From bpepple at fedoraproject.org  Thu Jan  1 00:15:12 2009
From: bpepple at fedoraproject.org (Brian Pepple)
Date: Thu,  1 Jan 2009 00:15:12 +0000 (UTC)
Subject: rpms/farsight2/devel farsight2.spec,1.1,1.2
Message-ID: <20090101001512.E7D297011B@cvs1.fedora.phx.redhat.com>

Author: bpepple

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

Modified Files:
	farsight2.spec 
Log Message:
add missing changelog entry


Index: farsight2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/farsight2/devel/farsight2.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- farsight2.spec	31 Dec 2008 23:55:52 -0000	1.1
+++ farsight2.spec	1 Jan 2009 00:14:42 -0000	1.2
@@ -110,5 +110,8 @@
 
 
 %changelog
+* Wed Dec 31 2008 Brian Pepple <bpepple at fedoraproject.org> - 0.0.6-2
+- Preserve time stamps.
+
 * Tue Dec 16 2008 Brian Pepple <bpepple at fedoraproject.org> - 0.0.6-1
 - Initial Fedora spec.



From lspooky at fedoraproject.org  Thu Jan  1 00:36:35 2009
From: lspooky at fedoraproject.org (Henrique Junior)
Date: Thu,  1 Jan 2009 00:36:35 +0000 (UTC)
Subject: rpms/bkchem/F-9 bkchem-setup.patch, NONE, 1.1 bkchem.desktop, NONE, 
	1.1 bkchem.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090101003635.2DC827011B@cvs1.fedora.phx.redhat.com>

Author: lspooky

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

Modified Files:
	.cvsignore sources 
Added Files:
	bkchem-setup.patch bkchem.desktop bkchem.spec import.log 
Log Message:
* Wed Dec 31 2008 Henrique (LonelySpooky) Junior <lspooky at fedoraproject.org> - 0.12.5-4
- Initial RPM release


bkchem-setup.patch:

--- NEW FILE bkchem-setup.patch ---
--- bkchem-0.12.5/setup.py	2008-05-30 04:34:24.000000000 -0300
+++ bkchem2-0.12.5/setup.py	2008-12-18 11:02:21.000000000 -0200
@@ -58,7 +58,7 @@
   platforms = ["Unix", "Windows", "hopefully other OSes able to run Python"],
   long_description = "BKchem is a chemical drawing program written in Python",
   
-  packages=[ 'bkchem', 'bkchem/plugins', 'bkchem/oasa', 'bkchem/oasa/oasa', 'bkchem/oasa/oasa/graph', 'bkchem/plugins/piddle'],
+  packages=[ 'bkchem', 'bkchem/plugins'],
 
   data_files=[ ('share/bkchem/templates', glob.glob( 'templates/*.cdml')+glob.glob('templates/*.xml')),
                ('share/bkchem/images', ['images/logo.ppm','images/icon.ico']+glob.glob('images/bkchem*.png')),


--- NEW FILE bkchem.desktop ---
[Desktop Entry] 
Encoding=UTF-8
Name=BkChem
GenericName=BkChem
Comment=Chemical drawing tool
Exec=bkchem
Icon=bkchem
Terminal=false
Type=Application
Categories=Education;Science;



--- NEW FILE bkchem.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

Name:		bkchem
Version:	0.12.5
Release:	4%{?dist}
Summary:	Chemical drawing program
Group:		Applications/Engineering
License:	GPLv2+ and GFDL
URL:		http://bkchem.zirael.org/
Group:		Applications/Engineering
Source0:	http://bkchem.zirael.org/download/%{name}-%{version}.tar.gz
Source1:	%{name}.desktop
Patch1:		bkchem-setup.patch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:	noarch
BuildRequires:	python-devel desktop-file-utils
Requires:	pycairo tkinter python-imaging PyXML python-pmw python-oasa

%description
BKChem is a free chemical drawing program. It was conceived and
written by Beda Kosata.

%prep
%setup -q -n %{name}-%{version}
%patch1 -p1 -b .bkchem-setup
%{__rm} -rf %{_builddir}/%{name}-%{version}/%{name}/oasa
%{__rm} -f %{_builddir}/%{name}-%{version}/%{name}/Pmw*.py
%{__rm} -rf %{_builddir}/%{name}-%{version}/%{name}/plugins/piddle



%build
%{__python} setup.py build

%install
%{__rm} -rf %{buildroot}
%{__python} setup.py install --skip-build --root %{buildroot}
%{__sed} -i -e 's,'%{buildroot}',,g' \
	%{buildroot}/%{python_sitelib}/%{name}/site_config.py \
	%{buildroot}/%{_bindir}/%{name}
%{__rm} -rf %{buildroot}/%{_datadir}/doc/%{name}
%find_lang BKchem

# menu
%{__install} -D -p -m 0644 images/bkchem.png \
	%{buildroot}/%{_datadir}/pixmaps/bkchem.png
%{__install} -d %{buildroot}/%{_datadir}/applications
desktop-file-install --dir=%{buildroot}/%{_datadir}/applications %{SOURCE1}


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

%files -f BKchem.lang
%defattr(-, root ,root, -)
%doc README gpl.txt progress.log doc/
%{_bindir}/%{name}
%{_datadir}/%{name}
%{_datadir}/applications/%{name}.desktop
%{_datadir}/pixmaps/%{name}.png
%{python_sitelib}/%{name}*

%changelog
* Sun Dec 21 2008 Henrique (LonelySpooky) Junior <lspooky at fedoraproject.org> - 0.12.5-4
- improvement of the spec file to be more consistent.

* Thu Dec 18 2008 Henrique (LonelySpooky) Junior <lspooky at fedoraproject.org> - 0.12.5-3
- improvement of the patch, saving a lot of space

* Tue Dec 16 2008 Henrique (LonelySpooky) Junior <lspooky at fedoraproject.org> - 0.12.5-2
- added a patch to get rid of redundant files

* Sat Dec 13 2008 Henrique (LonelySpooky) Junior <lspooky at fedoraproject.org> - 0.12.5-1
- starts using python-pmw instead of a native Pmw
- OASA is now splited in its own package

* Tue Oct 29 2008 Henrique (LonelySpooky) Junior <lspooky at fedoraproject.org> - 0.12.4-1
- bugfix that solve the corruption of saved files - 0.12.4-1

* Sat Oct 09 2008 Henrique (LonelySpooky) Junior <lspooky at fedoraproject.org> - 0.12.3-1
- added the new release of BKChem - 0.12.3

* Sat Aug 23 2008 Henrique (LonelySpooky) Junior <lspooky at fedoraproject.org> - 0.12.2-4
- piddle is removed from tarball

* Sat Jun 22 2008 Henrique (LonelySpooky) Junior <lspooky at fedoraproject.org> - 0.12.2-3
- creation of bkchem.desktop and addition of menu entrie

* Thu Jun 19 2008 Henrique (LonelySpooky) Junior <lspooky at fedoraproject.org> - 0.12.2-2
- enhacement of descriptions in the RPM

* Fri Jun 13 2008 Terje Rosten <terje.rosten at ntnu.no> - 0.12.2-1
- initial package


--- NEW FILE import.log ---
bkchem-0_12_5-4_fc10:F-9:bkchem-0.12.5-4.fc10.src.rpm:1230769551


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bkchem/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	28 Dec 2008 19:22:20 -0000	1.1
+++ .cvsignore	1 Jan 2009 00:36:04 -0000	1.2
@@ -0,0 +1 @@
+bkchem-0.12.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bkchem/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	28 Dec 2008 19:22:20 -0000	1.1
+++ sources	1 Jan 2009 00:36:04 -0000	1.2
@@ -0,0 +1 @@
+affe99c8c581bdef9a74e8608d811da8  bkchem-0.12.5.tar.gz



From lspooky at fedoraproject.org  Thu Jan  1 00:51:10 2009
From: lspooky at fedoraproject.org (Henrique Junior)
Date: Thu,  1 Jan 2009 00:51:10 +0000 (UTC)
Subject: rpms/bkchem/F-10 bkchem-setup.patch, NONE, 1.1 bkchem.desktop, NONE,
	1.1 bkchem.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090101005110.2EE247011B@cvs1.fedora.phx.redhat.com>

Author: lspooky

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

Modified Files:
	.cvsignore sources 
Added Files:
	bkchem-setup.patch bkchem.desktop bkchem.spec import.log 
Log Message:
* Wed Dec 31 2008 Henrique (LonelySpooky) Junior <lspooky at fedoraproject.org> - 0.12.5-4
- Initial RPM package


bkchem-setup.patch:

--- NEW FILE bkchem-setup.patch ---
--- bkchem-0.12.5/setup.py	2008-05-30 04:34:24.000000000 -0300
+++ bkchem2-0.12.5/setup.py	2008-12-18 11:02:21.000000000 -0200
@@ -58,7 +58,7 @@
   platforms = ["Unix", "Windows", "hopefully other OSes able to run Python"],
   long_description = "BKchem is a chemical drawing program written in Python",
   
-  packages=[ 'bkchem', 'bkchem/plugins', 'bkchem/oasa', 'bkchem/oasa/oasa', 'bkchem/oasa/oasa/graph', 'bkchem/plugins/piddle'],
+  packages=[ 'bkchem', 'bkchem/plugins'],
 
   data_files=[ ('share/bkchem/templates', glob.glob( 'templates/*.cdml')+glob.glob('templates/*.xml')),
                ('share/bkchem/images', ['images/logo.ppm','images/icon.ico']+glob.glob('images/bkchem*.png')),


--- NEW FILE bkchem.desktop ---
[Desktop Entry] 
Encoding=UTF-8
Name=BkChem
GenericName=BkChem
Comment=Chemical drawing tool
Exec=bkchem
Icon=bkchem
Terminal=false
Type=Application
Categories=Education;Science;



--- NEW FILE bkchem.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

Name:		bkchem
Version:	0.12.5
Release:	4%{?dist}
Summary:	Chemical drawing program
Group:		Applications/Engineering
License:	GPLv2+ and GFDL
URL:		http://bkchem.zirael.org/
Group:		Applications/Engineering
Source0:	http://bkchem.zirael.org/download/%{name}-%{version}.tar.gz
Source1:	%{name}.desktop
Patch1:		bkchem-setup.patch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:	noarch
BuildRequires:	python-devel desktop-file-utils
Requires:	pycairo tkinter python-imaging PyXML python-pmw python-oasa

%description
BKChem is a free chemical drawing program. It was conceived and
written by Beda Kosata.

%prep
%setup -q -n %{name}-%{version}
%patch1 -p1 -b .bkchem-setup
%{__rm} -rf %{_builddir}/%{name}-%{version}/%{name}/oasa
%{__rm} -f %{_builddir}/%{name}-%{version}/%{name}/Pmw*.py
%{__rm} -rf %{_builddir}/%{name}-%{version}/%{name}/plugins/piddle



%build
%{__python} setup.py build

%install
%{__rm} -rf %{buildroot}
%{__python} setup.py install --skip-build --root %{buildroot}
%{__sed} -i -e 's,'%{buildroot}',,g' \
	%{buildroot}/%{python_sitelib}/%{name}/site_config.py \
	%{buildroot}/%{_bindir}/%{name}
%{__rm} -rf %{buildroot}/%{_datadir}/doc/%{name}
%find_lang BKchem

# menu
%{__install} -D -p -m 0644 images/bkchem.png \
	%{buildroot}/%{_datadir}/pixmaps/bkchem.png
%{__install} -d %{buildroot}/%{_datadir}/applications
desktop-file-install --dir=%{buildroot}/%{_datadir}/applications %{SOURCE1}


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

%files -f BKchem.lang
%defattr(-, root ,root, -)
%doc README gpl.txt progress.log doc/
%{_bindir}/%{name}
%{_datadir}/%{name}
%{_datadir}/applications/%{name}.desktop
%{_datadir}/pixmaps/%{name}.png
%{python_sitelib}/%{name}*

%changelog
* Sun Dec 21 2008 Henrique (LonelySpooky) Junior <lspooky at fedoraproject.org> - 0.12.5-4
- improvement of the spec file to be more consistent.

* Thu Dec 18 2008 Henrique (LonelySpooky) Junior <lspooky at fedoraproject.org> - 0.12.5-3
- improvement of the patch, saving a lot of space

* Tue Dec 16 2008 Henrique (LonelySpooky) Junior <lspooky at fedoraproject.org> - 0.12.5-2
- added a patch to get rid of redundant files

* Sat Dec 13 2008 Henrique (LonelySpooky) Junior <lspooky at fedoraproject.org> - 0.12.5-1
- starts using python-pmw instead of a native Pmw
- OASA is now splited in its own package

* Tue Oct 29 2008 Henrique (LonelySpooky) Junior <lspooky at fedoraproject.org> - 0.12.4-1
- bugfix that solve the corruption of saved files - 0.12.4-1

* Sat Oct 09 2008 Henrique (LonelySpooky) Junior <lspooky at fedoraproject.org> - 0.12.3-1
- added the new release of BKChem - 0.12.3

* Sat Aug 23 2008 Henrique (LonelySpooky) Junior <lspooky at fedoraproject.org> - 0.12.2-4
- piddle is removed from tarball

* Sat Jun 22 2008 Henrique (LonelySpooky) Junior <lspooky at fedoraproject.org> - 0.12.2-3
- creation of bkchem.desktop and addition of menu entrie

* Thu Jun 19 2008 Henrique (LonelySpooky) Junior <lspooky at fedoraproject.org> - 0.12.2-2
- enhacement of descriptions in the RPM

* Fri Jun 13 2008 Terje Rosten <terje.rosten at ntnu.no> - 0.12.2-1
- initial package


--- NEW FILE import.log ---
bkchem-0_12_5-4_fc10:F-10:bkchem-0.12.5-4.fc10.src.rpm:1230770905


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bkchem/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	28 Dec 2008 19:22:20 -0000	1.1
+++ .cvsignore	1 Jan 2009 00:50:39 -0000	1.2
@@ -0,0 +1 @@
+bkchem-0.12.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bkchem/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	28 Dec 2008 19:22:20 -0000	1.1
+++ sources	1 Jan 2009 00:50:39 -0000	1.2
@@ -0,0 +1 @@
+affe99c8c581bdef9a74e8608d811da8  bkchem-0.12.5.tar.gz



From lspooky at fedoraproject.org  Thu Jan  1 01:02:31 2009
From: lspooky at fedoraproject.org (Henrique Junior)
Date: Thu,  1 Jan 2009 01:02:31 +0000 (UTC)
Subject: rpms/python-oasa/F-9 import.log, NONE, 1.1 python-oasa.spec, NONE, 
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090101010231.375C77011B@cvs1.fedora.phx.redhat.com>

Author: lspooky

Update of /cvs/pkgs/rpms/python-oasa/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18909/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	import.log python-oasa.spec 
Log Message:
* Wed Dec 31 2008 Henrique (LonelySpooky) Junior <lspooky at fedoraproject.org> - 0.12.5-4
- Initial RPM release



--- NEW FILE import.log ---
python-oasa-0_12_5-1_fc10:F-9:python-oasa-0.12.5-1.fc10.src.rpm:1230771610


--- NEW FILE python-oasa.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

Name:		python-oasa
Version:	0.12.5
Release:	1%{?dist}
Summary:	Python library for manipulation of chemical formats
Group:		Development/Libraries
License:	GPLv2+
URL:		http://bkchem.zirael.org
Source0:	http://bkchem.zirael.org/download/oasa-%{version}.tar.gz
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:	noarch
BuildRequires:	python-devel


%description
Free python library for manipulating and analyzing chemical structures


%prep
%setup -q -n oasa-%{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 PKG-INFO progress.log README
%{python_sitelib}/oasa/
%{python_sitelib}/oasa-%{version}-py*.egg-info



%changelog
* Fri Jun 13 2008 Henrique (LonelySpooky) Junior <lspooky at fedoraproject.org> - 0.12.5-1
- initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-oasa/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	28 Dec 2008 19:16:01 -0000	1.1
+++ .cvsignore	1 Jan 2009 01:02:00 -0000	1.2
@@ -0,0 +1 @@
+oasa-0.12.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-oasa/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	28 Dec 2008 19:16:01 -0000	1.1
+++ sources	1 Jan 2009 01:02:00 -0000	1.2
@@ -0,0 +1 @@
+041c7bd2d6ff849ad2c47062d0c826d6  oasa-0.12.5.tar.gz



From lspooky at fedoraproject.org  Thu Jan  1 01:11:38 2009
From: lspooky at fedoraproject.org (Henrique Junior)
Date: Thu,  1 Jan 2009 01:11:38 +0000 (UTC)
Subject: rpms/python-oasa/F-10 import.log, NONE, 1.1 python-oasa.spec, NONE, 
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090101011138.7DA5B7011B@cvs1.fedora.phx.redhat.com>

Author: lspooky

Update of /cvs/pkgs/rpms/python-oasa/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20025/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	import.log python-oasa.spec 
Log Message:
* Wed Dec 31 2008 Henrique (LonelySpooky) Junior <lspooky at fedoraproject.org> - 0.12.5-4
- Initial RPM release



--- NEW FILE import.log ---
python-oasa-0_12_5-1_fc10:F-10:python-oasa-0.12.5-1.fc10.src.rpm:1230772132


--- NEW FILE python-oasa.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

Name:		python-oasa
Version:	0.12.5
Release:	1%{?dist}
Summary:	Python library for manipulation of chemical formats
Group:		Development/Libraries
License:	GPLv2+
URL:		http://bkchem.zirael.org
Source0:	http://bkchem.zirael.org/download/oasa-%{version}.tar.gz
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:	noarch
BuildRequires:	python-devel


%description
Free python library for manipulating and analyzing chemical structures


%prep
%setup -q -n oasa-%{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 PKG-INFO progress.log README
%{python_sitelib}/oasa/
%{python_sitelib}/oasa-%{version}-py*.egg-info



%changelog
* Fri Jun 13 2008 Henrique (LonelySpooky) Junior <lspooky at fedoraproject.org> - 0.12.5-1
- initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-oasa/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	28 Dec 2008 19:16:01 -0000	1.1
+++ .cvsignore	1 Jan 2009 01:11:08 -0000	1.2
@@ -0,0 +1 @@
+oasa-0.12.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-oasa/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	28 Dec 2008 19:16:01 -0000	1.1
+++ sources	1 Jan 2009 01:11:08 -0000	1.2
@@ -0,0 +1 @@
+041c7bd2d6ff849ad2c47062d0c826d6  oasa-0.12.5.tar.gz



From pkgdb at fedoraproject.org  Thu Jan  1 01:15:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 01 Jan 2009 01:15:56 +0000
Subject: [pkgdb] k3b-extras: pawpawcatfish has requested watchbugzilla
Message-ID: <20090101011556.C4F22208D4F@bastion.fedora.phx.redhat.com>

pawpawcatfish has requested the watchbugzilla acl on k3b-extras (Fedora 10)

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



From pkgdb at fedoraproject.org  Thu Jan  1 01:16:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 01 Jan 2009 01:16:00 +0000
Subject: [pkgdb] k3b-extras: pawpawcatfish has requested watchcommits
Message-ID: <20090101011600.3B96D208D52@bastion.fedora.phx.redhat.com>

pawpawcatfish has requested the watchcommits acl on k3b-extras (Fedora 10)

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



From lspooky at fedoraproject.org  Thu Jan  1 01:19:07 2009
From: lspooky at fedoraproject.org (Henrique Junior)
Date: Thu,  1 Jan 2009 01:19:07 +0000 (UTC)
Subject: rpms/python-oasa/devel import.log, NONE, 1.1 python-oasa.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090101011908.041337011B@cvs1.fedora.phx.redhat.com>

Author: lspooky

Update of /cvs/pkgs/rpms/python-oasa/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23435/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log python-oasa.spec 
Log Message:
* Wed Dec 31 2008 Henrique (LonelySpooky) Junior <lspooky at fedoraproject.org> - 0.12.5
- Initial RPM release



--- NEW FILE import.log ---
python-oasa-0_12_5-1_fc10:HEAD:python-oasa-0.12.5-1.fc10.src.rpm:1230772621


--- NEW FILE python-oasa.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

Name:		python-oasa
Version:	0.12.5
Release:	1%{?dist}
Summary:	Python library for manipulation of chemical formats
Group:		Development/Libraries
License:	GPLv2+
URL:		http://bkchem.zirael.org
Source0:	http://bkchem.zirael.org/download/oasa-%{version}.tar.gz
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:	noarch
BuildRequires:	python-devel


%description
Free python library for manipulating and analyzing chemical structures


%prep
%setup -q -n oasa-%{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 PKG-INFO progress.log README
%{python_sitelib}/oasa/
%{python_sitelib}/oasa-%{version}-py*.egg-info



%changelog
* Fri Jun 13 2008 Henrique (LonelySpooky) Junior <lspooky at fedoraproject.org> - 0.12.5-1
- initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-oasa/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	28 Dec 2008 19:16:01 -0000	1.1
+++ .cvsignore	1 Jan 2009 01:18:37 -0000	1.2
@@ -0,0 +1 @@
+oasa-0.12.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-oasa/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	28 Dec 2008 19:16:01 -0000	1.1
+++ sources	1 Jan 2009 01:18:37 -0000	1.2
@@ -0,0 +1 @@
+041c7bd2d6ff849ad2c47062d0c826d6  oasa-0.12.5.tar.gz



From lspooky at fedoraproject.org  Thu Jan  1 01:25:55 2009
From: lspooky at fedoraproject.org (Henrique Junior)
Date: Thu,  1 Jan 2009 01:25:55 +0000 (UTC)
Subject: rpms/bkchem/devel bkchem-setup.patch, NONE, 1.1 bkchem.desktop, NONE,
	1.1 bkchem.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090101012555.1940C7011B@cvs1.fedora.phx.redhat.com>

Author: lspooky

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

Modified Files:
	.cvsignore sources 
Added Files:
	bkchem-setup.patch bkchem.desktop bkchem.spec import.log 
Log Message:
* Wed Dec 31 2008 Henrique (LonelySpooky) Junior <lspooky at fedoraproject.org> - 0.12.5-4
- Initial RPM release


bkchem-setup.patch:

--- NEW FILE bkchem-setup.patch ---
--- bkchem-0.12.5/setup.py	2008-05-30 04:34:24.000000000 -0300
+++ bkchem2-0.12.5/setup.py	2008-12-18 11:02:21.000000000 -0200
@@ -58,7 +58,7 @@
   platforms = ["Unix", "Windows", "hopefully other OSes able to run Python"],
   long_description = "BKchem is a chemical drawing program written in Python",
   
-  packages=[ 'bkchem', 'bkchem/plugins', 'bkchem/oasa', 'bkchem/oasa/oasa', 'bkchem/oasa/oasa/graph', 'bkchem/plugins/piddle'],
+  packages=[ 'bkchem', 'bkchem/plugins'],
 
   data_files=[ ('share/bkchem/templates', glob.glob( 'templates/*.cdml')+glob.glob('templates/*.xml')),
                ('share/bkchem/images', ['images/logo.ppm','images/icon.ico']+glob.glob('images/bkchem*.png')),


--- NEW FILE bkchem.desktop ---
[Desktop Entry] 
Encoding=UTF-8
Name=BkChem
GenericName=BkChem
Comment=Chemical drawing tool
Exec=bkchem
Icon=bkchem
Terminal=false
Type=Application
Categories=Education;Science;



--- NEW FILE bkchem.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

Name:		bkchem
Version:	0.12.5
Release:	4%{?dist}
Summary:	Chemical drawing program
Group:		Applications/Engineering
License:	GPLv2+ and GFDL
URL:		http://bkchem.zirael.org/
Group:		Applications/Engineering
Source0:	http://bkchem.zirael.org/download/%{name}-%{version}.tar.gz
Source1:	%{name}.desktop
Patch1:		bkchem-setup.patch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:	noarch
BuildRequires:	python-devel desktop-file-utils
Requires:	pycairo tkinter python-imaging PyXML python-pmw python-oasa

%description
BKChem is a free chemical drawing program. It was conceived and
written by Beda Kosata.

%prep
%setup -q -n %{name}-%{version}
%patch1 -p1 -b .bkchem-setup
%{__rm} -rf %{_builddir}/%{name}-%{version}/%{name}/oasa
%{__rm} -f %{_builddir}/%{name}-%{version}/%{name}/Pmw*.py
%{__rm} -rf %{_builddir}/%{name}-%{version}/%{name}/plugins/piddle



%build
%{__python} setup.py build

%install
%{__rm} -rf %{buildroot}
%{__python} setup.py install --skip-build --root %{buildroot}
%{__sed} -i -e 's,'%{buildroot}',,g' \
	%{buildroot}/%{python_sitelib}/%{name}/site_config.py \
	%{buildroot}/%{_bindir}/%{name}
%{__rm} -rf %{buildroot}/%{_datadir}/doc/%{name}
%find_lang BKchem

# menu
%{__install} -D -p -m 0644 images/bkchem.png \
	%{buildroot}/%{_datadir}/pixmaps/bkchem.png
%{__install} -d %{buildroot}/%{_datadir}/applications
desktop-file-install --dir=%{buildroot}/%{_datadir}/applications %{SOURCE1}


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

%files -f BKchem.lang
%defattr(-, root ,root, -)
%doc README gpl.txt progress.log doc/
%{_bindir}/%{name}
%{_datadir}/%{name}
%{_datadir}/applications/%{name}.desktop
%{_datadir}/pixmaps/%{name}.png
%{python_sitelib}/%{name}*

%changelog
* Sun Dec 21 2008 Henrique (LonelySpooky) Junior <lspooky at fedoraproject.org> - 0.12.5-4
- improvement of the spec file to be more consistent.

* Thu Dec 18 2008 Henrique (LonelySpooky) Junior <lspooky at fedoraproject.org> - 0.12.5-3
- improvement of the patch, saving a lot of space

* Tue Dec 16 2008 Henrique (LonelySpooky) Junior <lspooky at fedoraproject.org> - 0.12.5-2
- added a patch to get rid of redundant files

* Sat Dec 13 2008 Henrique (LonelySpooky) Junior <lspooky at fedoraproject.org> - 0.12.5-1
- starts using python-pmw instead of a native Pmw
- OASA is now splited in its own package

* Tue Oct 29 2008 Henrique (LonelySpooky) Junior <lspooky at fedoraproject.org> - 0.12.4-1
- bugfix that solve the corruption of saved files - 0.12.4-1

* Sat Oct 09 2008 Henrique (LonelySpooky) Junior <lspooky at fedoraproject.org> - 0.12.3-1
- added the new release of BKChem - 0.12.3

* Sat Aug 23 2008 Henrique (LonelySpooky) Junior <lspooky at fedoraproject.org> - 0.12.2-4
- piddle is removed from tarball

* Sat Jun 22 2008 Henrique (LonelySpooky) Junior <lspooky at fedoraproject.org> - 0.12.2-3
- creation of bkchem.desktop and addition of menu entrie

* Thu Jun 19 2008 Henrique (LonelySpooky) Junior <lspooky at fedoraproject.org> - 0.12.2-2
- enhacement of descriptions in the RPM

* Fri Jun 13 2008 Terje Rosten <terje.rosten at ntnu.no> - 0.12.2-1
- initial package


--- NEW FILE import.log ---
bkchem-0_12_5-4_fc10:HEAD:bkchem-0.12.5-4.fc10.src.rpm:1230773042


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bkchem/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	28 Dec 2008 19:22:20 -0000	1.1
+++ .cvsignore	1 Jan 2009 01:25:24 -0000	1.2
@@ -0,0 +1 @@
+bkchem-0.12.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bkchem/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	28 Dec 2008 19:22:20 -0000	1.1
+++ sources	1 Jan 2009 01:25:24 -0000	1.2
@@ -0,0 +1 @@
+affe99c8c581bdef9a74e8608d811da8  bkchem-0.12.5.tar.gz



From ausil at fedoraproject.org  Thu Jan  1 02:26:14 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Thu,  1 Jan 2009 02:26:14 +0000 (UTC)
Subject: rpms/graphviz/F-9 graphviz-2.16.1-sparc64-libpostfix.patch, NONE,
	1.1 graphviz.spec, 1.49, 1.50
Message-ID: <20090101022614.973C67011B@cvs1.fedora.phx.redhat.com>

Author: ausil

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

Modified Files:
	graphviz.spec 
Added Files:
	graphviz-2.16.1-sparc64-libpostfix.patch 
Log Message:
add patch so libprefix is right on sparc64


graphviz-2.16.1-sparc64-libpostfix.patch:

--- NEW FILE graphviz-2.16.1-sparc64-libpostfix.patch ---
--- graphviz-2.16.1/configure.BAD	2008-12-31 19:16:28.000000000 -0600
+++ graphviz-2.16.1/configure	2008-12-31 19:16:56.000000000 -0600
@@ -2464,7 +2464,7 @@
 case "${host_os}" in
   *linux* )
     case "${host_cpu}" in
-      powerpc64 | s390x | x86_64 )
+      powerpc64 | s390x | x86_64 | sparc64 )
         LIBPOSTFIX="64"
         ;;
     esac


Index: graphviz.spec
===================================================================
RCS file: /cvs/extras/rpms/graphviz/F-9/graphviz.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- graphviz.spec	29 Dec 2008 01:51:37 -0000	1.49
+++ graphviz.spec	1 Jan 2009 02:25:44 -0000	1.50
@@ -8,7 +8,7 @@
 Summary: Graph Visualization Tools
 Version: 2.16.1
 
-%define truerelease 0.7
+%define truerelease 0.8
 %{?distroagnostic: %define release %{truerelease}}
 %{!?distroagnostic: %define release %{truerelease}%{?dist}}
 
@@ -21,6 +21,7 @@
 Patch0:  %{name}-tk8.5.patch
 Patch1:  %{name}-gcc43.patch
 Patch2:  %{name}-multilib.patch
+Patch3:  graphviz-2.16.1-sparc64-libpostfix.patch
 
 # graphviz is relocatable - Caution: this feature is used in AT&T,
 #   but probably will not be supported in Redhat/Fedora/Centos distros
@@ -535,6 +536,7 @@
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %build
 %if ! %{SHARP}
@@ -620,6 +622,9 @@
 #-- changelog --------------------------------------------------
 
 %changelog
+* Wed Dec 31 2008 Dennis Gilmore <dennis at ausil.us> 2.16.1-0.8
+- patch for sparc64 libprefix
+
 * Sun Dec 28 2008 Dennis Gilmore <dennis at ausil.us> 2.16.1-0.7
 - build sparc64 same as ppc64
 



From dtimms at fedoraproject.org  Thu Jan  1 05:10:37 2009
From: dtimms at fedoraproject.org (David Timms)
Date: Thu,  1 Jan 2009 05:10:37 +0000 (UTC)
Subject: comps comps-f10.xml.in, 1.199, 1.200 comps-f11.xml.in, 1.46,
	1.47 comps-f9.xml.in, 1.428, 1.429
Message-ID: <20090101051037.657727011B@cvs1.fedora.phx.redhat.com>

Author: dtimms

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

Modified Files:
	comps-f10.xml.in comps-f11.xml.in comps-f9.xml.in 
Log Message:
add glglobe (education), pyvnc2swf, rakarrack (audio), run sort tool



Index: comps-f10.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f10.xml.in,v
retrieving revision 1.199
retrieving revision 1.200
diff -u -r1.199 -r1.200
--- comps-f10.xml.in	27 Dec 2008 04:55:08 -0000	1.199
+++ comps-f10.xml.in	1 Jan 2009 05:10:06 -0000	1.200
@@ -1124,6 +1124,7 @@
       <packagereq type="optional">fantasdic</packagereq>
       <packagereq type="optional">gcompris</packagereq>
       <packagereq type="optional">genchemlab</packagereq>
+      <packagereq type="optional">glglobe</packagereq>
       <packagereq type="optional">gperiodic</packagereq>
       <packagereq type="optional">gtypist</packagereq>
       <packagereq type="optional">kdeedu</packagereq>
@@ -4043,6 +4044,8 @@
       <packagereq type="default">pavucontrol</packagereq>
       <packagereq type="default">pulseaudio</packagereq>
       <packagereq type="default">pulseaudio-utils</packagereq>
+      <packagereq type="default">pyvnc2swf</packagereq>
+      <packagereq type="default">rakarrack</packagereq>
       <packagereq type="default">rhythmbox</packagereq>
       <packagereq type="default">sound-juicer</packagereq>
       <packagereq type="default">sox</packagereq>


Index: comps-f11.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f11.xml.in,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- comps-f11.xml.in	30 Dec 2008 12:49:08 -0000	1.46
+++ comps-f11.xml.in	1 Jan 2009 05:10:06 -0000	1.47
@@ -639,11 +639,11 @@
       <packagereq type="default">cluster-cim</packagereq>
       <packagereq type="default">cluster-snmp</packagereq>
       <packagereq type="default">ipvsadm</packagereq>
-      <packagereq type="default">luci</packagereq>   
+      <packagereq type="default">luci</packagereq>
       <packagereq type="default">modcluster</packagereq>
-      <packagereq type="default">pirahna</packagereq>   
-      <packagereq type="default">rgmanager</packagereq> 
-      <packagereq type="default">ricci</packagereq>    
+      <packagereq type="default">pirahna</packagereq>
+      <packagereq type="default">rgmanager</packagereq>
+      <packagereq type="default">ricci</packagereq>
       <packagereq type="default">system-config-cluster</packagereq>
       <packagereq type="optional">heartbeat</packagereq>
     </packagelist>
@@ -1138,6 +1138,7 @@
       <packagereq type="optional">fantasdic</packagereq>
       <packagereq type="optional">gcompris</packagereq>
       <packagereq type="optional">genchemlab</packagereq>
+      <packagereq type="optional">glglobe</packagereq>
       <packagereq type="optional">gperiodic</packagereq>
       <packagereq type="optional">gtypist</packagereq>
       <packagereq type="optional">kdeedu</packagereq>
@@ -4150,6 +4151,8 @@
       <packagereq type="default">pavucontrol</packagereq>
       <packagereq type="default">pulseaudio</packagereq>
       <packagereq type="default">pulseaudio-utils</packagereq>
+      <packagereq type="default">pyvnc2swf</packagereq>
+      <packagereq type="default">rakarrack</packagereq>
       <packagereq type="default">rhythmbox</packagereq>
       <packagereq type="default">sound-juicer</packagereq>
       <packagereq type="default">sox</packagereq>


Index: comps-f9.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f9.xml.in,v
retrieving revision 1.428
retrieving revision 1.429
diff -u -r1.428 -r1.429
--- comps-f9.xml.in	27 Dec 2008 04:55:09 -0000	1.428
+++ comps-f9.xml.in	1 Jan 2009 05:10:06 -0000	1.429
@@ -832,9 +832,9 @@
       <packagereq type="optional">codeblocks</packagereq>
       <packagereq type="optional">cogito</packagereq>
       <packagereq type="optional">colordiff</packagereq>
+      <packagereq type="optional">cpan-upload</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>
@@ -1085,6 +1085,7 @@
       <packagereq type="optional">fantasdic</packagereq>
       <packagereq type="optional">gcompris</packagereq>
       <packagereq type="optional">genchemlab</packagereq>
+      <packagereq type="optional">glglobe</packagereq>
       <packagereq type="optional">gperiodic</packagereq>
       <packagereq type="optional">gtypist</packagereq>
       <packagereq type="optional">kdeedu</packagereq>
@@ -1882,8 +1883,8 @@
       <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">gnomesword</packagereq>
       <packagereq type="optional">gnotime</packagereq>
       <packagereq type="optional">gonvert</packagereq>
       <packagereq type="optional">grsync</packagereq>
@@ -3674,8 +3675,8 @@
       <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">mkvtoolnix-gui</packagereq>
       <packagereq type="optional">muine</packagereq>
       <packagereq type="optional">mybashburn</packagereq>
       <packagereq type="optional">nted</packagereq>
@@ -3688,7 +3689,9 @@
       <packagereq type="optional">pitivi</packagereq>
       <packagereq type="optional">pulseaudio-module-lirc</packagereq>
       <packagereq type="optional">pulseaudio-module-zeroconf</packagereq>
+      <packagereq type="optional">pyvnc2swf</packagereq>
       <packagereq type="optional">quodlibet</packagereq>
+      <packagereq type="optional">rakarrack</packagereq>
       <packagereq type="optional">regionset</packagereq>
       <packagereq type="optional">rosegarden4</packagereq>
       <packagereq type="optional">serpentine</packagereq>
@@ -4389,7 +4392,6 @@
       <packagereq type="optional">fvwm</packagereq>
       <packagereq type="optional">hackedbox</packagereq>
       <packagereq type="optional">icewm</packagereq>
-      <packagereq type="optional">matchbox-window-manager</packagereq>
       <packagereq type="optional">lxappearance</packagereq>
       <packagereq type="optional">lxde-common</packagereq>
       <packagereq type="optional">lxlauncher</packagereq>
@@ -4397,6 +4399,7 @@
       <packagereq type="optional">lxsession-lite</packagereq>
       <packagereq type="optional">lxtask</packagereq>
       <packagereq type="optional">lxterminal</packagereq>
+      <packagereq type="optional">matchbox-window-manager</packagereq>
       <packagereq type="optional">obconf</packagereq>
       <packagereq type="optional">obmenu</packagereq>
       <packagereq type="optional">openbox</packagereq>



From pkgdb at fedoraproject.org  Thu Jan  1 06:32:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 01 Jan 2009 06:32:24 +0000
Subject: [pkgdb] k3b-extras had acl change status
Message-ID: <20090101063224.B29D3208978@bastion.fedora.phx.redhat.com>

rdieter has set the watchbugzilla acl on k3b-extras (Fedora 10) to Approved for pawpawcatfish

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



From pkgdb at fedoraproject.org  Thu Jan  1 06:32:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 01 Jan 2009 06:32:27 +0000
Subject: [pkgdb] k3b-extras had acl change status
Message-ID: <20090101063228.2E96A208D51@bastion.fedora.phx.redhat.com>

rdieter has set the watchcommits acl on k3b-extras (Fedora 10) to Approved for pawpawcatfish

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



From timn at fedoraproject.org  Thu Jan  1 10:56:45 2009
From: timn at fedoraproject.org (Tim Niemueller)
Date: Thu,  1 Jan 2009 10:56:45 +0000 (UTC)
Subject: rpms/papyrus/F-10 papyrus-0.7.1-virtual-dtors.patch, NONE,
	1.1 papyrus.spec, 1.18, 1.19
Message-ID: <20090101105645.294C27011B@cvs1.fedora.phx.redhat.com>

Author: timn

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

Modified Files:
	papyrus.spec 
Added Files:
	papyrus-0.7.1-virtual-dtors.patch 
Log Message:
Added patch to fix non-virtual dtors

Tim


papyrus-0.7.1-virtual-dtors.patch:

--- NEW FILE papyrus-0.7.1-virtual-dtors.patch ---
diff -urN papyrus-0.7.1/papyrus/animator.h papyrus-0.7.1.dtors/papyrus/animator.h
--- papyrus-0.7.1/papyrus/animator.h	2006-12-17 19:39:55.000000000 +0100
+++ papyrus-0.7.1.dtors/papyrus/animator.h	2009-01-01 11:25:35.000000000 +0100
@@ -37,7 +37,7 @@
 
     Animator();
 
-    ~Animator();
+    virtual ~Animator();
 
     /** Advance the animation by n frames */
     virtual int advance(int n=1);
diff -urN papyrus-0.7.1/papyrus/arc.h papyrus-0.7.1.dtors/papyrus/arc.h
--- papyrus-0.7.1/papyrus/arc.h	2007-02-25 00:20:39.000000000 +0100
+++ papyrus-0.7.1.dtors/papyrus/arc.h	2009-01-01 11:25:53.000000000 +0100
@@ -87,7 +87,7 @@
                                 );
 
       /** Destructor */
-      ~Arc();
+      virtual ~Arc();
 
       /** Returns the radius of this arc */
       double radius();
diff -urN papyrus-0.7.1/papyrus/beziergon.h papyrus-0.7.1.dtors/papyrus/beziergon.h
--- papyrus-0.7.1/papyrus/beziergon.h	2006-12-17 19:36:12.000000000 +0100
+++ papyrus-0.7.1.dtors/papyrus/beziergon.h	2009-01-01 11:25:59.000000000 +0100
@@ -63,7 +63,7 @@
 
   static Beziergon::pointer create(BezierVertices vertices=BezierVertices());
 
-  ~Beziergon();
+  virtual ~Beziergon();
 
   virtual void set_line_style(const LineStyle& line_style);
 
diff -urN papyrus-0.7.1/papyrus/bezierline.h papyrus-0.7.1.dtors/papyrus/bezierline.h
--- papyrus-0.7.1/papyrus/bezierline.h	2007-01-01 21:46:00.000000000 +0100
+++ papyrus-0.7.1.dtors/papyrus/bezierline.h	2009-01-01 11:26:14.000000000 +0100
@@ -101,7 +101,7 @@
       /** Creates a polyline from a specified set of vertices */
       static Bezierline::pointer create( BezierVertices vertices = BezierVertices() );
 
-      ~Bezierline();
+      virtual ~Bezierline();
 
       Bezierline& operator=( const Bezierline& other );
 
diff -urN papyrus-0.7.1/papyrus/boxed.h papyrus-0.7.1.dtors/papyrus/boxed.h
--- papyrus-0.7.1/papyrus/boxed.h	2007-01-19 07:17:29.000000000 +0100
+++ papyrus-0.7.1.dtors/papyrus/boxed.h	2009-01-01 11:26:21.000000000 +0100
@@ -53,7 +53,7 @@
 
       static Boxed::pointer create();
 
-      ~Boxed();
+      virtual ~Boxed();
 
       Rectangle::pointer get_box();
 
diff -urN papyrus-0.7.1/papyrus/circle.h papyrus-0.7.1.dtors/papyrus/circle.h
--- papyrus-0.7.1/papyrus/circle.h	2007-02-25 00:05:14.000000000 +0100
+++ papyrus-0.7.1.dtors/papyrus/circle.h	2009-01-01 11:26:39.000000000 +0100
@@ -75,7 +75,7 @@
                                      const LineStyle& outline
                                    );
 
-      ~Circle();
+      virtual ~Circle();
 
       PAPYRUS_CLASS_NAME( "Circle" );
 
diff -urN papyrus-0.7.1/papyrus/grid.h papyrus-0.7.1.dtors/papyrus/grid.h
--- papyrus-0.7.1/papyrus/grid.h	2007-02-25 00:05:14.000000000 +0100
+++ papyrus-0.7.1.dtors/papyrus/grid.h	2009-01-01 11:28:25.000000000 +0100
@@ -42,7 +42,7 @@
       static pointer create(double xmin=-infinity, double xmax=infinity,
                             double ymin=-infinity, double ymax=infinity);
 
-      ~Grid();
+      virtual ~Grid();
 
       double x_min();
 
diff -urN papyrus-0.7.1/papyrus/hilbert.h papyrus-0.7.1.dtors/papyrus/hilbert.h
--- papyrus-0.7.1/papyrus/hilbert.h	2006-12-17 19:57:46.000000000 +0100
+++ papyrus-0.7.1.dtors/papyrus/hilbert.h	2009-01-01 11:28:47.000000000 +0100
@@ -36,7 +36,7 @@
 
     static Hilbert::pointer create(unsigned level=0, double size=0);
 
-    ~Hilbert();
+    virtual ~Hilbert();
 
     unsigned level();
 
diff -urN papyrus-0.7.1/papyrus/image.h papyrus-0.7.1.dtors/papyrus/image.h
--- papyrus-0.7.1/papyrus/image.h	2007-02-25 00:05:14.000000000 +0100
+++ papyrus-0.7.1.dtors/papyrus/image.h	2009-01-01 11:29:08.000000000 +0100
@@ -74,7 +74,7 @@
       static Image::pointer create ( Cairo::RefPtr<Cairo::ImageSurface> img );
 
       /** Destructor */
-      ~Image();
+      virtual ~Image();
 
       std::string filename() const;
 
diff -urN papyrus-0.7.1/papyrus/kochcurve.h papyrus-0.7.1.dtors/papyrus/kochcurve.h
--- papyrus-0.7.1/papyrus/kochcurve.h	2006-12-17 19:58:34.000000000 +0100
+++ papyrus-0.7.1.dtors/papyrus/kochcurve.h	2009-01-01 11:29:19.000000000 +0100
@@ -36,7 +36,7 @@
 
     static KochCurve::pointer create(unsigned level=0, double size=0.0);
 
-    ~KochCurve();
+    virtual ~KochCurve();
 
     unsigned level();
 
diff -urN papyrus-0.7.1/papyrus/kochsnowflake.h papyrus-0.7.1.dtors/papyrus/kochsnowflake.h
--- papyrus-0.7.1/papyrus/kochsnowflake.h	2006-12-17 19:58:51.000000000 +0100
+++ papyrus-0.7.1.dtors/papyrus/kochsnowflake.h	2009-01-01 11:29:30.000000000 +0100
@@ -36,7 +36,7 @@
 
     static KochSnowflake::pointer create(unsigned level=0, double size=0.0);
 
-    ~KochSnowflake();
+    virtual ~KochSnowflake();
 
     unsigned level();
 
diff -urN papyrus-0.7.1/papyrus/linestyle.h papyrus-0.7.1.dtors/papyrus/linestyle.h
--- papyrus-0.7.1/papyrus/linestyle.h	2007-02-25 00:05:14.000000000 +0100
+++ papyrus-0.7.1.dtors/papyrus/linestyle.h	2009-01-01 11:29:43.000000000 +0100
@@ -47,7 +47,7 @@
                  Cairo::LineJoin join
                );
 
-      ~LineStyle();
+      virtual ~LineStyle();
 
       LineStyle& operator=( const LineStyle& other );
 
diff -urN papyrus-0.7.1/papyrus/marker.h papyrus-0.7.1.dtors/papyrus/marker.h
--- papyrus-0.7.1/papyrus/marker.h	2006-12-17 19:59:19.000000000 +0100
+++ papyrus-0.7.1.dtors/papyrus/marker.h	2009-01-01 11:29:53.000000000 +0100
@@ -71,7 +71,7 @@
       static Marker::pointer create( STYLE style=NONE, double width = 20.0, double height = 20.0, FACING facing = RIGHT );
 
       /** Destructor */
-      ~Marker();
+      virtual ~Marker();
 
       /** @return marker style */
       STYLE style() const;
diff -urN papyrus-0.7.1/papyrus/polygon.h papyrus-0.7.1.dtors/papyrus/polygon.h
--- papyrus-0.7.1/papyrus/polygon.h	2006-12-17 19:59:38.000000000 +0100
+++ papyrus-0.7.1.dtors/papyrus/polygon.h	2009-01-01 11:30:06.000000000 +0100
@@ -65,7 +65,7 @@
 
   static Polygon::pointer create(Vertices vertices=Vertices());
 
-  ~Polygon();
+  virtual ~Polygon();
 
   virtual void set_line_style(const LineStyle& line_style);
 
diff -urN papyrus-0.7.1/papyrus/polyline.h papyrus-0.7.1.dtors/papyrus/polyline.h
--- papyrus-0.7.1/papyrus/polyline.h	2006-12-17 19:59:55.000000000 +0100
+++ papyrus-0.7.1.dtors/papyrus/polyline.h	2009-01-01 11:30:12.000000000 +0100
@@ -92,7 +92,7 @@
       /** Creates a polyline from a specified set of vertices */
       static Polyline::pointer create( Vertices vertices = Vertices() );
 
-      ~Polyline();
+      virtual ~Polyline();
 
       Polyline& operator=(const Polyline& other);
 
diff -urN papyrus-0.7.1/papyrus/rectangle.h papyrus-0.7.1.dtors/papyrus/rectangle.h
--- papyrus-0.7.1/papyrus/rectangle.h	2007-02-25 00:05:14.000000000 +0100
+++ papyrus-0.7.1.dtors/papyrus/rectangle.h	2009-01-01 11:30:16.000000000 +0100
@@ -80,7 +80,7 @@
                                         const LineStyle& outline
                                       );
 
-      ~Rectangle();
+      virtual ~Rectangle();
 
       /** Returns the width of the rectangle */
       double width();
diff -urN papyrus-0.7.1/papyrus/region.h papyrus-0.7.1.dtors/papyrus/region.h
--- papyrus-0.7.1/papyrus/region.h	2007-02-25 00:05:14.000000000 +0100
+++ papyrus-0.7.1.dtors/papyrus/region.h	2009-01-01 11:30:24.000000000 +0100
@@ -33,7 +33,7 @@
 
     Region(double x=0.0, double y=0.0, double w=0.0, double h=0.0);
 
-    ~Region();
+    virtual ~Region();
 
     double x() const;
     double y() const;
diff -urN papyrus-0.7.1/papyrus/regularpolygon.h papyrus-0.7.1.dtors/papyrus/regularpolygon.h
--- papyrus-0.7.1/papyrus/regularpolygon.h	2006-12-17 20:00:24.000000000 +0100
+++ papyrus-0.7.1.dtors/papyrus/regularpolygon.h	2009-01-01 11:30:29.000000000 +0100
@@ -79,7 +79,7 @@
 
   static RegularPolygon::pointer create(unsigned int sides=3, double radius=1.0, Style style=ZERO_RADIUS );
 
-    ~RegularPolygon();
+    virtual ~RegularPolygon();
 
     unsigned int sides();
 
diff -urN papyrus-0.7.1/papyrus/rotator.h papyrus-0.7.1.dtors/papyrus/rotator.h
--- papyrus-0.7.1/papyrus/rotator.h	2006-12-31 23:16:02.000000000 +0100
+++ papyrus-0.7.1.dtors/papyrus/rotator.h	2009-01-01 11:30:50.000000000 +0100
@@ -58,7 +58,7 @@
                                    double radian_interval = 0.0
                                   );
 
-    ~Rotator();
+    virtual ~Rotator();
 
 //     double radian_interval();
 
diff -urN papyrus-0.7.1/papyrus/scaler.h papyrus-0.7.1.dtors/papyrus/scaler.h
--- papyrus-0.7.1/papyrus/scaler.h	2007-01-01 01:32:55.000000000 +0100
+++ papyrus-0.7.1.dtors/papyrus/scaler.h	2009-01-01 11:30:57.000000000 +0100
@@ -55,7 +55,7 @@
                                       int selection_depth = 1,
                                       unsigned side = 0 );
 
-    ~Scaler();
+    virtual ~Scaler();
 
     virtual void set_selection_group( Group::pointer selection_group, bool add_drawable_only = true );
 
diff -urN papyrus-0.7.1/papyrus/sierpinski.h papyrus-0.7.1.dtors/papyrus/sierpinski.h
--- papyrus-0.7.1/papyrus/sierpinski.h	2006-12-17 20:01:02.000000000 +0100
+++ papyrus-0.7.1.dtors/papyrus/sierpinski.h	2009-01-01 11:31:10.000000000 +0100
@@ -36,7 +36,7 @@
 
     static Sierpinski::pointer create(unsigned level=0, double size=0.0);
 
-    ~Sierpinski();
+    virtual ~Sierpinski();
 
     unsigned level();
 
diff -urN papyrus-0.7.1/papyrus/text.h papyrus-0.7.1.dtors/papyrus/text.h
--- papyrus-0.7.1/papyrus/text.h	2006-12-17 20:01:29.000000000 +0100
+++ papyrus-0.7.1.dtors/papyrus/text.h	2009-01-01 11:31:21.000000000 +0100
@@ -74,7 +74,7 @@
                                    Cairo::FontWeight weight = Cairo::FONT_WEIGHT_NORMAL
                                  );
 
-      ~Text();
+      virtual ~Text();
 
       const std::string& font_family();
 
diff -urN papyrus-0.7.1/papyrus/translator.h papyrus-0.7.1.dtors/papyrus/translator.h
--- papyrus-0.7.1/papyrus/translator.h	2006-12-30 02:09:26.000000000 +0100
+++ papyrus-0.7.1.dtors/papyrus/translator.h	2009-01-01 11:31:31.000000000 +0100
@@ -54,7 +54,7 @@
                                       int selection_depth = 1,
                                       unsigned transforms = TRANSLATE_X|TRANSLATE_Y );
 
-    ~Translator();
+    virtual ~Translator();
 
     unsigned transforms();
 
diff -urN papyrus-0.7.1/papyrus/viewbox.h papyrus-0.7.1.dtors/papyrus/viewbox.h
--- papyrus-0.7.1/papyrus/viewbox.h	2007-02-25 00:05:14.000000000 +0100
+++ papyrus-0.7.1.dtors/papyrus/viewbox.h	2009-01-01 11:31:44.000000000 +0100
@@ -105,7 +105,7 @@
 
     static pointer create(const Region& region, ALIGN align=ALIGN_NONE, MEET_OR_SLICE meet_or_slice = MEET);
 
-    ~Viewbox();
+    virtual ~Viewbox();
 
     Viewbox& operator=( const Region& other );
 


Index: papyrus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/papyrus/F-10/papyrus.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- papyrus.spec	21 Dec 2008 17:39:35 -0000	1.18
+++ papyrus.spec	1 Jan 2009 10:56:14 -0000	1.19
@@ -2,7 +2,7 @@
 Summary:          Papyrus is a C++ canvas library similar to the Gnome canvas
 Name:             papyrus
 Version:          0.7.1
-Release:          5%{?dist}
+Release:          6%{?dist}
 License:          LGPLv2
 URL:              http://libpapyrus.sourceforge.net/
 Group:            System Environment/Libraries
@@ -10,6 +10,7 @@
 Patch0:           papyrus.patch
 Patch1:           papyrus-0.7.1-typedef-fixes.patch
 Patch2:           papyrus-0.7.1-valarray.patch
+Patch3:           papyrus-0.7.1-virtual-dtors.patch
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:    gtkmm24-devel >= 2.10 cairomm-devel >= 1.2 boost-devel pkgconfig m4
 
@@ -35,6 +36,7 @@
 %patch0 -p1 -b gcc43
 %patch1 -p1 -b typedef-fixes
 %patch2 -p1 -b valarray
+%patch3 -p1 -b virtual-dtors
 
 %build
 %configure --enable-static=no
@@ -72,6 +74,9 @@
 %{_datadir}/papyrusmm-0.7.1/
 
 %changelog
+* Thu Jan 01 2009 Tim Niemueller <tim at niemueller.de> - 0.7.1-6
+- Make all dtors virtual to fix compile warnings (errors with -Wall -Werror)
+
 * Sun Dec 21 2008 Tim Niemueller <tim at niemueller.de> - 0.7.1-5
 - Header fixes for F-10
 - Drawing fixes (invalid use of std::valarray)



From timn at fedoraproject.org  Thu Jan  1 11:01:23 2009
From: timn at fedoraproject.org (Tim Niemueller)
Date: Thu,  1 Jan 2009 11:01:23 +0000 (UTC)
Subject: rpms/papyrus/F-9 papyrus-0.7.1-virtual-dtors.patch, NONE,
	1.1 papyrus.spec, 1.15, 1.16
Message-ID: <20090101110123.823877011B@cvs1.fedora.phx.redhat.com>

Author: timn

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

Modified Files:
	papyrus.spec 
Added Files:
	papyrus-0.7.1-virtual-dtors.patch 
Log Message:
+ Added patch to fix non-virtual dtors
+ Sync to F-10 version/release and changelog

Tim


papyrus-0.7.1-virtual-dtors.patch:

--- NEW FILE papyrus-0.7.1-virtual-dtors.patch ---
diff -urN papyrus-0.7.1/papyrus/animator.h papyrus-0.7.1.dtors/papyrus/animator.h
--- papyrus-0.7.1/papyrus/animator.h	2006-12-17 19:39:55.000000000 +0100
+++ papyrus-0.7.1.dtors/papyrus/animator.h	2009-01-01 11:25:35.000000000 +0100
@@ -37,7 +37,7 @@
 
     Animator();
 
-    ~Animator();
+    virtual ~Animator();
 
     /** Advance the animation by n frames */
     virtual int advance(int n=1);
diff -urN papyrus-0.7.1/papyrus/arc.h papyrus-0.7.1.dtors/papyrus/arc.h
--- papyrus-0.7.1/papyrus/arc.h	2007-02-25 00:20:39.000000000 +0100
+++ papyrus-0.7.1.dtors/papyrus/arc.h	2009-01-01 11:25:53.000000000 +0100
@@ -87,7 +87,7 @@
                                 );
 
       /** Destructor */
-      ~Arc();
+      virtual ~Arc();
 
       /** Returns the radius of this arc */
       double radius();
diff -urN papyrus-0.7.1/papyrus/beziergon.h papyrus-0.7.1.dtors/papyrus/beziergon.h
--- papyrus-0.7.1/papyrus/beziergon.h	2006-12-17 19:36:12.000000000 +0100
+++ papyrus-0.7.1.dtors/papyrus/beziergon.h	2009-01-01 11:25:59.000000000 +0100
@@ -63,7 +63,7 @@
 
   static Beziergon::pointer create(BezierVertices vertices=BezierVertices());
 
-  ~Beziergon();
+  virtual ~Beziergon();
 
   virtual void set_line_style(const LineStyle& line_style);
 
diff -urN papyrus-0.7.1/papyrus/bezierline.h papyrus-0.7.1.dtors/papyrus/bezierline.h
--- papyrus-0.7.1/papyrus/bezierline.h	2007-01-01 21:46:00.000000000 +0100
+++ papyrus-0.7.1.dtors/papyrus/bezierline.h	2009-01-01 11:26:14.000000000 +0100
@@ -101,7 +101,7 @@
       /** Creates a polyline from a specified set of vertices */
       static Bezierline::pointer create( BezierVertices vertices = BezierVertices() );
 
-      ~Bezierline();
+      virtual ~Bezierline();
 
       Bezierline& operator=( const Bezierline& other );
 
diff -urN papyrus-0.7.1/papyrus/boxed.h papyrus-0.7.1.dtors/papyrus/boxed.h
--- papyrus-0.7.1/papyrus/boxed.h	2007-01-19 07:17:29.000000000 +0100
+++ papyrus-0.7.1.dtors/papyrus/boxed.h	2009-01-01 11:26:21.000000000 +0100
@@ -53,7 +53,7 @@
 
       static Boxed::pointer create();
 
-      ~Boxed();
+      virtual ~Boxed();
 
       Rectangle::pointer get_box();
 
diff -urN papyrus-0.7.1/papyrus/circle.h papyrus-0.7.1.dtors/papyrus/circle.h
--- papyrus-0.7.1/papyrus/circle.h	2007-02-25 00:05:14.000000000 +0100
+++ papyrus-0.7.1.dtors/papyrus/circle.h	2009-01-01 11:26:39.000000000 +0100
@@ -75,7 +75,7 @@
                                      const LineStyle& outline
                                    );
 
-      ~Circle();
+      virtual ~Circle();
 
       PAPYRUS_CLASS_NAME( "Circle" );
 
diff -urN papyrus-0.7.1/papyrus/grid.h papyrus-0.7.1.dtors/papyrus/grid.h
--- papyrus-0.7.1/papyrus/grid.h	2007-02-25 00:05:14.000000000 +0100
+++ papyrus-0.7.1.dtors/papyrus/grid.h	2009-01-01 11:28:25.000000000 +0100
@@ -42,7 +42,7 @@
       static pointer create(double xmin=-infinity, double xmax=infinity,
                             double ymin=-infinity, double ymax=infinity);
 
-      ~Grid();
+      virtual ~Grid();
 
       double x_min();
 
diff -urN papyrus-0.7.1/papyrus/hilbert.h papyrus-0.7.1.dtors/papyrus/hilbert.h
--- papyrus-0.7.1/papyrus/hilbert.h	2006-12-17 19:57:46.000000000 +0100
+++ papyrus-0.7.1.dtors/papyrus/hilbert.h	2009-01-01 11:28:47.000000000 +0100
@@ -36,7 +36,7 @@
 
     static Hilbert::pointer create(unsigned level=0, double size=0);
 
-    ~Hilbert();
+    virtual ~Hilbert();
 
     unsigned level();
 
diff -urN papyrus-0.7.1/papyrus/image.h papyrus-0.7.1.dtors/papyrus/image.h
--- papyrus-0.7.1/papyrus/image.h	2007-02-25 00:05:14.000000000 +0100
+++ papyrus-0.7.1.dtors/papyrus/image.h	2009-01-01 11:29:08.000000000 +0100
@@ -74,7 +74,7 @@
       static Image::pointer create ( Cairo::RefPtr<Cairo::ImageSurface> img );
 
       /** Destructor */
-      ~Image();
+      virtual ~Image();
 
       std::string filename() const;
 
diff -urN papyrus-0.7.1/papyrus/kochcurve.h papyrus-0.7.1.dtors/papyrus/kochcurve.h
--- papyrus-0.7.1/papyrus/kochcurve.h	2006-12-17 19:58:34.000000000 +0100
+++ papyrus-0.7.1.dtors/papyrus/kochcurve.h	2009-01-01 11:29:19.000000000 +0100
@@ -36,7 +36,7 @@
 
     static KochCurve::pointer create(unsigned level=0, double size=0.0);
 
-    ~KochCurve();
+    virtual ~KochCurve();
 
     unsigned level();
 
diff -urN papyrus-0.7.1/papyrus/kochsnowflake.h papyrus-0.7.1.dtors/papyrus/kochsnowflake.h
--- papyrus-0.7.1/papyrus/kochsnowflake.h	2006-12-17 19:58:51.000000000 +0100
+++ papyrus-0.7.1.dtors/papyrus/kochsnowflake.h	2009-01-01 11:29:30.000000000 +0100
@@ -36,7 +36,7 @@
 
     static KochSnowflake::pointer create(unsigned level=0, double size=0.0);
 
-    ~KochSnowflake();
+    virtual ~KochSnowflake();
 
     unsigned level();
 
diff -urN papyrus-0.7.1/papyrus/linestyle.h papyrus-0.7.1.dtors/papyrus/linestyle.h
--- papyrus-0.7.1/papyrus/linestyle.h	2007-02-25 00:05:14.000000000 +0100
+++ papyrus-0.7.1.dtors/papyrus/linestyle.h	2009-01-01 11:29:43.000000000 +0100
@@ -47,7 +47,7 @@
                  Cairo::LineJoin join
                );
 
-      ~LineStyle();
+      virtual ~LineStyle();
 
       LineStyle& operator=( const LineStyle& other );
 
diff -urN papyrus-0.7.1/papyrus/marker.h papyrus-0.7.1.dtors/papyrus/marker.h
--- papyrus-0.7.1/papyrus/marker.h	2006-12-17 19:59:19.000000000 +0100
+++ papyrus-0.7.1.dtors/papyrus/marker.h	2009-01-01 11:29:53.000000000 +0100
@@ -71,7 +71,7 @@
       static Marker::pointer create( STYLE style=NONE, double width = 20.0, double height = 20.0, FACING facing = RIGHT );
 
       /** Destructor */
-      ~Marker();
+      virtual ~Marker();
 
       /** @return marker style */
       STYLE style() const;
diff -urN papyrus-0.7.1/papyrus/polygon.h papyrus-0.7.1.dtors/papyrus/polygon.h
--- papyrus-0.7.1/papyrus/polygon.h	2006-12-17 19:59:38.000000000 +0100
+++ papyrus-0.7.1.dtors/papyrus/polygon.h	2009-01-01 11:30:06.000000000 +0100
@@ -65,7 +65,7 @@
 
   static Polygon::pointer create(Vertices vertices=Vertices());
 
-  ~Polygon();
+  virtual ~Polygon();
 
   virtual void set_line_style(const LineStyle& line_style);
 
diff -urN papyrus-0.7.1/papyrus/polyline.h papyrus-0.7.1.dtors/papyrus/polyline.h
--- papyrus-0.7.1/papyrus/polyline.h	2006-12-17 19:59:55.000000000 +0100
+++ papyrus-0.7.1.dtors/papyrus/polyline.h	2009-01-01 11:30:12.000000000 +0100
@@ -92,7 +92,7 @@
       /** Creates a polyline from a specified set of vertices */
       static Polyline::pointer create( Vertices vertices = Vertices() );
 
-      ~Polyline();
+      virtual ~Polyline();
 
       Polyline& operator=(const Polyline& other);
 
diff -urN papyrus-0.7.1/papyrus/rectangle.h papyrus-0.7.1.dtors/papyrus/rectangle.h
--- papyrus-0.7.1/papyrus/rectangle.h	2007-02-25 00:05:14.000000000 +0100
+++ papyrus-0.7.1.dtors/papyrus/rectangle.h	2009-01-01 11:30:16.000000000 +0100
@@ -80,7 +80,7 @@
                                         const LineStyle& outline
                                       );
 
-      ~Rectangle();
+      virtual ~Rectangle();
 
       /** Returns the width of the rectangle */
       double width();
diff -urN papyrus-0.7.1/papyrus/region.h papyrus-0.7.1.dtors/papyrus/region.h
--- papyrus-0.7.1/papyrus/region.h	2007-02-25 00:05:14.000000000 +0100
+++ papyrus-0.7.1.dtors/papyrus/region.h	2009-01-01 11:30:24.000000000 +0100
@@ -33,7 +33,7 @@
 
     Region(double x=0.0, double y=0.0, double w=0.0, double h=0.0);
 
-    ~Region();
+    virtual ~Region();
 
     double x() const;
     double y() const;
diff -urN papyrus-0.7.1/papyrus/regularpolygon.h papyrus-0.7.1.dtors/papyrus/regularpolygon.h
--- papyrus-0.7.1/papyrus/regularpolygon.h	2006-12-17 20:00:24.000000000 +0100
+++ papyrus-0.7.1.dtors/papyrus/regularpolygon.h	2009-01-01 11:30:29.000000000 +0100
@@ -79,7 +79,7 @@
 
   static RegularPolygon::pointer create(unsigned int sides=3, double radius=1.0, Style style=ZERO_RADIUS );
 
-    ~RegularPolygon();
+    virtual ~RegularPolygon();
 
     unsigned int sides();
 
diff -urN papyrus-0.7.1/papyrus/rotator.h papyrus-0.7.1.dtors/papyrus/rotator.h
--- papyrus-0.7.1/papyrus/rotator.h	2006-12-31 23:16:02.000000000 +0100
+++ papyrus-0.7.1.dtors/papyrus/rotator.h	2009-01-01 11:30:50.000000000 +0100
@@ -58,7 +58,7 @@
                                    double radian_interval = 0.0
                                   );
 
-    ~Rotator();
+    virtual ~Rotator();
 
 //     double radian_interval();
 
diff -urN papyrus-0.7.1/papyrus/scaler.h papyrus-0.7.1.dtors/papyrus/scaler.h
--- papyrus-0.7.1/papyrus/scaler.h	2007-01-01 01:32:55.000000000 +0100
+++ papyrus-0.7.1.dtors/papyrus/scaler.h	2009-01-01 11:30:57.000000000 +0100
@@ -55,7 +55,7 @@
                                       int selection_depth = 1,
                                       unsigned side = 0 );
 
-    ~Scaler();
+    virtual ~Scaler();
 
     virtual void set_selection_group( Group::pointer selection_group, bool add_drawable_only = true );
 
diff -urN papyrus-0.7.1/papyrus/sierpinski.h papyrus-0.7.1.dtors/papyrus/sierpinski.h
--- papyrus-0.7.1/papyrus/sierpinski.h	2006-12-17 20:01:02.000000000 +0100
+++ papyrus-0.7.1.dtors/papyrus/sierpinski.h	2009-01-01 11:31:10.000000000 +0100
@@ -36,7 +36,7 @@
 
     static Sierpinski::pointer create(unsigned level=0, double size=0.0);
 
-    ~Sierpinski();
+    virtual ~Sierpinski();
 
     unsigned level();
 
diff -urN papyrus-0.7.1/papyrus/text.h papyrus-0.7.1.dtors/papyrus/text.h
--- papyrus-0.7.1/papyrus/text.h	2006-12-17 20:01:29.000000000 +0100
+++ papyrus-0.7.1.dtors/papyrus/text.h	2009-01-01 11:31:21.000000000 +0100
@@ -74,7 +74,7 @@
                                    Cairo::FontWeight weight = Cairo::FONT_WEIGHT_NORMAL
                                  );
 
-      ~Text();
+      virtual ~Text();
 
       const std::string& font_family();
 
diff -urN papyrus-0.7.1/papyrus/translator.h papyrus-0.7.1.dtors/papyrus/translator.h
--- papyrus-0.7.1/papyrus/translator.h	2006-12-30 02:09:26.000000000 +0100
+++ papyrus-0.7.1.dtors/papyrus/translator.h	2009-01-01 11:31:31.000000000 +0100
@@ -54,7 +54,7 @@
                                       int selection_depth = 1,
                                       unsigned transforms = TRANSLATE_X|TRANSLATE_Y );
 
-    ~Translator();
+    virtual ~Translator();
 
     unsigned transforms();
 
diff -urN papyrus-0.7.1/papyrus/viewbox.h papyrus-0.7.1.dtors/papyrus/viewbox.h
--- papyrus-0.7.1/papyrus/viewbox.h	2007-02-25 00:05:14.000000000 +0100
+++ papyrus-0.7.1.dtors/papyrus/viewbox.h	2009-01-01 11:31:44.000000000 +0100
@@ -105,7 +105,7 @@
 
     static pointer create(const Region& region, ALIGN align=ALIGN_NONE, MEET_OR_SLICE meet_or_slice = MEET);
 
-    ~Viewbox();
+    virtual ~Viewbox();
 
     Viewbox& operator=( const Region& other );
 


Index: papyrus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/papyrus/F-9/papyrus.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- papyrus.spec	21 Dec 2008 17:30:30 -0000	1.15
+++ papyrus.spec	1 Jan 2009 11:00:53 -0000	1.16
@@ -2,7 +2,7 @@
 Summary:          Papyrus is a C++ canvas library similar to the Gnome canvas
 Name:             papyrus
 Version:          0.7.1
-Release:          4%{?dist}
+Release:          6%{?dist}
 License:          LGPLv2
 URL:              http://libpapyrus.sourceforge.net/
 Group:            System Environment/Libraries
@@ -10,6 +10,7 @@
 Patch0:           papyrus.patch
 Patch1:           papyrus-0.7.1-typedef-fixes.patch
 Patch2:           papyrus-0.7.1-valarray.patch
+Patch3:           papyrus-0.7.1-virtual-dtors.patch
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:    gtkmm24-devel >= 2.10 cairomm-devel >= 1.2 boost-devel pkgconfig m4
 
@@ -35,6 +36,7 @@
 %patch0 -p1 -b gcc43
 %patch1 -p1 -b typedef-fixes
 %patch2 -p1 -b valarray
+%patch3 -p1 -b virtual-dtors
 
 %build
 %configure --enable-static=no
@@ -72,10 +74,17 @@
 %{_datadir}/papyrusmm-0.7.1/
 
 %changelog
-* Sun Dec 21 2008 Tim Niemueller <tim at niemueller.de> - 0.7.1-4
+* Thu Jan 01 2009 Tim Niemueller <tim at niemueller.de> - 0.7.1-6
+- Make all dtors virtual to fix compile warnings (errors with -Wall -Werror)
+- Sync with F-10 version/release and changelog
+
+* Sun Dec 21 2008 Tim Niemueller <tim at niemueller.de> - 0.7.1-5
 - Header fixes for F-10
 - Drawing fixes (invalid use of std::valarray)
 
+* 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 timn at fedoraproject.org  Thu Jan  1 11:04:05 2009
From: timn at fedoraproject.org (Tim Niemueller)
Date: Thu,  1 Jan 2009 11:04:05 +0000 (UTC)
Subject: rpms/papyrus/F-8 papyrus-0.7.1-virtual-dtors.patch, NONE,
	1.1 papyrus.spec, 1.13, 1.14
Message-ID: <20090101110405.3A69C7011B@cvs1.fedora.phx.redhat.com>

Author: timn

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

Modified Files:
	papyrus.spec 
Added Files:
	papyrus-0.7.1-virtual-dtors.patch 
Log Message:
+ Added patch to fix non-virtual dtors
+ Sync to F-10 version/release and changelog

Tim


papyrus-0.7.1-virtual-dtors.patch:

--- NEW FILE papyrus-0.7.1-virtual-dtors.patch ---
diff -urN papyrus-0.7.1/papyrus/animator.h papyrus-0.7.1.dtors/papyrus/animator.h
--- papyrus-0.7.1/papyrus/animator.h	2006-12-17 19:39:55.000000000 +0100
+++ papyrus-0.7.1.dtors/papyrus/animator.h	2009-01-01 11:25:35.000000000 +0100
@@ -37,7 +37,7 @@
 
     Animator();
 
-    ~Animator();
+    virtual ~Animator();
 
     /** Advance the animation by n frames */
     virtual int advance(int n=1);
diff -urN papyrus-0.7.1/papyrus/arc.h papyrus-0.7.1.dtors/papyrus/arc.h
--- papyrus-0.7.1/papyrus/arc.h	2007-02-25 00:20:39.000000000 +0100
+++ papyrus-0.7.1.dtors/papyrus/arc.h	2009-01-01 11:25:53.000000000 +0100
@@ -87,7 +87,7 @@
                                 );
 
       /** Destructor */
-      ~Arc();
+      virtual ~Arc();
 
       /** Returns the radius of this arc */
       double radius();
diff -urN papyrus-0.7.1/papyrus/beziergon.h papyrus-0.7.1.dtors/papyrus/beziergon.h
--- papyrus-0.7.1/papyrus/beziergon.h	2006-12-17 19:36:12.000000000 +0100
+++ papyrus-0.7.1.dtors/papyrus/beziergon.h	2009-01-01 11:25:59.000000000 +0100
@@ -63,7 +63,7 @@
 
   static Beziergon::pointer create(BezierVertices vertices=BezierVertices());
 
-  ~Beziergon();
+  virtual ~Beziergon();
 
   virtual void set_line_style(const LineStyle& line_style);
 
diff -urN papyrus-0.7.1/papyrus/bezierline.h papyrus-0.7.1.dtors/papyrus/bezierline.h
--- papyrus-0.7.1/papyrus/bezierline.h	2007-01-01 21:46:00.000000000 +0100
+++ papyrus-0.7.1.dtors/papyrus/bezierline.h	2009-01-01 11:26:14.000000000 +0100
@@ -101,7 +101,7 @@
       /** Creates a polyline from a specified set of vertices */
       static Bezierline::pointer create( BezierVertices vertices = BezierVertices() );
 
-      ~Bezierline();
+      virtual ~Bezierline();
 
       Bezierline& operator=( const Bezierline& other );
 
diff -urN papyrus-0.7.1/papyrus/boxed.h papyrus-0.7.1.dtors/papyrus/boxed.h
--- papyrus-0.7.1/papyrus/boxed.h	2007-01-19 07:17:29.000000000 +0100
+++ papyrus-0.7.1.dtors/papyrus/boxed.h	2009-01-01 11:26:21.000000000 +0100
@@ -53,7 +53,7 @@
 
       static Boxed::pointer create();
 
-      ~Boxed();
+      virtual ~Boxed();
 
       Rectangle::pointer get_box();
 
diff -urN papyrus-0.7.1/papyrus/circle.h papyrus-0.7.1.dtors/papyrus/circle.h
--- papyrus-0.7.1/papyrus/circle.h	2007-02-25 00:05:14.000000000 +0100
+++ papyrus-0.7.1.dtors/papyrus/circle.h	2009-01-01 11:26:39.000000000 +0100
@@ -75,7 +75,7 @@
                                      const LineStyle& outline
                                    );
 
-      ~Circle();
+      virtual ~Circle();
 
       PAPYRUS_CLASS_NAME( "Circle" );
 
diff -urN papyrus-0.7.1/papyrus/grid.h papyrus-0.7.1.dtors/papyrus/grid.h
--- papyrus-0.7.1/papyrus/grid.h	2007-02-25 00:05:14.000000000 +0100
+++ papyrus-0.7.1.dtors/papyrus/grid.h	2009-01-01 11:28:25.000000000 +0100
@@ -42,7 +42,7 @@
       static pointer create(double xmin=-infinity, double xmax=infinity,
                             double ymin=-infinity, double ymax=infinity);
 
-      ~Grid();
+      virtual ~Grid();
 
       double x_min();
 
diff -urN papyrus-0.7.1/papyrus/hilbert.h papyrus-0.7.1.dtors/papyrus/hilbert.h
--- papyrus-0.7.1/papyrus/hilbert.h	2006-12-17 19:57:46.000000000 +0100
+++ papyrus-0.7.1.dtors/papyrus/hilbert.h	2009-01-01 11:28:47.000000000 +0100
@@ -36,7 +36,7 @@
 
     static Hilbert::pointer create(unsigned level=0, double size=0);
 
-    ~Hilbert();
+    virtual ~Hilbert();
 
     unsigned level();
 
diff -urN papyrus-0.7.1/papyrus/image.h papyrus-0.7.1.dtors/papyrus/image.h
--- papyrus-0.7.1/papyrus/image.h	2007-02-25 00:05:14.000000000 +0100
+++ papyrus-0.7.1.dtors/papyrus/image.h	2009-01-01 11:29:08.000000000 +0100
@@ -74,7 +74,7 @@
       static Image::pointer create ( Cairo::RefPtr<Cairo::ImageSurface> img );
 
       /** Destructor */
-      ~Image();
+      virtual ~Image();
 
       std::string filename() const;
 
diff -urN papyrus-0.7.1/papyrus/kochcurve.h papyrus-0.7.1.dtors/papyrus/kochcurve.h
--- papyrus-0.7.1/papyrus/kochcurve.h	2006-12-17 19:58:34.000000000 +0100
+++ papyrus-0.7.1.dtors/papyrus/kochcurve.h	2009-01-01 11:29:19.000000000 +0100
@@ -36,7 +36,7 @@
 
     static KochCurve::pointer create(unsigned level=0, double size=0.0);
 
-    ~KochCurve();
+    virtual ~KochCurve();
 
     unsigned level();
 
diff -urN papyrus-0.7.1/papyrus/kochsnowflake.h papyrus-0.7.1.dtors/papyrus/kochsnowflake.h
--- papyrus-0.7.1/papyrus/kochsnowflake.h	2006-12-17 19:58:51.000000000 +0100
+++ papyrus-0.7.1.dtors/papyrus/kochsnowflake.h	2009-01-01 11:29:30.000000000 +0100
@@ -36,7 +36,7 @@
 
     static KochSnowflake::pointer create(unsigned level=0, double size=0.0);
 
-    ~KochSnowflake();
+    virtual ~KochSnowflake();
 
     unsigned level();
 
diff -urN papyrus-0.7.1/papyrus/linestyle.h papyrus-0.7.1.dtors/papyrus/linestyle.h
--- papyrus-0.7.1/papyrus/linestyle.h	2007-02-25 00:05:14.000000000 +0100
+++ papyrus-0.7.1.dtors/papyrus/linestyle.h	2009-01-01 11:29:43.000000000 +0100
@@ -47,7 +47,7 @@
                  Cairo::LineJoin join
                );
 
-      ~LineStyle();
+      virtual ~LineStyle();
 
       LineStyle& operator=( const LineStyle& other );
 
diff -urN papyrus-0.7.1/papyrus/marker.h papyrus-0.7.1.dtors/papyrus/marker.h
--- papyrus-0.7.1/papyrus/marker.h	2006-12-17 19:59:19.000000000 +0100
+++ papyrus-0.7.1.dtors/papyrus/marker.h	2009-01-01 11:29:53.000000000 +0100
@@ -71,7 +71,7 @@
       static Marker::pointer create( STYLE style=NONE, double width = 20.0, double height = 20.0, FACING facing = RIGHT );
 
       /** Destructor */
-      ~Marker();
+      virtual ~Marker();
 
       /** @return marker style */
       STYLE style() const;
diff -urN papyrus-0.7.1/papyrus/polygon.h papyrus-0.7.1.dtors/papyrus/polygon.h
--- papyrus-0.7.1/papyrus/polygon.h	2006-12-17 19:59:38.000000000 +0100
+++ papyrus-0.7.1.dtors/papyrus/polygon.h	2009-01-01 11:30:06.000000000 +0100
@@ -65,7 +65,7 @@
 
   static Polygon::pointer create(Vertices vertices=Vertices());
 
-  ~Polygon();
+  virtual ~Polygon();
 
   virtual void set_line_style(const LineStyle& line_style);
 
diff -urN papyrus-0.7.1/papyrus/polyline.h papyrus-0.7.1.dtors/papyrus/polyline.h
--- papyrus-0.7.1/papyrus/polyline.h	2006-12-17 19:59:55.000000000 +0100
+++ papyrus-0.7.1.dtors/papyrus/polyline.h	2009-01-01 11:30:12.000000000 +0100
@@ -92,7 +92,7 @@
       /** Creates a polyline from a specified set of vertices */
       static Polyline::pointer create( Vertices vertices = Vertices() );
 
-      ~Polyline();
+      virtual ~Polyline();
 
       Polyline& operator=(const Polyline& other);
 
diff -urN papyrus-0.7.1/papyrus/rectangle.h papyrus-0.7.1.dtors/papyrus/rectangle.h
--- papyrus-0.7.1/papyrus/rectangle.h	2007-02-25 00:05:14.000000000 +0100
+++ papyrus-0.7.1.dtors/papyrus/rectangle.h	2009-01-01 11:30:16.000000000 +0100
@@ -80,7 +80,7 @@
                                         const LineStyle& outline
                                       );
 
-      ~Rectangle();
+      virtual ~Rectangle();
 
       /** Returns the width of the rectangle */
       double width();
diff -urN papyrus-0.7.1/papyrus/region.h papyrus-0.7.1.dtors/papyrus/region.h
--- papyrus-0.7.1/papyrus/region.h	2007-02-25 00:05:14.000000000 +0100
+++ papyrus-0.7.1.dtors/papyrus/region.h	2009-01-01 11:30:24.000000000 +0100
@@ -33,7 +33,7 @@
 
     Region(double x=0.0, double y=0.0, double w=0.0, double h=0.0);
 
-    ~Region();
+    virtual ~Region();
 
     double x() const;
     double y() const;
diff -urN papyrus-0.7.1/papyrus/regularpolygon.h papyrus-0.7.1.dtors/papyrus/regularpolygon.h
--- papyrus-0.7.1/papyrus/regularpolygon.h	2006-12-17 20:00:24.000000000 +0100
+++ papyrus-0.7.1.dtors/papyrus/regularpolygon.h	2009-01-01 11:30:29.000000000 +0100
@@ -79,7 +79,7 @@
 
   static RegularPolygon::pointer create(unsigned int sides=3, double radius=1.0, Style style=ZERO_RADIUS );
 
-    ~RegularPolygon();
+    virtual ~RegularPolygon();
 
     unsigned int sides();
 
diff -urN papyrus-0.7.1/papyrus/rotator.h papyrus-0.7.1.dtors/papyrus/rotator.h
--- papyrus-0.7.1/papyrus/rotator.h	2006-12-31 23:16:02.000000000 +0100
+++ papyrus-0.7.1.dtors/papyrus/rotator.h	2009-01-01 11:30:50.000000000 +0100
@@ -58,7 +58,7 @@
                                    double radian_interval = 0.0
                                   );
 
-    ~Rotator();
+    virtual ~Rotator();
 
 //     double radian_interval();
 
diff -urN papyrus-0.7.1/papyrus/scaler.h papyrus-0.7.1.dtors/papyrus/scaler.h
--- papyrus-0.7.1/papyrus/scaler.h	2007-01-01 01:32:55.000000000 +0100
+++ papyrus-0.7.1.dtors/papyrus/scaler.h	2009-01-01 11:30:57.000000000 +0100
@@ -55,7 +55,7 @@
                                       int selection_depth = 1,
                                       unsigned side = 0 );
 
-    ~Scaler();
+    virtual ~Scaler();
 
     virtual void set_selection_group( Group::pointer selection_group, bool add_drawable_only = true );
 
diff -urN papyrus-0.7.1/papyrus/sierpinski.h papyrus-0.7.1.dtors/papyrus/sierpinski.h
--- papyrus-0.7.1/papyrus/sierpinski.h	2006-12-17 20:01:02.000000000 +0100
+++ papyrus-0.7.1.dtors/papyrus/sierpinski.h	2009-01-01 11:31:10.000000000 +0100
@@ -36,7 +36,7 @@
 
     static Sierpinski::pointer create(unsigned level=0, double size=0.0);
 
-    ~Sierpinski();
+    virtual ~Sierpinski();
 
     unsigned level();
 
diff -urN papyrus-0.7.1/papyrus/text.h papyrus-0.7.1.dtors/papyrus/text.h
--- papyrus-0.7.1/papyrus/text.h	2006-12-17 20:01:29.000000000 +0100
+++ papyrus-0.7.1.dtors/papyrus/text.h	2009-01-01 11:31:21.000000000 +0100
@@ -74,7 +74,7 @@
                                    Cairo::FontWeight weight = Cairo::FONT_WEIGHT_NORMAL
                                  );
 
-      ~Text();
+      virtual ~Text();
 
       const std::string& font_family();
 
diff -urN papyrus-0.7.1/papyrus/translator.h papyrus-0.7.1.dtors/papyrus/translator.h
--- papyrus-0.7.1/papyrus/translator.h	2006-12-30 02:09:26.000000000 +0100
+++ papyrus-0.7.1.dtors/papyrus/translator.h	2009-01-01 11:31:31.000000000 +0100
@@ -54,7 +54,7 @@
                                       int selection_depth = 1,
                                       unsigned transforms = TRANSLATE_X|TRANSLATE_Y );
 
-    ~Translator();
+    virtual ~Translator();
 
     unsigned transforms();
 
diff -urN papyrus-0.7.1/papyrus/viewbox.h papyrus-0.7.1.dtors/papyrus/viewbox.h
--- papyrus-0.7.1/papyrus/viewbox.h	2007-02-25 00:05:14.000000000 +0100
+++ papyrus-0.7.1.dtors/papyrus/viewbox.h	2009-01-01 11:31:44.000000000 +0100
@@ -105,7 +105,7 @@
 
     static pointer create(const Region& region, ALIGN align=ALIGN_NONE, MEET_OR_SLICE meet_or_slice = MEET);
 
-    ~Viewbox();
+    virtual ~Viewbox();
 
     Viewbox& operator=( const Region& other );
 


Index: papyrus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/papyrus/F-8/papyrus.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- papyrus.spec	21 Dec 2008 17:26:09 -0000	1.13
+++ papyrus.spec	1 Jan 2009 11:03:34 -0000	1.14
@@ -2,7 +2,7 @@
 Summary:          Papyrus is a C++ canvas library similar to the Gnome canvas
 Name:             papyrus
 Version:          0.7.1
-Release:          4%{?dist}
+Release:          6%{?dist}
 License:          LGPLv2
 URL:              http://libpapyrus.sourceforge.net/
 Group:            System Environment/Libraries
@@ -10,6 +10,7 @@
 Patch0:           papyrus.patch
 Patch1:           papyrus-0.7.1-typedef-fixes.patch
 Patch2:           papyrus-0.7.1-valarray.patch
+Patch3:           papyrus-0.7.1-virtual-dtors.patch
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:    gtkmm24-devel >= 2.10 cairomm-devel >= 1.2 boost-devel pkgconfig m4
 
@@ -35,6 +36,7 @@
 %patch0 -p1 -b gcc43
 %patch1 -p1 -b typedef-fixes
 %patch2 -p1 -b valarray
+%patch3 -p1 -b virtual-dtors
 
 %build
 %configure --enable-static=no
@@ -72,10 +74,17 @@
 %{_datadir}/papyrusmm-0.7.1/
 
 %changelog
-* Sun Dec 21 2008 Tim Niemueller <tim at niemueller.de> - 0.7.1-4
+* Thu Jan 01 2009 Tim Niemueller <tim at niemueller.de> - 0.7.1-6
+- Make all dtors virtual to fix compile warnings (errors with -Wall -Werror)
+- Sync with F-10 version/release and changelog
+
+* Sun Dec 21 2008 Tim Niemueller <tim at niemueller.de> - 0.7.1-5
 - Header fixes for F-10
 - Drawing fixes (invalid use of std::valarray)
 
+* 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 thias at fedoraproject.org  Thu Jan  1 11:06:27 2009
From: thias at fedoraproject.org (Matthias Saou)
Date: Thu,  1 Jan 2009 11:06:27 +0000 (UTC)
Subject: rpms/python-twisted-web2/devel python-twisted-web2.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090101110627.B41B67011B@cvs1.fedora.phx.redhat.com>

Author: thias

Update of /cvs/extras/rpms/python-twisted-web2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22137

Modified Files:
	.cvsignore sources 
Added Files:
	python-twisted-web2.spec 
Log Message:
Initial import of 8.1.0.



--- NEW FILE python-twisted-web2.spec ---
%{!?python:%define python python}
%{!?python_sitearch: %define python_sitearch %(%{python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}

Summary: Experimental Twisted Web Server Framework
Name: %{python}-twisted-web2
Version: 8.1.0
Release: 5%{?dist}
License: MIT
Group: Development/Libraries
URL: http://twistedmatrix.com/trac/wiki/TwistedWeb2
Source: http://tmrc.mit.edu/mirror/twisted/Web2/8.1/TwistedWeb2-%{version}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
Requires: %{python}-twisted-core >= 8.1.0
BuildRequires: %{python}-twisted-core >= 8.1.0
BuildRequires: %{python}-devel
# Files are noarch, but we need to install in sitearch for things to work, as
# all the rest of Twisted is in sitearch
#BuildArch: noarch
# Because of the above, disable generating an empty debuginfo package
%define debug_package %{nil}

%description
Twisted.Web2 is an experimental web server built with Twisted. Useful Web2
functionality will be backported to TwistedWeb until TwistedWeb is as
featureful as Web2, then Web2 will be abandoned. 


%prep
%setup -q -n TwistedWeb2-%{version}


%build
%{python} setup.py build


%install
%{__rm} -rf %{buildroot}
%{python} setup.py install \
    -O1 --skip-build --root %{buildroot} \
    --install-purelib %{python_sitearch}
# See if there's any egg-info
if [ -f %{buildroot}%{python_sitearch}/Twisted*.egg-info ]; then
    echo %{buildroot}%{python_sitearch}/Twisted*.egg-info |
        %{__sed} -e 's|^%{buildroot}||'
fi > egg-info


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


%post
if [ -x %{_libexecdir}/twisted-dropin-cache ]; then
    %{_libexecdir}/twisted-dropin-cache || :
fi

%postun
if [ -x %{_libexecdir}/twisted-dropin-cache ]; then
    %{_libexecdir}/twisted-dropin-cache || :
fi


%files -f egg-info
%defattr(-,root,root,-)
%doc LICENSE NEWS README doc/*
%{python_sitearch}/twisted/plugins/twisted_web2.py*
%{python_sitearch}/twisted/web2/


%changelog
* Tue Dec 23 2008 Matthias Saou <http://freshrpms.net/> 8.1.0-5
- Introduce python macro for parallel installable versions.
- Add calls to twisted-dropin-cache and make sure they don't ever fail.
- Minor spec file updates.

* Tue Aug 19 2008 Matthias Saou <http://freshrpms.net/> 8.1.0-4
- Use --install-purelib option instead of manually moving the installed files.
- Fix description.
- Include doc/ directory, although it would fit best in a "devel" package.
- Require python-twisted-core >= 8.1.0 to get ServiceMaker.

* Wed Jul 30 2008 Matthias Saou <http://freshrpms.net/> 8.1.0-2
- Update to 8.1.0 again, as the downgrade didn't fix the problem.

* Wed Jul 16 2008 Matthias Saou <http://freshrpms.net/> 0.2.0-2
- Downgrade to 0.2.0 as elisa doesn't work with 8.1.0.
- Include Debian's patch, as it changes quite a bit of code.

* Tue Jul 15 2008 Matthias Saou <http://freshrpms.net/> 8.1.0-0.1
- Initial RPM release.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-twisted-web2/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	31 Dec 2008 05:51:11 -0000	1.1
+++ .cvsignore	1 Jan 2009 11:05:56 -0000	1.2
@@ -0,0 +1 @@
+TwistedWeb2-8.1.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-twisted-web2/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	31 Dec 2008 05:51:11 -0000	1.1
+++ sources	1 Jan 2009 11:05:56 -0000	1.2
@@ -0,0 +1 @@
+e34b48edf6fef075bd41ddbd215aed32  TwistedWeb2-8.1.0.tar.bz2



From timn at fedoraproject.org  Thu Jan  1 11:09:43 2009
From: timn at fedoraproject.org (Tim Niemueller)
Date: Thu,  1 Jan 2009 11:09:43 +0000 (UTC)
Subject: rpms/papyrus/devel papyrus-0.7.1-typedef-fixes.patch, NONE,
	1.1 papyrus-0.7.1-valarray.patch, NONE,
	1.1 papyrus-0.7.1-virtual-dtors.patch, NONE, 1.1 papyrus.spec,
	1.15, 1.16
Message-ID: <20090101110943.18A5D7011B@cvs1.fedora.phx.redhat.com>

Author: timn

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

Modified Files:
	papyrus.spec 
Added Files:
	papyrus-0.7.1-typedef-fixes.patch papyrus-0.7.1-valarray.patch 
	papyrus-0.7.1-virtual-dtors.patch 
Log Message:
Sync to latest patches in F-10 branch

Tim


papyrus-0.7.1-typedef-fixes.patch:

--- NEW FILE papyrus-0.7.1-typedef-fixes.patch ---
diff -urN papyrus-0.7.1/papyrus/event.h papyrus-0.7.1.fixed/papyrus/event.h
--- papyrus-0.7.1/papyrus/event.h	2006-08-31 06:20:39.000000000 +0200
+++ papyrus-0.7.1.fixed/papyrus/event.h	2008-12-15 15:19:30.000000000 +0100
@@ -23,7 +23,7 @@
 
 namespace Event {
 
-  typedef enum Type {
+  typedef enum {
     BUTTON_PRESS,
     BUTTON_RELEASE,
     BUTTON_DOUBLE_PRESS,
@@ -39,10 +39,10 @@
     SCROLL_DOWN,
     SCROLL_LEFT,
     SCROLL_RIGHT,
-  };
+  } ScrollDirection;
 
   // These are taken straight from GDK
-  typedef enum ModifierType
+  typedef enum
   {
     SHIFT_MASK    = 1 << 0,
     LOCK_MASK     = 1 << 1,
diff -urN papyrus-0.7.1/papyrus/marker.h papyrus-0.7.1.fixed/papyrus/marker.h
--- papyrus-0.7.1/papyrus/marker.h	2006-12-17 19:59:19.000000000 +0100
+++ papyrus-0.7.1.fixed/papyrus/marker.h	2008-12-15 15:18:18.000000000 +0100
@@ -31,7 +31,7 @@
    */
   class Marker : public Shape {
     public:
-      typedef enum STYLE {
+      typedef enum {
         NONE,
         LINES,
         TRIANGLE,
@@ -55,12 +55,12 @@
         ROUND,
         OPEN_ROUND,
         BACKSLASH,
-    };
+    } STYLE;
 
-      typedef enum FACING {
+      typedef enum {
         LEFT,
         RIGHT
-    };
+    } FACING;
 
       typedef PapyrusSmartPointer<Marker> pointer;
 
diff -urN papyrus-0.7.1/papyrus/regularpolygon.h papyrus-0.7.1.fixed/papyrus/regularpolygon.h
--- papyrus-0.7.1/papyrus/regularpolygon.h	2006-12-17 20:00:24.000000000 +0100
+++ papyrus-0.7.1.fixed/papyrus/regularpolygon.h	2008-12-15 15:18:37.000000000 +0100
@@ -73,7 +73,7 @@
 public:
   typedef PapyrusSmartPointer<RegularPolygon> pointer;
 
-  typedef enum Style {ZERO_RADIUS, ZERO_APOTHEM};
+  typedef enum {ZERO_RADIUS, ZERO_APOTHEM} Style;
 
     RegularPolygon(unsigned int sides=3, double radius=1.0, Style style=ZERO_RADIUS);
 

papyrus-0.7.1-valarray.patch:

--- NEW FILE papyrus-0.7.1-valarray.patch ---
diff -urN papyrus-0.7.1/papyrus/linestyle.cpp papyrus-0.7.1.valarray/papyrus/linestyle.cpp
--- papyrus-0.7.1/papyrus/linestyle.cpp	2007-02-25 00:05:14.000000000 +0100
+++ papyrus-0.7.1.valarray/papyrus/linestyle.cpp	2008-12-21 16:04:03.000000000 +0100
@@ -58,6 +58,7 @@
     m_cap = other.m_cap;
     m_join = other.m_join;
     m_miter_limit = other.m_miter_limit;
+    m_dash_array.resize(other.m_dash_array.size());
     m_dash_array = other.m_dash_array;
     m_dash_offset = other.m_dash_offset;
 
@@ -98,6 +99,7 @@
 
   void LineStyle::set_dash ( const std::valarray< double > dashes, double offset )
   {
+    m_dash_array.resize(dashes.size());
     m_dash_array = dashes;
     m_dash_offset = offset;
     m_signal_dash.emit();

papyrus-0.7.1-virtual-dtors.patch:

--- NEW FILE papyrus-0.7.1-virtual-dtors.patch ---
diff -urN papyrus-0.7.1/papyrus/animator.h papyrus-0.7.1.dtors/papyrus/animator.h
--- papyrus-0.7.1/papyrus/animator.h	2006-12-17 19:39:55.000000000 +0100
+++ papyrus-0.7.1.dtors/papyrus/animator.h	2009-01-01 11:25:35.000000000 +0100
@@ -37,7 +37,7 @@
 
     Animator();
 
-    ~Animator();
+    virtual ~Animator();
 
     /** Advance the animation by n frames */
     virtual int advance(int n=1);
diff -urN papyrus-0.7.1/papyrus/arc.h papyrus-0.7.1.dtors/papyrus/arc.h
--- papyrus-0.7.1/papyrus/arc.h	2007-02-25 00:20:39.000000000 +0100
+++ papyrus-0.7.1.dtors/papyrus/arc.h	2009-01-01 11:25:53.000000000 +0100
@@ -87,7 +87,7 @@
                                 );
 
       /** Destructor */
-      ~Arc();
+      virtual ~Arc();
 
       /** Returns the radius of this arc */
       double radius();
diff -urN papyrus-0.7.1/papyrus/beziergon.h papyrus-0.7.1.dtors/papyrus/beziergon.h
--- papyrus-0.7.1/papyrus/beziergon.h	2006-12-17 19:36:12.000000000 +0100
+++ papyrus-0.7.1.dtors/papyrus/beziergon.h	2009-01-01 11:25:59.000000000 +0100
@@ -63,7 +63,7 @@
 
   static Beziergon::pointer create(BezierVertices vertices=BezierVertices());
 
-  ~Beziergon();
+  virtual ~Beziergon();
 
   virtual void set_line_style(const LineStyle& line_style);
 
diff -urN papyrus-0.7.1/papyrus/bezierline.h papyrus-0.7.1.dtors/papyrus/bezierline.h
--- papyrus-0.7.1/papyrus/bezierline.h	2007-01-01 21:46:00.000000000 +0100
+++ papyrus-0.7.1.dtors/papyrus/bezierline.h	2009-01-01 11:26:14.000000000 +0100
@@ -101,7 +101,7 @@
       /** Creates a polyline from a specified set of vertices */
       static Bezierline::pointer create( BezierVertices vertices = BezierVertices() );
 
-      ~Bezierline();
+      virtual ~Bezierline();
 
       Bezierline& operator=( const Bezierline& other );
 
diff -urN papyrus-0.7.1/papyrus/boxed.h papyrus-0.7.1.dtors/papyrus/boxed.h
--- papyrus-0.7.1/papyrus/boxed.h	2007-01-19 07:17:29.000000000 +0100
+++ papyrus-0.7.1.dtors/papyrus/boxed.h	2009-01-01 11:26:21.000000000 +0100
@@ -53,7 +53,7 @@
 
       static Boxed::pointer create();
 
-      ~Boxed();
+      virtual ~Boxed();
 
       Rectangle::pointer get_box();
 
diff -urN papyrus-0.7.1/papyrus/circle.h papyrus-0.7.1.dtors/papyrus/circle.h
--- papyrus-0.7.1/papyrus/circle.h	2007-02-25 00:05:14.000000000 +0100
+++ papyrus-0.7.1.dtors/papyrus/circle.h	2009-01-01 11:26:39.000000000 +0100
@@ -75,7 +75,7 @@
                                      const LineStyle& outline
                                    );
 
-      ~Circle();
+      virtual ~Circle();
 
       PAPYRUS_CLASS_NAME( "Circle" );
 
diff -urN papyrus-0.7.1/papyrus/grid.h papyrus-0.7.1.dtors/papyrus/grid.h
--- papyrus-0.7.1/papyrus/grid.h	2007-02-25 00:05:14.000000000 +0100
+++ papyrus-0.7.1.dtors/papyrus/grid.h	2009-01-01 11:28:25.000000000 +0100
@@ -42,7 +42,7 @@
       static pointer create(double xmin=-infinity, double xmax=infinity,
                             double ymin=-infinity, double ymax=infinity);
 
-      ~Grid();
+      virtual ~Grid();
 
       double x_min();
 
diff -urN papyrus-0.7.1/papyrus/hilbert.h papyrus-0.7.1.dtors/papyrus/hilbert.h
--- papyrus-0.7.1/papyrus/hilbert.h	2006-12-17 19:57:46.000000000 +0100
+++ papyrus-0.7.1.dtors/papyrus/hilbert.h	2009-01-01 11:28:47.000000000 +0100
@@ -36,7 +36,7 @@
 
     static Hilbert::pointer create(unsigned level=0, double size=0);
 
-    ~Hilbert();
+    virtual ~Hilbert();
 
     unsigned level();
 
diff -urN papyrus-0.7.1/papyrus/image.h papyrus-0.7.1.dtors/papyrus/image.h
--- papyrus-0.7.1/papyrus/image.h	2007-02-25 00:05:14.000000000 +0100
+++ papyrus-0.7.1.dtors/papyrus/image.h	2009-01-01 11:29:08.000000000 +0100
@@ -74,7 +74,7 @@
       static Image::pointer create ( Cairo::RefPtr<Cairo::ImageSurface> img );
 
       /** Destructor */
-      ~Image();
+      virtual ~Image();
 
       std::string filename() const;
 
diff -urN papyrus-0.7.1/papyrus/kochcurve.h papyrus-0.7.1.dtors/papyrus/kochcurve.h
--- papyrus-0.7.1/papyrus/kochcurve.h	2006-12-17 19:58:34.000000000 +0100
+++ papyrus-0.7.1.dtors/papyrus/kochcurve.h	2009-01-01 11:29:19.000000000 +0100
@@ -36,7 +36,7 @@
 
     static KochCurve::pointer create(unsigned level=0, double size=0.0);
 
-    ~KochCurve();
+    virtual ~KochCurve();
 
     unsigned level();
 
diff -urN papyrus-0.7.1/papyrus/kochsnowflake.h papyrus-0.7.1.dtors/papyrus/kochsnowflake.h
--- papyrus-0.7.1/papyrus/kochsnowflake.h	2006-12-17 19:58:51.000000000 +0100
+++ papyrus-0.7.1.dtors/papyrus/kochsnowflake.h	2009-01-01 11:29:30.000000000 +0100
@@ -36,7 +36,7 @@
 
     static KochSnowflake::pointer create(unsigned level=0, double size=0.0);
 
-    ~KochSnowflake();
+    virtual ~KochSnowflake();
 
     unsigned level();
 
diff -urN papyrus-0.7.1/papyrus/linestyle.h papyrus-0.7.1.dtors/papyrus/linestyle.h
--- papyrus-0.7.1/papyrus/linestyle.h	2007-02-25 00:05:14.000000000 +0100
+++ papyrus-0.7.1.dtors/papyrus/linestyle.h	2009-01-01 11:29:43.000000000 +0100
@@ -47,7 +47,7 @@
                  Cairo::LineJoin join
                );
 
-      ~LineStyle();
+      virtual ~LineStyle();
 
       LineStyle& operator=( const LineStyle& other );
 
diff -urN papyrus-0.7.1/papyrus/marker.h papyrus-0.7.1.dtors/papyrus/marker.h
--- papyrus-0.7.1/papyrus/marker.h	2006-12-17 19:59:19.000000000 +0100
+++ papyrus-0.7.1.dtors/papyrus/marker.h	2009-01-01 11:29:53.000000000 +0100
@@ -71,7 +71,7 @@
       static Marker::pointer create( STYLE style=NONE, double width = 20.0, double height = 20.0, FACING facing = RIGHT );
 
       /** Destructor */
-      ~Marker();
+      virtual ~Marker();
 
       /** @return marker style */
       STYLE style() const;
diff -urN papyrus-0.7.1/papyrus/polygon.h papyrus-0.7.1.dtors/papyrus/polygon.h
--- papyrus-0.7.1/papyrus/polygon.h	2006-12-17 19:59:38.000000000 +0100
+++ papyrus-0.7.1.dtors/papyrus/polygon.h	2009-01-01 11:30:06.000000000 +0100
@@ -65,7 +65,7 @@
 
   static Polygon::pointer create(Vertices vertices=Vertices());
 
-  ~Polygon();
+  virtual ~Polygon();
 
   virtual void set_line_style(const LineStyle& line_style);
 
diff -urN papyrus-0.7.1/papyrus/polyline.h papyrus-0.7.1.dtors/papyrus/polyline.h
--- papyrus-0.7.1/papyrus/polyline.h	2006-12-17 19:59:55.000000000 +0100
+++ papyrus-0.7.1.dtors/papyrus/polyline.h	2009-01-01 11:30:12.000000000 +0100
@@ -92,7 +92,7 @@
       /** Creates a polyline from a specified set of vertices */
       static Polyline::pointer create( Vertices vertices = Vertices() );
 
-      ~Polyline();
+      virtual ~Polyline();
 
       Polyline& operator=(const Polyline& other);
 
diff -urN papyrus-0.7.1/papyrus/rectangle.h papyrus-0.7.1.dtors/papyrus/rectangle.h
--- papyrus-0.7.1/papyrus/rectangle.h	2007-02-25 00:05:14.000000000 +0100
+++ papyrus-0.7.1.dtors/papyrus/rectangle.h	2009-01-01 11:30:16.000000000 +0100
@@ -80,7 +80,7 @@
                                         const LineStyle& outline
                                       );
 
-      ~Rectangle();
+      virtual ~Rectangle();
 
       /** Returns the width of the rectangle */
       double width();
diff -urN papyrus-0.7.1/papyrus/region.h papyrus-0.7.1.dtors/papyrus/region.h
--- papyrus-0.7.1/papyrus/region.h	2007-02-25 00:05:14.000000000 +0100
+++ papyrus-0.7.1.dtors/papyrus/region.h	2009-01-01 11:30:24.000000000 +0100
@@ -33,7 +33,7 @@
 
     Region(double x=0.0, double y=0.0, double w=0.0, double h=0.0);
 
-    ~Region();
+    virtual ~Region();
 
     double x() const;
     double y() const;
diff -urN papyrus-0.7.1/papyrus/regularpolygon.h papyrus-0.7.1.dtors/papyrus/regularpolygon.h
--- papyrus-0.7.1/papyrus/regularpolygon.h	2006-12-17 20:00:24.000000000 +0100
+++ papyrus-0.7.1.dtors/papyrus/regularpolygon.h	2009-01-01 11:30:29.000000000 +0100
@@ -79,7 +79,7 @@
 
   static RegularPolygon::pointer create(unsigned int sides=3, double radius=1.0, Style style=ZERO_RADIUS );
 
-    ~RegularPolygon();
+    virtual ~RegularPolygon();
 
     unsigned int sides();
 
diff -urN papyrus-0.7.1/papyrus/rotator.h papyrus-0.7.1.dtors/papyrus/rotator.h
--- papyrus-0.7.1/papyrus/rotator.h	2006-12-31 23:16:02.000000000 +0100
+++ papyrus-0.7.1.dtors/papyrus/rotator.h	2009-01-01 11:30:50.000000000 +0100
@@ -58,7 +58,7 @@
                                    double radian_interval = 0.0
                                   );
 
-    ~Rotator();
+    virtual ~Rotator();
 
 //     double radian_interval();
 
diff -urN papyrus-0.7.1/papyrus/scaler.h papyrus-0.7.1.dtors/papyrus/scaler.h
--- papyrus-0.7.1/papyrus/scaler.h	2007-01-01 01:32:55.000000000 +0100
+++ papyrus-0.7.1.dtors/papyrus/scaler.h	2009-01-01 11:30:57.000000000 +0100
@@ -55,7 +55,7 @@
                                       int selection_depth = 1,
                                       unsigned side = 0 );
 
-    ~Scaler();
+    virtual ~Scaler();
 
     virtual void set_selection_group( Group::pointer selection_group, bool add_drawable_only = true );
 
diff -urN papyrus-0.7.1/papyrus/sierpinski.h papyrus-0.7.1.dtors/papyrus/sierpinski.h
--- papyrus-0.7.1/papyrus/sierpinski.h	2006-12-17 20:01:02.000000000 +0100
+++ papyrus-0.7.1.dtors/papyrus/sierpinski.h	2009-01-01 11:31:10.000000000 +0100
@@ -36,7 +36,7 @@
 
     static Sierpinski::pointer create(unsigned level=0, double size=0.0);
 
-    ~Sierpinski();
+    virtual ~Sierpinski();
 
     unsigned level();
 
diff -urN papyrus-0.7.1/papyrus/text.h papyrus-0.7.1.dtors/papyrus/text.h
--- papyrus-0.7.1/papyrus/text.h	2006-12-17 20:01:29.000000000 +0100
+++ papyrus-0.7.1.dtors/papyrus/text.h	2009-01-01 11:31:21.000000000 +0100
@@ -74,7 +74,7 @@
                                    Cairo::FontWeight weight = Cairo::FONT_WEIGHT_NORMAL
                                  );
 
-      ~Text();
+      virtual ~Text();
 
       const std::string& font_family();
 
diff -urN papyrus-0.7.1/papyrus/translator.h papyrus-0.7.1.dtors/papyrus/translator.h
--- papyrus-0.7.1/papyrus/translator.h	2006-12-30 02:09:26.000000000 +0100
+++ papyrus-0.7.1.dtors/papyrus/translator.h	2009-01-01 11:31:31.000000000 +0100
@@ -54,7 +54,7 @@
                                       int selection_depth = 1,
                                       unsigned transforms = TRANSLATE_X|TRANSLATE_Y );
 
-    ~Translator();
+    virtual ~Translator();
 
     unsigned transforms();
 
diff -urN papyrus-0.7.1/papyrus/viewbox.h papyrus-0.7.1.dtors/papyrus/viewbox.h
--- papyrus-0.7.1/papyrus/viewbox.h	2007-02-25 00:05:14.000000000 +0100
+++ papyrus-0.7.1.dtors/papyrus/viewbox.h	2009-01-01 11:31:44.000000000 +0100
@@ -105,7 +105,7 @@
 
     static pointer create(const Region& region, ALIGN align=ALIGN_NONE, MEET_OR_SLICE meet_or_slice = MEET);
 
-    ~Viewbox();
+    virtual ~Viewbox();
 
     Viewbox& operator=( const Region& other );
 


Index: papyrus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/papyrus/devel/papyrus.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- papyrus.spec	21 Sep 2008 08:53:28 -0000	1.15
+++ papyrus.spec	1 Jan 2009 11:09:11 -0000	1.16
@@ -2,12 +2,15 @@
 Summary:          Papyrus is a C++ canvas library similar to the Gnome canvas
 Name:             papyrus
 Version:          0.7.1
-Release:          4%{?dist}
+Release:          6%{?dist}
 License:          LGPLv2
 URL:              http://libpapyrus.sourceforge.net/
 Group:            System Environment/Libraries
 Source:           http://download.sourceforge.net/libpapyrus/%{name}-%{version}.tar.bz2
 Patch0:           papyrus.patch
+Patch1:           papyrus-0.7.1-typedef-fixes.patch
+Patch2:           papyrus-0.7.1-valarray.patch
+Patch3:           papyrus-0.7.1-virtual-dtors.patch
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:    gtkmm24-devel >= 2.10 cairomm-devel >= 1.2 boost-devel pkgconfig m4
 
@@ -30,7 +33,10 @@
 
 %prep
 %setup -q
-%patch0 -p1
+%patch0 -p1 -b gcc43
+%patch1 -p1 -b typedef-fixes
+%patch2 -p1 -b valarray
+%patch3 -p1 -b virtual-dtors
 
 %build
 %configure --enable-static=no
@@ -68,6 +74,13 @@
 %{_datadir}/papyrusmm-0.7.1/
 
 %changelog
+* Thu Jan 01 2009 Tim Niemueller <tim at niemueller.de> - 0.7.1-6
+- Make all dtors virtual to fix compile warnings (errors with -Wall -Werror)
+
+* Sun Dec 21 2008 Tim Niemueller <tim at niemueller.de> - 0.7.1-5
+- Header fixes for F-10
+- Drawing fixes (invalid use of std::valarray)
+
 * Sun Sep 21 2008 Ville Skytt?? <ville.skytta at iki.fi> - 0.7.1-4
 - Fix Patch0:/%%patch mismatch.
 



From thias at fedoraproject.org  Thu Jan  1 11:18:56 2009
From: thias at fedoraproject.org (Matthias Saou)
Date: Thu,  1 Jan 2009 11:18:56 +0000 (UTC)
Subject: rpms/python-twisted-web2/F-10 python-twisted-web2.spec, NONE,
	1.1 twisted-web2_0.2.0-1.1.diff, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090101111856.401907013F@cvs1.fedora.phx.redhat.com>

Author: thias

Update of /cvs/extras/rpms/python-twisted-web2/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26946/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	python-twisted-web2.spec twisted-web2_0.2.0-1.1.diff 
Log Message:
Initial import of older 0.2.0 + patch on stable branches (pre Twisted 8).



--- NEW FILE python-twisted-web2.spec ---
%{!?python:%define python python}
%{!?python_sitearch: %define python_sitearch %(%{python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}

Summary: Experimental Twisted Web Server Framework
Name: %{python}-twisted-web2
Version: 0.2.0
Release: 3%{?dist}
License: MIT
Group: Development/Libraries
URL: http://twistedmatrix.com/trac/wiki/TwistedWeb2
Source: http://tmrc.mit.edu/mirror/twisted/Web2/TwistedWeb2-%{version}.tar.bz2
Patch0: twisted-web2_0.2.0-1.1.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
BuildRequires: %{python}-twisted-core >= 8.1.0
BuildRequires: %{python}-devel
# Files are noarch, but we need to install in sitearch for things to work, as
# all the rest of Twisted is in sitearch
#BuildArch: noarch
# Because of the above, disable generating an empty debuginfo package
%define debug_package %{nil}

%description
Twisted.Web2 is an experimental web server built with Twisted. Useful Web2
functionality will be backported to TwistedWeb until TwistedWeb is as
featureful as Web2, then Web2 will be abandoned.


%prep
%setup -q -n TwistedWeb2-%{version}
%patch0 -p1


%build
%{__python} setup.py build


%install
%{__rm} -rf %{buildroot}
%{__python} setup.py install \
    -O1 --skip-build --root %{buildroot} \
    --install-purelib %{python_sitearch}
# See if there's any egg-info
if [ -f %{buildroot}%{python_sitearch}/Twisted*.egg-info ]; then
    echo %{buildroot}%{python_sitearch}/Twisted*.egg-info |
        %{__sed} -e 's|^%{buildroot}||'
fi > egg-info


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


%post
if [ -x %{_libexecdir}/twisted-dropin-cache ]; then
    %{_libexecdir}/twisted-dropin-cache || :
fi

%postun
if [ -x %{_libexecdir}/twisted-dropin-cache ]; then
    %{_libexecdir}/twisted-dropin-cache || :
fi


%files -f egg-info
%defattr(-,root,root,-)
%doc LICENSE NEWS README
%{python_sitearch}/twisted/plugins/twisted_web2.py*
%{python_sitearch}/twisted/web2/


%changelog
* Thu Jan  1 2009 Matthias Saou <http://freshrpms.net/> 0.2.0-3
- Backport cosmetic changes from 8.1.0 devel spec to here. This will be an
  older build to go with Twisted < 8.

* Wed Jul 16 2008 Matthias Saou <http://freshrpms.net/> 0.2.0-2
- Downgrade to 0.2.0 as elisa doesn't work with 8.1.0.
- Include Debian's patch, as it changes quite a bit of code.

* Tue Jul 15 2008 Matthias Saou <http://freshrpms.net/> 8.1.0-0.1
- Initial RPM release.


twisted-web2_0.2.0-1.1.diff:

--- NEW FILE twisted-web2_0.2.0-1.1.diff ---
--- twisted-web2-0.2.0.orig/twisted/web2/stream.py
+++ twisted-web2-0.2.0/twisted/web2/stream.py
@@ -999,17 +999,29 @@
         return self._readUntil(gotdata)
     
         
-    def readline(self, delimiter='\r\n', maxLength=None):
+    def readline(self, delimiter='\r\n', maxLength=None, size=None):
         """Read a line of data from the string, bounded by delimiter"""
+        if size is not None and size < 0:
+            raise ValueError("readExactly: size cannot be negative: %s", size)
+
         def gotdata():
-            data = self.data.split(delimiter, 1)
+            postdata = ''
+            predata  = self.data
+            if size is not None and len(predata) >= size:
+                predata, postdata = predata[:size], predata[size:]
+            data = predata.split(delimiter, 1)
             if len(data) == 2:
-                self.data=data[1]
+                self.data=data[1] + postdata
                 if maxLength and len(data[0]) > maxLength:
-                    raise LineTooLongException(data[0])
+                    raise RuntimeError(
+                        "Line data too long at %d" % len(data[0]))
                 return data[0]
+            elif size is not None: # len(data) == 1
+                if postdata:
+                    self.data = postdata
+                    return predata
             if maxLength and len(self.data) > maxLength:
-                raise LineTooLongException(self.data)
+                raise RuntimeError("Line data too long at %d" % len(self.data))
         return self._readUntil(gotdata)
 
     def pushback(self, pushed):
--- twisted-web2-0.2.0.orig/twisted/web2/test/test_stream.py
+++ twisted-web2-0.2.0/twisted/web2/test/test_stream.py
@@ -128,8 +128,7 @@
         self.assertRaises(ValueError, self.makeStream, 0, 20)
 
 
-class TestSubstream(unittest.TestCase):
-    data = """I was angry with my friend:
+testdata = """I was angry with my friend:
 I told my wrath, my wrath did end.
 I was angry with my foe:
 I told it not, my wrath did grow.
@@ -148,8 +147,11 @@
 When the night had veil'd the pole:
 In the morning glad I see
 My foe outstretch'd beneath the tree"""
+
+class TestSubstream(unittest.TestCase):
     
     def setUp(self):
+        self.data = testdata
         self.s = stream.MemoryStream(self.data)
 
     def suckTheMarrow(self, s):
@@ -178,7 +180,55 @@
     def testPastEnd(self):
         size = len(self.data)
         self.assertRaises(ValueError, stream.substream, self.s, size-4, size+8)
-        
+
+
+class TestBufferedStream(unittest.TestCase):
+
+    def setUp(self):
+        self.data = testdata.replace('\n', '\r\n')
+        s = stream.MemoryStream(self.data)
+        self.s = stream.BufferedStream(s)
+
+    def _cbGotData(self, data, expected):
+        self.assertEqual(data, expected)
+
+    def test_readline(self):
+        d = self.s.readline()
+        d.addCallback(self._cbGotData, 'I was angry with my friend:')
+        return d
+
+    def test_readline_size(self):
+        d = self.s.readline(size = 5)
+        d.addCallback(self._cbGotData, 'I was')
+        return d
+
+    def test_readline_zero(self):
+        d = self.s.readline(size = 0)
+        d.addCallback(self._cbGotData, '')
+        return d
+
+    def test_readline_finished(self):
+        nolines = len(self.data.split('\r\n'))
+        for i in range(nolines):
+            self.s.readline()
+        d = self.s.readline()
+        d.addCallback(self._cbGotData, '')
+        return d
+
+    def test_readline_sizeneg(self):
+        self.assertRaises(ValueError, self.s.readline, size = -1)
+
+    def test_readline_maxlength(self):
+        d = self.s.readline(maxLength = 1)
+        self.assertFailure(d, RuntimeError)
+
+    def test_readExactly(self):
+        d = self.s.readExactly()
+        d.addCallback(self._cbGotData, self.data)
+        return d
+
+    def test_read(self):
+        self.assertEqual(str(self.s.read()), self.data)
 
 class TestStreamer:
     implements(stream.IStream, stream.IByteStream)
--- twisted-web2-0.2.0.orig/twisted/web2/test/test_wsgi.py
+++ twisted-web2-0.2.0/twisted/web2/test/test_wsgi.py
@@ -162,6 +162,44 @@
             (WSGI(application), 'http://host/', {}, None, None, '', "These\nare\nlines"),
             (200, {"Content-Length": 18}, "These\nXare\nXlines\n"))
 
+    def test_readInputLineSizeNegZero(self):
+        def application(environ, start_response):
+            input = environ['wsgi.input']
+
+            out = [input.read(5)] # 'Line '
+            out += ["X", input.readline(-1)] # 'blah blah\n'
+            out += ["X", input.readline(0)]  # ''
+            out += ["X", input.readline(-1)] # 'Oh Line\n'
+            out += ["X", input.readline()]   # ''
+
+            start_response("200 OK", {})
+            return out
+
+        return self.assertResponse(
+            (WSGI(application), 'http://host/', {}, None, None, '',
+             "Line blah blah\nOh Line\n"),
+            (200, {"Content-Length": 27},
+             "Line Xblah blah\nXXOh Line\nX"))
+
+    def test_readInputLineSize(self):
+        def application(environ, start_response):
+            input = environ['wsgi.input']
+
+            out = [input.read(5)]           # 'Line '
+            out += ["X", input.readline(5)] # 'blah '
+            out += ["X", input.readline()]  # 'blah\n'
+            out += ["X", input.readline(1)]     # '0'
+            out += ["X", input.readline()]  # 'h Line\n'
+
+            start_response("200 OK", {})
+            return out
+
+        return self.assertResponse(
+            (WSGI(application), 'http://host/', {}, None, None, '',
+             "Line blah blah\nOh Line\n"),
+            (200, {"Content-Length": 27},
+             "Line Xblah Xblah\nXOXh Line\n"))
+
     def test_readInputMixed(self):
         def application(environ, start_response):
             input = environ['wsgi.input']
@@ -174,7 +212,8 @@
             return out
         
         return self.assertResponse(
-            (WSGI(application), 'http://host/', {}, None, None, '', "Line blah blah\nOh Line\n"),
+            (WSGI(application), 'http://host/', {}, None, None, '',
+             "Line blah blah\nOh Line\n"),
             (200, {"Content-Length": 26}, "Line Xblah blah\nXOXh Line\n"))
 
 class TestWSGIEnvironment(BaseCase):
--- twisted-web2-0.2.0.orig/twisted/web2/wsgi.py
+++ twisted-web2-0.2.0/twisted/web2/wsgi.py
@@ -65,9 +65,28 @@
             size = None
         return callInReactor(self.stream.readExactly, size)
 
-    def readline(self):
+    def readline(self, size=None):
         # Called in application thread
-        return callInReactor(self.stream.readline, '\n')+'\n'
+        if size < 0:
+            size = None
+
+        if size is not None:
+            # we need to return maximum byte count of size 'including' the
+            # trailing newline
+            if size == 0:
+                return ''
+
+            size -= 1
+            data = callInReactor(self.stream.readline, '\n', size = size)
+            if len(data) == size:
+                # no newline - try to read one more byte
+                return data + callInReactor(self.stream.readExactly, 1)
+            return data + '\n'
+
+        data = callInReactor(self.stream.readline, '\n')
+        if data: # test that there was data in the stream
+            data += '\n'
+        return data
     
     def readlines(self, hint=None):
         # Called in application thread


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-twisted-web2/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	31 Dec 2008 05:51:11 -0000	1.1
+++ .cvsignore	1 Jan 2009 11:18:25 -0000	1.2
@@ -0,0 +1 @@
+TwistedWeb2-0.2.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-twisted-web2/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	31 Dec 2008 05:51:11 -0000	1.1
+++ sources	1 Jan 2009 11:18:25 -0000	1.2
@@ -0,0 +1 @@
+7d6dea006d7f1e004df9f6aad730fbee  TwistedWeb2-0.2.0.tar.bz2



From thias at fedoraproject.org  Thu Jan  1 11:18:56 2009
From: thias at fedoraproject.org (Matthias Saou)
Date: Thu,  1 Jan 2009 11:18:56 +0000 (UTC)
Subject: rpms/python-twisted-web2/EL-5 python-twisted-web2.spec, NONE,
	1.1 twisted-web2_0.2.0-1.1.diff, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090101111856.3872B7011B@cvs1.fedora.phx.redhat.com>

Author: thias

Update of /cvs/extras/rpms/python-twisted-web2/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26946/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	python-twisted-web2.spec twisted-web2_0.2.0-1.1.diff 
Log Message:
Initial import of older 0.2.0 + patch on stable branches (pre Twisted 8).



--- NEW FILE python-twisted-web2.spec ---
%{!?python:%define python python}
%{!?python_sitearch: %define python_sitearch %(%{python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}

Summary: Experimental Twisted Web Server Framework
Name: %{python}-twisted-web2
Version: 0.2.0
Release: 3%{?dist}
License: MIT
Group: Development/Libraries
URL: http://twistedmatrix.com/trac/wiki/TwistedWeb2
Source: http://tmrc.mit.edu/mirror/twisted/Web2/TwistedWeb2-%{version}.tar.bz2
Patch0: twisted-web2_0.2.0-1.1.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
BuildRequires: %{python}-twisted-core >= 8.1.0
BuildRequires: %{python}-devel
# Files are noarch, but we need to install in sitearch for things to work, as
# all the rest of Twisted is in sitearch
#BuildArch: noarch
# Because of the above, disable generating an empty debuginfo package
%define debug_package %{nil}

%description
Twisted.Web2 is an experimental web server built with Twisted. Useful Web2
functionality will be backported to TwistedWeb until TwistedWeb is as
featureful as Web2, then Web2 will be abandoned.


%prep
%setup -q -n TwistedWeb2-%{version}
%patch0 -p1


%build
%{__python} setup.py build


%install
%{__rm} -rf %{buildroot}
%{__python} setup.py install \
    -O1 --skip-build --root %{buildroot} \
    --install-purelib %{python_sitearch}
# See if there's any egg-info
if [ -f %{buildroot}%{python_sitearch}/Twisted*.egg-info ]; then
    echo %{buildroot}%{python_sitearch}/Twisted*.egg-info |
        %{__sed} -e 's|^%{buildroot}||'
fi > egg-info


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


%post
if [ -x %{_libexecdir}/twisted-dropin-cache ]; then
    %{_libexecdir}/twisted-dropin-cache || :
fi

%postun
if [ -x %{_libexecdir}/twisted-dropin-cache ]; then
    %{_libexecdir}/twisted-dropin-cache || :
fi


%files -f egg-info
%defattr(-,root,root,-)
%doc LICENSE NEWS README
%{python_sitearch}/twisted/plugins/twisted_web2.py*
%{python_sitearch}/twisted/web2/


%changelog
* Thu Jan  1 2009 Matthias Saou <http://freshrpms.net/> 0.2.0-3
- Backport cosmetic changes from 8.1.0 devel spec to here. This will be an
  older build to go with Twisted < 8.

* Wed Jul 16 2008 Matthias Saou <http://freshrpms.net/> 0.2.0-2
- Downgrade to 0.2.0 as elisa doesn't work with 8.1.0.
- Include Debian's patch, as it changes quite a bit of code.

* Tue Jul 15 2008 Matthias Saou <http://freshrpms.net/> 8.1.0-0.1
- Initial RPM release.


twisted-web2_0.2.0-1.1.diff:

--- NEW FILE twisted-web2_0.2.0-1.1.diff ---
--- twisted-web2-0.2.0.orig/twisted/web2/stream.py
+++ twisted-web2-0.2.0/twisted/web2/stream.py
@@ -999,17 +999,29 @@
         return self._readUntil(gotdata)
     
         
-    def readline(self, delimiter='\r\n', maxLength=None):
+    def readline(self, delimiter='\r\n', maxLength=None, size=None):
         """Read a line of data from the string, bounded by delimiter"""
+        if size is not None and size < 0:
+            raise ValueError("readExactly: size cannot be negative: %s", size)
+
         def gotdata():
-            data = self.data.split(delimiter, 1)
+            postdata = ''
+            predata  = self.data
+            if size is not None and len(predata) >= size:
+                predata, postdata = predata[:size], predata[size:]
+            data = predata.split(delimiter, 1)
             if len(data) == 2:
-                self.data=data[1]
+                self.data=data[1] + postdata
                 if maxLength and len(data[0]) > maxLength:
-                    raise LineTooLongException(data[0])
+                    raise RuntimeError(
+                        "Line data too long at %d" % len(data[0]))
                 return data[0]
+            elif size is not None: # len(data) == 1
+                if postdata:
+                    self.data = postdata
+                    return predata
             if maxLength and len(self.data) > maxLength:
-                raise LineTooLongException(self.data)
+                raise RuntimeError("Line data too long at %d" % len(self.data))
         return self._readUntil(gotdata)
 
     def pushback(self, pushed):
--- twisted-web2-0.2.0.orig/twisted/web2/test/test_stream.py
+++ twisted-web2-0.2.0/twisted/web2/test/test_stream.py
@@ -128,8 +128,7 @@
         self.assertRaises(ValueError, self.makeStream, 0, 20)
 
 
-class TestSubstream(unittest.TestCase):
-    data = """I was angry with my friend:
+testdata = """I was angry with my friend:
 I told my wrath, my wrath did end.
 I was angry with my foe:
 I told it not, my wrath did grow.
@@ -148,8 +147,11 @@
 When the night had veil'd the pole:
 In the morning glad I see
 My foe outstretch'd beneath the tree"""
+
+class TestSubstream(unittest.TestCase):
     
     def setUp(self):
+        self.data = testdata
         self.s = stream.MemoryStream(self.data)
 
     def suckTheMarrow(self, s):
@@ -178,7 +180,55 @@
     def testPastEnd(self):
         size = len(self.data)
         self.assertRaises(ValueError, stream.substream, self.s, size-4, size+8)
-        
+
+
+class TestBufferedStream(unittest.TestCase):
+
+    def setUp(self):
+        self.data = testdata.replace('\n', '\r\n')
+        s = stream.MemoryStream(self.data)
+        self.s = stream.BufferedStream(s)
+
+    def _cbGotData(self, data, expected):
+        self.assertEqual(data, expected)
+
+    def test_readline(self):
+        d = self.s.readline()
+        d.addCallback(self._cbGotData, 'I was angry with my friend:')
+        return d
+
+    def test_readline_size(self):
+        d = self.s.readline(size = 5)
+        d.addCallback(self._cbGotData, 'I was')
+        return d
+
+    def test_readline_zero(self):
+        d = self.s.readline(size = 0)
+        d.addCallback(self._cbGotData, '')
+        return d
+
+    def test_readline_finished(self):
+        nolines = len(self.data.split('\r\n'))
+        for i in range(nolines):
+            self.s.readline()
+        d = self.s.readline()
+        d.addCallback(self._cbGotData, '')
+        return d
+
+    def test_readline_sizeneg(self):
+        self.assertRaises(ValueError, self.s.readline, size = -1)
+
+    def test_readline_maxlength(self):
+        d = self.s.readline(maxLength = 1)
+        self.assertFailure(d, RuntimeError)
+
+    def test_readExactly(self):
+        d = self.s.readExactly()
+        d.addCallback(self._cbGotData, self.data)
+        return d
+
+    def test_read(self):
+        self.assertEqual(str(self.s.read()), self.data)
 
 class TestStreamer:
     implements(stream.IStream, stream.IByteStream)
--- twisted-web2-0.2.0.orig/twisted/web2/test/test_wsgi.py
+++ twisted-web2-0.2.0/twisted/web2/test/test_wsgi.py
@@ -162,6 +162,44 @@
             (WSGI(application), 'http://host/', {}, None, None, '', "These\nare\nlines"),
             (200, {"Content-Length": 18}, "These\nXare\nXlines\n"))
 
+    def test_readInputLineSizeNegZero(self):
+        def application(environ, start_response):
+            input = environ['wsgi.input']
+
+            out = [input.read(5)] # 'Line '
+            out += ["X", input.readline(-1)] # 'blah blah\n'
+            out += ["X", input.readline(0)]  # ''
+            out += ["X", input.readline(-1)] # 'Oh Line\n'
+            out += ["X", input.readline()]   # ''
+
+            start_response("200 OK", {})
+            return out
+
+        return self.assertResponse(
+            (WSGI(application), 'http://host/', {}, None, None, '',
+             "Line blah blah\nOh Line\n"),
+            (200, {"Content-Length": 27},
+             "Line Xblah blah\nXXOh Line\nX"))
+
+    def test_readInputLineSize(self):
+        def application(environ, start_response):
+            input = environ['wsgi.input']
+
+            out = [input.read(5)]           # 'Line '
+            out += ["X", input.readline(5)] # 'blah '
+            out += ["X", input.readline()]  # 'blah\n'
+            out += ["X", input.readline(1)]     # '0'
+            out += ["X", input.readline()]  # 'h Line\n'
+
+            start_response("200 OK", {})
+            return out
+
+        return self.assertResponse(
+            (WSGI(application), 'http://host/', {}, None, None, '',
+             "Line blah blah\nOh Line\n"),
+            (200, {"Content-Length": 27},
+             "Line Xblah Xblah\nXOXh Line\n"))
+
     def test_readInputMixed(self):
         def application(environ, start_response):
             input = environ['wsgi.input']
@@ -174,7 +212,8 @@
             return out
         
         return self.assertResponse(
-            (WSGI(application), 'http://host/', {}, None, None, '', "Line blah blah\nOh Line\n"),
+            (WSGI(application), 'http://host/', {}, None, None, '',
+             "Line blah blah\nOh Line\n"),
             (200, {"Content-Length": 26}, "Line Xblah blah\nXOXh Line\n"))
 
 class TestWSGIEnvironment(BaseCase):
--- twisted-web2-0.2.0.orig/twisted/web2/wsgi.py
+++ twisted-web2-0.2.0/twisted/web2/wsgi.py
@@ -65,9 +65,28 @@
             size = None
         return callInReactor(self.stream.readExactly, size)
 
-    def readline(self):
+    def readline(self, size=None):
         # Called in application thread
-        return callInReactor(self.stream.readline, '\n')+'\n'
+        if size < 0:
+            size = None
+
+        if size is not None:
+            # we need to return maximum byte count of size 'including' the
+            # trailing newline
+            if size == 0:
+                return ''
+
+            size -= 1
+            data = callInReactor(self.stream.readline, '\n', size = size)
+            if len(data) == size:
+                # no newline - try to read one more byte
+                return data + callInReactor(self.stream.readExactly, 1)
+            return data + '\n'
+
+        data = callInReactor(self.stream.readline, '\n')
+        if data: # test that there was data in the stream
+            data += '\n'
+        return data
     
     def readlines(self, hint=None):
         # Called in application thread


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-twisted-web2/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	31 Dec 2008 05:51:11 -0000	1.1
+++ .cvsignore	1 Jan 2009 11:18:24 -0000	1.2
@@ -0,0 +1 @@
+TwistedWeb2-0.2.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-twisted-web2/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	31 Dec 2008 05:51:11 -0000	1.1
+++ sources	1 Jan 2009 11:18:24 -0000	1.2
@@ -0,0 +1 @@
+7d6dea006d7f1e004df9f6aad730fbee  TwistedWeb2-0.2.0.tar.bz2



From thias at fedoraproject.org  Thu Jan  1 11:18:56 2009
From: thias at fedoraproject.org (Matthias Saou)
Date: Thu,  1 Jan 2009 11:18:56 +0000 (UTC)
Subject: rpms/python-twisted-web2/F-9 python-twisted-web2.spec, NONE,
	1.1 twisted-web2_0.2.0-1.1.diff, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090101111856.4629970140@cvs1.fedora.phx.redhat.com>

Author: thias

Update of /cvs/extras/rpms/python-twisted-web2/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26946/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	python-twisted-web2.spec twisted-web2_0.2.0-1.1.diff 
Log Message:
Initial import of older 0.2.0 + patch on stable branches (pre Twisted 8).



--- NEW FILE python-twisted-web2.spec ---
%{!?python:%define python python}
%{!?python_sitearch: %define python_sitearch %(%{python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}

Summary: Experimental Twisted Web Server Framework
Name: %{python}-twisted-web2
Version: 0.2.0
Release: 3%{?dist}
License: MIT
Group: Development/Libraries
URL: http://twistedmatrix.com/trac/wiki/TwistedWeb2
Source: http://tmrc.mit.edu/mirror/twisted/Web2/TwistedWeb2-%{version}.tar.bz2
Patch0: twisted-web2_0.2.0-1.1.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
BuildRequires: %{python}-twisted-core >= 8.1.0
BuildRequires: %{python}-devel
# Files are noarch, but we need to install in sitearch for things to work, as
# all the rest of Twisted is in sitearch
#BuildArch: noarch
# Because of the above, disable generating an empty debuginfo package
%define debug_package %{nil}

%description
Twisted.Web2 is an experimental web server built with Twisted. Useful Web2
functionality will be backported to TwistedWeb until TwistedWeb is as
featureful as Web2, then Web2 will be abandoned.


%prep
%setup -q -n TwistedWeb2-%{version}
%patch0 -p1


%build
%{__python} setup.py build


%install
%{__rm} -rf %{buildroot}
%{__python} setup.py install \
    -O1 --skip-build --root %{buildroot} \
    --install-purelib %{python_sitearch}
# See if there's any egg-info
if [ -f %{buildroot}%{python_sitearch}/Twisted*.egg-info ]; then
    echo %{buildroot}%{python_sitearch}/Twisted*.egg-info |
        %{__sed} -e 's|^%{buildroot}||'
fi > egg-info


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


%post
if [ -x %{_libexecdir}/twisted-dropin-cache ]; then
    %{_libexecdir}/twisted-dropin-cache || :
fi

%postun
if [ -x %{_libexecdir}/twisted-dropin-cache ]; then
    %{_libexecdir}/twisted-dropin-cache || :
fi


%files -f egg-info
%defattr(-,root,root,-)
%doc LICENSE NEWS README
%{python_sitearch}/twisted/plugins/twisted_web2.py*
%{python_sitearch}/twisted/web2/


%changelog
* Thu Jan  1 2009 Matthias Saou <http://freshrpms.net/> 0.2.0-3
- Backport cosmetic changes from 8.1.0 devel spec to here. This will be an
  older build to go with Twisted < 8.

* Wed Jul 16 2008 Matthias Saou <http://freshrpms.net/> 0.2.0-2
- Downgrade to 0.2.0 as elisa doesn't work with 8.1.0.
- Include Debian's patch, as it changes quite a bit of code.

* Tue Jul 15 2008 Matthias Saou <http://freshrpms.net/> 8.1.0-0.1
- Initial RPM release.


twisted-web2_0.2.0-1.1.diff:

--- NEW FILE twisted-web2_0.2.0-1.1.diff ---
--- twisted-web2-0.2.0.orig/twisted/web2/stream.py
+++ twisted-web2-0.2.0/twisted/web2/stream.py
@@ -999,17 +999,29 @@
         return self._readUntil(gotdata)
     
         
-    def readline(self, delimiter='\r\n', maxLength=None):
+    def readline(self, delimiter='\r\n', maxLength=None, size=None):
         """Read a line of data from the string, bounded by delimiter"""
+        if size is not None and size < 0:
+            raise ValueError("readExactly: size cannot be negative: %s", size)
+
         def gotdata():
-            data = self.data.split(delimiter, 1)
+            postdata = ''
+            predata  = self.data
+            if size is not None and len(predata) >= size:
+                predata, postdata = predata[:size], predata[size:]
+            data = predata.split(delimiter, 1)
             if len(data) == 2:
-                self.data=data[1]
+                self.data=data[1] + postdata
                 if maxLength and len(data[0]) > maxLength:
-                    raise LineTooLongException(data[0])
+                    raise RuntimeError(
+                        "Line data too long at %d" % len(data[0]))
                 return data[0]
+            elif size is not None: # len(data) == 1
+                if postdata:
+                    self.data = postdata
+                    return predata
             if maxLength and len(self.data) > maxLength:
-                raise LineTooLongException(self.data)
+                raise RuntimeError("Line data too long at %d" % len(self.data))
         return self._readUntil(gotdata)
 
     def pushback(self, pushed):
--- twisted-web2-0.2.0.orig/twisted/web2/test/test_stream.py
+++ twisted-web2-0.2.0/twisted/web2/test/test_stream.py
@@ -128,8 +128,7 @@
         self.assertRaises(ValueError, self.makeStream, 0, 20)
 
 
-class TestSubstream(unittest.TestCase):
-    data = """I was angry with my friend:
+testdata = """I was angry with my friend:
 I told my wrath, my wrath did end.
 I was angry with my foe:
 I told it not, my wrath did grow.
@@ -148,8 +147,11 @@
 When the night had veil'd the pole:
 In the morning glad I see
 My foe outstretch'd beneath the tree"""
+
+class TestSubstream(unittest.TestCase):
     
     def setUp(self):
+        self.data = testdata
         self.s = stream.MemoryStream(self.data)
 
     def suckTheMarrow(self, s):
@@ -178,7 +180,55 @@
     def testPastEnd(self):
         size = len(self.data)
         self.assertRaises(ValueError, stream.substream, self.s, size-4, size+8)
-        
+
+
+class TestBufferedStream(unittest.TestCase):
+
+    def setUp(self):
+        self.data = testdata.replace('\n', '\r\n')
+        s = stream.MemoryStream(self.data)
+        self.s = stream.BufferedStream(s)
+
+    def _cbGotData(self, data, expected):
+        self.assertEqual(data, expected)
+
+    def test_readline(self):
+        d = self.s.readline()
+        d.addCallback(self._cbGotData, 'I was angry with my friend:')
+        return d
+
+    def test_readline_size(self):
+        d = self.s.readline(size = 5)
+        d.addCallback(self._cbGotData, 'I was')
+        return d
+
+    def test_readline_zero(self):
+        d = self.s.readline(size = 0)
+        d.addCallback(self._cbGotData, '')
+        return d
+
+    def test_readline_finished(self):
+        nolines = len(self.data.split('\r\n'))
+        for i in range(nolines):
+            self.s.readline()
+        d = self.s.readline()
+        d.addCallback(self._cbGotData, '')
+        return d
+
+    def test_readline_sizeneg(self):
+        self.assertRaises(ValueError, self.s.readline, size = -1)
+
+    def test_readline_maxlength(self):
+        d = self.s.readline(maxLength = 1)
+        self.assertFailure(d, RuntimeError)
+
+    def test_readExactly(self):
+        d = self.s.readExactly()
+        d.addCallback(self._cbGotData, self.data)
+        return d
+
+    def test_read(self):
+        self.assertEqual(str(self.s.read()), self.data)
 
 class TestStreamer:
     implements(stream.IStream, stream.IByteStream)
--- twisted-web2-0.2.0.orig/twisted/web2/test/test_wsgi.py
+++ twisted-web2-0.2.0/twisted/web2/test/test_wsgi.py
@@ -162,6 +162,44 @@
             (WSGI(application), 'http://host/', {}, None, None, '', "These\nare\nlines"),
             (200, {"Content-Length": 18}, "These\nXare\nXlines\n"))
 
+    def test_readInputLineSizeNegZero(self):
+        def application(environ, start_response):
+            input = environ['wsgi.input']
+
+            out = [input.read(5)] # 'Line '
+            out += ["X", input.readline(-1)] # 'blah blah\n'
+            out += ["X", input.readline(0)]  # ''
+            out += ["X", input.readline(-1)] # 'Oh Line\n'
+            out += ["X", input.readline()]   # ''
+
+            start_response("200 OK", {})
+            return out
+
+        return self.assertResponse(
+            (WSGI(application), 'http://host/', {}, None, None, '',
+             "Line blah blah\nOh Line\n"),
+            (200, {"Content-Length": 27},
+             "Line Xblah blah\nXXOh Line\nX"))
+
+    def test_readInputLineSize(self):
+        def application(environ, start_response):
+            input = environ['wsgi.input']
+
+            out = [input.read(5)]           # 'Line '
+            out += ["X", input.readline(5)] # 'blah '
+            out += ["X", input.readline()]  # 'blah\n'
+            out += ["X", input.readline(1)]     # '0'
+            out += ["X", input.readline()]  # 'h Line\n'
+
+            start_response("200 OK", {})
+            return out
+
+        return self.assertResponse(
+            (WSGI(application), 'http://host/', {}, None, None, '',
+             "Line blah blah\nOh Line\n"),
+            (200, {"Content-Length": 27},
+             "Line Xblah Xblah\nXOXh Line\n"))
+
     def test_readInputMixed(self):
         def application(environ, start_response):
             input = environ['wsgi.input']
@@ -174,7 +212,8 @@
             return out
         
         return self.assertResponse(
-            (WSGI(application), 'http://host/', {}, None, None, '', "Line blah blah\nOh Line\n"),
+            (WSGI(application), 'http://host/', {}, None, None, '',
+             "Line blah blah\nOh Line\n"),
             (200, {"Content-Length": 26}, "Line Xblah blah\nXOXh Line\n"))
 
 class TestWSGIEnvironment(BaseCase):
--- twisted-web2-0.2.0.orig/twisted/web2/wsgi.py
+++ twisted-web2-0.2.0/twisted/web2/wsgi.py
@@ -65,9 +65,28 @@
             size = None
         return callInReactor(self.stream.readExactly, size)
 
-    def readline(self):
+    def readline(self, size=None):
         # Called in application thread
-        return callInReactor(self.stream.readline, '\n')+'\n'
+        if size < 0:
+            size = None
+
+        if size is not None:
+            # we need to return maximum byte count of size 'including' the
+            # trailing newline
+            if size == 0:
+                return ''
+
+            size -= 1
+            data = callInReactor(self.stream.readline, '\n', size = size)
+            if len(data) == size:
+                # no newline - try to read one more byte
+                return data + callInReactor(self.stream.readExactly, 1)
+            return data + '\n'
+
+        data = callInReactor(self.stream.readline, '\n')
+        if data: # test that there was data in the stream
+            data += '\n'
+        return data
     
     def readlines(self, hint=None):
         # Called in application thread


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-twisted-web2/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	31 Dec 2008 05:51:11 -0000	1.1
+++ .cvsignore	1 Jan 2009 11:18:25 -0000	1.2
@@ -0,0 +1 @@
+TwistedWeb2-0.2.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-twisted-web2/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	31 Dec 2008 05:51:11 -0000	1.1
+++ sources	1 Jan 2009 11:18:25 -0000	1.2
@@ -0,0 +1 @@
+7d6dea006d7f1e004df9f6aad730fbee  TwistedWeb2-0.2.0.tar.bz2



From thias at fedoraproject.org  Thu Jan  1 11:24:54 2009
From: thias at fedoraproject.org (Matthias Saou)
Date: Thu,  1 Jan 2009 11:24:54 +0000 (UTC)
Subject: rpms/python-twisted-web2/F-10 python-twisted-web2.spec,1.1,1.2
Message-ID: <20090101112454.8AA477013F@cvs1.fedora.phx.redhat.com>

Author: thias

Update of /cvs/extras/rpms/python-twisted-web2/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28145/F-10

Modified Files:
	python-twisted-web2.spec 
Log Message:
Fix version typo.



Index: python-twisted-web2.spec
===================================================================
RCS file: /cvs/extras/rpms/python-twisted-web2/F-10/python-twisted-web2.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- python-twisted-web2.spec	1 Jan 2009 11:18:25 -0000	1.1
+++ python-twisted-web2.spec	1 Jan 2009 11:24:24 -0000	1.2
@@ -11,7 +11,7 @@
 Source: http://tmrc.mit.edu/mirror/twisted/Web2/TwistedWeb2-%{version}.tar.bz2
 Patch0: twisted-web2_0.2.0-1.1.diff
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildRequires: %{python}-twisted-core >= 8.1.0
+BuildRequires: %{python}-twisted-core >= 2.5.0
 BuildRequires: %{python}-devel
 # Files are noarch, but we need to install in sitearch for things to work, as
 # all the rest of Twisted is in sitearch



From thias at fedoraproject.org  Thu Jan  1 11:24:54 2009
From: thias at fedoraproject.org (Matthias Saou)
Date: Thu,  1 Jan 2009 11:24:54 +0000 (UTC)
Subject: rpms/python-twisted-web2/EL-5 python-twisted-web2.spec,1.1,1.2
Message-ID: <20090101112454.700327011B@cvs1.fedora.phx.redhat.com>

Author: thias

Update of /cvs/extras/rpms/python-twisted-web2/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28145/EL-5

Modified Files:
	python-twisted-web2.spec 
Log Message:
Fix version typo.



Index: python-twisted-web2.spec
===================================================================
RCS file: /cvs/extras/rpms/python-twisted-web2/EL-5/python-twisted-web2.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- python-twisted-web2.spec	1 Jan 2009 11:18:24 -0000	1.1
+++ python-twisted-web2.spec	1 Jan 2009 11:24:23 -0000	1.2
@@ -11,7 +11,7 @@
 Source: http://tmrc.mit.edu/mirror/twisted/Web2/TwistedWeb2-%{version}.tar.bz2
 Patch0: twisted-web2_0.2.0-1.1.diff
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildRequires: %{python}-twisted-core >= 8.1.0
+BuildRequires: %{python}-twisted-core >= 2.5.0
 BuildRequires: %{python}-devel
 # Files are noarch, but we need to install in sitearch for things to work, as
 # all the rest of Twisted is in sitearch



From thias at fedoraproject.org  Thu Jan  1 11:24:54 2009
From: thias at fedoraproject.org (Matthias Saou)
Date: Thu,  1 Jan 2009 11:24:54 +0000 (UTC)
Subject: rpms/python-twisted-web2/F-9 python-twisted-web2.spec,1.1,1.2
Message-ID: <20090101112454.CDD507011B@cvs1.fedora.phx.redhat.com>

Author: thias

Update of /cvs/extras/rpms/python-twisted-web2/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28145/F-9

Modified Files:
	python-twisted-web2.spec 
Log Message:
Fix version typo.



Index: python-twisted-web2.spec
===================================================================
RCS file: /cvs/extras/rpms/python-twisted-web2/F-9/python-twisted-web2.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- python-twisted-web2.spec	1 Jan 2009 11:18:25 -0000	1.1
+++ python-twisted-web2.spec	1 Jan 2009 11:24:24 -0000	1.2
@@ -11,7 +11,7 @@
 Source: http://tmrc.mit.edu/mirror/twisted/Web2/TwistedWeb2-%{version}.tar.bz2
 Patch0: twisted-web2_0.2.0-1.1.diff
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildRequires: %{python}-twisted-core >= 8.1.0
+BuildRequires: %{python}-twisted-core >= 2.5.0
 BuildRequires: %{python}-devel
 # Files are noarch, but we need to install in sitearch for things to work, as
 # all the rest of Twisted is in sitearch



From donv at fedoraproject.org  Thu Jan  1 12:33:39 2009
From: donv at fedoraproject.org (Uwe Kubosch)
Date: Thu,  1 Jan 2009 12:33:39 +0000 (UTC)
Subject: rpms/zfs-fuse/F-10 zfs-fuse.spec, 1.3, 1.4 .cvsignore, 1.2,
	1.3 zfs-fuse.init, 1.2, 1.3
Message-ID: <20090101123339.9008C7011B@cvs1.fedora.phx.redhat.com>

Author: donv

Update of /cvs/pkgs/rpms/zfs-fuse/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12238/F-10

Modified Files:
	zfs-fuse.spec .cvsignore zfs-fuse.init 
Log Message:
* Sun Dec 28 2008 Uwe Kubosh <uwe at kubosch.no> - 0.5.0-6.20081221
- Updated etc/init.d/zfs-fuse init script after feedback from Rudd-O at
  http://groups.google.com/group/zfs-fuse/browse_thread/thread/da94aa803bceef52
- Adds better wait at startup before mounting filesystems.
- Add OOM kill protection.
- Adds syncing of disks at shutdown.
- Adds pool status when asking for service status.
- Changed to start zfs-fuse at boot as default.
- Changed to start zfs-fise right after installation.
- Cleanup of /var/run/zfs and /var/lock/zfs after uninstall.



Index: zfs-fuse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/zfs-fuse/F-10/zfs-fuse.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- zfs-fuse.spec	21 Dec 2008 22:41:53 -0000	1.3
+++ zfs-fuse.spec	1 Jan 2009 12:33:09 -0000	1.4
@@ -1,7 +1,7 @@
 Summary:          ZFS ported to Linux FUSE
 Name:             zfs-fuse
 Version:          0.5.0
-Release:          4.20081221%{?dist}
+Release:          6.20081221%{?dist}
 Group:            System Environment/Base
 License:          CDDL
 URL:              http://www.wizy.org/wiki/ZFS_on_FUSE
@@ -57,6 +57,8 @@
 %post
 if [ $1 = 1 ] ; then
     /sbin/chkconfig --add %{name}
+    /sbin/chkconfig %{name} on
+    /sbin/service %{name} start >/dev/null 2>&1 || :
 fi
 
 %preun
@@ -68,6 +70,8 @@
 %postun
 if [ $1 -ge 1 ] ; then
     /sbin/service %{name} condrestart >/dev/null 2>&1 || :
+    rm -rf /var/run/zfs
+    rm -rf /var/lock/zfs
 fi
 
 %files
@@ -83,6 +87,20 @@
 %{_sysconfdir}/sysconfig/%{name}
 
 %changelog
+* Sun Dec 28 2008 Uwe Kubosh <uwe at kubosch.no> - 0.5.0-6.20081221
+- Updated etc/init.d/zfs-fuse init script after feedback from Rudd-O at
+  http://groups.google.com/group/zfs-fuse/browse_thread/thread/da94aa803bceef52
+- Adds better wait at startup before mounting filesystems.
+- Add OOM kill protection.
+- Adds syncing of disks at shutdown.
+- Adds pool status when asking for service status.
+- Changed to start zfs-fuse at boot as default.
+- Changed to start zfs-fise right after installation.
+- Cleanup of /var/run/zfs and /var/lock/zfs after uninstall.
+
+* Sun Dec 24 2008 Uwe Kubosh <uwe at kubosch.no> - 0.5.0-5.20081221
+- Development tag.
+
 * Sun Dec 21 2008 Uwe Kubosh <uwe at kubosch.no> - 0.5.0-4.20081221
 - Updated to upstream trunk of 2008-12-21
 - Added config file in /etc/sysconfig/zfs


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/zfs-fuse/F-10/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	21 Dec 2008 22:41:53 -0000	1.2
+++ .cvsignore	1 Jan 2009 12:33:09 -0000	1.3
@@ -1,2 +1,4 @@
 zfs-fuse-0.5.0.tar.bz2
 i386
+trunk-*
+zfs-fuse-*.src.rpm


Index: zfs-fuse.init
===================================================================
RCS file: /cvs/pkgs/rpms/zfs-fuse/F-10/zfs-fuse.init,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- zfs-fuse.init	21 Dec 2008 22:41:53 -0000	1.2
+++ zfs-fuse.init	1 Jan 2009 12:33:09 -0000	1.3
@@ -20,93 +20,173 @@
 # Source function library.
 . /etc/rc.d/init.d/functions
 
-exec="/usr/bin/zfs-fuse"
 prog="zfs-fuse"
+exec="/usr/bin/$prog"
 config=/etc/sysconfig/$prog
 
 [ -e $config ] && . $config
 
-lockfile=/var/lock/subsys/$prog
+PIDFILE=/var/run/$prog.pid
+
+unset LANG
 
 start() {
-    [ -x $exec ] || exit 5
+    [ -x $exec ] || (echo "$prog binary not present or executable" && exit 5)
+    PID=`pidofproc $prog`
+    start_status=$?
+    case "$start_status" in
+    0)
+        echo "ZFS-FUSE is already running with pid $pid"
+        exit 3
+        ;;
+    1)
+        echo "Cleaning up stale $prog PID file in $PIDFILE"
+        rm -f "$PIDFILE"
+        ;;
+    3)
+        # not running
+        ;;
+    *)
+    	echo "Huh?"
+    	exit 99
+    esac
+
     echo -n $"Starting $prog: "
-    daemon $exec
-    retval=$?
+    daemon $exec -p "$PIDFILE"
+    exec_retval=$?
     echo
-    if [ $retval -eq 0 ] ; then
-    	touch $lockfile
-    	if [ $ZFS_AUTOMOUNT -eq 1 ] ; then
-			echo -n $"Mounting zfs partitions: "
-    		sleep 1
-			zfs mount -a
-			zfs_mount_retval=$?
-			if [ $zfs_mount_retval = 0 ]; then
-				echo_success
-			else
-				echo_warning
-			fi
-			echo
-    	fi
+    [ $exec_retval -ne 0 ] && return $exec_retval
+	
+    for a in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 ; do
+        PID=`pidofproc $prog`
+        [ "$PID" != "" ] && break
+        echo -n "."
+        sleep 1
+    done
+
+    if [ "$PID" = "" ] ; then
+        echo "ZFS-FUSE did not start or create $PIDFILE"
+        exit 3
+    fi 
+
+    echo -n "Immunizing $prog against OOM kills"
+    echo -17 > "/proc/$PID/oom_adj"
+    ES_TO_REPORT=$?
+    if [ "$ES_TO_REPORT" -ne 0 ] ; then
+		echo_warning
+        echo "code $ES_TO_REPORT"
+        exit 3
     fi
-    return $retval
+    echo_success
+    echo
+
+	if [ $ZFS_AUTOMOUNT -eq 1 ] ; then
+		echo -n $"Mounting zfs partitions: "
+    	sleep 1
+        rm -f /var/lib/random-seed
+		zfs mount -a
+		zfs_mount_retval=$?
+		if [ $zfs_mount_retval = 0 ]; then
+			echo_success
+		else
+			echo_warning
+			echo zfs mount failed with code $zfs_mount_retval
+		fi
+		echo
+    fi
+    
+    
+#    if [ -x /nonexistent -a -x /usr/bin/renice ] ; then # DISABLED
+#        log_action_begin_msg "Increasing ZFS-FUSE priority"
+#        /usr/bin/renice -15 -g $PID > /dev/null
+#        ES_TO_REPORT=$?
+#        if [ 0 = "$ES_TO_REPORT" ] ; then
+#            log_action_end_msg 0
+#        else
+#            log_action_end_msg 1 "code $ES_TO_REPORT"
+#            exit 3
+#        fi
+#        true
+#    fi 
+        
+    
+    return $exec_retval
 }
 
 stop() {
+    status_quiet || return 0
+    [ -x $exec ] || (echo "$prog binary not present or executable" && exit 5)
+    PID=`pidofproc $prog`
+    if [ "$PID" != "" ] ; then
+        echo -n "Syncing disks"
+        sync
+        echo_success
+        echo
+
+        echo -n "Unmounting ZFS filesystems"
+        zfs unmount -a
+        ES_TO_REPORT=$?
+        if [ 0 = "$ES_TO_REPORT" ] ; then
+            echo_success
+        else
+            echo_warning
+            exit 3
+        fi
+        echo
+    fi
+
     echo -n $"Stopping $prog: "
     killproc $prog
-    retval=$?
-    echo
-    [ $retval -eq 0 ] && rm -f $lockfile
-    return $retval
-}
-
-restart() {
-    stop
-    start 
-}
+    kill_retval=$?
+	echo
+	
+	if [ "$PID" != "" ] ; then
+    	echo -n "Syncing disks again"
+    	sync
+    	echo_success
+    	echo
+    fi
 
-reload() {
-    restart
+    return $kill_retval
 }
 
-force_reload() {
-    restart
+restart() {
+	stop
+	start
 }
 
-rh_status() {
+pool_status() {
     # run checks to determine if the service is running or use generic status
-    status $prog
+    status $prog && /usr/bin/zpool status
 }
 
-rh_status_q() {
-    rh_status >/dev/null 2>&1
+status_quiet() {
+    pool_status >/dev/null 2>&1
 }
 
 case "$1" in
     start)
-        rh_status_q && exit 0
+        status_quiet && exit 0
         $1
         ;;
     stop)
-        rh_status_q || exit 0
         $1
         ;;
     restart)
-        $1
+    	restart 
         ;;
     reload)
-        rh_status_q || exit 7
-        $1
+        status_quiet || exit 7
+	    restart
         ;;
     force-reload)
-        force_reload
+	    restart
         ;;
     status)
-        rh_status
+        pool_status
         ;;
     condrestart|try-restart)
-        rh_status_q || exit 0
+        status_quiet || exit 0
         restart
         ;;
     *)



From turki at fedoraproject.org  Thu Jan  1 13:57:47 2009
From: turki at fedoraproject.org (Nikolay Vladimirov)
Date: Thu,  1 Jan 2009 13:57:47 +0000 (UTC)
Subject: rpms/libgsasl/devel .cvsignore, 1.5, 1.6 libgsasl.spec, 1.7,
	1.8 sources, 1.5, 1.6
Message-ID: <20090101135747.73DF77011B@cvs1.fedora.phx.redhat.com>

Author: turki

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

Modified Files:
	.cvsignore libgsasl.spec sources 
Log Message:
Update to 0.2.29


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libgsasl/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	29 Jul 2008 09:25:13 -0000	1.5
+++ .cvsignore	1 Jan 2009 13:57:17 -0000	1.6
@@ -1 +1 @@
-libgsasl-0.2.27.tar.gz
+libgsasl-0.2.29.tar.gz


Index: libgsasl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libgsasl/devel/libgsasl.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- libgsasl.spec	29 Jul 2008 09:25:13 -0000	1.7
+++ libgsasl.spec	1 Jan 2009 13:57:17 -0000	1.8
@@ -1,5 +1,5 @@
 Name:           libgsasl
-Version:        0.2.27 
+Version:        0.2.29 
 Release:        1%{?dist}
 Summary:        GNU SASL library 
 
@@ -71,6 +71,10 @@
 
 
 %changelog
+* Thu Jan 1 2009 Nikolay Vladimirov <nikolay at vladimiroff.com> - 0.2.29-1
+- Rewrite to use poll instead of select.
+- Don't use poll with POLLOUT to avoid busy-waiting.
+
 * Tue Jul 29 2008 Nikolay Vladimirov <nikolay at vladimiroff.com> - 0.2.27-1
 - new upstream release 0.2.27
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libgsasl/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	29 Jul 2008 09:25:13 -0000	1.5
+++ sources	1 Jan 2009 13:57:17 -0000	1.6
@@ -1 +1 @@
-ea129609a1dea0fd80704a51c6769150  libgsasl-0.2.27.tar.gz
+c38f4bc5ab488a215a09f2d915942482  libgsasl-0.2.29.tar.gz



From turki at fedoraproject.org  Thu Jan  1 14:04:15 2009
From: turki at fedoraproject.org (Nikolay Vladimirov)
Date: Thu,  1 Jan 2009 14:04:15 +0000 (UTC)
Subject: rpms/libgsasl/F-10 .cvsignore, 1.5, 1.6 libgsasl.spec, 1.7,
	1.8 sources, 1.5, 1.6
Message-ID: <20090101140415.8BD627011B@cvs1.fedora.phx.redhat.com>

Author: turki

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

Modified Files:
	.cvsignore libgsasl.spec sources 
Log Message:
Update to 0.2.29


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libgsasl/F-10/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	29 Jul 2008 09:25:13 -0000	1.5
+++ .cvsignore	1 Jan 2009 14:03:45 -0000	1.6
@@ -1 +1 @@
-libgsasl-0.2.27.tar.gz
+libgsasl-0.2.29.tar.gz


Index: libgsasl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libgsasl/F-10/libgsasl.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- libgsasl.spec	29 Jul 2008 09:25:13 -0000	1.7
+++ libgsasl.spec	1 Jan 2009 14:03:45 -0000	1.8
@@ -1,5 +1,5 @@
 Name:           libgsasl
-Version:        0.2.27 
+Version:        0.2.29 
 Release:        1%{?dist}
 Summary:        GNU SASL library 
 
@@ -71,6 +71,10 @@
 
 
 %changelog
+* Thu Jan 1 2009 Nikolay Vladimirov <nikolay at vladimiroff.com> - 0.2.29-1
+- Rewrite to use poll instead of select.
+- Don't use poll with POLLOUT to avoid busy-waiting.
+
 * Tue Jul 29 2008 Nikolay Vladimirov <nikolay at vladimiroff.com> - 0.2.27-1
 - new upstream release 0.2.27
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libgsasl/F-10/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	29 Jul 2008 09:25:13 -0000	1.5
+++ sources	1 Jan 2009 14:03:45 -0000	1.6
@@ -1 +1 @@
-ea129609a1dea0fd80704a51c6769150  libgsasl-0.2.27.tar.gz
+c38f4bc5ab488a215a09f2d915942482  libgsasl-0.2.29.tar.gz



From turki at fedoraproject.org  Thu Jan  1 14:08:01 2009
From: turki at fedoraproject.org (Nikolay Vladimirov)
Date: Thu,  1 Jan 2009 14:08:01 +0000 (UTC)
Subject: rpms/libgsasl/F-9 .cvsignore, 1.5, 1.6 libgsasl.spec, 1.7,
	1.8 sources, 1.5, 1.6
Message-ID: <20090101140801.5AFFE7011B@cvs1.fedora.phx.redhat.com>

Author: turki

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

Modified Files:
	.cvsignore libgsasl.spec sources 
Log Message:
Update to 0.2.29


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libgsasl/F-9/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	29 Jul 2008 09:29:54 -0000	1.5
+++ .cvsignore	1 Jan 2009 14:07:31 -0000	1.6
@@ -1 +1 @@
-libgsasl-0.2.27.tar.gz
+libgsasl-0.2.29.tar.gz


Index: libgsasl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libgsasl/F-9/libgsasl.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- libgsasl.spec	29 Jul 2008 09:29:54 -0000	1.7
+++ libgsasl.spec	1 Jan 2009 14:07:31 -0000	1.8
@@ -1,5 +1,5 @@
 Name:           libgsasl
-Version:        0.2.27 
+Version:        0.2.29 
 Release:        1%{?dist}
 Summary:        GNU SASL library 
 
@@ -71,6 +71,10 @@
 
 
 %changelog
+* Thu Jan 1 2009 Nikolay Vladimirov <nikolay at vladimiroff.com> - 0.2.29-1
+- Rewrite to use poll instead of select.
+- Don't use poll with POLLOUT to avoid busy-waiting.
+
 * Tue Jul 29 2008 Nikolay Vladimirov <nikolay at vladimiroff.com> - 0.2.27-1
 - new upstream release 0.2.27
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libgsasl/F-9/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	29 Jul 2008 09:29:54 -0000	1.5
+++ sources	1 Jan 2009 14:07:31 -0000	1.6
@@ -1 +1 @@
-ea129609a1dea0fd80704a51c6769150  libgsasl-0.2.27.tar.gz
+c38f4bc5ab488a215a09f2d915942482  libgsasl-0.2.29.tar.gz



From ausil at fedoraproject.org  Thu Jan  1 15:37:10 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Thu,  1 Jan 2009 15:37:10 +0000 (UTC)
Subject: rpms/qemu/F-9 qemu-0.9.1-alpha-int.patch, NONE,
	1.1 qemu-0.9.1-dirent.patch, NONE,
	1.1 qemu-0.9.1-sparc-configure.patch, NONE, 1.1 qemu.spec, 1.37, 1.38
Message-ID: <20090101153710.DF9057011B@cvs1.fedora.phx.redhat.com>

Author: ausil

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

Modified Files:
	qemu.spec 
Added Files:
	qemu-0.9.1-alpha-int.patch qemu-0.9.1-dirent.patch 
	qemu-0.9.1-sparc-configure.patch 
Log Message:
enable sparc arches to build


qemu-0.9.1-alpha-int.patch:

--- NEW FILE qemu-0.9.1-alpha-int.patch ---
--- qemu-0.9.1/target-alpha/exec.h.BAD	2008-12-31 23:17:10.000000000 -0600
+++ qemu-0.9.1/target-alpha/exec.h	2008-12-31 23:17:48.000000000 -0600
@@ -24,6 +24,7 @@
 #include "config.h"
 
 #include "dyngen-exec.h"
+#include <stdint.h>
 
 #define TARGET_LONG_BITS 64
 

qemu-0.9.1-dirent.patch:

--- NEW FILE qemu-0.9.1-dirent.patch ---
--- qemu-0.9.1/linux-user/syscall.c.BAD	2008-12-31 20:20:00.000000000 -0600
+++ qemu-0.9.1/linux-user/syscall.c	2008-12-31 20:20:27.000000000 -0600
@@ -66,7 +66,7 @@
 #include <linux/cdrom.h>
 #include <linux/hdreg.h>
 #include <linux/soundcard.h>
-#include <linux/dirent.h>
+#include <dirent.h>
 #include <linux/kd.h>
 
 #include "qemu.h"

qemu-0.9.1-sparc-configure.patch:

--- NEW FILE qemu-0.9.1-sparc-configure.patch ---
--- qemu-0.9.1/configure.BAD	2008-12-31 20:49:19.000000000 -0600
+++ qemu-0.9.1/configure	2008-12-31 20:51:45.000000000 -0600
@@ -307,6 +307,8 @@
                  target_cpu="sparc"; cpu="sparc" ;;
         v8plus|v8plusa) SP_CFLAGS="-m32 -mcpu=ultrasparc -D__sparc_${sparc_cpu}__"; SP_LDFLAGS="-m32"
                  target_cpu="sparc"; cpu="sparc" ;;
+        v932)    SP_CFLAGS="-m32 -mcpu=ultrasparc -D__sparc_v9__"; SP_LDFLAGS="-m32"
+                 target_cpu="sparc"; cpu="sparc" ;;
         v9)    SP_CFLAGS="-m64 -mcpu=ultrasparc -D__sparc_${sparc_cpu}__"; SP_LDFLAGS="-m64"
                  target_cpu="sparc64"; cpu="sparc64" ;;
         *)     echo "undefined SPARC architecture. Exiting";exit 1;;
@@ -337,11 +339,11 @@
 
 #
 # If cpu ~= sparc and  sparc_cpu hasn't been defined, plug in the right
-# ARCH_CFLAGS/ARCH_LDFLAGS (assume sparc_v8plus for 32-bit and sparc_v9 for 64-bit)
+# ARCH_CFLAGS/ARCH_LDFLAGS (assume sparc_v9 for 32-bit and sparc_v9 for 64-bit)
 #
 case $cpu in
     sparc) if test -z "$sparc_cpu" ; then
-               ARCH_CFLAGS="-m32 -mcpu=ultrasparc -D__sparc_v8plus__"
+               ARCH_CFLAGS="-m32 -mcpu=ultrasparc -D__sparc_v9__"
                ARCH_LDFLAGS="-m32"
            else
                ARCH_CFLAGS="${SP_CFLAGS}"


Index: qemu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qemu/F-9/qemu.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- qemu.spec	11 Jun 2008 12:36:53 -0000	1.37
+++ qemu.spec	1 Jan 2009 15:36:40 -0000	1.38
@@ -8,7 +8,7 @@
 Summary: QEMU is a FAST! processor emulator
 Name: qemu
 Version: 0.9.1
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: Development/Tools
 URL: http://www.qemu.org/
@@ -20,13 +20,16 @@
 Patch4: qemu-%{version}-block-rw-range-check.patch
 # Upstream SVN changeset #4338
 Patch5: qemu-%{version}-pty-rawmode.patch
+Patch6: qemu-0.9.1-alpha-int.patch
+Patch7: qemu-0.9.1-dirent.patch
+Patch8: qemu-0.9.1-sparc-configure.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: SDL-devel compat-gcc-%{gccver} zlib-devel which texi2html gnutls-devel
 Requires(post): /sbin/chkconfig
 Requires(preun): /sbin/service /sbin/chkconfig
 Requires(postun): /sbin/service
 Requires: %{name}-img = %{version}-%{release}
-ExclusiveArch: %{ix86} x86_64 ppc alpha sparc armv4l
+ExclusiveArch: %{ix86} x86_64 ppc alpha sparcv9 sparc64 armv4l
 
 %description
 QEMU is a generic and open source processor emulator which achieves a good
@@ -57,13 +60,24 @@
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
+%patch7 -p1
+%patch8 -p1
 
 %build
 ./configure \
     --prefix=%{_prefix} \
     --interp-prefix=%{_prefix}/qemu-%%M \
     --cc=gcc%{gccver} \
+%ifnarch sparcv9
     --enable-alsa \
+%endif
+%ifarch sparcv9
+    --sparc_cpu=v932 \
+%endif
+%ifarch sparc64
+    --sparc_cpu=v9 \
+%endif
     --extra-ldflags="-Wl,--build-id"
 make %{?_smp_mflags} VL_LDFLAGS="-Wl,--build-id"
 
@@ -144,6 +158,9 @@
 %{_mandir}/man1/qemu-img.1*
 
 %changelog
+* Wed Dec 31 2008 Dennis Gilmore <dennis at ausil.us> - 0.9.1-7
+- add sparcv9 and sparc64 support
+
 * Wed Jun 11 2008 Daniel P. Berrange <berrange at redhat.com> - 0.9.1-6.fc9
 - Remove bogus wildcard from files list (rhbz #450701)
 - Fix text console PTYs to be in rawmode



From orion at fedoraproject.org  Thu Jan  1 15:41:44 2009
From: orion at fedoraproject.org (Orion Poplawski)
Date: Thu,  1 Jan 2009 15:41:44 +0000 (UTC)
Subject: rpms/perl-PDL/devel .cvsignore, 1.8, 1.9 perl-PDL.spec, 1.48,
	1.49 sources, 1.8, 1.9 perl-PDL-2.4.3-plparseopts.patch, 1.1,
	NONE perl-PDL-2.4.4-test_plplot.patch, 1.1, NONE
Message-ID: <20090101154144.63EE87011B@cvs1.fedora.phx.redhat.com>

Author: orion

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

Modified Files:
	.cvsignore perl-PDL.spec sources 
Removed Files:
	perl-PDL-2.4.3-plparseopts.patch 
	perl-PDL-2.4.4-test_plplot.patch 
Log Message:
* Thu Jan 1 2009 Orion Poplawski <orion at cora.nwra.com> - 2.4.4-2
- Use PDL-Graphics-PLplot-0.47 to support latest plplot



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-PDL/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	29 Nov 2008 23:58:36 -0000	1.8
+++ .cvsignore	1 Jan 2009 15:41:13 -0000	1.9
@@ -1 +1,2 @@
 PDL-2.4.4.tar.gz
+PDL-Graphics-PLplot-0.47.tar.gz


Index: perl-PDL.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-PDL/devel/perl-PDL.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- perl-PDL.spec	29 Nov 2008 23:58:36 -0000	1.48
+++ perl-PDL.spec	1 Jan 2009 15:41:13 -0000	1.49
@@ -1,12 +1,15 @@
+%global plplotver 0.47
+
 Name:           perl-PDL
 Version:        2.4.4
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        The Perl Data Language
 
 Group:          Development/Libraries
 License:        GPL+ or Artistic
 Url:            http://pdl.perl.org/
 Source0:        http://search.cpan.org/CPAN/authors/id/C/CH/CHM/PDL-%{version}.tar.gz
+Source1:        http://search.cpan.org/CPAN/authors/id/D/DH/DHUNT/PDL-Graphics-PLplot-%{plplotver}.tar.gz
 Patch0:         perl-PDL-settings.patch
 Patch1:         perl-PDL-2.4.2-fix_ia64_sdump.patch
 Patch2:         perl-PDL-2.4.4-cleanup.patch
@@ -16,9 +19,6 @@
 Patch6:         perl-PDL-2.4.4-Xext.patch
 Patch7:         perl-PDL-2.4.3-fortran.patch
 Patch8:	        perl-PDL-2.4.3-test_hdf.patch
-Patch9:	        perl-PDL-2.4.4-test_plplot.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
@@ -53,7 +53,12 @@
 
 
 %prep
-%setup -q -n PDL-%{version} 
+%setup -q -n PDL-%{version} -b 1
+# Use newer plplot.pd
+cp $RPM_BUILD_DIR/PDL-Graphics-PLplot-%{plplotver}/plplot.pd Graphics/PLplot/plplot.pd
+cp $RPM_BUILD_DIR/PDL-Graphics-PLplot-%{plplotver}/t/plplot.t t/plplot.t
+# Strip separate version informaion
+sed -i -e '/^\$VERSION =/d' Graphics/PLplot/plplot.pd
 %patch0 -p1 -b .settings
 %patch1 -p1
 %patch2 -p1 -b .cleanup
@@ -63,8 +68,6 @@
 %patch6 -p1 -b .Xext
 %patch7 -p1 -b .fortran
 %patch8 -p1 -b .patch_hdf
-%patch9 -p1 -b .test_plplot
-%patch12 -p1 -b .plparseopts
 
 # Provides: explicitly filter perl(Inline)
 cat <<__EOF__ > %{name}-findperlprovides
@@ -150,6 +153,9 @@
 
 
 %changelog
+* Thu Jan 1 2009 Orion Poplawski <orion at cora.nwra.com> - 2.4.4-2
+- Use PDL-Graphics-PLplot-0.47 to support latest plplot
+
 * Sat Nov 29 2008 Orion Poplawski <orion at cora.nwra.com> - 2.4.4-1
 - Update to 2.4.4
 - New source URL


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-PDL/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	29 Nov 2008 23:58:36 -0000	1.8
+++ sources	1 Jan 2009 15:41:13 -0000	1.9
@@ -1 +1,2 @@
 1c3e8f2fd001a8b48687fb277bc16eed  PDL-2.4.4.tar.gz
+f57df85c3cb3b1e731601beed90e2871  PDL-Graphics-PLplot-0.47.tar.gz


--- perl-PDL-2.4.3-plparseopts.patch DELETED ---


--- perl-PDL-2.4.4-test_plplot.patch DELETED ---



From ausil at fedoraproject.org  Thu Jan  1 16:26:18 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Thu,  1 Jan 2009 16:26:18 +0000 (UTC)
Subject: rpms/qemu/F-10 qemu.spec,1.43,1.44
Message-ID: <20090101162618.C42747011B@cvs1.fedora.phx.redhat.com>

Author: ausil

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

Modified Files:
	qemu.spec 
Log Message:
add sparc arch support



Index: qemu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qemu/F-10/qemu.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- qemu.spec	25 Jul 2008 14:39:15 -0000	1.43
+++ qemu.spec	1 Jan 2009 16:25:48 -0000	1.44
@@ -8,7 +8,7 @@
 Summary: QEMU is a FAST! processor emulator
 Name: qemu
 Version: 0.9.1
-Release: 10%{?dist}
+Release: 11%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: Development/Tools
 URL: http://www.qemu.org/
@@ -20,13 +20,16 @@
 Patch4: qemu-%{version}-block-rw-range-check.patch
 # Upstream SVN changeset #4338
 Patch5: qemu-%{version}-pty-rawmode.patch
+Patch6: qemu-0.9.1-alpha-int.patch                                                                                
+Patch7: qemu-0.9.1-dirent.patch                                                                                   
+Patch8: qemu-0.9.1-sparc-configure.patch  
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: SDL-devel compat-gcc-%{gccver} zlib-devel which texi2html gnutls-devel
 Requires(post): /sbin/chkconfig
 Requires(preun): /sbin/service /sbin/chkconfig
 Requires(postun): /sbin/service
 Requires: %{name}-img = %{version}-%{release}
-ExclusiveArch: %{ix86} x86_64 ppc alpha sparc armv4l
+ExclusiveArch: %{ix86} x86_64 ppc alpha sparcv9 sparc64 armv4l
 
 %description
 QEMU is a generic and open source processor emulator which achieves a good
@@ -57,6 +60,9 @@
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
+%patch7 -p1
+%patch8 -p1
 
 %build
 # FIXME: add --extra-cflags="$RPM_OPT_FLAGS" when we drop gcc34
@@ -64,7 +70,15 @@
     --prefix=%{_prefix} \
     --interp-prefix=%{_prefix}/qemu-%%M \
     --cc=gcc%{gccver} \
-    --enable-alsa \
+%ifnarch sparcv9
+     --enable-alsa \
+%endif
+%ifarch sparcv9
+    --sparc_cpu=v932 \
+%endif
+%ifarch sparc64
+    --sparc_cpu=v9 \
+%endif
     --extra-ldflags="-Wl,--build-id"
 make %{?_smp_mflags} VL_LDFLAGS="-Wl,--build-id"
 
@@ -145,6 +159,9 @@
 %{_mandir}/man1/qemu-img.1*
 
 %changelog
+* Wed Dec 31 2008 Dennis Gilmore <dennis at ausil.us> - 0.9.1-11
+- add sparcv9 and sparc64 support
+
 * Fri Jul 25 2008 Bill Nottingham <notting at redhat.com>
 - Fix qemu-img summary (#456344)
 



From mtasaka at fedoraproject.org  Thu Jan  1 16:36:09 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Thu,  1 Jan 2009 16:36:09 +0000 (UTC)
Subject: rpms/cairo-dock/devel .cvsignore, 1.90, 1.91 cairo-dock.spec, 1.121,
	1.122 sources, 1.90, 1.91
Message-ID: <20090101163609.3967C7011B@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/cairo-dock/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv733

Modified Files:
	.cvsignore cairo-dock.spec sources 
Log Message:
rev 1458


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cairo-dock/devel/.cvsignore,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -r1.90 -r1.91
--- .cvsignore	30 Dec 2008 03:49:33 -0000	1.90
+++ .cvsignore	1 Jan 2009 16:35:38 -0000	1.91
@@ -1 +1 @@
-cairo-dock-sources-svn1455_trunk.tar.bz2
+cairo-dock-sources-svn1458_trunk.tar.bz2


Index: cairo-dock.spec
===================================================================
RCS file: /cvs/extras/rpms/cairo-dock/devel/cairo-dock.spec,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -r1.121 -r1.122
--- cairo-dock.spec	30 Dec 2008 03:52:32 -0000	1.121
+++ cairo-dock.spec	1 Jan 2009 16:35:38 -0000	1.122
@@ -11,7 +11,7 @@
 %undefine		betaver		
 %define		build_webkit	1
 %define		build_xfce	1
-%define		tarballver	svn1455_trunk
+%define		tarballver	svn1458_trunk
 
 %define		fedora_main_rel	3
 
@@ -637,8 +637,8 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
-* Tue Dec 30 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
-- rev 1455
+* Fri Jan  2 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- rev 1458
 
 * Thu Dec 25 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
 - rev 1451


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cairo-dock/devel/sources,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -r1.90 -r1.91
--- sources	30 Dec 2008 03:49:33 -0000	1.90
+++ sources	1 Jan 2009 16:35:38 -0000	1.91
@@ -1 +1 @@
-a09a31c452dd2a3278da383f35d4ab49  cairo-dock-sources-svn1455_trunk.tar.bz2
+25005dc02c3e305d5588642c5e2fa60c  cairo-dock-sources-svn1458_trunk.tar.bz2



From ausil at fedoraproject.org  Thu Jan  1 17:01:29 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Thu,  1 Jan 2009 17:01:29 +0000 (UTC)
Subject: rpms/qemu/devel qemu-0.9.1-alpha-int.patch, NONE,
	1.1 qemu-0.9.1-dirent.patch, NONE,
	1.1 qemu-0.9.1-sparc-configure.patch, NONE, 1.1 qemu.spec, 1.43, 1.44
Message-ID: <20090101170129.731FB7011B@cvs1.fedora.phx.redhat.com>

Author: ausil

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

Modified Files:
	qemu.spec 
Added Files:
	qemu-0.9.1-alpha-int.patch qemu-0.9.1-dirent.patch 
	qemu-0.9.1-sparc-configure.patch 
Log Message:
build sparc arches 


qemu-0.9.1-alpha-int.patch:

--- NEW FILE qemu-0.9.1-alpha-int.patch ---
--- qemu-0.9.1/target-alpha/exec.h.BAD	2008-12-31 23:17:10.000000000 -0600
+++ qemu-0.9.1/target-alpha/exec.h	2008-12-31 23:17:48.000000000 -0600
@@ -24,6 +24,7 @@
 #include "config.h"
 
 #include "dyngen-exec.h"
+#include <stdint.h>
 
 #define TARGET_LONG_BITS 64
 

qemu-0.9.1-dirent.patch:

--- NEW FILE qemu-0.9.1-dirent.patch ---
--- qemu-0.9.1/linux-user/syscall.c.BAD	2008-12-31 20:20:00.000000000 -0600
+++ qemu-0.9.1/linux-user/syscall.c	2008-12-31 20:20:27.000000000 -0600
@@ -66,7 +66,7 @@
 #include <linux/cdrom.h>
 #include <linux/hdreg.h>
 #include <linux/soundcard.h>
-#include <linux/dirent.h>
+#include <dirent.h>
 #include <linux/kd.h>
 
 #include "qemu.h"

qemu-0.9.1-sparc-configure.patch:

--- NEW FILE qemu-0.9.1-sparc-configure.patch ---
--- qemu-0.9.1/configure.BAD	2008-12-31 20:49:19.000000000 -0600
+++ qemu-0.9.1/configure	2008-12-31 20:51:45.000000000 -0600
@@ -307,6 +307,8 @@
                  target_cpu="sparc"; cpu="sparc" ;;
         v8plus|v8plusa) SP_CFLAGS="-m32 -mcpu=ultrasparc -D__sparc_${sparc_cpu}__"; SP_LDFLAGS="-m32"
                  target_cpu="sparc"; cpu="sparc" ;;
+        v932)    SP_CFLAGS="-m32 -mcpu=ultrasparc -D__sparc_v9__"; SP_LDFLAGS="-m32"
+                 target_cpu="sparc"; cpu="sparc" ;;
         v9)    SP_CFLAGS="-m64 -mcpu=ultrasparc -D__sparc_${sparc_cpu}__"; SP_LDFLAGS="-m64"
                  target_cpu="sparc64"; cpu="sparc64" ;;
         *)     echo "undefined SPARC architecture. Exiting";exit 1;;
@@ -337,11 +339,11 @@
 
 #
 # If cpu ~= sparc and  sparc_cpu hasn't been defined, plug in the right
-# ARCH_CFLAGS/ARCH_LDFLAGS (assume sparc_v8plus for 32-bit and sparc_v9 for 64-bit)
+# ARCH_CFLAGS/ARCH_LDFLAGS (assume sparc_v9 for 32-bit and sparc_v9 for 64-bit)
 #
 case $cpu in
     sparc) if test -z "$sparc_cpu" ; then
-               ARCH_CFLAGS="-m32 -mcpu=ultrasparc -D__sparc_v8plus__"
+               ARCH_CFLAGS="-m32 -mcpu=ultrasparc -D__sparc_v9__"
                ARCH_LDFLAGS="-m32"
            else
                ARCH_CFLAGS="${SP_CFLAGS}"


Index: qemu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qemu/devel/qemu.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- qemu.spec	25 Jul 2008 14:39:15 -0000	1.43
+++ qemu.spec	1 Jan 2009 17:00:58 -0000	1.44
@@ -8,7 +8,7 @@
 Summary: QEMU is a FAST! processor emulator
 Name: qemu
 Version: 0.9.1
-Release: 10%{?dist}
+Release: 11%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: Development/Tools
 URL: http://www.qemu.org/
@@ -20,13 +20,16 @@
 Patch4: qemu-%{version}-block-rw-range-check.patch
 # Upstream SVN changeset #4338
 Patch5: qemu-%{version}-pty-rawmode.patch
+Patch6: qemu-0.9.1-alpha-int.patch                                                                                
+Patch7: qemu-0.9.1-dirent.patch                                                                                   
+Patch8: qemu-0.9.1-sparc-configure.patch  
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: SDL-devel compat-gcc-%{gccver} zlib-devel which texi2html gnutls-devel
 Requires(post): /sbin/chkconfig
 Requires(preun): /sbin/service /sbin/chkconfig
 Requires(postun): /sbin/service
 Requires: %{name}-img = %{version}-%{release}
-ExclusiveArch: %{ix86} x86_64 ppc alpha sparc armv4l
+ExclusiveArch: %{ix86} x86_64 ppc alpha sparcv9 sparc64 armv4l
 
 %description
 QEMU is a generic and open source processor emulator which achieves a good
@@ -57,6 +60,9 @@
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
+%patch7 -p1
+%patch8 -p1
 
 %build
 # FIXME: add --extra-cflags="$RPM_OPT_FLAGS" when we drop gcc34
@@ -64,7 +70,15 @@
     --prefix=%{_prefix} \
     --interp-prefix=%{_prefix}/qemu-%%M \
     --cc=gcc%{gccver} \
-    --enable-alsa \
+%ifnarch sparcv9
+     --enable-alsa \
+%endif
+%ifarch sparcv9
+    --sparc_cpu=v932 \
+%endif
+%ifarch sparc64
+    --sparc_cpu=v9 \
+%endif
     --extra-ldflags="-Wl,--build-id"
 make %{?_smp_mflags} VL_LDFLAGS="-Wl,--build-id"
 
@@ -145,6 +159,9 @@
 %{_mandir}/man1/qemu-img.1*
 
 %changelog
+* Wed Dec 31 2008 Dennis Gilmore <dennis at ausil.us> - 0.9.1-11
+- add sparcv9 and sparc64 support
+
 * Fri Jul 25 2008 Bill Nottingham <notting at redhat.com>
 - Fix qemu-img summary (#456344)
 



From sindrepb at fedoraproject.org  Thu Jan  1 17:04:20 2009
From: sindrepb at fedoraproject.org (=?utf-8?q?Sindre_Pedersen_Bj=C3=B8rdal?=)
Date: Thu,  1 Jan 2009 17:04:20 +0000 (UTC)
Subject: rpms/rubyripper/devel .cvsignore, 1.5, 1.6 rubyripper.spec, 1.10,
	1.11 sources, 1.5, 1.6
Message-ID: <20090101170420.8C23E7011B@cvs1.fedora.phx.redhat.com>

Author: sindrepb

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

Modified Files:
	.cvsignore rubyripper.spec sources 
Log Message:
new upstream release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rubyripper/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	6 Aug 2008 00:13:25 -0000	1.5
+++ .cvsignore	1 Jan 2009 17:03:49 -0000	1.6
@@ -1 +1 @@
-rubyripper-0.5.2.tar.bz2
+rubyripper-0.5.4.tar.bz2


Index: rubyripper.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rubyripper/devel/rubyripper.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- rubyripper.spec	6 Aug 2008 00:28:45 -0000	1.10
+++ rubyripper.spec	1 Jan 2009 17:03:50 -0000	1.11
@@ -1,8 +1,8 @@
 %{!?ruby_sitelib: %define ruby_sitelib %(ruby -rrbconfig -e 'puts Config::CONFIG["sitelibdir"]')}
 
 Name:           rubyripper
-Version:        0.5.2
-Release:        3%{?dist}
+Version:        0.5.4
+Release:        1%{?dist}
 Summary:        Open-source secure ripper for Linux
 
 Group:          Applications/Multimedia
@@ -82,6 +82,9 @@
 
 
 %changelog
+* Thu Jan 01 2009 Sindre Pedersen Bj??rdal <sindrepb at fedoraproject.org> - 0.5.4-1
+- New upstream release
+
 * Tue Aug 04 2008 Sindre Pedersen Bj??rdal <foolish at guezz.net> - 0.5.2-3
 - New release
 - Translation file updates


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rubyripper/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	6 Aug 2008 00:13:25 -0000	1.5
+++ sources	1 Jan 2009 17:03:50 -0000	1.6
@@ -1 +1 @@
-898d0ff7c794bfb8f919f8d642904a08  rubyripper-0.5.2.tar.bz2
+7c728ddd517c36c1c6b853c7e0bff8a3  rubyripper-0.5.4.tar.bz2



From ausil at fedoraproject.org  Thu Jan  1 17:08:24 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Thu,  1 Jan 2009 17:08:24 +0000 (UTC)
Subject: rpms/qemu/F-10 qemu-0.9.1-alpha-int.patch, NONE,
	1.1 qemu-0.9.1-dirent.patch, NONE,
	1.1 qemu-0.9.1-sparc-configure.patch, NONE, 1.1
Message-ID: <20090101170824.CCC647011B@cvs1.fedora.phx.redhat.com>

Author: ausil

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

Added Files:
	qemu-0.9.1-alpha-int.patch qemu-0.9.1-dirent.patch 
	qemu-0.9.1-sparc-configure.patch 
Log Message:
add patchs


qemu-0.9.1-alpha-int.patch:

--- NEW FILE qemu-0.9.1-alpha-int.patch ---
--- qemu-0.9.1/target-alpha/exec.h.BAD	2008-12-31 23:17:10.000000000 -0600
+++ qemu-0.9.1/target-alpha/exec.h	2008-12-31 23:17:48.000000000 -0600
@@ -24,6 +24,7 @@
 #include "config.h"
 
 #include "dyngen-exec.h"
+#include <stdint.h>
 
 #define TARGET_LONG_BITS 64
 

qemu-0.9.1-dirent.patch:

--- NEW FILE qemu-0.9.1-dirent.patch ---
--- qemu-0.9.1/linux-user/syscall.c.BAD	2008-12-31 20:20:00.000000000 -0600
+++ qemu-0.9.1/linux-user/syscall.c	2008-12-31 20:20:27.000000000 -0600
@@ -66,7 +66,7 @@
 #include <linux/cdrom.h>
 #include <linux/hdreg.h>
 #include <linux/soundcard.h>
-#include <linux/dirent.h>
+#include <dirent.h>
 #include <linux/kd.h>
 
 #include "qemu.h"

qemu-0.9.1-sparc-configure.patch:

--- NEW FILE qemu-0.9.1-sparc-configure.patch ---
--- qemu-0.9.1/configure.BAD	2008-12-31 20:49:19.000000000 -0600
+++ qemu-0.9.1/configure	2008-12-31 20:51:45.000000000 -0600
@@ -307,6 +307,8 @@
                  target_cpu="sparc"; cpu="sparc" ;;
         v8plus|v8plusa) SP_CFLAGS="-m32 -mcpu=ultrasparc -D__sparc_${sparc_cpu}__"; SP_LDFLAGS="-m32"
                  target_cpu="sparc"; cpu="sparc" ;;
+        v932)    SP_CFLAGS="-m32 -mcpu=ultrasparc -D__sparc_v9__"; SP_LDFLAGS="-m32"
+                 target_cpu="sparc"; cpu="sparc" ;;
         v9)    SP_CFLAGS="-m64 -mcpu=ultrasparc -D__sparc_${sparc_cpu}__"; SP_LDFLAGS="-m64"
                  target_cpu="sparc64"; cpu="sparc64" ;;
         *)     echo "undefined SPARC architecture. Exiting";exit 1;;
@@ -337,11 +339,11 @@
 
 #
 # If cpu ~= sparc and  sparc_cpu hasn't been defined, plug in the right
-# ARCH_CFLAGS/ARCH_LDFLAGS (assume sparc_v8plus for 32-bit and sparc_v9 for 64-bit)
+# ARCH_CFLAGS/ARCH_LDFLAGS (assume sparc_v9 for 32-bit and sparc_v9 for 64-bit)
 #
 case $cpu in
     sparc) if test -z "$sparc_cpu" ; then
-               ARCH_CFLAGS="-m32 -mcpu=ultrasparc -D__sparc_v8plus__"
+               ARCH_CFLAGS="-m32 -mcpu=ultrasparc -D__sparc_v9__"
                ARCH_LDFLAGS="-m32"
            else
                ARCH_CFLAGS="${SP_CFLAGS}"



From sindrepb at fedoraproject.org  Thu Jan  1 17:30:42 2009
From: sindrepb at fedoraproject.org (=?utf-8?q?Sindre_Pedersen_Bj=C3=B8rdal?=)
Date: Thu,  1 Jan 2009 17:30:42 +0000 (UTC)
Subject: rpms/rubyripper/F-10 rubyripper.spec,1.10,1.11 sources,1.5,1.6
Message-ID: <20090101173042.D14D27011B@cvs1.fedora.phx.redhat.com>

Author: sindrepb

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

Modified Files:
	rubyripper.spec sources 
Log Message:
new upstream release


Index: rubyripper.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rubyripper/F-10/rubyripper.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- rubyripper.spec	6 Aug 2008 00:28:45 -0000	1.10
+++ rubyripper.spec	1 Jan 2009 17:30:11 -0000	1.11
@@ -1,8 +1,8 @@
 %{!?ruby_sitelib: %define ruby_sitelib %(ruby -rrbconfig -e 'puts Config::CONFIG["sitelibdir"]')}
 
 Name:           rubyripper
-Version:        0.5.2
-Release:        3%{?dist}
+Version:        0.5.4
+Release:        1%{?dist}
 Summary:        Open-source secure ripper for Linux
 
 Group:          Applications/Multimedia
@@ -82,6 +82,9 @@
 
 
 %changelog
+* Thu Jan 01 2009 Sindre Pedersen Bj??rdal <sindrepb at fedoraproject.org> - 0.5.4-1
+- New upstream release
+
 * Tue Aug 04 2008 Sindre Pedersen Bj??rdal <foolish at guezz.net> - 0.5.2-3
 - New release
 - Translation file updates


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rubyripper/F-10/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	6 Aug 2008 00:13:25 -0000	1.5
+++ sources	1 Jan 2009 17:30:11 -0000	1.6
@@ -1 +1 @@
-898d0ff7c794bfb8f919f8d642904a08  rubyripper-0.5.2.tar.bz2
+7c728ddd517c36c1c6b853c7e0bff8a3  rubyripper-0.5.4.tar.bz2



From sindrepb at fedoraproject.org  Thu Jan  1 17:36:57 2009
From: sindrepb at fedoraproject.org (=?utf-8?q?Sindre_Pedersen_Bj=C3=B8rdal?=)
Date: Thu,  1 Jan 2009 17:36:57 +0000 (UTC)
Subject: rpms/rubyripper/F-9 rubyripper.spec,1.8,1.9 sources,1.5,1.6
Message-ID: <20090101173657.7AC727011B@cvs1.fedora.phx.redhat.com>

Author: sindrepb

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

Modified Files:
	rubyripper.spec sources 
Log Message:
new upstream release


Index: rubyripper.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rubyripper/F-9/rubyripper.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- rubyripper.spec	6 Aug 2008 00:34:01 -0000	1.8
+++ rubyripper.spec	1 Jan 2009 17:36:26 -0000	1.9
@@ -1,8 +1,8 @@
 %{!?ruby_sitelib: %define ruby_sitelib %(ruby -rrbconfig -e 'puts Config::CONFIG["sitelibdir"]')}
 
 Name:           rubyripper
-Version:        0.5.2
-Release:        3%{?dist}
+Version:        0.5.4
+Release:        1%{?dist}
 Summary:        Open-source secure ripper for Linux
 
 Group:          Applications/Multimedia
@@ -82,6 +82,9 @@
 
 
 %changelog
+* Thu Jan 01 2009 Sindre Pedersen Bj??rdal <sindrepb at fedoraproject.org> - 0.5.4-1
+- New upstream release
+
 * Tue Aug 04 2008 Sindre Pedersen Bj??rdal <foolish at guezz.net> - 0.5.2-3
 - New release
 - Translation file updates


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rubyripper/F-9/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	6 Aug 2008 00:34:01 -0000	1.5
+++ sources	1 Jan 2009 17:36:26 -0000	1.6
@@ -1 +1 @@
-898d0ff7c794bfb8f919f8d642904a08  rubyripper-0.5.2.tar.bz2
+7c728ddd517c36c1c6b853c7e0bff8a3  rubyripper-0.5.4.tar.bz2



From nbecker at fedoraproject.org  Thu Jan  1 17:41:06 2009
From: nbecker at fedoraproject.org (Neal Becker)
Date: Thu,  1 Jan 2009 17:41:06 +0000 (UTC)
Subject: rpms/mercurial/devel .cvsignore, 1.22, 1.23 mercurial.spec, 1.57,
	1.58 sources, 1.24, 1.25
Message-ID: <20090101174106.307757011B@cvs1.fedora.phx.redhat.com>

Author: nbecker

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

Modified Files:
	.cvsignore mercurial.spec sources 
Log Message:
update to 1.1.2


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mercurial/devel/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- .cvsignore	21 Dec 2008 13:50:32 -0000	1.22
+++ .cvsignore	1 Jan 2009 17:40:35 -0000	1.23
@@ -1 +1 @@
-mercurial-1.1.1.tar.gz
+mercurial-1.1.2.tar.gz


Index: mercurial.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mercurial/devel/mercurial.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- mercurial.spec	21 Dec 2008 14:17:05 -0000	1.57
+++ mercurial.spec	1 Jan 2009 17:40:35 -0000	1.58
@@ -2,8 +2,8 @@
 
 Summary: A fast, lightweight distributed source control management system 
 Name: mercurial
-Version: 1.1.1
-Release: 2%{?dist}
+Version: 1.1.2
+Release: 1%{?dist}
 License: GPLv2
 Group: Development/Tools
 URL: http://www.selenic.com/mercurial/
@@ -129,7 +129,7 @@
 EOF
 install hgk.rc $RPM_BUILD_ROOT/%{_sysconfdir}/mercurial/hgrc.d
 
-install contrib/mergetools.hgrc $RPM_BUILD_ROOT%{_sysconfdir}/mercurial/hgrc.d/mergetools.rc
+install contrib/mergetools.hgrc $RPM_BUILD_ROOT%{_sysconfdir}/mercurial/hgrc.d/mergetools.rc.sample
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -166,6 +166,12 @@
 #cd tests && %{__python} run-tests.py
 
 %changelog
+* Thu Jan  1 2009 Neal Becker <ndbecker2 at gmail.com> - 1.1.2-1
+- Update to 1.1.2
+
+* Wed Dec 24 2008 Neal Becker <ndbecker2 at gmail.com> - 1.1.1-3
+- Install mergetools.rc as mergetools.rc.sample
+
 * Sun Dec 21 2008 Neal Becker <ndbecker2 at gmail.com> - 1.1.1-2
 - Fix typo
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mercurial/devel/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- sources	21 Dec 2008 13:50:33 -0000	1.24
+++ sources	1 Jan 2009 17:40:35 -0000	1.25
@@ -1 +1 @@
-eae043de903b263e290b078ab223f6c5  mercurial-1.1.1.tar.gz
+4fd3b9a2e5dcd025840c3849b136bec8  mercurial-1.1.2.tar.gz



From nbecker at fedoraproject.org  Thu Jan  1 17:46:34 2009
From: nbecker at fedoraproject.org (Neal Becker)
Date: Thu,  1 Jan 2009 17:46:34 +0000 (UTC)
Subject: rpms/mercurial/devel mercurial.spec,1.58,1.59
Message-ID: <20090101174634.B6C5F7011B@cvs1.fedora.phx.redhat.com>

Author: nbecker

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

Modified Files:
	mercurial.spec 
Log Message:
fix mergetools.rc


Index: mercurial.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mercurial/devel/mercurial.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- mercurial.spec	1 Jan 2009 17:40:35 -0000	1.58
+++ mercurial.spec	1 Jan 2009 17:46:04 -0000	1.59
@@ -3,7 +3,7 @@
 Summary: A fast, lightweight distributed source control management system 
 Name: mercurial
 Version: 1.1.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2
 Group: Development/Tools
 URL: http://www.selenic.com/mercurial/
@@ -147,7 +147,7 @@
 %{_bindir}/mercurial-convert-repo
 %dir %{_sysconfdir}/mercurial
 %dir %{_sysconfdir}/mercurial/hgrc.d
-%{_sysconfdir}/mercurial/hgrc.d/mergetools.rc
+%{_sysconfdir}/mercurial/hgrc.d/mergetools.rc.sample
 %dir %{python_sitearch}/mercurial
 %dir %{python_sitearch}/hgext
 
@@ -166,6 +166,9 @@
 #cd tests && %{__python} run-tests.py
 
 %changelog
+* Thu Jan  1 2009 Neal Becker <ndbecker2 at gmail.com> - 1.1.2-2
+- Rename mergetools.rc -> mergetools.rc.sample
+
 * Thu Jan  1 2009 Neal Becker <ndbecker2 at gmail.com> - 1.1.2-1
 - Update to 1.1.2
 



From nbecker at fedoraproject.org  Thu Jan  1 17:53:09 2009
From: nbecker at fedoraproject.org (Neal Becker)
Date: Thu,  1 Jan 2009 17:53:09 +0000 (UTC)
Subject: rpms/mercurial/F-9 mercurial.spec,1.51,1.52
Message-ID: <20090101175309.50CDE7013F@cvs1.fedora.phx.redhat.com>

Author: nbecker

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

Modified Files:
	mercurial.spec 
Log Message:
update to 1.1.2


Index: mercurial.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mercurial/F-9/mercurial.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- mercurial.spec	21 Dec 2008 14:35:56 -0000	1.51
+++ mercurial.spec	1 Jan 2009 17:52:38 -0000	1.52
@@ -2,7 +2,7 @@
 
 Summary: A fast, lightweight distributed source control management system 
 Name: mercurial
-Version: 1.1.1
+Version: 1.1.2
 Release: 2%{?dist}
 License: GPLv2
 Group: Development/Tools
@@ -129,7 +129,7 @@
 EOF
 install hgk.rc $RPM_BUILD_ROOT/%{_sysconfdir}/mercurial/hgrc.d
 
-install contrib/mergetools.hgrc $RPM_BUILD_ROOT%{_sysconfdir}/mercurial/hgrc.d/mergetools.rc
+install contrib/mergetools.hgrc $RPM_BUILD_ROOT%{_sysconfdir}/mercurial/hgrc.d/mergetools.rc.sample
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -147,7 +147,7 @@
 %{_bindir}/mercurial-convert-repo
 %dir %{_sysconfdir}/mercurial
 %dir %{_sysconfdir}/mercurial/hgrc.d
-%{_sysconfdir}/mercurial/hgrc.d/mergetools.rc
+%{_sysconfdir}/mercurial/hgrc.d/mergetools.rc.sample
 %dir %{python_sitearch}/mercurial
 %dir %{python_sitearch}/hgext
 
@@ -166,6 +166,15 @@
 #cd tests && %{__python} run-tests.py
 
 %changelog
+* Thu Jan  1 2009 Neal Becker <ndbecker2 at gmail.com> - 1.1.2-2
+- Rename mergetools.rc -> mergetools.rc.sample
+
+* Thu Jan  1 2009 Neal Becker <ndbecker2 at gmail.com> - 1.1.2-1
+- Update to 1.1.2
+
+* Wed Dec 24 2008 Neal Becker <ndbecker2 at gmail.com> - 1.1.1-3
+- Install mergetools.rc as mergetools.rc.sample
+
 * Sun Dec 21 2008 Neal Becker <ndbecker2 at gmail.com> - 1.1.1-2
 - Fix typo
 



From nbecker at fedoraproject.org  Thu Jan  1 17:54:28 2009
From: nbecker at fedoraproject.org (Neal Becker)
Date: Thu,  1 Jan 2009 17:54:28 +0000 (UTC)
Subject: rpms/mercurial/F-10 mercurial.spec,1.55,1.56
Message-ID: <20090101175428.70DC770130@cvs1.fedora.phx.redhat.com>

Author: nbecker

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

Modified Files:
	mercurial.spec 
Log Message:
update to 1.1.2


Index: mercurial.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mercurial/F-10/mercurial.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- mercurial.spec	21 Dec 2008 14:23:51 -0000	1.55
+++ mercurial.spec	1 Jan 2009 17:53:58 -0000	1.56
@@ -2,7 +2,7 @@
 
 Summary: A fast, lightweight distributed source control management system 
 Name: mercurial
-Version: 1.1.1
+Version: 1.1.2
 Release: 2%{?dist}
 License: GPLv2
 Group: Development/Tools
@@ -129,7 +129,7 @@
 EOF
 install hgk.rc $RPM_BUILD_ROOT/%{_sysconfdir}/mercurial/hgrc.d
 
-install contrib/mergetools.hgrc $RPM_BUILD_ROOT%{_sysconfdir}/mercurial/hgrc.d/mergetools.rc
+install contrib/mergetools.hgrc $RPM_BUILD_ROOT%{_sysconfdir}/mercurial/hgrc.d/mergetools.rc.sample
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -147,7 +147,7 @@
 %{_bindir}/mercurial-convert-repo
 %dir %{_sysconfdir}/mercurial
 %dir %{_sysconfdir}/mercurial/hgrc.d
-%{_sysconfdir}/mercurial/hgrc.d/mergetools.rc
+%{_sysconfdir}/mercurial/hgrc.d/mergetools.rc.sample
 %dir %{python_sitearch}/mercurial
 %dir %{python_sitearch}/hgext
 
@@ -166,6 +166,15 @@
 #cd tests && %{__python} run-tests.py
 
 %changelog
+* Thu Jan  1 2009 Neal Becker <ndbecker2 at gmail.com> - 1.1.2-2
+- Rename mergetools.rc -> mergetools.rc.sample
+
+* Thu Jan  1 2009 Neal Becker <ndbecker2 at gmail.com> - 1.1.2-1
+- Update to 1.1.2
+
+* Wed Dec 24 2008 Neal Becker <ndbecker2 at gmail.com> - 1.1.1-3
+- Install mergetools.rc as mergetools.rc.sample
+
 * Sun Dec 21 2008 Neal Becker <ndbecker2 at gmail.com> - 1.1.1-2
 - Fix typo
 



From davej at fedoraproject.org  Thu Jan  1 18:03:18 2009
From: davej at fedoraproject.org (Dave Jones)
Date: Thu,  1 Jan 2009 18:03:18 +0000 (UTC)
Subject: rpms/kernel/devel patch-2.6.28-git4.bz2.sign, NONE, 1.1 .cvsignore, 
	1.977, 1.978 config-generic, 1.207, 1.208 kernel.spec, 1.1188,
	1.1189 sources, 1.939, 1.940 upstream, 1.851,
	1.852 patch-2.6.28-git3.bz2.sign, 1.1, NONE
Message-ID: <20090101180318.B73587011B@cvs1.fedora.phx.redhat.com>

Author: davej

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

Modified Files:
	.cvsignore config-generic kernel.spec sources upstream 
Added Files:
	patch-2.6.28-git4.bz2.sign 
Removed Files:
	patch-2.6.28-git3.bz2.sign 
Log Message:
2.6.28-git4


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

iD8DBQBJXLDAyGugalF9Dw4RAqDCAKCBECUPZnKkb3WPYTCneo9KFGmzJwCff1Ct
axCe/p5N427gekTE9KtIy0Q=
=iRzr
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.977
retrieving revision 1.978
diff -u -r1.977 -r1.978
--- .cvsignore	31 Dec 2008 16:12:35 -0000	1.977
+++ .cvsignore	1 Jan 2009 18:02:47 -0000	1.978
@@ -4,4 +4,4 @@
 temp-*
 kernel-2.6.28
 linux-2.6.28.tar.bz2
-patch-2.6.28-git3.bz2
+patch-2.6.28-git4.bz2


Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-generic,v
retrieving revision 1.207
retrieving revision 1.208
diff -u -r1.207 -r1.208
--- config-generic	31 Dec 2008 16:12:35 -0000	1.207
+++ config-generic	1 Jan 2009 18:02:48 -0000	1.208
@@ -3278,6 +3278,7 @@
 CONFIG_SECURITY=y
 CONFIG_SECURITY_NETWORK=y
 CONFIG_SECURITY_NETWORK_XFRM=y
+# CONFIG_SECURITY_PATH is not set
 CONFIG_SECURITY_CAPABILITIES=y
 CONFIG_SECURITY_FILE_CAPABILITIES=y
 # CONFIG_SECURITY_ROOTPLUG is not set


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1188
retrieving revision 1.1189
diff -u -r1.1188 -r1.1189
--- kernel.spec	31 Dec 2008 16:26:21 -0000	1.1188
+++ kernel.spec	1 Jan 2009 18:02:48 -0000	1.1189
@@ -57,7 +57,7 @@
 # The rc snapshot level
 %define rcrev 0
 # The git snapshot level
-%define gitrev 3
+%define gitrev 4
 # Set rpm version accordingly
 %define rpmversion 2.6.%{upstream_sublevel}
 %endif
@@ -1762,6 +1762,9 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Thu Jan 01 2009 Dave Jones <davej at redhat.com>
+- 2.6.28-git4
+
 * Wed Dec 31 2008 Kyle McMartin <kyle at redhat.com>
 - Rebase drm-modesetting-radeon.patch
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v
retrieving revision 1.939
retrieving revision 1.940
diff -u -r1.939 -r1.940
--- sources	31 Dec 2008 16:12:35 -0000	1.939
+++ sources	1 Jan 2009 18:02:48 -0000	1.940
@@ -1,2 +1,2 @@
 d351e44709c9810b85e29b877f50968a  linux-2.6.28.tar.bz2
-bb726ff169df1ed6db619a300c599097  patch-2.6.28-git3.bz2
+5959053c69e099586eb3cacd3e4cb56e  patch-2.6.28-git4.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v
retrieving revision 1.851
retrieving revision 1.852
diff -u -r1.851 -r1.852
--- upstream	31 Dec 2008 16:12:35 -0000	1.851
+++ upstream	1 Jan 2009 18:02:48 -0000	1.852
@@ -1,2 +1,2 @@
 linux-2.6.28.tar.bz2
-patch-2.6.28-git3.bz2
+patch-2.6.28-git4.bz2


--- patch-2.6.28-git3.bz2.sign DELETED ---



From nbecker at fedoraproject.org  Thu Jan  1 18:06:59 2009
From: nbecker at fedoraproject.org (Neal Becker)
Date: Thu,  1 Jan 2009 18:06:59 +0000 (UTC)
Subject: rpms/mercurial/F-10 .cvsignore,1.21,1.22 sources,1.24,1.25
Message-ID: <20090101180659.32C237011B@cvs1.fedora.phx.redhat.com>

Author: nbecker

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

Modified Files:
	.cvsignore sources 
Log Message:
forgot sources


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mercurial/F-10/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- .cvsignore	21 Dec 2008 13:58:23 -0000	1.21
+++ .cvsignore	1 Jan 2009 18:06:28 -0000	1.22
@@ -1 +1 @@
-mercurial-1.1.1.tar.gz
+mercurial-1.1.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mercurial/F-10/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- sources	21 Dec 2008 13:58:23 -0000	1.24
+++ sources	1 Jan 2009 18:06:28 -0000	1.25
@@ -1 +1 @@
-eae043de903b263e290b078ab223f6c5  mercurial-1.1.1.tar.gz
+4fd3b9a2e5dcd025840c3849b136bec8  mercurial-1.1.2.tar.gz



From nbecker at fedoraproject.org  Thu Jan  1 18:13:37 2009
From: nbecker at fedoraproject.org (Neal Becker)
Date: Thu,  1 Jan 2009 18:13:37 +0000 (UTC)
Subject: rpms/mercurial/F-9 .cvsignore,1.19,1.20 sources,1.22,1.23
Message-ID: <20090101181337.1A3397011B@cvs1.fedora.phx.redhat.com>

Author: nbecker

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

Modified Files:
	.cvsignore sources 
Log Message:
forgot sources


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mercurial/F-9/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- .cvsignore	21 Dec 2008 14:03:02 -0000	1.19
+++ .cvsignore	1 Jan 2009 18:13:06 -0000	1.20
@@ -1 +1 @@
-mercurial-1.1.1.tar.gz
+mercurial-1.1.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mercurial/F-9/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- sources	21 Dec 2008 14:03:03 -0000	1.22
+++ sources	1 Jan 2009 18:13:06 -0000	1.23
@@ -1 +1 @@
-eae043de903b263e290b078ab223f6c5  mercurial-1.1.1.tar.gz
+4fd3b9a2e5dcd025840c3849b136bec8  mercurial-1.1.2.tar.gz



From rdieter at fedoraproject.org  Thu Jan  1 18:14:52 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu,  1 Jan 2009 18:14:52 +0000 (UTC)
Subject: rpms/gstreamer/devel gstreamer.spec,1.88,1.89
Message-ID: <20090101181452.3B1F37011B@cvs1.fedora.phx.redhat.com>

Author: rdieter

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

Modified Files:
	gstreamer.spec 
Log Message:
* Thu Jan 01 2008 Rex Dieter <rdieter at fedoraprojet.org> - 0.10.21-3
- rebuild for pkgconfig deps (#478576)



Index: gstreamer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamer/devel/gstreamer.spec,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -r1.88 -r1.89
--- gstreamer.spec	12 Nov 2008 15:01:45 -0000	1.88
+++ gstreamer.spec	1 Jan 2009 18:14:22 -0000	1.89
@@ -6,7 +6,7 @@
 
 Name: 		%{gstreamer}
 Version: 	0.10.21
-Release: 	2%{?dist}
+Release: 	3%{?dist}
 Summary: 	GStreamer streaming media framework runtime
 
 Group: 		Applications/Multimedia
@@ -26,7 +26,8 @@
 BuildRequires: 	m4
 BuildRequires: 	check-devel
 BuildRequires: 	gtk-doc >= 1.3
-BuildRequires:	gettext
+BuildRequires:  gettext
+BuildRequires:  pkgconfig
 # We need to use the system libtool or else we end up with RPATHs
 BuildRequires:  libtool
 
@@ -217,6 +218,9 @@
 %{_sysconfdir}/rpm/macros.gstreamer
 
 %changelog
+* Thu Jan 01 2008 Rex Dieter <rdieter at fedoraprojet.org> - 0.10.21-3
+- rebuild for pkgconfig deps (#478576)
+
 * Tue Nov 11 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.10.21-2
 - fix gnome bz 555631 with patch from upstream cvs
 - use system libtool to prevent rpaths



From kevin at fedoraproject.org  Thu Jan  1 18:16:49 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu,  1 Jan 2009 18:16:49 +0000 (UTC)
Subject: rpms/rdiff-backup/devel .cvsignore, 1.10, 1.11 sources, 1.11,
	1.12 rdiff-backup.spec, 1.26, 1.27
Message-ID: <20090101181649.F41897011B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/rdiff-backup/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23192

Modified Files:
	.cvsignore sources rdiff-backup.spec 
Log Message:
Update to 1.2.4



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rdiff-backup/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	29 Dec 2008 18:54:18 -0000	1.10
+++ .cvsignore	1 Jan 2009 18:16:19 -0000	1.11
@@ -1 +1 @@
-rdiff-backup-1.2.3.tar.gz
+rdiff-backup-1.2.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rdiff-backup/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	29 Dec 2008 18:54:17 -0000	1.11
+++ sources	1 Jan 2009 18:16:19 -0000	1.12
@@ -1 +1 @@
-97e4b3b7c17b18bfdee4a185f1dc915b  rdiff-backup-1.2.3.tar.gz
+0d3f24ede9d27321371fd19014431e59  rdiff-backup-1.2.4.tar.gz


Index: rdiff-backup.spec
===================================================================
RCS file: /cvs/extras/rpms/rdiff-backup/devel/rdiff-backup.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- rdiff-backup.spec	29 Dec 2008 18:54:18 -0000	1.26
+++ rdiff-backup.spec	1 Jan 2009 18:16:19 -0000	1.27
@@ -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.3
+Version: 1.2.4
 Summary: Convenient and transparent local/remote incremental mirror/backup
 Name: rdiff-backup
 Release: 1%{?dist}
@@ -56,6 +56,9 @@
 %{python_sitearch}/rdiff_backup-%{version}-py?.?.egg-info
 
 %changelog
+* Thu Jan 01 2009 Kevin Fenzi <kevin at tummy.com> - 1.2.4-1
+- Update to 1.2.4
+
 * Mon Dec 29 2008 Kevin Fenzi <kevin at tummy.com> - 1.2.3-1
 - Update to 1.2.3
 - Also fixes bug 477507



From rdieter at fedoraproject.org  Thu Jan  1 18:17:23 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu,  1 Jan 2009 18:17:23 +0000 (UTC)
Subject: rpms/gstreamer/devel gstreamer.spec,1.89,1.90
Message-ID: <20090101181723.73C1D7011B@cvs1.fedora.phx.redhat.com>

Author: rdieter

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

Modified Files:
	gstreamer.spec 
Log Message:
doh, happy new year!



Index: gstreamer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamer/devel/gstreamer.spec,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -r1.89 -r1.90
--- gstreamer.spec	1 Jan 2009 18:14:22 -0000	1.89
+++ gstreamer.spec	1 Jan 2009 18:16:53 -0000	1.90
@@ -218,7 +218,7 @@
 %{_sysconfdir}/rpm/macros.gstreamer
 
 %changelog
-* Thu Jan 01 2008 Rex Dieter <rdieter at fedoraprojet.org> - 0.10.21-3
+* Thu Jan 01 2009 Rex Dieter <rdieter at fedoraprojet.org> - 0.10.21-3
 - rebuild for pkgconfig deps (#478576)
 
 * Tue Nov 11 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.10.21-2



From rdieter at fedoraproject.org  Thu Jan  1 18:18:36 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu,  1 Jan 2009 18:18:36 +0000 (UTC)
Subject: rpms/gstreamer-plugins-base/devel gstreamer-plugins-base.spec, 1.66,
	1.67
Message-ID: <20090101181836.A5BCF7011B@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/gstreamer-plugins-base/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23573

Modified Files:
	gstreamer-plugins-base.spec 
Log Message:
* Thu Jan 1 2009 - Rex Dieter <rdieter at fedoraproject.org> - 0.10.2-3
- rebuild for pkgconfig deps (#478577)



Index: gstreamer-plugins-base.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamer-plugins-base/devel/gstreamer-plugins-base.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- gstreamer-plugins-base.spec	3 Oct 2008 09:55:19 -0000	1.66
+++ gstreamer-plugins-base.spec	1 Jan 2009 18:18:06 -0000	1.67
@@ -5,7 +5,7 @@
 
 Name: 		%{gstreamer}-plugins-base
 Version: 	0.10.21
-Release:  	2%{?dist}	
+Release:  	3%{?dist}	
 Summary: 	GStreamer streaming media framework base plug-ins
 
 Group: 		Applications/Multimedia
@@ -33,6 +33,7 @@
 BuildRequires:  cdparanoia-devel
 BuildRequires:  libvisual-devel
 BuildRequires:  gtk2-devel
+BuildRequires:  pkgconfig
 Obsoletes:	gstreamer-plugins
 
 # documentation
@@ -237,6 +238,9 @@
 %doc %{_datadir}/gtk-doc/html/gst-plugins-base-plugins-%{majorminor}
 
 %changelog
+* Thu Jan 1 2009 - Rex Dieter <rdieter at fedoraproject.org> - 0.10.2-3
+- rebuild for pkgconfig deps (#478577)
+
 * Fri Oct 03 2008 - Bastien Nocera <bnocera at redhat.com> - 0.10.21-2
 - Update the gstreamer requirement
 - Add a gtk2-devel BR, so that the test-colorkey program will be built



From kevin at fedoraproject.org  Thu Jan  1 18:30:15 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu,  1 Jan 2009 18:30:15 +0000 (UTC)
Subject: rpms/rdiff-backup/F-10 sources, 1.11, 1.12 .cvsignore, 1.10,
	1.11 rdiff-backup.spec, 1.24, 1.25
Message-ID: <20090101183015.303A97011B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/rdiff-backup/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27766

Modified Files:
	sources .cvsignore rdiff-backup.spec 
Log Message:
Update to 1.2.4



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rdiff-backup/F-10/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	29 Dec 2008 19:07:18 -0000	1.11
+++ sources	1 Jan 2009 18:29:44 -0000	1.12
@@ -1 +1 @@
-97e4b3b7c17b18bfdee4a185f1dc915b  rdiff-backup-1.2.3.tar.gz
+0d3f24ede9d27321371fd19014431e59  rdiff-backup-1.2.4.tar.gz


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rdiff-backup/F-10/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	29 Dec 2008 19:07:18 -0000	1.10
+++ .cvsignore	1 Jan 2009 18:29:44 -0000	1.11
@@ -1 +1 @@
-rdiff-backup-1.2.3.tar.gz
+rdiff-backup-1.2.4.tar.gz


Index: rdiff-backup.spec
===================================================================
RCS file: /cvs/extras/rpms/rdiff-backup/F-10/rdiff-backup.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- rdiff-backup.spec	29 Dec 2008 19:07:18 -0000	1.24
+++ rdiff-backup.spec	1 Jan 2009 18:29:44 -0000	1.25
@@ -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.3
+Version: 1.2.4
 Summary: Convenient and transparent local/remote incremental mirror/backup
 Name: rdiff-backup
 Release: 1%{?dist}
@@ -56,6 +56,9 @@
 %{python_sitearch}/rdiff_backup-%{version}-py?.?.egg-info
 
 %changelog
+* Thu Jan 01 2009 Kevin Fenzi <kevin at tummy.com> - 1.2.4-1
+- Update to 1.2.4
+
 * Mon Dec 29 2008 Kevin Fenzi <kevin at tummy.com> - 1.2.3-1
 - Update to 1.2.3
 - Also fixes bug 477507



From scop at fedoraproject.org  Thu Jan  1 18:32:46 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Thu,  1 Jan 2009 18:32:46 +0000 (UTC)
Subject: rpms/rpmdevtools/EL-5 rpmdevtools-5.3-el53-conflict.patch, NONE,
	1.1 rpmdevtools.spec, 1.5, 1.6
Message-ID: <20090101183246.2BE157011B@cvs1.fedora.phx.redhat.com>

Author: scop

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

Modified Files:
	rpmdevtools.spec 
Added Files:
	rpmdevtools-5.3-el53-conflict.patch 
Log Message:
* Thu Jan  1 2009 Ville Skytt?? <ville.skytta at iki.fi> - 5.3-2
- Avoid conflict with EL 5.3 rpm (#466939, Panu Matilainen).


rpmdevtools-5.3-el53-conflict.patch:

--- NEW FILE rpmdevtools-5.3-el53-conflict.patch ---
diff -up rpmdevtools-5.3/check-rpaths-worker~ rpmdevtools-5.3/check-rpaths-worker
--- rpmdevtools-5.3/check-rpaths-worker~	2006-08-16 01:28:09.000000000 +0300
+++ rpmdevtools-5.3/check-rpaths-worker	2009-01-01 20:23:06.000000000 +0200
@@ -63,8 +63,6 @@ function showHint()
 * - to check existing files, set \$RPM_BUILD_ROOT and execute check-rpaths like
 *   \$ RPM_BUILD_ROOT=<top-dir> /usr/lib/rpm/check-rpaths
 *  
-* 'check-rpaths' is part of 'rpmdevtools'.
-*
 *******************************************************************************
 EOF
 }


Index: rpmdevtools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rpmdevtools/EL-5/rpmdevtools.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- rpmdevtools.spec	25 Oct 2006 12:26:07 -0000	1.5
+++ rpmdevtools.spec	1 Jan 2009 18:32:15 -0000	1.6
@@ -4,7 +4,7 @@
 
 Name:           rpmdevtools
 Version:        5.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        RPM Development Tools
 
 Group:          Development/Tools
@@ -12,6 +12,8 @@
 URL:            http://fedora.redhat.com/
 Source0:        %{name}-%{version}.tar.bz2
 Source1:        http://people.redhat.com/nphilipp/spectool/spectool-%{spectool_version}.tar.bz2
+# Avoid conflict with EL 5.3 rpm, #466939
+Patch0:         %{name}-5.3-el53-conflict.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -42,6 +44,7 @@
 
 %prep
 %setup -q -a 1
+%patch0 -p1
 cp -p spectool*/README README.spectool
 
 
@@ -120,6 +123,9 @@
 
 
 %changelog
+* Thu Jan  1 2009 Ville Skytt?? <ville.skytta at iki.fi> - 5.3-2
+- Avoid conflict with EL 5.3 rpm (#466939, Panu Matilainen).
+
 * Wed Oct 25 2006 Ville Skytt?? <ville.skytta at iki.fi> - 5.3-1
 - Update spectool to 1.0.8, fixes #212108.
 



From kevin at fedoraproject.org  Thu Jan  1 18:49:28 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu,  1 Jan 2009 18:49:28 +0000 (UTC)
Subject: rpms/rdiff-backup/F-9 sources, 1.11, 1.12 .cvsignore, 1.10,
	1.11 rdiff-backup.spec, 1.23, 1.24
Message-ID: <20090101184928.7C0197011B@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-serv30515

Modified Files:
	sources .cvsignore rdiff-backup.spec 
Log Message:
Update to 1.2.4



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rdiff-backup/F-9/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	29 Dec 2008 19:18:59 -0000	1.11
+++ sources	1 Jan 2009 18:48:58 -0000	1.12
@@ -1 +1 @@
-97e4b3b7c17b18bfdee4a185f1dc915b  rdiff-backup-1.2.3.tar.gz
+0d3f24ede9d27321371fd19014431e59  rdiff-backup-1.2.4.tar.gz


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rdiff-backup/F-9/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	29 Dec 2008 19:18:59 -0000	1.10
+++ .cvsignore	1 Jan 2009 18:48:58 -0000	1.11
@@ -1 +1 @@
-rdiff-backup-1.2.3.tar.gz
+rdiff-backup-1.2.4.tar.gz


Index: rdiff-backup.spec
===================================================================
RCS file: /cvs/extras/rpms/rdiff-backup/F-9/rdiff-backup.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- rdiff-backup.spec	29 Dec 2008 19:18:59 -0000	1.23
+++ rdiff-backup.spec	1 Jan 2009 18:48:58 -0000	1.24
@@ -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.3
+Version: 1.2.4
 Summary: Convenient and transparent local/remote incremental mirror/backup
 Name: rdiff-backup
 Release: 1%{?dist}
@@ -56,6 +56,9 @@
 %{python_sitearch}/rdiff_backup-%{version}-py?.?.egg-info
 
 %changelog
+* Thu Jan 01 2009 Kevin Fenzi <kevin at tummy.com> - 1.2.4-1
+- Update to 1.2.4
+
 * Mon Dec 29 2008 Kevin Fenzi <kevin at tummy.com> - 1.2.3-1
 - Update to 1.2.3
 - Also fixes bug 477507



From simo at fedoraproject.org  Thu Jan  1 19:21:01 2009
From: simo at fedoraproject.org (Simo Sorce)
Date: Thu,  1 Jan 2009 19:21:01 +0000 (UTC)
Subject: rpms/rsync/devel rsync.spec,1.60,1.61
Message-ID: <20090101192101.B79EF7011B@cvs1.fedora.phx.redhat.com>

Author: simo

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

Modified Files:
	rsync.spec 
Log Message:
Merge review fixes (bz#226380)



Index: rsync.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rsync/devel/rsync.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- rsync.spec	8 Sep 2008 14:01:31 -0000	1.60
+++ rsync.spec	1 Jan 2009 19:20:31 -0000	1.61
@@ -1,17 +1,17 @@
-Summary: A program for synchronizing files over a network.
+Summary: A program for synchronizing files over a network
 Name: rsync
 Version: 3.0.4
 Release: 0%{?dist}
 Group: Applications/Internet
+URL: http://rsync.samba.org/
 # TAG: for pre versions use
-#Source0:	ftp://rsync.samba.org/pub/rsync/rsync-%{version}pre3.tar.gz
-Source0:	ftp://rsync.samba.org/pub/rsync/rsync-%{version}.tar.gz
-#Source1:	ftp://rsync.samba.org/pub/rsync/rsync-patches-%{version}pre3.tar.gz
-Source1:	ftp://rsync.samba.org/pub/rsync/rsync-patches-%{version}.tar.gz
+#Source0: ftp://rsync.samba.org/pub/rsync/rsync-%{version}pre3.tar.gz
+Source0: ftp://rsync.samba.org/pub/rsync/rsync-%{version}.tar.gz
+#Source1: ftp://rsync.samba.org/pub/rsync/rsync-patches-%{version}pre3.tar.gz
+Source1: ftp://rsync.samba.org/pub/rsync/rsync-patches-%{version}.tar.gz
 Source2: rsync.xinetd
-BuildRequires: libacl-devel, libattr-devel, autoconf, make, gcc, popt-devel
-Prefix: %{_prefix}
-BuildRoot: /var/tmp/%{name}-root
+BuildRequires: libacl-devel, libattr-devel, autoconf, popt-devel
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 License: GPLv3+
 
 %description
@@ -47,9 +47,9 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%makeinstall
-mkdir -p $RPM_BUILD_ROOT/etc/xinetd.d
-install -m 644 %SOURCE2 $RPM_BUILD_ROOT/etc/xinetd.d/rsync
+%makeinstall INSTALLCMD='install -p' INSTALLMAN='install -p'
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/xinetd.d
+install -p -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/xinetd.d/%{name}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -57,9 +57,9 @@
 %files
 %defattr(-,root,root)
 %doc COPYING NEWS OLDNEWS README support/ tech_report.tex
-%config(noreplace) /etc/xinetd.d/rsync
-%{_prefix}/bin/rsync
-%{_mandir}/man1/rsync.1*
+%config(noreplace) %{_sysconfdir}/xinetd.d/%{name}
+%{_bindir}/%{name}
+%{_mandir}/man1/%{name}.1*
 %{_mandir}/man5/rsyncd.conf.5*
 
 %changelog
@@ -407,7 +407,7 @@
   showing no packager nor signature but giving 
   "Source RPM: rsync-1.6.3-1.src.rpm".
 - Changes from 1.6.2-1 packaging: added '$RPM_OPT_FLAGS' to make, strip
-  to '%build', removed '%prefix'.
+  to '%%build', removed '%%prefix'.
 
 * Thu Apr 10 1997 Michael De La Rue <miked at ed.ac.uk>
 - rsync-1.6.2-1 packaged.  (This entry by jam to credit Michael for the



From turki at fedoraproject.org  Thu Jan  1 19:21:52 2009
From: turki at fedoraproject.org (Nikolay Vladimirov)
Date: Thu,  1 Jan 2009 19:21:52 +0000 (UTC)
Subject: rpms/msmtp/devel .cvsignore, 1.6, 1.7 msmtp.spec, 1.8, 1.9 sources, 
	1.6, 1.7
Message-ID: <20090101192152.5A6807011B@cvs1.fedora.phx.redhat.com>

Author: turki

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

Modified Files:
	.cvsignore msmtp.spec sources 
Log Message:
Update to 1.4.17


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/msmtp/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	29 Jul 2008 09:38:58 -0000	1.6
+++ .cvsignore	1 Jan 2009 19:21:22 -0000	1.7
@@ -1 +1 @@
-msmtp-1.4.16.tar.bz2
+msmtp-1.4.17.tar.bz2


Index: msmtp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/msmtp/devel/msmtp.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- msmtp.spec	29 Jul 2008 09:38:58 -0000	1.8
+++ msmtp.spec	1 Jan 2009 19:21:22 -0000	1.9
@@ -1,5 +1,5 @@
 Name:           msmtp
-Version:        1.4.16 
+Version:        1.4.17 
 Release:        1%{?dist}
 Summary:        SMTP client
 Group:          System Environment/Base 
@@ -12,6 +12,7 @@
 BuildRequires:  libidn-devel
 BuildRequires:  gettext
 BuildRequires:  libgsasl-devel
+BuildRequires:  gnome-keyring-devel
 
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
@@ -34,7 +35,7 @@
 %setup -q
 
 %build
-%configure --disable-rpath
+%configure --disable-rpath --with-gnome-keyring
 make %{?_smp_mflags}
 
 
@@ -60,13 +61,19 @@
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING NEWS README THANKS
-%doc doc/msmtp.html  doc/msmtprc-system.example doc/msmtprc-user.example doc/Mutt+msmtp.txt
+%doc doc/msmtp.html doc/msmtp.pdf doc/msmtprc-system.example doc/msmtprc-user.example doc/Mutt+msmtp.txt
 %{_bindir}/msmtp
 %{_infodir}/msmtp.info*
 %{_mandir}/man1/msmtp.1*
 
 
 %changelog
+* Thu Jan 1 2009 Nikolay Vladimirov <nikolay at vladimiroff.com> - 1.4.17-1
+- Msmtp now also reads SYSCONFDIR/netrc if the password wasn't found in ~/.netrc.
+- Support for the GNOME keyring was added by Satoru SATOH.
+- Added BuildRequires for gnome-keyring-devel due to the new feature.
+- Added PDF version of the manual.
+
 * Tue Jul 29 2008 Nikolay Vladimirov <nikolay at vladimiroff.com> - 1.4.16-1
 - new upstream release - 1.4.16
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/msmtp/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	29 Jul 2008 09:38:58 -0000	1.6
+++ sources	1 Jan 2009 19:21:22 -0000	1.7
@@ -1 +1 @@
-77a333601e9de03f695539498e678cc2  msmtp-1.4.16.tar.bz2
+b0b74f1144812b60688f590c62a0d3dd  msmtp-1.4.17.tar.bz2



From simo at fedoraproject.org  Thu Jan  1 19:24:04 2009
From: simo at fedoraproject.org (Simo Sorce)
Date: Thu,  1 Jan 2009 19:24:04 +0000 (UTC)
Subject: rpms/rsync/devel .cvsignore, 1.32, 1.33 rsync.spec, 1.61,
	1.62 sources, 1.32, 1.33
Message-ID: <20090101192404.A897A7011B@cvs1.fedora.phx.redhat.com>

Author: simo

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

Modified Files:
	.cvsignore rsync.spec sources 
Log Message:
* Thu Jan  1 2009 Simo Sorce <ssorce at redhat.com> 3.0.5-0.fc11
- New upstream bugfix release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rsync/devel/.cvsignore,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- .cvsignore	8 Sep 2008 14:01:31 -0000	1.32
+++ .cvsignore	1 Jan 2009 19:23:34 -0000	1.33
@@ -1,2 +1,2 @@
-rsync-3.0.4.tar.gz
-rsync-patches-3.0.4.tar.gz
+rsync-3.0.5.tar.gz
+rsync-patches-3.0.5.tar.gz


Index: rsync.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rsync/devel/rsync.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- rsync.spec	1 Jan 2009 19:20:31 -0000	1.61
+++ rsync.spec	1 Jan 2009 19:23:34 -0000	1.62
@@ -1,6 +1,6 @@
 Summary: A program for synchronizing files over a network
 Name: rsync
-Version: 3.0.4
+Version: 3.0.5
 Release: 0%{?dist}
 Group: Applications/Internet
 URL: http://rsync.samba.org/
@@ -63,6 +63,9 @@
 %{_mandir}/man5/rsyncd.conf.5*
 
 %changelog
+* Thu Jan  1 2009 Simo Sorce <ssorce at redhat.com> 3.0.5-0.fc11
+- New upstream bugfix release
+
 * Mon Sep  8 2008 Simo Sorce <ssorce at redhat.com> 3.0.4-0.fc10
 - New upstream bugfix release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rsync/devel/sources,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- sources	8 Sep 2008 14:01:31 -0000	1.32
+++ sources	1 Jan 2009 19:23:34 -0000	1.33
@@ -1,2 +1,2 @@
-2b2d159c9bd1b5f8adfd8b13da3a1f3f  rsync-3.0.4.tar.gz
-a7697d7002f7789faede7109b420b94c  rsync-patches-3.0.4.tar.gz
+a130e736c011572cb423b6245e97fc4b  rsync-3.0.5.tar.gz
+ada27361a483f7366b9bb3dab4cba0d0  rsync-patches-3.0.5.tar.gz



From simo at fedoraproject.org  Thu Jan  1 19:27:20 2009
From: simo at fedoraproject.org (Simo Sorce)
Date: Thu,  1 Jan 2009 19:27:20 +0000 (UTC)
Subject: rpms/rsync/F-10 .cvsignore, 1.32, 1.33 rsync.spec, 1.60,
	1.61 sources, 1.32, 1.33
Message-ID: <20090101192720.4E5057011B@cvs1.fedora.phx.redhat.com>

Author: simo

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

Modified Files:
	.cvsignore rsync.spec sources 
Log Message:
* Thu Jan  1 2009 Simo Sorce <ssorce at redhat.com> 3.0.5-0.fc10
- New upstream bugfix release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rsync/F-10/.cvsignore,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- .cvsignore	8 Sep 2008 14:01:31 -0000	1.32
+++ .cvsignore	1 Jan 2009 19:26:49 -0000	1.33
@@ -1,2 +1,2 @@
-rsync-3.0.4.tar.gz
-rsync-patches-3.0.4.tar.gz
+rsync-3.0.5.tar.gz
+rsync-patches-3.0.5.tar.gz


Index: rsync.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rsync/F-10/rsync.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- rsync.spec	8 Sep 2008 14:01:31 -0000	1.60
+++ rsync.spec	1 Jan 2009 19:26:49 -0000	1.61
@@ -1,17 +1,17 @@
-Summary: A program for synchronizing files over a network.
+Summary: A program for synchronizing files over a network
 Name: rsync
-Version: 3.0.4
+Version: 3.0.5
 Release: 0%{?dist}
 Group: Applications/Internet
+URL: http://rsync.samba.org/
 # TAG: for pre versions use
-#Source0:	ftp://rsync.samba.org/pub/rsync/rsync-%{version}pre3.tar.gz
-Source0:	ftp://rsync.samba.org/pub/rsync/rsync-%{version}.tar.gz
-#Source1:	ftp://rsync.samba.org/pub/rsync/rsync-patches-%{version}pre3.tar.gz
-Source1:	ftp://rsync.samba.org/pub/rsync/rsync-patches-%{version}.tar.gz
+#Source0: ftp://rsync.samba.org/pub/rsync/rsync-%{version}pre3.tar.gz
+Source0: ftp://rsync.samba.org/pub/rsync/rsync-%{version}.tar.gz
+#Source1: ftp://rsync.samba.org/pub/rsync/rsync-patches-%{version}pre3.tar.gz
+Source1: ftp://rsync.samba.org/pub/rsync/rsync-patches-%{version}.tar.gz
 Source2: rsync.xinetd
-BuildRequires: libacl-devel, libattr-devel, autoconf, make, gcc, popt-devel
-Prefix: %{_prefix}
-BuildRoot: /var/tmp/%{name}-root
+BuildRequires: libacl-devel, libattr-devel, autoconf, popt-devel
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 License: GPLv3+
 
 %description
@@ -47,9 +47,9 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%makeinstall
-mkdir -p $RPM_BUILD_ROOT/etc/xinetd.d
-install -m 644 %SOURCE2 $RPM_BUILD_ROOT/etc/xinetd.d/rsync
+%makeinstall INSTALLCMD='install -p' INSTALLMAN='install -p'
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/xinetd.d
+install -p -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/xinetd.d/%{name}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -57,12 +57,15 @@
 %files
 %defattr(-,root,root)
 %doc COPYING NEWS OLDNEWS README support/ tech_report.tex
-%config(noreplace) /etc/xinetd.d/rsync
-%{_prefix}/bin/rsync
-%{_mandir}/man1/rsync.1*
+%config(noreplace) %{_sysconfdir}/xinetd.d/%{name}
+%{_bindir}/%{name}
+%{_mandir}/man1/%{name}.1*
 %{_mandir}/man5/rsyncd.conf.5*
 
 %changelog
+* Thu Jan  1 2009 Simo Sorce <ssorce at redhat.com> 3.0.5-0.fc10
+- New upstream bugfix release
+
 * Mon Sep  8 2008 Simo Sorce <ssorce at redhat.com> 3.0.4-0.fc10
 - New upstream bugfix release
 
@@ -407,7 +410,7 @@
   showing no packager nor signature but giving 
   "Source RPM: rsync-1.6.3-1.src.rpm".
 - Changes from 1.6.2-1 packaging: added '$RPM_OPT_FLAGS' to make, strip
-  to '%build', removed '%prefix'.
+  to '%%build', removed '%%prefix'.
 
 * Thu Apr 10 1997 Michael De La Rue <miked at ed.ac.uk>
 - rsync-1.6.2-1 packaged.  (This entry by jam to credit Michael for the


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rsync/F-10/sources,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- sources	8 Sep 2008 14:01:31 -0000	1.32
+++ sources	1 Jan 2009 19:26:49 -0000	1.33
@@ -1,2 +1,2 @@
-2b2d159c9bd1b5f8adfd8b13da3a1f3f  rsync-3.0.4.tar.gz
-a7697d7002f7789faede7109b420b94c  rsync-patches-3.0.4.tar.gz
+a130e736c011572cb423b6245e97fc4b  rsync-3.0.5.tar.gz
+ada27361a483f7366b9bb3dab4cba0d0  rsync-patches-3.0.5.tar.gz



From turki at fedoraproject.org  Thu Jan  1 19:32:20 2009
From: turki at fedoraproject.org (Nikolay Vladimirov)
Date: Thu,  1 Jan 2009 19:32:20 +0000 (UTC)
Subject: rpms/msmtp/F-10 .cvsignore, 1.6, 1.7 msmtp.spec, 1.8, 1.9 sources,
	1.6, 1.7
Message-ID: <20090101193220.A13A97011B@cvs1.fedora.phx.redhat.com>

Author: turki

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

Modified Files:
	.cvsignore msmtp.spec sources 
Log Message:
Update to 1.4.17


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/msmtp/F-10/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	29 Jul 2008 09:38:58 -0000	1.6
+++ .cvsignore	1 Jan 2009 19:31:50 -0000	1.7
@@ -1 +1 @@
-msmtp-1.4.16.tar.bz2
+msmtp-1.4.17.tar.bz2


Index: msmtp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/msmtp/F-10/msmtp.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- msmtp.spec	29 Jul 2008 09:38:58 -0000	1.8
+++ msmtp.spec	1 Jan 2009 19:31:50 -0000	1.9
@@ -1,5 +1,5 @@
 Name:           msmtp
-Version:        1.4.16 
+Version:        1.4.17 
 Release:        1%{?dist}
 Summary:        SMTP client
 Group:          System Environment/Base 
@@ -12,6 +12,7 @@
 BuildRequires:  libidn-devel
 BuildRequires:  gettext
 BuildRequires:  libgsasl-devel
+BuildRequires:  gnome-keyring-devel
 
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
@@ -34,7 +35,7 @@
 %setup -q
 
 %build
-%configure --disable-rpath
+%configure --disable-rpath --with-gnome-keyring
 make %{?_smp_mflags}
 
 
@@ -60,13 +61,19 @@
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING NEWS README THANKS
-%doc doc/msmtp.html  doc/msmtprc-system.example doc/msmtprc-user.example doc/Mutt+msmtp.txt
+%doc doc/msmtp.html doc/msmtp.pdf doc/msmtprc-system.example doc/msmtprc-user.example doc/Mutt+msmtp.txt
 %{_bindir}/msmtp
 %{_infodir}/msmtp.info*
 %{_mandir}/man1/msmtp.1*
 
 
 %changelog
+* Thu Jan 1 2009 Nikolay Vladimirov <nikolay at vladimiroff.com> - 1.4.17-1
+- Msmtp now also reads SYSCONFDIR/netrc if the password wasn't found in ~/.netrc.
+- Support for the GNOME keyring was added by Satoru SATOH.
+- Added BuildRequires for gnome-keyring-devel due to the new feature.
+- Added PDF version of the manual.
+
 * Tue Jul 29 2008 Nikolay Vladimirov <nikolay at vladimiroff.com> - 1.4.16-1
 - new upstream release - 1.4.16
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/msmtp/F-10/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	29 Jul 2008 09:38:58 -0000	1.6
+++ sources	1 Jan 2009 19:31:50 -0000	1.7
@@ -1 +1 @@
-77a333601e9de03f695539498e678cc2  msmtp-1.4.16.tar.bz2
+b0b74f1144812b60688f590c62a0d3dd  msmtp-1.4.17.tar.bz2



From simo at fedoraproject.org  Thu Jan  1 19:34:21 2009
From: simo at fedoraproject.org (Simo Sorce)
Date: Thu,  1 Jan 2009 19:34:21 +0000 (UTC)
Subject: rpms/rsync/F-10 rsync.spec,1.61,1.62
Message-ID: <20090101193421.8FFF47013F@cvs1.fedora.phx.redhat.com>

Author: simo

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

Modified Files:
	rsync.spec 
Log Message:
A non updated common created the -0 tag in the devel branch.
Up the release to 1 to be abel to tag and build as I cannot delete a wrong tag
from /devel



Index: rsync.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rsync/F-10/rsync.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- rsync.spec	1 Jan 2009 19:26:49 -0000	1.61
+++ rsync.spec	1 Jan 2009 19:33:51 -0000	1.62
@@ -1,7 +1,7 @@
 Summary: A program for synchronizing files over a network
 Name: rsync
 Version: 3.0.5
-Release: 0%{?dist}
+Release: 1%{?dist}
 Group: Applications/Internet
 URL: http://rsync.samba.org/
 # TAG: for pre versions use
@@ -63,7 +63,7 @@
 %{_mandir}/man5/rsyncd.conf.5*
 
 %changelog
-* Thu Jan  1 2009 Simo Sorce <ssorce at redhat.com> 3.0.5-0.fc10
+* Thu Jan  1 2009 Simo Sorce <ssorce at redhat.com> 3.0.5-1.fc10
 - New upstream bugfix release
 
 * Mon Sep  8 2008 Simo Sorce <ssorce at redhat.com> 3.0.4-0.fc10



From turki at fedoraproject.org  Thu Jan  1 20:00:46 2009
From: turki at fedoraproject.org (Nikolay Vladimirov)
Date: Thu,  1 Jan 2009 20:00:46 +0000 (UTC)
Subject: rpms/emerald/devel .cvsignore, 1.11, 1.12 emerald.spec, 1.18,
	1.19 sources, 1.11, 1.12
Message-ID: <20090101200046.8F6F97011B@cvs1.fedora.phx.redhat.com>

Author: turki

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

Modified Files:
	.cvsignore emerald.spec sources 
Log Message:
Update to 0.7.8


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/emerald/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	11 Jul 2008 19:25:58 -0000	1.11
+++ .cvsignore	1 Jan 2009 20:00:16 -0000	1.12
@@ -1 +1 @@
-emerald-0.7.6.tar.bz2
+emerald-0.7.8.tar.bz2


Index: emerald.spec
===================================================================
RCS file: /cvs/pkgs/rpms/emerald/devel/emerald.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- emerald.spec	15 Jul 2008 13:48:54 -0000	1.18
+++ emerald.spec	1 Jan 2009 20:00:16 -0000	1.19
@@ -2,13 +2,12 @@
 Url:            http://www.compiz-fusion.org/
 License:        GPLv2
 Group:          User Interface/Desktops
-Version:        0.7.6
-Release:        2%{?dist}
+Version:        0.7.8
+Release:        1%{?dist}
 
 Summary:        Themeable window decorator and compositing manager for Compiz Fusion
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Source0:        http://releases.compiz-fusion.org/%{version}/%{name}-%{version}.tar.bz2
-Patch0: 	    emerald-theme-manager-desktop.patch
 
 # compiz-devel is not available on these arches
 ExcludeArch:    s390 s390x
@@ -39,9 +38,6 @@
 
 %prep
 %setup -q
-#fix menu entries
-#https://bugzilla.redhat.com/show_bug.cgi?id=286141
-%patch0 -p1 -b .fixed
 
 %build
 %configure --enable-librsvg --disable-mime-update
@@ -100,7 +96,12 @@
 %{_libdir}/libemeraldengine.so
 
 %changelog
-* Tue Jul 15 2008 Nikolay Vladimirof <nikolay at vladimiroff.com> - 0.7.6-2
+* Thu Jan 1 2009 Nikolay Vladimirov <nikolay at vladimiroff.com> - 0.7.8-1
+- Minor bugfixes
+- L10N updates
+- Droping .desktop file patch ( now upsteam ) 
+
+* Tue Jul 15 2008 Nikolay Vladimirov <nikolay at vladimiroff.com> - 0.7.6-2
 - rebuild for ppc64
 
 * Fri Jul 11 2008 Nikolay Vladimirov <nikolay at vladimiroff.com> - 0.7.6-1


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/emerald/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	11 Jul 2008 19:25:58 -0000	1.11
+++ sources	1 Jan 2009 20:00:16 -0000	1.12
@@ -1 +1 @@
-340f4dafde5d6c55bd05c0033aa7d6fe  emerald-0.7.6.tar.bz2
+c7d90c1ca0c91503d474c7e1422edcd5  emerald-0.7.8.tar.bz2



From nphilipp at fedoraproject.org  Thu Jan  1 21:35:24 2009
From: nphilipp at fedoraproject.org (Nils Philippsen)
Date: Thu,  1 Jan 2009 21:35:24 +0000 (UTC)
Subject: rpms/gimp/devel .cvsignore, 1.47, 1.48 gimp.spec, 1.176,
	1.177 sources, 1.47, 1.48
Message-ID: <20090101213524.7F9D07011B@cvs1.fedora.phx.redhat.com>

Author: nphilipp

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

Modified Files:
	.cvsignore gimp.spec sources 
Log Message:
version 2.6.4
add BuildRequires: aalib-devel



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gimp/devel/.cvsignore,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- .cvsignore	24 Nov 2008 08:09:42 -0000	1.47
+++ .cvsignore	1 Jan 2009 21:34:53 -0000	1.48
@@ -1 +1 @@
-gimp-2.6.3.tar.bz2
+gimp-2.6.4.tar.bz2


Index: gimp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gimp/devel/gimp.spec,v
retrieving revision 1.176
retrieving revision 1.177
diff -u -r1.176 -r1.177
--- gimp.spec	1 Dec 2008 15:00:27 -0000	1.176
+++ gimp.spec	1 Jan 2009 21:34:53 -0000	1.177
@@ -22,14 +22,14 @@
 
 Summary:        GNU Image Manipulation Program
 Name:           gimp
-Version:        2.6.3
+Version:        2.6.4
 %define binver 2.6
 %define gimp_lang_ver 20
 %define interfacever 2.0
 %define age 0
 %define minorver 600
 %define microver %(ver=%{version}; echo ${ver##*.*.})
-Release:        3%{?dist}
+Release:        1%{?dist}
 Epoch:          2
 License:        GPLv2+
 Group:          Applications/Multimedia
@@ -37,6 +37,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-root-%(%__id_u -n)
 Obsoletes:      gimp-perl < 2:2.0
 Obsoletes:      gimp < 2:2.6.0-3
+BuildRequires:  aalib-devel
 BuildRequires:  alsa-lib-devel >= 1.0.0
 BuildRequires:  babl-devel >= 0.0.22
 BuildRequires:  cairo-devel >= 1.4.10
@@ -446,6 +447,48 @@
 %{_libdir}/gimp/%{interfacever}/plug-ins/help-browser
 
 %changelog
+* Thu Jan 01 2009 Nils Philippsen <nils at redhat.com> - 2:2.6.4-1
+- version 2.6.4
+
+  Overview of Changes from GIMP 2.6.3 to GIMP 2.6.4
+  =================================================
+  
+  * Bugs fixed:
+  
+   565223 ??? Perspective transformation jagged edges / comb effect
+   563985 ??? jpg save dialog: "cancel" is treated like "commit"
+            for settings
+   564087 ??? Using clone tool on a layer with a part out of canvas
+            causes crashes
+   564593 ??? crash when the drawable is changed while a color tool
+            is active
+   564869 ??? GIMP crashes on selecting Tools->GEGL operation
+   565138 ??? python-fu-foggify does not check if image is in rgb mode
+   563130 ??? Hue selection mode does not cross the 0-360 degrees line
+   563179 ??? Scrollbars not resized when we extend the canvas size
+   562459 ??? PF_PALETTE: 'TypeError' when used in a plugin that is
+            registered in <Image>
+   562427 ??? Compilation with --as-needed
+   562386 ??? PF_SLIDER and PF_SPINNER 'Step' values do not change
+            consistently...
+   562366 ??? Default image dimensions are not correctly
+            transferred in the file/new dialog box
+   561899 ??? GIMP can't save to mounted filesystem if file exists
+  
+  * Updated translations:
+  
+   Greek (el)
+   Hindi (hi)
+   Hungarian (hu)
+   Italian (it)
+   Japanese (ja)
+   Korean (ko)
+   Slovenian (sl)
+   Swedish (sv)
+   Tamil (ta)
+   Simplified Chinese (zh_CN)
+- add BuildRequires: aalib-devel
+
 * Mon Dec 01 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 2:2.6.3-3
 - Rebuild for Python 2.6
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gimp/devel/sources,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- sources	24 Nov 2008 08:09:42 -0000	1.47
+++ sources	1 Jan 2009 21:34:54 -0000	1.48
@@ -1 +1 @@
-39c30867511b79391eb9177c86c8b79a  gimp-2.6.3.tar.bz2
+4e8185e40ab06559ce6dd5ef61b3e83b  gimp-2.6.4.tar.bz2



From nphilipp at fedoraproject.org  Thu Jan  1 21:38:36 2009
From: nphilipp at fedoraproject.org (Nils Philippsen)
Date: Thu,  1 Jan 2009 21:38:36 +0000 (UTC)
Subject: rpms/gimp/F-10 .cvsignore, 1.47, 1.48 gimp.spec, 1.175,
	1.176 sources, 1.47, 1.48
Message-ID: <20090101213836.B2A6F7011B@cvs1.fedora.phx.redhat.com>

Author: nphilipp

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

Modified Files:
	.cvsignore gimp.spec sources 
Log Message:
version 2.6.4
add BuildRequires: aalib-devel



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gimp/F-10/.cvsignore,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- .cvsignore	24 Nov 2008 08:12:19 -0000	1.47
+++ .cvsignore	1 Jan 2009 21:38:06 -0000	1.48
@@ -1 +1 @@
-gimp-2.6.3.tar.bz2
+gimp-2.6.4.tar.bz2


Index: gimp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gimp/F-10/gimp.spec,v
retrieving revision 1.175
retrieving revision 1.176
diff -u -r1.175 -r1.176
--- gimp.spec	1 Dec 2008 12:25:17 -0000	1.175
+++ gimp.spec	1 Jan 2009 21:38:06 -0000	1.176
@@ -22,14 +22,14 @@
 
 Summary:        GNU Image Manipulation Program
 Name:           gimp
-Version:        2.6.3
+Version:        2.6.4
 %define binver 2.6
 %define gimp_lang_ver 20
 %define interfacever 2.0
 %define age 0
 %define minorver 600
 %define microver %(ver=%{version}; echo ${ver##*.*.})
-Release:        2%{?dist}
+Release:        1%{?dist}
 Epoch:          2
 License:        GPLv2+
 Group:          Applications/Multimedia
@@ -37,6 +37,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-root-%(%__id_u -n)
 Obsoletes:      gimp-perl < 2:2.0
 Obsoletes:      gimp < 2:2.6.0-3
+BuildRequires:  aalib-devel
 BuildRequires:  alsa-lib-devel >= 1.0.0
 BuildRequires:  babl-devel >= 0.0.22
 BuildRequires:  cairo-devel >= 1.4.10
@@ -446,6 +447,51 @@
 %{_libdir}/gimp/%{interfacever}/plug-ins/help-browser
 
 %changelog
+* Thu Jan 01 2009 Nils Philippsen <nils at redhat.com> - 2:2.6.4-1
+- version 2.6.4
+
+  Overview of Changes from GIMP 2.6.3 to GIMP 2.6.4
+  =================================================
+  
+  * Bugs fixed:
+  
+   565223 ??? Perspective transformation jagged edges / comb effect
+   563985 ??? jpg save dialog: "cancel" is treated like "commit"
+            for settings
+   564087 ??? Using clone tool on a layer with a part out of canvas
+            causes crashes
+   564593 ??? crash when the drawable is changed while a color tool
+            is active
+   564869 ??? GIMP crashes on selecting Tools->GEGL operation
+   565138 ??? python-fu-foggify does not check if image is in rgb mode
+   563130 ??? Hue selection mode does not cross the 0-360 degrees line
+   563179 ??? Scrollbars not resized when we extend the canvas size
+   562459 ??? PF_PALETTE: 'TypeError' when used in a plugin that is
+            registered in <Image>
+   562427 ??? Compilation with --as-needed
+   562386 ??? PF_SLIDER and PF_SPINNER 'Step' values do not change
+            consistently...
+   562366 ??? Default image dimensions are not correctly
+            transferred in the file/new dialog box
+   561899 ??? GIMP can't save to mounted filesystem if file exists
+  
+  * Updated translations:
+  
+   Greek (el)
+   Hindi (hi)
+   Hungarian (hu)
+   Italian (it)
+   Japanese (ja)
+   Korean (ko)
+   Slovenian (sl)
+   Swedish (sv)
+   Tamil (ta)
+   Simplified Chinese (zh_CN)
+- add BuildRequires: aalib-devel
+
+* Mon Dec 01 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 2:2.6.3-3
+- Rebuild for Python 2.6
+
 * Mon Nov 24 2008 Nils Philippsen <nils at redhat.com> - 2:2.6.3-2
 - own /usr/lib/gimp/2.0/interpreters (#473594)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gimp/F-10/sources,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- sources	24 Nov 2008 08:12:19 -0000	1.47
+++ sources	1 Jan 2009 21:38:06 -0000	1.48
@@ -1 +1 @@
-39c30867511b79391eb9177c86c8b79a  gimp-2.6.3.tar.bz2
+4e8185e40ab06559ce6dd5ef61b3e83b  gimp-2.6.4.tar.bz2



From nphilipp at fedoraproject.org  Thu Jan  1 21:39:01 2009
From: nphilipp at fedoraproject.org (Nils Philippsen)
Date: Thu,  1 Jan 2009 21:39:01 +0000 (UTC)
Subject: rpms/gimp/F-9 .cvsignore, 1.45, 1.46 gimp.spec, 1.165, 1.166 sources,
	1.45, 1.46
Message-ID: <20090101213901.75F307011B@cvs1.fedora.phx.redhat.com>

Author: nphilipp

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

Modified Files:
	.cvsignore gimp.spec sources 
Log Message:
version 2.6.4
add BuildRequires: aalib-devel



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gimp/F-9/.cvsignore,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- .cvsignore	24 Nov 2008 08:12:36 -0000	1.45
+++ .cvsignore	1 Jan 2009 21:38:31 -0000	1.46
@@ -1 +1 @@
-gimp-2.6.3.tar.bz2
+gimp-2.6.4.tar.bz2


Index: gimp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gimp/F-9/gimp.spec,v
retrieving revision 1.165
retrieving revision 1.166
diff -u -r1.165 -r1.166
--- gimp.spec	1 Dec 2008 12:25:20 -0000	1.165
+++ gimp.spec	1 Jan 2009 21:38:31 -0000	1.166
@@ -22,14 +22,14 @@
 
 Summary:        GNU Image Manipulation Program
 Name:           gimp
-Version:        2.6.3
+Version:        2.6.4
 %define binver 2.6
 %define gimp_lang_ver 20
 %define interfacever 2.0
 %define age 0
 %define minorver 600
 %define microver %(ver=%{version}; echo ${ver##*.*.})
-Release:        2%{?dist}
+Release:        1%{?dist}
 Epoch:          2
 License:        GPLv2+
 Group:          Applications/Multimedia
@@ -37,6 +37,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-root-%(%__id_u -n)
 Obsoletes:      gimp-perl < 2:2.0
 Obsoletes:      gimp < 2:2.6.0-3
+BuildRequires:  aalib-devel
 BuildRequires:  alsa-lib-devel >= 1.0.0
 BuildRequires:  babl-devel >= 0.0.22
 BuildRequires:  cairo-devel >= 1.4.10
@@ -446,6 +447,51 @@
 %{_libdir}/gimp/%{interfacever}/plug-ins/help-browser
 
 %changelog
+* Thu Jan 01 2009 Nils Philippsen <nils at redhat.com> - 2:2.6.4-1
+- version 2.6.4
+
+  Overview of Changes from GIMP 2.6.3 to GIMP 2.6.4
+  =================================================
+  
+  * Bugs fixed:
+  
+   565223 ??? Perspective transformation jagged edges / comb effect
+   563985 ??? jpg save dialog: "cancel" is treated like "commit"
+            for settings
+   564087 ??? Using clone tool on a layer with a part out of canvas
+            causes crashes
+   564593 ??? crash when the drawable is changed while a color tool
+            is active
+   564869 ??? GIMP crashes on selecting Tools->GEGL operation
+   565138 ??? python-fu-foggify does not check if image is in rgb mode
+   563130 ??? Hue selection mode does not cross the 0-360 degrees line
+   563179 ??? Scrollbars not resized when we extend the canvas size
+   562459 ??? PF_PALETTE: 'TypeError' when used in a plugin that is
+            registered in <Image>
+   562427 ??? Compilation with --as-needed
+   562386 ??? PF_SLIDER and PF_SPINNER 'Step' values do not change
+            consistently...
+   562366 ??? Default image dimensions are not correctly
+            transferred in the file/new dialog box
+   561899 ??? GIMP can't save to mounted filesystem if file exists
+  
+  * Updated translations:
+  
+   Greek (el)
+   Hindi (hi)
+   Hungarian (hu)
+   Italian (it)
+   Japanese (ja)
+   Korean (ko)
+   Slovenian (sl)
+   Swedish (sv)
+   Tamil (ta)
+   Simplified Chinese (zh_CN)
+- add BuildRequires: aalib-devel
+
+* Mon Dec 01 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 2:2.6.3-3
+- Rebuild for Python 2.6
+
 * Mon Nov 24 2008 Nils Philippsen <nils at redhat.com> - 2:2.6.3-2
 - own /usr/lib/gimp/2.0/interpreters (#473594)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gimp/F-9/sources,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- sources	24 Nov 2008 08:12:36 -0000	1.45
+++ sources	1 Jan 2009 21:38:31 -0000	1.46
@@ -1 +1 @@
-39c30867511b79391eb9177c86c8b79a  gimp-2.6.3.tar.bz2
+4e8185e40ab06559ce6dd5ef61b3e83b  gimp-2.6.4.tar.bz2



From salimma at fedoraproject.org  Thu Jan  1 21:57:03 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Thu,  1 Jan 2009 21:57:03 +0000 (UTC)
Subject: rpms/banshee/F-10 banshee-1-1.4.1-riptags.patch, NONE,
	1.1 banshee.spec, 1.62,
	1.63 banshee-0.10.12-libdbus-glib-dllmap.patch, 1.1,
	NONE banshee-0.10.12-mono-libdir.patch, 1.1, NONE
Message-ID: <20090101215703.139277011B@cvs1.fedora.phx.redhat.com>

Author: salimma

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

Modified Files:
	banshee.spec 
Added Files:
	banshee-1-1.4.1-riptags.patch 
Removed Files:
	banshee-0.10.12-libdbus-glib-dllmap.patch 
	banshee-0.10.12-mono-libdir.patch 
Log Message:
* Thu Jan  1 2009 Michel Salim <salimma at fedoraproject.org> - 1.4.1-3
- Split MusicBrainz libraries into separate subpackages
- Properly tag songs ripped from CDs (bug #477669)


banshee-1-1.4.1-riptags.patch:

--- NEW FILE banshee-1-1.4.1-riptags.patch ---
--- src.orig/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdRipper.cs	2008-09-23 15:29:25.000000000 -0300
+++ src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdRipper.cs	2008-12-17 19:57:47.000000000 -0400
@@ -37,6 +37,7 @@
 using Banshee.Collection;
 using Banshee.Collection.Database;
 using Banshee.MediaEngine;
+using Banshee.Streaming;
 
 namespace Banshee.AudioCd
 {
@@ -198,9 +199,9 @@
         
             ripped_duration += track.Duration;
             track.PrimarySource = ServiceManager.SourceManager.MusicLibrary;
-            track.Uri = args.Uri;
             
-            track.FileSize = Banshee.IO.File.GetSize (track.Uri);
+            TagLib.File file = StreamTagger.ProcessUri (args.Uri);
+            StreamTagger.TrackInfoMerge (track, file, true);
             
             track.Save ();
 



Index: banshee.spec
===================================================================
RCS file: /cvs/pkgs/rpms/banshee/F-10/banshee.spec,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- banshee.spec	27 Nov 2008 06:51:58 -0000	1.62
+++ banshee.spec	1 Jan 2009 21:56:32 -0000	1.63
@@ -2,13 +2,14 @@
 
 Name:    banshee
 Version: 1.4.1
-Release: 1%{?dist}
+Release: 3%{?dist}
 Summary: Easily import, manage, and play selections from your music collection
 Group:   Applications/Multimedia
 License: MIT
 URL:     http://banshee-project.org/
 Source0: http://banshee-project.org/files/banshee/banshee-1-%{version}.tar.bz2
 Source1: README.Fedora
+Patch0:  banshee-1-1.4.1-riptags.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # We only have mono on these arches:
@@ -45,6 +46,7 @@
 BuildRequires: desktop-file-utils
 
 Requires:      podsleuth
+Requires:      %{name}-musicbrainz = %{version}-%{release}
 
 %description
 Banshee allows you to import CDs, sync your music collection to an iPod,
@@ -52,16 +54,50 @@
 library, and create audio and MP3 CDs from subsets of your library.
 
 %package devel
-Summary: Development files for Banshee
-Group: Development/Libraries
+Summary:        Development files for Banshee
+Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
 Requires:       pkgconfig
 
 %description devel
-Development files for Banshee Media Player
+Banshee allows you to import CDs, sync your music collection to an iPod,
+play music directly from an iPod, create playlists with songs from your
+library, and create audio and MP3 CDs from subsets of your library.
+
+The %{name}-devel package contains libraries and header files for
+developing extensions for %{name}.
+
+%package        musicbrainz
+Summary:        MusicBrainz libraries for the Banshee Media Framework
+Group:          System Environment/Libraries
+Requires:       %{name} = %{version}-%{release}
+
+%description    musicbrainz
+Banshee allows you to import CDs, sync your music collection to an iPod,
+play music directly from an iPod, create playlists with songs from your
+library, and create audio and MP3 CDs from subsets of your library.
+
+The %{name}-musicbrainz package contains the MusicBrainz library shipped
+with the Banshee music player.
+
+%package        musicbrainz-devel
+Summary:        Development files for %{name}-musicbrainz
+Group:          Development/Libraries
+Requires:       %{name}-musicbrainz = %{version}-%{release}
+Requires:       pkgconfig
+
+%description    musicbrainz-devel
+Banshee allows you to import CDs, sync your music collection to an iPod,
+play music directly from an iPod, create playlists with songs from your
+library, and create audio and MP3 CDs from subsets of your library.
+
+The %{name}-musicbrainz-devel package contains header files for
+developing applications that use %{name}-musicbrainz.
+
 
 %prep
 %setup -q -n %{name}-1-%{version}
+%patch0 -p0 -b .riptags
 cp -p %{SOURCE1} .
 
 %build
@@ -116,6 +152,7 @@
 %defattr(-,root,root,-)
 %doc COPYING AUTHORS ChangeLog README README.Fedora NEWS
 %{_bindir}/banshee-1
+%exclude %{_libdir}/banshee-1/MusicBrainz.dll*
 %{_libdir}/banshee-1
 %{_datadir}/applications/*.desktop
 %{_datadir}/dbus-1/services/org.bansheeproject.Banshee.service
@@ -128,9 +165,27 @@
 
 %files devel
 %defattr(-,root,root,-)
+%exclude %{_libdir}/pkgconfig/banshee-1-musicbrainz.pc
 %{_libdir}/pkgconfig/banshee-1-*.pc
 
+%files musicbrainz
+%defattr(-,root,root,-)
+%{_libdir}/banshee-1/MusicBrainz.dll
+%{_libdir}/banshee-1/MusicBrainz.dll.mdb
+
+%files musicbrainz-devel
+%defattr(-,root,root,-)
+%{_libdir}/pkgconfig/banshee-1-musicbrainz.pc
+
+
 %changelog
+* Thu Jan  1 2009 Michel Salim <salimma at fedoraproject.org> - 1.4.1-3
+- Split MusicBrainz libraries into separate subpackages
+- Properly tag songs ripped from CDs (bug #477669)
+
+* Thu Dec 25 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1.4.1-2
+- rebuild to fix broken deps
+
 * Thu Nov 27 2008 Michel Salim <salimma at fedoraproject.org> - 1.4.1-1
 - Update to 1.4.1
 


--- banshee-0.10.12-libdbus-glib-dllmap.patch DELETED ---


--- banshee-0.10.12-mono-libdir.patch DELETED ---



From salimma at fedoraproject.org  Thu Jan  1 21:57:03 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Thu,  1 Jan 2009 21:57:03 +0000 (UTC)
Subject: rpms/banshee/F-9 banshee-1-1.4.1-riptags.patch, NONE,
	1.1 banshee.spec, 
	1.56, 1.57 banshee-0.10.12-libdbus-glib-dllmap.patch, 1.1,
	NONE banshee-0.10.12-mono-libdir.patch, 1.1, NONE
Message-ID: <20090101215703.4058A7011B@cvs1.fedora.phx.redhat.com>

Author: salimma

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

Modified Files:
	banshee.spec 
Added Files:
	banshee-1-1.4.1-riptags.patch 
Removed Files:
	banshee-0.10.12-libdbus-glib-dllmap.patch 
	banshee-0.10.12-mono-libdir.patch 
Log Message:
* Thu Jan  1 2009 Michel Salim <salimma at fedoraproject.org> - 1.4.1-3
- Split MusicBrainz libraries into separate subpackages
- Properly tag songs ripped from CDs (bug #477669)


banshee-1-1.4.1-riptags.patch:

--- NEW FILE banshee-1-1.4.1-riptags.patch ---
--- src.orig/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdRipper.cs	2008-09-23 15:29:25.000000000 -0300
+++ src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdRipper.cs	2008-12-17 19:57:47.000000000 -0400
@@ -37,6 +37,7 @@
 using Banshee.Collection;
 using Banshee.Collection.Database;
 using Banshee.MediaEngine;
+using Banshee.Streaming;
 
 namespace Banshee.AudioCd
 {
@@ -198,9 +199,9 @@
         
             ripped_duration += track.Duration;
             track.PrimarySource = ServiceManager.SourceManager.MusicLibrary;
-            track.Uri = args.Uri;
             
-            track.FileSize = Banshee.IO.File.GetSize (track.Uri);
+            TagLib.File file = StreamTagger.ProcessUri (args.Uri);
+            StreamTagger.TrackInfoMerge (track, file, true);
             
             track.Save ();
 



Index: banshee.spec
===================================================================
RCS file: /cvs/pkgs/rpms/banshee/F-9/banshee.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- banshee.spec	27 Nov 2008 06:51:59 -0000	1.56
+++ banshee.spec	1 Jan 2009 21:56:33 -0000	1.57
@@ -2,13 +2,14 @@
 
 Name:    banshee
 Version: 1.4.1
-Release: 1%{?dist}
+Release: 3%{?dist}
 Summary: Easily import, manage, and play selections from your music collection
 Group:   Applications/Multimedia
 License: MIT
 URL:     http://banshee-project.org/
 Source0: http://banshee-project.org/files/banshee/banshee-1-%{version}.tar.bz2
 Source1: README.Fedora
+Patch0:  banshee-1-1.4.1-riptags.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # We only have mono on these arches:
@@ -45,6 +46,7 @@
 BuildRequires: desktop-file-utils
 
 Requires:      podsleuth
+Requires:      %{name}-musicbrainz = %{version}-%{release}
 
 %description
 Banshee allows you to import CDs, sync your music collection to an iPod,
@@ -52,16 +54,50 @@
 library, and create audio and MP3 CDs from subsets of your library.
 
 %package devel
-Summary: Development files for Banshee
-Group: Development/Libraries
+Summary:        Development files for Banshee
+Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
 Requires:       pkgconfig
 
 %description devel
-Development files for Banshee Media Player
+Banshee allows you to import CDs, sync your music collection to an iPod,
+play music directly from an iPod, create playlists with songs from your
+library, and create audio and MP3 CDs from subsets of your library.
+
+The %{name}-devel package contains libraries and header files for
+developing extensions for %{name}.
+
+%package        musicbrainz
+Summary:        MusicBrainz libraries for the Banshee Media Framework
+Group:          System Environment/Libraries
+Requires:       %{name} = %{version}-%{release}
+
+%description    musicbrainz
+Banshee allows you to import CDs, sync your music collection to an iPod,
+play music directly from an iPod, create playlists with songs from your
+library, and create audio and MP3 CDs from subsets of your library.
+
+The %{name}-musicbrainz package contains the MusicBrainz library shipped
+with the Banshee music player.
+
+%package        musicbrainz-devel
+Summary:        Development files for %{name}-musicbrainz
+Group:          Development/Libraries
+Requires:       %{name}-musicbrainz = %{version}-%{release}
+Requires:       pkgconfig
+
+%description    musicbrainz-devel
+Banshee allows you to import CDs, sync your music collection to an iPod,
+play music directly from an iPod, create playlists with songs from your
+library, and create audio and MP3 CDs from subsets of your library.
+
+The %{name}-musicbrainz-devel package contains header files for
+developing applications that use %{name}-musicbrainz.
+
 
 %prep
 %setup -q -n %{name}-1-%{version}
+%patch0 -p0 -b .riptags
 cp -p %{SOURCE1} .
 
 %build
@@ -116,6 +152,7 @@
 %defattr(-,root,root,-)
 %doc COPYING AUTHORS ChangeLog README README.Fedora NEWS
 %{_bindir}/banshee-1
+%exclude %{_libdir}/banshee-1/MusicBrainz.dll*
 %{_libdir}/banshee-1
 %{_datadir}/applications/*.desktop
 %{_datadir}/dbus-1/services/org.bansheeproject.Banshee.service
@@ -128,9 +165,27 @@
 
 %files devel
 %defattr(-,root,root,-)
+%exclude %{_libdir}/pkgconfig/banshee-1-musicbrainz.pc
 %{_libdir}/pkgconfig/banshee-1-*.pc
 
+%files musicbrainz
+%defattr(-,root,root,-)
+%{_libdir}/banshee-1/MusicBrainz.dll
+%{_libdir}/banshee-1/MusicBrainz.dll.mdb
+
+%files musicbrainz-devel
+%defattr(-,root,root,-)
+%{_libdir}/pkgconfig/banshee-1-musicbrainz.pc
+
+
 %changelog
+* Thu Jan  1 2009 Michel Salim <salimma at fedoraproject.org> - 1.4.1-3
+- Split MusicBrainz libraries into separate subpackages
+- Properly tag songs ripped from CDs (bug #477669)
+
+* Thu Dec 25 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1.4.1-2
+- rebuild to fix broken deps
+
 * Thu Nov 27 2008 Michel Salim <salimma at fedoraproject.org> - 1.4.1-1
 - Update to 1.4.1
 


--- banshee-0.10.12-libdbus-glib-dllmap.patch DELETED ---


--- banshee-0.10.12-mono-libdir.patch DELETED ---



From salimma at fedoraproject.org  Thu Jan  1 21:57:03 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Thu,  1 Jan 2009 21:57:03 +0000 (UTC)
Subject: rpms/banshee/devel banshee-1-1.4.1-riptags.patch, NONE,
	1.1 banshee.spec, 1.63,
	1.64 banshee-0.10.12-libdbus-glib-dllmap.patch, 1.1,
	NONE banshee-0.10.12-mono-libdir.patch, 1.1, NONE
Message-ID: <20090101215703.899CC7011B@cvs1.fedora.phx.redhat.com>

Author: salimma

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

Modified Files:
	banshee.spec 
Added Files:
	banshee-1-1.4.1-riptags.patch 
Removed Files:
	banshee-0.10.12-libdbus-glib-dllmap.patch 
	banshee-0.10.12-mono-libdir.patch 
Log Message:
* Thu Jan  1 2009 Michel Salim <salimma at fedoraproject.org> - 1.4.1-3
- Split MusicBrainz libraries into separate subpackages
- Properly tag songs ripped from CDs (bug #477669)


banshee-1-1.4.1-riptags.patch:

--- NEW FILE banshee-1-1.4.1-riptags.patch ---
--- src.orig/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdRipper.cs	2008-09-23 15:29:25.000000000 -0300
+++ src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdRipper.cs	2008-12-17 19:57:47.000000000 -0400
@@ -37,6 +37,7 @@
 using Banshee.Collection;
 using Banshee.Collection.Database;
 using Banshee.MediaEngine;
+using Banshee.Streaming;
 
 namespace Banshee.AudioCd
 {
@@ -198,9 +199,9 @@
         
             ripped_duration += track.Duration;
             track.PrimarySource = ServiceManager.SourceManager.MusicLibrary;
-            track.Uri = args.Uri;
             
-            track.FileSize = Banshee.IO.File.GetSize (track.Uri);
+            TagLib.File file = StreamTagger.ProcessUri (args.Uri);
+            StreamTagger.TrackInfoMerge (track, file, true);
             
             track.Save ();
 



Index: banshee.spec
===================================================================
RCS file: /cvs/pkgs/rpms/banshee/devel/banshee.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- banshee.spec	25 Dec 2008 22:35:26 -0000	1.63
+++ banshee.spec	1 Jan 2009 21:56:33 -0000	1.64
@@ -2,13 +2,14 @@
 
 Name:    banshee
 Version: 1.4.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: Easily import, manage, and play selections from your music collection
 Group:   Applications/Multimedia
 License: MIT
 URL:     http://banshee-project.org/
 Source0: http://banshee-project.org/files/banshee/banshee-1-%{version}.tar.bz2
 Source1: README.Fedora
+Patch0:  banshee-1-1.4.1-riptags.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # We only have mono on these arches:
@@ -45,6 +46,7 @@
 BuildRequires: desktop-file-utils
 
 Requires:      podsleuth
+Requires:      %{name}-musicbrainz = %{version}-%{release}
 
 %description
 Banshee allows you to import CDs, sync your music collection to an iPod,
@@ -52,16 +54,50 @@
 library, and create audio and MP3 CDs from subsets of your library.
 
 %package devel
-Summary: Development files for Banshee
-Group: Development/Libraries
+Summary:        Development files for Banshee
+Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
 Requires:       pkgconfig
 
 %description devel
-Development files for Banshee Media Player
+Banshee allows you to import CDs, sync your music collection to an iPod,
+play music directly from an iPod, create playlists with songs from your
+library, and create audio and MP3 CDs from subsets of your library.
+
+The %{name}-devel package contains libraries and header files for
+developing extensions for %{name}.
+
+%package        musicbrainz
+Summary:        MusicBrainz libraries for the Banshee Media Framework
+Group:          System Environment/Libraries
+Requires:       %{name} = %{version}-%{release}
+
+%description    musicbrainz
+Banshee allows you to import CDs, sync your music collection to an iPod,
+play music directly from an iPod, create playlists with songs from your
+library, and create audio and MP3 CDs from subsets of your library.
+
+The %{name}-musicbrainz package contains the MusicBrainz library shipped
+with the Banshee music player.
+
+%package        musicbrainz-devel
+Summary:        Development files for %{name}-musicbrainz
+Group:          Development/Libraries
+Requires:       %{name}-musicbrainz = %{version}-%{release}
+Requires:       pkgconfig
+
+%description    musicbrainz-devel
+Banshee allows you to import CDs, sync your music collection to an iPod,
+play music directly from an iPod, create playlists with songs from your
+library, and create audio and MP3 CDs from subsets of your library.
+
+The %{name}-musicbrainz-devel package contains header files for
+developing applications that use %{name}-musicbrainz.
+
 
 %prep
 %setup -q -n %{name}-1-%{version}
+%patch0 -p0 -b .riptags
 cp -p %{SOURCE1} .
 
 %build
@@ -116,6 +152,7 @@
 %defattr(-,root,root,-)
 %doc COPYING AUTHORS ChangeLog README README.Fedora NEWS
 %{_bindir}/banshee-1
+%exclude %{_libdir}/banshee-1/MusicBrainz.dll*
 %{_libdir}/banshee-1
 %{_datadir}/applications/*.desktop
 %{_datadir}/dbus-1/services/org.bansheeproject.Banshee.service
@@ -128,9 +165,24 @@
 
 %files devel
 %defattr(-,root,root,-)
+%exclude %{_libdir}/pkgconfig/banshee-1-musicbrainz.pc
 %{_libdir}/pkgconfig/banshee-1-*.pc
 
+%files musicbrainz
+%defattr(-,root,root,-)
+%{_libdir}/banshee-1/MusicBrainz.dll
+%{_libdir}/banshee-1/MusicBrainz.dll.mdb
+
+%files musicbrainz-devel
+%defattr(-,root,root,-)
+%{_libdir}/pkgconfig/banshee-1-musicbrainz.pc
+
+
 %changelog
+* Thu Jan  1 2009 Michel Salim <salimma at fedoraproject.org> - 1.4.1-3
+- Split MusicBrainz libraries into separate subpackages
+- Properly tag songs ripped from CDs (bug #477669)
+
 * Thu Dec 25 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1.4.1-2
 - rebuild to fix broken deps
 


--- banshee-0.10.12-libdbus-glib-dllmap.patch DELETED ---


--- banshee-0.10.12-mono-libdir.patch DELETED ---



From mjakubicek at fedoraproject.org  Thu Jan  1 22:36:10 2009
From: mjakubicek at fedoraproject.org (=?utf-8?b?TWlsb8WhIEpha3Viw63EjWVr?=)
Date: Thu,  1 Jan 2009 22:36:10 +0000 (UTC)
Subject: rpms/boinc-client/devel .cvsignore, 1.3, 1.4 boinc-client.spec, 1.19,
	1.20 sources, 1.3, 1.4 trim, 1.1, 1.2 boinc-client, 1.1,
	NONE boinc.1, 1.1, NONE boinc_client.1, 1.1, NONE boinc_cmd.1,
	1.1, NONE boincmgr.1, 1.1, NONE
Message-ID: <20090101223610.46BC37011B@cvs1.fedora.phx.redhat.com>

Author: mjakubicek

Update of /cvs/pkgs/rpms/boinc-client/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14270

Modified Files:
	.cvsignore boinc-client.spec sources trim 
Removed Files:
	boinc-client boinc.1 boinc_client.1 boinc_cmd.1 boincmgr.1 
Log Message:
- Update to 6.4.5
- Updated boinc-gccflags.patch and boinc-locales.patch
- Not trimming doc/ subdirectory
- Bash completion now provided by the source tarball,
  not packaged as separate sources anymore.
- Supplied example /etc/sysconfig configuration file
- Added BR: docbook2X for autogenerating manpages, not packaged as separate
  sources anymore.




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/boinc-client/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	26 Aug 2008 20:27:10 -0000	1.3
+++ .cvsignore	1 Jan 2009 22:35:38 -0000	1.4
@@ -1 +1 @@
-boinc-6.2.15.tar.bz2
+boinc-6.4.5.tar.bz2


Index: boinc-client.spec
===================================================================
RCS file: /cvs/pkgs/rpms/boinc-client/devel/boinc-client.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- boinc-client.spec	13 Dec 2008 14:02:56 -0000	1.19
+++ boinc-client.spec	1 Jan 2009 22:35:38 -0000	1.20
@@ -1,10 +1,10 @@
-%define snap 20080818
-%define version_ 6_2_15
+%define snap 20081217
+%define version_ 6_4_5
 
 Summary:	The BOINC client core
 Name:		boinc-client
-Version:	6.2.15
-Release:	2.%{snap}svn%{?dist}
+Version:	6.4.5
+Release:	1.%{snap}svn%{?dist}
 License:	LGPLv2+
 Group:		Applications/Engineering
 URL:		http://boinc.berkeley.edu/
@@ -21,13 +21,8 @@
 Source1:	boinc-client-init-d
 Source2:	boinc-client-logrotate-d
 Source3:	boinc-manager.desktop
-Source4:	boinc.1
-Source5:	boinc_client.1
-Source6:	boinc_cmd.1
-Source7:	boincmgr.1
 Source8:	trim
 Source9:	unicode
-Source10:	boinc-client
 #Remove -fomit-frame-pointer and -ffast-math gcc flags:
 #Reported in upstream bugtracker: http://boinc.berkeley.edu/trac/ticket/647
 Patch1:		boinc-gccflags.patch
@@ -53,6 +48,7 @@
 BuildRequires:  mysql-devel
 BuildRequires:  libXmu-devel
 BuildRequires:  libjpeg-devel
+BuildRequires:	docbook2X
 
 %description
 The Berkeley Open Infrastructure for Network Computing (BOINC) is an open-
@@ -111,10 +107,17 @@
 %define boinc_platform ppc64-linux-gnu
 %endif
 
+#quick fix to make build & install to work, filed in upstream's bugtracker under
+#http://boinc.berkeley.edu/trac/ticket/811
+sed -i "s/boincmgr.16x16.png boincmgr.32x32.png boincmgr.48x48.png//" clientgui/res/Makefile.in
+echo "install:" >> samples/example_app/Makefile
+
+%define confflags --disable-static --enable-unicode STRIP=: DOCBOOK2X_MAN=/usr/bin/db2x_docbook2man
+
 %if %{defined boinc_platform}
-%configure --disable-static --enable-unicode --with-boinc-platform=%{boinc_platform} STRIP=:
+%configure %{confflags} --with-boinc-platform=%{boinc_platform}
 %else
-%configure --disable-static --enable-unicode STRIP=:
+%configure %{confflags}
 %endif
 
 
@@ -148,11 +151,14 @@
 pushd $RPM_BUILD_ROOT%{_bindir}
   ln -s boinc_client boinc
   mv boinc_gui boincmgr
+  mv boinc_cmd boinccmd
 popd
 
 rm $RPM_BUILD_ROOT%{_bindir}/ca-bundle.crt
 #because it's already included in curl
 
+# own init script and logrotate configuration file
+rm -f $RPM_BUILD_ROOT%{_sysconfdir}/init.d/%{name}
 install -p -m755 %{SOURCE1} $RPM_BUILD_ROOT%{_initrddir}/%{name}
 install -p -m644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/%{name}
 
@@ -164,12 +170,6 @@
 install -p -m644 sea/boincmgr.48x48.png \
   $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/boincmgr.png
 
-# man page
-install -p -m644 %{SOURCE4} $RPM_BUILD_ROOT%{_mandir}/man1
-install -p -m644 %{SOURCE5} $RPM_BUILD_ROOT%{_mandir}/man1
-install -p -m644 %{SOURCE6} $RPM_BUILD_ROOT%{_mandir}/man1
-install -p -m644 %{SOURCE7} $RPM_BUILD_ROOT%{_mandir}/man1
-
 desktop-file-install %{?_remove_encoding} --vendor fedora \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
   %{SOURCE3}
@@ -183,8 +183,7 @@
 %find_lang BOINC-Manager
 
 # bash-completion
-
-install -Dp -m644 %{SOURCE10} $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d/boinc-client
+install -Dp -m644 client/scripts/boinc.bash $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d/boinc-client
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -239,14 +238,13 @@
 %doc checkin_notes_2002
 %{_bindir}/boinc
 %{_bindir}/boinc_client
-%{_bindir}/boinc_cmd
+%{_bindir}/boinccmd
 %{_bindir}/crypt_prog
 %{_bindir}/switcher
 %{_initrddir}/%{name}
+%{_sysconfdir}/sysconfig/%{name}
+%{_mandir}/man1/boinccmd.1.gz
 %{_mandir}/man1/boinc.1.gz
-%{_mandir}/man1/boinc_client.1.gz
-%{_mandir}/man1/boinc_cmd.1.gz
-%{_mandir}/man1/boincmgr.1.gz
 %defattr(-,boinc,boinc,-)
 %{_localstatedir}/lib/boinc/
 
@@ -257,6 +255,7 @@
 %{_datadir}/icons/hicolor/16x16/apps/boincmgr.png
 %{_datadir}/icons/hicolor/32x32/apps/boincmgr.png
 %{_datadir}/icons/hicolor/48x48/apps/boincmgr.png
+%{_mandir}/man1/boincmgr.1.gz
 
 %files devel
 %defattr(-,root,root,-)
@@ -266,10 +265,20 @@
 %{_libdir}/libsched.a
 %{_libdir}/libboinc_graphics2.a
 
-%dir %{_includedir}/BOINC
-%{_includedir}/BOINC/*
+%dir %{_includedir}/boinc
+%{_includedir}/boinc/*
 
 %changelog
+* Wed Dec 17 2008 Milos Jakubicek <xjakub at fi.muni.cz> - 6.4.5-1.20081217svn
+- Update to 6.4.5
+- Updated boinc-gccflags.patch and boinc-locales.patch
+- Not trimming doc/ subdirectory
+- Bash completion now provided by the source tarball,
+  not packaged as separate sources anymore.
+- Supplied example /etc/sysconfig configuration file
+- Added BR: docbook2X for autogenerating manpages, not packaged as separate
+  sources anymore.
+
 * Sat Dec 13 2008 Milos Jakubicek <xjakub at fi.muni.cz> - 6.2.15-2.20080818svn
 - Fix usage of $BOINCDIR in the init script
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/boinc-client/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	26 Aug 2008 20:27:10 -0000	1.3
+++ sources	1 Jan 2009 22:35:38 -0000	1.4
@@ -1 +1 @@
-5da6b42595a0c9155c71dce49fec2dbe  boinc-6.2.15.tar.bz2
+98433ea90755d0579dcc778da99b9fa0  boinc-6.4.5.tar.bz2


Index: trim
===================================================================
RCS file: /cvs/pkgs/rpms/boinc-client/devel/trim,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- trim	25 Mar 2008 20:13:30 -0000	1.1
+++ trim	1 Jan 2009 22:35:38 -0000	1.2
@@ -9,7 +9,7 @@
 
 echo "Trimming directories..."
 
-DIRS="win_build doc html openssl client/os2 client/win clientgui/mac clientlib clienttray curl/include curl/mswin curl/patches lib/mac mac_build mac_installer zip/zip/macos zip/zip/win32 zip/unzip/macos zip/unzip/win32 zlib RSAEuro stripchart"
+DIRS="win_build html openssl client/os2 client/win clientgui/mac clientlib clienttray curl/include curl/mswin curl/patches lib/mac mac_build mac_installer zip/zip/macos zip/zip/win32 zip/unzip/macos zip/unzip/win32 zlib RSAEuro stripchart coprocs/CUDA/mswin"
 
 for DIR in $DIRS; do
 	/bin/rm -rf $1/$DIR;


--- boinc-client DELETED ---


--- boinc.1 DELETED ---


--- boinc_client.1 DELETED ---


--- boinc_cmd.1 DELETED ---


--- boincmgr.1 DELETED ---



From kkofler at fedoraproject.org  Thu Jan  1 22:42:19 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Thu,  1 Jan 2009 22:42:19 +0000 (UTC)
Subject: rpms/strigi/devel strigi.spec,1.30,1.31
Message-ID: <20090101224219.D55617011B@cvs1.fedora.phx.redhat.com>

Author: kkofler

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

Modified Files:
	strigi.spec 
Log Message:
Fix typo in changelog.


Index: strigi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/strigi/devel/strigi.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- strigi.spec	18 Dec 2008 18:36:38 -0000	1.30
+++ strigi.spec	1 Jan 2009 22:41:49 -0000	1.31
@@ -118,7 +118,7 @@
 
 %changelog
 * Thu Dec 18 2008 Rex Dieter <rdieter at fedoraproject.org> - 0.5.11.1-2 
-- respin (eviv2)
+- respin (exiv2)
 
 * Thu Nov 27 2008 Lorenzo Villani <lvillani at binaryhelix.net> - 0.5.11.1-1
 - drop _default_patch_fuzz



From mjakubicek at fedoraproject.org  Thu Jan  1 22:46:13 2009
From: mjakubicek at fedoraproject.org (=?utf-8?b?TWlsb8WhIEpha3Viw63EjWVr?=)
Date: Thu,  1 Jan 2009 22:46:13 +0000 (UTC)
Subject: rpms/ext3grep/F-10 .cvsignore, 1.6, 1.7 ext3grep.spec, 1.7,
	1.8 sources, 1.6, 1.7
Message-ID: <20090101224613.899F47011B@cvs1.fedora.phx.redhat.com>

Author: mjakubicek

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

Modified Files:
	.cvsignore ext3grep.spec sources 
Log Message:
- Upstream version 0.10.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ext3grep/F-10/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	26 Oct 2008 18:25:25 -0000	1.6
+++ .cvsignore	1 Jan 2009 22:45:43 -0000	1.7
@@ -1 +1 @@
-ext3grep-0.10.0.tar.gz
+ext3grep-0.10.1.tar.gz


Index: ext3grep.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ext3grep/F-10/ext3grep.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ext3grep.spec	26 Oct 2008 18:25:25 -0000	1.7
+++ ext3grep.spec	1 Jan 2009 22:45:43 -0000	1.8
@@ -1,5 +1,5 @@
 Name:			ext3grep
-Version:		0.10.0
+Version:		0.10.1
 Release:		1%{?dist}
 Summary:		Recovery tool for ext3 filesystems
 
@@ -37,6 +37,8 @@
 %doc NEWS README LICENSE.GPL2
 
 %changelog
+* Thu Dec 18 2008 Lubomir Rintel <lkundrak at v3.sk> - 0.10.1-1
+- Upstream version 0.10.1
 
 * Sun Oct 26 2008 Milos Jakubicek <xjakub at fi.muni.cz> - 0.10.0-1
 - Upstream version 0.10.0


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ext3grep/F-10/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	26 Oct 2008 18:25:25 -0000	1.6
+++ sources	1 Jan 2009 22:45:43 -0000	1.7
@@ -1 +1 @@
-261d4fd4428fe9641dac9b12dafdb340  ext3grep-0.10.0.tar.gz
+8cf879f8fea6ba3432c2fdafd2ea89b8  ext3grep-0.10.1.tar.gz



From kkofler at fedoraproject.org  Thu Jan  1 22:46:31 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Thu,  1 Jan 2009 22:46:31 +0000 (UTC)
Subject: rpms/strigi/F-10 strigi-0.5.11-to-0.5.11.1.diff, NONE,
	1.1 strigi-multilib-fix.patch, 1.3, 1.4 strigi.spec, 1.21, 1.22
Message-ID: <20090101224631.4ED5F7011B@cvs1.fedora.phx.redhat.com>

Author: kkofler

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

Modified Files:
	strigi-multilib-fix.patch strigi.spec 
Added Files:
	strigi-0.5.11-to-0.5.11.1.diff 
Log Message:
Sync from devel:

* Thu Dec 18 2008 Rex Dieter <rdieter at fedoraproject.org> - 0.5.11.1-2 
- respin (exiv2)

* Thu Nov 27 2008 Lorenzo Villani <lvillani at binaryhelix.net> - 0.5.11.1-1
- drop _default_patch_fuzz
- rebase strigi-multilib patch
- No official 0.5.11.1 tarballs were released but we need 0.5.11.1, apply a
  diff between 0.5.11 and 0.5.11.1 svn tags

strigi-0.5.11-to-0.5.11.1.diff:

--- NEW FILE strigi-0.5.11-to-0.5.11.1.diff ---
Index: src/streamanalyzer/CMakeLists.txt
===================================================================
--- src/streamanalyzer/CMakeLists.txt	(.../0.5.11)	(revision 889853)
+++ src/streamanalyzer/CMakeLists.txt	(.../0.5.11.1)	(revision 889853)
@@ -98,6 +98,7 @@
 	indexreader.h
 	indexmanager.h
 	indexplugin.h
+	indexpluginloader.h
 	indexwriter.h
 	variant.h
 	query.h

strigi-multilib-fix.patch:

Index: strigi-multilib-fix.patch
===================================================================
RCS file: /cvs/pkgs/rpms/strigi/F-10/strigi-multilib-fix.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- strigi-multilib-fix.patch	17 Oct 2008 19:50:22 -0000	1.3
+++ strigi-multilib-fix.patch	1 Jan 2009 22:46:00 -0000	1.4
@@ -1,5 +1,6 @@
---- src/streams/strigi/strigiconfig.h.cmake	2007-10-26 08:25:47.000000000 -0400
-+++ src/streams/strigi/strigiconfig.h.cmake.new	2007-10-30 09:10:38.000000000 -0400
+diff -Naur strigi-0.5.11/src/streams/strigi/strigiconfig.h.cmake strigi-0.5.11.multilib-fix/src/streams/strigi/strigiconfig.h.cmake
+--- strigi-0.5.11/src/streams/strigi/strigiconfig.h.cmake	2008-07-20 16:54:29.000000000 +0200
++++ strigi-0.5.11.multilib-fix/src/streams/strigi/strigiconfig.h.cmake	2008-11-27 22:45:05.000000000 +0100
 @@ -44,104 +44,6 @@
  #  include <stddef.h>
  #endif
@@ -104,4 +105,4 @@
 -
  #cmakedefine __STRIGI_HAVE_GCC_VISIBILITY
  
- #cmakedefine ENABLE_NEWXESAM
+ /**


Index: strigi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/strigi/F-10/strigi.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- strigi.spec	17 Oct 2008 19:17:51 -0000	1.21
+++ strigi.spec	1 Jan 2009 22:46:00 -0000	1.22
@@ -1,16 +1,15 @@
-%define _default_patch_fuzz 2
-
 Name:		strigi
-Version:	0.5.11
-Release:	1%{?dist}
+Version:	0.5.11.1
+Release:	2%{?dist}
 Summary:	A desktop search program for KDE
 Group:		Applications/Productivity
 License:	LGPLv2+
 URL:		http://www.vandenoever.info/software/strigi
-Source0:	http://www.vandenoever.info/software/strigi/strigi-%{version}.tar.bz2
+Source0:	http://www.vandenoever.info/software/strigi/strigi-0.5.11.tar.bz2
 Source1:	strigiclient.desktop
 Source2:	strigi-daemon.desktop
 Patch0:		strigi-multilib-fix.patch
+Patch1:     strigi-0.5.11-to-0.5.11.1.diff
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	cmake >= 2.4.5
@@ -50,8 +49,9 @@
 Strigi search engine libraries
 
 %prep
-%setup -q
-%patch0 -p0 -b .multilibs
+%setup -q -n strigi-0.5.11
+%patch0 -p1 -b .multilibs
+%patch1 -p0 -b .0.5.11-to-0.5.11.1
 
 %build
 mkdir fedora
@@ -117,6 +117,15 @@
 %{_libdir}/strigi/
 
 %changelog
+* Thu Dec 18 2008 Rex Dieter <rdieter at fedoraproject.org> - 0.5.11.1-2 
+- respin (exiv2)
+
+* Thu Nov 27 2008 Lorenzo Villani <lvillani at binaryhelix.net> - 0.5.11.1-1
+- drop _default_patch_fuzz
+- rebase strigi-multilib patch
+- No official 0.5.11.1 tarballs were released but we need 0.5.11.1, apply a
+  diff between 0.5.11 and 0.5.11.1 svn tags
+
 * Sun Jul 20 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> - 0.5.11-1
 - Update to 0.5.11
 - Drop compile-fix and lucenetest_fix patches (fixed upstream)
@@ -146,7 +155,7 @@
 
 * Tue Oct 30 2007 Deji Akingunola <dakingun at gmail.com> - 0.5.7-1
 - Update to 0.5.7 release
-- Fix multilibs conflict (Bug #343221, patch by Kevin Kofler) 
+- Fix multilibs conflict (Bug #343221, patch by Kevin Kofler)
 
 * Sun Sep 09 2007 Deji Akingunola <dakingun at gmail.com> - 0.5.5-2
 - Rebuild for BuildID changes



From kkofler at fedoraproject.org  Thu Jan  1 22:46:31 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Thu,  1 Jan 2009 22:46:31 +0000 (UTC)
Subject: rpms/strigi/F-8 strigi-0.5.11-to-0.5.11.1.diff, NONE,
	1.1 strigi-multilib-fix.patch, 1.1, 1.2 strigi.spec, 1.18, 1.19
Message-ID: <20090101224631.DE6D07011B@cvs1.fedora.phx.redhat.com>

Author: kkofler

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

Modified Files:
	strigi-multilib-fix.patch strigi.spec 
Added Files:
	strigi-0.5.11-to-0.5.11.1.diff 
Log Message:
Sync from devel:

* Thu Dec 18 2008 Rex Dieter <rdieter at fedoraproject.org> - 0.5.11.1-2 
- respin (exiv2)

* Thu Nov 27 2008 Lorenzo Villani <lvillani at binaryhelix.net> - 0.5.11.1-1
- drop _default_patch_fuzz
- rebase strigi-multilib patch
- No official 0.5.11.1 tarballs were released but we need 0.5.11.1, apply a
  diff between 0.5.11 and 0.5.11.1 svn tags

strigi-0.5.11-to-0.5.11.1.diff:

--- NEW FILE strigi-0.5.11-to-0.5.11.1.diff ---
Index: src/streamanalyzer/CMakeLists.txt
===================================================================
--- src/streamanalyzer/CMakeLists.txt	(.../0.5.11)	(revision 889853)
+++ src/streamanalyzer/CMakeLists.txt	(.../0.5.11.1)	(revision 889853)
@@ -98,6 +98,7 @@
 	indexreader.h
 	indexmanager.h
 	indexplugin.h
+	indexpluginloader.h
 	indexwriter.h
 	variant.h
 	query.h

strigi-multilib-fix.patch:

Index: strigi-multilib-fix.patch
===================================================================
RCS file: /cvs/pkgs/rpms/strigi/F-8/strigi-multilib-fix.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- strigi-multilib-fix.patch	31 Oct 2007 13:22:24 -0000	1.1
+++ strigi-multilib-fix.patch	1 Jan 2009 22:46:01 -0000	1.2
@@ -1,5 +1,6 @@
---- src/streams/strigi/strigiconfig.h.cmake	2007-10-26 08:25:47.000000000 -0400
-+++ src/streams/strigi/strigiconfig.h.cmake.new	2007-10-30 09:10:38.000000000 -0400
+diff -Naur strigi-0.5.11/src/streams/strigi/strigiconfig.h.cmake strigi-0.5.11.multilib-fix/src/streams/strigi/strigiconfig.h.cmake
+--- strigi-0.5.11/src/streams/strigi/strigiconfig.h.cmake	2008-07-20 16:54:29.000000000 +0200
++++ strigi-0.5.11.multilib-fix/src/streams/strigi/strigiconfig.h.cmake	2008-11-27 22:45:05.000000000 +0100
 @@ -44,104 +44,6 @@
  #  include <stddef.h>
  #endif
@@ -104,4 +105,4 @@
 -
  #cmakedefine __STRIGI_HAVE_GCC_VISIBILITY
  
- #cmakedefine ENABLE_NEWXESAM
+ /**


Index: strigi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/strigi/F-8/strigi.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- strigi.spec	20 Jul 2008 18:16:31 -0000	1.18
+++ strigi.spec	1 Jan 2009 22:46:01 -0000	1.19
@@ -1,16 +1,15 @@
-%define _default_patch_fuzz 2
-
 Name:		strigi
-Version:	0.5.11
-Release:	1%{?dist}
+Version:	0.5.11.1
+Release:	2%{?dist}
 Summary:	A desktop search program for KDE
 Group:		Applications/Productivity
 License:	LGPLv2+
 URL:		http://www.vandenoever.info/software/strigi
-Source0:	http://www.vandenoever.info/software/strigi/strigi-%{version}.tar.bz2
+Source0:	http://www.vandenoever.info/software/strigi/strigi-0.5.11.tar.bz2
 Source1:	strigiclient.desktop
 Source2:	strigi-daemon.desktop
 Patch0:		strigi-multilib-fix.patch
+Patch1:     strigi-0.5.11-to-0.5.11.1.diff
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	cmake >= 2.4.5
@@ -50,8 +49,9 @@
 Strigi search engine libraries
 
 %prep
-%setup -q
-%patch0 -p0 -b .multilibs
+%setup -q -n strigi-0.5.11
+%patch0 -p1 -b .multilibs
+%patch1 -p0 -b .0.5.11-to-0.5.11.1
 
 %build
 mkdir fedora
@@ -117,6 +117,15 @@
 %{_libdir}/strigi/
 
 %changelog
+* Thu Dec 18 2008 Rex Dieter <rdieter at fedoraproject.org> - 0.5.11.1-2 
+- respin (exiv2)
+
+* Thu Nov 27 2008 Lorenzo Villani <lvillani at binaryhelix.net> - 0.5.11.1-1
+- drop _default_patch_fuzz
+- rebase strigi-multilib patch
+- No official 0.5.11.1 tarballs were released but we need 0.5.11.1, apply a
+  diff between 0.5.11 and 0.5.11.1 svn tags
+
 * Sun Jul 20 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> - 0.5.11-1
 - Update to 0.5.11
 - Drop compile-fix and lucenetest_fix patches (fixed upstream)
@@ -146,7 +155,7 @@
 
 * Tue Oct 30 2007 Deji Akingunola <dakingun at gmail.com> - 0.5.7-1
 - Update to 0.5.7 release
-- Fix multilibs conflict (Bug #343221, patch by Kevin Kofler) 
+- Fix multilibs conflict (Bug #343221, patch by Kevin Kofler)
 
 * Sun Sep 09 2007 Deji Akingunola <dakingun at gmail.com> - 0.5.5-2
 - Rebuild for BuildID changes



From turki at fedoraproject.org  Thu Jan  1 22:46:41 2009
From: turki at fedoraproject.org (Nikolay Vladimirov)
Date: Thu,  1 Jan 2009 22:46:41 +0000 (UTC)
Subject: rpms/msmtp/F-9 .cvsignore, 1.6, 1.7 msmtp.spec, 1.8, 1.9 sources,
	1.6, 1.7
Message-ID: <20090101224641.4CF4F7011B@cvs1.fedora.phx.redhat.com>

Author: turki

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

Modified Files:
	.cvsignore msmtp.spec sources 
Log Message:
Update to 1.4.17


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/msmtp/F-9/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	29 Jul 2008 09:43:42 -0000	1.6
+++ .cvsignore	1 Jan 2009 22:46:10 -0000	1.7
@@ -1 +1 @@
-msmtp-1.4.16.tar.bz2
+msmtp-1.4.17.tar.bz2


Index: msmtp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/msmtp/F-9/msmtp.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- msmtp.spec	29 Jul 2008 09:43:42 -0000	1.8
+++ msmtp.spec	1 Jan 2009 22:46:10 -0000	1.9
@@ -1,5 +1,5 @@
 Name:           msmtp
-Version:        1.4.16
+Version:        1.4.17 
 Release:        1%{?dist}
 Summary:        SMTP client
 Group:          System Environment/Base 
@@ -12,6 +12,7 @@
 BuildRequires:  libidn-devel
 BuildRequires:  gettext
 BuildRequires:  libgsasl-devel
+BuildRequires:  gnome-keyring-devel
 
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
@@ -34,7 +35,7 @@
 %setup -q
 
 %build
-%configure --disable-rpath
+%configure --disable-rpath --with-gnome-keyring
 make %{?_smp_mflags}
 
 
@@ -60,17 +61,23 @@
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING NEWS README THANKS
-%doc doc/msmtp.html  doc/msmtprc-system.example doc/msmtprc-user.example doc/Mutt+msmtp.txt
+%doc doc/msmtp.html doc/msmtp.pdf doc/msmtprc-system.example doc/msmtprc-user.example doc/Mutt+msmtp.txt
 %{_bindir}/msmtp
 %{_infodir}/msmtp.info*
 %{_mandir}/man1/msmtp.1*
 
 
 %changelog
+* Thu Jan 1 2009 Nikolay Vladimirov <nikolay at vladimiroff.com> - 1.4.17-1
+- Msmtp now also reads SYSCONFDIR/netrc if the password wasn't found in ~/.netrc.
+- Support for the GNOME keyring was added by Satoru SATOH.
+- Added BuildRequires for gnome-keyring-devel due to the new feature.
+- Added PDF version of the manual.
+
 * Tue Jul 29 2008 Nikolay Vladimirov <nikolay at vladimiroff.com> - 1.4.16-1
-- new upstream 1.4.16
+- new upstream release - 1.4.16
 
-* Fri Jun 27 2008 Nikolay Vladimirov <nikolay at vladimiroff.com> - 1.4.15-1
+* Fri Jun 27 2008 Nikolay Vladimriov <nikolay at vladimiroff.com> - 1.4.15-1
 - new upstream release
 
 * Sat Apr 19 2008 Nikolay Vladimirov <nikolay at vladimiroff.com> - 1.4.14-1


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/msmtp/F-9/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	29 Jul 2008 09:43:42 -0000	1.6
+++ sources	1 Jan 2009 22:46:10 -0000	1.7
@@ -1 +1 @@
-77a333601e9de03f695539498e678cc2  msmtp-1.4.16.tar.bz2
+b0b74f1144812b60688f590c62a0d3dd  msmtp-1.4.17.tar.bz2



From kkofler at fedoraproject.org  Thu Jan  1 22:46:32 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Thu,  1 Jan 2009 22:46:32 +0000 (UTC)
Subject: rpms/strigi/F-9 strigi-0.5.11-to-0.5.11.1.diff, NONE,
	1.1 strigi-multilib-fix.patch, 1.1, 1.2 strigi.spec, 1.17, 1.18
Message-ID: <20090101224632.792C47011B@cvs1.fedora.phx.redhat.com>

Author: kkofler

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

Modified Files:
	strigi-multilib-fix.patch strigi.spec 
Added Files:
	strigi-0.5.11-to-0.5.11.1.diff 
Log Message:
Sync from devel:

* Thu Dec 18 2008 Rex Dieter <rdieter at fedoraproject.org> - 0.5.11.1-2 
- respin (exiv2)

* Thu Nov 27 2008 Lorenzo Villani <lvillani at binaryhelix.net> - 0.5.11.1-1
- drop _default_patch_fuzz
- rebase strigi-multilib patch
- No official 0.5.11.1 tarballs were released but we need 0.5.11.1, apply a
  diff between 0.5.11 and 0.5.11.1 svn tags

strigi-0.5.11-to-0.5.11.1.diff:

--- NEW FILE strigi-0.5.11-to-0.5.11.1.diff ---
Index: src/streamanalyzer/CMakeLists.txt
===================================================================
--- src/streamanalyzer/CMakeLists.txt	(.../0.5.11)	(revision 889853)
+++ src/streamanalyzer/CMakeLists.txt	(.../0.5.11.1)	(revision 889853)
@@ -98,6 +98,7 @@
 	indexreader.h
 	indexmanager.h
 	indexplugin.h
+	indexpluginloader.h
 	indexwriter.h
 	variant.h
 	query.h

strigi-multilib-fix.patch:

Index: strigi-multilib-fix.patch
===================================================================
RCS file: /cvs/pkgs/rpms/strigi/F-9/strigi-multilib-fix.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- strigi-multilib-fix.patch	30 Oct 2007 17:24:34 -0000	1.1
+++ strigi-multilib-fix.patch	1 Jan 2009 22:46:02 -0000	1.2
@@ -1,5 +1,6 @@
---- src/streams/strigi/strigiconfig.h.cmake	2007-10-26 08:25:47.000000000 -0400
-+++ src/streams/strigi/strigiconfig.h.cmake.new	2007-10-30 09:10:38.000000000 -0400
+diff -Naur strigi-0.5.11/src/streams/strigi/strigiconfig.h.cmake strigi-0.5.11.multilib-fix/src/streams/strigi/strigiconfig.h.cmake
+--- strigi-0.5.11/src/streams/strigi/strigiconfig.h.cmake	2008-07-20 16:54:29.000000000 +0200
++++ strigi-0.5.11.multilib-fix/src/streams/strigi/strigiconfig.h.cmake	2008-11-27 22:45:05.000000000 +0100
 @@ -44,104 +44,6 @@
  #  include <stddef.h>
  #endif
@@ -104,4 +105,4 @@
 -
  #cmakedefine __STRIGI_HAVE_GCC_VISIBILITY
  
- #cmakedefine ENABLE_NEWXESAM
+ /**


Index: strigi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/strigi/F-9/strigi.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- strigi.spec	20 Jul 2008 18:15:03 -0000	1.17
+++ strigi.spec	1 Jan 2009 22:46:02 -0000	1.18
@@ -1,16 +1,15 @@
-%define _default_patch_fuzz 2
-
 Name:		strigi
-Version:	0.5.11
-Release:	1%{?dist}
+Version:	0.5.11.1
+Release:	2%{?dist}
 Summary:	A desktop search program for KDE
 Group:		Applications/Productivity
 License:	LGPLv2+
 URL:		http://www.vandenoever.info/software/strigi
-Source0:	http://www.vandenoever.info/software/strigi/strigi-%{version}.tar.bz2
+Source0:	http://www.vandenoever.info/software/strigi/strigi-0.5.11.tar.bz2
 Source1:	strigiclient.desktop
 Source2:	strigi-daemon.desktop
 Patch0:		strigi-multilib-fix.patch
+Patch1:     strigi-0.5.11-to-0.5.11.1.diff
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	cmake >= 2.4.5
@@ -50,8 +49,9 @@
 Strigi search engine libraries
 
 %prep
-%setup -q
-%patch0 -p0 -b .multilibs
+%setup -q -n strigi-0.5.11
+%patch0 -p1 -b .multilibs
+%patch1 -p0 -b .0.5.11-to-0.5.11.1
 
 %build
 mkdir fedora
@@ -117,6 +117,15 @@
 %{_libdir}/strigi/
 
 %changelog
+* Thu Dec 18 2008 Rex Dieter <rdieter at fedoraproject.org> - 0.5.11.1-2 
+- respin (exiv2)
+
+* Thu Nov 27 2008 Lorenzo Villani <lvillani at binaryhelix.net> - 0.5.11.1-1
+- drop _default_patch_fuzz
+- rebase strigi-multilib patch
+- No official 0.5.11.1 tarballs were released but we need 0.5.11.1, apply a
+  diff between 0.5.11 and 0.5.11.1 svn tags
+
 * Sun Jul 20 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> - 0.5.11-1
 - Update to 0.5.11
 - Drop compile-fix and lucenetest_fix patches (fixed upstream)
@@ -146,7 +155,7 @@
 
 * Tue Oct 30 2007 Deji Akingunola <dakingun at gmail.com> - 0.5.7-1
 - Update to 0.5.7 release
-- Fix multilibs conflict (Bug #343221, patch by Kevin Kofler) 
+- Fix multilibs conflict (Bug #343221, patch by Kevin Kofler)
 
 * Sun Sep 09 2007 Deji Akingunola <dakingun at gmail.com> - 0.5.5-2
 - Rebuild for BuildID changes



From mjakubicek at fedoraproject.org  Thu Jan  1 22:47:13 2009
From: mjakubicek at fedoraproject.org (=?utf-8?b?TWlsb8WhIEpha3Viw63EjWVr?=)
Date: Thu,  1 Jan 2009 22:47:13 +0000 (UTC)
Subject: rpms/ext3grep/F-9 .cvsignore, 1.6, 1.7 ext3grep.spec, 1.6,
	1.7 sources, 1.6, 1.7
Message-ID: <20090101224713.8AA687011B@cvs1.fedora.phx.redhat.com>

Author: mjakubicek

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

Modified Files:
	.cvsignore ext3grep.spec sources 
Log Message:
- Upstream version 0.10.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ext3grep/F-9/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	26 Oct 2008 18:31:23 -0000	1.6
+++ .cvsignore	1 Jan 2009 22:46:43 -0000	1.7
@@ -1 +1 @@
-ext3grep-0.10.0.tar.gz
+ext3grep-0.10.1.tar.gz


Index: ext3grep.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ext3grep/F-9/ext3grep.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ext3grep.spec	26 Oct 2008 18:31:23 -0000	1.6
+++ ext3grep.spec	1 Jan 2009 22:46:43 -0000	1.7
@@ -1,5 +1,5 @@
 Name:			ext3grep
-Version:		0.10.0
+Version:		0.10.1
 Release:		1%{?dist}
 Summary:		Recovery tool for ext3 filesystems
 
@@ -37,6 +37,8 @@
 %doc NEWS README LICENSE.GPL2
 
 %changelog
+* Thu Dec 18 2008 Lubomir Rintel <lkundrak at v3.sk> - 0.10.1-1
+- Upstream version 0.10.1
 
 * Sun Oct 26 2008 Milos Jakubicek <xjakub at fi.muni.cz> - 0.10.0-1
 - Upstream version 0.10.0


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ext3grep/F-9/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	26 Oct 2008 18:31:23 -0000	1.6
+++ sources	1 Jan 2009 22:46:43 -0000	1.7
@@ -1 +1 @@
-261d4fd4428fe9641dac9b12dafdb340  ext3grep-0.10.0.tar.gz
+8cf879f8fea6ba3432c2fdafd2ea89b8  ext3grep-0.10.1.tar.gz



From turki at fedoraproject.org  Thu Jan  1 22:53:11 2009
From: turki at fedoraproject.org (Nikolay Vladimirov)
Date: Thu,  1 Jan 2009 22:53:11 +0000 (UTC)
Subject: rpms/emerald/F-10 .cvsignore, 1.11, 1.12 emerald.spec, 1.18,
	1.19 sources, 1.11, 1.12
Message-ID: <20090101225311.228777011B@cvs1.fedora.phx.redhat.com>

Author: turki

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

Modified Files:
	.cvsignore emerald.spec sources 
Log Message:
Update to 0.7.8


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/emerald/F-10/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	11 Jul 2008 19:25:58 -0000	1.11
+++ .cvsignore	1 Jan 2009 22:52:40 -0000	1.12
@@ -1 +1 @@
-emerald-0.7.6.tar.bz2
+emerald-0.7.8.tar.bz2


Index: emerald.spec
===================================================================
RCS file: /cvs/pkgs/rpms/emerald/F-10/emerald.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- emerald.spec	15 Jul 2008 13:48:54 -0000	1.18
+++ emerald.spec	1 Jan 2009 22:52:40 -0000	1.19
@@ -2,13 +2,12 @@
 Url:            http://www.compiz-fusion.org/
 License:        GPLv2
 Group:          User Interface/Desktops
-Version:        0.7.6
-Release:        2%{?dist}
+Version:        0.7.8
+Release:        1%{?dist}
 
 Summary:        Themeable window decorator and compositing manager for Compiz Fusion
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Source0:        http://releases.compiz-fusion.org/%{version}/%{name}-%{version}.tar.bz2
-Patch0: 	    emerald-theme-manager-desktop.patch
 
 # compiz-devel is not available on these arches
 ExcludeArch:    s390 s390x
@@ -39,9 +38,6 @@
 
 %prep
 %setup -q
-#fix menu entries
-#https://bugzilla.redhat.com/show_bug.cgi?id=286141
-%patch0 -p1 -b .fixed
 
 %build
 %configure --enable-librsvg --disable-mime-update
@@ -100,7 +96,12 @@
 %{_libdir}/libemeraldengine.so
 
 %changelog
-* Tue Jul 15 2008 Nikolay Vladimirof <nikolay at vladimiroff.com> - 0.7.6-2
+* Thu Jan 1 2009 Nikolay Vladimirov <nikolay at vladimiroff.com> - 0.7.8-1
+- Minor bugfixes
+- L10N updates
+- Droping .desktop file patch ( now upsteam ) 
+
+* Tue Jul 15 2008 Nikolay Vladimirov <nikolay at vladimiroff.com> - 0.7.6-2
 - rebuild for ppc64
 
 * Fri Jul 11 2008 Nikolay Vladimirov <nikolay at vladimiroff.com> - 0.7.6-1


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/emerald/F-10/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	11 Jul 2008 19:25:58 -0000	1.11
+++ sources	1 Jan 2009 22:52:40 -0000	1.12
@@ -1 +1 @@
-340f4dafde5d6c55bd05c0033aa7d6fe  emerald-0.7.6.tar.bz2
+c7d90c1ca0c91503d474c7e1422edcd5  emerald-0.7.8.tar.bz2



From mclasen at fedoraproject.org  Thu Jan  1 22:58:42 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Thu,  1 Jan 2009 22:58:42 +0000 (UTC)
Subject: rpms/gnome-terminal/F-10 gnome-terminal.spec, 1.110,
	1.111 tab-switching.patch, 1.2, 1.3
Message-ID: <20090101225842.4764E70130@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-terminal/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19923

Modified Files:
	gnome-terminal.spec tab-switching.patch 
Log Message:
Restore tab switching configurability



Index: gnome-terminal.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-terminal/F-10/gnome-terminal.spec,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -r1.110 -r1.111
--- gnome-terminal.spec	25 Nov 2008 06:47:18 -0000	1.110
+++ gnome-terminal.spec	1 Jan 2009 22:58:11 -0000	1.111
@@ -11,12 +11,12 @@
 Summary: Terminal emulator for GNOME
 Name: gnome-terminal
 Version: 2.24.2
-Release: 2%{?dist}
+Release: 3%{?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
 Patch2: gnome-terminal-2.15.0-338913-revert-336325.patch
-# From upstream trunk
+# http://bugzilla.gnome.org/show_bug.cgi?id=562834 
 Patch3: tab-switching.patch
 License: GPLv2+ and GFDL
 Group: User Interface/Desktops
@@ -55,7 +55,7 @@
 %prep
 %setup -q
 %patch2 -p1 -b .338913-revert-336325
-%patch3 -p1 -b .tab-switching
+%patch3 -p0 -b .tab-switching
 
 %build
 
@@ -135,6 +135,9 @@
 %{_libdir}/bonobo/servers/gnome-terminal.server
 
 %changelog
+* Thu Jan  1 2009 Matthias Clasen <mclasen at redhat.com> - 2.24.2-3
+- Restore tab switching configurability
+
 * Tue Nov 25 2008 Matthias Clasen <mclasen at redhat.com> - 2.24.2-2
 - Update to 2.24.2
 

tab-switching.patch:

Index: tab-switching.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-terminal/F-10/tab-switching.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- tab-switching.patch	25 Nov 2008 06:47:18 -0000	1.2
+++ tab-switching.patch	1 Jan 2009 22:58:11 -0000	1.3
@@ -1,11 +1,184 @@
-diff -up gnome-terminal-2.24.2/src/gnome-terminal.schemas.in.tab-switching gnome-terminal-2.24.2/src/gnome-terminal.schemas.in
---- gnome-terminal-2.24.2/src/gnome-terminal.schemas.in.tab-switching	2008-11-24 12:00:03.000000000 -0500
-+++ gnome-terminal-2.24.2/src/gnome-terminal.schemas.in	2008-11-25 01:23:43.000000000 -0500
-@@ -982,6 +982,211 @@
-          </long>
-       </locale>
+Index: src/terminal-accels.c
+===================================================================
+--- src/terminal-accels.c	(revision 3169)
++++ src/terminal-accels.c	(revision 3171)
+@@ -20,11 +20,14 @@
+ 
+ #include <string.h>
+ 
++#include <gdk/gdkkeysyms.h>
++
+ #include "terminal-accels.h"
+ #include "terminal-app.h"
+ #include "terminal-intl.h"
+ #include "terminal-profile.h"
+ #include "terminal-util.h"
++#include "terminal-accels.h"
+ 
+ #ifdef DEBUG_ACCELS
+ #define D(x) x
+@@ -71,6 +74,7 @@
+ #define ACCEL_PATH_MOVE_TAB_LEFT        ACCEL_PATH_ROOT "TabsMoveLeft"
+ #define ACCEL_PATH_MOVE_TAB_RIGHT       ACCEL_PATH_ROOT "TabsMoveRight"
+ #define ACCEL_PATH_DETACH_TAB           ACCEL_PATH_ROOT "TabsDetach"
++#define ACCEL_PATH_SWITCH_TAB_PREFIX    ACCEL_PATH_ROOT "TabsSwitch"
+ 
+ #define KEY_CLOSE_TAB           CONF_KEYS_PREFIX "/close_tab"
+ #define KEY_CLOSE_WINDOW        CONF_KEYS_PREFIX "/close_window"
+@@ -93,6 +97,7 @@
+ #define KEY_ZOOM_IN             CONF_KEYS_PREFIX "/zoom_in"
+ #define KEY_ZOOM_NORMAL         CONF_KEYS_PREFIX "/zoom_normal"
+ #define KEY_ZOOM_OUT            CONF_KEYS_PREFIX "/zoom_out"
++#define KEY_SWITCH_TAB_PREFIX   CONF_KEYS_PREFIX "/switch_to_tab_"
+ 
+ typedef struct
+ {
+@@ -173,6 +178,42 @@
+     KEY_MOVE_TAB_RIGHT, ACCEL_PATH_MOVE_TAB_RIGHT, 0, 0, NULL, FALSE, TRUE },
+   { N_("Detach Tab"),
+     KEY_DETACH_TAB, ACCEL_PATH_DETACH_TAB, 0, 0, NULL, FALSE, TRUE },
++  { N_("Switch to Tab 1"),
++    KEY_SWITCH_TAB_PREFIX "1",
++    ACCEL_PATH_SWITCH_TAB_PREFIX "1", GDK_1, GDK_MOD1_MASK, NULL, FALSE, TRUE },
++  { N_("Switch to Tab 2"),
++    KEY_SWITCH_TAB_PREFIX "2",
++    ACCEL_PATH_SWITCH_TAB_PREFIX "2", GDK_2, GDK_MOD1_MASK, NULL, FALSE, TRUE },
++  { N_("Switch to Tab 3"),
++    KEY_SWITCH_TAB_PREFIX "3",
++    ACCEL_PATH_SWITCH_TAB_PREFIX "3", GDK_3, GDK_MOD1_MASK, NULL, FALSE, TRUE },
++  { N_("Switch to Tab 4"),
++    KEY_SWITCH_TAB_PREFIX "4",
++    ACCEL_PATH_SWITCH_TAB_PREFIX "4", GDK_4, GDK_MOD1_MASK, NULL, FALSE, TRUE },
++  { N_("Switch to Tab 5"),
++    KEY_SWITCH_TAB_PREFIX "5",
++    ACCEL_PATH_SWITCH_TAB_PREFIX "5", GDK_5, GDK_MOD1_MASK, NULL, FALSE, TRUE },
++  { N_("Switch to Tab 6"),
++    KEY_SWITCH_TAB_PREFIX "6",
++    ACCEL_PATH_SWITCH_TAB_PREFIX "6", GDK_6, GDK_MOD1_MASK, NULL, FALSE, TRUE },
++  { N_("Switch to Tab 7"),
++    KEY_SWITCH_TAB_PREFIX "7",
++    ACCEL_PATH_SWITCH_TAB_PREFIX "7", GDK_7, GDK_MOD1_MASK, NULL, FALSE, TRUE },
++  { N_("Switch to Tab 8"),
++    KEY_SWITCH_TAB_PREFIX "8",
++    ACCEL_PATH_SWITCH_TAB_PREFIX "8", GDK_8, GDK_MOD1_MASK, NULL, FALSE, TRUE },
++  { N_("Switch to Tab 9"),
++    KEY_SWITCH_TAB_PREFIX "9",
++    ACCEL_PATH_SWITCH_TAB_PREFIX "9", GDK_9, GDK_MOD1_MASK, NULL, FALSE, TRUE },
++  { N_("Switch to Tab 10"),
++    KEY_SWITCH_TAB_PREFIX "10",
++    ACCEL_PATH_SWITCH_TAB_PREFIX "10", 0, 0, NULL, FALSE, TRUE },
++  { N_("Switch to Tab 11"),
++    KEY_SWITCH_TAB_PREFIX "11",
++    ACCEL_PATH_SWITCH_TAB_PREFIX "11", 0, 0, NULL, FALSE, TRUE },
++  { N_("Switch to Tab 12"),
++    KEY_SWITCH_TAB_PREFIX "12",
++    ACCEL_PATH_SWITCH_TAB_PREFIX "12", 0, 0, NULL, FALSE, TRUE }
+ };
+ 
+ static KeyEntry help_entries[] = {
+@@ -186,7 +227,7 @@
+   { view_entries, G_N_ELEMENTS (view_entries), N_("View") },
+   { terminal_entries, G_N_ELEMENTS (terminal_entries), N_("Terminal") },
+   { tabs_entries, G_N_ELEMENTS (tabs_entries), N_("Tabs") },
+-  { help_entries, G_N_ELEMENTS (help_entries), N_("Help") }
++  { help_entries, G_N_ELEMENTS (help_entries), N_("Help") },
+ };
+ 
+ enum
+Index: src/terminal-tabs-menu.c
+===================================================================
+--- src/terminal-tabs-menu.c	(revision 3169)
++++ src/terminal-tabs-menu.c	(revision 3171)
+@@ -30,14 +30,16 @@
+ #include "terminal-screen-container.h"
+ #include "terminal-intl.h"
+ 
++#define TERMINAL_ACCELS_N_TABS_SWITCH (12)
++
+ #define LABEL_WIDTH_CHARS 32
+ #define ACTION_VERB_FORMAT_PREFIX       "JmpTab"
+-#define ACTION_VERB_FORMAT_PREFIX_LEN   (6) /* strlen (ACTION_VERB_FORMAT_PREFIX) */
++#define ACTION_VERB_FORMAT_PREFIX_LEN   strlen (ACTION_VERB_FORMAT_PREFIX)
+ #define ACTION_VERB_FORMAT		ACTION_VERB_FORMAT_PREFIX "%x"
+ #define ACTION_VERB_FORMAT_LENGTH	strlen (ACTION_VERB_FORMAT) + 14 + 1
+ #define ACTION_VERB_FORMAT_BASE         (16) /* %x is hex */
+-#define ACCEL_PATH_FORMAT		"<Actions>/TabsActions/%s"
+-#define ACCEL_PATH_FORMAT_LENGTH	strlen (ACCEL_PATH_FORMAT) -2 + ACTION_VERB_FORMAT_LENGTH
++#define ACCEL_PATH_FORMAT		"<Actions>/Main/TabsSwitch%u"
++#define ACCEL_PATH_FORMAT_LENGTH	strlen (ACCEL_PATH_FORMAT) + 14 + 1
+ #define DATA_KEY			"TerminalTabsMenu::Action"
+ 
+ #define UI_PATH                         "/menubar/Tabs"
+@@ -379,7 +381,7 @@
+ 	g_type_class_add_private (object_class, sizeof (TerminalTabsMenuPrivate));
+ 
+         /* We don't want to save accels, so skip them */
+-        gtk_accel_map_add_filter ("<Actions>/TabsActions/JmpTab*");
++        gtk_accel_map_add_filter ("<Actions>/Main/TabsSwitch*");
+ }
+ 
+ static void
+@@ -416,40 +418,19 @@
+ 			    guint tab_number,
+ 			    gboolean is_single_tab)
+ {
+-	const char *verb;
+-	char accel_path[ACCEL_PATH_FORMAT_LENGTH];
+-	char accel[7];
+-	gint accel_number;
+-	guint accel_key;
+-	GdkModifierType accel_mods;
++        if (!is_single_tab &&
++            tab_number < TERMINAL_ACCELS_N_TABS_SWITCH)
++        {
++                char accel_path[ACCEL_PATH_FORMAT_LENGTH];
+ 
+-	verb = gtk_action_get_name (action);
+-
+-	/* set the accel path for the menu item */
+-	g_snprintf (accel_path, sizeof (accel_path),
+-		    ACCEL_PATH_FORMAT, verb);
+-	gtk_action_set_accel_path (action, accel_path);
+-
+-	/* Only the first ten tabs get accelerators starting from 1 through 0 */
+-	if (tab_number < 10 && !is_single_tab)
+-	{
+-		accel_key = 0;
+-		accel_number = (tab_number + 1) % 10;
+-
+-		g_snprintf (accel, sizeof (accel), "<alt>%d", accel_number);
+-
+-		gtk_accelerator_parse (accel, &accel_key, &accel_mods);
+-
+-		if (accel_key != 0)
+-		{
+-			gtk_accel_map_change_entry (accel_path, accel_key,
+-						    accel_mods, TRUE);
+-		}
+-	}
+-	else
+-	{
+-		gtk_accel_map_change_entry (accel_path, 0, 0, TRUE);
+-	}
++                g_snprintf (accel_path, sizeof (accel_path), ACCEL_PATH_FORMAT, tab_number + 1);
++                gtk_action_set_accel_path (action, accel_path);
++        }
++        else
++        {
++                gtk_action_set_accel_path (action, NULL);
++                return;
++        }
+ }
+ 
+ static void
+Index: src/gnome-terminal.schemas.in
+===================================================================
+--- src/gnome-terminal.schemas.in	(revision 3169)
++++ src/gnome-terminal.schemas.in	(revision 3171)
+@@ -916,6 +916,210 @@
      </schema>
-+    <schema>
+ 
+     <schema>
 +      <key>/schemas/apps/gnome-terminal/keybindings/switch_to_tab_1</key>
 +      <applyto>/apps/gnome-terminal/keybindings/switch_to_tab_1</applyto>
 +      <owner>gnome-terminal</owner>
@@ -209,7 +382,7 @@
 +      </locale>
 +    </schema>
 +
- 
-   </schemalist>  
- </gconfschemafile>
-+
++    <schema>
+       <key>/schemas/apps/gnome-terminal/keybindings/help</key>
+       <applyto>/apps/gnome-terminal/keybindings/help</applyto>
+       <owner>gnome-terminal</owner>



From wart at fedoraproject.org  Thu Jan  1 23:07:46 2009
From: wart at fedoraproject.org (Michael Thomas)
Date: Thu,  1 Jan 2009 23:07:46 +0000 (UTC)
Subject: rpms/neverball/devel neverball.spec,1.17,1.18
Message-ID: <20090101230746.62B297011B@cvs1.fedora.phx.redhat.com>

Author: wart

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

Modified Files:
	neverball.spec 
Log Message:
Fix font package name for F11




Index: neverball.spec
===================================================================
RCS file: /cvs/extras/rpms/neverball/devel/neverball.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- neverball.spec	24 Dec 2008 06:05:50 -0000	1.17
+++ neverball.spec	1 Jan 2009 23:07:14 -0000	1.18
@@ -1,6 +1,6 @@
 Name:           neverball
 Version:        1.4.0
-Release:        12%{?dist}
+Release:        13%{?dist}
 
 Summary:        Roll a ball through an obstacle course
 
@@ -15,7 +15,7 @@
 BuildRequires:  SDL_image-devel, SDL_ttf-devel, SDL_mixer-devel
 BuildRequires:  freetype-devel, desktop-file-utils, zlib-devel
 BuildRequires:  libGL-devel
-Requires: opengl-games-utils bitstream-vera-fonts
+Requires: opengl-games-utils bitstream-vera-fonts-sans
 
 %description
 Tilt the floor to roll a ball through an obstacle course within the
@@ -70,6 +70,9 @@
 %{_datadir}/applications/*
 
 %changelog
+* Thu Jan 1 2009 Wart <wart at kobold.org> - 1.4.0-13
+- Fix font package name for F11
+
 * Tue Dec 23 2008 Wart <wart at kobold.org> - 1.4.0-12
 - Replace bundled font with a symlink to an identical system font (BZ #477432)
 



From turki at fedoraproject.org  Thu Jan  1 23:10:00 2009
From: turki at fedoraproject.org (Nikolay Vladimirov)
Date: Thu,  1 Jan 2009 23:10:00 +0000 (UTC)
Subject: rpms/PyOpenGL/devel .cvsignore, 1.6, 1.7 PyOpenGL.spec, 1.9,
	1.10 sources, 1.6, 1.7
Message-ID: <20090101231000.1DB9E7011B@cvs1.fedora.phx.redhat.com>

Author: turki

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

Modified Files:
	.cvsignore PyOpenGL.spec sources 
Log Message:
Update to 3.0.0b8


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/PyOpenGL/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	22 Sep 2008 09:00:09 -0000	1.6
+++ .cvsignore	1 Jan 2009 23:09:29 -0000	1.7
@@ -1 +1 @@
-PyOpenGL-3.0.0b6.tar.gz
+PyOpenGL-3.0.0b8.tar.gz


Index: PyOpenGL.spec
===================================================================
RCS file: /cvs/pkgs/rpms/PyOpenGL/devel/PyOpenGL.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- PyOpenGL.spec	30 Nov 2008 01:38:49 -0000	1.9
+++ PyOpenGL.spec	1 Jan 2009 23:09:29 -0000	1.10
@@ -1,9 +1,9 @@
-%define prever b6
+%define prever b8
 %{!?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.10.%{prever}%{?dist}
+Release:        0.11.%{prever}%{?dist}
 Summary:        Python bindings for OpenGL
 License:        BSD
 Group:          System Environment/Libraries
@@ -86,6 +86,10 @@
 
 
 %changelog
+* Fri Jan 2 2009 Nikolay Vladimirov <nikolay at vladimiroff.com> - 3.0.0-0.11.b8
+- New upstream 3.0.0b8 (b7 was skipped by upstream)
+- performance, bug-fix and packaging release. 
+
 * Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 3.0.0-0.10.b6
 - Fix locations for Python 2.6
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/PyOpenGL/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	22 Sep 2008 09:00:09 -0000	1.6
+++ sources	1 Jan 2009 23:09:29 -0000	1.7
@@ -1 +1 @@
-6a70dd315767064ec78b84a92d2420a8  PyOpenGL-3.0.0b6.tar.gz
+1d9afbf0a403d916997937ef0dde2520  PyOpenGL-3.0.0b8.tar.gz



From turki at fedoraproject.org  Thu Jan  1 23:34:51 2009
From: turki at fedoraproject.org (Nikolay Vladimirov)
Date: Thu,  1 Jan 2009 23:34:51 +0000 (UTC)
Subject: rpms/PyOpenGL/devel PyOpenGL.spec,1.10,1.11
Message-ID: <20090101233451.DCD717011B@cvs1.fedora.phx.redhat.com>

Author: turki

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

Modified Files:
	PyOpenGL.spec 
Log Message:
Packagin fixes


Index: PyOpenGL.spec
===================================================================
RCS file: /cvs/pkgs/rpms/PyOpenGL/devel/PyOpenGL.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- PyOpenGL.spec	1 Jan 2009 23:09:29 -0000	1.10
+++ PyOpenGL.spec	1 Jan 2009 23:34:20 -0000	1.11
@@ -52,13 +52,13 @@
 
 
 %build
-python setup.py build
+%{__python} setup.py build
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-python setup.py install -O1 --skip-build --root="$RPM_BUILD_ROOT" \
-  --prefix="%{_prefix}" --single-version-externally-managed
+%{__python} setup.py install -O1 --skip-build --root="$RPM_BUILD_ROOT" \
+  --prefix="%{_prefix}"
 chmod -x $RPM_BUILD_ROOT%{python_sitelib}/%{name}-%{version}%{prever}-py?.?.egg-info/*
 # don't package the tests files
 rm -r $RPM_BUILD_ROOT%{python_sitelib}/OpenGL/tests
@@ -89,6 +89,8 @@
 * Fri Jan 2 2009 Nikolay Vladimirov <nikolay at vladimiroff.com> - 3.0.0-0.11.b8
 - New upstream 3.0.0b8 (b7 was skipped by upstream)
 - performance, bug-fix and packaging release. 
+- Use macro for "python"
+- remove "--single-version-externally-managed" option for setup.py
 
 * Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 3.0.0-0.10.b6
 - Fix locations for Python 2.6



From rdieter at fedoraproject.org  Fri Jan  2 00:08:22 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri,  2 Jan 2009 00:08:22 +0000 (UTC)
Subject: rpms/koffice-langpack/devel koffice-langpack.spec,1.14,1.15
Message-ID: <20090102000822.5E9637013C@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/koffice-langpack/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4959

Modified Files:
	koffice-langpack.spec 
Log Message:
cosmetic dir ownership



Index: koffice-langpack.spec
===================================================================
RCS file: /cvs/pkgs/rpms/koffice-langpack/devel/koffice-langpack.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- koffice-langpack.spec	31 Dec 2008 20:35:32 -0000	1.14
+++ koffice-langpack.spec	2 Jan 2009 00:07:50 -0000	1.15
@@ -524,7 +524,7 @@
 %lang(bg) %{_datadir}/locale/bg/LC_MESSAGES/*
 
 %files br
-%lang(br) %{_datadir}/locale/br/LC_MESSAGES
+%lang(br) %{_datadir}/locale/br/LC_MESSAGES/*
 
 %files ca
 %lang(ca) %{_datadir}/locale/ca/LC_MESSAGES/*



From turki at fedoraproject.org  Fri Jan  2 00:08:31 2009
From: turki at fedoraproject.org (Nikolay Vladimirov)
Date: Fri,  2 Jan 2009 00:08:31 +0000 (UTC)
Subject: rpms/PyOpenGL/devel PyOpenGL.spec,1.11,1.12
Message-ID: <20090102000831.274757013C@cvs1.fedora.phx.redhat.com>

Author: turki

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

Modified Files:
	PyOpenGL.spec 
Log Message:
More packaging fixes for b8


Index: PyOpenGL.spec
===================================================================
RCS file: /cvs/pkgs/rpms/PyOpenGL/devel/PyOpenGL.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- PyOpenGL.spec	1 Jan 2009 23:34:20 -0000	1.11
+++ PyOpenGL.spec	2 Jan 2009 00:08:00 -0000	1.12
@@ -59,11 +59,7 @@
 rm -rf $RPM_BUILD_ROOT
 %{__python} setup.py install -O1 --skip-build --root="$RPM_BUILD_ROOT" \
   --prefix="%{_prefix}"
-chmod -x $RPM_BUILD_ROOT%{python_sitelib}/%{name}-%{version}%{prever}-py?.?.egg-info/*
-# don't package the tests files
-rm -r $RPM_BUILD_ROOT%{python_sitelib}/OpenGL/tests
-# for %%doc
-rm documentation/pydoc/builddocs.py documentation/buildepydoc.py
+chmod -x $RPM_BUILD_ROOT%{python_sitelib}/%{name}-%{version}%{prever}-py?.?.egg-info
 
 
 %clean
@@ -72,7 +68,6 @@
 
 %files
 %defattr(-,root,root,-)
-%doc license.txt
 %{python_sitelib}/*OpenGL*
 %exclude %{python_sitelib}/OpenGL/Tk
 
@@ -82,8 +77,6 @@
 
 %files doc
 %defattr(-,root,root,-)
-%doc documentation/*
-
 
 %changelog
 * Fri Jan 2 2009 Nikolay Vladimirov <nikolay at vladimiroff.com> - 3.0.0-0.11.b8
@@ -91,6 +84,10 @@
 - performance, bug-fix and packaging release. 
 - Use macro for "python"
 - remove "--single-version-externally-managed" option for setup.py
+- *.egg-info is no longer a folder, it's a file now 
+- Tests are no longer installed by setup.py
+- Documentation is no longer distributed in "documentation" folder
+- license.txt is also no longer provided by upstream.
 
 * Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 3.0.0-0.10.b6
 - Fix locations for Python 2.6



From wart at fedoraproject.org  Fri Jan  2 00:12:18 2009
From: wart at fedoraproject.org (Michael Thomas)
Date: Fri,  2 Jan 2009 00:12:18 +0000 (UTC)
Subject: rpms/wormux/devel wormux.spec,1.15,1.16
Message-ID: <20090102001218.1A32B7013C@cvs1.fedora.phx.redhat.com>

Author: wart

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

Modified Files:
	wormux.spec 
Log Message:
Fix font package name for F11




Index: wormux.spec
===================================================================
RCS file: /cvs/extras/rpms/wormux/devel/wormux.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- wormux.spec	24 Dec 2008 23:24:51 -0000	1.15
+++ wormux.spec	2 Jan 2009 00:11:47 -0000	1.16
@@ -1,6 +1,6 @@
 Name:           wormux
 Version:        0.8.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        2D convivial mass murder game
 
 Group:          Amusements/Games
@@ -12,7 +12,7 @@
 BuildRequires:  SDL_image-devel SDL_gfx-devel SDL_mixer-devel
 BuildRequires:  SDL_ttf-devel SDL_net-devel curl-devel libpng-devel
 BuildRequires:  gettext libxml++-devel desktop-file-utils
-Requires:       wormux-data dejavu-fonts
+Requires:       wormux-data dejavu-fonts-sans
 Requires(post): coreutils
 Requires(postun): coreutils
 
@@ -89,6 +89,9 @@
 %{_datadir}/%{name}
 
 %changelog
+* Thu Jan 1 2009 Wart <wart at kobold.org> 0.8.2-3
+- Fix font package name for F11
+
 * Wed Dec 24 2008 Wart <wart at kobold.org> 0.8.2-2
 - Add coreutils requirement for rpm post scripts
 - Replace bundled font with a symlink to an identical system font (BZ #477484)



From salimma at fedoraproject.org  Fri Jan  2 00:15:18 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Fri,  2 Jan 2009 00:15:18 +0000 (UTC)
Subject: rpms/banshee/F-10 banshee.spec,1.63,1.64
Message-ID: <20090102001518.109687013C@cvs1.fedora.phx.redhat.com>

Author: salimma

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

Modified Files:
	banshee.spec 
Log Message:
* Thu Jan  1 2009 Michel Salim <salimma at fedoraproject.org> - 1.4.1-4
- Manually require libmtp



Index: banshee.spec
===================================================================
RCS file: /cvs/pkgs/rpms/banshee/F-10/banshee.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- banshee.spec	1 Jan 2009 21:56:32 -0000	1.63
+++ banshee.spec	2 Jan 2009 00:14:47 -0000	1.64
@@ -2,7 +2,7 @@
 
 Name:    banshee
 Version: 1.4.1
-Release: 3%{?dist}
+Release: 4%{?dist}
 Summary: Easily import, manage, and play selections from your music collection
 Group:   Applications/Multimedia
 License: MIT
@@ -46,6 +46,7 @@
 BuildRequires: desktop-file-utils
 
 Requires:      podsleuth
+Requires:      libmtp
 Requires:      %{name}-musicbrainz = %{version}-%{release}
 
 %description
@@ -179,6 +180,9 @@
 
 
 %changelog
+* Thu Jan  1 2009 Michel Salim <salimma at fedoraproject.org> - 1.4.1-4
+- Manually require libmtp
+
 * Thu Jan  1 2009 Michel Salim <salimma at fedoraproject.org> - 1.4.1-3
 - Split MusicBrainz libraries into separate subpackages
 - Properly tag songs ripped from CDs (bug #477669)



From salimma at fedoraproject.org  Fri Jan  2 00:15:18 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Fri,  2 Jan 2009 00:15:18 +0000 (UTC)
Subject: rpms/banshee/F-9 banshee.spec,1.57,1.58
Message-ID: <20090102001518.4076A7013C@cvs1.fedora.phx.redhat.com>

Author: salimma

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

Modified Files:
	banshee.spec 
Log Message:
* Thu Jan  1 2009 Michel Salim <salimma at fedoraproject.org> - 1.4.1-4
- Manually require libmtp



Index: banshee.spec
===================================================================
RCS file: /cvs/pkgs/rpms/banshee/F-9/banshee.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- banshee.spec	1 Jan 2009 21:56:33 -0000	1.57
+++ banshee.spec	2 Jan 2009 00:14:47 -0000	1.58
@@ -2,7 +2,7 @@
 
 Name:    banshee
 Version: 1.4.1
-Release: 3%{?dist}
+Release: 4%{?dist}
 Summary: Easily import, manage, and play selections from your music collection
 Group:   Applications/Multimedia
 License: MIT
@@ -46,6 +46,7 @@
 BuildRequires: desktop-file-utils
 
 Requires:      podsleuth
+Requires:      libmtp
 Requires:      %{name}-musicbrainz = %{version}-%{release}
 
 %description
@@ -179,6 +180,9 @@
 
 
 %changelog
+* Thu Jan  1 2009 Michel Salim <salimma at fedoraproject.org> - 1.4.1-4
+- Manually require libmtp
+
 * Thu Jan  1 2009 Michel Salim <salimma at fedoraproject.org> - 1.4.1-3
 - Split MusicBrainz libraries into separate subpackages
 - Properly tag songs ripped from CDs (bug #477669)



From salimma at fedoraproject.org  Fri Jan  2 00:15:18 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Fri,  2 Jan 2009 00:15:18 +0000 (UTC)
Subject: rpms/banshee/devel banshee.spec,1.64,1.65
Message-ID: <20090102001518.9A2F77013C@cvs1.fedora.phx.redhat.com>

Author: salimma

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

Modified Files:
	banshee.spec 
Log Message:
* Thu Jan  1 2009 Michel Salim <salimma at fedoraproject.org> - 1.4.1-4
- Manually require libmtp



Index: banshee.spec
===================================================================
RCS file: /cvs/pkgs/rpms/banshee/devel/banshee.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- banshee.spec	1 Jan 2009 21:56:33 -0000	1.64
+++ banshee.spec	2 Jan 2009 00:14:48 -0000	1.65
@@ -2,7 +2,7 @@
 
 Name:    banshee
 Version: 1.4.1
-Release: 3%{?dist}
+Release: 4%{?dist}
 Summary: Easily import, manage, and play selections from your music collection
 Group:   Applications/Multimedia
 License: MIT
@@ -46,6 +46,7 @@
 BuildRequires: desktop-file-utils
 
 Requires:      podsleuth
+Requires:      libmtp
 Requires:      %{name}-musicbrainz = %{version}-%{release}
 
 %description
@@ -179,6 +180,9 @@
 
 
 %changelog
+* Thu Jan  1 2009 Michel Salim <salimma at fedoraproject.org> - 1.4.1-4
+- Manually require libmtp
+
 * Thu Jan  1 2009 Michel Salim <salimma at fedoraproject.org> - 1.4.1-3
 - Split MusicBrainz libraries into separate subpackages
 - Properly tag songs ripped from CDs (bug #477669)



From turki at fedoraproject.org  Fri Jan  2 01:06:11 2009
From: turki at fedoraproject.org (Nikolay Vladimirov)
Date: Fri,  2 Jan 2009 01:06:11 +0000 (UTC)
Subject: rpms/PyOpenGL/devel license.txt,NONE,1.1 PyOpenGL.spec,1.12,1.13
Message-ID: <20090102010611.2FCD670134@cvs1.fedora.phx.redhat.com>

Author: turki

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

Modified Files:
	PyOpenGL.spec 
Added Files:
	license.txt 
Log Message:
Even More packaging fixes for b8


--- NEW FILE license.txt ---
OpenGL-ctypes License

	Copyright (c) 2005-2007, Michael C. Fletcher and Contributors
	All rights reserved.
	
	Redistribution and use in source and binary forms, with or without
	modification, are permitted provided that the following conditions
	are met:
	
		Redistributions of source code must retain the above copyright
		notice, this list of conditions and the following disclaimer.
	
		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.
	
		The name of Michael C. Fletcher, or the name of any Contributor,
		may not be used to endorse or promote products derived from this 
		software without specific prior written permission.
	
	THIS SOFTWARE IS NOT FAULT TOLERANT AND SHOULD NOT BE USED IN ANY
	SITUATION ENDANGERING HUMAN LIFE OR PROPERTY.
	
	THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
	``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
	LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
	FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
	COPYRIGHT HOLDERS AND 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. 

OpenGL-ctypes includes code from the PyOpenGL 2.x series licensed under
version 3 of the PyOpenGL License (BSD-style):

	PyOpenGL License (v3)

	PyOpenGL is based on PyOpenGL 1.5.5, Copyright &copy; 1997-1998 by
	James Hugunin, Cambridge MA, USA, Thomas Schwaller, Munich, Germany
	and David Ascher, San Francisco CA, USA.

	Contributors to the PyOpenGL project in addition to those listed 
	above include:
		* David Konerding
		* Soren Renner
		* Rene Liebscher
		* Randall Hopper
		* Michael Fletcher
		* Thomas Malik
		* Thomas Hamelryck
		* Jack Jansen
		* Michel Sanner
		* Tarn Weisner Burton
		* Andrew Cox
		* Rene Dudfield

	PyOpenGL is Copyright (c) 1997-1998, 2000-2006 by the contributors.

	All rights reserved.

	Redistribution and use in source and binary forms, with or without
	modification, are permitted provided that the following conditions are
	met:
	
	* Redistributions of source code must retain the above copyright
		notice, this list of conditions and the following disclaimer.
	* 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.
	* The names of the contributors may not be used to endorse or
		promote products derived from this software without specific prior
		written permission.
	
	THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
	"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
	LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
	A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
	HOLDERS 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.

OpenGL-ctypes includes code from the Pyglet project, licensed under the 
Pyglet License (BSD Style):

	Copyright (c) 2006-2008 Alex Holkner
	All rights reserved.

	Redistribution and use in source and binary forms, with or without
	modification, are permitted provided that the following conditions 
	are met:
	
	* Redistributions of source code must retain the above copyright
	   notice, this list of conditions and the following disclaimer.
	 * 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.
	 * Neither the name of pyglet nor the names of its
	   contributors may be used to endorse or promote products
	   derived from this software without specific prior written
	   permission.

	THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
	"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
	LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
	FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
	COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
	INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
	BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
	LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
	CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
	LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
	ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
	POSSIBILITY OF SUCH DAMAGE.



Index: PyOpenGL.spec
===================================================================
RCS file: /cvs/pkgs/rpms/PyOpenGL/devel/PyOpenGL.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- PyOpenGL.spec	2 Jan 2009 00:08:00 -0000	1.12
+++ PyOpenGL.spec	2 Jan 2009 01:05:40 -0000	1.13
@@ -9,14 +9,16 @@
 Group:          System Environment/Libraries
 URL:            http://pyopengl.sourceforge.net/
 Source0:        http://downloads.sourceforge.net/pyopengl/%{name}-%{version}%{prever}.tar.gz
+Source1:	license.txt
 Patch0:         PyOpenGL-3.0.0a6-shebang.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  python-devel python-setuptools-devel
 BuildArch:      noarch
-Requires:       python-numeric python-setuptools libGL libGLU freeglut
+Requires:       python-numeric python-setuptools freeglut
 # in some other repositories this is named python-opengl
 Provides:       python-opengl = %{version}-%{release}
 Obsoletes:      python-opengl < %{version}-%{release}
+Obsoletes:	PyOpenGL-doc
 
 %description
 PyOpenGL is the cross platform Python binding to OpenGL and related APIs. It
@@ -36,20 +38,10 @@
 %description Tk
 %{name} Togl (Tk OpenGL widget) 1.6 support.
 
-
-%package doc
-Summary:        Documentation files for %{name}
-Group:          Development/Languages
-Requires:       %{name} = %{version}-%{release}
-
-%description doc
-Documentation files for %{name}.
-
-
 %prep
 %setup -q -n %{name}-%{version}%{prever}
 %patch0 -p1 -z .shebang
-
+cp -p %{SOURCE1} .
 
 %build
 %{__python} setup.py build
@@ -68,6 +60,7 @@
 
 %files
 %defattr(-,root,root,-)
+%doc license.txt
 %{python_sitelib}/*OpenGL*
 %exclude %{python_sitelib}/OpenGL/Tk
 
@@ -75,9 +68,6 @@
 %defattr(-,root,root,-)
 %{python_sitelib}/OpenGL/Tk
 
-%files doc
-%defattr(-,root,root,-)
-
 %changelog
 * Fri Jan 2 2009 Nikolay Vladimirov <nikolay at vladimiroff.com> - 3.0.0-0.11.b8
 - New upstream 3.0.0b8 (b7 was skipped by upstream)
@@ -86,8 +76,9 @@
 - remove "--single-version-externally-managed" option for setup.py
 - *.egg-info is no longer a folder, it's a file now 
 - Tests are no longer installed by setup.py
-- Documentation is no longer distributed in "documentation" folder
-- license.txt is also no longer provided by upstream.
+- Obsolete 'doc' subpackage (no longer distributed "documentation" folder)
+- license.txt is also no longer provided by upstream. Using one from b6
+- Removed Requires for libGL and libGLU ( should be pulled for freeglut)
 
 * Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 3.0.0-0.10.b6
 - Fix locations for Python 2.6



From turki at fedoraproject.org  Fri Jan  2 01:25:53 2009
From: turki at fedoraproject.org (Nikolay Vladimirov)
Date: Fri,  2 Jan 2009 01:25:53 +0000 (UTC)
Subject: rpms/PyOpenGL/F-10 license.txt, NONE, 1.1 .cvsignore, 1.6,
	1.7 PyOpenGL.spec, 1.7, 1.8 sources, 1.6, 1.7
Message-ID: <20090102012553.2404770130@cvs1.fedora.phx.redhat.com>

Author: turki

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

Modified Files:
	.cvsignore PyOpenGL.spec sources 
Added Files:
	license.txt 
Log Message:
Update to 3.0.0b8 and lots of packaging fixes


--- NEW FILE license.txt ---
OpenGL-ctypes License

	Copyright (c) 2005-2007, Michael C. Fletcher and Contributors
	All rights reserved.
	
	Redistribution and use in source and binary forms, with or without
	modification, are permitted provided that the following conditions
	are met:
	
		Redistributions of source code must retain the above copyright
		notice, this list of conditions and the following disclaimer.
	
		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.
	
		The name of Michael C. Fletcher, or the name of any Contributor,
		may not be used to endorse or promote products derived from this 
		software without specific prior written permission.
	
	THIS SOFTWARE IS NOT FAULT TOLERANT AND SHOULD NOT BE USED IN ANY
	SITUATION ENDANGERING HUMAN LIFE OR PROPERTY.
	
	THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
	``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
	LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
	FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
	COPYRIGHT HOLDERS AND 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. 

OpenGL-ctypes includes code from the PyOpenGL 2.x series licensed under
version 3 of the PyOpenGL License (BSD-style):

	PyOpenGL License (v3)

	PyOpenGL is based on PyOpenGL 1.5.5, Copyright &copy; 1997-1998 by
	James Hugunin, Cambridge MA, USA, Thomas Schwaller, Munich, Germany
	and David Ascher, San Francisco CA, USA.

	Contributors to the PyOpenGL project in addition to those listed 
	above include:
		* David Konerding
		* Soren Renner
		* Rene Liebscher
		* Randall Hopper
		* Michael Fletcher
		* Thomas Malik
		* Thomas Hamelryck
		* Jack Jansen
		* Michel Sanner
		* Tarn Weisner Burton
		* Andrew Cox
		* Rene Dudfield

	PyOpenGL is Copyright (c) 1997-1998, 2000-2006 by the contributors.

	All rights reserved.

	Redistribution and use in source and binary forms, with or without
	modification, are permitted provided that the following conditions are
	met:
	
	* Redistributions of source code must retain the above copyright
		notice, this list of conditions and the following disclaimer.
	* 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.
	* The names of the contributors may not be used to endorse or
		promote products derived from this software without specific prior
		written permission.
	
	THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
	"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
	LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
	A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
	HOLDERS 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.

OpenGL-ctypes includes code from the Pyglet project, licensed under the 
Pyglet License (BSD Style):

	Copyright (c) 2006-2008 Alex Holkner
	All rights reserved.

	Redistribution and use in source and binary forms, with or without
	modification, are permitted provided that the following conditions 
	are met:
	
	* Redistributions of source code must retain the above copyright
	   notice, this list of conditions and the following disclaimer.
	 * 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.
	 * Neither the name of pyglet nor the names of its
	   contributors may be used to endorse or promote products
	   derived from this software without specific prior written
	   permission.

	THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
	"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
	LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
	FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
	COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
	INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
	BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
	LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
	CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
	LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
	ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
	POSSIBILITY OF SUCH DAMAGE.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/PyOpenGL/F-10/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	22 Sep 2008 09:00:09 -0000	1.6
+++ .cvsignore	2 Jan 2009 01:25:22 -0000	1.7
@@ -1 +1 @@
-PyOpenGL-3.0.0b6.tar.gz
+PyOpenGL-3.0.0b8.tar.gz


Index: PyOpenGL.spec
===================================================================
RCS file: /cvs/pkgs/rpms/PyOpenGL/F-10/PyOpenGL.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- PyOpenGL.spec	22 Sep 2008 09:00:09 -0000	1.7
+++ PyOpenGL.spec	2 Jan 2009 01:25:22 -0000	1.8
@@ -1,22 +1,24 @@
-%define prever b6
+%define prever b8
 %{!?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.8.%{prever}%{?dist}
+Release:        0.9.%{prever}%{?dist}
 Summary:        Python bindings for OpenGL
 License:        BSD
 Group:          System Environment/Libraries
 URL:            http://pyopengl.sourceforge.net/
 Source0:        http://downloads.sourceforge.net/pyopengl/%{name}-%{version}%{prever}.tar.gz
+Source1:	license.txt
 Patch0:         PyOpenGL-3.0.0a6-shebang.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  python-devel python-setuptools-devel
 BuildArch:      noarch
-Requires:       python-numeric python-setuptools libGL libGLU freeglut
+Requires:       python-numeric python-setuptools freeglut
 # in some other repositories this is named python-opengl
 Provides:       python-opengl = %{version}-%{release}
 Obsoletes:      python-opengl < %{version}-%{release}
+Obsoletes:	PyOpenGL-doc
 
 %description
 PyOpenGL is the cross platform Python binding to OpenGL and related APIs. It
@@ -36,34 +38,20 @@
 %description Tk
 %{name} Togl (Tk OpenGL widget) 1.6 support.
 
-
-%package doc
-Summary:        Documentation files for %{name}
-Group:          Development/Languages
-Requires:       %{name} = %{version}-%{release}
-
-%description doc
-Documentation files for %{name}.
-
-
 %prep
 %setup -q -n %{name}-%{version}%{prever}
 %patch0 -p1 -z .shebang
-
+cp -p %{SOURCE1} .
 
 %build
-python setup.py build
+%{__python} setup.py build
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-python setup.py install -O1 --skip-build --root="$RPM_BUILD_ROOT" \
-  --prefix="%{_prefix}" --single-version-externally-managed
-chmod -x $RPM_BUILD_ROOT%{python_sitelib}/%{name}-%{version}%{prever}-py2.5.egg-info/*
-# don't package the tests files
-rm -r $RPM_BUILD_ROOT%{python_sitelib}/OpenGL/tests
-# for %%doc
-rm documentation/pydoc/builddocs.py documentation/buildepydoc.py
+%{__python} setup.py install -O1 --skip-build --root="$RPM_BUILD_ROOT" \
+  --prefix="%{_prefix}"
+chmod -x $RPM_BUILD_ROOT%{python_sitelib}/%{name}-%{version}%{prever}-py?.?.egg-info
 
 
 %clean
@@ -80,12 +68,18 @@
 %defattr(-,root,root,-)
 %{python_sitelib}/OpenGL/Tk
 
-%files doc
-%defattr(-,root,root,-)
-%doc documentation/*
-
-
 %changelog
+* Fri Jan 2 2009 Nikolay Vladimirov <nikolay at vladimiroff.com> - 3.0.0-0.9.b8
+- New upstream 3.0.0b8 (b7 was skipped by upstream)
+- performance, bug-fix and packaging release. 
+- Use macro for "python"
+- remove "--single-version-externally-managed" option for setup.py
+- *.egg-info is no longer a folder, it's a file now 
+- Tests are no longer installed by setup.py
+- Obsolete 'doc' subpackage (no longer distributed "documentation" folder)
+- license.txt is also no longer provided by upstream. Using one from b6
+- Removed Requires for libGL and libGLU ( should be pulled for freeglut)
+
 * Mon Sep 22 2008 Nikolay Vladimirov <nikolay at vladimiroff.com> 3.0.0-0.8.b6
 - New upstream release 3.0.0b6
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/PyOpenGL/F-10/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	22 Sep 2008 09:00:09 -0000	1.6
+++ sources	2 Jan 2009 01:25:22 -0000	1.7
@@ -1 +1 @@
-6a70dd315767064ec78b84a92d2420a8  PyOpenGL-3.0.0b6.tar.gz
+1d9afbf0a403d916997937ef0dde2520  PyOpenGL-3.0.0b8.tar.gz



From turki at fedoraproject.org  Fri Jan  2 01:31:37 2009
From: turki at fedoraproject.org (Nikolay Vladimirov)
Date: Fri,  2 Jan 2009 01:31:37 +0000 (UTC)
Subject: rpms/python-libgmail/devel .cvsignore, 1.4, 1.5 python-libgmail.spec,
	1.6, 1.7 sources, 1.4, 1.5
Message-ID: <20090102013137.146DB70130@cvs1.fedora.phx.redhat.com>

Author: turki

Update of /cvs/pkgs/rpms/python-libgmail/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24985

Modified Files:
	.cvsignore python-libgmail.spec sources 
Log Message:
Update to 0.1.11


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-libgmail/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	29 Jul 2008 09:16:13 -0000	1.4
+++ .cvsignore	2 Jan 2009 01:31:06 -0000	1.5
@@ -1 +1 @@
-libgmail-0.1.10.tar.gz
+libgmail-0.1.11.tar.gz


Index: python-libgmail.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-libgmail/devel/python-libgmail.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- python-libgmail.spec	29 Nov 2008 15:36:06 -0000	1.6
+++ python-libgmail.spec	2 Jan 2009 01:31:06 -0000	1.7
@@ -2,8 +2,8 @@
 
 %define realname libgmail
 Name:           python-%{realname}
-Version:        0.1.10
-Release:        3%{?dist}
+Version:        0.1.11
+Release:        1%{?dist}
 Summary:        Library to provide access to Gmail via Python 
 
 Group:          Development/Languages
@@ -46,6 +46,12 @@
 
 
 %changelog
+* Fri Jan 2 2009 Nikolay Vladimirov <nikolay at vladimiroff.com> - 0.1.11-1
+- New upstream 0.1.11
+- Fixed bug that broke attachment support (SF bug #2034927) 
+- added .author_fullname field for messages 
+- Don't crash on threads with google chat log 
+
 * Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 0.1.10-3
 - Rebuild for Python 2.6
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-libgmail/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	29 Jul 2008 09:16:13 -0000	1.4
+++ sources	2 Jan 2009 01:31:06 -0000	1.5
@@ -1 +1 @@
-2835f66b8ef5a83e8a52dc80e878f492  libgmail-0.1.10.tar.gz
+247477ac98b39658fdcdee8d65639e51  libgmail-0.1.11.tar.gz



From xulchris at fedoraproject.org  Fri Jan  2 01:31:50 2009
From: xulchris at fedoraproject.org (Christopher Stone)
Date: Fri,  2 Jan 2009 01:31:50 +0000 (UTC)
Subject: rpms/poker-eval/F-10 poker-eval-135.0-exit.patch, NONE,
	1.1 .cvsignore, 
	1.6, 1.7 poker-eval.spec, 1.18, 1.19 sources, 1.6, 1.7
Message-ID: <20090102013150.ADCAF70130@cvs1.fedora.phx.redhat.com>

Author: xulchris

Update of /cvs/pkgs/rpms/poker-eval/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24912/F-10

Modified Files:
	.cvsignore poker-eval.spec sources 
Added Files:
	poker-eval-135.0-exit.patch 
Log Message:
upstream sync, remove exit calls from lib

poker-eval-135.0-exit.patch:

--- NEW FILE poker-eval-135.0-exit.patch ---
--- lib/combinations.c~	2009-01-01 14:12:46.000000000 -0800
+++ lib/combinations.c	2009-01-01 14:42:53.000000000 -0800
@@ -91,7 +91,8 @@
         break;
       }
     }
-    if (firstIncr == -1) { printf("BUG!\n"); exit(1); }
+    if (firstIncr == -1) 
+      return NULL;
     for (i=0; i<firstIncr; i++)
       combo->combos[i][j] = combo->combos[i][j-1];
     for (i=firstIncr+1; i<combo->nelem; i++)
--- lib/evx_generate.c~	2009-01-01 14:12:18.000000000 -0800
+++ lib/evx_generate.c	2009-01-01 14:12:34.000000000 -0800
@@ -69,7 +69,7 @@
   fp = fopen ("evx_preamble.cfrag", "r");
   if (fp == NULL) {
       fprintf (stderr, "Unable to read evx_preamble.c\n");
-      exit (-1);
+      return -1;
     }
   puts("/* This file is machine-generated -- DO NOT EDIT! */\n");
   {
--- include/enumerate.h~	2009-01-01 17:06:31.000000000 -0800
+++ include/enumerate.h	2009-01-01 17:09:40.000000000 -0800
@@ -641,7 +641,7 @@
         if (!deck##_CardMask_ANY_SET(_unavail, set_var[_i])) \
           break;	/* this hand is available for player i */ \
       } \
-      if (_j == _ncombo[_i]) { printf("not enough cards\n"); exit(1); } \
+      if (_j == _ncombo[_i]) { printf("not enough cards\n"); return(1); } \
       deck##_CardMask_OR(_unavail, _unavail, set_var[_i]); \
       _curIndex[_i] = _j; \
     } \


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/poker-eval/F-10/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	23 May 2007 18:38:25 -0000	1.6
+++ .cvsignore	2 Jan 2009 01:31:20 -0000	1.7
@@ -1 +1 @@
-poker-eval-134.0.tar.gz
+poker-eval-135.0.tar.gz


Index: poker-eval.spec
===================================================================
RCS file: /cvs/pkgs/rpms/poker-eval/F-10/poker-eval.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- poker-eval.spec	24 May 2008 05:26:04 -0000	1.18
+++ poker-eval.spec	2 Jan 2009 01:31:20 -0000	1.19
@@ -1,6 +1,6 @@
 Name:           poker-eval
-Version:        134.0
-Release:        3%{?dist}
+Version:        135.0
+Release:        1%{?dist}
 Summary:        Poker hand evaluator library
 
 Group:          Development/Libraries
@@ -8,6 +8,7 @@
 URL:            http://pokersource.org/poker-eval
 Source0:        http://download.gna.org/pokersource/sources/%{name}-%{version}.tar.gz
 Patch0:         %{name}-134.0-multiarch.patch
+Patch1:         %{name}-135.0-exit.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 
@@ -30,6 +31,7 @@
 %prep
 %setup -q
 %patch0 -p0 -b .multiarch~
+%patch1 -p0 -b .exit~
 
 # use examples/ directory for devel package %doc section
 mkdir -p tmp/examples && cp examples/*.c tmp/examples
@@ -76,6 +78,10 @@
 
 
 %changelog
+* Thu Jan 01 2009 Christopher Stone <chris.stone at gmail.com> 135.0-1
+- Upstream sync
+- Add patch to remove exit calls from library
+
 * Fri May 23 2008 Christopher Stone <chris.stone at gmail.com> 134.0-3
 - Add patch to fix multiarch conflict (bz #342911)
 - Update license tag


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/poker-eval/F-10/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	23 May 2007 18:38:25 -0000	1.6
+++ sources	2 Jan 2009 01:31:20 -0000	1.7
@@ -1 +1 @@
-aa6d39fd3b9025fb47f25009cde60d9b  poker-eval-134.0.tar.gz
+17c31abfc40fe8719e9496f089e68df3  poker-eval-135.0.tar.gz



From xulchris at fedoraproject.org  Fri Jan  2 01:31:50 2009
From: xulchris at fedoraproject.org (Christopher Stone)
Date: Fri,  2 Jan 2009 01:31:50 +0000 (UTC)
Subject: rpms/poker-eval/F-8 poker-eval-135.0-exit.patch, NONE,
	1.1 .cvsignore, 
	1.6, 1.7 poker-eval.spec, 1.17, 1.18 sources, 1.6, 1.7
Message-ID: <20090102013150.F1C8D70130@cvs1.fedora.phx.redhat.com>

Author: xulchris

Update of /cvs/pkgs/rpms/poker-eval/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24912/F-8

Modified Files:
	.cvsignore poker-eval.spec sources 
Added Files:
	poker-eval-135.0-exit.patch 
Log Message:
upstream sync, remove exit calls from lib

poker-eval-135.0-exit.patch:

--- NEW FILE poker-eval-135.0-exit.patch ---
--- lib/combinations.c~	2009-01-01 14:12:46.000000000 -0800
+++ lib/combinations.c	2009-01-01 14:42:53.000000000 -0800
@@ -91,7 +91,8 @@
         break;
       }
     }
-    if (firstIncr == -1) { printf("BUG!\n"); exit(1); }
+    if (firstIncr == -1) 
+      return NULL;
     for (i=0; i<firstIncr; i++)
       combo->combos[i][j] = combo->combos[i][j-1];
     for (i=firstIncr+1; i<combo->nelem; i++)
--- lib/evx_generate.c~	2009-01-01 14:12:18.000000000 -0800
+++ lib/evx_generate.c	2009-01-01 14:12:34.000000000 -0800
@@ -69,7 +69,7 @@
   fp = fopen ("evx_preamble.cfrag", "r");
   if (fp == NULL) {
       fprintf (stderr, "Unable to read evx_preamble.c\n");
-      exit (-1);
+      return -1;
     }
   puts("/* This file is machine-generated -- DO NOT EDIT! */\n");
   {
--- include/enumerate.h~	2009-01-01 17:06:31.000000000 -0800
+++ include/enumerate.h	2009-01-01 17:09:40.000000000 -0800
@@ -641,7 +641,7 @@
         if (!deck##_CardMask_ANY_SET(_unavail, set_var[_i])) \
           break;	/* this hand is available for player i */ \
       } \
-      if (_j == _ncombo[_i]) { printf("not enough cards\n"); exit(1); } \
+      if (_j == _ncombo[_i]) { printf("not enough cards\n"); return(1); } \
       deck##_CardMask_OR(_unavail, _unavail, set_var[_i]); \
       _curIndex[_i] = _j; \
     } \


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/poker-eval/F-8/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	23 May 2007 18:38:25 -0000	1.6
+++ .cvsignore	2 Jan 2009 01:31:20 -0000	1.7
@@ -1 +1 @@
-poker-eval-134.0.tar.gz
+poker-eval-135.0.tar.gz


Index: poker-eval.spec
===================================================================
RCS file: /cvs/pkgs/rpms/poker-eval/F-8/poker-eval.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- poker-eval.spec	24 May 2008 05:25:33 -0000	1.17
+++ poker-eval.spec	2 Jan 2009 01:31:20 -0000	1.18
@@ -1,6 +1,6 @@
 Name:           poker-eval
-Version:        134.0
-Release:        3%{?dist}
+Version:        135.0
+Release:        1%{?dist}
 Summary:        Poker hand evaluator library
 
 Group:          Development/Libraries
@@ -8,6 +8,7 @@
 URL:            http://pokersource.org/poker-eval
 Source0:        http://download.gna.org/pokersource/sources/%{name}-%{version}.tar.gz
 Patch0:         %{name}-134.0-multiarch.patch
+Patch1:         %{name}-135.0-exit.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 
@@ -30,6 +31,7 @@
 %prep
 %setup -q
 %patch0 -p0 -b .multiarch~
+%patch1 -p0 -b .exit~
 
 # use examples/ directory for devel package %doc section
 mkdir -p tmp/examples && cp examples/*.c tmp/examples
@@ -76,6 +78,10 @@
 
 
 %changelog
+* Thu Jan 01 2009 Christopher Stone <chris.stone at gmail.com> 135.0-1
+- Upstream sync
+- Add patch to remove exit calls from library
+
 * Fri May 23 2008 Christopher Stone <chris.stone at gmail.com> 134.0-3
 - Add patch to fix multiarch conflict (bz #342911)
 - Update license tag


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/poker-eval/F-8/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	23 May 2007 18:38:25 -0000	1.6
+++ sources	2 Jan 2009 01:31:20 -0000	1.7
@@ -1 +1 @@
-aa6d39fd3b9025fb47f25009cde60d9b  poker-eval-134.0.tar.gz
+17c31abfc40fe8719e9496f089e68df3  poker-eval-135.0.tar.gz



From xulchris at fedoraproject.org  Fri Jan  2 01:31:51 2009
From: xulchris at fedoraproject.org (Christopher Stone)
Date: Fri,  2 Jan 2009 01:31:51 +0000 (UTC)
Subject: rpms/poker-eval/F-9 poker-eval-135.0-exit.patch, NONE,
	1.1 .cvsignore, 
	1.6, 1.7 poker-eval.spec, 1.18, 1.19 sources, 1.6, 1.7
Message-ID: <20090102013151.40A9C70130@cvs1.fedora.phx.redhat.com>

Author: xulchris

Update of /cvs/pkgs/rpms/poker-eval/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24912/F-9

Modified Files:
	.cvsignore poker-eval.spec sources 
Added Files:
	poker-eval-135.0-exit.patch 
Log Message:
upstream sync, remove exit calls from lib

poker-eval-135.0-exit.patch:

--- NEW FILE poker-eval-135.0-exit.patch ---
--- lib/combinations.c~	2009-01-01 14:12:46.000000000 -0800
+++ lib/combinations.c	2009-01-01 14:42:53.000000000 -0800
@@ -91,7 +91,8 @@
         break;
       }
     }
-    if (firstIncr == -1) { printf("BUG!\n"); exit(1); }
+    if (firstIncr == -1) 
+      return NULL;
     for (i=0; i<firstIncr; i++)
       combo->combos[i][j] = combo->combos[i][j-1];
     for (i=firstIncr+1; i<combo->nelem; i++)
--- lib/evx_generate.c~	2009-01-01 14:12:18.000000000 -0800
+++ lib/evx_generate.c	2009-01-01 14:12:34.000000000 -0800
@@ -69,7 +69,7 @@
   fp = fopen ("evx_preamble.cfrag", "r");
   if (fp == NULL) {
       fprintf (stderr, "Unable to read evx_preamble.c\n");
-      exit (-1);
+      return -1;
     }
   puts("/* This file is machine-generated -- DO NOT EDIT! */\n");
   {
--- include/enumerate.h~	2009-01-01 17:06:31.000000000 -0800
+++ include/enumerate.h	2009-01-01 17:09:40.000000000 -0800
@@ -641,7 +641,7 @@
         if (!deck##_CardMask_ANY_SET(_unavail, set_var[_i])) \
           break;	/* this hand is available for player i */ \
       } \
-      if (_j == _ncombo[_i]) { printf("not enough cards\n"); exit(1); } \
+      if (_j == _ncombo[_i]) { printf("not enough cards\n"); return(1); } \
       deck##_CardMask_OR(_unavail, _unavail, set_var[_i]); \
       _curIndex[_i] = _j; \
     } \


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/poker-eval/F-9/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	23 May 2007 18:38:25 -0000	1.6
+++ .cvsignore	2 Jan 2009 01:31:20 -0000	1.7
@@ -1 +1 @@
-poker-eval-134.0.tar.gz
+poker-eval-135.0.tar.gz


Index: poker-eval.spec
===================================================================
RCS file: /cvs/pkgs/rpms/poker-eval/F-9/poker-eval.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- poker-eval.spec	24 May 2008 05:25:48 -0000	1.18
+++ poker-eval.spec	2 Jan 2009 01:31:20 -0000	1.19
@@ -1,6 +1,6 @@
 Name:           poker-eval
-Version:        134.0
-Release:        3%{?dist}
+Version:        135.0
+Release:        1%{?dist}
 Summary:        Poker hand evaluator library
 
 Group:          Development/Libraries
@@ -8,6 +8,7 @@
 URL:            http://pokersource.org/poker-eval
 Source0:        http://download.gna.org/pokersource/sources/%{name}-%{version}.tar.gz
 Patch0:         %{name}-134.0-multiarch.patch
+Patch1:         %{name}-135.0-exit.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 
@@ -30,6 +31,7 @@
 %prep
 %setup -q
 %patch0 -p0 -b .multiarch~
+%patch1 -p0 -b .exit~
 
 # use examples/ directory for devel package %doc section
 mkdir -p tmp/examples && cp examples/*.c tmp/examples
@@ -76,6 +78,10 @@
 
 
 %changelog
+* Thu Jan 01 2009 Christopher Stone <chris.stone at gmail.com> 135.0-1
+- Upstream sync
+- Add patch to remove exit calls from library
+
 * Fri May 23 2008 Christopher Stone <chris.stone at gmail.com> 134.0-3
 - Add patch to fix multiarch conflict (bz #342911)
 - Update license tag


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/poker-eval/F-9/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	23 May 2007 18:38:25 -0000	1.6
+++ sources	2 Jan 2009 01:31:20 -0000	1.7
@@ -1 +1 @@
-aa6d39fd3b9025fb47f25009cde60d9b  poker-eval-134.0.tar.gz
+17c31abfc40fe8719e9496f089e68df3  poker-eval-135.0.tar.gz



From xulchris at fedoraproject.org  Fri Jan  2 01:31:51 2009
From: xulchris at fedoraproject.org (Christopher Stone)
Date: Fri,  2 Jan 2009 01:31:51 +0000 (UTC)
Subject: rpms/poker-eval/devel poker-eval-135.0-exit.patch, NONE,
	1.1 .cvsignore, 1.6, 1.7 poker-eval.spec, 1.18, 1.19 sources, 1.6, 1.7
Message-ID: <20090102013151.82F5D70130@cvs1.fedora.phx.redhat.com>

Author: xulchris

Update of /cvs/pkgs/rpms/poker-eval/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24912/devel

Modified Files:
	.cvsignore poker-eval.spec sources 
Added Files:
	poker-eval-135.0-exit.patch 
Log Message:
upstream sync, remove exit calls from lib

poker-eval-135.0-exit.patch:

--- NEW FILE poker-eval-135.0-exit.patch ---
--- lib/combinations.c~	2009-01-01 14:12:46.000000000 -0800
+++ lib/combinations.c	2009-01-01 14:42:53.000000000 -0800
@@ -91,7 +91,8 @@
         break;
       }
     }
-    if (firstIncr == -1) { printf("BUG!\n"); exit(1); }
+    if (firstIncr == -1) 
+      return NULL;
     for (i=0; i<firstIncr; i++)
       combo->combos[i][j] = combo->combos[i][j-1];
     for (i=firstIncr+1; i<combo->nelem; i++)
--- lib/evx_generate.c~	2009-01-01 14:12:18.000000000 -0800
+++ lib/evx_generate.c	2009-01-01 14:12:34.000000000 -0800
@@ -69,7 +69,7 @@
   fp = fopen ("evx_preamble.cfrag", "r");
   if (fp == NULL) {
       fprintf (stderr, "Unable to read evx_preamble.c\n");
-      exit (-1);
+      return -1;
     }
   puts("/* This file is machine-generated -- DO NOT EDIT! */\n");
   {
--- include/enumerate.h~	2009-01-01 17:06:31.000000000 -0800
+++ include/enumerate.h	2009-01-01 17:09:40.000000000 -0800
@@ -641,7 +641,7 @@
         if (!deck##_CardMask_ANY_SET(_unavail, set_var[_i])) \
           break;	/* this hand is available for player i */ \
       } \
-      if (_j == _ncombo[_i]) { printf("not enough cards\n"); exit(1); } \
+      if (_j == _ncombo[_i]) { printf("not enough cards\n"); return(1); } \
       deck##_CardMask_OR(_unavail, _unavail, set_var[_i]); \
       _curIndex[_i] = _j; \
     } \


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/poker-eval/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	23 May 2007 18:38:25 -0000	1.6
+++ .cvsignore	2 Jan 2009 01:31:21 -0000	1.7
@@ -1 +1 @@
-poker-eval-134.0.tar.gz
+poker-eval-135.0.tar.gz


Index: poker-eval.spec
===================================================================
RCS file: /cvs/pkgs/rpms/poker-eval/devel/poker-eval.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- poker-eval.spec	24 May 2008 05:26:04 -0000	1.18
+++ poker-eval.spec	2 Jan 2009 01:31:21 -0000	1.19
@@ -1,6 +1,6 @@
 Name:           poker-eval
-Version:        134.0
-Release:        3%{?dist}
+Version:        135.0
+Release:        1%{?dist}
 Summary:        Poker hand evaluator library
 
 Group:          Development/Libraries
@@ -8,6 +8,7 @@
 URL:            http://pokersource.org/poker-eval
 Source0:        http://download.gna.org/pokersource/sources/%{name}-%{version}.tar.gz
 Patch0:         %{name}-134.0-multiarch.patch
+Patch1:         %{name}-135.0-exit.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 
@@ -30,6 +31,7 @@
 %prep
 %setup -q
 %patch0 -p0 -b .multiarch~
+%patch1 -p0 -b .exit~
 
 # use examples/ directory for devel package %doc section
 mkdir -p tmp/examples && cp examples/*.c tmp/examples
@@ -76,6 +78,10 @@
 
 
 %changelog
+* Thu Jan 01 2009 Christopher Stone <chris.stone at gmail.com> 135.0-1
+- Upstream sync
+- Add patch to remove exit calls from library
+
 * Fri May 23 2008 Christopher Stone <chris.stone at gmail.com> 134.0-3
 - Add patch to fix multiarch conflict (bz #342911)
 - Update license tag


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/poker-eval/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	23 May 2007 18:38:25 -0000	1.6
+++ sources	2 Jan 2009 01:31:21 -0000	1.7
@@ -1 +1 @@
-aa6d39fd3b9025fb47f25009cde60d9b  poker-eval-134.0.tar.gz
+17c31abfc40fe8719e9496f089e68df3  poker-eval-135.0.tar.gz



From turki at fedoraproject.org  Fri Jan  2 01:43:58 2009
From: turki at fedoraproject.org (Nikolay Vladimirov)
Date: Fri,  2 Jan 2009 01:43:58 +0000 (UTC)
Subject: rpms/python-libgmail/F-10 .cvsignore, 1.4, 1.5 python-libgmail.spec,
	1.5, 1.6 sources, 1.4, 1.5
Message-ID: <20090102014358.DC87B70130@cvs1.fedora.phx.redhat.com>

Author: turki

Update of /cvs/pkgs/rpms/python-libgmail/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27125

Modified Files:
	.cvsignore python-libgmail.spec sources 
Log Message:
Update to 0.1.11


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-libgmail/F-10/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	29 Jul 2008 09:16:13 -0000	1.4
+++ .cvsignore	2 Jan 2009 01:43:28 -0000	1.5
@@ -1 +1 @@
-libgmail-0.1.10.tar.gz
+libgmail-0.1.11.tar.gz


Index: python-libgmail.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-libgmail/F-10/python-libgmail.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- python-libgmail.spec	6 Aug 2008 13:05:38 -0000	1.5
+++ python-libgmail.spec	2 Jan 2009 01:43:28 -0000	1.6
@@ -2,8 +2,8 @@
 
 %define realname libgmail
 Name:           python-%{realname}
-Version:        0.1.10
-Release:        2%{?dist}
+Version:        0.1.11
+Release:        1%{?dist}
 Summary:        Library to provide access to Gmail via Python 
 
 Group:          Development/Languages
@@ -46,6 +46,12 @@
 
 
 %changelog
+* Fri Jan 2 2009 Nikolay Vladimirov <nikolay at vladimiroff.com> - 0.1.11-1
+- New upstream 0.1.11
+- Fixed bug that broke attachment support (SF bug #2034927) 
+- added .author_fullname field for messages 
+- Don't crash on threads with google chat log 
+
 * Wed Aug 6 2008 Nikolay Vladimirov <nikolay at vladimiroff.com> - 0.1.10-2
 - add manual python-mechanize requires
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-libgmail/F-10/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	29 Jul 2008 09:16:13 -0000	1.4
+++ sources	2 Jan 2009 01:43:28 -0000	1.5
@@ -1 +1 @@
-2835f66b8ef5a83e8a52dc80e878f492  libgmail-0.1.10.tar.gz
+247477ac98b39658fdcdee8d65639e51  libgmail-0.1.11.tar.gz



From turki at fedoraproject.org  Fri Jan  2 01:46:32 2009
From: turki at fedoraproject.org (Nikolay Vladimirov)
Date: Fri,  2 Jan 2009 01:46:32 +0000 (UTC)
Subject: rpms/PyOpenGL/F-9 license.txt, NONE, 1.1 .cvsignore, 1.6,
	1.7 PyOpenGL.spec, 1.7, 1.8 sources, 1.6, 1.7
Message-ID: <20090102014632.25FCD70134@cvs1.fedora.phx.redhat.com>

Author: turki

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

Modified Files:
	.cvsignore PyOpenGL.spec sources 
Added Files:
	license.txt 
Log Message:
Update to 3.0.0b8 and lots of packaging fixes


--- NEW FILE license.txt ---
OpenGL-ctypes License

	Copyright (c) 2005-2007, Michael C. Fletcher and Contributors
	All rights reserved.
	
	Redistribution and use in source and binary forms, with or without
	modification, are permitted provided that the following conditions
	are met:
	
		Redistributions of source code must retain the above copyright
		notice, this list of conditions and the following disclaimer.
	
		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.
	
		The name of Michael C. Fletcher, or the name of any Contributor,
		may not be used to endorse or promote products derived from this 
		software without specific prior written permission.
	
	THIS SOFTWARE IS NOT FAULT TOLERANT AND SHOULD NOT BE USED IN ANY
	SITUATION ENDANGERING HUMAN LIFE OR PROPERTY.
	
	THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
	``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
	LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
	FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
	COPYRIGHT HOLDERS AND 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. 

OpenGL-ctypes includes code from the PyOpenGL 2.x series licensed under
version 3 of the PyOpenGL License (BSD-style):

	PyOpenGL License (v3)

	PyOpenGL is based on PyOpenGL 1.5.5, Copyright &copy; 1997-1998 by
	James Hugunin, Cambridge MA, USA, Thomas Schwaller, Munich, Germany
	and David Ascher, San Francisco CA, USA.

	Contributors to the PyOpenGL project in addition to those listed 
	above include:
		* David Konerding
		* Soren Renner
		* Rene Liebscher
		* Randall Hopper
		* Michael Fletcher
		* Thomas Malik
		* Thomas Hamelryck
		* Jack Jansen
		* Michel Sanner
		* Tarn Weisner Burton
		* Andrew Cox
		* Rene Dudfield

	PyOpenGL is Copyright (c) 1997-1998, 2000-2006 by the contributors.

	All rights reserved.

	Redistribution and use in source and binary forms, with or without
	modification, are permitted provided that the following conditions are
	met:
	
	* Redistributions of source code must retain the above copyright
		notice, this list of conditions and the following disclaimer.
	* 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.
	* The names of the contributors may not be used to endorse or
		promote products derived from this software without specific prior
		written permission.
	
	THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
	"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
	LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
	A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
	HOLDERS 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.

OpenGL-ctypes includes code from the Pyglet project, licensed under the 
Pyglet License (BSD Style):

	Copyright (c) 2006-2008 Alex Holkner
	All rights reserved.

	Redistribution and use in source and binary forms, with or without
	modification, are permitted provided that the following conditions 
	are met:
	
	* Redistributions of source code must retain the above copyright
	   notice, this list of conditions and the following disclaimer.
	 * 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.
	 * Neither the name of pyglet nor the names of its
	   contributors may be used to endorse or promote products
	   derived from this software without specific prior written
	   permission.

	THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
	"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
	LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
	FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
	COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
	INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
	BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
	LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
	CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
	LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
	ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
	POSSIBILITY OF SUCH DAMAGE.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/PyOpenGL/F-9/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	22 Sep 2008 09:06:25 -0000	1.6
+++ .cvsignore	2 Jan 2009 01:46:01 -0000	1.7
@@ -1 +1 @@
-PyOpenGL-3.0.0b6.tar.gz
+PyOpenGL-3.0.0b8.tar.gz


Index: PyOpenGL.spec
===================================================================
RCS file: /cvs/pkgs/rpms/PyOpenGL/F-9/PyOpenGL.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- PyOpenGL.spec	22 Sep 2008 09:06:25 -0000	1.7
+++ PyOpenGL.spec	2 Jan 2009 01:46:01 -0000	1.8
@@ -1,22 +1,24 @@
-%define prever b6
+%define prever b8
 %{!?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.8.%{prever}%{?dist}
+Release:        0.9.%{prever}%{?dist}
 Summary:        Python bindings for OpenGL
 License:        BSD
 Group:          System Environment/Libraries
 URL:            http://pyopengl.sourceforge.net/
 Source0:        http://downloads.sourceforge.net/pyopengl/%{name}-%{version}%{prever}.tar.gz
+Source1:	license.txt
 Patch0:         PyOpenGL-3.0.0a6-shebang.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  python-devel python-setuptools-devel
 BuildArch:      noarch
-Requires:       python-numeric python-setuptools libGL libGLU freeglut
+Requires:       python-numeric python-setuptools freeglut
 # in some other repositories this is named python-opengl
 Provides:       python-opengl = %{version}-%{release}
 Obsoletes:      python-opengl < %{version}-%{release}
+Obsoletes:	PyOpenGL-doc
 
 %description
 PyOpenGL is the cross platform Python binding to OpenGL and related APIs. It
@@ -36,34 +38,20 @@
 %description Tk
 %{name} Togl (Tk OpenGL widget) 1.6 support.
 
-
-%package doc
-Summary:        Documentation files for %{name}
-Group:          Development/Languages
-Requires:       %{name} = %{version}-%{release}
-
-%description doc
-Documentation files for %{name}.
-
-
 %prep
 %setup -q -n %{name}-%{version}%{prever}
 %patch0 -p1 -z .shebang
-
+cp -p %{SOURCE1} .
 
 %build
-python setup.py build
+%{__python} setup.py build
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-python setup.py install -O1 --skip-build --root="$RPM_BUILD_ROOT" \
-  --prefix="%{_prefix}" --single-version-externally-managed
-chmod -x $RPM_BUILD_ROOT%{python_sitelib}/%{name}-%{version}%{prever}-py2.5.egg-info/*
-# don't package the tests files
-rm -r $RPM_BUILD_ROOT%{python_sitelib}/OpenGL/tests
-# for %%doc
-rm documentation/pydoc/builddocs.py documentation/buildepydoc.py
+%{__python} setup.py install -O1 --skip-build --root="$RPM_BUILD_ROOT" \
+  --prefix="%{_prefix}"
+chmod -x $RPM_BUILD_ROOT%{python_sitelib}/%{name}-%{version}%{prever}-py?.?.egg-info
 
 
 %clean
@@ -80,12 +68,18 @@
 %defattr(-,root,root,-)
 %{python_sitelib}/OpenGL/Tk
 
-%files doc
-%defattr(-,root,root,-)
-%doc documentation/*
-
-
 %changelog
+* Fri Jan 2 2009 Nikolay Vladimirov <nikolay at vladimiroff.com> - 3.0.0-0.9.b8
+- New upstream 3.0.0b8 (b7 was skipped by upstream)
+- performance, bug-fix and packaging release. 
+- Use macro for "python"
+- remove "--single-version-externally-managed" option for setup.py
+- *.egg-info is no longer a folder, it's a file now 
+- Tests are no longer installed by setup.py
+- Obsolete 'doc' subpackage (no longer distributed "documentation" folder)
+- license.txt is also no longer provided by upstream. Using one from b6
+- Removed Requires for libGL and libGLU ( should be pulled for freeglut)
+
 * Mon Sep 22 2008 Nikolay Vladimirov <nikolay at vladimiroff.com> 3.0.0-0.8.b6
 - New upstream release 3.0.0b6
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/PyOpenGL/F-9/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	22 Sep 2008 09:06:25 -0000	1.6
+++ sources	2 Jan 2009 01:46:01 -0000	1.7
@@ -1 +1 @@
-6a70dd315767064ec78b84a92d2420a8  PyOpenGL-3.0.0b6.tar.gz
+1d9afbf0a403d916997937ef0dde2520  PyOpenGL-3.0.0b8.tar.gz



From mclasen at fedoraproject.org  Fri Jan  2 01:46:35 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Fri,  2 Jan 2009 01:46:35 +0000 (UTC)
Subject: rpms/gtk2/devel .cvsignore, 1.96, 1.97 gtk2.spec, 1.341,
	1.342 sources, 1.105, 1.106
Message-ID: <20090102014635.688C670134@cvs1.fedora.phx.redhat.com>

Author: mclasen

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

Modified Files:
	.cvsignore gtk2.spec sources 
Log Message:
2.15.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gtk2/devel/.cvsignore,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -r1.96 -r1.97
--- .cvsignore	17 Dec 2008 03:57:38 -0000	1.96
+++ .cvsignore	2 Jan 2009 01:46:04 -0000	1.97
@@ -1 +1 @@
-gtk+-2.14.6.tar.bz2
+gtk+-2.15.0.tar.bz2


Index: gtk2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtk2/devel/gtk2.spec,v
retrieving revision 1.341
retrieving revision 1.342
diff -u -r1.341 -r1.342
--- gtk2.spec	17 Dec 2008 03:57:39 -0000	1.341
+++ gtk2.spec	2 Jan 2009 01:46:04 -0000	1.342
@@ -10,7 +10,7 @@
 %define cairo_version %{cairo_base_version}-1
 %define libpng_version 2:1.2.2-16
 
-%define base_version 2.14.6
+%define base_version 2.15.0
 %define bin_version 2.10.0
 
 Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X
@@ -19,14 +19,12 @@
 Release: 1%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
-Source: http://download.gnome.org/sources/gtk+/2.14/gtk+-%{version}.tar.bz2
+Source: http://download.gnome.org/sources/gtk+/2.15/gtk+-%{version}.tar.bz2
 Source1: update-gdk-pixbuf-loaders
 Source2: update-gtk-immodules 
 
 # Biarch changes
 Patch0: gtk+-2.13.5-lib64.patch
-# Fedora patch
-Patch1: gtk+-2.11.1-set-invisible-char-to-bullet.patch
 # a workaround for some brokenness in the flash plugin
 # see http://bugzilla.gnome.org/show_bug.cgi?id=463773
 Patch2: workaround.patch
@@ -115,7 +113,6 @@
 %setup -q -n gtk+-%{version}
 
 %patch0 -p1 -b .lib64
-%patch1 -p1 -b .set-invisible-char-to-bullet
 %patch2 -p1 -b .workaround
 
 %build
@@ -137,8 +134,6 @@
 # fight unused direct deps
 sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
 
-## smp_mflags doesn't work for now due to gdk-pixbuf.loaders, may be fixed 
-## past gtk 2.1.2
 make #%{?_smp_mflags}
 # turn off for now, since floatingtest needs a display
 #make check
@@ -296,6 +291,9 @@
 %{_datadir}/gtk-2.0
 
 %changelog
+* Thu Jan  1 2009 Matthias Clasen <mclasen at redhat.com> - 2.15.0-1
+- Update to 2.15.0
+
 * Tue Dec 16 2008 Matthias Clasen <mclasen at redhat.com> - 2.14.6-1
 - Update to 2.14.6
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gtk2/devel/sources,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -r1.105 -r1.106
--- sources	17 Dec 2008 03:57:39 -0000	1.105
+++ sources	2 Jan 2009 01:46:05 -0000	1.106
@@ -1 +1 @@
-69c2d2842203d7b627bc6ec34cb4a4f8  gtk+-2.14.6.tar.bz2
+23ff288d00b24f0820a4ae79a747f25e  gtk+-2.15.0.tar.bz2



From turki at fedoraproject.org  Fri Jan  2 01:52:49 2009
From: turki at fedoraproject.org (Nikolay Vladimirov)
Date: Fri,  2 Jan 2009 01:52:49 +0000 (UTC)
Subject: rpms/python-libgmail/F-9 .cvsignore, 1.4, 1.5 python-libgmail.spec, 
	1.4, 1.5 sources, 1.4, 1.5
Message-ID: <20090102015249.4690470130@cvs1.fedora.phx.redhat.com>

Author: turki

Update of /cvs/pkgs/rpms/python-libgmail/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31112

Modified Files:
	.cvsignore python-libgmail.spec sources 
Log Message:
Update to 0.1.11


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-libgmail/F-9/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	29 Jul 2008 09:26:12 -0000	1.4
+++ .cvsignore	2 Jan 2009 01:52:18 -0000	1.5
@@ -1 +1 @@
-libgmail-0.1.10.tar.gz
+libgmail-0.1.11.tar.gz


Index: python-libgmail.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-libgmail/F-9/python-libgmail.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- python-libgmail.spec	10 Aug 2008 19:16:57 -0000	1.4
+++ python-libgmail.spec	2 Jan 2009 01:52:18 -0000	1.5
@@ -2,8 +2,8 @@
 
 %define realname libgmail
 Name:           python-%{realname}
-Version:        0.1.10
-Release:        2%{?dist}
+Version:        0.1.11
+Release:        1%{?dist}
 Summary:        Library to provide access to Gmail via Python 
 
 Group:          Development/Languages
@@ -46,7 +46,13 @@
 
 
 %changelog
-* Wed Aug 10 2008 Nikolay Vladimirov <nikolay at vladimiroff.com> - 0.1.10-2
+* Fri Jan 2 2009 Nikolay Vladimirov <nikolay at vladimiroff.com> - 0.1.11-1
+- New upstream 0.1.11
+- Fixed bug that broke attachment support (SF bug #2034927) 
+- added .author_fullname field for messages 
+- Don't crash on threads with google chat log 
+
+* Wed Aug 6 2008 Nikolay Vladimirov <nikolay at vladimiroff.com> - 0.1.10-2
 - add manual python-mechanize requires
 
 * Tue Jul 29 2008 Nikolay Vladimirov <nikolay at vladimiroff.com> - 0.1.10-1


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-libgmail/F-9/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	29 Jul 2008 09:26:12 -0000	1.4
+++ sources	2 Jan 2009 01:52:18 -0000	1.5
@@ -1 +1 @@
-2835f66b8ef5a83e8a52dc80e878f492  libgmail-0.1.10.tar.gz
+247477ac98b39658fdcdee8d65639e51  libgmail-0.1.11.tar.gz



From lmacken at fedoraproject.org  Fri Jan  2 04:43:58 2009
From: lmacken at fedoraproject.org (Luke Macken)
Date: Fri,  2 Jan 2009 04:43:58 +0000 (UTC)
Subject: rpms/liveusb-creator/devel .cvsignore, 1.3, 1.4 liveusb-creator.spec,
	1.7, 1.8 sources, 1.6, 1.7
Message-ID: <20090102044358.F0CA270130@cvs1.fedora.phx.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/liveusb-creator/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10213

Modified Files:
	.cvsignore liveusb-creator.spec sources 
Log Message:
3.1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/liveusb-creator/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	2 Oct 2008 11:23:10 -0000	1.3
+++ .cvsignore	2 Jan 2009 04:43:26 -0000	1.4
@@ -1 +1 @@
-liveusb-creator-3.0.tar.bz2
+liveusb-creator-3.1.tar.bz2


Index: liveusb-creator.spec
===================================================================
RCS file: /cvs/pkgs/rpms/liveusb-creator/devel/liveusb-creator.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- liveusb-creator.spec	31 Dec 2008 23:22:24 -0000	1.7
+++ liveusb-creator.spec	2 Jan 2009 04:43:26 -0000	1.8
@@ -1,8 +1,8 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           liveusb-creator
-Version:        3.0
-Release:        5%{?dist}
+Version:        3.1
+Release:        1%{?dist}
 Summary:        A liveusb creator
 
 Group:          Applications/System
@@ -64,8 +64,9 @@
 %config(noreplace) %{_sysconfdir}/security/console.apps/%{name}
 
 %changelog
-* Wed Dec 31 2008 Luke Macken <lmacken at redhat.com> 3.0-5
-- Rebuild
+* Thu Jan 01 2009 Luke Macken <lmacken at redhat.com> 3.1-1
+- Latest upstream release, containing some windows-specific
+  optimizations and fixes.
 
 * Mon Dec 29 2008 Luke Macken <lmacken at redhat.com> 3.0-4
 - Latest upstream release.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/liveusb-creator/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	31 Dec 2008 23:22:24 -0000	1.6
+++ sources	2 Jan 2009 04:43:27 -0000	1.7
@@ -1 +1 @@
-75c836103cbde973d7a1b627f4b8bc60  liveusb-creator-3.0.tar.bz2
+703c81199d4487d5e7de64740693b0ba  liveusb-creator-3.1.tar.bz2



From lmacken at fedoraproject.org  Fri Jan  2 04:45:03 2009
From: lmacken at fedoraproject.org (Luke Macken)
Date: Fri,  2 Jan 2009 04:45:03 +0000 (UTC)
Subject: rpms/liveusb-creator/F-10 .cvsignore, 1.3, 1.4 liveusb-creator.spec,
	1.6, 1.7 sources, 1.5, 1.6
Message-ID: <20090102044503.00B0F70130@cvs1.fedora.phx.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/liveusb-creator/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10564

Modified Files:
	.cvsignore liveusb-creator.spec sources 
Log Message:
3.1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/liveusb-creator/F-10/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	2 Oct 2008 11:23:10 -0000	1.3
+++ .cvsignore	2 Jan 2009 04:44:32 -0000	1.4
@@ -1 +1 @@
-liveusb-creator-3.0.tar.bz2
+liveusb-creator-3.1.tar.bz2


Index: liveusb-creator.spec
===================================================================
RCS file: /cvs/pkgs/rpms/liveusb-creator/F-10/liveusb-creator.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- liveusb-creator.spec	31 Dec 2008 23:23:28 -0000	1.6
+++ liveusb-creator.spec	2 Jan 2009 04:44:32 -0000	1.7
@@ -1,8 +1,8 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           liveusb-creator
-Version:        3.0
-Release:        5%{?dist}
+Version:        3.1
+Release:        1%{?dist}
 Summary:        A liveusb creator
 
 Group:          Applications/System
@@ -64,8 +64,9 @@
 %config(noreplace) %{_sysconfdir}/security/console.apps/%{name}
 
 %changelog
-* Wed Dec 31 2008 Luke Macken <lmacken at redhat.com> 3.0-5
-- Rebuild
+* Thu Jan 01 2009 Luke Macken <lmacken at redhat.com> 3.1-1
+- Latest upstream release, containing some windows-specific
+  optimizations and fixes.
 
 * Mon Dec 29 2008 Luke Macken <lmacken at redhat.com> 3.0-4
 - Latest upstream release.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/liveusb-creator/F-10/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	31 Dec 2008 23:23:29 -0000	1.5
+++ sources	2 Jan 2009 04:44:32 -0000	1.6
@@ -1 +1 @@
-75c836103cbde973d7a1b627f4b8bc60  liveusb-creator-3.0.tar.bz2
+703c81199d4487d5e7de64740693b0ba  liveusb-creator-3.1.tar.bz2



From lmacken at fedoraproject.org  Fri Jan  2 04:46:07 2009
From: lmacken at fedoraproject.org (Luke Macken)
Date: Fri,  2 Jan 2009 04:46:07 +0000 (UTC)
Subject: rpms/liveusb-creator/F-9 .cvsignore, 1.2, 1.3 liveusb-creator.spec, 
	1.3, 1.4 sources, 1.3, 1.4
Message-ID: <20090102044607.CD37370130@cvs1.fedora.phx.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/liveusb-creator/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10897

Modified Files:
	.cvsignore liveusb-creator.spec sources 
Log Message:
3.1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/liveusb-creator/F-9/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	31 Dec 2008 23:10:23 -0000	1.2
+++ .cvsignore	2 Jan 2009 04:45:37 -0000	1.3
@@ -1 +1 @@
-liveusb-creator-3.0.tar.bz2
+liveusb-creator-3.1.tar.bz2


Index: liveusb-creator.spec
===================================================================
RCS file: /cvs/pkgs/rpms/liveusb-creator/F-9/liveusb-creator.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- liveusb-creator.spec	31 Dec 2008 23:11:37 -0000	1.3
+++ liveusb-creator.spec	2 Jan 2009 04:45:37 -0000	1.4
@@ -1,8 +1,8 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           liveusb-creator
-Version:        3.0
-Release:        5%{?dist}
+Version:        3.1
+Release:        1%{?dist}
 Summary:        A liveusb creator
 
 Group:          Applications/System
@@ -64,8 +64,9 @@
 %config(noreplace) %{_sysconfdir}/security/console.apps/%{name}
 
 %changelog
-* Wed Dec 31 2008 Luke Macken <lmacken at redhat.com> 3.0-5
-- Rebuild
+* Thu Jan 01 2009 Luke Macken <lmacken at redhat.com> 3.1-1
+- Latest upstream release, containing some windows-specific
+  optimizations and fixes.
 
 * Mon Dec 29 2008 Luke Macken <lmacken at redhat.com> 3.0-4
 - Latest upstream release.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/liveusb-creator/F-9/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	31 Dec 2008 23:10:23 -0000	1.3
+++ sources	2 Jan 2009 04:45:37 -0000	1.4
@@ -1 +1 @@
-75c836103cbde973d7a1b627f4b8bc60  liveusb-creator-3.0.tar.bz2
+703c81199d4487d5e7de64740693b0ba  liveusb-creator-3.1.tar.bz2



From xulchris at fedoraproject.org  Fri Jan  2 04:46:18 2009
From: xulchris at fedoraproject.org (Christopher Stone)
Date: Fri,  2 Jan 2009 04:46:18 +0000 (UTC)
Subject: rpms/pypoker-eval/F-10 .cvsignore, 1.6, 1.7 pypoker-eval.spec, 1.13,
	1.14 sources, 1.6, 1.7 pypoker-eval-135-python26.patch, 1.1, NONE
Message-ID: <20090102044618.0AFE270130@cvs1.fedora.phx.redhat.com>

Author: xulchris

Update of /cvs/pkgs/rpms/pypoker-eval/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10825/F-10

Modified Files:
	.cvsignore pypoker-eval.spec sources 
Removed Files:
	pypoker-eval-135-python26.patch 
Log Message:
upstream sync


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pypoker-eval/F-10/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	31 Mar 2008 21:28:25 -0000	1.6
+++ .cvsignore	2 Jan 2009 04:45:47 -0000	1.7
@@ -1 +1 @@
-pypoker-eval-135.0.tar.gz
+pypoker-eval-136.0.tar.gz


Index: pypoker-eval.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pypoker-eval/F-10/pypoker-eval.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- pypoker-eval.spec	1 Dec 2008 21:25:26 -0000	1.13
+++ pypoker-eval.spec	2 Jan 2009 04:45:47 -0000	1.14
@@ -1,17 +1,16 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           pypoker-eval
-Version:        135.0
-Release:        3%{?dist}
+Version:        136.0
+Release:        1%{?dist}
 Summary:        Python interface to poker-eval
 
 Group:          Development/Libraries
 License:        GPLv2+
 URL:            http://pokersource.org/pypoker-eval
 Source0:        http://download.gna.org/pokersource/sources/%{name}-%{version}.tar.gz
-Patch0:         %{name}-135-python26.patch
 
-BuildRequires:  libtool python-devel poker-eval-devel >= 124.0
+BuildRequires:  python-devel poker-eval-devel >= 124.0
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -31,8 +30,6 @@
 
 %prep
 %setup -q
-%patch0 -p2 -b .python26~
-autoreconf --force --install
 
 # make examples directory for devel %doc
 mkdir -p tmp/examples
@@ -78,6 +75,13 @@
 
 
 %changelog
+* Thu Jan 01 2009 Christopher Stone <chris.stone at gmail.com> 136.0-1
+- Upstream sync
+- Remove no longer needed python26 patch
+
+* Mon Dec 01 2008 Christopher Stone <chris.stone at gmail.com> 135.0-3.1
+- Release bump for dist-f11-python
+
 * Mon Dec 01 2008 Christopher Stone <chris.stone at gmail.com> 135.0-3
 - Add patch for python 2.6
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pypoker-eval/F-10/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	31 Mar 2008 21:28:25 -0000	1.6
+++ sources	2 Jan 2009 04:45:47 -0000	1.7
@@ -1 +1 @@
-79db0170fe723e6e847e6bcb832d6b56  pypoker-eval-135.0.tar.gz
+08cf41708c83b5f61577d7779f80cf55  pypoker-eval-136.0.tar.gz


--- pypoker-eval-135-python26.patch DELETED ---



From xulchris at fedoraproject.org  Fri Jan  2 04:46:18 2009
From: xulchris at fedoraproject.org (Christopher Stone)
Date: Fri,  2 Jan 2009 04:46:18 +0000 (UTC)
Subject: rpms/pypoker-eval/F-8 .cvsignore, 1.6, 1.7 pypoker-eval.spec, 1.12, 
	1.13 sources, 1.6, 1.7 pypoker-eval-135-python26.patch, 1.1, NONE
Message-ID: <20090102044618.6065E70130@cvs1.fedora.phx.redhat.com>

Author: xulchris

Update of /cvs/pkgs/rpms/pypoker-eval/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10825/F-8

Modified Files:
	.cvsignore pypoker-eval.spec sources 
Removed Files:
	pypoker-eval-135-python26.patch 
Log Message:
upstream sync


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pypoker-eval/F-8/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	31 Mar 2008 21:28:11 -0000	1.6
+++ .cvsignore	2 Jan 2009 04:45:48 -0000	1.7
@@ -1 +1 @@
-pypoker-eval-135.0.tar.gz
+pypoker-eval-136.0.tar.gz


Index: pypoker-eval.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pypoker-eval/F-8/pypoker-eval.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- pypoker-eval.spec	1 Dec 2008 21:25:26 -0000	1.12
+++ pypoker-eval.spec	2 Jan 2009 04:45:48 -0000	1.13
@@ -1,17 +1,16 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           pypoker-eval
-Version:        135.0
-Release:        3%{?dist}
+Version:        136.0
+Release:        1%{?dist}
 Summary:        Python interface to poker-eval
 
 Group:          Development/Libraries
 License:        GPLv2+
 URL:            http://pokersource.org/pypoker-eval
 Source0:        http://download.gna.org/pokersource/sources/%{name}-%{version}.tar.gz
-Patch0:         %{name}-135-python26.patch
 
-BuildRequires:  libtool python-devel poker-eval-devel >= 124.0
+BuildRequires:  python-devel poker-eval-devel >= 124.0
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -31,8 +30,6 @@
 
 %prep
 %setup -q
-%patch0 -p2 -b .python26~
-autoreconf --force --install
 
 # make examples directory for devel %doc
 mkdir -p tmp/examples
@@ -78,6 +75,13 @@
 
 
 %changelog
+* Thu Jan 01 2009 Christopher Stone <chris.stone at gmail.com> 136.0-1
+- Upstream sync
+- Remove no longer needed python26 patch
+
+* Mon Dec 01 2008 Christopher Stone <chris.stone at gmail.com> 135.0-3.1
+- Release bump for dist-f11-python
+
 * Mon Dec 01 2008 Christopher Stone <chris.stone at gmail.com> 135.0-3
 - Add patch for python 2.6
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pypoker-eval/F-8/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	31 Mar 2008 21:28:12 -0000	1.6
+++ sources	2 Jan 2009 04:45:48 -0000	1.7
@@ -1 +1 @@
-79db0170fe723e6e847e6bcb832d6b56  pypoker-eval-135.0.tar.gz
+08cf41708c83b5f61577d7779f80cf55  pypoker-eval-136.0.tar.gz


--- pypoker-eval-135-python26.patch DELETED ---



From xulchris at fedoraproject.org  Fri Jan  2 04:46:18 2009
From: xulchris at fedoraproject.org (Christopher Stone)
Date: Fri,  2 Jan 2009 04:46:18 +0000 (UTC)
Subject: rpms/pypoker-eval/F-9 .cvsignore, 1.6, 1.7 pypoker-eval.spec, 1.13, 
	1.14 sources, 1.6, 1.7 pypoker-eval-135-python26.patch, 1.1, NONE
Message-ID: <20090102044618.AD89E70130@cvs1.fedora.phx.redhat.com>

Author: xulchris

Update of /cvs/pkgs/rpms/pypoker-eval/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10825/F-9

Modified Files:
	.cvsignore pypoker-eval.spec sources 
Removed Files:
	pypoker-eval-135-python26.patch 
Log Message:
upstream sync


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pypoker-eval/F-9/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	31 Mar 2008 21:28:25 -0000	1.6
+++ .cvsignore	2 Jan 2009 04:45:48 -0000	1.7
@@ -1 +1 @@
-pypoker-eval-135.0.tar.gz
+pypoker-eval-136.0.tar.gz


Index: pypoker-eval.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pypoker-eval/F-9/pypoker-eval.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- pypoker-eval.spec	1 Dec 2008 21:25:27 -0000	1.13
+++ pypoker-eval.spec	2 Jan 2009 04:45:48 -0000	1.14
@@ -1,17 +1,16 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           pypoker-eval
-Version:        135.0
-Release:        3%{?dist}
+Version:        136.0
+Release:        1%{?dist}
 Summary:        Python interface to poker-eval
 
 Group:          Development/Libraries
 License:        GPLv2+
 URL:            http://pokersource.org/pypoker-eval
 Source0:        http://download.gna.org/pokersource/sources/%{name}-%{version}.tar.gz
-Patch0:         %{name}-135-python26.patch
 
-BuildRequires:  libtool python-devel poker-eval-devel >= 124.0
+BuildRequires:  python-devel poker-eval-devel >= 124.0
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -31,8 +30,6 @@
 
 %prep
 %setup -q
-%patch0 -p2 -b .python26~
-autoreconf --force --install
 
 # make examples directory for devel %doc
 mkdir -p tmp/examples
@@ -78,6 +75,13 @@
 
 
 %changelog
+* Thu Jan 01 2009 Christopher Stone <chris.stone at gmail.com> 136.0-1
+- Upstream sync
+- Remove no longer needed python26 patch
+
+* Mon Dec 01 2008 Christopher Stone <chris.stone at gmail.com> 135.0-3.1
+- Release bump for dist-f11-python
+
 * Mon Dec 01 2008 Christopher Stone <chris.stone at gmail.com> 135.0-3
 - Add patch for python 2.6
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pypoker-eval/F-9/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	31 Mar 2008 21:28:25 -0000	1.6
+++ sources	2 Jan 2009 04:45:48 -0000	1.7
@@ -1 +1 @@
-79db0170fe723e6e847e6bcb832d6b56  pypoker-eval-135.0.tar.gz
+08cf41708c83b5f61577d7779f80cf55  pypoker-eval-136.0.tar.gz


--- pypoker-eval-135-python26.patch DELETED ---



From xulchris at fedoraproject.org  Fri Jan  2 04:46:18 2009
From: xulchris at fedoraproject.org (Christopher Stone)
Date: Fri,  2 Jan 2009 04:46:18 +0000 (UTC)
Subject: rpms/pypoker-eval/devel .cvsignore, 1.6, 1.7 pypoker-eval.spec, 1.15,
	1.16 sources, 1.6, 1.7 pypoker-eval-135-python26.patch, 1.1, NONE
Message-ID: <20090102044618.E947D70130@cvs1.fedora.phx.redhat.com>

Author: xulchris

Update of /cvs/pkgs/rpms/pypoker-eval/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10825/devel

Modified Files:
	.cvsignore pypoker-eval.spec sources 
Removed Files:
	pypoker-eval-135-python26.patch 
Log Message:
upstream sync


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pypoker-eval/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	31 Mar 2008 21:28:25 -0000	1.6
+++ .cvsignore	2 Jan 2009 04:45:48 -0000	1.7
@@ -1 +1 @@
-pypoker-eval-135.0.tar.gz
+pypoker-eval-136.0.tar.gz


Index: pypoker-eval.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pypoker-eval/devel/pypoker-eval.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- pypoker-eval.spec	1 Dec 2008 23:07:35 -0000	1.15
+++ pypoker-eval.spec	2 Jan 2009 04:45:48 -0000	1.16
@@ -1,17 +1,16 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           pypoker-eval
-Version:        135.0
-Release:        3%{?dist}.1
+Version:        136.0
+Release:        1%{?dist}
 Summary:        Python interface to poker-eval
 
 Group:          Development/Libraries
 License:        GPLv2+
 URL:            http://pokersource.org/pypoker-eval
 Source0:        http://download.gna.org/pokersource/sources/%{name}-%{version}.tar.gz
-Patch0:         %{name}-135-python26.patch
 
-BuildRequires:  libtool python-devel poker-eval-devel >= 124.0
+BuildRequires:  python-devel poker-eval-devel >= 124.0
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -31,8 +30,6 @@
 
 %prep
 %setup -q
-%patch0 -p2 -b .python26~
-autoreconf --force --install
 
 # make examples directory for devel %doc
 mkdir -p tmp/examples
@@ -78,6 +75,10 @@
 
 
 %changelog
+* Thu Jan 01 2009 Christopher Stone <chris.stone at gmail.com> 136.0-1
+- Upstream sync
+- Remove no longer needed python26 patch
+
 * Mon Dec 01 2008 Christopher Stone <chris.stone at gmail.com> 135.0-3.1
 - Release bump for dist-f11-python
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pypoker-eval/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	31 Mar 2008 21:28:25 -0000	1.6
+++ sources	2 Jan 2009 04:45:48 -0000	1.7
@@ -1 +1 @@
-79db0170fe723e6e847e6bcb832d6b56  pypoker-eval-135.0.tar.gz
+08cf41708c83b5f61577d7779f80cf55  pypoker-eval-136.0.tar.gz


--- pypoker-eval-135-python26.patch DELETED ---



From roland at fedoraproject.org  Fri Jan  2 05:37:55 2009
From: roland at fedoraproject.org (Roland McGrath)
Date: Fri,  2 Jan 2009 05:37:55 +0000 (UTC)
Subject: rpms/elfutils/devel elfutils-0.138-libelf-padding-fix.patch, NONE, 
	1.1 elfutils.spec, 1.110, 1.111
Message-ID: <20090102053755.8A79470130@cvs1.fedora.phx.redhat.com>

Author: roland

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

Modified Files:
	elfutils.spec 
Added Files:
	elfutils-0.138-libelf-padding-fix.patch 
Log Message:
* Thu Jan  1 2009 Roland McGrath <roland at redhat.com> - 0.138-2
- Fix libelf regression.


elfutils-0.138-libelf-padding-fix.patch:

--- NEW FILE elfutils-0.138-libelf-padding-fix.patch ---
commit ed9d3bc176b3f0318551d9214b1cec4e49197842
Author: Roland McGrath <roland at redhat.com>
Date:   Thu Jan 1 21:22:18 2009 -0800

    Fill gaps and update bookkeeping between all sections, not only before a dirty one.
---
 libelf/ChangeLog          |    7 ++
 libelf/elf32_updatefile.c |  142 +++++++++++++++++++++++++++------------------
 2 files changed, 93 insertions(+), 56 deletions(-)

diff --git a/libelf/ChangeLog b/libelf/ChangeLog
index 9578f8b..bb487b1 100644
--- a/libelf/ChangeLog
+++ b/libelf/ChangeLog
@@ -1,3 +1,10 @@
+2009-01-01  Roland McGrath  <roland at redhat.com>
+
+	* elf32_updatefile.c (__elfw2(LIBELFBITS,updatemmap)):
+	Fill gaps and update bookkeeping between all sections,
+	not only before a dirty one.
+	(__elfw2(LIBELFBITS,updatefile)): Likewise.
+
 2008-12-11  Roland McGrath  <roland at redhat.com>
 
 	* elf32_updatefile.c (__elfw2(LIBELFBITS,updatemmap)): Handle
diff --git a/libelf/elf32_updatefile.c b/libelf/elf32_updatefile.c
index e88f4a4..4e170cb 100644
--- a/libelf/elf32_updatefile.c
+++ b/libelf/elf32_updatefile.c
@@ -1,5 +1,5 @@
 /* Write changed data structures.
-   Copyright (C) 2000, 2001, 2002, 2004, 2005, 2006, 2007, 2008 Red Hat, Inc.
+   Copyright (C) 2000,2001,2002,2004,2005,2006,2007,2008,2009 Red Hat, Inc.
    This file is part of Red Hat elfutils.
    Written by Ulrich Drepper <drepper at redhat.com>, 2000.
 
@@ -127,7 +127,6 @@ internal_function
 __elfw2(LIBELFBITS,updatemmap) (Elf *elf, int change_bo, size_t shnum)
 {
   ElfW2(LIBELFBITS,Ehdr) *ehdr;
-  char *last_position;
 
   /* We need the ELF header several times.  */
   ehdr = elf->state.ELFW(elf,LIBELFBITS).ehdr;
@@ -204,10 +203,11 @@ __elfw2(LIBELFBITS,updatemmap) (Elf *elf, int change_bo, size_t shnum)
 
   /* From now on we have to keep track of the last position to eventually
      fill the gaps with the prescribed fill byte.  */
-  last_position = ((char *) elf->map_address + elf->start_offset
-		   + MAX (elf_typesize (LIBELFBITS, ELF_T_EHDR, 1),
-			  ehdr->e_phoff)
-		   + elf_typesize (LIBELFBITS, ELF_T_PHDR, ehdr->e_phnum));
+  char *last_position = ((char *) elf->map_address + elf->start_offset
+			 + MAX (elf_typesize (LIBELFBITS, ELF_T_EHDR, 1),
+				ehdr->e_phoff)
+			 + elf_typesize (LIBELFBITS,
+					 ELF_T_PHDR, ehdr->e_phnum));
 
   /* Write all the sections.  Well, only those which are modified.  */
   if (shnum > 0)
@@ -278,6 +278,35 @@ __elfw2(LIBELFBITS,updatemmap) (Elf *elf, int change_bo, size_t shnum)
 	    }
 	}
 
+      /* Prepare to write at START, and then update LAST_POSITION.
+	 If LAST_POSITION was before START, fill in the gap.  */
+      inline void prepare_position (char *start)
+      {
+	if (start > last_position)
+	  {
+	    /* This code assumes that the data blocks for
+	       a section are ordered by offset.  */
+	    size_t written = 0;
+
+	    if (last_position < shdr_start)
+	      {
+		written = MIN (start - last_position,
+			       shdr_start - last_position);
+
+		memset (last_position, __libelf_fill_byte, written);
+	      }
+
+	    if (last_position + written != start && shdr_end < start)
+	      memset (shdr_end, __libelf_fill_byte, start - shdr_end);
+	  }
+
+	/* Let it go backward if the sections use a bogus layout with
+	   overlaps.  We'll overwrite the stupid user's section data
+	   with the latest one, rather than crashing.  */
+
+	last_position = start;
+      }
+
       /* Iterate over all the section in the order in which they
 	 appear in the output file.  */
       for (size_t cnt = 0; cnt < shnum; ++cnt)
@@ -298,38 +327,10 @@ __elfw2(LIBELFBITS,updatemmap) (Elf *elf, int change_bo, size_t shnum)
 		assert (dl->data.d.d_size <= (shdr->sh_size
 					      - (GElf_Off) dl->data.d.d_off));
 
+		prepare_position (scn_start + dl->data.d.d_off);
+
 		if ((scn->flags | dl->flags | elf->flags) & ELF_F_DIRTY)
 		  {
-		    if (scn_start + dl->data.d.d_off > last_position)
-		      {
-			/* This code assumes that the data blocks for
-			   a section are ordered by offset.  */
-			size_t written = 0;
-
-			if (last_position < shdr_start)
-			  {
-			    written = MIN (scn_start + dl->data.d.d_off
-					   - last_position,
-					   shdr_start - last_position);
-
-			    memset (last_position, __libelf_fill_byte,
-				    written);
-			  }
-
-			if (last_position + written
-			    != scn_start + dl->data.d.d_off
-			    && shdr_end < scn_start + dl->data.d.d_off)
-			  memset (shdr_end, __libelf_fill_byte,
-				  scn_start + dl->data.d.d_off - shdr_end);
-		      }
-
-		    /* Let it go backward if the sections use a bogus
-		       layout with overlaps.  We'll overwrite the stupid
-		       user's section data with the latest one, rather than
-		       crashing.  */
-
-		    last_position = scn_start + dl->data.d.d_off;
-
 		    if (unlikely (change_bo))
 		      {
 #if EV_NUM != 2
@@ -362,9 +363,19 @@ __elfw2(LIBELFBITS,updatemmap) (Elf *elf, int change_bo, size_t shnum)
 		dl = dl->next;
 	      }
 	    while (dl != NULL);
-	  else if (shdr->sh_type != SHT_NOBITS && scn->index != 0)
-	    /* We have to trust the existing section header information.  */
-	    last_position += shdr->sh_size;
+	  else if (shdr->sh_type != SHT_NOBITS && scn->index != 0
+		   && shdr->sh_size != 0)
+	    {
+	      /* We have to trust the existing section header information.
+
+		 If there are any contents at all, we must be sure we've
+		 filled in any gap before them, even if it turns out we
+		 aren't touching the contents after the gap.  */
+
+	      prepare_position (scn_start);
+
+	      last_position += shdr->sh_size;
+	    }
 
 	  scn->flags &= ~ELF_F_DIRTY;
 	}
@@ -622,31 +633,39 @@ __elfw2(LIBELFBITS,updatefile) (Elf *elf, int change_bo, size_t shnum)
 	  off_t scn_start = elf->start_offset + shdr->sh_offset;
 	  Elf_Data_List *dl = &scn->data_list;
 
+	  /* Prepare to write at START, and then update LAST_OFFSET.
+	     If LAST_OFFSET was before START, fill in the gap.  */
+	  inline bool prepare_offset (off_t start)
+	  {
+	    if (start > last_offset)
+	      {
+		if (unlikely (fill (elf->fildes, last_offset,
+				    start - last_offset, fillbuf,
+				    &filled) != 0))
+		  return true;
+	      }
+
+	    /* Let it go backward if the sections use a bogus layout with
+	       overlaps.  We'll overwrite the stupid user's section data
+	       with the latest one, rather than crashing.  */
+
+	    last_offset = start;
+
+	    return false;
+	  }
+
 	  if (shdr->sh_type != SHT_NOBITS && scn->data_list_rear != NULL
 	      && scn->index != 0)
 	    do
 	      {
+		if (unlikely (prepare_offset (scn_start + dl->data.d.d_off)))
+		  return 1;
+
 		if ((scn->flags | dl->flags | elf->flags) & ELF_F_DIRTY)
 		  {
 		    char tmpbuf[MAX_TMPBUF];
 		    void *buf = dl->data.d.d_buf;
 
-		    if (scn_start + dl->data.d.d_off > last_offset)
-		      {
-			if (unlikely (fill (elf->fildes, last_offset,
-					    (scn_start + dl->data.d.d_off)
-					    - last_offset, fillbuf,
-					    &filled) != 0))
-			  return 1;
-		      }
-
-		    /* Let it go backward if the sections use a bogus
-		       layout with overlaps.  We'll overwrite the stupid
-		       user's section data with the latest one, rather than
-		       crashing.  */
-
-		    last_offset = scn_start + dl->data.d.d_off;
-
 		    if (unlikely (change_bo))
 		      {
 #if EV_NUM != 2
@@ -696,7 +715,18 @@ __elfw2(LIBELFBITS,updatefile) (Elf *elf, int change_bo, size_t shnum)
 	      }
 	    while (dl != NULL);
 	  else if (shdr->sh_type != SHT_NOBITS && scn->index != 0)
-	    last_offset = scn_start + shdr->sh_size;
+	    {
+	      /* We have to trust the existing section header information.
+
+		 If there are any contents at all, we must be sure we've
+		 filled in any gap before them, even if it turns out we
+		 aren't touching the contents after the gap.  */
+
+	      if (shdr->sh_size != 0 && unlikely (prepare_offset (scn_start)))
+		return 1;
+
+	      last_offset = scn_start + shdr->sh_size;
+	    }
 
 	  /* Collect the section header table information.  */
 	  if (unlikely (change_bo))


Index: elfutils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/elfutils/devel/elfutils.spec,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -r1.110 -r1.111
--- elfutils.spec	31 Dec 2008 22:12:44 -0000	1.110
+++ elfutils.spec	2 Jan 2009 05:37:25 -0000	1.111
@@ -1,5 +1,5 @@
 %define eu_version 0.138
-%define eu_release 1
+%define eu_release 2
 
 %if %{?_with_compat:1}%{!?_with_compat:0}
 %define compat 1
@@ -38,6 +38,8 @@
 Requires: elfutils-libelf-%{_arch} = %{version}-%{release}
 Requires: elfutils-libs-%{_arch} = %{version}-%{release}
 
+Patch3: elfutils-0.138-libelf-padding-fix.patch
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: bison >= 1.875
 BuildRequires: flex >= 2.5.4a
@@ -156,6 +158,8 @@
 
 %patch2 -p1 -b .robustify
 
+%patch3 -p1 -b .fixes
+
 find . -name \*.sh ! -perm -0100 -print | xargs chmod +x
 
 %build
@@ -263,6 +267,9 @@
 %{_libdir}/libelf.a
 
 %changelog
+* Thu Jan  1 2009 Roland McGrath <roland at redhat.com> - 0.138-2
+- Fix libelf regression.
+
 * Wed Dec 31 2008 Roland McGrath <roland at redhat.com> - 0.138-1
 - Update to 0.138
   - Install <elfutils/version.h> header file for applications to use in



From xulchris at fedoraproject.org  Fri Jan  2 05:44:41 2009
From: xulchris at fedoraproject.org (Christopher Stone)
Date: Fri,  2 Jan 2009 05:44:41 +0000 (UTC)
Subject: rpms/poker-engine/F-10 .cvsignore, 1.15, 1.16 poker-engine.spec,
	1.24, 1.25 sources, 1.15, 1.16
Message-ID: <20090102054441.CC47270130@cvs1.fedora.phx.redhat.com>

Author: xulchris

Update of /cvs/pkgs/rpms/poker-engine/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25375/F-10

Modified Files:
	.cvsignore poker-engine.spec sources 
Log Message:
upstream sync


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/poker-engine/F-10/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	24 Dec 2008 17:46:52 -0000	1.15
+++ .cvsignore	2 Jan 2009 05:44:11 -0000	1.16
@@ -1 +1 @@
-poker-engine-1.3.1.tar.gz
+poker-engine-1.3.2.tar.gz


Index: poker-engine.spec
===================================================================
RCS file: /cvs/pkgs/rpms/poker-engine/F-10/poker-engine.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- poker-engine.spec	24 Dec 2008 17:46:52 -0000	1.24
+++ poker-engine.spec	2 Jan 2009 05:44:11 -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:           poker-engine
-Version:        1.3.1
+Version:        1.3.2
 Release:        1%{?dist}
 Summary:        Python library that implements poker rules
 
@@ -12,7 +12,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
-BuildRequires:  gettext
+BuildRequires:  gettext procps
 BuildRequires:  rsync libxml2-python libxslt-python pypoker-eval-devel >= 128.0
 Requires:       rsync libxml2-python libxslt-python pypoker-eval >= 128.0
 
@@ -72,6 +72,10 @@
 
 
 %changelog
+* Thu Jan 01 2009 Christopher Stone <chris.stone at gmail.com> 1.3.2-1
+- Upstream sync
+- Add new BR procps for make check
+
 * Wed Dec 24 2008 Christopher Stone <chris.stone at gmail.com> 1.3.1-1
 - Upstream sync
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/poker-engine/F-10/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	24 Dec 2008 17:46:52 -0000	1.15
+++ sources	2 Jan 2009 05:44:11 -0000	1.16
@@ -1 +1 @@
-adae03f1becb70d99efcb06e25c80192  poker-engine-1.3.1.tar.gz
+4614a68ba0ee765e76ea958bdc2c0780  poker-engine-1.3.2.tar.gz



From xulchris at fedoraproject.org  Fri Jan  2 05:44:41 2009
From: xulchris at fedoraproject.org (Christopher Stone)
Date: Fri,  2 Jan 2009 05:44:41 +0000 (UTC)
Subject: rpms/poker-engine/F-8 .cvsignore, 1.15, 1.16 poker-engine.spec, 1.24,
	1.25 sources, 1.15, 1.16
Message-ID: <20090102054441.ED69E70130@cvs1.fedora.phx.redhat.com>

Author: xulchris

Update of /cvs/pkgs/rpms/poker-engine/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25375/F-8

Modified Files:
	.cvsignore poker-engine.spec sources 
Log Message:
upstream sync


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/poker-engine/F-8/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	24 Dec 2008 17:46:53 -0000	1.15
+++ .cvsignore	2 Jan 2009 05:44:11 -0000	1.16
@@ -1 +1 @@
-poker-engine-1.3.1.tar.gz
+poker-engine-1.3.2.tar.gz


Index: poker-engine.spec
===================================================================
RCS file: /cvs/pkgs/rpms/poker-engine/F-8/poker-engine.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- poker-engine.spec	24 Dec 2008 17:46:53 -0000	1.24
+++ poker-engine.spec	2 Jan 2009 05:44:11 -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:           poker-engine
-Version:        1.3.1
+Version:        1.3.2
 Release:        1%{?dist}
 Summary:        Python library that implements poker rules
 
@@ -12,7 +12,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
-BuildRequires:  gettext
+BuildRequires:  gettext procps
 BuildRequires:  rsync libxml2-python libxslt-python pypoker-eval-devel >= 128.0
 Requires:       rsync libxml2-python libxslt-python pypoker-eval >= 128.0
 
@@ -72,6 +72,10 @@
 
 
 %changelog
+* Thu Jan 01 2009 Christopher Stone <chris.stone at gmail.com> 1.3.2-1
+- Upstream sync
+- Add new BR procps for make check
+
 * Wed Dec 24 2008 Christopher Stone <chris.stone at gmail.com> 1.3.1-1
 - Upstream sync
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/poker-engine/F-8/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	24 Dec 2008 17:46:53 -0000	1.15
+++ sources	2 Jan 2009 05:44:11 -0000	1.16
@@ -1 +1 @@
-adae03f1becb70d99efcb06e25c80192  poker-engine-1.3.1.tar.gz
+4614a68ba0ee765e76ea958bdc2c0780  poker-engine-1.3.2.tar.gz



From xulchris at fedoraproject.org  Fri Jan  2 05:44:42 2009
From: xulchris at fedoraproject.org (Christopher Stone)
Date: Fri,  2 Jan 2009 05:44:42 +0000 (UTC)
Subject: rpms/poker-engine/F-9 .cvsignore, 1.15, 1.16 poker-engine.spec, 1.24,
	1.25 sources, 1.15, 1.16
Message-ID: <20090102054442.4273270130@cvs1.fedora.phx.redhat.com>

Author: xulchris

Update of /cvs/pkgs/rpms/poker-engine/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25375/F-9

Modified Files:
	.cvsignore poker-engine.spec sources 
Log Message:
upstream sync


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/poker-engine/F-9/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	24 Dec 2008 17:46:53 -0000	1.15
+++ .cvsignore	2 Jan 2009 05:44:11 -0000	1.16
@@ -1 +1 @@
-poker-engine-1.3.1.tar.gz
+poker-engine-1.3.2.tar.gz


Index: poker-engine.spec
===================================================================
RCS file: /cvs/pkgs/rpms/poker-engine/F-9/poker-engine.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- poker-engine.spec	24 Dec 2008 17:46:53 -0000	1.24
+++ poker-engine.spec	2 Jan 2009 05:44:11 -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:           poker-engine
-Version:        1.3.1
+Version:        1.3.2
 Release:        1%{?dist}
 Summary:        Python library that implements poker rules
 
@@ -12,7 +12,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
-BuildRequires:  gettext
+BuildRequires:  gettext procps
 BuildRequires:  rsync libxml2-python libxslt-python pypoker-eval-devel >= 128.0
 Requires:       rsync libxml2-python libxslt-python pypoker-eval >= 128.0
 
@@ -72,6 +72,10 @@
 
 
 %changelog
+* Thu Jan 01 2009 Christopher Stone <chris.stone at gmail.com> 1.3.2-1
+- Upstream sync
+- Add new BR procps for make check
+
 * Wed Dec 24 2008 Christopher Stone <chris.stone at gmail.com> 1.3.1-1
 - Upstream sync
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/poker-engine/F-9/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	24 Dec 2008 17:46:53 -0000	1.15
+++ sources	2 Jan 2009 05:44:11 -0000	1.16
@@ -1 +1 @@
-adae03f1becb70d99efcb06e25c80192  poker-engine-1.3.1.tar.gz
+4614a68ba0ee765e76ea958bdc2c0780  poker-engine-1.3.2.tar.gz



From xulchris at fedoraproject.org  Fri Jan  2 05:44:42 2009
From: xulchris at fedoraproject.org (Christopher Stone)
Date: Fri,  2 Jan 2009 05:44:42 +0000 (UTC)
Subject: rpms/poker-engine/devel .cvsignore, 1.15, 1.16 poker-engine.spec,
	1.25, 1.26 sources, 1.15, 1.16
Message-ID: <20090102054442.9A2D070130@cvs1.fedora.phx.redhat.com>

Author: xulchris

Update of /cvs/pkgs/rpms/poker-engine/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25375/devel

Modified Files:
	.cvsignore poker-engine.spec sources 
Log Message:
upstream sync


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/poker-engine/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	24 Dec 2008 17:46:53 -0000	1.15
+++ .cvsignore	2 Jan 2009 05:44:12 -0000	1.16
@@ -1 +1 @@
-poker-engine-1.3.1.tar.gz
+poker-engine-1.3.2.tar.gz


Index: poker-engine.spec
===================================================================
RCS file: /cvs/pkgs/rpms/poker-engine/devel/poker-engine.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- poker-engine.spec	24 Dec 2008 17:46:53 -0000	1.25
+++ poker-engine.spec	2 Jan 2009 05:44:12 -0000	1.26
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           poker-engine
-Version:        1.3.1
+Version:        1.3.2
 Release:        1%{?dist}
 Summary:        Python library that implements poker rules
 
@@ -12,7 +12,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
-BuildRequires:  gettext
+BuildRequires:  gettext procps
 BuildRequires:  rsync libxml2-python libxslt-python pypoker-eval-devel >= 128.0
 Requires:       rsync libxml2-python libxslt-python pypoker-eval >= 128.0
 
@@ -72,6 +72,10 @@
 
 
 %changelog
+* Thu Jan 01 2009 Christopher Stone <chris.stone at gmail.com> 1.3.2-1
+- Upstream sync
+- Add new BR procps for make check
+
 * Wed Dec 24 2008 Christopher Stone <chris.stone at gmail.com> 1.3.1-1
 - Upstream sync
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/poker-engine/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	24 Dec 2008 17:46:53 -0000	1.15
+++ sources	2 Jan 2009 05:44:12 -0000	1.16
@@ -1 +1 @@
-adae03f1becb70d99efcb06e25c80192  poker-engine-1.3.1.tar.gz
+4614a68ba0ee765e76ea958bdc2c0780  poker-engine-1.3.2.tar.gz



From mjakubicek at fedoraproject.org  Fri Jan  2 07:08:53 2009
From: mjakubicek at fedoraproject.org (=?utf-8?b?TWlsb8WhIEpha3Viw63EjWVr?=)
Date: Fri,  2 Jan 2009 07:08:53 +0000 (UTC)
Subject: rpms/boinc-client/devel boinc-gccflags.patch, 1.2,
	1.3 boinc-locales.patch, 1.1, 1.2
Message-ID: <20090102070853.9616770130@cvs1.fedora.phx.redhat.com>

Author: mjakubicek

Update of /cvs/pkgs/rpms/boinc-client/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10420

Modified Files:
	boinc-gccflags.patch boinc-locales.patch 
Log Message:
-Forgot to commit updated patches.



boinc-gccflags.patch:

Index: boinc-gccflags.patch
===================================================================
RCS file: /cvs/pkgs/rpms/boinc-client/devel/boinc-gccflags.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- boinc-gccflags.patch	26 Aug 2008 20:27:10 -0000	1.2
+++ boinc-gccflags.patch	2 Jan 2009 07:08:23 -0000	1.3
@@ -1,7 +1,7 @@
---- boinc_core_release_6_2_15/client/Makefile.am.orig	2008-08-04 19:25:20.000000000 +0200
-+++ boinc_core_release_6_2_15/client/Makefile.am	2008-08-04 19:25:35.000000000 +0200
-@@ -61,7 +61,7 @@
-     work_fetch.C
+--- boinc_core_release_6_4_5/client/Makefile.am.orig	2008-12-17 19:25:20.000000000 +0200
++++ boinc_core_release_6_4_5/client/Makefile.am	2008-12-17 19:25:35.000000000 +0200
+@@ -65,7 +65,7 @@
+     work_fetch.cpp
  
  boinc_client_DEPENDENCIES =
 -boinc_client_CPPFLAGS = -O3 -fomit-frame-pointer -fforce-addr -ffast-math $(AM_CPPFLAGS)
@@ -9,10 +9,10 @@
  boinc_client_LDFLAGS = -static-libgcc
  boinc_client_LDADD = $(LIBBOINC) $(PTHREAD_LIBS)
  
---- boinc_core_release_6_2_15/client/Makefile.in.orig	2008-08-04 19:25:24.000000000 +0200
-+++ boinc_core_release_6_2_15/client/Makefile.in	2008-08-04 19:25:51.000000000 +0200
-@@ -367,7 +367,7 @@
-     work_fetch.C
+--- boinc_core_release_6_4_5/client/Makefile.in.orig	2008-12-17 19:25:24.000000000 +0200
++++ boinc_core_release_6_4_5/client/Makefile.in	2008-12-17 19:25:51.000000000 +0200
+@@ -373,7 +373,7 @@
+     work_fetch.cpp
  
  boinc_client_DEPENDENCIES = 
 -boinc_client_CPPFLAGS = -O3 -fomit-frame-pointer -fforce-addr -ffast-math $(AM_CPPFLAGS)

boinc-locales.patch:

Index: boinc-locales.patch
===================================================================
RCS file: /cvs/pkgs/rpms/boinc-client/devel/boinc-locales.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- boinc-locales.patch	17 May 2008 11:06:15 -0000	1.1
+++ boinc-locales.patch	2 Jan 2009 07:08:23 -0000	1.2
@@ -1,11 +1,11 @@
---- boinc_core_release_5_10_45_orig/clientgui/BOINCGUIApp.cpp	2008-05-17 12:45:13.000000000 +0200
-+++ boinc_core_release_5_10_45/clientgui/BOINCGUIApp.cpp	2008-05-17 12:45:34.000000000 +0200
-@@ -258,7 +258,7 @@
-         );
-     }
-     m_pLocale->AddCatalogLookupPathPrefix(wxT("locale"));
--    m_pLocale->AddCatalog(wxT("BOINC Manager"));
-+    m_pLocale->AddCatalog(wxT("BOINC-Manager"));
- 
-     InitSupportedLanguages();
- 
+--- boinc_core_release_6_4_5/clientgui/BOINCGUIApp.cpp.orig	2008-12-17 23:33:16.000000000 +0100
++++ boinc_core_release_6_4_5/clientgui/BOINCGUIApp.cpp	2008-12-17 23:33:19.000000000 +0100
+@@ -329,7 +329,7 @@
+         );
+     }
+     m_pLocale->AddCatalogLookupPathPrefix(wxT("locale"));
+-    m_pLocale->AddCatalog(wxT("BOINC Manager"));
++    m_pLocale->AddCatalog(wxT("BOINC-Manager"));
+ 
+     InitSupportedLanguages();
+ 



From jwrdegoede at fedoraproject.org  Fri Jan  2 08:24:37 2009
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Fri,  2 Jan 2009 08:24:37 +0000 (UTC)
Subject: rpms/lm_sensors/devel lm_sensors-3.0.3-acpi-bus.patch, NONE,
	1.1 .cvsignore, 1.22, 1.23 lm_sensors.spec, 1.66, 1.67 sources,
	1.22, 1.23
Message-ID: <20090102082438.115F570130@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

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

Modified Files:
	.cvsignore lm_sensors.spec sources 
Added Files:
	lm_sensors-3.0.3-acpi-bus.patch 
Log Message:
* Thu Jan  1 2009 Hans de Goede <j.w.r.degoede at hhs.nl> 3.0.3-1
- New upstream release 3.0.3
- Add a patch to support drivers with an ACPI "bus" (new Asus atk0110 drv)


lm_sensors-3.0.3-acpi-bus.patch:

--- NEW FILE lm_sensors-3.0.3-acpi-bus.patch ---
Index: lib/access.c
===================================================================
--- lib/access.c	(revision 5577)
+++ lib/access.c	(working copy)
@@ -349,6 +349,8 @@
 		return "SPI adapter";
 	case SENSORS_BUS_TYPE_VIRTUAL:
 		return "Virtual device";
+	case SENSORS_BUS_TYPE_ACPI:
+		return "ACPI interface";
 	}
 
 	/* bus types with several instances */
Index: lib/sensors.h
===================================================================
--- lib/sensors.h	(revision 5577)
+++ lib/sensors.h	(working copy)
@@ -42,6 +42,7 @@
 #define SENSORS_BUS_TYPE_PCI		2
 #define SENSORS_BUS_TYPE_SPI		3
 #define SENSORS_BUS_TYPE_VIRTUAL	4
+#define SENSORS_BUS_TYPE_ACPI		5
 #define SENSORS_BUS_NR_ANY		(-1)
 #define SENSORS_BUS_NR_IGNORE		(-2)
 
Index: lib/sysfs.c
===================================================================
--- lib/sysfs.c	(revision 5577)
+++ lib/sysfs.c	(working copy)
@@ -596,6 +596,11 @@
 			entry.chip.addr = 0;
 		entry.chip.bus.type = SENSORS_BUS_TYPE_ISA;
 		entry.chip.bus.nr = 0;
+	} else if (subsys && !strcmp(subsys, "acpi")) {
+		entry.chip.bus.type = SENSORS_BUS_TYPE_ACPI;
+		/* For now we assume that acpi devices are unique */
+		entry.chip.bus.nr = 0;
+		entry.chip.addr = 0;
 	} else {
 		/* Ignore unknown device */
 		err = 0;
Index: lib/data.c
===================================================================
--- lib/data.c	(revision 5577)
+++ lib/data.c	(working copy)
@@ -111,6 +111,8 @@
 		res->bus.type = SENSORS_BUS_TYPE_SPI;
 	else if (!strncmp(name, "virtual", dash - name))
 		res->bus.type = SENSORS_BUS_TYPE_VIRTUAL;
+	else if (!strncmp(name, "acpi", dash - name))
+		res->bus.type = SENSORS_BUS_TYPE_ACPI;
 	else
 		goto ERROR;
 	name = dash + 1;
@@ -174,6 +176,9 @@
 	case SENSORS_BUS_TYPE_VIRTUAL:
 		return snprintf(str, size, "%s-virtual-%x", chip->prefix,
 				chip->addr);
+	case SENSORS_BUS_TYPE_ACPI:
+		return snprintf(str, size, "%s-acpi-%x", chip->prefix,
+				chip->addr);
 	}
 
 	return -SENSORS_ERR_CHIP_NAME;


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/lm_sensors/devel/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- .cvsignore	1 Jul 2008 11:12:08 -0000	1.22
+++ .cvsignore	2 Jan 2009 08:24:06 -0000	1.23
@@ -1 +1 @@
-lm_sensors-3.0.2.tar.bz2
+lm_sensors-3.0.3.tar.bz2


Index: lm_sensors.spec
===================================================================
RCS file: /cvs/extras/rpms/lm_sensors/devel/lm_sensors.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- lm_sensors.spec	1 Jul 2008 11:12:08 -0000	1.66
+++ lm_sensors.spec	2 Jan 2009 08:24:07 -0000	1.67
@@ -1,5 +1,5 @@
 Name: lm_sensors
-Version: 3.0.2
+Version: 3.0.3
 Release: 1%{?dist}
 URL: http://www.lm-sensors.org/
 Source: http://dl.lm-sensors.org/lm-sensors/releases/%{name}-%{version}.tar.bz2
@@ -7,6 +7,8 @@
 # these 2 were taken from PLD-linux, Thanks!
 Source2: sensord.sysconfig
 Source3: sensord.init
+# submitted to upstream mailinglist
+Patch0: lm_sensors-3.0.3-acpi-bus.patch
 Summary: Hardware monitoring tools
 Group: Applications/System
 License: GPLv2+
@@ -48,6 +50,7 @@
 
 %prep
 %setup -q
+%patch0 -p0
 mv prog/init/README prog/init/README.initscripts
 chmod -x prog/init/fancontrol.init
 
@@ -161,6 +164,10 @@
 
 
 %changelog
+* Thu Jan  1 2009 Hans de Goede <j.w.r.degoede at hhs.nl> 3.0.3-1
+- New upstream release 3.0.3
+- Add a patch to support drivers with an ACPI "bus" (new Asus atk0110 drv)
+
 * Tue Jul  1 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 3.0.2-1
 - New upstream release 3.0.2
 - This release contains various important fixes to sensors-detect, which made


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/lm_sensors/devel/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- sources	1 Jul 2008 11:12:08 -0000	1.22
+++ sources	2 Jan 2009 08:24:07 -0000	1.23
@@ -1 +1 @@
-5b210ba9cc01f00161c438fd618484e5  lm_sensors-3.0.2.tar.bz2
+e88b236228ac2a50821217015b8fd0fa  lm_sensors-3.0.3.tar.bz2



From sharkcz at fedoraproject.org  Fri Jan  2 09:14:54 2009
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Fri,  2 Jan 2009 09:14:54 +0000 (UTC)
Subject: rpms/qlandkartegt/devel .cvsignore, 1.5, 1.6 qlandkartegt.spec, 1.4,
	1.5 sources, 1.5, 1.6
Message-ID: <20090102091454.54AAD70130@cvs1.fedora.phx.redhat.com>

Author: sharkcz

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

Modified Files:
	.cvsignore qlandkartegt.spec sources 
Log Message:
* Fri Jan  2 2009 Dan Horak <dan[at]danny.cz> 0.9.3-1
- update to 0.9.3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qlandkartegt/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	23 Dec 2008 17:28:38 -0000	1.5
+++ .cvsignore	2 Jan 2009 09:14:23 -0000	1.6
@@ -1 +1 @@
-QLandkarteGT.0.9.2.tar.gz
+QLandkarteGT.0.9.3.tar.gz


Index: qlandkartegt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qlandkartegt/devel/qlandkartegt.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- qlandkartegt.spec	23 Dec 2008 17:28:39 -0000	1.4
+++ qlandkartegt.spec	2 Jan 2009 09:14:23 -0000	1.5
@@ -1,8 +1,8 @@
 %define cap_name QLandkarteGT
-%define rel_date 2008.12.23
+%define rel_date 2009.01.01
 
 Name: qlandkartegt
-Version: 0.9.2
+Version: 0.9.3
 Release: 1%{?dist}
 Summary: GPS device mapping tool
 
@@ -68,6 +68,9 @@
 
 
 %changelog
+* Fri Jan  2 2009 Dan Horak <dan[at]danny.cz> 0.9.3-1
+- update to 0.9.3
+
 * Tue Dec 23 2008 Dan Horak <dan[at]danny.cz> 0.9.2-1
 - update to 0.9.2
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qlandkartegt/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	23 Dec 2008 17:28:39 -0000	1.5
+++ sources	2 Jan 2009 09:14:23 -0000	1.6
@@ -1 +1 @@
-b2840ac89a8c46fe6177ecf80c9c635d  QLandkarteGT.0.9.2.tar.gz
+6cd5e909812ffea3f2bb0ecdaeb095aa  QLandkarteGT.0.9.3.tar.gz



From sharkcz at fedoraproject.org  Fri Jan  2 09:18:12 2009
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Fri,  2 Jan 2009 09:18:12 +0000 (UTC)
Subject: rpms/qlandkartegt/F-10 .cvsignore, 1.5, 1.6 qlandkartegt.spec, 1.4, 
	1.5 sources, 1.5, 1.6
Message-ID: <20090102091812.E60AE70130@cvs1.fedora.phx.redhat.com>

Author: sharkcz

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

Modified Files:
	.cvsignore qlandkartegt.spec sources 
Log Message:
* Fri Jan  2 2009 Dan Horak <dan[at]danny.cz> 0.9.3-1
- update to 0.9.3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qlandkartegt/F-10/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	23 Dec 2008 17:47:57 -0000	1.5
+++ .cvsignore	2 Jan 2009 09:17:42 -0000	1.6
@@ -1 +1 @@
-QLandkarteGT.0.9.2.tar.gz
+QLandkarteGT.0.9.3.tar.gz


Index: qlandkartegt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qlandkartegt/F-10/qlandkartegt.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- qlandkartegt.spec	23 Dec 2008 17:47:57 -0000	1.4
+++ qlandkartegt.spec	2 Jan 2009 09:17:42 -0000	1.5
@@ -1,8 +1,8 @@
 %define cap_name QLandkarteGT
-%define rel_date 2008.12.23
+%define rel_date 2009.01.01
 
 Name: qlandkartegt
-Version: 0.9.2
+Version: 0.9.3
 Release: 1%{?dist}
 Summary: GPS device mapping tool
 
@@ -68,6 +68,9 @@
 
 
 %changelog
+* Fri Jan  2 2009 Dan Horak <dan[at]danny.cz> 0.9.3-1
+- update to 0.9.3
+
 * Tue Dec 23 2008 Dan Horak <dan[at]danny.cz> 0.9.2-1
 - update to 0.9.2
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qlandkartegt/F-10/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	23 Dec 2008 17:47:57 -0000	1.5
+++ sources	2 Jan 2009 09:17:42 -0000	1.6
@@ -1 +1 @@
-b2840ac89a8c46fe6177ecf80c9c635d  QLandkarteGT.0.9.2.tar.gz
+6cd5e909812ffea3f2bb0ecdaeb095aa  QLandkarteGT.0.9.3.tar.gz



From akahl at fedoraproject.org  Fri Jan  2 09:19:02 2009
From: akahl at fedoraproject.org (Alexander Kahl)
Date: Fri,  2 Jan 2009 09:19:02 +0000 (UTC)
Subject: rpms/php-ZendFramework/devel .cvsignore, 1.5,
	1.6 php-ZendFramework.spec, 1.6, 1.7 sources, 1.5, 1.6
Message-ID: <20090102091902.ACBA170130@cvs1.fedora.phx.redhat.com>

Author: akahl

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

Modified Files:
	.cvsignore php-ZendFramework.spec sources 
Log Message:
* update to 1.7.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-ZendFramework/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	19 Nov 2008 13:44:43 -0000	1.5
+++ .cvsignore	2 Jan 2009 09:18:32 -0000	1.6
@@ -1 +1 @@
-ZendFramework-1.7.0.tar.gz
+ZendFramework-1.7.2.tar.gz


Index: php-ZendFramework.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php-ZendFramework/devel/php-ZendFramework.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- php-ZendFramework.spec	19 Nov 2008 17:39:57 -0000	1.6
+++ php-ZendFramework.spec	2 Jan 2009 09:18:32 -0000	1.7
@@ -2,13 +2,12 @@
 
 Summary:         Leading open-source PHP framework
 Name:            php-ZendFramework
-Version:         1.7.0
-Release:         3%{?dist}
+Version:         1.7.2
+Release:         1%{?dist}
 
 License:         BSD
 Group:           Development/Libraries
 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/
 
@@ -34,11 +33,6 @@
 Requires: php-xml
 BuildRequires: symlinks
 
-# For ZendX documentation
-BuildRequires: autoconf, make
-BuildRequires: libxslt, libxml2
-BuildRequires: docbook-style-xsl
-
 
 %description
 Extending the art & spirit of PHP, Zend Framework is based on simplicity,
@@ -277,12 +271,6 @@
 
 %{__cat} executables valid_executables|sort|uniq -u > invalid_executables
 
-cd extras/documentation/manual/en
-%{__autoconf}
-%configure --with-xsltproc="$(which xsltproc) --path \
-           '%{_datadir}/sgml/docbook/xsl-stylesheets/htmlhelp' --nonet"
-%{__make} %{?_smp_mflags}
-cd ../../../..
 
 %install
 %{__rm} -rf $RPM_BUILD_ROOT
@@ -373,7 +361,7 @@
 %files extras
 %defattr(-,root,root,-)
 %{_datadir}/php/ZendX
-%doc LICENSE.txt extras/documentation/manual/en/html/*
+%doc LICENSE.txt extras/documentation/api/extras/*
 
 %files Cache-Backend-Apc
 %defattr(-,root,root,-)
@@ -448,6 +436,10 @@
 
 
 %changelog
+* Fri Jan  2 2009 Alexander Kahl <akahl at iconmobile.com> - 1.7.2-1
+- update to 1.7.2
+- ZendX documentation doesn't need regeneration anymore, removed deps
+
 * Wed Nov 19 2008 Alexander Kahl <akahl at iconmobile.com> - 1.7.0-3
 - fix to use internal docbook
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-ZendFramework/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	19 Nov 2008 13:44:43 -0000	1.5
+++ sources	2 Jan 2009 09:18:32 -0000	1.6
@@ -1 +1 @@
-423629a9be793d3b6df352913f8c1401  ZendFramework-1.7.0.tar.gz
+7bc33a0ed379f30ab408ecd546025a1b  ZendFramework-1.7.2.tar.gz



From sharkcz at fedoraproject.org  Fri Jan  2 09:19:54 2009
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Fri,  2 Jan 2009 09:19:54 +0000 (UTC)
Subject: rpms/qlandkartegt/F-9 .cvsignore, 1.5, 1.6 qlandkartegt.spec, 1.4, 
	1.5 sources, 1.5, 1.6
Message-ID: <20090102091954.7A46B70130@cvs1.fedora.phx.redhat.com>

Author: sharkcz

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

Modified Files:
	.cvsignore qlandkartegt.spec sources 
Log Message:
* Fri Jan  2 2009 Dan Horak <dan[at]danny.cz> 0.9.3-1
- update to 0.9.3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qlandkartegt/F-9/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	23 Dec 2008 17:50:28 -0000	1.5
+++ .cvsignore	2 Jan 2009 09:19:24 -0000	1.6
@@ -1 +1 @@
-QLandkarteGT.0.9.2.tar.gz
+QLandkarteGT.0.9.3.tar.gz


Index: qlandkartegt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qlandkartegt/F-9/qlandkartegt.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- qlandkartegt.spec	23 Dec 2008 17:50:29 -0000	1.4
+++ qlandkartegt.spec	2 Jan 2009 09:19:24 -0000	1.5
@@ -1,8 +1,8 @@
 %define cap_name QLandkarteGT
-%define rel_date 2008.12.23
+%define rel_date 2009.01.01
 
 Name: qlandkartegt
-Version: 0.9.2
+Version: 0.9.3
 Release: 1%{?dist}
 Summary: GPS device mapping tool
 
@@ -68,6 +68,9 @@
 
 
 %changelog
+* Fri Jan  2 2009 Dan Horak <dan[at]danny.cz> 0.9.3-1
+- update to 0.9.3
+
 * Tue Dec 23 2008 Dan Horak <dan[at]danny.cz> 0.9.2-1
 - update to 0.9.2
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qlandkartegt/F-9/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	23 Dec 2008 17:50:29 -0000	1.5
+++ sources	2 Jan 2009 09:19:24 -0000	1.6
@@ -1 +1 @@
-b2840ac89a8c46fe6177ecf80c9c635d  QLandkarteGT.0.9.2.tar.gz
+6cd5e909812ffea3f2bb0ecdaeb095aa  QLandkarteGT.0.9.3.tar.gz



From iarnell at fedoraproject.org  Fri Jan  2 09:43:04 2009
From: iarnell at fedoraproject.org (Iain Arnell)
Date: Fri,  2 Jan 2009 09:43:04 +0000 (UTC)
Subject: rpms/vim-perl-support/devel perl-input.patch, NONE, 1.1 sources, 1.2,
	1.3 vim-perl-support.spec, 1.1, 1.2
Message-ID: <20090102094304.2D26A70130@cvs1.fedora.phx.redhat.com>

Author: iarnell

Update of /cvs/pkgs/rpms/vim-perl-support/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19249

Modified Files:
	sources vim-perl-support.spec 
Added Files:
	perl-input.patch 
Log Message:
* Fri Jan 02 2009 Iain Arnell <iarnell at gmail.com> 4.0-1
- update to 4.0:
 + Completely new template system. Most menu items now user definable.
 + Plugin split into autoloadable modules (makes Vim startup faster).
 + Submenus for perlcritic severity and verbosity.
 In consequence there are some obsolete files and global variables, and some
 new files and hotkeys.
- fix bug in Perl_Input function


perl-input.patch:

--- NEW FILE perl-input.patch ---
diff -up vim-perl-support-4.0/plugin/perl-support.vim.orig vim-perl-support-4.0/plugin/perl-support.vim
--- vim-perl-support-4.0/plugin/perl-support.vim.orig	2008-12-11 20:32:15.000000000 +0100
+++ vim-perl-support-4.0/plugin/perl-support.vim	2009-01-02 10:21:22.000000000 +0100
@@ -252,7 +252,7 @@ let s:MsgInsNotAvail	= "insertion not av
 function! Perl_Input ( promp, text, ... )
 	echohl Search																					" highlight prompt
 	call inputsave()																			" preserve typeahead
-	if a:0 == 0
+	if a:0 == 0 || a:1 == ''
 		let retval	=input( a:promp, a:text )
 	else
 		let retval	=input( a:promp, a:text, a:1 )


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/vim-perl-support/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	4 Dec 2008 16:27:04 -0000	1.2
+++ sources	2 Jan 2009 09:42:33 -0000	1.3
@@ -1 +1 @@
-aa23b91d3487dd593b64114189b29a28  perl-support.zip
+a862a2a0359a35bad676e60dc94f6779  perl-support.zip


Index: vim-perl-support.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vim-perl-support/devel/vim-perl-support.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- vim-perl-support.spec	4 Dec 2008 16:27:04 -0000	1.1
+++ vim-perl-support.spec	2 Jan 2009 09:42:33 -0000	1.2
@@ -1,5 +1,5 @@
 Name:           vim-perl-support
-Version:        3.9.1
+Version:        4.0
 Release:        1%{?dist}
 Summary:        Perl-IDE for VIM
 
@@ -7,10 +7,13 @@
 # according to plugin/perl-support.vim
 License:        GPLv2
 URL:            http://www.vim.org/scripts/script.php?script_id=556
-# curl -o perl-support.zip 'http://www.vim.org/scripts/download_script.php?src_id=9578'
+# curl -o perl-support.zip 'http://www.vim.org/scripts/download_script.php?src_id=9701'
 Source0:        perl-support.zip
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
+# reported to VIM-Plugins-List
+Patch0:         perl-input.patch
+
 BuildArch:      noarch
 
 Requires:         vim-enhanced
@@ -47,6 +50,7 @@
 
 %prep
 %setup -q -c
+%patch0 -p 1 -b .orig
 
 # strip out false provides/requires from codesnippets
 cat << \EOF > %{name}-prov
@@ -72,6 +76,8 @@
 
 %install
 rm -rf %{buildroot}
+install -m 755 -d %{buildroot}%{vimfiles}/autoload
+install -m 644 -p autoload/*.vim %{buildroot}%{vimfiles}/autoload
 install -m 755 -d %{buildroot}%{vimfiles}/doc
 install -m 644 -p doc/*.txt %{buildroot}%{vimfiles}/doc
 install -m 755 -d %{buildroot}%{vimfiles}/ftplugin
@@ -121,11 +127,21 @@
 %defattr(-,root,root,-)
 %doc README.perlsupport perl-support/doc/* perl-support/rc
 %{vimfiles}/perl-support
+%{vimfiles}/autoload/*.vim
 %{vimfiles}/doc/perlsupport.txt
 %{vimfiles}/ftplugin/perl.vim
 %{vimfiles}/plugin/perl-support.vim
 
 
 %changelog
+* Fri Jan 02 2009 Iain Arnell <iarnell at gmail.com> 4.0-1
+- update to 4.0:
+ + Completely new template system. Most menu items now user definable.
+ + Plugin split into autoloadable modules (makes Vim startup faster).
+ + Submenus for perlcritic severity and verbosity.
+ In consequence there are some obsolete files and global variables, and some
+ new files and hotkeys.
+- fix bug in Perl_Input function
+
 * Fri Nov 28 2008 Iain Arnell <iarnell at gmail.com> 3.9.1-1
 - create vim-perl-support



From akahl at fedoraproject.org  Fri Jan  2 11:06:31 2009
From: akahl at fedoraproject.org (Alexander Kahl)
Date: Fri,  2 Jan 2009 11:06:31 +0000 (UTC)
Subject: rpms/php-ZendFramework/devel php-ZendFramework.spec,1.7,1.8
Message-ID: <20090102110631.261BB70130@cvs1.fedora.phx.redhat.com>

Author: akahl

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

Modified Files:
	php-ZendFramework.spec 
Log Message:
* -2: Fixed Bug 477440



Index: php-ZendFramework.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php-ZendFramework/devel/php-ZendFramework.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- php-ZendFramework.spec	2 Jan 2009 09:18:32 -0000	1.7
+++ php-ZendFramework.spec	2 Jan 2009 11:06:00 -0000	1.8
@@ -3,7 +3,7 @@
 Summary:         Leading open-source PHP framework
 Name:            php-ZendFramework
 Version:         1.7.2
-Release:         1%{?dist}
+Release:         2%{?dist}
 
 License:         BSD
 Group:           Development/Libraries
@@ -31,9 +31,9 @@
 Requires: php-Fileinfo
 Requires: php-pdo
 Requires: php-xml
+Requires: bitstream-vera-fonts
 BuildRequires: symlinks
 
-
 %description
 Extending the art & spirit of PHP, Zend Framework is based on simplicity,
 object-oriented best practices, corporate friendly licensing, and a rigorously
@@ -58,6 +58,7 @@
 Group:    Development/Libraries
 Requires: %{name} = %{version}-%{release}
 Requires: php-pear(pear.phpunit.de/PHPUnit) >= 3.0.0
+Requires: bitstream-vera-fonts
 
 %description tests
 This package includes Zend Framework unit tests for all available subpackages.
@@ -300,6 +301,22 @@
 symlinks -c $RPM_BUILD_ROOT%{_bindir} > /dev/null
 cd ..
 
+
+# Bug 477440
+%{__mkdir_p} $RPM_BUILD_ROOT%{_datadir}/fonts/bitstream-vera
+
+cd $RPM_BUILD_ROOT%{_datadir}/php/Zend/tests/Zend/Pdf/_fonts
+%{__rm} -f *.ttf
+
+for file in /usr/share/fonts/bitstream-vera/*.ttf
+do
+  touch $RPM_BUILD_ROOT${file}
+done
+%{__ln_s} $RPM_BUILD_ROOT%{_datadir}/fonts/bitstream-vera/* .
+symlinks -c . > /dev/null
+%{__rm} -rf $RPM_BUILD_ROOT%{_datadir}/fonts
+
+
 %clean
 %{__rm} -rf $RPM_BUILD_ROOT
 
@@ -436,6 +453,9 @@
 
 
 %changelog
+* Fri Jan  2 2009 Alexander Kahl <akahl at iconmobile.com> - 1.7.2-2
+- Bug 477440: Use Vera fonts from Fedora's package
+
 * Fri Jan  2 2009 Alexander Kahl <akahl at iconmobile.com> - 1.7.2-1
 - update to 1.7.2
 - ZendX documentation doesn't need regeneration anymore, removed deps



From jorton at fedoraproject.org  Fri Jan  2 11:08:04 2009
From: jorton at fedoraproject.org (Joe Orton)
Date: Fri,  2 Jan 2009 11:08:04 +0000 (UTC)
Subject: rpms/apr/devel apr.spec,1.79,1.80
Message-ID: <20090102110804.3452D70130@cvs1.fedora.phx.redhat.com>

Author: jorton

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

Modified Files:
	apr.spec 
Log Message:
* Fri Jan  2 2009 Joe Orton <jorton at redhat.com> 1.3.3
- rebuild



Index: apr.spec
===================================================================
RCS file: /cvs/extras/rpms/apr/devel/apr.spec,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- apr.spec	23 Aug 2008 01:42:59 -0000	1.79
+++ apr.spec	2 Jan 2009 11:07:33 -0000	1.80
@@ -6,7 +6,7 @@
 Summary: Apache Portable Runtime library
 Name: apr
 Version: 1.3.3
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: ASL 2.0
 Group: System Environment/Libraries
 URL: http://apr.apache.org/
@@ -121,6 +121,9 @@
 %{_datadir}/aclocal/*.m4
 
 %changelog
+* Fri Jan  2 2009 Joe Orton <jorton at redhat.com> 1.3.3
+- rebuild
+
 * Sat Aug 16 2008 Bojan Smojver <bojan at rexursive.com> - 1.3.3-1
 - bump up to 1.3.3
 



From thm at fedoraproject.org  Fri Jan  2 11:24:45 2009
From: thm at fedoraproject.org (Thomas Moschny)
Date: Fri,  2 Jan 2009 11:24:45 +0000 (UTC)
Subject: rpms/ikiwiki/devel ikiwiki-2.72-libexecdir.patch, NONE,
	1.1 .cvsignore, 
	1.11, 1.12 ikiwiki.spec, 1.12, 1.13 import.log, 1.11,
	1.12 sources, 1.11, 1.12 ikiwiki-2.70-libexecdir.patch, 1.1,
	NONE ikiwiki-2.70-mtn.patch, 1.1, NONE
Message-ID: <20090102112446.1A6AE70130@cvs1.fedora.phx.redhat.com>

Author: thm

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

Modified Files:
	.cvsignore ikiwiki.spec import.log sources 
Added Files:
	ikiwiki-2.72-libexecdir.patch 
Removed Files:
	ikiwiki-2.70-libexecdir.patch ikiwiki-2.70-mtn.patch 
Log Message:
Update to 2.72, plus some specfile fixes.


ikiwiki-2.72-libexecdir.patch:

--- NEW FILE ikiwiki-2.72-libexecdir.patch ---
diff -up ikiwiki/IkiWiki.pm.orig ikiwiki/IkiWiki.pm
--- ikiwiki/IkiWiki.pm.orig	2008-12-28 21:00:37.000000000 +0100
+++ ikiwiki/IkiWiki.pm	2009-01-02 12:16:43.000000000 +0100
@@ -547,7 +547,7 @@ sub loadplugin ($) {
 	return if grep { $_ eq $plugin} @{$config{disable_plugins}};
 
 	foreach my $dir (defined $config{libdir} ? possibly_foolish_untaint($config{libdir}) : undef,
-	                 "$installdir/lib/ikiwiki") {
+	                 "$installdir/libexec/ikiwiki") {
 		if (defined $dir && -x "$dir/plugins/$plugin") {
 			eval { require IkiWiki::Plugin::external };
 			if ($@) {


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ikiwiki/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	20 Nov 2008 21:20:00 -0000	1.11
+++ .cvsignore	2 Jan 2009 11:24:13 -0000	1.12
@@ -1 +1 @@
-ikiwiki_2.70.tar.gz
+ikiwiki_2.72.tar.gz


Index: ikiwiki.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ikiwiki/devel/ikiwiki.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- ikiwiki.spec	19 Dec 2008 15:38:44 -0000	1.12
+++ ikiwiki.spec	2 Jan 2009 11:24:14 -0000	1.13
@@ -1,14 +1,13 @@
 Name:           ikiwiki
-Version:        2.70
-Release:        3%{?dist}
+Version:        2.72
+Release:        1%{?dist}
 Summary:        A wiki compiler
 
 Group:          Applications/Internet
 License:        GPLv2+
 URL:            http://ikiwiki.info/
 Source0:        http://ftp.debian.org/debian/pool/main/i/%{name}/%{name}_%{version}.tar.gz
-Patch0:         ikiwiki-2.70-libexecdir.patch
-Patch1:         ikiwiki-2.70-mtn.patch
+Patch0:         ikiwiki-2.72-libexecdir.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
@@ -50,7 +49,6 @@
 %prep
 %setup0 -q -n %{name}
 %patch0 -p1 -b .libexecdir
-%patch1 -p1
 
 # Filter unwanted Provides:
 %{__cat} << \EOF > %{name}-prov
@@ -88,26 +86,14 @@
 
 %install
 %{__rm} -rf %{buildroot}
-%{__make} pure_install DESTDIR=%{buildroot}
+%{__make} pure_install DESTDIR=%{buildroot} W3M_CGI_BIN=%{cgi_bin}
 %find_lang %{name}
 
-# cgi script is wrongly installed in a fixed place
-%{__mkdir_p} %{buildroot}%{cgi_bin}
-%{__mv} %{buildroot}%{_prefix}/lib/w3m/cgi-bin/ikiwiki-w3m.cgi \
-        %{buildroot}%{cgi_bin}
-
 # move external plugins
 %{__mkdir_p} %{buildroot}%{_libexecdir}/ikiwiki/plugins
 %{__mv} %{buildroot}%{_prefix}/lib/ikiwiki/plugins/* \
         %{buildroot}%{_libexecdir}/ikiwiki/plugins
 
-# fix encoding
-iconv -f iso-8859-9 -t utf-8 \
-      html/tips/vim_syntax_highlighting/ikiwiki.vim \
-      -o html/tips/vim_syntax_highlighting/ikiwiki.vim.tmp
-%{__mv} html/tips/vim_syntax_highlighting/ikiwiki.vim.tmp \
-        html/tips/vim_syntax_highlighting/ikiwiki.vim
-
 # remove shebang
 %{__sed} -e '1{/^#!/d}' -i \
         %{buildroot}%{_sysconfdir}/ikiwiki/auto.setup
@@ -157,6 +143,12 @@
 
 
 %changelog
+* Fri Jan  2 2009 Thomas Moschny <thomas.moschny at gmx.de> - 2.72-1
+- Update to 2.72.
+- Patch for mtn plugin has been applied upstream.
+- Encoding of ikiwiki.vim has been changed to utf-8 upstream.
+- Use new W3M_CGI_BIN option in %%install.
+
 * Tue Dec 16 2008 Thomas Moschny <thomas.moschny at gmx.de> - 2.70-3
 - Patch for monotone plugin: Prevent broken pipe message.
 - Cosmetic changes to satisfy rpmlint.


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/ikiwiki/devel/import.log,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- import.log	19 Dec 2008 15:38:44 -0000	1.11
+++ import.log	2 Jan 2009 11:24:14 -0000	1.12
@@ -9,3 +9,4 @@
 ikiwiki-2_64-1_fc9:HEAD:ikiwiki-2.64-1.fc9.src.rpm:1221813107
 ikiwiki-2_70-1_fc9:HEAD:ikiwiki-2.70-1.fc9.src.rpm:1227214126
 ikiwiki-2_70-3_fc10:HEAD:ikiwiki-2.70-3.fc10.src.rpm:1229701030
+ikiwiki-2_72-1_fc10:HEAD:ikiwiki-2.72-1.fc10.src.rpm:1230895370


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ikiwiki/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	20 Nov 2008 21:20:00 -0000	1.11
+++ sources	2 Jan 2009 11:24:14 -0000	1.12
@@ -1 +1 @@
-43d9dc1a5e03e38dd829cd4d4a38eeb4  ikiwiki_2.70.tar.gz
+5bebbd85c2ad80ed9c8d730ba4f91e1a  ikiwiki_2.72.tar.gz


--- ikiwiki-2.70-libexecdir.patch DELETED ---


--- ikiwiki-2.70-mtn.patch DELETED ---



From jreznik at fedoraproject.org  Fri Jan  2 11:26:08 2009
From: jreznik at fedoraproject.org (Jaroslav Reznik)
Date: Fri,  2 Jan 2009 11:26:08 +0000 (UTC)
Subject: rpms/kde-plasma-runcommand/devel .cvsignore, 1.4,
	1.5 kde-plasma-runcommand.spec, 1.4, 1.5 sources, 1.4, 1.5
Message-ID: <20090102112608.B7B9C70130@cvs1.fedora.phx.redhat.com>

Author: jreznik

Update of /cvs/pkgs/rpms/kde-plasma-runcommand/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16566

Modified Files:
	.cvsignore kde-plasma-runcommand.spec sources 
Log Message:
> * Fri Jan 02 2009 Jaroslav Reznik <jreznik at redhat.com> 0.9-1
> - update to 0.9



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-runcommand/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	19 Nov 2008 08:14:41 -0000	1.4
+++ .cvsignore	2 Jan 2009 11:25:38 -0000	1.5
@@ -1 +1 @@
-91495-runcommand_0.7.tar.bz2
+91495-runcommand_0.9.tar.bz2


Index: kde-plasma-runcommand.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-runcommand/devel/kde-plasma-runcommand.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- kde-plasma-runcommand.spec	2 Dec 2008 12:12:54 -0000	1.4
+++ kde-plasma-runcommand.spec	2 Jan 2009 11:25:38 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           kde-plasma-runcommand
-Version:        0.7
-Release:        2%{?dist}
+Version:        0.9
+Release:        1%{?dist}
 Summary:        Simple plasmoid to run commands without using terminal or KRunner
 
 Group:          User Interface/Desktops
@@ -47,6 +47,9 @@
 %{_kde4_datadir}/kde4/services/plasma-applet-runcommand.desktop
 
 %changelog
+* Fri Jan 02 2009 Jaroslav Reznik <jreznik at redhat.com> 0.9-1
+- update to 0.9
+
 * Tue Dec 02 2008 Jaroslav Reznik <jreznik at redhat.com> 0.7-2
 - make VERBOSE=1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-runcommand/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	19 Nov 2008 08:14:41 -0000	1.4
+++ sources	2 Jan 2009 11:25:38 -0000	1.5
@@ -1 +1 @@
-44e0c9eb7accf8c9cf8ba27614566e8a  91495-runcommand_0.7.tar.bz2
+a98d6e3f32b85eae3f299c06cb8432f2  91495-runcommand_0.9.tar.bz2



From akahl at fedoraproject.org  Fri Jan  2 11:30:43 2009
From: akahl at fedoraproject.org (Alexander Kahl)
Date: Fri,  2 Jan 2009 11:30:43 +0000 (UTC)
Subject: rpms/php-ZendFramework/devel php-ZendFramework.spec,1.8,1.9
Message-ID: <20090102113043.C798270130@cvs1.fedora.phx.redhat.com>

Author: akahl

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

Modified Files:
	php-ZendFramework.spec 
Log Message:
* -3: requires oops



Index: php-ZendFramework.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php-ZendFramework/devel/php-ZendFramework.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- php-ZendFramework.spec	2 Jan 2009 11:06:00 -0000	1.8
+++ php-ZendFramework.spec	2 Jan 2009 11:30:13 -0000	1.9
@@ -3,7 +3,7 @@
 Summary:         Leading open-source PHP framework
 Name:            php-ZendFramework
 Version:         1.7.2
-Release:         2%{?dist}
+Release:         3%{?dist}
 
 License:         BSD
 Group:           Development/Libraries
@@ -31,7 +31,6 @@
 Requires: php-Fileinfo
 Requires: php-pdo
 Requires: php-xml
-Requires: bitstream-vera-fonts
 BuildRequires: symlinks
 
 %description
@@ -59,6 +58,7 @@
 Requires: %{name} = %{version}-%{release}
 Requires: php-pear(pear.phpunit.de/PHPUnit) >= 3.0.0
 Requires: bitstream-vera-fonts
+BuildRequires: bitstream-vera-fonts
 
 %description tests
 This package includes Zend Framework unit tests for all available subpackages.
@@ -453,6 +453,10 @@
 
 
 %changelog
+* Fri Jan  2 2009 Alexander Kahl <akahl at iconmobile.com> - 1.7.2-3
+- +BuildRequires: bitstream-vera-fonts
+- -Requires: bitstream-vera-fonts
+
 * Fri Jan  2 2009 Alexander Kahl <akahl at iconmobile.com> - 1.7.2-2
 - Bug 477440: Use Vera fonts from Fedora's package
 



From thm at fedoraproject.org  Fri Jan  2 11:32:57 2009
From: thm at fedoraproject.org (Thomas Moschny)
Date: Fri,  2 Jan 2009 11:32:57 +0000 (UTC)
Subject: rpms/ikiwiki/F-10 ikiwiki-2.72-libexecdir.patch, NONE,
	1.1 .cvsignore, 
	1.11, 1.12 ikiwiki.spec, 1.11, 1.12 import.log, 1.11,
	1.12 sources, 1.11, 1.12 ikiwiki-2.70-libexecdir.patch, 1.1,
	NONE ikiwiki-2.70-mtn.patch, 1.1, NONE
Message-ID: <20090102113258.04FC870130@cvs1.fedora.phx.redhat.com>

Author: thm

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

Modified Files:
	.cvsignore ikiwiki.spec import.log sources 
Added Files:
	ikiwiki-2.72-libexecdir.patch 
Removed Files:
	ikiwiki-2.70-libexecdir.patch ikiwiki-2.70-mtn.patch 
Log Message:
Update to 2.72, plus some specfile fixes.


ikiwiki-2.72-libexecdir.patch:

--- NEW FILE ikiwiki-2.72-libexecdir.patch ---
diff -up ikiwiki/IkiWiki.pm.orig ikiwiki/IkiWiki.pm
--- ikiwiki/IkiWiki.pm.orig	2008-12-28 21:00:37.000000000 +0100
+++ ikiwiki/IkiWiki.pm	2009-01-02 12:16:43.000000000 +0100
@@ -547,7 +547,7 @@ sub loadplugin ($) {
 	return if grep { $_ eq $plugin} @{$config{disable_plugins}};
 
 	foreach my $dir (defined $config{libdir} ? possibly_foolish_untaint($config{libdir}) : undef,
-	                 "$installdir/lib/ikiwiki") {
+	                 "$installdir/libexec/ikiwiki") {
 		if (defined $dir && -x "$dir/plugins/$plugin") {
 			eval { require IkiWiki::Plugin::external };
 			if ($@) {


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ikiwiki/F-10/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	20 Nov 2008 21:26:51 -0000	1.11
+++ .cvsignore	2 Jan 2009 11:32:26 -0000	1.12
@@ -1 +1 @@
-ikiwiki_2.70.tar.gz
+ikiwiki_2.72.tar.gz


Index: ikiwiki.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ikiwiki/F-10/ikiwiki.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ikiwiki.spec	19 Dec 2008 15:44:54 -0000	1.11
+++ ikiwiki.spec	2 Jan 2009 11:32:27 -0000	1.12
@@ -1,14 +1,13 @@
 Name:           ikiwiki
-Version:        2.70
-Release:        3%{?dist}
+Version:        2.72
+Release:        1%{?dist}
 Summary:        A wiki compiler
 
 Group:          Applications/Internet
 License:        GPLv2+
 URL:            http://ikiwiki.info/
 Source0:        http://ftp.debian.org/debian/pool/main/i/%{name}/%{name}_%{version}.tar.gz
-Patch0:         ikiwiki-2.70-libexecdir.patch
-Patch1:         ikiwiki-2.70-mtn.patch
+Patch0:         ikiwiki-2.72-libexecdir.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
@@ -50,7 +49,6 @@
 %prep
 %setup0 -q -n %{name}
 %patch0 -p1 -b .libexecdir
-%patch1 -p1
 
 # Filter unwanted Provides:
 %{__cat} << \EOF > %{name}-prov
@@ -88,26 +86,14 @@
 
 %install
 %{__rm} -rf %{buildroot}
-%{__make} pure_install DESTDIR=%{buildroot}
+%{__make} pure_install DESTDIR=%{buildroot} W3M_CGI_BIN=%{cgi_bin}
 %find_lang %{name}
 
-# cgi script is wrongly installed in a fixed place
-%{__mkdir_p} %{buildroot}%{cgi_bin}
-%{__mv} %{buildroot}%{_prefix}/lib/w3m/cgi-bin/ikiwiki-w3m.cgi \
-        %{buildroot}%{cgi_bin}
-
 # move external plugins
 %{__mkdir_p} %{buildroot}%{_libexecdir}/ikiwiki/plugins
 %{__mv} %{buildroot}%{_prefix}/lib/ikiwiki/plugins/* \
         %{buildroot}%{_libexecdir}/ikiwiki/plugins
 
-# fix encoding
-iconv -f iso-8859-9 -t utf-8 \
-      html/tips/vim_syntax_highlighting/ikiwiki.vim \
-      -o html/tips/vim_syntax_highlighting/ikiwiki.vim.tmp
-%{__mv} html/tips/vim_syntax_highlighting/ikiwiki.vim.tmp \
-        html/tips/vim_syntax_highlighting/ikiwiki.vim
-
 # remove shebang
 %{__sed} -e '1{/^#!/d}' -i \
         %{buildroot}%{_sysconfdir}/ikiwiki/auto.setup
@@ -157,6 +143,12 @@
 
 
 %changelog
+* Fri Jan  2 2009 Thomas Moschny <thomas.moschny at gmx.de> - 2.72-1
+- Update to 2.72.
+- Patch for mtn plugin has been applied upstream.
+- Encoding of ikiwiki.vim has been changed to utf-8 upstream.
+- Use new W3M_CGI_BIN option in %%install.
+
 * Tue Dec 16 2008 Thomas Moschny <thomas.moschny at gmx.de> - 2.70-3
 - Patch for monotone plugin: Prevent broken pipe message.
 - Cosmetic changes to satisfy rpmlint.


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/ikiwiki/F-10/import.log,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- import.log	19 Dec 2008 15:44:54 -0000	1.11
+++ import.log	2 Jan 2009 11:32:27 -0000	1.12
@@ -9,3 +9,4 @@
 ikiwiki-2_64-1_fc9:HEAD:ikiwiki-2.64-1.fc9.src.rpm:1221813107
 ikiwiki-2_70-1_fc9:F-10:ikiwiki-2.70-1.fc9.src.rpm:1227216329
 ikiwiki-2_70-3_fc10:F-10:ikiwiki-2.70-3.fc10.src.rpm:1229701432
+ikiwiki-2_72-1_fc10:F-10:ikiwiki-2.72-1.fc10.src.rpm:1230895904


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ikiwiki/F-10/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	20 Nov 2008 21:26:51 -0000	1.11
+++ sources	2 Jan 2009 11:32:27 -0000	1.12
@@ -1 +1 @@
-43d9dc1a5e03e38dd829cd4d4a38eeb4  ikiwiki_2.70.tar.gz
+5bebbd85c2ad80ed9c8d730ba4f91e1a  ikiwiki_2.72.tar.gz


--- ikiwiki-2.70-libexecdir.patch DELETED ---


--- ikiwiki-2.70-mtn.patch DELETED ---



From akahl at fedoraproject.org  Fri Jan  2 11:37:55 2009
From: akahl at fedoraproject.org (Alexander Kahl)
Date: Fri,  2 Jan 2009 11:37:55 +0000 (UTC)
Subject: rpms/php-ZendFramework/F-10 php-ZendFramework.spec, 1.6, 1.7 sources,
	1.5, 1.6
Message-ID: <20090102113755.EA71370130@cvs1.fedora.phx.redhat.com>

Author: akahl

Update of /cvs/pkgs/rpms/php-ZendFramework/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18965

Modified Files:
	php-ZendFramework.spec sources 
Log Message:
* update to 1.7.2



Index: php-ZendFramework.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php-ZendFramework/F-10/php-ZendFramework.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- php-ZendFramework.spec	20 Nov 2008 09:39:30 -0000	1.6
+++ php-ZendFramework.spec	2 Jan 2009 11:37:25 -0000	1.7
@@ -2,8 +2,8 @@
 
 Summary:         Leading open-source PHP framework
 Name:            php-ZendFramework
-Version:         1.7.0
-Release:         2%{?dist}
+Version:         1.7.2
+Release:         1%{?dist}
 
 License:         BSD
 Group:           Development/Libraries
@@ -33,12 +33,6 @@
 Requires: php-xml
 BuildRequires: symlinks
 
-# For ZendX documentation
-BuildRequires: autoconf, make
-BuildRequires: libxslt, libxml2
-BuildRequires: docbook-style-xsl
-
-
 %description
 Extending the art & spirit of PHP, Zend Framework is based on simplicity,
 object-oriented best practices, corporate friendly licensing, and a rigorously
@@ -63,6 +57,8 @@
 Group:    Development/Libraries
 Requires: %{name} = %{version}-%{release}
 Requires: php-pear(pear.phpunit.de/PHPUnit) >= 3.0.0
+Requires: bitstream-vera-fonts
+BuildRequires: bitstream-vera-fonts
 
 %description tests
 This package includes Zend Framework unit tests for all available subpackages.
@@ -276,12 +272,6 @@
 
 %{__cat} executables valid_executables|sort|uniq -u > invalid_executables
 
-cd extras/documentation/manual/en
-%{__autoconf}
-%configure --with-xsltproc="$(which xsltproc) --path \
-           '%{_datadir}/sgml/docbook/xsl-stylesheets/htmlhelp' --nonet"
-%{__make} %{?_smp_mflags}
-cd ../../../..
 
 %install
 %{__rm} -rf $RPM_BUILD_ROOT
@@ -311,6 +301,22 @@
 # symlinks -c $RPM_BUILD_ROOT%{_bindir} > /dev/null
 # cd ..
 
+
+# Bug 477440
+%{__mkdir_p} $RPM_BUILD_ROOT%{_datadir}/fonts/bitstream-vera
+
+cd $RPM_BUILD_ROOT%{_datadir}/php/Zend/tests/Zend/Pdf/_fonts
+%{__rm} -f *.ttf
+
+for file in /usr/share/fonts/bitstream-vera/*.ttf
+do
+  touch $RPM_BUILD_ROOT${file}
+done
+%{__ln_s} $RPM_BUILD_ROOT%{_datadir}/fonts/bitstream-vera/* .
+symlinks -c . > /dev/null
+%{__rm} -rf $RPM_BUILD_ROOT%{_datadir}/fonts
+
+
 %clean
 %{__rm} -rf $RPM_BUILD_ROOT
 
@@ -372,7 +378,7 @@
 %files extras
 %defattr(-,root,root,-)
 %{_datadir}/php/ZendX
-%doc LICENSE.txt extras/documentation/manual/en/html/*
+%doc LICENSE.txt extras/documentation/api/extras/*
 
 %files Cache-Backend-Apc
 %defattr(-,root,root,-)
@@ -447,7 +453,12 @@
 
 
 %changelog
-* Thu Nov 20 2008 Alexander Kahl <akahl at iconmobile.com> - 1.7.0-1
+* Fri Jan  2 2009 Alexander Kahl <akahl at iconmobile.com> - 1.7.2-1
+- update to 1.7.2
+- ZendX documentation doesn't need regeneration anymore, removed deps
+- Bug 477440: Use Vera fonts from Fedora's package
+
+* Thu Nov 20 2008 Alexander Kahl <akahl at iconmobile.com> - 1.7.0-2
 - bump, forgot internal docbook fix from rawhide build
 
 * Tue Nov 18 2008 Alexander Kahl <akahl at iconmobile.com> - 1.7.0-1


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-ZendFramework/F-10/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	20 Nov 2008 09:29:19 -0000	1.5
+++ sources	2 Jan 2009 11:37:25 -0000	1.6
@@ -1 +1 @@
-423629a9be793d3b6df352913f8c1401  ZendFramework-1.7.0.tar.gz
+7bc33a0ed379f30ab408ecd546025a1b  ZendFramework-1.7.2.tar.gz



From jnovy at fedoraproject.org  Fri Jan  2 11:38:32 2009
From: jnovy at fedoraproject.org (Jindrich Novy)
Date: Fri,  2 Jan 2009 11:38:32 +0000 (UTC)
Subject: rpms/latex2html/devel .cvsignore, 1.4, 1.5 cfgcache.pm, 1.2,
	1.3 latex2html.spec, 1.10, 1.11 sources, 1.4, 1.5
Message-ID: <20090102113832.A1C1470130@cvs1.fedora.phx.redhat.com>

Author: jnovy

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

Modified Files:
	.cvsignore cfgcache.pm latex2html.spec sources 
Log Message:
* Fri Jan 02 2009 Jindrich Novy <jnovy at redhat.com> 2008
- update to latex2html-2008
- license changed to GPL
- update japanese support to l2h-2K8-jp20081220
- update cfgcache.pm
- fix BR



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/latex2html/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	27 Jun 2006 07:33:52 -0000	1.4
+++ .cvsignore	2 Jan 2009 11:38:01 -0000	1.5
@@ -1,6 +1,3 @@
-l2h-2002-2-1+jp2.0.patch.gz
-latex2html-2002-2-1.tar.bz2
-latex2html-manpages.tar.bz2
-latex2html-2002-2-1.tar.gz
-l2h-2K2-2-1+jp2.1b1.6.patch.gz
+latex2html-2008.tar.gz
+l2h-2K8-jp20081220.tar.gz
 latex2html-manpages.tar.gz


Index: cfgcache.pm
===================================================================
RCS file: /cvs/pkgs/rpms/latex2html/devel/cfgcache.pm,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- cfgcache.pm	24 Nov 2005 15:33:08 -0000	1.2
+++ cfgcache.pm	2 Jan 2009 11:38:01 -0000	1.3
@@ -11,10 +11,13 @@
 @ISA = qw(Exporter);
 @EXPORT = qw(%cfg);
 
+$cfg{'ANYTOPNM'} = q'/usr/bin/anytopnm';
 $cfg{'BINDIR'} = q'/usr/bin';
+$cfg{'BMPTOPPM'} = q'/usr/bin/bmptoppm';
 $cfg{'CRAYOLAFILE'} = q'/usr/share/latex2html/styles/crayola.txt';
 $cfg{'DVIPS'} = q'/usr/bin/dvips';
 $cfg{'DVIPSOPT'} = q' -E';
+$cfg{'GIFTOPNM'} = q'/usr/bin/giftopnm';
 $cfg{'GS'} = q'/usr/bin/gs';
 $cfg{'GSALIASDEVICE'} = q'ppmraw';
 $cfg{'GSDEVICE'} = q'pnmraw';
@@ -23,40 +26,58 @@
 $cfg{'HASHBANG'} = q'1';
 $cfg{'HTML_VALIDATOR'} = q'';
 $cfg{'ICONPATH'} = q'file:/usr/share/latex2html/icons';
+$cfg{'ICONSERVER'} = q'';
 $cfg{'ICONSTORAGE'} = q'';
 $cfg{'IMAGE_TYPES'} = q'png gif';
 $cfg{'INITEX'} = q'/usr/bin/initex';
+$cfg{'JPEGTOPNM'} = q'/usr/bin/jpegtopnm';
 $cfg{'KPSEWHICH'} = q'/usr/bin/kpsewhich';
 $cfg{'LATEX'} = q'/usr/bin/latex';
 $cfg{'LATEX2HTMLDIR'} = q'/usr/share/latex2html';
+$cfg{'LATEX2HTMLPLATDIR'} = q'/usr/share/latex2html';
 $cfg{'LIBDIR'} = q'/usr/share/latex2html';
 $cfg{'METADPI'} = q'0';
 $cfg{'METAMODE'} = q'';
 $cfg{'MKTEXLSR'} = q'/usr/bin/mktexlsr';
 $cfg{'NULLFILE'} = q'/dev/null';
 $cfg{'PBMMAKE'} = q'/usr/bin/pbmmake';
+$cfg{'PCXTOPPM'} = q'/usr/bin/pcxtoppm';
 $cfg{'PERL'} = q'/usr/bin/perl';
 $cfg{'PERLFOOTER'} = q'';
 $cfg{'PERLHEADER'} = <<'EOQ';
 #! /usr/bin/perl -w
 EOQ
 $cfg{'PERLSCRIPTDIR'} = q'/usr/bin';
+$cfg{'PICTTOPPM'} = q'';
 $cfg{'PK_GENERATION'} = q'0';
+$cfg{'PNGTOPNM'} = q'/usr/bin/pngtopnm';
+$cfg{'PNMBLACK'} = q'';
 $cfg{'PNMCAT'} = q'/usr/bin/pnmcat';
 $cfg{'PNMCROP'} = q'/usr/bin/pnmcrop';
+$cfg{'PNMCROPOPT'} = q' -sides ';
+$cfg{'PNMCUT'} = q'/usr/bin/pnmcut';
 $cfg{'PNMFILE'} = q'/usr/bin/pnmfile';
 $cfg{'PNMFLIP'} = q'/usr/bin/pnmflip';
+$cfg{'PNMPAD'} = q'/usr/bin/pnmpad';
+$cfg{'PNMROTATE'} = q'/usr/bin/pnmrotate';
+$cfg{'PNMSCALE'} = q'/usr/bin/pnmscale';
 $cfg{'PNMTOPNG'} = q'/usr/bin/pnmtopng';
 $cfg{'PPMQUANT'} = q'/usr/bin/ppmquant';
 $cfg{'PPMTOGIF'} = q'/usr/bin/ppmtogif';
+$cfg{'PPMTOJPEG'} = q'/usr/bin/ppmtojpeg';
 $cfg{'PREFIX'} = q'/usr';
 $cfg{'RGBCOLORFILE'} = q'/usr/share/X11/rgb.txt';
+$cfg{'SGITOPNM'} = q'/usr/bin/sgitopnm';
+$cfg{'SHLIBDIR'} = q'/usr/share/latex2html';
 $cfg{'TEX'} = q'/usr/bin/tex';
 $cfg{'TEXPATH'} = q'/usr/share/texmf/tex/latex/html';
+$cfg{'TIFFTOPNM'} = q'/usr/bin/tifftopnm';
 $cfg{'TMPSPACE'} = q'/tmp';
 $cfg{'WEB2C'} = q'1';
+$cfg{'XBMTOPBM'} = q'/usr/bin/xbmtopbm';
+$cfg{'XWDTOPNM'} = q'/usr/bin/xwdtopnm';
 $cfg{'dd'} = q'/';
-$cfg{'distver'} = q'2K.1beta';
+$cfg{'distver'} = q'2008';
 $cfg{'exec_extension'} = q'';
 $cfg{'gif_interlace'} = q'netpbm';
 $cfg{'gif_trans'} = q'netpbm';
@@ -69,7 +90,7 @@
 $cfg{'plat'} = q'unix';
 $cfg{'scriptdir'} = q'/usr/bin';
 $cfg{'scriptext'} = q'';
-$cfg{'srcdir'} = q'/X/tetex/teTeX-1.0/latex2html-2K.1beta';
+$cfg{'srcdir'} = q'/X/latex2html-2008';
 $cfg{'texlive'} = q'0';
 $cfg{'wrapper'} = q'0';
 


Index: latex2html.spec
===================================================================
RCS file: /cvs/pkgs/rpms/latex2html/devel/latex2html.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- latex2html.spec	7 Jan 2008 09:39:35 -0000	1.10
+++ latex2html.spec	2 Jan 2009 11:38:02 -0000	1.11
@@ -1,30 +1,26 @@
 %define enable_japanese 1
-%define latex2html_ver	2002-2-1
 
 Summary: Converts LaTeX documents to HTML
 Name: latex2html
-Version: 2002.2.1
-Release: 8%{?dist}
-License: Free To Use But Restricted (See LICENSE)
+Version: 2008
+Release: 1%{?dist}
+License: GPLv2+
 Group: Applications/Publishing
 URL: http://www.latex2html.org/
-Source0: http://saftsack.fs.uni-bayreuth.de/~latex2ht/current/%{name}-%{latex2html_ver}.tar.gz
+# main latex2html source
+Source0: http://saftsack.fs.uni-bayreuth.de/~latex2ht/current/%{name}-%{version}.tar.gz
 Source1: cfgcache.pm
 Source2: %{name}-manpages.tar.gz
+# support for Japanese
+Source3: http://takeno.iee.niit.ac.jp/~shige/TeX/latex2html/current/data/l2h-2K8-jp20081220.tar.gz
 Patch0: latex2html-2K.1beta-tabularx.patch
 Patch1: teTeX-l2h-config.patch
 Patch3: latex2html-2K.1beta-DB.patch
 Patch4: latex2html-2002-2-1-SHLIB.patch
 Patch5: latex2html-2002-2-1-gsfont.patch
 Patch6: latex2html-2002.2.1-grayimg.patch
-
-###
-# Japanization patches
-###
-Patch100: http://takeno.iee.niit.ac.jp/~shige/TeX/latex2html/current/data/l2h-2K2-2-1+jp2.1b1.6.patch.gz
-
-Requires: tetex-latex, tetex-dvips
-BuildRequires: perl >= 5.003, ghostscript >= 4.03, netpbm >= 9.21, tetex-latex
+Requires: tex(latex), tex(dvips)
+BuildRequires: perl >= 5.003, ghostscript >= 4.03, netpbm >= 9.21, tex(latex)
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 
@@ -39,7 +35,7 @@
 %prep
 %setup -q -n %{name}-%{version} -c -a 0
 
-pushd %{name}-%{latex2html_ver}
+pushd %{name}-%{version}
 # patch latex2html to support tabularx environments better
 %patch0 -p1 -b .tabularx
 
@@ -62,21 +58,20 @@
 popd
 
 %if %{enable_japanese}
-cp -a %{name}-%{latex2html_ver} %{name}-%{latex2html_ver}JA
-pushd %{name}-%{latex2html_ver}JA
-# JA patches for latex2html.
-%patch100 -p1 -b .jp2
+cp -a %{name}-%{version} %{name}-%{version}JA
+pushd %{name}-%{version}JA
+tar fxz %{SOURCE3}
 popd
 %endif
 
-pushd %{name}-%{latex2html_ver}
+pushd %{name}-%{version}
 # don't generate gray images as output from latex2html
 # it's patched here to let the .jp2 patch be cleanly applied
 %patch6 -p1 -b .grayimg
 popd
 
 %build
-pushd %{name}-%{latex2html_ver}
+pushd %{name}-%{version}
 cp %{SOURCE1} cfgcache.pm
 tar fxz %{SOURCE2}
 
@@ -96,13 +91,13 @@
              --infodir=%{_infodir} \
 	     --shlibdir=%{_datadir}/latex2html \
 	     --with-texpath=%{_datadir}/texmf/tex/latex/html
- 
+
 perl -pi -e"s,/usr/(share/)?lib,%{_datadir}," cfgcache.pm
 make
 popd
 
 %if %{enable_japanese}
-pushd %{name}-%{latex2html_ver}JA
+pushd %{name}-%{version}JA
 sed s/latex2html/jlatex2html/g < %{SOURCE1} > cfgcache.pm
 perl -pi -e"s,/usr/bin/dvips,/usr/bin/pdvips," cfgcache.pm
 perl -pi -e"s,/usr/bin/latex,/usr/bin/platex," cfgcache.pm
@@ -140,7 +135,7 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 
-pushd %{name}-%{latex2html_ver}
+pushd %{name}-%{version}
 perl -pi -e"s,%{_prefix},${RPM_BUILD_ROOT}%{_prefix}," cfgcache.pm
 perl -pi -e"s,/.*\\\${dd}texexpand,%{_bindir}/texexpand,;
             s,/.*\\\${dd}pstoimg,%{_bindir}/pstoimg,;
@@ -164,7 +159,7 @@
 popd
 
 %if %{enable_japanese}
-pushd %{name}-%{latex2html_ver}JA
+pushd %{name}-%{version}JA
 perl -pi -e"s,%{_prefix},${RPM_BUILD_ROOT}%{_prefix}," cfgcache.pm
 perl -pi -e"s,latex2html pstoimg texexpand,jlatex2html jpstoimg jtexexpand," config/install.pl
 perl -pi -e"s,/.*\\\${dd}texexpand,%{_bindir}/jtexexpand,;
@@ -224,6 +219,13 @@
 %{_mandir}/man1/pstoimg.*
 
 %changelog
+* Fri Jan 02 2009 Jindrich Novy <jnovy at redhat.com> 2008
+- update to latex2html-2008
+- license changed to GPL
+- update japanese support to l2h-2K8-jp20081220
+- update cfgcache.pm
+- fix BR
+
 * Mon Jan 07 2008 Jindrich Novy <jnovy at redhat.com> 2002.2.1-8
 - fix post/postun scriptlets
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/latex2html/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	27 Jun 2006 07:33:52 -0000	1.4
+++ sources	2 Jan 2009 11:38:02 -0000	1.5
@@ -1,3 +1,3 @@
-a79cda0648c8721ab6df5020cd11e220  latex2html-2002-2-1.tar.gz
-a4f534ef3fc0e0e09a4ddb664beae487  l2h-2K2-2-1+jp2.1b1.6.patch.gz
+275ab6cfa8ca9328446b7f40d8dc302e  latex2html-2008.tar.gz
+7951e334e313a1a88946a1171c72e78f  l2h-2K8-jp20081220.tar.gz
 a27170c02c0f2bc3a524058711e339a4  latex2html-manpages.tar.gz



From jreznik at fedoraproject.org  Fri Jan  2 11:41:30 2009
From: jreznik at fedoraproject.org (Jaroslav Reznik)
Date: Fri,  2 Jan 2009 11:41:30 +0000 (UTC)
Subject: rpms/kde-plasma-runcommand/F-9 .cvsignore, 1.3,
	1.4 kde-plasma-runcommand.spec, 1.2, 1.3 sources, 1.3, 1.4
Message-ID: <20090102114130.6435470130@cvs1.fedora.phx.redhat.com>

Author: jreznik

Update of /cvs/pkgs/rpms/kde-plasma-runcommand/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19561

Modified Files:
	.cvsignore kde-plasma-runcommand.spec sources 
Log Message:
* Fri Jan 02 2009 Jaroslav Reznik <jreznik at redhat.com> 0.9-1
- update to 0.9



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-runcommand/F-9/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	19 Nov 2008 08:24:13 -0000	1.3
+++ .cvsignore	2 Jan 2009 11:40:59 -0000	1.4
@@ -1 +1 @@
-91495-runcommand_0.7.tar.bz2
+91495-runcommand_0.9.tar.bz2


Index: kde-plasma-runcommand.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-runcommand/F-9/kde-plasma-runcommand.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- kde-plasma-runcommand.spec	19 Nov 2008 08:24:13 -0000	1.2
+++ kde-plasma-runcommand.spec	2 Jan 2009 11:40:59 -0000	1.3
@@ -1,5 +1,5 @@
 Name:           kde-plasma-runcommand
-Version:        0.7
+Version:        0.9
 Release:        1%{?dist}
 Summary:        Simple plasmoid to run commands without using terminal or KRunner
 
@@ -47,6 +47,9 @@
 %{_kde4_datadir}/kde4/services/plasma-applet-runcommand.desktop
 
 %changelog
+* Fri Jan 02 2009 Jaroslav Reznik <jreznik at redhat.com> 0.9-1
+- update to 0.9
+
 * Wed Nov 19 2008 Jaroslav Reznik <jreznik at redhat.com> 0.7-1
 - update to 0.7
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-runcommand/F-9/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	19 Nov 2008 08:24:13 -0000	1.3
+++ sources	2 Jan 2009 11:41:00 -0000	1.4
@@ -1 +1 @@
-44e0c9eb7accf8c9cf8ba27614566e8a  91495-runcommand_0.7.tar.bz2
+a98d6e3f32b85eae3f299c06cb8432f2  91495-runcommand_0.9.tar.bz2



From thm at fedoraproject.org  Fri Jan  2 11:46:26 2009
From: thm at fedoraproject.org (Thomas Moschny)
Date: Fri,  2 Jan 2009 11:46:26 +0000 (UTC)
Subject: rpms/ikiwiki/F-9 ikiwiki-2.72-libexecdir.patch, NONE, 1.1 .cvsignore,
	1.6, 1.7 ikiwiki.spec, 1.6, 1.7 import.log, 1.6, 1.7 sources,
	1.6, 1.7 ikiwiki-2.70-libexecdir.patch, 1.1,
	NONE ikiwiki-2.70-mtn.patch, 1.1, NONE
Message-ID: <20090102114626.65F7970130@cvs1.fedora.phx.redhat.com>

Author: thm

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

Modified Files:
	.cvsignore ikiwiki.spec import.log sources 
Added Files:
	ikiwiki-2.72-libexecdir.patch 
Removed Files:
	ikiwiki-2.70-libexecdir.patch ikiwiki-2.70-mtn.patch 
Log Message:
Update to 2.72, plus some specfile fixes.


ikiwiki-2.72-libexecdir.patch:

--- NEW FILE ikiwiki-2.72-libexecdir.patch ---
diff -up ikiwiki/IkiWiki.pm.orig ikiwiki/IkiWiki.pm
--- ikiwiki/IkiWiki.pm.orig	2008-12-28 21:00:37.000000000 +0100
+++ ikiwiki/IkiWiki.pm	2009-01-02 12:16:43.000000000 +0100
@@ -547,7 +547,7 @@ sub loadplugin ($) {
 	return if grep { $_ eq $plugin} @{$config{disable_plugins}};
 
 	foreach my $dir (defined $config{libdir} ? possibly_foolish_untaint($config{libdir}) : undef,
-	                 "$installdir/lib/ikiwiki") {
+	                 "$installdir/libexec/ikiwiki") {
 		if (defined $dir && -x "$dir/plugins/$plugin") {
 			eval { require IkiWiki::Plugin::external };
 			if ($@) {


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ikiwiki/F-9/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	20 Nov 2008 21:36:43 -0000	1.6
+++ .cvsignore	2 Jan 2009 11:45:54 -0000	1.7
@@ -1 +1 @@
-ikiwiki_2.70.tar.gz
+ikiwiki_2.72.tar.gz


Index: ikiwiki.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ikiwiki/F-9/ikiwiki.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ikiwiki.spec	19 Dec 2008 15:58:26 -0000	1.6
+++ ikiwiki.spec	2 Jan 2009 11:45:55 -0000	1.7
@@ -1,14 +1,13 @@
 Name:           ikiwiki
-Version:        2.70
-Release:        3%{?dist}
+Version:        2.72
+Release:        1%{?dist}
 Summary:        A wiki compiler
 
 Group:          Applications/Internet
 License:        GPLv2+
 URL:            http://ikiwiki.info/
 Source0:        http://ftp.debian.org/debian/pool/main/i/%{name}/%{name}_%{version}.tar.gz
-Patch0:         ikiwiki-2.70-libexecdir.patch
-Patch1:         ikiwiki-2.70-mtn.patch
+Patch0:         ikiwiki-2.72-libexecdir.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
@@ -50,7 +49,6 @@
 %prep
 %setup0 -q -n %{name}
 %patch0 -p1 -b .libexecdir
-%patch1 -p1
 
 # Filter unwanted Provides:
 %{__cat} << \EOF > %{name}-prov
@@ -88,26 +86,14 @@
 
 %install
 %{__rm} -rf %{buildroot}
-%{__make} pure_install DESTDIR=%{buildroot}
+%{__make} pure_install DESTDIR=%{buildroot} W3M_CGI_BIN=%{cgi_bin}
 %find_lang %{name}
 
-# cgi script is wrongly installed in a fixed place
-%{__mkdir_p} %{buildroot}%{cgi_bin}
-%{__mv} %{buildroot}%{_prefix}/lib/w3m/cgi-bin/ikiwiki-w3m.cgi \
-        %{buildroot}%{cgi_bin}
-
 # move external plugins
 %{__mkdir_p} %{buildroot}%{_libexecdir}/ikiwiki/plugins
 %{__mv} %{buildroot}%{_prefix}/lib/ikiwiki/plugins/* \
         %{buildroot}%{_libexecdir}/ikiwiki/plugins
 
-# fix encoding
-iconv -f iso-8859-9 -t utf-8 \
-      html/tips/vim_syntax_highlighting/ikiwiki.vim \
-      -o html/tips/vim_syntax_highlighting/ikiwiki.vim.tmp
-%{__mv} html/tips/vim_syntax_highlighting/ikiwiki.vim.tmp \
-        html/tips/vim_syntax_highlighting/ikiwiki.vim
-
 # remove shebang
 %{__sed} -e '1{/^#!/d}' -i \
         %{buildroot}%{_sysconfdir}/ikiwiki/auto.setup
@@ -157,6 +143,12 @@
 
 
 %changelog
+* Fri Jan  2 2009 Thomas Moschny <thomas.moschny at gmx.de> - 2.72-1
+- Update to 2.72.
+- Patch for mtn plugin has been applied upstream.
+- Encoding of ikiwiki.vim has been changed to utf-8 upstream.
+- Use new W3M_CGI_BIN option in %%install.
+
 * Tue Dec 16 2008 Thomas Moschny <thomas.moschny at gmx.de> - 2.70-3
 - Patch for monotone plugin: Prevent broken pipe message.
 - Cosmetic changes to satisfy rpmlint.


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/ikiwiki/F-9/import.log,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- import.log	19 Dec 2008 15:58:26 -0000	1.6
+++ import.log	2 Jan 2009 11:45:55 -0000	1.7
@@ -4,3 +4,4 @@
 ikiwiki-2_63-1_fc9:F-9:ikiwiki-2.63-1.fc9.src.rpm:1221386213
 ikiwiki-2_70-1_fc9:F-9:ikiwiki-2.70-1.fc9.src.rpm:1227216777
 ikiwiki-2_70-3_fc10:F-9:ikiwiki-2.70-3.fc10.src.rpm:1229702242
+ikiwiki-2_72-1_fc10:F-9:ikiwiki-2.72-1.fc10.src.rpm:1230896711


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ikiwiki/F-9/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	20 Nov 2008 21:36:43 -0000	1.6
+++ sources	2 Jan 2009 11:45:55 -0000	1.7
@@ -1 +1 @@
-43d9dc1a5e03e38dd829cd4d4a38eeb4  ikiwiki_2.70.tar.gz
+5bebbd85c2ad80ed9c8d730ba4f91e1a  ikiwiki_2.72.tar.gz


--- ikiwiki-2.70-libexecdir.patch DELETED ---


--- ikiwiki-2.70-mtn.patch DELETED ---



From szpak at fedoraproject.org  Fri Jan  2 11:48:43 2009
From: szpak at fedoraproject.org (Marcin Zajaczkowski)
Date: Fri,  2 Jan 2009 11:48:43 +0000 (UTC)
Subject: rpms/pyxattr/F-10 pyxattr.spec,1.7,1.8 sources,1.3,1.4
Message-ID: <20090102114843.2F49A70130@cvs1.fedora.phx.redhat.com>

Author: szpak

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

Modified Files:
	pyxattr.spec sources 
Log Message:
Update to 0.4.0 (F-10 branch)




Index: pyxattr.spec
===================================================================
RCS file: /cvs/extras/rpms/pyxattr/F-10/pyxattr.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- pyxattr.spec	20 Feb 2008 03:39:18 -0000	1.7
+++ pyxattr.spec	2 Jan 2009 11:48:12 -0000	1.8
@@ -1,9 +1,9 @@
 Name: 		pyxattr
 Summary: 	Extended attributes library wrapper for Python
-Version: 	0.2.2
-Release: 	3%{?dist}
+Version: 	0.4.0
+Release: 	2%{?dist}
 #license version is precised on a website
-License: 	GPLv2+
+License: 	LGPLv2+
 Group: 		Development/Libraries
 URL: 		http://pyxattr.sourceforge.net/
 Source:		http://downloads.sourceforge.net/pyxattr/pyxattr-%{version}.tar.gz
@@ -13,7 +13,8 @@
 Obsoletes:	python-xattr <= %{version}-%{release}
 #libattr package is already forced by RPM
 Requires: 	python >= 2.2
-BuildRequires:	python-devel, libattr-devel
+#python-setuptools package is required since 0.4.0
+BuildRequires:	python-devel, libattr-devel, python-setuptools
 
 %description
 Python extension module wrapper for libattr. It allows to query, list,
@@ -35,13 +36,24 @@
 %files
 %defattr(0644,root,root,0755)
 %{_libdir}/python*/site-packages/xattr.so
-%if 0%{?fedora} >= 9
-#%{python_sitelib}/*egg-info - didn't work for me in rawhide
+#Python Eggs already in source distribution
+#(without compiled content, can be simple included in RPM package)
 %{_libdir}/python*/site-packages/*egg-info
-%endif
-%doc ChangeLog MANIFEST NEWS README *.html *.txt
+%doc COPYING NEWS README
 
 %changelog
+* Sat Dec 6 2008 Marcin Zajaczkowski <mszpak ATT wp DOTT pl> - 0.4.0-2
+- added python-setuptools in BuildRequires which is needed in build process
+since version 0.4.0 (thanks to Kevin Fenzi)
+
+* Fri Dec 5 2008 Marcin Zajaczkowski <mszpak ATT wp DOTT pl> - 0.4.0-1
+- updated to 0.4.0
+- License Tag adjusted to current licensing LGPLv2+
+- modified Python Eggs support due to its usage in source distribution 
+
+* Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 0.2.2-4
+- Rebuild for Python 2.6
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.2.2-3
 - Autorebuild for GCC 4.3
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pyxattr/F-10/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	27 Aug 2007 18:35:04 -0000	1.3
+++ sources	2 Jan 2009 11:48:12 -0000	1.4
@@ -1 +1 @@
-33d722b0c67fcee42bb3c6455f135f94  pyxattr-0.2.2.tar.gz
+8e54ffa2ca575232d57213efcbcee289  pyxattr-0.4.0.tar.gz



From jreznik at fedoraproject.org  Fri Jan  2 12:11:40 2009
From: jreznik at fedoraproject.org (Jaroslav Reznik)
Date: Fri,  2 Jan 2009 12:11:40 +0000 (UTC)
Subject: rpms/kde-plasma-runcommand/F-9
	kde-plasma-runcommand-0.9-plasma-libs.patch, NONE,
	1.1 kde-plasma-runcommand.spec, 1.3, 1.4
Message-ID: <20090102121140.97A3370130@cvs1.fedora.phx.redhat.com>

Author: jreznik

Update of /cvs/pkgs/rpms/kde-plasma-runcommand/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27411

Modified Files:
	kde-plasma-runcommand.spec 
Added Files:
	kde-plasma-runcommand-0.9-plasma-libs.patch 
Log Message:
* Fri Jan 02 2009 Jaroslav Reznik <jreznik at redhat.com> 0.9-2
- link target against PLASMA_LIBS


kde-plasma-runcommand-0.9-plasma-libs.patch:

--- NEW FILE kde-plasma-runcommand-0.9-plasma-libs.patch ---
diff -up runcommand_0.9/applet/CMakeLists.txt.plasma-libs runcommand_0.9/applet/CMakeLists.txt
--- runcommand_0.9/applet/CMakeLists.txt.plasma-libs	2008-12-24 19:38:18.000000000 +0100
+++ runcommand_0.9/applet/CMakeLists.txt	2009-01-02 12:55:33.000000000 +0100
@@ -17,7 +17,7 @@ kde4_add_ui_files(runcommand_SRCS config
 kde4_add_plugin(plasma_applet_runcommand ${runcommand_SRCS})
 target_link_libraries(plasma_applet_runcommand
                       ${QT_QTSCRIPT_LIBRARY}
-                      ${KDE4_PLASMA_LIBS}
+                      ${PLASMA_LIBS}
                       ${KDE4_KDEUI_LIBS}
                       ${KDE4_KUTILS_LIBS}
                       ${KDE4_KIO_LIBS}


Index: kde-plasma-runcommand.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-runcommand/F-9/kde-plasma-runcommand.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- kde-plasma-runcommand.spec	2 Jan 2009 11:40:59 -0000	1.3
+++ kde-plasma-runcommand.spec	2 Jan 2009 12:11:09 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           kde-plasma-runcommand
 Version:        0.9
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Simple plasmoid to run commands without using terminal or KRunner
 
 Group:          User Interface/Desktops
@@ -8,6 +8,7 @@
 URL:            http://www.kde-look.org/content/show.php/Run+Command?content=91495
 
 Source0:        http://www.kde-look.org/CONTENT/content-files/91495-runcommand_%{version}.tar.bz2
+Patch0:         kde-plasma-runcommand-0.9-plasma-libs.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -20,7 +21,7 @@
 
 %prep
 %setup -qn runcommand_%{version}
-
+%patch0 -p1 -b .plasma-libs
 
 %build
 mkdir -p %{_target_platform}
@@ -47,6 +48,9 @@
 %{_kde4_datadir}/kde4/services/plasma-applet-runcommand.desktop
 
 %changelog
+* Fri Jan 02 2009 Jaroslav Reznik <jreznik at redhat.com> 0.9-2
+- link target against PLASMA_LIBS
+
 * Fri Jan 02 2009 Jaroslav Reznik <jreznik at redhat.com> 0.9-1
 - update to 0.9
 



From szpak at fedoraproject.org  Fri Jan  2 12:23:01 2009
From: szpak at fedoraproject.org (Marcin Zajaczkowski)
Date: Fri,  2 Jan 2009 12:23:01 +0000 (UTC)
Subject: rpms/pyxattr/F-9 pyxattr.spec,1.7,1.8 sources,1.3,1.4
Message-ID: <20090102122301.6E88A70130@cvs1.fedora.phx.redhat.com>

Author: szpak

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

Modified Files:
	pyxattr.spec sources 
Log Message:
Updated to 0.4.0 (F-9 branch)




Index: pyxattr.spec
===================================================================
RCS file: /cvs/extras/rpms/pyxattr/F-9/pyxattr.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- pyxattr.spec	20 Feb 2008 03:39:18 -0000	1.7
+++ pyxattr.spec	2 Jan 2009 12:22:31 -0000	1.8
@@ -1,9 +1,9 @@
 Name: 		pyxattr
 Summary: 	Extended attributes library wrapper for Python
-Version: 	0.2.2
-Release: 	3%{?dist}
+Version: 	0.4.0
+Release: 	2%{?dist}
 #license version is precised on a website
-License: 	GPLv2+
+License: 	LGPLv2+
 Group: 		Development/Libraries
 URL: 		http://pyxattr.sourceforge.net/
 Source:		http://downloads.sourceforge.net/pyxattr/pyxattr-%{version}.tar.gz
@@ -13,7 +13,8 @@
 Obsoletes:	python-xattr <= %{version}-%{release}
 #libattr package is already forced by RPM
 Requires: 	python >= 2.2
-BuildRequires:	python-devel, libattr-devel
+#python-setuptools package is required since 0.4.0
+BuildRequires:	python-devel, libattr-devel, python-setuptools
 
 %description
 Python extension module wrapper for libattr. It allows to query, list,
@@ -35,13 +36,24 @@
 %files
 %defattr(0644,root,root,0755)
 %{_libdir}/python*/site-packages/xattr.so
-%if 0%{?fedora} >= 9
-#%{python_sitelib}/*egg-info - didn't work for me in rawhide
+#Python Eggs already in source distribution
+#(without compiled content, can be simple included in RPM package)
 %{_libdir}/python*/site-packages/*egg-info
-%endif
-%doc ChangeLog MANIFEST NEWS README *.html *.txt
+%doc COPYING NEWS README
 
 %changelog
+* Sat Dec 6 2008 Marcin Zajaczkowski <mszpak ATT wp DOTT pl> - 0.4.0-2
+- added python-setuptools in BuildRequires which is needed in build process
+since version 0.4.0 (thanks to Kevin Fenzi)
+
+* Fri Dec 5 2008 Marcin Zajaczkowski <mszpak ATT wp DOTT pl> - 0.4.0-1
+- updated to 0.4.0
+- License Tag adjusted to current licensing LGPLv2+
+- modified Python Eggs support due to its usage in source distribution 
+
+* Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 0.2.2-4
+- Rebuild for Python 2.6
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.2.2-3
 - Autorebuild for GCC 4.3
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pyxattr/F-9/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	27 Aug 2007 18:35:04 -0000	1.3
+++ sources	2 Jan 2009 12:22:31 -0000	1.4
@@ -1 +1 @@
-33d722b0c67fcee42bb3c6455f135f94  pyxattr-0.2.2.tar.gz
+8e54ffa2ca575232d57213efcbcee289  pyxattr-0.4.0.tar.gz



From jreznik at fedoraproject.org  Fri Jan  2 12:29:42 2009
From: jreznik at fedoraproject.org (Jaroslav Reznik)
Date: Fri,  2 Jan 2009 12:29:42 +0000 (UTC)
Subject: rpms/kde-plasma-runcommand/F-10
	kde-plasma-runcommand-0.9-plasma-libs.patch, NONE,
	1.1 .cvsignore, 1.3, 1.4 kde-plasma-runcommand.spec, 1.2,
	1.3 sources, 1.3, 1.4
Message-ID: <20090102122942.9D04F70134@cvs1.fedora.phx.redhat.com>

Author: jreznik

Update of /cvs/pkgs/rpms/kde-plasma-runcommand/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31330

Modified Files:
	.cvsignore kde-plasma-runcommand.spec sources 
Added Files:
	kde-plasma-runcommand-0.9-plasma-libs.patch 
Log Message:
* Fri Jan 02 2009 Jaroslav Reznik <jreznik at redhat.com> 0.9-1
- update 0.9
- link target against PLASMA_LIBS


kde-plasma-runcommand-0.9-plasma-libs.patch:

--- NEW FILE kde-plasma-runcommand-0.9-plasma-libs.patch ---
diff -up runcommand_0.9/applet/CMakeLists.txt.plasma-libs runcommand_0.9/applet/CMakeLists.txt
--- runcommand_0.9/applet/CMakeLists.txt.plasma-libs	2008-12-24 19:38:18.000000000 +0100
+++ runcommand_0.9/applet/CMakeLists.txt	2009-01-02 12:55:33.000000000 +0100
@@ -17,7 +17,7 @@ kde4_add_ui_files(runcommand_SRCS config
 kde4_add_plugin(plasma_applet_runcommand ${runcommand_SRCS})
 target_link_libraries(plasma_applet_runcommand
                       ${QT_QTSCRIPT_LIBRARY}
-                      ${KDE4_PLASMA_LIBS}
+                      ${PLASMA_LIBS}
                       ${KDE4_KDEUI_LIBS}
                       ${KDE4_KUTILS_LIBS}
                       ${KDE4_KIO_LIBS}


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-runcommand/F-10/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	19 Nov 2008 08:40:15 -0000	1.3
+++ .cvsignore	2 Jan 2009 12:29:12 -0000	1.4
@@ -1 +1 @@
-91495-runcommand_0.7.tar.bz2
+91495-runcommand_0.9.tar.bz2


Index: kde-plasma-runcommand.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-runcommand/F-10/kde-plasma-runcommand.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- kde-plasma-runcommand.spec	19 Nov 2008 08:40:15 -0000	1.2
+++ kde-plasma-runcommand.spec	2 Jan 2009 12:29:12 -0000	1.3
@@ -1,5 +1,5 @@
 Name:           kde-plasma-runcommand
-Version:        0.7
+Version:        0.9
 Release:        1%{?dist}
 Summary:        Simple plasmoid to run commands without using terminal or KRunner
 
@@ -8,6 +8,7 @@
 URL:            http://www.kde-look.org/content/show.php/Run+Command?content=91495
 
 Source0:        http://www.kde-look.org/CONTENT/content-files/91495-runcommand_%{version}.tar.bz2
+Patch0:         kde-plasma-runcommand-0.9-plasma-libs.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -20,7 +21,7 @@
 
 %prep
 %setup -qn runcommand_%{version}
-
+%patch0 -p1 -b .plasma-libs
 
 %build
 mkdir -p %{_target_platform}
@@ -47,6 +48,10 @@
 %{_kde4_datadir}/kde4/services/plasma-applet-runcommand.desktop
 
 %changelog
+* Fri Jan 02 2009 Jaroslav Reznik <jreznik at redhat.com> 0.9-1
+- update 0.9
+- link target against PLASMA_LIBS
+
 * Wed Nov 19 2008 Jaroslav Reznik <jreznik at redhat.com> 0.7-1
 - update to 0.7
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-runcommand/F-10/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	19 Nov 2008 08:40:15 -0000	1.3
+++ sources	2 Jan 2009 12:29:12 -0000	1.4
@@ -1 +1 @@
-44e0c9eb7accf8c9cf8ba27614566e8a  91495-runcommand_0.7.tar.bz2
+a98d6e3f32b85eae3f299c06cb8432f2  91495-runcommand_0.9.tar.bz2



From pkgdb at fedoraproject.org  Fri Jan  2 12:43:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 02 Jan 2009 12:43:47 +0000
Subject: [pkgdb] strace: vda has requested commit
Message-ID: <20090102124355.D2939208D50@bastion.fedora.phx.redhat.com>

vda has requested the commit acl on strace (Fedora devel)

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



From thias at fedoraproject.org  Fri Jan  2 12:52:18 2009
From: thias at fedoraproject.org (Matthias Saou)
Date: Fri,  2 Jan 2009 12:52:18 +0000 (UTC)
Subject: rpms/proftpd/EL-4 proftpd-1.3.1-csrf.patch, NONE, 1.1 proftpd.spec, 
	1.9, 1.10
Message-ID: <20090102125218.573CB70130@cvs1.fedora.phx.redhat.com>

Author: thias

Update of /cvs/extras/rpms/proftpd/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4000/EL-4

Modified Files:
	proftpd.spec 
Added Files:
	proftpd-1.3.1-csrf.patch 
Log Message:
Add Debian patch to fix CSRF vulnerability (#464127, upstream #3115) and backport recent minor changes on all current branches.


proftpd-1.3.1-csrf.patch:

--- NEW FILE proftpd-1.3.1-csrf.patch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 3115.dpatch by Francesco Paolo Lovergine <frankie at debian.org>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: No description.

@DPATCH@
diff -urNad trunk~/src/main.c trunk/src/main.c
--- trunk~/src/main.c	2008-09-21 23:50:55.000000000 +0200
+++ trunk/src/main.c	2008-09-21 23:50:55.000000000 +0200
@@ -674,12 +674,17 @@
   while (TRUE) {
     pr_signals_handle();
 
+    memset(buf,'\0',sizeof(buf));
+
     if (pr_netio_telnet_gets(buf, sizeof(buf)-1, session.c->instrm,
         session.c->outstrm) == NULL) {
 
-      if (PR_NETIO_ERRNO(session.c->instrm) == EINTR)
-        /* Simple interrupted syscall */
+      if (errno == E2BIG) {
+         /* The client sent a too-long command which was ignored; give
+          * them another chance?
+          */
 	continue;
+      }
 
 #ifndef PR_DEVEL_NO_DAEMON
       /* Otherwise, EOF */
@@ -695,20 +700,31 @@
 
     if (cmd_buf_size == -1) {
       int *bufsz = get_param_ptr(main_server->conf, "CommandBufferSize", FALSE);
+      size_t default_cmd_bufsz;
+
+      /* It's possible for the admin to select a PR_TUNABLE_BUFFER_SIZE which
+       * is smaller than PR_DEFAULT_CMD_BUFSZ.  We need to handle such cases
+       * properly.
+       */
+      default_cmd_bufsz = PR_DEFAULT_CMD_BUFSZ;
+      if (default_cmd_bufsz > sizeof(buf)) {
+        default_cmd_bufsz = sizeof(buf);
+      }
+  
       if (bufsz == NULL) {
-        cmd_buf_size = PR_DEFAULT_CMD_BUFSZ;
+        cmd_buf_size = default_cmd_bufsz;
 
       } else if (*bufsz <= 0) {
         pr_log_pri(PR_LOG_WARNING, "invalid CommandBufferSize size (%d) "
           "given, using default buffer size (%u) instead",
-          *bufsz, PR_DEFAULT_CMD_BUFSZ);
-        cmd_buf_size = PR_DEFAULT_CMD_BUFSZ;
+          *bufsz, default_cmd_bufsz);
+        cmd_buf_size = default_cmd_bufsz;
 
       } else if (*bufsz + 1 > sizeof(buf)) {
         pr_log_pri(PR_LOG_WARNING, "invalid CommandBufferSize size (%d) "
           "given, using default buffer size (%u) instead",
-          *bufsz, PR_DEFAULT_CMD_BUFSZ);
-        cmd_buf_size = PR_DEFAULT_CMD_BUFSZ;
+          *bufsz, default_cmd_bufsz);
+        cmd_buf_size = default_cmd_bufsz;
 
       } else {
         pr_log_debug(DEBUG1, "setting CommandBufferSize to %d", *bufsz);
diff -urNad trunk~/src/netio.c trunk/src/netio.c
--- trunk~/src/netio.c	2008-09-21 23:39:34.000000000 +0200
+++ trunk/src/netio.c	2008-09-21 23:52:17.000000000 +0200
@@ -1,6 +1,6 @@
 /*
  * ProFTPD - FTP server daemon
- * Copyright (c) 2001-2007 The ProFTPD Project team
+ * Copyright (c) 2001-2008 The ProFTPD Project team
  *
  * 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
@@ -30,19 +30,19 @@
 #include <signal.h>
 
 #ifndef IAC
-#define IAC	255
+# define IAC	255
 #endif
 #ifndef DONT
-#define DONT	254
+# define DONT	254
 #endif
 #ifndef DO
-#define DO	253
+# define DO	253
 #endif
 #ifndef WONT
-#define WONT	252
+# define WONT	252
 #endif
 #ifndef WILL
-#define WILL	251
+# define WILL	251
 #endif
 
 static const char *trace_channel = "netio";
@@ -51,6 +51,17 @@
 static pr_netio_t *core_data_netio = NULL, *data_netio = NULL;
 static pr_netio_t *core_othr_netio = NULL, *othr_netio = NULL;
 
+/* Used to track whether the previous text read from the client's control
+ * connection was a properly-terminated command.  If so, then read in the
+ * next/current text as per normal.  If NOT (e.g. the client sent a too-long
+ * command), then read in the next/current text, but ignore it.  Only clear
+ * this flag if the next/current command can be read as per normal.
+ *
+ * The pr_netio_telnet_gets() uses this variable, in conjunction with its
+ * saw_newline flag, for handling too-long commands from clients.
+ */
+static int properly_terminated_prev_command = TRUE;
+
 static pr_netio_stream_t *netio_stream_alloc(pool *parent_pool) {
   pool *netio_pool = NULL;
   pr_netio_stream_t *nstrm = NULL;
@@ -911,7 +922,7 @@
   char *bp = buf;
   unsigned char cp;
   static unsigned char mode = 0;
-  int toread;
+  int toread, saw_newline = FALSE;
   pr_buffer_t *pbuf = NULL;
 
   if (buflen == 0) {
@@ -940,8 +951,9 @@
           *bp = '\0';
           return buf;
 
-        } else
+        } else {
           return NULL;
+        }
       }
 
       pbuf->remaining = pbuf->buflen - toread;
@@ -1004,6 +1016,8 @@
       toread--;
       *bp++ = *pbuf->current++;
       pbuf->remaining++;
+
+      saw_newline = TRUE;
       break;
     }
 
@@ -1011,6 +1025,25 @@
       pbuf->current = NULL;
   }
 
+  if (!saw_newline) {
+    /* If we haven't seen a newline, then assume the client is deliberately
+     * sending a too-long command, trying to exploit buffer sizes and make
+     * the server make some possibly bad assumptions.
+     */
+
+    properly_terminated_prev_command = FALSE;
+    errno = E2BIG;
+    return NULL;
+  }
+
+  if (!properly_terminated_prev_command) {
+    properly_terminated_prev_command = TRUE;
+    pr_log_pri(PR_LOG_NOTICE, "client sent too-long command, ignoring");
+    errno = E2BIG;
+    return NULL;
+  }
+
+  properly_terminated_prev_command = TRUE;
   *bp = '\0';
   return buf;
 }


Index: proftpd.spec
===================================================================
RCS file: /cvs/extras/rpms/proftpd/EL-4/proftpd.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- proftpd.spec	3 Feb 2008 18:02:39 -0000	1.9
+++ proftpd.spec	2 Jan 2009 12:51:47 -0000	1.10
@@ -1,7 +1,7 @@
 Summary: Flexible, stable and highly-configurable FTP server
 Name: proftpd
 Version: 1.3.1
-Release: 3%{?dist}
+Release: 7%{?dist}
 License: GPLv2+
 Group: System Environment/Daemons
 URL: http://www.proftpd.org/
@@ -15,6 +15,7 @@
 Source7: proftpd-mod_quotatab_ldap.ldif
 Source8: proftpd-mod_quotatab_ldap.schema
 Patch0: proftpd-1.3.1-find-umode_t.patch
+Patch1: proftpd-1.3.1-csrf.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires: pam >= 0.59
 Requires(post): /sbin/chkconfig
@@ -66,6 +67,7 @@
 %prep
 %setup -q
 %patch0 -p1 -b .find-umode_t
+%patch1 -p1 -b .csrf
 
 
 %build
@@ -79,11 +81,12 @@
     --enable-facl \
     --enable-dso \
     --enable-ipv6 \
+    --enable-shadow \
     --enable-openssl \
     --with-libraries="%{_libdir}/mysql" \
     --with-includes="%{_includedir}/mysql" \
     --with-modules=mod_readme:mod_auth_pam:mod_tls \
-    --with-shared=mod_ldap:mod_sql:mod_sql_mysql:mod_sql_postgres:mod_quotatab:mod_quotatab_file:mod_quotatab_ldap:mod_quotatab_sql
+    --with-shared=mod_ldap:mod_sql:mod_sql_mysql:mod_sql_postgres:mod_quotatab:mod_quotatab_file:mod_quotatab_ldap:mod_quotatab_sql:mod_ifsession:mod_ban
 
 # It seems that with _smp_mflags -lsupp tries to get linked before being built
 # (as of 1.3.0a-4 F7/devel with koji, happened on F8 x86_64 and F7 ppc64)
@@ -160,6 +163,8 @@
 %{_bindir}/*
 %exclude %{_includedir}/proftpd/
 %dir %{_libexecdir}/proftpd/
+%{_libexecdir}/proftpd/mod_ban.so
+%{_libexecdir}/proftpd/mod_ifsession.so
 %{_libexecdir}/proftpd/mod_quotatab.so
 %{_libexecdir}/proftpd/mod_quotatab_file.so
 %{_libexecdir}/proftpd/mod_sql.so
@@ -193,6 +198,19 @@
 
 
 %changelog
+* Fri Jan  2 2009 Matthias Saou <http://freshrpms.net/> 1.3.1-7
+- Add Debian patch to fix CSRF vulnerability (#464127, upstream #3115).
+
+* Fri Aug  8 2008 Matthias Saou <http://freshrpms.net/> 1.3.1-6
+- Add mod_ban support (#457289, Philip Prindeville).
+
+* Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org>
+- Autorebuild for GCC 4.3
+
+* Wed Feb 13 2008 Matthias Saou <http://freshrpms.net/> 1.3.1-4
+- Pass --enable-shadow to also have it available, not just PAM (#378981).
+- Add mod_ifsession as DSO (#432539).
+
 * Mon Dec 17 2007 Matthias Saou <http://freshrpms.net/> 1.3.1-3
 - Rebuild for new openssl, patch from Paul Howarth.
 



From thias at fedoraproject.org  Fri Jan  2 12:52:18 2009
From: thias at fedoraproject.org (Matthias Saou)
Date: Fri,  2 Jan 2009 12:52:18 +0000 (UTC)
Subject: rpms/proftpd/EL-5 proftpd-1.3.1-csrf.patch, NONE, 1.1 proftpd.spec, 
	1.29, 1.30
Message-ID: <20090102125218.710987013C@cvs1.fedora.phx.redhat.com>

Author: thias

Update of /cvs/extras/rpms/proftpd/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4000/EL-5

Modified Files:
	proftpd.spec 
Added Files:
	proftpd-1.3.1-csrf.patch 
Log Message:
Add Debian patch to fix CSRF vulnerability (#464127, upstream #3115) and backport recent minor changes on all current branches.


proftpd-1.3.1-csrf.patch:

--- NEW FILE proftpd-1.3.1-csrf.patch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 3115.dpatch by Francesco Paolo Lovergine <frankie at debian.org>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: No description.

@DPATCH@
diff -urNad trunk~/src/main.c trunk/src/main.c
--- trunk~/src/main.c	2008-09-21 23:50:55.000000000 +0200
+++ trunk/src/main.c	2008-09-21 23:50:55.000000000 +0200
@@ -674,12 +674,17 @@
   while (TRUE) {
     pr_signals_handle();
 
+    memset(buf,'\0',sizeof(buf));
+
     if (pr_netio_telnet_gets(buf, sizeof(buf)-1, session.c->instrm,
         session.c->outstrm) == NULL) {
 
-      if (PR_NETIO_ERRNO(session.c->instrm) == EINTR)
-        /* Simple interrupted syscall */
+      if (errno == E2BIG) {
+         /* The client sent a too-long command which was ignored; give
+          * them another chance?
+          */
 	continue;
+      }
 
 #ifndef PR_DEVEL_NO_DAEMON
       /* Otherwise, EOF */
@@ -695,20 +700,31 @@
 
     if (cmd_buf_size == -1) {
       int *bufsz = get_param_ptr(main_server->conf, "CommandBufferSize", FALSE);
+      size_t default_cmd_bufsz;
+
+      /* It's possible for the admin to select a PR_TUNABLE_BUFFER_SIZE which
+       * is smaller than PR_DEFAULT_CMD_BUFSZ.  We need to handle such cases
+       * properly.
+       */
+      default_cmd_bufsz = PR_DEFAULT_CMD_BUFSZ;
+      if (default_cmd_bufsz > sizeof(buf)) {
+        default_cmd_bufsz = sizeof(buf);
+      }
+  
       if (bufsz == NULL) {
-        cmd_buf_size = PR_DEFAULT_CMD_BUFSZ;
+        cmd_buf_size = default_cmd_bufsz;
 
       } else if (*bufsz <= 0) {
         pr_log_pri(PR_LOG_WARNING, "invalid CommandBufferSize size (%d) "
           "given, using default buffer size (%u) instead",
-          *bufsz, PR_DEFAULT_CMD_BUFSZ);
-        cmd_buf_size = PR_DEFAULT_CMD_BUFSZ;
+          *bufsz, default_cmd_bufsz);
+        cmd_buf_size = default_cmd_bufsz;
 
       } else if (*bufsz + 1 > sizeof(buf)) {
         pr_log_pri(PR_LOG_WARNING, "invalid CommandBufferSize size (%d) "
           "given, using default buffer size (%u) instead",
-          *bufsz, PR_DEFAULT_CMD_BUFSZ);
-        cmd_buf_size = PR_DEFAULT_CMD_BUFSZ;
+          *bufsz, default_cmd_bufsz);
+        cmd_buf_size = default_cmd_bufsz;
 
       } else {
         pr_log_debug(DEBUG1, "setting CommandBufferSize to %d", *bufsz);
diff -urNad trunk~/src/netio.c trunk/src/netio.c
--- trunk~/src/netio.c	2008-09-21 23:39:34.000000000 +0200
+++ trunk/src/netio.c	2008-09-21 23:52:17.000000000 +0200
@@ -1,6 +1,6 @@
 /*
  * ProFTPD - FTP server daemon
- * Copyright (c) 2001-2007 The ProFTPD Project team
+ * Copyright (c) 2001-2008 The ProFTPD Project team
  *
  * 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
@@ -30,19 +30,19 @@
 #include <signal.h>
 
 #ifndef IAC
-#define IAC	255
+# define IAC	255
 #endif
 #ifndef DONT
-#define DONT	254
+# define DONT	254
 #endif
 #ifndef DO
-#define DO	253
+# define DO	253
 #endif
 #ifndef WONT
-#define WONT	252
+# define WONT	252
 #endif
 #ifndef WILL
-#define WILL	251
+# define WILL	251
 #endif
 
 static const char *trace_channel = "netio";
@@ -51,6 +51,17 @@
 static pr_netio_t *core_data_netio = NULL, *data_netio = NULL;
 static pr_netio_t *core_othr_netio = NULL, *othr_netio = NULL;
 
+/* Used to track whether the previous text read from the client's control
+ * connection was a properly-terminated command.  If so, then read in the
+ * next/current text as per normal.  If NOT (e.g. the client sent a too-long
+ * command), then read in the next/current text, but ignore it.  Only clear
+ * this flag if the next/current command can be read as per normal.
+ *
+ * The pr_netio_telnet_gets() uses this variable, in conjunction with its
+ * saw_newline flag, for handling too-long commands from clients.
+ */
+static int properly_terminated_prev_command = TRUE;
+
 static pr_netio_stream_t *netio_stream_alloc(pool *parent_pool) {
   pool *netio_pool = NULL;
   pr_netio_stream_t *nstrm = NULL;
@@ -911,7 +922,7 @@
   char *bp = buf;
   unsigned char cp;
   static unsigned char mode = 0;
-  int toread;
+  int toread, saw_newline = FALSE;
   pr_buffer_t *pbuf = NULL;
 
   if (buflen == 0) {
@@ -940,8 +951,9 @@
           *bp = '\0';
           return buf;
 
-        } else
+        } else {
           return NULL;
+        }
       }
 
       pbuf->remaining = pbuf->buflen - toread;
@@ -1004,6 +1016,8 @@
       toread--;
       *bp++ = *pbuf->current++;
       pbuf->remaining++;
+
+      saw_newline = TRUE;
       break;
     }
 
@@ -1011,6 +1025,25 @@
       pbuf->current = NULL;
   }
 
+  if (!saw_newline) {
+    /* If we haven't seen a newline, then assume the client is deliberately
+     * sending a too-long command, trying to exploit buffer sizes and make
+     * the server make some possibly bad assumptions.
+     */
+
+    properly_terminated_prev_command = FALSE;
+    errno = E2BIG;
+    return NULL;
+  }
+
+  if (!properly_terminated_prev_command) {
+    properly_terminated_prev_command = TRUE;
+    pr_log_pri(PR_LOG_NOTICE, "client sent too-long command, ignoring");
+    errno = E2BIG;
+    return NULL;
+  }
+
+  properly_terminated_prev_command = TRUE;
   *bp = '\0';
   return buf;
 }


Index: proftpd.spec
===================================================================
RCS file: /cvs/extras/rpms/proftpd/EL-5/proftpd.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- proftpd.spec	3 Feb 2008 17:54:06 -0000	1.29
+++ proftpd.spec	2 Jan 2009 12:51:48 -0000	1.30
@@ -1,7 +1,7 @@
 Summary: Flexible, stable and highly-configurable FTP server
 Name: proftpd
 Version: 1.3.1
-Release: 3%{?dist}
+Release: 7%{?dist}
 License: GPLv2+
 Group: System Environment/Daemons
 URL: http://www.proftpd.org/
@@ -15,6 +15,7 @@
 Source7: proftpd-mod_quotatab_ldap.ldif
 Source8: proftpd-mod_quotatab_ldap.schema
 Patch0: proftpd-1.3.1-find-umode_t.patch
+Patch1: proftpd-1.3.1-csrf.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires: pam >= 0.59
 Requires(post): /sbin/chkconfig
@@ -66,6 +67,7 @@
 %prep
 %setup -q
 %patch0 -p1 -b .find-umode_t
+%patch1 -p1 -b .csrf
 
 
 %build
@@ -79,11 +81,12 @@
     --enable-facl \
     --enable-dso \
     --enable-ipv6 \
+    --enable-shadow \
     --enable-openssl \
     --with-libraries="%{_libdir}/mysql" \
     --with-includes="%{_includedir}/mysql" \
     --with-modules=mod_readme:mod_auth_pam:mod_tls \
-    --with-shared=mod_ldap:mod_sql:mod_sql_mysql:mod_sql_postgres:mod_quotatab:mod_quotatab_file:mod_quotatab_ldap:mod_quotatab_sql
+    --with-shared=mod_ldap:mod_sql:mod_sql_mysql:mod_sql_postgres:mod_quotatab:mod_quotatab_file:mod_quotatab_ldap:mod_quotatab_sql:mod_ifsession:mod_ban
 
 # It seems that with _smp_mflags -lsupp tries to get linked before being built
 # (as of 1.3.0a-4 F7/devel with koji, happened on F8 x86_64 and F7 ppc64)
@@ -160,6 +163,8 @@
 %{_bindir}/*
 %exclude %{_includedir}/proftpd/
 %dir %{_libexecdir}/proftpd/
+%{_libexecdir}/proftpd/mod_ban.so
+%{_libexecdir}/proftpd/mod_ifsession.so
 %{_libexecdir}/proftpd/mod_quotatab.so
 %{_libexecdir}/proftpd/mod_quotatab_file.so
 %{_libexecdir}/proftpd/mod_sql.so
@@ -193,6 +198,19 @@
 
 
 %changelog
+* Fri Jan  2 2009 Matthias Saou <http://freshrpms.net/> 1.3.1-7
+- Add Debian patch to fix CSRF vulnerability (#464127, upstream #3115).
+
+* Fri Aug  8 2008 Matthias Saou <http://freshrpms.net/> 1.3.1-6
+- Add mod_ban support (#457289, Philip Prindeville).
+
+* Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org>
+- Autorebuild for GCC 4.3
+
+* Wed Feb 13 2008 Matthias Saou <http://freshrpms.net/> 1.3.1-4
+- Pass --enable-shadow to also have it available, not just PAM (#378981).
+- Add mod_ifsession as DSO (#432539).
+
 * Mon Dec 17 2007 Matthias Saou <http://freshrpms.net/> 1.3.1-3
 - Rebuild for new openssl, patch from Paul Howarth.
 



From thias at fedoraproject.org  Fri Jan  2 12:52:19 2009
From: thias at fedoraproject.org (Matthias Saou)
Date: Fri,  2 Jan 2009 12:52:19 +0000 (UTC)
Subject: rpms/proftpd/F-8 proftpd-1.3.1-csrf.patch, NONE, 1.1 proftpd.spec, 
	1.36, 1.37
Message-ID: <20090102125219.1694070130@cvs1.fedora.phx.redhat.com>

Author: thias

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

Modified Files:
	proftpd.spec 
Added Files:
	proftpd-1.3.1-csrf.patch 
Log Message:
Add Debian patch to fix CSRF vulnerability (#464127, upstream #3115) and backport recent minor changes on all current branches.


proftpd-1.3.1-csrf.patch:

--- NEW FILE proftpd-1.3.1-csrf.patch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 3115.dpatch by Francesco Paolo Lovergine <frankie at debian.org>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: No description.

@DPATCH@
diff -urNad trunk~/src/main.c trunk/src/main.c
--- trunk~/src/main.c	2008-09-21 23:50:55.000000000 +0200
+++ trunk/src/main.c	2008-09-21 23:50:55.000000000 +0200
@@ -674,12 +674,17 @@
   while (TRUE) {
     pr_signals_handle();
 
+    memset(buf,'\0',sizeof(buf));
+
     if (pr_netio_telnet_gets(buf, sizeof(buf)-1, session.c->instrm,
         session.c->outstrm) == NULL) {
 
-      if (PR_NETIO_ERRNO(session.c->instrm) == EINTR)
-        /* Simple interrupted syscall */
+      if (errno == E2BIG) {
+         /* The client sent a too-long command which was ignored; give
+          * them another chance?
+          */
 	continue;
+      }
 
 #ifndef PR_DEVEL_NO_DAEMON
       /* Otherwise, EOF */
@@ -695,20 +700,31 @@
 
     if (cmd_buf_size == -1) {
       int *bufsz = get_param_ptr(main_server->conf, "CommandBufferSize", FALSE);
+      size_t default_cmd_bufsz;
+
+      /* It's possible for the admin to select a PR_TUNABLE_BUFFER_SIZE which
+       * is smaller than PR_DEFAULT_CMD_BUFSZ.  We need to handle such cases
+       * properly.
+       */
+      default_cmd_bufsz = PR_DEFAULT_CMD_BUFSZ;
+      if (default_cmd_bufsz > sizeof(buf)) {
+        default_cmd_bufsz = sizeof(buf);
+      }
+  
       if (bufsz == NULL) {
-        cmd_buf_size = PR_DEFAULT_CMD_BUFSZ;
+        cmd_buf_size = default_cmd_bufsz;
 
       } else if (*bufsz <= 0) {
         pr_log_pri(PR_LOG_WARNING, "invalid CommandBufferSize size (%d) "
           "given, using default buffer size (%u) instead",
-          *bufsz, PR_DEFAULT_CMD_BUFSZ);
-        cmd_buf_size = PR_DEFAULT_CMD_BUFSZ;
+          *bufsz, default_cmd_bufsz);
+        cmd_buf_size = default_cmd_bufsz;
 
       } else if (*bufsz + 1 > sizeof(buf)) {
         pr_log_pri(PR_LOG_WARNING, "invalid CommandBufferSize size (%d) "
           "given, using default buffer size (%u) instead",
-          *bufsz, PR_DEFAULT_CMD_BUFSZ);
-        cmd_buf_size = PR_DEFAULT_CMD_BUFSZ;
+          *bufsz, default_cmd_bufsz);
+        cmd_buf_size = default_cmd_bufsz;
 
       } else {
         pr_log_debug(DEBUG1, "setting CommandBufferSize to %d", *bufsz);
diff -urNad trunk~/src/netio.c trunk/src/netio.c
--- trunk~/src/netio.c	2008-09-21 23:39:34.000000000 +0200
+++ trunk/src/netio.c	2008-09-21 23:52:17.000000000 +0200
@@ -1,6 +1,6 @@
 /*
  * ProFTPD - FTP server daemon
- * Copyright (c) 2001-2007 The ProFTPD Project team
+ * Copyright (c) 2001-2008 The ProFTPD Project team
  *
  * 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
@@ -30,19 +30,19 @@
 #include <signal.h>
 
 #ifndef IAC
-#define IAC	255
+# define IAC	255
 #endif
 #ifndef DONT
-#define DONT	254
+# define DONT	254
 #endif
 #ifndef DO
-#define DO	253
+# define DO	253
 #endif
 #ifndef WONT
-#define WONT	252
+# define WONT	252
 #endif
 #ifndef WILL
-#define WILL	251
+# define WILL	251
 #endif
 
 static const char *trace_channel = "netio";
@@ -51,6 +51,17 @@
 static pr_netio_t *core_data_netio = NULL, *data_netio = NULL;
 static pr_netio_t *core_othr_netio = NULL, *othr_netio = NULL;
 
+/* Used to track whether the previous text read from the client's control
+ * connection was a properly-terminated command.  If so, then read in the
+ * next/current text as per normal.  If NOT (e.g. the client sent a too-long
+ * command), then read in the next/current text, but ignore it.  Only clear
+ * this flag if the next/current command can be read as per normal.
+ *
+ * The pr_netio_telnet_gets() uses this variable, in conjunction with its
+ * saw_newline flag, for handling too-long commands from clients.
+ */
+static int properly_terminated_prev_command = TRUE;
+
 static pr_netio_stream_t *netio_stream_alloc(pool *parent_pool) {
   pool *netio_pool = NULL;
   pr_netio_stream_t *nstrm = NULL;
@@ -911,7 +922,7 @@
   char *bp = buf;
   unsigned char cp;
   static unsigned char mode = 0;
-  int toread;
+  int toread, saw_newline = FALSE;
   pr_buffer_t *pbuf = NULL;
 
   if (buflen == 0) {
@@ -940,8 +951,9 @@
           *bp = '\0';
           return buf;
 
-        } else
+        } else {
           return NULL;
+        }
       }
 
       pbuf->remaining = pbuf->buflen - toread;
@@ -1004,6 +1016,8 @@
       toread--;
       *bp++ = *pbuf->current++;
       pbuf->remaining++;
+
+      saw_newline = TRUE;
       break;
     }
 
@@ -1011,6 +1025,25 @@
       pbuf->current = NULL;
   }
 
+  if (!saw_newline) {
+    /* If we haven't seen a newline, then assume the client is deliberately
+     * sending a too-long command, trying to exploit buffer sizes and make
+     * the server make some possibly bad assumptions.
+     */
+
+    properly_terminated_prev_command = FALSE;
+    errno = E2BIG;
+    return NULL;
+  }
+
+  if (!properly_terminated_prev_command) {
+    properly_terminated_prev_command = TRUE;
+    pr_log_pri(PR_LOG_NOTICE, "client sent too-long command, ignoring");
+    errno = E2BIG;
+    return NULL;
+  }
+
+  properly_terminated_prev_command = TRUE;
   *bp = '\0';
   return buf;
 }


Index: proftpd.spec
===================================================================
RCS file: /cvs/extras/rpms/proftpd/F-8/proftpd.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- proftpd.spec	3 Feb 2008 17:36:18 -0000	1.36
+++ proftpd.spec	2 Jan 2009 12:51:48 -0000	1.37
@@ -1,7 +1,7 @@
 Summary: Flexible, stable and highly-configurable FTP server
 Name: proftpd
 Version: 1.3.1
-Release: 3%{?dist}
+Release: 7%{?dist}
 License: GPLv2+
 Group: System Environment/Daemons
 URL: http://www.proftpd.org/
@@ -15,6 +15,7 @@
 Source7: proftpd-mod_quotatab_ldap.ldif
 Source8: proftpd-mod_quotatab_ldap.schema
 Patch0: proftpd-1.3.1-find-umode_t.patch
+Patch1: proftpd-1.3.1-csrf.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires: pam >= 0.59
 Requires(post): /sbin/chkconfig
@@ -66,6 +67,7 @@
 %prep
 %setup -q
 %patch0 -p1 -b .find-umode_t
+%patch1 -p1 -b .csrf
 
 
 %build
@@ -79,11 +81,12 @@
     --enable-facl \
     --enable-dso \
     --enable-ipv6 \
+    --enable-shadow \
     --enable-openssl \
     --with-libraries="%{_libdir}/mysql" \
     --with-includes="%{_includedir}/mysql" \
     --with-modules=mod_readme:mod_auth_pam:mod_tls \
-    --with-shared=mod_ldap:mod_sql:mod_sql_mysql:mod_sql_postgres:mod_quotatab:mod_quotatab_file:mod_quotatab_ldap:mod_quotatab_sql
+    --with-shared=mod_ldap:mod_sql:mod_sql_mysql:mod_sql_postgres:mod_quotatab:mod_quotatab_file:mod_quotatab_ldap:mod_quotatab_sql:mod_ifsession:mod_ban
 
 # It seems that with _smp_mflags -lsupp tries to get linked before being built
 # (as of 1.3.0a-4 F7/devel with koji, happened on F8 x86_64 and F7 ppc64)
@@ -160,6 +163,8 @@
 %{_bindir}/*
 %exclude %{_includedir}/proftpd/
 %dir %{_libexecdir}/proftpd/
+%{_libexecdir}/proftpd/mod_ban.so
+%{_libexecdir}/proftpd/mod_ifsession.so
 %{_libexecdir}/proftpd/mod_quotatab.so
 %{_libexecdir}/proftpd/mod_quotatab_file.so
 %{_libexecdir}/proftpd/mod_sql.so
@@ -193,6 +198,19 @@
 
 
 %changelog
+* Fri Jan  2 2009 Matthias Saou <http://freshrpms.net/> 1.3.1-7
+- Add Debian patch to fix CSRF vulnerability (#464127, upstream #3115).
+
+* Fri Aug  8 2008 Matthias Saou <http://freshrpms.net/> 1.3.1-6
+- Add mod_ban support (#457289, Philip Prindeville).
+
+* Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org>
+- Autorebuild for GCC 4.3
+
+* Wed Feb 13 2008 Matthias Saou <http://freshrpms.net/> 1.3.1-4
+- Pass --enable-shadow to also have it available, not just PAM (#378981).
+- Add mod_ifsession as DSO (#432539).
+
 * Mon Dec 17 2007 Matthias Saou <http://freshrpms.net/> 1.3.1-3
 - Rebuild for new openssl, patch from Paul Howarth.
 



From thias at fedoraproject.org  Fri Jan  2 12:52:19 2009
From: thias at fedoraproject.org (Matthias Saou)
Date: Fri,  2 Jan 2009 12:52:19 +0000 (UTC)
Subject: rpms/proftpd/F-9 proftpd-1.3.1-csrf.patch, NONE, 1.1 proftpd.spec, 
	1.39, 1.40
Message-ID: <20090102125219.5AC1E70130@cvs1.fedora.phx.redhat.com>

Author: thias

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

Modified Files:
	proftpd.spec 
Added Files:
	proftpd-1.3.1-csrf.patch 
Log Message:
Add Debian patch to fix CSRF vulnerability (#464127, upstream #3115) and backport recent minor changes on all current branches.


proftpd-1.3.1-csrf.patch:

--- NEW FILE proftpd-1.3.1-csrf.patch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 3115.dpatch by Francesco Paolo Lovergine <frankie at debian.org>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: No description.

@DPATCH@
diff -urNad trunk~/src/main.c trunk/src/main.c
--- trunk~/src/main.c	2008-09-21 23:50:55.000000000 +0200
+++ trunk/src/main.c	2008-09-21 23:50:55.000000000 +0200
@@ -674,12 +674,17 @@
   while (TRUE) {
     pr_signals_handle();
 
+    memset(buf,'\0',sizeof(buf));
+
     if (pr_netio_telnet_gets(buf, sizeof(buf)-1, session.c->instrm,
         session.c->outstrm) == NULL) {
 
-      if (PR_NETIO_ERRNO(session.c->instrm) == EINTR)
-        /* Simple interrupted syscall */
+      if (errno == E2BIG) {
+         /* The client sent a too-long command which was ignored; give
+          * them another chance?
+          */
 	continue;
+      }
 
 #ifndef PR_DEVEL_NO_DAEMON
       /* Otherwise, EOF */
@@ -695,20 +700,31 @@
 
     if (cmd_buf_size == -1) {
       int *bufsz = get_param_ptr(main_server->conf, "CommandBufferSize", FALSE);
+      size_t default_cmd_bufsz;
+
+      /* It's possible for the admin to select a PR_TUNABLE_BUFFER_SIZE which
+       * is smaller than PR_DEFAULT_CMD_BUFSZ.  We need to handle such cases
+       * properly.
+       */
+      default_cmd_bufsz = PR_DEFAULT_CMD_BUFSZ;
+      if (default_cmd_bufsz > sizeof(buf)) {
+        default_cmd_bufsz = sizeof(buf);
+      }
+  
       if (bufsz == NULL) {
-        cmd_buf_size = PR_DEFAULT_CMD_BUFSZ;
+        cmd_buf_size = default_cmd_bufsz;
 
       } else if (*bufsz <= 0) {
         pr_log_pri(PR_LOG_WARNING, "invalid CommandBufferSize size (%d) "
           "given, using default buffer size (%u) instead",
-          *bufsz, PR_DEFAULT_CMD_BUFSZ);
-        cmd_buf_size = PR_DEFAULT_CMD_BUFSZ;
+          *bufsz, default_cmd_bufsz);
+        cmd_buf_size = default_cmd_bufsz;
 
       } else if (*bufsz + 1 > sizeof(buf)) {
         pr_log_pri(PR_LOG_WARNING, "invalid CommandBufferSize size (%d) "
           "given, using default buffer size (%u) instead",
-          *bufsz, PR_DEFAULT_CMD_BUFSZ);
-        cmd_buf_size = PR_DEFAULT_CMD_BUFSZ;
+          *bufsz, default_cmd_bufsz);
+        cmd_buf_size = default_cmd_bufsz;
 
       } else {
         pr_log_debug(DEBUG1, "setting CommandBufferSize to %d", *bufsz);
diff -urNad trunk~/src/netio.c trunk/src/netio.c
--- trunk~/src/netio.c	2008-09-21 23:39:34.000000000 +0200
+++ trunk/src/netio.c	2008-09-21 23:52:17.000000000 +0200
@@ -1,6 +1,6 @@
 /*
  * ProFTPD - FTP server daemon
- * Copyright (c) 2001-2007 The ProFTPD Project team
+ * Copyright (c) 2001-2008 The ProFTPD Project team
  *
  * 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
@@ -30,19 +30,19 @@
 #include <signal.h>
 
 #ifndef IAC
-#define IAC	255
+# define IAC	255
 #endif
 #ifndef DONT
-#define DONT	254
+# define DONT	254
 #endif
 #ifndef DO
-#define DO	253
+# define DO	253
 #endif
 #ifndef WONT
-#define WONT	252
+# define WONT	252
 #endif
 #ifndef WILL
-#define WILL	251
+# define WILL	251
 #endif
 
 static const char *trace_channel = "netio";
@@ -51,6 +51,17 @@
 static pr_netio_t *core_data_netio = NULL, *data_netio = NULL;
 static pr_netio_t *core_othr_netio = NULL, *othr_netio = NULL;
 
+/* Used to track whether the previous text read from the client's control
+ * connection was a properly-terminated command.  If so, then read in the
+ * next/current text as per normal.  If NOT (e.g. the client sent a too-long
+ * command), then read in the next/current text, but ignore it.  Only clear
+ * this flag if the next/current command can be read as per normal.
+ *
+ * The pr_netio_telnet_gets() uses this variable, in conjunction with its
+ * saw_newline flag, for handling too-long commands from clients.
+ */
+static int properly_terminated_prev_command = TRUE;
+
 static pr_netio_stream_t *netio_stream_alloc(pool *parent_pool) {
   pool *netio_pool = NULL;
   pr_netio_stream_t *nstrm = NULL;
@@ -911,7 +922,7 @@
   char *bp = buf;
   unsigned char cp;
   static unsigned char mode = 0;
-  int toread;
+  int toread, saw_newline = FALSE;
   pr_buffer_t *pbuf = NULL;
 
   if (buflen == 0) {
@@ -940,8 +951,9 @@
           *bp = '\0';
           return buf;
 
-        } else
+        } else {
           return NULL;
+        }
       }
 
       pbuf->remaining = pbuf->buflen - toread;
@@ -1004,6 +1016,8 @@
       toread--;
       *bp++ = *pbuf->current++;
       pbuf->remaining++;
+
+      saw_newline = TRUE;
       break;
     }
 
@@ -1011,6 +1025,25 @@
       pbuf->current = NULL;
   }
 
+  if (!saw_newline) {
+    /* If we haven't seen a newline, then assume the client is deliberately
+     * sending a too-long command, trying to exploit buffer sizes and make
+     * the server make some possibly bad assumptions.
+     */
+
+    properly_terminated_prev_command = FALSE;
+    errno = E2BIG;
+    return NULL;
+  }
+
+  if (!properly_terminated_prev_command) {
+    properly_terminated_prev_command = TRUE;
+    pr_log_pri(PR_LOG_NOTICE, "client sent too-long command, ignoring");
+    errno = E2BIG;
+    return NULL;
+  }
+
+  properly_terminated_prev_command = TRUE;
   *bp = '\0';
   return buf;
 }


Index: proftpd.spec
===================================================================
RCS file: /cvs/extras/rpms/proftpd/F-9/proftpd.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- proftpd.spec	20 Feb 2008 04:34:40 -0000	1.39
+++ proftpd.spec	2 Jan 2009 12:51:49 -0000	1.40
@@ -1,7 +1,7 @@
 Summary: Flexible, stable and highly-configurable FTP server
 Name: proftpd
 Version: 1.3.1
-Release: 5%{?dist}
+Release: 7%{?dist}
 License: GPLv2+
 Group: System Environment/Daemons
 URL: http://www.proftpd.org/
@@ -15,6 +15,7 @@
 Source7: proftpd-mod_quotatab_ldap.ldif
 Source8: proftpd-mod_quotatab_ldap.schema
 Patch0: proftpd-1.3.1-find-umode_t.patch
+Patch1: proftpd-1.3.1-csrf.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires: pam >= 0.59
 Requires(post): /sbin/chkconfig
@@ -66,6 +67,7 @@
 %prep
 %setup -q
 %patch0 -p1 -b .find-umode_t
+%patch1 -p1 -b .csrf
 
 
 %build
@@ -84,7 +86,7 @@
     --with-libraries="%{_libdir}/mysql" \
     --with-includes="%{_includedir}/mysql" \
     --with-modules=mod_readme:mod_auth_pam:mod_tls \
-    --with-shared=mod_ldap:mod_sql:mod_sql_mysql:mod_sql_postgres:mod_quotatab:mod_quotatab_file:mod_quotatab_ldap:mod_quotatab_sql:mod_ifsession
+    --with-shared=mod_ldap:mod_sql:mod_sql_mysql:mod_sql_postgres:mod_quotatab:mod_quotatab_file:mod_quotatab_ldap:mod_quotatab_sql:mod_ifsession:mod_ban
 
 # It seems that with _smp_mflags -lsupp tries to get linked before being built
 # (as of 1.3.0a-4 F7/devel with koji, happened on F8 x86_64 and F7 ppc64)
@@ -161,6 +163,7 @@
 %{_bindir}/*
 %exclude %{_includedir}/proftpd/
 %dir %{_libexecdir}/proftpd/
+%{_libexecdir}/proftpd/mod_ban.so
 %{_libexecdir}/proftpd/mod_ifsession.so
 %{_libexecdir}/proftpd/mod_quotatab.so
 %{_libexecdir}/proftpd/mod_quotatab_file.so
@@ -195,7 +198,13 @@
 
 
 %changelog
-* Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1.3.1-5
+* Fri Jan  2 2009 Matthias Saou <http://freshrpms.net/> 1.3.1-7
+- Add Debian patch to fix CSRF vulnerability (#464127, upstream #3115).
+
+* Fri Aug  8 2008 Matthias Saou <http://freshrpms.net/> 1.3.1-6
+- Add mod_ban support (#457289, Philip Prindeville).
+
+* Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org>
 - Autorebuild for GCC 4.3
 
 * Wed Feb 13 2008 Matthias Saou <http://freshrpms.net/> 1.3.1-4



From thias at fedoraproject.org  Fri Jan  2 12:52:19 2009
From: thias at fedoraproject.org (Matthias Saou)
Date: Fri,  2 Jan 2009 12:52:19 +0000 (UTC)
Subject: rpms/proftpd/devel proftpd.spec,1.40,1.41
Message-ID: <20090102125219.95D0C70130@cvs1.fedora.phx.redhat.com>

Author: thias

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

Modified Files:
	proftpd.spec 
Log Message:
Add Debian patch to fix CSRF vulnerability (#464127, upstream #3115) and backport recent minor changes on all current branches.



Index: proftpd.spec
===================================================================
RCS file: /cvs/extras/rpms/proftpd/devel/proftpd.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- proftpd.spec	8 Aug 2008 11:06:32 -0000	1.40
+++ proftpd.spec	2 Jan 2009 12:51:49 -0000	1.41
@@ -1,11 +1,13 @@
+%define prever rc3
+
 Summary: Flexible, stable and highly-configurable FTP server
 Name: proftpd
-Version: 1.3.1
-Release: 6%{?dist}
+Version: 1.3.2
+Release: 0.1%{?prever:.%{prever}}%{?dist}
 License: GPLv2+
 Group: System Environment/Daemons
 URL: http://www.proftpd.org/
-Source0: ftp://ftp.proftpd.org/distrib/source/proftpd-%{version}.tar.bz2
+Source0: ftp://ftp.proftpd.org/distrib/source/proftpd-%{version}%{?prever}.tar.bz2
 Source1: proftpd.conf
 Source2: proftpd.init
 Source3: proftpd-xinetd
@@ -14,7 +16,6 @@
 Source6: proftpd.pam
 Source7: proftpd-mod_quotatab_ldap.ldif
 Source8: proftpd-mod_quotatab_ldap.schema
-Patch0: proftpd-1.3.1-find-umode_t.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires: pam >= 0.59
 Requires(post): /sbin/chkconfig
@@ -64,8 +65,7 @@
 
 
 %prep
-%setup -q
-%patch0 -p1 -b .find-umode_t
+%setup -q -n %{name}-%{version}%{?prever}
 
 
 %build
@@ -160,6 +160,7 @@
 %{_mandir}/man?/*
 %{_bindir}/*
 %exclude %{_includedir}/proftpd/
+%exclude %{_libdir}/pkgconfig/
 %dir %{_libexecdir}/proftpd/
 %{_libexecdir}/proftpd/mod_ban.so
 %{_libexecdir}/proftpd/mod_ifsession.so
@@ -196,6 +197,13 @@
 
 
 %changelog
+* Mon Dec 22 2008 Matthias Saou <http://freshrpms.net/> 1.3.2-0.1.rc3
+- Update to 1.3.2rc3 (fixes security issue #464127)
+- Exclude new pkgconfig file, as we already exclude header files (if someone
+  ever needs to rebuild something against this proftpd, just ask and I'll split
+  out a devel package... but it seems pretty useless currently).
+- Remove no longer needed find-umode_t patch.
+
 * Fri Aug  8 2008 Matthias Saou <http://freshrpms.net/> 1.3.1-6
 - Add mod_ban support (#457289, Philip Prindeville).
 



From thias at fedoraproject.org  Fri Jan  2 12:52:18 2009
From: thias at fedoraproject.org (Matthias Saou)
Date: Fri,  2 Jan 2009 12:52:18 +0000 (UTC)
Subject: rpms/proftpd/F-10 proftpd-1.3.1-csrf.patch, NONE, 1.1 proftpd.spec, 
	1.40, 1.41
Message-ID: <20090102125218.CA60970130@cvs1.fedora.phx.redhat.com>

Author: thias

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

Modified Files:
	proftpd.spec 
Added Files:
	proftpd-1.3.1-csrf.patch 
Log Message:
Add Debian patch to fix CSRF vulnerability (#464127, upstream #3115) and backport recent minor changes on all current branches.


proftpd-1.3.1-csrf.patch:

--- NEW FILE proftpd-1.3.1-csrf.patch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 3115.dpatch by Francesco Paolo Lovergine <frankie at debian.org>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: No description.

@DPATCH@
diff -urNad trunk~/src/main.c trunk/src/main.c
--- trunk~/src/main.c	2008-09-21 23:50:55.000000000 +0200
+++ trunk/src/main.c	2008-09-21 23:50:55.000000000 +0200
@@ -674,12 +674,17 @@
   while (TRUE) {
     pr_signals_handle();
 
+    memset(buf,'\0',sizeof(buf));
+
     if (pr_netio_telnet_gets(buf, sizeof(buf)-1, session.c->instrm,
         session.c->outstrm) == NULL) {
 
-      if (PR_NETIO_ERRNO(session.c->instrm) == EINTR)
-        /* Simple interrupted syscall */
+      if (errno == E2BIG) {
+         /* The client sent a too-long command which was ignored; give
+          * them another chance?
+          */
 	continue;
+      }
 
 #ifndef PR_DEVEL_NO_DAEMON
       /* Otherwise, EOF */
@@ -695,20 +700,31 @@
 
     if (cmd_buf_size == -1) {
       int *bufsz = get_param_ptr(main_server->conf, "CommandBufferSize", FALSE);
+      size_t default_cmd_bufsz;
+
+      /* It's possible for the admin to select a PR_TUNABLE_BUFFER_SIZE which
+       * is smaller than PR_DEFAULT_CMD_BUFSZ.  We need to handle such cases
+       * properly.
+       */
+      default_cmd_bufsz = PR_DEFAULT_CMD_BUFSZ;
+      if (default_cmd_bufsz > sizeof(buf)) {
+        default_cmd_bufsz = sizeof(buf);
+      }
+  
       if (bufsz == NULL) {
-        cmd_buf_size = PR_DEFAULT_CMD_BUFSZ;
+        cmd_buf_size = default_cmd_bufsz;
 
       } else if (*bufsz <= 0) {
         pr_log_pri(PR_LOG_WARNING, "invalid CommandBufferSize size (%d) "
           "given, using default buffer size (%u) instead",
-          *bufsz, PR_DEFAULT_CMD_BUFSZ);
-        cmd_buf_size = PR_DEFAULT_CMD_BUFSZ;
+          *bufsz, default_cmd_bufsz);
+        cmd_buf_size = default_cmd_bufsz;
 
       } else if (*bufsz + 1 > sizeof(buf)) {
         pr_log_pri(PR_LOG_WARNING, "invalid CommandBufferSize size (%d) "
           "given, using default buffer size (%u) instead",
-          *bufsz, PR_DEFAULT_CMD_BUFSZ);
-        cmd_buf_size = PR_DEFAULT_CMD_BUFSZ;
+          *bufsz, default_cmd_bufsz);
+        cmd_buf_size = default_cmd_bufsz;
 
       } else {
         pr_log_debug(DEBUG1, "setting CommandBufferSize to %d", *bufsz);
diff -urNad trunk~/src/netio.c trunk/src/netio.c
--- trunk~/src/netio.c	2008-09-21 23:39:34.000000000 +0200
+++ trunk/src/netio.c	2008-09-21 23:52:17.000000000 +0200
@@ -1,6 +1,6 @@
 /*
  * ProFTPD - FTP server daemon
- * Copyright (c) 2001-2007 The ProFTPD Project team
+ * Copyright (c) 2001-2008 The ProFTPD Project team
  *
  * 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
@@ -30,19 +30,19 @@
 #include <signal.h>
 
 #ifndef IAC
-#define IAC	255
+# define IAC	255
 #endif
 #ifndef DONT
-#define DONT	254
+# define DONT	254
 #endif
 #ifndef DO
-#define DO	253
+# define DO	253
 #endif
 #ifndef WONT
-#define WONT	252
+# define WONT	252
 #endif
 #ifndef WILL
-#define WILL	251
+# define WILL	251
 #endif
 
 static const char *trace_channel = "netio";
@@ -51,6 +51,17 @@
 static pr_netio_t *core_data_netio = NULL, *data_netio = NULL;
 static pr_netio_t *core_othr_netio = NULL, *othr_netio = NULL;
 
+/* Used to track whether the previous text read from the client's control
+ * connection was a properly-terminated command.  If so, then read in the
+ * next/current text as per normal.  If NOT (e.g. the client sent a too-long
+ * command), then read in the next/current text, but ignore it.  Only clear
+ * this flag if the next/current command can be read as per normal.
+ *
+ * The pr_netio_telnet_gets() uses this variable, in conjunction with its
+ * saw_newline flag, for handling too-long commands from clients.
+ */
+static int properly_terminated_prev_command = TRUE;
+
 static pr_netio_stream_t *netio_stream_alloc(pool *parent_pool) {
   pool *netio_pool = NULL;
   pr_netio_stream_t *nstrm = NULL;
@@ -911,7 +922,7 @@
   char *bp = buf;
   unsigned char cp;
   static unsigned char mode = 0;
-  int toread;
+  int toread, saw_newline = FALSE;
   pr_buffer_t *pbuf = NULL;
 
   if (buflen == 0) {
@@ -940,8 +951,9 @@
           *bp = '\0';
           return buf;
 
-        } else
+        } else {
           return NULL;
+        }
       }
 
       pbuf->remaining = pbuf->buflen - toread;
@@ -1004,6 +1016,8 @@
       toread--;
       *bp++ = *pbuf->current++;
       pbuf->remaining++;
+
+      saw_newline = TRUE;
       break;
     }
 
@@ -1011,6 +1025,25 @@
       pbuf->current = NULL;
   }
 
+  if (!saw_newline) {
+    /* If we haven't seen a newline, then assume the client is deliberately
+     * sending a too-long command, trying to exploit buffer sizes and make
+     * the server make some possibly bad assumptions.
+     */
+
+    properly_terminated_prev_command = FALSE;
+    errno = E2BIG;
+    return NULL;
+  }
+
+  if (!properly_terminated_prev_command) {
+    properly_terminated_prev_command = TRUE;
+    pr_log_pri(PR_LOG_NOTICE, "client sent too-long command, ignoring");
+    errno = E2BIG;
+    return NULL;
+  }
+
+  properly_terminated_prev_command = TRUE;
   *bp = '\0';
   return buf;
 }


Index: proftpd.spec
===================================================================
RCS file: /cvs/extras/rpms/proftpd/F-10/proftpd.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- proftpd.spec	8 Aug 2008 11:06:32 -0000	1.40
+++ proftpd.spec	2 Jan 2009 12:51:48 -0000	1.41
@@ -1,7 +1,7 @@
 Summary: Flexible, stable and highly-configurable FTP server
 Name: proftpd
 Version: 1.3.1
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: GPLv2+
 Group: System Environment/Daemons
 URL: http://www.proftpd.org/
@@ -15,6 +15,7 @@
 Source7: proftpd-mod_quotatab_ldap.ldif
 Source8: proftpd-mod_quotatab_ldap.schema
 Patch0: proftpd-1.3.1-find-umode_t.patch
+Patch1: proftpd-1.3.1-csrf.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires: pam >= 0.59
 Requires(post): /sbin/chkconfig
@@ -66,6 +67,7 @@
 %prep
 %setup -q
 %patch0 -p1 -b .find-umode_t
+%patch1 -p1 -b .csrf
 
 
 %build
@@ -196,6 +198,9 @@
 
 
 %changelog
+* Fri Jan  2 2009 Matthias Saou <http://freshrpms.net/> 1.3.1-7
+- Add Debian patch to fix CSRF vulnerability (#464127, upstream #3115).
+
 * Fri Aug  8 2008 Matthias Saou <http://freshrpms.net/> 1.3.1-6
 - Add mod_ban support (#457289, Philip Prindeville).
 



From thias at fedoraproject.org  Fri Jan  2 12:54:18 2009
From: thias at fedoraproject.org (Matthias Saou)
Date: Fri,  2 Jan 2009 12:54:18 +0000 (UTC)
Subject: rpms/proftpd/devel .cvsignore,1.11,1.12 sources,1.11,1.12
Message-ID: <20090102125418.984E670130@cvs1.fedora.phx.redhat.com>

Author: thias

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

Modified Files:
	.cvsignore sources 
Log Message:
Update to 1.3.2rc3 (fixes security issue #464127).



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/proftpd/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	9 Oct 2007 17:37:01 -0000	1.11
+++ .cvsignore	2 Jan 2009 12:53:48 -0000	1.12
@@ -1 +1 @@
-proftpd-1.3.1.tar.bz2
+proftpd-1.3.2rc3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/proftpd/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	9 Oct 2007 17:37:01 -0000	1.11
+++ sources	2 Jan 2009 12:53:48 -0000	1.12
@@ -1 +1 @@
-175958df8de92d5209b7b1e2e23a5a28  proftpd-1.3.1.tar.bz2
+8ecfc2976aa6a5016bd4f4f6745aa3d4  proftpd-1.3.2rc3.tar.bz2



From akahl at fedoraproject.org  Fri Jan  2 12:59:10 2009
From: akahl at fedoraproject.org (Alexander Kahl)
Date: Fri,  2 Jan 2009 12:59:10 +0000 (UTC)
Subject: rpms/php-ZendFramework/F-9 php-ZendFramework.spec, 1.5, 1.6 sources,
	1.5, 1.6
Message-ID: <20090102125910.E643070130@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-serv5628

Modified Files:
	php-ZendFramework.spec sources 
Log Message:
* update to 1.7.2



Index: php-ZendFramework.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php-ZendFramework/F-9/php-ZendFramework.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- php-ZendFramework.spec	20 Nov 2008 10:04:59 -0000	1.5
+++ php-ZendFramework.spec	2 Jan 2009 12:58:40 -0000	1.6
@@ -2,8 +2,8 @@
 
 Summary:         Leading open-source PHP framework
 Name:            php-ZendFramework
-Version:         1.7.0
-Release:         2%{?dist}
+Version:         1.7.2
+Release:         1%{?dist}
 
 License:         BSD
 Group:           Development/Libraries
@@ -33,12 +33,6 @@
 Requires: php-xml
 BuildRequires: symlinks
 
-# For ZendX documentation
-BuildRequires: autoconf, make
-BuildRequires: libxslt, libxml2
-BuildRequires: docbook-style-xsl
-
-
 %description
 Extending the art & spirit of PHP, Zend Framework is based on simplicity,
 object-oriented best practices, corporate friendly licensing, and a rigorously
@@ -63,6 +57,8 @@
 Group:    Development/Libraries
 Requires: %{name} = %{version}-%{release}
 Requires: php-pear(pear.phpunit.de/PHPUnit) >= 3.0.0
+Requires: bitstream-vera-fonts
+BuildRequires: bitstream-vera-fonts
 
 %description tests
 This package includes Zend Framework unit tests for all available subpackages.
@@ -276,12 +272,6 @@
 
 %{__cat} executables valid_executables|sort|uniq -u > invalid_executables
 
-cd extras/documentation/manual/en
-%{__autoconf}
-%configure --with-xsltproc="$(which xsltproc) --path \
-           '%{_datadir}/sgml/docbook/xsl-stylesheets/htmlhelp' --nonet"
-%{__make} %{?_smp_mflags}
-cd ../../../..
 
 %install
 %{__rm} -rf $RPM_BUILD_ROOT
@@ -311,6 +301,22 @@
 # symlinks -c $RPM_BUILD_ROOT%{_bindir} > /dev/null
 # cd ..
 
+
+# Bug 477440
+%{__mkdir_p} $RPM_BUILD_ROOT%{_datadir}/fonts/bitstream-vera
+
+cd $RPM_BUILD_ROOT%{_datadir}/php/Zend/tests/Zend/Pdf/_fonts
+%{__rm} -f *.ttf
+
+for file in /usr/share/fonts/bitstream-vera/*.ttf
+do
+  touch $RPM_BUILD_ROOT${file}
+done
+%{__ln_s} $RPM_BUILD_ROOT%{_datadir}/fonts/bitstream-vera/* .
+symlinks -c . > /dev/null
+%{__rm} -rf $RPM_BUILD_ROOT%{_datadir}/fonts
+
+
 %clean
 %{__rm} -rf $RPM_BUILD_ROOT
 
@@ -372,7 +378,7 @@
 %files extras
 %defattr(-,root,root,-)
 %{_datadir}/php/ZendX
-%doc LICENSE.txt extras/documentation/manual/en/html/*
+%doc LICENSE.txt extras/documentation/api/extras/*
 
 %files Cache-Backend-Apc
 %defattr(-,root,root,-)
@@ -447,6 +453,11 @@
 
 
 %changelog
+* Fri Jan  2 2009 Alexander Kahl <akahl at iconmobile.com> - 1.7.2-1
+- update to 1.7.2
+- ZendX documentation doesn't need regeneration anymore, removed deps
+- Bug 477440: Use Vera fonts from Fedora's package
+
 * Thu Nov 20 2008 Alexander Kahl <akahl at iconmobile.com> - 1.7.0-2
 - bump, forgot internal docbook fix from rawhide build
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-ZendFramework/F-9/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	20 Nov 2008 10:04:59 -0000	1.5
+++ sources	2 Jan 2009 12:58:40 -0000	1.6
@@ -1 +1 @@
-423629a9be793d3b6df352913f8c1401  ZendFramework-1.7.0.tar.gz
+7bc33a0ed379f30ab408ecd546025a1b  ZendFramework-1.7.2.tar.gz



From iarnell at fedoraproject.org  Fri Jan  2 13:27:15 2009
From: iarnell at fedoraproject.org (Iain Arnell)
Date: Fri,  2 Jan 2009 13:27:15 +0000 (UTC)
Subject: rpms/vim-perl-support/devel sources, 1.3, 1.4 vim-perl-support.spec,
	1.2, 1.3 perl-input.patch, 1.1, NONE
Message-ID: <20090102132715.0F06A70130@cvs1.fedora.phx.redhat.com>

Author: iarnell

Update of /cvs/pkgs/rpms/vim-perl-support/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12961

Modified Files:
	sources vim-perl-support.spec 
Removed Files:
	perl-input.patch 
Log Message:
* Fri Jan 02 2009 Iain Arnell <iarnell at gmail.com> 4.0.1-1
- Bugfix: Error message in some functions that issue a prompt.



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/vim-perl-support/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	2 Jan 2009 09:42:33 -0000	1.3
+++ sources	2 Jan 2009 13:26:44 -0000	1.4
@@ -1 +1 @@
-a862a2a0359a35bad676e60dc94f6779  perl-support.zip
+cb838493081073a91d3891e549aacd8f  perl-support.zip


Index: vim-perl-support.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vim-perl-support/devel/vim-perl-support.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- vim-perl-support.spec	2 Jan 2009 09:42:33 -0000	1.2
+++ vim-perl-support.spec	2 Jan 2009 13:26:44 -0000	1.3
@@ -1,5 +1,5 @@
 Name:           vim-perl-support
-Version:        4.0
+Version:        4.0.1
 Release:        1%{?dist}
 Summary:        Perl-IDE for VIM
 
@@ -7,13 +7,10 @@
 # according to plugin/perl-support.vim
 License:        GPLv2
 URL:            http://www.vim.org/scripts/script.php?script_id=556
-# curl -o perl-support.zip 'http://www.vim.org/scripts/download_script.php?src_id=9701'
+# curl -o perl-support.zip 'http://www.vim.org/scripts/download_script.php?src_id=9746'
 Source0:        perl-support.zip
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
-# reported to VIM-Plugins-List
-Patch0:         perl-input.patch
-
 BuildArch:      noarch
 
 Requires:         vim-enhanced
@@ -50,7 +47,6 @@
 
 %prep
 %setup -q -c
-%patch0 -p 1 -b .orig
 
 # strip out false provides/requires from codesnippets
 cat << \EOF > %{name}-prov
@@ -134,6 +130,9 @@
 
 
 %changelog
+* Fri Jan 02 2009 Iain Arnell <iarnell at gmail.com> 4.0.1-1
+- Bugfix: Error message in some functions that issue a prompt.
+
 * Fri Jan 02 2009 Iain Arnell <iarnell at gmail.com> 4.0-1
 - update to 4.0:
  + Completely new template system. Most menu items now user definable.


--- perl-input.patch DELETED ---



From dtimms at fedoraproject.org  Fri Jan  2 13:27:50 2009
From: dtimms at fedoraproject.org (David Timms)
Date: Fri,  2 Jan 2009 13:27:50 +0000 (UTC)
Subject: rpms/audacity/F-10 audacity-1.3.5-portaudio-non-mmap-alsa.patch,
	NONE, 1.1 audacity.spec, 1.61, 1.62
Message-ID: <20090102132750.40A2970130@cvs1.fedora.phx.redhat.com>

Author: dtimms

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

Modified Files:
	audacity.spec 
Added Files:
	audacity-1.3.5-portaudio-non-mmap-alsa.patch 
Log Message:
add PortAudio patch to use pulseaudio


audacity-1.3.5-portaudio-non-mmap-alsa.patch:

--- NEW FILE audacity-1.3.5-portaudio-non-mmap-alsa.patch ---
diff -ur portaudio/src/hostapi/alsa/pa_linux_alsa.c portaudio-pulseaudio/src/hostapi/alsa/pa_linux_alsa.c
--- portaudio/src/hostapi/alsa/pa_linux_alsa.c	2007-09-12 19:39:48.000000000 +0200
+++ portaudio-pulseaudio/src/hostapi/alsa/pa_linux_alsa.c	2008-12-08 19:30:20.000000000 +0100
@@ -6,6 +6,7 @@
  *
  * Copyright (c) 2002 Joshua Haberman <joshua at haberman.com>
  * Copyright (c) 2005-2007 Arve Knudsen <aknuds-1 at broadpark.no>
+ * Copyright (c) 2008 Kevin Kofler <kevin.kofler at chello.at>
  *
  * Based on the Open Source API proposed by Ross Bencina
  * Copyright (c) 1999-2002 Ross Bencina, Phil Burk
@@ -118,6 +119,8 @@
     unsigned long framesPerBuffer;
     int numUserChannels, numHostChannels;
     int userInterleaved, hostInterleaved;
+    int canMmap;
+    void *nonMmapBuffer;
     PaDeviceIndex device;     /* Keep the device index */
 
     snd_pcm_t *pcm;
@@ -321,7 +324,7 @@
  * and a suitable result returned. The device is closed before returning.
  */
 static PaError GropeDevice( snd_pcm_t* pcm, int isPlug, StreamDirection mode, int openBlocking,
-        PaAlsaDeviceInfo* devInfo, int* canMmap )
+        PaAlsaDeviceInfo* devInfo )
 {
     PaError result = paNoError;
     snd_pcm_hw_params_t *hwParams;
@@ -354,9 +357,6 @@
     snd_pcm_hw_params_alloca( &hwParams );
     snd_pcm_hw_params_any( pcm, hwParams );
 
-    *canMmap = snd_pcm_hw_params_test_access( pcm, hwParams, SND_PCM_ACCESS_MMAP_INTERLEAVED ) >= 0 ||
-            snd_pcm_hw_params_test_access( pcm, hwParams, SND_PCM_ACCESS_MMAP_NONINTERLEAVED ) >= 0;
-
     if( defaultSr >= 0 )
     {
         /* Could be that the device opened in one mode supports samplerates that the other mode wont have,
@@ -566,7 +566,6 @@
     PaError result = 0;
     PaDeviceInfo *baseDeviceInfo = &devInfo->baseDeviceInfo;
     snd_pcm_t *pcm;
-    int canMmap = -1;
     PaUtilHostApiRepresentation *baseApi = &alsaApi->baseHostApiRep;
 
     /* Zero fields */
@@ -580,8 +579,7 @@
             OpenPcm( &pcm, deviceName->alsaName, SND_PCM_STREAM_CAPTURE, blocking, 0 )
             >= 0 )
     {
-        if( GropeDevice( pcm, deviceName->isPlug, StreamDirection_In, blocking, devInfo,
-                    &canMmap ) != paNoError )
+        if( GropeDevice( pcm, deviceName->isPlug, StreamDirection_In, blocking, devInfo ) != paNoError )
         {
             /* Error */
             PA_DEBUG(("%s: Failed groping %s for capture\n", __FUNCTION__, deviceName->alsaName));
@@ -594,8 +592,7 @@
             OpenPcm( &pcm, deviceName->alsaName, SND_PCM_STREAM_PLAYBACK, blocking, 0 )
             >= 0 )
     {
-        if( GropeDevice( pcm, deviceName->isPlug, StreamDirection_Out, blocking, devInfo,
-                    &canMmap ) != paNoError )
+        if( GropeDevice( pcm, deviceName->isPlug, StreamDirection_Out, blocking, devInfo ) != paNoError )
         {
             /* Error */
             PA_DEBUG(("%s: Failed groping %s for playback\n", __FUNCTION__, deviceName->alsaName));
@@ -603,12 +600,6 @@
         }
     }
 
-    if( 0 == canMmap )
-    {
-        PA_DEBUG(("%s: Device %s doesn't support mmap\n", __FUNCTION__, deviceName->alsaName));
-        goto end;
-    }
-
     baseDeviceInfo->structVersion = 2;
     baseDeviceInfo->hostApi = alsaApi->hostApiIndex;
     baseDeviceInfo->name = deviceName->name;
@@ -1197,6 +1188,8 @@
     self->hostInterleaved = self->userInterleaved = !(userSampleFormat & paNonInterleaved);
     self->numUserChannels = params->channelCount;
     self->streamDir = streamDir;
+    self->canMmap = 0;
+    self->nonMmapBuffer = NULL;
 
     if( !callbackMode && !self->userInterleaved )
     {
@@ -1239,6 +1232,7 @@
 
     PaError result = paNoError;
     snd_pcm_access_t accessMode, alternateAccessMode;
+    snd_pcm_access_t rwAccessMode, alternateRwAccessMode;
     int dir = 0;
     snd_pcm_t *pcm = self->pcm;
     double sr = *sampleRate;
@@ -1258,32 +1252,40 @@
     if( self->userInterleaved )
     {
         accessMode = SND_PCM_ACCESS_MMAP_INTERLEAVED;
+        rwAccessMode = SND_PCM_ACCESS_RW_INTERLEAVED;
         alternateAccessMode = SND_PCM_ACCESS_MMAP_NONINTERLEAVED;
+        alternateRwAccessMode = SND_PCM_ACCESS_RW_NONINTERLEAVED;
     }
     else
     {
         accessMode = SND_PCM_ACCESS_MMAP_NONINTERLEAVED;
+        rwAccessMode = SND_PCM_ACCESS_RW_NONINTERLEAVED;
         alternateAccessMode = SND_PCM_ACCESS_MMAP_INTERLEAVED;
+        alternateRwAccessMode = SND_PCM_ACCESS_RW_INTERLEAVED;
     }
     /* If requested access mode fails, try alternate mode */
+    self->canMmap = 1;
     if( snd_pcm_hw_params_set_access( pcm, hwParams, accessMode ) < 0 )
     {
-        int err = 0;
-        if( (err = snd_pcm_hw_params_set_access( pcm, hwParams, alternateAccessMode )) < 0)
+        if( snd_pcm_hw_params_set_access( pcm, hwParams, rwAccessMode ) >= 0 )
+            self->canMmap = 0;
+        else
         {
-            result = paUnanticipatedHostError;
-            if( -EINVAL == err )
+            if( snd_pcm_hw_params_set_access( pcm, hwParams, alternateAccessMode ) < 0 )
             {
-                PaUtil_SetLastHostErrorInfo( paALSA, err, "PA ALSA requires that a device supports mmap access" );
-            }
-            else
-            {
-                PaUtil_SetLastHostErrorInfo( paALSA, err, snd_strerror( err ) );
+                int err = 0;
+                if( (err = snd_pcm_hw_params_set_access( pcm, hwParams, alternateRwAccessMode )) >= 0)
+                    self->canMmap = 0;
+                else
+                {
+                    result = paUnanticipatedHostError;
+                    PaUtil_SetLastHostErrorInfo( paALSA, err, snd_strerror( err ) );
+                    goto error;
+                }
             }
-            goto error;
+            /* Flip mode */
+            self->hostInterleaved = !self->userInterleaved;
         }
-        /* Flip mode */
-        self->hostInterleaved = !self->userInterleaved;
     }
 
     ENSURE_( snd_pcm_hw_params_set_format( pcm, hwParams, self->nativeFormat ), paUnanticipatedHostError );
@@ -1361,7 +1363,7 @@
         
     ENSURE_( snd_pcm_sw_params_set_avail_min( self->pcm, swParams, self->framesPerBuffer ), paUnanticipatedHostError );
     ENSURE_( snd_pcm_sw_params_set_xfer_align( self->pcm, swParams, 1 ), paUnanticipatedHostError );
-    ENSURE_( snd_pcm_sw_params_set_tstamp_mode( self->pcm, swParams, SND_PCM_TSTAMP_MMAP ), paUnanticipatedHostError );
+    ENSURE_( snd_pcm_sw_params_set_tstamp_mode( self->pcm, swParams, SND_PCM_TSTAMP_ENABLE ), paUnanticipatedHostError );
 
     /* Set the parameters! */
     ENSURE_( snd_pcm_sw_params( self->pcm, swParams ), paUnanticipatedHostError );
@@ -1589,6 +1591,10 @@
         }
     }
 
+    /* non-mmap mode needs a reasonably-sized buffer or it'll stutter */
+    if( !self->canMmap && framesPerHostBuffer < 2048 )
+        framesPerHostBuffer = 2048;
+
     assert( framesPerHostBuffer > 0 );
     {
         snd_pcm_uframes_t min = 0, max = 0;
@@ -1831,12 +1837,13 @@
     PA_UNLESS( framesPerHostBuffer != 0, paInternalError );
     self->maxFramesPerHostBuffer = framesPerHostBuffer;
 
-    if( !accurate )
+    if( !self->playback.canMmap || !accurate )
     {
         /* Don't know the exact size per host buffer */
         *hostBufferSizeMode = paUtilBoundedHostBufferSize;
         /* Raise upper bound */
-        ++self->maxFramesPerHostBuffer;
+        if( !accurate )
+            ++self->maxFramesPerHostBuffer;
     }
 
 error:
@@ -2059,9 +2066,11 @@
             {
                 /* Buffer isn't primed, so prepare and silence */
                 ENSURE_( snd_pcm_prepare( stream->playback.pcm ), paUnanticipatedHostError );
-                SilenceBuffer( stream );
+                if( stream->playback.canMmap )
+                    SilenceBuffer( stream );
             }
-            ENSURE_( snd_pcm_start( stream->playback.pcm ), paUnanticipatedHostError );
+            if( stream->playback.canMmap )
+                ENSURE_( snd_pcm_start( stream->playback.pcm ), paUnanticipatedHostError );
         }
         else
             ENSURE_( snd_pcm_prepare( stream->playback.pcm ), paUnanticipatedHostError );
@@ -2390,6 +2399,7 @@
     snd_pcm_status_t *st;
     PaTime now = PaUtil_GetTime();
     snd_timestamp_t t;
+    int errplayback = 0, errcapture = 0;
 
     snd_pcm_status_alloca( &st );
 
@@ -2400,6 +2410,7 @@
         {
             snd_pcm_status_get_trigger_tstamp( st, &t );
             self->underrun = now * 1000 - ((PaTime) t.tv_sec * 1000 + (PaTime) t.tv_usec / 1000);
+            errplayback = snd_pcm_recover( self->playback.pcm, -EPIPE, 0 );
         }
     }
     if( self->capture.pcm )
@@ -2409,10 +2420,12 @@
         {
             snd_pcm_status_get_trigger_tstamp( st, &t );
             self->overrun = now * 1000 - ((PaTime) t.tv_sec * 1000 + (PaTime) t.tv_usec / 1000);
+            errcapture = snd_pcm_recover( self->capture.pcm, -EPIPE, 0 );
         }
     }
 
-    PA_ENSURE( AlsaRestart( self ) );
+    if( errplayback || errcapture )
+        PA_ENSURE( AlsaRestart( self ) );
 
 end:
     return result;
@@ -2563,7 +2576,7 @@
 static PaError PaAlsaStreamComponent_EndProcessing( PaAlsaStreamComponent *self, unsigned long numFrames, int *xrun )
 {
     PaError result = paNoError;
-    int res;
+    int res = 0;
 
     /* @concern FullDuplex It is possible that only one direction is marked ready after polling, and processed
      * afterwards
@@ -2571,7 +2584,34 @@
     if( !self->ready )
         goto end;
 
-    res = snd_pcm_mmap_commit( self->pcm, self->offset, numFrames );
+    if( !self->canMmap && StreamDirection_Out == self->streamDir )
+    {
+        /* Play sound */
+        if( self->hostInterleaved )
+            res = snd_pcm_writei( self->pcm, self->nonMmapBuffer, numFrames );
+        else
+        {
+            void *bufs[self->numHostChannels];
+            int bufsize = snd_pcm_format_size( self->nativeFormat, self->framesPerBuffer + 1 );
+            unsigned char *buffer = self->nonMmapBuffer;
+            int i;
+            for( i = 0; i < self->numHostChannels; ++i )
+            {
+                bufs[i] = buffer;
+                buffer += bufsize;
+            }
+            res = snd_pcm_writen( self->pcm, bufs, numFrames );
+        }
+    }
+
+    if( self->canMmap )
+        res = snd_pcm_mmap_commit( self->pcm, self->offset, numFrames );
+    else
+    {
+        free( self->nonMmapBuffer );
+        self->nonMmapBuffer = NULL;
+    }
+
     if( res == -EPIPE || res == -ESTRPIPE )
     {
         *xrun = 1;
@@ -2611,7 +2651,7 @@
     if( self->hostInterleaved )
     {
         int swidth = snd_pcm_format_size( self->nativeFormat, 1 );
-        unsigned char *buffer = ExtractAddress( self->channelAreas, self->offset );
+        unsigned char *buffer = self->canMmap ? ExtractAddress( self->channelAreas, self->offset ) : self->nonMmapBuffer;
 
         /* Start after the last user channel */
         p = buffer + self->numUserChannels * swidth;
@@ -2991,13 +3031,23 @@
         goto end;
     }
 
-    ENSURE_( snd_pcm_mmap_begin( self->pcm, &areas, &self->offset, numFrames ), paUnanticipatedHostError );
+    if( self->canMmap )
+    {
+        ENSURE_( snd_pcm_mmap_begin( self->pcm, &areas, &self->offset, numFrames ), paUnanticipatedHostError );
+        /* @concern ChannelAdaption Buffer address is recorded so we can do some channel adaption later */
+        self->channelAreas = (snd_pcm_channel_area_t *)areas;
+    }
+    else
+    {
+        free( self->nonMmapBuffer );
+        self->nonMmapBuffer = calloc( self->numHostChannels, snd_pcm_format_size( self->nativeFormat, self->framesPerBuffer + 1 ) );
+    }
 
     if( self->hostInterleaved )
     {
         int swidth = snd_pcm_format_size( self->nativeFormat, 1 );
 
-        p = buffer = ExtractAddress( areas, self->offset );
+        p = buffer = self->canMmap ? ExtractAddress( areas, self->offset ) : self->nonMmapBuffer;
         for( i = 0; i < self->numUserChannels; ++i )
         {
             /* We're setting the channels up to userChannels, but the stride will be hostChannels samples */
@@ -3007,16 +3057,52 @@
     }
     else
     {
-        for( i = 0; i < self->numUserChannels; ++i )
+        if( self->canMmap )
+            for( i = 0; i < self->numUserChannels; ++i )
+            {
+                area = areas + i;
+                buffer = ExtractAddress( area, self->offset );
+                setChannel( bp, i, buffer, 1 );
+            }
+        else
         {
-            area = areas + i;
-            buffer = ExtractAddress( area, self->offset );
-            setChannel( bp, i, buffer, 1 );
+            int bufsize = snd_pcm_format_size( self->nativeFormat, self->framesPerBuffer + 1 );
+            buffer = self->nonMmapBuffer;
+            for( i = 0; i < self->numUserChannels; ++i )
+            {
+                setChannel( bp, i, buffer, 1 );
+                buffer += bufsize;
+            }
         }
     }
 
-    /* @concern ChannelAdaption Buffer address is recorded so we can do some channel adaption later */
-    self->channelAreas = (snd_pcm_channel_area_t *)areas;
+    if( !self->canMmap && StreamDirection_In == self->streamDir )
+    {
+        /* Read sound */
+        int res;
+        if( self->hostInterleaved )
+            res = snd_pcm_readi( self->pcm, self->nonMmapBuffer, *numFrames );
+        else
+        {
+            void *bufs[self->numHostChannels];
+            int bufsize = snd_pcm_format_size( self->nativeFormat, self->framesPerBuffer + 1 );
+            unsigned char *buffer = self->nonMmapBuffer;
+            int i;
+            for( i = 0; i < self->numHostChannels; ++i )
+            {
+                bufs[i] = buffer;
+                buffer += bufsize;
+            }
+            res = snd_pcm_readn( self->pcm, bufs, *numFrames );
+        }
+        if( res == -EPIPE || res == -ESTRPIPE )
+        {
+            *xrun = 1;
+            *numFrames = 0;
+            free( self->nonMmapBuffer );
+            self->nonMmapBuffer = NULL;
+        }
+    }
 
 end:
 error:
diff -ur portaudio/src/os/unix/pa_unix_hostapis.c portaudio-pulseaudio/src/os/unix/pa_unix_hostapis.c
--- portaudio/src/os/unix/pa_unix_hostapis.c	2006-08-26 10:27:53.000000000 +0200
+++ portaudio-pulseaudio/src/os/unix/pa_unix_hostapis.c	2008-11-09 04:51:04.000000000 +0100
@@ -75,4 +75,8 @@
         0   /* NULL terminated array */
     };
 
+#if defined(PA_USE_OSS) && defined(PA_USE_ALSA)
+int paDefaultHostApiIndex = 1;
+#else
 int paDefaultHostApiIndex = 0;
+#endif


Index: audacity.spec
===================================================================
RCS file: /cvs/pkgs/rpms/audacity/F-10/audacity.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- audacity.spec	7 Nov 2008 12:59:46 -0000	1.61
+++ audacity.spec	2 Jan 2009 13:27:19 -0000	1.62
@@ -5,7 +5,7 @@
 
 Name: audacity
 Version: 1.3.5
-Release: 0.8.beta%{?dist}
+Release: 0.9.beta%{?dist}
 Summary: Multitrack audio editor
 Group: Applications/Multimedia
 License: GPLv2
@@ -19,6 +19,7 @@
 Patch2: audacity-1.3.5-libdir.patch
 Patch3: audacity-1.3.5-fr.patch
 Patch4: audacity-1.3.5-flac-import.patch
+Patch5: audacity-1.3.5-portaudio-non-mmap-alsa.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: alsa-lib-devel
@@ -64,6 +65,9 @@
 
 %patch3 -p1 -b .fr
 %patch4 -p1 -b .dumb-flac-import
+cd lib-src/portaudio-v19
+%patch5 -p1 -b .portaudio-non-mmap-alsa
+cd ../..
 
 # Substitute occurences of "libmp3lame.so" with "libmp3lame.so.0".
 for i in locale/*.po src/export/ExportMP3.cpp
@@ -134,6 +138,10 @@
 
 
 %changelog
+* Fri Jan  2 2009 David Timms <iinet.net.au at dtimms> - 1.3.5-0.9.beta
+- add PortAudio non mmap alsa patch (Kevin Kofler) bz 445644
+  allows record and playback through pulseaudio
+
 * Tue Nov  4 2008 Michael Schwendt <mschwendt at fedoraproject.org> - 1.3.5-0.8.beta
 - insert a guard in ImportFLAC next to the import assertion
 



From thias at fedoraproject.org  Fri Jan  2 13:32:19 2009
From: thias at fedoraproject.org (Matthias Saou)
Date: Fri,  2 Jan 2009 13:32:19 +0000 (UTC)
Subject: rpms/proftpd/devel proftpd.conf,1.8,1.9 proftpd.spec,1.41,1.42
Message-ID: <20090102133219.56CC670130@cvs1.fedora.phx.redhat.com>

Author: thias

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

Modified Files:
	proftpd.conf proftpd.spec 
Log Message:
Update default configuration to have a lit of available modules and more example configuration for them.



Index: proftpd.conf
===================================================================
RCS file: /cvs/extras/rpms/proftpd/devel/proftpd.conf,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- proftpd.conf	19 Aug 2007 16:18:30 -0000	1.8
+++ proftpd.conf	2 Jan 2009 13:31:48 -0000	1.9
@@ -91,9 +91,13 @@
 # SQL authentication Dynamic Shared Object (DSO) loading
 # See README.DSO and howto/DSO.html for more details.
 #<IfModule mod_dso.c>
-#   LoadModule mod_sql.c
-#   LoadModule mod_sql_mysql.c
-#   LoadModule mod_sql_postgres.c
+#  LoadModule mod_ban.c
+#  LoadModule mod_ifsession.c
+#  LoadModule mod_quotatab.c
+#  LoadModule mod_quotatab_file.c
+#  LoadModule mod_sql.c
+#  LoadModule mod_sql_mysql.c
+#  LoadModule mod_sql_postgres.c
 #</IfModule>
 
 # A basic anonymous configuration, with an upload directory.
@@ -148,3 +152,18 @@
 #
 #</Anonymous>
 
+# Configuration for mod_ban
+<IfModule mod_ban.c>
+  BanEngine on
+  BanLog /var/log/proftpd/ban.log
+  BanTable /var/run/proftpd/ban.tab
+
+  # If the same client reaches the MaxLoginAttempts limit 2 times
+  # within 10 minutes, automatically add a ban for that client that
+  # will expire after one hour.
+  BanOnEvent MaxLoginAttempts 2/00:10:00 01:00:00
+
+  # Allow the FTP admin to manually add/remove bans
+  BanControlsACLs all allow user ftpadm
+</IfModule>
+


Index: proftpd.spec
===================================================================
RCS file: /cvs/extras/rpms/proftpd/devel/proftpd.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- proftpd.spec	2 Jan 2009 12:51:49 -0000	1.41
+++ proftpd.spec	2 Jan 2009 13:31:48 -0000	1.42
@@ -3,7 +3,7 @@
 Summary: Flexible, stable and highly-configurable FTP server
 Name: proftpd
 Version: 1.3.2
-Release: 0.1%{?prever:.%{prever}}%{?dist}
+Release: 0.2%{?prever:.%{prever}}%{?dist}
 License: GPLv2+
 Group: System Environment/Daemons
 URL: http://www.proftpd.org/
@@ -197,6 +197,10 @@
 
 
 %changelog
+* Fri Jan  2 2009 Matthias Saou <http://freshrpms.net/> 1.3.2-0.2.rc3
+- Update default configuration to have a lit of available modules and more
+  example configuration for them.
+
 * Mon Dec 22 2008 Matthias Saou <http://freshrpms.net/> 1.3.2-0.1.rc3
 - Update to 1.3.2rc3 (fixes security issue #464127)
 - Exclude new pkgconfig file, as we already exclude header files (if someone



From thias at fedoraproject.org  Fri Jan  2 13:46:17 2009
From: thias at fedoraproject.org (Matthias Saou)
Date: Fri,  2 Jan 2009 13:46:17 +0000 (UTC)
Subject: rpms/proftpd/EL-4 proftpd-1.3.1-tls_debug.patch, NONE,
	1.1 proftpd-1.3.1-tls_shutdown.patch, NONE,
	1.1 proftpd-1.3.1-tls_sighup.patch, NONE, 1.1 proftpd.conf, 1.7,
	1.8 proftpd.spec, 1.10, 1.11
Message-ID: <20090102134618.064DA70130@cvs1.fedora.phx.redhat.com>

Author: thias

Update of /cvs/extras/rpms/proftpd/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19543/EL-4

Modified Files:
	proftpd.conf proftpd.spec 
Added Files:
	proftpd-1.3.1-tls_debug.patch proftpd-1.3.1-tls_shutdown.patch 
	proftpd-1.3.1-tls_sighup.patch 
Log Message:
Update default configuration to have a lit of available modules and more example configuration for them, include patches to fix TLS issues (#457280).


proftpd-1.3.1-tls_debug.patch:

--- NEW FILE proftpd-1.3.1-tls_debug.patch ---
diff -uNr proftpd-1.3.1.orig/contrib/mod_tls.c proftpd-1.3.1/contrib/mod_tls.c
--- proftpd-1.3.1.orig/contrib/mod_tls.c	2007-10-04 10:04:24.000000000 -0700
+++ proftpd-1.3.1/contrib/mod_tls.c	2008-08-10 07:54:21.000000000 -0700
@@ -969,6 +969,7 @@
       break;
 
     fseek(keyf, 0, SEEK_SET);
+    fprintf(stderr, "Error reading passphrase: %s", tls_get_errors());
     ERR_clear_error();
     fprintf(stderr, "\nWrong passphrase for this key.  Please try again.\n");
   }

proftpd-1.3.1-tls_shutdown.patch:

--- NEW FILE proftpd-1.3.1-tls_shutdown.patch ---
Index: contrib/mod_tls.c
===================================================================
RCS file: /cvsroot/proftp/proftpd/contrib/mod_tls.c,v
retrieving revision 1.138
diff -u -r1.138 mod_tls.c
--- contrib/mod_tls.c	20 May 2008 14:35:24 -0000	1.138
+++ contrib/mod_tls.c	30 Jul 2008 04:16:19 -0000
@@ -411,6 +411,8 @@
 /* SSL/TLS support functions */
 static void tls_closelog(void);
 static void tls_end_sess(SSL *, int, int);
+#define TLS_SHUTDOWN_BIDIRECTIONAL	0x0001
+
 static void tls_fatal_error(int, int);
 static const char *tls_get_errors(void);
 static char *tls_get_page(size_t, void **);
@@ -1428,7 +1430,7 @@
     } else if (tls_renegotiate_required) {
       tls_log("%s", "requested TLS renegotiation timed out on control channel");
       tls_log("%s", "shutting down control channel TLS session");
-      tls_end_sess(ctrl_ssl, PR_NETIO_STRM_CTRL, TRUE);
+      tls_end_sess(ctrl_ssl, PR_NETIO_STRM_CTRL, 0);
       tls_ctrl_rd_nstrm->strm_data = tls_ctrl_wr_nstrm->strm_data =
         ctrl_ssl = NULL;
     }
@@ -1444,8 +1446,7 @@
     } else if (tls_renegotiate_required) {
       tls_log("%s", "requested TLS renegotiation timed out on data channel");
       tls_log("%s", "shutting down data channel TLS session");
-      tls_end_sess((SSL *) tls_data_wr_nstrm->strm_data, PR_NETIO_STRM_DATA,
-        TRUE);
+      tls_end_sess((SSL *) tls_data_wr_nstrm->strm_data, PR_NETIO_STRM_DATA, 0);
       tls_data_rd_nstrm->strm_data = tls_data_wr_nstrm->strm_data = NULL;
     }
   }
@@ -1996,8 +1997,7 @@
 
     if (tls_handshake_timed_out) {
       tls_log("TLS negotiation timed out (%u seconds)", tls_handshake_timeout);
-      tls_end_sess(ssl, on_data ? PR_NETIO_STRM_DATA : PR_NETIO_STRM_CTRL,
-        TRUE);
+      tls_end_sess(ssl, on_data ? PR_NETIO_STRM_DATA : PR_NETIO_STRM_CTRL, 0);
       return -4;
     }
 
@@ -2043,8 +2043,7 @@
         break;
     }
 
-    tls_end_sess(ssl, on_data ? PR_NETIO_STRM_DATA : PR_NETIO_STRM_CTRL,
-      TRUE);
+    tls_end_sess(ssl, on_data ? PR_NETIO_STRM_DATA : PR_NETIO_STRM_CTRL, 0);
     return -3;
   }
 
@@ -2154,42 +2153,34 @@
   }
 }
 
-static void tls_end_sess(SSL *ssl, int strms, int use_shutdown) {
-  int res;
+static void tls_end_sess(SSL *ssl, int strms, int flags) {
+  int res = 0;
   int shutdown_state;
 
   if (!ssl)
     return;
 
-  res = SSL_shutdown(ssl);
-  if (res == 0) {
-    if (use_shutdown) {
-      /* Try calling SSL_shutdown() again.  First, though, send a TCP FIN
-       * to trigger the remote end's close_notify SSL message, via shutdown().
-       */
-      if (strms & PR_NETIO_STRM_CTRL) {
-        pr_netio_shutdown(session.c->outstrm, 1);
+  /* A 'close_notify' alert (SSL shutdown message) may have been previously
+   * sent to the client via tls_netio_shutdown_cb().
+   */
 
-        if (session.c->instrm != session.c->outstrm)
-          pr_netio_shutdown(session.c->instrm, 1);
-      }
+  shutdown_state = SSL_get_shutdown(ssl);
+  if (!(shutdown_state & SSL_SENT_SHUTDOWN)) {
+    /* 'close_notify' not already sent; send it now. */
+    res = SSL_shutdown(ssl);
+  }
 
-      if (strms & PR_NETIO_STRM_DATA) {
-        pr_netio_shutdown(session.d->outstrm, 1);
+  if (res == 0) {
+    /* Now call SSL_shutdown() again, but only if necessary. */
+    if (flags & TLS_SHUTDOWN_BIDIRECTIONAL) {
+      shutdown_state = SSL_get_shutdown(ssl);
 
-        if (session.d->instrm != session.d->outstrm)
-          pr_netio_shutdown(session.d->instrm, 1);
+      res = 1;
+      if (!(shutdown_state & SSL_RECEIVED_SHUTDOWN)) {
+        res = SSL_shutdown(ssl);
       }
     }
 
-    shutdown_state = SSL_get_shutdown(ssl);
-
-    /* Now call SSL_shutdown() again, but only if necessary. */
-    res = 1;
-    if (!(shutdown_state & SSL_RECEIVED_SHUTDOWN)) {
-      res = SSL_shutdown(ssl);
-    }
-
     if (res == 0) {
       int err = SSL_get_error(ssl, res);
 
@@ -2216,7 +2207,8 @@
           if (errno != 0 &&
               errno != EOF &&
               errno != EBADF &&
-              errno != EPIPE) {
+              errno != EPIPE &&
+              errno != EPERM) {
             tls_log("SSL_shutdown syscall error: %s", strerror(errno));
             pr_log_debug(DEBUG0, MOD_TLS_VERSION
               ": SSL_shutdown syscall error: %s", strerror(errno));
@@ -3811,7 +3803,7 @@
 
     if (nstrm->strm_type == PR_NETIO_STRM_CTRL &&
         nstrm->strm_mode == PR_NETIO_IO_WR) {
-      tls_end_sess((SSL *) nstrm->strm_data, nstrm->strm_type, TRUE);
+      tls_end_sess((SSL *) nstrm->strm_data, nstrm->strm_type, 0);
       tls_ctrl_rd_nstrm->strm_data = tls_ctrl_wr_nstrm->strm_data =
         nstrm->strm_data = NULL;
       tls_ctrl_netio = NULL;
@@ -3820,7 +3812,7 @@
 
     if (nstrm->strm_type == PR_NETIO_STRM_DATA &&
         nstrm->strm_mode == PR_NETIO_IO_WR) {
-      tls_end_sess((SSL *) nstrm->strm_data, nstrm->strm_type, TRUE);
+      tls_end_sess((SSL *) nstrm->strm_data, nstrm->strm_type, 0);
       tls_data_rd_nstrm->strm_data = tls_data_wr_nstrm->strm_data =
         nstrm->strm_data = NULL;
       tls_data_netio = NULL;
@@ -3931,7 +3923,7 @@
           X509_free(data_cert);
 
           /* Properly shutdown the SSL session. */
-          tls_end_sess((SSL *) nstrm->strm_data, nstrm->strm_type, TRUE);
+          tls_end_sess((SSL *) nstrm->strm_data, nstrm->strm_type, 0);
 
           tls_data_rd_nstrm->strm_data = tls_data_wr_nstrm->strm_data =
             nstrm->strm_data = NULL;
@@ -3987,6 +3979,28 @@
 }
 
 static int tls_netio_shutdown_cb(pr_netio_stream_t *nstrm, int how) {
+
+  if (how != 0) {
+    /* Closing this stream for writing; we need to send the 'close_notify'
+     * alert first, so that the client knows, at the application layer,
+     * that the SSL/TLS session is shutting down.
+     */
+
+    if (nstrm->strm_mode == PR_NETIO_IO_WR &&
+        (nstrm->strm_type == PR_NETIO_STRM_CTRL ||
+         nstrm->strm_type == PR_NETIO_STRM_DATA)) {
+      SSL *ssl;
+
+      ssl = (SSL *) nstrm->strm_data;
+      if (ssl) {
+        if (!(SSL_get_shutdown(ssl) & SSL_SENT_SHUTDOWN)) {
+          /* We haven't sent a 'close_notify' alert yet; do so now. */
+          SSL_shutdown(ssl);
+        }
+      }
+    }
+  }
+
   return shutdown(nstrm->strm_fd, how);
 }
 
@@ -4413,7 +4427,7 @@
    * The data channel, if protected, should remain so.
    */
 
-  tls_end_sess(ctrl_ssl, PR_NETIO_STRM_CTRL, FALSE);
+  tls_end_sess(ctrl_ssl, PR_NETIO_STRM_CTRL, TLS_SHUTDOWN_BIDIRECTIONAL);
   ctrl_ssl = tls_ctrl_rd_nstrm->strm_data = tls_ctrl_wr_nstrm->strm_data = NULL;
 
   /* Remove our NetIO for the control channel. */

proftpd-1.3.1-tls_sighup.patch:

--- NEW FILE proftpd-1.3.1-tls_sighup.patch ---
Index: src/log.c
===================================================================
RCS file: /cvsroot/proftp/proftpd/src/log.c,v
retrieving revision 1.85
diff -u -r1.85 log.c
--- src/log.c	24 Feb 2008 20:35:56 -0000	1.85
+++ src/log.c	13 Aug 2008 18:38:57 -0000
@@ -410,9 +410,10 @@
     /* The child may have inherited a valid socket from the parent. */
     pr_closelog(syslog_sockfd);
 
-    if ((syslog_sockfd = pr_openlog("proftpd", LOG_NDELAY|LOG_PID,
-        facility)) < 0)
+    syslog_sockfd = pr_openlog("proftpd", LOG_NDELAY|LOG_PID, facility);
+    if (syslog_sockfd < 0)
       return -1;
+
     systemlog_fd = -1;
 
   } else if ((res = pr_log_openfile(systemlog_fn, &systemlog_fd,
@@ -426,14 +427,11 @@
 }
 
 void log_closesyslog(void) {
-  if (systemlog_fd != -1) {
-    close(systemlog_fd);
-    systemlog_fd = -1;
+  (void) close(systemlog_fd);
+  systemlog_fd = -1;
 
-  } else {
-    pr_closelog(syslog_sockfd);
-    syslog_sockfd = -1;
-  }
+  (void) pr_closelog(syslog_sockfd);
+  syslog_sockfd = -1;
 
   syslog_open = FALSE;
 }
@@ -517,6 +515,7 @@
 
   if (!syslog_open) {
     syslog_sockfd = pr_openlog("proftpd", LOG_NDELAY|LOG_PID, f);
+    syslog_open = TRUE;
 
   } else if (f != facility) {
     (void) pr_setlogfacility(f);
@@ -531,14 +530,6 @@
     pr_syslog(syslog_sockfd, priority, "%s - %s\n", serverinfo, s);
   else
     pr_syslog(syslog_sockfd, priority, "%s\n", s);
-
-  if (!syslog_open) {
-    pr_closelog(syslog_sockfd);
-    syslog_sockfd = -1;
-
-  } else if (f != facility) {
-    (void) pr_setlogfacility(f);
-  }
 }
 
 void pr_log_pri(int priority, const char *fmt, ...) {


Index: proftpd.conf
===================================================================
RCS file: /cvs/extras/rpms/proftpd/EL-4/proftpd.conf,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- proftpd.conf	3 Feb 2008 18:02:39 -0000	1.7
+++ proftpd.conf	2 Jan 2009 13:45:47 -0000	1.8
@@ -91,9 +91,13 @@
 # SQL authentication Dynamic Shared Object (DSO) loading
 # See README.DSO and howto/DSO.html for more details.
 #<IfModule mod_dso.c>
-#   LoadModule mod_sql.c
-#   LoadModule mod_sql_mysql.c
-#   LoadModule mod_sql_postgres.c
+#  LoadModule mod_ban.c
+#  LoadModule mod_ifsession.c
+#  LoadModule mod_quotatab.c
+#  LoadModule mod_quotatab_file.c
+#  LoadModule mod_sql.c
+#  LoadModule mod_sql_mysql.c
+#  LoadModule mod_sql_postgres.c
 #</IfModule>
 
 # A basic anonymous configuration, with an upload directory.
@@ -148,3 +152,18 @@
 #
 #</Anonymous>
 
+# Configuration for mod_ban
+<IfModule mod_ban.c>
+  BanEngine on
+  BanLog /var/log/proftpd/ban.log
+  BanTable /var/run/proftpd/ban.tab
+
+  # If the same client reaches the MaxLoginAttempts limit 2 times
+  # within 10 minutes, automatically add a ban for that client that
+  # will expire after one hour.
+  BanOnEvent MaxLoginAttempts 2/00:10:00 01:00:00
+
+  # Allow the FTP admin to manually add/remove bans
+  BanControlsACLs all allow user ftpadm
+</IfModule>
+


Index: proftpd.spec
===================================================================
RCS file: /cvs/extras/rpms/proftpd/EL-4/proftpd.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- proftpd.spec	2 Jan 2009 12:51:47 -0000	1.10
+++ proftpd.spec	2 Jan 2009 13:45:47 -0000	1.11
@@ -1,7 +1,7 @@
 Summary: Flexible, stable and highly-configurable FTP server
 Name: proftpd
 Version: 1.3.1
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: GPLv2+
 Group: System Environment/Daemons
 URL: http://www.proftpd.org/
@@ -16,6 +16,9 @@
 Source8: proftpd-mod_quotatab_ldap.schema
 Patch0: proftpd-1.3.1-find-umode_t.patch
 Patch1: proftpd-1.3.1-csrf.patch
+Patch2: proftpd-1.3.1-tls_shutdown.patch
+Patch3: proftpd-1.3.1-tls_debug.patch
+Patch4: proftpd-1.3.1-tls_sighup.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires: pam >= 0.59
 Requires(post): /sbin/chkconfig
@@ -68,6 +71,9 @@
 %setup -q
 %patch0 -p1 -b .find-umode_t
 %patch1 -p1 -b .csrf
+%patch2 -p0 -b .tls_shutdown
+%patch3 -p1 -b .tls_debug.patch
+%patch4 -p0 -b .tls_sighup.patch
 
 
 %build
@@ -198,6 +204,11 @@
 
 
 %changelog
+* Fri Jan  2 2009 Matthias Saou <http://freshrpms.net/> 1.3.1-8
+- Update default configuration to have a lit of available modules and more
+  example configuration for them.
+- Include patches to fix TLS issues (#457280).
+
 * Fri Jan  2 2009 Matthias Saou <http://freshrpms.net/> 1.3.1-7
 - Add Debian patch to fix CSRF vulnerability (#464127, upstream #3115).
 



From thias at fedoraproject.org  Fri Jan  2 13:46:18 2009
From: thias at fedoraproject.org (Matthias Saou)
Date: Fri,  2 Jan 2009 13:46:18 +0000 (UTC)
Subject: rpms/proftpd/EL-5 proftpd-1.3.1-tls_debug.patch, NONE,
	1.1 proftpd-1.3.1-tls_shutdown.patch, NONE,
	1.1 proftpd-1.3.1-tls_sighup.patch, NONE, 1.1 proftpd.conf, 1.8,
	1.9 proftpd.spec, 1.30, 1.31
Message-ID: <20090102134618.7265270130@cvs1.fedora.phx.redhat.com>

Author: thias

Update of /cvs/extras/rpms/proftpd/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19543/EL-5

Modified Files:
	proftpd.conf proftpd.spec 
Added Files:
	proftpd-1.3.1-tls_debug.patch proftpd-1.3.1-tls_shutdown.patch 
	proftpd-1.3.1-tls_sighup.patch 
Log Message:
Update default configuration to have a lit of available modules and more example configuration for them, include patches to fix TLS issues (#457280).


proftpd-1.3.1-tls_debug.patch:

--- NEW FILE proftpd-1.3.1-tls_debug.patch ---
diff -uNr proftpd-1.3.1.orig/contrib/mod_tls.c proftpd-1.3.1/contrib/mod_tls.c
--- proftpd-1.3.1.orig/contrib/mod_tls.c	2007-10-04 10:04:24.000000000 -0700
+++ proftpd-1.3.1/contrib/mod_tls.c	2008-08-10 07:54:21.000000000 -0700
@@ -969,6 +969,7 @@
       break;
 
     fseek(keyf, 0, SEEK_SET);
+    fprintf(stderr, "Error reading passphrase: %s", tls_get_errors());
     ERR_clear_error();
     fprintf(stderr, "\nWrong passphrase for this key.  Please try again.\n");
   }

proftpd-1.3.1-tls_shutdown.patch:

--- NEW FILE proftpd-1.3.1-tls_shutdown.patch ---
Index: contrib/mod_tls.c
===================================================================
RCS file: /cvsroot/proftp/proftpd/contrib/mod_tls.c,v
retrieving revision 1.138
diff -u -r1.138 mod_tls.c
--- contrib/mod_tls.c	20 May 2008 14:35:24 -0000	1.138
+++ contrib/mod_tls.c	30 Jul 2008 04:16:19 -0000
@@ -411,6 +411,8 @@
 /* SSL/TLS support functions */
 static void tls_closelog(void);
 static void tls_end_sess(SSL *, int, int);
+#define TLS_SHUTDOWN_BIDIRECTIONAL	0x0001
+
 static void tls_fatal_error(int, int);
 static const char *tls_get_errors(void);
 static char *tls_get_page(size_t, void **);
@@ -1428,7 +1430,7 @@
     } else if (tls_renegotiate_required) {
       tls_log("%s", "requested TLS renegotiation timed out on control channel");
       tls_log("%s", "shutting down control channel TLS session");
-      tls_end_sess(ctrl_ssl, PR_NETIO_STRM_CTRL, TRUE);
+      tls_end_sess(ctrl_ssl, PR_NETIO_STRM_CTRL, 0);
       tls_ctrl_rd_nstrm->strm_data = tls_ctrl_wr_nstrm->strm_data =
         ctrl_ssl = NULL;
     }
@@ -1444,8 +1446,7 @@
     } else if (tls_renegotiate_required) {
       tls_log("%s", "requested TLS renegotiation timed out on data channel");
       tls_log("%s", "shutting down data channel TLS session");
-      tls_end_sess((SSL *) tls_data_wr_nstrm->strm_data, PR_NETIO_STRM_DATA,
-        TRUE);
+      tls_end_sess((SSL *) tls_data_wr_nstrm->strm_data, PR_NETIO_STRM_DATA, 0);
       tls_data_rd_nstrm->strm_data = tls_data_wr_nstrm->strm_data = NULL;
     }
   }
@@ -1996,8 +1997,7 @@
 
     if (tls_handshake_timed_out) {
       tls_log("TLS negotiation timed out (%u seconds)", tls_handshake_timeout);
-      tls_end_sess(ssl, on_data ? PR_NETIO_STRM_DATA : PR_NETIO_STRM_CTRL,
-        TRUE);
+      tls_end_sess(ssl, on_data ? PR_NETIO_STRM_DATA : PR_NETIO_STRM_CTRL, 0);
       return -4;
     }
 
@@ -2043,8 +2043,7 @@
         break;
     }
 
-    tls_end_sess(ssl, on_data ? PR_NETIO_STRM_DATA : PR_NETIO_STRM_CTRL,
-      TRUE);
+    tls_end_sess(ssl, on_data ? PR_NETIO_STRM_DATA : PR_NETIO_STRM_CTRL, 0);
     return -3;
   }
 
@@ -2154,42 +2153,34 @@
   }
 }
 
-static void tls_end_sess(SSL *ssl, int strms, int use_shutdown) {
-  int res;
+static void tls_end_sess(SSL *ssl, int strms, int flags) {
+  int res = 0;
   int shutdown_state;
 
   if (!ssl)
     return;
 
-  res = SSL_shutdown(ssl);
-  if (res == 0) {
-    if (use_shutdown) {
-      /* Try calling SSL_shutdown() again.  First, though, send a TCP FIN
-       * to trigger the remote end's close_notify SSL message, via shutdown().
-       */
-      if (strms & PR_NETIO_STRM_CTRL) {
-        pr_netio_shutdown(session.c->outstrm, 1);
+  /* A 'close_notify' alert (SSL shutdown message) may have been previously
+   * sent to the client via tls_netio_shutdown_cb().
+   */
 
-        if (session.c->instrm != session.c->outstrm)
-          pr_netio_shutdown(session.c->instrm, 1);
-      }
+  shutdown_state = SSL_get_shutdown(ssl);
+  if (!(shutdown_state & SSL_SENT_SHUTDOWN)) {
+    /* 'close_notify' not already sent; send it now. */
+    res = SSL_shutdown(ssl);
+  }
 
-      if (strms & PR_NETIO_STRM_DATA) {
-        pr_netio_shutdown(session.d->outstrm, 1);
+  if (res == 0) {
+    /* Now call SSL_shutdown() again, but only if necessary. */
+    if (flags & TLS_SHUTDOWN_BIDIRECTIONAL) {
+      shutdown_state = SSL_get_shutdown(ssl);
 
-        if (session.d->instrm != session.d->outstrm)
-          pr_netio_shutdown(session.d->instrm, 1);
+      res = 1;
+      if (!(shutdown_state & SSL_RECEIVED_SHUTDOWN)) {
+        res = SSL_shutdown(ssl);
       }
     }
 
-    shutdown_state = SSL_get_shutdown(ssl);
-
-    /* Now call SSL_shutdown() again, but only if necessary. */
-    res = 1;
-    if (!(shutdown_state & SSL_RECEIVED_SHUTDOWN)) {
-      res = SSL_shutdown(ssl);
-    }
-
     if (res == 0) {
       int err = SSL_get_error(ssl, res);
 
@@ -2216,7 +2207,8 @@
           if (errno != 0 &&
               errno != EOF &&
               errno != EBADF &&
-              errno != EPIPE) {
+              errno != EPIPE &&
+              errno != EPERM) {
             tls_log("SSL_shutdown syscall error: %s", strerror(errno));
             pr_log_debug(DEBUG0, MOD_TLS_VERSION
               ": SSL_shutdown syscall error: %s", strerror(errno));
@@ -3811,7 +3803,7 @@
 
     if (nstrm->strm_type == PR_NETIO_STRM_CTRL &&
         nstrm->strm_mode == PR_NETIO_IO_WR) {
-      tls_end_sess((SSL *) nstrm->strm_data, nstrm->strm_type, TRUE);
+      tls_end_sess((SSL *) nstrm->strm_data, nstrm->strm_type, 0);
       tls_ctrl_rd_nstrm->strm_data = tls_ctrl_wr_nstrm->strm_data =
         nstrm->strm_data = NULL;
       tls_ctrl_netio = NULL;
@@ -3820,7 +3812,7 @@
 
     if (nstrm->strm_type == PR_NETIO_STRM_DATA &&
         nstrm->strm_mode == PR_NETIO_IO_WR) {
-      tls_end_sess((SSL *) nstrm->strm_data, nstrm->strm_type, TRUE);
+      tls_end_sess((SSL *) nstrm->strm_data, nstrm->strm_type, 0);
       tls_data_rd_nstrm->strm_data = tls_data_wr_nstrm->strm_data =
         nstrm->strm_data = NULL;
       tls_data_netio = NULL;
@@ -3931,7 +3923,7 @@
           X509_free(data_cert);
 
           /* Properly shutdown the SSL session. */
-          tls_end_sess((SSL *) nstrm->strm_data, nstrm->strm_type, TRUE);
+          tls_end_sess((SSL *) nstrm->strm_data, nstrm->strm_type, 0);
 
           tls_data_rd_nstrm->strm_data = tls_data_wr_nstrm->strm_data =
             nstrm->strm_data = NULL;
@@ -3987,6 +3979,28 @@
 }
 
 static int tls_netio_shutdown_cb(pr_netio_stream_t *nstrm, int how) {
+
+  if (how != 0) {
+    /* Closing this stream for writing; we need to send the 'close_notify'
+     * alert first, so that the client knows, at the application layer,
+     * that the SSL/TLS session is shutting down.
+     */
+
+    if (nstrm->strm_mode == PR_NETIO_IO_WR &&
+        (nstrm->strm_type == PR_NETIO_STRM_CTRL ||
+         nstrm->strm_type == PR_NETIO_STRM_DATA)) {
+      SSL *ssl;
+
+      ssl = (SSL *) nstrm->strm_data;
+      if (ssl) {
+        if (!(SSL_get_shutdown(ssl) & SSL_SENT_SHUTDOWN)) {
+          /* We haven't sent a 'close_notify' alert yet; do so now. */
+          SSL_shutdown(ssl);
+        }
+      }
+    }
+  }
+
   return shutdown(nstrm->strm_fd, how);
 }
 
@@ -4413,7 +4427,7 @@
    * The data channel, if protected, should remain so.
    */
 
-  tls_end_sess(ctrl_ssl, PR_NETIO_STRM_CTRL, FALSE);
+  tls_end_sess(ctrl_ssl, PR_NETIO_STRM_CTRL, TLS_SHUTDOWN_BIDIRECTIONAL);
   ctrl_ssl = tls_ctrl_rd_nstrm->strm_data = tls_ctrl_wr_nstrm->strm_data = NULL;
 
   /* Remove our NetIO for the control channel. */

proftpd-1.3.1-tls_sighup.patch:

--- NEW FILE proftpd-1.3.1-tls_sighup.patch ---
Index: src/log.c
===================================================================
RCS file: /cvsroot/proftp/proftpd/src/log.c,v
retrieving revision 1.85
diff -u -r1.85 log.c
--- src/log.c	24 Feb 2008 20:35:56 -0000	1.85
+++ src/log.c	13 Aug 2008 18:38:57 -0000
@@ -410,9 +410,10 @@
     /* The child may have inherited a valid socket from the parent. */
     pr_closelog(syslog_sockfd);
 
-    if ((syslog_sockfd = pr_openlog("proftpd", LOG_NDELAY|LOG_PID,
-        facility)) < 0)
+    syslog_sockfd = pr_openlog("proftpd", LOG_NDELAY|LOG_PID, facility);
+    if (syslog_sockfd < 0)
       return -1;
+
     systemlog_fd = -1;
 
   } else if ((res = pr_log_openfile(systemlog_fn, &systemlog_fd,
@@ -426,14 +427,11 @@
 }
 
 void log_closesyslog(void) {
-  if (systemlog_fd != -1) {
-    close(systemlog_fd);
-    systemlog_fd = -1;
+  (void) close(systemlog_fd);
+  systemlog_fd = -1;
 
-  } else {
-    pr_closelog(syslog_sockfd);
-    syslog_sockfd = -1;
-  }
+  (void) pr_closelog(syslog_sockfd);
+  syslog_sockfd = -1;
 
   syslog_open = FALSE;
 }
@@ -517,6 +515,7 @@
 
   if (!syslog_open) {
     syslog_sockfd = pr_openlog("proftpd", LOG_NDELAY|LOG_PID, f);
+    syslog_open = TRUE;
 
   } else if (f != facility) {
     (void) pr_setlogfacility(f);
@@ -531,14 +530,6 @@
     pr_syslog(syslog_sockfd, priority, "%s - %s\n", serverinfo, s);
   else
     pr_syslog(syslog_sockfd, priority, "%s\n", s);
-
-  if (!syslog_open) {
-    pr_closelog(syslog_sockfd);
-    syslog_sockfd = -1;
-
-  } else if (f != facility) {
-    (void) pr_setlogfacility(f);
-  }
 }
 
 void pr_log_pri(int priority, const char *fmt, ...) {


Index: proftpd.conf
===================================================================
RCS file: /cvs/extras/rpms/proftpd/EL-5/proftpd.conf,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- proftpd.conf	3 Feb 2008 17:54:06 -0000	1.8
+++ proftpd.conf	2 Jan 2009 13:45:48 -0000	1.9
@@ -91,9 +91,13 @@
 # SQL authentication Dynamic Shared Object (DSO) loading
 # See README.DSO and howto/DSO.html for more details.
 #<IfModule mod_dso.c>
-#   LoadModule mod_sql.c
-#   LoadModule mod_sql_mysql.c
-#   LoadModule mod_sql_postgres.c
+#  LoadModule mod_ban.c
+#  LoadModule mod_ifsession.c
+#  LoadModule mod_quotatab.c
+#  LoadModule mod_quotatab_file.c
+#  LoadModule mod_sql.c
+#  LoadModule mod_sql_mysql.c
+#  LoadModule mod_sql_postgres.c
 #</IfModule>
 
 # A basic anonymous configuration, with an upload directory.
@@ -148,3 +152,18 @@
 #
 #</Anonymous>
 
+# Configuration for mod_ban
+<IfModule mod_ban.c>
+  BanEngine on
+  BanLog /var/log/proftpd/ban.log
+  BanTable /var/run/proftpd/ban.tab
+
+  # If the same client reaches the MaxLoginAttempts limit 2 times
+  # within 10 minutes, automatically add a ban for that client that
+  # will expire after one hour.
+  BanOnEvent MaxLoginAttempts 2/00:10:00 01:00:00
+
+  # Allow the FTP admin to manually add/remove bans
+  BanControlsACLs all allow user ftpadm
+</IfModule>
+


Index: proftpd.spec
===================================================================
RCS file: /cvs/extras/rpms/proftpd/EL-5/proftpd.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- proftpd.spec	2 Jan 2009 12:51:48 -0000	1.30
+++ proftpd.spec	2 Jan 2009 13:45:48 -0000	1.31
@@ -1,7 +1,7 @@
 Summary: Flexible, stable and highly-configurable FTP server
 Name: proftpd
 Version: 1.3.1
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: GPLv2+
 Group: System Environment/Daemons
 URL: http://www.proftpd.org/
@@ -16,6 +16,9 @@
 Source8: proftpd-mod_quotatab_ldap.schema
 Patch0: proftpd-1.3.1-find-umode_t.patch
 Patch1: proftpd-1.3.1-csrf.patch
+Patch2: proftpd-1.3.1-tls_shutdown.patch
+Patch3: proftpd-1.3.1-tls_debug.patch
+Patch4: proftpd-1.3.1-tls_sighup.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires: pam >= 0.59
 Requires(post): /sbin/chkconfig
@@ -68,6 +71,9 @@
 %setup -q
 %patch0 -p1 -b .find-umode_t
 %patch1 -p1 -b .csrf
+%patch2 -p0 -b .tls_shutdown
+%patch3 -p1 -b .tls_debug.patch
+%patch4 -p0 -b .tls_sighup.patch
 
 
 %build
@@ -198,6 +204,11 @@
 
 
 %changelog
+* Fri Jan  2 2009 Matthias Saou <http://freshrpms.net/> 1.3.1-8
+- Update default configuration to have a lit of available modules and more
+  example configuration for them.
+- Include patches to fix TLS issues (#457280).
+
 * Fri Jan  2 2009 Matthias Saou <http://freshrpms.net/> 1.3.1-7
 - Add Debian patch to fix CSRF vulnerability (#464127, upstream #3115).
 



From thias at fedoraproject.org  Fri Jan  2 13:46:18 2009
From: thias at fedoraproject.org (Matthias Saou)
Date: Fri,  2 Jan 2009 13:46:18 +0000 (UTC)
Subject: rpms/proftpd/F-10 proftpd-1.3.1-tls_debug.patch, NONE,
	1.1 proftpd-1.3.1-tls_shutdown.patch, NONE,
	1.1 proftpd-1.3.1-tls_sighup.patch, NONE, 1.1 proftpd.conf, 1.8,
	1.9 proftpd.spec, 1.41, 1.42
Message-ID: <20090102134618.BC42470130@cvs1.fedora.phx.redhat.com>

Author: thias

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

Modified Files:
	proftpd.conf proftpd.spec 
Added Files:
	proftpd-1.3.1-tls_debug.patch proftpd-1.3.1-tls_shutdown.patch 
	proftpd-1.3.1-tls_sighup.patch 
Log Message:
Update default configuration to have a lit of available modules and more example configuration for them, include patches to fix TLS issues (#457280).


proftpd-1.3.1-tls_debug.patch:

--- NEW FILE proftpd-1.3.1-tls_debug.patch ---
diff -uNr proftpd-1.3.1.orig/contrib/mod_tls.c proftpd-1.3.1/contrib/mod_tls.c
--- proftpd-1.3.1.orig/contrib/mod_tls.c	2007-10-04 10:04:24.000000000 -0700
+++ proftpd-1.3.1/contrib/mod_tls.c	2008-08-10 07:54:21.000000000 -0700
@@ -969,6 +969,7 @@
       break;
 
     fseek(keyf, 0, SEEK_SET);
+    fprintf(stderr, "Error reading passphrase: %s", tls_get_errors());
     ERR_clear_error();
     fprintf(stderr, "\nWrong passphrase for this key.  Please try again.\n");
   }

proftpd-1.3.1-tls_shutdown.patch:

--- NEW FILE proftpd-1.3.1-tls_shutdown.patch ---
Index: contrib/mod_tls.c
===================================================================
RCS file: /cvsroot/proftp/proftpd/contrib/mod_tls.c,v
retrieving revision 1.138
diff -u -r1.138 mod_tls.c
--- contrib/mod_tls.c	20 May 2008 14:35:24 -0000	1.138
+++ contrib/mod_tls.c	30 Jul 2008 04:16:19 -0000
@@ -411,6 +411,8 @@
 /* SSL/TLS support functions */
 static void tls_closelog(void);
 static void tls_end_sess(SSL *, int, int);
+#define TLS_SHUTDOWN_BIDIRECTIONAL	0x0001
+
 static void tls_fatal_error(int, int);
 static const char *tls_get_errors(void);
 static char *tls_get_page(size_t, void **);
@@ -1428,7 +1430,7 @@
     } else if (tls_renegotiate_required) {
       tls_log("%s", "requested TLS renegotiation timed out on control channel");
       tls_log("%s", "shutting down control channel TLS session");
-      tls_end_sess(ctrl_ssl, PR_NETIO_STRM_CTRL, TRUE);
+      tls_end_sess(ctrl_ssl, PR_NETIO_STRM_CTRL, 0);
       tls_ctrl_rd_nstrm->strm_data = tls_ctrl_wr_nstrm->strm_data =
         ctrl_ssl = NULL;
     }
@@ -1444,8 +1446,7 @@
     } else if (tls_renegotiate_required) {
       tls_log("%s", "requested TLS renegotiation timed out on data channel");
       tls_log("%s", "shutting down data channel TLS session");
-      tls_end_sess((SSL *) tls_data_wr_nstrm->strm_data, PR_NETIO_STRM_DATA,
-        TRUE);
+      tls_end_sess((SSL *) tls_data_wr_nstrm->strm_data, PR_NETIO_STRM_DATA, 0);
       tls_data_rd_nstrm->strm_data = tls_data_wr_nstrm->strm_data = NULL;
     }
   }
@@ -1996,8 +1997,7 @@
 
     if (tls_handshake_timed_out) {
       tls_log("TLS negotiation timed out (%u seconds)", tls_handshake_timeout);
-      tls_end_sess(ssl, on_data ? PR_NETIO_STRM_DATA : PR_NETIO_STRM_CTRL,
-        TRUE);
+      tls_end_sess(ssl, on_data ? PR_NETIO_STRM_DATA : PR_NETIO_STRM_CTRL, 0);
       return -4;
     }
 
@@ -2043,8 +2043,7 @@
         break;
     }
 
-    tls_end_sess(ssl, on_data ? PR_NETIO_STRM_DATA : PR_NETIO_STRM_CTRL,
-      TRUE);
+    tls_end_sess(ssl, on_data ? PR_NETIO_STRM_DATA : PR_NETIO_STRM_CTRL, 0);
     return -3;
   }
 
@@ -2154,42 +2153,34 @@
   }
 }
 
-static void tls_end_sess(SSL *ssl, int strms, int use_shutdown) {
-  int res;
+static void tls_end_sess(SSL *ssl, int strms, int flags) {
+  int res = 0;
   int shutdown_state;
 
   if (!ssl)
     return;
 
-  res = SSL_shutdown(ssl);
-  if (res == 0) {
-    if (use_shutdown) {
-      /* Try calling SSL_shutdown() again.  First, though, send a TCP FIN
-       * to trigger the remote end's close_notify SSL message, via shutdown().
-       */
-      if (strms & PR_NETIO_STRM_CTRL) {
-        pr_netio_shutdown(session.c->outstrm, 1);
+  /* A 'close_notify' alert (SSL shutdown message) may have been previously
+   * sent to the client via tls_netio_shutdown_cb().
+   */
 
-        if (session.c->instrm != session.c->outstrm)
-          pr_netio_shutdown(session.c->instrm, 1);
-      }
+  shutdown_state = SSL_get_shutdown(ssl);
+  if (!(shutdown_state & SSL_SENT_SHUTDOWN)) {
+    /* 'close_notify' not already sent; send it now. */
+    res = SSL_shutdown(ssl);
+  }
 
-      if (strms & PR_NETIO_STRM_DATA) {
-        pr_netio_shutdown(session.d->outstrm, 1);
+  if (res == 0) {
+    /* Now call SSL_shutdown() again, but only if necessary. */
+    if (flags & TLS_SHUTDOWN_BIDIRECTIONAL) {
+      shutdown_state = SSL_get_shutdown(ssl);
 
-        if (session.d->instrm != session.d->outstrm)
-          pr_netio_shutdown(session.d->instrm, 1);
+      res = 1;
+      if (!(shutdown_state & SSL_RECEIVED_SHUTDOWN)) {
+        res = SSL_shutdown(ssl);
       }
     }
 
-    shutdown_state = SSL_get_shutdown(ssl);
-
-    /* Now call SSL_shutdown() again, but only if necessary. */
-    res = 1;
-    if (!(shutdown_state & SSL_RECEIVED_SHUTDOWN)) {
-      res = SSL_shutdown(ssl);
-    }
-
     if (res == 0) {
       int err = SSL_get_error(ssl, res);
 
@@ -2216,7 +2207,8 @@
           if (errno != 0 &&
               errno != EOF &&
               errno != EBADF &&
-              errno != EPIPE) {
+              errno != EPIPE &&
+              errno != EPERM) {
             tls_log("SSL_shutdown syscall error: %s", strerror(errno));
             pr_log_debug(DEBUG0, MOD_TLS_VERSION
               ": SSL_shutdown syscall error: %s", strerror(errno));
@@ -3811,7 +3803,7 @@
 
     if (nstrm->strm_type == PR_NETIO_STRM_CTRL &&
         nstrm->strm_mode == PR_NETIO_IO_WR) {
-      tls_end_sess((SSL *) nstrm->strm_data, nstrm->strm_type, TRUE);
+      tls_end_sess((SSL *) nstrm->strm_data, nstrm->strm_type, 0);
       tls_ctrl_rd_nstrm->strm_data = tls_ctrl_wr_nstrm->strm_data =
         nstrm->strm_data = NULL;
       tls_ctrl_netio = NULL;
@@ -3820,7 +3812,7 @@
 
     if (nstrm->strm_type == PR_NETIO_STRM_DATA &&
         nstrm->strm_mode == PR_NETIO_IO_WR) {
-      tls_end_sess((SSL *) nstrm->strm_data, nstrm->strm_type, TRUE);
+      tls_end_sess((SSL *) nstrm->strm_data, nstrm->strm_type, 0);
       tls_data_rd_nstrm->strm_data = tls_data_wr_nstrm->strm_data =
         nstrm->strm_data = NULL;
       tls_data_netio = NULL;
@@ -3931,7 +3923,7 @@
           X509_free(data_cert);
 
           /* Properly shutdown the SSL session. */
-          tls_end_sess((SSL *) nstrm->strm_data, nstrm->strm_type, TRUE);
+          tls_end_sess((SSL *) nstrm->strm_data, nstrm->strm_type, 0);
 
           tls_data_rd_nstrm->strm_data = tls_data_wr_nstrm->strm_data =
             nstrm->strm_data = NULL;
@@ -3987,6 +3979,28 @@
 }
 
 static int tls_netio_shutdown_cb(pr_netio_stream_t *nstrm, int how) {
+
+  if (how != 0) {
+    /* Closing this stream for writing; we need to send the 'close_notify'
+     * alert first, so that the client knows, at the application layer,
+     * that the SSL/TLS session is shutting down.
+     */
+
+    if (nstrm->strm_mode == PR_NETIO_IO_WR &&
+        (nstrm->strm_type == PR_NETIO_STRM_CTRL ||
+         nstrm->strm_type == PR_NETIO_STRM_DATA)) {
+      SSL *ssl;
+
+      ssl = (SSL *) nstrm->strm_data;
+      if (ssl) {
+        if (!(SSL_get_shutdown(ssl) & SSL_SENT_SHUTDOWN)) {
+          /* We haven't sent a 'close_notify' alert yet; do so now. */
+          SSL_shutdown(ssl);
+        }
+      }
+    }
+  }
+
   return shutdown(nstrm->strm_fd, how);
 }
 
@@ -4413,7 +4427,7 @@
    * The data channel, if protected, should remain so.
    */
 
-  tls_end_sess(ctrl_ssl, PR_NETIO_STRM_CTRL, FALSE);
+  tls_end_sess(ctrl_ssl, PR_NETIO_STRM_CTRL, TLS_SHUTDOWN_BIDIRECTIONAL);
   ctrl_ssl = tls_ctrl_rd_nstrm->strm_data = tls_ctrl_wr_nstrm->strm_data = NULL;
 
   /* Remove our NetIO for the control channel. */

proftpd-1.3.1-tls_sighup.patch:

--- NEW FILE proftpd-1.3.1-tls_sighup.patch ---
Index: src/log.c
===================================================================
RCS file: /cvsroot/proftp/proftpd/src/log.c,v
retrieving revision 1.85
diff -u -r1.85 log.c
--- src/log.c	24 Feb 2008 20:35:56 -0000	1.85
+++ src/log.c	13 Aug 2008 18:38:57 -0000
@@ -410,9 +410,10 @@
     /* The child may have inherited a valid socket from the parent. */
     pr_closelog(syslog_sockfd);
 
-    if ((syslog_sockfd = pr_openlog("proftpd", LOG_NDELAY|LOG_PID,
-        facility)) < 0)
+    syslog_sockfd = pr_openlog("proftpd", LOG_NDELAY|LOG_PID, facility);
+    if (syslog_sockfd < 0)
       return -1;
+
     systemlog_fd = -1;
 
   } else if ((res = pr_log_openfile(systemlog_fn, &systemlog_fd,
@@ -426,14 +427,11 @@
 }
 
 void log_closesyslog(void) {
-  if (systemlog_fd != -1) {
-    close(systemlog_fd);
-    systemlog_fd = -1;
+  (void) close(systemlog_fd);
+  systemlog_fd = -1;
 
-  } else {
-    pr_closelog(syslog_sockfd);
-    syslog_sockfd = -1;
-  }
+  (void) pr_closelog(syslog_sockfd);
+  syslog_sockfd = -1;
 
   syslog_open = FALSE;
 }
@@ -517,6 +515,7 @@
 
   if (!syslog_open) {
     syslog_sockfd = pr_openlog("proftpd", LOG_NDELAY|LOG_PID, f);
+    syslog_open = TRUE;
 
   } else if (f != facility) {
     (void) pr_setlogfacility(f);
@@ -531,14 +530,6 @@
     pr_syslog(syslog_sockfd, priority, "%s - %s\n", serverinfo, s);
   else
     pr_syslog(syslog_sockfd, priority, "%s\n", s);
-
-  if (!syslog_open) {
-    pr_closelog(syslog_sockfd);
-    syslog_sockfd = -1;
-
-  } else if (f != facility) {
-    (void) pr_setlogfacility(f);
-  }
 }
 
 void pr_log_pri(int priority, const char *fmt, ...) {


Index: proftpd.conf
===================================================================
RCS file: /cvs/extras/rpms/proftpd/F-10/proftpd.conf,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- proftpd.conf	19 Aug 2007 16:18:30 -0000	1.8
+++ proftpd.conf	2 Jan 2009 13:45:48 -0000	1.9
@@ -91,9 +91,13 @@
 # SQL authentication Dynamic Shared Object (DSO) loading
 # See README.DSO and howto/DSO.html for more details.
 #<IfModule mod_dso.c>
-#   LoadModule mod_sql.c
-#   LoadModule mod_sql_mysql.c
-#   LoadModule mod_sql_postgres.c
+#  LoadModule mod_ban.c
+#  LoadModule mod_ifsession.c
+#  LoadModule mod_quotatab.c
+#  LoadModule mod_quotatab_file.c
+#  LoadModule mod_sql.c
+#  LoadModule mod_sql_mysql.c
+#  LoadModule mod_sql_postgres.c
 #</IfModule>
 
 # A basic anonymous configuration, with an upload directory.
@@ -148,3 +152,18 @@
 #
 #</Anonymous>
 
+# Configuration for mod_ban
+<IfModule mod_ban.c>
+  BanEngine on
+  BanLog /var/log/proftpd/ban.log
+  BanTable /var/run/proftpd/ban.tab
+
+  # If the same client reaches the MaxLoginAttempts limit 2 times
+  # within 10 minutes, automatically add a ban for that client that
+  # will expire after one hour.
+  BanOnEvent MaxLoginAttempts 2/00:10:00 01:00:00
+
+  # Allow the FTP admin to manually add/remove bans
+  BanControlsACLs all allow user ftpadm
+</IfModule>
+


Index: proftpd.spec
===================================================================
RCS file: /cvs/extras/rpms/proftpd/F-10/proftpd.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- proftpd.spec	2 Jan 2009 12:51:48 -0000	1.41
+++ proftpd.spec	2 Jan 2009 13:45:48 -0000	1.42
@@ -1,7 +1,7 @@
 Summary: Flexible, stable and highly-configurable FTP server
 Name: proftpd
 Version: 1.3.1
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: GPLv2+
 Group: System Environment/Daemons
 URL: http://www.proftpd.org/
@@ -16,6 +16,9 @@
 Source8: proftpd-mod_quotatab_ldap.schema
 Patch0: proftpd-1.3.1-find-umode_t.patch
 Patch1: proftpd-1.3.1-csrf.patch
+Patch2: proftpd-1.3.1-tls_shutdown.patch
+Patch3: proftpd-1.3.1-tls_debug.patch
+Patch4: proftpd-1.3.1-tls_sighup.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires: pam >= 0.59
 Requires(post): /sbin/chkconfig
@@ -68,6 +71,9 @@
 %setup -q
 %patch0 -p1 -b .find-umode_t
 %patch1 -p1 -b .csrf
+%patch2 -p0 -b .tls_shutdown
+%patch3 -p1 -b .tls_debug.patch
+%patch4 -p0 -b .tls_sighup.patch
 
 
 %build
@@ -198,6 +204,11 @@
 
 
 %changelog
+* Fri Jan  2 2009 Matthias Saou <http://freshrpms.net/> 1.3.1-8
+- Update default configuration to have a lit of available modules and more
+  example configuration for them.
+- Include patches to fix TLS issues (#457280).
+
 * Fri Jan  2 2009 Matthias Saou <http://freshrpms.net/> 1.3.1-7
 - Add Debian patch to fix CSRF vulnerability (#464127, upstream #3115).
 



From thias at fedoraproject.org  Fri Jan  2 13:46:19 2009
From: thias at fedoraproject.org (Matthias Saou)
Date: Fri,  2 Jan 2009 13:46:19 +0000 (UTC)
Subject: rpms/proftpd/F-9 proftpd-1.3.1-tls_debug.patch, NONE,
	1.1 proftpd-1.3.1-tls_shutdown.patch, NONE,
	1.1 proftpd-1.3.1-tls_sighup.patch, NONE, 1.1 proftpd.conf, 1.8,
	1.9 proftpd.spec, 1.40, 1.41
Message-ID: <20090102134619.5144B70130@cvs1.fedora.phx.redhat.com>

Author: thias

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

Modified Files:
	proftpd.conf proftpd.spec 
Added Files:
	proftpd-1.3.1-tls_debug.patch proftpd-1.3.1-tls_shutdown.patch 
	proftpd-1.3.1-tls_sighup.patch 
Log Message:
Update default configuration to have a lit of available modules and more example configuration for them, include patches to fix TLS issues (#457280).


proftpd-1.3.1-tls_debug.patch:

--- NEW FILE proftpd-1.3.1-tls_debug.patch ---
diff -uNr proftpd-1.3.1.orig/contrib/mod_tls.c proftpd-1.3.1/contrib/mod_tls.c
--- proftpd-1.3.1.orig/contrib/mod_tls.c	2007-10-04 10:04:24.000000000 -0700
+++ proftpd-1.3.1/contrib/mod_tls.c	2008-08-10 07:54:21.000000000 -0700
@@ -969,6 +969,7 @@
       break;
 
     fseek(keyf, 0, SEEK_SET);
+    fprintf(stderr, "Error reading passphrase: %s", tls_get_errors());
     ERR_clear_error();
     fprintf(stderr, "\nWrong passphrase for this key.  Please try again.\n");
   }

proftpd-1.3.1-tls_shutdown.patch:

--- NEW FILE proftpd-1.3.1-tls_shutdown.patch ---
Index: contrib/mod_tls.c
===================================================================
RCS file: /cvsroot/proftp/proftpd/contrib/mod_tls.c,v
retrieving revision 1.138
diff -u -r1.138 mod_tls.c
--- contrib/mod_tls.c	20 May 2008 14:35:24 -0000	1.138
+++ contrib/mod_tls.c	30 Jul 2008 04:16:19 -0000
@@ -411,6 +411,8 @@
 /* SSL/TLS support functions */
 static void tls_closelog(void);
 static void tls_end_sess(SSL *, int, int);
+#define TLS_SHUTDOWN_BIDIRECTIONAL	0x0001
+
 static void tls_fatal_error(int, int);
 static const char *tls_get_errors(void);
 static char *tls_get_page(size_t, void **);
@@ -1428,7 +1430,7 @@
     } else if (tls_renegotiate_required) {
       tls_log("%s", "requested TLS renegotiation timed out on control channel");
       tls_log("%s", "shutting down control channel TLS session");
-      tls_end_sess(ctrl_ssl, PR_NETIO_STRM_CTRL, TRUE);
+      tls_end_sess(ctrl_ssl, PR_NETIO_STRM_CTRL, 0);
       tls_ctrl_rd_nstrm->strm_data = tls_ctrl_wr_nstrm->strm_data =
         ctrl_ssl = NULL;
     }
@@ -1444,8 +1446,7 @@
     } else if (tls_renegotiate_required) {
       tls_log("%s", "requested TLS renegotiation timed out on data channel");
       tls_log("%s", "shutting down data channel TLS session");
-      tls_end_sess((SSL *) tls_data_wr_nstrm->strm_data, PR_NETIO_STRM_DATA,
-        TRUE);
+      tls_end_sess((SSL *) tls_data_wr_nstrm->strm_data, PR_NETIO_STRM_DATA, 0);
       tls_data_rd_nstrm->strm_data = tls_data_wr_nstrm->strm_data = NULL;
     }
   }
@@ -1996,8 +1997,7 @@
 
     if (tls_handshake_timed_out) {
       tls_log("TLS negotiation timed out (%u seconds)", tls_handshake_timeout);
-      tls_end_sess(ssl, on_data ? PR_NETIO_STRM_DATA : PR_NETIO_STRM_CTRL,
-        TRUE);
+      tls_end_sess(ssl, on_data ? PR_NETIO_STRM_DATA : PR_NETIO_STRM_CTRL, 0);
       return -4;
     }
 
@@ -2043,8 +2043,7 @@
         break;
     }
 
-    tls_end_sess(ssl, on_data ? PR_NETIO_STRM_DATA : PR_NETIO_STRM_CTRL,
-      TRUE);
+    tls_end_sess(ssl, on_data ? PR_NETIO_STRM_DATA : PR_NETIO_STRM_CTRL, 0);
     return -3;
   }
 
@@ -2154,42 +2153,34 @@
   }
 }
 
-static void tls_end_sess(SSL *ssl, int strms, int use_shutdown) {
-  int res;
+static void tls_end_sess(SSL *ssl, int strms, int flags) {
+  int res = 0;
   int shutdown_state;
 
   if (!ssl)
     return;
 
-  res = SSL_shutdown(ssl);
-  if (res == 0) {
-    if (use_shutdown) {
-      /* Try calling SSL_shutdown() again.  First, though, send a TCP FIN
-       * to trigger the remote end's close_notify SSL message, via shutdown().
-       */
-      if (strms & PR_NETIO_STRM_CTRL) {
-        pr_netio_shutdown(session.c->outstrm, 1);
+  /* A 'close_notify' alert (SSL shutdown message) may have been previously
+   * sent to the client via tls_netio_shutdown_cb().
+   */
 
-        if (session.c->instrm != session.c->outstrm)
-          pr_netio_shutdown(session.c->instrm, 1);
-      }
+  shutdown_state = SSL_get_shutdown(ssl);
+  if (!(shutdown_state & SSL_SENT_SHUTDOWN)) {
+    /* 'close_notify' not already sent; send it now. */
+    res = SSL_shutdown(ssl);
+  }
 
-      if (strms & PR_NETIO_STRM_DATA) {
-        pr_netio_shutdown(session.d->outstrm, 1);
+  if (res == 0) {
+    /* Now call SSL_shutdown() again, but only if necessary. */
+    if (flags & TLS_SHUTDOWN_BIDIRECTIONAL) {
+      shutdown_state = SSL_get_shutdown(ssl);
 
-        if (session.d->instrm != session.d->outstrm)
-          pr_netio_shutdown(session.d->instrm, 1);
+      res = 1;
+      if (!(shutdown_state & SSL_RECEIVED_SHUTDOWN)) {
+        res = SSL_shutdown(ssl);
       }
     }
 
-    shutdown_state = SSL_get_shutdown(ssl);
-
-    /* Now call SSL_shutdown() again, but only if necessary. */
-    res = 1;
-    if (!(shutdown_state & SSL_RECEIVED_SHUTDOWN)) {
-      res = SSL_shutdown(ssl);
-    }
-
     if (res == 0) {
       int err = SSL_get_error(ssl, res);
 
@@ -2216,7 +2207,8 @@
           if (errno != 0 &&
               errno != EOF &&
               errno != EBADF &&
-              errno != EPIPE) {
+              errno != EPIPE &&
+              errno != EPERM) {
             tls_log("SSL_shutdown syscall error: %s", strerror(errno));
             pr_log_debug(DEBUG0, MOD_TLS_VERSION
               ": SSL_shutdown syscall error: %s", strerror(errno));
@@ -3811,7 +3803,7 @@
 
     if (nstrm->strm_type == PR_NETIO_STRM_CTRL &&
         nstrm->strm_mode == PR_NETIO_IO_WR) {
-      tls_end_sess((SSL *) nstrm->strm_data, nstrm->strm_type, TRUE);
+      tls_end_sess((SSL *) nstrm->strm_data, nstrm->strm_type, 0);
       tls_ctrl_rd_nstrm->strm_data = tls_ctrl_wr_nstrm->strm_data =
         nstrm->strm_data = NULL;
       tls_ctrl_netio = NULL;
@@ -3820,7 +3812,7 @@
 
     if (nstrm->strm_type == PR_NETIO_STRM_DATA &&
         nstrm->strm_mode == PR_NETIO_IO_WR) {
-      tls_end_sess((SSL *) nstrm->strm_data, nstrm->strm_type, TRUE);
+      tls_end_sess((SSL *) nstrm->strm_data, nstrm->strm_type, 0);
       tls_data_rd_nstrm->strm_data = tls_data_wr_nstrm->strm_data =
         nstrm->strm_data = NULL;
       tls_data_netio = NULL;
@@ -3931,7 +3923,7 @@
           X509_free(data_cert);
 
           /* Properly shutdown the SSL session. */
-          tls_end_sess((SSL *) nstrm->strm_data, nstrm->strm_type, TRUE);
+          tls_end_sess((SSL *) nstrm->strm_data, nstrm->strm_type, 0);
 
           tls_data_rd_nstrm->strm_data = tls_data_wr_nstrm->strm_data =
             nstrm->strm_data = NULL;
@@ -3987,6 +3979,28 @@
 }
 
 static int tls_netio_shutdown_cb(pr_netio_stream_t *nstrm, int how) {
+
+  if (how != 0) {
+    /* Closing this stream for writing; we need to send the 'close_notify'
+     * alert first, so that the client knows, at the application layer,
+     * that the SSL/TLS session is shutting down.
+     */
+
+    if (nstrm->strm_mode == PR_NETIO_IO_WR &&
+        (nstrm->strm_type == PR_NETIO_STRM_CTRL ||
+         nstrm->strm_type == PR_NETIO_STRM_DATA)) {
+      SSL *ssl;
+
+      ssl = (SSL *) nstrm->strm_data;
+      if (ssl) {
+        if (!(SSL_get_shutdown(ssl) & SSL_SENT_SHUTDOWN)) {
+          /* We haven't sent a 'close_notify' alert yet; do so now. */
+          SSL_shutdown(ssl);
+        }
+      }
+    }
+  }
+
   return shutdown(nstrm->strm_fd, how);
 }
 
@@ -4413,7 +4427,7 @@
    * The data channel, if protected, should remain so.
    */
 
-  tls_end_sess(ctrl_ssl, PR_NETIO_STRM_CTRL, FALSE);
+  tls_end_sess(ctrl_ssl, PR_NETIO_STRM_CTRL, TLS_SHUTDOWN_BIDIRECTIONAL);
   ctrl_ssl = tls_ctrl_rd_nstrm->strm_data = tls_ctrl_wr_nstrm->strm_data = NULL;
 
   /* Remove our NetIO for the control channel. */

proftpd-1.3.1-tls_sighup.patch:

--- NEW FILE proftpd-1.3.1-tls_sighup.patch ---
Index: src/log.c
===================================================================
RCS file: /cvsroot/proftp/proftpd/src/log.c,v
retrieving revision 1.85
diff -u -r1.85 log.c
--- src/log.c	24 Feb 2008 20:35:56 -0000	1.85
+++ src/log.c	13 Aug 2008 18:38:57 -0000
@@ -410,9 +410,10 @@
     /* The child may have inherited a valid socket from the parent. */
     pr_closelog(syslog_sockfd);
 
-    if ((syslog_sockfd = pr_openlog("proftpd", LOG_NDELAY|LOG_PID,
-        facility)) < 0)
+    syslog_sockfd = pr_openlog("proftpd", LOG_NDELAY|LOG_PID, facility);
+    if (syslog_sockfd < 0)
       return -1;
+
     systemlog_fd = -1;
 
   } else if ((res = pr_log_openfile(systemlog_fn, &systemlog_fd,
@@ -426,14 +427,11 @@
 }
 
 void log_closesyslog(void) {
-  if (systemlog_fd != -1) {
-    close(systemlog_fd);
-    systemlog_fd = -1;
+  (void) close(systemlog_fd);
+  systemlog_fd = -1;
 
-  } else {
-    pr_closelog(syslog_sockfd);
-    syslog_sockfd = -1;
-  }
+  (void) pr_closelog(syslog_sockfd);
+  syslog_sockfd = -1;
 
   syslog_open = FALSE;
 }
@@ -517,6 +515,7 @@
 
   if (!syslog_open) {
     syslog_sockfd = pr_openlog("proftpd", LOG_NDELAY|LOG_PID, f);
+    syslog_open = TRUE;
 
   } else if (f != facility) {
     (void) pr_setlogfacility(f);
@@ -531,14 +530,6 @@
     pr_syslog(syslog_sockfd, priority, "%s - %s\n", serverinfo, s);
   else
     pr_syslog(syslog_sockfd, priority, "%s\n", s);
-
-  if (!syslog_open) {
-    pr_closelog(syslog_sockfd);
-    syslog_sockfd = -1;
-
-  } else if (f != facility) {
-    (void) pr_setlogfacility(f);
-  }
 }
 
 void pr_log_pri(int priority, const char *fmt, ...) {


Index: proftpd.conf
===================================================================
RCS file: /cvs/extras/rpms/proftpd/F-9/proftpd.conf,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- proftpd.conf	19 Aug 2007 16:18:30 -0000	1.8
+++ proftpd.conf	2 Jan 2009 13:45:49 -0000	1.9
@@ -91,9 +91,13 @@
 # SQL authentication Dynamic Shared Object (DSO) loading
 # See README.DSO and howto/DSO.html for more details.
 #<IfModule mod_dso.c>
-#   LoadModule mod_sql.c
-#   LoadModule mod_sql_mysql.c
-#   LoadModule mod_sql_postgres.c
+#  LoadModule mod_ban.c
+#  LoadModule mod_ifsession.c
+#  LoadModule mod_quotatab.c
+#  LoadModule mod_quotatab_file.c
+#  LoadModule mod_sql.c
+#  LoadModule mod_sql_mysql.c
+#  LoadModule mod_sql_postgres.c
 #</IfModule>
 
 # A basic anonymous configuration, with an upload directory.
@@ -148,3 +152,18 @@
 #
 #</Anonymous>
 
+# Configuration for mod_ban
+<IfModule mod_ban.c>
+  BanEngine on
+  BanLog /var/log/proftpd/ban.log
+  BanTable /var/run/proftpd/ban.tab
+
+  # If the same client reaches the MaxLoginAttempts limit 2 times
+  # within 10 minutes, automatically add a ban for that client that
+  # will expire after one hour.
+  BanOnEvent MaxLoginAttempts 2/00:10:00 01:00:00
+
+  # Allow the FTP admin to manually add/remove bans
+  BanControlsACLs all allow user ftpadm
+</IfModule>
+


Index: proftpd.spec
===================================================================
RCS file: /cvs/extras/rpms/proftpd/F-9/proftpd.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- proftpd.spec	2 Jan 2009 12:51:49 -0000	1.40
+++ proftpd.spec	2 Jan 2009 13:45:49 -0000	1.41
@@ -1,7 +1,7 @@
 Summary: Flexible, stable and highly-configurable FTP server
 Name: proftpd
 Version: 1.3.1
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: GPLv2+
 Group: System Environment/Daemons
 URL: http://www.proftpd.org/
@@ -16,6 +16,9 @@
 Source8: proftpd-mod_quotatab_ldap.schema
 Patch0: proftpd-1.3.1-find-umode_t.patch
 Patch1: proftpd-1.3.1-csrf.patch
+Patch2: proftpd-1.3.1-tls_shutdown.patch
+Patch3: proftpd-1.3.1-tls_debug.patch
+Patch4: proftpd-1.3.1-tls_sighup.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires: pam >= 0.59
 Requires(post): /sbin/chkconfig
@@ -68,6 +71,9 @@
 %setup -q
 %patch0 -p1 -b .find-umode_t
 %patch1 -p1 -b .csrf
+%patch2 -p0 -b .tls_shutdown
+%patch3 -p1 -b .tls_debug.patch
+%patch4 -p0 -b .tls_sighup.patch
 
 
 %build
@@ -198,6 +204,11 @@
 
 
 %changelog
+* Fri Jan  2 2009 Matthias Saou <http://freshrpms.net/> 1.3.1-8
+- Update default configuration to have a lit of available modules and more
+  example configuration for them.
+- Include patches to fix TLS issues (#457280).
+
 * Fri Jan  2 2009 Matthias Saou <http://freshrpms.net/> 1.3.1-7
 - Add Debian patch to fix CSRF vulnerability (#464127, upstream #3115).
 



From thias at fedoraproject.org  Fri Jan  2 13:46:19 2009
From: thias at fedoraproject.org (Matthias Saou)
Date: Fri,  2 Jan 2009 13:46:19 +0000 (UTC)
Subject: rpms/proftpd/F-8 proftpd-1.3.1-tls_debug.patch, NONE,
	1.1 proftpd-1.3.1-tls_shutdown.patch, NONE,
	1.1 proftpd-1.3.1-tls_sighup.patch, NONE, 1.1 proftpd.conf, 1.8,
	1.9 proftpd.spec, 1.37, 1.38
Message-ID: <20090102134619.0A13E70130@cvs1.fedora.phx.redhat.com>

Author: thias

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

Modified Files:
	proftpd.conf proftpd.spec 
Added Files:
	proftpd-1.3.1-tls_debug.patch proftpd-1.3.1-tls_shutdown.patch 
	proftpd-1.3.1-tls_sighup.patch 
Log Message:
Update default configuration to have a lit of available modules and more example configuration for them, include patches to fix TLS issues (#457280).


proftpd-1.3.1-tls_debug.patch:

--- NEW FILE proftpd-1.3.1-tls_debug.patch ---
diff -uNr proftpd-1.3.1.orig/contrib/mod_tls.c proftpd-1.3.1/contrib/mod_tls.c
--- proftpd-1.3.1.orig/contrib/mod_tls.c	2007-10-04 10:04:24.000000000 -0700
+++ proftpd-1.3.1/contrib/mod_tls.c	2008-08-10 07:54:21.000000000 -0700
@@ -969,6 +969,7 @@
       break;
 
     fseek(keyf, 0, SEEK_SET);
+    fprintf(stderr, "Error reading passphrase: %s", tls_get_errors());
     ERR_clear_error();
     fprintf(stderr, "\nWrong passphrase for this key.  Please try again.\n");
   }

proftpd-1.3.1-tls_shutdown.patch:

--- NEW FILE proftpd-1.3.1-tls_shutdown.patch ---
Index: contrib/mod_tls.c
===================================================================
RCS file: /cvsroot/proftp/proftpd/contrib/mod_tls.c,v
retrieving revision 1.138
diff -u -r1.138 mod_tls.c
--- contrib/mod_tls.c	20 May 2008 14:35:24 -0000	1.138
+++ contrib/mod_tls.c	30 Jul 2008 04:16:19 -0000
@@ -411,6 +411,8 @@
 /* SSL/TLS support functions */
 static void tls_closelog(void);
 static void tls_end_sess(SSL *, int, int);
+#define TLS_SHUTDOWN_BIDIRECTIONAL	0x0001
+
 static void tls_fatal_error(int, int);
 static const char *tls_get_errors(void);
 static char *tls_get_page(size_t, void **);
@@ -1428,7 +1430,7 @@
     } else if (tls_renegotiate_required) {
       tls_log("%s", "requested TLS renegotiation timed out on control channel");
       tls_log("%s", "shutting down control channel TLS session");
-      tls_end_sess(ctrl_ssl, PR_NETIO_STRM_CTRL, TRUE);
+      tls_end_sess(ctrl_ssl, PR_NETIO_STRM_CTRL, 0);
       tls_ctrl_rd_nstrm->strm_data = tls_ctrl_wr_nstrm->strm_data =
         ctrl_ssl = NULL;
     }
@@ -1444,8 +1446,7 @@
     } else if (tls_renegotiate_required) {
       tls_log("%s", "requested TLS renegotiation timed out on data channel");
       tls_log("%s", "shutting down data channel TLS session");
-      tls_end_sess((SSL *) tls_data_wr_nstrm->strm_data, PR_NETIO_STRM_DATA,
-        TRUE);
+      tls_end_sess((SSL *) tls_data_wr_nstrm->strm_data, PR_NETIO_STRM_DATA, 0);
       tls_data_rd_nstrm->strm_data = tls_data_wr_nstrm->strm_data = NULL;
     }
   }
@@ -1996,8 +1997,7 @@
 
     if (tls_handshake_timed_out) {
       tls_log("TLS negotiation timed out (%u seconds)", tls_handshake_timeout);
-      tls_end_sess(ssl, on_data ? PR_NETIO_STRM_DATA : PR_NETIO_STRM_CTRL,
-        TRUE);
+      tls_end_sess(ssl, on_data ? PR_NETIO_STRM_DATA : PR_NETIO_STRM_CTRL, 0);
       return -4;
     }
 
@@ -2043,8 +2043,7 @@
         break;
     }
 
-    tls_end_sess(ssl, on_data ? PR_NETIO_STRM_DATA : PR_NETIO_STRM_CTRL,
-      TRUE);
+    tls_end_sess(ssl, on_data ? PR_NETIO_STRM_DATA : PR_NETIO_STRM_CTRL, 0);
     return -3;
   }
 
@@ -2154,42 +2153,34 @@
   }
 }
 
-static void tls_end_sess(SSL *ssl, int strms, int use_shutdown) {
-  int res;
+static void tls_end_sess(SSL *ssl, int strms, int flags) {
+  int res = 0;
   int shutdown_state;
 
   if (!ssl)
     return;
 
-  res = SSL_shutdown(ssl);
-  if (res == 0) {
-    if (use_shutdown) {
-      /* Try calling SSL_shutdown() again.  First, though, send a TCP FIN
-       * to trigger the remote end's close_notify SSL message, via shutdown().
-       */
-      if (strms & PR_NETIO_STRM_CTRL) {
-        pr_netio_shutdown(session.c->outstrm, 1);
+  /* A 'close_notify' alert (SSL shutdown message) may have been previously
+   * sent to the client via tls_netio_shutdown_cb().
+   */
 
-        if (session.c->instrm != session.c->outstrm)
-          pr_netio_shutdown(session.c->instrm, 1);
-      }
+  shutdown_state = SSL_get_shutdown(ssl);
+  if (!(shutdown_state & SSL_SENT_SHUTDOWN)) {
+    /* 'close_notify' not already sent; send it now. */
+    res = SSL_shutdown(ssl);
+  }
 
-      if (strms & PR_NETIO_STRM_DATA) {
-        pr_netio_shutdown(session.d->outstrm, 1);
+  if (res == 0) {
+    /* Now call SSL_shutdown() again, but only if necessary. */
+    if (flags & TLS_SHUTDOWN_BIDIRECTIONAL) {
+      shutdown_state = SSL_get_shutdown(ssl);
 
-        if (session.d->instrm != session.d->outstrm)
-          pr_netio_shutdown(session.d->instrm, 1);
+      res = 1;
+      if (!(shutdown_state & SSL_RECEIVED_SHUTDOWN)) {
+        res = SSL_shutdown(ssl);
       }
     }
 
-    shutdown_state = SSL_get_shutdown(ssl);
-
-    /* Now call SSL_shutdown() again, but only if necessary. */
-    res = 1;
-    if (!(shutdown_state & SSL_RECEIVED_SHUTDOWN)) {
-      res = SSL_shutdown(ssl);
-    }
-
     if (res == 0) {
       int err = SSL_get_error(ssl, res);
 
@@ -2216,7 +2207,8 @@
           if (errno != 0 &&
               errno != EOF &&
               errno != EBADF &&
-              errno != EPIPE) {
+              errno != EPIPE &&
+              errno != EPERM) {
             tls_log("SSL_shutdown syscall error: %s", strerror(errno));
             pr_log_debug(DEBUG0, MOD_TLS_VERSION
               ": SSL_shutdown syscall error: %s", strerror(errno));
@@ -3811,7 +3803,7 @@
 
     if (nstrm->strm_type == PR_NETIO_STRM_CTRL &&
         nstrm->strm_mode == PR_NETIO_IO_WR) {
-      tls_end_sess((SSL *) nstrm->strm_data, nstrm->strm_type, TRUE);
+      tls_end_sess((SSL *) nstrm->strm_data, nstrm->strm_type, 0);
       tls_ctrl_rd_nstrm->strm_data = tls_ctrl_wr_nstrm->strm_data =
         nstrm->strm_data = NULL;
       tls_ctrl_netio = NULL;
@@ -3820,7 +3812,7 @@
 
     if (nstrm->strm_type == PR_NETIO_STRM_DATA &&
         nstrm->strm_mode == PR_NETIO_IO_WR) {
-      tls_end_sess((SSL *) nstrm->strm_data, nstrm->strm_type, TRUE);
+      tls_end_sess((SSL *) nstrm->strm_data, nstrm->strm_type, 0);
       tls_data_rd_nstrm->strm_data = tls_data_wr_nstrm->strm_data =
         nstrm->strm_data = NULL;
       tls_data_netio = NULL;
@@ -3931,7 +3923,7 @@
           X509_free(data_cert);
 
           /* Properly shutdown the SSL session. */
-          tls_end_sess((SSL *) nstrm->strm_data, nstrm->strm_type, TRUE);
+          tls_end_sess((SSL *) nstrm->strm_data, nstrm->strm_type, 0);
 
           tls_data_rd_nstrm->strm_data = tls_data_wr_nstrm->strm_data =
             nstrm->strm_data = NULL;
@@ -3987,6 +3979,28 @@
 }
 
 static int tls_netio_shutdown_cb(pr_netio_stream_t *nstrm, int how) {
+
+  if (how != 0) {
+    /* Closing this stream for writing; we need to send the 'close_notify'
+     * alert first, so that the client knows, at the application layer,
+     * that the SSL/TLS session is shutting down.
+     */
+
+    if (nstrm->strm_mode == PR_NETIO_IO_WR &&
+        (nstrm->strm_type == PR_NETIO_STRM_CTRL ||
+         nstrm->strm_type == PR_NETIO_STRM_DATA)) {
+      SSL *ssl;
+
+      ssl = (SSL *) nstrm->strm_data;
+      if (ssl) {
+        if (!(SSL_get_shutdown(ssl) & SSL_SENT_SHUTDOWN)) {
+          /* We haven't sent a 'close_notify' alert yet; do so now. */
+          SSL_shutdown(ssl);
+        }
+      }
+    }
+  }
+
   return shutdown(nstrm->strm_fd, how);
 }
 
@@ -4413,7 +4427,7 @@
    * The data channel, if protected, should remain so.
    */
 
-  tls_end_sess(ctrl_ssl, PR_NETIO_STRM_CTRL, FALSE);
+  tls_end_sess(ctrl_ssl, PR_NETIO_STRM_CTRL, TLS_SHUTDOWN_BIDIRECTIONAL);
   ctrl_ssl = tls_ctrl_rd_nstrm->strm_data = tls_ctrl_wr_nstrm->strm_data = NULL;
 
   /* Remove our NetIO for the control channel. */

proftpd-1.3.1-tls_sighup.patch:

--- NEW FILE proftpd-1.3.1-tls_sighup.patch ---
Index: src/log.c
===================================================================
RCS file: /cvsroot/proftp/proftpd/src/log.c,v
retrieving revision 1.85
diff -u -r1.85 log.c
--- src/log.c	24 Feb 2008 20:35:56 -0000	1.85
+++ src/log.c	13 Aug 2008 18:38:57 -0000
@@ -410,9 +410,10 @@
     /* The child may have inherited a valid socket from the parent. */
     pr_closelog(syslog_sockfd);
 
-    if ((syslog_sockfd = pr_openlog("proftpd", LOG_NDELAY|LOG_PID,
-        facility)) < 0)
+    syslog_sockfd = pr_openlog("proftpd", LOG_NDELAY|LOG_PID, facility);
+    if (syslog_sockfd < 0)
       return -1;
+
     systemlog_fd = -1;
 
   } else if ((res = pr_log_openfile(systemlog_fn, &systemlog_fd,
@@ -426,14 +427,11 @@
 }
 
 void log_closesyslog(void) {
-  if (systemlog_fd != -1) {
-    close(systemlog_fd);
-    systemlog_fd = -1;
+  (void) close(systemlog_fd);
+  systemlog_fd = -1;
 
-  } else {
-    pr_closelog(syslog_sockfd);
-    syslog_sockfd = -1;
-  }
+  (void) pr_closelog(syslog_sockfd);
+  syslog_sockfd = -1;
 
   syslog_open = FALSE;
 }
@@ -517,6 +515,7 @@
 
   if (!syslog_open) {
     syslog_sockfd = pr_openlog("proftpd", LOG_NDELAY|LOG_PID, f);
+    syslog_open = TRUE;
 
   } else if (f != facility) {
     (void) pr_setlogfacility(f);
@@ -531,14 +530,6 @@
     pr_syslog(syslog_sockfd, priority, "%s - %s\n", serverinfo, s);
   else
     pr_syslog(syslog_sockfd, priority, "%s\n", s);
-
-  if (!syslog_open) {
-    pr_closelog(syslog_sockfd);
-    syslog_sockfd = -1;
-
-  } else if (f != facility) {
-    (void) pr_setlogfacility(f);
-  }
 }
 
 void pr_log_pri(int priority, const char *fmt, ...) {


Index: proftpd.conf
===================================================================
RCS file: /cvs/extras/rpms/proftpd/F-8/proftpd.conf,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- proftpd.conf	19 Aug 2007 16:18:30 -0000	1.8
+++ proftpd.conf	2 Jan 2009 13:45:48 -0000	1.9
@@ -91,9 +91,13 @@
 # SQL authentication Dynamic Shared Object (DSO) loading
 # See README.DSO and howto/DSO.html for more details.
 #<IfModule mod_dso.c>
-#   LoadModule mod_sql.c
-#   LoadModule mod_sql_mysql.c
-#   LoadModule mod_sql_postgres.c
+#  LoadModule mod_ban.c
+#  LoadModule mod_ifsession.c
+#  LoadModule mod_quotatab.c
+#  LoadModule mod_quotatab_file.c
+#  LoadModule mod_sql.c
+#  LoadModule mod_sql_mysql.c
+#  LoadModule mod_sql_postgres.c
 #</IfModule>
 
 # A basic anonymous configuration, with an upload directory.
@@ -148,3 +152,18 @@
 #
 #</Anonymous>
 
+# Configuration for mod_ban
+<IfModule mod_ban.c>
+  BanEngine on
+  BanLog /var/log/proftpd/ban.log
+  BanTable /var/run/proftpd/ban.tab
+
+  # If the same client reaches the MaxLoginAttempts limit 2 times
+  # within 10 minutes, automatically add a ban for that client that
+  # will expire after one hour.
+  BanOnEvent MaxLoginAttempts 2/00:10:00 01:00:00
+
+  # Allow the FTP admin to manually add/remove bans
+  BanControlsACLs all allow user ftpadm
+</IfModule>
+


Index: proftpd.spec
===================================================================
RCS file: /cvs/extras/rpms/proftpd/F-8/proftpd.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- proftpd.spec	2 Jan 2009 12:51:48 -0000	1.37
+++ proftpd.spec	2 Jan 2009 13:45:48 -0000	1.38
@@ -1,7 +1,7 @@
 Summary: Flexible, stable and highly-configurable FTP server
 Name: proftpd
 Version: 1.3.1
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: GPLv2+
 Group: System Environment/Daemons
 URL: http://www.proftpd.org/
@@ -16,6 +16,9 @@
 Source8: proftpd-mod_quotatab_ldap.schema
 Patch0: proftpd-1.3.1-find-umode_t.patch
 Patch1: proftpd-1.3.1-csrf.patch
+Patch2: proftpd-1.3.1-tls_shutdown.patch
+Patch3: proftpd-1.3.1-tls_debug.patch
+Patch4: proftpd-1.3.1-tls_sighup.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires: pam >= 0.59
 Requires(post): /sbin/chkconfig
@@ -68,6 +71,9 @@
 %setup -q
 %patch0 -p1 -b .find-umode_t
 %patch1 -p1 -b .csrf
+%patch2 -p0 -b .tls_shutdown
+%patch3 -p1 -b .tls_debug.patch
+%patch4 -p0 -b .tls_sighup.patch
 
 
 %build
@@ -198,6 +204,11 @@
 
 
 %changelog
+* Fri Jan  2 2009 Matthias Saou <http://freshrpms.net/> 1.3.1-8
+- Update default configuration to have a lit of available modules and more
+  example configuration for them.
+- Include patches to fix TLS issues (#457280).
+
 * Fri Jan  2 2009 Matthias Saou <http://freshrpms.net/> 1.3.1-7
 - Add Debian patch to fix CSRF vulnerability (#464127, upstream #3115).
 



From limb at fedoraproject.org  Fri Jan  2 14:01:20 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Fri,  2 Jan 2009 14:01:20 +0000 (UTC)
Subject: rpms/gnubg/devel gnubg.spec,1.24,1.25
Message-ID: <20090102140120.42CE170130@cvs1.fedora.phx.redhat.com>

Author: limb

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

Modified Files:
	gnubg.spec 
Log Message:
Requires fix.



Index: gnubg.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnubg/devel/gnubg.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- gnubg.spec	31 Dec 2008 14:38:08 -0000	1.24
+++ gnubg.spec	2 Jan 2009 14:00:49 -0000	1.25
@@ -4,7 +4,7 @@
 Summary:       A backgammon game and analyser
 Epoch:         1
 Version:       0.9.0.1
-Release:       4%{?dist}
+Release:       4.1%{?dist}
 Source0:       http://gnubg.org/media/sources/gnubg-0.9.0-1.tar.gz
 Source1:       gnubg.weights
 Source2:       gnubg.desktop
@@ -45,7 +45,13 @@
 Requires(preun): /sbin/install-info
 Requires(post): coreutils
 Requires(postun): coreutils
+%if "0%{?dist}" == "0.fc10"
 Requires: bitstream-vera-fonts
+%else
+Requires: bitstream-vera-fonts-sans
+Requires: bitstream-vera-fonts-serif
+%endif
+
 
 %description
 GNU Backgammon is software for playing and analysing backgammon
@@ -159,6 +165,8 @@
 %{_datadir}/gnubg/gnubg_ts0.bd
 
 %changelog
+* Fri Jan 02 2009 Jon Ciesla <limb at jcomserv.net> - 1:0.9.0.1-4.1
+- Requires fix.
 * Tue Dec 30 2008 Jon Ciesla <limb at jcomserv.net> - 1:0.9.0.1-4
 - Drop and symlink to system fonts, BZ 477391.
 * Thu Dec 11 2008 Jon Ciesla <limb at jcomserv.net> - 1:0.9.0.1-3



From thias at fedoraproject.org  Fri Jan  2 14:06:35 2009
From: thias at fedoraproject.org (Matthias Saou)
Date: Fri,  2 Jan 2009 14:06:35 +0000 (UTC)
Subject: rpms/python-twisted-web/EL-5 .cvsignore, 1.2,
	1.3 python-twisted-web.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20090102140635.B95A770130@cvs1.fedora.phx.redhat.com>

Author: thias

Update of /cvs/extras/rpms/python-twisted-web/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25662

Modified Files:
	.cvsignore python-twisted-web.spec sources 
Log Message:
Update to 0.7.0, bugfix release dated Jan 2007.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-twisted-web/EL-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	27 Dec 2006 13:42:41 -0000	1.2
+++ .cvsignore	2 Jan 2009 14:06:05 -0000	1.3
@@ -1 +1 @@
-TwistedWeb-0.6.0.tar.bz2
+TwistedWeb-0.7.0.tar.bz2


Index: python-twisted-web.spec
===================================================================
RCS file: /cvs/extras/rpms/python-twisted-web/EL-5/python-twisted-web.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- python-twisted-web.spec	27 Dec 2006 13:42:41 -0000	1.1
+++ python-twisted-web.spec	2 Jan 2009 14:06:05 -0000	1.2
@@ -5,14 +5,14 @@
 %define origname TwistedWeb
 
 Name:           %{python}-twisted-web
-Version:        0.6.0
-Release:        4%{?dist}
+Version:        0.7.0
+Release:        1%{?dist}
 Summary:        Twisted web server, programmable in Python
 
 Group:          Development/Libraries
 License:        MIT
 URL:            http://twistedmatrix.com/trac/wiki/TwistedWeb
-Source0:        http://tmrc.mit.edu/mirror/twisted/Web/0.6/TwistedWeb-%{version}.tar.bz2
+Source0:        http://tmrc.mit.edu/mirror/twisted/Web/0.7/TwistedWeb-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  %{python}-twisted-core
@@ -50,11 +50,6 @@
 # python-twisted-core, which is arch-specific, so it needs to go in sitearch
 %{__python} setup.py install -O1 --root $RPM_BUILD_ROOT --install-purelib %{python_sitearch}
 
-# Man pages
-mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1/
-cp -a doc/man/*.1 $RPM_BUILD_ROOT%{_mandir}/man1/
-rm -rf doc/man
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -65,14 +60,17 @@
 %files
 %defattr(-,root,root,-)
 %doc README LICENSE NEWS doc/*
-%{_mandir}/man1/*
-%{_bindir}/websetroot
 
 %{python_sitearch}/twisted/web/
 
 %{python_sitearch}/twisted/plugins/twisted_web.py*
 
 %changelog
+* Fri Jan  2 2009 Matthias Saou <http://freshrpms.net/> 0.7.0-1
+- Update to 0.7.0, bugfix release dated Jan 2007.
+- Remove man pages and websetroot program which are no longer included (from
+  NEWS : "websetroot was removed, because it wasn't working anyway (#945)").
+
 * Fri Dec 22 2006 Jef Spaleta <jspaleta at gmail.com>
 - 0.6.0-4
 - Docs and Url fixes as suggested in the review


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-twisted-web/EL-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	27 Dec 2006 13:42:41 -0000	1.2
+++ sources	2 Jan 2009 14:06:05 -0000	1.3
@@ -1 +1 @@
-a681931d2eb747ca871ef71d8d1f5ff1  TwistedWeb-0.6.0.tar.bz2
+de55ee18f843bcc6372d34eb88a27c21  TwistedWeb-0.7.0.tar.bz2



From jorton at fedoraproject.org  Fri Jan  2 14:16:22 2009
From: jorton at fedoraproject.org (Joe Orton)
Date: Fri,  2 Jan 2009 14:16:22 +0000 (UTC)
Subject: rpms/libidn/devel libidn.spec,1.48,1.49
Message-ID: <20090102141622.29F8670130@cvs1.fedora.phx.redhat.com>

Author: jorton

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

Modified Files:
	libidn.spec 
Log Message:
* Mon Dec 29 2008 Kedar Sovani <kedars at marvell.com> 0.6.14-9
- fix the problem with #include_next



Index: libidn.spec
===================================================================
RCS file: /cvs/extras/rpms/libidn/devel/libidn.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- libidn.spec	10 Jun 2008 15:43:01 -0000	1.48
+++ libidn.spec	2 Jan 2009 14:15:51 -0000	1.49
@@ -1,11 +1,12 @@
 Summary: Internationalized Domain Name support library
 Name: libidn
 Version: 0.6.14
-Release: 8
+Release: 9
 URL: http://www.gnu.org/software/libidn/
 License: LGPLv2+
 Source0: http://josefsson.org/libidn/releases/libidn-%{version}.tar.gz
 Patch0: libidn-0.6.14-aconf262.patch
+Patch1: libidn-0.6.14-include-next.patch
 Group: System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: pkgconfig, gettext, libtool, autoconf
@@ -33,6 +34,7 @@
 %prep
 %setup -q
 %patch0 -p1 -b .aconf262
+%patch1 -p1 -b .include-next-fix
 
 # Name directory sections consistently in the info file, #209491
 sed -i '/^INFO-DIR-SECTION/{s/GNU Libraries/Libraries/;s/GNU utilities/Utilities/;}' doc/libidn.info
@@ -42,7 +44,9 @@
 
 %build
 # Must re-bootstrap to get multilib-aware libtool
-autoreconf
+libtoolize --force --copy
+aclocal -I m4 -I gl/m4 -I lib/gl/m4
+autoheader && autoconf && automake
 %configure --disable-csharp --disable-static --libdir=/%{_lib}
 make %{?_smp_mflags}
 
@@ -110,6 +114,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec 29 2008 Kedar Sovani <kedars at marvell.com> 0.6.14-9
+- fix the problem with #include_next
+
 * Tue Jun 10 2008 Joe Orton <jorton at redhat.com> 0.6.14-8
 - fix build with latest autoconf (#449440)
 



From jorton at fedoraproject.org  Fri Jan  2 14:16:39 2009
From: jorton at fedoraproject.org (Joe Orton)
Date: Fri,  2 Jan 2009 14:16:39 +0000 (UTC)
Subject: rpms/libidn/devel libidn-0.6.14-include-next.patch,NONE,1.1
Message-ID: <20090102141639.BBA3E70130@cvs1.fedora.phx.redhat.com>

Author: jorton

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

Added Files:
	libidn-0.6.14-include-next.patch 
Log Message:
* Mon Dec 29 2008 Kedar Sovani <kedars at marvell.com> 0.6.14-9
- fix the problem with #include_next


libidn-0.6.14-include-next.patch:

--- NEW FILE libidn-0.6.14-include-next.patch ---
diff -urp libidn-0.6.14.orig/lib/Makefile.am libidn-0.6.14/lib/Makefile.am
--- libidn-0.6.14.orig/lib/Makefile.am	2007-05-31 06:31:00.000000000 -0400
+++ libidn-0.6.14/lib/Makefile.am	2008-12-16 00:25:12.000000000 -0500
@@ -37,7 +37,7 @@ nodist_include_HEADERS = $(idn_int)
 
 idn-int.h:
 	if test -n "$(STDINT_H)"; then \
-		cp gl/stdint.h idn-int.h; \
+		sed -e s/include_next/include/ gl/stdint.h > idn-int.h; \
 	else \
 		echo '#include <stdint.h>' > idn-int.h; \
 	fi



From bpepple at fedoraproject.org  Fri Jan  2 15:00:49 2009
From: bpepple at fedoraproject.org (Brian Pepple)
Date: Fri,  2 Jan 2009 15:00:49 +0000 (UTC)
Subject: rpms/farsight2/devel farsight2.spec,1.2,1.3
Message-ID: <20090102150049.1DB2370130@cvs1.fedora.phx.redhat.com>

Author: bpepple

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

Modified Files:
	farsight2.spec 
Log Message:
* Fri Jan 02 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.0.6-3
- Rebuild.



Index: farsight2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/farsight2/devel/farsight2.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- farsight2.spec	1 Jan 2009 00:14:42 -0000	1.2
+++ farsight2.spec	2 Jan 2009 15:00:18 -0000	1.3
@@ -8,7 +8,7 @@
 
 Name:           farsight2
 Version:        0.0.6
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Libraries for videoconferencing
 
 Group:          System Environment/Libraries
@@ -110,6 +110,9 @@
 
 
 %changelog
+* Fri Jan 02 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.0.6-3
+- Rebuild.
+
 * Wed Dec 31 2008 Brian Pepple <bpepple at fedoraproject.org> - 0.0.6-2
 - Preserve time stamps.
 



From peterscheie at fedoraproject.org  Fri Jan  2 15:10:39 2009
From: peterscheie at fedoraproject.org (Peter Scheie)
Date: Fri,  2 Jan 2009 15:10:39 +0000 (UTC)
Subject: rpms/k12linux-quick-start-guide/devel .cvsignore, 1.2,
	1.3 import.log, 
	1.1, 1.2 k12linux-quick-start-guide.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20090102151039.EF25870130@cvs1.fedora.phx.redhat.com>

Author: peterscheie

Update of /cvs/pkgs/rpms/k12linux-quick-start-guide/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14279/devel

Modified Files:
	.cvsignore import.log k12linux-quick-start-guide.spec sources 
Log Message:
In HTML doc, changed 'rpm -e ltsp-livesetup-docs' to 'rpm -e k12linux-quick-start-guide'.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/k12linux-quick-start-guide/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	31 Dec 2008 15:39:18 -0000	1.2
+++ .cvsignore	2 Jan 2009 15:10:09 -0000	1.3
@@ -1 +1 @@
-k12linux-quick-start-guide-0.0.7.tar.bz2
+k12linux-quick-start-guide-0.0.8.tar.bz2


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/k12linux-quick-start-guide/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	31 Dec 2008 15:39:18 -0000	1.1
+++ import.log	2 Jan 2009 15:10:09 -0000	1.2
@@ -1 +1,2 @@
 k12linux-quick-start-guide-0_0_7-1_fc9:HEAD:k12linux-quick-start-guide-0.0.7-1.fc9.src.rpm:1230737874
+k12linux-quick-start-guide-0_0_8-1_fc9:HEAD:k12linux-quick-start-guide-0.0.8-1.fc9.src.rpm:1230908919


Index: k12linux-quick-start-guide.spec
===================================================================
RCS file: /cvs/pkgs/rpms/k12linux-quick-start-guide/devel/k12linux-quick-start-guide.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- k12linux-quick-start-guide.spec	31 Dec 2008 15:39:18 -0000	1.1
+++ k12linux-quick-start-guide.spec	2 Jan 2009 15:10:09 -0000	1.2
@@ -1,5 +1,5 @@
 Name:           k12linux-quick-start-guide
-Version:        0.0.7
+Version:        0.0.8
 Release:        1%{?dist}
 Summary:        Quick Start Guide for K12Linux Live LTSP Server
 
@@ -48,6 +48,10 @@
 
 
 %changelog
+* Mon Dec 29 2008 Peter Scheie <peter at scheie.homedns.org> - 0.0.8-1
+- Changed html document regarding removing the document from the
+  system from referencing ltsp-server-livesetupdocs to k12linux-quick-start-guide.
+
 * Sun Dec 21 2008 Peter Scheie <peter at scheie.homedns.org> - 0.0.7-1
 - Changed license in spec from GPLv2+ to CC-BY-SA.
 - Used a different screenshot for step #10 in html which more clearly shows


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/k12linux-quick-start-guide/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	31 Dec 2008 15:39:18 -0000	1.2
+++ sources	2 Jan 2009 15:10:09 -0000	1.3
@@ -1 +1 @@
-e28a512a14f1072b6bf5fd27b7df5921  k12linux-quick-start-guide-0.0.7.tar.bz2
+b3ad9ef3a08e68618acfcf0b9d52c5e3  k12linux-quick-start-guide-0.0.8.tar.bz2



From peterscheie at fedoraproject.org  Fri Jan  2 15:15:14 2009
From: peterscheie at fedoraproject.org (Peter Scheie)
Date: Fri,  2 Jan 2009 15:15:14 +0000 (UTC)
Subject: rpms/k12linux-quick-start-guide/F-9 import.log, NONE,
	1.1 k12linux-quick-start-guide.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090102151514.668B170130@cvs1.fedora.phx.redhat.com>

Author: peterscheie

Update of /cvs/pkgs/rpms/k12linux-quick-start-guide/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15825/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	import.log k12linux-quick-start-guide.spec 
Log Message:
Initial import for F9.  Document for enabling LTSP bits for K12Linux, which is
Fedora with LTSP pieces included.



--- NEW FILE import.log ---
k12linux-quick-start-guide-0_0_8-1_fc9:F-9:k12linux-quick-start-guide-0.0.8-1.fc9.src.rpm:1230909181


--- NEW FILE k12linux-quick-start-guide.spec ---
Name:           k12linux-quick-start-guide
Version:        0.0.8
Release:        1%{?dist}
Summary:        Quick Start Guide for K12Linux Live LTSP Server

Group:          Documentation
License:        CC-BY-SA
URL:            http://peterscheie.fedorapeople.org/k12linux/quick-start-guide
Source0:        http://peterscheie.fedorapeople.org/k12linux/quick-start-guide/k12linux-quick-start-guide-%{version}.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
Requires:       bluecurve-icon-theme 

%description
Documentation for configuring networking on K12Linux LTSP Server to
enable support for thin clients.  Covers LiveUSB and hard disk configurations. 
The admin should remove this package after the setup is complete.


%prep
%setup -q


%build
echo "Nothing to build"


%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/skel/Desktop/
mkdir -p -m 0755 $RPM_BUILD_ROOT%{_datadir}/k12linux-quick-start-guide/
cp -a "K12Linux Quick Start Guide.desktop" $RPM_BUILD_ROOT%{_sysconfdir}/skel/Desktop/
chmod 0644 $RPM_BUILD_ROOT%{_sysconfdir}/skel/Desktop/*
cp -a docs/* $RPM_BUILD_ROOT%{_datadir}/k12linux-quick-start-guide/
chmod 0644 $RPM_BUILD_ROOT%{_datadir}/k12linux-quick-start-guide/*


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
# None of this is marked %%doc because this package must be whole during runtime
%{_sysconfdir}/skel/Desktop/*
%{_datadir}/k12linux-quick-start-guide/



%changelog
* Mon Dec 29 2008 Peter Scheie <peter at scheie.homedns.org> - 0.0.8-1
- Changed html document regarding removing the document from the
  system from referencing ltsp-server-livesetupdocs to k12linux-quick-start-guide.

* Sun Dec 21 2008 Peter Scheie <peter at scheie.homedns.org> - 0.0.7-1
- Changed license in spec from GPLv2+ to CC-BY-SA.
- Used a different screenshot for step #10 in html which more clearly shows
  the device names.  Deleted the sentence that said to close the
  window because it was replaced by the File-Save verbage added in
  0.0.6.

* Sun Dec 21 2008 Peter Scheie <peter at scheie.homedns.org> - 0.0.6-1
- Removed version number for bluecurve-icon-theme for Requires in spec.
- Changed version number referenced in Source0 line to use %{version}.
- Changed Step 10 in html doc to use File-Save rather quit, save; replaced 
  corresponding screenshot.
- Replaced tabs with spaces in spec.

* Thu Dec 18 2008 Peter Scheie <peter at scheie.homedns.org> - 0.0.5
- Added mising Requires to spec for icon.
- Removed GenericName[en_US]= line from .desktop.
- Added blank line between each revision in changelog.

* Wed Dec 17 2008 Peter Scheie <peter at scheie.homedns.org> - 0.0.4
- Fixed path to document in .desktop file.
- Changed path to icon to actual file instead of symlink in .desktop file.
- Removed Icon[en_US] and Name[en_US] lines from .desktop file because they
  were redundant.
- Added CC license in html document.
- Changed URL to fedorapeople.org site.

* Sun Nov 16 2008 Peter Scheie <peter at scheie.homedns.org> - 0.0.3
- Reworked opening section to cover running from LiveUSB and from hard disk, since
  document is mostly about network config to enable LTSP support.
- Removed words about deleting the document launcher from /etc/skel; added back in
  step on removing entire package via rpm -e command.
- Added link to Fedora Installation Guide in reference to adding user IDs.
- Changed name and all allusions from README and ltsp-server-livesetupdocs to 
  k12linux-quick-start-guide.
- Changed screenshots so they show 'K12Linux Quick Start Guide' on desktop instead
  of 'README LTSP Server Setup'.

* Thu Nov 13 2008 Peter Scheie <peter at scheie.homedns.org> - 0.0.2
- Updated screencapture image for step 8 to one in which the interface in question is highlighted.
- Changed name of document to K12Linux Quick Start Guide to emphasize that this is just a simple
  set of instructions for getting LTSP networking running.
- Removed last step, of removing this package, as it's not really necessary since this is just a
  quick start guide.
* Sun Oct 12 2008 Warren Togami <wtogami at redhat.com> - 0.0.1
- initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/k12linux-quick-start-guide/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	31 Dec 2008 05:55:08 -0000	1.1
+++ .cvsignore	2 Jan 2009 15:14:43 -0000	1.2
@@ -0,0 +1 @@
+k12linux-quick-start-guide-0.0.8.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/k12linux-quick-start-guide/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	31 Dec 2008 05:55:08 -0000	1.1
+++ sources	2 Jan 2009 15:14:44 -0000	1.2
@@ -0,0 +1 @@
+b3ad9ef3a08e68618acfcf0b9d52c5e3  k12linux-quick-start-guide-0.0.8.tar.bz2



From corsepiu at fedoraproject.org  Fri Jan  2 16:24:12 2009
From: corsepiu at fedoraproject.org (=?utf-8?q?Ralf_Cors=C3=A9pius?=)
Date: Fri,  2 Jan 2009 16:24:12 +0000 (UTC)
Subject: rpms/perl-Locale-Maketext-Lexicon/devel .cvsignore, 1.14,
	1.15 perl-Locale-Maketext-Lexicon.spec, 1.21, 1.22 sources, 1.14, 1.15
Message-ID: <20090102162412.D59ED7013C@cvs1.fedora.phx.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-Locale-Maketext-Lexicon/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3928

Modified Files:
	.cvsignore perl-Locale-Maketext-Lexicon.spec sources 
Log Message:
* Fri Jan 02 2009 Ralf Cors??pius <corsepiu at fedoraproject.org> - 0.77-1
- Upstream update.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Locale-Maketext-Lexicon/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	20 Dec 2008 06:39:50 -0000	1.14
+++ .cvsignore	2 Jan 2009 16:23:42 -0000	1.15
@@ -1 +1 @@
-Locale-Maketext-Lexicon-0.76.tar.gz
+Locale-Maketext-Lexicon-0.77.tar.gz


Index: perl-Locale-Maketext-Lexicon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Locale-Maketext-Lexicon/devel/perl-Locale-Maketext-Lexicon.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- perl-Locale-Maketext-Lexicon.spec	20 Dec 2008 06:39:50 -0000	1.21
+++ perl-Locale-Maketext-Lexicon.spec	2 Jan 2009 16:23:42 -0000	1.22
@@ -1,5 +1,5 @@
 Name: 		perl-Locale-Maketext-Lexicon
-Version: 	0.76
+Version: 	0.77
 Release: 	1%{?dist}
 Summary: 	Extract translatable strings from source
 License:	MIT
@@ -82,6 +82,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Fri Jan 02 2009 Ralf Cors??pius <corsepiu at fedoraproject.org> - 0.77-1
+- Upstream update.
+
 * Sat Dec 20 2008 Ralf Cors??pius <corsepiu at fedoraproject.org> - 0.76-1
 - Upstream update.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Locale-Maketext-Lexicon/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	20 Dec 2008 06:39:51 -0000	1.14
+++ sources	2 Jan 2009 16:23:42 -0000	1.15
@@ -1 +1 @@
-e76a50a9935ab607bc06f13028bb364f  Locale-Maketext-Lexicon-0.76.tar.gz
+622dada722fb6db0e49e453c843af83c  Locale-Maketext-Lexicon-0.77.tar.gz



From thm at fedoraproject.org  Fri Jan  2 17:11:21 2009
From: thm at fedoraproject.org (Thomas Moschny)
Date: Fri,  2 Jan 2009 17:11:21 +0000 (UTC)
Subject: rpms/monotone/devel import.log, NONE, 1.1 .cvsignore, 1.21,
	1.22 monotone.spec, 1.39, 1.40 sources, 1.21, 1.22
Message-ID: <20090102171122.063ED70130@cvs1.fedora.phx.redhat.com>

Author: thm

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

Modified Files:
	.cvsignore monotone.spec sources 
Added Files:
	import.log 
Log Message:
Updated for 0.42 release. Removed tabs from specfile.


--- NEW FILE import.log ---
monotone-0_42-1_fc10:HEAD:monotone-0.42-1.fc10.src.rpm:1230916116


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/monotone/devel/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- .cvsignore	12 Sep 2008 20:24:20 -0000	1.21
+++ .cvsignore	2 Jan 2009 17:10:50 -0000	1.22
@@ -1 +1 @@
-monotone-0.41.tar.gz
+monotone-0.42.tar.gz


Index: monotone.spec
===================================================================
RCS file: /cvs/pkgs/rpms/monotone/devel/monotone.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- monotone.spec	12 Sep 2008 20:24:20 -0000	1.39
+++ monotone.spec	2 Jan 2009 17:10:51 -0000	1.40
@@ -1,5 +1,5 @@
 Name: monotone
-Version: 0.41
+Version: 0.42
 Release: 1%{?dist}
 
 Summary: A free, distributed version control system
@@ -65,7 +65,7 @@
 
 %build
 %configure --with-bundled-lua=%{bundled_lua} \
-	   --with-bundled-sqlite=%{bundled_sqlite}
+           --with-bundled-sqlite=%{bundled_sqlite}
 make %{?_smp_mflags}
 
 %check
@@ -92,7 +92,7 @@
 mkdir -p %{buildroot}%{_localstatedir}/lib
 ln -snf ../bin/mtn %{buildroot}%{_sbindir}/monotone-server
 %{__install} -D -m 0555 %{SOURCE1} \
-	     %{buildroot}%{_sysconfdir}/rc.d/init.d/monotone
+             %{buildroot}%{_sysconfdir}/rc.d/init.d/monotone
 %{__install} -D -m 0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/sysconfig/monotone
 %{__install} -d -m 0755 %{buildroot}%{_sysconfdir}/monotone
 %{__install} -d -m 0750 %{buildroot}%{_sysconfdir}/monotone/private-keys
@@ -101,13 +101,13 @@
 
 # These do not actually wind up in the package, due to %%ghost.
 %{__install} -c -m 0440 /dev/null \
-	     %{buildroot}%{_sysconfdir}/monotone/passphrase.lua
+             %{buildroot}%{_sysconfdir}/monotone/passphrase.lua
 %{__install} -c -m 0640 /dev/null \
-	     %{buildroot}%{_sysconfdir}/monotone/read-permissions
+             %{buildroot}%{_sysconfdir}/monotone/read-permissions
 %{__install} -c -m 0640 /dev/null \
-	     %{buildroot}%{_sysconfdir}/monotone/write-permissions
+             %{buildroot}%{_sysconfdir}/monotone/write-permissions
 %{__install} -c -m 0644 /dev/null \
-	     %{buildroot}%{_sysconfdir}/monotone/monotonerc
+             %{buildroot}%{_sysconfdir}/monotone/monotonerc
 touch %{buildroot}%{_localstatedir}/lib/monotone/server.mtn
 
 cp %{SOURCE3} .
@@ -119,13 +119,13 @@
 %post
 if [ $1 -eq 1 ]
 then
-	/sbin/install-info %{_infodir}/monotone.info %{_infodir}/dir > /dev/null 2>&1 || :
+        /sbin/install-info %{_infodir}/monotone.info %{_infodir}/dir > /dev/null 2>&1 || :
 fi
 
 %preun
 if [ $1 -eq 0 ]
 then
-	/sbin/install-info --delete %{_infodir}/monotone.info %{_infodir}/dir > /dev/null 2>&1 || :
+        /sbin/install-info --delete %{_infodir}/monotone.info %{_infodir}/dir > /dev/null 2>&1 || :
 fi
 
 %files -f %{name}.lang
@@ -160,7 +160,7 @@
 getent group monotone > /dev/null || groupadd -r monotone
 getent passwd monotone > /dev/null ||
 useradd -r -g monotone -r -d %{_localstatedir}/lib/monotone -s /sbin/nologin \
-	-c "Monotone Netsync Server" monotone
+        -c "Monotone Netsync Server" monotone
 exit 0
 
 %post server
@@ -169,18 +169,21 @@
 
 %preun server
 if [ $1 = 0 ]; then
-	/sbin/service monotone stop > /dev/null 2>&1
-	/sbin/chkconfig --del monotone
+        /sbin/service monotone stop > /dev/null 2>&1
+        /sbin/chkconfig --del monotone
 fi
 
 %postun
 if [ $1 -gt 1 ]; then
-	# Restart the running server: updates its db format when needed.
-	/sbin/service monotone condrestart > /dev/null 2>&1 || :
+        # Restart the running server: updates its db format when needed.
+        /sbin/service monotone condrestart > /dev/null 2>&1 || :
 fi
 
 
 %changelog
+* Fri Jan  2 2009 Thomas Moschny <thomas.moschny at gmx.de> - 0.42-1
+- Updated for 0.42 release.
+
 * Fri Sep 12 2008 Thomas Moschny <thomas.moschny at gmx.de> - 0.41-1
 - Updated for 0.41 release.
 - Added mtnopt helper.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/monotone/devel/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sources	12 Sep 2008 20:24:20 -0000	1.21
+++ sources	2 Jan 2009 17:10:51 -0000	1.22
@@ -1 +1 @@
-f4ee37fb6853719933561fef901e2a07  monotone-0.41.tar.gz
+c8e916d674b6608369d9f447700a8830  monotone-0.42.tar.gz



From pkgdb at fedoraproject.org  Fri Jan  2 17:19:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 02 Jan 2009 17:19:58 +0000
Subject: [pkgdb] php: remi has requested watchbugzilla
Message-ID: <20090102171958.663A9208D51@bastion.fedora.phx.redhat.com>

remi has requested the watchbugzilla acl on php (Fedora 9)

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



From pkgdb at fedoraproject.org  Fri Jan  2 17:20:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 02 Jan 2009 17:20:00 +0000
Subject: [pkgdb] php: remi has requested watchcommits
Message-ID: <20090102172000.5F397208D55@bastion.fedora.phx.redhat.com>

remi has requested the watchcommits acl on php (Fedora 9)

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



From pkgdb at fedoraproject.org  Fri Jan  2 17:20:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 02 Jan 2009 17:20:03 +0000
Subject: [pkgdb] php: remi has requested commit
Message-ID: <20090102172003.A6DC4208D58@bastion.fedora.phx.redhat.com>

remi has requested the commit acl on php (Fedora 9)

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



From peterscheie at fedoraproject.org  Fri Jan  2 17:26:44 2009
From: peterscheie at fedoraproject.org (Peter Scheie)
Date: Fri,  2 Jan 2009 17:26:44 +0000 (UTC)
Subject: rpms/k12linux-quick-start-guide/devel
	k12linux-quick-start-guide.spec, 1.2, 1.3
Message-ID: <20090102172644.98C0D70130@cvs1.fedora.phx.redhat.com>

Author: peterscheie

Update of /cvs/pkgs/rpms/k12linux-quick-start-guide/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18141

Modified Files:
	k12linux-quick-start-guide.spec 
Log Message:
Updated to version 0.0.9.  Includes a couple of changes to the html file.



Index: k12linux-quick-start-guide.spec
===================================================================
RCS file: /cvs/pkgs/rpms/k12linux-quick-start-guide/devel/k12linux-quick-start-guide.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- k12linux-quick-start-guide.spec	2 Jan 2009 15:10:09 -0000	1.2
+++ k12linux-quick-start-guide.spec	2 Jan 2009 17:26:13 -0000	1.3
@@ -1,5 +1,5 @@
 Name:           k12linux-quick-start-guide
-Version:        0.0.8
+Version:        0.0.9
 Release:        1%{?dist}
 Summary:        Quick Start Guide for K12Linux Live LTSP Server
 
@@ -48,6 +48,10 @@
 
 
 %changelog
+* Fri Jan 02 2009 Peter Scheie <peter at scheie.homedns.org> - 0.0.9-1
+- Consolidated 'rpm -e' commands for removing the guide to a single step.
+- Changed link to newer version of how to get on #ltsp at ltsp.org.
+
 * Mon Dec 29 2008 Peter Scheie <peter at scheie.homedns.org> - 0.0.8-1
 - Changed html document regarding removing the document from the
   system from referencing ltsp-server-livesetupdocs to k12linux-quick-start-guide.



From turki at fedoraproject.org  Fri Jan  2 17:31:39 2009
From: turki at fedoraproject.org (Nikolay Vladimirov)
Date: Fri,  2 Jan 2009 17:31:39 +0000 (UTC)
Subject: rpms/python-libgmail-docs/devel python-libgmail-docs.spec,1.3,1.4
Message-ID: <20090102173139.7384D7013F@cvs1.fedora.phx.redhat.com>

Author: turki

Update of /cvs/pkgs/rpms/python-libgmail-docs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19649

Modified Files:
	python-libgmail-docs.spec 
Log Message:
Fix BZ#474616(unowned dir) and restructure the package


Index: python-libgmail-docs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-libgmail-docs/devel/python-libgmail-docs.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- python-libgmail-docs.spec	28 Jan 2008 04:49:57 -0000	1.3
+++ python-libgmail-docs.spec	2 Jan 2009 17:31:08 -0000	1.4
@@ -1,11 +1,8 @@
 %define realname libgmail-docs
-%define projectname libgmail
-%define projectversion 0.1.8
-
 
 Name:           python-libgmail-docs
 Version:        0.3
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Documents and examples for python-libgmail
 
 Group:          Documentation
@@ -16,7 +13,6 @@
 
 BuildArch:      noarch 
 BuildRequires:  python
-Requires:       python-libgmail
 
 %description
 Documents and examples for python-libgmail.  
@@ -33,12 +29,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
+mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/API
+mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/examples
+install -p -m644 *.py $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/examples
+install -p -m644  README COPYING $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/
 cd API
-install -p -m644 * $RPM_BUILD_ROOT%{_docdir}/python-%{projectname}-%{projectversion}/API
+install -p -m644 * $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/API
 
  
 %clean
@@ -47,11 +43,15 @@
 
 %files
 %defattr(-,root,root,-)
-%doc %{_docdir}/python-%{projectname}-%{projectversion}/API
-%doc %{_docdir}/python-%{projectname}-%{projectversion}/examples
-%exclude %{_docdir}/python-%{projectname}-%{projectversion}/examples/*.py[co]
+%doc %{_docdir}/%{name}-%{version}
+%exclude %{_docdir}/%{name}-%{version}/examples/*.py[co]
 
 %changelog
+* Fri Jan 2 2009 Nikolay Vladimirov <nikolay at vladimiroff.com> 0.3-7
+- Completely restructure the package
+- Now using package's own dir instead of python-libmail's
+- Fixes BZ#474616
+
 * Sun Jan 27 2008 Michael Stahnke <mastahnke at gmail.com> - 0.3-6
 - Excluded *.pyc *.pyo in %%doc
 



From pkgdb at fedoraproject.org  Fri Jan  2 17:32:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 02 Jan 2009 17:32:15 +0000
Subject: [pkgdb] monotone ownership updated
Message-ID: <20090102173215.899622084B8@bastion.fedora.phx.redhat.com>

Package monotone in Fedora devel is now owned by thm

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



From peterscheie at fedoraproject.org  Fri Jan  2 17:32:39 2009
From: peterscheie at fedoraproject.org (Peter Scheie)
Date: Fri,  2 Jan 2009 17:32:39 +0000 (UTC)
Subject: rpms/k12linux-quick-start-guide/devel .cvsignore, 1.3, 1.4 sources, 
	1.3, 1.4
Message-ID: <20090102173239.76C617013F@cvs1.fedora.phx.redhat.com>

Author: peterscheie

Update of /cvs/pkgs/rpms/k12linux-quick-start-guide/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19918

Modified Files:
	.cvsignore sources 
Log Message:
Forgot to run 'make new-sources' before committing.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/k12linux-quick-start-guide/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	2 Jan 2009 15:10:09 -0000	1.3
+++ .cvsignore	2 Jan 2009 17:32:09 -0000	1.4
@@ -1 +1 @@
-k12linux-quick-start-guide-0.0.8.tar.bz2
+k12linux-quick-start-guide-0.0.9.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/k12linux-quick-start-guide/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	2 Jan 2009 15:10:09 -0000	1.3
+++ sources	2 Jan 2009 17:32:09 -0000	1.4
@@ -1 +1 @@
-b3ad9ef3a08e68618acfcf0b9d52c5e3  k12linux-quick-start-guide-0.0.8.tar.bz2
+db73786ee9a2bf2198a9f2a017088299  k12linux-quick-start-guide-0.0.9.tar.bz2



From pkgdb at fedoraproject.org  Fri Jan  2 17:32:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 02 Jan 2009 17:32:41 +0000
Subject: [pkgdb] monotone ownership updated
Message-ID: <20090102173241.85E8E208D51@bastion.fedora.phx.redhat.com>

Package monotone in Fedora 10 is now owned by thm

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



From pkgdb at fedoraproject.org  Fri Jan  2 17:32:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 02 Jan 2009 17:32:57 +0000
Subject: [pkgdb] monotone ownership updated
Message-ID: <20090102173259.218D5208D4E@bastion.fedora.phx.redhat.com>

Package monotone in Fedora 9 is now owned by thm

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



From pkgdb at fedoraproject.org  Fri Jan  2 17:33:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 02 Jan 2009 17:33:08 +0000
Subject: [pkgdb] monotone ownership updated
Message-ID: <20090102173308.846512084B8@bastion.fedora.phx.redhat.com>

Package monotone in Fedora EPEL 5 is now owned by thm

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



From turki at fedoraproject.org  Fri Jan  2 17:37:46 2009
From: turki at fedoraproject.org (Nikolay Vladimirov)
Date: Fri,  2 Jan 2009 17:37:46 +0000 (UTC)
Subject: rpms/python-libgmail-docs/F-10 python-libgmail-docs.spec,1.3,1.4
Message-ID: <20090102173746.C1F7E70130@cvs1.fedora.phx.redhat.com>

Author: turki

Update of /cvs/pkgs/rpms/python-libgmail-docs/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23161

Modified Files:
	python-libgmail-docs.spec 
Log Message:
Fix BZ#474616(unowned dir) and restructure the package


Index: python-libgmail-docs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-libgmail-docs/F-10/python-libgmail-docs.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- python-libgmail-docs.spec	28 Jan 2008 04:49:57 -0000	1.3
+++ python-libgmail-docs.spec	2 Jan 2009 17:37:16 -0000	1.4
@@ -1,11 +1,8 @@
 %define realname libgmail-docs
-%define projectname libgmail
-%define projectversion 0.1.8
-
 
 Name:           python-libgmail-docs
 Version:        0.3
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Documents and examples for python-libgmail
 
 Group:          Documentation
@@ -16,7 +13,6 @@
 
 BuildArch:      noarch 
 BuildRequires:  python
-Requires:       python-libgmail
 
 %description
 Documents and examples for python-libgmail.  
@@ -33,12 +29,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
+mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/API
+mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/examples
+install -p -m644 *.py $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/examples
+install -p -m644  README COPYING $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/
 cd API
-install -p -m644 * $RPM_BUILD_ROOT%{_docdir}/python-%{projectname}-%{projectversion}/API
+install -p -m644 * $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/API
 
  
 %clean
@@ -47,11 +43,15 @@
 
 %files
 %defattr(-,root,root,-)
-%doc %{_docdir}/python-%{projectname}-%{projectversion}/API
-%doc %{_docdir}/python-%{projectname}-%{projectversion}/examples
-%exclude %{_docdir}/python-%{projectname}-%{projectversion}/examples/*.py[co]
+%doc %{_docdir}/%{name}-%{version}
+%exclude %{_docdir}/%{name}-%{version}/examples/*.py[co]
 
 %changelog
+* Fri Jan 2 2009 Nikolay Vladimirov <nikolay at vladimiroff.com> 0.3-7
+- Completely restructure the package
+- Now using package's own dir instead of python-libmail's
+- Fixes BZ#474616
+
 * Sun Jan 27 2008 Michael Stahnke <mastahnke at gmail.com> - 0.3-6
 - Excluded *.pyc *.pyo in %%doc
 



From turki at fedoraproject.org  Fri Jan  2 17:38:48 2009
From: turki at fedoraproject.org (Nikolay Vladimirov)
Date: Fri,  2 Jan 2009 17:38:48 +0000 (UTC)
Subject: rpms/python-libgmail-docs/F-9 python-libgmail-docs.spec,1.3,1.4
Message-ID: <20090102173848.6E0B670130@cvs1.fedora.phx.redhat.com>

Author: turki

Update of /cvs/pkgs/rpms/python-libgmail-docs/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23346

Modified Files:
	python-libgmail-docs.spec 
Log Message:
Fix BZ#474616(unowned dir) and restructure the package


Index: python-libgmail-docs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-libgmail-docs/F-9/python-libgmail-docs.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- python-libgmail-docs.spec	28 Jan 2008 04:49:57 -0000	1.3
+++ python-libgmail-docs.spec	2 Jan 2009 17:38:18 -0000	1.4
@@ -1,11 +1,8 @@
 %define realname libgmail-docs
-%define projectname libgmail
-%define projectversion 0.1.8
-
 
 Name:           python-libgmail-docs
 Version:        0.3
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Documents and examples for python-libgmail
 
 Group:          Documentation
@@ -16,7 +13,6 @@
 
 BuildArch:      noarch 
 BuildRequires:  python
-Requires:       python-libgmail
 
 %description
 Documents and examples for python-libgmail.  
@@ -33,12 +29,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
+mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/API
+mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/examples
+install -p -m644 *.py $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/examples
+install -p -m644  README COPYING $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/
 cd API
-install -p -m644 * $RPM_BUILD_ROOT%{_docdir}/python-%{projectname}-%{projectversion}/API
+install -p -m644 * $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/API
 
  
 %clean
@@ -47,11 +43,15 @@
 
 %files
 %defattr(-,root,root,-)
-%doc %{_docdir}/python-%{projectname}-%{projectversion}/API
-%doc %{_docdir}/python-%{projectname}-%{projectversion}/examples
-%exclude %{_docdir}/python-%{projectname}-%{projectversion}/examples/*.py[co]
+%doc %{_docdir}/%{name}-%{version}
+%exclude %{_docdir}/%{name}-%{version}/examples/*.py[co]
 
 %changelog
+* Fri Jan 2 2009 Nikolay Vladimirov <nikolay at vladimiroff.com> 0.3-7
+- Completely restructure the package
+- Now using package's own dir instead of python-libmail's
+- Fixes BZ#474616
+
 * Sun Jan 27 2008 Michael Stahnke <mastahnke at gmail.com> - 0.3-6
 - Excluded *.pyc *.pyo in %%doc
 



From pkgdb at fedoraproject.org  Fri Jan  2 17:44:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 02 Jan 2009 17:44:38 +0000
Subject: [pkgdb] monotone had acl change status
Message-ID: <20090102174438.A34B02084B8@bastion.fedora.phx.redhat.com>

thm has set the watchbugzilla acl on monotone (Fedora devel) to Obsolete for thm

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



From pkgdb at fedoraproject.org  Fri Jan  2 17:45:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 02 Jan 2009 17:45:01 +0000
Subject: [pkgdb] monotone had acl change status
Message-ID: <20090102174501.9376A2084B8@bastion.fedora.phx.redhat.com>

thm has set the watchcommits acl on monotone (Fedora devel) to Obsolete for thm

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



From pkgdb at fedoraproject.org  Fri Jan  2 17:45:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 02 Jan 2009 17:45:05 +0000
Subject: [pkgdb] monotone had acl change status
Message-ID: <20090102174505.DCA57208D50@bastion.fedora.phx.redhat.com>

thm has set the commit acl on monotone (Fedora devel) to Obsolete for thm

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



From pkgdb at fedoraproject.org  Fri Jan  2 17:45:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 02 Jan 2009 17:45:12 +0000
Subject: [pkgdb] monotone had acl change status
Message-ID: <20090102174512.6414C208D55@bastion.fedora.phx.redhat.com>

thm has set the approveacls acl on monotone (Fedora devel) to Obsolete for thm

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



From pkgdb at fedoraproject.org  Fri Jan  2 17:45:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 02 Jan 2009 17:45:45 +0000
Subject: [pkgdb] monotone had acl change status
Message-ID: <20090102174545.ABE25208D51@bastion.fedora.phx.redhat.com>

thm has set the watchbugzilla acl on monotone (Fedora 10) to Obsolete for thm

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



From pkgdb at fedoraproject.org  Fri Jan  2 17:45:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 02 Jan 2009 17:45:47 +0000
Subject: [pkgdb] monotone had acl change status
Message-ID: <20090102174547.59987208D55@bastion.fedora.phx.redhat.com>

thm has set the watchcommits acl on monotone (Fedora 10) to Obsolete for thm

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



From pkgdb at fedoraproject.org  Fri Jan  2 17:45:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 02 Jan 2009 17:45:50 +0000
Subject: [pkgdb] monotone had acl change status
Message-ID: <20090102174550.AEAAB208D58@bastion.fedora.phx.redhat.com>

thm has set the commit acl on monotone (Fedora 10) to Obsolete for thm

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



From pkgdb at fedoraproject.org  Fri Jan  2 17:45:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 02 Jan 2009 17:45:53 +0000
Subject: [pkgdb] monotone had acl change status
Message-ID: <20090102174553.9B1BC208D59@bastion.fedora.phx.redhat.com>

thm has set the approveacls acl on monotone (Fedora 10) to Obsolete for thm

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



From pkgdb at fedoraproject.org  Fri Jan  2 17:46:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 02 Jan 2009 17:46:01 +0000
Subject: [pkgdb] monotone had acl change status
Message-ID: <20090102174601.219A6208D5A@bastion.fedora.phx.redhat.com>

thm has set the watchbugzilla acl on monotone (Fedora 9) to Obsolete for thm

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



From pkgdb at fedoraproject.org  Fri Jan  2 17:46:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 02 Jan 2009 17:46:01 +0000
Subject: [pkgdb] monotone had acl change status
Message-ID: <20090102174601.647A4208D60@bastion.fedora.phx.redhat.com>

thm has set the watchcommits acl on monotone (Fedora 9) to Obsolete for thm

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



From pkgdb at fedoraproject.org  Fri Jan  2 17:46:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 02 Jan 2009 17:46:01 +0000
Subject: [pkgdb] monotone had acl change status
Message-ID: <20090102174601.A2920208D66@bastion.fedora.phx.redhat.com>

thm has set the commit acl on monotone (Fedora 9) to Obsolete for thm

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



From pkgdb at fedoraproject.org  Fri Jan  2 17:46:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 02 Jan 2009 17:46:04 +0000
Subject: [pkgdb] monotone had acl change status
Message-ID: <20090102174604.68F21208D7D@bastion.fedora.phx.redhat.com>

thm has set the approveacls acl on monotone (Fedora 9) to Obsolete for thm

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



From pkgdb at fedoraproject.org  Fri Jan  2 17:46:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 02 Jan 2009 17:46:06 +0000
Subject: [pkgdb] monotone had acl change status
Message-ID: <20090102174606.9D5BC208DA5@bastion.fedora.phx.redhat.com>

thm has set the watchbugzilla acl on monotone (Fedora EPEL 5) to Obsolete for thm

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



From pkgdb at fedoraproject.org  Fri Jan  2 17:46:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 02 Jan 2009 17:46:09 +0000
Subject: [pkgdb] monotone had acl change status
Message-ID: <20090102174609.B0910208D53@bastion.fedora.phx.redhat.com>

thm has set the watchcommits acl on monotone (Fedora EPEL 5) to Obsolete for thm

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



From pkgdb at fedoraproject.org  Fri Jan  2 17:46:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 02 Jan 2009 17:46:09 +0000
Subject: [pkgdb] monotone had acl change status
Message-ID: <20090102174609.E6D09208D9B@bastion.fedora.phx.redhat.com>

thm has set the commit acl on monotone (Fedora EPEL 5) to Obsolete for thm

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



From pkgdb at fedoraproject.org  Fri Jan  2 17:46:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 02 Jan 2009 17:46:14 +0000
Subject: [pkgdb] monotone had acl change status
Message-ID: <20090102174614.D8CD7208D9F@bastion.fedora.phx.redhat.com>

thm has set the approveacls acl on monotone (Fedora EPEL 5) to Obsolete for thm

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



From peterscheie at fedoraproject.org  Fri Jan  2 17:56:11 2009
From: peterscheie at fedoraproject.org (Peter Scheie)
Date: Fri,  2 Jan 2009 17:56:11 +0000 (UTC)
Subject: rpms/k12linux-quick-start-guide/F-9 .cvsignore, 1.2,
	1.3 k12linux-quick-start-guide.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20090102175611.C8A0B70130@cvs1.fedora.phx.redhat.com>

Author: peterscheie

Update of /cvs/pkgs/rpms/k12linux-quick-start-guide/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26021

Modified Files:
	.cvsignore k12linux-quick-start-guide.spec sources 
Log Message:
Update to version 0.0.9


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/k12linux-quick-start-guide/F-9/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	2 Jan 2009 15:14:43 -0000	1.2
+++ .cvsignore	2 Jan 2009 17:55:39 -0000	1.3
@@ -1 +1 @@
-k12linux-quick-start-guide-0.0.8.tar.bz2
+k12linux-quick-start-guide-0.0.9.tar.bz2


Index: k12linux-quick-start-guide.spec
===================================================================
RCS file: /cvs/pkgs/rpms/k12linux-quick-start-guide/F-9/k12linux-quick-start-guide.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- k12linux-quick-start-guide.spec	2 Jan 2009 15:14:44 -0000	1.1
+++ k12linux-quick-start-guide.spec	2 Jan 2009 17:55:39 -0000	1.2
@@ -1,5 +1,5 @@
 Name:           k12linux-quick-start-guide
-Version:        0.0.8
+Version:        0.0.9
 Release:        1%{?dist}
 Summary:        Quick Start Guide for K12Linux Live LTSP Server
 
@@ -48,6 +48,10 @@
 
 
 %changelog
+* Fri Jan 02 2009 Peter Scheie <peter at scheie.homedns.org> - 0.0.9-1
+- Consolidated 'rpm -e' commands for removing the guide to a single step.
+- Changed link to newer version of how to get on #ltsp at ltsp.org.
+
 * Mon Dec 29 2008 Peter Scheie <peter at scheie.homedns.org> - 0.0.8-1
 - Changed html document regarding removing the document from the
   system from referencing ltsp-server-livesetupdocs to k12linux-quick-start-guide.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/k12linux-quick-start-guide/F-9/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	2 Jan 2009 15:14:44 -0000	1.2
+++ sources	2 Jan 2009 17:55:39 -0000	1.3
@@ -1 +1 @@
-b3ad9ef3a08e68618acfcf0b9d52c5e3  k12linux-quick-start-guide-0.0.8.tar.bz2
+db73786ee9a2bf2198a9f2a017088299  k12linux-quick-start-guide-0.0.9.tar.bz2



From salimma at fedoraproject.org  Fri Jan  2 18:36:05 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Fri,  2 Jan 2009 18:36:05 +0000 (UTC)
Subject: rpms/python-sphinx/F-9 .cvsignore, 1.5, 1.6 python-sphinx.spec, 1.5,
	1.6 sources, 1.5, 1.6
Message-ID: <20090102183605.8AC1170134@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/python-sphinx/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1885/F-9

Modified Files:
	.cvsignore python-sphinx.spec sources 
Log Message:
* Fri Jan  2 2009 Michel Salim <salimma at fedoraproject.org> - 0.5.1-1
- Update to 0.5.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-sphinx/F-9/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	25 Nov 2008 01:48:18 -0000	1.5
+++ .cvsignore	2 Jan 2009 18:35:34 -0000	1.6
@@ -1 +1 @@
-Sphinx-0.5.tar.gz
+Sphinx-0.5.1.tar.gz


Index: python-sphinx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-sphinx/F-9/python-sphinx.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- python-sphinx.spec	25 Nov 2008 01:48:18 -0000	1.5
+++ python-sphinx.spec	2 Jan 2009 18:35:34 -0000	1.6
@@ -4,7 +4,7 @@
 %define upstream_name Sphinx
 
 Name:           python-sphinx
-Version:        0.5
+Version:        0.5.1
 Release:        1%{?dist}
 Summary:        Python documentation generator
 
@@ -107,6 +107,12 @@
 
 
 %changelog
+* Fri Jan  2 2009 Michel Salim <salimma at fedoraproject.org> - 0.5.1-1
+- Update to 0.5.1
+
+* Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 0.5-2
+- Rebuild for Python 2.6
+
 * Mon Nov 24 2008 Michel Salim <salimma at fedoraproject.org> - 0.5-1
 - Update to 0.5
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-sphinx/F-9/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	25 Nov 2008 01:48:18 -0000	1.5
+++ sources	2 Jan 2009 18:35:34 -0000	1.6
@@ -1 +1 @@
-55a33cc13b5096c8763cd4a933b30ddc  Sphinx-0.5.tar.gz
+11456e362d75c1a4c5a5847921d3f4c7  Sphinx-0.5.1.tar.gz



From salimma at fedoraproject.org  Fri Jan  2 18:36:05 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Fri,  2 Jan 2009 18:36:05 +0000 (UTC)
Subject: rpms/python-sphinx/devel .cvsignore, 1.5, 1.6 python-sphinx.spec,
	1.8, 1.9 sources, 1.5, 1.6
Message-ID: <20090102183605.91B1C70140@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/python-sphinx/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1885/devel

Modified Files:
	.cvsignore python-sphinx.spec sources 
Log Message:
* Fri Jan  2 2009 Michel Salim <salimma at fedoraproject.org> - 0.5.1-1
- Update to 0.5.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-sphinx/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	25 Nov 2008 01:48:18 -0000	1.5
+++ .cvsignore	2 Jan 2009 18:35:34 -0000	1.6
@@ -1 +1 @@
-Sphinx-0.5.tar.gz
+Sphinx-0.5.1.tar.gz


Index: python-sphinx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-sphinx/devel/python-sphinx.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- python-sphinx.spec	29 Nov 2008 15:52:26 -0000	1.8
+++ python-sphinx.spec	2 Jan 2009 18:35:34 -0000	1.9
@@ -4,8 +4,8 @@
 %define upstream_name Sphinx
 
 Name:           python-sphinx
-Version:        0.5
-Release:        2%{?dist}
+Version:        0.5.1
+Release:        1%{?dist}
 Summary:        Python documentation generator
 
 Group:          Development/Tools
@@ -107,6 +107,9 @@
 
 
 %changelog
+* Fri Jan  2 2009 Michel Salim <salimma at fedoraproject.org> - 0.5.1-1
+- Update to 0.5.1
+
 * Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 0.5-2
 - Rebuild for Python 2.6
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-sphinx/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	25 Nov 2008 01:48:19 -0000	1.5
+++ sources	2 Jan 2009 18:35:34 -0000	1.6
@@ -1 +1 @@
-55a33cc13b5096c8763cd4a933b30ddc  Sphinx-0.5.tar.gz
+11456e362d75c1a4c5a5847921d3f4c7  Sphinx-0.5.1.tar.gz



From salimma at fedoraproject.org  Fri Jan  2 18:36:05 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Fri,  2 Jan 2009 18:36:05 +0000 (UTC)
Subject: rpms/python-sphinx/F-10 .cvsignore, 1.5, 1.6 python-sphinx.spec, 1.7,
	1.8 sources, 1.5, 1.6
Message-ID: <20090102183605.81E5B70130@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/python-sphinx/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1885/F-10

Modified Files:
	.cvsignore python-sphinx.spec sources 
Log Message:
* Fri Jan  2 2009 Michel Salim <salimma at fedoraproject.org> - 0.5.1-1
- Update to 0.5.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-sphinx/F-10/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	25 Nov 2008 01:48:18 -0000	1.5
+++ .cvsignore	2 Jan 2009 18:35:33 -0000	1.6
@@ -1 +1 @@
-Sphinx-0.5.tar.gz
+Sphinx-0.5.1.tar.gz


Index: python-sphinx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-sphinx/F-10/python-sphinx.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- python-sphinx.spec	25 Nov 2008 01:48:18 -0000	1.7
+++ python-sphinx.spec	2 Jan 2009 18:35:33 -0000	1.8
@@ -4,7 +4,7 @@
 %define upstream_name Sphinx
 
 Name:           python-sphinx
-Version:        0.5
+Version:        0.5.1
 Release:        1%{?dist}
 Summary:        Python documentation generator
 
@@ -107,6 +107,12 @@
 
 
 %changelog
+* Fri Jan  2 2009 Michel Salim <salimma at fedoraproject.org> - 0.5.1-1
+- Update to 0.5.1
+
+* Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 0.5-2
+- Rebuild for Python 2.6
+
 * Mon Nov 24 2008 Michel Salim <salimma at fedoraproject.org> - 0.5-1
 - Update to 0.5
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-sphinx/F-10/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	25 Nov 2008 01:48:18 -0000	1.5
+++ sources	2 Jan 2009 18:35:33 -0000	1.6
@@ -1 +1 @@
-55a33cc13b5096c8763cd4a933b30ddc  Sphinx-0.5.tar.gz
+11456e362d75c1a4c5a5847921d3f4c7  Sphinx-0.5.1.tar.gz



From thias at fedoraproject.org  Fri Jan  2 18:56:48 2009
From: thias at fedoraproject.org (Matthias Saou)
Date: Fri,  2 Jan 2009 18:56:48 +0000 (UTC)
Subject: rpms/python-Coherence/devel .cvsignore, 1.6,
	1.7 python-Coherence.spec, 1.7, 1.8 sources, 1.6, 1.7
Message-ID: <20090102185648.6FFF170130@cvs1.fedora.phx.redhat.com>

Author: thias

Update of /cvs/extras/rpms/python-Coherence/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8646

Modified Files:
	.cvsignore python-Coherence.spec sources 
Log Message:
Update to 0.6.0.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-Coherence/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	2 Oct 2008 08:01:34 -0000	1.6
+++ .cvsignore	2 Jan 2009 18:56:17 -0000	1.7
@@ -1 +1 @@
-Coherence-0.5.8.tar.gz
+Coherence-0.6.0.tar.gz


Index: python-Coherence.spec
===================================================================
RCS file: /cvs/extras/rpms/python-Coherence/devel/python-Coherence.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- python-Coherence.spec	29 Nov 2008 15:27:19 -0000	1.7
+++ python-Coherence.spec	2 Jan 2009 18:56:18 -0000	1.8
@@ -2,8 +2,8 @@
 
 Summary: Python framework to participate in digital living networks
 Name: python-Coherence
-Version: 0.5.8
-Release: 2%{?dist}
+Version: 0.6.0
+Release: 1%{?dist}
 License: MIT
 Group: Development/Languages
 URL: https://coherence.beebits.net/
@@ -13,18 +13,12 @@
 # As of 0.5.8, only "ConfigObj >= 4.3" in the requires.txt egg file
 #Requires: python-twisted-core
 #Requires: python-twisted-web
-#Requires: SOAPpy
 #Requires: python-nevow
-#Requires: python-louie
+Requires: python-louie
 Requires: python-configobj
 BuildRequires: python-devel
 # Must have setuptools to build the package
-# The build portions moved to a subpackage in F-8
-%if 0%{?fedora} >= 8
 BuildRequires: python-setuptools-devel
-%else
-BuildRequires: python-setuptools
-%endif
 Buildarch: noarch
 # Fist test packages had different names
 Obsoletes: coherence < 0.2.1-2
@@ -37,6 +31,11 @@
 
 %prep
 %setup -q -n Coherence-%{version}
+# As of 0.5.8, louie is bundled but we prefer the external package since we
+# have it easily available
+find coherence -type f -exec \
+    sed -i 's/coherence.extern.louie as louie/louie/' {} \;
+%{__rm} -rf coherence/extern/louie/
 
 
 %build
@@ -66,6 +65,10 @@
 
 
 %changelog
+* Fri Jan  2 2009 Matthias Saou <http://freshrpms.net/> 0.6.0-1
+- Update to 0.6.0.
+- Remove bundled internal louie and require external + trivial sed to use it.
+
 * Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 0.5.8-2
 - Rebuild for Python 2.6
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-Coherence/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	2 Oct 2008 08:01:34 -0000	1.6
+++ sources	2 Jan 2009 18:56:18 -0000	1.7
@@ -1 +1 @@
-81148ea9c8ab6ce5dd8fc3f5f1403348  Coherence-0.5.8.tar.gz
+58bebf0aee266161ae343e3d5b6956a3  Coherence-0.6.0.tar.gz



From pkgdb at fedoraproject.org  Fri Jan  2 19:57:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 02 Jan 2009 19:57:06 +0000
Subject: [pkgdb] strace had acl change status
Message-ID: <20090102195706.B56482084B8@bastion.fedora.phx.redhat.com>

roland has set the commit acl on strace (Fedora devel) to Approved for vda

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



From gemi at fedoraproject.org  Fri Jan  2 20:01:29 2009
From: gemi at fedoraproject.org (=?utf-8?q?G=C3=A9rard_Milmeister?=)
Date: Fri,  2 Jan 2009 20:01:29 +0000 (UTC)
Subject: rpms/TeXmacs/F-9 .cvsignore, 1.32, 1.33 TeXmacs.spec, 1.61,
	1.62 sources, 1.33, 1.34
Message-ID: <20090102200130.0E32770130@cvs1.fedora.phx.redhat.com>

Author: gemi

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

Modified Files:
	.cvsignore TeXmacs.spec sources 
Log Message:
new version 1.0.7.1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/TeXmacs/F-9/.cvsignore,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- .cvsignore	19 Oct 2008 20:37:59 -0000	1.32
+++ .cvsignore	2 Jan 2009 20:00:58 -0000	1.33
@@ -1 +1 @@
-TeXmacs-1.0.7-src.tar.gz
+TeXmacs-1.0.7.1-src.tar.gz


Index: TeXmacs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/TeXmacs/F-9/TeXmacs.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- TeXmacs.spec	19 Oct 2008 20:37:59 -0000	1.61
+++ TeXmacs.spec	2 Jan 2009 20:00:58 -0000	1.62
@@ -1,5 +1,5 @@
 Name:		TeXmacs
-Version:	1.0.7
+Version:	1.0.7.1
 Release:	1%{?dist}
 Summary:	Structured wysiwyg scientific text editor
 
@@ -170,6 +170,9 @@
 
 
 %changelog
+* Fri Jan  2 2009 Gerard Milmeister <gemi at bluewin.ch> - 1.0.7.1-1
+- new release 1.0.7.1
+
 * Sun Oct 19 2008 Gerard Milmeister <gemi at bluewin.ch> - 1.0.7-1
 - new release 1.0.7
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/TeXmacs/F-9/sources,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- sources	19 Oct 2008 20:37:59 -0000	1.33
+++ sources	2 Jan 2009 20:00:58 -0000	1.34
@@ -1 +1 @@
-4b58579250a697cbf68ed83ef3805030  TeXmacs-1.0.7-src.tar.gz
+d4416106273dcbcce8d5de421e5a0ddd  TeXmacs-1.0.7.1-src.tar.gz



From gemi at fedoraproject.org  Fri Jan  2 20:07:26 2009
From: gemi at fedoraproject.org (=?utf-8?q?G=C3=A9rard_Milmeister?=)
Date: Fri,  2 Jan 2009 20:07:26 +0000 (UTC)
Subject: rpms/abcm2ps/F-9 .cvsignore, 1.45, 1.46 abcm2ps.spec, 1.48,
	1.49 sources, 1.45, 1.46
Message-ID: <20090102200726.D2D3770130@cvs1.fedora.phx.redhat.com>

Author: gemi

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

Modified Files:
	.cvsignore abcm2ps.spec sources 
Log Message:
new release 5.9.3


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/abcm2ps/F-9/.cvsignore,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- .cvsignore	5 Oct 2008 08:36:45 -0000	1.45
+++ .cvsignore	2 Jan 2009 20:06:56 -0000	1.46
@@ -1,2 +1,2 @@
+abcm2ps-5.9.3.tar.gz
 abcplus_en-1.1.0.zip
-abcm2ps-5.9.1.tar.gz


Index: abcm2ps.spec
===================================================================
RCS file: /cvs/pkgs/rpms/abcm2ps/F-9/abcm2ps.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- abcm2ps.spec	5 Oct 2008 08:36:46 -0000	1.48
+++ abcm2ps.spec	2 Jan 2009 20:06:56 -0000	1.49
@@ -1,5 +1,5 @@
 Name:           abcm2ps
-Version:        5.9.1
+Version:        5.9.3
 Release:        1%{?dist}
 Summary:        A program to typeset ABC tunes into Postscript
 
@@ -52,6 +52,9 @@
 
 
 %changelog
+* Fri Jan  2 2009 Gerard Milmeister <gemi at bluewin.ch> - 5.9.3-1
+- new release 5.9.3
+
 * Sun Oct  5 2008 Gerard Milmeister <gemi at bluewin.ch> - 5.9.1-1
 - new release 5.9.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/abcm2ps/F-9/sources,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- sources	5 Oct 2008 08:36:46 -0000	1.45
+++ sources	2 Jan 2009 20:06:56 -0000	1.46
@@ -1,2 +1,2 @@
+9521d8c7746a2bfe6f39f152e1633e13  abcm2ps-5.9.3.tar.gz
 bf8d8ad90ba520f6a9872d2142efbda9  abcplus_en-1.1.0.zip
-27e14311d288f579ab841f2f40feec18  abcm2ps-5.9.1.tar.gz



From gemi at fedoraproject.org  Fri Jan  2 20:13:23 2009
From: gemi at fedoraproject.org (=?utf-8?q?G=C3=A9rard_Milmeister?=)
Date: Fri,  2 Jan 2009 20:13:23 +0000 (UTC)
Subject: rpms/abcm2ps/F-10 .cvsignore, 1.45, 1.46 abcm2ps.spec, 1.48,
	1.49 sources, 1.45, 1.46
Message-ID: <20090102201323.C8C4E70130@cvs1.fedora.phx.redhat.com>

Author: gemi

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

Modified Files:
	.cvsignore abcm2ps.spec sources 
Log Message:
new release 5.9.3


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/abcm2ps/F-10/.cvsignore,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- .cvsignore	5 Oct 2008 08:35:48 -0000	1.45
+++ .cvsignore	2 Jan 2009 20:12:53 -0000	1.46
@@ -1,2 +1,2 @@
+abcm2ps-5.9.3.tar.gz
 abcplus_en-1.1.0.zip
-abcm2ps-5.9.1.tar.gz


Index: abcm2ps.spec
===================================================================
RCS file: /cvs/pkgs/rpms/abcm2ps/F-10/abcm2ps.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- abcm2ps.spec	5 Oct 2008 08:35:48 -0000	1.48
+++ abcm2ps.spec	2 Jan 2009 20:12:53 -0000	1.49
@@ -1,5 +1,5 @@
 Name:           abcm2ps
-Version:        5.9.1
+Version:        5.9.3
 Release:        1%{?dist}
 Summary:        A program to typeset ABC tunes into Postscript
 
@@ -52,6 +52,9 @@
 
 
 %changelog
+* Fri Jan  2 2009 Gerard Milmeister <gemi at bluewin.ch> - 5.9.3-1
+- new release 5.9.3
+
 * Sun Oct  5 2008 Gerard Milmeister <gemi at bluewin.ch> - 5.9.1-1
 - new release 5.9.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/abcm2ps/F-10/sources,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- sources	5 Oct 2008 08:35:48 -0000	1.45
+++ sources	2 Jan 2009 20:12:53 -0000	1.46
@@ -1,2 +1,2 @@
+9521d8c7746a2bfe6f39f152e1633e13  abcm2ps-5.9.3.tar.gz
 bf8d8ad90ba520f6a9872d2142efbda9  abcplus_en-1.1.0.zip
-27e14311d288f579ab841f2f40feec18  abcm2ps-5.9.1.tar.gz



From gemi at fedoraproject.org  Fri Jan  2 20:13:24 2009
From: gemi at fedoraproject.org (=?utf-8?q?G=C3=A9rard_Milmeister?=)
Date: Fri,  2 Jan 2009 20:13:24 +0000 (UTC)
Subject: rpms/abcm2ps/devel .cvsignore, 1.45, 1.46 abcm2ps.spec, 1.48,
	1.49 sources, 1.45, 1.46
Message-ID: <20090102201324.21A9170130@cvs1.fedora.phx.redhat.com>

Author: gemi

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

Modified Files:
	.cvsignore abcm2ps.spec sources 
Log Message:
new release 5.9.3


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/abcm2ps/devel/.cvsignore,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- .cvsignore	5 Oct 2008 08:35:48 -0000	1.45
+++ .cvsignore	2 Jan 2009 20:12:53 -0000	1.46
@@ -1,2 +1,2 @@
+abcm2ps-5.9.3.tar.gz
 abcplus_en-1.1.0.zip
-abcm2ps-5.9.1.tar.gz


Index: abcm2ps.spec
===================================================================
RCS file: /cvs/pkgs/rpms/abcm2ps/devel/abcm2ps.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- abcm2ps.spec	5 Oct 2008 08:35:48 -0000	1.48
+++ abcm2ps.spec	2 Jan 2009 20:12:53 -0000	1.49
@@ -1,5 +1,5 @@
 Name:           abcm2ps
-Version:        5.9.1
+Version:        5.9.3
 Release:        1%{?dist}
 Summary:        A program to typeset ABC tunes into Postscript
 
@@ -52,6 +52,9 @@
 
 
 %changelog
+* Fri Jan  2 2009 Gerard Milmeister <gemi at bluewin.ch> - 5.9.3-1
+- new release 5.9.3
+
 * Sun Oct  5 2008 Gerard Milmeister <gemi at bluewin.ch> - 5.9.1-1
 - new release 5.9.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/abcm2ps/devel/sources,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- sources	5 Oct 2008 08:35:48 -0000	1.45
+++ sources	2 Jan 2009 20:12:53 -0000	1.46
@@ -1,2 +1,2 @@
+9521d8c7746a2bfe6f39f152e1633e13  abcm2ps-5.9.3.tar.gz
 bf8d8ad90ba520f6a9872d2142efbda9  abcplus_en-1.1.0.zip
-27e14311d288f579ab841f2f40feec18  abcm2ps-5.9.1.tar.gz



From gemi at fedoraproject.org  Fri Jan  2 20:17:46 2009
From: gemi at fedoraproject.org (=?utf-8?q?G=C3=A9rard_Milmeister?=)
Date: Fri,  2 Jan 2009 20:17:46 +0000 (UTC)
Subject: rpms/TeXmacs/F-10 .cvsignore, 1.32, 1.33 TeXmacs.spec, 1.61,
	1.62 sources, 1.33, 1.34
Message-ID: <20090102201746.F155570130@cvs1.fedora.phx.redhat.com>

Author: gemi

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

Modified Files:
	.cvsignore TeXmacs.spec sources 
Log Message:
new version 1.0.7.1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/TeXmacs/F-10/.cvsignore,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- .cvsignore	19 Oct 2008 20:37:59 -0000	1.32
+++ .cvsignore	2 Jan 2009 20:17:16 -0000	1.33
@@ -1 +1 @@
-TeXmacs-1.0.7-src.tar.gz
+TeXmacs-1.0.7.1-src.tar.gz


Index: TeXmacs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/TeXmacs/F-10/TeXmacs.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- TeXmacs.spec	19 Oct 2008 20:37:59 -0000	1.61
+++ TeXmacs.spec	2 Jan 2009 20:17:16 -0000	1.62
@@ -1,5 +1,5 @@
 Name:		TeXmacs
-Version:	1.0.7
+Version:	1.0.7.1
 Release:	1%{?dist}
 Summary:	Structured wysiwyg scientific text editor
 
@@ -170,6 +170,9 @@
 
 
 %changelog
+* Fri Jan  2 2009 Gerard Milmeister <gemi at bluewin.ch> - 1.0.7.1-1
+- new release 1.0.7.1
+
 * Sun Oct 19 2008 Gerard Milmeister <gemi at bluewin.ch> - 1.0.7-1
 - new release 1.0.7
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/TeXmacs/F-10/sources,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- sources	19 Oct 2008 20:37:59 -0000	1.33
+++ sources	2 Jan 2009 20:17:16 -0000	1.34
@@ -1 +1 @@
-4b58579250a697cbf68ed83ef3805030  TeXmacs-1.0.7-src.tar.gz
+d4416106273dcbcce8d5de421e5a0ddd  TeXmacs-1.0.7.1-src.tar.gz



From gemi at fedoraproject.org  Fri Jan  2 20:17:47 2009
From: gemi at fedoraproject.org (=?utf-8?q?G=C3=A9rard_Milmeister?=)
Date: Fri,  2 Jan 2009 20:17:47 +0000 (UTC)
Subject: rpms/TeXmacs/devel .cvsignore, 1.32, 1.33 TeXmacs.spec, 1.61,
	1.62 sources, 1.33, 1.34
Message-ID: <20090102201747.44A2570130@cvs1.fedora.phx.redhat.com>

Author: gemi

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

Modified Files:
	.cvsignore TeXmacs.spec sources 
Log Message:
new version 1.0.7.1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/TeXmacs/devel/.cvsignore,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- .cvsignore	19 Oct 2008 20:37:59 -0000	1.32
+++ .cvsignore	2 Jan 2009 20:17:16 -0000	1.33
@@ -1 +1 @@
-TeXmacs-1.0.7-src.tar.gz
+TeXmacs-1.0.7.1-src.tar.gz


Index: TeXmacs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/TeXmacs/devel/TeXmacs.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- TeXmacs.spec	19 Oct 2008 20:37:59 -0000	1.61
+++ TeXmacs.spec	2 Jan 2009 20:17:16 -0000	1.62
@@ -1,5 +1,5 @@
 Name:		TeXmacs
-Version:	1.0.7
+Version:	1.0.7.1
 Release:	1%{?dist}
 Summary:	Structured wysiwyg scientific text editor
 
@@ -170,6 +170,9 @@
 
 
 %changelog
+* Fri Jan  2 2009 Gerard Milmeister <gemi at bluewin.ch> - 1.0.7.1-1
+- new release 1.0.7.1
+
 * Sun Oct 19 2008 Gerard Milmeister <gemi at bluewin.ch> - 1.0.7-1
 - new release 1.0.7
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/TeXmacs/devel/sources,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- sources	19 Oct 2008 20:37:59 -0000	1.33
+++ sources	2 Jan 2009 20:17:16 -0000	1.34
@@ -1 +1 @@
-4b58579250a697cbf68ed83ef3805030  TeXmacs-1.0.7-src.tar.gz
+d4416106273dcbcce8d5de421e5a0ddd  TeXmacs-1.0.7.1-src.tar.gz



From ausil at fedoraproject.org  Fri Jan  2 20:42:05 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Fri,  2 Jan 2009 20:42:05 +0000 (UTC)
Subject: rpms/lpsolve/F-9 lpsolve.spec,1.2,1.3
Message-ID: <20090102204205.CB71370130@cvs1.fedora.phx.redhat.com>

Author: ausil

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

Modified Files:
	lpsolve.spec 
Log Message:
use -fPIC on sparc and s390 arches



Index: lpsolve.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lpsolve/F-9/lpsolve.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- lpsolve.spec	14 Mar 2008 09:33:50 -0000	1.2
+++ lpsolve.spec	2 Jan 2009 20:41:35 -0000	1.3
@@ -1,7 +1,7 @@
 Name:      lpsolve
 Summary:   A Mixed Integer Linear Programming (MILP) solver
 Version:   5.5.0.12
-Release:   1%{?dist}
+Release:   2%{?dist}
 Source:    http://downloads.sourceforge.net/lpsolve/lp_solve_%{version}_source.tar.gz
 Group:     System Environment/Libraries
 URL:       http://sourceforge.net/projects/lpsolve
@@ -25,6 +25,11 @@
 %prep
 %setup -q -n lp_solve_5.5
 %patch0 -p1 -b .cflags.patch
+#sparc and s390 need -fPIC  lets sed it 
+%ifarch sparcv9 sparc64 s390 s390x
+sed -i -e 's|-fpic|-fPIC|g' Makefile*
+sed -i -e 's|-fpic|-fPIC|g' lpsolve55/ccc
+%endif
 
 %build
 cd lpsolve55
@@ -61,6 +66,9 @@
 %{_includedir}/lpsolve
 
 %changelog
+* Fri Jan 02 2009 Dennis Gilmore <dennis at ausil.us> - 5.5.0.12-2
+- use -fPIC on sparc and s390 arches
+
 * Fri Mar 14 2008 Caolan McNamara <caolanm at redhat.com> - 5.5.0.12-1
 - latest version
 



From ausil at fedoraproject.org  Fri Jan  2 20:44:30 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Fri,  2 Jan 2009 20:44:30 +0000 (UTC)
Subject: rpms/lpsolve/F-9 lpsolve.spec,1.3,1.4
Message-ID: <20090102204430.E5B0370130@cvs1.fedora.phx.redhat.com>

Author: ausil

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

Modified Files:
	lpsolve.spec 
Log Message:
bump for unique tag




Index: lpsolve.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lpsolve/F-9/lpsolve.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- lpsolve.spec	2 Jan 2009 20:41:35 -0000	1.3
+++ lpsolve.spec	2 Jan 2009 20:44:00 -0000	1.4
@@ -1,7 +1,7 @@
 Name:      lpsolve
 Summary:   A Mixed Integer Linear Programming (MILP) solver
 Version:   5.5.0.12
-Release:   2%{?dist}
+Release:   2%{?dist}.1
 Source:    http://downloads.sourceforge.net/lpsolve/lp_solve_%{version}_source.tar.gz
 Group:     System Environment/Libraries
 URL:       http://sourceforge.net/projects/lpsolve
@@ -66,6 +66,10 @@
 %{_includedir}/lpsolve
 
 %changelog
+* Fri Jan 02 2009 Dennis Gilmore <dennis at ausil.us> - 5.5.0.12-2.1
+- -2 had been tagged but not built on teh devel tree before F-9 was branched
+- bump for unique tag
+
 * Fri Jan 02 2009 Dennis Gilmore <dennis at ausil.us> - 5.5.0.12-2
 - use -fPIC on sparc and s390 arches
 



From ausil at fedoraproject.org  Fri Jan  2 20:49:56 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Fri,  2 Jan 2009 20:49:56 +0000 (UTC)
Subject: rpms/lpsolve/F-10 lpsolve.spec,1.4,1.5
Message-ID: <20090102204956.BA35670130@cvs1.fedora.phx.redhat.com>

Author: ausil

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

Modified Files:
	lpsolve.spec 
Log Message:
use -fPIC on sparc and s390 arches



Index: lpsolve.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lpsolve/F-10/lpsolve.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- lpsolve.spec	4 Aug 2008 11:19:47 -0000	1.4
+++ lpsolve.spec	2 Jan 2009 20:49:26 -0000	1.5
@@ -1,7 +1,6 @@
-Name:      lpsolve
 Summary:   A Mixed Integer Linear Programming (MILP) solver
 Version:   5.5.0.13
-Release:   1%{?dist}
+Release:   2%{?dist}
 Source:    http://downloads.sourceforge.net/lpsolve/lp_solve_%{version}_source.tar.gz
 Group:     System Environment/Libraries
 URL:       http://sourceforge.net/projects/lpsolve
@@ -25,6 +24,11 @@
 %prep
 %setup -q -n lp_solve_5.5
 %patch0 -p1 -b .cflags.patch
+#sparc and s390 need -fPIC  lets sed it                                              
+%ifarch sparcv9 sparc64 s390 s390x                                                   
+sed -i -e 's|-fpic|-fPIC|g' Makefile*                                                
+sed -i -e 's|-fpic|-fPIC|g' lpsolve55/ccc                                            
+%endif 
 
 %build
 cd lpsolve55
@@ -61,6 +65,9 @@
 %{_includedir}/lpsolve
 
 %changelog
+* Fri Jan 02 2009 Dennis Gilmore <dennis at ausil.us> - 5.5.0.13-2
+- use -fPIC on sparc and s390 arches
+
 * Mon Aug 04 2008 Caolan McNamara <caolanm at redhat.com> - 5.5.0.13-1
 - latest version
 



From ausil at fedoraproject.org  Fri Jan  2 20:53:23 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Fri,  2 Jan 2009 20:53:23 +0000 (UTC)
Subject: rpms/lpsolve/F-10 lpsolve.spec,1.5,1.6
Message-ID: <20090102205323.BDBAB70130@cvs1.fedora.phx.redhat.com>

Author: ausil

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

Modified Files:
	lpsolve.spec 
Log Message:
put Name back



Index: lpsolve.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lpsolve/F-10/lpsolve.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- lpsolve.spec	2 Jan 2009 20:49:26 -0000	1.5
+++ lpsolve.spec	2 Jan 2009 20:52:53 -0000	1.6
@@ -1,3 +1,4 @@
+Name:      lpsolve
 Summary:   A Mixed Integer Linear Programming (MILP) solver
 Version:   5.5.0.13
 Release:   2%{?dist}



From limb at fedoraproject.org  Fri Jan  2 20:57:00 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Fri,  2 Jan 2009 20:57:00 +0000 (UTC)
Subject: rpms/drupal/devel .cvsignore,1.16,1.17 sources,1.16,1.17
Message-ID: <20090102205700.EB50F70134@cvs1.fedora.phx.redhat.com>

Author: limb

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

Modified Files:
	.cvsignore sources 
Log Message:
New upstream, selinux fix for BZ 472642.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/drupal/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore	11 Dec 2008 13:08:49 -0000	1.16
+++ .cvsignore	2 Jan 2009 20:56:30 -0000	1.17
@@ -1 +1 @@
-drupal-6.7.tar.gz
+drupal-6.8.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/drupal/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources	11 Dec 2008 13:08:49 -0000	1.16
+++ sources	2 Jan 2009 20:56:30 -0000	1.17
@@ -1 +1 @@
-c9e8e5a9892538d355c62bd17b95b3a9  drupal-6.7.tar.gz
+561f281b2dbee8310293a61443bdfbc7  drupal-6.8.tar.gz



From limb at fedoraproject.org  Fri Jan  2 20:57:59 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Fri,  2 Jan 2009 20:57:59 +0000 (UTC)
Subject: rpms/drupal/devel drupal-files-migrator.sh,NONE,1.1
Message-ID: <20090102205759.E035270130@cvs1.fedora.phx.redhat.com>

Author: limb

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

Added Files:
	drupal-files-migrator.sh 
Log Message:
Oops.



--- NEW FILE drupal-files-migrator.sh ---
#!/bin/bash
cd /etc/drupal
for i in `ls -1`; do
mv $i/files /var/lib/drupal/files/$i
/sbin/restorecon /var/lib/drupal/files/$i
ln -s /var/lib/drupal/files/$i /etc/drupal/$i/files
done



From limb at fedoraproject.org  Fri Jan  2 21:00:18 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Fri,  2 Jan 2009 21:00:18 +0000 (UTC)
Subject: rpms/drupal/devel drupal.spec,1.19,1.20
Message-ID: <20090102210018.ADBBE70130@cvs1.fedora.phx.redhat.com>

Author: limb

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

Modified Files:
	drupal.spec 
Log Message:
Hrm.



Index: drupal.spec
===================================================================
RCS file: /cvs/pkgs/rpms/drupal/devel/drupal.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- drupal.spec	11 Dec 2008 13:08:49 -0000	1.19
+++ drupal.spec	2 Jan 2009 20:59:48 -0000	1.20
@@ -1,6 +1,6 @@
 %define drupaldir %{_datadir}/drupal
 Name: drupal
-Version:  6.7
+Version:  6.8
 Release:  1%{?dist}
 Summary: An open-source content-management platform
 
@@ -11,6 +11,7 @@
 Source1: drupal.conf
 Source2: drupal-README.fedora
 Source3: drupal-cron
+Source4: drupal-files-migrator.sh
 Patch0: drupal-6.0-scripts-noshebang.patch
 
 BuildArch: noarch
@@ -47,15 +48,28 @@
 mkdir -p %{buildroot}%{_docdir}
 cp -pr %SOURCE2 .
 install -D -p -m 0644 %SOURCE3 %{buildroot}%{_sysconfdir}/cron.hourly/drupal 
-mkdir -p %{buildroot}%{_localstatedir}/lib/drupal
-ln -s ../../..%{_localstatedir}/lib/drupal %{buildroot}%{drupaldir}/files
+mkdir -p %{buildroot}%{_localstatedir}/lib/drupal/files/default
+#ln -s ../../..%{_localstatedir}/lib/drupal %{buildroot}%{drupaldir}/files
+ln -s ../../..%{_localstatedir}/lib/drupal/files/default %{buildroot}%{_sysconfdir}/drupal/default/files
+cp -pr %SOURCE4 .
 
 %clean
 rm -rf %{buildroot}
 
+#drop in first f12 build.
+%pre
+if [ $1 = "1" ]; then
+	if [ ! -d %{_localstatedir}/lib/drupal/files/default ]; then
+		mkdir %{_localstatedir}/lib/drupal/files/
+		mv %{_sysconfdir}/drupal/default/files/* %{_localstatedir}/lib/drupal/files/default
+		rmdir %{_sysconfdir}/drupal/default/files
+		/sbin/restorecon %{_localstatedir}/lib/drupal/files/default/
+	fi
+fi
+
 %files
 %defattr(-,root,root,-)
-%doc CHANGELOG.txt INSTALL* LICENSE* MAINTAINERS.txt UPGRADE.txt drupal-README.fedora sites/all/README.txt
+%doc CHANGELOG.txt INSTALL* LICENSE* MAINTAINERS.txt UPGRADE.txt drupal-README.fedora sites/all/README.txt drupal-files-migrator.sh
 %{drupaldir}
 %config(noreplace) %{drupaldir}/.htaccess
 %exclude %{drupaldir}/CHANGELOG.txt
@@ -70,8 +84,15 @@
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/drupal.conf
 %attr(755,root,apache) %{_sysconfdir}/cron.hourly/drupal
 %dir %attr(775,root,apache) %{_localstatedir}/lib/drupal/
+%dir %attr(775,root,apache) %{_localstatedir}/lib/drupal/files/
+%dir %attr(775,root,apache) %{_localstatedir}/lib/drupal/files/default/
 
 %changelog
+* Fri Jan 02 2009 Jon Ciesla <limb at jcomserv.net> - 6.8-1
+- Upgrade to 6.8.
+- Move files directories from sites to /var/lib/drupal/files/N for selinux reasons, 472642.
+- Included script to move files outside of default, use at your own risk, patches welcome.
+
 * Thu Dec 11 2008 Jon Ciesla <limb at jcomserv.net> - 6.7-1
 - Upgrade to 6.7, SA-2008-073.
 



From ausil at fedoraproject.org  Fri Jan  2 21:07:44 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Fri,  2 Jan 2009 21:07:44 +0000 (UTC)
Subject: rpms/lpsolve/devel lpsolve.spec,1.4,1.5
Message-ID: <20090102210744.6FEC670130@cvs1.fedora.phx.redhat.com>

Author: ausil

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

Modified Files:
	lpsolve.spec 
Log Message:
use -fPIC on sparc and s390 arches



Index: lpsolve.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lpsolve/devel/lpsolve.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- lpsolve.spec	4 Aug 2008 11:19:47 -0000	1.4
+++ lpsolve.spec	2 Jan 2009 21:07:14 -0000	1.5
@@ -1,7 +1,7 @@
 Name:      lpsolve
 Summary:   A Mixed Integer Linear Programming (MILP) solver
 Version:   5.5.0.13
-Release:   1%{?dist}
+Release:   2%{?dist}
 Source:    http://downloads.sourceforge.net/lpsolve/lp_solve_%{version}_source.tar.gz
 Group:     System Environment/Libraries
 URL:       http://sourceforge.net/projects/lpsolve
@@ -25,6 +25,11 @@
 %prep
 %setup -q -n lp_solve_5.5
 %patch0 -p1 -b .cflags.patch
+#sparc and s390 need -fPIC  lets sed it                                              
+%ifarch sparcv9 sparc64 s390 s390x                                                   
+sed -i -e 's|-fpic|-fPIC|g' Makefile*                                                
+sed -i -e 's|-fpic|-fPIC|g' lpsolve55/ccc                                            
+%endif 
 
 %build
 cd lpsolve55
@@ -61,6 +66,9 @@
 %{_includedir}/lpsolve
 
 %changelog
+* Fri Jan 02 2009 Dennis Gilmore <dennis at ausil.us> - 5.5.0.13-2
+- use -fPIC on sparc and s390 arches
+
 * Mon Aug 04 2008 Caolan McNamara <caolanm at redhat.com> - 5.5.0.13-1
 - latest version
 



From thm at fedoraproject.org  Fri Jan  2 21:51:08 2009
From: thm at fedoraproject.org (Thomas Moschny)
Date: Fri,  2 Jan 2009 21:51:08 +0000 (UTC)
Subject: rpms/monotone/devel import.log,1.1,1.2 monotone.spec,1.40,1.41
Message-ID: <20090102215108.D5EEC70130@cvs1.fedora.phx.redhat.com>

Author: thm

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

Modified Files:
	import.log monotone.spec 
Log Message:
Pack Monotone.pm (in a subpackage). (#450267)


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/monotone/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	2 Jan 2009 17:10:50 -0000	1.1
+++ import.log	2 Jan 2009 21:50:38 -0000	1.2
@@ -1 +1,2 @@
 monotone-0_42-1_fc10:HEAD:monotone-0.42-1.fc10.src.rpm:1230916116
+monotone-0_42-2_fc10:HEAD:monotone-0.42-2.fc10.src.rpm:1230932958


Index: monotone.spec
===================================================================
RCS file: /cvs/pkgs/rpms/monotone/devel/monotone.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- monotone.spec	2 Jan 2009 17:10:51 -0000	1.40
+++ monotone.spec	2 Jan 2009 21:50:38 -0000	1.41
@@ -1,6 +1,6 @@
 Name: monotone
 Version: 0.42
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 Summary: A free, distributed version control system
 Group: Development/Tools
@@ -59,6 +59,15 @@
 %description server
 This package provides an easy-to-use standalone server setup for monotone.
 
+%package -n perl-Monotone
+Summary: Perl Module for monotone
+Requires: monotone = %{version}-%{release}
+Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+Group: Development/Tools
+
+%description -n perl-Monotone
+This is a simple Perl module to start a monotone automate sub-process
+and then pass commands to it.
 
 %prep
 %setup -q
@@ -112,6 +121,9 @@
 
 cp %{SOURCE3} .
 
+%{__install} -D -m 0644 -p contrib/Monotone.pm \
+             %{buildroot}%{perl_vendorlib}/Monotone.pm
+
 %clean
 rm -f README.monotone-server
 rm -rf %{buildroot}
@@ -139,13 +151,17 @@
 %{_datadir}/emacs/site-lisp/monotone*.el*
 %{_sysconfdir}/bash_completion.d
 
+%files -n perl-Monotone
+%defattr(-,root,root,-)
+%{perl_vendorlib}/Monotone.pm
+
 %files 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
-%config %{_sysconfdir}/sysconfig/monotone
+%config(noreplace) %{_sysconfdir}/sysconfig/monotone
 %dir %attr(0755,root,monotone) %{_sysconfdir}/monotone
 %dir %attr(0750,root,monotone) %{_sysconfdir}/monotone/private-keys
 %attr(0640,root,monotone) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) %{_sysconfdir}/monotone/monotonerc
@@ -181,6 +197,9 @@
 
 
 %changelog
+* Fri Jan  2 2009 Thomas Moschny <thomas.moschny at gmx.de> - 0.42-2
+- Pack Monotone.pm (in a subpackage). (#450267)
+
 * Fri Jan  2 2009 Thomas Moschny <thomas.moschny at gmx.de> - 0.42-1
 - Updated for 0.42 release.
 



From jakub at fedoraproject.org  Fri Jan  2 22:18:17 2009
From: jakub at fedoraproject.org (Jakub Jelinek)
Date: Fri,  2 Jan 2009 22:18:17 +0000 (UTC)
Subject: rpms/glibc/devel .cvsignore, 1.258, 1.259 glibc-fedora.patch, 1.288,
	1.289 glibc.spec, 1.373, 1.374 import.log, 1.2, 1.3 sources,
	1.283, 1.284
Message-ID: <20090102221817.5CD4A70130@cvs1.fedora.phx.redhat.com>

Author: jakub

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

Modified Files:
	.cvsignore glibc-fedora.patch glibc.spec import.log sources 
Log Message:
2.9.90-1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/glibc/devel/.cvsignore,v
retrieving revision 1.258
retrieving revision 1.259
diff -u -r1.258 -r1.259
--- .cvsignore	13 Nov 2008 22:46:06 -0000	1.258
+++ .cvsignore	2 Jan 2009 22:17:46 -0000	1.259
@@ -1,2 +1,2 @@
-glibc-20081113T2206.tar.bz2
-glibc-fedora-20081113T2206.tar.bz2
+glibc-20090102T2110.tar.bz2
+glibc-fedora-20090102T2110.tar.bz2

glibc-fedora.patch:

Index: glibc-fedora.patch
===================================================================
RCS file: /cvs/pkgs/rpms/glibc/devel/glibc-fedora.patch,v
retrieving revision 1.288
retrieving revision 1.289
diff -u -r1.288 -r1.289
--- glibc-fedora.patch	13 Nov 2008 22:46:06 -0000	1.288
+++ glibc-fedora.patch	2 Jan 2009 22:17:46 -0000	1.289
@@ -1,6 +1,6 @@
---- glibc-20081113T2206/ChangeLog	13 Nov 2008 21:41:41 -0000	1.11390
-+++ glibc-20081113T2206-fedora/ChangeLog	13 Nov 2008 22:19:31 -0000	1.8782.2.315
-@@ -5881,6 +5881,13 @@
+--- glibc-20090102T2110/ChangeLog	2 Jan 2009 19:28:55 -0000	1.11430
++++ glibc-20090102T2110-fedora/ChangeLog	2 Jan 2009 21:13:52 -0000	1.8782.2.316
+@@ -6135,6 +6135,13 @@
  	* include/sys/cdefs.h: Redefine __nonnull so that test for
  	incorrect parameters in the libc code itself are not omitted.
  
@@ -14,7 +14,7 @@
  2007-05-09  Jakub Jelinek  <jakub at redhat.com>
  
  	* sysdeps/ia64/fpu/fraiseexcpt.c (feraiseexcept): Don't raise overflow
-@@ -6176,6 +6183,10 @@
+@@ -6430,6 +6437,10 @@
  	[BZ #4368]
  	* stdlib/stdlib.h: Remove obsolete part of comment for realpath.
  
@@ -25,7 +25,7 @@
  2007-04-16  Ulrich Drepper  <drepper at redhat.com>
  
  	[BZ #4364]
-@@ -7433,6 +7444,15 @@
+@@ -7687,6 +7698,15 @@
  	separators also if no non-zero digits found.
  	* stdlib/Makefile (tests): Add tst-strtod3.
  
@@ -41,8 +41,8 @@
  2006-12-09  Ulrich Drepper  <drepper at redhat.com>
  
  	[BZ #3632]
---- glibc-20081113T2206/ChangeLog.15	16 Feb 2005 07:34:17 -0000	1.1
-+++ glibc-20081113T2206-fedora/ChangeLog.15	19 Dec 2006 19:05:40 -0000	1.1.6.3
+--- glibc-20090102T2110/ChangeLog.15	16 Feb 2005 07:34:17 -0000	1.1
++++ glibc-20090102T2110-fedora/ChangeLog.15	19 Dec 2006 19:05:40 -0000	1.1.6.3
 @@ -477,6 +477,14 @@
  
  2004-11-26  Jakub Jelinek  <jakub at redhat.com>
@@ -108,8 +108,8 @@
  2004-08-30  Roland McGrath  <roland at frob.com>
  
  	* scripts/extract-abilist.awk: If `lastversion' variable defined, omit
---- glibc-20081113T2206/ChangeLog.16	4 May 2006 16:05:24 -0000	1.1
-+++ glibc-20081113T2206-fedora/ChangeLog.16	5 May 2006 06:11:52 -0000	1.1.2.1
+--- glibc-20090102T2110/ChangeLog.16	4 May 2006 16:05:24 -0000	1.1
++++ glibc-20090102T2110-fedora/ChangeLog.16	5 May 2006 06:11:52 -0000	1.1.2.1
 @@ -171,6 +171,11 @@
  	[BZ #2611]
  	* stdio-common/renameat.c (renameat): Fix typo.
@@ -281,8 +281,8 @@
  2005-02-10  Roland McGrath  <roland at redhat.com>
  
  	[BZ #157]
---- glibc-20081113T2206/csu/Makefile	1 Mar 2006 10:35:47 -0000	1.79
-+++ glibc-20081113T2206-fedora/csu/Makefile	30 Nov 2006 17:07:37 -0000	1.74.2.6
+--- glibc-20090102T2110/csu/Makefile	1 Mar 2006 10:35:47 -0000	1.79
++++ glibc-20090102T2110-fedora/csu/Makefile	30 Nov 2006 17:07:37 -0000	1.74.2.6
 @@ -93,7 +93,8 @@ omit-deps += $(crtstuff)
  $(crtstuff:%=$(objpfx)%.o): %.o: %.S $(objpfx)defs.h
  	$(compile.S) -g0 $(ASFLAGS-.os) -o $@
@@ -293,8 +293,8 @@
  
  vpath initfini.c $(sysdirs)
  
---- glibc-20081113T2206/csu/elf-init.c	5 Nov 2005 17:41:38 -0000	1.8
-+++ glibc-20081113T2206-fedora/csu/elf-init.c	15 Nov 2005 09:54:10 -0000	1.3.2.6
+--- glibc-20090102T2110/csu/elf-init.c	5 Nov 2005 17:41:38 -0000	1.8
++++ glibc-20090102T2110-fedora/csu/elf-init.c	15 Nov 2005 09:54:10 -0000	1.3.2.6
 @@ -49,6 +49,23 @@ extern void (*__init_array_end []) (int,
  extern void (*__fini_array_start []) (void) attribute_hidden;
  extern void (*__fini_array_end []) (void) attribute_hidden;
@@ -319,8 +319,8 @@
  
  /* These function symbols are provided for the .init/.fini section entry
     points automagically by the linker.  */
---- glibc-20081113T2206/debug/tst-chk1.c	5 Mar 2008 06:51:37 -0000	1.19
-+++ glibc-20081113T2206-fedora/debug/tst-chk1.c	5 Mar 2008 09:37:40 -0000	1.1.2.19
+--- glibc-20090102T2110/debug/tst-chk1.c	5 Mar 2008 06:51:37 -0000	1.19
++++ glibc-20090102T2110-fedora/debug/tst-chk1.c	5 Mar 2008 09:37:40 -0000	1.1.2.19
 @@ -17,6 +17,9 @@
     Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
     02111-1307 USA.  */
@@ -349,8 +349,8 @@
  #  define O 0
  # else
  #  define O 1
---- glibc-20081113T2206/elf/ldconfig.c	19 Mar 2008 06:43:31 -0000	1.63
-+++ glibc-20081113T2206-fedora/elf/ldconfig.c	26 Mar 2008 11:22:14 -0000	1.47.2.18
+--- glibc-20090102T2110/elf/ldconfig.c	2 Jan 2009 08:46:29 -0000	1.64
++++ glibc-20090102T2110-fedora/elf/ldconfig.c	2 Jan 2009 21:13:54 -0000	1.47.2.19
 @@ -1000,17 +1000,19 @@ search_dirs (void)
  
  
@@ -432,8 +432,8 @@
      }
  
    if (! opt_ignore_aux_cache)
---- glibc-20081113T2206/elf/tst-stackguard1.c	26 Jun 2005 18:08:36 -0000	1.1
-+++ glibc-20081113T2206-fedora/elf/tst-stackguard1.c	8 Aug 2005 21:24:27 -0000	1.1.2.3
+--- glibc-20090102T2110/elf/tst-stackguard1.c	26 Jun 2005 18:08:36 -0000	1.1
++++ glibc-20090102T2110-fedora/elf/tst-stackguard1.c	8 Aug 2005 21:24:27 -0000	1.1.2.3
 @@ -160,17 +160,21 @@ do_test (void)
       the 16 runs, something is very wrong.  */
    int ndifferences = 0;
@@ -458,8 +458,8 @@
      {
        puts ("stack guard canaries are not randomized enough");
        puts ("nor equal to the default canary value");
---- glibc-20081113T2206/include/features.h	13 Nov 2008 21:41:25 -0000	1.51
-+++ glibc-20081113T2206-fedora/include/features.h	13 Nov 2008 22:19:33 -0000	1.35.2.21
+--- glibc-20090102T2110/include/features.h	13 Nov 2008 21:41:25 -0000	1.51
++++ glibc-20090102T2110-fedora/include/features.h	13 Nov 2008 22:19:33 -0000	1.35.2.21
 @@ -282,8 +282,13 @@
  #endif
  
@@ -476,16 +476,16 @@
  #  define __USE_FORTIFY_LEVEL 2
  # else
  #  define __USE_FORTIFY_LEVEL 1
---- glibc-20081113T2206/include/bits/stdlib-ldbl.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20081113T2206-fedora/include/bits/stdlib-ldbl.h	1 Feb 2006 09:30:43 -0000	1.1.2.1
+--- glibc-20090102T2110/include/bits/stdlib-ldbl.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20090102T2110-fedora/include/bits/stdlib-ldbl.h	1 Feb 2006 09:30:43 -0000	1.1.2.1
 @@ -0,0 +1 @@
 +#include <stdlib/bits/stdlib-ldbl.h>
---- glibc-20081113T2206/include/bits/wchar-ldbl.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20081113T2206-fedora/include/bits/wchar-ldbl.h	1 Feb 2006 09:30:43 -0000	1.1.2.1
+--- glibc-20090102T2110/include/bits/wchar-ldbl.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20090102T2110-fedora/include/bits/wchar-ldbl.h	1 Feb 2006 09:30:43 -0000	1.1.2.1
 @@ -0,0 +1 @@
 +#include <wcsmbs/bits/wchar-ldbl.h>
---- glibc-20081113T2206/intl/locale.alias	28 Oct 2007 01:39:54 -0000	1.24
-+++ glibc-20081113T2206-fedora/intl/locale.alias	12 Dec 2007 18:13:23 -0000	1.23.2.2
+--- glibc-20090102T2110/intl/locale.alias	28 Oct 2007 01:39:54 -0000	1.24
++++ glibc-20090102T2110-fedora/intl/locale.alias	12 Dec 2007 18:13:23 -0000	1.23.2.2
 @@ -57,8 +57,6 @@ korean		ko_KR.eucKR
  korean.euc 	ko_KR.eucKR
  ko_KR		ko_KR.eucKR
@@ -495,8 +495,8 @@
  norwegian       nb_NO.ISO-8859-1
  nynorsk		nn_NO.ISO-8859-1
  polish          pl_PL.ISO-8859-2
---- glibc-20081113T2206/libio/stdio.h	24 May 2008 18:14:36 -0000	1.93
-+++ glibc-20081113T2206-fedora/libio/stdio.h	24 May 2008 22:22:18 -0000	1.78.2.14
+--- glibc-20090102T2110/libio/stdio.h	24 May 2008 18:14:36 -0000	1.93
++++ glibc-20090102T2110-fedora/libio/stdio.h	24 May 2008 22:22:18 -0000	1.78.2.14
 @@ -145,10 +145,12 @@ typedef _G_fpos64_t fpos64_t;
  extern struct _IO_FILE *stdin;		/* Standard input stream.  */
  extern struct _IO_FILE *stdout;		/* Standard output stream.  */
@@ -510,8 +510,8 @@
  
  __BEGIN_NAMESPACE_STD
  /* Remove file FILENAME.  */
---- glibc-20081113T2206/locale/iso-4217.def	17 Feb 2007 07:46:20 -0000	1.20
-+++ glibc-20081113T2206-fedora/locale/iso-4217.def	21 Feb 2007 11:15:50 -0000	1.15.2.5
+--- glibc-20090102T2110/locale/iso-4217.def	17 Feb 2007 07:46:20 -0000	1.20
++++ glibc-20090102T2110-fedora/locale/iso-4217.def	21 Feb 2007 11:15:50 -0000	1.15.2.5
 @@ -8,6 +8,7 @@
   *
   * !!! The list has to be sorted !!!
@@ -603,8 +603,8 @@
  DEFINE_INT_CURR("PYG")		/* Paraguay Guarani  */
  DEFINE_INT_CURR("QAR")		/* Qatar Rial  */
  DEFINE_INT_CURR("ROL")		/* Romanian Leu  */
---- glibc-20081113T2206/locale/programs/locarchive.c	16 Jul 2007 00:54:59 -0000	1.25
-+++ glibc-20081113T2206-fedora/locale/programs/locarchive.c	31 Jul 2007 17:45:53 -0000	1.21.2.4
+--- glibc-20090102T2110/locale/programs/locarchive.c	16 Jul 2007 00:54:59 -0000	1.25
++++ glibc-20090102T2110-fedora/locale/programs/locarchive.c	31 Jul 2007 17:45:53 -0000	1.21.2.4
 @@ -222,9 +222,9 @@ oldlocrecentcmp (const void *a, const vo
  /* forward decls for below */
  static uint32_t add_locale (struct locarhandle *ah, const char *name,
@@ -636,8 +636,8 @@
  add_alias (struct locarhandle *ah, const char *alias, bool replace,
  	   const char *oldname, uint32_t *locrec_offset_p)
  {
---- glibc-20081113T2206/localedata/Makefile	31 Oct 2008 15:12:03 -0000	1.109
-+++ glibc-20081113T2206-fedora/localedata/Makefile	31 Oct 2008 21:33:57 -0000	1.101.2.9
+--- glibc-20090102T2110/localedata/Makefile	31 Oct 2008 15:12:03 -0000	1.109
++++ glibc-20090102T2110-fedora/localedata/Makefile	31 Oct 2008 21:33:57 -0000	1.101.2.9
 @@ -225,6 +225,7 @@ $(INSTALL-SUPPORTED-LOCALES): install-lo
  	echo -n '...'; \
  	input=`echo $$locale | sed 's/\([^.]*\)[^@]*\(.*\)/\1\2/'`; \
@@ -646,8 +646,8 @@
  		     -i locales/$$input -c -f charmaps/$$charset \
  		     $(addprefix --prefix=,$(install_root)) $$locale; \
  	echo ' done'; \
---- glibc-20081113T2206/localedata/SUPPORTED	16 Sep 2008 21:24:57 -0000	1.114
-+++ glibc-20081113T2206-fedora/localedata/SUPPORTED	20 Oct 2008 07:21:53 -0000	1.71.2.22
+--- glibc-20090102T2110/localedata/SUPPORTED	6 Dec 2008 03:02:45 -0000	1.115
++++ glibc-20090102T2110-fedora/localedata/SUPPORTED	2 Jan 2009 21:13:56 -0000	1.71.2.23
 @@ -84,6 +84,7 @@ cy_GB.UTF-8/UTF-8 \
  cy_GB/ISO-8859-14 \
  da_DK.UTF-8/UTF-8 \
@@ -672,7 +672,7 @@
  en_ZA.UTF-8/UTF-8 \
  en_ZA/ISO-8859-1 \
  en_ZW.UTF-8/UTF-8 \
-@@ -300,6 +303,8 @@ nl_NL/ISO-8859-1 \
+@@ -301,6 +304,8 @@ nl_NL/ISO-8859-1 \
  nl_NL at euro/ISO-8859-15 \
  nn_NO.UTF-8/UTF-8 \
  nn_NO/ISO-8859-1 \
@@ -681,7 +681,7 @@
  nr_ZA/UTF-8 \
  nso_ZA/UTF-8 \
  oc_FR.UTF-8/UTF-8 \
-@@ -358,6 +363,7 @@ sv_FI/ISO-8859-1 \
+@@ -359,6 +364,7 @@ sv_FI/ISO-8859-1 \
  sv_FI at euro/ISO-8859-15 \
  sv_SE.UTF-8/UTF-8 \
  sv_SE/ISO-8859-1 \
@@ -689,8 +689,8 @@
  ta_IN/UTF-8 \
  te_IN/UTF-8 \
  tg_TJ.UTF-8/UTF-8 \
---- glibc-20081113T2206/localedata/locales/cy_GB	28 Sep 2004 04:37:33 -0000	1.4
-+++ glibc-20081113T2206-fedora/localedata/locales/cy_GB	29 Sep 2004 08:48:23 -0000	1.3.2.2
+--- glibc-20090102T2110/localedata/locales/cy_GB	28 Sep 2004 04:37:33 -0000	1.4
++++ glibc-20090102T2110-fedora/localedata/locales/cy_GB	29 Sep 2004 08:48:23 -0000	1.3.2.2
 @@ -248,8 +248,11 @@ mon         "<U0049><U006F><U006E><U0061
  d_t_fmt     "<U0044><U0079><U0064><U0064><U0020><U0025><U0041><U0020><U0025><U0064><U0020><U006d><U0069><U0073><U0020><U0025><U0042><U0020><U0025><U0059><U0020><U0025><U0054><U0020><U0025><U005A>"
  d_fmt       "<U0025><U0064><U002E><U0025><U006D><U002E><U0025><U0079>"
@@ -705,8 +705,8 @@
  END LC_TIME
  
  LC_MESSAGES
---- glibc-20081113T2206/localedata/locales/en_GB	31 Oct 2008 19:00:57 -0000	1.18
-+++ glibc-20081113T2206-fedora/localedata/locales/en_GB	31 Oct 2008 21:33:57 -0000	1.10.2.7
+--- glibc-20090102T2110/localedata/locales/en_GB	31 Oct 2008 19:00:57 -0000	1.18
++++ glibc-20090102T2110-fedora/localedata/locales/en_GB	31 Oct 2008 21:33:57 -0000	1.10.2.7
 @@ -116,8 +116,8 @@ mon         "<U004A><U0061><U006E><U0075
  d_t_fmt     "<U0025><U0061><U0020><U0025><U0064><U0020><U0025><U0062><U0020><U0025><U0059><U0020><U0025><U0054><U0020><U0025><U005A>"
  d_fmt       "<U0025><U0064><U002F><U0025><U006D><U002F><U0025><U0079>"
@@ -718,8 +718,8 @@
  date_fmt	"<U0025><U0061><U0020><U0025><U0062><U0020><U0025><U0065>/
  <U0020><U0025><U0048><U003A><U0025><U004D><U003A><U0025><U0053><U0020>/
  <U0025><U005A><U0020><U0025><U0059>"
---- glibc-20081113T2206/localedata/locales/no_NO 1 Jan 1970 00:00:00 -0000
-+++ glibc-20081113T2206-fedora/localedata/locales/no_NO	22 Sep 2004 21:21:01 -0000	1.11.2.1
+--- glibc-20090102T2110/localedata/locales/no_NO 1 Jan 1970 00:00:00 -0000
++++ glibc-20090102T2110-fedora/localedata/locales/no_NO	22 Sep 2004 21:21:01 -0000	1.11.2.1
 @@ -0,0 +1,69 @@
 +escape_char	/
 +comment_char    %
@@ -790,8 +790,8 @@
 +LC_ADDRESS
 +copy "nb_NO"
 +END LC_ADDRESS
---- glibc-20081113T2206/localedata/locales/zh_TW	31 Oct 2004 23:42:28 -0000	1.7
-+++ glibc-20081113T2206-fedora/localedata/locales/zh_TW	2 Nov 2004 12:25:57 -0000	1.5.2.2
+--- glibc-20090102T2110/localedata/locales/zh_TW	31 Oct 2004 23:42:28 -0000	1.7
++++ glibc-20090102T2110-fedora/localedata/locales/zh_TW	2 Nov 2004 12:25:57 -0000	1.5.2.2
 @@ -1,7 +1,7 @@
  comment_char %
  escape_char /
@@ -819,8 +819,8 @@
  revision   "0.2"
  date       "2000-08-02"
  %
---- glibc-20081113T2206/malloc/mcheck.c	19 May 2007 04:27:20 -0000	1.20
-+++ glibc-20081113T2206-fedora/malloc/mcheck.c	21 May 2007 20:01:08 -0000	1.18.2.2
+--- glibc-20090102T2110/malloc/mcheck.c	19 May 2007 04:27:20 -0000	1.20
++++ glibc-20090102T2110-fedora/malloc/mcheck.c	21 May 2007 20:01:08 -0000	1.18.2.2
 @@ -24,9 +24,25 @@
  # include <mcheck.h>
  # include <stdint.h>
@@ -896,8 +896,8 @@
  
        old_free_hook = __free_hook;
        __free_hook = freehook;
---- glibc-20081113T2206/manual/libc.texinfo	31 Jan 2008 01:43:04 -0000	1.98
-+++ glibc-20081113T2206-fedora/manual/libc.texinfo	31 Jan 2008 08:43:19 -0000	1.94.2.4
+--- glibc-20090102T2110/manual/libc.texinfo	31 Jan 2008 01:43:04 -0000	1.98
++++ glibc-20090102T2110-fedora/manual/libc.texinfo	31 Jan 2008 08:43:19 -0000	1.94.2.4
 @@ -5,7 +5,7 @@
  @c setchapternewpage odd
  
@@ -907,8 +907,8 @@
  @direntry
  * Libc: (libc).                 C library.
  @end direntry
---- glibc-20081113T2206/misc/sys/cdefs.h	3 Oct 2007 18:27:02 -0000	1.73
-+++ glibc-20081113T2206-fedora/misc/sys/cdefs.h	3 Oct 2007 19:32:28 -0000	1.58.2.10
+--- glibc-20090102T2110/misc/sys/cdefs.h	3 Oct 2007 18:27:02 -0000	1.73
++++ glibc-20090102T2110-fedora/misc/sys/cdefs.h	3 Oct 2007 19:32:28 -0000	1.58.2.10
 @@ -132,7 +132,10 @@
  #define __bos(ptr) __builtin_object_size (ptr, __USE_FORTIFY_LEVEL > 1)
  #define __bos0(ptr) __builtin_object_size (ptr, 0)
@@ -952,17 +952,17 @@
  # define __va_arg_pack() __builtin_va_arg_pack ()
  # define __va_arg_pack_len() __builtin_va_arg_pack_len ()
  #endif
---- glibc-20081113T2206/nis/nss	28 Apr 2006 21:02:23 -0000	1.3
-+++ glibc-20081113T2206-fedora/nis/nss	1 May 2006 08:02:53 -0000	1.2.2.2
+--- glibc-20090102T2110/nis/nss	28 Apr 2006 21:02:23 -0000	1.3
++++ glibc-20090102T2110-fedora/nis/nss	1 May 2006 08:02:53 -0000	1.2.2.2
 @@ -25,4 +25,4 @@
  #  memory with every getXXent() call.  Otherwise each getXXent() call
  #  might result into a network communication with the server to get
  #  the next entry.
 -#SETENT_BATCH_READ=TRUE
 +SETENT_BATCH_READ=TRUE
---- glibc-20081113T2206/nptl/ChangeLog	12 Nov 2008 13:39:22 -0000	1.1082
-+++ glibc-20081113T2206-fedora/nptl/ChangeLog	12 Nov 2008 20:29:34 -0000	1.706.2.164
-@@ -3291,6 +3291,15 @@
+--- glibc-20090102T2110/nptl/ChangeLog	29 Dec 2008 19:34:02 -0000	1.1091
++++ glibc-20090102T2110-fedora/nptl/ChangeLog	2 Jan 2009 21:13:57 -0000	1.706.2.165
+@@ -3341,6 +3341,15 @@
  	Use __sigfillset.  Document that sigfillset does the right thing wrt
  	to SIGSETXID.
  
@@ -978,7 +978,7 @@
  2005-07-11  Jakub Jelinek  <jakub at redhat.com>
  
  	[BZ #1102]
-@@ -4027,6 +4036,11 @@
+@@ -4077,6 +4086,11 @@
  	Move definition inside libpthread, libc, librt check.  Provide
  	definition for rtld.
  
@@ -990,7 +990,7 @@
  2004-09-02  Ulrich Drepper  <drepper at redhat.com>
  
  	* sysdeps/alpha/jmpbuf-unwind.h: Define __libc_unwind_longjmp.
-@@ -6101,6 +6115,11 @@
+@@ -6151,6 +6165,11 @@
  
  	* Makefile [$(build-shared) = yes] (tests): Depend on $(test-modules).
  
@@ -1002,8 +1002,8 @@
  2003-07-25  Jakub Jelinek  <jakub at redhat.com>
  
  	* tst-cancel17.c (do_test): Check if aio_cancel failed.
---- glibc-20081113T2206/nptl/Makefile	12 Nov 2008 13:38:23 -0000	1.195
-+++ glibc-20081113T2206-fedora/nptl/Makefile	12 Nov 2008 20:29:34 -0000	1.157.2.37
+--- glibc-20090102T2110/nptl/Makefile	12 Nov 2008 13:38:23 -0000	1.195
++++ glibc-20090102T2110-fedora/nptl/Makefile	12 Nov 2008 20:29:34 -0000	1.157.2.37
 @@ -339,7 +339,8 @@ endif
  extra-objs += $(crti-objs) $(crtn-objs)
  omit-deps += crti crtn
@@ -1036,8 +1036,8 @@
  else
  $(addprefix $(objpfx),$(tests) $(test-srcs)): $(objpfx)libpthread.a
  endif
---- glibc-20081113T2206/nptl/tst-stackguard1.c	26 Jun 2005 17:44:14 -0000	1.1
-+++ glibc-20081113T2206-fedora/nptl/tst-stackguard1.c	8 Aug 2005 21:24:28 -0000	1.1.2.3
+--- glibc-20090102T2110/nptl/tst-stackguard1.c	26 Jun 2005 17:44:14 -0000	1.1
++++ glibc-20090102T2110-fedora/nptl/tst-stackguard1.c	8 Aug 2005 21:24:28 -0000	1.1.2.3
 @@ -190,17 +190,21 @@ do_test (void)
       the 16 runs, something is very wrong.  */
    int ndifferences = 0;
@@ -1062,8 +1062,8 @@
      {
        puts ("stack guard canaries are not randomized enough");
        puts ("nor equal to the default canary value");
---- glibc-20081113T2206/nptl/sysdeps/unix/sysv/linux/kernel-features.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20081113T2206-fedora/nptl/sysdeps/unix/sysv/linux/kernel-features.h	22 Sep 2004 21:21:02 -0000	1.1.2.1
+--- glibc-20090102T2110/nptl/sysdeps/unix/sysv/linux/kernel-features.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20090102T2110-fedora/nptl/sysdeps/unix/sysv/linux/kernel-features.h	22 Sep 2004 21:21:02 -0000	1.1.2.1
 @@ -0,0 +1,6 @@
 +#include_next <kernel-features.h>
 +
@@ -1071,8 +1071,8 @@
 +#ifndef __ASSUME_CLONE_THREAD_FLAGS
 +# define __ASSUME_CLONE_THREAD_FLAGS	1
 +#endif
---- glibc-20081113T2206/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h	8 Mar 2008 01:57:04 -0000	1.16
-+++ glibc-20081113T2206-fedora/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h	14 Mar 2008 22:36:45 -0000	1.8.2.9
+--- glibc-20090102T2110/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h	8 Mar 2008 01:57:04 -0000	1.16
++++ glibc-20090102T2110-fedora/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h	14 Mar 2008 22:36:45 -0000	1.8.2.9
 @@ -181,4 +181,7 @@
  /* Typed memory objects are not available.  */
  #define _POSIX_TYPED_MEMORY_OBJECTS	-1
@@ -1081,8 +1081,8 @@
 +#define _XOPEN_STREAMS	-1
 +
  #endif /* posix_opt.h */
---- glibc-20081113T2206/nscd/nscd.conf	6 Nov 2007 00:50:48 -0000	1.16
-+++ glibc-20081113T2206-fedora/nscd/nscd.conf	12 Dec 2007 18:13:28 -0000	1.8.2.7
+--- glibc-20090102T2110/nscd/nscd.conf	6 Nov 2007 00:50:48 -0000	1.16
++++ glibc-20090102T2110-fedora/nscd/nscd.conf	12 Dec 2007 18:13:28 -0000	1.8.2.7
 @@ -33,7 +33,7 @@
  #	logfile			/var/log/nscd.log
  #	threads			4
@@ -1092,8 +1092,8 @@
  #	stat-user		somebody
  	debug-level		0
  #	reload-count		5
---- glibc-20081113T2206/nscd/nscd.init	1 Dec 2006 20:12:45 -0000	1.10
-+++ glibc-20081113T2206-fedora/nscd/nscd.init	12 Dec 2007 18:13:28 -0000	1.6.2.6
+--- glibc-20090102T2110/nscd/nscd.init	1 Dec 2006 20:12:45 -0000	1.10
++++ glibc-20090102T2110-fedora/nscd/nscd.init	12 Dec 2007 18:13:28 -0000	1.6.2.6
 @@ -9,6 +9,7 @@
  #		slow naming services like NIS, NIS+, LDAP, or hesiod.
  # processname: /usr/sbin/nscd
@@ -1150,8 +1150,8 @@
  	;;
      *)
  	echo $"Usage: $0 {start|stop|status|restart|reload|condrestart}"
---- glibc-20081113T2206/posix/Makefile	20 Nov 2007 00:41:16 -0000	1.203
-+++ glibc-20081113T2206-fedora/posix/Makefile	12 Dec 2007 18:13:30 -0000	1.171.2.27
+--- glibc-20090102T2110/posix/Makefile	20 Nov 2007 00:41:16 -0000	1.203
++++ glibc-20090102T2110-fedora/posix/Makefile	12 Dec 2007 18:13:30 -0000	1.171.2.27
 @@ -301,11 +301,8 @@ $(inst_libexecdir)/getconf: $(inst_bindi
  	  mv -f $@/$$spec.new $@/$$spec; \
  	done < $(objpfx)getconf.speclist
@@ -1168,8 +1168,8 @@
 +	  | sed -n -e '/START_OF_STRINGS/,$${/POSIX_V6_/{s/^[^"]*"//;s/".*$$//;p}}' \
 +	  > $@.new
  	mv -f $@.new $@
---- glibc-20081113T2206/posix/getconf.speclist.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20081113T2206-fedora/posix/getconf.speclist.h	13 Dec 2004 23:32:37 -0000	1.1.2.2
+--- glibc-20090102T2110/posix/getconf.speclist.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20090102T2110-fedora/posix/getconf.speclist.h	13 Dec 2004 23:32:37 -0000	1.1.2.2
 @@ -0,0 +1,15 @@
 +#include <unistd.h>
 +const char *START_OF_STRINGS =
@@ -1186,8 +1186,19 @@
 +"POSIX_V6_LPBIG_OFFBIG"
 +#endif
 +"";
---- glibc-20081113T2206/streams/Makefile	23 Oct 2002 23:48:41 -0000	1.4
-+++ glibc-20081113T2206-fedora/streams/Makefile	14 Mar 2008 22:36:46 -0000	1.4.2.1
+--- glibc-20090102T2110/resolv/Versions	1 Aug 2008 17:15:34 -0000	1.25
++++ glibc-20090102T2110-fedora/resolv/Versions	2 Jan 2009 21:14:01 -0000	1.20.2.6
+@@ -102,7 +102,7 @@ libnss_dns {
+     _nss_dns_gethostbyname_r; _nss_dns_getnetbyaddr_r;
+     _nss_dns_getnetbyname_r; _nss_dns_getcanonname_r;
+     _nss_dns_gethostbyaddr2_r;
+-    _nss_dns_gethostbyname4_r;
++    # _nss_dns_gethostbyname4_r;
+   }
+ }
+ 
+--- glibc-20090102T2110/streams/Makefile	23 Oct 2002 23:48:41 -0000	1.4
++++ glibc-20090102T2110-fedora/streams/Makefile	14 Mar 2008 22:36:46 -0000	1.4.2.1
 @@ -21,7 +21,7 @@
  #
  subdir	:= streams
@@ -1197,8 +1208,8 @@
  routines	= isastream getmsg getpmsg putmsg putpmsg fattach fdetach
  
  include ../Rules
---- glibc-20081113T2206/sysdeps/generic/dl-cache.h	25 Jun 2003 08:01:22 -0000	1.13
-+++ glibc-20081113T2206-fedora/sysdeps/generic/dl-cache.h	22 Sep 2004 21:21:07 -0000	1.13.2.1
+--- glibc-20090102T2110/sysdeps/generic/dl-cache.h	25 Jun 2003 08:01:22 -0000	1.13
++++ glibc-20090102T2110-fedora/sysdeps/generic/dl-cache.h	22 Sep 2004 21:21:07 -0000	1.13.2.1
 @@ -36,6 +36,14 @@
  # define add_system_dir(dir) add_dir (dir)
  #endif
@@ -1214,8 +1225,8 @@
  #define CACHEMAGIC "ld.so-1.7.0"
  
  /* libc5 and glibc 2.0/2.1 use the same format.  For glibc 2.2 another
---- glibc-20081113T2206/sysdeps/i386/Makefile	13 May 2008 05:30:43 -0000	1.21
-+++ glibc-20081113T2206-fedora/sysdeps/i386/Makefile	15 May 2008 07:57:47 -0000	1.16.2.5
+--- glibc-20090102T2110/sysdeps/i386/Makefile	13 May 2008 05:30:43 -0000	1.21
++++ glibc-20090102T2110-fedora/sysdeps/i386/Makefile	15 May 2008 07:57:47 -0000	1.16.2.5
 @@ -64,6 +64,14 @@ endif
  
  ifneq (,$(filter -mno-tls-direct-seg-refs,$(CFLAGS)))
@@ -1231,8 +1242,8 @@
  endif
  
  ifeq ($(subdir),elf)
---- glibc-20081113T2206/sysdeps/ia64/Makefile	16 Aug 2004 06:46:14 -0000	1.10
-+++ glibc-20081113T2206-fedora/sysdeps/ia64/Makefile	22 Sep 2004 21:21:07 -0000	1.10.2.1
+--- glibc-20090102T2110/sysdeps/ia64/Makefile	16 Aug 2004 06:46:14 -0000	1.10
++++ glibc-20090102T2110-fedora/sysdeps/ia64/Makefile	22 Sep 2004 21:21:07 -0000	1.10.2.1
 @@ -12,8 +12,8 @@ elide-routines.os += hp-timing
  
  ifeq (yes,$(build-shared))
@@ -1244,8 +1255,8 @@
  endif
  endif
  
---- glibc-20081113T2206/sysdeps/ia64/ia64libgcc.S	11 May 2002 05:12:35 -0000	1.2
-+++ glibc-20081113T2206-fedora/sysdeps/ia64/ia64libgcc.S	22 Sep 2004 21:21:07 -0000	1.2.2.1
+--- glibc-20090102T2110/sysdeps/ia64/ia64libgcc.S	11 May 2002 05:12:35 -0000	1.2
++++ glibc-20090102T2110-fedora/sysdeps/ia64/ia64libgcc.S	22 Sep 2004 21:21:07 -0000	1.2.2.1
 @@ -1,350 +0,0 @@
 -/* From the Intel IA-64 Optimization Guide, choose the minimum latency
 -   alternative.  */
@@ -1597,8 +1608,8 @@
 -	.symver	___multi3, __multi3 at GLIBC_2.2
 -
 -#endif
---- glibc-20081113T2206/sysdeps/ia64/libgcc-compat.c 1 Jan 1970 00:00:00 -0000
-+++ glibc-20081113T2206-fedora/sysdeps/ia64/libgcc-compat.c	22 Sep 2004 21:21:08 -0000	1.1.2.1
+--- glibc-20090102T2110/sysdeps/ia64/libgcc-compat.c 1 Jan 1970 00:00:00 -0000
++++ glibc-20090102T2110-fedora/sysdeps/ia64/libgcc-compat.c	22 Sep 2004 21:21:08 -0000	1.1.2.1
 @@ -0,0 +1,84 @@
 +/* pre-.hidden libgcc compatibility
 +   Copyright (C) 2002 Free Software Foundation, Inc.
@@ -1684,8 +1695,8 @@
 +symbol_version (INTUSE (__multi3), __multi3, GLIBC_2.2);
 +
 +#endif
---- glibc-20081113T2206/sysdeps/powerpc/powerpc64/Makefile	2 Feb 2006 08:23:44 -0000	1.8
-+++ glibc-20081113T2206-fedora/sysdeps/powerpc/powerpc64/Makefile	30 Nov 2006 17:07:38 -0000	1.4.2.5
+--- glibc-20090102T2110/sysdeps/powerpc/powerpc64/Makefile	2 Feb 2006 08:23:44 -0000	1.8
++++ glibc-20090102T2110-fedora/sysdeps/powerpc/powerpc64/Makefile	30 Nov 2006 17:07:38 -0000	1.4.2.5
 @@ -30,6 +30,7 @@ ifneq ($(elf),no)
  # we use -fpic instead which is much better.
  CFLAGS-initfini.s += -fpic -O1
@@ -1694,8 +1705,8 @@
  endif
  
  ifeq ($(subdir),elf)
---- glibc-20081113T2206/sysdeps/unix/nice.c	15 Aug 2006 05:24:45 -0000	1.7
-+++ glibc-20081113T2206-fedora/sysdeps/unix/nice.c	15 Aug 2006 05:53:50 -0000	1.6.2.2
+--- glibc-20090102T2110/sysdeps/unix/nice.c	15 Aug 2006 05:24:45 -0000	1.7
++++ glibc-20090102T2110-fedora/sysdeps/unix/nice.c	15 Aug 2006 05:53:50 -0000	1.6.2.2
 @@ -42,7 +42,12 @@ nice (int incr)
  	__set_errno (save);
      }
@@ -1710,8 +1721,8 @@
    if (result == -1)
      {
        if (errno == EACCES)
---- glibc-20081113T2206/sysdeps/unix/sysv/linux/check_pf.c	3 Jan 2008 00:24:52 -0000	1.15
-+++ glibc-20081113T2206-fedora/sysdeps/unix/sysv/linux/check_pf.c	3 Jan 2008 20:20:42 -0000	1.3.2.11
+--- glibc-20090102T2110/sysdeps/unix/sysv/linux/check_pf.c	3 Jan 2008 00:24:52 -0000	1.15
++++ glibc-20090102T2110-fedora/sysdeps/unix/sysv/linux/check_pf.c	3 Jan 2008 20:20:42 -0000	1.3.2.11
 @@ -27,13 +27,10 @@
  #include <unistd.h>
  #include <sys/socket.h>
@@ -1727,8 +1738,8 @@
  
  #ifndef IFA_F_HOMEADDRESS
  # define IFA_F_HOMEADDRESS 0
---- glibc-20081113T2206/sysdeps/unix/sysv/linux/dl-osinfo.h	17 Apr 2008 08:32:24 -0000	1.28
-+++ glibc-20081113T2206-fedora/sysdeps/unix/sysv/linux/dl-osinfo.h	15 May 2008 07:57:48 -0000	1.14.2.14
+--- glibc-20090102T2110/sysdeps/unix/sysv/linux/dl-osinfo.h	17 Apr 2008 08:32:24 -0000	1.28
++++ glibc-20090102T2110-fedora/sysdeps/unix/sysv/linux/dl-osinfo.h	15 May 2008 07:57:48 -0000	1.14.2.14
 @@ -17,10 +17,13 @@
     Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
     02111-1307 USA.  */
@@ -1775,8 +1786,8 @@
 +  ret ^= stk;
    return ret;
  }
---- glibc-20081113T2206/sysdeps/unix/sysv/linux/futimesat.c	3 Feb 2006 05:26:34 -0000	1.6
-+++ glibc-20081113T2206-fedora/sysdeps/unix/sysv/linux/futimesat.c	3 Feb 2006 09:43:55 -0000	1.1.2.7
+--- glibc-20090102T2110/sysdeps/unix/sysv/linux/futimesat.c	3 Feb 2006 05:26:34 -0000	1.6
++++ glibc-20090102T2110-fedora/sysdeps/unix/sysv/linux/futimesat.c	3 Feb 2006 09:43:55 -0000	1.1.2.7
 @@ -37,14 +37,14 @@ futimesat (fd, file, tvp)
  {
    int result;
@@ -1819,8 +1830,8 @@
      {
        size_t filelen = strlen (file);
        static const char procfd[] = "/proc/self/fd/%d/%s";
---- glibc-20081113T2206/sysdeps/unix/sysv/linux/netlinkaccess.h	8 Jan 2006 08:21:15 -0000	1.3
-+++ glibc-20081113T2206-fedora/sysdeps/unix/sysv/linux/netlinkaccess.h	10 Dec 2006 10:51:12 -0000	1.1.2.3
+--- glibc-20090102T2110/sysdeps/unix/sysv/linux/netlinkaccess.h	8 Jan 2006 08:21:15 -0000	1.3
++++ glibc-20090102T2110-fedora/sysdeps/unix/sysv/linux/netlinkaccess.h	10 Dec 2006 10:51:12 -0000	1.1.2.3
 @@ -25,6 +25,24 @@
  
  #include <kernel-features.h>
@@ -1846,8 +1857,8 @@
  
  struct netlink_res
  {
---- glibc-20081113T2206/sysdeps/unix/sysv/linux/paths.h	15 Nov 2000 23:06:47 -0000	1.11
-+++ glibc-20081113T2206-fedora/sysdeps/unix/sysv/linux/paths.h	22 Sep 2004 21:21:08 -0000	1.11.4.1
+--- glibc-20090102T2110/sysdeps/unix/sysv/linux/paths.h	15 Nov 2000 23:06:47 -0000	1.11
++++ glibc-20090102T2110-fedora/sysdeps/unix/sysv/linux/paths.h	22 Sep 2004 21:21:08 -0000	1.11.4.1
 @@ -61,7 +61,7 @@
  #define	_PATH_TTY	"/dev/tty"
  #define	_PATH_UNIX	"/boot/vmlinux"
@@ -1857,8 +1868,8 @@
  #define _PATH_WTMP	"/var/log/wtmp"
  
  /* Provide trailing slash, since mostly used for building pathnames. */
---- glibc-20081113T2206/sysdeps/unix/sysv/linux/tcsetattr.c	10 Sep 2003 19:16:07 -0000	1.16
-+++ glibc-20081113T2206-fedora/sysdeps/unix/sysv/linux/tcsetattr.c	22 Sep 2004 21:21:08 -0000	1.16.2.1
+--- glibc-20090102T2110/sysdeps/unix/sysv/linux/tcsetattr.c	10 Sep 2003 19:16:07 -0000	1.16
++++ glibc-20090102T2110-fedora/sysdeps/unix/sysv/linux/tcsetattr.c	22 Sep 2004 21:21:08 -0000	1.16.2.1
 @@ -49,6 +49,7 @@ tcsetattr (fd, optional_actions, termios
  {
    struct __kernel_termios k_termios;
@@ -1904,8 +1915,8 @@
 +  return retval;
  }
  libc_hidden_def (tcsetattr)
---- glibc-20081113T2206/sysdeps/unix/sysv/linux/i386/clone.S	3 Dec 2006 23:12:36 -0000	1.27
-+++ glibc-20081113T2206-fedora/sysdeps/unix/sysv/linux/i386/clone.S	14 Dec 2006 09:06:34 -0000	1.22.2.6
+--- glibc-20090102T2110/sysdeps/unix/sysv/linux/i386/clone.S	3 Dec 2006 23:12:36 -0000	1.27
++++ glibc-20090102T2110-fedora/sysdeps/unix/sysv/linux/i386/clone.S	14 Dec 2006 09:06:34 -0000	1.22.2.6
 @@ -120,9 +120,6 @@ L(pseudo_end):
  	ret
  
@@ -1924,8 +1935,8 @@
  
  	cfi_startproc
  PSEUDO_END (BP_SYM (__clone))
---- glibc-20081113T2206/sysdeps/unix/sysv/linux/i386/dl-cache.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20081113T2206-fedora/sysdeps/unix/sysv/linux/i386/dl-cache.h	22 Sep 2004 21:21:08 -0000	1.1.2.1
+--- glibc-20090102T2110/sysdeps/unix/sysv/linux/i386/dl-cache.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20090102T2110-fedora/sysdeps/unix/sysv/linux/i386/dl-cache.h	22 Sep 2004 21:21:08 -0000	1.1.2.1
 @@ -0,0 +1,59 @@
 +/* Support for reading /etc/ld.so.cache files written by Linux ldconfig.
 +   Copyright (C) 2004 Free Software Foundation, Inc.
@@ -1986,8 +1997,8 @@
 +  } while (0)
 +
 +#include_next <dl-cache.h>
---- glibc-20081113T2206/sysdeps/unix/sysv/linux/ia64/dl-cache.h	6 Jul 2001 04:56:17 -0000	1.2
-+++ glibc-20081113T2206-fedora/sysdeps/unix/sysv/linux/ia64/dl-cache.h	22 Sep 2004 21:21:09 -0000	1.2.4.1
+--- glibc-20090102T2110/sysdeps/unix/sysv/linux/ia64/dl-cache.h	6 Jul 2001 04:56:17 -0000	1.2
++++ glibc-20090102T2110-fedora/sysdeps/unix/sysv/linux/ia64/dl-cache.h	22 Sep 2004 21:21:09 -0000	1.2.4.1
 @@ -22,4 +22,31 @@
  #define _dl_cache_check_flags(flags) \
    ((flags) == _DL_CACHE_DEFAULT_ID)
@@ -2020,29 +2031,29 @@
 +  } while (0)
 +
  #include_next <dl-cache.h>
---- glibc-20081113T2206/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 1 Jan 1970 00:00:00 -0000
-+++ glibc-20081113T2206-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c	22 Sep 2004 21:21:09 -0000	1.1.2.1
+--- glibc-20090102T2110/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 1 Jan 1970 00:00:00 -0000
++++ glibc-20090102T2110-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c	22 Sep 2004 21:21:09 -0000	1.1.2.1
 @@ -0,0 +1,5 @@
 +#ifdef IS_IN_ldconfig
 +#include <sysdeps/i386/dl-procinfo.c>
 +#else
 +#include <sysdeps/generic/dl-procinfo.c>
 +#endif
---- glibc-20081113T2206/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20081113T2206-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h	22 Sep 2004 21:21:09 -0000	1.1.2.1
+--- glibc-20090102T2110/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20090102T2110-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h	22 Sep 2004 21:21:09 -0000	1.1.2.1
 @@ -0,0 +1,5 @@
 +#ifdef IS_IN_ldconfig
 +#include <sysdeps/unix/sysv/linux/i386/dl-procinfo.h>
 +#else
 +#include <sysdeps/generic/dl-procinfo.h>
 +#endif
---- glibc-20081113T2206/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed	17 Jan 2002 06:49:28 -0000	1.2
-+++ glibc-20081113T2206-fedora/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed	22 Sep 2004 21:21:09 -0000	1.2.2.1
+--- glibc-20090102T2110/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed	17 Jan 2002 06:49:28 -0000	1.2
++++ glibc-20090102T2110-fedora/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed	22 Sep 2004 21:21:09 -0000	1.2.2.1
 @@ -1 +1 @@
 -s_^\(RTLDLIST=\)\([^ 	]*\)-ia64\(\.so\.[0-9.]*\)[ 	]*$_\1"\2-ia64\3 \2\3"_
 +s_^\(RTLDLIST=\)\([^ 	]*\)-ia64\(\.so\.[0-9.]*\)[ 	]*$_\1"\2-ia64\3 /emul/ia32-linux\2\3"_
---- glibc-20081113T2206/sysdeps/unix/sysv/linux/x86_64/clone.S	3 Dec 2006 23:12:36 -0000	1.7
-+++ glibc-20081113T2206-fedora/sysdeps/unix/sysv/linux/x86_64/clone.S	14 Dec 2006 09:06:34 -0000	1.4.2.4
+--- glibc-20090102T2110/sysdeps/unix/sysv/linux/x86_64/clone.S	3 Dec 2006 23:12:36 -0000	1.7
++++ glibc-20090102T2110-fedora/sysdeps/unix/sysv/linux/x86_64/clone.S	14 Dec 2006 09:06:34 -0000	1.4.2.4
 @@ -89,9 +89,6 @@ L(pseudo_end):
  	ret
  


Index: glibc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/glibc/devel/glibc.spec,v
retrieving revision 1.373
retrieving revision 1.374
diff -u -r1.373 -r1.374
--- glibc.spec	13 Nov 2008 22:46:07 -0000	1.373
+++ glibc.spec	2 Jan 2009 22:17:46 -0000	1.374
@@ -1,6 +1,6 @@
-%define glibcdate 20081113T2206
+%define glibcdate 20090102T2110
 %define glibcname glibc
-%define glibcsrcdir glibc-20081113T2206
+%define glibcsrcdir glibc-20090102T2110
 %define glibc_release_tarballs 0
 %define run_glibc_tests 1
 %define auxarches i586 i686 athlon sparcv9v sparc64v alphaev6
@@ -22,7 +22,7 @@
 %define _unpackaged_files_terminate_build 0
 Summary: The GNU libc libraries
 Name: glibc
-Version: 2.9
+Version: 2.9.90
 Release: 1
 # GPLv2+ is used in a bunch of programs, LGPLv2+ is used for libraries.
 # Things that are linked directly into dynamically linked programs
@@ -988,7 +988,15 @@
 %endif
 
 %changelog
-* Thu Nov 13 2008 Jakub Jelinek <jakub at redhat.com> 2.9-1
+* Fri Jan  2 2009 Jakub Jelinek <jakub at redhat.com> 2.9.90-1
+- update from trunk (#478314)
+
+* Mon Dec  8 2008 Jakub Jelinek <jakub at redhat.com> 2.9-3
+- temporarily disable _nss_dns_gethostbyname4_r (#459756)
+- NIS hostname lookup fixes (#473073, #474800, BZ#7058)
+- fix unsetenv (#472941)
+
+* Thu Nov 13 2008 Jakub Jelinek <jakub at redhat.com> 2.9-2
 - glibc 2.9 release
 - fix CPU_ALLOC_SIZE on 32-bit arches (BZ#7029)
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/glibc/devel/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	13 Nov 2008 22:46:07 -0000	1.2
+++ import.log	2 Jan 2009 22:17:46 -0000	1.3
@@ -1,2 +1,3 @@
 glibc-2_8_90-17:HEAD:glibc-2.8.90-17.src.rpm:1226522699
 glibc-2_9-1:HEAD:glibc-2.9-1.src.rpm:1226616331
+glibc-2_9_90-1:HEAD:glibc-2.9.90-1.src.rpm:1230934009


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/glibc/devel/sources,v
retrieving revision 1.283
retrieving revision 1.284
diff -u -r1.283 -r1.284
--- sources	13 Nov 2008 22:46:07 -0000	1.283
+++ sources	2 Jan 2009 22:17:46 -0000	1.284
@@ -1,2 +1,2 @@
-fa95108fcbc4d7f54e685b312ce3c2a4  glibc-20081113T2206.tar.bz2
-565a968c461bf804f816f25d2f47474a  glibc-fedora-20081113T2206.tar.bz2
+9af466a43650290c3762ace76df57b62  glibc-20090102T2110.tar.bz2
+df962506987b8d817230af26a98be5fb  glibc-fedora-20090102T2110.tar.bz2



From peterscheie at fedoraproject.org  Fri Jan  2 22:23:00 2009
From: peterscheie at fedoraproject.org (Peter Scheie)
Date: Fri,  2 Jan 2009 22:23:00 +0000 (UTC)
Subject: rpms/k12linux-quick-start-guide/F-10 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <20090102222300.901ED70130@cvs1.fedora.phx.redhat.com>

Author: peterscheie

Update of /cvs/pkgs/rpms/k12linux-quick-start-guide/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26621

Modified Files:
	.cvsignore sources 
Log Message:
Update to version 0.0.9


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/k12linux-quick-start-guide/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	31 Dec 2008 05:55:08 -0000	1.1
+++ .cvsignore	2 Jan 2009 22:22:30 -0000	1.2
@@ -0,0 +1 @@
+k12linux-quick-start-guide-0.0.9.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/k12linux-quick-start-guide/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	31 Dec 2008 05:55:08 -0000	1.1
+++ sources	2 Jan 2009 22:22:30 -0000	1.2
@@ -0,0 +1 @@
+db73786ee9a2bf2198a9f2a017088299  k12linux-quick-start-guide-0.0.9.tar.bz2



From rishi at fedoraproject.org  Fri Jan  2 22:40:55 2009
From: rishi at fedoraproject.org (Debarshi Ray)
Date: Fri,  2 Jan 2009 22:40:55 +0000 (UTC)
Subject: rpms/anjuta/F-10 anjuta-2.24.1-webkit.patch, NONE, 1.1 anjuta.spec, 
	1.54, 1.55
Message-ID: <20090102224055.156D470130@cvs1.fedora.phx.redhat.com>

Author: rishi

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

Modified Files:
	anjuta.spec 
Added Files:
	anjuta-2.24.1-webkit.patch 
Log Message:
* Sat Jan 03 2009 Debarshi Ray <rishi at fedoraproject.org> - 1:2.24.1-3
- Added patch against the Devhelp plugin from GNOME to make it work with the
  new WebKit-based Devhelp >= 0.22. Closes GNOME Bugzilla bug #560311, and Red
  Hat Bugzilla bug #478578.


anjuta-2.24.1-webkit.patch:

--- NEW FILE anjuta-2.24.1-webkit.patch ---
diff -urNp anjuta-2.24.1.orig/configure anjuta-2.24.1/configure
--- anjuta-2.24.1.orig/configure	2009-01-03 02:03:23.000000000 +0530
+++ anjuta-2.24.1/configure	2009-01-03 03:28:07.000000000 +0530
@@ -2395,7 +2395,7 @@ VTE_REQUIRED=0.9.0
 VTE_NEW_REQUIRED=0.13.1
 LIBXML_REQUIRED=2.4.23
 PANGO_REQUIRED=1.1.1
-LIBDEVHELP_REQUIRED=0.13
+LIBDEVHELP_REQUIRED=0.22
 GDL_REQUIRED=0.7.3
 GNOMEBUILD_REQUIRED=0.3.0
 GLADEUI_REQUIRED=3.2.0
@@ -18753,12 +18753,12 @@ if test -n "$PKG_CONFIG"; then
         pkg_cv_PLUGIN_DEVHELP_CFLAGS="$PLUGIN_DEVHELP_CFLAGS"
     else
         if test -n "$PKG_CONFIG" && \
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libdevhelp-1.0 >= \$LIBDEVHELP_REQUIRED\"") >&5
-  ($PKG_CONFIG --exists --print-errors "libdevhelp-1.0 >= $LIBDEVHELP_REQUIRED") 2>&5
+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libdevhelp-1.0 >= \$LIBDEVHELP_REQUIRED webkit-1.0\"") >&5
+  ($PKG_CONFIG --exists --print-errors "libdevhelp-1.0 >= $LIBDEVHELP_REQUIRED webkit-1.0") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
-  pkg_cv_PLUGIN_DEVHELP_CFLAGS=`$PKG_CONFIG --cflags "libdevhelp-1.0 >= $LIBDEVHELP_REQUIRED" 2>/dev/null`
+  pkg_cv_PLUGIN_DEVHELP_CFLAGS=`$PKG_CONFIG --cflags "libdevhelp-1.0 >= $LIBDEVHELP_REQUIRED webkit-1.0" 2>/dev/null`
 else
   pkg_failed=yes
 fi
@@ -18771,12 +18771,12 @@ if test -n "$PKG_CONFIG"; then
         pkg_cv_PLUGIN_DEVHELP_LIBS="$PLUGIN_DEVHELP_LIBS"
     else
         if test -n "$PKG_CONFIG" && \
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libdevhelp-1.0 >= \$LIBDEVHELP_REQUIRED\"") >&5
-  ($PKG_CONFIG --exists --print-errors "libdevhelp-1.0 >= $LIBDEVHELP_REQUIRED") 2>&5
+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libdevhelp-1.0 >= \$LIBDEVHELP_REQUIRED webkit-1.0\"") >&5
+  ($PKG_CONFIG --exists --print-errors "libdevhelp-1.0 >= $LIBDEVHELP_REQUIRED webkit-1.0") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
-  pkg_cv_PLUGIN_DEVHELP_LIBS=`$PKG_CONFIG --libs "libdevhelp-1.0 >= $LIBDEVHELP_REQUIRED" 2>/dev/null`
+  pkg_cv_PLUGIN_DEVHELP_LIBS=`$PKG_CONFIG --libs "libdevhelp-1.0 >= $LIBDEVHELP_REQUIRED webkit-1.0" 2>/dev/null`
 else
   pkg_failed=yes
 fi
@@ -18795,9 +18795,9 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        PLUGIN_DEVHELP_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libdevhelp-1.0 >= $LIBDEVHELP_REQUIRED"`
+	        PLUGIN_DEVHELP_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libdevhelp-1.0 >= $LIBDEVHELP_REQUIRED webkit-1.0"`
         else
-	        PLUGIN_DEVHELP_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libdevhelp-1.0 >= $LIBDEVHELP_REQUIRED"`
+	        PLUGIN_DEVHELP_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libdevhelp-1.0 >= $LIBDEVHELP_REQUIRED webkit-1.0"`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$PLUGIN_DEVHELP_PKG_ERRORS" >&5
diff -urNp anjuta-2.24.1.orig/plugins/devhelp/anjuta-devhelp.ui anjuta-2.24.1/plugins/devhelp/anjuta-devhelp.ui
--- anjuta-2.24.1.orig/plugins/devhelp/anjuta-devhelp.ui	2009-01-03 02:03:23.000000000 +0530
+++ anjuta-2.24.1/plugins/devhelp/anjuta-devhelp.ui	2009-01-03 02:33:24.000000000 +0530
@@ -1,14 +1,6 @@
 <!--*- xml -*-->
 <ui>
 	<menubar name="MenuMain">
-		<menu name="MenuView" action="ActionMenuView">
-			<menu name="Goto" action="ActionMenuGoto">
-				<placeholder name="PlaceholderGotoMenus">
-					<menuitem name="BackHelp" action="ActionDevhelpBack" />
-					<menuitem name="ForwardHelp" action="ActionDevhelpForward" />
-				</placeholder>
-			</menu>
-		</menu>
 		<placeholder name="PlaceHolderHelpMenus" >
 			<menu name="MenuHelp" action="ActionMenuHelp" >
 				<placeholder name="PlaceHolderHelpDevel" >
@@ -24,7 +16,5 @@
 	</toolbar>
 	<toolbar name="ToolbarBrowser">		
 		<toolitem name="Context" action="ActionHelpContext" />
-		<toolitem name="BackHelp" action="ActionDevhelpBack" />
-		<toolitem name="ForwardHelp" action="ActionDevhelpForward" />
 	</toolbar>
 </ui>
diff -urNp anjuta-2.24.1.orig/plugins/devhelp/htmlview.c anjuta-2.24.1/plugins/devhelp/htmlview.c
--- anjuta-2.24.1.orig/plugins/devhelp/htmlview.c	2009-01-03 02:03:23.000000000 +0530
+++ anjuta-2.24.1/plugins/devhelp/htmlview.c	1970-01-01 05:30:00.000000000 +0530
@@ -1,182 +0,0 @@
-/*
- *  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 Library 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.
- */
-
-#include "htmlview.h"
-
-#include <devhelp/dh-book-tree.h>
-#include <devhelp/dh-html.h>
-#include <devhelp/dh-preferences.h>
-#include <devhelp/dh-search.h>
-#include <devhelp/dh-base.h>
-
-static void html_view_class_init(HtmlViewClass *klass);
-static void html_view_init(HtmlView *sp);
-static void html_view_finalize(GObject *object);
-
-struct _HtmlViewPrivate {
-	DhHtml* html;
-	AnjutaDevhelp* devhelp;
-	gchar* uri;
-	guint idle_realize;
-};
-
-G_DEFINE_TYPE(HtmlView, html_view, GTK_TYPE_HBOX)
-
-static gboolean
-devhelp_html_open_uri_cb (DhHtml      *html,
-			 const gchar *uri,
-			 AnjutaDevhelp    *widget)
-{
-#ifdef HAVE_OLD_DEVHELP
-	dh_book_tree_show_uri (DH_BOOK_TREE (widget->book_tree), uri);
-#else
-	dh_book_tree_select_uri (DH_BOOK_TREE (widget->book_tree), uri);
-#endif
-	return FALSE;
-}
-
-static void
-devhelp_html_location_changed_cb (DhHtml      *html,
-				 const gchar *location,
-				 AnjutaDevhelp    *widget)
-{	
-	anjuta_devhelp_check_history (widget);
-}
-
-static gboolean
-html_view_create_html(HtmlView* html_view)
-{
-	GtkWidget* view;
-	HtmlViewPrivate* priv = html_view->priv;
-
-	priv->html = dh_html_new();
-	
-	if (!priv->html || !DH_IS_HTML(priv->html))	
-		return TRUE; /* I think the idea is to wait until we get a widget? */
-	
-	view = dh_html_get_widget(priv->html);
-	gtk_box_pack_start(GTK_BOX(html_view), dh_html_get_widget(priv->html), TRUE, TRUE, 1);
-	
-	g_signal_connect (priv->html, "open-uri",
-			  G_CALLBACK (devhelp_html_open_uri_cb),
-			  priv->devhelp);
-	g_signal_connect (priv->html, "location-changed",
-			  G_CALLBACK (devhelp_html_location_changed_cb),
-			  priv->devhelp);
-	
-	/* Hack to get GtkMozEmbed to work properly. */
-	gtk_widget_realize (view);
-
-	if (priv->uri)
-		dh_html_open_uri(priv->html, priv->uri);
-	else
-		dh_html_clear(priv->html);
-	
-	gtk_widget_show (view);
-	
-	return FALSE;
-}
-
-static void
-html_view_realize(GtkWidget* widget)
-{
-	HtmlView* html_view = HTML_VIEW(widget);
-	
-	if (html_view->priv->idle_realize == 0)
-	{
-		html_view->priv->idle_realize =
-			g_idle_add((GSourceFunc) html_view_create_html, html_view);
-	}	
-	(* GTK_WIDGET_CLASS (html_view_parent_class)->realize)(widget);
-}
-
-static void
-html_view_unrealize(GtkWidget* widget)
-{
-	HtmlView* html_view = HTML_VIEW(widget);
-	
-	if (html_view->priv->idle_realize > 0)
-	{
-		g_source_remove (html_view->priv->idle_realize);
-		html_view->priv->idle_realize = 0;
-	}
-	
-	if (html_view->priv->html != NULL)
-	{
-		g_free(html_view->priv->uri);
-		html_view->priv->uri = dh_html_get_location(html_view->priv->html);
-	}
-	else
-		html_view->priv->uri = NULL;
-	
-	if (gtk_container_get_children(GTK_CONTAINER(html_view)))
-	{
-		gtk_container_remove(GTK_CONTAINER(widget), dh_html_get_widget(html_view->priv->html));
-		html_view->priv->html = NULL;
-	}
-
-	(* GTK_WIDGET_CLASS (html_view_parent_class)->unrealize)(widget);
-}
-
-static void
-html_view_class_init(HtmlViewClass *klass)
-{
-	GObjectClass *object_class = G_OBJECT_CLASS(klass);
-	GtkWidgetClass* widget_class = GTK_WIDGET_CLASS(klass);
-
-	object_class->finalize = html_view_finalize;
-	
-	widget_class->realize = html_view_realize;
-	widget_class->unrealize = html_view_unrealize;
-}
-
-static void
-html_view_init(HtmlView *obj)
-{
-	obj->priv = g_new0(HtmlViewPrivate, 1);
-	gtk_widget_show(GTK_WIDGET(obj));
-}
-
-static void
-html_view_finalize(GObject *object)
-{
-	HtmlView *cobj;
-	cobj = HTML_VIEW(object);
-	
-	/* Free private members, etc. */
-	if (cobj->priv->html)
-		gtk_widget_destroy(dh_html_get_widget(cobj->priv->html));
-	g_free (cobj->priv->uri);	
-	g_free(cobj->priv);
-	G_OBJECT_CLASS(html_view_parent_class)->finalize(object);
-}
-
-GtkWidget*
-html_view_new(AnjutaDevhelp* devhelp)
-{
-	HtmlView *obj;
-	
-	obj = HTML_VIEW(g_object_new(HTML_TYPE_VIEW, NULL));
-	
-	obj->priv->devhelp = devhelp;
-	
-	return GTK_WIDGET(obj);
-}
-
-DhHtml* html_view_get_dh_html(HtmlView* view)
-{
-	return view->priv->html;
-}
diff -urNp anjuta-2.24.1.orig/plugins/devhelp/htmlview.h anjuta-2.24.1/plugins/devhelp/htmlview.h
--- anjuta-2.24.1.orig/plugins/devhelp/htmlview.h	2009-01-03 02:03:23.000000000 +0530
+++ anjuta-2.24.1/plugins/devhelp/htmlview.h	1970-01-01 05:30:00.000000000 +0530
@@ -1,57 +0,0 @@
-/*
- *  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 Library 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 HTMLVIEW_H
-#define HTMLVIEW_H
-
-#include <glib.h>
-#include <glib-object.h>
-#include <gtk/gtk.h>
-
-#include <devhelp/dh-html.h>
-
-#include "plugin.h"
-
-G_BEGIN_DECLS
-
-#define HTML_TYPE_VIEW         (html_view_get_type ())
-#define HTML_VIEW(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), HTML_TYPE_VIEW, HtmlView))
-#define HTML_VIEW_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), HTML_TYPE_VIEW, HtmlViewClass))
-#define HTML_IS_VIEW(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), HTML_TYPE_VIEW))
-#define HTML_IS_VIEW_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), HTML_TYPE_VIEW))
-#define HTML_VIEW_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), HTML_TYPE_VIEW, HtmlViewClass))
-
-typedef struct _HtmlView HtmlView;
-typedef struct _HtmlViewPrivate HtmlViewPrivate;
-typedef struct _HtmlViewClass HtmlViewClass;
-
-struct _HtmlView {
-	GtkHBox parent;
-	HtmlViewPrivate *priv;
-};
-
-struct _HtmlViewClass {
-	GtkHBoxClass parent_class;
-};
-
-GType html_view_get_type(void);
-GtkWidget *html_view_new(AnjutaDevhelp* devhelp);
-
-DhHtml* html_view_get_dh_html(HtmlView* html_view);
-
-G_END_DECLS
-
-#endif /* HTMLVIEW_H */
diff -urNp anjuta-2.24.1.orig/plugins/devhelp/Makefile.in anjuta-2.24.1/plugins/devhelp/Makefile.in
--- anjuta-2.24.1.orig/plugins/devhelp/Makefile.in	2009-01-03 02:03:23.000000000 +0530
+++ anjuta-2.24.1/plugins/devhelp/Makefile.in	2009-01-03 03:46:06.000000000 +0530
@@ -37,11 +37,7 @@ build_triplet = @build@
 host_triplet = @host@
 @HAVE_PLUGIN_DEVHELP_TRUE at am__append_1 = $(PLUGIN_DEVHELP_CFLAGS)
 @HAVE_PLUGIN_DEVHELP_FALSE at am__append_2 = -DDISABLE_EMBEDDED_DEVHELP
- at HAVE_PLUGIN_DEVHELP_TRUE@am__append_3 = \
- at HAVE_PLUGIN_DEVHELP_TRUE@	htmlview.c \
- at HAVE_PLUGIN_DEVHELP_TRUE@	htmlview.h
-
- at HAVE_PLUGIN_DEVHELP_TRUE@am__append_4 = $(PLUGIN_DEVHELP_LIBS)
+ at HAVE_PLUGIN_DEVHELP_TRUE@am__append_3 = $(PLUGIN_DEVHELP_LIBS)
 subdir = plugins/devhelp
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -67,10 +63,7 @@ am__DEPENDENCIES_1 =
 @HAVE_PLUGIN_DEVHELP_TRUE at am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1)
 libanjuta_devhelp_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2)
-am__libanjuta_devhelp_la_SOURCES_DIST = plugin.c plugin.h htmlview.c \
-	htmlview.h
- at HAVE_PLUGIN_DEVHELP_TRUE@am__objects_1 = htmlview.lo
-am_libanjuta_devhelp_la_OBJECTS = plugin.lo $(am__objects_1)
+am_libanjuta_devhelp_la_OBJECTS = plugin.lo
 libanjuta_devhelp_la_OBJECTS = $(am_libanjuta_devhelp_la_OBJECTS)
 libanjuta_devhelp_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
@@ -88,7 +81,7 @@ LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLF
 	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
 	$(LDFLAGS) -o $@
 SOURCES = $(libanjuta_devhelp_la_SOURCES)
-DIST_SOURCES = $(am__libanjuta_devhelp_la_SOURCES_DIST)
+DIST_SOURCES = $(libanjuta_devhelp_la_SOURCES)
 devhelp_pixmapsDATA_INSTALL = $(INSTALL_DATA)
 devhelp_pluginDATA_INSTALL = $(INSTALL_DATA)
 devhelp_uiDATA_INSTALL = $(INSTALL_DATA)
@@ -389,6 +382,7 @@ sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 
@@ -424,11 +418,14 @@ plugin_LTLIBRARIES = libanjuta-devhelp.l
 libanjuta_devhelp_la_LDFLAGS = $(ANJUTA_PLUGIN_LDFLAGS)
 
 # Plugin sources
-libanjuta_devhelp_la_SOURCES = plugin.c plugin.h $(am__append_3)
+libanjuta_devhelp_la_SOURCES = \
+	plugin.c \
+	plugin.h
+
 
 # Plugin dependencies
 libanjuta_devhelp_la_LIBADD = $(GTK_LIBS) $(LIBANJUTA_LIBS) \
-	$(am__append_4)
+	$(am__append_3)
 EXTRA_DIST = \
 	$(plugin_in_files) \
 	$(devhelp_plugin_DATA) \
@@ -504,7 +501,6 @@ mostlyclean-compile:
 distclean-compile:
 	-rm -f *.tab.c
 
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/htmlview.Plo at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/plugin.Plo at am__quote@
 
 .c.o:
diff -urNp anjuta-2.24.1.orig/plugins/devhelp/plugin.c anjuta-2.24.1/plugins/devhelp/plugin.c
--- anjuta-2.24.1.orig/plugins/devhelp/plugin.c	2009-01-03 02:03:23.000000000 +0530
+++ anjuta-2.24.1/plugins/devhelp/plugin.c	2009-01-03 02:09:10.000000000 +0530
@@ -34,11 +34,9 @@
 #ifndef DISABLE_EMBEDDED_DEVHELP
 
 #include <devhelp/dh-book-tree.h>
-#include <devhelp/dh-html.h>
-#include <devhelp/dh-preferences.h>
 #include <devhelp/dh-search.h>
 #include <devhelp/dh-base.h>
-#include "htmlview.h"
+#include <webkit/webkit.h>
 #define UI_FILE PACKAGE_DATA_DIR"/ui/anjuta-devhelp.ui"
 
 #else /* DISABLE_EMBEDDED_DEVHELP */
@@ -51,12 +49,8 @@ static gpointer parent_class;
 
 #ifndef DISABLE_EMBEDDED_DEVHELP
 
-#define ANJUTA_PIXMAP_HELP_NEXT "anjuta-go-help-next-24.png"
-#define ANJUTA_PIXMAP_HELP_PREV "anjuta-go-help-prev-24.png"
 #define ANJUTA_PIXMAP_DEVHELP "anjuta-devhelp-plugin-48.png"
 
-#define ANJUTA_STOCK_HELP_NEXT "anjuta-help-next"
-#define ANJUTA_STOCK_HELP_PREV "anjuta-help-prev"
 #define ANJUTA_STOCK_DEVHELP "anjuta-devhelp"
 
 static void
@@ -74,76 +68,55 @@ register_stock_icons (AnjutaPlugin *plug
 	/* Register stock icons */
 	ui = anjuta_shell_get_ui (plugin->shell, NULL);
 	icon_factory = anjuta_ui_get_icon_factory (ui);
-	REGISTER_ICON (ANJUTA_PIXMAP_HELP_NEXT, ANJUTA_STOCK_HELP_NEXT);
-	REGISTER_ICON (ANJUTA_PIXMAP_HELP_PREV, ANJUTA_STOCK_HELP_PREV);
 	REGISTER_ICON (ANJUTA_PIXMAP_DEVHELP, ANJUTA_STOCK_DEVHELP);
 }
 
 static void
-devhelp_tree_link_selected_cb (GObject       *ignored,
-			      DhLink        *link,
-			      AnjutaDevhelp *widget)
+devhelp_tree_link_selected_cb (GObject       *ignored, DhLink *link,
+							   AnjutaDevhelp *widget)
 {
+	gchar *uri;
 	
-	DhHtml       *html;
+	/*anjuta_shell_present_widget (ANJUTA_PLUGIN (widget)->shell,
+								 widget->view, NULL);*/
 
-	anjuta_shell_present_widget (ANJUTA_PLUGIN (widget)->shell,
-								 widget->htmlview, NULL);
-
-	html = html_view_get_dh_html(HTML_VIEW(widget->htmlview));
-	
-	if (!DH_IS_HTML(html))
-		return;
+	uri = dh_link_get_uri (link);
+	webkit_web_view_open (WEBKIT_WEB_VIEW (widget->view), uri);
+	g_free (uri);
 	
-	dh_html_open_uri (html, link->uri);
-
 	anjuta_devhelp_check_history (widget);
 }
 
 static void
-devhelp_search_link_selected_cb (GObject  *ignored,
-				DhLink   *link,
-				 AnjutaDevhelp *widget)
+devhelp_search_link_selected_cb (GObject  *ignored, DhLink *link,
+								 AnjutaDevhelp *widget)
 {
-	DhHtml       *html;
-
-	anjuta_shell_present_widget (ANJUTA_PLUGIN (widget)->shell,
-								 widget->htmlview, NULL);
-
-	html = html_view_get_dh_html(HTML_VIEW(widget->htmlview));
-
-	if (!DH_IS_HTML(html))
-		return;
-
-	dh_html_open_uri (html, link->uri);
+	gchar *uri;
+	
+	/*anjuta_shell_present_widget (ANJUTA_PLUGIN (widget)->shell,
+								 widget->view, NULL);*/
 
+	uri = dh_link_get_uri (link);
+	webkit_web_view_open (WEBKIT_WEB_VIEW (widget->view), uri);
+	g_free (uri);
+	
 	anjuta_devhelp_check_history (widget);
 }
 
 static void
-on_go_back_activate (GtkAction *action, AnjutaDevhelp *plugin)
+on_go_back_clicked (GtkWidget *widget, AnjutaDevhelp *plugin)
 {
-	DhHtml* html;
-
-	html = html_view_get_dh_html(HTML_VIEW(plugin->htmlview));
+	webkit_web_view_go_back (WEBKIT_WEB_VIEW (plugin->view));
 	
-	if (!DH_IS_HTML(html))
-		return;
-		
-	dh_html_go_back(html);
+	anjuta_devhelp_check_history (plugin);
 }
 
 static void
-on_go_forward_activate (GtkAction *action, AnjutaDevhelp *plugin)
+on_go_forward_clicked (GtkWidget *widget, AnjutaDevhelp *plugin)
 {
-	DhHtml* html;
-
-	html = html_view_get_dh_html(HTML_VIEW(plugin->htmlview));
+	webkit_web_view_go_forward (WEBKIT_WEB_VIEW (plugin->view));
 	
-	if (!DH_IS_HTML(html))
-		return;
-	
-	dh_html_go_forward(html);
+	anjuta_devhelp_check_history (plugin);
 }
 
 static gboolean
@@ -173,7 +146,7 @@ on_api_reference_activate (GtkAction *ac
 }
 
 static gboolean
-context_idle(AnjutaDevhelp* plugin)
+context_idle (AnjutaDevhelp* plugin)
 {
 	IAnjutaEditor *editor;
 	gchar *current_word;
@@ -232,22 +205,6 @@ static GtkActionEntry actions[] = {
 		NULL,
 		NULL
 	},
-	{
-		"ActionDevhelpBack",
-		ANJUTA_STOCK_HELP_PREV,
-		N_("Previous Help"),
-		NULL,
-		N_("Go to previous help page"),
-		G_CALLBACK (on_go_back_activate)
-	},
-	{
-		"ActionDevhelpForward",
-		ANJUTA_STOCK_HELP_NEXT,
-		N_("Next Help"),
-		NULL,
-		N_("Go to next help page"),
-		G_CALLBACK (on_go_forward_activate)
-	},
 #endif /* DISABLE_EMBEDDED_DEVHELP */
 	{
 		"ActionHelpApi",
@@ -282,7 +239,7 @@ static GtkActionEntry actions[] = {
 /* Watches callbacks */
 
 static void
-value_added_current_editor (AnjutaPlugin *plugin, const char *name,
+value_added_current_editor (AnjutaPlugin *plugin, const gchar *name,
 							const GValue *value, gpointer data)
 {
 	GtkAction *action;
@@ -300,7 +257,7 @@ value_added_current_editor (AnjutaPlugin
 
 static void
 value_removed_current_editor (AnjutaPlugin *plugin,
-							  const char *name, gpointer data)
+							  const gchar *name, gpointer data)
 {
 	GtkAction *action;
 	AnjutaDevhelp* devhelp = ANJUTA_PLUGIN_DEVHELP (data);	
@@ -314,7 +271,6 @@ value_removed_current_editor (AnjutaPlug
 static gboolean
 devhelp_activate (AnjutaPlugin *plugin)
 {
-
 	AnjutaUI *ui;
 	AnjutaDevhelp *devhelp;
 
@@ -323,12 +279,15 @@ devhelp_activate (AnjutaPlugin *plugin)
 	GNode *books;
 	GList *keywords;
 	GtkWidget* books_sw;
+	GtkWidget *scrolled_window;
+	GtkWidget *main_vbox;
+	GtkWidget *button_hbox;
 	
 	if (!init)
 	{
 		register_stock_icons (plugin);
 		init = TRUE;
-	}	
+	}
 #endif
 
 	DEBUG_PRINT ("AnjutaDevhelp: Activating AnjutaDevhelp plugin ...");
@@ -346,47 +305,89 @@ devhelp_activate (AnjutaPlugin *plugin)
 	devhelp->uiid = anjuta_ui_merge (ui, UI_FILE);
 
 #ifndef DISABLE_EMBEDDED_DEVHELP
-
+	/*
+	 * Forward/back buttons
+	 */
+	main_vbox = gtk_vbox_new (FALSE, 6);
+	gtk_widget_show (main_vbox);
+	button_hbox = gtk_hbox_new (FALSE, 0);
+	gtk_widget_show (button_hbox);
+	
+	devhelp->go_back = gtk_button_new_from_stock (GTK_STOCK_GO_BACK);
+	gtk_widget_show (devhelp->go_back);
+	gtk_box_pack_start (GTK_BOX (button_hbox), devhelp->go_back, FALSE, FALSE, 0);
+	gtk_widget_set_sensitive (devhelp->go_back, FALSE);
+	g_signal_connect (devhelp->go_back, "clicked",
+			  G_CALLBACK (on_go_back_clicked), devhelp);
+	
+	devhelp->go_forward = gtk_button_new_from_stock (GTK_STOCK_GO_FORWARD);
+	gtk_widget_show (devhelp->go_forward);
+	gtk_box_pack_start (GTK_BOX (button_hbox), devhelp->go_forward, FALSE, FALSE, 0);
+	gtk_widget_set_sensitive (devhelp->go_forward, FALSE);
+	g_signal_connect (devhelp->go_forward, "clicked",
+			  G_CALLBACK (on_go_forward_clicked), devhelp);
+	
+	gtk_box_pack_start (GTK_BOX (main_vbox), button_hbox, FALSE, FALSE, 0);
+	
+	/*
+	 * Notebook
+	 */
 	books = dh_base_get_book_tree (devhelp->base);
 	keywords = dh_base_get_keywords (devhelp->base);
 	
-	books_sw = gtk_scrolled_window_new(NULL, NULL);
+	books_sw = gtk_scrolled_window_new (NULL, NULL);
 	gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (books_sw),
-					GTK_POLICY_NEVER,
-					GTK_POLICY_AUTOMATIC);
+									GTK_POLICY_NEVER,
+									GTK_POLICY_AUTOMATIC);
 	gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (books_sw),
-					     GTK_SHADOW_IN);
+									     GTK_SHADOW_IN);
 	gtk_container_set_border_width (GTK_CONTAINER (books_sw), 2);
 	
-	devhelp->control_notebook = gtk_notebook_new();
-	devhelp->book_tree = dh_book_tree_new(books);
-	devhelp->search = dh_search_new(keywords);
+	devhelp->control_notebook = gtk_notebook_new ();
+	gtk_box_pack_start (GTK_BOX (main_vbox), devhelp->control_notebook, TRUE, TRUE, 0);
+	devhelp->book_tree = dh_book_tree_new (books);
+	
+	devhelp->search = dh_search_new (keywords);
+	gtk_widget_set_size_request (devhelp->search, 0, 0);
 	
 	g_signal_connect (devhelp->book_tree,
-			  "link-selected",
-			  G_CALLBACK (devhelp_tree_link_selected_cb),
-			  devhelp);
+					  "link-selected",
+					  G_CALLBACK (devhelp_tree_link_selected_cb),
+					  devhelp);
 	g_signal_connect (devhelp->search,
-			  "link-selected",
-			  G_CALLBACK (devhelp_search_link_selected_cb),
-			  devhelp);
-	
-	gtk_container_add(GTK_CONTAINER(books_sw), devhelp->book_tree);
-	gtk_notebook_append_page(GTK_NOTEBOOK(devhelp->control_notebook), books_sw,
-		gtk_label_new(_("Books")));
-	gtk_notebook_append_page(GTK_NOTEBOOK(devhelp->control_notebook), devhelp->search,
-		gtk_label_new(_("Search")));
-	
-	devhelp->htmlview = html_view_new(devhelp);	
-
-	anjuta_shell_add_widget (plugin->shell, devhelp->control_notebook,
-								 "AnjutaDevhelpIndex", _("Help"), ANJUTA_STOCK_DEVHELP,
-								 ANJUTA_SHELL_PLACEMENT_LEFT, NULL);
+					  "link-selected",
+					  G_CALLBACK (devhelp_search_link_selected_cb),
+					  devhelp);
+	
+	gtk_container_add (GTK_CONTAINER (books_sw), devhelp->book_tree);
+	gtk_notebook_append_page (GTK_NOTEBOOK (devhelp->control_notebook), books_sw,
+							 gtk_label_new (_("Contents")));
+	gtk_notebook_append_page (GTK_NOTEBOOK (devhelp->control_notebook), devhelp->search,
+							  gtk_label_new (_("Search")));
+	
+	gtk_widget_show_all (devhelp->control_notebook);
+	
+	/* View */
+	devhelp->view = webkit_web_view_new ();
+	gtk_widget_show (devhelp->view);
+	
+	webkit_web_view_open (WEBKIT_WEB_VIEW (devhelp->view), "about:blank");
+	
+	scrolled_window = gtk_scrolled_window_new (NULL, NULL);
+	gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window),
+									GTK_POLICY_AUTOMATIC,
+									GTK_POLICY_AUTOMATIC);
+	gtk_widget_show (scrolled_window);
+	gtk_container_add (GTK_CONTAINER (scrolled_window), devhelp->view);
+
+	anjuta_shell_add_widget (plugin->shell, main_vbox,
+							 "AnjutaDevhelpIndex", _("Help"), ANJUTA_STOCK_DEVHELP,
+							 ANJUTA_SHELL_PLACEMENT_LEFT, NULL);
 	/* This is the window that show the html help text */
-	anjuta_shell_add_widget (plugin->shell, devhelp->htmlview,
-								 "AnjutaDevhelpDisplay", _("Help display"),
-								 ANJUTA_STOCK_DEVHELP,
-								 ANJUTA_SHELL_PLACEMENT_CENTER, NULL);
+	anjuta_shell_add_widget (plugin->shell, scrolled_window,
+							 "AnjutaDevhelpDisplay", _("Help display"),
+							 ANJUTA_STOCK_DEVHELP,
+							 ANJUTA_SHELL_PLACEMENT_CENTER, NULL);
 								 
 #endif /* DISABLE_EMBEDDED_DEVHELP */
 
@@ -415,7 +416,7 @@ devhelp_deactivate (AnjutaPlugin *plugin
 #ifndef DISABLE_EMBEDDED_DEVHELP
 
 	/* Remove widgets */
-	anjuta_shell_remove_widget(plugin->shell, devhelp->htmlview, NULL);
+	anjuta_shell_remove_widget(plugin->shell, devhelp->view, NULL);
 	anjuta_shell_remove_widget(plugin->shell, devhelp->control_notebook, NULL);	
 
 #endif /* DISABLE_EMBEDDED_DEVHELP */
@@ -431,32 +432,22 @@ devhelp_deactivate (AnjutaPlugin *plugin
 
 #ifndef DISABLE_EMBEDDED_DEVHELP
 
-void anjuta_devhelp_check_history(AnjutaDevhelp* devhelp)
+void
+anjuta_devhelp_check_history (AnjutaDevhelp* devhelp)
 {
-	GtkAction* action_forward;
-	GtkAction* action_back;
-	DhHtml* html = html_view_get_dh_html(HTML_VIEW(devhelp->htmlview));
-	
-	action_forward = gtk_action_group_get_action (devhelp->action_group,
-										  "ActionDevhelpForward");
-	action_back = gtk_action_group_get_action (devhelp->action_group,
-										  "ActionDevhelpBack");
-	if (html != NULL)
-	{
-		g_object_set (action_forward, "sensitive", dh_html_can_go_forward (html) , NULL);
-		g_object_set (action_back, "sensitive", dh_html_can_go_back (html) , NULL);
-	}
+	gtk_widget_set_sensitive (devhelp->go_forward, webkit_web_view_can_go_forward (WEBKIT_WEB_VIEW (devhelp->view)));
+
+	gtk_widget_set_sensitive (devhelp->go_back, webkit_web_view_can_go_back (WEBKIT_WEB_VIEW (devhelp->view)));
 }
 
 #endif /* DISABLE_EMBEDDED_DEVHELP */
 
-#if 0
 static void
 devhelp_finalize (GObject *obj)
 {
+	DEBUG_PRINT ("%s", "Finalising Devhelp plugin");
+
 	/* Finalization codes here */
-	AnjutaDevhelp *plugin = ANJUTA_PLUGIN_DEVHELP (obj);
-	
 	G_OBJECT_CLASS (parent_class)->finalize (obj);
 }
 
@@ -465,13 +456,17 @@ devhelp_dispose (GObject *obj)
 {
 	AnjutaDevhelp* devhelp = ANJUTA_PLUGIN_DEVHELP (obj);
 	
-	/* Destroy devhelp - seems not to work... */
-	// g_object_unref(G_OBJECT(devhelp->base));
+	DEBUG_PRINT ("%s", "Disposing Devhelp plugin");
+	
+	if (devhelp->base)
+	{
+		g_object_unref(G_OBJECT(devhelp->base));
+		devhelp->base = NULL;
+	}
 
 	/* Disposition codes */
 	G_OBJECT_CLASS (parent_class)->dispose (obj);
 }
-#endif
 
 static void
 devhelp_instance_init (GObject *obj)
@@ -497,10 +492,9 @@ devhelp_class_init (GObjectClass *klass)
 
 	plugin_class->activate = devhelp_activate;
 	plugin_class->deactivate = devhelp_deactivate;
-#if 0
+	
 	klass->finalize = devhelp_finalize;
 	klass->dispose = devhelp_dispose;
-#endif
 }
 
 #ifndef DISABLE_EMBEDDED_DEVHELP
@@ -515,7 +509,7 @@ ihelp_search (IAnjutaHelp *help, const g
 	anjuta_shell_present_widget (ANJUTA_PLUGIN (plugin)->shell,
 								 plugin->control_notebook, NULL);
 	
-	dh_search_set_search_string (DH_SEARCH (plugin->search), query);
+	dh_search_set_search_string (DH_SEARCH (plugin->search), query, NULL);
 	gtk_notebook_set_current_page (GTK_NOTEBOOK (plugin->control_notebook), 1);
 }
 
@@ -524,34 +518,33 @@ ihelp_search (IAnjutaHelp *help, const g
 static void
 ihelp_search (IAnjutaHelp *help, const gchar *query, GError **err)
 {
-	AnjutaDevhelp *plugin;
-	
-	plugin = ANJUTA_PLUGIN_DEVHELP (help);
+	gchar *cmd[4];
 	
 	if (!anjuta_util_prog_is_installed ("devhelp", TRUE))
 	{
 		return;
 	}
 	
-	if(query && strlen (query) > 0)
+	cmd[0] = "devhelp";
+	
+	if (query && strlen (query) > 0)
 	{
-		fprintf(stderr, "Word is %s\n", query);
-		if(fork()==0)
-		{
-			execlp("devhelp", "devhelp", "-s", query, NULL);
-			g_warning (_("Cannot execute command: \"%s\""), "devhelp");
-			_exit(1);
-		}
+		cmd[1] = "-s";
+		cmd[2] = (gchar *)query;
+		cmd[3] = NULL;	
 	}
 	else
 	{
-		if(fork()==0)
-		{
-			execlp("devhelp", "devhelp", NULL);
-			g_warning (_("Cannot execute command: \"%s\""), "devhelp");
-			_exit(1);
-		}
+		cmd[1] = NULL;
 	}
+	
+	gdk_spawn_on_screen (gdk_screen_get_default (),
+					     NULL,
+					     cmd,
+					     NULL,
+					     G_SPAWN_SEARCH_PATH,
+					     NULL,
+					     NULL, NULL, NULL);
 }
 
 #endif /* DISABLE_EMBEDDED_DEVHELP */
diff -urNp anjuta-2.24.1.orig/plugins/devhelp/plugin.h anjuta-2.24.1/plugins/devhelp/plugin.h
--- anjuta-2.24.1.orig/plugins/devhelp/plugin.h	2009-01-03 02:03:23.000000000 +0530
+++ anjuta-2.24.1/plugins/devhelp/plugin.h	2009-01-03 02:17:42.000000000 +0530
@@ -49,10 +49,12 @@ struct _AnjutaDevhelp{
 #ifndef DISABLE_EMBEDDED_DEVHELP
 	DhBase         *base;
 #endif /* DISABLE_EMBEDDED_DEVHELP */
-	GtkWidget     *htmlview;    
+	GtkWidget      *view;    
 	GtkWidget      *control_notebook; 
 	GtkWidget      *book_tree;
 	GtkWidget      *search;
+    GtkWidget      *go_back;
+    GtkWidget      *go_forward;
 	
 	IAnjutaEditor	*editor;
 	guint editor_watch_id;


Index: anjuta.spec
===================================================================
RCS file: /cvs/pkgs/rpms/anjuta/F-10/anjuta.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- anjuta.spec	9 Nov 2008 19:19:17 -0000	1.54
+++ anjuta.spec	2 Jan 2009 22:40:24 -0000	1.55
@@ -2,12 +2,15 @@
 Name:		anjuta
 Epoch:		1
 Version:	2.24.1
-Release:	2%{?dist}
+Release:	3%{?dist}
 License:	GPLv2+
 Group:		Development/Tools
 URL:		http://www.anjuta.org/
 Source0:	http://ftp.gnome.org/pub/GNOME/sources/anjuta/2.24/%{name}-%{version}.tar.gz
 
+# http://bugzilla.gnome.org/560311
+Patch0:		%{name}-%{version}-webkit.patch
+
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 Requires:	GConf2
@@ -26,7 +29,7 @@
 BuildRequires:	autogen
 BuildRequires:	binutils-devel
 BuildRequires:	desktop-file-utils
-BuildRequires:	devhelp-devel
+BuildRequires:	devhelp-devel >= 0.22
 BuildRequires:	e2fsprogs-devel
 BuildRequires:	gettext
 BuildRequires:	glade3-libgladeui-devel
@@ -84,6 +87,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 
 # Suppress rpmlint error.
 chmod 644 `find . -name "*.cxx" -perm /111 -print`
@@ -273,6 +277,11 @@
 %{_datadir}/omf/%{name}-manual/%{name}-manual-*.omf
 
 %changelog
+* Sat Jan 03 2009 Debarshi Ray <rishi at fedoraproject.org> - 1:2.24.1-3
+- Added patch against the Devhelp plugin from GNOME to make it work with the
+  new WebKit-based Devhelp >= 0.22. Closes GNOME Bugzilla bug #560311, and Red
+  Hat Bugzilla bug #478578.
+
 * Sun Nov 09 2008 Debarshi Ray <rishi at fedoraproject.org> - 1:2.24.1-2
 - Added 'Requires: libglade2 >= 2.6.3-2' and a symlink to libanjuta.so.0 for
   some plugins to work. Closes Red Hat Bugzilla bug #467894.



From rishi at fedoraproject.org  Fri Jan  2 22:42:54 2009
From: rishi at fedoraproject.org (Debarshi Ray)
Date: Fri,  2 Jan 2009 22:42:54 +0000 (UTC)
Subject: rpms/anjuta/devel anjuta-2.24.1-webkit.patch, NONE, 1.1 anjuta.spec,
	1.54, 1.55
Message-ID: <20090102224254.5C93D70130@cvs1.fedora.phx.redhat.com>

Author: rishi

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

Modified Files:
	anjuta.spec 
Added Files:
	anjuta-2.24.1-webkit.patch 
Log Message:
* Sat Jan 03 2009 Debarshi Ray <rishi at fedoraproject.org> - 1:2.24.1-3
- Added patch against the Devhelp plugin from GNOME to make it work with the
  new WebKit-based Devhelp >= 0.22. Closes GNOME Bugzilla bug #560311, and Red
  Hat Bugzilla bug #478578.


anjuta-2.24.1-webkit.patch:

--- NEW FILE anjuta-2.24.1-webkit.patch ---
diff -urNp anjuta-2.24.1.orig/configure anjuta-2.24.1/configure
--- anjuta-2.24.1.orig/configure	2009-01-03 02:03:23.000000000 +0530
+++ anjuta-2.24.1/configure	2009-01-03 03:28:07.000000000 +0530
@@ -2395,7 +2395,7 @@ VTE_REQUIRED=0.9.0
 VTE_NEW_REQUIRED=0.13.1
 LIBXML_REQUIRED=2.4.23
 PANGO_REQUIRED=1.1.1
-LIBDEVHELP_REQUIRED=0.13
+LIBDEVHELP_REQUIRED=0.22
 GDL_REQUIRED=0.7.3
 GNOMEBUILD_REQUIRED=0.3.0
 GLADEUI_REQUIRED=3.2.0
@@ -18753,12 +18753,12 @@ if test -n "$PKG_CONFIG"; then
         pkg_cv_PLUGIN_DEVHELP_CFLAGS="$PLUGIN_DEVHELP_CFLAGS"
     else
         if test -n "$PKG_CONFIG" && \
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libdevhelp-1.0 >= \$LIBDEVHELP_REQUIRED\"") >&5
-  ($PKG_CONFIG --exists --print-errors "libdevhelp-1.0 >= $LIBDEVHELP_REQUIRED") 2>&5
+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libdevhelp-1.0 >= \$LIBDEVHELP_REQUIRED webkit-1.0\"") >&5
+  ($PKG_CONFIG --exists --print-errors "libdevhelp-1.0 >= $LIBDEVHELP_REQUIRED webkit-1.0") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
-  pkg_cv_PLUGIN_DEVHELP_CFLAGS=`$PKG_CONFIG --cflags "libdevhelp-1.0 >= $LIBDEVHELP_REQUIRED" 2>/dev/null`
+  pkg_cv_PLUGIN_DEVHELP_CFLAGS=`$PKG_CONFIG --cflags "libdevhelp-1.0 >= $LIBDEVHELP_REQUIRED webkit-1.0" 2>/dev/null`
 else
   pkg_failed=yes
 fi
@@ -18771,12 +18771,12 @@ if test -n "$PKG_CONFIG"; then
         pkg_cv_PLUGIN_DEVHELP_LIBS="$PLUGIN_DEVHELP_LIBS"
     else
         if test -n "$PKG_CONFIG" && \
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libdevhelp-1.0 >= \$LIBDEVHELP_REQUIRED\"") >&5
-  ($PKG_CONFIG --exists --print-errors "libdevhelp-1.0 >= $LIBDEVHELP_REQUIRED") 2>&5
+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libdevhelp-1.0 >= \$LIBDEVHELP_REQUIRED webkit-1.0\"") >&5
+  ($PKG_CONFIG --exists --print-errors "libdevhelp-1.0 >= $LIBDEVHELP_REQUIRED webkit-1.0") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
-  pkg_cv_PLUGIN_DEVHELP_LIBS=`$PKG_CONFIG --libs "libdevhelp-1.0 >= $LIBDEVHELP_REQUIRED" 2>/dev/null`
+  pkg_cv_PLUGIN_DEVHELP_LIBS=`$PKG_CONFIG --libs "libdevhelp-1.0 >= $LIBDEVHELP_REQUIRED webkit-1.0" 2>/dev/null`
 else
   pkg_failed=yes
 fi
@@ -18795,9 +18795,9 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        PLUGIN_DEVHELP_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libdevhelp-1.0 >= $LIBDEVHELP_REQUIRED"`
+	        PLUGIN_DEVHELP_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libdevhelp-1.0 >= $LIBDEVHELP_REQUIRED webkit-1.0"`
         else
-	        PLUGIN_DEVHELP_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libdevhelp-1.0 >= $LIBDEVHELP_REQUIRED"`
+	        PLUGIN_DEVHELP_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libdevhelp-1.0 >= $LIBDEVHELP_REQUIRED webkit-1.0"`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$PLUGIN_DEVHELP_PKG_ERRORS" >&5
diff -urNp anjuta-2.24.1.orig/plugins/devhelp/anjuta-devhelp.ui anjuta-2.24.1/plugins/devhelp/anjuta-devhelp.ui
--- anjuta-2.24.1.orig/plugins/devhelp/anjuta-devhelp.ui	2009-01-03 02:03:23.000000000 +0530
+++ anjuta-2.24.1/plugins/devhelp/anjuta-devhelp.ui	2009-01-03 02:33:24.000000000 +0530
@@ -1,14 +1,6 @@
 <!--*- xml -*-->
 <ui>
 	<menubar name="MenuMain">
-		<menu name="MenuView" action="ActionMenuView">
-			<menu name="Goto" action="ActionMenuGoto">
-				<placeholder name="PlaceholderGotoMenus">
-					<menuitem name="BackHelp" action="ActionDevhelpBack" />
-					<menuitem name="ForwardHelp" action="ActionDevhelpForward" />
-				</placeholder>
-			</menu>
-		</menu>
 		<placeholder name="PlaceHolderHelpMenus" >
 			<menu name="MenuHelp" action="ActionMenuHelp" >
 				<placeholder name="PlaceHolderHelpDevel" >
@@ -24,7 +16,5 @@
 	</toolbar>
 	<toolbar name="ToolbarBrowser">		
 		<toolitem name="Context" action="ActionHelpContext" />
-		<toolitem name="BackHelp" action="ActionDevhelpBack" />
-		<toolitem name="ForwardHelp" action="ActionDevhelpForward" />
 	</toolbar>
 </ui>
diff -urNp anjuta-2.24.1.orig/plugins/devhelp/htmlview.c anjuta-2.24.1/plugins/devhelp/htmlview.c
--- anjuta-2.24.1.orig/plugins/devhelp/htmlview.c	2009-01-03 02:03:23.000000000 +0530
+++ anjuta-2.24.1/plugins/devhelp/htmlview.c	1970-01-01 05:30:00.000000000 +0530
@@ -1,182 +0,0 @@
-/*
- *  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 Library 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.
- */
-
-#include "htmlview.h"
-
-#include <devhelp/dh-book-tree.h>
-#include <devhelp/dh-html.h>
-#include <devhelp/dh-preferences.h>
-#include <devhelp/dh-search.h>
-#include <devhelp/dh-base.h>
-
-static void html_view_class_init(HtmlViewClass *klass);
-static void html_view_init(HtmlView *sp);
-static void html_view_finalize(GObject *object);
-
-struct _HtmlViewPrivate {
-	DhHtml* html;
-	AnjutaDevhelp* devhelp;
-	gchar* uri;
-	guint idle_realize;
-};
-
-G_DEFINE_TYPE(HtmlView, html_view, GTK_TYPE_HBOX)
-
-static gboolean
-devhelp_html_open_uri_cb (DhHtml      *html,
-			 const gchar *uri,
-			 AnjutaDevhelp    *widget)
-{
-#ifdef HAVE_OLD_DEVHELP
-	dh_book_tree_show_uri (DH_BOOK_TREE (widget->book_tree), uri);
-#else
-	dh_book_tree_select_uri (DH_BOOK_TREE (widget->book_tree), uri);
-#endif
-	return FALSE;
-}
-
-static void
-devhelp_html_location_changed_cb (DhHtml      *html,
-				 const gchar *location,
-				 AnjutaDevhelp    *widget)
-{	
-	anjuta_devhelp_check_history (widget);
-}
-
-static gboolean
-html_view_create_html(HtmlView* html_view)
-{
-	GtkWidget* view;
-	HtmlViewPrivate* priv = html_view->priv;
-
-	priv->html = dh_html_new();
-	
-	if (!priv->html || !DH_IS_HTML(priv->html))	
-		return TRUE; /* I think the idea is to wait until we get a widget? */
-	
-	view = dh_html_get_widget(priv->html);
-	gtk_box_pack_start(GTK_BOX(html_view), dh_html_get_widget(priv->html), TRUE, TRUE, 1);
-	
-	g_signal_connect (priv->html, "open-uri",
-			  G_CALLBACK (devhelp_html_open_uri_cb),
-			  priv->devhelp);
-	g_signal_connect (priv->html, "location-changed",
-			  G_CALLBACK (devhelp_html_location_changed_cb),
-			  priv->devhelp);
-	
-	/* Hack to get GtkMozEmbed to work properly. */
-	gtk_widget_realize (view);
-
-	if (priv->uri)
-		dh_html_open_uri(priv->html, priv->uri);
-	else
-		dh_html_clear(priv->html);
-	
-	gtk_widget_show (view);
-	
-	return FALSE;
-}
-
-static void
-html_view_realize(GtkWidget* widget)
-{
-	HtmlView* html_view = HTML_VIEW(widget);
-	
-	if (html_view->priv->idle_realize == 0)
-	{
-		html_view->priv->idle_realize =
-			g_idle_add((GSourceFunc) html_view_create_html, html_view);
-	}	
-	(* GTK_WIDGET_CLASS (html_view_parent_class)->realize)(widget);
-}
-
-static void
-html_view_unrealize(GtkWidget* widget)
-{
-	HtmlView* html_view = HTML_VIEW(widget);
-	
-	if (html_view->priv->idle_realize > 0)
-	{
-		g_source_remove (html_view->priv->idle_realize);
-		html_view->priv->idle_realize = 0;
-	}
-	
-	if (html_view->priv->html != NULL)
-	{
-		g_free(html_view->priv->uri);
-		html_view->priv->uri = dh_html_get_location(html_view->priv->html);
-	}
-	else
-		html_view->priv->uri = NULL;
-	
-	if (gtk_container_get_children(GTK_CONTAINER(html_view)))
-	{
-		gtk_container_remove(GTK_CONTAINER(widget), dh_html_get_widget(html_view->priv->html));
-		html_view->priv->html = NULL;
-	}
-
-	(* GTK_WIDGET_CLASS (html_view_parent_class)->unrealize)(widget);
-}
-
-static void
-html_view_class_init(HtmlViewClass *klass)
-{
-	GObjectClass *object_class = G_OBJECT_CLASS(klass);
-	GtkWidgetClass* widget_class = GTK_WIDGET_CLASS(klass);
-
-	object_class->finalize = html_view_finalize;
-	
-	widget_class->realize = html_view_realize;
-	widget_class->unrealize = html_view_unrealize;
-}
-
-static void
-html_view_init(HtmlView *obj)
-{
-	obj->priv = g_new0(HtmlViewPrivate, 1);
-	gtk_widget_show(GTK_WIDGET(obj));
-}
-
-static void
-html_view_finalize(GObject *object)
-{
-	HtmlView *cobj;
-	cobj = HTML_VIEW(object);
-	
-	/* Free private members, etc. */
-	if (cobj->priv->html)
-		gtk_widget_destroy(dh_html_get_widget(cobj->priv->html));
-	g_free (cobj->priv->uri);	
-	g_free(cobj->priv);
-	G_OBJECT_CLASS(html_view_parent_class)->finalize(object);
-}
-
-GtkWidget*
-html_view_new(AnjutaDevhelp* devhelp)
-{
-	HtmlView *obj;
-	
-	obj = HTML_VIEW(g_object_new(HTML_TYPE_VIEW, NULL));
-	
-	obj->priv->devhelp = devhelp;
-	
-	return GTK_WIDGET(obj);
-}
-
-DhHtml* html_view_get_dh_html(HtmlView* view)
-{
-	return view->priv->html;
-}
diff -urNp anjuta-2.24.1.orig/plugins/devhelp/htmlview.h anjuta-2.24.1/plugins/devhelp/htmlview.h
--- anjuta-2.24.1.orig/plugins/devhelp/htmlview.h	2009-01-03 02:03:23.000000000 +0530
+++ anjuta-2.24.1/plugins/devhelp/htmlview.h	1970-01-01 05:30:00.000000000 +0530
@@ -1,57 +0,0 @@
-/*
- *  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 Library 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 HTMLVIEW_H
-#define HTMLVIEW_H
-
-#include <glib.h>
-#include <glib-object.h>
-#include <gtk/gtk.h>
-
-#include <devhelp/dh-html.h>
-
-#include "plugin.h"
-
-G_BEGIN_DECLS
-
-#define HTML_TYPE_VIEW         (html_view_get_type ())
-#define HTML_VIEW(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), HTML_TYPE_VIEW, HtmlView))
-#define HTML_VIEW_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), HTML_TYPE_VIEW, HtmlViewClass))
-#define HTML_IS_VIEW(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), HTML_TYPE_VIEW))
-#define HTML_IS_VIEW_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), HTML_TYPE_VIEW))
-#define HTML_VIEW_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), HTML_TYPE_VIEW, HtmlViewClass))
-
-typedef struct _HtmlView HtmlView;
-typedef struct _HtmlViewPrivate HtmlViewPrivate;
-typedef struct _HtmlViewClass HtmlViewClass;
-
-struct _HtmlView {
-	GtkHBox parent;
-	HtmlViewPrivate *priv;
-};
-
-struct _HtmlViewClass {
-	GtkHBoxClass parent_class;
-};
-
-GType html_view_get_type(void);
-GtkWidget *html_view_new(AnjutaDevhelp* devhelp);
-
-DhHtml* html_view_get_dh_html(HtmlView* html_view);
-
-G_END_DECLS
-
-#endif /* HTMLVIEW_H */
diff -urNp anjuta-2.24.1.orig/plugins/devhelp/Makefile.in anjuta-2.24.1/plugins/devhelp/Makefile.in
--- anjuta-2.24.1.orig/plugins/devhelp/Makefile.in	2009-01-03 02:03:23.000000000 +0530
+++ anjuta-2.24.1/plugins/devhelp/Makefile.in	2009-01-03 03:46:06.000000000 +0530
@@ -37,11 +37,7 @@ build_triplet = @build@
 host_triplet = @host@
 @HAVE_PLUGIN_DEVHELP_TRUE at am__append_1 = $(PLUGIN_DEVHELP_CFLAGS)
 @HAVE_PLUGIN_DEVHELP_FALSE at am__append_2 = -DDISABLE_EMBEDDED_DEVHELP
- at HAVE_PLUGIN_DEVHELP_TRUE@am__append_3 = \
- at HAVE_PLUGIN_DEVHELP_TRUE@	htmlview.c \
- at HAVE_PLUGIN_DEVHELP_TRUE@	htmlview.h
-
- at HAVE_PLUGIN_DEVHELP_TRUE@am__append_4 = $(PLUGIN_DEVHELP_LIBS)
+ at HAVE_PLUGIN_DEVHELP_TRUE@am__append_3 = $(PLUGIN_DEVHELP_LIBS)
 subdir = plugins/devhelp
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -67,10 +63,7 @@ am__DEPENDENCIES_1 =
 @HAVE_PLUGIN_DEVHELP_TRUE at am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1)
 libanjuta_devhelp_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2)
-am__libanjuta_devhelp_la_SOURCES_DIST = plugin.c plugin.h htmlview.c \
-	htmlview.h
- at HAVE_PLUGIN_DEVHELP_TRUE@am__objects_1 = htmlview.lo
-am_libanjuta_devhelp_la_OBJECTS = plugin.lo $(am__objects_1)
+am_libanjuta_devhelp_la_OBJECTS = plugin.lo
 libanjuta_devhelp_la_OBJECTS = $(am_libanjuta_devhelp_la_OBJECTS)
 libanjuta_devhelp_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
@@ -88,7 +81,7 @@ LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLF
 	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
 	$(LDFLAGS) -o $@
 SOURCES = $(libanjuta_devhelp_la_SOURCES)
-DIST_SOURCES = $(am__libanjuta_devhelp_la_SOURCES_DIST)
+DIST_SOURCES = $(libanjuta_devhelp_la_SOURCES)
 devhelp_pixmapsDATA_INSTALL = $(INSTALL_DATA)
 devhelp_pluginDATA_INSTALL = $(INSTALL_DATA)
 devhelp_uiDATA_INSTALL = $(INSTALL_DATA)
@@ -389,6 +382,7 @@ sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 
@@ -424,11 +418,14 @@ plugin_LTLIBRARIES = libanjuta-devhelp.l
 libanjuta_devhelp_la_LDFLAGS = $(ANJUTA_PLUGIN_LDFLAGS)
 
 # Plugin sources
-libanjuta_devhelp_la_SOURCES = plugin.c plugin.h $(am__append_3)
+libanjuta_devhelp_la_SOURCES = \
+	plugin.c \
+	plugin.h
+
 
 # Plugin dependencies
 libanjuta_devhelp_la_LIBADD = $(GTK_LIBS) $(LIBANJUTA_LIBS) \
-	$(am__append_4)
+	$(am__append_3)
 EXTRA_DIST = \
 	$(plugin_in_files) \
 	$(devhelp_plugin_DATA) \
@@ -504,7 +501,6 @@ mostlyclean-compile:
 distclean-compile:
 	-rm -f *.tab.c
 
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/htmlview.Plo at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/plugin.Plo at am__quote@
 
 .c.o:
diff -urNp anjuta-2.24.1.orig/plugins/devhelp/plugin.c anjuta-2.24.1/plugins/devhelp/plugin.c
--- anjuta-2.24.1.orig/plugins/devhelp/plugin.c	2009-01-03 02:03:23.000000000 +0530
+++ anjuta-2.24.1/plugins/devhelp/plugin.c	2009-01-03 02:09:10.000000000 +0530
@@ -34,11 +34,9 @@
 #ifndef DISABLE_EMBEDDED_DEVHELP
 
 #include <devhelp/dh-book-tree.h>
-#include <devhelp/dh-html.h>
-#include <devhelp/dh-preferences.h>
 #include <devhelp/dh-search.h>
 #include <devhelp/dh-base.h>
-#include "htmlview.h"
+#include <webkit/webkit.h>
 #define UI_FILE PACKAGE_DATA_DIR"/ui/anjuta-devhelp.ui"
 
 #else /* DISABLE_EMBEDDED_DEVHELP */
@@ -51,12 +49,8 @@ static gpointer parent_class;
 
 #ifndef DISABLE_EMBEDDED_DEVHELP
 
-#define ANJUTA_PIXMAP_HELP_NEXT "anjuta-go-help-next-24.png"
-#define ANJUTA_PIXMAP_HELP_PREV "anjuta-go-help-prev-24.png"
 #define ANJUTA_PIXMAP_DEVHELP "anjuta-devhelp-plugin-48.png"
 
-#define ANJUTA_STOCK_HELP_NEXT "anjuta-help-next"
-#define ANJUTA_STOCK_HELP_PREV "anjuta-help-prev"
 #define ANJUTA_STOCK_DEVHELP "anjuta-devhelp"
 
 static void
@@ -74,76 +68,55 @@ register_stock_icons (AnjutaPlugin *plug
 	/* Register stock icons */
 	ui = anjuta_shell_get_ui (plugin->shell, NULL);
 	icon_factory = anjuta_ui_get_icon_factory (ui);
-	REGISTER_ICON (ANJUTA_PIXMAP_HELP_NEXT, ANJUTA_STOCK_HELP_NEXT);
-	REGISTER_ICON (ANJUTA_PIXMAP_HELP_PREV, ANJUTA_STOCK_HELP_PREV);
 	REGISTER_ICON (ANJUTA_PIXMAP_DEVHELP, ANJUTA_STOCK_DEVHELP);
 }
 
 static void
-devhelp_tree_link_selected_cb (GObject       *ignored,
-			      DhLink        *link,
-			      AnjutaDevhelp *widget)
+devhelp_tree_link_selected_cb (GObject       *ignored, DhLink *link,
+							   AnjutaDevhelp *widget)
 {
+	gchar *uri;
 	
-	DhHtml       *html;
+	/*anjuta_shell_present_widget (ANJUTA_PLUGIN (widget)->shell,
+								 widget->view, NULL);*/
 
-	anjuta_shell_present_widget (ANJUTA_PLUGIN (widget)->shell,
-								 widget->htmlview, NULL);
-
-	html = html_view_get_dh_html(HTML_VIEW(widget->htmlview));
-	
-	if (!DH_IS_HTML(html))
-		return;
+	uri = dh_link_get_uri (link);
+	webkit_web_view_open (WEBKIT_WEB_VIEW (widget->view), uri);
+	g_free (uri);
 	
-	dh_html_open_uri (html, link->uri);
-
 	anjuta_devhelp_check_history (widget);
 }
 
 static void
-devhelp_search_link_selected_cb (GObject  *ignored,
-				DhLink   *link,
-				 AnjutaDevhelp *widget)
+devhelp_search_link_selected_cb (GObject  *ignored, DhLink *link,
+								 AnjutaDevhelp *widget)
 {
-	DhHtml       *html;
-
-	anjuta_shell_present_widget (ANJUTA_PLUGIN (widget)->shell,
-								 widget->htmlview, NULL);
-
-	html = html_view_get_dh_html(HTML_VIEW(widget->htmlview));
-
-	if (!DH_IS_HTML(html))
-		return;
-
-	dh_html_open_uri (html, link->uri);
+	gchar *uri;
+	
+	/*anjuta_shell_present_widget (ANJUTA_PLUGIN (widget)->shell,
+								 widget->view, NULL);*/
 
+	uri = dh_link_get_uri (link);
+	webkit_web_view_open (WEBKIT_WEB_VIEW (widget->view), uri);
+	g_free (uri);
+	
 	anjuta_devhelp_check_history (widget);
 }
 
 static void
-on_go_back_activate (GtkAction *action, AnjutaDevhelp *plugin)
+on_go_back_clicked (GtkWidget *widget, AnjutaDevhelp *plugin)
 {
-	DhHtml* html;
-
-	html = html_view_get_dh_html(HTML_VIEW(plugin->htmlview));
+	webkit_web_view_go_back (WEBKIT_WEB_VIEW (plugin->view));
 	
-	if (!DH_IS_HTML(html))
-		return;
-		
-	dh_html_go_back(html);
+	anjuta_devhelp_check_history (plugin);
 }
 
 static void
-on_go_forward_activate (GtkAction *action, AnjutaDevhelp *plugin)
+on_go_forward_clicked (GtkWidget *widget, AnjutaDevhelp *plugin)
 {
-	DhHtml* html;
-
-	html = html_view_get_dh_html(HTML_VIEW(plugin->htmlview));
+	webkit_web_view_go_forward (WEBKIT_WEB_VIEW (plugin->view));
 	
-	if (!DH_IS_HTML(html))
-		return;
-	
-	dh_html_go_forward(html);
+	anjuta_devhelp_check_history (plugin);
 }
 
 static gboolean
@@ -173,7 +146,7 @@ on_api_reference_activate (GtkAction *ac
 }
 
 static gboolean
-context_idle(AnjutaDevhelp* plugin)
+context_idle (AnjutaDevhelp* plugin)
 {
 	IAnjutaEditor *editor;
 	gchar *current_word;
@@ -232,22 +205,6 @@ static GtkActionEntry actions[] = {
 		NULL,
 		NULL
 	},
-	{
-		"ActionDevhelpBack",
-		ANJUTA_STOCK_HELP_PREV,
-		N_("Previous Help"),
-		NULL,
-		N_("Go to previous help page"),
-		G_CALLBACK (on_go_back_activate)
-	},
-	{
-		"ActionDevhelpForward",
-		ANJUTA_STOCK_HELP_NEXT,
-		N_("Next Help"),
-		NULL,
-		N_("Go to next help page"),
-		G_CALLBACK (on_go_forward_activate)
-	},
 #endif /* DISABLE_EMBEDDED_DEVHELP */
 	{
 		"ActionHelpApi",
@@ -282,7 +239,7 @@ static GtkActionEntry actions[] = {
 /* Watches callbacks */
 
 static void
-value_added_current_editor (AnjutaPlugin *plugin, const char *name,
+value_added_current_editor (AnjutaPlugin *plugin, const gchar *name,
 							const GValue *value, gpointer data)
 {
 	GtkAction *action;
@@ -300,7 +257,7 @@ value_added_current_editor (AnjutaPlugin
 
 static void
 value_removed_current_editor (AnjutaPlugin *plugin,
-							  const char *name, gpointer data)
+							  const gchar *name, gpointer data)
 {
 	GtkAction *action;
 	AnjutaDevhelp* devhelp = ANJUTA_PLUGIN_DEVHELP (data);	
@@ -314,7 +271,6 @@ value_removed_current_editor (AnjutaPlug
 static gboolean
 devhelp_activate (AnjutaPlugin *plugin)
 {
-
 	AnjutaUI *ui;
 	AnjutaDevhelp *devhelp;
 
@@ -323,12 +279,15 @@ devhelp_activate (AnjutaPlugin *plugin)
 	GNode *books;
 	GList *keywords;
 	GtkWidget* books_sw;
+	GtkWidget *scrolled_window;
+	GtkWidget *main_vbox;
+	GtkWidget *button_hbox;
 	
 	if (!init)
 	{
 		register_stock_icons (plugin);
 		init = TRUE;
-	}	
+	}
 #endif
 
 	DEBUG_PRINT ("AnjutaDevhelp: Activating AnjutaDevhelp plugin ...");
@@ -346,47 +305,89 @@ devhelp_activate (AnjutaPlugin *plugin)
 	devhelp->uiid = anjuta_ui_merge (ui, UI_FILE);
 
 #ifndef DISABLE_EMBEDDED_DEVHELP
-
+	/*
+	 * Forward/back buttons
+	 */
+	main_vbox = gtk_vbox_new (FALSE, 6);
+	gtk_widget_show (main_vbox);
+	button_hbox = gtk_hbox_new (FALSE, 0);
+	gtk_widget_show (button_hbox);
+	
+	devhelp->go_back = gtk_button_new_from_stock (GTK_STOCK_GO_BACK);
+	gtk_widget_show (devhelp->go_back);
+	gtk_box_pack_start (GTK_BOX (button_hbox), devhelp->go_back, FALSE, FALSE, 0);
+	gtk_widget_set_sensitive (devhelp->go_back, FALSE);
+	g_signal_connect (devhelp->go_back, "clicked",
+			  G_CALLBACK (on_go_back_clicked), devhelp);
+	
+	devhelp->go_forward = gtk_button_new_from_stock (GTK_STOCK_GO_FORWARD);
+	gtk_widget_show (devhelp->go_forward);
+	gtk_box_pack_start (GTK_BOX (button_hbox), devhelp->go_forward, FALSE, FALSE, 0);
+	gtk_widget_set_sensitive (devhelp->go_forward, FALSE);
+	g_signal_connect (devhelp->go_forward, "clicked",
+			  G_CALLBACK (on_go_forward_clicked), devhelp);
+	
+	gtk_box_pack_start (GTK_BOX (main_vbox), button_hbox, FALSE, FALSE, 0);
+	
+	/*
+	 * Notebook
+	 */
 	books = dh_base_get_book_tree (devhelp->base);
 	keywords = dh_base_get_keywords (devhelp->base);
 	
-	books_sw = gtk_scrolled_window_new(NULL, NULL);
+	books_sw = gtk_scrolled_window_new (NULL, NULL);
 	gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (books_sw),
-					GTK_POLICY_NEVER,
-					GTK_POLICY_AUTOMATIC);
+									GTK_POLICY_NEVER,
+									GTK_POLICY_AUTOMATIC);
 	gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (books_sw),
-					     GTK_SHADOW_IN);
+									     GTK_SHADOW_IN);
 	gtk_container_set_border_width (GTK_CONTAINER (books_sw), 2);
 	
-	devhelp->control_notebook = gtk_notebook_new();
-	devhelp->book_tree = dh_book_tree_new(books);
-	devhelp->search = dh_search_new(keywords);
+	devhelp->control_notebook = gtk_notebook_new ();
+	gtk_box_pack_start (GTK_BOX (main_vbox), devhelp->control_notebook, TRUE, TRUE, 0);
+	devhelp->book_tree = dh_book_tree_new (books);
+	
+	devhelp->search = dh_search_new (keywords);
+	gtk_widget_set_size_request (devhelp->search, 0, 0);
 	
 	g_signal_connect (devhelp->book_tree,
-			  "link-selected",
-			  G_CALLBACK (devhelp_tree_link_selected_cb),
-			  devhelp);
+					  "link-selected",
+					  G_CALLBACK (devhelp_tree_link_selected_cb),
+					  devhelp);
 	g_signal_connect (devhelp->search,
-			  "link-selected",
-			  G_CALLBACK (devhelp_search_link_selected_cb),
-			  devhelp);
-	
-	gtk_container_add(GTK_CONTAINER(books_sw), devhelp->book_tree);
-	gtk_notebook_append_page(GTK_NOTEBOOK(devhelp->control_notebook), books_sw,
-		gtk_label_new(_("Books")));
-	gtk_notebook_append_page(GTK_NOTEBOOK(devhelp->control_notebook), devhelp->search,
-		gtk_label_new(_("Search")));
-	
-	devhelp->htmlview = html_view_new(devhelp);	
-
-	anjuta_shell_add_widget (plugin->shell, devhelp->control_notebook,
-								 "AnjutaDevhelpIndex", _("Help"), ANJUTA_STOCK_DEVHELP,
-								 ANJUTA_SHELL_PLACEMENT_LEFT, NULL);
+					  "link-selected",
+					  G_CALLBACK (devhelp_search_link_selected_cb),
+					  devhelp);
+	
+	gtk_container_add (GTK_CONTAINER (books_sw), devhelp->book_tree);
+	gtk_notebook_append_page (GTK_NOTEBOOK (devhelp->control_notebook), books_sw,
+							 gtk_label_new (_("Contents")));
+	gtk_notebook_append_page (GTK_NOTEBOOK (devhelp->control_notebook), devhelp->search,
+							  gtk_label_new (_("Search")));
+	
+	gtk_widget_show_all (devhelp->control_notebook);
+	
+	/* View */
+	devhelp->view = webkit_web_view_new ();
+	gtk_widget_show (devhelp->view);
+	
+	webkit_web_view_open (WEBKIT_WEB_VIEW (devhelp->view), "about:blank");
+	
+	scrolled_window = gtk_scrolled_window_new (NULL, NULL);
+	gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window),
+									GTK_POLICY_AUTOMATIC,
+									GTK_POLICY_AUTOMATIC);
+	gtk_widget_show (scrolled_window);
+	gtk_container_add (GTK_CONTAINER (scrolled_window), devhelp->view);
+
+	anjuta_shell_add_widget (plugin->shell, main_vbox,
+							 "AnjutaDevhelpIndex", _("Help"), ANJUTA_STOCK_DEVHELP,
+							 ANJUTA_SHELL_PLACEMENT_LEFT, NULL);
 	/* This is the window that show the html help text */
-	anjuta_shell_add_widget (plugin->shell, devhelp->htmlview,
-								 "AnjutaDevhelpDisplay", _("Help display"),
-								 ANJUTA_STOCK_DEVHELP,
-								 ANJUTA_SHELL_PLACEMENT_CENTER, NULL);
+	anjuta_shell_add_widget (plugin->shell, scrolled_window,
+							 "AnjutaDevhelpDisplay", _("Help display"),
+							 ANJUTA_STOCK_DEVHELP,
+							 ANJUTA_SHELL_PLACEMENT_CENTER, NULL);
 								 
 #endif /* DISABLE_EMBEDDED_DEVHELP */
 
@@ -415,7 +416,7 @@ devhelp_deactivate (AnjutaPlugin *plugin
 #ifndef DISABLE_EMBEDDED_DEVHELP
 
 	/* Remove widgets */
-	anjuta_shell_remove_widget(plugin->shell, devhelp->htmlview, NULL);
+	anjuta_shell_remove_widget(plugin->shell, devhelp->view, NULL);
 	anjuta_shell_remove_widget(plugin->shell, devhelp->control_notebook, NULL);	
 
 #endif /* DISABLE_EMBEDDED_DEVHELP */
@@ -431,32 +432,22 @@ devhelp_deactivate (AnjutaPlugin *plugin
 
 #ifndef DISABLE_EMBEDDED_DEVHELP
 
-void anjuta_devhelp_check_history(AnjutaDevhelp* devhelp)
+void
+anjuta_devhelp_check_history (AnjutaDevhelp* devhelp)
 {
-	GtkAction* action_forward;
-	GtkAction* action_back;
-	DhHtml* html = html_view_get_dh_html(HTML_VIEW(devhelp->htmlview));
-	
-	action_forward = gtk_action_group_get_action (devhelp->action_group,
-										  "ActionDevhelpForward");
-	action_back = gtk_action_group_get_action (devhelp->action_group,
-										  "ActionDevhelpBack");
-	if (html != NULL)
-	{
-		g_object_set (action_forward, "sensitive", dh_html_can_go_forward (html) , NULL);
-		g_object_set (action_back, "sensitive", dh_html_can_go_back (html) , NULL);
-	}
+	gtk_widget_set_sensitive (devhelp->go_forward, webkit_web_view_can_go_forward (WEBKIT_WEB_VIEW (devhelp->view)));
+
+	gtk_widget_set_sensitive (devhelp->go_back, webkit_web_view_can_go_back (WEBKIT_WEB_VIEW (devhelp->view)));
 }
 
 #endif /* DISABLE_EMBEDDED_DEVHELP */
 
-#if 0
 static void
 devhelp_finalize (GObject *obj)
 {
+	DEBUG_PRINT ("%s", "Finalising Devhelp plugin");
+
 	/* Finalization codes here */
-	AnjutaDevhelp *plugin = ANJUTA_PLUGIN_DEVHELP (obj);
-	
 	G_OBJECT_CLASS (parent_class)->finalize (obj);
 }
 
@@ -465,13 +456,17 @@ devhelp_dispose (GObject *obj)
 {
 	AnjutaDevhelp* devhelp = ANJUTA_PLUGIN_DEVHELP (obj);
 	
-	/* Destroy devhelp - seems not to work... */
-	// g_object_unref(G_OBJECT(devhelp->base));
+	DEBUG_PRINT ("%s", "Disposing Devhelp plugin");
+	
+	if (devhelp->base)
+	{
+		g_object_unref(G_OBJECT(devhelp->base));
+		devhelp->base = NULL;
+	}
 
 	/* Disposition codes */
 	G_OBJECT_CLASS (parent_class)->dispose (obj);
 }
-#endif
 
 static void
 devhelp_instance_init (GObject *obj)
@@ -497,10 +492,9 @@ devhelp_class_init (GObjectClass *klass)
 
 	plugin_class->activate = devhelp_activate;
 	plugin_class->deactivate = devhelp_deactivate;
-#if 0
+	
 	klass->finalize = devhelp_finalize;
 	klass->dispose = devhelp_dispose;
-#endif
 }
 
 #ifndef DISABLE_EMBEDDED_DEVHELP
@@ -515,7 +509,7 @@ ihelp_search (IAnjutaHelp *help, const g
 	anjuta_shell_present_widget (ANJUTA_PLUGIN (plugin)->shell,
 								 plugin->control_notebook, NULL);
 	
-	dh_search_set_search_string (DH_SEARCH (plugin->search), query);
+	dh_search_set_search_string (DH_SEARCH (plugin->search), query, NULL);
 	gtk_notebook_set_current_page (GTK_NOTEBOOK (plugin->control_notebook), 1);
 }
 
@@ -524,34 +518,33 @@ ihelp_search (IAnjutaHelp *help, const g
 static void
 ihelp_search (IAnjutaHelp *help, const gchar *query, GError **err)
 {
-	AnjutaDevhelp *plugin;
-	
-	plugin = ANJUTA_PLUGIN_DEVHELP (help);
+	gchar *cmd[4];
 	
 	if (!anjuta_util_prog_is_installed ("devhelp", TRUE))
 	{
 		return;
 	}
 	
-	if(query && strlen (query) > 0)
+	cmd[0] = "devhelp";
+	
+	if (query && strlen (query) > 0)
 	{
-		fprintf(stderr, "Word is %s\n", query);
-		if(fork()==0)
-		{
-			execlp("devhelp", "devhelp", "-s", query, NULL);
-			g_warning (_("Cannot execute command: \"%s\""), "devhelp");
-			_exit(1);
-		}
+		cmd[1] = "-s";
+		cmd[2] = (gchar *)query;
+		cmd[3] = NULL;	
 	}
 	else
 	{
-		if(fork()==0)
-		{
-			execlp("devhelp", "devhelp", NULL);
-			g_warning (_("Cannot execute command: \"%s\""), "devhelp");
-			_exit(1);
-		}
+		cmd[1] = NULL;
 	}
+	
+	gdk_spawn_on_screen (gdk_screen_get_default (),
+					     NULL,
+					     cmd,
+					     NULL,
+					     G_SPAWN_SEARCH_PATH,
+					     NULL,
+					     NULL, NULL, NULL);
 }
 
 #endif /* DISABLE_EMBEDDED_DEVHELP */
diff -urNp anjuta-2.24.1.orig/plugins/devhelp/plugin.h anjuta-2.24.1/plugins/devhelp/plugin.h
--- anjuta-2.24.1.orig/plugins/devhelp/plugin.h	2009-01-03 02:03:23.000000000 +0530
+++ anjuta-2.24.1/plugins/devhelp/plugin.h	2009-01-03 02:17:42.000000000 +0530
@@ -49,10 +49,12 @@ struct _AnjutaDevhelp{
 #ifndef DISABLE_EMBEDDED_DEVHELP
 	DhBase         *base;
 #endif /* DISABLE_EMBEDDED_DEVHELP */
-	GtkWidget     *htmlview;    
+	GtkWidget      *view;    
 	GtkWidget      *control_notebook; 
 	GtkWidget      *book_tree;
 	GtkWidget      *search;
+    GtkWidget      *go_back;
+    GtkWidget      *go_forward;
 	
 	IAnjutaEditor	*editor;
 	guint editor_watch_id;


Index: anjuta.spec
===================================================================
RCS file: /cvs/pkgs/rpms/anjuta/devel/anjuta.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- anjuta.spec	9 Nov 2008 19:22:19 -0000	1.54
+++ anjuta.spec	2 Jan 2009 22:42:24 -0000	1.55
@@ -2,12 +2,15 @@
 Name:		anjuta
 Epoch:		1
 Version:	2.24.1
-Release:	2%{?dist}
+Release:	3%{?dist}
 License:	GPLv2+
 Group:		Development/Tools
 URL:		http://www.anjuta.org/
 Source0:	http://ftp.gnome.org/pub/GNOME/sources/anjuta/2.24/%{name}-%{version}.tar.gz
 
+# http://bugzilla.gnome.org/560311
+Patch0:		%{name}-%{version}-webkit.patch
+
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 Requires:	GConf2
@@ -26,7 +29,7 @@
 BuildRequires:	autogen
 BuildRequires:	binutils-devel
 BuildRequires:	desktop-file-utils
-BuildRequires:	devhelp-devel
+BuildRequires:	devhelp-devel >= 0.22
 BuildRequires:	e2fsprogs-devel
 BuildRequires:	gettext
 BuildRequires:	glade3-libgladeui-devel
@@ -84,6 +87,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 
 # Suppress rpmlint error.
 chmod 644 `find . -name "*.cxx" -perm /111 -print`
@@ -273,6 +277,11 @@
 %{_datadir}/omf/%{name}-manual/%{name}-manual-*.omf
 
 %changelog
+* Sat Jan 03 2009 Debarshi Ray <rishi at fedoraproject.org> - 1:2.24.1-3
+- Added patch against the Devhelp plugin from GNOME to make it work with the
+  new WebKit-based Devhelp >= 0.22. Closes GNOME Bugzilla bug #560311, and Red
+  Hat Bugzilla bug #478578.
+
 * Sun Nov 09 2008 Debarshi Ray <rishi at fedoraproject.org> - 1:2.24.1-2
 - Added 'Requires: libglade2 >= 2.6.3-2' and a symlink to libanjuta.so.0 for
   some plugins to work. Closes Red Hat Bugzilla bug #467894.



From peterscheie at fedoraproject.org  Fri Jan  2 22:43:06 2009
From: peterscheie at fedoraproject.org (Peter Scheie)
Date: Fri,  2 Jan 2009 22:43:06 +0000 (UTC)
Subject: rpms/k12linux-quick-start-guide/F-10 import.log, NONE,
	1.1 k12linux-quick-start-guide.spec, NONE, 1.1
Message-ID: <20090102224306.9E3D970130@cvs1.fedora.phx.redhat.com>

Author: peterscheie

Update of /cvs/pkgs/rpms/k12linux-quick-start-guide/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32287/F-10

Added Files:
	import.log k12linux-quick-start-guide.spec 
Log Message:
Initial commit to F10 for doc on enabling LTSP pieces on k12linux.



--- NEW FILE import.log ---
k12linux-quick-start-guide-0_0_9-1_fc9:F-10:k12linux-quick-start-guide-0.0.9-1.fc9.src.rpm:1230936124


--- NEW FILE k12linux-quick-start-guide.spec ---
Name:           k12linux-quick-start-guide
Version:        0.0.9
Release:        1%{?dist}
Summary:        Quick Start Guide for K12Linux Live LTSP Server

Group:          Documentation
License:        CC-BY-SA
URL:            http://peterscheie.fedorapeople.org/k12linux/quick-start-guide
Source0:        http://peterscheie.fedorapeople.org/k12linux/quick-start-guide/k12linux-quick-start-guide-%{version}.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
Requires:       bluecurve-icon-theme 

%description
Documentation for configuring networking on K12Linux LTSP Server to
enable support for thin clients.  Covers LiveUSB and hard disk configurations. 
The admin should remove this package after the setup is complete.


%prep
%setup -q


%build
echo "Nothing to build"


%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/skel/Desktop/
mkdir -p -m 0755 $RPM_BUILD_ROOT%{_datadir}/k12linux-quick-start-guide/
cp -a "K12Linux Quick Start Guide.desktop" $RPM_BUILD_ROOT%{_sysconfdir}/skel/Desktop/
chmod 0644 $RPM_BUILD_ROOT%{_sysconfdir}/skel/Desktop/*
cp -a docs/* $RPM_BUILD_ROOT%{_datadir}/k12linux-quick-start-guide/
chmod 0644 $RPM_BUILD_ROOT%{_datadir}/k12linux-quick-start-guide/*


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
# None of this is marked %%doc because this package must be whole during runtime
%{_sysconfdir}/skel/Desktop/*
%{_datadir}/k12linux-quick-start-guide/



%changelog
* Fri Jan 02 2009 Peter Scheie <peter at scheie.homedns.org> - 0.0.9-1
- Consolidated 'rpm -e' commands for removing the guide to a single step.
- Changed link to newer version of how to get on #ltsp at ltsp.org.

* Mon Dec 29 2008 Peter Scheie <peter at scheie.homedns.org> - 0.0.8-1
- Changed html document regarding removing the document from the
  system from referencing ltsp-server-livesetupdocs to k12linux-quick-start-guide.

* Sun Dec 21 2008 Peter Scheie <peter at scheie.homedns.org> - 0.0.7-1
- Changed license in spec from GPLv2+ to CC-BY-SA.
- Used a different screenshot for step #10 in html which more clearly shows
  the device names.  Deleted the sentence that said to close the
  window because it was replaced by the File-Save verbage added in
  0.0.6.

* Sun Dec 21 2008 Peter Scheie <peter at scheie.homedns.org> - 0.0.6-1
- Removed version number for bluecurve-icon-theme for Requires in spec.
- Changed version number referenced in Source0 line to use %{version}.
- Changed Step 10 in html doc to use File-Save rather quit, save; replaced 
  corresponding screenshot.
- Replaced tabs with spaces in spec.

* Thu Dec 18 2008 Peter Scheie <peter at scheie.homedns.org> - 0.0.5
- Added mising Requires to spec for icon.
- Removed GenericName[en_US]= line from .desktop.
- Added blank line between each revision in changelog.

* Wed Dec 17 2008 Peter Scheie <peter at scheie.homedns.org> - 0.0.4
- Fixed path to document in .desktop file.
- Changed path to icon to actual file instead of symlink in .desktop file.
- Removed Icon[en_US] and Name[en_US] lines from .desktop file because they
  were redundant.
- Added CC license in html document.
- Changed URL to fedorapeople.org site.

* Sun Nov 16 2008 Peter Scheie <peter at scheie.homedns.org> - 0.0.3
- Reworked opening section to cover running from LiveUSB and from hard disk, since
  document is mostly about network config to enable LTSP support.
- Removed words about deleting the document launcher from /etc/skel; added back in
  step on removing entire package via rpm -e command.
- Added link to Fedora Installation Guide in reference to adding user IDs.
- Changed name and all allusions from README and ltsp-server-livesetupdocs to 
  k12linux-quick-start-guide.
- Changed screenshots so they show 'K12Linux Quick Start Guide' on desktop instead
  of 'README LTSP Server Setup'.

* Thu Nov 13 2008 Peter Scheie <peter at scheie.homedns.org> - 0.0.2
- Updated screencapture image for step 8 to one in which the interface in question is highlighted.
- Changed name of document to K12Linux Quick Start Guide to emphasize that this is just a simple
  set of instructions for getting LTSP networking running.
- Removed last step, of removing this package, as it's not really necessary since this is just a
  quick start guide.
* Sun Oct 12 2008 Warren Togami <wtogami at redhat.com> - 0.0.1
- initial package



From caolanm at fedoraproject.org  Fri Jan  2 22:48:02 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Fri,  2 Jan 2009 22:48:02 +0000 (UTC)
Subject: rpms/hunspell-da/devel .cvsignore, 1.16, 1.17 hunspell-da.spec, 1.16,
	1.17 sources, 1.16, 1.17
Message-ID: <20090102224802.329CB70130@cvs1.fedora.phx.redhat.com>

Author: caolanm

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

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.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore	23 Nov 2008 16:32:37 -0000	1.16
+++ .cvsignore	2 Jan 2009 22:47:31 -0000	1.17
@@ -1 +1 @@
-myspell-da-1.7.26.tar.bz2
+myspell-da-1.7.27.tar.bz2


Index: hunspell-da.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-da/devel/hunspell-da.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- hunspell-da.spec	23 Nov 2008 16:32:37 -0000	1.16
+++ hunspell-da.spec	2 Jan 2009 22:47:31 -0000	1.17
@@ -1,6 +1,6 @@
 Name: hunspell-da
 Summary: Danish hunspell dictionaries
-Version: 1.7.26
+Version: 1.7.27
 Release: 1%{?dist}
 Source: http://da.speling.org/filer/myspell-da-%{version}.tar.bz2
 Group: Applications/Text
@@ -33,6 +33,9 @@
 %{_datadir}/myspell/*
 
 %changelog
+* Fri Jan 02 2009 Caolan McNamara <caolanm at redhat.com> - 1.7.27-1
+- latest version
+
 * Sun Nov 23 2008 Caolan McNamara <caolanm at redhat.com> - 1.7.26-1
 - latest version
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-da/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources	23 Nov 2008 16:32:37 -0000	1.16
+++ sources	2 Jan 2009 22:47:31 -0000	1.17
@@ -1 +1 @@
-37a8217fe86f07a91dc80244cfb5e451  myspell-da-1.7.26.tar.bz2
+94b07b31f39f1b52a7132068ded0be31  myspell-da-1.7.27.tar.bz2



From kevin at fedoraproject.org  Fri Jan  2 23:22:46 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  2 Jan 2009 23:22:46 +0000 (UTC)
Subject: rpms/rkhunter/devel sources, 1.9, 1.10 .cvsignore, 1.8,
	1.9 rkhunter-1.3.2-debugtmp.patch, 1.1, NONE
Message-ID: <20090102232246.573B57011E@cvs1.fedora.phx.redhat.com>

Author: kevin

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

Modified Files:
	sources .cvsignore 
Removed Files:
	rkhunter-1.3.2-debugtmp.patch 
Log Message:
Update to 1.3.4
Use libdir as tmp dir - bug #456340



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rkhunter/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	29 Feb 2008 03:33:37 -0000	1.9
+++ sources	2 Jan 2009 23:22:15 -0000	1.10
@@ -1 +1 @@
-a00ff64d7076d6ff47ef0c9f0b6202f2  rkhunter-1.3.2.tar.gz
+31eaacc4d01ad138d1a4283f105088e6  rkhunter-1.3.4.tar.gz


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rkhunter/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	29 Feb 2008 03:33:37 -0000	1.8
+++ .cvsignore	2 Jan 2009 23:22:15 -0000	1.9
@@ -1 +1 @@
-rkhunter-1.3.2.tar.gz
+rkhunter-1.3.4.tar.gz


--- rkhunter-1.3.2-debugtmp.patch DELETED ---



From kevin at fedoraproject.org  Fri Jan  2 23:29:51 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  2 Jan 2009 23:29:51 +0000 (UTC)
Subject: rpms/rkhunter/devel rkhunter.spec,1.18,1.19
Message-ID: <20090102232951.8FBEC7011E@cvs1.fedora.phx.redhat.com>

Author: kevin

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

Modified Files:
	rkhunter.spec 
Log Message:
Update to 1.3.4
Use libdir as tmp dir - bug #456340



Index: rkhunter.spec
===================================================================
RCS file: /cvs/extras/rpms/rkhunter/devel/rkhunter.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- rkhunter.spec	14 Dec 2008 01:20:11 -0000	1.18
+++ rkhunter.spec	2 Jan 2009 23:29:21 -0000	1.19
@@ -1,16 +1,15 @@
 Name:           rkhunter
-Version:        1.3.2
-Release:        6%{?dist}
+Version:        1.3.4
+Release:        1%{?dist}
 Summary:        A host-based tool to scan for rootkits, backdoors and local exploits
 
 Group:          Applications/System
 License:        GPLv2+
 URL:            http://rkhunter.sourceforge.net/
-Source0:        http://downloads.sourceforge.net/rkhunter/rkhunter-1.3.2.tar.gz
-Source1:        http://downloads.sourceforge.net/rkhunter/rkhunter-1.3.2.tar.gz.sha1.txt
+Source0:        http://downloads.sourceforge.net/rkhunter/rkhunter-%{version}.tar.gz
+Source1:        http://downloads.sourceforge.net/rkhunter/rkhunter-%{version}.tar.gz.sha1.txt
 Source2:        01-rkhunter
 Source3:        rkhunter.sysconfig
-Patch0:		rkhunter-1.3.2-debugtmp.patch
 BuildArch:      noarch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -29,7 +28,7 @@
 
 %{__perl} -pi.0001 -e '
 	s|^#(MAIL-ON-WARNING=).+$|$1root\@localhost|;
-	s|^#(TMPDIR=).+$|$1%{_var}/run/%{name}|;
+	s|^#(TMPDIR=).+$|$1%{_var}/lib/%{name}|;
 	s|^#(DBDIR=).+$|$1%{_var}/lib/%{name}/db|;
 	s|^#(SCRIPTDIR=).+$|$1%{_datadir}/%{name}/scripts|;
 	s|^#(PKGMGR=).+$|$1RPM|;
@@ -70,8 +69,6 @@
 }
 EOF
 
-%patch0 -p1
-
 %build
 # Nothing to be built
 
@@ -139,6 +136,10 @@
 %{_mandir}/man8/*
 
 %changelog
+* Fri Jan 02 2009 Kevin Fenzi <kevin at tummy.com> - 1.3.4-1
+- Update to 1.3.4
+- Use libdir as tmp dir - bug #456340
+
 * Sat Dec 13 2008 Kevin Fenzi <kevin at tummy.com> - 1.3.2-6
 - Fix cron job sending as attachment - bug #472679
 - Fix cron job trying to send with colors - bug #475916



From kevin at fedoraproject.org  Fri Jan  2 23:36:57 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  2 Jan 2009 23:36:57 +0000 (UTC)
Subject: rpms/rkhunter/devel rkhunter-1.3.4.tar.gz.sha1.txt, NONE,
	1.1 rkhunter-1.3.2.tar.gz.sha1.txt, 1.1, NONE
Message-ID: <20090102233657.A8DAD7011E@cvs1.fedora.phx.redhat.com>

Author: kevin

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

Added Files:
	rkhunter-1.3.4.tar.gz.sha1.txt 
Removed Files:
	rkhunter-1.3.2.tar.gz.sha1.txt 
Log Message:
Commit new sha1.txt file



--- NEW FILE rkhunter-1.3.4.tar.gz.sha1.txt ---
73a42c94be2fb1fd3284d8dc60d22ff0fc8407f4  rkhunter-1.3.4/files/WISHLIST
c82074175e72642dd74322ce29281f0f2fe2798c  rkhunter-1.3.4/files/programs_bad.dat
443431d6c4dde5ff474fc9521561c6858478ad81  rkhunter-1.3.4/files/rkhunter
59de768a09a4cd13599653df85ecc2362e416ab3  rkhunter-1.3.4/files/defaulthashes.dat
9203f315cf8ea90724f70595c0b8facd61169b4a  rkhunter-1.3.4/files/i18n/cn
736fd9ea453f34c023a9ebed97fa0cea7461aeb8  rkhunter-1.3.4/files/i18n/zh.utf8
3aa3999bd924382f2a7b7e52ad0c3f7834d2285c  rkhunter-1.3.4/files/i18n/zh
a81ea7ee1677bb2f09c68ef55cac4819d102dfc0  rkhunter-1.3.4/files/i18n/en
ff10891d252f3859abe63054eb64f0e9eae2d781  rkhunter-1.3.4/files/tools/README
90876286c511986474144a5a1fc21afa0f5f29c5  rkhunter-1.3.4/files/tools/update_client.sh
e3ba269e33d5d385230d0a4457d87cf6e3acece8  rkhunter-1.3.4/files/tools/update_server.sh
98e225b334e319edaff76c079a3a241289ffa9c7  rkhunter-1.3.4/files/README
ebc05604eb51b10478d35ac3750699cefecd5ae3  rkhunter-1.3.4/files/filehashmd5.pl
d5bff919ce44a345a193824ea16b0404008d7823  rkhunter-1.3.4/files/programs_good.dat
beed9c4b594c5be28ca4837fdcd2ac367e2946ee  rkhunter-1.3.4/files/contrib/run_rkhunter.sh
225cc53f9691ad39f10bd2aaac478355ce4dc411  rkhunter-1.3.4/files/contrib/README.txt
285155f63cfa7a6a73ec0352dccaaa2221989b94  rkhunter-1.3.4/files/contrib/rkhunter_remote_howto.txt
56bf42d4fe669412b84eb307d5e314af4501dc9a  rkhunter-1.3.4/files/testing/stringscanner.sh
361ada5406c7e57e62e840caf3d3bce5e8436fc1  rkhunter-1.3.4/files/testing/rootkitinfo.txt
73e76916a3f65dde2317fff6c932e1d77760fdf7  rkhunter-1.3.4/files/testing/rkhunter.conf
1878119b6045eeab6a5afaebad7b523e86c3a935  rkhunter-1.3.4/files/filehashsha1.pl
a656a91b37a83a2325843f0ccedb5eb7866506ac  rkhunter-1.3.4/files/mirrors.dat
9ddeec64999f4c0e6f9aa5992cd25c503311b764  rkhunter-1.3.4/files/backdoorports.dat
a0badd192cc4f33fbf38f446eae3c858ba81c88f  rkhunter-1.3.4/files/check_modules.pl
82c8c3881d59d228de3ce74a4b7b68eac07940f1  rkhunter-1.3.4/files/md5blacklist.dat
4510d2228e144f80d75caef01c172095b2b4c24b  rkhunter-1.3.4/files/rkhunter.conf
5c4319fe3f9acc552b7a9e973b7d081f7cb31642  rkhunter-1.3.4/files/check_port.pl
f50ab02e29a0f4eba0ebe698f2c750a3b0298009  rkhunter-1.3.4/files/CHANGELOG
951b498f71fc4a126ca435f7bce96ed8b821efb6  rkhunter-1.3.4/files/os.dat
996a29dee608374e601ecf0253e445e16506c672  rkhunter-1.3.4/files/check_update.sh
2e971f1c9f355d2172db3c5a33601b7037853ac1  rkhunter-1.3.4/files/FAQ
7fa41ed0dc8c95b48b04dab42f1eaf8031c6ce7c  rkhunter-1.3.4/files/ACKNOWLEDGMENTS
5dfa5246dc1c87b05f44f9f444466ce3d0d6edec  rkhunter-1.3.4/files/stat.pl
345ab306455525cf5626caadda22b5dcbf732bc1  rkhunter-1.3.4/files/LICENSE
5fc098260380362a515d32376e8d5522f1ccf716  rkhunter-1.3.4/files/readlink.sh
e158163bfe6cb414d839e91880af37611f8b5cc0  rkhunter-1.3.4/files/development/createfilehashes.pl
0c613880f3447af695ca9f9f93e158b34c2a10c3  rkhunter-1.3.4/files/development/osinformation.sh
7378fb7e91b1f7e789508e4e8d00e1e3a70ee6ff  rkhunter-1.3.4/files/development/search_dead_sysmlinks.sh
d09ab61a3563122b8cd6415e3083dfe1ef285a2b  rkhunter-1.3.4/files/development/i18nchk
cb4903c649ad50b79230f5a5250da82c1d9ccb0f  rkhunter-1.3.4/files/development/createhashes.sh
4f4dfb87e758236cadc5ac5af67bbb35f4f63eb1  rkhunter-1.3.4/files/development/rpmprelinkhashes.sh
6b2f032d6143ed3b6ba3eae19d7921e154e69e47  rkhunter-1.3.4/files/development/createhashesall.sh
614a5d3999055a8faeecc393c5695d628e5a7675  rkhunter-1.3.4/files/development/rpmhashes.sh
ec4d60774decbb354f7aafcc2b65b1f87e000c97  rkhunter-1.3.4/files/suspscan.dat
0b0c2b2b1e6342ada9b1df48cda550e5120f0cdf  rkhunter-1.3.4/files/rkhunter.8
43bca835d9c64ab2f8cf7f1a5a078bb1b7da9306  rkhunter-1.3.4/files/showfiles.pl
21d8c152e81061d37d122e3a82283448cd267e73  rkhunter-1.3.4/files/rkhunter.spec
0093470e31268c538ecacc803969819faf742dde  rkhunter-1.3.4/installer.sh


--- rkhunter-1.3.2.tar.gz.sha1.txt DELETED ---



From lmacken at fedoraproject.org  Sat Jan  3 00:05:12 2009
From: lmacken at fedoraproject.org (Luke Macken)
Date: Sat,  3 Jan 2009 00:05:12 +0000 (UTC)
Subject: rpms/liveusb-creator/devel .cvsignore, 1.4, 1.5 liveusb-creator.spec,
	1.8, 1.9 sources, 1.7, 1.8
Message-ID: <20090103000512.7117B70120@cvs1.fedora.phx.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/liveusb-creator/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17951

Modified Files:
	.cvsignore liveusb-creator.spec sources 
Log Message:
v3.2


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/liveusb-creator/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	2 Jan 2009 04:43:26 -0000	1.4
+++ .cvsignore	3 Jan 2009 00:04:42 -0000	1.5
@@ -1 +1 @@
-liveusb-creator-3.1.tar.bz2
+liveusb-creator-3.2.tar.bz2


Index: liveusb-creator.spec
===================================================================
RCS file: /cvs/pkgs/rpms/liveusb-creator/devel/liveusb-creator.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- liveusb-creator.spec	2 Jan 2009 04:43:26 -0000	1.8
+++ liveusb-creator.spec	3 Jan 2009 00:04: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:           liveusb-creator
-Version:        3.1
+Version:        3.2
 Release:        1%{?dist}
 Summary:        A liveusb creator
 
@@ -64,6 +64,11 @@
 %config(noreplace) %{_sysconfdir}/security/console.apps/%{name}
 
 %changelog
+* Fri Jan 02 2009 Luke Macken <lmacken at redhat.com> 3.2-1
+- Fixed some syslinux-related issues (#167)
+- Fixed some windows-related logging problems (#337)
+- Mitigate a DBus/HAL-related segfault by unmounting upon termination
+
 * Thu Jan 01 2009 Luke Macken <lmacken at redhat.com> 3.1-1
 - Latest upstream release, containing some windows-specific
   optimizations and fixes.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/liveusb-creator/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	2 Jan 2009 04:43:27 -0000	1.7
+++ sources	3 Jan 2009 00:04:42 -0000	1.8
@@ -1 +1 @@
-703c81199d4487d5e7de64740693b0ba  liveusb-creator-3.1.tar.bz2
+cc1d39369c769dff0167a148d1a7d11c  liveusb-creator-3.2.tar.bz2



From lmacken at fedoraproject.org  Sat Jan  3 00:06:22 2009
From: lmacken at fedoraproject.org (Luke Macken)
Date: Sat,  3 Jan 2009 00:06:22 +0000 (UTC)
Subject: rpms/liveusb-creator/F-10 .cvsignore, 1.4, 1.5 liveusb-creator.spec,
	1.7, 1.8 sources, 1.6, 1.7
Message-ID: <20090103000622.502E870120@cvs1.fedora.phx.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/liveusb-creator/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18168

Modified Files:
	.cvsignore liveusb-creator.spec sources 
Log Message:
v3.2


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/liveusb-creator/F-10/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	2 Jan 2009 04:44:32 -0000	1.4
+++ .cvsignore	3 Jan 2009 00:05:52 -0000	1.5
@@ -1 +1 @@
-liveusb-creator-3.1.tar.bz2
+liveusb-creator-3.2.tar.bz2


Index: liveusb-creator.spec
===================================================================
RCS file: /cvs/pkgs/rpms/liveusb-creator/F-10/liveusb-creator.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- liveusb-creator.spec	2 Jan 2009 04:44:32 -0000	1.7
+++ liveusb-creator.spec	3 Jan 2009 00:05:52 -0000	1.8
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           liveusb-creator
-Version:        3.1
+Version:        3.2
 Release:        1%{?dist}
 Summary:        A liveusb creator
 
@@ -64,6 +64,11 @@
 %config(noreplace) %{_sysconfdir}/security/console.apps/%{name}
 
 %changelog
+* Fri Jan 02 2009 Luke Macken <lmacken at redhat.com> 3.2-1
+- Fixed some syslinux-related issues (#167)
+- Fixed some windows-related logging problems (#337)
+- Mitigate a DBus/HAL-related segfault by unmounting upon termination
+
 * Thu Jan 01 2009 Luke Macken <lmacken at redhat.com> 3.1-1
 - Latest upstream release, containing some windows-specific
   optimizations and fixes.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/liveusb-creator/F-10/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	2 Jan 2009 04:44:32 -0000	1.6
+++ sources	3 Jan 2009 00:05:52 -0000	1.7
@@ -1 +1 @@
-703c81199d4487d5e7de64740693b0ba  liveusb-creator-3.1.tar.bz2
+cc1d39369c769dff0167a148d1a7d11c  liveusb-creator-3.2.tar.bz2



From lmacken at fedoraproject.org  Sat Jan  3 00:07:27 2009
From: lmacken at fedoraproject.org (Luke Macken)
Date: Sat,  3 Jan 2009 00:07:27 +0000 (UTC)
Subject: rpms/liveusb-creator/F-9 .cvsignore, 1.3, 1.4 liveusb-creator.spec, 
	1.4, 1.5 sources, 1.4, 1.5
Message-ID: <20090103000727.5868270120@cvs1.fedora.phx.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/liveusb-creator/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18467

Modified Files:
	.cvsignore liveusb-creator.spec sources 
Log Message:
v3.2


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/liveusb-creator/F-9/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	2 Jan 2009 04:45:37 -0000	1.3
+++ .cvsignore	3 Jan 2009 00:06:57 -0000	1.4
@@ -1 +1 @@
-liveusb-creator-3.1.tar.bz2
+liveusb-creator-3.2.tar.bz2


Index: liveusb-creator.spec
===================================================================
RCS file: /cvs/pkgs/rpms/liveusb-creator/F-9/liveusb-creator.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- liveusb-creator.spec	2 Jan 2009 04:45:37 -0000	1.4
+++ liveusb-creator.spec	3 Jan 2009 00:06:57 -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:           liveusb-creator
-Version:        3.1
+Version:        3.2
 Release:        1%{?dist}
 Summary:        A liveusb creator
 
@@ -64,6 +64,11 @@
 %config(noreplace) %{_sysconfdir}/security/console.apps/%{name}
 
 %changelog
+* Fri Jan 02 2009 Luke Macken <lmacken at redhat.com> 3.2-1
+- Fixed some syslinux-related issues (#167)
+- Fixed some windows-related logging problems (#337)
+- Mitigate a DBus/HAL-related segfault by unmounting upon termination
+
 * Thu Jan 01 2009 Luke Macken <lmacken at redhat.com> 3.1-1
 - Latest upstream release, containing some windows-specific
   optimizations and fixes.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/liveusb-creator/F-9/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	2 Jan 2009 04:45:37 -0000	1.4
+++ sources	3 Jan 2009 00:06:57 -0000	1.5
@@ -1 +1 @@
-703c81199d4487d5e7de64740693b0ba  liveusb-creator-3.1.tar.bz2
+cc1d39369c769dff0167a148d1a7d11c  liveusb-creator-3.2.tar.bz2



From alexlan at fedoraproject.org  Sat Jan  3 00:07:24 2009
From: alexlan at fedoraproject.org (Alex Lancaster)
Date: Sat,  3 Jan 2009 00:07:24 +0000 (UTC)
Subject: rpms/olpc-utils/devel olpc-utils-python2.6.patch, NONE,
	1.1 olpc-utils.spec, 1.4, 1.5
Message-ID: <20090103000724.54AED70120@cvs1.fedora.phx.redhat.com>

Author: alexlan

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

Modified Files:
	olpc-utils.spec 
Added Files:
	olpc-utils-python2.6.patch 
Log Message:
* Fri Jan  2 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 0.89-8
- Add patch to fix spurious python2.5 Requires (#478661)


olpc-utils-python2.6.patch:

--- NEW FILE olpc-utils-python2.6.patch ---
--- usr/bin/olpc-test-devkey_orig	2009-01-02 16:55:37.000000000 -0700
+++ usr/bin/olpc-test-devkey	2009-01-02 16:55:46.000000000 -0700
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.5
+#!/usr/bin/python
 """olpc-test-devkey is a simple utility program to check the existence and
 validity of a user's developer key."""
 # Copyright (C) 2008 One Laptop Per Child Association, Inc.


Index: olpc-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/olpc-utils/devel/olpc-utils.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- olpc-utils.spec	15 Dec 2008 15:14:45 -0000	1.4
+++ olpc-utils.spec	3 Jan 2009 00:06:54 -0000	1.5
@@ -1,6 +1,6 @@
 Name:       olpc-utils
 Version:    0.89
-Release:    7%{?dist}
+Release:    8%{?dist}
 Summary:    OLPC utilities
 URL:        http://dev.laptop.org/git?p=projects/olpc-utils;a=summary
 Group:      System Environment/Base
@@ -9,6 +9,9 @@
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Patch1: olpc-utils-dbus.patch
+Patch2: olpc-utils-python2.6.patch
+
+BuildRequires:  python-devel
 
 # for olpc-dm
 BuildRequires:  pam-devel
@@ -33,6 +36,7 @@
 %setup -q
 
 %patch1 -p1
+%patch2 -p0
 
 %build
 make -f Makefile.build %{?_smp_mflags}
@@ -88,6 +92,9 @@
 %config(noreplace) %{_sysconfdir}/ConsoleKit/run-session.d/pam-foreground-compat.ck
 
 %changelog
+* Fri Jan  2 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 0.89-8
+- Add patch to fix spurious python2.5 Requires (#478661)
+
 * Mon Dec 15 2008 Peter Robinson <pbrobinson at gmail.com> 0.89-7
 - Fix deps and rebuild
 



From thm at fedoraproject.org  Sat Jan  3 00:53:53 2009
From: thm at fedoraproject.org (Thomas Moschny)
Date: Sat,  3 Jan 2009 00:53:53 +0000 (UTC)
Subject: rpms/monotone/F-10 import.log, NONE, 1.1 .cvsignore, 1.21,
	1.22 monotone.spec, 1.39, 1.40 sources, 1.21, 1.22
Message-ID: <20090103005353.A99F770120@cvs1.fedora.phx.redhat.com>

Author: thm

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

Modified Files:
	.cvsignore monotone.spec sources 
Added Files:
	import.log 
Log Message:
Updated for 0.42.


--- NEW FILE import.log ---
monotone-0_42-2_fc10:F-10:monotone-0.42-2.fc10.src.rpm:1230943967


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/monotone/F-10/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- .cvsignore	12 Sep 2008 20:24:20 -0000	1.21
+++ .cvsignore	3 Jan 2009 00:53:23 -0000	1.22
@@ -1 +1 @@
-monotone-0.41.tar.gz
+monotone-0.42.tar.gz


Index: monotone.spec
===================================================================
RCS file: /cvs/pkgs/rpms/monotone/F-10/monotone.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- monotone.spec	12 Sep 2008 20:24:20 -0000	1.39
+++ monotone.spec	3 Jan 2009 00:53:23 -0000	1.40
@@ -1,6 +1,6 @@
 Name: monotone
-Version: 0.41
-Release: 1%{?dist}
+Version: 0.42
+Release: 2%{?dist}
 
 Summary: A free, distributed version control system
 Group: Development/Tools
@@ -59,13 +59,22 @@
 %description server
 This package provides an easy-to-use standalone server setup for monotone.
 
+%package -n perl-Monotone
+Summary: Perl Module for monotone
+Requires: monotone = %{version}-%{release}
+Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+Group: Development/Tools
+
+%description -n perl-Monotone
+This is a simple Perl module to start a monotone automate sub-process
+and then pass commands to it.
 
 %prep
 %setup -q
 
 %build
 %configure --with-bundled-lua=%{bundled_lua} \
-	   --with-bundled-sqlite=%{bundled_sqlite}
+           --with-bundled-sqlite=%{bundled_sqlite}
 make %{?_smp_mflags}
 
 %check
@@ -92,7 +101,7 @@
 mkdir -p %{buildroot}%{_localstatedir}/lib
 ln -snf ../bin/mtn %{buildroot}%{_sbindir}/monotone-server
 %{__install} -D -m 0555 %{SOURCE1} \
-	     %{buildroot}%{_sysconfdir}/rc.d/init.d/monotone
+             %{buildroot}%{_sysconfdir}/rc.d/init.d/monotone
 %{__install} -D -m 0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/sysconfig/monotone
 %{__install} -d -m 0755 %{buildroot}%{_sysconfdir}/monotone
 %{__install} -d -m 0750 %{buildroot}%{_sysconfdir}/monotone/private-keys
@@ -101,17 +110,20 @@
 
 # These do not actually wind up in the package, due to %%ghost.
 %{__install} -c -m 0440 /dev/null \
-	     %{buildroot}%{_sysconfdir}/monotone/passphrase.lua
+             %{buildroot}%{_sysconfdir}/monotone/passphrase.lua
 %{__install} -c -m 0640 /dev/null \
-	     %{buildroot}%{_sysconfdir}/monotone/read-permissions
+             %{buildroot}%{_sysconfdir}/monotone/read-permissions
 %{__install} -c -m 0640 /dev/null \
-	     %{buildroot}%{_sysconfdir}/monotone/write-permissions
+             %{buildroot}%{_sysconfdir}/monotone/write-permissions
 %{__install} -c -m 0644 /dev/null \
-	     %{buildroot}%{_sysconfdir}/monotone/monotonerc
+             %{buildroot}%{_sysconfdir}/monotone/monotonerc
 touch %{buildroot}%{_localstatedir}/lib/monotone/server.mtn
 
 cp %{SOURCE3} .
 
+%{__install} -D -m 0644 -p contrib/Monotone.pm \
+             %{buildroot}%{perl_vendorlib}/Monotone.pm
+
 %clean
 rm -f README.monotone-server
 rm -rf %{buildroot}
@@ -119,13 +131,13 @@
 %post
 if [ $1 -eq 1 ]
 then
-	/sbin/install-info %{_infodir}/monotone.info %{_infodir}/dir > /dev/null 2>&1 || :
+        /sbin/install-info %{_infodir}/monotone.info %{_infodir}/dir > /dev/null 2>&1 || :
 fi
 
 %preun
 if [ $1 -eq 0 ]
 then
-	/sbin/install-info --delete %{_infodir}/monotone.info %{_infodir}/dir > /dev/null 2>&1 || :
+        /sbin/install-info --delete %{_infodir}/monotone.info %{_infodir}/dir > /dev/null 2>&1 || :
 fi
 
 %files -f %{name}.lang
@@ -139,13 +151,17 @@
 %{_datadir}/emacs/site-lisp/monotone*.el*
 %{_sysconfdir}/bash_completion.d
 
+%files -n perl-Monotone
+%defattr(-,root,root,-)
+%{perl_vendorlib}/Monotone.pm
+
 %files 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
-%config %{_sysconfdir}/sysconfig/monotone
+%config(noreplace) %{_sysconfdir}/sysconfig/monotone
 %dir %attr(0755,root,monotone) %{_sysconfdir}/monotone
 %dir %attr(0750,root,monotone) %{_sysconfdir}/monotone/private-keys
 %attr(0640,root,monotone) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) %{_sysconfdir}/monotone/monotonerc
@@ -160,7 +176,7 @@
 getent group monotone > /dev/null || groupadd -r monotone
 getent passwd monotone > /dev/null ||
 useradd -r -g monotone -r -d %{_localstatedir}/lib/monotone -s /sbin/nologin \
-	-c "Monotone Netsync Server" monotone
+        -c "Monotone Netsync Server" monotone
 exit 0
 
 %post server
@@ -169,18 +185,24 @@
 
 %preun server
 if [ $1 = 0 ]; then
-	/sbin/service monotone stop > /dev/null 2>&1
-	/sbin/chkconfig --del monotone
+        /sbin/service monotone stop > /dev/null 2>&1
+        /sbin/chkconfig --del monotone
 fi
 
 %postun
 if [ $1 -gt 1 ]; then
-	# Restart the running server: updates its db format when needed.
-	/sbin/service monotone condrestart > /dev/null 2>&1 || :
+        # Restart the running server: updates its db format when needed.
+        /sbin/service monotone condrestart > /dev/null 2>&1 || :
 fi
 
 
 %changelog
+* Fri Jan  2 2009 Thomas Moschny <thomas.moschny at gmx.de> - 0.42-2
+- Pack Monotone.pm (in a subpackage). (#450267)
+
+* Fri Jan  2 2009 Thomas Moschny <thomas.moschny at gmx.de> - 0.42-1
+- Updated for 0.42 release.
+
 * Fri Sep 12 2008 Thomas Moschny <thomas.moschny at gmx.de> - 0.41-1
 - Updated for 0.41 release.
 - Added mtnopt helper.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/monotone/F-10/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sources	12 Sep 2008 20:24:20 -0000	1.21
+++ sources	3 Jan 2009 00:53:23 -0000	1.22
@@ -1 +1 @@
-f4ee37fb6853719933561fef901e2a07  monotone-0.41.tar.gz
+c8e916d674b6608369d9f447700a8830  monotone-0.42.tar.gz



From thm at fedoraproject.org  Sat Jan  3 01:31:58 2009
From: thm at fedoraproject.org (Thomas Moschny)
Date: Sat,  3 Jan 2009 01:31:58 +0000 (UTC)
Subject: rpms/monotone/F-9 import.log, NONE, 1.1 .cvsignore, 1.21,
	1.22 monotone.spec, 1.38, 1.39 sources, 1.21, 1.22
Message-ID: <20090103013158.9165870120@cvs1.fedora.phx.redhat.com>

Author: thm

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

Modified Files:
	.cvsignore monotone.spec sources 
Added Files:
	import.log 
Log Message:
Updated for 0.42.


--- NEW FILE import.log ---
monotone-0_42-2_fc10:F-9:monotone-0.42-2.fc10.src.rpm:1230946242


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/monotone/F-9/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- .cvsignore	12 Sep 2008 21:06:21 -0000	1.21
+++ .cvsignore	3 Jan 2009 01:31:27 -0000	1.22
@@ -1 +1 @@
-monotone-0.41.tar.gz
+monotone-0.42.tar.gz


Index: monotone.spec
===================================================================
RCS file: /cvs/pkgs/rpms/monotone/F-9/monotone.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- monotone.spec	12 Sep 2008 21:06:21 -0000	1.38
+++ monotone.spec	3 Jan 2009 01:31:28 -0000	1.39
@@ -1,6 +1,6 @@
 Name: monotone
-Version: 0.41
-Release: 1%{?dist}
+Version: 0.42
+Release: 2%{?dist}
 
 Summary: A free, distributed version control system
 Group: Development/Tools
@@ -59,13 +59,22 @@
 %description server
 This package provides an easy-to-use standalone server setup for monotone.
 
+%package -n perl-Monotone
+Summary: Perl Module for monotone
+Requires: monotone = %{version}-%{release}
+Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+Group: Development/Tools
+
+%description -n perl-Monotone
+This is a simple Perl module to start a monotone automate sub-process
+and then pass commands to it.
 
 %prep
 %setup -q
 
 %build
 %configure --with-bundled-lua=%{bundled_lua} \
-	   --with-bundled-sqlite=%{bundled_sqlite}
+           --with-bundled-sqlite=%{bundled_sqlite}
 make %{?_smp_mflags}
 
 %check
@@ -92,7 +101,7 @@
 mkdir -p %{buildroot}%{_localstatedir}/lib
 ln -snf ../bin/mtn %{buildroot}%{_sbindir}/monotone-server
 %{__install} -D -m 0555 %{SOURCE1} \
-	     %{buildroot}%{_sysconfdir}/rc.d/init.d/monotone
+             %{buildroot}%{_sysconfdir}/rc.d/init.d/monotone
 %{__install} -D -m 0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/sysconfig/monotone
 %{__install} -d -m 0755 %{buildroot}%{_sysconfdir}/monotone
 %{__install} -d -m 0750 %{buildroot}%{_sysconfdir}/monotone/private-keys
@@ -101,17 +110,20 @@
 
 # These do not actually wind up in the package, due to %%ghost.
 %{__install} -c -m 0440 /dev/null \
-	     %{buildroot}%{_sysconfdir}/monotone/passphrase.lua
+             %{buildroot}%{_sysconfdir}/monotone/passphrase.lua
 %{__install} -c -m 0640 /dev/null \
-	     %{buildroot}%{_sysconfdir}/monotone/read-permissions
+             %{buildroot}%{_sysconfdir}/monotone/read-permissions
 %{__install} -c -m 0640 /dev/null \
-	     %{buildroot}%{_sysconfdir}/monotone/write-permissions
+             %{buildroot}%{_sysconfdir}/monotone/write-permissions
 %{__install} -c -m 0644 /dev/null \
-	     %{buildroot}%{_sysconfdir}/monotone/monotonerc
+             %{buildroot}%{_sysconfdir}/monotone/monotonerc
 touch %{buildroot}%{_localstatedir}/lib/monotone/server.mtn
 
 cp %{SOURCE3} .
 
+%{__install} -D -m 0644 -p contrib/Monotone.pm \
+             %{buildroot}%{perl_vendorlib}/Monotone.pm
+
 %clean
 rm -f README.monotone-server
 rm -rf %{buildroot}
@@ -119,13 +131,13 @@
 %post
 if [ $1 -eq 1 ]
 then
-	/sbin/install-info %{_infodir}/monotone.info %{_infodir}/dir > /dev/null 2>&1 || :
+        /sbin/install-info %{_infodir}/monotone.info %{_infodir}/dir > /dev/null 2>&1 || :
 fi
 
 %preun
 if [ $1 -eq 0 ]
 then
-	/sbin/install-info --delete %{_infodir}/monotone.info %{_infodir}/dir > /dev/null 2>&1 || :
+        /sbin/install-info --delete %{_infodir}/monotone.info %{_infodir}/dir > /dev/null 2>&1 || :
 fi
 
 %files -f %{name}.lang
@@ -139,13 +151,17 @@
 %{_datadir}/emacs/site-lisp/monotone*.el*
 %{_sysconfdir}/bash_completion.d
 
+%files -n perl-Monotone
+%defattr(-,root,root,-)
+%{perl_vendorlib}/Monotone.pm
+
 %files 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
-%config %{_sysconfdir}/sysconfig/monotone
+%config(noreplace) %{_sysconfdir}/sysconfig/monotone
 %dir %attr(0755,root,monotone) %{_sysconfdir}/monotone
 %dir %attr(0750,root,monotone) %{_sysconfdir}/monotone/private-keys
 %attr(0640,root,monotone) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) %{_sysconfdir}/monotone/monotonerc
@@ -160,7 +176,7 @@
 getent group monotone > /dev/null || groupadd -r monotone
 getent passwd monotone > /dev/null ||
 useradd -r -g monotone -r -d %{_localstatedir}/lib/monotone -s /sbin/nologin \
-	-c "Monotone Netsync Server" monotone
+        -c "Monotone Netsync Server" monotone
 exit 0
 
 %post server
@@ -169,18 +185,24 @@
 
 %preun server
 if [ $1 = 0 ]; then
-	/sbin/service monotone stop > /dev/null 2>&1
-	/sbin/chkconfig --del monotone
+        /sbin/service monotone stop > /dev/null 2>&1
+        /sbin/chkconfig --del monotone
 fi
 
 %postun
 if [ $1 -gt 1 ]; then
-	# Restart the running server: updates its db format when needed.
-	/sbin/service monotone condrestart > /dev/null 2>&1 || :
+        # Restart the running server: updates its db format when needed.
+        /sbin/service monotone condrestart > /dev/null 2>&1 || :
 fi
 
 
 %changelog
+* Fri Jan  2 2009 Thomas Moschny <thomas.moschny at gmx.de> - 0.42-2
+- Pack Monotone.pm (in a subpackage). (#450267)
+
+* Fri Jan  2 2009 Thomas Moschny <thomas.moschny at gmx.de> - 0.42-1
+- Updated for 0.42 release.
+
 * Fri Sep 12 2008 Thomas Moschny <thomas.moschny at gmx.de> - 0.41-1
 - Updated for 0.41 release.
 - Added mtnopt helper.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/monotone/F-9/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sources	12 Sep 2008 21:06:21 -0000	1.21
+++ sources	3 Jan 2009 01:31:28 -0000	1.22
@@ -1 +1 @@
-f4ee37fb6853719933561fef901e2a07  monotone-0.41.tar.gz
+c8e916d674b6608369d9f447700a8830  monotone-0.42.tar.gz



From davej at fedoraproject.org  Sat Jan  3 01:46:11 2009
From: davej at fedoraproject.org (Dave Jones)
Date: Sat,  3 Jan 2009 01:46:11 +0000 (UTC)
Subject: rpms/kernel/devel patch-2.6.28-git5.bz2.sign, NONE, 1.1 .cvsignore, 
	1.978, 1.979 config-generic, 1.208, 1.209 kernel.spec, 1.1189,
	1.1190 sources, 1.940, 1.941 upstream, 1.852,
	1.853 linux-2.6-serial.patch, 1.1,
	NONE patch-2.6.28-git4.bz2.sign, 1.1, NONE
Message-ID: <20090103014611.80C3970120@cvs1.fedora.phx.redhat.com>

Author: davej

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

Modified Files:
	.cvsignore config-generic kernel.spec sources upstream 
Added Files:
	patch-2.6.28-git5.bz2.sign 
Removed Files:
	linux-2.6-serial.patch patch-2.6.28-git4.bz2.sign 
Log Message:
2.6.28-git5


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

iD8DBQBJXquNyGugalF9Dw4RAkm/AJ0eI3vpg97Ynp6GZ2xeBQ+czDRonwCfRXws
r2yHXekvVU81SLoxb4fABkA=
=UfkA
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.978
retrieving revision 1.979
diff -u -r1.978 -r1.979
--- .cvsignore	1 Jan 2009 18:02:47 -0000	1.978
+++ .cvsignore	3 Jan 2009 01:45:40 -0000	1.979
@@ -4,4 +4,4 @@
 temp-*
 kernel-2.6.28
 linux-2.6.28.tar.bz2
-patch-2.6.28-git4.bz2
+patch-2.6.28-git5.bz2


Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-generic,v
retrieving revision 1.208
retrieving revision 1.209
diff -u -r1.208 -r1.209
--- config-generic	1 Jan 2009 18:02:48 -0000	1.208
+++ config-generic	3 Jan 2009 01:45:40 -0000	1.209
@@ -1869,6 +1869,7 @@
 CONFIG_SERIAL_CORE=y
 CONFIG_SERIAL_CORE_CONSOLE=y
 CONFIG_UNIX98_PTYS=y
+CONFIG_DEVPTS_MULTIPLE_INSTANCES=y
 # CONFIG_LEGACY_PTYS is not set
 CONFIG_PRINTER=m
 CONFIG_LP_CONSOLE=y


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1189
retrieving revision 1.1190
diff -u -r1.1189 -r1.1190
--- kernel.spec	1 Jan 2009 18:02:48 -0000	1.1189
+++ kernel.spec	3 Jan 2009 01:45:40 -0000	1.1190
@@ -57,7 +57,7 @@
 # The rc snapshot level
 %define rcrev 0
 # The git snapshot level
-%define gitrev 4
+%define gitrev 5
 # Set rpm version accordingly
 %define rpmversion 2.6.%{upstream_sublevel}
 %endif
@@ -654,9 +654,6 @@
 # Fix DEBUG_SHIRQ problem in tulip driver.  (454575)
 Patch2030: linux-2.6-net-tulip-interrupt.patch
 
-# Fix serial header so things can compile (#476327)
-Patch2050: linux-2.6-serial.patch
-
 # linux1394 git patches
 Patch2200: linux-2.6-firewire-git-update.patch
 Patch2201: linux-2.6-firewire-git-pending.patch
@@ -1164,8 +1161,6 @@
 
 ApplyPatch linux-2.6-net-tulip-interrupt.patch
 
-ApplyPatch linux-2.6-serial.patch
-
 # Nouveau DRM + drm fixes
 #ApplyPatch drm-next.patch
 ApplyPatch drm-modesetting-radeon.patch
@@ -1762,6 +1757,9 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Fri Jan 02 2009 Dave Jones <davej at redhat.com>
+- 2.6.28-git5
+
 * Thu Jan 01 2009 Dave Jones <davej at redhat.com>
 - 2.6.28-git4
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v
retrieving revision 1.940
retrieving revision 1.941
diff -u -r1.940 -r1.941
--- sources	1 Jan 2009 18:02:48 -0000	1.940
+++ sources	3 Jan 2009 01:45:40 -0000	1.941
@@ -1,2 +1,2 @@
 d351e44709c9810b85e29b877f50968a  linux-2.6.28.tar.bz2
-5959053c69e099586eb3cacd3e4cb56e  patch-2.6.28-git4.bz2
+86dc32de1bc11f13bfbac3e2225cc6e0  patch-2.6.28-git5.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v
retrieving revision 1.852
retrieving revision 1.853
diff -u -r1.852 -r1.853
--- upstream	1 Jan 2009 18:02:48 -0000	1.852
+++ upstream	3 Jan 2009 01:45:41 -0000	1.853
@@ -1,2 +1,2 @@
 linux-2.6.28.tar.bz2
-patch-2.6.28-git4.bz2
+patch-2.6.28-git5.bz2


--- linux-2.6-serial.patch DELETED ---


--- patch-2.6.28-git4.bz2.sign DELETED ---



From pkgdb at fedoraproject.org  Sat Jan  3 02:30:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Jan 2009 02:30:49 +0000
Subject: [pkgdb] mapnik: alexlan has requested watchbugzilla
Message-ID: <20090103023049.2C5F92086EF@bastion.fedora.phx.redhat.com>

alexlan has requested the watchbugzilla acl on mapnik (Fedora devel)

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



From pkgdb at fedoraproject.org  Sat Jan  3 02:30:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Jan 2009 02:30:52 +0000
Subject: [pkgdb] mapnik: alexlan has requested watchcommits
Message-ID: <20090103023052.10B39208D52@bastion.fedora.phx.redhat.com>

alexlan has requested the watchcommits acl on mapnik (Fedora devel)

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



From pkgdb at fedoraproject.org  Sat Jan  3 02:30:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Jan 2009 02:30:52 +0000
Subject: [pkgdb] mapnik: alexlan has requested commit
Message-ID: <20090103023052.E772A208D58@bastion.fedora.phx.redhat.com>

alexlan has requested the commit acl on mapnik (Fedora devel)

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



From pkgdb at fedoraproject.org  Sat Jan  3 02:30:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Jan 2009 02:30:55 +0000
Subject: [pkgdb] mapnik: alexlan has requested approveacls
Message-ID: <20090103023055.75172208D62@bastion.fedora.phx.redhat.com>

alexlan has requested the approveacls acl on mapnik (Fedora devel)

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



From ausil at fedoraproject.org  Sat Jan  3 03:23:59 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Sat,  3 Jan 2009 03:23:59 +0000 (UTC)
Subject: rpms/mono-nunit22/F-9 mono-nunit22.spec,1.4,1.5
Message-ID: <20090103032359.5890670120@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/mono-nunit22/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4276

Modified Files:
	mono-nunit22.spec 
Log Message:
exclude sparc64



Index: mono-nunit22.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mono-nunit22/F-9/mono-nunit22.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- mono-nunit22.spec	22 Apr 2008 22:04:32 -0000	1.4
+++ mono-nunit22.spec	3 Jan 2009 03:23:28 -0000	1.5
@@ -2,7 +2,7 @@
 
 Name:	 	mono-nunit22
 Version:	2.2.10
-Release:	5%{?dist}
+Release:	6%{?dist}
 Summary:	Unit-testing framework for .NET
 URL:		http://www.nunit.org/
 License:	MIT with acknowledgement
@@ -14,8 +14,8 @@
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildRequires:	mono-devel, nant
 BuildRequires:	unzip
-# There is no nant for ppc/ppc64
-ExcludeArch:	ppc64 ppc
+# There is no nant for ppc/ppc64/sparc64
+ExcludeArch:	ppc64 ppc sparc64
 
 %description
 NUnit is a unit-testing framework for all .Net languages. Initially ported from
@@ -75,6 +75,9 @@
 
 
 %changelog
+* Fri Jan 02 2008 Dennis Gilmore <dennis at ausil.us> 2.2.10-6
+- exclude sparc64 no mono there
+
 * Tue Apr 22 2008 Tom "spot" Callaway <tcallawa at redhat.com> 2.2.10-5
 - fix sed invocation
 



From ausil at fedoraproject.org  Sat Jan  3 03:28:05 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Sat,  3 Jan 2009 03:28:05 +0000 (UTC)
Subject: rpms/mono-nunit22/F-9 mono-nunit22.spec,1.5,1.6
Message-ID: <20090103032805.8B34D70120@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/mono-nunit22/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5077

Modified Files:
	mono-nunit22.spec 
Log Message:
fix date



Index: mono-nunit22.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mono-nunit22/F-9/mono-nunit22.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- mono-nunit22.spec	3 Jan 2009 03:23:28 -0000	1.5
+++ mono-nunit22.spec	3 Jan 2009 03:27:35 -0000	1.6
@@ -75,7 +75,7 @@
 
 
 %changelog
-* Fri Jan 02 2008 Dennis Gilmore <dennis at ausil.us> 2.2.10-6
+* Fri Jan 02 2009 Dennis Gilmore <dennis at ausil.us> 2.2.10-6
 - exclude sparc64 no mono there
 
 * Tue Apr 22 2008 Tom "spot" Callaway <tcallawa at redhat.com> 2.2.10-5



From ausil at fedoraproject.org  Sat Jan  3 03:32:37 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Sat,  3 Jan 2009 03:32:37 +0000 (UTC)
Subject: rpms/mono-nunit22/F-10 mono-nunit22.spec,1.6,1.7
Message-ID: <20090103033237.3FE4B70120@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/mono-nunit22/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5898

Modified Files:
	mono-nunit22.spec 
Log Message:
exlcude sparc64



Index: mono-nunit22.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mono-nunit22/F-10/mono-nunit22.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- mono-nunit22.spec	11 Aug 2008 15:22:02 -0000	1.6
+++ mono-nunit22.spec	3 Jan 2009 03:32:06 -0000	1.7
@@ -2,7 +2,7 @@
 
 Name:	 	mono-nunit22
 Version:	2.2.10
-Release:	7%{?dist}
+Release:	8%{?dist}
 Summary:	Unit-testing framework for .NET
 URL:		http://www.nunit.org/
 License:	MIT with advertising
@@ -14,8 +14,8 @@
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildRequires:	mono-devel, nant
 BuildRequires:	unzip
-# There is no nant for ppc/ppc64
-ExcludeArch:	ppc64 ppc
+# There is no nant for ppc/ppc64/sparc64
+ExcludeArch:	ppc64 ppc sparc64
 
 %description
 NUnit is a unit-testing framework for all .Net languages. Initially ported from
@@ -75,6 +75,9 @@
 
 
 %changelog
+* Fri Jan 02 2009 Dennis Gilmore <dennis at ausil.us> 2.2.10-8
+- exclude sparc64
+
 * Mon Aug 11 2008 Tom "spot" Callaway <tcallawa at redhat.com> 2.2.10-7
 - fix license tag
 



From ausil at fedoraproject.org  Sat Jan  3 03:36:41 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Sat,  3 Jan 2009 03:36:41 +0000 (UTC)
Subject: rpms/mono-nunit22/devel mono-nunit22.spec,1.7,1.8
Message-ID: <20090103033642.04C4C70120@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/mono-nunit22/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6567

Modified Files:
	mono-nunit22.spec 
Log Message:
exclude sparc64 
fix changelog entry



Index: mono-nunit22.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mono-nunit22/devel/mono-nunit22.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- mono-nunit22.spec	18 Dec 2008 12:32:05 -0000	1.7
+++ mono-nunit22.spec	3 Jan 2009 03:36:11 -0000	1.8
@@ -2,7 +2,7 @@
 
 Name:	 	mono-nunit22
 Version:	2.4.8
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Unit-testing framework for .NET
 URL:		http://www.nunit.org/
 License:	MIT with acknowledgement
@@ -13,8 +13,8 @@
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildRequires:	mono-devel >= 2.2 , nant
 BuildRequires:	unzip
-# There is no nant for ppc/ppc64
-ExcludeArch:	ppc64 ppc
+# There is no nant for ppc/ppc64/sparc64
+ExcludeArch:	ppc64 ppc sparc64
 
 %description 
 NUnit is a unit-testing framework for all .Net languages. Initially ported from
@@ -72,12 +72,28 @@
 
 
 %changelog
+* Fri Jan 02 2009 Dennis Gilmore <dennis at ausil.us> 2.4.8-2
+- exclude sparc64
+- add missing changelog entries
+
 * Sun Nov 30 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.4.8-1
 - bump to bring it up to date
 - remove nunit22 build patch
 - fix new nunit22 key patch
 - spec file fix
 
+* Mon Aug 11 2008 Tom "spot" Callaway <tcallawa at redhat.com> 2.2.10-7
+- fix license tag
+
+* Thu Jun  5 2008 Tom "spot" Callaway <tcallawa at redhat.com> 2.2.10-6
+- rebuild for new mono bits
+
+* Tue Apr 22 2008 Tom "spot" Callaway <tcallawa at redhat.com> 2.2.10-5
+- fix sed invocation
+
+* Tue Apr 22 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.2.10-4
+- fix for incorrect libdir in pc file
+
 * Fri Apr 11 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 2.2.10-3
 - no nant for ppc ppc64
 



From remi at fedoraproject.org  Sat Jan  3 08:33:04 2009
From: remi at fedoraproject.org (Remi Collet)
Date: Sat,  3 Jan 2009 08:33:04 +0000 (UTC)
Subject: rpms/maniadrive/F-10 maniadrive.spec,1.9,1.10
Message-ID: <20090103083304.A50E170153@cvs1.fedora.phx.redhat.com>

Author: remi

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

Modified Files:
	maniadrive.spec 
Log Message:
rebuild for php 5.2.8


Index: maniadrive.spec
===================================================================
RCS file: /cvs/extras/rpms/maniadrive/F-10/maniadrive.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- maniadrive.spec	30 Sep 2008 07:20:49 -0000	1.9
+++ maniadrive.spec	3 Jan 2009 08:32:34 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           maniadrive
 Version:        1.2
-Release:        10%{?dist}
+Release:        11%{?dist}
 Summary:        3D stunt driving game
 Group:          Amusements/Games
 License:        GPLv2+
@@ -161,6 +161,9 @@
 
 
 %changelog
+* Wed Dec 17 2008 Hans de Goede <hdegoede at redhat.com> 1.2-11
+- Rebuild for new php version
+
 * Mon Sep 15 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 1.2-10
 - Rebuild for new ode
 



From dcbw at fedoraproject.org  Sat Jan  3 07:42:29 2009
From: dcbw at fedoraproject.org (Daniel Williams)
Date: Sat,  3 Jan 2009 07:42:29 +0000 (UTC)
Subject: rpms/NetworkManager-openvpn/devel .cvsignore, 1.12,
	1.13 NetworkManager-openvpn.spec, 1.27, 1.28 sources, 1.16, 1.17
Message-ID: <20090103074229.8976970154@cvs1.fedora.phx.redhat.com>

Author: dcbw

Update of /cvs/pkgs/rpms/NetworkManager-openvpn/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12596

Modified Files:
	.cvsignore NetworkManager-openvpn.spec sources 
Log Message:
* Sat Jan  3 2009 Dan Williams <dcbw at redhat.com> 1:0.7.0-18.svn11
- Rebuild for updated NetworkManager
- Fix some specfile issues (rh #477149)
- Allow the EAP authentication method




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager-openvpn/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	22 Nov 2008 03:52:46 -0000	1.12
+++ .cvsignore	3 Jan 2009 07:41:58 -0000	1.13
@@ -7,3 +7,4 @@
 NetworkManager-openvpn-0.7.0.svn4175.tar.gz
 NetworkManager-openvpn-0.7.0.svn4229.tar.gz
 NetworkManager-openvpn-0.7.0.svn4326.tar.gz
+NetworkManager-openvpn-0.7.0.svn11.tar.gz


Index: NetworkManager-openvpn.spec
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager-openvpn/devel/NetworkManager-openvpn.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- NetworkManager-openvpn.spec	22 Nov 2008 03:52:46 -0000	1.27
+++ NetworkManager-openvpn.spec	3 Jan 2009 07:41:58 -0000	1.28
@@ -1,16 +1,16 @@
-%define nm_version          1:0.7.0-0.12.svn4326
+%define nm_version          1:0.7.0-1
 %define dbus_version        1.1
 %define gtk2_version        2.10.0
 %define openvpn_version     2.1
 %define shared_mime_version 0.16-3
 
-%define svn_snapshot svn4326
+%define svn_snapshot svn11
 
 Summary: NetworkManager VPN plugin for OpenVPN
 Name: NetworkManager-openvpn
 Epoch:   1
 Version: 0.7.0
-Release: 16.%{svn_snapshot}%{?dist}
+Release: 18.%{svn_snapshot}%{?dist}
 License: GPLv2+
 URL: http://www.gnome.org/projects/NetworkManager/
 Group: System Environment/Base
@@ -29,10 +29,8 @@
 BuildRequires: NetworkManager-glib-devel  >= %{nm_version}
 BuildRequires: glib2-devel
 BuildRequires: GConf2-devel
-BuildRequires: libgnomeui-devel
 BuildRequires: gnome-keyring-devel
 BuildRequires: libglade2-devel
-BuildRequires: libpng-devel
 BuildRequires: perl-XML-Parser
 BuildRequires: libtool intltool gettext
 BuildRequires: perl
@@ -61,7 +59,7 @@
 if [ ! -f configure ]; then
   ./autogen.sh
 fi
-%configure --disable-static --disable-dependency-tracking
+%configure --disable-static --disable-dependency-tracking --enable-more-warnings=yes
 make %{?_smp_mflags}
 
 %install
@@ -104,8 +102,17 @@
 %{_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
+%dir %{_datadir}/gnome-vpn-properties/openvpn
 
 %changelog
+* Sat Jan  3 2009 Dan Williams <dcbw at redhat.com> 1:0.7.0-18.svn11
+- Rebuild for updated NetworkManager
+- Fix some specfile issues (rh #477149)
+- Allow the EAP authentication method
+
+* Sat Dec 20 2008 Christoph H??ger <choeger at cs.tu-berlin.de> 0.7.0-17.svn4326
+- removed libpng-devel from BuildRequires, added %{_datadir}/gnome-vpn-properties/openvpn/ (rh #477149)
+
 * Fri Nov 21 2008 Dan Williams <dcbw at redhat.com> 1:0.7.0-16.svn4326
 - Rebuild for updated NetworkManager
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager-openvpn/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources	22 Nov 2008 03:52:46 -0000	1.16
+++ sources	3 Jan 2009 07:41:58 -0000	1.17
@@ -1 +1 @@
-027b5577aac9b132fdbd0735eb3ccdeb  NetworkManager-openvpn-0.7.0.svn4326.tar.gz
+de7716aef7fe8665030e82aa244ec3c0  NetworkManager-openvpn-0.7.0.svn11.tar.gz



From dcbw at fedoraproject.org  Sat Jan  3 07:51:50 2009
From: dcbw at fedoraproject.org (Daniel Williams)
Date: Sat,  3 Jan 2009 07:51:50 +0000 (UTC)
Subject: rpms/NetworkManager-openvpn/F-10 NetworkManager-openvpn.spec, 1.29, 
	1.30
Message-ID: <20090103075150.1BE007015E@cvs1.fedora.phx.redhat.com>

Author: dcbw

Update of /cvs/pkgs/rpms/NetworkManager-openvpn/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15942

Modified Files:
	NetworkManager-openvpn.spec 
Log Message:
remove erroneous change entry


Index: NetworkManager-openvpn.spec
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager-openvpn/F-10/NetworkManager-openvpn.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- NetworkManager-openvpn.spec	3 Jan 2009 07:42:51 -0000	1.29
+++ NetworkManager-openvpn.spec	3 Jan 2009 07:51:19 -0000	1.30
@@ -108,7 +108,6 @@
 * Sat Jan  3 2009 Dan Williams <dcbw at redhat.com> 1:0.7.0-18.svn11
 - Rebuild for updated NetworkManager
 - Fix some specfile issues (rh #477149)
-- Allow the EAP authentication method
 
 * Sat Dec 20 2008 Christoph H??ger <choeger at cs.tu-berlin.de> 0.7.0-17.svn4326
 - removed libpng-devel from BuildRequires, added %{_datadir}/gnome-vpn-properties/openvpn/ (rh #477149)



From dcbw at fedoraproject.org  Sat Jan  3 07:55:46 2009
From: dcbw at fedoraproject.org (Daniel Williams)
Date: Sat,  3 Jan 2009 07:55:46 +0000 (UTC)
Subject: rpms/NetworkManager-pptp/devel .cvsignore, 1.5,
	1.6 NetworkManager-pptp.spec, 1.7, 1.8 sources, 1.5, 1.6
Message-ID: <20090103075546.143BE70160@cvs1.fedora.phx.redhat.com>

Author: dcbw

Update of /cvs/pkgs/rpms/NetworkManager-pptp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16869

Modified Files:
	.cvsignore NetworkManager-pptp.spec sources 
Log Message:
* Sat Jan  3 2009 Dan Williams <dcbw at redhat.com> 1:0.7.0-1.svn16
- Rebuild for updated NetworkManager
- Fix some specfile issues (rh #477153)
- Allow the EAP authentication method




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager-pptp/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	22 Nov 2008 04:10:16 -0000	1.5
+++ .cvsignore	3 Jan 2009 07:55:15 -0000	1.6
@@ -2,3 +2,4 @@
 NetworkManager-pptp-0.7.0.svn4178.tar.bz2
 NetworkManager-pptp-0.7.0.svn4229.tar.bz2
 NetworkManager-pptp-0.7.0.svn4326.tar.bz2
+NetworkManager-pptp-0.7.0.svn16.tar.bz2


Index: NetworkManager-pptp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager-pptp/devel/NetworkManager-pptp.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- NetworkManager-pptp.spec	22 Nov 2008 04:11:56 -0000	1.7
+++ NetworkManager-pptp.spec	3 Jan 2009 07:55:15 -0000	1.8
@@ -1,16 +1,16 @@
-%define nm_version          1:0.7.0-0.12.svn4326
+%define nm_version          1:0.7.0-1
 %define dbus_version        1.1
 %define gtk2_version        2.10.0
 %define ppp_version         2.2.4
 %define shared_mime_version 0.16-3
 
-%define svn_snapshot svn4326
+%define svn_snapshot svn16
 
 Summary:   NetworkManager VPN plugin for pptp
 Name:      NetworkManager-pptp
 Epoch:     1
 Version:   0.7.0
-Release:   0.12.%{svn_snapshot}%{?dist}
+Release:   1.%{svn_snapshot}%{?dist}
 License:   GPLv2+
 Group:     System Environment/Base
 URL:       http://www.gnome.org/projects/NetworkManager/
@@ -23,7 +23,6 @@
 BuildRequires: NetworkManager-devel   >= %{nm_version}
 BuildRequires: NetworkManager-glib-devel >= %{nm_version}
 BuildRequires: GConf2-devel
-BuildRequires: libgnomeui-devel
 BuildRequires: gnome-keyring-devel
 BuildRequires: libglade2-devel
 BuildRequires: intltool gettext
@@ -50,7 +49,7 @@
 
 
 %build
-%configure --enable-more-warnings=yes
+%configure --disable-static --enable-more-warnings=yes
 make %{?_smp_mflags}
 
 %install
@@ -101,8 +100,14 @@
 %{_datadir}/gnome-vpn-properties/pptp/nm-pptp-dialog.glade
 %{_datadir}/applications/nm-pptp.desktop
 %{_datadir}/icons/hicolor/48x48/apps/gnome-mime-application-x-pptp-settings.png
+%dir %{_datadir}/gnome-vpn-properties/pptp
 
 %changelog
+* Sat Jan  3 2009 Dan Williams <dcbw at redhat.com> 1:0.7.0-1.svn16
+- Rebuild for updated NetworkManager
+- Fix some specfile issues (rh #477153)
+- Allow the EAP authentication method
+
 * Fri Nov 21 2008 Dan Williams <dcbw at redhat.com> 1:0.7.0-12.svn4326
 - Rebuild for updated NetworkManager
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager-pptp/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	22 Nov 2008 04:10:16 -0000	1.5
+++ sources	3 Jan 2009 07:55:15 -0000	1.6
@@ -1 +1 @@
-b9b6d1e987be04279fa2610eb208e09e  NetworkManager-pptp-0.7.0.svn4326.tar.bz2
+df7f950127c9cc7e640dd2c8effd953b  NetworkManager-pptp-0.7.0.svn16.tar.bz2



From pbrobinson at fedoraproject.org  Sat Jan  3 06:43:28 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Sat,  3 Jan 2009 06:43:28 +0000 (UTC)
Subject: rpms/libiphone/devel libiphone.spec,1.6,1.7
Message-ID: <20090103064328.9EF087014D@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

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

Modified Files:
	libiphone.spec 
Log Message:
- new git snapshot



Index: libiphone.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libiphone/devel/libiphone.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- libiphone.spec	13 Dec 2008 19:46:59 -0000	1.6
+++ libiphone.spec	3 Jan 2009 06:42:58 -0000	1.7
@@ -2,14 +2,14 @@
 # git clone http://git.matt.colyer.name/2008/libiphone/
 # git-archive --format=tar --prefix=libiphone-0.1.0/ %{git_version} | bzip2 > libiphone-0.1.0-20081201.tar.bz2
 
-%define gitdate 20081201
-%define git_version 8c3a01e
+%define gitdate 20090103
+%define git_version 5cde554
 %define tarfile %{name}-%{version}-%{gitdate}.tar.bz2
 %define snapshot %{gitdate}git%{git_version}
 
 Name:           libiphone
 Version:        0.1.0
-Release:        6.%{snapshot}%{?dist}
+Release:        7.%{snapshot}%{?dist}
 Summary:        Library for connecting to Apple iPhone and iPod touch
 
 Group:          System Environment/Libraries
@@ -17,7 +17,6 @@
 URL:            http://matt.colyer.name/projects/iphone-linux/
 
 Source0:        %{tarfile}
-Patch0:         libiphone-fixgnutlsver.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: libxml2-devel
@@ -45,7 +44,6 @@
 
 %prep
 %setup -q
-%patch0 -p0 -b .fixgnutlsver
 
 %build
 ./autogen.sh
@@ -79,6 +77,9 @@
 %{_includedir}/libiphone
 
 %changelog
+* Sat Jan 3 2009 Peter Robinson <pbrobinson at gmail.com> 0.1.0-7.git5cde554
+- New git snapshot
+
 * Mon Dec 5 2008 Peter Robinson <pbrobinson at gmail.com> 0.1.0-6.git8c3a01e
 - Fix devel dependency 
 



From dcbw at fedoraproject.org  Sat Jan  3 07:54:21 2009
From: dcbw at fedoraproject.org (Daniel Williams)
Date: Sat,  3 Jan 2009 07:54:21 +0000 (UTC)
Subject: rpms/NetworkManager-openvpn/F-9 NetworkManager-openvpn.spec, 1.27, 
	1.28
Message-ID: <20090103075421.7714F7015F@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-serv16412

Modified Files:
	NetworkManager-openvpn.spec 
Log Message:
remove erroneous change entry


Index: NetworkManager-openvpn.spec
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager-openvpn/F-9/NetworkManager-openvpn.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- NetworkManager-openvpn.spec	3 Jan 2009 07:44:46 -0000	1.27
+++ NetworkManager-openvpn.spec	3 Jan 2009 07:53:51 -0000	1.28
@@ -108,7 +108,6 @@
 * Sat Jan  3 2009 Dan Williams <dcbw at redhat.com> 1:0.7.0-18.svn11
 - Rebuild for updated NetworkManager
 - Fix some specfile issues (rh #477149)
-- Allow the EAP authentication method
 
 * Sat Dec 20 2008 Christoph H??ger <choeger at cs.tu-berlin.de> 0.7.0-17.svn4326
 - removed libpng-devel from BuildRequires, added %{_datadir}/gnome-vpn-properties/openvpn/ (rh #477149)



From dcbw at fedoraproject.org  Sat Jan  3 07:57:31 2009
From: dcbw at fedoraproject.org (Daniel Williams)
Date: Sat,  3 Jan 2009 07:57:31 +0000 (UTC)
Subject: rpms/NetworkManager-pptp/F-9 NetworkManager-pptp.spec, 1.2,
	1.3 sources, 1.3, 1.4
Message-ID: <20090103075731.9F4B070163@cvs1.fedora.phx.redhat.com>

Author: dcbw

Update of /cvs/pkgs/rpms/NetworkManager-pptp/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17680

Modified Files:
	NetworkManager-pptp.spec sources 
Log Message:
* Sat Jan  3 2009 Dan Williams <dcbw at redhat.com> 1:0.7.0-1.svn16
- Rebuild for updated NetworkManager
- Fix some specfile issues (rh #477153)
- Allow the EAP authentication method




Index: NetworkManager-pptp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager-pptp/F-9/NetworkManager-pptp.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- NetworkManager-pptp.spec	22 Nov 2008 04:15:20 -0000	1.2
+++ NetworkManager-pptp.spec	3 Jan 2009 07:57:01 -0000	1.3
@@ -1,16 +1,16 @@
-%define nm_version          1:0.7.0-0.12.svn4326
+%define nm_version          1:0.7.0-1
 %define dbus_version        1.1
 %define gtk2_version        2.10.0
 %define ppp_version         2.2.4
 %define shared_mime_version 0.16-3
 
-%define svn_snapshot svn4326
+%define svn_snapshot svn16
 
 Summary:   NetworkManager VPN plugin for pptp
 Name:      NetworkManager-pptp
 Epoch:     1
 Version:   0.7.0
-Release:   0.12.%{svn_snapshot}%{?dist}
+Release:   1.%{svn_snapshot}%{?dist}
 License:   GPLv2+
 Group:     System Environment/Base
 URL:       http://www.gnome.org/projects/NetworkManager/
@@ -23,7 +23,6 @@
 BuildRequires: NetworkManager-devel   >= %{nm_version}
 BuildRequires: NetworkManager-glib-devel >= %{nm_version}
 BuildRequires: GConf2-devel
-BuildRequires: libgnomeui-devel
 BuildRequires: gnome-keyring-devel
 BuildRequires: libglade2-devel
 BuildRequires: intltool gettext
@@ -50,7 +49,7 @@
 
 
 %build
-%configure --enable-more-warnings=yes
+%configure --disable-static --enable-more-warnings=yes
 make %{?_smp_mflags}
 
 %install
@@ -101,8 +100,14 @@
 %{_datadir}/gnome-vpn-properties/pptp/nm-pptp-dialog.glade
 %{_datadir}/applications/nm-pptp.desktop
 %{_datadir}/icons/hicolor/48x48/apps/gnome-mime-application-x-pptp-settings.png
+%dir %{_datadir}/gnome-vpn-properties/pptp
 
 %changelog
+* Sat Jan  3 2009 Dan Williams <dcbw at redhat.com> 1:0.7.0-1.svn16
+- Rebuild for updated NetworkManager
+- Fix some specfile issues (rh #477153)
+- Allow the EAP authentication method
+
 * Fri Nov 21 2008 Dan Williams <dcbw at redhat.com> 1:0.7.0-12.svn4326
 - Rebuild for updated NetworkManager
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager-pptp/F-9/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	22 Nov 2008 04:15:20 -0000	1.3
+++ sources	3 Jan 2009 07:57:01 -0000	1.4
@@ -1 +1 @@
-b9b6d1e987be04279fa2610eb208e09e  NetworkManager-pptp-0.7.0.svn4326.tar.bz2
+df7f950127c9cc7e640dd2c8effd953b  NetworkManager-pptp-0.7.0.svn16.tar.bz2



From xulchris at fedoraproject.org  Sat Jan  3 06:34:18 2009
From: xulchris at fedoraproject.org (Christopher Stone)
Date: Sat,  3 Jan 2009 06:34:18 +0000 (UTC)
Subject: rpms/poker-network/F-10 .cvsignore, 1.9, 1.10 poker-network.spec,
	1.15, 1.16 sources, 1.9, 1.10
Message-ID: <20090103063418.3FC817013C@cvs1.fedora.phx.redhat.com>

Author: xulchris

Update of /cvs/pkgs/rpms/poker-network/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24714/F-10

Modified Files:
	.cvsignore poker-network.spec sources 
Log Message:
upstream sync


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/poker-network/F-10/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	29 May 2008 17:23:12 -0000	1.9
+++ .cvsignore	3 Jan 2009 06:33:47 -0000	1.10
@@ -1 +1 @@
-poker-network-1.6.0.tar.gz
+poker-network-1.7.3.tar.gz


Index: poker-network.spec
===================================================================
RCS file: /cvs/pkgs/rpms/poker-network/F-10/poker-network.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- poker-network.spec	9 Oct 2008 15:22:08 -0000	1.15
+++ poker-network.spec	3 Jan 2009 06:33:47 -0000	1.16
@@ -8,12 +8,12 @@
 
 
 Name:             poker-network
-Version:          1.6.0
-Release:          2%{?dist}
+Version:          1.7.3
+Release:          1%{?dist}
 Summary:          Base package for poker client and server
 
 Group:            Applications/Internet
-License:          GPLv2+
+License:          AGPLv3
 URL:              http://pokersource.org/poker-network
 Source0:          http://download.gna.org/pokersource/sources/%{name}-%{version}.tar.gz
 
@@ -288,12 +288,18 @@
 %dir %{_sysconfdir}/%{name}
 %dir %{python_sitelib}/pokernetwork
 %{python_sitelib}/pokernetwork/__init__*
+%{python_sitelib}/pokernetwork/attrpack*
+%{python_sitelib}/pokernetwork/countfilter*
 %{python_sitelib}/pokernetwork/dispatch*
+%{python_sitelib}/pokernetwork/nullfilter*
 %{python_sitelib}/pokernetwork/packets*
+%{python_sitelib}/pokernetwork/pokerauth*
+%{python_sitelib}/pokernetwork/pokermemcache*
 %{python_sitelib}/pokernetwork/pokernetworkconfig*
 %{python_sitelib}/pokernetwork/pokerpackets*
 %{python_sitelib}/pokernetwork/protocol*
 %{python_sitelib}/pokernetwork/proxy*
+%{python_sitelib}/pokernetwork/tourneyattrs*
 %{python_sitelib}/pokernetwork/upgrade*
 %{python_sitelib}/pokernetwork/user*
 %{python_sitelib}/pokernetwork/version*
@@ -319,13 +325,16 @@
 %{_initrddir}/poker-server
 %dir %attr(-,%{poker_user},root) %{_var}/run/%{name}
 %dir %attr(-,%{poker_user},root) %{_var}/log/%{name}
+%{_bindir}/pokerstats
 %{_bindir}/poker-server-selinux
 %{_sbindir}/pokerserver
 %{_sbindir}/pokerdatabaseupgrade
+%{_mandir}/man1/pokerstats*
 %{_mandir}/man8/pokerserver*
 %{_mandir}/man8/pokerdatabaseupgrade*
 %{_datadir}/%{name}/*.sql
 %{_datadir}/%{name}/conf/poker.server.xml
+%{_datadir}/%{name}/conf/poker.stats.xml
 %{_datadir}/%{name}/conf/poker.pem
 %{_datadir}/%{name}/upgrades/poker.server
 %{_datadir}/%{name}/upgrades/upgrade
@@ -336,8 +345,11 @@
 %{python_sitelib}/pokernetwork/pokerlock*
 %{python_sitelib}/pokernetwork/pokerserver*
 %{python_sitelib}/pokernetwork/pokerservice*
+%{python_sitelib}/pokernetwork/pokersite*
 %{python_sitelib}/pokernetwork/pokertable*
 %{python_sitelib}/pokernetwork/server*
+%{python_sitelib}/pokerstats
+%{python_sitelib}/twisted/plugins/pokernetwork_plugin*
 
 %files -n poker-web
 %defattr(-,root,root,-)
@@ -366,6 +378,12 @@
 
 
 %changelog
+* Thu Jan 01 2009 Christopher Stone <chris.stone at gmail.com> 1.7.3-1
+- Upstream sync
+
+* Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 1.6.0-3
+- Rebuild for Python 2.6
+
 * Thu Oct 09 2008 Christopher Stone <chris.stone at gmail.com> 1.6.0-2
 - Update bot patch (bz #464986)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/poker-network/F-10/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	29 May 2008 17:23:12 -0000	1.9
+++ sources	3 Jan 2009 06:33:47 -0000	1.10
@@ -1 +1 @@
-1ba14542d834edcfac9782d0caeff8ba  poker-network-1.6.0.tar.gz
+9680fe96f33c678dd4825251f07d6823  poker-network-1.7.3.tar.gz



From xulchris at fedoraproject.org  Sat Jan  3 06:34:19 2009
From: xulchris at fedoraproject.org (Christopher Stone)
Date: Sat,  3 Jan 2009 06:34:19 +0000 (UTC)
Subject: rpms/poker-network/devel .cvsignore, 1.9, 1.10 poker-network.spec, 
	1.16, 1.17 sources, 1.9, 1.10
Message-ID: <20090103063419.30E5A70149@cvs1.fedora.phx.redhat.com>

Author: xulchris

Update of /cvs/pkgs/rpms/poker-network/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24714/devel

Modified Files:
	.cvsignore poker-network.spec sources 
Log Message:
upstream sync


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/poker-network/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	29 May 2008 17:23:12 -0000	1.9
+++ .cvsignore	3 Jan 2009 06:33:48 -0000	1.10
@@ -1 +1 @@
-poker-network-1.6.0.tar.gz
+poker-network-1.7.3.tar.gz


Index: poker-network.spec
===================================================================
RCS file: /cvs/pkgs/rpms/poker-network/devel/poker-network.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- poker-network.spec	29 Nov 2008 17:56:27 -0000	1.16
+++ poker-network.spec	3 Jan 2009 06:33:48 -0000	1.17
@@ -8,12 +8,12 @@
 
 
 Name:             poker-network
-Version:          1.6.0
-Release:          3%{?dist}
+Version:          1.7.3
+Release:          1%{?dist}
 Summary:          Base package for poker client and server
 
 Group:            Applications/Internet
-License:          GPLv2+
+License:          AGPLv3
 URL:              http://pokersource.org/poker-network
 Source0:          http://download.gna.org/pokersource/sources/%{name}-%{version}.tar.gz
 
@@ -288,12 +288,18 @@
 %dir %{_sysconfdir}/%{name}
 %dir %{python_sitelib}/pokernetwork
 %{python_sitelib}/pokernetwork/__init__*
+%{python_sitelib}/pokernetwork/attrpack*
+%{python_sitelib}/pokernetwork/countfilter*
 %{python_sitelib}/pokernetwork/dispatch*
+%{python_sitelib}/pokernetwork/nullfilter*
 %{python_sitelib}/pokernetwork/packets*
+%{python_sitelib}/pokernetwork/pokerauth*
+%{python_sitelib}/pokernetwork/pokermemcache*
 %{python_sitelib}/pokernetwork/pokernetworkconfig*
 %{python_sitelib}/pokernetwork/pokerpackets*
 %{python_sitelib}/pokernetwork/protocol*
 %{python_sitelib}/pokernetwork/proxy*
+%{python_sitelib}/pokernetwork/tourneyattrs*
 %{python_sitelib}/pokernetwork/upgrade*
 %{python_sitelib}/pokernetwork/user*
 %{python_sitelib}/pokernetwork/version*
@@ -319,13 +325,16 @@
 %{_initrddir}/poker-server
 %dir %attr(-,%{poker_user},root) %{_var}/run/%{name}
 %dir %attr(-,%{poker_user},root) %{_var}/log/%{name}
+%{_bindir}/pokerstats
 %{_bindir}/poker-server-selinux
 %{_sbindir}/pokerserver
 %{_sbindir}/pokerdatabaseupgrade
+%{_mandir}/man1/pokerstats*
 %{_mandir}/man8/pokerserver*
 %{_mandir}/man8/pokerdatabaseupgrade*
 %{_datadir}/%{name}/*.sql
 %{_datadir}/%{name}/conf/poker.server.xml
+%{_datadir}/%{name}/conf/poker.stats.xml
 %{_datadir}/%{name}/conf/poker.pem
 %{_datadir}/%{name}/upgrades/poker.server
 %{_datadir}/%{name}/upgrades/upgrade
@@ -336,8 +345,11 @@
 %{python_sitelib}/pokernetwork/pokerlock*
 %{python_sitelib}/pokernetwork/pokerserver*
 %{python_sitelib}/pokernetwork/pokerservice*
+%{python_sitelib}/pokernetwork/pokersite*
 %{python_sitelib}/pokernetwork/pokertable*
 %{python_sitelib}/pokernetwork/server*
+%{python_sitelib}/pokerstats
+%{python_sitelib}/twisted/plugins/pokernetwork_plugin*
 
 %files -n poker-web
 %defattr(-,root,root,-)
@@ -366,6 +378,9 @@
 
 
 %changelog
+* Thu Jan 01 2009 Christopher Stone <chris.stone at gmail.com> 1.7.3-1
+- Upstream sync
+
 * Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 1.6.0-3
 - Rebuild for Python 2.6
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/poker-network/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	29 May 2008 17:23:12 -0000	1.9
+++ sources	3 Jan 2009 06:33:48 -0000	1.10
@@ -1 +1 @@
-1ba14542d834edcfac9782d0caeff8ba  poker-network-1.6.0.tar.gz
+9680fe96f33c678dd4825251f07d6823  poker-network-1.7.3.tar.gz



From lmacken at fedoraproject.org  Sat Jan  3 06:36:47 2009
From: lmacken at fedoraproject.org (Luke Macken)
Date: Sat,  3 Jan 2009 06:36:47 +0000 (UTC)
Subject: rpms/TurboGears/devel TurboGears-1.0.8-cherrypyreq.patch, NONE,
	1.1 TurboGears-1.0.8-setup.patch, NONE, 1.1 TurboGears.spec,
	1.41, 1.42
Message-ID: <20090103063647.709867014C@cvs1.fedora.phx.redhat.com>

Author: lmacken

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

Modified Files:
	TurboGears.spec 
Added Files:
	TurboGears-1.0.8-cherrypyreq.patch 
	TurboGears-1.0.8-setup.patch 
Log Message:
* Sat Jan 03 2009 Luke Macken <lmacken at redhat.com> - 1.0.8-1
- Latest upstream release.



TurboGears-1.0.8-cherrypyreq.patch:

--- NEW FILE TurboGears-1.0.8-cherrypyreq.patch ---
--- turbogears/config.py.orig	2008-12-18 16:42:03.000000000 -0500
+++ turbogears/config.py	2008-12-18 16:42:06.000000000 -0500
@@ -1,8 +1,10 @@
 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.8-setup.patch:

--- NEW FILE TurboGears-1.0.8-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",
 ]
 


Index: TurboGears.spec
===================================================================
RCS file: /cvs/pkgs/rpms/TurboGears/devel/TurboGears.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- TurboGears.spec	29 Nov 2008 17:21:25 -0000	1.41
+++ TurboGears.spec	3 Jan 2009 06:36:17 -0000	1.42
@@ -2,8 +2,8 @@
 %{!?pyver: %define pyver %(%{__python} -c "import sys ; print sys.version[:3]")}
 
 Name:           TurboGears
-Version:        1.0.7
-Release:        3%{?dist}
+Version:        1.0.8
+Release:        1%{?dist}
 Summary:        Back-to-front web development in Python
 
 Group:          Development/Languages
@@ -92,6 +92,9 @@
 %{python_sitelib}/turbogears/
 
 %changelog
+* Sat Jan 03 2009 Luke Macken <lmacken at redhat.com> - 1.0.8-1
+- Latest upstream release.
+
 * Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 1.0.7-3
 - Rebuild for Python 2.6
 



From dcbw at fedoraproject.org  Sat Jan  3 07:55:53 2009
From: dcbw at fedoraproject.org (Daniel Williams)
Date: Sat,  3 Jan 2009 07:55:53 +0000 (UTC)
Subject: rpms/NetworkManager-openvpn/F-8 NetworkManager-openvpn.spec, 1.20, 
	1.21
Message-ID: <20090103075553.7E5C070161@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-serv16932

Modified Files:
	NetworkManager-openvpn.spec 
Log Message:
remove erroneous change entry


Index: NetworkManager-openvpn.spec
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager-openvpn/F-8/NetworkManager-openvpn.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- NetworkManager-openvpn.spec	3 Jan 2009 07:46:16 -0000	1.20
+++ NetworkManager-openvpn.spec	3 Jan 2009 07:55:23 -0000	1.21
@@ -108,7 +108,6 @@
 * Sat Jan  3 2009 Dan Williams <dcbw at redhat.com> 1:0.7.0-18.svn11
 - Rebuild for updated NetworkManager
 - Fix some specfile issues (rh #477149)
-- Allow the EAP authentication method
 
 * Sat Dec 20 2008 Christoph H??ger <choeger at cs.tu-berlin.de> 0.7.0-17.svn4326
 - removed libpng-devel from BuildRequires, added %{_datadir}/gnome-vpn-properties/openvpn/ (rh #477149)



From dcbw at fedoraproject.org  Sat Jan  3 06:27:37 2009
From: dcbw at fedoraproject.org (Daniel Williams)
Date: Sat,  3 Jan 2009 06:27:37 +0000 (UTC)
Subject: rpms/NetworkManager/F-10 NetworkManager.spec, 1.249,
	1.250 nm-applet-internal-buildfixes.patch, 1.1, 1.2 sources,
	1.127, 1.128
Message-ID: <20090103062737.3FE1A70145@cvs1.fedora.phx.redhat.com>

Author: dcbw

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

Modified Files:
	NetworkManager.spec nm-applet-internal-buildfixes.patch 
	sources 
Log Message:
* Fri Jan  2 2009 Dan Williams <dcbw at redhat.com> - 1:0.7.0-1.git20090102
- Update to 0.7.1 pre-release
- Allow connections to be ignored when determining the default route (rh #476089)
- Own /usr/share/gnome-vpn-properties (rh #477155)
- Fix log flooding due to netlink errors (rh #459205)
- Pass connection UUID to dispatcher scripts via the environment
- Fix possible crash after deactivating a VPN connection
- Fix issues with editing wired 802.1x connections
- Fix issues when using PKCS#12 certificates with 802.1x connections



Index: NetworkManager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager/F-10/NetworkManager.spec,v
retrieving revision 1.249
retrieving revision 1.250
diff -u -r1.249 -r1.250
--- NetworkManager.spec	22 Nov 2008 03:09:54 -0000	1.249
+++ NetworkManager.spec	3 Jan 2009 06:27:06 -0000	1.250
@@ -9,20 +9,20 @@
 %define libnl_version 1.1
 %define ppp_version 2.2.4
 
-%define snapshot svn4326
-%define applet_snapshot svn1043
+%define snapshot git20090102
+%define applet_snapshot svn1091
 
 Name: NetworkManager
 Summary: Network connection manager and user applications
 Epoch: 1
 Version: 0.7.0
-Release: 0.12.%{snapshot}%{?dist}
+Release: 1.%{snapshot}%{?dist}
 Group: System Environment/Base
 License: GPLv2+
 URL: http://www.gnome.org/projects/NetworkManager/
 
-Source: %{name}-%{version}.%{snapshot}.tar.gz
-Source1: nm-applet-%{version}.%{applet_snapshot}.tar.gz
+Source: %{name}-%{version}.%{snapshot}.tar.bz2
+Source1: network-manager-applet-%{version}.%{applet_snapshot}.tar.gz
 Source2: nm-system-settings.conf
 Patch1: nm-applet-internal-buildfixes.patch
 Patch2: explain-dns1-dns2.patch
@@ -42,9 +42,9 @@
 Requires: dnsmasq
 Obsoletes: dhcdbd
 
-Conflicts: NetworkManager-vpnc < 1:0.7.0-0.11.svn4326
-Conflicts: NetworkManager-openvpn < 1:0.7.0-16.svn4326
-Conflicts: NetworkManager-pptp < 1:0.7.0-0.12.svn4326
+Conflicts: NetworkManager-vpnc < 1:0.7.0-1
+Conflicts: NetworkManager-openvpn < 1:0.7.0-17
+Conflicts: NetworkManager-pptp < 1:0.7.0-1
 
 BuildRequires: dbus-devel >= %{dbus_version}
 BuildRequires: dbus-glib-devel >= %{dbus_glib_version}
@@ -142,6 +142,11 @@
 %patch2 -p1 -b .explain-dns1-dns2
 
 %build
+
+# back up pristine docs and use them instead of generated ones, which make
+# multilib unhappy due to different timestamps in the generated content
+%{__cp} -R docs ORIG-docs
+
 autoreconf -i
 %configure \
 	--disable-static \
@@ -154,10 +159,10 @@
 make
 
 # build the applet
-pushd nm-applet-0.7.0
+pushd network-manager-applet-0.7.0
 	autoreconf -i
 	intltoolize --force
-	%configure --disable-static
+	%configure --disable-static --enable-more-warnings=yes
 	make
 popd
 
@@ -170,13 +175,18 @@
 %{__cp} %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/
 
 # install the applet
-pushd nm-applet-0.7.0
+pushd network-manager-applet-0.7.0
   make install DESTDIR=$RPM_BUILD_ROOT
 popd
 
 # create a VPN directory
 %{__mkdir_p} $RPM_BUILD_ROOT%{_sysconfdir}/NetworkManager/VPN
 
+# create a keyfile plugin system settings directory
+%{__mkdir_p} $RPM_BUILD_ROOT%{_sysconfdir}/NetworkManager/system-connections
+
+%{__mkdir_p} $RPM_BUILD_ROOT%{_datadir}/gnome-vpn-properties
+
 %find_lang %{name}
 %find_lang nm-applet
 cat nm-applet.lang >> %{name}.lang
@@ -187,6 +197,11 @@
 
 install -m 0755 test/.libs/nm-online %{buildroot}/%{_bindir}
 
+# install the pristine docs
+%{__cp} ORIG-docs/libnm-glib/html/* $RPM_BUILD_ROOT%{_datadir}/gtk-doc/html/libnm-glib/
+%{__cp} ORIG-docs/libnm-util/html/* $RPM_BUILD_ROOT%{_datadir}/gtk-doc/html/libnm-util/
+
+
 %clean
 %{__rm} -rf $RPM_BUILD_ROOT
 
@@ -252,6 +267,7 @@
 %{_prefix}/libexec/nm-crash-logger
 %dir %{_datadir}/NetworkManager
 %{_datadir}/NetworkManager/gdb-cmd
+%dir %{_sysconfdir}/NetworkManager/system-connections
 %{_datadir}/dbus-1/system-services/org.freedesktop.NetworkManagerSystemSettings.service
 %{_datadir}/dbus-1/system-services/org.freedesktop.nm_dispatcher.service
 %{_libdir}/pppd/2.4.4/nm-pppd-plugin.so
@@ -275,6 +291,7 @@
 %{_datadir}/icons/hicolor/22x22/apps/*.png
 %{_datadir}/icons/hicolor/48x48/apps/*.png
 %{_sysconfdir}/xdg/autostart/nm-applet.desktop
+%dir %{_datadir}/gnome-vpn-properties
 
 %files glib
 %defattr(-,root,root,0755)
@@ -299,6 +316,16 @@
 %{_datadir}/gtk-doc/html/libnm-util/*
 
 %changelog
+* Fri Jan  2 2009 Dan Williams <dcbw at redhat.com> - 1:0.7.0-1.git20090102
+- Update to 0.7.1 pre-release
+- Allow connections to be ignored when determining the default route (rh #476089)
+- Own /usr/share/gnome-vpn-properties (rh #477155)
+- Fix log flooding due to netlink errors (rh #459205)
+- Pass connection UUID to dispatcher scripts via the environment
+- Fix possible crash after deactivating a VPN connection
+- Fix issues with editing wired 802.1x connections
+- Fix issues when using PKCS#12 certificates with 802.1x connections
+
 * Fri Nov 21 2008 Dan Williams <dcbw at redhat.com> - 1:0.7.0-0.12.svn4326
 - API and documentation updates
 - Fix PIN handling on 'hso' mobile broadband devices

nm-applet-internal-buildfixes.patch:

Index: nm-applet-internal-buildfixes.patch
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager/F-10/nm-applet-internal-buildfixes.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nm-applet-internal-buildfixes.patch	17 Nov 2008 23:24:03 -0000	1.1
+++ nm-applet-internal-buildfixes.patch	3 Jan 2009 06:27:06 -0000	1.2
@@ -1,6 +1,6 @@
-diff -up NetworkManager-0.7.0/nm-applet-0.7.0/configure.ac.buildfix NetworkManager-0.7.0/nm-applet-0.7.0/configure.ac
---- NetworkManager-0.7.0/nm-applet-0.7.0/configure.ac.buildfix	2008-11-17 08:37:21.000000000 -0500
-+++ NetworkManager-0.7.0/nm-applet-0.7.0/configure.ac	2008-11-17 18:04:35.000000000 -0500
+diff -up NetworkManager-0.7.0/network-manager-applet-0.7.0/configure.ac.buildfix NetworkManager-0.7.0/network-manager-applet-0.7.0/configure.ac
+--- NetworkManager-0.7.0/network-manager-applet-0.7.0/configure.ac.buildfix	2008-11-17 08:37:21.000000000 -0500
++++ NetworkManager-0.7.0/network-manager-applet-0.7.0/configure.ac	2008-11-17 18:04:35.000000000 -0500
 @@ -68,10 +68,6 @@ PKG_CHECK_MODULES(GOBJECT, gobject-2.0)
  PKG_CHECK_MODULES(NMA,
  		[dbus-glib-1 >= 0.72
@@ -12,9 +12,9 @@
  		 gtk+-2.0 >= 2.10
  		 libglade-2.0
  		 gmodule-export-2.0
-diff -up NetworkManager-0.7.0/nm-applet-0.7.0/src/connection-editor/Makefile.am.buildfix NetworkManager-0.7.0/nm-applet-0.7.0/src/connection-editor/Makefile.am
---- NetworkManager-0.7.0/nm-applet-0.7.0/src/connection-editor/Makefile.am.buildfix	2008-11-17 08:37:20.000000000 -0500
-+++ NetworkManager-0.7.0/nm-applet-0.7.0/src/connection-editor/Makefile.am	2008-11-17 18:04:35.000000000 -0500
+diff -up NetworkManager-0.7.0/network-manager-applet-0.7.0/src/connection-editor/Makefile.am.buildfix NetworkManager-0.7.0/network-manager-applet-0.7.0/src/connection-editor/Makefile.am
+--- NetworkManager-0.7.0/network-manager-applet-0.7.0/src/connection-editor/Makefile.am.buildfix	2008-11-17 08:37:20.000000000 -0500
++++ NetworkManager-0.7.0/network-manager-applet-0.7.0/src/connection-editor/Makefile.am	2008-11-17 18:04:35.000000000 -0500
 @@ -2,6 +2,10 @@ NULL=
  
  bin_PROGRAMS = nm-connection-editor
@@ -38,9 +38,9 @@
  
  if NO_POLKIT_GNOME
  nm_connection_editor_LDADD += \
-diff -up NetworkManager-0.7.0/nm-applet-0.7.0/src/gconf-helpers/Makefile.am.buildfix NetworkManager-0.7.0/nm-applet-0.7.0/src/gconf-helpers/Makefile.am
---- NetworkManager-0.7.0/nm-applet-0.7.0/src/gconf-helpers/Makefile.am.buildfix	2008-05-06 11:16:09.000000000 -0400
-+++ NetworkManager-0.7.0/nm-applet-0.7.0/src/gconf-helpers/Makefile.am	2008-11-17 18:04:35.000000000 -0500
+diff -up NetworkManager-0.7.0/network-manager-applet-0.7.0/src/gconf-helpers/Makefile.am.buildfix NetworkManager-0.7.0/network-manager-applet-0.7.0/src/gconf-helpers/Makefile.am
+--- NetworkManager-0.7.0/network-manager-applet-0.7.0/src/gconf-helpers/Makefile.am.buildfix	2008-05-06 11:16:09.000000000 -0400
++++ NetworkManager-0.7.0/network-manager-applet-0.7.0/src/gconf-helpers/Makefile.am	2008-11-17 18:04:35.000000000 -0500
 @@ -1,3 +1,7 @@
 +INCLUDES = -I${top_srcdir}/../include \
 +           -I${top_srcdir}/../libnm-util \
@@ -58,9 +58,9 @@
 +	-L${top_builddir}/../libnm-util $(top_builddir)/../libnm-util/libnm-util.la \
 +	-L${top_builddir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm_glib.la
  
-diff -up NetworkManager-0.7.0/nm-applet-0.7.0/src/Makefile.am.buildfix NetworkManager-0.7.0/nm-applet-0.7.0/src/Makefile.am
---- NetworkManager-0.7.0/nm-applet-0.7.0/src/Makefile.am.buildfix	2008-11-17 08:37:20.000000000 -0500
-+++ NetworkManager-0.7.0/nm-applet-0.7.0/src/Makefile.am	2008-11-17 18:04:35.000000000 -0500
+diff -up NetworkManager-0.7.0/network-manager-applet-0.7.0/src/Makefile.am.buildfix NetworkManager-0.7.0/network-manager-applet-0.7.0/src/Makefile.am
+--- NetworkManager-0.7.0/network-manager-applet-0.7.0/src/Makefile.am.buildfix	2008-11-17 08:37:20.000000000 -0500
++++ NetworkManager-0.7.0/network-manager-applet-0.7.0/src/Makefile.am	2008-11-17 18:04:35.000000000 -0500
 @@ -4,6 +4,10 @@ NULL=
  
  bin_PROGRAMS = nm-applet
@@ -83,9 +83,9 @@
  
  gladedir = $(datadir)/nm-applet
  glade_DATA = applet.glade keyring.png
-diff -up NetworkManager-0.7.0/nm-applet-0.7.0/src/utils/Makefile.am.buildfix NetworkManager-0.7.0/nm-applet-0.7.0/src/utils/Makefile.am
---- NetworkManager-0.7.0/nm-applet-0.7.0/src/utils/Makefile.am.buildfix	2008-05-19 11:02:18.000000000 -0400
-+++ NetworkManager-0.7.0/nm-applet-0.7.0/src/utils/Makefile.am	2008-11-17 18:04:35.000000000 -0500
+diff -up NetworkManager-0.7.0/network-manager-applet-0.7.0/src/utils/Makefile.am.buildfix NetworkManager-0.7.0/network-manager-applet-0.7.0/src/utils/Makefile.am
+--- NetworkManager-0.7.0/network-manager-applet-0.7.0/src/utils/Makefile.am.buildfix	2008-05-19 11:02:18.000000000 -0400
++++ NetworkManager-0.7.0/network-manager-applet-0.7.0/src/utils/Makefile.am	2008-11-17 18:04:35.000000000 -0500
 @@ -1,3 +1,7 @@
 +INCLUDES = -I${top_srcdir}/../include \
 +           -I${top_srcdir}/../libnm-util \
@@ -103,9 +103,9 @@
 +	-L${top_builddir}/../libnm-util $(top_builddir)/../libnm-util/libnm-util.la \
 +	-L${top_builddir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm_glib.la
 +
-diff -up NetworkManager-0.7.0/nm-applet-0.7.0/src/wireless-security/Makefile.am.buildfix NetworkManager-0.7.0/nm-applet-0.7.0/src/wireless-security/Makefile.am
---- NetworkManager-0.7.0/nm-applet-0.7.0/src/wireless-security/Makefile.am.buildfix	2008-03-30 13:17:59.000000000 -0400
-+++ NetworkManager-0.7.0/nm-applet-0.7.0/src/wireless-security/Makefile.am	2008-11-17 18:04:35.000000000 -0500
+diff -up NetworkManager-0.7.0/network-manager-applet-0.7.0/src/wireless-security/Makefile.am.buildfix NetworkManager-0.7.0/network-manager-applet-0.7.0/src/wireless-security/Makefile.am
+--- NetworkManager-0.7.0/network-manager-applet-0.7.0/src/wireless-security/Makefile.am.buildfix	2008-03-30 13:17:59.000000000 -0400
++++ NetworkManager-0.7.0/network-manager-applet-0.7.0/src/wireless-security/Makefile.am	2008-11-17 18:04:35.000000000 -0500
 @@ -1,5 +1,9 @@
  noinst_LTLIBRARIES = libwireless-security.la
  


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager/F-10/sources,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -r1.127 -r1.128
--- sources	22 Nov 2008 03:09:54 -0000	1.127
+++ sources	3 Jan 2009 06:27:06 -0000	1.128
@@ -1,2 +1,2 @@
-509ba458b104d4bbc5b4f78ca78ced87  NetworkManager-0.7.0.svn4326.tar.gz
-ac72a80e42d96e359969f96bc0ddf614  nm-applet-0.7.0.svn1043.tar.gz
+ca82bfac7c8388ee04a0fad8aac3b84a  NetworkManager-0.7.0.git20090102.tar.bz2
+144f84a8f2351e59f66b13aff11b5975  network-manager-applet-0.7.0.svn1091.tar.gz



From dcbw at fedoraproject.org  Sat Jan  3 07:45:17 2009
From: dcbw at fedoraproject.org (Daniel Williams)
Date: Sat,  3 Jan 2009 07:45:17 +0000 (UTC)
Subject: rpms/NetworkManager-openvpn/F-9 NetworkManager-openvpn.spec, 1.26, 
	1.27 sources, 1.12, 1.13
Message-ID: <20090103074517.7C76D7015B@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-serv13419

Modified Files:
	NetworkManager-openvpn.spec sources 
Log Message:
* Sat Jan  3 2009 Dan Williams <dcbw at redhat.com> 1:0.7.0-18.svn11
- Rebuild for updated NetworkManager
- Fix some specfile issues (rh #477149)
- Allow the EAP authentication method




Index: NetworkManager-openvpn.spec
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager-openvpn/F-9/NetworkManager-openvpn.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- NetworkManager-openvpn.spec	20 Dec 2008 12:11:06 -0000	1.26
+++ NetworkManager-openvpn.spec	3 Jan 2009 07:44:46 -0000	1.27
@@ -1,16 +1,16 @@
-%define nm_version          1:0.7.0-0.12.svn4326
+%define nm_version          1:0.7.0-1
 %define dbus_version        1.1
 %define gtk2_version        2.10.0
 %define openvpn_version     2.1
 %define shared_mime_version 0.16-3
 
-%define svn_snapshot svn4326
+%define svn_snapshot svn11
 
 Summary: NetworkManager VPN plugin for OpenVPN
 Name: NetworkManager-openvpn
 Epoch:   1
 Version: 0.7.0
-Release: 17.%{svn_snapshot}%{?dist}
+Release: 18.%{svn_snapshot}%{?dist}
 License: GPLv2+
 URL: http://www.gnome.org/projects/NetworkManager/
 Group: System Environment/Base
@@ -29,7 +29,6 @@
 BuildRequires: NetworkManager-glib-devel  >= %{nm_version}
 BuildRequires: glib2-devel
 BuildRequires: GConf2-devel
-BuildRequires: libgnomeui-devel
 BuildRequires: gnome-keyring-devel
 BuildRequires: libglade2-devel
 BuildRequires: perl-XML-Parser
@@ -60,7 +59,7 @@
 if [ ! -f configure ]; then
   ./autogen.sh
 fi
-%configure --disable-static --disable-dependency-tracking
+%configure --disable-static --disable-dependency-tracking --enable-more-warnings=yes
 make %{?_smp_mflags}
 
 %install
@@ -100,12 +99,17 @@
 %{_sysconfdir}/NetworkManager/VPN/nm-openvpn-service.name
 %{_libexecdir}/nm-openvpn-service
 %{_libexecdir}/nm-openvpn-service-openvpn-helper
-%{_datadir}/gnome-vpn-properties/openvpn/
 %{_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
+%dir %{_datadir}/gnome-vpn-properties/openvpn
 
 %changelog
+* Sat Jan  3 2009 Dan Williams <dcbw at redhat.com> 1:0.7.0-18.svn11
+- Rebuild for updated NetworkManager
+- Fix some specfile issues (rh #477149)
+- Allow the EAP authentication method
+
 * Sat Dec 20 2008 Christoph H??ger <choeger at cs.tu-berlin.de> 0.7.0-17.svn4326
 - removed libpng-devel from BuildRequires, added %{_datadir}/gnome-vpn-properties/openvpn/ (rh #477149)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager-openvpn/F-9/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	22 Nov 2008 04:01:59 -0000	1.12
+++ sources	3 Jan 2009 07:44:47 -0000	1.13
@@ -1 +1 @@
-027b5577aac9b132fdbd0735eb3ccdeb  NetworkManager-openvpn-0.7.0.svn4326.tar.gz
+de7716aef7fe8665030e82aa244ec3c0  NetworkManager-openvpn-0.7.0.svn11.tar.gz



From dcbw at fedoraproject.org  Sat Jan  3 07:50:34 2009
From: dcbw at fedoraproject.org (Daniel Williams)
Date: Sat,  3 Jan 2009 07:50:34 +0000 (UTC)
Subject: rpms/NetworkManager-openvpn/devel NetworkManager-openvpn.spec, 1.28,
	1.29
Message-ID: <20090103075034.675747015D@cvs1.fedora.phx.redhat.com>

Author: dcbw

Update of /cvs/pkgs/rpms/NetworkManager-openvpn/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15382

Modified Files:
	NetworkManager-openvpn.spec 
Log Message:
remove erroneous change entry


Index: NetworkManager-openvpn.spec
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager-openvpn/devel/NetworkManager-openvpn.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- NetworkManager-openvpn.spec	3 Jan 2009 07:41:58 -0000	1.28
+++ NetworkManager-openvpn.spec	3 Jan 2009 07:50:04 -0000	1.29
@@ -108,7 +108,6 @@
 * Sat Jan  3 2009 Dan Williams <dcbw at redhat.com> 1:0.7.0-18.svn11
 - Rebuild for updated NetworkManager
 - Fix some specfile issues (rh #477149)
-- Allow the EAP authentication method
 
 * Sat Dec 20 2008 Christoph H??ger <choeger at cs.tu-berlin.de> 0.7.0-17.svn4326
 - removed libpng-devel from BuildRequires, added %{_datadir}/gnome-vpn-properties/openvpn/ (rh #477149)



From dcbw at fedoraproject.org  Sat Jan  3 07:43:21 2009
From: dcbw at fedoraproject.org (Daniel Williams)
Date: Sat,  3 Jan 2009 07:43:21 +0000 (UTC)
Subject: rpms/NetworkManager-openvpn/F-10 NetworkManager-openvpn.spec, 1.28, 
	1.29 sources, 1.16, 1.17
Message-ID: <20090103074321.C2DEC70159@cvs1.fedora.phx.redhat.com>

Author: dcbw

Update of /cvs/pkgs/rpms/NetworkManager-openvpn/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12871

Modified Files:
	NetworkManager-openvpn.spec sources 
Log Message:
* Sat Jan  3 2009 Dan Williams <dcbw at redhat.com> 1:0.7.0-18.svn11
- Rebuild for updated NetworkManager
- Fix some specfile issues (rh #477149)
- Allow the EAP authentication method




Index: NetworkManager-openvpn.spec
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager-openvpn/F-10/NetworkManager-openvpn.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- NetworkManager-openvpn.spec	20 Dec 2008 11:47:29 -0000	1.28
+++ NetworkManager-openvpn.spec	3 Jan 2009 07:42:51 -0000	1.29
@@ -1,16 +1,16 @@
-%define nm_version          1:0.7.0-0.12.svn4326
+%define nm_version          1:0.7.0-1
 %define dbus_version        1.1
 %define gtk2_version        2.10.0
 %define openvpn_version     2.1
 %define shared_mime_version 0.16-3
 
-%define svn_snapshot svn4326
+%define svn_snapshot svn11
 
 Summary: NetworkManager VPN plugin for OpenVPN
 Name: NetworkManager-openvpn
 Epoch:   1
 Version: 0.7.0
-Release: 17.%{svn_snapshot}%{?dist}
+Release: 18.%{svn_snapshot}%{?dist}
 License: GPLv2+
 URL: http://www.gnome.org/projects/NetworkManager/
 Group: System Environment/Base
@@ -29,7 +29,6 @@
 BuildRequires: NetworkManager-glib-devel  >= %{nm_version}
 BuildRequires: glib2-devel
 BuildRequires: GConf2-devel
-BuildRequires: libgnomeui-devel
 BuildRequires: gnome-keyring-devel
 BuildRequires: libglade2-devel
 BuildRequires: perl-XML-Parser
@@ -60,7 +59,7 @@
 if [ ! -f configure ]; then
   ./autogen.sh
 fi
-%configure --disable-static --disable-dependency-tracking
+%configure --disable-static --disable-dependency-tracking --enable-more-warnings=yes
 make %{?_smp_mflags}
 
 %install
@@ -100,12 +99,17 @@
 %{_sysconfdir}/NetworkManager/VPN/nm-openvpn-service.name
 %{_libexecdir}/nm-openvpn-service
 %{_libexecdir}/nm-openvpn-service-openvpn-helper
-%{_datadir}/gnome-vpn-properties/openvpn/
 %{_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
+%dir %{_datadir}/gnome-vpn-properties/openvpn
 
 %changelog
+* Sat Jan  3 2009 Dan Williams <dcbw at redhat.com> 1:0.7.0-18.svn11
+- Rebuild for updated NetworkManager
+- Fix some specfile issues (rh #477149)
+- Allow the EAP authentication method
+
 * Sat Dec 20 2008 Christoph H??ger <choeger at cs.tu-berlin.de> 0.7.0-17.svn4326
 - removed libpng-devel from BuildRequires, added %{_datadir}/gnome-vpn-properties/openvpn/ (rh #477149)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager-openvpn/F-10/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources	22 Nov 2008 03:57:41 -0000	1.16
+++ sources	3 Jan 2009 07:42:51 -0000	1.17
@@ -1 +1 @@
-027b5577aac9b132fdbd0735eb3ccdeb  NetworkManager-openvpn-0.7.0.svn4326.tar.gz
+de7716aef7fe8665030e82aa244ec3c0  NetworkManager-openvpn-0.7.0.svn11.tar.gz



From xulchris at fedoraproject.org  Sat Jan  3 06:34:18 2009
From: xulchris at fedoraproject.org (Christopher Stone)
Date: Sat,  3 Jan 2009 06:34:18 +0000 (UTC)
Subject: rpms/poker-network/F-9 .cvsignore, 1.9, 1.10 poker-network.spec,
	1.15, 1.16 sources, 1.9, 1.10
Message-ID: <20090103063418.C1D6C70148@cvs1.fedora.phx.redhat.com>

Author: xulchris

Update of /cvs/pkgs/rpms/poker-network/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24714/F-9

Modified Files:
	.cvsignore poker-network.spec sources 
Log Message:
upstream sync


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/poker-network/F-9/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	29 May 2008 17:22:56 -0000	1.9
+++ .cvsignore	3 Jan 2009 06:33:48 -0000	1.10
@@ -1 +1 @@
-poker-network-1.6.0.tar.gz
+poker-network-1.7.3.tar.gz


Index: poker-network.spec
===================================================================
RCS file: /cvs/pkgs/rpms/poker-network/F-9/poker-network.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- poker-network.spec	9 Oct 2008 15:22:08 -0000	1.15
+++ poker-network.spec	3 Jan 2009 06:33:48 -0000	1.16
@@ -8,12 +8,12 @@
 
 
 Name:             poker-network
-Version:          1.6.0
-Release:          2%{?dist}
+Version:          1.7.3
+Release:          1%{?dist}
 Summary:          Base package for poker client and server
 
 Group:            Applications/Internet
-License:          GPLv2+
+License:          AGPLv3
 URL:              http://pokersource.org/poker-network
 Source0:          http://download.gna.org/pokersource/sources/%{name}-%{version}.tar.gz
 
@@ -288,12 +288,18 @@
 %dir %{_sysconfdir}/%{name}
 %dir %{python_sitelib}/pokernetwork
 %{python_sitelib}/pokernetwork/__init__*
+%{python_sitelib}/pokernetwork/attrpack*
+%{python_sitelib}/pokernetwork/countfilter*
 %{python_sitelib}/pokernetwork/dispatch*
+%{python_sitelib}/pokernetwork/nullfilter*
 %{python_sitelib}/pokernetwork/packets*
+%{python_sitelib}/pokernetwork/pokerauth*
+%{python_sitelib}/pokernetwork/pokermemcache*
 %{python_sitelib}/pokernetwork/pokernetworkconfig*
 %{python_sitelib}/pokernetwork/pokerpackets*
 %{python_sitelib}/pokernetwork/protocol*
 %{python_sitelib}/pokernetwork/proxy*
+%{python_sitelib}/pokernetwork/tourneyattrs*
 %{python_sitelib}/pokernetwork/upgrade*
 %{python_sitelib}/pokernetwork/user*
 %{python_sitelib}/pokernetwork/version*
@@ -319,13 +325,16 @@
 %{_initrddir}/poker-server
 %dir %attr(-,%{poker_user},root) %{_var}/run/%{name}
 %dir %attr(-,%{poker_user},root) %{_var}/log/%{name}
+%{_bindir}/pokerstats
 %{_bindir}/poker-server-selinux
 %{_sbindir}/pokerserver
 %{_sbindir}/pokerdatabaseupgrade
+%{_mandir}/man1/pokerstats*
 %{_mandir}/man8/pokerserver*
 %{_mandir}/man8/pokerdatabaseupgrade*
 %{_datadir}/%{name}/*.sql
 %{_datadir}/%{name}/conf/poker.server.xml
+%{_datadir}/%{name}/conf/poker.stats.xml
 %{_datadir}/%{name}/conf/poker.pem
 %{_datadir}/%{name}/upgrades/poker.server
 %{_datadir}/%{name}/upgrades/upgrade
@@ -336,8 +345,11 @@
 %{python_sitelib}/pokernetwork/pokerlock*
 %{python_sitelib}/pokernetwork/pokerserver*
 %{python_sitelib}/pokernetwork/pokerservice*
+%{python_sitelib}/pokernetwork/pokersite*
 %{python_sitelib}/pokernetwork/pokertable*
 %{python_sitelib}/pokernetwork/server*
+%{python_sitelib}/pokerstats
+%{python_sitelib}/twisted/plugins/pokernetwork_plugin*
 
 %files -n poker-web
 %defattr(-,root,root,-)
@@ -366,6 +378,12 @@
 
 
 %changelog
+* Thu Jan 01 2009 Christopher Stone <chris.stone at gmail.com> 1.7.3-1
+- Upstream sync
+
+* Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 1.6.0-3
+- Rebuild for Python 2.6
+
 * Thu Oct 09 2008 Christopher Stone <chris.stone at gmail.com> 1.6.0-2
 - Update bot patch (bz #464986)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/poker-network/F-9/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	29 May 2008 17:22:56 -0000	1.9
+++ sources	3 Jan 2009 06:33:48 -0000	1.10
@@ -1 +1 @@
-1ba14542d834edcfac9782d0caeff8ba  poker-network-1.6.0.tar.gz
+9680fe96f33c678dd4825251f07d6823  poker-network-1.7.3.tar.gz



From pbrobinson at fedoraproject.org  Sat Jan  3 06:46:31 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Sat,  3 Jan 2009 06:46:31 +0000 (UTC)
Subject: rpms/libiphone/devel .cvsignore,1.2,1.3 sources,1.2,1.3
Message-ID: <20090103064631.F34EB7014E@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

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

Modified Files:
	.cvsignore sources 
Log Message:
- Update sources



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libiphone/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	4 Dec 2008 10:57:27 -0000	1.2
+++ .cvsignore	3 Jan 2009 06:46:01 -0000	1.3
@@ -1 +1 @@
-libiphone-0.1.0-20081201.tar.bz2
+libiphone-0.1.0-20090103.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libiphone/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	4 Dec 2008 10:57:27 -0000	1.2
+++ sources	3 Jan 2009 06:46:01 -0000	1.3
@@ -1 +1 @@
-c360e277e5a361667245561d010c4a76  libiphone-0.1.0-20081201.tar.bz2
+2b84f8b2961b3082863b697b4b3cc0dc  libiphone-0.1.0-20090103.tar.bz2



From dcbw at fedoraproject.org  Sat Jan  3 06:34:49 2009
From: dcbw at fedoraproject.org (Daniel Williams)
Date: Sat,  3 Jan 2009 06:34:49 +0000 (UTC)
Subject: rpms/NetworkManager/F-9 NetworkManager.spec, 1.246,
	1.247 nm-applet-internal-buildfixes.patch, 1.1, 1.2 sources,
	1.125, 1.126
Message-ID: <20090103063449.7DDA57014A@cvs1.fedora.phx.redhat.com>

Author: dcbw

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

Modified Files:
	NetworkManager.spec nm-applet-internal-buildfixes.patch 
	sources 
Log Message:
* Fri Jan  2 2009 Dan Williams <dcbw at redhat.com> - 1:0.7.0-1.git20090102
- Update to 0.7.1 pre-release
- Allow connections to be ignored when determining the default route (rh #476089)
- Own /usr/share/gnome-vpn-properties (rh #477155)
- Fix log flooding due to netlink errors (rh #459205)
- Pass connection UUID to dispatcher scripts via the environment
- Fix possible crash after deactivating a VPN connection
- Fix issues with editing wired 802.1x connections
- Fix issues when using PKCS#12 certificates with 802.1x connections




Index: NetworkManager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager/F-9/NetworkManager.spec,v
retrieving revision 1.246
retrieving revision 1.247
diff -u -r1.246 -r1.247
--- NetworkManager.spec	22 Nov 2008 03:10:06 -0000	1.246
+++ NetworkManager.spec	3 Jan 2009 06:34:18 -0000	1.247
@@ -9,20 +9,20 @@
 %define libnl_version 1.1
 %define ppp_version 2.2.4
 
-%define snapshot svn4326
-%define applet_snapshot svn1043
+%define snapshot git20090102
+%define applet_snapshot svn1091
 
 Name: NetworkManager
 Summary: Network connection manager and user applications
 Epoch: 1
 Version: 0.7.0
-Release: 0.12.%{snapshot}%{?dist}
+Release: 1.%{snapshot}%{?dist}
 Group: System Environment/Base
 License: GPLv2+
 URL: http://www.gnome.org/projects/NetworkManager/
 
-Source: %{name}-%{version}.%{snapshot}.tar.gz
-Source1: nm-applet-%{version}.%{applet_snapshot}.tar.gz
+Source: %{name}-%{version}.%{snapshot}.tar.bz2
+Source1: network-manager-applet-%{version}.%{applet_snapshot}.tar.gz
 Source2: nm-system-settings.conf
 Patch1: nm-applet-internal-buildfixes.patch
 Patch2: explain-dns1-dns2.patch
@@ -43,9 +43,9 @@
 Requires: dnsmasq
 Obsoletes: dhcdbd
 
-Conflicts: NetworkManager-vpnc < 1:0.7.0-0.11.svn4326
-Conflicts: NetworkManager-openvpn < 1:0.7.0-16.svn4326
-Conflicts: NetworkManager-pptp < 1:0.7.0-0.12.svn4326
+Conflicts: NetworkManager-vpnc < 1:0.7.0-1
+Conflicts: NetworkManager-openvpn < 1:0.7.0-17
+Conflicts: NetworkManager-pptp < 1:0.7.0-1
 
 BuildRequires: dbus-devel >= %{dbus_version}
 BuildRequires: dbus-glib-devel >= %{dbus_glib_version}
@@ -147,6 +147,11 @@
 %patch10 -p1 -b .old-dbus-glib
 
 %build
+
+# back up pristine docs and use them instead of generated ones, which make
+# multilib unhappy due to different timestamps in the generated content
+%{__cp} -R docs ORIG-docs
+
 autoreconf -i
 %configure \
 	--disable-static \
@@ -159,10 +164,10 @@
 make
 
 # build the applet
-pushd nm-applet-0.7.0
+pushd network-manager-applet-0.7.0
 	autoreconf -i
 	intltoolize --force
-	%configure --disable-static
+	%configure --disable-static --enable-more-warnings=yes
 	make
 popd
 
@@ -175,13 +180,18 @@
 %{__cp} %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/
 
 # install the applet
-pushd nm-applet-0.7.0
+pushd network-manager-applet-0.7.0
   make install DESTDIR=$RPM_BUILD_ROOT
 popd
 
 # create a VPN directory
 %{__mkdir_p} $RPM_BUILD_ROOT%{_sysconfdir}/NetworkManager/VPN
 
+# create a keyfile plugin system settings directory
+%{__mkdir_p} $RPM_BUILD_ROOT%{_sysconfdir}/NetworkManager/system-connections
+
+%{__mkdir_p} $RPM_BUILD_ROOT%{_datadir}/gnome-vpn-properties
+
 %find_lang %{name}
 %find_lang nm-applet
 cat nm-applet.lang >> %{name}.lang
@@ -192,6 +202,11 @@
 
 install -m 0755 test/.libs/nm-online %{buildroot}/%{_bindir}
 
+# install the pristine docs
+%{__cp} ORIG-docs/libnm-glib/html/* $RPM_BUILD_ROOT%{_datadir}/gtk-doc/html/libnm-glib/
+%{__cp} ORIG-docs/libnm-util/html/* $RPM_BUILD_ROOT%{_datadir}/gtk-doc/html/libnm-util/
+
+
 %clean
 %{__rm} -rf $RPM_BUILD_ROOT
 
@@ -257,6 +272,7 @@
 %{_prefix}/libexec/nm-crash-logger
 %dir %{_datadir}/NetworkManager
 %{_datadir}/NetworkManager/gdb-cmd
+%dir %{_sysconfdir}/NetworkManager/system-connections
 %{_datadir}/dbus-1/system-services/org.freedesktop.NetworkManagerSystemSettings.service
 %{_datadir}/dbus-1/system-services/org.freedesktop.nm_dispatcher.service
 %{_libdir}/pppd/2.4.4/nm-pppd-plugin.so
@@ -280,6 +296,7 @@
 %{_datadir}/icons/hicolor/22x22/apps/*.png
 %{_datadir}/icons/hicolor/48x48/apps/*.png
 %{_sysconfdir}/xdg/autostart/nm-applet.desktop
+%dir %{_datadir}/gnome-vpn-properties
 
 %files glib
 %defattr(-,root,root,0755)
@@ -304,6 +321,16 @@
 %{_datadir}/gtk-doc/html/libnm-util/*
 
 %changelog
+* Fri Jan  2 2009 Dan Williams <dcbw at redhat.com> - 1:0.7.0-1.git20090102
+- Update to 0.7.1 pre-release
+- Allow connections to be ignored when determining the default route (rh #476089)
+- Own /usr/share/gnome-vpn-properties (rh #477155)
+- Fix log flooding due to netlink errors (rh #459205)
+- Pass connection UUID to dispatcher scripts via the environment
+- Fix possible crash after deactivating a VPN connection
+- Fix issues with editing wired 802.1x connections
+- Fix issues when using PKCS#12 certificates with 802.1x connections
+
 * Fri Nov 21 2008 Dan Williams <dcbw at redhat.com> - 1:0.7.0-0.12.svn4326
 - API and documentation updates
 - Fix PIN handling on 'hso' mobile broadband devices

nm-applet-internal-buildfixes.patch:

Index: nm-applet-internal-buildfixes.patch
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager/F-9/nm-applet-internal-buildfixes.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nm-applet-internal-buildfixes.patch	17 Nov 2008 23:31:43 -0000	1.1
+++ nm-applet-internal-buildfixes.patch	3 Jan 2009 06:34:19 -0000	1.2
@@ -1,6 +1,6 @@
-diff -up NetworkManager-0.7.0/nm-applet-0.7.0/configure.ac.buildfix NetworkManager-0.7.0/nm-applet-0.7.0/configure.ac
---- NetworkManager-0.7.0/nm-applet-0.7.0/configure.ac.buildfix	2008-11-17 08:37:21.000000000 -0500
-+++ NetworkManager-0.7.0/nm-applet-0.7.0/configure.ac	2008-11-17 18:04:35.000000000 -0500
+diff -up NetworkManager-0.7.0/network-manager-applet-0.7.0/configure.ac.buildfix NetworkManager-0.7.0/network-manager-applet-0.7.0/configure.ac
+--- NetworkManager-0.7.0/network-manager-applet-0.7.0/configure.ac.buildfix	2008-11-17 08:37:21.000000000 -0500
++++ NetworkManager-0.7.0/network-manager-applet-0.7.0/configure.ac	2008-11-17 18:04:35.000000000 -0500
 @@ -68,10 +68,6 @@ PKG_CHECK_MODULES(GOBJECT, gobject-2.0)
  PKG_CHECK_MODULES(NMA,
  		[dbus-glib-1 >= 0.72
@@ -12,9 +12,9 @@
  		 gtk+-2.0 >= 2.10
  		 libglade-2.0
  		 gmodule-export-2.0
-diff -up NetworkManager-0.7.0/nm-applet-0.7.0/src/connection-editor/Makefile.am.buildfix NetworkManager-0.7.0/nm-applet-0.7.0/src/connection-editor/Makefile.am
---- NetworkManager-0.7.0/nm-applet-0.7.0/src/connection-editor/Makefile.am.buildfix	2008-11-17 08:37:20.000000000 -0500
-+++ NetworkManager-0.7.0/nm-applet-0.7.0/src/connection-editor/Makefile.am	2008-11-17 18:04:35.000000000 -0500
+diff -up NetworkManager-0.7.0/network-manager-applet-0.7.0/src/connection-editor/Makefile.am.buildfix NetworkManager-0.7.0/network-manager-applet-0.7.0/src/connection-editor/Makefile.am
+--- NetworkManager-0.7.0/network-manager-applet-0.7.0/src/connection-editor/Makefile.am.buildfix	2008-11-17 08:37:20.000000000 -0500
++++ NetworkManager-0.7.0/network-manager-applet-0.7.0/src/connection-editor/Makefile.am	2008-11-17 18:04:35.000000000 -0500
 @@ -2,6 +2,10 @@ NULL=
  
  bin_PROGRAMS = nm-connection-editor
@@ -38,9 +38,9 @@
  
  if NO_POLKIT_GNOME
  nm_connection_editor_LDADD += \
-diff -up NetworkManager-0.7.0/nm-applet-0.7.0/src/gconf-helpers/Makefile.am.buildfix NetworkManager-0.7.0/nm-applet-0.7.0/src/gconf-helpers/Makefile.am
---- NetworkManager-0.7.0/nm-applet-0.7.0/src/gconf-helpers/Makefile.am.buildfix	2008-05-06 11:16:09.000000000 -0400
-+++ NetworkManager-0.7.0/nm-applet-0.7.0/src/gconf-helpers/Makefile.am	2008-11-17 18:04:35.000000000 -0500
+diff -up NetworkManager-0.7.0/network-manager-applet-0.7.0/src/gconf-helpers/Makefile.am.buildfix NetworkManager-0.7.0/network-manager-applet-0.7.0/src/gconf-helpers/Makefile.am
+--- NetworkManager-0.7.0/network-manager-applet-0.7.0/src/gconf-helpers/Makefile.am.buildfix	2008-05-06 11:16:09.000000000 -0400
++++ NetworkManager-0.7.0/network-manager-applet-0.7.0/src/gconf-helpers/Makefile.am	2008-11-17 18:04:35.000000000 -0500
 @@ -1,3 +1,7 @@
 +INCLUDES = -I${top_srcdir}/../include \
 +           -I${top_srcdir}/../libnm-util \
@@ -58,9 +58,9 @@
 +	-L${top_builddir}/../libnm-util $(top_builddir)/../libnm-util/libnm-util.la \
 +	-L${top_builddir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm_glib.la
  
-diff -up NetworkManager-0.7.0/nm-applet-0.7.0/src/Makefile.am.buildfix NetworkManager-0.7.0/nm-applet-0.7.0/src/Makefile.am
---- NetworkManager-0.7.0/nm-applet-0.7.0/src/Makefile.am.buildfix	2008-11-17 08:37:20.000000000 -0500
-+++ NetworkManager-0.7.0/nm-applet-0.7.0/src/Makefile.am	2008-11-17 18:04:35.000000000 -0500
+diff -up NetworkManager-0.7.0/network-manager-applet-0.7.0/src/Makefile.am.buildfix NetworkManager-0.7.0/network-manager-applet-0.7.0/src/Makefile.am
+--- NetworkManager-0.7.0/network-manager-applet-0.7.0/src/Makefile.am.buildfix	2008-11-17 08:37:20.000000000 -0500
++++ NetworkManager-0.7.0/network-manager-applet-0.7.0/src/Makefile.am	2008-11-17 18:04:35.000000000 -0500
 @@ -4,6 +4,10 @@ NULL=
  
  bin_PROGRAMS = nm-applet
@@ -83,9 +83,9 @@
  
  gladedir = $(datadir)/nm-applet
  glade_DATA = applet.glade keyring.png
-diff -up NetworkManager-0.7.0/nm-applet-0.7.0/src/utils/Makefile.am.buildfix NetworkManager-0.7.0/nm-applet-0.7.0/src/utils/Makefile.am
---- NetworkManager-0.7.0/nm-applet-0.7.0/src/utils/Makefile.am.buildfix	2008-05-19 11:02:18.000000000 -0400
-+++ NetworkManager-0.7.0/nm-applet-0.7.0/src/utils/Makefile.am	2008-11-17 18:04:35.000000000 -0500
+diff -up NetworkManager-0.7.0/network-manager-applet-0.7.0/src/utils/Makefile.am.buildfix NetworkManager-0.7.0/network-manager-applet-0.7.0/src/utils/Makefile.am
+--- NetworkManager-0.7.0/network-manager-applet-0.7.0/src/utils/Makefile.am.buildfix	2008-05-19 11:02:18.000000000 -0400
++++ NetworkManager-0.7.0/network-manager-applet-0.7.0/src/utils/Makefile.am	2008-11-17 18:04:35.000000000 -0500
 @@ -1,3 +1,7 @@
 +INCLUDES = -I${top_srcdir}/../include \
 +           -I${top_srcdir}/../libnm-util \
@@ -103,9 +103,9 @@
 +	-L${top_builddir}/../libnm-util $(top_builddir)/../libnm-util/libnm-util.la \
 +	-L${top_builddir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm_glib.la
 +
-diff -up NetworkManager-0.7.0/nm-applet-0.7.0/src/wireless-security/Makefile.am.buildfix NetworkManager-0.7.0/nm-applet-0.7.0/src/wireless-security/Makefile.am
---- NetworkManager-0.7.0/nm-applet-0.7.0/src/wireless-security/Makefile.am.buildfix	2008-03-30 13:17:59.000000000 -0400
-+++ NetworkManager-0.7.0/nm-applet-0.7.0/src/wireless-security/Makefile.am	2008-11-17 18:04:35.000000000 -0500
+diff -up NetworkManager-0.7.0/network-manager-applet-0.7.0/src/wireless-security/Makefile.am.buildfix NetworkManager-0.7.0/network-manager-applet-0.7.0/src/wireless-security/Makefile.am
+--- NetworkManager-0.7.0/network-manager-applet-0.7.0/src/wireless-security/Makefile.am.buildfix	2008-03-30 13:17:59.000000000 -0400
++++ NetworkManager-0.7.0/network-manager-applet-0.7.0/src/wireless-security/Makefile.am	2008-11-17 18:04:35.000000000 -0500
 @@ -1,5 +1,9 @@
  noinst_LTLIBRARIES = libwireless-security.la
  


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager/F-9/sources,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -r1.125 -r1.126
--- sources	22 Nov 2008 03:10:07 -0000	1.125
+++ sources	3 Jan 2009 06:34:19 -0000	1.126
@@ -1,2 +1,2 @@
-509ba458b104d4bbc5b4f78ca78ced87  NetworkManager-0.7.0.svn4326.tar.gz
-ac72a80e42d96e359969f96bc0ddf614  nm-applet-0.7.0.svn1043.tar.gz
+ca82bfac7c8388ee04a0fad8aac3b84a  NetworkManager-0.7.0.git20090102.tar.bz2
+144f84a8f2351e59f66b13aff11b5975  network-manager-applet-0.7.0.svn1091.tar.gz



From dcbw at fedoraproject.org  Sat Jan  3 07:56:41 2009
From: dcbw at fedoraproject.org (Daniel Williams)
Date: Sat,  3 Jan 2009 07:56:41 +0000 (UTC)
Subject: rpms/NetworkManager-pptp/F-10 NetworkManager-pptp.spec, 1.6,
	1.7 sources, 1.5, 1.6
Message-ID: <20090103075641.0A6E870162@cvs1.fedora.phx.redhat.com>

Author: dcbw

Update of /cvs/pkgs/rpms/NetworkManager-pptp/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17282

Modified Files:
	NetworkManager-pptp.spec sources 
Log Message:
* Sat Jan  3 2009 Dan Williams <dcbw at redhat.com> 1:0.7.0-1.svn16
- Rebuild for updated NetworkManager
- Fix some specfile issues (rh #477153)
- Allow the EAP authentication method




Index: NetworkManager-pptp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager-pptp/F-10/NetworkManager-pptp.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- NetworkManager-pptp.spec	22 Nov 2008 04:13:41 -0000	1.6
+++ NetworkManager-pptp.spec	3 Jan 2009 07:56:10 -0000	1.7
@@ -1,16 +1,16 @@
-%define nm_version          1:0.7.0-0.12.svn4326
+%define nm_version          1:0.7.0-1
 %define dbus_version        1.1
 %define gtk2_version        2.10.0
 %define ppp_version         2.2.4
 %define shared_mime_version 0.16-3
 
-%define svn_snapshot svn4326
+%define svn_snapshot svn16
 
 Summary:   NetworkManager VPN plugin for pptp
 Name:      NetworkManager-pptp
 Epoch:     1
 Version:   0.7.0
-Release:   0.12.%{svn_snapshot}%{?dist}
+Release:   1.%{svn_snapshot}%{?dist}
 License:   GPLv2+
 Group:     System Environment/Base
 URL:       http://www.gnome.org/projects/NetworkManager/
@@ -23,7 +23,6 @@
 BuildRequires: NetworkManager-devel   >= %{nm_version}
 BuildRequires: NetworkManager-glib-devel >= %{nm_version}
 BuildRequires: GConf2-devel
-BuildRequires: libgnomeui-devel
 BuildRequires: gnome-keyring-devel
 BuildRequires: libglade2-devel
 BuildRequires: intltool gettext
@@ -50,7 +49,7 @@
 
 
 %build
-%configure --enable-more-warnings=yes
+%configure --disable-static --enable-more-warnings=yes
 make %{?_smp_mflags}
 
 %install
@@ -101,8 +100,14 @@
 %{_datadir}/gnome-vpn-properties/pptp/nm-pptp-dialog.glade
 %{_datadir}/applications/nm-pptp.desktop
 %{_datadir}/icons/hicolor/48x48/apps/gnome-mime-application-x-pptp-settings.png
+%dir %{_datadir}/gnome-vpn-properties/pptp
 
 %changelog
+* Sat Jan  3 2009 Dan Williams <dcbw at redhat.com> 1:0.7.0-1.svn16
+- Rebuild for updated NetworkManager
+- Fix some specfile issues (rh #477153)
+- Allow the EAP authentication method
+
 * Fri Nov 21 2008 Dan Williams <dcbw at redhat.com> 1:0.7.0-12.svn4326
 - Rebuild for updated NetworkManager
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager-pptp/F-10/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	22 Nov 2008 04:13:41 -0000	1.5
+++ sources	3 Jan 2009 07:56:10 -0000	1.6
@@ -1 +1 @@
-b9b6d1e987be04279fa2610eb208e09e  NetworkManager-pptp-0.7.0.svn4326.tar.bz2
+df7f950127c9cc7e640dd2c8effd953b  NetworkManager-pptp-0.7.0.svn16.tar.bz2



From pbrobinson at fedoraproject.org  Sat Jan  3 06:49:43 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Sat,  3 Jan 2009 06:49:43 +0000 (UTC)
Subject: rpms/olpcsound/devel olpcsound-py26.patch, NONE, 1.1 olpcsound.spec,
	1.6, 1.7
Message-ID: <20090103064943.88BD77014F@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

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

Modified Files:
	olpcsound.spec 
Added Files:
	olpcsound-py26.patch 
Log Message:
- Fix python 2.6 build finally


olpcsound-py26.patch:

--- NEW FILE olpcsound-py26.patch ---
--- SConstruct.orig	2009-01-03 07:19:35.000000000 +0100
+++ SConstruct	2009-01-03 07:20:02.000000000 +0100
@@ -329,7 +329,7 @@
 commonEnvironment.Prepend(SWIGFLAGS = customSWIGFLAGS)
 
 if commonEnvironment['buildOLPC'] == '1':
-    commonEnvironment['pythonVersion'] = '2.5'
+    commonEnvironment['pythonVersion'] = '2.6'
     buildOLPC = True;
     commonEnvironment.Prepend(CPPFLAGS = ['-DOLPC'])
     commonEnvironment.Prepend(CPPFLAGS = ['-DENABLE_OPCODEDIR_WARNINGS=0'])
--- SConstruct2.orig	2009-01-03 07:19:39.000000000 +0100
+++ SConstruct2	2009-01-03 07:20:14.000000000 +0100
@@ -148,7 +148,7 @@
 
     def fixEnvForOLPC(self, env):
         if env['buildOLPC'] == '1':
-            env['pythonVersion']    = '2.5'
+            env['pythonVersion']    = '2.6'
             env.Prepend(CPPFLAGS    = ['-DOLPC'])
             env.Prepend(CPPFLAGS    = ['-DENABLE_OPCODEDIR_WARNINGS=0'])
 


Index: olpcsound.spec
===================================================================
RCS file: /cvs/pkgs/rpms/olpcsound/devel/olpcsound.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- olpcsound.spec	3 Jan 2009 05:49:49 -0000	1.6
+++ olpcsound.spec	3 Jan 2009 06:49:13 -0000	1.7
@@ -1,7 +1,7 @@
 Summary: Csound - sound synthesis language and library, OLPC subset
 Name:   olpcsound        
 Version: 5.08.92
-Release: 14%{?dist}
+Release: 15%{?dist}
 URL: http://csound.sourceforge.net/
 License: LGPLv2+
 Group: Applications/Multimedia
@@ -12,6 +12,7 @@
 Patch3: sfont-envelope.patch
 Patch4: jack-pulseaudio.patch
 Patch5: rtalsa-sched.patch
+Patch6: olpcsound-py26.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: swig python scons alsa-lib-devel liblo-devel libsndfile-devel 
 BuildRequires: jack-audio-connection-kit-devel 
@@ -40,6 +41,7 @@
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p0 -b .py26
 
 %build
 %{_bindir}/scons buildOLPC=1 customCCFLAGS="%{optflags}" customCXXFLAGS="%{optflags}"
@@ -78,6 +80,9 @@
 
 
 %changelog
+* Sat Jan  3 2009 Peter Robinson <pbrobinson at gmail.com> - 5.08.92-15
+- Add patch for python 2.6 versions
+
 * Sat Jan  3 2009 Peter Robinson <pbrobinson at gmail.com> - 5.08.92-14
 - Hopefully fix versioned python dir locations
 



From dcbw at fedoraproject.org  Sat Jan  3 06:23:53 2009
From: dcbw at fedoraproject.org (Daniel Williams)
Date: Sat,  3 Jan 2009 06:23:53 +0000 (UTC)
Subject: rpms/NetworkManager/devel .cvsignore, 1.90, 1.91 NetworkManager.spec,
	1.251, 1.252 nm-applet-internal-buildfixes.patch, 1.1,
	1.2 sources, 1.126, 1.127
Message-ID: <20090103062353.A7CCF70130@cvs1.fedora.phx.redhat.com>

Author: dcbw

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

Modified Files:
	.cvsignore NetworkManager.spec 
	nm-applet-internal-buildfixes.patch sources 
Log Message:
* Fri Jan  2 2009 Dan Williams <dcbw at redhat.com> - 1:0.7.0-1.git20090102
- Update to 0.7.1 pre-release
- Allow connections to be ignored when determining the default route (rh #476089)
- Own /usr/share/gnome-vpn-properties (rh #477155)
- Fix log flooding due to netlink errors (rh #459205)
- Pass connection UUID to dispatcher scripts via the environment
- Fix possible crash after deactivating a VPN connection
- Fix issues with editing wired 802.1x connections
- Fix issues when using PKCS#12 certificates with 802.1x connections




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager/devel/.cvsignore,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -r1.90 -r1.91
--- .cvsignore	22 Nov 2008 02:55:12 -0000	1.90
+++ .cvsignore	3 Jan 2009 06:23:23 -0000	1.91
@@ -127,3 +127,5 @@
 nm-applet-0.7.0.svn1033.tar.gz
 NetworkManager-0.7.0.svn4326.tar.gz
 nm-applet-0.7.0.svn1043.tar.gz
+NetworkManager-0.7.0.git20090102.tar.bz2
+network-manager-applet-0.7.0.svn1091.tar.gz


Index: NetworkManager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager/devel/NetworkManager.spec,v
retrieving revision 1.251
retrieving revision 1.252
diff -u -r1.251 -r1.252
--- NetworkManager.spec	22 Nov 2008 03:06:56 -0000	1.251
+++ NetworkManager.spec	3 Jan 2009 06:23:23 -0000	1.252
@@ -9,20 +9,20 @@
 %define libnl_version 1.1
 %define ppp_version 2.2.4
 
-%define snapshot svn4326
-%define applet_snapshot svn1043
+%define snapshot git20090102
+%define applet_snapshot svn1091
 
 Name: NetworkManager
 Summary: Network connection manager and user applications
 Epoch: 1
 Version: 0.7.0
-Release: 0.12.%{snapshot}%{?dist}
+Release: 1.%{snapshot}%{?dist}
 Group: System Environment/Base
 License: GPLv2+
 URL: http://www.gnome.org/projects/NetworkManager/
 
-Source: %{name}-%{version}.%{snapshot}.tar.gz
-Source1: nm-applet-%{version}.%{applet_snapshot}.tar.gz
+Source: %{name}-%{version}.%{snapshot}.tar.bz2
+Source1: network-manager-applet-%{version}.%{applet_snapshot}.tar.gz
 Source2: nm-system-settings.conf
 Patch1: nm-applet-internal-buildfixes.patch
 Patch2: explain-dns1-dns2.patch
@@ -42,9 +42,9 @@
 Requires: dnsmasq
 Obsoletes: dhcdbd
 
-Conflicts: NetworkManager-vpnc < 1:0.7.0-0.11.svn4326
-Conflicts: NetworkManager-openvpn < 1:0.7.0-16.svn4326
-Conflicts: NetworkManager-pptp < 1:0.7.0-0.12.svn4326
+Conflicts: NetworkManager-vpnc < 1:0.7.0-1
+Conflicts: NetworkManager-openvpn < 1:0.7.0-17
+Conflicts: NetworkManager-pptp < 1:0.7.0-1
 
 BuildRequires: dbus-devel >= %{dbus_version}
 BuildRequires: dbus-glib-devel >= %{dbus_glib_version}
@@ -142,6 +142,11 @@
 %patch2 -p1 -b .explain-dns1-dns2
 
 %build
+
+# back up pristine docs and use them instead of generated ones, which make
+# multilib unhappy due to different timestamps in the generated content
+%{__cp} -R docs ORIG-docs
+
 autoreconf -i
 %configure \
 	--disable-static \
@@ -154,10 +159,10 @@
 make
 
 # build the applet
-pushd nm-applet-0.7.0
+pushd network-manager-applet-0.7.0
 	autoreconf -i
 	intltoolize --force
-	%configure --disable-static
+	%configure --disable-static --enable-more-warnings=yes
 	make
 popd
 
@@ -170,13 +175,18 @@
 %{__cp} %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/
 
 # install the applet
-pushd nm-applet-0.7.0
+pushd network-manager-applet-0.7.0
   make install DESTDIR=$RPM_BUILD_ROOT
 popd
 
 # create a VPN directory
 %{__mkdir_p} $RPM_BUILD_ROOT%{_sysconfdir}/NetworkManager/VPN
 
+# create a keyfile plugin system settings directory
+%{__mkdir_p} $RPM_BUILD_ROOT%{_sysconfdir}/NetworkManager/system-connections
+
+%{__mkdir_p} $RPM_BUILD_ROOT%{_datadir}/gnome-vpn-properties
+
 %find_lang %{name}
 %find_lang nm-applet
 cat nm-applet.lang >> %{name}.lang
@@ -187,6 +197,11 @@
 
 install -m 0755 test/.libs/nm-online %{buildroot}/%{_bindir}
 
+# install the pristine docs
+%{__cp} ORIG-docs/libnm-glib/html/* $RPM_BUILD_ROOT%{_datadir}/gtk-doc/html/libnm-glib/
+%{__cp} ORIG-docs/libnm-util/html/* $RPM_BUILD_ROOT%{_datadir}/gtk-doc/html/libnm-util/
+
+
 %clean
 %{__rm} -rf $RPM_BUILD_ROOT
 
@@ -252,6 +267,7 @@
 %{_prefix}/libexec/nm-crash-logger
 %dir %{_datadir}/NetworkManager
 %{_datadir}/NetworkManager/gdb-cmd
+%dir %{_sysconfdir}/NetworkManager/system-connections
 %{_datadir}/dbus-1/system-services/org.freedesktop.NetworkManagerSystemSettings.service
 %{_datadir}/dbus-1/system-services/org.freedesktop.nm_dispatcher.service
 %{_libdir}/pppd/2.4.4/nm-pppd-plugin.so
@@ -275,6 +291,7 @@
 %{_datadir}/icons/hicolor/22x22/apps/*.png
 %{_datadir}/icons/hicolor/48x48/apps/*.png
 %{_sysconfdir}/xdg/autostart/nm-applet.desktop
+%dir %{_datadir}/gnome-vpn-properties
 
 %files glib
 %defattr(-,root,root,0755)
@@ -299,6 +316,16 @@
 %{_datadir}/gtk-doc/html/libnm-util/*
 
 %changelog
+* Fri Jan  2 2009 Dan Williams <dcbw at redhat.com> - 1:0.7.0-1.git20090102
+- Update to 0.7.1 pre-release
+- Allow connections to be ignored when determining the default route (rh #476089)
+- Own /usr/share/gnome-vpn-properties (rh #477155)
+- Fix log flooding due to netlink errors (rh #459205)
+- Pass connection UUID to dispatcher scripts via the environment
+- Fix possible crash after deactivating a VPN connection
+- Fix issues with editing wired 802.1x connections
+- Fix issues when using PKCS#12 certificates with 802.1x connections
+
 * Fri Nov 21 2008 Dan Williams <dcbw at redhat.com> - 1:0.7.0-0.12.svn4326
 - API and documentation updates
 - Fix PIN handling on 'hso' mobile broadband devices

nm-applet-internal-buildfixes.patch:

Index: nm-applet-internal-buildfixes.patch
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager/devel/nm-applet-internal-buildfixes.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nm-applet-internal-buildfixes.patch	17 Nov 2008 23:11:08 -0000	1.1
+++ nm-applet-internal-buildfixes.patch	3 Jan 2009 06:23:23 -0000	1.2
@@ -1,6 +1,6 @@
-diff -up NetworkManager-0.7.0/nm-applet-0.7.0/configure.ac.buildfix NetworkManager-0.7.0/nm-applet-0.7.0/configure.ac
---- NetworkManager-0.7.0/nm-applet-0.7.0/configure.ac.buildfix	2008-11-17 08:37:21.000000000 -0500
-+++ NetworkManager-0.7.0/nm-applet-0.7.0/configure.ac	2008-11-17 18:04:35.000000000 -0500
+diff -up NetworkManager-0.7.0/network-manager-applet-0.7.0/configure.ac.buildfix NetworkManager-0.7.0/network-manager-applet-0.7.0/configure.ac
+--- NetworkManager-0.7.0/network-manager-applet-0.7.0/configure.ac.buildfix	2008-11-17 08:37:21.000000000 -0500
++++ NetworkManager-0.7.0/network-manager-applet-0.7.0/configure.ac	2008-11-17 18:04:35.000000000 -0500
 @@ -68,10 +68,6 @@ PKG_CHECK_MODULES(GOBJECT, gobject-2.0)
  PKG_CHECK_MODULES(NMA,
  		[dbus-glib-1 >= 0.72
@@ -12,9 +12,9 @@
  		 gtk+-2.0 >= 2.10
  		 libglade-2.0
  		 gmodule-export-2.0
-diff -up NetworkManager-0.7.0/nm-applet-0.7.0/src/connection-editor/Makefile.am.buildfix NetworkManager-0.7.0/nm-applet-0.7.0/src/connection-editor/Makefile.am
---- NetworkManager-0.7.0/nm-applet-0.7.0/src/connection-editor/Makefile.am.buildfix	2008-11-17 08:37:20.000000000 -0500
-+++ NetworkManager-0.7.0/nm-applet-0.7.0/src/connection-editor/Makefile.am	2008-11-17 18:04:35.000000000 -0500
+diff -up NetworkManager-0.7.0/network-manager-applet-0.7.0/src/connection-editor/Makefile.am.buildfix NetworkManager-0.7.0/network-manager-applet-0.7.0/src/connection-editor/Makefile.am
+--- NetworkManager-0.7.0/network-manager-applet-0.7.0/src/connection-editor/Makefile.am.buildfix	2008-11-17 08:37:20.000000000 -0500
++++ NetworkManager-0.7.0/network-manager-applet-0.7.0/src/connection-editor/Makefile.am	2008-11-17 18:04:35.000000000 -0500
 @@ -2,6 +2,10 @@ NULL=
  
  bin_PROGRAMS = nm-connection-editor
@@ -38,9 +38,9 @@
  
  if NO_POLKIT_GNOME
  nm_connection_editor_LDADD += \
-diff -up NetworkManager-0.7.0/nm-applet-0.7.0/src/gconf-helpers/Makefile.am.buildfix NetworkManager-0.7.0/nm-applet-0.7.0/src/gconf-helpers/Makefile.am
---- NetworkManager-0.7.0/nm-applet-0.7.0/src/gconf-helpers/Makefile.am.buildfix	2008-05-06 11:16:09.000000000 -0400
-+++ NetworkManager-0.7.0/nm-applet-0.7.0/src/gconf-helpers/Makefile.am	2008-11-17 18:04:35.000000000 -0500
+diff -up NetworkManager-0.7.0/network-manager-applet-0.7.0/src/gconf-helpers/Makefile.am.buildfix NetworkManager-0.7.0/network-manager-applet-0.7.0/src/gconf-helpers/Makefile.am
+--- NetworkManager-0.7.0/network-manager-applet-0.7.0/src/gconf-helpers/Makefile.am.buildfix	2008-05-06 11:16:09.000000000 -0400
++++ NetworkManager-0.7.0/network-manager-applet-0.7.0/src/gconf-helpers/Makefile.am	2008-11-17 18:04:35.000000000 -0500
 @@ -1,3 +1,7 @@
 +INCLUDES = -I${top_srcdir}/../include \
 +           -I${top_srcdir}/../libnm-util \
@@ -58,9 +58,9 @@
 +	-L${top_builddir}/../libnm-util $(top_builddir)/../libnm-util/libnm-util.la \
 +	-L${top_builddir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm_glib.la
  
-diff -up NetworkManager-0.7.0/nm-applet-0.7.0/src/Makefile.am.buildfix NetworkManager-0.7.0/nm-applet-0.7.0/src/Makefile.am
---- NetworkManager-0.7.0/nm-applet-0.7.0/src/Makefile.am.buildfix	2008-11-17 08:37:20.000000000 -0500
-+++ NetworkManager-0.7.0/nm-applet-0.7.0/src/Makefile.am	2008-11-17 18:04:35.000000000 -0500
+diff -up NetworkManager-0.7.0/network-manager-applet-0.7.0/src/Makefile.am.buildfix NetworkManager-0.7.0/network-manager-applet-0.7.0/src/Makefile.am
+--- NetworkManager-0.7.0/network-manager-applet-0.7.0/src/Makefile.am.buildfix	2008-11-17 08:37:20.000000000 -0500
++++ NetworkManager-0.7.0/network-manager-applet-0.7.0/src/Makefile.am	2008-11-17 18:04:35.000000000 -0500
 @@ -4,6 +4,10 @@ NULL=
  
  bin_PROGRAMS = nm-applet
@@ -83,9 +83,9 @@
  
  gladedir = $(datadir)/nm-applet
  glade_DATA = applet.glade keyring.png
-diff -up NetworkManager-0.7.0/nm-applet-0.7.0/src/utils/Makefile.am.buildfix NetworkManager-0.7.0/nm-applet-0.7.0/src/utils/Makefile.am
---- NetworkManager-0.7.0/nm-applet-0.7.0/src/utils/Makefile.am.buildfix	2008-05-19 11:02:18.000000000 -0400
-+++ NetworkManager-0.7.0/nm-applet-0.7.0/src/utils/Makefile.am	2008-11-17 18:04:35.000000000 -0500
+diff -up NetworkManager-0.7.0/network-manager-applet-0.7.0/src/utils/Makefile.am.buildfix NetworkManager-0.7.0/network-manager-applet-0.7.0/src/utils/Makefile.am
+--- NetworkManager-0.7.0/network-manager-applet-0.7.0/src/utils/Makefile.am.buildfix	2008-05-19 11:02:18.000000000 -0400
++++ NetworkManager-0.7.0/network-manager-applet-0.7.0/src/utils/Makefile.am	2008-11-17 18:04:35.000000000 -0500
 @@ -1,3 +1,7 @@
 +INCLUDES = -I${top_srcdir}/../include \
 +           -I${top_srcdir}/../libnm-util \
@@ -103,9 +103,9 @@
 +	-L${top_builddir}/../libnm-util $(top_builddir)/../libnm-util/libnm-util.la \
 +	-L${top_builddir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm_glib.la
 +
-diff -up NetworkManager-0.7.0/nm-applet-0.7.0/src/wireless-security/Makefile.am.buildfix NetworkManager-0.7.0/nm-applet-0.7.0/src/wireless-security/Makefile.am
---- NetworkManager-0.7.0/nm-applet-0.7.0/src/wireless-security/Makefile.am.buildfix	2008-03-30 13:17:59.000000000 -0400
-+++ NetworkManager-0.7.0/nm-applet-0.7.0/src/wireless-security/Makefile.am	2008-11-17 18:04:35.000000000 -0500
+diff -up NetworkManager-0.7.0/network-manager-applet-0.7.0/src/wireless-security/Makefile.am.buildfix NetworkManager-0.7.0/network-manager-applet-0.7.0/src/wireless-security/Makefile.am
+--- NetworkManager-0.7.0/network-manager-applet-0.7.0/src/wireless-security/Makefile.am.buildfix	2008-03-30 13:17:59.000000000 -0400
++++ NetworkManager-0.7.0/network-manager-applet-0.7.0/src/wireless-security/Makefile.am	2008-11-17 18:04:35.000000000 -0500
 @@ -1,5 +1,9 @@
  noinst_LTLIBRARIES = libwireless-security.la
  


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager/devel/sources,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -r1.126 -r1.127
--- sources	22 Nov 2008 02:55:12 -0000	1.126
+++ sources	3 Jan 2009 06:23:23 -0000	1.127
@@ -1,2 +1,2 @@
-509ba458b104d4bbc5b4f78ca78ced87  NetworkManager-0.7.0.svn4326.tar.gz
-ac72a80e42d96e359969f96bc0ddf614  nm-applet-0.7.0.svn1043.tar.gz
+ca82bfac7c8388ee04a0fad8aac3b84a  NetworkManager-0.7.0.git20090102.tar.bz2
+144f84a8f2351e59f66b13aff11b5975  network-manager-applet-0.7.0.svn1091.tar.gz



From xulchris at fedoraproject.org  Sat Jan  3 06:34:18 2009
From: xulchris at fedoraproject.org (Christopher Stone)
Date: Sat,  3 Jan 2009 06:34:18 +0000 (UTC)
Subject: rpms/poker-network/F-8 .cvsignore, 1.9, 1.10 poker-network.spec,
	1.15, 1.16 sources, 1.9, 1.10
Message-ID: <20090103063418.741E070143@cvs1.fedora.phx.redhat.com>

Author: xulchris

Update of /cvs/pkgs/rpms/poker-network/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24714/F-8

Modified Files:
	.cvsignore poker-network.spec sources 
Log Message:
upstream sync


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/poker-network/F-8/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	29 May 2008 17:22:32 -0000	1.9
+++ .cvsignore	3 Jan 2009 06:33:48 -0000	1.10
@@ -1 +1 @@
-poker-network-1.6.0.tar.gz
+poker-network-1.7.3.tar.gz


Index: poker-network.spec
===================================================================
RCS file: /cvs/pkgs/rpms/poker-network/F-8/poker-network.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- poker-network.spec	9 Oct 2008 15:22:08 -0000	1.15
+++ poker-network.spec	3 Jan 2009 06:33:48 -0000	1.16
@@ -8,12 +8,12 @@
 
 
 Name:             poker-network
-Version:          1.6.0
-Release:          2%{?dist}
+Version:          1.7.3
+Release:          1%{?dist}
 Summary:          Base package for poker client and server
 
 Group:            Applications/Internet
-License:          GPLv2+
+License:          AGPLv3
 URL:              http://pokersource.org/poker-network
 Source0:          http://download.gna.org/pokersource/sources/%{name}-%{version}.tar.gz
 
@@ -288,12 +288,18 @@
 %dir %{_sysconfdir}/%{name}
 %dir %{python_sitelib}/pokernetwork
 %{python_sitelib}/pokernetwork/__init__*
+%{python_sitelib}/pokernetwork/attrpack*
+%{python_sitelib}/pokernetwork/countfilter*
 %{python_sitelib}/pokernetwork/dispatch*
+%{python_sitelib}/pokernetwork/nullfilter*
 %{python_sitelib}/pokernetwork/packets*
+%{python_sitelib}/pokernetwork/pokerauth*
+%{python_sitelib}/pokernetwork/pokermemcache*
 %{python_sitelib}/pokernetwork/pokernetworkconfig*
 %{python_sitelib}/pokernetwork/pokerpackets*
 %{python_sitelib}/pokernetwork/protocol*
 %{python_sitelib}/pokernetwork/proxy*
+%{python_sitelib}/pokernetwork/tourneyattrs*
 %{python_sitelib}/pokernetwork/upgrade*
 %{python_sitelib}/pokernetwork/user*
 %{python_sitelib}/pokernetwork/version*
@@ -319,13 +325,16 @@
 %{_initrddir}/poker-server
 %dir %attr(-,%{poker_user},root) %{_var}/run/%{name}
 %dir %attr(-,%{poker_user},root) %{_var}/log/%{name}
+%{_bindir}/pokerstats
 %{_bindir}/poker-server-selinux
 %{_sbindir}/pokerserver
 %{_sbindir}/pokerdatabaseupgrade
+%{_mandir}/man1/pokerstats*
 %{_mandir}/man8/pokerserver*
 %{_mandir}/man8/pokerdatabaseupgrade*
 %{_datadir}/%{name}/*.sql
 %{_datadir}/%{name}/conf/poker.server.xml
+%{_datadir}/%{name}/conf/poker.stats.xml
 %{_datadir}/%{name}/conf/poker.pem
 %{_datadir}/%{name}/upgrades/poker.server
 %{_datadir}/%{name}/upgrades/upgrade
@@ -336,8 +345,11 @@
 %{python_sitelib}/pokernetwork/pokerlock*
 %{python_sitelib}/pokernetwork/pokerserver*
 %{python_sitelib}/pokernetwork/pokerservice*
+%{python_sitelib}/pokernetwork/pokersite*
 %{python_sitelib}/pokernetwork/pokertable*
 %{python_sitelib}/pokernetwork/server*
+%{python_sitelib}/pokerstats
+%{python_sitelib}/twisted/plugins/pokernetwork_plugin*
 
 %files -n poker-web
 %defattr(-,root,root,-)
@@ -366,6 +378,12 @@
 
 
 %changelog
+* Thu Jan 01 2009 Christopher Stone <chris.stone at gmail.com> 1.7.3-1
+- Upstream sync
+
+* Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 1.6.0-3
+- Rebuild for Python 2.6
+
 * Thu Oct 09 2008 Christopher Stone <chris.stone at gmail.com> 1.6.0-2
 - Update bot patch (bz #464986)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/poker-network/F-8/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	29 May 2008 17:22:32 -0000	1.9
+++ sources	3 Jan 2009 06:33:48 -0000	1.10
@@ -1 +1 @@
-1ba14542d834edcfac9782d0caeff8ba  poker-network-1.6.0.tar.gz
+9680fe96f33c678dd4825251f07d6823  poker-network-1.7.3.tar.gz



From dcbw at fedoraproject.org  Sat Jan  3 06:35:26 2009
From: dcbw at fedoraproject.org (Daniel Williams)
Date: Sat,  3 Jan 2009 06:35:26 +0000 (UTC)
Subject: rpms/NetworkManager/F-8 NetworkManager.spec, 1.227,
	1.228 nm-applet-internal-buildfixes.patch, 1.1, 1.2 sources,
	1.113, 1.114
Message-ID: <20090103063526.D66957014B@cvs1.fedora.phx.redhat.com>

Author: dcbw

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

Modified Files:
	NetworkManager.spec nm-applet-internal-buildfixes.patch 
	sources 
Log Message:
* Fri Jan  2 2009 Dan Williams <dcbw at redhat.com> - 1:0.7.0-1.git20090102
- Update to 0.7.1 pre-release
- Allow connections to be ignored when determining the default route (rh #476089)
- Own /usr/share/gnome-vpn-properties (rh #477155)
- Fix log flooding due to netlink errors (rh #459205)
- Pass connection UUID to dispatcher scripts via the environment
- Fix possible crash after deactivating a VPN connection
- Fix issues with editing wired 802.1x connections
- Fix issues when using PKCS#12 certificates with 802.1x connections




Index: NetworkManager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager/F-8/NetworkManager.spec,v
retrieving revision 1.227
retrieving revision 1.228
diff -u -r1.227 -r1.228
--- NetworkManager.spec	22 Nov 2008 03:10:16 -0000	1.227
+++ NetworkManager.spec	3 Jan 2009 06:34:56 -0000	1.228
@@ -9,20 +9,20 @@
 %define libnl_version 1.1
 %define ppp_version 2.2.4
 
-%define snapshot svn4326
-%define applet_snapshot svn1043
+%define snapshot git20090102
+%define applet_snapshot svn1091
 
 Name: NetworkManager
 Summary: Network connection manager and user applications
 Epoch: 1
 Version: 0.7.0
-Release: 0.12.%{snapshot}%{?dist}
+Release: 1.%{snapshot}%{?dist}
 Group: System Environment/Base
 License: GPLv2+
 URL: http://www.gnome.org/projects/NetworkManager/
 
-Source: %{name}-%{version}.%{snapshot}.tar.gz
-Source1: nm-applet-%{version}.%{applet_snapshot}.tar.gz
+Source: %{name}-%{version}.%{snapshot}.tar.bz2
+Source1: network-manager-applet-%{version}.%{applet_snapshot}.tar.gz
 Source2: nm-system-settings.conf
 Patch1: nm-applet-internal-buildfixes.patch
 Patch2: explain-dns1-dns2.patch
@@ -45,9 +45,9 @@
 Requires: dnsmasq
 Obsoletes: dhcdbd
 
-Conflicts: NetworkManager-vpnc < 1:0.7.0-0.11.svn4326
-Conflicts: NetworkManager-openvpn < 1:0.7.0-16.svn4326
-Conflicts: NetworkManager-pptp < 1:0.7.0-0.12.svn4326
+Conflicts: NetworkManager-vpnc < 1:0.7.0-1
+Conflicts: NetworkManager-openvpn < 1:0.7.0-17
+Conflicts: NetworkManager-pptp < 1:0.7.0-1
 
 BuildRequires: dbus-devel >= %{dbus_version}
 BuildRequires: dbus-glib-devel >= %{dbus_glib_version}
@@ -152,6 +152,11 @@
 %patch21 -p1 -b .f8-priorities
 
 %build
+
+# back up pristine docs and use them instead of generated ones, which make
+# multilib unhappy due to different timestamps in the generated content
+%{__cp} -R docs ORIG-docs
+
 autoreconf -i
 %configure \
 	--disable-static \
@@ -164,10 +169,10 @@
 make
 
 # build the applet
-pushd nm-applet-0.7.0
+pushd network-manager-applet-0.7.0
 	autoreconf -i
 	intltoolize --force
-	%configure --disable-static
+	%configure --disable-static --enable-more-warnings=yes
 	make
 popd
 
@@ -180,13 +185,18 @@
 %{__cp} %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/
 
 # install the applet
-pushd nm-applet-0.7.0
+pushd network-manager-applet-0.7.0
   make install DESTDIR=$RPM_BUILD_ROOT
 popd
 
 # create a VPN directory
 %{__mkdir_p} $RPM_BUILD_ROOT%{_sysconfdir}/NetworkManager/VPN
 
+# create a keyfile plugin system settings directory
+%{__mkdir_p} $RPM_BUILD_ROOT%{_sysconfdir}/NetworkManager/system-connections
+
+%{__mkdir_p} $RPM_BUILD_ROOT%{_datadir}/gnome-vpn-properties
+
 %find_lang %{name}
 %find_lang nm-applet
 cat nm-applet.lang >> %{name}.lang
@@ -197,6 +207,11 @@
 
 install -m 0755 test/.libs/nm-online %{buildroot}/%{_bindir}
 
+# install the pristine docs
+%{__cp} ORIG-docs/libnm-glib/html/* $RPM_BUILD_ROOT%{_datadir}/gtk-doc/html/libnm-glib/
+%{__cp} ORIG-docs/libnm-util/html/* $RPM_BUILD_ROOT%{_datadir}/gtk-doc/html/libnm-util/
+
+
 %clean
 %{__rm} -rf $RPM_BUILD_ROOT
 
@@ -261,6 +276,7 @@
 %{_prefix}/libexec/nm-crash-logger
 %dir %{_datadir}/NetworkManager
 %{_datadir}/NetworkManager/gdb-cmd
+%dir %{_sysconfdir}/NetworkManager/system-connections
 %{_datadir}/dbus-1/system-services/org.freedesktop.NetworkManagerSystemSettings.service
 %{_datadir}/dbus-1/system-services/org.freedesktop.nm_dispatcher.service
 %{_libdir}/pppd/2.4.4/nm-pppd-plugin.so
@@ -284,6 +300,7 @@
 %{_datadir}/icons/hicolor/22x22/apps/*.png
 %{_datadir}/icons/hicolor/48x48/apps/*.png
 %{_sysconfdir}/xdg/autostart/nm-applet.desktop
+%dir %{_datadir}/gnome-vpn-properties
 
 %files glib
 %defattr(-,root,root,0755)
@@ -308,6 +325,16 @@
 %{_datadir}/gtk-doc/html/libnm-util/*
 
 %changelog
+* Fri Jan  2 2009 Dan Williams <dcbw at redhat.com> - 1:0.7.0-1.git20090102
+- Update to 0.7.1 pre-release
+- Allow connections to be ignored when determining the default route (rh #476089)
+- Own /usr/share/gnome-vpn-properties (rh #477155)
+- Fix log flooding due to netlink errors (rh #459205)
+- Pass connection UUID to dispatcher scripts via the environment
+- Fix possible crash after deactivating a VPN connection
+- Fix issues with editing wired 802.1x connections
+- Fix issues when using PKCS#12 certificates with 802.1x connections
+
 * Fri Nov 21 2008 Dan Williams <dcbw at redhat.com> - 1:0.7.0-0.12.svn4326
 - API and documentation updates
 - Fix PIN handling on 'hso' mobile broadband devices

nm-applet-internal-buildfixes.patch:

Index: nm-applet-internal-buildfixes.patch
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager/F-8/nm-applet-internal-buildfixes.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nm-applet-internal-buildfixes.patch	17 Nov 2008 23:49:44 -0000	1.1
+++ nm-applet-internal-buildfixes.patch	3 Jan 2009 06:34:56 -0000	1.2
@@ -1,6 +1,6 @@
-diff -up NetworkManager-0.7.0/nm-applet-0.7.0/configure.ac.buildfix NetworkManager-0.7.0/nm-applet-0.7.0/configure.ac
---- NetworkManager-0.7.0/nm-applet-0.7.0/configure.ac.buildfix	2008-11-17 08:37:21.000000000 -0500
-+++ NetworkManager-0.7.0/nm-applet-0.7.0/configure.ac	2008-11-17 18:04:35.000000000 -0500
+diff -up NetworkManager-0.7.0/network-manager-applet-0.7.0/configure.ac.buildfix NetworkManager-0.7.0/network-manager-applet-0.7.0/configure.ac
+--- NetworkManager-0.7.0/network-manager-applet-0.7.0/configure.ac.buildfix	2008-11-17 08:37:21.000000000 -0500
++++ NetworkManager-0.7.0/network-manager-applet-0.7.0/configure.ac	2008-11-17 18:04:35.000000000 -0500
 @@ -68,10 +68,6 @@ PKG_CHECK_MODULES(GOBJECT, gobject-2.0)
  PKG_CHECK_MODULES(NMA,
  		[dbus-glib-1 >= 0.72
@@ -12,9 +12,9 @@
  		 gtk+-2.0 >= 2.10
  		 libglade-2.0
  		 gmodule-export-2.0
-diff -up NetworkManager-0.7.0/nm-applet-0.7.0/src/connection-editor/Makefile.am.buildfix NetworkManager-0.7.0/nm-applet-0.7.0/src/connection-editor/Makefile.am
---- NetworkManager-0.7.0/nm-applet-0.7.0/src/connection-editor/Makefile.am.buildfix	2008-11-17 08:37:20.000000000 -0500
-+++ NetworkManager-0.7.0/nm-applet-0.7.0/src/connection-editor/Makefile.am	2008-11-17 18:04:35.000000000 -0500
+diff -up NetworkManager-0.7.0/network-manager-applet-0.7.0/src/connection-editor/Makefile.am.buildfix NetworkManager-0.7.0/network-manager-applet-0.7.0/src/connection-editor/Makefile.am
+--- NetworkManager-0.7.0/network-manager-applet-0.7.0/src/connection-editor/Makefile.am.buildfix	2008-11-17 08:37:20.000000000 -0500
++++ NetworkManager-0.7.0/network-manager-applet-0.7.0/src/connection-editor/Makefile.am	2008-11-17 18:04:35.000000000 -0500
 @@ -2,6 +2,10 @@ NULL=
  
  bin_PROGRAMS = nm-connection-editor
@@ -38,9 +38,9 @@
  
  if NO_POLKIT_GNOME
  nm_connection_editor_LDADD += \
-diff -up NetworkManager-0.7.0/nm-applet-0.7.0/src/gconf-helpers/Makefile.am.buildfix NetworkManager-0.7.0/nm-applet-0.7.0/src/gconf-helpers/Makefile.am
---- NetworkManager-0.7.0/nm-applet-0.7.0/src/gconf-helpers/Makefile.am.buildfix	2008-05-06 11:16:09.000000000 -0400
-+++ NetworkManager-0.7.0/nm-applet-0.7.0/src/gconf-helpers/Makefile.am	2008-11-17 18:04:35.000000000 -0500
+diff -up NetworkManager-0.7.0/network-manager-applet-0.7.0/src/gconf-helpers/Makefile.am.buildfix NetworkManager-0.7.0/network-manager-applet-0.7.0/src/gconf-helpers/Makefile.am
+--- NetworkManager-0.7.0/network-manager-applet-0.7.0/src/gconf-helpers/Makefile.am.buildfix	2008-05-06 11:16:09.000000000 -0400
++++ NetworkManager-0.7.0/network-manager-applet-0.7.0/src/gconf-helpers/Makefile.am	2008-11-17 18:04:35.000000000 -0500
 @@ -1,3 +1,7 @@
 +INCLUDES = -I${top_srcdir}/../include \
 +           -I${top_srcdir}/../libnm-util \
@@ -58,9 +58,9 @@
 +	-L${top_builddir}/../libnm-util $(top_builddir)/../libnm-util/libnm-util.la \
 +	-L${top_builddir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm_glib.la
  
-diff -up NetworkManager-0.7.0/nm-applet-0.7.0/src/Makefile.am.buildfix NetworkManager-0.7.0/nm-applet-0.7.0/src/Makefile.am
---- NetworkManager-0.7.0/nm-applet-0.7.0/src/Makefile.am.buildfix	2008-11-17 08:37:20.000000000 -0500
-+++ NetworkManager-0.7.0/nm-applet-0.7.0/src/Makefile.am	2008-11-17 18:04:35.000000000 -0500
+diff -up NetworkManager-0.7.0/network-manager-applet-0.7.0/src/Makefile.am.buildfix NetworkManager-0.7.0/network-manager-applet-0.7.0/src/Makefile.am
+--- NetworkManager-0.7.0/network-manager-applet-0.7.0/src/Makefile.am.buildfix	2008-11-17 08:37:20.000000000 -0500
++++ NetworkManager-0.7.0/network-manager-applet-0.7.0/src/Makefile.am	2008-11-17 18:04:35.000000000 -0500
 @@ -4,6 +4,10 @@ NULL=
  
  bin_PROGRAMS = nm-applet
@@ -83,9 +83,9 @@
  
  gladedir = $(datadir)/nm-applet
  glade_DATA = applet.glade keyring.png
-diff -up NetworkManager-0.7.0/nm-applet-0.7.0/src/utils/Makefile.am.buildfix NetworkManager-0.7.0/nm-applet-0.7.0/src/utils/Makefile.am
---- NetworkManager-0.7.0/nm-applet-0.7.0/src/utils/Makefile.am.buildfix	2008-05-19 11:02:18.000000000 -0400
-+++ NetworkManager-0.7.0/nm-applet-0.7.0/src/utils/Makefile.am	2008-11-17 18:04:35.000000000 -0500
+diff -up NetworkManager-0.7.0/network-manager-applet-0.7.0/src/utils/Makefile.am.buildfix NetworkManager-0.7.0/network-manager-applet-0.7.0/src/utils/Makefile.am
+--- NetworkManager-0.7.0/network-manager-applet-0.7.0/src/utils/Makefile.am.buildfix	2008-05-19 11:02:18.000000000 -0400
++++ NetworkManager-0.7.0/network-manager-applet-0.7.0/src/utils/Makefile.am	2008-11-17 18:04:35.000000000 -0500
 @@ -1,3 +1,7 @@
 +INCLUDES = -I${top_srcdir}/../include \
 +           -I${top_srcdir}/../libnm-util \
@@ -103,9 +103,9 @@
 +	-L${top_builddir}/../libnm-util $(top_builddir)/../libnm-util/libnm-util.la \
 +	-L${top_builddir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm_glib.la
 +
-diff -up NetworkManager-0.7.0/nm-applet-0.7.0/src/wireless-security/Makefile.am.buildfix NetworkManager-0.7.0/nm-applet-0.7.0/src/wireless-security/Makefile.am
---- NetworkManager-0.7.0/nm-applet-0.7.0/src/wireless-security/Makefile.am.buildfix	2008-03-30 13:17:59.000000000 -0400
-+++ NetworkManager-0.7.0/nm-applet-0.7.0/src/wireless-security/Makefile.am	2008-11-17 18:04:35.000000000 -0500
+diff -up NetworkManager-0.7.0/network-manager-applet-0.7.0/src/wireless-security/Makefile.am.buildfix NetworkManager-0.7.0/network-manager-applet-0.7.0/src/wireless-security/Makefile.am
+--- NetworkManager-0.7.0/network-manager-applet-0.7.0/src/wireless-security/Makefile.am.buildfix	2008-03-30 13:17:59.000000000 -0400
++++ NetworkManager-0.7.0/network-manager-applet-0.7.0/src/wireless-security/Makefile.am	2008-11-17 18:04:35.000000000 -0500
 @@ -1,5 +1,9 @@
  noinst_LTLIBRARIES = libwireless-security.la
  


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager/F-8/sources,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -r1.113 -r1.114
--- sources	22 Nov 2008 03:10:16 -0000	1.113
+++ sources	3 Jan 2009 06:34:56 -0000	1.114
@@ -1,2 +1,2 @@
-509ba458b104d4bbc5b4f78ca78ced87  NetworkManager-0.7.0.svn4326.tar.gz
-ac72a80e42d96e359969f96bc0ddf614  nm-applet-0.7.0.svn1043.tar.gz
+ca82bfac7c8388ee04a0fad8aac3b84a  NetworkManager-0.7.0.git20090102.tar.bz2
+144f84a8f2351e59f66b13aff11b5975  network-manager-applet-0.7.0.svn1091.tar.gz



From dcbw at fedoraproject.org  Sat Jan  3 07:46:46 2009
From: dcbw at fedoraproject.org (Daniel Williams)
Date: Sat,  3 Jan 2009 07:46:46 +0000 (UTC)
Subject: rpms/NetworkManager-openvpn/F-8 NetworkManager-openvpn.spec, 1.19, 
	1.20 sources, 1.11, 1.12
Message-ID: <20090103074646.B24F47015C@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-serv13883

Modified Files:
	NetworkManager-openvpn.spec sources 
Log Message:
* Sat Jan  3 2009 Dan Williams <dcbw at redhat.com> 1:0.7.0-18.svn11
- Rebuild for updated NetworkManager
- Fix some specfile issues (rh #477149)
- Allow the EAP authentication method




Index: NetworkManager-openvpn.spec
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager-openvpn/F-8/NetworkManager-openvpn.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- NetworkManager-openvpn.spec	22 Nov 2008 04:03:27 -0000	1.19
+++ NetworkManager-openvpn.spec	3 Jan 2009 07:46:16 -0000	1.20
@@ -1,16 +1,16 @@
-%define nm_version          1:0.7.0-0.12.svn4326
+%define nm_version          1:0.7.0-1
 %define dbus_version        1.1
 %define gtk2_version        2.10.0
 %define openvpn_version     2.1
 %define shared_mime_version 0.16-3
 
-%define svn_snapshot svn4326
+%define svn_snapshot svn11
 
 Summary: NetworkManager VPN plugin for OpenVPN
 Name: NetworkManager-openvpn
 Epoch:   1
 Version: 0.7.0
-Release: 16.%{svn_snapshot}%{?dist}
+Release: 18.%{svn_snapshot}%{?dist}
 License: GPLv2+
 URL: http://www.gnome.org/projects/NetworkManager/
 Group: System Environment/Base
@@ -29,10 +29,8 @@
 BuildRequires: NetworkManager-glib-devel  >= %{nm_version}
 BuildRequires: glib2-devel
 BuildRequires: GConf2-devel
-BuildRequires: libgnomeui-devel
 BuildRequires: gnome-keyring-devel
 BuildRequires: libglade2-devel
-BuildRequires: libpng-devel
 BuildRequires: perl-XML-Parser
 BuildRequires: libtool intltool gettext
 BuildRequires: perl
@@ -61,7 +59,7 @@
 if [ ! -f configure ]; then
   ./autogen.sh
 fi
-%configure --disable-static --disable-dependency-tracking
+%configure --disable-static --disable-dependency-tracking --enable-more-warnings=yes
 make %{?_smp_mflags}
 
 %install
@@ -104,8 +102,17 @@
 %{_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
+%dir %{_datadir}/gnome-vpn-properties/openvpn
 
 %changelog
+* Sat Jan  3 2009 Dan Williams <dcbw at redhat.com> 1:0.7.0-18.svn11
+- Rebuild for updated NetworkManager
+- Fix some specfile issues (rh #477149)
+- Allow the EAP authentication method
+
+* Sat Dec 20 2008 Christoph H??ger <choeger at cs.tu-berlin.de> 0.7.0-17.svn4326
+- removed libpng-devel from BuildRequires, added %{_datadir}/gnome-vpn-properties/openvpn/ (rh #477149)
+
 * Fri Nov 21 2008 Dan Williams <dcbw at redhat.com> 1:0.7.0-16.svn4326
 - Rebuild for updated NetworkManager
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager-openvpn/F-8/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	22 Nov 2008 04:03:27 -0000	1.11
+++ sources	3 Jan 2009 07:46:16 -0000	1.12
@@ -1 +1 @@
-027b5577aac9b132fdbd0735eb3ccdeb  NetworkManager-openvpn-0.7.0.svn4326.tar.gz
+de7716aef7fe8665030e82aa244ec3c0  NetworkManager-openvpn-0.7.0.svn11.tar.gz



From dcbw at fedoraproject.org  Sat Jan  3 08:00:15 2009
From: dcbw at fedoraproject.org (Daniel Williams)
Date: Sat,  3 Jan 2009 08:00:15 +0000 (UTC)
Subject: rpms/NetworkManager-pptp/F-8 NetworkManager-pptp.spec, 1.6,
	1.7 sources, 1.3, 1.4
Message-ID: <20090103080015.6807E70164@cvs1.fedora.phx.redhat.com>

Author: dcbw

Update of /cvs/pkgs/rpms/NetworkManager-pptp/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18657

Modified Files:
	NetworkManager-pptp.spec sources 
Log Message:
* Sat Jan  3 2009 Dan Williams <dcbw at redhat.com> 1:0.7.0-1.svn16
- Rebuild for updated NetworkManager
- Fix some specfile issues (rh #477153)
- Allow the EAP authentication method




Index: NetworkManager-pptp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager-pptp/F-8/NetworkManager-pptp.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- NetworkManager-pptp.spec	22 Nov 2008 04:18:25 -0000	1.6
+++ NetworkManager-pptp.spec	3 Jan 2009 07:59:45 -0000	1.7
@@ -1,16 +1,16 @@
-%define nm_version          1:0.7.0-0.12.svn4326
+%define nm_version          1:0.7.0-1
 %define dbus_version        1.1
 %define gtk2_version        2.10.0
 %define ppp_version         2.2.4
 %define shared_mime_version 0.16-3
 
-%define svn_snapshot svn4326
+%define svn_snapshot svn16
 
 Summary:   NetworkManager VPN plugin for pptp
 Name:      NetworkManager-pptp
 Epoch:     1
 Version:   0.7.0
-Release:   0.12.%{svn_snapshot}%{?dist}
+Release:   1.%{svn_snapshot}%{?dist}
 License:   GPLv2+
 Group:     System Environment/Base
 URL:       http://www.gnome.org/projects/NetworkManager/
@@ -24,7 +24,6 @@
 BuildRequires: NetworkManager-devel   >= %{nm_version}
 BuildRequires: NetworkManager-glib-devel >= %{nm_version}
 BuildRequires: GConf2-devel
-BuildRequires: libgnomeui-devel
 BuildRequires: gnome-keyring-devel
 BuildRequires: libglade2-devel
 BuildRequires: intltool gettext autoconf libtool
@@ -54,7 +53,7 @@
 
 %build
 autoreconf -i
-%configure --enable-more-warnings=yes
+%configure --disable-static --enable-more-warnings=yes
 make %{?_smp_mflags}
 
 %install
@@ -105,8 +104,14 @@
 %{_datadir}/gnome-vpn-properties/pptp/nm-pptp-dialog.glade
 %{_datadir}/applications/nm-pptp.desktop
 %{_datadir}/icons/hicolor/48x48/apps/gnome-mime-application-x-pptp-settings.png
+%dir %{_datadir}/gnome-vpn-properties/pptp
 
 %changelog
+* Sat Jan  3 2009 Dan Williams <dcbw at redhat.com> 1:0.7.0-1.svn16
+- Rebuild for updated NetworkManager
+- Fix some specfile issues (rh #477153)
+- Allow the EAP authentication method
+
 * Fri Nov 21 2008 Dan Williams <dcbw at redhat.com> 1:0.7.0-12.svn4326
 - Rebuild for updated NetworkManager
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager-pptp/F-8/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	22 Nov 2008 04:18:25 -0000	1.3
+++ sources	3 Jan 2009 07:59:45 -0000	1.4
@@ -1 +1 @@
-b9b6d1e987be04279fa2610eb208e09e  NetworkManager-pptp-0.7.0.svn4326.tar.bz2
+df7f950127c9cc7e640dd2c8effd953b  NetworkManager-pptp-0.7.0.svn16.tar.bz2



From remi at fedoraproject.org  Sat Jan  3 08:01:05 2009
From: remi at fedoraproject.org (Remi Collet)
Date: Sat,  3 Jan 2009 08:01:05 +0000 (UTC)
Subject: rpms/php/F-10 php-5.2.7-tests-dashn.patch, NONE, 1.1 .cvsignore,
	1.33, 1.34 php.spec, 1.161, 1.162 sources, 1.36,
	1.37 php-5.2.4-tests-dashn.patch, 1.1, NONE
Message-ID: <20090103080105.7823570165@cvs1.fedora.phx.redhat.com>

Author: remi

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

Modified Files:
	.cvsignore php.spec sources 
Added Files:
	php-5.2.7-tests-dashn.patch 
Removed Files:
	php-5.2.4-tests-dashn.patch 
Log Message:
update to 5.2.8

php-5.2.7-tests-dashn.patch:

--- NEW FILE php-5.2.7-tests-dashn.patch ---
--- php-5.2.7/Makefile.global.orig	2008-12-05 07:37:27.000000000 +0100
+++ php-5.2.7/Makefile.global	2008-12-05 07:37:55.000000000 +0100
@@ -67,7 +67,7 @@
 		done; \
 	fi
 
-PHP_TEST_SETTINGS = -d 'open_basedir=' -d 'output_buffering=0' -d 'memory_limit=-1'
+PHP_TEST_SETTINGS = -n -d 'open_basedir=' -d 'output_buffering=0' -d 'memory_limit=-1'
 PHP_TEST_SHARED_EXTENSIONS =  ` \
 	if test "x$(PHP_MODULES)" != "x"; then \
 		for i in $(PHP_MODULES)""; do \


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php/F-10/.cvsignore,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- .cvsignore	5 Dec 2007 15:49:24 -0000	1.33
+++ .cvsignore	3 Jan 2009 08:00:34 -0000	1.34
@@ -1,4 +1,5 @@
 php-5.2.3
 clog
 *.tar.gz
+*.tar.bz2
 *.rpm


Index: php.spec
===================================================================
RCS file: /cvs/extras/rpms/php/F-10/php.spec,v
retrieving revision 1.161
retrieving revision 1.162
diff -u -r1.161 -r1.162
--- php.spec	4 Nov 2008 11:26:35 -0000	1.161
+++ php.spec	3 Jan 2009 08:00:34 -0000	1.162
@@ -5,15 +5,15 @@
 
 %define _default_patch_fuzz 2
 
-Summary: The PHP HTML-embedded scripting language
+Summary: PHP scripting language for creating dynamic web sites
 Name: php
-Version: 5.2.6
-Release: 6
+Version: 5.2.8
+Release: 1%{?dist}
 License: PHP
 Group: Development/Languages
 URL: http://www.php.net/
 
-Source0: http://www.php.net/distributions/php-%{version}.tar.gz
+Source0: http://www.php.net/distributions/php-%{version}.tar.bz2
 Source1: php.conf
 Source2: php.ini
 Source3: macros.php
@@ -36,7 +36,7 @@
 Patch32: php-5.2.6-systzdata.patch
 
 # Fixes for tests
-Patch50: php-5.2.4-tests-dashn.patch
+Patch50: php-5.2.7-tests-dashn.patch
 Patch51: php-5.0.4-tests-wddx.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -327,7 +327,7 @@
 %package mssql
 Summary: MSSQL database module for PHP
 Group: Development/Languages
-Requires: php-common = %{version}-%{release}
+Requires: php-common = %{version}-%{release}, php-pdo
 BuildRequires: freetds-devel
 
 %description mssql
@@ -530,6 +530,7 @@
       --with-pdo-mysql=shared,%{_prefix} \
       --with-pdo-pgsql=shared,%{_prefix} \
       --with-pdo-sqlite=shared,%{_prefix} \
+      --with-pdo-dblib=shared,%{_prefix} \
       --enable-json=shared \
       --enable-zip=shared \
       --with-readline \
@@ -578,15 +579,15 @@
 %install
 [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
 
+# Install the version for embedded script language in applications + php_embed.h
+make -C build-embedded install-sapi install-headers INSTALL_ROOT=$RPM_BUILD_ROOT
+
 # Install everything from the CGI SAPI build
 make -C build-cgi install INSTALL_ROOT=$RPM_BUILD_ROOT 
 
 # Install the Apache module
 make -C build-apache install-sapi INSTALL_ROOT=$RPM_BUILD_ROOT
 
-# Install the version for embedded script language in applications
-make -C build-embedded install-sapi INSTALL_ROOT=$RPM_BUILD_ROOT
-
 # Install the default configuration file and icons
 install -m 755 -d $RPM_BUILD_ROOT%{_sysconfdir}/
 install -m 644 $RPM_SOURCE_DIR/php.ini $RPM_BUILD_ROOT%{_sysconfdir}/php.ini
@@ -613,7 +614,7 @@
 for mod in pgsql mysql mysqli odbc ldap snmp xmlrpc imap \
     mbstring ncurses gd dom xsl soap bcmath dba xmlreader xmlwriter \
     pdo pdo_mysql pdo_pgsql pdo_odbc pdo_sqlite json zip \
-    dbase mcrypt mhash tidy mssql pspell; do
+    dbase mcrypt mhash tidy pdo_dblib mssql pspell; do
     cat > $RPM_BUILD_ROOT%{_sysconfdir}/php.d/${mod}.ini <<EOF
 ; Enable ${mod} extension module
 extension=${mod}.so
@@ -631,6 +632,7 @@
 cat files.mysqli >> files.mysql
 
 # Split out the PDO modules
+cat files.pdo_dblib >> files.mssql
 cat files.pdo_mysql >> files.mysql
 cat files.pdo_pgsql >> files.pgsql
 cat files.pdo_odbc >> files.odbc
@@ -729,6 +731,11 @@
 %files pspell -f files.pspell
 
 %changelog
+* Sat Jan 03 2009 Remi Collet <Fedora at FamilleCollet.com> 5.2.8-1
+- update to 5.2.8
+- add missing php_embed.h (#457777)
+- enable pdo_dblib driver in php-mssql
+
 * Tue Nov  4 2008 Joe Orton <jorton at redhat.com> 5.2.6-6
 - move gd_README to php-gd
 - update to r4 of systzdata patch; introduces a default timezone


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php/F-10/sources,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- sources	14 Jul 2008 11:04:39 -0000	1.36
+++ sources	3 Jan 2009 08:00:35 -0000	1.37
@@ -1 +1 @@
-1720f95f26c506338f0dba3a51906bbd  php-5.2.6.tar.gz
+8760a833cf10433d3e72271ab0d0eccf  php-5.2.8.tar.bz2


--- php-5.2.4-tests-dashn.patch DELETED ---



From lmacken at fedoraproject.org  Sat Jan  3 06:54:38 2009
From: lmacken at fedoraproject.org (Luke Macken)
Date: Sat,  3 Jan 2009 06:54:38 +0000 (UTC)
Subject: rpms/TurboGears/devel .cvsignore,1.12,1.13 sources,1.12,1.13
Message-ID: <20090103065438.3BC9170151@cvs1.fedora.phx.redhat.com>

Author: lmacken

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

Modified Files:
	.cvsignore sources 
Log Message:
Add the sources


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/TurboGears/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	18 Sep 2008 00:32:33 -0000	1.12
+++ .cvsignore	3 Jan 2009 06:54:07 -0000	1.13
@@ -1 +1 @@
-TurboGears-1.0.7.tar.gz
+TurboGears-1.0.8.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/TurboGears/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	18 Sep 2008 00:32:33 -0000	1.12
+++ sources	3 Jan 2009 06:54:07 -0000	1.13
@@ -1 +1 @@
-a933efb063de7efb337d4819976c81ea  TurboGears-1.0.7.tar.gz
+845b29a588ae8d4e7591c7226daa6f98  TurboGears-1.0.8.tar.gz



From pbrobinson at fedoraproject.org  Sat Jan  3 05:46:54 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Sat,  3 Jan 2009 05:46:54 +0000 (UTC)
Subject: rpms/olpcsound/devel olpcsound.spec,1.4,1.5
Message-ID: <20090103054654.7585170134@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

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

Modified Files:
	olpcsound.spec 
Log Message:
- Hopefully fix versioned python dir locations



Index: olpcsound.spec
===================================================================
RCS file: /cvs/pkgs/rpms/olpcsound/devel/olpcsound.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- olpcsound.spec	29 Nov 2008 16:55:47 -0000	1.4
+++ olpcsound.spec	3 Jan 2009 05:46:15 -0000	1.5
@@ -1,7 +1,7 @@
 Summary: Csound - sound synthesis language and library, OLPC subset
 Name:   olpcsound        
 Version: 5.08.92
-Release: 13%{?dist}
+Release: 14%{?dist}
 URL: http://csound.sourceforge.net/
 License: LGPLv2+
 Group: Applications/Multimedia
@@ -16,7 +16,7 @@
 BuildRequires: swig python scons alsa-lib-devel liblo-devel libsndfile-devel 
 BuildRequires: jack-audio-connection-kit-devel 
 BuildRequires: libpng-devel libjpeg-devel libvorbis-devel libogg-devel gettext python-devel
-%define python_site_dir %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")
+%{?!pyver: %define pyver %(python -c 'import sys;print(sys.version[0:3])')}
 
 ExclusiveArch: i386
 
@@ -64,7 +64,7 @@
 %{_libdir}/csound/plugins/*
 %{_libdir}/libcsound.so.5.1
 %{_libdir}/libcsnd.so.5.1
-%{python_site_dir}/*
+%{_libdir}/python%{pyver}/site-packages/*
 %dir %{_datadir}/doc/csound
 %{_datadir}/doc/csound/*
 
@@ -78,6 +78,9 @@
 
 
 %changelog
+* Sat Jan  3 2008 Peter Robinson <pbrobinson at gmail.com> - 5.08.92-14
+- Hopefully fix versioned python dir locations
+
 * Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 5.08.92-13
 - Rebuild for Python 2.6
 



From pbrobinson at fedoraproject.org  Sat Jan  3 06:54:30 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Sat,  3 Jan 2009 06:54:30 +0000 (UTC)
Subject: rpms/libiphone/devel libiphone.spec,1.7,1.8 sources,1.3,1.4
Message-ID: <20090103065430.5FB1470150@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

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

Modified Files:
	libiphone.spec sources 
Log Message:
- Upload bzipped source file



Index: libiphone.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libiphone/devel/libiphone.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- libiphone.spec	3 Jan 2009 06:42:58 -0000	1.7
+++ libiphone.spec	3 Jan 2009 06:53:59 -0000	1.8
@@ -9,7 +9,7 @@
 
 Name:           libiphone
 Version:        0.1.0
-Release:        7.%{snapshot}%{?dist}
+Release:        8.%{snapshot}%{?dist}
 Summary:        Library for connecting to Apple iPhone and iPod touch
 
 Group:          System Environment/Libraries
@@ -77,6 +77,9 @@
 %{_includedir}/libiphone
 
 %changelog
+* Sat Jan 3 2009 Peter Robinson <pbrobinson at gmail.com> 0.1.0-8.git5cde554
+- Upload bzipped source file
+
 * Sat Jan 3 2009 Peter Robinson <pbrobinson at gmail.com> 0.1.0-7.git5cde554
 - New git snapshot
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libiphone/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	3 Jan 2009 06:46:01 -0000	1.3
+++ sources	3 Jan 2009 06:53:59 -0000	1.4
@@ -1 +1 @@
-2b84f8b2961b3082863b697b4b3cc0dc  libiphone-0.1.0-20090103.tar.bz2
+1c6950b2ddf6cf2ed103b616cde0b13a  libiphone-0.1.0-20090103.tar.bz2



From corsepiu at fedoraproject.org  Sat Jan  3 05:47:44 2009
From: corsepiu at fedoraproject.org (=?utf-8?q?Ralf_Cors=C3=A9pius?=)
Date: Sat,  3 Jan 2009 05:47:44 +0000 (UTC)
Subject: rpms/perl-Locale-Maketext-Lexicon/F-10 .cvsignore, 1.14,
	1.15 perl-Locale-Maketext-Lexicon.spec, 1.21, 1.22 sources, 1.14, 1.15
Message-ID: <20090103054744.83AE770140@cvs1.fedora.phx.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-Locale-Maketext-Lexicon/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9541

Modified Files:
	.cvsignore perl-Locale-Maketext-Lexicon.spec sources 
Log Message:
* Fri Jan 02 2009 Ralf Cors??pius <corsepiu at fedoraproject.org> - 0.77-1
- Upstream update.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Locale-Maketext-Lexicon/F-10/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	20 Dec 2008 06:39:51 -0000	1.14
+++ .cvsignore	3 Jan 2009 05:47:13 -0000	1.15
@@ -1 +1 @@
-Locale-Maketext-Lexicon-0.76.tar.gz
+Locale-Maketext-Lexicon-0.77.tar.gz


Index: perl-Locale-Maketext-Lexicon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Locale-Maketext-Lexicon/F-10/perl-Locale-Maketext-Lexicon.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- perl-Locale-Maketext-Lexicon.spec	20 Dec 2008 06:39:51 -0000	1.21
+++ perl-Locale-Maketext-Lexicon.spec	3 Jan 2009 05:47:13 -0000	1.22
@@ -1,5 +1,5 @@
 Name: 		perl-Locale-Maketext-Lexicon
-Version: 	0.76
+Version: 	0.77
 Release: 	1%{?dist}
 Summary: 	Extract translatable strings from source
 License:	MIT
@@ -82,6 +82,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Fri Jan 02 2009 Ralf Cors??pius <corsepiu at fedoraproject.org> - 0.77-1
+- Upstream update.
+
 * Sat Dec 20 2008 Ralf Cors??pius <corsepiu at fedoraproject.org> - 0.76-1
 - Upstream update.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Locale-Maketext-Lexicon/F-10/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	20 Dec 2008 06:39:51 -0000	1.14
+++ sources	3 Jan 2009 05:47:14 -0000	1.15
@@ -1 +1 @@
-e76a50a9935ab607bc06f13028bb364f  Locale-Maketext-Lexicon-0.76.tar.gz
+622dada722fb6db0e49e453c843af83c  Locale-Maketext-Lexicon-0.77.tar.gz



From pbrobinson at fedoraproject.org  Sat Jan  3 05:50:20 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Sat,  3 Jan 2009 05:50:20 +0000 (UTC)
Subject: rpms/olpcsound/devel olpcsound.spec,1.5,1.6
Message-ID: <20090103055020.2DB2E70120@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

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

Modified Files:
	olpcsound.spec 
Log Message:
- Update changelog date to 2009



Index: olpcsound.spec
===================================================================
RCS file: /cvs/pkgs/rpms/olpcsound/devel/olpcsound.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- olpcsound.spec	3 Jan 2009 05:46:15 -0000	1.5
+++ olpcsound.spec	3 Jan 2009 05:49:49 -0000	1.6
@@ -78,7 +78,7 @@
 
 
 %changelog
-* Sat Jan  3 2008 Peter Robinson <pbrobinson at gmail.com> - 5.08.92-14
+* Sat Jan  3 2009 Peter Robinson <pbrobinson at gmail.com> - 5.08.92-14
 - Hopefully fix versioned python dir locations
 
 * Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 5.08.92-13



From lmacken at fedoraproject.org  Sat Jan  3 07:20:45 2009
From: lmacken at fedoraproject.org (Luke Macken)
Date: Sat,  3 Jan 2009 07:20:45 +0000 (UTC)
Subject: rpms/TurboGears/F-9 TurboGears-1.0.8-cherrypyreq.patch, NONE,
	1.1 TurboGears-1.0.8-setup.patch, NONE, 1.1 .cvsignore, 1.11,
	1.12 TurboGears.spec, 1.39, 1.40 sources, 1.12, 1.13
Message-ID: <20090103072045.18EF770157@cvs1.fedora.phx.redhat.com>

Author: lmacken

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

Modified Files:
	.cvsignore TurboGears.spec sources 
Added Files:
	TurboGears-1.0.8-cherrypyreq.patch 
	TurboGears-1.0.8-setup.patch 
Log Message:
1.0.8, the latest upstream bugfix release

TurboGears-1.0.8-cherrypyreq.patch:

--- NEW FILE TurboGears-1.0.8-cherrypyreq.patch ---
--- turbogears/config.py.orig	2008-12-18 16:42:03.000000000 -0500
+++ turbogears/config.py	2008-12-18 16:42:06.000000000 -0500
@@ -1,8 +1,10 @@
 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.8-setup.patch:

--- NEW FILE TurboGears-1.0.8-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",
 ]
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/TurboGears/F-9/.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	3 Jan 2009 07:20:14 -0000	1.12
@@ -1 +1 @@
-TurboGears-1.0.4.4.tar.gz
+TurboGears-1.0.8.tar.gz


Index: TurboGears.spec
===================================================================
RCS file: /cvs/pkgs/rpms/TurboGears/F-9/TurboGears.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- TurboGears.spec	18 Sep 2008 01:43:24 -0000	1.39
+++ TurboGears.spec	3 Jan 2009 07:20:14 -0000	1.40
@@ -2,8 +2,8 @@
 %{!?pyver: %define pyver %(%{__python} -c "import sys ; print sys.version[:3]")}
 
 Name:           TurboGears
-Version:        1.0.7
-Release:        2%{?dist}
+Version:        1.0.8
+Release:        1%{?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,8 +92,14 @@
 %{python_sitelib}/turbogears/
 
 %changelog
+* Thu Dec 18 2008 Luke Macken <lmacken at redhat.com> - 1.0.8-1
+- Latest upstream release.
+
+* Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 1.0.7-3
+- Rebuild for Python 2.6
+
 * Wed Sep 17 2008 Luke Macken <lmacken at redhat.com> 1.0.7-2
-- Rebase cherrypyreq patch.
+- 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


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/TurboGears/F-9/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	18 Sep 2008 01:25:02 -0000	1.12
+++ sources	3 Jan 2009 07:20:14 -0000	1.13
@@ -1 +1 @@
-a933efb063de7efb337d4819976c81ea  TurboGears-1.0.7.tar.gz
+845b29a588ae8d4e7591c7226daa6f98  TurboGears-1.0.8.tar.gz



From corsepiu at fedoraproject.org  Sat Jan  3 05:52:43 2009
From: corsepiu at fedoraproject.org (=?utf-8?q?Ralf_Cors=C3=A9pius?=)
Date: Sat,  3 Jan 2009 05:52:43 +0000 (UTC)
Subject: rpms/perl-Locale-Maketext-Lexicon/F-9 .cvsignore, 1.14,
	1.15 perl-Locale-Maketext-Lexicon.spec, 1.21, 1.22 sources, 1.14, 1.15
Message-ID: <20090103055243.57AF470144@cvs1.fedora.phx.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-Locale-Maketext-Lexicon/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10903

Modified Files:
	.cvsignore perl-Locale-Maketext-Lexicon.spec sources 
Log Message:
* Fri Jan 02 2009 Ralf Cors??pius <corsepiu at fedoraproject.org> - 0.77-1
- Upstream update.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Locale-Maketext-Lexicon/F-9/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	20 Dec 2008 06:39:51 -0000	1.14
+++ .cvsignore	3 Jan 2009 05:52:12 -0000	1.15
@@ -1 +1 @@
-Locale-Maketext-Lexicon-0.76.tar.gz
+Locale-Maketext-Lexicon-0.77.tar.gz


Index: perl-Locale-Maketext-Lexicon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Locale-Maketext-Lexicon/F-9/perl-Locale-Maketext-Lexicon.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- perl-Locale-Maketext-Lexicon.spec	20 Dec 2008 06:39:51 -0000	1.21
+++ perl-Locale-Maketext-Lexicon.spec	3 Jan 2009 05:52:12 -0000	1.22
@@ -1,5 +1,5 @@
 Name: 		perl-Locale-Maketext-Lexicon
-Version: 	0.76
+Version: 	0.77
 Release: 	1%{?dist}
 Summary: 	Extract translatable strings from source
 License:	MIT
@@ -82,6 +82,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Fri Jan 02 2009 Ralf Cors??pius <corsepiu at fedoraproject.org> - 0.77-1
+- Upstream update.
+
 * Sat Dec 20 2008 Ralf Cors??pius <corsepiu at fedoraproject.org> - 0.76-1
 - Upstream update.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Locale-Maketext-Lexicon/F-9/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	20 Dec 2008 06:39:51 -0000	1.14
+++ sources	3 Jan 2009 05:52:12 -0000	1.15
@@ -1 +1 @@
-e76a50a9935ab607bc06f13028bb364f  Locale-Maketext-Lexicon-0.76.tar.gz
+622dada722fb6db0e49e453c843af83c  Locale-Maketext-Lexicon-0.77.tar.gz



From pbrobinson at fedoraproject.org  Sat Jan  3 07:12:00 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Sat,  3 Jan 2009 07:12:00 +0000 (UTC)
Subject: rpms/libiphone/devel libiphone.spec,1.8,1.9
Message-ID: <20090103071200.9EA8670155@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

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

Modified Files:
	libiphone.spec 
Log Message:
- Add back gnutls patch



Index: libiphone.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libiphone/devel/libiphone.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- libiphone.spec	3 Jan 2009 06:53:59 -0000	1.8
+++ libiphone.spec	3 Jan 2009 07:11:30 -0000	1.9
@@ -9,7 +9,7 @@
 
 Name:           libiphone
 Version:        0.1.0
-Release:        8.%{snapshot}%{?dist}
+Release:        9.%{snapshot}%{?dist}
 Summary:        Library for connecting to Apple iPhone and iPod touch
 
 Group:          System Environment/Libraries
@@ -17,6 +17,7 @@
 URL:            http://matt.colyer.name/projects/iphone-linux/
 
 Source0:        %{tarfile}
+Patch0:         libiphone-fixgnutlsver.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: libxml2-devel
@@ -44,6 +45,7 @@
 
 %prep
 %setup -q
+%patch0 -p0 -b .fixgnutlsver
 
 %build
 ./autogen.sh
@@ -77,6 +79,9 @@
 %{_includedir}/libiphone
 
 %changelog
+* Sat Jan 3 2009 Peter Robinson <pbrobinson at gmail.com> 0.1.0-9.git5cde554
+- Add back gnutls version patch
+
 * Sat Jan 3 2009 Peter Robinson <pbrobinson at gmail.com> 0.1.0-8.git5cde554
 - Upload bzipped source file
 



From lmacken at fedoraproject.org  Sat Jan  3 07:19:39 2009
From: lmacken at fedoraproject.org (Luke Macken)
Date: Sat,  3 Jan 2009 07:19:39 +0000 (UTC)
Subject: rpms/TurboGears/F-10 TurboGears-1.0.8-cherrypyreq.patch, NONE,
	1.1 TurboGears-1.0.8-setup.patch, NONE, 1.1 .cvsignore, 1.12,
	1.13 TurboGears.spec, 1.40, 1.41 sources, 1.12, 1.13
Message-ID: <20090103071939.2EEAF70156@cvs1.fedora.phx.redhat.com>

Author: lmacken

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

Modified Files:
	.cvsignore TurboGears.spec sources 
Added Files:
	TurboGears-1.0.8-cherrypyreq.patch 
	TurboGears-1.0.8-setup.patch 
Log Message:
1.0.8, the latest upstream bugfix release

TurboGears-1.0.8-cherrypyreq.patch:

--- NEW FILE TurboGears-1.0.8-cherrypyreq.patch ---
--- turbogears/config.py.orig	2008-12-18 16:42:03.000000000 -0500
+++ turbogears/config.py	2008-12-18 16:42:06.000000000 -0500
@@ -1,8 +1,10 @@
 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.8-setup.patch:

--- NEW FILE TurboGears-1.0.8-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",
 ]
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/TurboGears/F-10/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	18 Sep 2008 00:32:33 -0000	1.12
+++ .cvsignore	3 Jan 2009 07:19:08 -0000	1.13
@@ -1 +1 @@
-TurboGears-1.0.7.tar.gz
+TurboGears-1.0.8.tar.gz


Index: TurboGears.spec
===================================================================
RCS file: /cvs/pkgs/rpms/TurboGears/F-10/TurboGears.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- TurboGears.spec	18 Sep 2008 07:10:59 -0000	1.40
+++ TurboGears.spec	3 Jan 2009 07:19:08 -0000	1.41
@@ -2,8 +2,8 @@
 %{!?pyver: %define pyver %(%{__python} -c "import sys ; print sys.version[:3]")}
 
 Name:           TurboGears
-Version:        1.0.7
-Release:        2%{?dist}
+Version:        1.0.8
+Release:        1%{?dist}
 Summary:        Back-to-front web development in Python
 
 Group:          Development/Languages
@@ -92,6 +92,12 @@
 %{python_sitelib}/turbogears/
 
 %changelog
+* Thu Dec 18 2008 Luke Macken <lmacken at redhat.com> - 1.0.8-1
+- Latest upstream release.
+
+* Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 1.0.7-3
+- Rebuild for Python 2.6
+
 * Wed Sep 17 2008 Luke Macken <lmacken at redhat.com> 1.0.7-2
 - Add a patch to allow newer versions of TurboJson
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/TurboGears/F-10/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	18 Sep 2008 00:32:33 -0000	1.12
+++ sources	3 Jan 2009 07:19:08 -0000	1.13
@@ -1 +1 @@
-a933efb063de7efb337d4819976c81ea  TurboGears-1.0.7.tar.gz
+845b29a588ae8d4e7591c7226daa6f98  TurboGears-1.0.8.tar.gz



From dcbw at fedoraproject.org  Sat Jan  3 07:00:47 2009
From: dcbw at fedoraproject.org (Daniel Williams)
Date: Sat,  3 Jan 2009 07:00:47 +0000 (UTC)
Subject: rpms/NetworkManager-vpnc/devel .cvsignore, 1.24,
	1.25 NetworkManager-vpnc.spec, 1.48, 1.49 sources, 1.30, 1.31
Message-ID: <20090103070047.550FA70146@cvs1.fedora.phx.redhat.com>

Author: dcbw

Update of /cvs/extras/rpms/NetworkManager-vpnc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31893

Modified Files:
	.cvsignore NetworkManager-vpnc.spec sources 
Log Message:
* Sat Jan  3 2009 Dan Williams <dcbw at redhat.com> 1:0.7.0-1
- Rebuild for updated NetworkManager
- Better handling of passwords that shouldn't be saved
- Fix some specfile issues (rh #477151)




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/NetworkManager-vpnc/devel/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- .cvsignore	22 Nov 2008 03:38:11 -0000	1.24
+++ .cvsignore	3 Jan 2009 07:00:16 -0000	1.25
@@ -20,3 +20,4 @@
 NetworkManager-vpnc-0.7.0.svn4229.tar.gz
 NetworkManager-vpnc-0.7.0.svn4293.tar.gz
 NetworkManager-vpnc-0.7.0.svn4326.tar.gz
+NetworkManager-vpnc-0.7.0.svn13.tar.gz


Index: NetworkManager-vpnc.spec
===================================================================
RCS file: /cvs/extras/rpms/NetworkManager-vpnc/devel/NetworkManager-vpnc.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- NetworkManager-vpnc.spec	22 Nov 2008 03:38:11 -0000	1.48
+++ NetworkManager-vpnc.spec	3 Jan 2009 07:00:16 -0000	1.49
@@ -1,16 +1,16 @@
-%define nm_version          1:0.7.0-0.12.svn4326
+%define nm_version          1:0.7.0-1
 %define dbus_version        1.1
 %define gtk2_version        2.10.0
 %define vpnc_version        0.4
 %define shared_mime_version 0.16-3
 
-%define svn_snapshot svn4326
+%define svn_snapshot svn13
 
 Summary:   NetworkManager VPN plugin for vpnc
 Name:      NetworkManager-vpnc
 Epoch:     1
 Version:   0.7.0
-Release:   0.11.%{svn_snapshot}%{?dist}
+Release:   1.%{svn_snapshot}%{?dist}
 License:   GPLv2+
 Group:     System Environment/Base
 URL:       http://www.gnome.org/projects/NetworkManager/
@@ -24,7 +24,6 @@
 BuildRequires: GConf2-devel
 BuildRequires: gnome-keyring-devel
 BuildRequires: libglade2-devel
-BuildRequires: libpng-devel
 BuildRequires: intltool gettext
 
 Requires: gtk2             >= %{gtk2_version}
@@ -95,8 +94,14 @@
 %{_datadir}/gnome-vpn-properties/vpnc/nm-vpnc-dialog.glade
 %{_datadir}/applications/nm-vpnc.desktop
 %{_datadir}/icons/hicolor/48x48/apps/gnome-mime-application-x-cisco-vpn-settings.png
+%dir %{_datadir}/gnome-vpn-properties/vpnc
 
 %changelog
+* Sat Jan  3 2009 Dan Williams <dcbw at redhat.com> 1:0.7.0-1
+- Rebuild for updated NetworkManager
+- Better handling of passwords that shouldn't be saved
+- Fix some specfile issues (rh #477151)
+
 * Fri Nov 21 2008 Dan Williams <dcbw at redhat.com> 1:0.7.0-0.11.svn4326
 - Rebuild for updated NetworkManager
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/NetworkManager-vpnc/devel/sources,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- sources	22 Nov 2008 03:38:11 -0000	1.30
+++ sources	3 Jan 2009 07:00:16 -0000	1.31
@@ -1 +1 @@
-421768306b2a295f9d8696c87cc5118f  NetworkManager-vpnc-0.7.0.svn4326.tar.gz
+5d9adef5ce3b54a8ec8757448bfe2634  NetworkManager-vpnc-0.7.0.svn13.tar.gz



From dcbw at fedoraproject.org  Sat Jan  3 07:04:25 2009
From: dcbw at fedoraproject.org (Daniel Williams)
Date: Sat,  3 Jan 2009 07:04:25 +0000 (UTC)
Subject: rpms/NetworkManager-vpnc/F-10 NetworkManager-vpnc.spec, 1.48,
	1.49 sources, 1.30, 1.31
Message-ID: <20090103070425.A764170147@cvs1.fedora.phx.redhat.com>

Author: dcbw

Update of /cvs/extras/rpms/NetworkManager-vpnc/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1693

Modified Files:
	NetworkManager-vpnc.spec sources 
Log Message:
* Sat Jan  3 2009 Dan Williams <dcbw at redhat.com> 1:0.7.0-1
- Rebuild for updated NetworkManager
- Better handling of passwords that shouldn't be saved
- Fix some specfile issues (rh #477151)




Index: NetworkManager-vpnc.spec
===================================================================
RCS file: /cvs/extras/rpms/NetworkManager-vpnc/F-10/NetworkManager-vpnc.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- NetworkManager-vpnc.spec	22 Nov 2008 03:41:31 -0000	1.48
+++ NetworkManager-vpnc.spec	3 Jan 2009 07:03:55 -0000	1.49
@@ -1,16 +1,16 @@
-%define nm_version          1:0.7.0-0.12.svn4326
+%define nm_version          1:0.7.0-1
 %define dbus_version        1.1
 %define gtk2_version        2.10.0
 %define vpnc_version        0.4
 %define shared_mime_version 0.16-3
 
-%define svn_snapshot svn4326
+%define svn_snapshot svn13
 
 Summary:   NetworkManager VPN plugin for vpnc
 Name:      NetworkManager-vpnc
 Epoch:     1
 Version:   0.7.0
-Release:   0.11.%{svn_snapshot}%{?dist}
+Release:   1.%{svn_snapshot}%{?dist}
 License:   GPLv2+
 Group:     System Environment/Base
 URL:       http://www.gnome.org/projects/NetworkManager/
@@ -24,7 +24,6 @@
 BuildRequires: GConf2-devel
 BuildRequires: gnome-keyring-devel
 BuildRequires: libglade2-devel
-BuildRequires: libpng-devel
 BuildRequires: intltool gettext
 
 Requires: gtk2             >= %{gtk2_version}
@@ -95,8 +94,14 @@
 %{_datadir}/gnome-vpn-properties/vpnc/nm-vpnc-dialog.glade
 %{_datadir}/applications/nm-vpnc.desktop
 %{_datadir}/icons/hicolor/48x48/apps/gnome-mime-application-x-cisco-vpn-settings.png
+%dir %{_datadir}/gnome-vpn-properties/vpnc
 
 %changelog
+* Sat Jan  3 2009 Dan Williams <dcbw at redhat.com> 1:0.7.0-1
+- Rebuild for updated NetworkManager
+- Better handling of passwords that shouldn't be saved
+- Fix some specfile issues (rh #477151)
+
 * Fri Nov 21 2008 Dan Williams <dcbw at redhat.com> 1:0.7.0-0.11.svn4326
 - Rebuild for updated NetworkManager
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/NetworkManager-vpnc/F-10/sources,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- sources	22 Nov 2008 03:41:31 -0000	1.30
+++ sources	3 Jan 2009 07:03:55 -0000	1.31
@@ -1 +1 @@
-421768306b2a295f9d8696c87cc5118f  NetworkManager-vpnc-0.7.0.svn4326.tar.gz
+5d9adef5ce3b54a8ec8757448bfe2634  NetworkManager-vpnc-0.7.0.svn13.tar.gz



From dcbw at fedoraproject.org  Sat Jan  3 07:06:09 2009
From: dcbw at fedoraproject.org (Daniel Williams)
Date: Sat,  3 Jan 2009 07:06:09 +0000 (UTC)
Subject: rpms/NetworkManager-vpnc/F-9 NetworkManager-vpnc.spec, 1.42,
	1.43 sources, 1.25, 1.26
Message-ID: <20090103070609.DF44C70152@cvs1.fedora.phx.redhat.com>

Author: dcbw

Update of /cvs/extras/rpms/NetworkManager-vpnc/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2051

Modified Files:
	NetworkManager-vpnc.spec sources 
Log Message:
* Sat Jan  3 2009 Dan Williams <dcbw at redhat.com> 1:0.7.0-1
- Rebuild for updated NetworkManager
- Better handling of passwords that shouldn't be saved
- Fix some specfile issues (rh #477151)




Index: NetworkManager-vpnc.spec
===================================================================
RCS file: /cvs/extras/rpms/NetworkManager-vpnc/F-9/NetworkManager-vpnc.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- NetworkManager-vpnc.spec	22 Nov 2008 03:42:56 -0000	1.42
+++ NetworkManager-vpnc.spec	3 Jan 2009 07:05:39 -0000	1.43
@@ -1,16 +1,16 @@
-%define nm_version          1:0.7.0-0.12.svn4326
+%define nm_version          1:0.7.0-1
 %define dbus_version        1.1
 %define gtk2_version        2.10.0
 %define vpnc_version        0.4
 %define shared_mime_version 0.16-3
 
-%define svn_snapshot svn4326
+%define svn_snapshot svn13
 
 Summary:   NetworkManager VPN plugin for vpnc
 Name:      NetworkManager-vpnc
 Epoch:     1
 Version:   0.7.0
-Release:   0.11.%{svn_snapshot}%{?dist}
+Release:   1.%{svn_snapshot}%{?dist}
 License:   GPLv2+
 Group:     System Environment/Base
 URL:       http://www.gnome.org/projects/NetworkManager/
@@ -24,7 +24,6 @@
 BuildRequires: GConf2-devel
 BuildRequires: gnome-keyring-devel
 BuildRequires: libglade2-devel
-BuildRequires: libpng-devel
 BuildRequires: intltool gettext
 
 Requires: gtk2             >= %{gtk2_version}
@@ -95,8 +94,14 @@
 %{_datadir}/gnome-vpn-properties/vpnc/nm-vpnc-dialog.glade
 %{_datadir}/applications/nm-vpnc.desktop
 %{_datadir}/icons/hicolor/48x48/apps/gnome-mime-application-x-cisco-vpn-settings.png
+%dir %{_datadir}/gnome-vpn-properties/vpnc
 
 %changelog
+* Sat Jan  3 2009 Dan Williams <dcbw at redhat.com> 1:0.7.0-1
+- Rebuild for updated NetworkManager
+- Better handling of passwords that shouldn't be saved
+- Fix some specfile issues (rh #477151)
+
 * Fri Nov 21 2008 Dan Williams <dcbw at redhat.com> 1:0.7.0-0.11.svn4326
 - Rebuild for updated NetworkManager
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/NetworkManager-vpnc/F-9/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- sources	22 Nov 2008 03:42:56 -0000	1.25
+++ sources	3 Jan 2009 07:05:39 -0000	1.26
@@ -1 +1 @@
-421768306b2a295f9d8696c87cc5118f  NetworkManager-vpnc-0.7.0.svn4326.tar.gz
+5d9adef5ce3b54a8ec8757448bfe2634  NetworkManager-vpnc-0.7.0.svn13.tar.gz



From dcbw at fedoraproject.org  Sat Jan  3 07:24:27 2009
From: dcbw at fedoraproject.org (Daniel Williams)
Date: Sat,  3 Jan 2009 07:24:27 +0000 (UTC)
Subject: rpms/NetworkManager-vpnc/F-8 NetworkManager-vpnc.spec, 1.45,
	1.46 sources, 1.25, 1.26
Message-ID: <20090103072427.CF62470158@cvs1.fedora.phx.redhat.com>

Author: dcbw

Update of /cvs/extras/rpms/NetworkManager-vpnc/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6498

Modified Files:
	NetworkManager-vpnc.spec sources 
Log Message:
* Sat Jan  3 2009 Dan Williams <dcbw at redhat.com> 1:0.7.0-1
- Rebuild for updated NetworkManager
- Better handling of passwords that shouldn't be saved
- Fix some specfile issues (rh #477151)




Index: NetworkManager-vpnc.spec
===================================================================
RCS file: /cvs/extras/rpms/NetworkManager-vpnc/F-8/NetworkManager-vpnc.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- NetworkManager-vpnc.spec	22 Nov 2008 03:44:18 -0000	1.45
+++ NetworkManager-vpnc.spec	3 Jan 2009 07:23:57 -0000	1.46
@@ -1,16 +1,16 @@
-%define nm_version          1:0.7.0-0.12.svn4326
+%define nm_version          1:0.7.0-1
 %define dbus_version        1.1
 %define gtk2_version        2.10.0
 %define vpnc_version        0.4
 %define shared_mime_version 0.16-3
 
-%define svn_snapshot svn4326
+%define svn_snapshot svn13
 
 Summary:   NetworkManager VPN plugin for vpnc
 Name:      NetworkManager-vpnc
 Epoch:     1
 Version:   0.7.0
-Release:   0.11.%{svn_snapshot}%{?dist}
+Release:   1.%{svn_snapshot}%{?dist}
 License:   GPLv2+
 Group:     System Environment/Base
 URL:       http://www.gnome.org/projects/NetworkManager/
@@ -24,7 +24,6 @@
 BuildRequires: GConf2-devel
 BuildRequires: gnome-keyring-devel
 BuildRequires: libglade2-devel
-BuildRequires: libpng-devel
 BuildRequires: intltool gettext
 
 Requires: gtk2             >= %{gtk2_version}
@@ -95,8 +94,14 @@
 %{_datadir}/gnome-vpn-properties/vpnc/nm-vpnc-dialog.glade
 %{_datadir}/applications/nm-vpnc.desktop
 %{_datadir}/icons/hicolor/48x48/apps/gnome-mime-application-x-cisco-vpn-settings.png
+%dir %{_datadir}/gnome-vpn-properties/vpnc
 
 %changelog
+* Sat Jan  3 2009 Dan Williams <dcbw at redhat.com> 1:0.7.0-1
+- Rebuild for updated NetworkManager
+- Better handling of passwords that shouldn't be saved
+- Fix some specfile issues (rh #477151)
+
 * Fri Nov 21 2008 Dan Williams <dcbw at redhat.com> 1:0.7.0-0.11.svn4326
 - Rebuild for updated NetworkManager
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/NetworkManager-vpnc/F-8/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- sources	22 Nov 2008 03:44:18 -0000	1.25
+++ sources	3 Jan 2009 07:23:57 -0000	1.26
@@ -1 +1 @@
-421768306b2a295f9d8696c87cc5118f  NetworkManager-vpnc-0.7.0.svn4326.tar.gz
+5d9adef5ce3b54a8ec8757448bfe2634  NetworkManager-vpnc-0.7.0.svn13.tar.gz



From remi at fedoraproject.org  Sat Jan  3 11:06:28 2009
From: remi at fedoraproject.org (Remi Collet)
Date: Sat,  3 Jan 2009 11:06:28 +0000 (UTC)
Subject: rpms/php/F-9 php-5.2.6-gnusrc.patch, NONE,
	1.1 php-5.2.6-systzdata.patch, NONE,
	1.1 php-5.2.7-tests-dashn.patch, NONE, 1.1 php.ini, 1.7,
	1.8 php.spec, 1.157, 1.158 sources, 1.36,
	1.37 php-5.2.4-gnusrc.patch, 1.1,
	NONE php-5.2.4-tests-dashn.patch, 1.1,
	NONE php-5.2.5-systzdata.patch, 1.1, NONE
Message-ID: <20090103110628.66B3770120@cvs1.fedora.phx.redhat.com>

Author: remi

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

Modified Files:
	php.ini php.spec sources 
Added Files:
	php-5.2.6-gnusrc.patch php-5.2.6-systzdata.patch 
	php-5.2.7-tests-dashn.patch 
Removed Files:
	php-5.2.4-gnusrc.patch php-5.2.4-tests-dashn.patch 
	php-5.2.5-systzdata.patch 
Log Message:
update to 5.2.8

php-5.2.6-gnusrc.patch:

--- NEW FILE php-5.2.6-gnusrc.patch ---
--- php-5.2.6/configure.in.gnusrc
+++ php-5.2.6/configure.in
@@ -58,6 +58,8 @@ AC_DEFUN([PHP_EXT_DIR],[ext/$1])dnl
 AC_DEFUN([PHP_EXT_SRCDIR],[$abs_srcdir/ext/$1])dnl
 AC_DEFUN([PHP_ALWAYS_SHARED],[])dnl
 
+AC_DEFINE([_GNU_SOURCE], 1, [Define to enable GNU C Library extensions])
+
 dnl Setting up the PHP version based on the information above.
 dnl -------------------------------------------------------------------------
 
--- php-5.2.6/ext/interbase/interbase.c.gnusrc
+++ php-5.2.6/ext/interbase/interbase.c
@@ -24,7 +24,6 @@
 #include "config.h"
 #endif
 
-#define _GNU_SOURCE
 
 #include "php.h"
 
--- php-5.2.6/ext/pdo_firebird/firebird_driver.c.gnusrc
+++ php-5.2.6/ext/pdo_firebird/firebird_driver.c
@@ -22,7 +22,6 @@
 #include "config.h"
 #endif
 
-#define _GNU_SOURCE
 
 #include "php.h"
 #include "php_ini.h"
--- php-5.2.6/ext/standard/file.c.gnusrc
+++ php-5.2.6/ext/standard/file.c
@@ -118,7 +118,6 @@ php_file_globals file_globals;
 
 #ifdef HAVE_FNMATCH
 #ifndef _GNU_SOURCE
-#define _GNU_SOURCE
 #endif
 #include <fnmatch.h>
 #endif
--- php-5.2.6/ext/zlib/zlib_fopen_wrapper.c.gnusrc
+++ php-5.2.6/ext/zlib/zlib_fopen_wrapper.c
@@ -19,7 +19,6 @@
 
 /* $Id: zlib_fopen_wrapper.c,v 1.46.2.1.2.5 2007/12/31 07:20:14 sebastian Exp $ */
 
-#define _GNU_SOURCE
 
 #include "php.h"
 #include "php_zlib.h"
--- php-5.2.6/main/php.h.gnusrc
+++ php-5.2.6/main/php.h
@@ -30,6 +30,7 @@
 #define PHP_HAVE_STREAMS
 #define YYDEBUG 0
 
+#include "php_config.h"
 #include "php_version.h"
 #include "zend.h"
 #include "zend_qsort.h"
--- php-5.2.6/main/streams/cast.c.gnusrc
+++ php-5.2.6/main/streams/cast.c
@@ -18,7 +18,6 @@
 
 /* $Id: cast.c,v 1.12.2.1.2.2 2007/12/31 07:20:15 sebastian Exp $ */
 
-#define _GNU_SOURCE
 #include "php.h"
 #include "php_globals.h"
 #include "php_network.h"
--- php-5.2.6/main/streams/memory.c.gnusrc
+++ php-5.2.6/main/streams/memory.c
@@ -18,7 +18,6 @@
 
 /* $Id: memory.c,v 1.8.2.6.2.19 2008/03/15 10:28:53 felipe Exp $ */
 
-#define _GNU_SOURCE
 #include "php.h"
 
 PHPAPI int php_url_decode(char *str, int len);
--- php-5.2.6/main/streams/streams.c.gnusrc
+++ php-5.2.6/main/streams/streams.c
@@ -21,7 +21,6 @@
 
 /* $Id: streams.c,v 1.82.2.6.2.22 2008/03/24 16:28:56 tony2001 Exp $ */
 
-#define _GNU_SOURCE
 #include "php.h"
 #include "php_globals.h"
 #include "php_network.h"
--- php-5.2.6/Zend/zend_language_parser.c.gnusrc
+++ php-5.2.6/Zend/zend_language_parser.c
@@ -356,6 +356,8 @@
 #include "zend_API.h"
 #include "zend_constants.h"
 
+#include <string.h>
+
 
 #define YYERROR_VERBOSE
 #define YYSTYPE znode

php-5.2.6-systzdata.patch:

--- NEW FILE php-5.2.6-systzdata.patch ---

Add support for use of the system timezone database, rather
than embedding a copy.  Discussed upstream but was not desired.

History:
r4: added "System/Localtime" tzname which uses /etc/localtime
r3: fix a crash if /usr/share/zoneinfo doesn't exist (Raphael Geissert)
r2: add filesystem trawl to set up name alias index
r1: initial revision

--- php-5.2.6/ext/date/lib/parse_tz.c.systzdata
+++ php-5.2.6/ext/date/lib/parse_tz.c
@@ -20,6 +20,16 @@
 
 #include "timelib.h"
 
+#ifdef HAVE_SYSTEM_TZDATA
+#include <sys/mman.h>
+#include <sys/stat.h>
+#include <limits.h>
+#include <fcntl.h>
+#include <unistd.h>
+
+#include "php_scandir.h"
+#endif
+
 #include <stdio.h>
 
 #ifdef HAVE_LOCALE_H
@@ -31,7 +41,10 @@
 #else
 #include <strings.h>
 #endif
+
+#ifndef HAVE_SYSTEM_TZDATA
 #include "timezonedb.h"
+#endif
 
 #if (defined(__APPLE__) || defined(__APPLE_CC__)) && (defined(__BIG_ENDIAN__) || defined(__LITTLE_ENDIAN__))
 # if defined(__LITTLE_ENDIAN__)
@@ -206,6 +219,211 @@ void timelib_dump_tzinfo(timelib_tzinfo 
 	}
 }
 
+#ifdef HAVE_SYSTEM_TZDATA
+
+#ifdef HAVE_SYSTEM_TZDATA_PREFIX
+#define ZONEINFO_PREFIX HAVE_SYSTEM_TZDATA_PREFIX
+#else
+#define ZONEINFO_PREFIX "/usr/share/zoneinfo"
+#endif
+
+#define SYSTEM_TZFILE "/etc/localtime"
+
+static const timelib_tzdb *timezonedb_system = NULL;
+
+/* Filter out some non-tzdata files and the posix/right databases, if
+ * present. */
+static int index_filter(const struct dirent *ent)
+{
+	return strcmp(ent->d_name, ".") != 0
+		&& strcmp(ent->d_name, "..") != 0
+		&& strcmp(ent->d_name, "posix") != 0
+		&& strcmp(ent->d_name, "posixrules") != 0
+		&& strcmp(ent->d_name, "right") != 0
+		&& strstr(ent->d_name, ".tab") == NULL;
+}
+
+/* Create the zone identifier index by trawling the filesystem. */
+static void create_zone_index(timelib_tzdb *db)
+{
+	size_t dirstack_size,  dirstack_top;
+	size_t index_size, index_next;
+	timelib_tzdb_index_entry *db_index;
+	char **dirstack;
+
+	/* LIFO stack to hold directory entries to scan; each slot is a
+	 * directory name relative to the zoneinfo prefix. */
+	dirstack_size = 32;
+	dirstack = malloc(dirstack_size * sizeof *dirstack);
+	dirstack_top = 1;
+	dirstack[0] = strdup("");
+	
+	/* Index array. */
+	index_size = 64;
+	db_index = malloc(index_size * sizeof *db_index);
+	index_next = 0;
+
+	do {
+		struct dirent **ents;
+		char name[PATH_MAX], *top;
+		int count;
+
+		/* Pop the top stack entry, and iterate through its contents. */
+		top = dirstack[--dirstack_top];
+		snprintf(name, sizeof name, ZONEINFO_PREFIX "/%s", top);
+
+		count = php_scandir(name, &ents, index_filter, php_alphasort);
+
+		while (count > 0) {
+			struct stat st;
+			const char *leaf = ents[count - 1]->d_name;
+
+			snprintf(name, sizeof name, ZONEINFO_PREFIX "/%s/%s", 
+				 top, leaf);
+			
+			if (strlen(name) && stat(name, &st) == 0) {
+				/* Name, relative to the zoneinfo prefix. */
+				const char *root = top;
+
+				if (root[0] == '/') root++;
+
+				snprintf(name, sizeof name, "%s%s%s", root, 
+					 *root ? "/": "", leaf);
+
+				if (S_ISDIR(st.st_mode)) {
+					if (dirstack_top == dirstack_size) {
+						dirstack_size *= 2;
+						dirstack = realloc(dirstack, 
+								   dirstack_size * sizeof *dirstack);
+					}
+					dirstack[dirstack_top++] = strdup(name);
+				}
+				else {
+					if (index_next == index_size) {
+						index_size *= 2;
+						db_index = realloc(db_index,
+								   index_size * sizeof *db_index);
+					}
+
+					db_index[index_next].id = strdup(name);
+					db_index[index_next++].pos = 0;
+				}
+			}
+
+			free(ents[--count]);
+		}
+		
+		if (count != -1) free(ents);
+		free(top);
+	} while (dirstack_top);
+
+	db->index = db_index;
+	db->index_size = index_next;
+
+	free(dirstack);
+}
+
+/* Return the mmap()ed tzfile if found, else NULL.  On success, the
+ * length of the mapped data is placed in *length. */
+static char *map_tzfile(const char *timezone, size_t *length)
+{
+	char fname[PATH_MAX];
+	const char *fn;
+	struct stat st;
+	char *p;
+	int fd;
+	
+	if (strcmp(timezone, TIMELIB_SYSTEM_TZID) == 0) {
+		fn = SYSTEM_TZFILE;
+	}
+	else {
+		if (strstr(timezone, "..") != NULL) {
+			return NULL;
+		}
+	    
+		snprintf(fname, sizeof fname, ZONEINFO_PREFIX "/%s", timezone);
+		fn = fname;
+	}
+	
+	fd = open(fn, O_RDONLY);
+	if (fd == -1) {
+		return NULL;
+	} else if (fstat(fd, &st) != 0 || st.st_size < 21) {
+		close(fd);
+		return NULL;
+	}
+
+	*length = st.st_size;
+	p = mmap(NULL, st.st_size, PROT_READ, MAP_SHARED, fd, 0);
+	close(fd);
+	
+	return p != MAP_FAILED ? p : NULL;
+}
+
+const timelib_tzdb *timelib_builtin_db(void)
+{
+	if (timezonedb_system == NULL) {
+		timelib_tzdb *tmp = malloc(sizeof *tmp);
+
+		tmp->version = "0.system";
+		tmp->data = NULL;
+		create_zone_index(tmp);
+		timezonedb_system = tmp;
+	}
+			
+	return timezonedb_system;
+}
+
+const timelib_tzdb_index_entry *timelib_timezone_builtin_identifiers_list(int *count)
+{
+	*count = timezonedb_system->index_size;
+	return timezonedb_system->index;
+}
+
+int timelib_timezone_id_is_valid(char *timezone, const timelib_tzdb *tzdb)
+{
+	char fname[PATH_MAX];
+	const char *fn;
+
+	if (strcmp(timezone, TIMELIB_SYSTEM_TZID) == 0) {
+		fn = SYSTEM_TZFILE;
+	}
+	else {
+		if (strstr(timezone, "..") != NULL) {
+			return 0;
+		}
+		
+		snprintf(fname, sizeof fname, ZONEINFO_PREFIX "/%s", timezone);
+		fn = fname;
+	}
+
+	return access(fn, R_OK) == 0 ? 1 : 0;
+}
+
+timelib_tzinfo *timelib_parse_tzfile(char *timezone, const timelib_tzdb *tzdb)
+{
+	char *tzf, *orig;
+	timelib_tzinfo *tmp;
+	size_t len;
+
+	orig = map_tzfile(timezone, &len);
+	if (orig == NULL) {
+		return NULL;
+	}
+
+	tmp = timelib_tzinfo_ctor(timezone);
+
+	tzf = orig + 20;
+	read_header(&tzf, tmp);
+	read_transistions(&tzf, tmp);
+	read_types(&tzf, tmp);
+
+	munmap(orig, len);
+
+	return tmp;
+}
+#else /* !HAVE_SYSTEM_TZDATA */
+
 static int seek_to_tz_position(const unsigned char **tzf, char *timezone, const timelib_tzdb *tzdb)
 {
 	int left = 0, right = tzdb->index_size - 1;
@@ -279,6 +497,7 @@ timelib_tzinfo *timelib_parse_tzfile(cha
 
 	return tmp;
 }
+#endif
 
 static ttinfo* fetch_timezone_offset(timelib_tzinfo *tz, timelib_sll ts, timelib_sll *transition_time)
 {
--- php-5.2.6/ext/date/lib/timelib.h.systzdata
+++ php-5.2.6/ext/date/lib/timelib.h
@@ -31,6 +31,10 @@
 
 #define TIMELIB_SPECIAL_WEEKDAY  0x01
 
+#ifdef HAVE_SYSTEM_TZDATA
+#define TIMELIB_SYSTEM_TZID "System/Localtime"
+#endif
+
 #ifndef LONG_MAX
 #define LONG_MAX 2147483647L
 #endif
--- php-5.2.6/ext/date/lib/timelib.m4.systzdata
+++ php-5.2.6/ext/date/lib/timelib.m4
@@ -78,3 +78,17 @@ stdlib.h
 
 dnl Check for strtoll, atoll
 AC_CHECK_FUNCS(strtoll atoll strftime)
+
+PHP_ARG_WITH(system-tzdata, for use of system timezone data,
+[  --with-system-tzdata[=DIR]      to specify use of system timezone data],
+no, no)
+
+if test "$PHP_SYSTEM_TZDATA" != "no"; then
+   AC_DEFINE(HAVE_SYSTEM_TZDATA, 1, [Define if system timezone data is used])
+
+   if test "$PHP_SYSTEM_TZDATA" != "yes"; then
+      AC_DEFINE_UNQUOTED(HAVE_SYSTEM_TZDATA_PREFIX, "$PHP_SYSTEM_TZDATA",
+                         [Define for location of system timezone data])
+   fi
+fi
+
--- php-5.2.6/ext/date/php_date.c.systzdata
+++ php-5.2.6/ext/date/php_date.c
@@ -584,6 +584,11 @@ static char* guess_timezone(const timeli
 	if (DATEG(default_timezone) && (strlen(DATEG(default_timezone)) > 0) && timelib_timezone_id_is_valid(DATEG(default_timezone), tzdb)) {
 		return DATEG(default_timezone);
 	}
+#ifdef TIMELIB_SYSTEM_TZID
+	if (timelib_timezone_id_is_valid(TIMELIB_SYSTEM_TZID, tzdb)) {
+		return TIMELIB_SYSTEM_TZID;
+	}
+#endif
 #if HAVE_TM_ZONE
 	/* Try to guess timezone from system information */
 	{

php-5.2.7-tests-dashn.patch:

--- NEW FILE php-5.2.7-tests-dashn.patch ---
--- php-5.2.7/Makefile.global.orig	2008-12-05 07:37:27.000000000 +0100
+++ php-5.2.7/Makefile.global	2008-12-05 07:37:55.000000000 +0100
@@ -67,7 +67,7 @@
 		done; \
 	fi
 
-PHP_TEST_SETTINGS = -d 'open_basedir=' -d 'output_buffering=0' -d 'memory_limit=-1'
+PHP_TEST_SETTINGS = -n -d 'open_basedir=' -d 'output_buffering=0' -d 'memory_limit=-1'
 PHP_TEST_SHARED_EXTENSIONS =  ` \
 	if test "x$(PHP_MODULES)" != "x"; then \
 		for i in $(PHP_MODULES)""; do \


Index: php.ini
===================================================================
RCS file: /cvs/extras/rpms/php/F-9/php.ini,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- php.ini	4 May 2007 10:08:53 -0000	1.7
+++ php.ini	3 Jan 2009 11:05:57 -0000	1.8
@@ -299,6 +299,7 @@
 
 max_execution_time = 30     ; Maximum execution time of each script, in seconds
 max_input_time = 60	; Maximum amount of time each script may spend parsing request data
+;max_input_nesting_level = 64 ; Maximum input variable nesting level
 memory_limit = 32M      ; Maximum amount of memory a script may consume (16MB)
 
 
@@ -353,6 +354,18 @@
 ; instead (see below).  Keeping display_errors enabled on a production web site
 ; may reveal security information to end users, such as file paths on your Web
 ; server, your database schema or other information.
+;
+; possible values for display_errors:
+;
+; Off          - Do not display any errors 
+; stderr       - Display errors to STDERR (affects only CGI/CLI binaries!)   
+; On or stdout - Display errors to STDOUT (default)
+;  
+; To output errors to STDERR with CGI/CLI:              
+;display_errors = "stderr"
+;
+; Default
+;
 display_errors = Off
 
 ; Even when display_errors is on, errors that occur during PHP's startup
@@ -516,9 +529,6 @@
 ; if nonempty.
 user_dir =
 
-; Directory in which the loadable extensions (modules) reside.
-extension_dir = "/usr/lib/php/modules"
-
 ; Whether or not to enable the dl() function.  The dl() function does NOT work
 ; properly in multithreaded servers, such as IIS or Zeus, and is automatically
 ; disabled on them.
@@ -540,6 +550,14 @@
 ; cause security issues, KNOW WHAT YOU ARE DOING FIRST.
 ; cgi.redirect_status_env = ;
 
+; cgi.fix_pathinfo provides *real* PATH_INFO/PATH_TRANSLATED support for CGI.  PHP's
+; previous behaviour was to set PATH_TRANSLATED to SCRIPT_FILENAME, and to not grok
+; what PATH_INFO is.  For more information on PATH_INFO, see the cgi specs.  Setting
+; this to 1 will cause PHP CGI to fix it's paths to conform to the spec.  A setting
+; of zero causes PHP to behave as before.  Default is 1.  You should fix your scripts
+; to use SCRIPT_FILENAME rather than PATH_TRANSLATED.
+; cgi.fix_pathinfo=1
+
 ; FastCGI under IIS (on WINNT based OS) supports the ability to impersonate
 ; security tokens of the calling client.  This allows IIS to define the
 ; security context that the request runs under.  mod_fastcgi under Apache
@@ -548,7 +566,7 @@
 ; fastcgi.impersonate = 1;
 
 ; Disable logging through FastCGI connection
-; fastcgi.log = 0
+; fastcgi.logging = 0
 
 ; cgi.rfc2616_headers configuration option tells PHP what type of headers to
 ; use when sending HTTP response code. If it's set 0 PHP sends Status: header that
@@ -938,6 +956,8 @@
 ; Whether to use cookies.
 session.use_cookies = 1
 
+;session.cookie_secure =
+
 ; This option enables administrators to make their users invulnerable to
 ; attacks which involve passing session ids in URLs; defaults to 0.
 ; session.use_only_cookies = 1


Index: php.spec
===================================================================
RCS file: /cvs/extras/rpms/php/F-9/php.spec,v
retrieving revision 1.157
retrieving revision 1.158
diff -u -r1.157 -r1.158
--- php.spec	8 May 2008 14:15:39 -0000	1.157
+++ php.spec	3 Jan 2009 11:05:57 -0000	1.158
@@ -3,20 +3,22 @@
 %define zendver 20060613
 %define pdover 20060511
 
-Summary: The PHP HTML-embedded scripting language
+%define _default_patch_fuzz 2
+
+Summary: PHP scripting language for creating dynamic web sites
 Name: php
-Version: 5.2.6
-Release: 2%{?dist}
+Version: 5.2.8
+Release: 1%{?dist}
 License: PHP
 Group: Development/Languages
 URL: http://www.php.net/
 
-Source0: http://www.php.net/distributions/php-%{version}.tar.gz
+Source0: http://www.php.net/distributions/php-%{version}.tar.bz2
 Source1: php.conf
 Source2: php.ini
 Source3: macros.php
 
-Patch1: php-5.2.4-gnusrc.patch
+Patch1: php-5.2.6-gnusrc.patch
 Patch2: php-4.3.3-install.patch
 Patch3: php-5.2.4-norpath.patch
 Patch5: php-5.0.2-phpize64.patch
@@ -31,17 +33,17 @@
 # Functional changes
 Patch30: php-5.0.4-dlopen.patch
 Patch31: php-5.2.4-easter.patch
-Patch32: php-5.2.5-systzdata.patch
+Patch32: php-5.2.6-systzdata.patch
 
 # Fixes for tests
-Patch50: php-5.2.4-tests-dashn.patch
+Patch50: php-5.2.7-tests-dashn.patch
 Patch51: php-5.0.4-tests-wddx.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 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++
@@ -267,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
+# 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
@@ -324,7 +327,7 @@
 %package mssql
 Summary: MSSQL database module for PHP
 Group: Development/Languages
-Requires: php-common = %{version}-%{release}
+Requires: php-common = %{version}-%{release}, php-pdo
 BuildRequires: freetds-devel
 
 %description mssql
@@ -453,7 +456,9 @@
 	--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 \
 	--with-gettext \
 	--with-gmp \
@@ -525,6 +530,7 @@
       --with-pdo-mysql=shared,%{_prefix} \
       --with-pdo-pgsql=shared,%{_prefix} \
       --with-pdo-sqlite=shared,%{_prefix} \
+      --with-pdo-dblib=shared,%{_prefix} \
       --enable-json=shared \
       --enable-zip=shared \
       --with-readline \
@@ -573,15 +579,15 @@
 %install
 [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
 
+# Install the version for embedded script language in applications + php_embed.h
+make -C build-embedded install-sapi install-headers INSTALL_ROOT=$RPM_BUILD_ROOT
+
 # Install everything from the CGI SAPI build
 make -C build-cgi install INSTALL_ROOT=$RPM_BUILD_ROOT 
 
 # Install the Apache module
 make -C build-apache install-sapi INSTALL_ROOT=$RPM_BUILD_ROOT
 
-# Install the version for embedded script language in applications
-make -C build-embedded install-sapi INSTALL_ROOT=$RPM_BUILD_ROOT
-
 # Install the default configuration file and icons
 install -m 755 -d $RPM_BUILD_ROOT%{_sysconfdir}/
 install -m 644 $RPM_SOURCE_DIR/php.ini $RPM_BUILD_ROOT%{_sysconfdir}/php.ini
@@ -592,9 +598,6 @@
 install -m 755 -d $RPM_BUILD_ROOT%{_libdir}/php/pear \
                   $RPM_BUILD_ROOT%{_datadir}/php
 
-# Use correct libdir
-sed -i -e 's|%{_prefix}/lib|%{_libdir}|' $RPM_BUILD_ROOT%{_sysconfdir}/php.ini
-
 # install the DSO
 install -m 755 -d $RPM_BUILD_ROOT%{_libdir}/httpd/modules
 install -m 755 build-apache/libs/libphp5.so $RPM_BUILD_ROOT%{_libdir}/httpd/modules
@@ -611,7 +614,7 @@
 for mod in pgsql mysql mysqli odbc ldap snmp xmlrpc imap \
     mbstring ncurses gd dom xsl soap bcmath dba xmlreader xmlwriter \
     pdo pdo_mysql pdo_pgsql pdo_odbc pdo_sqlite json zip \
-    dbase mcrypt mhash tidy mssql pspell; do
+    dbase mcrypt mhash tidy pdo_dblib mssql pspell; do
     cat > $RPM_BUILD_ROOT%{_sysconfdir}/php.d/${mod}.ini <<EOF
 ; Enable ${mod} extension module
 extension=${mod}.so
@@ -629,6 +632,7 @@
 cat files.mysqli >> files.mysql
 
 # Split out the PDO modules
+cat files.pdo_dblib >> files.mssql
 cat files.pdo_mysql >> files.mysql
 cat files.pdo_pgsql >> files.pgsql
 cat files.pdo_odbc >> files.odbc
@@ -673,7 +677,7 @@
 %files common -f files.common
 %defattr(-,root,root)
 %doc CODING_STANDARDS CREDITS EXTENSIONS INSTALL LICENSE NEWS README*
-%doc Zend/ZEND_* gd_README TSRM_LICENSE regex_COPYRIGHT
+%doc Zend/ZEND_* TSRM_LICENSE regex_COPYRIGHT
 %config(noreplace) %{_sysconfdir}/php.ini
 %dir %{_sysconfdir}/php.d
 %dir %{_libdir}/php
@@ -715,6 +719,7 @@
 %files mbstring -f files.mbstring
 %files ncurses -f files.ncurses
 %files gd -f files.gd
+%doc gd_README
 %files soap -f files.soap
 %files bcmath -f files.bcmath
 %files dba -f files.dba
@@ -726,11 +731,32 @@
 %files pspell -f files.pspell
 
 %changelog
-* Thu May  8 2008 Joe Orton <jorton at redhat.com> 5.2.6-2
+* Sat Jan 03 2009 Remi Collet <Fedora at FamilleCollet.com> 5.2.8-1
+- update to 5.2.8
+- add missing php_embed.h (#457777)
+- enable pdo_dblib driver in php-mssql
+
+* Tue Nov  4 2008 Joe Orton <jorton at redhat.com> 5.2.6-6
+- move gd_README to php-gd
+- update to r4 of systzdata patch; introduces a default timezone
+  name of "System/Localtime", which uses /etc/localtime (#469532)
+
+* 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
+
+* Mon Jul 14 2008 Joe Orton <jorton at redhat.com> 5.2.6-3
 - update to 5.2.6
+- sync default php.ini with upstream
+- drop extension_dir from default php.ini, rely on hard-coded
+  default, to make php-common multilib-safe (#455091)
+- update to r3 of systzdata patch
 
 * Thu Apr 24 2008 Joe Orton <jorton at redhat.com> 5.2.5-7
-- split pspell extension out into php-pspell (#443857)
+- split pspell extension out into php-spell (#443857)
 
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 5.2.5-6
 - Autorebuild for GCC 4.3


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php/F-9/sources,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- sources	8 May 2008 14:15:39 -0000	1.36
+++ sources	3 Jan 2009 11:05:57 -0000	1.37
@@ -1 +1 @@
-1720f95f26c506338f0dba3a51906bbd  php-5.2.6.tar.gz
+8760a833cf10433d3e72271ab0d0eccf  php-5.2.8.tar.bz2


--- php-5.2.4-gnusrc.patch DELETED ---


--- php-5.2.4-tests-dashn.patch DELETED ---


--- php-5.2.5-systzdata.patch DELETED ---



From thm at fedoraproject.org  Sat Jan  3 12:09:02 2009
From: thm at fedoraproject.org (Thomas Moschny)
Date: Sat,  3 Jan 2009 12:09:02 +0000 (UTC)
Subject: rpms/ikiwiki/devel ikiwiki-3.00-libexecdir.patch, NONE,
	1.1 .cvsignore, 
	1.12, 1.13 ikiwiki.spec, 1.13, 1.14 import.log, 1.12,
	1.13 sources, 1.12, 1.13 ikiwiki-2.72-libexecdir.patch, 1.1, NONE
Message-ID: <20090103120902.4186970120@cvs1.fedora.phx.redhat.com>

Author: thm

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

Modified Files:
	.cvsignore ikiwiki.spec import.log sources 
Added Files:
	ikiwiki-3.00-libexecdir.patch 
Removed Files:
	ikiwiki-2.72-libexecdir.patch 
Log Message:
Updated for 3.00.

ikiwiki-3.00-libexecdir.patch:

--- NEW FILE ikiwiki-3.00-libexecdir.patch ---
diff -up ikiwiki/IkiWiki.pm.orig ikiwiki/IkiWiki.pm
--- ikiwiki/IkiWiki.pm.orig	2008-12-31 19:33:10.000000000 +0100
+++ ikiwiki/IkiWiki.pm	2009-01-02 12:55:15.000000000 +0100
@@ -547,7 +547,7 @@ sub loadplugin ($) {
 	return if grep { $_ eq $plugin} @{$config{disable_plugins}};
 
 	foreach my $dir (defined $config{libdir} ? possibly_foolish_untaint($config{libdir}) : undef,
-	                 "$installdir/lib/ikiwiki") {
+	                 "$installdir/libexec/ikiwiki") {
 		if (defined $dir && -x "$dir/plugins/$plugin") {
 			eval { require IkiWiki::Plugin::external };
 			if ($@) {


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ikiwiki/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	2 Jan 2009 11:24:13 -0000	1.12
+++ .cvsignore	3 Jan 2009 12:08:30 -0000	1.13
@@ -1 +1 @@
-ikiwiki_2.72.tar.gz
+ikiwiki_3.00.tar.gz


Index: ikiwiki.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ikiwiki/devel/ikiwiki.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- ikiwiki.spec	2 Jan 2009 11:24:14 -0000	1.13
+++ ikiwiki.spec	3 Jan 2009 12:08:30 -0000	1.14
@@ -1,5 +1,5 @@
 Name:           ikiwiki
-Version:        2.72
+Version:        3.00
 Release:        1%{?dist}
 Summary:        A wiki compiler
 
@@ -7,7 +7,7 @@
 License:        GPLv2+
 URL:            http://ikiwiki.info/
 Source0:        http://ftp.debian.org/debian/pool/main/i/%{name}/%{name}_%{version}.tar.gz
-Patch0:         ikiwiki-2.72-libexecdir.patch
+Patch0:         ikiwiki-3.00-libexecdir.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
@@ -143,6 +143,9 @@
 
 
 %changelog
+* Fri Jan  2 2009 Thomas Moschny <thomas.moschny at gmx.de> - 3.00-1
+- Update to 3.00.
+
 * Fri Jan  2 2009 Thomas Moschny <thomas.moschny at gmx.de> - 2.72-1
 - Update to 2.72.
 - Patch for mtn plugin has been applied upstream.


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/ikiwiki/devel/import.log,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- import.log	2 Jan 2009 11:24:14 -0000	1.12
+++ import.log	3 Jan 2009 12:08:30 -0000	1.13
@@ -10,3 +10,4 @@
 ikiwiki-2_70-1_fc9:HEAD:ikiwiki-2.70-1.fc9.src.rpm:1227214126
 ikiwiki-2_70-3_fc10:HEAD:ikiwiki-2.70-3.fc10.src.rpm:1229701030
 ikiwiki-2_72-1_fc10:HEAD:ikiwiki-2.72-1.fc10.src.rpm:1230895370
+ikiwiki-3_00-1_fc10:HEAD:ikiwiki-3.00-1.fc10.src.rpm:1230984471


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ikiwiki/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	2 Jan 2009 11:24:14 -0000	1.12
+++ sources	3 Jan 2009 12:08:30 -0000	1.13
@@ -1 +1 @@
-5bebbd85c2ad80ed9c8d730ba4f91e1a  ikiwiki_2.72.tar.gz
+f0a0a3e1ff820a12721b9b9864c8ea39  ikiwiki_3.00.tar.gz


--- ikiwiki-2.72-libexecdir.patch DELETED ---



From thm at fedoraproject.org  Sat Jan  3 12:20:14 2009
From: thm at fedoraproject.org (Thomas Moschny)
Date: Sat,  3 Jan 2009 12:20:14 +0000 (UTC)
Subject: rpms/monotone/EL-5 import.log, NONE, 1.1 .cvsignore, 1.21,
	1.22 monotone.spec, 1.35, 1.36 sources, 1.21, 1.22
Message-ID: <20090103122014.3761D70120@cvs1.fedora.phx.redhat.com>

Author: thm

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

Modified Files:
	.cvsignore monotone.spec sources 
Added Files:
	import.log 
Log Message:
Updated for 0.42.


--- NEW FILE import.log ---
monotone-0_42-2_fc10:EL-5:monotone-0.42-2.fc10.src.rpm:1230985114


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/monotone/EL-5/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- .cvsignore	14 Sep 2008 07:26:56 -0000	1.21
+++ .cvsignore	3 Jan 2009 12:19:43 -0000	1.22
@@ -1 +1 @@
-monotone-0.41.tar.gz
+monotone-0.42.tar.gz


Index: monotone.spec
===================================================================
RCS file: /cvs/pkgs/rpms/monotone/EL-5/monotone.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- monotone.spec	14 Sep 2008 07:26:56 -0000	1.35
+++ monotone.spec	3 Jan 2009 12:19:43 -0000	1.36
@@ -1,6 +1,6 @@
 Name: monotone
-Version: 0.41
-Release: 1%{?dist}
+Version: 0.42
+Release: 2%{?dist}
 
 Summary: A free, distributed version control system
 Group: Development/Tools
@@ -59,13 +59,22 @@
 %description server
 This package provides an easy-to-use standalone server setup for monotone.
 
+%package -n perl-Monotone
+Summary: Perl Module for monotone
+Requires: monotone = %{version}-%{release}
+Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+Group: Development/Tools
+
+%description -n perl-Monotone
+This is a simple Perl module to start a monotone automate sub-process
+and then pass commands to it.
 
 %prep
 %setup -q
 
 %build
 %configure --with-bundled-lua=%{bundled_lua} \
-	   --with-bundled-sqlite=%{bundled_sqlite}
+           --with-bundled-sqlite=%{bundled_sqlite}
 make %{?_smp_mflags}
 
 %check
@@ -92,7 +101,7 @@
 mkdir -p %{buildroot}%{_localstatedir}/lib
 ln -snf ../bin/mtn %{buildroot}%{_sbindir}/monotone-server
 %{__install} -D -m 0555 %{SOURCE1} \
-	     %{buildroot}%{_sysconfdir}/rc.d/init.d/monotone
+             %{buildroot}%{_sysconfdir}/rc.d/init.d/monotone
 %{__install} -D -m 0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/sysconfig/monotone
 %{__install} -d -m 0755 %{buildroot}%{_sysconfdir}/monotone
 %{__install} -d -m 0750 %{buildroot}%{_sysconfdir}/monotone/private-keys
@@ -101,17 +110,20 @@
 
 # These do not actually wind up in the package, due to %%ghost.
 %{__install} -c -m 0440 /dev/null \
-	     %{buildroot}%{_sysconfdir}/monotone/passphrase.lua
+             %{buildroot}%{_sysconfdir}/monotone/passphrase.lua
 %{__install} -c -m 0640 /dev/null \
-	     %{buildroot}%{_sysconfdir}/monotone/read-permissions
+             %{buildroot}%{_sysconfdir}/monotone/read-permissions
 %{__install} -c -m 0640 /dev/null \
-	     %{buildroot}%{_sysconfdir}/monotone/write-permissions
+             %{buildroot}%{_sysconfdir}/monotone/write-permissions
 %{__install} -c -m 0644 /dev/null \
-	     %{buildroot}%{_sysconfdir}/monotone/monotonerc
+             %{buildroot}%{_sysconfdir}/monotone/monotonerc
 touch %{buildroot}%{_localstatedir}/lib/monotone/server.mtn
 
 cp %{SOURCE3} .
 
+%{__install} -D -m 0644 -p contrib/Monotone.pm \
+             %{buildroot}%{perl_vendorlib}/Monotone.pm
+
 %clean
 rm -f README.monotone-server
 rm -rf %{buildroot}
@@ -119,13 +131,13 @@
 %post
 if [ $1 -eq 1 ]
 then
-	/sbin/install-info %{_infodir}/monotone.info %{_infodir}/dir > /dev/null 2>&1 || :
+        /sbin/install-info %{_infodir}/monotone.info %{_infodir}/dir > /dev/null 2>&1 || :
 fi
 
 %preun
 if [ $1 -eq 0 ]
 then
-	/sbin/install-info --delete %{_infodir}/monotone.info %{_infodir}/dir > /dev/null 2>&1 || :
+        /sbin/install-info --delete %{_infodir}/monotone.info %{_infodir}/dir > /dev/null 2>&1 || :
 fi
 
 %files -f %{name}.lang
@@ -139,13 +151,17 @@
 %{_datadir}/emacs/site-lisp/monotone*.el*
 %{_sysconfdir}/bash_completion.d
 
+%files -n perl-Monotone
+%defattr(-,root,root,-)
+%{perl_vendorlib}/Monotone.pm
+
 %files 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
-%config %{_sysconfdir}/sysconfig/monotone
+%config(noreplace) %{_sysconfdir}/sysconfig/monotone
 %dir %attr(0755,root,monotone) %{_sysconfdir}/monotone
 %dir %attr(0750,root,monotone) %{_sysconfdir}/monotone/private-keys
 %attr(0640,root,monotone) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) %{_sysconfdir}/monotone/monotonerc
@@ -160,7 +176,7 @@
 getent group monotone > /dev/null || groupadd -r monotone
 getent passwd monotone > /dev/null ||
 useradd -r -g monotone -r -d %{_localstatedir}/lib/monotone -s /sbin/nologin \
-	-c "Monotone Netsync Server" monotone
+        -c "Monotone Netsync Server" monotone
 exit 0
 
 %post server
@@ -169,18 +185,24 @@
 
 %preun server
 if [ $1 = 0 ]; then
-	/sbin/service monotone stop > /dev/null 2>&1
-	/sbin/chkconfig --del monotone
+        /sbin/service monotone stop > /dev/null 2>&1
+        /sbin/chkconfig --del monotone
 fi
 
 %postun
 if [ $1 -gt 1 ]; then
-	# Restart the running server: updates its db format when needed.
-	/sbin/service monotone condrestart > /dev/null 2>&1 || :
+        # Restart the running server: updates its db format when needed.
+        /sbin/service monotone condrestart > /dev/null 2>&1 || :
 fi
 
 
 %changelog
+* Fri Jan  2 2009 Thomas Moschny <thomas.moschny at gmx.de> - 0.42-2
+- Pack Monotone.pm (in a subpackage). (#450267)
+
+* Fri Jan  2 2009 Thomas Moschny <thomas.moschny at gmx.de> - 0.42-1
+- Updated for 0.42 release.
+
 * Fri Sep 12 2008 Thomas Moschny <thomas.moschny at gmx.de> - 0.41-1
 - Updated for 0.41 release.
 - Added mtnopt helper.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/monotone/EL-5/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sources	14 Sep 2008 07:26:56 -0000	1.21
+++ sources	3 Jan 2009 12:19:43 -0000	1.22
@@ -1 +1 @@
-f4ee37fb6853719933561fef901e2a07  monotone-0.41.tar.gz
+c8e916d674b6608369d9f447700a8830  monotone-0.42.tar.gz



From rezso at fedoraproject.org  Sat Jan  3 13:28:07 2009
From: rezso at fedoraproject.org (Balint Cristian)
Date: Sat,  3 Jan 2009 13:28:07 +0000 (UTC)
Subject: rpms/mapnik/devel import.log,1.9,1.10 mapnik.spec,1.10,1.11
Message-ID: <20090103132807.4046170120@cvs1.fedora.phx.redhat.com>

Author: rezso

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

Modified Files:
	import.log mapnik.spec 
Log Message:
- fix > fc11 fonts requirement
- new CVS



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/mapnik/devel/import.log,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- import.log	7 Dec 2008 08:15:01 -0000	1.9
+++ import.log	3 Jan 2009 13:27:36 -0000	1.10
@@ -7,3 +7,4 @@
 mapnik-0_5_2-0_6_svn738_fc10:HEAD:mapnik-0.5.2-0.6.svn738.fc10.src.rpm:1223475251
 mapnik-0_5_2-0_7_svn738_fc10:HEAD:mapnik-0.5.2-0.7.svn738.fc10.src.rpm:1223535000
 mapnik-0_5_2-0_9_svn738_fc11:HEAD:mapnik-0.5.2-0.9.svn738.fc11.src.rpm:1228637651
+mapnik-0_5_2-0_10_svn780_fc11:HEAD:mapnik-0.5.2-0.10.svn780.fc11.src.rpm:1230989213


Index: mapnik.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mapnik/devel/mapnik.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- mapnik.spec	7 Dec 2008 08:15:01 -0000	1.10
+++ mapnik.spec	3 Jan 2009 13:27:36 -0000	1.11
@@ -1,6 +1,6 @@
 Name:      mapnik
 Version:   0.5.2
-Release:   0.9.svn738%{?dist}
+Release:   0.10.svn780%{?dist}
 Summary:   Free Toolkit for developing mapping applications
 Group:     Applications/Engineering
 License:   LGPLv2+
@@ -12,7 +12,7 @@
 Patch0:    use-system-fonts.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-%if "%{?dist}" == ".f11"
+%if "%{?dist}" == ".fc11"
 Requires:  dejavu-fonts-sans
 %else
 Requires:  dejavu-fonts
@@ -266,6 +266,10 @@
 %doc demo/python demo/test
 
 %changelog
+* Sat Jan 03 2009 Balint Cristian <rezso at rdsor.ro> - 0.5.2-0.10.svn780
+- fix > fc11 fonts requirement
+- new CVS
+
 * Sun Dec 07 2008 Balint Cristian <rezso at rdsor.ro> - 0.5.2-0.9.svn738
 - fix fonts for F11
 



From rezso at fedoraproject.org  Sat Jan  3 14:12:46 2009
From: rezso at fedoraproject.org (Balint Cristian)
Date: Sat,  3 Jan 2009 14:12:46 +0000 (UTC)
Subject: rpms/mapserver/devel import.log,1.5,1.6 mapserver.spec,1.16,1.17
Message-ID: <20090103141246.50B5B70120@cvs1.fedora.phx.redhat.com>

Author: rezso

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

Modified Files:
	import.log mapserver.spec 
Log Message:
- require external fonts
- get rid of internal fonts



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/mapserver/devel/import.log,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- import.log	7 Dec 2008 13:10:03 -0000	1.5
+++ import.log	3 Jan 2009 14:12:15 -0000	1.6
@@ -3,3 +3,4 @@
 mapserver-5_2_0-1_fc9:HEAD:mapserver-5.2.0-1.fc9.src.rpm:1216813802
 mapserver-5_2_1-1_fc11:HEAD:mapserver-5.2.1-1.fc11.src.rpm:1228637903
 mapserver-5_2_1-2_fc11:HEAD:mapserver-5.2.1-2.fc11.src.rpm:1228655332
+mapserver-5_2_1-3_fc11:HEAD:mapserver-5.2.1-3.fc11.src.rpm:1230991877


Index: mapserver.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mapserver/devel/mapserver.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- mapserver.spec	7 Dec 2008 13:10:03 -0000	1.16
+++ mapserver.spec	3 Jan 2009 14:12:16 -0000	1.17
@@ -1,6 +1,6 @@
 Name:           mapserver
 Version:        5.2.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Environment for building spatially-enabled internet applications
 Group:          Development/Tools
 License:        BSD
@@ -8,6 +8,8 @@
 Source:         http://download.osgeo.org/mapserver/mapserver-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:       httpd
+Requires:       bitstream-vera-fonts-sans
+
 BuildRequires:  libXpm-devel
 BuildRequires:  httpd-devel php-devel
 BuildRequires:  perl(ExtUtils::MakeMaker)
@@ -80,6 +82,16 @@
 chmod -x mapscript/perl/examples/*.pl
 chmod -x mapscript/php3/README
 
+
+# remove fonts
+# alias as symlinks
+rm -rf tests/vera/Vera.ttf
+rm -rf tests/vera/VeraBd.ttf
+pushd tests/vera/
+ln -sf /usr/share/fonts/bitstream-vera/Vera.ttf Vera.ttf
+ln -sf /usr/share/fonts/bitstream-vera/Verabd.ttf VeraBd.ttf
+popd
+
 %build
 
 # fix a UTF-8 one
@@ -180,8 +192,6 @@
 for junk in {*.pod,*.bs,.packlist} ; do
 find %{buildroot} -name "$junk" -exec rm -rf '{}' \;
 done
-# remove vera fonts, these are provided system wide
-rm -rf %{buildroot}/%{_docdir}/%{name}-%{version}/tests/vera
 
 # fix some exec bits
 chmod 755 %{buildroot}/%{perl_vendorarch}/auto/mapscript/mapscript.so
@@ -230,6 +240,10 @@
 %{_javadir}/*.jar
 
 %changelog
+* Sat Jan 03 2009 Balint Cristian <rezso at rdsor.ro> 5.2.1-3
+- require external fonts
+- get rid of internal fonts
+
 * Sat Dec 07 2008 Balint Cristian <rezso at rdsor.ro> 5.2.1-2
 - enable agg render engine
 - enable fribidi renderer



From mmahut at fedoraproject.org  Sat Jan  3 14:22:18 2009
From: mmahut at fedoraproject.org (Marek Mahut)
Date: Sat,  3 Jan 2009 14:22:18 +0000 (UTC)
Subject: rpms/gnuradio/devel 10-usrp.rules,NONE,1.1 gnuradio.spec,1.9,1.10
Message-ID: <20090103142218.925F770120@cvs1.fedora.phx.redhat.com>

Author: mmahut

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

Modified Files:
	gnuradio.spec 
Added Files:
	10-usrp.rules 
Log Message:
adding udev support for usrp



--- NEW FILE 10-usrp.rules ---
# rule to grant read/write access on USRP to group named usrp.
# to use, install this file in /etc/udev/rules.d as 10-usrp.rules
ACTION=="add", BUS=="usb", SYSFS{idVendor}=="fffe", SYSFS{idProduct}=="0002", GROUP:="usrp", MODE:="0660"


Index: gnuradio.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnuradio/devel/gnuradio.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- gnuradio.spec	20 Dec 2008 00:39:18 -0000	1.9
+++ gnuradio.spec	3 Jan 2009 14:21:48 -0000	1.10
@@ -2,7 +2,7 @@
 
 Name:		gnuradio
 Version:	3.1.3
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Software defined radio framework
 
 Group:		Applications/Engineering
@@ -10,10 +10,12 @@
 URL:		http://www.gnuradio.org
 Source0:	ftp://ftp.gnu.org/gnu/gnuradio/gnuradio-%{version}.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Source1:	10-usrp.rules
 Patch0:		gnuradio-3.1.3-libtool.bug.patch
 Patch1:		gnuradio-3.1.3-werror.patch
 Patch2:		gnuradio-3.1.3-comedilib0.8.patch
 
+Requires(pre):	shadow-utils
 BuildRequires:	sdcc
 BuildRequires:	fftw-devel
 BuildRequires:	cppunit-devel
@@ -101,6 +103,7 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
+install -D -m0644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/10-usrp.rules
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -113,6 +116,8 @@
 
 %post -n usrp -p /sbin/ldconfig
 %postun -n usrp -p /sbin/ldconfig
+%pre -n usrp
+getent group usrp >/dev/null || groupadd -r usrp
 
 %files
 %defattr(-,root,root,-)
@@ -181,6 +186,7 @@
 %{python_sitelib}/usrpm
 %{python_sitelib}/gnuradio/_usrp1.so
 %{python_sitelib}/gnuradio/usrp*
+%config %{_sysconfdir}/udev/rules.d/10-usrp.rules
 %exclude %{_bindir}/*.pyc
 %exclude %{_bindir}/*.pyo
 %exclude %{_libdir}/*.la
@@ -192,6 +198,10 @@
 %{_includedir}/usrp_*
 
 %changelog
+* Wed Dec 31 2008 Marek Mahut <mmahut at fedoraproject.org> - 3.1.3-3
+- Adding udev rule for USRP device
+- Adding usrp system group
+
 * Fri Dec 19 2008 Marek Mahut <mmahut at fedoraproject.org> - 3.1.3-2
 - Upstream release 3.1.3
 - Comedi support



From pbrobinson at fedoraproject.org  Sat Jan  3 14:38:52 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Sat,  3 Jan 2009 14:38:52 +0000 (UTC)
Subject: rpms/libiphone/F-10 libiphone.spec,1.1,1.2
Message-ID: <20090103143852.A220D70120@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

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

Modified Files:
	libiphone.spec 
Log Message:
- update to latest git snapshot



Index: libiphone.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libiphone/F-10/libiphone.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libiphone.spec	4 Dec 2008 12:03:35 -0000	1.1
+++ libiphone.spec	3 Jan 2009 14:38:22 -0000	1.2
@@ -2,21 +2,21 @@
 # git clone http://git.matt.colyer.name/2008/libiphone/
 # git-archive --format=tar --prefix=libiphone-0.1.0/ %{git_version} | bzip2 > libiphone-0.1.0-20081201.tar.bz2
 
-%define gitdate 20081201
-%define git_version 8c3a01e
+%define gitdate 20090103
+%define git_version 5cde554
 %define tarfile %{name}-%{version}-%{gitdate}.tar.bz2
 %define snapshot %{gitdate}git%{git_version}
 
 Name:           libiphone
 Version:        0.1.0
-Release:        3.%{snapshot}%{?dist}
+Release:        4.%{snapshot}%{?dist}
 Summary:        Library for connecting to Apple iPhone and iPod touch
 
 Group:          System Environment/Libraries
 License:        LGPLv2+
 URL:            http://matt.colyer.name/projects/iphone-linux/
 
-Source0:	%{tarfile}
+Source0:        %{tarfile}
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: libxml2-devel
@@ -77,6 +77,9 @@
 %{_includedir}/libiphone
 
 %changelog
+* Sat Jan 3 2009 Peter Robinson <pbrobinson at gmail.com> 0.1.0-4.git5cde554
+- Update to latest git snapshot
+
 * Tue Dec 2 2008 Peter Robinson <pbrobinson at gmail.com> 0.1.0-3.git8c3a01e
 - Fix git file generation
 



From pbrobinson at fedoraproject.org  Sat Jan  3 14:44:26 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Sat,  3 Jan 2009 14:44:26 +0000 (UTC)
Subject: rpms/libiphone/F-10 libiphone.spec,1.2,1.3 sources,1.2,1.3
Message-ID: <20090103144426.78D7670120@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

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

Modified Files:
	libiphone.spec sources 
Log Message:
- update source file



Index: libiphone.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libiphone/F-10/libiphone.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- libiphone.spec	3 Jan 2009 14:38:22 -0000	1.2
+++ libiphone.spec	3 Jan 2009 14:43:56 -0000	1.3
@@ -9,7 +9,7 @@
 
 Name:           libiphone
 Version:        0.1.0
-Release:        4.%{snapshot}%{?dist}
+Release:        5.%{snapshot}%{?dist}
 Summary:        Library for connecting to Apple iPhone and iPod touch
 
 Group:          System Environment/Libraries
@@ -77,6 +77,9 @@
 %{_includedir}/libiphone
 
 %changelog
+* Sat Jan 3 2009 Peter Robinson <pbrobinson at gmail.com> 0.1.0-5.git5cde554
+- Actually update the sources file
+
 * Sat Jan 3 2009 Peter Robinson <pbrobinson at gmail.com> 0.1.0-4.git5cde554
 - Update to latest git snapshot
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libiphone/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	4 Dec 2008 12:03:35 -0000	1.2
+++ sources	3 Jan 2009 14:43:56 -0000	1.3
@@ -1 +1 @@
-c360e277e5a361667245561d010c4a76  libiphone-0.1.0-20081201.tar.bz2
+1c6950b2ddf6cf2ed103b616cde0b13a  libiphone-0.1.0-20090103.tar.bz2



From mschwendt at fedoraproject.org  Sat Jan  3 15:25:06 2009
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Sat,  3 Jan 2009 15:25:06 +0000 (UTC)
Subject: rpms/audacity/devel README,1.24,1.25
Message-ID: <20090103152507.057E270120@cvs1.fedora.phx.redhat.com>

Author: mschwendt

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

Modified Files:
	README 
Log Message:
SLV2 review request


Index: README
===================================================================
RCS file: /cvs/pkgs/rpms/audacity/devel/README,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- README	4 Nov 2008 22:54:06 -0000	1.24
+++ README	3 Jan 2009 15:24:36 -0000	1.25
@@ -17,7 +17,7 @@
 New optional build deps:
 
   SLV2 - http://drobilla.net/software/slv2/
-  (not in Fedora yet)
+  (not in Fedora yet, bz #470914)
       SLV2 is a library to make the use of LV2 plugins as simple
       as possible for applications.
       SLV2 is written in standard C using the Redland RDF toolkit, and is



From ghosler at fedoraproject.org  Sat Jan  3 15:43:55 2009
From: ghosler at fedoraproject.org (Gregory D Hosler)
Date: Sat,  3 Jan 2009 15:43:55 +0000 (UTC)
Subject: rpms/gyachi/devel .cvsignore, 1.23, 1.24 gyachi.spec, 1.38,
	1.39 sources, 1.27, 1.28
Message-ID: <20090103154355.830F370120@cvs1.fedora.phx.redhat.com>

Author: ghosler

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

Modified Files:
	.cvsignore gyachi.spec sources 
Log Message:
2009-01-01 (V1-1-61) Better stack management, esp in file sharing threads.
        * - Change the way that url's were built/processed in file
        *   transfer, so as to avert large stack allocations (would
        *   cause crashes in some distros).
        * - fix spell check plugin detection.




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gyachi/devel/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- .cvsignore	22 Dec 2008 16:31:26 -0000	1.23
+++ .cvsignore	3 Jan 2009 15:43:24 -0000	1.24
@@ -1 +1 @@
-gyachi-1.1.60.tar.gz
+gyachi-1.1.61.tar.gz


Index: gyachi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gyachi/devel/gyachi.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- gyachi.spec	22 Dec 2008 16:30:11 -0000	1.38
+++ gyachi.spec	3 Jan 2009 15:43:25 -0000	1.39
@@ -26,7 +26,7 @@
 %endif
 
 Name:		gyachi
-Version:	1.1.60
+Version:	1.1.61
 Release:	1%{?dist}
 Summary:	A Yahoo! chat client with Webcam and voice support
 
@@ -391,6 +391,9 @@
 
 
 %changelog
+* Sat Jan 03 2009 Gregory D Hosler <ghosler at users.sourceforge.net> - 1.1.61.1
+- Add fix for segfault in file transfer.
+
 * Mon Dec 22 2008 Gregory D Hosler <ghosler at users.sourceforge.net> - 1.1.60.1
 - Fixed plugin obsoletes.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gyachi/devel/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- sources	22 Dec 2008 16:31:26 -0000	1.27
+++ sources	3 Jan 2009 15:43:25 -0000	1.28
@@ -1 +1 @@
-d0785b39cc138761b425fd0e973d5d5b  gyachi-1.1.60.tar.gz
+24422b22a044ec02c70eef51908ae700  gyachi-1.1.61.tar.gz



From ghosler at fedoraproject.org  Sat Jan  3 15:47:24 2009
From: ghosler at fedoraproject.org (Gregory D Hosler)
Date: Sat,  3 Jan 2009 15:47:24 +0000 (UTC)
Subject: rpms/gyachi/F-10 .cvsignore, 1.22, 1.23 gyachi.spec, 1.32,
	1.33 sources, 1.22, 1.23
Message-ID: <20090103154724.B5A3970120@cvs1.fedora.phx.redhat.com>

Author: ghosler

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

Modified Files:
	.cvsignore gyachi.spec sources 
Log Message:
2009-01-01 (V1-1-61) Better stack management, esp in file sharing threads.
        * - Change the way that url's were built/processed in file
        *   transfer, so as to avert large stack allocations (would
        *   cause crashes in some distros).
        * - fix spell check plugin detection.




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gyachi/F-10/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- .cvsignore	22 Dec 2008 16:55:38 -0000	1.22
+++ .cvsignore	3 Jan 2009 15:46:54 -0000	1.23
@@ -1 +1 @@
-gyachi-1.1.60.tar.gz
+gyachi-1.1.61.tar.gz


Index: gyachi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gyachi/F-10/gyachi.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- gyachi.spec	22 Dec 2008 16:55:38 -0000	1.32
+++ gyachi.spec	3 Jan 2009 15:46:54 -0000	1.33
@@ -26,7 +26,7 @@
 %endif
 
 Name:		gyachi
-Version:	1.1.60
+Version:	1.1.61
 Release:	1%{?dist}
 Summary:	A Yahoo! chat client with Webcam and voice support
 
@@ -393,6 +393,9 @@
 
 
 %changelog
+* Sat Jan 03 2009 Gregory D Hosler <ghosler at users.sourceforge.net> - 1.1.61.1
+- Add fix for segfault in file transfer.
+
 * Mon Dec 22 2008 Gregory D Hosler <ghosler at users.sourceforge.net> - 1.1.60.1
 - Fixed plugin obsoletes.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gyachi/F-10/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- sources	22 Dec 2008 16:55:38 -0000	1.22
+++ sources	3 Jan 2009 15:46:54 -0000	1.23
@@ -1 +1 @@
-d0785b39cc138761b425fd0e973d5d5b  gyachi-1.1.60.tar.gz
+24422b22a044ec02c70eef51908ae700  gyachi-1.1.61.tar.gz



From ghosler at fedoraproject.org  Sat Jan  3 15:51:14 2009
From: ghosler at fedoraproject.org (Gregory D Hosler)
Date: Sat,  3 Jan 2009 15:51:14 +0000 (UTC)
Subject: rpms/gyachi/F-9 .cvsignore, 1.17, 1.18 gyachi.spec, 1.20,
	1.21 sources, 1.17, 1.18
Message-ID: <20090103155114.11BC070120@cvs1.fedora.phx.redhat.com>

Author: ghosler

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

Modified Files:
	.cvsignore gyachi.spec sources 
Log Message:
2009-01-01 (V1-1-61) Better stack management, esp in file sharing threads.
        * - Change the way that url's were built/processed in file
        *   transfer, so as to avert large stack allocations (would
        *   cause crashes in some distros).
        * - fix spell check plugin detection.




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gyachi/F-9/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- .cvsignore	22 Dec 2008 17:10:39 -0000	1.17
+++ .cvsignore	3 Jan 2009 15:50:43 -0000	1.18
@@ -1 +1 @@
-gyachi-1.1.60.tar.gz
+gyachi-1.1.61.tar.gz


Index: gyachi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gyachi/F-9/gyachi.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- gyachi.spec	22 Dec 2008 17:10:39 -0000	1.20
+++ gyachi.spec	3 Jan 2009 15:50:43 -0000	1.21
@@ -26,7 +26,7 @@
 %endif
 
 Name:		gyachi
-Version:	1.1.60
+Version:	1.1.61
 Release:	1%{?dist}
 Summary:	A Yahoo! chat client with Webcam and voice support
 
@@ -268,6 +268,8 @@
 %build
 ./autogen.sh
 
+#NOTE: xmms & photo_album are disabled, by default, in configure.
+#      if either are wanted, then they must be explicitely enabled!
 %configure --disable-rpath \
 	--libexecdir=%{_libexecdir}/gyachi \
 	%{?_without_wine:--disable-wine} \
@@ -393,6 +395,9 @@
 
 
 %changelog
+* Sat Jan 03 2009 Gregory D Hosler <ghosler at users.sourceforge.net> - 1.1.61.1
+- Add fix for segfault in file transfer.
+
 * Mon Dec 22 2008 Gregory D Hosler <ghosler at users.sourceforge.net> - 1.1.60.1
 - Fixed plugin obsoletes.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gyachi/F-9/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources	22 Dec 2008 17:10:39 -0000	1.17
+++ sources	3 Jan 2009 15:50:43 -0000	1.18
@@ -1 +1 @@
-d0785b39cc138761b425fd0e973d5d5b  gyachi-1.1.60.tar.gz
+24422b22a044ec02c70eef51908ae700  gyachi-1.1.61.tar.gz



From ghosler at fedoraproject.org  Sat Jan  3 15:54:24 2009
From: ghosler at fedoraproject.org (Gregory D Hosler)
Date: Sat,  3 Jan 2009 15:54:24 +0000 (UTC)
Subject: rpms/gyachi/F-8 .cvsignore, 1.16, 1.17 gyachi.spec, 1.20,
	1.21 sources, 1.16, 1.17
Message-ID: <20090103155424.6E7F370120@cvs1.fedora.phx.redhat.com>

Author: ghosler

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

Modified Files:
	.cvsignore gyachi.spec sources 
Log Message:
2009-01-01 (V1-1-61) Better stack management, esp in file sharing threads.
        * - Change the way that url's were built/processed in file
        *   transfer, so as to avert large stack allocations (would
        *   cause crashes in some distros).
        * - fix spell check plugin detection.




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gyachi/F-8/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore	26 Dec 2008 15:41:34 -0000	1.16
+++ .cvsignore	3 Jan 2009 15:53:53 -0000	1.17
@@ -1 +1 @@
-gyachi-1.1.60.tar.gz
+gyachi-1.1.61.tar.gz


Index: gyachi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gyachi/F-8/gyachi.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- gyachi.spec	26 Dec 2008 15:41:34 -0000	1.20
+++ gyachi.spec	3 Jan 2009 15:53:53 -0000	1.21
@@ -26,7 +26,7 @@
 %endif
 
 Name:		gyachi
-Version:	1.1.60
+Version:	1.1.61
 Release:	1%{?dist}
 Summary:	A Yahoo! chat client with Webcam and voice support
 
@@ -395,6 +395,9 @@
 
 
 %changelog
+* Sat Jan 03 2009 Gregory D Hosler <ghosler at users.sourceforge.net> - 1.1.61.1
+- Add fix for segfault in file transfer.
+
 * Mon Dec 22 2008 Gregory D Hosler <ghosler at users.sourceforge.net> - 1.1.60.1
 - Fixed plugin obsoletes.
 - Fixed wrong obsoletes names for xmms and photo album plugin


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gyachi/F-8/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources	26 Dec 2008 15:41:34 -0000	1.16
+++ sources	3 Jan 2009 15:53:53 -0000	1.17
@@ -1 +1 @@
-d0785b39cc138761b425fd0e973d5d5b  gyachi-1.1.60.tar.gz
+24422b22a044ec02c70eef51908ae700  gyachi-1.1.61.tar.gz



From huzaifas at fedoraproject.org  Sat Jan  3 16:18:11 2009
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Sat,  3 Jan 2009 16:18:11 +0000 (UTC)
Subject: rpms/dia/devel dia.spec,1.28,1.29
Message-ID: <20090103161811.582F770120@cvs1.fedora.phx.redhat.com>

Author: huzaifas

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

Modified Files:
	dia.spec 
Log Message:
Added libtool patch


Index: dia.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dia/devel/dia.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- dia.spec	1 Dec 2008 05:03:45 -0000	1.28
+++ dia.spec	3 Jan 2009 16:17:39 -0000	1.29
@@ -1,6 +1,6 @@
 Name:           dia
 Version:        0.96.1
-Release:        9%{?dist}
+Release:        10%{?dist}
 Epoch:          1
 Summary:        Diagram drawing program
 Group:          Applications/Multimedia
@@ -14,6 +14,7 @@
 Patch5:         dia-0.96.1-64bit.patch
 Patch6:         dia-0.96.1-desktop.patch
 Patch7:         dia-0.96.1-svg-export.patch
+Patch8:		dia-0.96.1-libtool.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  libgnomeui-devel python-devel pygtk2-devel desktop-file-utils
 BuildRequires:  intltool docbook-utils docbook-style-dsssl docbook-style-xsl
@@ -38,6 +39,7 @@
 %patch5 -p1 -b .64bit
 %patch6 -p1
 %patch7 -p1
+%patch8 -p1 -b .orig
 sed -i 's|libdia_la_LDFLAGS = -avoid-version|libdia_la_LDFLAGS = -avoid-version $(shell pkg-config gtk+-2.0 libxml-2.0 libart-2.0 libgnome-2.0 --libs)|' \
   lib/Makefile.*
 chmod -x `find objects/AADL -type f`
@@ -111,6 +113,9 @@
 
 
 %changelog
+* Sat Jan 03 2008 Huzaifa Sidhpurwala <huzaifas at redhat.com> 1:0.96.1-10
+- Patch so that plugins dont look for .la files
+
 * Sun Nov 30 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 1:0.96.1-9
 - Rebuild for Python 2.6
 



From huzaifas at fedoraproject.org  Sat Jan  3 16:19:56 2009
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Sat,  3 Jan 2009 16:19:56 +0000 (UTC)
Subject: rpms/dia/devel dia-0.96.1-libtool.patch,NONE,1.1
Message-ID: <20090103161956.AF6B870120@cvs1.fedora.phx.redhat.com>

Author: huzaifas

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

Added Files:
	dia-0.96.1-libtool.patch 
Log Message:
Added libtool patch

dia-0.96.1-libtool.patch:

--- NEW FILE dia-0.96.1-libtool.patch ---
diff -Naur dia-0.96.1.orig/lib/plug-ins.c dia-0.96.1/lib/plug-ins.c
--- dia-0.96.1.orig/lib/plug-ins.c	2007-01-07 03:58:26.000000000 +0530
+++ dia-0.96.1/lib/plug-ins.c	2009-01-03 20:57:33.000000000 +0530
@@ -52,9 +52,9 @@
 #  define USING_LIBTOOL 0
 #else
 /* this one should work on any platform where libtool is used to compile dia */
-#  define PLUG_IN_EXT ".la"
+#  define PLUG_IN_EXT ".so"
 #  define PLUG_IN_EXT_LEN 3
-#  define USING_LIBTOOL 1
+#  define USING_LIBTOOL 0
 #endif
 
 struct _PluginInfo {



From huzaifas at fedoraproject.org  Sat Jan  3 16:23:23 2009
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Sat,  3 Jan 2009 16:23:23 +0000 (UTC)
Subject: rpms/dia/devel dia.spec,1.29,1.30
Message-ID: <20090103162323.3B35270120@cvs1.fedora.phx.redhat.com>

Author: huzaifas

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

Modified Files:
	dia.spec 
Log Message:
Correct wrong date :)


Index: dia.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dia/devel/dia.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- dia.spec	3 Jan 2009 16:17:39 -0000	1.29
+++ dia.spec	3 Jan 2009 16:22:52 -0000	1.30
@@ -113,7 +113,7 @@
 
 
 %changelog
-* Sat Jan 03 2008 Huzaifa Sidhpurwala <huzaifas at redhat.com> 1:0.96.1-10
+* Sat Jan 03 2009 Huzaifa Sidhpurwala <huzaifas at redhat.com> 1:0.96.1-10
 - Patch so that plugins dont look for .la files
 
 * Sun Nov 30 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 1:0.96.1-9



From tmz at fedoraproject.org  Sat Jan  3 16:36:52 2009
From: tmz at fedoraproject.org (Todd M. Zullinger)
Date: Sat,  3 Jan 2009 16:36:52 +0000 (UTC)
Subject: rpms/git/devel .cvsignore, 1.68, 1.69 git.conf.httpd, 1.1,
	1.2 git.spec, 1.75, 1.76 git.xinetd, 1.1, 1.2 sources, 1.68, 1.69
Message-ID: <20090103163652.7E8427013C@cvs1.fedora.phx.redhat.com>

Author: tmz

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

Modified Files:
	.cvsignore git.conf.httpd git.spec git.xinetd sources 
Log Message:
* Sat Jan 03 2009 Todd Zullinger <tmz at pobox.com> 1.6.1-1
- Install git-* commands in %{_libexecdir}/git-core, the upstream default
- Remove libcurl from Requires, rpm will pick this up automatically
- Consolidate build/install options in %make_git (Roland McGrath)
- Include DirectoryIndex in gitweb httpd-config (bug 471692)
- Define DOCBOOK_XSL_172 to fix minor manpage issues
- Rename %{_var}/lib/git-daemon to %{_var}/lib/git
- Preserve timestamps on installed files
- Quiet some rpmlint complaints
- Use macros more consistently



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/git/devel/.cvsignore,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- .cvsignore	20 Dec 2008 17:26:02 -0000	1.68
+++ .cvsignore	3 Jan 2009 16:36:21 -0000	1.69
@@ -1 +1 @@
-git-1.6.0.6.tar.bz2
+git-1.6.1.tar.bz2


Index: git.conf.httpd
===================================================================
RCS file: /cvs/extras/rpms/git/devel/git.conf.httpd,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- git.conf.httpd	4 Aug 2007 02:05:22 -0000	1.1
+++ git.conf.httpd	3 Jan 2009 16:36:21 -0000	1.2
@@ -3,4 +3,5 @@
 <Directory /var/www/git>
   Options +ExecCGI
   AddHandler cgi-script .cgi
+  DirectoryIndex gitweb.cgi
 </Directory>


Index: git.spec
===================================================================
RCS file: /cvs/extras/rpms/git/devel/git.spec,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- git.spec	20 Dec 2008 17:26:02 -0000	1.75
+++ git.spec	3 Jan 2009 16:36:21 -0000	1.76
@@ -1,23 +1,23 @@
 # Pass --without docs to rpmbuild if you don't want the documentation
-Name: 		git
-Version: 	1.6.0.6
-Release: 	1%{?dist}
-Summary:  	Core git tools
-License: 	GPLv2
-Group: 		Development/Tools
-URL: 		http://kernel.org/pub/software/scm/git/
-Source: 	http://kernel.org/pub/software/scm/git/%{name}-%{version}.tar.bz2
-Source1:	git-init.el
-Source2:	git.xinetd
-Source3:	git.conf.httpd
-Patch0:		git-1.5-gitweb-home-link.patch
-BuildRequires:	zlib-devel >= 1.2, openssl-devel, libcurl-devel, expat-devel, emacs, gettext %{!?_without_docs:, xmlto, asciidoc > 6.0.3}
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Requires:	perl-Git = %{version}-%{release}
-Requires:	zlib >= 1.2, rsync, libcurl, less, openssh-clients, expat, perl(Error)
-Provides:	git-core = %{version}-%{release}
-Obsoletes:	git-core <= 1.5.4.3
+Name:           git
+Version:        1.6.1
+Release:        1%{?dist}
+Summary:        Core git tools
+License:        GPLv2
+Group:          Development/Tools
+URL:            http://kernel.org/pub/software/scm/git/
+Source0:        http://kernel.org/pub/software/scm/git/%{name}-%{version}.tar.bz2
+Source1:        git-init.el
+Source2:        git.xinetd
+Source3:        git.conf.httpd
+Patch0:         git-1.5-gitweb-home-link.patch
+BuildRequires:  zlib-devel >= 1.2, openssl-devel, libcurl-devel, expat-devel, emacs, gettext %{!?_without_docs:, xmlto, asciidoc > 6.0.3}
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Requires:       perl-Git = %{version}-%{release}
+Requires:       zlib >= 1.2, rsync, less, openssh-clients, expat, perl(Error)
+Provides:       git-core = %{version}-%{release}
+Obsoletes:      git-core <= 1.5.4.3
 
 %description
 Git is a fast, scalable, distributed revision control system with an
@@ -29,18 +29,18 @@
 SCMs, install the git-all meta-package.
 
 %package all
-Summary:	Meta-package to pull in all git tools
-Group:		Development/Tools
-Requires:	git = %{version}-%{release}
-Requires:	git-svn = %{version}-%{release}
-Requires:	git-cvs = %{version}-%{release}
-Requires:	git-arch = %{version}-%{release}
-Requires:	git-email = %{version}-%{release}
-Requires:	gitk = %{version}-%{release}
-Requires:	git-gui = %{version}-%{release}
-Requires:	perl-Git = %{version}-%{release}
-Requires:	emacs-git = %{version}-%{release}
-Obsoletes:	git <= 1.5.4.3
+Summary:        Meta-package to pull in all git tools
+Group:          Development/Tools
+Requires:       git = %{version}-%{release}
+Requires:       git-svn = %{version}-%{release}
+Requires:       git-cvs = %{version}-%{release}
+Requires:       git-arch = %{version}-%{release}
+Requires:       git-email = %{version}-%{release}
+Requires:       gitk = %{version}-%{release}
+Requires:       git-gui = %{version}-%{release}
+Requires:       perl-Git = %{version}-%{release}
+Requires:       emacs-git = %{version}-%{release}
+Obsoletes:      git <= 1.5.4.3
 
 %description all
 Git is a fast, scalable, distributed revision control system with an
@@ -50,9 +50,9 @@
 This is a dummy package which brings in all subpackages.
 
 %package daemon
-Summary:	Git protocol d??mon
-Group:		Development/Tools
-Requires:	git = %{version}-%{release}
+Summary:        Git protocol d??mon
+Group:          Development/Tools
+Requires:       git = %{version}-%{release}
 %description daemon
 The git d??mon for supporting git:// access to git repositories
 
@@ -89,8 +89,8 @@
 %package email
 Summary:        Git tools for sending email
 Group:          Development/Tools
-Requires:	git = %{version}-%{release}, perl-Git = %{version}-%{release}
-Requires:   perl(Net::SMTP::SSL)
+Requires:       git = %{version}-%{release}, perl-Git = %{version}-%{release}
+Requires:       perl(Net::SMTP::SSL)
 %description email
 Git tools for sending email.
 
@@ -120,9 +120,9 @@
 Perl interface to Git.
 
 %package -n emacs-git
-Summary:       Git version control system support for Emacs
-Group:         Applications/Editors
-Requires:      git = %{version}-%{release}, emacs-common
+Summary:        Git version control system support for Emacs
+Group:          Applications/Editors
+Requires:       git = %{version}-%{release}, emacs-common
 
 %description -n emacs-git
 %{summary}.
@@ -131,51 +131,61 @@
 %setup -q
 %patch0 -p1
 
+# Use these same options for every invocation of 'make'.
+# Otherwise it will rebuild in %%install due to flags changes.
+%define make_git \
+make %{_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" \\\
+     ETC_GITCONFIG=%{_sysconfdir}/gitconfig \\\
+     DESTDIR=$RPM_BUILD_ROOT \\\
+     DOCBOOK_XSL_172=YesPlease \\\
+     INSTALL="install -p" \\\
+     INSTALLDIRS=vendor \\\
+     prefix=%{_prefix}
+
 %build
-make %{_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" \
-     ETC_GITCONFIG=/etc/gitconfig \
-     gitexecdir=%{_bindir} \
-     prefix=%{_prefix} all %{!?_without_docs: doc}
+%{make_git} all %{!?_without_docs: doc}
 make -C contrib/emacs
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make %{_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" DESTDIR=$RPM_BUILD_ROOT \
-     prefix=%{_prefix} mandir=%{_mandir} \
-     ETC_GITCONFIG=/etc/gitconfig \
-     gitexecdir=%{_bindir} \
-     INSTALLDIRS=vendor install %{!?_without_docs: install-doc}
+%{make_git} install %{!?_without_docs: install-doc}
 make -C contrib/emacs install \
-		 emacsdir=$RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp
+    emacsdir=$RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp
 for elc in $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/*.elc ; do
-	install -pm 644 contrib/emacs/$(basename $elc .elc).el \
-	$RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp
+    install -pm 644 contrib/emacs/$(basename $elc .elc).el \
+    $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp
 done
 install -Dpm 644 %{SOURCE1} \
-	$RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/site-start.d/git-init.el
-mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/xinetd.d
-install -m 644 %SOURCE2 $RPM_BUILD_ROOT/%{_sysconfdir}/xinetd.d/git
-mkdir -p $RPM_BUILD_ROOT/var/www/git
-install -m 644 -t $RPM_BUILD_ROOT/var/www/git gitweb/*.png gitweb/*.css
-install -m 755 -t $RPM_BUILD_ROOT/var/www/git gitweb/gitweb.cgi
+    $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/site-start.d/git-init.el
+mkdir -p $RPM_BUILD_ROOT%{_var}/www/git
+install -pm 644 -t $RPM_BUILD_ROOT%{_var}/www/git gitweb/*.png gitweb/*.css
+install -pm 755 -t $RPM_BUILD_ROOT%{_var}/www/git gitweb/gitweb.cgi
 mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/httpd/conf.d
-install -m 0644 %SOURCE3 $RPM_BUILD_ROOT/%{_sysconfdir}/httpd/conf.d/git.conf
+install -pm 0644 %{SOURCE3} $RPM_BUILD_ROOT/%{_sysconfdir}/httpd/conf.d/git.conf
 
 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 -type f -name perllocal.pod -exec rm -f {} ';'
 
-(find $RPM_BUILD_ROOT%{_bindir} -type f | grep -vE "archimport|svn|cvs|email|gitk|git-gui|git-citooli|git-daemon" | sed -e s@^$RPM_BUILD_ROOT@@)               > bin-man-doc-files
+(find $RPM_BUILD_ROOT{%{_bindir},%{_libexecdir}} -type f | grep -vE "archimport|svn|cvs|email|gitk|git-gui|git-citooli|git-daemon" | sed -e s@^$RPM_BUILD_ROOT@@) > bin-man-doc-files
 (find $RPM_BUILD_ROOT%{perl_vendorlib} -type f | sed -e s@^$RPM_BUILD_ROOT@@) >> perl-files
 %if %{!?_without_docs:1}0
-(find $RPM_BUILD_ROOT%{_mandir} $RPM_BUILD_ROOT/Documentation -type f | grep -vE "archimport|svn|git-cvs|email|gitk|git-gui|git-citool" | sed -e s@^$RPM_BUILD_ROOT@@ -e 's/$/*/' ) >> bin-man-doc-files
+(find $RPM_BUILD_ROOT%{_mandir} -type f | grep -vE "archimport|svn|git-cvs|email|gitk|git-gui|git-citool" | sed -e s@^$RPM_BUILD_ROOT@@ -e 's/$/*/' ) >> bin-man-doc-files
 %else
 rm -rf $RPM_BUILD_ROOT%{_mandir}
 %endif
-mkdir -p $RPM_BUILD_ROOT/var/lib/git-daemon
+
+mkdir -p $RPM_BUILD_ROOT%{_var}/lib/git
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/xinetd.d
+install -pm 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/xinetd.d/git
 
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d
-install -m 644 -T contrib/completion/git-completion.bash $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d/git
+install -pm 644 -T contrib/completion/git-completion.bash $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d/git
+
+# quiet some rpmlint complaints
+chmod g-w $RPM_BUILD_ROOT%{_libexecdir}/git-core/*
+rm -f Documentation/technical/.gitignore
+chmod a-x Documentation/technical/api-index.sh
 
 
 %clean
@@ -185,6 +195,7 @@
 %files -f bin-man-doc-files
 %defattr(-,root,root)
 %{_datadir}/git-core/
+%dir %{_libexecdir}/git-core/
 %doc README COPYING Documentation/*.txt contrib/hooks
 %{!?_without_docs: %doc Documentation/*.html Documentation/docbook-xsl.css}
 %{!?_without_docs: %doc Documentation/howto Documentation/technical}
@@ -193,7 +204,7 @@
 
 %files svn
 %defattr(-,root,root)
-%{_bindir}/*svn*
+%{_libexecdir}/git-core/*svn*
 %doc Documentation/*svn*.txt
 %{!?_without_docs: %{_mandir}/man1/*svn*.1*}
 %{!?_without_docs: %doc Documentation/*svn*.html }
@@ -201,28 +212,29 @@
 %files cvs
 %defattr(-,root,root)
 %doc Documentation/*git-cvs*.txt
-%{_bindir}/*cvs*
+%{_bindir}/git-cvsserver
+%{_libexecdir}/git-core/*cvs*
 %{!?_without_docs: %{_mandir}/man1/*cvs*.1*}
 %{!?_without_docs: %doc Documentation/*git-cvs*.html }
 
 %files arch
 %defattr(-,root,root)
 %doc Documentation/git-archimport.txt
-%{_bindir}/git-archimport
+%{_libexecdir}/git-core/git-archimport
 %{!?_without_docs: %{_mandir}/man1/git-archimport.1*}
 %{!?_without_docs: %doc Documentation/git-archimport.html }
 
 %files email
 %defattr(-,root,root)
 %doc Documentation/*email*.txt
-%{_bindir}/*email*
+%{_libexecdir}/git-core/*email*
 %{!?_without_docs: %{_mandir}/man1/*email*.1*}
 %{!?_without_docs: %doc Documentation/*email*.html }
 
 %files gui
 %defattr(-,root,root)
-%{_bindir}/git-gui
-%{_bindir}/git-citool
+%{_libexecdir}/git-core/git-gui*
+%{_libexecdir}/git-core/git-citool
 %{_datadir}/git-gui/
 %{!?_without_docs: %{_mandir}/man1/git-gui.1*}
 %{!?_without_docs: %doc Documentation/git-gui.html}
@@ -247,13 +259,13 @@
 
 %files daemon
 %defattr(-,root,root)
-%{_bindir}/git-daemon
+%{_libexecdir}/git-core/git-daemon
 %config(noreplace)%{_sysconfdir}/xinetd.d/git
-/var/lib/git-daemon
+%{_var}/lib/git
 
 %files -n gitweb
 %defattr(-,root,root)
-/var/www/git/
+%{_var}/www/git/
 %config(noreplace)%{_sysconfdir}/httpd/conf.d/git.conf
 
 
@@ -261,6 +273,17 @@
 # No files for you!
 
 %changelog
+* Sat Jan 03 2009 Todd Zullinger <tmz at pobox.com> 1.6.1-1
+- Install git-* commands in %%{_libexecdir}/git-core, the upstream default
+- Remove libcurl from Requires, rpm will pick this up automatically
+- Consolidate build/install options in %%make_git (Roland McGrath)
+- Include DirectoryIndex in gitweb httpd-config (bug 471692)
+- Define DOCBOOK_XSL_172 to fix minor manpage issues
+- Rename %%{_var}/lib/git-daemon to %%{_var}/lib/git
+- Preserve timestamps on installed files
+- Quiet some rpmlint complaints
+- Use macros more consistently
+
 * Sat Dec 20 2008 Todd Zullinger <tmz at pobox.com> 1.6.0.6-1
 - git-1.6.0.6
 - Fixes a local privilege escalation bug in gitweb
@@ -514,7 +537,7 @@
 * Tue Jan 10 2006 Chris Wright <chrisw at redhat.com> 1.1.0-1
 - Update to latest git-1.1.0 (drop git-email for now)
 - Now creates multiple packages:
--	 git-core, git-svn, git-cvs, git-arch, gitk
+-        git-core, git-svn, git-cvs, git-arch, gitk
 
 * Mon Nov 14 2005 H. Peter Anvin <hpa at zytor.com> 0.99.9j-1
 - Change subpackage names to git-<name> instead of git-core-<name>
@@ -551,7 +574,7 @@
 * Wed Aug 17 2005 Tom "spot" Callaway <tcallawa at redhat.com> 0.99.4-3
 - use dist tag to differentiate between branches
 - use rpm optflags by default (patch0)
-- own %{_datadir}/git-core/
+- own %%{_datadir}/git-core/
 
 * Mon Aug 15 2005 Chris Wright <chrisw at osdl.org>
 - update spec file to fix Buildroot, Requires, and drop Vendor


Index: git.xinetd
===================================================================
RCS file: /cvs/extras/rpms/git/devel/git.xinetd,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- git.xinetd	4 Aug 2007 02:05:22 -0000	1.1
+++ git.xinetd	3 Jan 2009 16:36:21 -0000	1.2
@@ -8,8 +8,8 @@
         socket_type     = stream
         wait            = no
         user            = nobody
-        server          = /usr/bin/git-daemon
-        server_args     = --base-path=/srv/git --export-all --user-path=public_git --syslog --inetd --verbose
+        server          = /usr/bin/git
+        server_args     = daemon --base-path=/var/lib/git --export-all --user-path=public_git --syslog --inetd --verbose
         log_on_failure  += USERID
 # xinetd doesn't do this by default. bug #195265
         flags		= IPv6


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/git/devel/sources,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- sources	20 Dec 2008 17:26:02 -0000	1.68
+++ sources	3 Jan 2009 16:36:21 -0000	1.69
@@ -1 +1 @@
-b5be9b34b441cb57f92086bfaf59f255  git-1.6.0.6.tar.bz2
+66265d85593473b23290232b9dccef77  git-1.6.1.tar.bz2



From ghosler at fedoraproject.org  Sat Jan  3 16:41:42 2009
From: ghosler at fedoraproject.org (Gregory D Hosler)
Date: Sat,  3 Jan 2009 16:41:42 +0000 (UTC)
Subject: rpms/gyachi/EL-5 .cvsignore, 1.7, 1.8 gyachi.spec, 1.15,
	1.16 sources, 1.7, 1.8
Message-ID: <20090103164142.5E8E970120@cvs1.fedora.phx.redhat.com>

Author: ghosler

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

Modified Files:
	.cvsignore gyachi.spec sources 
Log Message:
update to upstream 1.1.61




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gyachi/EL-5/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	8 Aug 2008 16:22:33 -0000	1.7
+++ .cvsignore	3 Jan 2009 16:41:11 -0000	1.8
@@ -1 +1 @@
-gyachi-1.1.46.tar.gz
+gyachi-1.1.61.tar.gz


Index: gyachi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gyachi/EL-5/gyachi.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- gyachi.spec	8 Aug 2008 16:22:33 -0000	1.15
+++ gyachi.spec	3 Jan 2009 16:41:11 -0000	1.16
@@ -1,23 +1,33 @@
+%define _without_photo_album 1
+%undefine _with_photo_album
+%define _without_xmms 1
+%undefine _with_xmms
+
 %ifnarch i386
 %define _without_wine 1
+%undefine _with_wine
 %endif
 
 %if 0%{?fc7}%{?el4}%{?el5}
 %define _without_pulseaudio 1
+%undefine _with_pulseaudio
 %endif
 
 %if 0%{?el4}
 %define _without_gpgme 1
+%undefine _with_gpgme
 %define _without_libnotify 1
+%undefine _with_libnotify
 %endif
 
 %if 0%{?rhel}
 %define _without_xmms 1
+%undefine _with_xmms
 %endif
 
 Name:		gyachi
-Version:	1.1.46
-Release:	4%{?dist}
+Version:	1.1.61
+Release:	1%{?dist}
 Summary:	A Yahoo! chat client with Webcam and voice support
 
 Group:		Applications/Internet
@@ -46,6 +56,9 @@
 BuildRequires:	openssl-devel
 BuildRequires:	gtk2-devel
 BuildRequires:	jasper-devel >= 1.701.0
+%if 0%{?fc10}
+BuildRequires:	libv4l-devel
+%endif
 
 Requires:	gtk2
 #jasper >= 1.701 needed for memory leak fix.
@@ -56,7 +69,39 @@
 %endif
 Requires:	ImageMagick
 
-Obsoletes:	gyachi-plugin-photosharing
+%if 0%{?_without_blowfish:1}
+Obsoletes:	gyachi-plugin-blowfish <= 0:%version-%release
+%endif
+
+%if 0%{?_without_gpgme:1}
+Obsoletes:	gyachi-plugin-gpgme <= 0:%version-%release
+%endif
+
+%if 0%{?_without_mcrypt:1}
+Obsoletes:	gyachi-plugin-mcrypt <= 0:%version-%release
+%endif
+
+%if 0%{!?_with_photo_album:1}
+Obsoletes:	gyachi-plugin-photo_album <= 0:%version-%release
+Obsoletes:	gyachi-plugin-photosharing <= 0:1.1.26
+%endif
+
+%if 0%{!?_with_xmms:1}
+Obsoletes:	gyachi-plugin-xmms <= 0:%version-%release
+%endif
+
+%if 0%{?_without_libnotify:1}
+Obsoletes:	gyachi-plugin-libnotify <= 0:%version-%release
+%endif
+
+%if 0%{?_without_pulseaudio:1}
+Obsoletes:	gyachi-plugin-pulseaudio <= 0:%version-%release
+%endif
+
+%if 0%{!?_without_gtkspell:1}
+Obsoletes:	gyachi-plugin-gtkspell <= 0:%version-%release
+%endif
+
 
 %description
 GYachI is a Linux client for Yahoo! Messenger protocol, 
@@ -77,105 +122,144 @@
 kao i programi za kori????enje web-kamere (slanje i primanje slike).
 
 
-%package        plugin-blowfish
-Summary:        Blowfish encryption plugin for GyachI
-Group:          Applications/Internet
-Requires:       %{name} = %{version}-%{release}
+%if 0%{!?_without_blowfish:1}
+%package	plugin-blowfish
+Summary:	Blowfish encryption plugin for GyachI
+Group:		Applications/Internet
+Requires:	%{name} = %{version}-%{release}
 
-%description plugin-blowfish
+%description	plugin-blowfish
 Blowfish encryption plugin for GyachI
+%endif
 
 
 %if 0%{!?_without_gpgme:1}
-%package        plugin-gpgme
-Summary:        GPGMe encryption plugin for GyachI
-Group:          Applications/Internet
-BuildRequires:  gpgme-devel
-Requires:       %{name} = %{version}-%{release}
+%package	plugin-gpgme
+Summary:	GPGMe encryption plugin for GyachI
+Group:		Applications/Internet
+BuildRequires:	gpgme-devel
+Requires:	%{name} = %{version}-%{release}
 
-%description plugin-gpgme
+%description	plugin-gpgme
 GPGMe encryption plugin for GyachI
 %endif
 
 
-%package        plugin-mcrypt
-Summary:        MCrypt encryption plugin for GyachI
-Group:          Applications/Internet
-Requires:       %{name} = %{version}-%{release}
-Requires:       libmcrypt >= 2.5.0
-Buildrequires:  libmcrypt-devel >= 2.5.0
+%if 0%{!?_without_mcrypt:1}
+%package	plugin-mcrypt
+Summary:	MCrypt encryption plugin for GyachI
+Group:		Applications/Internet
+Requires:	%{name} = %{version}-%{release}
+Requires:	libmcrypt >= 2.5.0
+Buildrequires:	libmcrypt-devel >= 2.5.0
       
-%description plugin-mcrypt
+%description	plugin-mcrypt
 MCrypt encryption plugin for GyachI
+%endif
 
 
-%package        plugin-photo_album
-Summary:        Photo album plugin for GyachI
-Group:          Applications/Internet
-Requires:       %{name} = %{version}-%{release}
+%if 0%{?_with_photo_album:1}
+%package	plugin-photo_album
+Summary:	Photo album plugin for GyachI
+Group:		Applications/Internet
+Requires:	%{name} = %{version}-%{release}
 
-%description plugin-photo_album
+%description	plugin-photo_album
 Photo album plugin for GyachI
+%endif
 
 
-%if 0%{!?_without_xmms:1}
-%package        plugin-xmms
-Summary:        XMMS plugin for GyachI
-Group:          Applications/Internet
-Requires:       %{name} = %{version}-%{release}
-Requires:       xmms >= 1.2.0
-Buildrequires:  xmms-devel >= 1.2.0
+%if 0%{?_with_xmms:1}
+%package	plugin-xmms
+Summary:	XMMS plugin for GyachI
+Group:		Applications/Internet
+Requires:	%{name} = %{version}-%{release}
+Requires:	xmms >= 1.2.0
+Buildrequires:	xmms-devel >= 1.2.0
 
-%description plugin-xmms
+%description	plugin-xmms
 XMMS plugin for GyachI
 %endif
 
 
 %if 0%{!?_without_libnotify:1}
-%package        plugin-libnotify
-Summary:        libnotify popup replacement
-Group:          Applications/Internet
-Requires:       %{name} = %{version}-%{release}
+%package	plugin-libnotify
+Summary:	libnotify popup replacement
+Group:		Applications/Internet
+Requires:	%{name} = %{version}-%{release}
 Buildrequires:	libnotify-devel
 
-%description plugin-libnotify
+%description	plugin-libnotify
 libnotify plugin for GyachI
 %endif
 
 
-%package        plugin-alsa
-Summary:        libalsa sound driver
-Group:          Applications/Internet
-Requires:       %{name} = %{version}-%{release}
+%package	plugin-alsa
+Summary:	libalsa sound driver
+Group:		Applications/Internet
+Requires:	%{name} = %{version}-%{release}
 BuildRequires:	alsa-lib-devel >= 0.9
 Requires:	alsa-lib >= 0.9
 
-%description plugin-alsa
+%description	plugin-alsa
 ALSA sound driver for gyachi
 
 
 %if 0%{!?_without_pulseaudio:1}
-%package        plugin-pulseaudio
-Summary:        pulseaudio sound driver
-Group:          Applications/Internet
-Requires:       %{name} = %{version}-%{release}
+%package	plugin-pulseaudio
+Summary:	pulseaudio sound driver
+Group:		Applications/Internet
+Requires:	%{name} = %{version}-%{release}
 BuildRequires:	pulseaudio-libs-devel
 Requires:	pulseaudio-libs
 
-%description plugin-pulseaudio
+%description	plugin-pulseaudio
 PulseAudio sound driver for gyachi
 %endif
 
 
-%package recre8-theme
-Summary:        GyachI Prototype theme
-Group:          Applications/Internet
-Requires:       %{name} = %{version}-%{release}
+%if 0%{!?_without_gtkspell:1}
+%package	plugin-gtkspell
+Summary:	gtkspell spell check
+Group:		Applications/Internet
+Requires:	%{name} = %{version}-%{release}
+BuildRequires:	gtkspell-devel
+Requires:	gtkspell
+
+%description	plugin-gtkspell
+Spell check plugin for gyachi using gtkspell
+%endif
+
+
+%package	recre8-theme
+Summary:	GyachI Prototype theme
+Group:		Applications/Internet
+Requires:	%{name} = %{version}-%{release}
 
-%description recre8-theme
+%description	recre8-theme
 %{summary} This package supplies the artwork for the GyachI recre8 theme.
 
 
+%package	YMlike-theme
+Summary:	GyachI Prototype theme
+Group:		Applications/Internet
+Requires:	%{name} = %{version}-%{release}
+
+%description	YMlike-theme
+%{summary} This package supplies the artwork for the GyachI YMlike theme.
+This theme is an independent re-implementation of the yahoo theme.
+
+
+%package	pidgy-theme
+Summary:	GyachI Prototype theme
+Group:		Applications/Internet
+Requires:	%{name} = %{version}-%{release}
+
+%description	pidgy-theme
+%{summary} This package supplies the artwork for the GyachI pidgy theme.
+This theme uses the pidgin icons, and is copyrighted by it's respective authors.
+
+
 %prep
 %setup -q
 #%patch0 -p1
@@ -184,15 +268,19 @@
 %build
 ./autogen.sh
 
+#NOTE: xmms & photo_album are disabled, by default, in configure.
+#      if either are wanted, then they must be explicitely enabled!
 %configure --disable-rpath --enable-v4l2 \
 	--libexecdir=%{_libexecdir}/gyachi \
 	%{?_without_wine:--disable-wine} \
+	%{?_without_blowfish:--disable-plugin_blowfish} \
+	%{?_without_mcrypt:--disable-plugin_mcrypt} \
 	%{?_without_gpgme:--disable-plugin_gpgme} \
 	%{?_without_pulseaudio:--disable-plugin_pulseaudio} \
 	%{?_without_libnotify:--disable-plugin_libnotify} \
-	--enable-plugin_photo_album \
-	%{!?_without_xmms:--enable-plugin_xmms}
-
+	%{?_without_gktspell:--disable-plugin_gtkspell} \
+	%{?_with_photo_album:--enable-plugin_photo_album} \
+	%{?_with_xmms:--enable-plugin_xmms} 
 
 make %{?_smp_mflags}
 
@@ -200,14 +288,16 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 make DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" install
+rm $RPM_BUILD_ROOT%{_libdir}/libgyachi.la
+rm $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins/libgyachi*.la
 %find_lang %{name}
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
 ln -sf ../%{name}/themes/gyachi-classic/gyach-icon_48.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/%{name}.png
-desktop-file-install --delete-original                   \
-        --vendor fedora                                  \
-        --dir $RPM_BUILD_ROOT%{_datadir}/applications    \
-        --mode 0644                                      \
-        $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
+desktop-file-install --delete-original \
+	--vendor fedora \
+	--dir $RPM_BUILD_ROOT%{_datadir}/applications \
+	--mode 0644 \
+	$RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
 
 
 %clean
@@ -228,64 +318,86 @@
 %{_datadir}/%{name}/themes/gyachi-classic
 %dir %{_libexecdir}/%{name}
 %{_libexecdir}/%{name}/%{name}-*
+%dir %{_libdir}/%{name}
 %dir %{_libdir}/%{name}/plugins
 %{_libdir}/libgyachi.so
 %{_docdir}/%{name}-%{version}
 %docdir %{_docdir}/%{name}-%{version}
 
+%if 0%{!?_without_blowfish:1}
 %files plugin-blowfish
 %defattr(-,root,root,-)
-%{_libdir}/%{name}/plugins/%{name}blowfish.so
+%{_libdir}/%{name}/plugins/lib%{name}blowfish.so
+%endif
 
 %if 0%{!?_without_gpgme:1}
 %files plugin-gpgme
 %defattr(-,root,root,-)
-%{_libdir}/%{name}/plugins/%{name}gpgme.so
+%{_libdir}/%{name}/plugins/lib%{name}gpgme.so
 %endif
 
+%if 0%{!?_without_mcrypt:1}
 %files plugin-mcrypt
 %defattr(-,root,root,-)
-%{_libdir}/%{name}/plugins/%{name}mcrypt.so
+%{_libdir}/%{name}/plugins/lib%{name}mcrypt.so
+%endif
 
+%if 0%{?_with_photo_album:1}
 %files plugin-photo_album
 %defattr(-,root,root,-)
-%{_libdir}/%{name}/plugins/%{name}photos.so
+%{_libdir}/%{name}/plugins/lib%{name}photos.so
+%endif
 
-%if 0%{!?_without_xmms:1}
+%if 0%{?_with_xmms:1}
 %files plugin-xmms
 %defattr(-,root,root,-)
-%{_libdir}/%{name}/plugins/%{name}xmms.so
+%{_libdir}/%{name}/plugins/lib%{name}xmms.so
 %endif
 
 %if 0%{!?_without_libnotify:1}
 %files plugin-libnotify
 %defattr(-,root,root,-)
-%{_libdir}/%{name}/plugins/%{name}libnotify.so
+%{_libdir}/%{name}/plugins/lib%{name}libnotify.so
 %endif
 
 %files plugin-alsa
 %defattr(-,root,root,-)
-%{_libdir}/%{name}/plugins/%{name}alsa.so
+%{_libdir}/%{name}/plugins/lib%{name}alsa.so
 
 %if 0%{!?_without_pulseaudio:1}
 %files plugin-pulseaudio
 %defattr(-,root,root,-)
-%{_libdir}/%{name}/plugins/%{name}pulseaudio.so
+%{_libdir}/%{name}/plugins/lib%{name}pulseaudio.so
+%endif
+
+%if 0%{!?_without_gtkspell:1}
+%files plugin-gtkspell
+%defattr(-,root,root,-)
+%{_libdir}/%{name}/plugins/lib%{name}gtkspell.so
 %endif
 
 %files recre8-theme
 %defattr(-,root,root,-)
-/usr/share/%{name}/themes/recre8/*
+%{_datadir}/%{name}/themes/recre8/
+
+%files YMlike-theme
+%defattr(-,root,root,-)
+%{_datadir}/%{name}/themes/YMlike/
 
+%files pidgy-theme
+%defattr(-,root,root,-)
+%{_datadir}/%{name}/themes/pidgy/
 
-%postun
-ldconfig
 
-%post
-ldconfig
+%postun -p /sbin/ldconfig
+
+%post -p /sbin/ldconfig
 
 
 %changelog
+* Sat Jan 03 2009 Gregory D Hosler <ghosler at users.sourceforge.net> - 1.1.61.1
+- Update from upstream.
+
 * Fri Aug  8 2008 Gregory D Hosler <ghosler at fedoraproject.org> - 1.1.46-4
 - Update from upstream.
 
@@ -326,9 +438,9 @@
 
 * Mon May 05 2008 Gregory D Hosler <ghosler at fedoraproject.org> - 1.1.32-1
 - updated gyachi to 1.1.32 from upstream
-- fixed %files to include the full documentation directory, and the new
+- fixed %%files to include the full documentation directory, and the new
 - libgyachi library.
-- updated configure to set libdir & libexecdir to be %{_libdir} (x64 lib fix)
+- updated configure to set libdir & libexecdir to be %%{_libdir} (x64 lib fix)
 - added new gyachi modules (libnotify, and recre8)
 - updated the name change of the old photosharing module to photo_album
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gyachi/EL-5/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	8 Aug 2008 16:22:33 -0000	1.7
+++ sources	3 Jan 2009 16:41:11 -0000	1.8
@@ -1 +1 @@
-3794be40d2657aa7ff2519e86059c445  gyachi-1.1.46.tar.gz
+24422b22a044ec02c70eef51908ae700  gyachi-1.1.61.tar.gz



From mtasaka at fedoraproject.org  Sat Jan  3 17:01:04 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Sat,  3 Jan 2009 17:01:04 +0000 (UTC)
Subject: rpms/cairo-dock/devel .cvsignore, 1.91, 1.92 cairo-dock.spec, 1.122,
	1.123 sources, 1.91, 1.92
Message-ID: <20090103170105.1289370120@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/cairo-dock/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25488

Modified Files:
	.cvsignore cairo-dock.spec sources 
Log Message:
rev 1462


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cairo-dock/devel/.cvsignore,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -r1.91 -r1.92
--- .cvsignore	1 Jan 2009 16:35:38 -0000	1.91
+++ .cvsignore	3 Jan 2009 17:00:32 -0000	1.92
@@ -1 +1 @@
-cairo-dock-sources-svn1458_trunk.tar.bz2
+cairo-dock-sources-svn1462_trunk.tar.bz2


Index: cairo-dock.spec
===================================================================
RCS file: /cvs/extras/rpms/cairo-dock/devel/cairo-dock.spec,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -r1.122 -r1.123
--- cairo-dock.spec	1 Jan 2009 16:35:38 -0000	1.122
+++ cairo-dock.spec	3 Jan 2009 17:00:32 -0000	1.123
@@ -11,7 +11,7 @@
 %undefine		betaver		
 %define		build_webkit	1
 %define		build_xfce	1
-%define		tarballver	svn1458_trunk
+%define		tarballver	svn1462_trunk
 
 %define		fedora_main_rel	3
 
@@ -637,8 +637,8 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
-* Fri Jan  2 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
-- rev 1458
+* Sun Jan  4 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- rev 1462
 
 * Thu Dec 25 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
 - rev 1451


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cairo-dock/devel/sources,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -r1.91 -r1.92
--- sources	1 Jan 2009 16:35:38 -0000	1.91
+++ sources	3 Jan 2009 17:00:32 -0000	1.92
@@ -1 +1 @@
-25005dc02c3e305d5588642c5e2fa60c  cairo-dock-sources-svn1458_trunk.tar.bz2
+6468df6d5396345e24e79bb0369c1bcd  cairo-dock-sources-svn1462_trunk.tar.bz2



From mtasaka at fedoraproject.org  Sat Jan  3 17:16:31 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Sat,  3 Jan 2009 17:16:31 +0000 (UTC)
Subject: rpms/gnome-commander/devel .cvsignore, 1.22,
	1.23 gnome-commander.spec, 1.45, 1.46 sources, 1.22, 1.23
Message-ID: <20090103171631.91EBE70120@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/gnome-commander/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30771

Modified Files:
	.cvsignore gnome-commander.spec sources 
Log Message:
update


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-commander/devel/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- .cvsignore	21 Dec 2008 04:10:14 -0000	1.22
+++ .cvsignore	3 Jan 2009 17:16:00 -0000	1.23
@@ -1 +1 @@
-gnome-commander-1.2.8-svn2368_trunk.tar.bz2
+gnome-commander-1.2.8-svn2379_trunk.tar.bz2


Index: gnome-commander.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-commander/devel/gnome-commander.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- gnome-commander.spec	21 Dec 2008 04:10:15 -0000	1.45
+++ gnome-commander.spec	3 Jan 2009 17:16:01 -0000	1.46
@@ -18,7 +18,7 @@
 %define        use_autotool          0
 %define        if_pre                1
 %define        main_release          3 
-%define        extratag              svn2368_trunk
+%define        extratag              svn2379_trunk
 %define        mimeedit_rev          1958
 
 %if 0%{?if_pre} > 0
@@ -211,8 +211,8 @@
 %{_datadir}/pixmaps/%{name}/
 
 %changelog
-* Sun Dec 21 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
-- rev 2368
+* Sun Jan  4 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- rev 2379
 
 * Thu Dec 18 2008 Rex Dieter <rdieter at fedoraproject.org>
 - respin (exiv2)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-commander/devel/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- sources	21 Dec 2008 04:10:15 -0000	1.22
+++ sources	3 Jan 2009 17:16:01 -0000	1.23
@@ -1 +1 @@
-e0d93c0e13f8858808f02787628a3fc4  gnome-commander-1.2.8-svn2368_trunk.tar.bz2
+8b64a481f2f565f608dc54f04d62d928  gnome-commander-1.2.8-svn2379_trunk.tar.bz2



From mtasaka at fedoraproject.org  Sat Jan  3 17:28:48 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Sat,  3 Jan 2009 17:28:48 +0000 (UTC)
Subject: rpms/comix/devel .cvsignore, 1.11, 1.12 comix.spec, 1.20,
	1.21 sources, 1.11, 1.12
Message-ID: <20090103172848.84B6670120@cvs1.fedora.phx.redhat.com>

Author: mtasaka

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

Modified Files:
	.cvsignore comix.spec sources 
Log Message:
* Sun Jan  4 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 4.0.2-1
- 4.0.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/comix/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	15 Dec 2008 05:19:34 -0000	1.11
+++ .cvsignore	3 Jan 2009 17:28:17 -0000	1.12
@@ -1 +1 @@
-comix-4.0.1.tar.gz
+comix-4.0.2.tar.gz


Index: comix.spec
===================================================================
RCS file: /cvs/extras/rpms/comix/devel/comix.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- comix.spec	15 Dec 2008 05:19:34 -0000	1.20
+++ comix.spec	3 Jan 2009 17:28:18 -0000	1.21
@@ -3,7 +3,7 @@
 # mv trunk comix-%%mainver
 # tar czf comix-%%mainver-%%alphatag.tar.gz comix-%%mainver
 
-%define		mainver		4.0.1
+%define		mainver		4.0.2
 %undefine		alphatag	
 %define		comix4		1
 
@@ -176,6 +176,9 @@
 
 
 %changelog
+* Sun Jan  4 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 4.0.2-1
+- 4.0.2
+
 * Mon Dec 15 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 4.0.1-1
 - 4.0.1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/comix/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	15 Dec 2008 05:19:34 -0000	1.11
+++ sources	3 Jan 2009 17:28:18 -0000	1.12
@@ -1 +1 @@
-319cb93736ac525aca7f27aa208be708  comix-4.0.1.tar.gz
+8bf2565dc258ccdc3752a75025dd130e  comix-4.0.2.tar.gz



From rezso at fedoraproject.org  Sat Jan  3 17:58:39 2009
From: rezso at fedoraproject.org (Balint Cristian)
Date: Sat,  3 Jan 2009 17:58:39 +0000 (UTC)
Subject: rpms/fet/devel .cvsignore, 1.4, 1.5 fet.spec, 1.3, 1.4 import.log,
	1.3, 1.4 sources, 1.4, 1.5
Message-ID: <20090103175839.515D570120@cvs1.fedora.phx.redhat.com>

Author: rezso

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

Modified Files:
	.cvsignore fet.spec import.log sources 
Log Message:
- new upstream



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fet/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	6 Dec 2008 14:12:06 -0000	1.4
+++ .cvsignore	3 Jan 2009 17:58:08 -0000	1.5
@@ -1 +1 @@
-fet-5.7.5.tar.bz2
+fet-5.7.7.tar.bz2


Index: fet.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fet/devel/fet.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- fet.spec	6 Dec 2008 14:12:06 -0000	1.3
+++ fet.spec	3 Jan 2009 17:58:08 -0000	1.4
@@ -1,5 +1,5 @@
 Name:      fet
-Version:   5.7.5
+Version:   5.7.7
 Release:   1%{?dist}
 Summary:   Open source free timetabling software
 
@@ -68,6 +68,9 @@
 %{_datadir}/%{name}/*
 
 %changelog
+* Sat Jan 03 2009 Balint Cristian <rezso at rdsor.ro> - 5.7.7-1
+- new upstream release
+
 * Sat Dec 06 2008 Balint Cristian <rezso at rdsor.ro> - 5.7.5-1
 - new upstream release
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/fet/devel/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- import.log	6 Dec 2008 14:12:06 -0000	1.3
+++ import.log	3 Jan 2009 17:58:08 -0000	1.4
@@ -1,3 +1,4 @@
 fet-5_6_3-3_fc10:HEAD:fet-5.6.3-3.fc10.src.rpm:1222328849
 fet-5_7_0-1_fc10:HEAD:fet-5.7.0-1.fc10.src.rpm:1222936202
 fet-5_7_5-1_fc11:HEAD:fet-5.7.5-1.fc11.src.rpm:1228572685
+fet-5_7_7-1_fc11:HEAD:fet-5.7.7-1.fc11.src.rpm:1231005369


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fet/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	6 Dec 2008 14:12:06 -0000	1.4
+++ sources	3 Jan 2009 17:58:08 -0000	1.5
@@ -1 +1 @@
-7d815e3ba40f2eb503a5c82a06179dca  fet-5.7.5.tar.bz2
+fe1096f0e0021d43255cb677f72df458  fet-5.7.7.tar.bz2



From hadess at fedoraproject.org  Sat Jan  3 17:59:54 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Sat,  3 Jan 2009 17:59:54 +0000 (UTC)
Subject: rpms/bluez/devel .cvsignore, 1.19, 1.20 bluez.spec, 1.29,
	1.30 sources, 1.19, 1.20 dbus-bluetooth.conf, 1.1, NONE
Message-ID: <20090103175954.0251670120@cvs1.fedora.phx.redhat.com>

Author: hadess

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

Modified Files:
	.cvsignore bluez.spec sources 
Removed Files:
	dbus-bluetooth.conf 
Log Message:
* Sat Jan 03 2009 - Bastien Nocera <bnocera at redhat.com> - 4.25-1
- Update to 4.25



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bluez/devel/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- .cvsignore	8 Dec 2008 09:48:21 -0000	1.19
+++ .cvsignore	3 Jan 2009 17:59:23 -0000	1.20
@@ -1 +1 @@
-bluez-4.22.tar.gz
+bluez-4.25.tar.gz


Index: bluez.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bluez/devel/bluez.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- bluez.spec	9 Dec 2008 11:28:35 -0000	1.29
+++ bluez.spec	3 Jan 2009 17:59:23 -0000	1.30
@@ -1,14 +1,13 @@
 Summary: Bluetooth utilities
 Name: bluez
-Version: 4.22
-Release: 2%{?dist}
+Version: 4.25
+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
 Source3: bluez-uinput.modules
-Source4: dbus-bluetooth.conf
 Patch1: bluez-utils-oui-usage.patch
 Patch2: 0001-Add-icon-for-other-audio-device.patch
 
@@ -101,8 +100,6 @@
 %patch1 -p0 -b .oui
 %patch2 -p1
 
-cp -a %{SOURCE4} src/bluetooth.conf
-
 %build
 %configure --enable-cups --enable-hid2hci --enable-dfutool --enable-tools --enable-bccmd --enable-gstreamer --enable-hidd --enable-pand --enable-dund
 make
@@ -192,6 +189,9 @@
 %{_libdir}/alsa-lib/*.so
 
 %changelog
+* Sat Jan 03 2009 - Bastien Nocera <bnocera at redhat.com> - 4.25-1
+- Update to 4.25
+
 * Tue Dec 09 2008 - Bastien Nocera <bnocera at redhat.com> - 4.22-2
 - Fix D-Bus configuration for latest D-Bus (#475069)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bluez/devel/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources	8 Dec 2008 09:48:21 -0000	1.19
+++ sources	3 Jan 2009 17:59:23 -0000	1.20
@@ -1 +1 @@
-b8302c23d08c1fa370f8bb81a6926ff2  bluez-4.22.tar.gz
+1f5464b23be0774571e60f9012d50280  bluez-4.25.tar.gz


--- dbus-bluetooth.conf DELETED ---



From rezso at fedoraproject.org  Sat Jan  3 18:13:29 2009
From: rezso at fedoraproject.org (Balint Cristian)
Date: Sat,  3 Jan 2009 18:13:29 +0000 (UTC)
Subject: rpms/fet/F-10 .cvsignore, 1.4, 1.5 fet.spec, 1.3, 1.4 import.log,
	1.3, 1.4 sources, 1.4, 1.5
Message-ID: <20090103181329.672C070120@cvs1.fedora.phx.redhat.com>

Author: rezso

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

Modified Files:
	.cvsignore fet.spec import.log sources 
Log Message:
- new upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fet/F-10/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	6 Dec 2008 15:06:28 -0000	1.4
+++ .cvsignore	3 Jan 2009 18:12:58 -0000	1.5
@@ -1 +1 @@
-fet-5.7.5.tar.bz2
+fet-5.7.7.tar.bz2


Index: fet.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fet/F-10/fet.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- fet.spec	6 Dec 2008 15:06:28 -0000	1.3
+++ fet.spec	3 Jan 2009 18:12:58 -0000	1.4
@@ -1,5 +1,5 @@
 Name:      fet
-Version:   5.7.5
+Version:   5.7.7
 Release:   1%{?dist}
 Summary:   Open source free timetabling software
 
@@ -68,6 +68,9 @@
 %{_datadir}/%{name}/*
 
 %changelog
+* Sat Jan 03 2009 Balint Cristian <rezso at rdsor.ro> - 5.7.7-1
+- new upstream release
+
 * Sat Dec 06 2008 Balint Cristian <rezso at rdsor.ro> - 5.7.5-1
 - new upstream release
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/fet/F-10/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- import.log	6 Dec 2008 15:06:28 -0000	1.3
+++ import.log	3 Jan 2009 18:12:58 -0000	1.4
@@ -1,3 +1,4 @@
 fet-5_6_3-3_fc10:HEAD:fet-5.6.3-3.fc10.src.rpm:1222328849
 fet-5_7_0-1_fc10:HEAD:fet-5.7.0-1.fc10.src.rpm:1222936202
 fet-5_7_5-1_fc11:F-10:fet-5.7.5-1.fc11.src.rpm:1228575954
+fet-5_7_7-1_fc11:F-10:fet-5.7.7-1.fc11.src.rpm:1231006342


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fet/F-10/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	6 Dec 2008 15:06:28 -0000	1.4
+++ sources	3 Jan 2009 18:12:58 -0000	1.5
@@ -1 +1 @@
-7d815e3ba40f2eb503a5c82a06179dca  fet-5.7.5.tar.bz2
+fe1096f0e0021d43255cb677f72df458  fet-5.7.7.tar.bz2



From rezso at fedoraproject.org  Sat Jan  3 18:15:49 2009
From: rezso at fedoraproject.org (Balint Cristian)
Date: Sat,  3 Jan 2009 18:15:49 +0000 (UTC)
Subject: rpms/fet/F-9 .cvsignore, 1.4, 1.5 fet.spec, 1.3, 1.4 import.log, 1.3,
	1.4 sources, 1.4, 1.5
Message-ID: <20090103181549.EA1677013C@cvs1.fedora.phx.redhat.com>

Author: rezso

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

Modified Files:
	.cvsignore fet.spec import.log sources 
Log Message:
- new upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fet/F-9/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	6 Dec 2008 15:08:58 -0000	1.4
+++ .cvsignore	3 Jan 2009 18:15:19 -0000	1.5
@@ -1 +1 @@
-fet-5.7.5.tar.bz2
+fet-5.7.7.tar.bz2


Index: fet.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fet/F-9/fet.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- fet.spec	6 Dec 2008 15:08:58 -0000	1.3
+++ fet.spec	3 Jan 2009 18:15:19 -0000	1.4
@@ -1,5 +1,5 @@
 Name:      fet
-Version:   5.7.5
+Version:   5.7.7
 Release:   1%{?dist}
 Summary:   Open source free timetabling software
 
@@ -68,6 +68,9 @@
 %{_datadir}/%{name}/*
 
 %changelog
+* Sat Jan 03 2009 Balint Cristian <rezso at rdsor.ro> - 5.7.7-1
+- new upstream release
+
 * Sat Dec 06 2008 Balint Cristian <rezso at rdsor.ro> - 5.7.5-1
 - new upstream release
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/fet/F-9/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- import.log	6 Dec 2008 15:08:59 -0000	1.3
+++ import.log	3 Jan 2009 18:15:19 -0000	1.4
@@ -1,3 +1,4 @@
 fet-5_6_3-3_fc10:F-9:fet-5.6.3-3.fc10.src.rpm:1222330241
 fet-5_7_0-1_fc10:F-9:fet-5.7.0-1.fc10.src.rpm:1223455057
 fet-5_7_5-1_fc11:F-9:fet-5.7.5-1.fc11.src.rpm:1228576103
+fet-5_7_7-1_fc11:F-9:fet-5.7.7-1.fc11.src.rpm:1231006480


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fet/F-9/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	6 Dec 2008 15:08:59 -0000	1.4
+++ sources	3 Jan 2009 18:15:19 -0000	1.5
@@ -1 +1 @@
-7d815e3ba40f2eb503a5c82a06179dca  fet-5.7.5.tar.bz2
+fe1096f0e0021d43255cb677f72df458  fet-5.7.7.tar.bz2



From pkgdb at fedoraproject.org  Sat Jan  3 18:53:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Jan 2009 18:53:39 +0000
Subject: [pkgdb] octave-forge: rakesh has requested watchcommits
Message-ID: <20090103115328.AE2DC20873C@bastion.fedora.phx.redhat.com>

rakesh has requested the watchcommits acl on octave-forge (Fedora devel)

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



From pkgdb at fedoraproject.org  Sat Jan  3 18:53:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Jan 2009 18:53:40 +0000
Subject: [pkgdb] octave-forge: rakesh has requested commit
Message-ID: <20090103115329.559CD208D4E@bastion.fedora.phx.redhat.com>

rakesh has requested the commit acl on octave-forge (Fedora devel)

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



From pkgdb at fedoraproject.org  Sat Jan  3 18:53:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Jan 2009 18:53:46 +0000
Subject: [pkgdb] octave-forge: rakesh has requested watchbugzilla
Message-ID: <20090103115336.3AC8B208D51@bastion.fedora.phx.redhat.com>

rakesh has requested the watchbugzilla acl on octave-forge (Fedora devel)

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



From pkgdb at fedoraproject.org  Sat Jan  3 18:53:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Jan 2009 18:53:47 +0000
Subject: [pkgdb] octave-forge: rakesh has requested approveacls
Message-ID: <20090103115337.36897208D57@bastion.fedora.phx.redhat.com>

rakesh has requested the approveacls acl on octave-forge (Fedora devel)

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



From pkgdb at fedoraproject.org  Sat Jan  3 18:53:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Jan 2009 18:53:51 +0000
Subject: [pkgdb] octave-forge: rakesh has requested watchbugzilla
Message-ID: <20090103115341.23DFE208D58@bastion.fedora.phx.redhat.com>

rakesh has requested the watchbugzilla acl on octave-forge (Fedora 10)

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



From pkgdb at fedoraproject.org  Sat Jan  3 18:53:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Jan 2009 18:53:54 +0000
Subject: [pkgdb] octave-forge: rakesh has requested watchcommits
Message-ID: <20090103115343.D13E1208D62@bastion.fedora.phx.redhat.com>

rakesh has requested the watchcommits acl on octave-forge (Fedora 10)

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



From pkgdb at fedoraproject.org  Sat Jan  3 18:53:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Jan 2009 18:53:56 +0000
Subject: [pkgdb] octave-forge: rakesh has requested commit
Message-ID: <20090103115345.63EFA208D9F@bastion.fedora.phx.redhat.com>

rakesh has requested the commit acl on octave-forge (Fedora 10)

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



From rakesh at fedoraproject.org  Sat Jan  3 19:17:26 2009
From: rakesh at fedoraproject.org (Rakesh Pandit)
Date: Sat,  3 Jan 2009 19:17:26 +0000 (UTC)
Subject: rpms/octave-forge/devel octave-forge.spec,1.62,1.63
Message-ID: <20090103191726.71F6C70120@cvs1.fedora.phx.redhat.com>

Author: rakesh

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

Modified Files:
	octave-forge.spec 
Log Message:
Fixed unowned directories (BZ 474675)


Index: octave-forge.spec
===================================================================
RCS file: /cvs/pkgs/rpms/octave-forge/devel/octave-forge.spec,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- octave-forge.spec	11 Sep 2008 22:58:48 -0000	1.62
+++ octave-forge.spec	3 Jan 2009 19:16:55 -0000	1.63
@@ -2,7 +2,7 @@
 
 Name:           octave-forge
 Version:        20080831
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Contributed functions for octave
 
 Group:          Applications/Engineering
@@ -198,11 +198,14 @@
 
 %files
 %defattr(-,root,root,-)
-%{_datadir}/octave/packages/*
-%{_libexecdir}/octave/packages/*
+%{_datadir}/octave/packages/
+%{_libexecdir}/octave/packages/
 
 
 %changelog
+* Sun Jan 04 2009 Rakesh Pandit <rakesh at fedoraproject.org> 20080831-3
+- Fixed unowned directories (BZ 474675)
+
 * Thu Sep 11 2008 Orion Poplawski <orion at cora.nwra.com>  20080831-2
 - Rebuild for new libdap
 



From rakesh at fedoraproject.org  Sat Jan  3 19:18:45 2009
From: rakesh at fedoraproject.org (Rakesh Pandit)
Date: Sat,  3 Jan 2009 19:18:45 +0000 (UTC)
Subject: rpms/octave-forge/F-10 octave-forge.spec,1.62,1.63
Message-ID: <20090103191845.C151F70120@cvs1.fedora.phx.redhat.com>

Author: rakesh

Update of /cvs/pkgs/rpms/octave-forge/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29868

Modified Files:
	octave-forge.spec 
Log Message:
Fixed unowned directories (BZ 474675)


Index: octave-forge.spec
===================================================================
RCS file: /cvs/pkgs/rpms/octave-forge/F-10/octave-forge.spec,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- octave-forge.spec	11 Sep 2008 22:58:48 -0000	1.62
+++ octave-forge.spec	3 Jan 2009 19:18:15 -0000	1.63
@@ -2,7 +2,7 @@
 
 Name:           octave-forge
 Version:        20080831
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Contributed functions for octave
 
 Group:          Applications/Engineering
@@ -198,11 +198,14 @@
 
 %files
 %defattr(-,root,root,-)
-%{_datadir}/octave/packages/*
-%{_libexecdir}/octave/packages/*
+%{_datadir}/octave/packages/
+%{_libexecdir}/octave/packages/
 
 
 %changelog
+* Sun Jan 04 2009 Rakesh Pandit <rakesh at fedoraproject.org> 20080831-3
+- Fixed unowned directories (BZ 474675)
+
 * Thu Sep 11 2008 Orion Poplawski <orion at cora.nwra.com>  20080831-2
 - Rebuild for new libdap
 



From rakesh at fedoraproject.org  Sat Jan  3 19:19:51 2009
From: rakesh at fedoraproject.org (Rakesh Pandit)
Date: Sat,  3 Jan 2009 19:19:51 +0000 (UTC)
Subject: rpms/octave-forge/F-9 octave-forge.spec,1.55,1.56
Message-ID: <20090103191951.9920070120@cvs1.fedora.phx.redhat.com>

Author: rakesh

Update of /cvs/pkgs/rpms/octave-forge/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30130

Modified Files:
	octave-forge.spec 
Log Message:
Fixed unowned directories (BZ 474675)


Index: octave-forge.spec
===================================================================
RCS file: /cvs/pkgs/rpms/octave-forge/F-9/octave-forge.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- octave-forge.spec	19 Dec 2008 11:23:09 -0000	1.55
+++ octave-forge.spec	3 Jan 2009 19:19:21 -0000	1.56
@@ -2,7 +2,7 @@
 
 Name:           octave-forge
 Version:        20080831
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Contributed functions for octave
 
 Group:          Applications/Engineering
@@ -198,11 +198,14 @@
 
 %files
 %defattr(-,root,root,-)
-%{_datadir}/octave/packages/*
-%{_libexecdir}/octave/packages/*
+%{_datadir}/octave/packages/
+%{_libexecdir}/octave/packages/
 
 
 %changelog
+* Sun Jan 04 2009 Rakesh Pandit <rakesh at fedoraproject.org> 20080831-3
+- Fixed unowned directories (BZ 474675)
+
 * Thu Sep 11 2008 Orion Poplawski <orion at cora.nwra.com>  20080831-2
 - Rebuild for new libdap
 



From pkgdb at fedoraproject.org  Sat Jan  3 19:47:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Jan 2009 19:47:29 +0000
Subject: [pkgdb] octave-forge had acl change status
Message-ID: <20090103124718.DF9352084B6@bastion.fedora.phx.redhat.com>

qspencer has set the watchbugzilla acl on octave-forge (Fedora 10) to Approved for rakesh

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



From pkgdb at fedoraproject.org  Sat Jan  3 19:50:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Jan 2009 19:50:42 +0000
Subject: [pkgdb] octave-forge had acl change status
Message-ID: <20090103125032.4E74020873C@bastion.fedora.phx.redhat.com>

qspencer has set the watchbugzilla acl on octave-forge (Fedora devel) to Approved for rakesh

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



From pkgdb at fedoraproject.org  Sat Jan  3 19:56:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Jan 2009 19:56:14 +0000
Subject: [pkgdb] octave-forge had acl change status
Message-ID: <20090103125603.99E3F2084B6@bastion.fedora.phx.redhat.com>

qspencer has set the watchcommits acl on octave-forge (Fedora devel) to Approved for rakesh

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



From pkgdb at fedoraproject.org  Sat Jan  3 19:56:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Jan 2009 19:56:54 +0000
Subject: [pkgdb] octave-forge had acl change status
Message-ID: <20090103125644.159F220873C@bastion.fedora.phx.redhat.com>

qspencer has set the commit acl on octave-forge (Fedora devel) to Approved for rakesh

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



From pkgdb at fedoraproject.org  Sat Jan  3 19:56:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Jan 2009 19:56:58 +0000
Subject: [pkgdb] octave-forge had acl change status
Message-ID: <20090103125649.08D2E208D4F@bastion.fedora.phx.redhat.com>

qspencer has set the approveacls acl on octave-forge (Fedora devel) to Approved for rakesh

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



From pkgdb at fedoraproject.org  Sat Jan  3 19:57:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Jan 2009 19:57:04 +0000
Subject: [pkgdb] octave-forge ownership updated
Message-ID: <20090103125653.F14D5208D53@bastion.fedora.phx.redhat.com>

Package octave-forge in Fedora devel was orphaned by qspencer

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



From pkgdb at fedoraproject.org  Sat Jan  3 19:58:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Jan 2009 19:58:18 +0000
Subject: [pkgdb] octave-forge ownership updated
Message-ID: <20090103125807.E2B1D20873C@bastion.fedora.phx.redhat.com>

Package octave-forge in Fedora 9 was orphaned by qspencer

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



From pkgdb at fedoraproject.org  Sat Jan  3 19:58:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Jan 2009 19:58:23 +0000
Subject: [pkgdb] octave-forge ownership updated
Message-ID: <20090103125813.1CDF0208D4E@bastion.fedora.phx.redhat.com>

Package octave-forge in Fedora 10 was orphaned by qspencer

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



From pkgdb at fedoraproject.org  Sat Jan  3 22:38:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Jan 2009 22:38:07 +0000
Subject: [pkgdb] maatkit: slankes has requested watchbugzilla
Message-ID: <20090103153758.119C420873C@bastion.fedora.phx.redhat.com>

slankes has requested the watchbugzilla acl on maatkit (Fedora devel)

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



From pkgdb at fedoraproject.org  Sat Jan  3 22:38:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Jan 2009 22:38:14 +0000
Subject: [pkgdb] maatkit: slankes has requested watchcommits
Message-ID: <20090103153805.328CF208D4E@bastion.fedora.phx.redhat.com>

slankes has requested the watchcommits acl on maatkit (Fedora devel)

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



From pkgdb at fedoraproject.org  Sat Jan  3 22:38:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Jan 2009 22:38:17 +0000
Subject: [pkgdb] maatkit: slankes has requested commit
Message-ID: <20090103153807.B8066208D51@bastion.fedora.phx.redhat.com>

slankes has requested the commit acl on maatkit (Fedora devel)

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



From pkgdb at fedoraproject.org  Sat Jan  3 22:38:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Jan 2009 22:38:25 +0000
Subject: [pkgdb] maatkit: slankes has requested watchbugzilla
Message-ID: <20090103153818.9985E208D53@bastion.fedora.phx.redhat.com>

slankes has requested the watchbugzilla acl on maatkit (Fedora 10)

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



From pkgdb at fedoraproject.org  Sat Jan  3 22:38:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Jan 2009 22:38:26 +0000
Subject: [pkgdb] maatkit: slankes has requested commit
Message-ID: <20090103153820.81E30208D58@bastion.fedora.phx.redhat.com>

slankes has requested the commit acl on maatkit (Fedora 10)

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



From pkgdb at fedoraproject.org  Sat Jan  3 22:38:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Jan 2009 22:38:26 +0000
Subject: [pkgdb] maatkit: slankes has requested watchcommits
Message-ID: <20090103153824.ECAFE208D7D@bastion.fedora.phx.redhat.com>

slankes has requested the watchcommits acl on maatkit (Fedora 10)

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



From pkgdb at fedoraproject.org  Sat Jan  3 22:38:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Jan 2009 22:38:51 +0000
Subject: [pkgdb] maatkit: slankes has requested watchbugzilla
Message-ID: <20090103153846.90EEB208D60@bastion.fedora.phx.redhat.com>

slankes has requested the watchbugzilla acl on maatkit (Fedora 9)

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



From pkgdb at fedoraproject.org  Sat Jan  3 22:38:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Jan 2009 22:38:56 +0000
Subject: [pkgdb] maatkit: slankes has requested watchcommits
Message-ID: <20090103153853.E19C7208D53@bastion.fedora.phx.redhat.com>

slankes has requested the watchcommits acl on maatkit (Fedora 9)

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



From pkgdb at fedoraproject.org  Sat Jan  3 22:39:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 03 Jan 2009 22:39:56 +0000
Subject: [pkgdb] maatkit: slankes has requested commit
Message-ID: <20090103153953.BD93A208D2B@bastion.fedora.phx.redhat.com>

slankes has requested the commit acl on maatkit (Fedora 9)

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



From bpepple at fedoraproject.org  Sun Jan  4 00:45:11 2009
From: bpepple at fedoraproject.org (Brian Pepple)
Date: Sun,  4 Jan 2009 00:45:11 +0000 (UTC)
Subject: rpms/nautilus-sound-converter/devel .cvsignore, 1.3,
	1.4 nautilus-sound-converter.spec, 1.4, 1.5 sources, 1.3,
	1.4 nsc-0.7.0-oga.patch, 1.2, NONE
Message-ID: <20090104004511.7448B7011F@cvs1.fedora.phx.redhat.com>

Author: bpepple

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

Modified Files:
	.cvsignore nautilus-sound-converter.spec sources 
Removed Files:
	nsc-0.7.0-oga.patch 
Log Message:
* Sat Jan  3 2009 Brian Pepple <bpepple at fedoraproject.org> - 1.0.0-1
- Update to 1.0.0.
- Drop oga patch.  Fixed upstream.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/nautilus-sound-converter/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	27 Oct 2008 18:25:30 -0000	1.3
+++ .cvsignore	4 Jan 2009 00:44:38 -0000	1.4
@@ -1 +1 @@
-nautilus-sound-converter-0.7.0.tar.bz2
+nautilus-sound-converter-1.0.0.tar.bz2


Index: nautilus-sound-converter.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nautilus-sound-converter/devel/nautilus-sound-converter.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- nautilus-sound-converter.spec	28 Nov 2008 21:36:15 -0000	1.4
+++ nautilus-sound-converter.spec	4 Jan 2009 00:44:38 -0000	1.5
@@ -1,13 +1,12 @@
 Name:           nautilus-sound-converter
-Version:        0.7.0
-Release:        3%{?dist}
+Version:        1.0.0
+Release:        1%{?dist}
 Summary:        Nautilus extension to convert audio files
 
 Group:          User Interface/Desktops
 License:        GPLv2+
 URL:            http://code.google.com/p/nautilus-sound-converter/
 Source0:        http://%{name}.googlecode.com/files/%{name}-%{version}.tar.bz2
-Patch0:		nsc-0.7.0-oga.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  nautilus-devel >= 2.12.0
@@ -15,7 +14,7 @@
 BuildRequires:  gstreamer-devel >= 0.10.19
 BuildRequires:  gstreamer-plugins-base-devel
 BuildRequires:  gnome-media-devel
-BuildRequires:  gettext
+BuildRequires:	intltool
 BuildRequires:  perl(XML::Parser)
 
 # The bare minimum plugins needed.
@@ -34,7 +33,7 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .oga
+
 
 %build
 %configure --disable-static
@@ -59,6 +58,10 @@
 
 
 %changelog
+* Sat Jan  3 2009 Brian Pepple <bpepple at fedoraproject.org> - 1.0.0-1
+- Update to 1.0.0.
+- Drop oga patch.  Fixed upstream.
+
 * Fri Nov 28 2008 Brian Pepple <bpepple at fedoraproject.org> - 0.7.0-3
 - Fix typo in patch.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nautilus-sound-converter/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	27 Oct 2008 18:25:30 -0000	1.3
+++ sources	4 Jan 2009 00:44:39 -0000	1.4
@@ -1 +1 @@
-fc612e5c64b50b78605329b7bee4bbb7  nautilus-sound-converter-0.7.0.tar.bz2
+038fac2acc5a9aa20c8d40b1e6d4f57a  nautilus-sound-converter-1.0.0.tar.bz2


--- nsc-0.7.0-oga.patch DELETED ---



From bpepple at fedoraproject.org  Sun Jan  4 00:52:30 2009
From: bpepple at fedoraproject.org (Brian Pepple)
Date: Sun,  4 Jan 2009 00:52:30 +0000 (UTC)
Subject: rpms/nautilus-sound-converter/F-10 .cvsignore, 1.3,
	1.4 nautilus-sound-converter.spec, 1.4, 1.5 sources, 1.3,
	1.4 nsc-0.7.0-oga.patch, 1.2, NONE
Message-ID: <20090104005230.92A2B7011F@cvs1.fedora.phx.redhat.com>

Author: bpepple

Update of /cvs/pkgs/rpms/nautilus-sound-converter/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11376

Modified Files:
	.cvsignore nautilus-sound-converter.spec sources 
Removed Files:
	nsc-0.7.0-oga.patch 
Log Message:
* Sat Jan  3 2009 Brian Pepple <bpepple at fedoraproject.org> - 1.0.0-1
- Update to 1.0.0.
- Drop oga patch.  Fixed upstream.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/nautilus-sound-converter/F-10/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	27 Oct 2008 18:25:30 -0000	1.3
+++ .cvsignore	4 Jan 2009 00:52:00 -0000	1.4
@@ -1 +1 @@
-nautilus-sound-converter-0.7.0.tar.bz2
+nautilus-sound-converter-1.0.0.tar.bz2


Index: nautilus-sound-converter.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nautilus-sound-converter/F-10/nautilus-sound-converter.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- nautilus-sound-converter.spec	28 Nov 2008 21:52:48 -0000	1.4
+++ nautilus-sound-converter.spec	4 Jan 2009 00:52:00 -0000	1.5
@@ -1,13 +1,12 @@
 Name:           nautilus-sound-converter
-Version:        0.7.0
-Release:        3%{?dist}
+Version:        1.0.0
+Release:        1%{?dist}
 Summary:        Nautilus extension to convert audio files
 
 Group:          User Interface/Desktops
 License:        GPLv2+
 URL:            http://code.google.com/p/nautilus-sound-converter/
 Source0:        http://%{name}.googlecode.com/files/%{name}-%{version}.tar.bz2
-Patch0:		nsc-0.7.0-oga.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  nautilus-devel >= 2.12.0
@@ -15,7 +14,7 @@
 BuildRequires:  gstreamer-devel >= 0.10.19
 BuildRequires:  gstreamer-plugins-base-devel
 BuildRequires:  gnome-media-devel
-BuildRequires:  gettext
+BuildRequires:	intltool
 BuildRequires:  perl(XML::Parser)
 
 # The bare minimum plugins needed.
@@ -34,7 +33,7 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .oga
+
 
 %build
 %configure --disable-static
@@ -59,6 +58,10 @@
 
 
 %changelog
+* Sat Jan  3 2009 Brian Pepple <bpepple at fedoraproject.org> - 1.0.0-1
+- Update to 1.0.0.
+- Drop oga patch.  Fixed upstream.
+
 * Fri Nov 28 2008 Brian Pepple <bpepple at fedoraproject.org> - 0.7.0-3
 - Fix typo in patch.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nautilus-sound-converter/F-10/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	27 Oct 2008 18:25:30 -0000	1.3
+++ sources	4 Jan 2009 00:52:00 -0000	1.4
@@ -1 +1 @@
-fc612e5c64b50b78605329b7bee4bbb7  nautilus-sound-converter-0.7.0.tar.bz2
+038fac2acc5a9aa20c8d40b1e6d4f57a  nautilus-sound-converter-1.0.0.tar.bz2


--- nsc-0.7.0-oga.patch DELETED ---



From davej at fedoraproject.org  Sun Jan  4 01:51:04 2009
From: davej at fedoraproject.org (Dave Jones)
Date: Sun,  4 Jan 2009 01:51:04 +0000 (UTC)
Subject: rpms/kernel/devel patch-2.6.28-git6.bz2.sign, NONE, 1.1 .cvsignore, 
	1.979, 1.980 config-generic, 1.209, 1.210 config-x86_64-generic,
	1.56, 1.57 kernel.spec, 1.1190, 1.1191 sources, 1.941,
	1.942 upstream, 1.853, 1.854 patch-2.6.28-git5.bz2.sign, 1.1, NONE
Message-ID: <20090104015104.F0E127011F@cvs1.fedora.phx.redhat.com>

Author: davej

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

Modified Files:
	.cvsignore config-generic config-x86_64-generic kernel.spec 
	sources upstream 
Added Files:
	patch-2.6.28-git6.bz2.sign 
Removed Files:
	patch-2.6.28-git5.bz2.sign 
Log Message:
2.6.28-git6


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

iD8DBQBJX/0MyGugalF9Dw4RAvtZAJ4ucRE3HJaWuT65fa7kgq1VVLBjAgCgg9Dm
ikO+q26PbgXH7Dt7AHyS9Us=
=z7br
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.979
retrieving revision 1.980
diff -u -r1.979 -r1.980
--- .cvsignore	3 Jan 2009 01:45:40 -0000	1.979
+++ .cvsignore	4 Jan 2009 01:50:32 -0000	1.980
@@ -4,4 +4,4 @@
 temp-*
 kernel-2.6.28
 linux-2.6.28.tar.bz2
-patch-2.6.28-git5.bz2
+patch-2.6.28-git6.bz2


Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-generic,v
retrieving revision 1.209
retrieving revision 1.210
diff -u -r1.209 -r1.210
--- config-generic	3 Jan 2009 01:45:40 -0000	1.209
+++ config-generic	4 Jan 2009 01:50:32 -0000	1.210
@@ -2071,10 +2071,12 @@
 CONFIG_IT8712F_WDT=m
 # CONFIG_SBC8360_WDT is not set
 # CONFIG_SBC7240_WDT is not set
+CONFIG_SMSC_SCH311X_WDT=m
 CONFIG_W83977F_WDT=m
 CONFIG_PCIPCWATCHDOG=m
 CONFIG_USBPCWATCHDOG=m
 # CONFIG_SBC_EPX_C3_WATCHDOG is not set
+CONFIG_WM8350_WATCHDOG=m
 
 CONFIG_HW_RANDOM=y
 # CONFIG_NVRAM is not set
@@ -3547,6 +3549,7 @@
 # CONFIG_RADIO_SF16FMR2 is not set
 # CONFIG_RADIO_TERRATEC is not set
 # CONFIG_RADIO_TRUST is not set
+# CONFIG_RADIO_TEA5764 is not set
 # CONFIG_RADIO_TYPHOON is not set
 # CONFIG_RADIO_ZOLTRIX is not set
 
@@ -3847,3 +3850,4 @@
 CONFIG_DVB_DYNAMIC_MINORS=y
 CONFIG_DVB_LGDT3304=m
 CONFIG_DVB_S921=m
+


Index: config-x86_64-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-x86_64-generic,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- config-x86_64-generic	31 Dec 2008 16:12:35 -0000	1.56
+++ config-x86_64-generic	4 Jan 2009 01:50:32 -0000	1.57
@@ -299,6 +299,7 @@
 
 # CONFIG_MEMTEST is not set
 CONFIG_AMD_IOMMU=y
+CONFIG_AMD_IOMMU_STATS=y
 # CONFIG_MAXSMP is not set
 CONFIG_MTRR_SANITIZER=y
 CONFIG_MTRR_SANITIZER_ENABLE_DEFAULT=0


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1190
retrieving revision 1.1191
diff -u -r1.1190 -r1.1191
--- kernel.spec	3 Jan 2009 01:45:40 -0000	1.1190
+++ kernel.spec	4 Jan 2009 01:50:33 -0000	1.1191
@@ -57,7 +57,7 @@
 # The rc snapshot level
 %define rcrev 0
 # The git snapshot level
-%define gitrev 5
+%define gitrev 6
 # Set rpm version accordingly
 %define rpmversion 2.6.%{upstream_sublevel}
 %endif
@@ -1757,6 +1757,9 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Sat Jan 03 2009 Dave Jones <davej at redhat.com>
+- 2.6.28-git6
+
 * Fri Jan 02 2009 Dave Jones <davej at redhat.com>
 - 2.6.28-git5
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v
retrieving revision 1.941
retrieving revision 1.942
diff -u -r1.941 -r1.942
--- sources	3 Jan 2009 01:45:40 -0000	1.941
+++ sources	4 Jan 2009 01:50:33 -0000	1.942
@@ -1,2 +1,2 @@
 d351e44709c9810b85e29b877f50968a  linux-2.6.28.tar.bz2
-86dc32de1bc11f13bfbac3e2225cc6e0  patch-2.6.28-git5.bz2
+802d915efc572bc48210070bae26534c  patch-2.6.28-git6.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v
retrieving revision 1.853
retrieving revision 1.854
diff -u -r1.853 -r1.854
--- upstream	3 Jan 2009 01:45:41 -0000	1.853
+++ upstream	4 Jan 2009 01:50:33 -0000	1.854
@@ -1,2 +1,2 @@
 linux-2.6.28.tar.bz2
-patch-2.6.28-git5.bz2
+patch-2.6.28-git6.bz2


--- patch-2.6.28-git5.bz2.sign DELETED ---



From jspaleta at fedoraproject.org  Sun Jan  4 02:19:03 2009
From: jspaleta at fedoraproject.org (Jef Spaleta)
Date: Sun,  4 Jan 2009 02:19:03 +0000 (UTC)
Subject: rpms/safekeep/devel .cvsignore, 1.3, 1.4 safekeep.spec, 1.2,
	1.3 sources, 1.3, 1.4
Message-ID: <20090104021903.2F4947011F@cvs1.fedora.phx.redhat.com>

Author: jspaleta

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

Modified Files:
	.cvsignore safekeep.spec sources 
Log Message:
* Sat Jan 3 2009 Jef Spaleta <jspaleta AT fedoraproject DOT org> 1.0.5-1
  - Latest upstream release 



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/safekeep/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	1 Jul 2008 17:49:03 -0000	1.3
+++ .cvsignore	4 Jan 2009 02:18:32 -0000	1.4
@@ -1 +1 @@
-safekeep-1.0.4.tar.gz
+safekeep-1.0.5.tar.gz


Index: safekeep.spec
===================================================================
RCS file: /cvs/pkgs/rpms/safekeep/devel/safekeep.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- safekeep.spec	1 Jul 2008 17:49:03 -0000	1.2
+++ safekeep.spec	4 Jan 2009 02:18:32 -0000	1.3
@@ -1,5 +1,5 @@
 %define name    safekeep
-%define version 1.0.4
+%define version 1.0.5
 %define release 1
 %define homedir %{_localstatedir}/lib/%{name}
 
@@ -17,6 +17,7 @@
 
 BuildArch:      noarch
 BuildRequires:  xmlto, asciidoc > 6.0.3
+
 %description
 SafeKeep is a client/server backup system which enhances the
 power of rdiff-backup with simple, centralized configuration.
@@ -118,6 +119,9 @@
 %doc sample.backup
 
 %changelog
+* Sat Jan 3 2009 Jef Spaleta <jspaleta AT fedoraproject DOT org> 1.0.5-1
+  - Latest upstream release 
+
 * Tue Jul 1 2008 Jef Spaleta <jspaleta AT fedoraproject DOT org> 1.0.4-1
   - Latest upstream release 
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/safekeep/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	1 Jul 2008 17:49:03 -0000	1.3
+++ sources	4 Jan 2009 02:18:32 -0000	1.4
@@ -1 +1 @@
-af7f44e0cf15f9f05a9a33635e085066  safekeep-1.0.4.tar.gz
+fbcec8c5dfb8a2956b317744942ffbf7  safekeep-1.0.5.tar.gz



From mclasen at fedoraproject.org  Sun Jan  4 02:50:03 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Sun,  4 Jan 2009 02:50:03 +0000 (UTC)
Subject: rpms/gtk2/F-10 wmspec-recheck.patch,NONE,1.1 gtk2.spec,1.338,1.339
Message-ID: <20090104025003.70CD57011F@cvs1.fedora.phx.redhat.com>

Author: mclasen

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

Modified Files:
	gtk2.spec 
Added Files:
	wmspec-recheck.patch 
Log Message:
recheck _NET_SUPPORTING_WM_CHECK every now and then


wmspec-recheck.patch:

--- NEW FILE wmspec-recheck.patch ---
Index: gdk/x11/gdkscreen-x11.h
===================================================================
--- gdk/x11/gdkscreen-x11.h	(revision 22048)
+++ gdk/x11/gdkscreen-x11.h	(working copy)
@@ -57,6 +57,7 @@
   GdkWindow *root_window;
 
   /* Window manager */
+  long last_wmspec_check_time;
   Window wmspec_check_window;
   char *window_manager_name;
   /* TRUE if wmspec_check_window has changed since last
Index: gdk/x11/gdkevents-x11.c
===================================================================
--- gdk/x11/gdkevents-x11.c	(revision 22048)
+++ gdk/x11/gdkevents-x11.c	(working copy)
@@ -2614,23 +2614,20 @@
   gulong bytes_after;
   guchar *data;
   Window *xwindow;
+  GTimeVal tv;
   
-  /* This function is very slow on every call if you are not running a
-   * spec-supporting WM. For now not optimized, because it isn't in
-   * any critical code paths, but if you used it somewhere that had to
-   * be fast you want to avoid "GTK is slow with old WMs" complaints.
-   * Probably at that point the function should be changed to query
-   * _NET_SUPPORTING_WM_CHECK only once every 10 seconds or something.
-   */
-  
   screen_x11 = GDK_SCREEN_X11 (screen);
   display = screen_x11->display;
 
   g_return_if_fail (GDK_DISPLAY_X11 (display)->trusted_client);
   
-  if (screen_x11->wmspec_check_window != None)
-    return; /* already have it */
-  
+  g_get_current_time (&tv);
+      
+  if (ABS  (tv.tv_sec - screen_x11->last_wmspec_check_time) < 15)
+    return; /* we've checked recently */
+
+  screen_x11->last_wmspec_check_time = tv.tv_sec;
+
   data = NULL;
   XGetWindowProperty (GDK_DISPLAY_XDISPLAY (display), screen_x11->xroot_window,
 		      gdk_x11_get_xatom_by_name_for_display (display, "_NET_SUPPORTING_WM_CHECK"),
@@ -2646,6 +2643,12 @@
 
   xwindow = (Window *)data;
 
+  if (screen_x11->wmspec_check_window == *xwindow)
+    {
+      XFree (xwindow);
+      return;
+    }
+
   gdk_error_trap_push ();
   
   /* Find out if this WM goes away, so we can reset everything. */


Index: gtk2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtk2/F-10/gtk2.spec,v
retrieving revision 1.338
retrieving revision 1.339
diff -u -r1.338 -r1.339
--- gtk2.spec	12 Dec 2008 22:55:19 -0000	1.338
+++ gtk2.spec	4 Jan 2009 02:49:32 -0000	1.339
@@ -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,6 +32,8 @@
 Patch2: workaround.patch
 # from upstream
 Patch3: missing-compose-seqs.patch
+#
+Patch4: wmspec-recheck.patch
 
 BuildRequires: atk-devel >= %{atk_version}
 BuildRequires: pango-devel >= %{pango_version}
@@ -119,6 +121,7 @@
 %patch1 -p1 -b .set-invisible-char-to-bullet
 %patch2 -p1 -b .workaround
 %patch3 -p1 -b .missing-compose-seqs
+%patch4 -p0 -b .wmspec-recheck
 
 for i in config.guess config.sub ; do
   test -f %{_datadir}/libtool/$i && cp %{_datadir}/libtool/$i .
@@ -300,6 +303,9 @@
 %{_datadir}/gtk-2.0
 
 %changelog
+* Sat Jan  3 2009 Matthias Clasen <mclasen at redhat.com> - 2.14.5-4
+- Recheck _NET_SUPPORTING_WM_CHECK every now and then
+
 * Thu Nov 27 2008 Matthias Clasen <mclasen at redhat.com> - 2.14.5-3
 - Make dead keys work again
 



From konradm at fedoraproject.org  Sun Jan  4 03:30:38 2009
From: konradm at fedoraproject.org (Conrad Meyer)
Date: Sun,  4 Jan 2009 03:30:38 +0000 (UTC)
Subject: rpms/hello/devel hello.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090104033039.3331B7011F@cvs1.fedora.phx.redhat.com>

Author: konradm

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

Modified Files:
	.cvsignore sources 
Added Files:
	hello.spec import.log 
Log Message:
Import.



--- NEW FILE hello.spec ---
Name:           hello
Version:        2.4
Release:        1%{?dist}
Summary:        Prints a Familiar, Friendly Greeting
Group:          Development/Tools
# Parts of the documentation are under GFDL, BSD, and Public Domain
# *All* code is GPLv3+.
License:        GPLv3+ and GFDL and BSD and Public Domain
URL:            http://www.gnu.org/software/hello/
Source0:        http://ftp.gnu.org/gnu/hello/hello-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires: gettext
Requires(post): info
Requires(preun): info


%description
Hello prints a friendly greeting. It also serves as a sample GNU
package, showing practices that may be useful for GNU projects.


%prep
%setup -q


%build
%configure
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
rm -f $RPM_BUILD_ROOT%{_infodir}/dir
%find_lang hello


%check
cd tests
make check-TESTS


%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 -f hello.lang
%defattr(-,root,root,-)
%doc COPYING
%{_mandir}/man1/hello.1*
%{_bindir}/hello
%{_infodir}/hello.info*


%changelog
* Wed Dec 17 2008 Conrad Meyer <konrad at tylerc.org> - 2.4-1
- Initial package.


--- NEW FILE import.log ---
hello-2_4-1_fc9:HEAD:hello-2.4-1.fc9.src.rpm:1231039750


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hello/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	28 Dec 2008 19:02:51 -0000	1.1
+++ .cvsignore	4 Jan 2009 03:30:07 -0000	1.2
@@ -0,0 +1 @@
+hello-2.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hello/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	28 Dec 2008 19:02:51 -0000	1.1
+++ sources	4 Jan 2009 03:30:08 -0000	1.2
@@ -0,0 +1 @@
+1691faa758ca41c70b6da5501bdf230a  hello-2.4.tar.gz



From konradm at fedoraproject.org  Sun Jan  4 03:39:55 2009
From: konradm at fedoraproject.org (Conrad Meyer)
Date: Sun,  4 Jan 2009 03:39:55 +0000 (UTC)
Subject: rpms/python-cvxopt/devel import.log, NONE,
	1.1 python-cvxopt-1.1-use-system-suitesparse.diff, NONE,
	1.1 python-cvxopt-fixglpkinclude.patch, NONE,
	1.1 python-cvxopt.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <20090104033955.328EA7011F@cvs1.fedora.phx.redhat.com>

Author: konradm

Update of /cvs/pkgs/rpms/python-cvxopt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24299/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log python-cvxopt-1.1-use-system-suitesparse.diff 
	python-cvxopt-fixglpkinclude.patch python-cvxopt.spec 
Log Message:
Import.



--- NEW FILE import.log ---
python-cvxopt-1_1-4_fc9:HEAD:python-cvxopt-1.1-4.fc9.src.rpm:1231040084

python-cvxopt-1.1-use-system-suitesparse.diff:

--- NEW FILE python-cvxopt-1.1-use-system-suitesparse.diff ---
--- src/setup.py.orig	2008-12-08 23:49:39.000000000 -0800
+++ src/setup.py	2008-12-08 23:51:02.000000000 -0800
@@ -100,55 +100,32 @@
     library_dirs = [ ATLAS_LIB_DIR ],
     define_macros = MACROS,
     sources = ['C/lapack.c'] )
 
 umfpack = Extension('umfpack', 
-    include_dirs = [ 'C/SuiteSparse/UMFPACK/Include',
-        'C/SuiteSparse/AMD/Include', 'C/SuiteSparse/AMD/Source', 
-        'C/SuiteSparse/UFconfig' ],
+    include_dirs = [ '/usr/include/suitesparse' ],
     library_dirs = [ ATLAS_LIB_DIR ],
     define_macros = MACROS,
-    libraries = [ 'blas', 'lapack'],
-    sources = [ 'C/umfpack.c',
-        'C/SuiteSparse/UMFPACK/Source/umfpack_global.c',
-        'C/SuiteSparse/UMFPACK/Source/umfpack_tictoc.c' ] +
-        ['C/SuiteSparse_cvxopt_extra/umfpack/' + s for s in
-            listdir('C/SuiteSparse_cvxopt_extra/umfpack')])
+    libraries = [ 'blas', 'lapack', 'umfpack' ],
+    sources = [ 'C/umfpack.c' ])
 
 # Build for int or long? 
 import sys
 if sys.maxint > 2**31: MACROS += [('DLONG','')]
 
 cholmod = Extension('cholmod',
     library_dirs = [ ATLAS_LIB_DIR ],
-    libraries = ['lapack', 'blas'],
-    include_dirs = [ 'C/SuiteSparse/CHOLMOD/Include', 
-        'C/SuiteSparse/COLAMD', 'C/SuiteSparse/AMD/Include', 
-        'C/SuiteSparse/UFconfig', 'C/SuiteSparse/COLAMD/Include' ],
+    libraries = ['lapack', 'blas', 'cholmod' ],
+    include_dirs = [ '/usr/include/suitesparse' ],
     define_macros = MACROS + [('NPARTITION', '1')],
-    sources = [ 'C/cholmod.c' ] +
-        ['C/SuiteSparse/AMD/Source/' + s for s in ['amd_global.c',
-            'amd_postorder.c', 'amd_post_tree.c', 'amd_2.c']] +
-        ['C/SuiteSparse/COLAMD/Source/' + s for s in ['colamd.c',
-            'colamd_global.c']] +
-        ['C/SuiteSparse/CHOLMOD/Core/' + s for s in
-            listdir('C/SuiteSparse/CHOLMOD/Core') if s[-2:] == '.c' and
-            s[0] == 'c'] +
-        ['C/SuiteSparse/CHOLMOD/Cholesky/' + s for s in
-            listdir('C/SuiteSparse/CHOLMOD/Cholesky') if s[-2:] == '.c'
-            and s[0] == 'c'] +
-        ['C/SuiteSparse/CHOLMOD/Check/cholmod_check.c'] +
-        ['C/SuiteSparse/CHOLMOD/Supernodal/' + s for s in
-            listdir('C/SuiteSparse/CHOLMOD/Supernodal') if 
-            s[-2:] == '.c' and s[0] == 'c'] )
+    sources = [ 'C/cholmod.c' ])
 
 amd = Extension('amd', 
-    include_dirs = [ 'C/SuiteSparse/AMD/Include', 
-        'C/SuiteSparse/UFconfig' ],
+    include_dirs = [ '/usr/include/suitesparse' ],
     define_macros = MACROS,
-    sources = [ 'C/amd.c' ] + [ 'C/SuiteSparse/AMD/Source/' + s for s in
-        listdir('C/SuiteSparse/AMD/Source') if s[-2:] == '.c' ])
+    libraries = [ 'amd' ],
+    sources = [ 'C/amd.c' ])
 
 misc_solvers = Extension('misc_solvers', libraries = ['lapack', 'blas'],
     library_dirs = [ ATLAS_LIB_DIR ],
     define_macros = MACROS,
     sources = ['C/misc_solvers.c'] )

python-cvxopt-fixglpkinclude.patch:

--- NEW FILE python-cvxopt-fixglpkinclude.patch ---
--- src/C/glpk.c.orig	2008-10-13 00:39:55.000000000 -0700
+++ src/C/glpk.c	2008-10-13 00:40:17.000000000 -0700
@@ -17,11 +17,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "cvxopt.h"
 #include "misc.h"
-#include "glpk.h"
+#include <glpk/glpk.h>
 
 PyDoc_STRVAR(glpk__doc__,
     "Interface to the simplex algorithm in GLPK.\n\n" 
     "The GLPK control parameters have the default values listed in \n"
     "the GLPK documentation, except for 'LPX_K_PRESOL', which is set\n"


--- NEW FILE python-cvxopt.spec ---
%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}

Name:           python-cvxopt
Version:        1.1
Release:        4%{?dist}
Summary:        A Python Package for Convex Optimization
Group:          Development/Languages
License:        GPLv3+
URL:            http://abel.ee.ucla.edu/cvxopt
Source0:        http://abel.ee.ucla.edu/src/cvxopt-%{version}.tar.gz
# Will submit patch0 to upstream ASAP
Patch0:         python-cvxopt-fixglpkinclude.patch
Patch1:         python-cvxopt-1.1-use-system-suitesparse.diff
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  atlas-devel
BuildRequires:  blas-devel
BuildRequires:  fftw-devel
BuildRequires:  glpk-devel
BuildRequires:  gsl-devel
BuildRequires:  python-devel
BuildRequires:  python-setuptools-devel
BuildRequires:  suitesparse-devel
BuildRequires:  tetex-tex4ht


%description
CVXOPT is a free software package for convex optimization based on
the Python programming language. Its main purpose is to make the
development of software for convex optimization applications
straightforward by building on Python's extensive standard library and
on the strengths of Python as a high-level programming language.


%package        examples
Summary:        Examples of using %{name}
Group:          Development/Languages
Requires:       %{name} = %{version}-%{release}
Requires:       python-matplotlib


%description    examples
Example use of %{name}.


%prep
%setup -q -n cvxopt-%{version}
%patch0

# Configure all optional modules (except for DSDP which isn't in Fedora)
sed -i -e "s#^ATLAS_LIB_DIR =.*#ATLAS_LIB_DIR = '%{_libdir}/atlas'#" src/setup.py
sed -i -e "s#^BUILD_GSL =.*#BUILD_GSL = 1#" src/setup.py
sed -i -e "s#^GSL_LIB_DIR =.*#GSL_LIB_DIR = '%{_libdir}'#" src/setup.py
sed -i -e "s#^BUILD_FFTW =.*#BUILD_FFTW = 1#" src/setup.py
sed -i -e "s#^FFTW_LIB_DIR =.*#FFTW_LIB_DIR = '%{_libdir}'#" src/setup.py
sed -i -e "s#^BUILD_GLPK =.*#BUILD_GLPK = 1#" src/setup.py
sed -i -e "s#^GLPK_LIB_DIR =.*#GLPK_LIB_DIR = '%{_libdir}'#" src/setup.py
sed -i -e "s#^DSDP_LIB_DIR =.*#DSDP_LIB_DIR = '%{_libdir}'#" src/setup.py

pushd doc
  make clean
  make -B html
popd

# Remove internal copy of system library
rm -rf src/C/SuiteSparse*/

cp src/setup.py{,.orig}
%patch1


%build
cd src
CFLAGS="$RPM_OPT_FLAGS" %{__python} -c 'import setuptools; execfile("setup.py")' build


%install
rm -rf $RPM_BUILD_ROOT
pushd src
  %{__python} -c 'import setuptools; execfile("setup.py")' install --skip-build --root $RPM_BUILD_ROOT
popd

mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}
cp -R examples $RPM_BUILD_ROOT%{_datadir}/%{name}/

 
%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc LICENSE doc/html/
%{python_sitearch}/*egg-info
%{python_sitearch}/cvxopt

%files examples
%defattr(-,root,root,-)
%{_datadir}/%{name}


%changelog
* Mon Dec 8 2008 Conrad Meyer <konrad at tylerc.org> - 1.1-4
- Add BR on suitesparse-devel.
- Migrate examples to subpackage.

* Mon Dec 8 2008 Conrad Meyer <konrad at tylerc.org> - 1.1-3
- Remove SuiteSparse (copy of system library).

* Mon Dec 8 2008 Conrad Meyer <konrad at tylerc.org> - 1.1-2
- Move examples to datadir/name.
- Include html documentation.
- Package as a proper python egg.

* Mon Dec 8 2008 Conrad Meyer <konrad at tylerc.org> - 1.1-1
- Bump to 1.1.

* Mon Oct 13 2008 Conrad Meyer <konrad at tylerc.org> - 1.0-1
- Initial package.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-cvxopt/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	28 Dec 2008 19:06:51 -0000	1.1
+++ .cvsignore	4 Jan 2009 03:39:24 -0000	1.2
@@ -0,0 +1 @@
+cvxopt-1.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-cvxopt/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	28 Dec 2008 19:06:51 -0000	1.1
+++ sources	4 Jan 2009 03:39:24 -0000	1.2
@@ -0,0 +1 @@
+c56def864966a4e168474bb1c00f5808  cvxopt-1.1.tar.gz



From konradm at fedoraproject.org  Sun Jan  4 03:40:00 2009
From: konradm at fedoraproject.org (Conrad Meyer)
Date: Sun,  4 Jan 2009 03:40:00 +0000 (UTC)
Subject: rpms/hello/F-10 hello.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 
	1.1, 1.2
Message-ID: <20090104034000.3884E7011F@cvs1.fedora.phx.redhat.com>

Author: konradm

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

Modified Files:
	.cvsignore sources 
Added Files:
	hello.spec 
Log Message:
Import.


--- NEW FILE hello.spec ---
Name:           hello
Version:        2.4
Release:        1%{?dist}
Summary:        Prints a Familiar, Friendly Greeting
Group:          Development/Tools
# Parts of the documentation are under GFDL, BSD, and Public Domain
# *All* code is GPLv3+.
License:        GPLv3+ and GFDL and BSD and Public Domain
URL:            http://www.gnu.org/software/hello/
Source0:        http://ftp.gnu.org/gnu/hello/hello-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires: gettext
Requires(post): info
Requires(preun): info


%description
Hello prints a friendly greeting. It also serves as a sample GNU
package, showing practices that may be useful for GNU projects.


%prep
%setup -q


%build
%configure
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
rm -f $RPM_BUILD_ROOT%{_infodir}/dir
%find_lang hello


%check
cd tests
make check-TESTS


%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 -f hello.lang
%defattr(-,root,root,-)
%doc COPYING
%{_mandir}/man1/hello.1*
%{_bindir}/hello
%{_infodir}/hello.info*


%changelog
* Wed Dec 17 2008 Conrad Meyer <konrad at tylerc.org> - 2.4-1
- Initial package.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hello/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	28 Dec 2008 19:02:51 -0000	1.1
+++ .cvsignore	4 Jan 2009 03:39:29 -0000	1.2
@@ -0,0 +1 @@
+hello-2.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hello/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	28 Dec 2008 19:02:51 -0000	1.1
+++ sources	4 Jan 2009 03:39:29 -0000	1.2
@@ -0,0 +1 @@
+1691faa758ca41c70b6da5501bdf230a  hello-2.4.tar.gz



From konradm at fedoraproject.org  Sun Jan  4 03:44:42 2009
From: konradm at fedoraproject.org (Conrad Meyer)
Date: Sun,  4 Jan 2009 03:44:42 +0000 (UTC)
Subject: rpms/hello/F-9 hello.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <20090104034442.7402F7011F@cvs1.fedora.phx.redhat.com>

Author: konradm

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

Modified Files:
	.cvsignore sources 
Added Files:
	hello.spec 
Log Message:
Import.


--- NEW FILE hello.spec ---
Name:           hello
Version:        2.4
Release:        1%{?dist}
Summary:        Prints a Familiar, Friendly Greeting
Group:          Development/Tools
# Parts of the documentation are under GFDL, BSD, and Public Domain
# *All* code is GPLv3+.
License:        GPLv3+ and GFDL and BSD and Public Domain
URL:            http://www.gnu.org/software/hello/
Source0:        http://ftp.gnu.org/gnu/hello/hello-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires: gettext
Requires(post): info
Requires(preun): info


%description
Hello prints a friendly greeting. It also serves as a sample GNU
package, showing practices that may be useful for GNU projects.


%prep
%setup -q


%build
%configure
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
rm -f $RPM_BUILD_ROOT%{_infodir}/dir
%find_lang hello


%check
cd tests
make check-TESTS


%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 -f hello.lang
%defattr(-,root,root,-)
%doc COPYING
%{_mandir}/man1/hello.1*
%{_bindir}/hello
%{_infodir}/hello.info*


%changelog
* Wed Dec 17 2008 Conrad Meyer <konrad at tylerc.org> - 2.4-1
- Initial package.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hello/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	28 Dec 2008 19:02:51 -0000	1.1
+++ .cvsignore	4 Jan 2009 03:44:11 -0000	1.2
@@ -0,0 +1 @@
+hello-2.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hello/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	28 Dec 2008 19:02:51 -0000	1.1
+++ sources	4 Jan 2009 03:44:11 -0000	1.2
@@ -0,0 +1 @@
+1691faa758ca41c70b6da5501bdf230a  hello-2.4.tar.gz



From huzaifas at fedoraproject.org  Sun Jan  4 03:49:10 2009
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Sun,  4 Jan 2009 03:49:10 +0000 (UTC)
Subject: rpms/dia/devel dia-0.96.1-plugins.patch, NONE, 1.1 dia.spec, 1.30,
	1.31
Message-ID: <20090104034910.CA11570140@cvs1.fedora.phx.redhat.com>

Author: huzaifas

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

Modified Files:
	dia.spec 
Added Files:
	dia-0.96.1-plugins.patch 
Log Message:
Change name of the patch

dia-0.96.1-plugins.patch:

--- NEW FILE dia-0.96.1-plugins.patch ---
diff -Naur dia-0.96.1.orig/lib/plug-ins.c dia-0.96.1/lib/plug-ins.c
--- dia-0.96.1.orig/lib/plug-ins.c	2007-01-07 03:58:26.000000000 +0530
+++ dia-0.96.1/lib/plug-ins.c	2009-01-03 20:57:33.000000000 +0530
@@ -52,9 +52,9 @@
 #  define USING_LIBTOOL 0
 #else
 /* this one should work on any platform where libtool is used to compile dia */
-#  define PLUG_IN_EXT ".la"
+#  define PLUG_IN_EXT ".so"
 #  define PLUG_IN_EXT_LEN 3
-#  define USING_LIBTOOL 1
+#  define USING_LIBTOOL 0
 #endif
 
 struct _PluginInfo {


Index: dia.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dia/devel/dia.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- dia.spec	3 Jan 2009 16:22:52 -0000	1.30
+++ dia.spec	4 Jan 2009 03:48:40 -0000	1.31
@@ -14,7 +14,7 @@
 Patch5:         dia-0.96.1-64bit.patch
 Patch6:         dia-0.96.1-desktop.patch
 Patch7:         dia-0.96.1-svg-export.patch
-Patch8:		dia-0.96.1-libtool.patch
+Patch8:		dia-0.96.1-plugins.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  libgnomeui-devel python-devel pygtk2-devel desktop-file-utils
 BuildRequires:  intltool docbook-utils docbook-style-dsssl docbook-style-xsl



From huzaifas at fedoraproject.org  Sun Jan  4 03:54:14 2009
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Sun,  4 Jan 2009 03:54:14 +0000 (UTC)
Subject: rpms/dia/devel dia-0.96.1-libtool.patch,1.1,NONE
Message-ID: <20090104035414.5397F7011F@cvs1.fedora.phx.redhat.com>

Author: huzaifas

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

Removed Files:
	dia-0.96.1-libtool.patch 
Log Message:
removed old patch


--- dia-0.96.1-libtool.patch DELETED ---



From jspaleta at fedoraproject.org  Sun Jan  4 04:03:34 2009
From: jspaleta at fedoraproject.org (Jef Spaleta)
Date: Sun,  4 Jan 2009 04:03:34 +0000 (UTC)
Subject: rpms/safekeep/F-10 safekeep.spec,1.2,1.3 sources,1.3,1.4
Message-ID: <20090104040334.2633D7011F@cvs1.fedora.phx.redhat.com>

Author: jspaleta

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

Modified Files:
	safekeep.spec sources 
Log Message:
* Sat Jan 3 2009 Jef Spaleta <jspaleta AT fedoraproject DOT org> 1.0.5-1
  - Latest upstream release 



Index: safekeep.spec
===================================================================
RCS file: /cvs/pkgs/rpms/safekeep/F-10/safekeep.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- safekeep.spec	1 Jul 2008 17:49:03 -0000	1.2
+++ safekeep.spec	4 Jan 2009 04:03:03 -0000	1.3
@@ -1,5 +1,5 @@
 %define name    safekeep
-%define version 1.0.4
+%define version 1.0.5
 %define release 1
 %define homedir %{_localstatedir}/lib/%{name}
 
@@ -17,6 +17,7 @@
 
 BuildArch:      noarch
 BuildRequires:  xmlto, asciidoc > 6.0.3
+
 %description
 SafeKeep is a client/server backup system which enhances the
 power of rdiff-backup with simple, centralized configuration.
@@ -118,6 +119,9 @@
 %doc sample.backup
 
 %changelog
+* Sat Jan 3 2009 Jef Spaleta <jspaleta AT fedoraproject DOT org> 1.0.5-1
+  - Latest upstream release 
+
 * Tue Jul 1 2008 Jef Spaleta <jspaleta AT fedoraproject DOT org> 1.0.4-1
   - Latest upstream release 
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/safekeep/F-10/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	1 Jul 2008 17:49:03 -0000	1.3
+++ sources	4 Jan 2009 04:03:03 -0000	1.4
@@ -1 +1 @@
-af7f44e0cf15f9f05a9a33635e085066  safekeep-1.0.4.tar.gz
+fbcec8c5dfb8a2956b317744942ffbf7  safekeep-1.0.5.tar.gz



From pkgdb at fedoraproject.org  Sun Jan  4 04:14:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 04 Jan 2009 04:14:21 +0000
Subject: [pkgdb] octave-forge ownership updated
Message-ID: <20090103211412.82FE020873C@bastion.fedora.phx.redhat.com>

Package octave-forge in Fedora devel is now owned by alexlan

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



From pkgdb at fedoraproject.org  Sun Jan  4 04:14:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 04 Jan 2009 04:14:39 +0000
Subject: [pkgdb] octave-forge ownership updated
Message-ID: <20090103211430.5BCE0208D2B@bastion.fedora.phx.redhat.com>

Package octave-forge in Fedora 9 is now owned by alexlan

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



From pkgdb at fedoraproject.org  Sun Jan  4 04:15:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 04 Jan 2009 04:15:29 +0000
Subject: [pkgdb] octave-forge ownership updated
Message-ID: <20090103211520.627C8208D2B@bastion.fedora.phx.redhat.com>

Package octave-forge in Fedora 10 is now owned by alexlan

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



From pkgdb at fedoraproject.org  Sun Jan  4 04:15:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 04 Jan 2009 04:15:40 +0000
Subject: [pkgdb] octave-forge had acl change status
Message-ID: <20090103211531.5CA6620873C@bastion.fedora.phx.redhat.com>

alexlan has set the watchcommits acl on octave-forge (Fedora 10) to Approved for rakesh

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



From jspaleta at fedoraproject.org  Sun Jan  4 04:16:24 2009
From: jspaleta at fedoraproject.org (Jef Spaleta)
Date: Sun,  4 Jan 2009 04:16:24 +0000 (UTC)
Subject: rpms/safekeep/F-9 safekeep.spec,1.1,1.2 sources,1.2,1.3
Message-ID: <20090104041624.3427A7011F@cvs1.fedora.phx.redhat.com>

Author: jspaleta

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

Modified Files:
	safekeep.spec sources 
Log Message:
* Sat Jan 3 2009 Jef Spaleta <jspaleta AT fedoraproject DOT org> 1.0.5-1
  - Latest upstream release 



Index: safekeep.spec
===================================================================
RCS file: /cvs/pkgs/rpms/safekeep/F-9/safekeep.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- safekeep.spec	22 Oct 2007 17:38:43 -0000	1.1
+++ safekeep.spec	4 Jan 2009 04:15:53 -0000	1.2
@@ -1,6 +1,6 @@
 %define name    safekeep
-%define version 1.0.3
-%define release 2
+%define version 1.0.5
+%define release 1
 %define homedir %{_localstatedir}/lib/%{name}
 
 Name:           %{name}
@@ -119,6 +119,12 @@
 %doc sample.backup
 
 %changelog
+* Sat Jan 3 2009 Jef Spaleta <jspaleta AT fedoraproject DOT org> 1.0.5-1
+  - Latest upstream release 
+
+* Tue Jul 1 2008 Jef Spaleta <jspaleta AT fedoraproject DOT org> 1.0.4-1
+  - Latest upstream release 
+
 * Fri Oct 19 2007 Jef Spaleta <jspaleta at gmail.com> 1.0.3-2
   - Added README.Fedora with explanation of client subpackaging.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/safekeep/F-9/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	22 Oct 2007 17:38:43 -0000	1.2
+++ sources	4 Jan 2009 04:15:53 -0000	1.3
@@ -1 +1 @@
-89d97ad80ac72b0202c9181459925e21  safekeep-1.0.3.tar.gz
+fbcec8c5dfb8a2956b317744942ffbf7  safekeep-1.0.5.tar.gz



From jspaleta at fedoraproject.org  Sun Jan  4 04:41:13 2009
From: jspaleta at fedoraproject.org (Jef Spaleta)
Date: Sun,  4 Jan 2009 04:41:13 +0000 (UTC)
Subject: rpms/scipy/F-10 scipy.spec,1.13,1.14 sources,1.5,1.6
Message-ID: <20090104044114.00E547011F@cvs1.fedora.phx.redhat.com>

Author: jspaleta

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

Modified Files:
	scipy.spec sources 
Log Message:
* Sat Jan 03 2009  Jef Spaleta <jspaleta at fedoraproject.org> - 0.7.0-0.1.b1.fc10
- Update to latest beta to fix bug 478435



Index: scipy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/scipy/F-10/scipy.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- scipy.spec	3 Oct 2008 18:22:16 -0000	1.13
+++ scipy.spec	4 Jan 2009 04:40:42 -0000	1.14
@@ -1,14 +1,14 @@
 %define python_sitearch %(%{__python} -c 'from distutils import sysconfig; print sysconfig.get_python_lib(1)')
-
+%define betaversion 0.7.0b1
 Summary: Scipy: Scientific Tools for Python
 Name: scipy
-Version: 0.6.0
-Release: 7%{?dist}
+Version: 0.7.0
+Release: 0.1.b1%{?dist}
 
 Group: Development/Libraries
 License: BSD and LGPLv2+
 Url: http://www.scipy.org
-Source0: http://prdownloads.sourceforge.net/scipy/%{name}-%{version}.tar.gz
+Source0: http://prdownloads.sourceforge.net/scipy/%{name}-%{betaversion}.tar.gz
 # Missing setup.py files which control the build of this module
 # These should be removed as soon as upstream pushes a release with this fixed
 Source1: stsci_image_setup.py
@@ -18,6 +18,7 @@
 
 BuildRequires: numpy, python-devel
 BuildRequires: fftw-devel, blas-devel, lapack-devel, ufsparse-devel
+BuildRequires: atlas-devel
 BuildRequires: gcc-gfortran, swig
 Requires: numpy, python
 
@@ -34,8 +35,8 @@
 leading scientists and engineers.
 
 
-%prep
-%setup -q
+%prep 
+%setup -q -n %{name}-%{betaversion}
 cat > site.cfg << EOF
 [amd]
 library_dirs = %{_libdir}
@@ -52,12 +53,12 @@
 cp %{SOURCE2} scipy/stsci/convolve/setup.py
 
 %build
-env CFLAGS="$RPM_OPT_FLAGS" ATLAS=%{_libdir} FFTW=%{_libdir} BLAS=%{_libdir} LAPACK=%{_libdir} python setup.py config_fc --fcompiler=gnu95 --noarch build
+env CFLAGS="$RPM_OPT_FLAGS" ATLAS=%{_libdir}/atlas FFTW=%{_libdir} BLAS=%{_libdir} LAPACK=%{_libdir} python setup.py config_fc --fcompiler=gnu95 --noarch build
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-env CFLAGS="$RPM_OPT_FLAGS" ATLAS=%{_libdir} FFTW=%{_libdir} BLAS=%{_libdir} LAPACK=%{_libdir} python setup.py install --root=$RPM_BUILD_ROOT
+env CFLAGS="$RPM_OPT_FLAGS" ATLAS=%{_libdir}/atlas FFTW=%{_libdir} BLAS=%{_libdir} LAPACK=%{_libdir} python setup.py install --root=$RPM_BUILD_ROOT
 
 
 %clean
@@ -73,6 +74,9 @@
 
 
 %changelog
+* Sat Jan 03 2009  Jef Spaleta <jspaleta at fedoraproject.org> - 0.7.0-0.1.b1.fc10
+- Update to latest beta to fix bug 478435
+
 * Fri Oct 03 2008 Jef Spaleta <jspaleta at fedoraproject.org> - 0.6.0-7
 - fix the stsci fix
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/scipy/F-10/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	3 Oct 2007 23:20:44 -0000	1.5
+++ sources	4 Jan 2009 04:40:42 -0000	1.6
@@ -1 +1 @@
-417adf3bfe03f4c23c9fb265018e545c  scipy-0.6.0.tar.gz
+a3a671f9beb5e7ea38b799e7b56fb1cc  scipy-0.7.0b1.tar.gz



From pkgdb at fedoraproject.org  Sun Jan  4 04:41:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 04 Jan 2009 04:41:20 +0000
Subject: [pkgdb] NetworkManager-vpnc: huzaifas has requested watchbugzilla
Message-ID: <20090103214111.4871920873E@bastion.fedora.phx.redhat.com>

huzaifas has requested the watchbugzilla acl on NetworkManager-vpnc (Fedora EPEL 5)

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



From pkgdb at fedoraproject.org  Sun Jan  4 04:41:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 04 Jan 2009 04:41:21 +0000
Subject: [pkgdb] NetworkManager-vpnc: huzaifas has requested watchcommits
Message-ID: <20090103214112.5709E208D4F@bastion.fedora.phx.redhat.com>

huzaifas has requested the watchcommits acl on NetworkManager-vpnc (Fedora EPEL 5)

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



From pkgdb at fedoraproject.org  Sun Jan  4 04:41:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 04 Jan 2009 04:41:21 +0000
Subject: [pkgdb] NetworkManager-vpnc: huzaifas has requested commit
Message-ID: <20090103214112.7FDFE208D52@bastion.fedora.phx.redhat.com>

huzaifas has requested the commit acl on NetworkManager-vpnc (Fedora EPEL 5)

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



From pkgdb at fedoraproject.org  Sun Jan  4 04:41:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 04 Jan 2009 04:41:21 +0000
Subject: [pkgdb] NetworkManager-vpnc: huzaifas has requested approveacls
Message-ID: <20090103214112.C14AD208D57@bastion.fedora.phx.redhat.com>

huzaifas has requested the approveacls acl on NetworkManager-vpnc (Fedora EPEL 5)

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



From pkgdb at fedoraproject.org  Sun Jan  4 04:43:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 04 Jan 2009 04:43:50 +0000
Subject: [pkgdb] octave-forge had acl change status
Message-ID: <20090103214341.828972084B6@bastion.fedora.phx.redhat.com>

alexlan has set the approveacls acl on octave-forge (Fedora 10) to Approved for rakesh

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



From jcollie at fedoraproject.org  Sun Jan  4 05:05:44 2009
From: jcollie at fedoraproject.org (Jeffrey C. Ollie)
Date: Sun,  4 Jan 2009 05:05:44 +0000 (UTC)
Subject: rpms/asterisk/devel 0005-Build-using-external-libedit.patch, NONE, 
	1.1 0006-Revert-changes-to-pbx_lua-from-rev-126363-that-cause.patch,
	NONE,
	1.1 0007-change-configure.ac-to-look-for-pkg-config-gmime-2.4.patch, 
	NONE,
	1.1 0008-fix-the-AST_PROG_SED-problem-that-makes-.-bootstrap.patch,
	NONE,
	1.1 0009-my-guess-as-replacements-for-the-missing-broken-stuf.patch, 
	NONE, 1.1 0010-Update-autoconf.patch, 1.2, 1.3 .cvsignore, 1.18,
	1.19 0001-Modify-init-scripts-for-better-Fedora-compatibility.patch, 
	1.5,
	1.6 0002-Modify-modules.conf-so-that-different-voicemail-modu.patch, 
	1.5, 1.6 0003-Add-chan_mobile-from-asterisk-addons.patch, 1.1,
	1.2 0004-Use-pkgconfig-to-check-for-Lua.patch, 1.1,
	1.2 asterisk.spec, 1.42, 1.43 sources, 1.18,
	1.19 0005-Revert-changes-to-pbx_lua-from-rev-126363-that-cause.patch, 
	1.1, NONE 0006-Build-using-external-libedit.patch, 1.1,
	NONE 0007-Update-autoconf.patch, 1.1,
	NONE 0008-sys-io.h-is-not-available-on-PPC-systems.patch, 1.2,
	NONE 0009-Define-missing-variable-when-compiling-on-PPC.patch,
	1.1, NONE
Message-ID: <20090104050544.7CED27011F@cvs1.fedora.phx.redhat.com>

Author: jcollie

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

Modified Files:
	.cvsignore 
	0001-Modify-init-scripts-for-better-Fedora-compatibility.patch 
	0002-Modify-modules.conf-so-that-different-voicemail-modu.patch 
	0003-Add-chan_mobile-from-asterisk-addons.patch 
	0004-Use-pkgconfig-to-check-for-Lua.patch asterisk.spec 
	sources 
Added Files:
	0005-Build-using-external-libedit.patch 
	0006-Revert-changes-to-pbx_lua-from-rev-126363-that-cause.patch 
	0007-change-configure.ac-to-look-for-pkg-config-gmime-2.4.patch 
	0008-fix-the-AST_PROG_SED-problem-that-makes-.-bootstrap.patch 
	0009-my-guess-as-replacements-for-the-missing-broken-stuf.patch 
	0010-Update-autoconf.patch 
Removed Files:
	0005-Revert-changes-to-pbx_lua-from-rev-126363-that-cause.patch 
	0006-Build-using-external-libedit.patch 
	0007-Update-autoconf.patch 
	0008-sys-io.h-is-not-available-on-PPC-systems.patch 
	0009-Define-missing-variable-when-compiling-on-PPC.patch 
Log Message:
* Sat Jan  3 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6.1-0.8.beta4
- Update to 1.6.1-beta4


0005-Build-using-external-libedit.patch:

--- NEW FILE 0005-Build-using-external-libedit.patch ---
>From 1fc4e0fd9d7d24fd087a1c0d6f4dff5a1fec010f Mon Sep 17 00:00:00 2001
From: Jeffrey C. Ollie <jeff at ocjtech.us>
Date: Tue, 25 Mar 2008 00:50:27 -0500
Subject: [PATCH 05/10] Build using external libedit.

---
 build_tools/menuselect-deps.in |    1 +
 configure.ac                   |   22 ++++++++++++++++++++++
 main/Makefile                  |    8 +++++---
 main/cli.c                     |    3 ++-
 makeopts.in                    |    4 ++++
 5 files changed, 34 insertions(+), 4 deletions(-)

diff --git a/build_tools/menuselect-deps.in b/build_tools/menuselect-deps.in
index 6d94984..7832687 100644
--- a/build_tools/menuselect-deps.in
+++ b/build_tools/menuselect-deps.in
@@ -18,6 +18,7 @@ ISDNNET=@PBX_ISDNNET@
 IXJUSER=@PBX_IXJUSER@
 JACK=@PBX_JACK@
 LDAP=@PBX_LDAP@
+LIBEDIT=@PBX_LIBEDIT@
 LTDL=@PBX_LTDL@
 LUA=@PBX_LUA@
 MISDN=@PBX_MISDN@
diff --git a/configure.ac b/configure.ac
index 4519ec9..891548f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -230,6 +230,7 @@ AST_EXT_LIB_SETUP([IMAP_TK], [UW IMAP Toolkit], [imap])
 AST_EXT_LIB_SETUP([ISDNNET], [ISDN4Linux Library], [isdnnet])
 AST_EXT_LIB_SETUP([JACK], [Jack Audio Connection Kit], [jack])
 AST_EXT_LIB_SETUP([LDAP], [OpenLDAP], [ldap])
+AST_EXT_LIB_SETUP([LIBEDIT], [NetBSD Editline library], [libedit])
 AST_EXT_LIB_SETUP([LTDL], [libtool], [ltdl])
 AST_EXT_LIB_SETUP([LUA], [Lua], [lua])
 AST_EXT_LIB_SETUP([MISDN], [mISDN User Library], [misdn])
@@ -1602,6 +1603,27 @@ AC_SUBST(PBX_GTK2)
 AC_SUBST(GTK2_INCLUDE)
 AC_SUBST(GTK2_LIB)
 
+PBX_LIBEDIT=0
+LIBEDIT_INCLUDE=-Ieditline/readline
+LIBEDIT_LIB=
+LIBEDIT_OBJ=editline/libedit.a
+if test  "${USE_LIBEDIT}" != "no"; then
+   AC_CHECK_TOOL(PKGCONFIG, pkg-config, no)
+   if test "${PKGCONFIG}" != "no"; then
+      if ${PKGCONFIG} --exists libedit; then
+         LIBEDIT_INCLUDE=$(${PKGCONFIG} libedit --cflags)
+	 LIBEDIT_LIB=$(${PKGCONFIG} libedit --libs)
+         LIBEDIT_OBJ=
+         PBX_LIBEDIT=1
+         AC_DEFINE([HAVE_LIBEDIT], 1, [Define if your system has the NetBSD Editline libraries.])
+      fi
+   fi
+fi
+AC_SUBST(PBX_LIBEDIT)
+AC_SUBST(LIBEDIT_INCLUDE)
+AC_SUBST(LIBEDIT_LIB)
+AC_SUBST(LIBEDIT_OBJ)
+
 if test "${USE_CURL}" != "no"; then
    AC_PATH_TOOL([CURL_CONFIG], [curl-config], No)
    if test ! x"${CURL_CONFIG}" = xNo; then
diff --git a/main/Makefile b/main/Makefile
index 446bbb2..86a0f3c 100644
--- a/main/Makefile
+++ b/main/Makefile
@@ -138,6 +138,8 @@ testexpr2: ast_expr2f.c ast_expr2.c ast_expr2.h
 	$(CC) -g -o testexpr2 ast_expr2f.o ast_expr2.o -lm
 	rm ast_expr2.o ast_expr2f.o 
 
+cli.o: ASTCFLAGS+=$(LIBEDIT_INCLUDE)
+
 ifneq ($(findstring ENABLE_UPLOADS,$(MENUSELECT_CFLAGS)),)
 http.o: ASTCFLAGS+=$(GMIME_INCLUDE)
 endif
@@ -170,13 +172,13 @@ ifneq ($(findstring ENABLE_UPLOADS,$(MENUSELECT_CFLAGS)),)
 GMIMELDFLAGS+=$(GMIME_LIB)
 endif
 
-$(MAIN_TGT): $(OBJS) editline/libedit.a db1-ast/libdb1.a $(AST_EMBED_LDSCRIPTS)
+$(MAIN_TGT): $(OBJS) $(LIBEDIT_OBJ) db1-ast/libdb1.a $(AST_EMBED_LDSCRIPTS)
 	@$(CC) -c -o buildinfo.o $(ASTCFLAGS) buildinfo.c
 	$(ECHO_PREFIX) echo "   [LD] $^ -> $@"
 ifneq ($(findstring chan_h323,$(MENUSELECT_CHANNELS)),)
-	$(CMD_PREFIX) $(CC) $(STATIC_BUILD) -o $@ $(ASTLINK) $(AST_EMBED_LDFLAGS) $(ASTLDFLAGS) $^ buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS) $(GMIMELDFLAGS)
+	$(CMD_PREFIX) $(CC) $(STATIC_BUILD) -o $@ $(ASTLINK) $(AST_EMBED_LDFLAGS) $(ASTLDFLAGS) $^ buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS) $(GMIMELDFLAGS) $(LIBEDIT_LIB)
 else
-	$(CMD_PREFIX) $(CXX) $(STATIC_BUILD) -o $@ $(ASTLINK) $(AST_EMBED_LDFLAGS) $(ASTLDFLAGS) $(H323LDFLAGS) $^ buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS) $(H323LDLIBS) $(GMIMELDFLAGS)
+	$(CMD_PREFIX) $(CXX) $(STATIC_BUILD) -o $@ $(ASTLINK) $(AST_EMBED_LDFLAGS) $(ASTLDFLAGS) $(H323LDFLAGS) $^ buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS) $(H323LDLIBS) $(GMIMELDFLAGS) $(LIBEDIT_LIB)
 endif
 	$(CMD_PREFIX) $(ASTTOPDIR)/build_tools/strip_nonapi $@ || rm $@
 
diff --git a/main/cli.c b/main/cli.c
index f6982ad..286d775 100644
--- a/main/cli.c
+++ b/main/cli.c
@@ -34,6 +34,8 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include <ctype.h>
 #include <regex.h>
 
+#include <readline.h>
+
 #include "asterisk/cli.h"
 #include "asterisk/linkedlists.h"
 #include "asterisk/module.h"
@@ -42,7 +44,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/utils.h"
 #include "asterisk/app.h"
 #include "asterisk/lock.h"
-#include "editline/readline/readline.h"
 #include "asterisk/threadstorage.h"
 
 /*!
diff --git a/makeopts.in b/makeopts.in
index a5b2a5f..e2a8306 100644
--- a/makeopts.in
+++ b/makeopts.in
@@ -249,3 +249,7 @@ TINFO_DIR=@TINFO_DIR@
 
 # if poll is not present, let the makefile know.
 POLL_AVAILABLE=@HAS_POLL@
+
+LIBEDIT_INCLUDE=@LIBEDIT_INCLUDE@
+LIBEDIT_LIB=@LIBEDIT_LIB@
+LIBEDIT_OBJ=@LIBEDIT_OBJ@
-- 
1.6.1


0006-Revert-changes-to-pbx_lua-from-rev-126363-that-cause.patch:

--- NEW FILE 0006-Revert-changes-to-pbx_lua-from-rev-126363-that-cause.patch ---
>From eb9cc1a836086024bb619948468a80c4ff75bed9 Mon Sep 17 00:00:00 2001
From: Jeffrey C. Ollie <jeff at ocjtech.us>
Date: Fri, 10 Oct 2008 11:54:10 -0500
Subject: [PATCH 06/10] Revert changes to pbx_lua from rev 126363 that cause some problems.

---
 pbx/pbx_lua.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pbx/pbx_lua.c b/pbx/pbx_lua.c
index 7bc1a8a..2e2e5e8 100644
--- a/pbx/pbx_lua.c
+++ b/pbx/pbx_lua.c
@@ -42,9 +42,9 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/paths.h"
 #include "asterisk/hashtab.h"
 
-#include <lua5.1/lua.h>
-#include <lua5.1/lauxlib.h>
-#include <lua5.1/lualib.h>
+#include <lua.h>
+#include <lauxlib.h>
+#include <lualib.h>
 
 static char *config = "extensions.lua";
 static char *registrar = "pbx_lua";
-- 
1.6.1


0007-change-configure.ac-to-look-for-pkg-config-gmime-2.4.patch:

--- NEW FILE 0007-change-configure.ac-to-look-for-pkg-config-gmime-2.4.patch ---
>From 2a41fe1ca393e2c74157dd800b225fad6b04f628 Mon Sep 17 00:00:00 2001
From: Caolan McNamara <caolanm at redhat.com>
Date: Sat, 3 Jan 2009 19:06:18 -0600
Subject: [PATCH 07/10] change configure.ac to look for pkg-config gmime-2.4 instead of gmime-2.4 gmime-config

---
 configure.ac |   12 +++++++++++-
 1 files changed, 11 insertions(+), 1 deletions(-)

diff --git a/configure.ac b/configure.ac
index 891548f..5cfc205 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1475,7 +1475,17 @@ then
     AST_EXT_LIB_CHECK([OSPTK], [osptk], [OSPPCryptoDecrypt], [osp/osp.h], [-lcrypto -lssl])
 fi
 
-AST_EXT_TOOL_CHECK([GMIME], [gmime], [], [], [#include <gmime/gmime.h>], [gboolean q = g_mime_check_version(0,0,0);])
+PBX_GMIME=0
+AC_CHECK_TOOL(PKGCONFIG, pkg-config, No)
+if test ! "x${PKGCONFIG}" = xNo; then
+   GMIME_INCLUDE=$(${PKGCONFIG} gmime-2.4 --cflags 2>/dev/null)
+   GMIME_LIB=$(${PKGCONFIG} gmime-2.4 --libs)
+   PBX_GMIME=1
+   AC_DEFINE([HAVE_GMIME], 1, [Define if your system has the GMIME libraries.])
+fi
+AC_SUBST(PBX_GMIME)
+AC_SUBST(GMIME_INCLUDE)
+AC_SUBST(GMIME_LIB)
 
 AST_EXT_LIB_CHECK([HOARD], [hoard], [malloc], [])
 
-- 
1.6.1


0008-fix-the-AST_PROG_SED-problem-that-makes-.-bootstrap.patch:

--- NEW FILE 0008-fix-the-AST_PROG_SED-problem-that-makes-.-bootstrap.patch ---
>From b68f0fd7319a1b8593aa57fc08825d50a617d29a Mon Sep 17 00:00:00 2001
From: Caolan McNamara <caolanm at redhat.com>
Date: Sat, 3 Jan 2009 19:12:18 -0600
Subject: [PATCH 08/10] fix the AST_PROG_SED problem that makes ./bootstrap.sh fail

Need to regenerate configure from configure.ac after patch one with
./bootsrap.sh, so fix the broken .m4 in the autoconfig dir. (alternatively
change AST_PROG_SED to AC_PROG_SED as it is the same thing in the other .m4 in
the autoconf dir)
---
 autoconf/ast_prog_sed.m4 |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/autoconf/ast_prog_sed.m4 b/autoconf/ast_prog_sed.m4
index 283d52f..ae6cfc0 100644
--- a/autoconf/ast_prog_sed.m4
+++ b/autoconf/ast_prog_sed.m4
@@ -12,7 +12,7 @@ AC_DEFUN([AST_PROG_SED],
      done
      echo "$ac_script" | sed 99q >conftest.sed
      $as_unset ac_script || ac_script=
-     _AC_PATH_PROG_FEATURE_CHECK(SED, [sed gsed],
+     _AC_PATH_PROGS_FEATURE_CHECK(SED, [sed gsed],
 	[_AC_FEATURE_CHECK_LENGTH([ac_path_SED], [ac_cv_path_SED],
 		["$ac_path_SED" -f conftest.sed])])])
  SED="$ac_cv_path_SED"
-- 
1.6.1


0009-my-guess-as-replacements-for-the-missing-broken-stuf.patch:

--- NEW FILE 0009-my-guess-as-replacements-for-the-missing-broken-stuf.patch ---
>From 15d7fcf0c1ce6b73bddd3ad3b145290c14bb47bb Mon Sep 17 00:00:00 2001
From: Caolan McNamara <caolanm at redhat.com>
Date: Sat, 3 Jan 2009 19:15:12 -0600
Subject: [PATCH 09/10] my guess as replacements for the missing/broken stuff against the new gmime api

---
 res/res_http_post.c |   12 ++++--------
 1 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/res/res_http_post.c b/res/res_http_post.c
index deab15c..563ab9c 100644
--- a/res/res_http_post.c
+++ b/res/res_http_post.c
@@ -119,14 +119,10 @@ static void process_message_callback(GMimeObject *part, gpointer user_data)
 		ast_log(LOG_WARNING, "Got unexpected GMIME_IS_MESSAGE_PARTIAL\n");
 		return;
 	} else if (GMIME_IS_MULTIPART(part)) {
-		GList *l;
-		
 		ast_log(LOG_WARNING, "Got unexpected GMIME_IS_MULTIPART, trying to process subparts\n");
-		l = GMIME_MULTIPART(part)->subparts;
-		while (l) {
-			process_message_callback(l->data, cbinfo);
-			l = l->next;
-		}
+
+		g_mime_multipart_foreach(GMIME_MULTIPART(part), process_message_callback,
+                               cbinfo);
 	} else if (GMIME_IS_PART(part)) {
 		const char *filename;
 
@@ -148,7 +144,7 @@ static int process_message(GMimeMessage *message, const char *post_dir)
 		.post_dir = post_dir,
 	};
 
-	g_mime_message_foreach_part(message, process_message_callback, &cbinfo);
+	g_mime_message_foreach(message, process_message_callback, &cbinfo);
 
 	return cbinfo.count;
 }
-- 
1.6.1


0010-Update-autoconf.patch:

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.2 -r 1.3 0010-Update-autoconf.patch
Index: 0010-Update-autoconf.patch
===================================================================
RCS file: 0010-Update-autoconf.patch
diff -N 0010-Update-autoconf.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ 0010-Update-autoconf.patch	4 Jan 2009 05:05:41 -0000	1.3
@@ -0,0 +1,45956 @@
+From ef71d723c2623962f0685b80091d427f9eb307fa Mon Sep 17 00:00:00 2001
+From: Jeffrey C. Ollie <jeff at ocjtech.us>
+Date: Sat, 3 Jan 2009 22:26:11 -0600
+Subject: [PATCH 10/10] Update autoconf.
+
+---
+ configure                        |23473 ++++++++++++++++++++------------------
+ include/asterisk/autoconfig.h.in |   60 +-
+ 2 files changed, 12574 insertions(+), 10959 deletions(-)
+
+diff --git a/configure b/configure
+index 45c9f2a..b21b693 100755
+--- a/configure
++++ b/configure
+@@ -1,12 +1,12 @@
+ #! /bin/sh
+-# From configure.ac Revision: 163170 .
++# From configure.ac Revision.
+ # Guess values for system-dependent variables and create Makefiles.
+-# Generated by GNU Autoconf 2.61 for asterisk 1.6.
++# Generated by GNU Autoconf 2.63 for asterisk 1.6.
+ #
+ # Report bugs to <www.asterisk.org>.
+ #
+ # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
+-# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
++# 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+ # This configure script is free software; the Free Software Foundation
+ # gives unlimited permission to copy, distribute and modify it.
+ #
+@@ -20,7 +20,7 @@ DUALCASE=1; export DUALCASE # for MKS sh
+ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+   emulate sh
+   NULLCMD=:
+-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
++  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
+   # is contrary to our usage.  Disable this feature.
+   alias -g '${1+"$@"}'='"$@"'
+   setopt NO_GLOB_SUBST
+@@ -42,17 +42,45 @@ as_cr_Letters=$as_cr_letters$as_cr_LETTERS
+ as_cr_digits='0123456789'
+ as_cr_alnum=$as_cr_Letters$as_cr_digits
+ 
+-# The user is always right.
+-if test "${PATH_SEPARATOR+set}" != set; then
+-  echo "#! /bin/sh" >conf$$.sh
+-  echo  "exit 0"   >>conf$$.sh
+-  chmod +x conf$$.sh
+-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
+-    PATH_SEPARATOR=';'
++as_nl='
++'
++export as_nl
++# Printing a long string crashes Solaris 7 /usr/bin/printf.
++as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
++as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
++as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
++if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
++  as_echo='printf %s\n'
++  as_echo_n='printf %s'
++else
++  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
++    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
++    as_echo_n='/usr/ucb/echo -n'
+   else
+-    PATH_SEPARATOR=:
++    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
++    as_echo_n_body='eval
++      arg=$1;
++      case $arg in
++      *"$as_nl"*)
++	expr "X$arg" : "X\\(.*\\)$as_nl";
++	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
++      esac;
++      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
++    '
++    export as_echo_n_body
++    as_echo_n='sh -c $as_echo_n_body as_echo'
+   fi
+-  rm -f conf$$.sh
++  export as_echo_body
++  as_echo='sh -c $as_echo_body as_echo'
++fi
++
++# The user is always right.
++if test "${PATH_SEPARATOR+set}" != set; then
++  PATH_SEPARATOR=:
++  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
++    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
++      PATH_SEPARATOR=';'
++  }
+ fi
+ 
+ # Support unset when possible.
+@@ -68,8 +96,6 @@ fi
+ # there to prevent editors from complaining about space-tab.
+ # (If _AS_PATH_WALK were called with IFS unset, it would disable word
+ # splitting by setting IFS to empty value.)
+-as_nl='
+-'
+ IFS=" ""	$as_nl"
+ 
+ # Find who we are.  Look in the path if we contain no directory separator.
+@@ -92,7 +118,7 @@ if test "x$as_myself" = x; then
+   as_myself=$0
+ fi
+ if test ! -f "$as_myself"; then
+-  echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
++  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+   { (exit 1); exit 1; }
+ fi
+ 
+@@ -105,17 +131,10 @@ PS2='> '
+ PS4='+ '
+ 
+ # NLS nuisances.
+-for as_var in \
+-  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
+-  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
+-  LC_TELEPHONE LC_TIME
+-do
+-  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
+-    eval $as_var=C; export $as_var
+-  else
+-    ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+-  fi
+-done
++LC_ALL=C
++export LC_ALL
++LANGUAGE=C
++export LANGUAGE
+ 
+ # Required to use basename.
+ if expr a : '\(a\)' >/dev/null 2>&1 &&
+@@ -137,7 +156,7 @@ as_me=`$as_basename -- "$0" ||
+ $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
+ 	 X"$0" : 'X\(//\)$' \| \
+ 	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
+-echo X/"$0" |
++$as_echo X/"$0" |
+     sed '/^.*\/\([^/][^/]*\)\/*$/{
+ 	    s//\1/
+ 	    q
+@@ -163,7 +182,7 @@ else
+   as_have_required=no
+ fi
+ 
+-  if test $as_have_required = yes && 	 (eval ":
++  if test $as_have_required = yes &&	 (eval ":
+ (as_func_return () {
+   (exit \$1)
+ }
+@@ -245,7 +264,7 @@ IFS=$as_save_IFS
+ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+   emulate sh
+   NULLCMD=:
+-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
++  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
+   # is contrary to our usage.  Disable this feature.
+   alias -g '${1+"$@"}'='"$@"'
+   setopt NO_GLOB_SUBST
+@@ -266,7 +285,7 @@ _ASEOF
+ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+   emulate sh
+   NULLCMD=:
+-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
++  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
+   # is contrary to our usage.  Disable this feature.
+   alias -g '${1+"$@"}'='"$@"'
+   setopt NO_GLOB_SUBST
+@@ -346,10 +365,10 @@ fi
+ 
+       if test "x$CONFIG_SHELL" != x; then
+   for as_var in BASH_ENV ENV
+-        do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+-        done
+-        export CONFIG_SHELL
+-        exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
++	do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
++	done
++	export CONFIG_SHELL
++	exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
+ fi
+ 
+ 
+@@ -418,9 +437,10 @@ fi
+ 
+ test \$exitcode = 0") || {
+   echo No shell found that supports shell functions.
+-  echo Please tell autoconf at gnu.org about your system,
+-  echo including any error possibly output before this
+-  echo message
++  echo Please tell bug-autoconf at gnu.org about your system,
[...45563 lines suppressed...]
+     else
+-      rm -f $ac_file
+-      mv "$tmp/config.h" $ac_file
++      rm -f "$ac_file"
++      mv "$tmp/config.h" "$ac_file" \
++	|| { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
++$as_echo "$as_me: error: could not create $ac_file" >&2;}
++   { (exit 1); exit 1; }; }
+     fi
+   else
+-    echo "/* $configure_input  */"
+-    cat "$ac_result"
++    $as_echo "/* $configure_input  */" \
++      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
++      || { { $as_echo "$as_me:$LINENO: error: could not create -" >&5
++$as_echo "$as_me: error: could not create -" >&2;}
++   { (exit 1); exit 1; }; }
+   fi
+-  rm -f "$tmp/out12"
+  ;;
+ 
+ 
+@@ -51933,6 +53545,11 @@ _ACEOF
+ chmod +x $CONFIG_STATUS
+ ac_clean_files=$ac_clean_files_save
+ 
++test $ac_write_fail = 0 ||
++  { { $as_echo "$as_me:$LINENO: error: write failure creating $CONFIG_STATUS" >&5
++$as_echo "$as_me: error: write failure creating $CONFIG_STATUS" >&2;}
++   { (exit 1); exit 1; }; }
++
+ 
+ # configure is writing to config.log, and then calls config.status.
+ # config.status does its own redirection, appending to config.log.
+@@ -51954,6 +53571,10 @@ if test "$no_create" != yes; then
+   # would make configure fail if this is the last instruction.
+   $ac_cs_success || { (exit 1); exit 1; }
+ fi
++if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
++  { $as_echo "$as_me:$LINENO: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
++$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
++fi
+ 
+ 
+ if test "x${silent}" != "xyes" ; then
+@@ -51982,17 +53603,17 @@ echo "       \$\$\$\$\$\$\$\$\$\$\$\$\$\$\$\$.                "
+ echo
+ fi
+ 
+-{ echo "$as_me:$LINENO: Package configured for: " >&5
+-echo "$as_me: Package configured for: " >&6;}
+-{ echo "$as_me:$LINENO: OS type  : $host_os" >&5
+-echo "$as_me: OS type  : $host_os" >&6;}
+-{ echo "$as_me:$LINENO: Host CPU : $host_cpu" >&5
+-echo "$as_me: Host CPU : $host_cpu" >&6;}
+-{ echo "$as_me:$LINENO: build-cpu:vendor:os: $build_cpu : $build_vendor : $build_os :" >&5
+-echo "$as_me: build-cpu:vendor:os: $build_cpu : $build_vendor : $build_os :" >&6;}
+-{ echo "$as_me:$LINENO: host-cpu:vendor:os: $host_cpu : $host_vendor : $host_os :" >&5
+-echo "$as_me: host-cpu:vendor:os: $host_cpu : $host_vendor : $host_os :" >&6;}
++{ $as_echo "$as_me:$LINENO: Package configured for: " >&5
++$as_echo "$as_me: Package configured for: " >&6;}
++{ $as_echo "$as_me:$LINENO: OS type  : $host_os" >&5
++$as_echo "$as_me: OS type  : $host_os" >&6;}
++{ $as_echo "$as_me:$LINENO: Host CPU : $host_cpu" >&5
++$as_echo "$as_me: Host CPU : $host_cpu" >&6;}
++{ $as_echo "$as_me:$LINENO: build-cpu:vendor:os: $build_cpu : $build_vendor : $build_os :" >&5
++$as_echo "$as_me: build-cpu:vendor:os: $build_cpu : $build_vendor : $build_os :" >&6;}
++{ $as_echo "$as_me:$LINENO: host-cpu:vendor:os: $host_cpu : $host_vendor : $host_os :" >&5
++$as_echo "$as_me: host-cpu:vendor:os: $host_cpu : $host_vendor : $host_os :" >&6;}
+ if test "${cross_compiling}" = "yes"; then
+-   { echo "$as_me:$LINENO: Cross Compilation = YES" >&5
+-echo "$as_me: Cross Compilation = YES" >&6;}
++   { $as_echo "$as_me:$LINENO: Cross Compilation = YES" >&5
++$as_echo "$as_me: Cross Compilation = YES" >&6;}
+ fi
+diff --git a/include/asterisk/autoconfig.h.in b/include/asterisk/autoconfig.h.in
+index e567f45..2cd6e64 100644
+--- a/include/asterisk/autoconfig.h.in
++++ b/include/asterisk/autoconfig.h.in
+@@ -126,6 +126,12 @@
+ /* Define to indicate the ${BKTR_DESCRIP} library version */
+ #undef HAVE_BKTR_VERSION
+ 
++/* Define this to indicate the ${BLUETOOTH_DESCRIP} library */
++#undef HAVE_BLUETOOTH
++
++/* Define to indicate the ${BLUETOOTH_DESCRIP} library version */
++#undef HAVE_BLUETOOTH_VERSION
++
+ /* Define to 1 if byteswap.h macros are available. */
+ #undef HAVE_BYTESWAP_H
+ 
+@@ -407,6 +413,9 @@
+ /* Define to indicate the ${LDAP_DESCRIP} library version */
+ #undef HAVE_LDAP_VERSION
+ 
++/* Define if your system has the NetBSD Editline libraries. */
++#undef HAVE_LIBEDIT
++
+ /* Define to 1 if you have the <libintl.h> header file. */
+ #undef HAVE_LIBINTL_H
+ 
+@@ -464,12 +473,9 @@
+ /* Define to indicate the ${LTDL_DESCRIP} library version */
+ #undef HAVE_LTDL_VERSION
+ 
+-/* Define this to indicate the ${LUA_DESCRIP} library */
++/* Define if your system has the LUA libraries. */
+ #undef HAVE_LUA
+ 
+-/* Define to indicate the ${LUA_DESCRIP} library version */
+-#undef HAVE_LUA_VERSION
+-
+ /* Define to 1 if you have the <malloc.h> header file. */
+ #undef HAVE_MALLOC_H
+ 
+@@ -1115,9 +1121,6 @@
+ /* Define to the version of this package. */
+ #undef PACKAGE_VERSION
+ 
+-/* Define to 1 if the C compiler supports function prototypes. */
+-#undef PROTOTYPES
+-
+ /* Define to necessary symbol if this constant uses a non-standard name on
+    your system. */
+ #undef PTHREAD_CREATE_JOINABLE
+@@ -1134,11 +1137,6 @@
+ /* Define to the type of arg 5 for `select'. */
+ #undef SELECT_TYPE_ARG5
+ 
+-/* Define to 1 if the `setvbuf' function takes the buffering type as its
+-   second argument and the buffer pointer as the third, as on System V before
+-   release 3. */
+-#undef SETVBUF_REVERSED
+-
+ /* The size of `int', as computed by sizeof. */
+ #undef SIZEOF_INT
+ 
+@@ -1159,20 +1157,30 @@
+ /* Define to 1 if your <sys/time.h> declares `struct tm'. */
+ #undef TM_IN_SYS_TIME
+ 
+-/* Define to 1 if on AIX 3.
+-   System headers sometimes define this.
+-   We just want to avoid a redefinition error message.  */
++/* Enable extensions on AIX 3, Interix.  */
+ #ifndef _ALL_SOURCE
+ # undef _ALL_SOURCE
+ #endif
+-
+-/* Number of bits in a file offset, on hosts where this is settable. */
+-#undef _FILE_OFFSET_BITS
+-
+ /* Enable GNU extensions on systems that have them.  */
+ #ifndef _GNU_SOURCE
+ # undef _GNU_SOURCE
+ #endif
++/* Enable threading extensions on Solaris.  */
++#ifndef _POSIX_PTHREAD_SEMANTICS
++# undef _POSIX_PTHREAD_SEMANTICS
++#endif
++/* Enable extensions on HP NonStop.  */
++#ifndef _TANDEM_SOURCE
++# undef _TANDEM_SOURCE
++#endif
++/* Enable general extensions on Solaris.  */
++#ifndef __EXTENSIONS__
++# undef __EXTENSIONS__
++#endif
++
++
++/* Number of bits in a file offset, on hosts where this is settable. */
++#undef _FILE_OFFSET_BITS
+ 
+ /* Define to 1 to make fseeko visible on some hosts (e.g. glibc 2.2). */
+ #undef _LARGEFILE_SOURCE
+@@ -1190,20 +1198,6 @@
+ /* Define to 1 if you need to in order for `stat' and other things to work. */
+ #undef _POSIX_SOURCE
+ 
+-/* Enable extensions on Solaris.  */
+-#ifndef __EXTENSIONS__
+-# undef __EXTENSIONS__
+-#endif
+-#ifndef _POSIX_PTHREAD_SEMANTICS
+-# undef _POSIX_PTHREAD_SEMANTICS
+-#endif
+-#ifndef _TANDEM_SOURCE
+-# undef _TANDEM_SOURCE
+-#endif
+-
+-/* Define like PROTOTYPES; this can be used by system headers. */
+-#undef __PROTOTYPES
+-
+ /* Define to empty if `const' does not conform to ANSI C. */
+ #undef const
+ 
+-- 
+1.6.1
+


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/devel/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- .cvsignore	7 Nov 2008 16:39:49 -0000	1.18
+++ .cvsignore	4 Jan 2009 05:05:40 -0000	1.19
@@ -1 +1 @@
-asterisk-1.6.1-beta2-stripped.tar.gz
+asterisk-1.6.1-beta4-stripped.tar.gz

0001-Modify-init-scripts-for-better-Fedora-compatibility.patch:

Index: 0001-Modify-init-scripts-for-better-Fedora-compatibility.patch
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/devel/0001-Modify-init-scripts-for-better-Fedora-compatibility.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- 0001-Modify-init-scripts-for-better-Fedora-compatibility.patch	7 Nov 2008 16:39:49 -0000	1.5
+++ 0001-Modify-init-scripts-for-better-Fedora-compatibility.patch	4 Jan 2009 05:05:40 -0000	1.6
@@ -1,7 +1,7 @@
-From 174c9bf143c066f5670dde47559ed3d9d8d0c28f Mon Sep 17 00:00:00 2001
+From d397bc03e86335ed571121fa501dfefdc2ddbd4c Mon Sep 17 00:00:00 2001
 From: Jeffrey C. Ollie <jeff at ocjtech.us>
 Date: Sun, 18 Nov 2007 21:47:59 -0600
-Subject: [PATCH] Modify init scripts for better Fedora compatibility.
+Subject: [PATCH 01/10] Modify init scripts for better Fedora compatibility.
 
 ---
  contrib/init.d/rc.redhat.asterisk |   61 +++++++++++++++++-------------------
@@ -151,5 +151,5 @@
 +# be initialized.
 +#AST_GROUP="asterisk"
 -- 
-1.5.6.5
+1.6.1
 

0002-Modify-modules.conf-so-that-different-voicemail-modu.patch:

Index: 0002-Modify-modules.conf-so-that-different-voicemail-modu.patch
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/devel/0002-Modify-modules.conf-so-that-different-voicemail-modu.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- 0002-Modify-modules.conf-so-that-different-voicemail-modu.patch	7 Nov 2008 16:39:49 -0000	1.5
+++ 0002-Modify-modules.conf-so-that-different-voicemail-modu.patch	4 Jan 2009 05:05:40 -0000	1.6
@@ -1,7 +1,7 @@
-From a45cb3fffcafefae5bcd96061d23fe44ebc61990 Mon Sep 17 00:00:00 2001
+From e5d3f951bfa543e5d8b8cf85535f80b1d1143e09 Mon Sep 17 00:00:00 2001
 From: Jeffrey C. Ollie <jcollie at pc21224.campus.dmacc.edu>
 Date: Thu, 8 Nov 2007 15:52:36 -0600
-Subject: [PATCH] Modify modules.conf so that different voicemail modules can be loaded.
+Subject: [PATCH 02/10] Modify modules.conf so that different voicemail modules can be loaded.
 
 ---
  configs/modules.conf.sample |   26 ++++++++++++++++++++++++++
@@ -42,5 +42,5 @@
 +;noload => app_directory_plain.so
 +;noload => app_voicemail_plain.so
 -- 
-1.5.6.5
+1.6.1
 

0003-Add-chan_mobile-from-asterisk-addons.patch:

Index: 0003-Add-chan_mobile-from-asterisk-addons.patch
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/devel/0003-Add-chan_mobile-from-asterisk-addons.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 0003-Add-chan_mobile-from-asterisk-addons.patch	7 Nov 2008 16:39:49 -0000	1.1
+++ 0003-Add-chan_mobile-from-asterisk-addons.patch	4 Jan 2009 05:05:40 -0000	1.2
@@ -1,17 +1,17 @@
-From e4ca1e4c009965df9e7b230c4c8bddc645aaaf9c Mon Sep 17 00:00:00 2001
+From aeb688bc0889a4b035fd1590ba8df85af6e0a38c Mon Sep 17 00:00:00 2001
 From: Jeffrey C. Ollie <jeff at ocjtech.us>
-Date: Fri, 7 Nov 2008 07:52:23 -0600
-Subject: [PATCH] Add chan_mobile from asterisk-addons.
+Date: Thu, 16 Oct 2008 16:12:01 -0500
+Subject: [PATCH 03/10] Add chan_mobile from asterisk-addons.
 
 ---
  build_tools/menuselect-deps.in |    1 +
  channels/Makefile              |    1 +
- channels/chan_mobile.c         | 2150 ++++++++++++++++++++++++++++++++++++++++
+ channels/chan_mobile.c         | 2148 ++++++++++++++++++++++++++++++++++++++++
  configs/mobile.conf.sample     |   60 ++
  configure.ac                   |    4 +
  doc/chan_mobile.txt            |  240 +++++
  makeopts.in                    |    3 +
- 7 files changed, 2459 insertions(+), 0 deletions(-)
+ 7 files changed, 2457 insertions(+), 0 deletions(-)
  create mode 100644 channels/chan_mobile.c
  create mode 100644 configs/mobile.conf.sample
  create mode 100644 doc/chan_mobile.txt
@@ -38,10 +38,10 @@
 +chan_mobile.so: LIBS+=$(BLUETOOTH_LIB)
 diff --git a/channels/chan_mobile.c b/channels/chan_mobile.c
 new file mode 100644
-index 0000000..22692ec
+index 0000000..42659b2
 --- /dev/null
 +++ b/channels/chan_mobile.c
-@@ -0,0 +1,2150 @@
+@@ -0,0 +1,2148 @@
 +/*
 + * Asterisk -- An open source telephony toolkit.
 + *
@@ -612,7 +612,7 @@
 +	struct mbl_pvt *pvt;
 +	char *dest_dev = NULL;
 +	char *dest_num = NULL;
-+	int oldformat, group = -1;
++	int oldformat, group;
 +
 +	if (!data) {
 +		ast_log(LOG_WARNING, "Channel requested with no data\n");
@@ -634,15 +634,13 @@
 +	if (dest_num)
 +		*dest_num++ = 0x00;
 +
-+	if (((dest_dev[0] == 'g') || (dest_dev[0] == 'G')) && ((dest_dev[1] >= '0') && (dest_dev[1] <= '9'))) {
-+		group = atoi(&dest_dev[1]);
-+	}
-+
-+	/* Find requested device and make sure it's connected. */
++	/* Find requested device and make sure its connected. */
 +	AST_RWLIST_RDLOCK(&devices);
 +	AST_RWLIST_TRAVERSE(&devices, pvt, entry) {
-+		if (group > -1 && pvt->group == group && pvt->connected && !pvt->owner) {
-+			break;
++		if (((dest_dev[0] == 'g') || (dest_dev[0] == 'G')) && ((dest_dev[1] >= '0') && (dest_dev[1] <= '9'))) {
++			group = atoi(dest_dev+1);
++			if (pvt->group == group)
++				break;
 +		} else if (!strcmp(pvt->id, dest_dev)) {
 +			break;
 +		}
@@ -655,14 +653,14 @@
 +	}
 +
 +	if ((pvt->type == MBL_TYPE_PHONE) && !dest_num) {
-+		ast_log(LOG_WARNING, "Can't determine destination number.\n");
++		ast_log(LOG_WARNING, "Cant determine destination number.\n");
 +		*cause = AST_CAUSE_INCOMPATIBLE_DESTINATION;
 +		return NULL;
 +	}
 +
 +	chn = mbl_new(AST_STATE_DOWN, pvt, NULL);
 +	if (!chn) {
-+		ast_log(LOG_WARNING, "Unable to allocate channel structure.\n");
++		ast_log(LOG_WARNING, "Unable to allocate channel structure\n");
 +		*cause = AST_CAUSE_REQUESTED_CHAN_UNAVAIL;
 +		return NULL;
 +	}
@@ -2259,10 +2257,10 @@
 +type=headset
 +adapter=dlink
 diff --git a/configure.ac b/configure.ac
-index 036e692..ebb5fe9 100644
+index e0d0466..31b512f 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -205,6 +205,8 @@ AST_EXT_LIB_SETUP([ALSA], [Advanced Linux Sound Architecture], [asound])
+@@ -211,6 +211,8 @@ AST_EXT_LIB_SETUP([ALSA], [Advanced Linux Sound Architecture], [asound])
  # BKTR is used for backtrace support on platforms that do not
  # have it natively.
  AST_EXT_LIB_SETUP([BKTR], [Stack Backtrace support], [execinfo])
@@ -2271,7 +2269,7 @@
  AST_EXT_LIB_SETUP([CAP], [POSIX 1.e capabilities], [cap])
  AST_EXT_LIB_SETUP([CURL], [cURL], [curl])
  AST_EXT_LIB_SETUP([CURSES], [curses], [curses])
-@@ -570,6 +572,8 @@ AC_CHECK_SIZEOF(int)
+@@ -588,6 +590,8 @@ AC_CHECK_SIZEOF(int)
  
  AST_EXT_LIB_CHECK([ALSA], [asound], [snd_spcm_init], [alsa/asoundlib.h], [-lm -ldl])
  
@@ -2527,10 +2525,10 @@
 +
 +email me at   david.bowerman at gmail.com   or dseeb_ on #asterisk & #asterisk-dev irc.
 diff --git a/makeopts.in b/makeopts.in
-index 57d7fed..d037525 100644
+index 6a24183..a5b2a5f 100644
 --- a/makeopts.in
 +++ b/makeopts.in
-@@ -70,6 +70,9 @@ AST_SHADOW_WARNINGS=@AST_SHADOW_WARNINGS@
+@@ -72,6 +72,9 @@ AST_FORTIFY_SOURCE=@AST_FORTIFY_SOURCE@
  ASOUND_INCLUDE=@ALSA_INCLUDE@
  ASOUND_LIB=@ALSA_LIB@
  
@@ -2541,5 +2539,5 @@
  CURL_LIB=@CURL_LIB@
  
 -- 
-1.5.6.5
+1.6.1
 

0004-Use-pkgconfig-to-check-for-Lua.patch:

Index: 0004-Use-pkgconfig-to-check-for-Lua.patch
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/devel/0004-Use-pkgconfig-to-check-for-Lua.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 0004-Use-pkgconfig-to-check-for-Lua.patch	7 Nov 2008 16:39:49 -0000	1.1
+++ 0004-Use-pkgconfig-to-check-for-Lua.patch	4 Jan 2009 05:05:40 -0000	1.2
@@ -1,17 +1,17 @@
-From 2134757713eeb6dd4cd7645c37b71ebe1eeedeb1 Mon Sep 17 00:00:00 2001
+From 24b4e78b81a06375e233ccc7745d5d3bc5b1cc7e Mon Sep 17 00:00:00 2001
 From: Jeffrey C. Ollie <jeff at ocjtech.us>
 Date: Mon, 25 Feb 2008 13:14:23 -0600
-Subject: [PATCH] Use pkgconfig to check for Lua.
+Subject: [PATCH 04/10] Use pkgconfig to check for Lua.
 
 ---
  configure.ac |    9 ++++++++-
  1 files changed, 8 insertions(+), 1 deletions(-)
 
 diff --git a/configure.ac b/configure.ac
-index ebb5fe9..78c2137 100644
+index 31b512f..4519ec9 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -1378,7 +1378,14 @@ if test "${PBX_PWLIB}" = "1" -a "${USE_OPENH323}" != "no" ; then
+@@ -1406,7 +1406,14 @@ if test "${PBX_PWLIB}" = "1" -a "${USE_OPENH323}" != "no" ; then
  		[${PWLIB_INCLUDE}], [${PWLIB_LIB}])
  fi
  
@@ -28,5 +28,5 @@
  AST_EXT_LIB_CHECK([RADIUS], [radiusclient-ng], [rc_read_config], [radiusclient-ng.h])
  
 -- 
-1.5.6.5
+1.6.1
 


Index: asterisk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/devel/asterisk.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- asterisk.spec	9 Dec 2008 13:40:18 -0000	1.42
+++ asterisk.spec	4 Jan 2009 05:05:42 -0000	1.43
@@ -1,9 +1,9 @@
 %define with_apidoc %{?_with_apidoc: 1} %{!?_with_apidoc: 0}
-%define beta 2
+%define beta 4
 Summary: The Open Source PBX
 Name: asterisk
 Version: 1.6.1
-Release: 0.6%{?beta:beta%{beta}}%{?dist}
+Release: 0.8%{?beta:beta%{beta}}%{?dist}
 License: GPLv2
 Group: Applications/Internet
 URL: http://www.asterisk.org/
@@ -19,13 +19,13 @@
 
 # MD5 Sums
 # ========
-# 7dbcff5fb2d591b5b122ccb62909f641  asterisk-1.6.1-beta2.tar.gz
-# e2de68706687da9cce78d6f1e5e8d680  asterisk-1.6.1-beta2-stripped.tar.gz
+# 6ed4cad3cea37fc0c9bbcc3579a782ff  asterisk-1.6.1-beta4.tar.gz
+# ea9b4e1988c92cf40a913cb9e5fb32ef  asterisk-1.6.1-beta4-stripped.tar.gz
 #
 # SHA1 Sums
 # =========
-# 3ca20384c469c86aa87abb51f147ca6543740b72  asterisk-1.6.1-beta2.tar.gz
-# 8bcc273d4f499a974dd7df7b9c328e2cba4e75db  asterisk-1.6.1-beta2-stripped.tar.gz
+# 2b73ba5b94af16709f41ddeba7d9d93d7d5848af  asterisk-1.6.1-beta4.tar.gz
+# 1a5d21df9097baa28d44285a8e9b2e602e3b92ce  asterisk-1.6.1-beta4-stripped.tar.gz
 
 Source0: asterisk-%{version}%{?beta:-beta%{beta}}-stripped.tar.gz
 Source1: asterisk-logrotate
@@ -37,11 +37,12 @@
 Patch2:  0002-Modify-modules.conf-so-that-different-voicemail-modu.patch
 Patch3:  0003-Add-chan_mobile-from-asterisk-addons.patch
 Patch4:  0004-Use-pkgconfig-to-check-for-Lua.patch
-Patch5:  0005-Revert-changes-to-pbx_lua-from-rev-126363-that-cause.patch
-Patch6:  0006-Build-using-external-libedit.patch
-Patch7:  0007-Update-autoconf.patch
-Patch8:  0008-sys-io.h-is-not-available-on-PPC-systems.patch
-Patch9:  0009-Define-missing-variable-when-compiling-on-PPC.patch
+Patch5:  0005-Build-using-external-libedit.patch
+Patch6:  0006-Revert-changes-to-pbx_lua-from-rev-126363-that-cause.patch
+Patch7:  0007-change-configure.ac-to-look-for-pkg-config-gmime-2.4.patch
+Patch8:  0008-fix-the-AST_PROG_SED-problem-that-makes-.-bootstrap.patch
+Patch9:  0009-my-guess-as-replacements-for-the-missing-broken-stuf.patch
+Patch10: 0010-Update-autoconf.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
 
@@ -427,6 +428,7 @@
 %patch7 -p1
 %patch8 -p1
 %patch9 -p1
+%patch10 -p1
 
 cp %{SOURCE2} menuselect.makedeps
 cp %{SOURCE3} menuselect.makeopts
@@ -745,14 +747,14 @@
 %{_libdir}/asterisk/modules/res_timing_pthread.so
 %{_libdir}/asterisk/modules/test_dlinklists.so
 
-#%{_sbindir}/aelparse
+%{_sbindir}/aelparse
 %{_sbindir}/astcanary
 %{_sbindir}/asterisk
 %{_sbindir}/astgenkey
 %{_sbindir}/astman
 %{_sbindir}/autosupport
 %{_sbindir}/check_expr
-#%{_sbindir}/conf2ael
+%{_sbindir}/conf2ael
 %{_sbindir}/muted
 %{_sbindir}/rasterisk
 %{_sbindir}/refcounter
@@ -1053,6 +1055,12 @@
 %{_libdir}/asterisk/modules/app_voicemail_plain.so
 
 %changelog
+* Sat Jan  3 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6.1-0.8.beta4
+- Update to 1.6.1-beta4
+
+* Tue Dec  9 2008 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6.1-0.7.beta3
+- Update to 1.6.1-beta3
+
 * Tue Dec  9 2008 Alex Lancaster <alexlan[AT]fedoraproject org> - 1.6.1-0.6.beta2
 - Rebuild for new gmime
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/devel/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources	7 Nov 2008 16:39:49 -0000	1.18
+++ sources	4 Jan 2009 05:05:42 -0000	1.19
@@ -1 +1 @@
-e2de68706687da9cce78d6f1e5e8d680  asterisk-1.6.1-beta2-stripped.tar.gz
+ea9b4e1988c92cf40a913cb9e5fb32ef  asterisk-1.6.1-beta4-stripped.tar.gz


--- 0005-Revert-changes-to-pbx_lua-from-rev-126363-that-cause.patch DELETED ---


--- 0006-Build-using-external-libedit.patch DELETED ---


--- 0007-Update-autoconf.patch DELETED ---


--- 0008-sys-io.h-is-not-available-on-PPC-systems.patch DELETED ---


--- 0009-Define-missing-variable-when-compiling-on-PPC.patch DELETED ---



From jspaleta at fedoraproject.org  Sun Jan  4 05:12:04 2009
From: jspaleta at fedoraproject.org (Jef Spaleta)
Date: Sun,  4 Jan 2009 05:12:04 +0000 (UTC)
Subject: rpms/scipy/F-9 scipy.spec,1.12,1.13 sources,1.5,1.6
Message-ID: <20090104051204.D2F537011F@cvs1.fedora.phx.redhat.com>

Author: jspaleta

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

Modified Files:
	scipy.spec sources 
Log Message:
* Sat Jan 03 2009  Jef Spaleta <jspaleta at fedoraproject.org> - 0.7.0-0.1.b1.fc9
- Update to latest beta to fix bug 478435



Index: scipy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/scipy/F-9/scipy.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- scipy.spec	3 Oct 2008 21:13:18 -0000	1.12
+++ scipy.spec	4 Jan 2009 05:11:34 -0000	1.13
@@ -1,14 +1,14 @@
 %define python_sitearch %(%{__python} -c 'from distutils import sysconfig; print sysconfig.get_python_lib(1)')
-
+%define betaversion 0.7.0b1
 Summary: Scipy: Scientific Tools for Python
 Name: scipy
-Version: 0.6.0
-Release: 7%{?dist}
+Version: 0.7.0
+Release: 0.1.b1%{?dist}
 
 Group: Development/Libraries
 License: BSD and LGPLv2+
 Url: http://www.scipy.org
-Source0: http://prdownloads.sourceforge.net/scipy/%{name}-%{version}.tar.gz
+Source0: http://prdownloads.sourceforge.net/scipy/%{name}-%{betaversion}.tar.gz
 # Missing setup.py files which control the build of this module
 # These should be removed as soon as upstream pushes a release with this fixed
 Source1: stsci_image_setup.py
@@ -18,6 +18,7 @@
 
 BuildRequires: numpy, python-devel
 BuildRequires: fftw-devel, blas-devel, lapack-devel, ufsparse-devel
+BuildRequires: atlas-devel
 BuildRequires: gcc-gfortran, swig
 Requires: numpy, python
 
@@ -34,8 +35,8 @@
 leading scientists and engineers.
 
 
-%prep
-%setup -q
+%prep 
+%setup -q -n %{name}-%{betaversion}
 cat > site.cfg << EOF
 [amd]
 library_dirs = %{_libdir}
@@ -52,12 +53,12 @@
 cp %{SOURCE2} scipy/stsci/convolve/setup.py
 
 %build
-env CFLAGS="$RPM_OPT_FLAGS" ATLAS=%{_libdir} FFTW=%{_libdir} BLAS=%{_libdir} LAPACK=%{_libdir} python setup.py config_fc --fcompiler=gnu95 --noarch build
+env CFLAGS="$RPM_OPT_FLAGS" ATLAS=%{_libdir}/atlas FFTW=%{_libdir} BLAS=%{_libdir} LAPACK=%{_libdir} python setup.py config_fc --fcompiler=gnu95 --noarch build
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-env CFLAGS="$RPM_OPT_FLAGS" ATLAS=%{_libdir} FFTW=%{_libdir} BLAS=%{_libdir} LAPACK=%{_libdir} python setup.py install --root=$RPM_BUILD_ROOT
+env CFLAGS="$RPM_OPT_FLAGS" ATLAS=%{_libdir}/atlas FFTW=%{_libdir} BLAS=%{_libdir} LAPACK=%{_libdir} python setup.py install --root=$RPM_BUILD_ROOT
 
 
 %clean
@@ -73,6 +74,9 @@
 
 
 %changelog
+* Sat Jan 03 2009  Jef Spaleta <jspaleta at fedoraproject.org> - 0.7.0-0.1.b1.fc9
+- Update to latest beta to fix bug 478435
+
 * Fri Oct 03 2008 Jef Spaleta <jspaleta at fedoraproject.org> - 0.6.0-7
 - fix the stsci fix
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/scipy/F-9/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	3 Oct 2007 23:20:44 -0000	1.5
+++ sources	4 Jan 2009 05:11:34 -0000	1.6
@@ -1 +1 @@
-417adf3bfe03f4c23c9fb265018e545c  scipy-0.6.0.tar.gz
+a3a671f9beb5e7ea38b799e7b56fb1cc  scipy-0.7.0b1.tar.gz



From mclasen at fedoraproject.org  Sun Jan  4 05:15:59 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Sun,  4 Jan 2009 05:15:59 +0000 (UTC)
Subject: rpms/poppler/F-10 pdftops-large-image.patch, NONE, 1.1 poppler.spec,
	1.76, 1.77
Message-ID: <20090104051559.A44497011F@cvs1.fedora.phx.redhat.com>

Author: mclasen

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

Modified Files:
	poppler.spec 
Added Files:
	pdftops-large-image.patch 
Log Message:
upstream bugfix for large images


pdftops-large-image.patch:

--- NEW FILE pdftops-large-image.patch ---
diff --git a/poppler/PSOutputDev.cc b/poppler/PSOutputDev.cc
index 014036b..52495d7 100644
--- a/poppler/PSOutputDev.cc
+++ b/poppler/PSOutputDev.cc
@@ -2610,6 +2610,7 @@ void PSOutputDev::setupImage(Ref id, Stream *str) {
   GooString *s;
   int c;
   int size, line, col, i;
+  int outerSize, outer;
 
   // check if image is already setup
   for (i = 0; i < imgIDLen; ++i) {
@@ -2696,56 +2697,72 @@ void PSOutputDev::setupImage(Ref id, Stream *str) {
   if (useRLE) {
     ++size;
   }
+  outerSize = size/65535 + 1;
+
   writePSFmt("{0:d} array dup /ImData_{1:d}_{2:d} exch def\n",
-	     size, id.num, id.gen);
+	     outerSize, id.num, id.gen);
   str->close();
 
   // write the data into the array
   str->reset();
-  line = col = 0;
-  writePS((char *)(useASCIIHex ? "dup 0 <" : "dup 0 <~"));
-  do {
-    do {
-      c = str->getChar();
-    } while (c == '\n' || c == '\r');
-    if (c == (useASCIIHex ? '>' : '~') || c == EOF) {
-      break;
-    }
-    if (c == 'z') {
-      writePSChar(c);
-      ++col;
-    } else {
-      writePSChar(c);
-      ++col;
-      for (i = 1; i <= (useASCIIHex ? 1 : 4); ++i) {
-	do {
-	  c = str->getChar();
-	} while (c == '\n' || c == '\r');
-	if (c == (useASCIIHex ? '>' : '~') || c == EOF) {
-	  break;
-	}
+  for (outer = 0;outer < outerSize;outer++) {
+    int innerSize = size > 65535 ? 65535 : size;
+
+    // put the inner array into the outer array
+    writePSFmt("{0:d} array 1 index {1:d} 2 index put\n",
+	       innerSize, outer);
+    line = col = 0;
+    writePS((char *)(useASCIIHex ? "dup 0 <" : "dup 0 <~"));
+    for (;;) {
+      do {
+	c = str->getChar();
+      } while (c == '\n' || c == '\r');
+      if (c == (useASCIIHex ? '>' : '~') || c == EOF) {
+	break;
+      }
+      if (c == 'z') {
 	writePSChar(c);
 	++col;
+      } else {
+	writePSChar(c);
+	++col;
+	for (i = 1; i <= (useASCIIHex ? 1 : 4); ++i) {
+	  do {
+	    c = str->getChar();
+	  } while (c == '\n' || c == '\r');
+	  if (c == (useASCIIHex ? '>' : '~') || c == EOF) {
+	    break;
+	  }
+	  writePSChar(c);
+	  ++col;
+	}
+      }
+      // each line is: "dup nnnnn <~...data...~> put<eol>"
+      // so max data length = 255 - 20 = 235
+      // chunks are 1 or 4 bytes each, so we have to stop at 232
+      // but make it 225 just to be safe
+      if (col > 225) {
+	writePS((char *)(useASCIIHex ? "> put\n" : "~> put\n"));
+	++line;
+	if (line >= innerSize) break;
+	writePSFmt((char *)(useASCIIHex ? "dup {0:d} <" : "dup {0:d} <~"), line);
+	col = 0;
       }
     }
-    // each line is: "dup nnnnn <~...data...~> put<eol>"
-    // so max data length = 255 - 20 = 235
-    // chunks are 1 or 4 bytes each, so we have to stop at 232
-    // but make it 225 just to be safe
-    if (col > 225) {
+    if (c == (useASCIIHex ? '>' : '~') || c == EOF) {
       writePS((char *)(useASCIIHex ? "> put\n" : "~> put\n"));
-      ++line;
-      writePSFmt((char *)(useASCIIHex ? "dup {0:d} <" : "dup {0:d} <~"), line);
-      col = 0;
+      if (useRLE) {
+	++line;
+	writePSFmt("{0:d} <> put\n", line);
+      } else {
+	writePS("pop\n");
+      }
+      break;
     }
-  } while (c != (useASCIIHex ? '>' : '~') && c != EOF);
-  writePS((char *)(useASCIIHex ? "> put\n" : "~> put\n"));
-  if (useRLE) {
-    ++line;
-    writePSFmt("{0:d} <> put\n", line);
-  } else {
     writePS("pop\n");
+    size -= innerSize;
   }
+  writePS("pop\n");
   str->close();
 
   delete str;
@@ -4382,7 +4399,7 @@ void PSOutputDev::doImageL1(Object *ref, GfxImageColorMap *colorMap,
       // make sure the image is setup, it sometimes is not like on bug #17645
       setupImage(ref->getRef(), str);
       // set up to use the array already created by setupImages()
-      writePSFmt("ImData_{0:d}_{1:d} 0\n", ref->getRefNum(), ref->getRefGen());
+      writePSFmt("ImData_{0:d}_{1:d} 0 0\n", ref->getRefNum(), ref->getRefGen());
     }
   }
 
@@ -4845,7 +4862,7 @@ void PSOutputDev::doImageL2(Object *ref, GfxImageColorMap *colorMap,
       // make sure the image is setup, it sometimes is not like on bug #17645
       setupImage(ref->getRef(), str);
       // set up to use the array already created by setupImages()
-      writePSFmt("ImData_{0:d}_{1:d} 0\n", ref->getRefNum(), ref->getRefGen());
+      writePSFmt("ImData_{0:d}_{1:d} 0 0\n",ref->getRefNum(), ref->getRefGen());
     }
   }
 
@@ -4899,7 +4916,12 @@ void PSOutputDev::doImageL2(Object *ref, GfxImageColorMap *colorMap,
 
   // data source
   if (mode == psModeForm || inType3Char || preload) {
-    writePS("  /DataSource { 2 copy get exch 1 add exch }\n");
+    if (inlineImg) {
+      writePS("  /DataSource { 2 copy get exch 1 add exch }\n");
+    } else {
+      writePS("  /DataSource { dup 65535 ge { pop 1 add 0 } if 2 index 2"
+	" index get 1 index get exch 1 add exch }\n");
+    }
   } else {
     writePS("  /DataSource currentfile\n");
   }
@@ -4938,6 +4960,7 @@ void PSOutputDev::doImageL2(Object *ref, GfxImageColorMap *colorMap,
     writePSFmt(">>\n{0:s}\n", colorMap ? "image" : "imagemask");
 
     // get rid of the array and index
+    if (!inlineImg) writePS("pop ");
     writePS("pop pop\n");
 
   } else {
@@ -5115,7 +5138,7 @@ void PSOutputDev::doImageL3(Object *ref, GfxImageColorMap *colorMap,
       // make sure the image is setup, it sometimes is not like on bug #17645
       setupImage(ref->getRef(), str);
       // set up to use the array already created by setupImages()
-      writePSFmt("ImData_{0:d}_{1:d} 0\n", ref->getRefNum(), ref->getRefGen());
+      writePSFmt("ImData_{0:d}_{1:d} 0 0\n", ref->getRefNum(), ref->getRefGen());
     }
   }
 
@@ -5186,7 +5209,12 @@ void PSOutputDev::doImageL3(Object *ref, GfxImageColorMap *colorMap,
 
   // data source
   if (mode == psModeForm || inType3Char || preload) {
-    writePS("  /DataSource { 2 copy get exch 1 add exch }\n");
+    if (inlineImg) {
+	writePS("  /DataSource { 2 copy get exch 1 add exch }\n");
+    } else {
+	writePS("  /DataSource { dup 65535 ge { pop 1 add 0 } if 2 index 2"
+	  " index get 1 index get exch 1 add exch }\n");
+    }
   } else {
     writePS("  /DataSource currentfile\n");
   }
@@ -5322,6 +5350,7 @@ void PSOutputDev::doImageL3(Object *ref, GfxImageColorMap *colorMap,
 
   // get rid of the array and index
   if (mode == psModeForm || inType3Char || preload) {
+    if (!inlineImg) writePS("pop ");
     writePS("pop pop\n");
 
   // image data


Index: poppler.spec
===================================================================
RCS file: /cvs/pkgs/rpms/poppler/F-10/poppler.spec,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- poppler.spec	16 Sep 2008 19:02:41 -0000	1.76
+++ poppler.spec	4 Jan 2009 05:15:29 -0000	1.77
@@ -3,7 +3,7 @@
 Summary: PDF rendering library
 Name: poppler
 Version: 0.8.7
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2 and Redistributable, no modification permitted
 # the code is GPLv2
 # the charmap data in /usr/share/poppler is redistributable
@@ -12,6 +12,8 @@
 Source0: http://poppler.freedesktop.org/poppler-%{version}.tar.gz
 Source1: http://poppler.freedesktop.org/poppler-data-%{dataversion}.tar.gz
 Patch0: poppler-ObjStream.patch
+# fix from upstream
+Patch1: pdftops-large-image.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
 BuildRequires: gtk2-devel
@@ -108,6 +110,7 @@
 %setup -c -q -a1
 pushd %{name}-%{version}
 %patch0 -p0 -b .objstream
+%patch1 -p1 -b .large-image
 popd
 
 %build
@@ -195,6 +198,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Sun Jan  4 2009 Matthias Clasen  <mclasen at redhat.com> - 0.8.7-3
+- Fix a problem with large images
+
 * Tue Sep 16 2008 Rex Dieter <rdieter at fedoraproject.org> - 0.8.7-2
 - cleanup qt3 hack
 - %%description cosmetics



From huzaifas at fedoraproject.org  Sun Jan  4 05:21:30 2009
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Sun,  4 Jan 2009 05:21:30 +0000 (UTC)
Subject: rpms/stun/EL-5 stun.spec,NONE,1.1 patch0.diff,NONE,1.1
Message-ID: <20090104052130.6927D7011F@cvs1.fedora.phx.redhat.com>

Author: huzaifas

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

Added Files:
	stun.spec patch0.diff 
Log Message:
First commit


--- NEW FILE stun.spec ---
%define	download_name	stund
%define download_version	_0.96_Aug13.tgz

Name:		stun
Version:	0.96    
Release:	2%{?dist}
Summary:	Implements a simple Stun Client
Group:		Applications/Communications
License:	Vovida Software License 1.0
URL:		http://sourceforge.net/projects/%{name}
Source0:	http://downloads.sourceforge.net/%{name}/%{download_name}%{download_version}
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Patch0:		patch0.diff

%description
Implements a simple STUN client on Windows, Linux, and Solaris. 
The STUN protocol (Simple Traversal of UDP through NATs) is described in the 
IETF RFC 3489, available at http://www.ietf.org/rfc/rfc3489.txt

%package server
Summary:	Implements the Stun Server
Group:		Applications/Communications

%description server
Implements a simple STUN client on Windows, Linux, and Solaris.           
The STUN protocol (Simple Traversal of UDP through NATs) is described in the
IETF RFC 3489, available at http://www.ietf.org/rfc/rfc3489.txt


%prep
%setup -q  -n %{download_name}
%patch0 -p0

%build
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT

mkdir -p $RPM_BUILD_ROOT%{_bindir}
mkdir -p $RPM_BUILD_ROOT%{_sbindir}
install   client $RPM_BUILD_ROOT%{_bindir}/stun-client
install   server $RPM_BUILD_ROOT%{_sbindir}/stun-server



%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc rfc3489.txt
%{_bindir}/stun-client

%files server
%{_sbindir}/stun-server




%changelog
* Wed Apr 9 2008 Huzaifa Sidhpurwala <huzaifas at redhat.com> - 0.96-2
- Patched for ppc and x86_64

* Mon Jan 21 2008 Huzaifa Sidhpurwala <huzaifas at redhat.com> - 0.96-1
- Used correct macros

* Mon Jan 21 2008 Huzaifa Sidhpurwala <huzaifas at redhat.com> - 0.96-0
- Initial version


patch0.diff:

--- NEW FILE patch0.diff ---
--- stun.cxx	2005-08-14 06:09:03.000000000 +0530
+++ stun.cxx.huzaifas	2008-04-09 15:11:29.000000000 +0530
@@ -669,16 +669,16 @@
       tick = hightick;
       tick <<= 32;
       tick |= lowtick;
-#elif defined(__GNUC__) && ( defined(__i686__) || defined(__i386__) )
+#elif defined(__GNUC__) && ( defined(__i686__) || defined(__i386__) || defined(__x86_64__)  )
       asm("rdtsc" : "=A" (tick));
-#elif defined (__SUNPRO_CC) || defined( __sparc__ )	
+#elif defined (__SUNPRO_CC) || defined( __sparc__ )
       tick = gethrtime();
 #elif defined(__MACH__) 
       int fd=open("/dev/random",O_RDONLY);
       read(fd,&tick,sizeof(tick));
       closesocket(fd);
 #else
-#     error Need some way to seed the random number generator 
+/* #     error Need some way to seed the random number generator */
 #endif 
       int seed = int(tick);
 #ifdef WIN32



From jspaleta at fedoraproject.org  Sun Jan  4 05:37:54 2009
From: jspaleta at fedoraproject.org (Jef Spaleta)
Date: Sun,  4 Jan 2009 05:37:54 +0000 (UTC)
Subject: rpms/gpodder/devel gpodder.spec,1.21,1.22
Message-ID: <20090104053754.A6E7F7011F@cvs1.fedora.phx.redhat.com>

Author: jspaleta

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

Modified Files:
	gpodder.spec 
Log Message:
* Sat Jan 03 2008 Jef Spaleta <jspaleta AT fedoraproject DOT org> - 0.14.0-2
- pybluez dep fix



Index: gpodder.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gpodder/devel/gpodder.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- gpodder.spec	11 Dec 2008 22:37:08 -0000	1.21
+++ gpodder.spec	4 Jan 2009 05:37:22 -0000	1.22
@@ -3,7 +3,7 @@
 
 Name:           gpodder
 Version:        0.14.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Podcast receiver/catcher written in Python
 
 Group:          Applications/Multimedia
@@ -19,7 +19,7 @@
 BuildRequires:  help2man
 Requires:       pygtk2 pygtk2-libglade wget
 Requires:       python-gpod, python-eyed3, python-feedparser
-Requires:       python-bluez, bluez-gnome, python-imaging
+Requires:       pybluez, bluez-gnome, python-imaging
 %description
 gPodder is a Podcast receiver/catcher written in Python, using GTK. 
 It manages podcast feeds for you and automatically downloads all 
@@ -76,6 +76,9 @@
 %{python_sitelib}/%{name}*.egg-info
 
 %changelog
+* Sat Jan 03 2008 Jef Spaleta <jspaleta AT fedoraproject DOT org> - 0.14.0-2
+- pybluez dep fix
+
 * Mon Dec 11 2008 Jef Spaleta <jspaleta AT fedoraproject DOT org> - 0.14.0-1
 - New upstream release
 



From jspaleta at fedoraproject.org  Sun Jan  4 05:39:07 2009
From: jspaleta at fedoraproject.org (Jef Spaleta)
Date: Sun,  4 Jan 2009 05:39:07 +0000 (UTC)
Subject: rpms/gpodder/devel gpodder.spec,1.22,1.23
Message-ID: <20090104053907.91E9E7011F@cvs1.fedora.phx.redhat.com>

Author: jspaleta

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

Modified Files:
	gpodder.spec 
Log Message:
* Sat Jan 03 2009 Jef Spaleta <jspaleta AT fedoraproject DOT org> - 0.14.0-2
- pybluez dep fix



Index: gpodder.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gpodder/devel/gpodder.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- gpodder.spec	4 Jan 2009 05:37:22 -0000	1.22
+++ gpodder.spec	4 Jan 2009 05:38:37 -0000	1.23
@@ -76,7 +76,7 @@
 %{python_sitelib}/%{name}*.egg-info
 
 %changelog
-* Sat Jan 03 2008 Jef Spaleta <jspaleta AT fedoraproject DOT org> - 0.14.0-2
+* Sat Jan 03 2009 Jef Spaleta <jspaleta AT fedoraproject DOT org> - 0.14.0-2
 - pybluez dep fix
 
 * Mon Dec 11 2008 Jef Spaleta <jspaleta AT fedoraproject DOT org> - 0.14.0-1



From jcollie at fedoraproject.org  Sun Jan  4 05:52:36 2009
From: jcollie at fedoraproject.org (Jeffrey C. Ollie)
Date: Sun,  4 Jan 2009 05:52:36 +0000 (UTC)
Subject: rpms/asterisk/devel
	0007-Define-missing-variable-when-compiling-on-PPC.patch, NONE,
	1.1 0008-change-configure.ac-to-look-for-pkg-config-gmime-2.4.patch, 
	NONE,
	1.1 0009-fix-the-AST_PROG_SED-problem-that-makes-.-bootstrap.patch,
	NONE,
	1.1 0010-my-guess-as-replacements-for-the-missing-broken-stuf.patch, 
	NONE, 1.1 0011-Update-autoconf.patch, NONE,
	1.1 0001-Modify-init-scripts-for-better-Fedora-compatibility.patch,
	1.6,
	1.7 0002-Modify-modules.conf-so-that-different-voicemail-modu.patch, 
	1.6, 1.7 0003-Add-chan_mobile-from-asterisk-addons.patch, 1.2,
	1.3 0004-Use-pkgconfig-to-check-for-Lua.patch, 1.2,
	1.3 0005-Build-using-external-libedit.patch, 1.1,
	1.2 0006-Revert-changes-to-pbx_lua-from-rev-126363-that-cause.patch, 
	1.1, 1.2 asterisk.spec, 1.43,
	1.44 0007-change-configure.ac-to-look-for-pkg-config-gmime-2.4.patch, 
	1.1,
	NONE 0008-fix-the-AST_PROG_SED-problem-that-makes-.-bootstrap.patch, 
	1.1,
	NONE 0009-my-guess-as-replacements-for-the-missing-broken-stuf.patch, 
	1.1, NONE 0010-Update-autoconf.patch, 1.3, NONE
Message-ID: <20090104055236.47D847013F@cvs1.fedora.phx.redhat.com>

Author: jcollie

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

Modified Files:
	0001-Modify-init-scripts-for-better-Fedora-compatibility.patch 
	0002-Modify-modules.conf-so-that-different-voicemail-modu.patch 
	0003-Add-chan_mobile-from-asterisk-addons.patch 
	0004-Use-pkgconfig-to-check-for-Lua.patch 
	0005-Build-using-external-libedit.patch 
	0006-Revert-changes-to-pbx_lua-from-rev-126363-that-cause.patch 
	asterisk.spec 
Added Files:
	0007-Define-missing-variable-when-compiling-on-PPC.patch 
	0008-change-configure.ac-to-look-for-pkg-config-gmime-2.4.patch 
	0009-fix-the-AST_PROG_SED-problem-that-makes-.-bootstrap.patch 
	0010-my-guess-as-replacements-for-the-missing-broken-stuf.patch 
	0011-Update-autoconf.patch 
Removed Files:
	0007-change-configure.ac-to-look-for-pkg-config-gmime-2.4.patch 
	0008-fix-the-AST_PROG_SED-problem-that-makes-.-bootstrap.patch 
	0009-my-guess-as-replacements-for-the-missing-broken-stuf.patch 
	0010-Update-autoconf.patch 
Log Message:
* Sat Jan  3 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6.1-0.9.beta4
- Update patches


0007-Define-missing-variable-when-compiling-on-PPC.patch:

--- NEW FILE 0007-Define-missing-variable-when-compiling-on-PPC.patch ---
>From 06b01dff16e335004e107352fb9a87d56ab5dc57 Mon Sep 17 00:00:00 2001
From: Jeffrey C. Ollie <jeff at ocjtech.us>
Date: Fri, 7 Nov 2008 14:43:16 -0600
Subject: [PATCH 07/11] Define missing variable when compiling on PPC.

---
 apps/app_festival.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/apps/app_festival.c b/apps/app_festival.c
index 649707b..34c282b 100644
--- a/apps/app_festival.c
+++ b/apps/app_festival.c
@@ -119,6 +119,7 @@ static int send_waveform_to_fd(char *waveform, int length, int fd)
 {
 	int res;
 #ifdef __PPC__ 
+	int x;
 	char c;
 #endif
 
-- 
1.6.1


0008-change-configure.ac-to-look-for-pkg-config-gmime-2.4.patch:

--- NEW FILE 0008-change-configure.ac-to-look-for-pkg-config-gmime-2.4.patch ---
>From 15ba569e990035b085d2d983d3c22681ad82be89 Mon Sep 17 00:00:00 2001
From: Caolan McNamara <caolanm at redhat.com>
Date: Sat, 3 Jan 2009 19:06:18 -0600
Subject: [PATCH 08/11] change configure.ac to look for pkg-config gmime-2.4 instead of gmime-2.4 gmime-config

---
 configure.ac |   12 +++++++++++-
 1 files changed, 11 insertions(+), 1 deletions(-)

diff --git a/configure.ac b/configure.ac
index 891548f..5cfc205 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1475,7 +1475,17 @@ then
     AST_EXT_LIB_CHECK([OSPTK], [osptk], [OSPPCryptoDecrypt], [osp/osp.h], [-lcrypto -lssl])
 fi
 
-AST_EXT_TOOL_CHECK([GMIME], [gmime], [], [], [#include <gmime/gmime.h>], [gboolean q = g_mime_check_version(0,0,0);])
+PBX_GMIME=0
+AC_CHECK_TOOL(PKGCONFIG, pkg-config, No)
+if test ! "x${PKGCONFIG}" = xNo; then
+   GMIME_INCLUDE=$(${PKGCONFIG} gmime-2.4 --cflags 2>/dev/null)
+   GMIME_LIB=$(${PKGCONFIG} gmime-2.4 --libs)
+   PBX_GMIME=1
+   AC_DEFINE([HAVE_GMIME], 1, [Define if your system has the GMIME libraries.])
+fi
+AC_SUBST(PBX_GMIME)
+AC_SUBST(GMIME_INCLUDE)
+AC_SUBST(GMIME_LIB)
 
 AST_EXT_LIB_CHECK([HOARD], [hoard], [malloc], [])
 
-- 
1.6.1


0009-fix-the-AST_PROG_SED-problem-that-makes-.-bootstrap.patch:

--- NEW FILE 0009-fix-the-AST_PROG_SED-problem-that-makes-.-bootstrap.patch ---
>From fc4a4f6207cb8454b6d3ec673dba10f8daf57050 Mon Sep 17 00:00:00 2001
From: Caolan McNamara <caolanm at redhat.com>
Date: Sat, 3 Jan 2009 19:12:18 -0600
Subject: [PATCH 09/11] fix the AST_PROG_SED problem that makes ./bootstrap.sh fail

Need to regenerate configure from configure.ac after patch one with
./bootsrap.sh, so fix the broken .m4 in the autoconfig dir. (alternatively
change AST_PROG_SED to AC_PROG_SED as it is the same thing in the other .m4 in
the autoconf dir)
---
 autoconf/ast_prog_sed.m4 |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/autoconf/ast_prog_sed.m4 b/autoconf/ast_prog_sed.m4
index 283d52f..ae6cfc0 100644
--- a/autoconf/ast_prog_sed.m4
+++ b/autoconf/ast_prog_sed.m4
@@ -12,7 +12,7 @@ AC_DEFUN([AST_PROG_SED],
      done
      echo "$ac_script" | sed 99q >conftest.sed
      $as_unset ac_script || ac_script=
-     _AC_PATH_PROG_FEATURE_CHECK(SED, [sed gsed],
+     _AC_PATH_PROGS_FEATURE_CHECK(SED, [sed gsed],
 	[_AC_FEATURE_CHECK_LENGTH([ac_path_SED], [ac_cv_path_SED],
 		["$ac_path_SED" -f conftest.sed])])])
  SED="$ac_cv_path_SED"
-- 
1.6.1


0010-my-guess-as-replacements-for-the-missing-broken-stuf.patch:

--- NEW FILE 0010-my-guess-as-replacements-for-the-missing-broken-stuf.patch ---
>From b7ccdf7e246f75f67529126fb309efd2e6793446 Mon Sep 17 00:00:00 2001
From: Caolan McNamara <caolanm at redhat.com>
Date: Sat, 3 Jan 2009 19:15:12 -0600
Subject: [PATCH 10/11] my guess as replacements for the missing/broken stuff against the new gmime api

---
 res/res_http_post.c |   12 ++++--------
 1 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/res/res_http_post.c b/res/res_http_post.c
index deab15c..563ab9c 100644
--- a/res/res_http_post.c
+++ b/res/res_http_post.c
@@ -119,14 +119,10 @@ static void process_message_callback(GMimeObject *part, gpointer user_data)
 		ast_log(LOG_WARNING, "Got unexpected GMIME_IS_MESSAGE_PARTIAL\n");
 		return;
 	} else if (GMIME_IS_MULTIPART(part)) {
-		GList *l;
-		
 		ast_log(LOG_WARNING, "Got unexpected GMIME_IS_MULTIPART, trying to process subparts\n");
-		l = GMIME_MULTIPART(part)->subparts;
-		while (l) {
-			process_message_callback(l->data, cbinfo);
-			l = l->next;
-		}
+
+		g_mime_multipart_foreach(GMIME_MULTIPART(part), process_message_callback,
+                               cbinfo);
 	} else if (GMIME_IS_PART(part)) {
 		const char *filename;
 
@@ -148,7 +144,7 @@ static int process_message(GMimeMessage *message, const char *post_dir)
 		.post_dir = post_dir,
 	};
 
-	g_mime_message_foreach_part(message, process_message_callback, &cbinfo);
+	g_mime_message_foreach(message, process_message_callback, &cbinfo);
 
 	return cbinfo.count;
 }
-- 
1.6.1


0011-Update-autoconf.patch:

--- NEW FILE 0011-Update-autoconf.patch ---
>From acb8f9151b2cf455374f877ce3ae81ffceb5d5dd Mon Sep 17 00:00:00 2001
From: Jeffrey C. Ollie <jeff at ocjtech.us>
Date: Sat, 3 Jan 2009 22:26:11 -0600
Subject: [PATCH 11/11] Update autoconf.

---
 configure                        |23473 ++++++++++++++++++++------------------
 include/asterisk/autoconfig.h.in |   60 +-
 2 files changed, 12574 insertions(+), 10959 deletions(-)

diff --git a/configure b/configure
index 45c9f2a..b21b693 100755
--- a/configure
+++ b/configure
@@ -1,12 +1,12 @@
 #! /bin/sh
-# From configure.ac Revision: 163170 .
+# From configure.ac Revision.
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for asterisk 1.6.
+# Generated by GNU Autoconf 2.63 for asterisk 1.6.
 #
 # Report bugs to <www.asterisk.org>.
 #
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 # This configure script is free software; the Free Software Foundation
 # gives unlimited permission to copy, distribute and modify it.
 #
@@ -20,7 +20,7 @@ DUALCASE=1; export DUALCASE # for MKS sh
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
   emulate sh
   NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
   # is contrary to our usage.  Disable this feature.
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
@@ -42,17 +42,45 @@ as_cr_Letters=$as_cr_letters$as_cr_LETTERS
 as_cr_digits='0123456789'
 as_cr_alnum=$as_cr_Letters$as_cr_digits
 
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
+as_nl='
+'
+export as_nl
+# Printing a long string crashes Solaris 7 /usr/bin/printf.
+as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
+if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+  as_echo='printf %s\n'
+  as_echo_n='printf %s'
+else
+  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
+    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
+    as_echo_n='/usr/ucb/echo -n'
   else
-    PATH_SEPARATOR=:
+    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
+    as_echo_n_body='eval
+      arg=$1;
+      case $arg in
+      *"$as_nl"*)
+	expr "X$arg" : "X\\(.*\\)$as_nl";
+	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
+      esac;
+      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
+    '
+    export as_echo_n_body
+    as_echo_n='sh -c $as_echo_n_body as_echo'
   fi
-  rm -f conf$$.sh
+  export as_echo_body
+  as_echo='sh -c $as_echo_body as_echo'
+fi
+
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+  PATH_SEPARATOR=:
+  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
+    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
+      PATH_SEPARATOR=';'
+  }
 fi
 
 # Support unset when possible.
@@ -68,8 +96,6 @@ fi
 # there to prevent editors from complaining about space-tab.
 # (If _AS_PATH_WALK were called with IFS unset, it would disable word
 # splitting by setting IFS to empty value.)
-as_nl='
-'
 IFS=" ""	$as_nl"
 
 # Find who we are.  Look in the path if we contain no directory separator.
@@ -92,7 +118,7 @@ if test "x$as_myself" = x; then
   as_myself=$0
 fi
 if test ! -f "$as_myself"; then
-  echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
   { (exit 1); exit 1; }
 fi
 
@@ -105,17 +131,10 @@ PS2='> '
 PS4='+ '
 
 # NLS nuisances.
-for as_var in \
-  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
-  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
-  LC_TELEPHONE LC_TIME
-do
-  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
-    eval $as_var=C; export $as_var
-  else
-    ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-  fi
-done
+LC_ALL=C
+export LC_ALL
+LANGUAGE=C
+export LANGUAGE
 
 # Required to use basename.
 if expr a : '\(a\)' >/dev/null 2>&1 &&
@@ -137,7 +156,7 @@ as_me=`$as_basename -- "$0" ||
 $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
 	 X"$0" : 'X\(//\)$' \| \
 	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-echo X/"$0" |
+$as_echo X/"$0" |
     sed '/^.*\/\([^/][^/]*\)\/*$/{
 	    s//\1/
 	    q
@@ -163,7 +182,7 @@ else
   as_have_required=no
 fi
 
-  if test $as_have_required = yes && 	 (eval ":
+  if test $as_have_required = yes &&	 (eval ":
 (as_func_return () {
   (exit \$1)
 }
@@ -245,7 +264,7 @@ IFS=$as_save_IFS
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
   emulate sh
   NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
   # is contrary to our usage.  Disable this feature.
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
@@ -266,7 +285,7 @@ _ASEOF
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
   emulate sh
   NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
   # is contrary to our usage.  Disable this feature.
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
@@ -346,10 +365,10 @@ fi
 
       if test "x$CONFIG_SHELL" != x; then
   for as_var in BASH_ENV ENV
-        do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-        done
-        export CONFIG_SHELL
-        exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
+	do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+	done
+	export CONFIG_SHELL
+	exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
 fi
 
 
@@ -418,9 +437,10 @@ fi
 
 test \$exitcode = 0") || {
   echo No shell found that supports shell functions.
-  echo Please tell autoconf at gnu.org about your system,
-  echo including any error possibly output before this
-  echo message
+  echo Please tell bug-autoconf at gnu.org about your system,
+  echo including any error possibly output before this message.
+  echo This can help us improve future autoconf versions.
+  echo Configuration will now proceed without shell functions.
 }
 
 
[...45557 lines suppressed...]
     else
-      rm -f $ac_file
-      mv "$tmp/config.h" $ac_file
+      rm -f "$ac_file"
+      mv "$tmp/config.h" "$ac_file" \
+	|| { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
+$as_echo "$as_me: error: could not create $ac_file" >&2;}
+   { (exit 1); exit 1; }; }
     fi
   else
-    echo "/* $configure_input  */"
-    cat "$ac_result"
+    $as_echo "/* $configure_input  */" \
+      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
+      || { { $as_echo "$as_me:$LINENO: error: could not create -" >&5
+$as_echo "$as_me: error: could not create -" >&2;}
+   { (exit 1); exit 1; }; }
   fi
-  rm -f "$tmp/out12"
  ;;
 
 
@@ -51933,6 +53545,11 @@ _ACEOF
 chmod +x $CONFIG_STATUS
 ac_clean_files=$ac_clean_files_save
 
+test $ac_write_fail = 0 ||
+  { { $as_echo "$as_me:$LINENO: error: write failure creating $CONFIG_STATUS" >&5
+$as_echo "$as_me: error: write failure creating $CONFIG_STATUS" >&2;}
+   { (exit 1); exit 1; }; }
+
 
 # configure is writing to config.log, and then calls config.status.
 # config.status does its own redirection, appending to config.log.
@@ -51954,6 +53571,10 @@ if test "$no_create" != yes; then
   # would make configure fail if this is the last instruction.
   $ac_cs_success || { (exit 1); exit 1; }
 fi
+if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
+  { $as_echo "$as_me:$LINENO: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
+$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
+fi
 
 
 if test "x${silent}" != "xyes" ; then
@@ -51982,17 +53603,17 @@ echo "       \$\$\$\$\$\$\$\$\$\$\$\$\$\$\$\$.                "
 echo
 fi
 
-{ echo "$as_me:$LINENO: Package configured for: " >&5
-echo "$as_me: Package configured for: " >&6;}
-{ echo "$as_me:$LINENO: OS type  : $host_os" >&5
-echo "$as_me: OS type  : $host_os" >&6;}
-{ echo "$as_me:$LINENO: Host CPU : $host_cpu" >&5
-echo "$as_me: Host CPU : $host_cpu" >&6;}
-{ echo "$as_me:$LINENO: build-cpu:vendor:os: $build_cpu : $build_vendor : $build_os :" >&5
-echo "$as_me: build-cpu:vendor:os: $build_cpu : $build_vendor : $build_os :" >&6;}
-{ echo "$as_me:$LINENO: host-cpu:vendor:os: $host_cpu : $host_vendor : $host_os :" >&5
-echo "$as_me: host-cpu:vendor:os: $host_cpu : $host_vendor : $host_os :" >&6;}
+{ $as_echo "$as_me:$LINENO: Package configured for: " >&5
+$as_echo "$as_me: Package configured for: " >&6;}
+{ $as_echo "$as_me:$LINENO: OS type  : $host_os" >&5
+$as_echo "$as_me: OS type  : $host_os" >&6;}
+{ $as_echo "$as_me:$LINENO: Host CPU : $host_cpu" >&5
+$as_echo "$as_me: Host CPU : $host_cpu" >&6;}
+{ $as_echo "$as_me:$LINENO: build-cpu:vendor:os: $build_cpu : $build_vendor : $build_os :" >&5
+$as_echo "$as_me: build-cpu:vendor:os: $build_cpu : $build_vendor : $build_os :" >&6;}
+{ $as_echo "$as_me:$LINENO: host-cpu:vendor:os: $host_cpu : $host_vendor : $host_os :" >&5
+$as_echo "$as_me: host-cpu:vendor:os: $host_cpu : $host_vendor : $host_os :" >&6;}
 if test "${cross_compiling}" = "yes"; then
-   { echo "$as_me:$LINENO: Cross Compilation = YES" >&5
-echo "$as_me: Cross Compilation = YES" >&6;}
+   { $as_echo "$as_me:$LINENO: Cross Compilation = YES" >&5
+$as_echo "$as_me: Cross Compilation = YES" >&6;}
 fi
diff --git a/include/asterisk/autoconfig.h.in b/include/asterisk/autoconfig.h.in
index e567f45..2cd6e64 100644
--- a/include/asterisk/autoconfig.h.in
+++ b/include/asterisk/autoconfig.h.in
@@ -126,6 +126,12 @@
 /* Define to indicate the ${BKTR_DESCRIP} library version */
 #undef HAVE_BKTR_VERSION
 
+/* Define this to indicate the ${BLUETOOTH_DESCRIP} library */
+#undef HAVE_BLUETOOTH
+
+/* Define to indicate the ${BLUETOOTH_DESCRIP} library version */
+#undef HAVE_BLUETOOTH_VERSION
+
 /* Define to 1 if byteswap.h macros are available. */
 #undef HAVE_BYTESWAP_H
 
@@ -407,6 +413,9 @@
 /* Define to indicate the ${LDAP_DESCRIP} library version */
 #undef HAVE_LDAP_VERSION
 
+/* Define if your system has the NetBSD Editline libraries. */
+#undef HAVE_LIBEDIT
+
 /* Define to 1 if you have the <libintl.h> header file. */
 #undef HAVE_LIBINTL_H
 
@@ -464,12 +473,9 @@
 /* Define to indicate the ${LTDL_DESCRIP} library version */
 #undef HAVE_LTDL_VERSION
 
-/* Define this to indicate the ${LUA_DESCRIP} library */
+/* Define if your system has the LUA libraries. */
 #undef HAVE_LUA
 
-/* Define to indicate the ${LUA_DESCRIP} library version */
-#undef HAVE_LUA_VERSION
-
 /* Define to 1 if you have the <malloc.h> header file. */
 #undef HAVE_MALLOC_H
 
@@ -1115,9 +1121,6 @@
 /* Define to the version of this package. */
 #undef PACKAGE_VERSION
 
-/* Define to 1 if the C compiler supports function prototypes. */
-#undef PROTOTYPES
-
 /* Define to necessary symbol if this constant uses a non-standard name on
    your system. */
 #undef PTHREAD_CREATE_JOINABLE
@@ -1134,11 +1137,6 @@
 /* Define to the type of arg 5 for `select'. */
 #undef SELECT_TYPE_ARG5
 
-/* Define to 1 if the `setvbuf' function takes the buffering type as its
-   second argument and the buffer pointer as the third, as on System V before
-   release 3. */
-#undef SETVBUF_REVERSED
-
 /* The size of `int', as computed by sizeof. */
 #undef SIZEOF_INT
 
@@ -1159,20 +1157,30 @@
 /* Define to 1 if your <sys/time.h> declares `struct tm'. */
 #undef TM_IN_SYS_TIME
 
-/* Define to 1 if on AIX 3.
-   System headers sometimes define this.
-   We just want to avoid a redefinition error message.  */
+/* Enable extensions on AIX 3, Interix.  */
 #ifndef _ALL_SOURCE
 # undef _ALL_SOURCE
 #endif
-
-/* Number of bits in a file offset, on hosts where this is settable. */
-#undef _FILE_OFFSET_BITS
-
 /* Enable GNU extensions on systems that have them.  */
 #ifndef _GNU_SOURCE
 # undef _GNU_SOURCE
 #endif
+/* Enable threading extensions on Solaris.  */
+#ifndef _POSIX_PTHREAD_SEMANTICS
+# undef _POSIX_PTHREAD_SEMANTICS
+#endif
+/* Enable extensions on HP NonStop.  */
+#ifndef _TANDEM_SOURCE
+# undef _TANDEM_SOURCE
+#endif
+/* Enable general extensions on Solaris.  */
+#ifndef __EXTENSIONS__
+# undef __EXTENSIONS__
+#endif
+
+
+/* Number of bits in a file offset, on hosts where this is settable. */
+#undef _FILE_OFFSET_BITS
 
 /* Define to 1 to make fseeko visible on some hosts (e.g. glibc 2.2). */
 #undef _LARGEFILE_SOURCE
@@ -1190,20 +1198,6 @@
 /* Define to 1 if you need to in order for `stat' and other things to work. */
 #undef _POSIX_SOURCE
 
-/* Enable extensions on Solaris.  */
-#ifndef __EXTENSIONS__
-# undef __EXTENSIONS__
-#endif
-#ifndef _POSIX_PTHREAD_SEMANTICS
-# undef _POSIX_PTHREAD_SEMANTICS
-#endif
-#ifndef _TANDEM_SOURCE
-# undef _TANDEM_SOURCE
-#endif
-
-/* Define like PROTOTYPES; this can be used by system headers. */
-#undef __PROTOTYPES
-
 /* Define to empty if `const' does not conform to ANSI C. */
 #undef const
 
-- 
1.6.1


0001-Modify-init-scripts-for-better-Fedora-compatibility.patch:

Index: 0001-Modify-init-scripts-for-better-Fedora-compatibility.patch
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/devel/0001-Modify-init-scripts-for-better-Fedora-compatibility.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- 0001-Modify-init-scripts-for-better-Fedora-compatibility.patch	4 Jan 2009 05:05:40 -0000	1.6
+++ 0001-Modify-init-scripts-for-better-Fedora-compatibility.patch	4 Jan 2009 05:52:31 -0000	1.7
@@ -1,7 +1,7 @@
 From d397bc03e86335ed571121fa501dfefdc2ddbd4c Mon Sep 17 00:00:00 2001
 From: Jeffrey C. Ollie <jeff at ocjtech.us>
 Date: Sun, 18 Nov 2007 21:47:59 -0600
-Subject: [PATCH 01/10] Modify init scripts for better Fedora compatibility.
+Subject: [PATCH 01/11] Modify init scripts for better Fedora compatibility.
 
 ---
  contrib/init.d/rc.redhat.asterisk |   61 +++++++++++++++++-------------------

0002-Modify-modules.conf-so-that-different-voicemail-modu.patch:

Index: 0002-Modify-modules.conf-so-that-different-voicemail-modu.patch
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/devel/0002-Modify-modules.conf-so-that-different-voicemail-modu.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- 0002-Modify-modules.conf-so-that-different-voicemail-modu.patch	4 Jan 2009 05:05:40 -0000	1.6
+++ 0002-Modify-modules.conf-so-that-different-voicemail-modu.patch	4 Jan 2009 05:52:31 -0000	1.7
@@ -1,7 +1,7 @@
 From e5d3f951bfa543e5d8b8cf85535f80b1d1143e09 Mon Sep 17 00:00:00 2001
 From: Jeffrey C. Ollie <jcollie at pc21224.campus.dmacc.edu>
 Date: Thu, 8 Nov 2007 15:52:36 -0600
-Subject: [PATCH 02/10] Modify modules.conf so that different voicemail modules can be loaded.
+Subject: [PATCH 02/11] Modify modules.conf so that different voicemail modules can be loaded.
 
 ---
  configs/modules.conf.sample |   26 ++++++++++++++++++++++++++

0003-Add-chan_mobile-from-asterisk-addons.patch:

Index: 0003-Add-chan_mobile-from-asterisk-addons.patch
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/devel/0003-Add-chan_mobile-from-asterisk-addons.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- 0003-Add-chan_mobile-from-asterisk-addons.patch	4 Jan 2009 05:05:40 -0000	1.2
+++ 0003-Add-chan_mobile-from-asterisk-addons.patch	4 Jan 2009 05:52:31 -0000	1.3
@@ -1,7 +1,7 @@
 From aeb688bc0889a4b035fd1590ba8df85af6e0a38c Mon Sep 17 00:00:00 2001
 From: Jeffrey C. Ollie <jeff at ocjtech.us>
 Date: Thu, 16 Oct 2008 16:12:01 -0500
-Subject: [PATCH 03/10] Add chan_mobile from asterisk-addons.
+Subject: [PATCH 03/11] Add chan_mobile from asterisk-addons.
 
 ---
  build_tools/menuselect-deps.in |    1 +

0004-Use-pkgconfig-to-check-for-Lua.patch:

Index: 0004-Use-pkgconfig-to-check-for-Lua.patch
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/devel/0004-Use-pkgconfig-to-check-for-Lua.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- 0004-Use-pkgconfig-to-check-for-Lua.patch	4 Jan 2009 05:05:40 -0000	1.2
+++ 0004-Use-pkgconfig-to-check-for-Lua.patch	4 Jan 2009 05:52:31 -0000	1.3
@@ -1,7 +1,7 @@
 From 24b4e78b81a06375e233ccc7745d5d3bc5b1cc7e Mon Sep 17 00:00:00 2001
 From: Jeffrey C. Ollie <jeff at ocjtech.us>
 Date: Mon, 25 Feb 2008 13:14:23 -0600
-Subject: [PATCH 04/10] Use pkgconfig to check for Lua.
+Subject: [PATCH 04/11] Use pkgconfig to check for Lua.
 
 ---
  configure.ac |    9 ++++++++-

0005-Build-using-external-libedit.patch:

Index: 0005-Build-using-external-libedit.patch
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/devel/0005-Build-using-external-libedit.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 0005-Build-using-external-libedit.patch	4 Jan 2009 05:05:40 -0000	1.1
+++ 0005-Build-using-external-libedit.patch	4 Jan 2009 05:52:31 -0000	1.2
@@ -1,7 +1,7 @@
 From 1fc4e0fd9d7d24fd087a1c0d6f4dff5a1fec010f Mon Sep 17 00:00:00 2001
 From: Jeffrey C. Ollie <jeff at ocjtech.us>
 Date: Tue, 25 Mar 2008 00:50:27 -0500
-Subject: [PATCH 05/10] Build using external libedit.
+Subject: [PATCH 05/11] Build using external libedit.
 
 ---
  build_tools/menuselect-deps.in |    1 +

0006-Revert-changes-to-pbx_lua-from-rev-126363-that-cause.patch:

Index: 0006-Revert-changes-to-pbx_lua-from-rev-126363-that-cause.patch
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/devel/0006-Revert-changes-to-pbx_lua-from-rev-126363-that-cause.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 0006-Revert-changes-to-pbx_lua-from-rev-126363-that-cause.patch	4 Jan 2009 05:05:40 -0000	1.1
+++ 0006-Revert-changes-to-pbx_lua-from-rev-126363-that-cause.patch	4 Jan 2009 05:52:31 -0000	1.2
@@ -1,7 +1,7 @@
 From eb9cc1a836086024bb619948468a80c4ff75bed9 Mon Sep 17 00:00:00 2001
 From: Jeffrey C. Ollie <jeff at ocjtech.us>
 Date: Fri, 10 Oct 2008 11:54:10 -0500
-Subject: [PATCH 06/10] Revert changes to pbx_lua from rev 126363 that cause some problems.
+Subject: [PATCH 06/11] Revert changes to pbx_lua from rev 126363 that cause some problems.
 
 ---
  pbx/pbx_lua.c |    6 +++---


Index: asterisk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/devel/asterisk.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- asterisk.spec	4 Jan 2009 05:05:42 -0000	1.43
+++ asterisk.spec	4 Jan 2009 05:52:34 -0000	1.44
@@ -3,7 +3,7 @@
 Summary: The Open Source PBX
 Name: asterisk
 Version: 1.6.1
-Release: 0.8%{?beta:beta%{beta}}%{?dist}
+Release: 0.9%{?beta:beta%{beta}}%{?dist}
 License: GPLv2
 Group: Applications/Internet
 URL: http://www.asterisk.org/
@@ -39,10 +39,11 @@
 Patch4:  0004-Use-pkgconfig-to-check-for-Lua.patch
 Patch5:  0005-Build-using-external-libedit.patch
 Patch6:  0006-Revert-changes-to-pbx_lua-from-rev-126363-that-cause.patch
-Patch7:  0007-change-configure.ac-to-look-for-pkg-config-gmime-2.4.patch
-Patch8:  0008-fix-the-AST_PROG_SED-problem-that-makes-.-bootstrap.patch
-Patch9:  0009-my-guess-as-replacements-for-the-missing-broken-stuf.patch
-Patch10: 0010-Update-autoconf.patch
+Patch7:  0007-Define-missing-variable-when-compiling-on-PPC.patch
+Patch8:  0008-change-configure.ac-to-look-for-pkg-config-gmime-2.4.patch
+Patch9:  0009-fix-the-AST_PROG_SED-problem-that-makes-.-bootstrap.patch
+Patch10: 0010-my-guess-as-replacements-for-the-missing-broken-stuf.patch
+Patch11: 0011-Update-autoconf.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
 
@@ -429,6 +430,7 @@
 %patch8 -p1
 %patch9 -p1
 %patch10 -p1
+%patch11 -p1
 
 cp %{SOURCE2} menuselect.makedeps
 cp %{SOURCE3} menuselect.makeopts
@@ -1055,6 +1057,9 @@
 %{_libdir}/asterisk/modules/app_voicemail_plain.so
 
 %changelog
+* Sat Jan  3 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6.1-0.9.beta4
+- Update patches
+
 * Sat Jan  3 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6.1-0.8.beta4
 - Update to 1.6.1-beta4
 


--- 0007-change-configure.ac-to-look-for-pkg-config-gmime-2.4.patch DELETED ---


--- 0008-fix-the-AST_PROG_SED-problem-that-makes-.-bootstrap.patch DELETED ---


--- 0009-my-guess-as-replacements-for-the-missing-broken-stuf.patch DELETED ---


--- 0010-Update-autoconf.patch DELETED ---



From mclasen at fedoraproject.org  Sun Jan  4 05:55:53 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Sun,  4 Jan 2009 05:55:53 +0000 (UTC)
Subject: rpms/poppler/F-10 pdftops-large-image.patch, 1.1, 1.2 poppler.spec, 
	1.77, 1.78
Message-ID: <20090104055553.E836B7013F@cvs1.fedora.phx.redhat.com>

Author: mclasen

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

Modified Files:
	pdftops-large-image.patch poppler.spec 
Log Message:
fix the patch


pdftops-large-image.patch:

Index: pdftops-large-image.patch
===================================================================
RCS file: /cvs/pkgs/rpms/poppler/F-10/pdftops-large-image.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pdftops-large-image.patch	4 Jan 2009 05:15:29 -0000	1.1
+++ pdftops-large-image.patch	4 Jan 2009 05:55:23 -0000	1.2
@@ -1,8 +1,6 @@
-diff --git a/poppler/PSOutputDev.cc b/poppler/PSOutputDev.cc
-index 014036b..52495d7 100644
---- a/poppler/PSOutputDev.cc
-+++ b/poppler/PSOutputDev.cc
-@@ -2610,6 +2610,7 @@ void PSOutputDev::setupImage(Ref id, Stream *str) {
+--- poppler-0.8.7/poppler/PSOutputDev.cc	2008-06-01 16:35:25.000000000 +0200
++++ poppler-0.8.7.new/poppler/PSOutputDev.cc	2009-01-02 14:20:25.000000000 +0100
+@@ -2591,6 +2591,7 @@
    GooString *s;
    int c;
    int size, line, col, i;
@@ -10,7 +8,7 @@
  
    // check if image is already setup
    for (i = 0; i < imgIDLen; ++i) {
-@@ -2696,56 +2697,72 @@ void PSOutputDev::setupImage(Ref id, Stream *str) {
+@@ -2677,56 +2678,72 @@
    if (useRLE) {
      ++size;
    }
@@ -120,25 +118,25 @@
    str->close();
  
    delete str;
-@@ -4382,7 +4399,7 @@ void PSOutputDev::doImageL1(Object *ref, GfxImageColorMap *colorMap,
-       // make sure the image is setup, it sometimes is not like on bug #17645
-       setupImage(ref->getRef(), str);
+@@ -4361,7 +4378,7 @@
+       delete str;
+     } else {
        // set up to use the array already created by setupImages()
 -      writePSFmt("ImData_{0:d}_{1:d} 0\n", ref->getRefNum(), ref->getRefGen());
 +      writePSFmt("ImData_{0:d}_{1:d} 0 0\n", ref->getRefNum(), ref->getRefGen());
      }
    }
  
-@@ -4845,7 +4862,7 @@ void PSOutputDev::doImageL2(Object *ref, GfxImageColorMap *colorMap,
-       // make sure the image is setup, it sometimes is not like on bug #17645
-       setupImage(ref->getRef(), str);
+@@ -4822,7 +4839,7 @@
+       delete str2;
+     } else {
        // set up to use the array already created by setupImages()
 -      writePSFmt("ImData_{0:d}_{1:d} 0\n", ref->getRefNum(), ref->getRefGen());
 +      writePSFmt("ImData_{0:d}_{1:d} 0 0\n",ref->getRefNum(), ref->getRefGen());
      }
    }
  
-@@ -4899,7 +4916,12 @@ void PSOutputDev::doImageL2(Object *ref, GfxImageColorMap *colorMap,
+@@ -4876,7 +4893,12 @@
  
    // data source
    if (mode == psModeForm || inType3Char || preload) {
@@ -152,7 +150,7 @@
    } else {
      writePS("  /DataSource currentfile\n");
    }
-@@ -4938,6 +4960,7 @@ void PSOutputDev::doImageL2(Object *ref, GfxImageColorMap *colorMap,
+@@ -4915,6 +4937,7 @@
      writePSFmt(">>\n{0:s}\n", colorMap ? "image" : "imagemask");
  
      // get rid of the array and index
@@ -160,16 +158,16 @@
      writePS("pop pop\n");
  
    } else {
-@@ -5115,7 +5138,7 @@ void PSOutputDev::doImageL3(Object *ref, GfxImageColorMap *colorMap,
-       // make sure the image is setup, it sometimes is not like on bug #17645
-       setupImage(ref->getRef(), str);
+@@ -5090,7 +5113,7 @@
+       delete str2;
+     } else {
        // set up to use the array already created by setupImages()
 -      writePSFmt("ImData_{0:d}_{1:d} 0\n", ref->getRefNum(), ref->getRefGen());
 +      writePSFmt("ImData_{0:d}_{1:d} 0 0\n", ref->getRefNum(), ref->getRefGen());
      }
    }
  
-@@ -5186,7 +5209,12 @@ void PSOutputDev::doImageL3(Object *ref, GfxImageColorMap *colorMap,
+@@ -5161,7 +5184,12 @@
  
    // data source
    if (mode == psModeForm || inType3Char || preload) {
@@ -183,7 +181,7 @@
    } else {
      writePS("  /DataSource currentfile\n");
    }
-@@ -5322,6 +5350,7 @@ void PSOutputDev::doImageL3(Object *ref, GfxImageColorMap *colorMap,
+@@ -5297,6 +5325,7 @@
  
    // get rid of the array and index
    if (mode == psModeForm || inType3Char || preload) {


Index: poppler.spec
===================================================================
RCS file: /cvs/pkgs/rpms/poppler/F-10/poppler.spec,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- poppler.spec	4 Jan 2009 05:15:29 -0000	1.77
+++ poppler.spec	4 Jan 2009 05:55:23 -0000	1.78
@@ -3,7 +3,7 @@
 Summary: PDF rendering library
 Name: poppler
 Version: 0.8.7
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2 and Redistributable, no modification permitted
 # the code is GPLv2
 # the charmap data in /usr/share/poppler is redistributable
@@ -198,7 +198,7 @@
 %{_mandir}/man1/*
 
 %changelog
-* Sun Jan  4 2009 Matthias Clasen  <mclasen at redhat.com> - 0.8.7-3
+* Sun Jan  4 2009 Matthias Clasen  <mclasen at redhat.com> - 0.8.7-4
 - Fix a problem with large images
 
 * Tue Sep 16 2008 Rex Dieter <rdieter at fedoraproject.org> - 0.8.7-2



From agoode at fedoraproject.org  Sun Jan  4 05:56:04 2009
From: agoode at fedoraproject.org (Adam Goode)
Date: Sun,  4 Jan 2009 05:56:04 +0000 (UTC)
Subject: rpms/escape/devel escape.spec,1.13,1.14
Message-ID: <20090104055604.741A97013F@cvs1.fedora.phx.redhat.com>

Author: agoode

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

Modified Files:
	escape.spec 
Log Message:
* Sun Jan  4 2009 Adam Goode <adam at spicenitz.org> - 200704130-10
- Correct post and postun scripts for icon cache



Index: escape.spec
===================================================================
RCS file: /cvs/extras/rpms/escape/devel/escape.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- escape.spec	23 Nov 2008 01:19:03 -0000	1.13
+++ escape.spec	4 Jan 2009 05:55:34 -0000	1.14
@@ -1,6 +1,6 @@
 Name:		escape
 Version:	200704130
-Release:	9%{?dist}
+Release:	10%{?dist}
 Summary:	Extensible block-pushing puzzle game
 
 Group:		Amusements/Games
@@ -79,13 +79,16 @@
 
 
 %post
-touch --no-create %{_datadir}/icons/hicolor || :
-%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-
+touch --no-create %{_datadir}/icons/hicolor
+if [ -x %{_bindir}/gtk-update-icon-cache ] ; then
+	%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+fi
 
 %postun
-touch --no-create %{_datadir}/icons/hicolor || :
-%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+touch --no-create %{_datadir}/icons/hicolor
+if [ -x %{_bindir}/gtk-update-icon-cache ] ; then
+	%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+fi
 
 
 %clean
@@ -102,6 +105,9 @@
 
 
 %changelog
+* Sun Jan  4 2009 Adam Goode <adam at spicenitz.org> - 200704130-10
+- Correct post and postun scripts for icon cache
+
 * Sat Aug 30 2008 Adam Goode <adam at spicenitz.org> - 200704130-9
 - RPM 4.6 fix for patch tag
 



From jstanley at fedoraproject.org  Sun Jan  4 07:10:12 2009
From: jstanley at fedoraproject.org (Jon Stanley)
Date: Sun,  4 Jan 2009 07:10:12 +0000 (UTC)
Subject: rpms/supybot-fedora/EL-5 .cvsignore, 1.1, 1.2 sources, 1.2,
	1.3 supybot-fedora.spec, 1.1, 1.2
Message-ID: <20090104071012.CD6C07011F@cvs1.fedora.phx.redhat.com>

Author: jstanley

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

Modified Files:
	.cvsignore sources supybot-fedora.spec 
Log Message:
update to 0.2.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/supybot-fedora/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	8 Dec 2008 00:38:38 -0000	1.1
+++ .cvsignore	4 Jan 2009 07:09:40 -0000	1.2
@@ -0,0 +1 @@
+supybot-fedora-0.2.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/supybot-fedora/EL-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Dec 2008 01:37:20 -0000	1.2
+++ sources	4 Jan 2009 07:09:40 -0000	1.3
@@ -1 +1 @@
-a8888989d6e222c0f97b1ba50d8ff3dc  supybot-fedora-0.2.tar.bz2
+18785e3e40363ae8f3e348412286593c  supybot-fedora-0.2.1.tar.bz2


Index: supybot-fedora.spec
===================================================================
RCS file: /cvs/pkgs/rpms/supybot-fedora/EL-5/supybot-fedora.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- supybot-fedora.spec	8 Dec 2008 01:37:20 -0000	1.1
+++ supybot-fedora.spec	4 Jan 2009 07:09:40 -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:           supybot-fedora
-Version:        0.2
-Release:        4%{?dist}
+Version:        0.2.1
+Release:        1%{?dist}
 Summary:        Plugin for Supybot to interact with Fedora services
 
 Group:          Applications/Internet
@@ -54,6 +54,9 @@
 
 
 %changelog
+* Sun Jan 4 2009 Jon Stanley <jonstanley at gmail.com> - 0.2.1-1
+- New upstream 0.2.1
+
 * Sun Dec 7 2008 Jon Stanley <jonstanley at gmail.com> - 0.2-4
 - Fix license tag per review
 



From jstanley at fedoraproject.org  Sun Jan  4 07:18:15 2009
From: jstanley at fedoraproject.org (Jon Stanley)
Date: Sun,  4 Jan 2009 07:18:15 +0000 (UTC)
Subject: rpms/supybot-fedora/F-10 sources, 1.2, 1.3 supybot-fedora.spec, 1.1,
	1.2
Message-ID: <20090104071815.92DE07013F@cvs1.fedora.phx.redhat.com>

Author: jstanley

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

Modified Files:
	sources supybot-fedora.spec 
Log Message:
update other branches



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/supybot-fedora/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Dec 2008 01:37:21 -0000	1.2
+++ sources	4 Jan 2009 07:17:45 -0000	1.3
@@ -1 +1 @@
-a8888989d6e222c0f97b1ba50d8ff3dc  supybot-fedora-0.2.tar.bz2
+18785e3e40363ae8f3e348412286593c  supybot-fedora-0.2.1.tar.bz2


Index: supybot-fedora.spec
===================================================================
RCS file: /cvs/pkgs/rpms/supybot-fedora/F-10/supybot-fedora.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- supybot-fedora.spec	8 Dec 2008 01:37:21 -0000	1.1
+++ supybot-fedora.spec	4 Jan 2009 07:17:45 -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:           supybot-fedora
-Version:        0.2
-Release:        4%{?dist}
+Version:        0.2.1
+Release:        1%{?dist}
 Summary:        Plugin for Supybot to interact with Fedora services
 
 Group:          Applications/Internet
@@ -54,6 +54,9 @@
 
 
 %changelog
+* Sun Jan 4 2009 Jon Stanley <jonstanley at gmail.com> - 0.2.1-1
+- New upstream 0.2.1
+
 * Sun Dec 7 2008 Jon Stanley <jonstanley at gmail.com> - 0.2-4
 - Fix license tag per review
 



From jstanley at fedoraproject.org  Sun Jan  4 07:18:15 2009
From: jstanley at fedoraproject.org (Jon Stanley)
Date: Sun,  4 Jan 2009 07:18:15 +0000 (UTC)
Subject: rpms/supybot-fedora/F-9 sources, 1.2, 1.3 supybot-fedora.spec, 1.1,
	1.2
Message-ID: <20090104071815.E1C997013F@cvs1.fedora.phx.redhat.com>

Author: jstanley

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

Modified Files:
	sources supybot-fedora.spec 
Log Message:
update other branches



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/supybot-fedora/F-9/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Dec 2008 01:37:22 -0000	1.2
+++ sources	4 Jan 2009 07:17:45 -0000	1.3
@@ -1 +1 @@
-a8888989d6e222c0f97b1ba50d8ff3dc  supybot-fedora-0.2.tar.bz2
+18785e3e40363ae8f3e348412286593c  supybot-fedora-0.2.1.tar.bz2


Index: supybot-fedora.spec
===================================================================
RCS file: /cvs/pkgs/rpms/supybot-fedora/F-9/supybot-fedora.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- supybot-fedora.spec	8 Dec 2008 01:37:22 -0000	1.1
+++ supybot-fedora.spec	4 Jan 2009 07:17:45 -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:           supybot-fedora
-Version:        0.2
-Release:        4%{?dist}
+Version:        0.2.1
+Release:        1%{?dist}
 Summary:        Plugin for Supybot to interact with Fedora services
 
 Group:          Applications/Internet
@@ -54,6 +54,9 @@
 
 
 %changelog
+* Sun Jan 4 2009 Jon Stanley <jonstanley at gmail.com> - 0.2.1-1
+- New upstream 0.2.1
+
 * Sun Dec 7 2008 Jon Stanley <jonstanley at gmail.com> - 0.2-4
 - Fix license tag per review
 



From jstanley at fedoraproject.org  Sun Jan  4 07:18:16 2009
From: jstanley at fedoraproject.org (Jon Stanley)
Date: Sun,  4 Jan 2009 07:18:16 +0000 (UTC)
Subject: rpms/supybot-fedora/devel sources, 1.2, 1.3 supybot-fedora.spec, 1.1,
	1.2
Message-ID: <20090104071816.58BE77013F@cvs1.fedora.phx.redhat.com>

Author: jstanley

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

Modified Files:
	sources supybot-fedora.spec 
Log Message:
update other branches



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/supybot-fedora/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Dec 2008 01:23:26 -0000	1.2
+++ sources	4 Jan 2009 07:17:45 -0000	1.3
@@ -1 +1 @@
-a8888989d6e222c0f97b1ba50d8ff3dc  supybot-fedora-0.2.tar.bz2
+18785e3e40363ae8f3e348412286593c  supybot-fedora-0.2.1.tar.bz2


Index: supybot-fedora.spec
===================================================================
RCS file: /cvs/pkgs/rpms/supybot-fedora/devel/supybot-fedora.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- supybot-fedora.spec	8 Dec 2008 01:23:26 -0000	1.1
+++ supybot-fedora.spec	4 Jan 2009 07:17:46 -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:           supybot-fedora
-Version:        0.2
-Release:        4%{?dist}
+Version:        0.2.1
+Release:        1%{?dist}
 Summary:        Plugin for Supybot to interact with Fedora services
 
 Group:          Applications/Internet
@@ -54,6 +54,9 @@
 
 
 %changelog
+* Sun Jan 4 2009 Jon Stanley <jonstanley at gmail.com> - 0.2.1-1
+- New upstream 0.2.1
+
 * Sun Dec 7 2008 Jon Stanley <jonstanley at gmail.com> - 0.2-4
 - Fix license tag per review
 



From pkgdb at fedoraproject.org  Sun Jan  4 10:08:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 04 Jan 2009 10:08:10 +0000
Subject: [pkgdb] maatkit had acl change status
Message-ID: <20090104100810.CB71720873E@bastion.fedora.phx.redhat.com>

lkundrak has set the watchbugzilla acl on maatkit (Fedora devel) to Approved for slankes

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



From pkgdb at fedoraproject.org  Sun Jan  4 10:08:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 04 Jan 2009 10:08:11 +0000
Subject: [pkgdb] maatkit had acl change status
Message-ID: <20090104100811.DF752208D4F@bastion.fedora.phx.redhat.com>

lkundrak has set the watchcommits acl on maatkit (Fedora devel) to Approved for slankes

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



From pkgdb at fedoraproject.org  Sun Jan  4 10:08:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 04 Jan 2009 10:08:12 +0000
Subject: [pkgdb] maatkit had acl change status
Message-ID: <20090104100812.C77D0208D52@bastion.fedora.phx.redhat.com>

lkundrak has set the commit acl on maatkit (Fedora devel) to Approved for slankes

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



From pkgdb at fedoraproject.org  Sun Jan  4 10:08:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 04 Jan 2009 10:08:19 +0000
Subject: [pkgdb] maatkit had acl change status
Message-ID: <20090104100819.9BC73208D57@bastion.fedora.phx.redhat.com>

lkundrak has set the approveacls acl on maatkit (Fedora devel) to Approved for slankes

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



From pkgdb at fedoraproject.org  Sun Jan  4 10:08:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 04 Jan 2009 10:08:22 +0000
Subject: [pkgdb] maatkit had acl change status
Message-ID: <20090104100822.5A8FC2081F2@bastion.fedora.phx.redhat.com>

lkundrak has set the watchbugzilla acl on maatkit (Fedora 10) to Approved for slankes

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



From pkgdb at fedoraproject.org  Sun Jan  4 10:08:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 04 Jan 2009 10:08:23 +0000
Subject: [pkgdb] maatkit had acl change status
Message-ID: <20090104100824.1CB2A208D5A@bastion.fedora.phx.redhat.com>

lkundrak has set the watchcommits acl on maatkit (Fedora 10) to Approved for slankes

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



From pkgdb at fedoraproject.org  Sun Jan  4 10:08:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 04 Jan 2009 10:08:25 +0000
Subject: [pkgdb] maatkit had acl change status
Message-ID: <20090104100825.A8936208D7D@bastion.fedora.phx.redhat.com>

lkundrak has set the commit acl on maatkit (Fedora 10) to Approved for slankes

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



From pkgdb at fedoraproject.org  Sun Jan  4 10:08:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 04 Jan 2009 10:08:26 +0000
Subject: [pkgdb] maatkit had acl change status
Message-ID: <20090104100826.D187A208DA5@bastion.fedora.phx.redhat.com>

lkundrak has set the approveacls acl on maatkit (Fedora 10) to Approved for slankes

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



From pkgdb at fedoraproject.org  Sun Jan  4 10:08:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 04 Jan 2009 10:08:32 +0000
Subject: [pkgdb] maatkit had acl change status
Message-ID: <20090104100832.25142208DA9@bastion.fedora.phx.redhat.com>

lkundrak has set the watchbugzilla acl on maatkit (Fedora 9) to Approved for slankes

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



From pkgdb at fedoraproject.org  Sun Jan  4 10:08:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 04 Jan 2009 10:08:33 +0000
Subject: [pkgdb] maatkit had acl change status
Message-ID: <20090104100833.D743D208DAC@bastion.fedora.phx.redhat.com>

lkundrak has set the watchcommits acl on maatkit (Fedora 9) to Approved for slankes

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



From pkgdb at fedoraproject.org  Sun Jan  4 10:08:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 04 Jan 2009 10:08:35 +0000
Subject: [pkgdb] maatkit had acl change status
Message-ID: <20090104100835.6FD95208DAE@bastion.fedora.phx.redhat.com>

lkundrak has set the commit acl on maatkit (Fedora 9) to Approved for slankes

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



From pkgdb at fedoraproject.org  Sun Jan  4 10:08:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 04 Jan 2009 10:08:37 +0000
Subject: [pkgdb] maatkit had acl change status
Message-ID: <20090104100838.1315C208D50@bastion.fedora.phx.redhat.com>

lkundrak has set the approveacls acl on maatkit (Fedora 9) to Approved for slankes

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



From nphilipp at fedoraproject.org  Sun Jan  4 12:07:04 2009
From: nphilipp at fedoraproject.org (Nils Philippsen)
Date: Sun,  4 Jan 2009 12:07:04 +0000 (UTC)
Subject: rpms/gimp/F-9 gimp.spec,1.166,1.167
Message-ID: <20090104120704.5225070141@cvs1.fedora.phx.redhat.com>

Author: nphilipp

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

Modified Files:
	gimp.spec 
Log Message:
enable building with aalib


Index: gimp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gimp/F-9/gimp.spec,v
retrieving revision 1.166
retrieving revision 1.167
diff -u -r1.166 -r1.167
--- gimp.spec	1 Jan 2009 21:38:31 -0000	1.166
+++ gimp.spec	4 Jan 2009 12:06:33 -0000	1.167
@@ -29,7 +29,7 @@
 %define age 0
 %define minorver 600
 %define microver %(ver=%{version}; echo ${ver##*.*.})
-Release:        1%{?dist}
+Release:        2%{?dist}
 Epoch:          2
 License:        GPLv2+
 Group:          Applications/Multimedia
@@ -173,7 +173,6 @@
 %patch1 -p1 -b .jpeg-units
 
 %build
-LIBAA="disable"; export LIBAA
 if [ ! -f configure ]; then
   ./autogen.sh --quiet $MYARCH_FLAGS --prefix=%{_prefix}
 fi
@@ -447,6 +446,9 @@
 %{_libdir}/gimp/%{interfacever}/plug-ins/help-browser
 
 %changelog
+* Sun Jan 04 2009 Nils Philippsen <nils at redhat.com> - 2:2.6.4-2
+- enable building with aalib
+
 * Thu Jan 01 2009 Nils Philippsen <nils at redhat.com> - 2:2.6.4-1
 - version 2.6.4
 



From nphilipp at fedoraproject.org  Sun Jan  4 12:07:04 2009
From: nphilipp at fedoraproject.org (Nils Philippsen)
Date: Sun,  4 Jan 2009 12:07:04 +0000 (UTC)
Subject: rpms/gimp/F-10 gimp.spec,1.176,1.177
Message-ID: <20090104120704.51AA070130@cvs1.fedora.phx.redhat.com>

Author: nphilipp

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

Modified Files:
	gimp.spec 
Log Message:
enable building with aalib


Index: gimp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gimp/F-10/gimp.spec,v
retrieving revision 1.176
retrieving revision 1.177
diff -u -r1.176 -r1.177
--- gimp.spec	1 Jan 2009 21:38:06 -0000	1.176
+++ gimp.spec	4 Jan 2009 12:06:31 -0000	1.177
@@ -29,7 +29,7 @@
 %define age 0
 %define minorver 600
 %define microver %(ver=%{version}; echo ${ver##*.*.})
-Release:        1%{?dist}
+Release:        2%{?dist}
 Epoch:          2
 License:        GPLv2+
 Group:          Applications/Multimedia
@@ -173,7 +173,6 @@
 %patch1 -p1 -b .jpeg-units
 
 %build
-LIBAA="disable"; export LIBAA
 if [ ! -f configure ]; then
   ./autogen.sh --quiet $MYARCH_FLAGS --prefix=%{_prefix}
 fi
@@ -447,6 +446,9 @@
 %{_libdir}/gimp/%{interfacever}/plug-ins/help-browser
 
 %changelog
+* Sun Jan 04 2009 Nils Philippsen <nils at redhat.com> - 2:2.6.4-2
+- enable building with aalib
+
 * Thu Jan 01 2009 Nils Philippsen <nils at redhat.com> - 2:2.6.4-1
 - version 2.6.4
 



From nphilipp at fedoraproject.org  Sun Jan  4 12:07:04 2009
From: nphilipp at fedoraproject.org (Nils Philippsen)
Date: Sun,  4 Jan 2009 12:07:04 +0000 (UTC)
Subject: rpms/gimp/devel gimp.spec,1.177,1.178
Message-ID: <20090104120704.49F827011F@cvs1.fedora.phx.redhat.com>

Author: nphilipp

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

Modified Files:
	gimp.spec 
Log Message:
enable building with aalib


Index: gimp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gimp/devel/gimp.spec,v
retrieving revision 1.177
retrieving revision 1.178
diff -u -r1.177 -r1.178
--- gimp.spec	1 Jan 2009 21:34:53 -0000	1.177
+++ gimp.spec	4 Jan 2009 12:06:30 -0000	1.178
@@ -29,7 +29,7 @@
 %define age 0
 %define minorver 600
 %define microver %(ver=%{version}; echo ${ver##*.*.})
-Release:        1%{?dist}
+Release:        2%{?dist}
 Epoch:          2
 License:        GPLv2+
 Group:          Applications/Multimedia
@@ -173,7 +173,6 @@
 %patch1 -p1 -b .jpeg-units
 
 %build
-LIBAA="disable"; export LIBAA
 if [ ! -f configure ]; then
   ./autogen.sh --quiet $MYARCH_FLAGS --prefix=%{_prefix}
 fi
@@ -447,6 +446,9 @@
 %{_libdir}/gimp/%{interfacever}/plug-ins/help-browser
 
 %changelog
+* Sun Jan 04 2009 Nils Philippsen <nils at redhat.com> - 2:2.6.4-2
+- enable building with aalib
+
 * Thu Jan 01 2009 Nils Philippsen <nils at redhat.com> - 2:2.6.4-1
 - version 2.6.4
 



From nphilipp at fedoraproject.org  Sun Jan  4 12:18:18 2009
From: nphilipp at fedoraproject.org (Nils Philippsen)
Date: Sun,  4 Jan 2009 12:18:18 +0000 (UTC)
Subject: rpms/gimp/devel gimp.spec,1.178,1.179
Message-ID: <20090104121818.BF42C7011F@cvs1.fedora.phx.redhat.com>

Author: nphilipp

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

Modified Files:
	gimp.spec 
Log Message:
don't use --without-aa


Index: gimp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gimp/devel/gimp.spec,v
retrieving revision 1.178
retrieving revision 1.179
diff -u -r1.178 -r1.179
--- gimp.spec	4 Jan 2009 12:06:30 -0000	1.178
+++ gimp.spec	4 Jan 2009 12:17:48 -0000	1.179
@@ -204,7 +204,7 @@
     --without-lcms \
 %endif
     --enable-gimp-console \
-    --without-aa \
+    --with-aa \
 %ifos linux
     --with-linux-input \
 %endif



From nphilipp at fedoraproject.org  Sun Jan  4 12:18:22 2009
From: nphilipp at fedoraproject.org (Nils Philippsen)
Date: Sun,  4 Jan 2009 12:18:22 +0000 (UTC)
Subject: rpms/gimp/F-10 gimp.spec,1.177,1.178
Message-ID: <20090104121822.537397011F@cvs1.fedora.phx.redhat.com>

Author: nphilipp

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

Modified Files:
	gimp.spec 
Log Message:
don't use --without-aa


Index: gimp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gimp/F-10/gimp.spec,v
retrieving revision 1.177
retrieving revision 1.178
diff -u -r1.177 -r1.178
--- gimp.spec	4 Jan 2009 12:06:31 -0000	1.177
+++ gimp.spec	4 Jan 2009 12:17:51 -0000	1.178
@@ -204,7 +204,7 @@
     --without-lcms \
 %endif
     --enable-gimp-console \
-    --without-aa \
+    --with-aa \
 %ifos linux
     --with-linux-input \
 %endif



From nphilipp at fedoraproject.org  Sun Jan  4 12:18:23 2009
From: nphilipp at fedoraproject.org (Nils Philippsen)
Date: Sun,  4 Jan 2009 12:18:23 +0000 (UTC)
Subject: rpms/gimp/F-9 gimp.spec,1.167,1.168
Message-ID: <20090104121823.5DC247011F@cvs1.fedora.phx.redhat.com>

Author: nphilipp

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

Modified Files:
	gimp.spec 
Log Message:
don't use --without-aa


Index: gimp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gimp/F-9/gimp.spec,v
retrieving revision 1.167
retrieving revision 1.168
diff -u -r1.167 -r1.168
--- gimp.spec	4 Jan 2009 12:06:33 -0000	1.167
+++ gimp.spec	4 Jan 2009 12:17:52 -0000	1.168
@@ -204,7 +204,7 @@
     --without-lcms \
 %endif
     --enable-gimp-console \
-    --without-aa \
+    --with-aa \
 %ifos linux
     --with-linux-input \
 %endif



From frankb at fedoraproject.org  Sun Jan  4 14:07:23 2009
From: frankb at fedoraproject.org (=?utf-8?q?Frank_B=C3=BCttner?=)
Date: Sun,  4 Jan 2009 14:07:23 +0000 (UTC)
Subject: rpms/ctapi-cyberjack/EL-5 ctapi-cyberjack.spec,1.32,1.33
Message-ID: <20090104140723.351E87011F@cvs1.fedora.phx.redhat.com>

Author: frankb

Update of /cvs/pkgs/rpms/ctapi-cyberjack/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5683

Modified Files:
	ctapi-cyberjack.spec 
Log Message:
- fix missing dependency (libsysfs-devel)



Index: ctapi-cyberjack.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ctapi-cyberjack/EL-5/ctapi-cyberjack.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- ctapi-cyberjack.spec	29 Dec 2008 17:12:47 -0000	1.32
+++ ctapi-cyberjack.spec	4 Jan 2009 14:06:50 -0000	1.33
@@ -1,17 +1,17 @@
 Name:		ctapi-cyberjack
 Summary:	CT-API 1.1 driver for REINER SCT cyberjack USB chipcard reader
 Version:	3.3.0
-Release:	2%{?dist}
+Release:	3%{?dist}
 Requires(pre):	group(ctapiusers)
 Requires:	%{_libdir}/ctapi
 #ExcludeArch:	x86_64
 
 %if 0%{?rhel} > 4 || 0%{?fedora} > 4
 %define withPCSC 1
-BuildRequires:  libusb-devel readline-devel pcsc-lite-devel >= 1.3.0
+BuildRequires:  libusb-devel readline-devel libsysfs-devel pcsc-lite-devel >= 1.3.0
 %else
 %define withPCSC 0
-BuildRequires:  libusb-devel readline-devel
+BuildRequires:  libusb-devel readline-devel libsysfs-devel
 %endif
 %if 0%{?fedora} > 6
 %define useNewUdev 1
@@ -181,6 +181,9 @@
 %{_bindir}/getdist.sh
 
 %changelog
+*Sun Jan 04 2009 Frank B??ttner <frank-buettner at gmx.net> - 3.3.0-3
+ - fix missing dependency (libsysfs-devel)
+
 *Mon Dec 29 2008 Frank B??ttner <frank-buettner at gmx.net> - 3.3.0-2
  - no changes
 



From frankb at fedoraproject.org  Sun Jan  4 14:25:09 2009
From: frankb at fedoraproject.org (=?utf-8?q?Frank_B=C3=BCttner?=)
Date: Sun,  4 Jan 2009 14:25:09 +0000 (UTC)
Subject: rpms/ctapi-cyberjack/EL-4 .cvsignore, 1.13,
	1.14 ctapi-cyberjack.spec, 1.31, 1.32 sources, 1.13, 1.14
Message-ID: <20090104142509.28A1A7011F@cvs1.fedora.phx.redhat.com>

Author: frankb

Update of /cvs/pkgs/rpms/ctapi-cyberjack/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12514

Modified Files:
	.cvsignore ctapi-cyberjack.spec sources 
Log Message:
- update to 3.3.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ctapi-cyberjack/EL-4/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	21 Oct 2007 06:46:55 -0000	1.13
+++ .cvsignore	4 Jan 2009 14:24:38 -0000	1.14
@@ -1 +1 @@
-ctapi-cyberjack-3.0.5.tar.gz
+ctapi-cyberjack-3.3.0.tar.gz


Index: ctapi-cyberjack.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ctapi-cyberjack/EL-4/ctapi-cyberjack.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- ctapi-cyberjack.spec	21 Oct 2007 06:46:56 -0000	1.31
+++ ctapi-cyberjack.spec	4 Jan 2009 14:24:38 -0000	1.32
@@ -1,17 +1,17 @@
 Name:		ctapi-cyberjack
 Summary:	CT-API 1.1 driver for REINER SCT cyberjack USB chipcard reader
-Version:	3.0.5
-Release:	1%{?dist}
+Version:	3.3.0
+Release:	3%{?dist}
 Requires(pre):	group(ctapiusers)
 Requires:	%{_libdir}/ctapi
 #ExcludeArch:	x86_64
 
 %if 0%{?rhel} > 4 || 0%{?fedora} > 4
 %define withPCSC 1
-BuildRequires:  libusb-devel readline-devel pcsc-lite-devel >= 1.3.0
+BuildRequires:  libusb-devel readline-devel libsysfs-devel pcsc-lite-devel >= 1.3.0
 %else
 %define withPCSC 0
-BuildRequires:  libusb-devel readline-devel
+BuildRequires:  libusb-devel readline-devel libsysfs-devel
 %endif
 %if 0%{?fedora} > 6
 %define useNewUdev 1
@@ -181,6 +181,15 @@
 %{_bindir}/getdist.sh
 
 %changelog
+*Sun Jan 04 2009 Frank B??ttner <frank-buettner at gmx.net> - 3.3.0-3
+ - fix missing dependency (libsysfs-devel)
+
+*Mon Dec 29 2008 Frank B??ttner <frank-buettner at gmx.net> - 3.3.0-2
+ - no changes
+
+*Mon Dec 29 2008 Frank B??ttner <frank-buettner at gmx.net> - 3.3.0-1
+ - update to 3.3.0
+
 *Sat Oct 20 2007 Frank B??ttner <frank-buettner at gmx.net> - 3.0.5-1
  - update to 3.0.5
  - fix project URL


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ctapi-cyberjack/EL-4/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	21 Oct 2007 06:46:56 -0000	1.13
+++ sources	4 Jan 2009 14:24:38 -0000	1.14
@@ -1 +1 @@
-733db6dbf918879e552edc37d55ec3be  ctapi-cyberjack-3.0.5.tar.gz
+56013720fb9de904a9070ee9e3d9ea60  ctapi-cyberjack-3.3.0.tar.gz



From frankb at fedoraproject.org  Sun Jan  4 14:35:46 2009
From: frankb at fedoraproject.org (=?utf-8?q?Frank_B=C3=BCttner?=)
Date: Sun,  4 Jan 2009 14:35:46 +0000 (UTC)
Subject: rpms/ctapi-cyberjack/EL-4 ctapi-cyberjack.spec,1.32,1.33
Message-ID: <20090104143546.287307011F@cvs1.fedora.phx.redhat.com>

Author: frankb

Update of /cvs/pkgs/rpms/ctapi-cyberjack/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14953

Modified Files:
	ctapi-cyberjack.spec 
Log Message:
- fix missing dependency (libsysfs-devel) for EPEL4



Index: ctapi-cyberjack.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ctapi-cyberjack/EL-4/ctapi-cyberjack.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- ctapi-cyberjack.spec	4 Jan 2009 14:24:38 -0000	1.32
+++ ctapi-cyberjack.spec	4 Jan 2009 14:35:15 -0000	1.33
@@ -1,7 +1,7 @@
 Name:		ctapi-cyberjack
 Summary:	CT-API 1.1 driver for REINER SCT cyberjack USB chipcard reader
 Version:	3.3.0
-Release:	3%{?dist}
+Release:	4%{?dist}
 Requires(pre):	group(ctapiusers)
 Requires:	%{_libdir}/ctapi
 #ExcludeArch:	x86_64
@@ -11,7 +11,7 @@
 BuildRequires:  libusb-devel readline-devel libsysfs-devel pcsc-lite-devel >= 1.3.0
 %else
 %define withPCSC 0
-BuildRequires:  libusb-devel readline-devel libsysfs-devel
+BuildRequires:  libusb-devel readline-devel sysfsutils-devel
 %endif
 %if 0%{?fedora} > 6
 %define useNewUdev 1
@@ -181,6 +181,9 @@
 %{_bindir}/getdist.sh
 
 %changelog
+*Sun Jan 04 2009 Frank B??ttner <frank-buettner at gmx.net> - 3.3.0-4
+ - fix missing dependency (libsysfs-devel) for EPEL4
+
 *Sun Jan 04 2009 Frank B??ttner <frank-buettner at gmx.net> - 3.3.0-3
  - fix missing dependency (libsysfs-devel)
 



From frankb at fedoraproject.org  Sun Jan  4 14:46:00 2009
From: frankb at fedoraproject.org (=?utf-8?q?Frank_B=C3=BCttner?=)
Date: Sun,  4 Jan 2009 14:46:00 +0000 (UTC)
Subject: rpms/ctapi-cyberjack/devel .cvsignore, 1.15,
	1.16 ctapi-cyberjack.spec, 1.36, 1.37 sources, 1.15, 1.16
Message-ID: <20090104144600.676637011F@cvs1.fedora.phx.redhat.com>

Author: frankb

Update of /cvs/extras/rpms/ctapi-cyberjack/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17715

Modified Files:
	.cvsignore ctapi-cyberjack.spec sources 
Log Message:
-update to 3.3.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ctapi-cyberjack/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	21 Oct 2007 06:36:39 -0000	1.15
+++ .cvsignore	4 Jan 2009 14:45:28 -0000	1.16
@@ -1 +1 @@
-ctapi-cyberjack-3.0.5.tar.gz
+ctapi-cyberjack-3.3.0.tar.gz


Index: ctapi-cyberjack.spec
===================================================================
RCS file: /cvs/extras/rpms/ctapi-cyberjack/devel/ctapi-cyberjack.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- ctapi-cyberjack.spec	19 Feb 2008 03:17:50 -0000	1.36
+++ ctapi-cyberjack.spec	4 Jan 2009 14:45:28 -0000	1.37
@@ -1,17 +1,17 @@
 Name:		ctapi-cyberjack
 Summary:	CT-API 1.1 driver for REINER SCT cyberjack USB chipcard reader
-Version:	3.0.5
-Release:	2%{?dist}
+Version:	3.3.0
+Release:	4%{?dist}
 Requires(pre):	group(ctapiusers)
 Requires:	%{_libdir}/ctapi
 #ExcludeArch:	x86_64
 
 %if 0%{?rhel} > 4 || 0%{?fedora} > 4
 %define withPCSC 1
-BuildRequires:  libusb-devel readline-devel pcsc-lite-devel >= 1.3.0
+BuildRequires:  libusb-devel readline-devel libsysfs-devel pcsc-lite-devel >= 1.3.0
 %else
 %define withPCSC 0
-BuildRequires:  libusb-devel readline-devel
+BuildRequires:  libusb-devel readline-devel sysfsutils-devel
 %endif
 %if 0%{?fedora} > 6
 %define useNewUdev 1
@@ -181,8 +181,17 @@
 %{_bindir}/getdist.sh
 
 %changelog
-* Mon Feb 18 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 3.0.5-2
-- Autorebuild for GCC 4.3
+*Sun Jan 04 2009 Frank B??ttner <frank-buettner at gmx.net> - 3.3.0-4
+ - fix missing dependency (libsysfs-devel) for EPEL4
+
+*Sun Jan 04 2009 Frank B??ttner <frank-buettner at gmx.net> - 3.3.0-3
+ - fix missing dependency (libsysfs-devel)
+
+*Mon Dec 29 2008 Frank B??ttner <frank-buettner at gmx.net> - 3.3.0-2
+ - no changes
+
+*Mon Dec 29 2008 Frank B??ttner <frank-buettner at gmx.net> - 3.3.0-1
+ - update to 3.3.0
 
 *Sat Oct 20 2007 Frank B??ttner <frank-buettner at gmx.net> - 3.0.5-1
  - update to 3.0.5


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ctapi-cyberjack/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	21 Oct 2007 06:36:39 -0000	1.15
+++ sources	4 Jan 2009 14:45:28 -0000	1.16
@@ -1 +1 @@
-733db6dbf918879e552edc37d55ec3be  ctapi-cyberjack-3.0.5.tar.gz
+56013720fb9de904a9070ee9e3d9ea60  ctapi-cyberjack-3.3.0.tar.gz



From jcollie at fedoraproject.org  Sun Jan  4 14:48:28 2009
From: jcollie at fedoraproject.org (Jeffrey C. Ollie)
Date: Sun,  4 Jan 2009 14:48:28 +0000 (UTC)
Subject: rpms/asterisk/F-10
	0008-Revert-changes-to-pbx_lua-from-rev-126363-that-cause.patch, NONE,
	1.1 0009-change-configure.ac-to-look-for-pkg-config-gmime-2.4.patch, 
	NONE,
	1.1 0010-fix-the-AST_PROG_SED-problem-that-makes-.-bootstrap.patch,
	NONE, 1.1 0011-Merged-revisions-160170-160172-via-svnmerge-from.patch,
	NONE, 1.1 0012-Update-autoconf.patch, 1.2, 1.3 .cvsignore, 1.17,
	1.18 0001-Modify-init-scripts-for-better-Fedora-compatibility.patch, 
	1.4,
	1.5 0002-Modify-modules.conf-so-that-different-voicemail-modu.patch, 
	1.4,
	1.5 0003-Allow-alternate-extensions-to-be-specified-in-users.patch,
	1.3,
	1.4 0004-Minor-changes-to-reduce-packaging-changes-made-by-th.patch, 
	1.3, 1.4 0005-Add-chan_mobile-from-asterisk-addons.patch, 1.3,
	1.4 0006-Use-pkgconfig-to-check-for-Lua.patch, 1.3,
	1.4 0007-Build-using-external-libedit.patch, 1.3,
	1.4 asterisk.spec, 1.37, 1.38 sources, 1.17,
	1.18 0008-Update-autoconf.patch, 1.2,
	NONE 0009-Revert-changes-to-pbx_lua-from-rev-126363-that-cause.patch, 
	1.2, NONE
Message-ID: <20090104144829.025D970140@cvs1.fedora.phx.redhat.com>

Author: jcollie

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

Modified Files:
	.cvsignore 
	0001-Modify-init-scripts-for-better-Fedora-compatibility.patch 
	0002-Modify-modules.conf-so-that-different-voicemail-modu.patch 
	0003-Allow-alternate-extensions-to-be-specified-in-users.patch 
	0004-Minor-changes-to-reduce-packaging-changes-made-by-th.patch 
	0005-Add-chan_mobile-from-asterisk-addons.patch 
	0006-Use-pkgconfig-to-check-for-Lua.patch 
	0007-Build-using-external-libedit.patch asterisk.spec sources 
Added Files:
	0008-Revert-changes-to-pbx_lua-from-rev-126363-that-cause.patch 
	0009-change-configure.ac-to-look-for-pkg-config-gmime-2.4.patch 
	0010-fix-the-AST_PROG_SED-problem-that-makes-.-bootstrap.patch 
	0011-Merged-revisions-160170-160172-via-svnmerge-from.patch 
	0012-Update-autoconf.patch 
Removed Files:
	0008-Update-autoconf.patch 
	0009-Revert-changes-to-pbx_lua-from-rev-126363-that-cause.patch 
Log Message:
* Sun Jan  4 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6.0.2-1
- Update to 1.6.0.2


0008-Revert-changes-to-pbx_lua-from-rev-126363-that-cause.patch:

--- NEW FILE 0008-Revert-changes-to-pbx_lua-from-rev-126363-that-cause.patch ---
>From a092080315b7bfa9b7d174b6114cb957ac1590d8 Mon Sep 17 00:00:00 2001
From: Jeffrey C. Ollie <jeff at ocjtech.us>
Date: Fri, 10 Oct 2008 11:54:10 -0500
Subject: [PATCH 08/12] Revert changes to pbx_lua from rev 126363 that cause some problems.

---
 pbx/pbx_lua.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pbx/pbx_lua.c b/pbx/pbx_lua.c
index 6a600a4..a803bd5 100644
--- a/pbx/pbx_lua.c
+++ b/pbx/pbx_lua.c
@@ -42,9 +42,9 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/paths.h"
 #include "asterisk/hashtab.h"
 
-#include <lua5.1/lua.h>
-#include <lua5.1/lauxlib.h>
-#include <lua5.1/lualib.h>
+#include <lua.h>
+#include <lauxlib.h>
+#include <lualib.h>
 
 static char *config = "extensions.lua";
 static char *registrar = "pbx_lua";
-- 
1.6.1


0009-change-configure.ac-to-look-for-pkg-config-gmime-2.4.patch:

--- NEW FILE 0009-change-configure.ac-to-look-for-pkg-config-gmime-2.4.patch ---
>From 7719af5a016f40f573c90aae17910f7f77b9b4e6 Mon Sep 17 00:00:00 2001
From: Caolan McNamara <caolanm at redhat.com>
Date: Sat, 3 Jan 2009 19:06:18 -0600
Subject: [PATCH 09/12] change configure.ac to look for pkg-config gmime-2.4 instead of gmime-2.4 gmime-config

---
 configure.ac |   12 +++++++++++-
 1 files changed, 11 insertions(+), 1 deletions(-)

diff --git a/configure.ac b/configure.ac
index 12065a4..08f142d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1425,7 +1425,17 @@ then
     AST_EXT_LIB_CHECK([OSPTK], [osptk], [OSPPCryptoDecrypt], [osp/osp.h], [-lcrypto -lssl])
 fi
 
-AST_EXT_TOOL_CHECK([GMIME], [gmime])
+PBX_GMIME=0
+AC_CHECK_TOOL(PKGCONFIG, pkg-config, No)
+if test ! "x${PKGCONFIG}" = xNo; then
+   GMIME_INCLUDE=$(${PKGCONFIG} gmime-2.4 --cflags 2>/dev/null)
+   GMIME_LIB=$(${PKGCONFIG} gmime-2.4 --libs)
+   PBX_GMIME=1
+   AC_DEFINE([HAVE_GMIME], 1, [Define if your system has the GMIME libraries.])
+fi
+AC_SUBST(PBX_GMIME)
+AC_SUBST(GMIME_INCLUDE)
+AC_SUBST(GMIME_LIB)
 
 if test "$PBX_GMIME" = "1";
 then
-- 
1.6.1


0010-fix-the-AST_PROG_SED-problem-that-makes-.-bootstrap.patch:

--- NEW FILE 0010-fix-the-AST_PROG_SED-problem-that-makes-.-bootstrap.patch ---
>From 9a6c4641b2aa353c9076df9794d72fba5acdafb0 Mon Sep 17 00:00:00 2001
From: Caolan McNamara <caolanm at redhat.com>
Date: Sat, 3 Jan 2009 19:12:18 -0600
Subject: [PATCH 10/12] fix the AST_PROG_SED problem that makes ./bootstrap.sh fail

Need to regenerate configure from configure.ac after patch one with
./bootsrap.sh, so fix the broken .m4 in the autoconfig dir. (alternatively
change AST_PROG_SED to AC_PROG_SED as it is the same thing in the other .m4 in
the autoconf dir)
---
 autoconf/ast_prog_sed.m4 |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/autoconf/ast_prog_sed.m4 b/autoconf/ast_prog_sed.m4
index 283d52f..ae6cfc0 100644
--- a/autoconf/ast_prog_sed.m4
+++ b/autoconf/ast_prog_sed.m4
@@ -12,7 +12,7 @@ AC_DEFUN([AST_PROG_SED],
      done
      echo "$ac_script" | sed 99q >conftest.sed
      $as_unset ac_script || ac_script=
-     _AC_PATH_PROG_FEATURE_CHECK(SED, [sed gsed],
+     _AC_PATH_PROGS_FEATURE_CHECK(SED, [sed gsed],
 	[_AC_FEATURE_CHECK_LENGTH([ac_path_SED], [ac_cv_path_SED],
 		["$ac_path_SED" -f conftest.sed])])])
  SED="$ac_cv_path_SED"
-- 
1.6.1


0011-Merged-revisions-160170-160172-via-svnmerge-from.patch:

--- NEW FILE 0011-Merged-revisions-160170-160172-via-svnmerge-from.patch ---
>From c38fa4eb3cf989c110a737058c46a916ebab19c8 Mon Sep 17 00:00:00 2001
From: seanbright <seanbright at f38db490-d61c-443f-a65b-d21fe96a405b>
Date: Mon, 1 Dec 2008 23:41:16 +0000
Subject: [PATCH 11/12] Merged revisions 160170-160172 via svnmerge from
 https://origsvn.digium.com/svn/asterisk/trunk

................
  r160170 | seanbright | 2008-12-01 18:08:24 -0500 (Mon, 01 Dec 2008) | 1 line

  Pay attention to the return value of system(), even if we basically ignore it.
................
  r160171 | seanbright | 2008-12-01 18:18:48 -0500 (Mon, 01 Dec 2008) | 1 line

  Silence a build warning. (chan_phone.c:810: warning: value computed is not used)
................
  r160172 | seanbright | 2008-12-01 18:37:49 -0500 (Mon, 01 Dec 2008) | 10 lines

  Merged revisions 159976 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/branches/1.4

  ........
    r159976 | mvanbaak | 2008-12-01 11:08:36 -0500 (Mon, 01 Dec 2008) | 3 lines

    Get rid of the useless format string and argument in the Bogus/ manager channelname.
    Noted by kpfleming and name Bogus/manager suggested by eliel
  ........
................

git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0 at 160173 f38db490-d61c-443f-a65b-d21fe96a405b
---
 main/manager.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/main/manager.c b/main/manager.c
index 6c28fed..bcf222f 100644
--- a/main/manager.c
+++ b/main/manager.c
@@ -1729,7 +1729,7 @@ static int action_getvar(struct mansession *s, const struct message *m)
 
 	if (varname[strlen(varname) - 1] == ')') {
 		if (!c) {
-			c = ast_channel_alloc(0, 0, "", "", "", "", "", 0, "Bogus/%p", SENTINEL);
+			c = ast_channel_alloc(0, 0, "", "", "", "", "", 0, "Bogus/manager");
 			if (c) {
 				ast_func_read(c, (char *) varname, workspace, sizeof(workspace));
 				ast_channel_free(c);
-- 
1.6.1


0012-Update-autoconf.patch:

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.2 -r 1.3 0012-Update-autoconf.patch
Index: 0012-Update-autoconf.patch
===================================================================
RCS file: 0012-Update-autoconf.patch
diff -N 0012-Update-autoconf.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ 0012-Update-autoconf.patch	4 Jan 2009 14:48:27 -0000	1.3
@@ -0,0 +1,45038 @@
+From 91db0f005bd6818bbd2eade2b79ac430d884971c Mon Sep 17 00:00:00 2001
+From: Jeffrey C. Ollie <jeff at ocjtech.us>
+Date: Sun, 4 Jan 2009 00:37:02 -0600
+Subject: [PATCH 12/12] Update autoconf.
+
+---
+ configure                        |23025 ++++++++++++++++++++------------------
+ include/asterisk/autoconfig.h.in |   60 +-
+ 2 files changed, 12340 insertions(+), 10745 deletions(-)
+
+diff --git a/configure b/configure
+index f997451..e40ba2c 100755
+--- a/configure
++++ b/configure
+@@ -1,12 +1,12 @@
+ #! /bin/sh
+-# From configure.ac Revision: 159855 .
++# From configure.ac Revision.
+ # Guess values for system-dependent variables and create Makefiles.
+-# Generated by GNU Autoconf 2.61 for asterisk 1.6.
++# Generated by GNU Autoconf 2.63 for asterisk 1.6.
+ #
+ # Report bugs to <www.asterisk.org>.
+ #
+ # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
+-# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
++# 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+ # This configure script is free software; the Free Software Foundation
+ # gives unlimited permission to copy, distribute and modify it.
+ #
+@@ -20,7 +20,7 @@ DUALCASE=1; export DUALCASE # for MKS sh
+ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+   emulate sh
+   NULLCMD=:
+-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
++  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
+   # is contrary to our usage.  Disable this feature.
+   alias -g '${1+"$@"}'='"$@"'
+   setopt NO_GLOB_SUBST
+@@ -42,17 +42,45 @@ as_cr_Letters=$as_cr_letters$as_cr_LETTERS
+ as_cr_digits='0123456789'
+ as_cr_alnum=$as_cr_Letters$as_cr_digits
+ 
+-# The user is always right.
+-if test "${PATH_SEPARATOR+set}" != set; then
+-  echo "#! /bin/sh" >conf$$.sh
+-  echo  "exit 0"   >>conf$$.sh
+-  chmod +x conf$$.sh
+-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
+-    PATH_SEPARATOR=';'
++as_nl='
++'
++export as_nl
++# Printing a long string crashes Solaris 7 /usr/bin/printf.
++as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
++as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
++as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
++if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
++  as_echo='printf %s\n'
++  as_echo_n='printf %s'
++else
++  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
++    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
++    as_echo_n='/usr/ucb/echo -n'
+   else
+-    PATH_SEPARATOR=:
++    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
++    as_echo_n_body='eval
++      arg=$1;
++      case $arg in
++      *"$as_nl"*)
++	expr "X$arg" : "X\\(.*\\)$as_nl";
++	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
++      esac;
++      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
++    '
++    export as_echo_n_body
++    as_echo_n='sh -c $as_echo_n_body as_echo'
+   fi
+-  rm -f conf$$.sh
++  export as_echo_body
++  as_echo='sh -c $as_echo_body as_echo'
++fi
++
++# The user is always right.
++if test "${PATH_SEPARATOR+set}" != set; then
++  PATH_SEPARATOR=:
++  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
++    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
++      PATH_SEPARATOR=';'
++  }
+ fi
+ 
+ # Support unset when possible.
+@@ -68,8 +96,6 @@ fi
+ # there to prevent editors from complaining about space-tab.
+ # (If _AS_PATH_WALK were called with IFS unset, it would disable word
+ # splitting by setting IFS to empty value.)
+-as_nl='
+-'
+ IFS=" ""	$as_nl"
+ 
+ # Find who we are.  Look in the path if we contain no directory separator.
+@@ -92,7 +118,7 @@ if test "x$as_myself" = x; then
+   as_myself=$0
+ fi
+ if test ! -f "$as_myself"; then
+-  echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
++  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+   { (exit 1); exit 1; }
+ fi
+ 
+@@ -105,17 +131,10 @@ PS2='> '
+ PS4='+ '
+ 
+ # NLS nuisances.
+-for as_var in \
+-  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
+-  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
+-  LC_TELEPHONE LC_TIME
+-do
+-  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
+-    eval $as_var=C; export $as_var
+-  else
+-    ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+-  fi
+-done
++LC_ALL=C
++export LC_ALL
++LANGUAGE=C
++export LANGUAGE
+ 
+ # Required to use basename.
+ if expr a : '\(a\)' >/dev/null 2>&1 &&
+@@ -137,7 +156,7 @@ as_me=`$as_basename -- "$0" ||
+ $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
+ 	 X"$0" : 'X\(//\)$' \| \
+ 	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
+-echo X/"$0" |
++$as_echo X/"$0" |
+     sed '/^.*\/\([^/][^/]*\)\/*$/{
+ 	    s//\1/
+ 	    q
+@@ -163,7 +182,7 @@ else
+   as_have_required=no
+ fi
+ 
+-  if test $as_have_required = yes && 	 (eval ":
++  if test $as_have_required = yes &&	 (eval ":
+ (as_func_return () {
+   (exit \$1)
+ }
+@@ -245,7 +264,7 @@ IFS=$as_save_IFS
+ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+   emulate sh
+   NULLCMD=:
+-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
++  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
+   # is contrary to our usage.  Disable this feature.
+   alias -g '${1+"$@"}'='"$@"'
+   setopt NO_GLOB_SUBST
+@@ -266,7 +285,7 @@ _ASEOF
+ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+   emulate sh
+   NULLCMD=:
+-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
++  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
+   # is contrary to our usage.  Disable this feature.
+   alias -g '${1+"$@"}'='"$@"'
+   setopt NO_GLOB_SUBST
+@@ -346,10 +365,10 @@ fi
+ 
+       if test "x$CONFIG_SHELL" != x; then
+   for as_var in BASH_ENV ENV
+-        do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+-        done
+-        export CONFIG_SHELL
+-        exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
++	do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
++	done
++	export CONFIG_SHELL
++	exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
+ fi
+ 
+ 
+@@ -418,9 +437,10 @@ fi
+ 
+ test \$exitcode = 0") || {
+   echo No shell found that supports shell functions.
+-  echo Please tell autoconf at gnu.org about your system,
+-  echo including any error possibly output before this
+-  echo message
++  echo Please tell bug-autoconf at gnu.org about your system,
[...44645 lines suppressed...]
+     else
+-      rm -f $ac_file
+-      mv "$tmp/config.h" $ac_file
++      rm -f "$ac_file"
++      mv "$tmp/config.h" "$ac_file" \
++	|| { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
++$as_echo "$as_me: error: could not create $ac_file" >&2;}
++   { (exit 1); exit 1; }; }
+     fi
+   else
+-    echo "/* $configure_input  */"
+-    cat "$ac_result"
++    $as_echo "/* $configure_input  */" \
++      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
++      || { { $as_echo "$as_me:$LINENO: error: could not create -" >&5
++$as_echo "$as_me: error: could not create -" >&2;}
++   { (exit 1); exit 1; }; }
+   fi
+-  rm -f "$tmp/out12"
+  ;;
+ 
+ 
+@@ -50858,6 +52450,11 @@ _ACEOF
+ chmod +x $CONFIG_STATUS
+ ac_clean_files=$ac_clean_files_save
+ 
++test $ac_write_fail = 0 ||
++  { { $as_echo "$as_me:$LINENO: error: write failure creating $CONFIG_STATUS" >&5
++$as_echo "$as_me: error: write failure creating $CONFIG_STATUS" >&2;}
++   { (exit 1); exit 1; }; }
++
+ 
+ # configure is writing to config.log, and then calls config.status.
+ # config.status does its own redirection, appending to config.log.
+@@ -50879,6 +52476,10 @@ if test "$no_create" != yes; then
+   # would make configure fail if this is the last instruction.
+   $ac_cs_success || { (exit 1); exit 1; }
+ fi
++if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
++  { $as_echo "$as_me:$LINENO: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
++$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
++fi
+ 
+ 
+ if test "x${silent}" != "xyes" ; then
+@@ -50907,17 +52508,17 @@ echo "       \$\$\$\$\$\$\$\$\$\$\$\$\$\$\$\$.                "
+ echo
+ fi
+ 
+-{ echo "$as_me:$LINENO: Package configured for: " >&5
+-echo "$as_me: Package configured for: " >&6;}
+-{ echo "$as_me:$LINENO: OS type  : $host_os" >&5
+-echo "$as_me: OS type  : $host_os" >&6;}
+-{ echo "$as_me:$LINENO: Host CPU : $host_cpu" >&5
+-echo "$as_me: Host CPU : $host_cpu" >&6;}
+-{ echo "$as_me:$LINENO: build-cpu:vendor:os: $build_cpu : $build_vendor : $build_os :" >&5
+-echo "$as_me: build-cpu:vendor:os: $build_cpu : $build_vendor : $build_os :" >&6;}
+-{ echo "$as_me:$LINENO: host-cpu:vendor:os: $host_cpu : $host_vendor : $host_os :" >&5
+-echo "$as_me: host-cpu:vendor:os: $host_cpu : $host_vendor : $host_os :" >&6;}
++{ $as_echo "$as_me:$LINENO: Package configured for: " >&5
++$as_echo "$as_me: Package configured for: " >&6;}
++{ $as_echo "$as_me:$LINENO: OS type  : $host_os" >&5
++$as_echo "$as_me: OS type  : $host_os" >&6;}
++{ $as_echo "$as_me:$LINENO: Host CPU : $host_cpu" >&5
++$as_echo "$as_me: Host CPU : $host_cpu" >&6;}
++{ $as_echo "$as_me:$LINENO: build-cpu:vendor:os: $build_cpu : $build_vendor : $build_os :" >&5
++$as_echo "$as_me: build-cpu:vendor:os: $build_cpu : $build_vendor : $build_os :" >&6;}
++{ $as_echo "$as_me:$LINENO: host-cpu:vendor:os: $host_cpu : $host_vendor : $host_os :" >&5
++$as_echo "$as_me: host-cpu:vendor:os: $host_cpu : $host_vendor : $host_os :" >&6;}
+ if test "${cross_compiling}" = "yes"; then
+-   { echo "$as_me:$LINENO: Cross Compilation = YES" >&5
+-echo "$as_me: Cross Compilation = YES" >&6;}
++   { $as_echo "$as_me:$LINENO: Cross Compilation = YES" >&5
++$as_echo "$as_me: Cross Compilation = YES" >&6;}
+ fi
+diff --git a/include/asterisk/autoconfig.h.in b/include/asterisk/autoconfig.h.in
+index 60f497d..1e4c5a6 100644
+--- a/include/asterisk/autoconfig.h.in
++++ b/include/asterisk/autoconfig.h.in
+@@ -119,6 +119,12 @@
+ /* Define to indicate the ${BKTR_DESCRIP} library version */
+ #undef HAVE_BKTR_VERSION
+ 
++/* Define this to indicate the ${BLUETOOTH_DESCRIP} library */
++#undef HAVE_BLUETOOTH
++
++/* Define to indicate the ${BLUETOOTH_DESCRIP} library version */
++#undef HAVE_BLUETOOTH_VERSION
++
+ /* Define to 1 if byteswap.h macros are available. */
+ #undef HAVE_BYTESWAP_H
+ 
+@@ -391,6 +397,9 @@
+ /* Define to indicate the ${LDAP_DESCRIP} library version */
+ #undef HAVE_LDAP_VERSION
+ 
++/* Define if your system has the NetBSD Editline libraries. */
++#undef HAVE_LIBEDIT
++
+ /* Define to 1 if you have the <libintl.h> header file. */
+ #undef HAVE_LIBINTL_H
+ 
+@@ -448,12 +457,9 @@
+ /* Define to indicate the ${LTDL_DESCRIP} library version */
+ #undef HAVE_LTDL_VERSION
+ 
+-/* Define this to indicate the ${LUA_DESCRIP} library */
++/* Define if your system has the LUA libraries. */
+ #undef HAVE_LUA
+ 
+-/* Define to indicate the ${LUA_DESCRIP} library version */
+-#undef HAVE_LUA_VERSION
+-
+ /* Define to 1 if you have the <malloc.h> header file. */
+ #undef HAVE_MALLOC_H
+ 
+@@ -1087,9 +1093,6 @@
+ /* Define to the version of this package. */
+ #undef PACKAGE_VERSION
+ 
+-/* Define to 1 if the C compiler supports function prototypes. */
+-#undef PROTOTYPES
+-
+ /* Define to necessary symbol if this constant uses a non-standard name on
+    your system. */
+ #undef PTHREAD_CREATE_JOINABLE
+@@ -1106,11 +1109,6 @@
+ /* Define to the type of arg 5 for `select'. */
+ #undef SELECT_TYPE_ARG5
+ 
+-/* Define to 1 if the `setvbuf' function takes the buffering type as its
+-   second argument and the buffer pointer as the third, as on System V before
+-   release 3. */
+-#undef SETVBUF_REVERSED
+-
+ /* The size of `int', as computed by sizeof. */
+ #undef SIZEOF_INT
+ 
+@@ -1131,20 +1129,30 @@
+ /* Define to 1 if your <sys/time.h> declares `struct tm'. */
+ #undef TM_IN_SYS_TIME
+ 
+-/* Define to 1 if on AIX 3.
+-   System headers sometimes define this.
+-   We just want to avoid a redefinition error message.  */
++/* Enable extensions on AIX 3, Interix.  */
+ #ifndef _ALL_SOURCE
+ # undef _ALL_SOURCE
+ #endif
+-
+-/* Number of bits in a file offset, on hosts where this is settable. */
+-#undef _FILE_OFFSET_BITS
+-
+ /* Enable GNU extensions on systems that have them.  */
+ #ifndef _GNU_SOURCE
+ # undef _GNU_SOURCE
+ #endif
++/* Enable threading extensions on Solaris.  */
++#ifndef _POSIX_PTHREAD_SEMANTICS
++# undef _POSIX_PTHREAD_SEMANTICS
++#endif
++/* Enable extensions on HP NonStop.  */
++#ifndef _TANDEM_SOURCE
++# undef _TANDEM_SOURCE
++#endif
++/* Enable general extensions on Solaris.  */
++#ifndef __EXTENSIONS__
++# undef __EXTENSIONS__
++#endif
++
++
++/* Number of bits in a file offset, on hosts where this is settable. */
++#undef _FILE_OFFSET_BITS
+ 
+ /* Define to 1 to make fseeko visible on some hosts (e.g. glibc 2.2). */
+ #undef _LARGEFILE_SOURCE
+@@ -1162,20 +1170,6 @@
+ /* Define to 1 if you need to in order for `stat' and other things to work. */
+ #undef _POSIX_SOURCE
+ 
+-/* Enable extensions on Solaris.  */
+-#ifndef __EXTENSIONS__
+-# undef __EXTENSIONS__
+-#endif
+-#ifndef _POSIX_PTHREAD_SEMANTICS
+-# undef _POSIX_PTHREAD_SEMANTICS
+-#endif
+-#ifndef _TANDEM_SOURCE
+-# undef _TANDEM_SOURCE
+-#endif
+-
+-/* Define like PROTOTYPES; this can be used by system headers. */
+-#undef __PROTOTYPES
+-
+ /* Define to empty if `const' does not conform to ANSI C. */
+ #undef const
+ 
+-- 
+1.6.1
+


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/F-10/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- .cvsignore	10 Oct 2008 22:58:57 -0000	1.17
+++ .cvsignore	4 Jan 2009 14:48:26 -0000	1.18
@@ -1 +1 @@
-asterisk-1.6.0.1-stripped.tar.gz
+asterisk-1.6.0.2-stripped.tar.gz

0001-Modify-init-scripts-for-better-Fedora-compatibility.patch:

Index: 0001-Modify-init-scripts-for-better-Fedora-compatibility.patch
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/F-10/0001-Modify-init-scripts-for-better-Fedora-compatibility.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- 0001-Modify-init-scripts-for-better-Fedora-compatibility.patch	5 Nov 2008 14:58:10 -0000	1.4
+++ 0001-Modify-init-scripts-for-better-Fedora-compatibility.patch	4 Jan 2009 14:48:26 -0000	1.5
@@ -1,7 +1,7 @@
-From efe583b4fb0722cc56e52ff8bbadd06ccc312409 Mon Sep 17 00:00:00 2001
+From 0040bd97782e9db8c341af9ffe171749644e35f1 Mon Sep 17 00:00:00 2001
 From: Jeffrey C. Ollie <jeff at ocjtech.us>
 Date: Sun, 18 Nov 2007 21:47:59 -0600
-Subject: [PATCH] Modify init scripts for better Fedora compatibility.
+Subject: [PATCH 01/12] Modify init scripts for better Fedora compatibility.
 
 ---
  contrib/init.d/rc.redhat.asterisk |   61 +++++++++++++++++-------------------
@@ -151,5 +151,5 @@
 +# be initialized.
 +#AST_GROUP="asterisk"
 -- 
-1.5.6.5
+1.6.1
 

0002-Modify-modules.conf-so-that-different-voicemail-modu.patch:

Index: 0002-Modify-modules.conf-so-that-different-voicemail-modu.patch
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/F-10/0002-Modify-modules.conf-so-that-different-voicemail-modu.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- 0002-Modify-modules.conf-so-that-different-voicemail-modu.patch	5 Nov 2008 14:58:10 -0000	1.4
+++ 0002-Modify-modules.conf-so-that-different-voicemail-modu.patch	4 Jan 2009 14:48:26 -0000	1.5
@@ -1,7 +1,7 @@
-From de8c8daa4f1ad9647fd9be2196b1ca4ba6e3955a Mon Sep 17 00:00:00 2001
+From 42cd072beba88049783a7bedb029760a5952706e Mon Sep 17 00:00:00 2001
 From: Jeffrey C. Ollie <jcollie at pc21224.campus.dmacc.edu>
 Date: Thu, 8 Nov 2007 15:52:36 -0600
-Subject: [PATCH] Modify modules.conf so that different voicemail modules can be loaded.
+Subject: [PATCH 02/12] Modify modules.conf so that different voicemail modules can be loaded.
 
 ---
  configs/modules.conf.sample |   27 +++++++++++++++++++++++++++
@@ -43,5 +43,5 @@
 +;noload => app_voicemail_plain.so
 +
 -- 
-1.5.6.5
+1.6.1
 

0003-Allow-alternate-extensions-to-be-specified-in-users.patch:

Index: 0003-Allow-alternate-extensions-to-be-specified-in-users.patch
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/F-10/0003-Allow-alternate-extensions-to-be-specified-in-users.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- 0003-Allow-alternate-extensions-to-be-specified-in-users.patch	5 Nov 2008 14:58:10 -0000	1.3
+++ 0003-Allow-alternate-extensions-to-be-specified-in-users.patch	4 Jan 2009 14:48:26 -0000	1.4
@@ -1,17 +1,17 @@
-From 2bc910c60188c668d7ad530a61eeacdac8ac9ee6 Mon Sep 17 00:00:00 2001
+From a9d27e3b5f93ff8658fa06a0c454140f27244363 Mon Sep 17 00:00:00 2001
 From: Jeffrey C. Ollie <jcollie at pc21224.campus.dmacc.edu>
 Date: Thu, 8 Nov 2007 16:32:56 -0600
-Subject: [PATCH] Allow alternate extensions to be specified in users.conf
+Subject: [PATCH 03/12] Allow alternate extensions to be specified in users.conf
 
 ---
  pbx/pbx_config.c |   14 ++++++++++++++
  1 files changed, 14 insertions(+), 0 deletions(-)
 
 diff --git a/pbx/pbx_config.c b/pbx/pbx_config.c
-index b63fedd..3574d0d 100644
+index dc48136..6c6ba87 100644
 --- a/pbx/pbx_config.c
 +++ b/pbx/pbx_config.c
-@@ -1562,11 +1562,14 @@ static void pbx_load_users(void)
+@@ -1568,11 +1568,14 @@ static void pbx_load_users(void)
  {
  	struct ast_config *cfg;
  	char *cat, *chan;
@@ -26,7 +26,7 @@
  	char *c;
  	int len;
  	int hasvoicemail;
-@@ -1647,6 +1650,17 @@ static void pbx_load_users(void)
+@@ -1653,6 +1656,17 @@ static void pbx_load_users(void)
  			} else {
  				ast_add_extension2(con, 0, cat, 1, NULL, NULL, "Dial", strdup("${HINT}"), ast_free_ptr, registrar);
  			}
@@ -45,5 +45,5 @@
  	}
  	ast_config_destroy(cfg);
 -- 
-1.5.6.5
+1.6.1
 

0004-Minor-changes-to-reduce-packaging-changes-made-by-th.patch:

Index: 0004-Minor-changes-to-reduce-packaging-changes-made-by-th.patch
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/F-10/0004-Minor-changes-to-reduce-packaging-changes-made-by-th.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- 0004-Minor-changes-to-reduce-packaging-changes-made-by-th.patch	5 Nov 2008 14:58:10 -0000	1.3
+++ 0004-Minor-changes-to-reduce-packaging-changes-made-by-th.patch	4 Jan 2009 14:48:26 -0000	1.4
@@ -1,7 +1,7 @@
-From 28e48a2b0b1b50a4dc09051f1250ae667614bedb Mon Sep 17 00:00:00 2001
+From 42991016984f9e7930686527706ab0f36baa41d1 Mon Sep 17 00:00:00 2001
 From: tilghman <tilghman at 614ede4d-c843-0410-af14-a771ab80d22e>
 Date: Tue, 29 Jul 2008 23:00:45 +0000
-Subject: [PATCH] Minor changes to reduce packaging changes made by the Fedora maintainer.
+Subject: [PATCH 04/12] Minor changes to reduce packaging changes made by the Fedora maintainer.
  (closes issue #12974)
   Reported by: jcollie
   Patches:
@@ -13,10 +13,10 @@
  1 files changed, 12 insertions(+), 4 deletions(-)
 
 diff --git a/Makefile b/Makefile
-index a874a7c..f82602c 100644
+index 788e524..05a58d1 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -221,10 +221,16 @@ ifeq ($(OSARCH),linux-gnu)
+@@ -222,10 +222,16 @@ ifeq ($(OSARCH),linux-gnu)
  endif
  
  ifeq ($(findstring -save-temps,$(ASTCFLAGS)),)
@@ -33,9 +33,9 @@
 -ASTCFLAGS+=-Wall -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations $(DEBUG)
 +ASTCFLAGS+=-Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations $(DEBUG)
  
- ASTCFLAGS+=-include $(ASTTOPDIR)/include/asterisk/autoconfig.h
- 
-@@ -237,8 +243,10 @@ ifneq ($(findstring BSD,$(OSARCH)),)
+ ifeq ($(AST_DEVMODE),yes)
+   ASTCFLAGS+=-Werror
+@@ -242,8 +248,10 @@ ifneq ($(findstring BSD,$(OSARCH)),)
    ASTLDFLAGS+=-L/usr/local/lib
  endif
  
@@ -49,5 +49,5 @@
  
  ifeq ($(PROC),ppc)
 -- 
-1.5.6.5
+1.6.1
 

0005-Add-chan_mobile-from-asterisk-addons.patch:

Index: 0005-Add-chan_mobile-from-asterisk-addons.patch
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/F-10/0005-Add-chan_mobile-from-asterisk-addons.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- 0005-Add-chan_mobile-from-asterisk-addons.patch	5 Nov 2008 14:58:10 -0000	1.3
+++ 0005-Add-chan_mobile-from-asterisk-addons.patch	4 Jan 2009 14:48:26 -0000	1.4
@@ -1,7 +1,7 @@
-From f3c9272a15f71e3dc084fad107eceb92d8a19475 Mon Sep 17 00:00:00 2001
+From 8cc8002094fe880d374a727aa0be389ca68b0342 Mon Sep 17 00:00:00 2001
 From: Jeffrey C. Ollie <jeff at ocjtech.us>
 Date: Mon, 25 Feb 2008 09:23:28 -0600
-Subject: [PATCH] Add chan_mobile from asterisk-addons.
+Subject: [PATCH 05/12] Add chan_mobile from asterisk-addons.
 
 ---
  build_tools/menuselect-deps.in |    1 +
@@ -2228,10 +2228,10 @@
 +type=headset
 +adapter=dlink
 diff --git a/configure.ac b/configure.ac
-index 33b40a2..f86e8f5 100644
+index 20e8e33..b8ebbf5 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -205,6 +205,8 @@ AST_EXT_LIB_SETUP([ALSA], [Advanced Linux Sound Architecture], [asound])
+@@ -211,6 +211,8 @@ AST_EXT_LIB_SETUP([ALSA], [Advanced Linux Sound Architecture], [asound])
  # BKTR is used for backtrace support on platforms that do not
  # have it natively.
  AST_EXT_LIB_SETUP([BKTR], [Stack Backtrace support], [execinfo])
@@ -2240,7 +2240,7 @@
  AST_EXT_LIB_SETUP([CAP], [POSIX 1.e capabilities], [cap])
  AST_EXT_LIB_SETUP([CURL], [cURL], [curl])
  AST_EXT_LIB_SETUP([CURSES], [curses], [curses])
-@@ -556,6 +558,8 @@ AC_CHECK_SIZEOF(int)
+@@ -574,6 +576,8 @@ AC_CHECK_SIZEOF(int)
  
  AST_EXT_LIB_CHECK([ALSA], [asound], [snd_spcm_init], [alsa/asoundlib.h], [-lm -ldl])
  
@@ -2496,10 +2496,10 @@
 +
 +email me at   david.bowerman at gmail.com   or dseeb_ on #asterisk & #asterisk-dev irc.
 diff --git a/makeopts.in b/makeopts.in
-index b3e5c49..05de366 100644
+index 018bc6c..039525d 100644
 --- a/makeopts.in
 +++ b/makeopts.in
-@@ -69,6 +69,9 @@ AST_NO_STRICT_OVERFLOW=@AST_NO_STRICT_OVERFLOW@
+@@ -71,6 +71,9 @@ AST_FORTIFY_SOURCE=@AST_FORTIFY_SOURCE@
  ASOUND_INCLUDE=@ALSA_INCLUDE@
  ASOUND_LIB=@ALSA_LIB@
  
@@ -2510,5 +2510,5 @@
  CURL_LIB=@CURL_LIB@
  
 -- 
-1.5.6.5
+1.6.1
 

0006-Use-pkgconfig-to-check-for-Lua.patch:

Index: 0006-Use-pkgconfig-to-check-for-Lua.patch
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/F-10/0006-Use-pkgconfig-to-check-for-Lua.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- 0006-Use-pkgconfig-to-check-for-Lua.patch	5 Nov 2008 14:58:10 -0000	1.3
+++ 0006-Use-pkgconfig-to-check-for-Lua.patch	4 Jan 2009 14:48:26 -0000	1.4
@@ -1,17 +1,17 @@
-From 81bf87aedbf0f1ad5b8ecc97e3012821207445ca Mon Sep 17 00:00:00 2001
+From d633181f75ea7dc879e8ac9d014cf1fc0fe364ef Mon Sep 17 00:00:00 2001
 From: Jeffrey C. Ollie <jeff at ocjtech.us>
 Date: Mon, 25 Feb 2008 13:14:23 -0600
-Subject: [PATCH] Use pkgconfig to check for Lua.
+Subject: [PATCH 06/12] Use pkgconfig to check for Lua.
 
 ---
  configure.ac |    9 ++++++++-
  1 files changed, 8 insertions(+), 1 deletions(-)
 
 diff --git a/configure.ac b/configure.ac
-index f86e8f5..f4e445c 100644
+index b8ebbf5..d3e4054 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -1364,7 +1364,14 @@ if test "${PBX_PWLIB}" = "1" -a "${USE_OPENH323}" != "no" ; then
+@@ -1382,7 +1382,14 @@ if test "${PBX_PWLIB}" = "1" -a "${USE_OPENH323}" != "no" ; then
  		[${PWLIB_INCLUDE}], [${PWLIB_LIB}])
  fi
  
@@ -28,5 +28,5 @@
  AST_EXT_LIB_CHECK([RADIUS], [radiusclient-ng], [rc_read_config], [radiusclient-ng.h])
  
 -- 
-1.5.6.5
+1.6.1
 

0007-Build-using-external-libedit.patch:

Index: 0007-Build-using-external-libedit.patch
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/F-10/0007-Build-using-external-libedit.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- 0007-Build-using-external-libedit.patch	5 Nov 2008 14:58:10 -0000	1.3
+++ 0007-Build-using-external-libedit.patch	4 Jan 2009 14:48:27 -0000	1.4
@@ -1,7 +1,7 @@
-From bbdbf8b43a846dd5f84cee581cb43eae7fc57c87 Mon Sep 17 00:00:00 2001
+From a50090dc47540b5c3df28c9846fe753f5476c4fc Mon Sep 17 00:00:00 2001
 From: Jeffrey C. Ollie <jeff at ocjtech.us>
 Date: Tue, 25 Mar 2008 00:50:27 -0500
-Subject: [PATCH] Build using external libedit.
+Subject: [PATCH 07/12] Build using external libedit.
 
 ---
  build_tools/menuselect-deps.in |    1 +
@@ -24,10 +24,10 @@
  LUA=@PBX_LUA@
  MISDN=@PBX_MISDN@
 diff --git a/configure.ac b/configure.ac
-index f4e445c..40f8d6e 100644
+index d3e4054..12065a4 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -223,6 +223,7 @@ AST_EXT_LIB_SETUP([IMAP_TK], [UW IMAP Toolkit], [imap])
+@@ -229,6 +229,7 @@ AST_EXT_LIB_SETUP([IMAP_TK], [UW IMAP Toolkit], [imap])
  AST_EXT_LIB_SETUP([ISDNNET], [ISDN4Linux Library], [isdnnet])
  AST_EXT_LIB_SETUP([JACK], [Jack Audio Connection Kit], [jack])
  AST_EXT_LIB_SETUP([LDAP], [OpenLDAP], [ldap])
@@ -35,7 +35,7 @@
  AST_EXT_LIB_SETUP([LTDL], [libtool], [ltdl])
  AST_EXT_LIB_SETUP([LUA], [Lua], [lua])
  AST_EXT_LIB_SETUP([MISDN], [mISDN User Library], [misdn])
-@@ -1530,6 +1531,27 @@ AC_SUBST(PBX_GTK2)
+@@ -1576,6 +1577,27 @@ AC_SUBST(PBX_GTK2)
  AC_SUBST(GTK2_INCLUDE)
  AC_SUBST(GTK2_LIB)
  
@@ -64,10 +64,10 @@
     AC_PATH_TOOL([CURL_CONFIG], [curl-config], No)
     if test ! x"${CURL_CONFIG}" = xNo; then
 diff --git a/main/Makefile b/main/Makefile
-index b3a53a3..996ddf6 100644
+index 14fa19a..9d3e9e4 100644
 --- a/main/Makefile
 +++ b/main/Makefile
-@@ -132,6 +132,7 @@ testexpr2: ast_expr2f.c ast_expr2.c ast_expr2.h
+@@ -135,6 +135,7 @@ testexpr2: ast_expr2f.c ast_expr2.c ast_expr2.h
  channel.o: ASTCFLAGS+=$(DAHDI_INCLUDE)
  asterisk.o: ASTCFLAGS+=$(DAHDI_INCLUDE)
  
@@ -75,7 +75,7 @@
  
  ifneq ($(findstring ENABLE_UPLOADS,$(MENUSELECT_CFLAGS)),)
  http.o: ASTCFLAGS+=$(GMIME_INCLUDE)
-@@ -165,13 +166,13 @@ ifneq ($(findstring ENABLE_UPLOADS,$(MENUSELECT_CFLAGS)),)
+@@ -168,13 +169,13 @@ ifneq ($(findstring ENABLE_UPLOADS,$(MENUSELECT_CFLAGS)),)
  GMIMELDFLAGS+=$(GMIME_LIB)
  endif
  
@@ -93,7 +93,7 @@
  	$(CMD_PREFIX) $(ASTTOPDIR)/build_tools/strip_nonapi $@ || rm $@
  
 diff --git a/main/cli.c b/main/cli.c
-index 70d26e1..90454d8 100644
+index 6b129bc..cc838d5 100644
 --- a/main/cli.c
 +++ b/main/cli.c
 @@ -34,6 +34,8 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
@@ -114,10 +114,10 @@
  
  /*!
 diff --git a/makeopts.in b/makeopts.in
-index 05de366..72d5315 100644
+index 039525d..9eef75e 100644
 --- a/makeopts.in
 +++ b/makeopts.in
-@@ -241,3 +241,7 @@ TINFO_DIR=@TINFO_DIR@
+@@ -243,3 +243,7 @@ TINFO_DIR=@TINFO_DIR@
  
  # if poll is not present, let the makefile know.
  POLL_AVAILABLE=@HAS_POLL@
@@ -126,5 +126,5 @@
 +LIBEDIT_LIB=@LIBEDIT_LIB@
 +LIBEDIT_OBJ=@LIBEDIT_OBJ@
 -- 
-1.5.6.5
+1.6.1
 


Index: asterisk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/F-10/asterisk.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- asterisk.spec	5 Nov 2008 14:58:10 -0000	1.37
+++ asterisk.spec	4 Jan 2009 14:48:27 -0000	1.38
@@ -2,8 +2,8 @@
 
 Summary: The Open Source PBX
 Name: asterisk
-Version: 1.6.0.1
-Release: 3%{?dist}
+Version: 1.6.0.2
+Release: 1%{?dist}
 License: GPLv2
 Group: Applications/Internet
 URL: http://www.asterisk.org/
@@ -19,13 +19,13 @@
 
 # MD5 Sums
 # ========
-# 5277db1134f0dc736932279c6a25c29a  asterisk-1.6.0.1.tar.gz
-# 00465d571b2cd9fd49c86b753aa3a551  asterisk-1.6.0.1-stripped.tar.gz
+# 22068805be6b11831c507861293fc1f5  asterisk-1.6.0.2.tar.gz
+# 6782a95a088a78ebb52252926e94a186  asterisk-1.6.0.2-stripped.tar.gz
 #
 # SHA1 Sums
 # =========
-# 20d77f6a08a8d755eeadf431c1f692d5adeadde8  asterisk-1.6.0.1.tar.gz
-# 4f5d1f436ba1119db9dfea072b1e6ac59c9eebd5  asterisk-1.6.0.1-stripped.tar.gz
+# 7d7c63f5c8ad17cc7dfd1bdd0fd27eea4fcef2c1  asterisk-1.6.0.2.tar.gz
+# 9aa182314ed4cc72bd39c7bd6897812b22bde2a2  asterisk-1.6.0.2-stripped.tar.gz
 
 Source0: asterisk-%{version}-stripped.tar.gz
 Source1: asterisk-logrotate
@@ -40,8 +40,11 @@
 Patch5:  0005-Add-chan_mobile-from-asterisk-addons.patch
 Patch6:  0006-Use-pkgconfig-to-check-for-Lua.patch
 Patch7:  0007-Build-using-external-libedit.patch
-Patch8:  0008-Update-autoconf.patch
-Patch9:	 0009-Revert-changes-to-pbx_lua-from-rev-126363-that-cause.patch
+Patch8:  0008-Revert-changes-to-pbx_lua-from-rev-126363-that-cause.patch
+Patch9:  0009-change-configure.ac-to-look-for-pkg-config-gmime-2.4.patch
+Patch10: 0010-fix-the-AST_PROG_SED-problem-that-makes-.-bootstrap.patch
+Patch11: 0011-Merged-revisions-160170-160172-via-svnmerge-from.patch
+Patch12: 0012-Update-autoconf.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
 
@@ -415,6 +418,9 @@
 %patch7 -p1
 %patch8 -p1
 %patch9 -p1
+%patch10 -p1
+%patch11 -p1
+%patch12 -p1
 
 cp %{SOURCE2} menuselect.makedeps
 cp %{SOURCE3} menuselect.makeopts
@@ -727,14 +733,14 @@
 %{_libdir}/asterisk/modules/res_smdi.so
 %{_libdir}/asterisk/modules/res_speech.so
 
-%{_sbindir}/aelparse
+#%{_sbindir}/aelparse
 %{_sbindir}/astcanary
 %{_sbindir}/asterisk
 %{_sbindir}/astgenkey
 %{_sbindir}/astman
 %{_sbindir}/autosupport
 %{_sbindir}/check_expr
-%{_sbindir}/conf2ael
+#%{_sbindir}/conf2ael
 %{_sbindir}/muted
 %{_sbindir}/rasterisk
 %{_sbindir}/safe_asterisk
@@ -1024,6 +1030,9 @@
 %{_libdir}/asterisk/modules/app_voicemail_plain.so
 
 %changelog
+* Sun Jan  4 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6.0.2-1
+- Update to 1.6.0.2
+
 * Wed Nov  5 2008 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6.0.1-3
 - Fix issue with init script giving wrong path to config file.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/F-10/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources	10 Oct 2008 22:58:57 -0000	1.17
+++ sources	4 Jan 2009 14:48:27 -0000	1.18
@@ -1 +1 @@
-00465d571b2cd9fd49c86b753aa3a551  asterisk-1.6.0.1-stripped.tar.gz
+6782a95a088a78ebb52252926e94a186  asterisk-1.6.0.2-stripped.tar.gz


--- 0008-Update-autoconf.patch DELETED ---


--- 0009-Revert-changes-to-pbx_lua-from-rev-126363-that-cause.patch DELETED ---



From frankb at fedoraproject.org  Sun Jan  4 15:38:35 2009
From: frankb at fedoraproject.org (=?utf-8?q?Frank_B=C3=BCttner?=)
Date: Sun,  4 Jan 2009 15:38:35 +0000 (UTC)
Subject: rpms/ctapi-cyberjack/F-10 .cvsignore, 1.15,
	1.16 ctapi-cyberjack.spec, 1.36, 1.37 sources, 1.15, 1.16
Message-ID: <20090104153836.1CD387011F@cvs1.fedora.phx.redhat.com>

Author: frankb

Update of /cvs/extras/rpms/ctapi-cyberjack/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32189

Modified Files:
	.cvsignore ctapi-cyberjack.spec sources 
Log Message:
- update to 3.3.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ctapi-cyberjack/F-10/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	21 Oct 2007 06:36:39 -0000	1.15
+++ .cvsignore	4 Jan 2009 15:38:02 -0000	1.16
@@ -1 +1 @@
-ctapi-cyberjack-3.0.5.tar.gz
+ctapi-cyberjack-3.3.0.tar.gz


Index: ctapi-cyberjack.spec
===================================================================
RCS file: /cvs/extras/rpms/ctapi-cyberjack/F-10/ctapi-cyberjack.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- ctapi-cyberjack.spec	19 Feb 2008 03:17:50 -0000	1.36
+++ ctapi-cyberjack.spec	4 Jan 2009 15:38:02 -0000	1.37
@@ -1,17 +1,17 @@
 Name:		ctapi-cyberjack
 Summary:	CT-API 1.1 driver for REINER SCT cyberjack USB chipcard reader
-Version:	3.0.5
-Release:	2%{?dist}
+Version:	3.3.0
+Release:	4%{?dist}
 Requires(pre):	group(ctapiusers)
 Requires:	%{_libdir}/ctapi
 #ExcludeArch:	x86_64
 
 %if 0%{?rhel} > 4 || 0%{?fedora} > 4
 %define withPCSC 1
-BuildRequires:  libusb-devel readline-devel pcsc-lite-devel >= 1.3.0
+BuildRequires:  libusb-devel readline-devel libsysfs-devel pcsc-lite-devel >= 1.3.0
 %else
 %define withPCSC 0
-BuildRequires:  libusb-devel readline-devel
+BuildRequires:  libusb-devel readline-devel sysfsutils-devel
 %endif
 %if 0%{?fedora} > 6
 %define useNewUdev 1
@@ -181,8 +181,17 @@
 %{_bindir}/getdist.sh
 
 %changelog
-* Mon Feb 18 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 3.0.5-2
-- Autorebuild for GCC 4.3
+*Sun Jan 04 2009 Frank B??ttner <frank-buettner at gmx.net> - 3.3.0-4
+ - fix missing dependency (libsysfs-devel) for EPEL4
+
+*Sun Jan 04 2009 Frank B??ttner <frank-buettner at gmx.net> - 3.3.0-3
+ - fix missing dependency (libsysfs-devel)
+
+*Mon Dec 29 2008 Frank B??ttner <frank-buettner at gmx.net> - 3.3.0-2
+ - no changes
+
+*Mon Dec 29 2008 Frank B??ttner <frank-buettner at gmx.net> - 3.3.0-1
+ - update to 3.3.0
 
 *Sat Oct 20 2007 Frank B??ttner <frank-buettner at gmx.net> - 3.0.5-1
  - update to 3.0.5


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ctapi-cyberjack/F-10/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	21 Oct 2007 06:36:39 -0000	1.15
+++ sources	4 Jan 2009 15:38:03 -0000	1.16
@@ -1 +1 @@
-733db6dbf918879e552edc37d55ec3be  ctapi-cyberjack-3.0.5.tar.gz
+56013720fb9de904a9070ee9e3d9ea60  ctapi-cyberjack-3.3.0.tar.gz



From frankb at fedoraproject.org  Sun Jan  4 15:43:29 2009
From: frankb at fedoraproject.org (=?utf-8?q?Frank_B=C3=BCttner?=)
Date: Sun,  4 Jan 2009 15:43:29 +0000 (UTC)
Subject: rpms/ctapi-cyberjack/F-9 .cvsignore, 1.15, 1.16 ctapi-cyberjack.spec,
	1.36, 1.37 sources, 1.15, 1.16
Message-ID: <20090104154329.E73FC7011F@cvs1.fedora.phx.redhat.com>

Author: frankb

Update of /cvs/extras/rpms/ctapi-cyberjack/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1080

Modified Files:
	.cvsignore ctapi-cyberjack.spec sources 
Log Message:
- update to 3.3.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ctapi-cyberjack/F-9/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	21 Oct 2007 06:36:39 -0000	1.15
+++ .cvsignore	4 Jan 2009 15:42:59 -0000	1.16
@@ -1 +1 @@
-ctapi-cyberjack-3.0.5.tar.gz
+ctapi-cyberjack-3.3.0.tar.gz


Index: ctapi-cyberjack.spec
===================================================================
RCS file: /cvs/extras/rpms/ctapi-cyberjack/F-9/ctapi-cyberjack.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- ctapi-cyberjack.spec	19 Feb 2008 03:17:50 -0000	1.36
+++ ctapi-cyberjack.spec	4 Jan 2009 15:42:59 -0000	1.37
@@ -1,17 +1,17 @@
 Name:		ctapi-cyberjack
 Summary:	CT-API 1.1 driver for REINER SCT cyberjack USB chipcard reader
-Version:	3.0.5
-Release:	2%{?dist}
+Version:	3.3.0
+Release:	4%{?dist}
 Requires(pre):	group(ctapiusers)
 Requires:	%{_libdir}/ctapi
 #ExcludeArch:	x86_64
 
 %if 0%{?rhel} > 4 || 0%{?fedora} > 4
 %define withPCSC 1
-BuildRequires:  libusb-devel readline-devel pcsc-lite-devel >= 1.3.0
+BuildRequires:  libusb-devel readline-devel libsysfs-devel pcsc-lite-devel >= 1.3.0
 %else
 %define withPCSC 0
-BuildRequires:  libusb-devel readline-devel
+BuildRequires:  libusb-devel readline-devel sysfsutils-devel
 %endif
 %if 0%{?fedora} > 6
 %define useNewUdev 1
@@ -181,8 +181,17 @@
 %{_bindir}/getdist.sh
 
 %changelog
-* Mon Feb 18 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 3.0.5-2
-- Autorebuild for GCC 4.3
+*Sun Jan 04 2009 Frank B??ttner <frank-buettner at gmx.net> - 3.3.0-4
+ - fix missing dependency (libsysfs-devel) for EPEL4
+
+*Sun Jan 04 2009 Frank B??ttner <frank-buettner at gmx.net> - 3.3.0-3
+ - fix missing dependency (libsysfs-devel)
+
+*Mon Dec 29 2008 Frank B??ttner <frank-buettner at gmx.net> - 3.3.0-2
+ - no changes
+
+*Mon Dec 29 2008 Frank B??ttner <frank-buettner at gmx.net> - 3.3.0-1
+ - update to 3.3.0
 
 *Sat Oct 20 2007 Frank B??ttner <frank-buettner at gmx.net> - 3.0.5-1
  - update to 3.0.5


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ctapi-cyberjack/F-9/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	21 Oct 2007 06:36:39 -0000	1.15
+++ sources	4 Jan 2009 15:42:59 -0000	1.16
@@ -1 +1 @@
-733db6dbf918879e552edc37d55ec3be  ctapi-cyberjack-3.0.5.tar.gz
+56013720fb9de904a9070ee9e3d9ea60  ctapi-cyberjack-3.3.0.tar.gz



From peterscheie at fedoraproject.org  Sun Jan  4 15:48:38 2009
From: peterscheie at fedoraproject.org (Peter Scheie)
Date: Sun,  4 Jan 2009 15:48:38 +0000 (UTC)
Subject: rpms/k12linux-quick-start-guide/devel .cvsignore, 1.4, 1.5 sources, 
	1.4, 1.5
Message-ID: <20090104154838.406DD7011F@cvs1.fedora.phx.redhat.com>

Author: peterscheie

Update of /cvs/pkgs/rpms/k12linux-quick-start-guide/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2121

Modified Files:
	.cvsignore sources 
Log Message:
In html document, moved reverence to 'version 5' of LTSP to bottom; changed 
wording of WARNING about dhcp server to CAUTION and emphasized that bridge
should be only connected to an isolated switch with thin clients.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/k12linux-quick-start-guide/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	2 Jan 2009 17:32:09 -0000	1.4
+++ .cvsignore	4 Jan 2009 15:48:07 -0000	1.5
@@ -1 +1 @@
-k12linux-quick-start-guide-0.0.9.tar.bz2
+k12linux-quick-start-guide-0.0.10.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/k12linux-quick-start-guide/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	2 Jan 2009 17:32:09 -0000	1.4
+++ sources	4 Jan 2009 15:48:07 -0000	1.5
@@ -1 +1 @@
-db73786ee9a2bf2198a9f2a017088299  k12linux-quick-start-guide-0.0.9.tar.bz2
+81f0ed54497313c6364e11f66014d758  k12linux-quick-start-guide-0.0.10.tar.bz2



From peterscheie at fedoraproject.org  Sun Jan  4 15:53:47 2009
From: peterscheie at fedoraproject.org (Peter Scheie)
Date: Sun,  4 Jan 2009 15:53:47 +0000 (UTC)
Subject: rpms/k12linux-quick-start-guide/devel
	k12linux-quick-start-guide.spec, 1.3, 1.4
Message-ID: <20090104155347.237AF7011F@cvs1.fedora.phx.redhat.com>

Author: peterscheie

Update of /cvs/pkgs/rpms/k12linux-quick-start-guide/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3342

Modified Files:
	k12linux-quick-start-guide.spec 
Log Message:
Forgot to update spec file in last commit. 



Index: k12linux-quick-start-guide.spec
===================================================================
RCS file: /cvs/pkgs/rpms/k12linux-quick-start-guide/devel/k12linux-quick-start-guide.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- k12linux-quick-start-guide.spec	2 Jan 2009 17:26:13 -0000	1.3
+++ k12linux-quick-start-guide.spec	4 Jan 2009 15:53:16 -0000	1.4
@@ -1,5 +1,5 @@
 Name:           k12linux-quick-start-guide
-Version:        0.0.9
+Version:        0.0.10
 Release:        1%{?dist}
 Summary:        Quick Start Guide for K12Linux Live LTSP Server
 
@@ -48,6 +48,12 @@
 
 
 %changelog
+* Sun Jan 04 2009 Peter Scheie <peter at scheie.homedns.org> - 0.0.10-1
+- Moved 'version 5' phrase describing version of LTSP to bottom of html
+  document.
+- Changed wording of WARNING about the dhcp server to CAUTION and emphasized
+  that the bridge should only be connected to an isolated switch with the TCs.
+
 * Fri Jan 02 2009 Peter Scheie <peter at scheie.homedns.org> - 0.0.9-1
 - Consolidated 'rpm -e' commands for removing the guide to a single step.
 - Changed link to newer version of how to get on #ltsp at ltsp.org.



From frankb at fedoraproject.org  Sun Jan  4 15:53:47 2009
From: frankb at fedoraproject.org (=?utf-8?q?Frank_B=C3=BCttner?=)
Date: Sun,  4 Jan 2009 15:53:47 +0000 (UTC)
Subject: rpms/ctapi-cyberjack/F-8 .cvsignore, 1.15, 1.16 ctapi-cyberjack.spec,
	1.35, 1.36 sources, 1.15, 1.16
Message-ID: <20090104155347.29DF770130@cvs1.fedora.phx.redhat.com>

Author: frankb

Update of /cvs/extras/rpms/ctapi-cyberjack/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3396

Modified Files:
	.cvsignore ctapi-cyberjack.spec sources 
Log Message:
- update to 3.3.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ctapi-cyberjack/F-8/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	21 Oct 2007 07:10:10 -0000	1.15
+++ .cvsignore	4 Jan 2009 15:53:16 -0000	1.16
@@ -1 +1 @@
-ctapi-cyberjack-3.0.5.tar.gz
+ctapi-cyberjack-3.3.0.tar.gz


Index: ctapi-cyberjack.spec
===================================================================
RCS file: /cvs/extras/rpms/ctapi-cyberjack/F-8/ctapi-cyberjack.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- ctapi-cyberjack.spec	21 Oct 2007 07:10:10 -0000	1.35
+++ ctapi-cyberjack.spec	4 Jan 2009 15:53:16 -0000	1.36
@@ -1,17 +1,17 @@
 Name:		ctapi-cyberjack
 Summary:	CT-API 1.1 driver for REINER SCT cyberjack USB chipcard reader
-Version:	3.0.5
-Release:	1%{?dist}
+Version:	3.3.0
+Release:	4%{?dist}
 Requires(pre):	group(ctapiusers)
 Requires:	%{_libdir}/ctapi
 #ExcludeArch:	x86_64
 
 %if 0%{?rhel} > 4 || 0%{?fedora} > 4
 %define withPCSC 1
-BuildRequires:  libusb-devel readline-devel pcsc-lite-devel >= 1.3.0
+BuildRequires:  libusb-devel readline-devel libsysfs-devel pcsc-lite-devel >= 1.3.0
 %else
 %define withPCSC 0
-BuildRequires:  libusb-devel readline-devel
+BuildRequires:  libusb-devel readline-devel sysfsutils-devel
 %endif
 %if 0%{?fedora} > 6
 %define useNewUdev 1
@@ -181,6 +181,18 @@
 %{_bindir}/getdist.sh
 
 %changelog
+*Sun Jan 04 2009 Frank B??ttner <frank-buettner at gmx.net> - 3.3.0-4
+ - fix missing dependency (libsysfs-devel) for EPEL4
+
+*Sun Jan 04 2009 Frank B??ttner <frank-buettner at gmx.net> - 3.3.0-3
+ - fix missing dependency (libsysfs-devel)
+
+*Mon Dec 29 2008 Frank B??ttner <frank-buettner at gmx.net> - 3.3.0-2
+ - no changes
+
+*Mon Dec 29 2008 Frank B??ttner <frank-buettner at gmx.net> - 3.3.0-1
+ - update to 3.3.0
+
 *Sat Oct 20 2007 Frank B??ttner <frank-buettner at gmx.net> - 3.0.5-1
  - update to 3.0.5
  - fix project URL


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ctapi-cyberjack/F-8/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	21 Oct 2007 07:10:10 -0000	1.15
+++ sources	4 Jan 2009 15:53:16 -0000	1.16
@@ -1 +1 @@
-733db6dbf918879e552edc37d55ec3be  ctapi-cyberjack-3.0.5.tar.gz
+56013720fb9de904a9070ee9e3d9ea60  ctapi-cyberjack-3.3.0.tar.gz



From peterscheie at fedoraproject.org  Sun Jan  4 16:05:56 2009
From: peterscheie at fedoraproject.org (Peter Scheie)
Date: Sun,  4 Jan 2009 16:05:56 +0000 (UTC)
Subject: rpms/k12linux-quick-start-guide/F-9 .cvsignore, 1.3,
	1.4 k12linux-quick-start-guide.spec, 1.2, 1.3 sources, 1.3, 1.4
Message-ID: <20090104160556.92C717011F@cvs1.fedora.phx.redhat.com>

Author: peterscheie

Update of /cvs/pkgs/rpms/k12linux-quick-start-guide/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7856

Modified Files:
	.cvsignore k12linux-quick-start-guide.spec sources 
Log Message:
Changed WARNING and verbage on dhcp/bridge to CAUTION and emphasis on using 
an isolated switch with the thin clients.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/k12linux-quick-start-guide/F-9/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	2 Jan 2009 17:55:39 -0000	1.3
+++ .cvsignore	4 Jan 2009 16:05:25 -0000	1.4
@@ -1 +1 @@
-k12linux-quick-start-guide-0.0.9.tar.bz2
+k12linux-quick-start-guide-0.0.10.tar.bz2


Index: k12linux-quick-start-guide.spec
===================================================================
RCS file: /cvs/pkgs/rpms/k12linux-quick-start-guide/F-9/k12linux-quick-start-guide.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- k12linux-quick-start-guide.spec	2 Jan 2009 17:55:39 -0000	1.2
+++ k12linux-quick-start-guide.spec	4 Jan 2009 16:05:26 -0000	1.3
@@ -1,5 +1,5 @@
 Name:           k12linux-quick-start-guide
-Version:        0.0.9
+Version:        0.0.10
 Release:        1%{?dist}
 Summary:        Quick Start Guide for K12Linux Live LTSP Server
 
@@ -48,6 +48,12 @@
 
 
 %changelog
+* Sun Jan 04 2009 Peter Scheie <peter at scheie.homedns.org> - 0.0.10-1
+- Moved 'version 5' phrase describing version of LTSP to bottom of html
+  document.
+- Changed wording of WARNING about the dhcp server to CAUTION and emphasized
+  that the bridge should only be connected to an isolated switch with the TCs.
+
 * Fri Jan 02 2009 Peter Scheie <peter at scheie.homedns.org> - 0.0.9-1
 - Consolidated 'rpm -e' commands for removing the guide to a single step.
 - Changed link to newer version of how to get on #ltsp at ltsp.org.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/k12linux-quick-start-guide/F-9/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	2 Jan 2009 17:55:39 -0000	1.3
+++ sources	4 Jan 2009 16:05:26 -0000	1.4
@@ -1 +1 @@
-db73786ee9a2bf2198a9f2a017088299  k12linux-quick-start-guide-0.0.9.tar.bz2
+81f0ed54497313c6364e11f66014d758  k12linux-quick-start-guide-0.0.10.tar.bz2



From lkundrak at fedoraproject.org  Sun Jan  4 16:13:26 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Sun,  4 Jan 2009 16:13:26 +0000 (UTC)
Subject: rpms/perl-TAP-Harness-JUnit/devel .cvsignore, 1.2,
	1.3 perl-TAP-Harness-JUnit.spec, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <20090104161326.872BF7011F@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/perl-TAP-Harness-JUnit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9550

Modified Files:
	.cvsignore perl-TAP-Harness-JUnit.spec sources 
Log Message:
* Sun Jan 4 2008 Lubomir Rintel (Good Data) <lubo.rintel at gooddata.com> 0.26-1
- New upstream release
- Re-enable regression tests



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-TAP-Harness-JUnit/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	3 Nov 2008 20:06:12 -0000	1.2
+++ .cvsignore	4 Jan 2009 16:12:55 -0000	1.3
@@ -1 +1 @@
-TAP-Harness-JUnit-0.25.tar.gz
+TAP-Harness-JUnit-0.26.tar.gz


Index: perl-TAP-Harness-JUnit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-TAP-Harness-JUnit/devel/perl-TAP-Harness-JUnit.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-TAP-Harness-JUnit.spec	3 Nov 2008 22:45:59 -0000	1.2
+++ perl-TAP-Harness-JUnit.spec	4 Jan 2009 16:12:55 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-TAP-Harness-JUnit
-Version:        0.25
-Release:        0.2%{?dist}
+Version:        0.26
+Release:        1%{?dist}
 Summary:        Generate JUnit compatible output from TAP results
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -47,7 +47,7 @@
 
 
 %check
-./Build test ||:
+./Build test
 
 
 %clean
@@ -62,6 +62,10 @@
 
 
 %changelog
+* Sun Jan 4 2008 Lubomir Rintel (Good Data) <lubo.rintel at gooddata.com> 0.26-1
+- New upstream release
+- Re-enable regression tests
+
 * Mon Nov 3 2008 Lubomir Rintel (Good Data) <lubo.rintel at gooddata.com> 0.25-0.2
 - Disable tests due to ambiguity in whitespace within rest results
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-TAP-Harness-JUnit/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	3 Nov 2008 20:06:12 -0000	1.2
+++ sources	4 Jan 2009 16:12:55 -0000	1.3
@@ -1 +1 @@
-cfe00e86d18fe696b8ecfccea84fd892  TAP-Harness-JUnit-0.25.tar.gz
+9c73f275ee38cd8e47a8c7c7bc4e4c90  TAP-Harness-JUnit-0.26.tar.gz



From lkundrak at fedoraproject.org  Sun Jan  4 16:18:31 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Sun,  4 Jan 2009 16:18:31 +0000 (UTC)
Subject: rpms/perl-TAP-Harness-JUnit/devel perl-TAP-Harness-JUnit.spec, 1.3, 
	1.4
Message-ID: <20090104161831.DCCE07011F@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/perl-TAP-Harness-JUnit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10748

Modified Files:
	perl-TAP-Harness-JUnit.spec 
Log Message:
fix year


Index: perl-TAP-Harness-JUnit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-TAP-Harness-JUnit/devel/perl-TAP-Harness-JUnit.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- perl-TAP-Harness-JUnit.spec	4 Jan 2009 16:12:55 -0000	1.3
+++ perl-TAP-Harness-JUnit.spec	4 Jan 2009 16:18:01 -0000	1.4
@@ -62,7 +62,7 @@
 
 
 %changelog
-* Sun Jan 4 2008 Lubomir Rintel (Good Data) <lubo.rintel at gooddata.com> 0.26-1
+* Sun Jan 4 2009 Lubomir Rintel (Good Data) <lubo.rintel at gooddata.com> 0.26-1
 - New upstream release
 - Re-enable regression tests
 



From frankb at fedoraproject.org  Sun Jan  4 16:19:01 2009
From: frankb at fedoraproject.org (=?utf-8?q?Frank_B=C3=BCttner?=)
Date: Sun,  4 Jan 2009 16:19:01 +0000 (UTC)
Subject: rpms/qwt/devel .cvsignore,1.2,1.3 qwt.spec,1.3,1.4 sources,1.2,1.3
Message-ID: <20090104161901.AF3657011F@cvs1.fedora.phx.redhat.com>

Author: frankb

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

Modified Files:
	.cvsignore qwt.spec sources 
Log Message:
- update to 5.1.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qwt/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	29 Sep 2007 19:14:56 -0000	1.2
+++ .cvsignore	4 Jan 2009 16:18:31 -0000	1.3
@@ -1 +1 @@
-qwt-5.0.2.tar.bz2
+qwt-5.1.1.tar.bz2


Index: qwt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qwt/devel/qwt.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- qwt.spec	22 Nov 2008 12:01:47 -0000	1.3
+++ qwt.spec	4 Jan 2009 16:18:31 -0000	1.4
@@ -1,7 +1,7 @@
 Name:		qwt
 Summary:	Qt Widgets for Technical Applications
-Version:	5.0.2
-Release:	6%{?dist}
+Version:	5.1.1
+Release:	1%{?dist}
 BuildRequires:	qt4-devel
 URL:		http://qwt.sourceforge.net
 License:	LGPLv2 with exceptions
@@ -68,8 +68,8 @@
 %doc COPYING
 %doc README
 %{_libdir}/libqwt.so.5
-%{_libdir}/libqwt.so.5.0
-%{_libdir}/libqwt.so.5.0.2
+%{_libdir}/libqwt.so.5.1
+%{_libdir}/libqwt.so.5.1.1
 
 %files devel
 %defattr(-,root,root)
@@ -79,6 +79,9 @@
 %{_libdir}/qt4/plugins/designer/libqwt_designer_plugin.so
 
 %changelog
+* Sun Jan 04 2009 Frank B??ttner <frank-buettner at gmx.net> - 5.1.1-1
+ -update to 5.1.1
+
 * Mon Feb 18 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 5.0.2-6
 - Autorebuild for GCC 4.3
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qwt/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	29 Sep 2007 19:14:56 -0000	1.2
+++ sources	4 Jan 2009 16:18:31 -0000	1.3
@@ -1 +1 @@
-53adbb313c478dd4aae4f1c864a2037e  qwt-5.0.2.tar.bz2
+218cef1a39ebda6cfa440a0727464275  qwt-5.1.1.tar.bz2



From peterscheie at fedoraproject.org  Sun Jan  4 16:19:16 2009
From: peterscheie at fedoraproject.org (Peter Scheie)
Date: Sun,  4 Jan 2009 16:19:16 +0000 (UTC)
Subject: rpms/k12linux-quick-start-guide/F-10 .cvsignore, 1.2,
	1.3 k12linux-quick-start-guide.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20090104161916.7E3667011F@cvs1.fedora.phx.redhat.com>

Author: peterscheie

Update of /cvs/pkgs/rpms/k12linux-quick-start-guide/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10650

Modified Files:
	.cvsignore k12linux-quick-start-guide.spec sources 
Log Message:
In html doc, changed WARNING about dhcp/bridge to CAUTION and emphasized the
need to connect bridge to isolated switch.  Moved 'version 5' reference of
LTSP to bottom.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/k12linux-quick-start-guide/F-10/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	2 Jan 2009 22:22:30 -0000	1.2
+++ .cvsignore	4 Jan 2009 16:18:46 -0000	1.3
@@ -1 +1 @@
-k12linux-quick-start-guide-0.0.9.tar.bz2
+k12linux-quick-start-guide-0.0.10.tar.bz2


Index: k12linux-quick-start-guide.spec
===================================================================
RCS file: /cvs/pkgs/rpms/k12linux-quick-start-guide/F-10/k12linux-quick-start-guide.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- k12linux-quick-start-guide.spec	2 Jan 2009 22:43:06 -0000	1.1
+++ k12linux-quick-start-guide.spec	4 Jan 2009 16:18:46 -0000	1.2
@@ -1,5 +1,5 @@
 Name:           k12linux-quick-start-guide
-Version:        0.0.9
+Version:        0.0.10
 Release:        1%{?dist}
 Summary:        Quick Start Guide for K12Linux Live LTSP Server
 
@@ -48,6 +48,12 @@
 
 
 %changelog
+* Sun Jan 04 2009 Peter Scheie <peter at scheie.homedns.org> - 0.0.10-1
+- Moved 'version 5' phrase describing version of LTSP to bottom of html
+  document.
+- Changed wording of WARNING about the dhcp server to CAUTION and emphasized
+  that the bridge should only be connected to an isolated switch with the TCs.
+
 * Fri Jan 02 2009 Peter Scheie <peter at scheie.homedns.org> - 0.0.9-1
 - Consolidated 'rpm -e' commands for removing the guide to a single step.
 - Changed link to newer version of how to get on #ltsp at ltsp.org.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/k12linux-quick-start-guide/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	2 Jan 2009 22:22:30 -0000	1.2
+++ sources	4 Jan 2009 16:18:46 -0000	1.3
@@ -1 +1 @@
-db73786ee9a2bf2198a9f2a017088299  k12linux-quick-start-guide-0.0.9.tar.bz2
+81f0ed54497313c6364e11f66014d758  k12linux-quick-start-guide-0.0.10.tar.bz2



From huzaifas at fedoraproject.org  Sun Jan  4 16:19:50 2009
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Sun,  4 Jan 2009 16:19:50 +0000 (UTC)
Subject: rpms/stun/EL-5 sources,1.1,1.2
Message-ID: <20090104161950.B7B8A7011F@cvs1.fedora.phx.redhat.com>

Author: huzaifas

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

Modified Files:
	sources 
Log Message:
sources


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/stun/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	30 Sep 2008 04:33:00 -0000	1.1
+++ sources	4 Jan 2009 16:19:20 -0000	1.2
@@ -0,0 +1 @@
+af23f5f19ed059269f0e29745353a069  stund_0.96_Aug13.tgz



From scop at fedoraproject.org  Sun Jan  4 16:33:10 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Sun,  4 Jan 2009 16:33:10 +0000 (UTC)
Subject: rpms/perl-Config-General/devel
	perl-Config-General-2.42-system-ixhash.patch, NONE,
	1.1 .cvsignore, 1.11, 1.12 perl-Config-General.spec, 1.18,
	1.19 sources, 1.11, 1.12
Message-ID: <20090104163310.DF9B070140@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/perl-Config-General/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14695

Modified Files:
	.cvsignore perl-Config-General.spec sources 
Added Files:
	perl-Config-General-2.42-system-ixhash.patch 
Log Message:
* Sun Jan  4 2009 Ville Skytt?? <ville.skytta at iki.fi> - 2.42-1
- 2.42.
- Patch test suite to use system installed Tie::IxHash.
- Fix some spelling errors in %description.
- Use Source0: instead of Source:.


perl-Config-General-2.42-system-ixhash.patch:

--- NEW FILE perl-Config-General-2.42-system-ixhash.patch ---
diff -up Config-General-2.42/t/run.t~ Config-General-2.42/t/run.t
--- Config-General-2.42/t/run.t~	2008-12-17 23:09:33.000000000 +0200
+++ Config-General-2.42/t/run.t	2009-01-04 18:19:41.000000000 +0200
@@ -14,7 +14,8 @@ use Test::More tests => 50;
 # ahem, we deliver the test code with a local copy of
 # the Tie::IxHash module so we can do tests on sorted
 # hashes without dependency to Tie::IxHash.
-use lib qw(t);
+# ahem, in this rpm we don't (we want to test with the system installed one)
+#use lib qw(t);
 use Tie::IxHash;
 
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Config-General/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	21 Jun 2008 09:35:48 -0000	1.11
+++ .cvsignore	4 Jan 2009 16:32:39 -0000	1.12
@@ -1 +1 @@
-Config-General-2.40.tar.gz
+Config-General-2.42.tar.gz


Index: perl-Config-General.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Config-General/devel/perl-Config-General.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- perl-Config-General.spec	21 Jun 2008 09:35:48 -0000	1.18
+++ perl-Config-General.spec	4 Jan 2009 16:32:39 -0000	1.19
@@ -1,29 +1,31 @@
 Name:           perl-Config-General
-Version:        2.40
+Version:        2.42
 Release:        1%{?dist}
 Summary:        Generic configuration module for Perl
 
 Group:          Development/Libraries
 License:        GPL+ or Artistic
 URL:            http://search.cpan.org/dist/Config-General/
-Source:         http://www.cpan.org/authors/id/T/TL/TLINDEN/Config-General-%{version}.tar.gz
+Source0:        http://www.cpan.org/authors/id/T/TL/TLINDEN/Config-General-%{version}.tar.gz
+Patch0:         %{name}-2.42-system-ixhash.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
 BuildRequires:  perl(ExtUtils::MakeMaker)
 BuildRequires:  perl(Test::More)
+BuildRequires:  perl(Tie::IxHash)
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
-This module opens a config file and parses it's contents for
+This module opens a config file and parses its contents for
 you. After parsing the module returns a hash structure which contains
 the representation of the config file.
 The format of config files supported by Config::General is inspired by
-the well known apache config format, in fact, this module is 100%
-read-compatible to apache configs, but you can also just use simple
+the well known Apache config format, in fact, this module is 100%
+read-compatible with Apache configs, but you can also just use simple
 name/value pairs in your config files.
-In addition to the capabilities of a apache config file it supports
-some enhancements such as here-documents, C- style comments or
+In addition to the capabilities of an Apache config file it supports
+some enhancements such as here-documents, C-style comments or
 multiline options. It is also possible to save the config back to
 disk, which makes the module a perfect backend for configuration
 interfaces.
@@ -33,6 +35,8 @@
 
 %prep
 %setup -q -n Config-General-%{version}
+%patch0 -p1
+rm -r t/Tie
 f=Changelog ; iconv -f iso-8859-1 -t utf-8 -o $f.utf8 $f ; mv $f.utf8 $f
 
 
@@ -65,6 +69,12 @@
 
 
 %changelog
+* Sun Jan  4 2009 Ville Skytt?? <ville.skytta at iki.fi> - 2.42-1
+- 2.42.
+- Patch test suite to use system installed Tie::IxHash.
+- Fix some spelling errors in %%description.
+- Use Source0: instead of Source:.
+
 * Sat Jun 21 2008 Ville Skytt?? <ville.skytta at iki.fi> - 2.40-1
 - 2.40.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Config-General/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	21 Jun 2008 09:35:48 -0000	1.11
+++ sources	4 Jan 2009 16:32:40 -0000	1.12
@@ -1 +1 @@
-cbb860739f2097c4202c225981dcbcf0  Config-General-2.40.tar.gz
+2b4d586151de7de521dd415be08b4cd5  Config-General-2.42.tar.gz



From s4504kr at fedoraproject.org  Sun Jan  4 16:52:23 2009
From: s4504kr at fedoraproject.org (Jochen Schmitt)
Date: Sun,  4 Jan 2009 16:52:23 +0000 (UTC)
Subject: rpms/scons/EL-5 scons.spec,1.11,1.12 sources,1.5,1.6
Message-ID: <20090104165223.9774F7011F@cvs1.fedora.phx.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/scons/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22621

Modified Files:
	scons.spec sources 
Log Message:
Upate to release 0.98.4


Index: scons.spec
===================================================================
RCS file: /cvs/extras/rpms/scons/EL-5/scons.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- scons.spec	29 Apr 2008 15:36:05 -0000	1.11
+++ scons.spec	4 Jan 2009 16:51:51 -0000	1.12
@@ -1,5 +1,5 @@
 Name:           scons
-Version:        0.98.1
+Version:        0.98.4
 Release:        1%{?dist}
 
 Summary:        An Open Source software construction tool
@@ -57,6 +57,9 @@
 
 
 %changelog
+* Sun Jan  4 2009 Jochen Schmitt <Jochen herr-schmitt de> - 0.98.4-1
+- Update to 0.98.4 to fix BZ #475664
+
 * Sat Apr 19 2008 Gerard Milmeister <gemi at bluewin.ch> - 0.98.1-1
 - new release 0.98.1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/scons/EL-5/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	29 Apr 2008 15:36:05 -0000	1.5
+++ sources	4 Jan 2009 16:51:51 -0000	1.6
@@ -1 +1 @@
-64f555b332d5203101f30dd94c490cb3  scons-0.98.1.tar.gz
+4e49ae162bcea9574cde4ce4fc56afe1  scons-0.98.4.tar.gz



From andriy at fedoraproject.org  Sun Jan  4 16:56:24 2009
From: andriy at fedoraproject.org (Andy Shevchenko)
Date: Sun,  4 Jan 2009 16:56:24 +0000 (UTC)
Subject: rpms/jack-audio-connection-kit/devel jack-audio-connection-kit.spec,
	1.26, 1.27
Message-ID: <20090104165624.37DC27011F@cvs1.fedora.phx.redhat.com>

Author: andriy

Update of /cvs/extras/rpms/jack-audio-connection-kit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23603

Modified Files:
	jack-audio-connection-kit.spec 
Log Message:
Temporary fix for #477402


Index: jack-audio-connection-kit.spec
===================================================================
RCS file: /cvs/extras/rpms/jack-audio-connection-kit/devel/jack-audio-connection-kit.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- jack-audio-connection-kit.spec	29 Dec 2008 21:57:27 -0000	1.26
+++ jack-audio-connection-kit.spec	4 Jan 2009 16:55:53 -0000	1.27
@@ -1,7 +1,7 @@
 Summary: The Jack Audio Connection Kit
 Name: jack-audio-connection-kit
 Version: 0.116.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2 and LGPLv2
 Group: System Environment/Daemons
 Source0: http://www.jackaudio.org/downloads/%{name}-%{version}.tar.gz
@@ -64,8 +64,11 @@
 # Put custom HTML_FOOTER to avoid timestamp inside
 # (recipe was taken from http://fedoraproject.org/wiki/PackagingDrafts/MultilibTricks)
 cp %{SOURCE3} doc/no_date_footer.html
-# Fix Doxyfile - apply custom html footer
-sed -e 's,^HTML_FOOTER[ \t]*=.*,HTML_FOOTER = no_date_footer.html,' %{doxyfile} > %{doxyfile}.new
+# Fix Doxyfile:
+#  - apply custom html footer (#477718, #341621)
+#  - avoid font packaging (workaround for #477402, fix will come with #478747)
+sed -e 's,^HTML_FOOTER[ \t]*=.*,HTML_FOOTER = no_date_footer.html,;
+        s,^GENERATE_LATEX[ \t]*=.*,GENERATE_LATEX = NO,;' %{doxyfile} > %{doxyfile}.new
 touch -r %{doxyfile} %{doxyfile}.new
 mv -f %{doxyfile}.new %{doxyfile}
 
@@ -173,6 +176,9 @@
 %{_bindir}/jack_midisine
 
 %changelog
+* Sun Jan 04 2009 Andy Shevchenko <andy at smile.org.ua> - 0.116.1-3
+- avoid creation of the LaTeX documentation (temporary fix for #477402)
+
 * Mon Dec 29 2008 Andy Shevchenko <andy at smile.org.ua> - 0.116.1-2
 - fix multiarch conflict again (#477718, #341621)
 



From frankb at fedoraproject.org  Sun Jan  4 16:57:16 2009
From: frankb at fedoraproject.org (=?utf-8?q?Frank_B=C3=BCttner?=)
Date: Sun,  4 Jan 2009 16:57:16 +0000 (UTC)
Subject: rpms/qwt/devel qwt-path.patch,1.1,1.2 qwt.spec,1.4,1.5
Message-ID: <20090104165716.B08357011F@cvs1.fedora.phx.redhat.com>

Author: frankb

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

Modified Files:
	qwt-path.patch qwt.spec 
Log Message:
- modify path patch


qwt-path.patch:

Index: qwt-path.patch
===================================================================
RCS file: /cvs/pkgs/rpms/qwt/devel/qwt-path.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- qwt-path.patch	29 Sep 2007 19:14:56 -0000	1.1
+++ qwt-path.patch	4 Jan 2009 16:57:16 -0000	1.2
@@ -1,7 +1,7 @@
-diff -Nur qwt-5.0.1.org/designer/designer.pro qwt-5.0.1/designer/designer.pro
---- qwt-5.0.1.org/designer/designer.pro	2007-05-15 15:23:47.000000000 +0200
-+++ qwt-5.0.1/designer/designer.pro	2007-05-15 17:29:13.000000000 +0200
-@@ -92,7 +92,7 @@
+diff -Nur qwt-5.1.1.org/designer/designer.pro qwt-5.1.1/designer/designer.pro
+--- qwt-5.1.1.org/designer/designer.pro	2008-05-24 18:47:36.000000000 +0200
++++ qwt-5.1.1/designer/designer.pro	2009-01-04 17:54:33.000000000 +0100
+@@ -123,7 +123,7 @@
          RESOURCES += \
              qwt_designer_plugin.qrc
  
@@ -9,21 +9,20 @@
 +        target.path = QTDESIGNERPATH
          INSTALLS += target
      }
+ }
+diff -Nur qwt-5.1.1.org/qwtconfig.pri qwt-5.1.1/qwtconfig.pri
+--- qwt-5.1.1.org/qwtconfig.pri	2008-05-24 18:47:36.000000000 +0200
++++ qwt-5.1.1/qwtconfig.pri	2009-01-04 17:55:07.000000000 +0100
+@@ -7,17 +7,9 @@
+ VER_PAT      = 1
+ VERSION      = $$VER_MAJ.$$VER_MIN.$$VER_PAT
  
-diff -Nur qwt-5.0.1.org/qwtconfig.pri qwt-5.0.1/qwtconfig.pri
---- qwt-5.0.1.org/qwtconfig.pri	2007-05-15 12:07:33.000000000 +0200
-+++ qwt-5.0.1/qwtconfig.pri	2007-05-15 15:52:39.000000000 +0200
-@@ -1,18 +1,6 @@
--######################################################################
--# Install paths
--######################################################################
--
 -unix {
--    INSTALLBASE    = /usr/local/qwt-5.0.2
+-    INSTALLBASE    = /usr/local/qwt-5.1.1
 -}
 -
 -win32 {
--    INSTALLBASE    = C:/Qwt-5.0.2
+-    INSTALLBASE    = C:/Qwt-5.1.1
 -}
 -
 -target.path    = $$INSTALLBASE/lib
@@ -35,7 +34,7 @@
  
  ######################################################################
  # qmake internal options
-@@ -58,7 +46,7 @@
+@@ -97,7 +89,7 @@
  # QwtSVGItem.
  ######################################################################
  


Index: qwt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qwt/devel/qwt.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- qwt.spec	4 Jan 2009 16:18:31 -0000	1.4
+++ qwt.spec	4 Jan 2009 16:57:16 -0000	1.5
@@ -1,7 +1,7 @@
 Name:		qwt
 Summary:	Qt Widgets for Technical Applications
 Version:	5.1.1
-Release:	1%{?dist}
+Release:	2%{?dist}
 BuildRequires:	qt4-devel
 URL:		http://qwt.sourceforge.net
 License:	LGPLv2 with exceptions
@@ -79,6 +79,9 @@
 %{_libdir}/qt4/plugins/designer/libqwt_designer_plugin.so
 
 %changelog
+* Sun Jan 04 2009 Frank B??ttner <frank-buettner at gmx.net> - 5.1.1-2
+ - modify path patch
+
 * Sun Jan 04 2009 Frank B??ttner <frank-buettner at gmx.net> - 5.1.1-1
  -update to 5.1.1
 



From slankes at fedoraproject.org  Sun Jan  4 17:02:49 2009
From: slankes at fedoraproject.org (Sven Lankes)
Date: Sun,  4 Jan 2009 17:02:49 +0000 (UTC)
Subject: rpms/maatkit/devel .cvsignore, 1.2, 1.3 maatkit.spec, 1.4,
	1.5 sources, 1.2, 1.3
Message-ID: <20090104170249.A0B6D7011F@cvs1.fedora.phx.redhat.com>

Author: slankes

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

Modified Files:
	.cvsignore maatkit.spec sources 
Log Message:
new upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/maatkit/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	23 Dec 2008 20:35:38 -0000	1.2
+++ .cvsignore	4 Jan 2009 17:02:19 -0000	1.3
@@ -1 +1 @@
-maatkit-2582.tar.gz
+maatkit-2725.tar.gz


Index: maatkit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/maatkit/devel/maatkit.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- maatkit.spec	25 Dec 2008 14:44:12 -0000	1.4
+++ maatkit.spec	4 Jan 2009 17:02:19 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           maatkit
-Version:        2582
-Release:        3%{?dist}
+Version:        2725
+Release:        1%{?dist}
 Summary:        Essential command-line utilities for MySQL
 
 Group:          Applications/Databases
@@ -56,6 +56,9 @@
 
 
 %changelog
+* Sun Jan 4 2009 Sven Lankes <sven at lank.es> - 2725-1
+- new upstream release 
+
 * Thu Dec 25 2008 Lubomir Rintel <lkundrak at v3.sk> - 2582-3
 - Really fix the DBD dependency...
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/maatkit/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	23 Dec 2008 20:35:38 -0000	1.2
+++ sources	4 Jan 2009 17:02:19 -0000	1.3
@@ -1 +1 @@
-10e2f12b1e758b32c9c7649f0e26a166  maatkit-2582.tar.gz
+fcd33d94c953554e8d1d85bded9b5d55  maatkit-2725.tar.gz



From andriy at fedoraproject.org  Sun Jan  4 17:11:51 2009
From: andriy at fedoraproject.org (Andy Shevchenko)
Date: Sun,  4 Jan 2009 17:11:51 +0000 (UTC)
Subject: rpms/jack-audio-connection-kit/F-10 jack-audio-connection-kit.spec, 
	1.26, 1.27
Message-ID: <20090104171151.943C970140@cvs1.fedora.phx.redhat.com>

Author: andriy

Update of /cvs/extras/rpms/jack-audio-connection-kit/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28270

Modified Files:
	jack-audio-connection-kit.spec 
Log Message:
Temporary fix for #477402


Index: jack-audio-connection-kit.spec
===================================================================
RCS file: /cvs/extras/rpms/jack-audio-connection-kit/F-10/jack-audio-connection-kit.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- jack-audio-connection-kit.spec	29 Dec 2008 22:03:15 -0000	1.26
+++ jack-audio-connection-kit.spec	4 Jan 2009 17:11:21 -0000	1.27
@@ -1,7 +1,7 @@
 Summary: The Jack Audio Connection Kit
 Name: jack-audio-connection-kit
 Version: 0.116.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2 and LGPLv2
 Group: System Environment/Daemons
 Source0: http://www.jackaudio.org/downloads/%{name}-%{version}.tar.gz
@@ -64,8 +64,11 @@
 # Put custom HTML_FOOTER to avoid timestamp inside
 # (recipe was taken from http://fedoraproject.org/wiki/PackagingDrafts/MultilibTricks)
 cp %{SOURCE3} doc/no_date_footer.html
-# Fix Doxyfile - apply custom html footer
-sed -e 's,^HTML_FOOTER[ \t]*=.*,HTML_FOOTER = no_date_footer.html,' %{doxyfile} > %{doxyfile}.new
+# Fix Doxyfile:
+#  - apply custom html footer (#477718, #341621)
+#  - avoid font packaging (workaround for #477402, fix will come with #478747)
+sed -e 's,^HTML_FOOTER[ \t]*=.*,HTML_FOOTER = no_date_footer.html,;
+        s,^GENERATE_LATEX[ \t]*=.*,GENERATE_LATEX = NO,;' %{doxyfile} > %{doxyfile}.new
 touch -r %{doxyfile} %{doxyfile}.new
 mv -f %{doxyfile}.new %{doxyfile}
 
@@ -173,6 +176,9 @@
 %{_bindir}/jack_midisine
 
 %changelog
+* Sun Jan 04 2009 Andy Shevchenko <andy at smile.org.ua> - 0.116.1-3
+- avoid creation of the LaTeX documentation (temporary fix for #477402)
+
 * Mon Dec 29 2008 Andy Shevchenko <andy at smile.org.ua> - 0.116.1-2
 - fix multiarch conflict again (#477718, #341621)
 



From andriy at fedoraproject.org  Sun Jan  4 17:14:43 2009
From: andriy at fedoraproject.org (Andy Shevchenko)
Date: Sun,  4 Jan 2009 17:14:43 +0000 (UTC)
Subject: rpms/jack-audio-connection-kit/F-9 jack-audio-connection-kit.spec, 
	1.26, 1.27
Message-ID: <20090104171443.79B3B7011F@cvs1.fedora.phx.redhat.com>

Author: andriy

Update of /cvs/extras/rpms/jack-audio-connection-kit/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29886

Modified Files:
	jack-audio-connection-kit.spec 
Log Message:
Temporary fix for #477402


Index: jack-audio-connection-kit.spec
===================================================================
RCS file: /cvs/extras/rpms/jack-audio-connection-kit/F-9/jack-audio-connection-kit.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- jack-audio-connection-kit.spec	29 Dec 2008 22:13:38 -0000	1.26
+++ jack-audio-connection-kit.spec	4 Jan 2009 17:14:13 -0000	1.27
@@ -1,7 +1,7 @@
 Summary: The Jack Audio Connection Kit
 Name: jack-audio-connection-kit
 Version: 0.116.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2 and LGPLv2
 Group: System Environment/Daemons
 Source0: http://www.jackaudio.org/downloads/%{name}-%{version}.tar.gz
@@ -64,8 +64,11 @@
 # Put custom HTML_FOOTER to avoid timestamp inside
 # (recipe was taken from http://fedoraproject.org/wiki/PackagingDrafts/MultilibTricks)
 cp %{SOURCE3} doc/no_date_footer.html
-# Fix Doxyfile - apply custom html footer
-sed -e 's,^HTML_FOOTER[ \t]*=.*,HTML_FOOTER = no_date_footer.html,' %{doxyfile} > %{doxyfile}.new
+# Fix Doxyfile:
+#  - apply custom html footer (#477718, #341621)
+#  - avoid font packaging (workaround for #477402, fix will come with #478747)
+sed -e 's,^HTML_FOOTER[ \t]*=.*,HTML_FOOTER = no_date_footer.html,;
+        s,^GENERATE_LATEX[ \t]*=.*,GENERATE_LATEX = NO,;' %{doxyfile} > %{doxyfile}.new
 touch -r %{doxyfile} %{doxyfile}.new
 mv -f %{doxyfile}.new %{doxyfile}
 
@@ -173,6 +176,9 @@
 %{_bindir}/jack_midisine
 
 %changelog
+* Sun Jan 04 2009 Andy Shevchenko <andy at smile.org.ua> - 0.116.1-3
+- avoid creation of the LaTeX documentation (temporary fix for #477402)
+
 * Mon Dec 29 2008 Andy Shevchenko <andy at smile.org.ua> - 0.116.1-2
 - fix multiarch conflict again (#477718, #341621)
 



From dgoodwin at fedoraproject.org  Sun Jan  4 17:20:45 2009
From: dgoodwin at fedoraproject.org (Devan Goodwin)
Date: Sun,  4 Jan 2009 17:20:45 +0000 (UTC)
Subject: rpms/f-spot/F-10 f-spot.spec,1.80,1.81
Message-ID: <20090104172045.B440E7011F@cvs1.fedora.phx.redhat.com>

Author: dgoodwin

Update of /cvs/extras/rpms/f-spot/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31179

Modified Files:
	f-spot.spec 
Log Message:
Merge devel f-spot.spec changes back into F-10.



Index: f-spot.spec
===================================================================
RCS file: /cvs/extras/rpms/f-spot/F-10/f-spot.spec,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- f-spot.spec	30 Dec 2008 02:01:24 -0000	1.80
+++ f-spot.spec	4 Jan 2009 17:20:14 -0000	1.81
@@ -1,12 +1,12 @@
 Name:           f-spot
 Version:        0.5.0.3
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Photo management application
 
 Group:          Applications/Multimedia
 License:        GPLv2+ and LGPLv2+ and CPL and MIT
-URL:            http://www.gnome.org/projects/f-spot/
-Source0:        http://download.gnome.org/sources/f-spot/0.4/f-spot-%{version}.tar.bz2
+URL:            http://f-spot.org/
+Source0:        http://download.gnome.org/sources/f-spot/0.5/f-spot-%{version}.tar.bz2
 # http://bugzilla.gnome.org/show_bug.cgi?id=510325
 Patch0:		x-content.patch
 # I'm told this is fixed in SVN
@@ -21,13 +21,12 @@
 BuildRequires:  gtk2-devel mono-devel libjpeg-devel sqlite-devel >= 3.3.1
 BuildRequires:  gnome-sharp-devel gnome-desktop-sharp-devel gtk-sharp2-gapi
 BuildRequires:  gettext
-BuildRequires:  autoconf
+BuildRequires:  autoconf, automake, libtool, intltool
 BuildRequires:  perl(XML::Parser)
 BuildRequires:  gnome-doc-utils
 BuildRequires:  ndesk-dbus-glib-devel
 BuildRequires:  mono-addins-devel
 BuildRequires:  desktop-file-utils
-BuildRequires:  intltool
 Requires:       sqlite >= 3.3.1
 Requires:       lcms
 Requires:       dcraw
@@ -46,7 +45,7 @@
 %description
 F-Spot is an application designed to provide personal photo management
 to the GNOME desktop. Features include import, export, printing and advanced
-sorting of digital images. 
+sorting and tagging of digital images. 
 
 %prep
 %setup -q
@@ -124,6 +123,9 @@
 %{_libdir}/gio-sharp-unstable
 
 %changelog
+* Sun Jan 04 2009 Devan Goodwin <dgoodwin at redhat.com> 0.5.0.3-3
+- Merge in changes from devel spec file.
+
 * Mon Dec 22 2008 Devan Goodwin <dgoodwin at redhat.com> 0.5.0.3-1
 - Update to 0.5.0.3.
 



From jcollie at fedoraproject.org  Sun Jan  4 17:23:25 2009
From: jcollie at fedoraproject.org (Jeffrey C. Ollie)
Date: Sun,  4 Jan 2009 17:23:25 +0000 (UTC)
Subject: rpms/asterisk/F-10
	0012-Merged-revisions-162275-via-svnmerge-from.patch, NONE,
	1.1 0013-Update-autoconf.patch, NONE,
	1.1 0001-Modify-init-scripts-for-better-Fedora-compatibility.patch,
	1.5,
	1.6 0002-Modify-modules.conf-so-that-different-voicemail-modu.patch, 
	1.5,
	1.6 0003-Allow-alternate-extensions-to-be-specified-in-users.patch,
	1.4,
	1.5 0004-Minor-changes-to-reduce-packaging-changes-made-by-th.patch, 
	1.4, 1.5 0005-Add-chan_mobile-from-asterisk-addons.patch, 1.4,
	1.5 0006-Use-pkgconfig-to-check-for-Lua.patch, 1.4,
	1.5 0007-Build-using-external-libedit.patch, 1.4,
	1.5 0008-Revert-changes-to-pbx_lua-from-rev-126363-that-cause.patch, 
	1.1,
	1.2 0009-change-configure.ac-to-look-for-pkg-config-gmime-2.4.patch, 
	1.1,
	1.2 0010-fix-the-AST_PROG_SED-problem-that-makes-.-bootstrap.patch,
	1.1, 1.2 0011-Merged-revisions-160170-160172-via-svnmerge-from.patch, 
	1.1, 1.2 asterisk.spec, 1.38, 1.39 0012-Update-autoconf.patch,
	1.3, NONE
Message-ID: <20090104172325.83EEA7011F@cvs1.fedora.phx.redhat.com>

Author: jcollie

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

Modified Files:
	0001-Modify-init-scripts-for-better-Fedora-compatibility.patch 
	0002-Modify-modules.conf-so-that-different-voicemail-modu.patch 
	0003-Allow-alternate-extensions-to-be-specified-in-users.patch 
	0004-Minor-changes-to-reduce-packaging-changes-made-by-th.patch 
	0005-Add-chan_mobile-from-asterisk-addons.patch 
	0006-Use-pkgconfig-to-check-for-Lua.patch 
	0007-Build-using-external-libedit.patch 
	0008-Revert-changes-to-pbx_lua-from-rev-126363-that-cause.patch 
	0009-change-configure.ac-to-look-for-pkg-config-gmime-2.4.patch 
	0010-fix-the-AST_PROG_SED-problem-that-makes-.-bootstrap.patch 
	0011-Merged-revisions-160170-160172-via-svnmerge-from.patch 
	asterisk.spec 
Added Files:
	0012-Merged-revisions-162275-via-svnmerge-from.patch 
	0013-Update-autoconf.patch 
Removed Files:
	0012-Update-autoconf.patch 
Log Message:
* Sun Jan  4 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6.0.2-2
- Add patch to fix compilation on PPC


0012-Merged-revisions-162275-via-svnmerge-from.patch:

--- NEW FILE 0012-Merged-revisions-162275-via-svnmerge-from.patch ---
>From 986c677766137383378252947eafb3eb8c86718a Mon Sep 17 00:00:00 2001
From: file <file at f38db490-d61c-443f-a65b-d21fe96a405b>
Date: Tue, 9 Dec 2008 20:47:11 +0000
Subject: [PATCH 12/13] Merged revisions 162275 via svnmerge from
 https://origsvn.digium.com/svn/asterisk/trunk

................
  r162275 | file | 2008-12-09 16:46:11 -0400 (Tue, 09 Dec 2008) | 11 lines

  Merged revisions 162273 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/branches/1.4

  ........
    r162273 | file | 2008-12-09 16:44:32 -0400 (Tue, 09 Dec 2008) | 4 lines

    Fix double declaration of 'x' on the PPC platform.
    (closes issue #14038)
    Reported by: ffloimair
  ........
................

git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0 at 162276 f38db490-d61c-443f-a65b-d21fe96a405b
---
 apps/app_festival.c |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/apps/app_festival.c b/apps/app_festival.c
index de8c618..4e1e47e 100644
--- a/apps/app_festival.c
+++ b/apps/app_festival.c
@@ -121,7 +121,6 @@ static int send_waveform_to_fd(char *waveform, int length, int fd)
 	int x;
 #ifdef __PPC__ 
 	char c;
-	int x;
 #endif
 	sigset_t fullset, oldset;
 
-- 
1.6.1


0013-Update-autoconf.patch:

--- NEW FILE 0013-Update-autoconf.patch ---
>From 249cd4bd1b4b9a0b99a07d44359e098c10dacbdb Mon Sep 17 00:00:00 2001
From: Jeffrey C. Ollie <jeff at ocjtech.us>
Date: Sun, 4 Jan 2009 00:37:02 -0600
Subject: [PATCH 13/13] Update autoconf.

---
 configure                        |23025 ++++++++++++++++++++------------------
 include/asterisk/autoconfig.h.in |   60 +-
 2 files changed, 12340 insertions(+), 10745 deletions(-)

diff --git a/configure b/configure
index f997451..e40ba2c 100755
--- a/configure
+++ b/configure
@@ -1,12 +1,12 @@
 #! /bin/sh
-# From configure.ac Revision: 159855 .
+# From configure.ac Revision.
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for asterisk 1.6.
+# Generated by GNU Autoconf 2.63 for asterisk 1.6.
 #
 # Report bugs to <www.asterisk.org>.
 #
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 # This configure script is free software; the Free Software Foundation
 # gives unlimited permission to copy, distribute and modify it.
 #
@@ -20,7 +20,7 @@ DUALCASE=1; export DUALCASE # for MKS sh
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
   emulate sh
   NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
   # is contrary to our usage.  Disable this feature.
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
@@ -42,17 +42,45 @@ as_cr_Letters=$as_cr_letters$as_cr_LETTERS
 as_cr_digits='0123456789'
 as_cr_alnum=$as_cr_Letters$as_cr_digits
 
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
+as_nl='
+'
+export as_nl
+# Printing a long string crashes Solaris 7 /usr/bin/printf.
+as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
+if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+  as_echo='printf %s\n'
+  as_echo_n='printf %s'
+else
+  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
+    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
+    as_echo_n='/usr/ucb/echo -n'
   else
-    PATH_SEPARATOR=:
+    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
+    as_echo_n_body='eval
+      arg=$1;
+      case $arg in
+      *"$as_nl"*)
+	expr "X$arg" : "X\\(.*\\)$as_nl";
+	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
+      esac;
+      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
+    '
+    export as_echo_n_body
+    as_echo_n='sh -c $as_echo_n_body as_echo'
   fi
-  rm -f conf$$.sh
+  export as_echo_body
+  as_echo='sh -c $as_echo_body as_echo'
+fi
+
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+  PATH_SEPARATOR=:
+  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
+    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
+      PATH_SEPARATOR=';'
+  }
 fi
 
 # Support unset when possible.
@@ -68,8 +96,6 @@ fi
 # there to prevent editors from complaining about space-tab.
 # (If _AS_PATH_WALK were called with IFS unset, it would disable word
 # splitting by setting IFS to empty value.)
-as_nl='
-'
 IFS=" ""	$as_nl"
 
 # Find who we are.  Look in the path if we contain no directory separator.
@@ -92,7 +118,7 @@ if test "x$as_myself" = x; then
   as_myself=$0
 fi
 if test ! -f "$as_myself"; then
-  echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
   { (exit 1); exit 1; }
 fi
 
@@ -105,17 +131,10 @@ PS2='> '
 PS4='+ '
 
 # NLS nuisances.
-for as_var in \
-  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
-  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
-  LC_TELEPHONE LC_TIME
-do
-  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
-    eval $as_var=C; export $as_var
-  else
-    ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-  fi
-done
+LC_ALL=C
+export LC_ALL
+LANGUAGE=C
+export LANGUAGE
 
 # Required to use basename.
 if expr a : '\(a\)' >/dev/null 2>&1 &&
@@ -137,7 +156,7 @@ as_me=`$as_basename -- "$0" ||
 $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
 	 X"$0" : 'X\(//\)$' \| \
 	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-echo X/"$0" |
+$as_echo X/"$0" |
     sed '/^.*\/\([^/][^/]*\)\/*$/{
 	    s//\1/
 	    q
@@ -163,7 +182,7 @@ else
   as_have_required=no
 fi
 
-  if test $as_have_required = yes && 	 (eval ":
+  if test $as_have_required = yes &&	 (eval ":
 (as_func_return () {
   (exit \$1)
 }
@@ -245,7 +264,7 @@ IFS=$as_save_IFS
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
   emulate sh
   NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
   # is contrary to our usage.  Disable this feature.
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
@@ -266,7 +285,7 @@ _ASEOF
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
   emulate sh
   NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
   # is contrary to our usage.  Disable this feature.
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
@@ -346,10 +365,10 @@ fi
 
       if test "x$CONFIG_SHELL" != x; then
   for as_var in BASH_ENV ENV
-        do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-        done
-        export CONFIG_SHELL
-        exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
+	do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+	done
+	export CONFIG_SHELL
+	exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
 fi
 
 
@@ -418,9 +437,10 @@ fi
 
 test \$exitcode = 0") || {
   echo No shell found that supports shell functions.
-  echo Please tell autoconf at gnu.org about your system,
-  echo including any error possibly output before this
-  echo message
+  echo Please tell bug-autoconf at gnu.org about your system,
+  echo including any error possibly output before this message.
+  echo This can help us improve future autoconf versions.
+  echo Configuration will now proceed without shell functions.
 }
 
 
[...44639 lines suppressed...]
     else
-      rm -f $ac_file
-      mv "$tmp/config.h" $ac_file
+      rm -f "$ac_file"
+      mv "$tmp/config.h" "$ac_file" \
+	|| { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
+$as_echo "$as_me: error: could not create $ac_file" >&2;}
+   { (exit 1); exit 1; }; }
     fi
   else
-    echo "/* $configure_input  */"
-    cat "$ac_result"
+    $as_echo "/* $configure_input  */" \
+      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
+      || { { $as_echo "$as_me:$LINENO: error: could not create -" >&5
+$as_echo "$as_me: error: could not create -" >&2;}
+   { (exit 1); exit 1; }; }
   fi
-  rm -f "$tmp/out12"
  ;;
 
 
@@ -50858,6 +52450,11 @@ _ACEOF
 chmod +x $CONFIG_STATUS
 ac_clean_files=$ac_clean_files_save
 
+test $ac_write_fail = 0 ||
+  { { $as_echo "$as_me:$LINENO: error: write failure creating $CONFIG_STATUS" >&5
+$as_echo "$as_me: error: write failure creating $CONFIG_STATUS" >&2;}
+   { (exit 1); exit 1; }; }
+
 
 # configure is writing to config.log, and then calls config.status.
 # config.status does its own redirection, appending to config.log.
@@ -50879,6 +52476,10 @@ if test "$no_create" != yes; then
   # would make configure fail if this is the last instruction.
   $ac_cs_success || { (exit 1); exit 1; }
 fi
+if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
+  { $as_echo "$as_me:$LINENO: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
+$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
+fi
 
 
 if test "x${silent}" != "xyes" ; then
@@ -50907,17 +52508,17 @@ echo "       \$\$\$\$\$\$\$\$\$\$\$\$\$\$\$\$.                "
 echo
 fi
 
-{ echo "$as_me:$LINENO: Package configured for: " >&5
-echo "$as_me: Package configured for: " >&6;}
-{ echo "$as_me:$LINENO: OS type  : $host_os" >&5
-echo "$as_me: OS type  : $host_os" >&6;}
-{ echo "$as_me:$LINENO: Host CPU : $host_cpu" >&5
-echo "$as_me: Host CPU : $host_cpu" >&6;}
-{ echo "$as_me:$LINENO: build-cpu:vendor:os: $build_cpu : $build_vendor : $build_os :" >&5
-echo "$as_me: build-cpu:vendor:os: $build_cpu : $build_vendor : $build_os :" >&6;}
-{ echo "$as_me:$LINENO: host-cpu:vendor:os: $host_cpu : $host_vendor : $host_os :" >&5
-echo "$as_me: host-cpu:vendor:os: $host_cpu : $host_vendor : $host_os :" >&6;}
+{ $as_echo "$as_me:$LINENO: Package configured for: " >&5
+$as_echo "$as_me: Package configured for: " >&6;}
+{ $as_echo "$as_me:$LINENO: OS type  : $host_os" >&5
+$as_echo "$as_me: OS type  : $host_os" >&6;}
+{ $as_echo "$as_me:$LINENO: Host CPU : $host_cpu" >&5
+$as_echo "$as_me: Host CPU : $host_cpu" >&6;}
+{ $as_echo "$as_me:$LINENO: build-cpu:vendor:os: $build_cpu : $build_vendor : $build_os :" >&5
+$as_echo "$as_me: build-cpu:vendor:os: $build_cpu : $build_vendor : $build_os :" >&6;}
+{ $as_echo "$as_me:$LINENO: host-cpu:vendor:os: $host_cpu : $host_vendor : $host_os :" >&5
+$as_echo "$as_me: host-cpu:vendor:os: $host_cpu : $host_vendor : $host_os :" >&6;}
 if test "${cross_compiling}" = "yes"; then
-   { echo "$as_me:$LINENO: Cross Compilation = YES" >&5
-echo "$as_me: Cross Compilation = YES" >&6;}
+   { $as_echo "$as_me:$LINENO: Cross Compilation = YES" >&5
+$as_echo "$as_me: Cross Compilation = YES" >&6;}
 fi
diff --git a/include/asterisk/autoconfig.h.in b/include/asterisk/autoconfig.h.in
index 60f497d..1e4c5a6 100644
--- a/include/asterisk/autoconfig.h.in
+++ b/include/asterisk/autoconfig.h.in
@@ -119,6 +119,12 @@
 /* Define to indicate the ${BKTR_DESCRIP} library version */
 #undef HAVE_BKTR_VERSION
 
+/* Define this to indicate the ${BLUETOOTH_DESCRIP} library */
+#undef HAVE_BLUETOOTH
+
+/* Define to indicate the ${BLUETOOTH_DESCRIP} library version */
+#undef HAVE_BLUETOOTH_VERSION
+
 /* Define to 1 if byteswap.h macros are available. */
 #undef HAVE_BYTESWAP_H
 
@@ -391,6 +397,9 @@
 /* Define to indicate the ${LDAP_DESCRIP} library version */
 #undef HAVE_LDAP_VERSION
 
+/* Define if your system has the NetBSD Editline libraries. */
+#undef HAVE_LIBEDIT
+
 /* Define to 1 if you have the <libintl.h> header file. */
 #undef HAVE_LIBINTL_H
 
@@ -448,12 +457,9 @@
 /* Define to indicate the ${LTDL_DESCRIP} library version */
 #undef HAVE_LTDL_VERSION
 
-/* Define this to indicate the ${LUA_DESCRIP} library */
+/* Define if your system has the LUA libraries. */
 #undef HAVE_LUA
 
-/* Define to indicate the ${LUA_DESCRIP} library version */
-#undef HAVE_LUA_VERSION
-
 /* Define to 1 if you have the <malloc.h> header file. */
 #undef HAVE_MALLOC_H
 
@@ -1087,9 +1093,6 @@
 /* Define to the version of this package. */
 #undef PACKAGE_VERSION
 
-/* Define to 1 if the C compiler supports function prototypes. */
-#undef PROTOTYPES
-
 /* Define to necessary symbol if this constant uses a non-standard name on
    your system. */
 #undef PTHREAD_CREATE_JOINABLE
@@ -1106,11 +1109,6 @@
 /* Define to the type of arg 5 for `select'. */
 #undef SELECT_TYPE_ARG5
 
-/* Define to 1 if the `setvbuf' function takes the buffering type as its
-   second argument and the buffer pointer as the third, as on System V before
-   release 3. */
-#undef SETVBUF_REVERSED
-
 /* The size of `int', as computed by sizeof. */
 #undef SIZEOF_INT
 
@@ -1131,20 +1129,30 @@
 /* Define to 1 if your <sys/time.h> declares `struct tm'. */
 #undef TM_IN_SYS_TIME
 
-/* Define to 1 if on AIX 3.
-   System headers sometimes define this.
-   We just want to avoid a redefinition error message.  */
+/* Enable extensions on AIX 3, Interix.  */
 #ifndef _ALL_SOURCE
 # undef _ALL_SOURCE
 #endif
-
-/* Number of bits in a file offset, on hosts where this is settable. */
-#undef _FILE_OFFSET_BITS
-
 /* Enable GNU extensions on systems that have them.  */
 #ifndef _GNU_SOURCE
 # undef _GNU_SOURCE
 #endif
+/* Enable threading extensions on Solaris.  */
+#ifndef _POSIX_PTHREAD_SEMANTICS
+# undef _POSIX_PTHREAD_SEMANTICS
+#endif
+/* Enable extensions on HP NonStop.  */
+#ifndef _TANDEM_SOURCE
+# undef _TANDEM_SOURCE
+#endif
+/* Enable general extensions on Solaris.  */
+#ifndef __EXTENSIONS__
+# undef __EXTENSIONS__
+#endif
+
+
+/* Number of bits in a file offset, on hosts where this is settable. */
+#undef _FILE_OFFSET_BITS
 
 /* Define to 1 to make fseeko visible on some hosts (e.g. glibc 2.2). */
 #undef _LARGEFILE_SOURCE
@@ -1162,20 +1170,6 @@
 /* Define to 1 if you need to in order for `stat' and other things to work. */
 #undef _POSIX_SOURCE
 
-/* Enable extensions on Solaris.  */
-#ifndef __EXTENSIONS__
-# undef __EXTENSIONS__
-#endif
-#ifndef _POSIX_PTHREAD_SEMANTICS
-# undef _POSIX_PTHREAD_SEMANTICS
-#endif
-#ifndef _TANDEM_SOURCE
-# undef _TANDEM_SOURCE
-#endif
-
-/* Define like PROTOTYPES; this can be used by system headers. */
-#undef __PROTOTYPES
-
 /* Define to empty if `const' does not conform to ANSI C. */
 #undef const
 
-- 
1.6.1


0001-Modify-init-scripts-for-better-Fedora-compatibility.patch:

Index: 0001-Modify-init-scripts-for-better-Fedora-compatibility.patch
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/F-10/0001-Modify-init-scripts-for-better-Fedora-compatibility.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- 0001-Modify-init-scripts-for-better-Fedora-compatibility.patch	4 Jan 2009 14:48:26 -0000	1.5
+++ 0001-Modify-init-scripts-for-better-Fedora-compatibility.patch	4 Jan 2009 17:23:21 -0000	1.6
@@ -1,7 +1,7 @@
 From 0040bd97782e9db8c341af9ffe171749644e35f1 Mon Sep 17 00:00:00 2001
 From: Jeffrey C. Ollie <jeff at ocjtech.us>
 Date: Sun, 18 Nov 2007 21:47:59 -0600
-Subject: [PATCH 01/12] Modify init scripts for better Fedora compatibility.
+Subject: [PATCH 01/13] Modify init scripts for better Fedora compatibility.
 
 ---
  contrib/init.d/rc.redhat.asterisk |   61 +++++++++++++++++-------------------

0002-Modify-modules.conf-so-that-different-voicemail-modu.patch:

Index: 0002-Modify-modules.conf-so-that-different-voicemail-modu.patch
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/F-10/0002-Modify-modules.conf-so-that-different-voicemail-modu.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- 0002-Modify-modules.conf-so-that-different-voicemail-modu.patch	4 Jan 2009 14:48:26 -0000	1.5
+++ 0002-Modify-modules.conf-so-that-different-voicemail-modu.patch	4 Jan 2009 17:23:22 -0000	1.6
@@ -1,7 +1,7 @@
 From 42cd072beba88049783a7bedb029760a5952706e Mon Sep 17 00:00:00 2001
 From: Jeffrey C. Ollie <jcollie at pc21224.campus.dmacc.edu>
 Date: Thu, 8 Nov 2007 15:52:36 -0600
-Subject: [PATCH 02/12] Modify modules.conf so that different voicemail modules can be loaded.
+Subject: [PATCH 02/13] Modify modules.conf so that different voicemail modules can be loaded.
 
 ---
  configs/modules.conf.sample |   27 +++++++++++++++++++++++++++

0003-Allow-alternate-extensions-to-be-specified-in-users.patch:

Index: 0003-Allow-alternate-extensions-to-be-specified-in-users.patch
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/F-10/0003-Allow-alternate-extensions-to-be-specified-in-users.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- 0003-Allow-alternate-extensions-to-be-specified-in-users.patch	4 Jan 2009 14:48:26 -0000	1.4
+++ 0003-Allow-alternate-extensions-to-be-specified-in-users.patch	4 Jan 2009 17:23:22 -0000	1.5
@@ -1,7 +1,7 @@
 From a9d27e3b5f93ff8658fa06a0c454140f27244363 Mon Sep 17 00:00:00 2001
 From: Jeffrey C. Ollie <jcollie at pc21224.campus.dmacc.edu>
 Date: Thu, 8 Nov 2007 16:32:56 -0600
-Subject: [PATCH 03/12] Allow alternate extensions to be specified in users.conf
+Subject: [PATCH 03/13] Allow alternate extensions to be specified in users.conf
 
 ---
  pbx/pbx_config.c |   14 ++++++++++++++

0004-Minor-changes-to-reduce-packaging-changes-made-by-th.patch:

Index: 0004-Minor-changes-to-reduce-packaging-changes-made-by-th.patch
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/F-10/0004-Minor-changes-to-reduce-packaging-changes-made-by-th.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- 0004-Minor-changes-to-reduce-packaging-changes-made-by-th.patch	4 Jan 2009 14:48:26 -0000	1.4
+++ 0004-Minor-changes-to-reduce-packaging-changes-made-by-th.patch	4 Jan 2009 17:23:22 -0000	1.5
@@ -1,7 +1,7 @@
 From 42991016984f9e7930686527706ab0f36baa41d1 Mon Sep 17 00:00:00 2001
 From: tilghman <tilghman at 614ede4d-c843-0410-af14-a771ab80d22e>
 Date: Tue, 29 Jul 2008 23:00:45 +0000
-Subject: [PATCH 04/12] Minor changes to reduce packaging changes made by the Fedora maintainer.
+Subject: [PATCH 04/13] Minor changes to reduce packaging changes made by the Fedora maintainer.
  (closes issue #12974)
   Reported by: jcollie
   Patches:

0005-Add-chan_mobile-from-asterisk-addons.patch:

Index: 0005-Add-chan_mobile-from-asterisk-addons.patch
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/F-10/0005-Add-chan_mobile-from-asterisk-addons.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- 0005-Add-chan_mobile-from-asterisk-addons.patch	4 Jan 2009 14:48:26 -0000	1.4
+++ 0005-Add-chan_mobile-from-asterisk-addons.patch	4 Jan 2009 17:23:22 -0000	1.5
@@ -1,7 +1,7 @@
 From 8cc8002094fe880d374a727aa0be389ca68b0342 Mon Sep 17 00:00:00 2001
 From: Jeffrey C. Ollie <jeff at ocjtech.us>
 Date: Mon, 25 Feb 2008 09:23:28 -0600
-Subject: [PATCH 05/12] Add chan_mobile from asterisk-addons.
+Subject: [PATCH 05/13] Add chan_mobile from asterisk-addons.
 
 ---
  build_tools/menuselect-deps.in |    1 +

0006-Use-pkgconfig-to-check-for-Lua.patch:

Index: 0006-Use-pkgconfig-to-check-for-Lua.patch
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/F-10/0006-Use-pkgconfig-to-check-for-Lua.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- 0006-Use-pkgconfig-to-check-for-Lua.patch	4 Jan 2009 14:48:26 -0000	1.4
+++ 0006-Use-pkgconfig-to-check-for-Lua.patch	4 Jan 2009 17:23:22 -0000	1.5
@@ -1,7 +1,7 @@
 From d633181f75ea7dc879e8ac9d014cf1fc0fe364ef Mon Sep 17 00:00:00 2001
 From: Jeffrey C. Ollie <jeff at ocjtech.us>
 Date: Mon, 25 Feb 2008 13:14:23 -0600
-Subject: [PATCH 06/12] Use pkgconfig to check for Lua.
+Subject: [PATCH 06/13] Use pkgconfig to check for Lua.
 
 ---
  configure.ac |    9 ++++++++-

0007-Build-using-external-libedit.patch:

Index: 0007-Build-using-external-libedit.patch
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/F-10/0007-Build-using-external-libedit.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- 0007-Build-using-external-libedit.patch	4 Jan 2009 14:48:27 -0000	1.4
+++ 0007-Build-using-external-libedit.patch	4 Jan 2009 17:23:22 -0000	1.5
@@ -1,7 +1,7 @@
 From a50090dc47540b5c3df28c9846fe753f5476c4fc Mon Sep 17 00:00:00 2001
 From: Jeffrey C. Ollie <jeff at ocjtech.us>
 Date: Tue, 25 Mar 2008 00:50:27 -0500
-Subject: [PATCH 07/12] Build using external libedit.
+Subject: [PATCH 07/13] Build using external libedit.
 
 ---
  build_tools/menuselect-deps.in |    1 +

0008-Revert-changes-to-pbx_lua-from-rev-126363-that-cause.patch:

Index: 0008-Revert-changes-to-pbx_lua-from-rev-126363-that-cause.patch
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/F-10/0008-Revert-changes-to-pbx_lua-from-rev-126363-that-cause.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 0008-Revert-changes-to-pbx_lua-from-rev-126363-that-cause.patch	4 Jan 2009 14:48:27 -0000	1.1
+++ 0008-Revert-changes-to-pbx_lua-from-rev-126363-that-cause.patch	4 Jan 2009 17:23:22 -0000	1.2
@@ -1,7 +1,7 @@
 From a092080315b7bfa9b7d174b6114cb957ac1590d8 Mon Sep 17 00:00:00 2001
 From: Jeffrey C. Ollie <jeff at ocjtech.us>
 Date: Fri, 10 Oct 2008 11:54:10 -0500
-Subject: [PATCH 08/12] Revert changes to pbx_lua from rev 126363 that cause some problems.
+Subject: [PATCH 08/13] Revert changes to pbx_lua from rev 126363 that cause some problems.
 
 ---
  pbx/pbx_lua.c |    6 +++---

0009-change-configure.ac-to-look-for-pkg-config-gmime-2.4.patch:

Index: 0009-change-configure.ac-to-look-for-pkg-config-gmime-2.4.patch
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/F-10/0009-change-configure.ac-to-look-for-pkg-config-gmime-2.4.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 0009-change-configure.ac-to-look-for-pkg-config-gmime-2.4.patch	4 Jan 2009 14:48:27 -0000	1.1
+++ 0009-change-configure.ac-to-look-for-pkg-config-gmime-2.4.patch	4 Jan 2009 17:23:22 -0000	1.2
@@ -1,7 +1,7 @@
 From 7719af5a016f40f573c90aae17910f7f77b9b4e6 Mon Sep 17 00:00:00 2001
 From: Caolan McNamara <caolanm at redhat.com>
 Date: Sat, 3 Jan 2009 19:06:18 -0600
-Subject: [PATCH 09/12] change configure.ac to look for pkg-config gmime-2.4 instead of gmime-2.4 gmime-config
+Subject: [PATCH 09/13] change configure.ac to look for pkg-config gmime-2.4 instead of gmime-2.4 gmime-config
 
 ---
  configure.ac |   12 +++++++++++-

0010-fix-the-AST_PROG_SED-problem-that-makes-.-bootstrap.patch:

Index: 0010-fix-the-AST_PROG_SED-problem-that-makes-.-bootstrap.patch
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/F-10/0010-fix-the-AST_PROG_SED-problem-that-makes-.-bootstrap.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 0010-fix-the-AST_PROG_SED-problem-that-makes-.-bootstrap.patch	4 Jan 2009 14:48:27 -0000	1.1
+++ 0010-fix-the-AST_PROG_SED-problem-that-makes-.-bootstrap.patch	4 Jan 2009 17:23:22 -0000	1.2
@@ -1,7 +1,7 @@
 From 9a6c4641b2aa353c9076df9794d72fba5acdafb0 Mon Sep 17 00:00:00 2001
 From: Caolan McNamara <caolanm at redhat.com>
 Date: Sat, 3 Jan 2009 19:12:18 -0600
-Subject: [PATCH 10/12] fix the AST_PROG_SED problem that makes ./bootstrap.sh fail
+Subject: [PATCH 10/13] fix the AST_PROG_SED problem that makes ./bootstrap.sh fail
 
 Need to regenerate configure from configure.ac after patch one with
 ./bootsrap.sh, so fix the broken .m4 in the autoconfig dir. (alternatively

0011-Merged-revisions-160170-160172-via-svnmerge-from.patch:

Index: 0011-Merged-revisions-160170-160172-via-svnmerge-from.patch
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/F-10/0011-Merged-revisions-160170-160172-via-svnmerge-from.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 0011-Merged-revisions-160170-160172-via-svnmerge-from.patch	4 Jan 2009 14:48:27 -0000	1.1
+++ 0011-Merged-revisions-160170-160172-via-svnmerge-from.patch	4 Jan 2009 17:23:22 -0000	1.2
@@ -1,7 +1,7 @@
 From c38fa4eb3cf989c110a737058c46a916ebab19c8 Mon Sep 17 00:00:00 2001
 From: seanbright <seanbright at f38db490-d61c-443f-a65b-d21fe96a405b>
 Date: Mon, 1 Dec 2008 23:41:16 +0000
-Subject: [PATCH 11/12] Merged revisions 160170-160172 via svnmerge from
+Subject: [PATCH 11/13] Merged revisions 160170-160172 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/trunk
 
 ................


Index: asterisk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/F-10/asterisk.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- asterisk.spec	4 Jan 2009 14:48:27 -0000	1.38
+++ asterisk.spec	4 Jan 2009 17:23:24 -0000	1.39
@@ -3,7 +3,7 @@
 Summary: The Open Source PBX
 Name: asterisk
 Version: 1.6.0.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2
 Group: Applications/Internet
 URL: http://www.asterisk.org/
@@ -44,7 +44,8 @@
 Patch9:  0009-change-configure.ac-to-look-for-pkg-config-gmime-2.4.patch
 Patch10: 0010-fix-the-AST_PROG_SED-problem-that-makes-.-bootstrap.patch
 Patch11: 0011-Merged-revisions-160170-160172-via-svnmerge-from.patch
-Patch12: 0012-Update-autoconf.patch
+Patch12: 0012-Merged-revisions-162275-via-svnmerge-from.patch
+Patch13: 0013-Update-autoconf.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
 
@@ -421,6 +422,7 @@
 %patch10 -p1
 %patch11 -p1
 %patch12 -p1
+%patch13 -p1
 
 cp %{SOURCE2} menuselect.makedeps
 cp %{SOURCE3} menuselect.makeopts
@@ -1030,6 +1032,9 @@
 %{_libdir}/asterisk/modules/app_voicemail_plain.so
 
 %changelog
+* Sun Jan  4 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6.0.2-2
+- Add patch to fix compilation on PPC
+
 * Sun Jan  4 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6.0.2-1
 - Update to 1.6.0.2
 


--- 0012-Update-autoconf.patch DELETED ---



From frankb at fedoraproject.org  Sun Jan  4 17:43:51 2009
From: frankb at fedoraproject.org (=?utf-8?q?Frank_B=C3=BCttner?=)
Date: Sun,  4 Jan 2009 17:43:51 +0000 (UTC)
Subject: rpms/qwt/F-10 .cvsignore, 1.2, 1.3 qwt-path.patch, 1.1, 1.2 qwt.spec,
	1.2, 1.3 sources, 1.2, 1.3
Message-ID: <20090104174351.60B5270130@cvs1.fedora.phx.redhat.com>

Author: frankb

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

Modified Files:
	.cvsignore qwt-path.patch qwt.spec sources 
Log Message:
 update to 5.1.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qwt/F-10/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	29 Sep 2007 19:14:56 -0000	1.2
+++ .cvsignore	4 Jan 2009 17:43:16 -0000	1.3
@@ -1 +1 @@
-qwt-5.0.2.tar.bz2
+qwt-5.1.1.tar.bz2

qwt-path.patch:

Index: qwt-path.patch
===================================================================
RCS file: /cvs/pkgs/rpms/qwt/F-10/qwt-path.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- qwt-path.patch	29 Sep 2007 19:14:56 -0000	1.1
+++ qwt-path.patch	4 Jan 2009 17:43:16 -0000	1.2
@@ -1,7 +1,7 @@
-diff -Nur qwt-5.0.1.org/designer/designer.pro qwt-5.0.1/designer/designer.pro
---- qwt-5.0.1.org/designer/designer.pro	2007-05-15 15:23:47.000000000 +0200
-+++ qwt-5.0.1/designer/designer.pro	2007-05-15 17:29:13.000000000 +0200
-@@ -92,7 +92,7 @@
+diff -Nur qwt-5.1.1.org/designer/designer.pro qwt-5.1.1/designer/designer.pro
+--- qwt-5.1.1.org/designer/designer.pro	2008-05-24 18:47:36.000000000 +0200
++++ qwt-5.1.1/designer/designer.pro	2009-01-04 17:54:33.000000000 +0100
+@@ -123,7 +123,7 @@
          RESOURCES += \
              qwt_designer_plugin.qrc
  
@@ -9,21 +9,20 @@
 +        target.path = QTDESIGNERPATH
          INSTALLS += target
      }
+ }
+diff -Nur qwt-5.1.1.org/qwtconfig.pri qwt-5.1.1/qwtconfig.pri
+--- qwt-5.1.1.org/qwtconfig.pri	2008-05-24 18:47:36.000000000 +0200
++++ qwt-5.1.1/qwtconfig.pri	2009-01-04 17:55:07.000000000 +0100
+@@ -7,17 +7,9 @@
+ VER_PAT      = 1
+ VERSION      = $$VER_MAJ.$$VER_MIN.$$VER_PAT
  
-diff -Nur qwt-5.0.1.org/qwtconfig.pri qwt-5.0.1/qwtconfig.pri
---- qwt-5.0.1.org/qwtconfig.pri	2007-05-15 12:07:33.000000000 +0200
-+++ qwt-5.0.1/qwtconfig.pri	2007-05-15 15:52:39.000000000 +0200
-@@ -1,18 +1,6 @@
--######################################################################
--# Install paths
--######################################################################
--
 -unix {
--    INSTALLBASE    = /usr/local/qwt-5.0.2
+-    INSTALLBASE    = /usr/local/qwt-5.1.1
 -}
 -
 -win32 {
--    INSTALLBASE    = C:/Qwt-5.0.2
+-    INSTALLBASE    = C:/Qwt-5.1.1
 -}
 -
 -target.path    = $$INSTALLBASE/lib
@@ -35,7 +34,7 @@
  
  ######################################################################
  # qmake internal options
-@@ -58,7 +46,7 @@
+@@ -97,7 +89,7 @@
  # QwtSVGItem.
  ######################################################################
  


Index: qwt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qwt/F-10/qwt.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- qwt.spec	19 Feb 2008 03:21:27 -0000	1.2
+++ qwt.spec	4 Jan 2009 17:43:16 -0000	1.3
@@ -1,7 +1,7 @@
 Name:		qwt
 Summary:	Qt Widgets for Technical Applications
-Version:	5.0.2
-Release:	6%{?dist}
+Version:	5.1.1
+Release:	2%{?dist}
 BuildRequires:	qt4-devel
 URL:		http://qwt.sourceforge.net
 License:	LGPLv2 with exceptions
@@ -17,7 +17,7 @@
 %endif
 
 %package devel
-Summary:        Development and doc files for {%name}
+Summary:        Development and doc files for %{name}
 Requires:       %{name} = %{version}-%{release} qt4-devel
 Group:          Development/Libraries
 
@@ -68,8 +68,8 @@
 %doc COPYING
 %doc README
 %{_libdir}/libqwt.so.5
-%{_libdir}/libqwt.so.5.0
-%{_libdir}/libqwt.so.5.0.2
+%{_libdir}/libqwt.so.5.1
+%{_libdir}/libqwt.so.5.1.1
 
 %files devel
 %defattr(-,root,root)
@@ -79,6 +79,12 @@
 %{_libdir}/qt4/plugins/designer/libqwt_designer_plugin.so
 
 %changelog
+* Sun Jan 04 2009 Frank B??ttner <frank-buettner at gmx.net> - 5.1.1-2
+ - modify path patch
+
+* Sun Jan 04 2009 Frank B??ttner <frank-buettner at gmx.net> - 5.1.1-1
+ -update to 5.1.1
+
 * Mon Feb 18 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 5.0.2-6
 - Autorebuild for GCC 4.3
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qwt/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	29 Sep 2007 19:14:56 -0000	1.2
+++ sources	4 Jan 2009 17:43:16 -0000	1.3
@@ -1 +1 @@
-53adbb313c478dd4aae4f1c864a2037e  qwt-5.0.2.tar.bz2
+218cef1a39ebda6cfa440a0727464275  qwt-5.1.1.tar.bz2



From frankb at fedoraproject.org  Sun Jan  4 17:55:58 2009
From: frankb at fedoraproject.org (=?utf-8?q?Frank_B=C3=BCttner?=)
Date: Sun,  4 Jan 2009 17:55:58 +0000 (UTC)
Subject: rpms/qwt/F-9 .cvsignore, 1.2, 1.3 qwt-path.patch, 1.1, 1.2 qwt.spec,
	1.2, 1.3 sources, 1.2, 1.3
Message-ID: <20090104175558.B5A977013F@cvs1.fedora.phx.redhat.com>

Author: frankb

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

Modified Files:
	.cvsignore qwt-path.patch qwt.spec sources 
Log Message:
- update to 5.1.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qwt/F-9/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	29 Sep 2007 19:14:56 -0000	1.2
+++ .cvsignore	4 Jan 2009 17:55:27 -0000	1.3
@@ -1 +1 @@
-qwt-5.0.2.tar.bz2
+qwt-5.1.1.tar.bz2

qwt-path.patch:

Index: qwt-path.patch
===================================================================
RCS file: /cvs/pkgs/rpms/qwt/F-9/qwt-path.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- qwt-path.patch	29 Sep 2007 19:14:56 -0000	1.1
+++ qwt-path.patch	4 Jan 2009 17:55:27 -0000	1.2
@@ -1,7 +1,7 @@
-diff -Nur qwt-5.0.1.org/designer/designer.pro qwt-5.0.1/designer/designer.pro
---- qwt-5.0.1.org/designer/designer.pro	2007-05-15 15:23:47.000000000 +0200
-+++ qwt-5.0.1/designer/designer.pro	2007-05-15 17:29:13.000000000 +0200
-@@ -92,7 +92,7 @@
+diff -Nur qwt-5.1.1.org/designer/designer.pro qwt-5.1.1/designer/designer.pro
+--- qwt-5.1.1.org/designer/designer.pro	2008-05-24 18:47:36.000000000 +0200
++++ qwt-5.1.1/designer/designer.pro	2009-01-04 17:54:33.000000000 +0100
+@@ -123,7 +123,7 @@
          RESOURCES += \
              qwt_designer_plugin.qrc
  
@@ -9,21 +9,20 @@
 +        target.path = QTDESIGNERPATH
          INSTALLS += target
      }
+ }
+diff -Nur qwt-5.1.1.org/qwtconfig.pri qwt-5.1.1/qwtconfig.pri
+--- qwt-5.1.1.org/qwtconfig.pri	2008-05-24 18:47:36.000000000 +0200
++++ qwt-5.1.1/qwtconfig.pri	2009-01-04 17:55:07.000000000 +0100
+@@ -7,17 +7,9 @@
+ VER_PAT      = 1
+ VERSION      = $$VER_MAJ.$$VER_MIN.$$VER_PAT
  
-diff -Nur qwt-5.0.1.org/qwtconfig.pri qwt-5.0.1/qwtconfig.pri
---- qwt-5.0.1.org/qwtconfig.pri	2007-05-15 12:07:33.000000000 +0200
-+++ qwt-5.0.1/qwtconfig.pri	2007-05-15 15:52:39.000000000 +0200
-@@ -1,18 +1,6 @@
--######################################################################
--# Install paths
--######################################################################
--
 -unix {
--    INSTALLBASE    = /usr/local/qwt-5.0.2
+-    INSTALLBASE    = /usr/local/qwt-5.1.1
 -}
 -
 -win32 {
--    INSTALLBASE    = C:/Qwt-5.0.2
+-    INSTALLBASE    = C:/Qwt-5.1.1
 -}
 -
 -target.path    = $$INSTALLBASE/lib
@@ -35,7 +34,7 @@
  
  ######################################################################
  # qmake internal options
-@@ -58,7 +46,7 @@
+@@ -97,7 +89,7 @@
  # QwtSVGItem.
  ######################################################################
  


Index: qwt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qwt/F-9/qwt.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- qwt.spec	19 Feb 2008 03:21:27 -0000	1.2
+++ qwt.spec	4 Jan 2009 17:55:28 -0000	1.3
@@ -1,7 +1,7 @@
 Name:		qwt
 Summary:	Qt Widgets for Technical Applications
-Version:	5.0.2
-Release:	6%{?dist}
+Version:	5.1.1
+Release:	2%{?dist}
 BuildRequires:	qt4-devel
 URL:		http://qwt.sourceforge.net
 License:	LGPLv2 with exceptions
@@ -17,7 +17,7 @@
 %endif
 
 %package devel
-Summary:        Development and doc files for {%name}
+Summary:        Development and doc files for %{name}
 Requires:       %{name} = %{version}-%{release} qt4-devel
 Group:          Development/Libraries
 
@@ -68,8 +68,8 @@
 %doc COPYING
 %doc README
 %{_libdir}/libqwt.so.5
-%{_libdir}/libqwt.so.5.0
-%{_libdir}/libqwt.so.5.0.2
+%{_libdir}/libqwt.so.5.1
+%{_libdir}/libqwt.so.5.1.1
 
 %files devel
 %defattr(-,root,root)
@@ -79,6 +79,12 @@
 %{_libdir}/qt4/plugins/designer/libqwt_designer_plugin.so
 
 %changelog
+* Sun Jan 04 2009 Frank B??ttner <frank-buettner at gmx.net> - 5.1.1-2
+ - modify path patch
+
+* Sun Jan 04 2009 Frank B??ttner <frank-buettner at gmx.net> - 5.1.1-1
+ -update to 5.1.1
+
 * Mon Feb 18 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 5.0.2-6
 - Autorebuild for GCC 4.3
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qwt/F-9/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	29 Sep 2007 19:14:56 -0000	1.2
+++ sources	4 Jan 2009 17:55:28 -0000	1.3
@@ -1 +1 @@
-53adbb313c478dd4aae4f1c864a2037e  qwt-5.0.2.tar.bz2
+218cef1a39ebda6cfa440a0727464275  qwt-5.1.1.tar.bz2



From eponyme at fedoraproject.org  Sun Jan  4 18:03:51 2009
From: eponyme at fedoraproject.org (Nicoleau Fabien)
Date: Sun,  4 Jan 2009 18:03:51 +0000 (UTC)
Subject: rpms/fotoxx/devel .cvsignore, 1.11, 1.12 fotoxx.spec, 1.10,
	1.11 sources, 1.11, 1.12
Message-ID: <20090104180351.10F5D7013F@cvs1.fedora.phx.redhat.com>

Author: eponyme

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

Modified Files:
	.cvsignore fotoxx.spec sources 
Log Message:
Update to 5.8


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fotoxx/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	1 Dec 2008 19:57:36 -0000	1.11
+++ .cvsignore	4 Jan 2009 18:03:20 -0000	1.12
@@ -1 +1 @@
-fotoxx-5.7.tar.gz
+fotoxx-5.8.tar.gz


Index: fotoxx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fotoxx/devel/fotoxx.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- fotoxx.spec	1 Dec 2008 19:57:36 -0000	1.10
+++ fotoxx.spec	4 Jan 2009 18:03:20 -0000	1.11
@@ -1,5 +1,5 @@
 Name:           fotoxx
-Version:        5.7
+Version:        5.8
 Release:        1%{?dist}
 Summary:        Photo editor 
 
@@ -50,11 +50,14 @@
 %doc doc/*
 %dir %{_datadir}/%{name}
 %{_bindir}/%{name}
-%{_datadir}/%{name}/*
+%{_datadir}/%{name}/icons/
+%{_datadir}/%{name}/locales/
 %{_datadir}/applications/%{name}.desktop
 %{_datadir}/pixmaps/%{name}.png
 
 %changelog
+* Sun Jan  4 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> - 5.8-1
+- Rebuild for 5.8
 * Mon Dec  1 2008 Nicoleau Fabien <nicoleau.fabien at gmail.com> - 5.7-1
 - Rebuild for 5.7
 * Sun Nov 16 2008 Nicoleau Fabien <nicoleau.fabien at gmail.com> - 5.6-1


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fotoxx/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	1 Dec 2008 19:57:36 -0000	1.11
+++ sources	4 Jan 2009 18:03:20 -0000	1.12
@@ -1 +1 @@
-9a9167e8c6b8404769e1218f1e7e9e4b  fotoxx-5.7.tar.gz
+7f86e79ab79e8bf830e71930f6941b01  fotoxx-5.8.tar.gz



From eponyme at fedoraproject.org  Sun Jan  4 18:07:46 2009
From: eponyme at fedoraproject.org (Nicoleau Fabien)
Date: Sun,  4 Jan 2009 18:07:46 +0000 (UTC)
Subject: rpms/fotoxx/F-10 .cvsignore, 1.11, 1.12 fotoxx.spec, 1.10,
	1.11 sources, 1.11, 1.12
Message-ID: <20090104180746.569EE7013F@cvs1.fedora.phx.redhat.com>

Author: eponyme

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

Modified Files:
	.cvsignore fotoxx.spec sources 
Log Message:
Update to 5.8


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fotoxx/F-10/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	1 Dec 2008 20:00:37 -0000	1.11
+++ .cvsignore	4 Jan 2009 18:07:15 -0000	1.12
@@ -1 +1 @@
-fotoxx-5.7.tar.gz
+fotoxx-5.8.tar.gz


Index: fotoxx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fotoxx/F-10/fotoxx.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- fotoxx.spec	1 Dec 2008 20:00:37 -0000	1.10
+++ fotoxx.spec	4 Jan 2009 18:07:15 -0000	1.11
@@ -1,5 +1,5 @@
 Name:           fotoxx
-Version:        5.7
+Version:        5.8
 Release:        1%{?dist}
 Summary:        Photo editor 
 
@@ -50,11 +50,14 @@
 %doc doc/*
 %dir %{_datadir}/%{name}
 %{_bindir}/%{name}
-%{_datadir}/%{name}/*
+%{_datadir}/%{name}/icons/
+%{_datadir}/%{name}/locales/
 %{_datadir}/applications/%{name}.desktop
 %{_datadir}/pixmaps/%{name}.png
 
 %changelog
+* Sun Jan  4 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> - 5.8-1
+- Rebuild for 5.8
 * Mon Dec  1 2008 Nicoleau Fabien <nicoleau.fabien at gmail.com> - 5.7-1
 - Rebuild for 5.7
 * Sun Nov 16 2008 Nicoleau Fabien <nicoleau.fabien at gmail.com> - 5.6-1


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fotoxx/F-10/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	1 Dec 2008 20:00:37 -0000	1.11
+++ sources	4 Jan 2009 18:07:15 -0000	1.12
@@ -1 +1 @@
-9a9167e8c6b8404769e1218f1e7e9e4b  fotoxx-5.7.tar.gz
+7f86e79ab79e8bf830e71930f6941b01  fotoxx-5.8.tar.gz



From frankb at fedoraproject.org  Sun Jan  4 18:08:06 2009
From: frankb at fedoraproject.org (=?utf-8?q?Frank_B=C3=BCttner?=)
Date: Sun,  4 Jan 2009 18:08:06 +0000 (UTC)
Subject: rpms/qwt/F-8 .cvsignore, 1.2, 1.3 qwt-path.patch, 1.1, 1.2 qwt.spec,
	1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20090104180806.54BDC7013F@cvs1.fedora.phx.redhat.com>

Author: frankb

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

Modified Files:
	.cvsignore qwt-path.patch qwt.spec sources 
Log Message:
update to 5.1.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qwt/F-8/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	29 Sep 2007 19:14:56 -0000	1.2
+++ .cvsignore	4 Jan 2009 18:07:35 -0000	1.3
@@ -1 +1 @@
-qwt-5.0.2.tar.bz2
+qwt-5.1.1.tar.bz2

qwt-path.patch:

Index: qwt-path.patch
===================================================================
RCS file: /cvs/pkgs/rpms/qwt/F-8/qwt-path.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- qwt-path.patch	29 Sep 2007 19:14:56 -0000	1.1
+++ qwt-path.patch	4 Jan 2009 18:07:35 -0000	1.2
@@ -1,7 +1,7 @@
-diff -Nur qwt-5.0.1.org/designer/designer.pro qwt-5.0.1/designer/designer.pro
---- qwt-5.0.1.org/designer/designer.pro	2007-05-15 15:23:47.000000000 +0200
-+++ qwt-5.0.1/designer/designer.pro	2007-05-15 17:29:13.000000000 +0200
-@@ -92,7 +92,7 @@
+diff -Nur qwt-5.1.1.org/designer/designer.pro qwt-5.1.1/designer/designer.pro
+--- qwt-5.1.1.org/designer/designer.pro	2008-05-24 18:47:36.000000000 +0200
++++ qwt-5.1.1/designer/designer.pro	2009-01-04 17:54:33.000000000 +0100
+@@ -123,7 +123,7 @@
          RESOURCES += \
              qwt_designer_plugin.qrc
  
@@ -9,21 +9,20 @@
 +        target.path = QTDESIGNERPATH
          INSTALLS += target
      }
+ }
+diff -Nur qwt-5.1.1.org/qwtconfig.pri qwt-5.1.1/qwtconfig.pri
+--- qwt-5.1.1.org/qwtconfig.pri	2008-05-24 18:47:36.000000000 +0200
++++ qwt-5.1.1/qwtconfig.pri	2009-01-04 17:55:07.000000000 +0100
+@@ -7,17 +7,9 @@
+ VER_PAT      = 1
+ VERSION      = $$VER_MAJ.$$VER_MIN.$$VER_PAT
  
-diff -Nur qwt-5.0.1.org/qwtconfig.pri qwt-5.0.1/qwtconfig.pri
---- qwt-5.0.1.org/qwtconfig.pri	2007-05-15 12:07:33.000000000 +0200
-+++ qwt-5.0.1/qwtconfig.pri	2007-05-15 15:52:39.000000000 +0200
-@@ -1,18 +1,6 @@
--######################################################################
--# Install paths
--######################################################################
--
 -unix {
--    INSTALLBASE    = /usr/local/qwt-5.0.2
+-    INSTALLBASE    = /usr/local/qwt-5.1.1
 -}
 -
 -win32 {
--    INSTALLBASE    = C:/Qwt-5.0.2
+-    INSTALLBASE    = C:/Qwt-5.1.1
 -}
 -
 -target.path    = $$INSTALLBASE/lib
@@ -35,7 +34,7 @@
  
  ######################################################################
  # qmake internal options
-@@ -58,7 +46,7 @@
+@@ -97,7 +89,7 @@
  # QwtSVGItem.
  ######################################################################
  


Index: qwt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qwt/F-8/qwt.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- qwt.spec	29 Sep 2007 19:14:56 -0000	1.1
+++ qwt.spec	4 Jan 2009 18:07:35 -0000	1.2
@@ -1,7 +1,7 @@
 Name:		qwt
 Summary:	Qt Widgets for Technical Applications
-Version:	5.0.2
-Release:	5%{?dist}
+Version:	5.1.1
+Release:	2%{?dist}
 BuildRequires:	qt4-devel
 URL:		http://qwt.sourceforge.net
 License:	LGPLv2 with exceptions
@@ -17,7 +17,7 @@
 %endif
 
 %package devel
-Summary:        Development and doc files for {%name}
+Summary:        Development and doc files for %{name}
 Requires:       %{name} = %{version}-%{release} qt4-devel
 Group:          Development/Libraries
 
@@ -68,8 +68,8 @@
 %doc COPYING
 %doc README
 %{_libdir}/libqwt.so.5
-%{_libdir}/libqwt.so.5.0
-%{_libdir}/libqwt.so.5.0.2
+%{_libdir}/libqwt.so.5.1
+%{_libdir}/libqwt.so.5.1.1
 
 %files devel
 %defattr(-,root,root)
@@ -79,6 +79,15 @@
 %{_libdir}/qt4/plugins/designer/libqwt_designer_plugin.so
 
 %changelog
+* Sun Jan 04 2009 Frank B??ttner <frank-buettner at gmx.net> - 5.1.1-2
+ - modify path patch
+
+* Sun Jan 04 2009 Frank B??ttner <frank-buettner at gmx.net> - 5.1.1-1
+ -update to 5.1.1
+
+* Mon Feb 18 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 5.0.2-6
+- Autorebuild for GCC 4.3
+
 * Sat Sep 29 2007 Frank B??ttner <frank-buettner at gmx.net> - 5.0.2-5
  - add EPEL support
 * Sat Sep 29 2007 Frank B??ttner <frank-buettner at gmx.net> - 5.0.2-4


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qwt/F-8/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	29 Sep 2007 19:14:56 -0000	1.2
+++ sources	4 Jan 2009 18:07:35 -0000	1.3
@@ -1 +1 @@
-53adbb313c478dd4aae4f1c864a2037e  qwt-5.0.2.tar.bz2
+218cef1a39ebda6cfa440a0727464275  qwt-5.1.1.tar.bz2



From cwickert at fedoraproject.org  Sun Jan  4 18:09:44 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Sun,  4 Jan 2009 18:09:44 +0000 (UTC)
Subject: rpms/gnome-applet-timer/F-10 timer-applet-2.0.1-libnotify.patch,
	NONE, 1.1 gnome-applet-timer.spec, 1.19, 1.20
Message-ID: <20090104180944.E08957013F@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/gnome-applet-timer/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13687/F-10

Modified Files:
	gnome-applet-timer.spec 
Added Files:
	timer-applet-2.0.1-libnotify.patch 
Log Message:
* Sun Jan 04 2009 Christoph Wickert <cwickert at fedoraproject.org> - 2.0.2-7
- Apply libnotify patch, thanks to Michael Schwendt and Paul Frields (#471465)


timer-applet-2.0.1-libnotify.patch:

--- NEW FILE timer-applet-2.0.1-libnotify.patch ---
--- timer-applet-2.0.1.orig/src/timerapplet/ui/Notifier.py	2007-04-28 03:31:03.000000000 +0200
+++ timer-applet-2.0.1/src/timerapplet/ui/Notifier.py	2009-01-04 18:53:32.000000000 +0100
@@ -1,5 +1,7 @@
 import gobject
 import pynotify
+import glib
+except glib.GError
 
 class Notifier(object):
     _NOTIFICATION_REDISPLAY_INTERVAL_SECONDS = 60


Index: gnome-applet-timer.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-applet-timer/F-10/gnome-applet-timer.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- gnome-applet-timer.spec	28 Aug 2008 22:31:03 -0000	1.19
+++ gnome-applet-timer.spec	4 Jan 2009 18:09:13 -0000	1.20
@@ -4,13 +4,14 @@
 
 Name:           gnome-applet-timer
 Version:        2.0.1
-Release:        5%{?dist}
+Release:        7%{?dist}
 Summary:        A countdown timer applet for the GNOME panel
 
 Group:          User Interface/Desktops
 License:        GPLv2+
 URL:            http://timerapplet.sourceforge.net/
 Source0:        http://download.sourceforge.net/timerapplet/timer-applet-%{version}.tar.gz
+Patch0:         timer-applet-2.0.1-libnotify.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  python-devel >= 2.4
@@ -41,6 +42,7 @@
 
 %prep
 %setup -q -n timer-applet-%{version}
+%patch0 -p1 -b .plusing
 
 %build
 %if 0%{?fedora} > 6
@@ -98,6 +100,12 @@
 %{python_sitelib}/timerapplet/
 
 %changelog
+* Sun Jan 04 2009 Christoph Wickert <cwickert at fedoraproject.org> - 2.0.2-7
+- Apply libnotify patch, thanks to Michael Schwendt and Paul Frields (#471465)
+
+* Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 2.0.1-6
+- Rebuild for Python 2.6
+
 * Fri Aug 29 2008 Michael Schwendt <mschwendt at fedoraproject.org> 2.0.1-5
 - include %%_libdir/timer-applet directory
 
@@ -107,29 +115,29 @@
 * Mon Jul 07 2008 Adam Jackson <ajax at redhat.com> 2.0.1-3
 - %%fedora is an int, not a string.
 
-* Fri Jun 20 2008 Christoph Wickert <fedora christoph-wickert de> - 2.0.2-1
+* Fri Jun 20 2008 Christoph Wickert <cwickert at fedoraproject.org> - 2.0.2-1
 - Disable broken check macro (#449717) temporarily to fix #449485
 
-* Thu Feb 21 2008 Christoph Wickert <fedora christoph-wickert de> - 2.0.1-1
+* Thu Feb 21 2008 Christoph Wickert <cwickert at fedoraproject.org> - 2.0.1-1
 - Update to 2.0.1.
 
 * Mon Feb 18 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1.3.3-3
 - Autorebuild for GCC 4.3
 
-* Tue Aug 28 2007 Christoph Wickert <fedora christoph-wickert de> - 1.3.3-2
+* Tue Aug 28 2007 Christoph Wickert <cwickert at fedoraproject.org> - 1.3.3-2
 - Rebuild for BuildID feature
 - Update license tag
 
-* Sun Apr 15 2007 Christoph Wickert <fedora christoph-wickert de> - 1.3.3-1
+* Sun Apr 15 2007 Christoph Wickert <cwickert at fedoraproject.org> - 1.3.3-1
 - Update to 1.3.3.
 
-* Sun Dec 17 2006 Christoph Wickert <fedora christoph-wickert de> - 1.3.2-1
+* Sun Dec 17 2006 Christoph Wickert <cwickert at fedoraproject.org> - 1.3.2-1
 - Update to 1.3.2, includes fix for the icon in the notification bubble.
 
-* Tue Oct 31 2006 Christoph Wickert <fedora christoph-wickert de> - 1.3.1-1
+* Tue Oct 31 2006 Christoph Wickert <cwickert at fedoraproject.org> - 1.3.1-1
 - Update to 1.3.1 with libnotify support (#203234).
 
-* Fri Sep 15 2006 Christoph Wickert <fedora christoph-wickert de> - 1.2-4
+* Fri Sep 15 2006 Christoph Wickert <cwickert at fedoraproject.org> - 1.2-4
 - Mass rebuild for Fedora Core 6.
 - BuildRequire perl(XML::Parser).
 



From cwickert at fedoraproject.org  Sun Jan  4 18:09:45 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Sun,  4 Jan 2009 18:09:45 +0000 (UTC)
Subject: rpms/gnome-applet-timer/devel timer-applet-2.0.1-libnotify.patch,
	NONE, 1.1 gnome-applet-timer.spec, 1.20, 1.21
Message-ID: <20090104180945.8C2917013F@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/gnome-applet-timer/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13687/devel

Modified Files:
	gnome-applet-timer.spec 
Added Files:
	timer-applet-2.0.1-libnotify.patch 
Log Message:
* Sun Jan 04 2009 Christoph Wickert <cwickert at fedoraproject.org> - 2.0.2-7
- Apply libnotify patch, thanks to Michael Schwendt and Paul Frields (#471465)


timer-applet-2.0.1-libnotify.patch:

--- NEW FILE timer-applet-2.0.1-libnotify.patch ---
--- timer-applet-2.0.1.orig/src/timerapplet/ui/Notifier.py	2007-04-28 03:31:03.000000000 +0200
+++ timer-applet-2.0.1/src/timerapplet/ui/Notifier.py	2009-01-04 18:53:32.000000000 +0100
@@ -1,5 +1,7 @@
 import gobject
 import pynotify
+import glib
+except glib.GError
 
 class Notifier(object):
     _NOTIFICATION_REDISPLAY_INTERVAL_SECONDS = 60


Index: gnome-applet-timer.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-applet-timer/devel/gnome-applet-timer.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- gnome-applet-timer.spec	29 Nov 2008 16:37:05 -0000	1.20
+++ gnome-applet-timer.spec	4 Jan 2009 18:09:14 -0000	1.21
@@ -4,13 +4,14 @@
 
 Name:           gnome-applet-timer
 Version:        2.0.1
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        A countdown timer applet for the GNOME panel
 
 Group:          User Interface/Desktops
 License:        GPLv2+
 URL:            http://timerapplet.sourceforge.net/
 Source0:        http://download.sourceforge.net/timerapplet/timer-applet-%{version}.tar.gz
+Patch0:         timer-applet-2.0.1-libnotify.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  python-devel >= 2.4
@@ -41,6 +42,7 @@
 
 %prep
 %setup -q -n timer-applet-%{version}
+%patch0 -p1 -b .plusing
 
 %build
 %if 0%{?fedora} > 6
@@ -98,6 +100,9 @@
 %{python_sitelib}/timerapplet/
 
 %changelog
+* Sun Jan 04 2009 Christoph Wickert <cwickert at fedoraproject.org> - 2.0.2-7
+- Apply libnotify patch, thanks to Michael Schwendt and Paul Frields (#471465)
+
 * Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 2.0.1-6
 - Rebuild for Python 2.6
 
@@ -110,29 +115,29 @@
 * Mon Jul 07 2008 Adam Jackson <ajax at redhat.com> 2.0.1-3
 - %%fedora is an int, not a string.
 
-* Fri Jun 20 2008 Christoph Wickert <fedora christoph-wickert de> - 2.0.2-1
+* Fri Jun 20 2008 Christoph Wickert <cwickert at fedoraproject.org> - 2.0.2-1
 - Disable broken check macro (#449717) temporarily to fix #449485
 
-* Thu Feb 21 2008 Christoph Wickert <fedora christoph-wickert de> - 2.0.1-1
+* Thu Feb 21 2008 Christoph Wickert <cwickert at fedoraproject.org> - 2.0.1-1
 - Update to 2.0.1.
 
 * Mon Feb 18 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1.3.3-3
 - Autorebuild for GCC 4.3
 
-* Tue Aug 28 2007 Christoph Wickert <fedora christoph-wickert de> - 1.3.3-2
+* Tue Aug 28 2007 Christoph Wickert <cwickert at fedoraproject.org> - 1.3.3-2
 - Rebuild for BuildID feature
 - Update license tag
 
-* Sun Apr 15 2007 Christoph Wickert <fedora christoph-wickert de> - 1.3.3-1
+* Sun Apr 15 2007 Christoph Wickert <cwickert at fedoraproject.org> - 1.3.3-1
 - Update to 1.3.3.
 
-* Sun Dec 17 2006 Christoph Wickert <fedora christoph-wickert de> - 1.3.2-1
+* Sun Dec 17 2006 Christoph Wickert <cwickert at fedoraproject.org> - 1.3.2-1
 - Update to 1.3.2, includes fix for the icon in the notification bubble.
 
-* Tue Oct 31 2006 Christoph Wickert <fedora christoph-wickert de> - 1.3.1-1
+* Tue Oct 31 2006 Christoph Wickert <cwickert at fedoraproject.org> - 1.3.1-1
 - Update to 1.3.1 with libnotify support (#203234).
 
-* Fri Sep 15 2006 Christoph Wickert <fedora christoph-wickert de> - 1.2-4
+* Fri Sep 15 2006 Christoph Wickert <cwickert at fedoraproject.org> - 1.2-4
 - Mass rebuild for Fedora Core 6.
 - BuildRequire perl(XML::Parser).
 



From eponyme at fedoraproject.org  Sun Jan  4 18:18:33 2009
From: eponyme at fedoraproject.org (Nicoleau Fabien)
Date: Sun,  4 Jan 2009 18:18:33 +0000 (UTC)
Subject: rpms/printoxx/devel .cvsignore, 1.3, 1.4 printoxx.spec, 1.3,
	1.4 sources, 1.3, 1.4
Message-ID: <20090104181833.A6DEC70140@cvs1.fedora.phx.redhat.com>

Author: eponyme

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

Modified Files:
	.cvsignore printoxx.spec sources 
Log Message:
Update to 1.8


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/printoxx/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	1 Dec 2008 19:48:52 -0000	1.3
+++ .cvsignore	4 Jan 2009 18:18:03 -0000	1.4
@@ -1 +1 @@
-printoxx-1.7.tar.gz
+printoxx-1.8.tar.gz


Index: printoxx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/printoxx/devel/printoxx.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- printoxx.spec	4 Dec 2008 17:16:51 -0000	1.3
+++ printoxx.spec	4 Jan 2009 18:18:03 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           printoxx
-Version:        1.7
-Release:        2%{?dist}
+Version:        1.8
+Release:        1%{?dist}
 Summary:        Print image files
 
 Group:          Applications/Multimedia
@@ -52,16 +52,17 @@
 %doc doc/*
 %dir %{_datadir}/%{name}
 %{_bindir}/%{name}
-%{_datadir}/%{name}/*.xtext
-%{_datadir}/%{name}/icons
+%{_datadir}/%{name}/%{name}.xtext
+%{_datadir}/%{name}/icons/
+%{_datadir}/%{name}/locales/
 %{_datadir}/applications/%{name}.desktop
 %{_datadir}/pixmaps/%{name}.png
-%{_datadir}/%{name}/locales/
 
 %changelog
+* Sun Jan  4 2009  Nicoleau Fabien <nicoleau.fabien at gmail.com> - 1.8-1
+- Rebuild for 1.8
 * Thu Dec  4 2008 Michael Schwendt <mschwendt at fedoraproject.org> - 1.7-2
 - Include unowned /usr/share/printoxx/locales directory.
-
 * Mon Dec  1 2008 Nicoleau Fabien <nicoleau.fabien at gmail.com> - 1.7-1
 - Rebuild for 1.7
 * Mon Oct 13 2008 Nicoleau Fabien <nicoleau.fabien at gmail.com> - 1.6-4


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/printoxx/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	1 Dec 2008 19:48:52 -0000	1.3
+++ sources	4 Jan 2009 18:18:03 -0000	1.4
@@ -1 +1 @@
-7d99e706e50638c5d4869bd941c16762  printoxx-1.7.tar.gz
+0776b27bafb483fd2b2ade40d9d0b0a6  printoxx-1.8.tar.gz



From eponyme at fedoraproject.org  Sun Jan  4 18:22:22 2009
From: eponyme at fedoraproject.org (Nicoleau Fabien)
Date: Sun,  4 Jan 2009 18:22:22 +0000 (UTC)
Subject: rpms/printoxx/F-10 .cvsignore, 1.3, 1.4 printoxx.spec, 1.2,
	1.3 sources, 1.3, 1.4
Message-ID: <20090104182222.4356870130@cvs1.fedora.phx.redhat.com>

Author: eponyme

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

Modified Files:
	.cvsignore printoxx.spec sources 
Log Message:
Update to 1.8


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/printoxx/F-10/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	1 Dec 2008 19:51:07 -0000	1.3
+++ .cvsignore	4 Jan 2009 18:21:51 -0000	1.4
@@ -1 +1 @@
-printoxx-1.7.tar.gz
+printoxx-1.8.tar.gz


Index: printoxx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/printoxx/F-10/printoxx.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- printoxx.spec	1 Dec 2008 19:51:07 -0000	1.2
+++ printoxx.spec	4 Jan 2009 18:21:51 -0000	1.3
@@ -1,5 +1,5 @@
 Name:           printoxx
-Version:        1.7
+Version:        1.8
 Release:        1%{?dist}
 Summary:        Print image files
 
@@ -52,13 +52,17 @@
 %doc doc/*
 %dir %{_datadir}/%{name}
 %{_bindir}/%{name}
-%{_datadir}/%{name}/*.xtext
-%{_datadir}/%{name}/icons
+%{_datadir}/%{name}/%{name}.xtext
+%{_datadir}/%{name}/icons/
+%{_datadir}/%{name}/locales/
 %{_datadir}/applications/%{name}.desktop
 %{_datadir}/pixmaps/%{name}.png
-%{_datadir}/%{name}/locales/*
 
 %changelog
+* Sun Jan  4 2009  Nicoleau Fabien <nicoleau.fabien at gmail.com> - 1.8-1
+- Rebuild for 1.8
+* Thu Dec  4 2008 Michael Schwendt <mschwendt at fedoraproject.org> - 1.7-2
+- Include unowned /usr/share/printoxx/locales directory.
 * Mon Dec  1 2008 Nicoleau Fabien <nicoleau.fabien at gmail.com> - 1.7-1
 - Rebuild for 1.7
 * Mon Oct 13 2008 Nicoleau Fabien <nicoleau.fabien at gmail.com> - 1.6-4


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/printoxx/F-10/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	1 Dec 2008 19:51:07 -0000	1.3
+++ sources	4 Jan 2009 18:21:51 -0000	1.4
@@ -1 +1 @@
-7d99e706e50638c5d4869bd941c16762  printoxx-1.7.tar.gz
+0776b27bafb483fd2b2ade40d9d0b0a6  printoxx-1.8.tar.gz



From pkgdb at fedoraproject.org  Sun Jan  4 18:41:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 04 Jan 2009 18:41:36 +0000
Subject: [pkgdb] fotoxx ownership updated
Message-ID: <20090104184136.D201F2081F2@bastion.fedora.phx.redhat.com>

Package fotoxx in Fedora devel was orphaned by eponyme

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



From pkgdb at fedoraproject.org  Sun Jan  4 18:41:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 04 Jan 2009 18:41:43 +0000
Subject: [pkgdb] fotoxx ownership updated
Message-ID: <20090104184143.5C29E20873E@bastion.fedora.phx.redhat.com>

Package fotoxx in Fedora 9 was orphaned by eponyme

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



From pkgdb at fedoraproject.org  Sun Jan  4 18:41:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 04 Jan 2009 18:41:46 +0000
Subject: [pkgdb] fotoxx ownership updated
Message-ID: <20090104184147.15610208D4F@bastion.fedora.phx.redhat.com>

Package fotoxx in Fedora 10 was orphaned by eponyme

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



From s4504kr at fedoraproject.org  Sun Jan  4 18:42:04 2009
From: s4504kr at fedoraproject.org (Jochen Schmitt)
Date: Sun,  4 Jan 2009 18:42:04 +0000 (UTC)
Subject: rpms/stellarium/devel stellarium-0.10.0-fonts.patch, NONE,
	1.1 stellarium.spec, 1.49, 1.50
Message-ID: <20090104184204.BD5FE7013C@cvs1.fedora.phx.redhat.com>

Author: s4504kr

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

Modified Files:
	stellarium.spec 
Added Files:
	stellarium-0.10.0-fonts.patch 
Log Message:
Create symlinks for DejaVu fonts

stellarium-0.10.0-fonts.patch:

--- NEW FILE stellarium-0.10.0-fonts.patch ---
diff -up stellarium-0.10.0/data/CMakeLists.txt.fp stellarium-0.10.0/data/CMakeLists.txt
--- stellarium-0.10.0/data/CMakeLists.txt.fp	2009-01-04 19:20:51.000000000 +0100
+++ stellarium-0.10.0/data/CMakeLists.txt	2009-01-04 19:21:25.000000000 +0100
@@ -1,6 +1,6 @@
 ########### install files ###############
 
-INSTALL(FILES stellarium.ico ssystem.ini zone.tab base_locations.txt DejaVuSans.ttf default_config.ini DejaVuSansMono.ttf constellations_boundaries.dat fontmap.dat iso639-1.utf8 countryCodes.dat DESTINATION share/${PACKAGE}/data)
+INSTALL(FILES stellarium.ico ssystem.ini zone.tab base_locations.txt default_config.ini constellations_boundaries.dat fontmap.dat iso639-1.utf8 countryCodes.dat DESTINATION share/${PACKAGE}/data)
 
 IF(MACOSX)
 INSTALL(FILES Icon.icns DESTINATION share )


Index: stellarium.spec
===================================================================
RCS file: /cvs/extras/rpms/stellarium/devel/stellarium.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- stellarium.spec	24 Sep 2008 19:57:45 -0000	1.49
+++ stellarium.spec	4 Jan 2009 18:41:33 -0000	1.50
@@ -2,7 +2,7 @@
 
 Name:           stellarium
 Version:        0.10.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Photo-realistic nightsky renderer
 
 Group:          Amusements/Graphics
@@ -12,6 +12,7 @@
 Source1:        stellarium.desktop
 Source2:        http://downloads.sourceforge.net/stellarum/stellarium_user_guide-%{guidever}.pdf
 Patch1:		stellarium-0.9.1-cmake.patch
+Patch2:		stellarium-0.10.0-fonts.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -28,6 +29,8 @@
 
 Requires:	opengl-games-utils
 
+Requires:	dejavu-fonts-sans dejavu-fonts-sans-mono
+
 %description
 Stellarium is a real-time 3D photo-realistic nightsky renderer. It can
 generate images of the sky as seen through the Earth's atmosphere with
@@ -47,6 +50,7 @@
 %prep
 %setup -q
 %patch1 -p1 -b .cm
+%patch2 -p1 -b .fp
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS"
@@ -70,6 +74,10 @@
 
 ln -s opengl-game-wrapper.sh $RPM_BUILD_ROOT%{_bindir}/stellarium-wrapper
 
+( cd $RPM_BUILD_ROOT%{_datadir}/stellarium/data;
+  ln -sf ../../fonts/dejavu/DejaVuSans.ttf DejaVuSans.ttf;
+  ln -sf ../../fonts/dejavu/DejaVuSansMono.ttf DeJaVuSansMono.ttf; )
+
 %find_lang %{name}
 %find_lang %{name}-skycultures
 cat %{name}-skycultures.lang >>%{name}.lang
@@ -92,6 +100,9 @@
 %doc COPYING stellarium_user_guide-%{guidever}.pdf
 
 %changelog
+* Sun Jan  4 2009 Jochen Schmitt <Jochen herr-schmitt de> 0.10.0-2
+- Create symlinks to DejaVu fonts (#477460)
+
 * Wed Sep 24 2008 Jochen Schmitt <Jochen herr-schmitt de> 0.10.0-1
 - New upstream release
 



From pkgdb at fedoraproject.org  Sun Jan  4 18:42:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 04 Jan 2009 18:42:10 +0000
Subject: [pkgdb] printoxx ownership updated
Message-ID: <20090104184210.F31DB20873E@bastion.fedora.phx.redhat.com>

Package printoxx in Fedora devel was orphaned by eponyme

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



From pkgdb at fedoraproject.org  Sun Jan  4 18:42:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 04 Jan 2009 18:42:14 +0000
Subject: [pkgdb] printoxx ownership updated
Message-ID: <20090104184214.EA19F208D4F@bastion.fedora.phx.redhat.com>

Package printoxx in Fedora 9 was orphaned by eponyme

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



From pkgdb at fedoraproject.org  Sun Jan  4 18:42:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 04 Jan 2009 18:42:17 +0000
Subject: [pkgdb] printoxx ownership updated
Message-ID: <20090104184217.BF4CF208D58@bastion.fedora.phx.redhat.com>

Package printoxx in Fedora 10 was orphaned by eponyme

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



From jcollie at fedoraproject.org  Sun Jan  4 18:58:41 2009
From: jcollie at fedoraproject.org (Jeffrey C. Ollie)
Date: Sun,  4 Jan 2009 18:58:41 +0000 (UTC)
Subject: rpms/asterisk/F-10 0014-Fix-up-some-paths.patch, NONE,
	1.1 0001-Modify-init-scripts-for-better-Fedora-compatibility.patch,
	1.6,
	1.7 0002-Modify-modules.conf-so-that-different-voicemail-modu.patch, 
	1.6,
	1.7 0003-Allow-alternate-extensions-to-be-specified-in-users.patch,
	1.5,
	1.6 0004-Minor-changes-to-reduce-packaging-changes-made-by-th.patch, 
	1.5, 1.6 0005-Add-chan_mobile-from-asterisk-addons.patch, 1.5,
	1.6 0006-Use-pkgconfig-to-check-for-Lua.patch, 1.5,
	1.6 0007-Build-using-external-libedit.patch, 1.5,
	1.6 0008-Revert-changes-to-pbx_lua-from-rev-126363-that-cause.patch, 
	1.2,
	1.3 0009-change-configure.ac-to-look-for-pkg-config-gmime-2.4.patch, 
	1.2,
	1.3 0010-fix-the-AST_PROG_SED-problem-that-makes-.-bootstrap.patch,
	1.2, 1.3 0011-Merged-revisions-160170-160172-via-svnmerge-from.patch, 
	1.2, 1.3 0012-Merged-revisions-162275-via-svnmerge-from.patch,
	1.1, 1.2 0013-Update-autoconf.patch, 1.1, 1.2 asterisk.spec,
	1.39, 1.40
Message-ID: <20090104185841.49F8C70130@cvs1.fedora.phx.redhat.com>

Author: jcollie

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

Modified Files:
	0001-Modify-init-scripts-for-better-Fedora-compatibility.patch 
	0002-Modify-modules.conf-so-that-different-voicemail-modu.patch 
	0003-Allow-alternate-extensions-to-be-specified-in-users.patch 
	0004-Minor-changes-to-reduce-packaging-changes-made-by-th.patch 
	0005-Add-chan_mobile-from-asterisk-addons.patch 
	0006-Use-pkgconfig-to-check-for-Lua.patch 
	0007-Build-using-external-libedit.patch 
	0008-Revert-changes-to-pbx_lua-from-rev-126363-that-cause.patch 
	0009-change-configure.ac-to-look-for-pkg-config-gmime-2.4.patch 
	0010-fix-the-AST_PROG_SED-problem-that-makes-.-bootstrap.patch 
	0011-Merged-revisions-160170-160172-via-svnmerge-from.patch 
	0012-Merged-revisions-162275-via-svnmerge-from.patch 
	0013-Update-autoconf.patch asterisk.spec 
Added Files:
	0014-Fix-up-some-paths.patch 
Log Message:
* Sun Jan  4 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6.0.2-3
- Don't package func_curl in the main package. BZ#475910
- Fix up paths. BZ#477238


0014-Fix-up-some-paths.patch:

--- NEW FILE 0014-Fix-up-some-paths.patch ---
>From 57e9e58cb5d501da652d227eb8c07b2593d333ff Mon Sep 17 00:00:00 2001
From: Jeffrey C. Ollie <jeff at ocjtech.us>
Date: Sun, 4 Jan 2009 12:51:05 -0600
Subject: [PATCH 14/14] Fix up some paths.

---
 UPGRADE-1.4.txt                             |    2 +-
 configs/festival.conf.sample                |    2 +-
 configs/http.conf.sample                    |    6 ++--
 configs/iax.conf.sample                     |    4 +-
 configs/musiconhold.conf.sample             |   10 ++++----
 configs/osp.conf.sample                     |    4 +-
 configs/phoneprov.conf.sample               |    2 +-
 contrib/scripts/astgenkey                   |    2 +-
 contrib/scripts/astgenkey.8                 |    6 ++--
 doc/osp.txt                                 |    8 +++---
 doc/tex/phoneprov.tex                       |    2 +-
 doc/tex/privacy.tex                         |    6 ++--
 pbx/ael/ael-test/ael-test3/extensions.ael   |   28 +++++++++++++-------------
 pbx/ael/ael-test/ael-vtest13/extensions.ael |   28 +++++++++++++-------------
 pbx/ael/ael-test/ref.ael-vtest13            |   26 ++++++++++++------------
 15 files changed, 68 insertions(+), 68 deletions(-)

diff --git a/UPGRADE-1.4.txt b/UPGRADE-1.4.txt
index 4f82694..69bf322 100644
--- a/UPGRADE-1.4.txt
+++ b/UPGRADE-1.4.txt
@@ -92,7 +92,7 @@ sound packages in the 'sounds' subdirectory to be used later during installation
 WARNING: Asterisk 1.4 supports a new layout for sound files in multiple languages;
 instead of the alternate-language files being stored in subdirectories underneath
 the existing files (for French, that would be digits/fr, letters/fr, phonetic/fr,
-etc.) the new layout creates one directory under /var/lib/asterisk/sounds for the
+etc.) the new layout creates one directory under /usr/share/asterisk/sounds for the
 language itself, then places all the sound files for that language under that
 directory and its subdirectories. This is the layout that will be created if you
 select non-English languages to be installed via menuselect, HOWEVER Asterisk does
diff --git a/configs/festival.conf.sample b/configs/festival.conf.sample
index 774f1a1..815f11d 100644
--- a/configs/festival.conf.sample
+++ b/configs/festival.conf.sample
@@ -21,7 +21,7 @@
 ; THIS DIRECTORY *MUST* EXIST and must be writable from the asterisk process.
 ; Defaults to /tmp/
 ;
-;cachedir=/var/lib/asterisk/festivalcache/
+;cachedir=/var/spool/asterisk/festival/
 ;
 ; Festival command to send to the server.
 ; Defaults to: (tts_textasterisk "%s" 'file)(quit)\n
diff --git a/configs/http.conf.sample b/configs/http.conf.sample
index f15c9cf..6349905 100644
--- a/configs/http.conf.sample
+++ b/configs/http.conf.sample
@@ -5,7 +5,7 @@
 ; Note about Asterisk documentation:
 ;   If Asterisk was installed from a tarball, then the HTML documentation should
 ;   be installed in the static-http/docs directory which is
-;   (/var/lib/asterisk/static-http/docs) on linux by default.  If the Asterisk
+;   (/usr/share/asterisk/static-http/docs) on linux by default.  If the Asterisk
 ;   HTTP server is enabled in this file by setting the "enabled", "bindaddr",
 ;   and "bindport" options, then you should be able to view the documentation
 ;   remotely by browsing to:
@@ -66,6 +66,6 @@ bindaddr=127.0.0.1
 ;[post_mappings]
 ;
 ; In this example, if the prefix option is set to "asterisk", then using the
-; POST URL: /asterisk/uploads will put files in /var/lib/asterisk/uploads/.
-;uploads = /var/lib/asterisk/uploads/
+; POST URL: /asterisk/uploads will put files in /var/spool/asterisk/uploads/.
+;uploads = /var/spool/asterisk/uploads/
 ;
diff --git a/configs/iax.conf.sample b/configs/iax.conf.sample
index 854a243..ab2938e 100644
--- a/configs/iax.conf.sample
+++ b/configs/iax.conf.sample
@@ -348,8 +348,8 @@ inkeys=freeworlddialup
 ; authentication is used, "inkeys" is a list of acceptable public keys on the 
 ; local system that can be used to authenticate the remote peer, separated by
 ; the ":" character.  "outkey" is a single, private key to use to authenticate
-; to the other side.  Public keys are named /var/lib/asterisk/keys/<name>.pub
-; while private keys are named /var/lib/asterisk/keys/<name>.key.  Private
+; to the other side.  Public keys are named /usr/share/asterisk/keys/<name>.pub
+; while private keys are named /usr/share/asterisk/keys/<name>.key.  Private
 ; keys should always be 3DES encrypted.
 ;
 ;
diff --git a/configs/musiconhold.conf.sample b/configs/musiconhold.conf.sample
index 4df1afd..b730335 100644
--- a/configs/musiconhold.conf.sample
+++ b/configs/musiconhold.conf.sample
@@ -39,11 +39,11 @@
 
 [default]
 mode=files
-directory=/var/lib/asterisk/moh
+directory=/usr/share/asterisk/moh
 ;
 ;[native-random]
 ;mode=files
-;directory=/var/lib/asterisk/moh
+;directory=/usr/share/asterisk/moh
 ;digit=#        ; If this option is set for a class, then when callers are
 ;               ; listening to music on hold, they can press this digit, and
 ;               ; they will switch to listening to this music class.
@@ -51,7 +51,7 @@ directory=/var/lib/asterisk/moh
 
 ;[native-alphabetical]
 ;mode=files
-;directory=/var/lib/asterisk/moh
+;directory=/usr/share/asterisk/moh
 ;sort=alpha     ; Sort the files in alphabetical order.  If this option is
 ;               ; not specified, the sort order is undefined.
 
@@ -63,7 +63,7 @@ directory=/var/lib/asterisk/moh
 ;mode=custom
 ; Note that with mode=custom, a directory is not required, such as when reading
 ; from a stream.
-;directory=/var/lib/asterisk/mohmp3
+;directory=/usr/share/asterisk/mohmp3
 ;application=/usr/bin/mpg123 -q -r 8000 -f 8192 -b 2048 --mono -s
 
 ;[ulawstream]
@@ -75,5 +75,5 @@ directory=/var/lib/asterisk/moh
 ; choice
 ;[solaris]
 ;mode=custom
-;directory=/var/lib/asterisk/mohmp3
+;directory=/usr/share/asterisk/mohmp3
 ;application=/site/sw/bin/madplay -Q -o raw:- --mono -R 8000 -a -12
diff --git a/configs/osp.conf.sample b/configs/osp.conf.sample
index e342337..2e346e6 100644
--- a/configs/osp.conf.sample
+++ b/configs/osp.conf.sample
@@ -36,8 +36,8 @@
 ;source=domain name or [IP address in brackets]
 ;
 ; Define path and file name of crypto files.
-; The default path for crypto file is /var/lib/asterisk/keys.  If no path is 
-; defined, crypto files will in /var/lib/asterisk/keys directory.
+; The default path for crypto file is /usr/share/asterisk/keys.  If no path is 
+; defined, crypto files will in /usr/share/asterisk/keys directory.
 ;
 ; Specify the private key file name.  
 ; If this parameter is unspecified or not present, the default name will be the 
diff --git a/configs/phoneprov.conf.sample b/configs/phoneprov.conf.sample
index 8f55fa8..2608914 100644
--- a/configs/phoneprov.conf.sample
+++ b/configs/phoneprov.conf.sample
@@ -57,4 +57,4 @@ ${TOLOWER(${MAC})}.cfg => 000000000000.cfg               ; Dynamically generated
 ${TOLOWER(${MAC})}-phone.cfg => 000000000000-phone.cfg   ; (relative to AST_DATA_DIR/phoneprov)
 config/${TOLOWER(${MAC})} => polycom.xml                 ; Dynamic Filename => template file 
 ${TOLOWER(${MAC})}-directory.xml => 000000000000-directory.xml
-setvar => CUSTOM_CONFIG=/var/lib/asterisk/phoneprov/configs/custom.cfg  ; Custom variable
+setvar => CUSTOM_CONFIG=/usr/share/asterisk/phoneprov/configs/custom.cfg  ; Custom variable
diff --git a/contrib/scripts/astgenkey b/contrib/scripts/astgenkey
index 6376048..e4a5a80 100644
--- a/contrib/scripts/astgenkey
+++ b/contrib/scripts/astgenkey
@@ -29,7 +29,7 @@ if [ "$QUIET" != 'y' ]; then
 	echo "in PEM format for use by Asterisk.  You will be asked to"
 	echo "enter a passcode for your key multiple times.  Please"
 	echo "enter the same code each time.  The resulting files will"
-	echo "need to be moved to /var/lib/asterisk/keys if you want"
+	echo "need to be moved to /usr/share/asterisk/keys if you want"
 	echo "to use them, and any private keys (.key files) will"
 	echo "need to be initialized at runtime either by running"
 	echo "Asterisk with the '-i' option, or with the 'init keys'"
diff --git a/contrib/scripts/astgenkey.8 b/contrib/scripts/astgenkey.8
index 328a4d2..ac6feae 100644
--- a/contrib/scripts/astgenkey.8
+++ b/contrib/scripts/astgenkey.8
@@ -88,7 +88,7 @@ The private key: secret.
 .RE
 
 Those files should be copied to 
-.I /var/lib/asterisk/keys
+.I /usr/share/asterisk/keys
 
 (The private key: on your system. The public key: on other systems)
 
@@ -122,10 +122,10 @@ readable, such as with the following commands:
 And then make the key accessible to Asterisk (assuming you run it as
 user "asterisk").
 
-  chown asterisk /var/lib/asterisk/keys/yourname.*
+  chown asterisk /usr/share/asterisk/keys/yourname.*
 
 .SH FILES
-.I /var/lib/asterisk/keys
+.I /usr/share/asterisk/keys
 .RS
 .RE
 
diff --git a/doc/osp.txt b/doc/osp.txt
index a0cd429..932f214 100644
--- a/doc/osp.txt
+++ b/doc/osp.txt
@@ -136,7 +136,7 @@ make clean; make linux
 Compilation is successful if there are no errors in the compiler output. The enroll program is now located in the OSP Toolkit/bin directory (example: /usr/src/ TK-3_3_6-20060303/bin). 
 
 2.2 Obtain Crypto Files
-The OSP module in Asterisk requires three crypto files containing a local certificate (localcert.pem), private key (pkey.pem), and CA certificate (cacert_0.pem).  Asterisk will try to load the files from the Asterisk public/private key directory - /var/lib/asterisk/keys.  If the files are not present, the OSP module will not start and the Asterisk will not support the OSP protocol.  Use the enroll.sh script from the toolkit distribution to enroll Asterisk with an OSP server and obtain the crypto files.  Documentation explaining how to use the enroll.sh script (Device Enrollment) to enroll with an OSP server is available at http://www.transnexus.com/OSP%20Toolkit/OSP%20Toolkit%20Documents/Device_Enrollment.pdf.  Copy the files generated by the enrollment process to the Asterisk /var/lib/asterisk/keys directory.  
+The OSP module in Asterisk requires three crypto files containing a local certificate (localcert.pem), private key (pkey.pem), and CA certificate (cacert_0.pem).  Asterisk will try to load the files from the Asterisk public/private key directory - /usr/share/asterisk/keys.  If the files are not present, the OSP module will not start and the Asterisk will not support the OSP protocol.  Use the enroll.sh script from the toolkit distribution to enroll Asterisk with an OSP server and obtain the crypto files.  Documentation explaining how to use the enroll.sh script (Device Enrollment) to enroll with an OSP server is available at http://www.transnexus.com/OSP%20Toolkit/OSP%20Toolkit%20Documents/Device_Enrollment.pdf.  Copy the files generated by the enrollment process to the Asterisk /usr/share/asterisk/keys directory.  
 
 Note: The osptestserver.transnexus.com is configured only for sending and receiving non-SSL messages, and issuing signed tokens. If you need help, post a message on the OSP mailing list at https://lists.sourceforge.net/lists/listinfo/osp-toolkit-client..
 
@@ -183,7 +183,7 @@ depth=0 /CN=osptestserver.transnexus.com/O=OSPServer
 verify return:1
 The certificate request was successful.
 Error Code returned from localcert command : 0
-The files generated should be copied to the /var/lib/asterisk/keys directory. 
+The files generated should be copied to the /usr/share/asterisk/keys directory. 
 Note: The script enroll.sh requires AT&T korn shell (ksh) or any of its compatible variants. The /usr/src/TK-3_3_6-20060303/bin directory should be in the PATH variable. Otherwise, enroll.sh cannot find the enroll file.
 
 3 Asterisk
@@ -247,9 +247,9 @@ servicepoint=http://OSP server IP:1080/osp
 source=[host IP]
 ;
 ; Define path and file name of crypto files.
-; The default path for crypto file is /var/lib/asterisk/keys.  If no
+; The default path for crypto file is /usr/share/asterisk/keys.  If no
 ; path is defined, crypto files should be in  
-; /var/lib/asterisk/keys directory.
+; /usr/share/asterisk/keys directory.
 ;
 ; Specify the private key file name.  
 ; If this parameter is unspecified or not present, the default name 
diff --git a/doc/tex/phoneprov.tex b/doc/tex/phoneprov.tex
index cb236a8..be01d34 100644
--- a/doc/tex/phoneprov.tex
+++ b/doc/tex/phoneprov.tex
@@ -58,7 +58,7 @@ files, respectively. A sample profile:
 [polycom]
 staticdir => configs/
 mime_type => text/xml
-setvar => CUSTOM_CONFIG=/var/lib/asterisk/phoneprov/configs/custom.cfg
+setvar => CUSTOM_CONFIG=/usr/share/asterisk/phoneprov/configs/custom.cfg
 static_file => bootrom.ld,application/octet-stream
 static_file => bootrom.ver,plain/text
 static_file => sip.ld,application/octet-stream
diff --git a/doc/tex/privacy.tex b/doc/tex/privacy.tex
index 81b2fac..9971641 100644
--- a/doc/tex/privacy.tex
+++ b/doc/tex/privacy.tex
@@ -204,7 +204,7 @@ helpful.
 
 When there is no CallerID, P and p options will always record an intro
 for the incoming caller. This intro will be stored temporarily in the
-\path{/var/lib/asterisk/sounds/priv-callerintros} dir, under the name
+\path{/usr/share/asterisk/sounds/priv-callerintros} dir, under the name
 NOCALLERID\_$<$extension$>$ $<$channelname$>$ and will be erased after the
 callee decides what to do with the call.
 
@@ -239,7 +239,7 @@ introductions are stored and re-used for the convenience of the CALLER.
 \subsubsection{Introductions}
 Unless instructed to not save introductions (see the 'n' option above),
 the screening modes will save the recordings of the caller's names in
-the directory \path{/var/lib/asterisk/sounds/priv-callerintros}, if they have
+the directory \path{/usr/share/asterisk/sounds/priv-callerintros}, if they have
 a CallerID.  Just the 10-digit callerid numbers are used as filenames,
 with a ".gsm" at the end.
 
@@ -254,7 +254,7 @@ loudspeakers, and perhaps other nifty things. For instance:
 
 \begin{astlisting}
 \begin{verbatim}
-exten => s,6,Set(PATH=/var/lib/asterisk/sounds/priv-callerintros)
+exten => s,6,Set(PATH=/usr/share/asterisk/sounds/priv-callerintros)
 exten => s,7,System(/usr/bin/play ${PATH}/${CALLERID(num)}.gsm&,0)
 \end{verbatim}
 \end{astlisting}
diff --git a/pbx/ael/ael-test/ael-test3/extensions.ael b/pbx/ael/ael-test/ael-test3/extensions.ael
index ff1f6ae..53fb918 100755
--- a/pbx/ael/ael-test/ael-test3/extensions.ael
+++ b/pbx/ael/ael-test/ael-test3/extensions.ael
@@ -2049,7 +2049,7 @@ macro ciddial2(dialnum, lookup, waittime, dialopts, ddev) // give priority to tc
 
 macro callerid-liar()
 {
-	TrySystem(/usr/bin/play /var/lib/asterisk/sounds/priv-callerintros/LIAR.gsm&);
+	TrySystem(/usr/bin/play /usr/share/asterisk/sounds/priv-callerintros/LIAR.gsm&);
 	Background(priv-liar);  // Script: OOOps! Sorry! I don't allow men with ski masks pulled over their 
                             //         faces to get in the front door, and unidentified callers won't fair
                             //         any better. You entered *MY* phone number. That won't work.
@@ -2106,7 +2106,7 @@ context homeline {
 		PrivacyManager();
 		if( "${PRIVACYMGRSTATUS}" = "FAILED" )
 		{
-			TrySystem(/usr/bin/play /var/lib/asterisk/sounds/privmanfailed.gsm);
+			TrySystem(/usr/bin/play /usr/share/asterisk/sounds/privmanfailed.gsm);
 			&std-priv-exten(Zap/3r1&Zap/5r1,2,25,mtw,telemarket,telemarket);
 			Hangup();
 			return;
@@ -2138,7 +2138,7 @@ context homeline {
 			verbose(direct is XXX#${direct}XXXX);
 			Playback(greetings/direct); // Welcome to the Murphy residence. This system will automatically try to connect you to...
 			Playback(/var/spool/asterisk/voicemail/default/${direct}/greet);
-			TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
+			TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
 			TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/${direct}/greet.wav&);
 			switch(${direct})
 			{
@@ -2223,7 +2223,7 @@ context homeline {
 		
 	}
 	1 => {  // Sonya
-			TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
+			TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
 			TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/2/greet.wav&);
 			&std-priv-exten(Zap/3r1&Zap/5r1,2,25,mtw,telemarket,telemarket);
 			goto s|loopback;
@@ -2421,51 +2421,51 @@ context homeline-kids {
 		Background(murphy-homeline-kids);        //  Which Kid? 1=Sean, 2:Eric, 3:Ryan, 4:Kyle, 5:Amber, 6:Alex, 7:Neal
 	}
 	1 => {  // SEAN
-			TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
+			TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
 			TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/3/greet.wav&);
 			// &std-priv-exten(Zap/3r2&Zap/5r2,3,35,mtw,telemarket,telemarket);
 			&std-priv-exten(IAX2/seaniax&Zap/5r2,3,35,mtw,telemarket,telemarket);
 			goto homeline|s|loopback;
 	}
 	2 => {  // ERIC
-			TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
+			TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
 			TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/4/greet.wav&);
 			Voicemail(u4);
 			goto homeline|s|loopback;
 			
 			// SetMusicOnHold(erics);
-			// TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
+			// TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
 			// TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/4/greet.wav&);
 			// &std-priv-exten(Zap/3r2&Zap/5r2,4,35,mtw,telemarket,telemarket);
 			// goto homeline|s|loopback;
 	}
 	3 => {  // RYAN
-			TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
+			TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
 			TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/5/greet.wav&);
 			&std-priv-exten(Zap/3r2&Zap/5r2,5,35,mtw,telemarket,telemarket);
 			goto homeline|s|loopback;
 	}
 	4 => {  // KYLE
-			TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
+			TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
 			TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/6/greet.wav&);
 			&std-priv-exten(Zap/3r2&Zap/5r2,6,35,mtw,telemarket,telemarket);
 			goto homeline|s|loopback;
 	}
 	5 => {
-			TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
+			TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
 			TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/7/greet.wav&);
 			&std-priv-exten(Zap/3r2&Zap/5r2,7,35,mtw,telemarket,telemarket);
 			goto homeline|s|loopback;
 			
 	}
 	6 => {
-			TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
+			TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
 			TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/8/greet.wav&);
 			&std-priv-exten(Zap/3r2&Zap/5r2,8,35,mtw,telemarket,telemarket);
 			goto homeline|s|loopback;
 	}
 	7 => {
-			TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
+			TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
 			TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/9/greet.wav&);
 			&std-priv-exten(Zap/3r2&Zap/5r2,9,35,mtw,telemarket,telemarket);
 			goto homeline|s|loopback;
@@ -2517,7 +2517,7 @@ context workline {
                                               // Otherwise, dial 1, and hopefully, you will reach Steve.
 	}
 	1 => {
-		TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
+		TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
 		TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/1/greet.wav&);
 		
 		&std-priv-exten(Zap/6&Sip/murf,1,30,mtw,telemarket,telemarket);
@@ -2778,7 +2778,7 @@ context homeext {
 	}
 	761 => {
 		Record(announcement:gsm);
-		TrySystem(/usr/bin/play /var/lib/asterisk/sounds/announcement.gsm&);
+		TrySystem(/usr/bin/play /usr/share/asterisk/sounds/announcement.gsm&);
 		goto s|loopback;
 	}
 	762 => {
diff --git a/pbx/ael/ael-test/ael-vtest13/extensions.ael b/pbx/ael/ael-test/ael-vtest13/extensions.ael
index b7e953e..48baaef 100755
--- a/pbx/ael/ael-test/ael-vtest13/extensions.ael
+++ b/pbx/ael/ael-test/ael-vtest13/extensions.ael
@@ -2048,7 +2048,7 @@ macro ciddial2(dialnum, lookup, waittime, dialopts, ddev) // give priority to tc
 
 macro callerid-liar()
 {
-	TrySystem(/usr/bin/play /var/lib/asterisk/sounds/priv-callerintros/LIAR.gsm&);
+	TrySystem(/usr/bin/play /usr/share/asterisk/sounds/priv-callerintros/LIAR.gsm&);
 	Background(priv-liar);  // Script: OOOps! Sorry! I don't allow men with ski masks pulled over their 
                             //         faces to get in the front door, and unidentified callers won't fair
                             //         any better. You entered *MY* phone number. That won't work.
@@ -2105,7 +2105,7 @@ context homeline {
 		PrivacyManager();
 		if( "${PRIVACYMGRSTATUS}" = "FAILED" )
 		{
-			TrySystem(/usr/bin/play /var/lib/asterisk/sounds/privmanfailed.gsm);
+			TrySystem(/usr/bin/play /usr/share/asterisk/sounds/privmanfailed.gsm);
 			&std-priv-exten(Zap/3r1&Zap/5r1,2,25,mtw,telemarket,telemarket);
 			Hangup();
 			return;
@@ -2137,7 +2137,7 @@ context homeline {
 			verbose(direct is XXX#${direct}XXXX);
 			Playback(greetings/direct); // Welcome to the Murphy residence. This system will automatically try to connect you to...
 			Playback(/var/spool/asterisk/voicemail/default/${direct}/greet);
-			TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
+			TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
 			TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/${direct}/greet.wav&);
 			switch(${direct})
 			{
@@ -2222,7 +2222,7 @@ context homeline {
 		
 	}
 	1 => {  // Sonya
-			TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
+			TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
 			TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/2/greet.wav&);
 			&std-priv-exten(Zap/3r1&Zap/5r1,2,25,mtw,telemarket,telemarket);
 			goto s|loopback;
@@ -2420,51 +2420,51 @@ context homeline-kids {
 		Background(murphy-homeline-kids);        //  Which Kid? 1=Sean, 2:Eric, 3:Ryan, 4:Kyle, 5:Amber, 6:Alex, 7:Neal
 	}
 	1 => {  // SEAN
-			TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
+			TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
 			TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/3/greet.wav&);
 			// &std-priv-exten(Zap/3r2&Zap/5r2,3,35,mtw,telemarket,telemarket);
 			&std-priv-exten(IAX2/seaniax&Zap/5r2,3,35,mtw,telemarket,telemarket);
 			goto homeline|s|loopback;
 	}
 	2 => {  // ERIC
-			TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
+			TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
 			TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/4/greet.wav&);
 			Voicemail(u4);
 			goto homeline|s|loopback;
 			
 			// SetMusicOnHold(erics);
-			// TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
+			// TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
 			// TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/4/greet.wav&);
 			// &std-priv-exten(Zap/3r2&Zap/5r2,4,35,mtw,telemarket,telemarket);
 			// goto homeline|s|loopback;
 	}
 	3 => {  // RYAN
-			TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
+			TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
 			TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/5/greet.wav&);
 			&std-priv-exten(Zap/3r2&Zap/5r2,5,35,mtw,telemarket,telemarket);
 			goto homeline|s|loopback;
 	}
 	4 => {  // KYLE
-			TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
+			TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
 			TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/6/greet.wav&);
 			&std-priv-exten(Zap/3r2&Zap/5r2,6,35,mtw,telemarket,telemarket);
 			goto homeline|s|loopback;
 	}
 	5 => {
-			TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
+			TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
 			TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/7/greet.wav&);
 			&std-priv-exten(Zap/3r2&Zap/5r2,7,35,mtw,telemarket,telemarket);
 			goto homeline|s|loopback;
 			
 	}
 	6 => {
-			TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
+			TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
 			TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/8/greet.wav&);
 			&std-priv-exten(Zap/3r2&Zap/5r2,8,35,mtw,telemarket,telemarket);
 			goto homeline|s|loopback;
 	}
 	7 => {
-			TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
+			TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
 			TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/9/greet.wav&);
 			&std-priv-exten(Zap/3r2&Zap/5r2,9,35,mtw,telemarket,telemarket);
 			goto homeline|s|loopback;
@@ -2516,7 +2516,7 @@ context workline {
                                               // Otherwise, dial 1, and hopefully, you will reach Steve.
 	}
 	1 => {
-		TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
+		TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
 		TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/1/greet.wav&);
 		
 		&std-priv-exten(Zap/6&Sip/murf,1,30,mtw,telemarket,telemarket);
@@ -2777,7 +2777,7 @@ context homeext {
 	}
 	761 => {
 		Record(announcement:gsm);
-		TrySystem(/usr/bin/play /var/lib/asterisk/sounds/announcement.gsm&);
+		TrySystem(/usr/bin/play /usr/share/asterisk/sounds/announcement.gsm&);
 		goto s|loopback;
 	}
 	762 => {
diff --git a/pbx/ael/ael-test/ref.ael-vtest13 b/pbx/ael/ael-test/ref.ael-vtest13
index 79a5e48..cf1d255 100644
--- a/pbx/ael/ael-test/ref.ael-vtest13
+++ b/pbx/ael/ael-test/ref.ael-vtest13
@@ -2107,7 +2107,7 @@ exten => s,20,Return()
 
 
 [callerid-liar]
-exten => s,1,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/priv-callerintros/LIAR.gsm&)
+exten => s,1,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/priv-callerintros/LIAR.gsm&)
 exten => s,2,Background(priv-liar)
 exten => s,3,Hangup()
 exten => s,4,Return()
@@ -2142,7 +2142,7 @@ exten => s,3,Set(repeatcount=0)
 exten => s,4,Zapateller(nocallerid)
 exten => s,5,PrivacyManager()
 exten => s,6,GotoIf($["${PRIVACYMGRSTATUS}" = "FAILED" ]?7:11)
-exten => s,7,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/privmanfailed.gsm)
+exten => s,7,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/privmanfailed.gsm)
 exten => s,8,Gosub(std-priv-exten,s,1(Zap/3r1&Zap/5r1,2,25,mtw,telemarket,telemarket))
 exten => s,9,Hangup()
 exten => s,10,Return()
@@ -2168,7 +2168,7 @@ exten => s,29,GotoIf($["${direct}" != "" & ${direct} != 0 ]?30:37)
 exten => s,30,verbose(direct is XXX#${direct}XXXX)
 exten => s,31,Playback(greetings/direct)
 exten => s,32,Playback(/var/spool/asterisk/voicemail/default/${direct}/greet)
-exten => s,33,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm)
+exten => s,33,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm)
 exten => s,34,TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/${direct}/greet.wav&)
 exten => s,35,Goto(sw-92-${direct},10)
 exten => s,36,NoOp(Finish switch-if-homeline-91-92)
@@ -2247,7 +2247,7 @@ exten => sw-92-2,10,Gosub(std-priv-exten,s,1(Zap/3r1&Zap/5r1,2,25,mtw,telemarket
 exten => sw-92-2,11,Goto(s,loopback)
 exten => sw-92-1,10,Gosub(std-priv-exten,s,1(Zap/6r3&Sip/murf,1,25,mpA(beep)tw,telemarket,telemarket))
 exten => sw-92-1,11,Goto(s,loopback)
-exten => 1,1,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm)
+exten => 1,1,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm)
 exten => 1,2,TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/2/greet.wav&)
 exten => 1,3,Gosub(std-priv-exten,s,1(Zap/3r1&Zap/5r1,2,25,mtw,telemarket,telemarket))
 exten => 1,4,Goto(s,loopback)
@@ -2324,31 +2324,31 @@ exten => o,1,Goto(s,begin)
 
 [homeline-kids]
 exten => s,1(begin),Background(murphy-homeline-kids)
-exten => 1,1,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm)
+exten => 1,1,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm)
 exten => 1,2,TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/3/greet.wav&)
 exten => 1,3,Gosub(std-priv-exten,s,1(IAX2/seaniax&Zap/5r2,3,35,mtw,telemarket,telemarket))
 exten => 1,4,Goto(homeline,s,loopback)
-exten => 2,1,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm)
+exten => 2,1,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm)
 exten => 2,2,TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/4/greet.wav&)
 exten => 2,3,Voicemail(u4)
 exten => 2,4,Goto(homeline,s,loopback)
-exten => 3,1,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm)
+exten => 3,1,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm)
 exten => 3,2,TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/5/greet.wav&)
 exten => 3,3,Gosub(std-priv-exten,s,1(Zap/3r2&Zap/5r2,5,35,mtw,telemarket,telemarket))
 exten => 3,4,Goto(homeline,s,loopback)
-exten => 4,1,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm)
+exten => 4,1,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm)
 exten => 4,2,TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/6/greet.wav&)
 exten => 4,3,Gosub(std-priv-exten,s,1(Zap/3r2&Zap/5r2,6,35,mtw,telemarket,telemarket))
 exten => 4,4,Goto(homeline,s,loopback)
-exten => 5,1,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm)
+exten => 5,1,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm)
 exten => 5,2,TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/7/greet.wav&)
 exten => 5,3,Gosub(std-priv-exten,s,1(Zap/3r2&Zap/5r2,7,35,mtw,telemarket,telemarket))
 exten => 5,4,Goto(homeline,s,loopback)
-exten => 6,1,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm)
+exten => 6,1,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm)
 exten => 6,2,TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/8/greet.wav&)
 exten => 6,3,Gosub(std-priv-exten,s,1(Zap/3r2&Zap/5r2,8,35,mtw,telemarket,telemarket))
 exten => 6,4,Goto(homeline,s,loopback)
-exten => 7,1,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm)
+exten => 7,1,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm)
 exten => 7,2,TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/9/greet.wav&)
 exten => 7,3,Gosub(std-priv-exten,s,1(Zap/3r2&Zap/5r2,9,35,mtw,telemarket,telemarket))
 exten => 7,4,Goto(homeline,s,loopback)
@@ -2376,7 +2376,7 @@ exten => s,5,Gosub(fillcidname,s,1)
 exten => s,6,TrySystem(/usr/local/bin/who-is-it ${CALLERID(num)} "${CALLERID(name)}"&)
 exten => s,7(loopback),Background(greetings/greeting)
 exten => s,8,Background(murphy-office-intro1)
-exten => 1,1,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm)
+exten => 1,1,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm)
 exten => 1,2,TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/1/greet.wav&)
 exten => 1,3,Gosub(std-priv-exten,s,1(Zap/6&Sip/murf,1,30,mtw,telemarket,telemarket))
 exten => 1,4,Goto(s,loopback)
@@ -2502,7 +2502,7 @@ exten => 6,1,Background(recording)
 exten => 760,1,DateTime()
 exten => 760,2,Goto(s,loopback)
 exten => 761,1,Record(announcement:gsm)
-exten => 761,2,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/announcement.gsm&)
+exten => 761,2,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/announcement.gsm&)
 exten => 761,3,Goto(s,loopback)
 exten => 762,1,agi(tts-riddle.agi)
 exten => 762,2,Background(gsm/what-time-it-is2)
-- 
1.6.1


0001-Modify-init-scripts-for-better-Fedora-compatibility.patch:

Index: 0001-Modify-init-scripts-for-better-Fedora-compatibility.patch
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/F-10/0001-Modify-init-scripts-for-better-Fedora-compatibility.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- 0001-Modify-init-scripts-for-better-Fedora-compatibility.patch	4 Jan 2009 17:23:21 -0000	1.6
+++ 0001-Modify-init-scripts-for-better-Fedora-compatibility.patch	4 Jan 2009 18:58:38 -0000	1.7
@@ -1,7 +1,7 @@
 From 0040bd97782e9db8c341af9ffe171749644e35f1 Mon Sep 17 00:00:00 2001
 From: Jeffrey C. Ollie <jeff at ocjtech.us>
 Date: Sun, 18 Nov 2007 21:47:59 -0600
-Subject: [PATCH 01/13] Modify init scripts for better Fedora compatibility.
+Subject: [PATCH 01/14] Modify init scripts for better Fedora compatibility.
 
 ---
  contrib/init.d/rc.redhat.asterisk |   61 +++++++++++++++++-------------------

0002-Modify-modules.conf-so-that-different-voicemail-modu.patch:

Index: 0002-Modify-modules.conf-so-that-different-voicemail-modu.patch
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/F-10/0002-Modify-modules.conf-so-that-different-voicemail-modu.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- 0002-Modify-modules.conf-so-that-different-voicemail-modu.patch	4 Jan 2009 17:23:22 -0000	1.6
+++ 0002-Modify-modules.conf-so-that-different-voicemail-modu.patch	4 Jan 2009 18:58:38 -0000	1.7
@@ -1,7 +1,7 @@
 From 42cd072beba88049783a7bedb029760a5952706e Mon Sep 17 00:00:00 2001
 From: Jeffrey C. Ollie <jcollie at pc21224.campus.dmacc.edu>
 Date: Thu, 8 Nov 2007 15:52:36 -0600
-Subject: [PATCH 02/13] Modify modules.conf so that different voicemail modules can be loaded.
+Subject: [PATCH 02/14] Modify modules.conf so that different voicemail modules can be loaded.
 
 ---
  configs/modules.conf.sample |   27 +++++++++++++++++++++++++++

0003-Allow-alternate-extensions-to-be-specified-in-users.patch:

Index: 0003-Allow-alternate-extensions-to-be-specified-in-users.patch
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/F-10/0003-Allow-alternate-extensions-to-be-specified-in-users.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- 0003-Allow-alternate-extensions-to-be-specified-in-users.patch	4 Jan 2009 17:23:22 -0000	1.5
+++ 0003-Allow-alternate-extensions-to-be-specified-in-users.patch	4 Jan 2009 18:58:38 -0000	1.6
@@ -1,7 +1,7 @@
 From a9d27e3b5f93ff8658fa06a0c454140f27244363 Mon Sep 17 00:00:00 2001
 From: Jeffrey C. Ollie <jcollie at pc21224.campus.dmacc.edu>
 Date: Thu, 8 Nov 2007 16:32:56 -0600
-Subject: [PATCH 03/13] Allow alternate extensions to be specified in users.conf
+Subject: [PATCH 03/14] Allow alternate extensions to be specified in users.conf
 
 ---
  pbx/pbx_config.c |   14 ++++++++++++++

0004-Minor-changes-to-reduce-packaging-changes-made-by-th.patch:

Index: 0004-Minor-changes-to-reduce-packaging-changes-made-by-th.patch
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/F-10/0004-Minor-changes-to-reduce-packaging-changes-made-by-th.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- 0004-Minor-changes-to-reduce-packaging-changes-made-by-th.patch	4 Jan 2009 17:23:22 -0000	1.5
+++ 0004-Minor-changes-to-reduce-packaging-changes-made-by-th.patch	4 Jan 2009 18:58:38 -0000	1.6
@@ -1,7 +1,7 @@
 From 42991016984f9e7930686527706ab0f36baa41d1 Mon Sep 17 00:00:00 2001
 From: tilghman <tilghman at 614ede4d-c843-0410-af14-a771ab80d22e>
 Date: Tue, 29 Jul 2008 23:00:45 +0000
-Subject: [PATCH 04/13] Minor changes to reduce packaging changes made by the Fedora maintainer.
+Subject: [PATCH 04/14] Minor changes to reduce packaging changes made by the Fedora maintainer.
  (closes issue #12974)
   Reported by: jcollie
   Patches:

0005-Add-chan_mobile-from-asterisk-addons.patch:

Index: 0005-Add-chan_mobile-from-asterisk-addons.patch
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/F-10/0005-Add-chan_mobile-from-asterisk-addons.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- 0005-Add-chan_mobile-from-asterisk-addons.patch	4 Jan 2009 17:23:22 -0000	1.5
+++ 0005-Add-chan_mobile-from-asterisk-addons.patch	4 Jan 2009 18:58:38 -0000	1.6
@@ -1,7 +1,7 @@
 From 8cc8002094fe880d374a727aa0be389ca68b0342 Mon Sep 17 00:00:00 2001
 From: Jeffrey C. Ollie <jeff at ocjtech.us>
 Date: Mon, 25 Feb 2008 09:23:28 -0600
-Subject: [PATCH 05/13] Add chan_mobile from asterisk-addons.
+Subject: [PATCH 05/14] Add chan_mobile from asterisk-addons.
 
 ---
  build_tools/menuselect-deps.in |    1 +

0006-Use-pkgconfig-to-check-for-Lua.patch:

Index: 0006-Use-pkgconfig-to-check-for-Lua.patch
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/F-10/0006-Use-pkgconfig-to-check-for-Lua.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- 0006-Use-pkgconfig-to-check-for-Lua.patch	4 Jan 2009 17:23:22 -0000	1.5
+++ 0006-Use-pkgconfig-to-check-for-Lua.patch	4 Jan 2009 18:58:38 -0000	1.6
@@ -1,7 +1,7 @@
 From d633181f75ea7dc879e8ac9d014cf1fc0fe364ef Mon Sep 17 00:00:00 2001
 From: Jeffrey C. Ollie <jeff at ocjtech.us>
 Date: Mon, 25 Feb 2008 13:14:23 -0600
-Subject: [PATCH 06/13] Use pkgconfig to check for Lua.
+Subject: [PATCH 06/14] Use pkgconfig to check for Lua.
 
 ---
  configure.ac |    9 ++++++++-

0007-Build-using-external-libedit.patch:

Index: 0007-Build-using-external-libedit.patch
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/F-10/0007-Build-using-external-libedit.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- 0007-Build-using-external-libedit.patch	4 Jan 2009 17:23:22 -0000	1.5
+++ 0007-Build-using-external-libedit.patch	4 Jan 2009 18:58:38 -0000	1.6
@@ -1,7 +1,7 @@
 From a50090dc47540b5c3df28c9846fe753f5476c4fc Mon Sep 17 00:00:00 2001
 From: Jeffrey C. Ollie <jeff at ocjtech.us>
 Date: Tue, 25 Mar 2008 00:50:27 -0500
-Subject: [PATCH 07/13] Build using external libedit.
+Subject: [PATCH 07/14] Build using external libedit.
 
 ---
  build_tools/menuselect-deps.in |    1 +

0008-Revert-changes-to-pbx_lua-from-rev-126363-that-cause.patch:

Index: 0008-Revert-changes-to-pbx_lua-from-rev-126363-that-cause.patch
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/F-10/0008-Revert-changes-to-pbx_lua-from-rev-126363-that-cause.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- 0008-Revert-changes-to-pbx_lua-from-rev-126363-that-cause.patch	4 Jan 2009 17:23:22 -0000	1.2
+++ 0008-Revert-changes-to-pbx_lua-from-rev-126363-that-cause.patch	4 Jan 2009 18:58:38 -0000	1.3
@@ -1,7 +1,7 @@
 From a092080315b7bfa9b7d174b6114cb957ac1590d8 Mon Sep 17 00:00:00 2001
 From: Jeffrey C. Ollie <jeff at ocjtech.us>
 Date: Fri, 10 Oct 2008 11:54:10 -0500
-Subject: [PATCH 08/13] Revert changes to pbx_lua from rev 126363 that cause some problems.
+Subject: [PATCH 08/14] Revert changes to pbx_lua from rev 126363 that cause some problems.
 
 ---
  pbx/pbx_lua.c |    6 +++---

0009-change-configure.ac-to-look-for-pkg-config-gmime-2.4.patch:

Index: 0009-change-configure.ac-to-look-for-pkg-config-gmime-2.4.patch
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/F-10/0009-change-configure.ac-to-look-for-pkg-config-gmime-2.4.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- 0009-change-configure.ac-to-look-for-pkg-config-gmime-2.4.patch	4 Jan 2009 17:23:22 -0000	1.2
+++ 0009-change-configure.ac-to-look-for-pkg-config-gmime-2.4.patch	4 Jan 2009 18:58:38 -0000	1.3
@@ -1,7 +1,7 @@
 From 7719af5a016f40f573c90aae17910f7f77b9b4e6 Mon Sep 17 00:00:00 2001
 From: Caolan McNamara <caolanm at redhat.com>
 Date: Sat, 3 Jan 2009 19:06:18 -0600
-Subject: [PATCH 09/13] change configure.ac to look for pkg-config gmime-2.4 instead of gmime-2.4 gmime-config
+Subject: [PATCH 09/14] change configure.ac to look for pkg-config gmime-2.4 instead of gmime-2.4 gmime-config
 
 ---
  configure.ac |   12 +++++++++++-

0010-fix-the-AST_PROG_SED-problem-that-makes-.-bootstrap.patch:

Index: 0010-fix-the-AST_PROG_SED-problem-that-makes-.-bootstrap.patch
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/F-10/0010-fix-the-AST_PROG_SED-problem-that-makes-.-bootstrap.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- 0010-fix-the-AST_PROG_SED-problem-that-makes-.-bootstrap.patch	4 Jan 2009 17:23:22 -0000	1.2
+++ 0010-fix-the-AST_PROG_SED-problem-that-makes-.-bootstrap.patch	4 Jan 2009 18:58:38 -0000	1.3
@@ -1,7 +1,7 @@
 From 9a6c4641b2aa353c9076df9794d72fba5acdafb0 Mon Sep 17 00:00:00 2001
 From: Caolan McNamara <caolanm at redhat.com>
 Date: Sat, 3 Jan 2009 19:12:18 -0600
-Subject: [PATCH 10/13] fix the AST_PROG_SED problem that makes ./bootstrap.sh fail
+Subject: [PATCH 10/14] fix the AST_PROG_SED problem that makes ./bootstrap.sh fail
 
 Need to regenerate configure from configure.ac after patch one with
 ./bootsrap.sh, so fix the broken .m4 in the autoconfig dir. (alternatively

0011-Merged-revisions-160170-160172-via-svnmerge-from.patch:

Index: 0011-Merged-revisions-160170-160172-via-svnmerge-from.patch
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/F-10/0011-Merged-revisions-160170-160172-via-svnmerge-from.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- 0011-Merged-revisions-160170-160172-via-svnmerge-from.patch	4 Jan 2009 17:23:22 -0000	1.2
+++ 0011-Merged-revisions-160170-160172-via-svnmerge-from.patch	4 Jan 2009 18:58:38 -0000	1.3
@@ -1,7 +1,7 @@
 From c38fa4eb3cf989c110a737058c46a916ebab19c8 Mon Sep 17 00:00:00 2001
 From: seanbright <seanbright at f38db490-d61c-443f-a65b-d21fe96a405b>
 Date: Mon, 1 Dec 2008 23:41:16 +0000
-Subject: [PATCH 11/13] Merged revisions 160170-160172 via svnmerge from
+Subject: [PATCH 11/14] Merged revisions 160170-160172 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/trunk
 
 ................

0012-Merged-revisions-162275-via-svnmerge-from.patch:

Index: 0012-Merged-revisions-162275-via-svnmerge-from.patch
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/F-10/0012-Merged-revisions-162275-via-svnmerge-from.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 0012-Merged-revisions-162275-via-svnmerge-from.patch	4 Jan 2009 17:23:22 -0000	1.1
+++ 0012-Merged-revisions-162275-via-svnmerge-from.patch	4 Jan 2009 18:58:38 -0000	1.2
@@ -1,7 +1,7 @@
 From 986c677766137383378252947eafb3eb8c86718a Mon Sep 17 00:00:00 2001
 From: file <file at f38db490-d61c-443f-a65b-d21fe96a405b>
 Date: Tue, 9 Dec 2008 20:47:11 +0000
-Subject: [PATCH 12/13] Merged revisions 162275 via svnmerge from
+Subject: [PATCH 12/14] Merged revisions 162275 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/trunk
 
 ................

0013-Update-autoconf.patch:

Index: 0013-Update-autoconf.patch
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/F-10/0013-Update-autoconf.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 0013-Update-autoconf.patch	4 Jan 2009 17:23:24 -0000	1.1
+++ 0013-Update-autoconf.patch	4 Jan 2009 18:58:38 -0000	1.2
@@ -1,7 +1,7 @@
 From 249cd4bd1b4b9a0b99a07d44359e098c10dacbdb Mon Sep 17 00:00:00 2001
 From: Jeffrey C. Ollie <jeff at ocjtech.us>
 Date: Sun, 4 Jan 2009 00:37:02 -0600
-Subject: [PATCH 13/13] Update autoconf.
+Subject: [PATCH 13/14] Update autoconf.
 
 ---
  configure                        |23025 ++++++++++++++++++++------------------


Index: asterisk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/F-10/asterisk.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- asterisk.spec	4 Jan 2009 17:23:24 -0000	1.39
+++ asterisk.spec	4 Jan 2009 18:58:38 -0000	1.40
@@ -3,7 +3,7 @@
 Summary: The Open Source PBX
 Name: asterisk
 Version: 1.6.0.2
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2
 Group: Applications/Internet
 URL: http://www.asterisk.org/
@@ -46,6 +46,7 @@
 Patch11: 0011-Merged-revisions-160170-160172-via-svnmerge-from.patch
 Patch12: 0012-Merged-revisions-162275-via-svnmerge-from.patch
 Patch13: 0013-Update-autoconf.patch
+Patch14: 0014-Fix-up-some-paths.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
 
@@ -423,6 +424,7 @@
 %patch11 -p1
 %patch12 -p1
 %patch13 -p1
+%patch14 -p1
 
 cp %{SOURCE2} menuselect.makedeps
 cp %{SOURCE3} menuselect.makeopts
@@ -521,8 +523,10 @@
 mkdir -p %{buildroot}%{_datadir}/asterisk/sounds/
 mkdir -p %{buildroot}%{_localstatedir}/lib/asterisk
 mkdir -p %{buildroot}%{_localstatedir}/log/asterisk/cdr-custom/
+mkdir -p %{buildroot}%{_localstatedir}/spool/asterisk/festival/
 mkdir -p %{buildroot}%{_localstatedir}/spool/asterisk/monitor/
 mkdir -p %{buildroot}%{_localstatedir}/spool/asterisk/outgoing/
+mkdir -p %{buildroot}%{_localstatedir}/spool/asterisk/uploads/
 
 # We're not going to package any of the sample AGI scripts
 rm -f %{buildroot}%{_datadir}/asterisk/agi-bin/*
@@ -687,7 +691,6 @@
 %{_libdir}/asterisk/modules/func_callerid.so
 %{_libdir}/asterisk/modules/func_cdr.so
 %{_libdir}/asterisk/modules/func_channel.so
-%{_libdir}/asterisk/modules/func_curl.so
 %{_libdir}/asterisk/modules/func_cut.so
 %{_libdir}/asterisk/modules/func_db.so
 %{_libdir}/asterisk/modules/func_devstate.so
@@ -825,6 +828,7 @@
 %attr(0770,asterisk,asterisk) %dir %{_localstatedir}/spool/asterisk/monitor/
 %attr(0770,asterisk,asterisk) %dir %{_localstatedir}/spool/asterisk/outgoing/
 %attr(0750,asterisk,asterisk) %dir %{_localstatedir}/spool/asterisk/tmp/
+%attr(0750,asterisk,asterisk) %dir %{_localstatedir}/spool/asterisk/uploads/
 %attr(0750,asterisk,asterisk) %dir %{_localstatedir}/spool/asterisk/voicemail/
 
 %attr(0755,asterisk,asterisk) %dir %{_localstatedir}/run/asterisk
@@ -886,6 +890,7 @@
 %files festival
 %defattr(-,root,root,-)
 %config(noreplace) %{_sysconfdir}/asterisk/festival.conf
+%attr(0750,asterisk,asterisk) %dir %{_localstatedir}/spool/asterisk/festival/
 %{_libdir}/asterisk/modules/app_festival.so
 
 %files firmware
@@ -1032,6 +1037,10 @@
 %{_libdir}/asterisk/modules/app_voicemail_plain.so
 
 %changelog
+* Sun Jan  4 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6.0.2-3
+- Don't package func_curl in the main package. BZ#475910
+- Fix up paths. BZ#477238
+
 * Sun Jan  4 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6.0.2-2
 - Add patch to fix compilation on PPC
 



From jcollie at fedoraproject.org  Sun Jan  4 19:19:48 2009
From: jcollie at fedoraproject.org (Jeffrey C. Ollie)
Date: Sun,  4 Jan 2009 19:19:48 +0000 (UTC)
Subject: rpms/asterisk/devel 0012-Fix-up-some-paths.patch, NONE,
	1.1 0001-Modify-init-scripts-for-better-Fedora-compatibility.patch,
	1.7,
	1.8 0002-Modify-modules.conf-so-that-different-voicemail-modu.patch, 
	1.7, 1.8 0003-Add-chan_mobile-from-asterisk-addons.patch, 1.3,
	1.4 0004-Use-pkgconfig-to-check-for-Lua.patch, 1.3,
	1.4 0005-Build-using-external-libedit.patch, 1.2,
	1.3 0006-Revert-changes-to-pbx_lua-from-rev-126363-that-cause.patch, 
	1.2, 1.3 0007-Define-missing-variable-when-compiling-on-PPC.patch,
	1.1,
	1.2 0008-change-configure.ac-to-look-for-pkg-config-gmime-2.4.patch, 
	1.1,
	1.2 0009-fix-the-AST_PROG_SED-problem-that-makes-.-bootstrap.patch,
	1.1,
	1.2 0010-my-guess-as-replacements-for-the-missing-broken-stuf.patch, 
	1.1, 1.2 0011-Update-autoconf.patch, 1.1, 1.2 asterisk.spec,
	1.44, 1.45
Message-ID: <20090104191948.3985870130@cvs1.fedora.phx.redhat.com>

Author: jcollie

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

Modified Files:
	0001-Modify-init-scripts-for-better-Fedora-compatibility.patch 
	0002-Modify-modules.conf-so-that-different-voicemail-modu.patch 
	0003-Add-chan_mobile-from-asterisk-addons.patch 
	0004-Use-pkgconfig-to-check-for-Lua.patch 
	0005-Build-using-external-libedit.patch 
	0006-Revert-changes-to-pbx_lua-from-rev-126363-that-cause.patch 
	0007-Define-missing-variable-when-compiling-on-PPC.patch 
	0008-change-configure.ac-to-look-for-pkg-config-gmime-2.4.patch 
	0009-fix-the-AST_PROG_SED-problem-that-makes-.-bootstrap.patch 
	0010-my-guess-as-replacements-for-the-missing-broken-stuf.patch 
	0011-Update-autoconf.patch asterisk.spec 
Added Files:
	0012-Fix-up-some-paths.patch 
Log Message:
* Sun Jan  4 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6.1-0.10.beta4
- Fix up paths. BZ#477238


0012-Fix-up-some-paths.patch:

--- NEW FILE 0012-Fix-up-some-paths.patch ---
>From 561e2656fc6f73d256419aaa025ce391e67a96e6 Mon Sep 17 00:00:00 2001
From: Jeffrey C. Ollie <jeff at ocjtech.us>
Date: Sun, 4 Jan 2009 12:51:05 -0600
Subject: [PATCH 12/12] Fix up some paths.

---
 UPGRADE-1.4.txt                             |    2 +-
 configs/festival.conf.sample                |    2 +-
 configs/http.conf.sample                    |    6 ++--
 configs/iax.conf.sample                     |    4 +-
 configs/musiconhold.conf.sample             |   10 ++++----
 configs/osp.conf.sample                     |    4 +-
 configs/phoneprov.conf.sample               |    2 +-
 contrib/scripts/astgenkey                   |    2 +-
 contrib/scripts/astgenkey.8                 |    6 ++--
 doc/osp.txt                                 |    8 +++---
 doc/tex/phoneprov.tex                       |    2 +-
 doc/tex/privacy.tex                         |    6 ++--
 pbx/ael/ael-test/ael-test3/extensions.ael   |   28 +++++++++++++-------------
 pbx/ael/ael-test/ael-vtest13/extensions.ael |   28 +++++++++++++-------------
 pbx/ael/ael-test/ref.ael-vtest13            |   26 ++++++++++++------------
 15 files changed, 68 insertions(+), 68 deletions(-)

diff --git a/UPGRADE-1.4.txt b/UPGRADE-1.4.txt
index 4f82694..69bf322 100644
--- a/UPGRADE-1.4.txt
+++ b/UPGRADE-1.4.txt
@@ -92,7 +92,7 @@ sound packages in the 'sounds' subdirectory to be used later during installation
 WARNING: Asterisk 1.4 supports a new layout for sound files in multiple languages;
 instead of the alternate-language files being stored in subdirectories underneath
 the existing files (for French, that would be digits/fr, letters/fr, phonetic/fr,
-etc.) the new layout creates one directory under /var/lib/asterisk/sounds for the
+etc.) the new layout creates one directory under /usr/share/asterisk/sounds for the
 language itself, then places all the sound files for that language under that
 directory and its subdirectories. This is the layout that will be created if you
 select non-English languages to be installed via menuselect, HOWEVER Asterisk does
diff --git a/configs/festival.conf.sample b/configs/festival.conf.sample
index 774f1a1..815f11d 100644
--- a/configs/festival.conf.sample
+++ b/configs/festival.conf.sample
@@ -21,7 +21,7 @@
 ; THIS DIRECTORY *MUST* EXIST and must be writable from the asterisk process.
 ; Defaults to /tmp/
 ;
-;cachedir=/var/lib/asterisk/festivalcache/
+;cachedir=/var/spool/asterisk/festival/
 ;
 ; Festival command to send to the server.
 ; Defaults to: (tts_textasterisk "%s" 'file)(quit)\n
diff --git a/configs/http.conf.sample b/configs/http.conf.sample
index f15c9cf..6349905 100644
--- a/configs/http.conf.sample
+++ b/configs/http.conf.sample
@@ -5,7 +5,7 @@
 ; Note about Asterisk documentation:
 ;   If Asterisk was installed from a tarball, then the HTML documentation should
 ;   be installed in the static-http/docs directory which is
-;   (/var/lib/asterisk/static-http/docs) on linux by default.  If the Asterisk
+;   (/usr/share/asterisk/static-http/docs) on linux by default.  If the Asterisk
 ;   HTTP server is enabled in this file by setting the "enabled", "bindaddr",
 ;   and "bindport" options, then you should be able to view the documentation
 ;   remotely by browsing to:
@@ -66,6 +66,6 @@ bindaddr=127.0.0.1
 ;[post_mappings]
 ;
 ; In this example, if the prefix option is set to "asterisk", then using the
-; POST URL: /asterisk/uploads will put files in /var/lib/asterisk/uploads/.
-;uploads = /var/lib/asterisk/uploads/
+; POST URL: /asterisk/uploads will put files in /var/spool/asterisk/uploads/.
+;uploads = /var/spool/asterisk/uploads/
 ;
diff --git a/configs/iax.conf.sample b/configs/iax.conf.sample
index dc3c465..69de2b4 100644
--- a/configs/iax.conf.sample
+++ b/configs/iax.conf.sample
@@ -361,8 +361,8 @@ inkeys=freeworlddialup
 ; authentication is used, "inkeys" is a list of acceptable public keys on the 
 ; local system that can be used to authenticate the remote peer, separated by
 ; the ":" character.  "outkey" is a single, private key to use to authenticate
-; to the other side.  Public keys are named /var/lib/asterisk/keys/<name>.pub
-; while private keys are named /var/lib/asterisk/keys/<name>.key.  Private
+; to the other side.  Public keys are named /usr/share/asterisk/keys/<name>.pub
+; while private keys are named /usr/share/asterisk/keys/<name>.key.  Private
 ; keys should always be 3DES encrypted.
 ;
 ;
diff --git a/configs/musiconhold.conf.sample b/configs/musiconhold.conf.sample
index 4df1afd..b730335 100644
--- a/configs/musiconhold.conf.sample
+++ b/configs/musiconhold.conf.sample
@@ -39,11 +39,11 @@
 
 [default]
 mode=files
-directory=/var/lib/asterisk/moh
+directory=/usr/share/asterisk/moh
 ;
 ;[native-random]
 ;mode=files
-;directory=/var/lib/asterisk/moh
+;directory=/usr/share/asterisk/moh
 ;digit=#        ; If this option is set for a class, then when callers are
 ;               ; listening to music on hold, they can press this digit, and
 ;               ; they will switch to listening to this music class.
@@ -51,7 +51,7 @@ directory=/var/lib/asterisk/moh
 
 ;[native-alphabetical]
 ;mode=files
-;directory=/var/lib/asterisk/moh
+;directory=/usr/share/asterisk/moh
 ;sort=alpha     ; Sort the files in alphabetical order.  If this option is
 ;               ; not specified, the sort order is undefined.
 
@@ -63,7 +63,7 @@ directory=/var/lib/asterisk/moh
 ;mode=custom
 ; Note that with mode=custom, a directory is not required, such as when reading
 ; from a stream.
-;directory=/var/lib/asterisk/mohmp3
+;directory=/usr/share/asterisk/mohmp3
 ;application=/usr/bin/mpg123 -q -r 8000 -f 8192 -b 2048 --mono -s
 
 ;[ulawstream]
@@ -75,5 +75,5 @@ directory=/var/lib/asterisk/moh
 ; choice
 ;[solaris]
 ;mode=custom
-;directory=/var/lib/asterisk/mohmp3
+;directory=/usr/share/asterisk/mohmp3
 ;application=/site/sw/bin/madplay -Q -o raw:- --mono -R 8000 -a -12
diff --git a/configs/osp.conf.sample b/configs/osp.conf.sample
index e342337..2e346e6 100644
--- a/configs/osp.conf.sample
+++ b/configs/osp.conf.sample
@@ -36,8 +36,8 @@
 ;source=domain name or [IP address in brackets]
 ;
 ; Define path and file name of crypto files.
-; The default path for crypto file is /var/lib/asterisk/keys.  If no path is 
-; defined, crypto files will in /var/lib/asterisk/keys directory.
+; The default path for crypto file is /usr/share/asterisk/keys.  If no path is 
+; defined, crypto files will in /usr/share/asterisk/keys directory.
 ;
 ; Specify the private key file name.  
 ; If this parameter is unspecified or not present, the default name will be the 
diff --git a/configs/phoneprov.conf.sample b/configs/phoneprov.conf.sample
index 8f55fa8..2608914 100644
--- a/configs/phoneprov.conf.sample
+++ b/configs/phoneprov.conf.sample
@@ -57,4 +57,4 @@ ${TOLOWER(${MAC})}.cfg => 000000000000.cfg               ; Dynamically generated
 ${TOLOWER(${MAC})}-phone.cfg => 000000000000-phone.cfg   ; (relative to AST_DATA_DIR/phoneprov)
 config/${TOLOWER(${MAC})} => polycom.xml                 ; Dynamic Filename => template file 
 ${TOLOWER(${MAC})}-directory.xml => 000000000000-directory.xml
-setvar => CUSTOM_CONFIG=/var/lib/asterisk/phoneprov/configs/custom.cfg  ; Custom variable
+setvar => CUSTOM_CONFIG=/usr/share/asterisk/phoneprov/configs/custom.cfg  ; Custom variable
diff --git a/contrib/scripts/astgenkey b/contrib/scripts/astgenkey
index 6376048..e4a5a80 100644
--- a/contrib/scripts/astgenkey
+++ b/contrib/scripts/astgenkey
@@ -29,7 +29,7 @@ if [ "$QUIET" != 'y' ]; then
 	echo "in PEM format for use by Asterisk.  You will be asked to"
 	echo "enter a passcode for your key multiple times.  Please"
 	echo "enter the same code each time.  The resulting files will"
-	echo "need to be moved to /var/lib/asterisk/keys if you want"
+	echo "need to be moved to /usr/share/asterisk/keys if you want"
 	echo "to use them, and any private keys (.key files) will"
 	echo "need to be initialized at runtime either by running"
 	echo "Asterisk with the '-i' option, or with the 'init keys'"
diff --git a/contrib/scripts/astgenkey.8 b/contrib/scripts/astgenkey.8
index 328a4d2..ac6feae 100644
--- a/contrib/scripts/astgenkey.8
+++ b/contrib/scripts/astgenkey.8
@@ -88,7 +88,7 @@ The private key: secret.
 .RE
 
 Those files should be copied to 
-.I /var/lib/asterisk/keys
+.I /usr/share/asterisk/keys
 
 (The private key: on your system. The public key: on other systems)
 
@@ -122,10 +122,10 @@ readable, such as with the following commands:
 And then make the key accessible to Asterisk (assuming you run it as
 user "asterisk").
 
-  chown asterisk /var/lib/asterisk/keys/yourname.*
+  chown asterisk /usr/share/asterisk/keys/yourname.*
 
 .SH FILES
-.I /var/lib/asterisk/keys
+.I /usr/share/asterisk/keys
 .RS
 .RE
 
diff --git a/doc/osp.txt b/doc/osp.txt
index a0cd429..932f214 100644
--- a/doc/osp.txt
+++ b/doc/osp.txt
@@ -136,7 +136,7 @@ make clean; make linux
 Compilation is successful if there are no errors in the compiler output. The enroll program is now located in the OSP Toolkit/bin directory (example: /usr/src/ TK-3_3_6-20060303/bin). 
 
 2.2 Obtain Crypto Files
-The OSP module in Asterisk requires three crypto files containing a local certificate (localcert.pem), private key (pkey.pem), and CA certificate (cacert_0.pem).  Asterisk will try to load the files from the Asterisk public/private key directory - /var/lib/asterisk/keys.  If the files are not present, the OSP module will not start and the Asterisk will not support the OSP protocol.  Use the enroll.sh script from the toolkit distribution to enroll Asterisk with an OSP server and obtain the crypto files.  Documentation explaining how to use the enroll.sh script (Device Enrollment) to enroll with an OSP server is available at http://www.transnexus.com/OSP%20Toolkit/OSP%20Toolkit%20Documents/Device_Enrollment.pdf.  Copy the files generated by the enrollment process to the Asterisk /var/lib/asterisk/keys directory.  
+The OSP module in Asterisk requires three crypto files containing a local certificate (localcert.pem), private key (pkey.pem), and CA certificate (cacert_0.pem).  Asterisk will try to load the files from the Asterisk public/private key directory - /usr/share/asterisk/keys.  If the files are not present, the OSP module will not start and the Asterisk will not support the OSP protocol.  Use the enroll.sh script from the toolkit distribution to enroll Asterisk with an OSP server and obtain the crypto files.  Documentation explaining how to use the enroll.sh script (Device Enrollment) to enroll with an OSP server is available at http://www.transnexus.com/OSP%20Toolkit/OSP%20Toolkit%20Documents/Device_Enrollment.pdf.  Copy the files generated by the enrollment process to the Asterisk /usr/share/asterisk/keys directory.  
 
 Note: The osptestserver.transnexus.com is configured only for sending and receiving non-SSL messages, and issuing signed tokens. If you need help, post a message on the OSP mailing list at https://lists.sourceforge.net/lists/listinfo/osp-toolkit-client..
 
@@ -183,7 +183,7 @@ depth=0 /CN=osptestserver.transnexus.com/O=OSPServer
 verify return:1
 The certificate request was successful.
 Error Code returned from localcert command : 0
-The files generated should be copied to the /var/lib/asterisk/keys directory. 
+The files generated should be copied to the /usr/share/asterisk/keys directory. 
 Note: The script enroll.sh requires AT&T korn shell (ksh) or any of its compatible variants. The /usr/src/TK-3_3_6-20060303/bin directory should be in the PATH variable. Otherwise, enroll.sh cannot find the enroll file.
 
 3 Asterisk
@@ -247,9 +247,9 @@ servicepoint=http://OSP server IP:1080/osp
 source=[host IP]
 ;
 ; Define path and file name of crypto files.
-; The default path for crypto file is /var/lib/asterisk/keys.  If no
+; The default path for crypto file is /usr/share/asterisk/keys.  If no
 ; path is defined, crypto files should be in  
-; /var/lib/asterisk/keys directory.
+; /usr/share/asterisk/keys directory.
 ;
 ; Specify the private key file name.  
 ; If this parameter is unspecified or not present, the default name 
diff --git a/doc/tex/phoneprov.tex b/doc/tex/phoneprov.tex
index cb236a8..be01d34 100644
--- a/doc/tex/phoneprov.tex
+++ b/doc/tex/phoneprov.tex
@@ -58,7 +58,7 @@ files, respectively. A sample profile:
 [polycom]
 staticdir => configs/
 mime_type => text/xml
-setvar => CUSTOM_CONFIG=/var/lib/asterisk/phoneprov/configs/custom.cfg
+setvar => CUSTOM_CONFIG=/usr/share/asterisk/phoneprov/configs/custom.cfg
 static_file => bootrom.ld,application/octet-stream
 static_file => bootrom.ver,plain/text
 static_file => sip.ld,application/octet-stream
diff --git a/doc/tex/privacy.tex b/doc/tex/privacy.tex
index a4ae7b9..bad6815 100644
--- a/doc/tex/privacy.tex
+++ b/doc/tex/privacy.tex
@@ -210,7 +210,7 @@ helpful.
 
 When there is no CallerID, P and p options will always record an intro
 for the incoming caller. This intro will be stored temporarily in the
-\path{/var/lib/asterisk/sounds/priv-callerintros} dir, under the name
+\path{/usr/share/asterisk/sounds/priv-callerintros} dir, under the name
 NOCALLERID\_$<$extension$>$ $<$channelname$>$ and will be erased after the
 callee decides what to do with the call.
 
@@ -245,7 +245,7 @@ introductions are stored and re-used for the convenience of the CALLER.
 \subsubsection{Introductions}
 Unless instructed to not save introductions (see the 'n' option above),
 the screening modes will save the recordings of the caller's names in
-the directory \path{/var/lib/asterisk/sounds/priv-callerintros}, if they have
+the directory \path{/usr/share/asterisk/sounds/priv-callerintros}, if they have
 a CallerID.  Just the 10-digit callerid numbers are used as filenames,
 with a ".gsm" at the end.
 
@@ -260,7 +260,7 @@ loudspeakers, and perhaps other nifty things. For instance:
 
 \begin{astlisting}
 \begin{verbatim}
-exten => s,6,Set(PATH=/var/lib/asterisk/sounds/priv-callerintros)
+exten => s,6,Set(PATH=/usr/share/asterisk/sounds/priv-callerintros)
 exten => s,7,System(/usr/bin/play ${PATH}/${CALLERID(num)}.gsm&,0)
 \end{verbatim}
 \end{astlisting}
diff --git a/pbx/ael/ael-test/ael-test3/extensions.ael b/pbx/ael/ael-test/ael-test3/extensions.ael
index ff1f6ae..53fb918 100755
--- a/pbx/ael/ael-test/ael-test3/extensions.ael
+++ b/pbx/ael/ael-test/ael-test3/extensions.ael
@@ -2049,7 +2049,7 @@ macro ciddial2(dialnum, lookup, waittime, dialopts, ddev) // give priority to tc
 
 macro callerid-liar()
 {
-	TrySystem(/usr/bin/play /var/lib/asterisk/sounds/priv-callerintros/LIAR.gsm&);
+	TrySystem(/usr/bin/play /usr/share/asterisk/sounds/priv-callerintros/LIAR.gsm&);
 	Background(priv-liar);  // Script: OOOps! Sorry! I don't allow men with ski masks pulled over their 
                             //         faces to get in the front door, and unidentified callers won't fair
                             //         any better. You entered *MY* phone number. That won't work.
@@ -2106,7 +2106,7 @@ context homeline {
 		PrivacyManager();
 		if( "${PRIVACYMGRSTATUS}" = "FAILED" )
 		{
-			TrySystem(/usr/bin/play /var/lib/asterisk/sounds/privmanfailed.gsm);
+			TrySystem(/usr/bin/play /usr/share/asterisk/sounds/privmanfailed.gsm);
 			&std-priv-exten(Zap/3r1&Zap/5r1,2,25,mtw,telemarket,telemarket);
 			Hangup();
 			return;
@@ -2138,7 +2138,7 @@ context homeline {
 			verbose(direct is XXX#${direct}XXXX);
 			Playback(greetings/direct); // Welcome to the Murphy residence. This system will automatically try to connect you to...
 			Playback(/var/spool/asterisk/voicemail/default/${direct}/greet);
-			TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
+			TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
 			TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/${direct}/greet.wav&);
 			switch(${direct})
 			{
@@ -2223,7 +2223,7 @@ context homeline {
 		
 	}
 	1 => {  // Sonya
-			TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
+			TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
 			TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/2/greet.wav&);
 			&std-priv-exten(Zap/3r1&Zap/5r1,2,25,mtw,telemarket,telemarket);
 			goto s|loopback;
@@ -2421,51 +2421,51 @@ context homeline-kids {
 		Background(murphy-homeline-kids);        //  Which Kid? 1=Sean, 2:Eric, 3:Ryan, 4:Kyle, 5:Amber, 6:Alex, 7:Neal
 	}
 	1 => {  // SEAN
-			TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
+			TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
 			TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/3/greet.wav&);
 			// &std-priv-exten(Zap/3r2&Zap/5r2,3,35,mtw,telemarket,telemarket);
 			&std-priv-exten(IAX2/seaniax&Zap/5r2,3,35,mtw,telemarket,telemarket);
 			goto homeline|s|loopback;
 	}
 	2 => {  // ERIC
-			TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
+			TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
 			TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/4/greet.wav&);
 			Voicemail(u4);
 			goto homeline|s|loopback;
 			
 			// SetMusicOnHold(erics);
-			// TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
+			// TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
 			// TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/4/greet.wav&);
 			// &std-priv-exten(Zap/3r2&Zap/5r2,4,35,mtw,telemarket,telemarket);
 			// goto homeline|s|loopback;
 	}
 	3 => {  // RYAN
-			TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
+			TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
 			TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/5/greet.wav&);
 			&std-priv-exten(Zap/3r2&Zap/5r2,5,35,mtw,telemarket,telemarket);
 			goto homeline|s|loopback;
 	}
 	4 => {  // KYLE
-			TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
+			TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
 			TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/6/greet.wav&);
 			&std-priv-exten(Zap/3r2&Zap/5r2,6,35,mtw,telemarket,telemarket);
 			goto homeline|s|loopback;
 	}
 	5 => {
-			TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
+			TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
 			TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/7/greet.wav&);
 			&std-priv-exten(Zap/3r2&Zap/5r2,7,35,mtw,telemarket,telemarket);
 			goto homeline|s|loopback;
 			
 	}
 	6 => {
-			TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
+			TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
 			TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/8/greet.wav&);
 			&std-priv-exten(Zap/3r2&Zap/5r2,8,35,mtw,telemarket,telemarket);
 			goto homeline|s|loopback;
 	}
 	7 => {
-			TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
+			TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
 			TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/9/greet.wav&);
 			&std-priv-exten(Zap/3r2&Zap/5r2,9,35,mtw,telemarket,telemarket);
 			goto homeline|s|loopback;
@@ -2517,7 +2517,7 @@ context workline {
                                               // Otherwise, dial 1, and hopefully, you will reach Steve.
 	}
 	1 => {
-		TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
+		TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
 		TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/1/greet.wav&);
 		
 		&std-priv-exten(Zap/6&Sip/murf,1,30,mtw,telemarket,telemarket);
@@ -2778,7 +2778,7 @@ context homeext {
 	}
 	761 => {
 		Record(announcement:gsm);
-		TrySystem(/usr/bin/play /var/lib/asterisk/sounds/announcement.gsm&);
+		TrySystem(/usr/bin/play /usr/share/asterisk/sounds/announcement.gsm&);
 		goto s|loopback;
 	}
 	762 => {
diff --git a/pbx/ael/ael-test/ael-vtest13/extensions.ael b/pbx/ael/ael-test/ael-vtest13/extensions.ael
index b7e953e..48baaef 100755
--- a/pbx/ael/ael-test/ael-vtest13/extensions.ael
+++ b/pbx/ael/ael-test/ael-vtest13/extensions.ael
@@ -2048,7 +2048,7 @@ macro ciddial2(dialnum, lookup, waittime, dialopts, ddev) // give priority to tc
 
 macro callerid-liar()
 {
-	TrySystem(/usr/bin/play /var/lib/asterisk/sounds/priv-callerintros/LIAR.gsm&);
+	TrySystem(/usr/bin/play /usr/share/asterisk/sounds/priv-callerintros/LIAR.gsm&);
 	Background(priv-liar);  // Script: OOOps! Sorry! I don't allow men with ski masks pulled over their 
                             //         faces to get in the front door, and unidentified callers won't fair
                             //         any better. You entered *MY* phone number. That won't work.
@@ -2105,7 +2105,7 @@ context homeline {
 		PrivacyManager();
 		if( "${PRIVACYMGRSTATUS}" = "FAILED" )
 		{
-			TrySystem(/usr/bin/play /var/lib/asterisk/sounds/privmanfailed.gsm);
+			TrySystem(/usr/bin/play /usr/share/asterisk/sounds/privmanfailed.gsm);
 			&std-priv-exten(Zap/3r1&Zap/5r1,2,25,mtw,telemarket,telemarket);
 			Hangup();
 			return;
@@ -2137,7 +2137,7 @@ context homeline {
 			verbose(direct is XXX#${direct}XXXX);
 			Playback(greetings/direct); // Welcome to the Murphy residence. This system will automatically try to connect you to...
 			Playback(/var/spool/asterisk/voicemail/default/${direct}/greet);
-			TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
+			TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
 			TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/${direct}/greet.wav&);
 			switch(${direct})
 			{
@@ -2222,7 +2222,7 @@ context homeline {
 		
 	}
 	1 => {  // Sonya
-			TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
+			TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
 			TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/2/greet.wav&);
 			&std-priv-exten(Zap/3r1&Zap/5r1,2,25,mtw,telemarket,telemarket);
 			goto s|loopback;
@@ -2420,51 +2420,51 @@ context homeline-kids {
 		Background(murphy-homeline-kids);        //  Which Kid? 1=Sean, 2:Eric, 3:Ryan, 4:Kyle, 5:Amber, 6:Alex, 7:Neal
 	}
 	1 => {  // SEAN
-			TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
+			TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
 			TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/3/greet.wav&);
 			// &std-priv-exten(Zap/3r2&Zap/5r2,3,35,mtw,telemarket,telemarket);
 			&std-priv-exten(IAX2/seaniax&Zap/5r2,3,35,mtw,telemarket,telemarket);
 			goto homeline|s|loopback;
 	}
 	2 => {  // ERIC
-			TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
+			TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
 			TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/4/greet.wav&);
 			Voicemail(u4);
 			goto homeline|s|loopback;
 			
 			// SetMusicOnHold(erics);
-			// TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
+			// TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
 			// TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/4/greet.wav&);
 			// &std-priv-exten(Zap/3r2&Zap/5r2,4,35,mtw,telemarket,telemarket);
 			// goto homeline|s|loopback;
 	}
 	3 => {  // RYAN
-			TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
+			TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
 			TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/5/greet.wav&);
 			&std-priv-exten(Zap/3r2&Zap/5r2,5,35,mtw,telemarket,telemarket);
 			goto homeline|s|loopback;
 	}
 	4 => {  // KYLE
-			TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
+			TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
 			TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/6/greet.wav&);
 			&std-priv-exten(Zap/3r2&Zap/5r2,6,35,mtw,telemarket,telemarket);
 			goto homeline|s|loopback;
 	}
 	5 => {
-			TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
+			TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
 			TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/7/greet.wav&);
 			&std-priv-exten(Zap/3r2&Zap/5r2,7,35,mtw,telemarket,telemarket);
 			goto homeline|s|loopback;
 			
 	}
 	6 => {
-			TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
+			TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
 			TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/8/greet.wav&);
 			&std-priv-exten(Zap/3r2&Zap/5r2,8,35,mtw,telemarket,telemarket);
 			goto homeline|s|loopback;
 	}
 	7 => {
-			TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
+			TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
 			TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/9/greet.wav&);
 			&std-priv-exten(Zap/3r2&Zap/5r2,9,35,mtw,telemarket,telemarket);
 			goto homeline|s|loopback;
@@ -2516,7 +2516,7 @@ context workline {
                                               // Otherwise, dial 1, and hopefully, you will reach Steve.
 	}
 	1 => {
-		TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
+		TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
 		TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/1/greet.wav&);
 		
 		&std-priv-exten(Zap/6&Sip/murf,1,30,mtw,telemarket,telemarket);
@@ -2777,7 +2777,7 @@ context homeext {
 	}
 	761 => {
 		Record(announcement:gsm);
-		TrySystem(/usr/bin/play /var/lib/asterisk/sounds/announcement.gsm&);
+		TrySystem(/usr/bin/play /usr/share/asterisk/sounds/announcement.gsm&);
 		goto s|loopback;
 	}
 	762 => {
diff --git a/pbx/ael/ael-test/ref.ael-vtest13 b/pbx/ael/ael-test/ref.ael-vtest13
index 07ae29e..70956d4 100644
--- a/pbx/ael/ael-test/ref.ael-vtest13
+++ b/pbx/ael/ael-test/ref.ael-vtest13
@@ -2107,7 +2107,7 @@ exten => s,20,Return()
 
 
 [callerid-liar]
-exten => s,1,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/priv-callerintros/LIAR.gsm&)
+exten => s,1,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/priv-callerintros/LIAR.gsm&)
 exten => s,2,Background(priv-liar)
 exten => s,3,Hangup()
 exten => s,4,Return()
@@ -2142,7 +2142,7 @@ exten => s,3,Set(repeatcount=0)
 exten => s,4,Zapateller(nocallerid)
 exten => s,5,PrivacyManager()
 exten => s,6,GotoIf($["${PRIVACYMGRSTATUS}" = "FAILED" ]?7:11)
-exten => s,7,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/privmanfailed.gsm)
+exten => s,7,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/privmanfailed.gsm)
 exten => s,8,Gosub(std-priv-exten,s,1(Zap/3r1&Zap/5r1,2,25,mtw,telemarket,telemarket))
 exten => s,9,Hangup()
 exten => s,10,Return()
@@ -2168,7 +2168,7 @@ exten => s,29,GotoIf($["${direct}" != "" & ${direct} != 0 ]?30:37)
 exten => s,30,verbose(direct is XXX#${direct}XXXX)
 exten => s,31,Playback(greetings/direct)
 exten => s,32,Playback(/var/spool/asterisk/voicemail/default/${direct}/greet)
-exten => s,33,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm)
+exten => s,33,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm)
 exten => s,34,TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/${direct}/greet.wav&)
 exten => s,35,Goto(sw-92-${direct},10)
 exten => s,36,NoOp(Finish switch-if-homeline-91-92)
@@ -2247,7 +2247,7 @@ exten => sw-92-2,10,Gosub(std-priv-exten,s,1(Zap/3r1&Zap/5r1,2,25,mtw,telemarket
 exten => sw-92-2,11,Goto(s,loopback)
 exten => sw-92-1,10,Gosub(std-priv-exten,s,1(Zap/6r3&Sip/murf,1,25,mpA(beep)tw,telemarket,telemarket))
 exten => sw-92-1,11,Goto(s,loopback)
-exten => 1,1,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm)
+exten => 1,1,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm)
 exten => 1,2,TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/2/greet.wav&)
 exten => 1,3,Gosub(std-priv-exten,s,1(Zap/3r1&Zap/5r1,2,25,mtw,telemarket,telemarket))
 exten => 1,4,Goto(s,loopback)
@@ -2324,31 +2324,31 @@ exten => o,1,Goto(s,begin)
 
 [homeline-kids]
 exten => s,1(begin),Background(murphy-homeline-kids)
-exten => 1,1,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm)
+exten => 1,1,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm)
 exten => 1,2,TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/3/greet.wav&)
 exten => 1,3,Gosub(std-priv-exten,s,1(IAX2/seaniax&Zap/5r2,3,35,mtw,telemarket,telemarket))
 exten => 1,4,Goto(homeline,s,loopback)
-exten => 2,1,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm)
+exten => 2,1,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm)
 exten => 2,2,TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/4/greet.wav&)
 exten => 2,3,Voicemail(u4)
 exten => 2,4,Goto(homeline,s,loopback)
-exten => 3,1,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm)
+exten => 3,1,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm)
 exten => 3,2,TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/5/greet.wav&)
 exten => 3,3,Gosub(std-priv-exten,s,1(Zap/3r2&Zap/5r2,5,35,mtw,telemarket,telemarket))
 exten => 3,4,Goto(homeline,s,loopback)
-exten => 4,1,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm)
+exten => 4,1,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm)
 exten => 4,2,TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/6/greet.wav&)
 exten => 4,3,Gosub(std-priv-exten,s,1(Zap/3r2&Zap/5r2,6,35,mtw,telemarket,telemarket))
 exten => 4,4,Goto(homeline,s,loopback)
-exten => 5,1,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm)
+exten => 5,1,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm)
 exten => 5,2,TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/7/greet.wav&)
 exten => 5,3,Gosub(std-priv-exten,s,1(Zap/3r2&Zap/5r2,7,35,mtw,telemarket,telemarket))
 exten => 5,4,Goto(homeline,s,loopback)
-exten => 6,1,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm)
+exten => 6,1,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm)
 exten => 6,2,TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/8/greet.wav&)
 exten => 6,3,Gosub(std-priv-exten,s,1(Zap/3r2&Zap/5r2,8,35,mtw,telemarket,telemarket))
 exten => 6,4,Goto(homeline,s,loopback)
-exten => 7,1,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm)
+exten => 7,1,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm)
 exten => 7,2,TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/9/greet.wav&)
 exten => 7,3,Gosub(std-priv-exten,s,1(Zap/3r2&Zap/5r2,9,35,mtw,telemarket,telemarket))
 exten => 7,4,Goto(homeline,s,loopback)
@@ -2376,7 +2376,7 @@ exten => s,5,Gosub(fillcidname,s,1)
 exten => s,6,TrySystem(/usr/local/bin/who-is-it ${CALLERID(num)} "${CALLERID(name)}"&)
 exten => s,7(loopback),Background(greetings/greeting)
 exten => s,8,Background(murphy-office-intro1)
-exten => 1,1,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm)
+exten => 1,1,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm)
 exten => 1,2,TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/1/greet.wav&)
 exten => 1,3,Gosub(std-priv-exten,s,1(Zap/6&Sip/murf,1,30,mtw,telemarket,telemarket))
 exten => 1,4,Goto(s,loopback)
@@ -2502,7 +2502,7 @@ exten => 6,1,Background(recording)
 exten => 760,1,DateTime()
 exten => 760,2,Goto(s,loopback)
 exten => 761,1,Record(announcement:gsm)
-exten => 761,2,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/announcement.gsm&)
+exten => 761,2,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/announcement.gsm&)
 exten => 761,3,Goto(s,loopback)
 exten => 762,1,agi(tts-riddle.agi)
 exten => 762,2,Background(gsm/what-time-it-is2)
-- 
1.6.1


0001-Modify-init-scripts-for-better-Fedora-compatibility.patch:

Index: 0001-Modify-init-scripts-for-better-Fedora-compatibility.patch
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/devel/0001-Modify-init-scripts-for-better-Fedora-compatibility.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- 0001-Modify-init-scripts-for-better-Fedora-compatibility.patch	4 Jan 2009 05:52:31 -0000	1.7
+++ 0001-Modify-init-scripts-for-better-Fedora-compatibility.patch	4 Jan 2009 19:19:14 -0000	1.8
@@ -1,7 +1,7 @@
 From d397bc03e86335ed571121fa501dfefdc2ddbd4c Mon Sep 17 00:00:00 2001
 From: Jeffrey C. Ollie <jeff at ocjtech.us>
 Date: Sun, 18 Nov 2007 21:47:59 -0600
-Subject: [PATCH 01/11] Modify init scripts for better Fedora compatibility.
+Subject: [PATCH 01/12] Modify init scripts for better Fedora compatibility.
 
 ---
  contrib/init.d/rc.redhat.asterisk |   61 +++++++++++++++++-------------------

0002-Modify-modules.conf-so-that-different-voicemail-modu.patch:

Index: 0002-Modify-modules.conf-so-that-different-voicemail-modu.patch
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/devel/0002-Modify-modules.conf-so-that-different-voicemail-modu.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- 0002-Modify-modules.conf-so-that-different-voicemail-modu.patch	4 Jan 2009 05:52:31 -0000	1.7
+++ 0002-Modify-modules.conf-so-that-different-voicemail-modu.patch	4 Jan 2009 19:19:14 -0000	1.8
@@ -1,7 +1,7 @@
 From e5d3f951bfa543e5d8b8cf85535f80b1d1143e09 Mon Sep 17 00:00:00 2001
 From: Jeffrey C. Ollie <jcollie at pc21224.campus.dmacc.edu>
 Date: Thu, 8 Nov 2007 15:52:36 -0600
-Subject: [PATCH 02/11] Modify modules.conf so that different voicemail modules can be loaded.
+Subject: [PATCH 02/12] Modify modules.conf so that different voicemail modules can be loaded.
 
 ---
  configs/modules.conf.sample |   26 ++++++++++++++++++++++++++

0003-Add-chan_mobile-from-asterisk-addons.patch:

Index: 0003-Add-chan_mobile-from-asterisk-addons.patch
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/devel/0003-Add-chan_mobile-from-asterisk-addons.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- 0003-Add-chan_mobile-from-asterisk-addons.patch	4 Jan 2009 05:52:31 -0000	1.3
+++ 0003-Add-chan_mobile-from-asterisk-addons.patch	4 Jan 2009 19:19:14 -0000	1.4
@@ -1,7 +1,7 @@
 From aeb688bc0889a4b035fd1590ba8df85af6e0a38c Mon Sep 17 00:00:00 2001
 From: Jeffrey C. Ollie <jeff at ocjtech.us>
 Date: Thu, 16 Oct 2008 16:12:01 -0500
-Subject: [PATCH 03/11] Add chan_mobile from asterisk-addons.
+Subject: [PATCH 03/12] Add chan_mobile from asterisk-addons.
 
 ---
  build_tools/menuselect-deps.in |    1 +

0004-Use-pkgconfig-to-check-for-Lua.patch:

Index: 0004-Use-pkgconfig-to-check-for-Lua.patch
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/devel/0004-Use-pkgconfig-to-check-for-Lua.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- 0004-Use-pkgconfig-to-check-for-Lua.patch	4 Jan 2009 05:52:31 -0000	1.3
+++ 0004-Use-pkgconfig-to-check-for-Lua.patch	4 Jan 2009 19:19:15 -0000	1.4
@@ -1,7 +1,7 @@
 From 24b4e78b81a06375e233ccc7745d5d3bc5b1cc7e Mon Sep 17 00:00:00 2001
 From: Jeffrey C. Ollie <jeff at ocjtech.us>
 Date: Mon, 25 Feb 2008 13:14:23 -0600
-Subject: [PATCH 04/11] Use pkgconfig to check for Lua.
+Subject: [PATCH 04/12] Use pkgconfig to check for Lua.
 
 ---
  configure.ac |    9 ++++++++-

0005-Build-using-external-libedit.patch:

Index: 0005-Build-using-external-libedit.patch
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/devel/0005-Build-using-external-libedit.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- 0005-Build-using-external-libedit.patch	4 Jan 2009 05:52:31 -0000	1.2
+++ 0005-Build-using-external-libedit.patch	4 Jan 2009 19:19:15 -0000	1.3
@@ -1,7 +1,7 @@
 From 1fc4e0fd9d7d24fd087a1c0d6f4dff5a1fec010f Mon Sep 17 00:00:00 2001
 From: Jeffrey C. Ollie <jeff at ocjtech.us>
 Date: Tue, 25 Mar 2008 00:50:27 -0500
-Subject: [PATCH 05/11] Build using external libedit.
+Subject: [PATCH 05/12] Build using external libedit.
 
 ---
  build_tools/menuselect-deps.in |    1 +

0006-Revert-changes-to-pbx_lua-from-rev-126363-that-cause.patch:

Index: 0006-Revert-changes-to-pbx_lua-from-rev-126363-that-cause.patch
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/devel/0006-Revert-changes-to-pbx_lua-from-rev-126363-that-cause.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- 0006-Revert-changes-to-pbx_lua-from-rev-126363-that-cause.patch	4 Jan 2009 05:52:31 -0000	1.2
+++ 0006-Revert-changes-to-pbx_lua-from-rev-126363-that-cause.patch	4 Jan 2009 19:19:15 -0000	1.3
@@ -1,7 +1,7 @@
 From eb9cc1a836086024bb619948468a80c4ff75bed9 Mon Sep 17 00:00:00 2001
 From: Jeffrey C. Ollie <jeff at ocjtech.us>
 Date: Fri, 10 Oct 2008 11:54:10 -0500
-Subject: [PATCH 06/11] Revert changes to pbx_lua from rev 126363 that cause some problems.
+Subject: [PATCH 06/12] Revert changes to pbx_lua from rev 126363 that cause some problems.
 
 ---
  pbx/pbx_lua.c |    6 +++---

0007-Define-missing-variable-when-compiling-on-PPC.patch:

Index: 0007-Define-missing-variable-when-compiling-on-PPC.patch
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/devel/0007-Define-missing-variable-when-compiling-on-PPC.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 0007-Define-missing-variable-when-compiling-on-PPC.patch	4 Jan 2009 05:52:32 -0000	1.1
+++ 0007-Define-missing-variable-when-compiling-on-PPC.patch	4 Jan 2009 19:19:15 -0000	1.2
@@ -1,7 +1,7 @@
 From 06b01dff16e335004e107352fb9a87d56ab5dc57 Mon Sep 17 00:00:00 2001
 From: Jeffrey C. Ollie <jeff at ocjtech.us>
 Date: Fri, 7 Nov 2008 14:43:16 -0600
-Subject: [PATCH 07/11] Define missing variable when compiling on PPC.
+Subject: [PATCH 07/12] Define missing variable when compiling on PPC.
 
 ---
  apps/app_festival.c |    1 +

0008-change-configure.ac-to-look-for-pkg-config-gmime-2.4.patch:

Index: 0008-change-configure.ac-to-look-for-pkg-config-gmime-2.4.patch
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/devel/0008-change-configure.ac-to-look-for-pkg-config-gmime-2.4.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 0008-change-configure.ac-to-look-for-pkg-config-gmime-2.4.patch	4 Jan 2009 05:52:32 -0000	1.1
+++ 0008-change-configure.ac-to-look-for-pkg-config-gmime-2.4.patch	4 Jan 2009 19:19:15 -0000	1.2
@@ -1,7 +1,7 @@
 From 15ba569e990035b085d2d983d3c22681ad82be89 Mon Sep 17 00:00:00 2001
 From: Caolan McNamara <caolanm at redhat.com>
 Date: Sat, 3 Jan 2009 19:06:18 -0600
-Subject: [PATCH 08/11] change configure.ac to look for pkg-config gmime-2.4 instead of gmime-2.4 gmime-config
+Subject: [PATCH 08/12] change configure.ac to look for pkg-config gmime-2.4 instead of gmime-2.4 gmime-config
 
 ---
  configure.ac |   12 +++++++++++-

0009-fix-the-AST_PROG_SED-problem-that-makes-.-bootstrap.patch:

Index: 0009-fix-the-AST_PROG_SED-problem-that-makes-.-bootstrap.patch
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/devel/0009-fix-the-AST_PROG_SED-problem-that-makes-.-bootstrap.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 0009-fix-the-AST_PROG_SED-problem-that-makes-.-bootstrap.patch	4 Jan 2009 05:52:32 -0000	1.1
+++ 0009-fix-the-AST_PROG_SED-problem-that-makes-.-bootstrap.patch	4 Jan 2009 19:19:15 -0000	1.2
@@ -1,7 +1,7 @@
 From fc4a4f6207cb8454b6d3ec673dba10f8daf57050 Mon Sep 17 00:00:00 2001
 From: Caolan McNamara <caolanm at redhat.com>
 Date: Sat, 3 Jan 2009 19:12:18 -0600
-Subject: [PATCH 09/11] fix the AST_PROG_SED problem that makes ./bootstrap.sh fail
+Subject: [PATCH 09/12] fix the AST_PROG_SED problem that makes ./bootstrap.sh fail
 
 Need to regenerate configure from configure.ac after patch one with
 ./bootsrap.sh, so fix the broken .m4 in the autoconfig dir. (alternatively

0010-my-guess-as-replacements-for-the-missing-broken-stuf.patch:

Index: 0010-my-guess-as-replacements-for-the-missing-broken-stuf.patch
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/devel/0010-my-guess-as-replacements-for-the-missing-broken-stuf.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 0010-my-guess-as-replacements-for-the-missing-broken-stuf.patch	4 Jan 2009 05:52:33 -0000	1.1
+++ 0010-my-guess-as-replacements-for-the-missing-broken-stuf.patch	4 Jan 2009 19:19:15 -0000	1.2
@@ -1,7 +1,7 @@
 From b7ccdf7e246f75f67529126fb309efd2e6793446 Mon Sep 17 00:00:00 2001
 From: Caolan McNamara <caolanm at redhat.com>
 Date: Sat, 3 Jan 2009 19:15:12 -0600
-Subject: [PATCH 10/11] my guess as replacements for the missing/broken stuff against the new gmime api
+Subject: [PATCH 10/12] my guess as replacements for the missing/broken stuff against the new gmime api
 
 ---
  res/res_http_post.c |   12 ++++--------

0011-Update-autoconf.patch:

Index: 0011-Update-autoconf.patch
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/devel/0011-Update-autoconf.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 0011-Update-autoconf.patch	4 Jan 2009 05:52:33 -0000	1.1
+++ 0011-Update-autoconf.patch	4 Jan 2009 19:19:15 -0000	1.2
@@ -1,7 +1,7 @@
 From acb8f9151b2cf455374f877ce3ae81ffceb5d5dd Mon Sep 17 00:00:00 2001
 From: Jeffrey C. Ollie <jeff at ocjtech.us>
 Date: Sat, 3 Jan 2009 22:26:11 -0600
-Subject: [PATCH 11/11] Update autoconf.
+Subject: [PATCH 11/12] Update autoconf.
 
 ---
  configure                        |23473 ++++++++++++++++++++------------------


Index: asterisk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/devel/asterisk.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- asterisk.spec	4 Jan 2009 05:52:34 -0000	1.44
+++ asterisk.spec	4 Jan 2009 19:19:15 -0000	1.45
@@ -3,7 +3,7 @@
 Summary: The Open Source PBX
 Name: asterisk
 Version: 1.6.1
-Release: 0.9%{?beta:beta%{beta}}%{?dist}
+Release: 0.10%{?beta:beta%{beta}}%{?dist}
 License: GPLv2
 Group: Applications/Internet
 URL: http://www.asterisk.org/
@@ -44,6 +44,7 @@
 Patch9:  0009-fix-the-AST_PROG_SED-problem-that-makes-.-bootstrap.patch
 Patch10: 0010-my-guess-as-replacements-for-the-missing-broken-stuf.patch
 Patch11: 0011-Update-autoconf.patch
+Patch12: 0012-Fix-up-some-paths.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
 
@@ -431,6 +432,7 @@
 %patch9 -p1
 %patch10 -p1
 %patch11 -p1
+%patch12 -p1
 
 cp %{SOURCE2} menuselect.makedeps
 cp %{SOURCE3} menuselect.makeopts
@@ -531,8 +533,10 @@
 mkdir -p %{buildroot}%{_datadir}/asterisk/sounds/
 mkdir -p %{buildroot}%{_localstatedir}/lib/asterisk
 mkdir -p %{buildroot}%{_localstatedir}/log/asterisk/cdr-custom/
+mkdir -p %{buildroot}%{_localstatedir}/spool/asterisk/festival/
 mkdir -p %{buildroot}%{_localstatedir}/spool/asterisk/monitor/
 mkdir -p %{buildroot}%{_localstatedir}/spool/asterisk/outgoing/
+mkdir -p %{buildroot}%{_localstatedir}/spool/asterisk/uploads/
 
 # We're not going to package any of the sample AGI scripts
 rm -f %{buildroot}%{_datadir}/asterisk/agi-bin/*
@@ -841,6 +845,7 @@
 %attr(0770,asterisk,asterisk) %dir %{_localstatedir}/spool/asterisk/monitor/
 %attr(0770,asterisk,asterisk) %dir %{_localstatedir}/spool/asterisk/outgoing/
 %attr(0750,asterisk,asterisk) %dir %{_localstatedir}/spool/asterisk/tmp/
+%attr(0750,asterisk,asterisk) %dir %{_localstatedir}/spool/asterisk/uploads/
 %attr(0750,asterisk,asterisk) %dir %{_localstatedir}/spool/asterisk/voicemail/
 
 %attr(0755,asterisk,asterisk) %dir %{_localstatedir}/run/asterisk
@@ -911,6 +916,7 @@
 %files festival
 %defattr(-,root,root,-)
 %config(noreplace) %{_sysconfdir}/asterisk/festival.conf
+%attr(0750,asterisk,asterisk) %dir %{_localstatedir}/spool/asterisk/festival/
 %{_libdir}/asterisk/modules/app_festival.so
 
 %files firmware
@@ -1057,6 +1063,9 @@
 %{_libdir}/asterisk/modules/app_voicemail_plain.so
 
 %changelog
+* Sun Jan  4 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6.1-0.10.beta4
+- Fix up paths. BZ#477238
+
 * Sat Jan  3 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6.1-0.9.beta4
 - Update patches
 



From rishi at fedoraproject.org  Sun Jan  4 19:22:01 2009
From: rishi at fedoraproject.org (Debarshi Ray)
Date: Sun,  4 Jan 2009 19:22:01 +0000 (UTC)
Subject: rpms/glade3/F-9 glade3-3.4.5-anjuta-hang.patch, NONE,
	1.1 glade3.spec, 1.14, 1.15
Message-ID: <20090104192201.DE72470130@cvs1.fedora.phx.redhat.com>

Author: rishi

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

Modified Files:
	glade3.spec 
Added Files:
	glade3-3.4.5-anjuta-hang.patch 
Log Message:
* Mon Jan 05 2009 Debarshi Ray <rishi at fedoraproject.org> - 3.4.5-2
- Added patch to prevent Anjuta from hanging on startup from GNOME that was
  mistakenly left out from the upstream tarball. Closes GNOME Bugzilla bug
  #531585.


glade3-3.4.5-anjuta-hang.patch:

--- NEW FILE glade3-3.4.5-anjuta-hang.patch ---
diff -urNp glade3-3.4.5.orig/gladeui/glade-widget.c glade3-3.4.5/gladeui/glade-widget.c
--- glade3-3.4.5.orig/gladeui/glade-widget.c	2009-01-04 23:58:05.000000000 +0530
+++ glade3-3.4.5/gladeui/glade-widget.c	2009-01-05 00:10:26.000000000 +0530
@@ -2142,14 +2142,15 @@ glade_widget_debug (GladeWidget *widget)
 	glade_widget_debug_real (widget, 0);
 }
 
-static gboolean
-glade_widget_show_idle (GladeWidget *widget)
+static void
+glade_widget_add_to_layout (GladeWidget *widget, GtkWidget *layout)
 {
-	/* This could be dangerous */ 
-	if (GLADE_IS_WIDGET (widget))
-		glade_widget_show (widget);
+	if (gtk_bin_get_child (GTK_BIN (layout)) != NULL)
+		gtk_container_remove (GTK_CONTAINER (layout), gtk_bin_get_child (GTK_BIN (layout)));
 
-	return FALSE;
+	gtk_container_add (GTK_CONTAINER (layout), GTK_WIDGET (widget->object));
+
+	gtk_widget_show_all (GTK_WIDGET (widget->object));
 }
 
 /**
@@ -2172,22 +2173,13 @@ glade_widget_show (GladeWidget *widget)
 		view = glade_design_view_get_from_project (glade_widget_get_project (widget));
 		layout = GTK_WIDGET (glade_design_view_get_layout (view));
 
-		/* This case causes a black window */
-		if (layout && !GTK_WIDGET_REALIZED (layout))
-		{
-			/* XXX Dangerous !!! give her a little kick */
-			g_idle_add (glade_widget_show_idle, widget);
+		if (!layout)
 			return;
-		}
-		else if (!layout)
-			return;
-		
-		if (gtk_bin_get_child (GTK_BIN (layout)) != NULL)
-			gtk_container_remove (GTK_CONTAINER (layout), gtk_bin_get_child (GTK_BIN (layout)));
 		
-		gtk_container_add (GTK_CONTAINER (layout), GTK_WIDGET (widget->object));
-
-		gtk_widget_show_all (GTK_WIDGET (widget->object));
+		if (GTK_WIDGET_REALIZED (layout))
+			glade_widget_add_to_layout (widget, layout);
+		else
+			g_signal_connect_data (layout, "map", (GCallback) glade_widget_add_to_layout, widget, NULL, G_CONNECT_AFTER | G_CONNECT_SWAPPED);
 
 	} else if (GTK_IS_WIDGET (widget->object))
 	{


Index: glade3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/glade3/F-9/glade3.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- glade3.spec	16 Sep 2008 20:08:43 -0000	1.14
+++ glade3.spec	4 Jan 2009 19:21:31 -0000	1.15
@@ -6,13 +6,15 @@
 Summary:	User Interface Designer for GTK+ and GNOME
 Name:		glade3
 Version:	3.4.5
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GPLv2+
 Group:		Development/Tools
 URL:		http://glade.gnome.org/
 Source0:	http://ftp.gnome.org/pub/GNOME/sources/glade3/3.4/%{name}-%{version}.tar.gz
 
-Patch0:		%{name}-%{version}-desktop.patch
+# http://bugzilla.gnome.org/531585
+Patch0:		%{name}-%{version}-anjuta-hang.patch
+Patch1:		%{name}-%{version}-desktop.patch
 
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
@@ -74,6 +76,7 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 %configure --disable-static --enable-gtk-doc
@@ -190,6 +193,11 @@
 %{_includedir}/libgladeui-1.0/gladeui/*
 
 %changelog
+* Mon Jan 05 2009 Debarshi Ray <rishi at fedoraproject.org> - 3.4.5-2
+- Added patch to prevent Anjuta from hanging on startup from GNOME that was
+  mistakenly left out from the upstream tarball. Closes GNOME Bugzilla bug
+  #531585.
+
 * Tue Sep 16 2008 Debarshi Ray <rishi at fedoraproject.org> - 3.4.5-1
 - Version bump to 3.4.5.
 



From rishi at fedoraproject.org  Sun Jan  4 19:23:44 2009
From: rishi at fedoraproject.org (Debarshi Ray)
Date: Sun,  4 Jan 2009 19:23:44 +0000 (UTC)
Subject: rpms/glade3/F-9 glade3.spec,1.15,1.16
Message-ID: <20090104192344.34A5B70130@cvs1.fedora.phx.redhat.com>

Author: rishi

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

Modified Files:
	glade3.spec 
Log Message:
* Mon Jan 05 2009 Debarshi Ray <rishi at fedoraproject.org> - 3.4.5-2
- Added patch to prevent Anjuta from hanging on startup from GNOME that was
  mistakenly left out from the upstream tarball. Closes GNOME Bugzilla bug
  #531585, and Red Hat Bugzilla bug #478698.



Index: glade3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/glade3/F-9/glade3.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- glade3.spec	4 Jan 2009 19:21:31 -0000	1.15
+++ glade3.spec	4 Jan 2009 19:23:13 -0000	1.16
@@ -196,7 +196,7 @@
 * Mon Jan 05 2009 Debarshi Ray <rishi at fedoraproject.org> - 3.4.5-2
 - Added patch to prevent Anjuta from hanging on startup from GNOME that was
   mistakenly left out from the upstream tarball. Closes GNOME Bugzilla bug
-  #531585.
+  #531585, and Red Hat Bugzilla bug #478698.
 
 * Tue Sep 16 2008 Debarshi Ray <rishi at fedoraproject.org> - 3.4.5-1
 - Version bump to 3.4.5.



From dwalsh at fedoraproject.org  Sun Jan  4 19:25:21 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Sun,  4 Jan 2009 19:25:21 +0000 (UTC)
Subject: rpms/policycoreutils/F-10 policycoreutils-gui.patch, 1.80,
	1.81 policycoreutils-rhat.patch, 1.402,
	1.403 policycoreutils.spec, 1.573, 1.574
Message-ID: <20090104192521.C70DF70130@cvs1.fedora.phx.redhat.com>

Author: dwalsh

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

Modified Files:
	policycoreutils-gui.patch policycoreutils-rhat.patch 
	policycoreutils.spec 
Log Message:
* Mon Dec 15 2008 Dan Walsh <dwalsh at redhat.com> 2.0.57-15
- Fix audit2allow man page


policycoreutils-gui.patch:

Index: policycoreutils-gui.patch
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/F-10/policycoreutils-gui.patch,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- policycoreutils-gui.patch	29 Oct 2008 17:02:31 -0000	1.80
+++ policycoreutils-gui.patch	4 Jan 2009 19:25:16 -0000	1.81
@@ -8461,7 +8461,7 @@
 +	      <child>
 +		<widget class="GtkComboBox" id="portsProtocolCombo">
 +		  <property name="visible">True</property>
-+		  <property name="items" translatable="yes">tcp
++		  <property name="items">tcp
 +udp</property>
 +		  <property name="add_tearoffs">False</property>
 +		  <property name="focus_on_click">True</property>

policycoreutils-rhat.patch:

Index: policycoreutils-rhat.patch
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/F-10/policycoreutils-rhat.patch,v
retrieving revision 1.402
retrieving revision 1.403
diff -u -r1.402 -r1.403
--- policycoreutils-rhat.patch	2 Dec 2008 13:41:50 -0000	1.402
+++ policycoreutils-rhat.patch	4 Jan 2009 19:25:18 -0000	1.403
@@ -1,15 +1,6 @@
-diff --exclude-from=exclude --exclude=sepolgen-1.0.14 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/Makefile policycoreutils-2.0.57/Makefile
---- nsapolicycoreutils/Makefile	2008-09-22 13:25:07.000000000 -0400
-+++ policycoreutils-2.0.57/Makefile	2008-12-01 15:20:08.000000000 -0500
-@@ -1,4 +1,4 @@
--SUBDIRS = setfiles semanage load_policy newrole run_init secon audit2allow audit2why scripts sestatus semodule_package semodule semodule_link semodule_expand semodule_deps setsebool po
-+SUBDIRS = setfiles semanage load_policy newrole run_init 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.14 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/audit2allow/audit2allow policycoreutils-2.0.57/audit2allow/audit2allow
 --- nsapolicycoreutils/audit2allow/audit2allow	2008-09-22 13:25:08.000000000 -0400
-+++ policycoreutils-2.0.57/audit2allow/audit2allow	2008-12-01 15:22:30.000000000 -0500
++++ policycoreutils-2.0.57/audit2allow/audit2allow	2008-12-15 15:39:08.000000000 -0500
 @@ -42,10 +42,10 @@
          from optparse import OptionParser
  
@@ -59,7 +50,7 @@
  
 diff --exclude-from=exclude --exclude=sepolgen-1.0.14 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/audit2allow/audit2allow.1 policycoreutils-2.0.57/audit2allow/audit2allow.1
 --- nsapolicycoreutils/audit2allow/audit2allow.1	2008-09-22 13:25:08.000000000 -0400
-+++ policycoreutils-2.0.57/audit2allow/audit2allow.1	2008-12-01 15:22:34.000000000 -0500
++++ policycoreutils-2.0.57/audit2allow/audit2allow.1	2008-12-15 15:39:09.000000000 -0500
 @@ -44,9 +44,6 @@
  Note that all audit messages are not available via dmesg when
  auditd is running; use "ausearch -m avc | audit2allow"  or "-a" instead.
@@ -70,15 +61,28 @@
  .B "\-h" | "\-\-help"
  Print a short usage message
  .TP
-@@ -82,7 +79,7 @@
- Indicates input file is a te (type enforcement) file.  This can be used to translate old te format to new policy format.
+@@ -78,11 +75,8 @@
+ Generate reference policy using installed macros.
+ This attempts to match denials against interfaces and may be inaccurate.
  .TP
+-.B "\-t "  | "\-\-tefile"
+-Indicates input file is a te (type enforcement) file.  This can be used to translate old te format to new policy format.
+-.TP
  .B "\-w" | "\-\-why"
 -Translates SELinux audit messages into a description of why the access wasn denied
 +Translates SELinux audit messages into a description of why the access was denied
  
  .TP
  .B "\-v" | "\-\-verbose"
+diff --exclude-from=exclude --exclude=sepolgen-1.0.14 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/Makefile policycoreutils-2.0.57/Makefile
+--- nsapolicycoreutils/Makefile	2008-09-22 13:25:07.000000000 -0400
++++ policycoreutils-2.0.57/Makefile	2008-12-01 15:20:08.000000000 -0500
+@@ -1,4 +1,4 @@
+-SUBDIRS = setfiles semanage load_policy newrole run_init secon audit2allow audit2why scripts sestatus semodule_package semodule semodule_link semodule_expand semodule_deps setsebool po
++SUBDIRS = setfiles semanage load_policy newrole run_init 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.14 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/newrole/newrole.c policycoreutils-2.0.57/newrole/newrole.c
 --- nsapolicycoreutils/newrole/newrole.c	2008-09-22 13:25:08.000000000 -0400
 +++ policycoreutils-2.0.57/newrole/newrole.c	2008-12-01 15:20:08.000000000 -0500


Index: policycoreutils.spec
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/F-10/policycoreutils.spec,v
retrieving revision 1.573
retrieving revision 1.574
diff -u -r1.573 -r1.574
--- policycoreutils.spec	10 Dec 2008 14:21:50 -0000	1.573
+++ policycoreutils.spec	4 Jan 2009 19:25:21 -0000	1.574
@@ -6,7 +6,7 @@
 Summary: SELinux policy core utilities
 Name:	 policycoreutils
 Version: 2.0.57
-Release: 14%{?dist}
+Release: 15%{?dist}
 License: GPLv2+
 Group:	 System Environment/Base
 Source:	 http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@@ -192,6 +192,9 @@
 fi
 
 %changelog
+* Mon Dec 15 2008 Dan Walsh <dwalsh at redhat.com> 2.0.57-15
+- Fix audit2allow man page
+
 * Wed Dec 10 2008 Dan Walsh <dwalsh at redhat.com> 2.0.57-13
 - Fix Japanese translations
 



From rishi at fedoraproject.org  Sun Jan  4 19:27:06 2009
From: rishi at fedoraproject.org (Debarshi Ray)
Date: Sun,  4 Jan 2009 19:27:06 +0000 (UTC)
Subject: rpms/glade3/F-10 glade3-3.4.5-anjuta-hang.patch, NONE,
	1.1 glade3.spec, 1.14, 1.15
Message-ID: <20090104192706.B3A8870130@cvs1.fedora.phx.redhat.com>

Author: rishi

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

Modified Files:
	glade3.spec 
Added Files:
	glade3-3.4.5-anjuta-hang.patch 
Log Message:
* Mon Jan 05 2009 Debarshi Ray <rishi at fedoraproject.org> - 3.4.5-2
- Added patch to prevent Anjuta from hanging on startup from GNOME that was
  mistakenly left out from the upstream tarball. Closes GNOME Bugzilla bug
  #531585, and Red Hat Bugzilla bug #478698.


glade3-3.4.5-anjuta-hang.patch:

--- NEW FILE glade3-3.4.5-anjuta-hang.patch ---
diff -urNp glade3-3.4.5.orig/gladeui/glade-widget.c glade3-3.4.5/gladeui/glade-widget.c
--- glade3-3.4.5.orig/gladeui/glade-widget.c	2009-01-04 23:58:05.000000000 +0530
+++ glade3-3.4.5/gladeui/glade-widget.c	2009-01-05 00:10:26.000000000 +0530
@@ -2142,14 +2142,15 @@ glade_widget_debug (GladeWidget *widget)
 	glade_widget_debug_real (widget, 0);
 }
 
-static gboolean
-glade_widget_show_idle (GladeWidget *widget)
+static void
+glade_widget_add_to_layout (GladeWidget *widget, GtkWidget *layout)
 {
-	/* This could be dangerous */ 
-	if (GLADE_IS_WIDGET (widget))
-		glade_widget_show (widget);
+	if (gtk_bin_get_child (GTK_BIN (layout)) != NULL)
+		gtk_container_remove (GTK_CONTAINER (layout), gtk_bin_get_child (GTK_BIN (layout)));
 
-	return FALSE;
+	gtk_container_add (GTK_CONTAINER (layout), GTK_WIDGET (widget->object));
+
+	gtk_widget_show_all (GTK_WIDGET (widget->object));
 }
 
 /**
@@ -2172,22 +2173,13 @@ glade_widget_show (GladeWidget *widget)
 		view = glade_design_view_get_from_project (glade_widget_get_project (widget));
 		layout = GTK_WIDGET (glade_design_view_get_layout (view));
 
-		/* This case causes a black window */
-		if (layout && !GTK_WIDGET_REALIZED (layout))
-		{
-			/* XXX Dangerous !!! give her a little kick */
-			g_idle_add (glade_widget_show_idle, widget);
+		if (!layout)
 			return;
-		}
-		else if (!layout)
-			return;
-		
-		if (gtk_bin_get_child (GTK_BIN (layout)) != NULL)
-			gtk_container_remove (GTK_CONTAINER (layout), gtk_bin_get_child (GTK_BIN (layout)));
 		
-		gtk_container_add (GTK_CONTAINER (layout), GTK_WIDGET (widget->object));
-
-		gtk_widget_show_all (GTK_WIDGET (widget->object));
+		if (GTK_WIDGET_REALIZED (layout))
+			glade_widget_add_to_layout (widget, layout);
+		else
+			g_signal_connect_data (layout, "map", (GCallback) glade_widget_add_to_layout, widget, NULL, G_CONNECT_AFTER | G_CONNECT_SWAPPED);
 
 	} else if (GTK_IS_WIDGET (widget->object))
 	{


Index: glade3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/glade3/F-10/glade3.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- glade3.spec	16 Sep 2008 20:20:10 -0000	1.14
+++ glade3.spec	4 Jan 2009 19:26:36 -0000	1.15
@@ -6,13 +6,15 @@
 Summary:	User Interface Designer for GTK+ and GNOME
 Name:		glade3
 Version:	3.4.5
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GPLv2+
 Group:		Development/Tools
 URL:		http://glade.gnome.org/
 Source0:	http://ftp.gnome.org/pub/GNOME/sources/glade3/3.4/%{name}-%{version}.tar.gz
 
-Patch0:		%{name}-%{version}-desktop.patch
+# http://bugzilla.gnome.org/531585
+Patch0:		%{name}-%{version}-anjuta-hang.patch
+Patch1:		%{name}-%{version}-desktop.patch
 
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
@@ -74,6 +76,7 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 %configure --disable-static --enable-gtk-doc
@@ -190,6 +193,11 @@
 %{_includedir}/libgladeui-1.0/gladeui/*
 
 %changelog
+* Mon Jan 05 2009 Debarshi Ray <rishi at fedoraproject.org> - 3.4.5-2
+- Added patch to prevent Anjuta from hanging on startup from GNOME that was
+  mistakenly left out from the upstream tarball. Closes GNOME Bugzilla bug
+  #531585, and Red Hat Bugzilla bug #478698.
+
 * Tue Sep 16 2008 Debarshi Ray <rishi at fedoraproject.org> - 3.4.5-1
 - Version bump to 3.4.5.
 



From dwalsh at fedoraproject.org  Sun Jan  4 19:45:04 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Sun,  4 Jan 2009 19:45:04 +0000 (UTC)
Subject: rpms/selinux-policy/devel policy-20081111.patch, 1.19,
	1.20 selinux-policy.spec, 1.760, 1.761
Message-ID: <20090104194504.9378470130@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13903

Modified Files:
	policy-20081111.patch selinux-policy.spec 
Log Message:
* Sun Jan 4 2009 Dan Walsh <dwalsh at redhat.com> 3.6.1-15
- Allow hal_acl_t to getattr/setattr fixed_disk


policy-20081111.patch:

Index: policy-20081111.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-20081111.patch,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- policy-20081111.patch	27 Dec 2008 13:06:14 -0000	1.19
+++ policy-20081111.patch	4 Jan 2009 19:45:02 -0000	1.20
@@ -2004,7 +2004,7 @@
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/java.te serefpolicy-3.6.1/policy/modules/apps/java.te
 --- nsaserefpolicy/policy/modules/apps/java.te	2008-11-11 16:13:41.000000000 -0500
-+++ serefpolicy-3.6.1/policy/modules/apps/java.te	2008-11-25 09:45:43.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/apps/java.te	2009-01-04 13:53:30.000000000 -0500
 @@ -40,7 +40,7 @@
  # Local policy
  #
@@ -2014,7 +2014,22 @@
  allow java_t self:fifo_file rw_fifo_file_perms;
  allow java_t self:tcp_socket create_socket_perms;
  allow java_t self:udp_socket create_socket_perms;
-@@ -147,4 +147,11 @@
+@@ -116,12 +116,13 @@
+ 
+ 	allow java_t java_tmp_t:file execute;
+ 
+-	libs_legacy_use_shared_libs(java_t)
+ 	libs_legacy_use_ld_so(java_t)
+ 
+ 	miscfiles_legacy_read_localization(java_t)
+ ')
+ 
++libs_legacy_use_shared_libs(java_t)
++
+ optional_policy(`
+ 	nis_use_ypbind(java_t)
+ ')
+@@ -147,4 +148,11 @@
  
  	unconfined_domain_noaudit(unconfined_java_t)
  	unconfined_dbus_chat(unconfined_java_t)
@@ -5496,7 +5511,7 @@
  #
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/filesystem.if serefpolicy-3.6.1/policy/modules/kernel/filesystem.if
 --- nsaserefpolicy/policy/modules/kernel/filesystem.if	2008-11-11 16:13:41.000000000 -0500
-+++ serefpolicy-3.6.1/policy/modules/kernel/filesystem.if	2008-12-01 16:27:54.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/kernel/filesystem.if	2009-01-04 12:00:43.000000000 -0500
 @@ -534,6 +534,24 @@
  
  ########################################
@@ -7814,7 +7829,7 @@
 +permissive afs_t;
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.fc serefpolicy-3.6.1/policy/modules/services/apache.fc
 --- nsaserefpolicy/policy/modules/services/apache.fc	2008-11-11 16:13:46.000000000 -0500
-+++ serefpolicy-3.6.1/policy/modules/services/apache.fc	2008-11-25 09:45:43.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/services/apache.fc	2008-12-29 10:16:33.000000000 -0500
 @@ -1,12 +1,13 @@
 -HOME_DIR/((www)|(web)|(public_html))(/.+)? gen_context(system_u:object_r:httpd_user_content_t,s0)
 +HOME_DIR/((www)|(web)|(public_html)|(public_git))(/.+)? gen_context(system_u:object_r:httpd_user_content_t,s0)
@@ -7874,10 +7889,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)
-@@ -64,11 +71,21 @@
+@@ -64,11 +71,22 @@
  /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/mod_.*				gen_context(system_u:object_r:httpd_var_run_t,s0)
 +/var/run/wsgi.*			-s	gen_context(system_u:object_r:httpd_var_run_t,s0)
  
  /var/spool/gosa(/.*)?			gen_context(system_u:object_r:httpd_sys_script_rw_t,s0)
@@ -8432,7 +8448,7 @@
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.te serefpolicy-3.6.1/policy/modules/services/apache.te
 --- nsaserefpolicy/policy/modules/services/apache.te	2008-11-11 16:13:46.000000000 -0500
-+++ serefpolicy-3.6.1/policy/modules/services/apache.te	2008-12-08 16:47:30.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/services/apache.te	2009-01-04 12:50:52.000000000 -0500
 @@ -19,6 +19,8 @@
  # Declarations
  #
@@ -12351,7 +12367,7 @@
  ########################################
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.te serefpolicy-3.6.1/policy/modules/services/hal.te
 --- nsaserefpolicy/policy/modules/services/hal.te	2008-11-19 11:51:44.000000000 -0500
-+++ serefpolicy-3.6.1/policy/modules/services/hal.te	2008-12-19 17:16:25.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/services/hal.te	2009-01-04 12:01:07.000000000 -0500
 @@ -49,6 +49,15 @@
  type hald_var_lib_t;
  files_type(hald_var_lib_t)
@@ -12368,7 +12384,7 @@
  ########################################
  #
  # Local policy
-@@ -143,6 +152,7 @@
+@@ -143,11 +152,16 @@
  files_getattr_all_dirs(hald_t)
  files_read_kernel_img(hald_t)
  files_rw_lock_dirs(hald_t)
@@ -12376,7 +12392,16 @@
  
  fs_getattr_all_fs(hald_t)
  fs_search_all(hald_t)
-@@ -195,6 +205,7 @@
+ fs_list_inotifyfs(hald_t)
+ fs_list_auto_mountpoints(hald_t)
++fs_mount_dos_fs(hald_t)
++fs_unmount_dos_fs(hald_t)
++fs_manage_dos_files(hald_t)
++
+ files_getattr_all_mountpoints(hald_t)
+ 
+ mls_file_read_all_levels(hald_t)
+@@ -195,6 +209,7 @@
  seutil_read_file_contexts(hald_t)
  
  sysnet_read_config(hald_t)
@@ -12384,7 +12409,7 @@
  
  userdom_dontaudit_use_unpriv_user_fds(hald_t)
  userdom_dontaudit_search_user_home_dirs(hald_t)
-@@ -277,6 +288,12 @@
+@@ -277,6 +292,12 @@
  ')
  
  optional_policy(`
@@ -12397,7 +12422,7 @@
  	rpc_search_nfs_state_data(hald_t)
  ')
  
-@@ -301,12 +318,16 @@
+@@ -301,12 +322,16 @@
  	virt_manage_images(hald_t)
  ')
  
@@ -12415,7 +12440,24 @@
  allow hald_acl_t self:process { getattr signal };
  allow hald_acl_t self:fifo_file rw_fifo_file_perms;
  
-@@ -346,12 +367,17 @@
+@@ -321,6 +346,7 @@
+ manage_dirs_pattern(hald_acl_t, hald_var_run_t, hald_var_run_t)
+ manage_files_pattern(hald_acl_t, hald_var_run_t, hald_var_run_t)
+ files_pid_filetrans(hald_acl_t, hald_var_run_t, { dir file })
++allow hald_t hald_var_run_t:dir mounton;
+ 
+ corecmd_exec_bin(hald_acl_t)
+ 
+@@ -339,6 +365,8 @@
+ 
+ storage_getattr_removable_dev(hald_acl_t)
+ storage_setattr_removable_dev(hald_acl_t)
++storage_getattr_fixed_disk_dev(hald_acl_t)
++storage_setattr_fixed_disk_dev(hald_acl_t)
+ 
+ auth_use_nsswitch(hald_acl_t)
+ 
+@@ -346,12 +374,17 @@
  
  miscfiles_read_localization(hald_acl_t)
  
@@ -12434,7 +12476,7 @@
  
  domtrans_pattern(hald_t, hald_mac_exec_t, hald_mac_t)
  allow hald_t hald_mac_t:process signal;
-@@ -418,3 +444,49 @@
+@@ -418,3 +451,49 @@
  files_read_usr_files(hald_keymap_t)
  
  miscfiles_read_localization(hald_keymap_t)
@@ -18108,6 +18150,18 @@
  userdom_dontaudit_search_user_home_dirs(pyzor_t)
  
  optional_policy(`
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/radvd.te serefpolicy-3.6.1/policy/modules/services/radvd.te
+--- nsaserefpolicy/policy/modules/services/radvd.te	2008-11-11 16:13:46.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/services/radvd.te	2009-01-04 12:30:51.000000000 -0500
+@@ -22,7 +22,7 @@
+ #
+ # Local policy
+ #
+-allow radvd_t self:capability { setgid setuid net_raw };
++allow radvd_t self:capability { setgid setuid net_raw net_admin };
+ dontaudit radvd_t self:capability sys_tty_config;
+ allow radvd_t self:process signal_perms;
+ allow radvd_t self:unix_dgram_socket create_socket_perms;
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/razor.if serefpolicy-3.6.1/policy/modules/services/razor.if
 --- nsaserefpolicy/policy/modules/services/razor.if	2008-11-11 16:13:46.000000000 -0500
 +++ serefpolicy-3.6.1/policy/modules/services/razor.if	2008-11-25 09:45:43.000000000 -0500
@@ -19423,7 +19477,7 @@
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/sendmail.te serefpolicy-3.6.1/policy/modules/services/sendmail.te
 --- nsaserefpolicy/policy/modules/services/sendmail.te	2008-11-25 09:01:08.000000000 -0500
-+++ serefpolicy-3.6.1/policy/modules/services/sendmail.te	2008-11-25 10:40:18.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/services/sendmail.te	2009-01-04 12:51:01.000000000 -0500
 @@ -1,5 +1,5 @@
  
 -policy_module(sendmail, 1.8.2)
@@ -19459,11 +19513,12 @@
  
  corenet_all_recvfrom_unlabeled(sendmail_t)
  corenet_all_recvfrom_netlabel(sendmail_t)
-@@ -64,24 +69,29 @@
+@@ -64,24 +69,30 @@
  
  fs_getattr_all_fs(sendmail_t)
  fs_search_auto_mountpoints(sendmail_t)
 +fs_rw_anon_inodefs_files(sendmail_t)
++fs_list_inotifyfs(sendmail_t)
  
  term_dontaudit_use_console(sendmail_t)
  
@@ -19489,7 +19544,7 @@
  
  auth_use_nsswitch(sendmail_t)
  
-@@ -89,23 +99,38 @@
+@@ -89,23 +100,38 @@
  libs_read_lib_files(sendmail_t)
  
  logging_send_syslog_msg(sendmail_t)
@@ -19530,7 +19585,7 @@
  ')
  
  optional_policy(`
-@@ -113,13 +138,19 @@
+@@ -113,13 +139,19 @@
  ')
  
  optional_policy(`
@@ -19551,7 +19606,7 @@
  ')
  
  optional_policy(`
-@@ -127,24 +158,29 @@
+@@ -127,24 +159,29 @@
  ')
  
  optional_policy(`
@@ -26456,7 +26511,7 @@
 +/dev/shm/mono.*		gen_context(system_u:object_r:user_tmpfs_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-3.6.1/policy/modules/system/userdomain.if
 --- nsaserefpolicy/policy/modules/system/userdomain.if	2008-11-13 18:40:02.000000000 -0500
-+++ serefpolicy-3.6.1/policy/modules/system/userdomain.if	2008-12-27 06:28:18.000000000 -0500
++++ serefpolicy-3.6.1/policy/modules/system/userdomain.if	2009-01-04 13:57:22.000000000 -0500
 @@ -30,8 +30,9 @@
  	')
  
@@ -27133,7 +27188,7 @@
  ')
  
  #######################################
-@@ -722,15 +740,27 @@
+@@ -722,15 +740,29 @@
  
  	userdom_base_user_template($1)
  
@@ -27148,26 +27203,28 @@
 -	userdom_exec_user_home_content_files($1_t)
 +	userdom_manage_tmp_role($1_r, $1_usertype)
 +	userdom_manage_tmpfs_role($1_r, $1_usertype)
- 
--	userdom_change_password_template($1)
-+	gen_tunable(allow_$1_exec_content, true)
 +
-+	tunable_policy(`allow_$1_exec_content',`
-+		userdom_exec_user_tmp_files($1_usertype)
-+		userdom_exec_user_home_content_files($1_usertype)
-+	')
++	ifelse(`$1',`unconfined',`',`
++		gen_tunable(allow_$1_exec_content, true)
 +
-+	tunable_policy(`allow_$1_exec_content && use_nfs_home_dirs',`
-+		fs_exec_nfs_files($1_usertype)
-+	')
++		tunable_policy(`allow_$1_exec_content',`
++			userdom_exec_user_tmp_files($1_usertype)
++			userdom_exec_user_home_content_files($1_usertype)
++		')
++		tunable_policy(`allow_$1_exec_content && use_nfs_home_dirs',`
++                        fs_exec_nfs_files($1_usertype)
++		')
 +
-+	tunable_policy(`allow_$1_exec_content && use_samba_home_dirs',`
-+		fs_exec_cifs_files($1_usertype)
++		tunable_policy(`allow_$1_exec_content && use_samba_home_dirs',`
++			fs_exec_cifs_files($1_usertype)
++		')
 +	')
  
+-	userdom_change_password_template($1)
+ 
  	##############################
  	#
-@@ -746,70 +776,72 @@
+@@ -746,70 +778,72 @@
  
  	allow $1_t self:context contains;
  
@@ -27273,7 +27330,7 @@
  	')
  ')
  
-@@ -846,6 +878,28 @@
+@@ -846,6 +880,28 @@
  	# Local policy
  	#
  
@@ -27302,7 +27359,7 @@
  	optional_policy(`
  		loadkeys_run($1_t,$1_r)
  	')
-@@ -876,7 +930,7 @@
+@@ -876,7 +932,7 @@
  
  	userdom_restricted_user_template($1)
  
@@ -27311,17 +27368,17 @@
  
  	##############################
  	#
-@@ -884,14 +938,18 @@
+@@ -884,14 +940,18 @@
  	#
  
  	auth_role($1_r, $1_t)
 -	auth_search_pam_console_data($1_t)
 +	auth_search_pam_console_data($1_usertype)
-+
-+	xserver_role($1_r, $1_t)
  
 -	dev_read_sound($1_t)
 -	dev_write_sound($1_t)
++	xserver_role($1_r, $1_t)
++
 +	dev_read_sound($1_usertype)
 +	dev_write_sound($1_usertype)
  	# gnome keyring wants to read this.
@@ -27335,7 +27392,7 @@
  	logging_dontaudit_send_audit_msgs($1_t)
  
  	# Need to to this just so screensaver will work. Should be moved to screensaver domain
-@@ -899,28 +957,24 @@
+@@ -899,28 +959,24 @@
  	selinux_get_enforce_mode($1_t)
  
  	optional_policy(`
@@ -27370,7 +27427,7 @@
  	')
  ')
  
-@@ -931,8 +985,7 @@
+@@ -931,8 +987,7 @@
  ## </summary>
  ## <desc>
  ##	<p>
@@ -27380,7 +27437,7 @@
  ##	</p>
  ##	<p>
  ##	This template creates a user domain, types, and
-@@ -954,8 +1007,8 @@
+@@ -954,8 +1009,8 @@
  	# Declarations
  	#
  
@@ -27390,7 +27447,7 @@
  	userdom_common_user_template($1)
  
  	##############################
-@@ -964,11 +1017,10 @@
+@@ -964,11 +1019,10 @@
  	#
  
  	# port access is audited even if dac would not have allowed it, so dontaudit it here
@@ -27403,7 +27460,7 @@
  	# cjp: why?
  	files_read_kernel_symbol_table($1_t)
  
-@@ -986,37 +1038,43 @@
+@@ -986,37 +1040,43 @@
  		')
  	')
  
@@ -27460,7 +27517,7 @@
  ')
  
  #######################################
-@@ -1050,7 +1108,7 @@
+@@ -1050,7 +1110,7 @@
  #
  template(`userdom_admin_user_template',`
  	gen_require(`
@@ -27469,7 +27526,7 @@
  	')
  
  	##############################
-@@ -1059,8 +1117,7 @@
+@@ -1059,8 +1119,7 @@
  	#
  
  	# Inherit rules for ordinary users.
@@ -27479,7 +27536,7 @@
  
  	domain_obj_id_change_exemption($1_t)
  	role system_r types $1_t;
-@@ -1083,7 +1140,8 @@
+@@ -1083,7 +1142,8 @@
  	# Skip authentication when pam_rootok is specified.
  	allow $1_t self:passwd rootok;
  
@@ -27489,7 +27546,7 @@
  
  	kernel_read_software_raid_state($1_t)
  	kernel_getattr_core_if($1_t)
-@@ -1106,8 +1164,6 @@
+@@ -1106,8 +1166,6 @@
  
  	dev_getattr_generic_blk_files($1_t)
  	dev_getattr_generic_chr_files($1_t)
@@ -27498,7 +27555,7 @@
  	# Allow MAKEDEV to work
  	dev_create_all_blk_files($1_t)
  	dev_create_all_chr_files($1_t)
-@@ -1162,20 +1218,6 @@
+@@ -1162,20 +1220,6 @@
  	# But presently necessary for installing the file_contexts file.
  	seutil_manage_bin_policy($1_t)
  
@@ -27519,7 +27576,7 @@
  	optional_policy(`
  		postgresql_unconfined($1_t)
  	')
-@@ -1221,6 +1263,7 @@
+@@ -1221,6 +1265,7 @@
  	dev_relabel_all_dev_nodes($1)
  
  	files_create_boot_flag($1)
@@ -27527,7 +27584,7 @@
  
  	# Necessary for managing /boot/efi
  	fs_manage_dos_files($1)
-@@ -1286,11 +1329,15 @@
+@@ -1286,11 +1331,15 @@
  interface(`userdom_user_home_content',`
  	gen_require(`
  		type user_home_t;
@@ -27543,7 +27600,7 @@
  ')
  
  ########################################
-@@ -1387,7 +1434,7 @@
+@@ -1387,7 +1436,7 @@
  
  ########################################
  ## <summary>
@@ -27552,7 +27609,7 @@
  ## </summary>
  ## <param name="domain">
  ##	<summary>
-@@ -1420,6 +1467,14 @@
+@@ -1420,6 +1469,14 @@
  
  	allow $1 user_home_dir_t:dir list_dir_perms;
  	files_search_home($1)
@@ -27567,7 +27624,7 @@
  ')
  
  ########################################
-@@ -1435,9 +1490,11 @@
+@@ -1435,9 +1492,11 @@
  interface(`userdom_dontaudit_list_user_home_dirs',`
  	gen_require(`
  		type user_home_dir_t;
@@ -27579,7 +27636,7 @@
  ')
  
  ########################################
-@@ -1494,6 +1551,25 @@
+@@ -1494,6 +1553,25 @@
  	allow $1 user_home_dir_t:dir relabelto;
  ')
  
@@ -27605,7 +27662,7 @@
  ########################################
  ## <summary>
  ##	Create directories in the home dir root with
-@@ -1547,9 +1623,9 @@
+@@ -1547,9 +1625,9 @@
  		type user_home_dir_t, user_home_t;
  	')
  
@@ -27617,7 +27674,7 @@
  ')
  
  ########################################
-@@ -1568,6 +1644,8 @@
+@@ -1568,6 +1646,8 @@
  	')
  
  	dontaudit $1 user_home_t:dir search_dir_perms;
@@ -27626,7 +27683,7 @@
  ')
  
  ########################################
-@@ -1643,6 +1721,7 @@
+@@ -1643,6 +1723,7 @@
  		type user_home_dir_t, user_home_t;
  	')
  
@@ -27634,7 +27691,7 @@
  	read_files_pattern($1, { user_home_dir_t user_home_t }, user_home_t)
  	files_search_home($1)
  ')
-@@ -1741,6 +1820,62 @@
+@@ -1741,6 +1822,62 @@
  
  ########################################
  ## <summary>
@@ -27697,7 +27754,7 @@
  ##	Execute user home files.
  ## </summary>
  ## <param name="domain">
-@@ -1757,14 +1892,6 @@
+@@ -1757,14 +1894,6 @@
  
  	files_search_home($1)
  	exec_files_pattern($1, { user_home_dir_t user_home_t }, user_home_t)
@@ -27712,7 +27769,7 @@
  ')
  
  ########################################
-@@ -1787,6 +1914,46 @@
+@@ -1787,6 +1916,46 @@
  
  ########################################
  ## <summary>
@@ -27759,7 +27816,7 @@
  ##	Create, read, write, and delete files
  ##	in a user home subdirectory.
  ## </summary>
-@@ -2819,6 +2986,24 @@
+@@ -2819,6 +2988,24 @@
  
  ########################################
  ## <summary>
@@ -27784,7 +27841,7 @@
  ##	Do not audit attempts to use user ttys.
  ## </summary>
  ## <param name="domain">
-@@ -2851,6 +3036,7 @@
+@@ -2851,6 +3038,7 @@
  	')
  
  	read_files_pattern($1,userdomain,userdomain)
@@ -27792,7 +27849,7 @@
  	kernel_search_proc($1)
  ')
  
-@@ -2965,6 +3151,24 @@
+@@ -2965,6 +3153,24 @@
  
  ########################################
  ## <summary>
@@ -27817,7 +27874,7 @@
  ##	Send a dbus message to all user domains.
  ## </summary>
  ## <param name="domain">
-@@ -2981,3 +3185,264 @@
+@@ -2981,3 +3187,264 @@
  
  	allow $1 userdomain:dbus send_msg;
  ')


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.760
retrieving revision 1.761
diff -u -r1.760 -r1.761
--- selinux-policy.spec	27 Dec 2008 13:05:32 -0000	1.760
+++ selinux-policy.spec	4 Jan 2009 19:45:03 -0000	1.761
@@ -1,4 +1,4 @@
-%define distro redhat
+ %define distro redhat
 %define polyinstatiate n
 %define monolithic n
 %if %{?BUILD_TARGETED:0}%{!?BUILD_TARGETED:1}
@@ -20,7 +20,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.6.1
-Release: 14%{?dist}
+Release: 15%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -446,6 +446,9 @@
 %endif
 
 %changelog
+* Sun Jan 4 2009 Dan Walsh <dwalsh at redhat.com> 3.6.1-15
+- Allow hal_acl_t to getattr/setattr fixed_disk
+
 * Sat Dec 27 2008 Dan Walsh <dwalsh at redhat.com> 3.6.1-14
 - Change userdom_read_all_users_state to include reading symbolic links in /proc
 



From dwalsh at fedoraproject.org  Sun Jan  4 19:45:27 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Sun,  4 Jan 2009 19:45:27 +0000 (UTC)
Subject: rpms/selinux-policy/F-10 policy-20080710.patch, 1.117,
	1.118 selinux-policy.spec, 1.764, 1.765
Message-ID: <20090104194527.8E5B470130@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14051

Modified Files:
	policy-20080710.patch selinux-policy.spec 
Log Message:
* Sun Jan 4 2009 Dan Walsh <dwalsh at redhat.com> 3.5.13-38
- Allow sendmail to list inotifyfs


policy-20080710.patch:

Index: policy-20080710.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-10/policy-20080710.patch,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -r1.117 -r1.118
--- policy-20080710.patch	27 Dec 2008 13:05:44 -0000	1.117
+++ policy-20080710.patch	4 Jan 2009 19:45:24 -0000	1.118
@@ -3150,7 +3150,7 @@
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/java.te serefpolicy-3.5.13/policy/modules/apps/java.te
 --- nsaserefpolicy/policy/modules/apps/java.te	2008-10-17 08:49:14.000000000 -0400
-+++ serefpolicy-3.5.13/policy/modules/apps/java.te	2008-11-24 10:49:49.000000000 -0500
++++ serefpolicy-3.5.13/policy/modules/apps/java.te	2009-01-04 13:52:24.000000000 -0500
 @@ -6,16 +6,10 @@
  # Declarations
  #
@@ -3169,12 +3169,14 @@
  
  ########################################
  #
-@@ -23,11 +17,28 @@
+@@ -23,11 +17,30 @@
  #
  
  # execheap is needed for itanium/BEA jrocket
 -allow java_t self:process { execstack execmem execheap };
 +allow java_t self:process { getsched sigkill execheap execmem execstack };
++
++libs_legacy_use_shared_libs(java_t)
  
 +optional_policy(`
  init_dbus_chat_script(java_t)
@@ -10443,7 +10445,7 @@
  ')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.fc serefpolicy-3.5.13/policy/modules/services/apache.fc
 --- nsaserefpolicy/policy/modules/services/apache.fc	2008-10-17 08:49:13.000000000 -0400
-+++ serefpolicy-3.5.13/policy/modules/services/apache.fc	2008-11-24 10:49:49.000000000 -0500
++++ serefpolicy-3.5.13/policy/modules/services/apache.fc	2008-12-29 10:16:37.000000000 -0500
 @@ -1,12 +1,13 @@
 -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)
@@ -10503,10 +10505,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)
-@@ -64,11 +71,21 @@
+@@ -64,11 +71,22 @@
  /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/mod_.*				gen_context(system_u:object_r:httpd_var_run_t,s0)
 +/var/run/wsgi.*			-s	gen_context(system_u:object_r:httpd_var_run_t,s0)
  
  /var/spool/gosa(/.*)?			gen_context(system_u:object_r:httpd_sys_script_rw_t,s0)
@@ -16688,7 +16691,7 @@
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.te serefpolicy-3.5.13/policy/modules/services/hal.te
 --- nsaserefpolicy/policy/modules/services/hal.te	2008-10-17 08:49:13.000000000 -0400
-+++ serefpolicy-3.5.13/policy/modules/services/hal.te	2008-12-19 17:16:31.000000000 -0500
++++ serefpolicy-3.5.13/policy/modules/services/hal.te	2009-01-04 12:01:17.000000000 -0500
 @@ -49,6 +49,15 @@
  type hald_var_lib_t;
  files_type(hald_var_lib_t)
@@ -16705,7 +16708,15 @@
  ########################################
  #
  # Local policy
-@@ -143,6 +152,7 @@
+@@ -85,6 +94,7 @@
+ manage_dirs_pattern(hald_t, hald_var_run_t, hald_var_run_t)
+ manage_files_pattern(hald_t, hald_var_run_t, hald_var_run_t)
+ files_pid_filetrans(hald_t, hald_var_run_t, { dir file })
++allow hald_t hald_var_run_t:dir mounton;
+ 
+ kernel_read_system_state(hald_t)
+ kernel_read_network_state(hald_t)
+@@ -143,11 +153,16 @@
  files_getattr_all_dirs(hald_t)
  files_read_kernel_img(hald_t)
  files_rw_lock_dirs(hald_t)
@@ -16713,7 +16724,16 @@
  
  fs_getattr_all_fs(hald_t)
  fs_search_all(hald_t)
-@@ -197,6 +207,7 @@
+ fs_list_inotifyfs(hald_t)
+ fs_list_auto_mountpoints(hald_t)
++fs_mount_dos_fs(hald_t)
++fs_unmount_dos_fs(hald_t)
++fs_manage_dos_files(hald_t)
++
+ files_getattr_all_mountpoints(hald_t)
+ 
+ mls_file_read_all_levels(hald_t)
+@@ -197,6 +212,7 @@
  seutil_read_file_contexts(hald_t)
  
  sysnet_read_config(hald_t)
@@ -16721,7 +16741,7 @@
  
  userdom_dontaudit_use_unpriv_user_fds(hald_t)
  
-@@ -280,6 +291,12 @@
+@@ -280,6 +296,12 @@
  ')
  
  optional_policy(`
@@ -16734,7 +16754,7 @@
  	rpc_search_nfs_state_data(hald_t)
  ')
  
-@@ -300,12 +317,20 @@
+@@ -300,12 +322,20 @@
  	vbetool_domtrans(hald_t)
  ')
  
@@ -16756,7 +16776,7 @@
  allow hald_acl_t self:process { getattr signal };
  allow hald_acl_t self:fifo_file rw_fifo_file_perms;
  
-@@ -344,13 +369,22 @@
+@@ -344,13 +374,22 @@
  libs_use_ld_so(hald_acl_t)
  libs_use_shared_libs(hald_acl_t)
  
@@ -16779,7 +16799,7 @@
  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;
-@@ -359,6 +393,8 @@
+@@ -359,6 +398,8 @@
  manage_files_pattern(hald_mac_t, hald_var_lib_t, hald_var_lib_t)
  files_search_var_lib(hald_mac_t)
  
@@ -16788,7 +16808,7 @@
  kernel_read_system_state(hald_mac_t)
  
  dev_read_raw_memory(hald_mac_t)
-@@ -366,6 +402,9 @@
+@@ -366,6 +407,9 @@
  dev_read_sysfs(hald_mac_t)
  
  files_read_usr_files(hald_mac_t)
@@ -16798,7 +16818,7 @@
  
  libs_use_ld_so(hald_mac_t)
  libs_use_shared_libs(hald_mac_t)
-@@ -388,6 +427,8 @@
+@@ -388,6 +432,8 @@
  manage_files_pattern(hald_sonypic_t, hald_var_lib_t, hald_var_lib_t)
  files_search_var_lib(hald_sonypic_t)
  
@@ -16807,7 +16827,7 @@
  files_read_usr_files(hald_sonypic_t)
  
  libs_use_ld_so(hald_sonypic_t)
-@@ -408,6 +449,8 @@
+@@ -408,6 +454,8 @@
  manage_files_pattern(hald_keymap_t, hald_var_lib_t, hald_var_lib_t)
  files_search_var_lib(hald_keymap_t)
  
@@ -16816,7 +16836,7 @@
  dev_rw_input_dev(hald_keymap_t)
  
  files_read_usr_files(hald_keymap_t)
-@@ -419,4 +462,50 @@
+@@ -419,4 +467,50 @@
  
  # This is caused by a bug in hald and PolicyKit.  
  # Should be removed when this is fixed
@@ -22822,6 +22842,18 @@
  
  kernel_read_kernel_sysctls(radiusd_t)
  kernel_read_system_state(radiusd_t)
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/radvd.te serefpolicy-3.5.13/policy/modules/services/radvd.te
+--- nsaserefpolicy/policy/modules/services/radvd.te	2008-10-17 08:49:13.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/services/radvd.te	2009-01-04 12:30:26.000000000 -0500
+@@ -22,7 +22,7 @@
+ #
+ # Local policy
+ #
+-allow radvd_t self:capability { setgid setuid net_raw };
++allow radvd_t self:capability { setgid setuid net_raw net_admin };
+ dontaudit radvd_t self:capability sys_tty_config;
+ allow radvd_t self:process signal_perms;
+ allow radvd_t self:unix_dgram_socket create_socket_perms;
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/razor.fc serefpolicy-3.5.13/policy/modules/services/razor.fc
 --- nsaserefpolicy/policy/modules/services/razor.fc	2008-10-17 08:49:13.000000000 -0400
 +++ serefpolicy-3.5.13/policy/modules/services/razor.fc	2008-11-24 10:49:49.000000000 -0500
@@ -24490,7 +24522,7 @@
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/sendmail.te serefpolicy-3.5.13/policy/modules/services/sendmail.te
 --- nsaserefpolicy/policy/modules/services/sendmail.te	2008-10-17 08:49:13.000000000 -0400
-+++ serefpolicy-3.5.13/policy/modules/services/sendmail.te	2008-11-25 10:39:57.000000000 -0500
++++ serefpolicy-3.5.13/policy/modules/services/sendmail.te	2009-01-04 12:51:17.000000000 -0500
 @@ -20,13 +20,17 @@
  mta_mailserver_delivery(sendmail_t)
  mta_mailserver_sender(sendmail_t)
@@ -24519,11 +24551,12 @@
  
  corenet_all_recvfrom_unlabeled(sendmail_t)
  corenet_all_recvfrom_netlabel(sendmail_t)
-@@ -64,24 +69,29 @@
+@@ -64,24 +69,30 @@
  
  fs_getattr_all_fs(sendmail_t)
  fs_search_auto_mountpoints(sendmail_t)
 +fs_rw_anon_inodefs_files(sendmail_t)
++fs_list_inotifyfs(sendmail_t)
  
  term_dontaudit_use_console(sendmail_t)
  
@@ -24549,7 +24582,7 @@
  
  auth_use_nsswitch(sendmail_t)
  
-@@ -91,34 +101,55 @@
+@@ -91,34 +102,55 @@
  libs_read_lib_files(sendmail_t)
  
  logging_send_syslog_msg(sendmail_t)
@@ -24608,7 +24641,7 @@
  ')
  
  optional_policy(`
-@@ -126,24 +157,29 @@
+@@ -126,24 +158,29 @@
  ')
  
  optional_policy(`
@@ -33386,7 +33419,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.13/policy/modules/system/userdomain.if
 --- nsaserefpolicy/policy/modules/system/userdomain.if	2008-10-17 08:49:13.000000000 -0400
-+++ serefpolicy-3.5.13/policy/modules/system/userdomain.if	2008-12-10 09:16:20.000000000 -0500
++++ serefpolicy-3.5.13/policy/modules/system/userdomain.if	2009-01-04 13:56:10.000000000 -0500
 @@ -28,10 +28,14 @@
  		class context contains;
  	')
@@ -34288,18 +34321,29 @@
  ')
  
  #######################################
-@@ -902,9 +883,7 @@
+@@ -902,8 +883,8 @@
  ## </param>
  #
  template(`userdom_login_user_template', `
 -	gen_require(`
 -		class context contains;
--	')
-+	gen_tunable(allow_$1_exec_content, true)
++	ifelse(`$1',`unconfined',`',`
++		gen_tunable(allow_$1_exec_content, true)
+ 	')
  
  	userdom_base_user_template($1)
+@@ -915,8 +896,10 @@
+ 	userdom_manage_tmp_template($1)
+ 	userdom_manage_tmpfs_template($1)
+ 
++	ifelse(`$1',`unconfined',`',`
+ 	userdom_exec_tmp_template($1)
+ 	userdom_exec_home_template($1)
++	')
+ 
+ 	userdom_change_password_template($1)
  
-@@ -930,74 +909,77 @@
+@@ -930,74 +913,77 @@
  
  	allow $1_t self:process ~{ setcurrent setexec setrlimit execmem execstack execheap };
  	dontaudit $1_t self:process setrlimit;
@@ -34410,7 +34454,7 @@
  	')
  ')
  
-@@ -1031,9 +1013,6 @@
+@@ -1031,9 +1017,6 @@
  	domain_interactive_fd($1_t)
  
  	typeattribute $1_devpts_t user_ptynode;
@@ -34420,7 +34464,7 @@
  	typeattribute $1_tty_device_t user_ttynode;
  
  	##############################
-@@ -1042,12 +1021,32 @@
+@@ -1042,12 +1025,32 @@
  	#
  
  	# privileged home directory writers
@@ -34459,7 +34503,7 @@
  
  	optional_policy(`
  		loadkeys_run($1_t,$1_r,$1_tty_device_t)
-@@ -1079,7 +1078,9 @@
+@@ -1079,7 +1082,9 @@
  
  	userdom_restricted_user_template($1)
  
@@ -34469,7 +34513,7 @@
  
  	##############################
  	#
-@@ -1087,14 +1088,16 @@
+@@ -1087,14 +1092,16 @@
  	#
  
  	authlogin_per_role_template($1, $1_t, $1_r)
@@ -34491,7 +34535,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 +1105,19 @@
+@@ -1102,28 +1109,19 @@
  	selinux_get_enforce_mode($1_t)
  
  	optional_policy(`
@@ -34524,7 +34568,7 @@
  	')
  ')
  
-@@ -1134,8 +1128,7 @@
+@@ -1134,8 +1132,7 @@
  ## </summary>
  ## <desc>
  ##	<p>
@@ -34534,7 +34578,7 @@
  ##	</p>
  ##	<p>
  ##	This template creates a user domain, types, and
-@@ -1157,8 +1150,8 @@
+@@ -1157,8 +1154,8 @@
  	# Declarations
  	#
  
@@ -34544,7 +34588,7 @@
  	userdom_common_user_template($1)
  
  	##############################
-@@ -1167,11 +1160,10 @@
+@@ -1167,11 +1164,10 @@
  	#
  
  	# port access is audited even if dac would not have allowed it, so dontaudit it here
@@ -34557,7 +34601,7 @@
  	# cjp: why?
  	files_read_kernel_symbol_table($1_t)
  
-@@ -1189,36 +1181,41 @@
+@@ -1189,36 +1185,41 @@
  		')
  	')
  
@@ -34612,7 +34656,7 @@
  	')
  ')
  
-@@ -1263,8 +1260,7 @@
+@@ -1263,8 +1264,7 @@
  	#
  
  	# Inherit rules for ordinary users.
@@ -34622,7 +34666,7 @@
  
  	typeattribute $1_t privhome;
  	domain_obj_id_change_exemption($1_t)
-@@ -1295,8 +1291,6 @@
+@@ -1295,8 +1295,6 @@
  	# Manipulate other users crontab.
  	allow $1_t self:passwd crontab;
  
@@ -34631,7 +34675,7 @@
  	kernel_read_software_raid_state($1_t)
  	kernel_getattr_core_if($1_t)
  	kernel_getattr_message_if($1_t)
-@@ -1318,8 +1312,6 @@
+@@ -1318,8 +1316,6 @@
  
  	dev_getattr_generic_blk_files($1_t)
  	dev_getattr_generic_chr_files($1_t)
@@ -34640,7 +34684,7 @@
  	# Allow MAKEDEV to work
  	dev_create_all_blk_files($1_t)
  	dev_create_all_chr_files($1_t)
-@@ -1374,13 +1366,6 @@
+@@ -1374,13 +1370,6 @@
  	# But presently necessary for installing the file_contexts file.
  	seutil_manage_bin_policy($1_t)
  
@@ -34654,7 +34698,7 @@
  	optional_policy(`
  		postgresql_unconfined($1_t)
  	')
-@@ -1432,6 +1417,7 @@
+@@ -1432,6 +1421,7 @@
  	dev_relabel_all_dev_nodes($1)
  
  	files_create_boot_flag($1)
@@ -34662,7 +34706,7 @@
  
  	# Necessary for managing /boot/efi
  	fs_manage_dos_files($1)
-@@ -1461,10 +1447,6 @@
+@@ -1461,10 +1451,6 @@
  	seutil_run_semanage($1,$2,$3)
  	seutil_run_setfiles($1, $2, $3)
  
@@ -34673,7 +34717,7 @@
  	optional_policy(`
  		aide_run($1,$2, $3)
  	')
-@@ -1484,6 +1466,14 @@
+@@ -1484,6 +1470,14 @@
  	optional_policy(`
  		netlabel_run_mgmt($1,$2, $3)
  	')
@@ -34688,7 +34732,7 @@
  ')
  
  ########################################
-@@ -1741,11 +1731,15 @@
+@@ -1741,11 +1735,15 @@
  #
  template(`userdom_user_home_content',`
  	gen_require(`
@@ -34707,7 +34751,7 @@
  ')
  
  ########################################
-@@ -1841,11 +1835,11 @@
+@@ -1841,11 +1839,11 @@
  #
  template(`userdom_search_user_home_dirs',`
  	gen_require(`
@@ -34721,7 +34765,7 @@
  ')
  
  ########################################
-@@ -1875,11 +1869,11 @@
+@@ -1875,11 +1873,11 @@
  #
  template(`userdom_list_user_home_dirs',`
  	gen_require(`
@@ -34735,7 +34779,7 @@
  ')
  
  ########################################
-@@ -1923,12 +1917,12 @@
+@@ -1923,12 +1921,12 @@
  #
  template(`userdom_user_home_domtrans',`
  	gen_require(`
@@ -34751,7 +34795,7 @@
  ')
  
  ########################################
-@@ -1958,10 +1952,11 @@
+@@ -1958,10 +1956,11 @@
  #
  template(`userdom_dontaudit_list_user_home_dirs',`
  	gen_require(`
@@ -34765,7 +34809,7 @@
  ')
  
  ########################################
-@@ -1993,11 +1988,47 @@
+@@ -1993,11 +1992,47 @@
  #
  template(`userdom_manage_user_home_content_dirs',`
  	gen_require(`
@@ -34815,7 +34859,7 @@
  ')
  
  ########################################
-@@ -2029,10 +2060,10 @@
+@@ -2029,10 +2064,10 @@
  #
  template(`userdom_dontaudit_setattr_user_home_content_files',`
  	gen_require(`
@@ -34828,7 +34872,7 @@
  ')
  
  ########################################
-@@ -2062,11 +2093,11 @@
+@@ -2062,11 +2097,11 @@
  #
  template(`userdom_read_user_home_content_files',`
  	gen_require(`
@@ -34842,7 +34886,7 @@
  ')
  
  ########################################
-@@ -2096,11 +2127,11 @@
+@@ -2096,11 +2131,11 @@
  #
  template(`userdom_dontaudit_read_user_home_content_files',`
  	gen_require(`
@@ -34857,7 +34901,7 @@
  ')
  
  ########################################
-@@ -2130,10 +2161,14 @@
+@@ -2130,10 +2165,14 @@
  #
  template(`userdom_dontaudit_write_user_home_content_files',`
  	gen_require(`
@@ -34874,7 +34918,7 @@
  ')
  
  ########################################
-@@ -2163,11 +2198,11 @@
+@@ -2163,11 +2202,11 @@
  #
  template(`userdom_read_user_home_content_symlinks',`
  	gen_require(`
@@ -34888,7 +34932,7 @@
  ')
  
  ########################################
-@@ -2197,11 +2232,11 @@
+@@ -2197,11 +2236,11 @@
  #
  template(`userdom_exec_user_home_content_files',`
  	gen_require(`
@@ -34902,7 +34946,7 @@
  ')
  
  ########################################
-@@ -2231,10 +2266,10 @@
+@@ -2231,10 +2270,10 @@
  #
  template(`userdom_dontaudit_exec_user_home_content_files',`
  	gen_require(`
@@ -34915,7 +34959,7 @@
  ')
  
  ########################################
-@@ -2266,12 +2301,12 @@
+@@ -2266,12 +2305,12 @@
  #
  template(`userdom_manage_user_home_content_files',`
  	gen_require(`
@@ -34931,7 +34975,7 @@
  ')
  
  ########################################
-@@ -2303,10 +2338,10 @@
+@@ -2303,10 +2342,10 @@
  #
  template(`userdom_dontaudit_manage_user_home_content_dirs',`
  	gen_require(`
@@ -34944,7 +34988,7 @@
  ')
  
  ########################################
-@@ -2338,12 +2373,12 @@
+@@ -2338,12 +2377,12 @@
  #
  template(`userdom_manage_user_home_content_symlinks',`
  	gen_require(`
@@ -34960,7 +35004,7 @@
  ')
  
  ########################################
-@@ -2375,12 +2410,12 @@
+@@ -2375,12 +2414,12 @@
  #
  template(`userdom_manage_user_home_content_pipes',`
  	gen_require(`
@@ -34976,7 +35020,7 @@
  ')
  
  ########################################
-@@ -2412,12 +2447,12 @@
+@@ -2412,12 +2451,12 @@
  #
  template(`userdom_manage_user_home_content_sockets',`
  	gen_require(`
@@ -34992,7 +35036,7 @@
  ')
  
  ########################################
-@@ -2462,11 +2497,11 @@
+@@ -2462,11 +2501,11 @@
  #
  template(`userdom_user_home_dir_filetrans',`
  	gen_require(`
@@ -35006,7 +35050,7 @@
  ')
  
  ########################################
-@@ -2511,11 +2546,11 @@
+@@ -2511,11 +2550,11 @@
  #
  template(`userdom_user_home_content_filetrans',`
  	gen_require(`
@@ -35020,7 +35064,7 @@
  ')
  
  ########################################
-@@ -2555,11 +2590,11 @@
+@@ -2555,11 +2594,11 @@
  #
  template(`userdom_user_home_dir_filetrans_user_home_content',`
  	gen_require(`
@@ -35034,7 +35078,7 @@
  ')
  
  ########################################
-@@ -2589,11 +2624,11 @@
+@@ -2589,11 +2628,11 @@
  #
  template(`userdom_write_user_tmp_sockets',`
  	gen_require(`
@@ -35048,7 +35092,7 @@
  ')
  
  ########################################
-@@ -2623,11 +2658,11 @@
+@@ -2623,11 +2662,11 @@
  #
  template(`userdom_list_user_tmp',`
  	gen_require(`
@@ -35062,7 +35106,7 @@
  ')
  
  ########################################
-@@ -2659,10 +2694,10 @@
+@@ -2659,10 +2698,10 @@
  #
  template(`userdom_dontaudit_list_user_tmp',`
  	gen_require(`
@@ -35075,7 +35119,7 @@
  ')
  
  ########################################
-@@ -2694,10 +2729,10 @@
+@@ -2694,10 +2733,10 @@
  #
  template(`userdom_dontaudit_manage_user_tmp_dirs',`
  	gen_require(`
@@ -35088,7 +35132,7 @@
  ')
  
  ########################################
-@@ -2727,12 +2762,12 @@
+@@ -2727,12 +2766,12 @@
  #
  template(`userdom_read_user_tmp_files',`
  	gen_require(`
@@ -35104,7 +35148,7 @@
  ')
  
  ########################################
-@@ -2764,10 +2799,10 @@
+@@ -2764,10 +2803,10 @@
  #
  template(`userdom_dontaudit_read_user_tmp_files',`
  	gen_require(`
@@ -35117,7 +35161,7 @@
  ')
  
  ########################################
-@@ -2799,10 +2834,10 @@
+@@ -2799,10 +2838,10 @@
  #
  template(`userdom_dontaudit_append_user_tmp_files',`
  	gen_require(`
@@ -35130,7 +35174,7 @@
  ')
  
  ########################################
-@@ -2832,12 +2867,12 @@
+@@ -2832,12 +2871,12 @@
  #
  template(`userdom_rw_user_tmp_files',`
  	gen_require(`
@@ -35146,7 +35190,7 @@
  ')
  
  ########################################
-@@ -2869,10 +2904,10 @@
+@@ -2869,10 +2908,10 @@
  #
  template(`userdom_dontaudit_manage_user_tmp_files',`
  	gen_require(`
@@ -35159,7 +35203,7 @@
  ')
  
  ########################################
-@@ -2904,12 +2939,12 @@
+@@ -2904,12 +2943,12 @@
  #
  template(`userdom_read_user_tmp_symlinks',`
  	gen_require(`
@@ -35175,7 +35219,7 @@
  ')
  
  ########################################
-@@ -2941,11 +2976,11 @@
+@@ -2941,11 +2980,11 @@
  #
  template(`userdom_manage_user_tmp_dirs',`
  	gen_require(`
@@ -35189,7 +35233,7 @@
  ')
  
  ########################################
-@@ -2977,11 +3012,11 @@
+@@ -2977,11 +3016,11 @@
  #
  template(`userdom_manage_user_tmp_files',`
  	gen_require(`
@@ -35203,7 +35247,7 @@
  ')
  
  ########################################
-@@ -3013,11 +3048,11 @@
+@@ -3013,11 +3052,11 @@
  #
  template(`userdom_manage_user_tmp_symlinks',`
  	gen_require(`
@@ -35217,7 +35261,7 @@
  ')
  
  ########################################
-@@ -3049,11 +3084,11 @@
+@@ -3049,11 +3088,11 @@
  #
  template(`userdom_manage_user_tmp_pipes',`
  	gen_require(`
@@ -35231,7 +35275,7 @@
  ')
  
  ########################################
-@@ -3085,11 +3120,11 @@
+@@ -3085,11 +3124,11 @@
  #
  template(`userdom_manage_user_tmp_sockets',`
  	gen_require(`
@@ -35245,7 +35289,7 @@
  ')
  
  ########################################
-@@ -3134,10 +3169,10 @@
+@@ -3134,10 +3173,10 @@
  #
  template(`userdom_user_tmp_filetrans',`
  	gen_require(`
@@ -35258,7 +35302,7 @@
  	files_search_tmp($2)
  ')
  
-@@ -3178,19 +3213,19 @@
+@@ -3178,19 +3217,19 @@
  #
  template(`userdom_tmp_filetrans_user_tmp',`
  	gen_require(`
@@ -35282,7 +35326,7 @@
  ##	</p>
  ##	<p>
  ##	This is a templated interface, and should only
-@@ -3211,13 +3246,13 @@
+@@ -3211,13 +3250,13 @@
  #
  template(`userdom_rw_user_tmpfs_files',`
  	gen_require(`
@@ -35300,7 +35344,7 @@
  ')
  
  ########################################
-@@ -4616,11 +4651,11 @@
+@@ -4616,11 +4655,11 @@
  #
  interface(`userdom_search_all_users_home_dirs',`
  	gen_require(`
@@ -35314,7 +35358,7 @@
  ')
  
  ########################################
-@@ -4640,6 +4675,14 @@
+@@ -4640,6 +4679,14 @@
  
  	files_list_home($1)
  	allow $1 home_dir_type:dir list_dir_perms;
@@ -35329,7 +35373,7 @@
  ')
  
  ########################################
-@@ -4677,6 +4720,8 @@
+@@ -4677,6 +4724,8 @@
  	')
  
  	dontaudit $1 { home_dir_type home_type }:dir search_dir_perms;
@@ -35338,7 +35382,7 @@
  ')
  
  ########################################
-@@ -4721,6 +4766,25 @@
+@@ -4721,6 +4770,25 @@
  
  ########################################
  ## <summary>
@@ -35364,7 +35408,7 @@
  ##	Create, read, write, and delete all files
  ##	in all users home directories.
  ## </summary>
-@@ -4946,7 +5010,7 @@
+@@ -4946,7 +5014,7 @@
  
  ########################################
  ## <summary>
@@ -35373,7 +35417,7 @@
  ## </summary>
  ## <param name="domain">
  ##	<summary>
-@@ -5318,7 +5382,7 @@
+@@ -5318,7 +5386,7 @@
  
  ########################################
  ## <summary>
@@ -35382,7 +35426,7 @@
  ## </summary>
  ## <param name="domain">
  ##	<summary>
-@@ -5326,18 +5390,17 @@
+@@ -5326,18 +5394,17 @@
  ##	</summary>
  ## </param>
  #
@@ -35405,7 +35449,7 @@
  ## </summary>
  ## <param name="domain">
  ##	<summary>
-@@ -5345,17 +5408,17 @@
+@@ -5345,17 +5412,17 @@
  ##	</summary>
  ## </param>
  #
@@ -35427,7 +35471,7 @@
  ## </summary>
  ## <param name="domain">
  ##	<summary>
-@@ -5363,18 +5426,18 @@
+@@ -5363,18 +5430,18 @@
  ##	</summary>
  ## </param>
  #
@@ -35451,7 +35495,7 @@
  ## </summary>
  ## <param name="domain">
  ##	<summary>
-@@ -5382,9 +5445,46 @@
+@@ -5382,9 +5449,46 @@
  ##	</summary>
  ## </param>
  #
@@ -35500,7 +35544,7 @@
  	')
  
  	allow $1 userdomain:process getattr;
-@@ -5447,6 +5547,24 @@
+@@ -5447,6 +5551,24 @@
  
  ########################################
  ## <summary>
@@ -35525,7 +35569,7 @@
  ##	Send a SIGCHLD signal to all user domains.
  ## </summary>
  ## <param name="domain">
-@@ -5483,6 +5601,42 @@
+@@ -5483,6 +5605,42 @@
  
  ########################################
  ## <summary>
@@ -35568,7 +35612,7 @@
  ##	Send a dbus message to all user domains.
  ## </summary>
  ## <param name="domain">
-@@ -5513,3 +5667,601 @@
+@@ -5513,3 +5671,601 @@
  interface(`userdom_unconfined',`
  	refpolicywarn(`$0($*) has been deprecated.')
  ')


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-10/selinux-policy.spec,v
retrieving revision 1.764
retrieving revision 1.765
diff -u -r1.764 -r1.765
--- selinux-policy.spec	27 Dec 2008 13:05:46 -0000	1.764
+++ selinux-policy.spec	4 Jan 2009 19:45:26 -0000	1.765
@@ -20,7 +20,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.5.13
-Release: 37%{?dist}
+Release: 38%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -459,6 +459,9 @@
 %endif
 
 %changelog
+* Sun Jan 4 2009 Dan Walsh <dwalsh at redhat.com> 3.5.13-38
+- Allow sendmail to list inotifyfs
+
 * Sat Dec 27 2008 Dan Walsh <dwalsh at redhat.com> 3.5.13-37
 - Allow sshd to use inotify
 



From rdieter at fedoraproject.org  Sun Jan  4 19:46:50 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sun,  4 Jan 2009 19:46:50 +0000 (UTC)
Subject: rpms/eigen2/F-10 .cvsignore, 1.3, 1.4 eigen2.spec, 1.2, 1.3 sources,
	1.3, 1.4
Message-ID: <20090104194650.695BB70130@cvs1.fedora.phx.redhat.com>

Author: rdieter

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

Modified Files:
	.cvsignore eigen2.spec sources 
Log Message:
* Mon Dec 08 2008 Rex Dieter <rdieter at fedoraproject.org> 2.0-0.5.beta2
- eigen-2.0-beta2
- (re)enable buildtime test



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/eigen2/F-10/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	22 Sep 2008 17:58:03 -0000	1.3
+++ .cvsignore	4 Jan 2009 19:46:19 -0000	1.4
@@ -1 +1 @@
-eigen-2.0-beta1.tar.bz2
+eigen-2.0-beta2.tar.bz2


Index: eigen2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eigen2/F-10/eigen2.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- eigen2.spec	22 Sep 2008 17:58:03 -0000	1.2
+++ eigen2.spec	4 Jan 2009 19:46:20 -0000	1.3
@@ -2,13 +2,13 @@
 # Fedora package review
 # http://bugzilla.redhat.com/459705
 
-#define _with_check -DBUILD_TESTS=ON 
-%define pre beta1 
+%define _with_check -DBUILD_TESTS=ON 
+%define pre beta2
 
 Name:    eigen2
 Summary: A lightweight C++ template library for vector and matrix math
 Version: 2.0 
-Release: 0.4.%{pre}%{?dist} 
+Release: 0.5.%{pre}%{?dist} 
 Group:   System Environment/Libraries
 License: GPLv2+ or LGPLv3+
 URL:     http://eigen.tuxfamily.org/
@@ -19,12 +19,14 @@
 BuildRequires: cmake
 #docs
 BuildRequires: doxygen graphviz
+
+#BuildRequires: %{_bindir}/latex
 %if 0%{?fedora} > 8
 BuildRequires: tex(latex)
 %else
 BuildRequires: tetex-latex
-#BuildRequires: %{_bindir}/latex
 %endif
+
 %{?_with_check:BuildRequires: qt4-devel}
 
 %description
@@ -56,7 +58,6 @@
 doxygen
 
 
-
 %install
 rm -rf %{buildroot}
 
@@ -81,6 +82,10 @@
 
 
 %changelog
+* Mon Dec 08 2008 Rex Dieter <rdieter at fedoraproject.org> 2.0-0.5.beta2
+- eigen-2.0-beta2
+- (re)enable buildtime test
+
 * Mon Sep 22 2008 Rex Dieter <rdieter at fedoraproject.org> 2.0-0.4.beta1
 - eigen-2.0-beta1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eigen2/F-10/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	22 Sep 2008 17:58:03 -0000	1.3
+++ sources	4 Jan 2009 19:46:20 -0000	1.4
@@ -1 +1 @@
-6631f3fb3145b2f9a980cd64431104aa  eigen-2.0-beta1.tar.bz2
+22b55e388a602e0fa7e2098124f39f71  eigen-2.0-beta2.tar.bz2



From rdieter at fedoraproject.org  Sun Jan  4 19:47:07 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sun,  4 Jan 2009 19:47:07 +0000 (UTC)
Subject: rpms/eigen2/F-9 .cvsignore, 1.3, 1.4 eigen2.spec, 1.2, 1.3 sources, 
	1.3, 1.4
Message-ID: <20090104194707.78C7270130@cvs1.fedora.phx.redhat.com>

Author: rdieter

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

Modified Files:
	.cvsignore eigen2.spec sources 
Log Message:
* Mon Dec 08 2008 Rex Dieter <rdieter at fedoraproject.org> 2.0-0.5.beta2
- eigen-2.0-beta2
- (re)enable buildtime test



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/eigen2/F-9/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	25 Sep 2008 20:10:37 -0000	1.3
+++ .cvsignore	4 Jan 2009 19:46:36 -0000	1.4
@@ -1 +1 @@
-eigen-2.0-beta1.tar.bz2
+eigen-2.0-beta2.tar.bz2


Index: eigen2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eigen2/F-9/eigen2.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- eigen2.spec	25 Sep 2008 20:10:37 -0000	1.2
+++ eigen2.spec	4 Jan 2009 19:46:37 -0000	1.3
@@ -2,13 +2,13 @@
 # Fedora package review
 # http://bugzilla.redhat.com/459705
 
-#define _with_check -DBUILD_TESTS=ON 
-%define pre beta1 
+%define _with_check -DBUILD_TESTS=ON 
+%define pre beta2
 
 Name:    eigen2
 Summary: A lightweight C++ template library for vector and matrix math
 Version: 2.0 
-Release: 0.4.%{pre}%{?dist} 
+Release: 0.5.%{pre}%{?dist} 
 Group:   System Environment/Libraries
 License: GPLv2+ or LGPLv3+
 URL:     http://eigen.tuxfamily.org/
@@ -19,12 +19,14 @@
 BuildRequires: cmake
 #docs
 BuildRequires: doxygen graphviz
+
+#BuildRequires: %{_bindir}/latex
 %if 0%{?fedora} > 8
 BuildRequires: tex(latex)
 %else
 BuildRequires: tetex-latex
-#BuildRequires: %{_bindir}/latex
 %endif
+
 %{?_with_check:BuildRequires: qt4-devel}
 
 %description
@@ -56,7 +58,6 @@
 doxygen
 
 
-
 %install
 rm -rf %{buildroot}
 
@@ -81,6 +82,10 @@
 
 
 %changelog
+* Mon Dec 08 2008 Rex Dieter <rdieter at fedoraproject.org> 2.0-0.5.beta2
+- eigen-2.0-beta2
+- (re)enable buildtime test
+
 * Mon Sep 22 2008 Rex Dieter <rdieter at fedoraproject.org> 2.0-0.4.beta1
 - eigen-2.0-beta1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eigen2/F-9/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	25 Sep 2008 20:10:37 -0000	1.3
+++ sources	4 Jan 2009 19:46:37 -0000	1.4
@@ -1 +1 @@
-6631f3fb3145b2f9a980cd64431104aa  eigen-2.0-beta1.tar.bz2
+22b55e388a602e0fa7e2098124f39f71  eigen-2.0-beta2.tar.bz2



From dwalsh at fedoraproject.org  Sun Jan  4 19:47:28 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Sun,  4 Jan 2009 19:47:28 +0000 (UTC)
Subject: rpms/policycoreutils/devel policycoreutils-gui.patch, 1.80,
	1.81 policycoreutils-rhat.patch, 1.404,
	1.405 policycoreutils.spec, 1.578, 1.579
Message-ID: <20090104194728.6CEEE70130@cvs1.fedora.phx.redhat.com>

Author: dwalsh

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

Modified Files:
	policycoreutils-gui.patch policycoreutils-rhat.patch 
	policycoreutils.spec 
Log Message:
* Mon Dec 15 2008 Dan Walsh <dwalsh at redhat.com> 2.0.60-6
- fix audit2allow man page


policycoreutils-gui.patch:

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.80 -r 1.81 policycoreutils-gui.patch
Index: policycoreutils-gui.patch
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils-gui.patch,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- policycoreutils-gui.patch	29 Oct 2008 17:02:31 -0000	1.80
+++ policycoreutils-gui.patch	4 Jan 2009 19:46:52 -0000	1.81
@@ -1,47 +1,6 @@
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/Makefile policycoreutils-2.0.57/gui/Makefile
---- nsapolicycoreutils/gui/Makefile	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.57/gui/Makefile	2008-10-10 16:04:46.000000000 -0400
-@@ -0,0 +1,37 @@
-+# Installation directories.
-+PREFIX ?= ${DESTDIR}/usr
-+SHAREDIR ?= $(PREFIX)/share/system-config-selinux
-+
-+TARGETS= \
-+booleansPage.py \
-+fcontextPage.py \
-+html_util.py \
-+loginsPage.py \
-+mappingsPage.py \
-+modulesPage.py \
-+polgen.py \
-+polgen.glade \
-+portsPage.py \
-+lockdown.glade \
-+semanagePage.py \
-+statusPage.py \
-+system-config-selinux.glade \
-+translationsPage.py \
-+usersPage.py \
-+selinux.tbl
-+
-+all: $(TARGETS) system-config-selinux.py polgengui.py templates lockdown.py 
-+
-+install: all
-+	-mkdir -p $(SHAREDIR)/templates
-+	install -m 755 system-config-selinux.py $(SHAREDIR)
-+	install -m 755 polgengui.py $(SHAREDIR)
-+	install -m 755 lockdown.py $(SHAREDIR)
-+	install -m 644 $(TARGETS) $(SHAREDIR)
-+	install -m 644 templates/*.py $(SHAREDIR)/templates/
-+
-+clean:
-+
-+indent:
-+
-+relabel:
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/booleansPage.py policycoreutils-2.0.57/gui/booleansPage.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/booleansPage.py policycoreutils-2.0.60/gui/booleansPage.py
 --- nsapolicycoreutils/gui/booleansPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.57/gui/booleansPage.py	2008-10-29 12:39:48.000000000 -0400
++++ policycoreutils-2.0.60/gui/booleansPage.py	2008-12-15 15:34:54.000000000 -0500
 @@ -0,0 +1,247 @@
 +#
 +# booleansPage.py - GUI for Booleans page in system-config-securitylevel
@@ -290,9 +249,9 @@
 +        self.load(self.filter)
 +        return True
 +        
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/fcontextPage.py policycoreutils-2.0.57/gui/fcontextPage.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/fcontextPage.py policycoreutils-2.0.60/gui/fcontextPage.py
 --- nsapolicycoreutils/gui/fcontextPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.57/gui/fcontextPage.py	2008-10-29 12:39:26.000000000 -0400
++++ policycoreutils-2.0.60/gui/fcontextPage.py	2008-12-15 15:34:54.000000000 -0500
 @@ -0,0 +1,223 @@
 +## fcontextPage.py - show selinux mappings
 +## Copyright (C) 2006 Red Hat, Inc.
@@ -517,9 +476,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.57/gui/html_util.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/html_util.py policycoreutils-2.0.60/gui/html_util.py
 --- nsapolicycoreutils/gui/html_util.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.57/gui/html_util.py	2008-10-10 16:04:46.000000000 -0400
++++ policycoreutils-2.0.60/gui/html_util.py	2008-12-15 15:34:54.000000000 -0500
 @@ -0,0 +1,164 @@
 +# Authors: John Dennis <jdennis at redhat.com>
 +#
@@ -685,9 +644,9 @@
 +    doc += tail
 +    return doc
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/lockdown.glade policycoreutils-2.0.57/gui/lockdown.glade
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/lockdown.glade policycoreutils-2.0.60/gui/lockdown.glade
 --- nsapolicycoreutils/gui/lockdown.glade	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.57/gui/lockdown.glade	2008-10-10 16:04:46.000000000 -0400
++++ policycoreutils-2.0.60/gui/lockdown.glade	2008-12-15 15:34:54.000000000 -0500
 @@ -0,0 +1,771 @@
 +<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
 +<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
@@ -1460,9 +1419,9 @@
 +</widget>
 +
 +</glade-interface>
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/lockdown.gladep policycoreutils-2.0.57/gui/lockdown.gladep
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/lockdown.gladep policycoreutils-2.0.60/gui/lockdown.gladep
 --- nsapolicycoreutils/gui/lockdown.gladep	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.57/gui/lockdown.gladep	2008-10-10 16:04:46.000000000 -0400
++++ policycoreutils-2.0.60/gui/lockdown.gladep	2008-12-15 15:34:54.000000000 -0500
 @@ -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">
@@ -1471,9 +1430,9 @@
 +  <name></name>
 +  <program_name></program_name>
 +</glade-project>
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/lockdown.py policycoreutils-2.0.57/gui/lockdown.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/lockdown.py policycoreutils-2.0.60/gui/lockdown.py
 --- nsapolicycoreutils/gui/lockdown.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.57/gui/lockdown.py	2008-10-29 12:39:00.000000000 -0400
++++ policycoreutils-2.0.60/gui/lockdown.py	2008-12-15 15:34:55.000000000 -0500
 @@ -0,0 +1,382 @@
 +#!/usr/bin/python
 +#
@@ -1857,9 +1816,9 @@
 +
 +    app = booleanWindow()
 +    app.stand_alone()
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/loginsPage.py policycoreutils-2.0.57/gui/loginsPage.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/loginsPage.py policycoreutils-2.0.60/gui/loginsPage.py
 --- nsapolicycoreutils/gui/loginsPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.57/gui/loginsPage.py	2008-10-10 16:04:46.000000000 -0400
++++ policycoreutils-2.0.60/gui/loginsPage.py	2008-12-15 15:34:55.000000000 -0500
 @@ -0,0 +1,185 @@
 +## loginsPage.py - show selinux mappings
 +## Copyright (C) 2006 Red Hat, Inc.
@@ -2046,9 +2005,50 @@
 +        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.57/gui/mappingsPage.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/Makefile policycoreutils-2.0.60/gui/Makefile
+--- nsapolicycoreutils/gui/Makefile	1969-12-31 19:00:00.000000000 -0500
++++ policycoreutils-2.0.60/gui/Makefile	2008-12-15 15:34:54.000000000 -0500
+@@ -0,0 +1,37 @@
++# Installation directories.
++PREFIX ?= ${DESTDIR}/usr
++SHAREDIR ?= $(PREFIX)/share/system-config-selinux
++
++TARGETS= \
++booleansPage.py \
++fcontextPage.py \
++html_util.py \
++loginsPage.py \
++mappingsPage.py \
++modulesPage.py \
++polgen.py \
++polgen.glade \
++portsPage.py \
++lockdown.glade \
++semanagePage.py \
++statusPage.py \
++system-config-selinux.glade \
++translationsPage.py \
++usersPage.py \
++selinux.tbl
++
++all: $(TARGETS) system-config-selinux.py polgengui.py templates lockdown.py 
++
++install: all
++	-mkdir -p $(SHAREDIR)/templates
++	install -m 755 system-config-selinux.py $(SHAREDIR)
++	install -m 755 polgengui.py $(SHAREDIR)
++	install -m 755 lockdown.py $(SHAREDIR)
++	install -m 644 $(TARGETS) $(SHAREDIR)
++	install -m 644 templates/*.py $(SHAREDIR)/templates/
++
++clean:
++
++indent:
++
++relabel:
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/mappingsPage.py policycoreutils-2.0.60/gui/mappingsPage.py
 --- nsapolicycoreutils/gui/mappingsPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.57/gui/mappingsPage.py	2008-10-10 16:04:46.000000000 -0400
++++ policycoreutils-2.0.60/gui/mappingsPage.py	2008-12-15 15:34:55.000000000 -0500
 @@ -0,0 +1,56 @@
 +## mappingsPage.py - show selinux mappings
 +## Copyright (C) 2006 Red Hat, Inc.
@@ -2106,9 +2106,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.57/gui/modulesPage.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/modulesPage.py policycoreutils-2.0.60/gui/modulesPage.py
 --- nsapolicycoreutils/gui/modulesPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.57/gui/modulesPage.py	2008-10-10 16:04:46.000000000 -0400
++++ policycoreutils-2.0.60/gui/modulesPage.py	2008-12-15 15:34:55.000000000 -0500
 @@ -0,0 +1,195 @@
 +## modulesPage.py - show selinux mappings
 +## Copyright (C) 2006 Red Hat, Inc.
@@ -2305,9 +2305,9 @@
 +        
 +
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.glade policycoreutils-2.0.57/gui/polgen.glade
[...3041 lines suppressed...]
-+#
-+
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/boolean.py policycoreutils-2.0.57/gui/templates/boolean.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/boolean.py policycoreutils-2.0.60/gui/templates/boolean.py
 --- nsapolicycoreutils/gui/templates/boolean.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.57/gui/templates/boolean.py	2008-10-10 16:04:46.000000000 -0400
++++ policycoreutils-2.0.60/gui/templates/boolean.py	2008-12-15 15:34:55.000000000 -0500
 @@ -0,0 +1,40 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -11500,9 +11478,9 @@
 +')
 +"""
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/etc_rw.py policycoreutils-2.0.57/gui/templates/etc_rw.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/etc_rw.py policycoreutils-2.0.60/gui/templates/etc_rw.py
 --- nsapolicycoreutils/gui/templates/etc_rw.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.57/gui/templates/etc_rw.py	2008-10-10 16:04:46.000000000 -0400
++++ policycoreutils-2.0.60/gui/templates/etc_rw.py	2008-12-15 15:34:55.000000000 -0500
 @@ -0,0 +1,129 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -11633,9 +11611,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.57/gui/templates/executable.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/executable.py policycoreutils-2.0.60/gui/templates/executable.py
 --- nsapolicycoreutils/gui/templates/executable.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.57/gui/templates/executable.py	2008-10-10 16:04:46.000000000 -0400
++++ policycoreutils-2.0.60/gui/templates/executable.py	2008-12-15 15:34:55.000000000 -0500
 @@ -0,0 +1,327 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -11964,9 +11942,31 @@
 +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.57/gui/templates/network.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/__init__.py policycoreutils-2.0.60/gui/templates/__init__.py
+--- nsapolicycoreutils/gui/templates/__init__.py	1969-12-31 19:00:00.000000000 -0500
++++ policycoreutils-2.0.60/gui/templates/__init__.py	2008-12-15 15:34:55.000000000 -0500
+@@ -0,0 +1,18 @@
++#
++# Copyright (C) 2007 Red Hat, Inc.
++#
++# This program is free software; you can redistribute it and/or modify
++# it under the terms of the GNU General Public License as published by
++# the Free Software Foundation; either version 2 of the License, or
++# (at your option) any later version.
++#
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++# GNU General Public License for more details.
++#
++# You should have received a copy of the GNU General Public License
++# along with this program; if not, write to the Free Software
++# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++#
++
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/network.py policycoreutils-2.0.60/gui/templates/network.py
 --- nsapolicycoreutils/gui/templates/network.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.57/gui/templates/network.py	2008-10-10 16:04:46.000000000 -0400
++++ policycoreutils-2.0.60/gui/templates/network.py	2008-12-15 15:34:55.000000000 -0500
 @@ -0,0 +1,80 @@
 +te_port_types="""
 +type TEMPLATETYPE_port_t;
@@ -12048,9 +12048,9 @@
 +corenet_udp_bind_all_unreserved_ports(TEMPLATETYPE_t)
 +"""
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/rw.py policycoreutils-2.0.57/gui/templates/rw.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/rw.py policycoreutils-2.0.60/gui/templates/rw.py
 --- nsapolicycoreutils/gui/templates/rw.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.57/gui/templates/rw.py	2008-10-10 16:04:46.000000000 -0400
++++ policycoreutils-2.0.60/gui/templates/rw.py	2008-12-15 15:34:55.000000000 -0500
 @@ -0,0 +1,128 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -12180,9 +12180,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.57/gui/templates/script.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/script.py policycoreutils-2.0.60/gui/templates/script.py
 --- nsapolicycoreutils/gui/templates/script.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.57/gui/templates/script.py	2008-10-10 16:04:46.000000000 -0400
++++ policycoreutils-2.0.60/gui/templates/script.py	2008-12-15 15:34:55.000000000 -0500
 @@ -0,0 +1,105 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -12289,9 +12289,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.57/gui/templates/semodule.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/semodule.py policycoreutils-2.0.60/gui/templates/semodule.py
 --- nsapolicycoreutils/gui/templates/semodule.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.57/gui/templates/semodule.py	2008-10-10 16:04:46.000000000 -0400
++++ policycoreutils-2.0.60/gui/templates/semodule.py	2008-12-15 15:34:55.000000000 -0500
 @@ -0,0 +1,41 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -12334,9 +12334,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.57/gui/templates/tmp.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/tmp.py policycoreutils-2.0.60/gui/templates/tmp.py
 --- nsapolicycoreutils/gui/templates/tmp.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.57/gui/templates/tmp.py	2008-10-10 16:04:46.000000000 -0400
++++ policycoreutils-2.0.60/gui/templates/tmp.py	2008-12-15 15:34:55.000000000 -0500
 @@ -0,0 +1,97 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -12435,9 +12435,9 @@
 +	TEMPLATETYPE_manage_tmp($1)
 +"""
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/user.py policycoreutils-2.0.57/gui/templates/user.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/user.py policycoreutils-2.0.60/gui/templates/user.py
 --- nsapolicycoreutils/gui/templates/user.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.57/gui/templates/user.py	2008-10-10 16:04:46.000000000 -0400
++++ policycoreutils-2.0.60/gui/templates/user.py	2008-12-15 15:34:55.000000000 -0500
 @@ -0,0 +1,182 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -12621,9 +12621,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.57/gui/templates/var_lib.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_lib.py policycoreutils-2.0.60/gui/templates/var_lib.py
 --- nsapolicycoreutils/gui/templates/var_lib.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.57/gui/templates/var_lib.py	2008-10-10 16:04:46.000000000 -0400
++++ policycoreutils-2.0.60/gui/templates/var_lib.py	2008-12-15 15:34:55.000000000 -0500
 @@ -0,0 +1,158 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -12783,9 +12783,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.57/gui/templates/var_log.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_log.py policycoreutils-2.0.60/gui/templates/var_log.py
 --- nsapolicycoreutils/gui/templates/var_log.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.57/gui/templates/var_log.py	2008-10-10 16:04:46.000000000 -0400
++++ policycoreutils-2.0.60/gui/templates/var_log.py	2008-12-15 15:34:55.000000000 -0500
 @@ -0,0 +1,110 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -12897,9 +12897,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.57/gui/templates/var_run.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_run.py policycoreutils-2.0.60/gui/templates/var_run.py
 --- nsapolicycoreutils/gui/templates/var_run.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.57/gui/templates/var_run.py	2008-10-10 16:04:46.000000000 -0400
++++ policycoreutils-2.0.60/gui/templates/var_run.py	2008-12-15 15:34:55.000000000 -0500
 @@ -0,0 +1,118 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -13019,9 +13019,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.57/gui/templates/var_spool.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_spool.py policycoreutils-2.0.60/gui/templates/var_spool.py
 --- nsapolicycoreutils/gui/templates/var_spool.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.57/gui/templates/var_spool.py	2008-10-10 16:04:46.000000000 -0400
++++ policycoreutils-2.0.60/gui/templates/var_spool.py	2008-12-15 15:34:55.000000000 -0500
 @@ -0,0 +1,129 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -13152,9 +13152,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.57/gui/translationsPage.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/translationsPage.py policycoreutils-2.0.60/gui/translationsPage.py
 --- nsapolicycoreutils/gui/translationsPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.57/gui/translationsPage.py	2008-10-10 16:04:46.000000000 -0400
++++ policycoreutils-2.0.60/gui/translationsPage.py	2008-12-15 15:34:55.000000000 -0500
 @@ -0,0 +1,118 @@
 +## translationsPage.py - show selinux translations
 +## Copyright (C) 2006 Red Hat, Inc.
@@ -13274,9 +13274,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.57/gui/usersPage.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/usersPage.py policycoreutils-2.0.60/gui/usersPage.py
 --- nsapolicycoreutils/gui/usersPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.57/gui/usersPage.py	2008-10-10 16:04:46.000000000 -0400
++++ policycoreutils-2.0.60/gui/usersPage.py	2008-12-15 15:34:55.000000000 -0500
 @@ -0,0 +1,150 @@
 +## usersPage.py - show selinux mappings
 +## Copyright (C) 2006,2007,2008 Red Hat, Inc.

policycoreutils-rhat.patch:

Index: policycoreutils-rhat.patch
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils-rhat.patch,v
retrieving revision 1.404
retrieving revision 1.405
diff -u -r1.404 -r1.405
--- policycoreutils-rhat.patch	2 Dec 2008 13:37:45 -0000	1.404
+++ policycoreutils-rhat.patch	4 Jan 2009 19:46:54 -0000	1.405
@@ -1,15 +1,6 @@
-diff --exclude-from=exclude --exclude=sepolgen-1.0.14 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/Makefile policycoreutils-2.0.60/Makefile
---- nsapolicycoreutils/Makefile	2008-08-28 09:34:24.000000000 -0400
-+++ policycoreutils-2.0.60/Makefile	2008-12-01 11:47:09.000000000 -0500
-@@ -1,4 +1,4 @@
--SUBDIRS = setfiles semanage load_policy newrole run_init secon audit2allow audit2why scripts sestatus semodule_package semodule semodule_link semodule_expand semodule_deps setsebool po
-+SUBDIRS = setfiles semanage load_policy newrole run_init 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.14 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/audit2allow/audit2allow policycoreutils-2.0.60/audit2allow/audit2allow
 --- nsapolicycoreutils/audit2allow/audit2allow	2008-11-10 08:53:49.000000000 -0500
-+++ policycoreutils-2.0.60/audit2allow/audit2allow	2008-12-01 15:16:31.000000000 -0500
++++ policycoreutils-2.0.60/audit2allow/audit2allow	2008-12-15 15:34:54.000000000 -0500
 @@ -42,10 +42,10 @@
          from optparse import OptionParser
  
@@ -46,7 +37,7 @@
          writer.write(generator.get_module(), fd)
 diff --exclude-from=exclude --exclude=sepolgen-1.0.14 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/audit2allow/audit2allow.1 policycoreutils-2.0.60/audit2allow/audit2allow.1
 --- nsapolicycoreutils/audit2allow/audit2allow.1	2008-11-10 08:53:49.000000000 -0500
-+++ policycoreutils-2.0.60/audit2allow/audit2allow.1	2008-12-01 15:10:13.000000000 -0500
++++ policycoreutils-2.0.60/audit2allow/audit2allow.1	2008-12-15 15:35:46.000000000 -0500
 @@ -44,9 +44,6 @@
  Note that all audit messages are not available via dmesg when
  auditd is running; use "ausearch -m avc | audit2allow"  or "-a" instead.
@@ -57,9 +48,28 @@
  .B "\-h" | "\-\-help"
  Print a short usage message
  .TP
+@@ -78,9 +75,6 @@
+ Generate reference policy using installed macros.
+ This attempts to match denials against interfaces and may be inaccurate.
+ .TP
+-.B "\-t "  | "\-\-tefile"
+-Indicates input file is a te (type enforcement) file.  This can be used to translate old te format to new policy format.
+-.TP
+ .B "\-w" | "\-\-why"
+ Translates SELinux audit messages into a description of why the access was denied
+ 
+diff --exclude-from=exclude --exclude=sepolgen-1.0.14 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/Makefile policycoreutils-2.0.60/Makefile
+--- nsapolicycoreutils/Makefile	2008-08-28 09:34:24.000000000 -0400
++++ policycoreutils-2.0.60/Makefile	2008-12-15 15:34:54.000000000 -0500
+@@ -1,4 +1,4 @@
+-SUBDIRS = setfiles semanage load_policy newrole run_init secon audit2allow audit2why scripts sestatus semodule_package semodule semodule_link semodule_expand semodule_deps setsebool po
++SUBDIRS = setfiles semanage load_policy newrole run_init 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.14 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.c policycoreutils-2.0.60/restorecond/restorecond.c
 --- nsapolicycoreutils/restorecond/restorecond.c	2008-08-28 09:34:24.000000000 -0400
-+++ policycoreutils-2.0.60/restorecond/restorecond.c	2008-12-02 08:36:38.000000000 -0500
++++ policycoreutils-2.0.60/restorecond/restorecond.c	2008-12-15 15:34:54.000000000 -0500
 @@ -283,6 +283,8 @@
  	inotify_rm_watch(fd, master_wd);
  	master_wd =
@@ -86,7 +96,7 @@
  	if (!ptr->dir)
 diff --exclude-from=exclude --exclude=sepolgen-1.0.14 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/utmpwatcher.c policycoreutils-2.0.60/restorecond/utmpwatcher.c
 --- nsapolicycoreutils/restorecond/utmpwatcher.c	2008-08-28 09:34:24.000000000 -0400
-+++ policycoreutils-2.0.60/restorecond/utmpwatcher.c	2008-12-02 08:35:18.000000000 -0500
++++ policycoreutils-2.0.60/restorecond/utmpwatcher.c	2008-12-15 15:34:54.000000000 -0500
 @@ -57,7 +57,7 @@
  	utmp_ptr = NULL;
  	FILE *cfg = fopen(utmp_path, "r");
@@ -108,7 +118,7 @@
  		strings_list_free(prev_utmp_ptr);
 diff --exclude-from=exclude --exclude=sepolgen-1.0.14 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/scripts/chcat policycoreutils-2.0.60/scripts/chcat
 --- nsapolicycoreutils/scripts/chcat	2008-08-28 09:34:24.000000000 -0400
-+++ policycoreutils-2.0.60/scripts/chcat	2008-12-01 11:47:09.000000000 -0500
++++ policycoreutils-2.0.60/scripts/chcat	2008-12-15 15:34:54.000000000 -0500
 @@ -291,6 +291,8 @@
              for i in c.split(","):
                  if i not in newcats:
@@ -120,7 +130,7 @@
  def translate(cats):
 diff --exclude-from=exclude --exclude=sepolgen-1.0.14 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semodule/semodule.c policycoreutils-2.0.60/semodule/semodule.c
 --- nsapolicycoreutils/semodule/semodule.c	2008-08-28 09:34:24.000000000 -0400
-+++ policycoreutils-2.0.60/semodule/semodule.c	2008-12-01 11:47:09.000000000 -0500
++++ policycoreutils-2.0.60/semodule/semodule.c	2008-12-15 15:34:54.000000000 -0500
 @@ -60,24 +60,6 @@
  	free(commands);
  }


Index: policycoreutils.spec
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils.spec,v
retrieving revision 1.578
retrieving revision 1.579
diff -u -r1.578 -r1.579
--- policycoreutils.spec	10 Dec 2008 14:19:53 -0000	1.578
+++ policycoreutils.spec	4 Jan 2009 19:46:57 -0000	1.579
@@ -6,7 +6,7 @@
 Summary: SELinux policy core utilities
 Name:	 policycoreutils
 Version: 2.0.60
-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
+* Mon Dec 15 2008 Dan Walsh <dwalsh at redhat.com> 2.0.60-6
+- fix audit2allow man page
+
 * Wed Dec 10 2008 Dan Walsh <dwalsh at redhat.com> 2.0.60-5
 - Fix Japanese translations
 



From pkgdb at fedoraproject.org  Sun Jan  4 20:02:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 04 Jan 2009 20:02:39 +0000
Subject: [pkgdb] srm (Fedora, 9) updated by kevin
Message-ID: <20090104200239.77DF1208D4F@bastion.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for srm
kevin has set commit to Approved for provenpackager on srm (Fedora 9)
kevin has set build to Approved for provenpackager on srm (Fedora 9)
kevin has set checkout to Approved for provenpackager on srm (Fedora 9)

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



From pkgdb at fedoraproject.org  Sun Jan  4 20:02:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 04 Jan 2009 20:02:37 +0000
Subject: [pkgdb] srm was added for fab
Message-ID: <20090104200237.DF7C820873B@bastion.fedora.phx.redhat.com>

kevin has added Package srm with summary Secure file deletion
kevin has approved Package srm
kevin has added a Fedora devel branch for srm with an owner of fab
kevin has approved srm in Fedora devel
kevin has approved Package srm
kevin has set commit to Approved for provenpackager on srm (Fedora devel)
kevin has set build to Approved for provenpackager on srm (Fedora devel)
kevin has set checkout to Approved for provenpackager on srm (Fedora devel)

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



From pkgdb at fedoraproject.org  Sun Jan  4 20:02:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 04 Jan 2009 20:02:39 +0000
Subject: [pkgdb] srm (Fedora, 10) updated by kevin
Message-ID: <20090104200239.83500208D52@bastion.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for srm
kevin has set commit to Approved for provenpackager on srm (Fedora 10)
kevin has set build to Approved for provenpackager on srm (Fedora 10)
kevin has set checkout to Approved for provenpackager on srm (Fedora 10)

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



From kevin at fedoraproject.org  Sun Jan  4 20:03:03 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun,  4 Jan 2009 20:03:03 +0000 (UTC)
Subject: rpms/srm - New directory
Message-ID: <20090104200303.4461370130@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/srm
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsh19983/rpms/srm

Log Message:
Directory /cvs/pkgs/rpms/srm added to the repository




From kevin at fedoraproject.org  Sun Jan  4 20:03:03 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun,  4 Jan 2009 20:03:03 +0000 (UTC)
Subject: rpms/srm/devel - New directory
Message-ID: <20090104200303.9F29B70130@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/srm/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsh19983/rpms/srm/devel

Log Message:
Directory /cvs/pkgs/rpms/srm/devel added to the repository




From kevin at fedoraproject.org  Sun Jan  4 20:03:23 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun,  4 Jan 2009 20:03:23 +0000 (UTC)
Subject: rpms/srm Makefile,NONE,1.1
Message-ID: <20090104200323.4F83D70140@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/srm
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsh19983/rpms/srm

Added Files:
	Makefile 
Log Message:
Setup of module srm


--- NEW FILE Makefile ---
# Top level Makefile for module srm
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Jan  4 20:03:23 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun,  4 Jan 2009 20:03:23 +0000 (UTC)
Subject: rpms/srm/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <20090104200323.AB40770140@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/srm/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsh19983/rpms/srm/devel

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


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: srm
# $Id: Makefile,v 1.1 2009/01/04 20:03:23 kevin Exp $
NAME := srm
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Jan  4 20:06:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 04 Jan 2009 20:06:32 +0000
Subject: [pkgdb] mapbender was added for rezso
Message-ID: <20090104200632.39B9320873B@bastion.fedora.phx.redhat.com>

kevin has added Package mapbender with summary Geospatial portal for OGC OWS architectures
kevin has approved Package mapbender
kevin has added a Fedora devel branch for mapbender with an owner of rezso
kevin has approved mapbender in Fedora devel
kevin has approved Package mapbender
kevin has set commit to Approved for provenpackager on mapbender (Fedora devel)
kevin has set build to Approved for provenpackager on mapbender (Fedora devel)
kevin has set checkout to Approved for provenpackager on mapbender (Fedora devel)

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



From pkgdb at fedoraproject.org  Sun Jan  4 20:06:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 04 Jan 2009 20:06:33 +0000
Subject: [pkgdb] mapbender (Fedora, 10) updated by kevin
Message-ID: <20090104200633.D73C2208D4F@bastion.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for mapbender
kevin has set commit to Approved for provenpackager on mapbender (Fedora 10)
kevin has set build to Approved for provenpackager on mapbender (Fedora 10)
kevin has set checkout to Approved for provenpackager on mapbender (Fedora 10)

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



From kevin at fedoraproject.org  Sun Jan  4 20:06:49 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun,  4 Jan 2009 20:06:49 +0000 (UTC)
Subject: rpms/mapbender - New directory
Message-ID: <20090104200649.3BEA67013C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/mapbender
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsI22460/rpms/mapbender

Log Message:
Directory /cvs/pkgs/rpms/mapbender added to the repository




From kevin at fedoraproject.org  Sun Jan  4 20:06:49 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun,  4 Jan 2009 20:06:49 +0000 (UTC)
Subject: rpms/mapbender/devel - New directory
Message-ID: <20090104200649.A646B7013C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/mapbender/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsI22460/rpms/mapbender/devel

Log Message:
Directory /cvs/pkgs/rpms/mapbender/devel added to the repository




From pkgdb at fedoraproject.org  Sun Jan  4 20:06:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 04 Jan 2009 20:06:33 +0000
Subject: [pkgdb] mapbender (Fedora, 9) updated by kevin
Message-ID: <20090104200634.07E18208D52@bastion.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for mapbender
kevin has set commit to Approved for provenpackager on mapbender (Fedora 9)
kevin has set build to Approved for provenpackager on mapbender (Fedora 9)
kevin has set checkout to Approved for provenpackager on mapbender (Fedora 9)

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



From kevin at fedoraproject.org  Sun Jan  4 20:07:08 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun,  4 Jan 2009 20:07:08 +0000 (UTC)
Subject: rpms/mapbender Makefile,NONE,1.1
Message-ID: <20090104200708.DEC707013C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/mapbender
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsI22460/rpms/mapbender

Added Files:
	Makefile 
Log Message:
Setup of module mapbender


--- NEW FILE Makefile ---
# Top level Makefile for module mapbender
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Jan  4 20:07:09 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun,  4 Jan 2009 20:07:09 +0000 (UTC)
Subject: rpms/mapbender/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090104200709.6BE367013C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/mapbender/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsI22460/rpms/mapbender/devel

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


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: mapbender
# $Id: Makefile,v 1.1 2009/01/04 20:07:09 kevin Exp $
NAME := mapbender
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Jan  4 20:09:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 04 Jan 2009 20:09:17 +0000
Subject: [pkgdb] teeworlds was added for cassmodiah
Message-ID: <20090104200917.6F0E62084B6@bastion.fedora.phx.redhat.com>

kevin has added Package teeworlds with summary Online multi-player platform 2D shooter
kevin has approved Package teeworlds
kevin has added a Fedora devel branch for teeworlds with an owner of cassmodiah
kevin has approved teeworlds in Fedora devel
kevin has approved Package teeworlds
kevin has set commit to Approved for provenpackager on teeworlds (Fedora devel)
kevin has set build to Approved for provenpackager on teeworlds (Fedora devel)
kevin has set checkout to Approved for provenpackager on teeworlds (Fedora devel)

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



From pkgdb at fedoraproject.org  Sun Jan  4 20:09:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 04 Jan 2009 20:09:19 +0000
Subject: [pkgdb] teeworlds (Fedora, 10) updated by kevin
Message-ID: <20090104200919.41BEF208D4E@bastion.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for teeworlds
kevin has set commit to Approved for provenpackager on teeworlds (Fedora 10)
kevin has set build to Approved for provenpackager on teeworlds (Fedora 10)
kevin has set checkout to Approved for provenpackager on teeworlds (Fedora 10)
kevin approved watchbugzilla on teeworlds (Fedora 10) for lkundrak
kevin approved watchcommits on teeworlds (Fedora 10) for lkundrak
kevin approved commit on teeworlds (Fedora 10) for lkundrak
kevin approved build on teeworlds (Fedora 10) for lkundrak
kevin approved approveacls on teeworlds (Fedora 10) for lkundrak

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



From pkgdb at fedoraproject.org  Sun Jan  4 20:09:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 04 Jan 2009 20:09:19 +0000
Subject: [pkgdb] teeworlds (Fedora, devel) updated by kevin
Message-ID: <20090104200919.4B9EC208D53@bastion.fedora.phx.redhat.com>

kevin approved watchbugzilla on teeworlds (Fedora devel) for lkundrak
kevin approved watchcommits on teeworlds (Fedora devel) for lkundrak
kevin approved commit on teeworlds (Fedora devel) for lkundrak
kevin approved build on teeworlds (Fedora devel) for lkundrak
kevin approved approveacls on teeworlds (Fedora devel) for lkundrak

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



From kevin at fedoraproject.org  Sun Jan  4 20:09:38 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun,  4 Jan 2009 20:09:38 +0000 (UTC)
Subject: rpms/teeworlds - New directory
Message-ID: <20090104200938.27F2C70130@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/teeworlds
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsL24320/rpms/teeworlds

Log Message:
Directory /cvs/pkgs/rpms/teeworlds added to the repository




From kevin at fedoraproject.org  Sun Jan  4 20:09:38 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun,  4 Jan 2009 20:09:38 +0000 (UTC)
Subject: rpms/teeworlds/devel - New directory
Message-ID: <20090104200938.68ECA70142@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/teeworlds/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsL24320/rpms/teeworlds/devel

Log Message:
Directory /cvs/pkgs/rpms/teeworlds/devel added to the repository




From pkgdb at fedoraproject.org  Sun Jan  4 20:09:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 04 Jan 2009 20:09:19 +0000
Subject: [pkgdb] teeworlds (Fedora, 9) updated by kevin
Message-ID: <20090104200919.5A3CB208D59@bastion.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for teeworlds
kevin has set commit to Approved for provenpackager on teeworlds (Fedora 9)
kevin has set build to Approved for provenpackager on teeworlds (Fedora 9)
kevin has set checkout to Approved for provenpackager on teeworlds (Fedora 9)
kevin approved watchbugzilla on teeworlds (Fedora 9) for lkundrak
kevin approved watchcommits on teeworlds (Fedora 9) for lkundrak
kevin approved commit on teeworlds (Fedora 9) for lkundrak
kevin approved build on teeworlds (Fedora 9) for lkundrak
kevin approved approveacls on teeworlds (Fedora 9) for lkundrak

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



From kevin at fedoraproject.org  Sun Jan  4 20:09:54 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun,  4 Jan 2009 20:09:54 +0000 (UTC)
Subject: rpms/teeworlds Makefile,NONE,1.1
Message-ID: <20090104200954.E493170130@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/teeworlds
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsL24320/rpms/teeworlds

Added Files:
	Makefile 
Log Message:
Setup of module teeworlds


--- NEW FILE Makefile ---
# Top level Makefile for module teeworlds
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Jan  4 20:09:55 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun,  4 Jan 2009 20:09:55 +0000 (UTC)
Subject: rpms/teeworlds/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090104200955.4E7C670130@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/teeworlds/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsL24320/rpms/teeworlds/devel

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


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: teeworlds
# $Id: Makefile,v 1.1 2009/01/04 20:09:55 kevin Exp $
NAME := teeworlds
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From cwickert at fedoraproject.org  Sun Jan  4 20:09:57 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Sun,  4 Jan 2009 20:09:57 +0000 (UTC)
Subject: rpms/gnome-applet-timer/F-10 gnome-applet-timer.spec,1.20,1.21
Message-ID: <20090104200957.DAB9E70130@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/gnome-applet-timer/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24226/F-10

Modified Files:
	gnome-applet-timer.spec 
Log Message:
* Sun Jan 04 2009 Christoph Wickert <cwickert at fedoraproject.org> - 2.0.2-8
- Use Paul's patch instead of Michael suggestion (#471465)



Index: gnome-applet-timer.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-applet-timer/F-10/gnome-applet-timer.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- gnome-applet-timer.spec	4 Jan 2009 18:09:13 -0000	1.20
+++ gnome-applet-timer.spec	4 Jan 2009 20:09:27 -0000	1.21
@@ -4,14 +4,14 @@
 
 Name:           gnome-applet-timer
 Version:        2.0.1
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        A countdown timer applet for the GNOME panel
 
 Group:          User Interface/Desktops
 License:        GPLv2+
 URL:            http://timerapplet.sourceforge.net/
 Source0:        http://download.sourceforge.net/timerapplet/timer-applet-%{version}.tar.gz
-Patch0:         timer-applet-2.0.1-libnotify.patch
+Patch0:         timer-applet-2.0.1-stop-pulsing.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  python-devel >= 2.4
@@ -100,6 +100,9 @@
 %{python_sitelib}/timerapplet/
 
 %changelog
+* Sun Jan 04 2009 Christoph Wickert <cwickert at fedoraproject.org> - 2.0.2-8
+- Use Paul's patch instead of Michael suggestion (#471465)
+
 * Sun Jan 04 2009 Christoph Wickert <cwickert at fedoraproject.org> - 2.0.2-7
 - Apply libnotify patch, thanks to Michael Schwendt and Paul Frields (#471465)
 



From cwickert at fedoraproject.org  Sun Jan  4 20:09:58 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Sun,  4 Jan 2009 20:09:58 +0000 (UTC)
Subject: rpms/gnome-applet-timer/devel timer-applet-2.0.1-stop-pulsing.patch,
	NONE, 1.1 gnome-applet-timer.spec, 1.21,
	1.22 timer-applet-2.0.1-libnotify.patch, 1.1, NONE
Message-ID: <20090104200958.DC58170130@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/gnome-applet-timer/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24226/devel

Modified Files:
	gnome-applet-timer.spec 
Added Files:
	timer-applet-2.0.1-stop-pulsing.patch 
Removed Files:
	timer-applet-2.0.1-libnotify.patch 
Log Message:
* Sun Jan 04 2009 Christoph Wickert <cwickert at fedoraproject.org> - 2.0.2-8
- Use Paul's patch instead of Michael suggestion (#471465)


timer-applet-2.0.1-stop-pulsing.patch:

--- NEW FILE timer-applet-2.0.1-stop-pulsing.patch ---
--- timer-applet-2.0.1-orig/src/timerapplet/ui/Notifier.py	2007-04-27 21:31:03.000000000 -0400
+++ timer-applet-2.0.1/src/timerapplet/ui/Notifier.py	2008-12-24 11:04:52.000000000 -0500
@@ -25,12 +25,16 @@
             if self._timeout_id is not None:
                 gobject.source_remove(self._timeout_id)
                 self._timeout_id = None
-            self._notify.disconnect(self._handler_id)
-            self._handler_id = None
-            self._notify.close()
-            self._notify = None
+            if self._handler_id is not None:
+                self._notify.disconnect(self._handler_id)
+                self._handler_id = None
+            try:
+                self._notify.close()
+                self._notify = None
+            except:
+                pass
             
-    def _on_notification_closed(self, notification, get_reminder_message_func):
+    def _on_notification_closed(self, notification, reason, get_reminder_message_func):
         self._timeout_id = gobject.timeout_add(Notifier._NOTIFICATION_REDISPLAY_INTERVAL_SECONDS * 1000,
                                                self._on_notification_redisplay_timeout,
                                                get_reminder_message_func)


Index: gnome-applet-timer.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-applet-timer/devel/gnome-applet-timer.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- gnome-applet-timer.spec	4 Jan 2009 18:09:14 -0000	1.21
+++ gnome-applet-timer.spec	4 Jan 2009 20:09:27 -0000	1.22
@@ -4,14 +4,14 @@
 
 Name:           gnome-applet-timer
 Version:        2.0.1
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        A countdown timer applet for the GNOME panel
 
 Group:          User Interface/Desktops
 License:        GPLv2+
 URL:            http://timerapplet.sourceforge.net/
 Source0:        http://download.sourceforge.net/timerapplet/timer-applet-%{version}.tar.gz
-Patch0:         timer-applet-2.0.1-libnotify.patch
+Patch0:         timer-applet-2.0.1-stop-pulsing.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  python-devel >= 2.4
@@ -100,6 +100,9 @@
 %{python_sitelib}/timerapplet/
 
 %changelog
+* Sun Jan 04 2009 Christoph Wickert <cwickert at fedoraproject.org> - 2.0.2-8
+- Use Paul's patch instead of Michael suggestion (#471465)
+
 * Sun Jan 04 2009 Christoph Wickert <cwickert at fedoraproject.org> - 2.0.2-7
 - Apply libnotify patch, thanks to Michael Schwendt and Paul Frields (#471465)
 


--- timer-applet-2.0.1-libnotify.patch DELETED ---



From pkgdb at fedoraproject.org  Sun Jan  4 20:11:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 04 Jan 2009 20:11:15 +0000
Subject: [pkgdb] tinyows was added for rezso
Message-ID: <20090104201116.2EB3B208D4E@bastion.fedora.phx.redhat.com>

kevin has added Package tinyows with summary WFS-T and FE implementation server
kevin has approved Package tinyows
kevin has added a Fedora devel branch for tinyows with an owner of rezso
kevin has approved tinyows in Fedora devel
kevin has approved Package tinyows
kevin has set commit to Approved for provenpackager on tinyows (Fedora devel)
kevin has set build to Approved for provenpackager on tinyows (Fedora devel)
kevin has set checkout to Approved for provenpackager on tinyows (Fedora devel)

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



From pkgdb at fedoraproject.org  Sun Jan  4 20:11:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 04 Jan 2009 20:11:17 +0000
Subject: [pkgdb] tinyows (Fedora, 10) updated by kevin
Message-ID: <20090104201117.88DC2208D51@bastion.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for tinyows
kevin has set commit to Approved for provenpackager on tinyows (Fedora 10)
kevin has set build to Approved for provenpackager on tinyows (Fedora 10)
kevin has set checkout to Approved for provenpackager on tinyows (Fedora 10)

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



From kevin at fedoraproject.org  Sun Jan  4 20:11:34 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun,  4 Jan 2009 20:11:34 +0000 (UTC)
Subject: rpms/tinyows - New directory
Message-ID: <20090104201134.2A03B70130@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/tinyows
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsv24891/rpms/tinyows

Log Message:
Directory /cvs/pkgs/rpms/tinyows added to the repository




From pkgdb at fedoraproject.org  Sun Jan  4 20:11:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 04 Jan 2009 20:11:17 +0000
Subject: [pkgdb] tinyows (Fedora, 9) updated by kevin
Message-ID: <20090104201117.AB58A208D55@bastion.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for tinyows
kevin has set commit to Approved for provenpackager on tinyows (Fedora 9)
kevin has set build to Approved for provenpackager on tinyows (Fedora 9)
kevin has set checkout to Approved for provenpackager on tinyows (Fedora 9)

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



From kevin at fedoraproject.org  Sun Jan  4 20:11:34 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun,  4 Jan 2009 20:11:34 +0000 (UTC)
Subject: rpms/tinyows/devel - New directory
Message-ID: <20090104201134.690E170130@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/tinyows/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsv24891/rpms/tinyows/devel

Log Message:
Directory /cvs/pkgs/rpms/tinyows/devel added to the repository




From cwickert at fedoraproject.org  Sun Jan  4 20:11:41 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Sun,  4 Jan 2009 20:11:41 +0000 (UTC)
Subject: rpms/gnome-applet-timer/devel gnome-applet-timer.spec,1.22,1.23
Message-ID: <20090104201141.2A0E870130@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/gnome-applet-timer/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24760/devel

Modified Files:
	gnome-applet-timer.spec 
Log Message:
fix typo in changelog


Index: gnome-applet-timer.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-applet-timer/devel/gnome-applet-timer.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- gnome-applet-timer.spec	4 Jan 2009 20:09:27 -0000	1.22
+++ gnome-applet-timer.spec	4 Jan 2009 20:11:10 -0000	1.23
@@ -101,7 +101,7 @@
 
 %changelog
 * Sun Jan 04 2009 Christoph Wickert <cwickert at fedoraproject.org> - 2.0.2-8
-- Use Paul's patch instead of Michael suggestion (#471465)
+- Use Paul's patch instead of Michael's suggestion (#471465)
 
 * Sun Jan 04 2009 Christoph Wickert <cwickert at fedoraproject.org> - 2.0.2-7
 - Apply libnotify patch, thanks to Michael Schwendt and Paul Frields (#471465)



From cwickert at fedoraproject.org  Sun Jan  4 20:11:41 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Sun,  4 Jan 2009 20:11:41 +0000 (UTC)
Subject: rpms/gnome-applet-timer/F-10 gnome-applet-timer.spec,1.21,1.22
Message-ID: <20090104201141.6980070130@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/gnome-applet-timer/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24760/F-10

Modified Files:
	gnome-applet-timer.spec 
Log Message:
fix typo in changelog


Index: gnome-applet-timer.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-applet-timer/F-10/gnome-applet-timer.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- gnome-applet-timer.spec	4 Jan 2009 20:09:27 -0000	1.21
+++ gnome-applet-timer.spec	4 Jan 2009 20:11:11 -0000	1.22
@@ -101,7 +101,7 @@
 
 %changelog
 * Sun Jan 04 2009 Christoph Wickert <cwickert at fedoraproject.org> - 2.0.2-8
-- Use Paul's patch instead of Michael suggestion (#471465)
+- Use Paul's patch instead of Michael's suggestion (#471465)
 
 * Sun Jan 04 2009 Christoph Wickert <cwickert at fedoraproject.org> - 2.0.2-7
 - Apply libnotify patch, thanks to Michael Schwendt and Paul Frields (#471465)



From kevin at fedoraproject.org  Sun Jan  4 20:11:51 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun,  4 Jan 2009 20:11:51 +0000 (UTC)
Subject: rpms/tinyows/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <20090104201151.644E57013F@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/tinyows/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsv24891/rpms/tinyows/devel

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


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: tinyows
# $Id: Makefile,v 1.1 2009/01/04 20:11:50 kevin Exp $
NAME := tinyows
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out 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 Jan  4 20:11:50 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun,  4 Jan 2009 20:11:50 +0000 (UTC)
Subject: rpms/tinyows Makefile,NONE,1.1
Message-ID: <20090104201150.B52C470130@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/tinyows
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsv24891/rpms/tinyows

Added Files:
	Makefile 
Log Message:
Setup of module tinyows


--- NEW FILE Makefile ---
# Top level Makefile for module tinyows
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout 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 Jan  4 20:13:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 04 Jan 2009 20:13:32 +0000
Subject: [pkgdb] dhcping (Fedora, 9) updated by kevin
Message-ID: <20090104201332.4E25B208D4F@bastion.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for dhcping
kevin has set commit to Approved for provenpackager on dhcping (Fedora 9)
kevin has set build to Approved for provenpackager on dhcping (Fedora 9)
kevin has set checkout to Approved for provenpackager on dhcping (Fedora 9)

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



From pkgdb at fedoraproject.org  Sun Jan  4 20:13:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 04 Jan 2009 20:13:30 +0000
Subject: [pkgdb] dhcping was added for fab
Message-ID: <20090104201330.F065520873E@bastion.fedora.phx.redhat.com>

kevin has added Package dhcping with summary DHCP daemon ping program
kevin has approved Package dhcping
kevin has added a Fedora devel branch for dhcping with an owner of fab
kevin has approved dhcping in Fedora devel
kevin has approved Package dhcping
kevin has set commit to Approved for provenpackager on dhcping (Fedora devel)
kevin has set build to Approved for provenpackager on dhcping (Fedora devel)
kevin has set checkout to Approved for provenpackager on dhcping (Fedora devel)

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



From kevin at fedoraproject.org  Sun Jan  4 20:13:46 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun,  4 Jan 2009 20:13:46 +0000 (UTC)
Subject: rpms/dhcping - New directory
Message-ID: <20090104201346.2C02370130@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/dhcping
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsQ25587/rpms/dhcping

Log Message:
Directory /cvs/pkgs/rpms/dhcping added to the repository




From kevin at fedoraproject.org  Sun Jan  4 20:13:46 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun,  4 Jan 2009 20:13:46 +0000 (UTC)
Subject: rpms/dhcping/devel - New directory
Message-ID: <20090104201346.717B970130@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/dhcping/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsQ25587/rpms/dhcping/devel

Log Message:
Directory /cvs/pkgs/rpms/dhcping/devel added to the repository




From pkgdb at fedoraproject.org  Sun Jan  4 20:13:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 04 Jan 2009 20:13:32 +0000
Subject: [pkgdb] dhcping (Fedora, 10) updated by kevin
Message-ID: <20090104201332.63854208D52@bastion.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for dhcping
kevin has set commit to Approved for provenpackager on dhcping (Fedora 10)
kevin has set build to Approved for provenpackager on dhcping (Fedora 10)
kevin has set checkout to Approved for provenpackager on dhcping (Fedora 10)

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



From kevin at fedoraproject.org  Sun Jan  4 20:14:05 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun,  4 Jan 2009 20:14:05 +0000 (UTC)
Subject: rpms/dhcping Makefile,NONE,1.1
Message-ID: <20090104201405.DB7A770130@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/dhcping
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsQ25587/rpms/dhcping

Added Files:
	Makefile 
Log Message:
Setup of module dhcping


--- NEW FILE Makefile ---
# Top level Makefile for module dhcping
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Jan  4 20:14:06 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun,  4 Jan 2009 20:14:06 +0000 (UTC)
Subject: rpms/dhcping/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <20090104201406.5164970130@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/dhcping/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsQ25587/rpms/dhcping/devel

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


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: dhcping
# $Id: Makefile,v 1.1 2009/01/04 20:14:06 kevin Exp $
NAME := dhcping
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Jan  4 20:15:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 04 Jan 2009 20:15:55 +0000
Subject: [pkgdb] virtaal was added for dwayne
Message-ID: <20090104201555.C349F20873E@bastion.fedora.phx.redhat.com>

kevin has added Package virtaal with summary Localization and translation editor
kevin has approved Package virtaal
kevin has added a Fedora devel branch for virtaal with an owner of dwayne
kevin has approved virtaal in Fedora devel
kevin has approved Package virtaal
kevin has set commit to Approved for provenpackager on virtaal (Fedora devel)
kevin has set build to Approved for provenpackager on virtaal (Fedora devel)
kevin has set checkout to Approved for provenpackager on virtaal (Fedora devel)

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



From pkgdb at fedoraproject.org  Sun Jan  4 20:15:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 04 Jan 2009 20:15:57 +0000
Subject: [pkgdb] virtaal (Fedora, 9) updated by kevin
Message-ID: <20090104201557.DBC84208D51@bastion.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for virtaal
kevin has set commit to Approved for provenpackager on virtaal (Fedora 9)
kevin has set build to Approved for provenpackager on virtaal (Fedora 9)
kevin has set checkout to Approved for provenpackager on virtaal (Fedora 9)

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



From pkgdb at fedoraproject.org  Sun Jan  4 20:15:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 04 Jan 2009 20:15:57 +0000
Subject: [pkgdb] virtaal (Fedora EPEL, 4) updated by kevin
Message-ID: <20090104201557.DF7AC208D53@bastion.fedora.phx.redhat.com>

kevin added a Fedora EPEL 4 branch for virtaal
kevin has set commit to Approved for provenpackager on virtaal (Fedora EPEL 4)
kevin has set build to Approved for provenpackager on virtaal (Fedora EPEL 4)
kevin has set checkout to Approved for provenpackager on virtaal (Fedora EPEL 4)

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



From kevin at fedoraproject.org  Sun Jan  4 20:16:10 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun,  4 Jan 2009 20:16:10 +0000 (UTC)
Subject: rpms/virtaal - New directory
Message-ID: <20090104201610.2AAAE70130@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/virtaal
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsy26302/rpms/virtaal

Log Message:
Directory /cvs/pkgs/rpms/virtaal added to the repository




From pkgdb at fedoraproject.org  Sun Jan  4 20:15:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 04 Jan 2009 20:15:57 +0000
Subject: [pkgdb] virtaal (Fedora, 10) updated by kevin
Message-ID: <20090104201557.E5B06208D58@bastion.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for virtaal
kevin has set commit to Approved for provenpackager on virtaal (Fedora 10)
kevin has set build to Approved for provenpackager on virtaal (Fedora 10)
kevin has set checkout to Approved for provenpackager on virtaal (Fedora 10)

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



From pkgdb at fedoraproject.org  Sun Jan  4 20:15:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 04 Jan 2009 20:15:57 +0000
Subject: [pkgdb] virtaal (Fedora EPEL, 5) updated by kevin
Message-ID: <20090104201558.01D21208D60@bastion.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for virtaal
kevin has set commit to Approved for provenpackager on virtaal (Fedora EPEL 5)
kevin has set build to Approved for provenpackager on virtaal (Fedora EPEL 5)
kevin has set checkout to Approved for provenpackager on virtaal (Fedora EPEL 5)

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



From kevin at fedoraproject.org  Sun Jan  4 20:16:10 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun,  4 Jan 2009 20:16:10 +0000 (UTC)
Subject: rpms/virtaal/devel - New directory
Message-ID: <20090104201610.66AB170130@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/virtaal/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsy26302/rpms/virtaal/devel

Log Message:
Directory /cvs/pkgs/rpms/virtaal/devel added to the repository




From kevin at fedoraproject.org  Sun Jan  4 20:16:29 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun,  4 Jan 2009 20:16:29 +0000 (UTC)
Subject: rpms/virtaal Makefile,NONE,1.1
Message-ID: <20090104201629.B5EF970130@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/virtaal
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsy26302/rpms/virtaal

Added Files:
	Makefile 
Log Message:
Setup of module virtaal


--- NEW FILE Makefile ---
# Top level Makefile for module virtaal
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Jan  4 20:16:30 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun,  4 Jan 2009 20:16:30 +0000 (UTC)
Subject: rpms/virtaal/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <20090104201630.4564770130@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/virtaal/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsy26302/rpms/virtaal/devel

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


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: virtaal
# $Id: Makefile,v 1.1 2009/01/04 20:16:29 kevin Exp $
NAME := virtaal
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Jan  4 20:16:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 04 Jan 2009 20:16:48 +0000
Subject: [pkgdb] libnice was added for bpepple
Message-ID: <20090104201648.47CB9208D2B@bastion.fedora.phx.redhat.com>

kevin has added Package libnice with summary GLib ICE implementation
kevin has approved Package libnice
kevin has added a Fedora devel branch for libnice with an owner of bpepple
kevin has approved libnice in Fedora devel
kevin has approved Package libnice
kevin has set commit to Approved for provenpackager on libnice (Fedora devel)
kevin has set build to Approved for provenpackager on libnice (Fedora devel)
kevin has set checkout to Approved for provenpackager on libnice (Fedora devel)

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



From kevin at fedoraproject.org  Sun Jan  4 20:17:06 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun,  4 Jan 2009 20:17:06 +0000 (UTC)
Subject: rpms/libnice - New directory
Message-ID: <20090104201706.3AC8370130@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/libnice
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsE26725/rpms/libnice

Log Message:
Directory /cvs/pkgs/rpms/libnice added to the repository




From kevin at fedoraproject.org  Sun Jan  4 20:17:06 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun,  4 Jan 2009 20:17:06 +0000 (UTC)
Subject: rpms/libnice/devel - New directory
Message-ID: <20090104201706.8780470130@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/libnice/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsE26725/rpms/libnice/devel

Log Message:
Directory /cvs/pkgs/rpms/libnice/devel added to the repository




From kevin at fedoraproject.org  Sun Jan  4 20:17:28 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun,  4 Jan 2009 20:17:28 +0000 (UTC)
Subject: rpms/libnice Makefile,NONE,1.1
Message-ID: <20090104201728.312F470130@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/libnice
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsE26725/rpms/libnice

Added Files:
	Makefile 
Log Message:
Setup of module libnice


--- NEW FILE Makefile ---
# Top level Makefile for module libnice
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Jan  4 20:17:28 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun,  4 Jan 2009 20:17:28 +0000 (UTC)
Subject: rpms/libnice/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <20090104201728.F1C3070130@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/libnice/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsE26725/rpms/libnice/devel

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


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: libnice
# $Id: Makefile,v 1.1 2009/01/04 20:17:28 kevin Exp $
NAME := libnice
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out 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 Jan  4 20:19:11 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun,  4 Jan 2009 20:19:11 +0000 (UTC)
Subject: rpms/mumbles - New directory
Message-ID: <20090104201911.3364470130@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/mumbles
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsW27211/rpms/mumbles

Log Message:
Directory /cvs/pkgs/rpms/mumbles added to the repository




From pkgdb at fedoraproject.org  Sun Jan  4 20:18:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 04 Jan 2009 20:18:55 +0000
Subject: [pkgdb] mumbles was added for janderson
Message-ID: <20090104201855.270F220873E@bastion.fedora.phx.redhat.com>

kevin has added Package mumbles with summary growl like notification system for GNOME
kevin has approved Package mumbles
kevin has added a Fedora devel branch for mumbles with an owner of janderson
kevin has approved mumbles in Fedora devel
kevin has approved Package mumbles
kevin has set commit to Approved for provenpackager on mumbles (Fedora devel)
kevin has set build to Approved for provenpackager on mumbles (Fedora devel)
kevin has set checkout to Approved for provenpackager on mumbles (Fedora devel)

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



From pkgdb at fedoraproject.org  Sun Jan  4 20:18:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 04 Jan 2009 20:18:56 +0000
Subject: [pkgdb] mumbles (Fedora, 10) updated by kevin
Message-ID: <20090104201856.CDA4B208D4F@bastion.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for mumbles
kevin has set commit to Approved for provenpackager on mumbles (Fedora 10)
kevin has set build to Approved for provenpackager on mumbles (Fedora 10)
kevin has set checkout to Approved for provenpackager on mumbles (Fedora 10)

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



From kevin at fedoraproject.org  Sun Jan  4 20:19:11 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun,  4 Jan 2009 20:19:11 +0000 (UTC)
Subject: rpms/mumbles/devel - New directory
Message-ID: <20090104201911.7BA4370130@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/mumbles/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsW27211/rpms/mumbles/devel

Log Message:
Directory /cvs/pkgs/rpms/mumbles/devel added to the repository




From kevin at fedoraproject.org  Sun Jan  4 20:19:30 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun,  4 Jan 2009 20:19:30 +0000 (UTC)
Subject: rpms/mumbles Makefile,NONE,1.1
Message-ID: <20090104201930.5315A70130@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/mumbles
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsW27211/rpms/mumbles

Added Files:
	Makefile 
Log Message:
Setup of module mumbles


--- NEW FILE Makefile ---
# Top level Makefile for module mumbles
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Jan  4 20:19:30 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun,  4 Jan 2009 20:19:30 +0000 (UTC)
Subject: rpms/mumbles/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <20090104201930.D3D9270130@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/mumbles/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsW27211/rpms/mumbles/devel

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


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: mumbles
# $Id: Makefile,v 1.1 2009/01/04 20:19:30 kevin Exp $
NAME := mumbles
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Jan  4 20:20:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 04 Jan 2009 20:20:02 +0000
Subject: [pkgdb] sion was added for kevin
Message-ID: <20090104202002.BCAF820873E@bastion.fedora.phx.redhat.com>

kevin has added Package sion with summary GIO/GVFS management application
kevin has approved Package sion
kevin has added a Fedora devel branch for sion with an owner of kevin
kevin has approved sion in Fedora devel
kevin has approved Package sion
kevin has set commit to Approved for provenpackager on sion (Fedora devel)
kevin has set build to Approved for provenpackager on sion (Fedora devel)
kevin has set checkout to Approved for provenpackager on sion (Fedora devel)

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



From pkgdb at fedoraproject.org  Sun Jan  4 20:20:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 04 Jan 2009 20:20:04 +0000
Subject: [pkgdb] sion (Fedora, 9) updated by kevin
Message-ID: <20090104202004.81792208D4E@bastion.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for sion
kevin has set commit to Approved for provenpackager on sion (Fedora 9)
kevin has set build to Approved for provenpackager on sion (Fedora 9)
kevin has set checkout to Approved for provenpackager on sion (Fedora 9)

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



From kevin at fedoraproject.org  Sun Jan  4 20:20:19 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun,  4 Jan 2009 20:20:19 +0000 (UTC)
Subject: rpms/sion - New directory
Message-ID: <20090104202019.2DC9070130@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/sion
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsn27560/rpms/sion

Log Message:
Directory /cvs/pkgs/rpms/sion added to the repository




From pkgdb at fedoraproject.org  Sun Jan  4 20:20:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 04 Jan 2009 20:20:04 +0000
Subject: [pkgdb] sion (Fedora, 10) updated by kevin
Message-ID: <20090104202004.B32CF208D50@bastion.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for sion
kevin has set commit to Approved for provenpackager on sion (Fedora 10)
kevin has set build to Approved for provenpackager on sion (Fedora 10)
kevin has set checkout to Approved for provenpackager on sion (Fedora 10)

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



From kevin at fedoraproject.org  Sun Jan  4 20:20:19 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun,  4 Jan 2009 20:20:19 +0000 (UTC)
Subject: rpms/sion/devel - New directory
Message-ID: <20090104202019.6944F70130@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/sion/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsn27560/rpms/sion/devel

Log Message:
Directory /cvs/pkgs/rpms/sion/devel added to the repository




From kevin at fedoraproject.org  Sun Jan  4 20:20:36 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun,  4 Jan 2009 20:20:36 +0000 (UTC)
Subject: rpms/sion Makefile,NONE,1.1
Message-ID: <20090104202036.5BA6F70130@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/sion
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsn27560/rpms/sion

Added Files:
	Makefile 
Log Message:
Setup of module sion


--- NEW FILE Makefile ---
# Top level Makefile for module sion
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Jan  4 20:20:36 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun,  4 Jan 2009 20:20:36 +0000 (UTC)
Subject: rpms/sion/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <20090104202036.A3F7D70130@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/sion/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsn27560/rpms/sion/devel

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


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: sion
# $Id: Makefile,v 1.1 2009/01/04 20:20:36 kevin Exp $
NAME := sion
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Jan  4 20:21:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 04 Jan 2009 20:21:16 +0000
Subject: [pkgdb] python-transitfeed was added for ianweller
Message-ID: <20090104202116.D0B3920873E@bastion.fedora.phx.redhat.com>

kevin has added Package python-transitfeed with summary Google Transit Feed Specification library and tools
kevin has approved Package python-transitfeed
kevin has added a Fedora devel branch for python-transitfeed with an owner of ianweller
kevin has approved python-transitfeed in Fedora devel
kevin has approved Package python-transitfeed
kevin has set commit to Approved for provenpackager on python-transitfeed (Fedora devel)
kevin has set build to Approved for provenpackager on python-transitfeed (Fedora devel)
kevin has set checkout to Approved for provenpackager on python-transitfeed (Fedora devel)

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



From pkgdb at fedoraproject.org  Sun Jan  4 20:21:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 04 Jan 2009 20:21:18 +0000
Subject: [pkgdb] python-transitfeed (Fedora, 9) updated by kevin
Message-ID: <20090104202118.4F1C6208D4F@bastion.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for python-transitfeed
kevin has set commit to Approved for provenpackager on python-transitfeed (Fedora 9)
kevin has set build to Approved for provenpackager on python-transitfeed (Fedora 9)
kevin has set checkout to Approved for provenpackager on python-transitfeed (Fedora 9)

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



From kevin at fedoraproject.org  Sun Jan  4 20:21:33 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun,  4 Jan 2009 20:21:33 +0000 (UTC)
Subject: rpms/python-transitfeed - New directory
Message-ID: <20090104202133.29D7E70130@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/python-transitfeed
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsw27953/rpms/python-transitfeed

Log Message:
Directory /cvs/pkgs/rpms/python-transitfeed added to the repository




From kevin at fedoraproject.org  Sun Jan  4 20:21:33 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun,  4 Jan 2009 20:21:33 +0000 (UTC)
Subject: rpms/python-transitfeed/devel - New directory
Message-ID: <20090104202133.6FFB770130@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/python-transitfeed/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsw27953/rpms/python-transitfeed/devel

Log Message:
Directory /cvs/pkgs/rpms/python-transitfeed/devel added to the repository




From pkgdb at fedoraproject.org  Sun Jan  4 20:21:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 04 Jan 2009 20:21:18 +0000
Subject: [pkgdb] python-transitfeed (Fedora, 10) updated by kevin
Message-ID: <20090104202118.57CB3208D52@bastion.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for python-transitfeed
kevin has set commit to Approved for provenpackager on python-transitfeed (Fedora 10)
kevin has set build to Approved for provenpackager on python-transitfeed (Fedora 10)
kevin has set checkout to Approved for provenpackager on python-transitfeed (Fedora 10)

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



From kevin at fedoraproject.org  Sun Jan  4 20:21:51 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun,  4 Jan 2009 20:21:51 +0000 (UTC)
Subject: rpms/python-transitfeed Makefile,NONE,1.1
Message-ID: <20090104202151.55AA870130@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/python-transitfeed
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsw27953/rpms/python-transitfeed

Added Files:
	Makefile 
Log Message:
Setup of module python-transitfeed


--- NEW FILE Makefile ---
# Top level Makefile for module python-transitfeed
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Jan  4 20:21:51 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun,  4 Jan 2009 20:21:51 +0000 (UTC)
Subject: rpms/python-transitfeed/devel .cvsignore, NONE, 1.1 Makefile, NONE, 
	1.1 sources, NONE, 1.1
Message-ID: <20090104202151.AF9D870130@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/python-transitfeed/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsw27953/rpms/python-transitfeed/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module python-transitfeed


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: python-transitfeed
# $Id: Makefile,v 1.1 2009/01/04 20:21:51 kevin Exp $
NAME := python-transitfeed
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Jan  4 20:24:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 04 Jan 2009 20:24:58 +0000
Subject: [pkgdb] fspy was added for fab
Message-ID: <20090104202458.3403020873E@bastion.fedora.phx.redhat.com>

kevin has added Package fspy with summary Filesystem activity monitoring utility
kevin has approved Package fspy
kevin has added a Fedora devel branch for fspy with an owner of fab
kevin has approved fspy in Fedora devel
kevin has approved Package fspy
kevin has set commit to Approved for provenpackager on fspy (Fedora devel)
kevin has set build to Approved for provenpackager on fspy (Fedora devel)
kevin has set checkout to Approved for provenpackager on fspy (Fedora devel)

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



From kevin at fedoraproject.org  Sun Jan  4 20:25:15 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun,  4 Jan 2009 20:25:15 +0000 (UTC)
Subject: rpms/fspy - New directory
Message-ID: <20090104202515.2A46470130@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/fspy
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsW28831/rpms/fspy

Log Message:
Directory /cvs/pkgs/rpms/fspy added to the repository




From pkgdb at fedoraproject.org  Sun Jan  4 20:24:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 04 Jan 2009 20:24:59 +0000
Subject: [pkgdb] fspy (Fedora, 9) updated by kevin
Message-ID: <20090104202459.9CBEF208D51@bastion.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for fspy
kevin has set commit to Approved for provenpackager on fspy (Fedora 9)
kevin has set build to Approved for provenpackager on fspy (Fedora 9)
kevin has set checkout to Approved for provenpackager on fspy (Fedora 9)

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



From pkgdb at fedoraproject.org  Sun Jan  4 20:24:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 04 Jan 2009 20:24:59 +0000
Subject: [pkgdb] fspy (Fedora, 10) updated by kevin
Message-ID: <20090104202459.A599E208D55@bastion.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for fspy
kevin has set commit to Approved for provenpackager on fspy (Fedora 10)
kevin has set build to Approved for provenpackager on fspy (Fedora 10)
kevin has set checkout to Approved for provenpackager on fspy (Fedora 10)

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



From kevin at fedoraproject.org  Sun Jan  4 20:25:15 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun,  4 Jan 2009 20:25:15 +0000 (UTC)
Subject: rpms/fspy/devel - New directory
Message-ID: <20090104202515.6C24470130@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/fspy/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsW28831/rpms/fspy/devel

Log Message:
Directory /cvs/pkgs/rpms/fspy/devel added to the repository




From kevin at fedoraproject.org  Sun Jan  4 20:25:33 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun,  4 Jan 2009 20:25:33 +0000 (UTC)
Subject: rpms/fspy Makefile,NONE,1.1
Message-ID: <20090104202533.448DD70130@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/fspy
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsW28831/rpms/fspy

Added Files:
	Makefile 
Log Message:
Setup of module fspy


--- NEW FILE Makefile ---
# Top level Makefile for module fspy
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Jan  4 20:25:33 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun,  4 Jan 2009 20:25:33 +0000 (UTC)
Subject: rpms/fspy/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <20090104202533.B40BC70130@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/fspy/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsW28831/rpms/fspy/devel

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


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: fspy
# $Id: Makefile,v 1.1 2009/01/04 20:25:33 kevin Exp $
NAME := fspy
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Jan  4 20:28:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 04 Jan 2009 20:28:25 +0000
Subject: [pkgdb] conspy (Fedora, 9) updated by kevin
Message-ID: <20090104202827.1A858208D52@bastion.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for conspy
kevin has set commit to Approved for provenpackager on conspy (Fedora 9)
kevin has set build to Approved for provenpackager on conspy (Fedora 9)
kevin has set checkout to Approved for provenpackager on conspy (Fedora 9)

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



From pkgdb at fedoraproject.org  Sun Jan  4 20:28:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 04 Jan 2009 20:28:24 +0000
Subject: [pkgdb] conspy was added for fab
Message-ID: <20090104202824.78E81208D4F@bastion.fedora.phx.redhat.com>

kevin has added Package conspy with summary Remote control for text mode virtual consoles
kevin has approved Package conspy
kevin has added a Fedora devel branch for conspy with an owner of fab
kevin has approved conspy in Fedora devel
kevin has approved Package conspy
kevin has set commit to Approved for provenpackager on conspy (Fedora devel)
kevin has set build to Approved for provenpackager on conspy (Fedora devel)
kevin has set checkout to Approved for provenpackager on conspy (Fedora devel)

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



From cwickert at fedoraproject.org  Sun Jan  4 20:28:34 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Sun,  4 Jan 2009 20:28:34 +0000 (UTC)
Subject: rpms/gnome-applet-timer/F-10 timer-applet-2.0.1-stop-pulsing.patch, 
	NONE, 1.1 timer-applet-2.0.1-libnotify.patch, 1.1, NONE
Message-ID: <20090104202834.41D0370130@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/gnome-applet-timer/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29780

Added Files:
	timer-applet-2.0.1-stop-pulsing.patch 
Removed Files:
	timer-applet-2.0.1-libnotify.patch 
Log Message:
add the right patch

timer-applet-2.0.1-stop-pulsing.patch:

--- NEW FILE timer-applet-2.0.1-stop-pulsing.patch ---
--- timer-applet-2.0.1-orig/src/timerapplet/ui/Notifier.py	2007-04-27 21:31:03.000000000 -0400
+++ timer-applet-2.0.1/src/timerapplet/ui/Notifier.py	2008-12-24 11:04:52.000000000 -0500
@@ -25,12 +25,16 @@
             if self._timeout_id is not None:
                 gobject.source_remove(self._timeout_id)
                 self._timeout_id = None
-            self._notify.disconnect(self._handler_id)
-            self._handler_id = None
-            self._notify.close()
-            self._notify = None
+            if self._handler_id is not None:
+                self._notify.disconnect(self._handler_id)
+                self._handler_id = None
+            try:
+                self._notify.close()
+                self._notify = None
+            except:
+                pass
             
-    def _on_notification_closed(self, notification, get_reminder_message_func):
+    def _on_notification_closed(self, notification, reason, get_reminder_message_func):
         self._timeout_id = gobject.timeout_add(Notifier._NOTIFICATION_REDISPLAY_INTERVAL_SECONDS * 1000,
                                                self._on_notification_redisplay_timeout,
                                                get_reminder_message_func)


--- timer-applet-2.0.1-libnotify.patch DELETED ---



From kevin at fedoraproject.org  Sun Jan  4 20:28:40 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun,  4 Jan 2009 20:28:40 +0000 (UTC)
Subject: rpms/conspy - New directory
Message-ID: <20090104202840.2422770130@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/conspy
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsy29824/rpms/conspy

Log Message:
Directory /cvs/pkgs/rpms/conspy added to the repository




From pkgdb at fedoraproject.org  Sun Jan  4 20:28:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 04 Jan 2009 20:28:25 +0000
Subject: [pkgdb] conspy (Fedora, 10) updated by kevin
Message-ID: <20090104202827.26B62208D57@bastion.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for conspy
kevin has set commit to Approved for provenpackager on conspy (Fedora 10)
kevin has set build to Approved for provenpackager on conspy (Fedora 10)
kevin has set checkout to Approved for provenpackager on conspy (Fedora 10)

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



From kevin at fedoraproject.org  Sun Jan  4 20:28:40 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun,  4 Jan 2009 20:28:40 +0000 (UTC)
Subject: rpms/conspy/devel - New directory
Message-ID: <20090104202840.5F11770130@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/conspy/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsy29824/rpms/conspy/devel

Log Message:
Directory /cvs/pkgs/rpms/conspy/devel added to the repository




From kevin at fedoraproject.org  Sun Jan  4 20:28:56 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun,  4 Jan 2009 20:28:56 +0000 (UTC)
Subject: rpms/conspy Makefile,NONE,1.1
Message-ID: <20090104202856.11C6470130@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/conspy
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsy29824/rpms/conspy

Added Files:
	Makefile 
Log Message:
Setup of module conspy


--- NEW FILE Makefile ---
# Top level Makefile for module conspy
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Jan  4 20:28:56 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun,  4 Jan 2009 20:28:56 +0000 (UTC)
Subject: rpms/conspy/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <20090104202856.9096470130@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/conspy/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsy29824/rpms/conspy/devel

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


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: conspy
# $Id: Makefile,v 1.1 2009/01/04 20:28:56 kevin Exp $
NAME := conspy
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Jan  4 20:29:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 04 Jan 2009 20:29:27 +0000
Subject: [pkgdb] xfce4-screenshooter was added for cwickert
Message-ID: <20090104202927.D106720873B@bastion.fedora.phx.redhat.com>

kevin has added Package xfce4-screenshooter with summary Screenshot utility for the Xfce desktop
kevin has approved Package xfce4-screenshooter
kevin has added a Fedora devel branch for xfce4-screenshooter with an owner of cwickert
kevin has approved xfce4-screenshooter in Fedora devel
kevin has approved Package xfce4-screenshooter
kevin has set commit to Approved for provenpackager on xfce4-screenshooter (Fedora devel)
kevin has set build to Approved for provenpackager on xfce4-screenshooter (Fedora devel)
kevin has set checkout to Approved for provenpackager on xfce4-screenshooter (Fedora devel)

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



From pkgdb at fedoraproject.org  Sun Jan  4 20:29:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 04 Jan 2009 20:29:29 +0000
Subject: [pkgdb] xfce4-screenshooter (Fedora, 10) updated by kevin
Message-ID: <20090104202929.EC796208D50@bastion.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for xfce4-screenshooter
kevin has set commit to Approved for provenpackager on xfce4-screenshooter (Fedora 10)
kevin has set build to Approved for provenpackager on xfce4-screenshooter (Fedora 10)
kevin has set checkout to Approved for provenpackager on xfce4-screenshooter (Fedora 10)

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



From kevin at fedoraproject.org  Sun Jan  4 20:29:43 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun,  4 Jan 2009 20:29:43 +0000 (UTC)
Subject: rpms/xfce4-screenshooter - New directory
Message-ID: <20090104202943.2D2FC70130@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/xfce4-screenshooter
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsk30208/rpms/xfce4-screenshooter

Log Message:
Directory /cvs/pkgs/rpms/xfce4-screenshooter added to the repository




From kevin at fedoraproject.org  Sun Jan  4 20:29:43 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun,  4 Jan 2009 20:29:43 +0000 (UTC)
Subject: rpms/xfce4-screenshooter/devel - New directory
Message-ID: <20090104202943.72B3F70130@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/xfce4-screenshooter/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsk30208/rpms/xfce4-screenshooter/devel

Log Message:
Directory /cvs/pkgs/rpms/xfce4-screenshooter/devel added to the repository




From kevin at fedoraproject.org  Sun Jan  4 20:30:02 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun,  4 Jan 2009 20:30:02 +0000 (UTC)
Subject: rpms/xfce4-screenshooter/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090104203002.E706470130@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/xfce4-screenshooter/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsk30208/rpms/xfce4-screenshooter/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module xfce4-screenshooter


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: xfce4-screenshooter
# $Id: Makefile,v 1.1 2009/01/04 20:30:02 kevin Exp $
NAME := xfce4-screenshooter
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out 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 Jan  4 20:30:02 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun,  4 Jan 2009 20:30:02 +0000 (UTC)
Subject: rpms/xfce4-screenshooter Makefile,NONE,1.1
Message-ID: <20090104203002.4668270130@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/xfce4-screenshooter
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsk30208/rpms/xfce4-screenshooter

Added Files:
	Makefile 
Log Message:
Setup of module xfce4-screenshooter


--- NEW FILE Makefile ---
# Top level Makefile for module xfce4-screenshooter
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout 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 Jan  4 20:31:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 04 Jan 2009 20:31:04 +0000
Subject: [pkgdb] perl-Directory-Scratch-Structured was added for cweyl
Message-ID: <20090104203104.C377E20873B@bastion.fedora.phx.redhat.com>

kevin has added Package perl-Directory-Scratch-Structured with summary Creates temporary files and directories from a structured description
kevin has approved Package perl-Directory-Scratch-Structured
kevin has added a Fedora devel branch for perl-Directory-Scratch-Structured with an owner of cweyl
kevin has approved perl-Directory-Scratch-Structured in Fedora devel
kevin has approved Package perl-Directory-Scratch-Structured
kevin has set commit to Approved for provenpackager on perl-Directory-Scratch-Structured (Fedora devel)
kevin has set build to Approved for provenpackager on perl-Directory-Scratch-Structured (Fedora devel)
kevin has set checkout to Approved for provenpackager on perl-Directory-Scratch-Structured (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Directory-Scratch-Structured



From pkgdb at fedoraproject.org  Sun Jan  4 20:31:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 04 Jan 2009 20:31:06 +0000
Subject: [pkgdb] perl-Directory-Scratch-Structured (Fedora,
	9) updated by kevin
Message-ID: <20090104203106.402F0208D50@bastion.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for perl-Directory-Scratch-Structured
kevin has set commit to Approved for provenpackager on perl-Directory-Scratch-Structured (Fedora 9)
kevin has set build to Approved for provenpackager on perl-Directory-Scratch-Structured (Fedora 9)
kevin has set checkout to Approved for provenpackager on perl-Directory-Scratch-Structured (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Directory-Scratch-Structured



From kevin at fedoraproject.org  Sun Jan  4 20:31:28 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun,  4 Jan 2009 20:31:28 +0000 (UTC)
Subject: rpms/perl-Directory-Scratch-Structured - New directory
Message-ID: <20090104203128.B4BD870130@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Directory-Scratch-Structured
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsH30712/rpms/perl-Directory-Scratch-Structured

Log Message:
Directory /cvs/pkgs/rpms/perl-Directory-Scratch-Structured added to the repository




From kevin at fedoraproject.org  Sun Jan  4 20:31:29 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun,  4 Jan 2009 20:31:29 +0000 (UTC)
Subject: rpms/perl-Directory-Scratch-Structured/devel - New directory
Message-ID: <20090104203129.A2AE170130@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Directory-Scratch-Structured/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsH30712/rpms/perl-Directory-Scratch-Structured/devel

Log Message:
Directory /cvs/pkgs/rpms/perl-Directory-Scratch-Structured/devel added to the repository




From pkgdb at fedoraproject.org  Sun Jan  4 20:31:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 04 Jan 2009 20:31:06 +0000
Subject: [pkgdb] perl-Directory-Scratch-Structured (Fedora,
	10) updated by kevin
Message-ID: <20090104203106.536FF208D53@bastion.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for perl-Directory-Scratch-Structured
kevin has set commit to Approved for provenpackager on perl-Directory-Scratch-Structured (Fedora 10)
kevin has set build to Approved for provenpackager on perl-Directory-Scratch-Structured (Fedora 10)
kevin has set checkout to Approved for provenpackager on perl-Directory-Scratch-Structured (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Directory-Scratch-Structured



From kevin at fedoraproject.org  Sun Jan  4 20:31:55 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun,  4 Jan 2009 20:31:55 +0000 (UTC)
Subject: rpms/perl-Directory-Scratch-Structured Makefile,NONE,1.1
Message-ID: <20090104203155.1105870130@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Directory-Scratch-Structured
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsH30712/rpms/perl-Directory-Scratch-Structured

Added Files:
	Makefile 
Log Message:
Setup of module perl-Directory-Scratch-Structured


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Directory-Scratch-Structured
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Jan  4 20:31:55 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun,  4 Jan 2009 20:31:55 +0000 (UTC)
Subject: rpms/perl-Directory-Scratch-Structured/devel .cvsignore, NONE,
	1.1 Makefile, NONE, 1.1 sources, NONE, 1.1
Message-ID: <20090104203155.C625D70130@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Directory-Scratch-Structured/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsH30712/rpms/perl-Directory-Scratch-Structured/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Directory-Scratch-Structured


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: perl-Directory-Scratch-Structured
# $Id: Makefile,v 1.1 2009/01/04 20:31:55 kevin Exp $
NAME := perl-Directory-Scratch-Structured
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Jan  4 20:32:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 04 Jan 2009 20:32:42 +0000
Subject: [pkgdb] linsmith was added for chitlesh
Message-ID: <20090104203242.81DD5208D50@bastion.fedora.phx.redhat.com>

kevin has added Package linsmith with summary a Smith Charting program
kevin has approved Package linsmith
kevin has added a Fedora devel branch for linsmith with an owner of chitlesh
kevin has approved linsmith in Fedora devel
kevin has approved Package linsmith
kevin has set commit to Approved for provenpackager on linsmith (Fedora devel)
kevin has set build to Approved for provenpackager on linsmith (Fedora devel)
kevin has set checkout to Approved for provenpackager on linsmith (Fedora devel)

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



From pkgdb at fedoraproject.org  Sun Jan  4 20:32:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 04 Jan 2009 20:32:48 +0000
Subject: [pkgdb] linsmith (Fedora, 9) updated by kevin
Message-ID: <20090104203249.08873208D52@bastion.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for linsmith
kevin has set commit to Approved for provenpackager on linsmith (Fedora 9)
kevin has set build to Approved for provenpackager on linsmith (Fedora 9)
kevin has set checkout to Approved for provenpackager on linsmith (Fedora 9)

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



From pkgdb at fedoraproject.org  Sun Jan  4 20:32:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 04 Jan 2009 20:32:48 +0000
Subject: [pkgdb] linsmith (Fedora EPEL, 5) updated by kevin
Message-ID: <20090104203249.DE250208D53@bastion.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for linsmith
kevin has set commit to Approved for provenpackager on linsmith (Fedora EPEL 5)
kevin has set build to Approved for provenpackager on linsmith (Fedora EPEL 5)
kevin has set checkout to Approved for provenpackager on linsmith (Fedora EPEL 5)

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



From kevin at fedoraproject.org  Sun Jan  4 20:33:01 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun,  4 Jan 2009 20:33:01 +0000 (UTC)
Subject: rpms/linsmith - New directory
Message-ID: <20090104203301.3565870130@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/linsmith
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvso31255/rpms/linsmith

Log Message:
Directory /cvs/pkgs/rpms/linsmith added to the repository




From kevin at fedoraproject.org  Sun Jan  4 20:33:01 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun,  4 Jan 2009 20:33:01 +0000 (UTC)
Subject: rpms/linsmith/devel - New directory
Message-ID: <20090104203301.6FE5B70130@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/linsmith/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvso31255/rpms/linsmith/devel

Log Message:
Directory /cvs/pkgs/rpms/linsmith/devel added to the repository




From pkgdb at fedoraproject.org  Sun Jan  4 20:32:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 04 Jan 2009 20:32:48 +0000
Subject: [pkgdb] linsmith (Fedora, 10) updated by kevin
Message-ID: <20090104203250.84A49208D5A@bastion.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for linsmith
kevin has set commit to Approved for provenpackager on linsmith (Fedora 10)
kevin has set build to Approved for provenpackager on linsmith (Fedora 10)
kevin has set checkout to Approved for provenpackager on linsmith (Fedora 10)

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



From kevin at fedoraproject.org  Sun Jan  4 20:33:18 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun,  4 Jan 2009 20:33:18 +0000 (UTC)
Subject: rpms/linsmith Makefile,NONE,1.1
Message-ID: <20090104203318.6411C70130@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/linsmith
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvso31255/rpms/linsmith

Added Files:
	Makefile 
Log Message:
Setup of module linsmith


--- NEW FILE Makefile ---
# Top level Makefile for module linsmith
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Jan  4 20:33:18 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun,  4 Jan 2009 20:33:18 +0000 (UTC)
Subject: rpms/linsmith/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090104203318.C566C70130@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/linsmith/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvso31255/rpms/linsmith/devel

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


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: linsmith
# $Id: Makefile,v 1.1 2009/01/04 20:33:18 kevin Exp $
NAME := linsmith
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Jan  4 20:36:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 04 Jan 2009 20:36:20 +0000
Subject: [pkgdb] pfstools was added for drepper
Message-ID: <20090104203620.5D8E620873E@bastion.fedora.phx.redhat.com>

kevin has added Package pfstools with summary Programs for handling high-dynamic range images
kevin has approved Package pfstools
kevin has added a Fedora devel branch for pfstools with an owner of drepper
kevin has approved pfstools in Fedora devel
kevin has approved Package pfstools
kevin has set commit to Approved for provenpackager on pfstools (Fedora devel)
kevin has set build to Approved for provenpackager on pfstools (Fedora devel)
kevin has set checkout to Approved for provenpackager on pfstools (Fedora devel)

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



From pkgdb at fedoraproject.org  Sun Jan  4 20:36:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 04 Jan 2009 20:36:21 +0000
Subject: [pkgdb] pfstools (Fedora, 9) updated by kevin
Message-ID: <20090104203621.E218B208D51@bastion.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for pfstools
kevin has set commit to Approved for provenpackager on pfstools (Fedora 9)
kevin has set build to Approved for provenpackager on pfstools (Fedora 9)
kevin has set checkout to Approved for provenpackager on pfstools (Fedora 9)

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



From kevin at fedoraproject.org  Sun Jan  4 20:36:36 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun,  4 Jan 2009 20:36:36 +0000 (UTC)
Subject: rpms/pfstools/devel - New directory
Message-ID: <20090104203636.71AF67013F@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/pfstools/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsw32317/rpms/pfstools/devel

Log Message:
Directory /cvs/pkgs/rpms/pfstools/devel added to the repository




From kevin at fedoraproject.org  Sun Jan  4 20:36:36 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun,  4 Jan 2009 20:36:36 +0000 (UTC)
Subject: rpms/pfstools - New directory
Message-ID: <20090104203636.36BB670130@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/pfstools
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsw32317/rpms/pfstools

Log Message:
Directory /cvs/pkgs/rpms/pfstools added to the repository




From pkgdb at fedoraproject.org  Sun Jan  4 20:36:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 04 Jan 2009 20:36:21 +0000
Subject: [pkgdb] pfstools (Fedora, 10) updated by kevin
Message-ID: <20090104203622.021EB208D55@bastion.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for pfstools
kevin has set commit to Approved for provenpackager on pfstools (Fedora 10)
kevin has set build to Approved for provenpackager on pfstools (Fedora 10)
kevin has set checkout to Approved for provenpackager on pfstools (Fedora 10)

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



From kevin at fedoraproject.org  Sun Jan  4 20:36:52 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun,  4 Jan 2009 20:36:52 +0000 (UTC)
Subject: rpms/pfstools Makefile,NONE,1.1
Message-ID: <20090104203652.0ECB670130@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/pfstools
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsw32317/rpms/pfstools

Added Files:
	Makefile 
Log Message:
Setup of module pfstools


--- NEW FILE Makefile ---
# Top level Makefile for module pfstools
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Jan  4 20:36:52 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun,  4 Jan 2009 20:36:52 +0000 (UTC)
Subject: rpms/pfstools/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090104203652.5291D70130@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/pfstools/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsw32317/rpms/pfstools/devel

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


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: pfstools
# $Id: Makefile,v 1.1 2009/01/04 20:36:52 kevin Exp $
NAME := pfstools
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Jan  4 20:37:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 04 Jan 2009 20:37:27 +0000
Subject: [pkgdb] mr was added for fab
Message-ID: <20090104203727.6F4D820873E@bastion.fedora.phx.redhat.com>

kevin has added Package mr with summary A multiple repository management tool
kevin has approved Package mr
kevin has added a Fedora devel branch for mr with an owner of fab
kevin has approved mr in Fedora devel
kevin has approved Package mr
kevin has set commit to Approved for provenpackager on mr (Fedora devel)
kevin has set build to Approved for provenpackager on mr (Fedora devel)
kevin has set checkout to Approved for provenpackager on mr (Fedora devel)

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



From pkgdb at fedoraproject.org  Sun Jan  4 20:37:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 04 Jan 2009 20:37:29 +0000
Subject: [pkgdb] mr (Fedora, 9) updated by kevin
Message-ID: <20090104203729.2FE5A208D51@bastion.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for mr
kevin has set commit to Approved for provenpackager on mr (Fedora 9)
kevin has set build to Approved for provenpackager on mr (Fedora 9)
kevin has set checkout to Approved for provenpackager on mr (Fedora 9)

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



From kevin at fedoraproject.org  Sun Jan  4 20:37:42 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun,  4 Jan 2009 20:37:42 +0000 (UTC)
Subject: rpms/mr - New directory
Message-ID: <20090104203742.325E670130@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/mr
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsN32760/rpms/mr

Log Message:
Directory /cvs/pkgs/rpms/mr added to the repository




From kevin at fedoraproject.org  Sun Jan  4 20:37:42 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun,  4 Jan 2009 20:37:42 +0000 (UTC)
Subject: rpms/mr/devel - New directory
Message-ID: <20090104203742.72FF370130@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/mr/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsN32760/rpms/mr/devel

Log Message:
Directory /cvs/pkgs/rpms/mr/devel added to the repository




From pkgdb at fedoraproject.org  Sun Jan  4 20:37:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 04 Jan 2009 20:37:29 +0000
Subject: [pkgdb] mr (Fedora, 10) updated by kevin
Message-ID: <20090104203729.3BA6B208D55@bastion.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for mr
kevin has set commit to Approved for provenpackager on mr (Fedora 10)
kevin has set build to Approved for provenpackager on mr (Fedora 10)
kevin has set checkout to Approved for provenpackager on mr (Fedora 10)

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



From kevin at fedoraproject.org  Sun Jan  4 20:38:00 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun,  4 Jan 2009 20:38:00 +0000 (UTC)
Subject: rpms/mr Makefile,NONE,1.1
Message-ID: <20090104203800.3C8E47013F@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/mr
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsN32760/rpms/mr

Added Files:
	Makefile 
Log Message:
Setup of module mr


--- NEW FILE Makefile ---
# Top level Makefile for module mr
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Sun Jan  4 20:38:00 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun,  4 Jan 2009 20:38:00 +0000 (UTC)
Subject: rpms/mr/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <20090104203800.9F1587013F@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/mr/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsN32760/rpms/mr/devel

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


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: mr
# $Id: Makefile,v 1.1 2009/01/04 20:38:00 kevin Exp $
NAME := mr
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Sun Jan  4 20:39:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 04 Jan 2009 20:39:08 +0000
Subject: [pkgdb] screenie was added for fab
Message-ID: <20090104203908.5BE04208D4F@bastion.fedora.phx.redhat.com>

kevin has added Package screenie with summary A small and lightweight screen wrapper
kevin has approved Package screenie
kevin has added a Fedora devel branch for screenie with an owner of fab
kevin has approved screenie in Fedora devel
kevin has approved Package screenie
kevin has set commit to Approved for provenpackager on screenie (Fedora devel)
kevin has set build to Approved for provenpackager on screenie (Fedora devel)
kevin has set checkout to Approved for provenpackager on screenie (Fedora devel)

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



From pkgdb at fedoraproject.org  Sun Jan  4 20:39:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 04 Jan 2009 20:39:10 +0000
Subject: [pkgdb] screenie (Fedora, 9) updated by kevin
Message-ID: <20090104203910.256CF208D52@bastion.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for screenie
kevin has set commit to Approved for provenpackager on screenie (Fedora 9)
kevin has set build to Approved for provenpackager on screenie (Fedora 9)
kevin has set checkout to Approved for provenpackager on screenie (Fedora 9)

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



From kevin at fedoraproject.org  Sun Jan  4 20:39:25 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun,  4 Jan 2009 20:39:25 +0000 (UTC)
Subject: rpms/screenie - New directory
Message-ID: <20090104203925.2985C7013F@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/screenie
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsFT1468/rpms/screenie

Log Message:
Directory /cvs/pkgs/rpms/screenie added to the repository




From kevin at fedoraproject.org  Sun Jan  4 20:39:25 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun,  4 Jan 2009 20:39:25 +0000 (UTC)
Subject: rpms/screenie/devel - New directory
Message-ID: <20090104203925.7B35E7013F@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/screenie/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsFT1468/rpms/screenie/devel

Log Message:
Directory /cvs/pkgs/rpms/screenie/devel added to the repository




From pkgdb at fedoraproject.org  Sun Jan  4 20:39:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 04 Jan 2009 20:39:10 +0000
Subject: [pkgdb] screenie (Fedora, 10) updated by kevin
Message-ID: <20090104203910.3537E208D57@bastion.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for screenie
kevin has set commit to Approved for provenpackager on screenie (Fedora 10)
kevin has set build to Approved for provenpackager on screenie (Fedora 10)
kevin has set checkout to Approved for provenpackager on screenie (Fedora 10)

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



From kevin at fedoraproject.org  Sun Jan  4 20:39:46 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun,  4 Jan 2009 20:39:46 +0000 (UTC)
Subject: rpms/screenie Makefile,NONE,1.1
Message-ID: <20090104203946.D662E7013F@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/screenie
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsFT1468/rpms/screenie

Added Files:
	Makefile 
Log Message:
Setup of module screenie


--- NEW FILE Makefile ---
# Top level Makefile for module screenie
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Jan  4 20:39:47 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun,  4 Jan 2009 20:39:47 +0000 (UTC)
Subject: rpms/screenie/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090104203947.42F7F7013F@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/screenie/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsFT1468/rpms/screenie/devel

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


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: screenie
# $Id: Makefile,v 1.1 2009/01/04 20:39:47 kevin Exp $
NAME := screenie
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Jan  4 20:40:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 04 Jan 2009 20:40:00 +0000
Subject: [pkgdb] hyphen-fr was added for caolanm
Message-ID: <20090104204000.46831208D53@bastion.fedora.phx.redhat.com>

kevin has added Package hyphen-fr with summary French hyphenation rules
kevin has approved Package hyphen-fr
kevin has added a Fedora devel branch for hyphen-fr with an owner of caolanm
kevin has approved hyphen-fr in Fedora devel
kevin has approved Package hyphen-fr
kevin has set commit to Approved for provenpackager on hyphen-fr (Fedora devel)
kevin has set build to Approved for provenpackager on hyphen-fr (Fedora devel)
kevin has set checkout to Approved for provenpackager on hyphen-fr (Fedora devel)

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



From kevin at fedoraproject.org  Sun Jan  4 20:40:14 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun,  4 Jan 2009 20:40:14 +0000 (UTC)
Subject: rpms/hyphen-fr - New directory
Message-ID: <20090104204014.351227013F@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/hyphen-fr
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvswJ2233/rpms/hyphen-fr

Log Message:
Directory /cvs/pkgs/rpms/hyphen-fr added to the repository




From kevin at fedoraproject.org  Sun Jan  4 20:40:14 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun,  4 Jan 2009 20:40:14 +0000 (UTC)
Subject: rpms/hyphen-fr/devel - New directory
Message-ID: <20090104204014.ADF657013F@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/hyphen-fr/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvswJ2233/rpms/hyphen-fr/devel

Log Message:
Directory /cvs/pkgs/rpms/hyphen-fr/devel added to the repository




From kevin at fedoraproject.org  Sun Jan  4 20:40:34 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun,  4 Jan 2009 20:40:34 +0000 (UTC)
Subject: rpms/hyphen-fr Makefile,NONE,1.1
Message-ID: <20090104204034.6547970140@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/hyphen-fr
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvswJ2233/rpms/hyphen-fr

Added Files:
	Makefile 
Log Message:
Setup of module hyphen-fr


--- NEW FILE Makefile ---
# Top level Makefile for module hyphen-fr
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Jan  4 20:40:34 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun,  4 Jan 2009 20:40:34 +0000 (UTC)
Subject: rpms/hyphen-fr/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090104204034.E934070140@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/hyphen-fr/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvswJ2233/rpms/hyphen-fr/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module hyphen-fr


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: hyphen-fr
# $Id: Makefile,v 1.1 2009/01/04 20:40:34 kevin Exp $
NAME := hyphen-fr
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Jan  4 20:41:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 04 Jan 2009 20:41:47 +0000
Subject: [pkgdb] gnaural was added for rakesh
Message-ID: <20090104204147.70F5520873E@bastion.fedora.phx.redhat.com>

kevin has added Package gnaural with summary A multi-platform programmable binaural-beat generator
kevin has approved Package gnaural
kevin has added a Fedora devel branch for gnaural with an owner of rakesh
kevin has approved gnaural in Fedora devel
kevin has approved Package gnaural
kevin has set commit to Approved for provenpackager on gnaural (Fedora devel)
kevin has set build to Approved for provenpackager on gnaural (Fedora devel)
kevin has set checkout to Approved for provenpackager on gnaural (Fedora devel)

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



From pkgdb at fedoraproject.org  Sun Jan  4 20:41:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 04 Jan 2009 20:41:49 +0000
Subject: [pkgdb] gnaural (Fedora, 9) updated by kevin
Message-ID: <20090104204149.DD227208D51@bastion.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for gnaural
kevin has set commit to Approved for provenpackager on gnaural (Fedora 9)
kevin has set build to Approved for provenpackager on gnaural (Fedora 9)
kevin has set checkout to Approved for provenpackager on gnaural (Fedora 9)

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



From pkgdb at fedoraproject.org  Sun Jan  4 20:41:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 04 Jan 2009 20:41:49 +0000
Subject: [pkgdb] gnaural (Fedora, 10) updated by kevin
Message-ID: <20090104204150.02737208D55@bastion.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for gnaural
kevin has set commit to Approved for provenpackager on gnaural (Fedora 10)
kevin has set build to Approved for provenpackager on gnaural (Fedora 10)
kevin has set checkout to Approved for provenpackager on gnaural (Fedora 10)

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



From kevin at fedoraproject.org  Sun Jan  4 20:42:25 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun,  4 Jan 2009 20:42:25 +0000 (UTC)
Subject: rpms/gnaural - New directory
Message-ID: <20090104204225.4088070140@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/gnaural
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsgL3957/rpms/gnaural

Log Message:
Directory /cvs/pkgs/rpms/gnaural added to the repository




From kevin at fedoraproject.org  Sun Jan  4 20:42:25 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun,  4 Jan 2009 20:42:25 +0000 (UTC)
Subject: rpms/gnaural/devel - New directory
Message-ID: <20090104204225.B282F70140@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/gnaural/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsgL3957/rpms/gnaural/devel

Log Message:
Directory /cvs/pkgs/rpms/gnaural/devel added to the repository




From kevin at fedoraproject.org  Sun Jan  4 20:42:49 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun,  4 Jan 2009 20:42:49 +0000 (UTC)
Subject: rpms/gnaural Makefile,NONE,1.1
Message-ID: <20090104204249.D906B70130@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/gnaural
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsgL3957/rpms/gnaural

Added Files:
	Makefile 
Log Message:
Setup of module gnaural


--- NEW FILE Makefile ---
# Top level Makefile for module gnaural
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Jan  4 20:42:50 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun,  4 Jan 2009 20:42:50 +0000 (UTC)
Subject: rpms/gnaural/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <20090104204250.82F9770130@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/gnaural/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsgL3957/rpms/gnaural/devel

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


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: gnaural
# $Id: Makefile,v 1.1 2009/01/04 20:42:50 kevin Exp $
NAME := gnaural
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Jan  4 20:45:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 04 Jan 2009 20:45:01 +0000
Subject: [pkgdb] javassist was added for red
Message-ID: <20090104204501.8284720873E@bastion.fedora.phx.redhat.com>

kevin has added Package javassist with summary The Java Programming Assistant provides simple Java bytecode manipulation
kevin has approved Package javassist
kevin has added a Fedora devel branch for javassist with an owner of red
kevin has approved javassist in Fedora devel
kevin has approved Package javassist
kevin has set commit to Approved for provenpackager on javassist (Fedora devel)
kevin has set build to Approved for provenpackager on javassist (Fedora devel)
kevin has set checkout to Approved for provenpackager on javassist (Fedora devel)

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



From pkgdb at fedoraproject.org  Sun Jan  4 20:45:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 04 Jan 2009 20:45:02 +0000
Subject: [pkgdb] javassist (Fedora, 9) updated by kevin
Message-ID: <20090104204502.E82CA208D51@bastion.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for javassist
kevin has set commit to Approved for provenpackager on javassist (Fedora 9)
kevin has set build to Approved for provenpackager on javassist (Fedora 9)
kevin has set checkout to Approved for provenpackager on javassist (Fedora 9)

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



From kevin at fedoraproject.org  Sun Jan  4 20:45:19 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun,  4 Jan 2009 20:45:19 +0000 (UTC)
Subject: rpms/javassist - New directory
Message-ID: <20090104204519.4E58E70130@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/javassist
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsBX4991/rpms/javassist

Log Message:
Directory /cvs/pkgs/rpms/javassist added to the repository




From kevin at fedoraproject.org  Sun Jan  4 20:45:19 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun,  4 Jan 2009 20:45:19 +0000 (UTC)
Subject: rpms/javassist/devel - New directory
Message-ID: <20090104204519.9F79970130@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/javassist/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsBX4991/rpms/javassist/devel

Log Message:
Directory /cvs/pkgs/rpms/javassist/devel added to the repository




From pkgdb at fedoraproject.org  Sun Jan  4 20:45:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 04 Jan 2009 20:45:02 +0000
Subject: [pkgdb] javassist (Fedora, 10) updated by kevin
Message-ID: <20090104204503.0082B208D55@bastion.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for javassist
kevin has set commit to Approved for provenpackager on javassist (Fedora 10)
kevin has set build to Approved for provenpackager on javassist (Fedora 10)
kevin has set checkout to Approved for provenpackager on javassist (Fedora 10)

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



From kevin at fedoraproject.org  Sun Jan  4 20:45:42 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun,  4 Jan 2009 20:45:42 +0000 (UTC)
Subject: rpms/javassist Makefile,NONE,1.1
Message-ID: <20090104204542.2602270130@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/javassist
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsBX4991/rpms/javassist

Added Files:
	Makefile 
Log Message:
Setup of module javassist


--- NEW FILE Makefile ---
# Top level Makefile for module javassist
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Jan  4 20:45:42 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun,  4 Jan 2009 20:45:42 +0000 (UTC)
Subject: rpms/javassist/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090104204542.EBA3270130@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/javassist/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsBX4991/rpms/javassist/devel

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


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: javassist
# $Id: Makefile,v 1.1 2009/01/04 20:45:42 kevin Exp $
NAME := javassist
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Jan  4 20:47:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 04 Jan 2009 20:47:16 +0000
Subject: [pkgdb] pnglite was added for lkundrak
Message-ID: <20090104204716.59C3820873C@bastion.fedora.phx.redhat.com>

kevin has added Package pnglite with summary A lightweight C library for loading PNG images
kevin has approved Package pnglite
kevin has added a Fedora devel branch for pnglite with an owner of lkundrak
kevin has approved pnglite in Fedora devel
kevin has approved Package pnglite
kevin has set commit to Approved for provenpackager on pnglite (Fedora devel)
kevin has set build to Approved for provenpackager on pnglite (Fedora devel)
kevin has set checkout to Approved for provenpackager on pnglite (Fedora devel)

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



From pkgdb at fedoraproject.org  Sun Jan  4 20:47:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 04 Jan 2009 20:47:18 +0000
Subject: [pkgdb] pnglite (Fedora EPEL, 5) updated by kevin
Message-ID: <20090104204718.E30CF208D52@bastion.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for pnglite
kevin has set commit to Approved for provenpackager on pnglite (Fedora EPEL 5)
kevin has set build to Approved for provenpackager on pnglite (Fedora EPEL 5)
kevin has set checkout to Approved for provenpackager on pnglite (Fedora EPEL 5)
kevin approved watchbugzilla on pnglite (Fedora EPEL 5) for cassmodiah
kevin approved watchcommits on pnglite (Fedora EPEL 5) for cassmodiah
kevin approved commit on pnglite (Fedora EPEL 5) for cassmodiah
kevin approved build on pnglite (Fedora EPEL 5) for cassmodiah
kevin approved approveacls on pnglite (Fedora EPEL 5) for cassmodiah

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



From pkgdb at fedoraproject.org  Sun Jan  4 20:47:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 04 Jan 2009 20:47:18 +0000
Subject: [pkgdb] pnglite (Fedora, 9) updated by kevin
Message-ID: <20090104204718.F0FF8208D58@bastion.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for pnglite
kevin has set commit to Approved for provenpackager on pnglite (Fedora 9)
kevin has set build to Approved for provenpackager on pnglite (Fedora 9)
kevin has set checkout to Approved for provenpackager on pnglite (Fedora 9)
kevin approved watchbugzilla on pnglite (Fedora 9) for cassmodiah
kevin approved watchcommits on pnglite (Fedora 9) for cassmodiah
kevin approved commit on pnglite (Fedora 9) for cassmodiah
kevin approved build on pnglite (Fedora 9) for cassmodiah
kevin approved approveacls on pnglite (Fedora 9) for cassmodiah

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



From pkgdb at fedoraproject.org  Sun Jan  4 20:47:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 04 Jan 2009 20:47:18 +0000
Subject: [pkgdb] pnglite (Fedora, 10) updated by kevin
Message-ID: <20090104204719.60AE1208D60@bastion.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for pnglite
kevin has set commit to Approved for provenpackager on pnglite (Fedora 10)
kevin has set build to Approved for provenpackager on pnglite (Fedora 10)
kevin has set checkout to Approved for provenpackager on pnglite (Fedora 10)
kevin approved watchbugzilla on pnglite (Fedora 10) for cassmodiah
kevin approved watchcommits on pnglite (Fedora 10) for cassmodiah
kevin approved commit on pnglite (Fedora 10) for cassmodiah
kevin approved build on pnglite (Fedora 10) for cassmodiah
kevin approved approveacls on pnglite (Fedora 10) for cassmodiah

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



From kevin at fedoraproject.org  Sun Jan  4 20:47:33 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun,  4 Jan 2009 20:47:33 +0000 (UTC)
Subject: rpms/pnglite - New directory
Message-ID: <20090104204733.25FA170130@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/pnglite
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsux5754/rpms/pnglite

Log Message:
Directory /cvs/pkgs/rpms/pnglite added to the repository




From kevin at fedoraproject.org  Sun Jan  4 20:47:33 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun,  4 Jan 2009 20:47:33 +0000 (UTC)
Subject: rpms/pnglite/devel - New directory
Message-ID: <20090104204733.6C33470130@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/pnglite/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsux5754/rpms/pnglite/devel

Log Message:
Directory /cvs/pkgs/rpms/pnglite/devel added to the repository




From pkgdb at fedoraproject.org  Sun Jan  4 20:47:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 04 Jan 2009 20:47:18 +0000
Subject: [pkgdb] pnglite (Fedora, devel) updated by kevin
Message-ID: <20090104204719.91982208D7D@bastion.fedora.phx.redhat.com>

kevin approved watchbugzilla on pnglite (Fedora devel) for cassmodiah
kevin approved watchcommits on pnglite (Fedora devel) for cassmodiah
kevin approved commit on pnglite (Fedora devel) for cassmodiah
kevin approved build on pnglite (Fedora devel) for cassmodiah
kevin approved approveacls on pnglite (Fedora devel) for cassmodiah

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



From kevin at fedoraproject.org  Sun Jan  4 20:47:53 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun,  4 Jan 2009 20:47:53 +0000 (UTC)
Subject: rpms/pnglite Makefile,NONE,1.1
Message-ID: <20090104204753.F062A70130@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/pnglite
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsux5754/rpms/pnglite

Added Files:
	Makefile 
Log Message:
Setup of module pnglite


--- NEW FILE Makefile ---
# Top level Makefile for module pnglite
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Jan  4 20:47:54 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun,  4 Jan 2009 20:47:54 +0000 (UTC)
Subject: rpms/pnglite/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <20090104204754.D0D1970130@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/pnglite/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsux5754/rpms/pnglite/devel

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


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: pnglite
# $Id: Makefile,v 1.1 2009/01/04 20:47:54 kevin Exp $
NAME := pnglite
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Jan  4 20:48:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 04 Jan 2009 20:48:20 +0000
Subject: [pkgdb] xqilla (Fedora EPEL, 5) updated by kevin
Message-ID: <20090104204820.A2726208D52@bastion.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for xqilla
kevin has set commit to Approved for provenpackager on xqilla (Fedora EPEL 5)
kevin has set build to Approved for provenpackager on xqilla (Fedora EPEL 5)
kevin has set checkout to Approved for provenpackager on xqilla (Fedora EPEL 5)

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



From rakesh at fedoraproject.org  Sun Jan  4 21:02:13 2009
From: rakesh at fedoraproject.org (Rakesh Pandit)
Date: Sun,  4 Jan 2009 21:02:13 +0000 (UTC)
Subject: rpms/gnaural/devel gnaural.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090104210213.586BF70130@cvs1.fedora.phx.redhat.com>

Author: rakesh

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

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



--- NEW FILE gnaural.spec ---
Name:           gnaural
Version:        1.0.20080808
Release:        5%{?dist}
Summary:        A multi-platform programmable binaural-beat generator

Group:          Applications/Multimedia
License:        GPLv2+
URL:            http://gnaural.sourceforge.net/
Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  gtk2-devel, libglade2-devel, libsndfile-devel
BuildRequires:  portaudio-devel
BuildRequires:  desktop-file-utils
Requires:       hicolor-icon-theme

%description
Gnaural is a multi-platform programmable binaural-beat generator. It
is actually brainwave entrainment software for creating binaural beats
intended to be used as personal brainwave synchronization software,
for scientific research, or by professionals. Gnaural allows for the
creation of binaural beat tracks specifying different frequencies and
exporting tracks into different audio formats. Gnaural runnings can
also be linked over the internet, allowing synchronous sessions
between many users.

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


%build
%configure
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install INSTALL="install -p" DESTDIR=$RPM_BUILD_ROOT

install -p -dm 755 $RPM_BUILD_ROOT/%{_datadir}/pixmaps
install -p -dm 755 $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/48x48/apps

install -p -m 644 pixmaps/%{name}-icon.xpm \
 $RPM_BUILD_ROOT/%{_datadir}/pixmaps
install -p -m 644 pixmaps/%{name}-icon.png \
 $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/48x48/apps

install -p -dm 755 $RPM_BUILD_ROOT/%{_datadir}/applications

sed -i -e 's|^Categories=.*$|Categories=AudioVideo;AudioVideoEditing;|g' \
 -e 's|^Encoding=UTF-8$||g' \
 -e 's|^GenericName=Audio binaural beat editor/generator$||g' \
 -e 's|^Icon=.*$|Icon=%{name}-icon|g' \
 $RPM_BUILD_ROOT/%{_datadir}/gnome/apps/Multimedia/%{name}.desktop

desktop-file-install \
--dir=${RPM_BUILD_ROOT}%{_datadir}/applications \
$RPM_BUILD_ROOT%{_datadir}/gnome/apps/Multimedia/%{name}.desktop

rm -r $RPM_BUILD_ROOT%{_datadir}/gnome


%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 AUTHORS COPYING ChangeLog NEWS README
%{_bindir}/%{name}
%dir %{_datadir}/%{name}
%{_datadir}/%{name}/%{name}.glade
%dir %{_datadir}/%{name}/pixmaps
%{_datadir}/%{name}/pixmaps/%{name}-icon.*
%{_datadir}/applications/%{name}.desktop
%{_datadir}/pixmaps/%{name}-icon.xpm
%{_datadir}/icons/hicolor/48x48/apps/%{name}-icon.png


%changelog
* Mon Jan 05 2009 Rakesh Pandit <rakesh at fedoraproject.org> 1.0.20080808-5
- Removed "Application" from .desktop Categories.

* Sun Jan 04 2009 Rakesh Pandit <rakesh at fedoraproject.org> 1.0.20080808-4
- Fixed missing -p for install command.

* Sun Jan 04 2009 Rakesh Pandit <rakesh at fedoraproject.org> 1.0.20080808-3
- Removed fedora as vendor - as per new guidelines.

* Sun Jan 04 2009 Rakesh Pandit <rakesh at fedoraproject.org> 1.0.20080808-2
- Fixed %%version, %%description, timestamp, fixed icon path,
- Removed useless buildrequires, fixed .desktop file installation.

* Sat Dec 06 2008 Rakesh Pandit <rakesh at fedoraproject.org> 1.0-1.20080808
- Initial build.


--- NEW FILE import.log ---
gnaural-1_0_20080808-5_fc10:HEAD:gnaural-1.0.20080808-5.fc10.src.rpm:1231059719


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnaural/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	4 Jan 2009 20:42:50 -0000	1.1
+++ .cvsignore	4 Jan 2009 21:01:42 -0000	1.2
@@ -0,0 +1 @@
+gnaural-1.0.20080808.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnaural/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	4 Jan 2009 20:42:50 -0000	1.1
+++ sources	4 Jan 2009 21:01:43 -0000	1.2
@@ -0,0 +1 @@
+66d6f8e17207c5ce8d8c4f3cabe8598a  gnaural-1.0.20080808.tar.gz



From rakesh at fedoraproject.org  Sun Jan  4 21:03:59 2009
From: rakesh at fedoraproject.org (Rakesh Pandit)
Date: Sun,  4 Jan 2009 21:03:59 +0000 (UTC)
Subject: rpms/gnaural/F-10 gnaural.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090104210359.99A8770130@cvs1.fedora.phx.redhat.com>

Author: rakesh

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

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



--- NEW FILE gnaural.spec ---
Name:           gnaural
Version:        1.0.20080808
Release:        5%{?dist}
Summary:        A multi-platform programmable binaural-beat generator

Group:          Applications/Multimedia
License:        GPLv2+
URL:            http://gnaural.sourceforge.net/
Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  gtk2-devel, libglade2-devel, libsndfile-devel
BuildRequires:  portaudio-devel
BuildRequires:  desktop-file-utils
Requires:       hicolor-icon-theme

%description
Gnaural is a multi-platform programmable binaural-beat generator. It
is actually brainwave entrainment software for creating binaural beats
intended to be used as personal brainwave synchronization software,
for scientific research, or by professionals. Gnaural allows for the
creation of binaural beat tracks specifying different frequencies and
exporting tracks into different audio formats. Gnaural runnings can
also be linked over the internet, allowing synchronous sessions
between many users.

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


%build
%configure
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install INSTALL="install -p" DESTDIR=$RPM_BUILD_ROOT

install -p -dm 755 $RPM_BUILD_ROOT/%{_datadir}/pixmaps
install -p -dm 755 $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/48x48/apps

install -p -m 644 pixmaps/%{name}-icon.xpm \
 $RPM_BUILD_ROOT/%{_datadir}/pixmaps
install -p -m 644 pixmaps/%{name}-icon.png \
 $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/48x48/apps

install -p -dm 755 $RPM_BUILD_ROOT/%{_datadir}/applications

sed -i -e 's|^Categories=.*$|Categories=AudioVideo;AudioVideoEditing;|g' \
 -e 's|^Encoding=UTF-8$||g' \
 -e 's|^GenericName=Audio binaural beat editor/generator$||g' \
 -e 's|^Icon=.*$|Icon=%{name}-icon|g' \
 $RPM_BUILD_ROOT/%{_datadir}/gnome/apps/Multimedia/%{name}.desktop

desktop-file-install \
--dir=${RPM_BUILD_ROOT}%{_datadir}/applications \
$RPM_BUILD_ROOT%{_datadir}/gnome/apps/Multimedia/%{name}.desktop

rm -r $RPM_BUILD_ROOT%{_datadir}/gnome


%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 AUTHORS COPYING ChangeLog NEWS README
%{_bindir}/%{name}
%dir %{_datadir}/%{name}
%{_datadir}/%{name}/%{name}.glade
%dir %{_datadir}/%{name}/pixmaps
%{_datadir}/%{name}/pixmaps/%{name}-icon.*
%{_datadir}/applications/%{name}.desktop
%{_datadir}/pixmaps/%{name}-icon.xpm
%{_datadir}/icons/hicolor/48x48/apps/%{name}-icon.png


%changelog
* Mon Jan 05 2009 Rakesh Pandit <rakesh at fedoraproject.org> 1.0.20080808-5
- Removed "Application" from .desktop Categories.

* Sun Jan 04 2009 Rakesh Pandit <rakesh at fedoraproject.org> 1.0.20080808-4
- Fixed missing -p for install command.

* Sun Jan 04 2009 Rakesh Pandit <rakesh at fedoraproject.org> 1.0.20080808-3
- Removed fedora as vendor - as per new guidelines.

* Sun Jan 04 2009 Rakesh Pandit <rakesh at fedoraproject.org> 1.0.20080808-2
- Fixed %%version, %%description, timestamp, fixed icon path,
- Removed useless buildrequires, fixed .desktop file installation.

* Sat Dec 06 2008 Rakesh Pandit <rakesh at fedoraproject.org> 1.0-1.20080808
- Initial build.


--- NEW FILE import.log ---
gnaural-1_0_20080808-5_fc10:F-10:gnaural-1.0.20080808-5.fc10.src.rpm:1231059828


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnaural/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	4 Jan 2009 20:42:50 -0000	1.1
+++ .cvsignore	4 Jan 2009 21:03:28 -0000	1.2
@@ -0,0 +1 @@
+gnaural-1.0.20080808.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnaural/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	4 Jan 2009 20:42:50 -0000	1.1
+++ sources	4 Jan 2009 21:03:29 -0000	1.2
@@ -0,0 +1 @@
+66d6f8e17207c5ce8d8c4f3cabe8598a  gnaural-1.0.20080808.tar.gz



From janderson at fedoraproject.org  Sun Jan  4 21:04:26 2009
From: janderson at fedoraproject.org (John Anderson)
Date: Sun,  4 Jan 2009 21:04:26 +0000 (UTC)
Subject: rpms/mumbles/devel import.log, NONE, 1.1 mumbles-sitedir.patch, NONE,
	1.1 mumbles.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090104210426.7FF8A70130@cvs1.fedora.phx.redhat.com>

Author: janderson

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

Modified Files:
	.cvsignore sources 
Added Files:
	import.log mumbles-sitedir.patch mumbles.spec 
Log Message:
Initial Import



--- NEW FILE import.log ---
mumbles-0_4-7_fc10:HEAD:mumbles-0.4-7.fc10.src.rpm:1231102993

mumbles-sitedir.patch:

--- NEW FILE mumbles-sitedir.patch ---
diff -uNr mumbles-0.4-orig/bin/mumbles mumbles-0.4/bin/mumbles
--- mumbles-0.4-orig/bin/mumbles	2007-08-26 17:30:20.000000000 -0500
+++ mumbles-0.4/bin/mumbles	2008-11-18 09:01:36.000000000 -0600
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python
 #
 # THIS FILE IS PART OF THE MUMBLES PROJECT AND IS LICENSED UNDER THE GPL.
 # SEE THE 'COPYING' FILE FOR DETAILS
@@ -8,7 +8,9 @@
 #------------------------------------------------------------------------
 import os, sys
 
-sys.path.append("/usr/share/python-support/mumbles/src/")
+from distutils.sysconfig import get_python_lib
+syspath = get_python_lib(1)+"/mumbles"
+sys.path.append(syspath)
 os.environ.setdefault("MUMBLES_PATH", "/usr/share/mumbles/")
 
 from MumblesGlobals import *
diff -uNr mumbles-0.4-orig/bin/mumbles-send mumbles-0.4/bin/mumbles-send
--- mumbles-0.4-orig/bin/mumbles-send	2007-08-28 22:17:51.000000000 -0500
+++ mumbles-0.4/bin/mumbles-send	2008-11-18 09:01:45.000000000 -0600
@@ -22,7 +22,10 @@
 from socket import AF_INET, SOCK_DGRAM, socket
 from getpass import getpass
 
-sys.path.append("/usr/share/python-support/mumbles/src/")
+from distutils.sysconfig import get_python_lib
+syspath = get_python_lib(1)+"/mumbles"
+sys.path.append(syspath)
+print "syspath: %s" % (syspath)
 os.environ.setdefault("MUMBLES_PATH", "/usr/share/mumbles/")
 
 from MumblesGlobals import *
diff -uNr mumbles-0.4-orig/setup.py mumbles-0.4/setup.py
--- mumbles-0.4-orig/setup.py	2007-08-29 20:42:56.000000000 -0500
+++ mumbles-0.4/setup.py	2008-11-16 10:07:07.000000000 -0600
@@ -17,7 +17,8 @@
 	license='GNU GPL',
 	platforms='linux',
 	scripts=['bin/mumbles', 'bin/mumbles-send'],
-	packages=['src'],
+	package_dir={'mumbles': 'src'},
+	packages=['mumbles'],
 	data_files=[
 		('share/icons/hicolor/22x22/apps', ['src/ui/mumbles.png']),
 		('share/icons/hicolor/scalable/apps', ['src/ui/mumbles.svg']),


--- NEW FILE mumbles.spec ---
%{!?python_version: %define python_version %(%{__python} -c "from distutils.sysconfig import get_python_version; print get_python_version()")}
%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

Name:		mumbles
Version:	0.4
Release:	7%{?dist}
Summary:	A plugin driven DBus based notification system for the Gnome desktop

Group:		User Interface/Desktops
License:	GPLv2
URL:		http://www.mumbles-project.org
Source0:	http://downloads.sourceforge.net/mumbles/mumbles_%{version}-1.tar.gz
#		The default setup.py uses src as the python package name and doesn't
#		have the correct search path. Submitted upstream id #2307852
Patch0:		mumbles-sitedir.patch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	python
BuildRequires:	python-setuptools-devel
BuildRequires:	desktop-file-utils

BuildArch:	noarch

Requires:	pygtk2 dbus dbus-python pycairo pygtk2-libglade

%description
Mumbles is a plugin driven, DBus based notification system written for the
Gnome desktop. Similar to libnotify notifications and Growl for OSX, mumbles
aims to provide a modern notification system for the GNU/Linux Desktop.

%prep
%setup -q -n mumbles-%{version}
%patch0 -p1 -b .sitedir

# small fix to avoid warning from desktop-file-install
sed -i 's!mumbles.png!mumbles!' bin/mumbles.desktop

%build
CFLAGS="%{optflags}" %{__python} setup.py build

%install
rm -rf %{buildroot}
%{__python} setup.py install -O1 --skip-build --root %{buildroot}

desktop-file-install	\
	--dir %{buildroot}%{_datadir}/applications	\
	--copy-name-to-generic-name			\
	--delete-original				\
	--remove-category=Application			\
	%{buildroot}%{_datadir}/applications/%{name}.desktop

desktop-file-install \
	--dir %{buildroot}%{_sysconfdir}/xdg/autostart \
	--copy-name-to-generic-name   \
	--remove-category=Application   \
	--add-category="GNOME;GTK;TrayIcon;"  \
	--add-only-show-in="GNOME;XFCE;"  \
	%{buildroot}%{_datadir}/applications/%{name}.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 COPYING AUTHORS README
%{_bindir}/%{name}
%{_bindir}/mumbles-send
%{python_sitelib}/%{name}-%{version}-py%{python_version}.egg-info
%{python_sitelib}/%{name}/
%{_datadir}/%{name}/
%{_datadir}/applications/%{name}.desktop
%{_datadir}/icons/hicolor/*/apps/%{name}.png
%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg
%{_datadir}/pixmaps/%{name}.png
%{_sysconfdir}/xdg/autostart/%{name}.desktop


%changelog
* Sat Jan  3 2009 John Anderson <john.e.anderson at gmail.com> - 0.4-7
- Added desktop-file-install back

* Sat Jan  3 2009 John Anderson <john.e.anderson at gmail.com> - 0.4-6
- Fixes from review comments #12-15
- Corrected source0 timestamp
- Changed group to User Interface/Desktops
- Removed unneeded update-desktop-database
- desktop-file-install cleanup

* Tue Dec 23 2008 John Anderson <john.e.anderson at gmail.com> - 0.4-5
- Added python version to files section for python 2.6 compatibility
- Added fix for desktop file per comment #10

* Sun Dec 21 2008 John Anderson <john.e.anderson at gmail.com> - 0.4-4
- Modified patch line per review comment #8

* Thu Nov 20 2008 John Anderson <john.e.anderson at gmail.com> - 0.4-3
- Fixed buildroot macro per comment #5

* Wed Nov 19 2008 John Anderson <john.e.anderson at gmail.com> - 0.4-2
- Changes from review comments #1 and #2
- macro cleanup
- fixed BuildRequires

* Fri Nov 14 2008 John Anderson <john.e.anderson at gmail.com> - 0.4-1
- Initial build


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mumbles/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	4 Jan 2009 20:19:30 -0000	1.1
+++ .cvsignore	4 Jan 2009 21:03:55 -0000	1.2
@@ -0,0 +1 @@
+mumbles_0.4-1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mumbles/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	4 Jan 2009 20:19:30 -0000	1.1
+++ sources	4 Jan 2009 21:03:56 -0000	1.2
@@ -0,0 +1 @@
+a6b24223dc23e5022332586ffc454e84  mumbles_0.4-1.tar.gz



From rakesh at fedoraproject.org  Sun Jan  4 21:05:51 2009
From: rakesh at fedoraproject.org (Rakesh Pandit)
Date: Sun,  4 Jan 2009 21:05:51 +0000 (UTC)
Subject: rpms/gnaural/F-9 gnaural.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090104210551.27DE170130@cvs1.fedora.phx.redhat.com>

Author: rakesh

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

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



--- NEW FILE gnaural.spec ---
Name:           gnaural
Version:        1.0.20080808
Release:        5%{?dist}
Summary:        A multi-platform programmable binaural-beat generator

Group:          Applications/Multimedia
License:        GPLv2+
URL:            http://gnaural.sourceforge.net/
Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  gtk2-devel, libglade2-devel, libsndfile-devel
BuildRequires:  portaudio-devel
BuildRequires:  desktop-file-utils
Requires:       hicolor-icon-theme

%description
Gnaural is a multi-platform programmable binaural-beat generator. It
is actually brainwave entrainment software for creating binaural beats
intended to be used as personal brainwave synchronization software,
for scientific research, or by professionals. Gnaural allows for the
creation of binaural beat tracks specifying different frequencies and
exporting tracks into different audio formats. Gnaural runnings can
also be linked over the internet, allowing synchronous sessions
between many users.

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


%build
%configure
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install INSTALL="install -p" DESTDIR=$RPM_BUILD_ROOT

install -p -dm 755 $RPM_BUILD_ROOT/%{_datadir}/pixmaps
install -p -dm 755 $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/48x48/apps

install -p -m 644 pixmaps/%{name}-icon.xpm \
 $RPM_BUILD_ROOT/%{_datadir}/pixmaps
install -p -m 644 pixmaps/%{name}-icon.png \
 $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/48x48/apps

install -p -dm 755 $RPM_BUILD_ROOT/%{_datadir}/applications

sed -i -e 's|^Categories=.*$|Categories=AudioVideo;AudioVideoEditing;|g' \
 -e 's|^Encoding=UTF-8$||g' \
 -e 's|^GenericName=Audio binaural beat editor/generator$||g' \
 -e 's|^Icon=.*$|Icon=%{name}-icon|g' \
 $RPM_BUILD_ROOT/%{_datadir}/gnome/apps/Multimedia/%{name}.desktop

desktop-file-install \
--dir=${RPM_BUILD_ROOT}%{_datadir}/applications \
$RPM_BUILD_ROOT%{_datadir}/gnome/apps/Multimedia/%{name}.desktop

rm -r $RPM_BUILD_ROOT%{_datadir}/gnome


%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 AUTHORS COPYING ChangeLog NEWS README
%{_bindir}/%{name}
%dir %{_datadir}/%{name}
%{_datadir}/%{name}/%{name}.glade
%dir %{_datadir}/%{name}/pixmaps
%{_datadir}/%{name}/pixmaps/%{name}-icon.*
%{_datadir}/applications/%{name}.desktop
%{_datadir}/pixmaps/%{name}-icon.xpm
%{_datadir}/icons/hicolor/48x48/apps/%{name}-icon.png


%changelog
* Mon Jan 05 2009 Rakesh Pandit <rakesh at fedoraproject.org> 1.0.20080808-5
- Removed "Application" from .desktop Categories.

* Sun Jan 04 2009 Rakesh Pandit <rakesh at fedoraproject.org> 1.0.20080808-4
- Fixed missing -p for install command.

* Sun Jan 04 2009 Rakesh Pandit <rakesh at fedoraproject.org> 1.0.20080808-3
- Removed fedora as vendor - as per new guidelines.

* Sun Jan 04 2009 Rakesh Pandit <rakesh at fedoraproject.org> 1.0.20080808-2
- Fixed %%version, %%description, timestamp, fixed icon path,
- Removed useless buildrequires, fixed .desktop file installation.

* Sat Dec 06 2008 Rakesh Pandit <rakesh at fedoraproject.org> 1.0-1.20080808
- Initial build.


--- NEW FILE import.log ---
gnaural-1_0_20080808-5_fc10:F-9:gnaural-1.0.20080808-5.fc10.src.rpm:1231059935


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnaural/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	4 Jan 2009 20:42:50 -0000	1.1
+++ .cvsignore	4 Jan 2009 21:05:18 -0000	1.2
@@ -0,0 +1 @@
+gnaural-1.0.20080808.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnaural/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	4 Jan 2009 20:42:50 -0000	1.1
+++ sources	4 Jan 2009 21:05:19 -0000	1.2
@@ -0,0 +1 @@
+66d6f8e17207c5ce8d8c4f3cabe8598a  gnaural-1.0.20080808.tar.gz



From janderson at fedoraproject.org  Sun Jan  4 21:06:22 2009
From: janderson at fedoraproject.org (John Anderson)
Date: Sun,  4 Jan 2009 21:06:22 +0000 (UTC)
Subject: rpms/mumbles/F-10 import.log, NONE, 1.1 mumbles-sitedir.patch, NONE,
	1.1 mumbles.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090104210622.6891970130@cvs1.fedora.phx.redhat.com>

Author: janderson

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

Modified Files:
	.cvsignore sources 
Added Files:
	import.log mumbles-sitedir.patch mumbles.spec 
Log Message:
Initial Import F-10



--- NEW FILE import.log ---
mumbles-0_4-7_fc10:F-10:mumbles-0.4-7.fc10.src.rpm:1231103124

mumbles-sitedir.patch:

--- NEW FILE mumbles-sitedir.patch ---
diff -uNr mumbles-0.4-orig/bin/mumbles mumbles-0.4/bin/mumbles
--- mumbles-0.4-orig/bin/mumbles	2007-08-26 17:30:20.000000000 -0500
+++ mumbles-0.4/bin/mumbles	2008-11-18 09:01:36.000000000 -0600
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python
 #
 # THIS FILE IS PART OF THE MUMBLES PROJECT AND IS LICENSED UNDER THE GPL.
 # SEE THE 'COPYING' FILE FOR DETAILS
@@ -8,7 +8,9 @@
 #------------------------------------------------------------------------
 import os, sys
 
-sys.path.append("/usr/share/python-support/mumbles/src/")
+from distutils.sysconfig import get_python_lib
+syspath = get_python_lib(1)+"/mumbles"
+sys.path.append(syspath)
 os.environ.setdefault("MUMBLES_PATH", "/usr/share/mumbles/")
 
 from MumblesGlobals import *
diff -uNr mumbles-0.4-orig/bin/mumbles-send mumbles-0.4/bin/mumbles-send
--- mumbles-0.4-orig/bin/mumbles-send	2007-08-28 22:17:51.000000000 -0500
+++ mumbles-0.4/bin/mumbles-send	2008-11-18 09:01:45.000000000 -0600
@@ -22,7 +22,10 @@
 from socket import AF_INET, SOCK_DGRAM, socket
 from getpass import getpass
 
-sys.path.append("/usr/share/python-support/mumbles/src/")
+from distutils.sysconfig import get_python_lib
+syspath = get_python_lib(1)+"/mumbles"
+sys.path.append(syspath)
+print "syspath: %s" % (syspath)
 os.environ.setdefault("MUMBLES_PATH", "/usr/share/mumbles/")
 
 from MumblesGlobals import *
diff -uNr mumbles-0.4-orig/setup.py mumbles-0.4/setup.py
--- mumbles-0.4-orig/setup.py	2007-08-29 20:42:56.000000000 -0500
+++ mumbles-0.4/setup.py	2008-11-16 10:07:07.000000000 -0600
@@ -17,7 +17,8 @@
 	license='GNU GPL',
 	platforms='linux',
 	scripts=['bin/mumbles', 'bin/mumbles-send'],
-	packages=['src'],
+	package_dir={'mumbles': 'src'},
+	packages=['mumbles'],
 	data_files=[
 		('share/icons/hicolor/22x22/apps', ['src/ui/mumbles.png']),
 		('share/icons/hicolor/scalable/apps', ['src/ui/mumbles.svg']),


--- NEW FILE mumbles.spec ---
%{!?python_version: %define python_version %(%{__python} -c "from distutils.sysconfig import get_python_version; print get_python_version()")}
%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

Name:		mumbles
Version:	0.4
Release:	7%{?dist}
Summary:	A plugin driven DBus based notification system for the Gnome desktop

Group:		User Interface/Desktops
License:	GPLv2
URL:		http://www.mumbles-project.org
Source0:	http://downloads.sourceforge.net/mumbles/mumbles_%{version}-1.tar.gz
#		The default setup.py uses src as the python package name and doesn't
#		have the correct search path. Submitted upstream id #2307852
Patch0:		mumbles-sitedir.patch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	python
BuildRequires:	python-setuptools-devel
BuildRequires:	desktop-file-utils

BuildArch:	noarch

Requires:	pygtk2 dbus dbus-python pycairo pygtk2-libglade

%description
Mumbles is a plugin driven, DBus based notification system written for the
Gnome desktop. Similar to libnotify notifications and Growl for OSX, mumbles
aims to provide a modern notification system for the GNU/Linux Desktop.

%prep
%setup -q -n mumbles-%{version}
%patch0 -p1 -b .sitedir

# small fix to avoid warning from desktop-file-install
sed -i 's!mumbles.png!mumbles!' bin/mumbles.desktop

%build
CFLAGS="%{optflags}" %{__python} setup.py build

%install
rm -rf %{buildroot}
%{__python} setup.py install -O1 --skip-build --root %{buildroot}

desktop-file-install	\
	--dir %{buildroot}%{_datadir}/applications	\
	--copy-name-to-generic-name			\
	--delete-original				\
	--remove-category=Application			\
	%{buildroot}%{_datadir}/applications/%{name}.desktop

desktop-file-install \
	--dir %{buildroot}%{_sysconfdir}/xdg/autostart \
	--copy-name-to-generic-name   \
	--remove-category=Application   \
	--add-category="GNOME;GTK;TrayIcon;"  \
	--add-only-show-in="GNOME;XFCE;"  \
	%{buildroot}%{_datadir}/applications/%{name}.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 COPYING AUTHORS README
%{_bindir}/%{name}
%{_bindir}/mumbles-send
%{python_sitelib}/%{name}-%{version}-py%{python_version}.egg-info
%{python_sitelib}/%{name}/
%{_datadir}/%{name}/
%{_datadir}/applications/%{name}.desktop
%{_datadir}/icons/hicolor/*/apps/%{name}.png
%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg
%{_datadir}/pixmaps/%{name}.png
%{_sysconfdir}/xdg/autostart/%{name}.desktop


%changelog
* Sat Jan  3 2009 John Anderson <john.e.anderson at gmail.com> - 0.4-7
- Added desktop-file-install back

* Sat Jan  3 2009 John Anderson <john.e.anderson at gmail.com> - 0.4-6
- Fixes from review comments #12-15
- Corrected source0 timestamp
- Changed group to User Interface/Desktops
- Removed unneeded update-desktop-database
- desktop-file-install cleanup

* Tue Dec 23 2008 John Anderson <john.e.anderson at gmail.com> - 0.4-5
- Added python version to files section for python 2.6 compatibility
- Added fix for desktop file per comment #10

* Sun Dec 21 2008 John Anderson <john.e.anderson at gmail.com> - 0.4-4
- Modified patch line per review comment #8

* Thu Nov 20 2008 John Anderson <john.e.anderson at gmail.com> - 0.4-3
- Fixed buildroot macro per comment #5

* Wed Nov 19 2008 John Anderson <john.e.anderson at gmail.com> - 0.4-2
- Changes from review comments #1 and #2
- macro cleanup
- fixed BuildRequires

* Fri Nov 14 2008 John Anderson <john.e.anderson at gmail.com> - 0.4-1
- Initial build


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mumbles/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	4 Jan 2009 20:19:30 -0000	1.1
+++ .cvsignore	4 Jan 2009 21:05:49 -0000	1.2
@@ -0,0 +1 @@
+mumbles_0.4-1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mumbles/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	4 Jan 2009 20:19:30 -0000	1.1
+++ sources	4 Jan 2009 21:05:52 -0000	1.2
@@ -0,0 +1 @@
+a6b24223dc23e5022332586ffc454e84  mumbles_0.4-1.tar.gz



From janderson at fedoraproject.org  Sun Jan  4 21:10:35 2009
From: janderson at fedoraproject.org (John Anderson)
Date: Sun,  4 Jan 2009 21:10:35 +0000 (UTC)
Subject: rpms/mumbles/F-10 mumbles.spec,1.1,1.2
Message-ID: <20090104211035.E743570130@cvs1.fedora.phx.redhat.com>

Author: janderson

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

Modified Files:
	mumbles.spec 
Log Message:
Updating spec per comment #20



Index: mumbles.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mumbles/F-10/mumbles.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mumbles.spec	4 Jan 2009 21:05:52 -0000	1.1
+++ mumbles.spec	4 Jan 2009 21:10:05 -0000	1.2
@@ -47,6 +47,7 @@
 	--copy-name-to-generic-name			\
 	--delete-original				\
 	--remove-category=Application			\
+	--add-category="GNOME;GTK;"			\
 	%{buildroot}%{_datadir}/applications/%{name}.desktop
 
 desktop-file-install \



From rdieter at fedoraproject.org  Sun Jan  4 21:10:53 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sun,  4 Jan 2009 21:10:53 +0000 (UTC)
Subject: rpms/cmake/devel cmake.spec,1.48,1.49 macros.cmake,1.3,1.4
Message-ID: <20090104211053.5FE5570130@cvs1.fedora.phx.redhat.com>

Author: rdieter

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

Modified Files:
	cmake.spec macros.cmake 
Log Message:
* Sun Jan 04 2008 Rex Dieter <rdieter at fedoraproject.org> - 2.6.3-0.2.rc5
- macros.cmake: add -DCMAKE_SKIP_RPATH:BOOL=ON
- fix Release tag



Index: cmake.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cmake/devel/cmake.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- cmake.spec	10 Dec 2008 21:42:46 -0000	1.48
+++ cmake.spec	4 Jan 2009 21:10:22 -0000	1.49
@@ -8,7 +8,7 @@
 
 Name:           cmake
 Version:        2.6.3
-Release:        0.rc5.1%{?dist}
+Release:        0.2.rc5%{?dist}
 Summary:        Cross-platform make system
 
 Group:          Development/Tools
@@ -125,6 +125,10 @@
 
 
 %changelog
+* Sun Jan 04 2008 Rex Dieter <rdieter at fedoraproject.org> - 2.6.3-0.2.rc5
+- macros.cmake: add -DCMAKE_SKIP_RPATH:BOOL=ON
+- fix Release tag
+
 * Wed Dec 10 2008 Orion Poplawski <orion at cora.nwra.com> - 2.6.3-0.rc5.1
 - Update to 2.6.3-RC-5
 


Index: macros.cmake
===================================================================
RCS file: /cvs/pkgs/rpms/cmake/devel/macros.cmake,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- macros.cmake	2 Dec 2008 17:46:08 -0000	1.3
+++ macros.cmake	4 Jan 2009 21:10:23 -0000	1.4
@@ -2,6 +2,7 @@
 # Macros for cmake
 #
 %_cmake_lib_suffix64 -DLIB_SUFFIX=64
+%_cmake_skip_rpath -DCMAKE_SKIP_RPATH:BOOL=ON
 %__cmake %{_bindir}/cmake
 
 %cmake \
@@ -19,4 +20,5 @@
 %if "%{?_lib}" == "lib64" \
         %{?_cmake_lib_suffix64} \\\
 %endif \
+        %{?_cmake_skip_rpath} \\\
         -DBUILD_SHARED_LIBS:BOOL=ON



From janderson at fedoraproject.org  Sun Jan  4 21:14:52 2009
From: janderson at fedoraproject.org (John Anderson)
Date: Sun,  4 Jan 2009 21:14:52 +0000 (UTC)
Subject: rpms/mumbles/F-10 import.log,1.1,1.2 mumbles.spec,1.2,1.3
Message-ID: <20090104211452.BAC297013C@cvs1.fedora.phx.redhat.com>

Author: janderson

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

Modified Files:
	import.log mumbles.spec 
Log Message:
Adding desktop file changes per comment 20



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/mumbles/F-10/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	4 Jan 2009 21:05:51 -0000	1.1
+++ import.log	4 Jan 2009 21:14:22 -0000	1.2
@@ -1 +1,2 @@
 mumbles-0_4-7_fc10:F-10:mumbles-0.4-7.fc10.src.rpm:1231103124
+mumbles-0_4-8_fc10:F-10:mumbles-0.4-8.fc10.src.rpm:1231103616


Index: mumbles.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mumbles/F-10/mumbles.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mumbles.spec	4 Jan 2009 21:10:05 -0000	1.2
+++ mumbles.spec	4 Jan 2009 21:14:22 -0000	1.3
@@ -3,7 +3,7 @@
 
 Name:		mumbles
 Version:	0.4
-Release:	7%{?dist}
+Release:	8%{?dist}
 Summary:	A plugin driven DBus based notification system for the Gnome desktop
 
 Group:		User Interface/Desktops
@@ -90,6 +90,9 @@
 
 
 %changelog
+* Sun Jan  4 2009 John Anderson <john.e.anderson at gmail.com> - 0.4-8
+- Added GNOME and GTK categories to desktop file
+
 * Sat Jan  3 2009 John Anderson <john.e.anderson at gmail.com> - 0.4-7
 - Added desktop-file-install back
 



From janderson at fedoraproject.org  Sun Jan  4 21:16:17 2009
From: janderson at fedoraproject.org (John Anderson)
Date: Sun,  4 Jan 2009 21:16:17 +0000 (UTC)
Subject: rpms/mumbles/devel import.log,1.1,1.2 mumbles.spec,1.1,1.2
Message-ID: <20090104211617.87B617013F@cvs1.fedora.phx.redhat.com>

Author: janderson

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

Modified Files:
	import.log mumbles.spec 
Log Message:
Desktop file category change per comment 20



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/mumbles/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	4 Jan 2009 21:03:55 -0000	1.1
+++ import.log	4 Jan 2009 21:15:47 -0000	1.2
@@ -1 +1,2 @@
 mumbles-0_4-7_fc10:HEAD:mumbles-0.4-7.fc10.src.rpm:1231102993
+mumbles-0_4-8_fc10:HEAD:mumbles-0.4-8.fc10.src.rpm:1231103707


Index: mumbles.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mumbles/devel/mumbles.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mumbles.spec	4 Jan 2009 21:03:56 -0000	1.1
+++ mumbles.spec	4 Jan 2009 21:15:47 -0000	1.2
@@ -3,7 +3,7 @@
 
 Name:		mumbles
 Version:	0.4
-Release:	7%{?dist}
+Release:	8%{?dist}
 Summary:	A plugin driven DBus based notification system for the Gnome desktop
 
 Group:		User Interface/Desktops
@@ -47,6 +47,7 @@
 	--copy-name-to-generic-name			\
 	--delete-original				\
 	--remove-category=Application			\
+	--add-category="GNOME;GTK;"			\
 	%{buildroot}%{_datadir}/applications/%{name}.desktop
 
 desktop-file-install \
@@ -89,6 +90,9 @@
 
 
 %changelog
+* Sun Jan  4 2009 John Anderson <john.e.anderson at gmail.com> - 0.4-8
+- Added GNOME and GTK categories to desktop file
+
 * Sat Jan  3 2009 John Anderson <john.e.anderson at gmail.com> - 0.4-7
 - Added desktop-file-install back
 



From rdieter at fedoraproject.org  Sun Jan  4 21:19:42 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sun,  4 Jan 2009 21:19:42 +0000 (UTC)
Subject: rpms/cmake/devel cmake.spec,1.49,1.50
Message-ID: <20090104211942.3239970130@cvs1.fedora.phx.redhat.com>

Author: rdieter

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

Modified Files:
	cmake.spec 
Log Message:
happy new year



Index: cmake.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cmake/devel/cmake.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- cmake.spec	4 Jan 2009 21:10:22 -0000	1.49
+++ cmake.spec	4 Jan 2009 21:19:11 -0000	1.50
@@ -125,7 +125,7 @@
 
 
 %changelog
-* Sun Jan 04 2008 Rex Dieter <rdieter at fedoraproject.org> - 2.6.3-0.2.rc5
+* Sun Jan 04 2009 Rex Dieter <rdieter at fedoraproject.org> - 2.6.3-0.2.rc5
 - macros.cmake: add -DCMAKE_SKIP_RPATH:BOOL=ON
 - fix Release tag
 



From erikos at fedoraproject.org  Sun Jan  4 21:23:57 2009
From: erikos at fedoraproject.org (Simon Schampijer)
Date: Sun,  4 Jan 2009 21:23:57 +0000 (UTC)
Subject: rpms/sugar/devel .cvsignore, 1.22, 1.23 sources, 1.24,
	1.25 sugar.spec, 1.39, 1.40 desktop.patch, 1.1, NONE
Message-ID: <20090104212357.9EBD870130@cvs1.fedora.phx.redhat.com>

Author: erikos

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

Modified Files:
	.cvsignore sources sugar.spec 
Removed Files:
	desktop.patch 
Log Message:
* Sun Jan 04 2009 Simon Schampijer <simon at laptop.org> - 0.83.4-1
- New download url
- Fix language parsing on Gentoo and ALTLinux #81 (alsroot)
- Change the FRAME_POSITION_RELATIVE to follow eben's spec
- exec sugar-session
- Add wired device icon for the frame
- Only show wireless device in the frame when connecting/connected
- Use jabber.sugarlabs.org by default
- Only create a keydialog for the activating connection
- CanvasPulsingIcon: Don't begin pulse loop on resume if not pulsing
- Use g_timeout_add_seconds() for power efficiency
- Add the journal button to the volumes toolbar in the journal
- Remove jarabe/model/volume.py and use gio instead
- First try at restoring removable devices support in the journal
- make the image viewer activity the default one for iamges




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sugar/devel/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- .cvsignore	6 Nov 2008 00:07:21 -0000	1.22
+++ .cvsignore	4 Jan 2009 21:23:26 -0000	1.23
@@ -1 +1 @@
-sugar-0.83.2.tar.bz2
+sugar-0.83.4.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sugar/devel/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- sources	28 Nov 2008 01:44:13 -0000	1.24
+++ sources	4 Jan 2009 21:23:26 -0000	1.25
@@ -1 +1 @@
-96ffdd4392bce3d4958a5ea871cb1f64  sugar-0.83.3.tar.bz2
+6b981c63bb5d8b23b43831ece79884e6  sugar-0.83.4.tar.bz2


Index: sugar.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar/devel/sugar.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- sugar.spec	21 Dec 2008 07:20:03 -0000	1.39
+++ sugar.spec	4 Jan 2009 21:23:27 -0000	1.40
@@ -5,16 +5,14 @@
 
 Summary: Constructionist learning platform
 Name: sugar
-Version: 0.83.3
-Release: 6%{?dist}
+Version: 0.83.4
+Release: 1%{?dist}
 URL: http://sugarlabs.org/
-Source0: http://dev.laptop.org/pub/sugar/sources/%{name}/%{name}-%{version}.tar.bz2
+Source0: http://download.sugarlabs.org/sources/sucrose/glucose/%{name}/%{name}-%{version}.tar.bz2
 License: GPLv2+
 Group: User Interface/Desktops
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Patch1: desktop.patch
-
 BuildRequires: pkgconfig
 BuildRequires: perl-XML-Parser
 BuildRequires: gettext
@@ -37,7 +35,7 @@
 
 %description
 
-Sugar provides a simple yet powerful means of engaging young
+Sugar provides simple yet powerful means of engaging young
 children in the world of learning that is opened up by computers
 and the Internet. With Sugar, even the youngest learner will quickly
 become proficient in using the computer as a tool to engage in
@@ -64,8 +62,6 @@
 %prep
 %setup -q
 
-%patch1 -p0 -b .desktop
-
 %build
 %configure
 make
@@ -134,6 +130,22 @@
 %{_bindir}/sugar-emulator
 
 %changelog
+* Sun Jan 04 2009 Simon Schampijer <simon at laptop.org> - 0.83.4-1
+- New download url
+- Fix language parsing on Gentoo and ALTLinux #81 (alsroot)
+- Change the FRAME_POSITION_RELATIVE to follow eben's spec
+- exec sugar-session
+- Add wired device icon for the frame
+- Only show wireless device in the frame when connecting/connected
+- Use jabber.sugarlabs.org by default
+- Only create a keydialog for the activating connection
+- CanvasPulsingIcon: Don't begin pulse loop on resume if not pulsing
+- Use g_timeout_add_seconds() for power efficiency
+- Add the journal button to the volumes toolbar in the journal
+- Remove jarabe/model/volume.py and use gio instead
+- First try at restoring removable devices support in the journal
+- make the image viewer activity the default one for iamges
+
 * Wed Dec 21 2008 Bernie Innocenti <bernie at codewiz.org> - 0.83.3-6
 - Add missing dependencies on xorg-x11-utils, dbus-x11 and openssh
 


--- desktop.patch DELETED ---



From rdieter at fedoraproject.org  Sun Jan  4 21:25:55 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sun,  4 Jan 2009 21:25:55 +0000 (UTC)
Subject: rpms/akonadi/devel .cvsignore, 1.7, 1.8 akonadi.spec, 1.19,
	1.20 sources, 1.7, 1.8
Message-ID: <20090104212555.6A36570130@cvs1.fedora.phx.redhat.com>

Author: rdieter

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

Modified Files:
	.cvsignore akonadi.spec sources 
Log Message:
* Sun Jan 04 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.1.0-1
- 1.1.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/akonadi/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	16 Dec 2008 19:18:12 -0000	1.7
+++ .cvsignore	4 Jan 2009 21:25:24 -0000	1.8
@@ -1 +1 @@
-akonadi-1.0.81.tar.bz2
+akonadi-1.1.0.tar.bz2


Index: akonadi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/akonadi/devel/akonadi.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- akonadi.spec	16 Dec 2008 19:18:12 -0000	1.19
+++ akonadi.spec	4 Jan 2009 21:25:24 -0000	1.20
@@ -1,6 +1,6 @@
 Summary: PIM Storage Service
 Name:    akonadi
-Version: 1.0.81
+Version: 1.1.0
 Release: 1%{?dist}
 
 Group:   System Environment/Libraries
@@ -53,7 +53,9 @@
 
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
+# added CMAKE_SKIP_RPATH ... at least until universally in %cmake macro -- Rex
 %{cmake} \
+  -DCMAKE_SKIP_RPATH:BOOL=ON \
   -DCONFIG_INSTALL_DIR=%{_sysconfdir} \
   ..
 popd
@@ -88,7 +90,7 @@
 %{_bindir}/akonadi_control
 %{_bindir}/akonadictl
 %{_bindir}/akonadiserver
-%{_libdir}/libakonadi*.so.*
+%{_libdir}/libakonadi*.so.1*
 %{_datadir}/dbus-1/interfaces/
 %{_datadir}/dbus-1/services/org.freedesktop.Akonadi.Control.service
 %{_datadir}/mime/packages/akonadi-mime.xml
@@ -103,6 +105,9 @@
 
 
 %changelog
+* Sun Jan 04 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.1.0-1
+- 1.1.0
+
 * Tue Dec 16 2008 Rex Dieter <rdieter at fedoraproject.org> - 1.0.81-1
 - 1.0.81
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/akonadi/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	16 Dec 2008 19:18:12 -0000	1.7
+++ sources	4 Jan 2009 21:25:24 -0000	1.8
@@ -1 +1 @@
-6a42c9e8fdfb47fde0a8c6a3bc01a101  akonadi-1.0.81.tar.bz2
+de54155bdc4f15d30e889a6245779a2c  akonadi-1.1.0.tar.bz2



From lkundrak at fedoraproject.org  Sun Jan  4 21:26:23 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Sun,  4 Jan 2009 21:26:23 +0000 (UTC)
Subject: rpms/pnglite/devel pnglite-0.1.17-zlib.patch, NONE, 1.1 pnglite.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090104212623.264F370130@cvs1.fedora.phx.redhat.com>

Author: lkundrak

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

Modified Files:
	.cvsignore sources 
Added Files:
	pnglite-0.1.17-zlib.patch pnglite.spec 
Log Message:
Initial import

pnglite-0.1.17-zlib.patch:

--- NEW FILE pnglite-0.1.17-zlib.patch ---
diff -up pnglite-0.1.17/pnglite.c.zlib pnglite-0.1.17/pnglite.c
--- pnglite-0.1.17/pnglite.c.zlib	2008-12-31 16:54:41.000000000 +0100
+++ pnglite-0.1.17/pnglite.c	2008-12-31 16:54:49.000000000 +0100
@@ -5,7 +5,7 @@
 #define USE_ZLIB 1
 
 #if USE_ZLIB
-#include "../zlib/zlib.h"
+#include <zlib.h>
 #else
 #include "zlite.h"
 #endif


--- NEW FILE pnglite.spec ---
# Upstream doesn't use a SONAME and nobody knows how stable the interface is
# Please take extra care when updating this package -- bump the following
# and rebuild dependencies (shouldn't be many) if you suspect an ABI change:
%define abi_major 0
%define abi_minor 1

Name:           pnglite
Version:        0.1.17
Release:        %{abi_minor}%{?dist}
Summary:        A lightweight C library for loading PNG images

Group:          Development/Libraries
License:        zlib
URL:            http://www.karlings.com/~danne/pnglite/
Source0:        http://downloads.sourceforge.net/pnglite/%{name}-%{version}.zip
Patch0:         pnglite-0.1.17-zlib.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  zlib-devel

%description
pnglite is a C library for loading PNG images. It was created as a
substitute for libpng in situations when libpng is more than enough. It
currently requires zlib for inflate and crc checking and it can read the
most common types of PNG images. The library has a small and simple to use
interface.


%package devel
Summary:        Files needed to build and link programs with pnglite
Group:          Development/Libraries
Requires:       pnglite = %{version}

%description devel
This contains a header file and a link to library for the linker
to link against pnglite.


%prep
%setup -q -c
%patch0 -p1 -b .zlib
sed 's/\r//' -i pnglite.h


%build
gcc %{optflags} -shared -fPIC -Wl,--soname,libpnglite.so.%{abi_major} \
       -o libpnglite.so.%{abi_major}.%{abi_minor} pnglite.c


%install
rm -rf $RPM_BUILD_ROOT

install -d $RPM_BUILD_ROOT%{_libdir}
install -d $RPM_BUILD_ROOT%{_includedir}

install -pm 0644 pnglite.h $RPM_BUILD_ROOT%{_includedir}
install libpnglite.so.%{abi_major}.%{abi_minor} $RPM_BUILD_ROOT%{_libdir}
ln -s libpnglite.so.%{abi_major}.%{abi_minor} $RPM_BUILD_ROOT%{_libdir}/libpnglite.so.%{abi_major}
ln -s libpnglite.so.%{abi_major}.%{abi_minor} $RPM_BUILD_ROOT%{_libdir}/libpnglite.so


%clean
rm -rf $RPM_BUILD_ROOT


%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig


%files
%defattr(-,root,root,-)
%{_libdir}/*.so.*
# No documentation. License text is in the header file in -devel though.


%files devel
%defattr(-,root,root,-)
%{_libdir}/*.so
%{_includedir}/*.h


%changelog
* Wed Dec 31 2008 Lubomir Rintel <lkundrak at v3.sk> - 0.1.17-1
- Initial packaging


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pnglite/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	4 Jan 2009 20:47:54 -0000	1.1
+++ .cvsignore	4 Jan 2009 21:25:52 -0000	1.2
@@ -0,0 +1 @@
+pnglite-0.1.17.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pnglite/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	4 Jan 2009 20:47:54 -0000	1.1
+++ sources	4 Jan 2009 21:25:52 -0000	1.2
@@ -0,0 +1 @@
+37b1cecc92c53b05dd4c8dcb00fc4196  pnglite-0.1.17.zip



From kevin at fedoraproject.org  Sun Jan  4 21:27:06 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun,  4 Jan 2009 21:27:06 +0000 (UTC)
Subject: rpms/sion/devel import.log, NONE, 1.1 sion.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090104212706.D1A1870130@cvs1.fedora.phx.redhat.com>

Author: kevin

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

Modified Files:
	.cvsignore sources 
Added Files:
	import.log sion.spec 
Log Message:
Initial import into fedora



--- NEW FILE import.log ---
sion-0_1_0-2_fc11:HEAD:sion-0.1.0-2.fc11.src.rpm:1231104278


--- NEW FILE sion.spec ---
Name:           sion
Version:        0.1.0
Release:        2%{?dist}
Summary:        GIO/GVFS management application

Group:          User Interface/Desktops
License:        GPLv2
URL:            http://goodies.xfce.org/projects/applications/sion/
Source0:        http://goodies.xfce.org/releases/sion/sion-%{version}.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires: python
BuildRequires: gettext
BuildRequires: intltool
BuildRequires: gtk2-devel
BuildRequires: desktop-file-utils

Requires: %{_bindir}/gvfs-open
Requires: %{_bindir}/fusermount

%description
A frontend to easily manage connections to remote filesystems using GIO/GVFS. 
It allows you to quickly connect/mount a remote filesystem and manage
bookmarks of such. 

%prep
%setup -q

%build
./waf 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} --infodir=%{_infodir} --enable-debug

./waf build

%install
rm -rf $RPM_BUILD_ROOT
DESTDIR=$RPM_BUILD_ROOT ./waf install 

# remove docs that waf installs in the wrong place
rm -rf $RPM_BUILD_ROOT/%{_datadir}/doc/sion

rm -f $RPM_BUILD_ROOT/%{_datadir}/applications/sion.desktop

desktop-file-install --vendor="fedora"                         \
      --dir=%{buildroot}%{_datadir}/applications               \
      _build_/default/%{name}.desktop

%find_lang %{name}

%clean
rm -rf $RPM_BUILD_ROOT

%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING NEWS README README.I18N TODO
%{_bindir}/sion
%{_datadir}/applications/fedora-sion.desktop
%{_mandir}/man1/sion.1.gz

%changelog
* Sun Jan 04 2009 Kevin Fenzi <kevin at tummy.com> - 0.1.0-2
- Fix License tag
- Add Requires for needed binaries

* Fri Jan 02 2009 Kevin Fenzi <kevin at tummy.com> - 0.1.0-1
- Initial version for Fedora


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sion/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	4 Jan 2009 20:20:36 -0000	1.1
+++ .cvsignore	4 Jan 2009 21:26:36 -0000	1.2
@@ -0,0 +1 @@
+sion-0.1.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sion/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	4 Jan 2009 20:20:36 -0000	1.1
+++ sources	4 Jan 2009 21:26:36 -0000	1.2
@@ -0,0 +1 @@
+d38ba0f6468793f1860bbc6a5797916d  sion-0.1.0.tar.bz2



From lkundrak at fedoraproject.org  Sun Jan  4 21:27:47 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Sun,  4 Jan 2009 21:27:47 +0000 (UTC)
Subject: rpms/pnglite/F-10 pnglite-0.1.17-zlib.patch, NONE, 1.1 pnglite.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090104212747.023AB70130@cvs1.fedora.phx.redhat.com>

Author: lkundrak

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

Modified Files:
	.cvsignore sources 
Added Files:
	pnglite-0.1.17-zlib.patch pnglite.spec 
Log Message:
Import to branches

pnglite-0.1.17-zlib.patch:

--- NEW FILE pnglite-0.1.17-zlib.patch ---
diff -up pnglite-0.1.17/pnglite.c.zlib pnglite-0.1.17/pnglite.c
--- pnglite-0.1.17/pnglite.c.zlib	2008-12-31 16:54:41.000000000 +0100
+++ pnglite-0.1.17/pnglite.c	2008-12-31 16:54:49.000000000 +0100
@@ -5,7 +5,7 @@
 #define USE_ZLIB 1
 
 #if USE_ZLIB
-#include "../zlib/zlib.h"
+#include <zlib.h>
 #else
 #include "zlite.h"
 #endif


--- NEW FILE pnglite.spec ---
# Upstream doesn't use a SONAME and nobody knows how stable the interface is
# Please take extra care when updating this package -- bump the following
# and rebuild dependencies (shouldn't be many) if you suspect an ABI change:
%define abi_major 0
%define abi_minor 1

Name:           pnglite
Version:        0.1.17
Release:        %{abi_minor}%{?dist}
Summary:        A lightweight C library for loading PNG images

Group:          Development/Libraries
License:        zlib
URL:            http://www.karlings.com/~danne/pnglite/
Source0:        http://downloads.sourceforge.net/pnglite/%{name}-%{version}.zip
Patch0:         pnglite-0.1.17-zlib.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  zlib-devel

%description
pnglite is a C library for loading PNG images. It was created as a
substitute for libpng in situations when libpng is more than enough. It
currently requires zlib for inflate and crc checking and it can read the
most common types of PNG images. The library has a small and simple to use
interface.


%package devel
Summary:        Files needed to build and link programs with pnglite
Group:          Development/Libraries
Requires:       pnglite = %{version}

%description devel
This contains a header file and a link to library for the linker
to link against pnglite.


%prep
%setup -q -c
%patch0 -p1 -b .zlib
sed 's/\r//' -i pnglite.h


%build
gcc %{optflags} -shared -fPIC -Wl,--soname,libpnglite.so.%{abi_major} \
       -o libpnglite.so.%{abi_major}.%{abi_minor} pnglite.c


%install
rm -rf $RPM_BUILD_ROOT

install -d $RPM_BUILD_ROOT%{_libdir}
install -d $RPM_BUILD_ROOT%{_includedir}

install -pm 0644 pnglite.h $RPM_BUILD_ROOT%{_includedir}
install libpnglite.so.%{abi_major}.%{abi_minor} $RPM_BUILD_ROOT%{_libdir}
ln -s libpnglite.so.%{abi_major}.%{abi_minor} $RPM_BUILD_ROOT%{_libdir}/libpnglite.so.%{abi_major}
ln -s libpnglite.so.%{abi_major}.%{abi_minor} $RPM_BUILD_ROOT%{_libdir}/libpnglite.so


%clean
rm -rf $RPM_BUILD_ROOT


%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig


%files
%defattr(-,root,root,-)
%{_libdir}/*.so.*
# No documentation. License text is in the header file in -devel though.


%files devel
%defattr(-,root,root,-)
%{_libdir}/*.so
%{_includedir}/*.h


%changelog
* Wed Dec 31 2008 Lubomir Rintel <lkundrak at v3.sk> - 0.1.17-1
- Initial packaging


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pnglite/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	4 Jan 2009 20:47:54 -0000	1.1
+++ .cvsignore	4 Jan 2009 21:27:16 -0000	1.2
@@ -0,0 +1 @@
+pnglite-0.1.17.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pnglite/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	4 Jan 2009 20:47:54 -0000	1.1
+++ sources	4 Jan 2009 21:27:16 -0000	1.2
@@ -0,0 +1 @@
+37b1cecc92c53b05dd4c8dcb00fc4196  pnglite-0.1.17.zip



From lkundrak at fedoraproject.org  Sun Jan  4 21:27:47 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Sun,  4 Jan 2009 21:27:47 +0000 (UTC)
Subject: rpms/pnglite/F-9 pnglite-0.1.17-zlib.patch, NONE, 1.1 pnglite.spec, 
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090104212747.6442D70130@cvs1.fedora.phx.redhat.com>

Author: lkundrak

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

Modified Files:
	.cvsignore sources 
Added Files:
	pnglite-0.1.17-zlib.patch pnglite.spec 
Log Message:
Import to branches

pnglite-0.1.17-zlib.patch:

--- NEW FILE pnglite-0.1.17-zlib.patch ---
diff -up pnglite-0.1.17/pnglite.c.zlib pnglite-0.1.17/pnglite.c
--- pnglite-0.1.17/pnglite.c.zlib	2008-12-31 16:54:41.000000000 +0100
+++ pnglite-0.1.17/pnglite.c	2008-12-31 16:54:49.000000000 +0100
@@ -5,7 +5,7 @@
 #define USE_ZLIB 1
 
 #if USE_ZLIB
-#include "../zlib/zlib.h"
+#include <zlib.h>
 #else
 #include "zlite.h"
 #endif


--- NEW FILE pnglite.spec ---
# Upstream doesn't use a SONAME and nobody knows how stable the interface is
# Please take extra care when updating this package -- bump the following
# and rebuild dependencies (shouldn't be many) if you suspect an ABI change:
%define abi_major 0
%define abi_minor 1

Name:           pnglite
Version:        0.1.17
Release:        %{abi_minor}%{?dist}
Summary:        A lightweight C library for loading PNG images

Group:          Development/Libraries
License:        zlib
URL:            http://www.karlings.com/~danne/pnglite/
Source0:        http://downloads.sourceforge.net/pnglite/%{name}-%{version}.zip
Patch0:         pnglite-0.1.17-zlib.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  zlib-devel

%description
pnglite is a C library for loading PNG images. It was created as a
substitute for libpng in situations when libpng is more than enough. It
currently requires zlib for inflate and crc checking and it can read the
most common types of PNG images. The library has a small and simple to use
interface.


%package devel
Summary:        Files needed to build and link programs with pnglite
Group:          Development/Libraries
Requires:       pnglite = %{version}

%description devel
This contains a header file and a link to library for the linker
to link against pnglite.


%prep
%setup -q -c
%patch0 -p1 -b .zlib
sed 's/\r//' -i pnglite.h


%build
gcc %{optflags} -shared -fPIC -Wl,--soname,libpnglite.so.%{abi_major} \
       -o libpnglite.so.%{abi_major}.%{abi_minor} pnglite.c


%install
rm -rf $RPM_BUILD_ROOT

install -d $RPM_BUILD_ROOT%{_libdir}
install -d $RPM_BUILD_ROOT%{_includedir}

install -pm 0644 pnglite.h $RPM_BUILD_ROOT%{_includedir}
install libpnglite.so.%{abi_major}.%{abi_minor} $RPM_BUILD_ROOT%{_libdir}
ln -s libpnglite.so.%{abi_major}.%{abi_minor} $RPM_BUILD_ROOT%{_libdir}/libpnglite.so.%{abi_major}
ln -s libpnglite.so.%{abi_major}.%{abi_minor} $RPM_BUILD_ROOT%{_libdir}/libpnglite.so


%clean
rm -rf $RPM_BUILD_ROOT


%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig


%files
%defattr(-,root,root,-)
%{_libdir}/*.so.*
# No documentation. License text is in the header file in -devel though.


%files devel
%defattr(-,root,root,-)
%{_libdir}/*.so
%{_includedir}/*.h


%changelog
* Wed Dec 31 2008 Lubomir Rintel <lkundrak at v3.sk> - 0.1.17-1
- Initial packaging


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pnglite/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	4 Jan 2009 20:47:54 -0000	1.1
+++ .cvsignore	4 Jan 2009 21:27:17 -0000	1.2
@@ -0,0 +1 @@
+pnglite-0.1.17.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pnglite/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	4 Jan 2009 20:47:54 -0000	1.1
+++ sources	4 Jan 2009 21:27:17 -0000	1.2
@@ -0,0 +1 @@
+37b1cecc92c53b05dd4c8dcb00fc4196  pnglite-0.1.17.zip



From lkundrak at fedoraproject.org  Sun Jan  4 21:28:56 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Sun,  4 Jan 2009 21:28:56 +0000 (UTC)
Subject: rpms/pnglite/EL-5 pnglite-0.1.17-zlib.patch, NONE, 1.1 pnglite.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090104212856.4E8C970130@cvs1.fedora.phx.redhat.com>

Author: lkundrak

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

Modified Files:
	.cvsignore sources 
Added Files:
	pnglite-0.1.17-zlib.patch pnglite.spec 
Log Message:
Import to epel

pnglite-0.1.17-zlib.patch:

--- NEW FILE pnglite-0.1.17-zlib.patch ---
diff -up pnglite-0.1.17/pnglite.c.zlib pnglite-0.1.17/pnglite.c
--- pnglite-0.1.17/pnglite.c.zlib	2008-12-31 16:54:41.000000000 +0100
+++ pnglite-0.1.17/pnglite.c	2008-12-31 16:54:49.000000000 +0100
@@ -5,7 +5,7 @@
 #define USE_ZLIB 1
 
 #if USE_ZLIB
-#include "../zlib/zlib.h"
+#include <zlib.h>
 #else
 #include "zlite.h"
 #endif


--- NEW FILE pnglite.spec ---
# Upstream doesn't use a SONAME and nobody knows how stable the interface is
# Please take extra care when updating this package -- bump the following
# and rebuild dependencies (shouldn't be many) if you suspect an ABI change:
%define abi_major 0
%define abi_minor 1

Name:           pnglite
Version:        0.1.17
Release:        %{abi_minor}%{?dist}
Summary:        A lightweight C library for loading PNG images

Group:          Development/Libraries
License:        zlib
URL:            http://www.karlings.com/~danne/pnglite/
Source0:        http://downloads.sourceforge.net/pnglite/%{name}-%{version}.zip
Patch0:         pnglite-0.1.17-zlib.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  zlib-devel

%description
pnglite is a C library for loading PNG images. It was created as a
substitute for libpng in situations when libpng is more than enough. It
currently requires zlib for inflate and crc checking and it can read the
most common types of PNG images. The library has a small and simple to use
interface.


%package devel
Summary:        Files needed to build and link programs with pnglite
Group:          Development/Libraries
Requires:       pnglite = %{version}

%description devel
This contains a header file and a link to library for the linker
to link against pnglite.


%prep
%setup -q -c
%patch0 -p1 -b .zlib
sed 's/\r//' -i pnglite.h


%build
gcc %{optflags} -shared -fPIC -Wl,--soname,libpnglite.so.%{abi_major} \
       -o libpnglite.so.%{abi_major}.%{abi_minor} pnglite.c


%install
rm -rf $RPM_BUILD_ROOT

install -d $RPM_BUILD_ROOT%{_libdir}
install -d $RPM_BUILD_ROOT%{_includedir}

install -pm 0644 pnglite.h $RPM_BUILD_ROOT%{_includedir}
install libpnglite.so.%{abi_major}.%{abi_minor} $RPM_BUILD_ROOT%{_libdir}
ln -s libpnglite.so.%{abi_major}.%{abi_minor} $RPM_BUILD_ROOT%{_libdir}/libpnglite.so.%{abi_major}
ln -s libpnglite.so.%{abi_major}.%{abi_minor} $RPM_BUILD_ROOT%{_libdir}/libpnglite.so


%clean
rm -rf $RPM_BUILD_ROOT


%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig


%files
%defattr(-,root,root,-)
%{_libdir}/*.so.*
# No documentation. License text is in the header file in -devel though.


%files devel
%defattr(-,root,root,-)
%{_libdir}/*.so
%{_includedir}/*.h


%changelog
* Wed Dec 31 2008 Lubomir Rintel <lkundrak at v3.sk> - 0.1.17-1
- Initial packaging


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pnglite/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	4 Jan 2009 20:47:54 -0000	1.1
+++ .cvsignore	4 Jan 2009 21:28:25 -0000	1.2
@@ -0,0 +1 @@
+pnglite-0.1.17.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pnglite/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	4 Jan 2009 20:47:54 -0000	1.1
+++ sources	4 Jan 2009 21:28:25 -0000	1.2
@@ -0,0 +1 @@
+37b1cecc92c53b05dd4c8dcb00fc4196  pnglite-0.1.17.zip



From kevin at fedoraproject.org  Sun Jan  4 21:44:47 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun,  4 Jan 2009 21:44:47 +0000 (UTC)
Subject: rpms/sion/F-10 sion.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <20090104214447.0A7D970130@cvs1.fedora.phx.redhat.com>

Author: kevin

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

Modified Files:
	.cvsignore sources 
Added Files:
	sion.spec 
Log Message:
initial fedora import



--- NEW FILE sion.spec ---
Name:           sion
Version:        0.1.0
Release:        2%{?dist}
Summary:        GIO/GVFS management application

Group:          User Interface/Desktops
License:        GPLv2
URL:            http://goodies.xfce.org/projects/applications/sion/
Source0:        http://goodies.xfce.org/releases/sion/sion-%{version}.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires: python
BuildRequires: gettext
BuildRequires: intltool
BuildRequires: gtk2-devel
BuildRequires: desktop-file-utils

Requires: %{_bindir}/gvfs-open
Requires: %{_bindir}/fusermount

%description
A frontend to easily manage connections to remote filesystems using GIO/GVFS. 
It allows you to quickly connect/mount a remote filesystem and manage
bookmarks of such. 

%prep
%setup -q

%build
./waf 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} --infodir=%{_infodir} --enable-debug

./waf build

%install
rm -rf $RPM_BUILD_ROOT
DESTDIR=$RPM_BUILD_ROOT ./waf install 

# remove docs that waf installs in the wrong place
rm -rf $RPM_BUILD_ROOT/%{_datadir}/doc/sion

rm -f $RPM_BUILD_ROOT/%{_datadir}/applications/sion.desktop

desktop-file-install --vendor="fedora"                         \
      --dir=%{buildroot}%{_datadir}/applications               \
      _build_/default/%{name}.desktop

%find_lang %{name}

%clean
rm -rf $RPM_BUILD_ROOT

%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING NEWS README README.I18N TODO
%{_bindir}/sion
%{_datadir}/applications/fedora-sion.desktop
%{_mandir}/man1/sion.1.gz

%changelog
* Sun Jan 04 2009 Kevin Fenzi <kevin at tummy.com> - 0.1.0-2
- Fix License tag
- Add Requires for needed binaries

* Fri Jan 02 2009 Kevin Fenzi <kevin at tummy.com> - 0.1.0-1
- Initial version for Fedora


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sion/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	4 Jan 2009 20:20:36 -0000	1.1
+++ .cvsignore	4 Jan 2009 21:44:16 -0000	1.2
@@ -0,0 +1 @@
+sion-0.1.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sion/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	4 Jan 2009 20:20:36 -0000	1.1
+++ sources	4 Jan 2009 21:44:16 -0000	1.2
@@ -0,0 +1 @@
+d38ba0f6468793f1860bbc6a5797916d  sion-0.1.0.tar.bz2



From dwayne at fedoraproject.org  Sun Jan  4 21:46:22 2009
From: dwayne at fedoraproject.org (Dwayne Bailey)
Date: Sun,  4 Jan 2009 21:46:22 +0000 (UTC)
Subject: rpms/virtaal/devel import.log, NONE,
	1.1 virtaal-0.2-setup_drop_MO_generation.patch, NONE,
	1.1 virtaal.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090104214622.B388470130@cvs1.fedora.phx.redhat.com>

Author: dwayne

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

Modified Files:
	.cvsignore sources 
Added Files:
	import.log virtaal-0.2-setup_drop_MO_generation.patch 
	virtaal.spec 
Log Message:
Import Virtaal 0.2 to Fedora



--- NEW FILE import.log ---
virtaal-0_2-2_fc9:HEAD:virtaal-0.2-2.fc9.src.rpm:1231105357

virtaal-0.2-setup_drop_MO_generation.patch:

--- NEW FILE virtaal-0.2-setup_drop_MO_generation.patch ---
diff -ur virtaal-0.2.old/setup.py virtaal-0.2/setup.py
--- virtaal-0.2.old/setup.py	2008-10-16 15:11:04.000000000 +0200
+++ virtaal-0.2/setup.py	2008-11-15 20:11:10.000000000 +0200
@@ -60,23 +60,6 @@
 ]
 #TODO: add Natural Language classifiers
 
-# Compile .mo files from available .po files
-from translate.tools.pocompile import convertmo
-mo_files = []
-
-for po_filename in glob.glob(path.join('po', '*.po')):
-    lang = path.split(po_filename[:-3])[1] # Chop off '.po'
-    mo_filename = path.join('mo', lang, 'virtaal.mo')
-
-    if not path.exists(path.join('mo', lang)):
-        os.makedirs(path.join('mo', lang))
-
-    convertmo(open(po_filename), open(mo_filename, 'w'), None)
-
-    mo_files.append(
-        ( path.join(TARGET_DATA_DIR, 'locale', lang, 'LC_MESSAGES'), [mo_filename])
-    )
-
 # Some of these depend on some files to be built externally before running 
 # setup.py, like the .xml and .desktop files
 options = {
@@ -84,7 +67,7 @@
         (path.join(TARGET_DATA_DIR, "virtaal"), glob.glob(path.join(SOURCE_DATA_DIR, "virtaal", "*.*"))),
         (path.join(TARGET_DATA_DIR, "virtaal", "autocorr"), glob.glob(path.join(SOURCE_DATA_DIR, "virtaal", "autocorr", "*"))),
         (path.join(TARGET_DATA_DIR, "icons"), glob.glob(path.join(SOURCE_DATA_DIR, "icons", "*.*"))),
-    ] + mo_files,
+    ],
     'scripts': [
         "bin/virtaal"
     ],


--- NEW FILE virtaal.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

Name:           virtaal
Version:        0.2
Release:        2%{?dist}
Summary:        Localization and translation editor

Group:          Development/Tools
License:        GPLv2+
URL:            http://translate.sourceforge.net/wiki/virtaal/index
Source0:        http://downloads.sourceforge.net/translate/%{name}-%{version}.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Patch0:         virtaal-0.2-setup_drop_MO_generation.patch

BuildArch:      noarch
BuildRequires:  python
BuildRequires:  python-devel
BuildRequires:  desktop-file-utils
BuildRequires:  gettext
BuildRequires:  intltool
Requires:       translate-toolkit >= 1.2
Requires:       pygtk2
Requires:       pygtk2-libglade
Requires:       python-lxml
Requires:       gnome-python2-gtkspell
Requires:       xdg-utils


%description
A program for Computer Aided Translation (CAT) built on the Translate Toolkit.

Virtaal includes features that allow a localizer to work effectively including:
syntax highlighting, autocomplete and autocorrect.  Showing only 
the data that is needed through its simple and effective user interface it
ensures that you can focus on the translation task straight away.

By building on the Translate Toolkit, Virtaal is able to edit any of the
following formats: XLIFF, Gettext PO and .mo, Qt .ts, .qph and .qm, Wordfast 
TM, TMX, TBX.  By using the Translate Toolkit converters a translator can edit:
OpenOffice.org SDF, Java (and Mozilla) .properties and Mozilla DTD.
 

%prep
%setup -q -n %{name}-%{version}
%patch0 -p1

%build
%{__python} setup.py build
./maketranslations %{name}
pushd po
for po in $(ls *.po | egrep -v de_DE)
do
    mkdir -p locale/$(basename $po .po)/LC_MESSAGES/
    msgfmt $po --output-file=locale/$(basename $po .po)/LC_MESSAGES/%{name}.mo
done
popd


%install
rm -rf %{buildroot}
%{__python} setup.py install -O1 --skip-build --install-data=/usr --root %{buildroot}

desktop-file-install                                     \
   --delete-original                                     \
   --dir=%{buildroot}%{_datadir}/applications            \
   %{buildroot}%{_datadir}/applications/%{name}.desktop
cp -rp po/locale %{buildroot}%{_datadir}/
%find_lang %{name}


%post
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


%postun
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


%clean
rm -rf %{buildroot}


%files -f %{name}.lang
%defattr(-,root,root,-)
%doc README LICENSE po/*.pot
%{_bindir}/*
%{_datadir}/applications/*
%{_datadir}/mime/packages/*
%{_datadir}/virtaal
%{_datadir}/icons/*
%{python_sitelib}/*


%changelog
* Sat Dec 6 2008 Dwayne Bailey <dwayne at translate.org.za> - 0.2-2
- Cleanups from package review

* Thu Oct 16 2008 Dwayne Bailey <dwayne at translate.org.za> - 0.2-1
- Build for final 0.2 release
- Add pygtk2-libglade dependency

* Thu Oct 2 2008 Dwayne Bailey <dwayne at translate.org.za> - 0.2-0.3.rc1
- Rebuild after tarball restructuring

* Wed Oct 1 2008 Dwayne Bailey <dwayne at translate.org.za> - 0.2-0.2.rc1
- Fix file locations

* Wed Oct 1 2008 Dwayne Bailey <dwayne at translate.org.za> - 0.2-0.1.rc1
- Update to RC1

* Sat Sep 20 2008 Dwayne Bailey <dwayne at translate.org.za> - 0.1-12
- Include LICENSE

* Thu Sep 11 2008 Dwayne Bailey <dwayne at translate.org.za> - 0.1-11
- Update for various file moves.
- Package virtaal.pot and gtk+-lite.pot
- Exclude the de_DE.mo debug translations

* Sat Jul 26 2008 Dwayne Bailey <dwayne at translate.org.za> - 0.1-10
- Package autocorrect files

* Thu Jul 24 2008 Dwayne Bailey <dwayne at translate.org.za> - 0.1-9
- Rebuild after upstream data location changes

* Tue Jun 3 2008 Dwayne Bailey <dwayne at translate.org.za> - 0.1-8
- Rebuild for fc9

* Fri May 9 2008 Dwayne Bailey <dwayne at translate.org.za> - 0.1-8
- Add xdg-utils as a requirement as we are using xdg-open

* Wed May 7 2008 Dwayne Bailey <dwayne at translate.org.za> - 0.1-7
- Adjust to changes in source package

* Wed Apr 30 2008 Dwayne Bailey <dwayne at translate.org.za> - 0.1-6
- Adjust to changes in source package

* Thu Apr 17 2008 Dwayne Bailey <dwayne at translate.org.za> - 0.1-5
- Install icon

* Thu Apr 17 2008 Dwayne Bailey <dwayne at translate.org.za> - 0.1-4
- Build translatable files using intltool

* Mon Apr 14 2008 Dwayne Bailey <dwayne at translate.org.za> - 0.1-3
- Install translations

* Sat Apr 12 2008 Dwayne Bailey <dwayne at translate.org.za> - 0.1-2
- Executable s/run_virtaal.py/virtaal/
- Remove .glade movement, ./setup.py install it correctly now
- Install .desktop, locale, mime files
- Update desktop- and mime-database

* Sat Apr 5 2008 Dwayne Bailey <dwayne at translate.org.za> - 0.1-1
- Initial packaging


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/virtaal/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	4 Jan 2009 20:16:29 -0000	1.1
+++ .cvsignore	4 Jan 2009 21:45:51 -0000	1.2
@@ -0,0 +1 @@
+virtaal-0.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/virtaal/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	4 Jan 2009 20:16:30 -0000	1.1
+++ sources	4 Jan 2009 21:45:52 -0000	1.2
@@ -0,0 +1 @@
+cd01398cc6c916317829a88c72af2253  virtaal-0.2.tar.bz2



From erikos at fedoraproject.org  Sun Jan  4 21:47:00 2009
From: erikos at fedoraproject.org (Simon Schampijer)
Date: Sun,  4 Jan 2009 21:47:00 +0000 (UTC)
Subject: rpms/sugar/devel sugar.spec,1.40,1.41
Message-ID: <20090104214700.5B5DB70130@cvs1.fedora.phx.redhat.com>

Author: erikos

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

Modified Files:
	sugar.spec 
Log Message:
* Sun Jan 04 2009 Simon Schampijer <simon at laptop.org> - 0.83.4-2
- add intltool build require




Index: sugar.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar/devel/sugar.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- sugar.spec	4 Jan 2009 21:23:27 -0000	1.40
+++ sugar.spec	4 Jan 2009 21:46:29 -0000	1.41
@@ -6,7 +6,7 @@
 Summary: Constructionist learning platform
 Name: sugar
 Version: 0.83.4
-Release: 1%{?dist}
+Release: 2%{?dist}
 URL: http://sugarlabs.org/
 Source0: http://download.sugarlabs.org/sources/sucrose/glucose/%{name}/%{name}-%{version}.tar.bz2
 License: GPLv2+
@@ -20,6 +20,7 @@
 BuildRequires: pygtk2-devel
 BuildRequires: gtk2-devel
 BuildRequires: GConf2-devel
+BuildRequires: intltool
 
 Requires: sugar-artwork
 Requires: sugar-toolkit
@@ -130,6 +131,9 @@
 %{_bindir}/sugar-emulator
 
 %changelog
+* Sun Jan 04 2009 Simon Schampijer <simon at laptop.org> - 0.83.4-2
+- add intltool build require
+
 * Sun Jan 04 2009 Simon Schampijer <simon at laptop.org> - 0.83.4-1
 - New download url
 - Fix language parsing on Gentoo and ALTLinux #81 (alsroot)



From kevin at fedoraproject.org  Sun Jan  4 21:55:03 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun,  4 Jan 2009 21:55:03 +0000 (UTC)
Subject: rpms/sion/F-9 sion.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1,
	1.2
Message-ID: <20090104215503.F1C0070130@cvs1.fedora.phx.redhat.com>

Author: kevin

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

Modified Files:
	.cvsignore sources 
Added Files:
	sion.spec 
Log Message:
Initial fedora version



--- NEW FILE sion.spec ---
Name:           sion
Version:        0.1.0
Release:        2%{?dist}
Summary:        GIO/GVFS management application

Group:          User Interface/Desktops
License:        GPLv2
URL:            http://goodies.xfce.org/projects/applications/sion/
Source0:        http://goodies.xfce.org/releases/sion/sion-%{version}.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires: python
BuildRequires: gettext
BuildRequires: intltool
BuildRequires: gtk2-devel
BuildRequires: desktop-file-utils

Requires: %{_bindir}/gvfs-open
Requires: %{_bindir}/fusermount

%description
A frontend to easily manage connections to remote filesystems using GIO/GVFS. 
It allows you to quickly connect/mount a remote filesystem and manage
bookmarks of such. 

%prep
%setup -q

%build
./waf 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} --infodir=%{_infodir} --enable-debug

./waf build

%install
rm -rf $RPM_BUILD_ROOT
DESTDIR=$RPM_BUILD_ROOT ./waf install 

# remove docs that waf installs in the wrong place
rm -rf $RPM_BUILD_ROOT/%{_datadir}/doc/sion

rm -f $RPM_BUILD_ROOT/%{_datadir}/applications/sion.desktop

desktop-file-install --vendor="fedora"                         \
      --dir=%{buildroot}%{_datadir}/applications               \
      _build_/default/%{name}.desktop

%find_lang %{name}

%clean
rm -rf $RPM_BUILD_ROOT

%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING NEWS README README.I18N TODO
%{_bindir}/sion
%{_datadir}/applications/fedora-sion.desktop
%{_mandir}/man1/sion.1.gz

%changelog
* Sun Jan 04 2009 Kevin Fenzi <kevin at tummy.com> - 0.1.0-2
- Fix License tag
- Add Requires for needed binaries

* Fri Jan 02 2009 Kevin Fenzi <kevin at tummy.com> - 0.1.0-1
- Initial version for Fedora


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sion/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	4 Jan 2009 20:20:36 -0000	1.1
+++ .cvsignore	4 Jan 2009 21:54:33 -0000	1.2
@@ -0,0 +1 @@
+sion-0.1.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sion/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	4 Jan 2009 20:20:36 -0000	1.1
+++ sources	4 Jan 2009 21:54:33 -0000	1.2
@@ -0,0 +1 @@
+d38ba0f6468793f1860bbc6a5797916d  sion-0.1.0.tar.bz2



From rdieter at fedoraproject.org  Sun Jan  4 21:55:16 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sun,  4 Jan 2009 21:55:16 +0000 (UTC)
Subject: rpms/akonadi/devel akonadi.spec,1.20,1.21
Message-ID: <20090104215516.9EB5470130@cvs1.fedora.phx.redhat.com>

Author: rdieter

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

Modified Files:
	akonadi.spec 
Log Message:
escape macro in comment



Index: akonadi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/akonadi/devel/akonadi.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- akonadi.spec	4 Jan 2009 21:25:24 -0000	1.20
+++ akonadi.spec	4 Jan 2009 21:54:46 -0000	1.21
@@ -53,7 +53,7 @@
 
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
-# added CMAKE_SKIP_RPATH ... at least until universally in %cmake macro -- Rex
+# added CMAKE_SKIP_RPATH ... at least until universally in %%cmake macro -- Rex
 %{cmake} \
   -DCMAKE_SKIP_RPATH:BOOL=ON \
   -DCONFIG_INSTALL_DIR=%{_sysconfdir} \



From dwayne at fedoraproject.org  Sun Jan  4 21:58:33 2009
From: dwayne at fedoraproject.org (Dwayne Bailey)
Date: Sun,  4 Jan 2009 21:58:33 +0000 (UTC)
Subject: rpms/virtaal/F-10 import.log, NONE,
	1.1 virtaal-0.2-setup_drop_MO_generation.patch, NONE,
	1.1 virtaal.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090104215833.4D9B370130@cvs1.fedora.phx.redhat.com>

Author: dwayne

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

Modified Files:
	.cvsignore sources 
Added Files:
	import.log virtaal-0.2-setup_drop_MO_generation.patch 
	virtaal.spec 
Log Message:
Import Virtaal to F-10



--- NEW FILE import.log ---
virtaal-0_2-2_fc9:F-10:virtaal-0.2-2.fc9.src.rpm:1231106229

virtaal-0.2-setup_drop_MO_generation.patch:

--- NEW FILE virtaal-0.2-setup_drop_MO_generation.patch ---
diff -ur virtaal-0.2.old/setup.py virtaal-0.2/setup.py
--- virtaal-0.2.old/setup.py	2008-10-16 15:11:04.000000000 +0200
+++ virtaal-0.2/setup.py	2008-11-15 20:11:10.000000000 +0200
@@ -60,23 +60,6 @@
 ]
 #TODO: add Natural Language classifiers
 
-# Compile .mo files from available .po files
-from translate.tools.pocompile import convertmo
-mo_files = []
-
-for po_filename in glob.glob(path.join('po', '*.po')):
-    lang = path.split(po_filename[:-3])[1] # Chop off '.po'
-    mo_filename = path.join('mo', lang, 'virtaal.mo')
-
-    if not path.exists(path.join('mo', lang)):
-        os.makedirs(path.join('mo', lang))
-
-    convertmo(open(po_filename), open(mo_filename, 'w'), None)
-
-    mo_files.append(
-        ( path.join(TARGET_DATA_DIR, 'locale', lang, 'LC_MESSAGES'), [mo_filename])
-    )
-
 # Some of these depend on some files to be built externally before running 
 # setup.py, like the .xml and .desktop files
 options = {
@@ -84,7 +67,7 @@
         (path.join(TARGET_DATA_DIR, "virtaal"), glob.glob(path.join(SOURCE_DATA_DIR, "virtaal", "*.*"))),
         (path.join(TARGET_DATA_DIR, "virtaal", "autocorr"), glob.glob(path.join(SOURCE_DATA_DIR, "virtaal", "autocorr", "*"))),
         (path.join(TARGET_DATA_DIR, "icons"), glob.glob(path.join(SOURCE_DATA_DIR, "icons", "*.*"))),
-    ] + mo_files,
+    ],
     'scripts': [
         "bin/virtaal"
     ],


--- NEW FILE virtaal.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

Name:           virtaal
Version:        0.2
Release:        2%{?dist}
Summary:        Localization and translation editor

Group:          Development/Tools
License:        GPLv2+
URL:            http://translate.sourceforge.net/wiki/virtaal/index
Source0:        http://downloads.sourceforge.net/translate/%{name}-%{version}.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Patch0:         virtaal-0.2-setup_drop_MO_generation.patch

BuildArch:      noarch
BuildRequires:  python
BuildRequires:  python-devel
BuildRequires:  desktop-file-utils
BuildRequires:  gettext
BuildRequires:  intltool
Requires:       translate-toolkit >= 1.2
Requires:       pygtk2
Requires:       pygtk2-libglade
Requires:       python-lxml
Requires:       gnome-python2-gtkspell
Requires:       xdg-utils


%description
A program for Computer Aided Translation (CAT) built on the Translate Toolkit.

Virtaal includes features that allow a localizer to work effectively including:
syntax highlighting, autocomplete and autocorrect.  Showing only 
the data that is needed through its simple and effective user interface it
ensures that you can focus on the translation task straight away.

By building on the Translate Toolkit, Virtaal is able to edit any of the
following formats: XLIFF, Gettext PO and .mo, Qt .ts, .qph and .qm, Wordfast 
TM, TMX, TBX.  By using the Translate Toolkit converters a translator can edit:
OpenOffice.org SDF, Java (and Mozilla) .properties and Mozilla DTD.
 

%prep
%setup -q -n %{name}-%{version}
%patch0 -p1

%build
%{__python} setup.py build
./maketranslations %{name}
pushd po
for po in $(ls *.po | egrep -v de_DE)
do
    mkdir -p locale/$(basename $po .po)/LC_MESSAGES/
    msgfmt $po --output-file=locale/$(basename $po .po)/LC_MESSAGES/%{name}.mo
done
popd


%install
rm -rf %{buildroot}
%{__python} setup.py install -O1 --skip-build --install-data=/usr --root %{buildroot}

desktop-file-install                                     \
   --delete-original                                     \
   --dir=%{buildroot}%{_datadir}/applications            \
   %{buildroot}%{_datadir}/applications/%{name}.desktop
cp -rp po/locale %{buildroot}%{_datadir}/
%find_lang %{name}


%post
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


%postun
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


%clean
rm -rf %{buildroot}


%files -f %{name}.lang
%defattr(-,root,root,-)
%doc README LICENSE po/*.pot
%{_bindir}/*
%{_datadir}/applications/*
%{_datadir}/mime/packages/*
%{_datadir}/virtaal
%{_datadir}/icons/*
%{python_sitelib}/*


%changelog
* Sat Dec 6 2008 Dwayne Bailey <dwayne at translate.org.za> - 0.2-2
- Cleanups from package review

* Thu Oct 16 2008 Dwayne Bailey <dwayne at translate.org.za> - 0.2-1
- Build for final 0.2 release
- Add pygtk2-libglade dependency

* Thu Oct 2 2008 Dwayne Bailey <dwayne at translate.org.za> - 0.2-0.3.rc1
- Rebuild after tarball restructuring

* Wed Oct 1 2008 Dwayne Bailey <dwayne at translate.org.za> - 0.2-0.2.rc1
- Fix file locations

* Wed Oct 1 2008 Dwayne Bailey <dwayne at translate.org.za> - 0.2-0.1.rc1
- Update to RC1

* Sat Sep 20 2008 Dwayne Bailey <dwayne at translate.org.za> - 0.1-12
- Include LICENSE

* Thu Sep 11 2008 Dwayne Bailey <dwayne at translate.org.za> - 0.1-11
- Update for various file moves.
- Package virtaal.pot and gtk+-lite.pot
- Exclude the de_DE.mo debug translations

* Sat Jul 26 2008 Dwayne Bailey <dwayne at translate.org.za> - 0.1-10
- Package autocorrect files

* Thu Jul 24 2008 Dwayne Bailey <dwayne at translate.org.za> - 0.1-9
- Rebuild after upstream data location changes

* Tue Jun 3 2008 Dwayne Bailey <dwayne at translate.org.za> - 0.1-8
- Rebuild for fc9

* Fri May 9 2008 Dwayne Bailey <dwayne at translate.org.za> - 0.1-8
- Add xdg-utils as a requirement as we are using xdg-open

* Wed May 7 2008 Dwayne Bailey <dwayne at translate.org.za> - 0.1-7
- Adjust to changes in source package

* Wed Apr 30 2008 Dwayne Bailey <dwayne at translate.org.za> - 0.1-6
- Adjust to changes in source package

* Thu Apr 17 2008 Dwayne Bailey <dwayne at translate.org.za> - 0.1-5
- Install icon

* Thu Apr 17 2008 Dwayne Bailey <dwayne at translate.org.za> - 0.1-4
- Build translatable files using intltool

* Mon Apr 14 2008 Dwayne Bailey <dwayne at translate.org.za> - 0.1-3
- Install translations

* Sat Apr 12 2008 Dwayne Bailey <dwayne at translate.org.za> - 0.1-2
- Executable s/run_virtaal.py/virtaal/
- Remove .glade movement, ./setup.py install it correctly now
- Install .desktop, locale, mime files
- Update desktop- and mime-database

* Sat Apr 5 2008 Dwayne Bailey <dwayne at translate.org.za> - 0.1-1
- Initial packaging


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/virtaal/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	4 Jan 2009 20:16:29 -0000	1.1
+++ .cvsignore	4 Jan 2009 21:58:02 -0000	1.2
@@ -0,0 +1 @@
+virtaal-0.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/virtaal/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	4 Jan 2009 20:16:30 -0000	1.1
+++ sources	4 Jan 2009 21:58:02 -0000	1.2
@@ -0,0 +1 @@
+cd01398cc6c916317829a88c72af2253  virtaal-0.2.tar.bz2



From dwayne at fedoraproject.org  Sun Jan  4 22:02:07 2009
From: dwayne at fedoraproject.org (Dwayne Bailey)
Date: Sun,  4 Jan 2009 22:02:07 +0000 (UTC)
Subject: rpms/virtaal/F-9 import.log, NONE,
	1.1 virtaal-0.2-setup_drop_MO_generation.patch, NONE,
	1.1 virtaal.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090104220207.1D63A70130@cvs1.fedora.phx.redhat.com>

Author: dwayne

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

Modified Files:
	.cvsignore sources 
Added Files:
	import.log virtaal-0.2-setup_drop_MO_generation.patch 
	virtaal.spec 
Log Message:
Import Virtaal 0.2 to F-9



--- NEW FILE import.log ---
virtaal-0_2-2_fc9:F-9:virtaal-0.2-2.fc9.src.rpm:1231106415

virtaal-0.2-setup_drop_MO_generation.patch:

--- NEW FILE virtaal-0.2-setup_drop_MO_generation.patch ---
diff -ur virtaal-0.2.old/setup.py virtaal-0.2/setup.py
--- virtaal-0.2.old/setup.py	2008-10-16 15:11:04.000000000 +0200
+++ virtaal-0.2/setup.py	2008-11-15 20:11:10.000000000 +0200
@@ -60,23 +60,6 @@
 ]
 #TODO: add Natural Language classifiers
 
-# Compile .mo files from available .po files
-from translate.tools.pocompile import convertmo
-mo_files = []
-
-for po_filename in glob.glob(path.join('po', '*.po')):
-    lang = path.split(po_filename[:-3])[1] # Chop off '.po'
-    mo_filename = path.join('mo', lang, 'virtaal.mo')
-
-    if not path.exists(path.join('mo', lang)):
-        os.makedirs(path.join('mo', lang))
-
-    convertmo(open(po_filename), open(mo_filename, 'w'), None)
-
-    mo_files.append(
-        ( path.join(TARGET_DATA_DIR, 'locale', lang, 'LC_MESSAGES'), [mo_filename])
-    )
-
 # Some of these depend on some files to be built externally before running 
 # setup.py, like the .xml and .desktop files
 options = {
@@ -84,7 +67,7 @@
         (path.join(TARGET_DATA_DIR, "virtaal"), glob.glob(path.join(SOURCE_DATA_DIR, "virtaal", "*.*"))),
         (path.join(TARGET_DATA_DIR, "virtaal", "autocorr"), glob.glob(path.join(SOURCE_DATA_DIR, "virtaal", "autocorr", "*"))),
         (path.join(TARGET_DATA_DIR, "icons"), glob.glob(path.join(SOURCE_DATA_DIR, "icons", "*.*"))),
-    ] + mo_files,
+    ],
     'scripts': [
         "bin/virtaal"
     ],


--- NEW FILE virtaal.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

Name:           virtaal
Version:        0.2
Release:        2%{?dist}
Summary:        Localization and translation editor

Group:          Development/Tools
License:        GPLv2+
URL:            http://translate.sourceforge.net/wiki/virtaal/index
Source0:        http://downloads.sourceforge.net/translate/%{name}-%{version}.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Patch0:         virtaal-0.2-setup_drop_MO_generation.patch

BuildArch:      noarch
BuildRequires:  python
BuildRequires:  python-devel
BuildRequires:  desktop-file-utils
BuildRequires:  gettext
BuildRequires:  intltool
Requires:       translate-toolkit >= 1.2
Requires:       pygtk2
Requires:       pygtk2-libglade
Requires:       python-lxml
Requires:       gnome-python2-gtkspell
Requires:       xdg-utils


%description
A program for Computer Aided Translation (CAT) built on the Translate Toolkit.

Virtaal includes features that allow a localizer to work effectively including:
syntax highlighting, autocomplete and autocorrect.  Showing only 
the data that is needed through its simple and effective user interface it
ensures that you can focus on the translation task straight away.

By building on the Translate Toolkit, Virtaal is able to edit any of the
following formats: XLIFF, Gettext PO and .mo, Qt .ts, .qph and .qm, Wordfast 
TM, TMX, TBX.  By using the Translate Toolkit converters a translator can edit:
OpenOffice.org SDF, Java (and Mozilla) .properties and Mozilla DTD.
 

%prep
%setup -q -n %{name}-%{version}
%patch0 -p1

%build
%{__python} setup.py build
./maketranslations %{name}
pushd po
for po in $(ls *.po | egrep -v de_DE)
do
    mkdir -p locale/$(basename $po .po)/LC_MESSAGES/
    msgfmt $po --output-file=locale/$(basename $po .po)/LC_MESSAGES/%{name}.mo
done
popd


%install
rm -rf %{buildroot}
%{__python} setup.py install -O1 --skip-build --install-data=/usr --root %{buildroot}

desktop-file-install                                     \
   --delete-original                                     \
   --dir=%{buildroot}%{_datadir}/applications            \
   %{buildroot}%{_datadir}/applications/%{name}.desktop
cp -rp po/locale %{buildroot}%{_datadir}/
%find_lang %{name}


%post
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


%postun
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


%clean
rm -rf %{buildroot}


%files -f %{name}.lang
%defattr(-,root,root,-)
%doc README LICENSE po/*.pot
%{_bindir}/*
%{_datadir}/applications/*
%{_datadir}/mime/packages/*
%{_datadir}/virtaal
%{_datadir}/icons/*
%{python_sitelib}/*


%changelog
* Sat Dec 6 2008 Dwayne Bailey <dwayne at translate.org.za> - 0.2-2
- Cleanups from package review

* Thu Oct 16 2008 Dwayne Bailey <dwayne at translate.org.za> - 0.2-1
- Build for final 0.2 release
- Add pygtk2-libglade dependency

* Thu Oct 2 2008 Dwayne Bailey <dwayne at translate.org.za> - 0.2-0.3.rc1
- Rebuild after tarball restructuring

* Wed Oct 1 2008 Dwayne Bailey <dwayne at translate.org.za> - 0.2-0.2.rc1
- Fix file locations

* Wed Oct 1 2008 Dwayne Bailey <dwayne at translate.org.za> - 0.2-0.1.rc1
- Update to RC1

* Sat Sep 20 2008 Dwayne Bailey <dwayne at translate.org.za> - 0.1-12
- Include LICENSE

* Thu Sep 11 2008 Dwayne Bailey <dwayne at translate.org.za> - 0.1-11
- Update for various file moves.
- Package virtaal.pot and gtk+-lite.pot
- Exclude the de_DE.mo debug translations

* Sat Jul 26 2008 Dwayne Bailey <dwayne at translate.org.za> - 0.1-10
- Package autocorrect files

* Thu Jul 24 2008 Dwayne Bailey <dwayne at translate.org.za> - 0.1-9
- Rebuild after upstream data location changes

* Tue Jun 3 2008 Dwayne Bailey <dwayne at translate.org.za> - 0.1-8
- Rebuild for fc9

* Fri May 9 2008 Dwayne Bailey <dwayne at translate.org.za> - 0.1-8
- Add xdg-utils as a requirement as we are using xdg-open

* Wed May 7 2008 Dwayne Bailey <dwayne at translate.org.za> - 0.1-7
- Adjust to changes in source package

* Wed Apr 30 2008 Dwayne Bailey <dwayne at translate.org.za> - 0.1-6
- Adjust to changes in source package

* Thu Apr 17 2008 Dwayne Bailey <dwayne at translate.org.za> - 0.1-5
- Install icon

* Thu Apr 17 2008 Dwayne Bailey <dwayne at translate.org.za> - 0.1-4
- Build translatable files using intltool

* Mon Apr 14 2008 Dwayne Bailey <dwayne at translate.org.za> - 0.1-3
- Install translations

* Sat Apr 12 2008 Dwayne Bailey <dwayne at translate.org.za> - 0.1-2
- Executable s/run_virtaal.py/virtaal/
- Remove .glade movement, ./setup.py install it correctly now
- Install .desktop, locale, mime files
- Update desktop- and mime-database

* Sat Apr 5 2008 Dwayne Bailey <dwayne at translate.org.za> - 0.1-1
- Initial packaging


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/virtaal/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	4 Jan 2009 20:16:29 -0000	1.1
+++ .cvsignore	4 Jan 2009 22:01:36 -0000	1.2
@@ -0,0 +1 @@
+virtaal-0.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/virtaal/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	4 Jan 2009 20:16:30 -0000	1.1
+++ sources	4 Jan 2009 22:01:36 -0000	1.2
@@ -0,0 +1 @@
+cd01398cc6c916317829a88c72af2253  virtaal-0.2.tar.bz2



From erikos at fedoraproject.org  Sun Jan  4 22:09:03 2009
From: erikos at fedoraproject.org (Simon Schampijer)
Date: Sun,  4 Jan 2009 22:09:03 +0000 (UTC)
Subject: rpms/sugar-toolkit/devel .cvsignore, 1.19, 1.20 sources, 1.23,
	1.24 sugar-toolkit.spec, 1.32, 1.33 session.patch, 1.1, NONE
Message-ID: <20090104220903.3325070130@cvs1.fedora.phx.redhat.com>

Author: erikos

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

Modified Files:
	.cvsignore sources sugar-toolkit.spec 
Removed Files:
	session.patch 
Log Message:
* Sun Jan 04 2009 Simon Schampijer <simon at laptop.org> - 0.83.3-1
- remove session shutdown patch
- add intltool as build requires
- new download url
- Fix palette highlighting on tray icons. Patch by benzea, style tweaks by marcopg
- Rework palette state logic. Fix #42
- Use g_timeout_add_seconds() for power efficiency
- Add colors to icons in menu items
- Add accelerator support to menu items
- Simplify activity bundle installation
- Dont pop down the palette when a submenu opens




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-toolkit/devel/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- .cvsignore	4 Nov 2008 10:29:07 -0000	1.19
+++ .cvsignore	4 Jan 2009 22:08:32 -0000	1.20
@@ -1 +1 @@
-sugar-toolkit-0.83.1.tar.bz2
+sugar-toolkit-0.83.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-toolkit/devel/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sources	28 Nov 2008 01:52:50 -0000	1.23
+++ sources	4 Jan 2009 22:08:32 -0000	1.24
@@ -1 +1 @@
-099a21f0063018a77c7fa548c76e96d6  sugar-toolkit-0.83.2.tar.bz2
+f6882ee56ed327c6680738133e911bf3  sugar-toolkit-0.83.3.tar.bz2


Index: sugar-toolkit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-toolkit/devel/sugar-toolkit.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- sugar-toolkit.spec	8 Dec 2008 16:18:17 -0000	1.32
+++ sugar-toolkit.spec	4 Jan 2009 22:08:32 -0000	1.33
@@ -2,17 +2,15 @@
 
 Summary: Sugar toolkit
 Name: sugar-toolkit
-Version: 0.83.2
-Release: 4%{?dist}
-URL: http://wiki.laptop.org/go/Sugar
-Source0: http://dev.laptop.org/pub/sugar/sources/%{name}/%{name}-%{version}.tar.bz2
+Version: 0.83.3
+Release: 1%{?dist}
+URL: http://sugarlabs.org
+Source0: http://download.sugarlabs.org/sources/sucrose/glucose/%{name}/%{name}-%{version}.tar.bz2
 Source1: macros.sugar
 License: LGPLv2
 Group: System Environment/Libraries
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Patch1: session.patch
-
 BuildRequires: pkgconfig
 BuildRequires: pygtk2-devel
 BuildRequires: gettext
@@ -20,6 +18,7 @@
 BuildRequires: perl-XML-Parser
 BuildRequires: libSM-devel
 BuildRequires: alsa-lib-devel
+BuildRequires: intltool
 
 Requires: gnome-python2-rsvg
 Requires: dbus-python
@@ -40,8 +39,6 @@
 %prep
 %setup -q
 
-%patch1 -p1 -b .session
-
 %build
 %configure
 make
@@ -64,6 +61,18 @@
 %{_sysconfdir}/rpm/macros.sugar
 
 %changelog
+* Sun Jan 04 2009 Simon Schampijer <simon at laptop.org> - 0.83.3-1
+- remove session shutdown patch
+- add intltool as build requires
+- new download url
+- Fix palette highlighting on tray icons. Patch by benzea, style tweaks by marcopg
+- Rework palette state logic. Fix #42
+- Use g_timeout_add_seconds() for power efficiency
+- Add colors to icons in menu items
+- Add accelerator support to menu items
+- Simplify activity bundle installation
+- Dont pop down the palette when a submenu opens 
+
 * Mon Dec  5 2008 Peter Robinson<pbrobinson at gmail.com> - 0.83.2-4
 - Rebuild for python 2.6
 


--- session.patch DELETED ---



From bpepple at fedoraproject.org  Sun Jan  4 22:18:37 2009
From: bpepple at fedoraproject.org (Brian Pepple)
Date: Sun,  4 Jan 2009 22:18:37 +0000 (UTC)
Subject: rpms/libnice/devel import.log, NONE, 1.1 libnice.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090104221837.2FDB870130@cvs1.fedora.phx.redhat.com>

Author: bpepple

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

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



--- NEW FILE import.log ---
libnice-0_0_4-1_fc10:HEAD:libnice-0.0.4-1.fc10.src.rpm:1231107495


--- NEW FILE libnice.spec ---
Name:           libnice
Version:        0.0.4
Release:        1%{?dist}
Summary:        GLib ICE implementation

Group:          System Environment/Libraries
License:        LGPLv2 and MPLv1.1
URL:            http://nice.freedesktop.org/wiki/
Source0:        http://nice.freedesktop.org/releases/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	glib2-devel
BuildRequires:  gstreamer-devel
BuildRequires:	gstreamer-plugins-base-devel


%description
%{name} is an implementation of the IETF's draft Interactive Connectivity
Establishment standard (ICE). ICE is useful for applications that want to
establish peer-to-peer UDP data streams. It automates the process of traversing
NATs and provides security against some attacks. Existing standards that use
ICE include the Session Initiation Protocol (SIP) and Jingle, XMPP extension
for audio/video calls.


%package        devel
Summary:        Development files for %{name}
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}
Requires:	glib2-devel
Requires:	pkgconfig


%description    devel
The %{name}-devel package contains libraries and header files for
developing applications that use %{name}.


%prep
%setup -q -n nice-%{version}


%build
%configure --disable-static
sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'


%clean
rm -rf $RPM_BUILD_ROOT


%post -p /sbin/ldconfig


%postun -p /sbin/ldconfig


%files
%defattr(-,root,root,-)
%doc NEWS README COPYING COPYING.LGPL COPYING.MPL
%{_bindir}/stunbdc
%{_bindir}/stund
%{_libdir}/gstreamer-0.10/libgstnice.so
%{_libdir}/*.so.*


%files devel
%defattr(-,root,root,-)
%{_includedir}/*
%{_libdir}/*.so
%{_libdir}/pkgconfig/nice.pc
%{_datadir}/gtk-doc/html/%{name}/


%changelog
* Sat Dec 27 2008 Brian Pepple <bpepple at fedoraproject.org> - 0.0.4-1
- Initial Fedora spec.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libnice/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	4 Jan 2009 20:17:28 -0000	1.1
+++ .cvsignore	4 Jan 2009 22:18:05 -0000	1.2
@@ -0,0 +1 @@
+libnice-0.0.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libnice/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	4 Jan 2009 20:17:28 -0000	1.1
+++ sources	4 Jan 2009 22:18:05 -0000	1.2
@@ -0,0 +1 @@
+3a5a68cbc58a2f2d53d00e8c2cbb1f7a  libnice-0.0.4.tar.gz



From timj at fedoraproject.org  Sun Jan  4 22:21:36 2009
From: timj at fedoraproject.org (Tim Jackson)
Date: Sun,  4 Jan 2009 22:21:36 +0000 (UTC)
Subject: rpms/php-pecl-apc/EL-4 php-pecl-apc.spec,1.8,1.9 sources,1.4,1.5
Message-ID: <20090104222136.DBE5B70130@cvs1.fedora.phx.redhat.com>

Author: timj

Update of /cvs/pkgs/rpms/php-pecl-apc/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6484

Modified Files:
	php-pecl-apc.spec sources 
Log Message:
Update to 3.0.19
Fix PHP Zend API/ABI dependencies to work on EL-4/5
Fix "License" tag
Fix encoding of "NOTICE" file
Add registration via PECL



Index: php-pecl-apc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php-pecl-apc/EL-4/php-pecl-apc.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- php-pecl-apc.spec	18 Feb 2008 22:30:49 -0000	1.8
+++ php-pecl-apc.spec	4 Jan 2009 22:21:06 -0000	1.9
@@ -1,31 +1,54 @@
+%{!?__pecl: %{expand: %%global __pecl %{_bindir}/pecl}}
 %define php_extdir %(php-config --extension-dir 2>/dev/null || echo %{_libdir}/php4)                     
+%global php_zendabiver %((echo 0; php -i 2>/dev/null | sed -n 's/^PHP Extension => //p') | tail -1)
+%global php_version %((echo 0; php-config --version 2>/dev/null) | tail -1)
+
+# This is not defined by the php-pear package on EL-4
+%define pecl_xmldir %{_datadir}/pear/.pkgxml
+
+%define pecl_name APC
+
 Summary:       APC caches and optimizes PHP intermediate code
 Name:          php-pecl-apc
-Version:       3.0.14
-Release:       3%{?dist}
-License:       PHP License
+Version:       3.0.19
+Release:       1%{?dist}
+License:       PHP
 Group:         Development/Languages
 URL:           http://pecl.php.net/package/APC
 Source:        http://pecl.php.net/get/APC-%{version}.tgz
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root
 Conflicts:     php-mmcache php-eaccelerator
-BuildRequires: php-devel httpd-devel
-Obsoletes:     php-apc
+BuildRequires: php-devel httpd-devel php-pear
+
+# Should be automatically pulled in by php-devel, but it isn't - see bug #453028
+BuildRequires: autoconf automake
+
+BuildRequires: libtool
+
 %if %{?php_zend_api}0
-Requires:     php(zend-abi) = %{php_zend_api}
-Requires:     php(api) = %{php_core_api}
+# Require clean ABI/API versions if available (Fedora)
+Requires:      php(zend-abi) = %{php_zend_api}
+Requires:      php(api) = %{php_core_api}
+%else
+%if "%{rhel}" == "5"
+# RHEL5 where we have php-common providing the Zend ABI the "old way"
+Requires:      php-zend-abi = %{php_zendabiver}
 %else
-Requires:     php-api = %{php_apiver}
+# RHEL4 where we have no php-common and nothing providing the Zend ABI...
+Requires:      php = %{php_version}
 %endif
-Provides:      php-apc = %{version}-%{release}
-Provides:     php-pecl(apc)
+%endif
+Provides:      php-pecl(%{pecl_name}) = %{version}
+
+Requires(post): %{__pecl}
+Requires(postun): %{__pecl}
 
 %description
-APC is a free, open, and robust framework for 
-caching and optimizing PHP intermediate code.
+APC is a free, open, and robust framework for caching and optimizing PHP
+intermediate code.
 
 %prep
-%setup -q -n APC-%{version}
+%setup -q -n %{pecl_name}-%{version}
 
 %build
 %{_bindir}/phpize
@@ -36,6 +59,10 @@
 %{__rm} -rf %{buildroot}
 %{__make} install INSTALL_ROOT=%{buildroot}
 
+# Install the package XML file
+%{__mkdir_p} %{buildroot}%{pecl_xmldir}
+%{__install} -m 644 ../package.xml %{buildroot}%{pecl_xmldir}/%{pecl_name}.xml
+
 # Drop in the bit of configuration
 %{__mkdir_p} %{buildroot}%{_sysconfdir}/php.d
 %{__cat} > %{buildroot}%{_sysconfdir}/php.d/apc.ini << 'EOF'
@@ -54,6 +81,19 @@
 apc.cache_by_default=1
 EOF
 
+# Fix the charset of NOTICE
+iconv -f iso-8859-1 -t utf8 NOTICE >NOTICE.utf8
+mv NOTICE.utf8 NOTICE
+
+%post
+%{__pecl} install --nodeps --soft --force --register-only --nobuild %{pecl_xmldir}/%{pecl_name}.xml >/dev/null || :
+
+
+%postun
+if [ $1 -eq 0 ]  ; then
+%{__pecl} uninstall --nodeps --ignore-errors --register-only %{pecl_name} >/dev/null || :
+fi
+
 %clean
 %{__rm} -rf %{buildroot}
 
@@ -62,8 +102,16 @@
 %doc TECHNOTES.txt CHANGELOG LICENSE NOTICE TODO INSTALL apc.php
 %config(noreplace) %{_sysconfdir}/php.d/apc.ini
 %{php_extdir}/apc.so
+%{pecl_xmldir}/%{pecl_name}.xml
 
 %changelog
+* Wed Jun 25 2008 Tim Jackson <rpm at timj.co.uk> - 3.0.19-1
+- Update to 3.0.19
+- Fix PHP Zend API/ABI dependencies to work on EL-4/5
+- Fix "License" tag
+- Fix encoding of "NOTICE" file
+- Add registration via PECL
+
 * Mon Feb 18 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 3.0.14-3
 - Autorebuild for GCC 4.3
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-pecl-apc/EL-4/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	28 Jun 2007 13:41:58 -0000	1.4
+++ sources	4 Jan 2009 22:21:06 -0000	1.5
@@ -1 +1 @@
-0f452f936239b6107d3e2e5cda4f4bda  APC-3.0.14.tgz
+951f43d2873e3572f5d5ae71a9b66f90  APC-3.0.19.tgz



From dwayne at fedoraproject.org  Sun Jan  4 22:22:30 2009
From: dwayne at fedoraproject.org (Dwayne Bailey)
Date: Sun,  4 Jan 2009 22:22:30 +0000 (UTC)
Subject: comps comps-f10.xml.in, 1.200, 1.201 comps-f11.xml.in, 1.47,
	1.48 comps-f9.xml.in, 1.429, 1.430
Message-ID: <20090104222230.D179E70130@cvs1.fedora.phx.redhat.com>

Author: dwayne

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

Modified Files:
	comps-f10.xml.in comps-f11.xml.in comps-f9.xml.in 
Log Message:
Add: virtaal



Index: comps-f10.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f10.xml.in,v
retrieving revision 1.200
retrieving revision 1.201
diff -u -r1.200 -r1.201
--- comps-f10.xml.in	1 Jan 2009 05:10:06 -0000	1.200
+++ comps-f10.xml.in	4 Jan 2009 22:21:59 -0000	1.201
@@ -1102,6 +1102,7 @@
       <packagereq type="optional">scribes</packagereq>
       <packagereq type="optional">scribes-templates</packagereq>
       <packagereq type="optional">vim-X11</packagereq>
+      <packagereq type="optional">virtaal</packagereq>
       <packagereq type="optional">xemacs</packagereq>
       <packagereq type="optional">xemacs-ess</packagereq>
       <packagereq type="optional">xemacs-muse</packagereq>


Index: comps-f11.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f11.xml.in,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- comps-f11.xml.in	1 Jan 2009 05:10:06 -0000	1.47
+++ comps-f11.xml.in	4 Jan 2009 22:22:00 -0000	1.48
@@ -1116,6 +1116,7 @@
       <packagereq type="optional">scribes</packagereq>
       <packagereq type="optional">scribes-templates</packagereq>
       <packagereq type="optional">vim-X11</packagereq>
+      <packagereq type="optional">virtaal</packagereq>
       <packagereq type="optional">xemacs</packagereq>
       <packagereq type="optional">xemacs-ess</packagereq>
       <packagereq type="optional">xemacs-muse</packagereq>


Index: comps-f9.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f9.xml.in,v
retrieving revision 1.429
retrieving revision 1.430
diff -u -r1.429 -r1.430
--- comps-f9.xml.in	1 Jan 2009 05:10:06 -0000	1.429
+++ comps-f9.xml.in	4 Jan 2009 22:22:00 -0000	1.430
@@ -1063,6 +1063,7 @@
       <packagereq type="optional">scribes</packagereq>
       <packagereq type="optional">scribes-templates</packagereq>
       <packagereq type="optional">vim-X11</packagereq>
+      <packagereq type="optional">virtaal</packagereq>
       <packagereq type="optional">xemacs</packagereq>
       <packagereq type="optional">xemacs-ess</packagereq>
       <packagereq type="optional">xemacs-muse</packagereq>



From erikos at fedoraproject.org  Sun Jan  4 22:28:31 2009
From: erikos at fedoraproject.org (Simon Schampijer)
Date: Sun,  4 Jan 2009 22:28:31 +0000 (UTC)
Subject: rpms/sugar-base/devel .cvsignore, 1.7, 1.8 sources, 1.7,
	1.8 sugar-base.spec, 1.10, 1.11
Message-ID: <20090104222831.50BFE70140@cvs1.fedora.phx.redhat.com>

Author: erikos

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

Modified Files:
	.cvsignore sources sugar-base.spec 
Log Message:
* Sun Jan 04 2009 Simon Schampijer <simon at schampijer.de> - 0.83.2-1
- add intltool as build dep
- new download url
- Adding language he, bi, hu, sw, cs, sv, sk, wa
- Updated translations




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-base/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	4 Nov 2008 10:13:02 -0000	1.7
+++ .cvsignore	4 Jan 2009 22:28:00 -0000	1.8
@@ -1 +1 @@
-sugar-base-0.83.1.tar.bz2
+sugar-base-0.83.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-base/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	4 Nov 2008 10:13:02 -0000	1.7
+++ sources	4 Jan 2009 22:28:00 -0000	1.8
@@ -1 +1 @@
-d1b9b9b32f14592d5a071af7f5787fb3  sugar-base-0.83.1.tar.bz2
+0f05d95eaf0f8e3174a3b3e3b0afe995  sugar-base-0.83.2.tar.bz2


Index: sugar-base.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-base/devel/sugar-base.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sugar-base.spec	29 Nov 2008 17:21:15 -0000	1.10
+++ sugar-base.spec	4 Jan 2009 22:28:00 -0000	1.11
@@ -2,11 +2,11 @@
 
 Summary: Base Sugar library
 Name: sugar-base
-Version: 0.83.1
-Release: 2%{?dist}
+Version: 0.83.2
+Release: 1%{?dist}
 #Release: 2.%{alphatag}%{?dist}
-URL: http://dev.laptop.org/
-Source0: http://dev.laptop.org/pub/sugar/sources/%{name}/%{name}-%{version}.tar.bz2
+URL: http://sugarlabs.org/
+Source0: http://download.sugarlabs.org/sources/sucrose/glucose/%{name}/%{name}-%{version}.tar.bz2
 License: LGPLv2
 Group: System Environment/Libraries
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -16,6 +16,7 @@
 BuildRequires: pygtk2-codegen
 BuildRequires: gettext
 BuildRequires: perl-XML-Parser
+BuildRequires: intltool
 
 %description
 
@@ -44,6 +45,12 @@
 %{python_sitelib}/*
 
 %changelog
+* Sun Jan 04 2009 Simon Schampijer <simon at schampijer.de> - 0.83.2-1
+- add intltool as build dep
+- new download url
+- Adding language he, bi, hu, sw, cs, sv, sk, wa
+- Updated translations
+
 * Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 0.83.1-2
 - Rebuild for Python 2.6
 



From pkgdb at fedoraproject.org  Sun Jan  4 22:34:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 04 Jan 2009 22:34:10 +0000
Subject: [pkgdb] php-pecl-apc: timj has requested watchbugzilla
Message-ID: <20090104223410.A68F1208D2B@bastion.fedora.phx.redhat.com>

timj has requested the watchbugzilla acl on php-pecl-apc (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/php-pecl-apc



From pkgdb at fedoraproject.org  Sun Jan  4 22:34:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 04 Jan 2009 22:34:17 +0000
Subject: [pkgdb] php-pecl-apc: timj has requested watchcommits
Message-ID: <20090104223417.927CF208D4F@bastion.fedora.phx.redhat.com>

timj has requested the watchcommits acl on php-pecl-apc (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/php-pecl-apc



From pkgdb at fedoraproject.org  Sun Jan  4 22:34:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 04 Jan 2009 22:34:36 +0000
Subject: [pkgdb] php-pecl-apc ownership updated
Message-ID: <20090104223437.00EDB2084B6@bastion.fedora.phx.redhat.com>

Package php-pecl-apc in Fedora EPEL 4 was orphaned by timj

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/php-pecl-apc



From cwickert at fedoraproject.org  Sun Jan  4 22:35:10 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Sun,  4 Jan 2009 22:35:10 +0000 (UTC)
Subject: rpms/xfce4-screenshooter/devel import.log, NONE,
	1.1 xfce4-screenshooter.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090104223510.080F470130@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/xfce4-screenshooter/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12162/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log xfce4-screenshooter.spec 
Log Message:
Initial import. Review at https://bugzilla.redhat.com/show_bug.cgi?id=478659



--- NEW FILE import.log ---
xfce4-screenshooter-1_4_90_0-1_fc11:HEAD:xfce4-screenshooter-1.4.90.0-1.fc11.src.rpm:1231108387


--- NEW FILE xfce4-screenshooter.spec ---
# Review at 
# Successor of the xfce4-screenshooter-plugin, which was reviewed at
# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=179202

Name:           xfce4-screenshooter
Version:        1.4.90.0
Release:        1%{?dist}
Summary:        Screenshot utility for the Xfce desktop

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
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  libxfcegui4-devel >= 4.4.0 
BuildRequires:  perl(XML::Parser) gettext intltool desktop-file-utils

%description
The Xfce Screenshooter utility allows you to capture the entire screen, the 
active window or a selected region. You can set the delay that elapses before 
the screenshot is taken and the action that will be done with the screenshot: 
save it to a PNG file, copy it to the clipboard, or open it using another 
application.

%package        plugin
Summary:        Screenshot utility for the Xfce panel
Group:          User Interface/Desktops
BuildRequires:  xfce4-panel-devel >= 4.4.0
Requires:       %{name} = %{version}-%{release}
Requires:       xfce4-panel >= 4.4.0

%description    plugin
The Xfce Screenshooter plugin allows you to take screenshots from the Xfce 
panel.


%prep
%setup -q


%build
%configure --disable-static
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
%find_lang %{name}
desktop-file-install --vendor ""                                \
        --dir ${RPM_BUILD_ROOT}%{_datadir}/applications         \
        --add-only-show-in=XFCE                                 \
        --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 -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog README
%{_bindir}/xfce4-screenshooter
%{_datadir}/applications/%{name}.desktop
%{_datadir}/icons/hicolor/*/apps/applets-screenshooter.png
%{_datadir}/icons/hicolor/scalable/apps/applets-screenshooter.svg
%{_datadir}/xfce4/doc/*/images/%{name}-dialog.png
%{_datadir}/xfce4/doc/*/%{name}.html
%{_mandir}/man1/*.1.gz


%files plugin
%defattr(-,root,root,-)
%{_libexecdir}/xfce4/panel-plugins/%{name}-plugin
%{_datadir}/xfce4/panel-plugins/*.desktop


%changelog
* Fri Jan 02 2009 Christoph Wickert <cwickert at fedoraproject.org> - 1.4.90.0-1
- Update to 1.4.90.0
- Split package into standalone app and panel plugin

* Thu Nov 27 2008 Christoph Wickert <cwickert at fedoraproject.org> - 1.4.0-1
- Update to 1.4.0

* Wed Aug 27 2008 Christoph Wickert <cwickert at fedoraproject.org> - 1.3.2-1
- Update to 1.3.2

* Wed Aug 27 2008 Christoph Wickert <cwickert at fedoraproject.org> - 1.3.2-1
- Update to 1.3.2

* Fri Jul 18 2008 Christoph Wickert <cwickert at fedoraproject.org> - 1.3.1-1
- Update to 1.3.1

* Wed Jul 16 2008 Christoph Wickert <cwickert at fedoraproject.org> - 1.3.0-1
- Update to 1.3.0

* Thu Jul 03 2008 Christoph Wickert <cwickert at fedoraproject.org> - 1.2.0-1
- Update to 1.2.0
- Include new xfce4-screenshooter manpage

* Sat Jun 22 2008 Christoph Wickert <cwickert at fedoraproject.org> - 1.1.0-1
- Update to 1.1.0
- BR gettext

* Mon Feb 18 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1.0.0-7
- Autorebuild for GCC 4.3

* Sat Aug 25 2007 Christoph Wickert <cwickert at fedoraproject.org> - 1.0.0-6
- Change license tag to GPLv2+

* Sat Apr 28 2007 Christoph Wickert <cwickert at fedoraproject.org> - 1.0.0-5
- Rebuild for Xfce 4.4.1

* Sun Jan 28 2007 Christoph Wickert <cwickert at fedoraproject.org> - 1.0.0-4
- Rebuild for XFCE 4.4.

* Thu Oct 05 2006 Christoph Wickert <cwickert at fedoraproject.org> - 1.0.0-3
- Bump release for devel checkin.

* Wed Sep 13 2006 Christoph Wickert <cwickert at fedoraproject.org> - 1.0.0-2
- Rebuild for XFCE 4.3.99.1.
- BR perl(XML::Parser).

* Mon Sep 04 2006 Christoph Wickert <cwickert at fedoraproject.org> - 1.0.0-1
- Update to 1.0.0 on XFCE 4.3.90.2.

* Mon Sep 04 2006 Christoph Wickert <cwickert at fedoraproject.org> - 0.0.8-4
- Mass rebuild for Fedora Core 6.

* Tue Apr 11 2006 Christoph Wickert <fedora.wickert at arcor.de> - 0.0.8-3
- Require xfce4-panel.

* Thu Feb 16 2006 Christoph Wickert <fedora.wickert at arcor.de> - 0.0.8-2
- Rebuild for Fedora Extras 5.

* Sat Jan 21 2006 Christoph Wickert <fedora.wickert at arcor.de> - 0.0.8-1
- Initial Fedora Extras version.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-screenshooter/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	4 Jan 2009 20:30:02 -0000	1.1
+++ .cvsignore	4 Jan 2009 22:34:39 -0000	1.2
@@ -0,0 +1 @@
+xfce4-screenshooter-1.4.90.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-screenshooter/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	4 Jan 2009 20:30:02 -0000	1.1
+++ sources	4 Jan 2009 22:34:39 -0000	1.2
@@ -0,0 +1 @@
+1bcd5d2e7428c7ced039be87dfa30d74  xfce4-screenshooter-1.4.90.0.tar.gz



From cwickert at fedoraproject.org  Sun Jan  4 22:46:10 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Sun,  4 Jan 2009 22:46:10 +0000 (UTC)
Subject: rpms/xfce4-screenshooter/devel xfce4-screenshooter.spec,1.1,1.2
Message-ID: <20090104224610.98E5270130@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/xfce4-screenshooter/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15558

Modified Files:
	xfce4-screenshooter.spec 
Log Message:
final fixes as propsed in the review


Index: xfce4-screenshooter.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-screenshooter/devel/xfce4-screenshooter.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xfce4-screenshooter.spec	4 Jan 2009 22:34:39 -0000	1.1
+++ xfce4-screenshooter.spec	4 Jan 2009 22:45:40 -0000	1.2
@@ -1,4 +1,4 @@
-# Review at 
+# Review at https://bugzilla.redhat.com/show_bug.cgi?id=478659
 # Successor of the xfce4-screenshooter-plugin, which was reviewed at
 # https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=179202
 
@@ -37,7 +37,8 @@
 
 %prep
 %setup -q
-
+# KDE and GNOME have their own screenshot utilis
+echo "NotShowIn=KDE;GNOME;" >> src/xfce4-screenshooter.desktop.in.in
 
 %build
 %configure --disable-static
@@ -50,7 +51,6 @@
 %find_lang %{name}
 desktop-file-install --vendor ""                                \
         --dir ${RPM_BUILD_ROOT}%{_datadir}/applications         \
-        --add-only-show-in=XFCE                                 \
         --delete-original                                       \
         ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop
 



From erikos at fedoraproject.org  Sun Jan  4 22:46:15 2009
From: erikos at fedoraproject.org (Simon Schampijer)
Date: Sun,  4 Jan 2009 22:46:15 +0000 (UTC)
Subject: rpms/sugar-artwork/devel .cvsignore, 1.10, 1.11 sources, 1.10,
	1.11 sugar-artwork.spec, 1.13, 1.14
Message-ID: <20090104224615.3D74370130@cvs1.fedora.phx.redhat.com>

Author: erikos

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

Modified Files:
	.cvsignore sources sugar-artwork.spec 
Log Message:
* Sun Jan 04 2009 Simon Schampijer <simon at laptop.org> - 0.83.2-1
- New icon for the wired network




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-artwork/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	4 Nov 2008 10:10:50 -0000	1.10
+++ .cvsignore	4 Jan 2009 22:45:44 -0000	1.11
@@ -1 +1 @@
-sugar-artwork-0.83.1.tar.bz2
+sugar-artwork-0.83.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-artwork/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	4 Nov 2008 10:10:50 -0000	1.10
+++ sources	4 Jan 2009 22:45:44 -0000	1.11
@@ -1 +1 @@
-358c00077cb5ce5d6e9a2378a1d73679  sugar-artwork-0.83.1.tar.bz2
+89219be4549bc6cb6a59062d06bec1e4  sugar-artwork-0.83.2.tar.bz2


Index: sugar-artwork.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-artwork/devel/sugar-artwork.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sugar-artwork.spec	4 Nov 2008 10:10:50 -0000	1.13
+++ sugar-artwork.spec	4 Jan 2009 22:45:44 -0000	1.14
@@ -3,15 +3,15 @@
 
 Summary: Artwork for Sugar look-and-feel
 Name: sugar-artwork
-Version: 0.83.1
+Version: 0.83.2
 Release: 1%{?dist}
 #Release: 2.%{alphatag}%{?dist}
-URL: http://dev.laptop.org
+URL: http://sugarlabs.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 
+Source0: http://download.sugarlabs.org/sources/sucrose/glucose/%{name}/%{name}-%{version}.tar.bz2 
 Group: User Interface/Desktops
 License: LGPLv2+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -64,6 +64,9 @@
 %{_libdir}/gtk-2.0/*/engines/*.so
 
 %changelog
+* Sun Jan 04 2009 Simon Schampijer <simon at laptop.org> - 0.83.2-1
+- New icon for the wired network
+
 * Tue Nov  4 2008 Marco Pesenti Gritti <mpg at redhat.com> - 0.83.1-1
 - Update to 0.83.1
 



From pfj at fedoraproject.org  Sun Jan  4 22:54:08 2009
From: pfj at fedoraproject.org (Paul F. Johnson)
Date: Sun,  4 Jan 2009 22:54:08 +0000 (UTC)
Subject: rpms/libgdiplus/devel .cvsignore, 1.20, 1.21 import.log, 1.7,
	1.8 libgdiplus.spec, 1.36, 1.37 sources, 1.23, 1.24
Message-ID: <20090104225408.C5ADE70130@cvs1.fedora.phx.redhat.com>

Author: pfj

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

Modified Files:
	.cvsignore import.log libgdiplus.spec sources 
Log Message:

Update from svn 



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libgdiplus/devel/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- .cvsignore	24 Dec 2008 22:37:09 -0000	1.20
+++ .cvsignore	4 Jan 2009 22:53:38 -0000	1.21
@@ -1 +1 @@
-libgdiplus-122059.tar.bz2
+libgdiplus-122354.tar.bz2


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/libgdiplus/devel/import.log,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- import.log	24 Dec 2008 22:37:09 -0000	1.7
+++ import.log	4 Jan 2009 22:53:38 -0000	1.8
@@ -5,3 +5,4 @@
 libgdiplus-2_2-1_pre1_fc10:HEAD:libgdiplus-2.2-1.pre1.fc10.src.rpm:1227618032
 libgdiplus-2_2-3_pre2_20081210svn118228_fc11:HEAD:libgdiplus-2.2-3.pre2.20081210svn118228.fc11.src.rpm:1229339579
 libgdiplus-2_2-4_RC1_20081224svn122059_fc11:HEAD:libgdiplus-2.2-4.RC1.20081224svn122059.fc11.src.rpm:1230158179
+libgdiplus-2_2-4_RC1_20090104svn122354_fc11:HEAD:libgdiplus-2.2-4.RC1.20090104svn122354.fc11.src.rpm:1231109575


Index: libgdiplus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libgdiplus/devel/libgdiplus.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- libgdiplus.spec	24 Dec 2008 22:37:09 -0000	1.36
+++ libgdiplus.spec	4 Jan 2009 22:53:38 -0000	1.37
@@ -1,8 +1,8 @@
-%define svnver 122059
+%define svnver 122354
 
 Name:           libgdiplus
 Version:        2.2
-Release:        4.RC1.20081224svn%{svnver}%{?dist}
+Release:        4.RC1.20090104svn%{svnver}%{?dist}
 Summary:        libgdiplus: An Open Source implementation of the GDI+ API
 
 Group:          System Environment/Libraries
@@ -61,6 +61,9 @@
 %{_libdir}/lib*.so
 
 %changelog
+* Sun Jan 04 2009 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.2-4.RC1.20090104svn122354
+- Update to svn
+
 * Wed Dec 24 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.2-4.RC1.20081224svn122059
 - Bump to RC1 branched svn
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libgdiplus/devel/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sources	24 Dec 2008 22:37:09 -0000	1.23
+++ sources	4 Jan 2009 22:53:38 -0000	1.24
@@ -1 +1 @@
-0ee844a701f813868a7af3ab08201a1c  libgdiplus-122059.tar.bz2
+f0c21613efbedfbe0dd7f0fdfc702dc0  libgdiplus-122354.tar.bz2



From cweyl at fedoraproject.org  Sun Jan  4 22:59:56 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Sun,  4 Jan 2009 22:59:56 +0000 (UTC)
Subject: rpms/perl-Directory-Scratch-Structured/devel import.log, NONE,
	1.1 perl-Directory-Scratch-Structured.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090104225956.DFBEB7013C@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Directory-Scratch-Structured/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20271/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-Directory-Scratch-Structured.spec 
Log Message:
initial import


--- NEW FILE import.log ---
perl-Directory-Scratch-Structured-0_04-1_fc10:HEAD:perl-Directory-Scratch-Structured-0.04-1.fc10.src.rpm:1231109951


--- NEW FILE perl-Directory-Scratch-Structured.spec ---
Name:       perl-Directory-Scratch-Structured 
Version:    0.04
Release:    1%{?dist}
# see lib/Directory/Scratch/Structured.pm
License:    GPL+ or Artistic
Group:      Development/Libraries
Summary:    Creates temporary files and directories from a structured description
Source:     http://search.cpan.org/CPAN/authors/id/N/NK/NKH/Directory-Scratch-Structured-%{version}.tar.gz 
Url:        http://search.cpan.org/dist/Directory-Scratch-Structured
BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
Requires:   perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
BuildArch:  noarch

BuildRequires: perl(ExtUtils::MakeMaker) 
BuildRequires: perl(Module::Build::Compat)
BuildRequires: perl(Data::TreeDumper)
BuildRequires: perl(Directory::Scratch)
BuildRequires: perl(Readonly)
BuildRequires: perl(Sub::Exporter)
BuildRequires: perl(Sub::Install)
BuildRequires: perl(Test::More)
BuildRequires: perl(Test::Block)
BuildRequires: perl(Test::Exception)
BuildRequires: perl(Test::NoWarnings)
BuildRequires: perl(Test::Strict)
BuildRequires: perl(Test::Warn)

%description
This module adds a _create_structured_tree_ subroutine to Directory::Scratch.
This method is useful to create a directory structure needed for temporary
purposes, e.g. for testing.

%prep
%setup -q -n Directory-Scratch-Structured-%{version}

find . -type f -exec chmod -c -x {} +

%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 README Changes 
%{perl_vendorlib}/*
%{_mandir}/man3/*.3*

%changelog
* Tue Dec 30 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.04-1
- remove author test br's (removed from t/)

* Sat Nov 29 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.03-1
- update for submission

* Sat Nov 29 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.03-0.1
- initial RPM packaging
- generated with cpan2dist (CPANPLUS::Dist::RPM version 0.0.5)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Directory-Scratch-Structured/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	4 Jan 2009 20:31:55 -0000	1.1
+++ .cvsignore	4 Jan 2009 22:59:26 -0000	1.2
@@ -0,0 +1 @@
+Directory-Scratch-Structured-0.04.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Directory-Scratch-Structured/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	4 Jan 2009 20:31:55 -0000	1.1
+++ sources	4 Jan 2009 22:59:26 -0000	1.2
@@ -0,0 +1 @@
+ef6155cc8a9723e0e9614508aa1c592d  Directory-Scratch-Structured-0.04.tar.gz



From erikos at fedoraproject.org  Sun Jan  4 22:59:55 2009
From: erikos at fedoraproject.org (Simon Schampijer)
Date: Sun,  4 Jan 2009 22:59:55 +0000 (UTC)
Subject: rpms/sugar-datastore/devel .cvsignore, 1.7, 1.8 sources, 1.7,
	1.8 sugar-datastore.spec, 1.9, 1.10
Message-ID: <20090104225955.D1F6A7013C@cvs1.fedora.phx.redhat.com>

Author: erikos

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

Modified Files:
	.cvsignore sources sugar-datastore.spec 
Log Message:
* Sun Jan 04 2009 Simon Schampijer <simon at laptop.org> - 0.83.1-1
- contains a bunch of stability and robustness improvements




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-datastore/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	4 Nov 2008 10:20:12 -0000	1.7
+++ .cvsignore	4 Jan 2009 22:59:24 -0000	1.8
@@ -1 +1 @@
-sugar-datastore-0.83.0.tar.bz2
+sugar-datastore-0.83.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-datastore/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	4 Nov 2008 10:20:12 -0000	1.7
+++ sources	4 Jan 2009 22:59:24 -0000	1.8
@@ -1 +1 @@
-9b8d9f6111f43004f32a61fd3fc98414  sugar-datastore-0.83.0.tar.bz2
+31f1b45406d42207ffcec8f3829dc12b  sugar-datastore-0.83.1.tar.bz2


Index: sugar-datastore.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-datastore/devel/sugar-datastore.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sugar-datastore.spec	29 Nov 2008 17:21:15 -0000	1.9
+++ sugar-datastore.spec	4 Jan 2009 22:59:24 -0000	1.10
@@ -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.83.0
-Release: 2%{?dist}
+Version: 0.83.1
+Release: 1%{?dist}
 Summary: Sugar Datastore
 
 Group: Development/Libraries
 License: GPLv2+
-URL: http://dev.laptop.org/
-Source0: http://dev.laptop.org/pub/sugar/sources/%{name}/%{name}-%{version}.tar.bz2
+URL: http://sugarlabs.org/
+Source0: http://download.sugarlabs.org/sources/sucrose/glucose/%{name}/%{name}-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: python-devel
@@ -46,6 +46,9 @@
 %{_datadir}/dbus-1/services/*.service
 
 %changelog
+* Sun Jan 04 2009 Simon Schampijer <simon at laptop.org> - 0.83.1-1
+- contains a bunch of stability and robustness improvements 
+
 * Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 0.83.0-2
 - Rebuild for Python 2.6
 



From cweyl at fedoraproject.org  Sun Jan  4 23:01:42 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Sun,  4 Jan 2009 23:01:42 +0000 (UTC)
Subject: rpms/perl-Directory-Scratch-Structured/F-10 import.log, NONE,
	1.1 perl-Directory-Scratch-Structured.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090104230142.D1B9A7013C@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Directory-Scratch-Structured/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21580/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-Directory-Scratch-Structured.spec 
Log Message:
initial import


--- NEW FILE import.log ---
perl-Directory-Scratch-Structured-0_04-1_fc10:F-10:perl-Directory-Scratch-Structured-0.04-1.fc10.src.rpm:1231110047


--- NEW FILE perl-Directory-Scratch-Structured.spec ---
Name:       perl-Directory-Scratch-Structured 
Version:    0.04
Release:    1%{?dist}
# see lib/Directory/Scratch/Structured.pm
License:    GPL+ or Artistic
Group:      Development/Libraries
Summary:    Creates temporary files and directories from a structured description
Source:     http://search.cpan.org/CPAN/authors/id/N/NK/NKH/Directory-Scratch-Structured-%{version}.tar.gz 
Url:        http://search.cpan.org/dist/Directory-Scratch-Structured
BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
Requires:   perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
BuildArch:  noarch

BuildRequires: perl(ExtUtils::MakeMaker) 
BuildRequires: perl(Module::Build::Compat)
BuildRequires: perl(Data::TreeDumper)
BuildRequires: perl(Directory::Scratch)
BuildRequires: perl(Readonly)
BuildRequires: perl(Sub::Exporter)
BuildRequires: perl(Sub::Install)
BuildRequires: perl(Test::More)
BuildRequires: perl(Test::Block)
BuildRequires: perl(Test::Exception)
BuildRequires: perl(Test::NoWarnings)
BuildRequires: perl(Test::Strict)
BuildRequires: perl(Test::Warn)

%description
This module adds a _create_structured_tree_ subroutine to Directory::Scratch.
This method is useful to create a directory structure needed for temporary
purposes, e.g. for testing.

%prep
%setup -q -n Directory-Scratch-Structured-%{version}

find . -type f -exec chmod -c -x {} +

%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 README Changes 
%{perl_vendorlib}/*
%{_mandir}/man3/*.3*

%changelog
* Tue Dec 30 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.04-1
- remove author test br's (removed from t/)

* Sat Nov 29 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.03-1
- update for submission

* Sat Nov 29 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.03-0.1
- initial RPM packaging
- generated with cpan2dist (CPANPLUS::Dist::RPM version 0.0.5)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Directory-Scratch-Structured/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	4 Jan 2009 20:31:55 -0000	1.1
+++ .cvsignore	4 Jan 2009 23:01:11 -0000	1.2
@@ -0,0 +1 @@
+Directory-Scratch-Structured-0.04.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Directory-Scratch-Structured/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	4 Jan 2009 20:31:55 -0000	1.1
+++ sources	4 Jan 2009 23:01:12 -0000	1.2
@@ -0,0 +1 @@
+ef6155cc8a9723e0e9614508aa1c592d  Directory-Scratch-Structured-0.04.tar.gz



From cweyl at fedoraproject.org  Sun Jan  4 23:03:03 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Sun,  4 Jan 2009 23:03:03 +0000 (UTC)
Subject: rpms/perl-Directory-Scratch-Structured/F-9 import.log, NONE,
	1.1 perl-Directory-Scratch-Structured.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090104230303.5EAF07013F@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Directory-Scratch-Structured/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22705/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-Directory-Scratch-Structured.spec 
Log Message:
initial import


--- NEW FILE import.log ---
perl-Directory-Scratch-Structured-0_04-1_fc10:F-9:perl-Directory-Scratch-Structured-0.04-1.fc10.src.rpm:1231110140


--- NEW FILE perl-Directory-Scratch-Structured.spec ---
Name:       perl-Directory-Scratch-Structured 
Version:    0.04
Release:    1%{?dist}
# see lib/Directory/Scratch/Structured.pm
License:    GPL+ or Artistic
Group:      Development/Libraries
Summary:    Creates temporary files and directories from a structured description
Source:     http://search.cpan.org/CPAN/authors/id/N/NK/NKH/Directory-Scratch-Structured-%{version}.tar.gz 
Url:        http://search.cpan.org/dist/Directory-Scratch-Structured
BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
Requires:   perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
BuildArch:  noarch

BuildRequires: perl(ExtUtils::MakeMaker) 
BuildRequires: perl(Module::Build::Compat)
BuildRequires: perl(Data::TreeDumper)
BuildRequires: perl(Directory::Scratch)
BuildRequires: perl(Readonly)
BuildRequires: perl(Sub::Exporter)
BuildRequires: perl(Sub::Install)
BuildRequires: perl(Test::More)
BuildRequires: perl(Test::Block)
BuildRequires: perl(Test::Exception)
BuildRequires: perl(Test::NoWarnings)
BuildRequires: perl(Test::Strict)
BuildRequires: perl(Test::Warn)

%description
This module adds a _create_structured_tree_ subroutine to Directory::Scratch.
This method is useful to create a directory structure needed for temporary
purposes, e.g. for testing.

%prep
%setup -q -n Directory-Scratch-Structured-%{version}

find . -type f -exec chmod -c -x {} +

%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 README Changes 
%{perl_vendorlib}/*
%{_mandir}/man3/*.3*

%changelog
* Tue Dec 30 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.04-1
- remove author test br's (removed from t/)

* Sat Nov 29 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.03-1
- update for submission

* Sat Nov 29 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.03-0.1
- initial RPM packaging
- generated with cpan2dist (CPANPLUS::Dist::RPM version 0.0.5)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Directory-Scratch-Structured/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	4 Jan 2009 20:31:55 -0000	1.1
+++ .cvsignore	4 Jan 2009 23:02:32 -0000	1.2
@@ -0,0 +1 @@
+Directory-Scratch-Structured-0.04.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Directory-Scratch-Structured/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	4 Jan 2009 20:31:55 -0000	1.1
+++ sources	4 Jan 2009 23:02:33 -0000	1.2
@@ -0,0 +1 @@
+ef6155cc8a9723e0e9614508aa1c592d  Directory-Scratch-Structured-0.04.tar.gz



From cwickert at fedoraproject.org  Sun Jan  4 23:03:23 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Sun,  4 Jan 2009 23:03:23 +0000 (UTC)
Subject: rpms/xfce4-screenshooter-plugin/devel dead.package, NONE,
	1.1 .cvsignore, 1.7, NONE Makefile, 1.1, NONE sources, 1.7,
	NONE xfce4-screenshooter-plugin.spec, 1.15, NONE
Message-ID: <20090104230323.D0D677013F@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/xfce4-screenshooter-plugin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23087/devel

Added Files:
	dead.package 
Removed Files:
	.cvsignore Makefile sources xfce4-screenshooter-plugin.spec 
Log Message:
obsolte package in F10 and devel because it has been superseded by xfce4-screenshooter


--- NEW FILE dead.package ---
xfce4-screenshooter-plugin is a subpackage of xfce4-screenshooter now (changed with 1.4.90.0).

--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- sources DELETED ---


--- xfce4-screenshooter-plugin.spec DELETED ---



From cwickert at fedoraproject.org  Sun Jan  4 23:03:24 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Sun,  4 Jan 2009 23:03:24 +0000 (UTC)
Subject: rpms/xfce4-screenshooter-plugin/F-10 dead.package, NONE,
	1.1 .cvsignore, 1.7, NONE Makefile, 1.1, NONE sources, 1.7,
	NONE xfce4-screenshooter-plugin.spec, 1.15, NONE
Message-ID: <20090104230324.B4FEA7013F@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/xfce4-screenshooter-plugin/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23087/F-10

Added Files:
	dead.package 
Removed Files:
	.cvsignore Makefile sources xfce4-screenshooter-plugin.spec 
Log Message:
obsolte package in F10 and devel because it has been superseded by xfce4-screenshooter


--- NEW FILE dead.package ---
xfce4-screenshooter-plugin is a subpackage of xfce4-screenshooter now (changed with 1.4.90.0).

--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- sources DELETED ---


--- xfce4-screenshooter-plugin.spec DELETED ---



From cwickert at fedoraproject.org  Sun Jan  4 23:06:20 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Sun,  4 Jan 2009 23:06:20 +0000 (UTC)
Subject: rpms/xfce4-screenshooter/F-10 xfce4-screenshooter.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090104230620.29D6D70130@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/xfce4-screenshooter/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25199

Modified Files:
	.cvsignore sources 
Added Files:
	xfce4-screenshooter.spec 
Log Message:
* Fri Jan 02 2009 Christoph Wickert <cwickert at fedoraproject.org> - 1.4.90.0-1
- Update to 1.4.90.0
- Split package into standalone app and panel plugin



--- NEW FILE xfce4-screenshooter.spec ---
# Review at https://bugzilla.redhat.com/show_bug.cgi?id=478659
# Successor of the xfce4-screenshooter-plugin, which was reviewed at
# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=179202

Name:           xfce4-screenshooter
Version:        1.4.90.0
Release:        1%{?dist}
Summary:        Screenshot utility for the Xfce desktop

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
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  libxfcegui4-devel >= 4.4.0 
BuildRequires:  perl(XML::Parser) gettext intltool desktop-file-utils

%description
The Xfce Screenshooter utility allows you to capture the entire screen, the 
active window or a selected region. You can set the delay that elapses before 
the screenshot is taken and the action that will be done with the screenshot: 
save it to a PNG file, copy it to the clipboard, or open it using another 
application.

%package        plugin
Summary:        Screenshot utility for the Xfce panel
Group:          User Interface/Desktops
BuildRequires:  xfce4-panel-devel >= 4.4.0
Requires:       %{name} = %{version}-%{release}
Requires:       xfce4-panel >= 4.4.0

%description    plugin
The Xfce Screenshooter plugin allows you to take screenshots from the Xfce 
panel.


%prep
%setup -q
# KDE and GNOME have their own screenshot utilis
echo "NotShowIn=KDE;GNOME;" >> src/xfce4-screenshooter.desktop.in.in

%build
%configure --disable-static
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
%find_lang %{name}
desktop-file-install --vendor ""                                \
        --dir ${RPM_BUILD_ROOT}%{_datadir}/applications         \
        --delete-original                                       \
        ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop


%clean
rm -rf $RPM_BUILD_ROOT


%post
touch --no-create %{_datadir}/icons/hicolor || :
if [ -x %{_bindir}/gtk-update-icon-cache ] ; then
        %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
fi


%postun
touch --no-create %{_datadir}/icons/hicolor || :
if [ -x %{_bindir}/gtk-update-icon-cache ] ; then
        %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
fi


%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog README
%{_bindir}/xfce4-screenshooter
%{_datadir}/applications/%{name}.desktop
%{_datadir}/icons/hicolor/*/apps/applets-screenshooter.png
%{_datadir}/icons/hicolor/scalable/apps/applets-screenshooter.svg
%{_datadir}/xfce4/doc/*/images/%{name}-dialog.png
%{_datadir}/xfce4/doc/*/%{name}.html
%{_mandir}/man1/*.1.gz


%files plugin
%defattr(-,root,root,-)
%{_libexecdir}/xfce4/panel-plugins/%{name}-plugin
%{_datadir}/xfce4/panel-plugins/*.desktop


%changelog
* Fri Jan 02 2009 Christoph Wickert <cwickert at fedoraproject.org> - 1.4.90.0-1
- Update to 1.4.90.0
- Split package into standalone app and panel plugin

* Thu Nov 27 2008 Christoph Wickert <cwickert at fedoraproject.org> - 1.4.0-1
- Update to 1.4.0

* Wed Aug 27 2008 Christoph Wickert <cwickert at fedoraproject.org> - 1.3.2-1
- Update to 1.3.2

* Wed Aug 27 2008 Christoph Wickert <cwickert at fedoraproject.org> - 1.3.2-1
- Update to 1.3.2

* Fri Jul 18 2008 Christoph Wickert <cwickert at fedoraproject.org> - 1.3.1-1
- Update to 1.3.1

* Wed Jul 16 2008 Christoph Wickert <cwickert at fedoraproject.org> - 1.3.0-1
- Update to 1.3.0

* Thu Jul 03 2008 Christoph Wickert <cwickert at fedoraproject.org> - 1.2.0-1
- Update to 1.2.0
- Include new xfce4-screenshooter manpage

* Sat Jun 22 2008 Christoph Wickert <cwickert at fedoraproject.org> - 1.1.0-1
- Update to 1.1.0
- BR gettext

* Mon Feb 18 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1.0.0-7
- Autorebuild for GCC 4.3

* Sat Aug 25 2007 Christoph Wickert <cwickert at fedoraproject.org> - 1.0.0-6
- Change license tag to GPLv2+

* Sat Apr 28 2007 Christoph Wickert <cwickert at fedoraproject.org> - 1.0.0-5
- Rebuild for Xfce 4.4.1

* Sun Jan 28 2007 Christoph Wickert <cwickert at fedoraproject.org> - 1.0.0-4
- Rebuild for XFCE 4.4.

* Thu Oct 05 2006 Christoph Wickert <cwickert at fedoraproject.org> - 1.0.0-3
- Bump release for devel checkin.

* Wed Sep 13 2006 Christoph Wickert <cwickert at fedoraproject.org> - 1.0.0-2
- Rebuild for XFCE 4.3.99.1.
- BR perl(XML::Parser).

* Mon Sep 04 2006 Christoph Wickert <cwickert at fedoraproject.org> - 1.0.0-1
- Update to 1.0.0 on XFCE 4.3.90.2.

* Mon Sep 04 2006 Christoph Wickert <cwickert at fedoraproject.org> - 0.0.8-4
- Mass rebuild for Fedora Core 6.

* Tue Apr 11 2006 Christoph Wickert <fedora.wickert at arcor.de> - 0.0.8-3
- Require xfce4-panel.

* Thu Feb 16 2006 Christoph Wickert <fedora.wickert at arcor.de> - 0.0.8-2
- Rebuild for Fedora Extras 5.

* Sat Jan 21 2006 Christoph Wickert <fedora.wickert at arcor.de> - 0.0.8-1
- Initial Fedora Extras version.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-screenshooter/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	4 Jan 2009 20:30:02 -0000	1.1
+++ .cvsignore	4 Jan 2009 23:05:49 -0000	1.2
@@ -0,0 +1 @@
+xfce4-screenshooter-1.4.90.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-screenshooter/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	4 Jan 2009 20:30:02 -0000	1.1
+++ sources	4 Jan 2009 23:05:49 -0000	1.2
@@ -0,0 +1 @@
+1bcd5d2e7428c7ced039be87dfa30d74  xfce4-screenshooter-1.4.90.0.tar.gz



From whot at fedoraproject.org  Sun Jan  4 23:08:53 2009
From: whot at fedoraproject.org (Peter Hutterer)
Date: Sun,  4 Jan 2009 23:08:53 +0000 (UTC)
Subject: rpms/xkeyboard-config/devel xkeyboard-config-1.4-abnt2.patch, NONE, 
	1.1 xkeyboard-config.spec, 1.29, 1.30
Message-ID: <20090104230853.35A8670130@cvs1.fedora.phx.redhat.com>

Author: whot

Update of /cvs/pkgs/rpms/xkeyboard-config/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25809

Modified Files:
	xkeyboard-config.spec 
Added Files:
	xkeyboard-config-1.4-abnt2.patch 
Log Message:
* Mon Jan 05 2009 Peter Hutterer <peter.hutterer at redhat.com> - 1.4-8
- xkeyboard-config-1.4-abnt2.patch: fix , and . mixup in abnt2 (#470153)


xkeyboard-config-1.4-abnt2.patch:

--- NEW FILE xkeyboard-config-1.4-abnt2.patch ---
>From b67326a9b271332c5bef23115d9c4ac7e7b2e6d9 Mon Sep 17 00:00:00 2001
From: Sergey V. Udaltsov <svu at gnome.org>
Date: Wed, 26 Nov 2008 23:19:41 +0000
Subject: [PATCH] fixed abnt2 keycodes, b.fd.o#18712

---
 ChangeLog      |    5 +++++
 keycodes/evdev |    1 +
 2 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/keycodes/evdev b/keycodes/evdev
index 760e2d0..9da2cd5 100644
--- a/keycodes/evdev
+++ b/keycodes/evdev
@@ -311,6 +311,7 @@ xkb_keycodes "jp106" {
 // For brazilian ABNT2 keyboard.
 xkb_keycodes "abnt2" {
     include "evdev(evdev)"
+    <KPPT> = 129;
 };
 
 // PC98
-- 
1.6.0.6



Index: xkeyboard-config.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xkeyboard-config/devel/xkeyboard-config.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- xkeyboard-config.spec	24 Nov 2008 03:56:27 -0000	1.29
+++ xkeyboard-config.spec	4 Jan 2009 23:08:22 -0000	1.30
@@ -4,7 +4,7 @@
 Summary: X Keyboard Extension configuration data
 Name: xkeyboard-config
 Version: 1.4
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: MIT
 Group: User Interface/X
 URL: http://www.freedesktop.org/wiki/Software/XKeyboardConfig
@@ -19,6 +19,8 @@
 Patch4: xkeyboard-config-1.4-battery.patch
 # Sent to svu
 Patch5: xkeyboard-config-1.4-jp-tilde.patch
+# RH 470153, FDO Bug 18712 (fixed), taken from git
+Patch6: xkeyboard-config-1.4-abnt2.patch
 
 BuildArch: noarch
 
@@ -100,6 +102,9 @@
 %{_datadir}/X11/xkb/rules/xorg.xml
 
 %changelog
+* Mon Jan 05 2009 Peter Hutterer <peter.hutterer at redhat.com> - 1.4-8
+- xkeyboard-config-1.4-abnt2.patch: fix , and . mixup in abnt2 (#470153)
+
 * Mon Nov 24 2008 Peter Hutterer <peter.hutterer at redhat.com> - 1.4-7
 - Switch to using git patches, modelled after xorg-x11-server.
 - CVS remove unused patches.



From pfj at fedoraproject.org  Sun Jan  4 23:11:01 2009
From: pfj at fedoraproject.org (Paul F. Johnson)
Date: Sun,  4 Jan 2009 23:11:01 +0000 (UTC)
Subject: rpms/mono/devel .cvsignore, 1.31, 1.32 import.log, 1.30,
	1.31 mono.spec, 1.103, 1.104 sources, 1.37, 1.38
Message-ID: <20090104231101.9133570130@cvs1.fedora.phx.redhat.com>

Author: pfj

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

Modified Files:
	.cvsignore import.log mono.spec sources 
Log Message:

Update from svn 



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mono/devel/.cvsignore,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- .cvsignore	31 Dec 2008 17:12:55 -0000	1.31
+++ .cvsignore	4 Jan 2009 23:10:30 -0000	1.32
@@ -1 +1 @@
-mono-122288.tar.bz2
+mono-122388.tar.bz2


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/mono/devel/import.log,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- import.log	31 Dec 2008 17:12:55 -0000	1.30
+++ import.log	4 Jan 2009 23:10:30 -0000	1.31
@@ -28,3 +28,4 @@
 mono-2_2-14_RC1_20081223svn122032_fc11:HEAD:mono-2.2-14.RC1.20081223svn122032.fc11.src.rpm:1230112849
 mono-2_2-15_RC1_20081229svn122181_fc11:HEAD:mono-2.2-15.RC1.20081229svn122181.fc11.src.rpm:1230645701
 mono-2_2-15_RC1_20081231svn122288_fc11:HEAD:mono-2.2-15.RC1.20081231svn122288.fc11.src.rpm:1230743514
+mono-2_2-15_RC1_20090401svn122388_fc11:HEAD:mono-2.2-15.RC1.20090401svn122388.fc11.src.rpm:1231110581


Index: mono.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mono/devel/mono.spec,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -r1.103 -r1.104
--- mono.spec	31 Dec 2008 17:12:55 -0000	1.103
+++ mono.spec	4 Jan 2009 23:10:30 -0000	1.104
@@ -1,8 +1,8 @@
-%define svnver 122288
+%define svnver 122388
 
 Name:		mono
 Version:        2.2
-Release:        15.RC1.20081231svn%{svnver}%{?dist}
+Release:        15.RC1.20090401svn%{svnver}%{?dist}
 Summary:        A .NET runtime environment
 
 Group:          Development/Languages
@@ -690,6 +690,9 @@
 %{_libdir}/pkgconfig/monodoc.pc
 
 %changelog
+* Sun Jan 04 2009 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.2-15.RC1.20090401svn122388
+- Updates from svn
+
 * Wed Dec 31 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.2-15.RC1.20081231svn122288
 - Important updates from svn
 
@@ -701,7 +704,6 @@
 - Update from svn
 - Minor spec file cleanups
 
-
 * Fri Dec 19 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.2-14.pre3.20081219svn121833
 - Get PPC to build itself, will be disabled from the next build
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mono/devel/sources,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- sources	31 Dec 2008 17:12:55 -0000	1.37
+++ sources	4 Jan 2009 23:10:30 -0000	1.38
@@ -1 +1 @@
-1ca6db93dccd3bbfc9d65b5a260af125  mono-122288.tar.bz2
+fa7ec2cb621a4f96745fcd68c9558c3f  mono-122388.tar.bz2



From pfj at fedoraproject.org  Sun Jan  4 23:15:26 2009
From: pfj at fedoraproject.org (Paul F. Johnson)
Date: Sun,  4 Jan 2009 23:15:26 +0000 (UTC)
Subject: rpms/mono-tools/devel .cvsignore, 1.8, 1.9 import.log, 1.17,
	1.18 mono-tools.spec, 1.22, 1.23 sources, 1.9, 1.10
Message-ID: <20090104231526.3A5A770130@cvs1.fedora.phx.redhat.com>

Author: pfj

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

Modified Files:
	.cvsignore import.log mono-tools.spec sources 
Log Message:

Update from svn 



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mono-tools/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	30 Dec 2008 14:28:55 -0000	1.8
+++ .cvsignore	4 Jan 2009 23:14:55 -0000	1.9
@@ -1 +1 @@
-mono-tools-122166.tar.bz2
+mono-tools-122377.tar.bz2


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/mono-tools/devel/import.log,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- import.log	30 Dec 2008 14:28:55 -0000	1.17
+++ import.log	4 Jan 2009 23:14:55 -0000	1.18
@@ -15,3 +15,4 @@
 mono-tools-2_2-7_pre3_20081217svn121681_fc11:HEAD:mono-tools-2.2-7.pre3.20081217svn121681.fc11.src.rpm:1229522027
 mono-tools-2_2-9_RC1_20081224svn122098_fc11:HEAD:mono-tools-2.2-9.RC1.20081224svn122098.fc11.src.rpm:1230158733
 mono-tools-2_2-9_RC1_20081230svn122166_fc11:HEAD:mono-tools-2.2-9.RC1.20081230svn122166.fc11.src.rpm:1230647227
+mono-tools-2_2-9_RC1_20090104svn122377_fc11:HEAD:mono-tools-2.2-9.RC1.20090104svn122377.fc11.src.rpm:1231110855


Index: mono-tools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mono-tools/devel/mono-tools.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- mono-tools.spec	30 Dec 2008 14:28:55 -0000	1.22
+++ mono-tools.spec	4 Jan 2009 23:14:55 -0000	1.23
@@ -1,10 +1,10 @@
 %define debug_package %{nil}
-%define svnver 122166
+%define svnver 122377
 
 Summary: A collection of tools for mono applications
 Name: mono-tools
 Version: 2.2
-Release: 9.RC1.20081230svn%{svnver}%{?dist}
+Release: 9.RC1.20090104svn%{svnver}%{?dist}
 License: MIT
 Group: Development/Tools
 Source0: %{name}-%{svnver}.tar.bz2
@@ -133,6 +133,9 @@
 %{_libdir}/monodoc/sources/Gendarme*
 
 %changelog
+* Sun Jan 04 2009  Paul F. Johnson <paul at all-the-johnsons.co.uk> -.2.2-9.RC1.20090104svn122377
+- update from svn
+
 * Tue Dec 30 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> -.2.2-9.RC1.20081230svn122166
 - update from svn
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mono-tools/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	30 Dec 2008 14:28:55 -0000	1.9
+++ sources	4 Jan 2009 23:14:55 -0000	1.10
@@ -1 +1 @@
-277ecf8802fa9d259583f990cd8a4f00  mono-tools-122166.tar.bz2
+94609bbb5292a48c132f0a3bc660c9d4  mono-tools-122377.tar.bz2



From whot at fedoraproject.org  Sun Jan  4 23:15:54 2009
From: whot at fedoraproject.org (Peter Hutterer)
Date: Sun,  4 Jan 2009 23:15:54 +0000 (UTC)
Subject: rpms/xkeyboard-config/F-10 xkeyboard-config-1.4-abnt2.patch, NONE, 
	1.1 xkeyboard-config.spec, 1.26, 1.27
Message-ID: <20090104231554.7243770130@cvs1.fedora.phx.redhat.com>

Author: whot

Update of /cvs/pkgs/rpms/xkeyboard-config/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27763

Modified Files:
	xkeyboard-config.spec 
Added Files:
	xkeyboard-config-1.4-abnt2.patch 
Log Message:
* Mon Jan 05 2009 Peter Hutterer <peter.hutterer at redhat.com> - 1.4-6
- xkeyboard-config-1.4-abnt2.patch: fix , and . mixup in abnt2 (#470153)



xkeyboard-config-1.4-abnt2.patch:

--- NEW FILE xkeyboard-config-1.4-abnt2.patch ---
>From b67326a9b271332c5bef23115d9c4ac7e7b2e6d9 Mon Sep 17 00:00:00 2001
From: Sergey V. Udaltsov <svu at gnome.org>
Date: Wed, 26 Nov 2008 23:19:41 +0000
Subject: [PATCH] fixed abnt2 keycodes, b.fd.o#18712

---
 ChangeLog      |    5 +++++
 keycodes/evdev |    1 +
 2 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/keycodes/evdev b/keycodes/evdev
index 760e2d0..9da2cd5 100644
--- a/keycodes/evdev
+++ b/keycodes/evdev
@@ -311,6 +311,7 @@ xkb_keycodes "jp106" {
 // For brazilian ABNT2 keyboard.
 xkb_keycodes "abnt2" {
     include "evdev(evdev)"
+    <KPPT> = 129;
 };
 
 // PC98
-- 
1.6.0.6



Index: xkeyboard-config.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xkeyboard-config/F-10/xkeyboard-config.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- xkeyboard-config.spec	12 Nov 2008 23:33:43 -0000	1.26
+++ xkeyboard-config.spec	4 Jan 2009 23:15:24 -0000	1.27
@@ -4,7 +4,7 @@
 Summary: xkeyboard-config alternative xkb data files
 Name: xkeyboard-config
 Version: 1.4
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: MIT
 Group: User Interface/X
 URL: http://www.x.org
@@ -19,6 +19,8 @@
 Patch4: xkeyboard-config-1.4-battery.patch
 # Sent to svu
 Patch5: xkeyboard-config-1.4-jp-tilde.patch
+# RH 470153, FDO Bug 18712 (fixed), taken from git
+Patch6: xkeyboard-config-1.4-abnt2.patch
 
 BuildArch: noarch
 
@@ -53,6 +55,7 @@
 %patch3 -p1 -b .tj-variants
 %patch4 -p1 -b .battery
 %patch5 -p1 -b .jp-tilde
+%patch6 -p1 -b .abnt2
 
 %build
 %configure \
@@ -92,6 +95,9 @@
 %{_datadir}/X11/xkb/rules/xorg.xml
 
 %changelog
+* Mon Jan 05 2009 Peter Hutterer <peter.hutterer at redhat.com> - 1.4-6
+- xkeyboard-config-1.4-abnt2.patch: fix , and . mixup in abnt2 (#470153)
+
 * Tue Nov 13 2008 Peter Hutterer  <peter.hutterer at redhat.com> - 1.4-5
 - xkeyboard-config-1.4-jp-tilde.patch: TLDE in jp is Zenkaku/Hankaku, and BKSL
   should be bracket right/brace right (#469537).



From pfj at fedoraproject.org  Sun Jan  4 23:20:37 2009
From: pfj at fedoraproject.org (Paul F. Johnson)
Date: Sun,  4 Jan 2009 23:20:37 +0000 (UTC)
Subject: rpms/monodevelop/devel .cvsignore, 1.14, 1.15 import.log, 1.12,
	1.13 monodevelop-2.spec, 1.4, 1.5 sources, 1.14, 1.15
Message-ID: <20090104232037.DECC370130@cvs1.fedora.phx.redhat.com>

Author: pfj

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

Modified Files:
	.cvsignore import.log monodevelop-2.spec sources 
Log Message:

Update from svn
Changed version number as 1.9.1 is in the wild....



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/monodevelop/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	30 Dec 2008 14:35:32 -0000	1.14
+++ .cvsignore	4 Jan 2009 23:20:07 -0000	1.15
@@ -1 +1 @@
-monodevelop-122192.tar.bz2
+monodevelop-122336.tar.bz2


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/monodevelop/devel/import.log,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- import.log	30 Dec 2008 14:35:32 -0000	1.12
+++ import.log	4 Jan 2009 23:20:07 -0000	1.13
@@ -10,3 +10,4 @@
 monodevelop-1_9_1-6_pre1_20081218svn121699_fc11:HEAD:monodevelop-1.9.1-6.pre1.20081218svn121699.fc11.src.rpm:1229595136
 monodevelop-1_9_1-6_pre1_20081224svn122090_fc11:HEAD:monodevelop-1.9.1-6.pre1.20081224svn122090.fc11.src.rpm:1230160103
 monodevelop-1_9_1-6_pre1_20081230svn122192_fc11:HEAD:monodevelop-1.9.1-6.pre1.20081230svn122192.fc11.src.rpm:1230647557
+monodevelop-1_9_2-pre1_20090104svn122336_fc11:HEAD:monodevelop-1.9.2-pre1.20090104svn122336.fc11.src.rpm:1231111150


Index: monodevelop-2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/monodevelop/devel/monodevelop-2.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- monodevelop-2.spec	30 Dec 2008 14:35:32 -0000	1.4
+++ monodevelop-2.spec	4 Jan 2009 23:20:07 -0000	1.5
@@ -8,12 +8,12 @@
 #%(gacutil -l nunit.core | tail -n 2 | grep nunit.core | cut -d "=" -f 2 | cut -d "," -f 1)
 %define nunitver 2.2.10.0
 
-%define svnver 122192
+%define svnver 122336
 
 
 Name:           monodevelop
-Version:        1.9.1
-Release:        6.pre1.20081230svn%{svnver}%{?dist}
+Version:        1.9.2
+Release:        pre1.20090104svn%{svnver}%{?dist}
 Summary:        A full-featured IDE for Mono and Gtk#
 
 Group:          Development/Tools
@@ -160,6 +160,10 @@
 %{_libdir}/pkgconfig/monodevelop*.pc
 
 %changelog
+* Sun Jan 04 2009 Paul F. Johnson <paul at all-the-johnsons.co.uk> 1.9.2-pre1.200900104svn122336
+- Update from svn
+- Reversioned as 1.9.1 is out there already
+
 * Tue Dec 30 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> 1.9.1-7.pre1.20081230svn122192
 - Update from svn
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/monodevelop/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	30 Dec 2008 14:35:32 -0000	1.14
+++ sources	4 Jan 2009 23:20:07 -0000	1.15
@@ -1 +1 @@
-bb5ddda224ed81b2e829b38235efd70a  monodevelop-122192.tar.bz2
+b248d3f8e8f6d2c954b64cc0dee24bb8  monodevelop-122336.tar.bz2



From rdieter at fedoraproject.org  Sun Jan  4 23:24:27 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sun,  4 Jan 2009 23:24:27 +0000 (UTC)
Subject: rpms/eigen2/devel .cvsignore, 1.4, 1.5 eigen2.spec, 1.3, 1.4 sources,
	1.4, 1.5
Message-ID: <20090104232427.AA91D70130@cvs1.fedora.phx.redhat.com>

Author: rdieter

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

Modified Files:
	.cvsignore eigen2.spec sources 
Log Message:
* Sun Jan 04 2009 Rex Dieter <rdieter at fedoraproject.org> 2.0-0.6.beta4
- eigen-2.0-beta4



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/eigen2/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	8 Dec 2008 14:53:18 -0000	1.4
+++ .cvsignore	4 Jan 2009 23:23:57 -0000	1.5
@@ -1 +1 @@
-eigen-2.0-beta2.tar.bz2
+eigen-2.0-beta4.tar.bz2


Index: eigen2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eigen2/devel/eigen2.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- eigen2.spec	8 Dec 2008 14:53:18 -0000	1.3
+++ eigen2.spec	4 Jan 2009 23:23:57 -0000	1.4
@@ -3,16 +3,16 @@
 # http://bugzilla.redhat.com/459705
 
 %define _with_check -DBUILD_TESTS=ON 
-%define pre beta2
+%define pre beta4
 
 Name:    eigen2
 Summary: A lightweight C++ template library for vector and matrix math
 Version: 2.0 
-Release: 0.5.%{pre}%{?dist} 
+Release: 0.6.%{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
+Source0: http://eigen.tuxfamily.org/eigen-%{version}-%{pre}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 
@@ -82,6 +82,9 @@
 
 
 %changelog
+* Sun Jan 04 2009 Rex Dieter <rdieter at fedoraproject.org> 2.0-0.6.beta4
+- eigen-2.0-beta4
+
 * Mon Dec 08 2008 Rex Dieter <rdieter at fedoraproject.org> 2.0-0.5.beta2
 - eigen-2.0-beta2
 - (re)enable buildtime test


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eigen2/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	8 Dec 2008 14:53:18 -0000	1.4
+++ sources	4 Jan 2009 23:23:57 -0000	1.5
@@ -1 +1 @@
-22b55e388a602e0fa7e2098124f39f71  eigen-2.0-beta2.tar.bz2
+2a83362c251da812be16963da0186ad5  eigen-2.0-beta4.tar.bz2



From twaugh at fedoraproject.org  Sun Jan  4 23:26:29 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Sun,  4 Jan 2009 23:26:29 +0000 (UTC)
Subject: rpms/expendable/devel expendable-0.0.8.tar.bz2.sig, NONE,
	1.1 .cvsignore, 1.7, 1.8 expendable.spec, 1.15, 1.16 sources,
	1.7, 1.8 expendable-0.0.7.tar.bz2.sig, 1.1, NONE
Message-ID: <20090104232629.5280870130@cvs1.fedora.phx.redhat.com>

Author: twaugh

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

Modified Files:
	.cvsignore expendable.spec sources 
Added Files:
	expendable-0.0.8.tar.bz2.sig 
Removed Files:
	expendable-0.0.7.tar.bz2.sig 
Log Message:
* Sun Jan  4 2009 Tim Waugh <twaugh at redhat.com> 0.0.8-1
- 0.0.8.



--- NEW FILE expendable-0.0.8.tar.bz2.sig ---
??

Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/expendable/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	11 Nov 2008 10:08:59 -0000	1.7
+++ .cvsignore	4 Jan 2009 23:25:58 -0000	1.8
@@ -4,3 +4,4 @@
 expendable-0.0.5.tar.bz2
 expendable-0.0.6.tar.bz2
 expendable-0.0.7.tar.bz2
+expendable-0.0.8.tar.bz2


Index: expendable.spec
===================================================================
RCS file: /cvs/pkgs/rpms/expendable/devel/expendable.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- expendable.spec	1 Dec 2008 15:00:23 -0000	1.15
+++ expendable.spec	4 Jan 2009 23:25:58 -0000	1.16
@@ -1,7 +1,7 @@
 Summary: Home finances modeling program
 Name: expendable
-Version: 0.0.7
-Release: 2%{?dist}
+Version: 0.0.8
+Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/Productivity
 URL: https://fedorahosted.org/expendable/
@@ -83,6 +83,9 @@
 %{_datadir}/applications/*.desktop
 
 %changelog
+* Sun Jan  4 2009 Tim Waugh <twaugh at redhat.com> 0.0.8-1
+- 0.0.8.
+
 * Mon Dec 01 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 0.0.7-2
 - Rebuild for Python 2.6
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/expendable/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	11 Nov 2008 10:08:59 -0000	1.7
+++ sources	4 Jan 2009 23:25:58 -0000	1.8
@@ -1 +1 @@
-e14f73b0aedfb9cee9bf196a38e9991c  expendable-0.0.7.tar.bz2
+b261185e32c8966837435607fbb455bc  expendable-0.0.8.tar.bz2


--- expendable-0.0.7.tar.bz2.sig DELETED ---



From whot at fedoraproject.org  Sun Jan  4 23:41:19 2009
From: whot at fedoraproject.org (Peter Hutterer)
Date: Sun,  4 Jan 2009 23:41:19 +0000 (UTC)
Subject: rpms/xorg-x11-drv-synaptics/devel 10-synaptics.fdi, 1.4,
	1.5 xorg-x11-drv-synaptics.spec, 1.16, 1.17
Message-ID: <20090104234119.480F570130@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-serv5268

Modified Files:
	10-synaptics.fdi xorg-x11-drv-synaptics.spec 
Log Message:
* Mon Jan 05 2009 Peter Hutterer <peter.hutterer at redhat.com> 0.99.3-3
- Require xorg-x11-server-sdk 1.6 to build
- Update fdi file with comments on how to merge your own keys.




Index: 10-synaptics.fdi
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-synaptics/devel/10-synaptics.fdi,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- 10-synaptics.fdi	3 Dec 2008 23:39:58 -0000	1.4
+++ 10-synaptics.fdi	4 Jan 2009 23:40:48 -0000	1.5
@@ -2,6 +2,20 @@
 <deviceinfo version="0.2">
   <device>
     <match key="info.capabilities" contains="input.touchpad">
+        <!-- To add custom options for the touchpad, modify the examples below
+             to suit your needs. The available options are listed in the
+             "synaptics" man page. After modifyfing this file, you must
+             restart HAL. Check the output of lshal whether your modifications
+             have been merged successfully.
+
+             Note: Options must always be type "string".
+             The following examples enable left, right, middle clicks on
+             single, double, triple finger tapping, respectively.
+
+             <merge key="input.x11_options.TapButton1" type="string">1</merge>
+             <merge key="input.x11_options.TapButton2" type="string">3</merge>
+             <merge key="input.x11_options.TapButton3" type="string">2</merge>
+        -->
 	<merge key="input.x11_driver" type="string">synaptics</merge>
     </match>
   </device>


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.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- xorg-x11-drv-synaptics.spec	22 Dec 2008 01:49:17 -0000	1.16
+++ xorg-x11-drv-synaptics.spec	4 Jan 2009 23:40:48 -0000	1.17
@@ -7,7 +7,7 @@
 Name:           xorg-x11-drv-synaptics
 Summary:        Xorg X11 Synaptics touchpad input driver
 Version:        0.99.3
-Release:        2%{?dist}
+Release:        3%{?dist}
 URL:            http://www.x.org
 License:        MIT
 Group:          User Interface/X Hardware Support
@@ -21,10 +21,10 @@
 ExcludeArch:    s390 s390x
 
 BuildRequires:  libtool pkgconfig
-BuildRequires:  xorg-x11-server-sdk >= 1.3.0.0-6
+BuildRequires:  xorg-x11-server-sdk >= 1.5.99.3-1
 BuildRequires:  libX11-devel
 
-Requires:       xorg-x11-server-Xorg >= 1.3.0.0-6
+Requires:       xorg-x11-server-Xorg >= 1.5.99.3-1
 Requires:       hal
 
 Provides:       synaptics = %{version}-%{release}
@@ -121,6 +121,10 @@
 
 
 %changelog
+* Mon Jan 05 2009 Peter Hutterer <peter.hutterer at redhat.com> 0.99.3-3
+- Require xorg-x11-server-sdk 1.6 to build
+- Update fdi file with comments on how to merge your own keys.
+
 * Mon Dec 22 2008 Peter Hutterer <peter.hutterer at redhat.com> 0.99.3-2
 - Rebuild for server 1.6
 



From twaugh at fedoraproject.org  Sun Jan  4 23:41:35 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Sun,  4 Jan 2009 23:41:35 +0000 (UTC)
Subject: rpms/expendable/F-10 expendable-0.0.8.tar.bz2.sig, NONE,
	1.1 .cvsignore, 1.7, 1.8 expendable.spec, 1.14, 1.15 sources,
	1.7, 1.8 expendable-0.0.7.tar.bz2.sig, 1.1, NONE
Message-ID: <20090104234135.2C23170130@cvs1.fedora.phx.redhat.com>

Author: twaugh

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

Modified Files:
	.cvsignore expendable.spec sources 
Added Files:
	expendable-0.0.8.tar.bz2.sig 
Removed Files:
	expendable-0.0.7.tar.bz2.sig 
Log Message:
* Sun Jan  4 2009 Tim Waugh <twaugh at redhat.com> 0.0.8-1
- 0.0.8.



--- NEW FILE expendable-0.0.8.tar.bz2.sig ---
??

Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/expendable/F-10/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	11 Nov 2008 10:11:29 -0000	1.7
+++ .cvsignore	4 Jan 2009 23:41:04 -0000	1.8
@@ -4,3 +4,4 @@
 expendable-0.0.5.tar.bz2
 expendable-0.0.6.tar.bz2
 expendable-0.0.7.tar.bz2
+expendable-0.0.8.tar.bz2


Index: expendable.spec
===================================================================
RCS file: /cvs/pkgs/rpms/expendable/F-10/expendable.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- expendable.spec	11 Nov 2008 10:11:29 -0000	1.14
+++ expendable.spec	4 Jan 2009 23:41:04 -0000	1.15
@@ -1,6 +1,6 @@
 Summary: Home finances modeling program
 Name: expendable
-Version: 0.0.7
+Version: 0.0.8
 Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/Productivity
@@ -83,6 +83,12 @@
 %{_datadir}/applications/*.desktop
 
 %changelog
+* Sun Jan  4 2009 Tim Waugh <twaugh at redhat.com> 0.0.8-1
+- 0.0.8.
+
+* Mon Dec 01 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 0.0.7-2
+- Rebuild for Python 2.6
+
 * Tue Nov 11 2008 Tim Waugh <twaugh at redhat.com> 0.0.7-1
 - 0.0.7.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/expendable/F-10/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	11 Nov 2008 10:11:29 -0000	1.7
+++ sources	4 Jan 2009 23:41:04 -0000	1.8
@@ -1 +1 @@
-e14f73b0aedfb9cee9bf196a38e9991c  expendable-0.0.7.tar.bz2
+b261185e32c8966837435607fbb455bc  expendable-0.0.8.tar.bz2


--- expendable-0.0.7.tar.bz2.sig DELETED ---



From pkgdb at fedoraproject.org  Sun Jan  4 23:49:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 04 Jan 2009 23:49:45 +0000
Subject: [pkgdb] rkhunter: wolfy has requested watchcommits
Message-ID: <20090104234945.BB9E7208D4F@bastion.fedora.phx.redhat.com>

wolfy has requested the watchcommits acl on rkhunter (Fedora EPEL 4)

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



From pkgdb at fedoraproject.org  Sun Jan  4 23:49:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 04 Jan 2009 23:49:44 +0000
Subject: [pkgdb] rkhunter: wolfy has requested commit
Message-ID: <20090104234944.6484620873E@bastion.fedora.phx.redhat.com>

wolfy has requested the commit acl on rkhunter (Fedora EPEL 4)

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



From pkgdb at fedoraproject.org  Sun Jan  4 23:49:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 04 Jan 2009 23:49:45 +0000
Subject: [pkgdb] rkhunter: wolfy has requested watchbugzilla
Message-ID: <20090104234946.01ED7208D52@bastion.fedora.phx.redhat.com>

wolfy has requested the watchbugzilla acl on rkhunter (Fedora EPEL 4)

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



From pkgdb at fedoraproject.org  Sun Jan  4 23:49:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 04 Jan 2009 23:49:50 +0000
Subject: [pkgdb] rkhunter: wolfy has requested watchbugzilla
Message-ID: <20090104234950.8CD9D208D57@bastion.fedora.phx.redhat.com>

wolfy has requested the watchbugzilla acl on rkhunter (Fedora EPEL 5)

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



From pkgdb at fedoraproject.org  Sun Jan  4 23:49:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 04 Jan 2009 23:49:53 +0000
Subject: [pkgdb] rkhunter: wolfy has requested watchcommits
Message-ID: <20090104234953.8ED75208D5A@bastion.fedora.phx.redhat.com>

wolfy has requested the watchcommits acl on rkhunter (Fedora EPEL 5)

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



From pkgdb at fedoraproject.org  Sun Jan  4 23:49:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 04 Jan 2009 23:49:53 +0000
Subject: [pkgdb] rkhunter: wolfy has requested commit
Message-ID: <20090104234953.AA4D5208D6A@bastion.fedora.phx.redhat.com>

wolfy has requested the commit acl on rkhunter (Fedora EPEL 5)

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



From whot at fedoraproject.org  Sun Jan  4 23:51:40 2009
From: whot at fedoraproject.org (Peter Hutterer)
Date: Sun,  4 Jan 2009 23:51:40 +0000 (UTC)
Subject: rpms/xorg-x11-drv-synaptics/F-10 10-synaptics.fdi, 1.3,
	1.4 xorg-x11-drv-synaptics.spec, 1.9, 1.10
Message-ID: <20090104235141.1F84770130@cvs1.fedora.phx.redhat.com>

Author: whot

Update of /cvs/pkgs/rpms/xorg-x11-drv-synaptics/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7216

Modified Files:
	10-synaptics.fdi xorg-x11-drv-synaptics.spec 
Log Message:
* Mon Jan 05 2009 Peter Hutterer <peter.hutterer at redhat.com> 0.15.2-2
- Update fdi file with comments on how to merge your own keys.




Index: 10-synaptics.fdi
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-synaptics/F-10/10-synaptics.fdi,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- 10-synaptics.fdi	8 Sep 2008 20:02:37 -0000	1.3
+++ 10-synaptics.fdi	4 Jan 2009 23:51:10 -0000	1.4
@@ -3,6 +3,22 @@
   <device>
     <match key="info.capabilities" contains="input.touchpad">
       <match key="info.product" contains="Synaptics TouchPad">
+        <!-- To add custom options for the touchpad, modify the examples below
+             to suit your needs. The available options are listed in the
+             "synaptics" man page. After modifyfing this file, you must
+             restart HAL. Check the output of lshal whether your modifications
+             have been merged successfully.
+             The options need to merged in the section that applies to your
+             specific touchpad.
+
+             Note: Options must always be type "string".
+             The following examples enable left, right, middle clicks on
+             single, double, triple finger tapping, respectively.
+
+             <merge key="input.x11_options.TapButton1" type="string">1</merge>
+             <merge key="input.x11_options.TapButton2" type="string">3</merge>
+             <merge key="input.x11_options.TapButton3" type="string">2</merge>
+        -->
 	<merge key="input.x11_driver" type="string">synaptics</merge>
       </match>
       <match key="info.product" contains="AlpsPS/2 ALPS">


Index: xorg-x11-drv-synaptics.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-synaptics/F-10/xorg-x11-drv-synaptics.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- xorg-x11-drv-synaptics.spec	24 Nov 2008 00:06:37 -0000	1.9
+++ xorg-x11-drv-synaptics.spec	4 Jan 2009 23:51:10 -0000	1.10
@@ -5,7 +5,7 @@
 Name:           xorg-x11-drv-synaptics
 Summary:        Xorg X11 Synaptics touchpad input driver
 Version:        0.15.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 URL:            http://www.x.org
 License:        MIT
 Group:          User Interface/X Hardware Support
@@ -102,6 +102,9 @@
 %doc COPYING README
 
 %changelog
+* Mon Jan 05 2009 Peter Hutterer <peter.hutterer at redhat.com> 0.15.2-2
+- Update fdi file with comments on how to merge your own keys.
+
 * Mon Nov 24 2008 Peter Hutterer <peter.hutterer at redhat.com>
 - Fix up summary and description, provide list of supported models.
 



From pkgdb at fedoraproject.org  Sun Jan  4 23:52:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 04 Jan 2009 23:52:23 +0000
Subject: [pkgdb] rkhunter had acl change status
Message-ID: <20090104235223.B62AD208D4E@bastion.fedora.phx.redhat.com>

kevin has set the watchbugzilla acl on rkhunter (Fedora EPEL 4) to Approved for wolfy

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



From pkgdb at fedoraproject.org  Sun Jan  4 23:52:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 04 Jan 2009 23:52:27 +0000
Subject: [pkgdb] rkhunter had acl change status
Message-ID: <20090104235227.270A5208D52@bastion.fedora.phx.redhat.com>

kevin has set the commit acl on rkhunter (Fedora EPEL 4) to Approved for wolfy

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



From pkgdb at fedoraproject.org  Sun Jan  4 23:52:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 04 Jan 2009 23:52:25 +0000
Subject: [pkgdb] rkhunter had acl change status
Message-ID: <20090104235225.49659208D51@bastion.fedora.phx.redhat.com>

kevin has set the watchcommits acl on rkhunter (Fedora EPEL 4) to Approved for wolfy

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



From pkgdb at fedoraproject.org  Sun Jan  4 23:52:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 04 Jan 2009 23:52:31 +0000
Subject: [pkgdb] rkhunter had acl change status
Message-ID: <20090104235231.BB66B208D57@bastion.fedora.phx.redhat.com>

kevin has set the watchbugzilla acl on rkhunter (Fedora EPEL 5) to Approved for wolfy

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



From pkgdb at fedoraproject.org  Sun Jan  4 23:52:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 04 Jan 2009 23:52:34 +0000
Subject: [pkgdb] rkhunter had acl change status
Message-ID: <20090104235234.1E4AE208D60@bastion.fedora.phx.redhat.com>

kevin has set the watchcommits acl on rkhunter (Fedora EPEL 5) to Approved for wolfy

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



From pkgdb at fedoraproject.org  Sun Jan  4 23:52:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 04 Jan 2009 23:52:36 +0000
Subject: [pkgdb] rkhunter had acl change status
Message-ID: <20090104235236.CC674208D6A@bastion.fedora.phx.redhat.com>

kevin has set the commit acl on rkhunter (Fedora EPEL 5) to Approved for wolfy

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



From twaugh at fedoraproject.org  Mon Jan  5 00:00:29 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Mon,  5 Jan 2009 00:00:29 +0000 (UTC)
Subject: rpms/expendable/F-9 expendable-0.0.8.tar.bz2.sig, NONE,
	1.1 .cvsignore, 1.6, 1.7 expendable.spec, 1.10, 1.11 sources, 1.7,
	1.8 expendable-0.0.7.tar.bz2.sig, 1.1, NONE
Message-ID: <20090105000030.053C970108@cvs1.fedora.phx.redhat.com>

Author: twaugh

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

Modified Files:
	.cvsignore expendable.spec sources 
Added Files:
	expendable-0.0.8.tar.bz2.sig 
Removed Files:
	expendable-0.0.7.tar.bz2.sig 
Log Message:
* Sun Jan  4 2009 Tim Waugh <twaugh at redhat.com> 0.0.8-1
- 0.0.8.



--- NEW FILE expendable-0.0.8.tar.bz2.sig ---
??

Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/expendable/F-9/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	11 Nov 2008 10:15:20 -0000	1.6
+++ .cvsignore	4 Jan 2009 23:59:57 -0000	1.7
@@ -4,3 +4,4 @@
 expendable-0.0.5.tar.bz2
 expendable-0.0.6.tar.bz2
 expendable-0.0.7.tar.bz2
+expendable-0.0.8.tar.bz2


Index: expendable.spec
===================================================================
RCS file: /cvs/pkgs/rpms/expendable/F-9/expendable.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- expendable.spec	11 Nov 2008 10:15:20 -0000	1.10
+++ expendable.spec	4 Jan 2009 23:59:57 -0000	1.11
@@ -1,6 +1,6 @@
 Summary: Home finances modeling program
 Name: expendable
-Version: 0.0.7
+Version: 0.0.8
 Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/Productivity
@@ -83,6 +83,12 @@
 %{_datadir}/applications/*.desktop
 
 %changelog
+* Sun Jan  4 2009 Tim Waugh <twaugh at redhat.com> 0.0.8-1
+- 0.0.8.
+
+* Mon Dec 01 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 0.0.7-2
+- Rebuild for Python 2.6
+
 * Tue Nov 11 2008 Tim Waugh <twaugh at redhat.com> 0.0.7-1
 - 0.0.7.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/expendable/F-9/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	11 Nov 2008 10:15:20 -0000	1.7
+++ sources	4 Jan 2009 23:59:57 -0000	1.8
@@ -1,2 +1 @@
-430a4f19616fb10f51614e009e00e630  expendable-0.0.6.tar.bz2
-e14f73b0aedfb9cee9bf196a38e9991c  expendable-0.0.7.tar.bz2
+b261185e32c8966837435607fbb455bc  expendable-0.0.8.tar.bz2


--- expendable-0.0.7.tar.bz2.sig DELETED ---



From cwickert at fedoraproject.org  Sun Jan  4 23:33:50 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Sun,  4 Jan 2009 23:33:50 +0000 (UTC)
Subject: comps comps-f10.xml.in,1.201,1.202 comps-f11.xml.in,1.48,1.49
Message-ID: <20090104233350.5D92A70130@cvs1.fedora.phx.redhat.com>

Author: cwickert

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

Modified Files:
	comps-f10.xml.in comps-f11.xml.in 
Log Message:
add xfce4-screenshooter


Index: comps-f10.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f10.xml.in,v
retrieving revision 1.201
retrieving revision 1.202
diff -u -r1.201 -r1.202
--- comps-f10.xml.in	4 Jan 2009 22:21:59 -0000	1.201
+++ comps-f10.xml.in	4 Jan 2009 23:33:19 -0000	1.202
@@ -5004,6 +5004,7 @@
       <packagereq type="optional">xfce4-notes-plugin</packagereq>
       <packagereq type="optional">xfce4-places-plugin</packagereq>
       <packagereq type="optional">xfce4-quicklauncher-plugin</packagereq>
+      <packagereq type="optional">xfce4-screenshooter</packagereq>
       <packagereq type="optional">xfce4-screenshooter-plugin</packagereq>
       <packagereq type="optional">xfce4-sensors-plugin</packagereq>
       <packagereq type="optional">xfce4-smartbookmark-plugin</packagereq>


Index: comps-f11.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f11.xml.in,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- comps-f11.xml.in	4 Jan 2009 22:22:00 -0000	1.48
+++ comps-f11.xml.in	4 Jan 2009 23:33:19 -0000	1.49
@@ -5133,6 +5133,7 @@
       <packagereq type="optional">xfce4-notes-plugin</packagereq>
       <packagereq type="optional">xfce4-places-plugin</packagereq>
       <packagereq type="optional">xfce4-quicklauncher-plugin</packagereq>
+      <packagereq type="optional">xfce4-screenshooter</packagereq>	  
       <packagereq type="optional">xfce4-screenshooter-plugin</packagereq>
       <packagereq type="optional">xfce4-sensors-plugin</packagereq>
       <packagereq type="optional">xfce4-smartbookmark-plugin</packagereq>



From cweyl at fedoraproject.org  Mon Jan  5 00:09:36 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Mon,  5 Jan 2009 00:09:36 +0000 (UTC)
Subject: rpms/perl-Class-MOP/devel .cvsignore, 1.22, 1.23 perl-Class-MOP.spec,
	1.26, 1.27 sources, 1.22, 1.23
Message-ID: <20090105000936.D189670108@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-serv9439

Modified Files:
	.cvsignore perl-Class-MOP.spec sources 
Log Message:
* Sun Jan 04 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.75-1
- update to 0.75



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-MOP/devel/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- .cvsignore	28 Dec 2008 16:15:15 -0000	1.22
+++ .cvsignore	5 Jan 2009 00:09:05 -0000	1.23
@@ -1 +1 @@
-Class-MOP-0.74.tar.gz
+Class-MOP-0.75.tar.gz


Index: perl-Class-MOP.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-MOP/devel/perl-Class-MOP.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- perl-Class-MOP.spec	28 Dec 2008 16:15:15 -0000	1.26
+++ perl-Class-MOP.spec	5 Jan 2009 00:09:05 -0000	1.27
@@ -1,5 +1,5 @@
 Name:           perl-Class-MOP
-Version:        0.74
+Version:        0.75
 Release:        1%{?dist}
 Summary:        Metaobject programming model for Perl
 License:        GPL+ or Artistic
@@ -87,6 +87,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Sun Jan 04 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.75-1
+- update to 0.75
+
 * Sun Dec 28 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.74-1
 - update to 0.74
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-MOP/devel/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- sources	28 Dec 2008 16:15:15 -0000	1.22
+++ sources	5 Jan 2009 00:09:05 -0000	1.23
@@ -1 +1 @@
-c87613c1054496d64c196920f619b6df  Class-MOP-0.74.tar.gz
+b82bbb168eec776ec02795bb218c9f23  Class-MOP-0.75.tar.gz



From cweyl at fedoraproject.org  Mon Jan  5 00:12:26 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Mon,  5 Jan 2009 00:12:26 +0000 (UTC)
Subject: rpms/perl-Class-MOP/F-10 perl-Class-MOP.spec, 1.21, 1.22 sources,
	1.18, 1.19
Message-ID: <20090105001226.D26107013F@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Class-MOP/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10310

Modified Files:
	perl-Class-MOP.spec sources 
Log Message:
* Sun Jan 04 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.75-1
- update to 0.75



Index: perl-Class-MOP.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-MOP/F-10/perl-Class-MOP.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- perl-Class-MOP.spec	31 Dec 2008 03:08:26 -0000	1.21
+++ perl-Class-MOP.spec	5 Jan 2009 00:11:55 -0000	1.22
@@ -1,5 +1,5 @@
 Name:           perl-Class-MOP
-Version:        0.74
+Version:        0.75
 Release:        1%{?dist}
 Summary:        Metaobject programming model for Perl
 License:        GPL+ or Artistic
@@ -87,6 +87,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Sun Jan 04 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.75-1
+- update to 0.75
+
 * Sun Dec 28 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.74-1
 - update to 0.74
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-MOP/F-10/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources	31 Dec 2008 03:08:26 -0000	1.18
+++ sources	5 Jan 2009 00:11:55 -0000	1.19
@@ -1 +1 @@
-c87613c1054496d64c196920f619b6df  Class-MOP-0.74.tar.gz
+b82bbb168eec776ec02795bb218c9f23  Class-MOP-0.75.tar.gz



From cweyl at fedoraproject.org  Mon Jan  5 00:12:35 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Mon,  5 Jan 2009 00:12:35 +0000 (UTC)
Subject: rpms/perl-Class-MOP/F-9 perl-Class-MOP.spec, 1.17, 1.18 sources,
	1.15, 1.16
Message-ID: <20090105001235.EE12E7013F@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Class-MOP/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10420

Modified Files:
	perl-Class-MOP.spec sources 
Log Message:
* Sun Jan 04 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.75-1
- update to 0.75



Index: perl-Class-MOP.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-MOP/F-9/perl-Class-MOP.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- perl-Class-MOP.spec	31 Dec 2008 03:17:04 -0000	1.17
+++ perl-Class-MOP.spec	5 Jan 2009 00:12:05 -0000	1.18
@@ -1,5 +1,5 @@
 Name:           perl-Class-MOP
-Version:        0.74
+Version:        0.75
 Release:        1%{?dist}
 Summary:        Metaobject programming model for Perl
 License:        GPL+ or Artistic
@@ -87,6 +87,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Sun Jan 04 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.75-1
+- update to 0.75
+
 * Sun Dec 28 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.74-1
 - update to 0.74
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-MOP/F-9/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	31 Dec 2008 03:17:04 -0000	1.15
+++ sources	5 Jan 2009 00:12:05 -0000	1.16
@@ -1 +1 @@
-c87613c1054496d64c196920f619b6df  Class-MOP-0.74.tar.gz
+b82bbb168eec776ec02795bb218c9f23  Class-MOP-0.75.tar.gz



From jcollie at fedoraproject.org  Mon Jan  5 00:12:40 2009
From: jcollie at fedoraproject.org (Jeffrey C. Ollie)
Date: Mon,  5 Jan 2009 00:12:40 +0000 (UTC)
Subject: rpms/dahdi-tools/devel .cvsignore, 1.2, 1.3 dahdi-tools.spec, 1.4, 
	1.5 sources, 1.2, 1.3 dahdi-tools-2.0.0-init-status.patch, 1.1, NONE
Message-ID: <20090105001240.D7B0B7013F@cvs1.fedora.phx.redhat.com>

Author: jcollie

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

Modified Files:
	.cvsignore dahdi-tools.spec sources 
Removed Files:
	dahdi-tools-2.0.0-init-status.patch 
Log Message:
* Sun Jan  4 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 2.1.0.2-4
- Update to latest.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/dahdi-tools/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	10 Oct 2008 12:31:18 -0000	1.2
+++ .cvsignore	5 Jan 2009 00:12:10 -0000	1.3
@@ -1,2 +1,2 @@
-dahdi-linux-2.0.0.tar.gz
-dahdi-tools-2.0.0.tar.gz
+dahdi-linux-2.1.0.3.tar.gz
+dahdi-tools-2.1.0.2.tar.gz


Index: dahdi-tools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dahdi-tools/devel/dahdi-tools.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- dahdi-tools.spec	20 Nov 2008 15:01:06 -0000	1.4
+++ dahdi-tools.spec	5 Jan 2009 00:12:10 -0000	1.5
@@ -1,5 +1,5 @@
-%define tools_version 2.0.0
-%define linux_version 2.0.0
+%define tools_version 2.1.0.2
+%define linux_version 2.1.0.3
 
 Name:           dahdi-tools
 Version:        %{tools_version}
@@ -13,7 +13,6 @@
 Source0:        http://downloads.digium.com/pub/telephony/dahdi-tools/releases/dahdi-tools-%{tools_version}.tar.gz
 Source1:        http://downloads.digium.com/pub/telephony/dahdi-linux/releases/dahdi-linux-%{linux_version}.tar.gz
 # pulled from upstream SVN, revs 5072 and 5074
-Patch0:         dahdi-tools-2.0.0-init-status.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -54,7 +53,6 @@
 
 %prep
 %setup0 -q -n dahdi-tools-%{tools_version} -a 1
-%patch0 -p1
 ln -s dahdi-linux-%{linux_version}/include include
 %{__perl} -pi -e 's/chkconfig:\s([0-9]+)\s([0-9]+)\s([0-9]+)/chkconfig: - \2 \3/' dahdi.init
 
@@ -130,6 +128,7 @@
 %{_sbindir}/xpp_sync
 %dir %{_datadir}/dahdi
 %{_datadir}/dahdi/xpp_fxloader
+%{_datadir}/dahdi/waitfor_xpds
 %{_mandir}/man8/dahdi_cfg.8.gz
 %{_mandir}/man8/dahdi_genconf.8.gz
 %{_mandir}/man8/dahdi_hardware.8.gz
@@ -158,6 +157,9 @@
 %{_libdir}/*.so
 
 %changelog
+* Sun Jan  4 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 2.1.0.2-4
+- Update to latest.
+
 * Thu Nov 20 2008 Jeffrey C. Ollie <jeff at ocjtech.us> - 2.0.0-4
 - Fix zaptel-lib(s) conflicts
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dahdi-tools/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	10 Oct 2008 12:31:18 -0000	1.2
+++ sources	5 Jan 2009 00:12:10 -0000	1.3
@@ -1,2 +1,2 @@
-c09f880e67305bf5561c8030958b9fb9  dahdi-linux-2.0.0.tar.gz
-31e48ed37e43662b0f8fbf146e192b66  dahdi-tools-2.0.0.tar.gz
+4e2a294073a1375b8b3d33bbf4f607fe  dahdi-linux-2.1.0.3.tar.gz
+2e0c2866112932e54aacf3dc62f548ca  dahdi-tools-2.1.0.2.tar.gz


--- dahdi-tools-2.0.0-init-status.patch DELETED ---



From dchen at fedoraproject.org  Mon Jan  5 01:43:44 2009
From: dchen at fedoraproject.org (Ding-Yi Chen)
Date: Mon,  5 Jan 2009 01:43:44 +0000 (UTC)
Subject: rpms/fbterm/devel fbterm-1.3-setcap.patch, NONE, 1.1 .cvsignore, 1.3,
	1.4 fbterm.spec, 1.5, 1.6 import.log, 1.4, 1.5 sources, 1.3,
	1.4 fbterm-1.2-kernel-header.patch, 1.1, NONE
Message-ID: <20090105014344.8994C7011F@cvs1.fedora.phx.redhat.com>

Author: dchen

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

Modified Files:
	.cvsignore fbterm.spec import.log sources 
Added Files:
	fbterm-1.3-setcap.patch 
Removed Files:
	fbterm-1.2-kernel-header.patch 
Log Message:
Upstream update

fbterm-1.3-setcap.patch:

--- NEW FILE fbterm-1.3-setcap.patch ---
diff -up ./src/Makefile.in.setcap ./src/Makefile.in
--- ./src/Makefile.in.setcap	2009-01-05 10:23:56.000000000 +1000
+++ ./src/Makefile.in	2009-01-05 10:28:14.000000000 +1000
@@ -729,7 +729,7 @@ uninstall-am: uninstall-binPROGRAMS
 
 
 install-exec-hook:
- at HAVE_FS_CAPABILITY_TRUE@	setcap 'cap_sys_tty_config+ep' $(DESTDIR)$(bindir)/fbterm$(EXEEXT)
+#@HAVE_FS_CAPABILITY_TRUE@	setcap 'cap_sys_tty_config+ep' $(DESTDIR)$(bindir)/fbterm$(EXEEXT)
 @HAVE_FS_CAPABILITY_FALSE@	chmod u+s $(DESTDIR)$(bindir)/fbterm$(EXEEXT)
 # 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: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fbterm/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	21 Nov 2008 07:00:34 -0000	1.3
+++ .cvsignore	5 Jan 2009 01:43:12 -0000	1.4
@@ -1 +1 @@
-fbterm-1.2.tar.gz
+fbterm-1.3.tar.gz


Index: fbterm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fbterm/devel/fbterm.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- fbterm.spec	11 Dec 2008 01:46:49 -0000	1.5
+++ fbterm.spec	5 Jan 2009 01:43:12 -0000	1.6
@@ -1,11 +1,12 @@
 Name:       fbterm
-Version:    1.2
-Release:    2%{?dist}
+Version:    1.3
+Release:    0%{?dist}
 License:    GPLv2+
 Group:      Applications/System
 URL:        http://code.google.com/p/fbterm/
 Source0:    http://fbterm.googlecode.com/files/%{name}-%{version}.tar.gz
-Patch0:     %{name}-1.2-kernel-header.patch   
+#Patch0:     %{name}-1.2-kernel-header.patch
+Patch1:     %{name}-%{version}-setcap.patch
 Summary:    A frame buffer terminal emulator
 Summary(zh_CN): ??????????????????????????????????????????
 Summary(zh_TW): ?????????Framebuffer????????????????????????
@@ -35,7 +36,8 @@
 
 %prep
 %setup -q
-%patch0 -p0 -b .kernel-header
+#%patch0 -p0 -b .kernel-header
+%patch1 -p0 -b .signalfd
 
 %build
 %configure --disable-static --disable-rpath
@@ -46,9 +48,13 @@
 make DESTDIR=${RPM_BUILD_ROOT} install
 chmod 755 $RPM_BUILD_ROOT/%{_bindir}/%{name}
 
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post
+setcap 'cap_sys_tty_config+ep' %{_bindir}/%{name}
+
 %files 
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING README
@@ -57,6 +63,22 @@
 
 
 %changelog
+* Mon Jan 05 2009 Ding-Yi Chen <dchen at redhat dot com> - 1.3-0
+- Upstream update:
+  1. added command line arguments to change option values 
+  2. added client-server based input method framework 
+  3. added screen rotation support 
+  4. added support for visual type DIRECTCOLOR used by ATI cards 
+     (thanks for Witek's patch) 
+  5. fixed a bug that user can't input some unicode characters 
+  6. fixed a bug of maybe not restore original console state after 
+     FbTerm exited 
+  7. fixed several trivial bugs 
+  8. added using filesystem capability attributes offered by kernel 
+     2.6.27, instead of setting set-user-ID bit on FbTerm 
+  9. decreased memory usage of every shell instance by changing size 
+      of the struct saving every charater's attribute from 4 to 2 bytes
+
 * Thu Dec 11 2008 Ding-Yi Chen <dchen at redhat dot com> - 1.2-2
 - Summary simplified.
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/fbterm/devel/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- import.log	11 Dec 2008 01:46:49 -0000	1.4
+++ import.log	5 Jan 2009 01:43:12 -0000	1.5
@@ -2,3 +2,4 @@
 fbterm-1_2-0_fc9:HEAD:fbterm-1.2-0.fc9.src.rpm:1227250796
 fbterm-1_2-1_fc9:HEAD:fbterm-1.2-1.fc9.src.rpm:1227251011
 fbterm-1_2-2_fc10:HEAD:fbterm-1.2-2.fc10.src.rpm:1228959810
+fbterm-1_3-0_fc10:HEAD:fbterm-1.3-0.fc10.src.rpm:1231119727


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fbterm/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	21 Nov 2008 07:00:34 -0000	1.3
+++ sources	5 Jan 2009 01:43:12 -0000	1.4
@@ -1 +1 @@
-92cc48ff42f6059722f72c62130ee97b  fbterm-1.2.tar.gz
+12f52f60390576866ce9f7696779050d  fbterm-1.3.tar.gz


--- fbterm-1.2-kernel-header.patch DELETED ---



From dchen at fedoraproject.org  Mon Jan  5 01:45:27 2009
From: dchen at fedoraproject.org (Ding-Yi Chen)
Date: Mon,  5 Jan 2009 01:45:27 +0000 (UTC)
Subject: rpms/fbterm/F-10 fbterm-1.3-setcap.patch, NONE, 1.1 .cvsignore, 1.3,
	1.4 fbterm.spec, 1.3, 1.4 import.log, 1.3, 1.4 sources, 1.3,
	1.4 fbterm-1.2-kernel-header.patch, 1.1, NONE
Message-ID: <20090105014527.C17C07011F@cvs1.fedora.phx.redhat.com>

Author: dchen

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

Modified Files:
	.cvsignore fbterm.spec import.log sources 
Added Files:
	fbterm-1.3-setcap.patch 
Removed Files:
	fbterm-1.2-kernel-header.patch 
Log Message:
Upstream update

fbterm-1.3-setcap.patch:

--- NEW FILE fbterm-1.3-setcap.patch ---
diff -up ./src/Makefile.in.setcap ./src/Makefile.in
--- ./src/Makefile.in.setcap	2009-01-05 10:23:56.000000000 +1000
+++ ./src/Makefile.in	2009-01-05 10:28:14.000000000 +1000
@@ -729,7 +729,7 @@ uninstall-am: uninstall-binPROGRAMS
 
 
 install-exec-hook:
- at HAVE_FS_CAPABILITY_TRUE@	setcap 'cap_sys_tty_config+ep' $(DESTDIR)$(bindir)/fbterm$(EXEEXT)
+#@HAVE_FS_CAPABILITY_TRUE@	setcap 'cap_sys_tty_config+ep' $(DESTDIR)$(bindir)/fbterm$(EXEEXT)
 @HAVE_FS_CAPABILITY_FALSE@	chmod u+s $(DESTDIR)$(bindir)/fbterm$(EXEEXT)
 # 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: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fbterm/F-10/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	21 Nov 2008 07:19:07 -0000	1.3
+++ .cvsignore	5 Jan 2009 01:44:57 -0000	1.4
@@ -1 +1 @@
-fbterm-1.2.tar.gz
+fbterm-1.3.tar.gz


Index: fbterm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fbterm/F-10/fbterm.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- fbterm.spec	11 Dec 2008 01:52:08 -0000	1.3
+++ fbterm.spec	5 Jan 2009 01:44:57 -0000	1.4
@@ -1,11 +1,12 @@
 Name:       fbterm
-Version:    1.2
-Release:    2%{?dist}
+Version:    1.3
+Release:    0%{?dist}
 License:    GPLv2+
 Group:      Applications/System
 URL:        http://code.google.com/p/fbterm/
 Source0:    http://fbterm.googlecode.com/files/%{name}-%{version}.tar.gz
-Patch0:     %{name}-1.2-kernel-header.patch   
+#Patch0:     %{name}-1.2-kernel-header.patch
+Patch1:     %{name}-%{version}-setcap.patch
 Summary:    A frame buffer terminal emulator
 Summary(zh_CN): ??????????????????????????????????????????
 Summary(zh_TW): ?????????Framebuffer????????????????????????
@@ -35,7 +36,8 @@
 
 %prep
 %setup -q
-%patch0 -p0 -b .kernel-header
+#%patch0 -p0 -b .kernel-header
+%patch1 -p0 -b .signalfd
 
 %build
 %configure --disable-static --disable-rpath
@@ -46,9 +48,13 @@
 make DESTDIR=${RPM_BUILD_ROOT} install
 chmod 755 $RPM_BUILD_ROOT/%{_bindir}/%{name}
 
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post
+setcap 'cap_sys_tty_config+ep' %{_bindir}/%{name}
+
 %files 
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING README
@@ -57,6 +63,22 @@
 
 
 %changelog
+* Mon Jan 05 2009 Ding-Yi Chen <dchen at redhat dot com> - 1.3-0
+- Upstream update:
+  1. added command line arguments to change option values 
+  2. added client-server based input method framework 
+  3. added screen rotation support 
+  4. added support for visual type DIRECTCOLOR used by ATI cards 
+     (thanks for Witek's patch) 
+  5. fixed a bug that user can't input some unicode characters 
+  6. fixed a bug of maybe not restore original console state after 
+     FbTerm exited 
+  7. fixed several trivial bugs 
+  8. added using filesystem capability attributes offered by kernel 
+     2.6.27, instead of setting set-user-ID bit on FbTerm 
+  9. decreased memory usage of every shell instance by changing size 
+      of the struct saving every charater's attribute from 4 to 2 bytes
+
 * Thu Dec 11 2008 Ding-Yi Chen <dchen at redhat dot com> - 1.2-2
 - Summary simplified.
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/fbterm/F-10/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- import.log	11 Dec 2008 01:52:09 -0000	1.3
+++ import.log	5 Jan 2009 01:44:57 -0000	1.4
@@ -1,3 +1,4 @@
 fbterm-1_1-3_fc9:F-10:fbterm-1.1-3.fc9.src.rpm:1224459860
 fbterm-1_2-1_fc9:F-10:fbterm-1.2-1.fc9.src.rpm:1227251433
 fbterm-1_2-2_fc10:F-10:fbterm-1.2-2.fc10.src.rpm:1228960163
+fbterm-1_3-0_fc10:F-10:fbterm-1.3-0.fc10.src.rpm:1231119864


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fbterm/F-10/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	21 Nov 2008 07:19:08 -0000	1.3
+++ sources	5 Jan 2009 01:44:57 -0000	1.4
@@ -1 +1 @@
-92cc48ff42f6059722f72c62130ee97b  fbterm-1.2.tar.gz
+12f52f60390576866ce9f7696779050d  fbterm-1.3.tar.gz


--- fbterm-1.2-kernel-header.patch DELETED ---



From dchen at fedoraproject.org  Mon Jan  5 01:57:53 2009
From: dchen at fedoraproject.org (Ding-Yi Chen)
Date: Mon,  5 Jan 2009 01:57:53 +0000 (UTC)
Subject: rpms/fbterm/F-9 fbterm-1.3-setcap.patch, NONE, 1.1 .cvsignore, 1.3, 
	1.4 fbterm.spec, 1.3, 1.4 import.log, 1.3, 1.4 sources, 1.3,
	1.4 fbterm-1.2-kernel-header.patch, 1.1, NONE
Message-ID: <20090105015753.ACC747011F@cvs1.fedora.phx.redhat.com>

Author: dchen

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

Modified Files:
	.cvsignore fbterm.spec import.log sources 
Added Files:
	fbterm-1.3-setcap.patch 
Removed Files:
	fbterm-1.2-kernel-header.patch 
Log Message:
Upstream update

fbterm-1.3-setcap.patch:

--- NEW FILE fbterm-1.3-setcap.patch ---
diff -up ./src/Makefile.in.setcap ./src/Makefile.in
--- ./src/Makefile.in.setcap	2009-01-05 10:23:56.000000000 +1000
+++ ./src/Makefile.in	2009-01-05 10:28:14.000000000 +1000
@@ -729,7 +729,7 @@ uninstall-am: uninstall-binPROGRAMS
 
 
 install-exec-hook:
- at HAVE_FS_CAPABILITY_TRUE@	setcap 'cap_sys_tty_config+ep' $(DESTDIR)$(bindir)/fbterm$(EXEEXT)
+#@HAVE_FS_CAPABILITY_TRUE@	setcap 'cap_sys_tty_config+ep' $(DESTDIR)$(bindir)/fbterm$(EXEEXT)
 @HAVE_FS_CAPABILITY_FALSE@	chmod u+s $(DESTDIR)$(bindir)/fbterm$(EXEEXT)
 # 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: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fbterm/F-9/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	21 Nov 2008 07:08:19 -0000	1.3
+++ .cvsignore	5 Jan 2009 01:57:23 -0000	1.4
@@ -1 +1 @@
-fbterm-1.2.tar.gz
+fbterm-1.3.tar.gz


Index: fbterm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fbterm/F-9/fbterm.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- fbterm.spec	11 Dec 2008 02:01:04 -0000	1.3
+++ fbterm.spec	5 Jan 2009 01:57:23 -0000	1.4
@@ -1,11 +1,12 @@
 Name:       fbterm
-Version:    1.2
-Release:    2%{?dist}
+Version:    1.3
+Release:    0%{?dist}
 License:    GPLv2+
 Group:      Applications/System
 URL:        http://code.google.com/p/fbterm/
 Source0:    http://fbterm.googlecode.com/files/%{name}-%{version}.tar.gz
-Patch0:     %{name}-1.2-kernel-header.patch   
+#Patch0:     %{name}-1.2-kernel-header.patch
+Patch1:     %{name}-%{version}-setcap.patch
 Summary:    A frame buffer terminal emulator
 Summary(zh_CN): ??????????????????????????????????????????
 Summary(zh_TW): ?????????Framebuffer????????????????????????
@@ -35,7 +36,8 @@
 
 %prep
 %setup -q
-%patch0 -p0 -b .kernel-header
+#%patch0 -p0 -b .kernel-header
+%patch1 -p0 -b .signalfd
 
 %build
 %configure --disable-static --disable-rpath
@@ -46,9 +48,13 @@
 make DESTDIR=${RPM_BUILD_ROOT} install
 chmod 755 $RPM_BUILD_ROOT/%{_bindir}/%{name}
 
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post
+setcap 'cap_sys_tty_config+ep' %{_bindir}/%{name}
+
 %files 
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING README
@@ -57,6 +63,22 @@
 
 
 %changelog
+* Mon Jan 05 2009 Ding-Yi Chen <dchen at redhat dot com> - 1.3-0
+- Upstream update:
+  1. added command line arguments to change option values 
+  2. added client-server based input method framework 
+  3. added screen rotation support 
+  4. added support for visual type DIRECTCOLOR used by ATI cards 
+     (thanks for Witek's patch) 
+  5. fixed a bug that user can't input some unicode characters 
+  6. fixed a bug of maybe not restore original console state after 
+     FbTerm exited 
+  7. fixed several trivial bugs 
+  8. added using filesystem capability attributes offered by kernel 
+     2.6.27, instead of setting set-user-ID bit on FbTerm 
+  9. decreased memory usage of every shell instance by changing size 
+      of the struct saving every charater's attribute from 4 to 2 bytes
+
 * Thu Dec 11 2008 Ding-Yi Chen <dchen at redhat dot com> - 1.2-2
 - Summary simplified.
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/fbterm/F-9/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- import.log	11 Dec 2008 02:01:04 -0000	1.3
+++ import.log	5 Jan 2009 01:57:23 -0000	1.4
@@ -1,3 +1,4 @@
 fbterm-1_1-3_fc9:F-9:fbterm-1.1-3.fc9.src.rpm:1224459265
 fbterm-1_2-1_fc9:F-9:fbterm-1.2-1.fc9.src.rpm:1227251111
 fbterm-1_2-2_fc10:F-9:fbterm-1.2-2.fc10.src.rpm:1228960580
+fbterm-1_3-0_fc10:F-9:fbterm-1.3-0.fc10.src.rpm:1231120357


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fbterm/F-9/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	21 Nov 2008 07:08:19 -0000	1.3
+++ sources	5 Jan 2009 01:57:23 -0000	1.4
@@ -1 +1 @@
-92cc48ff42f6059722f72c62130ee97b  fbterm-1.2.tar.gz
+12f52f60390576866ce9f7696779050d  fbterm-1.3.tar.gz


--- fbterm-1.2-kernel-header.patch DELETED ---



From jcollie at fedoraproject.org  Mon Jan  5 02:06:15 2009
From: jcollie at fedoraproject.org (Jeffrey C. Ollie)
Date: Mon,  5 Jan 2009 02:06:15 +0000 (UTC)
Subject: rpms/asterisk/devel
	0013-Add-LDAP-schema-that-is-compatible-with-Fedora-Direc.patch, NONE,
	1.1 0001-Modify-init-scripts-for-better-Fedora-compatibility.patch,
	1.8,
	1.9 0002-Modify-modules.conf-so-that-different-voicemail-modu.patch, 
	1.8, 1.9 0003-Add-chan_mobile-from-asterisk-addons.patch, 1.4,
	1.5 0004-Use-pkgconfig-to-check-for-Lua.patch, 1.4,
	1.5 0005-Build-using-external-libedit.patch, 1.3,
	1.4 0006-Revert-changes-to-pbx_lua-from-rev-126363-that-cause.patch, 
	1.3, 1.4 0007-Define-missing-variable-when-compiling-on-PPC.patch,
	1.2,
	1.3 0008-change-configure.ac-to-look-for-pkg-config-gmime-2.4.patch, 
	1.2,
	1.3 0009-fix-the-AST_PROG_SED-problem-that-makes-.-bootstrap.patch,
	1.2,
	1.3 0010-my-guess-as-replacements-for-the-missing-broken-stuf.patch, 
	1.2, 1.3 0011-Update-autoconf.patch, 1.2,
	1.3 0012-Fix-up-some-paths.patch, 1.1, 1.2 asterisk.spec, 1.45, 1.46
Message-ID: <20090105020615.B28527011F@cvs1.fedora.phx.redhat.com>

Author: jcollie

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

Modified Files:
	0001-Modify-init-scripts-for-better-Fedora-compatibility.patch 
	0002-Modify-modules.conf-so-that-different-voicemail-modu.patch 
	0003-Add-chan_mobile-from-asterisk-addons.patch 
	0004-Use-pkgconfig-to-check-for-Lua.patch 
	0005-Build-using-external-libedit.patch 
	0006-Revert-changes-to-pbx_lua-from-rev-126363-that-cause.patch 
	0007-Define-missing-variable-when-compiling-on-PPC.patch 
	0008-change-configure.ac-to-look-for-pkg-config-gmime-2.4.patch 
	0009-fix-the-AST_PROG_SED-problem-that-makes-.-bootstrap.patch 
	0010-my-guess-as-replacements-for-the-missing-broken-stuf.patch 
	0011-Update-autoconf.patch 0012-Fix-up-some-paths.patch 
	asterisk.spec 
Added Files:
	0013-Add-LDAP-schema-that-is-compatible-with-Fedora-Direc.patch 
Log Message:
* Sun Jan  4 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6.1-0.10.beta4
- Fix up paths. BZ#477238


0013-Add-LDAP-schema-that-is-compatible-with-Fedora-Direc.patch:

--- NEW FILE 0013-Add-LDAP-schema-that-is-compatible-with-Fedora-Direc.patch ---
>From b3f7c393cf33589d4ae68639cc1adffe51879a95 Mon Sep 17 00:00:00 2001
From: Jeffrey C. Ollie <jeff at ocjtech.us>
Date: Sun, 4 Jan 2009 19:22:39 -0600
Subject: [PATCH 13/13] Add LDAP schema that is compatible with Fedora Directory Server.

---
 contrib/scripts/99asterisk.ldif |  489 +++++++++++++++++++++++++++++++++++++++
 1 files changed, 489 insertions(+), 0 deletions(-)
 create mode 100644 contrib/scripts/99asterisk.ldif

diff --git a/contrib/scripts/99asterisk.ldif b/contrib/scripts/99asterisk.ldif
new file mode 100644
index 0000000..ef878a8
--- /dev/null
+++ b/contrib/scripts/99asterisk.ldif
@@ -0,0 +1,489 @@
+dn: cn=schema
+#
+attributeTypes: (
+  
+  NAME 'AstContext'
+  DESC 'Asterisk Context'
+  EQUALITY caseIgnoreMatch
+  SUBSTR caseIgnoreSubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+  )
+#
+attributeTypes: (
+  
+  NAME 'AstExtension'
+  DESC 'Asterisk Extension'
+  EQUALITY caseIgnoreMatch
+  SUBSTR caseIgnoreSubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+  )
+#
+attributeTypes: (
+  
+  NAME 'AstPriority'
+  DESC 'Asterisk Priority'
+  EQUALITY caseIgnoreMatch
+  SUBSTR caseIgnoreSubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+  )
+#
+attributeTypes: (
+  
+  NAME 'AstApplication'
+  DESC 'Asterisk Application'
+  EQUALITY caseIgnoreMatch
+  SUBSTR caseIgnoreSubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+  )
+#
+attributeTypes: (
+  
+  NAME 'AstApplicationData'
+  DESC 'Asterisk Application Data'
+  EQUALITY caseIgnoreMatch
+  SUBSTR caseIgnoreSubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+  )
+#
+attributeTypes: (
+  
+  NAME 'AstAccountAMAFlags'
+  DESC 'Asterisk Account AMA Flags'
+  EQUALITY caseIgnoreMatch
+  SUBSTR caseIgnoreSubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+  )
+#
+attributeTypes: (
+  
+  NAME 'AstAccountCallerID'
+  DESC 'Asterisk Account CallerID'
+  EQUALITY caseIgnoreMatch
+  SUBSTR caseIgnoreSubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+  )
+#
+attributeTypes: (
+  
+  NAME 'AstAccountContext'
+  DESC 'Asterisk Account Context'
+  EQUALITY caseIgnoreMatch
+  SUBSTR caseIgnoreSubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+  )
+#
+attributeTypes: (
+  
+  NAME 'AstAccountMailbox'
+  DESC 'Asterisk Account Mailbox'
+  EQUALITY caseIgnoreMatch
+  SUBSTR caseIgnoreSubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+  )
+#
+attributeTypes: (
+  
+  NAME 'AstMD5secret'
+  DESC 'Asterisk Account MD5 Secret'
+  EQUALITY caseIgnoreMatch
+  SUBSTR caseIgnoreSubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+  )
+#
+attributeTypes: (
+  
+  NAME 'AstAccountDeny'
+  DESC 'Asterisk Account Deny'
+  EQUALITY caseIgnoreMatch
+  SUBSTR caseIgnoreSubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+  )
+#
+attributeTypes: (
+  
+  NAME 'AstAccountPermit'
+  DESC 'Asterisk Account Permit'
+  EQUALITY caseIgnoreMatch
+  SUBSTR caseIgnoreSubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+  )
+#
+attributeTypes: (
+  
+  NAME 'AstAccountQualify'
+  DESC 'Asterisk Account Qualify'
+  EQUALITY caseIgnoreMatch
+  SUBSTR caseIgnoreSubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+  )
+#
+attributeTypes: (
+  
+  NAME 'AstAccountType'
+  DESC 'Asterisk Account Type'
+  EQUALITY caseIgnoreMatch
+  SUBSTR caseIgnoreSubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+  )
+#
+attributeTypes: (
+  
+  NAME 'AstAccountDisallowedCodec'
+  DESC 'Asterisk Account Disallowed Codec'
+  EQUALITY caseIgnoreMatch
+  SUBSTR caseIgnoreSubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+  )
+#
+attributeTypes: (
+  
+  NAME 'AstAccountExpirationTimestamp'
+  DESC 'Asterisk Account Allowed Codec'
+  EQUALITY caseIgnoreMatch
+  SUBSTR caseIgnoreSubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+  )
+#
+attributeTypes: (
+  
+  NAME 'AstAccountRegistrationContext'
+  DESC 'Asterisk Account AMA Flags'
+  EQUALITY caseIgnoreMatch
+  SUBSTR caseIgnoreSubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+  )
+#
+attributeTypes: (
+  
+  NAME 'AstAccountRegistrationExten'
+  DESC 'Asterisk Account AMA Flags'
+  EQUALITY caseIgnoreMatch
+  SUBSTR caseIgnoreSubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+  )
+#
+attributeTypes: (
+  
+  NAME 'AstAccountNoTransfer'
+  DESC 'Asterisk Account AMA Flags'
+  EQUALITY caseIgnoreMatch
+  SUBSTR caseIgnoreSubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+  )
+#
+attributeTypes: (
+  
+  NAME 'AstAccountCallGroup'
+  DESC 'Asterisk Account Call Group'
+  EQUALITY caseIgnoreMatch
+  SUBSTR caseIgnoreSubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+  )
+#
+attributeTypes: (
+  
+  NAME 'AstAccountCanReinvite'
+  DESC 'Asterisk Account Can Reinvite'
+  EQUALITY caseIgnoreMatch
+  SUBSTR caseIgnoreSubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+  )
+#
+attributeTypes: (
+  
+  NAME 'AstAccountDTMFMode'
+  DESC 'Asterisk Account DTMF Flags'
+  EQUALITY caseIgnoreMatch
+  SUBSTR caseIgnoreSubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+  )
+#
+attributeTypes: (
+  
+  NAME 'AstAccountFromUser'
+  DESC 'Asterisk Account From User'
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+  )
+#
+attributeTypes: (
+  
+  NAME 'AstAccountFromDomain'
+  DESC 'Asterisk Account From Domain'
+  EQUALITY caseIgnoreMatch
+  SUBSTR caseIgnoreSubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+  )
+#
+attributeTypes: (
+  
+  NAME 'AstAccountFullContact'
+  DESC 'Asterisk Account Full Contact'
+  EQUALITY caseIgnoreMatch
+  SUBSTR caseIgnoreSubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+  )
+#
+attributeTypes: (
+  
+  NAME 'AstAccountHost'
+  DESC 'Asterisk Account Host'
+  EQUALITY caseIgnoreMatch
+  SUBSTR caseIgnoreSubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+  )
+#
+attributeTypes: (
+  
+  NAME 'AstAccountInsecure'
+  DESC 'Asterisk Account Insecure'
+  EQUALITY caseIgnoreMatch
+  SUBSTR caseIgnoreSubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+  )
+#
+attributeTypes: (
+  
+  NAME 'AstAccountNAT'
+  DESC 'Asterisk Account NAT'
+  EQUALITY caseIgnoreMatch
+  SUBSTR caseIgnoreSubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+  )
+#
+attributeTypes: (
+  
+  NAME 'AstAccountPickupGroup'
+  DESC 'Asterisk Account PickupGroup'
+  EQUALITY caseIgnoreMatch
+  SUBSTR caseIgnoreSubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+  )
+#
+attributeTypes: (
+  
+  NAME 'AstAccountPort'
+  DESC 'Asterisk Account Port'
+  EQUALITY caseIgnoreMatch
+  SUBSTR caseIgnoreSubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+  )
+#
+attributeTypes: (
+  
+  NAME 'AstAccountRestrictCID'
+  DESC 'Asterisk Restrict CallerID'
+  EQUALITY caseIgnoreMatch
+  SUBSTR caseIgnoreSubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+  )
+#
+attributeTypes: (
+  
+  NAME 'AstAccountRTPTimeout'
+  DESC 'Asterisk RTP Timeout'
+  EQUALITY caseIgnoreMatch
+  SUBSTR caseIgnoreSubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+  )
+#
+attributeTypes: (
+  
+  NAME 'AstAccountRTPHoldTimeout'
+  DESC 'Asterisk RTP Hold Timeout'
+  EQUALITY caseIgnoreMatch
+  SUBSTR caseIgnoreSubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+  )
+#
+attributeTypes: (
+  
+  NAME 'AstAccountRealmedPassword'
+  DESC 'Asterisk RTP Hold Timeout'
+  EQUALITY caseIgnoreMatch
+  SUBSTR caseIgnoreSubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+  )
+#
+attributeTypes: (
+  
+  NAME 'AstAccountAllowedCodec'
+  DESC 'Asterisk Account Allowed Codec'
+  EQUALITY caseIgnoreMatch
+  SUBSTR caseIgnoreSubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+  )
+#
+attributeTypes: (
+  
+  NAME 'AstAccountMusicOnHold'
+  DESC 'Asterisk Account Allowed Codec'
+  EQUALITY caseIgnoreMatch
+  SUBSTR caseIgnoreSubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+  )
+#
+attributeTypes: (
+  
+  NAME 'AstAccountCanCallForward'
+  DESC 'Asterisk Can CAll Forward'
+  EQUALITY caseIgnoreMatch
+  SUBSTR caseIgnoreSubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+  )
+#
+attributeTypes: (
+  
+  NAME 'AstAccountSecret'
+  DESC 'Asterisk Can CAll Forward'
+  EQUALITY caseIgnoreMatch
+  SUBSTR caseIgnoreSubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+  )
+#
+attributeTypes: (
+  
+  NAME 'AstAccountName'
+  DESC 'Asterisk Account Username'
+  EQUALITY caseIgnoreMatch
+  SUBSTR caseIgnoreSubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+  )
+#
+attributeTypes: (
+  
+  NAME 'AstConfigFilename'
+  DESC 'Asterisk LDAP Configuration Filename'
+  EQUALITY caseIgnoreMatch
+  SUBSTR caseIgnoreSubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+  )
+#
+attributeTypes: (
+  
+  NAME 'AstConfigCategory'
+  DESC 'Asterisk LDAP Configuration Category'
+  EQUALITY caseIgnoreMatch
+  SUBSTR caseIgnoreSubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+  )
+#
+attributeTypes: (
+  
+  NAME 'AstConfigCategoryMetric'
+  DESC 'Asterisk LDAP Configuration Category Metric'
+  EQUALITY caseIgnoreMatch
+  SUBSTR caseIgnoreSubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+  )
+#
+attributeTypes: (
+  
+  NAME 'AstConfigVariableName'
+  DESC 'Asterisk LDAP Configuration Variable Name'
+  EQUALITY caseIgnoreMatch
+  SUBSTR caseIgnoreSubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+  )
+#
+attributeTypes: (
+  
+  NAME 'AstConfigVariableValue'
+  DESC 'Asterisk LDAP Configuration Variable Value'
+  EQUALITY caseIgnoreMatch
+  SUBSTR caseIgnoreSubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+  )
+#
+attributeTypes: (
+  
+  NAME 'AstConfigCommented'
+  DESC 'Asterisk LDAP Configuration Commented'
+  EQUALITY caseIgnoreMatch
+  SUBSTR caseIgnoreSubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+  )
+#
+attributeTypes: (
+  
+  NAME 'AstAccountIPAddress'
+  DESC 'Asterisk Account IP Address'
+  EQUALITY caseIgnoreMatch
+  SUBSTR caseIgnoreSubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+  )
+#
+attributeTypes: (
+  
+  NAME 'AstAccountDefaultUser'
+  DESC 'Asterisk Account Default User'
+  EQUALITY caseIgnoreMatch
+  SUBSTR caseIgnoreSubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+  )
+#
+attributeTypes: (
+  
+  NAME 'AstAccountRegistrationServer'
+  DESC 'Asterisk Account Registration Server'
+  EQUALITY caseIgnoreMatch
+  SUBSTR caseIgnoreSubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+  )
+#
+objectClasses: (
+  
+  NAME 'AsteriskExtension'
+  DESC 'PBX Extension Information for Asterisk'
+  SUP top
+  AUXILIARY
+  MUST cn
+  MAY ( AstContext $ AstExtension $ AstPriority $ AstApplication 
+      $ AstApplicationData )
+  )
+#
+objectClasses: (
+  
+  NAME 'AsteriskIAXUser'
+  DESC 'IAX2 User information for Asterisk'
+  SUP AsteriskExtension
+  AUXILIARY
+  MUST cn
+  MAY ( AstAccountAMAFlags $ AstAccountCallerID $ AstAccountContext 
+      $ AstAccountFullContact $ AstAccountHost $ AstAccountMailbox $ AstMD5secret 
+      $ AstAccountDeny $ AstAccountPermit $ AstAccountPort $ AstAccountQualify 
+      $ AstAccountType $ AstAccountDisallowedCodec $ AstAccountExpirationTimestamp 
+      $ AstAccountRegistrationContext$ AstAccountRegistrationExten 
+      $ AstAccountNoTransfer $ AstAccountName )
+  )
+#
+objectClasses: (
+  
+  NAME 'AsteriskSIPUser'
+  DESC 'SIP User information for Asterisk'
+  SUP AsteriskExtension
+  AUXILIARY
+  MUST cn
+  MAY ( AstAccountAMAFlags $ AstAccountCallGroup $ AstAccountCallerID 
+      $ AstAccountCanReinvite $ AstAccountContext $ AstAccountDefaultUser
+      $ AstAccountDTMFMode $ AstAccountFromUser $ AstAccountFromDomain 
+      $ AstAccountFullContact $ AstAccountHost $ AstAccountInsecure 
+      $ AstAccountIPAddress $ AstAccountMailbox $ AstAccountRealmedPassword 
+      $ AstAccountNAT $ AstAccountDeny $ AstAccountPermit $ AstAccountPickupGroup 
+      $ AstAccountPort $ AstAccountQualify $ AstAccountRestrictCID 
+      $ AstAccountRTPTimeout $ AstAccountRTPHoldTimeout $ AstAccountType 
+      $ AstAccountDisallowedCodec $ AstAccountAllowedCodec $ AstAccountMusicOnHold 
+      $ AstAccountExpirationTimestamp $ AstAccountRegistrationContext 
+      $ AstAccountRegistrationExten $ AstAccountRegistrationServer 
+      $ AstAccountCanCallForward $ AstAccountSecret $ AstAccountName )
+  )
+#
+objectClasses: (
+  
+  NAME 'AsteriskConfig'
+  DESC 'Asterisk configuration Information'
+  SUP top
+  AUXILIARY
+  MUST cn
+  MAY ( AstConfigFilename $ AstConfigCategory $ AstConfigCategoryMetric 
+      $ AstConfigVariableName $ AstConfigVariableValue $ AstConfigCommented )
+  )
-- 
1.6.1


0001-Modify-init-scripts-for-better-Fedora-compatibility.patch:

Index: 0001-Modify-init-scripts-for-better-Fedora-compatibility.patch
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/devel/0001-Modify-init-scripts-for-better-Fedora-compatibility.patch,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- 0001-Modify-init-scripts-for-better-Fedora-compatibility.patch	4 Jan 2009 19:19:14 -0000	1.8
+++ 0001-Modify-init-scripts-for-better-Fedora-compatibility.patch	5 Jan 2009 02:06:10 -0000	1.9
@@ -1,7 +1,7 @@
 From d397bc03e86335ed571121fa501dfefdc2ddbd4c Mon Sep 17 00:00:00 2001
 From: Jeffrey C. Ollie <jeff at ocjtech.us>
 Date: Sun, 18 Nov 2007 21:47:59 -0600
-Subject: [PATCH 01/12] Modify init scripts for better Fedora compatibility.
+Subject: [PATCH 01/13] Modify init scripts for better Fedora compatibility.
 
 ---
  contrib/init.d/rc.redhat.asterisk |   61 +++++++++++++++++-------------------

0002-Modify-modules.conf-so-that-different-voicemail-modu.patch:

Index: 0002-Modify-modules.conf-so-that-different-voicemail-modu.patch
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/devel/0002-Modify-modules.conf-so-that-different-voicemail-modu.patch,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- 0002-Modify-modules.conf-so-that-different-voicemail-modu.patch	4 Jan 2009 19:19:14 -0000	1.8
+++ 0002-Modify-modules.conf-so-that-different-voicemail-modu.patch	5 Jan 2009 02:06:10 -0000	1.9
@@ -1,7 +1,7 @@
 From e5d3f951bfa543e5d8b8cf85535f80b1d1143e09 Mon Sep 17 00:00:00 2001
 From: Jeffrey C. Ollie <jcollie at pc21224.campus.dmacc.edu>
 Date: Thu, 8 Nov 2007 15:52:36 -0600
-Subject: [PATCH 02/12] Modify modules.conf so that different voicemail modules can be loaded.
+Subject: [PATCH 02/13] Modify modules.conf so that different voicemail modules can be loaded.
 
 ---
  configs/modules.conf.sample |   26 ++++++++++++++++++++++++++

0003-Add-chan_mobile-from-asterisk-addons.patch:

Index: 0003-Add-chan_mobile-from-asterisk-addons.patch
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/devel/0003-Add-chan_mobile-from-asterisk-addons.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- 0003-Add-chan_mobile-from-asterisk-addons.patch	4 Jan 2009 19:19:14 -0000	1.4
+++ 0003-Add-chan_mobile-from-asterisk-addons.patch	5 Jan 2009 02:06:10 -0000	1.5
@@ -1,7 +1,7 @@
 From aeb688bc0889a4b035fd1590ba8df85af6e0a38c Mon Sep 17 00:00:00 2001
 From: Jeffrey C. Ollie <jeff at ocjtech.us>
 Date: Thu, 16 Oct 2008 16:12:01 -0500
-Subject: [PATCH 03/12] Add chan_mobile from asterisk-addons.
+Subject: [PATCH 03/13] Add chan_mobile from asterisk-addons.
 
 ---
  build_tools/menuselect-deps.in |    1 +

0004-Use-pkgconfig-to-check-for-Lua.patch:

Index: 0004-Use-pkgconfig-to-check-for-Lua.patch
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/devel/0004-Use-pkgconfig-to-check-for-Lua.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- 0004-Use-pkgconfig-to-check-for-Lua.patch	4 Jan 2009 19:19:15 -0000	1.4
+++ 0004-Use-pkgconfig-to-check-for-Lua.patch	5 Jan 2009 02:06:11 -0000	1.5
@@ -1,7 +1,7 @@
 From 24b4e78b81a06375e233ccc7745d5d3bc5b1cc7e Mon Sep 17 00:00:00 2001
 From: Jeffrey C. Ollie <jeff at ocjtech.us>
 Date: Mon, 25 Feb 2008 13:14:23 -0600
-Subject: [PATCH 04/12] Use pkgconfig to check for Lua.
+Subject: [PATCH 04/13] Use pkgconfig to check for Lua.
 
 ---
  configure.ac |    9 ++++++++-

0005-Build-using-external-libedit.patch:

Index: 0005-Build-using-external-libedit.patch
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/devel/0005-Build-using-external-libedit.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- 0005-Build-using-external-libedit.patch	4 Jan 2009 19:19:15 -0000	1.3
+++ 0005-Build-using-external-libedit.patch	5 Jan 2009 02:06:11 -0000	1.4
@@ -1,7 +1,7 @@
 From 1fc4e0fd9d7d24fd087a1c0d6f4dff5a1fec010f Mon Sep 17 00:00:00 2001
 From: Jeffrey C. Ollie <jeff at ocjtech.us>
 Date: Tue, 25 Mar 2008 00:50:27 -0500
-Subject: [PATCH 05/12] Build using external libedit.
+Subject: [PATCH 05/13] Build using external libedit.
 
 ---
  build_tools/menuselect-deps.in |    1 +

0006-Revert-changes-to-pbx_lua-from-rev-126363-that-cause.patch:

Index: 0006-Revert-changes-to-pbx_lua-from-rev-126363-that-cause.patch
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/devel/0006-Revert-changes-to-pbx_lua-from-rev-126363-that-cause.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- 0006-Revert-changes-to-pbx_lua-from-rev-126363-that-cause.patch	4 Jan 2009 19:19:15 -0000	1.3
+++ 0006-Revert-changes-to-pbx_lua-from-rev-126363-that-cause.patch	5 Jan 2009 02:06:11 -0000	1.4
@@ -1,7 +1,7 @@
 From eb9cc1a836086024bb619948468a80c4ff75bed9 Mon Sep 17 00:00:00 2001
 From: Jeffrey C. Ollie <jeff at ocjtech.us>
 Date: Fri, 10 Oct 2008 11:54:10 -0500
-Subject: [PATCH 06/12] Revert changes to pbx_lua from rev 126363 that cause some problems.
+Subject: [PATCH 06/13] Revert changes to pbx_lua from rev 126363 that cause some problems.
 
 ---
  pbx/pbx_lua.c |    6 +++---

0007-Define-missing-variable-when-compiling-on-PPC.patch:

Index: 0007-Define-missing-variable-when-compiling-on-PPC.patch
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/devel/0007-Define-missing-variable-when-compiling-on-PPC.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- 0007-Define-missing-variable-when-compiling-on-PPC.patch	4 Jan 2009 19:19:15 -0000	1.2
+++ 0007-Define-missing-variable-when-compiling-on-PPC.patch	5 Jan 2009 02:06:11 -0000	1.3
@@ -1,7 +1,7 @@
 From 06b01dff16e335004e107352fb9a87d56ab5dc57 Mon Sep 17 00:00:00 2001
 From: Jeffrey C. Ollie <jeff at ocjtech.us>
 Date: Fri, 7 Nov 2008 14:43:16 -0600
-Subject: [PATCH 07/12] Define missing variable when compiling on PPC.
+Subject: [PATCH 07/13] Define missing variable when compiling on PPC.
 
 ---
  apps/app_festival.c |    1 +

0008-change-configure.ac-to-look-for-pkg-config-gmime-2.4.patch:

Index: 0008-change-configure.ac-to-look-for-pkg-config-gmime-2.4.patch
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/devel/0008-change-configure.ac-to-look-for-pkg-config-gmime-2.4.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- 0008-change-configure.ac-to-look-for-pkg-config-gmime-2.4.patch	4 Jan 2009 19:19:15 -0000	1.2
+++ 0008-change-configure.ac-to-look-for-pkg-config-gmime-2.4.patch	5 Jan 2009 02:06:11 -0000	1.3
@@ -1,7 +1,7 @@
 From 15ba569e990035b085d2d983d3c22681ad82be89 Mon Sep 17 00:00:00 2001
 From: Caolan McNamara <caolanm at redhat.com>
 Date: Sat, 3 Jan 2009 19:06:18 -0600
-Subject: [PATCH 08/12] change configure.ac to look for pkg-config gmime-2.4 instead of gmime-2.4 gmime-config
+Subject: [PATCH 08/13] change configure.ac to look for pkg-config gmime-2.4 instead of gmime-2.4 gmime-config
 
 ---
  configure.ac |   12 +++++++++++-

0009-fix-the-AST_PROG_SED-problem-that-makes-.-bootstrap.patch:

Index: 0009-fix-the-AST_PROG_SED-problem-that-makes-.-bootstrap.patch
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/devel/0009-fix-the-AST_PROG_SED-problem-that-makes-.-bootstrap.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- 0009-fix-the-AST_PROG_SED-problem-that-makes-.-bootstrap.patch	4 Jan 2009 19:19:15 -0000	1.2
+++ 0009-fix-the-AST_PROG_SED-problem-that-makes-.-bootstrap.patch	5 Jan 2009 02:06:11 -0000	1.3
@@ -1,7 +1,7 @@
 From fc4a4f6207cb8454b6d3ec673dba10f8daf57050 Mon Sep 17 00:00:00 2001
 From: Caolan McNamara <caolanm at redhat.com>
 Date: Sat, 3 Jan 2009 19:12:18 -0600
-Subject: [PATCH 09/12] fix the AST_PROG_SED problem that makes ./bootstrap.sh fail
+Subject: [PATCH 09/13] fix the AST_PROG_SED problem that makes ./bootstrap.sh fail
 
 Need to regenerate configure from configure.ac after patch one with
 ./bootsrap.sh, so fix the broken .m4 in the autoconfig dir. (alternatively

0010-my-guess-as-replacements-for-the-missing-broken-stuf.patch:

Index: 0010-my-guess-as-replacements-for-the-missing-broken-stuf.patch
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/devel/0010-my-guess-as-replacements-for-the-missing-broken-stuf.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- 0010-my-guess-as-replacements-for-the-missing-broken-stuf.patch	4 Jan 2009 19:19:15 -0000	1.2
+++ 0010-my-guess-as-replacements-for-the-missing-broken-stuf.patch	5 Jan 2009 02:06:11 -0000	1.3
@@ -1,7 +1,7 @@
 From b7ccdf7e246f75f67529126fb309efd2e6793446 Mon Sep 17 00:00:00 2001
 From: Caolan McNamara <caolanm at redhat.com>
 Date: Sat, 3 Jan 2009 19:15:12 -0600
-Subject: [PATCH 10/12] my guess as replacements for the missing/broken stuff against the new gmime api
+Subject: [PATCH 10/13] my guess as replacements for the missing/broken stuff against the new gmime api
 
 ---
  res/res_http_post.c |   12 ++++--------

0011-Update-autoconf.patch:

Index: 0011-Update-autoconf.patch
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/devel/0011-Update-autoconf.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- 0011-Update-autoconf.patch	4 Jan 2009 19:19:15 -0000	1.2
+++ 0011-Update-autoconf.patch	5 Jan 2009 02:06:11 -0000	1.3
@@ -1,7 +1,7 @@
 From acb8f9151b2cf455374f877ce3ae81ffceb5d5dd Mon Sep 17 00:00:00 2001
 From: Jeffrey C. Ollie <jeff at ocjtech.us>
 Date: Sat, 3 Jan 2009 22:26:11 -0600
-Subject: [PATCH 11/12] Update autoconf.
+Subject: [PATCH 11/13] Update autoconf.
 
 ---
  configure                        |23473 ++++++++++++++++++++------------------

0012-Fix-up-some-paths.patch:

Index: 0012-Fix-up-some-paths.patch
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/devel/0012-Fix-up-some-paths.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 0012-Fix-up-some-paths.patch	4 Jan 2009 19:19:15 -0000	1.1
+++ 0012-Fix-up-some-paths.patch	5 Jan 2009 02:06:11 -0000	1.2
@@ -1,7 +1,7 @@
 From 561e2656fc6f73d256419aaa025ce391e67a96e6 Mon Sep 17 00:00:00 2001
 From: Jeffrey C. Ollie <jeff at ocjtech.us>
 Date: Sun, 4 Jan 2009 12:51:05 -0600
-Subject: [PATCH 12/12] Fix up some paths.
+Subject: [PATCH 12/13] Fix up some paths.
 
 ---
  UPGRADE-1.4.txt                             |    2 +-


Index: asterisk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/devel/asterisk.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- asterisk.spec	4 Jan 2009 19:19:15 -0000	1.45
+++ asterisk.spec	5 Jan 2009 02:06:11 -0000	1.46
@@ -3,7 +3,7 @@
 Summary: The Open Source PBX
 Name: asterisk
 Version: 1.6.1
-Release: 0.10%{?beta:beta%{beta}}%{?dist}
+Release: 0.11%{?beta:beta%{beta}}%{?dist}
 License: GPLv2
 Group: Applications/Internet
 URL: http://www.asterisk.org/
@@ -45,6 +45,7 @@
 Patch10: 0010-my-guess-as-replacements-for-the-missing-broken-stuf.patch
 Patch11: 0011-Update-autoconf.patch
 Patch12: 0012-Fix-up-some-paths.patch
+Patch13: 0013-Add-LDAP-schema-that-is-compatible-with-Fedora-Direc.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
 
@@ -245,6 +246,16 @@
 %description ldap
 LDAP resources for Asterisk.
 
+%package ldap-fds
+Summary: LDAP resources for Asterisk and the Fedora Directory Server
+Group: Applications/Internet
+Requires: asterisk = %{version}-%{release}
+Requires: asterisk-ldap = %{version}-%{release}
+Requires: fedora-ds-base
+
+%description ldap-fds
+LDAP resources for Asterisk and the Fedora Directory Server.
+
 %package misdn
 Summary: mISDN channel for Asterisk
 Group: Applications/Internet
@@ -433,6 +444,7 @@
 %patch10 -p1
 %patch11 -p1
 %patch12 -p1
+%patch13 -p1
 
 cp %{SOURCE2} menuselect.makedeps
 cp %{SOURCE3} menuselect.makeopts
@@ -515,6 +527,7 @@
 
 install -D -p -m 0755 contrib/init.d/rc.redhat.asterisk %{buildroot}%{_initrddir}/asterisk
 install -D -p -m 0644 contrib/sysconfig/asterisk %{buildroot}%{_sysconfdir}/sysconfig/asterisk
+install -D -p -m 0644 contrib/scripts/99asterisk.ldif %{buildroot}%{_sysconfdir}/dirsrv/schema/99asterisk.ldif
 install -D -p -m 0644 %{S:1} %{buildroot}%{_sysconfdir}/logrotate.d/asterisk
 install -D -p -m 0644 doc/asterisk-mib.txt %{buildroot}%{_datadir}/snmp/mibs/ASTERISK-MIB.txt
 install -D -p -m 0644 doc/digium-mib.txt %{buildroot}%{_datadir}/snmp/mibs/DIGIUM-MIB.txt
@@ -954,6 +967,10 @@
 %config(noreplace) %{_sysconfdir}/asterisk/res_ldap.conf
 %{_libdir}/asterisk/modules/res_config_ldap.so
 
+%files ldap-fds
+%defattr(-,root,root,-)
+%{_sysconfdir}/dirsrv/schema/99asterisk.ldif
+
 %files minivm
 %defattr(-,root,root,-)
 %config(noreplace) %{_sysconfdir}/asterisk/extensions_minivm.conf



From jcollie at fedoraproject.org  Mon Jan  5 02:26:49 2009
From: jcollie at fedoraproject.org (Jeffrey C. Ollie)
Date: Mon,  5 Jan 2009 02:26:49 +0000 (UTC)
Subject: rpms/asterisk/devel asterisk.spec,1.46,1.47
Message-ID: <20090105022650.1E74B7011F@cvs1.fedora.phx.redhat.com>

Author: jcollie

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

Modified Files:
	asterisk.spec 
Log Message:
* Sun Jan  4 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6.1-0.12.beta4
- Fedora Directory Server compatibility patch/subpackage.



Index: asterisk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/devel/asterisk.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- asterisk.spec	5 Jan 2009 02:06:11 -0000	1.46
+++ asterisk.spec	5 Jan 2009 02:26:17 -0000	1.47
@@ -3,7 +3,7 @@
 Summary: The Open Source PBX
 Name: asterisk
 Version: 1.6.1
-Release: 0.11%{?beta:beta%{beta}}%{?dist}
+Release: 0.12.%{?beta:beta%{beta}}%{?dist}
 License: GPLv2
 Group: Applications/Internet
 URL: http://www.asterisk.org/
@@ -1080,6 +1080,9 @@
 %{_libdir}/asterisk/modules/app_voicemail_plain.so
 
 %changelog
+* Sun Jan  4 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6.1-0.12.beta4
+- Fedora Directory Server compatibility patch/subpackage.
+
 * Sun Jan  4 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6.1-0.10.beta4
 - Fix up paths. BZ#477238
 



From dchen at fedoraproject.org  Mon Jan  5 02:42:20 2009
From: dchen at fedoraproject.org (Ding-Yi Chen)
Date: Mon,  5 Jan 2009 02:42:20 +0000 (UTC)
Subject: rpms/fbterm/EL-5 fbterm-1.3-setcap.patch, NONE, 1.1 .cvsignore, 1.3,
	1.4 fbterm.spec, 1.2, 1.3 import.log, 1.2, 1.3 sources, 1.3,
	1.4 fbterm-1.2-kernel-header.patch, 1.1, NONE
Message-ID: <20090105024220.4E2387013F@cvs1.fedora.phx.redhat.com>

Author: dchen

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

Modified Files:
	.cvsignore fbterm.spec import.log sources 
Added Files:
	fbterm-1.3-setcap.patch 
Removed Files:
	fbterm-1.2-kernel-header.patch 
Log Message:
Upstream update

fbterm-1.3-setcap.patch:

--- NEW FILE fbterm-1.3-setcap.patch ---
diff -up ./src/Makefile.in.setcap ./src/Makefile.in
--- ./src/Makefile.in.setcap	2009-01-05 10:23:56.000000000 +1000
+++ ./src/Makefile.in	2009-01-05 10:28:14.000000000 +1000
@@ -729,7 +729,7 @@ uninstall-am: uninstall-binPROGRAMS
 
 
 install-exec-hook:
- at HAVE_FS_CAPABILITY_TRUE@	setcap 'cap_sys_tty_config+ep' $(DESTDIR)$(bindir)/fbterm$(EXEEXT)
+#@HAVE_FS_CAPABILITY_TRUE@	setcap 'cap_sys_tty_config+ep' $(DESTDIR)$(bindir)/fbterm$(EXEEXT)
 @HAVE_FS_CAPABILITY_FALSE@	chmod u+s $(DESTDIR)$(bindir)/fbterm$(EXEEXT)
 # 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: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fbterm/EL-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	21 Nov 2008 07:23:33 -0000	1.3
+++ .cvsignore	5 Jan 2009 02:41:45 -0000	1.4
@@ -1 +1 @@
-fbterm-1.2.tar.gz
+fbterm-1.3.tar.gz


Index: fbterm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fbterm/EL-5/fbterm.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- fbterm.spec	21 Nov 2008 07:23:34 -0000	1.2
+++ fbterm.spec	5 Jan 2009 02:41:45 -0000	1.3
@@ -1,14 +1,15 @@
 Name:       fbterm
-Version:    1.2
-Release:    1%{?dist}
+Version:    1.3
+Release:    0%{?dist}
 License:    GPLv2+
 Group:      Applications/System
 URL:        http://code.google.com/p/fbterm/
 Source0:    http://fbterm.googlecode.com/files/%{name}-%{version}.tar.gz
-Patch0:     %{name}-1.2-kernel-header.patch   
-Summary:    FbTerm is a fast terminal emulator for linux with frame buffer device
-Summary(zh_CN): FbTerm ??????????????????????????????????????????????????? Linux ???????????????(framebuffer)?????????
-Summary(zh_TW): FbTerm ??????????????????????????????????????????????????? Linux ?????? framebuffer?????????
+#Patch0:     %{name}-1.2-kernel-header.patch
+Patch1:     %{name}-%{version}-setcap.patch
+Summary:    A frame buffer terminal emulator
+Summary(zh_CN): ??????????????????????????????????????????
+Summary(zh_TW): ?????????Framebuffer????????????????????????
 
 
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -35,7 +36,8 @@
 
 %prep
 %setup -q
-%patch0 -p0 -b .kernel-header
+#%patch0 -p0 -b .kernel-header
+%patch1 -p0 -b .signalfd
 
 %build
 %configure --disable-static --disable-rpath
@@ -46,9 +48,13 @@
 make DESTDIR=${RPM_BUILD_ROOT} install
 chmod 755 $RPM_BUILD_ROOT/%{_bindir}/%{name}
 
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post
+setcap 'cap_sys_tty_config+ep' %{_bindir}/%{name}
+
 %files 
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING README
@@ -57,7 +63,26 @@
 
 
 %changelog
-* Fri Nov 21 2008 Ding-Yi Chen <dchen at redhat dot com> - 1.2-1
+* Mon Jan 05 2009 Ding-Yi Chen <dchen at redhat dot com> - 1.3-0
+- Upstream update:
+  1. added command line arguments to change option values 
+  2. added client-server based input method framework 
+  3. added screen rotation support 
+  4. added support for visual type DIRECTCOLOR used by ATI cards 
+     (thanks for Witek's patch) 
+  5. fixed a bug that user can't input some unicode characters 
+  6. fixed a bug of maybe not restore original console state after 
+     FbTerm exited 
+  7. fixed several trivial bugs 
+  8. added using filesystem capability attributes offered by kernel 
+     2.6.27, instead of setting set-user-ID bit on FbTerm 
+  9. decreased memory usage of every shell instance by changing size 
+      of the struct saving every charater's attribute from 4 to 2 bytes
+
+* Thu Dec 11 2008 Ding-Yi Chen <dchen at redhat dot com> - 1.2-2
+- Summary simplified.
+
+* Fri Nov 21 2008 Ding-Yi Chen <dchen at redhat dot com> - 1.2-2
 - Upstream update, see 
  http://code.google.com/p/fbterm/
  for details.


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/fbterm/EL-5/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	21 Nov 2008 07:23:34 -0000	1.2
+++ import.log	5 Jan 2009 02:41:45 -0000	1.3
@@ -1,2 +1,3 @@
 fbterm-1_1-3_fc9:EL-5:fbterm-1.1-3.fc9.src.rpm:1224460854
 fbterm-1_2-1_fc9:EL-5:fbterm-1.2-1.fc9.src.rpm:1227252152
+fbterm-1_3-0_fc10:EL-5:fbterm-1.3-0.fc10.src.rpm:1231120976


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fbterm/EL-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	21 Nov 2008 07:23:34 -0000	1.3
+++ sources	5 Jan 2009 02:41:45 -0000	1.4
@@ -1 +1 @@
-92cc48ff42f6059722f72c62130ee97b  fbterm-1.2.tar.gz
+12f52f60390576866ce9f7696779050d  fbterm-1.3.tar.gz


--- fbterm-1.2-kernel-header.patch DELETED ---



From mbarnes at fedoraproject.org  Mon Jan  5 02:44:56 2009
From: mbarnes at fedoraproject.org (Matthew Barnes)
Date: Mon,  5 Jan 2009 02:44:56 +0000 (UTC)
Subject: rpms/pygobject2/devel .cvsignore, 1.18, 1.19 pygobject2.spec, 1.44, 
	1.45 sources, 1.18, 1.19 pygobject-2.15.2-threads-init.patch,
	1.3, NONE pygobject-gio-load-contents.patch, 1.2, NONE
Message-ID: <20090105024456.67E6E7013F@cvs1.fedora.phx.redhat.com>

Author: mbarnes

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

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

* Sun Jan 4 2009 - Matthew Barnes <mbarnes at redhat.com> - 2.16.0-1.fc11
- Update to 2.16.0
- Remove patch for RH bug #457502 (fixed upstream).
- Remove patch for GNOME bug #551059 and #551212 (fixed upstream).



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pygobject2/devel/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- .cvsignore	3 Sep 2008 11:17:42 -0000	1.18
+++ .cvsignore	5 Jan 2009 02:44:25 -0000	1.19
@@ -1 +1 @@
-pygobject-2.15.4.tar.bz2
+pygobject-2.16.0.tar.bz2


Index: pygobject2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pygobject2/devel/pygobject2.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- pygobject2.spec	29 Nov 2008 06:01:29 -0000	1.44
+++ pygobject2.spec	5 Jan 2009 02:44:25 -0000	1.45
@@ -1,14 +1,14 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
-# Last updated for version 2.15.1
+# Last updated for version 2.16.0
 %define glib2_version           2.16.0
 %define python2_version         2.3.5
 
 ### Abstract ###
 
 Name: pygobject2
-Version: 2.15.4
-Release: 4%{?dist}
+Version: 2.16.0
+Release: 1%{?dist}
 License: LGPLv2+
 Group: Development/Languages
 Summary: Python bindings for GObject
@@ -18,12 +18,6 @@
 
 ### Patches ###
 
-# RH bug #544946
-Patch0: pygobject-2.15.2-threads-init.patch
-# http://bugzilla.gnome.org/show_bug.cgi?id=551059
-# http://bugzilla.gnome.org/show_bug.cgi?id=551212
-Patch1: pygobject-gio-load-contents.patch
-
 ### Build Dependencies ###
 
 BuildRequires: automake
@@ -64,8 +58,6 @@
 
 %prep
 %setup -q -n pygobject-%{version}
-%patch0 -p1 -b .threads-init
-%patch1 -p0 -b .load-contents
 
 %build
 %configure --enable-thread
@@ -120,6 +112,11 @@
 %{_datadir}/pygobject/xsl
 
 %changelog
+* Sun Jan 4 2009 - Matthew Barnes <mbarnes at redhat.com> - 2.16.0-1.fc11
+- Update to 2.16.0
+- Remove patch for RH bug #457502 (fixed upstream).
+- Remove patch for GNOME bug #551059 and #551212 (fixed upstream).
+
 * Sat Nov 29 2008 - Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 2.15.4-4
 - Rebuild for Python 2.6
 
@@ -139,7 +136,7 @@
 - Modify thread initialization patch to fix RH bug #458522.
 
 * Thu Aug 07 2008 Matthew Barnes <mbarnes at redhat.com> - 2.15.2-2.fc10
-- Add patch for RH bug #544946 (error on gtk.gdk.threads_init).
+- Add patch for RH bug #457502 (error on gtk.gdk.threads_init).
 
 * Sat Jul 26 2008 Matthew Barnes <mbarnes at redhat.com> - 2.15.2-1.fc10
 - Update to 2.15.2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pygobject2/devel/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources	3 Sep 2008 11:17:42 -0000	1.18
+++ sources	5 Jan 2009 02:44:25 -0000	1.19
@@ -1 +1 @@
-df59affe5b8fd7148506c3473d479868  pygobject-2.15.4.tar.bz2
+431e7d4632163b93d1ee43cd071a389c  pygobject-2.16.0.tar.bz2


--- pygobject-2.15.2-threads-init.patch DELETED ---


--- pygobject-gio-load-contents.patch DELETED ---



From huzaifas at fedoraproject.org  Mon Jan  5 02:51:01 2009
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Mon,  5 Jan 2009 02:51:01 +0000 (UTC)
Subject: rpms/stun/EL-5 import.log,NONE,1.1 .cvsignore,1.1,1.2
Message-ID: <20090105025101.9D6777013F@cvs1.fedora.phx.redhat.com>

Author: huzaifas

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

Modified Files:
	.cvsignore 
Added Files:
	import.log 
Log Message:
initial import


--- NEW FILE import.log ---
stun-0_96-2_fc11:EL-5:stun-0.96-2.fc11.src.rpm:1231123872


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/stun/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	30 Sep 2008 04:33:00 -0000	1.1
+++ .cvsignore	5 Jan 2009 02:50:31 -0000	1.2
@@ -0,0 +1 @@
+stund_0.96_Aug13.tgz



From ianweller at fedoraproject.org  Mon Jan  5 02:58:16 2009
From: ianweller at fedoraproject.org (Ian Weller)
Date: Mon,  5 Jan 2009 02:58:16 +0000 (UTC)
Subject: rpms/python-transitfeed/devel import.log, NONE,
	1.1 python-transitfeed.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090105025816.0D32C7013F@cvs1.fedora.phx.redhat.com>

Author: ianweller

Update of /cvs/pkgs/rpms/python-transitfeed/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20060/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log python-transitfeed.spec 
Log Message:
importing python-transitfeed-1.1.9-4 in devel


--- NEW FILE import.log ---
python-transitfeed-1_1_9-4_fc10:HEAD:python-transitfeed-1.1.9-4.fc10.src.rpm:1231124207


--- NEW FILE python-transitfeed.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

Name:           python-transitfeed
Version:        1.1.9
Release:        4%{?dist}
Summary:        Google Transit Feed Specification library and tools

Group:          Development/Languages
License:        ASL 2.0
URL:            http://code.google.com/p/googletransitdatafeed/
Source0:        http://googletransitdatafeed.googlecode.com/files/transitfeed-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  python-devel
Requires:       pytz

%description
This module provides a library for reading, writing and validating Google
Transit Feed Specification files. It includes some scripts that validate a
feed, display it using the Google Maps API and the start of a KML importer and
exporter.


%prep
%setup -q -n transitfeed-%{version}


%build
%{__python} setup.py build


%install
rm -rf %{buildroot}
%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
rename '.py' '' %{buildroot}%{_bindir}/*.py
for exec in $(ls %{buildroot}%{_bindir}); do mv %{buildroot}%{_bindir}/$exec %{buildroot}%{_bindir}/gtfs-$exec; done
chmod a+x %{buildroot}%{_bindir}/*
sed -i '/#! \?\/usr\/bin\/.*/d' %{buildroot}%{python_sitelib}/*.py %{buildroot}%{python_sitelib}/gtfsscheduleviewer/*.py

 
%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%doc COPYING README
%{python_sitelib}/*
%{_bindir}/*


%changelog
* Sun Jan 04 2009 Ian Weller <ianweller at gmail.com> 1.1.9-4
- Whoops, that should be "gtfs-"

* Sat Jan 03 2009 Ian Weller <ianweller at gmail.com> 1.1.9-3
- Add a "gfts-" prefix to everything in /usr/bin to get rid of naming conflicts

* Thu Jan 01 2009 Ian Weller <ianweller at gmail.com> 1.1.9-2
- Remove shebangs on a couple of files in python_sitelib

* Sun Dec 21 2008 Ian Weller <ianweller at gmail.com> 1.1.9-1
- Initial package build.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-transitfeed/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	4 Jan 2009 20:21:51 -0000	1.1
+++ .cvsignore	5 Jan 2009 02:57:45 -0000	1.2
@@ -0,0 +1 @@
+transitfeed-1.1.9.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-transitfeed/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	4 Jan 2009 20:21:51 -0000	1.1
+++ sources	5 Jan 2009 02:57:45 -0000	1.2
@@ -0,0 +1 @@
+709ab37eaaa3b56e7ff5f874091aa390  transitfeed-1.1.9.tar.gz



From ianweller at fedoraproject.org  Mon Jan  5 02:59:40 2009
From: ianweller at fedoraproject.org (Ian Weller)
Date: Mon,  5 Jan 2009 02:59:40 +0000 (UTC)
Subject: rpms/python-transitfeed/F-10 import.log, NONE,
	1.1 python-transitfeed.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090105025940.6B9227013F@cvs1.fedora.phx.redhat.com>

Author: ianweller

Update of /cvs/pkgs/rpms/python-transitfeed/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20519/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	import.log python-transitfeed.spec 
Log Message:
importing python-transitfeed-1.1.9-4 in F-10


--- NEW FILE import.log ---
python-transitfeed-1_1_9-4_fc10:F-10:python-transitfeed-1.1.9-4.fc10.src.rpm:1231124315


--- NEW FILE python-transitfeed.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

Name:           python-transitfeed
Version:        1.1.9
Release:        4%{?dist}
Summary:        Google Transit Feed Specification library and tools

Group:          Development/Languages
License:        ASL 2.0
URL:            http://code.google.com/p/googletransitdatafeed/
Source0:        http://googletransitdatafeed.googlecode.com/files/transitfeed-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  python-devel
Requires:       pytz

%description
This module provides a library for reading, writing and validating Google
Transit Feed Specification files. It includes some scripts that validate a
feed, display it using the Google Maps API and the start of a KML importer and
exporter.


%prep
%setup -q -n transitfeed-%{version}


%build
%{__python} setup.py build


%install
rm -rf %{buildroot}
%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
rename '.py' '' %{buildroot}%{_bindir}/*.py
for exec in $(ls %{buildroot}%{_bindir}); do mv %{buildroot}%{_bindir}/$exec %{buildroot}%{_bindir}/gtfs-$exec; done
chmod a+x %{buildroot}%{_bindir}/*
sed -i '/#! \?\/usr\/bin\/.*/d' %{buildroot}%{python_sitelib}/*.py %{buildroot}%{python_sitelib}/gtfsscheduleviewer/*.py

 
%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%doc COPYING README
%{python_sitelib}/*
%{_bindir}/*


%changelog
* Sun Jan 04 2009 Ian Weller <ianweller at gmail.com> 1.1.9-4
- Whoops, that should be "gtfs-"

* Sat Jan 03 2009 Ian Weller <ianweller at gmail.com> 1.1.9-3
- Add a "gfts-" prefix to everything in /usr/bin to get rid of naming conflicts

* Thu Jan 01 2009 Ian Weller <ianweller at gmail.com> 1.1.9-2
- Remove shebangs on a couple of files in python_sitelib

* Sun Dec 21 2008 Ian Weller <ianweller at gmail.com> 1.1.9-1
- Initial package build.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-transitfeed/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	4 Jan 2009 20:21:51 -0000	1.1
+++ .cvsignore	5 Jan 2009 02:59:09 -0000	1.2
@@ -0,0 +1 @@
+transitfeed-1.1.9.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-transitfeed/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	4 Jan 2009 20:21:51 -0000	1.1
+++ sources	5 Jan 2009 02:59:10 -0000	1.2
@@ -0,0 +1 @@
+709ab37eaaa3b56e7ff5f874091aa390  transitfeed-1.1.9.tar.gz



From ianweller at fedoraproject.org  Mon Jan  5 03:06:27 2009
From: ianweller at fedoraproject.org (Ian Weller)
Date: Mon,  5 Jan 2009 03:06:27 +0000 (UTC)
Subject: rpms/python-transitfeed/F-9 import.log, NONE,
	1.1 python-transitfeed.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090105030627.C5E487013C@cvs1.fedora.phx.redhat.com>

Author: ianweller

Update of /cvs/pkgs/rpms/python-transitfeed/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22841/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	import.log python-transitfeed.spec 
Log Message:
importing python-transitfeed-1.1.9-4 in F-9


--- NEW FILE import.log ---
python-transitfeed-1_1_9-4_fc10:F-9:python-transitfeed-1.1.9-4.fc10.src.rpm:1231124400


--- NEW FILE python-transitfeed.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

Name:           python-transitfeed
Version:        1.1.9
Release:        4%{?dist}
Summary:        Google Transit Feed Specification library and tools

Group:          Development/Languages
License:        ASL 2.0
URL:            http://code.google.com/p/googletransitdatafeed/
Source0:        http://googletransitdatafeed.googlecode.com/files/transitfeed-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  python-devel
Requires:       pytz

%description
This module provides a library for reading, writing and validating Google
Transit Feed Specification files. It includes some scripts that validate a
feed, display it using the Google Maps API and the start of a KML importer and
exporter.


%prep
%setup -q -n transitfeed-%{version}


%build
%{__python} setup.py build


%install
rm -rf %{buildroot}
%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
rename '.py' '' %{buildroot}%{_bindir}/*.py
for exec in $(ls %{buildroot}%{_bindir}); do mv %{buildroot}%{_bindir}/$exec %{buildroot}%{_bindir}/gtfs-$exec; done
chmod a+x %{buildroot}%{_bindir}/*
sed -i '/#! \?\/usr\/bin\/.*/d' %{buildroot}%{python_sitelib}/*.py %{buildroot}%{python_sitelib}/gtfsscheduleviewer/*.py

 
%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%doc COPYING README
%{python_sitelib}/*
%{_bindir}/*


%changelog
* Sun Jan 04 2009 Ian Weller <ianweller at gmail.com> 1.1.9-4
- Whoops, that should be "gtfs-"

* Sat Jan 03 2009 Ian Weller <ianweller at gmail.com> 1.1.9-3
- Add a "gfts-" prefix to everything in /usr/bin to get rid of naming conflicts

* Thu Jan 01 2009 Ian Weller <ianweller at gmail.com> 1.1.9-2
- Remove shebangs on a couple of files in python_sitelib

* Sun Dec 21 2008 Ian Weller <ianweller at gmail.com> 1.1.9-1
- Initial package build.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-transitfeed/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	4 Jan 2009 20:21:51 -0000	1.1
+++ .cvsignore	5 Jan 2009 03:05:57 -0000	1.2
@@ -0,0 +1 @@
+transitfeed-1.1.9.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-transitfeed/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	4 Jan 2009 20:21:51 -0000	1.1
+++ sources	5 Jan 2009 03:05:57 -0000	1.2
@@ -0,0 +1 @@
+709ab37eaaa3b56e7ff5f874091aa390  transitfeed-1.1.9.tar.gz



From jcollie at fedoraproject.org  Mon Jan  5 03:10:31 2009
From: jcollie at fedoraproject.org (Jeffrey C. Ollie)
Date: Mon,  5 Jan 2009 03:10:31 +0000 (UTC)
Subject: rpms/asterisk/F-10
	0015-Add-LDAP-schema-that-is-compatible-with-Fedora-Direc.patch, NONE,
	1.1 0001-Modify-init-scripts-for-better-Fedora-compatibility.patch,
	1.7,
	1.8 0002-Modify-modules.conf-so-that-different-voicemail-modu.patch, 
	1.7,
	1.8 0003-Allow-alternate-extensions-to-be-specified-in-users.patch,
	1.6,
	1.7 0004-Minor-changes-to-reduce-packaging-changes-made-by-th.patch, 
	1.6, 1.7 0005-Add-chan_mobile-from-asterisk-addons.patch, 1.6,
	1.7 0006-Use-pkgconfig-to-check-for-Lua.patch, 1.6,
	1.7 0007-Build-using-external-libedit.patch, 1.6,
	1.7 0008-Revert-changes-to-pbx_lua-from-rev-126363-that-cause.patch, 
	1.3,
	1.4 0009-change-configure.ac-to-look-for-pkg-config-gmime-2.4.patch, 
	1.3,
	1.4 0010-fix-the-AST_PROG_SED-problem-that-makes-.-bootstrap.patch,
	1.3, 1.4 0011-Merged-revisions-160170-160172-via-svnmerge-from.patch, 
	1.3, 1.4 0012-Merged-revisions-162275-via-svnmerge-from.patch,
	1.2, 1.3 0013-Update-autoconf.patch, 1.2,
	1.3 0014-Fix-up-some-paths.patch, 1.1, 1.2 asterisk.spec, 1.40, 1.41
Message-ID: <20090105031031.6EC7A70108@cvs1.fedora.phx.redhat.com>

Author: jcollie

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

Modified Files:
	0001-Modify-init-scripts-for-better-Fedora-compatibility.patch 
	0002-Modify-modules.conf-so-that-different-voicemail-modu.patch 
	0003-Allow-alternate-extensions-to-be-specified-in-users.patch 
	0004-Minor-changes-to-reduce-packaging-changes-made-by-th.patch 
	0005-Add-chan_mobile-from-asterisk-addons.patch 
	0006-Use-pkgconfig-to-check-for-Lua.patch 
	0007-Build-using-external-libedit.patch 
	0008-Revert-changes-to-pbx_lua-from-rev-126363-that-cause.patch 
	0009-change-configure.ac-to-look-for-pkg-config-gmime-2.4.patch 
	0010-fix-the-AST_PROG_SED-problem-that-makes-.-bootstrap.patch 
	0011-Merged-revisions-160170-160172-via-svnmerge-from.patch 
	0012-Merged-revisions-162275-via-svnmerge-from.patch 
	0013-Update-autoconf.patch 0014-Fix-up-some-paths.patch 
	asterisk.spec 
Added Files:
	0015-Add-LDAP-schema-that-is-compatible-with-Fedora-Direc.patch 
Log Message:
* Sun Jan  4 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6.0.2-4
- Fedora Directory Server compatibility patch/subpackage. BZ#452176


0015-Add-LDAP-schema-that-is-compatible-with-Fedora-Direc.patch:

--- NEW FILE 0015-Add-LDAP-schema-that-is-compatible-with-Fedora-Direc.patch ---
>From f8a1e831086e6022b69773826f75f8bb759a40b5 Mon Sep 17 00:00:00 2001
From: Jeffrey C. Ollie <jeff at ocjtech.us>
Date: Sun, 4 Jan 2009 19:22:39 -0600
Subject: [PATCH 15/15] Add LDAP schema that is compatible with Fedora Directory Server.

---
 contrib/scripts/99asterisk.ldif |  489 +++++++++++++++++++++++++++++++++++++++
 1 files changed, 489 insertions(+), 0 deletions(-)
 create mode 100644 contrib/scripts/99asterisk.ldif

diff --git a/contrib/scripts/99asterisk.ldif b/contrib/scripts/99asterisk.ldif
new file mode 100644
index 0000000..ef878a8
--- /dev/null
+++ b/contrib/scripts/99asterisk.ldif
@@ -0,0 +1,489 @@
+dn: cn=schema
+#
+attributeTypes: (
+  
+  NAME 'AstContext'
+  DESC 'Asterisk Context'
+  EQUALITY caseIgnoreMatch
+  SUBSTR caseIgnoreSubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+  )
+#
+attributeTypes: (
+  
+  NAME 'AstExtension'
+  DESC 'Asterisk Extension'
+  EQUALITY caseIgnoreMatch
+  SUBSTR caseIgnoreSubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+  )
+#
+attributeTypes: (
+  
+  NAME 'AstPriority'
+  DESC 'Asterisk Priority'
+  EQUALITY caseIgnoreMatch
+  SUBSTR caseIgnoreSubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+  )
+#
+attributeTypes: (
+  
+  NAME 'AstApplication'
+  DESC 'Asterisk Application'
+  EQUALITY caseIgnoreMatch
+  SUBSTR caseIgnoreSubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+  )
+#
+attributeTypes: (
+  
+  NAME 'AstApplicationData'
+  DESC 'Asterisk Application Data'
+  EQUALITY caseIgnoreMatch
+  SUBSTR caseIgnoreSubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+  )
+#
+attributeTypes: (
+  
+  NAME 'AstAccountAMAFlags'
+  DESC 'Asterisk Account AMA Flags'
+  EQUALITY caseIgnoreMatch
+  SUBSTR caseIgnoreSubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+  )
+#
+attributeTypes: (
+  
+  NAME 'AstAccountCallerID'
+  DESC 'Asterisk Account CallerID'
+  EQUALITY caseIgnoreMatch
+  SUBSTR caseIgnoreSubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+  )
+#
+attributeTypes: (
+  
+  NAME 'AstAccountContext'
+  DESC 'Asterisk Account Context'
+  EQUALITY caseIgnoreMatch
+  SUBSTR caseIgnoreSubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+  )
+#
+attributeTypes: (
+  
+  NAME 'AstAccountMailbox'
+  DESC 'Asterisk Account Mailbox'
+  EQUALITY caseIgnoreMatch
+  SUBSTR caseIgnoreSubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+  )
+#
+attributeTypes: (
+  
+  NAME 'AstMD5secret'
+  DESC 'Asterisk Account MD5 Secret'
+  EQUALITY caseIgnoreMatch
+  SUBSTR caseIgnoreSubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+  )
+#
+attributeTypes: (
+  
+  NAME 'AstAccountDeny'
+  DESC 'Asterisk Account Deny'
+  EQUALITY caseIgnoreMatch
+  SUBSTR caseIgnoreSubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+  )
+#
+attributeTypes: (
+  
+  NAME 'AstAccountPermit'
+  DESC 'Asterisk Account Permit'
+  EQUALITY caseIgnoreMatch
+  SUBSTR caseIgnoreSubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+  )
+#
+attributeTypes: (
+  
+  NAME 'AstAccountQualify'
+  DESC 'Asterisk Account Qualify'
+  EQUALITY caseIgnoreMatch
+  SUBSTR caseIgnoreSubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+  )
+#
+attributeTypes: (
+  
+  NAME 'AstAccountType'
+  DESC 'Asterisk Account Type'
+  EQUALITY caseIgnoreMatch
+  SUBSTR caseIgnoreSubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+  )
+#
+attributeTypes: (
+  
+  NAME 'AstAccountDisallowedCodec'
+  DESC 'Asterisk Account Disallowed Codec'
+  EQUALITY caseIgnoreMatch
+  SUBSTR caseIgnoreSubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+  )
+#
+attributeTypes: (
+  
+  NAME 'AstAccountExpirationTimestamp'
+  DESC 'Asterisk Account Allowed Codec'
+  EQUALITY caseIgnoreMatch
+  SUBSTR caseIgnoreSubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+  )
+#
+attributeTypes: (
+  
+  NAME 'AstAccountRegistrationContext'
+  DESC 'Asterisk Account AMA Flags'
+  EQUALITY caseIgnoreMatch
+  SUBSTR caseIgnoreSubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+  )
+#
+attributeTypes: (
+  
+  NAME 'AstAccountRegistrationExten'
+  DESC 'Asterisk Account AMA Flags'
+  EQUALITY caseIgnoreMatch
+  SUBSTR caseIgnoreSubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+  )
+#
+attributeTypes: (
+  
+  NAME 'AstAccountNoTransfer'
+  DESC 'Asterisk Account AMA Flags'
+  EQUALITY caseIgnoreMatch
+  SUBSTR caseIgnoreSubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+  )
+#
+attributeTypes: (
+  
+  NAME 'AstAccountCallGroup'
+  DESC 'Asterisk Account Call Group'
+  EQUALITY caseIgnoreMatch
+  SUBSTR caseIgnoreSubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+  )
+#
+attributeTypes: (
+  
+  NAME 'AstAccountCanReinvite'
+  DESC 'Asterisk Account Can Reinvite'
+  EQUALITY caseIgnoreMatch
+  SUBSTR caseIgnoreSubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+  )
+#
+attributeTypes: (
+  
+  NAME 'AstAccountDTMFMode'
+  DESC 'Asterisk Account DTMF Flags'
+  EQUALITY caseIgnoreMatch
+  SUBSTR caseIgnoreSubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+  )
+#
+attributeTypes: (
+  
+  NAME 'AstAccountFromUser'
+  DESC 'Asterisk Account From User'
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+  )
+#
+attributeTypes: (
+  
+  NAME 'AstAccountFromDomain'
+  DESC 'Asterisk Account From Domain'
+  EQUALITY caseIgnoreMatch
+  SUBSTR caseIgnoreSubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+  )
+#
+attributeTypes: (
+  
+  NAME 'AstAccountFullContact'
+  DESC 'Asterisk Account Full Contact'
+  EQUALITY caseIgnoreMatch
+  SUBSTR caseIgnoreSubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+  )
+#
+attributeTypes: (
+  
+  NAME 'AstAccountHost'
+  DESC 'Asterisk Account Host'
+  EQUALITY caseIgnoreMatch
+  SUBSTR caseIgnoreSubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+  )
+#
+attributeTypes: (
+  
+  NAME 'AstAccountInsecure'
+  DESC 'Asterisk Account Insecure'
+  EQUALITY caseIgnoreMatch
+  SUBSTR caseIgnoreSubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+  )
+#
+attributeTypes: (
+  
+  NAME 'AstAccountNAT'
+  DESC 'Asterisk Account NAT'
+  EQUALITY caseIgnoreMatch
+  SUBSTR caseIgnoreSubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+  )
+#
+attributeTypes: (
+  
+  NAME 'AstAccountPickupGroup'
+  DESC 'Asterisk Account PickupGroup'
+  EQUALITY caseIgnoreMatch
+  SUBSTR caseIgnoreSubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+  )
+#
+attributeTypes: (
+  
+  NAME 'AstAccountPort'
+  DESC 'Asterisk Account Port'
+  EQUALITY caseIgnoreMatch
+  SUBSTR caseIgnoreSubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+  )
+#
+attributeTypes: (
+  
+  NAME 'AstAccountRestrictCID'
+  DESC 'Asterisk Restrict CallerID'
+  EQUALITY caseIgnoreMatch
+  SUBSTR caseIgnoreSubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+  )
+#
+attributeTypes: (
+  
+  NAME 'AstAccountRTPTimeout'
+  DESC 'Asterisk RTP Timeout'
+  EQUALITY caseIgnoreMatch
+  SUBSTR caseIgnoreSubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+  )
+#
+attributeTypes: (
+  
+  NAME 'AstAccountRTPHoldTimeout'
+  DESC 'Asterisk RTP Hold Timeout'
+  EQUALITY caseIgnoreMatch
+  SUBSTR caseIgnoreSubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+  )
+#
+attributeTypes: (
+  
+  NAME 'AstAccountRealmedPassword'
+  DESC 'Asterisk RTP Hold Timeout'
+  EQUALITY caseIgnoreMatch
+  SUBSTR caseIgnoreSubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+  )
+#
+attributeTypes: (
+  
+  NAME 'AstAccountAllowedCodec'
+  DESC 'Asterisk Account Allowed Codec'
+  EQUALITY caseIgnoreMatch
+  SUBSTR caseIgnoreSubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+  )
+#
+attributeTypes: (
+  
+  NAME 'AstAccountMusicOnHold'
+  DESC 'Asterisk Account Allowed Codec'
+  EQUALITY caseIgnoreMatch
+  SUBSTR caseIgnoreSubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+  )
+#
+attributeTypes: (
+  
+  NAME 'AstAccountCanCallForward'
+  DESC 'Asterisk Can CAll Forward'
+  EQUALITY caseIgnoreMatch
+  SUBSTR caseIgnoreSubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+  )
+#
+attributeTypes: (
+  
+  NAME 'AstAccountSecret'
+  DESC 'Asterisk Can CAll Forward'
+  EQUALITY caseIgnoreMatch
+  SUBSTR caseIgnoreSubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+  )
+#
+attributeTypes: (
+  
+  NAME 'AstAccountName'
+  DESC 'Asterisk Account Username'
+  EQUALITY caseIgnoreMatch
+  SUBSTR caseIgnoreSubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+  )
+#
+attributeTypes: (
+  
+  NAME 'AstConfigFilename'
+  DESC 'Asterisk LDAP Configuration Filename'
+  EQUALITY caseIgnoreMatch
+  SUBSTR caseIgnoreSubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+  )
+#
+attributeTypes: (
+  
+  NAME 'AstConfigCategory'
+  DESC 'Asterisk LDAP Configuration Category'
+  EQUALITY caseIgnoreMatch
+  SUBSTR caseIgnoreSubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+  )
+#
+attributeTypes: (
+  
+  NAME 'AstConfigCategoryMetric'
+  DESC 'Asterisk LDAP Configuration Category Metric'
+  EQUALITY caseIgnoreMatch
+  SUBSTR caseIgnoreSubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+  )
+#
+attributeTypes: (
+  
+  NAME 'AstConfigVariableName'
+  DESC 'Asterisk LDAP Configuration Variable Name'
+  EQUALITY caseIgnoreMatch
+  SUBSTR caseIgnoreSubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+  )
+#
+attributeTypes: (
+  
+  NAME 'AstConfigVariableValue'
+  DESC 'Asterisk LDAP Configuration Variable Value'
+  EQUALITY caseIgnoreMatch
+  SUBSTR caseIgnoreSubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+  )
+#
+attributeTypes: (
+  
+  NAME 'AstConfigCommented'
+  DESC 'Asterisk LDAP Configuration Commented'
+  EQUALITY caseIgnoreMatch
+  SUBSTR caseIgnoreSubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+  )
+#
+attributeTypes: (
+  
+  NAME 'AstAccountIPAddress'
+  DESC 'Asterisk Account IP Address'
+  EQUALITY caseIgnoreMatch
+  SUBSTR caseIgnoreSubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+  )
+#
+attributeTypes: (
+  
+  NAME 'AstAccountDefaultUser'
+  DESC 'Asterisk Account Default User'
+  EQUALITY caseIgnoreMatch
+  SUBSTR caseIgnoreSubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+  )
+#
+attributeTypes: (
+  
+  NAME 'AstAccountRegistrationServer'
+  DESC 'Asterisk Account Registration Server'
+  EQUALITY caseIgnoreMatch
+  SUBSTR caseIgnoreSubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+  )
+#
+objectClasses: (
+  
+  NAME 'AsteriskExtension'
+  DESC 'PBX Extension Information for Asterisk'
+  SUP top
+  AUXILIARY
+  MUST cn
+  MAY ( AstContext $ AstExtension $ AstPriority $ AstApplication 
+      $ AstApplicationData )
+  )
+#
+objectClasses: (
+  
+  NAME 'AsteriskIAXUser'
+  DESC 'IAX2 User information for Asterisk'
+  SUP AsteriskExtension
+  AUXILIARY
+  MUST cn
+  MAY ( AstAccountAMAFlags $ AstAccountCallerID $ AstAccountContext 
+      $ AstAccountFullContact $ AstAccountHost $ AstAccountMailbox $ AstMD5secret 
+      $ AstAccountDeny $ AstAccountPermit $ AstAccountPort $ AstAccountQualify 
+      $ AstAccountType $ AstAccountDisallowedCodec $ AstAccountExpirationTimestamp 
+      $ AstAccountRegistrationContext$ AstAccountRegistrationExten 
+      $ AstAccountNoTransfer $ AstAccountName )
+  )
+#
+objectClasses: (
+  
+  NAME 'AsteriskSIPUser'
+  DESC 'SIP User information for Asterisk'
+  SUP AsteriskExtension
+  AUXILIARY
+  MUST cn
+  MAY ( AstAccountAMAFlags $ AstAccountCallGroup $ AstAccountCallerID 
+      $ AstAccountCanReinvite $ AstAccountContext $ AstAccountDefaultUser
+      $ AstAccountDTMFMode $ AstAccountFromUser $ AstAccountFromDomain 
+      $ AstAccountFullContact $ AstAccountHost $ AstAccountInsecure 
+      $ AstAccountIPAddress $ AstAccountMailbox $ AstAccountRealmedPassword 
+      $ AstAccountNAT $ AstAccountDeny $ AstAccountPermit $ AstAccountPickupGroup 
+      $ AstAccountPort $ AstAccountQualify $ AstAccountRestrictCID 
+      $ AstAccountRTPTimeout $ AstAccountRTPHoldTimeout $ AstAccountType 
+      $ AstAccountDisallowedCodec $ AstAccountAllowedCodec $ AstAccountMusicOnHold 
+      $ AstAccountExpirationTimestamp $ AstAccountRegistrationContext 
+      $ AstAccountRegistrationExten $ AstAccountRegistrationServer 
+      $ AstAccountCanCallForward $ AstAccountSecret $ AstAccountName )
+  )
+#
+objectClasses: (
+  
+  NAME 'AsteriskConfig'
+  DESC 'Asterisk configuration Information'
+  SUP top
+  AUXILIARY
+  MUST cn
+  MAY ( AstConfigFilename $ AstConfigCategory $ AstConfigCategoryMetric 
+      $ AstConfigVariableName $ AstConfigVariableValue $ AstConfigCommented )
+  )
-- 
1.6.1


0001-Modify-init-scripts-for-better-Fedora-compatibility.patch:

Index: 0001-Modify-init-scripts-for-better-Fedora-compatibility.patch
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/F-10/0001-Modify-init-scripts-for-better-Fedora-compatibility.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- 0001-Modify-init-scripts-for-better-Fedora-compatibility.patch	4 Jan 2009 18:58:38 -0000	1.7
+++ 0001-Modify-init-scripts-for-better-Fedora-compatibility.patch	5 Jan 2009 03:10:28 -0000	1.8
@@ -1,7 +1,7 @@
 From 0040bd97782e9db8c341af9ffe171749644e35f1 Mon Sep 17 00:00:00 2001
 From: Jeffrey C. Ollie <jeff at ocjtech.us>
 Date: Sun, 18 Nov 2007 21:47:59 -0600
-Subject: [PATCH 01/14] Modify init scripts for better Fedora compatibility.
+Subject: [PATCH 01/15] Modify init scripts for better Fedora compatibility.
 
 ---
  contrib/init.d/rc.redhat.asterisk |   61 +++++++++++++++++-------------------

0002-Modify-modules.conf-so-that-different-voicemail-modu.patch:

Index: 0002-Modify-modules.conf-so-that-different-voicemail-modu.patch
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/F-10/0002-Modify-modules.conf-so-that-different-voicemail-modu.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- 0002-Modify-modules.conf-so-that-different-voicemail-modu.patch	4 Jan 2009 18:58:38 -0000	1.7
+++ 0002-Modify-modules.conf-so-that-different-voicemail-modu.patch	5 Jan 2009 03:10:28 -0000	1.8
@@ -1,7 +1,7 @@
 From 42cd072beba88049783a7bedb029760a5952706e Mon Sep 17 00:00:00 2001
 From: Jeffrey C. Ollie <jcollie at pc21224.campus.dmacc.edu>
 Date: Thu, 8 Nov 2007 15:52:36 -0600
-Subject: [PATCH 02/14] Modify modules.conf so that different voicemail modules can be loaded.
+Subject: [PATCH 02/15] Modify modules.conf so that different voicemail modules can be loaded.
 
 ---
  configs/modules.conf.sample |   27 +++++++++++++++++++++++++++

0003-Allow-alternate-extensions-to-be-specified-in-users.patch:

Index: 0003-Allow-alternate-extensions-to-be-specified-in-users.patch
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/F-10/0003-Allow-alternate-extensions-to-be-specified-in-users.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- 0003-Allow-alternate-extensions-to-be-specified-in-users.patch	4 Jan 2009 18:58:38 -0000	1.6
+++ 0003-Allow-alternate-extensions-to-be-specified-in-users.patch	5 Jan 2009 03:10:28 -0000	1.7
@@ -1,7 +1,7 @@
 From a9d27e3b5f93ff8658fa06a0c454140f27244363 Mon Sep 17 00:00:00 2001
 From: Jeffrey C. Ollie <jcollie at pc21224.campus.dmacc.edu>
 Date: Thu, 8 Nov 2007 16:32:56 -0600
-Subject: [PATCH 03/14] Allow alternate extensions to be specified in users.conf
+Subject: [PATCH 03/15] Allow alternate extensions to be specified in users.conf
 
 ---
  pbx/pbx_config.c |   14 ++++++++++++++

0004-Minor-changes-to-reduce-packaging-changes-made-by-th.patch:

Index: 0004-Minor-changes-to-reduce-packaging-changes-made-by-th.patch
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/F-10/0004-Minor-changes-to-reduce-packaging-changes-made-by-th.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- 0004-Minor-changes-to-reduce-packaging-changes-made-by-th.patch	4 Jan 2009 18:58:38 -0000	1.6
+++ 0004-Minor-changes-to-reduce-packaging-changes-made-by-th.patch	5 Jan 2009 03:10:28 -0000	1.7
@@ -1,7 +1,7 @@
 From 42991016984f9e7930686527706ab0f36baa41d1 Mon Sep 17 00:00:00 2001
 From: tilghman <tilghman at 614ede4d-c843-0410-af14-a771ab80d22e>
 Date: Tue, 29 Jul 2008 23:00:45 +0000
-Subject: [PATCH 04/14] Minor changes to reduce packaging changes made by the Fedora maintainer.
+Subject: [PATCH 04/15] Minor changes to reduce packaging changes made by the Fedora maintainer.
  (closes issue #12974)
   Reported by: jcollie
   Patches:

0005-Add-chan_mobile-from-asterisk-addons.patch:

Index: 0005-Add-chan_mobile-from-asterisk-addons.patch
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/F-10/0005-Add-chan_mobile-from-asterisk-addons.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- 0005-Add-chan_mobile-from-asterisk-addons.patch	4 Jan 2009 18:58:38 -0000	1.6
+++ 0005-Add-chan_mobile-from-asterisk-addons.patch	5 Jan 2009 03:10:28 -0000	1.7
@@ -1,7 +1,7 @@
 From 8cc8002094fe880d374a727aa0be389ca68b0342 Mon Sep 17 00:00:00 2001
 From: Jeffrey C. Ollie <jeff at ocjtech.us>
 Date: Mon, 25 Feb 2008 09:23:28 -0600
-Subject: [PATCH 05/14] Add chan_mobile from asterisk-addons.
+Subject: [PATCH 05/15] Add chan_mobile from asterisk-addons.
 
 ---
  build_tools/menuselect-deps.in |    1 +

0006-Use-pkgconfig-to-check-for-Lua.patch:

Index: 0006-Use-pkgconfig-to-check-for-Lua.patch
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/F-10/0006-Use-pkgconfig-to-check-for-Lua.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- 0006-Use-pkgconfig-to-check-for-Lua.patch	4 Jan 2009 18:58:38 -0000	1.6
+++ 0006-Use-pkgconfig-to-check-for-Lua.patch	5 Jan 2009 03:10:28 -0000	1.7
@@ -1,7 +1,7 @@
 From d633181f75ea7dc879e8ac9d014cf1fc0fe364ef Mon Sep 17 00:00:00 2001
 From: Jeffrey C. Ollie <jeff at ocjtech.us>
 Date: Mon, 25 Feb 2008 13:14:23 -0600
-Subject: [PATCH 06/14] Use pkgconfig to check for Lua.
+Subject: [PATCH 06/15] Use pkgconfig to check for Lua.
 
 ---
  configure.ac |    9 ++++++++-

0007-Build-using-external-libedit.patch:

Index: 0007-Build-using-external-libedit.patch
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/F-10/0007-Build-using-external-libedit.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- 0007-Build-using-external-libedit.patch	4 Jan 2009 18:58:38 -0000	1.6
+++ 0007-Build-using-external-libedit.patch	5 Jan 2009 03:10:28 -0000	1.7
@@ -1,7 +1,7 @@
 From a50090dc47540b5c3df28c9846fe753f5476c4fc Mon Sep 17 00:00:00 2001
 From: Jeffrey C. Ollie <jeff at ocjtech.us>
 Date: Tue, 25 Mar 2008 00:50:27 -0500
-Subject: [PATCH 07/14] Build using external libedit.
+Subject: [PATCH 07/15] Build using external libedit.
 
 ---
  build_tools/menuselect-deps.in |    1 +

0008-Revert-changes-to-pbx_lua-from-rev-126363-that-cause.patch:

Index: 0008-Revert-changes-to-pbx_lua-from-rev-126363-that-cause.patch
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/F-10/0008-Revert-changes-to-pbx_lua-from-rev-126363-that-cause.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- 0008-Revert-changes-to-pbx_lua-from-rev-126363-that-cause.patch	4 Jan 2009 18:58:38 -0000	1.3
+++ 0008-Revert-changes-to-pbx_lua-from-rev-126363-that-cause.patch	5 Jan 2009 03:10:28 -0000	1.4
@@ -1,7 +1,7 @@
 From a092080315b7bfa9b7d174b6114cb957ac1590d8 Mon Sep 17 00:00:00 2001
 From: Jeffrey C. Ollie <jeff at ocjtech.us>
 Date: Fri, 10 Oct 2008 11:54:10 -0500
-Subject: [PATCH 08/14] Revert changes to pbx_lua from rev 126363 that cause some problems.
+Subject: [PATCH 08/15] Revert changes to pbx_lua from rev 126363 that cause some problems.
 
 ---
  pbx/pbx_lua.c |    6 +++---

0009-change-configure.ac-to-look-for-pkg-config-gmime-2.4.patch:

Index: 0009-change-configure.ac-to-look-for-pkg-config-gmime-2.4.patch
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/F-10/0009-change-configure.ac-to-look-for-pkg-config-gmime-2.4.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- 0009-change-configure.ac-to-look-for-pkg-config-gmime-2.4.patch	4 Jan 2009 18:58:38 -0000	1.3
+++ 0009-change-configure.ac-to-look-for-pkg-config-gmime-2.4.patch	5 Jan 2009 03:10:28 -0000	1.4
@@ -1,7 +1,7 @@
 From 7719af5a016f40f573c90aae17910f7f77b9b4e6 Mon Sep 17 00:00:00 2001
 From: Caolan McNamara <caolanm at redhat.com>
 Date: Sat, 3 Jan 2009 19:06:18 -0600
-Subject: [PATCH 09/14] change configure.ac to look for pkg-config gmime-2.4 instead of gmime-2.4 gmime-config
+Subject: [PATCH 09/15] change configure.ac to look for pkg-config gmime-2.4 instead of gmime-2.4 gmime-config
 
 ---
  configure.ac |   12 +++++++++++-

0010-fix-the-AST_PROG_SED-problem-that-makes-.-bootstrap.patch:

Index: 0010-fix-the-AST_PROG_SED-problem-that-makes-.-bootstrap.patch
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/F-10/0010-fix-the-AST_PROG_SED-problem-that-makes-.-bootstrap.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- 0010-fix-the-AST_PROG_SED-problem-that-makes-.-bootstrap.patch	4 Jan 2009 18:58:38 -0000	1.3
+++ 0010-fix-the-AST_PROG_SED-problem-that-makes-.-bootstrap.patch	5 Jan 2009 03:10:28 -0000	1.4
@@ -1,7 +1,7 @@
 From 9a6c4641b2aa353c9076df9794d72fba5acdafb0 Mon Sep 17 00:00:00 2001
 From: Caolan McNamara <caolanm at redhat.com>
 Date: Sat, 3 Jan 2009 19:12:18 -0600
-Subject: [PATCH 10/14] fix the AST_PROG_SED problem that makes ./bootstrap.sh fail
+Subject: [PATCH 10/15] fix the AST_PROG_SED problem that makes ./bootstrap.sh fail
 
 Need to regenerate configure from configure.ac after patch one with
 ./bootsrap.sh, so fix the broken .m4 in the autoconfig dir. (alternatively

0011-Merged-revisions-160170-160172-via-svnmerge-from.patch:

Index: 0011-Merged-revisions-160170-160172-via-svnmerge-from.patch
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/F-10/0011-Merged-revisions-160170-160172-via-svnmerge-from.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- 0011-Merged-revisions-160170-160172-via-svnmerge-from.patch	4 Jan 2009 18:58:38 -0000	1.3
+++ 0011-Merged-revisions-160170-160172-via-svnmerge-from.patch	5 Jan 2009 03:10:29 -0000	1.4
@@ -1,7 +1,7 @@
 From c38fa4eb3cf989c110a737058c46a916ebab19c8 Mon Sep 17 00:00:00 2001
 From: seanbright <seanbright at f38db490-d61c-443f-a65b-d21fe96a405b>
 Date: Mon, 1 Dec 2008 23:41:16 +0000
-Subject: [PATCH 11/14] Merged revisions 160170-160172 via svnmerge from
+Subject: [PATCH 11/15] Merged revisions 160170-160172 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/trunk
 
 ................

0012-Merged-revisions-162275-via-svnmerge-from.patch:

Index: 0012-Merged-revisions-162275-via-svnmerge-from.patch
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/F-10/0012-Merged-revisions-162275-via-svnmerge-from.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- 0012-Merged-revisions-162275-via-svnmerge-from.patch	4 Jan 2009 18:58:38 -0000	1.2
+++ 0012-Merged-revisions-162275-via-svnmerge-from.patch	5 Jan 2009 03:10:29 -0000	1.3
@@ -1,7 +1,7 @@
 From 986c677766137383378252947eafb3eb8c86718a Mon Sep 17 00:00:00 2001
 From: file <file at f38db490-d61c-443f-a65b-d21fe96a405b>
 Date: Tue, 9 Dec 2008 20:47:11 +0000
-Subject: [PATCH 12/14] Merged revisions 162275 via svnmerge from
+Subject: [PATCH 12/15] Merged revisions 162275 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/trunk
 
 ................

0013-Update-autoconf.patch:

Index: 0013-Update-autoconf.patch
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/F-10/0013-Update-autoconf.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- 0013-Update-autoconf.patch	4 Jan 2009 18:58:38 -0000	1.2
+++ 0013-Update-autoconf.patch	5 Jan 2009 03:10:29 -0000	1.3
@@ -1,7 +1,7 @@
 From 249cd4bd1b4b9a0b99a07d44359e098c10dacbdb Mon Sep 17 00:00:00 2001
 From: Jeffrey C. Ollie <jeff at ocjtech.us>
 Date: Sun, 4 Jan 2009 00:37:02 -0600
-Subject: [PATCH 13/14] Update autoconf.
+Subject: [PATCH 13/15] Update autoconf.
 
 ---
  configure                        |23025 ++++++++++++++++++++------------------

0014-Fix-up-some-paths.patch:

Index: 0014-Fix-up-some-paths.patch
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/F-10/0014-Fix-up-some-paths.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 0014-Fix-up-some-paths.patch	4 Jan 2009 18:58:38 -0000	1.1
+++ 0014-Fix-up-some-paths.patch	5 Jan 2009 03:10:29 -0000	1.2
@@ -1,7 +1,7 @@
 From 57e9e58cb5d501da652d227eb8c07b2593d333ff Mon Sep 17 00:00:00 2001
 From: Jeffrey C. Ollie <jeff at ocjtech.us>
 Date: Sun, 4 Jan 2009 12:51:05 -0600
-Subject: [PATCH 14/14] Fix up some paths.
+Subject: [PATCH 14/15] Fix up some paths.
 
 ---
  UPGRADE-1.4.txt                             |    2 +-


Index: asterisk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/F-10/asterisk.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- asterisk.spec	4 Jan 2009 18:58:38 -0000	1.40
+++ asterisk.spec	5 Jan 2009 03:10:29 -0000	1.41
@@ -3,7 +3,7 @@
 Summary: The Open Source PBX
 Name: asterisk
 Version: 1.6.0.2
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2
 Group: Applications/Internet
 URL: http://www.asterisk.org/
@@ -47,6 +47,7 @@
 Patch12: 0012-Merged-revisions-162275-via-svnmerge-from.patch
 Patch13: 0013-Update-autoconf.patch
 Patch14: 0014-Fix-up-some-paths.patch
+Patch15: 0015-Add-LDAP-schema-that-is-compatible-with-Fedora-Direc.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
 
@@ -235,6 +236,16 @@
 %description ldap
 LDAP resources for Asterisk.
 
+%package ldap-fds
+Summary: LDAP resources for Asterisk and the Fedora Directory Server
+Group: Applications/Internet
+Requires: asterisk = %{version}-%{release}
+Requires: asterisk-ldap = %{version}-%{release}
+Requires: fedora-ds-base
+
+%description ldap-fds
+LDAP resources for Asterisk and the Fedora Directory Server.
+
 %package misdn
 Summary: mISDN channel for Asterisk
 Group: Applications/Internet
@@ -425,6 +436,7 @@
 %patch12 -p1
 %patch13 -p1
 %patch14 -p1
+%patch15 -p1
 
 cp %{SOURCE2} menuselect.makedeps
 cp %{SOURCE3} menuselect.makeopts
@@ -505,6 +517,7 @@
 
 install -D -p -m 0755 contrib/init.d/rc.redhat.asterisk %{buildroot}%{_initrddir}/asterisk
 install -D -p -m 0644 contrib/sysconfig/asterisk %{buildroot}%{_sysconfdir}/sysconfig/asterisk
+install -D -p -m 0644 contrib/scripts/99asterisk.ldif %{buildroot}%{_sysconfdir}/dirsrv/schema/99asterisk.ldif
 install -D -p -m 0644 %{S:1} %{buildroot}%{_sysconfdir}/logrotate.d/asterisk
 install -D -p -m 0644 doc/asterisk-mib.txt %{buildroot}%{_datadir}/snmp/mibs/ASTERISK-MIB.txt
 install -D -p -m 0644 doc/digium-mib.txt %{buildroot}%{_datadir}/snmp/mibs/DIGIUM-MIB.txt
@@ -928,6 +941,10 @@
 %config(noreplace) %{_sysconfdir}/asterisk/res_ldap.conf
 %{_libdir}/asterisk/modules/res_config_ldap.so
 
+%files ldap-fds
+%defattr(-,root,root,-)
+%{_sysconfdir}/dirsrv/schema/99asterisk.ldif
+
 %files minivm
 %defattr(-,root,root,-)
 %config(noreplace) %{_sysconfdir}/asterisk/extensions_minivm.conf
@@ -1037,6 +1054,9 @@
 %{_libdir}/asterisk/modules/app_voicemail_plain.so
 
 %changelog
+* Sun Jan  4 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6.0.2-4
+- Fedora Directory Server compatibility patch/subpackage. BZ#452176
+
 * Sun Jan  4 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6.0.2-3
 - Don't package func_curl in the main package. BZ#475910
 - Fix up paths. BZ#477238



From cweyl at fedoraproject.org  Mon Jan  5 04:18:07 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Mon,  5 Jan 2009 04:18:07 +0000 (UTC)
Subject: rpms/perl-Moose/devel .cvsignore, 1.23, 1.24 perl-Moose.spec, 1.32, 
	1.33 sources, 1.23, 1.24
Message-ID: <20090105041807.D507C7011F@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Moose/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11018

Modified Files:
	.cvsignore perl-Moose.spec sources 
Log Message:
* Sun Jan 04 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.64-1
- update to 0.64



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Moose/devel/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- .cvsignore	29 Dec 2008 00:36:07 -0000	1.23
+++ .cvsignore	5 Jan 2009 04:17:35 -0000	1.24
@@ -1,5 +1 @@
-Moose-0.63.tar.gz
-*.rpm
-*.gz
-*.tar
-*.log
+Moose-0.64.tar.gz


Index: perl-Moose.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Moose/devel/perl-Moose.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- perl-Moose.spec	29 Dec 2008 00:36:07 -0000	1.32
+++ perl-Moose.spec	5 Jan 2009 04:17:35 -0000	1.33
@@ -1,5 +1,5 @@
 Name:           perl-Moose
-Version:        0.63
+Version:        0.64
 Release:        1%{?dist}
 Summary:        Complete modern object system for Perl 5
 License:        GPL+ or Artistic
@@ -15,7 +15,7 @@
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 BuildRequires:  perl(ExtUtils::MakeMaker)
-BuildRequires:  perl(Class::MOP)         >= 0.72
+BuildRequires:  perl(Class::MOP)         >= 0.75
 BuildRequires:  perl(Filter::Simple) 
 BuildRequires:  perl(List::MoreUtils)    >= 0.12
 BuildRequires:  perl(Scalar::Util)       >= 1.19
@@ -111,6 +111,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Sun Jan 04 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.64-1
+- update to 0.64
+
 * Sun Dec 28 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.63-1
 - update to 0.63
 - bump br versions on Moose, List::MoreUtils


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Moose/devel/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sources	29 Dec 2008 00:36:07 -0000	1.23
+++ sources	5 Jan 2009 04:17:35 -0000	1.24
@@ -1 +1 @@
-1f8b7d335ac0edd9532167636df4002d  Moose-0.63.tar.gz
+1f1dfa4312926b272e05e3a9b89dca5b  Moose-0.64.tar.gz



From lutter at fedoraproject.org  Mon Jan  5 04:22:18 2009
From: lutter at fedoraproject.org (David Lutterkort)
Date: Mon,  5 Jan 2009 04:22:18 +0000 (UTC)
Subject: rpms/augeas/EL-4 datadir.patch,NONE,1.1 augeas.spec,1.11,1.12
Message-ID: <20090105042218.10D147011F@cvs1.fedora.phx.redhat.com>

Author: lutter

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

Modified Files:
	augeas.spec 
Added Files:
	datadir.patch 
Log Message:
Fix bz 478619

datadir.patch:

--- NEW FILE datadir.patch ---
diff -urN augeas-0.3.5.orig/src/Makefile.am augeas-0.3.5/src/Makefile.am
--- augeas-0.3.5.orig/src/Makefile.am	2008-12-24 02:21:25.000000000 +0100
+++ augeas-0.3.5/src/Makefile.am	2009-01-04 16:53:36.000000000 +0100
@@ -45,7 +45,7 @@
 internal.h: datadir.h
 
 FORCE-datadir.h: Makefile
-	echo '#define DATADIR "$(abspath $(datadir))"' > datadir.h1
+	echo '#define DATADIR "$(datadir)"' > datadir.h1
 	$(top_srcdir)/build/aux/move-if-change datadir.h1 datadir.h
 
 datadir.h: FORCE-datadir.h
diff -urN augeas-0.3.5.orig/src/Makefile.in augeas-0.3.5/src/Makefile.in
--- augeas-0.3.5.orig/src/Makefile.in	2008-12-24 07:05:51.000000000 +0100
+++ augeas-0.3.5/src/Makefile.in	2009-01-04 16:53:49.000000000 +0100
@@ -898,7 +898,7 @@
 internal.h: datadir.h
 
 FORCE-datadir.h: Makefile
-	echo '#define DATADIR "$(abspath $(datadir))"' > datadir.h1
+	echo '#define DATADIR "$(datadir)"' > datadir.h1
 	$(top_srcdir)/build/aux/move-if-change datadir.h1 datadir.h
 
 datadir.h: FORCE-datadir.h


Index: augeas.spec
===================================================================
RCS file: /cvs/pkgs/rpms/augeas/EL-4/augeas.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- augeas.spec	24 Dec 2008 06:24:01 -0000	1.11
+++ augeas.spec	5 Jan 2009 04:21:47 -0000	1.12
@@ -1,12 +1,13 @@
 Name:           augeas
 Version:        0.3.5
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A library for changing configuration files
 
 Group:          System Environment/Libraries
 License:        LGPLv2+
 URL:            http://augeas.net/
 Source0:        http://augeas.net/download/%{name}-%{version}.tar.gz
+Patch0:         datadir.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  readline-devel
@@ -43,6 +44,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %configure --disable-static
@@ -80,6 +82,9 @@
 %{_libdir}/pkgconfig/augeas.pc
 
 %changelog
+* Sun Jan  4 2009 David Lutterkort <lutter at redhat.com> - 0.3.5-2
+- Add patch to fix bz478619
+
 * Tue Dec 23 2008 David Lutterkort <lutter at redhat.com> - 0.3.5-1
 - New version
 



From kevin at fedoraproject.org  Mon Jan  5 05:04:23 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon,  5 Jan 2009 05:04:23 +0000 (UTC)
Subject: rpms/munin/devel munin.spec,1.17,1.18
Message-ID: <20090105050424.24E0B7011F@cvs1.fedora.phx.redhat.com>

Author: kevin

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

Modified Files:
	munin.spec 
Log Message:
Require bitstream-vera-fonts-sans-mono for Font (fixes #477428)



Index: munin.spec
===================================================================
RCS file: /cvs/extras/rpms/munin/devel/munin.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- munin.spec	12 Aug 2008 03:02:19 -0000	1.17
+++ munin.spec	5 Jan 2009 05:03:50 -0000	1.18
@@ -1,6 +1,6 @@
 Name:      munin
 Version:   1.2.6
-Release:   3%{?dist}
+Release:   4%{?dist}
 Summary:   Network-wide graphing framework (grapher/gatherer)
 License:   GPLv2 and Bitstream Vera
 Group:     System Environment/Daemons
@@ -25,6 +25,7 @@
 Requires: logrotate
 Requires(pre): shadow-utils
 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+Requires: bitstream-vera-fonts-sans-mono
 
 %description
 Munin is a highly flexible and powerful solution used to create graphs of
@@ -147,6 +148,10 @@
 sed -i -e 's/\$MUNIN_LIBDIR/\/usr\/share\/munin\//' %{buildroot}%{_datadir}/munin/plugins/multips
 sed -i -e 's/\$MUNIN_LIBDIR/\/usr\/share\/munin\//' %{buildroot}%{_datadir}/munin/plugins/df_abs
 
+# Use font from bitstream-vera-fonts-sans-mono
+rm -f $RPM_BUILD_ROOT/%{_datadir}/munin/VeraMono.ttf
+ln -s /usr/share/fonts/bitstream-vera/VeraMono.ttf $RPM_BUILD_ROOT/%{_datadir}/munin/VeraMono.ttf
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -241,6 +246,9 @@
 %doc %{_mandir}/man5/munin-node*
 
 %changelog
+* Sun Jan 04 2009 Kevin Fenzi <kevin at tummy.com> - 1.2.6-4
+- Require bitstream-vera-fonts-sans-mono for Font (fixes #477428)
+
 * Mon Aug 11 2008 Kevin Fenzi <kevin at tummy.com> - 1.2.6-3
 - Move Munin/Plugin.pm to the node subpackage (fixes #457403)
 



From pbrobinson at fedoraproject.org  Mon Jan  5 05:11:18 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Mon,  5 Jan 2009 05:11:18 +0000 (UTC)
Subject: rpms/libiphone/F-9 libiphone.spec,1.1,1.2 sources,1.2,1.3
Message-ID: <20090105051118.ED5F27011F@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

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

Modified Files:
	libiphone.spec sources 
Log Message:
- new git snapshot



Index: libiphone.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libiphone/F-9/libiphone.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libiphone.spec	4 Dec 2008 13:57:46 -0000	1.1
+++ libiphone.spec	5 Jan 2009 05:10:48 -0000	1.2
@@ -2,21 +2,21 @@
 # git clone http://git.matt.colyer.name/2008/libiphone/
 # git-archive --format=tar --prefix=libiphone-0.1.0/ %{git_version} | bzip2 > libiphone-0.1.0-20081201.tar.bz2
 
-%define gitdate 20081201
-%define git_version 8c3a01e
+%define gitdate 20090103
+%define git_version 5cde554
 %define tarfile %{name}-%{version}-%{gitdate}.tar.bz2
 %define snapshot %{gitdate}git%{git_version}
 
 Name:           libiphone
 Version:        0.1.0
-Release:        3.%{snapshot}%{?dist}
+Release:        4.%{snapshot}%{?dist}
 Summary:        Library for connecting to Apple iPhone and iPod touch
 
 Group:          System Environment/Libraries
 License:        LGPLv2+
 URL:            http://matt.colyer.name/projects/iphone-linux/
 
-Source0:	%{tarfile}
+Source0:        %{tarfile}
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: libxml2-devel
@@ -77,6 +77,9 @@
 %{_includedir}/libiphone
 
 %changelog
+* Mon Jan 5 2009 Peter Robinson <pbrobinson at gmail.com> 0.1.0-4.git5cde554
+- Update to latest git snapshot
+
 * Tue Dec 2 2008 Peter Robinson <pbrobinson at gmail.com> 0.1.0-3.git8c3a01e
 - Fix git file generation
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libiphone/F-9/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	4 Dec 2008 13:57:46 -0000	1.2
+++ sources	5 Jan 2009 05:10:48 -0000	1.3
@@ -1 +1 @@
-c360e277e5a361667245561d010c4a76  libiphone-0.1.0-20081201.tar.bz2
+1c6950b2ddf6cf2ed103b616cde0b13a  libiphone-0.1.0-20090103.tar.bz2



From kevin at fedoraproject.org  Mon Jan  5 05:17:07 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon,  5 Jan 2009 05:17:07 +0000 (UTC)
Subject: rpms/rkhunter/F-10 sources, 1.9, 1.10 .cvsignore, 1.8,
	1.9 rkhunter.spec, 1.17, 1.18
Message-ID: <20090105051707.217BF7011F@cvs1.fedora.phx.redhat.com>

Author: kevin

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

Modified Files:
	sources .cvsignore rkhunter.spec 
Log Message:
Update to 1.3.4
Use libdir as tmp dir - bug #456340



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rkhunter/F-10/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	29 Feb 2008 03:33:37 -0000	1.9
+++ sources	5 Jan 2009 05:16:36 -0000	1.10
@@ -1 +1 @@
-a00ff64d7076d6ff47ef0c9f0b6202f2  rkhunter-1.3.2.tar.gz
+31eaacc4d01ad138d1a4283f105088e6  rkhunter-1.3.4.tar.gz


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rkhunter/F-10/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	29 Feb 2008 03:33:37 -0000	1.8
+++ .cvsignore	5 Jan 2009 05:16:36 -0000	1.9
@@ -1 +1 @@
-rkhunter-1.3.2.tar.gz
+rkhunter-1.3.4.tar.gz


Index: rkhunter.spec
===================================================================
RCS file: /cvs/extras/rpms/rkhunter/F-10/rkhunter.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- rkhunter.spec	15 Sep 2008 21:55:21 -0000	1.17
+++ rkhunter.spec	5 Jan 2009 05:16:36 -0000	1.18
@@ -1,16 +1,15 @@
 Name:           rkhunter
-Version:        1.3.2
-Release:        5%{?dist}
+Version:        1.3.4
+Release:        1%{?dist}
 Summary:        A host-based tool to scan for rootkits, backdoors and local exploits
 
 Group:          Applications/System
 License:        GPLv2+
 URL:            http://rkhunter.sourceforge.net/
-Source0:        http://downloads.sourceforge.net/rkhunter/rkhunter-1.3.2.tar.gz
-Source1:        http://downloads.sourceforge.net/rkhunter/rkhunter-1.3.2.tar.gz.sha1.txt
+Source0:        http://downloads.sourceforge.net/rkhunter/rkhunter-%{version}.tar.gz
+Source1:        http://downloads.sourceforge.net/rkhunter/rkhunter-%{version}.tar.gz.sha1.txt
 Source2:        01-rkhunter
 Source3:        rkhunter.sysconfig
-Patch0:		rkhunter-1.3.2-debugtmp.patch
 BuildArch:      noarch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -29,7 +28,7 @@
 
 %{__perl} -pi.0001 -e '
 	s|^#(MAIL-ON-WARNING=).+$|$1root\@localhost|;
-	s|^#(TMPDIR=).+$|$1%{_var}/run/%{name}|;
+	s|^#(TMPDIR=).+$|$1%{_var}/lib/%{name}|;
 	s|^#(DBDIR=).+$|$1%{_var}/lib/%{name}/db|;
 	s|^#(SCRIPTDIR=).+$|$1%{_datadir}/%{name}/scripts|;
 	s|^#(PKGMGR=).+$|$1RPM|;
@@ -70,8 +69,6 @@
 }
 EOF
 
-%patch0 -p1
-
 %build
 # Nothing to be built
 
@@ -139,6 +136,14 @@
 %{_mandir}/man8/*
 
 %changelog
+* Fri Jan 02 2009 Kevin Fenzi <kevin at tummy.com> - 1.3.4-1
+- Update to 1.3.4
+- Use libdir as tmp dir - bug #456340
+
+* Sat Dec 13 2008 Kevin Fenzi <kevin at tummy.com> - 1.3.2-6
+- Fix cron job sending as attachment - bug #472679
+- Fix cron job trying to send with colors - bug #475916
+
 * Wed Sep 03 2008 Kevin Fenzi <kevin at tummy.com> - 1.3.2-5
 - Patch debug tmp file issue - bug #460628
 



From kevin at fedoraproject.org  Mon Jan  5 05:18:53 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon,  5 Jan 2009 05:18:53 +0000 (UTC)
Subject: rpms/rkhunter/F-10 01-rkhunter,1.4,1.5
Message-ID: <20090105051853.2B2857011F@cvs1.fedora.phx.redhat.com>

Author: kevin

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

Modified Files:
	01-rkhunter 
Log Message:
commit cron file as well



Index: 01-rkhunter
===================================================================
RCS file: /cvs/extras/rpms/rkhunter/F-10/01-rkhunter,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- 01-rkhunter	17 Jun 2008 18:48:04 -0000	1.4
+++ 01-rkhunter	5 Jan 2009 05:18:22 -0000	1.5
@@ -22,7 +22,7 @@
   if [ "$DIAG_SCAN" == "yes" ]; then
     RKHUNTER_FLAGS="--checkall --skip-keypress --nocolors --quiet --appendlog --display-logfile"
   else
-    RKHUNTER_FLAGS="--cronjob --report-warnings-only"
+    RKHUNTER_FLAGS="--cronjob --nocolors --report-warnings-only"
   fi
 
   # Set a few critical parameters
@@ -33,7 +33,7 @@
   if [ -x $RKHUNTER ]; then
     /bin/echo -e "\n--------------------- Start Rootkit Hunter Update ---------------------" \
       > $TMPFILE1
-    /bin/nice -n 10 $RKHUNTER --update 2>&1 >> $TMPFILE1
+    /bin/nice -n 10 $RKHUNTER --update --nocolors 2>&1 >> $TMPFILE1
     /bin/echo -e "\n---------------------- Start Rootkit Hunter Scan ----------------------" \
       >> $TMPFILE1
     /bin/nice -n 10 $RKHUNTER $RKHUNTER_FLAGS 2>&1 >> $TMPFILE1



From kevin at fedoraproject.org  Mon Jan  5 05:24:22 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon,  5 Jan 2009 05:24:22 +0000 (UTC)
Subject: rpms/rkhunter/F-10 rkhunter-1.3.2-debugtmp.patch, 1.1,
	NONE rkhunter-1.3.2.tar.gz.sha1.txt, 1.1, NONE
Message-ID: <20090105052422.7A9647013C@cvs1.fedora.phx.redhat.com>

Author: kevin

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

Removed Files:
	rkhunter-1.3.2-debugtmp.patch rkhunter-1.3.2.tar.gz.sha1.txt 
Log Message:
Remove old patches and sha1



--- rkhunter-1.3.2-debugtmp.patch DELETED ---


--- rkhunter-1.3.2.tar.gz.sha1.txt DELETED ---



From kevin at fedoraproject.org  Mon Jan  5 05:24:39 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon,  5 Jan 2009 05:24:39 +0000 (UTC)
Subject: rpms/rkhunter/F-10 rkhunter-1.3.4.tar.gz.sha1.txt,NONE,1.1
Message-ID: <20090105052439.42DA27013C@cvs1.fedora.phx.redhat.com>

Author: kevin

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

Added Files:
	rkhunter-1.3.4.tar.gz.sha1.txt 
Log Message:
Add new sha1 file



--- NEW FILE rkhunter-1.3.4.tar.gz.sha1.txt ---
73a42c94be2fb1fd3284d8dc60d22ff0fc8407f4  rkhunter-1.3.4/files/WISHLIST
c82074175e72642dd74322ce29281f0f2fe2798c  rkhunter-1.3.4/files/programs_bad.dat
443431d6c4dde5ff474fc9521561c6858478ad81  rkhunter-1.3.4/files/rkhunter
59de768a09a4cd13599653df85ecc2362e416ab3  rkhunter-1.3.4/files/defaulthashes.dat
9203f315cf8ea90724f70595c0b8facd61169b4a  rkhunter-1.3.4/files/i18n/cn
736fd9ea453f34c023a9ebed97fa0cea7461aeb8  rkhunter-1.3.4/files/i18n/zh.utf8
3aa3999bd924382f2a7b7e52ad0c3f7834d2285c  rkhunter-1.3.4/files/i18n/zh
a81ea7ee1677bb2f09c68ef55cac4819d102dfc0  rkhunter-1.3.4/files/i18n/en
ff10891d252f3859abe63054eb64f0e9eae2d781  rkhunter-1.3.4/files/tools/README
90876286c511986474144a5a1fc21afa0f5f29c5  rkhunter-1.3.4/files/tools/update_client.sh
e3ba269e33d5d385230d0a4457d87cf6e3acece8  rkhunter-1.3.4/files/tools/update_server.sh
98e225b334e319edaff76c079a3a241289ffa9c7  rkhunter-1.3.4/files/README
ebc05604eb51b10478d35ac3750699cefecd5ae3  rkhunter-1.3.4/files/filehashmd5.pl
d5bff919ce44a345a193824ea16b0404008d7823  rkhunter-1.3.4/files/programs_good.dat
beed9c4b594c5be28ca4837fdcd2ac367e2946ee  rkhunter-1.3.4/files/contrib/run_rkhunter.sh
225cc53f9691ad39f10bd2aaac478355ce4dc411  rkhunter-1.3.4/files/contrib/README.txt
285155f63cfa7a6a73ec0352dccaaa2221989b94  rkhunter-1.3.4/files/contrib/rkhunter_remote_howto.txt
56bf42d4fe669412b84eb307d5e314af4501dc9a  rkhunter-1.3.4/files/testing/stringscanner.sh
361ada5406c7e57e62e840caf3d3bce5e8436fc1  rkhunter-1.3.4/files/testing/rootkitinfo.txt
73e76916a3f65dde2317fff6c932e1d77760fdf7  rkhunter-1.3.4/files/testing/rkhunter.conf
1878119b6045eeab6a5afaebad7b523e86c3a935  rkhunter-1.3.4/files/filehashsha1.pl
a656a91b37a83a2325843f0ccedb5eb7866506ac  rkhunter-1.3.4/files/mirrors.dat
9ddeec64999f4c0e6f9aa5992cd25c503311b764  rkhunter-1.3.4/files/backdoorports.dat
a0badd192cc4f33fbf38f446eae3c858ba81c88f  rkhunter-1.3.4/files/check_modules.pl
82c8c3881d59d228de3ce74a4b7b68eac07940f1  rkhunter-1.3.4/files/md5blacklist.dat
4510d2228e144f80d75caef01c172095b2b4c24b  rkhunter-1.3.4/files/rkhunter.conf
5c4319fe3f9acc552b7a9e973b7d081f7cb31642  rkhunter-1.3.4/files/check_port.pl
f50ab02e29a0f4eba0ebe698f2c750a3b0298009  rkhunter-1.3.4/files/CHANGELOG
951b498f71fc4a126ca435f7bce96ed8b821efb6  rkhunter-1.3.4/files/os.dat
996a29dee608374e601ecf0253e445e16506c672  rkhunter-1.3.4/files/check_update.sh
2e971f1c9f355d2172db3c5a33601b7037853ac1  rkhunter-1.3.4/files/FAQ
7fa41ed0dc8c95b48b04dab42f1eaf8031c6ce7c  rkhunter-1.3.4/files/ACKNOWLEDGMENTS
5dfa5246dc1c87b05f44f9f444466ce3d0d6edec  rkhunter-1.3.4/files/stat.pl
345ab306455525cf5626caadda22b5dcbf732bc1  rkhunter-1.3.4/files/LICENSE
5fc098260380362a515d32376e8d5522f1ccf716  rkhunter-1.3.4/files/readlink.sh
e158163bfe6cb414d839e91880af37611f8b5cc0  rkhunter-1.3.4/files/development/createfilehashes.pl
0c613880f3447af695ca9f9f93e158b34c2a10c3  rkhunter-1.3.4/files/development/osinformation.sh
7378fb7e91b1f7e789508e4e8d00e1e3a70ee6ff  rkhunter-1.3.4/files/development/search_dead_sysmlinks.sh
d09ab61a3563122b8cd6415e3083dfe1ef285a2b  rkhunter-1.3.4/files/development/i18nchk
cb4903c649ad50b79230f5a5250da82c1d9ccb0f  rkhunter-1.3.4/files/development/createhashes.sh
4f4dfb87e758236cadc5ac5af67bbb35f4f63eb1  rkhunter-1.3.4/files/development/rpmprelinkhashes.sh
6b2f032d6143ed3b6ba3eae19d7921e154e69e47  rkhunter-1.3.4/files/development/createhashesall.sh
614a5d3999055a8faeecc393c5695d628e5a7675  rkhunter-1.3.4/files/development/rpmhashes.sh
ec4d60774decbb354f7aafcc2b65b1f87e000c97  rkhunter-1.3.4/files/suspscan.dat
0b0c2b2b1e6342ada9b1df48cda550e5120f0cdf  rkhunter-1.3.4/files/rkhunter.8
43bca835d9c64ab2f8cf7f1a5a078bb1b7da9306  rkhunter-1.3.4/files/showfiles.pl
21d8c152e81061d37d122e3a82283448cd267e73  rkhunter-1.3.4/files/rkhunter.spec
0093470e31268c538ecacc803969819faf742dde  rkhunter-1.3.4/installer.sh



From kevin at fedoraproject.org  Mon Jan  5 05:36:10 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon,  5 Jan 2009 05:36:10 +0000 (UTC)
Subject: rpms/rkhunter/F-9 rkhunter-1.3.4.tar.gz.sha1.txt, NONE,
	1.1 rkhunter.spec, 1.17, 1.18 01-rkhunter, 1.4, 1.5 sources, 1.9,
	1.10 .cvsignore, 1.8, 1.9 rkhunter-1.3.2-debugtmp.patch, 1.1,
	NONE rkhunter-1.3.2.tar.gz.sha1.txt, 1.1, NONE
Message-ID: <20090105053610.CF6A37011F@cvs1.fedora.phx.redhat.com>

Author: kevin

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

Modified Files:
	rkhunter.spec 01-rkhunter sources .cvsignore 
Added Files:
	rkhunter-1.3.4.tar.gz.sha1.txt 
Removed Files:
	rkhunter-1.3.2-debugtmp.patch rkhunter-1.3.2.tar.gz.sha1.txt 
Log Message:
Update to 1.3.4
Use libdir as tmp dir - bug #456340
Fix cron job sending as attachment - bug #472679
Fix cron job trying to send with colors - bug #475916



--- NEW FILE rkhunter-1.3.4.tar.gz.sha1.txt ---
73a42c94be2fb1fd3284d8dc60d22ff0fc8407f4  rkhunter-1.3.4/files/WISHLIST
c82074175e72642dd74322ce29281f0f2fe2798c  rkhunter-1.3.4/files/programs_bad.dat
443431d6c4dde5ff474fc9521561c6858478ad81  rkhunter-1.3.4/files/rkhunter
59de768a09a4cd13599653df85ecc2362e416ab3  rkhunter-1.3.4/files/defaulthashes.dat
9203f315cf8ea90724f70595c0b8facd61169b4a  rkhunter-1.3.4/files/i18n/cn
736fd9ea453f34c023a9ebed97fa0cea7461aeb8  rkhunter-1.3.4/files/i18n/zh.utf8
3aa3999bd924382f2a7b7e52ad0c3f7834d2285c  rkhunter-1.3.4/files/i18n/zh
a81ea7ee1677bb2f09c68ef55cac4819d102dfc0  rkhunter-1.3.4/files/i18n/en
ff10891d252f3859abe63054eb64f0e9eae2d781  rkhunter-1.3.4/files/tools/README
90876286c511986474144a5a1fc21afa0f5f29c5  rkhunter-1.3.4/files/tools/update_client.sh
e3ba269e33d5d385230d0a4457d87cf6e3acece8  rkhunter-1.3.4/files/tools/update_server.sh
98e225b334e319edaff76c079a3a241289ffa9c7  rkhunter-1.3.4/files/README
ebc05604eb51b10478d35ac3750699cefecd5ae3  rkhunter-1.3.4/files/filehashmd5.pl
d5bff919ce44a345a193824ea16b0404008d7823  rkhunter-1.3.4/files/programs_good.dat
beed9c4b594c5be28ca4837fdcd2ac367e2946ee  rkhunter-1.3.4/files/contrib/run_rkhunter.sh
225cc53f9691ad39f10bd2aaac478355ce4dc411  rkhunter-1.3.4/files/contrib/README.txt
285155f63cfa7a6a73ec0352dccaaa2221989b94  rkhunter-1.3.4/files/contrib/rkhunter_remote_howto.txt
56bf42d4fe669412b84eb307d5e314af4501dc9a  rkhunter-1.3.4/files/testing/stringscanner.sh
361ada5406c7e57e62e840caf3d3bce5e8436fc1  rkhunter-1.3.4/files/testing/rootkitinfo.txt
73e76916a3f65dde2317fff6c932e1d77760fdf7  rkhunter-1.3.4/files/testing/rkhunter.conf
1878119b6045eeab6a5afaebad7b523e86c3a935  rkhunter-1.3.4/files/filehashsha1.pl
a656a91b37a83a2325843f0ccedb5eb7866506ac  rkhunter-1.3.4/files/mirrors.dat
9ddeec64999f4c0e6f9aa5992cd25c503311b764  rkhunter-1.3.4/files/backdoorports.dat
a0badd192cc4f33fbf38f446eae3c858ba81c88f  rkhunter-1.3.4/files/check_modules.pl
82c8c3881d59d228de3ce74a4b7b68eac07940f1  rkhunter-1.3.4/files/md5blacklist.dat
4510d2228e144f80d75caef01c172095b2b4c24b  rkhunter-1.3.4/files/rkhunter.conf
5c4319fe3f9acc552b7a9e973b7d081f7cb31642  rkhunter-1.3.4/files/check_port.pl
f50ab02e29a0f4eba0ebe698f2c750a3b0298009  rkhunter-1.3.4/files/CHANGELOG
951b498f71fc4a126ca435f7bce96ed8b821efb6  rkhunter-1.3.4/files/os.dat
996a29dee608374e601ecf0253e445e16506c672  rkhunter-1.3.4/files/check_update.sh
2e971f1c9f355d2172db3c5a33601b7037853ac1  rkhunter-1.3.4/files/FAQ
7fa41ed0dc8c95b48b04dab42f1eaf8031c6ce7c  rkhunter-1.3.4/files/ACKNOWLEDGMENTS
5dfa5246dc1c87b05f44f9f444466ce3d0d6edec  rkhunter-1.3.4/files/stat.pl
345ab306455525cf5626caadda22b5dcbf732bc1  rkhunter-1.3.4/files/LICENSE
5fc098260380362a515d32376e8d5522f1ccf716  rkhunter-1.3.4/files/readlink.sh
e158163bfe6cb414d839e91880af37611f8b5cc0  rkhunter-1.3.4/files/development/createfilehashes.pl
0c613880f3447af695ca9f9f93e158b34c2a10c3  rkhunter-1.3.4/files/development/osinformation.sh
7378fb7e91b1f7e789508e4e8d00e1e3a70ee6ff  rkhunter-1.3.4/files/development/search_dead_sysmlinks.sh
d09ab61a3563122b8cd6415e3083dfe1ef285a2b  rkhunter-1.3.4/files/development/i18nchk
cb4903c649ad50b79230f5a5250da82c1d9ccb0f  rkhunter-1.3.4/files/development/createhashes.sh
4f4dfb87e758236cadc5ac5af67bbb35f4f63eb1  rkhunter-1.3.4/files/development/rpmprelinkhashes.sh
6b2f032d6143ed3b6ba3eae19d7921e154e69e47  rkhunter-1.3.4/files/development/createhashesall.sh
614a5d3999055a8faeecc393c5695d628e5a7675  rkhunter-1.3.4/files/development/rpmhashes.sh
ec4d60774decbb354f7aafcc2b65b1f87e000c97  rkhunter-1.3.4/files/suspscan.dat
0b0c2b2b1e6342ada9b1df48cda550e5120f0cdf  rkhunter-1.3.4/files/rkhunter.8
43bca835d9c64ab2f8cf7f1a5a078bb1b7da9306  rkhunter-1.3.4/files/showfiles.pl
21d8c152e81061d37d122e3a82283448cd267e73  rkhunter-1.3.4/files/rkhunter.spec
0093470e31268c538ecacc803969819faf742dde  rkhunter-1.3.4/installer.sh


Index: rkhunter.spec
===================================================================
RCS file: /cvs/extras/rpms/rkhunter/F-9/rkhunter.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- rkhunter.spec	15 Sep 2008 22:02:37 -0000	1.17
+++ rkhunter.spec	5 Jan 2009 05:35:40 -0000	1.18
@@ -1,16 +1,15 @@
 Name:           rkhunter
-Version:        1.3.2
-Release:        5%{?dist}
+Version:        1.3.4
+Release:        1%{?dist}
 Summary:        A host-based tool to scan for rootkits, backdoors and local exploits
 
 Group:          Applications/System
 License:        GPLv2+
 URL:            http://rkhunter.sourceforge.net/
-Source0:        http://downloads.sourceforge.net/rkhunter/rkhunter-1.3.2.tar.gz
-Source1:        http://downloads.sourceforge.net/rkhunter/rkhunter-1.3.2.tar.gz.sha1.txt
+Source0:        http://downloads.sourceforge.net/rkhunter/rkhunter-%{version}.tar.gz
+Source1:        http://downloads.sourceforge.net/rkhunter/rkhunter-%{version}.tar.gz.sha1.txt
 Source2:        01-rkhunter
 Source3:        rkhunter.sysconfig
-Patch0:		rkhunter-1.3.2-debugtmp.patch
 BuildArch:      noarch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -29,7 +28,7 @@
 
 %{__perl} -pi.0001 -e '
 	s|^#(MAIL-ON-WARNING=).+$|$1root\@localhost|;
-	s|^#(TMPDIR=).+$|$1%{_var}/run/%{name}|;
+	s|^#(TMPDIR=).+$|$1%{_var}/lib/%{name}|;
 	s|^#(DBDIR=).+$|$1%{_var}/lib/%{name}/db|;
 	s|^#(SCRIPTDIR=).+$|$1%{_datadir}/%{name}/scripts|;
 	s|^#(PKGMGR=).+$|$1RPM|;
@@ -70,8 +69,6 @@
 }
 EOF
 
-%patch0 -p1
-
 %build
 # Nothing to be built
 
@@ -139,6 +136,14 @@
 %{_mandir}/man8/*
 
 %changelog
+* Fri Jan 02 2009 Kevin Fenzi <kevin at tummy.com> - 1.3.4-1
+- Update to 1.3.4
+- Use libdir as tmp dir - bug #456340
+
+* Sat Dec 13 2008 Kevin Fenzi <kevin at tummy.com> - 1.3.2-6
+- Fix cron job sending as attachment - bug #472679
+- Fix cron job trying to send with colors - bug #475916
+
 * Wed Sep 03 2008 Kevin Fenzi <kevin at tummy.com> - 1.3.2-5
 - Patch debug tmp file issue - bug #460628
 


Index: 01-rkhunter
===================================================================
RCS file: /cvs/extras/rpms/rkhunter/F-9/01-rkhunter,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- 01-rkhunter	17 Jun 2008 18:55:09 -0000	1.4
+++ 01-rkhunter	5 Jan 2009 05:35:40 -0000	1.5
@@ -22,7 +22,7 @@
   if [ "$DIAG_SCAN" == "yes" ]; then
     RKHUNTER_FLAGS="--checkall --skip-keypress --nocolors --quiet --appendlog --display-logfile"
   else
-    RKHUNTER_FLAGS="--cronjob --report-warnings-only"
+    RKHUNTER_FLAGS="--cronjob --nocolors --report-warnings-only"
   fi
 
   # Set a few critical parameters
@@ -33,7 +33,7 @@
   if [ -x $RKHUNTER ]; then
     /bin/echo -e "\n--------------------- Start Rootkit Hunter Update ---------------------" \
       > $TMPFILE1
-    /bin/nice -n 10 $RKHUNTER --update 2>&1 >> $TMPFILE1
+    /bin/nice -n 10 $RKHUNTER --update --nocolors 2>&1 >> $TMPFILE1
     /bin/echo -e "\n---------------------- Start Rootkit Hunter Scan ----------------------" \
       >> $TMPFILE1
     /bin/nice -n 10 $RKHUNTER $RKHUNTER_FLAGS 2>&1 >> $TMPFILE1


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rkhunter/F-9/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	29 Feb 2008 03:33:37 -0000	1.9
+++ sources	5 Jan 2009 05:35:40 -0000	1.10
@@ -1 +1 @@
-a00ff64d7076d6ff47ef0c9f0b6202f2  rkhunter-1.3.2.tar.gz
+31eaacc4d01ad138d1a4283f105088e6  rkhunter-1.3.4.tar.gz


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rkhunter/F-9/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	29 Feb 2008 03:33:37 -0000	1.8
+++ .cvsignore	5 Jan 2009 05:35:40 -0000	1.9
@@ -1 +1 @@
-rkhunter-1.3.2.tar.gz
+rkhunter-1.3.4.tar.gz


--- rkhunter-1.3.2-debugtmp.patch DELETED ---


--- rkhunter-1.3.2.tar.gz.sha1.txt DELETED ---



From rezso at fedoraproject.org  Mon Jan  5 07:10:42 2009
From: rezso at fedoraproject.org (Balint Cristian)
Date: Mon,  5 Jan 2009 07:10:42 +0000 (UTC)
Subject: rpms/tinyows/devel import.log, NONE, 1.1 no_date_footer.html, NONE, 
	1.1 tinyows.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090105071042.6277A7011F@cvs1.fedora.phx.redhat.com>

Author: rezso

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

Modified Files:
	.cvsignore sources 
Added Files:
	import.log no_date_footer.html tinyows.spec 
Log Message:
- initial import



--- NEW FILE import.log ---
tinyows-0_6_0-3_fc11:HEAD:tinyows-0.6.0-3.fc11.src.rpm:1231139376


--- NEW FILE no_date_footer.html ---
<hr size="1"><address style="text-align: right;"><small>
Generated for $projectname by <a href="http://www.doxygen.org/
index.html"><img src="doxygen.png" alt="doxygen" align="middle" border="0"></a>
$doxygenversion</small></address>
</body>
</html>



--- NEW FILE tinyows.spec ---
Name:      tinyows
Version:   0.6.0
Release:   3%{?dist}
Summary:   WFS-T and FE implementation server

Group:     Applications/Publishing
License:   MIT
URL:       http://www.tinyows.org
Source0:   http://tinyows.org/tracdocs/release/%{name}_0-6-0.tar.bz2
Source1:   no_date_footer.html
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires:  httpd

BuildRequires: ctags indent doxygen valgrind
BuildRequires: libxml2-devel postgresql-devel

%description
TinyOWS server implements latest WFS-T standard versions,
as well as related standards such as Filter Encoding (FE).

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

# clean SVN
find . -type d -name .svn -exec rm -rf '{}' +

%build

%configure --enable-api

# fix datadir lookup path
sed -i -e 's|/usr/tinyows/|%{_datadir}/%{name}/|' src/ows_define.h

# WARNING
# disable %{?_smp_mflags}
# it breaks compile
make

# disable timestamp inside docs
sed -i -e 's|HTML_FOOTER|HTML_FOOTER=no_date_footer.html\n\#|g' doc/Doxyfile
make doxygen

%install
rm -rf %{buildroot}

install -d %{buildroot}%{_bindir}
install -p -m 0755 tinyows %{buildroot}%{_bindir}/
install -d %{buildroot}%{_datadir}/%{name}
cp -pR schema %{buildroot}%{_datadir}/%{name}/
install -d %{buildroot}%{_sysconfdir}/%{name}
install -p -m 0644 config.xml %{buildroot}%{_sysconfdir}/%{name}
pushd %{buildroot}%{_datadir}/%{name}/
   ln -s ../../../%{_sysconfdir}/%{name}/config.xml config.xml
popd

%clean
rm -rf %{buildroot}

%check

make %{?_smp_mflags} valgrind || true

%files
%defattr(-,root,root,-)
%doc LICENSE README VERSION
%doc doc/doxygen
%{_bindir}/%{name}
%dir %{_sysconfdir}/%{name}
%attr(644,root,root) %config(noreplace) %{_sysconfdir}/%{name}/config.xml
%{_datadir}/%{name}

%changelog
* Mon Jan 05 2009 Balint Cristian <rezso at rdsor.ro> - 0.6.0-3
- initial import

* Thu Sep 25 2008 Balint Cristian <rezso at rdsor.ro> - 0.6.0-2
- shorter summary description

* Thu Sep 25 2008 Balint Cristian <rezso at rdsor.ro> - 0.6.0-1
- initial package for fedora


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/tinyows/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	4 Jan 2009 20:11:50 -0000	1.1
+++ .cvsignore	5 Jan 2009 07:10:11 -0000	1.2
@@ -0,0 +1 @@
+tinyows_0-6-0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tinyows/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	4 Jan 2009 20:11:51 -0000	1.1
+++ sources	5 Jan 2009 07:10:11 -0000	1.2
@@ -0,0 +1 @@
+ad36de642d087e9881dadef585f9e440  tinyows_0-6-0.tar.bz2



From rezso at fedoraproject.org  Mon Jan  5 07:13:56 2009
From: rezso at fedoraproject.org (Balint Cristian)
Date: Mon,  5 Jan 2009 07:13:56 +0000 (UTC)
Subject: rpms/tinyows/F-10 import.log, NONE, 1.1 no_date_footer.html, NONE, 
	1.1 tinyows.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090105071356.7A3197011F@cvs1.fedora.phx.redhat.com>

Author: rezso

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

Modified Files:
	.cvsignore sources 
Added Files:
	import.log no_date_footer.html tinyows.spec 
Log Message:
- initial import



--- NEW FILE import.log ---
tinyows-0_6_0-3_fc11:F-10:tinyows-0.6.0-3.fc11.src.rpm:1231139527


--- NEW FILE no_date_footer.html ---
<hr size="1"><address style="text-align: right;"><small>
Generated for $projectname by <a href="http://www.doxygen.org/
index.html"><img src="doxygen.png" alt="doxygen" align="middle" border="0"></a>
$doxygenversion</small></address>
</body>
</html>



--- NEW FILE tinyows.spec ---
Name:      tinyows
Version:   0.6.0
Release:   3%{?dist}
Summary:   WFS-T and FE implementation server

Group:     Applications/Publishing
License:   MIT
URL:       http://www.tinyows.org
Source0:   http://tinyows.org/tracdocs/release/%{name}_0-6-0.tar.bz2
Source1:   no_date_footer.html
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires:  httpd

BuildRequires: ctags indent doxygen valgrind
BuildRequires: libxml2-devel postgresql-devel

%description
TinyOWS server implements latest WFS-T standard versions,
as well as related standards such as Filter Encoding (FE).

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

# clean SVN
find . -type d -name .svn -exec rm -rf '{}' +

%build

%configure --enable-api

# fix datadir lookup path
sed -i -e 's|/usr/tinyows/|%{_datadir}/%{name}/|' src/ows_define.h

# WARNING
# disable %{?_smp_mflags}
# it breaks compile
make

# disable timestamp inside docs
sed -i -e 's|HTML_FOOTER|HTML_FOOTER=no_date_footer.html\n\#|g' doc/Doxyfile
make doxygen

%install
rm -rf %{buildroot}

install -d %{buildroot}%{_bindir}
install -p -m 0755 tinyows %{buildroot}%{_bindir}/
install -d %{buildroot}%{_datadir}/%{name}
cp -pR schema %{buildroot}%{_datadir}/%{name}/
install -d %{buildroot}%{_sysconfdir}/%{name}
install -p -m 0644 config.xml %{buildroot}%{_sysconfdir}/%{name}
pushd %{buildroot}%{_datadir}/%{name}/
   ln -s ../../../%{_sysconfdir}/%{name}/config.xml config.xml
popd

%clean
rm -rf %{buildroot}

%check

make %{?_smp_mflags} valgrind || true

%files
%defattr(-,root,root,-)
%doc LICENSE README VERSION
%doc doc/doxygen
%{_bindir}/%{name}
%dir %{_sysconfdir}/%{name}
%attr(644,root,root) %config(noreplace) %{_sysconfdir}/%{name}/config.xml
%{_datadir}/%{name}

%changelog
* Mon Jan 05 2009 Balint Cristian <rezso at rdsor.ro> - 0.6.0-3
- initial import

* Thu Sep 25 2008 Balint Cristian <rezso at rdsor.ro> - 0.6.0-2
- shorter summary description

* Thu Sep 25 2008 Balint Cristian <rezso at rdsor.ro> - 0.6.0-1
- initial package for fedora


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/tinyows/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	4 Jan 2009 20:11:50 -0000	1.1
+++ .cvsignore	5 Jan 2009 07:13:25 -0000	1.2
@@ -0,0 +1 @@
+tinyows_0-6-0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tinyows/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	4 Jan 2009 20:11:51 -0000	1.1
+++ sources	5 Jan 2009 07:13:26 -0000	1.2
@@ -0,0 +1 @@
+ad36de642d087e9881dadef585f9e440  tinyows_0-6-0.tar.bz2



From rezso at fedoraproject.org  Mon Jan  5 07:16:33 2009
From: rezso at fedoraproject.org (Balint Cristian)
Date: Mon,  5 Jan 2009 07:16:33 +0000 (UTC)
Subject: rpms/tinyows/F-9 import.log, NONE, 1.1 no_date_footer.html, NONE,
	1.1 tinyows.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090105071633.96C4D7011F@cvs1.fedora.phx.redhat.com>

Author: rezso

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

Modified Files:
	.cvsignore sources 
Added Files:
	import.log no_date_footer.html tinyows.spec 
Log Message:
- initial import



--- NEW FILE import.log ---
tinyows-0_6_0-3_fc11:F-9:tinyows-0.6.0-3.fc11.src.rpm:1231139726


--- NEW FILE no_date_footer.html ---
<hr size="1"><address style="text-align: right;"><small>
Generated for $projectname by <a href="http://www.doxygen.org/
index.html"><img src="doxygen.png" alt="doxygen" align="middle" border="0"></a>
$doxygenversion</small></address>
</body>
</html>



--- NEW FILE tinyows.spec ---
Name:      tinyows
Version:   0.6.0
Release:   3%{?dist}
Summary:   WFS-T and FE implementation server

Group:     Applications/Publishing
License:   MIT
URL:       http://www.tinyows.org
Source0:   http://tinyows.org/tracdocs/release/%{name}_0-6-0.tar.bz2
Source1:   no_date_footer.html
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires:  httpd

BuildRequires: ctags indent doxygen valgrind
BuildRequires: libxml2-devel postgresql-devel

%description
TinyOWS server implements latest WFS-T standard versions,
as well as related standards such as Filter Encoding (FE).

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

# clean SVN
find . -type d -name .svn -exec rm -rf '{}' +

%build

%configure --enable-api

# fix datadir lookup path
sed -i -e 's|/usr/tinyows/|%{_datadir}/%{name}/|' src/ows_define.h

# WARNING
# disable %{?_smp_mflags}
# it breaks compile
make

# disable timestamp inside docs
sed -i -e 's|HTML_FOOTER|HTML_FOOTER=no_date_footer.html\n\#|g' doc/Doxyfile
make doxygen

%install
rm -rf %{buildroot}

install -d %{buildroot}%{_bindir}
install -p -m 0755 tinyows %{buildroot}%{_bindir}/
install -d %{buildroot}%{_datadir}/%{name}
cp -pR schema %{buildroot}%{_datadir}/%{name}/
install -d %{buildroot}%{_sysconfdir}/%{name}
install -p -m 0644 config.xml %{buildroot}%{_sysconfdir}/%{name}
pushd %{buildroot}%{_datadir}/%{name}/
   ln -s ../../../%{_sysconfdir}/%{name}/config.xml config.xml
popd

%clean
rm -rf %{buildroot}

%check

make %{?_smp_mflags} valgrind || true

%files
%defattr(-,root,root,-)
%doc LICENSE README VERSION
%doc doc/doxygen
%{_bindir}/%{name}
%dir %{_sysconfdir}/%{name}
%attr(644,root,root) %config(noreplace) %{_sysconfdir}/%{name}/config.xml
%{_datadir}/%{name}

%changelog
* Mon Jan 05 2009 Balint Cristian <rezso at rdsor.ro> - 0.6.0-3
- initial import

* Thu Sep 25 2008 Balint Cristian <rezso at rdsor.ro> - 0.6.0-2
- shorter summary description

* Thu Sep 25 2008 Balint Cristian <rezso at rdsor.ro> - 0.6.0-1
- initial package for fedora


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/tinyows/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	4 Jan 2009 20:11:50 -0000	1.1
+++ .cvsignore	5 Jan 2009 07:16:02 -0000	1.2
@@ -0,0 +1 @@
+tinyows_0-6-0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tinyows/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	4 Jan 2009 20:11:51 -0000	1.1
+++ sources	5 Jan 2009 07:16:03 -0000	1.2
@@ -0,0 +1 @@
+ad36de642d087e9881dadef585f9e440  tinyows_0-6-0.tar.bz2



From rezso at fedoraproject.org  Mon Jan  5 07:24:38 2009
From: rezso at fedoraproject.org (Balint Cristian)
Date: Mon,  5 Jan 2009 07:24:38 +0000 (UTC)
Subject: rpms/mapbender/devel README.fedora, NONE, 1.1 import.log, NONE,
	1.1 mapbender.conf, NONE, 1.1 mapbender.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090105072438.3AEB67011F@cvs1.fedora.phx.redhat.com>

Author: rezso

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

Modified Files:
	.cvsignore sources 
Added Files:
	README.fedora import.log mapbender.conf mapbender.spec 
Log Message:
- initial import



--- NEW FILE README.fedora ---

Please follow these two mandatory steps:

 - Dont forget to install mandatory SQL schema and data from your docdir/resources.
     for MySQL:
         mysqladmin -p create mapbender
         mysql -p mapbender < /usr/share/doc/mapbender-*/resources/db/mysql/mysql_schema.sql
         mysql -p mapbender < /usr/share/doc/mapbender-*/resources/db/mysql/utf8/mysql_data.sql
     for PgSQL:
         createdb mapbender
         psql -f /usr/share/doc/mapbender-*/resources/db/postgresql/pgsql_schema.sql mapbender
         psql -f /usr/share/doc/mapbender-*/resources/db/postgresql/utf8/pgsql_data.sql mapbender
         psql -f /usr/share/doc/mapbender-*/resources/db/postgresql/pgsql_serial_set_sequences.sql mapbender

 - Edit your /etc/mapbender/mapbender.conf file acordingly, follow Install.txt from docdir.
         * adjust mandatory HOST,USER,PASSWORD,DATABASE and SQL type in your config.
         * reload your apache.

 - You should olso check your setup: http://localhost/bendertools
 - You can access portal on alias: http://localhost/mapbender
 - Your initial portal User/Password is root/root
 - You should adjust localhost restriction: /etc/httpd/conf.d/mapbender.conf


--- NEW FILE import.log ---
mapbender-2_5-1_fc11:HEAD:mapbender-2.5-1.fc11.src.rpm:1231140137


--- NEW FILE mapbender.conf ---
#
# MapBender geospatial portal written in PHP.
#

# default restrictions
<Directory /usr/share/mapbender>
    Options -Indexes
    Order Deny,Allow
    Deny from all
    Allow from localhost
</Directory>

# mandatory aliases
Alias /mapbender /usr/share/mapbender/http
Alias /bendertools /usr/share/mapbender/http/tools
Alias /owsproxy /usr/share/mapbender/owsproxy


--- NEW FILE mapbender.spec ---
Name:      mapbender
Version:   2.5
Release:   1%{?dist}
Summary:   Geospatial portal for OGC OWS architectures
Group:     Applications/Internet
License:   GPLv2
URL:       http://www.mapbender.org/
Source0:   http://www.mapbender.org/download/%{name}_%{version}.zip
Source1:   mapbender.conf
Source2:   README.fedora
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch

%define contentdir /var/www

Requires: httpd, php
Requires: php-mbstring, php-gd
Requires: php-mysql, php-pgsql

%description
Mapbender is the geospatial portal site management software for
OGC OWS architectures.Mapbender comes with a data model to manage
interfaces for displaying, navigating and querying OGC compliant
web map and feature services (WMS and transactional WFS).
Authentication and authorization are used by the OWS Security
Proxy and management interfaces for multi client capable user,
group and service administration. The embedded metadata component
follows ISO 19119 specification.

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

set +x
for f in `find . -type f` ; do
   if file $f | grep -q ISO-8859 ; then
      set -x
      iconv -f ISO-8859-1 -t UTF-8 $f > ${f}.tmp && \
         mv -f ${f}.tmp $f
      set +x
   fi
   if file $f | grep -q CRLF ; then
      set -x
      sed -i -e 's|\r||g' $f
      set +x
   fi
done
set -x

# fix spurious flags
for f in `find . -name Mapbender.po -type f` ; do
chmod -x $f
done


%build

%install
rm -rf %{buildroot}

mkdir -p -m0755 %{buildroot}%{_sysconfdir}/%{name}
mkdir -p -m0755 %{buildroot}%{_datadir}/%{name}
mkdir -p -m0755 %{buildroot}%{contentdir}/html

# install the config files
mkdir -p %{buildroot}%{_sysconfdir}/httpd/conf.d
install -m 644 %{SOURCE1} \
   %{buildroot}%{_sysconfdir}/httpd/conf.d/

mkdir -p %{buildroot}%{_datadir}/%{name}/conf
pushd %{buildroot}%{_datadir}/%{name}/conf
 for file in {digitize_default,gazetteerSQL,mapbender,poi,session,wfs_default}; do
   ln -s ../../../../%{_sysconfdir}/%{name}/$file.conf $file.conf
 done
popd
sed -i 's|\r||g' conf/*
install -p -m 644 conf/*.conf %{buildroot}%{_sysconfdir}/%{name}
install -p -m 644 conf/%{name}.conf-dist \
        %{buildroot}%{_sysconfdir}/%{name}/%{name}.conf
install -p -m 644 conf/*.conf-dist %{buildroot}%{_datadir}/%{name}/conf

# adjust config file
sed -i 's|\"CHECK\"\, false|\"CHECK\"\, true|g' \
%{buildroot}%{_sysconfdir}/%{name}/%{name}.conf
sed -i 's|\"PORTAL\"\, false|\"PORTAL\"\, true|g' \
%{buildroot}%{_sysconfdir}/%{name}/%{name}.conf
sed -i 's|"TMPDIR", "../tmp"|"TMPDIR", "/var/tmp"|g' \
%{buildroot}%{_sysconfdir}/%{name}/%{name}.conf
sed -i 's|<ip or name>/owsproxy|localhost/owsproxy|g' \
%{buildroot}%{_sysconfdir}/%{name}/%{name}.conf
sed -i 's|<HOST>|localhost|g' \
%{buildroot}%{_sysconfdir}/%{name}/%{name}.conf
sed -i 's|<database>|mapbender|g' \
%{buildroot}%{_sysconfdir}/%{name}/%{name}.conf
sed -i 's|<owner>|root|g' \
%{buildroot}%{_sysconfdir}/%{name}/%{name}.conf


# instal mapbender
cp -pr http %{buildroot}%{_datadir}/%{name}/
cp -pr core %{buildroot}%{_datadir}/%{name}/
cp -pr lib %{buildroot}%{_datadir}/%{name}/
cp -pr tools %{buildroot}%{_datadir}/%{name}/http/
cp -pr documents %{buildroot}%{_datadir}/%{name}/
cp -pr owsproxy %{buildroot}%{_datadir}/%{name}/
cp -pr resources %{buildroot}%{_datadir}/%{name}/

# install fedora doc
install -p -m644 %{SOURCE2} .

# install index.php wrapper for tools setup-check page
pushd %{buildroot}%{_datadir}/%{name}/http/tools/
ln -s mapbender_setup.php index.php
popd

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root)
%config %dir %{_sysconfdir}/%{name}
%attr(640,root,apache) %config(noreplace) %{_sysconfdir}/%{name}/*.conf
%config(noreplace) %{_sysconfdir}/httpd/conf.d/%{name}.conf
%doc Changes.txt Install.txt Readme.txt README.fedora
%doc license resources
%dir %{_datadir}/%{name}
%{_datadir}/%{name}/conf
%{_datadir}/%{name}/http
%{_datadir}/%{name}/core
%{_datadir}/%{name}/lib
%{_datadir}/%{name}/documents
%{_datadir}/%{name}/owsproxy
%{_datadir}/%{name}/resources

%changelog
* Tue Dec 09 2008 Balint Cristian <rezso at rdsor.ro> - 2.5-1
- new release

* Sat Jul 05 2008 Balint Cristian <rezso at rdsor.ro> - 2.4.5-2
- allow connections only from localhost by defult
- create README.fedora doc

* Fri Jun 13 2008 Balint Cristian <rezso at rdsor.ro> - 2.4.5-1
- initial package, upstream stable 2.4.5



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mapbender/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	4 Jan 2009 20:07:09 -0000	1.1
+++ .cvsignore	5 Jan 2009 07:24:07 -0000	1.2
@@ -0,0 +1 @@
+mapbender_2.5.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mapbender/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	4 Jan 2009 20:07:09 -0000	1.1
+++ sources	5 Jan 2009 07:24:07 -0000	1.2
@@ -0,0 +1 @@
+b9161c1349cab9078db6fa62d26e80af  mapbender_2.5.zip



From rezso at fedoraproject.org  Mon Jan  5 07:27:21 2009
From: rezso at fedoraproject.org (Balint Cristian)
Date: Mon,  5 Jan 2009 07:27:21 +0000 (UTC)
Subject: rpms/mapbender/F-10 README.fedora, NONE, 1.1 import.log, NONE,
	1.1 mapbender.conf, NONE, 1.1 mapbender.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090105072721.EFE367011F@cvs1.fedora.phx.redhat.com>

Author: rezso

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

Modified Files:
	.cvsignore sources 
Added Files:
	README.fedora import.log mapbender.conf mapbender.spec 
Log Message:
- initial import



--- NEW FILE README.fedora ---

Please follow these two mandatory steps:

 - Dont forget to install mandatory SQL schema and data from your docdir/resources.
     for MySQL:
         mysqladmin -p create mapbender
         mysql -p mapbender < /usr/share/doc/mapbender-*/resources/db/mysql/mysql_schema.sql
         mysql -p mapbender < /usr/share/doc/mapbender-*/resources/db/mysql/utf8/mysql_data.sql
     for PgSQL:
         createdb mapbender
         psql -f /usr/share/doc/mapbender-*/resources/db/postgresql/pgsql_schema.sql mapbender
         psql -f /usr/share/doc/mapbender-*/resources/db/postgresql/utf8/pgsql_data.sql mapbender
         psql -f /usr/share/doc/mapbender-*/resources/db/postgresql/pgsql_serial_set_sequences.sql mapbender

 - Edit your /etc/mapbender/mapbender.conf file acordingly, follow Install.txt from docdir.
         * adjust mandatory HOST,USER,PASSWORD,DATABASE and SQL type in your config.
         * reload your apache.

 - You should olso check your setup: http://localhost/bendertools
 - You can access portal on alias: http://localhost/mapbender
 - Your initial portal User/Password is root/root
 - You should adjust localhost restriction: /etc/httpd/conf.d/mapbender.conf


--- NEW FILE import.log ---
mapbender-2_5-1_fc11:F-10:mapbender-2.5-1.fc11.src.rpm:1231140370


--- NEW FILE mapbender.conf ---
#
# MapBender geospatial portal written in PHP.
#

# default restrictions
<Directory /usr/share/mapbender>
    Options -Indexes
    Order Deny,Allow
    Deny from all
    Allow from localhost
</Directory>

# mandatory aliases
Alias /mapbender /usr/share/mapbender/http
Alias /bendertools /usr/share/mapbender/http/tools
Alias /owsproxy /usr/share/mapbender/owsproxy


--- NEW FILE mapbender.spec ---
Name:      mapbender
Version:   2.5
Release:   1%{?dist}
Summary:   Geospatial portal for OGC OWS architectures
Group:     Applications/Internet
License:   GPLv2
URL:       http://www.mapbender.org/
Source0:   http://www.mapbender.org/download/%{name}_%{version}.zip
Source1:   mapbender.conf
Source2:   README.fedora
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch

%define contentdir /var/www

Requires: httpd, php
Requires: php-mbstring, php-gd
Requires: php-mysql, php-pgsql

%description
Mapbender is the geospatial portal site management software for
OGC OWS architectures.Mapbender comes with a data model to manage
interfaces for displaying, navigating and querying OGC compliant
web map and feature services (WMS and transactional WFS).
Authentication and authorization are used by the OWS Security
Proxy and management interfaces for multi client capable user,
group and service administration. The embedded metadata component
follows ISO 19119 specification.

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

set +x
for f in `find . -type f` ; do
   if file $f | grep -q ISO-8859 ; then
      set -x
      iconv -f ISO-8859-1 -t UTF-8 $f > ${f}.tmp && \
         mv -f ${f}.tmp $f
      set +x
   fi
   if file $f | grep -q CRLF ; then
      set -x
      sed -i -e 's|\r||g' $f
      set +x
   fi
done
set -x

# fix spurious flags
for f in `find . -name Mapbender.po -type f` ; do
chmod -x $f
done


%build

%install
rm -rf %{buildroot}

mkdir -p -m0755 %{buildroot}%{_sysconfdir}/%{name}
mkdir -p -m0755 %{buildroot}%{_datadir}/%{name}
mkdir -p -m0755 %{buildroot}%{contentdir}/html

# install the config files
mkdir -p %{buildroot}%{_sysconfdir}/httpd/conf.d
install -m 644 %{SOURCE1} \
   %{buildroot}%{_sysconfdir}/httpd/conf.d/

mkdir -p %{buildroot}%{_datadir}/%{name}/conf
pushd %{buildroot}%{_datadir}/%{name}/conf
 for file in {digitize_default,gazetteerSQL,mapbender,poi,session,wfs_default}; do
   ln -s ../../../../%{_sysconfdir}/%{name}/$file.conf $file.conf
 done
popd
sed -i 's|\r||g' conf/*
install -p -m 644 conf/*.conf %{buildroot}%{_sysconfdir}/%{name}
install -p -m 644 conf/%{name}.conf-dist \
        %{buildroot}%{_sysconfdir}/%{name}/%{name}.conf
install -p -m 644 conf/*.conf-dist %{buildroot}%{_datadir}/%{name}/conf

# adjust config file
sed -i 's|\"CHECK\"\, false|\"CHECK\"\, true|g' \
%{buildroot}%{_sysconfdir}/%{name}/%{name}.conf
sed -i 's|\"PORTAL\"\, false|\"PORTAL\"\, true|g' \
%{buildroot}%{_sysconfdir}/%{name}/%{name}.conf
sed -i 's|"TMPDIR", "../tmp"|"TMPDIR", "/var/tmp"|g' \
%{buildroot}%{_sysconfdir}/%{name}/%{name}.conf
sed -i 's|<ip or name>/owsproxy|localhost/owsproxy|g' \
%{buildroot}%{_sysconfdir}/%{name}/%{name}.conf
sed -i 's|<HOST>|localhost|g' \
%{buildroot}%{_sysconfdir}/%{name}/%{name}.conf
sed -i 's|<database>|mapbender|g' \
%{buildroot}%{_sysconfdir}/%{name}/%{name}.conf
sed -i 's|<owner>|root|g' \
%{buildroot}%{_sysconfdir}/%{name}/%{name}.conf


# instal mapbender
cp -pr http %{buildroot}%{_datadir}/%{name}/
cp -pr core %{buildroot}%{_datadir}/%{name}/
cp -pr lib %{buildroot}%{_datadir}/%{name}/
cp -pr tools %{buildroot}%{_datadir}/%{name}/http/
cp -pr documents %{buildroot}%{_datadir}/%{name}/
cp -pr owsproxy %{buildroot}%{_datadir}/%{name}/
cp -pr resources %{buildroot}%{_datadir}/%{name}/

# install fedora doc
install -p -m644 %{SOURCE2} .

# install index.php wrapper for tools setup-check page
pushd %{buildroot}%{_datadir}/%{name}/http/tools/
ln -s mapbender_setup.php index.php
popd

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root)
%config %dir %{_sysconfdir}/%{name}
%attr(640,root,apache) %config(noreplace) %{_sysconfdir}/%{name}/*.conf
%config(noreplace) %{_sysconfdir}/httpd/conf.d/%{name}.conf
%doc Changes.txt Install.txt Readme.txt README.fedora
%doc license resources
%dir %{_datadir}/%{name}
%{_datadir}/%{name}/conf
%{_datadir}/%{name}/http
%{_datadir}/%{name}/core
%{_datadir}/%{name}/lib
%{_datadir}/%{name}/documents
%{_datadir}/%{name}/owsproxy
%{_datadir}/%{name}/resources

%changelog
* Tue Dec 09 2008 Balint Cristian <rezso at rdsor.ro> - 2.5-1
- new release

* Sat Jul 05 2008 Balint Cristian <rezso at rdsor.ro> - 2.4.5-2
- allow connections only from localhost by defult
- create README.fedora doc

* Fri Jun 13 2008 Balint Cristian <rezso at rdsor.ro> - 2.4.5-1
- initial package, upstream stable 2.4.5



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mapbender/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	4 Jan 2009 20:07:09 -0000	1.1
+++ .cvsignore	5 Jan 2009 07:26:51 -0000	1.2
@@ -0,0 +1 @@
+mapbender_2.5.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mapbender/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	4 Jan 2009 20:07:09 -0000	1.1
+++ sources	5 Jan 2009 07:26:51 -0000	1.2
@@ -0,0 +1 @@
+b9161c1349cab9078db6fa62d26e80af  mapbender_2.5.zip



From rezso at fedoraproject.org  Mon Jan  5 07:30:56 2009
From: rezso at fedoraproject.org (Balint Cristian)
Date: Mon,  5 Jan 2009 07:30:56 +0000 (UTC)
Subject: rpms/mapbender/F-9 README.fedora, NONE, 1.1 import.log, NONE,
	1.1 mapbender.conf, NONE, 1.1 mapbender.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090105073056.69EE67011F@cvs1.fedora.phx.redhat.com>

Author: rezso

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

Modified Files:
	.cvsignore sources 
Added Files:
	README.fedora import.log mapbender.conf mapbender.spec 
Log Message:
- initial import



--- NEW FILE README.fedora ---

Please follow these two mandatory steps:

 - Dont forget to install mandatory SQL schema and data from your docdir/resources.
     for MySQL:
         mysqladmin -p create mapbender
         mysql -p mapbender < /usr/share/doc/mapbender-*/resources/db/mysql/mysql_schema.sql
         mysql -p mapbender < /usr/share/doc/mapbender-*/resources/db/mysql/utf8/mysql_data.sql
     for PgSQL:
         createdb mapbender
         psql -f /usr/share/doc/mapbender-*/resources/db/postgresql/pgsql_schema.sql mapbender
         psql -f /usr/share/doc/mapbender-*/resources/db/postgresql/utf8/pgsql_data.sql mapbender
         psql -f /usr/share/doc/mapbender-*/resources/db/postgresql/pgsql_serial_set_sequences.sql mapbender

 - Edit your /etc/mapbender/mapbender.conf file acordingly, follow Install.txt from docdir.
         * adjust mandatory HOST,USER,PASSWORD,DATABASE and SQL type in your config.
         * reload your apache.

 - You should olso check your setup: http://localhost/bendertools
 - You can access portal on alias: http://localhost/mapbender
 - Your initial portal User/Password is root/root
 - You should adjust localhost restriction: /etc/httpd/conf.d/mapbender.conf


--- NEW FILE import.log ---
mapbender-2_5-1_fc11:F-9:mapbender-2.5-1.fc11.src.rpm:1231140587


--- NEW FILE mapbender.conf ---
#
# MapBender geospatial portal written in PHP.
#

# default restrictions
<Directory /usr/share/mapbender>
    Options -Indexes
    Order Deny,Allow
    Deny from all
    Allow from localhost
</Directory>

# mandatory aliases
Alias /mapbender /usr/share/mapbender/http
Alias /bendertools /usr/share/mapbender/http/tools
Alias /owsproxy /usr/share/mapbender/owsproxy


--- NEW FILE mapbender.spec ---
Name:      mapbender
Version:   2.5
Release:   1%{?dist}
Summary:   Geospatial portal for OGC OWS architectures
Group:     Applications/Internet
License:   GPLv2
URL:       http://www.mapbender.org/
Source0:   http://www.mapbender.org/download/%{name}_%{version}.zip
Source1:   mapbender.conf
Source2:   README.fedora
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch

%define contentdir /var/www

Requires: httpd, php
Requires: php-mbstring, php-gd
Requires: php-mysql, php-pgsql

%description
Mapbender is the geospatial portal site management software for
OGC OWS architectures.Mapbender comes with a data model to manage
interfaces for displaying, navigating and querying OGC compliant
web map and feature services (WMS and transactional WFS).
Authentication and authorization are used by the OWS Security
Proxy and management interfaces for multi client capable user,
group and service administration. The embedded metadata component
follows ISO 19119 specification.

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

set +x
for f in `find . -type f` ; do
   if file $f | grep -q ISO-8859 ; then
      set -x
      iconv -f ISO-8859-1 -t UTF-8 $f > ${f}.tmp && \
         mv -f ${f}.tmp $f
      set +x
   fi
   if file $f | grep -q CRLF ; then
      set -x
      sed -i -e 's|\r||g' $f
      set +x
   fi
done
set -x

# fix spurious flags
for f in `find . -name Mapbender.po -type f` ; do
chmod -x $f
done


%build

%install
rm -rf %{buildroot}

mkdir -p -m0755 %{buildroot}%{_sysconfdir}/%{name}
mkdir -p -m0755 %{buildroot}%{_datadir}/%{name}
mkdir -p -m0755 %{buildroot}%{contentdir}/html

# install the config files
mkdir -p %{buildroot}%{_sysconfdir}/httpd/conf.d
install -m 644 %{SOURCE1} \
   %{buildroot}%{_sysconfdir}/httpd/conf.d/

mkdir -p %{buildroot}%{_datadir}/%{name}/conf
pushd %{buildroot}%{_datadir}/%{name}/conf
 for file in {digitize_default,gazetteerSQL,mapbender,poi,session,wfs_default}; do
   ln -s ../../../../%{_sysconfdir}/%{name}/$file.conf $file.conf
 done
popd
sed -i 's|\r||g' conf/*
install -p -m 644 conf/*.conf %{buildroot}%{_sysconfdir}/%{name}
install -p -m 644 conf/%{name}.conf-dist \
        %{buildroot}%{_sysconfdir}/%{name}/%{name}.conf
install -p -m 644 conf/*.conf-dist %{buildroot}%{_datadir}/%{name}/conf

# adjust config file
sed -i 's|\"CHECK\"\, false|\"CHECK\"\, true|g' \
%{buildroot}%{_sysconfdir}/%{name}/%{name}.conf
sed -i 's|\"PORTAL\"\, false|\"PORTAL\"\, true|g' \
%{buildroot}%{_sysconfdir}/%{name}/%{name}.conf
sed -i 's|"TMPDIR", "../tmp"|"TMPDIR", "/var/tmp"|g' \
%{buildroot}%{_sysconfdir}/%{name}/%{name}.conf
sed -i 's|<ip or name>/owsproxy|localhost/owsproxy|g' \
%{buildroot}%{_sysconfdir}/%{name}/%{name}.conf
sed -i 's|<HOST>|localhost|g' \
%{buildroot}%{_sysconfdir}/%{name}/%{name}.conf
sed -i 's|<database>|mapbender|g' \
%{buildroot}%{_sysconfdir}/%{name}/%{name}.conf
sed -i 's|<owner>|root|g' \
%{buildroot}%{_sysconfdir}/%{name}/%{name}.conf


# instal mapbender
cp -pr http %{buildroot}%{_datadir}/%{name}/
cp -pr core %{buildroot}%{_datadir}/%{name}/
cp -pr lib %{buildroot}%{_datadir}/%{name}/
cp -pr tools %{buildroot}%{_datadir}/%{name}/http/
cp -pr documents %{buildroot}%{_datadir}/%{name}/
cp -pr owsproxy %{buildroot}%{_datadir}/%{name}/
cp -pr resources %{buildroot}%{_datadir}/%{name}/

# install fedora doc
install -p -m644 %{SOURCE2} .

# install index.php wrapper for tools setup-check page
pushd %{buildroot}%{_datadir}/%{name}/http/tools/
ln -s mapbender_setup.php index.php
popd

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root)
%config %dir %{_sysconfdir}/%{name}
%attr(640,root,apache) %config(noreplace) %{_sysconfdir}/%{name}/*.conf
%config(noreplace) %{_sysconfdir}/httpd/conf.d/%{name}.conf
%doc Changes.txt Install.txt Readme.txt README.fedora
%doc license resources
%dir %{_datadir}/%{name}
%{_datadir}/%{name}/conf
%{_datadir}/%{name}/http
%{_datadir}/%{name}/core
%{_datadir}/%{name}/lib
%{_datadir}/%{name}/documents
%{_datadir}/%{name}/owsproxy
%{_datadir}/%{name}/resources

%changelog
* Tue Dec 09 2008 Balint Cristian <rezso at rdsor.ro> - 2.5-1
- new release

* Sat Jul 05 2008 Balint Cristian <rezso at rdsor.ro> - 2.4.5-2
- allow connections only from localhost by defult
- create README.fedora doc

* Fri Jun 13 2008 Balint Cristian <rezso at rdsor.ro> - 2.4.5-1
- initial package, upstream stable 2.4.5



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mapbender/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	4 Jan 2009 20:07:09 -0000	1.1
+++ .cvsignore	5 Jan 2009 07:30:25 -0000	1.2
@@ -0,0 +1 @@
+mapbender_2.5.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mapbender/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	4 Jan 2009 20:07:09 -0000	1.1
+++ sources	5 Jan 2009 07:30:26 -0000	1.2
@@ -0,0 +1 @@
+b9161c1349cab9078db6fa62d26e80af  mapbender_2.5.zip



From alexlan at fedoraproject.org  Mon Jan  5 07:52:28 2009
From: alexlan at fedoraproject.org (Alex Lancaster)
Date: Mon,  5 Jan 2009 07:52:28 +0000 (UTC)
Subject: rpms/octave-forge/devel octave-forge-image-1.0.8-build.patch, NONE, 
	1.1 octave-forge.spec, 1.63, 1.64
Message-ID: <20090105075228.826237011F@cvs1.fedora.phx.redhat.com>

Author: alexlan

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

Modified Files:
	octave-forge.spec 
Added Files:
	octave-forge-image-1.0.8-build.patch 
Log Message:
* Mon Jan  5 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 20080831-4
- Patch to temporarily get image subpackage to build (#477577)


octave-forge-image-1.0.8-build.patch:

--- NEW FILE octave-forge-image-1.0.8-build.patch ---
--- main/image-1.0.8/src/Makefile.orig	2009-01-05 00:27:11.000000000 -0700
+++ main/image-1.0.8/src/Makefile	2009-01-05 00:32:41.000000000 -0700
@@ -30,6 +30,6 @@
 	$(MKOCTFILE) $< -lpng
 
 __magick_read__.oct: __magick_read__.cc
-	$(MKOCTFILE) $< `Magick++-config --cppflags` `Magick++-config --ldflags`
+	$(MKOCTFILE) $< `for i in $$(Magick++-config --cppflags); do echo -Wp,$${i}; done` `for l in $$(Magick++-config --ldflags); do echo -Wl,$${l}; done`
 
 clean: ; -$(RM) *.o octave-core core *.oct *~


Index: octave-forge.spec
===================================================================
RCS file: /cvs/pkgs/rpms/octave-forge/devel/octave-forge.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- octave-forge.spec	3 Jan 2009 19:16:55 -0000	1.63
+++ octave-forge.spec	5 Jan 2009 07:51:57 -0000	1.64
@@ -2,7 +2,7 @@
 
 Name:           octave-forge
 Version:        20080831
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Contributed functions for octave
 
 Group:          Applications/Engineering
@@ -17,6 +17,7 @@
 ## tar czf octave-forge-bundle-%{version}.patched.tar.gz octave-forge-bundle-%{version}
 ## rm -Rf octave-forge-bundle-%{version}
 Source0:        %{name}-bundle-%{version}.patched.tar.gz
+Patch0:         %{name}-image-1.0.8-build.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:	octave(api) = %{octave_api} ImageMagick
@@ -131,6 +132,9 @@
    cd ..
 done
 
+#apply patch to build image-1.0.8 (bug #477577)
+%patch0 -p0
+
 #Install with -nodeps
 sed -i -e "s/pkg('install',/pkg('install','-nodeps',/" */*/Makefile
 
@@ -203,6 +207,9 @@
 
 
 %changelog
+* Mon Jan  5 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 20080831-4
+- Patch to temporarily get image subpackage to build (#477577)
+
 * Sun Jan 04 2009 Rakesh Pandit <rakesh at fedoraproject.org> 20080831-3
 - Fixed unowned directories (BZ 474675)
 



From pkgdb at fedoraproject.org  Mon Jan  5 08:05:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Jan 2009 08:05:20 +0000
Subject: [pkgdb] wireshark had acl change status
Message-ID: <20090105080520.BC5CF20873E@bastion.fedora.phx.redhat.com>

rvokal has set the watchbugzilla acl on wireshark (Fedora 8) to Approved for tunis1ano

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



From atkac at fedoraproject.org  Mon Jan  5 08:18:16 2009
From: atkac at fedoraproject.org (Adam Tkac)
Date: Mon,  5 Jan 2009 08:18:16 +0000 (UTC)
Subject: rpms/bind/devel .cvsignore, 1.48, 1.49 bind.spec, 1.296,
	1.297 sources, 1.57, 1.58
Message-ID: <20090105081816.CCB7D7011F@cvs1.fedora.phx.redhat.com>

Author: atkac

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

Modified Files:
	.cvsignore bind.spec sources 
Log Message:
- Happy new year
- 9.6.0 release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bind/devel/.cvsignore,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- .cvsignore	18 Dec 2008 13:34:51 -0000	1.48
+++ .cvsignore	5 Jan 2009 08:17:46 -0000	1.49
@@ -1,5 +1,5 @@
 config-4.tar.bz2
 libbind-man.tar.gz
 bind-chroot.tar.bz2
-bind-9.6.0rc2.tar.gz
+bind-9.6.0.tar.gz
 libbind-9.5.1b2.tar.bz2


Index: bind.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bind/devel/bind.spec,v
retrieving revision 1.296
retrieving revision 1.297
diff -u -r1.296 -r1.297
--- bind.spec	18 Dec 2008 13:34:51 -0000	1.296
+++ bind.spec	5 Jan 2009 08:17:46 -0000	1.297
@@ -2,8 +2,9 @@
 # Red Hat BIND package .spec file
 #
 
-%define PREVER rc2
-%define VERSION %{version}%{PREVER}
+#%define PREVER rc2
+#%define VERSION %{version}%{PREVER}
+%define VERSION %{version}
 
 %{?!SDB:       %define SDB       1}
 %{?!LIBBIND:   %define LIBBIND   1}
@@ -18,7 +19,7 @@
 Name:     bind
 License:  ISC
 Version:  9.6.0
-Release:  0.7.%{PREVER}%{?dist}
+Release:  1%{?dist}
 Epoch:    32
 Url:      http://www.isc.org/products/BIND/
 Buildroot:%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -599,6 +600,10 @@
 %ghost %{chroot_prefix}/etc/localtime
 
 %changelog
+* Mon Jan 05 2009 Adam Tkac <atkac redhat com> 32:9.6.0-1
+- Happy new year
+- 9.6.0 release
+
 * Thu Dec 18 2008 Adam Tkac <atkac redhat com> 32:9.6.0-0.7.rc2
 - 9.6.0rc2 release
 - bind-96-rh475120.patch merged


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bind/devel/sources,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- sources	18 Dec 2008 13:34:51 -0000	1.57
+++ sources	5 Jan 2009 08:17:46 -0000	1.58
@@ -1,5 +1,5 @@
 de68e10e91e05ab100be879b5bcaa6cb  config-4.tar.bz2
 13fef79f99fcefebb51d84b08805de51  libbind-man.tar.gz
 4faa4395b955e5f8a3d50f308b9fabc8  bind-chroot.tar.bz2
-6a2cf98100ac5df8b7f70931456d73f5  bind-9.6.0rc2.tar.gz
+287231d759ad83ed51f60f8a9f8176b9  bind-9.6.0.tar.gz
 3d1dad3630ec3510c8ab0ac2217a3317  libbind-9.5.1b2.tar.bz2



From akurtakov at fedoraproject.org  Mon Jan  5 08:28:06 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Mon,  5 Jan 2009 08:28:06 +0000 (UTC)
Subject: rpms/eclipse-pydev/devel .cvsignore, 1.12, 1.13 sources, 1.12,
	1.13 eclipse-pydev.spec, 1.19, 1.20
Message-ID: <20090105082806.577177011F@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/eclipse-pydev/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17447/devel

Modified Files:
	.cvsignore sources eclipse-pydev.spec 
Log Message:
- Update to 1.4.0 - adds support for Python 2.6/3.0.
- Use system jakarta-commons-logging and xmlrpc3.
- Drop arch checks for mylyn - it is noarch now.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-pydev/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	27 Oct 2008 20:47:50 -0000	1.12
+++ .cvsignore	5 Jan 2009 08:27:35 -0000	1.13
@@ -3,3 +3,4 @@
 org.python.pydev.feature-src-1_3_22.zip
 org.python.pydev.feature-src-1_3_23.zip
 org.python.pydev.feature-src-1_3_24.zip
+org.python.pydev.feature-src-1_4_0.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-pydev/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	27 Oct 2008 20:47:50 -0000	1.12
+++ sources	5 Jan 2009 08:27:35 -0000	1.13
@@ -1,2 +1,2 @@
 3a42402df10a42af0a8d648711c36239  org.python.pydev.mylyn.feature-fetched-src-pydev_1_3_7.tar.bz2
-d1569c0e4264bbdfa34fe9339560baa5  org.python.pydev.feature-src-1_3_24.zip
+bbc66c7501ef55179c331121239fa289  org.python.pydev.feature-src-1_4_0.zip


Index: eclipse-pydev.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-pydev/devel/eclipse-pydev.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- eclipse-pydev.spec	15 Dec 2008 10:06:52 -0000	1.19
+++ eclipse-pydev.spec	5 Jan 2009 08:27:35 -0000	1.20
@@ -1,15 +1,15 @@
 Epoch: 1
 
 %define eclipse_base        %{_libdir}/eclipse
-%define install_loc         %{_datadir}/eclipse/dropins
+%define install_loc         %{_libdir}/eclipse/dropins
 
 %define major     1
-%define minor     3
-%define maint     24
+%define minor     4
+%define maint     0
 Summary:          Eclipse Python development plug-in
 Name:             eclipse-pydev
 Version:          %{major}.%{minor}.%{maint}
-Release:          4%{?dist}
+Release:          1%{?dist}
 License:          EPL
 URL:              http://pydev.sourceforge.net
 Group:            Development/Tools
@@ -26,21 +26,26 @@
 %ifarch %{ix86}
 Requires:         python-psyco
 %endif
-Requires:         commons-codec >= 1.3
+Requires:         jakarta-commons-codec >= 1.3
+Requires:         jakarta-commons-logging
+Requires:         xmlrpc3-common
+Requires:         xmlrpc3-client
+Requires:         xmlrpc3-server
 Requires:         junit >= 3.8.1
 Requires:         jython >= 2.2
 BuildRequires:    eclipse-pde
-# no xmlrpc3 -> no mylyn on ppc64 due to:
-# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=239123
-%ifnarch ppc64
 BuildRequires:    eclipse-mylyn
-%endif
 BuildRequires:    jpackage-utils >= 0:1.5
 BuildRequires:    junit >= 3.8.1
-BuildRequires:    commons-codec >= 1.3
+BuildRequires:    jakarta-commons-codec >= 1.3
+BuildRequires:    jakarta-commons-logging
+BuildRequires:    ws-commons-util
+BuildRequires:    xmlrpc3-common
+BuildRequires:    xmlrpc3-client
+BuildRequires:    xmlrpc3-server
 BuildRequires:    jython >= 2.2
 
-# This package can not be noarch due to mylyn and psyco issues on different platforms.
+# This package can not be noarch because psyco is a x86 package.
 #BuildArch:        noarch
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -48,7 +53,6 @@
 The eclipse-pydev package contains Eclipse plugins for
 Python development.
 
-%ifnarch ppc64
 %package  mylyn
 Summary:  Pydev Mylyn Focused UI
 Requires: eclipse-mylyn
@@ -57,7 +61,6 @@
 
 %description mylyn
 Mylyn Task-Focused UI extensions for Pydev.
-%endif
 
 %prep
 %setup -q -c 
@@ -81,16 +84,36 @@
 
 # link to system jars
 rm -f plugins/org.python.pydev.core/commons-codec.jar
-ln -sf %{_datadir}/java/jakarta-commons-codec.jar \
+ln -sf %{_javadir}/jakarta-commons-codec.jar \
        plugins/org.python.pydev.core/commons-codec.jar
 
 rm -f plugins/org.python.pydev.core/lib/junit.jar
-ln -sf %{_datadir}/java/junit.jar \
+ln -sf %{_javadir}/junit.jar \
        plugins/org.python.pydev.core/junit.jar
 
 rm -f plugins/org.python.pydev.jython/jython.jar
-ln -sf %{_datadir}/java/jython.jar \
+ln -sf %{_javadir}/jython.jar \
        plugins/org.python.pydev.jython/jython.jar
+       
+rm -f plugins/org.python.pydev.debug/commons-logging-1.1.jar
+ln -sf %{_javadir}/jakarta-commons-logging.jar \
+       plugins/org.python.pydev.debug/commons-logging-1.1.jar
+       
+rm -f plugins/org.python.pydev.debug/ws-commons-util-1.0.2.jar
+ln -sf %{_javadir}/ws-commons-util.jar \
+       plugins/org.python.pydev.debug/ws-commons-util-1.0.2.jar
+       
+rm -f plugins/org.python.pydev.debug/xmlrpc-client-3.1.jar
+ln -sf %{_javadir}/xmlrpc3-client.jar \
+       plugins/org.python.pydev.debug/xmlrpc-client-3.1.jar
+
+rm -f plugins/org.python.pydev.debug/xmlrpc-common-3.1.jar
+ln -sf %{_javadir}/xmlrpc3-common.jar \
+       plugins/org.python.pydev.debug/xmlrpc-common-3.1.jar
+       
+rm -f plugins/org.python.pydev.debug/xmlrpc-server-3.1.jar
+ln -sf %{_javadir}/xmlrpc3-server.jar \
+       plugins/org.python.pydev.debug/xmlrpc-server-3.1.jar
 
 rm -f plugins/org.python.pydev.refactoring/tests/lib/JFlex.jar
 # enable when tests are used
@@ -114,14 +137,10 @@
   -a "-DjavacSource=1.5  -DjavacTarget=1.5" \
   -f org.python.pydev.feature
 
-# no xmlrpc3 -> no mylyn on ppc64 due to:
-# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=239123
-%ifnarch ppc64
 %{eclipse_base}/buildscripts/pdebuild \
   -a "-DjavacSource=1.5  -DjavacTarget=1.5" \
   -d mylyn \
   -f org.python.pydev.mylyn.feature
-%endif
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -132,30 +151,46 @@
 # pydev main feature
 unzip -q -d $installDir build/rpmBuild/org.python.pydev.feature.zip
 
-# no xmlrpc3 -> no mylyn on ppc64 due to:
-# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=239123
-%ifnarch ppc64
 # pydev mylyn feature
 unzip -q -d ${installDir}-mylyn build/rpmBuild/org.python.pydev.mylyn.feature.zip
-%endif
 
 # deal with linked deps
 pushd $installDir/eclipse/plugins
 rm -rf org.python.pydev.core_%{version}/commons-codec.jar
-ln -sf %{_datadir}/java/jakarta-commons-codec.jar \
+ln -sf %{_javadir}/jakarta-commons-codec.jar \
        org.python.pydev.core_%{version}/commons-codec.jar
 
 mkdir org.python.pydev.core_%{version}/lib
-ln -sf %{_datadir}/java/junit.jar \
+ln -sf %{_javadir}/junit.jar \
        org.python.pydev.core_%{version}/lib/junit.jar
 
+rm -rf org.python.pydev.debug_%{version}/commons-logging-1.1.jar
+ln -sf %{_javadir}/jakarta-commons-logging.jar \
+       org.python.pydev.debug_%{version}/commons-logging-1.1.jar
+       
+rm -rf org.python.pydev.debug_%{version}/ws-commons-util-1.0.2.jar
+ln -sf %{_javadir}/ws-commons-util.jar \
+       org.python.pydev.debug_%{version}/ws-commons-util-1.0.2.jar
+       
+rm -f org.python.pydev.debug_%{version}/xmlrpc-client-3.1.jar
+ln -sf %{_javadir}/xmlrpc3-client.jar \
+       org.python.pydev.debug_%{version}/xmlrpc-client-3.1.jar
+
+rm -f org.python.pydev.debug_%{version}/xmlrpc-common-3.1.jar
+ln -sf %{_javadir}/xmlrpc3-common.jar \
+       org.python.pydev.debug_%{version}/xmlrpc-common-3.1.jar
+       
+rm -f org.python.pydev.debug_%{version}/xmlrpc-server-3.1.jar
+ln -sf %{_javadir}/xmlrpc3-server.jar \
+       org.python.pydev.debug_%{version}/xmlrpc-server-3.1.jar
+
 rm -rf org.python.pydev.jython_%{version}/jython.jar
-ln -sf %{_datadir}/java/jython.jar \
+ln -sf %{_javadir}/jython.jar \
        org.python.pydev.jython_%{version}/jython.jar
 popd
 
 # 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/dropins/pydev/eclipse/plugins/org.python.pydev.jython_%{version}/Lib/cgi.py
+sed -i 's/\/usr\/local\/bin\/python/\/usr\/bin\/env python/' ${RPM_BUILD_ROOT}%{install_loc}/pydev/eclipse/plugins/org.python.pydev.jython_%{version}/Lib/cgi.py
 # convert .py$ files from mode 0644 to mode 0755
 chmod 0755 `find ${RPM_BUILD_ROOT} -name '*\.py' -perm 0644 | xargs`
 
@@ -169,15 +204,16 @@
 %files
 %defattr(-,root,root,-)
 %{install_loc}/pydev
-# no xmlrpc3 -> no mylyn on ppc64 due to:
-# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=239123
 
-%ifnarch ppc64
 %files mylyn
 %{install_loc}/pydev-mylyn
-%endif 
 
 %changelog
+* Thu Dec 25 2008 Alexander Kurtakov <akurtako at redhat.com> 1:1.4.0-1
+- Update to 1.4.0 - adds support for Python 2.6/3.0.
+- Use system jakarta-commons-logging and xmlrpc3.
+- Drop arch checks for mylyn - it is noarch now.
+
 * Mon Dec 15 2008 Alexander Kurtakov <akurtako at redhat.com> 1:1.3.24-4
 - This package is not noarch due to python-psyco and mylyn issues on different platforms.
 



From pwouters at fedoraproject.org  Mon Jan  5 08:38:26 2009
From: pwouters at fedoraproject.org (Paul Wouters)
Date: Mon,  5 Jan 2009 08:38:26 +0000 (UTC)
Subject: rpms/unbound/devel unbound-1.1-scandir.patch,NONE,1.1
Message-ID: <20090105083826.4E5037011F@cvs1.fedora.phx.redhat.com>

Author: pwouters

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

Added Files:
	unbound-1.1-scandir.patch 
Log Message:
Added unbound patch to support scandir() to load multiple config files
for the trusted-keys-file: statement used with loading dnssec keys.


unbound-1.1-scandir.patch:

--- NEW FILE unbound-1.1-scandir.patch ---
Index: validator/val_anchor.c
===================================================================
--- validator/val_anchor.c	(revision 1404)
+++ validator/val_anchor.c	(working copy)
@@ -47,6 +47,11 @@
 #include "util/regional.h"
 #include "util/config_file.h"
 
+#include <dirent.h>
+#include <libgen.h>
+#include <fnmatch.h>
+
+
 int
 anchor_cmp(const void* k1, const void* k2)
 {
@@ -627,9 +633,53 @@
 	FILE* in = fopen(fname, "r");
 	int rdlen = 0;
 	if(!in) {
-		log_err("error opening file %s: %s", fname, strerror(errno));
-		return 0;
-	}
+		if(strstr(fname,"*")!=NULL) {
+			struct dirent **namelist;
+			char *fnameb = strdup(fname);
+			char *fnamef = strdup(fname);
+			char *dbase, *globmatch;
+			dbase = dirname(fnameb);
+			globmatch = basename(fnamef);
+			int n;
+			verbose(VERB_QUERY, "wildcard found, processing directory");
+			n = scandir(dbase,&namelist, 0, 0);
+			if (n<0) {
+				log_err("error opening wildcard in dir: %s:", dbase);
+				free(namelist);
+				free(dbase);
+				free(fnameb);
+				free(fnamef);
+				free(globmatch);
+				return 0;
+			}
+			else {
+				while(n--) {
+					if (namelist[n]->d_type != DT_DIR) {
+						if(!fnmatch(globmatch,namelist[n]->d_name,0)) {
+							// log_err( "file %s matched pattern %s - loading", namelist[n]->d_name, globmatch);
+							char *newname = malloc(strlen(namelist[n]->d_name) + strlen(dbase) + strlen("/") + 1);
+							strcpy(newname, dbase);
+							strcat(newname,"/");
+							strcat(newname, namelist[n]->d_name);
+							if(!anchor_read_bind_file(anchors, buffer,newname)) {
+                        					log_err("error reading wildcard trusted-keys-file: %s", newname);
+                					}
+							free(newname);
+						} else {
+							// log_err("file %s did not match pattern %s", namelist[n]->d_name, globmatch);
+						}
+					}
+					free(namelist[n]);
+				}
+				free(namelist);
+				free(dbase);
+				// causes segfault free(fnameb);
+				free(fnamef);
+				// causes segfault  free(globmatch);
+			     }
+			return 1;
+			}
+	         }
 	verbose(VERB_QUERY, "reading in bind-compat-mode: '%s'", fname);
 	/* scan for  trusted-keys  keyword, ignore everything else */
 	ldns_buffer_clear(buffer);



From caolanm at fedoraproject.org  Mon Jan  5 08:43:28 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Mon,  5 Jan 2009 08:43:28 +0000 (UTC)
Subject: rpms/hyphen-fr/devel hyphen-fr.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090105084328.C8BA57011F@cvs1.fedora.phx.redhat.com>

Author: caolanm

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

Modified Files:
	.cvsignore sources 
Added Files:
	hyphen-fr.spec import.log 
Log Message:



--- NEW FILE hyphen-fr.spec ---
Name: hyphen-fr
Summary: French hyphenation rules
%define upstreamid 20080318
Version: 0.%{upstreamid}
Release: 1%{?dist}
Source: http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/dictionaries/hyph_fr_FR_2-0.zip
Group: Applications/Text
URL: http://wiki.services.openoffice.org/wiki/Dictionaries
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
License: LGPLv2+
BuildArch: noarch

Requires: hyphen

%description
French hyphenation rules.

%prep
%setup -q -c

%build

%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT/%{_datadir}/hyphen
cp -p *.dic $RPM_BUILD_ROOT/%{_datadir}/hyphen

pushd $RPM_BUILD_ROOT/%{_datadir}/hyphen/
fr_FR_aliases="fr_BE fr_CA fr_CH fr_LU fr_MC"
for lang in $fr_FR_aliases; do
        ln -s hyph_fr_FR.dic hyph_$lang.dic
done
popd

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc README_hyph_fr_FR.txt
%{_datadir}/hyphen/*

%changelog
* Wed Dec 31 2008 Caolan McNamara <caolanm at redhat.com> - 0.20080318-1
- initial version


--- NEW FILE import.log ---
hyphen-fr-0_20080318-1_fc10:HEAD:hyphen-fr-0.20080318-1.fc10.src.rpm:1231144941


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hyphen-fr/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	4 Jan 2009 20:40:34 -0000	1.1
+++ .cvsignore	5 Jan 2009 08:42:58 -0000	1.2
@@ -0,0 +1 @@
+hyph_fr_FR_2-0.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hyphen-fr/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	4 Jan 2009 20:40:34 -0000	1.1
+++ sources	5 Jan 2009 08:42:58 -0000	1.2
@@ -0,0 +1 @@
+f6d9bd51a939df943612c3f5ac2a511c  hyph_fr_FR_2-0.zip



From caolanm at fedoraproject.org  Mon Jan  5 09:28:16 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Mon,  5 Jan 2009 09:28:16 +0000 (UTC)
Subject: rpms/openoffice.org/devel openoffice.org.spec,1.1739,1.1740
Message-ID: <20090105092816.E0BD57011F@cvs1.fedora.phx.redhat.com>

Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Log Message:
add hyphen-fr


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1739
retrieving revision 1.1740
diff -u -r1.1739 -r1.1740
--- openoffice.org.spec	25 Dec 2008 23:12:48 -0000	1.1739
+++ openoffice.org.spec	5 Jan 2009 09:27:46 -0000	1.1740
@@ -799,7 +799,7 @@
 Summary: French language pack for %{name}
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
-Requires: hunspell-fr
+Requires: hunspell-fr, hyphen-fr
 Obsoletes: openoffice.org-i18n < 1.9.0
 Obsoletes: openoffice.org2-langpack-fr < 1:3.0.0
 



From pkgdb at fedoraproject.org  Mon Jan  5 09:41:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Jan 2009 09:41:17 +0000
Subject: [pkgdb] gamin had acl change status
Message-ID: <20090105094117.89B90208CAB@bastion.fedora.phx.redhat.com>

tbzatek has set the watchcommits acl on gamin (Fedora 10) to Approved for kedars

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



From pkgdb at fedoraproject.org  Mon Jan  5 09:48:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Jan 2009 09:48:51 +0000
Subject: [pkgdb] php had acl change status
Message-ID: <20090105094851.9626B20873E@bastion.fedora.phx.redhat.com>

jorton has set the watchcommits acl on php (Fedora 9) to Approved for remi

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



From pkgdb at fedoraproject.org  Mon Jan  5 09:48:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Jan 2009 09:48:52 +0000
Subject: [pkgdb] php had acl change status
Message-ID: <20090105094853.280C6208D4F@bastion.fedora.phx.redhat.com>

jorton has set the commit acl on php (Fedora 9) to Approved for remi

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



From pkgdb at fedoraproject.org  Mon Jan  5 09:48:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Jan 2009 09:48:53 +0000
Subject: [pkgdb] php had acl change status
Message-ID: <20090105094853.3E2F5208D52@bastion.fedora.phx.redhat.com>

jorton has set the watchbugzilla acl on php (Fedora 9) to Approved for remi

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



From pkgdb at fedoraproject.org  Mon Jan  5 10:10:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Jan 2009 10:10:38 +0000
Subject: [pkgdb] flac had acl change status
Message-ID: <20090105101038.7905C20873E@bastion.fedora.phx.redhat.com>

mlichvar has set the watchcommits acl on flac (Fedora 10) to Approved for saravanantcecse

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



From gilboa at fedoraproject.org  Mon Jan  5 10:16:17 2009
From: gilboa at fedoraproject.org (Gilboa Davara)
Date: Mon,  5 Jan 2009 10:16:17 +0000 (UTC)
Subject: rpms/icewm/devel .cvsignore, 1.4, 1.5 icewm-keys.patch, 1.1,
	1.2 icewm-menu.patch, 1.1, 1.2 icewm-toolbar.patch, 1.1,
	1.2 icewm.spec, 1.13, 1.14 sources, 1.5, 1.6
Message-ID: <20090105101617.68DBB7011F@cvs1.fedora.phx.redhat.com>

Author: gilboa

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

Modified Files:
	.cvsignore icewm-keys.patch icewm-menu.patch 
	icewm-toolbar.patch icewm.spec sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/icewm/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	14 Jan 2008 17:17:23 -0000	1.4
+++ .cvsignore	5 Jan 2009 10:15:46 -0000	1.5
@@ -1 +1,2 @@
-icewm-1.2.35.tar.gz
+icewm-1.2.36.tar.gz
+clearlooks.tgz

icewm-keys.patch:

Index: icewm-keys.patch
===================================================================
RCS file: /cvs/pkgs/rpms/icewm/devel/icewm-keys.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- icewm-keys.patch	15 Feb 2007 09:55:58 -0000	1.1
+++ icewm-keys.patch	5 Jan 2009 10:15:46 -0000	1.2
@@ -12,8 +12,8 @@
 -key "Alt+Ctrl+b"		netscape -noraise -remote openBookmarks
 -key "Alt+Ctrl+m"		netscape -noraise -remote openURL(mailto:,new-window) 
 +key "Alt+Ctrl+t"			xterm
-+key "Alt+Ctrl+b"			htmlview
-+key "Alt+Ctrl+s"			htmlview http://www.google.com
++key "Alt+Ctrl+b"			xdg-open about:blank
++key "Alt+Ctrl+s"			xdg-open http://www.google.com
  
 -key "Alt+Ctrl+KP_Divide"	aumix -v -5		# lower volume
 -key "Alt+Ctrl+KP_Multiply"	aumix -v +5		# raise volume
@@ -38,6 +38,6 @@
 +key "XF86AudioLowerVolume"	amixer sset PCM 5%-
 +key "XF86AudioRaiseVolume"	amixer sset PCM 5%+
 +key "XF86AudioMute"			amixer sset PCM 0%
-+key "XF86HomePage"			htmlview
-+key "XF86Search"			htmlview http://www.google.com
++key "XF86HomePage"			xdg-open about:blank
++key "XF86Search"			xdg-open http://www.google.com
 +key "XF86Eject"				eject

icewm-menu.patch:

Index: icewm-menu.patch
===================================================================
RCS file: /cvs/pkgs/rpms/icewm/devel/icewm-menu.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- icewm-menu.patch	15 Feb 2007 09:55:58 -0000	1.1
+++ icewm-menu.patch	5 Jan 2009 10:15:46 -0000	1.2
@@ -12,7 +12,7 @@
 -prog XChat xchat xchat
 -prog Gimp gimp gimp
 +prog xterm /usr/share/icons/Bluecurve/32x32/apps/gnome-terminal.png xterm
-+prog "Web browser" /usr/share/icons/Bluecurve/32x32/apps/mozilla-icon.png htmlview
++prog "Web browser" /usr/share/icons/Bluecurve/32x32/apps/mozilla-icon.png xdg-open about:blank
  separator
 -menuprog Gnome folder icewm-menu-gnome1 --list @CONFIG_GNOME1_MENU_DIR@
 -menuprog Gnome folder icewm-menu-gnome2 --list @CONFIG_GNOME2_MENU_DIR@

icewm-toolbar.patch:

Index: icewm-toolbar.patch
===================================================================
RCS file: /cvs/pkgs/rpms/icewm/devel/icewm-toolbar.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- icewm-toolbar.patch	15 Feb 2007 09:55:58 -0000	1.1
+++ icewm-toolbar.patch	5 Jan 2009 10:15:46 -0000	1.2
@@ -8,5 +8,5 @@
 -prog FTE fte fte
 -prog Netscape netscape netscape
 +prog xterm /usr/share/icons/Bluecurve/32x32/apps/gnome-terminal.png xterm
-+prog "Web browser" /usr/share/icons/Bluecurve/32x32/apps/mozilla-icon.png htmlview
++prog "Web browser" /usr/share/icons/Bluecurve/32x32/apps/mozilla-icon.png xdg-open about:blank
 +


Index: icewm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/icewm/devel/icewm.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- icewm.spec	19 Feb 2008 04:02:09 -0000	1.13
+++ icewm.spec	5 Jan 2009 10:15:46 -0000	1.14
@@ -1,6 +1,6 @@
 Name:			icewm
-Version:		1.2.35
-Release:		4%{?dist}
+Version:		1.2.36
+Release:		1%{?dist}
 Summary:		Light and configurable window manager
 
 Group:			User Interface/Desktops
@@ -9,7 +9,8 @@
 Source0:		http://heanet.dl.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.gz
 Source1:		http://lostclus.linux.kiev.ua/scripts/icewm-xdg-menu
 Source2:		icewm.desktop
-Source4:		icewm-startup
+Source3:		icewm-startup
+Source4:		clearlooks.tgz
 BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 %if 0%{?fedora} >= 8
 BuildRequires:	popt-devel
@@ -30,9 +31,11 @@
 BuildRequires:	gnome-desktop-devel
 %if 0%{?fedora} < 9
 Requires:		xorg-x11-fonts-truetype
+Requires:		htmlview
+%else
+Requires:		xdg-utils
 %endif
 Requires:		alsa-utils
-Requires:		htmlview
 Requires:		xterm
 
 Patch0:			icewm-configure.patch
@@ -53,8 +56,6 @@
 Requires:		icewm = %{version}-%{release}
 
 
-
-
 %description	gnome
 IceWM-gnome adds gnome-menu support for the IceWM window manager.
 
@@ -72,6 +73,18 @@
 user logs-in.
 
 
+%package		clearlooks
+Summary:		Clearlooks like theme for IceWM
+Group:			User Interface/Desktops
+Requires:		ImageMagick
+Requires:		icewm = %{version}-%{release}
+
+
+%description	clearlooks
+An IceWM theme that mimics the GNOME ClearLooks theme used by
+older Fedora releases and RHEL.
+
+
 %prep
 %setup -q
 %patch0 -p1 -b .configure
@@ -100,11 +113,16 @@
 
 %{__install} -p -m 755 %{SOURCE1} $RPM_BUILD_ROOT/%{_bindir}
 
-%{__install} -p -m 755 %{SOURCE4} $RPM_BUILD_ROOT%{_datadir}/icewm/startup
+%{__install} -p -m 755 %{SOURCE3} $RPM_BUILD_ROOT%{_datadir}/icewm/startup
 
 mkdir -p $RPM_BUILD_ROOT/%{_datadir}/xsessions/
 %{__install} -p -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/xsessions/
 
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/icewm/themes
+tar -C $RPM_BUILD_ROOT%{_datadir}/icewm/themes -xzf %{SOURCE4}
+
+echo "Theme=\"clearlooks/default.theme\"" > $RPM_BUILD_ROOT%{_datadir}/icewm/theme
+
 %find_lang %{name}
 
 
@@ -112,11 +130,42 @@
 rm -rf $RPM_BUILD_ROOT
 
 
+%post clearlooks
+[ ! -z "$(cat /etc/issue | grep Fedora)" ] &&									\
+	[ -d /usr/share/icewm/themes/clearlooks ] && [ -x /usr/bin/convert ] &&		\
+			convert /usr/share/icons/hicolor/24x24/apps/fedora-logo-icon.png	\
+					/usr/share/icewm/themes/clearlooks/taskbar/icewm.xpm || echo -n
+[ -z "$(cat /etc/issue | grep Fedora)" ] &&										\
+	[ -d /usr/share/icewm/themes/clearlooks ] && [ -x /usr/bin/convert ] &&		\
+			convert /usr/share/pixmaps/redhat/shadowman-transparent-22.png		\
+					/usr/share/icewm/themes/clearlooks/taskbar/icewm.xpm || echo -n
+
+
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS BUGS CHANGES COPYING README README.wm-session TODO doc/*.html
 %exclude %{_datadir}/icewm/startup
-%{_datadir}/icewm/
+%{_datadir}/icewm/icons
+%{_datadir}/icewm/keys
+%{_datadir}/icewm/ledclock
+%{_datadir}/icewm/mailbox
+%{_datadir}/icewm/menu
+%{_datadir}/icewm/preferences
+%{_datadir}/icewm/startup
+%{_datadir}/icewm/taskbar  
+%{_datadir}/icewm/themes/gtk2
+%{_datadir}/icewm/themes/icedesert
+%{_datadir}/icewm/themes/Infadel2
+%{_datadir}/icewm/themes/metal2
+%{_datadir}/icewm/themes/motif
+%{_datadir}/icewm/themes/nice
+%{_datadir}/icewm/themes/nice2
+%{_datadir}/icewm/themes/warp3
+%{_datadir}/icewm/themes/warp4
+%{_datadir}/icewm/themes/win95
+%{_datadir}/icewm/themes/yellowmotif
+%{_datadir}/icewm/toolbar
+%{_datadir}/icewm/winoptions
 %{_datadir}/xsessions/icewm.desktop
 %{_mandir}/man1/icewm.1*
 %{_bindir}/icewmbg
@@ -139,7 +188,18 @@
 %{_datadir}/icewm/startup
 
 
+%files clearlooks
+%defattr(-,root,root,-)
+%{_datadir}/icewm/themes/clearlooks
+%{_datadir}/icewm/theme
+
+
 %changelog
+* Sun Jan 4 2009 Gilboa Davara <gilboad[AT]gmail.com> - 1.2.36-1
+- 1.2.36.
+- Replace htmlview with xdg-utils. (Patch by Ville Skytta).
+- New sub-package: Clearlook theme.
+
 * Mon Feb 18 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1.2.35-4
 - Autorebuild for GCC 4.3
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/icewm/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	14 Jan 2008 17:17:23 -0000	1.5
+++ sources	5 Jan 2009 10:15:46 -0000	1.6
@@ -1 +1,2 @@
-a2adc53ab4c0c7ca6daa1ca4c697ffe9  icewm-1.2.35.tar.gz
+a9761dcde3633ca677b62e1f1abada3d  icewm-1.2.36.tar.gz
+933ab5875707f9918d92f63d391630b0  clearlooks.tgz



From mmaslano at fedoraproject.org  Mon Jan  5 10:30:02 2009
From: mmaslano at fedoraproject.org (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?=)
Date: Mon,  5 Jan 2009 10:30:02 +0000 (UTC)
Subject: rpms/anacron/F-8 .cvsignore, 1.3, 1.4 anacron-2.3-hourly.patch, 1.1,
	1.2 anacron.init, 1.13, 1.14 anacron.spec, 1.44, 1.45 sources,
	1.3, 1.4
Message-ID: <20090105103002.448CF7013C@cvs1.fedora.phx.redhat.com>

Author: mmaslano

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

Modified Files:
	.cvsignore anacron-2.3-hourly.patch anacron.init anacron.spec 
	sources 
Log Message:
* Mon Jan 5 2009 Marcela Ma??l????ov?? <mmaslano at redhat.com> 2.3-59
- 472275 apply changes from pspencer, which should fix most of
 problems like running some jobs twice.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/anacron/F-8/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	6 Feb 2007 14:35:24 -0000	1.3
+++ .cvsignore	5 Jan 2009 10:29:31 -0000	1.4
@@ -1,2 +1,4 @@
 anacron_2.3.orig.tar.gz
 anacron.init
+anacron.cron
+runanacron

anacron-2.3-hourly.patch:

Index: anacron-2.3-hourly.patch
===================================================================
RCS file: /cvs/pkgs/rpms/anacron/F-8/anacron-2.3-hourly.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- anacron-2.3-hourly.patch	30 Oct 2008 13:49:03 -0000	1.1
+++ anacron-2.3-hourly.patch	5 Jan 2009 10:29:31 -0000	1.2
@@ -1,13 +1,18 @@
 diff -urN anacron-2.3/fedora.mm/anacron.daily anacron-2.3/fedora/anacron.daily
 --- anacron-2.3/fedora.mm/anacron.daily	1970-01-01 01:00:00.000000000 +0100
 +++ anacron-2.3/fedora/anacron.daily	2008-10-30 12:44:27.000000000 +0100
-@@ -0,0 +1,33 @@
+@@ -0,0 +1,38 @@
 +#!/bin/bash
 +# wait for 3:02 when /etc/crontab runs cron.daily
 +if [ `date +%H` -le 4 ]; then
 +    exit 0;
 +fi
 +
++day=`cat /var/spool/anacron/cron.daily`
++if [ `date +%Y%m%d` = $day ]; then
++	exit 0;
++fi
++
 +#delay - more computers on one line don't receive updates at the same time
 +[ -f /etc/sysconfig/crontab ] && . /etc/sysconfig/crontab
 +if [ ! -z "$DELAY" ]; then


Index: anacron.init
===================================================================
RCS file: /cvs/pkgs/rpms/anacron/F-8/anacron.init,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- anacron.init	17 Aug 2007 10:38:46 -0000	1.13
+++ anacron.init	5 Jan 2009 10:29:31 -0000	1.14
@@ -34,6 +34,17 @@
 	    exit 0
         fi
     fi
+
+# If starting within 15 minutes of midnight or before 5 am, defer until
+# the scheduled 5am anacron run -- this allows the regular cron jobs to
+# run first, so that anacron doesn't repeat jobs that the regular cron
+# job will pick up as well.
+
+    if [ `date +%H -d "15 minutes"` -le 4 ] ; then
+        echo "deferred until after the regular morning cron job run"
+        exit 0
+    fi
+ 
     daemon +19 anacron -s
     RETVAL=$?
     if [ $RETVAL -ne 0 ]; then


Index: anacron.spec
===================================================================
RCS file: /cvs/pkgs/rpms/anacron/F-8/anacron.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- anacron.spec	30 Oct 2008 13:49:03 -0000	1.44
+++ anacron.spec	5 Jan 2009 10:29:31 -0000	1.45
@@ -2,20 +2,21 @@
 Summary: A cron-like program that can run jobs lost during downtime
 Name: anacron
 Version: 2.3
-Release: 58%{?dist}
+Release: 59%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 URL: http://packages.debian.org/stable/source/anacron
 Source: http://ftp.debian.org/debian/pool/main/a/anacron/%{name}_%{version}.orig.tar.gz
 Source1: anacrontab
 Source2: anacron.init
+Source3: runanacron
+Source4: anacron.cron
 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
 
 Requires: crontabs
 Requires: initscripts
@@ -48,7 +49,6 @@
 %patch3 -p1 -b .pic
 %patch4 -p1 -b .memleaking
 %patch5 -p1 -b .spool
-%patch6 -p1
 
 %build
 make CFLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags}
@@ -67,16 +67,20 @@
 mkdir -p $RPM_BUILD_ROOT/etc/$i/
 done
 
-#cp debian/0anacron.daily $RPM_BUILD_ROOT/etc/cron.daily/0anacron
-#cp debian/0anacron.monthly $RPM_BUILD_ROOT/etc/cron.monthly/0anacron
-#cp debian/0anacron.weekly $RPM_BUILD_ROOT/etc/cron.weekly/0anacron
-install -m755 fedora/anacron.daily $RPM_BUILD_ROOT/etc/cron.daily/0anacron
-ln -s ../cron.daily/0anacron $RPM_BUILD_ROOT/etc/cron.weekly/0anacron
-ln -s ../cron.daily/0anacron $RPM_BUILD_ROOT/etc/cron.monthly/0anacron
+cp debian/0anacron.daily $RPM_BUILD_ROOT/etc/cron.daily/0anacron
+cp debian/0anacron.monthly $RPM_BUILD_ROOT/etc/cron.monthly/0anacron
+cp debian/0anacron.weekly $RPM_BUILD_ROOT/etc/cron.weekly/0anacron
+#install -m755 fedora/anacron.daily $RPM_BUILD_ROOT/etc/cron.daily/0anacron
+#ln -s ../cron.daily/0anacron $RPM_BUILD_ROOT/etc/cron.weekly/0anacron
+#ln -s ../cron.daily/0anacron $RPM_BUILD_ROOT/etc/cron.monthly/0anacron
 
 mkdir -p $RPM_BUILD_ROOT/etc/rc.d/init.d/
 install -c -m755 %SOURCE2 $RPM_BUILD_ROOT/etc/rc.d/init.d/anacron
 
+install -c -m755 %SOURCE3 $RPM_BUILD_ROOT/usr/sbin/runanacron
+mkdir -p $RPM_BUILD_ROOT/etc/cron.d
+install -m644 %SOURCE4 $RPM_BUILD_ROOT/etc/cron.d/anacron
+
 %clean 
 rm -rf $RPM_BUILD_ROOT
 
@@ -106,11 +110,17 @@
 /%{_mandir}/man5/*
 /%{_mandir}/man8/*
 /usr/sbin/anacron
+/usr/sbin/runanacron
+/etc/cron.d/anacron
 %attr(755,root,root) %dir /etc/cron.daily/0anacron
 %attr(755,root,root) %dir /etc/cron.monthly/0anacron
 %attr(755,root,root) %dir /etc/cron.weekly/0anacron
 
 %changelog
+* Mon Jan 5 2009 Marcela Ma??l????ov?? <mmaslano at redhat.com> 2.3-59
+- 472275 apply changes from pspencer, which should fix most of
+ problems like running some jobs twice.
+
 * Thu Oct 30 2008 Marcela Ma??l????ov?? <mmaslano at redhat.com> 2.3-58
 - same script for all cron.something should prevent double jobs
 - correct spooldir is logged


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/anacron/F-8/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	6 Feb 2007 14:35:24 -0000	1.3
+++ sources	5 Jan 2009 10:29:31 -0000	1.4
@@ -1,2 +1,4 @@
 9fdfc50f5741643332722a9145146278  anacron_2.3.orig.tar.gz
 094af5e05723d2c4924d60f73d738509  anacron.init
+312b5eed93765e26e9d21f23bccc72c9  anacron.cron
+1e65b1fcb49c7929645a1bd0baffd7ef  runanacron



From dwmw2 at fedoraproject.org  Mon Jan  5 10:41:36 2009
From: dwmw2 at fedoraproject.org (David Woodhouse)
Date: Mon,  5 Jan 2009 10:41:36 +0000 (UTC)
Subject: rpms/NetworkManager-openconnect/devel .cvsignore, 1.3,
	1.4 NetworkManager-openconnect.spec, 1.3, 1.4 sources, 1.3, 1.4
Message-ID: <20090105104136.8CDE37011F@cvs1.fedora.phx.redhat.com>

Author: dwmw2

Update of /cvs/pkgs/rpms/NetworkManager-openconnect/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27408

Modified Files:
	.cvsignore NetworkManager-openconnect.spec sources 
Log Message:
update translations


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager-openconnect/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	21 Dec 2008 09:58:51 -0000	1.3
+++ .cvsignore	5 Jan 2009 10:41:06 -0000	1.4
@@ -1 +1 @@
-NetworkManager-openconnect-0.7.0.svn9.tar.gz
+NetworkManager-openconnect-0.7.0.svn14.tar.gz


Index: NetworkManager-openconnect.spec
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager-openconnect/devel/NetworkManager-openconnect.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- NetworkManager-openconnect.spec	22 Dec 2008 11:14:18 -0000	1.3
+++ NetworkManager-openconnect.spec	5 Jan 2009 10:41:06 -0000	1.4
@@ -3,20 +3,20 @@
 %define gtk2_version        2.10.0
 %define openconnect_version 0.99
 
-%define svn_snapshot        svn9
+%define svn_snapshot        svn14
 
 Summary:   NetworkManager VPN integration for openconnect
 Name:      NetworkManager-openconnect
 Version:   0.7.0
-Release:   3.%{svn_snapshot}%{?dist}
+Release:   4.%{svn_snapshot}%{?dist}
 License:   GPLv2+
 Group:     System Environment/Base
 URL:       http://www.gnome.org/projects/NetworkManager/
 # Created from the git mirror of GNOME SVN:
 # git-clone git://git.infradead.org/network-manager-openconnect.git
 # cd network-manager-openconnect
-# git-archive --format=tar --prefix=NetworkManager-openconnect-0.7.0/ daf365e \
-#                 | gzip -9 > NetworkManager-openconnect-0.7.0.svn9.tar.gz
+# git-archive --format=tar --prefix=NetworkManager-openconnect-0.7.0/ b94964eb \
+#                 | gzip -9 > NetworkManager-openconnect-0.7.0.svn14.tar.gz
 Source:    %{name}-%{version}.%{svn_snapshot}.tar.gz
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
@@ -102,6 +102,10 @@
 %{_datadir}/gnome-vpn-properties/openconnect/nm-openconnect-dialog.glade
 
 %changelog
+* Mon Jan  5 2009 David Woodhouse <David.woodhouse at intel.com> 0.7.0-4.svn14
+- Rebuild for updated NetworkManager
+- Update translations from GNOME SVN
+
 * Sun Dec 21 2008 David Woodhouse <David.Woodhouse at intel.com> 0.7.0-3.svn9
 - Update from GNOME SVN (translations, review feedback merged)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager-openconnect/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	21 Dec 2008 09:58:52 -0000	1.3
+++ sources	5 Jan 2009 10:41:06 -0000	1.4
@@ -1 +1 @@
-e308cb5153019c03dd1837738845edc3  NetworkManager-openconnect-0.7.0.svn9.tar.gz
+9a8f8d94958f104345a986c9b6aa1cea  NetworkManager-openconnect-0.7.0.svn14.tar.gz



From gilboa at fedoraproject.org  Mon Jan  5 10:58:13 2009
From: gilboa at fedoraproject.org (Gilboa Davara)
Date: Mon,  5 Jan 2009 10:58:13 +0000 (UTC)
Subject: rpms/icewm/devel icewm.spec,1.14,1.15
Message-ID: <20090105105813.9024B7011F@cvs1.fedora.phx.redhat.com>

Author: gilboa

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

Modified Files:
	icewm.spec 
Log Message:



Index: icewm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/icewm/devel/icewm.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- icewm.spec	5 Jan 2009 10:15:46 -0000	1.14
+++ icewm.spec	5 Jan 2009 10:57:43 -0000	1.15
@@ -1,6 +1,6 @@
 Name:			icewm
 Version:		1.2.36
-Release:		1%{?dist}
+Release:		2%{?dist}
 Summary:		Light and configurable window manager
 
 Group:			User Interface/Desktops
@@ -29,6 +29,9 @@
 BuildRequires:	libICE-devel
 BuildRequires:	gettext
 BuildRequires:	gnome-desktop-devel
+%if 0%{?fedora} > 10
+BuildRequires:	libgnomeui-devel
+%endif
 %if 0%{?fedora} < 9
 Requires:		xorg-x11-fonts-truetype
 Requires:		htmlview
@@ -195,13 +198,8 @@
 
 
 %changelog
-* Sun Jan 4 2009 Gilboa Davara <gilboad[AT]gmail.com> - 1.2.36-1
-- 1.2.36.
-- Replace htmlview with xdg-utils. (Patch by Ville Skytta).
-- New sub-package: Clearlook theme.
-
-* Mon Feb 18 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1.2.35-4
-- Autorebuild for GCC 4.3
+* Mon Jan 5 2009 Gilboa Davara <gilboad[AT]gmail.com> - 1.2.36-2
+- Missing BR libgnomeui-devel.
 
 * Thu Jan 24 2008 <gilboad[AT]gmail.com> - 1.2.35-3
 - Fix broken -devel BR (truetype).



From caolanm at fedoraproject.org  Mon Jan  5 10:58:48 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Mon,  5 Jan 2009 10:58:48 +0000 (UTC)
Subject: rpms/openoffice.org/devel
	openoffice.org-3.0.1.ooo97488.sw.ww8toc.patch, NONE,
	1.1 openoffice.org.spec, 1.1740, 1.1741
Message-ID: <20090105105848.120507011F@cvs1.fedora.phx.redhat.com>

Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-3.0.1.ooo97488.sw.ww8toc.patch 
Log Message:
Resolves: rhbz#476959 openoffice.org-3.0.1.ooo97488.sw.ww8toc.patch

openoffice.org-3.0.1.ooo97488.sw.ww8toc.patch:

--- NEW FILE openoffice.org-3.0.1.ooo97488.sw.ww8toc.patch ---
Index: source/filter/ww8/ww8atr.cxx
===================================================================
RCS file: /cvs/sw/sw/source/filter/ww8/ww8atr.cxx,v
retrieving revision 1.113.44.3
diff -u -r1.113.44.3 ww8atr.cxx
--- openoffice.org.orig/sw/source/filter/ww8/ww8atr.cxx	12 Dec 2008 11:12:04 -0000	1.113.44.3
+++ openoffice.org/sw/source/filter/ww8/ww8atr.cxx	5 Jan 2009 10:47:18 -0000
@@ -2112,57 +2112,72 @@
 
                 if( nsSwTOXElement::TOX_OUTLINELEVEL & pTOX->GetCreateType() )
                 {
+                   // Take the TOC value of the max level to evaluate to as
+                   // the starting point for the \o flag, but reduce it to the 
+                   // value of the highest outline level filled by a *standard*
+                   // Heading 1 - 9 style because \o "Builds a table of
+                   // contents from paragraphs formatted with built-in heading
+                   // styles". And afterward fill in any outline styles left
+                   // uncovered by that range to the \t flag
+                   //
+                   // i.e. for
+                   // Heading 1
+                   // Heading 2
+                   // custom-style
+                   // Heading 4
+                   // output
+                   // \o 1-2 \tcustom-style,3,Heading 3,4
+
                     // Search over all the outline styles used and figure out
-                    // what is the minimum outline level we need to display
-                    // (ignoring headline styles 1-9)
-                    BYTE nLvl = 0, nMinLvl = 0;
+                   // what is the minimum outline level (if any) filled by a
+                   // non-standard style for that level, i.e. ignore headline
+                   // styles 1-9 and find the lowest valid outline level
+                    BYTE nPosOfLowestNonStandardLvl = MAXLEVEL;
                     const SwTxtFmtColls& rColls = *pDoc->GetTxtFmtColls();
-                    const SwTxtFmtColl* pColl;
                     for( n = rColls.Count(); n; )
                     {
-                        pColl = rColls[ --n ];
-                        nLvl = pColl->GetOutlineLevel();
+                        const SwTxtFmtColl* pColl = rColls[ --n ];
+                        BYTE nTestLvl = pColl->GetOutlineLevel();
                         USHORT nPoolId = pColl->GetPoolFmtId();
-                        if( MAXLEVEL > nLvl && nMinLvl < nLvl &&
-                            ( RES_POOLCOLL_HEADLINE1 > nPoolId ||
-                              RES_POOLCOLL_HEADLINE9 < nPoolId ))
-                        {
-
+                        if (
+                             (RES_POOLCOLL_HEADLINE1 > nPoolId || RES_POOLCOLL_HEADLINE9 < nPoolId) && //Is a Non-Standard Outline Style
+                             (nTestLvl < MAXLEVEL) && //Has a valid outline level
+                             (nTestLvl < nPosOfLowestNonStandardLvl) // Is less than the lowest known non-standard level
+                           )
+                       {
+                           nPosOfLowestNonStandardLvl = nTestLvl;
+                       }
+                   }
 
-                    // If we are using the default heading styles then use nTOXLvl
-                    if(!nMinLvl)
-                        nLvl = static_cast< BYTE >(nTOXLvl);
-                    else
-                        nLvl = nMinLvl < nTOXLvl ? nMinLvl : (BYTE)nTOXLvl;
-                            nMinLvl = nLvl;
-                        }
-                    }
+                   BYTE nMaxMSAutoEvaluate = nPosOfLowestNonStandardLvl < nTOXLvl ? nPosOfLowestNonStandardLvl : (BYTE)nTOXLvl;
 
-                    if( nLvl )
+                   //output \o 1-X where X is the highest normal outline style to be included in the toc
+                    if( nMaxMSAutoEvaluate )
                     {
-                        USHORT nTmpLvl = nLvl + 1;
-                        if (nTmpLvl > WW8ListManager::nMaxLevel)
-                            nTmpLvl = WW8ListManager::nMaxLevel;
+                        if (nMaxMSAutoEvaluate > WW8ListManager::nMaxLevel)
+                            nMaxMSAutoEvaluate = WW8ListManager::nMaxLevel;
 
                         sStr.APPEND_CONST_ASC( "\\o \"1-" );
-                        sStr += String::CreateFromInt32( nTmpLvl );
+                        sStr += String::CreateFromInt32( nMaxMSAutoEvaluate );
                         sStr.AppendAscii(sEntryEnd);
 
                     }
 
-                    if( nLvl != nMinLvl )
+                   //collect up any other styles in the writer TOC which will
+                   //not already appear in the MS TOC and place then into the
+                   //\t option
+                    if( nMaxMSAutoEvaluate < nTOXLvl )
                     {
-                        // collect this templates into the \t otion
                         for( n = rColls.Count(); n;)
                         {
-                            pColl = rColls[--n];
-                            nLvl =  pColl->GetOutlineLevel();
-                            if (MAXLEVEL > nLvl && nMinLvl <= nLvl)
+                            const SwTxtFmtColl* pColl = rColls[ --n ];
+                            BYTE nTestLvl =  pColl->GetOutlineLevel();
+                            if (nTestLvl < nTOXLvl && nTestLvl >= nMaxMSAutoEvaluate)
                             {
                                 if( sTOption.Len() )
-                                    sTOption += ';';
-                                (( sTOption += pColl->GetName() ) += ';' )
-                                        += String::CreateFromInt32( nLvl + 1 );
+                                    sTOption += ',';
+                                (( sTOption += pColl->GetName() ) += ',' )
+                                        += String::CreateFromInt32( nTestLvl + 1 );
                             }
                         }
                     }
@@ -2175,16 +2190,21 @@
                         if( rStyles.Len() )
                         {
                             xub_StrLen nPos = 0;
-                            String sLvl( ';' );
+                            String sLvl( ',' );
                             sLvl += String::CreateFromInt32( n + 1 );
                             do {
                                 String sStyle( rStyles.GetToken( 0,
                                             TOX_STYLE_DELIMITER, nPos ));
                                 if( sStyle.Len() )
                                 {
-                                    if( sTOption.Len() )
-                                        sTOption += ';';
-                                    ( sTOption += sStyle ) += sLvl;
+                                    SwTxtFmtColl* pColl = pDoc->FindTxtFmtCollByName(sStyle);
+                                    BYTE nTestLvl = pColl ? pColl->GetOutlineLevel() : 0;
+                                    if ((nTestLvl < nTOXLvl) || (nTestLvl == NO_NUMBERING) || (nTestLvl == NO_NUM))
+                                    {
+                                        if( sTOption.Len() )
+                                            sTOption += ',';
+                                        ( sTOption += sStyle ) += sLvl;
+                                    }
                                 }
                             } while( STRING_NOTFOUND != nPos );
                         }
Index: source/filter/ww8/ww8par5.cxx
===================================================================
RCS file: /cvs/sw/sw/source/filter/ww8/ww8par5.cxx,v
retrieving revision 1.110.44.1
diff -u -r1.110.44.1 ww8par5.cxx
--- openoffice.org.orig/sw/source/filter/ww8/ww8par5.cxx	19 Nov 2008 14:38:26 -0000	1.110.44.1
+++ openoffice.org/sw/source/filter/ww8/ww8par5.cxx	5 Jan 2009 10:47:18 -0000
@@ -2637,6 +2637,28 @@
     return bExtras;
 }
 
+static void EnsureMaxLevelForTemplates(SwTOXBase& rBase)
+{
+    //If the TOC contains Template entries at levels > the evaluation level
+    //that was initially taken from the max normal outline level of the word TOC
+    //then we cannot use that for the evaluation level because writer cuts off
+    //all styles above that level, while word just cuts off the "standard"
+    //outline styles, we have no option but to expand to the highest level
+    //Word included.
+    if ((rBase.GetLevel() != MAXLEVEL) && (nsSwTOXElement::TOX_TEMPLATE & rBase.GetCreateType()))
+    {
+        for (USHORT nI = MAXLEVEL; nI > 0; --nI)
+        {
+            String sStyles(rBase.GetStyleNames(nI-1));
+            if (rBase.GetStyleNames(nI-1).Len())
+            {
+                rBase.SetLevel(nI);
+                break;
+            }
+        }
+    }
+}
+
 void lcl_toxMatchTSwitch(SwWW8ImplReader& rReader, SwTOXBase& rBase,
     _ReadFieldParams& rParam)
 {
@@ -2730,6 +2752,19 @@
     return bRet;
 }
 
+USHORT lcl_GetMaxValidWordTOCLevel(const SwForm &rForm)
+{
+    // GetFormMax() returns level + 1, hence the -1
+    USHORT nRet = rForm.GetFormMax()-1;
+
+	// If the max of this type of TOC is greater than the max of a word
+	// possible toc, then clip to the word max
+    if (nRet > WW8ListManager::nMaxLevel)
+        nRet = WW8ListManager::nMaxLevel;
+
+    return nRet;
+}
+
 eF_ResT SwWW8ImplReader::Read_F_Tox( WW8FieldDesc* pF, String& rStr )
 {
     if (pF->nLRes < 3)
@@ -2886,8 +2922,8 @@
                 case 'o':
                     {
                         USHORT nVal;
-                        if( !aReadParam.GetTokenSttFromTo(0, &nVal, MAXLEVEL) )
-                            nVal = aOrigForm.GetFormMax()-1;
+                        if( !aReadParam.GetTokenSttFromTo(0, &nVal, WW8ListManager::nMaxLevel) )
+                            nVal = lcl_GetMaxValidWordTOCLevel(aOrigForm);
                         if( nMaxLevel < nVal )
                             nMaxLevel = nVal;
                         eCreateFrom |= nsSwTOXElement::TOX_OUTLINELEVEL;
@@ -2899,7 +2935,7 @@
                 case 'l':
                     {
                         USHORT nVal;
-                        if( aReadParam.GetTokenSttFromTo(0, &nVal, MAXLEVEL) )
+                        if( aReadParam.GetTokenSttFromTo(0, &nVal, WW8ListManager::nMaxLevel) )
                         {
                             if( nMaxLevel < nVal )
                                 nMaxLevel = nVal;
@@ -2972,7 +3008,7 @@
                         // read START and END param
                         USHORT nStart, nEnd;
                         if( !aReadParam.GetTokenSttFromTo(  &nStart, &nEnd,
-                            MAXLEVEL ) )
+                            WW8ListManager::nMaxLevel ) )
                         {
                             nStart = 1;
                             nEnd = aOrigForm.GetFormMax()-1;
@@ -3055,7 +3091,7 @@
             }
 
             if (!nMaxLevel)
-                nMaxLevel = MAXLEVEL;
+                nMaxLevel = WW8ListManager::nMaxLevel;
             pBase->SetLevel(nMaxLevel);
 
             const TOXTypes eType = pBase->GetTOXType()->GetType();
@@ -3113,6 +3149,7 @@
 
                         if (eCreateFrom)
                             pBase->SetCreate(eCreateFrom);
+                        EnsureMaxLevelForTemplates(*pBase);
                     }
                     break;
                 case TOX_ILLUSTRATIONS:


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1740
retrieving revision 1.1741
diff -u -r1.1740 -r1.1741
--- openoffice.org.spec	5 Jan 2009 09:27:46 -0000	1.1740
+++ openoffice.org.spec	5 Jan 2009 10:58:17 -0000	1.1741
@@ -1,6 +1,6 @@
 %define oootag OOO300
 %define ooomilestone 14
-%define rh_rpm_release 2
+%define rh_rpm_release 3
 
 # rhbz#465664 jar-repacking breaks help by reordering META-INF/MANIFEST.MF
 %define __jar_repack %{nil}
@@ -3817,6 +3817,9 @@
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
+* Mon Jan 05 2009 Caol??n McNamara <caolanm at redhat.com> - 1:3.0.1-14.3
+- Resolves: rhbz#476959 openoffice.org-3.0.1.ooo97488.sw.ww8toc.patch
+
 * Tue Dec 23 2008 Caol??n McNamara <caolanm at redhat.com> - 1:3.0.1-14.2
 - Workaround: rhbz#477174 recover metacity workarounds without hanging in
   gdk_x11_get_server_time



From gilboa at fedoraproject.org  Mon Jan  5 11:00:11 2009
From: gilboa at fedoraproject.org (Gilboa Davara)
Date: Mon,  5 Jan 2009 11:00:11 +0000 (UTC)
Subject: rpms/icewm/devel icewm.spec,1.15,1.16
Message-ID: <20090105110011.573667011F@cvs1.fedora.phx.redhat.com>

Author: gilboa

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

Modified Files:
	icewm.spec 
Log Message:



Index: icewm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/icewm/devel/icewm.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- icewm.spec	5 Jan 2009 10:57:43 -0000	1.15
+++ icewm.spec	5 Jan 2009 10:59:41 -0000	1.16
@@ -31,6 +31,7 @@
 BuildRequires:	gnome-desktop-devel
 %if 0%{?fedora} > 10
 BuildRequires:	libgnomeui-devel
+BuildRequires:	gnome-vfs2-devel
 %endif
 %if 0%{?fedora} < 9
 Requires:		xorg-x11-fonts-truetype



From gilboa at fedoraproject.org  Mon Jan  5 11:04:42 2009
From: gilboa at fedoraproject.org (Gilboa Davara)
Date: Mon,  5 Jan 2009 11:04:42 +0000 (UTC)
Subject: rpms/icewm/devel icewm.spec,1.16,1.17
Message-ID: <20090105110442.A34E07011F@cvs1.fedora.phx.redhat.com>

Author: gilboa

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

Modified Files:
	icewm.spec 
Log Message:



Index: icewm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/icewm/devel/icewm.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- icewm.spec	5 Jan 2009 10:59:41 -0000	1.16
+++ icewm.spec	5 Jan 2009 11:04:10 -0000	1.17
@@ -200,7 +200,8 @@
 
 %changelog
 * Mon Jan 5 2009 Gilboa Davara <gilboad[AT]gmail.com> - 1.2.36-2
-- Missing BR libgnomeui-devel.
+- Missing BR libgnomeui-devel. (devel)
+- Missing BR gnome-vfs2-devel. (devel)
 
 * Thu Jan 24 2008 <gilboad[AT]gmail.com> - 1.2.35-3
 - Fix broken -devel BR (truetype).



From terjeros at fedoraproject.org  Mon Jan  5 11:24:46 2009
From: terjeros at fedoraproject.org (=?utf-8?q?Terje_R=C3=B8sten?=)
Date: Mon,  5 Jan 2009 11:24:46 +0000 (UTC)
Subject: rpms/mathomatic/devel mathomatic-14.2.8-build.patch, NONE,
	1.1 .cvsignore, 1.3, 1.4 mathomatic.spec, 1.2, 1.3 sources, 1.3,
	1.4 mathomatic-14.1.4-build.patch, 1.1, NONE
Message-ID: <20090105112446.651F27011F@cvs1.fedora.phx.redhat.com>

Author: terjeros

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

Modified Files:
	.cvsignore mathomatic.spec sources 
Added Files:
	mathomatic-14.2.8-build.patch 
Removed Files:
	mathomatic-14.1.4-build.patch 
Log Message:
* Mon Jan  5 2009 Terje Rosten <terje.rosten at ntnu.no> - 14.2.8-1
- 14.2.8


mathomatic-14.2.8-build.patch:

--- NEW FILE mathomatic-14.2.8-build.patch ---
--- mathomatic-14.2.8/makefile~	2009-01-03 13:01:27.000000000 +0100
+++ mathomatic-14.2.8/makefile	2009-01-05 12:18:10.000000000 +0100
@@ -2,7 +2,8 @@
 # Currently uses gcc only options in CFLAGS, just remove them for other C compilers.
 
 VERSION		= `cat VERSION`
-CFLAGS		+= -O2 -Wuninitialized -Wunused -Wshadow -Wformat -Wparentheses -Wno-char-subscripts # gcc specific flags
+OPTFLAGS	?= -O2
+CFLAGS		+= $(OPTFLAGS) -Wuninitialized -Wunused -Wshadow -Wformat -Wparentheses -Wno-char-subscripts # gcc specific flags
 #CFLAGS		+= -Wall # Copy cproto.h to proto.h to compile with -Wall with no complaints.
 CFLAGS		+= -DUNIX -DVERSION=\"$(VERSION)\" # C compiler flags
 LDLIBS		+= -lm # libraries to link


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mathomatic/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	22 Aug 2008 19:02:56 -0000	1.3
+++ .cvsignore	5 Jan 2009 11:24:14 -0000	1.4
@@ -1 +1 @@
-mathomatic-14.1.4.tar.bz2
+mathomatic-14.2.8.tar.bz2


Index: mathomatic.spec
===================================================================
RCS file: /cvs/extras/rpms/mathomatic/devel/mathomatic.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mathomatic.spec	22 Aug 2008 19:02:56 -0000	1.2
+++ mathomatic.spec	5 Jan 2009 11:24:14 -0000	1.3
@@ -1,12 +1,12 @@
 Summary:       Small, portable symbolic math program
 Name:          mathomatic
-Version:       14.1.4
+Version:       14.2.8
 Release:       1%{?dist} 
 License:       LGPLv2
 Group:         Applications/Engineering
 URL:           http://www.mathomatic.org/
 Source0:       http://www.panix.com/~gesslein/%{name}-%{version}.tar.bz2
-Patch0:        mathomatic-14.1.4-build.patch
+Patch0:        mathomatic-14.2.8-build.patch
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: desktop-file-utils readline-devel
 
@@ -71,6 +71,9 @@
 %{_mandir}/man1/matho-sumsq.1*
 
 %changelog
+* Mon Jan  5 2009 Terje Rosten <terje.rosten at ntnu.no> - 14.2.8-1
+- 14.2.8
+
 * Fri Aug 22 2008 Terje Rosten <terje.rosten at ntnu.no> - 14.1.4-1
 - 14.1.4
 - add build patch (add optflags, dont strip)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mathomatic/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	22 Aug 2008 19:02:56 -0000	1.3
+++ sources	5 Jan 2009 11:24:14 -0000	1.4
@@ -1 +1 @@
-85f5c734d4843fe41127366b07066e7e  mathomatic-14.1.4.tar.bz2
+99decea11fb050167fff2e89d63d7503  mathomatic-14.2.8.tar.bz2


--- mathomatic-14.1.4-build.patch DELETED ---



From terjeros at fedoraproject.org  Mon Jan  5 11:31:44 2009
From: terjeros at fedoraproject.org (=?utf-8?q?Terje_R=C3=B8sten?=)
Date: Mon,  5 Jan 2009 11:31:44 +0000 (UTC)
Subject: rpms/bpython/devel .cvsignore, 1.4, 1.5 bpython.spec, 1.4,
	1.5 sources, 1.4, 1.5
Message-ID: <20090105113144.C08437011F@cvs1.fedora.phx.redhat.com>

Author: terjeros

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

Modified Files:
	.cvsignore bpython.spec sources 
Log Message:
* Mon Jan  5 2009 Terje Rosten <terje.rosten at ntnu.no> - 0.7.1-1
- 0.7.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/bpython/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	1 Sep 2008 20:25:45 -0000	1.4
+++ .cvsignore	5 Jan 2009 11:31:13 -0000	1.5
@@ -1 +1 @@
-bpython-0.7.0.tar.gz
+bpython-0.7.1.tar.gz


Index: bpython.spec
===================================================================
RCS file: /cvs/extras/rpms/bpython/devel/bpython.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- bpython.spec	29 Nov 2008 16:36:41 -0000	1.4
+++ bpython.spec	5 Jan 2009 11:31:14 -0000	1.5
@@ -2,8 +2,8 @@
 
 Name:          bpython
 Summary:       Fancy curses interface to the Python interactive interpreter
-Version:       0.7.0
-Release:       2%{?dist}
+Version:       0.7.1
+Release:       1%{?dist}
 URL:           http://www.noiseforfree.com/bpython/
 Group:         Development/Libraries
 License:       MIT
@@ -54,6 +54,9 @@
 #{_datadir}/applications/%{name}.desktop
 
 %changelog
+* Mon Jan  5 2009 Terje Rosten <terje.rosten at ntnu.no> - 0.7.1-1
+- 0.7.1
+
 * Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 0.7.0-2
 - Rebuild for Python 2.6
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/bpython/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	1 Sep 2008 20:25:45 -0000	1.4
+++ sources	5 Jan 2009 11:31:14 -0000	1.5
@@ -1 +1 @@
-5a992ada6f31cbea048d2dee07ec6bfe  bpython-0.7.0.tar.gz
+65554d3ebb9f9b5cab62e446424b8ab7  bpython-0.7.1.tar.gz



From pwouters at fedoraproject.org  Mon Jan  5 11:38:13 2009
From: pwouters at fedoraproject.org (Paul Wouters)
Date: Mon,  5 Jan 2009 11:38:13 +0000 (UTC)
Subject: rpms/unbound/devel unbound.spec,1.10,1.11
Message-ID: <20090105113813.88FC470140@cvs1.fedora.phx.redhat.com>

Author: pwouters

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

Modified Files:
	unbound.spec 
Log Message:
fix merge conflict



Index: unbound.spec
===================================================================
RCS file: /cvs/extras/rpms/unbound/devel/unbound.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- unbound.spec	8 Dec 2008 20:42:45 -0000	1.10
+++ unbound.spec	5 Jan 2009 11:37:42 -0000	1.11
@@ -1,13 +1,14 @@
 Summary: Validating, recursive, and caching DNS(SEC) resolver
 Name: unbound
 Version: 1.1.1
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: BSD
 Url: http://www.nlnetlabs.nl/unbound/
 Source: http://www.unbound.net/downloads/%{name}-%{version}.tar.gz
 Source1: unbound.init
 Source2: unbound.conf
 Source3: unbound.munin
+Patch0: unbound-1.1-scandir.patch
 Group: System Environment/Daemons
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: flex, openssl-devel, ldns-devel >= 1.4.0, libevent-devel
@@ -61,6 +62,7 @@
 
 %prep
 %setup -q 
+%patch -p0
 
 %build
 %configure  --with-ldns= --with-libevent --with-pthreads --with-ssl \
@@ -145,6 +147,10 @@
 %postun libs -p /sbin/ldconfig
 
 %changelog
+* Mon Jan  5 2009 Paul Wouters <paul at xelerance.com> - 1.1.1-5
+- Added scandir patch for trusted-keys-file: option, which
+  is used to load multiple dnssec keys in bind file format
+
 * Mon Dec  8 2008 Paul Wouters <paul at xelerance.com> - 1.1.1-4
 - Added Requires: for selinux-policy >= 3.5.13-33 for proper SElinux rules.
 



From terjeros at fedoraproject.org  Mon Jan  5 11:44:38 2009
From: terjeros at fedoraproject.org (=?utf-8?q?Terje_R=C3=B8sten?=)
Date: Mon,  5 Jan 2009 11:44:38 +0000 (UTC)
Subject: rpms/bpython/devel bpython.spec,1.5,1.6
Message-ID: <20090105114439.4AF9D7011F@cvs1.fedora.phx.redhat.com>

Author: terjeros

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

Modified Files:
	bpython.spec 
Log Message:
* Mon Jan  5 2009 Terje Rosten <terje.rosten at ntnu.no> - 0.7.1-2
- Add setuptools to buildreq



Index: bpython.spec
===================================================================
RCS file: /cvs/extras/rpms/bpython/devel/bpython.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- bpython.spec	5 Jan 2009 11:31:14 -0000	1.5
+++ bpython.spec	5 Jan 2009 11:44:36 -0000	1.6
@@ -3,13 +3,13 @@
 Name:          bpython
 Summary:       Fancy curses interface to the Python interactive interpreter
 Version:       0.7.1
-Release:       1%{?dist}
+Release:       2%{?dist}
 URL:           http://www.noiseforfree.com/bpython/
 Group:         Development/Libraries
 License:       MIT
 Source0:       http://www.noiseforfree.com/%{name}/%{name}-%{version}.tar.gz
 BuildArch:     noarch
-BuildRequires: python-devel desktop-file-utils
+BuildRequires: python-devel python-setuptools desktop-file-utils
 Requires:      python-pygments pyparsing
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -54,6 +54,9 @@
 #{_datadir}/applications/%{name}.desktop
 
 %changelog
+* Mon Jan  5 2009 Terje Rosten <terje.rosten at ntnu.no> - 0.7.1-2
+- Add setuptools to buildreq
+
 * Mon Jan  5 2009 Terje Rosten <terje.rosten at ntnu.no> - 0.7.1-1
 - 0.7.1
 



From pkgdb at fedoraproject.org  Mon Jan  5 11:46:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Jan 2009 11:46:49 +0000
Subject: [pkgdb] ss5: itamarjp has requested watchcommits
Message-ID: <20090105114649.ED1B820873C@bastion.fedora.phx.redhat.com>

itamarjp has requested the watchcommits acl on ss5 (Fedora devel)

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



From pkgdb at fedoraproject.org  Mon Jan  5 11:46:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Jan 2009 11:46:51 +0000
Subject: [pkgdb] ss5: itamarjp has requested watchbugzilla
Message-ID: <20090105114651.952B5208D2B@bastion.fedora.phx.redhat.com>

itamarjp has requested the watchbugzilla acl on ss5 (Fedora devel)

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



From pkgdb at fedoraproject.org  Mon Jan  5 11:46:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Jan 2009 11:46:51 +0000
Subject: [pkgdb] ss5: itamarjp has requested commit
Message-ID: <20090105114651.BFE17208D51@bastion.fedora.phx.redhat.com>

itamarjp has requested the commit acl on ss5 (Fedora devel)

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



From pkgdb at fedoraproject.org  Mon Jan  5 11:46:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Jan 2009 11:46:51 +0000
Subject: [pkgdb] ss5: itamarjp has requested approveacls
Message-ID: <20090105114651.D7CFA208D55@bastion.fedora.phx.redhat.com>

itamarjp has requested the approveacls acl on ss5 (Fedora devel)

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



From pkgdb at fedoraproject.org  Mon Jan  5 11:47:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Jan 2009 11:47:00 +0000
Subject: [pkgdb] ss5: itamarjp has requested watchbugzilla
Message-ID: <20090105114700.193F2208D59@bastion.fedora.phx.redhat.com>

itamarjp has requested the watchbugzilla acl on ss5 (Fedora 10)

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



From pkgdb at fedoraproject.org  Mon Jan  5 11:47:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Jan 2009 11:47:00 +0000
Subject: [pkgdb] ss5: itamarjp has requested watchcommits
Message-ID: <20090105114700.693A3208D60@bastion.fedora.phx.redhat.com>

itamarjp has requested the watchcommits acl on ss5 (Fedora 10)

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



From pkgdb at fedoraproject.org  Mon Jan  5 11:47:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Jan 2009 11:47:03 +0000
Subject: [pkgdb] ss5: itamarjp has requested approveacls
Message-ID: <20090105114703.67F5E20873C@bastion.fedora.phx.redhat.com>

itamarjp has requested the approveacls acl on ss5 (Fedora 10)

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



From pkgdb at fedoraproject.org  Mon Jan  5 11:47:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Jan 2009 11:47:06 +0000
Subject: [pkgdb] ss5: itamarjp has requested commit
Message-ID: <20090105114706.40734208D9B@bastion.fedora.phx.redhat.com>

itamarjp has requested the commit acl on ss5 (Fedora 10)

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



From pkgdb at fedoraproject.org  Mon Jan  5 11:47:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Jan 2009 11:47:11 +0000
Subject: [pkgdb] ss5: itamarjp has requested watchbugzilla
Message-ID: <20090105114711.190A0208DA7@bastion.fedora.phx.redhat.com>

itamarjp has requested the watchbugzilla acl on ss5 (Fedora 9)

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



From pkgdb at fedoraproject.org  Mon Jan  5 11:47:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Jan 2009 11:47:11 +0000
Subject: [pkgdb] ss5: itamarjp has requested watchcommits
Message-ID: <20090105114711.D194B208DAB@bastion.fedora.phx.redhat.com>

itamarjp has requested the watchcommits acl on ss5 (Fedora 9)

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



From pkgdb at fedoraproject.org  Mon Jan  5 11:47:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Jan 2009 11:47:13 +0000
Subject: [pkgdb] ss5: itamarjp has requested commit
Message-ID: <20090105114713.BF0C2208CAB@bastion.fedora.phx.redhat.com>

itamarjp has requested the commit acl on ss5 (Fedora 9)

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



From pkgdb at fedoraproject.org  Mon Jan  5 11:47:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Jan 2009 11:47:14 +0000
Subject: [pkgdb] ss5: itamarjp has requested approveacls
Message-ID: <20090105114714.82B26208D50@bastion.fedora.phx.redhat.com>

itamarjp has requested the approveacls acl on ss5 (Fedora 9)

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



From jgranado at fedoraproject.org  Mon Jan  5 11:47:51 2009
From: jgranado at fedoraproject.org (Joel Andres Granados Moreno)
Date: Mon,  5 Jan 2009 11:47:51 +0000 (UTC)
Subject: rpms/firstaidkit/devel firstaidkit.spec,1.16,1.17
Message-ID: <20090105114752.04A9A7011F@cvs1.fedora.phx.redhat.com>

Author: jgranado

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

Modified Files:
	firstaidkit.spec 
Log Message:
 The ppc and ppc64 arch do not handle grub as their bootloader.



Index: firstaidkit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/firstaidkit/devel/firstaidkit.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- firstaidkit.spec	4 Dec 2008 17:54:59 -0000	1.16
+++ firstaidkit.spec	5 Jan 2009 11:47:21 -0000	1.17
@@ -4,7 +4,7 @@
 
 Name:           firstaidkit
 Version:        0.2.2
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        System Rescue Tool
 
 Group:          Applications/System
@@ -84,6 +84,7 @@
 Requires:       dbus-python
 Requires:       grub
 Requires:       pyparted
+ExcludeArch:    ppc ppc64
 
 %description plugin-grub
 This FirstAidKit plugin automates the recovery from the GRUB bootloader problems.
@@ -190,6 +191,9 @@
 %dir %{_libdir}/firstaidkit/plugins/grub/*
 
 %changelog
+* Mon Jan 05 2008 Joel Granados <jgranado at redhat.com> - 0.2.2-6
+- The ppc and ppc64 arch do not handle grub as their bootloader.
+
 * Thu Dec 04 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 0.2.2-5
 - Rebuild for Python 2.6
 



From pwouters at fedoraproject.org  Mon Jan  5 11:49:45 2009
From: pwouters at fedoraproject.org (Paul Wouters)
Date: Mon,  5 Jan 2009 11:49:45 +0000 (UTC)
Subject: rpms/unbound/devel unbound.spec,1.11,1.12
Message-ID: <20090105114945.368627011F@cvs1.fedora.phx.redhat.com>

Author: pwouters

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

Modified Files:
	unbound.spec 
Log Message:
Fix patch command



Index: unbound.spec
===================================================================
RCS file: /cvs/extras/rpms/unbound/devel/unbound.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- unbound.spec	5 Jan 2009 11:37:42 -0000	1.11
+++ unbound.spec	5 Jan 2009 11:49:14 -0000	1.12
@@ -62,7 +62,7 @@
 
 %prep
 %setup -q 
-%patch -p0
+%patch0 -p0
 
 %build
 %configure  --with-ldns= --with-libevent --with-pthreads --with-ssl \



From pwouters at fedoraproject.org  Mon Jan  5 11:50:57 2009
From: pwouters at fedoraproject.org (Paul Wouters)
Date: Mon,  5 Jan 2009 11:50:57 +0000 (UTC)
Subject: rpms/unbound/devel unbound.spec,1.12,1.13
Message-ID: <20090105115057.58FBD7011F@cvs1.fedora.phx.redhat.com>

Author: pwouters

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

Modified Files:
	unbound.spec 
Log Message:
bump version



Index: unbound.spec
===================================================================
RCS file: /cvs/extras/rpms/unbound/devel/unbound.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- unbound.spec	5 Jan 2009 11:49:14 -0000	1.12
+++ unbound.spec	5 Jan 2009 11:50:27 -0000	1.13
@@ -1,7 +1,7 @@
 Summary: Validating, recursive, and caching DNS(SEC) resolver
 Name: unbound
 Version: 1.1.1
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: BSD
 Url: http://www.nlnetlabs.nl/unbound/
 Source: http://www.unbound.net/downloads/%{name}-%{version}.tar.gz
@@ -147,7 +147,7 @@
 %postun libs -p /sbin/ldconfig
 
 %changelog
-* Mon Jan  5 2009 Paul Wouters <paul at xelerance.com> - 1.1.1-5
+* Mon Jan  5 2009 Paul Wouters <paul at xelerance.com> - 1.1.1-6
 - Added scandir patch for trusted-keys-file: option, which
   is used to load multiple dnssec keys in bind file format
 



From jgranado at fedoraproject.org  Mon Jan  5 11:52:47 2009
From: jgranado at fedoraproject.org (Joel Andres Granados Moreno)
Date: Mon,  5 Jan 2009 11:52:47 +0000 (UTC)
Subject: rpms/firstaidkit/devel firstaidkit.spec,1.17,1.18
Message-ID: <20090105115247.F0ABA7011F@cvs1.fedora.phx.redhat.com>

Author: jgranado

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

Modified Files:
	firstaidkit.spec 
Log Message:
Fix the changelog entry.



Index: firstaidkit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/firstaidkit/devel/firstaidkit.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- firstaidkit.spec	5 Jan 2009 11:47:21 -0000	1.17
+++ firstaidkit.spec	5 Jan 2009 11:52:17 -0000	1.18
@@ -191,7 +191,7 @@
 %dir %{_libdir}/firstaidkit/plugins/grub/*
 
 %changelog
-* Mon Jan 05 2008 Joel Granados <jgranado at redhat.com> - 0.2.2-6
+* Mon Jan 05 2009 Joel Granados <jgranado at redhat.com> - 0.2.2-6
 - The ppc and ppc64 arch do not handle grub as their bootloader.
 
 * Thu Dec 04 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 0.2.2-5



From mgrepl at fedoraproject.org  Mon Jan  5 12:28:40 2009
From: mgrepl at fedoraproject.org (Miroslav Grepl)
Date: Mon,  5 Jan 2009 12:28:40 +0000 (UTC)
Subject: rpms/selinux-policy/F-9 policy-20071130.patch, 1.245,
	1.246 selinux-policy.spec, 1.731, 1.732
Message-ID: <20090105122840.DC3317013C@cvs1.fedora.phx.redhat.com>

Author: mgrepl

Update of /cvs/extras/rpms/selinux-policy/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27207

Modified Files:
	policy-20071130.patch selinux-policy.spec 
Log Message:
- Add label to /var/run/mod_.*
- Add label to /var/turboprint(/.*)?
- Add radvd net_admin capability
- Add 4321 to whois ports


policy-20071130.patch:

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.245 -r 1.246 policy-20071130.patch
Index: policy-20071130.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-9/policy-20071130.patch,v
retrieving revision 1.245
retrieving revision 1.246
diff -u -r1.245 -r1.246
--- policy-20071130.patch	15 Dec 2008 15:22:45 -0000	1.245
+++ policy-20071130.patch	5 Jan 2009 12:28:36 -0000	1.246
@@ -1,12 +1,12 @@
 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-02-26 14:23:12.000000000 +0100
-+++ serefpolicy-3.3.1/config/appconfig-mcs/failsafe_context	2008-12-15 10:40:31.000000000 +0100
++++ serefpolicy-3.3.1/config/appconfig-mcs/failsafe_context	2009-01-05 11:17:34.000000000 +0100
 @@ -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	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.3.1/config/appconfig-mcs/guest_u_default_contexts	2008-12-15 10:40:31.000000000 +0100
++++ serefpolicy-3.3.1/config/appconfig-mcs/guest_u_default_contexts	2009-01-05 11:17:34.000000000 +0100
 @@ -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
@@ -16,7 +16,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-02-26 14:23:12.000000000 +0100
-+++ serefpolicy-3.3.1/config/appconfig-mcs/root_default_contexts	2008-12-15 10:40:31.000000000 +0100
++++ serefpolicy-3.3.1/config/appconfig-mcs/root_default_contexts	2009-01-05 11:17:34.000000000 +0100
 @@ -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
@@ -32,7 +32,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-02-26 14:23:12.000000000 +0100
-+++ serefpolicy-3.3.1/config/appconfig-mcs/staff_u_default_contexts	2008-12-15 10:40:31.000000000 +0100
++++ serefpolicy-3.3.1/config/appconfig-mcs/staff_u_default_contexts	2009-01-05 11:17:34.000000000 +0100
 @@ -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
@@ -44,7 +44,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	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.3.1/config/appconfig-mcs/unconfined_u_default_contexts	2008-12-15 10:40:31.000000000 +0100
++++ serefpolicy-3.3.1/config/appconfig-mcs/unconfined_u_default_contexts	2009-01-05 11:17:34.000000000 +0100
 @@ -0,0 +1,11 @@
 +system_r:crond_t:s0		unconfined_r:unconfined_t:s0
 +system_r:initrc_t:s0		unconfined_r:unconfined_t:s0
@@ -59,13 +59,13 @@
 +system_r:xdm_t:s0		unconfined_r:unconfined_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-02-26 14:23:12.000000000 +0100
-+++ serefpolicy-3.3.1/config/appconfig-mcs/userhelper_context	2008-12-15 10:40:31.000000000 +0100
++++ serefpolicy-3.3.1/config/appconfig-mcs/userhelper_context	2009-01-05 11:17:34.000000000 +0100
 @@ -1 +1 @@
 -system_u:sysadm_r:sysadm_t:s0
 +system_u:system_r:unconfined_t:s0	
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/user_u_default_contexts serefpolicy-3.3.1/config/appconfig-mcs/user_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/user_u_default_contexts	2008-02-26 14:23:12.000000000 +0100
-+++ serefpolicy-3.3.1/config/appconfig-mcs/user_u_default_contexts	2008-12-15 10:40:31.000000000 +0100
++++ serefpolicy-3.3.1/config/appconfig-mcs/user_u_default_contexts	2009-01-05 11:17:34.000000000 +0100
 @@ -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
@@ -75,7 +75,7 @@
 +user_r:user_t:s0		user_r:user_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	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.3.1/config/appconfig-mcs/x_contexts	2008-12-15 10:40:31.000000000 +0100
++++ serefpolicy-3.3.1/config/appconfig-mcs/x_contexts	2009-01-05 11:17:34.000000000 +0100
 @@ -0,0 +1,188 @@
 +#
 +# Config file for XSELinux extension
@@ -267,7 +267,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	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.3.1/config/appconfig-mcs/xguest_u_default_contexts	2008-12-15 10:40:31.000000000 +0100
++++ serefpolicy-3.3.1/config/appconfig-mcs/xguest_u_default_contexts	2009-01-05 11:17:34.000000000 +0100
 @@ -0,0 +1,7 @@
 +system_r:local_login_t	xguest_r:xguest_t:s0
 +system_r:remote_login_t	xguest_r:xguest_t:s0
@@ -278,7 +278,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	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.3.1/config/appconfig-mls/guest_u_default_contexts	2008-12-15 10:40:31.000000000 +0100
++++ serefpolicy-3.3.1/config/appconfig-mls/guest_u_default_contexts	2009-01-05 11:17:34.000000000 +0100
 @@ -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
@@ -286,7 +286,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	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.3.1/config/appconfig-mls/x_contexts	2008-12-15 10:40:31.000000000 +0100
++++ serefpolicy-3.3.1/config/appconfig-mls/x_contexts	2009-01-05 11:17:34.000000000 +0100
 @@ -0,0 +1,188 @@
 +#
 +# Config file for XSELinux extension
@@ -478,7 +478,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	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.3.1/config/appconfig-standard/guest_u_default_contexts	2008-12-15 10:40:31.000000000 +0100
++++ serefpolicy-3.3.1/config/appconfig-standard/guest_u_default_contexts	2009-01-05 11:17:34.000000000 +0100
 @@ -0,0 +1,4 @@
 +system_r:local_login_t	guest_r:guest_t
 +system_r:remote_login_t	guest_r:guest_t
@@ -486,7 +486,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-02-26 14:23:12.000000000 +0100
-+++ serefpolicy-3.3.1/config/appconfig-standard/root_default_contexts	2008-12-15 10:40:31.000000000 +0100
++++ serefpolicy-3.3.1/config/appconfig-standard/root_default_contexts	2009-01-05 11:17:34.000000000 +0100
 @@ -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
@@ -502,7 +502,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	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.3.1/config/appconfig-standard/x_contexts	2008-12-15 10:40:31.000000000 +0100
++++ serefpolicy-3.3.1/config/appconfig-standard/x_contexts	2009-01-05 11:17:34.000000000 +0100
 @@ -0,0 +1,188 @@
 +#
 +# Config file for XSELinux extension
@@ -694,7 +694,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	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.3.1/config/appconfig-standard/xguest_u_default_contexts	2008-12-15 10:40:31.000000000 +0100
++++ serefpolicy-3.3.1/config/appconfig-standard/xguest_u_default_contexts	2009-01-05 11:17:34.000000000 +0100
 @@ -0,0 +1,5 @@
 +system_r:local_login_t	xguest_r:xguest_t
 +system_r:remote_login_t	xguest_r:xguest_t
@@ -703,7 +703,7 @@
 +system_r:xdm_t		xguest_r:xguest_t
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/Makefile serefpolicy-3.3.1/Makefile
 --- nsaserefpolicy/Makefile	2008-02-26 14:23:09.000000000 +0100
-+++ serefpolicy-3.3.1/Makefile	2008-12-15 10:40:31.000000000 +0100
++++ serefpolicy-3.3.1/Makefile	2009-01-05 11:17:34.000000000 +0100
 @@ -235,7 +235,7 @@
  appdir := $(contextpath)
  user_default_contexts := $(wildcard config/appconfig-$(TYPE)/*_default_contexts)
@@ -759,7 +759,7 @@
  	$(verbose) $(INSTALL) -m 644 $< $@
 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-02-26 14:23:12.000000000 +0100
-+++ serefpolicy-3.3.1/man/man8/ftpd_selinux.8	2008-12-15 10:40:31.000000000 +0100
++++ serefpolicy-3.3.1/man/man8/ftpd_selinux.8	2009-01-05 11:17:34.000000000 +0100
 @@ -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"
@@ -867,7 +867,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-02-26 14:23:12.000000000 +0100
-+++ serefpolicy-3.3.1/man/man8/httpd_selinux.8	2008-12-15 10:40:31.000000000 +0100
++++ serefpolicy-3.3.1/man/man8/httpd_selinux.8	2009-01-05 11:17:34.000000000 +0100
 @@ -22,23 +22,19 @@
  .EX
  httpd_sys_content_t 
@@ -899,7 +899,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-02-26 14:23:09.000000000 +0100
-+++ serefpolicy-3.3.1/policy/flask/access_vectors	2008-12-15 10:40:31.000000000 +0100
++++ serefpolicy-3.3.1/policy/flask/access_vectors	2009-01-05 11:17:34.000000000 +0100
 @@ -125,6 +125,7 @@
  	reparent
  	search
@@ -1186,7 +1186,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-02-26 14:23:09.000000000 +0100
-+++ serefpolicy-3.3.1/policy/flask/security_classes	2008-12-15 10:40:31.000000000 +0100
++++ serefpolicy-3.3.1/policy/flask/security_classes	2009-01-05 11:17:34.000000000 +0100
 @@ -50,21 +50,19 @@
  # passwd/chfn/chsh
  class passwd			# userspace
@@ -1235,7 +1235,7 @@
  # FLASK
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/global_tunables serefpolicy-3.3.1/policy/global_tunables
 --- nsaserefpolicy/policy/global_tunables	2008-02-26 14:23:12.000000000 +0100
-+++ serefpolicy-3.3.1/policy/global_tunables	2008-12-15 10:40:31.000000000 +0100
++++ serefpolicy-3.3.1/policy/global_tunables	2009-01-05 11:17:34.000000000 +0100
 @@ -34,7 +34,7 @@
  
  ## <desc>
@@ -1276,7 +1276,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/mls serefpolicy-3.3.1/policy/mls
 --- nsaserefpolicy/policy/mls	2008-02-26 14:23:09.000000000 +0100
-+++ serefpolicy-3.3.1/policy/mls	2008-12-15 10:40:31.000000000 +0100
++++ serefpolicy-3.3.1/policy/mls	2009-01-05 11:17:34.000000000 +0100
 @@ -371,78 +371,53 @@
  
[...4336 lines suppressed...]
 +policy_module(auditadm,1.0.1)
 +gen_require(`
@@ -43797,17 +43807,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	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.3.1/policy/modules/users/guest.fc	2008-12-15 10:40:31.000000000 +0100
++++ serefpolicy-3.3.1/policy/modules/users/guest.fc	2009-01-05 11:17:34.000000000 +0100
 @@ -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	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.3.1/policy/modules/users/guest.if	2008-12-15 10:40:31.000000000 +0100
++++ serefpolicy-3.3.1/policy/modules/users/guest.if	2009-01-05 11:17:34.000000000 +0100
 @@ -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	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.3.1/policy/modules/users/guest.te	2008-12-15 10:40:31.000000000 +0100
++++ serefpolicy-3.3.1/policy/modules/users/guest.te	2009-01-05 11:17:34.000000000 +0100
 @@ -0,0 +1,33 @@
 +policy_module(guest,1.0.1)
 +userdom_restricted_user_template(guest)
@@ -43844,17 +43854,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	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.3.1/policy/modules/users/logadm.fc	2008-12-15 10:40:31.000000000 +0100
++++ serefpolicy-3.3.1/policy/modules/users/logadm.fc	2009-01-05 11:17:34.000000000 +0100
 @@ -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	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.3.1/policy/modules/users/logadm.if	2008-12-15 10:40:31.000000000 +0100
++++ serefpolicy-3.3.1/policy/modules/users/logadm.if	2009-01-05 11:17:34.000000000 +0100
 @@ -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	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.3.1/policy/modules/users/logadm.te	2008-12-15 10:40:31.000000000 +0100
++++ serefpolicy-3.3.1/policy/modules/users/logadm.te	2009-01-05 11:17:34.000000000 +0100
 @@ -0,0 +1,11 @@
 +policy_module(logadm,1.0.0)
 +
@@ -43869,22 +43879,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	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.3.1/policy/modules/users/metadata.xml	2008-12-15 10:40:31.000000000 +0100
++++ serefpolicy-3.3.1/policy/modules/users/metadata.xml	2009-01-05 11:17:34.000000000 +0100
 @@ -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	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.3.1/policy/modules/users/secadm.fc	2008-12-15 10:40:31.000000000 +0100
++++ serefpolicy-3.3.1/policy/modules/users/secadm.fc	2009-01-05 11:17:34.000000000 +0100
 @@ -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	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.3.1/policy/modules/users/secadm.if	2008-12-15 10:40:31.000000000 +0100
++++ serefpolicy-3.3.1/policy/modules/users/secadm.if	2009-01-05 11:17:34.000000000 +0100
 @@ -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	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.3.1/policy/modules/users/secadm.te	2008-12-15 10:40:31.000000000 +0100
++++ serefpolicy-3.3.1/policy/modules/users/secadm.te	2009-01-05 11:17:34.000000000 +0100
 @@ -0,0 +1,39 @@
 +policy_module(secadm,1.0.1)
 +gen_require(`
@@ -43927,17 +43937,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	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.3.1/policy/modules/users/staff.fc	2008-12-15 10:40:31.000000000 +0100
++++ serefpolicy-3.3.1/policy/modules/users/staff.fc	2009-01-05 11:17:34.000000000 +0100
 @@ -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	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.3.1/policy/modules/users/staff.if	2008-12-15 10:40:31.000000000 +0100
++++ serefpolicy-3.3.1/policy/modules/users/staff.if	2009-01-05 11:17:34.000000000 +0100
 @@ -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	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.3.1/policy/modules/users/staff.te	2008-12-15 10:40:31.000000000 +0100
++++ serefpolicy-3.3.1/policy/modules/users/staff.te	2009-01-05 11:17:34.000000000 +0100
 @@ -0,0 +1,30 @@
 +policy_module(staff,1.0.1)
 +userdom_admin_login_user_template(staff)
@@ -43971,17 +43981,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	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.3.1/policy/modules/users/user.fc	2008-12-15 10:40:31.000000000 +0100
++++ serefpolicy-3.3.1/policy/modules/users/user.fc	2009-01-05 11:17:34.000000000 +0100
 @@ -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	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.3.1/policy/modules/users/user.if	2008-12-15 10:40:31.000000000 +0100
++++ serefpolicy-3.3.1/policy/modules/users/user.if	2009-01-05 11:17:34.000000000 +0100
 @@ -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	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.3.1/policy/modules/users/user.te	2008-12-15 10:40:31.000000000 +0100
++++ serefpolicy-3.3.1/policy/modules/users/user.te	2009-01-05 11:17:34.000000000 +0100
 @@ -0,0 +1,18 @@
 +policy_module(user,1.0.1)
 +userdom_unpriv_user_template(user)
@@ -44003,17 +44013,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	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.3.1/policy/modules/users/webadm.fc	2008-12-15 10:40:31.000000000 +0100
++++ serefpolicy-3.3.1/policy/modules/users/webadm.fc	2009-01-05 11:17:34.000000000 +0100
 @@ -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	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.3.1/policy/modules/users/webadm.if	2008-12-15 10:40:31.000000000 +0100
++++ serefpolicy-3.3.1/policy/modules/users/webadm.if	2009-01-05 11:17:34.000000000 +0100
 @@ -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	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.3.1/policy/modules/users/webadm.te	2008-12-15 10:40:31.000000000 +0100
++++ serefpolicy-3.3.1/policy/modules/users/webadm.te	2009-01-05 11:17:34.000000000 +0100
 @@ -0,0 +1,41 @@
 +policy_module(webadm,1.0.0)
 +
@@ -44058,17 +44068,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	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.3.1/policy/modules/users/xguest.fc	2008-12-15 10:40:31.000000000 +0100
++++ serefpolicy-3.3.1/policy/modules/users/xguest.fc	2009-01-05 11:17:34.000000000 +0100
 @@ -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	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.3.1/policy/modules/users/xguest.if	2008-12-15 10:40:31.000000000 +0100
++++ serefpolicy-3.3.1/policy/modules/users/xguest.if	2009-01-05 11:17:34.000000000 +0100
 @@ -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	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.3.1/policy/modules/users/xguest.te	2008-12-15 10:40:31.000000000 +0100
++++ serefpolicy-3.3.1/policy/modules/users/xguest.te	2009-01-05 11:17:34.000000000 +0100
 @@ -0,0 +1,69 @@
 +policy_module(xguest,1.0.1)
 +
@@ -44141,7 +44151,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-02-26 14:23:09.000000000 +0100
-+++ serefpolicy-3.3.1/policy/support/file_patterns.spt	2008-12-15 10:40:31.000000000 +0100
++++ serefpolicy-3.3.1/policy/support/file_patterns.spt	2009-01-05 11:17:34.000000000 +0100
 @@ -537,3 +537,23 @@
  	allow $1 $2:dir rw_dir_perms;
  	type_transition $1 $2:$4 $3;
@@ -44168,7 +44178,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-02-26 14:23:09.000000000 +0100
-+++ serefpolicy-3.3.1/policy/support/obj_perm_sets.spt	2008-12-15 10:40:31.000000000 +0100
++++ serefpolicy-3.3.1/policy/support/obj_perm_sets.spt	2009-01-05 11:17:34.000000000 +0100
 @@ -193,7 +193,7 @@
  define(`create_dir_perms',`{ getattr create }')
  define(`rename_dir_perms',`{ getattr rename }')
@@ -44248,7 +44258,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-02-26 14:23:12.000000000 +0100
-+++ serefpolicy-3.3.1/policy/users	2008-12-15 10:40:31.000000000 +0100
++++ serefpolicy-3.3.1/policy/users	2009-01-05 11:17:34.000000000 +0100
 @@ -16,7 +16,7 @@
  # and a user process should never be assigned the system user
  # identity.
@@ -44284,7 +44294,7 @@
 +gen_user(root, user, unconfined_r sysadm_r staff_r ifdef(`enable_mls',`secadm_r auditadm_r') system_r, s0, s0 - mls_systemhigh, mcs_allcats)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/Rules.modular serefpolicy-3.3.1/Rules.modular
 --- nsaserefpolicy/Rules.modular	2008-02-26 14:23:12.000000000 +0100
-+++ serefpolicy-3.3.1/Rules.modular	2008-12-15 10:40:31.000000000 +0100
++++ serefpolicy-3.3.1/Rules.modular	2009-01-05 11:17:34.000000000 +0100
 @@ -73,8 +73,8 @@
  $(tmpdir)/%.mod: $(m4support) $(tmpdir)/generated_definitions.conf $(tmpdir)/all_interfaces.conf %.te
  	@echo "Compliling $(NAME) $(@F) module"
@@ -44316,7 +44326,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-02-26 14:23:13.000000000 +0100
-+++ serefpolicy-3.3.1/Rules.monolithic	2008-12-15 10:40:31.000000000 +0100
++++ serefpolicy-3.3.1/Rules.monolithic	2009-01-05 11:17:34.000000000 +0100
 @@ -96,7 +96,7 @@
  #
  # Load the binary policy


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-9/selinux-policy.spec,v
retrieving revision 1.731
retrieving revision 1.732
diff -u -r1.731 -r1.732
--- selinux-policy.spec	15 Dec 2008 15:22:48 -0000	1.731
+++ selinux-policy.spec	5 Jan 2009 12:28:38 -0000	1.732
@@ -20,7 +20,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.3.1
-Release: 116%{?dist}
+Release: 117%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -443,6 +443,12 @@
 %endif
 
 %changelog
+* Mon Jan 5 2009  Miroslav Grepl <mgrepl at redhat.com> 3.3.1-117
+- Add label to /var/run/mod_.*
+- Add label to /var/turboprint(/.*)?
+- Add radvd net_admin capability
+- Add 4321 to whois ports
+
 * Mon Dec 15 2008 Miroslav Grepl <mgrepl at redhat.com> 3.3.1-116
 - Allow uux to read mail queue files
 - Allow hplip to manage cupsd_tmp_t files



From pvrabec at fedoraproject.org  Mon Jan  5 12:58:14 2009
From: pvrabec at fedoraproject.org (Peter Vrabec)
Date: Mon,  5 Jan 2009 12:58:14 +0000 (UTC)
Subject: rpms/shadow-utils/devel shadow-utils.spec,1.124,1.125
Message-ID: <20090105125814.759D070108@cvs1.fedora.phx.redhat.com>

Author: pvrabec

Update of /cvs/extras/rpms/shadow-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3495

Modified Files:
	shadow-utils.spec 
Log Message:
Add policycoreutils as Requires, because of restorecon (#478494)



Index: shadow-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/shadow-utils/devel/shadow-utils.spec,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -r1.124 -r1.125
--- shadow-utils.spec	21 Dec 2008 16:54:46 -0000	1.124
+++ shadow-utils.spec	5 Jan 2009 12:57:44 -0000	1.125
@@ -5,7 +5,7 @@
 Summary: Utilities for managing accounts and shadow password files
 Name: shadow-utils
 Version: 4.1.2
-Release: 9%{?dist}
+Release: 10%{?dist}
 Epoch: 2
 URL: http://pkg-shadow.alioth.debian.org/
 Source0: ftp://pkg-shadow.alioth.debian.org/pub/pkg-shadow/shadow-%{version}.tar.bz2
@@ -29,7 +29,7 @@
 BuildRequires: audit-libs-devel >= 1.6.5
 Requires: libselinux >= 1.25.2-1
 Requires: audit-libs >= 1.6.5
-Requires: setup
+Requires: setup policycoreutils
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -195,6 +195,9 @@
 %{_mandir}/man8/vigr.8*
 
 %changelog
+* Mon Jan 05 2009 Peter Vrabec <pvrabec at redhat.com> 2:4.1.2-10
+- Add policycoreutils as Requires, because of restorecon (#478494)
+
 * Sun Dec 21 2008 Jesse Keating <jkeating at redhat.com> - 2:4.1.2-9
 - Add setup as a Requires. Perhaps this should be a files requires. (#477529)
 



From pvrabec at fedoraproject.org  Mon Jan  5 13:04:39 2009
From: pvrabec at fedoraproject.org (Peter Vrabec)
Date: Mon,  5 Jan 2009 13:04:39 +0000 (UTC)
Subject: rpms/shadow-utils/F-10 shadow-utils.spec,1.123,1.124
Message-ID: <20090105130439.BE22D70108@cvs1.fedora.phx.redhat.com>

Author: pvrabec

Update of /cvs/extras/rpms/shadow-utils/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4961

Modified Files:
	shadow-utils.spec 
Log Message:
- Add policycoreutils as Requires, because of restorecon (#478494)
- Add setup as a Requires. Perhaps this should be a files requires. (#477529)



Index: shadow-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/shadow-utils/F-10/shadow-utils.spec,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -r1.123 -r1.124
--- shadow-utils.spec	24 Sep 2008 13:26:18 -0000	1.123
+++ shadow-utils.spec	5 Jan 2009 13:04:09 -0000	1.124
@@ -5,7 +5,7 @@
 Summary: Utilities for managing accounts and shadow password files
 Name: shadow-utils
 Version: 4.1.2
-Release: 8%{?dist}
+Release: 9%{?dist}
 Epoch: 2
 URL: http://pkg-shadow.alioth.debian.org/
 Source0: ftp://pkg-shadow.alioth.debian.org/pub/pkg-shadow/shadow-%{version}.tar.bz2
@@ -29,6 +29,7 @@
 BuildRequires: audit-libs-devel >= 1.6.5
 Requires: libselinux >= 1.25.2-1
 Requires: audit-libs >= 1.6.5
+Requires: setup policycoreutils
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -194,6 +195,10 @@
 %{_mandir}/man8/vigr.8*
 
 %changelog
+* Mon Jan 05 2009 Peter Vrabec <pvrabec at redhat.com> 2:4.1.2-9
+- Add policycoreutils as Requires, because of restorecon (#478494)
+- Add setup as a Requires. Perhaps this should be a files requires. (#477529)
+
 * 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)



From pwouters at fedoraproject.org  Mon Jan  5 13:19:33 2009
From: pwouters at fedoraproject.org (Paul Wouters)
Date: Mon,  5 Jan 2009 13:19:33 +0000 (UTC)
Subject: rpms/unbound/devel unbound-1.1-checkconf.patch, NONE,
	1.1 unbound-1.1-scandir.patch, 1.1, 1.2 unbound.spec, 1.13, 1.14
Message-ID: <20090105131933.1F3437013C@cvs1.fedora.phx.redhat.com>

Author: pwouters

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

Modified Files:
	unbound-1.1-scandir.patch unbound.spec 
Added Files:
	unbound-1.1-checkconf.patch 
Log Message:
* Mon Jan  5 2009 Paul Wouters <paul at xelerance.com> - 1.1.1-7
- Modified scandir patch to silently fail when wildcard matches nothing
- Patch to allow unbound-checkconf to find empty wildcard matches


unbound-1.1-checkconf.patch:

--- NEW FILE unbound-1.1-checkconf.patch ---
Index: smallapp/unbound-checkconf.c
===================================================================
--- smallapp/unbound-checkconf.c	(revision 1404)
+++ smallapp/unbound-checkconf.c	(working copy)
@@ -258,7 +258,9 @@
 {
 	struct config_strlist* p;
 	for(p=list; p; p=p->next) {
-		check_chroot_string(desc, &p->str, chrootdir, cfg);
+		/* skip wildcard checks, may fail */
+		if(strstr(p->str,"*") == NULL)
+		     check_chroot_string(desc, &p->str, chrootdir, cfg);
 	}
 }
 

unbound-1.1-scandir.patch:

Index: unbound-1.1-scandir.patch
===================================================================
RCS file: /cvs/extras/rpms/unbound/devel/unbound-1.1-scandir.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- unbound-1.1-scandir.patch	5 Jan 2009 08:38:26 -0000	1.1
+++ unbound-1.1-scandir.patch	5 Jan 2009 13:19:32 -0000	1.2
@@ -38,7 +38,7 @@
 +				free(fnameb);
 +				free(fnamef);
 +				free(globmatch);
-+				return 0;
++				return 1;
 +			}
 +			else {
 +				while(n--) {


Index: unbound.spec
===================================================================
RCS file: /cvs/extras/rpms/unbound/devel/unbound.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- unbound.spec	5 Jan 2009 11:50:27 -0000	1.13
+++ unbound.spec	5 Jan 2009 13:19:32 -0000	1.14
@@ -1,7 +1,7 @@
 Summary: Validating, recursive, and caching DNS(SEC) resolver
 Name: unbound
 Version: 1.1.1
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: BSD
 Url: http://www.nlnetlabs.nl/unbound/
 Source: http://www.unbound.net/downloads/%{name}-%{version}.tar.gz
@@ -9,6 +9,7 @@
 Source2: unbound.conf
 Source3: unbound.munin
 Patch0: unbound-1.1-scandir.patch
+Patch1: unbound-1.1-checkconf.patch
 Group: System Environment/Daemons
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: flex, openssl-devel, ldns-devel >= 1.4.0, libevent-devel
@@ -63,6 +64,7 @@
 %prep
 %setup -q 
 %patch0 -p0
+%patch1 -p0
 
 %build
 %configure  --with-ldns= --with-libevent --with-pthreads --with-ssl \
@@ -147,6 +149,10 @@
 %postun libs -p /sbin/ldconfig
 
 %changelog
+* Mon Jan  5 2009 Paul Wouters <paul at xelerance.com> - 1.1.1-7
+- Modified scandir patch to silently fail when wildcard matches nothing
+- Patch to allow unbound-checkconf to find empty wildcard matches
+
 * Mon Jan  5 2009 Paul Wouters <paul at xelerance.com> - 1.1.1-6
 - Added scandir patch for trusted-keys-file: option, which
   is used to load multiple dnssec keys in bind file format



From caolanm at fedoraproject.org  Mon Jan  5 13:28:05 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Mon,  5 Jan 2009 13:28:05 +0000 (UTC)
Subject: rpms/mythes-sk/devel mythes-sk.spec,1.4,1.5 sources,1.5,1.6
Message-ID: <20090105132805.A38FD70108@cvs1.fedora.phx.redhat.com>

Author: caolanm

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

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


Index: mythes-sk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mythes-sk/devel/mythes-sk.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- mythes-sk.spec	27 Nov 2008 13:06:32 -0000	1.4
+++ mythes-sk.spec	5 Jan 2009 13:27:35 -0000	1.5
@@ -1,6 +1,6 @@
 Name: mythes-sk
 Summary: Slovak thesarus
-%define upstreamid 20081121
+%define upstreamid 20090102
 Version: 0.%{upstreamid}
 Release: 1%{?dist}
 Source: http://www.sk-spell.sk.cx/thesaurus/download/OOo-Thesaurus2-sk_SK.zip
@@ -37,6 +37,9 @@
 %{_datadir}/mythes/*
 
 %changelog
+* Mon Jan 05 2009 Caolan McNamara <caolanm at redhat.com> - 0.20090102-1
+- latest version
+
 * Thu Nov 27 2008 Caolan McNamara <caolanm at redhat.com> - 0.20081121-1
 - latest version
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mythes-sk/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	27 Nov 2008 13:06:32 -0000	1.5
+++ sources	5 Jan 2009 13:27:35 -0000	1.6
@@ -1 +1 @@
-b08c6a26e748af65b96ff9b821a1e27d  OOo-Thesaurus2-sk_SK.zip
+07f5d7f14aa9478db8e8a25c31ac75b0  OOo-Thesaurus2-sk_SK.zip



From caolanm at fedoraproject.org  Mon Jan  5 13:39:50 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Mon,  5 Jan 2009 13:39:50 +0000 (UTC)
Subject: rpms/mythes-sk/devel mythes-sk.spec,1.5,1.6
Message-ID: <20090105133950.3240570108@cvs1.fedora.phx.redhat.com>

Author: caolanm

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

Modified Files:
	mythes-sk.spec 
Log Message:
fixup


Index: mythes-sk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mythes-sk/devel/mythes-sk.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- mythes-sk.spec	5 Jan 2009 13:27:35 -0000	1.5
+++ mythes-sk.spec	5 Jan 2009 13:39:19 -0000	1.6
@@ -18,21 +18,20 @@
 %setup -q -c
 
 %build
-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
+tr -d '\r' < README_th_sk_SK_v2.txt > README_th_sk_SK_v2.txt.new
+mv -f README_th_sk_SK_v2.txt.new README_th_sk_SK_v2.txt
 
 %install
 rm -rf $RPM_BUILD_ROOT
 mkdir -p $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
+cp -p th_sk_SK_v2.* $RPM_BUILD_ROOT/%{_datadir}/mythes
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc README_th_sk_SK.txt
+%doc README_th_sk_SK_v2.txt
 %dir %{_datadir}/mythes
 %{_datadir}/mythes/*
 



From mzazrive at fedoraproject.org  Mon Jan  5 13:49:03 2009
From: mzazrive at fedoraproject.org (Milan Zazrivec)
Date: Mon,  5 Jan 2009 13:49:03 +0000 (UTC)
Subject: rpms/xqilla/EL-5 mapm_mt.c, 1.2, 1.3 .cvsignore, 1.4, 1.5 import.log,
	1.1, 1.2 sources, 1.4, 1.5 xqilla-xercesc-libdir.patch, 1.2,
	1.3 xqilla.spec, 1.8, 1.9
Message-ID: <20090105134903.97D1770108@cvs1.fedora.phx.redhat.com>

Author: mzazrive

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

Modified Files:
	.cvsignore import.log sources xqilla-xercesc-libdir.patch 
	xqilla.spec 
Added Files:
	mapm_mt.c 
Log Message:
imported xqilla-2.0.0-1.1 (from F-8 branch)



Index: mapm_mt.c
===================================================================
RCS file: mapm_mt.c
diff -N mapm_mt.c
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ mapm_mt.c	5 Jan 2009 13:48:33 -0000	1.3
@@ -0,0 +1,664 @@
+
+/* 
+ *  M_APM  -  mapm_mt.c
+ *
+ *  Copyright (C) 2002 - 2007   
+ *  Martin Pfingstl (Martin.Pfingstl at epost.de)
+ *  Michael C. Ring
+ *
+ *  Permission to use, copy, and distribute this software and its
+ *  documentation for any purpose with or without fee is hereby granted, 
+ *  provided that the above copyright notice appear in all copies and 
+ *  that both that copyright notice and this permission notice appear 
+ *  in supporting documentation.
+ *
+ *  Permission to modify the software is granted. Permission to distribute
+ *  the modified code is granted. Modifications are to be distributed by
+ *  using the file 'license.txt' as a template to modify the file header.
+ *  'license.txt' is available in the official MAPM distribution.
+ *
+ *  This software is provided "as is" without express or implied warranty.
+ *
+ *  THIS FILE HAS BEEN MODIFIED FROM THE OFFICIAL MAPM DISTRIBUTION BY
+ *  Milan Zazrivec on 2008/10/01
+ *  THIS FILE IS ORIGINALLY FROM MAPM VERSION 4.9.5
+ *
+ *  Changes made by Milan Zazrivec:
+ *  - imported changes from XQilla project into mapm_mt.c (needed to make it
+ *    work with xqilla version 2.0.0)
+ */
+
+/*
+ *      $Id$
+ *
+ *      This file contains all wrapper functions for the library 
+ *	using semaphores
+ *
+ *      $Log$
+ *      Revision 1.3  2009/01/05 13:48:33  mzazrive
+ *      imported xqilla-2.0.0-1.1 (from F-8 branch)
+ *
+ *      Revision 1.4  2007/12/03 02:24:27  mike
+ *      update license
+ *
+ *      Revision 1.3  2003/05/07 22:52:22  mike
+ *      add 2 new version functions
+ *
+ *      Revision 1.2  2002/11/10 22:42:44  mike
+ *      add new integer_pow_nr function
+ *
+ *      Revision 1.1  2002/06/13 20:39:09  mike
+ *      Initial revision
+ */
+
+
+#include <xqilla/mapm/m_apm.h>
+
+extern   void    m_apm_enter(void);
+extern   void    m_apm_leave(void);
+
+#include <xercesc/util/Mutexes.hpp>
+#include <xercesc/util/PlatformUtils.hpp>
+
+extern "C"
+{
+
+static XERCES_CPP_NAMESPACE_QUALIFIER XMLMutex* m_apm_semaphore=0;
+
+void m_apm_mt_initialize(void)
+{
+  if(m_apm_semaphore == 0) {
+    m_apm_semaphore = new XERCES_CPP_NAMESPACE_QUALIFIER XMLMutex;
+  }
+}
+
+void m_apm_mt_terminate(void)
+{
+  delete m_apm_semaphore;
+  m_apm_semaphore = 0;
+}
+
+void    m_apm_enter(void)
+{
+        m_apm_semaphore->lock();
+}
+
+void    m_apm_leave(void)
+{
+        m_apm_semaphore->unlock();
+}
+
+/****************************************************************************/
+
+M_APM 	m_apm_init_mt(void)
+{
+M_APM 	t;
+
+/*	m_apm_enter(); */
+	t=m_apm_init();
+/*	m_apm_leave(); */
+	return(t);
+}
+
+/****************************************************************************/
+
+void	m_apm_free_mt(M_APM t)
+{
+/*	m_apm_enter(); */
+	m_apm_free(t);
+/*	m_apm_leave(); */
+}
+
+/****************************************************************************/
+
+void	m_apm_free_all_mem_mt(void)
+{
+	m_apm_enter();
+	m_apm_free_all_mem();
+	m_apm_leave();
+}
+
+/****************************************************************************/
+
+void	m_apm_trim_mem_usage_mt(void)
+{
+	m_apm_enter();
+	m_apm_trim_mem_usage();
+	m_apm_leave();
+}
+
+/****************************************************************************/
+
+void	m_apm_set_string_mt(M_APM ctmp, char *s_in)
+{
+/*	m_apm_enter(); */
+	m_apm_set_string(ctmp,s_in);
+/*	m_apm_leave(); */
+}
+
+/****************************************************************************/
+
+void	m_apm_set_double_mt(M_APM atmp,double dd)
+{
+/*	m_apm_enter(); */
+	m_apm_set_double(atmp,dd);
+/*	m_apm_leave(); */
+}
+
+/****************************************************************************/
+
+void	m_apm_set_long_mt(M_APM atmp, long mm)
+{
+/*	m_apm_enter(); */
+	m_apm_set_long(atmp,mm);
+/*	m_apm_leave(); */
+}
+
+/****************************************************************************/
+
+void	m_apm_to_string_mt(char *s, int places, M_APM mtmp)
+{
+/*	m_apm_enter(); */
+	m_apm_to_string(s,places,mtmp);
+/*	m_apm_leave(); */
+}
+
+/****************************************************************************/
+
+void	m_apm_add_mt(M_APM r, M_APM a, M_APM b)
+{
+/*	m_apm_enter(); */
+	m_apm_add(r,a,b);
+/*	m_apm_leave(); */
+}
+
+/****************************************************************************/
+
+void	m_apm_subtract_mt(M_APM r, M_APM a, M_APM b)
+{
+/*	m_apm_enter(); */
+	m_apm_subtract(r,a,b);
+/*	m_apm_leave(); */
+}
+
+/****************************************************************************/
+
+void	m_apm_absolute_value_mt(M_APM d, M_APM s)
+{
+/*	m_apm_enter(); */
+	m_apm_absolute_value(d,s);
+/*	m_apm_leave(); */
+}
+
+/****************************************************************************/
+
+void	m_apm_negate_mt(M_APM d, M_APM s)
+{
+/*	m_apm_enter(); */
+	m_apm_negate(d,s);
+/*	m_apm_leave(); */
+}
+
+/****************************************************************************/
+
+int	m_apm_compare_mt(M_APM ltmp, M_APM rtmp)
+{
+int 	ret;
+
+/*	m_apm_enter(); */
+	ret=m_apm_compare(ltmp,rtmp);
+/*	m_apm_leave(); */
+	return(ret);
+}
+
+
+/****************************************************************************/
+
+void	m_apm_multiply_mt(M_APM r, M_APM a, M_APM b)
+{
+	m_apm_enter();
+	m_apm_multiply(r,a,b);
+	m_apm_leave();
+}
+
+/****************************************************************************/
+
+void	m_apm_divide_mt(M_APM rr, int places, M_APM aa, M_APM bb)
+{
+	m_apm_enter();
+	m_apm_divide(rr,places,aa,bb);
+	m_apm_leave();
+}
+
+/****************************************************************************/
+
+void m_apm_cpp_precision_mt(int digits)
+{
+	m_apm_enter();
+	m_apm_cpp_precision(digits);
+	m_apm_leave();
+}
+
+/****************************************************************************/
+
+void	m_apm_to_fixpt_string_mt(char *ss, int dplaces, M_APM mtmp)
+{
+	m_apm_enter();
+	m_apm_to_fixpt_string(ss,dplaces,mtmp);
+	m_apm_leave();
+}
+
+/****************************************************************************/
+
+void	m_apm_round_mt(M_APM btmp, int places, M_APM atmp)
+{
+/*	m_apm_enter(); */
+	m_apm_round(btmp,places,atmp);
+/*	m_apm_leave(); */
+}
+
+/****************************************************************************/
+
+void	m_apm_sqrt_mt(M_APM rr, int places, M_APM aa)
+{
+	m_apm_enter();
+	m_apm_sqrt(rr,places,aa);
+	m_apm_leave();
+}
+
+/****************************************************************************/
+
+void	m_apm_sin_mt(M_APM r, int places, M_APM a)
+{
+	m_apm_enter();
+	m_apm_sin(r,places,a);
+	m_apm_leave();
+}
+
+/****************************************************************************/
+
+void	m_apm_arccos_mt(M_APM r, int places, M_APM x)
+{
+	m_apm_enter();
+	m_apm_arccos(r,places,x);
+	m_apm_leave();
+}
+
+/****************************************************************************/
+
+void	m_apm_arctan2_mt(M_APM rr, int places, M_APM yy, M_APM xx)
+{
+	m_apm_enter();
+	m_apm_arctan2(rr,places,yy,xx);
+	m_apm_leave();
+}
+
+/****************************************************************************/
+
+void	m_apm_copy_mt(M_APM dest, M_APM src)
+{
+/*	m_apm_enter(); */
+	m_apm_copy(dest,src);
+/*	m_apm_leave(); */
+}
+
+
+/****************************************************************************/
+
+void	m_apm_reciprocal_mt(M_APM rr, int places, M_APM aa)
+{
+	m_apm_enter();
+	m_apm_reciprocal(rr,places,aa);
+	m_apm_leave();
+}
+
+/****************************************************************************/
+
+void	m_apm_to_fixpt_stringex_mt(char *s, int dplaces, M_APM atmp,
+			char ch_radix, char ch_sep, int count_sep)
+{
+	m_apm_enter();
+	m_apm_to_fixpt_stringex(s,dplaces,atmp,ch_radix,ch_sep,count_sep);
+	m_apm_leave();
+}
+
+/****************************************************************************/
+
+char	*m_apm_to_fixpt_stringexp_mt(int dplaces, M_APM atmp, char ch_radx, 
+				char ch_sep, int ct_sep)
+{
+char 	*s;
+
+	m_apm_enter();
+	s=m_apm_to_fixpt_stringexp(dplaces,atmp,ch_radx,ch_sep,ct_sep);
+	m_apm_leave();
+	return(s);
+}
+
+/****************************************************************************/
+
+void m_apm_to_integer_string_mt(char *s, M_APM mtmp)
+{
+	m_apm_enter();
+	m_apm_to_integer_string(s,mtmp);
+	m_apm_leave();
+}
+
+/****************************************************************************/
+
+int	m_apm_sign_mt(M_APM m)
+{
+int 	i;
+
+/*	m_apm_enter(); */
+	i=m_apm_sign(m);
+/*	m_apm_leave(); */
+	return(i);
+}
+
+/****************************************************************************/
+
+int	m_apm_exponent_mt(M_APM m)
+{
+int 	i;
+
+/*	m_apm_enter(); */
+	i=m_apm_exponent(m);
+/*	m_apm_leave(); */
+	return(i);
+}
+
+/****************************************************************************/
+
+int	m_apm_significant_digits_mt(M_APM m)
+{
+int 	i;
+
+/*	m_apm_enter(); */
+	i=m_apm_significant_digits(m);
+/*	m_apm_leave(); */
+	return(i);
+}
+
+/****************************************************************************/
+
+int	m_apm_is_integer_mt(M_APM m)
+{
+int 	i;
+
+/*	m_apm_enter(); */
+	i=m_apm_is_integer(m);
+/*	m_apm_leave(); */
+	return(i);
+}
+
+/****************************************************************************/
+
+int	m_apm_is_even_mt(M_APM m)
+{
+int 	i;
+
+/*	m_apm_enter(); */
+	i=m_apm_is_even(m);
+/*	m_apm_leave(); */
+	return(i);
+}
+
+/****************************************************************************/
+
+int	m_apm_is_odd_mt(M_APM m)
+{
+int 	i;
+
+/*	m_apm_enter(); */
+	i=m_apm_is_odd(m);
+/*	m_apm_leave(); */
+	return(i);
+}
+
+/****************************************************************************/
+
+void	m_apm_gcd_mt(M_APM r, M_APM u, M_APM v)
+{
+	m_apm_enter();
+	m_apm_gcd(r,u,v);
+	m_apm_leave();
+}
+
+/****************************************************************************/
+
+void	m_apm_lcm_mt(M_APM r, M_APM u, M_APM v)
+{
+	m_apm_enter();
+	m_apm_lcm(r,u,v);
+	m_apm_leave();
+}
+
+/****************************************************************************/
+
+void	m_apm_integer_divide_mt(M_APM rr, M_APM aa, M_APM bb)
+{
+	m_apm_enter();
+	m_apm_integer_divide(rr,aa,bb);
+	m_apm_leave();
+}
+
+/****************************************************************************/
+
+void	m_apm_integer_div_rem_mt(M_APM qq, M_APM rr, M_APM aa, M_APM bb)
+{
+	m_apm_enter();
+	m_apm_integer_div_rem(qq,rr,aa,bb);
+	m_apm_leave();
+}
+
+/****************************************************************************/
+
+void	m_apm_factorial_mt(M_APM moutput, M_APM  minput)
+{
+	m_apm_enter();
+	m_apm_factorial(moutput,minput);
+	m_apm_leave();
+}
+
+/****************************************************************************/
+
+void	m_apm_floor_mt(M_APM bb, M_APM aa)
+{
+	m_apm_enter();
+	m_apm_floor(bb,aa);
+	m_apm_leave();
+}
+
+/****************************************************************************/
+
+void	m_apm_ceil_mt(M_APM bb, M_APM aa)
+{
+	m_apm_enter();
+	m_apm_ceil(bb,aa);
+	m_apm_leave();
+}
+
+/****************************************************************************/
+
+void	m_apm_get_random_mt(M_APM m)
+{
+	m_apm_enter();
+	m_apm_get_random(m);
+	m_apm_leave();
+}
+
+/****************************************************************************/
+
+void	m_apm_set_random_seed_mt(char *s)
+{
+	m_apm_enter();
+	m_apm_set_random_seed(s);
+	m_apm_leave();
+}
+
+/****************************************************************************/
+
+void	m_apm_cbrt_mt(M_APM rr, int places, M_APM aa)
+{
+	m_apm_enter();
+	m_apm_cbrt(rr,places,aa);
+	m_apm_leave();
+}
+
+/****************************************************************************/
+
+void	m_apm_log_mt(M_APM rr, int places, M_APM aa)
+{
+	m_apm_enter();
+	m_apm_log(rr,places,aa);
+	m_apm_leave();
+}
+
+/****************************************************************************/
+
+void	m_apm_log10_mt(M_APM rr, int places, M_APM aa)
+{
+	m_apm_enter();
+	m_apm_log10(rr,places,aa);
+	m_apm_leave();
+}
+
+/****************************************************************************/
+
+void	m_apm_exp_mt(M_APM rr, int places, M_APM aa)
+{
+	m_apm_enter();
+	m_apm_exp(rr,places,aa);
+	m_apm_leave();
+}
+
+/****************************************************************************/
+
+void	m_apm_pow_mt(M_APM rr, int places, M_APM xx, M_APM yy)
+{
+	m_apm_enter();
+	m_apm_pow(rr,places,xx,yy);
+	m_apm_leave();
+}
+
+/****************************************************************************/
+
+void	m_apm_integer_pow_mt(M_APM rr, int places, M_APM aa, int mexp)
+{
+	m_apm_enter();
+	m_apm_integer_pow(rr,places,aa,mexp);
+	m_apm_leave();
+}
+
+/****************************************************************************/
+
+void	m_apm_integer_pow_nr_mt(M_APM rr, M_APM aa, int mexp)
+{
+	m_apm_enter();
+	m_apm_integer_pow_nr(rr,aa,mexp);
+	m_apm_leave();
+}
+
+/****************************************************************************/
+
+void	m_apm_sin_cos_mt(M_APM sinv, M_APM cosv, int places, M_APM aa)
+{
+	m_apm_enter();
+	m_apm_sin_cos(sinv,cosv,places,aa);
+	m_apm_leave();
+}
+
+/****************************************************************************/
+
+void	m_apm_cos_mt(M_APM rr, int places, M_APM aa)
+{
+	m_apm_enter();
+	m_apm_cos(rr,places,aa);
+	m_apm_leave();
+}
+
+/****************************************************************************/
+
+void	m_apm_tan_mt(M_APM rr, int places, M_APM aa)
+{
+	m_apm_enter();
+	m_apm_tan(rr,places,aa);
+	m_apm_leave();
+}
+
+/****************************************************************************/
+
+void	m_apm_arcsin_mt(M_APM rr, int places, M_APM aa)
+{
+	m_apm_enter();
+	m_apm_arcsin(rr,places,aa);
+	m_apm_leave();
+}
+
+/****************************************************************************/
+
+void	m_apm_arctan_mt(M_APM rr, int places, M_APM aa)
+{
+	m_apm_enter();
+	m_apm_arctan(rr,places,aa);
+	m_apm_leave();
+}
+
+/****************************************************************************/
+
+void    m_apm_sinh_mt(M_APM rr, int places, M_APM aa)
+{
+	m_apm_enter();
+	m_apm_sinh(rr,places,aa);
+	m_apm_leave();
+}
+
+/****************************************************************************/
+
+void    m_apm_cosh_mt(M_APM rr, int places, M_APM aa)
+{
+	m_apm_enter();
+	m_apm_cosh(rr,places,aa);
+	m_apm_leave();
+}
+
+/****************************************************************************/
+
+void    m_apm_tanh_mt(M_APM rr, int places, M_APM aa)
+{
+	m_apm_enter();
+	m_apm_tanh(rr,places,aa);
+	m_apm_leave();
+}
+
+/****************************************************************************/
+
+void    m_apm_arcsinh_mt(M_APM rr, int places, M_APM aa)
+{
+	m_apm_enter();
+	m_apm_arcsinh(rr,places,aa);
+	m_apm_leave();
+}
+
+/****************************************************************************/
+
+void    m_apm_arccosh_mt(M_APM rr, int places, M_APM aa)
+{
+	m_apm_enter();
+	m_apm_arccosh(rr,places,aa);
+	m_apm_leave();
+}
+
+/****************************************************************************/
+
+void    m_apm_arctanh_mt(M_APM rr, int places, M_APM aa)
+{
+	m_apm_enter();
+	m_apm_arctanh(rr,places,aa);
+	m_apm_leave();
+}
+
+/****************************************************************************/
+
+}


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xqilla/EL-5/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	29 Aug 2008 12:23:06 -0000	1.4
+++ .cvsignore	5 Jan 2009 13:48:32 -0000	1.5
@@ -1,2 +1,2 @@
-xerces-c-src_2_8_0.tar.gz
-XQilla-2.1.3.tar.gz
+XQilla-2.0.0.tar.gz
+xerces-c-src_2_7_0.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/xqilla/EL-5/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	29 Aug 2008 12:23:06 -0000	1.1
+++ import.log	5 Jan 2009 13:48:33 -0000	1.2
@@ -1 +1,2 @@
 xqilla-2_1_3-0_1_fc10:HEAD:xqilla-2.1.3-0.1.fc10.src.rpm:1220012482
+xqilla-2_0_0-1_1_fc8:EL-5:xqilla-2.0.0-1.1.fc8.src.rpm:1231163163


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xqilla/EL-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	29 Aug 2008 12:23:06 -0000	1.4
+++ sources	5 Jan 2009 13:48:33 -0000	1.5
@@ -1,2 +1,2 @@
-5daf514b73f3e0de9e3fce704387c0d2  xerces-c-src_2_8_0.tar.gz
-95b46bb8b29674cd1ae56fb5080a5649  XQilla-2.1.3.tar.gz
+d7aa51c18a164af2fb54282bb271f0e2  XQilla-2.0.0.tar.gz
+04169609449a8846bc1e6891c04cadf4  xerces-c-src_2_7_0.tar.gz

xqilla-xercesc-libdir.patch:

Index: xqilla-xercesc-libdir.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xqilla/EL-5/xqilla-xercesc-libdir.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xqilla-xercesc-libdir.patch	29 Aug 2008 12:23:06 -0000	1.2
+++ xqilla-xercesc-libdir.patch	5 Jan 2009 13:48:33 -0000	1.3
@@ -1,18 +1,37 @@
---- ./configure.in	2008-08-29 13:44:16.000000000 +0200
-+++ ./configure.in	2008-08-29 13:45:53.000000000 +0200
-@@ -71,11 +71,11 @@ AC_MSG_RESULT($with_xerces)
+--- configure.in	2007-12-13 02:06:15.000000000 +0100
++++ configure.in	2008-01-08 15:26:41.000000000 +0100
+@@ -69,18 +69,18 @@
  if test "$with_xerces" = "no"; then
          with_xerces="/usr/local"
  fi
 -if test `ls $with_xerces/lib/libxerces-c.*2[[6-8]].* 2>/dev/null | wc -l` -gt 0 ; then
--        AC_MSG_CHECKING([for Xerces C++ version from source tree])
--        xerces_version=`ls "$with_xerces"/lib/libxerces-c.*[[0-9]][[0-9]].* | tail -1 | sed 's/.*xerces-c.*\([[0-9]]\)\([[0-9]]\).*/\1.\2/'`
 +if test `ls $libdir/libxerces-c.*2[[6-8]].* 2>/dev/null | wc -l` -gt 0 ; then
-+        AC_MSG_CHECKING([for Xerces C++ version from installed library])
+         AC_MSG_CHECKING([for Xerces C++ version from source tree])
+-        xerces_version=`ls "$with_xerces"/lib/libxerces-c.*[[0-9]][[0-9]].* | tail -1 | sed 's/.*xerces-c.*\([[0-9]]\)\([[0-9]]\).*/\1.\2/'`
 +        xerces_version=`ls "$libdir"/libxerces-c.*[[0-9]][[0-9]].* | tail -1 | sed 's/.*xerces-c.*\([[0-9]]\)\([[0-9]]\).*/\1.\2/'`
          AC_MSG_RESULT([$xerces_version])
 -        xerces_lib="$with_xerces/lib"
 +        xerces_lib="$libdir"
-         xerces_include_dir="$with_xerces/src"
-         xerces_include="-I$with_xerces/src"
- elif test `ls $with_xerces/lib/libxerces-c*2[[6-8]].* 2>/dev/null | wc -l` -gt 0 ; then
+         xerces_include="$with_xerces/src"
+         xerces_library="xerces-c"
+-elif test `ls $with_xerces/lib/libxerces-c*2[[6-8]].* 2>/dev/null | wc -l` -gt 0 ; then
++elif test `ls $libdir/libxerces-c*2[[6-8]].* 2>/dev/null | wc -l` -gt 0 ; then
+         AC_MSG_CHECKING([for Xerces C++ version from source tree])
+-        xerces_version=`ls "$with_xerces"/lib/libxerces-c*[[0-9]][[0-9]].* | tail -1 | sed 's/.*xerces-c*\([[0-9]]\)\([[0-9]]\).*/\1.\2/'`
++        xerces_version=`ls "$libdir"/libxerces-c*[[0-9]][[0-9]].* | tail -1 | sed 's/.*xerces-c*\([[0-9]]\)\([[0-9]]\).*/\1.\2/'`
+         AC_MSG_RESULT([$xerces_version])
+-        xerces_lib="$with_xerces/lib"
++        xerces_lib="$libdir"
+         xerces_include="$with_xerces/src"
+         xerces_library="xerces-c"
+ else
+@@ -162,9 +162,7 @@
+ fi
+ 
+ # Checks for libraries.
+-AC_CHECK_LIB(pthread,pthread_create)
+ AC_CHECK_LIB(socket,connect)
+-AC_CHECK_LIB(nsl,gethostbyname)
+ 
+ # Checks for header files.
+ AC_FUNC_ALLOCA


Index: xqilla.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xqilla/EL-5/xqilla.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- xqilla.spec	2 Dec 2008 10:23:51 -0000	1.8
+++ xqilla.spec	5 Jan 2009 13:48:33 -0000	1.9
@@ -1,27 +1,33 @@
 %define _unpackaged_files_terminate_build  1
 %define _missing_doc_files_terminate_build 1
 
-%define xercesc_dir xerces-c-src_2_8_0
+%define xercesc_dir xerces-c-src_2_7_0
 
 Name: xqilla
 Summary: XQilla is an XQuery and XPath 2.0 library, built on top of Xerces-C
 Group: System Environment/Libraries
-Version: 2.1.3
-Release: 0.3%{?dist}
+Version: 2.0.0
+Release: 1.1%{?dist}
 License: ASL 2.0
 URL: http://xqilla.sourceforge.net/HomePage
-Source0: http://downloads.sourceforge.net/xqilla/XQilla-%{version}.tar.gz
-Source1: http://www.apache.org/dist/xerces/c/sources/xerces-c-src_2_8_0.tar.gz
-
-Requires: libstdc++ >= 4.1.1 xerces-c >= 2.8.0
+# Original upstream source:
+# Source0: http://downloads.sourceforge.net/xqilla/XQilla-%{version}.tar.gz
+# 
+# Original tarball with src/mapm/mapm_mt.cpp removed (licensing problems)
+Source0: XQilla-%{version}.tar.gz
+Source1: http://archive.apache.org/dist/xml/xerces-c/Xerces-C_2_7_0/source/xerces-c-src_2_7_0.tar.gz
+# mapm_mt.c is wrapper for mapm library to be used in multithreaded apps.
+# It was taken from MAPM library ver. 4.9.5 and modified to work with
+# XQilla ver. 2.0.0. It's purpose is to replace the removed mapm_mt.cpp.
+Source2: mapm_mt.c
+Requires: libstdc++ >= 4.1.1 xerces-c >= 2.7.0
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-build
-
-BuildRequires: xerces-c-devel >= 2.8.0 
+BuildRequires: xerces-c-devel >= 2.7.0 
 BuildRequires: autoconf automake libtool
 BuildRequires: doxygen graphviz
 
-Patch1: xqilla-xercesc-libdir.patch
+Patch0: xqilla-xercesc-libdir.patch
 
 %define xercesc_build_root %{_builddir}/%{xercesc_dir}
 
@@ -34,7 +40,7 @@
 %package devel
 Group: Development/Libraries
 Summary: XQilla is an XQuery and XPath 2.0 library, built on top of Xerces-C
-Requires: %{name} = %{version}-%{release} xerces-c-devel >= 2.7.0
+Requires: %{name} = %{version}-%{release} xerces-c-devel = 2.7.0
 
 %description devel
 XQilla is an XQuery and XPath 2.0 implementation written in C++ and based
@@ -50,8 +56,10 @@
 simple-api and dom3-api documentation for XQilla.
 
 %prep
-%setup -q -b 1 -n XQilla-%{version}
-%patch1
+%setup -q -b 1 -n XQilla-2.0.0
+cp -p %{SOURCE2} src/mapm
+ln -s mapm_mt.c src/mapm/mapm_mt.cpp
+%patch0
 
 %build
 rm -f aclocal.m4
@@ -102,32 +110,13 @@
 %{_includedir}/xqilla
 
 %files doc
-%defattr(-,root,root,-)
-%dir %{_defaultdocdir}/%{name}-%{version}
 %{_defaultdocdir}/%{name}-%{version}/dom3-api
 %{_defaultdocdir}/%{name}-%{version}/simple-api
 
 %changelog
-* Tue Dec  2 2008 Milan Zazrivec <mzazrivec at redhat.com 2.1.3-0.3
-- fix for bz #473997 - xqilla : Unowned directories
-
-* Fri Aug 29 2008 Milan Zazrivec <mzazrivec at redhat.com> 2.1.3-0.2
-- Rebased XQilla to latest upstream version 2.1.3
-- Fixed files section in spec (documentation was included twice)
-
-* Fri Feb 29 2008 Milan Zazrivec <mzazrivec at redhat.com> 2.0.0-5
+* Thu Feb 28 2008 Milan Zazrivec <mzazrivec at redhat.com> 2.0.0-1.1
 - Create xqilla-doc package for xqilla documentation
 
-* Wed Feb 20 2008 Milan Zazrivec <mzazrivec at redhat.com> - 2.0.0-4
-- Fix Requires: value for xqilla-devel
-
-* Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 2.0.0-3
-- Autorebuild for GCC 4.3
-
-* Tue Feb 19 2008 Milan Zazrivec <mazrivec at redhat.com> 2.0.0-2
-- Included Xerces-C 2.8.0 sources
-- Add missing #include <cstring> where needed (g++ 4.3 changes)
-
 * Thu Jan 10 2008 Milan Zazrivec <mzazrivec at redhat.com> 2.0.0-1
 - Removed src/mapm/mapm_mt.cpp
 - Added modified mapm_mt.c, taken from MAPM library ver. 4.9.5



From rrakus at fedoraproject.org  Mon Jan  5 13:54:01 2009
From: rrakus at fedoraproject.org (Roman Rakus)
Date: Mon,  5 Jan 2009 13:54:01 +0000 (UTC)
Subject: rpms/dvd+rw-tools/F-10 dvd+rw-tools-7.0-dvddl.patch, NONE,
	1.1 dvd+rw-tools.spec, 1.37, 1.38
Message-ID: <20090105135401.DF3A17013C@cvs1.fedora.phx.redhat.com>

Author: rrakus

Update of /cvs/extras/rpms/dvd+rw-tools/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20305

Modified Files:
	dvd+rw-tools.spec 
Added Files:
	dvd+rw-tools-7.0-dvddl.patch 
Log Message:
allow burn small image on dual-layer DVD. Resolves: #476154

dvd+rw-tools-7.0-dvddl.patch:

--- NEW FILE dvd+rw-tools-7.0-dvddl.patch ---
--- ./growisofs_mmc.cpp.joe	2006-04-27 20:45:00.788446635 +0200
+++ ./growisofs_mmc.cpp	2006-04-27 20:46:01.666824300 +0200
@@ -1412,9 +1412,7 @@
     blocks += 15, blocks &= ~15;
 
     if (blocks <= split)
-	fprintf (stderr,":-( more than 50%% of space will be *wasted*!\n"
-			"    use single layer media for this recording\n"),
-	exit (FATAL_START(EMEDIUMTYPE));
+	fprintf (stderr,":-? more than 50%% of space will be *wasted*!\n");
 
     blocks /= 16;
     blocks += 1;


Index: dvd+rw-tools.spec
===================================================================
RCS file: /cvs/extras/rpms/dvd+rw-tools/F-10/dvd+rw-tools.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- dvd+rw-tools.spec	15 Aug 2008 10:42:54 -0000	1.37
+++ dvd+rw-tools.spec	5 Jan 2009 13:53:31 -0000	1.38
@@ -1,7 +1,7 @@
 Summary:	Toolchain to master DVD+RW/+R media
 Name:		dvd+rw-tools
 Version:	7.1
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GPLv2
 Group:		Applications/Multimedia
 Source:		http://fy.chalmers.se/~appro/linux/DVD+RW/tools/dvd+rw-tools-%{version}.tar.gz
@@ -11,6 +11,7 @@
 Patch3:		dvd+rw-tools-7.0-glibc2.6.90.patch
 Patch4: 	dvd+rw-tools-7.0-reload.patch
 Patch5: 	dvd+rw-tools-7.0-wctomb.patch
+Patch6:		dvd+rw-tools-7.0-dvddl.patch
 URL:		http://fy.chalmers.se/~appro/linux/DVD+RW/
 Requires:	mkisofs >= 2.0
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -27,6 +28,7 @@
 %patch3 -p1 -b .glibc2.6.90
 %patch4 -p1 -b .reload
 %patch5 -p0 -b .wctomb
+%patch6 -p0 -b .dvddl
 install -m 644 %{SOURCE1} index.html
 
 %build
@@ -49,6 +51,11 @@
 %{_mandir}/man1/growisofs.1*
 
 %changelog
+* Mon Jan 5 2009 Roman Rakus <rrakus at redhat.com> - 7.1-2
+- allow the burning of dual-layer DVD's from an image
+  of less than half the disc's capacity.
+  Resolves: #476154
+
 * Fri Aug 15 2008 Roman Rakus <rrakus at redhat.com> - 7.1-1
 - new version 7.1
 



From gd at fedoraproject.org  Mon Jan  5 14:13:35 2009
From: gd at fedoraproject.org (Guenther Deschner)
Date: Mon,  5 Jan 2009 14:13:35 +0000 (UTC)
Subject: rpms/samba/F-10 .cvsignore, 1.56, 1.57 samba.spec, 1.164,
	1.165 sources, 1.60, 1.61
Message-ID: <20090105141335.98CEE70108@cvs1.fedora.phx.redhat.com>

Author: gd

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

Modified Files:
	.cvsignore samba.spec sources 
Log Message:
Update to 3.2.7 (Security fix for CVE-2009-0022)

Guenther



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/samba/F-10/.cvsignore,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- .cvsignore	10 Dec 2008 13:58:29 -0000	1.56
+++ .cvsignore	5 Jan 2009 14:13:05 -0000	1.57
@@ -1 +1 @@
-samba-3.2.6.tar.gz
+samba-3.2.7.tar.gz


Index: samba.spec
===================================================================
RCS file: /cvs/pkgs/rpms/samba/F-10/samba.spec,v
retrieving revision 1.164
retrieving revision 1.165
diff -u -r1.164 -r1.165
--- samba.spec	10 Dec 2008 13:58:29 -0000	1.164
+++ samba.spec	5 Jan 2009 14:13:05 -0000	1.165
@@ -1,5 +1,5 @@
-%define main_release 24
-%define samba_version 3.2.6
+%define main_release 25
+%define samba_version 3.2.7
 %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.6
+Version: 3.2.7
 Release: %{samba_release}
 License: GPLv3+ and LGPLv3+
 Group: System Environment/Daemons
@@ -824,6 +824,9 @@
 %{_datadir}/pixmaps/samba/logo-small.png
 
 %changelog
+* Mon Jan  5 2009 Guenther Deschner <gdeschner at redhat.com> - 3.2.7-0.25
+- Update to 3.2.7 (Security fix for CVE-2009-0022)
+
 * Wed Dec 10 2008 Guenther Deschner <gdeschner at redhat.com> - 3.2.6-0.24
 - Update to 3.2.6
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/samba/F-10/sources,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- sources	10 Dec 2008 13:58:29 -0000	1.60
+++ sources	5 Jan 2009 14:13:05 -0000	1.61
@@ -1 +1 @@
-0cd27c7afbb8211616eea4010f32271c  samba-3.2.6.tar.gz
+528677f261f3ed4a58f9483ca25ba6b2  samba-3.2.7.tar.gz



From stransky at fedoraproject.org  Mon Jan  5 14:15:30 2009
From: stransky at fedoraproject.org (Martin Stransky)
Date: Mon,  5 Jan 2009 14:15:30 +0000 (UTC)
Subject: rpms/seamonkey/F-10 seamonkey-mozconfig, 1.4, 1.5 seamonkey.spec,
	1.47, 1.48
Message-ID: <20090105141530.585B970108@cvs1.fedora.phx.redhat.com>

Author: stransky

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

Modified Files:
	seamonkey-mozconfig seamonkey.spec 
Log Message:
 disabled -O2 optimalization for i386 as a workaround for #468415


Index: seamonkey-mozconfig
===================================================================
RCS file: /cvs/pkgs/rpms/seamonkey/F-10/seamonkey-mozconfig,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- seamonkey-mozconfig	14 Feb 2008 22:09:41 -0000	1.4
+++ seamonkey-mozconfig	5 Jan 2009 14:14:59 -0000	1.5
@@ -7,7 +7,8 @@
 ac_add_options --disable-tests
 ac_add_options --disable-debug
 ac_add_options --disable-installer
-ac_add_options --enable-optimize="$RPM_OPT_FLAGS"
+#Workaround for BZ468415
+#ac_add_options --enable-optimize="$RPM_OPT_FLAGS"
 ac_add_options --enable-xinerama
 ac_add_options --enable-default-toolkit=gtk2
 ac_add_options --disable-xprint


Index: seamonkey.spec
===================================================================
RCS file: /cvs/pkgs/rpms/seamonkey/F-10/seamonkey.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- seamonkey.spec	18 Dec 2008 00:17:19 -0000	1.47
+++ seamonkey.spec	5 Jan 2009 14:14:59 -0000	1.48
@@ -12,7 +12,7 @@
 Name:           seamonkey
 Summary:        Web browser, e-mail, news, IRC client, HTML editor
 Version:        1.1.14
-Release:        1%{?dist}
+Release:        2%{?dist}
 URL:            http://www.mozilla.org/projects/seamonkey/
 License:        MPLv1.1
 Group:          Applications/Internet
@@ -156,7 +156,12 @@
 BUILD_OFFICIAL=1 MOZILLA_OFFICIAL=1 \
 ./configure --prefix=%{_prefix} --libdir=%{_libdir} \
 --with-default-mozilla-five-home=%{mozdir} \
---mandir=%{_mandir}
+--mandir=%{_mandir} \
+%ifarch i386
+--enable-optimize="$RPM_OPT_FLAGS"" -O0" \
+%else
+--enable-optimize="$RPM_OPT_FLAGS" \
+%endif
 
 BUILD_OFFICIAL=1 MOZILLA_OFFICIAL=1 make export
 BUILD_OFFICIAL=1 MOZILLA_OFFICIAL=1 make %{?_smp_mflags} libs
@@ -432,6 +437,8 @@
 
 
 %changelog
+* Mon Jan 5 2009 Martin Stransky <stransky at redhat.com> 1.1.14-2
+- disabled -O2 optimalization for i386 as a workaround for #468415
 * Wed Dec 17 2008 Kai Engert <kengert at redhat.com> - 1.1.14-1
 - Update to 1.1.14
 * Wed Nov 12 2008 Christopher Aillon <caillon at redhat.com> - 1.1.13-1



From buc at fedoraproject.org  Mon Jan  5 14:19:17 2009
From: buc at fedoraproject.org (Dmitry Butskoy)
Date: Mon,  5 Jan 2009 14:19:17 +0000 (UTC)
Subject: rpms/newscache/F-10 newscache.spec,1.8,1.9
Message-ID: <20090105141917.F3CEE70108@cvs1.fedora.phx.redhat.com>

Author: buc

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

Modified Files:
	newscache.spec 
Log Message:



Index: newscache.spec
===================================================================
RCS file: /cvs/extras/rpms/newscache/F-10/newscache.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- newscache.spec	15 Feb 2008 14:56:32 -0000	1.8
+++ newscache.spec	5 Jan 2009 14:18:47 -0000	1.9
@@ -4,7 +4,7 @@
 Name: 		newscache
 Summary: 	Free cache server for USENET News
 Version: 	1.2
-Release: 	0.6.rc6%{?dist}
+Release: 	0.7.rc6%{?dist}
 Group: 		System Environment/Daemons
 License:	GPLv2+
 URL:		http://www.linuxhacker.at/newscache/
@@ -16,6 +16,7 @@
 Patch2:		newscache-1.2rc6-gcc43.patch
 BuildRequires:	libtool, texinfo, pam-devel
 
+Requires(pre): shadow-utils
 Requires(post):	/sbin/chkconfig
 Requires(preun): /sbin/chkconfig, /sbin/service
 Requires(postun): /sbin/service
@@ -100,6 +101,14 @@
 popd
 
 
+%pre
+
+getent group news >/dev/null || groupadd -r news
+getent passwd news >/dev/null || \
+    useradd -r -g news -d /etc/news -s /sbin/nologin -c 'News user' news
+exit 0
+
+
 %post
 
 /sbin/chkconfig --add %{name}
@@ -137,6 +146,9 @@
 
 
 %changelog
+* Mon Jan  5 2009 Dmitry Butskoy <Dmitry at Butskoy.name> - 1.2-0.7.rc6
+- Add news user and group (#478785) since Fedora 10
+
 * Fri Feb 15 2008 Dmitry Butskoy <Dmitry at Butskoy.name> - 1.2-0.6.rc6
 - change initscript to comply with the LSB standards
 



From dhavalgiani at fedoraproject.org  Mon Jan  5 14:20:01 2009
From: dhavalgiani at fedoraproject.org (Dhaval Giani)
Date: Mon,  5 Jan 2009 14:20:01 +0000 (UTC)
Subject: rpms/libcgroup/F-10 libcgroup.spec,1.6,1.7
Message-ID: <20090105142001.A176E70108@cvs1.fedora.phx.redhat.com>

Author: dhavalgiani

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

Modified Files:
	libcgroup.spec 
Log Message:
Add redhat-lsb dependency



Index: libcgroup.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libcgroup/F-10/libcgroup.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- libcgroup.spec	29 Dec 2008 14:09:35 -0000	1.6
+++ libcgroup.spec	5 Jan 2009 14:19:31 -0000	1.7
@@ -2,7 +2,7 @@
 Summary: Tools and libraries to control and monitor control groups
 Group: Development/Libraries
 Version: 0.32.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 License: LGPLv2+
 URL: http://libcg.sourceforge.net/
 Source0: http://downloads.sourceforge.net/libcg/%{name}-%{version}.tar.bz2
@@ -16,6 +16,7 @@
 Requires(post): initscripts
 Requires(preun): initscripts
 Requires(preun): chkconfig
+Requires: redhat-lsb
 
 %description
 Control groups infrastructure. The tools and library help manipulate, control,
@@ -88,6 +89,8 @@
 
 
 %changelog
+* Mon Jan 05 2009 Dhaval Giani <dhaval at linux.vnet.ibm.com> 0.32.2-2
+- Fix dependency on redhat-lsb
 * Mon Dec 29 2008 Dhaval Giani <dhaval at linux.vnet.ibm.com> 0.32.2-1
 - Update to latest upstream
 * Thu Oct 23 2008 Dhaval Giani <dhaval at linux.vnet.ibm.com> 0.32.1-1



From ovasik at fedoraproject.org  Mon Jan  5 14:20:09 2009
From: ovasik at fedoraproject.org (Ondrej Vasik)
Date: Mon,  5 Jan 2009 14:20:09 +0000 (UTC)
Subject: rpms/tar/devel tar-1.21-testsuite.patch, NONE, 1.1 .cvsignore, 1.14,
	1.15 sources, 1.16, 1.17 tar.spec, 1.75,
	1.76 tar-1.19-null-terminator.patch, 1.1, NONE
Message-ID: <20090105142009.027ED70108@cvs1.fedora.phx.redhat.com>

Author: ovasik

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

Modified Files:
	.cvsignore sources tar.spec 
Added Files:
	tar-1.21-testsuite.patch 
Removed Files:
	tar-1.19-null-terminator.patch 
Log Message:
new upstream release 1.21, fix testsuite failure, remove already applied patches

tar-1.21-testsuite.patch:

--- NEW FILE tar-1.21-testsuite.patch ---
From: Sergey Poznyakoff <gray at gnu.org.ua>
Date: Mon, 29 Dec 2008 09:27:00 +0000 (+0000)
Subject: Fix testsuite and bootstrap. Implement -I.
X-Git-Url: http://git.savannah.gnu.org/gitweb/?p=tar.git;a=commitdiff_plain;h=7b68ef3d918603f3afb03e939ba72f5cad10edf4;hp=970f999818a52a107a89697666c54397403c09be

Fix testsuite. Implement -I.

* src/tar.c: Implement -I as a shorthand for --use-compress-program.
* doc/tar.texi: Document -I.
* tests/pipe.at, tests/shortrec.at: Account for eventual 'Record
size' output.
* tests/testsuite.at (AT_TAR_CHECK_HOOK): New define
(AT_TAR_WITH_HOOK, TAR_IGNREC_HOOK): New macros.
---

diff --git a/ChangeLog b/ChangeLog
index 7dd05f8..68fe50a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2008-12-29  Sergey Poznyakoff  <gray at gnu.org.ua>
+
+	* src/tar.c: Implement -I as a shorthand for --use-compress-program.
+	* doc/tar.texi: Document -I.
+	* tests/pipe.at, tests/shortrec.at: Account for eventual 'Record
+	size' output.
+	* tests/testsuite.at (AT_TAR_CHECK_HOOK): New define
+	(AT_TAR_WITH_HOOK, TAR_IGNREC_HOOK): New macros.
+
 2008-11-30  Sergey Poznyakoff  <gray at gnu.org.ua>
 
 	* src/xheader.c: Remove duplicate inclusion of fnmatch.h. Reported
diff --git a/doc/tar.texi b/doc/tar.texi
index cb8bd19..210639e 100644
--- a/doc/tar.texi
+++ b/doc/tar.texi
@@ -3309,6 +3309,7 @@ name quoting}.
 
 @opsummary{use-compress-program}
 @item --use-compress-program=@var{prog}
+ at itemx -I=@var{prog}
 
 Instructs @command{tar} to access the archive through @var{prog}, which is
 presumed to be a compression program of some sort.  @xref{gzip}.
@@ -8570,6 +8571,7 @@ Filter the archive through @command{compress}.  Otherwise like @option{--gzip}.
 
 @opindex use-compress-program
 @item --use-compress-program=@var{prog}
+ at itemx -I=@var{prog}
 Use external compression program @var{prog}.  Use this option if you
 have a compression program that @GNUTAR{} does not support.  There
 are two requirements to which @var{prog} should comply:
@@ -8608,14 +8610,14 @@ Suppose you name it @file{gpgz} and save it somewhere in your
 archive signed with your private key:
 
 @smallexample
-$ @kbd{tar -cf foo.tar.gpgz --use-compress=gpgz .}
+$ @kbd{tar -cf foo.tar.gpgz -Igpgz .}
 @end smallexample
 
 @noindent
-Likewise, the following command will list its contents:
+Likewise, the command below will list its contents:
 
 @smallexample
-$ @kbd{tar -tf foo.tar.gpgz --use-compress=gpgz .}
+$ @kbd{tar -tf foo.tar.gpgz -Igpgz .}
 @end smallexample
 
 @ignore
diff --git a/src/tar.c b/src/tar.c
index ae0c739..8396ad5 100644
--- a/src/tar.c
+++ b/src/tar.c
@@ -323,7 +323,6 @@ enum
   TRANSFORM_OPTION,
   UNQUOTE_OPTION,
   USAGE_OPTION,
-  USE_COMPRESS_PROGRAM_OPTION,
   UTC_OPTION,
   VERSION_OPTION,
   VOLNO_FILE_OPTION,
@@ -352,7 +351,7 @@ The version control may be set with --backup or VERSION_CONTROL, values are:\n\n
 
 /* NOTE:
 
-   Available option letters are DEIQY and eqy. Consider the following
+   Available option letters are DEQY and eqy. Consider the following
    assignments:
 
    [For Solaris tar compatibility =/= Is it important at all?]
@@ -360,7 +359,6 @@ The version control may be set with --backup or VERSION_CONTROL, values are:\n\n
    E  use extended headers (--format=posix)
 
    [q  alias for --occurrence=1 =/= this would better be used for quiet?]
-   [I  same as T =/= will harm star compatibility]
 
    y  per-file gzip compression
    Y  per-block gzip compression */
@@ -610,7 +608,7 @@ static struct argp_option options[] = {
    N_("filter the archive through lzma"), GRID+1 },
   {"lzop", LZOP_OPTION, 0, 0,
    N_("filter the archive through lzop"), GRID+8 },
-  {"use-compress-program", USE_COMPRESS_PROGRAM_OPTION, N_("PROG"), 0,
+  {"use-compress-program", 'I', N_("PROG"), 0,
    N_("filter through PROG (must accept -d)"), GRID+1 },
 #undef GRID
   
@@ -1364,12 +1362,6 @@ parse_opt (int key, char *arg, struct argp_state *state)
       ignore_zeros_option = true;
       break;
 
-    case 'I':
-      USAGE_ERROR ((0, 0,
-		    _("Warning: the -I option is not supported;"
-		      " perhaps you meant -j or -T?")));
-      break;
-
     case 'j':
       set_use_compress_program_option ("bzip2");
       break;
@@ -1905,7 +1897,7 @@ parse_opt (int key, char *arg, struct argp_state *state)
       set_transform_expr (arg);
       break;
 
-    case USE_COMPRESS_PROGRAM_OPTION:
+    case 'I':
       set_use_compress_program_option (arg);
       break;
 
diff --git a/tests/pipe.at b/tests/pipe.at
index efca65b..be99212 100644
--- a/tests/pipe.at
+++ b/tests/pipe.at
@@ -1,7 +1,7 @@
 # Process this file with autom4te to create testsuite. -*- Autotest -*-
 
 # Test suite for GNU tar.
-# Copyright (C) 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
+# Copyright (C) 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -30,7 +30,8 @@ AT_SETUP([decompressing from stdin])
 
 AT_KEYWORDS([pipe])
 
-AT_TAR_CHECK([
+AT_TAR_WITH_HOOK([TAR_IGNREC_HOOK],
+[AT_TAR_CHECK([
 AT_SORT_PREREQ
 
 mkdir directory
@@ -49,6 +50,7 @@ directory/file1
 directory/file2
 separator
 separator
-])
+],
+[stderr])])
 
 AT_CLEANUP
diff --git a/tests/shortrec.at b/tests/shortrec.at
index 3e009fd..179f365 100644
--- a/tests/shortrec.at
+++ b/tests/shortrec.at
@@ -1,7 +1,7 @@
 # Process this file with autom4te to create testsuite. -*- Autotest -*-
 
 # Test suite for GNU tar.
-# Copyright (C) 2005, 2007 Free Software Foundation, Inc.
+# Copyright (C) 2005, 2007, 2008 Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -23,17 +23,22 @@
 # used to create the archive.
 
 AT_SETUP([short records])
-AT_KEYWORDS([shortrec.at])
+AT_KEYWORDS([shortrec])
 
-AT_TAR_CHECK([
+AT_TAR_WITH_HOOK([TAR_IGNREC_HOOK],
+[AT_TAR_CHECK([
 mkdir directory
 (cd directory && touch a b c d e f g h i j k l m n o p q r)
-tar -c -b 1 -f - directory | tar -t -f - >/dev/null
+tar -c -b 1 -f - directory | tar -t -f - 
 tar -c -b 1 -f archive directory
-tar -t -f archive >/dev/null
-tar -t -f - < archive >/dev/null
+tar -t -f archive 
+tar -t -f - < archive 
 
 rm -r directory
+],
+[0],
+[ignore],
+[stderr])
 ])
 
 AT_CLEANUP
diff --git a/tests/testsuite.at b/tests/testsuite.at
index 2fa5392..a12477d 100644
--- a/tests/testsuite.at
+++ b/tests/testsuite.at
@@ -1,7 +1,7 @@
 # Process this file with autom4te to create testsuite. -*- Autotest -*-
 
 # Test suite for GNU tar.
-# Copyright (C) 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
+# Copyright (C) 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -21,6 +21,7 @@
 # We need a recent Autotest.
 m4_version_prereq([2.52g])
 
+m4_define([AT_TAR_CHECK_HOOK])
 m4_define([AT_TAR_CHECK],[
   AT_XFAIL_IF(test -f $[]XFAILFILE)
   m4_foreach([FMT],
@@ -33,9 +34,20 @@ export TEST_TAR_FORMAT
 TAR_OPTIONS="-H FMT"
 export TAR_OPTIONS
 rm -rf *
-$1)],$2,$3,$4,$5,$6)])
+$1)],$2,$3,$4,$5,$6)
+              AT_TAR_CHECK_HOOK])
 ])
 
+m4_define([AT_TAR_WITH_HOOK],[
+  m4_pushdef([AT_TAR_CHECK_HOOK],[$1])
+  $2
+  
+  m4_popdef([AT_TAR_CHECK_HOOK])])
+
+m4_define([TAR_IGNREC_HOOK],[
+  AT_CHECK([grep -v '^.*tar: Record size = ' stderr; exit 0])
+])
+  
 m4_define([RE_CHECK],[
 AT_DATA([$1.re],[$2])
 awk '{print NR " " $[]0}' $1 > $[]$.1


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tar/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	26 May 2008 17:02:24 -0000	1.14
+++ .cvsignore	5 Jan 2009 14:19:38 -0000	1.15
@@ -1,2 +1,2 @@
-tar-1.20.tar.gz
-tar-1.20.tar.gz.sig
+tar-1.21.tar.gz
+tar-1.21.tar.gz.sig


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tar/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources	26 May 2008 17:02:24 -0000	1.16
+++ sources	5 Jan 2009 14:19:38 -0000	1.17
@@ -1,2 +1,2 @@
-c1a4ff43157ac60dd4b96dab09a3197c  tar-1.20.tar.gz
-0c5eaacc1805750d2701bda133c6f654  tar-1.20.tar.gz.sig
+e7ae56b3bf924d5108b57b544b247c50  tar-1.21.tar.gz
+cceab48ed4cdd0c5e2de825e59797820  tar-1.21.tar.gz.sig


Index: tar.spec
===================================================================
RCS file: /cvs/extras/rpms/tar/devel/tar.spec,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- tar.spec	11 Dec 2008 12:25:22 -0000	1.75
+++ tar.spec	5 Jan 2009 14:19:38 -0000	1.76
@@ -1,8 +1,8 @@
 Summary: A GNU file archiving program
 Name: tar
 Epoch: 2
-Version: 1.20
-Release: 6%{?dist}
+Version: 1.21
+Release: 1%{?dist}
 License: GPLv3+
 Group: Applications/Archiving
 URL: http://www.gnu.org/software/tar/
@@ -14,8 +14,7 @@
 Patch3: tar-1.19-xattrs.patch
 Patch4: tar-1.19-xattrs-conf.patch
 Patch5: tar-1.17-wildcards.patch
-Patch6: tar-1.19-null-terminator.patch
-Patch7: tar-1.16-multiVolLabels.patch
+Patch6: tar-1.21-testsuite.patch
 Prereq: info
 BuildRequires: autoconf automake gzip texinfo gettext libacl-devel libselinux-devel gawk rsh
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -41,8 +40,7 @@
 %patch3 -p1 -b .xattrs
 %patch4 -p1 -b .xattrs-conf
 %patch5 -p1 -b .wildcards
-%patch6 -p1 -b .nullterm
-%patch7 -p1 -b .multiVolLabels
+%patch6 -p1 -b .testsuite
 
 %build
 %configure --bindir=/bin --libexecdir=/sbin
@@ -93,6 +91,10 @@
 %{_infodir}/tar.info*
 
 %changelog
+* Mon Jan 05 2009 Ondrej Vasik <ovasik at redhat.com> 2:1.21-1
+- New upstream release 1.21, removed applied patches
+- add support for -I option, fix testsuite failure
+
 * Thu Dec 11 2008 Ondrej Vasik <ovasik at redhat.com> 2:1.20-6
 - add BuildRequires for rsh (#475950)
 


--- tar-1.19-null-terminator.patch DELETED ---



From buc at fedoraproject.org  Mon Jan  5 14:22:02 2009
From: buc at fedoraproject.org (Dmitry Butskoy)
Date: Mon,  5 Jan 2009 14:22:02 +0000 (UTC)
Subject: rpms/newscache/devel newscache.spec,1.8,1.9
Message-ID: <20090105142202.D00BE70108@cvs1.fedora.phx.redhat.com>

Author: buc

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

Modified Files:
	newscache.spec 
Log Message:



Index: newscache.spec
===================================================================
RCS file: /cvs/extras/rpms/newscache/devel/newscache.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- newscache.spec	15 Feb 2008 14:56:32 -0000	1.8
+++ newscache.spec	5 Jan 2009 14:21:32 -0000	1.9
@@ -4,7 +4,7 @@
 Name: 		newscache
 Summary: 	Free cache server for USENET News
 Version: 	1.2
-Release: 	0.6.rc6%{?dist}
+Release: 	0.7.rc6%{?dist}
 Group: 		System Environment/Daemons
 License:	GPLv2+
 URL:		http://www.linuxhacker.at/newscache/
@@ -16,6 +16,7 @@
 Patch2:		newscache-1.2rc6-gcc43.patch
 BuildRequires:	libtool, texinfo, pam-devel
 
+Requires(pre): shadow-utils
 Requires(post):	/sbin/chkconfig
 Requires(preun): /sbin/chkconfig, /sbin/service
 Requires(postun): /sbin/service
@@ -100,6 +101,14 @@
 popd
 
 
+%pre
+
+getent group news >/dev/null || groupadd -r news
+getent passwd news >/dev/null || \
+    useradd -r -g news -d /etc/news -s /sbin/nologin -c 'News user' news
+exit 0
+
+
 %post
 
 /sbin/chkconfig --add %{name}
@@ -137,6 +146,9 @@
 
 
 %changelog
+* Mon Jan  5 2009 Dmitry Butskoy <Dmitry at Butskoy.name> - 1.2-0.7.rc6
+- Add news user and group (#478785) since Fedora 10
+
 * Fri Feb 15 2008 Dmitry Butskoy <Dmitry at Butskoy.name> - 1.2-0.6.rc6
 - change initscript to comply with the LSB standards
 



From tbzatek at fedoraproject.org  Mon Jan  5 14:22:32 2009
From: tbzatek at fedoraproject.org (Tomas Bzatek)
Date: Mon,  5 Jan 2009 14:22:32 +0000 (UTC)
Subject: rpms/gnome-keyring/devel .cvsignore, 1.52, 1.53 gnome-keyring.spec, 
	1.104, 1.105 sources, 1.52, 1.53 init-dbus-later.patch, 1.1, NONE
Message-ID: <20090105142232.A31E670108@cvs1.fedora.phx.redhat.com>

Author: tbzatek

Update of /cvs/extras/rpms/gnome-keyring/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29632

Modified Files:
	.cvsignore gnome-keyring.spec sources 
Removed Files:
	init-dbus-later.patch 
Log Message:
* Mon Jan  5 2009 Tomas Bzatek <tbzatek at redhat.com> - 2.25.4-1
- Update to 2.25.4



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-keyring/devel/.cvsignore,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- .cvsignore	12 Dec 2008 05:32:34 -0000	1.52
+++ .cvsignore	5 Jan 2009 14:22:02 -0000	1.53
@@ -1 +1 @@
-gnome-keyring-2.25.2.tar.bz2
+gnome-keyring-2.25.4.tar.bz2


Index: gnome-keyring.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-keyring/devel/gnome-keyring.spec,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -r1.104 -r1.105
--- gnome-keyring.spec	20 Dec 2008 19:49:16 -0000	1.104
+++ gnome-keyring.spec	5 Jan 2009 14:22:02 -0000	1.105
@@ -7,8 +7,8 @@
 
 Summary: Framework for managing passwords and other secrets
 Name: gnome-keyring
-Version: 2.25.2
-Release: 3%{?dist}
+Version: 2.25.4
+Release: 1%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Libraries
 Source: http://download.gnome.org/sources/gnome-keyring/2.24/gnome-keyring-%{version}.tar.bz2
@@ -30,10 +30,6 @@
 Requires(preun): GConf2
 Requires(post): GConf2
 
-# https://bugzilla.redhat.com/show_bug.cgi?id=476300
-# http://mail.gnome.org/archives/gnome-keyring-list/2008-December/msg00004.html
-Patch0: init-dbus-later.patch
-
 %description
 The gnome-keyring session daemon manages passwords and other types of 
 secrets for the user, storing them encrypted with a main password. 
@@ -68,7 +64,6 @@
 
 %prep
 %setup -q -n gnome-keyring-%{version}
-%patch0 -p1 -b .init-dbus-later
 
 %build
 %configure --disable-gtk-doc --with-pam-dir=/%{_lib}/security --disable-acl-prompts
@@ -83,6 +78,7 @@
 rm $RPM_BUILD_ROOT/%{_lib}/security/*.la
 rm $RPM_BUILD_ROOT%{_libdir}/*.la
 rm $RPM_BUILD_ROOT%{_libdir}/gnome-keyring/*.la
+rm $RPM_BUILD_ROOT%{_libdir}/gnome-keyring/devel/*.la
 
 %find_lang gnome-keyring
 
@@ -115,6 +111,7 @@
 %{_libdir}/lib*.so.*
 %dir %{_libdir}/gnome-keyring
 %{_libdir}/gnome-keyring/gnome-keyring-pkcs11.so
+%{_libdir}/gnome-keyring/devel/*.so
 # GPL
 %{_bindir}/*
 %{_libexecdir}/*
@@ -136,6 +133,9 @@
 
 
 %changelog
+* Mon Jan  5 2009 Tomas Bzatek <tbzatek at redhat.com> - 2.25.4-1
+- Update to 2.25.4
+
 * Sat Dec 20 2008 Ray Strode <rstrode at redhat.com> - 2.25.2-3
 - Init dbus later (fixes ssh-agent,
   patch from Yanko Kaneti, bug 476300)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-keyring/devel/sources,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- sources	12 Dec 2008 05:32:34 -0000	1.52
+++ sources	5 Jan 2009 14:22:02 -0000	1.53
@@ -1 +1 @@
-8e0ec750d5af38d86f12491b48a9c390  gnome-keyring-2.25.2.tar.bz2
+801b581f3ca0a4554ceac774eaa60f1d  gnome-keyring-2.25.4.tar.bz2


--- init-dbus-later.patch DELETED ---



From rdieter at fedoraproject.org  Mon Jan  5 14:37:48 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon,  5 Jan 2009 14:37:48 +0000 (UTC)
Subject: rpms/digikam/devel .cvsignore, 1.28, 1.29 digikam.spec, 1.78,
	1.79 sources, 1.28, 1.29
Message-ID: <20090105143748.A2A0670108@cvs1.fedora.phx.redhat.com>

Author: rdieter

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

Modified Files:
	.cvsignore digikam.spec sources 
Log Message:
* Mon Jan 05 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.10.0-0.12.beta8
- digikam-0.10.0-beta8



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/digikam/devel/.cvsignore,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- .cvsignore	19 Dec 2008 17:09:54 -0000	1.28
+++ .cvsignore	5 Jan 2009 14:37:18 -0000	1.29
@@ -1 +1 @@
-digikam-0.10.0-beta7.tar.bz2
+digikam-0.10.0-beta8.tar.bz2


Index: digikam.spec
===================================================================
RCS file: /cvs/pkgs/rpms/digikam/devel/digikam.spec,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- digikam.spec	22 Dec 2008 20:48:25 -0000	1.78
+++ digikam.spec	5 Jan 2009 14:37:18 -0000	1.79
@@ -1,8 +1,8 @@
-%define beta beta7
+%define beta beta8
 
 Name:	 digikam
 Version: 0.10.0
-Release: 0.11.%{beta}%{?dist}
+Release: 0.12.%{beta}%{?dist}
 Summary: A digital camera accessing & photo management application
 
 Group:	 Applications/Multimedia
@@ -149,6 +149,9 @@
 
 
 %changelog
+* Mon Jan 05 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.10.0-0.12.beta8
+- digikam-0.10.0-beta8
+
 * Mon Dec 22 2008 Rex Dieter <rdieter at fedoraproject.org> - 0.10.0-0.11.beta7
 - BR: libkipi-devel >= 0.3.0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/digikam/devel/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- sources	19 Dec 2008 17:09:55 -0000	1.28
+++ sources	5 Jan 2009 14:37:18 -0000	1.29
@@ -1 +1 @@
-81b4ab94d9312d685e21796829aa31f9  digikam-0.10.0-beta7.tar.bz2
+1e256ed34d4d7d6b90def644b66f7fa9  digikam-0.10.0-beta8.tar.bz2



From rdieter at fedoraproject.org  Mon Jan  5 14:38:07 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon,  5 Jan 2009 14:38:07 +0000 (UTC)
Subject: rpms/kipi-plugins/devel .cvsignore, 1.23, 1.24 kipi-plugins.spec,
	1.75, 1.76 sources, 1.23, 1.24
Message-ID: <20090105143807.2203970108@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kipi-plugins/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3731

Modified Files:
	.cvsignore kipi-plugins.spec sources 
Log Message:
* Mon Jan 05 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.2.0-0.11.beta6
- kipi-plugins-0.2.0-beta6



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kipi-plugins/devel/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- .cvsignore	16 Dec 2008 16:54:24 -0000	1.23
+++ .cvsignore	5 Jan 2009 14:37:36 -0000	1.24
@@ -1 +1 @@
-kipi-plugins-0.2.0-beta5.tar.bz2
+kipi-plugins-0.2.0-beta6.tar.bz2


Index: kipi-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kipi-plugins/devel/kipi-plugins.spec,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- kipi-plugins.spec	22 Dec 2008 20:52:51 -0000	1.75
+++ kipi-plugins.spec	5 Jan 2009 14:37:36 -0000	1.76
@@ -1,11 +1,11 @@
 # Fedora review: http://bugzilla.redhat.com/171504
 
-%define beta beta5
+%define beta beta6
 
 Name:    kipi-plugins
 Summary: Plugins to use with Kipi
 Version: 0.2.0
-Release: 0.10.%{beta}%{?dist}
+Release: 0.11.%{beta}%{?dist}
 
 License: GPLv2+
 Group:   Applications/Multimedia
@@ -143,6 +143,9 @@
 
 
 %changelog
+* Mon Jan 05 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.2.0-0.11.beta6
+- kipi-plugins-0.2.0-beta6
+
 * Mon Dec 22 2008 Rex Dieter <rdieter at fedoraproject.org> - 0.2.0-0.10.beta5
 - tighten BR's (libkipi >= 0.3.0 mostly)
 
@@ -150,7 +153,7 @@
 - respin (exiv2)
 
 * Mon Dec 15 2008 Rex Dieter <rdieter at fedoraproject.org> 0.2.0-0.8.beta5
-- kipi-plugins-0.0.2-beta5
+- kipi-plugins-0.2.0-beta5
 - %%description: reorder (alphabetic), simplify
 
 * Thu Dec 04 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 0.2.0-0.7.beta4


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kipi-plugins/devel/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sources	16 Dec 2008 16:54:25 -0000	1.23
+++ sources	5 Jan 2009 14:37:36 -0000	1.24
@@ -1 +1 @@
-4a3b382fd20e8075830132b333ae44d1  kipi-plugins-0.2.0-beta5.tar.bz2
+0442a58f2f9a68163025c205d89269d0  kipi-plugins-0.2.0-beta6.tar.bz2



From dhavalgiani at fedoraproject.org  Mon Jan  5 14:44:30 2009
From: dhavalgiani at fedoraproject.org (Dhaval Giani)
Date: Mon,  5 Jan 2009 14:44:30 +0000 (UTC)
Subject: rpms/libcgroup/devel libcgroup.spec,1.7,1.8
Message-ID: <20090105144430.1937070108@cvs1.fedora.phx.redhat.com>

Author: dhavalgiani

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

Modified Files:
	libcgroup.spec 
Log Message:
Fix runtime dependency on redhat-lsb



Index: libcgroup.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libcgroup/devel/libcgroup.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- libcgroup.spec	29 Dec 2008 13:51:46 -0000	1.7
+++ libcgroup.spec	5 Jan 2009 14:43:59 -0000	1.8
@@ -2,7 +2,7 @@
 Summary: Tools and libraries to control and monitor control groups
 Group: Development/Libraries
 Version: 0.32.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 License: LGPLv2+
 URL: http://libcg.sourceforge.net/
 Source0: http://downloads.sourceforge.net/libcg/%{name}-%{version}.tar.bz2
@@ -16,6 +16,7 @@
 Requires(post): initscripts
 Requires(preun): initscripts
 Requires(preun): chkconfig
+Requires: redhat-lsb
 
 %description
 Control groups infrastructure. The tools and library help manipulate, control,
@@ -88,6 +89,8 @@
 
 
 %changelog
+* Mon Jan 05 2009 Dhaval Giani <dhaval at linux.vnet.ibm.com> 0.32.2-3
+- Fix redhat-lsb dependency
 * Mon Dec 29 2008 Dhaval Giani <dhaval at linux.vnet.ibm.com> 0.32.2-2
 - Fix build dependencies
 * Mon Dec 29 2008 Dhaval Giani <dhaval at linux.vnet.ibm.com> 0.32.2-1



From rdieter at fedoraproject.org  Mon Jan  5 14:56:05 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon,  5 Jan 2009 14:56:05 +0000 (UTC)
Subject: rpms/digikam/devel digikam.spec,1.79,1.80
Message-ID: <20090105145605.4123670108@cvs1.fedora.phx.redhat.com>

Author: rdieter

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

Modified Files:
	digikam.spec 
Log Message:
unpackaged files



Index: digikam.spec
===================================================================
RCS file: /cvs/pkgs/rpms/digikam/devel/digikam.spec,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- digikam.spec	5 Jan 2009 14:37:18 -0000	1.79
+++ digikam.spec	5 Jan 2009 14:55:34 -0000	1.80
@@ -130,6 +130,7 @@
 %{_kde4_libdir}/kde4/*.so
 %{_kde4_appsdir}/digikam/
 %{_kde4_appsdir}/showfoto/
+%{_kde4_appsdir}/solid/actions/*.desktop
 %{_kde4_datadir}/applications/kde4/*.desktop
 %{_kde4_iconsdir}/hicolor/*/*/*
 %{_kde4_iconsdir}/oxygen/*/*/*



From vcrhonek at fedoraproject.org  Mon Jan  5 14:56:17 2009
From: vcrhonek at fedoraproject.org (Vitezslav Crhonek)
Date: Mon,  5 Jan 2009 14:56:17 +0000 (UTC)
Subject: rpms/ypbind/devel nis.sh,NONE,1.1 ypbind.spec,1.55,1.56
Message-ID: <20090105145617.862A970108@cvs1.fedora.phx.redhat.com>

Author: vcrhonek

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

Modified Files:
	ypbind.spec 
Added Files:
	nis.sh 
Log Message:
Ship helper script for dhclient


--- NEW FILE nis.sh ---
#!/bin/bash
#
# nis.sh: dhclient-script plugin for NIS settings,
#         place in /etc/dhcp/dhclient.d and 'chmod +x nis.sh' to enable
#
# 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 General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program.  If not, see <http://www.gnu.org/licenses/>.
#
# Author(s): David Cantrell <dcantrell at redhat.com>
#

CONF=/etc/yp.conf

save_config_file() {
    origfile="${1}"
    savefile="${SAVEDIR}/${origfile##*/}.predhclient.${interface}"

    if [ ! -d ${SAVEDIR} ]; then
        mkdir -p ${SAVEDIR}
    fi

    if [ -e ${origfile} ]; then
        mv ${origfile} ${savefile}
    else
        echo > ${savefile}
    fi

    restorecon ${savefile} >/dev/null 2>&1
}

nis_config() {
    if [ ! "${PEERNIS}" = "no" ]; then
        if [ -n "${new_nis_domain}" ]; then
            domainname "${new_nis_domain}"
            save_config_file ${CONF}
            let contents=0
            echo '# generated by /sbin/dhclient-script' > ${CONF}

            if [ -n "${new_nis_servers}" ]; then
                for i in ${new_nis_servers} ; do
                    echo "domain ${new_nis_domain} server ${i}" >> ${CONF}
                    let contents=contents+1
                done
            else
                echo "domain ${new_nis_domain} broadcast" >> ${CONF}
                let contents=contents+1
            fi

            if [ ${contents} -gt 0 ]; then
                if [ -x /etc/rc.d/init.d/ypbind ] &&
                   [ -r /var/run/ypbind.pid ]; then
                    service ypbind restart >/dev/null 2>&1
                fi
            fi
        elif [ -n "${new_nis_servers}" ]; then
            save_config_file ${CONF}
            echo '# generated by /sbin/dhclient-script' > ${CONF}
            let contents=0

            for i in ${new_nis_servers} ; do
                echo "ypserver ${i}" >> ${CONF}
                let contents=contents+1
            done

            if [ $contents -gt 0 ]; then
                if [ -x /etc/rc.d/init.d/ypbind ] &&
                   [ -r /var/run/ypbind.pid ]; then
                    service ypbind restart >/dev/null 2>&1
                fi
            fi
        fi
    fi
}

nis_restore() {
    if [ ! "${PEERNIS}" = "no" ]; then
        if [ -f ${SAVEDIR}/${CONF}.predhclient.${interface} ]; then
            rm -f ${CONF}
            mv -f ${SAVEDIR}/${CONF}.predhclient.${interface} ${CONF}
            if [ -x /etc/rc.d/init.d/ypbind ] && [ -r /var/run/ypbind.pid ]; then
                service ypbind restart >/dev/null 2>&1
            fi
        fi
    fi
}


Index: ypbind.spec
===================================================================
RCS file: /cvs/extras/rpms/ypbind/devel/ypbind.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- ypbind.spec	3 Dec 2008 13:38:21 -0000	1.55
+++ ypbind.spec	5 Jan 2009 14:55:47 -0000	1.56
@@ -1,12 +1,13 @@
 Summary: The NIS daemon which binds NIS clients to an NIS domain
 Name: ypbind
 Version: 1.20.4
-Release: 11%{?dist}
+Release: 12%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 Source0: ftp://ftp.us.kernel.org/pub/linux/utils/net/NIS/ypbind-mt-%{version}.tar.bz2
 Url: http://www.linux-nis.org/nis/ypbind-mt/index.html
 Source1: ypbind.init
+Source2: nis.sh
 Patch1: ypbind-1.11-broadcast.patch
 Patch2: ypbind-1.11-gettextdomain.patch
 Patch3: ypbind-mt-1.19-port-leak.patch
@@ -59,9 +60,10 @@
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
-mkdir -p $RPM_BUILD_ROOT/%{_initrddir} $RPM_BUILD_ROOT/var/yp/binding
+mkdir -p $RPM_BUILD_ROOT/%{_initrddir} $RPM_BUILD_ROOT/var/yp/binding $RPM_BUILD_ROOT/etc/dhcp/dhclient.d/
 install -m 644 etc/yp.conf $RPM_BUILD_ROOT/etc/yp.conf
 install -m 755 %{SOURCE1} $RPM_BUILD_ROOT/%{_initrddir}/ypbind
+install -m 755 %{SOURCE2} $RPM_BUILD_ROOT/etc/dhcp/dhclient.d/nis.sh
 
 %{find_lang} %{name}
 
@@ -87,11 +89,15 @@
 /sbin/ypbind
 %{_mandir}/*/*
 %{_initrddir}/*
+/etc/dhcp/dhclient.d/*
 %config(noreplace) /etc/yp.conf
 %dir /var/yp/binding
 %doc README NEWS
 
 %changelog
+* Mon Jan  5 2009 Vitezslav Crhonek <vcrhonek at redhat.com> - 3:1.20.4-12
+- Ship helper script for dhclient
+
 * Wed Dec  3 2008 Vitezslav Crhonek <vcrhonek at redhat.com> - 3:1.20.4-11
 - Fix verbose option man page entry
 - Add description of port option to man page



From rdieter at fedoraproject.org  Mon Jan  5 14:59:14 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon,  5 Jan 2009 14:59:14 +0000 (UTC)
Subject: rpms/kipi-plugins/devel kipi-plugins.spec,1.76,1.77
Message-ID: <20090105145914.BB16B70108@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kipi-plugins/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9548

Modified Files:
	kipi-plugins.spec 
Log Message:
+FbExport



Index: kipi-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kipi-plugins/devel/kipi-plugins.spec,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- kipi-plugins.spec	5 Jan 2009 14:37:36 -0000	1.76
+++ kipi-plugins.spec	5 Jan 2009 14:58:44 -0000	1.77
@@ -44,8 +44,9 @@
 Interface.  Currently implemented plugins are:
  * AcquireImages      : Acquire images interface
  * BatchProcessImages : Batch process images: rename, convert, borders,
-                        filters, colors, effects, resize, recompress.
+                        filters, colors, effects, resize, recompress
  * RawConverter       : Raw image converter for digital cameras
+ * FbExport           : Export images to a remote Facebook web service
  * FlickrExport       : Export images to a remote Flickr web service
  * HTMLExport         : Export images collections into HTML page
  * JpegLossLess       : process JPEG images without losing quality
@@ -115,6 +116,7 @@
 %{_kde4_libdir}/kde4/kipiplugin_acquireimages.so
 %{_kde4_libdir}/kde4/kipiplugin_calendar.so
 %{_kde4_libdir}/kde4/kipiplugin_dngconverter.so
+%{_kde4_libdir}/kde4/kipiplugin_fbexport.so
 %{_kde4_libdir}/kde4/kipiplugin_flickrexport.so
 %{_kde4_libdir}/kde4/kipiplugin_galleryexport.so
 %{_kde4_libdir}/kde4/kipiplugin_gpssync.so



From hadess at fedoraproject.org  Mon Jan  5 15:03:26 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Mon,  5 Jan 2009 15:03:26 +0000 (UTC)
Subject: rpms/gedit/devel gedit.spec,1.177,1.178
Message-ID: <20090105150326.9101D70140@cvs1.fedora.phx.redhat.com>

Author: hadess

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

Modified Files:
	gedit.spec 
Log Message:
* Mon Jan 05 2009 - Bastien Nocera <bnocera at redhat.com> - 1:2.25.2-3
- Remove some unneeded dependencies



Index: gedit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gedit/devel/gedit.spec,v
retrieving revision 1.177
retrieving revision 1.178
diff -u -r1.177 -r1.178
--- gedit.spec	5 Dec 2008 01:44:09 -0000	1.177
+++ gedit.spec	5 Jan 2009 15:02:56 -0000	1.178
@@ -18,7 +18,7 @@
 Summary:	Text editor for the GNOME desktop
 Name:		gedit
 Version: 	2.25.2
-Release: 	2%{?dist}
+Release: 	3%{?dist}
 Epoch:		1
 License:	GPLv2+ and GFDL
 Group:		Applications/Editors
@@ -46,8 +46,6 @@
 BuildRequires: glib2-devel >= %{glib2_version}
 BuildRequires: pango-devel >= %{pango_version}
 BuildRequires: gtk2-devel >= %{gtk2_version}
-BuildRequires: gnome-vfs2 >= %{gnome_vfs2_version}
-BuildRequires: libgnomeui-devel >= %{libgnomeui_version}
 BuildRequires: desktop-file-utils >= %{desktop_file_utils_version}
 BuildRequires: enchant-devel >= %{enchant_version}
 BuildRequires: iso-codes-devel >= %{isocodes_version}
@@ -59,7 +57,6 @@
 BuildRequires: pygobject2-devel >= %{pygobject_version}
 BuildRequires: pygtksourceview-devel >= %{pygtksourceview_version}
 BuildRequires: python-devel
-BuildRequires: gnome-python2-desktop >= %{gnome_python_desktop_version}
 BuildRequires: gnome-doc-utils >= %{gnome_doc_utils_version}
 BuildRequires: which
 BuildRequires: autoconf, automake, libtool
@@ -222,6 +219,9 @@
 
 
 %changelog
+* Mon Jan 05 2009 - Bastien Nocera <bnocera at redhat.com> - 1:2.25.2-3
+- Remove some unneeded dependencies
+
 * Thu Dec  4 2008 Matthias Clasen <mclasen at redhat.com>
 - Rebuild for Python 2.6 
 



From rdieter at fedoraproject.org  Mon Jan  5 15:07:28 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon,  5 Jan 2009 15:07:28 +0000 (UTC)
Subject: rpms/eigen2/F-10 .cvsignore, 1.4, 1.5 eigen2.spec, 1.3, 1.4 sources,
	1.4, 1.5
Message-ID: <20090105150729.0213F70108@cvs1.fedora.phx.redhat.com>

Author: rdieter

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

Modified Files:
	.cvsignore eigen2.spec sources 
Log Message:
* Sun Jan 04 2009 Rex Dieter <rdieter at fedoraproject.org> 2.0-0.6.beta4
- eigen-2.0-beta4



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/eigen2/F-10/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	4 Jan 2009 19:46:19 -0000	1.4
+++ .cvsignore	5 Jan 2009 15:06:58 -0000	1.5
@@ -1 +1 @@
-eigen-2.0-beta2.tar.bz2
+eigen-2.0-beta4.tar.bz2


Index: eigen2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eigen2/F-10/eigen2.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- eigen2.spec	4 Jan 2009 19:46:20 -0000	1.3
+++ eigen2.spec	5 Jan 2009 15:06:58 -0000	1.4
@@ -3,16 +3,16 @@
 # http://bugzilla.redhat.com/459705
 
 %define _with_check -DBUILD_TESTS=ON 
-%define pre beta2
+%define pre beta4
 
 Name:    eigen2
 Summary: A lightweight C++ template library for vector and matrix math
 Version: 2.0 
-Release: 0.5.%{pre}%{?dist} 
+Release: 0.6.%{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
+Source0: http://eigen.tuxfamily.org/eigen-%{version}-%{pre}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 
@@ -82,6 +82,9 @@
 
 
 %changelog
+* Sun Jan 04 2009 Rex Dieter <rdieter at fedoraproject.org> 2.0-0.6.beta4
+- eigen-2.0-beta4
+
 * Mon Dec 08 2008 Rex Dieter <rdieter at fedoraproject.org> 2.0-0.5.beta2
 - eigen-2.0-beta2
 - (re)enable buildtime test


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eigen2/F-10/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	4 Jan 2009 19:46:20 -0000	1.4
+++ sources	5 Jan 2009 15:06:58 -0000	1.5
@@ -1 +1 @@
-22b55e388a602e0fa7e2098124f39f71  eigen-2.0-beta2.tar.bz2
+2a83362c251da812be16963da0186ad5  eigen-2.0-beta4.tar.bz2



From rdieter at fedoraproject.org  Mon Jan  5 15:07:49 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon,  5 Jan 2009 15:07:49 +0000 (UTC)
Subject: rpms/eigen2/F-9 .cvsignore, 1.4, 1.5 eigen2.spec, 1.3, 1.4 sources, 
	1.4, 1.5
Message-ID: <20090105150749.3E9BA70108@cvs1.fedora.phx.redhat.com>

Author: rdieter

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

Modified Files:
	.cvsignore eigen2.spec sources 
Log Message:
* Sun Jan 04 2009 Rex Dieter <rdieter at fedoraproject.org> 2.0-0.6.beta4
- eigen-2.0-beta4



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/eigen2/F-9/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	4 Jan 2009 19:46:36 -0000	1.4
+++ .cvsignore	5 Jan 2009 15:07:18 -0000	1.5
@@ -1 +1 @@
-eigen-2.0-beta2.tar.bz2
+eigen-2.0-beta4.tar.bz2


Index: eigen2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eigen2/F-9/eigen2.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- eigen2.spec	4 Jan 2009 19:46:37 -0000	1.3
+++ eigen2.spec	5 Jan 2009 15:07:18 -0000	1.4
@@ -3,16 +3,16 @@
 # http://bugzilla.redhat.com/459705
 
 %define _with_check -DBUILD_TESTS=ON 
-%define pre beta2
+%define pre beta4
 
 Name:    eigen2
 Summary: A lightweight C++ template library for vector and matrix math
 Version: 2.0 
-Release: 0.5.%{pre}%{?dist} 
+Release: 0.6.%{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
+Source0: http://eigen.tuxfamily.org/eigen-%{version}-%{pre}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 
@@ -82,6 +82,9 @@
 
 
 %changelog
+* Sun Jan 04 2009 Rex Dieter <rdieter at fedoraproject.org> 2.0-0.6.beta4
+- eigen-2.0-beta4
+
 * Mon Dec 08 2008 Rex Dieter <rdieter at fedoraproject.org> 2.0-0.5.beta2
 - eigen-2.0-beta2
 - (re)enable buildtime test


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eigen2/F-9/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	4 Jan 2009 19:46:37 -0000	1.4
+++ sources	5 Jan 2009 15:07:18 -0000	1.5
@@ -1 +1 @@
-22b55e388a602e0fa7e2098124f39f71  eigen-2.0-beta2.tar.bz2
+2a83362c251da812be16963da0186ad5  eigen-2.0-beta4.tar.bz2



From hadess at fedoraproject.org  Mon Jan  5 15:09:34 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Mon,  5 Jan 2009 15:09:34 +0000 (UTC)
Subject: rpms/gnome-media/devel gnome-media.spec,1.145,1.146
Message-ID: <20090105150934.5B3BD70108@cvs1.fedora.phx.redhat.com>

Author: hadess

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

Modified Files:
	gnome-media.spec 
Log Message:
* Mon Jan 05 2009 - Bastien Nocera <bnocera at redhat.com> - 2.25.1-2
- Split applications and the media profiles library
- Remove some unneeded BuildRequires



Index: gnome-media.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-media/devel/gnome-media.spec,v
retrieving revision 1.145
retrieving revision 1.146
diff -u -r1.145 -r1.146
--- gnome-media.spec	17 Dec 2008 22:27:27 -0000	1.145
+++ gnome-media.spec	5 Jan 2009 15:09:03 -0000	1.146
@@ -14,7 +14,7 @@
 Summary:        GNOME media programs
 Name:           gnome-media
 Version:        2.25.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 License:        GPLv2+ and GFDL
 Group:          Applications/Multimedia
 Source:         http://download.gnome.org/sources/gnome-media/2.25/gnome-media-%{version}.tar.bz2
@@ -30,21 +30,15 @@
 Requires(pre): GConf2 >= 2.14
 Requires(preun): GConf2 >= 2.14
 
-BuildRequires:  glib2-devel >= %{glib2_version}
-BuildRequires:  pango-devel >= %{pango_version}
 BuildRequires:  gtk2-devel >= %{gtk2_version}
 BuildRequires:  libgnome-devel >= %{libgnome_version}
 BuildRequires:  libgnomeui-devel >= %{libgnomeui_version}
 BuildRequires:  libglade2-devel
 BuildRequires:  GConf2-devel
-BuildRequires:  gnome-vfs2-devel
-BuildRequires:  esound-devel 
-BuildRequires:  gail-devel >= %{gail_version}
 BuildRequires:  desktop-file-utils >= %{desktop_file_utils_version}
 BuildRequires:  gstreamer-devel >= %{gstreamer_version}
 BuildRequires:  gstreamer-plugins-base-devel >= %{gstreamer_version}
 BuildRequires:  gstreamer-plugins-good-devel
-BuildRequires:  nautilus-cd-burner-devel
 BuildRequires:  dbus-glib-devel
 BuildRequires:  libcanberra-devel
 BuildRequires:  pulseaudio-libs-devel
@@ -58,7 +52,7 @@
 %package devel
 Summary: Development files for gnome-media
 Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
+Requires: %{name}-libs = %{version}-%{release}
 Requires: gtk2-devel >= %{gtk2_version}
 Requires: libgnome-devel >= %{libgnome_version}
 Requires: libgnomeui-devel >= %{libgnomeui_version}
@@ -68,6 +62,18 @@
 This package contains the libraries and header files necessary to 
 develop GNOME media applications.
 
+%package libs
+Summary: Development files for gnome-media
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
+Requires: gtk2-devel >= %{gtk2_version}
+Requires: libgnome-devel >= %{libgnome_version}
+Requires: libgnomeui-devel >= %{libgnomeui_version}
+Requires: pkgconfig
+
+%description libs
+This package contains the libraries required for using encoding profiles
+in GNOME media applications.
 
 %prep
 %setup -q
@@ -139,10 +145,15 @@
 scrollkeeper-update -q -o %{_datadir}/omf/%{name} || :
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
 gconftool-2 --makefile-install-rule \
-    %{_sysconfdir}/gconf/schemas/gnome-audio-profiles.schemas \
     %{_sysconfdir}/gconf/schemas/gnome-sound-recorder.schemas \
     %{_sysconfdir}/gconf/schemas/gnome-volume-control.schemas \
     > /dev/null || :
+
+%post libs
+export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+gconftool-2 --makefile-install-rule \
+    %{_sysconfdir}/gconf/schemas/gnome-audio-profiles.schemas \
+    > /dev/null || :
 /sbin/ldconfig
 
 %pre
@@ -160,11 +171,17 @@
       > /dev/null || :
   fi
   gconftool-2 --makefile-uninstall-rule \
-    %{_sysconfdir}/gconf/schemas/gnome-audio-profiles.schemas \
     %{_sysconfdir}/gconf/schemas/gnome-volume-control.schemas \
     > /dev/null || :
 fi
 
+%pre libs
+if [ "$1" -gt 1 ]; then
+  gconftool-2 --makefile-uninstall-rule \
+  %{_sysconfdir}/gconf/schemas/gnome-audio-profiles.schemas \
+  > /dev/null || :
+fi
+
 %preun
 if [ "$1" -eq 0 ]; then
   export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
@@ -180,21 +197,30 @@
       > /dev/null || :
   fi
   gconftool-2 --makefile-uninstall-rule \
-    %{_sysconfdir}/gconf/schemas/gnome-audio-profiles.schemas \
     %{_sysconfdir}/gconf/schemas/gnome-volume-control.schemas \
     > /dev/null || :
 fi
 
+%preun libs
+if [ "$1" -eq 0 ]; then
+  if [ -f %{_sysconfdir}/gconf/schemas/gnome-audio-profiles.schemas ] ; then
+    gconftool-2 --makefile-uninstall-rule \
+    %{_sysconfdir}/gconf/schemas/gnome-audio-profiles.schemas \
+    > /dev/null || :
+  fi
+fi
+
 %postun
 scrollkeeper-update -q || :
-/sbin/ldconfig
 
+%postun libs
+/sbin/ldconfig
 
-%files -f %{gettext_package}.lang
+%files
 %defattr(-, root, root)
 
 %doc AUTHORS COPYING NEWS README
-%config %{_sysconfdir}/gconf/schemas/*.schemas
+%config %{_sysconfdir}/gconf/schemas/gnome-sound-recorder.schemas
 
 %{_datadir}/gnome/autostart/gnome-volume-control-applet.desktop
 
@@ -203,11 +229,13 @@
 %{_datadir}/gnome-media
 %{_datadir}/gstreamer-properties
 %{_datadir}/gnome-sound-recorder
+%{_bindir}/*
 
+%files libs -f %{gettext_package}.lang
+%defattr(-, root, root)
+%config %{_sysconfdir}/gconf/schemas/gnome-audio-profiles.schemas
 %{_libdir}/*.so.*
 %{_libdir}/libglade/2.0/*.so
-%{_bindir}/*
-
 
 %files devel
 %defattr(-, root, root)
@@ -216,6 +244,10 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Mon Jan 05 2009 - Bastien Nocera <bnocera at redhat.com> - 2.25.1-2
+- Split applications and the media profiles library
+- Remove some unneeded BuildRequires
+
 * Wed Dec 17 2008 Matthias Clasen <mclasen at redhat.com>  2.25.1-1
 - Update to 2.25.1
 



From hadess at fedoraproject.org  Mon Jan  5 15:11:26 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Mon,  5 Jan 2009 15:11:26 +0000 (UTC)
Subject: rpms/gedit/devel gedit.spec,1.178,1.179
Message-ID: <20090105151126.BF60570108@cvs1.fedora.phx.redhat.com>

Author: hadess

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

Modified Files:
	gedit.spec 
Log Message:
Add missing GConf2-devel BR



Index: gedit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gedit/devel/gedit.spec,v
retrieving revision 1.178
retrieving revision 1.179
diff -u -r1.178 -r1.179
--- gedit.spec	5 Jan 2009 15:02:56 -0000	1.178
+++ gedit.spec	5 Jan 2009 15:10:56 -0000	1.179
@@ -46,6 +46,7 @@
 BuildRequires: glib2-devel >= %{glib2_version}
 BuildRequires: pango-devel >= %{pango_version}
 BuildRequires: gtk2-devel >= %{gtk2_version}
+BuildRequires: GConf2-devel
 BuildRequires: desktop-file-utils >= %{desktop_file_utils_version}
 BuildRequires: enchant-devel >= %{enchant_version}
 BuildRequires: iso-codes-devel >= %{isocodes_version}



From spot at fedoraproject.org  Mon Jan  5 15:12:20 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Mon,  5 Jan 2009 15:12:20 +0000 (UTC)
Subject: rpms/R/F-10 R.spec,1.51,1.52
Message-ID: <20090105151220.C00CC70108@cvs1.fedora.phx.redhat.com>

Author: spot

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

Modified Files:
	R.spec 
Log Message:

Add pango-devel to BuildRequires, fix versioned dependency on libRmath



Index: R.spec
===================================================================
RCS file: /cvs/pkgs/rpms/R/F-10/R.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- R.spec	22 Dec 2008 16:27:49 -0000	1.51
+++ R.spec	5 Jan 2009 15:11:50 -0000	1.52
@@ -6,7 +6,7 @@
 
 Name: R
 Version: 2.8.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: A language for data analysis and graphics
 URL: http://www.r-project.org
 Source0: ftp://cran.r-project.org/pub/R/src/base/R-2/R-%{version}.tar.gz
@@ -24,7 +24,7 @@
 BuildRequires: java-1.5.0-gcj, lapack-devel
 BuildRequires: libSM-devel, libX11-devel, libICE-devel, libXt-devel
 BuildRequires: bzip2-devel, libXmu-devel, cairo-devel, libtiff-devel
-BuildRequires: gcc-objc
+BuildRequires: gcc-objc, pango-devel
 # R-devel will pull in R-core
 Requires: R-devel = %{version}-%{release}
 # libRmath-devel will pull in libRmath
@@ -122,7 +122,7 @@
 %package -n libRmath-devel
 Summary: standalone math library from the R project
 Group: Development/Libraries
-Requires: libRmath = %{version}, pkgconfig
+Requires: libRmath = %{version}-%{release}, pkgconfig
 
 %description -n libRmath-devel
 A standalone library of mathematical and statistical functions derived
@@ -330,6 +330,10 @@
 /sbin/ldconfig
 
 %changelog
+* Mon Jan  5 2009 Tom "spot" Callaway <tcallawa at redhat.com> 2.8.1-2
+- add pango-devel to BuildRequires (thanks to Martyn Plummer and Peter Dalgaard)
+- fix libRmath requires to need V-R (thanks to Martyn Plummer)
+
 * Mon Dec 22 2008 Tom "spot" Callaway <tcallawa at redhat.com> 2.8.1-1
 - update javareconf call in %%post (bz 477076)
 - 2.8.1



From spot at fedoraproject.org  Mon Jan  5 15:12:20 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Mon,  5 Jan 2009 15:12:20 +0000 (UTC)
Subject: rpms/R/EL-5 R.spec,1.34,1.35
Message-ID: <20090105151220.476B870108@cvs1.fedora.phx.redhat.com>

Author: spot

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

Modified Files:
	R.spec 
Log Message:

Add pango-devel to BuildRequires, fix versioned dependency on libRmath



Index: R.spec
===================================================================
RCS file: /cvs/pkgs/rpms/R/EL-5/R.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- R.spec	22 Dec 2008 16:27:48 -0000	1.34
+++ R.spec	5 Jan 2009 15:11:49 -0000	1.35
@@ -6,7 +6,7 @@
 
 Name: R
 Version: 2.8.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: A language for data analysis and graphics
 URL: http://www.r-project.org
 Source0: ftp://cran.r-project.org/pub/R/src/base/R-2/R-%{version}.tar.gz
@@ -24,7 +24,7 @@
 BuildRequires: java-1.4.2-gcj-compat, lapack-devel
 BuildRequires: libSM-devel, libX11-devel, libICE-devel, libXt-devel
 BuildRequires: bzip2-devel, libXmu-devel, cairo-devel, libtiff-devel
-BuildRequires: gcc-objc
+BuildRequires: gcc-objc, pango-devel
 # R-devel will pull in R-core
 Requires: R-devel = %{version}-%{release}
 # libRmath-devel will pull in libRmath
@@ -122,7 +122,7 @@
 %package -n libRmath-devel
 Summary: standalone math library from the R project
 Group: Development/Libraries
-Requires: libRmath = %{version}, pkgconfig
+Requires: libRmath = %{version}-%{release}, pkgconfig
 
 %description -n libRmath-devel
 A standalone library of mathematical and statistical functions derived
@@ -330,6 +330,10 @@
 /sbin/ldconfig
 
 %changelog
+* Mon Jan  5 2009 Tom "spot" Callaway <tcallawa at redhat.com> 2.8.1-2
+- add pango-devel to BuildRequires (thanks to Martyn Plummer and Peter Dalgaard)
+- fix libRmath requires to need V-R (thanks to Martyn Plummer)
+
 * Mon Dec 22 2008 Tom "spot" Callaway <tcallawa at redhat.com> 2.8.1-1
 - update javareconf call in %%post (bz 477076)
 - 2.8.1



From spot at fedoraproject.org  Mon Jan  5 15:12:21 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Mon,  5 Jan 2009 15:12:21 +0000 (UTC)
Subject: rpms/R/devel R.spec,1.51,1.52
Message-ID: <20090105151221.A4C4570108@cvs1.fedora.phx.redhat.com>

Author: spot

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

Modified Files:
	R.spec 
Log Message:

Add pango-devel to BuildRequires, fix versioned dependency on libRmath



Index: R.spec
===================================================================
RCS file: /cvs/pkgs/rpms/R/devel/R.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- R.spec	22 Dec 2008 16:27:50 -0000	1.51
+++ R.spec	5 Jan 2009 15:11:51 -0000	1.52
@@ -6,7 +6,7 @@
 
 Name: R
 Version: 2.8.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: A language for data analysis and graphics
 URL: http://www.r-project.org
 Source0: ftp://cran.r-project.org/pub/R/src/base/R-2/R-%{version}.tar.gz
@@ -24,7 +24,7 @@
 BuildRequires: java-1.5.0-gcj, lapack-devel
 BuildRequires: libSM-devel, libX11-devel, libICE-devel, libXt-devel
 BuildRequires: bzip2-devel, libXmu-devel, cairo-devel, libtiff-devel
-BuildRequires: gcc-objc
+BuildRequires: gcc-objc, pango-devel
 # R-devel will pull in R-core
 Requires: R-devel = %{version}-%{release}
 # libRmath-devel will pull in libRmath
@@ -122,7 +122,7 @@
 %package -n libRmath-devel
 Summary: standalone math library from the R project
 Group: Development/Libraries
-Requires: libRmath = %{version}, pkgconfig
+Requires: libRmath = %{version}-%{release}, pkgconfig
 
 %description -n libRmath-devel
 A standalone library of mathematical and statistical functions derived
@@ -330,6 +330,10 @@
 /sbin/ldconfig
 
 %changelog
+* Mon Jan  5 2009 Tom "spot" Callaway <tcallawa at redhat.com> 2.8.1-2
+- add pango-devel to BuildRequires (thanks to Martyn Plummer and Peter Dalgaard)
+- fix libRmath requires to need V-R (thanks to Martyn Plummer)
+
 * Mon Dec 22 2008 Tom "spot" Callaway <tcallawa at redhat.com> 2.8.1-1
 - update javareconf call in %%post (bz 477076)
 - 2.8.1



From spot at fedoraproject.org  Mon Jan  5 15:12:21 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Mon,  5 Jan 2009 15:12:21 +0000 (UTC)
Subject: rpms/R/F-9 R.spec,1.50,1.51
Message-ID: <20090105151221.3BF0F70108@cvs1.fedora.phx.redhat.com>

Author: spot

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

Modified Files:
	R.spec 
Log Message:

Add pango-devel to BuildRequires, fix versioned dependency on libRmath



Index: R.spec
===================================================================
RCS file: /cvs/pkgs/rpms/R/F-9/R.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- R.spec	22 Dec 2008 16:27:49 -0000	1.50
+++ R.spec	5 Jan 2009 15:11:50 -0000	1.51
@@ -6,7 +6,7 @@
 
 Name: R
 Version: 2.8.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: A language for data analysis and graphics
 URL: http://www.r-project.org
 Source0: ftp://cran.r-project.org/pub/R/src/base/R-2/R-%{version}.tar.gz
@@ -24,7 +24,7 @@
 BuildRequires: java-1.5.0-gcj, lapack-devel
 BuildRequires: libSM-devel, libX11-devel, libICE-devel, libXt-devel
 BuildRequires: bzip2-devel, libXmu-devel, cairo-devel, libtiff-devel
-BuildRequires: gcc-objc
+BuildRequires: gcc-objc, pango-devel
 # R-devel will pull in R-core
 Requires: R-devel = %{version}-%{release}
 # libRmath-devel will pull in libRmath
@@ -122,7 +122,7 @@
 %package -n libRmath-devel
 Summary: standalone math library from the R project
 Group: Development/Libraries
-Requires: libRmath = %{version}, pkgconfig
+Requires: libRmath = %{version}-%{release}, pkgconfig
 
 %description -n libRmath-devel
 A standalone library of mathematical and statistical functions derived
@@ -330,6 +330,10 @@
 /sbin/ldconfig
 
 %changelog
+* Mon Jan  5 2009 Tom "spot" Callaway <tcallawa at redhat.com> 2.8.1-2
+- add pango-devel to BuildRequires (thanks to Martyn Plummer and Peter Dalgaard)
+- fix libRmath requires to need V-R (thanks to Martyn Plummer)
+
 * Mon Dec 22 2008 Tom "spot" Callaway <tcallawa at redhat.com> 2.8.1-1
 - update javareconf call in %%post (bz 477076)
 - 2.8.1



From pmachata at fedoraproject.org  Mon Jan  5 15:15:55 2009
From: pmachata at fedoraproject.org (Petr Machata)
Date: Mon,  5 Jan 2009 15:15:55 +0000 (UTC)
Subject: rpms/boost/F-9 boost-gcc43.patch,1.5,1.6 boost.spec,1.49,1.50
Message-ID: <20090105151555.4BE0370108@cvs1.fedora.phx.redhat.com>

Author: pmachata

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

Modified Files:
	boost-gcc43.patch boost.spec 
Log Message:
- Fix missing <limits.h> include in relaxed_heap.hpp
- Resolves: #475587


boost-gcc43.patch:

Index: boost-gcc43.patch
===================================================================
RCS file: /cvs/pkgs/rpms/boost/F-9/boost-gcc43.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- boost-gcc43.patch	12 Jun 2008 11:09:13 -0000	1.5
+++ boost-gcc43.patch	5 Jan 2009 15:15:24 -0000	1.6
@@ -213,3 +213,14 @@
  
            rules = 
              boost::shared_ptr<rule_type>(parse_rules(result[START_DATE_RULE],
+diff -urp boost/pending/relaxed_heap.hpp /usr/include/boost/pending/relaxed_heap.hpp
+--- boost_1_34_1/boost/pending/relaxed_heap.hpp	2005-12-08 03:56:25.000000000 +0100
++++ boost_1_34_1-pm/boost/pending/relaxed_heap.hpp	2009-01-05 13:49:23.000000000 +0100
+@@ -13,6 +13,7 @@
+ #include <boost/property_map.hpp>
+ #include <boost/optional.hpp>
+ #include <vector>
++#include <limits.h>
+ 
+ #ifdef BOOST_RELAXED_HEAP_DEBUG
+ #  include <iostream>


Index: boost.spec
===================================================================
RCS file: /cvs/pkgs/rpms/boost/F-9/boost.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- boost.spec	12 Jun 2008 11:09:13 -0000	1.49
+++ boost.spec	5 Jan 2009 15:15:24 -0000	1.50
@@ -3,7 +3,7 @@
 Name: boost
 Summary: The Boost C++ Libraries
 Version: 1.34.1
-Release: 15%{?dist}
+Release: 16%{?dist}
 License: Boost Software License (GPL-Compatible, Free Software License)
 URL: http://www.boost.org/
 Group: System Environment/Libraries
@@ -198,6 +198,10 @@
 %doc %{_docdir}/%{name}-%{version}
 
 %changelog
+* Mon Jan  5 2009 Petr Machata <pmachata at redhat.com> - 1.34.1-16
+- Fix missing <limits.h> include in relaxed_heap.hpp
+- Resolves: #475587
+
 * Thu Jun 12 2008 Petr Machata <pmachata at redhat.com> - 1.34.1-15
 - Fix "changes meaning of keywords" in boost date_time
 - Resolves: #450718



From pvrabec at fedoraproject.org  Mon Jan  5 15:18:03 2009
From: pvrabec at fedoraproject.org (Peter Vrabec)
Date: Mon,  5 Jan 2009 15:18:03 +0000 (UTC)
Subject: rpms/fwknop/devel fwknop.spec,1.5,1.6
Message-ID: <20090105151803.D887C70108@cvs1.fedora.phx.redhat.com>

Author: pvrabec

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

Modified Files:
	fwknop.spec 
Log Message:
add /var/log/fwknop/errs directory (#469395)



Index: fwknop.spec
===================================================================
RCS file: /cvs/extras/rpms/fwknop/devel/fwknop.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- fwknop.spec	17 Nov 2008 19:50:52 -0000	1.5
+++ fwknop.spec	5 Jan 2009 15:17:33 -0000	1.6
@@ -1,7 +1,7 @@
 Summary: A Single Packet Authorization (SPA) implementation
 Name: fwknop
 Version: 1.9.9
-Release: 1
+Release: 2
 License: GPLv2
 Group: System Environment/Daemons
 Url: http://www.cipherdyne.org/fwknop/
@@ -62,6 +62,7 @@
       $RPM_BUILD_ROOT%{_sbindir} \
       $RPM_BUILD_ROOT%{_localstatedir}/lib/fwknop \
       $RPM_BUILD_ROOT%{_localstatedir}/log/fwknop \
+      $RPM_BUILD_ROOT%{_localstatedir}/log/fwknop/errs \
       $RPM_BUILD_ROOT%{_localstatedir}/run/fwknop
 
 install -p -m 644 access.conf fwknop.conf pf.os $RPM_BUILD_ROOT%_sysconfdir/fwknop
@@ -106,9 +107,13 @@
 %{_mandir}/man8/*
 %dir %{_localstatedir}/lib/fwknop
 %dir %{_localstatedir}/log/fwknop
+%dir %{_localstatedir}/log/fwknop/errs
 %dir %{_localstatedir}/run/fwknop
 
 %changelog
+* Mon Jan 05 2009 Peter Vrabec <pvrabec at redhat.com> 1.9.9-2
+- add /var/log/fwknop/errs directory (#469395)
+
 * Mon Nov 17 2008 Miloslav Trma?? <mitr at redhat.com> - 1.9.9-1
 - Update to fwknop-1.9.9
 



From pmachata at fedoraproject.org  Mon Jan  5 15:20:49 2009
From: pmachata at fedoraproject.org (Petr Machata)
Date: Mon,  5 Jan 2009 15:20:49 +0000 (UTC)
Subject: rpms/boost/F-10 boost-gcc43.patch,1.9,1.10 boost.spec,1.53,1.54
Message-ID: <20090105152049.B314370108@cvs1.fedora.phx.redhat.com>

Author: pmachata

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

Modified Files:
	boost-gcc43.patch boost.spec 
Log Message:
- Fix missing <limits.h> include in relaxed_heap.hpp
- Related: #475587


boost-gcc43.patch:

Index: boost-gcc43.patch
===================================================================
RCS file: /cvs/pkgs/rpms/boost/F-10/boost-gcc43.patch,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- boost-gcc43.patch	6 Oct 2008 13:59:54 -0000	1.9
+++ boost-gcc43.patch	5 Jan 2009 15:20:19 -0000	1.10
@@ -213,3 +213,14 @@
  
            rules = 
              boost::shared_ptr<rule_type>(parse_rules(result[START_DATE_RULE],
+diff -urp boost/pending/relaxed_heap.hpp /usr/include/boost/pending/relaxed_heap.hpp
+--- boost_1_34_1/boost/pending/relaxed_heap.hpp	2005-12-08 03:56:25.000000000 +0100
++++ boost_1_34_1-pm/boost/pending/relaxed_heap.hpp	2009-01-05 13:49:23.000000000 +0100
+@@ -13,6 +13,7 @@
+ #include <boost/property_map.hpp>
+ #include <boost/optional.hpp>
+ #include <vector>
++#include <limits.h>
+ 
+ #ifdef BOOST_RELAXED_HEAP_DEBUG
+ #  include <iostream>


Index: boost.spec
===================================================================
RCS file: /cvs/pkgs/rpms/boost/F-10/boost.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- boost.spec	6 Oct 2008 13:59:55 -0000	1.53
+++ boost.spec	5 Jan 2009 15:20:19 -0000	1.54
@@ -3,7 +3,7 @@
 Name: boost
 Summary: The Boost C++ Libraries
 Version: 1.34.1
-Release: 17%{?dist}
+Release: 18%{?dist}
 License: Boost
 URL: http://www.boost.org/
 Group: System Environment/Libraries
@@ -198,6 +198,10 @@
 %doc %{_docdir}/%{name}-%{version}
 
 %changelog
+* Mon Jan  5 2009 Petr Machata <pmachata at redhat.com> - 1.34.1-18
+- Fix missing <limits.h> include in relaxed_heap.hpp
+- Related: #475587
+
 * Mon Oct  6 2008 Petr Machata <pmachata at redhat.com> - 1.34.1-17
 - Fix gcc43 patch to apply cleanly under --fuzz=0
 - Resolves: #465003



From pvrabec at fedoraproject.org  Mon Jan  5 15:24:34 2009
From: pvrabec at fedoraproject.org (Peter Vrabec)
Date: Mon,  5 Jan 2009 15:24:34 +0000 (UTC)
Subject: rpms/fwknop/F-10 fwknop.spec,1.3,1.4
Message-ID: <20090105152434.70BEC70108@cvs1.fedora.phx.redhat.com>

Author: pvrabec

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

Modified Files:
	fwknop.spec 
Log Message:
- add /var/log/fwknop/errs directory (#469395)



Index: fwknop.spec
===================================================================
RCS file: /cvs/extras/rpms/fwknop/F-10/fwknop.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- fwknop.spec	4 Oct 2008 15:17:01 -0000	1.3
+++ fwknop.spec	5 Jan 2009 15:24:03 -0000	1.4
@@ -1,7 +1,7 @@
 Summary: A Single Packet Authorization (SPA) implementation
 Name: fwknop
 Version: 1.9.8
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 Url: http://www.cipherdyne.org/fwknop/
@@ -62,6 +62,7 @@
       $RPM_BUILD_ROOT%{_sbindir} \
       $RPM_BUILD_ROOT%{_localstatedir}/lib/fwknop \
       $RPM_BUILD_ROOT%{_localstatedir}/log/fwknop \
+      $RPM_BUILD_ROOT%{_localstatedir}/log/fwknop/errs \
       $RPM_BUILD_ROOT%{_localstatedir}/run/fwknop
 
 install -p -m 644 access.conf fwknop.conf pf.os $RPM_BUILD_ROOT%_sysconfdir/fwknop
@@ -106,9 +107,13 @@
 %{_mandir}/man8/*
 %dir %{_localstatedir}/lib/fwknop
 %dir %{_localstatedir}/log/fwknop
+%dir %{_localstatedir}/log/fwknop/errs
 %dir %{_localstatedir}/run/fwknop
 
 %changelog
+* Mon Jan 05 2009 Peter Vrabec <pvrabec at redhat.com> 1.9.8-2
+- add /var/log/fwknop/errs directory (#469395)
+
 * Sat Oct  4 2008 Miloslav Trma?? <mitr at redhat.com> - 1.9.8-1
 - Update to fwknop-1.9.8
 - Add missing Requires:



From hadess at fedoraproject.org  Mon Jan  5 15:25:29 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Mon,  5 Jan 2009 15:25:29 +0000 (UTC)
Subject: rpms/gedit/devel gedit.spec,1.179,1.180
Message-ID: <20090105152529.750BE70108@cvs1.fedora.phx.redhat.com>

Author: hadess

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

Modified Files:
	gedit.spec 
Log Message:
Add missing libSM dep



Index: gedit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gedit/devel/gedit.spec,v
retrieving revision 1.179
retrieving revision 1.180
diff -u -r1.179 -r1.180
--- gedit.spec	5 Jan 2009 15:10:56 -0000	1.179
+++ gedit.spec	5 Jan 2009 15:24:59 -0000	1.180
@@ -47,6 +47,7 @@
 BuildRequires: pango-devel >= %{pango_version}
 BuildRequires: gtk2-devel >= %{gtk2_version}
 BuildRequires: GConf2-devel
+BuildRequires: libSM-devel
 BuildRequires: desktop-file-utils >= %{desktop_file_utils_version}
 BuildRequires: enchant-devel >= %{enchant_version}
 BuildRequires: iso-codes-devel >= %{isocodes_version}



From buc at fedoraproject.org  Mon Jan  5 15:38:12 2009
From: buc at fedoraproject.org (Dmitry Butskoy)
Date: Mon,  5 Jan 2009 15:38:12 +0000 (UTC)
Subject: rpms/newscache/devel newscache.spec,1.9,1.10
Message-ID: <20090105153812.BE19070108@cvs1.fedora.phx.redhat.com>

Author: buc

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

Modified Files:
	newscache.spec 
Log Message:



Index: newscache.spec
===================================================================
RCS file: /cvs/extras/rpms/newscache/devel/newscache.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- newscache.spec	5 Jan 2009 14:21:32 -0000	1.9
+++ newscache.spec	5 Jan 2009 15:37:42 -0000	1.10
@@ -46,7 +46,12 @@
 # to ship it separately.
 
 pushd socket++-%{socketver}
-./autogen
+#./autogen
+libtoolize -v -f
+aclocal
+autoheader
+automake --add-missing
+autoconf
 %configure --enable-static --disable-shared
 make
 popd



From hadess at fedoraproject.org  Mon Jan  5 15:44:49 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Mon,  5 Jan 2009 15:44:49 +0000 (UTC)
Subject: rpms/gstreamer/devel gstreamer-fix-bison-check.patch, NONE,
	1.1 gstreamer.spec, 1.90, 1.91
Message-ID: <20090105154449.2507D70108@cvs1.fedora.phx.redhat.com>

Author: hadess

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

Modified Files:
	gstreamer.spec 
Added Files:
	gstreamer-fix-bison-check.patch 
Log Message:
* Mon Jan 05 2009 - Bastien Nocera <bnocera at redhat.com> - 0.10.21-4
- Fix build with newer version of bison


gstreamer-fix-bison-check.patch:

--- NEW FILE gstreamer-fix-bison-check.patch ---
--- common/m4/gst-parser.m4.orig	2008-09-10 11:16:47.000000000 +0200
+++ common/m4/gst-parser.m4	2008-12-14 19:14:43.000000000 +0100
@@ -15,10 +15,7 @@
   bison_version=`$BISON_PATH --version | head -n 1 |  sed 's/^[[^0-9]]*//' | sed 's/[[^0-9]]*$//' | cut -d' ' -f1`
   AC_MSG_CHECKING([bison version $bison_version >= $bison_min_version])
 
-  if perl -w <<EOF
-    exit ($bison_version < $bison_min_version) ? 0 : 1;
-EOF 
-  then 
+  if perl -we "exit ((v$bison_version ge v$bison_min_version) ? 0 : 1)"; then 
     AC_MSG_RESULT([yes])
   else 
     AC_MSG_ERROR([no])


Index: gstreamer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamer/devel/gstreamer.spec,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -r1.90 -r1.91
--- gstreamer.spec	1 Jan 2009 18:16:53 -0000	1.90
+++ gstreamer.spec	5 Jan 2009 15:44:18 -0000	1.91
@@ -6,7 +6,7 @@
 
 Name: 		%{gstreamer}
 Version: 	0.10.21
-Release: 	3%{?dist}
+Release: 	4%{?dist}
 Summary: 	GStreamer streaming media framework runtime
 
 Group: 		Applications/Multimedia
@@ -40,6 +40,8 @@
 Source2:	macros.gstreamer
 # From: http://bugzilla.gnome.org/show_bug.cgi?id=555631
 Patch2:		gstreamer-0.10.21-fixgnomebz555631.patch
+# From http://bugzilla.gnome.org/show_bug.cgi?id=564507
+Patch3:		gstreamer-fix-bison-check.patch
 
 ### documentation requirements
 BuildRequires:  python2
@@ -107,8 +109,10 @@
 %patch1 -p0 -b .rpm-provides
 popd
 %patch2 -p1 -b .gnomebz555631
+%patch3 -p0 -b .bison-check
 
 %build
+autoreconf
 # 0.10.0: manuals do not build due to an openjade error; disable for now
 %configure \
   --with-package-name='Fedora Core gstreamer package' \
@@ -218,6 +222,9 @@
 %{_sysconfdir}/rpm/macros.gstreamer
 
 %changelog
+* Mon Jan 05 2009 - Bastien Nocera <bnocera at redhat.com> - 0.10.21-4
+- Fix build with newer version of bison
+
 * Thu Jan 01 2009 Rex Dieter <rdieter at fedoraprojet.org> - 0.10.21-3
 - rebuild for pkgconfig deps (#478576)
 



From mhlavink at fedoraproject.org  Mon Jan  5 15:46:21 2009
From: mhlavink at fedoraproject.org (Michal Hlavinka)
Date: Mon,  5 Jan 2009 15:46:21 +0000 (UTC)
Subject: rpms/nut/EL-5 nut-2.2.0-trippliteusb_476850.patch, NONE,
	1.1 nut.spec, 1.51, 1.52
Message-ID: <20090105154621.7A33270108@cvs1.fedora.phx.redhat.com>

Author: mhlavink

Update of /cvs/extras/rpms/nut/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28565

Modified Files:
	nut.spec 
Added Files:
	nut-2.2.0-trippliteusb_476850.patch 
Log Message:
fix #476850 - tripplite_usb driver segfaults when UPS on battery


nut-2.2.0-trippliteusb_476850.patch:

--- NEW FILE nut-2.2.0-trippliteusb_476850.patch ---
diff -up nut-2.2.0/drivers/tripplite_usb.c.trippliteusb_476850 nut-2.2.0/drivers/tripplite_usb.c
--- nut-2.2.0/drivers/tripplite_usb.c.trippliteusb_476850	2007-06-23 05:36:15.000000000 +0200
+++ nut-2.2.0/drivers/tripplite_usb.c	2009-01-05 16:41:02.050817936 +0100
@@ -25,7 +25,7 @@
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 */
 
-#define DRV_VERSION "0.11"
+#define DRV_VERSION "0.11.1"
 
 /* % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % 
  *
@@ -355,8 +355,6 @@ static int reconnect_ups(void)
 		upsdebugx(2, "= device has been disconnected, try to reconnect =");
 		upsdebugx(2, "==================================================");
 
-		upsdrv_cleanup();
-
 		if ((hd = HIDOpenDevice(&udev, &curDevice, reopen_matcher, MODE_REOPEN)) == NULL) {
 			upslogx(LOG_INFO, "Reconnecting to UPS failed; will retry later...");
 			dstate_datastale();
@@ -509,12 +507,10 @@ void usb_comm_fail(int res, const char *
 		case -EBUSY:
 			upslogx(LOG_WARNING, "%s: Device claimed by another process", msg);
 			fatalx(EXIT_FAILURE, "Terminating: EBUSY");
-			upsdrv_cleanup();
 			break;
 
 		default:
 			upslogx(LOG_WARNING, "%s: Device detached? (error %d: %s)", msg, res, usb_strerror());
-			upsdrv_cleanup();
 
 			upslogx(LOG_NOTICE, "Reconnect attempt #%d", ++try);
 			hd = NULL;


Index: nut.spec
===================================================================
RCS file: /cvs/extras/rpms/nut/EL-5/nut.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- nut.spec	9 Sep 2008 15:07:22 -0000	1.51
+++ nut.spec	5 Jan 2009 15:45:51 -0000	1.52
@@ -9,7 +9,7 @@
 Summary: Network UPS Tools
 Name: nut
 Version: 2.2.0
-Release: 5.2%{?dist}
+Release: 6%{?dist}
 Group: Applications/System
 License: GPLv2+
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -23,6 +23,7 @@
 #Patch2: nut-2.2.0-udevusb.patch
 Patch3: nut-2.2.0-glibcopen.patch
 Patch4: nut-2.2.0-wrongssl.patch
+Patch5: nut-2.2.0-trippliteusb_476850.patch
 
 Requires: nut-client => 2.0.0 hal dbus-glib shadow-utils
 Requires(post): fileutils chkconfig /sbin/service
@@ -90,6 +91,7 @@
 #%patch2 -p1 -b .udevusb
 %patch3 -p1 -b .open
 %patch4 -p1 -b .wrongssl
+%patch5 -p1 -b .trippliteusb_476850
 
 %build
 %configure \
@@ -297,6 +299,9 @@
 %{_libdir}/pkgconfig/libupsclient.pc
 
 %changelog
+* Mon Jan 05 2009 Michal Hlavinka <mhlavink at redhat.com> 2.2.0-6
+- fix #476850 - tripplite_usb driver segfaults when UPS on battery
+
 * 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
 



From tbzatek at fedoraproject.org  Mon Jan  5 15:51:56 2009
From: tbzatek at fedoraproject.org (Tomas Bzatek)
Date: Mon,  5 Jan 2009 15:51:56 +0000 (UTC)
Subject: rpms/gamin/devel gamin-0.1.10-gnueabi.patch, NONE, 1.1 gamin.spec, 
	1.70, 1.71
Message-ID: <20090105155156.EA3E270108@cvs1.fedora.phx.redhat.com>

Author: tbzatek

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

Modified Files:
	gamin.spec 
Added Files:
	gamin-0.1.10-gnueabi.patch 
Log Message:
* Mon Nov 24 2008 Tomas Bzatek <tbzatek at redhat.com> - 0.1.10-1
- Update to 0.1.10
- Drop upstreamed patches


gamin-0.1.10-gnueabi.patch:

--- NEW FILE gamin-0.1.10-gnueabi.patch ---
diff -up gamin-0.1.10/configure.in.old gamin-0.1.10/configure.in
--- gamin-0.1.10/configure.in.old	2008-11-24 16:23:06.000000000 +0100
+++ gamin-0.1.10/configure.in	2009-01-05 16:20:41.740669149 +0100
@@ -158,6 +158,10 @@ AC_ARG_ENABLE(debug,
 if test x$debug = xyes ; then
     AC_DEFINE([GAMIN_DEBUG], [], [Enable debugging support])
 fi
+#AM_CONDITIONAL(HAVE_LINUX, test x$target_os = xlinux-gnueabi)
+if test x$target_os = xlinux-gnueabi; then
+      AC_DEFINE([HAVE_LINUX],[],[Whether we are using linux or not])
+fi
 
 AM_CONDITIONAL(GAMIN_DEBUG, test x$debug = xyes)
 


Index: gamin.spec
===================================================================
RCS file: /cvs/extras/rpms/gamin/devel/gamin.spec,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- gamin.spec	29 Nov 2008 05:22:47 -0000	1.70
+++ gamin.spec	5 Jan 2009 15:51:26 -0000	1.71
@@ -1,7 +1,7 @@
 Summary: Library providing the FAM File Alteration Monitor API
 Name: gamin
 Version: 0.1.10
-Release: 2%{?dist}%{?extra_release}
+Release: 3%{?dist}%{?extra_release}
 License: LGPLv2
 Group: Development/Libraries
 Source: gamin-%{version}.tar.bz2
@@ -13,6 +13,13 @@
 BuildRequires: automake, libtool
 
 
+# This fix addresses an issue with ARM, where the configuration triplet
+# happens to be armv5tel-redhat-linux-gnueabi instead of armv5tel-redhat-linux-gnu.
+# The patch declares HAVE_LINUX in case of linux-gnueabi as well.
+# Patch by Kedar Sovani <kedars at marvell.com>
+Patch1: gamin-0.1.10-gnueabi.patch
+
+
 %description
 This C library provides an API and ABI compatible file alteration
 monitor mechanism compatible with FAM but not dependent on a system wide
@@ -42,6 +49,7 @@
 
 %prep
 %setup -q
+%patch1 -p1 -b .gnueabi
 
 %build
 autoreconf --force --install
@@ -90,6 +98,9 @@
 %doc doc/python.html
 
 %changelog
+* Mon Jan  5 2009 Tomas Bzatek <tbzatek at redhat.com> - 0.1.10-3
+- Fix build on gnueabi (patch by Kedar Sovani)
+
 * Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 0.1.10-2
 - Rebuild for Python 2.6
 



From hadess at fedoraproject.org  Mon Jan  5 15:54:26 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Mon,  5 Jan 2009 15:54:26 +0000 (UTC)
Subject: rpms/gstreamer/devel gstreamer.spec,1.91,1.92
Message-ID: <20090105155426.E54A770108@cvs1.fedora.phx.redhat.com>

Author: hadess

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

Modified Files:
	gstreamer.spec 
Log Message:
Run libtoolize after autoreconf



Index: gstreamer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamer/devel/gstreamer.spec,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -r1.91 -r1.92
--- gstreamer.spec	5 Jan 2009 15:44:18 -0000	1.91
+++ gstreamer.spec	5 Jan 2009 15:53:56 -0000	1.92
@@ -113,6 +113,7 @@
 
 %build
 autoreconf
+libtoolize -f
 # 0.10.0: manuals do not build due to an openjade error; disable for now
 %configure \
   --with-package-name='Fedora Core gstreamer package' \



From jbowes at fedoraproject.org  Mon Jan  5 15:54:46 2009
From: jbowes at fedoraproject.org (James Bowes)
Date: Mon,  5 Jan 2009 15:54:46 +0000 (UTC)
Subject: rpms/python-vobject/devel .cvsignore, 1.13, 1.14 python-vobject.spec,
	1.18, 1.19 sources, 1.13, 1.14
Message-ID: <20090105155446.8899370108@cvs1.fedora.phx.redhat.com>

Author: jbowes

Update of /cvs/pkgs/rpms/python-vobject/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31003

Modified Files:
	.cvsignore python-vobject.spec sources 
Log Message:
Update to 0.8.0


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-vobject/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	3 Sep 2008 12:54:27 -0000	1.13
+++ .cvsignore	5 Jan 2009 15:54:15 -0000	1.14
@@ -1 +1 @@
-vobject-0.7.1.tar.gz
+vobject-0.8.0.tar.gz


Index: python-vobject.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-vobject/devel/python-vobject.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- python-vobject.spec	29 Nov 2008 16:02:00 -0000	1.18
+++ python-vobject.spec	5 Jan 2009 15:54:16 -0000	1.19
@@ -1,12 +1,12 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           python-vobject 
-Version:        0.7.1 
-Release:        3%{?dist}
+Version:        0.8.0 
+Release:        1%{?dist}
 Summary:        A python library for manipulating vCard and vCalendar files
 
 Group:          Development/Languages
-License:        ASL 1.1
+License:        ASL 2.0
 URL:            http://vobject.skyhouseconsulting.com/ 
 Source0:        http://vobject.skyhouseconsulting.com/vobject-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -43,7 +43,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc ACKNOWLEDGEMENTS.txt LICENSE.txt README.txt
+%doc ACKNOWLEDGEMENTS.txt LICENSE-2.0.txt README.txt
 
 %{python_sitelib}/*
 
@@ -52,6 +52,9 @@
 
 
 %changelog
+* Mon Jan 05 2009 James Bowes <jbowes at redhat.com> - 0.8.0-1
+- Update to 0.8.0
+
 * Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 0.7.1-3
 - Rebuild for Python 2.6
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-vobject/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	3 Sep 2008 12:54:28 -0000	1.13
+++ sources	5 Jan 2009 15:54:16 -0000	1.14
@@ -1 +1 @@
-9f2c151ba6c08afcc47b8966ea862061  vobject-0.7.1.tar.gz
+4c215d9f5008d2da01bcc49dc6491d6a  vobject-0.8.0.tar.gz



From buc at fedoraproject.org  Mon Jan  5 15:55:57 2009
From: buc at fedoraproject.org (Dmitry Butskoy)
Date: Mon,  5 Jan 2009 15:55:57 +0000 (UTC)
Subject: rpms/newscache/devel newscache.spec,1.10,1.11
Message-ID: <20090105155557.1EF2E70108@cvs1.fedora.phx.redhat.com>

Author: buc

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

Modified Files:
	newscache.spec 
Log Message:



Index: newscache.spec
===================================================================
RCS file: /cvs/extras/rpms/newscache/devel/newscache.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- newscache.spec	5 Jan 2009 15:37:42 -0000	1.10
+++ newscache.spec	5 Jan 2009 15:55:26 -0000	1.11
@@ -47,8 +47,8 @@
 
 pushd socket++-%{socketver}
 #./autogen
-libtoolize -v -f
 aclocal
+libtoolize -v -f
 autoheader
 automake --add-missing
 autoconf



From nsantos at fedoraproject.org  Mon Jan  5 16:01:04 2009
From: nsantos at fedoraproject.org (Nuno Santos)
Date: Mon,  5 Jan 2009 16:01:04 +0000 (UTC)
Subject: rpms/rhm/F-10 rhm.spec,1.32,1.33
Message-ID: <20090105160104.AEA1C70108@cvs1.fedora.phx.redhat.com>

Author: nsantos

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

Modified Files:
	rhm.spec 
Log Message:
require specific version of qpidc/d


Index: rhm.spec
===================================================================
RCS file: /cvs/extras/rpms/rhm/F-10/rhm.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- rhm.spec	23 Dec 2008 21:04:48 -0000	1.32
+++ rhm.spec	5 Jan 2009 16:00:34 -0000	1.33
@@ -8,7 +8,7 @@
 
 Name:           rhm
 Version:        0.4.%{svnrev}
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Red Hat persistence extension to the Qpid messaging system
 Group:          System Environment/Libraries
 License:        LGPLv2+
@@ -18,14 +18,14 @@
 
 ExclusiveArch: i386 x86_64
 
-BuildRequires: qpidc-devel
-BuildRequires: qpidd-devel
+BuildRequires: qpidc-devel = 0.4.%{svnrev_qpid}
+BuildRequires: qpidd-devel = 0.4.%{svnrev_qpid}
 BuildRequires: db4-devel
 BuildRequires: libaio-devel
 BuildRequires: python
 BuildRequires: libtool
 
-Requires: qpidd >= 0.4.%{svnrev_qpid}
+Requires: qpidd = 0.4.%{svnrev_qpid}
 Requires: db4
 Requires: libaio
 



From mhlavink at fedoraproject.org  Mon Jan  5 16:06:02 2009
From: mhlavink at fedoraproject.org (Michal Hlavinka)
Date: Mon,  5 Jan 2009 16:06:02 +0000 (UTC)
Subject: rpms/nut/EL-4 nut-2.2.0-trippliteusb_476850.patch, NONE,
	1.1 nut.spec, 1.51, 1.52
Message-ID: <20090105160602.E42EB70108@cvs1.fedora.phx.redhat.com>

Author: mhlavink

Update of /cvs/extras/rpms/nut/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2645

Modified Files:
	nut.spec 
Added Files:
	nut-2.2.0-trippliteusb_476850.patch 
Log Message:
fix #476850 - tripplite_usb driver segfaults when UPS on battery


nut-2.2.0-trippliteusb_476850.patch:

--- NEW FILE nut-2.2.0-trippliteusb_476850.patch ---
diff -up nut-2.2.0/drivers/tripplite_usb.c.trippliteusb_476850 nut-2.2.0/drivers/tripplite_usb.c
--- nut-2.2.0/drivers/tripplite_usb.c.trippliteusb_476850	2007-06-23 05:36:15.000000000 +0200
+++ nut-2.2.0/drivers/tripplite_usb.c	2009-01-05 16:41:02.050817936 +0100
@@ -25,7 +25,7 @@
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 */
 
-#define DRV_VERSION "0.11"
+#define DRV_VERSION "0.11.1"
 
 /* % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % 
  *
@@ -355,8 +355,6 @@ static int reconnect_ups(void)
 		upsdebugx(2, "= device has been disconnected, try to reconnect =");
 		upsdebugx(2, "==================================================");
 
-		upsdrv_cleanup();
-
 		if ((hd = HIDOpenDevice(&udev, &curDevice, reopen_matcher, MODE_REOPEN)) == NULL) {
 			upslogx(LOG_INFO, "Reconnecting to UPS failed; will retry later...");
 			dstate_datastale();
@@ -509,12 +507,10 @@ void usb_comm_fail(int res, const char *
 		case -EBUSY:
 			upslogx(LOG_WARNING, "%s: Device claimed by another process", msg);
 			fatalx(EXIT_FAILURE, "Terminating: EBUSY");
-			upsdrv_cleanup();
 			break;
 
 		default:
 			upslogx(LOG_WARNING, "%s: Device detached? (error %d: %s)", msg, res, usb_strerror());
-			upsdrv_cleanup();
 
 			upslogx(LOG_NOTICE, "Reconnect attempt #%d", ++try);
 			hd = NULL;


Index: nut.spec
===================================================================
RCS file: /cvs/extras/rpms/nut/EL-4/nut.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- nut.spec	10 Oct 2007 08:40:06 -0000	1.51
+++ nut.spec	5 Jan 2009 16:05:32 -0000	1.52
@@ -9,7 +9,7 @@
 Summary: Network UPS Tools
 Name: nut
 Version: 2.2.0
-Release: 3.3%{?dist}
+Release: 4%{?dist}
 Group: Applications/System
 License: GPLv2+
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -23,6 +23,7 @@
 Patch2: nut-2.2.0-udevusb.patch
 Patch3: nut-2.2.0-glibcopen.patch
 Patch4: nut-2.2.0-wrongssl.patch
+Patch5: nut-2.2.0-trippliteusb_476850.patch
 
 Requires: nut-client => 2.0.0 dbus-glib shadow-utils
 Requires(post): fileutils chkconfig /sbin/service
@@ -87,6 +88,7 @@
 %patch2 -p1 -b .udevusb
 %patch3 -p1 -b .open
 %patch4 -p1 -b .wrongssl
+%patch5 -p1 -b .trippliteusb_476850
 
 %build
 %configure \
@@ -295,6 +297,9 @@
 %{_libdir}/pkgconfig/libupsclient.pc
 
 %changelog
+* Mon Jan 05 2009 Michal Hlavinka <mhlavink at redhat.com> 2.2.0-4
+- fix #476850 - tripplite_usb driver segfaults when UPS on battery
+
 * Wed Oct 10 2007 Tomas Smetana <tsmetana at redhat.com> 2.2.0-3.3
 - fix #325331 - permission problem on /etc/hotplug/usb/libhidups
 



From ovasik at fedoraproject.org  Mon Jan  5 16:13:30 2009
From: ovasik at fedoraproject.org (Ondrej Vasik)
Date: Mon,  5 Jan 2009 16:13:30 +0000 (UTC)
Subject: rpms/tar/devel tar-1.19-xattrs-conf.patch, 1.3,
	1.4 tar-1.19-xattrs.patch, 1.7, 1.8
Message-ID: <20090105161331.0441B70108@cvs1.fedora.phx.redhat.com>

Author: ovasik

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

Modified Files:
	tar-1.19-xattrs-conf.patch tar-1.19-xattrs.patch 
Log Message:
fix fuzz in patches

tar-1.19-xattrs-conf.patch:

Index: tar-1.19-xattrs-conf.patch
===================================================================
RCS file: /cvs/extras/rpms/tar/devel/tar-1.19-xattrs-conf.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- tar-1.19-xattrs-conf.patch	29 Aug 2008 16:02:24 -0000	1.3
+++ tar-1.19-xattrs-conf.patch	5 Jan 2009 16:13:30 -0000	1.4
@@ -115,7 +115,7 @@
  /* Define to 1 if you have the <grp.h> header file. */
  #undef HAVE_GRP_H
  
-@@ -444,12 +459,27 @@
+@@ -444,15 +459,30 @@
  /* Define to 1 if you have the `lchown' function. */
  #undef HAVE_LCHOWN
  
@@ -125,9 +125,12 @@
 +/* Define to 1 if you have the `acl' library (-lacl). */
 +#undef HAVE_LIBACL
 +
+ /* Define to 1 if you have the <libintl.h> header file. */
+ #undef HAVE_LIBINTL_H
++
 +/* Define to 1 if you have the `selinux' library (-lselinux). */
 +#undef HAVE_LIBSELINUX
-+
+ 
  /* Define to 1 if you have the <linewrap.h> header file. */
  #undef HAVE_LINEWRAP_H
  

tar-1.19-xattrs.patch:

Index: tar-1.19-xattrs.patch
===================================================================
RCS file: /cvs/extras/rpms/tar/devel/tar-1.19-xattrs.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- tar-1.19-xattrs.patch	21 Nov 2008 17:44:38 -0000	1.7
+++ tar-1.19-xattrs.patch	5 Jan 2009 16:13:30 -0000	1.8
@@ -722,8 +722,8 @@
    NEWER_MTIME_OPTION,
 +  NO_ACLS_OPTION,
    NO_ANCHORED_OPTION,
+   NO_AUTO_COMPRESS_OPTION,
    NO_CHECK_DEVICE_OPTION,
-   NO_DELAY_DIRECTORY_RESTORE_OPTION,
 @@ -280,9 +282,11 @@ enum
    NO_RECURSION_OPTION,
    NO_SAME_OWNER_OPTION,



From nsantos at fedoraproject.org  Mon Jan  5 16:16:34 2009
From: nsantos at fedoraproject.org (Nuno Santos)
Date: Mon,  5 Jan 2009 16:16:34 +0000 (UTC)
Subject: rpms/rhm/F-9 rhm.spec,1.27,1.28
Message-ID: <20090105161634.6633170108@cvs1.fedora.phx.redhat.com>

Author: nsantos

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

Modified Files:
	rhm.spec 
Log Message:
require specific version of qpidc/d


Index: rhm.spec
===================================================================
RCS file: /cvs/extras/rpms/rhm/F-9/rhm.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- rhm.spec	23 Dec 2008 21:42:18 -0000	1.27
+++ rhm.spec	5 Jan 2009 16:16:03 -0000	1.28
@@ -8,7 +8,7 @@
 
 Name:           rhm
 Version:        0.4.%{svnrev}
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Red Hat persistence extension to the Qpid messaging system
 Group:          System Environment/Libraries
 License:        LGPLv2+
@@ -18,14 +18,14 @@
 
 ExclusiveArch: i386 x86_64
 
-BuildRequires: qpidc-devel
-BuildRequires: qpidd-devel
+BuildRequires: qpidc-devel = 0.4.%{svnrev_qpid}
+BuildRequires: qpidd-devel = 0.4.%{svnrev_qpid}
 BuildRequires: db4-devel
 BuildRequires: libaio-devel
 BuildRequires: python
 BuildRequires: libtool
 
-Requires: qpidd >= 0.4.%{svnrev_qpid}
+Requires: qpidd = 0.4.%{svnrev_qpid}
 Requires: db4
 Requires: libaio
 



From tbzatek at fedoraproject.org  Mon Jan  5 16:16:55 2009
From: tbzatek at fedoraproject.org (Tomas Bzatek)
Date: Mon,  5 Jan 2009 16:16:55 +0000 (UTC)
Subject: rpms/gamin/F-10 gamin-0.1.10-gnueabi.patch, NONE, 1.1 gamin.spec,
	1.68, 1.69
Message-ID: <20090105161655.65F9970108@cvs1.fedora.phx.redhat.com>

Author: tbzatek

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

Modified Files:
	gamin.spec 
Added Files:
	gamin-0.1.10-gnueabi.patch 
Log Message:
* Mon Jan  5 2009 Tomas Bzatek <tbzatek at redhat.com> - 0.1.9-7
- Fix build on gnueabi (patch by Kedar Sovani)


gamin-0.1.10-gnueabi.patch:

--- NEW FILE gamin-0.1.10-gnueabi.patch ---
diff -up gamin-0.1.10/configure.in.old gamin-0.1.10/configure.in
--- gamin-0.1.10/configure.in.old	2008-11-24 16:23:06.000000000 +0100
+++ gamin-0.1.10/configure.in	2009-01-05 16:20:41.740669149 +0100
@@ -158,6 +158,10 @@ AC_ARG_ENABLE(debug,
 if test x$debug = xyes ; then
     AC_DEFINE([GAMIN_DEBUG], [], [Enable debugging support])
 fi
+#AM_CONDITIONAL(HAVE_LINUX, test x$target_os = xlinux-gnueabi)
+if test x$target_os = xlinux-gnueabi; then
+      AC_DEFINE([HAVE_LINUX],[],[Whether we are using linux or not])
+fi
 
 AM_CONDITIONAL(GAMIN_DEBUG, test x$debug = xyes)
 


Index: gamin.spec
===================================================================
RCS file: /cvs/extras/rpms/gamin/F-10/gamin.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- gamin.spec	21 Jul 2008 14:36:41 -0000	1.68
+++ gamin.spec	5 Jan 2009 16:16:25 -0000	1.69
@@ -1,7 +1,7 @@
 Summary: Library providing the FAM File Alteration Monitor API
 Name: gamin
 Version: 0.1.9
-Release: 6%{?dist}%{?extra_release}
+Release: 7%{?dist}%{?extra_release}
 License: LGPLv2
 Group: Development/Libraries
 Source: gamin-%{version}.tar.gz
@@ -19,6 +19,12 @@
 # patching missing struct ucred in glibc headers
 # http://bugzilla.gnome.org/show_bug.cgi?id=525228
 Patch2: gamin-0.1.9-ucred-headers.patch
+# This fix addresses an issue with ARM, where the configuration triplet
+# happens to be armv5tel-redhat-linux-gnueabi instead of armv5tel-redhat-linux-gnu.
+# The patch declares HAVE_LINUX in case of linux-gnueabi as well.
+# Patch by Kedar Sovani <kedars at marvell.com>
+Patch3: gamin-0.1.10-gnueabi.patch
+
 
 %description
 This C library provides an API and ABI compatible file alteration
@@ -52,6 +58,7 @@
 %patch0 -p1 -b .poll-less
 %patch1 -p1 -b .filesystem-leak
 %patch2 -p1 -b .ucred
+%patch3 -p1 -b .gnueabi
 
 %build
 autoreconf --force --install
@@ -100,6 +107,9 @@
 %doc doc/python.html
 
 %changelog
+* Mon Jan  5 2009 Tomas Bzatek <tbzatek at redhat.com> - 0.1.9-7
+- Fix build on gnueabi (patch by Kedar Sovani)
+
 * Mon Jul 21 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.1.9-6
 - fix license tag
 



From buc at fedoraproject.org  Mon Jan  5 16:18:12 2009
From: buc at fedoraproject.org (Dmitry Butskoy)
Date: Mon,  5 Jan 2009 16:18:12 +0000 (UTC)
Subject: rpms/newscache/devel newscache.spec,1.11,1.12
Message-ID: <20090105161812.6A91370108@cvs1.fedora.phx.redhat.com>

Author: buc

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

Modified Files:
	newscache.spec 
Log Message:



Index: newscache.spec
===================================================================
RCS file: /cvs/extras/rpms/newscache/devel/newscache.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- newscache.spec	5 Jan 2009 15:55:26 -0000	1.11
+++ newscache.spec	5 Jan 2009 16:17:42 -0000	1.12
@@ -48,10 +48,10 @@
 pushd socket++-%{socketver}
 #./autogen
 aclocal
-libtoolize -v -f
+autoconf
 autoheader
+libtoolize -v -f
 automake --add-missing
-autoconf
 %configure --enable-static --disable-shared
 make
 popd



From pkgdb at fedoraproject.org  Mon Jan  5 16:21:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Jan 2009 16:21:49 +0000
Subject: [pkgdb] cmake: rdieter has requested watchbugzilla
Message-ID: <20090105162149.6D09420873E@bastion.fedora.phx.redhat.com>

rdieter has requested the watchbugzilla acl on cmake (Fedora devel)

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



From pkgdb at fedoraproject.org  Mon Jan  5 16:21:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Jan 2009 16:21:51 +0000
Subject: [pkgdb] cmake: rdieter has requested watchcommits
Message-ID: <20090105162151.5CF52208D2B@bastion.fedora.phx.redhat.com>

rdieter has requested the watchcommits acl on cmake (Fedora devel)

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



From pkgdb at fedoraproject.org  Mon Jan  5 16:21:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Jan 2009 16:21:54 +0000
Subject: [pkgdb] cmake: rdieter has requested commit
Message-ID: <20090105162154.20CCA208D57@bastion.fedora.phx.redhat.com>

rdieter has requested the commit acl on cmake (Fedora devel)

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



From nsantos at fedoraproject.org  Mon Jan  5 16:32:16 2009
From: nsantos at fedoraproject.org (Nuno Santos)
Date: Mon,  5 Jan 2009 16:32:16 +0000 (UTC)
Subject: rpms/rhm/devel rhm.spec,1.31,1.32
Message-ID: <20090105163216.3568770108@cvs1.fedora.phx.redhat.com>

Author: nsantos

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

Modified Files:
	rhm.spec 
Log Message:
require specific version of qpidc/d


Index: rhm.spec
===================================================================
RCS file: /cvs/extras/rpms/rhm/devel/rhm.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- rhm.spec	23 Dec 2008 21:43:52 -0000	1.31
+++ rhm.spec	5 Jan 2009 16:31:45 -0000	1.32
@@ -8,7 +8,7 @@
 
 Name:           rhm
 Version:        0.4.%{svnrev}
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Red Hat persistence extension to the Qpid messaging system
 Group:          System Environment/Libraries
 License:        LGPLv2+
@@ -18,14 +18,14 @@
 
 ExclusiveArch: i386 x86_64
 
-BuildRequires: qpidc-devel
-BuildRequires: qpidd-devel
+BuildRequires: qpidc-devel = 0.4.%{svnrev_qpid}
+BuildRequires: qpidd-devel = 0.4.%{svnrev_qpid}
 BuildRequires: db4-devel
 BuildRequires: libaio-devel
 BuildRequires: python
 BuildRequires: libtool
 
-Requires: qpidd >= 0.4.%{svnrev_qpid}
+Requires: qpidd = 0.4.%{svnrev_qpid}
 Requires: db4
 Requires: libaio
 



From pkgdb at fedoraproject.org  Mon Jan  5 16:32:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Jan 2009 16:32:47 +0000
Subject: [pkgdb] cmake: rdieter has requested watchbugzilla
Message-ID: <20090105163247.E8E3920873B@bastion.fedora.phx.redhat.com>

rdieter has requested the watchbugzilla acl on cmake (Fedora 10)

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



From pkgdb at fedoraproject.org  Mon Jan  5 16:32:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Jan 2009 16:32:49 +0000
Subject: [pkgdb] cmake: rdieter has requested watchcommits
Message-ID: <20090105163249.4D00B208D50@bastion.fedora.phx.redhat.com>

rdieter has requested the watchcommits acl on cmake (Fedora 10)

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



From pkgdb at fedoraproject.org  Mon Jan  5 16:32:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Jan 2009 16:32:49 +0000
Subject: [pkgdb] cmake: rdieter has requested commit
Message-ID: <20090105163249.4BC63208D4F@bastion.fedora.phx.redhat.com>

rdieter has requested the commit acl on cmake (Fedora 10)

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



From pkgdb at fedoraproject.org  Mon Jan  5 16:32:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Jan 2009 16:32:57 +0000
Subject: [pkgdb] cmake: rdieter has requested approveacls
Message-ID: <20090105163258.01693208D57@bastion.fedora.phx.redhat.com>

rdieter has requested the approveacls acl on cmake (Fedora 10)

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



From pkgdb at fedoraproject.org  Mon Jan  5 16:33:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Jan 2009 16:33:03 +0000
Subject: [pkgdb] cmake: rdieter has given up approveacls
Message-ID: <20090105163303.5604A20873B@bastion.fedora.phx.redhat.com>

rdieter has given up the approveacls acl on cmake (Fedora 10)

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



From emaldonado at fedoraproject.org  Mon Jan  5 16:36:05 2009
From: emaldonado at fedoraproject.org (Elio Maldonado)
Date: Mon,  5 Jan 2009 16:36:05 +0000 (UTC)
Subject: rpms/crypto-utils/devel genkey.pl,1.25,1.26
Message-ID: <20090105163605.0CC5070108@cvs1.fedora.phx.redhat.com>

Author: emaldonado

Update of /cvs/extras/rpms/crypto-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11118

Modified Files:
	genkey.pl 
Log Message:
fix ca key file name


Index: genkey.pl
===================================================================
RCS file: /cvs/extras/rpms/crypto-utils/devel/genkey.pl,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- genkey.pl	29 Dec 2008 00:51:01 -0000	1.25
+++ genkey.pl	5 Jan 2009 16:35:34 -0000	1.26
@@ -154,7 +154,7 @@
 $tmpPasswordFile = ''; # none has been created yet
 $keyfile = $ssltop."/private/".$servername.".key";
 if ($ca_mode) {
-    $keyfile = $cadir."/private/".$servername;
+    $keyfile = $cadir."/private/".$servername."."key";
 }
 
 ### State variables



From pghmcfc at fedoraproject.org  Mon Jan  5 16:44:51 2009
From: pghmcfc at fedoraproject.org (Paul Howarth)
Date: Mon,  5 Jan 2009 16:44:51 +0000 (UTC)
Subject: rpms/perl-Test-Warn/F-10 .cvsignore, 1.4, 1.5 perl-Test-Warn.spec,
	1.8, 1.9 sources, 1.4, 1.5
Message-ID: <20090105164451.D130370140@cvs1.fedora.phx.redhat.com>

Author: pghmcfc

Update of /cvs/pkgs/rpms/perl-Test-Warn/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14974

Modified Files:
	.cvsignore perl-Test-Warn.spec sources 
Log Message:
Resync with devel (#477298)


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-Warn/F-10/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	5 May 2007 13:57:17 -0000	1.4
+++ .cvsignore	5 Jan 2009 16:44:21 -0000	1.5
@@ -1 +1 @@
-Test-Warn-0.10.tar.gz
+Test-Warn-0.11.tar.gz


Index: perl-Test-Warn.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-Warn/F-10/perl-Test-Warn.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- perl-Test-Warn.spec	2 Mar 2008 15:56:35 -0000	1.8
+++ perl-Test-Warn.spec	5 Jan 2009 16:44:21 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           perl-Test-Warn
-Version:        0.10
-Release:        3%{?dist}
+Version:        0.11
+Release:        1%{?dist}
 Summary:        Perl extension to test methods for warnings
 
 Group:          Development/Libraries
@@ -10,14 +10,22 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
+BuildRequires:  perl(Array::Compare)
+BuildRequires:  perl(ExtUtils::MakeMaker)
+BuildRequires:  perl(File::Spec)
 BuildRequires:  perl(Sub::Uplevel) >= 0.12
+BuildRequires:  perl(Test::Builder) >= 0.13
+BuildRequires:  perl(Test::Builder::Tester)
 BuildRequires:  perl(Test::Exception)
-BuildRequires:  perl(Array::Compare)
-BuildRequires:  perl(Tree::DAG_Node)
+BuildRequires:  perl(Test::More)
 BuildRequires:  perl(Test::Pod)
+BuildRequires:  perl(Tree::DAG_Node)
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+Requires:       perl(Test::Builder) >= 0.13
+Requires:       perl(Test::Builder::Tester)
 Requires:       perl(Tree::DAG_Node)
 
+
 %description
 This module provides a few convenience methods for testing warning
 based code.
@@ -56,6 +64,12 @@
 
 
 %changelog
+* Sat Dec 20 2008 Paul Howarth <paul at city-fan.org> - 0.11-1
+- Update to 0.11 (#477298)
+- Buildreq ExtUtils::MakeMaker, File::Spec, Test::Builder,
+  Test::Builder::Tester, and Test::More (from upstream Makefile.PL)
+- Add runtime dependencies on Test::Builder and Test::Builder::Tester
+
 * Wed Feb 27 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.10-3
 - Rebuild for perl 5.10 (again)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-Warn/F-10/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	5 May 2007 13:57:17 -0000	1.4
+++ sources	5 Jan 2009 16:44:21 -0000	1.5
@@ -1 +1 @@
-17557bbc8eefadf9f088ae4ab73e9976  Test-Warn-0.10.tar.gz
+1000ef6d94b54ca9eb75fb994a7e8bec  Test-Warn-0.11.tar.gz



From bpepple at fedoraproject.org  Mon Jan  5 16:45:48 2009
From: bpepple at fedoraproject.org (Brian Pepple)
Date: Mon,  5 Jan 2009 16:45:48 +0000 (UTC)
Subject: rpms/python-telepathy/devel .cvsignore, 1.14,
	1.15 python-telepathy.spec, 1.24, 1.25 sources, 1.14, 1.15
Message-ID: <20090105164548.DF46070108@cvs1.fedora.phx.redhat.com>

Author: bpepple

Update of /cvs/pkgs/rpms/python-telepathy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16163

Modified Files:
	.cvsignore python-telepathy.spec sources 
Log Message:
* Mon Jan  5 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.15.4-1
- Update to 0.15.4.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-telepathy/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	21 Oct 2008 14:43:36 -0000	1.14
+++ .cvsignore	5 Jan 2009 16:45:18 -0000	1.15
@@ -1 +1 @@
-telepathy-python-0.15.3.tar.gz
+telepathy-python-0.15.4.tar.gz


Index: python-telepathy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-telepathy/devel/python-telepathy.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- python-telepathy.spec	29 Nov 2008 16:01:47 -0000	1.24
+++ python-telepathy.spec	5 Jan 2009 16:45:18 -0000	1.25
@@ -1,8 +1,8 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           python-telepathy
-Version:        0.15.3
-Release:        2%{?dist}
+Version:        0.15.4
+Release:        1%{?dist}
 Summary:        Python libraries for Telepathy
 
 Group:          Development/Languages
@@ -49,6 +49,9 @@
 
 
 %changelog
+* Mon Jan  5 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.15.4-1
+- Update to 0.15.4.
+
 * Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 0.15.3-2
 - Rebuild for Python 2.6
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-telepathy/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	21 Oct 2008 14:43:36 -0000	1.14
+++ sources	5 Jan 2009 16:45:18 -0000	1.15
@@ -1 +1 @@
-594a66a70764052e30df9428b5be52b2  telepathy-python-0.15.3.tar.gz
+e5c7428c38359cf2db387ab1ffac2c84  telepathy-python-0.15.4.tar.gz



From tanguy at fedoraproject.org  Mon Jan  5 16:49:11 2009
From: tanguy at fedoraproject.org (Eric Tanguy)
Date: Mon,  5 Jan 2009 16:49:11 +0000 (UTC)
Subject: rpms/scidavis/devel scidavis-0.1.3-python26.patch, NONE,
	1.1 scidavis.spec, 1.5, 1.6
Message-ID: <20090105164911.2CFD470108@cvs1.fedora.phx.redhat.com>

Author: tanguy

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

Modified Files:
	scidavis.spec 
Added Files:
	scidavis-0.1.3-python26.patch 
Log Message:


scidavis-0.1.3-python26.patch:

--- NEW FILE scidavis-0.1.3-python26.patch ---
--- scidavis-0.1.3/scidavis/python.pri	2008-02-25 20:32:02.000000000 +0100
+++ scidavis-0.1.3/scidavis/python.pri.new	2009-01-05 17:42:39.000000000 +0100
@@ -15,8 +15,8 @@
   SOURCES += src/PythonScript.cpp src/PythonScripting.cpp
 
   unix {
-    INCLUDEPATH += $$system(python python-includepath.py)
-    LIBS        += $$system(python -c "\"from distutils import sysconfig; print '-lpython'+sysconfig.get_config_var('VERSION')\"")
+    INCLUDEPATH += /usr/include/python2.6
+    LIBS        += -lpython2.6
     LIBS        += -lm
     system(mkdir -p $${SIP_DIR})
     system($$system(python python-sipcmd.py) -c $${SIP_DIR} src/scidavis.sip)


Index: scidavis.spec
===================================================================
RCS file: /cvs/extras/rpms/scidavis/devel/scidavis.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- scidavis.spec	1 Dec 2008 05:03:52 -0000	1.5
+++ scidavis.spec	5 Jan 2009 16:48:40 -0000	1.6
@@ -5,6 +5,7 @@
 Source0:	http://download.sourceforge.net/sourceforge/scidavis/%{name}-%{version}.tar.bz2
 Source1:	http://download.sourceforge.net/sourceforge/scidavis/scidavis-manual-0.1_2008-02-28.tar.bz2
 Patch0:		scidavis-0.1.3-pro.patch
+Patch1:		scidavis-0.1.3-pyton26.patch
 URL:		http://scidavis.sourceforge.net/
 License:	GPLv2
 Group: 		Applications/Engineering
@@ -29,6 +30,7 @@
 %prep
 %setup -q -a 1
 %patch0 -p1
+%patch1 -p1
 
 sed -i -e 's/x-sciprj/x-sciprj;/' scidavis/scidavis.desktop
 sed -i -e 's/50/100/' scidavis/scidavis.xml



From pghmcfc at fedoraproject.org  Mon Jan  5 16:50:12 2009
From: pghmcfc at fedoraproject.org (Paul Howarth)
Date: Mon,  5 Jan 2009 16:50:12 +0000 (UTC)
Subject: rpms/perl-Test-Warn/F-9 .cvsignore, 1.4, 1.5 perl-Test-Warn.spec,
	1.8, 1.9 sources, 1.4, 1.5
Message-ID: <20090105165012.547AC70108@cvs1.fedora.phx.redhat.com>

Author: pghmcfc

Update of /cvs/pkgs/rpms/perl-Test-Warn/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17672

Modified Files:
	.cvsignore perl-Test-Warn.spec sources 
Log Message:
Resync with devel (#477298)


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-Warn/F-9/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	5 May 2007 13:57:17 -0000	1.4
+++ .cvsignore	5 Jan 2009 16:49:41 -0000	1.5
@@ -1 +1 @@
-Test-Warn-0.10.tar.gz
+Test-Warn-0.11.tar.gz


Index: perl-Test-Warn.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-Warn/F-9/perl-Test-Warn.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- perl-Test-Warn.spec	2 Mar 2008 15:56:35 -0000	1.8
+++ perl-Test-Warn.spec	5 Jan 2009 16:49:42 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           perl-Test-Warn
-Version:        0.10
-Release:        3%{?dist}
+Version:        0.11
+Release:        1%{?dist}
 Summary:        Perl extension to test methods for warnings
 
 Group:          Development/Libraries
@@ -10,14 +10,22 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
+BuildRequires:  perl(Array::Compare)
+BuildRequires:  perl(ExtUtils::MakeMaker)
+BuildRequires:  perl(File::Spec)
 BuildRequires:  perl(Sub::Uplevel) >= 0.12
+BuildRequires:  perl(Test::Builder) >= 0.13
+BuildRequires:  perl(Test::Builder::Tester)
 BuildRequires:  perl(Test::Exception)
-BuildRequires:  perl(Array::Compare)
-BuildRequires:  perl(Tree::DAG_Node)
+BuildRequires:  perl(Test::More)
 BuildRequires:  perl(Test::Pod)
+BuildRequires:  perl(Tree::DAG_Node)
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+Requires:       perl(Test::Builder) >= 0.13
+Requires:       perl(Test::Builder::Tester)
 Requires:       perl(Tree::DAG_Node)
 
+
 %description
 This module provides a few convenience methods for testing warning
 based code.
@@ -56,6 +64,12 @@
 
 
 %changelog
+* Sat Dec 20 2008 Paul Howarth <paul at city-fan.org> - 0.11-1
+- Update to 0.11 (#477298)
+- Buildreq ExtUtils::MakeMaker, File::Spec, Test::Builder,
+  Test::Builder::Tester, and Test::More (from upstream Makefile.PL)
+- Add runtime dependencies on Test::Builder and Test::Builder::Tester
+
 * Wed Feb 27 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.10-3
 - Rebuild for perl 5.10 (again)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-Warn/F-9/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	5 May 2007 13:57:17 -0000	1.4
+++ sources	5 Jan 2009 16:49:42 -0000	1.5
@@ -1 +1 @@
-17557bbc8eefadf9f088ae4ab73e9976  Test-Warn-0.10.tar.gz
+1000ef6d94b54ca9eb75fb994a7e8bec  Test-Warn-0.11.tar.gz



From hadess at fedoraproject.org  Mon Jan  5 16:52:24 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Mon,  5 Jan 2009 16:52:24 +0000 (UTC)
Subject: rpms/rhythmbox/devel rhythmbox.spec, 1.219,
	1.220 rhythmbox-iradio-initial.pls, 1.2, NONE
Message-ID: <20090105165224.5CE3270108@cvs1.fedora.phx.redhat.com>

Author: hadess

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

Modified Files:
	rhythmbox.spec 
Removed Files:
	rhythmbox-iradio-initial.pls 
Log Message:
* Mon Jan 05 2009 - Bastien Nocera <bnocera at redhat.com> - 0.11.6-20.r6096
- Don't ship our own iradio playlist, the changes are already upstream



Index: rhythmbox.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rhythmbox/devel/rhythmbox.spec,v
retrieving revision 1.219
retrieving revision 1.220
diff -u -r1.219 -r1.220
--- rhythmbox.spec	9 Dec 2008 15:10:20 -0000	1.219
+++ rhythmbox.spec	5 Jan 2009 16:51:53 -0000	1.220
@@ -3,13 +3,12 @@
 Name: rhythmbox
 Summary: Music Management Application 
 Version: 0.11.6
-Release: 19.r6096%{?dist}
+Release: 20.r6096%{?dist}
 License: GPLv2+ with exceptions and GFDL
 Group: Applications/Multimedia
 URL: http://projects.gnome.org/rhythmbox/
 #Source: http://download.gnome.org/sources/rhythmbox/0.11/%{name}-%{version}.tar.bz2
 Source: %{name}-%{version}-r6096.tar.gz
-Source1: rhythmbox-iradio-initial.pls
 # http://bugzilla.gnome.org/show_bug.cgi?id=524079
 Source2: rhythmbox.png
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -117,9 +116,6 @@
 
 %find_lang %name --with-gnome
 
-# Replace the default radios with Ogg Radios
-cp -a %{SOURCE1} %{buildroot}%{_libdir}/rhythmbox/plugins/iradio/iradio-initial.pls
-
 # Install a 24x24 icon
 install -m 0755 -d %{buildroot}%{_datadir}/icons/hicolor/24x24/apps/
 install -m 0644 %{SOURCE2} %{buildroot}%{_datadir}/icons/hicolor/24x24/apps/rhythmbox.png
@@ -222,6 +218,9 @@
 %{_libdir}/rhythmbox/plugins/upnp_coherence
 
 %changelog
+* Mon Jan 05 2009 - Bastien Nocera <bnocera at redhat.com> - 0.11.6-20.r6096
+- Don't ship our own iradio playlist, the changes are already upstream
+
 * Tue Dec 09 2008 - Bastien Nocera <bnocera at redhat.com> - 0.11.6-19.r6096
 - Update to rev 6096
 - Fixes some crashers during playback


--- rhythmbox-iradio-initial.pls DELETED ---



From cweyl at fedoraproject.org  Mon Jan  5 16:53:48 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Mon,  5 Jan 2009 16:53:48 +0000 (UTC)
Subject: rpms/perl-Moose/F-10 perl-Moose.spec,1.26,1.27 sources,1.20,1.21
Message-ID: <20090105165348.8157070108@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Moose/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19306

Modified Files:
	perl-Moose.spec sources 
Log Message:
* Sun Jan 04 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.64-1
- update to 0.64



Index: perl-Moose.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Moose/F-10/perl-Moose.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- perl-Moose.spec	6 Sep 2008 22:21:34 -0000	1.26
+++ perl-Moose.spec	5 Jan 2009 16:53:18 -0000	1.27
@@ -1,11 +1,11 @@
 Name:           perl-Moose
-Version:        0.57
-Release:        2%{?dist}
+Version:        0.64
+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
+# source tends to flip between these four 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
@@ -14,16 +14,15 @@
 BuildArch:      noarch
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
-# core
-BuildRequires:  perl(Test::More)         >= 0.62
 BuildRequires:  perl(ExtUtils::MakeMaker)
-# cpan
-BuildRequires:  perl(Class::MOP)         >= 0.65
-BuildRequires:  perl(Module::Build) 
+BuildRequires:  perl(Class::MOP)         >= 0.75
 BuildRequires:  perl(Filter::Simple) 
-BuildRequires:  perl(List::MoreUtils)
+BuildRequires:  perl(List::MoreUtils)    >= 0.12
+BuildRequires:  perl(Scalar::Util)       >= 1.19
 BuildRequires:  perl(Sub::Exporter)      >= 0.954
 BuildRequires:  perl(Sub::Install)       >= 0.92
+BuildRequires:  perl(Task::Weaken)
+BuildRequires:  perl(Test::More)         >= 0.77
 BuildRequires:  perl(Test::Exception)    >= 0.21
 BuildRequires:  perl(Test::LongString)
 BuildRequires:  perl(UNIVERSAL::require) >= 0.10
@@ -112,6 +111,30 @@
 %{_mandir}/man3/*
 
 %changelog
+* Sun Jan 04 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.64-1
+- update to 0.64
+
+* Sun Dec 28 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.63-1
+- update to 0.63
+- bump br versions on Moose, List::MoreUtils
+
+* Sat Dec 06 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.62-1
+- update to 0.62
+- new Task::Weaken and Class::MOP requirements
+
+* Sat Nov 08 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.61-4
+- aaaand drop them again, as it was really perl-Class-MOP's issue.
+
+* Sat Nov 08 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.61-3
+- same with Devel::GlobalDestruction (same RT as below)
+
+* Sat Nov 08 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.61-2
+- add Sub::Name as a build dep (RT#40772)
+
+* Sat Nov 08 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.61-1
+- update to 0.61
+- update BR's
+
 * Sat Sep 06 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.57-2
 - add additional test BR's
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Moose/F-10/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources	6 Sep 2008 19:45:30 -0000	1.20
+++ sources	5 Jan 2009 16:53:18 -0000	1.21
@@ -1 +1 @@
-624b995525536edd1b3d4b39bdcafb77  Moose-0.57.tar.gz
+1f1dfa4312926b272e05e3a9b89dca5b  Moose-0.64.tar.gz



From cweyl at fedoraproject.org  Mon Jan  5 16:54:20 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Mon,  5 Jan 2009 16:54:20 +0000 (UTC)
Subject: rpms/perl-Moose/F-9 perl-Moose.spec,1.23,1.24 sources,1.18,1.19
Message-ID: <20090105165421.0018D70108@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Moose/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19451

Modified Files:
	perl-Moose.spec sources 
Log Message:
* Sun Jan 04 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.64-1
- update to 0.64



Index: perl-Moose.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Moose/F-9/perl-Moose.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- perl-Moose.spec	22 Jul 2008 04:28:38 -0000	1.23
+++ perl-Moose.spec	5 Jan 2009 16:53:50 -0000	1.24
@@ -1,27 +1,28 @@
 Name:           perl-Moose
-Version:        0.54
+Version:        0.64
 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
+# source tends to flip between these four 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
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
-# core
-BuildRequires:  perl(Test::More)         >= 0.62
 BuildRequires:  perl(ExtUtils::MakeMaker)
-# cpan
-BuildRequires:  perl(Class::MOP)         >= 0.55
-BuildRequires:  perl(Module::Build) 
+BuildRequires:  perl(Class::MOP)         >= 0.75
 BuildRequires:  perl(Filter::Simple) 
+BuildRequires:  perl(List::MoreUtils)    >= 0.12
+BuildRequires:  perl(Scalar::Util)       >= 1.19
 BuildRequires:  perl(Sub::Exporter)      >= 0.954
 BuildRequires:  perl(Sub::Install)       >= 0.92
+BuildRequires:  perl(Task::Weaken)
+BuildRequires:  perl(Test::More)         >= 0.77
 BuildRequires:  perl(Test::Exception)    >= 0.21
 BuildRequires:  perl(Test::LongString)
 BuildRequires:  perl(UNIVERSAL::require) >= 0.10
@@ -43,6 +44,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
@@ -107,6 +111,36 @@
 %{_mandir}/man3/*
 
 %changelog
+* Sun Jan 04 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.64-1
+- update to 0.64
+
+* Sun Dec 28 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.63-1
+- update to 0.63
+- bump br versions on Moose, List::MoreUtils
+
+* Sat Dec 06 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.62-1
+- update to 0.62
+- new Task::Weaken and Class::MOP requirements
+
+* Sat Nov 08 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.61-4
+- aaaand drop them again, as it was really perl-Class-MOP's issue.
+
+* Sat Nov 08 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.61-3
+- same with Devel::GlobalDestruction (same RT as below)
+
+* Sat Nov 08 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.61-2
+- add Sub::Name as a build dep (RT#40772)
+
+* Sat Nov 08 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.61-1
+- update to 0.61
+- update BR's
+
+* 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
+
 * 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/F-9/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources	22 Jul 2008 04:28:38 -0000	1.18
+++ sources	5 Jan 2009 16:53:50 -0000	1.19
@@ -1 +1 @@
-53b5cddeb1e287b29f87966c9ad3e433  Moose-0.54.tar.gz
+1f1dfa4312926b272e05e3a9b89dca5b  Moose-0.64.tar.gz



From dwmw2 at fedoraproject.org  Mon Jan  5 16:57:49 2009
From: dwmw2 at fedoraproject.org (David Woodhouse)
Date: Mon,  5 Jan 2009 16:57:49 +0000 (UTC)
Subject: rpms/NetworkManager-openconnect/F-9 .cvsignore, 1.3,
	1.4 NetworkManager-openconnect.spec, 1.3, 1.4 sources, 1.3, 1.4
Message-ID: <20090105165749.C7F9370108@cvs1.fedora.phx.redhat.com>

Author: dwmw2

Update of /cvs/pkgs/rpms/NetworkManager-openconnect/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20376

Modified Files:
	.cvsignore NetworkManager-openconnect.spec sources 
Log Message:
update translations and rebuild


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager-openconnect/F-9/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	21 Dec 2008 10:02:25 -0000	1.3
+++ .cvsignore	5 Jan 2009 16:57:19 -0000	1.4
@@ -1 +1 @@
-NetworkManager-openconnect-0.7.0.svn9.tar.gz
+NetworkManager-openconnect-0.7.0.svn14.tar.gz


Index: NetworkManager-openconnect.spec
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager-openconnect/F-9/NetworkManager-openconnect.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- NetworkManager-openconnect.spec	22 Dec 2008 11:15:21 -0000	1.3
+++ NetworkManager-openconnect.spec	5 Jan 2009 16:57:19 -0000	1.4
@@ -3,20 +3,20 @@
 %define gtk2_version        2.10.0
 %define openconnect_version 0.99
 
-%define svn_snapshot        svn9
+%define svn_snapshot        svn14
 
 Summary:   NetworkManager VPN integration for openconnect
 Name:      NetworkManager-openconnect
 Version:   0.7.0
-Release:   3.%{svn_snapshot}%{?dist}
+Release:   4.%{svn_snapshot}%{?dist}
 License:   GPLv2+
 Group:     System Environment/Base
 URL:       http://www.gnome.org/projects/NetworkManager/
 # Created from the git mirror of GNOME SVN:
 # git-clone git://git.infradead.org/network-manager-openconnect.git
 # cd network-manager-openconnect
-# git-archive --format=tar --prefix=NetworkManager-openconnect-0.7.0/ daf365e \
-#                 | gzip -9 > NetworkManager-openconnect-0.7.0.svn9.tar.gz
+# git-archive --format=tar --prefix=NetworkManager-openconnect-0.7.0/ b94964eb \
+#                 | gzip -9 > NetworkManager-openconnect-0.7.0.svn14.tar.gz
 Source:    %{name}-%{version}.%{svn_snapshot}.tar.gz
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
@@ -102,6 +102,10 @@
 %{_datadir}/gnome-vpn-properties/openconnect/nm-openconnect-dialog.glade
 
 %changelog
+* Mon Jan  5 2009 David Woodhouse <David.woodhouse at intel.com> 0.7.0-4.svn14
+- Rebuild for updated NetworkManager
+- Update translations from GNOME SVN
+
 * Sun Dec 21 2008 David Woodhouse <David.Woodhouse at intel.com> 0.7.0-3.svn9
 - Update from GNOME SVN (translations, review feedback merged)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager-openconnect/F-9/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	21 Dec 2008 10:02:25 -0000	1.3
+++ sources	5 Jan 2009 16:57:19 -0000	1.4
@@ -1 +1 @@
-e308cb5153019c03dd1837738845edc3  NetworkManager-openconnect-0.7.0.svn9.tar.gz
+9a8f8d94958f104345a986c9b6aa1cea  NetworkManager-openconnect-0.7.0.svn14.tar.gz



From tanguy at fedoraproject.org  Mon Jan  5 16:58:06 2009
From: tanguy at fedoraproject.org (Eric Tanguy)
Date: Mon,  5 Jan 2009 16:58:06 +0000 (UTC)
Subject: rpms/scidavis/devel scidavis.spec,1.6,1.7
Message-ID: <20090105165806.3609B70108@cvs1.fedora.phx.redhat.com>

Author: tanguy

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

Modified Files:
	scidavis.spec 
Log Message:



Index: scidavis.spec
===================================================================
RCS file: /cvs/extras/rpms/scidavis/devel/scidavis.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- scidavis.spec	5 Jan 2009 16:48:40 -0000	1.6
+++ scidavis.spec	5 Jan 2009 16:57:36 -0000	1.7
@@ -5,7 +5,7 @@
 Source0:	http://download.sourceforge.net/sourceforge/scidavis/%{name}-%{version}.tar.bz2
 Source1:	http://download.sourceforge.net/sourceforge/scidavis/scidavis-manual-0.1_2008-02-28.tar.bz2
 Patch0:		scidavis-0.1.3-pro.patch
-Patch1:		scidavis-0.1.3-pyton26.patch
+Patch1:		scidavis-0.1.3-python26.patch
 URL:		http://scidavis.sourceforge.net/
 License:	GPLv2
 Group: 		Applications/Engineering



From dwmw2 at fedoraproject.org  Mon Jan  5 16:58:47 2009
From: dwmw2 at fedoraproject.org (David Woodhouse)
Date: Mon,  5 Jan 2009 16:58:47 +0000 (UTC)
Subject: rpms/NetworkManager-openconnect/F-10 .cvsignore, 1.3,
	1.4 NetworkManager-openconnect.spec, 1.3, 1.4 sources, 1.3, 1.4
Message-ID: <20090105165847.D03A670108@cvs1.fedora.phx.redhat.com>

Author: dwmw2

Update of /cvs/pkgs/rpms/NetworkManager-openconnect/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20651

Modified Files:
	.cvsignore NetworkManager-openconnect.spec sources 
Log Message:
update translations and rebuild


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager-openconnect/F-10/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	21 Dec 2008 10:01:27 -0000	1.3
+++ .cvsignore	5 Jan 2009 16:58:17 -0000	1.4
@@ -1 +1 @@
-NetworkManager-openconnect-0.7.0.svn9.tar.gz
+NetworkManager-openconnect-0.7.0.svn14.tar.gz


Index: NetworkManager-openconnect.spec
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager-openconnect/F-10/NetworkManager-openconnect.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- NetworkManager-openconnect.spec	22 Dec 2008 11:18:11 -0000	1.3
+++ NetworkManager-openconnect.spec	5 Jan 2009 16:58:17 -0000	1.4
@@ -3,20 +3,20 @@
 %define gtk2_version        2.10.0
 %define openconnect_version 0.99
 
-%define svn_snapshot        svn9
+%define svn_snapshot        svn14
 
 Summary:   NetworkManager VPN integration for openconnect
 Name:      NetworkManager-openconnect
 Version:   0.7.0
-Release:   3.%{svn_snapshot}%{?dist}
+Release:   4.%{svn_snapshot}%{?dist}
 License:   GPLv2+
 Group:     System Environment/Base
 URL:       http://www.gnome.org/projects/NetworkManager/
 # Created from the git mirror of GNOME SVN:
 # git-clone git://git.infradead.org/network-manager-openconnect.git
 # cd network-manager-openconnect
-# git-archive --format=tar --prefix=NetworkManager-openconnect-0.7.0/ daf365e \
-#                 | gzip -9 > NetworkManager-openconnect-0.7.0.svn9.tar.gz
+# git-archive --format=tar --prefix=NetworkManager-openconnect-0.7.0/ b94964eb \
+#                 | gzip -9 > NetworkManager-openconnect-0.7.0.svn14.tar.gz
 Source:    %{name}-%{version}.%{svn_snapshot}.tar.gz
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
@@ -102,6 +102,10 @@
 %{_datadir}/gnome-vpn-properties/openconnect/nm-openconnect-dialog.glade
 
 %changelog
+* Mon Jan  5 2009 David Woodhouse <David.woodhouse at intel.com> 0.7.0-4.svn14
+- Rebuild for updated NetworkManager
+- Update translations from GNOME SVN
+
 * Sun Dec 21 2008 David Woodhouse <David.Woodhouse at intel.com> 0.7.0-3.svn9
 - Update from GNOME SVN (translations, review feedback merged)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager-openconnect/F-10/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	21 Dec 2008 10:01:28 -0000	1.3
+++ sources	5 Jan 2009 16:58:17 -0000	1.4
@@ -1 +1 @@
-e308cb5153019c03dd1837738845edc3  NetworkManager-openconnect-0.7.0.svn9.tar.gz
+9a8f8d94958f104345a986c9b6aa1cea  NetworkManager-openconnect-0.7.0.svn14.tar.gz



From ovasik at fedoraproject.org  Mon Jan  5 17:02:03 2009
From: ovasik at fedoraproject.org (Ondrej Vasik)
Date: Mon,  5 Jan 2009 17:02:03 +0000 (UTC)
Subject: rpms/xmlto/devel xmlto-stringparam.patch, NONE, 1.1 xmlto.spec, 1.42,
	1.43
Message-ID: <20090105170203.3F77270108@cvs1.fedora.phx.redhat.com>

Author: ovasik

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

Modified Files:
	xmlto.spec 
Added Files:
	xmlto-stringparam.patch 
Log Message:
fix stringparam option functionality, clarify licenses

xmlto-stringparam.patch:

--- NEW FILE xmlto-stringparam.patch ---
diff -urNp xmlto-0.0.21-orig/THANKS xmlto-0.0.21/THANKS
--- xmlto-0.0.21-orig/THANKS	2008-02-25 15:24:59.000000000 +0100
+++ xmlto-0.0.21/THANKS	2009-01-05 17:55:58.000000000 +0100
@@ -11,3 +11,4 @@ Shlomi Fish <shlomif at gmail.com>
 Braden McDaniel <braden at endoframe.com>
 Andreas Hoenen <andreas.hoenen at arcor.de>
 Graham Wilson <graham at debian.org>
+Joseph Parmelee <jparmele at wildbear.com>
diff -urNp xmlto-0.0.21-orig/xmlto.in xmlto-0.0.21/xmlto.in
--- xmlto-0.0.21-orig/xmlto.in	2008-05-30 15:41:31.000000000 +0200
+++ xmlto-0.0.21/xmlto.in	2009-01-05 17:55:12.000000000 +0100
@@ -273,8 +273,8 @@ while [ "$#" -gt "0" ]; do
 	;;
   --stringparam)
 	MYPARAM="$2"
-	XSLTPARAMS="XSLTPARAMS --stringparam ${MYPARAM%=*}"
-	XSLTPARAMS="XSLTPARAMS $MYPARAM#*=}"
+	XSLTPARAMS="$XSLTPARAMS --stringparam ${MYPARAM%=*}"
+	XSLTPARAMS="$XSLTPARAMS ${MYPARAM#*=}"
 	shift 2
 	;;
   --noclean)


Index: xmlto.spec
===================================================================
RCS file: /cvs/extras/rpms/xmlto/devel/xmlto.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- xmlto.spec	16 Dec 2008 16:36:52 -0000	1.42
+++ xmlto.spec	5 Jan 2009 17:01:32 -0000	1.43
@@ -1,7 +1,8 @@
 Summary: A tool for converting XML files to various formats
 Name: xmlto
 Version: 0.0.21
-Release: 4%{?dist}
+Release: 5%{?dist}
+#xmlto is released under GPLv2+ license, xmlif under GPL+ license
 License: GPLv2+ and GPL+
 Group: Applications/System
 #Older versions up to xmlto-0.0.20
@@ -9,6 +10,7 @@
 #Source0: http://cyberelk.net/tim/data/xmlto/stable/%{name}-%{version}.tar.bz2
 URL: https://fedorahosted.org/xmlto/
 Source0: https://fedorahosted.org/releases/x/m/%{name}/%{name}-%{version}.tar.bz2
+Patch0: xmlto-stringparam.patch
 
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -42,6 +44,7 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .stringparam
 
 %build
 %configure
@@ -74,6 +77,9 @@
 %{_datadir}/xmlto/format/fo/pdf
 
 %changelog
+* Mon Jan 05 2009 Ondrej Vasik <ovasik at redhat.com> - 0.0.21-5
+- fix stringparam option functionality
+
 * Tue Dec 16 2008 Ondrej Vasik <ovasik at redhat.com> - 0.0.21-4
 - merge review(#226568)
   correct doc filelist attributes, add License GPL+ for xmlif



From rishi at fedoraproject.org  Mon Jan  5 17:02:22 2009
From: rishi at fedoraproject.org (Debarshi Ray)
Date: Mon,  5 Jan 2009 17:02:22 +0000 (UTC)
Subject: rpms/anjuta/F-10 anjuta-2.24.2-webkit.patch, NONE, 1.1 .cvsignore, 
	1.13, 1.14 anjuta.spec, 1.55, 1.56 sources, 1.13,
	1.14 anjuta-2.24.1-webkit.patch, 1.1, NONE
Message-ID: <20090105170222.1DFD570108@cvs1.fedora.phx.redhat.com>

Author: rishi

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

Modified Files:
	.cvsignore anjuta.spec sources 
Added Files:
	anjuta-2.24.2-webkit.patch 
Removed Files:
	anjuta-2.24.1-webkit.patch 
Log Message:
* Sun Jan 04 2009 Debarshi Ray <rishi at fedoraproject.org> - 1:2.24.2-1
- Version bump to 2.24.2. Closes Red Hat Bugzilla bug #478684.


anjuta-2.24.2-webkit.patch:

--- NEW FILE anjuta-2.24.2-webkit.patch ---
diff -urNp anjuta-2.24.2.orig/configure anjuta-2.24.2/configure
--- anjuta-2.24.2.orig/configure	2009-01-04 15:27:36.000000000 +0530
+++ anjuta-2.24.2/configure	2009-01-04 15:27:51.000000000 +0530
@@ -2395,7 +2395,7 @@ VTE_REQUIRED=0.9.0
 VTE_NEW_REQUIRED=0.13.1
 LIBXML_REQUIRED=2.4.23
 PANGO_REQUIRED=1.1.1
-LIBDEVHELP_REQUIRED=0.13
+LIBDEVHELP_REQUIRED=0.22
 GDL_REQUIRED=0.7.3
 GNOMEBUILD_REQUIRED=0.3.0
 GLADEUI_REQUIRED=3.2.0
@@ -18753,12 +18753,12 @@ if test -n "$PKG_CONFIG"; then
         pkg_cv_PLUGIN_DEVHELP_CFLAGS="$PLUGIN_DEVHELP_CFLAGS"
     else
         if test -n "$PKG_CONFIG" && \
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libdevhelp-1.0 >= \$LIBDEVHELP_REQUIRED\"") >&5
-  ($PKG_CONFIG --exists --print-errors "libdevhelp-1.0 >= $LIBDEVHELP_REQUIRED") 2>&5
+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libdevhelp-1.0 >= \$LIBDEVHELP_REQUIRED webkit-1.0\"") >&5
+  ($PKG_CONFIG --exists --print-errors "libdevhelp-1.0 >= $LIBDEVHELP_REQUIRED webkit-1.0") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
-  pkg_cv_PLUGIN_DEVHELP_CFLAGS=`$PKG_CONFIG --cflags "libdevhelp-1.0 >= $LIBDEVHELP_REQUIRED" 2>/dev/null`
+  pkg_cv_PLUGIN_DEVHELP_CFLAGS=`$PKG_CONFIG --cflags "libdevhelp-1.0 >= $LIBDEVHELP_REQUIRED webkit-1.0" 2>/dev/null`
 else
   pkg_failed=yes
 fi
@@ -18771,12 +18771,12 @@ if test -n "$PKG_CONFIG"; then
         pkg_cv_PLUGIN_DEVHELP_LIBS="$PLUGIN_DEVHELP_LIBS"
     else
         if test -n "$PKG_CONFIG" && \
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libdevhelp-1.0 >= \$LIBDEVHELP_REQUIRED\"") >&5
-  ($PKG_CONFIG --exists --print-errors "libdevhelp-1.0 >= $LIBDEVHELP_REQUIRED") 2>&5
+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libdevhelp-1.0 >= \$LIBDEVHELP_REQUIRED webkit-1.0\"") >&5
+  ($PKG_CONFIG --exists --print-errors "libdevhelp-1.0 >= $LIBDEVHELP_REQUIRED webkit-1.0") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
-  pkg_cv_PLUGIN_DEVHELP_LIBS=`$PKG_CONFIG --libs "libdevhelp-1.0 >= $LIBDEVHELP_REQUIRED" 2>/dev/null`
+  pkg_cv_PLUGIN_DEVHELP_LIBS=`$PKG_CONFIG --libs "libdevhelp-1.0 >= $LIBDEVHELP_REQUIRED webkit-1.0" 2>/dev/null`
 else
   pkg_failed=yes
 fi
@@ -18795,9 +18795,9 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        PLUGIN_DEVHELP_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libdevhelp-1.0 >= $LIBDEVHELP_REQUIRED"`
+	        PLUGIN_DEVHELP_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libdevhelp-1.0 >= $LIBDEVHELP_REQUIRED webkit-1.0"`
         else
-	        PLUGIN_DEVHELP_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libdevhelp-1.0 >= $LIBDEVHELP_REQUIRED"`
+	        PLUGIN_DEVHELP_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libdevhelp-1.0 >= $LIBDEVHELP_REQUIRED webkit-1.0"`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$PLUGIN_DEVHELP_PKG_ERRORS" >&5
diff -urNp anjuta-2.24.2.orig/plugins/devhelp/anjuta-devhelp.ui anjuta-2.24.2/plugins/devhelp/anjuta-devhelp.ui
--- anjuta-2.24.2.orig/plugins/devhelp/anjuta-devhelp.ui	2009-01-04 15:27:36.000000000 +0530
+++ anjuta-2.24.2/plugins/devhelp/anjuta-devhelp.ui	2009-01-04 15:27:51.000000000 +0530
@@ -1,14 +1,6 @@
 <!--*- xml -*-->
 <ui>
 	<menubar name="MenuMain">
-		<menu name="MenuView" action="ActionMenuView">
-			<menu name="Goto" action="ActionMenuGoto">
-				<placeholder name="PlaceholderGotoMenus">
-					<menuitem name="BackHelp" action="ActionDevhelpBack" />
-					<menuitem name="ForwardHelp" action="ActionDevhelpForward" />
-				</placeholder>
-			</menu>
-		</menu>
 		<placeholder name="PlaceHolderHelpMenus" >
 			<menu name="MenuHelp" action="ActionMenuHelp" >
 				<placeholder name="PlaceHolderHelpDevel" >
@@ -24,7 +16,5 @@
 	</toolbar>
 	<toolbar name="ToolbarBrowser">		
 		<toolitem name="Context" action="ActionHelpContext" />
-		<toolitem name="BackHelp" action="ActionDevhelpBack" />
-		<toolitem name="ForwardHelp" action="ActionDevhelpForward" />
 	</toolbar>
 </ui>
diff -urNp anjuta-2.24.2.orig/plugins/devhelp/htmlview.c anjuta-2.24.2/plugins/devhelp/htmlview.c
--- anjuta-2.24.2.orig/plugins/devhelp/htmlview.c	2009-01-04 15:27:36.000000000 +0530
+++ anjuta-2.24.2/plugins/devhelp/htmlview.c	1970-01-01 05:30:00.000000000 +0530
@@ -1,182 +0,0 @@
-/*
- *  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 Library 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.
- */
-
-#include "htmlview.h"
-
-#include <devhelp/dh-book-tree.h>
-#include <devhelp/dh-html.h>
-#include <devhelp/dh-preferences.h>
-#include <devhelp/dh-search.h>
-#include <devhelp/dh-base.h>
-
-static void html_view_class_init(HtmlViewClass *klass);
-static void html_view_init(HtmlView *sp);
-static void html_view_finalize(GObject *object);
-
-struct _HtmlViewPrivate {
-	DhHtml* html;
-	AnjutaDevhelp* devhelp;
-	gchar* uri;
-	guint idle_realize;
-};
-
-G_DEFINE_TYPE(HtmlView, html_view, GTK_TYPE_HBOX)
-
-static gboolean
-devhelp_html_open_uri_cb (DhHtml      *html,
-			 const gchar *uri,
-			 AnjutaDevhelp    *widget)
-{
-#ifdef HAVE_OLD_DEVHELP
-	dh_book_tree_show_uri (DH_BOOK_TREE (widget->book_tree), uri);
-#else
-	dh_book_tree_select_uri (DH_BOOK_TREE (widget->book_tree), uri);
-#endif
-	return FALSE;
-}
-
-static void
-devhelp_html_location_changed_cb (DhHtml      *html,
-				 const gchar *location,
-				 AnjutaDevhelp    *widget)
-{	
-	anjuta_devhelp_check_history (widget);
-}
-
-static gboolean
-html_view_create_html(HtmlView* html_view)
-{
-	GtkWidget* view;
-	HtmlViewPrivate* priv = html_view->priv;
-
-	priv->html = dh_html_new();
-	
-	if (!priv->html || !DH_IS_HTML(priv->html))	
-		return TRUE; /* I think the idea is to wait until we get a widget? */
-	
-	view = dh_html_get_widget(priv->html);
-	gtk_box_pack_start(GTK_BOX(html_view), dh_html_get_widget(priv->html), TRUE, TRUE, 1);
-	
-	g_signal_connect (priv->html, "open-uri",
-			  G_CALLBACK (devhelp_html_open_uri_cb),
-			  priv->devhelp);
-	g_signal_connect (priv->html, "location-changed",
-			  G_CALLBACK (devhelp_html_location_changed_cb),
-			  priv->devhelp);
-	
-	/* Hack to get GtkMozEmbed to work properly. */
-	gtk_widget_realize (view);
-
-	if (priv->uri)
-		dh_html_open_uri(priv->html, priv->uri);
-	else
-		dh_html_clear(priv->html);
-	
-	gtk_widget_show (view);
-	
-	return FALSE;
-}
-
-static void
-html_view_realize(GtkWidget* widget)
-{
-	HtmlView* html_view = HTML_VIEW(widget);
-	
-	if (html_view->priv->idle_realize == 0)
-	{
-		html_view->priv->idle_realize =
-			g_idle_add((GSourceFunc) html_view_create_html, html_view);
-	}	
-	(* GTK_WIDGET_CLASS (html_view_parent_class)->realize)(widget);
-}
-
-static void
-html_view_unrealize(GtkWidget* widget)
-{
-	HtmlView* html_view = HTML_VIEW(widget);
-	
-	if (html_view->priv->idle_realize > 0)
-	{
-		g_source_remove (html_view->priv->idle_realize);
-		html_view->priv->idle_realize = 0;
-	}
-	
-	if (html_view->priv->html != NULL)
-	{
-		g_free(html_view->priv->uri);
-		html_view->priv->uri = dh_html_get_location(html_view->priv->html);
-	}
-	else
-		html_view->priv->uri = NULL;
-	
-	if (gtk_container_get_children(GTK_CONTAINER(html_view)))
-	{
-		gtk_container_remove(GTK_CONTAINER(widget), dh_html_get_widget(html_view->priv->html));
-		html_view->priv->html = NULL;
-	}
-
-	(* GTK_WIDGET_CLASS (html_view_parent_class)->unrealize)(widget);
-}
-
-static void
-html_view_class_init(HtmlViewClass *klass)
-{
-	GObjectClass *object_class = G_OBJECT_CLASS(klass);
-	GtkWidgetClass* widget_class = GTK_WIDGET_CLASS(klass);
-
-	object_class->finalize = html_view_finalize;
-	
-	widget_class->realize = html_view_realize;
-	widget_class->unrealize = html_view_unrealize;
-}
-
-static void
-html_view_init(HtmlView *obj)
-{
-	obj->priv = g_new0(HtmlViewPrivate, 1);
-	gtk_widget_show(GTK_WIDGET(obj));
-}
-
-static void
-html_view_finalize(GObject *object)
-{
-	HtmlView *cobj;
-	cobj = HTML_VIEW(object);
-	
-	/* Free private members, etc. */
-	if (cobj->priv->html)
-		gtk_widget_destroy(dh_html_get_widget(cobj->priv->html));
-	g_free (cobj->priv->uri);	
-	g_free(cobj->priv);
-	G_OBJECT_CLASS(html_view_parent_class)->finalize(object);
-}
-
-GtkWidget*
-html_view_new(AnjutaDevhelp* devhelp)
-{
-	HtmlView *obj;
-	
-	obj = HTML_VIEW(g_object_new(HTML_TYPE_VIEW, NULL));
-	
-	obj->priv->devhelp = devhelp;
-	
-	return GTK_WIDGET(obj);
-}
-
-DhHtml* html_view_get_dh_html(HtmlView* view)
-{
-	return view->priv->html;
-}
diff -urNp anjuta-2.24.2.orig/plugins/devhelp/htmlview.h anjuta-2.24.2/plugins/devhelp/htmlview.h
--- anjuta-2.24.2.orig/plugins/devhelp/htmlview.h	2009-01-04 15:27:36.000000000 +0530
+++ anjuta-2.24.2/plugins/devhelp/htmlview.h	1970-01-01 05:30:00.000000000 +0530
@@ -1,57 +0,0 @@
-/*
- *  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 Library 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 HTMLVIEW_H
-#define HTMLVIEW_H
-
-#include <glib.h>
-#include <glib-object.h>
-#include <gtk/gtk.h>
-
-#include <devhelp/dh-html.h>
-
-#include "plugin.h"
-
-G_BEGIN_DECLS
-
-#define HTML_TYPE_VIEW         (html_view_get_type ())
-#define HTML_VIEW(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), HTML_TYPE_VIEW, HtmlView))
-#define HTML_VIEW_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), HTML_TYPE_VIEW, HtmlViewClass))
-#define HTML_IS_VIEW(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), HTML_TYPE_VIEW))
-#define HTML_IS_VIEW_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), HTML_TYPE_VIEW))
-#define HTML_VIEW_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), HTML_TYPE_VIEW, HtmlViewClass))
-
-typedef struct _HtmlView HtmlView;
-typedef struct _HtmlViewPrivate HtmlViewPrivate;
-typedef struct _HtmlViewClass HtmlViewClass;
-
-struct _HtmlView {
-	GtkHBox parent;
-	HtmlViewPrivate *priv;
-};
-
-struct _HtmlViewClass {
-	GtkHBoxClass parent_class;
-};
-
-GType html_view_get_type(void);
-GtkWidget *html_view_new(AnjutaDevhelp* devhelp);
-
-DhHtml* html_view_get_dh_html(HtmlView* html_view);
-
-G_END_DECLS
-
-#endif /* HTMLVIEW_H */
diff -urNp anjuta-2.24.2.orig/plugins/devhelp/Makefile.in anjuta-2.24.2/plugins/devhelp/Makefile.in
--- anjuta-2.24.2.orig/plugins/devhelp/Makefile.in	2009-01-04 15:27:36.000000000 +0530
+++ anjuta-2.24.2/plugins/devhelp/Makefile.in	2009-01-04 15:27:51.000000000 +0530
@@ -37,11 +37,7 @@ build_triplet = @build@
 host_triplet = @host@
 @HAVE_PLUGIN_DEVHELP_TRUE at am__append_1 = $(PLUGIN_DEVHELP_CFLAGS)
 @HAVE_PLUGIN_DEVHELP_FALSE at am__append_2 = -DDISABLE_EMBEDDED_DEVHELP
- at HAVE_PLUGIN_DEVHELP_TRUE@am__append_3 = \
- at HAVE_PLUGIN_DEVHELP_TRUE@	htmlview.c \
- at HAVE_PLUGIN_DEVHELP_TRUE@	htmlview.h
-
- at HAVE_PLUGIN_DEVHELP_TRUE@am__append_4 = $(PLUGIN_DEVHELP_LIBS)
+ at HAVE_PLUGIN_DEVHELP_TRUE@am__append_3 = $(PLUGIN_DEVHELP_LIBS)
 subdir = plugins/devhelp
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -67,10 +63,7 @@ am__DEPENDENCIES_1 =
 @HAVE_PLUGIN_DEVHELP_TRUE at am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1)
 libanjuta_devhelp_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2)
-am__libanjuta_devhelp_la_SOURCES_DIST = plugin.c plugin.h htmlview.c \
-	htmlview.h
- at HAVE_PLUGIN_DEVHELP_TRUE@am__objects_1 = htmlview.lo
-am_libanjuta_devhelp_la_OBJECTS = plugin.lo $(am__objects_1)
+am_libanjuta_devhelp_la_OBJECTS = plugin.lo
 libanjuta_devhelp_la_OBJECTS = $(am_libanjuta_devhelp_la_OBJECTS)
 libanjuta_devhelp_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
@@ -88,7 +81,7 @@ LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLF
 	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
 	$(LDFLAGS) -o $@
 SOURCES = $(libanjuta_devhelp_la_SOURCES)
-DIST_SOURCES = $(am__libanjuta_devhelp_la_SOURCES_DIST)
+DIST_SOURCES = $(libanjuta_devhelp_la_SOURCES)
 devhelp_pixmapsDATA_INSTALL = $(INSTALL_DATA)
 devhelp_pluginDATA_INSTALL = $(INSTALL_DATA)
 devhelp_uiDATA_INSTALL = $(INSTALL_DATA)
@@ -389,6 +382,7 @@ sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 
@@ -424,11 +418,14 @@ plugin_LTLIBRARIES = libanjuta-devhelp.l
 libanjuta_devhelp_la_LDFLAGS = $(ANJUTA_PLUGIN_LDFLAGS)
 
 # Plugin sources
-libanjuta_devhelp_la_SOURCES = plugin.c plugin.h $(am__append_3)
+libanjuta_devhelp_la_SOURCES = \
+	plugin.c \
+	plugin.h
+
 
 # Plugin dependencies
 libanjuta_devhelp_la_LIBADD = $(GTK_LIBS) $(LIBANJUTA_LIBS) \
-	$(am__append_4)
+	$(am__append_3)
 EXTRA_DIST = \
 	$(plugin_in_files) \
 	$(devhelp_plugin_DATA) \
@@ -504,7 +501,6 @@ mostlyclean-compile:
 distclean-compile:
 	-rm -f *.tab.c
 
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/htmlview.Plo at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/plugin.Plo at am__quote@
 
 .c.o:
diff -urNp anjuta-2.24.2.orig/plugins/devhelp/plugin.c anjuta-2.24.2/plugins/devhelp/plugin.c
--- anjuta-2.24.2.orig/plugins/devhelp/plugin.c	2009-01-04 15:27:36.000000000 +0530
+++ anjuta-2.24.2/plugins/devhelp/plugin.c	2009-01-04 15:27:51.000000000 +0530
@@ -34,11 +34,9 @@
 #ifndef DISABLE_EMBEDDED_DEVHELP
 
 #include <devhelp/dh-book-tree.h>
-#include <devhelp/dh-html.h>
-#include <devhelp/dh-preferences.h>
 #include <devhelp/dh-search.h>
 #include <devhelp/dh-base.h>
-#include "htmlview.h"
+#include <webkit/webkit.h>
 #define UI_FILE PACKAGE_DATA_DIR"/ui/anjuta-devhelp.ui"
 
 #else /* DISABLE_EMBEDDED_DEVHELP */
@@ -51,12 +49,8 @@ static gpointer parent_class;
 
 #ifndef DISABLE_EMBEDDED_DEVHELP
 
-#define ANJUTA_PIXMAP_HELP_NEXT "anjuta-go-help-next-24.png"
-#define ANJUTA_PIXMAP_HELP_PREV "anjuta-go-help-prev-24.png"
 #define ANJUTA_PIXMAP_DEVHELP "anjuta-devhelp-plugin-48.png"
 
-#define ANJUTA_STOCK_HELP_NEXT "anjuta-help-next"
-#define ANJUTA_STOCK_HELP_PREV "anjuta-help-prev"
 #define ANJUTA_STOCK_DEVHELP "anjuta-devhelp"
 
 static void
@@ -74,76 +68,55 @@ register_stock_icons (AnjutaPlugin *plug
 	/* Register stock icons */
 	ui = anjuta_shell_get_ui (plugin->shell, NULL);
 	icon_factory = anjuta_ui_get_icon_factory (ui);
-	REGISTER_ICON (ANJUTA_PIXMAP_HELP_NEXT, ANJUTA_STOCK_HELP_NEXT);
-	REGISTER_ICON (ANJUTA_PIXMAP_HELP_PREV, ANJUTA_STOCK_HELP_PREV);
 	REGISTER_ICON (ANJUTA_PIXMAP_DEVHELP, ANJUTA_STOCK_DEVHELP);
 }
 
 static void
-devhelp_tree_link_selected_cb (GObject       *ignored,
-			      DhLink        *link,
-			      AnjutaDevhelp *widget)
+devhelp_tree_link_selected_cb (GObject       *ignored, DhLink *link,
+							   AnjutaDevhelp *widget)
 {
+	gchar *uri;
 	
-	DhHtml       *html;
+	/*anjuta_shell_present_widget (ANJUTA_PLUGIN (widget)->shell,
+								 widget->view, NULL);*/
 
-	anjuta_shell_present_widget (ANJUTA_PLUGIN (widget)->shell,
-								 widget->htmlview, NULL);
-
-	html = html_view_get_dh_html(HTML_VIEW(widget->htmlview));
-	
-	if (!DH_IS_HTML(html))
-		return;
+	uri = dh_link_get_uri (link);
+	webkit_web_view_open (WEBKIT_WEB_VIEW (widget->view), uri);
+	g_free (uri);
 	
-	dh_html_open_uri (html, link->uri);
-
 	anjuta_devhelp_check_history (widget);
 }
 
 static void
-devhelp_search_link_selected_cb (GObject  *ignored,
-				DhLink   *link,
-				 AnjutaDevhelp *widget)
+devhelp_search_link_selected_cb (GObject  *ignored, DhLink *link,
+								 AnjutaDevhelp *widget)
 {
-	DhHtml       *html;
-
-	anjuta_shell_present_widget (ANJUTA_PLUGIN (widget)->shell,
-								 widget->htmlview, NULL);
-
-	html = html_view_get_dh_html(HTML_VIEW(widget->htmlview));
-
-	if (!DH_IS_HTML(html))
-		return;
-
-	dh_html_open_uri (html, link->uri);
+	gchar *uri;
+	
+	/*anjuta_shell_present_widget (ANJUTA_PLUGIN (widget)->shell,
+								 widget->view, NULL);*/
 
+	uri = dh_link_get_uri (link);
+	webkit_web_view_open (WEBKIT_WEB_VIEW (widget->view), uri);
+	g_free (uri);
+	
 	anjuta_devhelp_check_history (widget);
 }
 
 static void
-on_go_back_activate (GtkAction *action, AnjutaDevhelp *plugin)
+on_go_back_clicked (GtkWidget *widget, AnjutaDevhelp *plugin)
 {
-	DhHtml* html;
-
-	html = html_view_get_dh_html(HTML_VIEW(plugin->htmlview));
+	webkit_web_view_go_back (WEBKIT_WEB_VIEW (plugin->view));
 	
-	if (!DH_IS_HTML(html))
-		return;
-		
-	dh_html_go_back(html);
+	anjuta_devhelp_check_history (plugin);
 }
 
 static void
-on_go_forward_activate (GtkAction *action, AnjutaDevhelp *plugin)
+on_go_forward_clicked (GtkWidget *widget, AnjutaDevhelp *plugin)
 {
-	DhHtml* html;
-
-	html = html_view_get_dh_html(HTML_VIEW(plugin->htmlview));
+	webkit_web_view_go_forward (WEBKIT_WEB_VIEW (plugin->view));
 	
-	if (!DH_IS_HTML(html))
-		return;
-	
-	dh_html_go_forward(html);
+	anjuta_devhelp_check_history (plugin);
 }
 
 static gboolean
@@ -173,7 +146,7 @@ on_api_reference_activate (GtkAction *ac
 }
 
 static gboolean
-context_idle(AnjutaDevhelp* plugin)
+context_idle (AnjutaDevhelp* plugin)
 {
 	IAnjutaEditor *editor;
 	gchar *current_word;
@@ -232,22 +205,6 @@ static GtkActionEntry actions[] = {
 		NULL,
 		NULL
 	},
-	{
-		"ActionDevhelpBack",
-		ANJUTA_STOCK_HELP_PREV,
-		N_("Previous Help"),
-		NULL,
-		N_("Go to previous help page"),
-		G_CALLBACK (on_go_back_activate)
-	},
-	{
-		"ActionDevhelpForward",
-		ANJUTA_STOCK_HELP_NEXT,
-		N_("Next Help"),
-		NULL,
-		N_("Go to next help page"),
-		G_CALLBACK (on_go_forward_activate)
-	},
 #endif /* DISABLE_EMBEDDED_DEVHELP */
 	{
 		"ActionHelpApi",
@@ -282,7 +239,7 @@ static GtkActionEntry actions[] = {
 /* Watches callbacks */
 
 static void
-value_added_current_editor (AnjutaPlugin *plugin, const char *name,
+value_added_current_editor (AnjutaPlugin *plugin, const gchar *name,
 							const GValue *value, gpointer data)
 {
 	GtkAction *action;
@@ -300,7 +257,7 @@ value_added_current_editor (AnjutaPlugin
 
 static void
 value_removed_current_editor (AnjutaPlugin *plugin,
-							  const char *name, gpointer data)
+							  const gchar *name, gpointer data)
 {
 	GtkAction *action;
 	AnjutaDevhelp* devhelp = ANJUTA_PLUGIN_DEVHELP (data);	
@@ -314,7 +271,6 @@ value_removed_current_editor (AnjutaPlug
 static gboolean
 devhelp_activate (AnjutaPlugin *plugin)
 {
-
 	AnjutaUI *ui;
 	AnjutaDevhelp *devhelp;
 
@@ -323,12 +279,15 @@ devhelp_activate (AnjutaPlugin *plugin)
 	GNode *books;
 	GList *keywords;
 	GtkWidget* books_sw;
+	GtkWidget *scrolled_window;
+	GtkWidget *main_vbox;
+	GtkWidget *button_hbox;
 	
 	if (!init)
 	{
 		register_stock_icons (plugin);
 		init = TRUE;
-	}	
+	}
 #endif
 
 	DEBUG_PRINT ("AnjutaDevhelp: Activating AnjutaDevhelp plugin ...");
@@ -346,47 +305,89 @@ devhelp_activate (AnjutaPlugin *plugin)
 	devhelp->uiid = anjuta_ui_merge (ui, UI_FILE);
 
 #ifndef DISABLE_EMBEDDED_DEVHELP
-
+	/*
+	 * Forward/back buttons
+	 */
+	main_vbox = gtk_vbox_new (FALSE, 6);
+	gtk_widget_show (main_vbox);
+	button_hbox = gtk_hbox_new (FALSE, 0);
+	gtk_widget_show (button_hbox);
+	
+	devhelp->go_back = gtk_button_new_from_stock (GTK_STOCK_GO_BACK);
+	gtk_widget_show (devhelp->go_back);
+	gtk_box_pack_start (GTK_BOX (button_hbox), devhelp->go_back, FALSE, FALSE, 0);
+	gtk_widget_set_sensitive (devhelp->go_back, FALSE);
+	g_signal_connect (devhelp->go_back, "clicked",
+			  G_CALLBACK (on_go_back_clicked), devhelp);
+	
+	devhelp->go_forward = gtk_button_new_from_stock (GTK_STOCK_GO_FORWARD);
+	gtk_widget_show (devhelp->go_forward);
+	gtk_box_pack_start (GTK_BOX (button_hbox), devhelp->go_forward, FALSE, FALSE, 0);
+	gtk_widget_set_sensitive (devhelp->go_forward, FALSE);
+	g_signal_connect (devhelp->go_forward, "clicked",
+			  G_CALLBACK (on_go_forward_clicked), devhelp);
+	
+	gtk_box_pack_start (GTK_BOX (main_vbox), button_hbox, FALSE, FALSE, 0);
+	
+	/*
+	 * Notebook
+	 */
 	books = dh_base_get_book_tree (devhelp->base);
 	keywords = dh_base_get_keywords (devhelp->base);
 	
-	books_sw = gtk_scrolled_window_new(NULL, NULL);
+	books_sw = gtk_scrolled_window_new (NULL, NULL);
 	gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (books_sw),
-					GTK_POLICY_NEVER,
-					GTK_POLICY_AUTOMATIC);
+									GTK_POLICY_NEVER,
+									GTK_POLICY_AUTOMATIC);
 	gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (books_sw),
-					     GTK_SHADOW_IN);
+									     GTK_SHADOW_IN);
 	gtk_container_set_border_width (GTK_CONTAINER (books_sw), 2);
 	
-	devhelp->control_notebook = gtk_notebook_new();
-	devhelp->book_tree = dh_book_tree_new(books);
-	devhelp->search = dh_search_new(keywords);
+	devhelp->control_notebook = gtk_notebook_new ();
+	gtk_box_pack_start (GTK_BOX (main_vbox), devhelp->control_notebook, TRUE, TRUE, 0);
+	devhelp->book_tree = dh_book_tree_new (books);
+	
+	devhelp->search = dh_search_new (keywords);
+	gtk_widget_set_size_request (devhelp->search, 0, 0);
 	
 	g_signal_connect (devhelp->book_tree,
-			  "link-selected",
-			  G_CALLBACK (devhelp_tree_link_selected_cb),
-			  devhelp);
+					  "link-selected",
+					  G_CALLBACK (devhelp_tree_link_selected_cb),
+					  devhelp);
 	g_signal_connect (devhelp->search,
-			  "link-selected",
-			  G_CALLBACK (devhelp_search_link_selected_cb),
-			  devhelp);
-	
-	gtk_container_add(GTK_CONTAINER(books_sw), devhelp->book_tree);
-	gtk_notebook_append_page(GTK_NOTEBOOK(devhelp->control_notebook), books_sw,
-		gtk_label_new(_("Books")));
-	gtk_notebook_append_page(GTK_NOTEBOOK(devhelp->control_notebook), devhelp->search,
-		gtk_label_new(_("Search")));
-	
-	devhelp->htmlview = html_view_new(devhelp);	
-
-	anjuta_shell_add_widget (plugin->shell, devhelp->control_notebook,
-								 "AnjutaDevhelpIndex", _("Help"), ANJUTA_STOCK_DEVHELP,
-								 ANJUTA_SHELL_PLACEMENT_LEFT, NULL);
+					  "link-selected",
+					  G_CALLBACK (devhelp_search_link_selected_cb),
+					  devhelp);
+	
+	gtk_container_add (GTK_CONTAINER (books_sw), devhelp->book_tree);
+	gtk_notebook_append_page (GTK_NOTEBOOK (devhelp->control_notebook), books_sw,
+							 gtk_label_new (_("Contents")));
+	gtk_notebook_append_page (GTK_NOTEBOOK (devhelp->control_notebook), devhelp->search,
+							  gtk_label_new (_("Search")));
+	
+	gtk_widget_show_all (devhelp->control_notebook);
+	
+	/* View */
+	devhelp->view = webkit_web_view_new ();
+	gtk_widget_show (devhelp->view);
+	
+	webkit_web_view_open (WEBKIT_WEB_VIEW (devhelp->view), "about:blank");
+	
+	scrolled_window = gtk_scrolled_window_new (NULL, NULL);
+	gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window),
+									GTK_POLICY_AUTOMATIC,
+									GTK_POLICY_AUTOMATIC);
+	gtk_widget_show (scrolled_window);
+	gtk_container_add (GTK_CONTAINER (scrolled_window), devhelp->view);
+
+	anjuta_shell_add_widget (plugin->shell, main_vbox,
+							 "AnjutaDevhelpIndex", _("Help"), ANJUTA_STOCK_DEVHELP,
+							 ANJUTA_SHELL_PLACEMENT_LEFT, NULL);
 	/* This is the window that show the html help text */
-	anjuta_shell_add_widget (plugin->shell, devhelp->htmlview,
-								 "AnjutaDevhelpDisplay", _("Help display"),
-								 ANJUTA_STOCK_DEVHELP,
-								 ANJUTA_SHELL_PLACEMENT_CENTER, NULL);
+	anjuta_shell_add_widget (plugin->shell, scrolled_window,
+							 "AnjutaDevhelpDisplay", _("Help display"),
+							 ANJUTA_STOCK_DEVHELP,
+							 ANJUTA_SHELL_PLACEMENT_CENTER, NULL);
 								 
 #endif /* DISABLE_EMBEDDED_DEVHELP */
 
@@ -415,7 +416,7 @@ devhelp_deactivate (AnjutaPlugin *plugin
 #ifndef DISABLE_EMBEDDED_DEVHELP
 
 	/* Remove widgets */
-	anjuta_shell_remove_widget(plugin->shell, devhelp->htmlview, NULL);
+	anjuta_shell_remove_widget(plugin->shell, devhelp->view, NULL);
 	anjuta_shell_remove_widget(plugin->shell, devhelp->control_notebook, NULL);	
 
 #endif /* DISABLE_EMBEDDED_DEVHELP */
@@ -431,32 +432,22 @@ devhelp_deactivate (AnjutaPlugin *plugin
 
 #ifndef DISABLE_EMBEDDED_DEVHELP
 
-void anjuta_devhelp_check_history(AnjutaDevhelp* devhelp)
+void
+anjuta_devhelp_check_history (AnjutaDevhelp* devhelp)
 {
-	GtkAction* action_forward;
-	GtkAction* action_back;
-	DhHtml* html = html_view_get_dh_html(HTML_VIEW(devhelp->htmlview));
-	
-	action_forward = gtk_action_group_get_action (devhelp->action_group,
-										  "ActionDevhelpForward");
-	action_back = gtk_action_group_get_action (devhelp->action_group,
-										  "ActionDevhelpBack");
-	if (html != NULL)
-	{
-		g_object_set (action_forward, "sensitive", dh_html_can_go_forward (html) , NULL);
-		g_object_set (action_back, "sensitive", dh_html_can_go_back (html) , NULL);
-	}
+	gtk_widget_set_sensitive (devhelp->go_forward, webkit_web_view_can_go_forward (WEBKIT_WEB_VIEW (devhelp->view)));
+
+	gtk_widget_set_sensitive (devhelp->go_back, webkit_web_view_can_go_back (WEBKIT_WEB_VIEW (devhelp->view)));
 }
 
 #endif /* DISABLE_EMBEDDED_DEVHELP */
 
-#if 0
 static void
 devhelp_finalize (GObject *obj)
 {
+	DEBUG_PRINT ("%s", "Finalising Devhelp plugin");
+
 	/* Finalization codes here */
-	AnjutaDevhelp *plugin = ANJUTA_PLUGIN_DEVHELP (obj);
-	
 	G_OBJECT_CLASS (parent_class)->finalize (obj);
 }
 
@@ -465,13 +456,17 @@ devhelp_dispose (GObject *obj)
 {
 	AnjutaDevhelp* devhelp = ANJUTA_PLUGIN_DEVHELP (obj);
 	
-	/* Destroy devhelp - seems not to work... */
-	// g_object_unref(G_OBJECT(devhelp->base));
+	DEBUG_PRINT ("%s", "Disposing Devhelp plugin");
+	
+	if (devhelp->base)
+	{
+		g_object_unref(G_OBJECT(devhelp->base));
+		devhelp->base = NULL;
+	}
 
 	/* Disposition codes */
 	G_OBJECT_CLASS (parent_class)->dispose (obj);
 }
-#endif
 
 static void
 devhelp_instance_init (GObject *obj)
@@ -497,10 +492,9 @@ devhelp_class_init (GObjectClass *klass)
 
 	plugin_class->activate = devhelp_activate;
 	plugin_class->deactivate = devhelp_deactivate;
-#if 0
+	
 	klass->finalize = devhelp_finalize;
 	klass->dispose = devhelp_dispose;
-#endif
 }
 
 #ifndef DISABLE_EMBEDDED_DEVHELP
@@ -515,7 +509,7 @@ ihelp_search (IAnjutaHelp *help, const g
 	anjuta_shell_present_widget (ANJUTA_PLUGIN (plugin)->shell,
 								 plugin->control_notebook, NULL);
 	
-	dh_search_set_search_string (DH_SEARCH (plugin->search), query);
+	dh_search_set_search_string (DH_SEARCH (plugin->search), query, NULL);
 	gtk_notebook_set_current_page (GTK_NOTEBOOK (plugin->control_notebook), 1);
 }
 
@@ -524,34 +518,33 @@ ihelp_search (IAnjutaHelp *help, const g
 static void
 ihelp_search (IAnjutaHelp *help, const gchar *query, GError **err)
 {
-	AnjutaDevhelp *plugin;
-	
-	plugin = ANJUTA_PLUGIN_DEVHELP (help);
+	gchar *cmd[4];
 	
 	if (!anjuta_util_prog_is_installed ("devhelp", TRUE))
 	{
 		return;
 	}
 	
-	if(query && strlen (query) > 0)
+	cmd[0] = "devhelp";
+	
+	if (query && strlen (query) > 0)
 	{
-		fprintf(stderr, "Word is %s\n", query);
-		if(fork()==0)
-		{
-			execlp("devhelp", "devhelp", "-s", query, NULL);
-			g_warning (_("Cannot execute command: \"%s\""), "devhelp");
-			_exit(1);
-		}
+		cmd[1] = "-s";
+		cmd[2] = (gchar *)query;
+		cmd[3] = NULL;	
 	}
 	else
 	{
-		if(fork()==0)
-		{
-			execlp("devhelp", "devhelp", NULL);
-			g_warning (_("Cannot execute command: \"%s\""), "devhelp");
-			_exit(1);
-		}
+		cmd[1] = NULL;
 	}
+	
+	gdk_spawn_on_screen (gdk_screen_get_default (),
+					     NULL,
+					     cmd,
+					     NULL,
+					     G_SPAWN_SEARCH_PATH,
+					     NULL,
+					     NULL, NULL, NULL);
 }
 
 #endif /* DISABLE_EMBEDDED_DEVHELP */
diff -urNp anjuta-2.24.2.orig/plugins/devhelp/plugin.h anjuta-2.24.2/plugins/devhelp/plugin.h
--- anjuta-2.24.2.orig/plugins/devhelp/plugin.h	2009-01-04 15:27:36.000000000 +0530
+++ anjuta-2.24.2/plugins/devhelp/plugin.h	2009-01-04 15:27:51.000000000 +0530
@@ -49,10 +49,12 @@ struct _AnjutaDevhelp{
 #ifndef DISABLE_EMBEDDED_DEVHELP
 	DhBase         *base;
 #endif /* DISABLE_EMBEDDED_DEVHELP */
-	GtkWidget     *htmlview;    
+	GtkWidget      *view;    
 	GtkWidget      *control_notebook; 
 	GtkWidget      *book_tree;
 	GtkWidget      *search;
+    GtkWidget      *go_back;
+    GtkWidget      *go_forward;
 	
 	IAnjutaEditor	*editor;
 	guint editor_watch_id;


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/anjuta/F-10/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	28 Oct 2008 19:22:13 -0000	1.13
+++ .cvsignore	5 Jan 2009 17:01:51 -0000	1.14
@@ -1 +1 @@
-anjuta-2.24.1.tar.gz
+anjuta-2.24.2.tar.gz


Index: anjuta.spec
===================================================================
RCS file: /cvs/pkgs/rpms/anjuta/F-10/anjuta.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- anjuta.spec	2 Jan 2009 22:40:24 -0000	1.55
+++ anjuta.spec	5 Jan 2009 17:01:51 -0000	1.56
@@ -1,8 +1,8 @@
 Summary:	A GNOME development IDE for C/C++
 Name:		anjuta
 Epoch:		1
-Version:	2.24.1
-Release:	3%{?dist}
+Version:	2.24.2
+Release:	1%{?dist}
 License:	GPLv2+
 Group:		Development/Tools
 URL:		http://www.anjuta.org/
@@ -221,6 +221,8 @@
 %doc README
 %doc ROADMAP
 %doc THANKS
+%doc %{_mandir}/man1/%{name}.1*
+%doc %{_mandir}/man1/%{name}_launcher.1*
 %{_bindir}/%{name}
 %{_bindir}/%{name}_import.sh
 %{_bindir}/%{name}_launcher
@@ -237,8 +239,6 @@
 %{_libdir}/libanjuta.so.*
 # Symlink to libanjuta.so.*.
 %{_libdir}/libglade/2.0/libanjuta.so
-%{_mandir}/man1/%{name}.1.gz
-%{_mandir}/man1/%{name}_launcher.1.gz
 %{_sysconfdir}/gconf/schemas/%{name}.schemas
 %{_sysconfdir}/gconf/schemas/%{name}-*.schemas
 
@@ -259,7 +259,7 @@
 %{_libdir}/pkgconfig/libanjuta-1.0.pc
 
 %dir %{_datadir}/gtk-doc/html/libanjuta
-%{_datadir}/gtk-doc/html/libanjuta/*
+%doc %{_datadir}/gtk-doc/html/libanjuta/*
 
 %dir %{_includedir}/libanjuta-1.0
 %{_includedir}/libanjuta-1.0/libanjuta
@@ -277,6 +277,9 @@
 %{_datadir}/omf/%{name}-manual/%{name}-manual-*.omf
 
 %changelog
+* Sun Jan 04 2009 Debarshi Ray <rishi at fedoraproject.org> - 1:2.24.2-1
+- Version bump to 2.24.2. Closes Red Hat Bugzilla bug #478684.
+
 * Sat Jan 03 2009 Debarshi Ray <rishi at fedoraproject.org> - 1:2.24.1-3
 - Added patch against the Devhelp plugin from GNOME to make it work with the
   new WebKit-based Devhelp >= 0.22. Closes GNOME Bugzilla bug #560311, and Red


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/anjuta/F-10/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	28 Oct 2008 19:22:13 -0000	1.13
+++ sources	5 Jan 2009 17:01:51 -0000	1.14
@@ -1 +1 @@
-57b820afc475a2fab69637fe5c51b76e  anjuta-2.24.1.tar.gz
+125275bebd01eb9345717d3712bd4ea5  anjuta-2.24.2.tar.gz


--- anjuta-2.24.1-webkit.patch DELETED ---



From bpepple at fedoraproject.org  Mon Jan  5 17:06:44 2009
From: bpepple at fedoraproject.org (Brian Pepple)
Date: Mon,  5 Jan 2009 17:06:44 +0000 (UTC)
Subject: rpms/telepathy-salut/devel .cvsignore, 1.16, 1.17 sources, 1.16,
	1.17 telepathy-salut.spec, 1.22, 1.23
Message-ID: <20090105170644.957A170108@cvs1.fedora.phx.redhat.com>

Author: bpepple

Update of /cvs/pkgs/rpms/telepathy-salut/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22393

Modified Files:
	.cvsignore sources telepathy-salut.spec 
Log Message:
* Mon Jan  5 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.3.7-1
- Update to 0.3.7.
- Change BR to libsoup-devel, since they support it now.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-salut/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore	6 Dec 2008 15:57:05 -0000	1.16
+++ .cvsignore	5 Jan 2009 17:06:14 -0000	1.17
@@ -1 +1 @@
-telepathy-salut-0.3.6.tar.gz
+telepathy-salut-0.3.7.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-salut/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources	6 Dec 2008 15:57:05 -0000	1.16
+++ sources	5 Jan 2009 17:06:14 -0000	1.17
@@ -1 +1 @@
-ccd02baafbbd708c11e4f770715065f4  telepathy-salut-0.3.6.tar.gz
+0019eb92a06edf4e61b7a4cb8bc88d40  telepathy-salut-0.3.7.tar.gz


Index: telepathy-salut.spec
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-salut/devel/telepathy-salut.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- telepathy-salut.spec	8 Dec 2008 20:49:06 -0000	1.22
+++ telepathy-salut.spec	5 Jan 2009 17:06:14 -0000	1.23
@@ -1,6 +1,6 @@
 Name:           telepathy-salut
-Version:        0.3.6
-Release:        2%{?dist}
+Version:        0.3.7
+Release:        1%{?dist}
 Summary:        Link-local XMPP telepathy connection manager
 
 Group:          Applications/Communications
@@ -18,7 +18,7 @@
 BuildRequires:	libxslt
 BuildRequires:	libasyncns-devel >= 0.3
 BuildRequires:	telepathy-glib-devel >= 0.7.17
-BuildRequires:	libsoup22-devel
+BuildRequires:	libsoup-devel
 BuildRequires:	check-devel >= 0.9.4
 
 Requires:	telepathy-filesystem
@@ -59,6 +59,10 @@
 %{_mandir}/man8/%{name}.8.gz
 
 %changelog
+* Mon Jan  5 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.3.7-1
+- Update to 0.3.7.
+- Change BR to libsoup-devel, since they support it now.
+
 * Mon Dec  8 2008 Brian Pepple <bpepple at fedoraproject.org> - 0.3.6-2
 - Enable OLPC support code. It is not used unless a client explicitely requests them.
 



From rishi at fedoraproject.org  Mon Jan  5 17:08:23 2009
From: rishi at fedoraproject.org (Debarshi Ray)
Date: Mon,  5 Jan 2009 17:08:23 +0000 (UTC)
Subject: rpms/anjuta/devel .cvsignore, 1.13, 1.14 anjuta.spec, 1.55,
	1.56 sources, 1.13, 1.14 anjuta-2.24.1-webkit.patch, 1.1, NONE
Message-ID: <20090105170823.ABA1270108@cvs1.fedora.phx.redhat.com>

Author: rishi

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

Modified Files:
	.cvsignore anjuta.spec sources 
Removed Files:
	anjuta-2.24.1-webkit.patch 
Log Message:
* Sun Jan 04 2009 Debarshi Ray <rishi at fedoraproject.org> - 1:2.24.2-1
- Version bump to 2.24.2. Closes Red Hat Bugzilla bug #478684.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/anjuta/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	28 Oct 2008 19:22:13 -0000	1.13
+++ .cvsignore	5 Jan 2009 17:07:53 -0000	1.14
@@ -1 +1 @@
-anjuta-2.24.1.tar.gz
+anjuta-2.24.2.tar.gz


Index: anjuta.spec
===================================================================
RCS file: /cvs/pkgs/rpms/anjuta/devel/anjuta.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- anjuta.spec	2 Jan 2009 22:42:24 -0000	1.55
+++ anjuta.spec	5 Jan 2009 17:07:53 -0000	1.56
@@ -1,8 +1,8 @@
 Summary:	A GNOME development IDE for C/C++
 Name:		anjuta
 Epoch:		1
-Version:	2.24.1
-Release:	3%{?dist}
+Version:	2.24.2
+Release:	1%{?dist}
 License:	GPLv2+
 Group:		Development/Tools
 URL:		http://www.anjuta.org/
@@ -221,6 +221,8 @@
 %doc README
 %doc ROADMAP
 %doc THANKS
+%doc %{_mandir}/man1/%{name}.1*
+%doc %{_mandir}/man1/%{name}_launcher.1*
 %{_bindir}/%{name}
 %{_bindir}/%{name}_import.sh
 %{_bindir}/%{name}_launcher
@@ -237,8 +239,6 @@
 %{_libdir}/libanjuta.so.*
 # Symlink to libanjuta.so.*.
 %{_libdir}/libglade/2.0/libanjuta.so
-%{_mandir}/man1/%{name}.1.gz
-%{_mandir}/man1/%{name}_launcher.1.gz
 %{_sysconfdir}/gconf/schemas/%{name}.schemas
 %{_sysconfdir}/gconf/schemas/%{name}-*.schemas
 
@@ -259,7 +259,7 @@
 %{_libdir}/pkgconfig/libanjuta-1.0.pc
 
 %dir %{_datadir}/gtk-doc/html/libanjuta
-%{_datadir}/gtk-doc/html/libanjuta/*
+%doc %{_datadir}/gtk-doc/html/libanjuta/*
 
 %dir %{_includedir}/libanjuta-1.0
 %{_includedir}/libanjuta-1.0/libanjuta
@@ -277,6 +277,9 @@
 %{_datadir}/omf/%{name}-manual/%{name}-manual-*.omf
 
 %changelog
+* Sun Jan 04 2009 Debarshi Ray <rishi at fedoraproject.org> - 1:2.24.2-1
+- Version bump to 2.24.2. Closes Red Hat Bugzilla bug #478684.
+
 * Sat Jan 03 2009 Debarshi Ray <rishi at fedoraproject.org> - 1:2.24.1-3
 - Added patch against the Devhelp plugin from GNOME to make it work with the
   new WebKit-based Devhelp >= 0.22. Closes GNOME Bugzilla bug #560311, and Red


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/anjuta/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	28 Oct 2008 19:22:13 -0000	1.13
+++ sources	5 Jan 2009 17:07:53 -0000	1.14
@@ -1 +1 @@
-57b820afc475a2fab69637fe5c51b76e  anjuta-2.24.1.tar.gz
+125275bebd01eb9345717d3712bd4ea5  anjuta-2.24.2.tar.gz


--- anjuta-2.24.1-webkit.patch DELETED ---



From rdieter at fedoraproject.org  Mon Jan  5 17:14:01 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon,  5 Jan 2009 17:14:01 +0000 (UTC)
Subject: rpms/digikam/F-10 .cvsignore, 1.28, 1.29 digikam.spec, 1.74,
	1.75 sources, 1.28, 1.29
Message-ID: <20090105171401.CE8BC70108@cvs1.fedora.phx.redhat.com>

Author: rdieter

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

Modified Files:
	.cvsignore digikam.spec sources 
Log Message:
* Mon Jan 05 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.10.0-0.12.beta8
- digikam-0.10.0-beta8



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/digikam/F-10/.cvsignore,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- .cvsignore	19 Dec 2008 17:30:12 -0000	1.28
+++ .cvsignore	5 Jan 2009 17:13:31 -0000	1.29
@@ -1 +1 @@
-digikam-0.10.0-beta7.tar.bz2
+digikam-0.10.0-beta8.tar.bz2


Index: digikam.spec
===================================================================
RCS file: /cvs/pkgs/rpms/digikam/F-10/digikam.spec,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- digikam.spec	22 Dec 2008 20:48:25 -0000	1.74
+++ digikam.spec	5 Jan 2009 17:13:31 -0000	1.75
@@ -1,8 +1,8 @@
-%define beta beta7
+%define beta beta8
 
 Name:	 digikam
 Version: 0.10.0
-Release: 0.11.%{beta}%{?dist}
+Release: 0.12.%{beta}%{?dist}
 Summary: A digital camera accessing & photo management application
 
 Group:	 Applications/Multimedia
@@ -130,6 +130,7 @@
 %{_kde4_libdir}/kde4/*.so
 %{_kde4_appsdir}/digikam/
 %{_kde4_appsdir}/showfoto/
+%{_kde4_appsdir}/solid/actions/*.desktop
 %{_kde4_datadir}/applications/kde4/*.desktop
 %{_kde4_iconsdir}/hicolor/*/*/*
 %{_kde4_iconsdir}/oxygen/*/*/*
@@ -149,6 +150,9 @@
 
 
 %changelog
+* Mon Jan 05 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.10.0-0.12.beta8
+- digikam-0.10.0-beta8
+
 * Mon Dec 22 2008 Rex Dieter <rdieter at fedoraproject.org> - 0.10.0-0.11.beta7
 - BR: libkipi-devel >= 0.3.0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/digikam/F-10/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- sources	19 Dec 2008 17:30:13 -0000	1.28
+++ sources	5 Jan 2009 17:13:31 -0000	1.29
@@ -1 +1 @@
-81b4ab94d9312d685e21796829aa31f9  digikam-0.10.0-beta7.tar.bz2
+1e256ed34d4d7d6b90def644b66f7fa9  digikam-0.10.0-beta8.tar.bz2



From rdieter at fedoraproject.org  Mon Jan  5 17:15:28 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon,  5 Jan 2009 17:15:28 +0000 (UTC)
Subject: rpms/kipi-plugins/F-10 .cvsignore, 1.23, 1.24 kipi-plugins.spec,
	1.70, 1.71 sources, 1.23, 1.24
Message-ID: <20090105171528.9E2987013F@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kipi-plugins/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24365

Modified Files:
	.cvsignore kipi-plugins.spec sources 
Log Message:
* Mon Jan 05 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.2.0-0.11.beta6
- kipi-plugins-0.2.0-beta6



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kipi-plugins/F-10/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- .cvsignore	17 Dec 2008 14:34:22 -0000	1.23
+++ .cvsignore	5 Jan 2009 17:14:58 -0000	1.24
@@ -1 +1 @@
-kipi-plugins-0.2.0-beta5.tar.bz2
+kipi-plugins-0.2.0-beta6.tar.bz2


Index: kipi-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kipi-plugins/F-10/kipi-plugins.spec,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- kipi-plugins.spec	22 Dec 2008 20:53:06 -0000	1.70
+++ kipi-plugins.spec	5 Jan 2009 17:14:58 -0000	1.71
@@ -1,11 +1,11 @@
 # Fedora review: http://bugzilla.redhat.com/171504
 
-%define beta beta5
+%define beta beta6
 
 Name:    kipi-plugins
 Summary: Plugins to use with Kipi
 Version: 0.2.0
-Release: 0.10.%{beta}%{?dist}
+Release: 0.11.%{beta}%{?dist}
 
 License: GPLv2+
 Group:   Applications/Multimedia
@@ -44,8 +44,9 @@
 Interface.  Currently implemented plugins are:
  * AcquireImages      : Acquire images interface
  * BatchProcessImages : Batch process images: rename, convert, borders,
-                        filters, colors, effects, resize, recompress.
+                        filters, colors, effects, resize, recompress
  * RawConverter       : Raw image converter for digital cameras
+ * FbExport           : Export images to a remote Facebook web service
  * FlickrExport       : Export images to a remote Flickr web service
  * HTMLExport         : Export images collections into HTML page
  * JpegLossLess       : process JPEG images without losing quality
@@ -115,6 +116,7 @@
 %{_kde4_libdir}/kde4/kipiplugin_acquireimages.so
 %{_kde4_libdir}/kde4/kipiplugin_calendar.so
 %{_kde4_libdir}/kde4/kipiplugin_dngconverter.so
+%{_kde4_libdir}/kde4/kipiplugin_fbexport.so
 %{_kde4_libdir}/kde4/kipiplugin_flickrexport.so
 %{_kde4_libdir}/kde4/kipiplugin_galleryexport.so
 %{_kde4_libdir}/kde4/kipiplugin_gpssync.so
@@ -143,6 +145,9 @@
 
 
 %changelog
+* Mon Jan 05 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.2.0-0.11.beta6
+- kipi-plugins-0.2.0-beta6
+
 * Mon Dec 22 2008 Rex Dieter <rdieter at fedoraproject.org> - 0.2.0-0.10.beta5
 - tighten BR's (libkipi >= 0.3.0 mostly)
 
@@ -150,7 +155,7 @@
 - respin (exiv2)
 
 * Mon Dec 15 2008 Rex Dieter <rdieter at fedoraproject.org> 0.2.0-0.8.beta5
-- kipi-plugins-0.0.2-beta5
+- kipi-plugins-0.2.0-beta5
 - %%description: reorder (alphabetic), simplify
 
 * Thu Dec 04 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 0.2.0-0.7.beta4


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kipi-plugins/F-10/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sources	17 Dec 2008 14:34:22 -0000	1.23
+++ sources	5 Jan 2009 17:14:58 -0000	1.24
@@ -1 +1 @@
-4a3b382fd20e8075830132b333ae44d1  kipi-plugins-0.2.0-beta5.tar.bz2
+0442a58f2f9a68163025c205d89269d0  kipi-plugins-0.2.0-beta6.tar.bz2



From rishi at fedoraproject.org  Mon Jan  5 17:18:14 2009
From: rishi at fedoraproject.org (Debarshi Ray)
Date: Mon,  5 Jan 2009 17:18:14 +0000 (UTC)
Subject: rpms/anjuta/devel anjuta-2.24.2-webkit.patch,NONE,1.1
Message-ID: <20090105171814.CC4017013C@cvs1.fedora.phx.redhat.com>

Author: rishi

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

Added Files:
	anjuta-2.24.2-webkit.patch 
Log Message:
* Sun Jan 04 2009 Debarshi Ray <rishi at fedoraproject.org> - 1:2.24.2-1
- Version bump to 2.24.2. Closes Red Hat Bugzilla bug #478684.


anjuta-2.24.2-webkit.patch:

--- NEW FILE anjuta-2.24.2-webkit.patch ---
diff -urNp anjuta-2.24.2.orig/configure anjuta-2.24.2/configure
--- anjuta-2.24.2.orig/configure	2009-01-04 15:27:36.000000000 +0530
+++ anjuta-2.24.2/configure	2009-01-04 15:27:51.000000000 +0530
@@ -2395,7 +2395,7 @@ VTE_REQUIRED=0.9.0
 VTE_NEW_REQUIRED=0.13.1
 LIBXML_REQUIRED=2.4.23
 PANGO_REQUIRED=1.1.1
-LIBDEVHELP_REQUIRED=0.13
+LIBDEVHELP_REQUIRED=0.22
 GDL_REQUIRED=0.7.3
 GNOMEBUILD_REQUIRED=0.3.0
 GLADEUI_REQUIRED=3.2.0
@@ -18753,12 +18753,12 @@ if test -n "$PKG_CONFIG"; then
         pkg_cv_PLUGIN_DEVHELP_CFLAGS="$PLUGIN_DEVHELP_CFLAGS"
     else
         if test -n "$PKG_CONFIG" && \
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libdevhelp-1.0 >= \$LIBDEVHELP_REQUIRED\"") >&5
-  ($PKG_CONFIG --exists --print-errors "libdevhelp-1.0 >= $LIBDEVHELP_REQUIRED") 2>&5
+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libdevhelp-1.0 >= \$LIBDEVHELP_REQUIRED webkit-1.0\"") >&5
+  ($PKG_CONFIG --exists --print-errors "libdevhelp-1.0 >= $LIBDEVHELP_REQUIRED webkit-1.0") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
-  pkg_cv_PLUGIN_DEVHELP_CFLAGS=`$PKG_CONFIG --cflags "libdevhelp-1.0 >= $LIBDEVHELP_REQUIRED" 2>/dev/null`
+  pkg_cv_PLUGIN_DEVHELP_CFLAGS=`$PKG_CONFIG --cflags "libdevhelp-1.0 >= $LIBDEVHELP_REQUIRED webkit-1.0" 2>/dev/null`
 else
   pkg_failed=yes
 fi
@@ -18771,12 +18771,12 @@ if test -n "$PKG_CONFIG"; then
         pkg_cv_PLUGIN_DEVHELP_LIBS="$PLUGIN_DEVHELP_LIBS"
     else
         if test -n "$PKG_CONFIG" && \
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libdevhelp-1.0 >= \$LIBDEVHELP_REQUIRED\"") >&5
-  ($PKG_CONFIG --exists --print-errors "libdevhelp-1.0 >= $LIBDEVHELP_REQUIRED") 2>&5
+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libdevhelp-1.0 >= \$LIBDEVHELP_REQUIRED webkit-1.0\"") >&5
+  ($PKG_CONFIG --exists --print-errors "libdevhelp-1.0 >= $LIBDEVHELP_REQUIRED webkit-1.0") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
-  pkg_cv_PLUGIN_DEVHELP_LIBS=`$PKG_CONFIG --libs "libdevhelp-1.0 >= $LIBDEVHELP_REQUIRED" 2>/dev/null`
+  pkg_cv_PLUGIN_DEVHELP_LIBS=`$PKG_CONFIG --libs "libdevhelp-1.0 >= $LIBDEVHELP_REQUIRED webkit-1.0" 2>/dev/null`
 else
   pkg_failed=yes
 fi
@@ -18795,9 +18795,9 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        PLUGIN_DEVHELP_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libdevhelp-1.0 >= $LIBDEVHELP_REQUIRED"`
+	        PLUGIN_DEVHELP_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libdevhelp-1.0 >= $LIBDEVHELP_REQUIRED webkit-1.0"`
         else
-	        PLUGIN_DEVHELP_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libdevhelp-1.0 >= $LIBDEVHELP_REQUIRED"`
+	        PLUGIN_DEVHELP_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libdevhelp-1.0 >= $LIBDEVHELP_REQUIRED webkit-1.0"`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$PLUGIN_DEVHELP_PKG_ERRORS" >&5
diff -urNp anjuta-2.24.2.orig/plugins/devhelp/anjuta-devhelp.ui anjuta-2.24.2/plugins/devhelp/anjuta-devhelp.ui
--- anjuta-2.24.2.orig/plugins/devhelp/anjuta-devhelp.ui	2009-01-04 15:27:36.000000000 +0530
+++ anjuta-2.24.2/plugins/devhelp/anjuta-devhelp.ui	2009-01-04 15:27:51.000000000 +0530
@@ -1,14 +1,6 @@
 <!--*- xml -*-->
 <ui>
 	<menubar name="MenuMain">
-		<menu name="MenuView" action="ActionMenuView">
-			<menu name="Goto" action="ActionMenuGoto">
-				<placeholder name="PlaceholderGotoMenus">
-					<menuitem name="BackHelp" action="ActionDevhelpBack" />
-					<menuitem name="ForwardHelp" action="ActionDevhelpForward" />
-				</placeholder>
-			</menu>
-		</menu>
 		<placeholder name="PlaceHolderHelpMenus" >
 			<menu name="MenuHelp" action="ActionMenuHelp" >
 				<placeholder name="PlaceHolderHelpDevel" >
@@ -24,7 +16,5 @@
 	</toolbar>
 	<toolbar name="ToolbarBrowser">		
 		<toolitem name="Context" action="ActionHelpContext" />
-		<toolitem name="BackHelp" action="ActionDevhelpBack" />
-		<toolitem name="ForwardHelp" action="ActionDevhelpForward" />
 	</toolbar>
 </ui>
diff -urNp anjuta-2.24.2.orig/plugins/devhelp/htmlview.c anjuta-2.24.2/plugins/devhelp/htmlview.c
--- anjuta-2.24.2.orig/plugins/devhelp/htmlview.c	2009-01-04 15:27:36.000000000 +0530
+++ anjuta-2.24.2/plugins/devhelp/htmlview.c	1970-01-01 05:30:00.000000000 +0530
@@ -1,182 +0,0 @@
-/*
- *  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 Library 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.
- */
-
-#include "htmlview.h"
-
-#include <devhelp/dh-book-tree.h>
-#include <devhelp/dh-html.h>
-#include <devhelp/dh-preferences.h>
-#include <devhelp/dh-search.h>
-#include <devhelp/dh-base.h>
-
-static void html_view_class_init(HtmlViewClass *klass);
-static void html_view_init(HtmlView *sp);
-static void html_view_finalize(GObject *object);
-
-struct _HtmlViewPrivate {
-	DhHtml* html;
-	AnjutaDevhelp* devhelp;
-	gchar* uri;
-	guint idle_realize;
-};
-
-G_DEFINE_TYPE(HtmlView, html_view, GTK_TYPE_HBOX)
-
-static gboolean
-devhelp_html_open_uri_cb (DhHtml      *html,
-			 const gchar *uri,
-			 AnjutaDevhelp    *widget)
-{
-#ifdef HAVE_OLD_DEVHELP
-	dh_book_tree_show_uri (DH_BOOK_TREE (widget->book_tree), uri);
-#else
-	dh_book_tree_select_uri (DH_BOOK_TREE (widget->book_tree), uri);
-#endif
-	return FALSE;
-}
-
-static void
-devhelp_html_location_changed_cb (DhHtml      *html,
-				 const gchar *location,
-				 AnjutaDevhelp    *widget)
-{	
-	anjuta_devhelp_check_history (widget);
-}
-
-static gboolean
-html_view_create_html(HtmlView* html_view)
-{
-	GtkWidget* view;
-	HtmlViewPrivate* priv = html_view->priv;
-
-	priv->html = dh_html_new();
-	
-	if (!priv->html || !DH_IS_HTML(priv->html))	
-		return TRUE; /* I think the idea is to wait until we get a widget? */
-	
-	view = dh_html_get_widget(priv->html);
-	gtk_box_pack_start(GTK_BOX(html_view), dh_html_get_widget(priv->html), TRUE, TRUE, 1);
-	
-	g_signal_connect (priv->html, "open-uri",
-			  G_CALLBACK (devhelp_html_open_uri_cb),
-			  priv->devhelp);
-	g_signal_connect (priv->html, "location-changed",
-			  G_CALLBACK (devhelp_html_location_changed_cb),
-			  priv->devhelp);
-	
-	/* Hack to get GtkMozEmbed to work properly. */
-	gtk_widget_realize (view);
-
-	if (priv->uri)
-		dh_html_open_uri(priv->html, priv->uri);
-	else
-		dh_html_clear(priv->html);
-	
-	gtk_widget_show (view);
-	
-	return FALSE;
-}
-
-static void
-html_view_realize(GtkWidget* widget)
-{
-	HtmlView* html_view = HTML_VIEW(widget);
-	
-	if (html_view->priv->idle_realize == 0)
-	{
-		html_view->priv->idle_realize =
-			g_idle_add((GSourceFunc) html_view_create_html, html_view);
-	}	
-	(* GTK_WIDGET_CLASS (html_view_parent_class)->realize)(widget);
-}
-
-static void
-html_view_unrealize(GtkWidget* widget)
-{
-	HtmlView* html_view = HTML_VIEW(widget);
-	
-	if (html_view->priv->idle_realize > 0)
-	{
-		g_source_remove (html_view->priv->idle_realize);
-		html_view->priv->idle_realize = 0;
-	}
-	
-	if (html_view->priv->html != NULL)
-	{
-		g_free(html_view->priv->uri);
-		html_view->priv->uri = dh_html_get_location(html_view->priv->html);
-	}
-	else
-		html_view->priv->uri = NULL;
-	
-	if (gtk_container_get_children(GTK_CONTAINER(html_view)))
-	{
-		gtk_container_remove(GTK_CONTAINER(widget), dh_html_get_widget(html_view->priv->html));
-		html_view->priv->html = NULL;
-	}
-
-	(* GTK_WIDGET_CLASS (html_view_parent_class)->unrealize)(widget);
-}
-
-static void
-html_view_class_init(HtmlViewClass *klass)
-{
-	GObjectClass *object_class = G_OBJECT_CLASS(klass);
-	GtkWidgetClass* widget_class = GTK_WIDGET_CLASS(klass);
-
-	object_class->finalize = html_view_finalize;
-	
-	widget_class->realize = html_view_realize;
-	widget_class->unrealize = html_view_unrealize;
-}
-
-static void
-html_view_init(HtmlView *obj)
-{
-	obj->priv = g_new0(HtmlViewPrivate, 1);
-	gtk_widget_show(GTK_WIDGET(obj));
-}
-
-static void
-html_view_finalize(GObject *object)
-{
-	HtmlView *cobj;
-	cobj = HTML_VIEW(object);
-	
-	/* Free private members, etc. */
-	if (cobj->priv->html)
-		gtk_widget_destroy(dh_html_get_widget(cobj->priv->html));
-	g_free (cobj->priv->uri);	
-	g_free(cobj->priv);
-	G_OBJECT_CLASS(html_view_parent_class)->finalize(object);
-}
-
-GtkWidget*
-html_view_new(AnjutaDevhelp* devhelp)
-{
-	HtmlView *obj;
-	
-	obj = HTML_VIEW(g_object_new(HTML_TYPE_VIEW, NULL));
-	
-	obj->priv->devhelp = devhelp;
-	
-	return GTK_WIDGET(obj);
-}
-
-DhHtml* html_view_get_dh_html(HtmlView* view)
-{
-	return view->priv->html;
-}
diff -urNp anjuta-2.24.2.orig/plugins/devhelp/htmlview.h anjuta-2.24.2/plugins/devhelp/htmlview.h
--- anjuta-2.24.2.orig/plugins/devhelp/htmlview.h	2009-01-04 15:27:36.000000000 +0530
+++ anjuta-2.24.2/plugins/devhelp/htmlview.h	1970-01-01 05:30:00.000000000 +0530
@@ -1,57 +0,0 @@
-/*
- *  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 Library 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 HTMLVIEW_H
-#define HTMLVIEW_H
-
-#include <glib.h>
-#include <glib-object.h>
-#include <gtk/gtk.h>
-
-#include <devhelp/dh-html.h>
-
-#include "plugin.h"
-
-G_BEGIN_DECLS
-
-#define HTML_TYPE_VIEW         (html_view_get_type ())
-#define HTML_VIEW(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), HTML_TYPE_VIEW, HtmlView))
-#define HTML_VIEW_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), HTML_TYPE_VIEW, HtmlViewClass))
-#define HTML_IS_VIEW(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), HTML_TYPE_VIEW))
-#define HTML_IS_VIEW_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), HTML_TYPE_VIEW))
-#define HTML_VIEW_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), HTML_TYPE_VIEW, HtmlViewClass))
-
-typedef struct _HtmlView HtmlView;
-typedef struct _HtmlViewPrivate HtmlViewPrivate;
-typedef struct _HtmlViewClass HtmlViewClass;
-
-struct _HtmlView {
-	GtkHBox parent;
-	HtmlViewPrivate *priv;
-};
-
-struct _HtmlViewClass {
-	GtkHBoxClass parent_class;
-};
-
-GType html_view_get_type(void);
-GtkWidget *html_view_new(AnjutaDevhelp* devhelp);
-
-DhHtml* html_view_get_dh_html(HtmlView* html_view);
-
-G_END_DECLS
-
-#endif /* HTMLVIEW_H */
diff -urNp anjuta-2.24.2.orig/plugins/devhelp/Makefile.in anjuta-2.24.2/plugins/devhelp/Makefile.in
--- anjuta-2.24.2.orig/plugins/devhelp/Makefile.in	2009-01-04 15:27:36.000000000 +0530
+++ anjuta-2.24.2/plugins/devhelp/Makefile.in	2009-01-04 15:27:51.000000000 +0530
@@ -37,11 +37,7 @@ build_triplet = @build@
 host_triplet = @host@
 @HAVE_PLUGIN_DEVHELP_TRUE at am__append_1 = $(PLUGIN_DEVHELP_CFLAGS)
 @HAVE_PLUGIN_DEVHELP_FALSE at am__append_2 = -DDISABLE_EMBEDDED_DEVHELP
- at HAVE_PLUGIN_DEVHELP_TRUE@am__append_3 = \
- at HAVE_PLUGIN_DEVHELP_TRUE@	htmlview.c \
- at HAVE_PLUGIN_DEVHELP_TRUE@	htmlview.h
-
- at HAVE_PLUGIN_DEVHELP_TRUE@am__append_4 = $(PLUGIN_DEVHELP_LIBS)
+ at HAVE_PLUGIN_DEVHELP_TRUE@am__append_3 = $(PLUGIN_DEVHELP_LIBS)
 subdir = plugins/devhelp
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -67,10 +63,7 @@ am__DEPENDENCIES_1 =
 @HAVE_PLUGIN_DEVHELP_TRUE at am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1)
 libanjuta_devhelp_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2)
-am__libanjuta_devhelp_la_SOURCES_DIST = plugin.c plugin.h htmlview.c \
-	htmlview.h
- at HAVE_PLUGIN_DEVHELP_TRUE@am__objects_1 = htmlview.lo
-am_libanjuta_devhelp_la_OBJECTS = plugin.lo $(am__objects_1)
+am_libanjuta_devhelp_la_OBJECTS = plugin.lo
 libanjuta_devhelp_la_OBJECTS = $(am_libanjuta_devhelp_la_OBJECTS)
 libanjuta_devhelp_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
@@ -88,7 +81,7 @@ LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLF
 	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
 	$(LDFLAGS) -o $@
 SOURCES = $(libanjuta_devhelp_la_SOURCES)
-DIST_SOURCES = $(am__libanjuta_devhelp_la_SOURCES_DIST)
+DIST_SOURCES = $(libanjuta_devhelp_la_SOURCES)
 devhelp_pixmapsDATA_INSTALL = $(INSTALL_DATA)
 devhelp_pluginDATA_INSTALL = $(INSTALL_DATA)
 devhelp_uiDATA_INSTALL = $(INSTALL_DATA)
@@ -389,6 +382,7 @@ sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 
@@ -424,11 +418,14 @@ plugin_LTLIBRARIES = libanjuta-devhelp.l
 libanjuta_devhelp_la_LDFLAGS = $(ANJUTA_PLUGIN_LDFLAGS)
 
 # Plugin sources
-libanjuta_devhelp_la_SOURCES = plugin.c plugin.h $(am__append_3)
+libanjuta_devhelp_la_SOURCES = \
+	plugin.c \
+	plugin.h
+
 
 # Plugin dependencies
 libanjuta_devhelp_la_LIBADD = $(GTK_LIBS) $(LIBANJUTA_LIBS) \
-	$(am__append_4)
+	$(am__append_3)
 EXTRA_DIST = \
 	$(plugin_in_files) \
 	$(devhelp_plugin_DATA) \
@@ -504,7 +501,6 @@ mostlyclean-compile:
 distclean-compile:
 	-rm -f *.tab.c
 
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/htmlview.Plo at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/plugin.Plo at am__quote@
 
 .c.o:
diff -urNp anjuta-2.24.2.orig/plugins/devhelp/plugin.c anjuta-2.24.2/plugins/devhelp/plugin.c
--- anjuta-2.24.2.orig/plugins/devhelp/plugin.c	2009-01-04 15:27:36.000000000 +0530
+++ anjuta-2.24.2/plugins/devhelp/plugin.c	2009-01-04 15:27:51.000000000 +0530
@@ -34,11 +34,9 @@
 #ifndef DISABLE_EMBEDDED_DEVHELP
 
 #include <devhelp/dh-book-tree.h>
-#include <devhelp/dh-html.h>
-#include <devhelp/dh-preferences.h>
 #include <devhelp/dh-search.h>
 #include <devhelp/dh-base.h>
-#include "htmlview.h"
+#include <webkit/webkit.h>
 #define UI_FILE PACKAGE_DATA_DIR"/ui/anjuta-devhelp.ui"
 
 #else /* DISABLE_EMBEDDED_DEVHELP */
@@ -51,12 +49,8 @@ static gpointer parent_class;
 
 #ifndef DISABLE_EMBEDDED_DEVHELP
 
-#define ANJUTA_PIXMAP_HELP_NEXT "anjuta-go-help-next-24.png"
-#define ANJUTA_PIXMAP_HELP_PREV "anjuta-go-help-prev-24.png"
 #define ANJUTA_PIXMAP_DEVHELP "anjuta-devhelp-plugin-48.png"
 
-#define ANJUTA_STOCK_HELP_NEXT "anjuta-help-next"
-#define ANJUTA_STOCK_HELP_PREV "anjuta-help-prev"
 #define ANJUTA_STOCK_DEVHELP "anjuta-devhelp"
 
 static void
@@ -74,76 +68,55 @@ register_stock_icons (AnjutaPlugin *plug
 	/* Register stock icons */
 	ui = anjuta_shell_get_ui (plugin->shell, NULL);
 	icon_factory = anjuta_ui_get_icon_factory (ui);
-	REGISTER_ICON (ANJUTA_PIXMAP_HELP_NEXT, ANJUTA_STOCK_HELP_NEXT);
-	REGISTER_ICON (ANJUTA_PIXMAP_HELP_PREV, ANJUTA_STOCK_HELP_PREV);
 	REGISTER_ICON (ANJUTA_PIXMAP_DEVHELP, ANJUTA_STOCK_DEVHELP);
 }
 
 static void
-devhelp_tree_link_selected_cb (GObject       *ignored,
-			      DhLink        *link,
-			      AnjutaDevhelp *widget)
+devhelp_tree_link_selected_cb (GObject       *ignored, DhLink *link,
+							   AnjutaDevhelp *widget)
 {
+	gchar *uri;
 	
-	DhHtml       *html;
+	/*anjuta_shell_present_widget (ANJUTA_PLUGIN (widget)->shell,
+								 widget->view, NULL);*/
 
-	anjuta_shell_present_widget (ANJUTA_PLUGIN (widget)->shell,
-								 widget->htmlview, NULL);
-
-	html = html_view_get_dh_html(HTML_VIEW(widget->htmlview));
-	
-	if (!DH_IS_HTML(html))
-		return;
+	uri = dh_link_get_uri (link);
+	webkit_web_view_open (WEBKIT_WEB_VIEW (widget->view), uri);
+	g_free (uri);
 	
-	dh_html_open_uri (html, link->uri);
-
 	anjuta_devhelp_check_history (widget);
 }
 
 static void
-devhelp_search_link_selected_cb (GObject  *ignored,
-				DhLink   *link,
-				 AnjutaDevhelp *widget)
+devhelp_search_link_selected_cb (GObject  *ignored, DhLink *link,
+								 AnjutaDevhelp *widget)
 {
-	DhHtml       *html;
-
-	anjuta_shell_present_widget (ANJUTA_PLUGIN (widget)->shell,
-								 widget->htmlview, NULL);
-
-	html = html_view_get_dh_html(HTML_VIEW(widget->htmlview));
-
-	if (!DH_IS_HTML(html))
-		return;
-
-	dh_html_open_uri (html, link->uri);
+	gchar *uri;
+	
+	/*anjuta_shell_present_widget (ANJUTA_PLUGIN (widget)->shell,
+								 widget->view, NULL);*/
 
+	uri = dh_link_get_uri (link);
+	webkit_web_view_open (WEBKIT_WEB_VIEW (widget->view), uri);
+	g_free (uri);
+	
 	anjuta_devhelp_check_history (widget);
 }
 
 static void
-on_go_back_activate (GtkAction *action, AnjutaDevhelp *plugin)
+on_go_back_clicked (GtkWidget *widget, AnjutaDevhelp *plugin)
 {
-	DhHtml* html;
-
-	html = html_view_get_dh_html(HTML_VIEW(plugin->htmlview));
+	webkit_web_view_go_back (WEBKIT_WEB_VIEW (plugin->view));
 	
-	if (!DH_IS_HTML(html))
-		return;
-		
-	dh_html_go_back(html);
+	anjuta_devhelp_check_history (plugin);
 }
 
 static void
-on_go_forward_activate (GtkAction *action, AnjutaDevhelp *plugin)
+on_go_forward_clicked (GtkWidget *widget, AnjutaDevhelp *plugin)
 {
-	DhHtml* html;
-
-	html = html_view_get_dh_html(HTML_VIEW(plugin->htmlview));
+	webkit_web_view_go_forward (WEBKIT_WEB_VIEW (plugin->view));
 	
-	if (!DH_IS_HTML(html))
-		return;
-	
-	dh_html_go_forward(html);
+	anjuta_devhelp_check_history (plugin);
 }
 
 static gboolean
@@ -173,7 +146,7 @@ on_api_reference_activate (GtkAction *ac
 }
 
 static gboolean
-context_idle(AnjutaDevhelp* plugin)
+context_idle (AnjutaDevhelp* plugin)
 {
 	IAnjutaEditor *editor;
 	gchar *current_word;
@@ -232,22 +205,6 @@ static GtkActionEntry actions[] = {
 		NULL,
 		NULL
 	},
-	{
-		"ActionDevhelpBack",
-		ANJUTA_STOCK_HELP_PREV,
-		N_("Previous Help"),
-		NULL,
-		N_("Go to previous help page"),
-		G_CALLBACK (on_go_back_activate)
-	},
-	{
-		"ActionDevhelpForward",
-		ANJUTA_STOCK_HELP_NEXT,
-		N_("Next Help"),
-		NULL,
-		N_("Go to next help page"),
-		G_CALLBACK (on_go_forward_activate)
-	},
 #endif /* DISABLE_EMBEDDED_DEVHELP */
 	{
 		"ActionHelpApi",
@@ -282,7 +239,7 @@ static GtkActionEntry actions[] = {
 /* Watches callbacks */
 
 static void
-value_added_current_editor (AnjutaPlugin *plugin, const char *name,
+value_added_current_editor (AnjutaPlugin *plugin, const gchar *name,
 							const GValue *value, gpointer data)
 {
 	GtkAction *action;
@@ -300,7 +257,7 @@ value_added_current_editor (AnjutaPlugin
 
 static void
 value_removed_current_editor (AnjutaPlugin *plugin,
-							  const char *name, gpointer data)
+							  const gchar *name, gpointer data)
 {
 	GtkAction *action;
 	AnjutaDevhelp* devhelp = ANJUTA_PLUGIN_DEVHELP (data);	
@@ -314,7 +271,6 @@ value_removed_current_editor (AnjutaPlug
 static gboolean
 devhelp_activate (AnjutaPlugin *plugin)
 {
-
 	AnjutaUI *ui;
 	AnjutaDevhelp *devhelp;
 
@@ -323,12 +279,15 @@ devhelp_activate (AnjutaPlugin *plugin)
 	GNode *books;
 	GList *keywords;
 	GtkWidget* books_sw;
+	GtkWidget *scrolled_window;
+	GtkWidget *main_vbox;
+	GtkWidget *button_hbox;
 	
 	if (!init)
 	{
 		register_stock_icons (plugin);
 		init = TRUE;
-	}	
+	}
 #endif
 
 	DEBUG_PRINT ("AnjutaDevhelp: Activating AnjutaDevhelp plugin ...");
@@ -346,47 +305,89 @@ devhelp_activate (AnjutaPlugin *plugin)
 	devhelp->uiid = anjuta_ui_merge (ui, UI_FILE);
 
 #ifndef DISABLE_EMBEDDED_DEVHELP
-
+	/*
+	 * Forward/back buttons
+	 */
+	main_vbox = gtk_vbox_new (FALSE, 6);
+	gtk_widget_show (main_vbox);
+	button_hbox = gtk_hbox_new (FALSE, 0);
+	gtk_widget_show (button_hbox);
+	
+	devhelp->go_back = gtk_button_new_from_stock (GTK_STOCK_GO_BACK);
+	gtk_widget_show (devhelp->go_back);
+	gtk_box_pack_start (GTK_BOX (button_hbox), devhelp->go_back, FALSE, FALSE, 0);
+	gtk_widget_set_sensitive (devhelp->go_back, FALSE);
+	g_signal_connect (devhelp->go_back, "clicked",
+			  G_CALLBACK (on_go_back_clicked), devhelp);
+	
+	devhelp->go_forward = gtk_button_new_from_stock (GTK_STOCK_GO_FORWARD);
+	gtk_widget_show (devhelp->go_forward);
+	gtk_box_pack_start (GTK_BOX (button_hbox), devhelp->go_forward, FALSE, FALSE, 0);
+	gtk_widget_set_sensitive (devhelp->go_forward, FALSE);
+	g_signal_connect (devhelp->go_forward, "clicked",
+			  G_CALLBACK (on_go_forward_clicked), devhelp);
+	
+	gtk_box_pack_start (GTK_BOX (main_vbox), button_hbox, FALSE, FALSE, 0);
+	
+	/*
+	 * Notebook
+	 */
 	books = dh_base_get_book_tree (devhelp->base);
 	keywords = dh_base_get_keywords (devhelp->base);
 	
-	books_sw = gtk_scrolled_window_new(NULL, NULL);
+	books_sw = gtk_scrolled_window_new (NULL, NULL);
 	gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (books_sw),
-					GTK_POLICY_NEVER,
-					GTK_POLICY_AUTOMATIC);
+									GTK_POLICY_NEVER,
+									GTK_POLICY_AUTOMATIC);
 	gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (books_sw),
-					     GTK_SHADOW_IN);
+									     GTK_SHADOW_IN);
 	gtk_container_set_border_width (GTK_CONTAINER (books_sw), 2);
 	
-	devhelp->control_notebook = gtk_notebook_new();
-	devhelp->book_tree = dh_book_tree_new(books);
-	devhelp->search = dh_search_new(keywords);
+	devhelp->control_notebook = gtk_notebook_new ();
+	gtk_box_pack_start (GTK_BOX (main_vbox), devhelp->control_notebook, TRUE, TRUE, 0);
+	devhelp->book_tree = dh_book_tree_new (books);
+	
+	devhelp->search = dh_search_new (keywords);
+	gtk_widget_set_size_request (devhelp->search, 0, 0);
 	
 	g_signal_connect (devhelp->book_tree,
-			  "link-selected",
-			  G_CALLBACK (devhelp_tree_link_selected_cb),
-			  devhelp);
+					  "link-selected",
+					  G_CALLBACK (devhelp_tree_link_selected_cb),
+					  devhelp);
 	g_signal_connect (devhelp->search,
-			  "link-selected",
-			  G_CALLBACK (devhelp_search_link_selected_cb),
-			  devhelp);
-	
-	gtk_container_add(GTK_CONTAINER(books_sw), devhelp->book_tree);
-	gtk_notebook_append_page(GTK_NOTEBOOK(devhelp->control_notebook), books_sw,
-		gtk_label_new(_("Books")));
-	gtk_notebook_append_page(GTK_NOTEBOOK(devhelp->control_notebook), devhelp->search,
-		gtk_label_new(_("Search")));
-	
-	devhelp->htmlview = html_view_new(devhelp);	
-
-	anjuta_shell_add_widget (plugin->shell, devhelp->control_notebook,
-								 "AnjutaDevhelpIndex", _("Help"), ANJUTA_STOCK_DEVHELP,
-								 ANJUTA_SHELL_PLACEMENT_LEFT, NULL);
+					  "link-selected",
+					  G_CALLBACK (devhelp_search_link_selected_cb),
+					  devhelp);
+	
+	gtk_container_add (GTK_CONTAINER (books_sw), devhelp->book_tree);
+	gtk_notebook_append_page (GTK_NOTEBOOK (devhelp->control_notebook), books_sw,
+							 gtk_label_new (_("Contents")));
+	gtk_notebook_append_page (GTK_NOTEBOOK (devhelp->control_notebook), devhelp->search,
+							  gtk_label_new (_("Search")));
+	
+	gtk_widget_show_all (devhelp->control_notebook);
+	
+	/* View */
+	devhelp->view = webkit_web_view_new ();
+	gtk_widget_show (devhelp->view);
+	
+	webkit_web_view_open (WEBKIT_WEB_VIEW (devhelp->view), "about:blank");
+	
+	scrolled_window = gtk_scrolled_window_new (NULL, NULL);
+	gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window),
+									GTK_POLICY_AUTOMATIC,
+									GTK_POLICY_AUTOMATIC);
+	gtk_widget_show (scrolled_window);
+	gtk_container_add (GTK_CONTAINER (scrolled_window), devhelp->view);
+
+	anjuta_shell_add_widget (plugin->shell, main_vbox,
+							 "AnjutaDevhelpIndex", _("Help"), ANJUTA_STOCK_DEVHELP,
+							 ANJUTA_SHELL_PLACEMENT_LEFT, NULL);
 	/* This is the window that show the html help text */
-	anjuta_shell_add_widget (plugin->shell, devhelp->htmlview,
-								 "AnjutaDevhelpDisplay", _("Help display"),
-								 ANJUTA_STOCK_DEVHELP,
-								 ANJUTA_SHELL_PLACEMENT_CENTER, NULL);
+	anjuta_shell_add_widget (plugin->shell, scrolled_window,
+							 "AnjutaDevhelpDisplay", _("Help display"),
+							 ANJUTA_STOCK_DEVHELP,
+							 ANJUTA_SHELL_PLACEMENT_CENTER, NULL);
 								 
 #endif /* DISABLE_EMBEDDED_DEVHELP */
 
@@ -415,7 +416,7 @@ devhelp_deactivate (AnjutaPlugin *plugin
 #ifndef DISABLE_EMBEDDED_DEVHELP
 
 	/* Remove widgets */
-	anjuta_shell_remove_widget(plugin->shell, devhelp->htmlview, NULL);
+	anjuta_shell_remove_widget(plugin->shell, devhelp->view, NULL);
 	anjuta_shell_remove_widget(plugin->shell, devhelp->control_notebook, NULL);	
 
 #endif /* DISABLE_EMBEDDED_DEVHELP */
@@ -431,32 +432,22 @@ devhelp_deactivate (AnjutaPlugin *plugin
 
 #ifndef DISABLE_EMBEDDED_DEVHELP
 
-void anjuta_devhelp_check_history(AnjutaDevhelp* devhelp)
+void
+anjuta_devhelp_check_history (AnjutaDevhelp* devhelp)
 {
-	GtkAction* action_forward;
-	GtkAction* action_back;
-	DhHtml* html = html_view_get_dh_html(HTML_VIEW(devhelp->htmlview));
-	
-	action_forward = gtk_action_group_get_action (devhelp->action_group,
-										  "ActionDevhelpForward");
-	action_back = gtk_action_group_get_action (devhelp->action_group,
-										  "ActionDevhelpBack");
-	if (html != NULL)
-	{
-		g_object_set (action_forward, "sensitive", dh_html_can_go_forward (html) , NULL);
-		g_object_set (action_back, "sensitive", dh_html_can_go_back (html) , NULL);
-	}
+	gtk_widget_set_sensitive (devhelp->go_forward, webkit_web_view_can_go_forward (WEBKIT_WEB_VIEW (devhelp->view)));
+
+	gtk_widget_set_sensitive (devhelp->go_back, webkit_web_view_can_go_back (WEBKIT_WEB_VIEW (devhelp->view)));
 }
 
 #endif /* DISABLE_EMBEDDED_DEVHELP */
 
-#if 0
 static void
 devhelp_finalize (GObject *obj)
 {
+	DEBUG_PRINT ("%s", "Finalising Devhelp plugin");
+
 	/* Finalization codes here */
-	AnjutaDevhelp *plugin = ANJUTA_PLUGIN_DEVHELP (obj);
-	
 	G_OBJECT_CLASS (parent_class)->finalize (obj);
 }
 
@@ -465,13 +456,17 @@ devhelp_dispose (GObject *obj)
 {
 	AnjutaDevhelp* devhelp = ANJUTA_PLUGIN_DEVHELP (obj);
 	
-	/* Destroy devhelp - seems not to work... */
-	// g_object_unref(G_OBJECT(devhelp->base));
+	DEBUG_PRINT ("%s", "Disposing Devhelp plugin");
+	
+	if (devhelp->base)
+	{
+		g_object_unref(G_OBJECT(devhelp->base));
+		devhelp->base = NULL;
+	}
 
 	/* Disposition codes */
 	G_OBJECT_CLASS (parent_class)->dispose (obj);
 }
-#endif
 
 static void
 devhelp_instance_init (GObject *obj)
@@ -497,10 +492,9 @@ devhelp_class_init (GObjectClass *klass)
 
 	plugin_class->activate = devhelp_activate;
 	plugin_class->deactivate = devhelp_deactivate;
-#if 0
+	
 	klass->finalize = devhelp_finalize;
 	klass->dispose = devhelp_dispose;
-#endif
 }
 
 #ifndef DISABLE_EMBEDDED_DEVHELP
@@ -515,7 +509,7 @@ ihelp_search (IAnjutaHelp *help, const g
 	anjuta_shell_present_widget (ANJUTA_PLUGIN (plugin)->shell,
 								 plugin->control_notebook, NULL);
 	
-	dh_search_set_search_string (DH_SEARCH (plugin->search), query);
+	dh_search_set_search_string (DH_SEARCH (plugin->search), query, NULL);
 	gtk_notebook_set_current_page (GTK_NOTEBOOK (plugin->control_notebook), 1);
 }
 
@@ -524,34 +518,33 @@ ihelp_search (IAnjutaHelp *help, const g
 static void
 ihelp_search (IAnjutaHelp *help, const gchar *query, GError **err)
 {
-	AnjutaDevhelp *plugin;
-	
-	plugin = ANJUTA_PLUGIN_DEVHELP (help);
+	gchar *cmd[4];
 	
 	if (!anjuta_util_prog_is_installed ("devhelp", TRUE))
 	{
 		return;
 	}
 	
-	if(query && strlen (query) > 0)
+	cmd[0] = "devhelp";
+	
+	if (query && strlen (query) > 0)
 	{
-		fprintf(stderr, "Word is %s\n", query);
-		if(fork()==0)
-		{
-			execlp("devhelp", "devhelp", "-s", query, NULL);
-			g_warning (_("Cannot execute command: \"%s\""), "devhelp");
-			_exit(1);
-		}
+		cmd[1] = "-s";
+		cmd[2] = (gchar *)query;
+		cmd[3] = NULL;	
 	}
 	else
 	{
-		if(fork()==0)
-		{
-			execlp("devhelp", "devhelp", NULL);
-			g_warning (_("Cannot execute command: \"%s\""), "devhelp");
-			_exit(1);
-		}
+		cmd[1] = NULL;
 	}
+	
+	gdk_spawn_on_screen (gdk_screen_get_default (),
+					     NULL,
+					     cmd,
+					     NULL,
+					     G_SPAWN_SEARCH_PATH,
+					     NULL,
+					     NULL, NULL, NULL);
 }
 
 #endif /* DISABLE_EMBEDDED_DEVHELP */
diff -urNp anjuta-2.24.2.orig/plugins/devhelp/plugin.h anjuta-2.24.2/plugins/devhelp/plugin.h
--- anjuta-2.24.2.orig/plugins/devhelp/plugin.h	2009-01-04 15:27:36.000000000 +0530
+++ anjuta-2.24.2/plugins/devhelp/plugin.h	2009-01-04 15:27:51.000000000 +0530
@@ -49,10 +49,12 @@ struct _AnjutaDevhelp{
 #ifndef DISABLE_EMBEDDED_DEVHELP
 	DhBase         *base;
 #endif /* DISABLE_EMBEDDED_DEVHELP */
-	GtkWidget     *htmlview;    
+	GtkWidget      *view;    
 	GtkWidget      *control_notebook; 
 	GtkWidget      *book_tree;
 	GtkWidget      *search;
+    GtkWidget      *go_back;
+    GtkWidget      *go_forward;
 	
 	IAnjutaEditor	*editor;
 	guint editor_watch_id;



From buc at fedoraproject.org  Mon Jan  5 17:26:48 2009
From: buc at fedoraproject.org (Dmitry Butskoy)
Date: Mon,  5 Jan 2009 17:26:48 +0000 (UTC)
Subject: rpms/newscache/devel newscache.spec,1.12,1.13
Message-ID: <20090105172648.8426270108@cvs1.fedora.phx.redhat.com>

Author: buc

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

Modified Files:
	newscache.spec 
Log Message:



Index: newscache.spec
===================================================================
RCS file: /cvs/extras/rpms/newscache/devel/newscache.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- newscache.spec	5 Jan 2009 16:17:42 -0000	1.12
+++ newscache.spec	5 Jan 2009 17:26:18 -0000	1.13
@@ -46,12 +46,13 @@
 # to ship it separately.
 
 pushd socket++-%{socketver}
-#./autogen
 aclocal
-autoconf
-autoheader
-libtoolize -v -f
-automake --add-missing
+./autogen
+#aclocal
+#autoconf
+#autoheader
+#libtoolize -v -f
+#automake --add-missing
 %configure --enable-static --disable-shared
 make
 popd



From musuruan at fedoraproject.org  Mon Jan  5 17:31:11 2009
From: musuruan at fedoraproject.org (Andrea Musuruane)
Date: Mon,  5 Jan 2009 17:31:11 +0000 (UTC)
Subject: rpms/libicns/devel .cvsignore, 1.2, 1.3 libicns.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <20090105173111.ED02A70108@cvs1.fedora.phx.redhat.com>

Author: musuruan

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

Modified Files:
	.cvsignore libicns.spec sources 
Log Message:
* Mon Jan 05 2009 Andrea Musuruane <musuruan at gmail.com> - 0.6.1-1
- Updated to upstream 0.6.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libicns/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	21 Dec 2008 13:51:36 -0000	1.2
+++ .cvsignore	5 Jan 2009 17:30:41 -0000	1.3
@@ -1 +1 @@
-libicns-0.6.0.tar.gz
+libicns-0.6.1.tar.gz


Index: libicns.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libicns/devel/libicns.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libicns.spec	21 Dec 2008 13:51:36 -0000	1.1
+++ libicns.spec	5 Jan 2009 17:30:41 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           libicns
-Version:        0.6.0 
-Release:        2%{?dist}
+Version:        0.6.1 
+Release:        1%{?dist}
 Summary:        Library for manipulating Macintosh icns files
 
 Group:          System Environment/Libraries
@@ -88,6 +88,9 @@
 
 
 %changelog
+* Mon Jan 05 2009 Andrea Musuruane <musuruan at gmail.com> - 0.6.1-1
+- Updated to upstream 0.6.1
+
 * Sat Dec 20 2008 Andrea Musuruane <musuruan at gmail.com> - 0.6.0-2
 - Fixed Source0 URL
 - Added missing 'Requires: pkgconfig' to devel package


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libicns/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	21 Dec 2008 13:51:36 -0000	1.2
+++ sources	5 Jan 2009 17:30:41 -0000	1.3
@@ -1 +1 @@
-f6ab74c2cfd4ab5b11d1cb9114743c90  libicns-0.6.0.tar.gz
+ee7e417570becd638caf40c6d1bbfee2  libicns-0.6.1.tar.gz



From buc at fedoraproject.org  Mon Jan  5 17:38:11 2009
From: buc at fedoraproject.org (Dmitry Butskoy)
Date: Mon,  5 Jan 2009 17:38:11 +0000 (UTC)
Subject: rpms/newscache/devel socket++-1.12.12-libtool2.patch, NONE,
	1.1 newscache.spec, 1.13, 1.14
Message-ID: <20090105173811.6694570108@cvs1.fedora.phx.redhat.com>

Author: buc

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

Modified Files:
	newscache.spec 
Added Files:
	socket++-1.12.12-libtool2.patch 
Log Message:


socket++-1.12.12-libtool2.patch:

--- NEW FILE socket++-1.12.12-libtool2.patch ---
diff -Nrbu socket++-1.12.12/configure.in socket++-1.12.12-OK/configure.in
--- socket++-1.12.12/configure.in	2004-09-30 17:00:14.000000000 +0400
+++ socket++-1.12.12-OK/configure.in	2009-01-05 20:34:24.000000000 +0300
@@ -32,7 +32,7 @@
 AC_PROG_MAKE_SET
 AC_LANG_CPLUSPLUS
 AC_PROG_CXX
-AM_PROG_LIBTOOL
+LT_INIT
 AC_PROG_INSTALL
 
 AC_CHECK_PROG(MAKEDEPEND, makedepend, makedepend, :) dnl not a smiley :(


Index: newscache.spec
===================================================================
RCS file: /cvs/extras/rpms/newscache/devel/newscache.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- newscache.spec	5 Jan 2009 17:26:18 -0000	1.13
+++ newscache.spec	5 Jan 2009 17:37:40 -0000	1.14
@@ -14,6 +14,7 @@
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Patch1:		newscache-1.2rc6-config.patch
 Patch2:		newscache-1.2rc6-gcc43.patch
+Patch3:		socket++-1.12.12-libtool2.patch
 BuildRequires:	libtool, texinfo, pam-devel
 
 Requires(pre): shadow-utils
@@ -38,6 +39,10 @@
 %patch1 -p0
 %patch2 -p1
 
+pushd socket++-%{socketver}
+%patch3 -p1
+popd
+
 
 %build
 
@@ -46,13 +51,7 @@
 # to ship it separately.
 
 pushd socket++-%{socketver}
-aclocal
 ./autogen
-#aclocal
-#autoconf
-#autoheader
-#libtoolize -v -f
-#automake --add-missing
 %configure --enable-static --disable-shared
 make
 popd



From musuruan at fedoraproject.org  Mon Jan  5 17:40:14 2009
From: musuruan at fedoraproject.org (Andrea Musuruane)
Date: Mon,  5 Jan 2009 17:40:14 +0000 (UTC)
Subject: rpms/libicns/F-10 .cvsignore, 1.2, 1.3 libicns.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <20090105174014.F1F2A70108@cvs1.fedora.phx.redhat.com>

Author: musuruan

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

Modified Files:
	.cvsignore libicns.spec sources 
Log Message:
* Mon Jan 05 2009 Andrea Musuruane <musuruan at gmail.com> - 0.6.1-1
- Updated to upstream 0.6.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libicns/F-10/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	21 Dec 2008 13:53:37 -0000	1.2
+++ .cvsignore	5 Jan 2009 17:39:44 -0000	1.3
@@ -1 +1 @@
-libicns-0.6.0.tar.gz
+libicns-0.6.1.tar.gz


Index: libicns.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libicns/F-10/libicns.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libicns.spec	21 Dec 2008 13:53:38 -0000	1.1
+++ libicns.spec	5 Jan 2009 17:39:44 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           libicns
-Version:        0.6.0 
-Release:        2%{?dist}
+Version:        0.6.1 
+Release:        1%{?dist}
 Summary:        Library for manipulating Macintosh icns files
 
 Group:          System Environment/Libraries
@@ -88,6 +88,9 @@
 
 
 %changelog
+* Mon Jan 05 2009 Andrea Musuruane <musuruan at gmail.com> - 0.6.1-1
+- Updated to upstream 0.6.1
+
 * Sat Dec 20 2008 Andrea Musuruane <musuruan at gmail.com> - 0.6.0-2
 - Fixed Source0 URL
 - Added missing 'Requires: pkgconfig' to devel package


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libicns/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	21 Dec 2008 13:53:38 -0000	1.2
+++ sources	5 Jan 2009 17:39:44 -0000	1.3
@@ -1 +1 @@
-f6ab74c2cfd4ab5b11d1cb9114743c90  libicns-0.6.0.tar.gz
+ee7e417570becd638caf40c6d1bbfee2  libicns-0.6.1.tar.gz



From davej at fedoraproject.org  Mon Jan  5 17:42:54 2009
From: davej at fedoraproject.org (Dave Jones)
Date: Mon,  5 Jan 2009 17:42:54 +0000 (UTC)
Subject: rpms/kernel/devel patch-2.6.28-git7.bz2.sign, NONE, 1.1 .cvsignore, 
	1.980, 1.981 kernel.spec, 1.1191, 1.1192 sources, 1.942,
	1.943 upstream, 1.854, 1.855 patch-2.6.28-git6.bz2.sign, 1.1, NONE
Message-ID: <20090105174254.10D4270108@cvs1.fedora.phx.redhat.com>

Author: davej

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

Modified Files:
	.cvsignore kernel.spec sources upstream 
Added Files:
	patch-2.6.28-git7.bz2.sign 
Removed Files:
	patch-2.6.28-git6.bz2.sign 
Log Message:
2.6.28-git7


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

iD8DBQBJYfbKyGugalF9Dw4RAn48AKCEVf422VHdRnt8/HddIQvQfdlWSQCgjl+i
6ftl9Q8TDjBw+TBu0t7VerA=
=oJGE
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.980
retrieving revision 1.981
diff -u -r1.980 -r1.981
--- .cvsignore	4 Jan 2009 01:50:32 -0000	1.980
+++ .cvsignore	5 Jan 2009 17:42:23 -0000	1.981
@@ -4,4 +4,4 @@
 temp-*
 kernel-2.6.28
 linux-2.6.28.tar.bz2
-patch-2.6.28-git6.bz2
+patch-2.6.28-git7.bz2


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1191
retrieving revision 1.1192
diff -u -r1.1191 -r1.1192
--- kernel.spec	4 Jan 2009 01:50:33 -0000	1.1191
+++ kernel.spec	5 Jan 2009 17:42:23 -0000	1.1192
@@ -57,7 +57,7 @@
 # The rc snapshot level
 %define rcrev 0
 # The git snapshot level
-%define gitrev 6
+%define gitrev 7
 # Set rpm version accordingly
 %define rpmversion 2.6.%{upstream_sublevel}
 %endif
@@ -1757,6 +1757,9 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Mon Jan 05 2009 Dave Jones <davej at redhat.com>
+- 2.6.28-git7
+
 * Sat Jan 03 2009 Dave Jones <davej at redhat.com>
 - 2.6.28-git6
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v
retrieving revision 1.942
retrieving revision 1.943
diff -u -r1.942 -r1.943
--- sources	4 Jan 2009 01:50:33 -0000	1.942
+++ sources	5 Jan 2009 17:42:23 -0000	1.943
@@ -1,2 +1,2 @@
 d351e44709c9810b85e29b877f50968a  linux-2.6.28.tar.bz2
-802d915efc572bc48210070bae26534c  patch-2.6.28-git6.bz2
+425b1d05c16ce88ba1448bf337b5175a  patch-2.6.28-git7.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v
retrieving revision 1.854
retrieving revision 1.855
diff -u -r1.854 -r1.855
--- upstream	4 Jan 2009 01:50:33 -0000	1.854
+++ upstream	5 Jan 2009 17:42:23 -0000	1.855
@@ -1,2 +1,2 @@
 linux-2.6.28.tar.bz2
-patch-2.6.28-git6.bz2
+patch-2.6.28-git7.bz2


--- patch-2.6.28-git6.bz2.sign DELETED ---



From caillon at fedoraproject.org  Mon Jan  5 17:59:40 2009
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Mon,  5 Jan 2009 17:59:40 +0000 (UTC)
Subject: rpms/thunderbird/F-10 .cvsignore, 1.22, 1.23 sources, 1.29,
	1.30 thunderbird.spec, 1.120, 1.121
Message-ID: <20090105175940.6CE5670108@cvs1.fedora.phx.redhat.com>

Author: caillon

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

Modified Files:
	.cvsignore sources thunderbird.spec 
Log Message:
* Mon Jan  5 2009 Christopher Aillon <caillon at redhat.com> 2.0.0.19-1
- Update to 2.0.0.19



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/thunderbird/F-10/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- .cvsignore	20 Nov 2008 00:25:18 -0000	1.22
+++ .cvsignore	5 Jan 2009 17:59:09 -0000	1.23
@@ -1,2 +1,2 @@
-thunderbird-2.0.0.18-source.tar.bz2
-thunderbird-langpacks-2.0.0.18-20081119.tar.bz2
+thunderbird-2.0.0.19-source.tar.bz2
+thunderbird-langpacks-2.0.0.19-20090105.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/thunderbird/F-10/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- sources	20 Nov 2008 00:25:18 -0000	1.29
+++ sources	5 Jan 2009 17:59:09 -0000	1.30
@@ -1,2 +1,2 @@
-1d131408b2338132a154700cc92a1d58  thunderbird-2.0.0.18-source.tar.bz2
-0391bb2456dd3c8cb633152802279f4b  thunderbird-langpacks-2.0.0.18-20081119.tar.bz2
+546e81748f5f8bf06cacbcb8c358395f  thunderbird-2.0.0.19-source.tar.bz2
+35c5bf378d8810ccec1d6c03f2e7d770  thunderbird-langpacks-2.0.0.19-20090105.tar.bz2


Index: thunderbird.spec
===================================================================
RCS file: /cvs/extras/rpms/thunderbird/F-10/thunderbird.spec,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -r1.120 -r1.121
--- thunderbird.spec	20 Nov 2008 00:25:18 -0000	1.120
+++ thunderbird.spec	5 Jan 2009 17:59:09 -0000	1.121
@@ -7,7 +7,7 @@
 
 Summary:        Mozilla Thunderbird mail/newsgroup client
 Name:           thunderbird
-Version:        2.0.0.18
+Version:        2.0.0.19
 Release:        1%{?dist}
 URL:            http://www.mozilla.org/projects/thunderbird/
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
@@ -18,7 +18,7 @@
 %define tarball thunderbird-2.0.0.0rc1-source.tar.bz2
 %endif
 Source0:        %{tarball}
-Source1:        thunderbird-langpacks-%{version}-20081119.tar.bz2
+Source1:        thunderbird-langpacks-%{version}-20090105.tar.bz2
 Source10:       thunderbird-mozconfig
 Source11:       thunderbird-mozconfig-branded
 Source12:       thunderbird-redhat-default-prefs.js
@@ -329,6 +329,9 @@
 #===============================================================================
 
 %changelog
+* Mon Jan  5 2009 Christopher Aillon <caillon at redhat.com> 2.0.0.19-1
+- Update to 2.0.0.19
+
 * Wed Nov 19 2008 Christopher Aillon <caillon at redhat.com> 2.0.0.18-1
 - Update to 2.0.0.18
 



From musuruan at fedoraproject.org  Mon Jan  5 18:00:23 2009
From: musuruan at fedoraproject.org (Andrea Musuruane)
Date: Mon,  5 Jan 2009 18:00:23 +0000 (UTC)
Subject: rpms/libicns/F-9 .cvsignore, 1.2, 1.3 libicns.spec, 1.1, 1.2 sources,
	1.2, 1.3
Message-ID: <20090105180023.09F7970108@cvs1.fedora.phx.redhat.com>

Author: musuruan

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

Modified Files:
	.cvsignore libicns.spec sources 
Log Message:
* Mon Jan 05 2009 Andrea Musuruane <musuruan at gmail.com> - 0.6.1-1
- Updated to upstream 0.6.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libicns/F-9/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	21 Dec 2008 13:56:25 -0000	1.2
+++ .cvsignore	5 Jan 2009 17:59:52 -0000	1.3
@@ -1 +1 @@
-libicns-0.6.0.tar.gz
+libicns-0.6.1.tar.gz


Index: libicns.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libicns/F-9/libicns.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libicns.spec	21 Dec 2008 13:56:25 -0000	1.1
+++ libicns.spec	5 Jan 2009 17:59:52 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           libicns
-Version:        0.6.0 
-Release:        2%{?dist}
+Version:        0.6.1 
+Release:        1%{?dist}
 Summary:        Library for manipulating Macintosh icns files
 
 Group:          System Environment/Libraries
@@ -88,6 +88,9 @@
 
 
 %changelog
+* Mon Jan 05 2009 Andrea Musuruane <musuruan at gmail.com> - 0.6.1-1
+- Updated to upstream 0.6.1
+
 * Sat Dec 20 2008 Andrea Musuruane <musuruan at gmail.com> - 0.6.0-2
 - Fixed Source0 URL
 - Added missing 'Requires: pkgconfig' to devel package


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libicns/F-9/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	21 Dec 2008 13:56:25 -0000	1.2
+++ sources	5 Jan 2009 17:59:52 -0000	1.3
@@ -1 +1 @@
-f6ab74c2cfd4ab5b11d1cb9114743c90  libicns-0.6.0.tar.gz
+ee7e417570becd638caf40c6d1bbfee2  libicns-0.6.1.tar.gz



From steved at fedoraproject.org  Mon Jan  5 18:04:07 2009
From: steved at fedoraproject.org (Steve Dickson)
Date: Mon,  5 Jan 2009 18:04:07 +0000 (UTC)
Subject: rpms/nfs-utils/devel nfs-utils-1.1.4-tcpwrap-warn.patch, NONE,
	1.1 nfs-utils.spec, 1.202, 1.203
Message-ID: <20090105180407.7070970108@cvs1.fedora.phx.redhat.com>

Author: steved

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

Modified Files:
	nfs-utils.spec 
Added Files:
	nfs-utils-1.1.4-tcpwrap-warn.patch 
Log Message:
- Added warnings to tcp wrapper code when mounts are 
  denied due to misconfigured DNS configurations.


nfs-utils-1.1.4-tcpwrap-warn.patch:

--- NEW FILE nfs-utils-1.1.4-tcpwrap-warn.patch ---
commit 6e3f696e788a56f30b5b3f8250647fe4cd63c884
Author: Steve Dickson <steved at redhat.com>
Date:   Sat Jan 3 14:08:25 2009 -0500

    Now that the TCP wrapper actually works, mounts will
    be denied with misconfigured DNS configurations. Warnings
    will be logged when these types of configurations are
    detected.
    
    Signed-off-by: Steve Dickson <steved at redhat.com>

diff -up nfs-utils-1.1.4/support/misc/tcpwrapper.c.orig nfs-utils-1.1.4/support/misc/tcpwrapper.c
--- nfs-utils-1.1.4/support/misc/tcpwrapper.c.orig	2009-01-03 13:02:15.000000000 -0500
+++ nfs-utils-1.1.4/support/misc/tcpwrapper.c	2009-01-03 14:05:42.000000000 -0500
@@ -48,6 +48,8 @@
 #include <sys/stat.h>
 #include <unistd.h>
 
+#include "xlog.h"
+
 #ifdef SYSV40
 #include <netinet/in.h>
 #include <rpc/rpcent.h>
@@ -179,17 +181,27 @@ struct sockaddr_in *addr;
 	/* Now do the hostname lookup */
 	hp = gethostbyaddr ((const char *) &(addr->sin_addr),
 		sizeof (addr->sin_addr), AF_INET);
-	if (!hp)
+	if (!hp) {
+		xlog(L_WARNING, 
+			"Warning: Client IP address '%s' not found in host lookup",
+			inet_ntoa(addr->sin_addr));
 		return DENY; /* never heard of it. misconfigured DNS? */
+	}
 
 	/* Make sure the hostent is authorative. */
 	tmpname = strdup(hp->h_name);
-	if (!tmpname)
+	if (!tmpname) {
+		xlog(L_WARNING, "Warning: No memory for Host access check");
 		return DENY;
+	}
 	hp = gethostbyname(tmpname);
-	free(tmpname);
-	if (!hp)
+	if (!hp) {
+		xlog(L_WARNING, 
+			"Warning: Client hostname '%s' not found in host lookup", tmpname);
+		free(tmpname);
 		return DENY; /* never heard of it. misconfigured DNS? */
+	}
+	free(tmpname);
 
 	/* Now make sure the address is on the list */
 	for (sp = hp->h_addr_list ; *sp ; sp++) {


Index: nfs-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nfs-utils/devel/nfs-utils.spec,v
retrieving revision 1.202
retrieving revision 1.203
diff -u -r1.202 -r1.203
--- nfs-utils.spec	20 Dec 2008 12:16:35 -0000	1.202
+++ nfs-utils.spec	5 Jan 2009 18:03:37 -0000	1.203
@@ -2,7 +2,7 @@
 Name: nfs-utils
 URL: http://sourceforge.net/projects/nfs
 Version: 1.1.4
-Release: 10%{?dist}
+Release: 11%{?dist}
 Epoch: 1
 
 # group all 32bit related archs
@@ -39,6 +39,7 @@
 Patch110: nfs-utils-1.1.4-sm-notify-freeaddrinfo.patch
 Patch111: nfs-utils-1.1.4-statd-xunlink.patch
 Patch112: nfs-utils-1.1.4-tcpwrapper-update.patch
+Patch113: nfs-utils-1.1.4-tcpwrap-warn.patch
 
 %if %{enablefscache}
 Patch90: nfs-utils-1.1.0-mount-fsc.patch
@@ -106,6 +107,7 @@
 %patch110 -p1
 %patch111 -p1
 %patch112 -p1
+%patch113 -p1
 
 %if %{enablefscache}
 %patch90 -p1
@@ -269,6 +271,10 @@
 %attr(4755,root,root)   /sbin/umount.nfs4
 
 %changelog
+* Sat Jan  3 2009 Steve Dickson <steved at redhat.com> 1.1.4-11
+- Added warnings to tcp wrapper code when mounts are 
+  denied due to misconfigured DNS configurations.
+
 * Fri Dec 19 2008 Steve Dickson <steved at redhat.com> 1.1.4-10
 - Re-enabled and fixed/enhanced tcp wrappers.
 



From caillon at fedoraproject.org  Mon Jan  5 18:05:05 2009
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Mon,  5 Jan 2009 18:05:05 +0000 (UTC)
Subject: rpms/thunderbird/F-9 .cvsignore, 1.22, 1.23 sources, 1.29,
	1.30 thunderbird.spec, 1.122, 1.123
Message-ID: <20090105180505.DC50070108@cvs1.fedora.phx.redhat.com>

Author: caillon

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

Modified Files:
	.cvsignore sources thunderbird.spec 
Log Message:
* Mon Jan  5 2009 Christopher Aillon <caillon at redhat.com> 2.0.0.19-1
- Update to 2.0.0.19



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/thunderbird/F-9/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- .cvsignore	20 Nov 2008 00:30:55 -0000	1.22
+++ .cvsignore	5 Jan 2009 18:04:35 -0000	1.23
@@ -1,2 +1,2 @@
-thunderbird-2.0.0.18-source.tar.bz2
-thunderbird-langpacks-2.0.0.18-20081119.tar.bz2
+thunderbird-2.0.0.19-source.tar.bz2
+thunderbird-langpacks-2.0.0.19-20090105.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/thunderbird/F-9/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- sources	20 Nov 2008 00:30:55 -0000	1.29
+++ sources	5 Jan 2009 18:04:35 -0000	1.30
@@ -1,2 +1,2 @@
-1d131408b2338132a154700cc92a1d58  thunderbird-2.0.0.18-source.tar.bz2
-0391bb2456dd3c8cb633152802279f4b  thunderbird-langpacks-2.0.0.18-20081119.tar.bz2
+546e81748f5f8bf06cacbcb8c358395f  thunderbird-2.0.0.19-source.tar.bz2
+35c5bf378d8810ccec1d6c03f2e7d770  thunderbird-langpacks-2.0.0.19-20090105.tar.bz2


Index: thunderbird.spec
===================================================================
RCS file: /cvs/extras/rpms/thunderbird/F-9/thunderbird.spec,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -r1.122 -r1.123
--- thunderbird.spec	20 Nov 2008 00:30:55 -0000	1.122
+++ thunderbird.spec	5 Jan 2009 18:04:35 -0000	1.123
@@ -7,7 +7,7 @@
 
 Summary:        Mozilla Thunderbird mail/newsgroup client
 Name:           thunderbird
-Version:        2.0.0.18
+Version:        2.0.0.19
 Release:        1%{?dist}
 URL:            http://www.mozilla.org/projects/thunderbird/
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
@@ -18,7 +18,7 @@
 %define tarball thunderbird-2.0.0.0rc1-source.tar.bz2
 %endif
 Source0:        %{tarball}
-Source1:        thunderbird-langpacks-%{version}-20081119.tar.bz2
+Source1:        thunderbird-langpacks-%{version}-20090105.tar.bz2
 Source10:       thunderbird-mozconfig
 Source11:       thunderbird-mozconfig-branded
 Source12:       thunderbird-redhat-default-prefs.js
@@ -329,6 +329,9 @@
 #===============================================================================
 
 %changelog
+* Mon Jan  5 2009 Christopher Aillon <caillon at redhat.com> 2.0.0.19-1
+- Update to 2.0.0.19
+
 * Wed Nov 19 2008 Christopher Aillon <caillon at redhat.com> 2.0.0.18-1
 - Update to 2.0.0.18
 



From caillon at fedoraproject.org  Mon Jan  5 18:07:45 2009
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Mon,  5 Jan 2009 18:07:45 +0000 (UTC)
Subject: rpms/thunderbird/F-8 .cvsignore, 1.22, 1.23 sources, 1.29,
	1.30 thunderbird.spec, 1.117, 1.118
Message-ID: <20090105180745.D7F8D70108@cvs1.fedora.phx.redhat.com>

Author: caillon

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

Modified Files:
	.cvsignore sources thunderbird.spec 
Log Message:
* Mon Jan  5 2009 Christopher Aillon <caillon at redhat.com> 2.0.0.19-1
- Update to 2.0.0.19



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/thunderbird/F-8/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- .cvsignore	20 Nov 2008 00:33:32 -0000	1.22
+++ .cvsignore	5 Jan 2009 18:07:15 -0000	1.23
@@ -1,2 +1,2 @@
-thunderbird-2.0.0.18-source.tar.bz2
-thunderbird-langpacks-2.0.0.18-20081119.tar.bz2
+thunderbird-2.0.0.19-source.tar.bz2
+thunderbird-langpacks-2.0.0.19-20090105.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/thunderbird/F-8/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- sources	20 Nov 2008 00:33:32 -0000	1.29
+++ sources	5 Jan 2009 18:07:15 -0000	1.30
@@ -1,2 +1,2 @@
-1d131408b2338132a154700cc92a1d58  thunderbird-2.0.0.18-source.tar.bz2
-0391bb2456dd3c8cb633152802279f4b  thunderbird-langpacks-2.0.0.18-20081119.tar.bz2
+546e81748f5f8bf06cacbcb8c358395f  thunderbird-2.0.0.19-source.tar.bz2
+35c5bf378d8810ccec1d6c03f2e7d770  thunderbird-langpacks-2.0.0.19-20090105.tar.bz2


Index: thunderbird.spec
===================================================================
RCS file: /cvs/extras/rpms/thunderbird/F-8/thunderbird.spec,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -r1.117 -r1.118
--- thunderbird.spec	20 Nov 2008 00:33:32 -0000	1.117
+++ thunderbird.spec	5 Jan 2009 18:07:15 -0000	1.118
@@ -7,7 +7,7 @@
 
 Summary:	Mozilla Thunderbird mail/newsgroup client
 Name:		thunderbird
-Version:	2.0.0.18
+Version:	2.0.0.19
 Release:	1%{?dist}
 URL:		http://www.mozilla.org/projects/thunderbird/
 License:	MPLv1.1 or GPLv2+ or LGPLv2+
@@ -18,7 +18,7 @@
 %define tarball thunderbird-2.0.0.0rc1-source.tar.bz2
 %endif
 Source0:        %{tarball}
-Source1:        thunderbird-langpacks-%{version}-20081119.tar.bz2
+Source1:        thunderbird-langpacks-%{version}-20090105.tar.bz2
 Source10:       thunderbird-mozconfig
 Source11:       thunderbird-mozconfig-branded
 Source12:       thunderbird-redhat-default-prefs.js
@@ -309,6 +309,9 @@
 #===============================================================================
 
 %changelog
+* Mon Jan  5 2009 Christopher Aillon <caillon at redhat.com> 2.0.0.19-1
+- Update to 2.0.0.19
+
 * Wed Nov 19 2008 Christopher Aillon <caillon at redhat.com> 2.0.0.18-1
 - Update to 2.0.0.18
 



From steved at fedoraproject.org  Mon Jan  5 18:14:20 2009
From: steved at fedoraproject.org (Steve Dickson)
Date: Mon,  5 Jan 2009 18:14:20 +0000 (UTC)
Subject: rpms/nfs-utils/F-10 nfs-utils-1.1.4-tcpwrap-warn.patch, NONE,
	1.1 nfs-utils.spec, 1.196, 1.197
Message-ID: <20090105181420.87F2570108@cvs1.fedora.phx.redhat.com>

Author: steved

Update of /cvs/pkgs/rpms/nfs-utils/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12845

Modified Files:
	nfs-utils.spec 
Added Files:
	nfs-utils-1.1.4-tcpwrap-warn.patch 
Log Message:
- Added warnings to tcp wrapper code when mounts are 
  denied due to misconfigured DNS configurations.


nfs-utils-1.1.4-tcpwrap-warn.patch:

--- NEW FILE nfs-utils-1.1.4-tcpwrap-warn.patch ---
commit 6e3f696e788a56f30b5b3f8250647fe4cd63c884
Author: Steve Dickson <steved at redhat.com>
Date:   Sat Jan 3 14:08:25 2009 -0500

    Now that the TCP wrapper actually works, mounts will
    be denied with misconfigured DNS configurations. Warnings
    will be logged when these types of configurations are
    detected.
    
    Signed-off-by: Steve Dickson <steved at redhat.com>

diff -up nfs-utils-1.1.4/support/misc/tcpwrapper.c.orig nfs-utils-1.1.4/support/misc/tcpwrapper.c
--- nfs-utils-1.1.4/support/misc/tcpwrapper.c.orig	2009-01-03 13:02:15.000000000 -0500
+++ nfs-utils-1.1.4/support/misc/tcpwrapper.c	2009-01-03 14:05:42.000000000 -0500
@@ -48,6 +48,8 @@
 #include <sys/stat.h>
 #include <unistd.h>
 
+#include "xlog.h"
+
 #ifdef SYSV40
 #include <netinet/in.h>
 #include <rpc/rpcent.h>
@@ -179,17 +181,27 @@ struct sockaddr_in *addr;
 	/* Now do the hostname lookup */
 	hp = gethostbyaddr ((const char *) &(addr->sin_addr),
 		sizeof (addr->sin_addr), AF_INET);
-	if (!hp)
+	if (!hp) {
+		xlog(L_WARNING, 
+			"Warning: Client IP address '%s' not found in host lookup",
+			inet_ntoa(addr->sin_addr));
 		return DENY; /* never heard of it. misconfigured DNS? */
+	}
 
 	/* Make sure the hostent is authorative. */
 	tmpname = strdup(hp->h_name);
-	if (!tmpname)
+	if (!tmpname) {
+		xlog(L_WARNING, "Warning: No memory for Host access check");
 		return DENY;
+	}
 	hp = gethostbyname(tmpname);
-	free(tmpname);
-	if (!hp)
+	if (!hp) {
+		xlog(L_WARNING, 
+			"Warning: Client hostname '%s' not found in host lookup", tmpname);
+		free(tmpname);
 		return DENY; /* never heard of it. misconfigured DNS? */
+	}
+	free(tmpname);
 
 	/* Now make sure the address is on the list */
 	for (sp = hp->h_addr_list ; *sp ; sp++) {


Index: nfs-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nfs-utils/F-10/nfs-utils.spec,v
retrieving revision 1.196
retrieving revision 1.197
diff -u -r1.196 -r1.197
--- nfs-utils.spec	20 Dec 2008 12:31:18 -0000	1.196
+++ nfs-utils.spec	5 Jan 2009 18:13:50 -0000	1.197
@@ -2,7 +2,7 @@
 Name: nfs-utils
 URL: http://sourceforge.net/projects/nfs
 Version: 1.1.4
-Release: 5%{?dist}
+Release: 6%{?dist}
 Epoch: 1
 
 # group all 32bit related archs
@@ -28,6 +28,7 @@
 Patch03: nfs-utils-1.1.4-sm-notify-typo.patch
 Patch04: nfs-utils-1.1.4-statd-unlink.patch
 Patch05: nfs-utils-1.1.4-tcpwrapper-update.patch
+Patch06: nfs-utils-1.1.4-tcpwrap-warn.patch
 
 %if %{enablefscache}
 Patch90: nfs-utils-1.1.0-mount-fsc.patch
@@ -84,6 +85,7 @@
 %patch03 -p1
 %patch04 -p1
 %patch05 -p1
+%patch06 -p1
 
 %if %{enablefscache}
 %patch90 -p1
@@ -247,6 +249,10 @@
 %attr(4755,root,root)   /sbin/umount.nfs4
 
 %changelog
+* Mon Jan  5 2009 Steve Dickson <steved at redhat.com> 1.1.4-6
+- Added warnings to tcp wrapper code when mounts are 
+  denied due to misconfigured DNS configurations.
+
 * Sat Dec 20 2008 Steve Dickson <steved at redhat.com> 1.1.4-5
 - Re-enabled and fixed/enhanced tcp wrappers.
 



From steved at fedoraproject.org  Mon Jan  5 18:27:26 2009
From: steved at fedoraproject.org (Steve Dickson)
Date: Mon,  5 Jan 2009 18:27:26 +0000 (UTC)
Subject: rpms/nfs-utils/F-9 nfs-utils-1.1.2-tcpwrap-warn.patch, NONE,
	1.1 nfs-utils.spec, 1.177, 1.178
Message-ID: <20090105182726.DEC2770108@cvs1.fedora.phx.redhat.com>

Author: steved

Update of /cvs/pkgs/rpms/nfs-utils/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17443

Modified Files:
	nfs-utils.spec 
Added Files:
	nfs-utils-1.1.2-tcpwrap-warn.patch 
Log Message:
- Added warnings to tcp wrapper code when mounts are 
  denied due to misconfigured DNS configurations.


nfs-utils-1.1.2-tcpwrap-warn.patch:

--- NEW FILE nfs-utils-1.1.2-tcpwrap-warn.patch ---
commit 6e3f696e788a56f30b5b3f8250647fe4cd63c884
Author: Steve Dickson <steved at redhat.com>
Date:   Sat Jan 3 14:08:25 2009 -0500

    Now that the TCP wrapper actually works, mounts will
    be denied with misconfigured DNS configurations. Warnings
    will be logged when these types of configurations are
    detected.
    
    Signed-off-by: Steve Dickson <steved at redhat.com>

diff -up nfs-utils-1.1.4/support/misc/tcpwrapper.c.orig nfs-utils-1.1.4/support/misc/tcpwrapper.c
--- nfs-utils-1.1.4/support/misc/tcpwrapper.c.orig	2009-01-03 13:02:15.000000000 -0500
+++ nfs-utils-1.1.4/support/misc/tcpwrapper.c	2009-01-03 14:05:42.000000000 -0500
@@ -48,6 +48,8 @@
 #include <sys/stat.h>
 #include <unistd.h>
 
+#include "xlog.h"
+
 #ifdef SYSV40
 #include <netinet/in.h>
 #include <rpc/rpcent.h>
@@ -179,17 +181,27 @@ struct sockaddr_in *addr;
 	/* Now do the hostname lookup */
 	hp = gethostbyaddr ((const char *) &(addr->sin_addr),
 		sizeof (addr->sin_addr), AF_INET);
-	if (!hp)
+	if (!hp) {
+		xlog(L_WARNING, 
+			"Warning: Client IP address '%s' not found in host lookup",
+			inet_ntoa(addr->sin_addr));
 		return DENY; /* never heard of it. misconfigured DNS? */
+	}
 
 	/* Make sure the hostent is authorative. */
 	tmpname = strdup(hp->h_name);
-	if (!tmpname)
+	if (!tmpname) {
+		xlog(L_WARNING, "Warning: No memory for Host access check");
 		return DENY;
+	}
 	hp = gethostbyname(tmpname);
-	free(tmpname);
-	if (!hp)
+	if (!hp) {
+		xlog(L_WARNING, 
+			"Warning: Client hostname '%s' not found in host lookup", tmpname);
+		free(tmpname);
 		return DENY; /* never heard of it. misconfigured DNS? */
+	}
+	free(tmpname);
 
 	/* Now make sure the address is on the list */
 	for (sp = hp->h_addr_list ; *sp ; sp++) {


Index: nfs-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nfs-utils/F-9/nfs-utils.spec,v
retrieving revision 1.177
retrieving revision 1.178
diff -u -r1.177 -r1.178
--- nfs-utils.spec	20 Dec 2008 13:04:14 -0000	1.177
+++ nfs-utils.spec	5 Jan 2009 18:26:56 -0000	1.178
@@ -2,7 +2,7 @@
 Name: nfs-utils
 URL: http://sourceforge.net/projects/nfs
 Version: 1.1.2
-Release: 8%{?dist}
+Release: 9%{?dist}
 Epoch: 1
 
 # group all 32bit related archs
@@ -34,6 +34,7 @@
 Patch09: nfs-utils-1.1.2-rmtab-fqdn.patch
 Patch10: nfs-utils-1.1.0-smnotify-path.patch
 Patch11: nfs-utils-1.1.2-tcpwrapper-update.patch
+Patch12: nfs-utils-1.1.2-tcpwrap-warn.patch
 
 %if %{enablefscache}
 Patch90: nfs-utils-1.1.0-mount-fsc.patch
@@ -96,6 +97,7 @@
 %patch09 -p1
 %patch10 -p1
 %patch11 -p1
+%patch12 -p1
 
 %if %{enablefscache}
 %patch90 -p1
@@ -259,6 +261,10 @@
 %attr(4755,root,root)   /sbin/umount.nfs4
 
 %changelog
+* Mon Jan  5 2009 Steve Dickson <steved at redhat.com> 1.1.2-9
+- Added warnings to tcp wrapper code when mounts are 
+  denied due to misconfigured DNS configurations.
+
 * Sat Dec 20 2008 Steve Dickson <steved at redhat.com> 1.1.2-8
 - Re-enabled and fixed/enhanced tcp wrappers.
 



From mclasen at fedoraproject.org  Mon Jan  5 18:39:15 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon,  5 Jan 2009 18:39:15 +0000 (UTC)
Subject: rpms/glib2/devel .cvsignore, 1.100, 1.101 glib2.spec, 1.192,
	1.193 sources, 1.102, 1.103
Message-ID: <20090105183915.B33D070108@cvs1.fedora.phx.redhat.com>

Author: mclasen

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

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



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/glib2/devel/.cvsignore,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -r1.100 -r1.101
--- .cvsignore	16 Dec 2008 01:49:48 -0000	1.100
+++ .cvsignore	5 Jan 2009 18:38:45 -0000	1.101
@@ -1 +1 @@
-glib-2.19.3.tar.bz2
+glib-2.19.4.tar.bz2


Index: glib2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/glib2/devel/glib2.spec,v
retrieving revision 1.192
retrieving revision 1.193
diff -u -r1.192 -r1.193
--- glib2.spec	16 Dec 2008 01:49:48 -0000	1.192
+++ glib2.spec	5 Jan 2009 18:38:45 -0000	1.193
@@ -2,7 +2,7 @@
 
 Summary: A library of handy utility functions
 Name: glib2
-Version: 2.19.3
+Version: 2.19.4
 Release: 1%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
@@ -133,6 +133,9 @@
 %{_libdir}/lib*.a
 
 %changelog
+* Mon Jan  5 2009 Matthias Clasen <mclasen at redhat.com> - 2.19.4-1
+- Update to 2.19.4
+
 * Mon Dec 15 2008 Matthias Clasen <mclasen at redhat.com> - 2.19.3-1
 - Update to 2.19.3
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/glib2/devel/sources,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -r1.102 -r1.103
--- sources	16 Dec 2008 01:49:48 -0000	1.102
+++ sources	5 Jan 2009 18:38:45 -0000	1.103
@@ -1 +1 @@
-8c209e5ed7864cf38bd9f48db6631d1b  glib-2.19.3.tar.bz2
+1eefaadb07e66df90418fe7cc775e9f7  glib-2.19.4.tar.bz2



From davej at fedoraproject.org  Mon Jan  5 18:48:25 2009
From: davej at fedoraproject.org (Dave Jones)
Date: Mon,  5 Jan 2009 18:48:25 +0000 (UTC)
Subject: rpms/kernel/devel linux-2.6-compile-fixes.patch,1.184,1.185
Message-ID: <20090105184825.BBF9970108@cvs1.fedora.phx.redhat.com>

Author: davej

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

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.184
retrieving revision 1.185
diff -u -r1.184 -r1.185
--- linux-2.6-compile-fixes.patch	29 Dec 2008 17:30:27 -0000	1.184
+++ linux-2.6-compile-fixes.patch	5 Jan 2009 18:48:25 -0000	1.185
@@ -5,3 +5,163 @@
 # to do a compile to figure out what your diff is fixing. Thanks.
 #
 
+From davej  Sun Jan  4 17:00:52 2009
+Return-Path: linux-kernel-owner at vger.kernel.org
+X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on
+	gelk.kernelslacker.org
+X-Spam-Level: 
+X-Spam-Status: No, score=-5.8 required=5.0 tests=AWL,BAYES_00,
+	RCVD_IN_DNSWL_MED,UNPARSEABLE_RELAY autolearn=ham version=3.2.5
+Received: from mail.corp.redhat.com [10.5.5.53]
+	by gelk.kernelslacker.org with IMAP (fetchmail-6.3.8)
+	for <davej at localhost> (single-drop); Sun, 04 Jan 2009 17:00:52 -0500 (EST)
+Received: from zmta02.collab.prod.int.phx2.redhat.com (LHLO
+ zmta02.collab.prod.int.phx2.redhat.com) (10.5.5.32) by
+ mail01.corp.redhat.com with LMTP; Sun, 4 Jan 2009 16:57:24 -0500 (EST)
+Received: from localhost (localhost.localdomain [127.0.0.1])
+	by zmta02.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id D37809C504;
+	Sun,  4 Jan 2009 16:57:24 -0500 (EST)
+Received: from zmta02.collab.prod.int.phx2.redhat.com ([127.0.0.1])
+	by localhost (zmta02.collab.prod.int.phx2.redhat.com [127.0.0.1]) (amavisd-new, port 10024)
+	with ESMTP id Zc+IlAojNlo9; Sun,  4 Jan 2009 16:57:24 -0500 (EST)
+Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com [172.16.52.254])
+	by zmta02.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id 6E77C9C322;
+	Sun,  4 Jan 2009 16:57:24 -0500 (EST)
+Received: from mx3.redhat.com (mx3.redhat.com [172.16.48.32])
+	by int-mx1.corp.redhat.com (8.13.1/8.13.1) with ESMTP id n04LvNfd004253;
+	Sun, 4 Jan 2009 16:57:23 -0500
+Received: from vger.kernel.org (vger.kernel.org [209.132.176.167])
+	by mx3.redhat.com (8.13.8/8.13.8) with ESMTP id n04Lv8kf032280;
+	Sun, 4 Jan 2009 16:57:08 -0500
+Received: (majordomo at vger.kernel.org) by vger.kernel.org via listexpand
+	id S1757804AbZADV5H (ORCPT <rfc822;cdahlin at redhat.com> + 33 others);
+	Sun, 4 Jan 2009 16:57:07 -0500
+Received: (majordomo at vger.kernel.org) by vger.kernel.org id S1751921AbZADV44
+	(ORCPT <rfc822;linux-kernel-outgoing>);
+	Sun, 4 Jan 2009 16:56:56 -0500
+Received: from mx2.mail.elte.hu ([157.181.151.9]:58090 "EHLO mx2.mail.elte.hu"
+	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
+	id S1751332AbZADV4z (ORCPT <rfc822;linux-kernel at vger.kernel.org>);
+	Sun, 4 Jan 2009 16:56:55 -0500
+Received: from elvis.elte.hu ([157.181.1.14])
+	by mx2.mail.elte.hu with esmtp (Exim)
+	id 1LJaxm-0008Nh-7r
+	from <mingo at elte.hu>; Sun, 04 Jan 2009 22:56:52 +0100
+Received: by elvis.elte.hu (Postfix, from userid 1004)
+	id 11E833E21A7; Sun,  4 Jan 2009 22:56:43 +0100 (CET)
+Date: 	Sun, 4 Jan 2009 22:56:45 +0100
+From: Ingo Molnar <mingo at elte.hu>
+To: Linus Torvalds <torvalds at linux-foundation.org>
+Cc: linux-kernel at vger.kernel.org, Andrew Morton <akpm at linux-foundation.org>
+Subject: [git pull] core/iommu fixes
+Message-ID: <20090104215645.GA22924 at elte.hu>
+MIME-Version: 1.0
+Content-Type: text/plain; charset=us-ascii
+Content-Disposition: inline
+User-Agent: Mutt/1.5.18 (2008-05-17)
+Received-SPF: neutral (mx2: 157.181.1.14 is neither permitted nor denied by domain of elte.hu) client-ip=157.181.1.14; envelope-from=mingo at elte.hu; helo=elvis.elte.hu;
+X-ELTE-VirusStatus: clean
+X-ELTE-SpamScore: -1.5
+X-ELTE-SpamLevel: 
+X-ELTE-SpamCheck: no
+X-ELTE-SpamVersion: ELTE 2.0 
+X-ELTE-SpamCheck-Details: score=-1.5 required=5.9 tests=BAYES_00 autolearn=no SpamAssassin version=3.2.3
+	-1.5 BAYES_00               BODY: Bayesian spam probability is 0 to 1%
+	[score: 0.0000]
+Sender: linux-kernel-owner at vger.kernel.org
+Precedence: bulk
+List-ID: <linux-kernel.vger.kernel.org>
+X-Mailing-List: 	linux-kernel at vger.kernel.org
+X-RedHat-Spam-Score: -3.454 
+X-Scanned-By: MIMEDefang 2.58 on 172.16.52.254
+X-Scanned-By: MIMEDefang 2.63 on 172.16.48.32
+Status: RO
+Content-Length: 2444
+Lines: 85
+
+Linus,
+
+Please pull the latest core-fixes-for-linus git tree from:
+
+   git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git core-fixes-for-linus
+
+ Thanks,
+
+	Ingo
+
+------------------>
+Ingo Molnar (1):
+      intel-iommu: fix build error with INTR_REMAP=y and DMAR=n
+
+Jesper Juhl (1):
+      swiotlb: Don't include linux/swiotlb.h twice in lib/swiotlb.c
+
+Roland Dreier (1):
+      swiotlb: add missing __init annotations
+
+
+ arch/x86/kernel/pci-swiotlb_64.c |    2 +-
+ include/linux/dma_remapping.h    |    8 ++++++++
+ lib/swiotlb.c                    |    3 +--
+ 3 files changed, 10 insertions(+), 3 deletions(-)
+
+diff --git a/arch/x86/kernel/pci-swiotlb_64.c b/arch/x86/kernel/pci-swiotlb_64.c
+index 242c344..8cba374 100644
+--- a/arch/x86/kernel/pci-swiotlb_64.c
++++ b/arch/x86/kernel/pci-swiotlb_64.c
+@@ -13,7 +13,7 @@
+ 
+ int swiotlb __read_mostly;
+ 
+-void *swiotlb_alloc_boot(size_t size, unsigned long nslabs)
++void * __init swiotlb_alloc_boot(size_t size, unsigned long nslabs)
+ {
+ 	return alloc_bootmem_low_pages(size);
+ }
+diff --git a/include/linux/dma_remapping.h b/include/linux/dma_remapping.h
+index 136f170..af1dab4 100644
+--- a/include/linux/dma_remapping.h
++++ b/include/linux/dma_remapping.h
+@@ -17,7 +17,15 @@ struct dmar_domain;
+ struct root_entry;
+ 
+ extern void free_dmar_iommu(struct intel_iommu *iommu);
++
++#ifdef CONFIG_DMAR
+ extern int iommu_calculate_agaw(struct intel_iommu *iommu);
++#else
++static inline int iommu_calculate_agaw(struct intel_iommu *iommu)
++{
++	return 0;
++}
++#endif
+ 
+ extern int dmar_disabled;
+ 
+diff --git a/lib/swiotlb.c b/lib/swiotlb.c
+index fa2dc4e..7f5e21b 100644
+--- a/lib/swiotlb.c
++++ b/lib/swiotlb.c
+@@ -23,7 +23,6 @@
+ #include <linux/spinlock.h>
+ #include <linux/swiotlb.h>
+ #include <linux/string.h>
+-#include <linux/swiotlb.h>
+ #include <linux/types.h>
+ #include <linux/ctype.h>
+ #include <linux/highmem.h>
+@@ -116,7 +115,7 @@ setup_io_tlb_npages(char *str)
+ __setup("swiotlb=", setup_io_tlb_npages);
+ /* make io_tlb_overflow tunable too? */
+ 
+-void * __weak swiotlb_alloc_boot(size_t size, unsigned long nslabs)
++void * __weak __init swiotlb_alloc_boot(size_t size, unsigned long nslabs)
+ {
+ 	return alloc_bootmem_low_pages(size);
+ }
+--
+To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
+the body of a message to majordomo at vger.kernel.org
+More majordomo info at  http://vger.kernel.org/majordomo-info.html
+Please read the FAQ at  http://www.tux.org/lkml/
+



From langel at fedoraproject.org  Mon Jan  5 19:09:15 2009
From: langel at fedoraproject.org (Lillian Angel)
Date: Mon,  5 Jan 2009 19:09:15 +0000 (UTC)
Subject: rpms/batik/devel .cvsignore, 1.6, 1.7 batik.spec, 1.8, 1.9 sources, 
	1.7, 1.8
Message-ID: <20090105190915.EB45E70108@cvs1.fedora.phx.redhat.com>

Author: langel

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

Modified Files:
	.cvsignore batik.spec sources 
Log Message:
* Mon Jan 05 2009 Lillian Angel  <langel at redhat.com> - 1.7-1
- Updated batik-repack.sh to remove font files from test resources.
- Resolves: rhbz#477369

* Mon Jan 05 2009 Nicolas Chauvet <kwizart at gmail.com> - 1.7-1
- Fix release field
- Repack the source (without included jar files)
- Fix dual listed files in the demo subpackage
- Fix BR subversion used in determine-svn-revision-svn-info
- Fix BR that was previously bundled within the source archive
- Resolves: rhbz#472736




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/batik/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	28 Nov 2008 15:49:33 -0000	1.6
+++ .cvsignore	5 Jan 2009 19:08:45 -0000	1.7
@@ -3,5 +3,6 @@
 batik.squiggle.script
 batik.svgpp.script
 batik.ttf2svg.script
-batik-src-1.7.zip
 batik.rasterizer.script
+batik-repack.sh
+batik-repack-1.7.zip


Index: batik.spec
===================================================================
RCS file: /cvs/pkgs/rpms/batik/devel/batik.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- batik.spec	28 Nov 2008 15:51:51 -0000	1.8
+++ batik.spec	5 Jan 2009 19:08:45 -0000	1.9
@@ -1,34 +1,45 @@
 Name:           batik
 Version:        1.7
-Release:        0.7
+Release:        1%{?dist}
 Summary:        Scalable Vector Graphics for Java
 License:        ASL 2.0
 URL:            http://xml.apache.org/batik/
 Group:          Applications/Multimedia
-Source0:        %{name}-src-%{version}.zip
+#Source0:        http://apache.crihan.fr/dist/xmlgraphics/batik/batik-src-%{version}.zip
+Source0:        %{name}-repack-%{version}.zip
 Source1:        %{name}.squiggle.script
 Source2:        %{name}.svgpp.script
 Source3:        %{name}.ttf2svg.script
 Source4:        %{name}.rasterizer.script
 Source5:        %{name}.slideshow.script
 Source6:        %{name}-squiggle.desktop
+Source7:       %{name}-repack.sh
 Patch0:         %{name}-manifests.patch
 Patch1:         %{name}-policy.patch
 Requires:       rhino >= 1.5
-Requires:       xml-commons-apis >= 1.3.04
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildArch:	noarch
 
+BuildRequires:  java-1.6.0-openjdk-devel >= 1:1.6.0.0
+BuildRequires:  jpackage-utils >= 1.5
 BuildRequires:  ant
+BuildRequires:  ant-trax
+BuildRequires:  subversion
+
+BuildRequires:  jython
 BuildRequires:  rhino >= 1.5
 BuildRequires:  jpackage-utils >= 1.5
 BuildRequires:  xerces-j2
-BuildRequires:  jython
+BuildRequires:  xml-commons-apis >= 1.3.04
+
 BuildRequires:  java-javadoc
 BuildRequires:  rhino-javadoc
-BuildRequires:  %{__perl}
-BuildRequires:  java-1.7.0-icedtea >= 1.7.0.0
-BuildArch:      noarch
+
+Requires:       java >= 1:1.6.0.0
+Requires:       rhino >= 1.5
+Requires:       xml-commons-apis >= 1.3.04
+
 
 %description
 Batik is a Java(tm) technology based toolkit for applications that want
@@ -115,17 +126,29 @@
 
 
 %build
-export CLASSPATH=$CLASSPATH:/usr/share/java/ant/ant-trax-1.7.0.jar
+export CLASSPATH=$CLASSPATH:/usr/share/java/ant/ant-trax.jar
 export CLASSPATH=$CLASSPATH:/usr/share/java/xml-commons-apis.jar
 export CLASSPATH=$CLASSPATH:/usr/share/java/xml-commons-apis-ext.jar
+export CLASSPATH=$CLASSPATH:/usr/share/java/js.jar
+export CLASSPATH=$CLASSPATH:/usr/share/java/rhino.jar
+export CLASSPATH=$CLASSPATH:/usr/share/java/xalan-j2.jar
+export CLASSPATH=$CLASSPATH:/usr/share/java/xerces-j2.jar
 ant all-jar \
-        javadoc \
+	-Ddebug=on \
+        -Dsun-codecs.present=false \
+        -Dsun-codecs.disabled=true \
         svg-pp-jar \
         svg-slideshow-jar \
         squiggle-jar \
         rasterizer-jar \
         ttf2svg-jar
 
+for j in $(find batik-%{version} -name *.jar); do
+ export CLASSPATH=$CLASSPATH:${j}
+done
+ant javadoc
+
+
 %install
 rm -rf $RPM_BUILD_ROOT
 
@@ -165,6 +188,10 @@
 cp -pr contrib resources samples test-resources test-sources \
   $RPM_BUILD_ROOT%{_datadir}/%{name}
 
+#Fix perms
+chmod +x $RPM_BUILD_ROOT%{_datadir}/%{name}/contrib/rasterizertask/build.sh 
+chmod +x $RPM_BUILD_ROOT%{_datadir}/%{name}/contrib/charts/convert.sh
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -208,11 +235,21 @@
 %files demo
 %defattr(-,root,root,-)
 %{_datadir}/%{name}
-%attr(0755,root,root) %{_datadir}/%{name}/contrib/rasterizertask/build.sh 
-%attr(0755,root,root) %{_datadir}/%{name}/contrib/charts/convert.sh
 
 
 %changelog
+* Mon Jan 05 2009 Lillian Angel  <langel at redhat.com> - 1.7-1
+- Updated batik-repack.sh to remove font files from test resources.
+- Resolves: rhbz#477369
+
+* Mon Jan 05 2009 Nicolas Chauvet <kwizart at gmail.com> - 1.7-1
+- Fix release field
+- Repack the source (without included jar files)
+- Fix dual listed files in the demo subpackage
+- Fix BR subversion used in determine-svn-revision-svn-info
+- Fix BR that was previously bundled within the source archive
+- Resolves: rhbz#472736
+
 * Fri Nov 28 2008 Lillian Angel <langel at redhat.com> - 1.7-0.7
 - Fixed BASE_JARS in batik.rasterizer.script.
 - Resolves: rhbz#455397


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/batik/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	28 Nov 2008 15:49:33 -0000	1.7
+++ sources	5 Jan 2009 19:08:45 -0000	1.8
@@ -2,6 +2,7 @@
 c20cbde45a96e45bf6e657b50b4fa8e2  batik-squiggle.desktop
 0e2b0bc15b89eef1b72306ebcce4075b  batik.svgpp.script
 96002f6d0e61453b72dc8183e0dce9c8  batik.ttf2svg.script
-c117ca2241907f62a2b3031167ebf917  batik-src-1.7.zip
 83bd841d2e11c265c930765d974480c4  batik.squiggle.script
 41e4dcaacf99bb8e583ee3e7e04e662f  batik.rasterizer.script
+26100fd0b228e3466c4e1788589140b3  batik-repack.sh
+207f23ed2d90e9b9982f739398834c4d  batik-repack-1.7.zip



From pkgdb at fedoraproject.org  Mon Jan  5 19:14:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Jan 2009 19:14:10 +0000
Subject: [pkgdb] printoxx ownership updated
Message-ID: <20090105191410.81D0B2084B6@bastion.fedora.phx.redhat.com>

Package printoxx in Fedora devel is now owned by hubbitus

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



From pkgdb at fedoraproject.org  Mon Jan  5 19:14:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Jan 2009 19:14:15 +0000
Subject: [pkgdb] printoxx ownership updated
Message-ID: <20090105191415.6BE6720873C@bastion.fedora.phx.redhat.com>

Package printoxx in Fedora 9 is now owned by hubbitus

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



From pkgdb at fedoraproject.org  Mon Jan  5 19:14:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Jan 2009 19:14:19 +0000
Subject: [pkgdb] printoxx ownership updated
Message-ID: <20090105191419.9F908208D2B@bastion.fedora.phx.redhat.com>

Package printoxx in Fedora 10 is now owned by hubbitus

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



From pkgdb at fedoraproject.org  Mon Jan  5 19:14:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Jan 2009 19:14:58 +0000
Subject: [pkgdb] fotoxx ownership updated
Message-ID: <20090105191458.4245E20873C@bastion.fedora.phx.redhat.com>

Package fotoxx in Fedora devel is now owned by hubbitus

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



From pkgdb at fedoraproject.org  Mon Jan  5 19:14:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Jan 2009 19:14:59 +0000
Subject: [pkgdb] fotoxx ownership updated
Message-ID: <20090105191459.2B839208D4F@bastion.fedora.phx.redhat.com>

Package fotoxx in Fedora 9 is now owned by hubbitus

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



From pkgdb at fedoraproject.org  Mon Jan  5 19:15:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Jan 2009 19:15:03 +0000
Subject: [pkgdb] fotoxx ownership updated
Message-ID: <20090105191503.44A4B208D51@bastion.fedora.phx.redhat.com>

Package fotoxx in Fedora 10 is now owned by hubbitus

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



From mclasen at fedoraproject.org  Mon Jan  5 19:27:38 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon,  5 Jan 2009 19:27:38 +0000 (UTC)
Subject: rpms/metacity/devel .cvsignore, 1.82, 1.83 metacity.spec, 1.179,
	1.180 sources, 1.82, 1.83
Message-ID: <20090105192738.492D370108@cvs1.fedora.phx.redhat.com>

Author: mclasen

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

Modified Files:
	.cvsignore metacity.spec sources 
Log Message:
2.25.89



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/metacity/devel/.cvsignore,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -r1.82 -r1.83
--- .cvsignore	17 Dec 2008 04:27:40 -0000	1.82
+++ .cvsignore	5 Jan 2009 19:27:07 -0000	1.83
@@ -1 +1 @@
-metacity-2.25.55.tar.bz2
+metacity-2.25.89.tar.bz2


Index: metacity.spec
===================================================================
RCS file: /cvs/pkgs/rpms/metacity/devel/metacity.spec,v
retrieving revision 1.179
retrieving revision 1.180
diff -u -r1.179 -r1.180
--- metacity.spec	17 Dec 2008 04:27:40 -0000	1.179
+++ metacity.spec	5 Jan 2009 19:27:07 -0000	1.180
@@ -1,12 +1,10 @@
 Summary: Unobtrusive window manager
 Name: metacity
-Version: 2.25.55
+Version: 2.25.89
 Release: 1%{?dist}
 URL: http://download.gnome.org/sources/metacity/
 Source0: http://download.gnome.org/sources/metacity/2.25/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
@@ -73,7 +71,6 @@
 %prep
 %setup -q 
 %patch0 -p1 -b .default-theme
-%patch1 -p0 -b .dont-move-windows
 %patch2 -p1 -b .leaks
 %patch3 -p1 -b .string-leak
 %patch4 -p1 -b .stop-spamming-xsession-errors
@@ -180,6 +177,9 @@
 %{_mandir}/man1/metacity-window-demo.1.gz
 
 %changelog
+* Mon Jan  5 2009 Matthias Clasen  <mclasen at redhat.com> - 2.25.89-1
+- Update to 2.25.89
+
 * Tue Dec 16 2008 Matthias Clasen  <mclasen at redhat.com> - 2.25.55-1
 - Update to 2.25.55
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/metacity/devel/sources,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -r1.82 -r1.83
--- sources	17 Dec 2008 04:27:40 -0000	1.82
+++ sources	5 Jan 2009 19:27:07 -0000	1.83
@@ -1 +1 @@
-ab1f07d639351d6ed6386da9538b0ff4  metacity-2.25.55.tar.bz2
+1d083549efdcdc6aad4eaada1c3ff86a  metacity-2.25.89.tar.bz2



From steved at fedoraproject.org  Mon Jan  5 19:28:01 2009
From: steved at fedoraproject.org (Steve Dickson)
Date: Mon,  5 Jan 2009 19:28:01 +0000 (UTC)
Subject: rpms/nfs-utils/devel nfs-utils-1.1.4-gssd-verbosity.patch, NONE,
	1.1 nfs-utils.spec, 1.203, 1.204
Message-ID: <20090105192801.71B4370108@cvs1.fedora.phx.redhat.com>

Author: steved

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

Modified Files:
	nfs-utils.spec 
Added Files:
	nfs-utils-1.1.4-gssd-verbosity.patch 
Log Message:
gssd: By default, don't spam syslog when users' credentials expire


nfs-utils-1.1.4-gssd-verbosity.patch:

--- NEW FILE nfs-utils-1.1.4-gssd-verbosity.patch ---
commit 09c7ad1cd9c5ca2fc46631a0057d47309abc8706
Author: Kevin Coffman <kwc at citi.umich.edu>
Date:   Mon Jan 5 14:07:05 2009 -0500

    gssd: By default, don't spam syslog when users' credentials expire
    
    Change the priority of "common" log messages so that syslog doesn't get
    slammed/spammed when users' credentials expire, or there is another
    common
    problem which would cause error messages for all context creation
    requests.
    
    Note that this will now require that gssd or svcgssd option "-v" is used
    to
    debug these common cases.
    
    Original patch from Andrew Pollock <apollock at google.com>.
    
    Signed-off-by: Kevin Coffman <kwc at citi.umich.edu>
    Signed-off-by: Steve Dickson <steved at redhat.com>
    CC: Andrew Pollock <apollock at google.com>

diff --git a/utils/gssd/gss_util.c b/utils/gssd/gss_util.c
index 8a7bcaa..2d66be9 100644
--- a/utils/gssd/gss_util.c
+++ b/utils/gssd/gss_util.c
@@ -216,7 +216,7 @@ gssd_acquire_cred(char *server_name)
 		ignore_maj_stat = gss_display_name(&ignore_min_stat,
 				target_name, &pbuf, NULL);
 		if (ignore_maj_stat == GSS_S_COMPLETE) {
-			printerr(0, "Unable to obtain credentials for '%.*s'\n",
+			printerr(1, "Unable to obtain credentials for '%.*s'\n",
 				 pbuf.length, pbuf.value);
 			ignore_maj_stat = gss_release_buffer(&ignore_min_stat,
 							     &pbuf);
diff --git a/utils/gssd/gssd_proc.c b/utils/gssd/gssd_proc.c
index cb14d45..91fc8d2 100644
--- a/utils/gssd/gssd_proc.c
+++ b/utils/gssd/gssd_proc.c
@@ -448,7 +448,7 @@ do_downcall(int k5_fd, uid_t uid, struct authgss_private_data *pd,
 	return 0;
 out_err:
 	if (buf) free(buf);
-	printerr(0, "Failed to write downcall!\n");
+	printerr(1, "Failed to write downcall!\n");
 	return -1;
 }
 
@@ -741,14 +741,14 @@ handle_krb5_upcall(struct clnt_info *clp)
 			}
 			gssd_free_krb5_machine_cred_list(credlist);
 			if (!success) {
-				printerr(0, "WARNING: Failed to create krb5 context "
+				printerr(1, "WARNING: Failed to create krb5 context "
 					 "for user with uid %d with any "
 					 "credentials cache for server %s\n",
 					 uid, clp->servername);
 				goto out_return_error;
 			}
 		} else {
-			printerr(0, "WARNING: Failed to create krb5 context "
+			printerr(1, "WARNING: Failed to create krb5 context "
 				 "for user with uid %d for server %s\n",
 				 uid, clp->servername);
 			goto out_return_error;
@@ -756,7 +756,7 @@ handle_krb5_upcall(struct clnt_info *clp)
 	}
 
 	if (!authgss_get_private_data(auth, &pd)) {
-		printerr(0, "WARNING: Failed to obtain authentication "
+		printerr(1, "WARNING: Failed to obtain authentication "
 			    "data for user with uid %d for server %s\n",
 			 uid, clp->servername);
 		goto out_return_error;
diff --git a/utils/gssd/krb5_util.c b/utils/gssd/krb5_util.c
index 77814bc..d4ee631 100644
--- a/utils/gssd/krb5_util.c
+++ b/utils/gssd/krb5_util.c
@@ -399,7 +399,7 @@ gssd_get_single_krb5_cred(krb5_context context,
 		goto out;
 	}
 	if (krb5_get_init_creds_opt_set_addressless(context, init_opts, 1))
-		printerr(0, "WARNING: Unable to set option for addressless "
+		printerr(1, "WARNING: Unable to set option for addressless "
 			 "tickets.  May have problems behind a NAT.\n");
 #ifdef TEST_SHORT_LIFETIME
 	/* set a short lifetime (for debugging only!) */
@@ -422,7 +422,7 @@ gssd_get_single_krb5_cred(krb5_context context,
 
 	if ((code = krb5_get_init_creds_keytab(context, &my_creds, ple->princ,
 					       kt, 0, NULL, opts))) {
-		printerr(0, "WARNING: %s while getting initial ticket for "
+		printerr(1, "WARNING: %s while getting initial ticket for "
 			 "principal '%s' using keytab '%s'\n",
 			 gssd_k5_err_msg(context, code),
 			 pname ? pname : "<unparsable>", kt_name);
@@ -632,7 +632,7 @@ get_full_hostname(const char *inhost, char *outhost, int outhostlen)
 	/* Get full target hostname */
 	retval = getaddrinfo(inhost, NULL, &hints, &addrs);
 	if (retval) {
-		printerr(0, "%s while getting full hostname for '%s'\n",
+		printerr(1, "%s while getting full hostname for '%s'\n",
 			 gai_strerror(retval), inhost);
 		goto out;
 	}
diff --git a/utils/gssd/svcgssd_proc.c b/utils/gssd/svcgssd_proc.c
index f162152..1d13532 100644
--- a/utils/gssd/svcgssd_proc.c
+++ b/utils/gssd/svcgssd_proc.c
@@ -108,7 +108,7 @@ do_svc_downcall(gss_buffer_desc *out_handle, struct svc_cred *cred,
 	fclose(f);
 	return err;
 out_err:
-	printerr(0, "WARNING: downcall failed\n");
+	printerr(1, "WARNING: downcall failed\n");
 	return -1;
 }
 
@@ -247,7 +247,7 @@ get_ids(gss_name_t client_name, gss_OID mech, struct svc_cred *cred)
 			res = 0;
 			goto out_free;
 		}
-		printerr(0, "WARNING: get_ids: failed to map name '%s' "
+		printerr(1, "WARNING: get_ids: failed to map name '%s' "
 			"to uid/gid: %s\n", sname, strerror(-res));
 		goto out_free;
 	}
@@ -380,7 +380,7 @@ handle_nullreq(FILE *f) {
 		goto continue_needed;
 	}
 	else if (maj_stat != GSS_S_COMPLETE) {
-		printerr(0, "WARNING: gss_accept_sec_context failed\n");
+		printerr(1, "WARNING: gss_accept_sec_context failed\n");
 		pgsserr("handle_nullreq: gss_accept_sec_context",
 			maj_stat, min_stat, mech);
 		goto out_err;


Index: nfs-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nfs-utils/devel/nfs-utils.spec,v
retrieving revision 1.203
retrieving revision 1.204
diff -u -r1.203 -r1.204
--- nfs-utils.spec	5 Jan 2009 18:03:37 -0000	1.203
+++ nfs-utils.spec	5 Jan 2009 19:27:31 -0000	1.204
@@ -40,6 +40,7 @@
 Patch111: nfs-utils-1.1.4-statd-xunlink.patch
 Patch112: nfs-utils-1.1.4-tcpwrapper-update.patch
 Patch113: nfs-utils-1.1.4-tcpwrap-warn.patch
+Patch114: nfs-utils-1.1.4-gssd-verbosity.patch
 
 %if %{enablefscache}
 Patch90: nfs-utils-1.1.0-mount-fsc.patch
@@ -108,6 +109,7 @@
 %patch111 -p1
 %patch112 -p1
 %patch113 -p1
+%patch114 -p1
 
 %if %{enablefscache}
 %patch90 -p1
@@ -274,6 +276,7 @@
 * Sat Jan  3 2009 Steve Dickson <steved at redhat.com> 1.1.4-11
 - Added warnings to tcp wrapper code when mounts are 
   denied due to misconfigured DNS configurations.
+- gssd: By default, don't spam syslog when users' credentials expire
 
 * Fri Dec 19 2008 Steve Dickson <steved at redhat.com> 1.1.4-10
 - Re-enabled and fixed/enhanced tcp wrappers.



From steved at fedoraproject.org  Mon Jan  5 19:33:35 2009
From: steved at fedoraproject.org (Steve Dickson)
Date: Mon,  5 Jan 2009 19:33:35 +0000 (UTC)
Subject: rpms/nfs-utils/F-10 nfs-utils-1.1.4-gssd-verbosity.patch, NONE,
	1.1 nfs-utils.spec, 1.197, 1.198
Message-ID: <20090105193335.25C4C7013F@cvs1.fedora.phx.redhat.com>

Author: steved

Update of /cvs/pkgs/rpms/nfs-utils/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3899

Modified Files:
	nfs-utils.spec 
Added Files:
	nfs-utils-1.1.4-gssd-verbosity.patch 
Log Message:
- gssd: By default, don't spam syslog when users' credentials expire


nfs-utils-1.1.4-gssd-verbosity.patch:

--- NEW FILE nfs-utils-1.1.4-gssd-verbosity.patch ---
commit 09c7ad1cd9c5ca2fc46631a0057d47309abc8706
Author: Kevin Coffman <kwc at citi.umich.edu>
Date:   Mon Jan 5 14:07:05 2009 -0500

    gssd: By default, don't spam syslog when users' credentials expire
    
    Change the priority of "common" log messages so that syslog doesn't get
    slammed/spammed when users' credentials expire, or there is another
    common
    problem which would cause error messages for all context creation
    requests.
    
    Note that this will now require that gssd or svcgssd option "-v" is used
    to
    debug these common cases.
    
    Original patch from Andrew Pollock <apollock at google.com>.
    
    Signed-off-by: Kevin Coffman <kwc at citi.umich.edu>
    Signed-off-by: Steve Dickson <steved at redhat.com>
    CC: Andrew Pollock <apollock at google.com>

diff --git a/utils/gssd/gss_util.c b/utils/gssd/gss_util.c
index 8a7bcaa..2d66be9 100644
--- a/utils/gssd/gss_util.c
+++ b/utils/gssd/gss_util.c
@@ -216,7 +216,7 @@ gssd_acquire_cred(char *server_name)
 		ignore_maj_stat = gss_display_name(&ignore_min_stat,
 				target_name, &pbuf, NULL);
 		if (ignore_maj_stat == GSS_S_COMPLETE) {
-			printerr(0, "Unable to obtain credentials for '%.*s'\n",
+			printerr(1, "Unable to obtain credentials for '%.*s'\n",
 				 pbuf.length, pbuf.value);
 			ignore_maj_stat = gss_release_buffer(&ignore_min_stat,
 							     &pbuf);
diff --git a/utils/gssd/gssd_proc.c b/utils/gssd/gssd_proc.c
index cb14d45..91fc8d2 100644
--- a/utils/gssd/gssd_proc.c
+++ b/utils/gssd/gssd_proc.c
@@ -448,7 +448,7 @@ do_downcall(int k5_fd, uid_t uid, struct authgss_private_data *pd,
 	return 0;
 out_err:
 	if (buf) free(buf);
-	printerr(0, "Failed to write downcall!\n");
+	printerr(1, "Failed to write downcall!\n");
 	return -1;
 }
 
@@ -741,14 +741,14 @@ handle_krb5_upcall(struct clnt_info *clp)
 			}
 			gssd_free_krb5_machine_cred_list(credlist);
 			if (!success) {
-				printerr(0, "WARNING: Failed to create krb5 context "
+				printerr(1, "WARNING: Failed to create krb5 context "
 					 "for user with uid %d with any "
 					 "credentials cache for server %s\n",
 					 uid, clp->servername);
 				goto out_return_error;
 			}
 		} else {
-			printerr(0, "WARNING: Failed to create krb5 context "
+			printerr(1, "WARNING: Failed to create krb5 context "
 				 "for user with uid %d for server %s\n",
 				 uid, clp->servername);
 			goto out_return_error;
@@ -756,7 +756,7 @@ handle_krb5_upcall(struct clnt_info *clp)
 	}
 
 	if (!authgss_get_private_data(auth, &pd)) {
-		printerr(0, "WARNING: Failed to obtain authentication "
+		printerr(1, "WARNING: Failed to obtain authentication "
 			    "data for user with uid %d for server %s\n",
 			 uid, clp->servername);
 		goto out_return_error;
diff --git a/utils/gssd/krb5_util.c b/utils/gssd/krb5_util.c
index 77814bc..d4ee631 100644
--- a/utils/gssd/krb5_util.c
+++ b/utils/gssd/krb5_util.c
@@ -399,7 +399,7 @@ gssd_get_single_krb5_cred(krb5_context context,
 		goto out;
 	}
 	if (krb5_get_init_creds_opt_set_addressless(context, init_opts, 1))
-		printerr(0, "WARNING: Unable to set option for addressless "
+		printerr(1, "WARNING: Unable to set option for addressless "
 			 "tickets.  May have problems behind a NAT.\n");
 #ifdef TEST_SHORT_LIFETIME
 	/* set a short lifetime (for debugging only!) */
@@ -422,7 +422,7 @@ gssd_get_single_krb5_cred(krb5_context context,
 
 	if ((code = krb5_get_init_creds_keytab(context, &my_creds, ple->princ,
 					       kt, 0, NULL, opts))) {
-		printerr(0, "WARNING: %s while getting initial ticket for "
+		printerr(1, "WARNING: %s while getting initial ticket for "
 			 "principal '%s' using keytab '%s'\n",
 			 gssd_k5_err_msg(context, code),
 			 pname ? pname : "<unparsable>", kt_name);
@@ -632,7 +632,7 @@ get_full_hostname(const char *inhost, char *outhost, int outhostlen)
 	/* Get full target hostname */
 	retval = getaddrinfo(inhost, NULL, &hints, &addrs);
 	if (retval) {
-		printerr(0, "%s while getting full hostname for '%s'\n",
+		printerr(1, "%s while getting full hostname for '%s'\n",
 			 gai_strerror(retval), inhost);
 		goto out;
 	}
diff --git a/utils/gssd/svcgssd_proc.c b/utils/gssd/svcgssd_proc.c
index f162152..1d13532 100644
--- a/utils/gssd/svcgssd_proc.c
+++ b/utils/gssd/svcgssd_proc.c
@@ -108,7 +108,7 @@ do_svc_downcall(gss_buffer_desc *out_handle, struct svc_cred *cred,
 	fclose(f);
 	return err;
 out_err:
-	printerr(0, "WARNING: downcall failed\n");
+	printerr(1, "WARNING: downcall failed\n");
 	return -1;
 }
 
@@ -247,7 +247,7 @@ get_ids(gss_name_t client_name, gss_OID mech, struct svc_cred *cred)
 			res = 0;
 			goto out_free;
 		}
-		printerr(0, "WARNING: get_ids: failed to map name '%s' "
+		printerr(1, "WARNING: get_ids: failed to map name '%s' "
 			"to uid/gid: %s\n", sname, strerror(-res));
 		goto out_free;
 	}
@@ -380,7 +380,7 @@ handle_nullreq(FILE *f) {
 		goto continue_needed;
 	}
 	else if (maj_stat != GSS_S_COMPLETE) {
-		printerr(0, "WARNING: gss_accept_sec_context failed\n");
+		printerr(1, "WARNING: gss_accept_sec_context failed\n");
 		pgsserr("handle_nullreq: gss_accept_sec_context",
 			maj_stat, min_stat, mech);
 		goto out_err;


Index: nfs-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nfs-utils/F-10/nfs-utils.spec,v
retrieving revision 1.197
retrieving revision 1.198
diff -u -r1.197 -r1.198
--- nfs-utils.spec	5 Jan 2009 18:13:50 -0000	1.197
+++ nfs-utils.spec	5 Jan 2009 19:33:04 -0000	1.198
@@ -29,6 +29,7 @@
 Patch04: nfs-utils-1.1.4-statd-unlink.patch
 Patch05: nfs-utils-1.1.4-tcpwrapper-update.patch
 Patch06: nfs-utils-1.1.4-tcpwrap-warn.patch
+Patch07: nfs-utils-1.1.4-gssd-verbosity.patch
 
 %if %{enablefscache}
 Patch90: nfs-utils-1.1.0-mount-fsc.patch
@@ -86,6 +87,7 @@
 %patch04 -p1
 %patch05 -p1
 %patch06 -p1
+%patch07 -p1
 
 %if %{enablefscache}
 %patch90 -p1
@@ -252,6 +254,7 @@
 * Mon Jan  5 2009 Steve Dickson <steved at redhat.com> 1.1.4-6
 - Added warnings to tcp wrapper code when mounts are 
   denied due to misconfigured DNS configurations.
+- gssd: By default, don't spam syslog when users' credentials expire
 
 * Sat Dec 20 2008 Steve Dickson <steved at redhat.com> 1.1.4-5
 - Re-enabled and fixed/enhanced tcp wrappers.



From caillon at fedoraproject.org  Mon Jan  5 19:36:56 2009
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Mon,  5 Jan 2009 19:36:56 +0000 (UTC)
Subject: rpms/epiphany/F-10 epiphany.spec,1.218,1.219
Message-ID: <20090105193656.52D1F70108@cvs1.fedora.phx.redhat.com>

Author: caillon

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

Modified Files:
	epiphany.spec 
Log Message:
* Mon Jan  5 2009 Christopher Aillon <caillon at redhat.com> - 2.24.2.1-1
- Update to 2.24.2.1



Index: epiphany.spec
===================================================================
RCS file: /cvs/extras/rpms/epiphany/F-10/epiphany.spec,v
retrieving revision 1.218
retrieving revision 1.219
diff -u -r1.218 -r1.219
--- epiphany.spec	18 Dec 2008 15:26:39 -0000	1.218
+++ epiphany.spec	5 Jan 2009 19:36:25 -0000	1.219
@@ -7,8 +7,8 @@
 
 Summary: GNOME web browser based on the Mozilla rendering engine
 Name: epiphany
-Version: 2.24.2
-Release: 5%{?dist}
+Version: 2.24.2.1
+Release: 1%{?dist}
 License: GPLv2+ and GFDL
 Group: Applications/Internet
 URL: http://www.gnome.org/projects/epiphany/
@@ -55,7 +55,6 @@
 Patch2: epiphany-2.18.1-default-bookmarks.patch
 # https://bugzilla.redhat.com/show_bug.cgi?id=334751
 Patch3: epiphany-2.20.1-wrapped-plugins.patch
-Patch4: python-paths.patch
 
 %description
 Epiphany is a simple GNOME web browser based on the Mozilla rendering
@@ -98,7 +97,6 @@
 %patch1 -p1 -b .use-pango
 %patch2 -p1 -b .default-bookmarks
 %patch3 -p1 -b .wrapped-plugins
-%patch4 -p1 -b .python-paths
 # Fedora Epiphany version
 cat >> data/default-prefs-common.js << EOF
 pref("general.useragent.vendor", "Fedora");
@@ -254,6 +252,9 @@
 %{_datadir}/pygtk/2.0/defs/epiphany.defs
 
 %changelog
+* Mon Jan  5 2009 Christopher Aillon <caillon at redhat.com> - 2.24.2.1-1
+- Update to 2.24.2.1
+
 * Thu Dec 18 2008 Martin Stransky <stransky at redhat.com> - 2.24.2-5
 - build fix to configure
 



From caillon at fedoraproject.org  Mon Jan  5 19:37:54 2009
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Mon,  5 Jan 2009 19:37:54 +0000 (UTC)
Subject: rpms/epiphany/F-10 .cvsignore,1.76,1.77 sources,1.81,1.82
Message-ID: <20090105193754.BD5D370108@cvs1.fedora.phx.redhat.com>

Author: caillon

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

Modified Files:
	.cvsignore sources 
Log Message:
* Mon Jan  5 2009 Christopher Aillon <caillon at redhat.com> - 2.24.2.1-1
- Update to 2.24.2.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/epiphany/F-10/.cvsignore,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- .cvsignore	25 Nov 2008 16:30:13 -0000	1.76
+++ .cvsignore	5 Jan 2009 19:37:24 -0000	1.77
@@ -1 +1 @@
-epiphany-2.24.2.tar.bz2
+epiphany-2.24.2.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/epiphany/F-10/sources,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- sources	18 Dec 2008 01:29:59 -0000	1.81
+++ sources	5 Jan 2009 19:37:24 -0000	1.82
@@ -1 +1 @@
-7650df6cc08292cd6faf8bbcfbf9e901  epiphany-2.24.2.tar.bz2
+c4993233792e83b00df11feae950e201  epiphany-2.24.2.1.tar.bz2



From xavierb at fedoraproject.org  Mon Jan  5 19:43:57 2009
From: xavierb at fedoraproject.org (Xavier Bachelot)
Date: Mon,  5 Jan 2009 19:43:57 +0000 (UTC)
Subject: rpms/xorg-x11-drv-openchrome/devel
	openchrome-0.2.903-latest_snapshot.patch, 1.2,
	1.3 xorg-x11-drv-openchrome.spec, 1.34, 1.35
Message-ID: <20090105194357.5D98E70108@cvs1.fedora.phx.redhat.com>

Author: xavierb

Update of /cvs/pkgs/rpms/xorg-x11-drv-openchrome/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8474

Modified Files:
	openchrome-0.2.903-latest_snapshot.patch 
	xorg-x11-drv-openchrome.spec 
Log Message:
trunk rev 711

openchrome-0.2.903-latest_snapshot.patch:

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.2 -r 1.3 openchrome-0.2.903-latest_snapshot.patch
Index: openchrome-0.2.903-latest_snapshot.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-openchrome/devel/openchrome-0.2.903-latest_snapshot.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- openchrome-0.2.903-latest_snapshot.patch	30 Dec 2008 01:54:40 -0000	1.2
+++ openchrome-0.2.903-latest_snapshot.patch	5 Jan 2009 19:43:26 -0000	1.3
@@ -1,7 +1,7 @@
 Index: configure.ac
 ===================================================================
---- configure.ac	(.../tags/release_0_2_903)	(revision 696)
-+++ configure.ac	(.../trunk)	(revision 696)
+--- configure.ac	(.../tags/release_0_2_903)	(revision 711)
++++ configure.ac	(.../trunk)	(revision 711)
 @@ -70,7 +70,7 @@
  XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto)
  
@@ -55,8 +55,8 @@
          AC_DEFINE(XSERVER_LIBPCIACCESS,1,[Enable libpciaccess])
 Index: libxvmc/Makefile.am
 ===================================================================
---- libxvmc/Makefile.am	(.../tags/release_0_2_903)	(revision 696)
-+++ libxvmc/Makefile.am	(.../trunk)	(revision 696)
+--- libxvmc/Makefile.am	(.../tags/release_0_2_903)	(revision 711)
++++ libxvmc/Makefile.am	(.../trunk)	(revision 711)
 @@ -24,13 +24,13 @@
  	xf86dristr.h \
  	vldXvMC.h
@@ -77,8 +77,8 @@
  	driDrawable.c \
 Index: libxvmc/viaLowLevelPro.c
 ===================================================================
---- libxvmc/viaLowLevelPro.c	(.../tags/release_0_2_903)	(revision 696)
-+++ libxvmc/viaLowLevelPro.c	(.../trunk)	(revision 696)
+--- libxvmc/viaLowLevelPro.c	(.../tags/release_0_2_903)	(revision 711)
++++ libxvmc/viaLowLevelPro.c	(.../trunk)	(revision 711)
 @@ -1460,13 +1460,13 @@
  
      if (size != mem->size) {
@@ -106,8 +106,8 @@
  
 Index: libxvmc/viaXvMC.c
 ===================================================================
---- libxvmc/viaXvMC.c	(.../tags/release_0_2_903)	(revision 696)
-+++ libxvmc/viaXvMC.c	(.../trunk)	(revision 696)
+--- libxvmc/viaXvMC.c	(.../tags/release_0_2_903)	(revision 711)
++++ libxvmc/viaXvMC.c	(.../trunk)	(revision 711)
 @@ -248,7 +248,7 @@
      return errType;
  }
@@ -384,9 +384,92 @@
  
 Index: ChangeLog
 ===================================================================
---- ChangeLog	(.../tags/release_0_2_903)	(revision 696)
-+++ ChangeLog	(.../trunk)	(revision 696)
-@@ -1,3 +1,149 @@
+--- ChangeLog	(.../tags/release_0_2_903)	(revision 711)
++++ ChangeLog	(.../trunk)	(revision 711)
+@@ -1,3 +1,232 @@
++2009-01-06  Jon Nettleton  <jon.nettleton at gmail.com>
++
++	* src/via_mode.c: (ViaModesMonitorFixup), (ViaModesAttachHelper):
++
++	Make sure that the monitor settings will handle our
++	internal Modes set for TV out and LCD Panels.
++
++2009-01-05  Jon Nettleton  <jon.nettleton at gmail.com>
++
++	* src/via_cursor.c: (viaHWCursorInit), (viaLoadCursorImage):
++
++	A couple more tweaks to fix mono hardware cursor on older
++	chipsets.
++
++2009-01-05  Jon Nettleton  <jon.nettleton at gmail.com>
++
++	* src/via_cursor.c: (viaHWCursorInit), (viaUseHWCursorARGB),
++	(viaUseHWCursor):
++	* src/via_driver.c: (VIAScreenInit):
++
++	Missed a couple of changes for the chipset specific
++	cursors.  Moved chipset detection to HWInit.  Removed
++	some extraneous debugging.
++
++2009-01-04  Gabriel Mansi  <gabriel-dot-mansi-at-gmail-dot-com>
++
++	* src/via.h:
++	* src/via_accel.c: (viaInitialize2DEngine):
++	* src/via_crtc.c: (ViaFirstCRTCSetMode), (ViaSecondCRTCSetMode):
++	* src/via_driver.c: (ViaMMIOEnable), (ViaMMIODisable),
++	(VIAWriteMode):
++	* src/via_swov.c: (SetFIFO_V3), (Upd_Video):
++	* src/via_video.c: (DecideOverlaySupport):
++
++	Initial XVideo support for VX800.
++
++2009-01-04  Jon Nettleton  <jon.nettleton at gmail.com>
++
++	* src/via_cursor.c: (viaHWCursorInit), (viaCursorSetFB),
++	(viaUseHWCursorARGB), (viaUseHWCursor), (viaLoadCursorImage),
++	(viaSetCursorColors), (viaLoadCursorARGB):
++	* src/via_driver.h:
++
++	Okay I tried to cheat.  We need to have some chipset
++	specific intelligence.  I have added this back into
++	the initial test to check for HWCursor support.
++
++2009-01-04  Jon Nettleton <jon.nettleton at gmail.com>
++
++	* src/via_accel.c: (viaInitXAA), (viaInitAccel):
++	* src/via_crtc.c: (ViaSecondCRTCSetStartingAddress):
++	* src/via_cursor.c: (viaHWCursorInit), (viaCursorSetFB),
++	(viaCursorStore), (viaCursorRestore), (viaShowCursor),
++	(viaHideCursor), (viaSetCursorPosition), (viaUseHWCursorARGB),
++	(viaUseHWCursor), (viaLoadCursorImage), (viaSetCursorColors),
++	(viaLoadCursorARGB):
++	* src/via_dga.c: (VIADGASetMode):
++	* src/via_driver.c: (VIAFreeRec), (VIASetupDefaultOptions),
++	(VIAPreInit), (VIAEnterVT), (VIALeaveVT), (VIAScreenInit),
++	(VIACloseScreen):
++	* src/via_driver.h:
++	* src/via_regs.h:
++
++	This is a take at reworking HWCursor.  It works off the
++	ttm_branch and the work done in the randr_branch.  It only needs
++	marginal testing as HWCursor was already very broken.
++
++2009-01-04  Jon Nettleton  <jon.nettleton at gmail.com>
++
++	* src/via_driver.c: (VIAMapMMIO), (VIAMapFB):
++
++	Moved pVia->FrameBufferBase setting to within
++	VIAMapFB where it was before being called without
++	being set.
++
++2009-01-04  Jon Nettleton  <jon.nettleton at gmail.com>
++
++	* src/via_driver.c: (VIAPreInit):
++
++	Patch submitted by Robert Bridge to clean up compiler
++        warnings.  Should close trac ticket #243.  Thanks
++	RobbieAB.
++
 +2008-12-29  Jon Nettleton  <jon.nettleton at gmail.com>
 +
 +	* src/via_accel.c: (viaInitXAA):
@@ -539,7 +622,7 @@
 Index: src/via_panel.c
 ===================================================================
 --- src/via_panel.c	(.../tags/release_0_2_903)	(revision 0)
-+++ src/via_panel.c	(.../trunk)	(revision 696)
++++ src/via_panel.c	(.../trunk)	(revision 711)
 @@ -0,0 +1,461 @@
 +/*
 + * Copyright 2007 The Openchrome Project [openchrome.org]
@@ -1004,8 +1087,8 @@
 +}
 Index: src/via_id.h
 ===================================================================
---- src/via_id.h	(.../tags/release_0_2_903)	(revision 696)
-+++ src/via_id.h	(.../trunk)	(revision 696)
+--- src/via_id.h	(.../tags/release_0_2_903)	(revision 711)
++++ src/via_id.h	(.../trunk)	(revision 711)
 @@ -37,6 +37,7 @@
      VIA_P4M900,
      VIA_CX700,
@@ -1024,8 +1107,8 @@
   * the CLE266, often labelled Ax and Cx.  The dividing line seems to be
 Index: src/via_video.c
 ===================================================================
---- src/via_video.c	(.../tags/release_0_2_903)	(revision 696)
-+++ src/via_video.c	(.../trunk)	(revision 696)
+--- src/via_video.c	(.../tags/release_0_2_903)	(revision 711)
++++ src/via_video.c	(.../trunk)	(revision 711)
 @@ -112,11 +112,7 @@
  static int viaSetPortAttribute(ScrnInfoPtr, Atom, INT32, pointer);
  static int viaPutImage(ScrnInfoPtr, short, short, short, short, short, short,
@@ -1039,7 +1122,17 @@
  static void nv12Blit(unsigned char *nv12Chroma,
      const unsigned char *uBuffer,
      const unsigned char *vBuffer,
-@@ -370,14 +366,14 @@
+@@ -282,7 +278,8 @@
+         pVia->ChipId != PCI_CHIP_VT3327 && 
+         pVia->ChipId != PCI_CHIP_VT3336 && 
+         pVia->ChipId != PCI_CHIP_VT3364 && 
+-        pVia->ChipId != PCI_CHIP_VT3324) {
++        pVia->ChipId != PCI_CHIP_VT3324 &&
++	pVia->ChipId != PCI_CHIP_VT3353) {
+         CARD32 bandwidth = (mode->HDisplay >> 4) * (mode->VDisplay >> 5) *
+             pScrn->bitsPerPixel * mode->VRefresh;
+ 
+@@ -370,14 +367,14 @@
      
          if (pVia->pVbe) {
              refresh = 100;
@@ -1058,7 +1151,7 @@
                  if ((width == 1400) && (height == 1050)) {
                      width = 1280;
[...2384 lines suppressed...]
++	    *dst++ = 0;
 +    }
-+    viaCursorShow(pScrn);
-+}
 +
-+#endif
++    for (; y < pVia->CursorMaxHeight; y++)
++	for (x = 0; x < pVia->CursorMaxWidth; x++)
++	    *dst++ = 0;
 +
-+Bool
-+viaCursorRecInit(ScrnInfoPtr pScrn)
-+{
-+    VIAPtr pVia = VIAPTR(pScrn);
-+
-+    if (!pVia->cursor)
-+        pVia->cursor =
-+                (ViaCursorInfoPtr) xnfcalloc(sizeof(ViaCursorInfoRec), 1);
-+
-+    if (pVia->cursor) {
-+        ViaCursorInfoPtr cursor = pVia->cursor;
-+
-+        switch (pVia->Chipset) {
-+            case VIA_CLE266:
-+            case VIA_KM400:
-+            case VIA_K8M800:
-+                cursor->isARGBSupported = FALSE;
-+                cursor->isARGBEnabled = FALSE;
-+                cursor->maxWidth = 32;
-+                cursor->maxHeight = 32;
-+                cursor->size = ((cursor->maxWidth * cursor->maxHeight) / 8) * 2;
-+                break;
-+            default:
-+                cursor->isARGBSupported = TRUE;
-+                cursor->isARGBEnabled = TRUE;
-+                cursor->maxWidth = 64;
-+                cursor->maxHeight = 64;
-+                cursor->size = cursor->maxWidth * cursor->maxHeight * 4;
-+                break;
-+        }
-+    }
-+
-+    return pVia->cursor != NULL;
-+}
-+
-+void
-+viaCursorRecDestroy(ScrnInfoPtr pScrn)
-+{
-+    VIAPtr pVia = VIAPTR(pScrn);
-+
-+    if (pVia->cursor)
-+        xfree(pVia->cursor);
-+}
-+
-+static Bool
-+viaCursorHWUse(ScreenPtr pScreen, CursorPtr pCurs)
-+{
-+    ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
-+    VIAPtr pVia = VIAPTR(pScrn);
-+
-+    return (pVia->cursor->isHWCursorEnabled
-+            /* Can't enable HW cursor on both CRTCs at the same time. */
-+            && !(pVia->pBIOSInfo->FirstCRTC->IsActive
-+                 && pVia->pBIOSInfo->SecondCRTC->IsActive)
-+            && pCurs->bits->width <= pVia->cursor->maxWidth
-+            && pCurs->bits->height <= pVia->cursor->maxHeight);
-+}
++    VIASETREG(control, temp);
+ }
 Index: src/via_xvmc.c
 ===================================================================
---- src/via_xvmc.c	(.../tags/release_0_2_903)	(revision 696)
-+++ src/via_xvmc.c	(.../trunk)	(revision 696)
+--- src/via_xvmc.c	(.../tags/release_0_2_903)	(revision 711)
++++ src/via_xvmc.c	(.../trunk)	(revision 711)
 @@ -114,11 +114,7 @@
  static int viaXvMCInterceptPutImage(ScrnInfoPtr, short, short, short, short,
                                      short, short, short, short, int,
@@ -6366,8 +6578,8 @@
  unsigned long
 Index: src/via_vt162x.h
 ===================================================================
---- src/via_vt162x.h	(.../tags/release_0_2_903)	(revision 696)
-+++ src/via_vt162x.h	(.../trunk)	(revision 696)
+--- src/via_vt162x.h	(.../tags/release_0_2_903)	(revision 711)
++++ src/via_vt162x.h	(.../trunk)	(revision 711)
 @@ -926,6 +926,23 @@
        0x0, 0x0,
      },
@@ -6392,10 +6604,44 @@
      { "720x576", 720, 576, TVTYPE_PAL, 0, 0,
        /*  00                                                                                         0F */
        { 0x03, 0x00, 0x10, 0x1f, 0x03, 0x00, 0x00, 0xc9,  0x4c, 0x11, 0x7c, 0x00, 0x56, 0x57, 0x07, 0xbf,
+Index: src/via.h
+===================================================================
+--- src/via.h	(.../tags/release_0_2_903)	(revision 711)
++++ src/via.h	(.../trunk)	(revision 711)
+@@ -561,9 +561,6 @@
+ #define HQV_V_FILTER_DEFAULT    0x00420000
+ #define HQV_H_FILTER_DEFAULT    0x00000040
+ 
+-
+-
+-
+ /* HQV_MINI_CONTROL        0x3E8 */
+ #define HQV_H_MINIFY_ENABLE 0x00000800
+ #define HQV_H_MINIFY_DOWN   0x00001000
+@@ -572,6 +569,19 @@
+ #define HQV_VDEBLOCK_FILTER 0x80000000
+ #define HQV_HDEBLOCK_FILTER 0x00008000
+ 
++/* Add new HQV Registers for VT3353: */
++#define HQV_SRC_DATA_OFFSET_CONTROL1        0x180
++#define HQV_SRC_DATA_OFFSET_CONTROL2        0x184
++#define HQV_SRC_DATA_OFFSET_CONTROL3        0x188
++#define HQV_SRC_DATA_OFFSET_CONTROL4        0x18C
++#define HQV_HW_TUNING_PERFORMANCE           0x190
++#define HQV_EXTENDED_CONTROL                0x194
++#define HQV_STATIC_RECORD_FB_STARTADDR      0x198
++#define HQV_STATIC_RECORD_FB_STRIDE         0x19C
++#define HQV_COLOR_ADJUSTMENT_CONTROL1       0x1A0
++#define HQV_COLOR_ADJUSTMENT_CONTROL2       0x1A4
++#define HQV_COLOR_ADJUSTMENT_CONTROL3       0x1A8
++#define HQV_COLOR_ADJUSTMENT_CONTROL5       0x1AC
+ 
+ #define CHROMA_KEY_LOW          0x00FFFFFF
+ #define CHROMA_KEY_HIGH         0x00FFFFFF
 Index: src/via_timing.c
 ===================================================================
 --- src/via_timing.c	(.../tags/release_0_2_903)	(revision 0)
-+++ src/via_timing.c	(.../trunk)	(revision 696)
++++ src/via_timing.c	(.../trunk)	(revision 711)
 @@ -0,0 +1,398 @@
 +/*
 + * Copyright 2007-2008 Gabriel Mansi.
@@ -6797,8 +7043,8 @@
 +}
 Index: src/Makefile.am
 ===================================================================
---- src/Makefile.am	(.../tags/release_0_2_903)	(revision 696)
-+++ src/Makefile.am	(.../trunk)	(revision 696)
+--- src/Makefile.am	(.../tags/release_0_2_903)	(revision 711)
++++ src/Makefile.am	(.../trunk)	(revision 711)
 @@ -43,23 +43,29 @@
           via_ch7xxx.c \
           via_ch7xxx.h \
@@ -6831,34 +7077,30 @@
           via_vgahw.h \
 Index: src/via_dga.c
 ===================================================================
---- src/via_dga.c	(.../tags/release_0_2_903)	(revision 696)
-+++ src/via_dga.c	(.../trunk)	(revision 696)
-@@ -247,8 +247,8 @@
-         pScrn->depth = pVia->DGAOldDepth;
+--- src/via_dga.c	(.../tags/release_0_2_903)	(revision 711)
++++ src/via_dga.c	(.../trunk)	(revision 711)
+@@ -248,7 +248,7 @@
  
          pScrn->SwitchMode(index, pScrn->currentMode, 0);
--        if (pVia->hwcursor)
+         if (pVia->hwcursor)
 -            VIAShowCursor(pScrn);
-+        if (pVia->cursor->isHWCursorEnabled)
-+            viaCursorShow(pScrn);
++            viaShowCursor(pScrn);
  
          pVia->DGAactive = FALSE;
      }
-@@ -260,8 +260,8 @@
-                pMode->bitsPerPixel, pMode->depth);
+@@ -261,7 +261,7 @@
  #endif
  
--        if (pVia->hwcursor)
+         if (pVia->hwcursor)
 -            VIAHideCursor(pScrn);
-+        if (pVia->cursor->isHWCursorEnabled)
-+            viaCursorHide(pScrn);
++            viaHideCursor(pScrn);
  
          if (!pVia->DGAactive) {  /* save the old parameters */
              pVia->DGAOldDisplayWidth = pScrn->displayWidth;
 Index: src/via_id.c
 ===================================================================
---- src/via_id.c	(.../tags/release_0_2_903)	(revision 696)
-+++ src/via_id.c	(.../trunk)	(revision 696)
+--- src/via_id.c	(.../tags/release_0_2_903)	(revision 711)
++++ src/via_id.c	(.../trunk)	(revision 711)
 @@ -87,6 +87,7 @@
      {"Asustek K8V-MX",                        VIA_K8M800,  0x1043, 0x8129, VIA_DEVICE_CRT},
      {"Mitac 8399",                            VIA_K8M800,  0x1071, 0x8399, VIA_DEVICE_CRT | VIA_DEVICE_LCD | VIA_DEVICE_TV}, /* aka "Pogolinux Konabook 3100" */
@@ -6918,7 +7160,7 @@
 Index: src/via_timing.h
 ===================================================================
 --- src/via_timing.h	(.../tags/release_0_2_903)	(revision 0)
-+++ src/via_timing.h	(.../trunk)	(revision 696)
++++ src/via_timing.h	(.../trunk)	(revision 711)
 @@ -0,0 +1,51 @@
 +/*
 + * Copyright 2007-2008 Gabriel Mansi.


Index: xorg-x11-drv-openchrome.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-openchrome/devel/xorg-x11-drv-openchrome.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- xorg-x11-drv-openchrome.spec	30 Dec 2008 18:58:21 -0000	1.34
+++ xorg-x11-drv-openchrome.spec	5 Jan 2009 19:43:26 -0000	1.35
@@ -10,7 +10,7 @@
 Summary:	Xorg X11 openchrome video driver
 Name:		xorg-x11-drv-openchrome
 Version:	0.2.903
-Release:	4%{?dist}
+Release:	5%{?dist}
 URL:		http://www.openchrome.org
 License:	MIT
 Group:		User Interface/X Hardware Support
@@ -123,6 +123,9 @@
 
 
 %changelog
+* Mon Jan 05 2008 Xavier Bachelot <xavier at bachelot.org> - 0.2.903-5
+- Update to latest snapshot (svn 711), fix hardware cursor and add VX800 Xv.
+
 * Tue Dec 30 2008 Xavier Bachelot <xavier at bachelot.org> - 0.2.903-4
 - Fix autoreconf call.
 



From caillon at fedoraproject.org  Mon Jan  5 19:45:31 2009
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Mon,  5 Jan 2009 19:45:31 +0000 (UTC)
Subject: rpms/epiphany/F-10 python-paths.patch,1.2,NONE
Message-ID: <20090105194531.2A48B70108@cvs1.fedora.phx.redhat.com>

Author: caillon

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

Removed Files:
	python-paths.patch 
Log Message:
Unneeded patch in 2.24.2.1



--- python-paths.patch DELETED ---



From xavierb at fedoraproject.org  Mon Jan  5 19:46:42 2009
From: xavierb at fedoraproject.org (Xavier Bachelot)
Date: Mon,  5 Jan 2009 19:46:42 +0000 (UTC)
Subject: rpms/xorg-x11-drv-openchrome/devel xorg-x11-drv-openchrome.spec,
	1.35, 1.36
Message-ID: <20090105194642.73AC070108@cvs1.fedora.phx.redhat.com>

Author: xavierb

Update of /cvs/pkgs/rpms/xorg-x11-drv-openchrome/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9366

Modified Files:
	xorg-x11-drv-openchrome.spec 
Log Message:
date typo in changelog


Index: xorg-x11-drv-openchrome.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-openchrome/devel/xorg-x11-drv-openchrome.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- xorg-x11-drv-openchrome.spec	5 Jan 2009 19:43:26 -0000	1.35
+++ xorg-x11-drv-openchrome.spec	5 Jan 2009 19:46:11 -0000	1.36
@@ -123,7 +123,7 @@
 
 
 %changelog
-* Mon Jan 05 2008 Xavier Bachelot <xavier at bachelot.org> - 0.2.903-5
+* Mon Jan 05 2009 Xavier Bachelot <xavier at bachelot.org> - 0.2.903-5
 - Update to latest snapshot (svn 711), fix hardware cursor and add VX800 Xv.
 
 * Tue Dec 30 2008 Xavier Bachelot <xavier at bachelot.org> - 0.2.903-4



From steved at fedoraproject.org  Mon Jan  5 19:49:20 2009
From: steved at fedoraproject.org (Steve Dickson)
Date: Mon,  5 Jan 2009 19:49:20 +0000 (UTC)
Subject: rpms/nfs-utils/F-9 nfs-utils-1.1.2-gssd-verbosity.patch, NONE,
	1.1 nfs-utils.spec, 1.178, 1.179
Message-ID: <20090105194920.EFEA870108@cvs1.fedora.phx.redhat.com>

Author: steved

Update of /cvs/pkgs/rpms/nfs-utils/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10144

Modified Files:
	nfs-utils.spec 
Added Files:
	nfs-utils-1.1.2-gssd-verbosity.patch 
Log Message:
gssd: By default, don't spam syslog when users' credentials expire


nfs-utils-1.1.2-gssd-verbosity.patch:

--- NEW FILE nfs-utils-1.1.2-gssd-verbosity.patch ---
commit 09c7ad1cd9c5ca2fc46631a0057d47309abc8706
Author: Kevin Coffman <kwc at citi.umich.edu>
Date:   Mon Jan 5 14:07:05 2009 -0500

    gssd: By default, don't spam syslog when users' credentials expire
    
    Change the priority of "common" log messages so that syslog doesn't get
    slammed/spammed when users' credentials expire, or there is another
    common
    problem which would cause error messages for all context creation
    requests.
    
    Note that this will now require that gssd or svcgssd option "-v" is used
    to
    debug these common cases.
    
    Original patch from Andrew Pollock <apollock at google.com>.
    
    Signed-off-by: Kevin Coffman <kwc at citi.umich.edu>
    Signed-off-by: Steve Dickson <steved at redhat.com>
    CC: Andrew Pollock <apollock at google.com>

diff --git a/utils/gssd/gss_util.c b/utils/gssd/gss_util.c
index 8a7bcaa..2d66be9 100644
--- a/utils/gssd/gss_util.c
+++ b/utils/gssd/gss_util.c
@@ -216,7 +216,7 @@ gssd_acquire_cred(char *server_name)
 		ignore_maj_stat = gss_display_name(&ignore_min_stat,
 				target_name, &pbuf, NULL);
 		if (ignore_maj_stat == GSS_S_COMPLETE) {
-			printerr(0, "Unable to obtain credentials for '%.*s'\n",
+			printerr(1, "Unable to obtain credentials for '%.*s'\n",
 				 pbuf.length, pbuf.value);
 			ignore_maj_stat = gss_release_buffer(&ignore_min_stat,
 							     &pbuf);
diff --git a/utils/gssd/gssd_proc.c b/utils/gssd/gssd_proc.c
index cb14d45..91fc8d2 100644
--- a/utils/gssd/gssd_proc.c
+++ b/utils/gssd/gssd_proc.c
@@ -448,7 +448,7 @@ do_downcall(int k5_fd, uid_t uid, struct authgss_private_data *pd,
 	return 0;
 out_err:
 	if (buf) free(buf);
-	printerr(0, "Failed to write downcall!\n");
+	printerr(1, "Failed to write downcall!\n");
 	return -1;
 }
 
@@ -741,14 +741,14 @@ handle_krb5_upcall(struct clnt_info *clp)
 			}
 			gssd_free_krb5_machine_cred_list(credlist);
 			if (!success) {
-				printerr(0, "WARNING: Failed to create krb5 context "
+				printerr(1, "WARNING: Failed to create krb5 context "
 					 "for user with uid %d with any "
 					 "credentials cache for server %s\n",
 					 uid, clp->servername);
 				goto out_return_error;
 			}
 		} else {
-			printerr(0, "WARNING: Failed to create krb5 context "
+			printerr(1, "WARNING: Failed to create krb5 context "
 				 "for user with uid %d for server %s\n",
 				 uid, clp->servername);
 			goto out_return_error;
@@ -756,7 +756,7 @@ handle_krb5_upcall(struct clnt_info *clp)
 	}
 
 	if (!authgss_get_private_data(auth, &pd)) {
-		printerr(0, "WARNING: Failed to obtain authentication "
+		printerr(1, "WARNING: Failed to obtain authentication "
 			    "data for user with uid %d for server %s\n",
 			 uid, clp->servername);
 		goto out_return_error;
diff --git a/utils/gssd/krb5_util.c b/utils/gssd/krb5_util.c
index 77814bc..d4ee631 100644
--- a/utils/gssd/krb5_util.c
+++ b/utils/gssd/krb5_util.c
@@ -399,7 +399,7 @@ gssd_get_single_krb5_cred(krb5_context context,
 		goto out;
 	}
 	if (krb5_get_init_creds_opt_set_addressless(context, init_opts, 1))
-		printerr(0, "WARNING: Unable to set option for addressless "
+		printerr(1, "WARNING: Unable to set option for addressless "
 			 "tickets.  May have problems behind a NAT.\n");
 #ifdef TEST_SHORT_LIFETIME
 	/* set a short lifetime (for debugging only!) */
@@ -422,7 +422,7 @@ gssd_get_single_krb5_cred(krb5_context context,
 
 	if ((code = krb5_get_init_creds_keytab(context, &my_creds, ple->princ,
 					       kt, 0, NULL, opts))) {
-		printerr(0, "WARNING: %s while getting initial ticket for "
+		printerr(1, "WARNING: %s while getting initial ticket for "
 			 "principal '%s' using keytab '%s'\n",
 			 gssd_k5_err_msg(context, code),
 			 pname ? pname : "<unparsable>", kt_name);
@@ -632,7 +632,7 @@ get_full_hostname(const char *inhost, char *outhost, int outhostlen)
 	/* Get full target hostname */
 	retval = getaddrinfo(inhost, NULL, &hints, &addrs);
 	if (retval) {
-		printerr(0, "%s while getting full hostname for '%s'\n",
+		printerr(1, "%s while getting full hostname for '%s'\n",
 			 gai_strerror(retval), inhost);
 		goto out;
 	}
diff --git a/utils/gssd/svcgssd_proc.c b/utils/gssd/svcgssd_proc.c
index f162152..1d13532 100644
--- a/utils/gssd/svcgssd_proc.c
+++ b/utils/gssd/svcgssd_proc.c
@@ -108,7 +108,7 @@ do_svc_downcall(gss_buffer_desc *out_handle, struct svc_cred *cred,
 	fclose(f);
 	return err;
 out_err:
-	printerr(0, "WARNING: downcall failed\n");
+	printerr(1, "WARNING: downcall failed\n");
 	return -1;
 }
 
@@ -247,7 +247,7 @@ get_ids(gss_name_t client_name, gss_OID mech, struct svc_cred *cred)
 			res = 0;
 			goto out_free;
 		}
-		printerr(0, "WARNING: get_ids: failed to map name '%s' "
+		printerr(1, "WARNING: get_ids: failed to map name '%s' "
 			"to uid/gid: %s\n", sname, strerror(-res));
 		goto out_free;
 	}
@@ -380,7 +380,7 @@ handle_nullreq(FILE *f) {
 		goto continue_needed;
 	}
 	else if (maj_stat != GSS_S_COMPLETE) {
-		printerr(0, "WARNING: gss_accept_sec_context failed\n");
+		printerr(1, "WARNING: gss_accept_sec_context failed\n");
 		pgsserr("handle_nullreq: gss_accept_sec_context",
 			maj_stat, min_stat, mech);
 		goto out_err;


Index: nfs-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nfs-utils/F-9/nfs-utils.spec,v
retrieving revision 1.178
retrieving revision 1.179
diff -u -r1.178 -r1.179
--- nfs-utils.spec	5 Jan 2009 18:26:56 -0000	1.178
+++ nfs-utils.spec	5 Jan 2009 19:48:50 -0000	1.179
@@ -35,6 +35,7 @@
 Patch10: nfs-utils-1.1.0-smnotify-path.patch
 Patch11: nfs-utils-1.1.2-tcpwrapper-update.patch
 Patch12: nfs-utils-1.1.2-tcpwrap-warn.patch
+Patch13: nfs-utils-1.1.2-gssd-verbosity.patch
 
 %if %{enablefscache}
 Patch90: nfs-utils-1.1.0-mount-fsc.patch
@@ -98,6 +99,7 @@
 %patch10 -p1
 %patch11 -p1
 %patch12 -p1
+%patch13 -p1
 
 %if %{enablefscache}
 %patch90 -p1
@@ -264,6 +266,7 @@
 * Mon Jan  5 2009 Steve Dickson <steved at redhat.com> 1.1.2-9
 - Added warnings to tcp wrapper code when mounts are 
   denied due to misconfigured DNS configurations.
+- gssd: By default, don't spam syslog when users' credentials expire
 
 * Sat Dec 20 2008 Steve Dickson <steved at redhat.com> 1.1.2-8
 - Re-enabled and fixed/enhanced tcp wrappers.



From drepper at fedoraproject.org  Mon Jan  5 19:51:32 2009
From: drepper at fedoraproject.org (Ulrich Drepper)
Date: Mon,  5 Jan 2009 19:51:32 +0000 (UTC)
Subject: rpms/pfstools/devel import.log, NONE, 1.1 pfstools-1.7.0-bf1.patch, 
	NONE, 1.1 pfstools-mDATA.patch, NONE, 1.1 pfstools.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090105195132.A1A2F70108@cvs1.fedora.phx.redhat.com>

Author: drepper

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

Modified Files:
	.cvsignore sources 
Added Files:
	import.log pfstools-1.7.0-bf1.patch pfstools-mDATA.patch 
	pfstools.spec 
Log Message:
pfstools for F11, initial checkin.



--- NEW FILE import.log ---
pfstools-1_7_0-2_fc10:HEAD:pfstools-1.7.0-2.fc10.src.rpm:1231185011

pfstools-1.7.0-bf1.patch:

--- NEW FILE pfstools-1.7.0-bf1.patch ---
diff -up pfstools-1.7.0/src/fileformat/Makefile.am-old pfstools-1.7.0/src/fileformat/Makefile.am
--- pfstools-1.7.0/src/fileformat/Makefile.am-old	2009-01-02 13:17:32.000000000 -0800
+++ pfstools-1.7.0/src/fileformat/Makefile.am	2009-01-02 13:18:14.000000000 -0800
@@ -96,6 +96,7 @@ endif
 
 if GDAL_SUPPORT
 pfsingdal_SOURCES = pfsingdal.cpp
+pfsingdal_CXXFLAGS = $(shell /usr/bin/gdal-config --cflags)
 pfsingdal_LDADD = $(GDAL_LIBS)
 endif
 
diff -up pfstools-1.7.0/src/fileformat/pfsingdal.cpp-old pfstools-1.7.0/src/fileformat/pfsingdal.cpp

pfstools-mDATA.patch:

--- NEW FILE pfstools-mDATA.patch ---
--- pfstools-1.6.5/src/octave/Makefile.am-old	2008-10-12 09:57:46.000000000 -0700
+++ pfstools-1.6.5/src/octave/Makefile.am	2008-10-12 09:57:58.000000000 -0700
@@ -15,7 +15,7 @@
 help_h_files = $(help_files:.help=_help.h) 
 
 oct_SCRIPTS = $(linked_oct_files) 
-m_SCRIPTS = $(m_oct_files)
+m_DATA = $(m_oct_files)
 
 bin_SCRIPTS = pfsoctavelum pfsoctavergb pfsstat
 man_MANS = pfsoctavelum.1 pfsoctavergb.1 pfsstat.1


--- NEW FILE pfstools.spec ---
Name:		pfstools
Version:	1.7.0
Release:	2%{?dist}
Summary:	Programs for handling high-dynamic range images

Group:		Applications/Multimedia
License:	GPLv2+
URL:		http://pfstools.sourceforge.net/
Source0:	http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
Patch1:		pfstools-mDATA.patch
Patch2:		pfstools-1.7.0-bf1.patch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	automake
BuildRequires:	libtool
BuildRequires:	libtiff-devel
BuildRequires:	openexr-devel
BuildRequires:	octave-devel
BuildRequires:	libGL-devel
BuildRequires:	ImageMagick-devel
BuildRequires:	freeglut-devel
BuildRequires:	ImageMagick-c++-devel
BuildRequires:	qt3-devel
BuildRequires:	libXi-devel
BuildRequires:	netpbm-devel
BuildRequires:	texlive-latex
BuildRequires:	gdal-devel
Requires:	pfstools-libs = %{version}-%{release}

%description
pfstools is a set of command line programs for reading,
writing, manipulating and viewing high-dynamic range (HDR) images and
video frames. All programs in the package exchange data using unix
pipes and a simple generic HDR image format (pfs). The concept of the
pfstools is similar to netpbm package for low-dynamic range images.


%package libs
Summary:	Libraries for HDR processing
Group:		System Environment/Libraries
License:	LGPLv2+

%description libs
The pfstools-libs package contains a runtime library of functions for
handling HDR graphics files.


%package qt
Summary:	Qt-based viewer for HDR files
Group:		Applications/Multimedia
Requires:	pfstools-libs = %{version}-%{release}

%description qt
The pfstools-qt package contains viewer programs based on qt3 for
viewing HDR graphics files.


%package glview
Summary:	GL-based viewer for HDR files
Group:		Applications/Multimedia
Requires:	pfstools-libs = %{version}-%{release}

%description glview
The pfstools-glview package contains viewer programs based on OpenGL for
viewing HDR graphics files.


%package exr
Summary:	EXR file import for PFS tools
Group:		Applications/Multimedia
Requires:	pfstools-libs = %{version}-%{release}

%description exr
The pfstools-exr package contains input and output filters for EXR files
to and from the HDR graphics file format used in pfstools.


%package imgmagick
Summary:	ImageMagick file import for PFS tools
Group:		Applications/Multimedia
Requires:	pfstools-libs = %{version}-%{release}

%description imgmagick
The pfstools-exr package contains input and output filters based in
ImageMagick to and from the HDR graphics file format used in pfstools.


%package octave
Summary:	Octave interaction with PFS tools
Group:		Applications/Multimedia

%description octave
The pfstools-octave package contains programs to process red, green and blue
channels or luminance channels in pfs stream using Octave.


%package gdal
Summary:	PFS Tools using the GDAL library to handle GIS information
Group:		Applications/Multimedia

%description gdal
The pfstools-gdal package contains programs which can handle GIS information
using the GDAL library.


%package devel
Summary:	Files for development with PFS tools
Group:		Development/Libraries
Requires:	pfstools-libs = %{version}-%{release}

%description devel
The netpbm-devel package contains the header files and link libraries,
etc., for developing programs which can handle HDR graphics files.


%prep
%setup -q
%patch1 -p1 -b .mDATA
%patch2 -p1 -b .bf1
# Remove the following once the patch for the Makefile.am file
# is not necessary anymore.
aclocal
automake
libtoolize --automake


%build
%configure
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
mkdir -p ${RPM_BUILD_ROOT}%{_prefix}
make DESTDIR=$RPM_BUILD_ROOT "INSTALL=install -p" install

# XXX Nuke unpackaged files
{ cd ${RPM_BUILD_ROOT}
  rm -f .%{_libdir}/libpfs-1.2.a
  rm -f .%{_libdir}/libpfs-1.2.la
  rm -f .%{_mandir}/man1/pfsinjpeghdr.1
  rm -f .%{_mandir}/man1/pfsoutjpeghdr.1
}


%clean
rm -rf $RPM_BUILD_ROOT


%post libs -p /sbin/ldconfig


%postun libs -p /sbin/ldconfig


%files
%defattr(-,root,root,-)
%doc README TODO doc/faq.txt
%{_bindir}/pfsabsolute
%{_bindir}/pfscat
%{_bindir}/pfsclamp
%{_bindir}/pfscut
%{_bindir}/pfsextractchannels
%{_bindir}/pfsdisplayfunction
%{_bindir}/pfsflip
%{_bindir}/pfsgamma
%{_bindir}/pfsin
%{_bindir}/pfsindcraw
%{_bindir}/pfsinmulti
%{_bindir}/pfsinpfm
%{_bindir}/pfsinppm
%{_bindir}/pfsinrgbe
%{_bindir}/pfsintiff
%{_bindir}/pfsout
%{_bindir}/pfsoutffmpeg
%{_bindir}/pfsoutpfm
%{_bindir}/pfsoutppm
%{_bindir}/pfsoutrgbe
%{_bindir}/pfsouttiff
%{_bindir}/pfspad
%{_bindir}/pfspanoramic
%{_bindir}/pfsrotate
%{_bindir}/pfssize
%{_bindir}/pfstag
%{_mandir}/man1/pfsabsolute.1.gz
%{_mandir}/man1/pfscat.1.gz
%{_mandir}/man1/pfsclamp.1.gz
%{_mandir}/man1/pfscut.1.gz
%{_mandir}/man1/pfsdisplayfunction.1.gz
%{_mandir}/man1/pfsextractchannels.1.gz
%{_mandir}/man1/pfsflip.1.gz
%{_mandir}/man1/pfsgamma.1.gz
%{_mandir}/man1/pfsin.1.gz
%{_mandir}/man1/pfsindcraw.1.gz
%{_mandir}/man1/pfsinmulti.1.gz
%{_mandir}/man1/pfsinpfm.1.gz
%{_mandir}/man1/pfsinppm.1.gz
%{_mandir}/man1/pfsinrgbe.1.gz
%{_mandir}/man1/pfsintiff.1.gz
%{_mandir}/man1/pfsout.1.gz
%{_mandir}/man1/pfsoutffmpeg.1.gz
%{_mandir}/man1/pfsoutpfm.1.gz
%{_mandir}/man1/pfsoutppm.1.gz
%{_mandir}/man1/pfsoutrgbe.1.gz
%{_mandir}/man1/pfsouttiff.1.gz
%{_mandir}/man1/pfspad.1.gz
%{_mandir}/man1/pfspanoramic.1.gz
%{_mandir}/man1/pfsrotate.1.gz
%{_mandir}/man1/pfssize.1.gz
%{_mandir}/man1/pfstag.1.gz
%doc

%files libs
%defattr(-,root,root,-)
%{_libdir}/libpfs-1.2.so.0
%{_libdir}/libpfs-1.2.so.0.0.0

%files qt
%defattr(-,root,root,-)
%{_bindir}/pfsv
%{_bindir}/pfsview
%{_mandir}/man1/pfsv.1.gz
%{_mandir}/man1/pfsview.1.gz

%files glview
%defattr(-,root,root,-)
%{_bindir}/pfsglview
%{_mandir}/man1/pfsglview.1.gz

%files exr
%defattr(-,root,root,-)
%{_bindir}/pfsinexr
%{_bindir}/pfsoutexr
%{_mandir}/man1/pfsinexr.1.gz
%{_mandir}/man1/pfsoutexr.1.gz

%files imgmagick
%defattr(-,root,root,-)
%{_bindir}/pfsinimgmagick
%{_bindir}/pfsoutimgmagick
%{_mandir}/man1/pfsinimgmagick.1.gz
%{_mandir}/man1/pfsoutimgmagick.1.gz

%files octave
%defattr(-,root,root,-)
%{_bindir}/pfsoctavelum
%{_bindir}/pfsoctavergb
%{_bindir}/pfsstat
%{_libexecdir}/octave/*/site/oct/*/pfstools/
#%{_libexecdir}/octave/*/site/oct/*/pfstools/*.oct
%{_datadir}/octave/*/site/m/pfstools/*.m
%{_mandir}/man1/pfsoctavelum.1.gz
%{_mandir}/man1/pfsoctavergb.1.gz
%{_mandir}/man1/pfsstat.1.gz

%files gdal
%defattr(-,root,root,-)
%{_bindir}/pfsingdal
%{_mandir}/man1/pfsingdal.1.gz

%files devel
%defattr(-,root,root,-)
%doc doc/pfs_format_spec.pdf
%{_libdir}/libpfs-1.2.so
%{_libdir}/pkgconfig/pfs.pc
%{_includedir}/pfs-1.2/array2d.h
%{_includedir}/pfs-1.2/pfs.h

%changelog

* Mon Jan 5 2009 Ulrich Drepper <drepper at redhat.com> - 1.7.0-2
- Fix BuildRequires

* Fri Jan 1 2009 Ulrich Drepper <drepper at redhat.com> - 1.7.0-1
- update to most recent upstream release
  - new subpackage pfstools-gdal for GIS data handling
  - new program pfsdisplayfunction

* Fri Jan 1 2009 Ulrich Drepper <drepper at redhat.com> - 1.6.5-5
- add automake BuildRequires

* Wed Nov 5 2008 Ulrich Drepper <drepper at redhat.com> - 1.6.5-4
- ship more doc files

* Sun Oct 12 2008 Ulrich Drepper <drepper at redhat.com> - 1.6.5-3
- .spec file cleanups
- install Octave files without execution permission

* Wed Sep 03 2008 Manuel Wolfshant <wolfy at fedoraproject.org> - 1.6.5-2
- fix missing BR, Source URL, double inclusion of several files
- preserve timestamps

* Tue Aug 19 2008 Ulrich Drepper <drepper at redhat.com> - 1.6.5-1
- Initial package.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pfstools/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	4 Jan 2009 20:36:52 -0000	1.1
+++ .cvsignore	5 Jan 2009 19:51:02 -0000	1.2
@@ -0,0 +1 @@
+pfstools-1.7.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pfstools/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	4 Jan 2009 20:36:52 -0000	1.1
+++ sources	5 Jan 2009 19:51:02 -0000	1.2
@@ -0,0 +1 @@
+baf058fcdc6ac040c210dc5a4a607d1d  pfstools-1.7.0.tar.gz



From caillon at fedoraproject.org  Mon Jan  5 19:52:00 2009
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Mon,  5 Jan 2009 19:52:00 +0000 (UTC)
Subject: rpms/iso-codes/devel .cvsignore, 1.21, 1.22 iso-codes.spec, 1.27,
	1.28 sources, 1.22, 1.23
Message-ID: <20090105195200.6665D70108@cvs1.fedora.phx.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/iso-codes/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11228

Modified Files:
	.cvsignore iso-codes.spec sources 
Log Message:
* Mon Jan  5 2009 Christopher Aillon <caillon at redhat.com> - 3.5.1-1
- Update to 3.5.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/iso-codes/devel/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- .cvsignore	9 Dec 2008 21:46:28 -0000	1.21
+++ .cvsignore	5 Jan 2009 19:51:30 -0000	1.22
@@ -1 +1 @@
-iso-codes-3.5.tar.bz2
+iso-codes-3.5.1.tar.bz2


Index: iso-codes.spec
===================================================================
RCS file: /cvs/extras/rpms/iso-codes/devel/iso-codes.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- iso-codes.spec	9 Dec 2008 21:46:28 -0000	1.27
+++ iso-codes.spec	5 Jan 2009 19:51:30 -0000	1.28
@@ -1,7 +1,7 @@
 Name:	iso-codes
 Summary:	ISO code lists and translations
 
-Version:	3.5
+Version:	3.5.1
 Release:	1%{?dist}
 License:	LGPLv2+
 Group:	System Environment/Base
@@ -59,6 +59,9 @@
 %{_datadir}/pkgconfig/iso-codes.pc
 
 %changelog
+* Mon Jan  5 2009 Christopher Aillon <caillon at redhat.com> - 3.5.1-1
+- Update to 3.5.1
+
 * Tue Dec  9 2008 Christopher Aillon <caillon at redhat.com> - 3.5-1
 - Update to 3.5
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/iso-codes/devel/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- sources	9 Dec 2008 21:46:28 -0000	1.22
+++ sources	5 Jan 2009 19:51:30 -0000	1.23
@@ -1 +1 @@
-b11fe4878baf098cdbf28c417796d87e  iso-codes-3.5.tar.bz2
+16d01d84888c0343304e84fc251bc07c  iso-codes-3.5.1.tar.bz2



From drepper at fedoraproject.org  Mon Jan  5 19:53:34 2009
From: drepper at fedoraproject.org (Ulrich Drepper)
Date: Mon,  5 Jan 2009 19:53:34 +0000 (UTC)
Subject: rpms/pfstools/F-9 import.log, NONE, 1.1 pfstools-1.7.0-bf1.patch,
	NONE, 1.1 pfstools-mDATA.patch, NONE, 1.1 pfstools.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090105195334.B711870108@cvs1.fedora.phx.redhat.com>

Author: drepper

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

Modified Files:
	.cvsignore sources 
Added Files:
	import.log pfstools-1.7.0-bf1.patch pfstools-mDATA.patch 
	pfstools.spec 
Log Message:
pfstools for F9, initial checkin.



--- NEW FILE import.log ---
pfstools-1_7_0-2_fc10:F-9:pfstools-1.7.0-2.fc10.src.rpm:1231185149

pfstools-1.7.0-bf1.patch:

--- NEW FILE pfstools-1.7.0-bf1.patch ---
diff -up pfstools-1.7.0/src/fileformat/Makefile.am-old pfstools-1.7.0/src/fileformat/Makefile.am
--- pfstools-1.7.0/src/fileformat/Makefile.am-old	2009-01-02 13:17:32.000000000 -0800
+++ pfstools-1.7.0/src/fileformat/Makefile.am	2009-01-02 13:18:14.000000000 -0800
@@ -96,6 +96,7 @@ endif
 
 if GDAL_SUPPORT
 pfsingdal_SOURCES = pfsingdal.cpp
+pfsingdal_CXXFLAGS = $(shell /usr/bin/gdal-config --cflags)
 pfsingdal_LDADD = $(GDAL_LIBS)
 endif
 
diff -up pfstools-1.7.0/src/fileformat/pfsingdal.cpp-old pfstools-1.7.0/src/fileformat/pfsingdal.cpp

pfstools-mDATA.patch:

--- NEW FILE pfstools-mDATA.patch ---
--- pfstools-1.6.5/src/octave/Makefile.am-old	2008-10-12 09:57:46.000000000 -0700
+++ pfstools-1.6.5/src/octave/Makefile.am	2008-10-12 09:57:58.000000000 -0700
@@ -15,7 +15,7 @@
 help_h_files = $(help_files:.help=_help.h) 
 
 oct_SCRIPTS = $(linked_oct_files) 
-m_SCRIPTS = $(m_oct_files)
+m_DATA = $(m_oct_files)
 
 bin_SCRIPTS = pfsoctavelum pfsoctavergb pfsstat
 man_MANS = pfsoctavelum.1 pfsoctavergb.1 pfsstat.1


--- NEW FILE pfstools.spec ---
Name:		pfstools
Version:	1.7.0
Release:	2%{?dist}
Summary:	Programs for handling high-dynamic range images

Group:		Applications/Multimedia
License:	GPLv2+
URL:		http://pfstools.sourceforge.net/
Source0:	http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
Patch1:		pfstools-mDATA.patch
Patch2:		pfstools-1.7.0-bf1.patch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	automake
BuildRequires:	libtool
BuildRequires:	libtiff-devel
BuildRequires:	openexr-devel
BuildRequires:	octave-devel
BuildRequires:	libGL-devel
BuildRequires:	ImageMagick-devel
BuildRequires:	freeglut-devel
BuildRequires:	ImageMagick-c++-devel
BuildRequires:	qt3-devel
BuildRequires:	libXi-devel
BuildRequires:	netpbm-devel
BuildRequires:	texlive-latex
BuildRequires:	gdal-devel
Requires:	pfstools-libs = %{version}-%{release}

%description
pfstools is a set of command line programs for reading,
writing, manipulating and viewing high-dynamic range (HDR) images and
video frames. All programs in the package exchange data using unix
pipes and a simple generic HDR image format (pfs). The concept of the
pfstools is similar to netpbm package for low-dynamic range images.


%package libs
Summary:	Libraries for HDR processing
Group:		System Environment/Libraries
License:	LGPLv2+

%description libs
The pfstools-libs package contains a runtime library of functions for
handling HDR graphics files.


%package qt
Summary:	Qt-based viewer for HDR files
Group:		Applications/Multimedia
Requires:	pfstools-libs = %{version}-%{release}

%description qt
The pfstools-qt package contains viewer programs based on qt3 for
viewing HDR graphics files.


%package glview
Summary:	GL-based viewer for HDR files
Group:		Applications/Multimedia
Requires:	pfstools-libs = %{version}-%{release}

%description glview
The pfstools-glview package contains viewer programs based on OpenGL for
viewing HDR graphics files.


%package exr
Summary:	EXR file import for PFS tools
Group:		Applications/Multimedia
Requires:	pfstools-libs = %{version}-%{release}

%description exr
The pfstools-exr package contains input and output filters for EXR files
to and from the HDR graphics file format used in pfstools.


%package imgmagick
Summary:	ImageMagick file import for PFS tools
Group:		Applications/Multimedia
Requires:	pfstools-libs = %{version}-%{release}

%description imgmagick
The pfstools-exr package contains input and output filters based in
ImageMagick to and from the HDR graphics file format used in pfstools.


%package octave
Summary:	Octave interaction with PFS tools
Group:		Applications/Multimedia

%description octave
The pfstools-octave package contains programs to process red, green and blue
channels or luminance channels in pfs stream using Octave.


%package gdal
Summary:	PFS Tools using the GDAL library to handle GIS information
Group:		Applications/Multimedia

%description gdal
The pfstools-gdal package contains programs which can handle GIS information
using the GDAL library.


%package devel
Summary:	Files for development with PFS tools
Group:		Development/Libraries
Requires:	pfstools-libs = %{version}-%{release}

%description devel
The netpbm-devel package contains the header files and link libraries,
etc., for developing programs which can handle HDR graphics files.


%prep
%setup -q
%patch1 -p1 -b .mDATA
%patch2 -p1 -b .bf1
# Remove the following once the patch for the Makefile.am file
# is not necessary anymore.
aclocal
automake
libtoolize --automake


%build
%configure
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
mkdir -p ${RPM_BUILD_ROOT}%{_prefix}
make DESTDIR=$RPM_BUILD_ROOT "INSTALL=install -p" install

# XXX Nuke unpackaged files
{ cd ${RPM_BUILD_ROOT}
  rm -f .%{_libdir}/libpfs-1.2.a
  rm -f .%{_libdir}/libpfs-1.2.la
  rm -f .%{_mandir}/man1/pfsinjpeghdr.1
  rm -f .%{_mandir}/man1/pfsoutjpeghdr.1
}


%clean
rm -rf $RPM_BUILD_ROOT


%post libs -p /sbin/ldconfig


%postun libs -p /sbin/ldconfig


%files
%defattr(-,root,root,-)
%doc README TODO doc/faq.txt
%{_bindir}/pfsabsolute
%{_bindir}/pfscat
%{_bindir}/pfsclamp
%{_bindir}/pfscut
%{_bindir}/pfsextractchannels
%{_bindir}/pfsdisplayfunction
%{_bindir}/pfsflip
%{_bindir}/pfsgamma
%{_bindir}/pfsin
%{_bindir}/pfsindcraw
%{_bindir}/pfsinmulti
%{_bindir}/pfsinpfm
%{_bindir}/pfsinppm
%{_bindir}/pfsinrgbe
%{_bindir}/pfsintiff
%{_bindir}/pfsout
%{_bindir}/pfsoutffmpeg
%{_bindir}/pfsoutpfm
%{_bindir}/pfsoutppm
%{_bindir}/pfsoutrgbe
%{_bindir}/pfsouttiff
%{_bindir}/pfspad
%{_bindir}/pfspanoramic
%{_bindir}/pfsrotate
%{_bindir}/pfssize
%{_bindir}/pfstag
%{_mandir}/man1/pfsabsolute.1.gz
%{_mandir}/man1/pfscat.1.gz
%{_mandir}/man1/pfsclamp.1.gz
%{_mandir}/man1/pfscut.1.gz
%{_mandir}/man1/pfsdisplayfunction.1.gz
%{_mandir}/man1/pfsextractchannels.1.gz
%{_mandir}/man1/pfsflip.1.gz
%{_mandir}/man1/pfsgamma.1.gz
%{_mandir}/man1/pfsin.1.gz
%{_mandir}/man1/pfsindcraw.1.gz
%{_mandir}/man1/pfsinmulti.1.gz
%{_mandir}/man1/pfsinpfm.1.gz
%{_mandir}/man1/pfsinppm.1.gz
%{_mandir}/man1/pfsinrgbe.1.gz
%{_mandir}/man1/pfsintiff.1.gz
%{_mandir}/man1/pfsout.1.gz
%{_mandir}/man1/pfsoutffmpeg.1.gz
%{_mandir}/man1/pfsoutpfm.1.gz
%{_mandir}/man1/pfsoutppm.1.gz
%{_mandir}/man1/pfsoutrgbe.1.gz
%{_mandir}/man1/pfsouttiff.1.gz
%{_mandir}/man1/pfspad.1.gz
%{_mandir}/man1/pfspanoramic.1.gz
%{_mandir}/man1/pfsrotate.1.gz
%{_mandir}/man1/pfssize.1.gz
%{_mandir}/man1/pfstag.1.gz
%doc

%files libs
%defattr(-,root,root,-)
%{_libdir}/libpfs-1.2.so.0
%{_libdir}/libpfs-1.2.so.0.0.0

%files qt
%defattr(-,root,root,-)
%{_bindir}/pfsv
%{_bindir}/pfsview
%{_mandir}/man1/pfsv.1.gz
%{_mandir}/man1/pfsview.1.gz

%files glview
%defattr(-,root,root,-)
%{_bindir}/pfsglview
%{_mandir}/man1/pfsglview.1.gz

%files exr
%defattr(-,root,root,-)
%{_bindir}/pfsinexr
%{_bindir}/pfsoutexr
%{_mandir}/man1/pfsinexr.1.gz
%{_mandir}/man1/pfsoutexr.1.gz

%files imgmagick
%defattr(-,root,root,-)
%{_bindir}/pfsinimgmagick
%{_bindir}/pfsoutimgmagick
%{_mandir}/man1/pfsinimgmagick.1.gz
%{_mandir}/man1/pfsoutimgmagick.1.gz

%files octave
%defattr(-,root,root,-)
%{_bindir}/pfsoctavelum
%{_bindir}/pfsoctavergb
%{_bindir}/pfsstat
%{_libexecdir}/octave/*/site/oct/*/pfstools/
#%{_libexecdir}/octave/*/site/oct/*/pfstools/*.oct
%{_datadir}/octave/*/site/m/pfstools/*.m
%{_mandir}/man1/pfsoctavelum.1.gz
%{_mandir}/man1/pfsoctavergb.1.gz
%{_mandir}/man1/pfsstat.1.gz

%files gdal
%defattr(-,root,root,-)
%{_bindir}/pfsingdal
%{_mandir}/man1/pfsingdal.1.gz

%files devel
%defattr(-,root,root,-)
%doc doc/pfs_format_spec.pdf
%{_libdir}/libpfs-1.2.so
%{_libdir}/pkgconfig/pfs.pc
%{_includedir}/pfs-1.2/array2d.h
%{_includedir}/pfs-1.2/pfs.h

%changelog

* Mon Jan 5 2009 Ulrich Drepper <drepper at redhat.com> - 1.7.0-2
- Fix BuildRequires

* Fri Jan 1 2009 Ulrich Drepper <drepper at redhat.com> - 1.7.0-1
- update to most recent upstream release
  - new subpackage pfstools-gdal for GIS data handling
  - new program pfsdisplayfunction

* Fri Jan 1 2009 Ulrich Drepper <drepper at redhat.com> - 1.6.5-5
- add automake BuildRequires

* Wed Nov 5 2008 Ulrich Drepper <drepper at redhat.com> - 1.6.5-4
- ship more doc files

* Sun Oct 12 2008 Ulrich Drepper <drepper at redhat.com> - 1.6.5-3
- .spec file cleanups
- install Octave files without execution permission

* Wed Sep 03 2008 Manuel Wolfshant <wolfy at fedoraproject.org> - 1.6.5-2
- fix missing BR, Source URL, double inclusion of several files
- preserve timestamps

* Tue Aug 19 2008 Ulrich Drepper <drepper at redhat.com> - 1.6.5-1
- Initial package.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pfstools/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	4 Jan 2009 20:36:52 -0000	1.1
+++ .cvsignore	5 Jan 2009 19:53:04 -0000	1.2
@@ -0,0 +1 @@
+pfstools-1.7.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pfstools/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	4 Jan 2009 20:36:52 -0000	1.1
+++ sources	5 Jan 2009 19:53:04 -0000	1.2
@@ -0,0 +1 @@
+baf058fcdc6ac040c210dc5a4a607d1d  pfstools-1.7.0.tar.gz



From drepper at fedoraproject.org  Mon Jan  5 19:55:38 2009
From: drepper at fedoraproject.org (Ulrich Drepper)
Date: Mon,  5 Jan 2009 19:55:38 +0000 (UTC)
Subject: rpms/pfstools/F-10 import.log, NONE, 1.1 pfstools-1.7.0-bf1.patch, 
	NONE, 1.1 pfstools-mDATA.patch, NONE, 1.1 pfstools.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090105195538.9342870108@cvs1.fedora.phx.redhat.com>

Author: drepper

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

Modified Files:
	.cvsignore sources 
Added Files:
	import.log pfstools-1.7.0-bf1.patch pfstools-mDATA.patch 
	pfstools.spec 
Log Message:
pfstools for F10, initial checkin.



--- NEW FILE import.log ---
pfstools-1_7_0-2_fc10:F-10:pfstools-1.7.0-2.fc10.src.rpm:1231185247

pfstools-1.7.0-bf1.patch:

--- NEW FILE pfstools-1.7.0-bf1.patch ---
diff -up pfstools-1.7.0/src/fileformat/Makefile.am-old pfstools-1.7.0/src/fileformat/Makefile.am
--- pfstools-1.7.0/src/fileformat/Makefile.am-old	2009-01-02 13:17:32.000000000 -0800
+++ pfstools-1.7.0/src/fileformat/Makefile.am	2009-01-02 13:18:14.000000000 -0800
@@ -96,6 +96,7 @@ endif
 
 if GDAL_SUPPORT
 pfsingdal_SOURCES = pfsingdal.cpp
+pfsingdal_CXXFLAGS = $(shell /usr/bin/gdal-config --cflags)
 pfsingdal_LDADD = $(GDAL_LIBS)
 endif
 
diff -up pfstools-1.7.0/src/fileformat/pfsingdal.cpp-old pfstools-1.7.0/src/fileformat/pfsingdal.cpp

pfstools-mDATA.patch:

--- NEW FILE pfstools-mDATA.patch ---
--- pfstools-1.6.5/src/octave/Makefile.am-old	2008-10-12 09:57:46.000000000 -0700
+++ pfstools-1.6.5/src/octave/Makefile.am	2008-10-12 09:57:58.000000000 -0700
@@ -15,7 +15,7 @@
 help_h_files = $(help_files:.help=_help.h) 
 
 oct_SCRIPTS = $(linked_oct_files) 
-m_SCRIPTS = $(m_oct_files)
+m_DATA = $(m_oct_files)
 
 bin_SCRIPTS = pfsoctavelum pfsoctavergb pfsstat
 man_MANS = pfsoctavelum.1 pfsoctavergb.1 pfsstat.1


--- NEW FILE pfstools.spec ---
Name:		pfstools
Version:	1.7.0
Release:	2%{?dist}
Summary:	Programs for handling high-dynamic range images

Group:		Applications/Multimedia
License:	GPLv2+
URL:		http://pfstools.sourceforge.net/
Source0:	http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
Patch1:		pfstools-mDATA.patch
Patch2:		pfstools-1.7.0-bf1.patch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	automake
BuildRequires:	libtool
BuildRequires:	libtiff-devel
BuildRequires:	openexr-devel
BuildRequires:	octave-devel
BuildRequires:	libGL-devel
BuildRequires:	ImageMagick-devel
BuildRequires:	freeglut-devel
BuildRequires:	ImageMagick-c++-devel
BuildRequires:	qt3-devel
BuildRequires:	libXi-devel
BuildRequires:	netpbm-devel
BuildRequires:	texlive-latex
BuildRequires:	gdal-devel
Requires:	pfstools-libs = %{version}-%{release}

%description
pfstools is a set of command line programs for reading,
writing, manipulating and viewing high-dynamic range (HDR) images and
video frames. All programs in the package exchange data using unix
pipes and a simple generic HDR image format (pfs). The concept of the
pfstools is similar to netpbm package for low-dynamic range images.


%package libs
Summary:	Libraries for HDR processing
Group:		System Environment/Libraries
License:	LGPLv2+

%description libs
The pfstools-libs package contains a runtime library of functions for
handling HDR graphics files.


%package qt
Summary:	Qt-based viewer for HDR files
Group:		Applications/Multimedia
Requires:	pfstools-libs = %{version}-%{release}

%description qt
The pfstools-qt package contains viewer programs based on qt3 for
viewing HDR graphics files.


%package glview
Summary:	GL-based viewer for HDR files
Group:		Applications/Multimedia
Requires:	pfstools-libs = %{version}-%{release}

%description glview
The pfstools-glview package contains viewer programs based on OpenGL for
viewing HDR graphics files.


%package exr
Summary:	EXR file import for PFS tools
Group:		Applications/Multimedia
Requires:	pfstools-libs = %{version}-%{release}

%description exr
The pfstools-exr package contains input and output filters for EXR files
to and from the HDR graphics file format used in pfstools.


%package imgmagick
Summary:	ImageMagick file import for PFS tools
Group:		Applications/Multimedia
Requires:	pfstools-libs = %{version}-%{release}

%description imgmagick
The pfstools-exr package contains input and output filters based in
ImageMagick to and from the HDR graphics file format used in pfstools.


%package octave
Summary:	Octave interaction with PFS tools
Group:		Applications/Multimedia

%description octave
The pfstools-octave package contains programs to process red, green and blue
channels or luminance channels in pfs stream using Octave.


%package gdal
Summary:	PFS Tools using the GDAL library to handle GIS information
Group:		Applications/Multimedia

%description gdal
The pfstools-gdal package contains programs which can handle GIS information
using the GDAL library.


%package devel
Summary:	Files for development with PFS tools
Group:		Development/Libraries
Requires:	pfstools-libs = %{version}-%{release}

%description devel
The netpbm-devel package contains the header files and link libraries,
etc., for developing programs which can handle HDR graphics files.


%prep
%setup -q
%patch1 -p1 -b .mDATA
%patch2 -p1 -b .bf1
# Remove the following once the patch for the Makefile.am file
# is not necessary anymore.
aclocal
automake
libtoolize --automake


%build
%configure
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
mkdir -p ${RPM_BUILD_ROOT}%{_prefix}
make DESTDIR=$RPM_BUILD_ROOT "INSTALL=install -p" install

# XXX Nuke unpackaged files
{ cd ${RPM_BUILD_ROOT}
  rm -f .%{_libdir}/libpfs-1.2.a
  rm -f .%{_libdir}/libpfs-1.2.la
  rm -f .%{_mandir}/man1/pfsinjpeghdr.1
  rm -f .%{_mandir}/man1/pfsoutjpeghdr.1
}


%clean
rm -rf $RPM_BUILD_ROOT


%post libs -p /sbin/ldconfig


%postun libs -p /sbin/ldconfig


%files
%defattr(-,root,root,-)
%doc README TODO doc/faq.txt
%{_bindir}/pfsabsolute
%{_bindir}/pfscat
%{_bindir}/pfsclamp
%{_bindir}/pfscut
%{_bindir}/pfsextractchannels
%{_bindir}/pfsdisplayfunction
%{_bindir}/pfsflip
%{_bindir}/pfsgamma
%{_bindir}/pfsin
%{_bindir}/pfsindcraw
%{_bindir}/pfsinmulti
%{_bindir}/pfsinpfm
%{_bindir}/pfsinppm
%{_bindir}/pfsinrgbe
%{_bindir}/pfsintiff
%{_bindir}/pfsout
%{_bindir}/pfsoutffmpeg
%{_bindir}/pfsoutpfm
%{_bindir}/pfsoutppm
%{_bindir}/pfsoutrgbe
%{_bindir}/pfsouttiff
%{_bindir}/pfspad
%{_bindir}/pfspanoramic
%{_bindir}/pfsrotate
%{_bindir}/pfssize
%{_bindir}/pfstag
%{_mandir}/man1/pfsabsolute.1.gz
%{_mandir}/man1/pfscat.1.gz
%{_mandir}/man1/pfsclamp.1.gz
%{_mandir}/man1/pfscut.1.gz
%{_mandir}/man1/pfsdisplayfunction.1.gz
%{_mandir}/man1/pfsextractchannels.1.gz
%{_mandir}/man1/pfsflip.1.gz
%{_mandir}/man1/pfsgamma.1.gz
%{_mandir}/man1/pfsin.1.gz
%{_mandir}/man1/pfsindcraw.1.gz
%{_mandir}/man1/pfsinmulti.1.gz
%{_mandir}/man1/pfsinpfm.1.gz
%{_mandir}/man1/pfsinppm.1.gz
%{_mandir}/man1/pfsinrgbe.1.gz
%{_mandir}/man1/pfsintiff.1.gz
%{_mandir}/man1/pfsout.1.gz
%{_mandir}/man1/pfsoutffmpeg.1.gz
%{_mandir}/man1/pfsoutpfm.1.gz
%{_mandir}/man1/pfsoutppm.1.gz
%{_mandir}/man1/pfsoutrgbe.1.gz
%{_mandir}/man1/pfsouttiff.1.gz
%{_mandir}/man1/pfspad.1.gz
%{_mandir}/man1/pfspanoramic.1.gz
%{_mandir}/man1/pfsrotate.1.gz
%{_mandir}/man1/pfssize.1.gz
%{_mandir}/man1/pfstag.1.gz
%doc

%files libs
%defattr(-,root,root,-)
%{_libdir}/libpfs-1.2.so.0
%{_libdir}/libpfs-1.2.so.0.0.0

%files qt
%defattr(-,root,root,-)
%{_bindir}/pfsv
%{_bindir}/pfsview
%{_mandir}/man1/pfsv.1.gz
%{_mandir}/man1/pfsview.1.gz

%files glview
%defattr(-,root,root,-)
%{_bindir}/pfsglview
%{_mandir}/man1/pfsglview.1.gz

%files exr
%defattr(-,root,root,-)
%{_bindir}/pfsinexr
%{_bindir}/pfsoutexr
%{_mandir}/man1/pfsinexr.1.gz
%{_mandir}/man1/pfsoutexr.1.gz

%files imgmagick
%defattr(-,root,root,-)
%{_bindir}/pfsinimgmagick
%{_bindir}/pfsoutimgmagick
%{_mandir}/man1/pfsinimgmagick.1.gz
%{_mandir}/man1/pfsoutimgmagick.1.gz

%files octave
%defattr(-,root,root,-)
%{_bindir}/pfsoctavelum
%{_bindir}/pfsoctavergb
%{_bindir}/pfsstat
%{_libexecdir}/octave/*/site/oct/*/pfstools/
#%{_libexecdir}/octave/*/site/oct/*/pfstools/*.oct
%{_datadir}/octave/*/site/m/pfstools/*.m
%{_mandir}/man1/pfsoctavelum.1.gz
%{_mandir}/man1/pfsoctavergb.1.gz
%{_mandir}/man1/pfsstat.1.gz

%files gdal
%defattr(-,root,root,-)
%{_bindir}/pfsingdal
%{_mandir}/man1/pfsingdal.1.gz

%files devel
%defattr(-,root,root,-)
%doc doc/pfs_format_spec.pdf
%{_libdir}/libpfs-1.2.so
%{_libdir}/pkgconfig/pfs.pc
%{_includedir}/pfs-1.2/array2d.h
%{_includedir}/pfs-1.2/pfs.h

%changelog

* Mon Jan 5 2009 Ulrich Drepper <drepper at redhat.com> - 1.7.0-2
- Fix BuildRequires

* Fri Jan 1 2009 Ulrich Drepper <drepper at redhat.com> - 1.7.0-1
- update to most recent upstream release
  - new subpackage pfstools-gdal for GIS data handling
  - new program pfsdisplayfunction

* Fri Jan 1 2009 Ulrich Drepper <drepper at redhat.com> - 1.6.5-5
- add automake BuildRequires

* Wed Nov 5 2008 Ulrich Drepper <drepper at redhat.com> - 1.6.5-4
- ship more doc files

* Sun Oct 12 2008 Ulrich Drepper <drepper at redhat.com> - 1.6.5-3
- .spec file cleanups
- install Octave files without execution permission

* Wed Sep 03 2008 Manuel Wolfshant <wolfy at fedoraproject.org> - 1.6.5-2
- fix missing BR, Source URL, double inclusion of several files
- preserve timestamps

* Tue Aug 19 2008 Ulrich Drepper <drepper at redhat.com> - 1.6.5-1
- Initial package.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pfstools/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	4 Jan 2009 20:36:52 -0000	1.1
+++ .cvsignore	5 Jan 2009 19:55:08 -0000	1.2
@@ -0,0 +1 @@
+pfstools-1.7.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pfstools/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	4 Jan 2009 20:36:52 -0000	1.1
+++ sources	5 Jan 2009 19:55:08 -0000	1.2
@@ -0,0 +1 @@
+baf058fcdc6ac040c210dc5a4a607d1d  pfstools-1.7.0.tar.gz



From mbarnes at fedoraproject.org  Mon Jan  5 19:59:43 2009
From: mbarnes at fedoraproject.org (Matthew Barnes)
Date: Mon,  5 Jan 2009 19:59:43 +0000 (UTC)
Subject: rpms/gtkhtml3/devel gtkhtml-3.25.4-compiler-warnings.patch, NONE,
	1.1 .cvsignore, 1.86, 1.87 gtkhtml3.spec, 1.137, 1.138 sources,
	1.86, 1.87
Message-ID: <20090105195943.4BF8B70108@cvs1.fedora.phx.redhat.com>

Author: mbarnes

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

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

* Mon Jan 05 2009 Matthew Barnes <mbarnes at redhat.com> - 3.25.4-1.fc11
- Update to 3.25.4


gtkhtml-3.25.4-compiler-warnings.patch:

--- NEW FILE gtkhtml-3.25.4-compiler-warnings.patch ---
diff -up gtkhtml-3.25.4/gtkhtml/htmltokenizer.c.compiler-warnings gtkhtml-3.25.4/gtkhtml/htmltokenizer.c
--- gtkhtml-3.25.4/gtkhtml/htmltokenizer.c.compiler-warnings	2009-01-04 14:54:40.000000000 -0500
+++ gtkhtml-3.25.4/gtkhtml/htmltokenizer.c	2009-01-05 13:50:09.000000000 -0500
@@ -428,7 +428,7 @@ html_tokenizer_real_peek_token (HTMLToke
 
 /* test iconv for valid*/
 gboolean
-is_valid_g_iconv(const GIConv iconv_cd)
+is_valid_g_iconv (const GIConv iconv_cd)
 {
 	return iconv_cd != NULL && iconv_cd != (GIConv)-1;
 }
@@ -438,95 +438,94 @@ gboolean
 is_need_convert (const gchar* token)
 {
 	int i=strlen (token);
-	for(;i>=0;i--)
-		if(token[i]&128)
+	for (;i>=0;i--)
+		if (token[i]&128)
 			return TRUE;
 	return FALSE;
 }
 
 /*Convert entity values in already converted to right charset token*/
-char* html_tokenizer_convert_entity(char * token)
-{	
+gchar *
+html_tokenizer_convert_entity (gchar *token)
+{
+	gchar *full_pos;
+	gchar *resulted;
+	gchar *write_pos;
+	gchar *read_pos;
+
 	if (token == NULL)
 		return NULL;
+
 	/*stop pointer*/
-	gchar* full_pos = token + strlen(token);
-	gchar* resulted = g_new(gchar, strlen (token) +1);
-	gchar* write_pos = resulted;
-	gchar* read_pos = token;
-	while ( read_pos < full_pos )
-	{
+	full_pos = token + strlen (token);
+	resulted = g_new (gchar, strlen (token) + 1);
+	write_pos = resulted;
+	read_pos = token;
+	while (read_pos < full_pos) {
 		size_t count_chars = strcspn (read_pos, "&");
-		memcpy( write_pos, read_pos, count_chars);
+		memcpy (write_pos, read_pos, count_chars);
 		write_pos += count_chars;
 		read_pos += count_chars;
 		/*may be end string?*/
 		if (read_pos < full_pos)
-			if(*read_pos == '&' )
-			{
+			if (*read_pos == '&') {
 				/*value to add*/
 				gunichar value = INVALID_CHARACTER_MARKER;
 				/*skip not needed &*/
 				read_pos ++;
-				count_chars = strcspn(read_pos, ";");
-				if(count_chars < 14 && count_chars > 1)
-				{					
+				count_chars = strcspn (read_pos, ";");
+				if (count_chars < 14 && count_chars > 1) {
 					*(read_pos + count_chars)=0;
 					/* &#******; */
-					if (*read_pos == '#')
-					{
+					if (*read_pos == '#') {
 						/* &#1234567 */
-						if(isdigit (*(read_pos + 1)))
-						{
+						if (isdigit (*(read_pos + 1))) {
 							value=strtoull (read_pos + 1, NULL, 10);
-						}
 						/* &#xdd; */
-						else if(*(read_pos + 1) == 'x')
-						{
+						} else if (*(read_pos + 1) == 'x') {
 							value=strtoull (read_pos + 2, NULL, 16);
 						}
-					}
-					else 
-					{
-						value = html_entity_parse (read_pos, strlen(read_pos));
+					} else {
+						value = html_entity_parse (read_pos, strlen (read_pos));
 					}
 					read_pos += (count_chars + 1);
-					write_pos += g_unichar_to_utf8 ( value, write_pos);
+					write_pos += g_unichar_to_utf8 (value, write_pos);
 				}
 			}
 	}
-	* write_pos = 0;
-	free(token);
+	*write_pos = 0;
+	free (token);
+
 	return resulted;
 }
 
 /*convert text to utf8 - allways alloc memmory*/
-gchar* 
-convert_text_encoding(const GIConv iconv_cd,const gchar * token)
+gchar *
+convert_text_encoding (const GIConv iconv_cd,
+                       const gchar *token)
 {
 	size_t currlength;
-	gchar * newbuffer;
-	gchar * returnbuffer;
-	const gchar * current;
+	gchar *newbuffer;
+	gchar *returnbuffer;
+	const gchar *current;
 	size_t newlength;
 	size_t oldlength;
-	if(token == NULL)
+
+	if (token == NULL)
 		return NULL;
-	if(is_valid_g_iconv (iconv_cd) && is_need_convert (token))
-	{
+
+	if (is_valid_g_iconv (iconv_cd) && is_need_convert (token)) {
 		currlength = strlen (token);
 		current = token;
 		newlength = currlength*7+1;
 		oldlength = newlength;
 		newbuffer = g_new (gchar, newlength);
 		returnbuffer = newbuffer;
-		g_assert (returnbuffer);
-		while(currlength > 0)
-		{			
+
+		while (currlength > 0) {
 			/*function not change current, but g_iconv use not const source*/
 			g_iconv (iconv_cd, (gchar **)&current, &currlength, &newbuffer, &newlength);
-			if(currlength > 0)
-			{
+			if (currlength > 0) {
 				g_warning ("IconvError=%s", current);
 				*newbuffer = INVALID_CHARACTER_MARKER;
 				newbuffer ++;
@@ -537,38 +536,40 @@ convert_text_encoding(const GIConv iconv
 		}
 		returnbuffer[oldlength - newlength] = '\0';
 		returnbuffer = g_realloc (returnbuffer, oldlength - newlength + 1);
-		g_assert (returnbuffer);
 		return returnbuffer;
 	}
-	return g_strdup(token);
+	return g_strdup (token);
 }
 
 static gchar *
-html_tokenizer_converted_token(HTMLTokenizer *t, const gchar* token)
+html_tokenizer_converted_token (HTMLTokenizer *t,
+                                const gchar* token)
 {
-	if(token != NULL)
-	{
+	if (token != NULL) {
 		struct _HTMLTokenizerPrivate *p = t->priv;
 		return html_tokenizer_convert_entity (convert_text_encoding (p->iconv_cd, token));
 	}
+
 	return NULL;
 }
 
 static const gchar *
-html_tokenizer_real_get_content_type(HTMLTokenizer *t)
+html_tokenizer_real_get_content_type (HTMLTokenizer *t)
 {
 	struct _HTMLTokenizerPrivate *p = t->priv;
-	if(p->content_type)
+
+	if (p->content_type)
 		return p->content_type;
+
 	return NULL;
 }
 
 static gboolean
-html_tokenizer_real_get_engine_type(HTMLTokenizer *t)
+html_tokenizer_real_get_engine_type (HTMLTokenizer *t)
 {
 	struct _HTMLTokenizerPrivate *p = t->priv;
+
 	return p->enableconvert;
-	return FALSE;
 }
 
 static gchar *


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gtkhtml3/devel/.cvsignore,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -r1.86 -r1.87
--- .cvsignore	15 Dec 2008 15:37:35 -0000	1.86
+++ .cvsignore	5 Jan 2009 19:59:12 -0000	1.87
@@ -1 +1 @@
-gtkhtml-3.25.3.tar.bz2
+gtkhtml-3.25.4.tar.bz2


Index: gtkhtml3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtkhtml3/devel/gtkhtml3.spec,v
retrieving revision 1.137
retrieving revision 1.138
diff -u -r1.137 -r1.138
--- gtkhtml3.spec	15 Dec 2008 15:37:35 -0000	1.137
+++ gtkhtml3.spec	5 Jan 2009 19:59:12 -0000	1.138
@@ -9,7 +9,7 @@
 ### Abstract ###
 
 Name: gtkhtml3
-Version: 3.25.3
+Version: 3.25.4
 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
 
+# Upstream carelessness.
+Patch2: gtkhtml-3.25.4-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
 
@@ -123,6 +127,9 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Mon Jan 05 2009 Matthew Barnes <mbarnes at redhat.com> - 3.25.4-1.fc11
+- Update to 3.25.4
+
 * Mon Dec 15 2008 Matthew Barnes <mbarnes at redhat.com> - 3.25.3-1.fc11
 - Update to 3.25.3
 - Bump gnome_icon_theme_version to 2.22.0


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gtkhtml3/devel/sources,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -r1.86 -r1.87
--- sources	15 Dec 2008 15:37:35 -0000	1.86
+++ sources	5 Jan 2009 19:59:12 -0000	1.87
@@ -1 +1 @@
-f81263739361568cf50a626be282ffde  gtkhtml-3.25.3.tar.bz2
+fc91d5dd7c64b268b97d040f6c4fa07c  gtkhtml-3.25.4.tar.bz2



From frankb at fedoraproject.org  Mon Jan  5 20:00:06 2009
From: frankb at fedoraproject.org (=?utf-8?q?Frank_B=C3=BCttner?=)
Date: Mon,  5 Jan 2009 20:00:06 +0000 (UTC)
Subject: rpms/qwt-doc/devel .cvsignore, 1.2, 1.3 qwt-doc.spec, 1.1,
	1.2 qwt-path.patch, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20090105200006.0913F70108@cvs1.fedora.phx.redhat.com>

Author: frankb

Update of /cvs/pkgs/rpms/qwt-doc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14266

Modified Files:
	.cvsignore qwt-doc.spec qwt-path.patch sources 
Log Message:
- update to 5.1.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qwt-doc/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	30 Sep 2007 19:06:32 -0000	1.2
+++ .cvsignore	5 Jan 2009 19:59:35 -0000	1.3
@@ -1,2 +1,2 @@
-qwt-5.0.2.pdf
-qwt-5.0.2.tar.bz2
+qwt-5.1.1.tar.bz2
+qwt-5.1.1.pdf


Index: qwt-doc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qwt-doc/devel/qwt-doc.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- qwt-doc.spec	30 Sep 2007 19:06:32 -0000	1.1
+++ qwt-doc.spec	5 Jan 2009 19:59:35 -0000	1.2
@@ -1,17 +1,17 @@
 Name:		qwt-doc
 Summary:	Documentation of qwt
-Version:	5.0.2
-Release:	4%{?dist}
+Version:	5.1.1
+Release:	1%{?dist}
 URL:		http://qwt.sourceforge.net
 License:	LGPLv2 with exceptions
-Group:          Documentation
-Source0:        http://downloads.sourceforge.net/qwt/qwt-%{version}.tar.bz2
+Group:		Documentation
+Source0:	http://downloads.sourceforge.net/qwt/qwt-%{version}.tar.bz2
 Source1:	http://downloads.sourceforge.net/qwt/qwt-%{version}.pdf
-Patch0:         qwt-path.patch
-Buildroot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:  qt4-devel
+Patch0:		qwt-path.patch
+Buildroot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires:	qt4-devel
 Buildarch:	noarch
-Requires: 	qwt = %{version}
+Requires:	qwt = %{version}
 
 %if 0%{?rhel} > 4
 %define epel5mode 1
@@ -58,6 +58,9 @@
 mkdir -p $RPM_BUILD_ROOT%{_mandir}/man3
 mv $RPM_BUILD_ROOT%{_docdir}/qwt-%{version}/man/man3/* $RPM_BUILD_ROOT%{_mandir}/man3/
 rm -rf $RPM_BUILD_ROOT%{_docdir}/qwt-%{version}/man
+#fix for #322191
+mv $RPM_BUILD_ROOT%{_mandir}/man3/deprecated.3.gz $RPM_BUILD_ROOT%{_mandir}/man3/qwt-deprecated.3.gz
+mv $RPM_BUILD_ROOT%{_mandir}/man3/todo.3.gz $RPM_BUILD_ROOT%{_mandir}/man3/qwt-todo.3.gz
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -67,6 +70,11 @@
 %{_mandir}/man3/*
 
 %changelog
+* Mon Jan 05 2009 Frank B??ttner <frank-buettner at gmx.net - 5.1.1-1
+ - update to 5.1.1
+* Sun Oct 07 2007 Frank B??ttner <frank-buettner at gmx.net - 5.0.2-5
+ - fix for bug #322191
+ - use tab for all seperators
 * Sun Sep 30 2007 Frank B??ttner <frank-buettner at gmx.net - 5.0.2-4
  - modify the file encoding
 * Sat Sep 29 2007 Frank B??ttner <frank-buettner at gmx.net - 5.0.2-3

qwt-path.patch:

Index: qwt-path.patch
===================================================================
RCS file: /cvs/pkgs/rpms/qwt-doc/devel/qwt-path.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- qwt-path.patch	30 Sep 2007 19:06:32 -0000	1.1
+++ qwt-path.patch	5 Jan 2009 19:59:35 -0000	1.2
@@ -1,7 +1,7 @@
-diff -Nur qwt-5.0.1.org/designer/designer.pro qwt-5.0.1/designer/designer.pro
---- qwt-5.0.1.org/designer/designer.pro	2007-05-15 15:23:47.000000000 +0200
-+++ qwt-5.0.1/designer/designer.pro	2007-05-15 17:29:13.000000000 +0200
-@@ -92,7 +92,7 @@
+diff -Nur qwt-5.1.1.org/designer/designer.pro qwt-5.1.1/designer/designer.pro
+--- qwt-5.1.1.org/designer/designer.pro	2008-05-24 18:47:36.000000000 +0200
++++ qwt-5.1.1/designer/designer.pro	2009-01-04 17:54:33.000000000 +0100
+@@ -123,7 +123,7 @@
          RESOURCES += \
              qwt_designer_plugin.qrc
  
@@ -9,21 +9,20 @@
 +        target.path = QTDESIGNERPATH
          INSTALLS += target
      }
+ }
+diff -Nur qwt-5.1.1.org/qwtconfig.pri qwt-5.1.1/qwtconfig.pri
+--- qwt-5.1.1.org/qwtconfig.pri	2008-05-24 18:47:36.000000000 +0200
++++ qwt-5.1.1/qwtconfig.pri	2009-01-04 17:55:07.000000000 +0100
+@@ -7,17 +7,9 @@
+ VER_PAT      = 1
+ VERSION      = $$VER_MAJ.$$VER_MIN.$$VER_PAT
  
-diff -Nur qwt-5.0.1.org/qwtconfig.pri qwt-5.0.1/qwtconfig.pri
---- qwt-5.0.1.org/qwtconfig.pri	2007-05-15 12:07:33.000000000 +0200
-+++ qwt-5.0.1/qwtconfig.pri	2007-05-15 15:52:39.000000000 +0200
-@@ -1,18 +1,6 @@
--######################################################################
--# Install paths
--######################################################################
--
 -unix {
--    INSTALLBASE    = /usr/local/qwt-5.0.2
+-    INSTALLBASE    = /usr/local/qwt-5.1.1
 -}
 -
 -win32 {
--    INSTALLBASE    = C:/Qwt-5.0.2
+-    INSTALLBASE    = C:/Qwt-5.1.1
 -}
 -
 -target.path    = $$INSTALLBASE/lib
@@ -35,7 +34,7 @@
  
  ######################################################################
  # qmake internal options
-@@ -58,7 +46,7 @@
+@@ -97,7 +89,7 @@
  # QwtSVGItem.
  ######################################################################
  


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qwt-doc/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	30 Sep 2007 19:06:32 -0000	1.2
+++ sources	5 Jan 2009 19:59:35 -0000	1.3
@@ -1,2 +1,2 @@
-9eacccf772eb66892450a9d7ad98381d  qwt-5.0.2.pdf
-53adbb313c478dd4aae4f1c864a2037e  qwt-5.0.2.tar.bz2
+218cef1a39ebda6cfa440a0727464275  qwt-5.1.1.tar.bz2
+a6567cd390d127b0ebb564da4750a630  qwt-5.1.1.pdf



From pkgdb at fedoraproject.org  Mon Jan  5 20:00:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Jan 2009 20:00:22 +0000
Subject: [pkgdb] plague had acl change status
Message-ID: <20090105200022.C05072084BA@bastion.fedora.phx.redhat.com>

dcbw has set the watchbugzilla acl on plague (Fedora devel) to Approved for mschwendt

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



From pkgdb at fedoraproject.org  Mon Jan  5 20:00:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Jan 2009 20:00:25 +0000
Subject: [pkgdb] plague had acl change status
Message-ID: <20090105200025.D797F208D4F@bastion.fedora.phx.redhat.com>

dcbw has set the watchbugzilla acl on plague (Fedora devel) to Approved for smooge

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



From pkgdb at fedoraproject.org  Mon Jan  5 20:00:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Jan 2009 20:00:28 +0000
Subject: [pkgdb] plague had acl change status
Message-ID: <20090105200028.32800208D52@bastion.fedora.phx.redhat.com>

dcbw has set the watchcommits acl on plague (Fedora devel) to Approved for mschwendt

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



From pkgdb at fedoraproject.org  Mon Jan  5 20:00:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Jan 2009 20:00:30 +0000
Subject: [pkgdb] plague had acl change status
Message-ID: <20090105200030.6D954208D57@bastion.fedora.phx.redhat.com>

dcbw has set the watchcommits acl on plague (Fedora devel) to Approved for smooge

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



From buc at fedoraproject.org  Mon Jan  5 20:14:57 2009
From: buc at fedoraproject.org (Dmitry Butskoy)
Date: Mon,  5 Jan 2009 20:14:57 +0000 (UTC)
Subject: rpms/newscache/devel socket++-1.12.12-autotools.patch, NONE,
	1.1 newscache.spec, 1.14, 1.15 socket++-1.12.12-libtool2.patch,
	1.1, NONE
Message-ID: <20090105201457.49CE870108@cvs1.fedora.phx.redhat.com>

Author: buc

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

Modified Files:
	newscache.spec 
Added Files:
	socket++-1.12.12-autotools.patch 
Removed Files:
	socket++-1.12.12-libtool2.patch 
Log Message:


socket++-1.12.12-autotools.patch:

--- NEW FILE socket++-1.12.12-autotools.patch ---
diff -Nrbu socket++-1.12.12/configure.in socket++-1.12.12-OK/configure.in
--- socket++-1.12.12/configure.in	2009-01-05 22:59:07.000000000 +0300
+++ socket++-1.12.12-OK/configure.in	2009-01-05 23:02:47.000000000 +0300
@@ -137,17 +137,6 @@
 # include <unistd.h>
 # include <sys/signal.h>
 
-  void sigh (int s, int c, void* p, void* a) {}
-  ], [
-  typedef RETSIGTYPE (*funcptr) (...);
-  struct sigaction sa;
-  sa.sa_handler = funcptr (&sigh);
-  ],
-  socketxx_cv_sighnd_argtype=...,
-  AC_TRY_COMPILE([
-#   include <unistd.h>
-#   include <sys/signal.h>
-
     void sigh (int s, int c, void* p, void* a);
     ], [
     typedef RETSIGTYPE (*funcptr) (int);
@@ -155,7 +144,7 @@
     sa.sa_handler = funcptr (&sigh);
     ],
     socketxx_cv_sighnd_argtype=int,
-    socketxx_cv_sighnd_argtype=void)) ])
+  socketxx_cv_sighnd_argtype=void) ])
 AC_LANG_RESTORE
 AC_DEFINE_UNQUOTED(SIGHND_ARGTYPE, $socketxx_cv_sighnd_argtype)
 AC_MSG_RESULT($socketxx_cv_sighnd_argtype)


Index: newscache.spec
===================================================================
RCS file: /cvs/extras/rpms/newscache/devel/newscache.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- newscache.spec	5 Jan 2009 17:37:40 -0000	1.14
+++ newscache.spec	5 Jan 2009 20:14:26 -0000	1.15
@@ -14,7 +14,7 @@
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Patch1:		newscache-1.2rc6-config.patch
 Patch2:		newscache-1.2rc6-gcc43.patch
-Patch3:		socket++-1.12.12-libtool2.patch
+Patch3:		socket++-1.12.12-autotools.patch
 BuildRequires:	libtool, texinfo, pam-devel
 
 Requires(pre): shadow-utils
@@ -51,6 +51,7 @@
 # to ship it separately.
 
 pushd socket++-%{socketver}
+autoupdate
 ./autogen
 %configure --enable-static --disable-shared
 make


--- socket++-1.12.12-libtool2.patch DELETED ---



From frankb at fedoraproject.org  Mon Jan  5 20:16:54 2009
From: frankb at fedoraproject.org (=?utf-8?q?Frank_B=C3=BCttner?=)
Date: Mon,  5 Jan 2009 20:16:54 +0000 (UTC)
Subject: rpms/qwt-doc/devel qwt-doc.spec,1.2,1.3
Message-ID: <20090105201654.B96D770108@cvs1.fedora.phx.redhat.com>

Author: frankb

Update of /cvs/pkgs/rpms/qwt-doc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20375

Modified Files:
	qwt-doc.spec 
Log Message:
-fix wrong file name



Index: qwt-doc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qwt-doc/devel/qwt-doc.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- qwt-doc.spec	5 Jan 2009 19:59:35 -0000	1.2
+++ qwt-doc.spec	5 Jan 2009 20:16:24 -0000	1.3
@@ -1,7 +1,7 @@
 Name:		qwt-doc
 Summary:	Documentation of qwt
 Version:	5.1.1
-Release:	1%{?dist}
+Release:	2%{?dist}
 URL:		http://qwt.sourceforge.net
 License:	LGPLv2 with exceptions
 Group:		Documentation
@@ -59,8 +59,8 @@
 mv $RPM_BUILD_ROOT%{_docdir}/qwt-%{version}/man/man3/* $RPM_BUILD_ROOT%{_mandir}/man3/
 rm -rf $RPM_BUILD_ROOT%{_docdir}/qwt-%{version}/man
 #fix for #322191
-mv $RPM_BUILD_ROOT%{_mandir}/man3/deprecated.3.gz $RPM_BUILD_ROOT%{_mandir}/man3/qwt-deprecated.3.gz
-mv $RPM_BUILD_ROOT%{_mandir}/man3/todo.3.gz $RPM_BUILD_ROOT%{_mandir}/man3/qwt-todo.3.gz
+mv $RPM_BUILD_ROOT%{_mandir}/man3/deprecated.3 $RPM_BUILD_ROOT%{_mandir}/man3/qwt-deprecated.3
+mv $RPM_BUILD_ROOT%{_mandir}/man3/todo.3 $RPM_BUILD_ROOT%{_mandir}/man3/qwt-todo.3
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -70,6 +70,8 @@
 %{_mandir}/man3/*
 
 %changelog
+* Mon Jan 05 2009 Frank B??ttner <frank-buettner at gmx.net - 5.1.1-2
+ - fix wrong file name
 * Mon Jan 05 2009 Frank B??ttner <frank-buettner at gmx.net - 5.1.1-1
  - update to 5.1.1
 * Sun Oct 07 2007 Frank B??ttner <frank-buettner at gmx.net - 5.0.2-5



From remi at fedoraproject.org  Mon Jan  5 20:24:15 2009
From: remi at fedoraproject.org (Remi Collet)
Date: Mon,  5 Jan 2009 20:24:15 +0000 (UTC)
Subject: rpms/maniadrive/F-9 maniadrive.spec,1.8,1.9
Message-ID: <20090105202415.6EF8870108@cvs1.fedora.phx.redhat.com>

Author: remi

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

Modified Files:
	maniadrive.spec 
Log Message:
rebuild against new php 5.2.8


Index: maniadrive.spec
===================================================================
RCS file: /cvs/extras/rpms/maniadrive/F-9/maniadrive.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- maniadrive.spec	21 Jun 2008 11:24:58 -0000	1.8
+++ maniadrive.spec	5 Jan 2009 20:23:45 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           maniadrive
 Version:        1.2
-Release:        9%{?dist}
+Release:        11%{?dist}
 Summary:        3D stunt driving game
 Group:          Amusements/Games
 License:        GPLv2+
@@ -161,6 +161,12 @@
 
 
 %changelog
+* Wed Dec 17 2008 Hans de Goede <hdegoede at redhat.com> 1.2-11
+- Rebuild for new php version
+
+* 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 frankb at fedoraproject.org  Mon Jan  5 20:27:14 2009
From: frankb at fedoraproject.org (=?utf-8?q?Frank_B=C3=BCttner?=)
Date: Mon,  5 Jan 2009 20:27:14 +0000 (UTC)
Subject: rpms/qwt-doc/F-10 .cvsignore, 1.2, 1.3 qwt-doc.spec, 1.1,
	1.2 qwt-path.patch, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20090105202714.454AD70108@cvs1.fedora.phx.redhat.com>

Author: frankb

Update of /cvs/pkgs/rpms/qwt-doc/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23575

Modified Files:
	.cvsignore qwt-doc.spec qwt-path.patch sources 
Log Message:
-update to 5.1.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qwt-doc/F-10/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	30 Sep 2007 19:06:32 -0000	1.2
+++ .cvsignore	5 Jan 2009 20:26:43 -0000	1.3
@@ -1,2 +1,2 @@
-qwt-5.0.2.pdf
-qwt-5.0.2.tar.bz2
+qwt-5.1.1.tar.bz2
+qwt-5.1.1.pdf


Index: qwt-doc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qwt-doc/F-10/qwt-doc.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- qwt-doc.spec	30 Sep 2007 19:06:32 -0000	1.1
+++ qwt-doc.spec	5 Jan 2009 20:26:43 -0000	1.2
@@ -1,17 +1,17 @@
 Name:		qwt-doc
 Summary:	Documentation of qwt
-Version:	5.0.2
-Release:	4%{?dist}
+Version:	5.1.1
+Release:	2%{?dist}
 URL:		http://qwt.sourceforge.net
 License:	LGPLv2 with exceptions
-Group:          Documentation
-Source0:        http://downloads.sourceforge.net/qwt/qwt-%{version}.tar.bz2
+Group:		Documentation
+Source0:	http://downloads.sourceforge.net/qwt/qwt-%{version}.tar.bz2
 Source1:	http://downloads.sourceforge.net/qwt/qwt-%{version}.pdf
-Patch0:         qwt-path.patch
-Buildroot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:  qt4-devel
+Patch0:		qwt-path.patch
+Buildroot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires:	qt4-devel
 Buildarch:	noarch
-Requires: 	qwt = %{version}
+Requires:	qwt = %{version}
 
 %if 0%{?rhel} > 4
 %define epel5mode 1
@@ -58,6 +58,9 @@
 mkdir -p $RPM_BUILD_ROOT%{_mandir}/man3
 mv $RPM_BUILD_ROOT%{_docdir}/qwt-%{version}/man/man3/* $RPM_BUILD_ROOT%{_mandir}/man3/
 rm -rf $RPM_BUILD_ROOT%{_docdir}/qwt-%{version}/man
+#fix for #322191
+mv $RPM_BUILD_ROOT%{_mandir}/man3/deprecated.3 $RPM_BUILD_ROOT%{_mandir}/man3/qwt-deprecated.3
+mv $RPM_BUILD_ROOT%{_mandir}/man3/todo.3 $RPM_BUILD_ROOT%{_mandir}/man3/qwt-todo.3
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -67,6 +70,13 @@
 %{_mandir}/man3/*
 
 %changelog
+* Mon Jan 05 2009 Frank B??ttner <frank-buettner at gmx.net - 5.1.1-2
+ - fix wrong file name
+* Mon Jan 05 2009 Frank B??ttner <frank-buettner at gmx.net - 5.1.1-1
+ - update to 5.1.1
+* Sun Oct 07 2007 Frank B??ttner <frank-buettner at gmx.net - 5.0.2-5
+ - fix for bug #322191
+ - use tab for all seperators
 * Sun Sep 30 2007 Frank B??ttner <frank-buettner at gmx.net - 5.0.2-4
  - modify the file encoding
 * Sat Sep 29 2007 Frank B??ttner <frank-buettner at gmx.net - 5.0.2-3

qwt-path.patch:

Index: qwt-path.patch
===================================================================
RCS file: /cvs/pkgs/rpms/qwt-doc/F-10/qwt-path.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- qwt-path.patch	30 Sep 2007 19:06:32 -0000	1.1
+++ qwt-path.patch	5 Jan 2009 20:26:43 -0000	1.2
@@ -1,7 +1,7 @@
-diff -Nur qwt-5.0.1.org/designer/designer.pro qwt-5.0.1/designer/designer.pro
---- qwt-5.0.1.org/designer/designer.pro	2007-05-15 15:23:47.000000000 +0200
-+++ qwt-5.0.1/designer/designer.pro	2007-05-15 17:29:13.000000000 +0200
-@@ -92,7 +92,7 @@
+diff -Nur qwt-5.1.1.org/designer/designer.pro qwt-5.1.1/designer/designer.pro
+--- qwt-5.1.1.org/designer/designer.pro	2008-05-24 18:47:36.000000000 +0200
++++ qwt-5.1.1/designer/designer.pro	2009-01-04 17:54:33.000000000 +0100
+@@ -123,7 +123,7 @@
          RESOURCES += \
              qwt_designer_plugin.qrc
  
@@ -9,21 +9,20 @@
 +        target.path = QTDESIGNERPATH
          INSTALLS += target
      }
+ }
+diff -Nur qwt-5.1.1.org/qwtconfig.pri qwt-5.1.1/qwtconfig.pri
+--- qwt-5.1.1.org/qwtconfig.pri	2008-05-24 18:47:36.000000000 +0200
++++ qwt-5.1.1/qwtconfig.pri	2009-01-04 17:55:07.000000000 +0100
+@@ -7,17 +7,9 @@
+ VER_PAT      = 1
+ VERSION      = $$VER_MAJ.$$VER_MIN.$$VER_PAT
  
-diff -Nur qwt-5.0.1.org/qwtconfig.pri qwt-5.0.1/qwtconfig.pri
---- qwt-5.0.1.org/qwtconfig.pri	2007-05-15 12:07:33.000000000 +0200
-+++ qwt-5.0.1/qwtconfig.pri	2007-05-15 15:52:39.000000000 +0200
-@@ -1,18 +1,6 @@
--######################################################################
--# Install paths
--######################################################################
--
 -unix {
--    INSTALLBASE    = /usr/local/qwt-5.0.2
+-    INSTALLBASE    = /usr/local/qwt-5.1.1
 -}
 -
 -win32 {
--    INSTALLBASE    = C:/Qwt-5.0.2
+-    INSTALLBASE    = C:/Qwt-5.1.1
 -}
 -
 -target.path    = $$INSTALLBASE/lib
@@ -35,7 +34,7 @@
  
  ######################################################################
  # qmake internal options
-@@ -58,7 +46,7 @@
+@@ -97,7 +89,7 @@
  # QwtSVGItem.
  ######################################################################
  


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qwt-doc/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	30 Sep 2007 19:06:32 -0000	1.2
+++ sources	5 Jan 2009 20:26:43 -0000	1.3
@@ -1,2 +1,2 @@
-9eacccf772eb66892450a9d7ad98381d  qwt-5.0.2.pdf
-53adbb313c478dd4aae4f1c864a2037e  qwt-5.0.2.tar.bz2
+218cef1a39ebda6cfa440a0727464275  qwt-5.1.1.tar.bz2
+a6567cd390d127b0ebb564da4750a630  qwt-5.1.1.pdf



From buc at fedoraproject.org  Mon Jan  5 20:31:00 2009
From: buc at fedoraproject.org (Dmitry Butskoy)
Date: Mon,  5 Jan 2009 20:31:00 +0000 (UTC)
Subject: rpms/newscache/devel newscache.spec,1.15,1.16
Message-ID: <20090105203100.4DDB170108@cvs1.fedora.phx.redhat.com>

Author: buc

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

Modified Files:
	newscache.spec 
Log Message:



Index: newscache.spec
===================================================================
RCS file: /cvs/extras/rpms/newscache/devel/newscache.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- newscache.spec	5 Jan 2009 20:14:26 -0000	1.15
+++ newscache.spec	5 Jan 2009 20:30:29 -0000	1.16
@@ -52,7 +52,15 @@
 
 pushd socket++-%{socketver}
 autoupdate
-./autogen
+#./autogen
+libtoolize -v --force
+aclocal
+autoheader
+libtoolize -v --force
+automake --add-missing
+libtoolize -v --force
+autoconf
+
 %configure --enable-static --disable-shared
 make
 popd



From pkgdb at fedoraproject.org  Mon Jan  5 20:32:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Jan 2009 20:32:08 +0000
Subject: [pkgdb] bacula had acl change status
Message-ID: <20090105203208.EBBF5208CAB@bastion.fedora.phx.redhat.com>

ixs has set the watchcommits acl on bacula (Fedora devel) to Approved for fschwarz

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



From pkgdb at fedoraproject.org  Mon Jan  5 20:32:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Jan 2009 20:32:08 +0000
Subject: [pkgdb] bacula had acl change status
Message-ID: <20090105203208.E36A82084BA@bastion.fedora.phx.redhat.com>

ixs has set the watchbugzilla acl on bacula (Fedora devel) to Approved for fschwarz

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



From pkgdb at fedoraproject.org  Mon Jan  5 20:32:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Jan 2009 20:32:23 +0000
Subject: [pkgdb] bacula had acl change status
Message-ID: <20090105203223.4479A20873E@bastion.fedora.phx.redhat.com>

ixs has set the watchcommits acl on bacula (Fedora EPEL 4) to Approved for fschwarz

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



From pkgdb at fedoraproject.org  Mon Jan  5 20:32:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Jan 2009 20:32:23 +0000
Subject: [pkgdb] bacula had acl change status
Message-ID: <20090105203223.5774E208D57@bastion.fedora.phx.redhat.com>

ixs has set the watchbugzilla acl on bacula (Fedora EPEL 4) to Approved for fschwarz

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



From pkgdb at fedoraproject.org  Mon Jan  5 20:32:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Jan 2009 20:32:35 +0000
Subject: [pkgdb] bacula had acl change status
Message-ID: <20090105203235.763CD208CAB@bastion.fedora.phx.redhat.com>

ixs has set the watchcommits acl on bacula (Fedora EPEL 5) to Approved for fschwarz

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



From pkgdb at fedoraproject.org  Mon Jan  5 20:32:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Jan 2009 20:32:35 +0000
Subject: [pkgdb] bacula had acl change status
Message-ID: <20090105203235.E0EC0208D6A@bastion.fedora.phx.redhat.com>

ixs has set the watchbugzilla acl on bacula (Fedora EPEL 5) to Approved for fschwarz

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



From pkgdb at fedoraproject.org  Mon Jan  5 20:32:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Jan 2009 20:32:46 +0000
Subject: [pkgdb] bacula had acl change status
Message-ID: <20090105203246.EE22120873E@bastion.fedora.phx.redhat.com>

ixs has set the watchcommits acl on bacula (Fedora 8) to Approved for fschwarz

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



From pkgdb at fedoraproject.org  Mon Jan  5 20:32:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Jan 2009 20:32:48 +0000
Subject: [pkgdb] bacula had acl change status
Message-ID: <20090105203248.31546208DA5@bastion.fedora.phx.redhat.com>

ixs has set the watchbugzilla acl on bacula (Fedora 8) to Approved for fschwarz

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



From pkgdb at fedoraproject.org  Mon Jan  5 20:32:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Jan 2009 20:32:52 +0000
Subject: [pkgdb] bacula had acl change status
Message-ID: <20090105203252.7F7BA208DAA@bastion.fedora.phx.redhat.com>

ixs has set the watchcommits acl on bacula (Fedora 9) to Approved for fschwarz

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



From pkgdb at fedoraproject.org  Mon Jan  5 20:32:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Jan 2009 20:32:55 +0000
Subject: [pkgdb] bacula had acl change status
Message-ID: <20090105203255.84E00208D57@bastion.fedora.phx.redhat.com>

ixs has set the watchbugzilla acl on bacula (Fedora 9) to Approved for fschwarz

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



From pkgdb at fedoraproject.org  Mon Jan  5 20:32:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Jan 2009 20:32:58 +0000
Subject: [pkgdb] bacula had acl change status
Message-ID: <20090105203258.141E5208D5A@bastion.fedora.phx.redhat.com>

ixs has set the watchcommits acl on bacula (Fedora 10) to Approved for fschwarz

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



From pkgdb at fedoraproject.org  Mon Jan  5 20:33:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Jan 2009 20:33:01 +0000
Subject: [pkgdb] bacula had acl change status
Message-ID: <20090105203301.465D6208DB2@bastion.fedora.phx.redhat.com>

ixs has set the watchbugzilla acl on bacula (Fedora 10) to Approved for fschwarz

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



From pkgdb at fedoraproject.org  Mon Jan  5 20:33:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Jan 2009 20:33:03 +0000
Subject: [pkgdb] bacula had acl change status
Message-ID: <20090105203303.C4B9C208DB7@bastion.fedora.phx.redhat.com>

ixs has set the commit acl on bacula (Fedora 10) to Approved for fschwarz

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



From pkgdb at fedoraproject.org  Mon Jan  5 20:33:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Jan 2009 20:33:10 +0000
Subject: [pkgdb] bacula had acl change status
Message-ID: <20090105203310.EC63E208D50@bastion.fedora.phx.redhat.com>

ixs has set the commit acl on bacula (Fedora 9) to Approved for fschwarz

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



From pkgdb at fedoraproject.org  Mon Jan  5 20:33:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Jan 2009 20:33:25 +0000
Subject: [pkgdb] bacula had acl change status
Message-ID: <20090105203326.1297F208D6A@bastion.fedora.phx.redhat.com>

ixs has set the commit acl on bacula (Fedora devel) to Approved for fschwarz

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



From pkgdb at fedoraproject.org  Mon Jan  5 20:34:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Jan 2009 20:34:38 +0000
Subject: [pkgdb] bacula: fschwarz has requested commit
Message-ID: <20090105203438.D5A2F208DA9@bastion.fedora.phx.redhat.com>

fschwarz has requested the commit acl on bacula (Fedora EPEL 4)

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



From pkgdb at fedoraproject.org  Mon Jan  5 20:34:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Jan 2009 20:34:40 +0000
Subject: [pkgdb] bacula: fschwarz has requested approveacls
Message-ID: <20090105203440.ADB8F208DAE@bastion.fedora.phx.redhat.com>

fschwarz has requested the approveacls acl on bacula (Fedora EPEL 4)

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



From pkgdb at fedoraproject.org  Mon Jan  5 20:34:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Jan 2009 20:34:47 +0000
Subject: [pkgdb] bacula: fschwarz has requested commit
Message-ID: <20090105203447.E1090208DB2@bastion.fedora.phx.redhat.com>

fschwarz has requested the commit acl on bacula (Fedora EPEL 5)

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



From pkgdb at fedoraproject.org  Mon Jan  5 20:34:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Jan 2009 20:34:48 +0000
Subject: [pkgdb] bacula: fschwarz has requested approveacls
Message-ID: <20090105203448.ED5C4208DB5@bastion.fedora.phx.redhat.com>

fschwarz has requested the approveacls acl on bacula (Fedora EPEL 5)

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



From pkgdb at fedoraproject.org  Mon Jan  5 20:34:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Jan 2009 20:34:54 +0000
Subject: [pkgdb] bacula: fschwarz has requested commit
Message-ID: <20090105203455.0B3A6208DB8@bastion.fedora.phx.redhat.com>

fschwarz has requested the commit acl on bacula (Fedora 8)

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



From pkgdb at fedoraproject.org  Mon Jan  5 20:34:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Jan 2009 20:34:59 +0000
Subject: [pkgdb] bacula: fschwarz has requested approveacls
Message-ID: <20090105203459.93FCA208D7D@bastion.fedora.phx.redhat.com>

fschwarz has requested the approveacls acl on bacula (Fedora 9)

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



From pkgdb at fedoraproject.org  Mon Jan  5 20:35:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Jan 2009 20:35:00 +0000
Subject: [pkgdb] bacula: fschwarz has requested approveacls
Message-ID: <20090105203501.1AD40208DBD@bastion.fedora.phx.redhat.com>

fschwarz has requested the approveacls acl on bacula (Fedora 8)

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



From pkgdb at fedoraproject.org  Mon Jan  5 20:35:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Jan 2009 20:35:04 +0000
Subject: [pkgdb] bacula: fschwarz has requested approveacls
Message-ID: <20090105203505.65C8D208DC0@bastion.fedora.phx.redhat.com>

fschwarz has requested the approveacls acl on bacula (Fedora 10)

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



From pkgdb at fedoraproject.org  Mon Jan  5 20:36:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Jan 2009 20:36:29 +0000
Subject: [pkgdb] bacula had acl change status
Message-ID: <20090105203629.BBE31208D53@bastion.fedora.phx.redhat.com>

ixs has set the commit acl on bacula (Fedora EPEL 4) to Approved for fschwarz

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



From pkgdb at fedoraproject.org  Mon Jan  5 20:36:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Jan 2009 20:36:30 +0000
Subject: [pkgdb] bacula had acl change status
Message-ID: <20090105203630.51B3C208D5A@bastion.fedora.phx.redhat.com>

ixs has set the commit acl on bacula (Fedora EPEL 5) to Approved for fschwarz

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



From frankb at fedoraproject.org  Mon Jan  5 20:36:59 2009
From: frankb at fedoraproject.org (=?utf-8?q?Frank_B=C3=BCttner?=)
Date: Mon,  5 Jan 2009 20:36:59 +0000 (UTC)
Subject: rpms/qwt-doc/F-9 .cvsignore, 1.2, 1.3 qwt-doc.spec, 1.1,
	1.2 qwt-path.patch, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20090105203659.0D59970108@cvs1.fedora.phx.redhat.com>

Author: frankb

Update of /cvs/pkgs/rpms/qwt-doc/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26628

Modified Files:
	.cvsignore qwt-doc.spec qwt-path.patch sources 
Log Message:
update to 5.1.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qwt-doc/F-9/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	30 Sep 2007 19:06:32 -0000	1.2
+++ .cvsignore	5 Jan 2009 20:36:28 -0000	1.3
@@ -1,2 +1,2 @@
-qwt-5.0.2.pdf
-qwt-5.0.2.tar.bz2
+qwt-5.1.1.tar.bz2
+qwt-5.1.1.pdf


Index: qwt-doc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qwt-doc/F-9/qwt-doc.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- qwt-doc.spec	30 Sep 2007 19:06:32 -0000	1.1
+++ qwt-doc.spec	5 Jan 2009 20:36:28 -0000	1.2
@@ -1,17 +1,17 @@
 Name:		qwt-doc
 Summary:	Documentation of qwt
-Version:	5.0.2
-Release:	4%{?dist}
+Version:	5.1.1
+Release:	2%{?dist}
 URL:		http://qwt.sourceforge.net
 License:	LGPLv2 with exceptions
-Group:          Documentation
-Source0:        http://downloads.sourceforge.net/qwt/qwt-%{version}.tar.bz2
+Group:		Documentation
+Source0:	http://downloads.sourceforge.net/qwt/qwt-%{version}.tar.bz2
 Source1:	http://downloads.sourceforge.net/qwt/qwt-%{version}.pdf
-Patch0:         qwt-path.patch
-Buildroot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:  qt4-devel
+Patch0:		qwt-path.patch
+Buildroot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires:	qt4-devel
 Buildarch:	noarch
-Requires: 	qwt = %{version}
+Requires:	qwt = %{version}
 
 %if 0%{?rhel} > 4
 %define epel5mode 1
@@ -58,6 +58,9 @@
 mkdir -p $RPM_BUILD_ROOT%{_mandir}/man3
 mv $RPM_BUILD_ROOT%{_docdir}/qwt-%{version}/man/man3/* $RPM_BUILD_ROOT%{_mandir}/man3/
 rm -rf $RPM_BUILD_ROOT%{_docdir}/qwt-%{version}/man
+#fix for #322191
+mv $RPM_BUILD_ROOT%{_mandir}/man3/deprecated.3 $RPM_BUILD_ROOT%{_mandir}/man3/qwt-deprecated.3
+mv $RPM_BUILD_ROOT%{_mandir}/man3/todo.3 $RPM_BUILD_ROOT%{_mandir}/man3/qwt-todo.3
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -67,6 +70,13 @@
 %{_mandir}/man3/*
 
 %changelog
+* Mon Jan 05 2009 Frank B??ttner <frank-buettner at gmx.net - 5.1.1-2
+ - fix wrong file name
+* Mon Jan 05 2009 Frank B??ttner <frank-buettner at gmx.net - 5.1.1-1
+ - update to 5.1.1
+* Sun Oct 07 2007 Frank B??ttner <frank-buettner at gmx.net - 5.0.2-5
+ - fix for bug #322191
+ - use tab for all seperators
 * Sun Sep 30 2007 Frank B??ttner <frank-buettner at gmx.net - 5.0.2-4
  - modify the file encoding
 * Sat Sep 29 2007 Frank B??ttner <frank-buettner at gmx.net - 5.0.2-3

qwt-path.patch:

Index: qwt-path.patch
===================================================================
RCS file: /cvs/pkgs/rpms/qwt-doc/F-9/qwt-path.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- qwt-path.patch	30 Sep 2007 19:06:32 -0000	1.1
+++ qwt-path.patch	5 Jan 2009 20:36:28 -0000	1.2
@@ -1,7 +1,7 @@
-diff -Nur qwt-5.0.1.org/designer/designer.pro qwt-5.0.1/designer/designer.pro
---- qwt-5.0.1.org/designer/designer.pro	2007-05-15 15:23:47.000000000 +0200
-+++ qwt-5.0.1/designer/designer.pro	2007-05-15 17:29:13.000000000 +0200
-@@ -92,7 +92,7 @@
+diff -Nur qwt-5.1.1.org/designer/designer.pro qwt-5.1.1/designer/designer.pro
+--- qwt-5.1.1.org/designer/designer.pro	2008-05-24 18:47:36.000000000 +0200
++++ qwt-5.1.1/designer/designer.pro	2009-01-04 17:54:33.000000000 +0100
+@@ -123,7 +123,7 @@
          RESOURCES += \
              qwt_designer_plugin.qrc
  
@@ -9,21 +9,20 @@
 +        target.path = QTDESIGNERPATH
          INSTALLS += target
      }
+ }
+diff -Nur qwt-5.1.1.org/qwtconfig.pri qwt-5.1.1/qwtconfig.pri
+--- qwt-5.1.1.org/qwtconfig.pri	2008-05-24 18:47:36.000000000 +0200
++++ qwt-5.1.1/qwtconfig.pri	2009-01-04 17:55:07.000000000 +0100
+@@ -7,17 +7,9 @@
+ VER_PAT      = 1
+ VERSION      = $$VER_MAJ.$$VER_MIN.$$VER_PAT
  
-diff -Nur qwt-5.0.1.org/qwtconfig.pri qwt-5.0.1/qwtconfig.pri
---- qwt-5.0.1.org/qwtconfig.pri	2007-05-15 12:07:33.000000000 +0200
-+++ qwt-5.0.1/qwtconfig.pri	2007-05-15 15:52:39.000000000 +0200
-@@ -1,18 +1,6 @@
--######################################################################
--# Install paths
--######################################################################
--
 -unix {
--    INSTALLBASE    = /usr/local/qwt-5.0.2
+-    INSTALLBASE    = /usr/local/qwt-5.1.1
 -}
 -
 -win32 {
--    INSTALLBASE    = C:/Qwt-5.0.2
+-    INSTALLBASE    = C:/Qwt-5.1.1
 -}
 -
 -target.path    = $$INSTALLBASE/lib
@@ -35,7 +34,7 @@
  
  ######################################################################
  # qmake internal options
-@@ -58,7 +46,7 @@
+@@ -97,7 +89,7 @@
  # QwtSVGItem.
  ######################################################################
  


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qwt-doc/F-9/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	30 Sep 2007 19:06:32 -0000	1.2
+++ sources	5 Jan 2009 20:36:28 -0000	1.3
@@ -1,2 +1,2 @@
-9eacccf772eb66892450a9d7ad98381d  qwt-5.0.2.pdf
-53adbb313c478dd4aae4f1c864a2037e  qwt-5.0.2.tar.bz2
+218cef1a39ebda6cfa440a0727464275  qwt-5.1.1.tar.bz2
+a6567cd390d127b0ebb564da4750a630  qwt-5.1.1.pdf



From spot at fedoraproject.org  Mon Jan  5 20:40:39 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Mon,  5 Jan 2009 20:40:39 +0000 (UTC)
Subject: rpms/gambas2/F-9 gambas2.spec,1.6,1.7 sources,1.7,1.8
Message-ID: <20090105204039.439177013F@cvs1.fedora.phx.redhat.com>

Author: spot

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

Modified Files:
	gambas2.spec sources 
Log Message:
update to 2.10.2


Index: gambas2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gambas2/F-9/gambas2.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- gambas2.spec	30 Oct 2008 18:20:35 -0000	1.6
+++ gambas2.spec	5 Jan 2009 20:40:08 -0000	1.7
@@ -1,6 +1,6 @@
 Name:		gambas2
 Summary:	IDE based on a basic interpreter with object extensions
-Version:	2.9.0
+Version:	2.10.2
 Release:	1%{?dist}
 License:	GPL+
 Group:		Development/Tools
@@ -1491,6 +1491,9 @@
 %{_datadir}/%{name}/info/gb.xml.xslt.*
 
 %changelog
+* Mon Jan  5 2008 Tom "spot" Callaway <tcallawa at redhat.com> 2.10.2-1
+- update to 2.10.2
+
 * Thu Oct 30 2008 Tom "spot" Callaway <tcallawa at redhat.com> 2.9.0-1
 - Update to 2.9.0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gambas2/F-9/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	30 Oct 2008 18:20:36 -0000	1.7
+++ sources	5 Jan 2009 20:40:08 -0000	1.8
@@ -1 +1 @@
-6e4d5dd7085583c6fab3ac16f52dc437  gambas2-2.9.0.tar.bz2
+65c4d39d31a3f63dede805bacbfdd104  gambas2-2.10.2.tar.bz2



From spot at fedoraproject.org  Mon Jan  5 20:40:38 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Mon,  5 Jan 2009 20:40:38 +0000 (UTC)
Subject: rpms/gambas2/F-10 gambas2.spec,1.7,1.8 sources,1.8,1.9
Message-ID: <20090105204038.B9D207013F@cvs1.fedora.phx.redhat.com>

Author: spot

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

Modified Files:
	gambas2.spec sources 
Log Message:
update to 2.10.2


Index: gambas2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gambas2/F-10/gambas2.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- gambas2.spec	30 Oct 2008 18:20:36 -0000	1.7
+++ gambas2.spec	5 Jan 2009 20:40:07 -0000	1.8
@@ -1,6 +1,6 @@
 Name:		gambas2
 Summary:	IDE based on a basic interpreter with object extensions
-Version:	2.9.0
+Version:	2.10.2
 Release:	1%{?dist}
 License:	GPL+
 Group:		Development/Tools
@@ -1491,6 +1491,9 @@
 %{_datadir}/%{name}/info/gb.xml.xslt.*
 
 %changelog
+* Mon Jan  5 2008 Tom "spot" Callaway <tcallawa at redhat.com> 2.10.2-1
+- update to 2.10.2
+
 * Thu Oct 30 2008 Tom "spot" Callaway <tcallawa at redhat.com> 2.9.0-1
 - Update to 2.9.0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gambas2/F-10/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	30 Oct 2008 18:20:36 -0000	1.8
+++ sources	5 Jan 2009 20:40:08 -0000	1.9
@@ -1 +1 @@
-6e4d5dd7085583c6fab3ac16f52dc437  gambas2-2.9.0.tar.bz2
+65c4d39d31a3f63dede805bacbfdd104  gambas2-2.10.2.tar.bz2



From spot at fedoraproject.org  Mon Jan  5 20:40:39 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Mon,  5 Jan 2009 20:40:39 +0000 (UTC)
Subject: rpms/gambas2/devel gambas2.spec,1.8,1.9 sources,1.8,1.9
Message-ID: <20090105204039.99B337013F@cvs1.fedora.phx.redhat.com>

Author: spot

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

Modified Files:
	gambas2.spec sources 
Log Message:
update to 2.10.2


Index: gambas2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gambas2/devel/gambas2.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- gambas2.spec	29 Nov 2008 14:41:47 -0000	1.8
+++ gambas2.spec	5 Jan 2009 20:40:09 -0000	1.9
@@ -1,7 +1,7 @@
 Name:		gambas2
 Summary:	IDE based on a basic interpreter with object extensions
-Version:	2.9.0
-Release:	2%{?dist}
+Version:	2.10.2
+Release:	1%{?dist}
 License:	GPL+
 Group:		Development/Tools
 URL:		http://gambas.sourceforge.net/
@@ -1491,6 +1491,9 @@
 %{_datadir}/%{name}/info/gb.xml.xslt.*
 
 %changelog
+* Mon Jan  5 2008 Tom "spot" Callaway <tcallawa at redhat.com> 2.10.2-1
+- update to 2.10.2
+
 * Sat Nov 29 2008 Caol??n McNamara <caolanm at redhat.com> 2.9.0-2
 - rebuild for dependencies
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gambas2/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	30 Oct 2008 18:20:36 -0000	1.8
+++ sources	5 Jan 2009 20:40:09 -0000	1.9
@@ -1 +1 @@
-6e4d5dd7085583c6fab3ac16f52dc437  gambas2-2.9.0.tar.bz2
+65c4d39d31a3f63dede805bacbfdd104  gambas2-2.10.2.tar.bz2



From terjeros at fedoraproject.org  Mon Jan  5 20:44:23 2009
From: terjeros at fedoraproject.org (=?utf-8?q?Terje_R=C3=B8sten?=)
Date: Mon,  5 Jan 2009 20:44:23 +0000 (UTC)
Subject: rpms/bpython/F-10 .cvsignore, 1.4, 1.5 bpython.spec, 1.3,
	1.4 sources, 1.4, 1.5
Message-ID: <20090105204423.A434270108@cvs1.fedora.phx.redhat.com>

Author: terjeros

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

Modified Files:
	.cvsignore bpython.spec sources 
Log Message:
Sync with rawhide.




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/bpython/F-10/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	1 Sep 2008 20:25:45 -0000	1.4
+++ .cvsignore	5 Jan 2009 20:43:53 -0000	1.5
@@ -1 +1 @@
-bpython-0.7.0.tar.gz
+bpython-0.7.1.tar.gz


Index: bpython.spec
===================================================================
RCS file: /cvs/extras/rpms/bpython/F-10/bpython.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- bpython.spec	1 Sep 2008 20:25:45 -0000	1.3
+++ bpython.spec	5 Jan 2009 20:43:53 -0000	1.4
@@ -2,14 +2,14 @@
 
 Name:          bpython
 Summary:       Fancy curses interface to the Python interactive interpreter
-Version:       0.7.0
-Release:       1%{?dist}
+Version:       0.7.1
+Release:       2%{?dist}
 URL:           http://www.noiseforfree.com/bpython/
 Group:         Development/Libraries
 License:       MIT
 Source0:       http://www.noiseforfree.com/%{name}/%{name}-%{version}.tar.gz
 BuildArch:     noarch
-BuildRequires: python-devel desktop-file-utils
+BuildRequires: python-devel python-setuptools desktop-file-utils
 Requires:      python-pygments pyparsing
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -54,6 +54,15 @@
 #{_datadir}/applications/%{name}.desktop
 
 %changelog
+* Mon Jan  5 2009 Terje Rosten <terje.rosten at ntnu.no> - 0.7.1-2
+- Add setuptools to buildreq
+
+* Mon Jan  5 2009 Terje Rosten <terje.rosten at ntnu.no> - 0.7.1-1
+- 0.7.1
+
+* Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 0.7.0-2
+- Rebuild for Python 2.6
+
 * Mon  Sep 1 2008 Terje Rosten <terje.rosten at ntnu.no> - 0.7.0-1
 - 0.7.0
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/bpython/F-10/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	1 Sep 2008 20:25:45 -0000	1.4
+++ sources	5 Jan 2009 20:43:53 -0000	1.5
@@ -1 +1 @@
-5a992ada6f31cbea048d2dee07ec6bfe  bpython-0.7.0.tar.gz
+65554d3ebb9f9b5cab62e446424b8ab7  bpython-0.7.1.tar.gz



From terjeros at fedoraproject.org  Mon Jan  5 20:44:24 2009
From: terjeros at fedoraproject.org (=?utf-8?q?Terje_R=C3=B8sten?=)
Date: Mon,  5 Jan 2009 20:44:24 +0000 (UTC)
Subject: rpms/bpython/F-9 .cvsignore, 1.4, 1.5 bpython.spec, 1.3, 1.4 sources,
	1.4, 1.5
Message-ID: <20090105204424.0401670108@cvs1.fedora.phx.redhat.com>

Author: terjeros

Update of /cvs/extras/rpms/bpython/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31171/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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	1 Sep 2008 20:40:03 -0000	1.4
+++ .cvsignore	5 Jan 2009 20:43:53 -0000	1.5
@@ -1 +1 @@
-bpython-0.7.0.tar.gz
+bpython-0.7.1.tar.gz


Index: bpython.spec
===================================================================
RCS file: /cvs/extras/rpms/bpython/F-9/bpython.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- bpython.spec	1 Sep 2008 20:40:03 -0000	1.3
+++ bpython.spec	5 Jan 2009 20:43:53 -0000	1.4
@@ -2,14 +2,14 @@
 
 Name:          bpython
 Summary:       Fancy curses interface to the Python interactive interpreter
-Version:       0.7.0
-Release:       1%{?dist}
+Version:       0.7.1
+Release:       2%{?dist}
 URL:           http://www.noiseforfree.com/bpython/
 Group:         Development/Libraries
 License:       MIT
 Source0:       http://www.noiseforfree.com/%{name}/%{name}-%{version}.tar.gz
 BuildArch:     noarch
-BuildRequires: python-devel desktop-file-utils
+BuildRequires: python-devel python-setuptools desktop-file-utils
 Requires:      python-pygments pyparsing
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -54,6 +54,15 @@
 #{_datadir}/applications/%{name}.desktop
 
 %changelog
+* Mon Jan  5 2009 Terje Rosten <terje.rosten at ntnu.no> - 0.7.1-2
+- Add setuptools to buildreq
+
+* Mon Jan  5 2009 Terje Rosten <terje.rosten at ntnu.no> - 0.7.1-1
+- 0.7.1
+
+* Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 0.7.0-2
+- Rebuild for Python 2.6
+
 * Mon  Sep 1 2008 Terje Rosten <terje.rosten at ntnu.no> - 0.7.0-1
 - 0.7.0
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/bpython/F-9/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	1 Sep 2008 20:40:03 -0000	1.4
+++ sources	5 Jan 2009 20:43:53 -0000	1.5
@@ -1 +1 @@
-5a992ada6f31cbea048d2dee07ec6bfe  bpython-0.7.0.tar.gz
+65554d3ebb9f9b5cab62e446424b8ab7  bpython-0.7.1.tar.gz



From spot at fedoraproject.org  Mon Jan  5 20:45:01 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Mon,  5 Jan 2009 20:45:01 +0000 (UTC)
Subject: rpms/gambas2/F-10 gambas2.spec,1.8,1.9
Message-ID: <20090105204501.38E9C70108@cvs1.fedora.phx.redhat.com>

Author: spot

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

Modified Files:
	gambas2.spec 
Log Message:
hey, it is 2009!


Index: gambas2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gambas2/F-10/gambas2.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- gambas2.spec	5 Jan 2009 20:40:07 -0000	1.8
+++ gambas2.spec	5 Jan 2009 20:44:30 -0000	1.9
@@ -1491,7 +1491,7 @@
 %{_datadir}/%{name}/info/gb.xml.xslt.*
 
 %changelog
-* Mon Jan  5 2008 Tom "spot" Callaway <tcallawa at redhat.com> 2.10.2-1
+* Mon Jan  5 2009 Tom "spot" Callaway <tcallawa at redhat.com> 2.10.2-1
 - update to 2.10.2
 
 * Thu Oct 30 2008 Tom "spot" Callaway <tcallawa at redhat.com> 2.9.0-1



From spot at fedoraproject.org  Mon Jan  5 20:45:01 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Mon,  5 Jan 2009 20:45:01 +0000 (UTC)
Subject: rpms/gambas2/F-9 gambas2.spec,1.7,1.8
Message-ID: <20090105204501.A2A2B70108@cvs1.fedora.phx.redhat.com>

Author: spot

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

Modified Files:
	gambas2.spec 
Log Message:
hey, it is 2009!


Index: gambas2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gambas2/F-9/gambas2.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- gambas2.spec	5 Jan 2009 20:40:08 -0000	1.7
+++ gambas2.spec	5 Jan 2009 20:44:31 -0000	1.8
@@ -1491,7 +1491,7 @@
 %{_datadir}/%{name}/info/gb.xml.xslt.*
 
 %changelog
-* Mon Jan  5 2008 Tom "spot" Callaway <tcallawa at redhat.com> 2.10.2-1
+* Mon Jan  5 2009 Tom "spot" Callaway <tcallawa at redhat.com> 2.10.2-1
 - update to 2.10.2
 
 * Thu Oct 30 2008 Tom "spot" Callaway <tcallawa at redhat.com> 2.9.0-1



From spot at fedoraproject.org  Mon Jan  5 20:45:02 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Mon,  5 Jan 2009 20:45:02 +0000 (UTC)
Subject: rpms/gambas2/devel gambas2.spec,1.9,1.10
Message-ID: <20090105204502.1B35F70108@cvs1.fedora.phx.redhat.com>

Author: spot

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

Modified Files:
	gambas2.spec 
Log Message:
hey, it is 2009!


Index: gambas2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gambas2/devel/gambas2.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- gambas2.spec	5 Jan 2009 20:40:09 -0000	1.9
+++ gambas2.spec	5 Jan 2009 20:44:31 -0000	1.10
@@ -1491,7 +1491,7 @@
 %{_datadir}/%{name}/info/gb.xml.xslt.*
 
 %changelog
-* Mon Jan  5 2008 Tom "spot" Callaway <tcallawa at redhat.com> 2.10.2-1
+* Mon Jan  5 2009 Tom "spot" Callaway <tcallawa at redhat.com> 2.10.2-1
 - update to 2.10.2
 
 * Sat Nov 29 2008 Caol??n McNamara <caolanm at redhat.com> 2.9.0-2



From frankb at fedoraproject.org  Mon Jan  5 20:46:33 2009
From: frankb at fedoraproject.org (=?utf-8?q?Frank_B=C3=BCttner?=)
Date: Mon,  5 Jan 2009 20:46:33 +0000 (UTC)
Subject: rpms/qwt-doc/F-8 .cvsignore, 1.2, 1.3 qwt-doc.spec, 1.1,
	1.2 qwt-path.patch, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20090105204633.4DC9E70108@cvs1.fedora.phx.redhat.com>

Author: frankb

Update of /cvs/pkgs/rpms/qwt-doc/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32688

Modified Files:
	.cvsignore qwt-doc.spec qwt-path.patch sources 
Log Message:
update to 5.1.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qwt-doc/F-8/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	30 Sep 2007 19:06:32 -0000	1.2
+++ .cvsignore	5 Jan 2009 20:46:02 -0000	1.3
@@ -1,2 +1,2 @@
-qwt-5.0.2.pdf
-qwt-5.0.2.tar.bz2
+qwt-5.1.1.tar.bz2
+qwt-5.1.1.pdf


Index: qwt-doc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qwt-doc/F-8/qwt-doc.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- qwt-doc.spec	30 Sep 2007 19:06:32 -0000	1.1
+++ qwt-doc.spec	5 Jan 2009 20:46:02 -0000	1.2
@@ -1,17 +1,17 @@
 Name:		qwt-doc
 Summary:	Documentation of qwt
-Version:	5.0.2
-Release:	4%{?dist}
+Version:	5.1.1
+Release:	2%{?dist}
 URL:		http://qwt.sourceforge.net
 License:	LGPLv2 with exceptions
-Group:          Documentation
-Source0:        http://downloads.sourceforge.net/qwt/qwt-%{version}.tar.bz2
+Group:		Documentation
+Source0:	http://downloads.sourceforge.net/qwt/qwt-%{version}.tar.bz2
 Source1:	http://downloads.sourceforge.net/qwt/qwt-%{version}.pdf
-Patch0:         qwt-path.patch
-Buildroot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:  qt4-devel
+Patch0:		qwt-path.patch
+Buildroot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires:	qt4-devel
 Buildarch:	noarch
-Requires: 	qwt = %{version}
+Requires:	qwt = %{version}
 
 %if 0%{?rhel} > 4
 %define epel5mode 1
@@ -58,6 +58,9 @@
 mkdir -p $RPM_BUILD_ROOT%{_mandir}/man3
 mv $RPM_BUILD_ROOT%{_docdir}/qwt-%{version}/man/man3/* $RPM_BUILD_ROOT%{_mandir}/man3/
 rm -rf $RPM_BUILD_ROOT%{_docdir}/qwt-%{version}/man
+#fix for #322191
+mv $RPM_BUILD_ROOT%{_mandir}/man3/deprecated.3 $RPM_BUILD_ROOT%{_mandir}/man3/qwt-deprecated.3
+mv $RPM_BUILD_ROOT%{_mandir}/man3/todo.3 $RPM_BUILD_ROOT%{_mandir}/man3/qwt-todo.3
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -67,6 +70,13 @@
 %{_mandir}/man3/*
 
 %changelog
+* Mon Jan 05 2009 Frank B??ttner <frank-buettner at gmx.net - 5.1.1-2
+ - fix wrong file name
+* Mon Jan 05 2009 Frank B??ttner <frank-buettner at gmx.net - 5.1.1-1
+ - update to 5.1.1
+* Sun Oct 07 2007 Frank B??ttner <frank-buettner at gmx.net - 5.0.2-5
+ - fix for bug #322191
+ - use tab for all seperators
 * Sun Sep 30 2007 Frank B??ttner <frank-buettner at gmx.net - 5.0.2-4
  - modify the file encoding
 * Sat Sep 29 2007 Frank B??ttner <frank-buettner at gmx.net - 5.0.2-3

qwt-path.patch:

Index: qwt-path.patch
===================================================================
RCS file: /cvs/pkgs/rpms/qwt-doc/F-8/qwt-path.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- qwt-path.patch	30 Sep 2007 19:06:32 -0000	1.1
+++ qwt-path.patch	5 Jan 2009 20:46:03 -0000	1.2
@@ -1,7 +1,7 @@
-diff -Nur qwt-5.0.1.org/designer/designer.pro qwt-5.0.1/designer/designer.pro
---- qwt-5.0.1.org/designer/designer.pro	2007-05-15 15:23:47.000000000 +0200
-+++ qwt-5.0.1/designer/designer.pro	2007-05-15 17:29:13.000000000 +0200
-@@ -92,7 +92,7 @@
+diff -Nur qwt-5.1.1.org/designer/designer.pro qwt-5.1.1/designer/designer.pro
+--- qwt-5.1.1.org/designer/designer.pro	2008-05-24 18:47:36.000000000 +0200
++++ qwt-5.1.1/designer/designer.pro	2009-01-04 17:54:33.000000000 +0100
+@@ -123,7 +123,7 @@
          RESOURCES += \
              qwt_designer_plugin.qrc
  
@@ -9,21 +9,20 @@
 +        target.path = QTDESIGNERPATH
          INSTALLS += target
      }
+ }
+diff -Nur qwt-5.1.1.org/qwtconfig.pri qwt-5.1.1/qwtconfig.pri
+--- qwt-5.1.1.org/qwtconfig.pri	2008-05-24 18:47:36.000000000 +0200
++++ qwt-5.1.1/qwtconfig.pri	2009-01-04 17:55:07.000000000 +0100
+@@ -7,17 +7,9 @@
+ VER_PAT      = 1
+ VERSION      = $$VER_MAJ.$$VER_MIN.$$VER_PAT
  
-diff -Nur qwt-5.0.1.org/qwtconfig.pri qwt-5.0.1/qwtconfig.pri
---- qwt-5.0.1.org/qwtconfig.pri	2007-05-15 12:07:33.000000000 +0200
-+++ qwt-5.0.1/qwtconfig.pri	2007-05-15 15:52:39.000000000 +0200
-@@ -1,18 +1,6 @@
--######################################################################
--# Install paths
--######################################################################
--
 -unix {
--    INSTALLBASE    = /usr/local/qwt-5.0.2
+-    INSTALLBASE    = /usr/local/qwt-5.1.1
 -}
 -
 -win32 {
--    INSTALLBASE    = C:/Qwt-5.0.2
+-    INSTALLBASE    = C:/Qwt-5.1.1
 -}
 -
 -target.path    = $$INSTALLBASE/lib
@@ -35,7 +34,7 @@
  
  ######################################################################
  # qmake internal options
-@@ -58,7 +46,7 @@
+@@ -97,7 +89,7 @@
  # QwtSVGItem.
  ######################################################################
  


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qwt-doc/F-8/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	30 Sep 2007 19:06:32 -0000	1.2
+++ sources	5 Jan 2009 20:46:03 -0000	1.3
@@ -1,2 +1,2 @@
-9eacccf772eb66892450a9d7ad98381d  qwt-5.0.2.pdf
-53adbb313c478dd4aae4f1c864a2037e  qwt-5.0.2.tar.bz2
+218cef1a39ebda6cfa440a0727464275  qwt-5.1.1.tar.bz2
+a6567cd390d127b0ebb564da4750a630  qwt-5.1.1.pdf



From terjeros at fedoraproject.org  Mon Jan  5 20:50:44 2009
From: terjeros at fedoraproject.org (=?utf-8?q?Terje_R=C3=B8sten?=)
Date: Mon,  5 Jan 2009 20:50:44 +0000 (UTC)
Subject: rpms/mathomatic/F-9 mathomatic-14.2.8-build.patch, NONE,
	1.1 .cvsignore, 1.3, 1.4 mathomatic.spec, 1.2, 1.3 sources, 1.3,
	1.4 mathomatic-14.1.4-build.patch, 1.1, NONE
Message-ID: <20090105205044.C50C47013C@cvs1.fedora.phx.redhat.com>

Author: terjeros

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

Modified Files:
	.cvsignore mathomatic.spec sources 
Added Files:
	mathomatic-14.2.8-build.patch 
Removed Files:
	mathomatic-14.1.4-build.patch 
Log Message:
Sync with rawhide.



mathomatic-14.2.8-build.patch:

--- NEW FILE mathomatic-14.2.8-build.patch ---
--- mathomatic-14.2.8/makefile~	2009-01-03 13:01:27.000000000 +0100
+++ mathomatic-14.2.8/makefile	2009-01-05 12:18:10.000000000 +0100
@@ -2,7 +2,8 @@
 # Currently uses gcc only options in CFLAGS, just remove them for other C compilers.
 
 VERSION		= `cat VERSION`
-CFLAGS		+= -O2 -Wuninitialized -Wunused -Wshadow -Wformat -Wparentheses -Wno-char-subscripts # gcc specific flags
+OPTFLAGS	?= -O2
+CFLAGS		+= $(OPTFLAGS) -Wuninitialized -Wunused -Wshadow -Wformat -Wparentheses -Wno-char-subscripts # gcc specific flags
 #CFLAGS		+= -Wall # Copy cproto.h to proto.h to compile with -Wall with no complaints.
 CFLAGS		+= -DUNIX -DVERSION=\"$(VERSION)\" # C compiler flags
 LDLIBS		+= -lm # libraries to link


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mathomatic/F-9/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	22 Aug 2008 19:34:40 -0000	1.3
+++ .cvsignore	5 Jan 2009 20:50:14 -0000	1.4
@@ -1 +1 @@
-mathomatic-14.1.4.tar.bz2
+mathomatic-14.2.8.tar.bz2


Index: mathomatic.spec
===================================================================
RCS file: /cvs/extras/rpms/mathomatic/F-9/mathomatic.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mathomatic.spec	22 Aug 2008 19:34:40 -0000	1.2
+++ mathomatic.spec	5 Jan 2009 20:50:14 -0000	1.3
@@ -1,12 +1,12 @@
 Summary:       Small, portable symbolic math program
 Name:          mathomatic
-Version:       14.1.4
+Version:       14.2.8
 Release:       1%{?dist} 
 License:       LGPLv2
 Group:         Applications/Engineering
 URL:           http://www.mathomatic.org/
 Source0:       http://www.panix.com/~gesslein/%{name}-%{version}.tar.bz2
-Patch0:        mathomatic-14.1.4-build.patch
+Patch0:        mathomatic-14.2.8-build.patch
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: desktop-file-utils readline-devel
 
@@ -71,6 +71,9 @@
 %{_mandir}/man1/matho-sumsq.1*
 
 %changelog
+* Mon Jan  5 2009 Terje Rosten <terje.rosten at ntnu.no> - 14.2.8-1
+- 14.2.8
+
 * Fri Aug 22 2008 Terje Rosten <terje.rosten at ntnu.no> - 14.1.4-1
 - 14.1.4
 - add build patch (add optflags, dont strip)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mathomatic/F-9/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	22 Aug 2008 19:34:40 -0000	1.3
+++ sources	5 Jan 2009 20:50:14 -0000	1.4
@@ -1 +1 @@
-85f5c734d4843fe41127366b07066e7e  mathomatic-14.1.4.tar.bz2
+99decea11fb050167fff2e89d63d7503  mathomatic-14.2.8.tar.bz2


--- mathomatic-14.1.4-build.patch DELETED ---



From terjeros at fedoraproject.org  Mon Jan  5 20:50:44 2009
From: terjeros at fedoraproject.org (=?utf-8?q?Terje_R=C3=B8sten?=)
Date: Mon,  5 Jan 2009 20:50:44 +0000 (UTC)
Subject: rpms/mathomatic/F-10 mathomatic-14.2.8-build.patch, NONE,
	1.1 .cvsignore, 1.3, 1.4 mathomatic.spec, 1.2, 1.3 sources, 1.3,
	1.4 mathomatic-14.1.4-build.patch, 1.1, NONE
Message-ID: <20090105205044.AD94870108@cvs1.fedora.phx.redhat.com>

Author: terjeros

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

Modified Files:
	.cvsignore mathomatic.spec sources 
Added Files:
	mathomatic-14.2.8-build.patch 
Removed Files:
	mathomatic-14.1.4-build.patch 
Log Message:
Sync with rawhide.



mathomatic-14.2.8-build.patch:

--- NEW FILE mathomatic-14.2.8-build.patch ---
--- mathomatic-14.2.8/makefile~	2009-01-03 13:01:27.000000000 +0100
+++ mathomatic-14.2.8/makefile	2009-01-05 12:18:10.000000000 +0100
@@ -2,7 +2,8 @@
 # Currently uses gcc only options in CFLAGS, just remove them for other C compilers.
 
 VERSION		= `cat VERSION`
-CFLAGS		+= -O2 -Wuninitialized -Wunused -Wshadow -Wformat -Wparentheses -Wno-char-subscripts # gcc specific flags
+OPTFLAGS	?= -O2
+CFLAGS		+= $(OPTFLAGS) -Wuninitialized -Wunused -Wshadow -Wformat -Wparentheses -Wno-char-subscripts # gcc specific flags
 #CFLAGS		+= -Wall # Copy cproto.h to proto.h to compile with -Wall with no complaints.
 CFLAGS		+= -DUNIX -DVERSION=\"$(VERSION)\" # C compiler flags
 LDLIBS		+= -lm # libraries to link


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mathomatic/F-10/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	22 Aug 2008 19:02:56 -0000	1.3
+++ .cvsignore	5 Jan 2009 20:50:11 -0000	1.4
@@ -1 +1 @@
-mathomatic-14.1.4.tar.bz2
+mathomatic-14.2.8.tar.bz2


Index: mathomatic.spec
===================================================================
RCS file: /cvs/extras/rpms/mathomatic/F-10/mathomatic.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mathomatic.spec	22 Aug 2008 19:02:56 -0000	1.2
+++ mathomatic.spec	5 Jan 2009 20:50:14 -0000	1.3
@@ -1,12 +1,12 @@
 Summary:       Small, portable symbolic math program
 Name:          mathomatic
-Version:       14.1.4
+Version:       14.2.8
 Release:       1%{?dist} 
 License:       LGPLv2
 Group:         Applications/Engineering
 URL:           http://www.mathomatic.org/
 Source0:       http://www.panix.com/~gesslein/%{name}-%{version}.tar.bz2
-Patch0:        mathomatic-14.1.4-build.patch
+Patch0:        mathomatic-14.2.8-build.patch
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: desktop-file-utils readline-devel
 
@@ -71,6 +71,9 @@
 %{_mandir}/man1/matho-sumsq.1*
 
 %changelog
+* Mon Jan  5 2009 Terje Rosten <terje.rosten at ntnu.no> - 14.2.8-1
+- 14.2.8
+
 * Fri Aug 22 2008 Terje Rosten <terje.rosten at ntnu.no> - 14.1.4-1
 - 14.1.4
 - add build patch (add optflags, dont strip)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mathomatic/F-10/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	22 Aug 2008 19:02:56 -0000	1.3
+++ sources	5 Jan 2009 20:50:14 -0000	1.4
@@ -1 +1 @@
-85f5c734d4843fe41127366b07066e7e  mathomatic-14.1.4.tar.bz2
+99decea11fb050167fff2e89d63d7503  mathomatic-14.2.8.tar.bz2


--- mathomatic-14.1.4-build.patch DELETED ---



From buc at fedoraproject.org  Mon Jan  5 20:53:33 2009
From: buc at fedoraproject.org (Dmitry Butskoy)
Date: Mon,  5 Jan 2009 20:53:33 +0000 (UTC)
Subject: rpms/newscache/devel socket++-1.12.12-autotools.patch,1.1,1.2
Message-ID: <20090105205333.A56E970108@cvs1.fedora.phx.redhat.com>

Author: buc

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

Modified Files:
	socket++-1.12.12-autotools.patch 
Log Message:


socket++-1.12.12-autotools.patch:

Index: socket++-1.12.12-autotools.patch
===================================================================
RCS file: /cvs/extras/rpms/newscache/devel/socket++-1.12.12-autotools.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- socket++-1.12.12-autotools.patch	5 Jan 2009 20:14:26 -0000	1.1
+++ socket++-1.12.12-autotools.patch	5 Jan 2009 20:53:03 -0000	1.2
@@ -1,30 +1,12 @@
 diff -Nrbu socket++-1.12.12/configure.in socket++-1.12.12-OK/configure.in
---- socket++-1.12.12/configure.in	2009-01-05 22:59:07.000000000 +0300
-+++ socket++-1.12.12-OK/configure.in	2009-01-05 23:02:47.000000000 +0300
-@@ -137,17 +137,6 @@
- # include <unistd.h>
- # include <sys/signal.h>
+--- socket++-1.12.12/configure.in	2004-09-30 17:00:14.000000000 +0400
++++ socket++-1.12.12-OK/configure.in	2009-01-05 23:47:20.000000000 +0300
+@@ -28,6 +28,8 @@
+ dnl Specify a configuration file
+ AM_CONFIG_HEADER(socket++/config.h)
  
--  void sigh (int s, int c, void* p, void* a) {}
--  ], [
--  typedef RETSIGTYPE (*funcptr) (...);
--  struct sigaction sa;
--  sa.sa_handler = funcptr (&sigh);
--  ],
--  socketxx_cv_sighnd_argtype=...,
--  AC_TRY_COMPILE([
--#   include <unistd.h>
--#   include <sys/signal.h>
--
-     void sigh (int s, int c, void* p, void* a);
-     ], [
-     typedef RETSIGTYPE (*funcptr) (int);
-@@ -155,7 +144,7 @@
-     sa.sa_handler = funcptr (&sigh);
-     ],
-     socketxx_cv_sighnd_argtype=int,
--    socketxx_cv_sighnd_argtype=void)) ])
-+  socketxx_cv_sighnd_argtype=void) ])
- AC_LANG_RESTORE
- AC_DEFINE_UNQUOTED(SIGHND_ARGTYPE, $socketxx_cv_sighnd_argtype)
- AC_MSG_RESULT($socketxx_cv_sighnd_argtype)
++AC_CONFIG_MACRO_DIR([m4])
++
+ dnl check for programs
+ AC_PROG_MAKE_SET
+ AC_LANG_CPLUSPLUS



From buc at fedoraproject.org  Mon Jan  5 21:03:18 2009
From: buc at fedoraproject.org (Dmitry Butskoy)
Date: Mon,  5 Jan 2009 21:03:18 +0000 (UTC)
Subject: rpms/newscache/devel newscache.spec,1.16,1.17
Message-ID: <20090105210318.E40B170108@cvs1.fedora.phx.redhat.com>

Author: buc

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

Modified Files:
	newscache.spec 
Log Message:



Index: newscache.spec
===================================================================
RCS file: /cvs/extras/rpms/newscache/devel/newscache.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- newscache.spec	5 Jan 2009 20:30:29 -0000	1.16
+++ newscache.spec	5 Jan 2009 21:02:48 -0000	1.17
@@ -51,7 +51,6 @@
 # to ship it separately.
 
 pushd socket++-%{socketver}
-autoupdate
 #./autogen
 libtoolize -v --force
 aclocal



From terjeros at fedoraproject.org  Mon Jan  5 21:09:10 2009
From: terjeros at fedoraproject.org (=?utf-8?q?Terje_R=C3=B8sten?=)
Date: Mon,  5 Jan 2009 21:09:10 +0000 (UTC)
Subject: rpms/pssh/devel .cvsignore, 1.2, 1.3 pssh.spec, 1.2, 1.3 sources,
	1.2, 1.3
Message-ID: <20090105210910.D27B370108@cvs1.fedora.phx.redhat.com>

Author: terjeros

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

Modified Files:
	.cvsignore pssh.spec sources 
Log Message:
* Mon Jan  5 2009 Terje Rosten <terje.rosten at ntnu.no> - 1.4.3-1
- 1.4.3



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pssh/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	25 Aug 2008 21:31:24 -0000	1.2
+++ .cvsignore	5 Jan 2009 21:08:40 -0000	1.3
@@ -1 +1 @@
-pssh-1.4.0.tar.gz
+pssh-1.4.3.tar.gz


Index: pssh.spec
===================================================================
RCS file: /cvs/extras/rpms/pssh/devel/pssh.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- pssh.spec	29 Nov 2008 17:56:30 -0000	1.2
+++ pssh.spec	5 Jan 2009 21:08:40 -0000	1.3
@@ -3,8 +3,8 @@
 
 Summary:   Parallel SSH tools
 Name:      pssh
-Version:   1.4.0
-Release:   2%{?dist}
+Version:   1.4.3
+Release:   1%{?dist}
 License:   BSD
 Url:       http://www.theether.org/pssh/
 Group:     Applications/Productivity
@@ -48,6 +48,9 @@
 %{python_sitelib}/%{name}lib
 
 %changelog
+* Mon Jan  5 2009 Terje Rosten <terje.rosten at ntnu.no> - 1.4.3-1
+- 1.4.3
+
 * Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 1.4.0-2
 - Rebuild for Python 2.6
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pssh/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	25 Aug 2008 21:31:24 -0000	1.2
+++ sources	5 Jan 2009 21:08:40 -0000	1.3
@@ -1 +1 @@
-6cf09d3660f837a82a9029731093b543  pssh-1.4.0.tar.gz
+dcb8e1497fdd53dced9c3a5d33053757  pssh-1.4.3.tar.gz



From buc at fedoraproject.org  Mon Jan  5 21:24:03 2009
From: buc at fedoraproject.org (Dmitry Butskoy)
Date: Mon,  5 Jan 2009 21:24:03 +0000 (UTC)
Subject: rpms/newscache/devel newscache.spec,1.17,1.18
Message-ID: <20090105212403.BC4B970108@cvs1.fedora.phx.redhat.com>

Author: buc

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

Modified Files:
	newscache.spec 
Log Message:



Index: newscache.spec
===================================================================
RCS file: /cvs/extras/rpms/newscache/devel/newscache.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- newscache.spec	5 Jan 2009 21:02:48 -0000	1.17
+++ newscache.spec	5 Jan 2009 21:23:33 -0000	1.18
@@ -53,11 +53,9 @@
 pushd socket++-%{socketver}
 #./autogen
 libtoolize -v --force
-aclocal
+aclocal -I m4
 autoheader
-libtoolize -v --force
 automake --add-missing
-libtoolize -v --force
 autoconf
 
 %configure --enable-static --disable-shared



From terjeros at fedoraproject.org  Mon Jan  5 21:24:14 2009
From: terjeros at fedoraproject.org (=?utf-8?q?Terje_R=C3=B8sten?=)
Date: Mon,  5 Jan 2009 21:24:14 +0000 (UTC)
Subject: rpms/pssh/F-10 .cvsignore, 1.2, 1.3 pssh.spec, 1.1, 1.2 sources, 1.2,
	1.3
Message-ID: <20090105212414.6796170108@cvs1.fedora.phx.redhat.com>

Author: terjeros

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

Modified Files:
	.cvsignore pssh.spec sources 
Log Message:
Sync with rawhide.




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pssh/F-10/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	25 Aug 2008 21:31:24 -0000	1.2
+++ .cvsignore	5 Jan 2009 21:23:44 -0000	1.3
@@ -1 +1 @@
-pssh-1.4.0.tar.gz
+pssh-1.4.3.tar.gz


Index: pssh.spec
===================================================================
RCS file: /cvs/extras/rpms/pssh/F-10/pssh.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pssh.spec	25 Aug 2008 21:31:24 -0000	1.1
+++ pssh.spec	5 Jan 2009 21:23:44 -0000	1.2
@@ -3,7 +3,7 @@
 
 Summary:   Parallel SSH tools
 Name:      pssh
-Version:   1.4.0
+Version:   1.4.3
 Release:   1%{?dist}
 License:   BSD
 Url:       http://www.theether.org/pssh/
@@ -48,5 +48,11 @@
 %{python_sitelib}/%{name}lib
 
 %changelog
+* Mon Jan  5 2009 Terje Rosten <terje.rosten at ntnu.no> - 1.4.3-1
+- 1.4.3
+
+* Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 1.4.0-2
+- Rebuild for Python 2.6
+
 * Mon Aug 25 2008 Terje Rosten <terje.rosten at ntnu.no> - 1.4.0-1
 - initial build


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pssh/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	25 Aug 2008 21:31:24 -0000	1.2
+++ sources	5 Jan 2009 21:23:44 -0000	1.3
@@ -1 +1 @@
-6cf09d3660f837a82a9029731093b543  pssh-1.4.0.tar.gz
+dcb8e1497fdd53dced9c3a5d33053757  pssh-1.4.3.tar.gz



From terjeros at fedoraproject.org  Mon Jan  5 21:24:14 2009
From: terjeros at fedoraproject.org (=?utf-8?q?Terje_R=C3=B8sten?=)
Date: Mon,  5 Jan 2009 21:24:14 +0000 (UTC)
Subject: rpms/pssh/F-9 .cvsignore,1.2,1.3 pssh.spec,1.1,1.2 sources,1.2,1.3
Message-ID: <20090105212414.A7E8A70108@cvs1.fedora.phx.redhat.com>

Author: terjeros

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

Modified Files:
	.cvsignore pssh.spec sources 
Log Message:
Sync with rawhide.




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pssh/F-9/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	25 Aug 2008 21:33:51 -0000	1.2
+++ .cvsignore	5 Jan 2009 21:23:44 -0000	1.3
@@ -1 +1 @@
-pssh-1.4.0.tar.gz
+pssh-1.4.3.tar.gz


Index: pssh.spec
===================================================================
RCS file: /cvs/extras/rpms/pssh/F-9/pssh.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pssh.spec	25 Aug 2008 21:33:51 -0000	1.1
+++ pssh.spec	5 Jan 2009 21:23:44 -0000	1.2
@@ -3,7 +3,7 @@
 
 Summary:   Parallel SSH tools
 Name:      pssh
-Version:   1.4.0
+Version:   1.4.3
 Release:   1%{?dist}
 License:   BSD
 Url:       http://www.theether.org/pssh/
@@ -48,5 +48,11 @@
 %{python_sitelib}/%{name}lib
 
 %changelog
+* Mon Jan  5 2009 Terje Rosten <terje.rosten at ntnu.no> - 1.4.3-1
+- 1.4.3
+
+* Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 1.4.0-2
+- Rebuild for Python 2.6
+
 * Mon Aug 25 2008 Terje Rosten <terje.rosten at ntnu.no> - 1.4.0-1
 - initial build


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pssh/F-9/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	25 Aug 2008 21:33:51 -0000	1.2
+++ sources	5 Jan 2009 21:23:44 -0000	1.3
@@ -1 +1 @@
-6cf09d3660f837a82a9029731093b543  pssh-1.4.0.tar.gz
+dcb8e1497fdd53dced9c3a5d33053757  pssh-1.4.3.tar.gz



From dcantrel at fedoraproject.org  Mon Jan  5 21:24:32 2009
From: dcantrel at fedoraproject.org (David Cantrell)
Date: Mon,  5 Jan 2009 21:24:32 +0000 (UTC)
Subject: rpms/anaconda/F-10 .cvsignore, 1.594, 1.595 anaconda.spec, 1.736,
	1.737 sources, 1.728, 1.729
Message-ID: <20090105212432.DB07570108@cvs1.fedora.phx.redhat.com>

Author: dcantrel

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

Modified Files:
	.cvsignore anaconda.spec sources 
Log Message:
* Mon Jan 05 2009 David Cantrell <dcantrell at redhat.com> - 11.4.1.63-1
- Require latest NetworkManager in F-10. (dcantrell)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/F-10/.cvsignore,v
retrieving revision 1.594
retrieving revision 1.595
diff -u -r1.594 -r1.595
--- .cvsignore	19 Nov 2008 16:29:35 -0000	1.594
+++ .cvsignore	5 Jan 2009 21:24:02 -0000	1.595
@@ -1 +1 @@
-anaconda-11.4.1.62.tar.bz2
+anaconda-11.4.1.63.tar.bz2


Index: anaconda.spec
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/F-10/anaconda.spec,v
retrieving revision 1.736
retrieving revision 1.737
diff -u -r1.736 -r1.737
--- anaconda.spec	19 Nov 2008 16:29:35 -0000	1.736
+++ anaconda.spec	5 Jan 2009 21:24:02 -0000	1.737
@@ -2,7 +2,7 @@
 
 Summary: Graphical system installer
 Name:    anaconda
-Version: 11.4.1.62
+Version: 11.4.1.63
 Release: 1
 License: GPLv2+
 Group:   Applications/System
@@ -31,7 +31,7 @@
 %define libbdevidver 5.1.2-1
 %define desktopfileutilsver 0.8
 %define e2fsver 1.41.0
-%define nmver 0.7.0
+%define nmver 1:0.7.0-1.git20090102
 %define dbusver 1.2.3
 %define createrepover 0.4.7
 %define yumutilsver 1.1.11-3
@@ -205,6 +205,9 @@
 /sbin/chkconfig --del reconfig >/dev/null 2>&1 || :
 
 %changelog
+* Mon Jan 05 2009 David Cantrell <dcantrell at redhat.com> - 11.4.1.63-1
+- Require latest NetworkManager in F-10. (dcantrell)
+
 * Wed Nov 19 2008 Jeremy Katz <katzj at redhat.com> - 11.4.1.62-1
 - Do not show disabled repos such as rawhide during the install. (jkeating)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/F-10/sources,v
retrieving revision 1.728
retrieving revision 1.729
diff -u -r1.728 -r1.729
--- sources	19 Nov 2008 16:29:35 -0000	1.728
+++ sources	5 Jan 2009 21:24:02 -0000	1.729
@@ -1 +1 @@
-fea687d2c75a3a16f7e4ceff3b1daa07  anaconda-11.4.1.62.tar.bz2
+3d142885809338a6a2c368dc1e490252  anaconda-11.4.1.63.tar.bz2



From rdieter at fedoraproject.org  Mon Jan  5 21:32:58 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon,  5 Jan 2009 21:32:58 +0000 (UTC)
Subject: rpms/kdeaddons/F-8 kdeaddons.spec,1.70,1.71
Message-ID: <20090105213258.EEE2970108@cvs1.fedora.phx.redhat.com>

Author: rdieter

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

Modified Files:
	kdeaddons.spec 
Log Message:
* Mon Jan 05 2009 Rex Dieter <rdieter at fedoraproject.org> - 3.5.10-2
- omit bogus python-exif dep



Index: kdeaddons.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeaddons/F-8/kdeaddons.spec,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- kdeaddons.spec	4 Sep 2008 15:26:38 -0000	1.70
+++ kdeaddons.spec	5 Jan 2009 21:32:28 -0000	1.71
@@ -2,7 +2,7 @@
 Name:    kdeaddons
 Summary: K Desktop Environment - Plugins
 Version: 3.5.10
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPLv2
 Group: User Interface/Desktops
@@ -26,10 +26,6 @@
 BuildRequires: xmms-devel
 
 Requires: kdebase3 >= %{version}
-%if 0%{?fedora}
-# used in jpegorient (#312641)
-Requires: python-exif
-%endif
 Requires: which
 
 Requires(post): /sbin/ldconfig
@@ -208,6 +204,9 @@
 
 
 %changelog
+* Mon Jan 05 2009 Rex Dieter <rdieter at fedoraproject.org> - 3.5.10-2
+- omit bogus python-exif dep
+
 * Thu Sep 04 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> - 3.5.10-1
 - update to 3.5.10
 



From jlaska at fedoraproject.org  Mon Jan  5 21:36:10 2009
From: jlaska at fedoraproject.org (James Laska)
Date: Mon,  5 Jan 2009 21:36:10 +0000 (UTC)
Subject: rpms/snake/devel .cvsignore, 1.9, 1.10 import.log, 1.4,
	1.5 snake.spec, 1.17, 1.18 sources, 1.17, 1.18
Message-ID: <20090105213610.66CB170108@cvs1.fedora.phx.redhat.com>

Author: jlaska

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

Modified Files:
	.cvsignore import.log snake.spec sources 
Log Message:
Update to snake-0.11-0.12


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/snake/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	18 Dec 2008 21:17:27 -0000	1.9
+++ .cvsignore	5 Jan 2009 21:35:39 -0000	1.10
@@ -1 +1 @@
-snake-0.11-0.11.tar.bz2
+snake-0.11-0.12.tar.bz2


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/snake/devel/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- import.log	18 Dec 2008 21:17:27 -0000	1.4
+++ import.log	5 Jan 2009 21:35:39 -0000	1.5
@@ -2,3 +2,4 @@
 snake-0_11-0_8_fc9:HEAD:snake-0.11-0.8.fc9.src.rpm:1217259365
 snake-0_11-0_9_fc9:HEAD:snake-0.11-0.9.fc9.src.rpm:1217261529
 snake-0_11-0_11_fc10:HEAD:snake-0.11-0.11.fc10.src.rpm:1229635008
+snake-0_11-0_12_fc10:HEAD:snake-0.11-0.12.fc10.src.rpm:1231191321


Index: snake.spec
===================================================================
RCS file: /cvs/pkgs/rpms/snake/devel/snake.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- snake.spec	18 Dec 2008 21:17:27 -0000	1.17
+++ snake.spec	5 Jan 2009 21:35:39 -0000	1.18
@@ -4,7 +4,7 @@
 Name:           snake
 Summary:        Smart Network Automated Kickstart Environment
 Version:        0.11
-%define rel     0.11
+%define rel     0.12
 Release:        %{rel}%{?dist}
 Source0:        http://hosted.fedoraproject.org/projects/snake/SnakeReleases/%{name}-%{version}-%{rel}.tar.bz2
 License:        GPLv2+
@@ -78,7 +78,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc README LICENSE
+%doc README LICENSE docs/DESIGN docs/cobbler.ks
 %{_sbindir}/snake-install
 %{_sbindir}/snake-install-tui
 %{_sbindir}/snake-tree
@@ -111,7 +111,6 @@
 %if %{build_server}
 %files server
 %defattr(-,root,root,-)
-%doc docs/DESIGN docs/cobbler.ks
 %{_sbindir}/snake-server
 %dir %{_localstatedir}/lib/snake
 %dir %{_localstatedir}/lib/snake/kickstarts
@@ -136,6 +135,9 @@
 
 
 %changelog
+* Mon Jan 5 2009 James Laska <jlaska at redhat.com> 0.11-0.12
+- Minor fix to cobbler template and move %doc into base package (jlaska)
+
 * Thu Dec 18 2008 James Laska <jlaska at redhat.com> 0.11-0.11
 - ticket#64 - only parse kickstarts when requested during snake-ks generate
   (jlaska)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/snake/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources	18 Dec 2008 21:17:27 -0000	1.17
+++ sources	5 Jan 2009 21:35:39 -0000	1.18
@@ -1 +1 @@
-e189069dc7d629f1a9749f96129e0641  snake-0.11-0.11.tar.bz2
+0a763da58a7f8babeccae3a6d35abff6  snake-0.11-0.12.tar.bz2



From rdieter at fedoraproject.org  Mon Jan  5 21:40:41 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon,  5 Jan 2009 21:40:41 +0000 (UTC)
Subject: rpms/konq-plugins/devel konq-plugins-4.1.3-jpegorient.patch, NONE, 
	1.1 konq-plugins-4.1.3-tryexec.patch, NONE,
	1.1 konq-plugins.spec, 1.15, 1.16
Message-ID: <20090105214041.2188970108@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/konq-plugins/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15054

Modified Files:
	konq-plugins.spec 
Added Files:
	konq-plugins-4.1.3-jpegorient.patch 
	konq-plugins-4.1.3-tryexec.patch 
Log Message:
* Mon Jan 05 2009 Rex Dieter <rdieter at fedoraproject.org> 4.1.3-4
- make install/fast
- jpegorient is not installed (#478736, kdebug#178612)


konq-plugins-4.1.3-jpegorient.patch:

--- NEW FILE konq-plugins-4.1.3-jpegorient.patch ---
diff -up konq-plugins-4.1.3/konq-plugins/imagerotation/CMakeLists.txt.fix konq-plugins-4.1.3/konq-plugins/imagerotation/CMakeLists.txt
--- konq-plugins-4.1.3/konq-plugins/imagerotation/CMakeLists.txt.fix	2008-11-05 11:18:19.000000000 -0600
+++ konq-plugins-4.1.3/konq-plugins/imagerotation/CMakeLists.txt	2009-01-05 15:34:59.000000000 -0600
@@ -1,10 +1,9 @@
 
-if(NOT WIN32)
-  install( FILES jpegorient.desktop DESTINATION ${SERVICES_INSTALL_DIR}/ServiceMenus )
-  install(PROGRAMS  exif.py orient.py DESTINATION ${DATA_INSTALL_DIR}/imagerotation/)
-endif(NOT WIN32)
+#if(NOT WIN32)
+#  install( FILES jpegorient.desktop DESTINATION ${SERVICES_INSTALL_DIR}/ServiceMenus )
+#  install( PROGRAMS exif.py jpegorient orient.py DESTINATION ${BIN_INSTALL_DIR} )
+#endif(NOT WIN32)
 
 install( FILES imageconverter.desktop  DESTINATION ${SERVICES_INSTALL_DIR}/ServiceMenus )
-install(PROGRAMS  exif.py orient.py DESTINATION ${DATA_INSTALL_DIR}/imagerotation/)
 
 

konq-plugins-4.1.3-tryexec.patch:

--- NEW FILE konq-plugins-4.1.3-tryexec.patch ---
diff -up konq-plugins-4.1.3/konq-plugins/imagerotation/imageconverter.desktop.tryexec konq-plugins-4.1.3/konq-plugins/imagerotation/imageconverter.desktop
--- konq-plugins-4.1.3/konq-plugins/imagerotation/imageconverter.desktop.tryexec	2008-11-05 11:18:19.000000000 -0600
+++ konq-plugins-4.1.3/konq-plugins/imagerotation/imageconverter.desktop	2009-01-05 13:05:53.000000000 -0600
@@ -1,6 +1,7 @@
 [Desktop Entry]
 Encoding=UTF-8
 ServiceTypes=KonqPopupMenu/Plugin,image/*
+TryExec=convert
 Type=Service
 Actions=convToJPEG;convToPNG;convToGIF;convToTIF;
 X-KDE-Submenu=Convert To
diff -up konq-plugins-4.1.3/konq-plugins/imagerotation/jpegorient.desktop.tryexec konq-plugins-4.1.3/konq-plugins/imagerotation/jpegorient.desktop
--- konq-plugins-4.1.3/konq-plugins/imagerotation/jpegorient.desktop.tryexec	2008-11-05 11:18:19.000000000 -0600
+++ konq-plugins-4.1.3/konq-plugins/imagerotation/jpegorient.desktop	2009-01-05 13:06:03.000000000 -0600
@@ -1,5 +1,6 @@
 [Desktop Entry]
 Encoding=UTF-8
+TryExec=jpegorient
 Type=Service
 ServiceTypes=KonqPopupMenu/Plugin,image/jpeg
 Actions=jpegRot90;jpegRot270;jpegFlipV;jpegFlipH;


Index: konq-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/konq-plugins/devel/konq-plugins.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- konq-plugins.spec	14 Dec 2008 06:22:46 -0000	1.15
+++ konq-plugins.spec	5 Jan 2009 21:40:10 -0000	1.16
@@ -2,16 +2,19 @@
 
 Name:           konq-plugins
 Version:        4.1.3
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Additional plugins that interact with konqueror
 
 Group:          Applications/Internet
 License:        GPLv2+ and LGPLv2+
 URL:            http://extragear.kde.org
 Source0:        ftp://ftp.kde.org/pub/kde/stable/%{version}/src/extragear/konq-plugins-%{version}.tar.bz2
-
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+# upstreamed
+Patch100:  konq-plugins-4.1.3-tryexec.patch
+Patch101:  konq-plugins-4.1.3-jpegorient.patch
+
 BuildRequires: kdebase4-devel >= %{version}
 BuildRequires: cmake
 BuildRequires: gettext
@@ -43,6 +46,8 @@
 
 %prep
 %setup -q
+%patch100 -p1 -b .tryexec
+%patch101 -p1 -b .jpegorient
 
 
 %build
@@ -56,7 +61,7 @@
 
 %install
 rm -rf %{buildroot}
-make install DESTDIR=%{buildroot} -C %{_target_platform}
+make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
 # locale
 for locale in adblock akregator_konqplugin autorefresh babelfish crashesplugin \
@@ -94,7 +99,6 @@
 %{_kde4_appsdir}/dolphinpart/kpartplugins/
 %{_kde4_appsdir}/domtreeviewer/
 %{_kde4_appsdir}/fsview/
-%{_kde4_appsdir}/imagerotation/
 %{_kde4_appsdir}/khtml/kpartplugins/*
 %{_kde4_appsdir}/konqueror/icons/oxygen/*/actions/google.*
 %{_kde4_appsdir}/konqueror/kpartplugins/*
@@ -114,6 +118,10 @@
 %lang(uk) %{_kde4_docdir}/HTML/uk/konq-plugins
 
 %changelog
+* Mon Jan 05 2009 Rex Dieter <rdieter at fedoraproject.org> 4.1.3-4
+- make install/fast
+- jpegorient is not installed (#478736, kdebug#178612)
+
 * Sun Dec 14 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.3-3
 - rebuild for Python 2.6 (contains Python bytecode despite no dependencies)
 



From mbarnes at fedoraproject.org  Mon Jan  5 21:53:01 2009
From: mbarnes at fedoraproject.org (Matthew Barnes)
Date: Mon,  5 Jan 2009 21:53:01 +0000 (UTC)
Subject: rpms/libsoup/devel .cvsignore, 1.43, 1.44 libsoup.spec, 1.81,
	1.82 sources, 1.43, 1.44
Message-ID: <20090105215301.CAC5070108@cvs1.fedora.phx.redhat.com>

Author: mbarnes

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

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

* Mon Jan 05 2009 Matthew Barnes <mbarnes at redhat.com> - 2.25.4-1
- Update to 2.25.4



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libsoup/devel/.cvsignore,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- .cvsignore	16 Dec 2008 10:18:05 -0000	1.43
+++ .cvsignore	5 Jan 2009 21:52:31 -0000	1.44
@@ -1 +1 @@
-libsoup-2.25.3.tar.bz2
+libsoup-2.25.4.tar.bz2


Index: libsoup.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libsoup/devel/libsoup.spec,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- libsoup.spec	16 Dec 2008 10:18:06 -0000	1.81
+++ libsoup.spec	5 Jan 2009 21:52:31 -0000	1.82
@@ -3,7 +3,7 @@
 ### Abstract ###
 
 Name: libsoup
-Version: 2.25.3
+Version: 2.25.4
 Release: 1%{?dist}
 License: LGPLv2
 Group: Development/Libraries
@@ -83,6 +83,9 @@
 %{_datadir}/gtk-doc/html/%{name}-2.4
 
 %changelog
+* Mon Jan 05 2009 Matthew Barnes <mbarnes at redhat.com> - 2.25.4-1
+- Update to 2.25.4
+
 * Tue Dec 16 2008 Matthew Barnes <mbarnes at redhat.com> - 2.25.3-1
 - Update to 2.25.3
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libsoup/devel/sources,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- sources	16 Dec 2008 10:18:06 -0000	1.43
+++ sources	5 Jan 2009 21:52:31 -0000	1.44
@@ -1 +1 @@
-01db9efcbf5cf84a497ee9fc9c51d51b  libsoup-2.25.3.tar.bz2
+280ab4388aaeef7594dd2e33f6d04e66  libsoup-2.25.4.tar.bz2



From jlaska at fedoraproject.org  Mon Jan  5 21:55:36 2009
From: jlaska at fedoraproject.org (James Laska)
Date: Mon,  5 Jan 2009 21:55:36 +0000 (UTC)
Subject: rpms/snake/F-10 .cvsignore, 1.9, 1.10 import.log, 1.4,
	1.5 snake.spec, 1.16, 1.17 sources, 1.17, 1.18
Message-ID: <20090105215536.5E6F270108@cvs1.fedora.phx.redhat.com>

Author: jlaska

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

Modified Files:
	.cvsignore import.log snake.spec sources 
Log Message:
Update to snake-0.11-0.12


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/snake/F-10/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	18 Dec 2008 21:04:14 -0000	1.9
+++ .cvsignore	5 Jan 2009 21:55:05 -0000	1.10
@@ -1 +1 @@
-snake-0.11-0.11.tar.bz2
+snake-0.11-0.12.tar.bz2


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/snake/F-10/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- import.log	18 Dec 2008 21:04:14 -0000	1.4
+++ import.log	5 Jan 2009 21:55:05 -0000	1.5
@@ -2,3 +2,4 @@
 snake-0_11-0_8_fc9:HEAD:snake-0.11-0.8.fc9.src.rpm:1217259365
 snake-0_11-0_9_fc9:HEAD:snake-0.11-0.9.fc9.src.rpm:1217261529
 snake-0_11-0_11_fc10:F-10:snake-0.11-0.11.fc10.src.rpm:1229634107
+snake-0_11-0_12_fc10:F-10:snake-0.11-0.12.fc10.src.rpm:1231192478


Index: snake.spec
===================================================================
RCS file: /cvs/pkgs/rpms/snake/F-10/snake.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- snake.spec	18 Dec 2008 21:04:14 -0000	1.16
+++ snake.spec	5 Jan 2009 21:55:05 -0000	1.17
@@ -4,7 +4,7 @@
 Name:           snake
 Summary:        Smart Network Automated Kickstart Environment
 Version:        0.11
-%define rel     0.11
+%define rel     0.12
 Release:        %{rel}%{?dist}
 Source0:        http://hosted.fedoraproject.org/projects/snake/SnakeReleases/%{name}-%{version}-%{rel}.tar.bz2
 License:        GPLv2+
@@ -78,7 +78,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc README LICENSE
+%doc README LICENSE docs/DESIGN docs/cobbler.ks
 %{_sbindir}/snake-install
 %{_sbindir}/snake-install-tui
 %{_sbindir}/snake-tree
@@ -111,7 +111,6 @@
 %if %{build_server}
 %files server
 %defattr(-,root,root,-)
-%doc docs/DESIGN docs/cobbler.ks
 %{_sbindir}/snake-server
 %dir %{_localstatedir}/lib/snake
 %dir %{_localstatedir}/lib/snake/kickstarts
@@ -136,6 +135,9 @@
 
 
 %changelog
+* Mon Jan 5 2009 James Laska <jlaska at redhat.com> 0.11-0.12
+- Minor fix to cobbler template and move %doc into base package (jlaska)
+
 * Thu Dec 18 2008 James Laska <jlaska at redhat.com> 0.11-0.11
 - ticket#64 - only parse kickstarts when requested during snake-ks generate
   (jlaska)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/snake/F-10/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources	18 Dec 2008 21:04:14 -0000	1.17
+++ sources	5 Jan 2009 21:55:05 -0000	1.18
@@ -1 +1 @@
-e189069dc7d629f1a9749f96129e0641  snake-0.11-0.11.tar.bz2
+0a763da58a7f8babeccae3a6d35abff6  snake-0.11-0.12.tar.bz2



From kwizart at fedoraproject.org  Mon Jan  5 21:57:37 2009
From: kwizart at fedoraproject.org (Chauvet Nicolas)
Date: Mon,  5 Jan 2009 21:57:37 +0000 (UTC)
Subject: rpms/python-kaa-metadata/devel sources, 1.5, 1.6 .cvsignore, 1.5,
	1.6 python-kaa-metadata.spec, 1.11, 1.12
Message-ID: <20090105215737.BEDFD70108@cvs1.fedora.phx.redhat.com>

Author: kwizart

Update of /cvs/pkgs/rpms/python-kaa-metadata/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21683

Modified Files:
	sources .cvsignore python-kaa-metadata.spec 
Log Message:
Update to 0.7.5



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-kaa-metadata/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	25 Mar 2008 14:41:22 -0000	1.5
+++ sources	5 Jan 2009 21:57:07 -0000	1.6
@@ -1 +1 @@
-ce116b588e1ebbdcd0b8bf4aa4ba5ed4  kaa-metadata-0.7.3.tar.gz
+012d1de5593d1a4e0e97cec52de7f1ac  kaa-metadata-0.7.5.tar.gz


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-kaa-metadata/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	25 Mar 2008 14:41:22 -0000	1.5
+++ .cvsignore	5 Jan 2009 21:57:07 -0000	1.6
@@ -1 +1 @@
-kaa-metadata-0.7.3.tar.gz
+kaa-metadata-0.7.5.tar.gz


Index: python-kaa-metadata.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-kaa-metadata/devel/python-kaa-metadata.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- python-kaa-metadata.spec	29 Nov 2008 15:36:05 -0000	1.11
+++ python-kaa-metadata.spec	5 Jan 2009 21:57:07 -0000	1.12
@@ -1,8 +1,8 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           python-kaa-metadata
-Version:        0.7.3
-Release:        2%{?dist}
+Version:        0.7.5
+Release:        1%{?dist}
 Summary:        The Kaa Media - metadata binding for python
 
 Group:          Development/Languages
@@ -70,6 +70,9 @@
 
 
 %changelog
+* Mon Jan  5 2009 kwizart < kwizart at gmail.com > - 0.7.5-1
+- Update to 0.7.5
+
 * Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 0.7.3-2
 - Rebuild for Python 2.6
 



From dwalsh at fedoraproject.org  Mon Jan  5 22:14:42 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Mon,  5 Jan 2009 22:14:42 +0000 (UTC)
Subject: rpms/selinux-policy/devel selinux-policy.spec,1.761,1.762
Message-ID: <20090105221442.7DCC770108@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25023

Modified Files:
	selinux-policy.spec 
Log Message:
* Mon Jan 5 2009 Dan Walsh <dwalsh at redhat.com> 3.6.2-1
- Update to upstream



Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.761
retrieving revision 1.762
diff -u -r1.761 -r1.762
--- selinux-policy.spec	4 Jan 2009 19:45:03 -0000	1.761
+++ selinux-policy.spec	5 Jan 2009 22:14:11 -0000	1.762
@@ -19,12 +19,12 @@
 %define CHECKPOLICYVER 2.0.16-3
 Summary: SELinux policy configuration
 Name: selinux-policy
-Version: 3.6.1
-Release: 15%{?dist}
+Version: 3.6.2
+Release: 1%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
-patch: policy-20081111.patch
+patch: policy-20090105.patch
 Source1: modules-targeted.conf
 Source2: booleans-targeted.conf
 Source3: Makefile.devel
@@ -446,6 +446,9 @@
 %endif
 
 %changelog
+* Mon Jan 5 2009 Dan Walsh <dwalsh at redhat.com> 3.6.2-1
+- Update to upstream
+
 * Sun Jan 4 2009 Dan Walsh <dwalsh at redhat.com> 3.6.1-15
 - Allow hal_acl_t to getattr/setattr fixed_disk
 



From clumens at fedoraproject.org  Mon Jan  5 22:21:06 2009
From: clumens at fedoraproject.org (Christopher Edward Lumens)
Date: Mon,  5 Jan 2009 22:21:06 +0000 (UTC)
Subject: rpms/anaconda/devel .cvsignore, 1.593, 1.594 anaconda.spec, 1.736, 
	1.737 sources, 1.727, 1.728
Message-ID: <20090105222106.3A85C70108@cvs1.fedora.phx.redhat.com>

Author: clumens

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

Modified Files:
	.cvsignore anaconda.spec sources 
Log Message:
New version.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/devel/.cvsignore,v
retrieving revision 1.593
retrieving revision 1.594
diff -u -r1.593 -r1.594
--- .cvsignore	24 Dec 2008 04:07:13 -0000	1.593
+++ .cvsignore	5 Jan 2009 22:20:35 -0000	1.594
@@ -1 +1,2 @@
 anaconda-11.5.0.3.tar.bz2
+anaconda-11.5.0.4.tar.bz2


Index: anaconda.spec
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/devel/anaconda.spec,v
retrieving revision 1.736
retrieving revision 1.737
diff -u -r1.736 -r1.737
--- anaconda.spec	24 Dec 2008 04:07:13 -0000	1.736
+++ anaconda.spec	5 Jan 2009 22:20:35 -0000	1.737
@@ -2,12 +2,16 @@
 
 Summary: Graphical system installer
 Name:    anaconda
-Version: 11.5.0.3
+Version: 11.5.0.4
 Release: 1
 License: GPLv2+
 Group:   Applications/System
 URL:     http://fedoraproject.org/wiki/Anaconda
 
+# To generate Source0 do:
+# git clone http://git.fedorahosted.org/git/anaconda.git
+# git checkout -b archive-branch anaconda-%{version}-%{release}
+# make archive-no-tag
 Source0: %{name}-%{version}.tar.bz2
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -29,7 +33,6 @@
 %define syscfgdatever 1.9.0
 %define pythonpyblockver 0.24-1
 %define libbdevidver 5.1.2-1
-%define desktopfileutilsver 0.8
 %define e2fsver 1.41.0
 %define nmver 0.7.0
 %define dbusver 1.2.3
@@ -97,7 +100,6 @@
 Requires: python-pyblock >= %{pythonpyblockver}
 Requires: libbdevid >= %{libbdevidver}
 Requires: libbdevid-python
-Requires: audit-libs
 Requires: libuser-python
 Requires: newt-python
 Requires: authconfig
@@ -116,8 +118,6 @@
 %ifarch %livearches
 Requires: usermode
 Requires: zenity
-Requires(post): desktop-file-utils >= %{desktopfileutilsver}
-Requires(postun): desktop-file-utils >= %{desktopfileutilsver}
 %endif
 Requires: createrepo >= %{createrepover}
 Requires: squashfs-tools
@@ -138,6 +138,7 @@
 Requires: dhcpv6-client
 Requires: anaconda-yum-plugins
 Obsoletes: anaconda-images <= 10
+Provides: anaconda-images = %{version}-%{release}
 Obsoletes: anaconda-runtime < %{version}-%{release}
 Provides: anaconda-runtime = %{version}-%{release}
 
@@ -167,12 +168,12 @@
 
 %ifarch %livearches
 %post
-/usr/bin/update-desktop-database %{_datadir}/applications
+update-desktop-database &> /dev/null || :
 %endif
 
 %ifarch %livearches
 %postun
-/usr/bin/update-desktop-database %{_datadir}/applications
+update-desktop-database &> /dev/null || :
 %endif
 
 %files -f %{name}.lang
@@ -196,16 +197,22 @@
 %ifarch %livearches
 %{_bindir}/liveinst
 %{_sbindir}/liveinst
-%{_sysconfdir}/pam.d/*
+%config(noreplace) %{_sysconfdir}/pam.d/*
+%config(noreplace) %{_sysconfdir}/security/console.apps/*
 %{_sysconfdir}/X11/xinit/xinitrc.d/*
-%{_sysconfdir}/security/console.apps/*
 %{_datadir}/applications/*.desktop
 %endif
 
-%triggerun -- anaconda < 8.0-1
-/sbin/chkconfig --del reconfig >/dev/null 2>&1 || :
-
 %changelog
+* Mon Jan 05 2009 Chris Lumens <clumens at redhat.com> - 11.5.0.4-1
+- Various packaging fixed from review (#225246) (hdegoede)
+- Show the header in certain non-lowres cases (#478765, alsadi).
+- Remove doMultiMount. (clumens)
+- Use mount -t auto instead of passing a list of valid fstypes (#477328).
+  (clumens)
+- Fix case sensitivity when searching for headers (kanarip)
+- Fix a traceback in checking for network install (ricky).
+
 * Tue Dec 23 2008 David Cantrell <dcantrell at redhat.com> - 11.5.0.3-1
 - Initialize domainname to None (#477831) (dcantrell)
 - Do not import unused modules. (dcantrell)
@@ -903,7 +910,7 @@
 - Remove extra ')' in install-buildrequires (dcantrell)
 
 * Mon Aug 11 2008 Chris Lumens <clumens at redhat.com> - 11.4.1.27-1
-- Handle 'rescue' and %post in rescue mode (atodorov)
+- Handle 'rescue' and %%post in rescue mode (atodorov)
 - Delay the duplicate label error until the label is actually used
   (#458505). (clumens)
 - Enable wireless modules again for now as a test (#443545). (clumens)
@@ -1073,7 +1080,7 @@
 - Don't strip too much off the NFS directory path. (clumens)
 - Log stage2 url better. (pjones)
 - Fix minor whitespace nits. (pjones)
-- Use %m rather than strerror() where appropriate. (pjones)
+- Use %%m rather than strerror() where appropriate. (pjones)
 - Make setupCdrom() actually return the path to the stage2 image it
   found. (pjones)
 - Don't unconditionally pass --lang for live installs (#454101) (katzj)
@@ -1427,7 +1434,7 @@
 * Wed Apr 02 2008 Chris Lumens <clumens at redhat.com> - 11.4.0.65-1
 - Only do verbose hal logging if loglevel=debug (katzj)
 - Avoid AttributeError in HardDriveDict (#432362) (pjones)
-- Don't use %n with gettext to avoid segfaults (#439861) (katzj)
+- Don't use %%n with gettext to avoid segfaults (#439861) (katzj)
 - Require live installs to be to an ext2 or ext3 filesystem (#397871) (katzj)
 - Don't allow migrations to ext4 for now (katzj)
 - Change ext4 parameter to ext4, not iamanext4developer (katzj)
@@ -1809,7 +1816,7 @@
 - remove yumcache (katzj)
 - Don't do fixmtimes anymore (katzj)
 - Don't compress translations (katzj)
-- Don't manually duplicate things from package %post scripts (katzj)
+- Don't manually duplicate things from package %%post scripts (katzj)
 - Remove some unused options (--discs and --buildinstdir) (katzj)
 - Keep /etc/nsswitch.conf and /etc/shells (katzj)
 - Stop forcing passive mode for FTP by patching urllib (katzj)
@@ -2140,7 +2147,7 @@
 - Add linear.ko to the modules available for rescue mode (#151742).
 - Update implantisomd5 usage to give correct option name (#364611).
 - Start removing unneeded install method code.
-- Run %post scripts on upgrade (#392201).
+- Run %%post scripts on upgrade (#392201).
 - Correct nicdelay patch (msivak, #349521).
 - Only run media check if we're installing off the CD (#362561).
 - Fix display of package names in non-English text installs (#376231).
@@ -2620,7 +2627,7 @@
 - Fix for mirror errors (dlehman)
 - Fix splittree (Joel Andres Granados, #233384)
 - Fix ppc32 netboot (pnasrat, #237988)
-- Fix %packages for media installs (clumens, #231121, #235881)
+- Fix %%packages for media installs (clumens, #231121, #235881)
 - Fix rescue mode networking (dcantrell, #238080)
 - Adjust for unbreaking the yum API
 - Fix rescue mode traceback (#238261)
@@ -2832,7 +2839,7 @@
 - BR newt-static
 
 * Thu Mar 01 2007 Chris Lumens <clumens at redhat.com> - 11.2.0.28-1
-- Support multiple %ksappend lines (#222201).
+- Support multiple %%ksappend lines (#222201).
 - Set the ksdata after setting the initial timezone values (#230472).
 - New progress screen interface that's easier on backends (katzj).
 - Handle KickstartError exns better than just dumping a backtrace.
@@ -2956,7 +2963,7 @@
 * Fri Jan 19 2007 Chris Lumens <clumens at redhat.com> - 11.2.0.13-1
 - Kickstart and upgrade are no longer installclasses.
 - Update x86_64 syslinux config (katzj).
-- Support %packages --default (#221305).
+- Support %%packages --default (#221305).
 - Fix early kickstart UI traceback.
 - Remove cruft in x86 images (katzj).
 - Fix error handling in loader netconfig screen (dcantrell).
@@ -3066,7 +3073,7 @@
 - Update kickstart documentation.
 - Don't always write out xconfig and monitor in anaconda-ks.cfg (#211977).
 - Follow drive order specified in kickstart file (#214881).
-- Unmount source on image installs before %post is run (#214677).
+- Unmount source on image installs before %%post is run (#214677).
 - Check return value of getBiosDisk (pjones, #214653).
 - splittree shouldn't fail with non-rpms in the directory (jkeating).
 - Order bind mounts correctly on upgrades (#212270).
@@ -4540,7 +4547,7 @@
 - Move repo setup and group selection earlier (pnasrat)
 
 * Tue Sep 20 2005 Jeremy Katz <katzj at redhat.com> - 10.3.0.24-1
-- Some kickstart %packages fixes (clumens)
+- Some kickstart %%packages fixes (clumens)
 - Don't copy null bytes into syslog (clumens)
 - New exception dialog (clumens)
 - Fix a traceback (pnasrat)
@@ -4994,7 +5001,7 @@
 
 * Sat Feb 12 2005 Jeremy Katz <katzj at redhat.com> - 10.2.0.19-1
 - fix x86_64 installs for bad urlgrabber import
-- Fix traceback with no %post (clumens)
+- Fix traceback with no %%post (clumens)
 - Put hostname in the text entry (clumens, #132826)
 
 * Tue Feb  8 2005 Jeremy Katz <katzj at redhat.com> - 10.2.0.18-1
@@ -5003,7 +5010,7 @@
 - Add needed requirements for rpm 4.4
 - Fix segfault when rpm tries to write to non-existent fd during 
   transaction ordering
-- Support --erroronfail as an option for %pre/%post (clumens, #124386)
+- Support --erroronfail as an option for %%pre/%%post (clumens, #124386)
 
 * Tue Feb  8 2005 Jeremy Katz <katzj at redhat.com> - 10.2.0.17-1
 - Use rhpl.archscore to fix iseries upgrades (pnasrat, #146915)
@@ -5190,7 +5197,7 @@
 - Update for new Indic font filenames
 
 * Mon Oct 18 2004 Jeremy Katz <katzj at redhat.com> - 10.0.3.20-1
-- Fix traceback with %post logging (Gijs Hollestelle, #136154)
+- Fix traceback with %%post logging (Gijs Hollestelle, #136154)
 - When using a local stage2.img for FTP/HTTP install, give an error earlier 
   if you point at an invalid tree (#135603, #117155, #120101)
 - Add a trailing newline to /etc/sysconfig/kernel
@@ -5201,7 +5208,7 @@
 - Fix font size to fit on disk display better (#135731)
 - Write out part lines for autopart lvm correctly (#135714)
 - Remove empty row in drive order for boot loader (#135944)
-- Replace % in URLs to avoid format string weirdness (#135929)
+- Replace %% in URLs to avoid format string weirdness (#135929)
 - Bind mount /dev for rescue mode (#135860)
 - Fix Dutch and Danish keyboard defaults (#135839)
 - add s2io 10GbE driver
@@ -5249,7 +5256,7 @@
 * Mon Oct  4 2004 Jeremy Katz <katzj at redhat.com> - 10.0.3.11-1
 - Handle 32 raid devs (#134438)
 - Fix LCS PORTNAME (#134487)
-- Add logging of kickstart scripts with --log to %post/%pre
+- Add logging of kickstart scripts with --log to %%post/%%pre
 - Copy /tmp/anaconda.log and /tmp/syslog to /var/log/anaconda.log 
   and /var/log/anaconda.syslog respectively (#124370)
 - Fix Polish (#134554)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/devel/sources,v
retrieving revision 1.727
retrieving revision 1.728
diff -u -r1.727 -r1.728
--- sources	24 Dec 2008 04:07:14 -0000	1.727
+++ sources	5 Jan 2009 22:20:35 -0000	1.728
@@ -1 +1 @@
-a088c2161488c25cac03d1909287e1f1  anaconda-11.5.0.3.tar.bz2
+00534cb4f6e168932ade7f9ca2324870  anaconda-11.5.0.4.tar.bz2



From chitlesh at fedoraproject.org  Mon Jan  5 22:35:07 2009
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Mon,  5 Jan 2009 22:35:07 +0000 (UTC)
Subject: rpms/linsmith/F-9 import.log, NONE, 1.1 linsmith.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090105223507.B2CDF7011F@cvs1.fedora.phx.redhat.com>

Author: chitlesh

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

Modified Files:
	.cvsignore sources 
Added Files:
	import.log linsmith.spec 
Log Message:
new package


--- NEW FILE import.log ---
linsmith-0_99_11-2_fc10:F-9:linsmith-0.99.11-2.fc10.src.rpm:1231194728


--- NEW FILE linsmith.spec ---
Name:           linsmith
Version:        0.99.11
Release:        2%{?dist}
Summary:        A Smith charting program

Group:          Applications/Engineering
License:        GPLv2
URL:            http://jcoppens.com/soft/linsmith/index.en.php
Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz

BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  libgnomeprint22-devel
BuildRequires:  libgnomeui-devel
BuildRequires:  gettext
BuildRequires:  desktop-file-utils

Requires:       electronics-menu
Requires:       tcl

%description
linSmith is a Smith Charting program.
It's main features are:
  * Definition of multiple load impedances
  * Addition of discrete and line components
  * A 'virtual' component switches from impedance
    to admittance to help explaining parallel components
  * The chart works in real impedances
  * Load and circuit configuration is stored separately,
    permitting several solutions without re-defining the other

%prep
%setup -q


#remove unwanted file.
%{__rm} -f pixmaps/Makefile.am~

%build
%configure
%{__make} %{?_smp_mflags}


%install
%{__rm} -rf %{buildroot}
%{__make} install DESTDIR=%{buildroot} INSTALL="install -p"

desktop-file-install                            \
    --dir=%{buildroot}/%{_datadir}/applications \
    --delete-original                           \
    --remove-category GTK                       \
    --remove-category GNOME                     \
    --add-category "Electronics"                \
    %{_builddir}/%{name}-%{version}/%{name}.desktop

# icon
cp -p linsmith_icon.xpm %{buildroot}/%{_datadir}/pixmaps/%{name}/

# man file
%{__mkdir} -p %{buildroot}/%{_datadir}/man/man1
cp -p doc/linsmith.1 %{buildroot}/%{_datadir}/man/man1

#examples
mv %{buildroot}/%{_datadir}/%{name} examples/

%find_lang %{name}


%clean
rm -rf %{buildroot}


%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING NEWS README THANKS doc/manual.pdf
%doc examples/
%{_bindir}/%{name}
%{_datadir}/applications/%{name}.desktop
%{_datadir}/pixmaps/%{name}
%{_datadir}/man/man1/%{name}.1.gz


%changelog
* Mon Dec 29 2008 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 0.99.11-2
- spec file updated as suggested in the #478368c2

* Mon Dec 29 2008 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 0.99.11-1
- Initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/linsmith/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	4 Jan 2009 20:33:18 -0000	1.1
+++ .cvsignore	5 Jan 2009 22:34:36 -0000	1.2
@@ -0,0 +1 @@
+linsmith-0.99.11.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/linsmith/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	4 Jan 2009 20:33:18 -0000	1.1
+++ sources	5 Jan 2009 22:34:36 -0000	1.2
@@ -0,0 +1 @@
+33256af1c310309da6f03f2a2fe8a869  linsmith-0.99.11.tar.gz



From dwalsh at fedoraproject.org  Mon Jan  5 22:35:33 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Mon,  5 Jan 2009 22:35:33 +0000 (UTC)
Subject: rpms/selinux-policy/devel policy-20090105.patch, NONE,
	1.1 .cvsignore, 1.154, 1.155 sources, 1.172, 1.173
Message-ID: <20090105223533.64D917011F@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31356

Modified Files:
	.cvsignore sources 
Added Files:
	policy-20090105.patch 
Log Message:
* Mon Jan 5 2009 Dan Walsh <dwalsh at redhat.com> 3.6.2-1
- Update to upstream


policy-20090105.patch:

--- NEW FILE policy-20090105.patch ---
diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/default_contexts serefpolicy-3.6.2/config/appconfig-mcs/default_contexts
--- nsaserefpolicy/config/appconfig-mcs/default_contexts	2008-11-11 16:13:50.000000000 -0500
+++ serefpolicy-3.6.2/config/appconfig-mcs/default_contexts	2009-01-05 17:10:36.000000000 -0500
@@ -1,15 +1,6 @@
-system_r:crond_t:s0		user_r:cronjob_t:s0 staff_r:cronjob_t:s0 sysadm_r:cronjob_t:s0 system_r:cronjob_t:s0 unconfined_r:unconfined_cronjob_t:s0
-system_r:local_login_t:s0	user_r:user_t:s0 staff_r:staff_t:s0 sysadm_r:sysadm_t:s0 unconfined_r:unconfined_t:s0
-system_r:remote_login_t:s0	user_r:user_t:s0 staff_r:staff_t:s0 unconfined_r:unconfined_t:s0
-system_r:sshd_t:s0		user_r:user_t:s0 staff_r:staff_t:s0 sysadm_r:sysadm_t:s0 unconfined_r:unconfined_t:s0
+system_r:crond_t:s0		system_r:system_cronjob_t:s0
+system_r:local_login_t:s0	user_r:user_t:s0
+system_r:remote_login_t:s0	user_r:user_t:s0
+system_r:sshd_t:s0		user_r:user_t:s0
 system_r:sulogin_t:s0		sysadm_r:sysadm_t:s0
-system_r:xdm_t:s0		user_r:user_t:s0 staff_r:staff_t:s0 sysadm_r:sysadm_t:s0 unconfined_r:unconfined_t:s0
-
-staff_r:staff_su_t:s0		user_r:user_t:s0 staff_r:staff_t:s0 sysadm_r:sysadm_t:s0
-staff_r:staff_sudo_t:s0		sysadm_r:sysadm_t:s0 staff_r:staff_t:s0
-
-sysadm_r:sysadm_su_t:s0		user_r:user_t:s0 staff_r:staff_t:s0 sysadm_r:sysadm_t:s0
-sysadm_r:sysadm_sudo_t:s0	sysadm_r:sysadm_t:s0
-
-user_r:user_su_t:s0		user_r:user_t:s0 staff_r:staff_t:s0 sysadm_r:sysadm_t:s0
-user_r:user_sudo_t:s0		sysadm_r:sysadm_t:s0 user_r:user_t:s0
+system_r:xdm_t:s0		user_r:user_t:s0
diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/failsafe_context serefpolicy-3.6.2/config/appconfig-mcs/failsafe_context
--- nsaserefpolicy/config/appconfig-mcs/failsafe_context	2008-08-07 11:15:14.000000000 -0400
+++ serefpolicy-3.6.2/config/appconfig-mcs/failsafe_context	2009-01-05 17:10:36.000000000 -0500
@@ -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.6.2/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.6.2/config/appconfig-mcs/guest_u_default_contexts	2009-01-05 17:10:36.000000000 -0500
@@ -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_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.6.2/config/appconfig-mcs/root_default_contexts
--- nsaserefpolicy/config/appconfig-mcs/root_default_contexts	2008-11-11 16:13:50.000000000 -0500
+++ serefpolicy-3.6.2/config/appconfig-mcs/root_default_contexts	2009-01-05 17:10:36.000000000 -0500
@@ -1,11 +1,7 @@
-system_r:crond_t:s0		unconfined_r:unconfined_t:s0 sysadm_r:cronjob_t:s0 staff_r:cronjob_t:s0 user_r:cronjob_t:s0
+system_r:crond_t:s0		unconfined_r:unconfined_t:s0 sysadm_r:sysadm_t:s0 staff_r:staff_t:s0 user_r:user_t:s0
 system_r:local_login_t:s0	unconfined_r:unconfined_t:s0 sysadm_r:sysadm_t:s0 staff_r:staff_t:s0 user_r:user_t:s0
 
-staff_r:staff_su_t:s0		unconfined_r:unconfined_t:s0 sysadm_r:sysadm_t:s0 staff_r:staff_t:s0 user_r:user_t:s0
-sysadm_r:sysadm_su_t:s0		unconfined_r:unconfined_t:s0 sysadm_r:sysadm_t:s0 staff_r:staff_t:s0 user_r:user_t:s0
-user_r:user_su_t:s0		unconfined_r:unconfined_t:s0 sysadm_r:sysadm_t:s0 staff_r:staff_t:s0 user_r:user_t:s0
-
 #
 # Uncomment if you want to automatically login as sysadm_r
 #
-#system_r:sshd_t:s0		unconfined_r:unconfined_t:s0 sysadm_r:sysadm_t:s0 staff_r:staff_t:s0 user_r:user_t:s0
+system_r:sshd_t:s0		unconfined_r:unconfined_t:s0 sysadm_r:sysadm_t:s0 staff_r:staff_t:s0 user_r:user_t:s0
diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/seusers serefpolicy-3.6.2/config/appconfig-mcs/seusers
--- nsaserefpolicy/config/appconfig-mcs/seusers	2008-08-07 11:15:14.000000000 -0400
+++ serefpolicy-3.6.2/config/appconfig-mcs/seusers	2009-01-05 17:10:36.000000000 -0500
@@ -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.6.2/config/appconfig-mcs/staff_u_default_contexts
--- nsaserefpolicy/config/appconfig-mcs/staff_u_default_contexts	2008-11-11 16:13:50.000000000 -0500
+++ serefpolicy-3.6.2/config/appconfig-mcs/staff_u_default_contexts	2009-01-05 17:10:36.000000000 -0500
@@ -1,10 +1,12 @@
 system_r:local_login_t:s0	staff_r:staff_t:s0 sysadm_r:sysadm_t:s0
 system_r:remote_login_t:s0	staff_r:staff_t:s0
 system_r:sshd_t:s0		staff_r:staff_t:s0 sysadm_r:sysadm_t:s0
-system_r:crond_t:s0		staff_r:cronjob_t:s0
+system_r:crond_t:s0		staff_r:staff_t:s0
 system_r:xdm_t:s0		staff_r:staff_t:s0
 staff_r:staff_su_t:s0		staff_r:staff_t:s0
 staff_r:staff_sudo_t:s0		staff_r:staff_t:s0
+system_r:initrc_su_t:s0		staff_r:staff_t:s0
+staff_r:staff_t:s0		staff_r:staff_t:s0
 sysadm_r:sysadm_su_t:s0		sysadm_r:sysadm_t:s0 
 sysadm_r:sysadm_sudo_t:s0	sysadm_r:sysadm_t:s0
 
diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/unconfined_u_default_contexts serefpolicy-3.6.2/config/appconfig-mcs/unconfined_u_default_contexts
--- nsaserefpolicy/config/appconfig-mcs/unconfined_u_default_contexts	2008-11-11 16:13:50.000000000 -0500
+++ serefpolicy-3.6.2/config/appconfig-mcs/unconfined_u_default_contexts	2009-01-05 17:10:36.000000000 -0500
@@ -1,4 +1,4 @@
-system_r:crond_t:s0		unconfined_r:unconfined_t:s0 unconfined_r:unconfined_cronjob_t:s0
+system_r:crond_t:s0		unconfined_r:unconfined_t:s0
 system_r:initrc_t:s0		unconfined_r:unconfined_t:s0
 system_r:local_login_t:s0	unconfined_r:unconfined_t:s0
 system_r:remote_login_t:s0	unconfined_r:unconfined_t:s0
@@ -6,4 +6,6 @@
 system_r:sshd_t:s0		unconfined_r:unconfined_t:s0
 system_r:sysadm_su_t:s0		unconfined_r:unconfined_t:s0
 system_r:unconfined_t:s0	unconfined_r:unconfined_t:s0
+system_r:initrc_su_t:s0		unconfined_r:unconfined_t:s0
+unconfined_r:unconfined_t:s0	unconfined_r:unconfined_t:s0
 system_r:xdm_t:s0		unconfined_r:unconfined_t:s0
diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/userhelper_context serefpolicy-3.6.2/config/appconfig-mcs/userhelper_context
--- nsaserefpolicy/config/appconfig-mcs/userhelper_context	2008-08-07 11:15:14.000000000 -0400
+++ serefpolicy-3.6.2/config/appconfig-mcs/userhelper_context	2009-01-05 17:10:36.000000000 -0500
@@ -1 +1 @@
-system_u:sysadm_r:sysadm_t:s0
+system_u:system_r:unconfined_t:s0	
diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/user_u_default_contexts serefpolicy-3.6.2/config/appconfig-mcs/user_u_default_contexts
--- nsaserefpolicy/config/appconfig-mcs/user_u_default_contexts	2008-11-11 16:13:50.000000000 -0500
+++ serefpolicy-3.6.2/config/appconfig-mcs/user_u_default_contexts	2009-01-05 17:10:36.000000000 -0500
@@ -1,8 +1,9 @@
 system_r:local_login_t:s0	user_r:user_t:s0
 system_r:remote_login_t:s0	user_r:user_t:s0
 system_r:sshd_t:s0		user_r:user_t:s0
-system_r:crond_t:s0		user_r:cronjob_t:s0
+system_r:crond_t:s0		user_r:user_t:s0
 system_r:xdm_t:s0		user_r:user_t:s0
 user_r:user_su_t:s0		user_r:user_t:s0
 user_r:user_sudo_t:s0		user_r:user_t:s0
-
+system_r:initrc_su_t:s0		user_r:user_t:s0
+user_r:user_t:s0		user_r:user_t:s0
diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/xguest_u_default_contexts serefpolicy-3.6.2/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.6.2/config/appconfig-mcs/xguest_u_default_contexts	2009-01-05 17:10:36.000000000 -0500
@@ -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-mls/default_contexts serefpolicy-3.6.2/config/appconfig-mls/default_contexts
--- nsaserefpolicy/config/appconfig-mls/default_contexts	2008-11-11 16:13:50.000000000 -0500
+++ serefpolicy-3.6.2/config/appconfig-mls/default_contexts	2009-01-05 17:10:36.000000000 -0500
@@ -1,15 +1,6 @@
-system_r:crond_t:s0		user_r:cronjob_t:s0 staff_r:cronjob_t:s0 sysadm_r:cronjob_t:s0 system_r:cronjob_t:s0 unconfined_r:unconfined_cronjob_t:s0
-system_r:local_login_t:s0	user_r:user_t:s0 staff_r:staff_t:s0 sysadm_r:sysadm_t:s0 unconfined_r:unconfined_t:s0
-system_r:remote_login_t:s0	user_r:user_t:s0 staff_r:staff_t:s0 unconfined_r:unconfined_t:s0
-system_r:sshd_t:s0		user_r:user_t:s0 staff_r:staff_t:s0 sysadm_r:sysadm_t:s0 unconfined_r:unconfined_t:s0
+system_r:crond_t:s0		system_r:system_crond_t:s0
+system_r:local_login_t:s0	user_r:user_t:s0
+system_r:remote_login_t:s0	user_r:user_t:s0
+system_r:sshd_t:s0		user_r:user_t:s0
 system_r:sulogin_t:s0		sysadm_r:sysadm_t:s0
-system_r:xdm_t:s0		user_r:user_t:s0 staff_r:staff_t:s0 sysadm_r:sysadm_t:s0 unconfined_r:unconfined_t:s0
-
-staff_r:staff_su_t:s0		user_r:user_t:s0 staff_r:staff_t:s0 sysadm_r:sysadm_t:s0
-staff_r:staff_sudo_t:s0		sysadm_r:sysadm_t:s0 staff_r:staff_t:s0
-
-sysadm_r:sysadm_su_t:s0		user_r:user_t:s0 staff_r:staff_t:s0 sysadm_r:sysadm_t:s0
-sysadm_r:sysadm_sudo_t:s0	sysadm_r:sysadm_t:s0
-
-user_r:user_su_t:s0		user_r:user_t:s0 staff_r:staff_t:s0 sysadm_r:sysadm_t:s0
-user_r:user_sudo_t:s0		sysadm_r:sysadm_t:s0 user_r:user_t:s0
+system_r:xdm_t:s0		user_r:user_t:s0
diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/guest_u_default_contexts serefpolicy-3.6.2/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.6.2/config/appconfig-mls/guest_u_default_contexts	2009-01-05 17:10:36.000000000 -0500
@@ -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.6.2/config/appconfig-mls/root_default_contexts
--- nsaserefpolicy/config/appconfig-mls/root_default_contexts	2008-11-11 16:13:50.000000000 -0500
+++ serefpolicy-3.6.2/config/appconfig-mls/root_default_contexts	2009-01-05 17:10:36.000000000 -0500
@@ -1,11 +1,11 @@
-system_r:crond_t:s0		unconfined_r:unconfined_t:s0 sysadm_r:cronjob_t:s0 staff_r:cronjob_t:s0 user_r:cronjob_t:s0
-system_r:local_login_t:s0	unconfined_r:unconfined_t:s0 sysadm_r:sysadm_t:s0 staff_r:staff_t:s0 user_r:user_t:s0
+system_r:crond_t:s0		sysadm_r:sysadm_t:s0 staff_r:staff_t:s0
+system_r:local_login_t:s0	sysadm_r:sysadm_t:s0 staff_r:staff_t:s0
 
-staff_r:staff_su_t:s0		unconfined_r:unconfined_t:s0 sysadm_r:sysadm_t:s0 staff_r:staff_t:s0 user_r:user_t:s0
-sysadm_r:sysadm_su_t:s0		unconfined_r:unconfined_t:s0 sysadm_r:sysadm_t:s0 staff_r:staff_t:s0 user_r:user_t:s0
-user_r:user_su_t:s0		unconfined_r:unconfined_t:s0 sysadm_r:sysadm_t:s0 staff_r:staff_t:s0 user_r:user_t:s0
+staff_r:staff_su_t:s0		sysadm_r:sysadm_t:s0 staff_r:staff_t:s0
+sysadm_r:sysadm_su_t:s0		sysadm_r:sysadm_t:s0 staff_r:staff_t:s0
+user_r:user_su_t:s0		sysadm_r:sysadm_t:s0 staff_r:staff_t:s0
 
 #
 # Uncomment if you want to automatically login as sysadm_r
 #
-#system_r:sshd_t:s0		unconfined_r:unconfined_t:s0 sysadm_r:sysadm_t:s0 staff_r:staff_t:s0 user_r:user_t:s0
+#system_r:sshd_t:s0		sysadm_r:sysadm_t:s0 staff_r:staff_t:s0
diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/xguest_u_default_contexts serefpolicy-3.6.2/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.6.2/config/appconfig-mls/xguest_u_default_contexts	2009-01-05 17:10:36.000000000 -0500
@@ -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/Makefile serefpolicy-3.6.2/Makefile
--- nsaserefpolicy/Makefile	2008-11-11 16:13:50.000000000 -0500
+++ serefpolicy-3.6.2/Makefile	2009-01-05 17:10:36.000000000 -0500
@@ -315,20 +315,22 @@
[...27521 lines suppressed...]
+manage_files_pattern(xenstored_t, xenstored_tmp_t, xenstored_tmp_t)
+manage_dirs_pattern(xenstored_t, xenstored_tmp_t, xenstored_tmp_t)
+files_tmp_filetrans(xenstored_t, xenstored_tmp_t, { file dir })
+
 # pid file
 manage_files_pattern(xenstored_t,xenstored_var_run_t,xenstored_var_run_t)
 manage_sock_files_pattern(xenstored_t,xenstored_var_run_t,xenstored_var_run_t)
 files_pid_filetrans(xenstored_t,xenstored_var_run_t, { file sock_file })
 
+# log files
+manage_dirs_pattern(xenstored_t, xenstored_var_log_t, xenstored_var_log_t)
+manage_files_pattern(xenstored_t, xenstored_var_log_t, xenstored_var_log_t)
+manage_sock_files_pattern(xenstored_t, xenstored_var_log_t, xenstored_var_log_t)
+logging_log_filetrans(xenstored_t, xenstored_var_log_t, { sock_file file dir })
+
 # var/lib files for xenstored
 manage_dirs_pattern(xenstored_t,xenstored_var_lib_t,xenstored_var_lib_t)
 manage_files_pattern(xenstored_t,xenstored_var_lib_t,xenstored_var_lib_t)
@@ -312,18 +343,21 @@
 
 manage_files_pattern(xm_t,xend_var_lib_t,xend_var_lib_t)
 manage_fifo_files_pattern(xm_t,xend_var_lib_t,xend_var_lib_t)
+manage_sock_files_pattern(xm_t, xend_var_lib_t, xend_var_lib_t)
 files_search_var_lib(xm_t)
 
 allow xm_t xen_image_t:dir rw_dir_perms;
 allow xm_t xen_image_t:file read_file_perms;
 allow xm_t xen_image_t:blk_file read_blk_file_perms;
 
-kernel_read_system_state(xm_t)
 kernel_read_kernel_sysctls(xm_t)
+kernel_read_sysctl(xm_t)
+kernel_read_system_state(xm_t)
 kernel_read_xen_state(xm_t)
 kernel_write_xen_state(xm_t)
 
 corecmd_exec_bin(xm_t)
+corecmd_exec_shell(xm_t)
 
 corenet_tcp_sendrecv_generic_if(xm_t)
 corenet_tcp_sendrecv_all_nodes(xm_t)
@@ -339,15 +373,38 @@
 
 storage_raw_read_fixed_disk(xm_t)
 
+fs_getattr_all_fs(xm_t)
+
 term_use_all_terms(xm_t)
 
+init_stream_connect_script(xm_t)
 init_rw_script_stream_sockets(xm_t)
 init_use_fds(xm_t)
 
 miscfiles_read_localization(xm_t)
 
-sysnet_read_config(xm_t)
+sysnet_dns_name_resolve(xm_t)
 
 xen_append_log(xm_t)
 xen_stream_connect(xm_t)
 xen_stream_connect_xenstore(xm_t)
+
+optional_policy(`
+	virt_manage_images(xm_t)
+	virt_stream_connect(xm_t)
+')
+
+#Should have a boolean wrapping these
+fs_list_auto_mountpoints(xend_t)
+files_search_mnt(xend_t)
+fs_getattr_all_fs(xend_t)
+fs_read_dos_files(xend_t)
+
+tunable_policy(`xen_use_nfs',`
+	fs_manage_nfs_files(xend_t)
+	fs_read_nfs_symlinks(xend_t)
+')
+
+optional_policy(`
+	unconfined_domain(xend_t)
+')
diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/support/obj_perm_sets.spt serefpolicy-3.6.2/policy/support/obj_perm_sets.spt
--- nsaserefpolicy/policy/support/obj_perm_sets.spt	2008-10-16 17:21:16.000000000 -0400
+++ serefpolicy-3.6.2/policy/support/obj_perm_sets.spt	2009-01-05 17:10:36.000000000 -0500
@@ -179,20 +179,20 @@
 #
 # Directory (dir)
 #
-define(`getattr_dir_perms',`{ getattr }')
-define(`setattr_dir_perms',`{ setattr }')
-define(`search_dir_perms',`{ getattr search }')
+define(`getattr_dir_perms',`{ getattr open }')
+define(`setattr_dir_perms',`{ setattr open }')
+define(`search_dir_perms',`{ getattr search open }')
 define(`list_dir_perms',`{ getattr search open read lock ioctl }')
 define(`add_entry_dir_perms',`{ getattr search open lock ioctl write add_name }')
 define(`del_entry_dir_perms',`{ getattr search open lock ioctl write remove_name }')
 define(`rw_dir_perms', `{ open read getattr lock search ioctl add_name remove_name write }')
-define(`create_dir_perms',`{ getattr create }')
-define(`rename_dir_perms',`{ getattr rename }')
-define(`delete_dir_perms',`{ getattr rmdir }')
+define(`create_dir_perms',`{ getattr create open }')
+define(`rename_dir_perms',`{ getattr rename open }')
+define(`delete_dir_perms',`{ getattr rmdir open }')
 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 }')
+define(`relabelfrom_dir_perms',`{ getattr open relabelfrom }')
+define(`relabelto_dir_perms',`{ getattr open relabelto }')
+define(`relabel_dir_perms',`{ getattr open relabelfrom relabelto }')
 
 #
 # Regular file (file)
@@ -312,3 +312,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 }')
+
+define(`all_capabilities', `{ chown dac_override dac_read_search fowner fsetid kill setgid setuid setpcap linux_immutable net_bind_service net_broadcast net_admin net_raw ipc_lock ipc_owner sys_module sys_rawio sys_chroot sys_ptrace sys_pacct sys_admin sys_boot sys_nice sys_resource sys_time sys_tty_config mknod lease audit_write audit_control setfcap }
+')
+
+define(`all_nscd_perms', `{ getserv getpwd getgrp gethost getstat admin shmempwd shmemgrp shmemhost shmemserv } ')
+define(`all_dbus_perms', `{ acquire_svc send_msg } ')
+define(`all_passwd_perms', `{ passwd chfn chsh rootok crontab } ')
+define(`all_association_perms', `{ sendto recvfrom setcontext polmatch } ')
+
+define(`manage_key_perms', `{ create link read search setattr view write } ')
diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/users serefpolicy-3.6.2/policy/users
--- nsaserefpolicy/policy/users	2008-08-07 11:15:13.000000000 -0400
+++ serefpolicy-3.6.2/policy/users	2009-01-05 17:10:36.000000000 -0500
@@ -25,11 +25,8 @@
 # permit any access to such users, then remove this entry.
 #
 gen_user(user_u, user, user_r, s0, s0)
-gen_user(staff_u, staff, staff_r sysadm_r ifdef(`enable_mls',`secadm_r auditadm_r'), s0, s0 - mls_systemhigh, mcs_allcats)
-gen_user(sysadm_u, sysadm, sysadm_r, s0, s0 - mls_systemhigh, mcs_allcats)
-
-# Until order dependence is fixed for users:
-gen_user(unconfined_u, unconfined, unconfined_r, s0, s0 - mls_systemhigh, mcs_allcats)
+gen_user(staff_u, user, staff_r system_r sysadm_r ifdef(`enable_mls',`secadm_r auditadm_r'), s0, s0 - mls_systemhigh, mcs_allcats)
+gen_user(sysadm_u, user, sysadm_r, s0, s0 - mls_systemhigh, mcs_allcats)
 
 #
 # The following users correspond to Unix identities.
@@ -38,8 +35,4 @@
 # role should use the staff_r role instead of the user_r role when
 # not in the sysadm_r.
 #
-ifdef(`direct_sysadm_daemon',`
-	gen_user(root, sysadm, sysadm_r staff_r ifdef(`enable_mls',`secadm_r auditadm_r') system_r, s0, s0 - mls_systemhigh, mcs_allcats)
-',`
-	gen_user(root, sysadm, sysadm_r staff_r ifdef(`enable_mls',`secadm_r auditadm_r'), s0, s0 - mls_systemhigh, mcs_allcats)
-')
+gen_user(root, user, unconfined_r sysadm_r staff_r ifdef(`enable_mls',`secadm_r auditadm_r') system_r, s0, s0 - mls_systemhigh, mcs_allcats)
diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/Rules.modular serefpolicy-3.6.2/Rules.modular
--- nsaserefpolicy/Rules.modular	2008-11-11 16:13:50.000000000 -0500
+++ serefpolicy-3.6.2/Rules.modular	2009-01-05 17:10:36.000000000 -0500
@@ -73,8 +73,8 @@
 $(tmpdir)/%.mod: $(m4support) $(tmpdir)/generated_definitions.conf $(tmpdir)/all_interfaces.conf %.te
 	@echo "Compliling $(NAME) $(@F) module"
 	@test -d $(tmpdir) || mkdir -p $(tmpdir)
-	$(call perrole-expansion,$(basename $(@F)),$@.role)
-	$(verbose) $(M4) $(M4PARAM) -s $^ $@.role > $(@:.mod=.tmp)
+#	$(call perrole-expansion,$(basename $(@F)),$@.role)
+	$(verbose) $(M4) $(M4PARAM) -s $^ > $(@:.mod=.tmp)
 	$(verbose) $(CHECKMODULE) -m $(@:.mod=.tmp) -o $@
 
 $(tmpdir)/%.mod.fc: $(m4support) %.fc
@@ -129,7 +129,7 @@
 	@test -d $(tmpdir) || mkdir -p $(tmpdir)
 # define all available object classes
 	$(verbose) $(genperm) $(avs) $(secclass) > $@
-	$(verbose) $(call create-base-per-role-tmpl,$(patsubst %.te,%,$(base_mods)),$@)
+#	$(verbose) $(call create-base-per-role-tmpl,$(patsubst %.te,%,$(base_mods)),$@)
 	$(verbose) test -f $(booleans) && $(setbools) $(booleans) >> $@ || true
 
 $(tmpdir)/global_bools.conf: M4PARAM += -D self_contained_policy
@@ -146,7 +146,7 @@
 $(tmpdir)/rolemap.conf: M4PARAM += -D self_contained_policy
 $(tmpdir)/rolemap.conf: $(rolemap)
 	$(verbose) echo "" > $@
-	$(call parse-rolemap,base,$@)
+#	$(call parse-rolemap,base,$@)
 
 $(tmpdir)/all_te_files.conf: M4PARAM += -D self_contained_policy
 $(tmpdir)/all_te_files.conf: $(m4support) $(tmpdir)/generated_definitions.conf $(tmpdir)/all_interfaces.conf $(base_te_files) $(tmpdir)/rolemap.conf
diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/support/Makefile.devel serefpolicy-3.6.2/support/Makefile.devel
--- nsaserefpolicy/support/Makefile.devel	2008-11-11 16:13:50.000000000 -0500
+++ serefpolicy-3.6.2/support/Makefile.devel	2009-01-05 17:10:36.000000000 -0500
@@ -185,8 +185,7 @@
 tmp/%.mod: $(m4support) tmp/all_interfaces.conf %.te
 	@$(EINFO) "Compiling $(NAME) $(basename $(@F)) module"
 	@test -d $(@D) || mkdir -p $(@D)
-	$(call peruser-expansion,$(basename $(@F)),$@.role)
-	$(verbose) $(M4) $(M4PARAM) -s $^ $@.role > $(@:.mod=.tmp)
+	$(verbose) $(M4) $(M4PARAM) -s $^ > $(@:.mod=.tmp)
 	$(verbose) $(CHECKMODULE) -m $(@:.mod=.tmp) -o $@
 
 tmp/%.mod.fc: $(m4support) %.fc


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/.cvsignore,v
retrieving revision 1.154
retrieving revision 1.155
diff -u -r1.154 -r1.155
--- .cvsignore	25 Nov 2008 19:18:01 -0000	1.154
+++ .cvsignore	5 Jan 2009 22:35:32 -0000	1.155
@@ -156,3 +156,4 @@
 serefpolicy-3.5.12.tgz
 serefpolicy-3.5.13.tgz
 serefpolicy-3.6.1.tgz
+serefpolicy-3.6.2.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/sources,v
retrieving revision 1.172
retrieving revision 1.173
diff -u -r1.172 -r1.173
--- sources	25 Nov 2008 21:08:25 -0000	1.172
+++ sources	5 Jan 2009 22:35:32 -0000	1.173
@@ -1 +1 @@
-2036125daa5665ffcd7d64174e5cf471  serefpolicy-3.6.1.tgz
+5fdbc11560122f475411106da175db9a  serefpolicy-3.6.2.tgz



From dcantrel at fedoraproject.org  Mon Jan  5 22:45:38 2009
From: dcantrel at fedoraproject.org (David Cantrell)
Date: Mon,  5 Jan 2009 22:45:38 +0000 (UTC)
Subject: rpms/dhcp/devel dhcp-4.0.0-paths.patch, 1.3, 1.4 dhcp.spec, 1.231,
	1.232
Message-ID: <20090105224538.A9AAE7011F@cvs1.fedora.phx.redhat.com>

Author: dcantrel

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

Modified Files:
	dhcp-4.0.0-paths.patch dhcp.spec 
Log Message:
* Thu Dec 18 2008 David Cantrell <dcantrell at redhat.com> - 12:4.0.0-34
- Move /etc/dhclient.conf to /etc/dhcp/dhclient.conf
- Move /etc/dhcpd.conf to /etc/dhcp/dhcpd.conf


dhcp-4.0.0-paths.patch:

Index: dhcp-4.0.0-paths.patch
===================================================================
RCS file: /cvs/pkgs/rpms/dhcp/devel/dhcp-4.0.0-paths.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- dhcp-4.0.0-paths.patch	13 Jan 2008 21:02:47 -0000	1.3
+++ dhcp-4.0.0-paths.patch	5 Jan 2009 22:45:37 -0000	1.4
@@ -1,7 +1,12 @@
-diff -up dhcp-4.0.0/includes/dhcpd.h.paths dhcp-4.0.0/includes/dhcpd.h
---- dhcp-4.0.0/includes/dhcpd.h.paths	2008-01-01 15:09:21.000000000 -1000
-+++ dhcp-4.0.0/includes/dhcpd.h	2008-01-01 15:10:55.000000000 -1000
-@@ -1306,11 +1306,11 @@ typedef unsigned char option_mask [16];
+diff -up dhcp-4.0.0/includes/dhcpd.h.path dhcp-4.0.0/includes/dhcpd.h
+--- dhcp-4.0.0/includes/dhcpd.h.path	2008-08-23 18:25:54.000000000 -1000
++++ dhcp-4.0.0/includes/dhcpd.h	2008-08-23 18:26:21.000000000 -1000
+@@ -1302,15 +1302,15 @@ typedef unsigned char option_mask [16];
+ #else /* !DEBUG */
+ 
+ #ifndef _PATH_DHCPD_CONF
+-#define _PATH_DHCPD_CONF	"/etc/dhcpd.conf"
++#define _PATH_DHCPD_CONF	"/etc/dhcp/dhcpd.conf"
  #endif /* DEBUG */
  
  #ifndef _PATH_DHCPD_DB
@@ -15,6 +20,15 @@
  #endif
  
  #ifndef _PATH_DHCPD_PID
+@@ -1324,7 +1324,7 @@ typedef unsigned char option_mask [16];
+ #endif /* DEBUG */
+ 
+ #ifndef _PATH_DHCLIENT_CONF
+-#define _PATH_DHCLIENT_CONF	"/etc/dhclient.conf"
++#define _PATH_DHCLIENT_CONF	"/etc/dhcp/dhclient.conf"
+ #endif
+ 
+ #ifndef _PATH_DHCLIENT_SCRIPT
 @@ -1340,11 +1340,11 @@ typedef unsigned char option_mask [16];
  #endif
  


Index: dhcp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dhcp/devel/dhcp.spec,v
retrieving revision 1.231
retrieving revision 1.232
diff -u -r1.231 -r1.232
--- dhcp.spec	18 Dec 2008 22:47:12 -0000	1.231
+++ dhcp.spec	5 Jan 2009 22:45:37 -0000	1.232
@@ -17,7 +17,7 @@
 Summary:  Dynamic host configuration protocol software
 Name:     dhcp
 Version:  4.0.0
-Release:  33%{?dist}
+Release:  34%{?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.
@@ -329,6 +329,9 @@
 %{__mkdir} -p %{buildroot}%{_sysconfdir}/openldap/schema
 %{__install} -p -m 0644 -D %{SOURCE9} %{buildroot}%{_sysconfdir}/openldap/schema
 
+# Install empty directory for dhclient.d scripts
+%{__mkdir} -p %{buildroot}%{_sysconfdir}/dhcp/dhclient.d
+
 %clean
 %{__rm} -rf %{buildroot}
 
@@ -384,6 +387,7 @@
 %files -n dhclient
 %defattr(-,root,root,-)
 %doc dhclient.conf.sample
+%dir %{_sysconfdir}/dhcp/dhclient.d
 %dir %{_localstatedir}/lib/dhclient
 /sbin/dhclient
 /sbin/dhclient-script
@@ -406,6 +410,10 @@
 %attr(0644,root,root) %{_mandir}/man3/omapi.3.gz
 
 %changelog
+* Thu Dec 18 2008 David Cantrell <dcantrell at redhat.com> - 12:4.0.0-34
+- Move /etc/dhclient.conf to /etc/dhcp/dhclient.conf
+- Move /etc/dhcpd.conf to /etc/dhcp/dhcpd.conf
+
 * Thu Dec 18 2008 David Cantrell <dcantrell at redhat.com> - 12:4.0.0-33
 - Remove unnecessary success/failure lines in init scripts (#476846)
 



From chitlesh at fedoraproject.org  Mon Jan  5 22:46:43 2009
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Mon,  5 Jan 2009 22:46:43 +0000 (UTC)
Subject: rpms/linsmith/F-10 import.log, NONE, 1.1 linsmith.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090105224643.0F2E07011F@cvs1.fedora.phx.redhat.com>

Author: chitlesh

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

Modified Files:
	.cvsignore sources 
Added Files:
	import.log linsmith.spec 
Log Message:
new package


--- NEW FILE import.log ---
linsmith-0_99_11-2_fc10:F-10:linsmith-0.99.11-2.fc10.src.rpm:1231194926


--- NEW FILE linsmith.spec ---
Name:           linsmith
Version:        0.99.11
Release:        2%{?dist}
Summary:        A Smith charting program

Group:          Applications/Engineering
License:        GPLv2
URL:            http://jcoppens.com/soft/linsmith/index.en.php
Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz

BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  libgnomeprint22-devel
BuildRequires:  libgnomeui-devel
BuildRequires:  gettext
BuildRequires:  desktop-file-utils

Requires:       electronics-menu
Requires:       tcl

%description
linSmith is a Smith Charting program.
It's main features are:
  * Definition of multiple load impedances
  * Addition of discrete and line components
  * A 'virtual' component switches from impedance
    to admittance to help explaining parallel components
  * The chart works in real impedances
  * Load and circuit configuration is stored separately,
    permitting several solutions without re-defining the other

%prep
%setup -q


#remove unwanted file.
%{__rm} -f pixmaps/Makefile.am~

%build
%configure
%{__make} %{?_smp_mflags}


%install
%{__rm} -rf %{buildroot}
%{__make} install DESTDIR=%{buildroot} INSTALL="install -p"

desktop-file-install                            \
    --dir=%{buildroot}/%{_datadir}/applications \
    --delete-original                           \
    --remove-category GTK                       \
    --remove-category GNOME                     \
    --add-category "Electronics"                \
    %{_builddir}/%{name}-%{version}/%{name}.desktop

# icon
cp -p linsmith_icon.xpm %{buildroot}/%{_datadir}/pixmaps/%{name}/

# man file
%{__mkdir} -p %{buildroot}/%{_datadir}/man/man1
cp -p doc/linsmith.1 %{buildroot}/%{_datadir}/man/man1

#examples
mv %{buildroot}/%{_datadir}/%{name} examples/

%find_lang %{name}


%clean
rm -rf %{buildroot}


%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING NEWS README THANKS doc/manual.pdf
%doc examples/
%{_bindir}/%{name}
%{_datadir}/applications/%{name}.desktop
%{_datadir}/pixmaps/%{name}
%{_datadir}/man/man1/%{name}.1.gz


%changelog
* Mon Dec 29 2008 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 0.99.11-2
- spec file updated as suggested in the #478368c2

* Mon Dec 29 2008 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 0.99.11-1
- Initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/linsmith/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	4 Jan 2009 20:33:18 -0000	1.1
+++ .cvsignore	5 Jan 2009 22:46:12 -0000	1.2
@@ -0,0 +1 @@
+linsmith-0.99.11.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/linsmith/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	4 Jan 2009 20:33:18 -0000	1.1
+++ sources	5 Jan 2009 22:46:12 -0000	1.2
@@ -0,0 +1 @@
+33256af1c310309da6f03f2a2fe8a869  linsmith-0.99.11.tar.gz



From dwalsh at fedoraproject.org  Mon Jan  5 22:51:31 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Mon,  5 Jan 2009 22:51:31 +0000 (UTC)
Subject: rpms/selinux-policy/devel policy-20090105.patch,1.1,1.2
Message-ID: <20090105225131.B6A2A7011F@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2381

Modified Files:
	policy-20090105.patch 
Log Message:
* Mon Jan 5 2009 Dan Walsh <dwalsh at redhat.com> 3.6.2-1
- Update to upstream


policy-20090105.patch:

Index: policy-20090105.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-20090105.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- policy-20090105.patch	5 Jan 2009 22:35:32 -0000	1.1
+++ policy-20090105.patch	5 Jan 2009 22:51:01 -0000	1.2
@@ -17927,7 +17927,7 @@
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/razor.te serefpolicy-3.6.2/policy/modules/services/razor.te
 --- nsaserefpolicy/policy/modules/services/razor.te	2008-11-19 18:10:07.000000000 -0500
-+++ serefpolicy-3.6.2/policy/modules/services/razor.te	2009-01-05 17:10:36.000000000 -0500
++++ serefpolicy-3.6.2/policy/modules/services/razor.te	2009-01-05 17:43:13.000000000 -0500
 @@ -6,6 +6,32 @@
  # Declarations
  #
@@ -17961,6 +17961,11 @@
  type razor_exec_t;
  corecmd_executable_file(razor_exec_t)
  
+@@ -61,3 +87,4 @@
+ optional_policy(`
+ 	nscd_socket_use(razor_t)
+ ')
++')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ricci.te serefpolicy-3.6.2/policy/modules/services/ricci.te
 --- nsaserefpolicy/policy/modules/services/ricci.te	2009-01-05 15:39:43.000000000 -0500
 +++ serefpolicy-3.6.2/policy/modules/services/ricci.te	2009-01-05 17:10:36.000000000 -0500



From chitlesh at fedoraproject.org  Mon Jan  5 22:53:27 2009
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Mon,  5 Jan 2009 22:53:27 +0000 (UTC)
Subject: rpms/linsmith/devel import.log, NONE, 1.1 linsmith.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090105225327.18CD87011F@cvs1.fedora.phx.redhat.com>

Author: chitlesh

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

Modified Files:
	.cvsignore sources 
Added Files:
	import.log linsmith.spec 
Log Message:
new package


--- NEW FILE import.log ---
linsmith-0_99_11-2_fc10:HEAD:linsmith-0.99.11-2.fc10.src.rpm:1231195751


--- NEW FILE linsmith.spec ---
Name:           linsmith
Version:        0.99.11
Release:        2%{?dist}
Summary:        A Smith charting program

Group:          Applications/Engineering
License:        GPLv2
URL:            http://jcoppens.com/soft/linsmith/index.en.php
Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz

BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  libgnomeprint22-devel
BuildRequires:  libgnomeui-devel
BuildRequires:  gettext
BuildRequires:  desktop-file-utils

Requires:       electronics-menu
Requires:       tcl

%description
linSmith is a Smith Charting program.
It's main features are:
  * Definition of multiple load impedances
  * Addition of discrete and line components
  * A 'virtual' component switches from impedance
    to admittance to help explaining parallel components
  * The chart works in real impedances
  * Load and circuit configuration is stored separately,
    permitting several solutions without re-defining the other

%prep
%setup -q


#remove unwanted file.
%{__rm} -f pixmaps/Makefile.am~

%build
%configure
%{__make} %{?_smp_mflags}


%install
%{__rm} -rf %{buildroot}
%{__make} install DESTDIR=%{buildroot} INSTALL="install -p"

desktop-file-install                            \
    --dir=%{buildroot}/%{_datadir}/applications \
    --delete-original                           \
    --remove-category GTK                       \
    --remove-category GNOME                     \
    --add-category "Electronics"                \
    %{_builddir}/%{name}-%{version}/%{name}.desktop

# icon
cp -p linsmith_icon.xpm %{buildroot}/%{_datadir}/pixmaps/%{name}/

# man file
%{__mkdir} -p %{buildroot}/%{_datadir}/man/man1
cp -p doc/linsmith.1 %{buildroot}/%{_datadir}/man/man1

#examples
mv %{buildroot}/%{_datadir}/%{name} examples/

%find_lang %{name}


%clean
rm -rf %{buildroot}


%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING NEWS README THANKS doc/manual.pdf
%doc examples/
%{_bindir}/%{name}
%{_datadir}/applications/%{name}.desktop
%{_datadir}/pixmaps/%{name}
%{_datadir}/man/man1/%{name}.1.gz


%changelog
* Mon Dec 29 2008 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 0.99.11-2
- spec file updated as suggested in the #478368c2

* Mon Dec 29 2008 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 0.99.11-1
- Initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/linsmith/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	4 Jan 2009 20:33:18 -0000	1.1
+++ .cvsignore	5 Jan 2009 22:52:56 -0000	1.2
@@ -0,0 +1 @@
+linsmith-0.99.11.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/linsmith/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	4 Jan 2009 20:33:18 -0000	1.1
+++ sources	5 Jan 2009 22:52:56 -0000	1.2
@@ -0,0 +1 @@
+33256af1c310309da6f03f2a2fe8a869  linsmith-0.99.11.tar.gz



From dwalsh at fedoraproject.org  Mon Jan  5 22:55:50 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Mon,  5 Jan 2009 22:55:50 +0000 (UTC)
Subject: rpms/selinux-policy/devel sources,1.173,1.174
Message-ID: <20090105225550.A36087011F@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3483

Modified Files:
	sources 
Log Message:
* Mon Jan 5 2009 Dan Walsh <dwalsh at redhat.com> 3.6.2-1
- Update to upstream



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/sources,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -r1.173 -r1.174
--- sources	5 Jan 2009 22:35:32 -0000	1.173
+++ sources	5 Jan 2009 22:55:20 -0000	1.174
@@ -1 +1 @@
-5fdbc11560122f475411106da175db9a  serefpolicy-3.6.2.tgz
+44fa8cab20d73ab4beb07513931e01b6  serefpolicy-3.6.2.tgz



From timn at fedoraproject.org  Mon Jan  5 23:06:35 2009
From: timn at fedoraproject.org (Tim Niemueller)
Date: Mon,  5 Jan 2009 23:06:35 +0000 (UTC)
Subject: rpms/conexusmm/F-8 conexusmm.spec,1.8,1.9
Message-ID: <20090105230635.AC1D47011F@cvs1.fedora.phx.redhat.com>

Author: timn

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

Modified Files:
	conexusmm.spec 
Log Message:
- Rebuild for new papyrus 0.7.1-6
- Sync to F-10 version/release

Tim



Index: conexusmm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/conexusmm/F-8/conexusmm.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- conexusmm.spec	14 Mar 2007 06:24:00 -0000	1.8
+++ conexusmm.spec	5 Jan 2009 23:06:05 -0000	1.9
@@ -2,8 +2,8 @@
 Summary:          Network and serial communication widgets for Gtkmm
 Name:             conexusmm
 Version:          0.5.0
-Release:          3%{?dist}
-License:          LGPL
+Release:          6%{?dist}
+License:          LGPLv2
 URL:              http://conexus.sourceforge.net
 Group:            System Environment/Libraries
 Source:           http://download.sourceforge.net/conexus/%{name}-%{version}.tar.bz2
@@ -63,6 +63,16 @@
 %{_datadir}/conexusmm-0.5.0/
 
 %changelog
+* Thu Jan 01 2009 Tim Niemueller <tim at niemueller.de> - 0.5.0-6
+- Rebuild for new papyrus 0.7.1-6
+- Sync to F-10 version/release
+
+* Tue Jul 15 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.5.0-5
+- fix license tag
+
+* Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.5.0-4
+- Autorebuild for GCC 4.3
+
 * Tue Mar 13 2007 Rick L Vinyard Jr <rvinyard at cs.nmsu.edu> - 0.5.0-3
 - Bump release... didn't make new-sources
 



From chitlesh at fedoraproject.org  Mon Jan  5 23:08:11 2009
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Mon,  5 Jan 2009 23:08:11 +0000 (UTC)
Subject: rpms/linsmith/EL-5 import.log, NONE, 1.1 linsmith.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090105230811.F1A217011F@cvs1.fedora.phx.redhat.com>

Author: chitlesh

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

Modified Files:
	.cvsignore sources 
Added Files:
	import.log linsmith.spec 
Log Message:
new package


--- NEW FILE import.log ---
linsmith-0_99_11-2_fc10:EL-5:linsmith-0.99.11-2.fc10.src.rpm:1231196351


--- NEW FILE linsmith.spec ---
Name:           linsmith
Version:        0.99.11
Release:        2%{?dist}
Summary:        A Smith charting program

Group:          Applications/Engineering
License:        GPLv2
URL:            http://jcoppens.com/soft/linsmith/index.en.php
Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz

BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  libgnomeprint22-devel
BuildRequires:  libgnomeui-devel
BuildRequires:  gettext
BuildRequires:  desktop-file-utils

Requires:       electronics-menu
Requires:       tcl

%description
linSmith is a Smith Charting program.
It's main features are:
  * Definition of multiple load impedances
  * Addition of discrete and line components
  * A 'virtual' component switches from impedance
    to admittance to help explaining parallel components
  * The chart works in real impedances
  * Load and circuit configuration is stored separately,
    permitting several solutions without re-defining the other

%prep
%setup -q


#remove unwanted file.
%{__rm} -f pixmaps/Makefile.am~

%build
%configure
%{__make} %{?_smp_mflags}


%install
%{__rm} -rf %{buildroot}
%{__make} install DESTDIR=%{buildroot} INSTALL="install -p"

desktop-file-install                            \
    --dir=%{buildroot}/%{_datadir}/applications \
    --delete-original                           \
    --remove-category GTK                       \
    --remove-category GNOME                     \
    --add-category "Electronics"                \
    %{_builddir}/%{name}-%{version}/%{name}.desktop

# icon
cp -p linsmith_icon.xpm %{buildroot}/%{_datadir}/pixmaps/%{name}/

# man file
%{__mkdir} -p %{buildroot}/%{_datadir}/man/man1
cp -p doc/linsmith.1 %{buildroot}/%{_datadir}/man/man1

#examples
mv %{buildroot}/%{_datadir}/%{name} examples/

%find_lang %{name}


%clean
rm -rf %{buildroot}


%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING NEWS README THANKS doc/manual.pdf
%doc examples/
%{_bindir}/%{name}
%{_datadir}/applications/%{name}.desktop
%{_datadir}/pixmaps/%{name}
%{_datadir}/man/man1/%{name}.1.gz


%changelog
* Mon Dec 29 2008 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 0.99.11-2
- spec file updated as suggested in the #478368c2

* Mon Dec 29 2008 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 0.99.11-1
- Initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/linsmith/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	4 Jan 2009 20:33:18 -0000	1.1
+++ .cvsignore	5 Jan 2009 23:07:41 -0000	1.2
@@ -0,0 +1 @@
+linsmith-0.99.11.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/linsmith/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	4 Jan 2009 20:33:18 -0000	1.1
+++ sources	5 Jan 2009 23:07:41 -0000	1.2
@@ -0,0 +1 @@
+33256af1c310309da6f03f2a2fe8a869  linsmith-0.99.11.tar.gz



From pkgdb at fedoraproject.org  Mon Jan  5 23:14:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Jan 2009 23:14:21 +0000
Subject: [pkgdb] papyrus: timn has requested watchbugzilla
Message-ID: <20090105231421.6B66320873B@bastion.fedora.phx.redhat.com>

timn has requested the watchbugzilla acl on papyrus (Fedora 8)

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



From pkgdb at fedoraproject.org  Mon Jan  5 23:14:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Jan 2009 23:14:23 +0000
Subject: [pkgdb] papyrus: timn has requested watchcommits
Message-ID: <20090105231423.2FF89208D4F@bastion.fedora.phx.redhat.com>

timn has requested the watchcommits acl on papyrus (Fedora 8)

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



From pkgdb at fedoraproject.org  Mon Jan  5 23:14:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Jan 2009 23:14:25 +0000
Subject: [pkgdb] papyrus: timn has requested commit
Message-ID: <20090105231425.22C53208D52@bastion.fedora.phx.redhat.com>

timn has requested the commit acl on papyrus (Fedora 8)

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



From pkgdb at fedoraproject.org  Mon Jan  5 23:14:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Jan 2009 23:14:30 +0000
Subject: [pkgdb] papyrus: timn has requested watchbugzilla
Message-ID: <20090105231430.4BC22208D59@bastion.fedora.phx.redhat.com>

timn has requested the watchbugzilla acl on papyrus (Fedora 9)

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



From pkgdb at fedoraproject.org  Mon Jan  5 23:14:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Jan 2009 23:14:31 +0000
Subject: [pkgdb] papyrus: timn has requested watchcommits
Message-ID: <20090105231431.9CB14208D60@bastion.fedora.phx.redhat.com>

timn has requested the watchcommits acl on papyrus (Fedora 9)

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



From pkgdb at fedoraproject.org  Mon Jan  5 23:14:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Jan 2009 23:14:32 +0000
Subject: [pkgdb] papyrus: timn has requested commit
Message-ID: <20090105231432.BF3AE208D66@bastion.fedora.phx.redhat.com>

timn has requested the commit acl on papyrus (Fedora 9)

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



From pkgdb at fedoraproject.org  Mon Jan  5 23:14:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Jan 2009 23:14:37 +0000
Subject: [pkgdb] papyrus: timn has requested watchbugzilla
Message-ID: <20090105231437.6163D208D9B@bastion.fedora.phx.redhat.com>

timn has requested the watchbugzilla acl on papyrus (Fedora 10)

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



From pkgdb at fedoraproject.org  Mon Jan  5 23:14:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Jan 2009 23:14:38 +0000
Subject: [pkgdb] papyrus: timn has requested watchcommits
Message-ID: <20090105231438.A5DF3208DA5@bastion.fedora.phx.redhat.com>

timn has requested the watchcommits acl on papyrus (Fedora 10)

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



From pkgdb at fedoraproject.org  Mon Jan  5 23:14:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Jan 2009 23:14:40 +0000
Subject: [pkgdb] papyrus: timn has requested commit
Message-ID: <20090105231440.30656208DA7@bastion.fedora.phx.redhat.com>

timn has requested the commit acl on papyrus (Fedora 10)

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



From pkgdb at fedoraproject.org  Mon Jan  5 23:14:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Jan 2009 23:14:54 +0000
Subject: [pkgdb] papyrus: timn has requested watchbugzilla
Message-ID: <20090105231454.B5BDB208D51@bastion.fedora.phx.redhat.com>

timn has requested the watchbugzilla acl on papyrus (Fedora devel)

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



From pkgdb at fedoraproject.org  Mon Jan  5 23:14:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Jan 2009 23:14:56 +0000
Subject: [pkgdb] papyrus: timn has requested watchcommits
Message-ID: <20090105231456.817FB208D55@bastion.fedora.phx.redhat.com>

timn has requested the watchcommits acl on papyrus (Fedora devel)

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



From pkgdb at fedoraproject.org  Mon Jan  5 23:14:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 05 Jan 2009 23:14:58 +0000
Subject: [pkgdb] papyrus: timn has requested commit
Message-ID: <20090105231458.43B8B208DAA@bastion.fedora.phx.redhat.com>

timn has requested the commit acl on papyrus (Fedora devel)

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



From hadess at fedoraproject.org  Mon Jan  5 23:19:39 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Mon,  5 Jan 2009 23:19:39 +0000 (UTC)
Subject: rpms/totem/devel totem.spec,1.213,1.214
Message-ID: <20090105231939.8A55C7011F@cvs1.fedora.phx.redhat.com>

Author: hadess

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

Modified Files:
	totem.spec 
Log Message:
* Mon Jan 05 2009 - Bastien Nocera <bnocera at redhat.com> - 2.25.3-6
- Remove compiled bits for the bug report scripts (#478889)



Index: totem.spec
===================================================================
RCS file: /cvs/pkgs/rpms/totem/devel/totem.spec,v
retrieving revision 1.213
retrieving revision 1.214
diff -u -r1.213 -r1.214
--- totem.spec	17 Dec 2008 15:07:40 -0000	1.213
+++ totem.spec	5 Jan 2009 23:19:07 -0000	1.214
@@ -10,7 +10,7 @@
 Summary: Movie player for GNOME
 Name: totem
 Version: 2.25.3
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPLv2+ with exceptions
 Group: Applications/Multimedia
 URL: http://projects.gnome.org/totem/
@@ -268,7 +268,8 @@
  $RPM_BUILD_ROOT%{_libdir}/nautilus/extensions-2.0/*.{a,la} \
  $RPM_BUILD_ROOT%{_libdir}/libbaconvideowidget*.{a,la} \
  $RPM_BUILD_ROOT%{_libdir}/libbaconvideowidget.so \
- $RPM_BUILD_ROOT%{_libdir}/totem/plugins/bemused/
+ $RPM_BUILD_ROOT%{_libdir}/totem/plugins/bemused/ \
+ $RPM_BUILD_ROOT%{_libexecdir}/totem/totem-bugreport.py[co]
 
 %find_lang %{name} --with-gnome
 
@@ -390,7 +391,7 @@
 %{_datadir}/applications/%{name}.desktop
 %{_datadir}/%{name}/
 %dir %{_libexecdir}/totem
-%{_libexecdir}/totem/totem-bugreport.py*
+%{_libexecdir}/totem/totem-bugreport.py
 %{_libdir}/libbaconvideowidget.so*
 %dir %{_libdir}/totem/plugins
 %{_libdir}/totem/plugins/gromit
@@ -457,6 +458,9 @@
 %endif
 
 %changelog
+* Mon Jan 05 2009 - Bastien Nocera <bnocera at redhat.com> - 2.25.3-6
+- Remove compiled bits for the bug report scripts (#478889)
+
 * Wed Dec 17 2008 - Bastien Nocera <bnocera at redhat.com> - 2.25.3-5
 - Whatever
 



From timn at fedoraproject.org  Mon Jan  5 23:36:42 2009
From: timn at fedoraproject.org (Tim Niemueller)
Date: Mon,  5 Jan 2009 23:36:42 +0000 (UTC)
Subject: rpms/conexusmm/F-9 conexusmm.spec,1.9,1.10
Message-ID: <20090105233642.70F057011F@cvs1.fedora.phx.redhat.com>

Author: timn

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

Modified Files:
	conexusmm.spec 
Log Message:
- Rebuild for new papyrus 0.7.1-6
- Sync to F-10 version/release

Tim



Index: conexusmm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/conexusmm/F-9/conexusmm.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- conexusmm.spec	19 Feb 2008 22:52:03 -0000	1.9
+++ conexusmm.spec	5 Jan 2009 23:36:11 -0000	1.10
@@ -2,8 +2,8 @@
 Summary:          Network and serial communication widgets for Gtkmm
 Name:             conexusmm
 Version:          0.5.0
-Release:          4%{?dist}
-License:          LGPL
+Release:          6%{?dist}
+License:          LGPLv2
 URL:              http://conexus.sourceforge.net
 Group:            System Environment/Libraries
 Source:           http://download.sourceforge.net/conexus/%{name}-%{version}.tar.bz2
@@ -63,6 +63,13 @@
 %{_datadir}/conexusmm-0.5.0/
 
 %changelog
+* Thu Jan 01 2009 Tim Niemueller <tim at niemueller.de> - 0.5.0-6
+- Rebuild for new papyrus 0.7.1-6
+- Sync to F-10 version/release
+
+* Tue Jul 15 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.5.0-5
+- fix license tag
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.5.0-4
 - Autorebuild for GCC 4.3
 



From dcantrel at fedoraproject.org  Mon Jan  5 23:38:19 2009
From: dcantrel at fedoraproject.org (David Cantrell)
Date: Mon,  5 Jan 2009 23:38:19 +0000 (UTC)
Subject: rpms/anaconda/devel anaconda.spec,1.737,1.738 sources,1.728,1.729
Message-ID: <20090105233819.02C3C7011F@cvs1.fedora.phx.redhat.com>

Author: dcantrel

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

Modified Files:
	anaconda.spec sources 
Log Message:
* Mon Jan 05 2009 David Cantrell <dcantrell at redhat.com> - 11.5.0.4-1
- Workaround compile error due to (# 478663) (hdegoede)
- Various packaging fixed from review (#225246) (hdegoede)
- Show the header in certain non-lowres cases (#478765, alsadi AT
  ojuba.org). (clumens)
- Remove doMultiMount. (clumens)
- Use mount -t auto instead of passing a list of valid fstypes (#477328).
  (clumens)
- Fix case sensitivity when searching for headers (kanarip)
- Fix a traceback in checking for network install (ricky AT
  fedoraproject.org). (clumens)



Index: anaconda.spec
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/devel/anaconda.spec,v
retrieving revision 1.737
retrieving revision 1.738
diff -u -r1.737 -r1.738
--- anaconda.spec	5 Jan 2009 22:20:35 -0000	1.737
+++ anaconda.spec	5 Jan 2009 23:37:47 -0000	1.738
@@ -204,14 +204,17 @@
 %endif
 
 %changelog
-* Mon Jan 05 2009 Chris Lumens <clumens at redhat.com> - 11.5.0.4-1
+* Mon Jan 05 2009 David Cantrell <dcantrell at redhat.com> - 11.5.0.4-1
+- Workaround compile error due to (# 478663) (hdegoede)
 - Various packaging fixed from review (#225246) (hdegoede)
-- Show the header in certain non-lowres cases (#478765, alsadi).
+- Show the header in certain non-lowres cases (#478765, alsadi AT
+  ojuba.org). (clumens)
 - Remove doMultiMount. (clumens)
 - Use mount -t auto instead of passing a list of valid fstypes (#477328).
   (clumens)
 - Fix case sensitivity when searching for headers (kanarip)
-- Fix a traceback in checking for network install (ricky).
+- Fix a traceback in checking for network install (ricky AT
+  fedoraproject.org). (clumens)
 
 * Tue Dec 23 2008 David Cantrell <dcantrell at redhat.com> - 11.5.0.3-1
 - Initialize domainname to None (#477831) (dcantrell)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/devel/sources,v
retrieving revision 1.728
retrieving revision 1.729
diff -u -r1.728 -r1.729
--- sources	5 Jan 2009 22:20:35 -0000	1.728
+++ sources	5 Jan 2009 23:37:48 -0000	1.729
@@ -1 +1 @@
-00534cb4f6e168932ade7f9ca2324870  anaconda-11.5.0.4.tar.bz2
+5f32eee4e0d921598f538c0d208740a0  anaconda-11.5.0.4.tar.bz2



From timn at fedoraproject.org  Mon Jan  5 23:39:04 2009
From: timn at fedoraproject.org (Tim Niemueller)
Date: Mon,  5 Jan 2009 23:39:04 +0000 (UTC)
Subject: rpms/conexusmm/F-10 conexusmm.spec,1.10,1.11
Message-ID: <20090105233904.386F97011F@cvs1.fedora.phx.redhat.com>

Author: timn

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

Modified Files:
	conexusmm.spec 
Log Message:
- Rebuild for new papyrus 0.7.1-6

Tim



Index: conexusmm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/conexusmm/F-10/conexusmm.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- conexusmm.spec	15 Jul 2008 17:50:47 -0000	1.10
+++ conexusmm.spec	5 Jan 2009 23:38:33 -0000	1.11
@@ -2,7 +2,7 @@
 Summary:          Network and serial communication widgets for Gtkmm
 Name:             conexusmm
 Version:          0.5.0
-Release:          5%{?dist}
+Release:          6%{?dist}
 License:          LGPLv2
 URL:              http://conexus.sourceforge.net
 Group:            System Environment/Libraries
@@ -63,6 +63,9 @@
 %{_datadir}/conexusmm-0.5.0/
 
 %changelog
+* Thu Jan 01 2009 Tim Niemueller <tim at niemueller.de> - 0.5.0-6
+- Rebuild for new papyrus 0.7.1-6
+
 * Tue Jul 15 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.5.0-5
 - fix license tag
 



From cwickert at fedoraproject.org  Mon Jan  5 23:40:20 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Mon,  5 Jan 2009 23:40:20 +0000 (UTC)
Subject: rpms/gnome-applet-timer/devel gnome-applet-timer.spec, 1.23,
	1.24 timer-applet-2.0.1-stop-pulsing.patch, 1.1, 1.2
Message-ID: <20090105234020.9743E7011F@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/gnome-applet-timer/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19484/devel

Modified Files:
	gnome-applet-timer.spec timer-applet-2.0.1-stop-pulsing.patch 
Log Message:
* Mon Jan 05 2009 Christoph Wickert <cwickert at fedoraproject.org> - 2.0.2-9
- Update patch as suggested by Michael Schwendt



Index: gnome-applet-timer.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-applet-timer/devel/gnome-applet-timer.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- gnome-applet-timer.spec	4 Jan 2009 20:11:10 -0000	1.23
+++ gnome-applet-timer.spec	5 Jan 2009 23:39:49 -0000	1.24
@@ -4,7 +4,7 @@
 
 Name:           gnome-applet-timer
 Version:        2.0.1
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        A countdown timer applet for the GNOME panel
 
 Group:          User Interface/Desktops
@@ -100,11 +100,14 @@
 %{python_sitelib}/timerapplet/
 
 %changelog
+* Mon Jan 05 2009 Christoph Wickert <cwickert at fedoraproject.org> - 2.0.2-9
+- Update patch as suggested by Michael Schwendt
+
 * Sun Jan 04 2009 Christoph Wickert <cwickert at fedoraproject.org> - 2.0.2-8
-- Use Paul's patch instead of Michael's suggestion (#471465)
+- Use Paul's patch to fix #471465 properly
 
 * Sun Jan 04 2009 Christoph Wickert <cwickert at fedoraproject.org> - 2.0.2-7
-- Apply libnotify patch, thanks to Michael Schwendt and Paul Frields (#471465)
+- Apply libnotify patch to fix #471465
 
 * Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 2.0.1-6
 - Rebuild for Python 2.6

timer-applet-2.0.1-stop-pulsing.patch:

Index: timer-applet-2.0.1-stop-pulsing.patch
===================================================================
RCS file: /cvs/extras/rpms/gnome-applet-timer/devel/timer-applet-2.0.1-stop-pulsing.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- timer-applet-2.0.1-stop-pulsing.patch	4 Jan 2009 20:09:28 -0000	1.1
+++ timer-applet-2.0.1-stop-pulsing.patch	5 Jan 2009 23:39:50 -0000	1.2
@@ -1,6 +1,14 @@
---- timer-applet-2.0.1-orig/src/timerapplet/ui/Notifier.py	2007-04-27 21:31:03.000000000 -0400
-+++ timer-applet-2.0.1/src/timerapplet/ui/Notifier.py	2008-12-24 11:04:52.000000000 -0500
-@@ -25,12 +25,16 @@
+diff -Nur timer-applet-2.0.1-orig/src/timerapplet/ui/Notifier.py timer-applet-2.0.1/src/timerapplet/ui/Notifier.py
+--- timer-applet-2.0.1-orig/src/timerapplet/ui/Notifier.py	2007-04-28 03:31:03.000000000 +0200
++++ timer-applet-2.0.1/src/timerapplet/ui/Notifier.py	2009-01-05 16:38:54.000000000 +0100
+@@ -1,5 +1,6 @@
+ import gobject
+ import pynotify
++import glib
+ 
+ class Notifier(object):
+     _NOTIFICATION_REDISPLAY_INTERVAL_SECONDS = 60
+@@ -25,12 +26,16 @@
              if self._timeout_id is not None:
                  gobject.source_remove(self._timeout_id)
                  self._timeout_id = None
@@ -14,7 +22,7 @@
 +            try:
 +                self._notify.close()
 +                self._notify = None
-+            except:
++            except glib.GError:
 +                pass
              
 -    def _on_notification_closed(self, notification, get_reminder_message_func):



From cwickert at fedoraproject.org  Mon Jan  5 23:40:21 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Mon,  5 Jan 2009 23:40:21 +0000 (UTC)
Subject: rpms/gnome-applet-timer/F-10 gnome-applet-timer.spec, 1.22,
	1.23 timer-applet-2.0.1-stop-pulsing.patch, 1.1, 1.2
Message-ID: <20090105234021.217487011F@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/gnome-applet-timer/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19484/F-10

Modified Files:
	gnome-applet-timer.spec timer-applet-2.0.1-stop-pulsing.patch 
Log Message:
* Mon Jan 05 2009 Christoph Wickert <cwickert at fedoraproject.org> - 2.0.2-9
- Update patch as suggested by Michael Schwendt



Index: gnome-applet-timer.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-applet-timer/F-10/gnome-applet-timer.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- gnome-applet-timer.spec	4 Jan 2009 20:11:11 -0000	1.22
+++ gnome-applet-timer.spec	5 Jan 2009 23:39:50 -0000	1.23
@@ -4,7 +4,7 @@
 
 Name:           gnome-applet-timer
 Version:        2.0.1
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        A countdown timer applet for the GNOME panel
 
 Group:          User Interface/Desktops
@@ -100,11 +100,14 @@
 %{python_sitelib}/timerapplet/
 
 %changelog
+* Mon Jan 05 2009 Christoph Wickert <cwickert at fedoraproject.org> - 2.0.2-9
+- Update patch as suggested by Michael Schwendt
+
 * Sun Jan 04 2009 Christoph Wickert <cwickert at fedoraproject.org> - 2.0.2-8
-- Use Paul's patch instead of Michael's suggestion (#471465)
+- Use Paul's patch to fix #471465 properly
 
 * Sun Jan 04 2009 Christoph Wickert <cwickert at fedoraproject.org> - 2.0.2-7
-- Apply libnotify patch, thanks to Michael Schwendt and Paul Frields (#471465)
+- Apply libnotify patch to fix #471465
 
 * Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 2.0.1-6
 - Rebuild for Python 2.6

timer-applet-2.0.1-stop-pulsing.patch:

Index: timer-applet-2.0.1-stop-pulsing.patch
===================================================================
RCS file: /cvs/extras/rpms/gnome-applet-timer/F-10/timer-applet-2.0.1-stop-pulsing.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- timer-applet-2.0.1-stop-pulsing.patch	4 Jan 2009 20:28:33 -0000	1.1
+++ timer-applet-2.0.1-stop-pulsing.patch	5 Jan 2009 23:39:50 -0000	1.2
@@ -1,6 +1,14 @@
---- timer-applet-2.0.1-orig/src/timerapplet/ui/Notifier.py	2007-04-27 21:31:03.000000000 -0400
-+++ timer-applet-2.0.1/src/timerapplet/ui/Notifier.py	2008-12-24 11:04:52.000000000 -0500
-@@ -25,12 +25,16 @@
+diff -Nur timer-applet-2.0.1-orig/src/timerapplet/ui/Notifier.py timer-applet-2.0.1/src/timerapplet/ui/Notifier.py
+--- timer-applet-2.0.1-orig/src/timerapplet/ui/Notifier.py	2007-04-28 03:31:03.000000000 +0200
++++ timer-applet-2.0.1/src/timerapplet/ui/Notifier.py	2009-01-05 16:38:54.000000000 +0100
+@@ -1,5 +1,6 @@
+ import gobject
+ import pynotify
++import glib
+ 
+ class Notifier(object):
+     _NOTIFICATION_REDISPLAY_INTERVAL_SECONDS = 60
+@@ -25,12 +26,16 @@
              if self._timeout_id is not None:
                  gobject.source_remove(self._timeout_id)
                  self._timeout_id = None
@@ -14,7 +22,7 @@
 +            try:
 +                self._notify.close()
 +                self._notify = None
-+            except:
++            except glib.GError:
 +                pass
              
 -    def _on_notification_closed(self, notification, get_reminder_message_func):



From spot at fedoraproject.org  Mon Jan  5 23:40:41 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Mon,  5 Jan 2009 23:40:41 +0000 (UTC)
Subject: rpms/libmcrypt/F-10 libmcrypt.spec,1.11,1.12
Message-ID: <20090105234041.465F17011F@cvs1.fedora.phx.redhat.com>

Author: spot

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

Modified Files:
	libmcrypt.spec 
Log Message:
fix multilib issue (bz 478879)


Index: libmcrypt.spec
===================================================================
RCS file: /cvs/extras/rpms/libmcrypt/F-10/libmcrypt.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- libmcrypt.spec	26 Aug 2008 12:32:25 -0000	1.11
+++ libmcrypt.spec	5 Jan 2009 23:40:10 -0000	1.12
@@ -1,6 +1,6 @@
 Name:		libmcrypt
 Version:	2.5.8
-Release:	6%{?dist}
+Release:	7%{?dist}
 License:	LGPLv2+
 Group:		System Environment/Libraries
 Summary:	Encryption algorithms library
@@ -45,6 +45,7 @@
 find $RPM_BUILD_ROOT -type f -name '*.la' -exec rm -f {} \;
 
 # Multilib fix
+sed -i 's|-L%{_libdir}||g' $RPM_BUILD_ROOT%{_bindir}/libmcrypt-config
 touch -r NEWS $RPM_BUILD_ROOT%{_bindir}/libmcrypt-config
 
 %clean
@@ -69,6 +70,9 @@
 %{_datadir}/aclocal/libmcrypt.m4
 
 %changelog
+* Mon Jan  5 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 2.5.8-7
+- fix multilib conflict (bz 478879)
+
 * Tue Aug 26 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 2.5.8-6
 - apply minor cleanups from upstream
 



From spot at fedoraproject.org  Mon Jan  5 23:40:42 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Mon,  5 Jan 2009 23:40:42 +0000 (UTC)
Subject: rpms/libmcrypt/devel libmcrypt.spec,1.11,1.12
Message-ID: <20090105234042.9C3877011F@cvs1.fedora.phx.redhat.com>

Author: spot

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

Modified Files:
	libmcrypt.spec 
Log Message:
fix multilib issue (bz 478879)


Index: libmcrypt.spec
===================================================================
RCS file: /cvs/extras/rpms/libmcrypt/devel/libmcrypt.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- libmcrypt.spec	26 Aug 2008 12:32:25 -0000	1.11
+++ libmcrypt.spec	5 Jan 2009 23:40:12 -0000	1.12
@@ -1,6 +1,6 @@
 Name:		libmcrypt
 Version:	2.5.8
-Release:	6%{?dist}
+Release:	7%{?dist}
 License:	LGPLv2+
 Group:		System Environment/Libraries
 Summary:	Encryption algorithms library
@@ -45,6 +45,7 @@
 find $RPM_BUILD_ROOT -type f -name '*.la' -exec rm -f {} \;
 
 # Multilib fix
+sed -i 's|-L%{_libdir}||g' $RPM_BUILD_ROOT%{_bindir}/libmcrypt-config
 touch -r NEWS $RPM_BUILD_ROOT%{_bindir}/libmcrypt-config
 
 %clean
@@ -69,6 +70,9 @@
 %{_datadir}/aclocal/libmcrypt.m4
 
 %changelog
+* Mon Jan  5 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 2.5.8-7
+- fix multilib conflict (bz 478879)
+
 * Tue Aug 26 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 2.5.8-6
 - apply minor cleanups from upstream
 



From spot at fedoraproject.org  Mon Jan  5 23:40:42 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Mon,  5 Jan 2009 23:40:42 +0000 (UTC)
Subject: rpms/libmcrypt/F-9 libmcrypt.spec,1.11,1.12
Message-ID: <20090105234042.0C6417011F@cvs1.fedora.phx.redhat.com>

Author: spot

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

Modified Files:
	libmcrypt.spec 
Log Message:
fix multilib issue (bz 478879)


Index: libmcrypt.spec
===================================================================
RCS file: /cvs/extras/rpms/libmcrypt/F-9/libmcrypt.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- libmcrypt.spec	26 Aug 2008 12:40:10 -0000	1.11
+++ libmcrypt.spec	5 Jan 2009 23:40:11 -0000	1.12
@@ -1,6 +1,6 @@
 Name:		libmcrypt
 Version:	2.5.8
-Release:	6%{?dist}
+Release:	7%{?dist}
 License:	LGPLv2+
 Group:		System Environment/Libraries
 Summary:	Encryption algorithms library
@@ -45,6 +45,7 @@
 find $RPM_BUILD_ROOT -type f -name '*.la' -exec rm -f {} \;
 
 # Multilib fix
+sed -i 's|-L%{_libdir}||g' $RPM_BUILD_ROOT%{_bindir}/libmcrypt-config
 touch -r NEWS $RPM_BUILD_ROOT%{_bindir}/libmcrypt-config
 
 %clean
@@ -69,6 +70,9 @@
 %{_datadir}/aclocal/libmcrypt.m4
 
 %changelog
+* Mon Jan  5 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 2.5.8-7
+- fix multilib conflict (bz 478879)
+
 * Tue Aug 26 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 2.5.8-6
 - apply minor cleanups from upstream
 



From lmacken at fedoraproject.org  Mon Jan  5 23:53:00 2009
From: lmacken at fedoraproject.org (Luke Macken)
Date: Mon,  5 Jan 2009 23:53:00 +0000 (UTC)
Subject: rpms/bodhi/devel .cvsignore, 1.20, 1.21 bodhi.spec, 1.26,
	1.27 sources, 1.22, 1.23
Message-ID: <20090105235300.E9EDE7011F@cvs1.fedora.phx.redhat.com>

Author: lmacken

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

Modified Files:
	.cvsignore bodhi.spec sources 
Log Message:
* Mon Jan 05 2009 Luke Macken <lmacken at redhat.com> - 0.5.16-1
- Latest upstream bugfix release.

* Mon Dec 22 2008 Luke Macken <lmacken at redhat.com> - 0.5.15-1
- Latest release, with more masher improvements.




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bodhi/devel/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- .cvsignore	20 Dec 2008 01:45:22 -0000	1.20
+++ .cvsignore	5 Jan 2009 23:52:28 -0000	1.21
@@ -1 +1 @@
-bodhi-0.5.14.tar.bz2
+bodhi-0.5.16.tar.bz2


Index: bodhi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bodhi/devel/bodhi.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- bodhi.spec	20 Dec 2008 01:45:22 -0000	1.26
+++ bodhi.spec	5 Jan 2009 23:52:29 -0000	1.27
@@ -2,7 +2,7 @@
 %{!?pyver: %define pyver %(%{__python} -c "import sys ; print sys.version[:3]")}
 
 Name:           bodhi
-Version:        0.5.14
+Version:        0.5.16
 Release:        1%{?dist}
 Summary:        A modular framework that facilitates publishing software updates
 Group:          Applications/Internet
@@ -113,6 +113,12 @@
 
 
 %changelog
+* Mon Jan 05 2009 Luke Macken <lmacken at redhat.com> - 0.5.16-1
+- Latest upstream bugfix release.
+
+* Mon Dec 22 2008 Luke Macken <lmacken at redhat.com> - 0.5.15-1
+- Latest release, with more masher improvements.
+
 * Fri Dec 19 2008 Luke Macken <lmacken at redhat.com> - 0.5.14-1
 - Latest upstream release, containing some masher improvements.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bodhi/devel/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- sources	20 Dec 2008 01:45:22 -0000	1.22
+++ sources	5 Jan 2009 23:52:29 -0000	1.23
@@ -1 +1 @@
-4630ccd729d301044971e94675344252  bodhi-0.5.14.tar.bz2
+a76e28c05ab3349f538087046b3aac28  bodhi-0.5.16.tar.bz2



From emaldonado at fedoraproject.org  Mon Jan  5 23:55:33 2009
From: emaldonado at fedoraproject.org (Elio Maldonado)
Date: Mon,  5 Jan 2009 23:55:33 +0000 (UTC)
Subject: rpms/crypto-utils/devel crypto-utils.spec,1.49,1.50
Message-ID: <20090105235533.AC310700DB@cvs1.fedora.phx.redhat.com>

Author: emaldonado

Update of /cvs/extras/rpms/crypto-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22967

Modified Files:
	crypto-utils.spec 
Log Message:
fix ca server key name extension


Index: crypto-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/crypto-utils/devel/crypto-utils.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- crypto-utils.spec	29 Dec 2008 00:54:13 -0000	1.49
+++ crypto-utils.spec	5 Jan 2009 23:55:03 -0000	1.50
@@ -4,7 +4,7 @@
 Summary: SSL certificate and key management utilities
 Name: crypto-utils
 Version: 2.4.1
-Release: 5
+Release: 6
 Source: crypto-rand-%{crver}.tar.gz
 Source1: genkey.pl
 Source2: certwatch.c
@@ -131,6 +131,9 @@
 %{perl_vendorarch}/auto/Crypt
 
 %changelog
+* Mon Jan 05 2009 Elio Maldonado <emaldona at redhat.com> - 2.4.1-6
+- genkey: fix ca key name extension
+
 * Wed Dec 28 2008 Elio Maldonado <emaldona at redhat.com> - 2.4.1-5
 - genkey: fix server key name extension
 - certwatch: code cleanup



From xavierb at fedoraproject.org  Tue Jan  6 00:08:06 2009
From: xavierb at fedoraproject.org (Xavier Bachelot)
Date: Tue,  6 Jan 2009 00:08:06 +0000 (UTC)
Subject: rpms/xorg-x11-drv-openchrome/F-10
	openchrome-0.2.903-latest_snapshot.patch, NONE,
	1.1 openchrome.xinf, 1.1, 1.2 xorg-x11-drv-openchrome.spec, 1.32, 1.33
Message-ID: <20090106000806.3B67370140@cvs1.fedora.phx.redhat.com>

Author: xavierb

Update of /cvs/pkgs/rpms/xorg-x11-drv-openchrome/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26557

Modified Files:
	openchrome.xinf xorg-x11-drv-openchrome.spec 
Added Files:
	openchrome-0.2.903-latest_snapshot.patch 
Log Message:
openchrome trunk rev 711

openchrome-0.2.903-latest_snapshot.patch:

--- NEW FILE openchrome-0.2.903-latest_snapshot.patch ---
Index: configure.ac
===================================================================
--- configure.ac	(.../tags/release_0_2_903)	(revision 711)
+++ configure.ac	(.../trunk)	(revision 711)
@@ -70,7 +70,7 @@
 XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto)
 
 # Checks for pkg-config packages
-PKG_CHECK_MODULES(XORG, [xorg-server xproto xvmc fontsproto libdrm $REQUIRED_MODULES])
+PKG_CHECK_MODULES(XORG, [xorg-server xproto fontsproto libdrm $REQUIRED_MODULES])
 sdkdir=$(pkg-config --variable=sdkdir xorg-server)
 
 # Checks for libraries.
@@ -126,6 +126,7 @@
 
 if test "x$XVMC" = xyes; then
 	AC_CHECK_HEADERS(pthread.h sys/ioctl.h sys/time.h time.h,,[XVMC="no"; break],)
+	PKG_CHECK_MODULES(XVMC, [x11 xext xvmc])
 fi
 
 AC_MSG_CHECKING([whether to build XvMC driver support])
@@ -133,33 +134,10 @@
 
 AM_CONDITIONAL(XVMC, test x$XVMC = xyes)
 
-AC_CHECK_FILE([${sdkdir}/xf86Module.h],
-              [have_xf86Module_h="yes"], [have_xf86Module_h="no"])
-
 # Check the ABI_VIDEODRV_VERSION
 SAVE_CFLAGS="$CFLAGS"
 CFLAGS="$CFLAGS $XORG_CFLAGS"
 		
-if test "x$have_xf86Module_h" = xyes; then
-AC_MSG_CHECKING([whether to use old Xv ABI])
-        AC_PREPROC_IFELSE([AC_LANG_PROGRAM([[
-                           ]])],
-                           [OLD_XVABI=no],
-			   [OLD_XVABI=yes])
-else
-        OLD_XVABI=yes
-        echo -n "xf86Module.h not found, "
-fi
-
-CFLAGS="$SAVE_CFLAGS"
-
-if test "x$OLD_XVABI" = xyes; then
-                echo "yes."
-else
-                echo "no."
-                AC_DEFINE(USE_NEW_XVABI, 1, [Use new Xv ABI (7.1RC1+)])
-fi
-
 AM_CONDITIONAL(XSERVER_LIBPCIACCESS, test x$XSERVER_LIBPCIACCESS = xyes)
 if test "$XSERVER_LIBPCIACCESS" = yes; then
         AC_DEFINE(XSERVER_LIBPCIACCESS,1,[Enable libpciaccess])
Index: libxvmc/Makefile.am
===================================================================
--- libxvmc/Makefile.am	(.../tags/release_0_2_903)	(revision 711)
+++ libxvmc/Makefile.am	(.../trunk)	(revision 711)
@@ -24,13 +24,13 @@
 	xf86dristr.h \
 	vldXvMC.h
 
-libchromeXvMC_la_CFLAGS = @XORG_CFLAGS@ @DRI_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/libxvmc -DTRUE=1 -DFALSE=0
+libchromeXvMC_la_CFLAGS = @XORG_CFLAGS@ @DRI_CFLAGS@ @XVMC_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/libxvmc -DTRUE=1 -DFALSE=0
 libchromeXvMC_la_LDFLAGS = -version-number 1:0:0
-libchromeXvMC_la_LIBADD = @DRI_LIBS@
+libchromeXvMC_la_LIBADD = @DRI_LIBS@ @XVMC_LIBS@
 
-libchromeXvMCPro_la_CFLAGS = @XORG_CFLAGS@ @DRI_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/libxvmc -DTRUE=1 -DFALSE=0
+libchromeXvMCPro_la_CFLAGS = @XORG_CFLAGS@ @DRI_CFLAGS@ @XVMC_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/libxvmc -DTRUE=1 -DFALSE=0
 libchromeXvMCPro_la_LDFLAGS = -version-number 1:0:0
-libchromeXvMCPro_la_LIBADD = @DRI_LIBS@
+libchromeXvMCPro_la_LIBADD = @DRI_LIBS@ @XVMC_LIBS@
 else
 EXTRA_DIST = \
 	driDrawable.c \
Index: libxvmc/viaLowLevelPro.c
===================================================================
--- libxvmc/viaLowLevelPro.c	(.../tags/release_0_2_903)	(revision 711)
+++ libxvmc/viaLowLevelPro.c	(.../trunk)	(revision 711)
@@ -1460,13 +1460,13 @@
 
     if (size != mem->size) {
 	if (mem->size)
-	    drmCommandWrite(xl->fd, DRM_VIA_FREEMEM, mem, sizeof(mem));
+	    drmCommandWrite(xl->fd, DRM_VIA_FREEMEM, mem, sizeof(*mem));
 	mem->context = *(xl->drmcontext);
 	mem->size = size;
 	mem->type = VIA_MEM_VIDEO;
 
 	if (((ret = drmCommandWriteRead(xl->fd, DRM_VIA_ALLOCMEM, mem,
-			sizeof(mem))) < 0) || mem->size != size) {
+			sizeof(*mem))) < 0) || mem->size != size) {
 	    mem->size = 0;
 	    return -1;
 	}
@@ -1484,7 +1484,7 @@
     drm_via_mem_t *mem = &buf->mem;
 
     if (mem->size)
-	drmCommandWrite(xl->fd, DRM_VIA_FREEMEM, mem, sizeof(mem));
+	drmCommandWrite(xl->fd, DRM_VIA_FREEMEM, mem, sizeof(*mem));
     mem->size = 0;
 }
 
Index: libxvmc/viaXvMC.c
===================================================================
--- libxvmc/viaXvMC.c	(.../tags/release_0_2_903)	(revision 711)
+++ libxvmc/viaXvMC.c	(.../trunk)	(revision 711)
@@ -248,7 +248,7 @@
     return errType;
 }
 
-Status
+_X_EXPORT Status
 XvMCCreateContext(Display * display, XvPortID port,
     int surface_type_id, int width, int height, int flags,
     XvMCContext * context)
@@ -572,7 +572,7 @@
     return Success;
 }
 
-Status
+_X_EXPORT Status
 XvMCDestroyContext(Display * display, XvMCContext * context)
 {
     ViaXvMCContext *pViaXvMC;
@@ -594,7 +594,7 @@
     return releaseContextResources(display, context, 1, Success);
 }
 
-Status
+_X_EXPORT Status
 XvMCCreateSurface(Display * display, XvMCContext * context,
     XvMCSurface * surface)
 {
@@ -661,7 +661,7 @@
     return Success;
 }
 
-Status
+_X_EXPORT Status
 XvMCDestroySurface(Display * display, XvMCSurface * surface)
 {
     ViaXvMCSurface *pViaSurface;
@@ -684,7 +684,7 @@
     return Success;
 }
 
-Status
+_X_EXPORT Status
 XvMCPutSlice2(Display * display, XvMCContext * context, char *slice,
     int nBytes, int sliceCode)
 {
@@ -711,7 +711,7 @@
     return Success;
 }
 
-Status
+_X_EXPORT Status
 XvMCPutSlice(Display * display, XvMCContext * context, char *slice,
     int nBytes)
 {
@@ -781,7 +781,7 @@
     return Success;
 }
 
-Status
+_X_EXPORT Status
 XvMCPutSurface(Display * display, XvMCSurface * surface, Drawable draw,
     short srcx, short srcy, unsigned short srcw,
     unsigned short srch, short destx, short desty,
@@ -964,7 +964,7 @@
     printf("flags: 0x%x\n", control->flags);
 }
 
-Status
+_X_EXPORT Status
 XvMCBeginSurface(Display * display,
     XvMCContext * context,
     XvMCSurface * target_surface,
@@ -1062,7 +1062,7 @@
     return Success;
 }
 
-Status
+_X_EXPORT Status
 XvMCSyncSurface(Display * display, XvMCSurface * surface)
 {
     ViaXvMCSurface *pViaSurface;
@@ -1124,7 +1124,7 @@
     return Success;
 }
 
-Status
+_X_EXPORT Status
 XvMCLoadQMatrix(Display * display, XvMCContext * context,
     const XvMCQMatrix * qmx)
[...6816 lines suppressed...]
+        if (RED_BLANK_RQD) {
+            mode->Flags |= V_PHSYNC ;
+            mode->Flags |= V_NVSYNC ;
+        } else {
+            mode->Flags |= V_NHSYNC ;
+            mode->Flags |= V_PVSYNC ;
+        }
+
+        if (!(mode->Flags & V_PHSYNC)) mode->Flags |= V_NHSYNC ;
+        if (!(mode->Flags & V_NHSYNC)) mode->Flags |= V_PHSYNC ;
+        if (!(mode->Flags & V_PVSYNC)) mode->Flags |= V_NVSYNC ;
+        if (!(mode->Flags & V_NVSYNC)) mode->Flags |= V_PVSYNC ;
+
+        if (INT_RQD) mode->Flags |= V_INTERLACE ;
+    } else {
+        ret |= TIMING_ERR_BAD_ALLOC ;
+    }
+
+    return ret ;
+}
+
+int viaTimingCvt(DisplayModePtr mode, int width, int height, float refresh, Bool interlaced, Bool reducedBlanking) {
+    return timingGenerateMode( mode, FALSE, width, height, refresh, interlaced, reducedBlanking ) ;
+}
+
+int viaTimingGtf(DisplayModePtr mode, int width, int height, float refresh, Bool interlaced) {
+    return timingGenerateMode( mode, TRUE, width, height, refresh, interlaced, FALSE ) ;
+}
Index: src/Makefile.am
===================================================================
--- src/Makefile.am	(.../tags/release_0_2_903)	(revision 711)
+++ src/Makefile.am	(.../trunk)	(revision 711)
@@ -43,23 +43,29 @@
          via_ch7xxx.c \
          via_ch7xxx.h \
          via_cursor.c \
+         via_crtc.c \
          via_dga.c \
+         via_display.c \
          via_dmabuffer.h \
          via_driver.c \
          via_driver.h \
          via_i2c.c \
          via_id.c \
          via_id.h \
+         via_lvds.c \
          via_memcpy.c \
          via_memcpy.h \
          via_memory.c \
          via_mode.c \
          via_mode.h \
+         via_panel.c \
          via_priv.h \
          via_regs.h \
          via_shadow.c \
          via_swov.c \
          via_swov.h \
+         via_timing.c \
+         via_timing.h \
          via_vbe.c \
          via_vgahw.c \
          via_vgahw.h \
Index: src/via_dga.c
===================================================================
--- src/via_dga.c	(.../tags/release_0_2_903)	(revision 711)
+++ src/via_dga.c	(.../trunk)	(revision 711)
@@ -248,7 +248,7 @@
 
         pScrn->SwitchMode(index, pScrn->currentMode, 0);
         if (pVia->hwcursor)
-            VIAShowCursor(pScrn);
+            viaShowCursor(pScrn);
 
         pVia->DGAactive = FALSE;
     }
@@ -261,7 +261,7 @@
 #endif
 
         if (pVia->hwcursor)
-            VIAHideCursor(pScrn);
+            viaHideCursor(pScrn);
 
         if (!pVia->DGAactive) {  /* save the old parameters */
             pVia->DGAOldDisplayWidth = pScrn->displayWidth;
Index: src/via_id.c
===================================================================
--- src/via_id.c	(.../tags/release_0_2_903)	(revision 711)
+++ src/via_id.c	(.../trunk)	(revision 711)
@@ -87,6 +87,7 @@
     {"Asustek K8V-MX",                        VIA_K8M800,  0x1043, 0x8129, VIA_DEVICE_CRT},
     {"Mitac 8399",                            VIA_K8M800,  0x1071, 0x8399, VIA_DEVICE_CRT | VIA_DEVICE_LCD | VIA_DEVICE_TV}, /* aka "Pogolinux Konabook 3100" */
     {"Mitac 8889",                            VIA_K8M800,  0x1071, 0x8889, VIA_DEVICE_CRT | VIA_DEVICE_LCD | VIA_DEVICE_TV},
+    {"MSI K8M Neo-V (broken pci id)",         VIA_K8M800,  0x1106, 0x0204, VIA_DEVICE_CRT},
     {"VIA VT3108 (K8M800)",                   VIA_K8M800,  0x1106, 0x3108, VIA_DEVICE_CRT}, /* borrowed by Asustek A8V-MX */ 
     {"Shuttle FX21",                          VIA_K8M800,  0x1297, 0x3052, VIA_DEVICE_CRT},
     {"Shuttle FX83",                          VIA_K8M800,  0x1297, 0xF683, VIA_DEVICE_CRT | VIA_DEVICE_TV},
@@ -113,6 +114,7 @@
     {"Packard Bell Imedia 2097",              VIA_K8M800,  0x1631, 0xD007, VIA_DEVICE_CRT},
     {"Fujitsu-Siemens Amilo K7610",           VIA_K8M800,  0x1734, 0x10B3, VIA_DEVICE_CRT | VIA_DEVICE_LCD},
     {"ASRock K8Upgrade-VM800",                VIA_K8M800,  0x1849, 0x3108, VIA_DEVICE_CRT},
+    {"Axper XP-M8VM800",                      VIA_K8M800,  0x1940, 0xD000, VIA_DEVICE_CRT},
 
     /*** PM800, PM880, PN800, CN400 ***/
     {"VIA VT3118 (PM800)",                    VIA_PM800,   0x1106, 0x3118, VIA_DEVICE_CRT}, /* borrowed by ECS PM800-M2 */
@@ -158,6 +160,7 @@
     {"Asustek P5V800-MX",                     VIA_VM800,   0x3344, 0x1122, VIA_DEVICE_CRT},
 
     /*** K8M890 ***/
+    {"IBM AnyPlace Kiosk 3xx",                VIA_K8M890,  0x1106, 0x3230, VIA_DEVICE_CRT | VIA_DEVICE_LCD},
     {"Asustek A8V-VM",                        VIA_K8M890,  0x1043, 0x81B5, VIA_DEVICE_CRT},
     {"Asustek M2V-MX SE",                     VIA_K8M890,  0x1043, 0x8297, VIA_DEVICE_CRT},
     {"Foxconn K8M890M2MA-RS2H",               VIA_K8M890,  0x105B, 0x0C84, VIA_DEVICE_CRT},
@@ -190,12 +193,13 @@
     {"ASRock P4VM900-SATA2",                  VIA_P4M900,  0x1849, 0x3371, VIA_DEVICE_CRT},
 
     /*** CX700 ***/
-    {"VIA VT8454B",                           VIA_CX700,   0x0908, 0x1975, VIA_DEVICE_CRT}, /* Evaluation board, reference possibly wrong */
+    {"VIA VT8454B",                           VIA_CX700,   0x0908, 0x1975, VIA_DEVICE_CRT | VIA_DEVICE_LCD}, /* Evaluation board, reference possibly wrong */
     {"VIA VT3324 (CX700)",                    VIA_CX700,   0x1106, 0x3157, VIA_DEVICE_CRT},
     {"MSI Fuzzy CX700/CX700D",                VIA_CX700,   0x1462, 0x8020, VIA_DEVICE_CRT | VIA_DEVICE_LCD | VIA_DEVICE_TV},
     {"Samsung Q1B",                           VIA_CX700,   0x144D, 0xC02C, VIA_DEVICE_CRT | VIA_DEVICE_LCD},
     {"FIC CE260",                             VIA_CX700,   0x1509, 0x2D30, VIA_DEVICE_LCD},
     {"FIC CE261",                             VIA_CX700,   0x1509, 0x2F07, VIA_DEVICE_LCD},
+    {"Gigabyte M704 / RoverPC A700GQ",        VIA_CX700,   0x161F, 0x2060, VIA_DEVICE_CRT | VIA_DEVICE_LCD},
     {"Packard Bell EasyNote XS",              VIA_CX700,   0x1631, 0xC201, VIA_DEVICE_LCD}, /* aka Everex Cloudbook CE1200V */
 
     /*** P4M890, VN890 ***/
@@ -204,11 +208,16 @@
     {"Asustek P5V-VM ULTRA",                  VIA_P4M890,  0x1043, 0x81B5, VIA_DEVICE_CRT},
     {"Asustek P5V-VM DH",                     VIA_P4M890,  0x1043, 0x81CE, VIA_DEVICE_CRT},
     {"Mitac 8615",                            VIA_P4M890,  0x1071, 0x8615, VIA_DEVICE_CRT | VIA_DEVICE_LCD},
+    {"Mitac 8624 (Joybook R41E)",             VIA_P4M890,  0x1071, 0x8624, VIA_DEVICE_CRT | VIA_DEVICE_LCD},
     {"VIA VT3343 (P4M890)",                   VIA_P4M890,  0x1106, 0x3343, VIA_DEVICE_CRT},
     {"MSI P4M890M-L/IL (MS-7255)",            VIA_P4M890,  0x1462, 0x7255, VIA_DEVICE_CRT},
     {"Biostar P4M890-M7 TE",                  VIA_P4M890,  0x1565, 0x1207, VIA_DEVICE_CRT},
     {"ASRock P4VM890",                        VIA_P4M890,  0x1849, 0x3343, VIA_DEVICE_CRT},
 
+    /*** VX800 ***/
+    {"VIA Epia M700",                         VIA_VX800,   0x1106, 0x1122, VIA_DEVICE_CRT},
+    {"Quanta DreamBook Light IL1",            VIA_VX800,   0x152d, 0x0771, VIA_DEVICE_CRT | VIA_DEVICE_LCD},
+
     /* keep this */
     {NULL,                                    VIA_UNKNOWN, 0x0000, 0x0000, VIA_DEVICE_NONE}
 };
Index: src/via_timing.h
===================================================================
--- src/via_timing.h	(.../tags/release_0_2_903)	(revision 0)
+++ src/via_timing.h	(.../trunk)	(revision 711)
@@ -0,0 +1,51 @@
+/*
+ * Copyright 2007-2008 Gabriel Mansi.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ *
+ */
+
+#ifndef _TIMING_H_
+#define _TIMING_H_
+
+#include "xf86.h"
+
+/* Aspect ratio not CVT standard */
+#define TIMING_CVT_WARN_ASPECT_RATIO 1 << 0
+
+/* Error allocating memory */
+#define TIMING_ERR_BAD_ALLOC 1 << 1
+
+/* Refresh rate not CVT standard */
+#define TIMING_CVT_WARN_REFRESH_RATE 1 << 2
+
+/* Refresh rate not valid for reducing blanking */
+#define TIMING_CVT_WARN_REFRESH_RATE_NOT_RB 1 << 3
+
+/**
+ * Geneartes a CVT modeline
+ * mode must not be null, if mode->name is null a new char* will be allocated. 
+ * 
+ */
+int viaTimingCvt(DisplayModePtr mode, int width, int height, float refresh, Bool interlaced, Bool reducedBlanking);
+
+int viaTimingGtf(DisplayModePtr mode, int width, int height, float refresh, Bool interlaced) ;
+
+#endif /*_TIMING_H_*/


Index: openchrome.xinf
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-openchrome/F-10/openchrome.xinf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openchrome.xinf	2 Nov 2007 16:32:18 -0000	1.1
+++ openchrome.xinf	6 Jan 2009 00:07:34 -0000	1.2
@@ -28,3 +28,6 @@
 
 # 1106:3371 - P4M900 (PCI_CHIP_VT3364)
 alias pcivideo:v00001106d00003371sv*sd*bc*sc*i* openchrome
+
+# 1106:1122 - VX800 (PCI_CHIP_VT3353)
+alias pcivideo:v00001106d00001122sv*sd*bc*sc*i* openchrome


Index: xorg-x11-drv-openchrome.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-openchrome/F-10/xorg-x11-drv-openchrome.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- xorg-x11-drv-openchrome.spec	30 Dec 2008 01:40:12 -0000	1.32
+++ xorg-x11-drv-openchrome.spec	6 Jan 2009 00:07:34 -0000	1.33
@@ -9,7 +9,7 @@
 Summary:	Xorg X11 openchrome video driver
 Name:		xorg-x11-drv-openchrome
 Version:	0.2.903
-Release:	2%{?dist}
+Release:	3%{?dist}
 URL:		http://www.openchrome.org
 License:	MIT
 Group:		User Interface/X Hardware Support
@@ -19,12 +19,13 @@
 Source1:	openchrome.xinf
 
 # Patches from upstream trunk :
-Patch1:         openchrome-0.2.903-sync_pciids.patch
-Patch2:         openchrome-0.2.903-fix_bltsize.patch
+#Patch1:         openchrome-0.2.903-sync_pciids.patch
+#Patch2:         openchrome-0.2.903-fix_bltsize.patch
+Patch99:         openchrome-0.2.903-latest_snapshot.patch
 # Fedora specific patches :
-Patch100:       openchrome-0.2.903-re_enable_AGPDMA.patch
+#Patch100:       openchrome-0.2.903-re_enable_AGPDMA.patch
 # Experimental patches (branch backport, etc...): 
-Patch200:       openchrome-0.2.903-panel.patch
+#Patch200:       openchrome-0.2.903-panel.patch
 
 ExclusiveArch:	%{ix86} x86_64
 
@@ -61,16 +62,19 @@
 
 %prep
 %setup -q -n %{tarball}-%{version}
-%patch1 -p0 -b .pciids
-%patch2 -p0 -b .bltsize
-%patch100 -p0 -b .agpdma
-%patch200 -p0 -b .panel
+#%patch1 -p0 -b .pciids
+#%patch2 -p0 -b .bltsize
+%patch99 -p0 -b .latest
+#%patch100 -p0 -b .agpdma
+#%patch200 -p0 -b .panel
+
 
 %build
-autoreconf
+autoreconf -iv
 %configure --disable-static --enable-dri
 make
 
+
 %install
 rm -rf $RPM_BUILD_ROOT
 
@@ -83,14 +87,17 @@
 # should be fixed in upstream Makefile.am or whatever.
 find $RPM_BUILD_ROOT -regex ".*\.la$" | xargs rm -f --
 
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+
 %post
 if [ -e /etc/X11/xorg.conf ]; then
     sed -i "/Driver/s/via/openchrome/" /etc/X11/xorg.conf || :
 fi
 
+
 %files
 %defattr(-,root,root,-)
 %doc COPYING NEWS README
@@ -113,42 +120,49 @@
 
 
 %changelog
-* Mon Dec 29 2008 Xavier Bachelot <xavier AT bachelot DOT org> - 0.2.903-2
+* Mon Jan 05 2009 Xavier Bachelot <xavier at bachelot.org> - 0.2.903-3
+- Sync spec file with Rawhide.
+- Update to latest snapshot (svn 711) : 
+  - ARGB hardware cursor.
+  - VX800 support.
+  - Assorted bug fixes and small enhancements.
+
+* Mon Dec 29 2008 Xavier Bachelot <xavier at bachelot.org> - 0.2.903-2
 - Fix for RHBZ#446489.
 
-* Wed Aug 20 2008 Xavier Bachelot <xavier AT bachelot DOT org> - 0.2.903-1
+* Wed Aug 20 2008 Xavier Bachelot <xavier at bachelot.org> - 0.2.903-1
 - Update to 0.2.903.
 
-* Wed Aug 06 2008 Xavier Bachelot <xavier AT bachelot DOT org> - 0.2.902-10
+* Wed Aug 06 2008 Xavier Bachelot <xavier at bachelot.org> - 0.2.902-10
 - Disable argb cursor for K8M800.
 
-* Sun Aug 03 2008 Xavier Bachelot <xavier AT bachelot DOT org> - 0.2.902-9
+* Sun Aug 03 2008 Xavier Bachelot <xavier at bachelot.org> - 0.2.902-9
 - New version of the panel and hw cursor patch.
 - Rawhide is now using patch --fuzz=0, fixes for induced issues.
 
-* Mon Jun 23 2008 Xavier Bachelot <xavier AT bachelot DOT org> - 0.2.902-8
+* Mon Jun 23 2008 Xavier Bachelot <xavier at bachelot.org> - 0.2.902-8
 - New version of the panel and hw cursor patch.
 
-* Sat May 31 2008 Xavier Bachelot <xavier AT bachelot DOT org> - 0.2.902-7
+* Sat May 31 2008 Xavier Bachelot <xavier at bachelot.org> - 0.2.902-7
 - New panel and hardware cursor code from randr branch.
 
-* Sun May 31 2008 Xavier Bachelot <xavier AT bachelot DOT org> - 0.2.902-6
+* Sun May 31 2008 Xavier Bachelot <xavier at bachelot.org> - 0.2.902-6
 - Disable XvDMA for K8M890 and P4M890 (RHBZ #391621).
 
-* Mon May 26 2008 Xavier Bachelot <xavier AT bachelot DOT org> - 0.2.902-5
+* Mon May 26 2008 Xavier Bachelot <xavier at bachelot.org> - 0.2.902-5
 - Add patch to fix Xv on LCD for CX700.
 
-* Sun May 25 2008 Xavier Bachelot <xavier AT bachelot DOT org> - 0.2.902-4
+* Sun May 25 2008 Xavier Bachelot <xavier at bachelot.org> - 0.2.902-4
 - Unbreak ActiveDevice option.
 
-* Thu Apr 17 2008 Xavier Bachelot <xavier AT bachelot DOT org> - 0.2.902-3
+* Thu Apr 17 2008 Xavier Bachelot <xavier at bachelot.org> - 0.2.902-3
 - Strip leading /trunk/ from patch #2 and #3.
 
-* Sun Apr 13 2008 Xavier Bachelot <xavier AT bachelot DOT org> - 0.2.902-2
+* Sun Apr 13 2008 Xavier Bachelot <xavier at bachelot.org> - 0.2.902-2
 - Add patch to properly report driver version in the libpciaccess code path.
 - Add patch to properly report chipset revision in the libpciaccess code path.
 
-* Wed Apr 09 2008 Xavier Bachelot <xavier AT bachelot DOT org> - 0.2.902-1
+* Wed Apr 09 2008 Xavier Bachelot <xavier at bachelot.org> - 0.2.902-1
 - New upstream release.
 - Re-enable AGPDMA for K8M800 and VM800, as the drm bug is fixed in kernel
   >= 2.6.25rc7 (Patch #1).
@@ -156,56 +170,56 @@
 * Mon Mar 17 2008 Jesse Keating <jkeating at redhat.com> - 0.2.901-16
 - Remove dangerous unversioned obsoletes/provides.
 
-* Sun Mar 16 2008 Xavier Bachelot <xavier AT bachelot DOT org> - 0.2.901-15
+* Sun Mar 16 2008 Xavier Bachelot <xavier at bachelot.org> - 0.2.901-15
 - Update to latest svn snapshot (Rev. 553).
 
-* Sun Mar 09 2008 Xavier Bachelot <xavier AT bachelot DOT org> - 0.2.901-14
+* Sun Mar 09 2008 Xavier Bachelot <xavier at bachelot.org> - 0.2.901-14
 - Revert to last good version of the libpciaccess patch.
 
-* Sun Mar 09 2008 Xavier Bachelot <xavier AT bachelot DOT org> - 0.2.901-13
+* Sun Mar 09 2008 Xavier Bachelot <xavier at bachelot.org> - 0.2.901-13
 - Temporarily revert to old memory detection method. We need something that
   works out of the box for F9 Beta.
 
-* Sat Mar 08 2008 Xavier Bachelot <xavier AT bachelot DOT org> - 0.2.901-12
+* Sat Mar 08 2008 Xavier Bachelot <xavier at bachelot.org> - 0.2.901-12
 - Yet another revision of the libpciaccess patch.
 
-* Fri Mar 07 2008 Xavier Bachelot <xavier AT bachelot DOT org> - 0.2.901-11
+* Fri Mar 07 2008 Xavier Bachelot <xavier at bachelot.org> - 0.2.901-11
 - Fix a typo in libpciaccess patch.
 
 * Fri Mar 07 2008 Adam Jackson <ajax at redhat.com> 0.2.901-10
 - Fix -devel subpackage to obsolete via-devel properly.
 
-* Thu Mar 06 2008 Xavier Bachelot <xavier AT bachelot DOT org> - 0.2.901-9
+* Thu Mar 06 2008 Xavier Bachelot <xavier at bachelot.org> - 0.2.901-9
 - Fix libpciaccess patch.
 
-* Thu Mar 06 2008 Xavier Bachelot <xavier AT bachelot DOT org> - 0.2.901-8
+* Thu Mar 06 2008 Xavier Bachelot <xavier at bachelot.org> - 0.2.901-8
 - Add patch to fix XV on LCD for VM800.
 - Improved libpciaccess patch.
 
 * Wed Feb 20 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.2.901-7
 - Autorebuild for GCC 4.3
 
-* Wed Jan 23 2008 Xavier Bachelot <xavier AT bachelot DOT org> - 0.2.901-6
+* Wed Jan 23 2008 Xavier Bachelot <xavier at bachelot.org> - 0.2.901-6
 - Add patch to properly set fifo on P4M900.
 
-* Fri Jan 19 2008 Xavier Bachelot <xavier AT bachelot DOT org> - 0.2.901-5
+* Fri Jan 19 2008 Xavier Bachelot <xavier at bachelot.org> - 0.2.901-5
 - Add patch to replace xf86memcpy by plain memcpy.
 
-* Thu Jan 10 2008 Xavier Bachelot <xavier AT bachelot DOT org> - 0.2.901-4
+* Thu Jan 10 2008 Xavier Bachelot <xavier at bachelot.org> - 0.2.901-4
 - Another try at fixing the libpciaccess patch.
 
-* Mon Jan 07 2008 Xavier Bachelot <xavier AT bachelot DOT org> - 0.2.901-3
+* Mon Jan 07 2008 Xavier Bachelot <xavier at bachelot.org> - 0.2.901-3
 - And now fix patch filename...
 
-* Mon Jan 07 2008 Xavier Bachelot <xavier AT bachelot DOT org> - 0.2.901-2
+* Mon Jan 07 2008 Xavier Bachelot <xavier at bachelot.org> - 0.2.901-2
 - Fix broken libpciaccess patch.
 
-* Wed Jan 02 2008 Xavier Bachelot <xavier AT bachelot DOT org> - 0.2.901-1
+* Wed Jan 02 2008 Xavier Bachelot <xavier at bachelot.org> - 0.2.901-1
 - Update to 0.2.901.
 - Remove obsoleted patches.
 - Update libpciaccess patch.
 
-* Fri Dec 08 2007 Xavier Bachelot <xavier AT bachelot DOT org> - 0.2.900-9
+* Fri Dec 08 2007 Xavier Bachelot <xavier at bachelot.org> - 0.2.900-9
 - Add patch for preliminary libpciaccess support.
 
 * Wed Nov 28 2007 Adam Jackson <ajax at redhat.com> 0.2.900-8
@@ -213,31 +227,31 @@
 - Munge xorg.conf in %%post to change from via to openchrome.
 - Drive-by spec cleanups.
 
-* Fri Nov 02 2007 Xavier Bachelot <xavier AT bachelot DOT org> - 0.2.900-7
+* Fri Nov 02 2007 Xavier Bachelot <xavier at bachelot.org> - 0.2.900-7
 - Replace broken VT1625 NTSC patch.
 - Add patch to announce as release not as development build.
 - First official Fedora build.
 
-* Thu Oct 18 2007 Xavier Bachelot <xavier AT bachelot DOT org> - 0.2.900-6
+* Thu Oct 18 2007 Xavier Bachelot <xavier at bachelot.org> - 0.2.900-6
 - Update to official 0.2.900
 
-* Wed Oct 10 2007 Xavier Bachelot <xavier AT bachelot DOT org> - 0.2.900-5
+* Wed Oct 10 2007 Xavier Bachelot <xavier at bachelot.org> - 0.2.900-5
 - Update to release_0_3_0 branch rev. 410
 - Add VT1625 patch for 720x576 PAL
 
-* Mon Sep 10 2007 Xavier Bachelot <xavier AT bachelot DOT org> - 0.2.900-4
+* Mon Sep 10 2007 Xavier Bachelot <xavier at bachelot.org> - 0.2.900-4
 - Update to release_0_3_0 branch rev. 384 plus all changes from experimental
   merged back
 - Remove upstream patch #2
 
-* Wed Aug 01 2007 Xavier Bachelot <xavier AT bachelot DOT org> - 0.2.900-3
+* Wed Aug 01 2007 Xavier Bachelot <xavier at bachelot.org> - 0.2.900-3
 - Update to release_0_3_0 branch rev. 380 (fix a bug with XvMC acceleration)
 - Add a patch to allow proper detection of DDR667 (patch #2)
 
-* Mon Jul 16 2007 Xavier Bachelot <xavier AT bachelot DOT org> - 0.2.900-2
+* Mon Jul 16 2007 Xavier Bachelot <xavier at bachelot.org> - 0.2.900-2
 - Update to release_0_3_0 branch rev. 373
 - Add release notes to %%doc
 
-* Thu Jul 05 2007 Xavier Bachelot <xavier AT bachelot DOT org> - 0.2.900-1
+* Thu Jul 05 2007 Xavier Bachelot <xavier at bachelot.org> - 0.2.900-1
 - Initial build (release_0_3_0 branch rev. 365)
 - Add some NTSC modes for the VT1625 (patch #1)



From whot at fedoraproject.org  Tue Jan  6 01:02:41 2009
From: whot at fedoraproject.org (Peter Hutterer)
Date: Tue,  6 Jan 2009 01:02:41 +0000 (UTC)
Subject: rpms/linuxwacom/devel linuxwacom-0.8.0.3-nocrash-removal.patch, NONE,
	1.1 linuxwacom.spec, 1.66, 1.67
Message-ID: <20090106010241.A332870125@cvs1.fedora.phx.redhat.com>

Author: whot

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

Modified Files:
	linuxwacom.spec 
Added Files:
	linuxwacom-0.8.0.3-nocrash-removal.patch 
Log Message:
* Tue Jan 06 2009 Peter Hutterer <peter.hutterer at redhat.com> 0.8.0.3-7
- linuxwacom-0.8.0.3-nocrash-removal.patch: don't free the device's private,
  it causes a SIGABRT on device removal and the server does it anyway.



linuxwacom-0.8.0.3-nocrash-removal.patch:

--- NEW FILE linuxwacom-0.8.0.3-nocrash-removal.patch ---
>From 6d833162dd73d97511f7effa03f335b60749929b Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer at who-t.net>
Date: Tue, 6 Jan 2009 10:41:55 +1000
Subject: [PATCH] xdrv: Don't explicitly free the driver private.

The X server frees the private in the call to xf86DeleteInput, if we free it
first we get a SIGABRT.
---
 src/xdrv/wcmConfig.c |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/src/xdrv/wcmConfig.c b/src/xdrv/wcmConfig.c
index 5dc84b7..1610918 100644
--- a/src/xdrv/wcmConfig.c
+++ b/src/xdrv/wcmConfig.c
@@ -376,7 +376,6 @@ static void xf86WcmUninit(InputDriverPtr drv, LocalDevicePtr local, int flags)
 	if (priv->pPressCurve)
 		xfree(priv->pPressCurve);
     
-	xfree(priv);
 	xf86DeleteInput(local, 0);    
 }
 
-- 
1.6.0.6



Index: linuxwacom.spec
===================================================================
RCS file: /cvs/pkgs/rpms/linuxwacom/devel/linuxwacom.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- linuxwacom.spec	22 Dec 2008 06:37:09 -0000	1.66
+++ linuxwacom.spec	6 Jan 2009 01:02:10 -0000	1.67
@@ -3,7 +3,7 @@
 # Upstream's versioning is goofy.  Note the mapping from tarname to version.
 Name:		linuxwacom
 Version:	0.8.0.3
-Release:	6%{?dist}
+Release:	7%{?dist}
 Summary:	Wacom Drivers from Linux Wacom Project
 
 Group:		User Interface/X Hardware Support
@@ -17,6 +17,7 @@
 Patch4:		linuxwacom-0.7.9.7-fix_build.patch
 Patch5:		linuxwacom-dont_call_devproc_again_in_uninit.patch
 Patch6:		linuxwacom-0.8.0.3-build-fixes.patch
+Patch7:		linuxwacom-0.8.0.3-nocrash-removal.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}
 BuildRequires:	libX11-devel libXi-devel ncurses-devel
@@ -48,6 +49,7 @@
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1 -b .buildfixes
+%patch7 -p1 -b .nocrash-removal
 
 %build
 
@@ -109,6 +111,10 @@
 %{_libdir}/libwacomcfg*.so
 
 %changelog
+* Tue Jan 06 2009 Peter Hutterer <peter.hutterer at redhat.com> 0.8.0.3-7
+- linuxwacom-0.8.0.3-nocrash-removal.patch: don't free the device's private,
+  it causes a SIGABRT on device removal and the server does it anyway.
+
 * Mon Dec 22 2008 Peter Hutterer <peter.hutterer at redhat.com> 0.8.0.3-6
 - Rebuild for server 1.6
   add build-fixes.patch: protect against XINPUT ABI 3, and other build



From pkgdb at fedoraproject.org  Tue Jan  6 01:05:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 06 Jan 2009 01:05:01 +0000
Subject: [pkgdb] papyrus had acl change status
Message-ID: <20090106010501.DA1CE20873E@bastion.fedora.phx.redhat.com>

rvinyard has set the watchbugzilla acl on papyrus (Fedora devel) to Approved for timn

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



From pkgdb at fedoraproject.org  Tue Jan  6 01:05:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 06 Jan 2009 01:05:05 +0000
Subject: [pkgdb] papyrus had acl change status
Message-ID: <20090106010505.65A8E208D2B@bastion.fedora.phx.redhat.com>

rvinyard has set the watchcommits acl on papyrus (Fedora devel) to Approved for timn

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



From pkgdb at fedoraproject.org  Tue Jan  6 01:05:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 06 Jan 2009 01:05:22 +0000
Subject: [pkgdb] papyrus had acl change status
Message-ID: <20090106010522.A3EEC208D52@bastion.fedora.phx.redhat.com>

rvinyard has set the watchbugzilla acl on papyrus (Fedora 8) to Approved for timn

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



From pkgdb at fedoraproject.org  Tue Jan  6 01:05:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 06 Jan 2009 01:05:08 +0000
Subject: [pkgdb] papyrus had acl change status
Message-ID: <20090106010508.C4792208D51@bastion.fedora.phx.redhat.com>

rvinyard has set the commit acl on papyrus (Fedora devel) to Approved for timn

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



From pkgdb at fedoraproject.org  Tue Jan  6 01:05:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 06 Jan 2009 01:05:24 +0000
Subject: [pkgdb] papyrus had acl change status
Message-ID: <20090106010524.A9121208D57@bastion.fedora.phx.redhat.com>

rvinyard has set the watchcommits acl on papyrus (Fedora 8) to Approved for timn

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



From pkgdb at fedoraproject.org  Tue Jan  6 01:05:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 06 Jan 2009 01:05:27 +0000
Subject: [pkgdb] papyrus had acl change status
Message-ID: <20090106010527.40D06208CAB@bastion.fedora.phx.redhat.com>

rvinyard has set the commit acl on papyrus (Fedora 8) to Approved for timn

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



From pkgdb at fedoraproject.org  Tue Jan  6 01:05:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 06 Jan 2009 01:05:29 +0000
Subject: [pkgdb] papyrus had acl change status
Message-ID: <20090106010529.87B9D208D58@bastion.fedora.phx.redhat.com>

rvinyard has set the watchbugzilla acl on papyrus (Fedora 9) to Approved for timn

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



From pkgdb at fedoraproject.org  Tue Jan  6 01:05:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 06 Jan 2009 01:05:31 +0000
Subject: [pkgdb] papyrus had acl change status
Message-ID: <20090106010531.5D9C1208D5C@bastion.fedora.phx.redhat.com>

rvinyard has set the watchcommits acl on papyrus (Fedora 9) to Approved for timn

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



From pkgdb at fedoraproject.org  Tue Jan  6 01:05:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 06 Jan 2009 01:05:33 +0000
Subject: [pkgdb] papyrus had acl change status
Message-ID: <20090106010533.4E2AD208D6A@bastion.fedora.phx.redhat.com>

rvinyard has set the commit acl on papyrus (Fedora 9) to Approved for timn

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



From pkgdb at fedoraproject.org  Tue Jan  6 01:05:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 06 Jan 2009 01:05:35 +0000
Subject: [pkgdb] papyrus had acl change status
Message-ID: <20090106010535.A3507208D9B@bastion.fedora.phx.redhat.com>

rvinyard has set the watchbugzilla acl on papyrus (Fedora 10) to Approved for timn

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



From pkgdb at fedoraproject.org  Tue Jan  6 01:05:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 06 Jan 2009 01:05:37 +0000
Subject: [pkgdb] papyrus had acl change status
Message-ID: <20090106010537.A7BB0208DA7@bastion.fedora.phx.redhat.com>

rvinyard has set the watchcommits acl on papyrus (Fedora 10) to Approved for timn

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



From pkgdb at fedoraproject.org  Tue Jan  6 01:05:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 06 Jan 2009 01:05:39 +0000
Subject: [pkgdb] papyrus had acl change status
Message-ID: <20090106010539.26C6C208D51@bastion.fedora.phx.redhat.com>

rvinyard has set the commit acl on papyrus (Fedora 10) to Approved for timn

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



From cchance at fedoraproject.org  Tue Jan  6 01:22:00 2009
From: cchance at fedoraproject.org (Caius Chance)
Date: Tue,  6 Jan 2009 01:22:00 +0000 (UTC)
Subject: rpms/cjkunifonts/devel cjkunifonts.spec,1.22,1.23
Message-ID: <20090106012200.643A770125@cvs1.fedora.phx.redhat.com>

Author: cchance

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

Modified Files:
	cjkunifonts.spec 
Log Message:
* Tue Jan 06 2009 Caius Chance <cchance at redhat.com> - 0.2.20080216.1-11.fc11
- Resolves: rhbz#477373 (Converted to new font packaging guidelines.)

modified .spec file according to guidelines



Index: cjkunifonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cjkunifonts/devel/cjkunifonts.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- cjkunifonts.spec	7 Dec 2008 09:13:01 -0000	1.22
+++ cjkunifonts.spec	6 Jan 2009 01:21:29 -0000	1.23
@@ -1,3 +1,12 @@
+%define fontname cjkunifonts
+%define fontconf <65>-%{fontname}
+%define archivename %{name}-%{version}
+%define common_desc \
+Chinese Unicode TrueType fonts derived from the original fonts generously made
+available by Arphic Technology under the "Arphic Public License" and extended
+by the CJK Unifonts project.
+
+
 %define umingfontdir    %{_datadir}/fonts/%{name}-uming
 %define ukaifontdir     %{_datadir}/fonts/%{name}-ukai
 %define fcdir           %{_sysconfdir}/fonts/conf.d
@@ -7,10 +16,9 @@
 %define umingbuilddir   ../%{name}-uming-%{version}
 %define ukaibuilddir    ../%{name}-ukai-%{version}
 
-Name:        cjkunifonts
+Name:        %{fontname}
 Version:     0.2.20080216.1
-Release:     10.fc11
-#Release:     9.1%{?dist}
+Release:     11%{?dist}
 Summary:     Chinese TrueType Fonts -- Simplified and Traditional Chinese Ming and Kai Face
 License:     Arphic
 Group:       User Interface/X
@@ -26,24 +34,25 @@
 Source8:    CIDFnmap.zh_CN
 Patch1:     cjkunifonts-0.2.20080216.1-2.patch
 
-BuildRequires:    xorg-x11-font-utils, ttmkfdir
+BuildRoot:        %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildArch:        noarch
-BuildRoot:        %{_tmppath}/%{name}-%{version}-root
+BuildRequires:    fontpackages-devel, xorg-x11-font-utils, ttmkfdir
 
 %description
-Chinese Unicode TrueType fonts derived from the original fonts generously made
-available by Arphic Technology under the "Arphic Public License" and extended
-by the CJK Unifonts project.
+%common_desc
 
 %package uming
 Summary:      Chinese Uming style face TrueType Font
 License:      Arphic
 Group:        User Interface/X
+Requires:     fontpackages-filesystem
 Conflicts:    fonts-chinese <= 3.03-9.fc8
 Obsoletes:    fonts-chinese < 3.03-13
 Obsoletes:    ttfonts-zh_CN <= 2.14-10, ttfonts-zh_TW <= 2.11-28
 
 %description uming
+%common_desc
+
 Chinese Uming style face TrueType Font derived from the original fonts released
 by Arphic Technology and extended by the CJK Unifonts project.
 
@@ -51,11 +60,14 @@
 Summary:      Chinese Ukai style face TrueType font
 License:      Arphic
 Group:        User Interface/X
+Requires:     fontpackages-filesystem
 Conflicts:    fonts-chinese <= 3.03-9.fc8
 Obsoletes:    fonts-chinese < 3.03-13
 Obsoletes:    ttfonts-zh_CN <= 2.14-10, ttfonts-zh_TW <= 2.11-28
 
 %description ukai
+%common_desc
+
 Chinese Ukai style face TrueType Font derived from the original fonts released
 by Arphic Technology and extended by the CJK Unifonts project.
 
@@ -68,55 +80,59 @@
 %{nil}
 
 %install
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 # dirs
-install -d $RPM_BUILD_ROOT%{catalogue}
-install -d $RPM_BUILD_ROOT%{umingfontdir}
-install -d $RPM_BUILD_ROOT%{ukaifontdir}
+install -d %{buildroot}%{catalogue}
+install -d %{buildroot}%{umingfontdir}
+install -d %{buildroot}%{ukaifontdir}
 
 # ttfs
-install -m 0644 %{umingbuilddir}/uming.ttc $RPM_BUILD_ROOT%{umingfontdir}/
-install -m 0644 %{ukaibuilddir}/ukai.ttc $RPM_BUILD_ROOT%{ukaifontdir}/
+install -m 0644 %{umingbuilddir}/uming.ttc %{buildroot}%{umingfontdir}/
+install -m 0644 %{ukaibuilddir}/ukai.ttc %{buildroot}%{ukaifontdir}/
 
 # fonts.{scale,dir}
-%{_bindir}/ttmkfdir -d $RPM_BUILD_ROOT%{umingfontdir} -o $RPM_BUILD_ROOT%{umingfontdir}/fonts.scale
-mkfontdir $RPM_BUILD_ROOT%{umingfontdir}
-%{_bindir}/ttmkfdir -d $RPM_BUILD_ROOT%{ukaifontdir} -o $RPM_BUILD_ROOT%{ukaifontdir}/fonts.scale
-mkfontdir $RPM_BUILD_ROOT%{ukaifontdir}
+%{_bindir}/ttmkfdir -d %{buildroot}%{umingfontdir} -o %{buildroot}%{umingfontdir}/fonts.scale
+mkfontdir %{buildroot}%{umingfontdir}
+%{_bindir}/ttmkfdir -d %{buildroot}%{ukaifontdir} -o %{buildroot}%{ukaifontdir}/fonts.scale
+mkfontdir %{buildroot}%{ukaifontdir}
 
 # fontconfig config files
-install -d $RPM_BUILD_ROOT%{fcdir}
-for conf in `ls %{umingbuilddir}/*-ttf-arphic-uming*.conf`
+install -d %{buildroot}%{fcdir}
+for fconf in `ls %{umingbuilddir}/*-ttf-arphic-uming*.conf`
 do
-    install -m 0644 $conf $RPM_BUILD_ROOT%{fcdir}/
+    install -m 0644 $fconf %{buildroot}%{fcdir}/
+    ln -s %{_fontconfig_templatedir}/$fconf \
+        %{buildroot}%{_fontconfig_confdir}/$fconf
 done
-for conf in `ls %{ukaibuilddir}/*-ttf-arphic-ukai*.conf`
+for fconf in `ls %{ukaibuilddir}/*-ttf-arphic-ukai*.conf`
 do
-    install -m 0644 $conf $RPM_BUILD_ROOT%{fcdir}/
+    install -m 0644 $fconf %{buildroot}%{fcdir}/
+    ln -s %{_fontconfig_templatedir}/$fconf \
+        %{buildroot}%{_fontconfig_confdir}/$fconf
 done
 
 # backward compat
-install -d $RPM_BUILD_ROOT%{_datadir}/fonts/zh_CN/TrueType
-install -d $RPM_BUILD_ROOT%{_datadir}/fonts/zh_TW/TrueType
-%{__ln_s} ../../%{name}-uming/uming.ttc $RPM_BUILD_ROOT%{_datadir}/fonts/zh_CN/TrueType/zysong.ttf
-%{__ln_s} ../../%{name}-uming/uming.ttc $RPM_BUILD_ROOT%{_datadir}/fonts/zh_TW/TrueType/bsmi00lp.ttf
+install -d %{buildroot}%{_datadir}/fonts/zh_CN/TrueType
+install -d %{buildroot}%{_datadir}/fonts/zh_TW/TrueType
+%{__ln_s} ../../%{name}-uming/uming.ttc %{buildroot}%{_datadir}/fonts/zh_CN/TrueType/zysong.ttf
+%{__ln_s} ../../%{name}-uming/uming.ttc %{buildroot}%{_datadir}/fonts/zh_TW/TrueType/bsmi00lp.ttf
 
 # catalogue
-%{__ln_s} %{umingfontdir} $RPM_BUILD_ROOT%{catalogue}/%{name}-uming
-%{__ln_s} %{ukaifontdir} $RPM_BUILD_ROOT%{catalogue}/%{name}-ukai
+%{__ln_s} %{umingfontdir} %{buildroot}%{catalogue}/%{name}-uming
+%{__ln_s} %{ukaifontdir} %{buildroot}%{catalogue}/%{name}-ukai
 
 # ghostscript
-install -d $RPM_BUILD_ROOT%{cidmapdir}
-install -m 0644 %{SOURCE3} $RPM_BUILD_ROOT%{cidmapdir}/
-install -m 0644 %{SOURCE4} $RPM_BUILD_ROOT%{cidmapdir}/
-install -m 0644 %{SOURCE5} $RPM_BUILD_ROOT%{cidmapdir}/
-install -m 0644 %{SOURCE6} $RPM_BUILD_ROOT%{cidmapdir}/
-install -m 0644 %{SOURCE7} $RPM_BUILD_ROOT%{cidmapdir}/
-install -m 0644 %{SOURCE8} $RPM_BUILD_ROOT%{cidmapdir}/
+install -d %{buildroot}%{cidmapdir}
+install -m 0644 %{SOURCE3} %{buildroot}%{cidmapdir}/
+install -m 0644 %{SOURCE4} %{buildroot}%{cidmapdir}/
+install -m 0644 %{SOURCE5} %{buildroot}%{cidmapdir}/
+install -m 0644 %{SOURCE6} %{buildroot}%{cidmapdir}/
+install -m 0644 %{SOURCE7} %{buildroot}%{cidmapdir}/
+install -m 0644 %{SOURCE8} %{buildroot}%{cidmapdir}/
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -fr ${buildroot}
 
 %post uming
 if [ -x %{_bindir}/fc-cache ]; then
@@ -143,7 +159,7 @@
 fi
 
 %files uming
-%defattr(-,root,root,-)
+%defattr(0644,root,root,0755)
 %doc %{umingbuilddir}/license
 %doc %{umingbuilddir}/CONTRIBUTERS
 %doc %{umingbuilddir}/Font_Comparison_ShanHeiSun_UMing.odt
@@ -174,7 +190,7 @@
 %{catalogue}/%{name}-uming
 
 %files ukai
-%defattr(-,root,root,-)
+%defattr(0644,root,root,0755)
 %doc %{ukaibuilddir}/license
 %doc %{ukaibuilddir}/CONTRIBUTERS
 %doc %{ukaibuilddir}/Font_Comparison_ZenKai_UKai.odt
@@ -199,6 +215,9 @@
 %{catalogue}/%{name}-ukai
 
 %changelog
+* Tue Jan 06 2009 Caius Chance <cchance at redhat.com> - 0.2.20080216.1-11.fc11
+- Resolves: rhbz#477373 (Converted to new font packaging guidelines.)
+
 * Sun Dec  7 2008 Behdad Esfahbod <besfahbo at redhat.com> - 0.2.20080216.1-10.fc11
 - Don't umask before fc-cache.
 - Add -f to fc-cache.



From pgordon at fedoraproject.org  Tue Jan  6 01:25:59 2009
From: pgordon at fedoraproject.org (Peter Gordon)
Date: Tue,  6 Jan 2009 01:25:59 +0000 (UTC)
Subject: rpms/rb_libtorrent/devel
	rb_libtorrent-configure-dont-use-locate.patch, NONE,
	1.1 rb_libtorrent-python26.patch, NONE, 1.1 .cvsignore, 1.5,
	1.6 rb_libtorrent.spec, 1.18, 1.19 sources, 1.5,
	1.6 rb_libtorrent-python-setup.py, 1.1, NONE
Message-ID: <20090106012559.5A84970125@cvs1.fedora.phx.redhat.com>

Author: pgordon

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

Modified Files:
	.cvsignore rb_libtorrent.spec sources 
Added Files:
	rb_libtorrent-configure-dont-use-locate.patch 
	rb_libtorrent-python26.patch 
Removed Files:
	rb_libtorrent-python-setup.py 
Log Message:
* Mon Jan 05 2009 Peter Gordon <peter at thecodergeek.com> - 0.14.1-1
- Update to new upstream release (0.14.1)
- Add asio-devel as runtime dependency for the devel subpackage (#478589)
- Add patch to build with Python 2.6:
  + python26.patch
- Add patch to make the configure script use the proper python include
  directory instead of calling locate, as that can cause failures in a chroot
  with no db file (and is a bit silly in the first place):
  + configure-dont-use-locate.patch
- Drop manual setup.py for building the python module (fixed upstream):
  - setup.py
- Update Source0 URL back to SourceForge's hosting.
- Reenable the examples, since the Makefiles are fixed.


rb_libtorrent-configure-dont-use-locate.patch:

--- NEW FILE rb_libtorrent-configure-dont-use-locate.patch ---
When building in a chroot (such as Fedora's Mock tool), using locate to find
where the Python include directory is causes build failures, since the db file
used by (m)locate does not yet exist.

However, instead of manually calling updatedb, there is no need to even use
locate at all since we already know that the properly-versioned include
directory is under the toplevel $includedir (defined earlier by autotools), and
is simply the same as the versioned Python binary ($ax_python_bin), so we can
simply substitute the locate call with a direct path that functions identically.

diff -up ./m4/ax_python.m4.old ./m4/ax_python.m4
--- ./m4/ax_python.m4.old	2009-01-05 15:24:44.000000000 -0800
+++ ./m4/ax_python.m4	2009-01-05 15:25:31.000000000 -0800
@@ -64,7 +64,7 @@ ax_python_bin=$PYTHON_BIN
 if test x$ax_python_bin != x; then
    AC_CHECK_LIB($ax_python_bin, main, ax_python_lib=$ax_python_bin, ax_python_lib=no)
    AC_CHECK_HEADER([$ax_python_bin/Python.h],
-   [[ax_python_header=`locate $ax_python_bin/Python.h | sed -e s,/Python.h,,`]],
+   [[ax_python_header=$includedir/$ax_python_bin]],
    ax_python_header=no)
    if test $ax_python_lib != no; then
      if test $ax_python_header != no; then

rb_libtorrent-python26.patch:

--- NEW FILE rb_libtorrent-python26.patch ---
With Python 2.6 (in Fedora rawhide), the current trunk (and 0.14.1) fail to
build the python bindings . I looked into it a bit more deeply and it seems that
AM_PATH_PYTHON is called in configure.in:329 (to check for the python stuff),
and that in turn uses the binary name as the top-level include directory to
search for when attempting to locate the Python headers. However, the m4 file
that defines the macro doesn't find the python2.6 executable because it doesn't
have that python2.6 name in its list (m4/ax_python.m4:61), and so when it finds
the unversioned "python" binary, it uses that as the directory name and thus
fails to properly find the Python headers (which *are* in a versioned directory,
e.g. "$includedir/python2.6/Python.h" - and not "$includedir/python/Python.h"
as it then tries to use).

The attached patch simply adds python2.6 to to the list, which after recreating
the build files with the already-included autotool.sh script, makes the
configure script properly find the python headers and thus makes the build
successful.

diff -up ./m4/ax_python.m4.old ./m4/ax_python.m4
--- ./m4/ax_python.m4.old	2009-01-05 14:50:47.000000000 -0800
+++ ./m4/ax_python.m4	2009-01-05 14:51:02.000000000 -0800
@@ -58,7 +58,7 @@
 AC_DEFUN([AX_PYTHON],
 [AC_MSG_CHECKING(for python build information)
 AC_MSG_RESULT([])
-for python in python2.5 python2.4 python2.3 python2.2 python2.1 python; do
+for python in python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python; do
 AC_CHECK_PROGS(PYTHON_BIN, [$python])
 ax_python_bin=$PYTHON_BIN
 if test x$ax_python_bin != x; then


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rb_libtorrent/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	15 Jul 2008 02:56:14 -0000	1.5
+++ .cvsignore	6 Jan 2009 01:25:28 -0000	1.6
@@ -1 +1 @@
-libtorrent-rasterbar-0.13.1.tar.gz
+libtorrent-rasterbar-0.14.1.tar.gz


Index: rb_libtorrent.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rb_libtorrent/devel/rb_libtorrent.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- rb_libtorrent.spec	19 Dec 2008 12:28:09 -0000	1.18
+++ rb_libtorrent.spec	6 Jan 2009 01:25:28 -0000	1.19
@@ -2,24 +2,29 @@
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:		rb_libtorrent
-Version:	0.13.1
-Release:	7%{?dist}
+Version:	0.14.1
+Release:	1%{?dist}
 Summary:	A C++ BitTorrent library aiming to be the best alternative
 
 Group:		System Environment/Libraries
 License:	BSD
 URL:		http://www.rasterbar.com/products/libtorrent/
 
-## TODO: Source0 Should use SourceForge's file-mirroring URL upon update to
-## version 0.14+.
-Source0:	http://mirror.thecodergeek.com/src/libtorrent-rasterbar-0.13.1.tar.gz
+Source0:	http://downloads.sourceforge.net/libtorrent/libtorrent-rasterbar-%{version}.tar.gz
 Source1:	%{name}-README-renames.Fedora
 Source2:	%{name}-COPYING.Boost
 Source3:	%{name}-COPYING.zlib
-## Sent upstream via the libtorrent-discuss ML.
-## Message-Id: <1216701448.24546.11.camel at tuxhugs>
-Source4: 	%{name}-python-setup.py
-Patch1:         rb_libtorrent-0.13.1-boost.patch
+
+## Patch the included m4 Python detection to properly find the binary and
+## include directory for Python 2.6 support.
+## Upstream bug: http://code.rasterbar.com/libtorrent/ticket/466
+Patch0: 	%{name}-python26.patch
+
+## Using locate when we already know where the file is, is a bit silly and
+## fails miserably with chroot-based building, since the db file does not
+## yet exist.
+## Upstream bug: http://code.rasterbar.com/libtorrent/ticket/467
+Patch1: 	%{name}-configure-dont-use-locate.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -51,6 +56,7 @@
 ## Same include directory. :(
 Conflicts:	libtorrent-devel
 ## Needed for various headers used via #include directives...
+Requires:	asio-devel
 Requires:	boost-devel
 Requires:	openssl-devel
 
@@ -65,17 +71,17 @@
 a given source or header file is released under.
 
 
-#package	examples
-#Summary:	Example clients using %{name}
-#Group:		Applications/Internet
-#License:	BSD
-#Requires:	%{name} = %{version}-%{release}
-
-#description	examples
-#The %{name}-examples package contains example clients which intend to
-#show how to make use of its various features. (Due to potential
-#namespace conflicts, a couple of the examples had to be renamed. See the
-#included documentation for more details.)
+%package	examples
+Summary:	Example clients using %{name}
+Group:		Applications/Internet
+License:	BSD
+Requires:	%{name} = %{version}-%{release}
+
+%description	examples
+The %{name}-examples package contains example clients which intend to
+show how to make use of its various features. (Due to potential
+namespace conflicts, a couple of the examples had to be renamed. See the
+included documentation for more details.)
 
 
 %package	python
@@ -91,7 +97,10 @@
 
 %prep
 %setup -q -n "libtorrent-rasterbar-%{version}"
-%patch1 -p3
+%patch0 -b .python26
+%patch1 -b .dont-use-locate
+## We need to recreate the build scripts now that the M4 sources are patched.
+./autotool.sh 
 ## The RST files are the sources used to create the final HTML files; and are
 ## not needed.
 rm -f docs/*.rst
@@ -102,8 +111,6 @@
 ## Finally, ensure that everything is UTF-8, as it should be.
 iconv -t UTF-8 -f ISO_8859-15 AUTHORS -o AUTHORS.iconv
 mv AUTHORS.iconv AUTHORS
-## Install the necessary build script for the python bindings module...
-install -p -m 0755 %{SOURCE4} bindings/python/setup.py
 
 
 %build
@@ -111,21 +118,22 @@
 ## the local include directory overrides that of the system. We don't like
 ## local copies of system code. :)
 rm -rf include/libtorrent/asio*
-## FIXME: The examples currently fail to build (missing Makefile.in)
-%configure --disable-static --with-zlib=system		\
+%configure --disable-static				\
+	--enable-examples				\
+	--enable-python-binding				\
+	--with-asio=system				\
 	--with-boost-date-time=mt 			\
-	--with-boost-thread=mt				\
-	--with-boost-regex=mt				\
-	--with-boost-program_options=mt			\
 	--with-boost-filesystem=mt			\
+	--with-boost-program_options=mt			\
+	--with-boost-python=mt				\
+	--with-boost-regex=mt				\
 	--with-boost-system=mt				\
-	--with-asio=system
+	--with-boost-thread=mt				\
+	--with-zlib=system
 ## Use the system libtool to ensure that we don't get unnecessary RPATH
 ## hacks in our final build.
 make %{?_smp_mflags} LIBTOOL=%{_bindir}/libtool
-## Finally, build the python module.
 pushd bindings/python
-	CFLAGS="%{optflags}" %{__python} setup.py build
 	## Fix the interpreter for the example clients
 	sed -i -e 's:^#!/bin/python$:#!/usr/bin/python:' {simple_,}client.py 
 popd
@@ -141,8 +149,8 @@
 export CPPROG="%{__cp} -p"
 make install DESTDIR=%{buildroot} INSTALL="%{__install} -c -p"
 ## Do the renaming due to the somewhat limited %%_bindir namespace. 
-#rename client torrent_client %{buildroot}%{_bindir}/*
-#install -p -m 0644 %{SOURCE1} ./README-renames.Fedora
+rename client torrent_client %{buildroot}%{_bindir}/*
+install -p -m 0644 %{SOURCE1} ./README-renames.Fedora
 ## Install the python binding module.
 pushd bindings/python
 	%{__python} setup.py install -O1 --skip-build --root %{buildroot}
@@ -176,19 +184,33 @@
 %{_includedir}/libtorrent/
 %{_libdir}/libtorrent-rasterbar.so
 
-## Build failures...
-#files examples
-#doc COPYING README-renames.Fedora
-#{_bindir}/*torrent*
+%files examples
+%doc COPYING README-renames.Fedora
+%{_bindir}/*torrent*
+%{_bindir}/enum_if
 
 %files	python
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING.Boost bindings/python/{simple_,}client.py
-%{python_sitearch}/libtorrent-%{version}-py?.?.egg-info
+%{python_sitearch}/python_libtorrent-%{version}-py?.?.egg-info
 %{python_sitearch}/libtorrent.so
 
 
 %changelog
+* Mon Jan 05 2009 Peter Gordon <peter at thecodergeek.com> - 0.14.1-1
+- Update to new upstream release (0.14.1)
+- Add asio-devel as runtime dependency for the devel subpackage (#478589)
+- Add patch to build with Python 2.6:
+  + python26.patch
+- Add patch to make the configure script use the proper python include
+  directory instead of calling locate, as that can cause failures in a chroot
+  with no db file (and is a bit silly in the first place):
+  + configure-dont-use-locate.patch
+- Drop manual setup.py for building the python module (fixed upstream):
+  - setup.py
+- Update Source0 URL back to SourceForge's hosting.
+- Reenable the examples, since the Makefiles are fixed.
+
 * Fri Dec 19 2008 Petr Machata <pmachata at redhat.com> - 0.13.1-7
 - Rebuild for boost-1.37.0.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rb_libtorrent/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	15 Jul 2008 02:56:14 -0000	1.5
+++ sources	6 Jan 2009 01:25:29 -0000	1.6
@@ -1 +1 @@
-9d6b112fedc5861402647ff72e95dba0  libtorrent-rasterbar-0.13.1.tar.gz
+6aa0ed4da604b8b160bf12bcd41d5055  libtorrent-rasterbar-0.14.1.tar.gz


--- rb_libtorrent-python-setup.py DELETED ---



From cchance at fedoraproject.org  Tue Jan  6 01:30:12 2009
From: cchance at fedoraproject.org (Caius Chance)
Date: Tue,  6 Jan 2009 01:30:12 +0000 (UTC)
Subject: rpms/cjkunifonts/devel cjkunifonts.spec,1.23,1.24
Message-ID: <20090106013012.582FE70125@cvs1.fedora.phx.redhat.com>

Author: cchance

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

Modified Files:
	cjkunifonts.spec 
Log Message:
revised from %{fcdir} to %{_fontconfig_templatedir}



Index: cjkunifonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cjkunifonts/devel/cjkunifonts.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- cjkunifonts.spec	6 Jan 2009 01:21:29 -0000	1.23
+++ cjkunifonts.spec	6 Jan 2009 01:29:42 -0000	1.24
@@ -9,7 +9,6 @@
 
 %define umingfontdir    %{_datadir}/fonts/%{name}-uming
 %define ukaifontdir     %{_datadir}/fonts/%{name}-ukai
-%define fcdir           %{_sysconfdir}/fonts/conf.d
 %define cidmapdir       %{_datadir}/ghostscript/conf.d
 %define catalogue       %{_sysconfdir}/X11/fontpath.d
 
@@ -83,9 +82,9 @@
 rm -rf %{buildroot}
 
 # dirs
-install -d %{buildroot}%{catalogue}
-install -d %{buildroot}%{umingfontdir}
-install -d %{buildroot}%{ukaifontdir}
+install -m 0755 -d %{buildroot}%{catalogue}
+install -m 0755 -d %{buildroot}%{umingfontdir}
+install -m 0755 -d %{buildroot}%{ukaifontdir}
 
 # ttfs
 install -m 0644 %{umingbuilddir}/uming.ttc %{buildroot}%{umingfontdir}/
@@ -98,16 +97,17 @@
 mkfontdir %{buildroot}%{ukaifontdir}
 
 # fontconfig config files
-install -d %{buildroot}%{fcdir}
+install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} \
+    %{buildroot}%{_fontconfig_confdir}
 for fconf in `ls %{umingbuilddir}/*-ttf-arphic-uming*.conf`
 do
-    install -m 0644 $fconf %{buildroot}%{fcdir}/
+    install -m 0644 $fconf %{buildroot}%{_fontconfig_templatedir}/
     ln -s %{_fontconfig_templatedir}/$fconf \
         %{buildroot}%{_fontconfig_confdir}/$fconf
 done
 for fconf in `ls %{ukaibuilddir}/*-ttf-arphic-ukai*.conf`
 do
-    install -m 0644 $fconf %{buildroot}%{fcdir}/
+    install -m 0644 $fconf %{buildroot}%{_fontconfig_templatedir}/
     ln -s %{_fontconfig_templatedir}/$fconf \
         %{buildroot}%{_fontconfig_confdir}/$fconf
 done
@@ -176,7 +176,7 @@
 %dir %{_datadir}/fonts/zh_CN/TrueType
 %dir %{_datadir}/fonts/zh_TW/TrueType
 %{umingfontdir}/*.ttc
-%{fcdir}/*-ttf-arphic-uming*.conf
+%{_fontconfig_templatedir}/*-ttf-arphic-uming*.conf
 %{cidmapdir}/FAPIcidfmap.zh_TW
 %{cidmapdir}/FAPIcidfmap.zh_CN
 %{cidmapdir}/cidfmap.zh_TW
@@ -203,7 +203,7 @@
 %doc %{ukaibuilddir}/TODO
 %dir %{ukaifontdir}
 %{ukaifontdir}/*.ttc
-%{fcdir}/*-ttf-arphic-ukai*.conf
+%{_fontconfig_templatedir}/*-ttf-arphic-ukai*.conf
 %{cidmapdir}/FAPIcidfmap.zh_TW
 %{cidmapdir}/FAPIcidfmap.zh_CN
 %{cidmapdir}/cidfmap.zh_TW



From mbarnes at fedoraproject.org  Tue Jan  6 01:33:12 2009
From: mbarnes at fedoraproject.org (Matthew Barnes)
Date: Tue,  6 Jan 2009 01:33:12 +0000 (UTC)
Subject: rpms/libgweather/devel .cvsignore, 1.17, 1.18 libgweather.spec, 1.32,
	1.33 sources, 1.17, 1.18
Message-ID: <20090106013312.8073D70125@cvs1.fedora.phx.redhat.com>

Author: mbarnes

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

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

* Mon Jan 05 2009 Matthew Barnes <mbarnes at redhat.com> 2.25.4-1
- Update to 2.25.4



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libgweather/devel/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- .cvsignore	17 Dec 2008 02:59:51 -0000	1.17
+++ .cvsignore	6 Jan 2009 01:32:42 -0000	1.18
@@ -1 +1 @@
-libgweather-2.25.3.tar.bz2
+libgweather-2.25.4.tar.bz2


Index: libgweather.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libgweather/devel/libgweather.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- libgweather.spec	17 Dec 2008 03:45:13 -0000	1.32
+++ libgweather.spec	6 Jan 2009 01:32:42 -0000	1.33
@@ -1,6 +1,6 @@
 Name:           libgweather
-Version:        2.25.3
-Release:        2%{?dist}
+Version:        2.25.4
+Release:        1%{?dist}
 Summary:        A library for weather information 
 
 Group:          System Environment/Libraries
@@ -123,6 +123,9 @@
 
 
 %changelog
+* Mon Jan 05 2009 Matthew Barnes <mbarnes at redhat.com> 2.25.4-1
+- Update to 2.25.4
+
 * Tue Dec 16 2008 Matthias Clasen <mclasen at redhat.com> 2.25.3-2
 - Update to 2.25.3
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libgweather/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources	17 Dec 2008 02:59:52 -0000	1.17
+++ sources	6 Jan 2009 01:32:42 -0000	1.18
@@ -1 +1 @@
-4a3948030ac9600b4466be64227a4239  libgweather-2.25.3.tar.bz2
+21caa3ec85fe270bf95a59303390244a  libgweather-2.25.4.tar.bz2



From cchance at fedoraproject.org  Tue Jan  6 01:35:16 2009
From: cchance at fedoraproject.org (Caius Chance)
Date: Tue,  6 Jan 2009 01:35:16 +0000 (UTC)
Subject: rpms/cjkunifonts/devel cjkunifonts.spec,1.24,1.25
Message-ID: <20090106013516.4C7D670125@cvs1.fedora.phx.redhat.com>

Author: cchance

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

Modified Files:
	cjkunifonts.spec 
Log Message:
fixed %comm_desc line break



Index: cjkunifonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cjkunifonts/devel/cjkunifonts.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- cjkunifonts.spec	6 Jan 2009 01:29:42 -0000	1.24
+++ cjkunifonts.spec	6 Jan 2009 01:34:45 -0000	1.25
@@ -2,11 +2,9 @@
 %define fontconf <65>-%{fontname}
 %define archivename %{name}-%{version}
 %define common_desc \
-Chinese Unicode TrueType fonts derived from the original fonts generously made
-available by Arphic Technology under the "Arphic Public License" and extended
+Chinese Unicode TrueType fonts derived from the original fonts generously made \available by Arphic Technology under the "Arphic Public License" and extended \
 by the CJK Unifonts project.
 
-
 %define umingfontdir    %{_datadir}/fonts/%{name}-uming
 %define ukaifontdir     %{_datadir}/fonts/%{name}-ukai
 %define cidmapdir       %{_datadir}/ghostscript/conf.d



From cchance at fedoraproject.org  Tue Jan  6 01:49:12 2009
From: cchance at fedoraproject.org (Caius Chance)
Date: Tue,  6 Jan 2009 01:49:12 +0000 (UTC)
Subject: rpms/cjkunifonts/devel cjkunifonts.spec,1.25,1.26
Message-ID: <20090106014912.CB3D27013C@cvs1.fedora.phx.redhat.com>

Author: cchance

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

Modified Files:
	cjkunifonts.spec 
Log Message:
fixed .conf ln -s path mistake



Index: cjkunifonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cjkunifonts/devel/cjkunifonts.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- cjkunifonts.spec	6 Jan 2009 01:34:45 -0000	1.25
+++ cjkunifonts.spec	6 Jan 2009 01:48:42 -0000	1.26
@@ -100,13 +100,13 @@
 for fconf in `ls %{umingbuilddir}/*-ttf-arphic-uming*.conf`
 do
     install -m 0644 $fconf %{buildroot}%{_fontconfig_templatedir}/
-    ln -s %{_fontconfig_templatedir}/$fconf \
+    ln -s %{buildroot}%{_fontconfig_templatedir}/$fconf \
         %{buildroot}%{_fontconfig_confdir}/$fconf
 done
 for fconf in `ls %{ukaibuilddir}/*-ttf-arphic-ukai*.conf`
 do
     install -m 0644 $fconf %{buildroot}%{_fontconfig_templatedir}/
-    ln -s %{_fontconfig_templatedir}/$fconf \
+    ln -s %{buildroot}%{_fontconfig_templatedir}/$fconf \
         %{buildroot}%{_fontconfig_confdir}/$fconf
 done
 



From mbarnes at fedoraproject.org  Tue Jan  6 01:54:04 2009
From: mbarnes at fedoraproject.org (Matthew Barnes)
Date: Tue,  6 Jan 2009 01:54:04 +0000 (UTC)
Subject: rpms/evolution-data-server/devel .cvsignore, 1.98,
	1.99 evolution-data-server.spec, 1.242, 1.243 sources, 1.98, 1.99
	evolution-data-server-2.25.3-implicit-function-declarations.patch,
	1.1, NONE
Message-ID: <20090106015404.3AF1A70125@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-serv29391

Modified Files:
	.cvsignore evolution-data-server.spec sources 
Removed Files:
	evolution-data-server-2.25.3-implicit-function-declarations.patch 
Log Message:

* Mon Jan 05 2009 Matthew Barnes <mbarnes at redhat.com> - 2.25.4-1.fc11
- Update to 2.25.4



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-data-server/devel/.cvsignore,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -r1.98 -r1.99
--- .cvsignore	15 Dec 2008 15:38:05 -0000	1.98
+++ .cvsignore	6 Jan 2009 01:53:33 -0000	1.99
@@ -1 +1 @@
-evolution-data-server-2.25.3.tar.bz2
+evolution-data-server-2.25.4.tar.bz2


Index: evolution-data-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-data-server/devel/evolution-data-server.spec,v
retrieving revision 1.242
retrieving revision 1.243
diff -u -r1.242 -r1.243
--- evolution-data-server.spec	15 Dec 2008 15:38:05 -0000	1.242
+++ evolution-data-server.spec	6 Jan 2009 01:53:33 -0000	1.243
@@ -9,7 +9,7 @@
 %define gtk_doc_version 1.9
 %define intltool_version 0.35.5
 %define libbonobo_version 2.20.3
-%define libgweather_version 2.25.2
+%define libgweather_version 2.25.4
 %define orbit2_version 2.9.8
 %define soup_version 2.3.0
 %define sqlite_version 3.5
@@ -29,7 +29,7 @@
 ### Abstract ###
 
 Name: evolution-data-server
-Version: 2.25.3
+Version: 2.25.4
 Release: 1%{?dist}
 License: LGPLv2
 Group: System Environment/Libraries
@@ -55,8 +55,6 @@
 # RH bug #243296
 Patch13: evolution-data-server-1.11.5-fix-64bit-acinclude.patch
 
-Patch14: evolution-data-server-2.25.3-implicit-function-declarations.patch
-
 ### Build Dependencies ###
 
 BuildRequires: GConf2-devel
@@ -137,7 +135,6 @@
 %patch11 -p1 -b .fix-ldap-query
 %patch12 -p1 -b .camel-folder-summary-crash
 %patch13 -p1 -b .fix-64bit-acinclude
-%patch14 -p1 -b .implicit-function-declarations
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
@@ -383,6 +380,9 @@
 %{_datadir}/gtk-doc/html/libedataserverui
 
 %changelog
+* Mon Jan 05 2009 Matthew Barnes <mbarnes at redhat.com> - 2.25.4-1.fc11
+- Update to 2.25.4
+
 * Mon Dec 15 2008 Matthew Barnes <mbarnes at redhat.com> - 2.25.3-1.fc11
 - Update to 2.25.3
 - New BR: libgweather-devel


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-data-server/devel/sources,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -r1.98 -r1.99
--- sources	15 Dec 2008 15:38:05 -0000	1.98
+++ sources	6 Jan 2009 01:53:33 -0000	1.99
@@ -1 +1 @@
-4dc7d405f18c58a3a8c74f96a88fe0f7  evolution-data-server-2.25.3.tar.bz2
+714baf1349f75b8a94b7dc0a8e594781  evolution-data-server-2.25.4.tar.bz2


--- evolution-data-server-2.25.3-implicit-function-declarations.patch DELETED ---



From bpepple at fedoraproject.org  Tue Jan  6 01:58:55 2009
From: bpepple at fedoraproject.org (Brian Pepple)
Date: Tue,  6 Jan 2009 01:58:55 +0000 (UTC)
Subject: rpms/farsight2/devel farsight2.spec,1.3,1.4
Message-ID: <20090106015855.592DF70125@cvs1.fedora.phx.redhat.com>

Author: bpepple

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

Modified Files:
	farsight2.spec 
Log Message:
* Mon Jan  5 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.0.6-4
- Add BR on libnice-devel and build libnice transmitter.
- Set gstreamer package name & origin.



Index: farsight2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/farsight2/devel/farsight2.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- farsight2.spec	2 Jan 2009 15:00:18 -0000	1.3
+++ farsight2.spec	6 Jan 2009 01:58:25 -0000	1.4
@@ -8,7 +8,7 @@
 
 Name:           farsight2
 Version:        0.0.6
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Libraries for videoconferencing
 
 Group:          System Environment/Libraries
@@ -21,6 +21,7 @@
 BuildRequires:  gstreamer-devel >= %{gst_ver}
 BuildRequires:	gstreamer-plugins-base-devel >= %{gst_plugins_base_ver}
 BuildRequires:	gstreamer-python >= %{gst_python}
+BuildRequires:	libnice-devel
 BuildRequires:	python-devel
 
 Requires:	gstreamer-plugins-farsight >= %{gst_plugins_farsight}
@@ -61,7 +62,11 @@
 
 
 %build
-%configure --disable-static
+%configure								\
+  --with-package-name='Fedora farsight2 package'			\
+  --with-package-origin='http://download.fedora.redhat.com/fedora'	\
+  --disable-static
+
 sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
 sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
 make %{?_smp_mflags}
@@ -90,6 +95,7 @@
 %dir %{_libdir}/%{name}-0.0
 %{_libdir}/%{name}-0.0/libmulticast-transmitter.so
 %{_libdir}/%{name}-0.0/librawudp-transmitter.so
+%{_libdir}/%{name}-0.0/libnice-transmitter.so
 %{_libdir}/gstreamer-0.10/libfsfunnel.so
 %{_libdir}/gstreamer-0.10/libfsrtpconference.so
 %{_libdir}/gstreamer-0.10/libfsvideoanyrate.so
@@ -110,6 +116,10 @@
 
 
 %changelog
+* Mon Jan  5 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.0.6-4
+- Add BR on libnice-devel and build libnice transmitter.
+- Set gstreamer package name & origin.
+
 * Fri Jan 02 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.0.6-3
 - Rebuild.
 



From pgordon at fedoraproject.org  Tue Jan  6 02:07:14 2009
From: pgordon at fedoraproject.org (Peter Gordon)
Date: Tue,  6 Jan 2009 02:07:14 +0000 (UTC)
Subject: rpms/rb_libtorrent/F-10 rb_libtorrent.spec,1.14,1.15
Message-ID: <20090106020714.1222970125@cvs1.fedora.phx.redhat.com>

Author: pgordon

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

Modified Files:
	rb_libtorrent.spec 
Log Message:
Add asio-devel as a runtime dependency for the devel subpackage. (#478589)


Index: rb_libtorrent.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rb_libtorrent/F-10/rb_libtorrent.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- rb_libtorrent.spec	21 Nov 2008 02:00:12 -0000	1.14
+++ rb_libtorrent.spec	6 Jan 2009 02:06:43 -0000	1.15
@@ -3,7 +3,7 @@
 
 Name:		rb_libtorrent
 Version:	0.13.1
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	A C++ BitTorrent library aiming to be the best alternative
 
 Group:		System Environment/Libraries
@@ -50,6 +50,7 @@
 ## Same include directory. :(
 Conflicts:	libtorrent-devel
 ## Needed for various headers used via #include directives...
+Requires:	asio-devel
 Requires:	boost-devel
 Requires:	openssl-devel
 
@@ -181,11 +182,14 @@
 %files	python
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING.Boost bindings/python/{simple_,}client.py
-%{python_sitearch}/libtorrent-%{version}-py2.5.egg-info
+%{python_sitearch}/libtorrent-%{version}-py?.?.egg-info
 %{python_sitearch}/libtorrent.so
 
 
 %changelog
+* Mon Jan 05 2009 Peter Gordon <peter at thecodergeek.com> - 0.13.1-4
+- Add asio-devel as runtime dependency for the devel subpackage (#478589)
+
 * Thu Nov 20 2008 Peter Gordon <peter at thecodergeek.com>
 - Update Source0 URL, for now.
 



From cchance at fedoraproject.org  Tue Jan  6 02:08:40 2009
From: cchance at fedoraproject.org (Caius Chance)
Date: Tue,  6 Jan 2009 02:08:40 +0000 (UTC)
Subject: rpms/cjkunifonts/devel cjkunifonts.spec,1.26,1.27
Message-ID: <20090106020840.3E1A570125@cvs1.fedora.phx.redhat.com>

Author: cchance

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

Modified Files:
	cjkunifonts.spec 
Log Message:
retag




Index: cjkunifonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cjkunifonts/devel/cjkunifonts.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- cjkunifonts.spec	6 Jan 2009 01:48:42 -0000	1.26
+++ cjkunifonts.spec	6 Jan 2009 02:08:10 -0000	1.27
@@ -15,7 +15,7 @@
 
 Name:        %{fontname}
 Version:     0.2.20080216.1
-Release:     11%{?dist}
+Release:     11.1%{?dist}
 Summary:     Chinese TrueType Fonts -- Simplified and Traditional Chinese Ming and Kai Face
 License:     Arphic
 Group:       User Interface/X
@@ -213,7 +213,7 @@
 %{catalogue}/%{name}-ukai
 
 %changelog
-* Tue Jan 06 2009 Caius Chance <cchance at redhat.com> - 0.2.20080216.1-11.fc11
+* Tue Jan 06 2009 Caius Chance <cchance at redhat.com> - 0.2.20080216.1-11.1.fc11
 - Resolves: rhbz#477373 (Converted to new font packaging guidelines.)
 
 * Sun Dec  7 2008 Behdad Esfahbod <besfahbo at redhat.com> - 0.2.20080216.1-10.fc11



From dchen at fedoraproject.org  Tue Jan  6 02:19:30 2009
From: dchen at fedoraproject.org (Ding-Yi Chen)
Date: Tue,  6 Jan 2009 02:19:30 +0000 (UTC)
Subject: rpms/fbterm/devel fbterm.spec,1.6,1.7 import.log,1.5,1.6
Message-ID: <20090106021930.2767B70125@cvs1.fedora.phx.redhat.com>

Author: dchen

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

Modified Files:
	fbterm.spec import.log 
Log Message:
SUID fbterm for EL5


Index: fbterm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fbterm/devel/fbterm.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- fbterm.spec	5 Jan 2009 01:43:12 -0000	1.6
+++ fbterm.spec	6 Jan 2009 02:18:59 -0000	1.7
@@ -1,6 +1,6 @@
 Name:       fbterm
 Version:    1.3
-Release:    0%{?dist}
+Release:    1%{?dist}
 License:    GPLv2+
 Group:      Applications/System
 URL:        http://code.google.com/p/fbterm/
@@ -37,7 +37,7 @@
 %prep
 %setup -q
 #%patch0 -p0 -b .kernel-header
-%patch1 -p0 -b .signalfd
+%patch1 -p0 -b .setcap
 
 %build
 %configure --disable-static --disable-rpath
@@ -52,17 +52,27 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%if 0%{?fedora} >= 9
 %post
 setcap 'cap_sys_tty_config+ep' %{_bindir}/%{name}
+%endif
+
 
 %files 
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING README
+%if 0%{?fedora} >= 9
 %{_bindir}/%{name}
+%else
+%attr(4755,root,root) %{_bindir}/%{name}
+%endif
 %{_mandir}/man1/%{name}.1.gz
 
 
 %changelog
+* Tue Jan 06 2009 Ding-Yi Chen <dchen at redhat dot com> - 1.3-1
+- SUID fbterm for el5, as it does not have libcap.
+
 * Mon Jan 05 2009 Ding-Yi Chen <dchen at redhat dot com> - 1.3-0
 - Upstream update:
   1. added command line arguments to change option values 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/fbterm/devel/import.log,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- import.log	5 Jan 2009 01:43:12 -0000	1.5
+++ import.log	6 Jan 2009 02:18:59 -0000	1.6
@@ -3,3 +3,4 @@
 fbterm-1_2-1_fc9:HEAD:fbterm-1.2-1.fc9.src.rpm:1227251011
 fbterm-1_2-2_fc10:HEAD:fbterm-1.2-2.fc10.src.rpm:1228959810
 fbterm-1_3-0_fc10:HEAD:fbterm-1.3-0.fc10.src.rpm:1231119727
+fbterm-1_3-1_fc10:HEAD:fbterm-1.3-1.fc10.src.rpm:1231208300



From dchen at fedoraproject.org  Tue Jan  6 02:23:09 2009
From: dchen at fedoraproject.org (Ding-Yi Chen)
Date: Tue,  6 Jan 2009 02:23:09 +0000 (UTC)
Subject: rpms/fbterm/F-10 fbterm.spec,1.4,1.5 import.log,1.4,1.5
Message-ID: <20090106022309.EE48E7013F@cvs1.fedora.phx.redhat.com>

Author: dchen

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

Modified Files:
	fbterm.spec import.log 
Log Message:
SUID fbterm for EL5


Index: fbterm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fbterm/F-10/fbterm.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- fbterm.spec	5 Jan 2009 01:44:57 -0000	1.4
+++ fbterm.spec	6 Jan 2009 02:22:39 -0000	1.5
@@ -1,6 +1,6 @@
 Name:       fbterm
 Version:    1.3
-Release:    0%{?dist}
+Release:    1%{?dist}
 License:    GPLv2+
 Group:      Applications/System
 URL:        http://code.google.com/p/fbterm/
@@ -37,7 +37,7 @@
 %prep
 %setup -q
 #%patch0 -p0 -b .kernel-header
-%patch1 -p0 -b .signalfd
+%patch1 -p0 -b .setcap
 
 %build
 %configure --disable-static --disable-rpath
@@ -52,17 +52,27 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%if 0%{?fedora} >= 9
 %post
 setcap 'cap_sys_tty_config+ep' %{_bindir}/%{name}
+%endif
+
 
 %files 
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING README
+%if 0%{?fedora} >= 9
 %{_bindir}/%{name}
+%else
+%attr(4755,root,root) %{_bindir}/%{name}
+%endif
 %{_mandir}/man1/%{name}.1.gz
 
 
 %changelog
+* Tue Jan 06 2009 Ding-Yi Chen <dchen at redhat dot com> - 1.3-1
+- SUID fbterm for el5, as it does not have libcap.
+
 * Mon Jan 05 2009 Ding-Yi Chen <dchen at redhat dot com> - 1.3-0
 - Upstream update:
   1. added command line arguments to change option values 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/fbterm/F-10/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- import.log	5 Jan 2009 01:44:57 -0000	1.4
+++ import.log	6 Jan 2009 02:22:39 -0000	1.5
@@ -2,3 +2,4 @@
 fbterm-1_2-1_fc9:F-10:fbterm-1.2-1.fc9.src.rpm:1227251433
 fbterm-1_2-2_fc10:F-10:fbterm-1.2-2.fc10.src.rpm:1228960163
 fbterm-1_3-0_fc10:F-10:fbterm-1.3-0.fc10.src.rpm:1231119864
+fbterm-1_3-1_fc10:F-10:fbterm-1.3-1.fc10.src.rpm:1231208373



From cchance at fedoraproject.org  Tue Jan  6 02:25:04 2009
From: cchance at fedoraproject.org (Caius Chance)
Date: Tue,  6 Jan 2009 02:25:04 +0000 (UTC)
Subject: rpms/cjkunifonts/devel cjkunifonts.spec,1.27,1.28
Message-ID: <20090106022504.AC9D170141@cvs1.fedora.phx.redhat.com>

Author: cchance

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

Modified Files:
	cjkunifonts.spec 
Log Message:
fixed .conf ln -s path mistake



Index: cjkunifonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cjkunifonts/devel/cjkunifonts.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- cjkunifonts.spec	6 Jan 2009 02:08:10 -0000	1.27
+++ cjkunifonts.spec	6 Jan 2009 02:24:34 -0000	1.28
@@ -10,12 +10,9 @@
 %define cidmapdir       %{_datadir}/ghostscript/conf.d
 %define catalogue       %{_sysconfdir}/X11/fontpath.d
 
-%define umingbuilddir   ../%{name}-uming-%{version}
-%define ukaibuilddir    ../%{name}-ukai-%{version}
-
 Name:        %{fontname}
 Version:     0.2.20080216.1
-Release:     11.1%{?dist}
+Release:     11.2%{?dist}
 Summary:     Chinese TrueType Fonts -- Simplified and Traditional Chinese Ming and Kai Face
 License:     Arphic
 Group:       User Interface/X
@@ -97,18 +94,24 @@
 # fontconfig config files
 install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} \
     %{buildroot}%{_fontconfig_confdir}
-for fconf in `ls %{umingbuilddir}/*-ttf-arphic-uming*.conf`
+
+cd %{name}-uming-%{version}
+for fconf in `ls *-ttf-arphic-uming*.conf`
 do
     install -m 0644 $fconf %{buildroot}%{_fontconfig_templatedir}/
     ln -s %{buildroot}%{_fontconfig_templatedir}/$fconf \
         %{buildroot}%{_fontconfig_confdir}/$fconf
 done
-for fconf in `ls %{ukaibuilddir}/*-ttf-arphic-ukai*.conf`
+cd ..
+
+cd %{name}-ukai-%{version}
+for fconf in `ls *-ttf-arphic-ukai*.conf`
 do
     install -m 0644 $fconf %{buildroot}%{_fontconfig_templatedir}/
     ln -s %{buildroot}%{_fontconfig_templatedir}/$fconf \
         %{buildroot}%{_fontconfig_confdir}/$fconf
 done
+cd ..
 
 # backward compat
 install -d %{buildroot}%{_datadir}/fonts/zh_CN/TrueType
@@ -213,7 +216,7 @@
 %{catalogue}/%{name}-ukai
 
 %changelog
-* Tue Jan 06 2009 Caius Chance <cchance at redhat.com> - 0.2.20080216.1-11.1.fc11
+* Tue Jan 06 2009 Caius Chance <cchance at redhat.com> - 0.2.20080216.1-11.2.fc11
 - Resolves: rhbz#477373 (Converted to new font packaging guidelines.)
 
 * Sun Dec  7 2008 Behdad Esfahbod <besfahbo at redhat.com> - 0.2.20080216.1-10.fc11



From dchen at fedoraproject.org  Tue Jan  6 02:25:13 2009
From: dchen at fedoraproject.org (Ding-Yi Chen)
Date: Tue,  6 Jan 2009 02:25:13 +0000 (UTC)
Subject: rpms/fbterm/F-9 fbterm.spec,1.4,1.5 import.log,1.4,1.5
Message-ID: <20090106022513.AD06370125@cvs1.fedora.phx.redhat.com>

Author: dchen

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

Modified Files:
	fbterm.spec import.log 
Log Message:
SUID fbterm for EL5


Index: fbterm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fbterm/F-9/fbterm.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- fbterm.spec	5 Jan 2009 01:57:23 -0000	1.4
+++ fbterm.spec	6 Jan 2009 02:24:43 -0000	1.5
@@ -1,6 +1,6 @@
 Name:       fbterm
 Version:    1.3
-Release:    0%{?dist}
+Release:    1%{?dist}
 License:    GPLv2+
 Group:      Applications/System
 URL:        http://code.google.com/p/fbterm/
@@ -37,7 +37,7 @@
 %prep
 %setup -q
 #%patch0 -p0 -b .kernel-header
-%patch1 -p0 -b .signalfd
+%patch1 -p0 -b .setcap
 
 %build
 %configure --disable-static --disable-rpath
@@ -52,17 +52,27 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%if 0%{?fedora} >= 9
 %post
 setcap 'cap_sys_tty_config+ep' %{_bindir}/%{name}
+%endif
+
 
 %files 
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING README
+%if 0%{?fedora} >= 9
 %{_bindir}/%{name}
+%else
+%attr(4755,root,root) %{_bindir}/%{name}
+%endif
 %{_mandir}/man1/%{name}.1.gz
 
 
 %changelog
+* Tue Jan 06 2009 Ding-Yi Chen <dchen at redhat dot com> - 1.3-1
+- SUID fbterm for el5, as it does not have libcap.
+
 * Mon Jan 05 2009 Ding-Yi Chen <dchen at redhat dot com> - 1.3-0
 - Upstream update:
   1. added command line arguments to change option values 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/fbterm/F-9/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- import.log	5 Jan 2009 01:57:23 -0000	1.4
+++ import.log	6 Jan 2009 02:24:43 -0000	1.5
@@ -2,3 +2,4 @@
 fbterm-1_2-1_fc9:F-9:fbterm-1.2-1.fc9.src.rpm:1227251111
 fbterm-1_2-2_fc10:F-9:fbterm-1.2-2.fc10.src.rpm:1228960580
 fbterm-1_3-0_fc10:F-9:fbterm-1.3-0.fc10.src.rpm:1231120357
+fbterm-1_3-1_fc10:F-9:fbterm-1.3-1.fc10.src.rpm:1231208645



From dchen at fedoraproject.org  Tue Jan  6 03:05:48 2009
From: dchen at fedoraproject.org (Ding-Yi Chen)
Date: Tue,  6 Jan 2009 03:05:48 +0000 (UTC)
Subject: rpms/fbterm/EL-5 fbterm.spec,1.3,1.4 import.log,1.3,1.4
Message-ID: <20090106030548.0BC6770125@cvs1.fedora.phx.redhat.com>

Author: dchen

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

Modified Files:
	fbterm.spec import.log 
Log Message:
SUID fbterm for EL5


Index: fbterm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fbterm/EL-5/fbterm.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- fbterm.spec	5 Jan 2009 02:41:45 -0000	1.3
+++ fbterm.spec	6 Jan 2009 03:05:17 -0000	1.4
@@ -1,6 +1,6 @@
 Name:       fbterm
 Version:    1.3
-Release:    0%{?dist}
+Release:    1%{?dist}
 License:    GPLv2+
 Group:      Applications/System
 URL:        http://code.google.com/p/fbterm/
@@ -37,7 +37,7 @@
 %prep
 %setup -q
 #%patch0 -p0 -b .kernel-header
-%patch1 -p0 -b .signalfd
+%patch1 -p0 -b .setcap
 
 %build
 %configure --disable-static --disable-rpath
@@ -52,17 +52,27 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%if 0%{?fedora} >= 9
 %post
 setcap 'cap_sys_tty_config+ep' %{_bindir}/%{name}
+%endif
+
 
 %files 
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING README
+%if 0%{?fedora} >= 9
 %{_bindir}/%{name}
+%else
+%attr(4755,root,root) %{_bindir}/%{name}
+%endif
 %{_mandir}/man1/%{name}.1.gz
 
 
 %changelog
+* Tue Jan 06 2009 Ding-Yi Chen <dchen at redhat dot com> - 1.3-1
+- SUID fbterm for el5, as it does not have libcap.
+
 * Mon Jan 05 2009 Ding-Yi Chen <dchen at redhat dot com> - 1.3-0
 - Upstream update:
   1. added command line arguments to change option values 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/fbterm/EL-5/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- import.log	5 Jan 2009 02:41:45 -0000	1.3
+++ import.log	6 Jan 2009 03:05:17 -0000	1.4
@@ -1,3 +1,4 @@
 fbterm-1_1-3_fc9:EL-5:fbterm-1.1-3.fc9.src.rpm:1224460854
 fbterm-1_2-1_fc9:EL-5:fbterm-1.2-1.fc9.src.rpm:1227252152
 fbterm-1_3-0_fc10:EL-5:fbterm-1.3-0.fc10.src.rpm:1231120976
+fbterm-1_3-1_fc10:EL-5:fbterm-1.3-1.fc10.src.rpm:1231211081



From mtasaka at fedoraproject.org  Tue Jan  6 05:43:05 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Tue,  6 Jan 2009 05:43:05 +0000 (UTC)
Subject: rpms/cairo-dock/devel .cvsignore, 1.92, 1.93 cairo-dock.spec, 1.123,
	1.124 sources, 1.92, 1.93
Message-ID: <20090106054305.4116F7013F@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/cairo-dock/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28361

Modified Files:
	.cvsignore cairo-dock.spec sources 
Log Message:
rev 1470


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cairo-dock/devel/.cvsignore,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -r1.92 -r1.93
--- .cvsignore	3 Jan 2009 17:00:32 -0000	1.92
+++ .cvsignore	6 Jan 2009 05:42:33 -0000	1.93
@@ -1 +1 @@
-cairo-dock-sources-svn1462_trunk.tar.bz2
+cairo-dock-sources-svn1470_trunk.tar.bz2


Index: cairo-dock.spec
===================================================================
RCS file: /cvs/extras/rpms/cairo-dock/devel/cairo-dock.spec,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -r1.123 -r1.124
--- cairo-dock.spec	3 Jan 2009 17:00:32 -0000	1.123
+++ cairo-dock.spec	6 Jan 2009 05:42:33 -0000	1.124
@@ -11,7 +11,7 @@
 %undefine		betaver		
 %define		build_webkit	1
 %define		build_xfce	1
-%define		tarballver	svn1462_trunk
+%define		tarballver	svn1470_trunk
 
 %define		fedora_main_rel	3
 
@@ -175,8 +175,6 @@
 pushd .
 # A. main
 cd cairo-dock
-# temporary fix
-#%%{__sed} -i.inline -e 's|^inline ||' src/cairo-dock-icons.*
 
 # permission
 for dir in */
@@ -637,8 +635,8 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
-* Sun Jan  4 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
-- rev 1462
+* Tue Jan  6 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- rev 1470
 
 * Thu Dec 25 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
 - rev 1451


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cairo-dock/devel/sources,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -r1.92 -r1.93
--- sources	3 Jan 2009 17:00:32 -0000	1.92
+++ sources	6 Jan 2009 05:42:33 -0000	1.93
@@ -1 +1 @@
-6468df6d5396345e24e79bb0369c1bcd  cairo-dock-sources-svn1462_trunk.tar.bz2
+885e64b62b9cd5d446ca7a93dd08f101  cairo-dock-sources-svn1470_trunk.tar.bz2



From mtasaka at fedoraproject.org  Tue Jan  6 05:48:34 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Tue,  6 Jan 2009 05:48:34 +0000 (UTC)
Subject: rpms/ochusha/devel .cvsignore, 1.67, 1.68 ochusha.spec, 1.91,
	1.92 sources, 1.67, 1.68
Message-ID: <20090106054834.F1A7770108@cvs1.fedora.phx.redhat.com>

Author: mtasaka

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

Modified Files:
	.cvsignore ochusha.spec sources 
Log Message:
2009-01-06 14:30


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ochusha/devel/.cvsignore,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- .cvsignore	31 Dec 2008 16:37:40 -0000	1.67
+++ .cvsignore	6 Jan 2009 05:48:04 -0000	1.68
@@ -1 +1 @@
-ochusha-0.6.0.1-cvs20090101T0130.tar.bz2
+ochusha-0.6.0.1-cvs20090106T1430.tar.bz2


Index: ochusha.spec
===================================================================
RCS file: /cvs/extras/rpms/ochusha/devel/ochusha.spec,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -r1.91 -r1.92
--- ochusha.spec	31 Dec 2008 16:37:40 -0000	1.91
+++ ochusha.spec	6 Jan 2009 05:48:04 -0000	1.92
@@ -16,8 +16,8 @@
 %define		help_url			file://%{_docdir}/%{name}-%{version}/doc/index.html
 
 %define		main_ver	0.6.0.1
-%define		codate		20090101
-%define		cotime_JST	0130
+%define		codate		20090106
+%define		cotime_JST	1430
 %define		strtag		cvs%{codate}T%{cotime_JST}
 %define		repoid		36733
 
@@ -217,6 +217,9 @@
 %{_datadir}/icons/hicolor/48x48/apps/*.png
 
 %changelog
+* Tue Jan  6 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- Use latest CVS
+
 * Thu Jan  1 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
 - A Happy New Year
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ochusha/devel/sources,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- sources	31 Dec 2008 16:37:40 -0000	1.67
+++ sources	6 Jan 2009 05:48:04 -0000	1.68
@@ -1 +1 @@
-3373a90b0fddbc7031a8a4f40570ae15  ochusha-0.6.0.1-cvs20090101T0130.tar.bz2
+d5217e68ae68208086938083c35da9ef  ochusha-0.6.0.1-cvs20090106T1430.tar.bz2



From pbrobinson at fedoraproject.org  Tue Jan  6 06:11:43 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Tue,  6 Jan 2009 06:11:43 +0000 (UTC)
Subject: rpms/opal/devel .cvsignore, 1.14, 1.15 opal.spec, 1.32, 1.33 sources,
	1.15, 1.16
Message-ID: <20090106061143.DE1E870108@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

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

Modified Files:
	.cvsignore opal.spec sources 
Log Message:
- New release for ekiga 3.1.0 beta
- Some updates from merge review



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/opal/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	20 Oct 2008 19:41:44 -0000	1.14
+++ .cvsignore	6 Jan 2009 06:11:13 -0000	1.15
@@ -1 +1 @@
-opal-3.4.2.tar.bz2
+opal-3.5.2.tar.bz2


Index: opal.spec
===================================================================
RCS file: /cvs/pkgs/rpms/opal/devel/opal.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- opal.spec	16 Dec 2008 21:45:52 -0000	1.32
+++ opal.spec	6 Jan 2009 06:11:13 -0000	1.33
@@ -1,12 +1,12 @@
 Name:		opal
 Summary:	Open Phone Abstraction Library
-Version:	3.4.2
-Release:	2%{?dist}
+Version:	3.5.2
+Release:	1%{?dist}
 URL:		http://www.opalvoip.org/
 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.4.1
+BuildRequires:	ptlib-devel = 2.5.2
 BuildRequires:	openldap-devel
 BuildRequires:	openssl-devel
 BuildRequires:	libtheora-devel
@@ -23,7 +23,7 @@
 Group:		Development/Libraries
 Requires:	opal = %{version}-%{release}
 Requires:	openssl-devel
-Requires:	ptlib-devel >= 2.4.1
+Requires:	ptlib-devel = 2.5.2
 Requires:	pkgconfig
 
 %description devel
@@ -55,18 +55,22 @@
 %postun -p /sbin/ldconfig
 
 %files
-%defattr(-,root,root)
-%doc  mpl-1.0.htm
+%defattr(-,root,root,-)
+%doc mpl-1.0.htm
 %{_libdir}/*.so.*
 %{_libdir}/%{name}-%{version}
 
 %files devel
-%defattr(-,root,root)
+%doc mpl-1.0.htm docs/*
 %{_includedir}/*
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/opal.pc
 
 %changelog
+* Tue Jan  6 2009 Peter Robinson <pbrobinson at gmail.com> - 3.5.2-1
+- New release for ekiga 3.1.0 beta
+- Some updates from merge review
+
 * Fri Dec  5 2008 Peter Robinson <pbrobinson at gmail.com> - 3.4.2-2
 - Update spec to ensure we own directories
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/opal/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	20 Oct 2008 19:41:44 -0000	1.15
+++ sources	6 Jan 2009 06:11:13 -0000	1.16
@@ -1 +1 @@
-a1d11099fa00d77a79dcfe513872e8dc  opal-3.4.2.tar.bz2
+0b593302c10e7c5f14ae20484ddf8e6b  opal-3.5.2.tar.bz2



From pbrobinson at fedoraproject.org  Tue Jan  6 06:13:50 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Tue,  6 Jan 2009 06:13:50 +0000 (UTC)
Subject: rpms/ptlib/devel .cvsignore, 1.4, 1.5 ptlib.spec, 1.5, 1.6 sources, 
	1.4, 1.5
Message-ID: <20090106061350.77A8E70108@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

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

Modified Files:
	.cvsignore ptlib.spec sources 
Log Message:
- New release for ekiga 3.1.0 beta



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ptlib/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	20 Oct 2008 19:37:54 -0000	1.4
+++ .cvsignore	6 Jan 2009 06:13:20 -0000	1.5
@@ -1 +1 @@
-ptlib-2.4.2.tar.bz2
+ptlib-2.5.2.tar.bz2


Index: ptlib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ptlib/devel/ptlib.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ptlib.spec	20 Oct 2008 19:37:54 -0000	1.5
+++ ptlib.spec	6 Jan 2009 06:13:20 -0000	1.6
@@ -1,9 +1,9 @@
 Name:		ptlib
 Summary:	Portable Tools Library
-Version:	2.4.2
+Version:	2.5.2
 Release:	1%{?dist}
 URL:		http://www.opalvoip.org/
-Source0:	ftp://ftp.gnome.org/pub/gnome/sources/%{name}/2.4/%{name}-%{version}.tar.bz2
+Source0:	ftp://ftp.gnome.org/pub/gnome/sources/%{name}/2.5/%{name}-%{version}.tar.bz2
 License:	MPLv1.0
 Group:		System Environment/Libraries
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -82,6 +82,9 @@
 %attr(755,root,root) %{_bindir}/*
 
 %changelog
+* Tue Jan  6 2009 Peter Robinson <pbrobinson at gmail.com> - 2.5.2-1
+- New release for ekiga 3.1.0 beta
+
 * Mon Oct 20 2008 Peter Robinson <pbrobinson at gmail.com> - 2.4.2-1
 - Update to new stable release for ekiga 3.0.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ptlib/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	20 Oct 2008 19:37:54 -0000	1.4
+++ sources	6 Jan 2009 06:13:20 -0000	1.5
@@ -1 +1 @@
-47ba7da2a339643d5f5406215d457d5a  ptlib-2.4.2.tar.bz2
+7d8dcd999827d51ad4a15afe74aad181  ptlib-2.5.2.tar.bz2



From mclasen at fedoraproject.org  Tue Jan  6 06:23:53 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue,  6 Jan 2009 06:23:53 +0000 (UTC)
Subject: rpms/at-spi/devel .cvsignore, 1.56, 1.57 at-spi.spec, 1.109,
	1.110 sources, 1.56, 1.57
Message-ID: <20090106062353.8C73970108@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/at-spi/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11521

Modified Files:
	.cvsignore at-spi.spec sources 
Log Message:
1.25.4



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/at-spi/devel/.cvsignore,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- .cvsignore	2 Dec 2008 15:17:41 -0000	1.56
+++ .cvsignore	6 Jan 2009 06:23:23 -0000	1.57
@@ -1 +1 @@
-at-spi-1.25.2.tar.bz2
+at-spi-1.25.4.tar.bz2


Index: at-spi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/at-spi/devel/at-spi.spec,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -r1.109 -r1.110
--- at-spi.spec	10 Dec 2008 16:51:28 -0000	1.109
+++ at-spi.spec	6 Jan 2009 06:23:23 -0000	1.110
@@ -9,8 +9,8 @@
 
 Summary: Assistive Technology Service Provider Interface 
 Name: at-spi
-Version: 1.25.2
-Release: 5%{?dist}
+Version: 1.25.4
+Release: 1%{?dist}
 URL: http://developer.gnome.org/projects/gap/
 Source0: http://download.gnome.org/sources/at-spi/1.25/%{name}-%{version}.tar.bz2
 
@@ -156,6 +156,9 @@
 
 
 %changelog
+* Tue Jan  6 2009 Matthias Clasen <mclasen at redhat.com> - 1.25.4-1
+- Update to 1.25.4
+
 * Wed Dec 10 2008 Matthias Clasen <mclasen at redhat.com> - 1.25.2-5
 - ...but keep all the needed deps
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/at-spi/devel/sources,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- sources	2 Dec 2008 15:17:41 -0000	1.56
+++ sources	6 Jan 2009 06:23:23 -0000	1.57
@@ -1 +1 @@
-9580090e3f4023bcea35aa0502463dda  at-spi-1.25.2.tar.bz2
+6ba94371ecf4b4d2d8fbb97ca973cb97  at-spi-1.25.4.tar.bz2



From pbrobinson at fedoraproject.org  Tue Jan  6 06:31:55 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Tue,  6 Jan 2009 06:31:55 +0000 (UTC)
Subject: rpms/ekiga/devel .cvsignore, 1.15, 1.16 ekiga.spec, 1.61,
	1.62 sources, 1.17, 1.18
Message-ID: <20090106063155.E568270108@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

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

Modified Files:
	.cvsignore ekiga.spec sources 
Log Message:
- Upgrade to the 3.1.0 devel release, enable gstreamer and xcap, remove libgnome



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ekiga/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	20 Oct 2008 19:58:02 -0000	1.15
+++ .cvsignore	6 Jan 2009 06:31:25 -0000	1.16
@@ -1 +1 @@
-ekiga-3.0.1.tar.bz2
+ekiga-3.1.0.tar.bz2


Index: ekiga.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ekiga/devel/ekiga.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- ekiga.spec	14 Nov 2008 18:11:45 -0000	1.61
+++ ekiga.spec	6 Jan 2009 06:31:25 -0000	1.62
@@ -1,10 +1,10 @@
 Summary:	A Gnome based SIP/H323 teleconferencing application
 Name:		ekiga
-Version:	3.0.1
-Release:	4%{?dist}
+Version:	3.1.0
+Release:	1%{?dist}
 URL:		http://www.ekiga.org/
 Source0:	ftp://ftp.gnome.org/pub/gnome/sources/ekiga/3.0/%{name}-%{version}.tar.bz2
-Patch0:		ekiga-fixlibnotify.patch
+#Patch0:		ekiga-fixlibnotify.patch
 License:	GPLv2+
 Group:		Applications/Communications
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -14,8 +14,8 @@
 Requires:	GConf2
 BuildRequires:	gtk2-devel >= 2.12
 BuildRequires:	GConf2-devel >= 2.2.0
-BuildRequires:	libgnomeui-devel >= 2.0
-BuildRequires:	libgnome-devel >= 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
@@ -36,6 +36,9 @@
 BuildRequires:	desktop-file-utils
 BuildRequires:	libsigc++20-devel
 BuildRequires:	speex-devel
+BuildRequires:	gstreamer-devel
+BuildRequires:	gstreamer-plugins-base-devel
+BuildRequires:	gstreamer-plugins-bad-devel
 
 Requires(pre):	GConf2
 Requires(post):	GConf2
@@ -49,11 +52,11 @@
 
 %prep
 %setup -q
-%patch0 -p0 -b .fixlibnotify
+#%patch0 -p0 -b .fixlibnotify
 
 %build
 CXXFLAGS="$RPM_OPT_FLAGS -DLDAP_DEPRECATED=1 -fPIC"
-%configure --disable-scrollkeeper
+%configure --disable-scrollkeeper --enable-gstreamer --enable-xcap
 make %{?_smp_mflags}
 
 %install
@@ -141,6 +144,9 @@
 %{_sysconfdir}/gconf/schemas/ekiga.schemas
 
 %changelog
+* Mon Jan  5 2009 Peter Robinson <pbrobinson at gmail.com> - 3.1.0-1
+- Upgrade to the 3.1.0 devel release, enable gstreamer and xcap, remove libgnome
+
 * Mon Nov 13 2008 Peter Robinson <pbrobinson at gmail.com> - 3.0.1-4
 - Fix spec file error
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ekiga/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources	20 Oct 2008 19:58:02 -0000	1.17
+++ sources	6 Jan 2009 06:31:25 -0000	1.18
@@ -1 +1 @@
-69b4cb7ec2041c5b76861d161d993820  ekiga-3.0.1.tar.bz2
+ec8690ff84b364d2df5b2443a01ba529  ekiga-3.1.0.tar.bz2



From mclasen at fedoraproject.org  Tue Jan  6 06:33:09 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue,  6 Jan 2009 06:33:09 +0000 (UTC)
Subject: rpms/gedit/devel .cvsignore, 1.82, 1.83 gedit.spec, 1.180,
	1.181 sources, 1.84, 1.85
Message-ID: <20090106063309.5C63E70108@cvs1.fedora.phx.redhat.com>

Author: mclasen

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

Modified Files:
	.cvsignore gedit.spec sources 
Log Message:
2.25.4



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gedit/devel/.cvsignore,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -r1.82 -r1.83
--- .cvsignore	4 Dec 2008 15:04:43 -0000	1.82
+++ .cvsignore	6 Jan 2009 06:32:38 -0000	1.83
@@ -1 +1 @@
-gedit-2.25.2.tar.bz2
+gedit-2.25.4.tar.bz2


Index: gedit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gedit/devel/gedit.spec,v
retrieving revision 1.180
retrieving revision 1.181
diff -u -r1.180 -r1.181
--- gedit.spec	5 Jan 2009 15:24:59 -0000	1.180
+++ gedit.spec	6 Jan 2009 06:32:38 -0000	1.181
@@ -17,8 +17,8 @@
 
 Summary:	Text editor for the GNOME desktop
 Name:		gedit
-Version: 	2.25.2
-Release: 	3%{?dist}
+Version: 	2.25.4
+Release: 	1%{?dist}
 Epoch:		1
 License:	GPLv2+ and GFDL
 Group:		Applications/Editors
@@ -221,6 +221,9 @@
 
 
 %changelog
+* Tue Jan  6 2009 Matthias Clasen <mclasen at redhat.com> - 1:2.25.4-1
+- Update to 2.25.4
+
 * Mon Jan 05 2009 - Bastien Nocera <bnocera at redhat.com> - 1:2.25.2-3
 - Remove some unneeded dependencies
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gedit/devel/sources,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -r1.84 -r1.85
--- sources	4 Dec 2008 15:04:43 -0000	1.84
+++ sources	6 Jan 2009 06:32:39 -0000	1.85
@@ -1 +1 @@
-703b945d95e7fb4f942e0f083ffb74f6  gedit-2.25.2.tar.bz2
+31f4ad2cc3a0148c433c1dc5048503e5  gedit-2.25.4.tar.bz2



From mclasen at fedoraproject.org  Tue Jan  6 06:39:31 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue,  6 Jan 2009 06:39:31 +0000 (UTC)
Subject: rpms/at-spi/devel at-spi.spec,1.110,1.111
Message-ID: <20090106063931.910CD70108@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/at-spi/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14061

Modified Files:
	at-spi.spec 
Log Message:
drop upstreamed patch



Index: at-spi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/at-spi/devel/at-spi.spec,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -r1.110 -r1.111
--- at-spi.spec	6 Jan 2009 06:23:23 -0000	1.110
+++ at-spi.spec	6 Jan 2009 06:39:01 -0000	1.111
@@ -10,7 +10,7 @@
 Summary: Assistive Technology Service Provider Interface 
 Name: at-spi
 Version: 1.25.4
-Release: 1%{?dist}
+Release: 2%{?dist}
 URL: http://developer.gnome.org/projects/gap/
 Source0: http://download.gnome.org/sources/at-spi/1.25/%{name}-%{version}.tar.bz2
 
@@ -48,8 +48,6 @@
 
 # http://bugzilla.gnome.org/show_bug.cgi?id=548782
 Patch4: evo-crash.patch
-# http://bugzilla.gnome.org/show_bug.cgi?id=563806
-Patch5: at-spi-unneeded-deps.patch
 
 %description
 at-spi allows assistive technologies to access GTK-based
@@ -87,7 +85,6 @@
 %prep
 %setup -q
 %patch4 -p1 -b .evo-crash
-%patch5 -p1 -b .unneeded-deps
 
 autoreconf -i -f
 
@@ -156,7 +153,7 @@
 
 
 %changelog
-* Tue Jan  6 2009 Matthias Clasen <mclasen at redhat.com> - 1.25.4-1
+* Tue Jan  6 2009 Matthias Clasen <mclasen at redhat.com> - 1.25.4-2
 - Update to 1.25.4
 
 * Wed Dec 10 2008 Matthias Clasen <mclasen at redhat.com> - 1.25.2-5



From mclasen at fedoraproject.org  Tue Jan  6 06:40:29 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue,  6 Jan 2009 06:40:29 +0000 (UTC)
Subject: rpms/gedit/devel gedit.spec,1.181,1.182
Message-ID: <20090106064029.3737570108@cvs1.fedora.phx.redhat.com>

Author: mclasen

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

Modified Files:
	gedit.spec 
Log Message:
thanks, libtool



Index: gedit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gedit/devel/gedit.spec,v
retrieving revision 1.181
retrieving revision 1.182
diff -u -r1.181 -r1.182
--- gedit.spec	6 Jan 2009 06:32:38 -0000	1.181
+++ gedit.spec	6 Jan 2009 06:39:58 -0000	1.182
@@ -18,7 +18,7 @@
 Summary:	Text editor for the GNOME desktop
 Name:		gedit
 Version: 	2.25.4
-Release: 	1%{?dist}
+Release: 	2%{?dist}
 Epoch:		1
 License:	GPLv2+ and GFDL
 Group:		Applications/Editors
@@ -108,7 +108,7 @@
 %endif
 
 %build
-autoreconf
+autoreconf -f -i
 %configure \
 	--disable-scrollkeeper \
 	--disable-gtk-doc \
@@ -221,7 +221,7 @@
 
 
 %changelog
-* Tue Jan  6 2009 Matthias Clasen <mclasen at redhat.com> - 1:2.25.4-1
+* Tue Jan  6 2009 Matthias Clasen <mclasen at redhat.com> - 1:2.25.4-2
 - Update to 2.25.4
 
 * Mon Jan 05 2009 - Bastien Nocera <bnocera at redhat.com> - 1:2.25.2-3



From mmaslano at fedoraproject.org  Tue Jan  6 06:47:11 2009
From: mmaslano at fedoraproject.org (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?=)
Date: Tue,  6 Jan 2009 06:47:11 +0000 (UTC)
Subject: rpms/perl-HTML-Parser/F-10 .cvsignore, 1.12,
	1.13 perl-HTML-Parser.spec, 1.32, 1.33 sources, 1.13, 1.14
Message-ID: <20090106064711.9475770108@cvs1.fedora.phx.redhat.com>

Author: mmaslano

Update of /cvs/pkgs/rpms/perl-HTML-Parser/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15759

Modified Files:
	.cvsignore perl-HTML-Parser.spec sources 
Log Message:
* Tue Dec 16 2008 Marcela Ma??l????ov?? <mmaslano at redhat.com> - 3.59-1
- update to the latest version for Padre editor



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-HTML-Parser/F-10/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	6 Feb 2007 04:53:37 -0000	1.12
+++ .cvsignore	6 Jan 2009 06:46:41 -0000	1.13
@@ -1 +1 @@
-HTML-Parser-3.56.tar.gz
+HTML-Parser-3.59.tar.gz


Index: perl-HTML-Parser.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-HTML-Parser/F-10/perl-HTML-Parser.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- perl-HTML-Parser.spec	28 Feb 2008 13:06:18 -0000	1.32
+++ perl-HTML-Parser.spec	6 Jan 2009 06:46:41 -0000	1.33
@@ -1,8 +1,8 @@
 %define real_name HTML-Parser
 
 Name:           perl-%{real_name}
-Version:        3.56
-Release:        5%{?dist}
+Version:        3.59
+Release:        1%{?dist}
 Summary:        Perl module for parsing HTML
 
 Group:          Development/Libraries
@@ -58,6 +58,9 @@
 
 
 %changelog
+* Tue Dec 16 2008 Marcela Ma??l????ov?? <mmaslano at redhat.com> - 3.59-1
+- update to the latest version for Padre editor
+
 * Wed Feb 27 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 3.56-5
 - Rebuild for perl 5.10 (again)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-HTML-Parser/F-10/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	6 Feb 2007 04:53:37 -0000	1.13
+++ sources	6 Jan 2009 06:46:41 -0000	1.14
@@ -1 +1 @@
-bddc432e5ed9df4d4153a62234f04fc2  HTML-Parser-3.56.tar.gz
+190950f442ff4a8e59e637714105a01b  HTML-Parser-3.59.tar.gz



From mclasen at fedoraproject.org  Tue Jan  6 06:50:59 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue,  6 Jan 2009 06:50:59 +0000 (UTC)
Subject: rpms/mousetweaks/devel .cvsignore, 1.14, 1.15 mousetweaks.spec, 1.19,
	1.20 sources, 1.14, 1.15
Message-ID: <20090106065059.9C44670140@cvs1.fedora.phx.redhat.com>

Author: mclasen

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

Modified Files:
	.cvsignore mousetweaks.spec sources 
Log Message:
2.25.4



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mousetweaks/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	4 Dec 2008 06:49:22 -0000	1.14
+++ .cvsignore	6 Jan 2009 06:50:29 -0000	1.15
@@ -1 +1 @@
-mousetweaks-2.25.2.tar.bz2
+mousetweaks-2.25.4.tar.bz2


Index: mousetweaks.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mousetweaks/devel/mousetweaks.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- mousetweaks.spec	4 Dec 2008 06:49:23 -0000	1.19
+++ mousetweaks.spec	6 Jan 2009 06:50:29 -0000	1.20
@@ -1,5 +1,5 @@
 Name:		mousetweaks
-Version:	2.25.2
+Version:	2.25.4
 Release:	1%{?dist}
 Summary:	Mouse accessibility support for the GNOME desktop
 Group:		User Interface/Desktops
@@ -109,6 +109,9 @@
 %doc %{_mandir}/man1/*
 
 %changelog
+* Tue Jan  6 2009 Matthias Clasen <mclasen at redhat.com> - 2.25.4-1
+- Update to 2.25.4
+
 * Thu Dec  4 2008 Matthias Clasen <mclasen at redhat.com> - 2.25.2-1
 - Update to 2.25.2
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mousetweaks/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	4 Dec 2008 06:49:23 -0000	1.14
+++ sources	6 Jan 2009 06:50:29 -0000	1.15
@@ -1 +1 @@
-50b5263588a48a6b55ae1744313d6d16  mousetweaks-2.25.2.tar.bz2
+3884d1434e1892fc2fce5f8ba8b41e33  mousetweaks-2.25.4.tar.bz2



From mclasen at fedoraproject.org  Tue Jan  6 06:56:57 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue,  6 Jan 2009 06:56:57 +0000 (UTC)
Subject: rpms/gtksourceview2/devel .cvsignore, 1.20, 1.21 gtksourceview2.spec,
	1.22, 1.23 sources, 1.20, 1.21
Message-ID: <20090106065657.650F170108@cvs1.fedora.phx.redhat.com>

Author: mclasen

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

Modified Files:
	.cvsignore gtksourceview2.spec sources 
Log Message:
2.5.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gtksourceview2/devel/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- .cvsignore	12 Nov 2008 06:48:15 -0000	1.20
+++ .cvsignore	6 Jan 2009 06:56:26 -0000	1.21
@@ -1 +1 @@
-gtksourceview-2.4.1.tar.bz2
+gtksourceview-2.5.2.tar.bz2


Index: gtksourceview2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtksourceview2/devel/gtksourceview2.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- gtksourceview2.spec	12 Nov 2008 06:48:16 -0000	1.22
+++ gtksourceview2.spec	6 Jan 2009 06:56:27 -0000	1.23
@@ -5,13 +5,13 @@
 
 Summary: A library for viewing source files
 Name: gtksourceview2
-Version: 2.4.1
+Version: 2.5.2
 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.4/gtksourceview-%{version}.tar.bz2
+Source0: http://download.gnome.org/sources/gtksourceview/2.5/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
+* Tue Jan  6 2009 Matthias Clasen <mclasen at redhat.com> - 2.5.2-1
+- Update to 2.5.2
+
 * Wed Nov 12 2008 Matthias Clasen <mclasen at redhat.com> - 2.4.1-1
 - Update to 2.4.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gtksourceview2/devel/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources	12 Nov 2008 06:48:16 -0000	1.20
+++ sources	6 Jan 2009 06:56:27 -0000	1.21
@@ -1 +1 @@
-7b5902e00aafc573e56f1bac244b2673  gtksourceview-2.4.1.tar.bz2
+a108e40cb5022864c0e1b1c605b0fe71  gtksourceview-2.5.2.tar.bz2



From mclasen at fedoraproject.org  Tue Jan  6 07:01:04 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue,  6 Jan 2009 07:01:04 +0000 (UTC)
Subject: rpms/orca/devel .cvsignore, 1.44, 1.45 orca.spec, 1.75, 1.76 sources,
	1.45, 1.46
Message-ID: <20090106070104.E557870108@cvs1.fedora.phx.redhat.com>

Author: mclasen

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

Modified Files:
	.cvsignore orca.spec sources 
Log Message:
2.25.4



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/orca/devel/.cvsignore,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- .cvsignore	17 Dec 2008 16:44:48 -0000	1.44
+++ .cvsignore	6 Jan 2009 07:00:33 -0000	1.45
@@ -1 +1 @@
-orca-2.25.3.tar.bz2
+orca-2.25.4.tar.bz2


Index: orca.spec
===================================================================
RCS file: /cvs/pkgs/rpms/orca/devel/orca.spec,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- orca.spec	17 Dec 2008 16:59:10 -0000	1.75
+++ orca.spec	6 Jan 2009 07:00:34 -0000	1.76
@@ -16,8 +16,8 @@
 %define control_center_version 2.16.0-5
 
 Name:		orca
-Version:	2.25.3
-Release: 	2%{?dist}
+Version:	2.25.4
+Release: 	1%{?dist}
 Summary:	Assistive technology for people with visual impairments
 
 Group:		User Interface/Desktops
@@ -105,6 +105,9 @@
 
 
 %changelog
+* Tue Jan  6 2009 Matthias Clasen <mclasen at redhat.com> - 2.25.4-1
+- Update to 2.25.4
+
 * Wed Dec 17 2008 Matthias Clasen <mclasen at redhat.com> - 2.25.3-2
 - Update to 2.25.3
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/orca/devel/sources,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- sources	17 Dec 2008 16:44:48 -0000	1.45
+++ sources	6 Jan 2009 07:00:34 -0000	1.46
@@ -1 +1 @@
-6be17bba945f4d5411adf5223822c91d  orca-2.25.3.tar.bz2
+093adf1da8670c1fdb377d0aee22130c  orca-2.25.4.tar.bz2



From mclasen at fedoraproject.org  Tue Jan  6 07:09:08 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue,  6 Jan 2009 07:09:08 +0000 (UTC)
Subject: rpms/file-roller/devel .cvsignore, 1.79, 1.80 file-roller.spec,
	1.134, 1.135 sources, 1.79, 1.80
Message-ID: <20090106070908.4EE9770108@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/file-roller/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24778

Modified Files:
	.cvsignore file-roller.spec sources 
Log Message:
2.25.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/file-roller/devel/.cvsignore,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- .cvsignore	21 Oct 2008 01:45:25 -0000	1.79
+++ .cvsignore	6 Jan 2009 07:08:37 -0000	1.80
@@ -1 +1 @@
-file-roller-2.24.1.tar.bz2
+file-roller-2.25.1.tar.bz2


Index: file-roller.spec
===================================================================
RCS file: /cvs/pkgs/rpms/file-roller/devel/file-roller.spec,v
retrieving revision 1.134
retrieving revision 1.135
diff -u -r1.134 -r1.135
--- file-roller.spec	24 Nov 2008 00:00:33 -0000	1.134
+++ file-roller.spec	6 Jan 2009 07:08:37 -0000	1.135
@@ -10,12 +10,12 @@
 
 Summary:	Tool for viewing and creating archives
 Name:		file-roller
-Version:	2.24.1
-Release: 	2%{?dist}
+Version:	2.25.1
+Release: 	1%{?dist}
 License:	GPLv2+
 Group:		Applications/Archiving
 URL:		http://download.gnome.org/sources/file-roller/
-Source:		http://download.gnome.org/sources/file-roller/2.24/file-roller-%{version}.tar.bz2
+Source:		http://download.gnome.org/sources/file-roller/2.25/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
+* Tue Jan  6 2009 Matthias Clasen <mclasen at redhat.com> - 2.25.1-1
+- Update to 2.25.1
+
 * Sun Nov 23 2008 Matthias Clasen <mclasen at redhat.com> - 2.24.1-2
 - Shorten summary 
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/file-roller/devel/sources,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- sources	21 Oct 2008 01:45:25 -0000	1.79
+++ sources	6 Jan 2009 07:08:37 -0000	1.80
@@ -1 +1 @@
-da2ee9111041ade40013f75d8185f63d  file-roller-2.24.1.tar.bz2
+75efc66b734e8accee40353fc7a6fa62  file-roller-2.25.1.tar.bz2



From pkgdb at fedoraproject.org  Tue Jan  6 07:10:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 06 Jan 2009 07:10:23 +0000
Subject: [pkgdb] otrs had acl change status
Message-ID: <20090106071023.967B0208202@bastion.fedora.phx.redhat.com>

romal has set the watchbugzilla acl on otrs (Fedora devel) to Approved for dtimms

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



From pkgdb at fedoraproject.org  Tue Jan  6 07:10:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 06 Jan 2009 07:10:25 +0000
Subject: [pkgdb] otrs had acl change status
Message-ID: <20090106071025.EF17920873E@bastion.fedora.phx.redhat.com>

romal has set the watchcommits acl on otrs (Fedora devel) to Approved for dtimms

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



From pkgdb at fedoraproject.org  Tue Jan  6 07:10:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 06 Jan 2009 07:10:29 +0000
Subject: [pkgdb] otrs had acl change status
Message-ID: <20090106071029.89D7E208D2B@bastion.fedora.phx.redhat.com>

romal has set the commit acl on otrs (Fedora devel) to Approved for dtimms

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



From pkgdb at fedoraproject.org  Tue Jan  6 07:10:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 06 Jan 2009 07:10:30 +0000
Subject: [pkgdb] otrs had acl change status
Message-ID: <20090106071030.DC7C2208D51@bastion.fedora.phx.redhat.com>

romal has set the approveacls acl on otrs (Fedora devel) to Approved for dtimms

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



From pbrobinson at fedoraproject.org  Tue Jan  6 07:11:45 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Tue,  6 Jan 2009 07:11:45 +0000 (UTC)
Subject: rpms/ekiga/devel ekiga.spec,1.62,1.63
Message-ID: <20090106071145.DA7EE70108@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

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

Modified Files:
	ekiga.spec 
Log Message:
- drop libnotify patch now we're back using upstream vanilla



Index: ekiga.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ekiga/devel/ekiga.spec,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- ekiga.spec	6 Jan 2009 06:31:25 -0000	1.62
+++ ekiga.spec	6 Jan 2009 07:11:15 -0000	1.63
@@ -4,7 +4,6 @@
 Release:	1%{?dist}
 URL:		http://www.ekiga.org/
 Source0:	ftp://ftp.gnome.org/pub/gnome/sources/ekiga/3.0/%{name}-%{version}.tar.bz2
-#Patch0:		ekiga-fixlibnotify.patch
 License:	GPLv2+
 Group:		Applications/Communications
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -52,7 +51,6 @@
 
 %prep
 %setup -q
-#%patch0 -p0 -b .fixlibnotify
 
 %build
 CXXFLAGS="$RPM_OPT_FLAGS -DLDAP_DEPRECATED=1 -fPIC"



From mclasen at fedoraproject.org  Tue Jan  6 07:15:44 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue,  6 Jan 2009 07:15:44 +0000 (UTC)
Subject: rpms/gcalctool/devel .cvsignore, 1.52, 1.53 gcalctool.spec, 1.79,
	1.80 sources, 1.53, 1.54
Message-ID: <20090106071544.2468A70108@cvs1.fedora.phx.redhat.com>

Author: mclasen

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

Modified Files:
	.cvsignore gcalctool.spec sources 
Log Message:
5.25.4



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gcalctool/devel/.cvsignore,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- .cvsignore	17 Dec 2008 17:15:58 -0000	1.52
+++ .cvsignore	6 Jan 2009 07:15:13 -0000	1.53
@@ -1 +1 @@
-gcalctool-5.25.3.tar.bz2
+gcalctool-5.25.4.tar.bz2


Index: gcalctool.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gcalctool/devel/gcalctool.spec,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- gcalctool.spec	17 Dec 2008 17:15:58 -0000	1.79
+++ gcalctool.spec	6 Jan 2009 07:15:13 -0000	1.80
@@ -1,5 +1,5 @@
 Name:           gcalctool
-Version:        5.25.3
+Version:        5.25.4
 Release:        1%{?dist}
 Summary:        A desktop calculator
 
@@ -99,6 +99,9 @@
 
 
 %changelog
+* Tue Jan  6 2009 Matthias Clasen <mclasen at redhat.com> - 5.25.4-1
+- Update to 5.25.4
+
 * Wed Dec 17 2008 Matthias Clasen <mclasen at redhat.com> - 5.25.3-1
 - Update to 5.25.3
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gcalctool/devel/sources,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- sources	17 Dec 2008 17:15:58 -0000	1.53
+++ sources	6 Jan 2009 07:15:13 -0000	1.54
@@ -1 +1 @@
-ed2169c8809c53d99a1ab0e715fd9c40  gcalctool-5.25.3.tar.bz2
+13998f97ba1815db3dae5b4b1ed864cf  gcalctool-5.25.4.tar.bz2



From mclasen at fedoraproject.org  Tue Jan  6 07:24:39 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue,  6 Jan 2009 07:24:39 +0000 (UTC)
Subject: rpms/file-roller/devel file-roller.spec,1.135,1.136
Message-ID: <20090106072439.3EECC7013C@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/file-roller/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29553

Modified Files:
	file-roller.spec 
Log Message:
fix build



Index: file-roller.spec
===================================================================
RCS file: /cvs/pkgs/rpms/file-roller/devel/file-roller.spec,v
retrieving revision 1.135
retrieving revision 1.136
diff -u -r1.135 -r1.136
--- file-roller.spec	6 Jan 2009 07:08:37 -0000	1.135
+++ file-roller.spec	6 Jan 2009 07:24:08 -0000	1.136
@@ -11,7 +11,7 @@
 Summary:	Tool for viewing and creating archives
 Name:		file-roller
 Version:	2.25.1
-Release: 	1%{?dist}
+Release: 	2%{?dist}
 License:	GPLv2+
 Group:		Applications/Archiving
 URL:		http://download.gnome.org/sources/file-roller/
@@ -20,10 +20,8 @@
 BuildRequires: glib2-devel >= %{glib2_version}
 BuildRequires: pango-devel >= %{pango_version}
 BuildRequires: gtk2-devel >= %{gtk2_version}
-BuildRequires: libgnomeui-devel >= %{libgnomeui_version}
-BuildRequires: libgnomeprintui22-devel >= %{libgnomeprintui_version}
-BuildRequires: libgnomeprint22-devel >= %{libgnomeprint_version}
 BuildRequires: nautilus-devel >= %{nautilus_version}
+BuildRequires: automake autoconf
 BuildRequires: libtool
 BuildRequires: gettext
 BuildRequires: desktop-file-utils >= %{desktop_file_utils_version}
@@ -51,7 +49,7 @@
 %prep
 %setup -q
 
-autoreconf
+autoreconf -f -i
 
 %build
 %configure --disable-scrollkeeper --disable-static
@@ -128,7 +126,7 @@
 %{_datadir}/icons/hicolor/scalable/apps/file-roller.svg
 
 %changelog
-* Tue Jan  6 2009 Matthias Clasen <mclasen at redhat.com> - 2.25.1-1
+* Tue Jan  6 2009 Matthias Clasen <mclasen at redhat.com> - 2.25.1-2
 - Update to 2.25.1
 
 * Sun Nov 23 2008 Matthias Clasen <mclasen at redhat.com> - 2.24.1-2



From pbrobinson at fedoraproject.org  Tue Jan  6 07:29:55 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Tue,  6 Jan 2009 07:29:55 +0000 (UTC)
Subject: rpms/opal/devel opal.spec,1.33,1.34
Message-ID: <20090106072955.2948A70108@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

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

Modified Files:
	opal.spec 
Log Message:
- readd accidentally removed line



Index: opal.spec
===================================================================
RCS file: /cvs/pkgs/rpms/opal/devel/opal.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- opal.spec	6 Jan 2009 06:11:13 -0000	1.33
+++ opal.spec	6 Jan 2009 07:29:24 -0000	1.34
@@ -61,6 +61,7 @@
 %{_libdir}/%{name}-%{version}
 
 %files devel
+%defattr(-,root,root,-)
 %doc mpl-1.0.htm docs/*
 %{_includedir}/*
 %{_libdir}/*.so



From mclasen at fedoraproject.org  Tue Jan  6 07:33:35 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue,  6 Jan 2009 07:33:35 +0000 (UTC)
Subject: rpms/file-roller/devel file-roller.spec,1.136,1.137
Message-ID: <20090106073335.3E95370108@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/file-roller/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1621

Modified Files:
	file-roller.spec 
Log Message:
try again



Index: file-roller.spec
===================================================================
RCS file: /cvs/pkgs/rpms/file-roller/devel/file-roller.spec,v
retrieving revision 1.136
retrieving revision 1.137
diff -u -r1.136 -r1.137
--- file-roller.spec	6 Jan 2009 07:24:08 -0000	1.136
+++ file-roller.spec	6 Jan 2009 07:33:04 -0000	1.137
@@ -11,7 +11,7 @@
 Summary:	Tool for viewing and creating archives
 Name:		file-roller
 Version:	2.25.1
-Release: 	2%{?dist}
+Release: 	3%{?dist}
 License:	GPLv2+
 Group:		Applications/Archiving
 URL:		http://download.gnome.org/sources/file-roller/
@@ -26,6 +26,7 @@
 BuildRequires: gettext
 BuildRequires: desktop-file-utils >= %{desktop_file_utils_version}
 BuildRequires: gnome-doc-utils >= %{gnome_doc_utils_version}
+BuildRequires: GConf2-devel
 BuildRequires: scrollkeeper
 BuildRequires: perl(XML::Parser)
 BuildRequires: intltool
@@ -126,7 +127,7 @@
 %{_datadir}/icons/hicolor/scalable/apps/file-roller.svg
 
 %changelog
-* Tue Jan  6 2009 Matthias Clasen <mclasen at redhat.com> - 2.25.1-2
+* Tue Jan  6 2009 Matthias Clasen <mclasen at redhat.com> - 2.25.1-3
 - Update to 2.25.1
 
 * Sun Nov 23 2008 Matthias Clasen <mclasen at redhat.com> - 2.24.1-2



From pbrobinson at fedoraproject.org  Tue Jan  6 07:34:34 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Tue,  6 Jan 2009 07:34:34 +0000 (UTC)
Subject: rpms/opal/F-10 opal.spec,1.30,1.31
Message-ID: <20090106073434.979A870108@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

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

Modified Files:
	opal.spec 
Log Message:
- merge review updates



Index: opal.spec
===================================================================
RCS file: /cvs/pkgs/rpms/opal/F-10/opal.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- opal.spec	26 Nov 2008 16:24:24 -0000	1.30
+++ opal.spec	6 Jan 2009 07:34:04 -0000	1.31
@@ -1,12 +1,12 @@
 Name:		opal
 Summary:	Open Phone Abstraction Library
 Version:	3.4.2
-Release:	1%{?dist}
+Release:	2%{?dist}
 URL:		http://www.opalvoip.org/
 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.4.1
+BuildRequires:	ptlib-devel = 2.4.2
 BuildRequires:	openldap-devel
 BuildRequires:	openssl-devel
 BuildRequires:	libtheora-devel
@@ -22,9 +22,9 @@
 Summary:	Development package for opal
 Group:		Development/Libraries
 Requires:	opal = %{version}-%{release}
-Requires:	ptlib-devel >= 2.4.1
+Requires:	openssl-devel
+Requires:	ptlib-devel = 2.4.2
 Requires:	pkgconfig
-Obsoletes:	openh323-devel
 
 %description devel
 The opal-devel package includes the development libraries and 
@@ -55,20 +55,22 @@
 %postun -p /sbin/ldconfig
 
 %files
-%defattr(-,root,root)
-%doc  mpl-1.0.htm
+%defattr(-,root,root,-)
+%doc mpl-1.0.htm
 %{_libdir}/*.so.*
-%{_libdir}/%{name}-%{version}/codecs/audio/*.so
-%{_libdir}/%{name}-%{version}/codecs/video/*.so
-%{_libdir}/%{name}-%{version}/lid/*.so
+%{_libdir}/%{name}-%{version}
 
 %files devel
-%defattr(-,root,root)
+%defattr(-,root,root,-)
+%doc mpl-1.0.htm docs/*
 %{_includedir}/*
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/opal.pc
 
 %changelog
+* Mon Oct 20 2008 Peter Robinson <pbrobinson at gmail.com> - 3.4.2-2
+- Some merge review updates
+
 * Mon Oct 20 2008 Peter Robinson <pbrobinson at gmail.com> - 3.4.2-1
 - Update to new stable release for ekiga 3.0.1
 



From mclasen at fedoraproject.org  Tue Jan  6 07:40:16 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue,  6 Jan 2009 07:40:16 +0000 (UTC)
Subject: rpms/file-roller/devel file-roller.spec,1.137,1.138
Message-ID: <20090106074016.B851B70108@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/file-roller/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3775

Modified Files:
	file-roller.spec 
Log Message:
fix more BRs



Index: file-roller.spec
===================================================================
RCS file: /cvs/pkgs/rpms/file-roller/devel/file-roller.spec,v
retrieving revision 1.137
retrieving revision 1.138
diff -u -r1.137 -r1.138
--- file-roller.spec	6 Jan 2009 07:33:04 -0000	1.137
+++ file-roller.spec	6 Jan 2009 07:39:46 -0000	1.138
@@ -11,7 +11,7 @@
 Summary:	Tool for viewing and creating archives
 Name:		file-roller
 Version:	2.25.1
-Release: 	3%{?dist}
+Release: 	4%{?dist}
 License:	GPLv2+
 Group:		Applications/Archiving
 URL:		http://download.gnome.org/sources/file-roller/
@@ -20,6 +20,7 @@
 BuildRequires: glib2-devel >= %{glib2_version}
 BuildRequires: pango-devel >= %{pango_version}
 BuildRequires: gtk2-devel >= %{gtk2_version}
+BuildRequires: libglade2-devel
 BuildRequires: nautilus-devel >= %{nautilus_version}
 BuildRequires: automake autoconf
 BuildRequires: libtool
@@ -127,8 +128,9 @@
 %{_datadir}/icons/hicolor/scalable/apps/file-roller.svg
 
 %changelog
-* Tue Jan  6 2009 Matthias Clasen <mclasen at redhat.com> - 2.25.1-3
+* Tue Jan  6 2009 Matthias Clasen <mclasen at redhat.com> - 2.25.1-4
 - Update to 2.25.1
+- Clean up BRs
 
 * Sun Nov 23 2008 Matthias Clasen <mclasen at redhat.com> - 2.24.1-2
 - Shorten summary 



From mclasen at fedoraproject.org  Tue Jan  6 07:47:03 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue,  6 Jan 2009 07:47:03 +0000 (UTC)
Subject: rpms/file-roller/devel file-roller.spec,1.138,1.139
Message-ID: <20090106074703.B9D9D70108@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/file-roller/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6218

Modified Files:
	file-roller.spec 
Log Message:
and more



Index: file-roller.spec
===================================================================
RCS file: /cvs/pkgs/rpms/file-roller/devel/file-roller.spec,v
retrieving revision 1.138
retrieving revision 1.139
diff -u -r1.138 -r1.139
--- file-roller.spec	6 Jan 2009 07:39:46 -0000	1.138
+++ file-roller.spec	6 Jan 2009 07:46:33 -0000	1.139
@@ -11,7 +11,7 @@
 Summary:	Tool for viewing and creating archives
 Name:		file-roller
 Version:	2.25.1
-Release: 	4%{?dist}
+Release: 	5%{?dist}
 License:	GPLv2+
 Group:		Applications/Archiving
 URL:		http://download.gnome.org/sources/file-roller/
@@ -25,6 +25,7 @@
 BuildRequires: automake autoconf
 BuildRequires: libtool
 BuildRequires: gettext
+BuildRequires: libSM-devel
 BuildRequires: desktop-file-utils >= %{desktop_file_utils_version}
 BuildRequires: gnome-doc-utils >= %{gnome_doc_utils_version}
 BuildRequires: GConf2-devel
@@ -128,7 +129,7 @@
 %{_datadir}/icons/hicolor/scalable/apps/file-roller.svg
 
 %changelog
-* Tue Jan  6 2009 Matthias Clasen <mclasen at redhat.com> - 2.25.1-4
+* Tue Jan  6 2009 Matthias Clasen <mclasen at redhat.com> - 2.25.1-5
 - Update to 2.25.1
 - Clean up BRs
 



From kkofler at fedoraproject.org  Tue Jan  6 07:54:15 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Tue,  6 Jan 2009 07:54:15 +0000 (UTC)
Subject: comps comps-f11.xml.in,1.49,1.50
Message-ID: <20090106075415.46ED570108@cvs1.fedora.phx.redhat.com>

Author: kkofler

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

Modified Files:
	comps-f11.xml.in 
Log Message:
Revert "Removed frysk from comps-f11.xml.in; package is retired.", package was un-retired.


Index: comps-f11.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f11.xml.in,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- comps-f11.xml.in	4 Jan 2009 23:33:19 -0000	1.49
+++ comps-f11.xml.in	6 Jan 2009 07:53:44 -0000	1.50
@@ -846,6 +846,7 @@
       <packagereq type="default">diffstat</packagereq>
       <packagereq type="default">doxygen</packagereq>
       <packagereq type="default">elfutils</packagereq>
+      <packagereq type="default">frysk</packagereq>
       <packagereq basearchonly="true" type="default">gcc-gfortran</packagereq>
       <packagereq type="default">git</packagereq>
       <packagereq type="default">indent</packagereq>
@@ -907,6 +908,7 @@
       <packagereq type="optional">expect</packagereq>
       <packagereq type="optional">flasm</packagereq>
       <packagereq type="optional">fpc</packagereq>
+      <packagereq type="optional">frysk-gnome</packagereq>
       <packagereq type="optional">ftnchek</packagereq>
       <packagereq type="optional">gambas-ide</packagereq>
       <packagereq type="optional">gauche</packagereq>



From jskala at fedoraproject.org  Tue Jan  6 08:11:55 2009
From: jskala at fedoraproject.org (Jiri Skala)
Date: Tue,  6 Jan 2009 08:11:55 +0000 (UTC)
Subject: rpms/quagga/devel .cvsignore, 1.19, 1.20 quagga.spec, 1.46,
	1.47 sources, 1.19, 1.20
Message-ID: <20090106081155.222B770108@cvs1.fedora.phx.redhat.com>

Author: jskala

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

Modified Files:
	.cvsignore quagga.spec sources 
Log Message:
* Tue Jan 06 2009 Jiri Skala <jskala at redhat.com> - 0.99.11-1
- bump to latest upstream version 0.99.11



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/quagga/devel/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- .cvsignore	11 Jun 2008 08:57:48 -0000	1.19
+++ .cvsignore	6 Jan 2009 08:11:24 -0000	1.20
@@ -1 +1 @@
-quagga-0.99.10.tar.gz
+quagga-0.99.11.tar.gz


Index: quagga.spec
===================================================================
RCS file: /cvs/extras/rpms/quagga/devel/quagga.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- quagga.spec	3 Sep 2008 19:46:03 -0000	1.46
+++ quagga.spec	6 Jan 2009 08:11:24 -0000	1.47
@@ -31,8 +31,8 @@
 
 Summary:    Routing daemon
 Name:		quagga
-Version:	0.99.10
-Release:    2%{?dist}
+Version:	0.99.11
+Release:    1%{?dist}
 Epoch:      0
 License:	GPLv2+
 Group:      System Environment/Daemons
@@ -348,6 +348,9 @@
 %endif
 
 %changelog
+* Tue Jan 06 2009 Jiri Skala <jskala at redhat.com> - 0.99.11-1
+- bump to latest upstream version 0.99.11
+
 * Wed Sep  3 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.99.10-2
 - fix license tag
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/quagga/devel/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources	11 Jun 2008 08:57:48 -0000	1.19
+++ sources	6 Jan 2009 08:11:24 -0000	1.20
@@ -1 +1 @@
-c7a2d92e1c42214afef9b2e1cd4b5d06  quagga-0.99.10.tar.gz
+903e40c744730ad4d62bee872eeb813b  quagga-0.99.11.tar.gz



From sharkcz at fedoraproject.org  Tue Jan  6 08:27:14 2009
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Tue,  6 Jan 2009 08:27:14 +0000 (UTC)
Subject: rpms/tailor/devel tailor.spec,1.12,1.13
Message-ID: <20090106082714.4725E70108@cvs1.fedora.phx.redhat.com>

Author: sharkcz

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

Modified Files:
	tailor.spec 
Log Message:
* Tue Jan  6 2009 Dan Hor??k <dan[at]danny.cz> 0.9.35-4
- add patch for compatibility with mercurial 1.1.2 by Daniel P. Berrange (Resolves: #478841)



Index: tailor.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tailor/devel/tailor.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- tailor.spec	19 Dec 2008 12:37:20 -0000	1.12
+++ tailor.spec	6 Jan 2009 08:26:43 -0000	1.13
@@ -3,7 +3,7 @@
 Summary:	A tool to migrate changesets between several version control systems
 Name:		tailor
 Version:	0.9.35
-Release:	3%{?dist}
+Release:	4%{?dist}
 Source0:	http://darcs.arstecnica.it/%{name}-%{version}.tar.gz
 License:	GPLv3+
 Group:		Development/Tools
@@ -13,8 +13,11 @@
 Requires:	python-vcpx = %{version}-%{release}
 BuildArch:	noarch
 Patch0:		tailor-test.patch
+# https://bugzilla.redhat.com/show_bug.cgi?id=477148
 # http://progetti.arstecnica.it/tailor/ticket/172
 Patch1:		tailor-0.9.35-mercurial-1.1-compat.patch
+# https://bugzilla.redhat.com/show_bug.cgi?id=478841
+Patch2:		tailor-0.9.35-mercurial-1.1.2-delete.patch
 
 %description
 Tailor is a tool to migrate changesets between CVS, Subversion, git,
@@ -27,7 +30,8 @@
 %package -n python-vcpx
 Summary:	Version Control Patch eXchanger
 Group:		Development/Libraries
-Requires:	cvs, subversion, mercurial, cogito, tla, bazaar, monotone, git-core
+Requires:	cvs, subversion, cogito, tla, bazaar, monotone, git-core
+Requires:	mercurial >= 1.1.2
 
 %description -n python-vcpx
 This is the package `vcpx` (pronounced "veeseepex").  It encapsulates
@@ -38,7 +42,8 @@
 %prep
 %setup -q 
 %patch0
-%patch1 -p1 -b .hg-1.1
+%patch1 -p1 -b .hg-1.1-compat
+%patch2 -p1 -b .hg-1.1.2-delete
 
 # remove the shebang line
 sed -i -e '1d' vcpx/repository/p4/p4lib.py
@@ -67,6 +72,9 @@
 
 
 %changelog
+* Tue Jan  6 2009 Dan Hor??k <dan[at]danny.cz> 0.9.35-4
+- add patch for compatibility with mercurial 1.1.2 by Daniel P. Berrange (Resolves: #478841)
+
 * Fri Dec 19 2008 Dan Hor??k <dan[at]danny.cz> 0.9.35-3
 - add patch for compatibility with mercurial 1.1 by Daniel P. Berrange (Resolves: #477148)
 



From zprikryl at fedoraproject.org  Tue Jan  6 08:55:18 2009
From: zprikryl at fedoraproject.org (Zdenek Prikryl)
Date: Tue,  6 Jan 2009 08:55:18 +0000 (UTC)
Subject: rpms/gpm/devel gpm.init,1.18,1.19 gpm.spec,1.65,1.66
Message-ID: <20090106085518.4FFBB70108@cvs1.fedora.phx.redhat.com>

Author: zprikryl

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

Modified Files:
	gpm.init gpm.spec 
Log Message:
Fixed description in init script (#474337)



Index: gpm.init
===================================================================
RCS file: /cvs/extras/rpms/gpm/devel/gpm.init,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- gpm.init	4 Jun 2008 12:06:10 -0000	1.18
+++ gpm.init	6 Jan 2009 08:54:47 -0000	1.19
@@ -16,9 +16,9 @@
 # Default-Start:  2 3 4 5
 # Default-Stop: 0 1 6
 # Short-Description: Start and stop gpm daemon
-# Description: GPM adds mouse support to text-based Linux applications such \
-#              as the Midnight Commander. It also allows mouse-based console \
-#              cut-and-paste operations, and includes support for pop-up \
+# Description: GPM adds mouse support to text-based Linux applications such
+#              as the Midnight Commander. It also allows mouse-based console
+#              cut-and-paste operations, and includes support for pop-up
 #              menus on the console.
 ### END INIT INFO
 


Index: gpm.spec
===================================================================
RCS file: /cvs/extras/rpms/gpm/devel/gpm.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- gpm.spec	3 Dec 2008 09:30:25 -0000	1.65
+++ gpm.spec	6 Jan 2009 08:54:47 -0000	1.66
@@ -131,6 +131,7 @@
 %changelog
 * Wed Dec 02 2008 Zdenek Prikryl <zprikryl at redhat.com> - 1.20.5-2
 - Fixed debug mode (#473422)
+- Fixed description in init script (#474337)
 
 * Thu Jul 17 2008 Zdenek Prikryl <zprikryl at redhat.com> - 1.20.5-1
 - Updated to 1.20.5



From sharkcz at fedoraproject.org  Tue Jan  6 08:58:52 2009
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Tue,  6 Jan 2009 08:58:52 +0000 (UTC)
Subject: rpms/tailor/devel tailor-0.9.35-mercurial-1.1.2-delete.patch, NONE, 
	1.1
Message-ID: <20090106085852.A2F3970108@cvs1.fedora.phx.redhat.com>

Author: sharkcz

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

Added Files:
	tailor-0.9.35-mercurial-1.1.2-delete.patch 
Log Message:
add missing patch

tailor-0.9.35-mercurial-1.1.2-delete.patch:

--- NEW FILE tailor-0.9.35-mercurial-1.1.2-delete.patch ---
--- tailor-0.9.35/vcpx/repository/hg.py.hg-1.1.2-delete	2009-01-06 09:14:38.000000000 +0100
+++ tailor-0.9.35/vcpx/repository/hg.py	2009-01-06 09:14:48.000000000 +0100
@@ -13,7 +13,7 @@ instead of thru the command line.
 
 __docformat__ = 'reStructuredText'
 
-from mercurial import ui, hg, cmdutil, commands
+from mercurial import ui, hg, cmdutil, commands, match
 
 from vcpx.repository import Repository
 from vcpx.source import UpdatableSourceWorkingDir
@@ -479,8 +479,11 @@ class HgWorkingDir(UpdatableSourceWorkin
         """
         from os.path import join, split
 
+        m = match.exact(self.repository.basedir,
+                        self.repository.basedir,
+                        [subdir])
         files = []
-        for src, path in self._getRepo().dirstate.walk([subdir]):
+        for path in self._getRepo().dirstate.walk(m, unknown=True, ignored=False):
             # If subdir is a plain file, just return
             if path == subdir:
                 return None



From sharkcz at fedoraproject.org  Tue Jan  6 09:08:25 2009
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Tue,  6 Jan 2009 09:08:25 +0000 (UTC)
Subject: rpms/tailor/F-10 tailor-0.9.35-mercurial-1.1.2-delete.patch, NONE, 
	1.1 tailor.spec, 1.11, 1.12
Message-ID: <20090106090825.ADC3C70125@cvs1.fedora.phx.redhat.com>

Author: sharkcz

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

Modified Files:
	tailor.spec 
Added Files:
	tailor-0.9.35-mercurial-1.1.2-delete.patch 
Log Message:
* Tue Jan  6 2009 Dan Hor??k <dan[at]danny.cz> 0.9.35-4
- add patch for compatibility with mercurial 1.1.2 by Daniel P. Berrange (Resolves: #478841)


tailor-0.9.35-mercurial-1.1.2-delete.patch:

--- NEW FILE tailor-0.9.35-mercurial-1.1.2-delete.patch ---
--- tailor-0.9.35/vcpx/repository/hg.py.hg-1.1.2-delete	2009-01-06 09:14:38.000000000 +0100
+++ tailor-0.9.35/vcpx/repository/hg.py	2009-01-06 09:14:48.000000000 +0100
@@ -13,7 +13,7 @@ instead of thru the command line.
 
 __docformat__ = 'reStructuredText'
 
-from mercurial import ui, hg, cmdutil, commands
+from mercurial import ui, hg, cmdutil, commands, match
 
 from vcpx.repository import Repository
 from vcpx.source import UpdatableSourceWorkingDir
@@ -479,8 +479,11 @@ class HgWorkingDir(UpdatableSourceWorkin
         """
         from os.path import join, split
 
+        m = match.exact(self.repository.basedir,
+                        self.repository.basedir,
+                        [subdir])
         files = []
-        for src, path in self._getRepo().dirstate.walk([subdir]):
+        for path in self._getRepo().dirstate.walk(m, unknown=True, ignored=False):
             # If subdir is a plain file, just return
             if path == subdir:
                 return None


Index: tailor.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tailor/F-10/tailor.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- tailor.spec	19 Dec 2008 12:40:02 -0000	1.11
+++ tailor.spec	6 Jan 2009 09:07:55 -0000	1.12
@@ -3,7 +3,7 @@
 Summary:	A tool to migrate changesets between several version control systems
 Name:		tailor
 Version:	0.9.35
-Release:	3%{?dist}
+Release:	4%{?dist}
 Source0:	http://darcs.arstecnica.it/%{name}-%{version}.tar.gz
 License:	GPLv3+
 Group:		Development/Tools
@@ -13,8 +13,11 @@
 Requires:	python-vcpx = %{version}-%{release}
 BuildArch:	noarch
 Patch0:		tailor-test.patch
+# https://bugzilla.redhat.com/show_bug.cgi?id=477148
 # http://progetti.arstecnica.it/tailor/ticket/172
 Patch1:		tailor-0.9.35-mercurial-1.1-compat.patch
+# https://bugzilla.redhat.com/show_bug.cgi?id=478841
+Patch2:		tailor-0.9.35-mercurial-1.1.2-delete.patch
 
 %description
 Tailor is a tool to migrate changesets between CVS, Subversion, git,
@@ -27,7 +30,8 @@
 %package -n python-vcpx
 Summary:	Version Control Patch eXchanger
 Group:		Development/Libraries
-Requires:	cvs, subversion, mercurial, cogito, tla, bazaar, monotone, git-core
+Requires:	cvs, subversion, cogito, tla, bazaar, monotone, git-core
+Requires:	mercurial >= 1.1.2
 
 %description -n python-vcpx
 This is the package `vcpx` (pronounced "veeseepex").  It encapsulates
@@ -38,7 +42,8 @@
 %prep
 %setup -q 
 %patch0
-%patch1 -p1 -b .hg-1.1
+%patch1 -p1 -b .hg-1.1-compat
+%patch2 -p1 -b .hg-1.1.2-delete
 
 # remove the shebang line
 sed -i -e '1d' vcpx/repository/p4/p4lib.py
@@ -67,6 +72,9 @@
 
 
 %changelog
+* Tue Jan  6 2009 Dan Hor??k <dan[at]danny.cz> 0.9.35-4
+- add patch for compatibility with mercurial 1.1.2 by Daniel P. Berrange (Resolves: #478841)
+
 * Fri Dec 19 2008 Dan Hor??k <dan[at]danny.cz> 0.9.35-3
 - add patch for compatibility with mercurial 1.1 by Daniel P. Berrange (Resolves: #477148)
 



From zprikryl at fedoraproject.org  Tue Jan  6 09:14:50 2009
From: zprikryl at fedoraproject.org (Zdenek Prikryl)
Date: Tue,  6 Jan 2009 09:14:50 +0000 (UTC)
Subject: rpms/gpm/F-10 gpm-1.20.5-close-fds.patch, 1.1, 1.2 gpm.init, 1.18, 
	1.19 gpm.spec, 1.64, 1.65
Message-ID: <20090106091450.A721070108@cvs1.fedora.phx.redhat.com>

Author: zprikryl

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

Modified Files:
	gpm-1.20.5-close-fds.patch gpm.init gpm.spec 
Log Message:
Fixed debug mode (#473422)
Fixed description in init script (#474337)


gpm-1.20.5-close-fds.patch:

Index: gpm-1.20.5-close-fds.patch
===================================================================
RCS file: /cvs/extras/rpms/gpm/F-10/gpm-1.20.5-close-fds.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gpm-1.20.5-close-fds.patch	17 Jul 2008 09:46:43 -0000	1.1
+++ gpm-1.20.5-close-fds.patch	6 Jan 2009 09:14:20 -0000	1.2
@@ -1,13 +1,16 @@
---- gpm-1.20.5/src/daemon/startup.c.close-fds	2008-07-17 11:39:55.000000000 +0200
-+++ gpm-1.20.5/src/daemon/startup.c	2008-07-17 11:40:20.000000000 +0200
-@@ -135,6 +135,11 @@ void startup(int argc, char **argv)
+diff -up gpm-1.20.5/src/daemon/startup.c.close-fds gpm-1.20.5/src/daemon/startup.c
+--- gpm-1.20.5/src/daemon/startup.c.close-fds	2008-06-13 10:08:19.000000000 +0200
++++ gpm-1.20.5/src/daemon/startup.c	2008-12-02 10:11:12.000000000 +0100
+@@ -135,6 +135,13 @@ void startup(int argc, char **argv)
     check_uniqueness();
     gpm_report(GPM_PR_INFO,GPM_MESS_STARTED);
  
 +   // close extra fds
-+   close(0);
-+   close(1);
-+   close(2);
++   if (option.run_status == GPM_RUN_STARTUP ) {
++       close(0);
++       close(1);
++       close(2);
++   }
 +
     //return mouse_table[1].fd; /* the second is handled in the main() */
  


Index: gpm.init
===================================================================
RCS file: /cvs/extras/rpms/gpm/F-10/gpm.init,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- gpm.init	4 Jun 2008 12:06:10 -0000	1.18
+++ gpm.init	6 Jan 2009 09:14:20 -0000	1.19
@@ -16,9 +16,9 @@
 # Default-Start:  2 3 4 5
 # Default-Stop: 0 1 6
 # Short-Description: Start and stop gpm daemon
-# Description: GPM adds mouse support to text-based Linux applications such \
-#              as the Midnight Commander. It also allows mouse-based console \
-#              cut-and-paste operations, and includes support for pop-up \
+# Description: GPM adds mouse support to text-based Linux applications such
+#              as the Midnight Commander. It also allows mouse-based console
+#              cut-and-paste operations, and includes support for pop-up
 #              menus on the console.
 ### END INIT INFO
 


Index: gpm.spec
===================================================================
RCS file: /cvs/extras/rpms/gpm/F-10/gpm.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- gpm.spec	17 Jul 2008 10:23:47 -0000	1.64
+++ gpm.spec	6 Jan 2009 09:14:20 -0000	1.65
@@ -1,7 +1,7 @@
 Summary: A mouse server for the Linux console.
 Name: gpm
 Version: 1.20.5
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Group: System Environment/Daemons
 URL: http://unix.schottelius.org/gpm/
@@ -129,6 +129,10 @@
 %{_libdir}/libgpm.so
 
 %changelog
+* Tue Dec 02 2008 Zdenek Prikryl <zprikryl at redhat.com> - 1.20.5-2
+- Fixed debug mode (#473422)
+- Fixed description in init script (#474337)
+
 * Thu Jul 17 2008 Zdenek Prikryl <zprikryl at redhat.com> - 1.20.5-1
 - Updated to 1.20.5
 - Removed doc patch



From sharkcz at fedoraproject.org  Tue Jan  6 09:16:37 2009
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Tue,  6 Jan 2009 09:16:37 +0000 (UTC)
Subject: rpms/tailor/F-9 tailor-0.9.35-mercurial-1.1.2-delete.patch, NONE,
	1.1 tailor.spec, 1.11, 1.12
Message-ID: <20090106091637.CFB8E70108@cvs1.fedora.phx.redhat.com>

Author: sharkcz

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

Modified Files:
	tailor.spec 
Added Files:
	tailor-0.9.35-mercurial-1.1.2-delete.patch 
Log Message:
* Tue Jan  6 2009 Dan Hor??k <dan[at]danny.cz> 0.9.35-4
- add patch for compatibility with mercurial 1.1.2 by Daniel P. Berrange (Resolves: #478841)


tailor-0.9.35-mercurial-1.1.2-delete.patch:

--- NEW FILE tailor-0.9.35-mercurial-1.1.2-delete.patch ---
--- tailor-0.9.35/vcpx/repository/hg.py.hg-1.1.2-delete	2009-01-06 09:14:38.000000000 +0100
+++ tailor-0.9.35/vcpx/repository/hg.py	2009-01-06 09:14:48.000000000 +0100
@@ -13,7 +13,7 @@ instead of thru the command line.
 
 __docformat__ = 'reStructuredText'
 
-from mercurial import ui, hg, cmdutil, commands
+from mercurial import ui, hg, cmdutil, commands, match
 
 from vcpx.repository import Repository
 from vcpx.source import UpdatableSourceWorkingDir
@@ -479,8 +479,11 @@ class HgWorkingDir(UpdatableSourceWorkin
         """
         from os.path import join, split
 
+        m = match.exact(self.repository.basedir,
+                        self.repository.basedir,
+                        [subdir])
         files = []
-        for src, path in self._getRepo().dirstate.walk([subdir]):
+        for path in self._getRepo().dirstate.walk(m, unknown=True, ignored=False):
             # If subdir is a plain file, just return
             if path == subdir:
                 return None


Index: tailor.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tailor/F-9/tailor.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- tailor.spec	19 Dec 2008 12:41:52 -0000	1.11
+++ tailor.spec	6 Jan 2009 09:16:07 -0000	1.12
@@ -3,7 +3,7 @@
 Summary:	A tool to migrate changesets between several version control systems
 Name:		tailor
 Version:	0.9.35
-Release:	3%{?dist}
+Release:	4%{?dist}
 Source0:	http://darcs.arstecnica.it/%{name}-%{version}.tar.gz
 License:	GPLv3+
 Group:		Development/Tools
@@ -13,8 +13,11 @@
 Requires:	python-vcpx = %{version}-%{release}
 BuildArch:	noarch
 Patch0:		tailor-test.patch
+# https://bugzilla.redhat.com/show_bug.cgi?id=477148
 # http://progetti.arstecnica.it/tailor/ticket/172
 Patch1:		tailor-0.9.35-mercurial-1.1-compat.patch
+# https://bugzilla.redhat.com/show_bug.cgi?id=478841
+Patch2:		tailor-0.9.35-mercurial-1.1.2-delete.patch
 
 %description
 Tailor is a tool to migrate changesets between CVS, Subversion, git,
@@ -27,7 +30,8 @@
 %package -n python-vcpx
 Summary:	Version Control Patch eXchanger
 Group:		Development/Libraries
-Requires:	cvs, subversion, mercurial, cogito, tla, bazaar, monotone, git-core
+Requires:	cvs, subversion, cogito, tla, bazaar, monotone, git-core
+Requires:	mercurial >= 1.1.2
 
 %description -n python-vcpx
 This is the package `vcpx` (pronounced "veeseepex").  It encapsulates
@@ -38,7 +42,8 @@
 %prep
 %setup -q 
 %patch0
-%patch1 -p1 -b .hg-1.1
+%patch1 -p1 -b .hg-1.1-compat
+%patch2 -p1 -b .hg-1.1.2-delete
 
 # remove the shebang line
 sed -i -e '1d' vcpx/repository/p4/p4lib.py
@@ -67,6 +72,9 @@
 
 
 %changelog
+* Tue Jan  6 2009 Dan Hor??k <dan[at]danny.cz> 0.9.35-4
+- add patch for compatibility with mercurial 1.1.2 by Daniel P. Berrange (Resolves: #478841)
+
 * Fri Dec 19 2008 Dan Hor??k <dan[at]danny.cz> 0.9.35-3
 - add patch for compatibility with mercurial 1.1 by Daniel P. Berrange (Resolves: #477148)
 



From jreznik at fedoraproject.org  Tue Jan  6 09:24:23 2009
From: jreznik at fedoraproject.org (Jaroslav Reznik)
Date: Tue,  6 Jan 2009 09:24:23 +0000 (UTC)
Subject: rpms/solar-kde-theme/F-10 .cvsignore, 1.13,
	1.14 solar-kde-theme.spec, 1.20, 1.21 sources, 1.14, 1.15
Message-ID: <20090106092423.06F5E70108@cvs1.fedora.phx.redhat.com>

Author: jreznik

Update of /cvs/pkgs/rpms/solar-kde-theme/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12001

Modified Files:
	.cvsignore solar-kde-theme.spec sources 
Log Message:
* Tue Jan 06 2009 Jaroslav Reznik <jreznik at redhat.com> 0.1.17-1
- screenshot resized to 200x150 px
- kdm theme authors are more compact



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/solar-kde-theme/F-10/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	10 Nov 2008 09:34:37 -0000	1.13
+++ .cvsignore	6 Jan 2009 09:23:52 -0000	1.14
@@ -1,3 +1 @@
-solar-kde-theme-0.1.14.tar.bz2
-solar-kde-theme-0.1.15.tar.bz2
-solar-kde-theme-0.1.16.tar.bz2
+solar-kde-theme-0.1.17.tar.bz2


Index: solar-kde-theme.spec
===================================================================
RCS file: /cvs/pkgs/rpms/solar-kde-theme/F-10/solar-kde-theme.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- solar-kde-theme.spec	13 Nov 2008 14:27:02 -0000	1.20
+++ solar-kde-theme.spec	6 Jan 2009 09:23:52 -0000	1.21
@@ -1,6 +1,6 @@
 Name:		solar-kde-theme
-Version:	0.1.16
-Release:	2%{?dist}
+Version:	0.1.17
+Release:	1%{?dist}
 Summary:	Solar KDE Theme
 
 Group:		User Interface/Desktops
@@ -13,7 +13,7 @@
 BuildRequires:	kde-filesystem
 Requires:	kde-filesystem
 Requires:	system-logos >= 10.0.0-2
-Requires:       solar-backgrounds-common >= 0.91.0
+Requires:	solar-backgrounds-common >= 0.91.0
 
 
 %description
@@ -141,6 +141,10 @@
 
 
 %changelog
+* Tue Jan 06 2009 Jaroslav Reznik <jreznik at redhat.com> 0.1.17-1
+- screenshot resized to 200x150 px
+- kdm theme authors are more compact 
+
 * Thu Nov 13 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 0.1.16-2
 - list 1920x1080, 1366x768 and 1280x720 (16:9/HDTV) as widescreen
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/solar-kde-theme/F-10/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	10 Nov 2008 09:34:37 -0000	1.14
+++ sources	6 Jan 2009 09:23:52 -0000	1.15
@@ -1 +1 @@
-674e0ba5ab559f8286bb73a6fd6856a9  solar-kde-theme-0.1.16.tar.bz2
+e89238d581fd91bc103f4f6b98a62845  solar-kde-theme-0.1.17.tar.bz2



From scop at fedoraproject.org  Tue Jan  6 09:24:24 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Tue,  6 Jan 2009 09:24:24 +0000 (UTC)
Subject: rpms/vdr-ttxtsubs/devel .cvsignore, 1.4, 1.5 sources, 1.5,
	1.6 vdr-ttxtsubs.spec, 1.8, 1.9
Message-ID: <20090106092424.BC66570108@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/vdr-ttxtsubs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12090

Modified Files:
	.cvsignore sources vdr-ttxtsubs.spec 
Log Message:
* Tue Jan  6 2009 Ville Skytt?? <ville.skytta at iki.fi> - 0.0.8-1
- 0.0.8.
- License: GPLv2+ (already since 0.0.6).



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/vdr-ttxtsubs/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	18 Dec 2008 22:10:49 -0000	1.4
+++ .cvsignore	6 Jan 2009 09:23:54 -0000	1.5
@@ -1 +1 @@
-vdr-ttxtsubs-0.0.7.tar.gz
+vdr-ttxtsubs-0.0.8.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/vdr-ttxtsubs/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	18 Dec 2008 22:10:49 -0000	1.5
+++ sources	6 Jan 2009 09:23:54 -0000	1.6
@@ -1 +1 @@
-b2b342f5a83336ebd20c5bc70e84116a  vdr-ttxtsubs-0.0.7.tar.gz
+d16339e23e427a941828eb58c55977d9  vdr-ttxtsubs-0.0.8.tar.gz


Index: vdr-ttxtsubs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vdr-ttxtsubs/devel/vdr-ttxtsubs.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- vdr-ttxtsubs.spec	18 Dec 2008 22:10:49 -0000	1.8
+++ vdr-ttxtsubs.spec	6 Jan 2009 09:23:54 -0000	1.9
@@ -5,14 +5,14 @@
 %define apiver    %(vdr-config --apiversion 2>/dev/null || echo ERROR)
 
 Name:           vdr-%{pname}
-Version:        0.0.7
+Version:        0.0.8
 Release:        1%{?dist}
 Summary:        Teletext subtitles plugin for VDR
 
 Group:          Applications/Multimedia
-License:        GPL+
+License:        GPLv2+
 URL:            http://projects.vdr-developer.org/projects/show/plg-ttxtsubs
-Source0:        http://projects.vdr-developer.org/attachments/download/15/%{name}-%{version}.tar.gz
+Source0:        http://projects.vdr-developer.org/attachments/download/39/%{name}-%{version}.tar.gz
 Source1:        %{name}.conf
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -69,6 +69,10 @@
 
 
 %changelog
+* Tue Jan  6 2009 Ville Skytt?? <ville.skytta at iki.fi> - 0.0.8-1
+- 0.0.8.
+- License: GPLv2+ (already since 0.0.6).
+
 * Fri Dec 19 2008 Ville Skytt?? <ville.skytta at iki.fi> - 0.0.7-1
 - 0.0.7.
 



From pravins at fedoraproject.org  Tue Jan  6 09:31:10 2009
From: pravins at fedoraproject.org (Pravin Satpute)
Date: Tue,  6 Jan 2009 09:31:10 +0000 (UTC)
Subject: rpms/smc-fonts/devel smc-fonts.spec,1.2,1.3
Message-ID: <20090106093110.2B1ED70108@cvs1.fedora.phx.redhat.com>

Author: pravins

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

Modified Files:
	smc-fonts.spec 
Log Message:
* Tue Jan 06 2009 Pravin Satpute <psatpute at redhat.com> 04.1-2
- bugfix 477458
- updated spec



Index: smc-fonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/smc-fonts/devel/smc-fonts.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- smc-fonts.spec	29 Jul 2008 09:14:48 -0000	1.2
+++ smc-fonts.spec	6 Jan 2009 09:30:39 -0000	1.3
@@ -1,25 +1,38 @@
-%define fontname smc
-%define fontdir %{_datadir}/fonts/%{fontname}
-%define fontconfdir %{_sysconfdir}/fonts/conf.d
+%define	fontname	smc
+%define	fontconf	90-%{fontname}
+
+# Common description
+%define common_desc \
+The smc-fonts package contains fonts for the display of\
+traditional and new Malayalam Script.
 
 Name:	%{fontname}-fonts
 Version:	04.1
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Open Type Fonts for Malayalam script
 Group:	User Interface/X
 License:	GPLv3+ with exceptions and GPLv2+ with exceptions and GPLv2+ and  GPLv2
 URL:	http://savannah.nongnu.org/projects/smc
 Source:	http://download.savannah.nongnu.org/releases/smc/fonts/malayalam-fonts-%{version}.zip
 BuildArch:	noarch
+BuildRequires: fontpackages-devel
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
-The smc-fonts package contains fonts for the display of
-traditional and new Malayalam Script.
+%common_desc
+
+%package common
+Summary:  Common files for smc-fonts
+Group:  User Interface/X
+Requires: fontpackages-filesystem
+
+%description common
+%common_desc
 
 %package dyuthi
 Summary: Open Type Fonts for Malayalam script
 Group: User Interface/X 
+Requires: %{name}-common = %{version}-%{release}
 License: GPLv3+ with exceptions
 %description dyuthi
 The smc-fonts-dyuthi package contains fonts for the display of
@@ -28,6 +41,7 @@
 %package meera 
 Summary: Open Type Fonts for Malayalam script
 Group: User Interface/X 
+Requires: %{name}-common = %{version}-%{release}
 License: GPLv2+ with exceptions
 %description meera
 The smc-fonts-meera package contains fonts for the display of
@@ -37,6 +51,7 @@
 %package rachana 
 Summary: Open Type Fonts for Malayalam script
 Group: User Interface/X 
+Requires: %{name}-common = %{version}-%{release}
 License: GPLv2+
 %description rachana
 The smc-fonts-rachana package contains fonts for the display of
@@ -46,6 +61,7 @@
 %package raghumalayalam
 Summary: Open Type Fonts for Malayalam script
 Group: User Interface/X 
+Requires: %{name}-common = %{version}-%{release}
 License: GPLv2
 %description raghumalayalam
 The smc-fonts-malayalam package contains fonts for the display of
@@ -54,6 +70,7 @@
 %package suruma
 Summary: Open Type Fonts for Malayalam script
 Group: User Interface/X 
+Requires: %{name}-common = %{version}-%{release}
 License: GPLv3+ with exceptions
 %description suruma
 The smc-fonts-suruma package contains fonts for the display of
@@ -62,6 +79,7 @@
 %package kalyani
 Summary: Open Type Fonts for Malayalam script
 Group: User Interface/X
+Requires: %{name}-common = %{version}-%{release}
 License: GPLv3+ with exceptions
 %description kalyani
 The smc-fonts-suruma package contains fonts for the display of
@@ -70,11 +88,27 @@
 %package anjalioldlipi
 Summary: Open Type Fonts for Malayalam script
 Group: User Interface/X
+Requires: %{name}-common = %{version}-%{release}
 License: GPLv3+ with exceptions
 %description anjalioldlipi
 The smc-fonts-suruma package contains fonts for the display of
 traditional Malayalam Scripts.
 
+#%{_fontdir} is shared by following packages since they all are for malayalam script only
+%_font_pkg -n dyuthi Dyuthi*.ttf 
+
+%_font_pkg -n meera -f 90-%{fontname}-fonts.conf Meera*.ttf 
+
+%_font_pkg -n rachana Rachana*.ttf
+
+%_font_pkg -n raghumalayalam RaghuMalayalamSans*.ttf
+
+%_font_pkg -n suruma suruma*.ttf
+
+%_font_pkg -n kalyani Kalyani*.ttf
+
+%_font_pkg -n anjalioldlipi AnjaliOldLipi.ttf
+
 %prep
 %setup -q -n malayalam-fonts-04
 
@@ -82,145 +116,31 @@
 echo "Nothing to do in Build."
 
 %install
-
 rm -rf %{buildroot}
-install -m 0755 -d %{buildroot}%{fontdir}
-install -m 0644 -p *.ttf  %{buildroot}%{fontdir}
-install -m 0755 -d %{buildroot}%{fontconfdir} 
-install -m 0644 -p $RPM_BUILD_DIR/malayalam-fonts-04/malayalam-fonts.conf %{buildroot}%{fontconfdir}/90-%{fontname}.conf
+install -m 0755 -d %{buildroot}%{_fontdir}
+install -m 0644 -p *.ttf  %{buildroot}%{_fontdir}
+install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} \
+		%{buildroot}%{_fontconfig_confdir}
+install -m 0644 -p $RPM_BUILD_DIR/malayalam-fonts-04/malayalam-fonts.conf %{buildroot}%{_fontconfig_templatedir}/%{fontconf}-fonts.conf
+for fconf in %{fontconf}-fonts.conf ; do
+  ln -s %{_fontconfig_templatedir}/$fconf \
+	%{buildroot}%{_fontconfig_confdir}/$fconf
+done
 
 %clean
 rm -fr %{buildroot}
 
-%post  dyuthi
-if [ -x %{_bindir}/fc-cache ]; then
-%{_bindir}/fc-cache -f %{fontdir} || :
-fi
-
-%post  meera
-if [ -x %{_bindir}/fc-cache ]; then
-%{_bindir}/fc-cache -f %{fontdir} || :
-fi
-
-%post  rachana
-if [ -x %{_bindir}/fc-cache ]; then
-%{_bindir}/fc-cache -f %{fontdir} || :
-fi
-
-%post  raghumalayalam
-if [ -x %{_bindir}/fc-cache ]; then
-%{_bindir}/fc-cache -f %{fontdir} || :
-fi	
-
-%post  suruma
-if [ -x %{_bindir}/fc-cache ]; then
-%{_bindir}/fc-cache -f %{fontdir} || :
-fi
-
-%post  kalyani
-if [ -x %{_bindir}/fc-cache ]; then
-%{_bindir}/fc-cache -f %{fontdir} || :
-fi
-
-%post  anjalioldlipi
-if [ -x %{_bindir}/fc-cache ]; then
-%{_bindir}/fc-cache -f %{fontdir} || :
-fi
-
-%postun dyuthi
-if [ "$1" = "0" ]; then
-	if [ -x %{_bindir}/fc-cache ]; then
-%{_bindir}/fc-cache -f %{fontdir} || :
-	fi
-fi
-
-%postun meera
-if [ "$1" = "0" ]; then
-	if [ -x %{_bindir}/fc-cache ]; then
-%{_bindir}/fc-cache -f %{fontdir} || :
-	fi
-fi
-
-%postun rachana
-if [ "$1" = "0" ]; then
-	if [ -x %{_bindir}/fc-cache ]; then
-%{_bindir}/fc-cache -f %{fontdir} || :
-	fi
-fi
-
-%postun raghumalayalam
-if [ "$1" = "0" ]; then
-	if [ -x %{_bindir}/fc-cache ]; then
-%{_bindir}/fc-cache -f %{fontdir} || :
-	fi
-fi
-
-%postun suruma
-if [ "$1" = "0" ]; then
-	if [ -x %{_bindir}/fc-cache ]; then
-%{_bindir}/fc-cache -f %{fontdir} || :
-	fi
-fi
-
-%postun kalyani
-if [ "$1" = "0" ]; then
-	if [ -x %{_bindir}/fc-cache ]; then
-%{_bindir}/fc-cache -f %{fontdir} || :
-	fi
-fi
-
-%postun anjalioldlipi
-if [ "$1" = "0" ]; then
-	if [ -x %{_bindir}/fc-cache ]; then
-%{_bindir}/fc-cache -f %{fontdir} || :
-	fi
-fi
 
-#%{fontdir} is shared by following packages since they all are for malayalam script only
-%files dyuthi
+%files common
 %defattr(-,root,root,-) 
 %doc *.txt 
-%dir %{fontdir}
-%{fontdir}/Dyuthi*.ttf 
-
-%files meera
-%defattr(-,root,root,-) 
-%doc *.txt 
-%config(noreplace) %{fontconfdir}/90-%{fontname}.conf 
-%dir %{fontdir}
-%{fontdir}/Meera*.ttf 
-
-%files rachana
-%defattr(-,root,root,-) 
-%doc *.txt 
-%dir %{fontdir}
-%{fontdir}/Rachana*.ttf 
-
-%files raghumalayalam
-%defattr(-,root,root,-) 
-%doc *.txt 
-%dir %{fontdir}
-%{fontdir}/RaghuMalayalamSans*.ttf 
-
-%files suruma
-%defattr(-,root,root,-) 
-%doc *.txt 
-%dir %{fontdir}
-%{fontdir}/suruma*.ttf 
-
-%files kalyani
-%defattr(-,root,root,-)
-%doc *.txt
-%dir %{fontdir}
-%{fontdir}/Kalyani*.ttf
-
-%files anjalioldlipi
-%defattr(-,root,root,-)
-%doc *.txt
-%dir %{fontdir}
-%{fontdir}/AnjaliOldLipi.ttf
+%dir %{_fontdir}
 
 %changelog
+* Tue Jan 06 2009 Pravin Satpute <psatpute at redhat.com> 04.1-2
+- bugfix 477458
+- updated spec
+
 * Tue Jul 29 2008 Pravin Satpute <psatpute at redhat.com> 04.1-1
 - new upstream release
 - fontconfig rule for size adjustment of Meera is added



From jreznik at fedoraproject.org  Tue Jan  6 09:37:31 2009
From: jreznik at fedoraproject.org (Jaroslav Reznik)
Date: Tue,  6 Jan 2009 09:37:31 +0000 (UTC)
Subject: rpms/solar-kde-theme/devel .cvsignore, 1.13,
	1.14 solar-kde-theme.spec, 1.19, 1.20 sources, 1.14, 1.15
Message-ID: <20090106093731.BBC2270108@cvs1.fedora.phx.redhat.com>

Author: jreznik

Update of /cvs/pkgs/rpms/solar-kde-theme/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16514

Modified Files:
	.cvsignore solar-kde-theme.spec sources 
Log Message:
* Tue Jan 06 2009 Jaroslav Reznik <jreznik at redhat.com> 0.1.17-1
- screenshot resized to 200x150 px
- kdm theme authors are more compact



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/solar-kde-theme/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	13 Nov 2008 14:24:33 -0000	1.13
+++ .cvsignore	6 Jan 2009 09:37:00 -0000	1.14
@@ -1,3 +1 @@
-solar-kde-theme-0.1.14.tar.bz2
-solar-kde-theme-0.1.15.tar.bz2
-solar-kde-theme-0.1.16.tar.bz2
+solar-kde-theme-0.1.17.tar.bz2


Index: solar-kde-theme.spec
===================================================================
RCS file: /cvs/pkgs/rpms/solar-kde-theme/devel/solar-kde-theme.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- solar-kde-theme.spec	13 Nov 2008 14:27:02 -0000	1.19
+++ solar-kde-theme.spec	6 Jan 2009 09:37:01 -0000	1.20
@@ -1,6 +1,6 @@
 Name:		solar-kde-theme
-Version:	0.1.16
-Release:	2%{?dist}
+Version:	0.1.17
+Release:	1%{?dist}
 Summary:	Solar KDE Theme
 
 Group:		User Interface/Desktops
@@ -13,7 +13,7 @@
 BuildRequires:	kde-filesystem
 Requires:	kde-filesystem
 Requires:	system-logos >= 10.0.0-2
-Requires:       solar-backgrounds-common >= 0.91.0
+Requires:	solar-backgrounds-common >= 0.91.0
 
 
 %description
@@ -141,6 +141,10 @@
 
 
 %changelog
+* Tue Jan 06 2009 Jaroslav Reznik <jreznik at redhat.com> 0.1.17-1
+- screenshot resized to 200x150 px
+- kdm theme authors are more compact 
+
 * Thu Nov 13 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 0.1.16-2
 - list 1920x1080, 1366x768 and 1280x720 (16:9/HDTV) as widescreen
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/solar-kde-theme/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	13 Nov 2008 14:24:33 -0000	1.14
+++ sources	6 Jan 2009 09:37:01 -0000	1.15
@@ -1 +1 @@
-674e0ba5ab559f8286bb73a6fd6856a9  solar-kde-theme-0.1.16.tar.bz2
+e89238d581fd91bc103f4f6b98a62845  solar-kde-theme-0.1.17.tar.bz2



From tbzatek at fedoraproject.org  Tue Jan  6 09:53:24 2009
From: tbzatek at fedoraproject.org (Tomas Bzatek)
Date: Tue,  6 Jan 2009 09:53:24 +0000 (UTC)
Subject: rpms/gnome-keyring/devel .cvsignore, 1.53, 1.54 gnome-keyring.spec, 
	1.105, 1.106 sources, 1.53, 1.54
Message-ID: <20090106095324.D3C9670108@cvs1.fedora.phx.redhat.com>

Author: tbzatek

Update of /cvs/extras/rpms/gnome-keyring/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23440

Modified Files:
	.cvsignore gnome-keyring.spec sources 
Log Message:
* Tue Jan  6 2009 Tomas Bzatek <tbzatek at redhat.com> - 2.25.4.1-1
- Update to 2.25.4.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-keyring/devel/.cvsignore,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- .cvsignore	5 Jan 2009 14:22:02 -0000	1.53
+++ .cvsignore	6 Jan 2009 09:52:54 -0000	1.54
@@ -1 +1 @@
-gnome-keyring-2.25.4.tar.bz2
+gnome-keyring-2.25.4.1.tar.bz2


Index: gnome-keyring.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-keyring/devel/gnome-keyring.spec,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -r1.105 -r1.106
--- gnome-keyring.spec	5 Jan 2009 14:22:02 -0000	1.105
+++ gnome-keyring.spec	6 Jan 2009 09:52:54 -0000	1.106
@@ -7,7 +7,7 @@
 
 Summary: Framework for managing passwords and other secrets
 Name: gnome-keyring
-Version: 2.25.4
+Version: 2.25.4.1
 Release: 1%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Libraries
@@ -133,6 +133,9 @@
 
 
 %changelog
+* Tue Jan  6 2009 Tomas Bzatek <tbzatek at redhat.com> - 2.25.4.1-1
+- Update to 2.25.4.1
+
 * Mon Jan  5 2009 Tomas Bzatek <tbzatek at redhat.com> - 2.25.4-1
 - Update to 2.25.4
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-keyring/devel/sources,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- sources	5 Jan 2009 14:22:02 -0000	1.53
+++ sources	6 Jan 2009 09:52:54 -0000	1.54
@@ -1 +1 @@
-801b581f3ca0a4554ceac774eaa60f1d  gnome-keyring-2.25.4.tar.bz2
+9bf68b3f3a261038962896c9c040882f  gnome-keyring-2.25.4.1.tar.bz2



From lkundrak at fedoraproject.org  Tue Jan  6 10:04:02 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Tue,  6 Jan 2009 10:04:02 +0000 (UTC)
Subject: rpms/libwpd/devel libwpd.spec,1.43,1.44
Message-ID: <20090106100402.61FCE70108@cvs1.fedora.phx.redhat.com>

Author: lkundrak

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

Modified Files:
	libwpd.spec 
Log Message:
* Tue Jan 06 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.8.14-2
- Rebuild for provides



Index: libwpd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libwpd/devel/libwpd.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- libwpd.spec	13 Feb 2008 10:47:45 -0000	1.43
+++ libwpd.spec	6 Jan 2009 10:03:31 -0000	1.44
@@ -1,7 +1,7 @@
 Name: libwpd
 Summary: Library for reading and converting WordPerfect(tm) documents
 Version: 0.8.14
-Release: 1%{?dist}
+Release: 2%{?dist}
 Source: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 Group: System Environment/Libraries
 URL: http://libwpd.sf.net/
@@ -65,6 +65,9 @@
 %{_includedir}/libwpd-0.8/libwpd/
 
 %changelog
+* Tue Jan 06 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.8.14-2
+- Rebuild for provides
+
 * Wed Feb 13 2008 Caolan McNamara <caolanm at redhat.com> - 0.8.14-1
 - next version
 



From thias at fedoraproject.org  Tue Jan  6 10:08:38 2009
From: thias at fedoraproject.org (Matthias Saou)
Date: Tue,  6 Jan 2009 10:08:38 +0000 (UTC)
Subject: rpms/proftpd/F-10 proftpd.pam,1.2,1.3
Message-ID: <20090106100838.9695670108@cvs1.fedora.phx.redhat.com>

Author: thias

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

Modified Files:
	proftpd.pam 
Log Message:
Add comment to help work around PAM issue with chrooted users (#477120).



Index: proftpd.pam
===================================================================
RCS file: /cvs/extras/rpms/proftpd/F-10/proftpd.pam,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- proftpd.pam	15 Jun 2007 15:52:28 -0000	1.2
+++ proftpd.pam	6 Jan 2009 10:08:08 -0000	1.3
@@ -4,5 +4,6 @@
 auth       required	pam_shells.so
 auth       include      system-auth
 account    include      system-auth
+# Comment the following line if you are having PAM issues with chrooted users
 session    include      system-auth
 session    required     pam_loginuid.so



From thias at fedoraproject.org  Tue Jan  6 10:08:38 2009
From: thias at fedoraproject.org (Matthias Saou)
Date: Tue,  6 Jan 2009 10:08:38 +0000 (UTC)
Subject: rpms/proftpd/F-9 proftpd.pam,1.2,1.3
Message-ID: <20090106100838.EBFC570108@cvs1.fedora.phx.redhat.com>

Author: thias

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

Modified Files:
	proftpd.pam 
Log Message:
Add comment to help work around PAM issue with chrooted users (#477120).



Index: proftpd.pam
===================================================================
RCS file: /cvs/extras/rpms/proftpd/F-9/proftpd.pam,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- proftpd.pam	15 Jun 2007 15:52:28 -0000	1.2
+++ proftpd.pam	6 Jan 2009 10:08:08 -0000	1.3
@@ -4,5 +4,6 @@
 auth       required	pam_shells.so
 auth       include      system-auth
 account    include      system-auth
+# Comment the following line if you are having PAM issues with chrooted users
 session    include      system-auth
 session    required     pam_loginuid.so



From thias at fedoraproject.org  Tue Jan  6 10:08:39 2009
From: thias at fedoraproject.org (Matthias Saou)
Date: Tue,  6 Jan 2009 10:08:39 +0000 (UTC)
Subject: rpms/proftpd/devel proftpd.pam,1.2,1.3
Message-ID: <20090106100839.3C18F70108@cvs1.fedora.phx.redhat.com>

Author: thias

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

Modified Files:
	proftpd.pam 
Log Message:
Add comment to help work around PAM issue with chrooted users (#477120).



Index: proftpd.pam
===================================================================
RCS file: /cvs/extras/rpms/proftpd/devel/proftpd.pam,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- proftpd.pam	15 Jun 2007 15:52:28 -0000	1.2
+++ proftpd.pam	6 Jan 2009 10:08:09 -0000	1.3
@@ -4,5 +4,6 @@
 auth       required	pam_shells.so
 auth       include      system-auth
 account    include      system-auth
+# Comment the following line if you are having PAM issues with chrooted users
 session    include      system-auth
 session    required     pam_loginuid.so



From hadess at fedoraproject.org  Tue Jan  6 10:16:17 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Tue,  6 Jan 2009 10:16:17 +0000 (UTC)
Subject: rpms/totem/devel totem.spec,1.214,1.215
Message-ID: <20090106101617.9276470140@cvs1.fedora.phx.redhat.com>

Author: hadess

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

Modified Files:
	totem.spec 
Log Message:
Really exclude built python scripts



Index: totem.spec
===================================================================
RCS file: /cvs/pkgs/rpms/totem/devel/totem.spec,v
retrieving revision 1.214
retrieving revision 1.215
diff -u -r1.214 -r1.215
--- totem.spec	5 Jan 2009 23:19:07 -0000	1.214
+++ totem.spec	6 Jan 2009 10:15:46 -0000	1.215
@@ -268,8 +268,7 @@
  $RPM_BUILD_ROOT%{_libdir}/nautilus/extensions-2.0/*.{a,la} \
  $RPM_BUILD_ROOT%{_libdir}/libbaconvideowidget*.{a,la} \
  $RPM_BUILD_ROOT%{_libdir}/libbaconvideowidget.so \
- $RPM_BUILD_ROOT%{_libdir}/totem/plugins/bemused/ \
- $RPM_BUILD_ROOT%{_libexecdir}/totem/totem-bugreport.py[co]
+ $RPM_BUILD_ROOT%{_libdir}/totem/plugins/bemused/
 
 %find_lang %{name} --with-gnome
 
@@ -392,6 +391,7 @@
 %{_datadir}/%{name}/
 %dir %{_libexecdir}/totem
 %{_libexecdir}/totem/totem-bugreport.py
+%exclude %{_libexecdir}/totem/totem-bugreport.py[co]
 %{_libdir}/libbaconvideowidget.so*
 %dir %{_libdir}/totem/plugins
 %{_libdir}/totem/plugins/gromit



From gd at fedoraproject.org  Tue Jan  6 11:41:03 2009
From: gd at fedoraproject.org (Guenther Deschner)
Date: Tue,  6 Jan 2009 11:41:03 +0000 (UTC)
Subject: rpms/samba/F-9 .cvsignore, 1.55, 1.56 samba.spec, 1.164,
	1.165 sources, 1.59, 1.60 samba-3.2.4-build.patch, 1.1, NONE
Message-ID: <20090106114103.C2FA370108@cvs1.fedora.phx.redhat.com>

Author: gd

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

Modified Files:
	.cvsignore samba.spec sources 
Removed Files:
	samba-3.2.4-build.patch 
Log Message:
Update to 3.2.7 (Security fix for CVE-2009-0022)

Guenther



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/samba/F-9/.cvsignore,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- .cvsignore	27 Nov 2008 12:37:05 -0000	1.55
+++ .cvsignore	6 Jan 2009 11:40:31 -0000	1.56
@@ -1 +1 @@
-samba-3.2.5.tar.gz
+samba-3.2.7.tar.gz


Index: samba.spec
===================================================================
RCS file: /cvs/pkgs/rpms/samba/F-9/samba.spec,v
retrieving revision 1.164
retrieving revision 1.165
diff -u -r1.164 -r1.165
--- samba.spec	27 Nov 2008 12:37:05 -0000	1.164
+++ samba.spec	6 Jan 2009 11:40:31 -0000	1.165
@@ -1,5 +1,5 @@
-%define main_release 22
-%define samba_version 3.2.5
+%define main_release 23
+%define samba_version 3.2.7
 %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.5
+Version: 3.2.7
 Release: %{samba_release}
 License: GPLv3+ and LGPLv3+
 Group: System Environment/Daemons
@@ -46,7 +46,6 @@
 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
@@ -253,7 +252,6 @@
 #%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
@@ -325,10 +323,6 @@
 make  CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE" \
 	debug2html smbfilter bin/cifs.upcall
 
-( cd client ; gcc -o mount.cifs $RPM_OPT_FLAGS -Wall -O -D_GNU_SOURCE -D_LARGEFILE64_SOURCE mount.cifs.c )
-( cd client ; gcc -o umount.cifs $RPM_OPT_FLAGS -Wall -O -D_GNU_SOURCE -D_LARGEFILE64_SOURCE umount.cifs.c )
-
-
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -430,8 +424,8 @@
 
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig
 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 $RPM_BUILD_ROOT/usr/sbin/mount.cifs $RPM_BUILD_ROOT/sbin/mount.cifs
+install -m755 $RPM_BUILD_ROOT/usr/sbin/umount.cifs $RPM_BUILD_ROOT/sbin/umount.cifs
 
 install -m 755 source/lib/netapi/examples/bin/netdomjoin-gui $RPM_BUILD_ROOT/%{_sbindir}/netdomjoin-gui
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps/%{name}
@@ -830,6 +824,9 @@
 %{_datadir}/pixmaps/samba/logo-small.png
 
 %changelog
+* Mon Jan  5 2009 Guenther Deschner <gdeschner at redhat.com> - 3.2.7-0.23
+- Update to 3.2.7 (Security fix for CVE-2009-0022)
+
 * Thu Nov 27 2008 Guenther Deschner <gdeschner at redhat.com> - 3.2.5-0.22
 - Update to 3.2.5 (Security fix for CVE-2008-4314)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/samba/F-9/sources,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- sources	27 Nov 2008 12:37:05 -0000	1.59
+++ sources	6 Jan 2009 11:40:31 -0000	1.60
@@ -1 +1 @@
-0f7539e09803ae60a2912e70adf1c747  samba-3.2.5.tar.gz
+528677f261f3ed4a58f9483ca25ba6b2  samba-3.2.7.tar.gz


--- samba-3.2.4-build.patch DELETED ---



From caolanm at fedoraproject.org  Tue Jan  6 12:06:17 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Tue,  6 Jan 2009 12:06:17 +0000 (UTC)
Subject: rpms/icewm/devel icewm-configure.patch, 1.1, 1.2 icewm.spec, 1.17,
	1.18
Message-ID: <20090106120617.E73BC70108@cvs1.fedora.phx.redhat.com>

Author: caolanm

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

Modified Files:
	icewm-configure.patch icewm.spec 
Log Message:
pkg-config --cflags gnome-desktop-2.0 doesn't implicitly include libgnomeui-2.0 anymore, so add it in explicitly

icewm-configure.patch:

Index: icewm-configure.patch
===================================================================
RCS file: /cvs/pkgs/rpms/icewm/devel/icewm-configure.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- icewm-configure.patch	15 Feb 2007 09:55:58 -0000	1.1
+++ icewm-configure.patch	6 Jan 2009 12:06:16 -0000	1.2
@@ -1,6 +1,16 @@
 --- icewm-1.2.30/configure.in.old	2007-01-16 16:12:51.000000000 +0200
 +++ icewm-1.2.30/configure.in	2007-01-16 16:13:31.000000000 +0200
-@@ -814,7 +814,7 @@
+@@ -820,15 +820,15 @@
+     
+       if test "${PKG_CONFIG}" != ""; then
+ 	GNOME_VER=2
+-	GNOME2_CFLAGS=`pkg-config --cflags gnome-desktop-2.0`
+-	GNOME2_LIBS=`pkg-config --libs gnome-desktop-2.0`
++	GNOME2_CFLAGS=`pkg-config --cflags gnome-desktop-2.0 libgnomeui-2.0`
++	GNOME2_LIBS=`pkg-config --libs gnome-desktop-2.0 libgnomeui-2.0`
+ 
+ 	AC_DEFINE(CONFIG_GNOME_MENUS, 1, [Define to make IceWM more GNOME-friendly])
+ 
  	APPLICATIONS="${APPLICATIONS} icewm-menu-gnome2"
  	GNOME2_PREFIX=`pkg-config --variable=prefix gnome-desktop-2.0`
  	GWMDIR="${GNOME2_PREFIX}/share/gnome/wm-properties/"
@@ -11,7 +21,17 @@
        if test "${GNOME2_CFLAGS}" = ""; then
 --- icewm-1.2.30/configure.old	2007-01-16 17:44:10.000000000 +0200
 +++ icewm-1.2.30/configure	2007-01-16 17:44:31.000000000 +0200
-@@ -12000,7 +12000,7 @@
+@@ -12564,7 +12564,8 @@
+       if test "${PKG_CONFIG}" != ""; then
+ 	GNOME_VER=2
+ 	GNOME2_CFLAGS=`pkg-config --cflags gnome-desktop-2.0`
+-	GNOME2_LIBS=`pkg-config --libs gnome-desktop-2.0`
++	GNOME2_CFLAGS=`pkg-config --cflags gnome-desktop-2.0 libgnomeui-2.0`
++	GNOME2_LIBS=`pkg-config --libs gnome-desktop-2.0 libgnomeui-2.0`
+ 
+ 
+ cat >>confdefs.h <<\_ACEOF
+@@ -12575,7 +12576,7 @@
  	APPLICATIONS="${APPLICATIONS} icewm-menu-gnome2"
  	GNOME2_PREFIX=`pkg-config --variable=prefix gnome-desktop-2.0`
  	GWMDIR="${GNOME2_PREFIX}/share/gnome/wm-properties/"


Index: icewm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/icewm/devel/icewm.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- icewm.spec	5 Jan 2009 11:04:10 -0000	1.17
+++ icewm.spec	6 Jan 2009 12:06:16 -0000	1.18
@@ -1,6 +1,6 @@
 Name:			icewm
 Version:		1.2.36
-Release:		2%{?dist}
+Release:		3%{?dist}
 Summary:		Light and configurable window manager
 
 Group:			User Interface/Desktops
@@ -199,6 +199,10 @@
 
 
 %changelog
+* Tue Jan 6 2009 Caol??n McNamara <caolanm at redhat.com> - 1.2.36-3
+- pkg-config --cflags gnome-desktop-2.0 doesn't implicitly include
+  libgnomeui-2.0 anymore, so add it in explicitly
+
 * Mon Jan 5 2009 Gilboa Davara <gilboad[AT]gmail.com> - 1.2.36-2
 - Missing BR libgnomeui-devel. (devel)
 - Missing BR gnome-vfs2-devel. (devel)



From thias at fedoraproject.org  Tue Jan  6 12:27:57 2009
From: thias at fedoraproject.org (Matthias Saou)
Date: Tue,  6 Jan 2009 12:27:57 +0000 (UTC)
Subject: rpms/pigment/F-10 pigment.spec,1.13,1.14
Message-ID: <20090106122757.E642170108@cvs1.fedora.phx.redhat.com>

Author: thias

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

Modified Files:
	pigment.spec 
Log Message:
Re-enable autoreconf since the build is still broken without.



Index: pigment.spec
===================================================================
RCS file: /cvs/extras/rpms/pigment/F-10/pigment.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- pigment.spec	22 Dec 2008 09:36:25 -0000	1.13
+++ pigment.spec	6 Jan 2009 12:27:27 -0000	1.14
@@ -1,7 +1,7 @@
 Summary: Media Center Toolkit
 Name: pigment
 Version: 0.3.13
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: LGPLv2+
 Group: Applications/Multimedia
 URL: http://elisa.fluendo.com/
@@ -44,9 +44,8 @@
 
 %prep
 %setup -q
-# Required to get 0.3.6 working. Some lib64 problems.
-# Try disabling in 0.3.13 on f11 because of libtool build problems
-#autoreconf
+# Required to get 0.3.6 working. Some lib64 problems. Still as of 0.3.13.
+autoreconf
 
 
 %build
@@ -99,6 +98,9 @@
 
 
 %changelog
+* Tue Jan  6 2009 Matthias Saou <http://freshrpms.net/> 0.3.13-3
+- Re-enable autoreconf since the build is still broken without.
+
 * Sun Dec 21 2008 Matthias Saou <http://freshrpms.net/> 0.3.13-2
 - Disable gtk-doc to fix multilib conflicts (#342871).
 



From thias at fedoraproject.org  Tue Jan  6 12:27:58 2009
From: thias at fedoraproject.org (Matthias Saou)
Date: Tue,  6 Jan 2009 12:27:58 +0000 (UTC)
Subject: rpms/pigment/F-9 pigment.spec,1.9,1.10
Message-ID: <20090106122758.246B470108@cvs1.fedora.phx.redhat.com>

Author: thias

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

Modified Files:
	pigment.spec 
Log Message:
Re-enable autoreconf since the build is still broken without.



Index: pigment.spec
===================================================================
RCS file: /cvs/extras/rpms/pigment/F-9/pigment.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- pigment.spec	22 Dec 2008 09:36:26 -0000	1.9
+++ pigment.spec	6 Jan 2009 12:27:27 -0000	1.10
@@ -1,7 +1,7 @@
 Summary: Media Center Toolkit
 Name: pigment
 Version: 0.3.13
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: LGPLv2+
 Group: Applications/Multimedia
 URL: http://elisa.fluendo.com/
@@ -44,9 +44,8 @@
 
 %prep
 %setup -q
-# Required to get 0.3.6 working. Some lib64 problems.
-# Try disabling in 0.3.13 on f11 because of libtool build problems
-#autoreconf
+# Required to get 0.3.6 working. Some lib64 problems. Still as of 0.3.13.
+autoreconf
 
 
 %build
@@ -99,6 +98,9 @@
 
 
 %changelog
+* Tue Jan  6 2009 Matthias Saou <http://freshrpms.net/> 0.3.13-3
+- Re-enable autoreconf since the build is still broken without.
+
 * Sun Dec 21 2008 Matthias Saou <http://freshrpms.net/> 0.3.13-2
 - Disable gtk-doc to fix multilib conflicts (#342871).
 



From thias at fedoraproject.org  Tue Jan  6 12:27:58 2009
From: thias at fedoraproject.org (Matthias Saou)
Date: Tue,  6 Jan 2009 12:27:58 +0000 (UTC)
Subject: rpms/pigment/devel pigment.spec,1.15,1.16
Message-ID: <20090106122758.6BC3870125@cvs1.fedora.phx.redhat.com>

Author: thias

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

Modified Files:
	pigment.spec 
Log Message:
Re-enable autoreconf since the build is still broken without.



Index: pigment.spec
===================================================================
RCS file: /cvs/extras/rpms/pigment/devel/pigment.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- pigment.spec	22 Dec 2008 08:41:39 -0000	1.15
+++ pigment.spec	6 Jan 2009 12:27:28 -0000	1.16
@@ -1,7 +1,7 @@
 Summary: Media Center Toolkit
 Name: pigment
 Version: 0.3.13
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: LGPLv2+
 Group: Applications/Multimedia
 URL: http://elisa.fluendo.com/
@@ -44,9 +44,8 @@
 
 %prep
 %setup -q
-# Required to get 0.3.6 working. Some lib64 problems.
-# Try disabling in 0.3.13 on f11 because of libtool build problems
-#autoreconf
+# Required to get 0.3.6 working. Some lib64 problems. Still as of 0.3.13.
+autoreconf
 
 
 %build
@@ -99,6 +98,9 @@
 
 
 %changelog
+* Tue Jan  6 2009 Matthias Saou <http://freshrpms.net/> 0.3.13-3
+- Re-enable autoreconf since the build is still broken without.
+
 * Sun Dec 21 2008 Matthias Saou <http://freshrpms.net/> 0.3.13-2
 - Disable gtk-doc to fix multilib conflicts (#342871).
 



From jlaska at fedoraproject.org  Tue Jan  6 12:33:38 2009
From: jlaska at fedoraproject.org (James Laska)
Date: Tue,  6 Jan 2009 12:33:38 +0000 (UTC)
Subject: rpms/snake/F-9 .cvsignore, 1.10, 1.11 import.log, 1.3,
	1.4 snake.spec, 1.17, 1.18 sources, 1.18, 1.19
Message-ID: <20090106123338.5F75470140@cvs1.fedora.phx.redhat.com>

Author: jlaska

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

Modified Files:
	.cvsignore import.log snake.spec sources 
Log Message:
Update to snake-0.11-0.12


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/snake/F-9/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	18 Dec 2008 21:11:34 -0000	1.10
+++ .cvsignore	6 Jan 2009 12:33:07 -0000	1.11
@@ -1 +1 @@
-snake-0.11-0.11.tar.bz2
+snake-0.11-0.12.tar.bz2


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/snake/F-9/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- import.log	18 Dec 2008 21:11:34 -0000	1.3
+++ import.log	6 Jan 2009 12:33:07 -0000	1.4
@@ -1,3 +1,4 @@
 snake-0_11-0_8_fc9:F-9:snake-0.11-0.8.fc9.src.rpm:1217259960
 snake-0_11-0_9_fc9:F-9:snake-0.11-0.9.fc9.src.rpm:1217261970
 snake-0_11-0_11_fc10:F-9:snake-0.11-0.11.fc10.src.rpm:1229634596
+snake-0_11-0_12_fc10:F-9:snake-0.11-0.12.fc10.src.rpm:1231245090


Index: snake.spec
===================================================================
RCS file: /cvs/pkgs/rpms/snake/F-9/snake.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- snake.spec	18 Dec 2008 21:11:34 -0000	1.17
+++ snake.spec	6 Jan 2009 12:33:07 -0000	1.18
@@ -4,7 +4,7 @@
 Name:           snake
 Summary:        Smart Network Automated Kickstart Environment
 Version:        0.11
-%define rel     0.11
+%define rel     0.12
 Release:        %{rel}%{?dist}
 Source0:        http://hosted.fedoraproject.org/projects/snake/SnakeReleases/%{name}-%{version}-%{rel}.tar.bz2
 License:        GPLv2+
@@ -78,7 +78,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc README LICENSE
+%doc README LICENSE docs/DESIGN docs/cobbler.ks
 %{_sbindir}/snake-install
 %{_sbindir}/snake-install-tui
 %{_sbindir}/snake-tree
@@ -111,7 +111,6 @@
 %if %{build_server}
 %files server
 %defattr(-,root,root,-)
-%doc docs/DESIGN docs/cobbler.ks
 %{_sbindir}/snake-server
 %dir %{_localstatedir}/lib/snake
 %dir %{_localstatedir}/lib/snake/kickstarts
@@ -136,6 +135,9 @@
 
 
 %changelog
+* Mon Jan 5 2009 James Laska <jlaska at redhat.com> 0.11-0.12
+- Minor fix to cobbler template and move %doc into base package (jlaska)
+
 * Thu Dec 18 2008 James Laska <jlaska at redhat.com> 0.11-0.11
 - ticket#64 - only parse kickstarts when requested during snake-ks generate
   (jlaska)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/snake/F-9/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources	18 Dec 2008 21:11:34 -0000	1.18
+++ sources	6 Jan 2009 12:33:07 -0000	1.19
@@ -1 +1 @@
-e189069dc7d629f1a9749f96129e0641  snake-0.11-0.11.tar.bz2
+0a763da58a7f8babeccae3a6d35abff6  snake-0.11-0.12.tar.bz2



From jlaska at fedoraproject.org  Tue Jan  6 12:44:58 2009
From: jlaska at fedoraproject.org (James Laska)
Date: Tue,  6 Jan 2009 12:44:58 +0000 (UTC)
Subject: rpms/snake/F-8 .cvsignore, 1.9, 1.10 import.log, 1.3, 1.4 snake.spec,
	1.15, 1.16 sources, 1.16, 1.17
Message-ID: <20090106124458.A58CD70108@cvs1.fedora.phx.redhat.com>

Author: jlaska

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

Modified Files:
	.cvsignore import.log snake.spec sources 
Log Message:
Update to snake-0.11-0.12


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/snake/F-8/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	19 Dec 2008 12:35:43 -0000	1.9
+++ .cvsignore	6 Jan 2009 12:44:27 -0000	1.10
@@ -1 +1 @@
-snake-0.11-0.11.tar.bz2
+snake-0.11-0.12.tar.bz2


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/snake/F-8/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- import.log	19 Dec 2008 12:35:43 -0000	1.3
+++ import.log	6 Jan 2009 12:44:28 -0000	1.4
@@ -1,3 +1,4 @@
 snake-0_11-0_8_fc9:F-8:snake-0.11-0.8.fc9.src.rpm:1217260292
 snake-0_11-0_9_fc9:F-8:snake-0.11-0.9.fc9.src.rpm:1217263036
 snake-0_11-0_11_fc10:F-8:snake-0.11-0.11.fc10.src.rpm:1229689995
+snake-0_11-0_12_fc10:F-8:snake-0.11-0.12.fc10.src.rpm:1231245541


Index: snake.spec
===================================================================
RCS file: /cvs/pkgs/rpms/snake/F-8/snake.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- snake.spec	19 Dec 2008 12:35:43 -0000	1.15
+++ snake.spec	6 Jan 2009 12:44:28 -0000	1.16
@@ -4,7 +4,7 @@
 Name:           snake
 Summary:        Smart Network Automated Kickstart Environment
 Version:        0.11
-%define rel     0.11
+%define rel     0.12
 Release:        %{rel}%{?dist}
 Source0:        http://hosted.fedoraproject.org/projects/snake/SnakeReleases/%{name}-%{version}-%{rel}.tar.bz2
 License:        GPLv2+
@@ -78,7 +78,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc README LICENSE
+%doc README LICENSE docs/DESIGN docs/cobbler.ks
 %{_sbindir}/snake-install
 %{_sbindir}/snake-install-tui
 %{_sbindir}/snake-tree
@@ -111,7 +111,6 @@
 %if %{build_server}
 %files server
 %defattr(-,root,root,-)
-%doc docs/DESIGN docs/cobbler.ks
 %{_sbindir}/snake-server
 %dir %{_localstatedir}/lib/snake
 %dir %{_localstatedir}/lib/snake/kickstarts
@@ -136,6 +135,9 @@
 
 
 %changelog
+* Mon Jan 5 2009 James Laska <jlaska at redhat.com> 0.11-0.12
+- Minor fix to cobbler template and move %doc into base package (jlaska)
+
 * Thu Dec 18 2008 James Laska <jlaska at redhat.com> 0.11-0.11
 - ticket#64 - only parse kickstarts when requested during snake-ks generate
   (jlaska)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/snake/F-8/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources	19 Dec 2008 12:35:43 -0000	1.16
+++ sources	6 Jan 2009 12:44:28 -0000	1.17
@@ -1 +1 @@
-e189069dc7d629f1a9749f96129e0641  snake-0.11-0.11.tar.bz2
+0a763da58a7f8babeccae3a6d35abff6  snake-0.11-0.12.tar.bz2



From buc at fedoraproject.org  Tue Jan  6 13:09:17 2009
From: buc at fedoraproject.org (Dmitry Butskoy)
Date: Tue,  6 Jan 2009 13:09:17 +0000 (UTC)
Subject: rpms/newscache/devel socket++-1.12.12-autotools.patch,1.2,1.3
Message-ID: <20090106130917.5A33570108@cvs1.fedora.phx.redhat.com>

Author: buc

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

Modified Files:
	socket++-1.12.12-autotools.patch 
Log Message:


socket++-1.12.12-autotools.patch:

Index: socket++-1.12.12-autotools.patch
===================================================================
RCS file: /cvs/extras/rpms/newscache/devel/socket++-1.12.12-autotools.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- socket++-1.12.12-autotools.patch	5 Jan 2009 20:53:03 -0000	1.2
+++ socket++-1.12.12-autotools.patch	6 Jan 2009 13:09:17 -0000	1.3
@@ -1,6 +1,14 @@
+diff -Nrbu socket++-1.12.12/Makefile.am socket++-1.12.12-OK/Makefile.am
+--- socket++-1.12.12/Makefile.am	2002-11-25 15:31:56.000000000 +0300
++++ socket++-1.12.12-OK/Makefile.am	2009-01-06 16:03:17.000000000 +0300
+@@ -1,2 +1,4 @@
+ SUBDIRS = socket++ doc
+ 
++ACLOCAL_AMFLAGS = -I m4
++
 diff -Nrbu socket++-1.12.12/configure.in socket++-1.12.12-OK/configure.in
 --- socket++-1.12.12/configure.in	2004-09-30 17:00:14.000000000 +0400
-+++ socket++-1.12.12-OK/configure.in	2009-01-05 23:47:20.000000000 +0300
++++ socket++-1.12.12-OK/configure.in	2009-01-06 15:55:48.000000000 +0300
 @@ -28,6 +28,8 @@
  dnl Specify a configuration file
  AM_CONFIG_HEADER(socket++/config.h)



From varekova at fedoraproject.org  Tue Jan  6 13:09:46 2009
From: varekova at fedoraproject.org (Ivana Varekova)
Date: Tue,  6 Jan 2009 13:09:46 +0000 (UTC)
Subject: rpms/logwatch/devel logwatch-7.3.6-smartd.patch, NONE,
	1.1 logwatch.spec, 1.108, 1.109
Message-ID: <20090106130946.7BA0570108@cvs1.fedora.phx.redhat.com>

Author: varekova

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

Modified Files:
	logwatch.spec 
Added Files:
	logwatch-7.3.6-smartd.patch 
Log Message:
- fix smartd script


logwatch-7.3.6-smartd.patch:

--- NEW FILE logwatch-7.3.6-smartd.patch ---
diff -up logwatch-7.3.6/scripts/services/smartd.pom logwatch-7.3.6/scripts/services/smartd
--- logwatch-7.3.6/scripts/services/smartd.pom	2007-04-09 16:46:46.000000000 +0200
+++ logwatch-7.3.6/scripts/services/smartd	2009-01-06 13:45:00.000000000 +0100
@@ -8,6 +8,8 @@ use strict;
 my ($Device, $Msg, $Test);
 my %ParamChanges = ();
 my %TempChanges = ();
+my %TempLimit = ();
+my %TempCritLimit = ();
 my %Pendsectors = ();
 my %NumPendsectors = ();
 my %Offsectors = ();
@@ -94,7 +96,13 @@ while (defined(my $ThisLine = <STDIN>)) 
    # smartd reports temperature changes this way only for SCSI disks
    } elsif ( my ($Device,$NewVal) = ($ThisLine =~ /^Device: ([^,]+), initial Temperature is (\d+) Celsius/)) {
       push @{$TempChanges{$Device}},$NewVal;
-   } elsif ( my ($Device,$NewVal) = ($ThisLine =~ /^Device: ([^,]+), Temperature changed -?\d+ Celsius to (\d+) Celsius/)) {
+   } elsif ( my ($Device,$Limit) = ($ThisLine =~ /^Device: ([^,]+), Temperature \d+ Celsius reached limit of (\d+) Celsius/)) {
+   # Device: /dev/sda, Temperature 37 Celsius reached limit of 10 Celsius (Min/Max 37/37)
+      $TempLimit{"$Device,$Limit"}++;    
+   } elsif ( my ($Device,$Limit) = ($ThisLine =~ /^Device: ([^,]+), Temperature \d+ Celsius reached critical limit of (\d+) Celsius/)) {
+   # Device: /dev/sda, Temperature 38 Celsius reached critical limit of 15 Celsius (Min/Max 38!/39)
+      $TempCritLimit{"$Device,$Limit"}++;    
+   } elsif ( my ($Device,$NewVal) = ($ThisLine =~ /^Device: ([^,]+), Temperature changed [-+]?\d+ Celsius to (\d+) Celsius/)) {
       push @{$TempChanges{$Device}},$NewVal;
    } elsif ( my ($Device, $Num) = ($ThisLine =~ /^Device: ([^,]+), (\d+) Currently unreadable \(pending\) sectors/) ) {
       $Pendsectors{$Device}++;
@@ -178,14 +186,31 @@ if (keys %TempChanges) {
                        print "\n";
                }
    }
-       if($Detail < 10) {
+   if($Detail < 10) {
           my @sorttemp = sort @min;
                my $mint = $sorttemp[0];
           my @sorttemp = sort @max;
                my $maxt = $sorttemp[$#sorttemp];
           print "All devices: $mint - $maxt\n";
-       }
+   }
+}
+
+if (keys %TempCritLimit) {
+   printf "\nReached critical temperature limit:\n";
+   foreach (keys %TempCritLimit) {
+      my ($Device,$Limit)=split ",";
+      print "\t" . $Device . ": reached limit of " . $Limit . " Celsius: ". $TempCritLimit{"$Device,$Limit"} .  " Time(s)\n";
+   }
+}
+
+if (keys %TempLimit) {
+   printf "\nReached temperature limit:\n";
+   foreach (keys %TempLimit) {
+      my ($Device,$Limit)=split ",";
+      print "\t" . $Device . ": reached limit of " . $Limit . " Celsius: ". $TempLimit{"$Device,$Limit"} .  " Time(s)\n";
+   } 
 }
+                       
 
 if (keys %Pendsectors){
    print "\nCurrently unreadable (pending) sectors detected:\n";


Index: logwatch.spec
===================================================================
RCS file: /cvs/pkgs/rpms/logwatch/devel/logwatch.spec,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -r1.108 -r1.109
--- logwatch.spec	17 Dec 2008 12:19:38 -0000	1.108
+++ logwatch.spec	6 Jan 2009 13:09:16 -0000	1.109
@@ -1,7 +1,7 @@
 Summary: A log file analysis program
 Name: logwatch
 Version: 7.3.6
-Release: 38%{?dist}
+Release: 39%{?dist}
 License: MIT
 Group: Applications/System
 URL: http://www.logwatch.org/
@@ -48,7 +48,7 @@
 Patch49: logwatch-7.3.6-dovecot.patch
 Patch50: logwatch-7.3.6-named4.patch
 Patch51: logwatch-7.3.6-openvpn3.patch
-
+Patch52: logwatch-7.3.6-smartd.patch
 Requires: textutils sh-utils grep mailx
 Requires: perl(Date::Manip)
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -104,6 +104,7 @@
 %patch49 -p1
 %patch50 -p1
 %patch51 -p1
+%patch52 -p1
 rm -f scripts/services/*.orig
 
 %build
@@ -215,6 +216,9 @@
 %doc License project/CHANGES 
 
 %changelog
+* Tue Jan  6 2009 Ivana Varekova <varekova at redhat.com> 7.3.6-39
+- fix smartd script
+
 * Tue Dec 16 2008 Ivana Varekova <varekova at redhat.com> 7.3.6-38
 - remove obsolete patches
 - fix dovecot,named and openvpn scrpts(#476620)



From buc at fedoraproject.org  Tue Jan  6 13:46:31 2009
From: buc at fedoraproject.org (Dmitry Butskoy)
Date: Tue,  6 Jan 2009 13:46:31 +0000 (UTC)
Subject: rpms/newscache/devel newscache.spec,1.18,1.19
Message-ID: <20090106134631.7780270108@cvs1.fedora.phx.redhat.com>

Author: buc

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

Modified Files:
	newscache.spec 
Log Message:



Index: newscache.spec
===================================================================
RCS file: /cvs/extras/rpms/newscache/devel/newscache.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- newscache.spec	5 Jan 2009 21:23:33 -0000	1.18
+++ newscache.spec	6 Jan 2009 13:46:01 -0000	1.19
@@ -52,10 +52,11 @@
 
 pushd socket++-%{socketver}
 #./autogen
-libtoolize -v --force
-aclocal -I m4
+aclocal
 autoheader
 automake --add-missing
+libtoolize -v --force
+automake --add-missing
 autoconf
 
 %configure --enable-static --disable-shared



From green at fedoraproject.org  Tue Jan  6 13:46:32 2009
From: green at fedoraproject.org (Anthony Green)
Date: Tue,  6 Jan 2009 13:46:32 +0000 (UTC)
Subject: rpms/sooperlooper/devel .cvsignore, 1.3, 1.4 sooperlooper.spec, 1.3,
	1.4 sources, 1.3, 1.4 sooperlooper-1.6.2-rubberband-1.2.patch,
	1.1, NONE
Message-ID: <20090106134632.ACE0870108@cvs1.fedora.phx.redhat.com>

Author: green

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

Modified Files:
	.cvsignore sooperlooper.spec sources 
Removed Files:
	sooperlooper-1.6.2-rubberband-1.2.patch 
Log Message:
Update to 1.6.13


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sooperlooper/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	21 Jul 2008 08:35:15 -0000	1.3
+++ .cvsignore	6 Jan 2009 13:46:02 -0000	1.4
@@ -1 +1 @@
-sooperlooper-1.6.6.tar.gz
+sooperlooper-1.6.13-2.tar.gz


Index: sooperlooper.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sooperlooper/devel/sooperlooper.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sooperlooper.spec	21 Jul 2008 08:35:15 -0000	1.3
+++ sooperlooper.spec	6 Jan 2009 13:46:02 -0000	1.4
@@ -1,14 +1,13 @@
 Summary: Realtime software looping sampler
 Name: sooperlooper
-Version: 1.6.6
+Version: 1.6.13
 Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/Multimedia
 URL: http://essej.net/sooperlooper/
-Source0: http://essej.net/sooperlooper/sooperlooper-%{version}.tar.gz
+Source0: http://essej.net/sooperlooper/sooperlooper-%{version}-2.tar.gz
 Source1: sooperlooper.png
 Source2: sooperlooper.desktop
-Patch0: sooperlooper-1.6.2-rubberband-1.2.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: hicolor-icon-theme
 
@@ -26,7 +25,6 @@
 
 %prep
 %setup -q
-%patch0 -p1
 # kill the stubborn overriding of CXXFLAGS
 sed -i 's/OPT_FLAGS="$OPT_FLAGS -pipe"/OPT_FLAGS=""/g' configure
 sed -i 's/OPT_FLAGS="$OPT_FLAGS -pipe"/OPT_FLAGS="%{optflags}"/g' \
@@ -84,9 +82,8 @@
 
 
 %changelog
-* Mon Jul 21 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 1.6.6-1
-- New upstream release 1.6.6
-- Rebuild for new rubberband
+* Tue Jan 06 2009 Anthony Green <green at redhat.com> 1.6.13-1
+- New upstream release 1.6.13
 
 * Tue Apr 15 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 1.6.2-1
 - New upstream release 1.6.2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sooperlooper/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	21 Jul 2008 08:35:15 -0000	1.3
+++ sources	6 Jan 2009 13:46:02 -0000	1.4
@@ -1 +1 @@
-8531e8b17197dd57776bbdf4d2a612c4  sooperlooper-1.6.6.tar.gz
+60eb9f2d5ddb652c9b57e2a5295a3db5  sooperlooper-1.6.13-2.tar.gz


--- sooperlooper-1.6.2-rubberband-1.2.patch DELETED ---



From pkgdb at fedoraproject.org  Tue Jan  6 13:50:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 06 Jan 2009 13:50:59 +0000
Subject: [pkgdb] gd: varekova has requested commit
Message-ID: <20090106135059.5BEF820873B@bastion.fedora.phx.redhat.com>

varekova has requested the commit acl on gd (Fedora devel)

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



From pkgdb at fedoraproject.org  Tue Jan  6 13:51:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 06 Jan 2009 13:51:01 +0000
Subject: [pkgdb] gd: varekova has requested watchbugzilla
Message-ID: <20090106135101.398DE208D2B@bastion.fedora.phx.redhat.com>

varekova has requested the watchbugzilla acl on gd (Fedora devel)

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



From pkgdb at fedoraproject.org  Tue Jan  6 13:51:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 06 Jan 2009 13:51:05 +0000
Subject: [pkgdb] gd: varekova has requested watchcommits
Message-ID: <20090106135105.EBD22208D51@bastion.fedora.phx.redhat.com>

varekova has requested the watchcommits acl on gd (Fedora devel)

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



From pkgdb at fedoraproject.org  Tue Jan  6 13:51:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 06 Jan 2009 13:51:50 +0000
Subject: [pkgdb] gd had acl change status
Message-ID: <20090106135151.498ED208D2B@bastion.fedora.phx.redhat.com>

jmoskovc has set the commit acl on gd (Fedora devel) to Approved for varekova

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



From pkgdb at fedoraproject.org  Tue Jan  6 13:51:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 06 Jan 2009 13:51:58 +0000
Subject: [pkgdb] gd had acl change status
Message-ID: <20090106135158.47249208D50@bastion.fedora.phx.redhat.com>

jmoskovc has set the watchcommits acl on gd (Fedora devel) to Approved for varekova

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



From pkgdb at fedoraproject.org  Tue Jan  6 13:52:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 06 Jan 2009 13:52:04 +0000
Subject: [pkgdb] gd had acl change status
Message-ID: <20090106135204.B206A208D55@bastion.fedora.phx.redhat.com>

jmoskovc has set the watchbugzilla acl on gd (Fedora devel) to Approved for varekova

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



From pkgdb at fedoraproject.org  Tue Jan  6 13:52:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 06 Jan 2009 13:52:08 +0000
Subject: [pkgdb] gd had acl change status
Message-ID: <20090106135209.39B1F208D58@bastion.fedora.phx.redhat.com>

jmoskovc has set the watchcommits acl on gd (Fedora devel) to Approved for pertusus

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



From pkgdb at fedoraproject.org  Tue Jan  6 13:52:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 06 Jan 2009 13:52:08 +0000
Subject: [pkgdb] gd had acl change status
Message-ID: <20090106135209.9733A208D5A@bastion.fedora.phx.redhat.com>

jmoskovc has set the watchcommits acl on gd (Fedora 7) to Approved for pertusus

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



From pkgdb at fedoraproject.org  Tue Jan  6 13:52:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 06 Jan 2009 13:52:08 +0000
Subject: [pkgdb] gd had acl change status
Message-ID: <20090106135209.A6480208D66@bastion.fedora.phx.redhat.com>

jmoskovc has set the watchbugzilla acl on gd (Fedora devel) to Approved for pertusus

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



From pkgdb at fedoraproject.org  Tue Jan  6 13:52:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 06 Jan 2009 13:52:09 +0000
Subject: [pkgdb] gd had acl change status
Message-ID: <20090106135209.9BA4A208D51@bastion.fedora.phx.redhat.com>

jmoskovc has set the watchbugzilla acl on gd (Fedora 7) to Approved for pertusus

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



From pkgdb at fedoraproject.org  Tue Jan  6 13:52:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 06 Jan 2009 13:52:10 +0000
Subject: [pkgdb] gd had acl change status
Message-ID: <20090106135210.59617208D9B@bastion.fedora.phx.redhat.com>

jmoskovc has set the watchbugzilla acl on gd (Fedora 8) to Approved for pertusus

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



From pkgdb at fedoraproject.org  Tue Jan  6 13:52:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 06 Jan 2009 13:52:12 +0000
Subject: [pkgdb] gd had acl change status
Message-ID: <20090106135212.67EB4208DA7@bastion.fedora.phx.redhat.com>

jmoskovc has set the watchcommits acl on gd (Fedora 8) to Approved for pertusus

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



From mbarnes at fedoraproject.org  Tue Jan  6 13:54:28 2009
From: mbarnes at fedoraproject.org (Matthew Barnes)
Date: Tue,  6 Jan 2009 13:54:28 +0000 (UTC)
Subject: rpms/evolution/devel .cvsignore, 1.103, 1.104 evolution.spec, 1.365,
	1.366 sources, 1.103, 1.104
Message-ID: <20090106135428.4A10870108@cvs1.fedora.phx.redhat.com>

Author: mbarnes

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

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

* Mon Jan 05 2009 Matthew Barnes <mbarnes at redhat.com> - 2.25.4-1.fc11
- Update to 2.25.4
- Bump eds_version to 2.25.4.
- Bump libgweather_version to 2.25.4.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/.cvsignore,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -r1.103 -r1.104
--- .cvsignore	15 Dec 2008 17:50:23 -0000	1.103
+++ .cvsignore	6 Jan 2009 13:53:56 -0000	1.104
@@ -1 +1 @@
-evolution-2.25.3.1.tar.bz2
+evolution-2.25.4.tar.bz2


Index: evolution.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/evolution.spec,v
retrieving revision 1.365
retrieving revision 1.366
diff -u -r1.365 -r1.366
--- evolution.spec	15 Dec 2008 17:50:23 -0000	1.365
+++ evolution.spec	6 Jan 2009 13:53:56 -0000	1.366
@@ -1,6 +1,6 @@
 %define dbus_glib_version 0.70
 %define dbus_version 1.0
-%define eds_version 2.25.2
+%define eds_version 2.25.4
 %define glib2_version 2.16.0
 %define gnome_doc_utils_version 0.8.0
 %define gnome_icon_theme_version 2.19.91
@@ -11,7 +11,7 @@
 %define last_libgal2_version 2:2.5.3-2
 %define libbonobo_version 2.20.3
 %define libbonoboui_version 2.4.2
-%define libgweather_version 2.25.2
+%define libgweather_version 2.25.4
 %define orbit2_version 2.9.8
 %define pilot_link_version 2:0.12.1
 %define scrollkeeper_version 0.1.4
@@ -45,7 +45,7 @@
 ### Abstract ###
 
 Name: evolution
-Version: 2.25.3.1
+Version: 2.25.4
 Release: 1%{?dist}
 License: GPLv2 and GFDL
 Group: Applications/Productivity
@@ -704,6 +704,11 @@
 %{_libexecdir}/evolution/%{evo_major}/evolution-addressbook-clean
 
 %changelog
+* Mon Jan 05 2009 Matthew Barnes <mbarnes at redhat.com> - 2.25.4-1.fc11
+- Update to 2.25.4
+- Bump eds_version to 2.25.4.
+- Bump libgweather_version to 2.25.4.
+
 * Mon Dec 15 2008 Matthew Barnes <mbarnes at redhat.com> - 2.25.3.1-1.fc11
 - Update to 2.25.3.1
 - New BR: libgweather-devel


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/sources,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -r1.103 -r1.104
--- sources	15 Dec 2008 17:50:24 -0000	1.103
+++ sources	6 Jan 2009 13:53:57 -0000	1.104
@@ -1 +1 @@
-2d74ba6cf6dfca0cbe208c82f5726de9  evolution-2.25.3.1.tar.bz2
+8f9d4fb91c10c9d5ba8cc032c1129ee6  evolution-2.25.4.tar.bz2



From buc at fedoraproject.org  Tue Jan  6 13:58:13 2009
From: buc at fedoraproject.org (Dmitry Butskoy)
Date: Tue,  6 Jan 2009 13:58:13 +0000 (UTC)
Subject: rpms/newscache/devel newscache.spec,1.19,1.20
Message-ID: <20090106135813.C038E70108@cvs1.fedora.phx.redhat.com>

Author: buc

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

Modified Files:
	newscache.spec 
Log Message:



Index: newscache.spec
===================================================================
RCS file: /cvs/extras/rpms/newscache/devel/newscache.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- newscache.spec	6 Jan 2009 13:46:01 -0000	1.19
+++ newscache.spec	6 Jan 2009 13:57:43 -0000	1.20
@@ -54,7 +54,7 @@
 #./autogen
 aclocal
 autoheader
-automake --add-missing
+automake --add-missing || :
 libtoolize -v --force
 automake --add-missing
 autoconf



From dwalsh at fedoraproject.org  Tue Jan  6 14:12:29 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Tue,  6 Jan 2009 14:12:29 +0000 (UTC)
Subject: rpms/policycoreutils/devel policycoreutils-rhat.patch, 1.405,
	1.406 policycoreutils.spec, 1.579, 1.580
Message-ID: <20090106141229.8CD5C70125@cvs1.fedora.phx.redhat.com>

Author: dwalsh

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

Modified Files:
	policycoreutils-rhat.patch policycoreutils.spec 
Log Message:
* Tue Jan 6 2009 Dan Walsh <dwalsh at redhat.com> 2.0.60-7
- Don't error out when removing a non existing module


policycoreutils-rhat.patch:

Index: policycoreutils-rhat.patch
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils-rhat.patch,v
retrieving revision 1.405
retrieving revision 1.406
diff -u -r1.405 -r1.406
--- policycoreutils-rhat.patch	4 Jan 2009 19:46:54 -0000	1.405
+++ policycoreutils-rhat.patch	6 Jan 2009 14:12:27 -0000	1.406
@@ -128,9 +128,20 @@
      return newcats
  
  def translate(cats):
+diff --exclude-from=exclude --exclude=sepolgen-1.0.14 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/semanage policycoreutils-2.0.60/semanage/semanage
+--- nsapolicycoreutils/semanage/semanage	2008-11-14 17:10:15.000000000 -0500
++++ policycoreutils-2.0.60/semanage/semanage	2009-01-05 14:07:44.000000000 -0500
+@@ -219,6 +219,7 @@
+ 					     'seuser=',
+ 					     'store=',
+ 					     'range=',
++					     'locallist=',
+ 					     'level=',
+ 					     'roles=',
+ 					     'type=',
 diff --exclude-from=exclude --exclude=sepolgen-1.0.14 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semodule/semodule.c policycoreutils-2.0.60/semodule/semodule.c
 --- nsapolicycoreutils/semodule/semodule.c	2008-08-28 09:34:24.000000000 -0400
-+++ policycoreutils-2.0.60/semodule/semodule.c	2008-12-15 15:34:54.000000000 -0500
++++ policycoreutils-2.0.60/semodule/semodule.c	2009-01-06 08:56:37.000000000 -0500
 @@ -60,24 +60,6 @@
  	free(commands);
  }
@@ -201,7 +212,17 @@
  				break;
  			}
  		case REMOVE_M:{
-@@ -429,9 +400,6 @@
+@@ -388,6 +359,9 @@
+ 					     mode_arg);
+ 				}
+ 				result = semanage_module_remove(sh, mode_arg);
++				if ( result == -2 ) { 
++					continue;
++				}
+ 				break;
+ 			}
+ 		case LIST_M:{
+@@ -429,9 +403,6 @@
  			}
  		}
  		commit += do_commit[mode];
@@ -211,3 +232,4 @@
  		if (result < 0) {
  			fprintf(stderr, "%s:  Failed on %s!\n", argv[0],
  				mode_arg ? : "list");
+Binary files nsapolicycoreutils/semodule/semodule.o and policycoreutils-2.0.60/semodule/semodule.o differ


Index: policycoreutils.spec
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils.spec,v
retrieving revision 1.579
retrieving revision 1.580
diff -u -r1.579 -r1.580
--- policycoreutils.spec	4 Jan 2009 19:46:57 -0000	1.579
+++ policycoreutils.spec	6 Jan 2009 14:12:28 -0000	1.580
@@ -6,7 +6,7 @@
 Summary: SELinux policy core utilities
 Name:	 policycoreutils
 Version: 2.0.60
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: GPLv2+
 Group:	 System Environment/Base
 Source:	 http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@@ -192,6 +192,9 @@
 fi
 
 %changelog
+* Tue Jan 6 2009 Dan Walsh <dwalsh at redhat.com> 2.0.60-7
+- Don't error out when removing a non existing module
+
 * Mon Dec 15 2008 Dan Walsh <dwalsh at redhat.com> 2.0.60-6
 - fix audit2allow man page
 



From timlau at fedoraproject.org  Tue Jan  6 14:13:32 2009
From: timlau at fedoraproject.org (Tim Lauridsen)
Date: Tue,  6 Jan 2009 14:13:32 +0000 (UTC)
Subject: rpms/postr/devel .cvsignore, 1.8, 1.9 postr.spec, 1.12, 1.13 sources,
	1.8, 1.9
Message-ID: <20090106141332.6DF7370125@cvs1.fedora.phx.redhat.com>

Author: timlau

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

Modified Files:
	.cvsignore postr.spec sources 
Log Message:
upstream release 0.12.3


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/postr/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	9 Sep 2008 06:55:36 -0000	1.8
+++ .cvsignore	6 Jan 2009 14:13:01 -0000	1.9
@@ -1 +1 @@
-postr-0.12.2.tar.gz
+postr-0.12.3.tar.gz


Index: postr.spec
===================================================================
RCS file: /cvs/pkgs/rpms/postr/devel/postr.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- postr.spec	30 Nov 2008 00:53:23 -0000	1.12
+++ postr.spec	6 Jan 2009 14:13:02 -0000	1.13
@@ -1,8 +1,8 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           postr
-Version:        0.12.2
-Release:        3%{?dist}
+Version:        0.12.3
+Release:        1%{?dist}
 Summary:        Flickr uploader
 
 Group:          Applications/Multimedia
@@ -71,6 +71,9 @@
 
 
 %changelog
+* Tue Jan 6 2008 Tim Lauridsen <timlau at fedoraproject.org> - 0.12.3-1
+- New upstream version 0.12.3
+
 * Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 0.12.2-3
 - Fix locations for Python 2.6
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/postr/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	9 Sep 2008 06:55:36 -0000	1.8
+++ sources	6 Jan 2009 14:13:02 -0000	1.9
@@ -1 +1 @@
-0b823d94dd6a7e96fde94a2581aaf819  postr-0.12.2.tar.gz
+9c6452ed378eb8c8f808134a3bdcacaa  postr-0.12.3.tar.gz



From buc at fedoraproject.org  Tue Jan  6 14:15:19 2009
From: buc at fedoraproject.org (Dmitry Butskoy)
Date: Tue,  6 Jan 2009 14:15:19 +0000 (UTC)
Subject: rpms/newscache/devel newscache.spec,1.20,1.21
Message-ID: <20090106141519.3543E70108@cvs1.fedora.phx.redhat.com>

Author: buc

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

Modified Files:
	newscache.spec 
Log Message:



Index: newscache.spec
===================================================================
RCS file: /cvs/extras/rpms/newscache/devel/newscache.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- newscache.spec	6 Jan 2009 13:57:43 -0000	1.20
+++ newscache.spec	6 Jan 2009 14:14:48 -0000	1.21
@@ -40,7 +40,7 @@
 %patch2 -p1
 
 pushd socket++-%{socketver}
-%patch3 -p1
+#%patch3 -p1
 popd
 
 
@@ -55,7 +55,7 @@
 aclocal
 autoheader
 automake --add-missing || :
-libtoolize -v --force
+libtoolize -v
 automake --add-missing
 autoconf
 



From timlau at fedoraproject.org  Tue Jan  6 14:16:12 2009
From: timlau at fedoraproject.org (Tim Lauridsen)
Date: Tue,  6 Jan 2009 14:16:12 +0000 (UTC)
Subject: rpms/postr/devel postr.spec,1.13,1.14
Message-ID: <20090106141612.2FADF70108@cvs1.fedora.phx.redhat.com>

Author: timlau

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

Modified Files:
	postr.spec 
Log Message:
fixed year in clog entry :)


Index: postr.spec
===================================================================
RCS file: /cvs/pkgs/rpms/postr/devel/postr.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- postr.spec	6 Jan 2009 14:13:02 -0000	1.13
+++ postr.spec	6 Jan 2009 14:15:42 -0000	1.14
@@ -71,7 +71,7 @@
 
 
 %changelog
-* Tue Jan 6 2008 Tim Lauridsen <timlau at fedoraproject.org> - 0.12.3-1
+* Tue Jan 6 2009 Tim Lauridsen <timlau at fedoraproject.org> - 0.12.3-1
 - New upstream version 0.12.3
 
 * Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 0.12.2-3



From jnovy at fedoraproject.org  Tue Jan  6 14:17:03 2009
From: jnovy at fedoraproject.org (Jindrich Novy)
Date: Tue,  6 Jan 2009 14:17:03 +0000 (UTC)
Subject: rpms/texi2html/devel .cvsignore, 1.4, 1.5 sources, 1.4,
	1.5 texi2html.spec, 1.16, 1.17
Message-ID: <20090106141703.1723D70108@cvs1.fedora.phx.redhat.com>

Author: jnovy

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

Modified Files:
	.cvsignore sources texi2html.spec 
Log Message:
* Tue Jan  6 2009 Jindrich Novy <jnovy at redhat.com> 1.80-1
- update to 1.80



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/texi2html/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	6 Jun 2007 04:27:53 -0000	1.4
+++ .cvsignore	6 Jan 2009 14:16:32 -0000	1.5
@@ -1,3 +1 @@
-texi2html-1.76.tar.bz2
-texi2html-1.77-20070214cvs.tar.bz2
-texi2html-1.78.tar.bz2
+texi2html-1.80.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/texi2html/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	6 Jun 2007 04:27:53 -0000	1.4
+++ sources	6 Jan 2009 14:16:32 -0000	1.5
@@ -1 +1 @@
-40df77a1b84b5ef4ce9238f5ffd5346d  texi2html-1.78.tar.bz2
+4eec3730f39ba64534062483b174795d  texi2html-1.80.tar.gz


Index: texi2html.spec
===================================================================
RCS file: /cvs/pkgs/rpms/texi2html/devel/texi2html.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- texi2html.spec	28 Aug 2007 22:21:30 -0000	1.16
+++ texi2html.spec	6 Jan 2009 14:16:32 -0000	1.17
@@ -1,13 +1,13 @@
 Name: texi2html
-Version: 1.78
-Release: 3%{?dist}
+Version: 1.80
+Release: 1%{?dist}
 # GPLv2+ is for the code
 # OFSFDL (Old FSF Documentation License) for the documentation
 # CC-BY-SA or GPLv2 for the images
 License: GPLv2+ and OFSFDL and (CC-BY-SA or GPLv2)
 Group: Applications/Text
 Summary: A highly customizable texinfo to HTML and other formats translator
-Source0: http://download.savannah.nongnu.org/releases/%{name}/%{name}-%{version}.tar.bz2
+Source0: http://download.savannah.nongnu.org/releases/%{name}/%{name}-%{version}.tar.gz
 URL: http://www.nongnu.org/texi2html/
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
@@ -30,6 +30,8 @@
 %setup -q
 
 %build
+# upstream configure script doesn't have executable bit set
+chmod +x ./configure
 %configure
 make %{?_smp_mflags}
 
@@ -72,6 +74,9 @@
 %dir %{_sysconfdir}/texinfo
 
 %changelog
+* Tue Jan  6 2009 Jindrich Novy <jnovy at redhat.com> 1.80-1
+- update to 1.80
+
 * Tue Aug 28 2007 Patrice Dumas <pertusus at free.fr> 1.78-3
 - use the right license tag for the documentation
 



From mlichvar at fedoraproject.org  Tue Jan  6 14:18:16 2009
From: mlichvar at fedoraproject.org (Miroslav Lichvar)
Date: Tue,  6 Jan 2009 14:18:16 +0000 (UTC)
Subject: rpms/xterm/devel xterm-238-windowfontops.patch, NONE, 1.1 .cvsignore,
	1.31, 1.32 sources, 1.31, 1.32 xterm.spec, 1.69, 1.70
Message-ID: <20090106141816.8F89570108@cvs1.fedora.phx.redhat.com>

Author: mlichvar

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

Modified Files:
	.cvsignore sources xterm.spec 
Added Files:
	xterm-238-windowfontops.patch 
Log Message:
- update to 238 (#479000, CVE-2008-2383)
- set default values of allowWindowOps and allowFontOps resources to false


xterm-238-windowfontops.patch:

--- NEW FILE xterm-238-windowfontops.patch ---
diff -up xterm-238/charproc.c.windowfontops xterm-238/charproc.c
--- xterm-238/charproc.c.windowfontops	2009-01-06 12:10:30.000000000 +0100
+++ xterm-238/charproc.c	2009-01-06 12:15:57.000000000 +0100
@@ -389,10 +389,10 @@ static XtActionsRec actionsList[] = {
 static XtResource resources[] =
 {
     Bres(XtNallowSendEvents, XtCAllowSendEvents, screen.allowSendEvent0, False),
-    Bres(XtNallowFontOps, XtCAllowFontOps, screen.allowFontOp0, True),
+    Bres(XtNallowFontOps, XtCAllowFontOps, screen.allowFontOp0, False),
     Bres(XtNallowTcapOps, XtCAllowTcapOps, screen.allowTcapOp0, True),
     Bres(XtNallowTitleOps, XtCAllowTitleOps, screen.allowTitleOp0, True),
-    Bres(XtNallowWindowOps, XtCAllowWindowOps, screen.allowWindowOp0, True),
+    Bres(XtNallowWindowOps, XtCAllowWindowOps, screen.allowWindowOp0, False),
     Bres(XtNaltIsNotMeta, XtCAltIsNotMeta, screen.alt_is_not_meta, False),
     Bres(XtNaltSendsEscape, XtCAltSendsEscape, screen.alt_sends_esc, False),
     Bres(XtNalwaysBoldMode, XtCAlwaysBoldMode, screen.always_bold_mode, False),
diff -up xterm-238/xterm.man.windowfontops xterm-238/xterm.man
--- xterm-238/xterm.man.windowfontops	2009-01-06 12:10:30.000000000 +0100
+++ xterm-238/xterm.man	2009-01-06 12:11:39.000000000 +0100
@@ -1448,7 +1448,7 @@ The default is ``false.''
 .TP
 .B "allowFontOps (\fPclass\fB AllowFontOps)"
 Specifies whether control sequences that set/query the font should be allowed.
-The default is ``true.''
+The default is ``false.''
 .TP 8
 .B "allowSendEvents (\fPclass\fB AllowSendEvents)"
 Specifies whether or not synthetic key and button events (generated using
@@ -1472,7 +1472,7 @@ The default is ``true.''
 .B "allowWindowOps (\fPclass\fB AllowWindowOps)"
 Specifies whether extended window control sequences (as used in dtterm)
 should be allowed.
-The default is ``true.''
+The default is ``false.''
 .TP 8
 .B "altIsNotMeta (\fPclass\fB AltIsNotMeta\fP)"
 If ``true'', treat the Alt-key as if it were the Meta-key.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xterm/devel/.cvsignore,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- .cvsignore	16 Sep 2008 16:53:13 -0000	1.31
+++ .cvsignore	6 Jan 2009 14:17:46 -0000	1.32
@@ -1,2 +1,2 @@
 16colors.txt
-xterm-237.tgz
+xterm-238.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xterm/devel/sources,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- sources	16 Sep 2008 16:53:13 -0000	1.31
+++ sources	6 Jan 2009 14:17:46 -0000	1.32
@@ -1,2 +1,2 @@
 6093439b8d79089f4ff1cdfed358b401  16colors.txt
-6d5f9e124fd3e09487f47c66da8c7345  xterm-237.tgz
+754f670723eb9a20f9f90d7c5f4a5bad  xterm-238.tgz


Index: xterm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xterm/devel/xterm.spec,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- xterm.spec	16 Sep 2008 16:53:13 -0000	1.69
+++ xterm.spec	6 Jan 2009 14:17:46 -0000	1.70
@@ -1,6 +1,6 @@
 Summary: Terminal emulator for the X Window System
 Name: xterm
-Version: 237
+Version: 238
 Release: 1%{?dist}
 URL: http://dickey.his.com/xterm
 License: MIT
@@ -16,6 +16,7 @@
 Patch1: xterm-223-resources.patch
 Patch2: xterm-222-can-2003-0063.patch
 Patch3: xterm-226-man-page_paths.patch
+Patch4: xterm-238-windowfontops.patch
 
 %bcond_with trace
 
@@ -32,6 +33,7 @@
 %patch1 -p1 -b .redhat-resources
 %patch2 -p1 -b .can-2003-0063
 %patch3 -p1 -b .man-page_paths
+%patch4 -p1 -b .windowfontops
 
 %build
 %configure \
@@ -82,6 +84,10 @@
 %{x11_app_defaults_dir}/XTerm-color
 
 %changelog
+* Tue Jan 06 2009 Miroslav Lichvar <mlichvar at redhat.com> 238-1
+- update to 238 (#479000, CVE-2008-2383)
+- set default values of allowWindowOps and allowFontOps resources to false
+
 * Tue Sep 16 2008 Miroslav Lichvar <mlichvar at redhat.com> 237-1
 - update to 237
 



From kraxel at fedoraproject.org  Tue Jan  6 14:18:31 2009
From: kraxel at fedoraproject.org (Gerd Hoffmann)
Date: Tue,  6 Jan 2009 14:18:31 +0000 (UTC)
Subject: rpms/amtterm/devel .cvsignore, 1.5, 1.6 amtterm.spec, 1.6,
	1.7 sources, 1.5, 1.6
Message-ID: <20090106141831.88A1670108@cvs1.fedora.phx.redhat.com>

Author: kraxel

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

Modified Files:
	.cvsignore amtterm.spec sources 
Log Message:
update to version 1.2


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/amtterm/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	30 Oct 2008 10:32:40 -0000	1.5
+++ .cvsignore	6 Jan 2009 14:18:01 -0000	1.6
@@ -1 +1 @@
-amtterm-1.1.tar.gz
+amtterm-1.2.tar.gz


Index: amtterm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/amtterm/devel/amtterm.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- amtterm.spec	30 Oct 2008 11:55:10 -0000	1.6
+++ amtterm.spec	6 Jan 2009 14:18:01 -0000	1.7
@@ -1,7 +1,7 @@
 Name:         amtterm
 License:      GPLv2+
-Version:      1.1
-Release:      3%{?dist}
+Version:      1.2
+Release:      1%{?dist}
 Summary:      Serial-over-lan (sol) client for Intel AMT
 Group:        Applications/Internet
 Source:       %{name}-%{version}.tar.gz
@@ -43,6 +43,11 @@
 rm -rf %{buildroot}
 
 %changelog
+* Tue Jan 06 2009 Gerd Hoffmann <kraxel at redhat.com> - 1.2-1
+- update to version 1.2
+  * support special reboot commands (pxe, bios. ...).
+  * gamt: gui tweaks, logging support.
+
 * Thu Oct 30 2008 Gerd Hoffmann <kraxel at redhat.com> - 1.1-3
 - update to version 1.1
   * handle BIOS-over-SOL.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/amtterm/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	30 Oct 2008 10:32:40 -0000	1.5
+++ sources	6 Jan 2009 14:18:01 -0000	1.6
@@ -1 +1 @@
-43900abfd7fe67f2823716764df45885  amtterm-1.1.tar.gz
+74646aeab6af038bd557f344f8178adc  amtterm-1.2.tar.gz



From varekova at fedoraproject.org  Tue Jan  6 14:20:05 2009
From: varekova at fedoraproject.org (Ivana Varekova)
Date: Tue,  6 Jan 2009 14:20:05 +0000 (UTC)
Subject: rpms/gd/devel gd-2.0.35-time.patch,NONE,1.1 gd.spec,1.50,1.51
Message-ID: <20090106142005.0AE3270108@cvs1.fedora.phx.redhat.com>

Author: varekova

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

Modified Files:
	gd.spec 
Added Files:
	gd-2.0.35-time.patch 
Log Message:
- do minor spec file cleanup 


gd-2.0.35-time.patch:

--- NEW FILE gd-2.0.35-time.patch ---
diff -up gd-2.0.35/Makefile.in.time gd-2.0.35/Makefile.in
--- gd-2.0.35/Makefile.in.time	2009-01-06 15:07:36.000000000 +0100
+++ gd-2.0.35/Makefile.in	2009-01-06 15:09:54.000000000 +0100
@@ -25,7 +25,7 @@ pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 top_builddir = .
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
+INSTALL = @INSTALL@ -p
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c


Index: gd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gd/devel/gd.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- gd.spec	21 Jul 2008 15:25:47 -0000	1.50
+++ gd.spec	6 Jan 2009 14:19:34 -0000	1.51
@@ -1,7 +1,7 @@
 Summary:       A graphics library for quick creation of PNG or JPEG images
 Name:          gd
 Version:       2.0.35
-Release:       6%{?dist}
+Release:       7%{?dist}
 Group:         System Environment/Libraries
 License:       MIT
 URL:           http://www.libgd.org/Main_Page
@@ -13,7 +13,8 @@
 Patch6:        gd-2.0.35-overflow.patch
 Patch7:        gd-2.0.35-AALineThick.patch
 Patch8:        gd-2.0.33-BoxBound.patch
-Patch9:	       gd-2.0.34-fonts.patch
+Patch9:        gd-2.0.34-fonts.patch
+Patch10:       gd-2.0.35-time.patch
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: freetype-devel, fontconfig-devel, libX11-devel, libXpm-devel
 BuildRequires: libjpeg-devel, libpng-devel, zlib-devel, pkgconfig
@@ -59,6 +60,7 @@
 %patch7 -p1 -b .AALineThick
 %patch8 -p1 -b .bb
 %patch9 -p1 -b .fonts
+%patch10 -p1 -b .time
 
 %build
 %configure --disable-rpath
@@ -66,9 +68,9 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
-rm -f $RPM_BUILD_ROOT/%{_libdir}/libgd.la
-rm -f $RPM_BUILD_ROOT/%{_libdir}/libgd.a
+make install INSTALL='install -p' DESTDIR=$RPM_BUILD_ROOT 
+rm $RPM_BUILD_ROOT/%{_libdir}/libgd.la
+rm $RPM_BUILD_ROOT/%{_libdir}/libgd.a
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -80,7 +82,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc COPYING README-JPEG.TXT index.html 
+%doc COPYING README-JPEG.TXT index.html NEWS
 %{_libdir}/*.so.*
 
 %files progs
@@ -97,6 +99,9 @@
 %{_libdir}/pkgconfig/gdlib.pc
 
 %changelog
+* Tue Jan  6 2009 Ivana Varekova <varekova at redhat.com> - 2.0.35-7
+- do minor spec file cleanup 
+
 * Mon Jul 21 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 2.0.35-6
 - fix license tag (nothing in this is GPL)
 



From mlichvar at fedoraproject.org  Tue Jan  6 14:21:25 2009
From: mlichvar at fedoraproject.org (Miroslav Lichvar)
Date: Tue,  6 Jan 2009 14:21:25 +0000 (UTC)
Subject: rpms/xterm/F-10 xterm-238-windowfontops.patch, NONE, 1.1 .cvsignore,
	1.31, 1.32 sources, 1.31, 1.32 xterm.spec, 1.69, 1.70
Message-ID: <20090106142125.DC78670108@cvs1.fedora.phx.redhat.com>

Author: mlichvar

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

Modified Files:
	.cvsignore sources xterm.spec 
Added Files:
	xterm-238-windowfontops.patch 
Log Message:
- update to 238 (#479000, CVE-2008-2383)
- set default values of allowWindowOps and allowFontOps resources to false


xterm-238-windowfontops.patch:

--- NEW FILE xterm-238-windowfontops.patch ---
diff -up xterm-238/charproc.c.windowfontops xterm-238/charproc.c
--- xterm-238/charproc.c.windowfontops	2009-01-06 12:10:30.000000000 +0100
+++ xterm-238/charproc.c	2009-01-06 12:15:57.000000000 +0100
@@ -389,10 +389,10 @@ static XtActionsRec actionsList[] = {
 static XtResource resources[] =
 {
     Bres(XtNallowSendEvents, XtCAllowSendEvents, screen.allowSendEvent0, False),
-    Bres(XtNallowFontOps, XtCAllowFontOps, screen.allowFontOp0, True),
+    Bres(XtNallowFontOps, XtCAllowFontOps, screen.allowFontOp0, False),
     Bres(XtNallowTcapOps, XtCAllowTcapOps, screen.allowTcapOp0, True),
     Bres(XtNallowTitleOps, XtCAllowTitleOps, screen.allowTitleOp0, True),
-    Bres(XtNallowWindowOps, XtCAllowWindowOps, screen.allowWindowOp0, True),
+    Bres(XtNallowWindowOps, XtCAllowWindowOps, screen.allowWindowOp0, False),
     Bres(XtNaltIsNotMeta, XtCAltIsNotMeta, screen.alt_is_not_meta, False),
     Bres(XtNaltSendsEscape, XtCAltSendsEscape, screen.alt_sends_esc, False),
     Bres(XtNalwaysBoldMode, XtCAlwaysBoldMode, screen.always_bold_mode, False),
diff -up xterm-238/xterm.man.windowfontops xterm-238/xterm.man
--- xterm-238/xterm.man.windowfontops	2009-01-06 12:10:30.000000000 +0100
+++ xterm-238/xterm.man	2009-01-06 12:11:39.000000000 +0100
@@ -1448,7 +1448,7 @@ The default is ``false.''
 .TP
 .B "allowFontOps (\fPclass\fB AllowFontOps)"
 Specifies whether control sequences that set/query the font should be allowed.
-The default is ``true.''
+The default is ``false.''
 .TP 8
 .B "allowSendEvents (\fPclass\fB AllowSendEvents)"
 Specifies whether or not synthetic key and button events (generated using
@@ -1472,7 +1472,7 @@ The default is ``true.''
 .B "allowWindowOps (\fPclass\fB AllowWindowOps)"
 Specifies whether extended window control sequences (as used in dtterm)
 should be allowed.
-The default is ``true.''
+The default is ``false.''
 .TP 8
 .B "altIsNotMeta (\fPclass\fB AltIsNotMeta\fP)"
 If ``true'', treat the Alt-key as if it were the Meta-key.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xterm/F-10/.cvsignore,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- .cvsignore	16 Sep 2008 16:53:13 -0000	1.31
+++ .cvsignore	6 Jan 2009 14:20:55 -0000	1.32
@@ -1,2 +1,2 @@
 16colors.txt
-xterm-237.tgz
+xterm-238.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xterm/F-10/sources,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- sources	16 Sep 2008 16:53:13 -0000	1.31
+++ sources	6 Jan 2009 14:20:55 -0000	1.32
@@ -1,2 +1,2 @@
 6093439b8d79089f4ff1cdfed358b401  16colors.txt
-6d5f9e124fd3e09487f47c66da8c7345  xterm-237.tgz
+754f670723eb9a20f9f90d7c5f4a5bad  xterm-238.tgz


Index: xterm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xterm/F-10/xterm.spec,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- xterm.spec	16 Sep 2008 16:53:13 -0000	1.69
+++ xterm.spec	6 Jan 2009 14:20:55 -0000	1.70
@@ -1,6 +1,6 @@
 Summary: Terminal emulator for the X Window System
 Name: xterm
-Version: 237
+Version: 238
 Release: 1%{?dist}
 URL: http://dickey.his.com/xterm
 License: MIT
@@ -16,6 +16,7 @@
 Patch1: xterm-223-resources.patch
 Patch2: xterm-222-can-2003-0063.patch
 Patch3: xterm-226-man-page_paths.patch
+Patch4: xterm-238-windowfontops.patch
 
 %bcond_with trace
 
@@ -32,6 +33,7 @@
 %patch1 -p1 -b .redhat-resources
 %patch2 -p1 -b .can-2003-0063
 %patch3 -p1 -b .man-page_paths
+%patch4 -p1 -b .windowfontops
 
 %build
 %configure \
@@ -82,6 +84,10 @@
 %{x11_app_defaults_dir}/XTerm-color
 
 %changelog
+* Tue Jan 06 2009 Miroslav Lichvar <mlichvar at redhat.com> 238-1
+- update to 238 (#479000, CVE-2008-2383)
+- set default values of allowWindowOps and allowFontOps resources to false
+
 * Tue Sep 16 2008 Miroslav Lichvar <mlichvar at redhat.com> 237-1
 - update to 237
 



From timlau at fedoraproject.org  Tue Jan  6 14:22:47 2009
From: timlau at fedoraproject.org (Tim Lauridsen)
Date: Tue,  6 Jan 2009 14:22:47 +0000 (UTC)
Subject: rpms/postr/F-10 postr.spec,1.10,1.11 sources,1.8,1.9
Message-ID: <20090106142247.D959D70108@cvs1.fedora.phx.redhat.com>

Author: timlau

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

Modified Files:
	postr.spec sources 
Log Message:
upstream release 0.12.3


Index: postr.spec
===================================================================
RCS file: /cvs/pkgs/rpms/postr/F-10/postr.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- postr.spec	9 Sep 2008 06:55:36 -0000	1.10
+++ postr.spec	6 Jan 2009 14:22:17 -0000	1.11
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           postr
-Version:        0.12.2
+Version:        0.12.3
 Release:        1%{?dist}
 Summary:        Flickr uploader
 
@@ -71,6 +71,9 @@
 
 
 %changelog
+* Tue Jan 6 2009 Tim Lauridsen <timlau at fedoraproject.org> - 0.12.3-1
+- New upstream version 0.12.3
+
 * 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.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/postr/F-10/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	9 Sep 2008 06:55:36 -0000	1.8
+++ sources	6 Jan 2009 14:22:17 -0000	1.9
@@ -1 +1 @@
-0b823d94dd6a7e96fde94a2581aaf819  postr-0.12.2.tar.gz
+9c6452ed378eb8c8f808134a3bdcacaa  postr-0.12.3.tar.gz



From buc at fedoraproject.org  Tue Jan  6 14:25:36 2009
From: buc at fedoraproject.org (Dmitry Butskoy)
Date: Tue,  6 Jan 2009 14:25:36 +0000 (UTC)
Subject: rpms/newscache/devel newscache.spec, 1.21,
	1.22 socket++-1.12.12-autotools.patch, 1.3, 1.4
Message-ID: <20090106142536.4E35B70108@cvs1.fedora.phx.redhat.com>

Author: buc

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

Modified Files:
	newscache.spec socket++-1.12.12-autotools.patch 
Log Message:



Index: newscache.spec
===================================================================
RCS file: /cvs/extras/rpms/newscache/devel/newscache.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- newscache.spec	6 Jan 2009 14:14:48 -0000	1.21
+++ newscache.spec	6 Jan 2009 14:25:05 -0000	1.22
@@ -40,7 +40,7 @@
 %patch2 -p1
 
 pushd socket++-%{socketver}
-#%patch3 -p1
+%patch3 -p1
 popd
 
 
@@ -52,10 +52,9 @@
 
 pushd socket++-%{socketver}
 #./autogen
+libtoolize -v --force
 aclocal
 autoheader
-automake --add-missing || :
-libtoolize -v
 automake --add-missing
 autoconf
 

socket++-1.12.12-autotools.patch:

Index: socket++-1.12.12-autotools.patch
===================================================================
RCS file: /cvs/extras/rpms/newscache/devel/socket++-1.12.12-autotools.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- socket++-1.12.12-autotools.patch	6 Jan 2009 13:09:17 -0000	1.3
+++ socket++-1.12.12-autotools.patch	6 Jan 2009 14:25:05 -0000	1.4
@@ -1,6 +1,6 @@
 diff -Nrbu socket++-1.12.12/Makefile.am socket++-1.12.12-OK/Makefile.am
 --- socket++-1.12.12/Makefile.am	2002-11-25 15:31:56.000000000 +0300
-+++ socket++-1.12.12-OK/Makefile.am	2009-01-06 16:03:17.000000000 +0300
++++ socket++-1.12.12-OK/Makefile.am	2009-01-06 17:22:05.000000000 +0300
 @@ -1,2 +1,4 @@
  SUBDIRS = socket++ doc
  
@@ -8,11 +8,12 @@
 +
 diff -Nrbu socket++-1.12.12/configure.in socket++-1.12.12-OK/configure.in
 --- socket++-1.12.12/configure.in	2004-09-30 17:00:14.000000000 +0400
-+++ socket++-1.12.12-OK/configure.in	2009-01-06 15:55:48.000000000 +0300
-@@ -28,6 +28,8 @@
++++ socket++-1.12.12-OK/configure.in	2009-01-06 17:24:04.000000000 +0300
+@@ -28,6 +28,9 @@
  dnl Specify a configuration file
  AM_CONFIG_HEADER(socket++/config.h)
  
++AC_CONFIG_AUX_DIR([autotools])
 +AC_CONFIG_MACRO_DIR([m4])
 +
  dnl check for programs



From mlichvar at fedoraproject.org  Tue Jan  6 14:27:15 2009
From: mlichvar at fedoraproject.org (Miroslav Lichvar)
Date: Tue,  6 Jan 2009 14:27:15 +0000 (UTC)
Subject: rpms/xterm/F-9 xterm-238-windowfontops.patch, NONE, 1.1 .cvsignore, 
	1.30, 1.31 sources, 1.30, 1.31 xterm.spec, 1.68, 1.69
Message-ID: <20090106142715.4027C70108@cvs1.fedora.phx.redhat.com>

Author: mlichvar

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

Modified Files:
	.cvsignore sources xterm.spec 
Added Files:
	xterm-238-windowfontops.patch 
Log Message:
- update to 238 (#479000, CVE-2008-2383)
- set default values of allowWindowOps and allowFontOps resources to false


xterm-238-windowfontops.patch:

--- NEW FILE xterm-238-windowfontops.patch ---
diff -up xterm-238/charproc.c.windowfontops xterm-238/charproc.c
--- xterm-238/charproc.c.windowfontops	2009-01-06 12:10:30.000000000 +0100
+++ xterm-238/charproc.c	2009-01-06 12:15:57.000000000 +0100
@@ -389,10 +389,10 @@ static XtActionsRec actionsList[] = {
 static XtResource resources[] =
 {
     Bres(XtNallowSendEvents, XtCAllowSendEvents, screen.allowSendEvent0, False),
-    Bres(XtNallowFontOps, XtCAllowFontOps, screen.allowFontOp0, True),
+    Bres(XtNallowFontOps, XtCAllowFontOps, screen.allowFontOp0, False),
     Bres(XtNallowTcapOps, XtCAllowTcapOps, screen.allowTcapOp0, True),
     Bres(XtNallowTitleOps, XtCAllowTitleOps, screen.allowTitleOp0, True),
-    Bres(XtNallowWindowOps, XtCAllowWindowOps, screen.allowWindowOp0, True),
+    Bres(XtNallowWindowOps, XtCAllowWindowOps, screen.allowWindowOp0, False),
     Bres(XtNaltIsNotMeta, XtCAltIsNotMeta, screen.alt_is_not_meta, False),
     Bres(XtNaltSendsEscape, XtCAltSendsEscape, screen.alt_sends_esc, False),
     Bres(XtNalwaysBoldMode, XtCAlwaysBoldMode, screen.always_bold_mode, False),
diff -up xterm-238/xterm.man.windowfontops xterm-238/xterm.man
--- xterm-238/xterm.man.windowfontops	2009-01-06 12:10:30.000000000 +0100
+++ xterm-238/xterm.man	2009-01-06 12:11:39.000000000 +0100
@@ -1448,7 +1448,7 @@ The default is ``false.''
 .TP
 .B "allowFontOps (\fPclass\fB AllowFontOps)"
 Specifies whether control sequences that set/query the font should be allowed.
-The default is ``true.''
+The default is ``false.''
 .TP 8
 .B "allowSendEvents (\fPclass\fB AllowSendEvents)"
 Specifies whether or not synthetic key and button events (generated using
@@ -1472,7 +1472,7 @@ The default is ``true.''
 .B "allowWindowOps (\fPclass\fB AllowWindowOps)"
 Specifies whether extended window control sequences (as used in dtterm)
 should be allowed.
-The default is ``true.''
+The default is ``false.''
 .TP 8
 .B "altIsNotMeta (\fPclass\fB AltIsNotMeta\fP)"
 If ``true'', treat the Alt-key as if it were the Meta-key.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xterm/F-9/.cvsignore,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- .cvsignore	30 Jul 2008 16:32:43 -0000	1.30
+++ .cvsignore	6 Jan 2009 14:26:44 -0000	1.31
@@ -1,2 +1,2 @@
 16colors.txt
-xterm-236.tgz
+xterm-238.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xterm/F-9/sources,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- sources	30 Jul 2008 16:32:43 -0000	1.30
+++ sources	6 Jan 2009 14:26:44 -0000	1.31
@@ -1,2 +1,2 @@
 6093439b8d79089f4ff1cdfed358b401  16colors.txt
-204288c9de867679fc8201f4fb153772  xterm-236.tgz
+754f670723eb9a20f9f90d7c5f4a5bad  xterm-238.tgz


Index: xterm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xterm/F-9/xterm.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- xterm.spec	30 Jul 2008 16:32:43 -0000	1.68
+++ xterm.spec	6 Jan 2009 14:26:44 -0000	1.69
@@ -1,6 +1,6 @@
 Summary: Terminal emulator for the X Window System
 Name: xterm
-Version: 236
+Version: 238
 Release: 1%{?dist}
 URL: http://dickey.his.com/xterm
 License: MIT
@@ -16,6 +16,7 @@
 Patch1: xterm-223-resources.patch
 Patch2: xterm-222-can-2003-0063.patch
 Patch3: xterm-226-man-page_paths.patch
+Patch4: xterm-238-windowfontops.patch
 
 %bcond_with trace
 
@@ -32,6 +33,7 @@
 %patch1 -p1 -b .redhat-resources
 %patch2 -p1 -b .can-2003-0063
 %patch3 -p1 -b .man-page_paths
+%patch4 -p1 -b .windowfontops
 
 %build
 %configure \
@@ -82,6 +84,10 @@
 %{x11_app_defaults_dir}/XTerm-color
 
 %changelog
+* Tue Jan 06 2009 Miroslav Lichvar <mlichvar at redhat.com> 238-1
+- update to 238 (#479000, CVE-2008-2383)
+- set default values of allowWindowOps and allowFontOps resources to false
+
 * Wed Jul 30 2008 Miroslav Lichvar <mlichvar at redhat.com> 236-1
 - update to 236
 - enable support for spawn-new-terminal action (#457130)



From limb at fedoraproject.org  Tue Jan  6 14:27:46 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Tue,  6 Jan 2009 14:27:46 +0000 (UTC)
Subject: rpms/bacula/devel .cvsignore, 1.6, 1.7 bacula.spec, 1.20,
	1.21 sources, 1.5, 1.6
Message-ID: <20090106142746.BB31870108@cvs1.fedora.phx.redhat.com>

Author: limb

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

Modified Files:
	.cvsignore bacula.spec sources 
Log Message:
New upstream.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bacula/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	22 Oct 2008 19:33:30 -0000	1.6
+++ .cvsignore	6 Jan 2009 14:27:16 -0000	1.7
@@ -1,2 +1,2 @@
-bacula-2.4.3.tar.gz
-bacula-docs-2.4.3.tar.bz2
+bacula-2.4.4.tar.gz
+bacula-docs-2.4.4.tar.bz2


Index: bacula.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bacula/devel/bacula.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- bacula.spec	15 Dec 2008 21:03:12 -0000	1.20
+++ bacula.spec	6 Jan 2009 14:27:16 -0000	1.21
@@ -7,8 +7,8 @@
 
 Summary: Cross platform network backup for Linux, Unix, Mac and Windows
 Name: bacula
-Version: 2.4.3
-Release: 7%{?dist}
+Version: 2.4.4
+Release: 8%{?dist}
 # See LICENSE for details
 License: GPLv2 with exceptions
 Group: System Environment/Daemons
@@ -36,8 +36,8 @@
 #Patch8: 2.0.3-verify.patch
 #Patch9: 2.0.3-tls-disconnect.patch
 #Patch10: bacula-web-smarty.patch
-Patch11: bacula-2.4.3-orphaned-jobs.patch
-Patch12: bacula-2.4.3-python26.patch
+#Patch11: bacula-2.4.3-orphaned-jobs.patch
+#Patch12: bacula-2.4.3-python26.patch
 URL: http://www.bacula.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: openssl-devel, atk-devel, ncurses-devel, pango-devel, perl
@@ -361,8 +361,8 @@
 #%patch7 -p0
 #%patch8 -p0
 #%patch9 -p0
-%patch11 -p0
-%patch12 -p0
+#%patch11 -p0
+#%patch12 -p0
 
 # Remove execution permissions from files we're packaging as docs later on
 find examples -type f | xargs chmod -x
@@ -990,6 +990,10 @@
 
 
 %changelog
+* Mon Jan 05 2009 Jon Ciesla <limb at jcomserv.net - 2.4.4-1
+- Update to new upstream, 2.4.4.
+- Dropped orphaned jobs patch, python 2.6 patch, applied upstream.
+
 * Mon Dec 15 2008 Jon Ciesla <limb at jcomserv.net - 2.4.3-7
 - Patched to support Python 2.6, BZ 476547.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bacula/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	22 Oct 2008 19:33:30 -0000	1.5
+++ sources	6 Jan 2009 14:27:16 -0000	1.6
@@ -1,2 +1,2 @@
-6c61f730e896e6161d21d67efed55a5b  bacula-2.4.3.tar.gz
-630cdd353baa3bfbf847f78b03c99bc4  bacula-docs-2.4.3.tar.bz2
+4eb6155b45611018af03002d37a2ffde  bacula-2.4.4.tar.gz
+d9bb3e8ca8c9a4c741b83569c21a4806  bacula-docs-2.4.4.tar.bz2



From bpepple at fedoraproject.org  Tue Jan  6 14:28:29 2009
From: bpepple at fedoraproject.org (Brian Pepple)
Date: Tue,  6 Jan 2009 14:28:29 +0000 (UTC)
Subject: rpms/python-telepathy/devel .cvsignore, 1.15,
	1.16 python-telepathy.spec, 1.25, 1.26 sources, 1.15, 1.16
Message-ID: <20090106142829.BBD5C70108@cvs1.fedora.phx.redhat.com>

Author: bpepple

Update of /cvs/pkgs/rpms/python-telepathy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21377

Modified Files:
	.cvsignore python-telepathy.spec sources 
Log Message:
* Tue Jan  6 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.15.5-1
- Update to 0.15.5.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-telepathy/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	5 Jan 2009 16:45:18 -0000	1.15
+++ .cvsignore	6 Jan 2009 14:27:59 -0000	1.16
@@ -1 +1 @@
-telepathy-python-0.15.4.tar.gz
+telepathy-python-0.15.5.tar.gz


Index: python-telepathy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-telepathy/devel/python-telepathy.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- python-telepathy.spec	5 Jan 2009 16:45:18 -0000	1.25
+++ python-telepathy.spec	6 Jan 2009 14:27:59 -0000	1.26
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           python-telepathy
-Version:        0.15.4
+Version:        0.15.5
 Release:        1%{?dist}
 Summary:        Python libraries for Telepathy
 
@@ -49,6 +49,9 @@
 
 
 %changelog
+* Tue Jan  6 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.15.5-1
+- Update to 0.15.5.
+
 * Mon Jan  5 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.15.4-1
 - Update to 0.15.4.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-telepathy/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	5 Jan 2009 16:45:18 -0000	1.15
+++ sources	6 Jan 2009 14:27:59 -0000	1.16
@@ -1 +1 @@
-e5c7428c38359cf2db387ab1ffac2c84  telepathy-python-0.15.4.tar.gz
+f732c165dd8c0f79248fd2dd123ce430  telepathy-python-0.15.5.tar.gz



From mlichvar at fedoraproject.org  Tue Jan  6 14:28:32 2009
From: mlichvar at fedoraproject.org (Miroslav Lichvar)
Date: Tue,  6 Jan 2009 14:28:32 +0000 (UTC)
Subject: rpms/xterm/F-8 xterm-238-windowfontops.patch, NONE, 1.1 .cvsignore, 
	1.29, 1.30 sources, 1.29, 1.30 xterm.spec, 1.67, 1.68
Message-ID: <20090106142832.34C8770108@cvs1.fedora.phx.redhat.com>

Author: mlichvar

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

Modified Files:
	.cvsignore sources xterm.spec 
Added Files:
	xterm-238-windowfontops.patch 
Log Message:
- update to 238 (#479000, CVE-2008-2383)
- set default values of allowWindowOps and allowFontOps resources to false


xterm-238-windowfontops.patch:

--- NEW FILE xterm-238-windowfontops.patch ---
diff -up xterm-238/charproc.c.windowfontops xterm-238/charproc.c
--- xterm-238/charproc.c.windowfontops	2009-01-06 12:10:30.000000000 +0100
+++ xterm-238/charproc.c	2009-01-06 12:15:57.000000000 +0100
@@ -389,10 +389,10 @@ static XtActionsRec actionsList[] = {
 static XtResource resources[] =
 {
     Bres(XtNallowSendEvents, XtCAllowSendEvents, screen.allowSendEvent0, False),
-    Bres(XtNallowFontOps, XtCAllowFontOps, screen.allowFontOp0, True),
+    Bres(XtNallowFontOps, XtCAllowFontOps, screen.allowFontOp0, False),
     Bres(XtNallowTcapOps, XtCAllowTcapOps, screen.allowTcapOp0, True),
     Bres(XtNallowTitleOps, XtCAllowTitleOps, screen.allowTitleOp0, True),
-    Bres(XtNallowWindowOps, XtCAllowWindowOps, screen.allowWindowOp0, True),
+    Bres(XtNallowWindowOps, XtCAllowWindowOps, screen.allowWindowOp0, False),
     Bres(XtNaltIsNotMeta, XtCAltIsNotMeta, screen.alt_is_not_meta, False),
     Bres(XtNaltSendsEscape, XtCAltSendsEscape, screen.alt_sends_esc, False),
     Bres(XtNalwaysBoldMode, XtCAlwaysBoldMode, screen.always_bold_mode, False),
diff -up xterm-238/xterm.man.windowfontops xterm-238/xterm.man
--- xterm-238/xterm.man.windowfontops	2009-01-06 12:10:30.000000000 +0100
+++ xterm-238/xterm.man	2009-01-06 12:11:39.000000000 +0100
@@ -1448,7 +1448,7 @@ The default is ``false.''
 .TP
 .B "allowFontOps (\fPclass\fB AllowFontOps)"
 Specifies whether control sequences that set/query the font should be allowed.
-The default is ``true.''
+The default is ``false.''
 .TP 8
 .B "allowSendEvents (\fPclass\fB AllowSendEvents)"
 Specifies whether or not synthetic key and button events (generated using
@@ -1472,7 +1472,7 @@ The default is ``true.''
 .B "allowWindowOps (\fPclass\fB AllowWindowOps)"
 Specifies whether extended window control sequences (as used in dtterm)
 should be allowed.
-The default is ``true.''
+The default is ``false.''
 .TP 8
 .B "altIsNotMeta (\fPclass\fB AltIsNotMeta\fP)"
 If ``true'', treat the Alt-key as if it were the Meta-key.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xterm/F-8/.cvsignore,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- .cvsignore	30 Jul 2008 16:34:12 -0000	1.29
+++ .cvsignore	6 Jan 2009 14:28:01 -0000	1.30
@@ -1,2 +1,2 @@
 16colors.txt
-xterm-236.tgz
+xterm-238.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xterm/F-8/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- sources	30 Jul 2008 16:34:12 -0000	1.29
+++ sources	6 Jan 2009 14:28:01 -0000	1.30
@@ -1,2 +1,2 @@
 6093439b8d79089f4ff1cdfed358b401  16colors.txt
-204288c9de867679fc8201f4fb153772  xterm-236.tgz
+754f670723eb9a20f9f90d7c5f4a5bad  xterm-238.tgz


Index: xterm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xterm/F-8/xterm.spec,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- xterm.spec	30 Jul 2008 16:34:12 -0000	1.67
+++ xterm.spec	6 Jan 2009 14:28:01 -0000	1.68
@@ -1,6 +1,6 @@
 Summary: Terminal emulator for the X Window System
 Name: xterm
-Version: 236
+Version: 238
 Release: 1%{?dist}
 URL: http://dickey.his.com/xterm
 License: MIT
@@ -16,6 +16,7 @@
 Patch1: xterm-223-resources.patch
 Patch2: xterm-222-can-2003-0063.patch
 Patch3: xterm-226-man-page_paths.patch
+Patch4: xterm-238-windowfontops.patch
 
 %bcond_with trace
 
@@ -32,6 +33,7 @@
 %patch1 -p1 -b .redhat-resources
 %patch2 -p1 -b .can-2003-0063
 %patch3 -p1 -b .man-page_paths
+%patch4 -p1 -b .windowfontops
 
 %build
 %configure \
@@ -82,6 +84,10 @@
 %{x11_app_defaults_dir}/XTerm-color
 
 %changelog
+* Tue Jan 06 2009 Miroslav Lichvar <mlichvar at redhat.com> 238-1
+- update to 238 (#479000, CVE-2008-2383)
+- set default values of allowWindowOps and allowFontOps resources to false
+
 * Wed Jul 30 2008 Miroslav Lichvar <mlichvar at redhat.com> 236-1
 - update to 236
 - enable support for spawn-new-terminal action (#457130)



From kraxel at fedoraproject.org  Tue Jan  6 14:29:20 2009
From: kraxel at fedoraproject.org (Gerd Hoffmann)
Date: Tue,  6 Jan 2009 14:29:20 +0000 (UTC)
Subject: rpms/amtterm/F-10 .cvsignore, 1.5, 1.6 amtterm.spec, 1.6,
	1.7 sources, 1.5, 1.6
Message-ID: <20090106142920.2C7A270108@cvs1.fedora.phx.redhat.com>

Author: kraxel

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

Modified Files:
	.cvsignore amtterm.spec sources 
Log Message:
update to version 1.2


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/amtterm/F-10/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	30 Oct 2008 10:32:40 -0000	1.5
+++ .cvsignore	6 Jan 2009 14:28:49 -0000	1.6
@@ -1 +1 @@
-amtterm-1.1.tar.gz
+amtterm-1.2.tar.gz


Index: amtterm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/amtterm/F-10/amtterm.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- amtterm.spec	30 Oct 2008 11:55:10 -0000	1.6
+++ amtterm.spec	6 Jan 2009 14:28:49 -0000	1.7
@@ -1,7 +1,7 @@
 Name:         amtterm
 License:      GPLv2+
-Version:      1.1
-Release:      3%{?dist}
+Version:      1.2
+Release:      1%{?dist}
 Summary:      Serial-over-lan (sol) client for Intel AMT
 Group:        Applications/Internet
 Source:       %{name}-%{version}.tar.gz
@@ -43,6 +43,11 @@
 rm -rf %{buildroot}
 
 %changelog
+* Tue Jan 06 2009 Gerd Hoffmann <kraxel at redhat.com> - 1.2-1
+- update to version 1.2
+  * support special reboot commands (pxe, bios. ...).
+  * gamt: gui tweaks, logging support.
+
 * Thu Oct 30 2008 Gerd Hoffmann <kraxel at redhat.com> - 1.1-3
 - update to version 1.1
   * handle BIOS-over-SOL.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/amtterm/F-10/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	30 Oct 2008 10:32:40 -0000	1.5
+++ sources	6 Jan 2009 14:28:49 -0000	1.6
@@ -1 +1 @@
-43900abfd7fe67f2823716764df45885  amtterm-1.1.tar.gz
+74646aeab6af038bd557f344f8178adc  amtterm-1.2.tar.gz



From dwalsh at fedoraproject.org  Tue Jan  6 14:32:17 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Tue,  6 Jan 2009 14:32:17 +0000 (UTC)
Subject: rpms/libselinux/devel .cvsignore, 1.178, 1.179 libselinux-rhat.patch,
	1.178, 1.179 libselinux.spec, 1.352, 1.353 sources, 1.180, 1.181
Message-ID: <20090106143217.AEE4F70108@cvs1.fedora.phx.redhat.com>

Author: dwalsh

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

Modified Files:
	.cvsignore libselinux-rhat.patch libselinux.spec sources 
Log Message:
* Tue Jan 6 2009 Dan Walsh <dwalsh at redhat.com> - 2.0.77-1
- Update to upstream



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libselinux/devel/.cvsignore,v
retrieving revision 1.178
retrieving revision 1.179
diff -u -r1.178 -r1.179
--- .cvsignore	21 Nov 2008 21:06:11 -0000	1.178
+++ .cvsignore	6 Jan 2009 14:31:46 -0000	1.179
@@ -160,3 +160,4 @@
 libselinux-2.0.74.tgz
 libselinux-2.0.75.tgz
 libselinux-2.0.76.tgz
+libselinux-2.0.77.tgz

libselinux-rhat.patch:

Index: libselinux-rhat.patch
===================================================================
RCS file: /cvs/extras/rpms/libselinux/devel/libselinux-rhat.patch,v
retrieving revision 1.178
retrieving revision 1.179
diff -u -r1.178 -r1.179
--- libselinux-rhat.patch	19 Dec 2008 20:17:53 -0000	1.178
+++ libselinux-rhat.patch	6 Jan 2009 14:31:46 -0000	1.179
@@ -3078,6 +3078,47 @@
 -	return 0;
 +	return ret >= 0;
  }
+diff --exclude-from=exclude -N -u -r nsalibselinux/utils/Makefile libselinux-2.0.76/utils/Makefile
+--- nsalibselinux/utils/Makefile	2008-08-28 09:34:24.000000000 -0400
++++ libselinux-2.0.76/utils/Makefile	2008-12-19 15:55:54.000000000 -0500
+@@ -2,28 +2,33 @@
+ PREFIX ?= $(DESTDIR)/usr
+ LIBDIR ?= $(PREFIX)/lib
+ BINDIR ?= $(PREFIX)/sbin
++_BINDIR ?= $(DESTDIR)/sbin
+ 
+ CFLAGS ?= -Wall
+ override CFLAGS += -I../include -D_GNU_SOURCE $(EMFLAGS)
+ LDLIBS += -L../src -lselinux -L$(LIBDIR)
+ 
+ TARGETS=$(patsubst %.c,%,$(wildcard *.c))
++
++
+ ifeq ($(DISABLE_AVC),y)
+ 	UNUSED_TARGETS+=compute_av compute_create compute_member compute_relabel
+ endif
+ ifeq ($(DISABLE_BOOL),y)
+ 	UNUSED_TARGETS+=getsebool togglesebool
+ endif
+-TARGETS:= $(filter-out $(UNUSED_TARGETS), $(TARGETS))
++TARGETS:= $(filter-out $(UNUSED_TARGETS) matchpathcon, $(TARGETS))
+ 
+-all: $(TARGETS)
++all: $(TARGETS) matchpathcon
+ 
+ install: all
+ 	-mkdir -p $(BINDIR)
+ 	install -m 755 $(TARGETS) $(BINDIR)
+-
++	-mkdir -p $(_BINDIR)
++	install -m 755 matchpathcon $(_BINDIR)
++	(cd $(BINDIR); 	ln -fs ../../sbin/matchpathcon)
+ clean:
+-	rm -f $(TARGETS) *.o 
++	rm -f $(TARGETS) *.o *~
+ 
+ indent:
+ 	../../scripts/Lindent $(wildcard *.[ch])
 diff --exclude-from=exclude -N -u -r nsalibselinux/utils/matchpathcon.c libselinux-2.0.76/utils/matchpathcon.c
 --- nsalibselinux/utils/matchpathcon.c	2008-10-28 10:06:51.000000000 -0400
 +++ libselinux-2.0.76/utils/matchpathcon.c	2008-12-19 15:14:20.000000000 -0500


Index: libselinux.spec
===================================================================
RCS file: /cvs/extras/rpms/libselinux/devel/libselinux.spec,v
retrieving revision 1.352
retrieving revision 1.353
diff -u -r1.352 -r1.353
--- libselinux.spec	19 Dec 2008 20:17:53 -0000	1.352
+++ libselinux.spec	6 Jan 2009 14:31:47 -0000	1.353
@@ -4,8 +4,8 @@
 
 Summary: SELinux library and simple utilities
 Name: libselinux
-Version: 2.0.76
-Release: 6%{?dist}
+Version: 2.0.77
+Release: 1%{?dist}
 License: Public Domain
 Group: System Environment/Libraries
 Source: http://www.nsa.gov/selinux/archives/%{name}-%{version}.tgz
@@ -127,6 +127,7 @@
 %defattr(-,root,root,-)
 /%{_lib}/libselinux.so.*
 /var/run/setrans
+/sbin/matchpathcon
 
 %files utils
 %defattr(-,root,root,-)
@@ -163,10 +164,13 @@
 %{ruby_sitearch}/selinux.so
 
 %changelog
+* Tue Jan 6 2009 Dan Walsh <dwalsh at redhat.com> - 2.0.77-1
+- Update to upstream
+
 * Tue Dec 16 2008 Dan Walsh <dwalsh at redhat.com> - 2.0.76-6
 - Strip trailing / for matchpathcon
 
-* Tue Dec 16 2008 Dan Walsh <dwalsh at redhat.com> - 2.0.76-5
+* Tue Dec 16 2008 Dan Walsh <dwalsh at redhat.com>l - 2.0.76-5
 - Fix segfault if seusers file does not work
 
 * Fri Dec 12 2008 Dan Walsh <dwalsh at redhat.com> - 2.0.76-4


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libselinux/devel/sources,v
retrieving revision 1.180
retrieving revision 1.181
diff -u -r1.180 -r1.181
--- sources	21 Nov 2008 21:06:11 -0000	1.180
+++ sources	6 Jan 2009 14:31:47 -0000	1.181
@@ -1 +1 @@
-6829e79d3103683961d82c419bdb4e86  libselinux-2.0.76.tgz
+f0660b8d415b25e39d20f31717d48f2c  libselinux-2.0.77.tgz



From limb at fedoraproject.org  Tue Jan  6 14:34:03 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Tue,  6 Jan 2009 14:34:03 +0000 (UTC)
Subject: rpms/bacula/devel bacula.spec,1.21,1.22
Message-ID: <20090106143403.37FED70108@cvs1.fedora.phx.redhat.com>

Author: limb

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

Modified Files:
	bacula.spec 
Log Message:
Oops.



Index: bacula.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bacula/devel/bacula.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- bacula.spec	6 Jan 2009 14:27:16 -0000	1.21
+++ bacula.spec	6 Jan 2009 14:33:32 -0000	1.22
@@ -8,7 +8,7 @@
 Summary: Cross platform network backup for Linux, Unix, Mac and Windows
 Name: bacula
 Version: 2.4.4
-Release: 8%{?dist}
+Release: 1%{?dist}
 # See LICENSE for details
 License: GPLv2 with exceptions
 Group: System Environment/Daemons



From buc at fedoraproject.org  Tue Jan  6 14:36:21 2009
From: buc at fedoraproject.org (Dmitry Butskoy)
Date: Tue,  6 Jan 2009 14:36:21 +0000 (UTC)
Subject: rpms/newscache/devel socket++-1.12.12-autotools.patch,1.4,1.5
Message-ID: <20090106143621.7CE9C70108@cvs1.fedora.phx.redhat.com>

Author: buc

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

Modified Files:
	socket++-1.12.12-autotools.patch 
Log Message:


socket++-1.12.12-autotools.patch:

Index: socket++-1.12.12-autotools.patch
===================================================================
RCS file: /cvs/extras/rpms/newscache/devel/socket++-1.12.12-autotools.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- socket++-1.12.12-autotools.patch	6 Jan 2009 14:25:05 -0000	1.4
+++ socket++-1.12.12-autotools.patch	6 Jan 2009 14:36:21 -0000	1.5
@@ -1,6 +1,6 @@
 diff -Nrbu socket++-1.12.12/Makefile.am socket++-1.12.12-OK/Makefile.am
 --- socket++-1.12.12/Makefile.am	2002-11-25 15:31:56.000000000 +0300
-+++ socket++-1.12.12-OK/Makefile.am	2009-01-06 17:22:05.000000000 +0300
++++ socket++-1.12.12-OK/Makefile.am	2009-01-06 17:35:03.000000000 +0300
 @@ -1,2 +1,4 @@
  SUBDIRS = socket++ doc
  
@@ -8,14 +8,14 @@
 +
 diff -Nrbu socket++-1.12.12/configure.in socket++-1.12.12-OK/configure.in
 --- socket++-1.12.12/configure.in	2004-09-30 17:00:14.000000000 +0400
-+++ socket++-1.12.12-OK/configure.in	2009-01-06 17:24:04.000000000 +0300
-@@ -28,6 +28,9 @@
- dnl Specify a configuration file
- AM_CONFIG_HEADER(socket++/config.h)
++++ socket++-1.12.12-OK/configure.in	2009-01-06 17:35:34.000000000 +0300
+@@ -22,6 +22,9 @@
+ VERSION=$SOCKET_VERSION
+ PACKAGE=socket
  
 +AC_CONFIG_AUX_DIR([autotools])
 +AC_CONFIG_MACRO_DIR([m4])
 +
- dnl check for programs
- AC_PROG_MAKE_SET
- AC_LANG_CPLUSPLUS
+ dnl Inititalize automake stuff
+ AM_INIT_AUTOMAKE(socket++,$SOCKET_VERSION)
+ 



From pkgdb at fedoraproject.org  Tue Jan  6 14:44:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 06 Jan 2009 14:44:28 +0000
Subject: [pkgdb] postr ownership updated
Message-ID: <20090106144428.BBF502082B3@bastion.fedora.phx.redhat.com>

Package postr in Fedora 9 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 Jan  6 14:45:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 06 Jan 2009 14:45:05 +0000
Subject: [pkgdb] postr: timlau has requested watchcommits
Message-ID: <20090106144506.35AFE208D2B@bastion.fedora.phx.redhat.com>

timlau has requested the watchcommits acl on postr (Fedora 9)

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



From pkgdb at fedoraproject.org  Tue Jan  6 14:45:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 06 Jan 2009 14:45:06 +0000
Subject: [pkgdb] postr: timlau has requested watchbugzilla
Message-ID: <20090106144506.8B9BF208D51@bastion.fedora.phx.redhat.com>

timlau has requested the watchbugzilla acl on postr (Fedora 9)

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



From pkgdb at fedoraproject.org  Tue Jan  6 14:45:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 06 Jan 2009 14:45:07 +0000
Subject: [pkgdb] postr: timlau has requested commit
Message-ID: <20090106144507.3C220208D55@bastion.fedora.phx.redhat.com>

timlau has requested the commit acl on postr (Fedora 9)

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



From pkgdb at fedoraproject.org  Tue Jan  6 14:45:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 06 Jan 2009 14:45:08 +0000
Subject: [pkgdb] postr: timlau has requested approveacls
Message-ID: <20090106144509.3AC55208D52@bastion.fedora.phx.redhat.com>

timlau has requested the approveacls acl on postr (Fedora 9)

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



From dwalsh at fedoraproject.org  Tue Jan  6 14:46:52 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Tue,  6 Jan 2009 14:46:52 +0000 (UTC)
Subject: rpms/selinux-policy/devel policy-20090105.patch, 1.2,
	1.3 selinux-policy.spec, 1.762, 1.763
Message-ID: <20090106144652.659B17013F@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28002

Modified Files:
	policy-20090105.patch selinux-policy.spec 
Log Message:
* Tue Jan 6 2009 Dan Walsh <dwalsh at redhat.com> 3.6.2-2
- Remove audio_entropy policy


policy-20090105.patch:

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.2 -r 1.3 policy-20090105.patch
Index: policy-20090105.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-20090105.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- policy-20090105.patch	5 Jan 2009 22:51:01 -0000	1.2
+++ policy-20090105.patch	6 Jan 2009 14:46:21 -0000	1.3
@@ -1,6 +1,6 @@
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/default_contexts serefpolicy-3.6.2/config/appconfig-mcs/default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/default_contexts	2008-11-11 16:13:50.000000000 -0500
-+++ serefpolicy-3.6.2/config/appconfig-mcs/default_contexts	2009-01-05 17:10:36.000000000 -0500
++++ serefpolicy-3.6.2/config/appconfig-mcs/default_contexts	2009-01-05 17:54:58.000000000 -0500
 @@ -1,15 +1,6 @@
 -system_r:crond_t:s0		user_r:cronjob_t:s0 staff_r:cronjob_t:s0 sysadm_r:cronjob_t:s0 system_r:cronjob_t:s0 unconfined_r:unconfined_cronjob_t:s0
 -system_r:local_login_t:s0	user_r:user_t:s0 staff_r:staff_t:s0 sysadm_r:sysadm_t:s0 unconfined_r:unconfined_t:s0
@@ -24,13 +24,13 @@
 +system_r:xdm_t:s0		user_r:user_t:s0
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/failsafe_context serefpolicy-3.6.2/config/appconfig-mcs/failsafe_context
 --- nsaserefpolicy/config/appconfig-mcs/failsafe_context	2008-08-07 11:15:14.000000000 -0400
-+++ serefpolicy-3.6.2/config/appconfig-mcs/failsafe_context	2009-01-05 17:10:36.000000000 -0500
++++ serefpolicy-3.6.2/config/appconfig-mcs/failsafe_context	2009-01-05 17:54:58.000000000 -0500
 @@ -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.6.2/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.6.2/config/appconfig-mcs/guest_u_default_contexts	2009-01-05 17:10:36.000000000 -0500
++++ serefpolicy-3.6.2/config/appconfig-mcs/guest_u_default_contexts	2009-01-05 17:54:58.000000000 -0500
 @@ -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
@@ -40,7 +40,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.6.2/config/appconfig-mcs/root_default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/root_default_contexts	2008-11-11 16:13:50.000000000 -0500
-+++ serefpolicy-3.6.2/config/appconfig-mcs/root_default_contexts	2009-01-05 17:10:36.000000000 -0500
++++ serefpolicy-3.6.2/config/appconfig-mcs/root_default_contexts	2009-01-05 17:54:58.000000000 -0500
 @@ -1,11 +1,7 @@
 -system_r:crond_t:s0		unconfined_r:unconfined_t:s0 sysadm_r:cronjob_t:s0 staff_r:cronjob_t:s0 user_r:cronjob_t:s0
 +system_r:crond_t:s0		unconfined_r:unconfined_t:s0 sysadm_r:sysadm_t:s0 staff_r:staff_t:s0 user_r:user_t:s0
@@ -57,7 +57,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/seusers serefpolicy-3.6.2/config/appconfig-mcs/seusers
 --- nsaserefpolicy/config/appconfig-mcs/seusers	2008-08-07 11:15:14.000000000 -0400
-+++ serefpolicy-3.6.2/config/appconfig-mcs/seusers	2009-01-05 17:10:36.000000000 -0500
++++ serefpolicy-3.6.2/config/appconfig-mcs/seusers	2009-01-05 17:54:58.000000000 -0500
 @@ -1,3 +1,3 @@
  system_u:system_u:s0-mcs_systemhigh
 -root:root:s0-mcs_systemhigh
@@ -66,7 +66,7 @@
 +__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.6.2/config/appconfig-mcs/staff_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/staff_u_default_contexts	2008-11-11 16:13:50.000000000 -0500
-+++ serefpolicy-3.6.2/config/appconfig-mcs/staff_u_default_contexts	2009-01-05 17:10:36.000000000 -0500
++++ serefpolicy-3.6.2/config/appconfig-mcs/staff_u_default_contexts	2009-01-05 17:54:58.000000000 -0500
 @@ -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
@@ -83,7 +83,7 @@
  
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/unconfined_u_default_contexts serefpolicy-3.6.2/config/appconfig-mcs/unconfined_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/unconfined_u_default_contexts	2008-11-11 16:13:50.000000000 -0500
-+++ serefpolicy-3.6.2/config/appconfig-mcs/unconfined_u_default_contexts	2009-01-05 17:10:36.000000000 -0500
++++ serefpolicy-3.6.2/config/appconfig-mcs/unconfined_u_default_contexts	2009-01-05 17:54:58.000000000 -0500
 @@ -1,4 +1,4 @@
 -system_r:crond_t:s0		unconfined_r:unconfined_t:s0 unconfined_r:unconfined_cronjob_t:s0
 +system_r:crond_t:s0		unconfined_r:unconfined_t:s0
@@ -99,13 +99,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/userhelper_context serefpolicy-3.6.2/config/appconfig-mcs/userhelper_context
 --- nsaserefpolicy/config/appconfig-mcs/userhelper_context	2008-08-07 11:15:14.000000000 -0400
-+++ serefpolicy-3.6.2/config/appconfig-mcs/userhelper_context	2009-01-05 17:10:36.000000000 -0500
++++ serefpolicy-3.6.2/config/appconfig-mcs/userhelper_context	2009-01-05 17:54:58.000000000 -0500
 @@ -1 +1 @@
 -system_u:sysadm_r:sysadm_t:s0
 +system_u:system_r:unconfined_t:s0	
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/user_u_default_contexts serefpolicy-3.6.2/config/appconfig-mcs/user_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/user_u_default_contexts	2008-11-11 16:13:50.000000000 -0500
-+++ serefpolicy-3.6.2/config/appconfig-mcs/user_u_default_contexts	2009-01-05 17:10:36.000000000 -0500
++++ serefpolicy-3.6.2/config/appconfig-mcs/user_u_default_contexts	2009-01-05 17:54:58.000000000 -0500
 @@ -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
@@ -120,7 +120,7 @@
 +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/xguest_u_default_contexts serefpolicy-3.6.2/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.6.2/config/appconfig-mcs/xguest_u_default_contexts	2009-01-05 17:10:36.000000000 -0500
++++ serefpolicy-3.6.2/config/appconfig-mcs/xguest_u_default_contexts	2009-01-05 17:54:58.000000000 -0500
 @@ -0,0 +1,7 @@
 +system_r:local_login_t	xguest_r:xguest_t:s0
 +system_r:remote_login_t	xguest_r:xguest_t:s0
@@ -131,7 +131,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/default_contexts serefpolicy-3.6.2/config/appconfig-mls/default_contexts
 --- nsaserefpolicy/config/appconfig-mls/default_contexts	2008-11-11 16:13:50.000000000 -0500
-+++ serefpolicy-3.6.2/config/appconfig-mls/default_contexts	2009-01-05 17:10:36.000000000 -0500
++++ serefpolicy-3.6.2/config/appconfig-mls/default_contexts	2009-01-05 17:54:58.000000000 -0500
 @@ -1,15 +1,6 @@
 -system_r:crond_t:s0		user_r:cronjob_t:s0 staff_r:cronjob_t:s0 sysadm_r:cronjob_t:s0 system_r:cronjob_t:s0 unconfined_r:unconfined_cronjob_t:s0
 -system_r:local_login_t:s0	user_r:user_t:s0 staff_r:staff_t:s0 sysadm_r:sysadm_t:s0 unconfined_r:unconfined_t:s0
@@ -155,7 +155,7 @@
 +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.6.2/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.6.2/config/appconfig-mls/guest_u_default_contexts	2009-01-05 17:10:36.000000000 -0500
++++ serefpolicy-3.6.2/config/appconfig-mls/guest_u_default_contexts	2009-01-05 17:54:58.000000000 -0500
 @@ -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
@@ -163,7 +163,7 @@
 +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.6.2/config/appconfig-mls/root_default_contexts
 --- nsaserefpolicy/config/appconfig-mls/root_default_contexts	2008-11-11 16:13:50.000000000 -0500
-+++ serefpolicy-3.6.2/config/appconfig-mls/root_default_contexts	2009-01-05 17:10:36.000000000 -0500
++++ serefpolicy-3.6.2/config/appconfig-mls/root_default_contexts	2009-01-05 17:54:58.000000000 -0500
 @@ -1,11 +1,11 @@
 -system_r:crond_t:s0		unconfined_r:unconfined_t:s0 sysadm_r:cronjob_t:s0 staff_r:cronjob_t:s0 user_r:cronjob_t:s0
 -system_r:local_login_t:s0	unconfined_r:unconfined_t:s0 sysadm_r:sysadm_t:s0 staff_r:staff_t:s0 user_r:user_t:s0
@@ -184,7 +184,7 @@
 +#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/xguest_u_default_contexts serefpolicy-3.6.2/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.6.2/config/appconfig-mls/xguest_u_default_contexts	2009-01-05 17:10:36.000000000 -0500
++++ serefpolicy-3.6.2/config/appconfig-mls/xguest_u_default_contexts	2009-01-05 17:54:58.000000000 -0500
 @@ -0,0 +1,7 @@
 +system_r:local_login_t	xguest_r:xguest_t:s0
 +system_r:remote_login_t	xguest_r:xguest_t:s0
@@ -195,7 +195,7 @@
 +xguest_r:xguest_t:s0	xguest_r:xguest_t:s0
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/Makefile serefpolicy-3.6.2/Makefile
 --- nsaserefpolicy/Makefile	2008-11-11 16:13:50.000000000 -0500
-+++ serefpolicy-3.6.2/Makefile	2009-01-05 17:10:36.000000000 -0500
++++ serefpolicy-3.6.2/Makefile	2009-01-05 17:54:58.000000000 -0500
 @@ -315,20 +315,22 @@
  
  # parse-rolemap modulename,outputfile
@@ -242,7 +242,7 @@
  	$(verbose) $(INSTALL) -m 644 $< $@
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/man/man8/httpd_selinux.8 serefpolicy-3.6.2/man/man8/httpd_selinux.8
 --- nsaserefpolicy/man/man8/httpd_selinux.8	2008-08-25 09:12:31.000000000 -0400
-+++ serefpolicy-3.6.2/man/man8/httpd_selinux.8	2009-01-05 17:10:36.000000000 -0500
++++ serefpolicy-3.6.2/man/man8/httpd_selinux.8	2009-01-05 17:54:58.000000000 -0500
 @@ -41,7 +41,7 @@
  - Set cgi scripts with httpd_unconfined_script_exec_t to allow them to run without any SELinux protection. This should only be used for a very complex httpd scripts, after exhausting all other options.  It is better to use this script rather than turning off SELinux protection for httpd.
  
@@ -263,7 +263,7 @@
  setsebool -P httpd_tty_comm 1
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/man/man8/kerberos_selinux.8 serefpolicy-3.6.2/man/man8/kerberos_selinux.8
 --- nsaserefpolicy/man/man8/kerberos_selinux.8	2008-08-07 11:15:14.000000000 -0400
-+++ serefpolicy-3.6.2/man/man8/kerberos_selinux.8	2009-01-05 17:10:36.000000000 -0500
++++ serefpolicy-3.6.2/man/man8/kerberos_selinux.8	2009-01-05 17:54:58.000000000 -0500
 @@ -12,7 +12,7 @@
  .SH "DESCRIPTION"
  
@@ -275,7 +275,7 @@
  You must set the allow_kerberos boolean to allow your system to work properly in a Kerberos environment.
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/man/man8/nfs_selinux.8 serefpolicy-3.6.2/man/man8/nfs_selinux.8
 --- nsaserefpolicy/man/man8/nfs_selinux.8	2008-08-07 11:15:14.000000000 -0400
-+++ serefpolicy-3.6.2/man/man8/nfs_selinux.8	2009-01-05 17:10:36.000000000 -0500
++++ serefpolicy-3.6.2/man/man8/nfs_selinux.8	2009-01-05 17:54:58.000000000 -0500
 @@ -26,5 +26,5 @@
  .SH AUTHOR	
  This manual page was written by Dan Walsh <dwalsh at redhat.com>.
@@ -285,7 +285,7 @@
  selinux(8), chcon(1), setsebool(8)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/man/man8/samba_selinux.8 serefpolicy-3.6.2/man/man8/samba_selinux.8
 --- nsaserefpolicy/man/man8/samba_selinux.8	2008-08-07 11:15:14.000000000 -0400
-+++ serefpolicy-3.6.2/man/man8/samba_selinux.8	2009-01-05 17:10:36.000000000 -0500
++++ serefpolicy-3.6.2/man/man8/samba_selinux.8	2009-01-05 17:54:58.000000000 -0500
 @@ -14,11 +14,17 @@
  .TP
  chcon -t samba_share_t /var/eng
@@ -308,8 +308,8 @@
  .SH SHARING FILES
  If you want to share files with multiple domains (Apache, FTP, rsync, Samba), you can set a file context of public_content_t and public_content_rw_t.  These context allow any of the above domains to read the content.  If you want a particular domain to write to the public_content_rw_t domain, you must set the appropriate boolean.  allow_DOMAIN_anon_write.  So for samba you would execute:
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/flask/access_vectors serefpolicy-3.6.2/policy/flask/access_vectors
---- nsaserefpolicy/policy/flask/access_vectors	2008-08-07 11:15:00.000000000 -0400
-+++ serefpolicy-3.6.2/policy/flask/access_vectors	2009-01-05 17:10:36.000000000 -0500
+--- nsaserefpolicy/policy/flask/access_vectors	2009-01-05 17:53:53.000000000 -0500
++++ serefpolicy-3.6.2/policy/flask/access_vectors	2009-01-05 17:54:58.000000000 -0500
 @@ -616,6 +616,7 @@
  	nlmsg_write
  	nlmsg_relay
@@ -320,7 +320,7 @@
  class netlink_ip6fw_socket
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/global_tunables serefpolicy-3.6.2/policy/global_tunables
 --- nsaserefpolicy/policy/global_tunables	2008-11-11 16:13:50.000000000 -0500
-+++ serefpolicy-3.6.2/policy/global_tunables	2009-01-05 17:10:36.000000000 -0500
++++ serefpolicy-3.6.2/policy/global_tunables	2009-01-05 17:54:58.000000000 -0500
 @@ -61,15 +61,6 @@
  
  ## <desc>
@@ -352,7 +352,7 @@
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/anaconda.te serefpolicy-3.6.2/policy/modules/admin/anaconda.te
 --- nsaserefpolicy/policy/modules/admin/anaconda.te	2009-01-05 15:39:44.000000000 -0500
-+++ serefpolicy-3.6.2/policy/modules/admin/anaconda.te	2009-01-05 17:10:36.000000000 -0500
++++ serefpolicy-3.6.2/policy/modules/admin/anaconda.te	2009-01-05 17:54:58.000000000 -0500
[...2669 lines suppressed...]
  /etc/selinux(/.*)?			gen_context(system_u:object_r:selinux_config_t,s0)
  /etc/selinux/([^/]*/)?contexts(/.*)?	gen_context(system_u:object_r:default_context_t,s0)
@@ -23971,7 +23971,7 @@
 +/etc/share/selinux/mls(/.*)?		gen_context(system_u:object_r:semanage_store_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.if serefpolicy-3.6.2/policy/modules/system/selinuxutil.if
 --- nsaserefpolicy/policy/modules/system/selinuxutil.if	2009-01-05 15:39:43.000000000 -0500
-+++ serefpolicy-3.6.2/policy/modules/system/selinuxutil.if	2009-01-05 17:10:36.000000000 -0500
++++ serefpolicy-3.6.2/policy/modules/system/selinuxutil.if	2009-01-05 17:54:59.000000000 -0500
 @@ -535,6 +535,53 @@
  
  ########################################
@@ -24362,7 +24362,7 @@
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.te serefpolicy-3.6.2/policy/modules/system/selinuxutil.te
 --- nsaserefpolicy/policy/modules/system/selinuxutil.te	2009-01-05 15:39:43.000000000 -0500
-+++ serefpolicy-3.6.2/policy/modules/system/selinuxutil.te	2009-01-05 17:10:36.000000000 -0500
++++ serefpolicy-3.6.2/policy/modules/system/selinuxutil.te	2009-01-05 17:54:59.000000000 -0500
 @@ -23,6 +23,9 @@
  type selinux_config_t;
  files_type(selinux_config_t)
@@ -24721,7 +24721,7 @@
  ')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/setrans.if serefpolicy-3.6.2/policy/modules/system/setrans.if
 --- nsaserefpolicy/policy/modules/system/setrans.if	2008-08-07 11:15:12.000000000 -0400
-+++ serefpolicy-3.6.2/policy/modules/system/setrans.if	2009-01-05 17:10:36.000000000 -0500
++++ serefpolicy-3.6.2/policy/modules/system/setrans.if	2009-01-05 17:54:59.000000000 -0500
 @@ -21,3 +21,23 @@
  	stream_connect_pattern($1,setrans_var_run_t,setrans_var_run_t,setrans_t)
  	files_list_pids($1)
@@ -24748,7 +24748,7 @@
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/sysnetwork.fc serefpolicy-3.6.2/policy/modules/system/sysnetwork.fc
 --- nsaserefpolicy/policy/modules/system/sysnetwork.fc	2008-08-07 11:15:12.000000000 -0400
-+++ serefpolicy-3.6.2/policy/modules/system/sysnetwork.fc	2009-01-05 17:10:36.000000000 -0500
++++ serefpolicy-3.6.2/policy/modules/system/sysnetwork.fc	2009-01-05 17:54:59.000000000 -0500
 @@ -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)
@@ -24773,7 +24773,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.6.2/policy/modules/system/sysnetwork.if
 --- nsaserefpolicy/policy/modules/system/sysnetwork.if	2009-01-05 15:39:43.000000000 -0500
-+++ serefpolicy-3.6.2/policy/modules/system/sysnetwork.if	2009-01-05 17:10:36.000000000 -0500
++++ serefpolicy-3.6.2/policy/modules/system/sysnetwork.if	2009-01-05 17:54:59.000000000 -0500
 @@ -192,7 +192,25 @@
  		type dhcpc_state_t;
  	')
@@ -24885,7 +24885,7 @@
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/sysnetwork.te serefpolicy-3.6.2/policy/modules/system/sysnetwork.te
 --- nsaserefpolicy/policy/modules/system/sysnetwork.te	2009-01-05 15:39:43.000000000 -0500
-+++ serefpolicy-3.6.2/policy/modules/system/sysnetwork.te	2009-01-05 17:10:36.000000000 -0500
++++ serefpolicy-3.6.2/policy/modules/system/sysnetwork.te	2009-01-05 17:54:59.000000000 -0500
 @@ -20,6 +20,9 @@
  init_daemon_domain(dhcpc_t,dhcpc_exec_t)
  role system_r types dhcpc_t;
@@ -25062,7 +25062,7 @@
  	xen_append_log(ifconfig_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/udev.fc serefpolicy-3.6.2/policy/modules/system/udev.fc
 --- nsaserefpolicy/policy/modules/system/udev.fc	2009-01-05 15:39:43.000000000 -0500
-+++ serefpolicy-3.6.2/policy/modules/system/udev.fc	2009-01-05 17:10:36.000000000 -0500
++++ serefpolicy-3.6.2/policy/modules/system/udev.fc	2009-01-05 17:54:59.000000000 -0500
 @@ -17,3 +17,5 @@
  /sbin/wait_for_sysfs -- gen_context(system_u:object_r:udev_exec_t,s0)
  
@@ -25071,7 +25071,7 @@
 +/var/run/PackageKit/udev(/.*)?		gen_context(system_u:object_r:udev_var_run_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/udev.if serefpolicy-3.6.2/policy/modules/system/udev.if
 --- nsaserefpolicy/policy/modules/system/udev.if	2008-08-07 11:15:12.000000000 -0400
-+++ serefpolicy-3.6.2/policy/modules/system/udev.if	2009-01-05 17:10:36.000000000 -0500
++++ serefpolicy-3.6.2/policy/modules/system/udev.if	2009-01-05 17:54:59.000000000 -0500
 @@ -96,6 +96,24 @@
  
  ########################################
@@ -25127,7 +25127,7 @@
  ')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/udev.te serefpolicy-3.6.2/policy/modules/system/udev.te
 --- nsaserefpolicy/policy/modules/system/udev.te	2009-01-05 15:39:43.000000000 -0500
-+++ serefpolicy-3.6.2/policy/modules/system/udev.te	2009-01-05 17:10:36.000000000 -0500
++++ serefpolicy-3.6.2/policy/modules/system/udev.te	2009-01-05 17:54:59.000000000 -0500
 @@ -83,6 +83,7 @@
  kernel_rw_unix_dgram_sockets(udev_t)
  kernel_dgram_send(udev_t)
@@ -25186,7 +25186,7 @@
  ')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.fc serefpolicy-3.6.2/policy/modules/system/unconfined.fc
 --- nsaserefpolicy/policy/modules/system/unconfined.fc	2008-09-11 16:42:49.000000000 -0400
-+++ serefpolicy-3.6.2/policy/modules/system/unconfined.fc	2009-01-05 17:10:36.000000000 -0500
++++ serefpolicy-3.6.2/policy/modules/system/unconfined.fc	2009-01-05 17:54:59.000000000 -0500
 @@ -2,15 +2,29 @@
  # e.g.:
  # /usr/local/bin/appsrv		--	gen_context(system_u:object_r:unconfined_exec_t,s0)
@@ -25228,7 +25228,7 @@
 +/usr/bin/gcl 		       --	gen_context(system_u:object_r:execmem_exec_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.if serefpolicy-3.6.2/policy/modules/system/unconfined.if
 --- nsaserefpolicy/policy/modules/system/unconfined.if	2008-11-11 16:13:48.000000000 -0500
-+++ serefpolicy-3.6.2/policy/modules/system/unconfined.if	2009-01-05 17:10:36.000000000 -0500
++++ serefpolicy-3.6.2/policy/modules/system/unconfined.if	2009-01-05 17:54:59.000000000 -0500
 @@ -12,14 +12,13 @@
  #
  interface(`unconfined_domain_noaudit',`
@@ -25464,7 +25464,7 @@
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.te serefpolicy-3.6.2/policy/modules/system/unconfined.te
 --- nsaserefpolicy/policy/modules/system/unconfined.te	2008-11-11 16:13:48.000000000 -0500
-+++ serefpolicy-3.6.2/policy/modules/system/unconfined.te	2009-01-05 17:10:36.000000000 -0500
++++ serefpolicy-3.6.2/policy/modules/system/unconfined.te	2009-01-05 17:54:59.000000000 -0500
 @@ -6,35 +6,76 @@
  # Declarations
  #
@@ -25797,7 +25797,7 @@
 +gen_user(unconfined_u, user, unconfined_r system_r, s0, s0 - mls_systemhigh, mcs_allcats)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.fc serefpolicy-3.6.2/policy/modules/system/userdomain.fc
 --- nsaserefpolicy/policy/modules/system/userdomain.fc	2008-11-11 16:13:48.000000000 -0500
-+++ serefpolicy-3.6.2/policy/modules/system/userdomain.fc	2009-01-05 17:10:36.000000000 -0500
++++ serefpolicy-3.6.2/policy/modules/system/userdomain.fc	2009-01-05 17:54:59.000000000 -0500
 @@ -1,4 +1,7 @@
  HOME_DIR	-d	gen_context(system_u:object_r:user_home_dir_t,s0-mls_systemhigh)
 +HOME_DIR	-l	gen_context(system_u:object_r:user_home_dir_t,s0-mls_systemhigh)
@@ -25809,7 +25809,7 @@
 +/dev/shm/mono.*		gen_context(system_u:object_r:user_tmpfs_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-3.6.2/policy/modules/system/userdomain.if
 --- nsaserefpolicy/policy/modules/system/userdomain.if	2009-01-05 15:39:43.000000000 -0500
-+++ serefpolicy-3.6.2/policy/modules/system/userdomain.if	2009-01-05 17:10:36.000000000 -0500
++++ serefpolicy-3.6.2/policy/modules/system/userdomain.if	2009-01-05 17:54:59.000000000 -0500
 @@ -30,8 +30,9 @@
  	')
  
@@ -27439,7 +27439,7 @@
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-3.6.2/policy/modules/system/userdomain.te
 --- nsaserefpolicy/policy/modules/system/userdomain.te	2009-01-05 15:39:43.000000000 -0500
-+++ serefpolicy-3.6.2/policy/modules/system/userdomain.te	2009-01-05 17:10:36.000000000 -0500
++++ serefpolicy-3.6.2/policy/modules/system/userdomain.te	2009-01-05 17:54:59.000000000 -0500
 @@ -8,13 +8,6 @@
  
  ## <desc>
@@ -27503,7 +27503,7 @@
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.fc serefpolicy-3.6.2/policy/modules/system/xen.fc
 --- nsaserefpolicy/policy/modules/system/xen.fc	2009-01-05 15:39:43.000000000 -0500
-+++ serefpolicy-3.6.2/policy/modules/system/xen.fc	2009-01-05 17:10:36.000000000 -0500
++++ serefpolicy-3.6.2/policy/modules/system/xen.fc	2009-01-05 17:54:59.000000000 -0500
 @@ -2,17 +2,10 @@
  
  /usr/bin/virsh		--	gen_context(system_u:object_r:xm_exec_t,s0)
@@ -27532,7 +27532,7 @@
  
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.if serefpolicy-3.6.2/policy/modules/system/xen.if
 --- nsaserefpolicy/policy/modules/system/xen.if	2009-01-05 15:39:43.000000000 -0500
-+++ serefpolicy-3.6.2/policy/modules/system/xen.if	2009-01-05 17:10:36.000000000 -0500
++++ serefpolicy-3.6.2/policy/modules/system/xen.if	2009-01-05 17:54:59.000000000 -0500
 @@ -167,11 +167,14 @@
  #
  interface(`xen_stream_connect',`
@@ -27576,7 +27576,7 @@
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.te serefpolicy-3.6.2/policy/modules/system/xen.te
 --- nsaserefpolicy/policy/modules/system/xen.te	2009-01-05 15:39:43.000000000 -0500
-+++ serefpolicy-3.6.2/policy/modules/system/xen.te	2009-01-05 17:10:36.000000000 -0500
++++ serefpolicy-3.6.2/policy/modules/system/xen.te	2009-01-05 17:54:59.000000000 -0500
 @@ -1,11 +1,18 @@
  
 -policy_module(xen, 1.8.0)
@@ -27806,7 +27806,7 @@
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/support/obj_perm_sets.spt serefpolicy-3.6.2/policy/support/obj_perm_sets.spt
 --- nsaserefpolicy/policy/support/obj_perm_sets.spt	2008-10-16 17:21:16.000000000 -0400
-+++ serefpolicy-3.6.2/policy/support/obj_perm_sets.spt	2009-01-05 17:10:36.000000000 -0500
++++ serefpolicy-3.6.2/policy/support/obj_perm_sets.spt	2009-01-05 17:54:59.000000000 -0500
 @@ -179,20 +179,20 @@
  #
  # Directory (dir)
@@ -27853,7 +27853,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.6.2/policy/users
 --- nsaserefpolicy/policy/users	2008-08-07 11:15:13.000000000 -0400
-+++ serefpolicy-3.6.2/policy/users	2009-01-05 17:10:36.000000000 -0500
++++ serefpolicy-3.6.2/policy/users	2009-01-05 17:54:59.000000000 -0500
 @@ -25,11 +25,8 @@
  # permit any access to such users, then remove this entry.
  #
@@ -27880,7 +27880,7 @@
 +gen_user(root, user, unconfined_r sysadm_r staff_r ifdef(`enable_mls',`secadm_r auditadm_r') system_r, s0, s0 - mls_systemhigh, mcs_allcats)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/Rules.modular serefpolicy-3.6.2/Rules.modular
 --- nsaserefpolicy/Rules.modular	2008-11-11 16:13:50.000000000 -0500
-+++ serefpolicy-3.6.2/Rules.modular	2009-01-05 17:10:36.000000000 -0500
++++ serefpolicy-3.6.2/Rules.modular	2009-01-05 17:54:59.000000000 -0500
 @@ -73,8 +73,8 @@
  $(tmpdir)/%.mod: $(m4support) $(tmpdir)/generated_definitions.conf $(tmpdir)/all_interfaces.conf %.te
  	@echo "Compliling $(NAME) $(@F) module"
@@ -27912,7 +27912,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/support/Makefile.devel serefpolicy-3.6.2/support/Makefile.devel
 --- nsaserefpolicy/support/Makefile.devel	2008-11-11 16:13:50.000000000 -0500
-+++ serefpolicy-3.6.2/support/Makefile.devel	2009-01-05 17:10:36.000000000 -0500
++++ serefpolicy-3.6.2/support/Makefile.devel	2009-01-05 17:54:59.000000000 -0500
 @@ -185,8 +185,7 @@
  tmp/%.mod: $(m4support) tmp/all_interfaces.conf %.te
  	@$(EINFO) "Compiling $(NAME) $(basename $(@F)) module"


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.762
retrieving revision 1.763
diff -u -r1.762 -r1.763
--- selinux-policy.spec	5 Jan 2009 22:14:11 -0000	1.762
+++ selinux-policy.spec	6 Jan 2009 14:46:21 -0000	1.763
@@ -15,12 +15,12 @@
 %endif
 %define POLICYVER 23
 %define libsepolver 2.0.20-1
-%define POLICYCOREUTILSVER 2.0.57-12
+%define POLICYCOREUTILSVER 2.0.60-7
 %define CHECKPOLICYVER 2.0.16-3
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.6.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -318,8 +318,7 @@
 #__eof
 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
+semodule -n -s targeted -r moilscanner  -r gamin -r audio_entropy -r iscsid 2>/dev/null
 %loadpolicy targeted
 %relabel targeted
 fi
@@ -446,6 +445,9 @@
 %endif
 
 %changelog
+* Tue Jan 6 2009 Dan Walsh <dwalsh at redhat.com> 3.6.2-2
+- Remove audio_entropy policy
+
 * Mon Jan 5 2009 Dan Walsh <dwalsh at redhat.com> 3.6.2-1
 - Update to upstream
 



From ajax at fedoraproject.org  Tue Jan  6 14:47:20 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Tue,  6 Jan 2009 14:47:20 +0000 (UTC)
Subject: rpms/powertop/devel import.log, NONE, 1.1 .cvsignore, 1.11,
	1.12 powertop.spec, 1.18, 1.19 sources, 1.11,
	1.12 powertop-1.9-hciconfig.patch, 1.1, NONE
Message-ID: <20090106144720.B820C7013F@cvs1.fedora.phx.redhat.com>

Author: ajax

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

Modified Files:
	.cvsignore powertop.spec sources 
Added Files:
	import.log 
Removed Files:
	powertop-1.9-hciconfig.patch 
Log Message:
powertop 1.11



--- NEW FILE import.log ---
powertop-1_11-1_fc11:HEAD:powertop-1.11-1.fc11.src.rpm:1231253193


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/powertop/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	6 Nov 2008 12:53:59 -0000	1.11
+++ .cvsignore	6 Jan 2009 14:46:50 -0000	1.12
@@ -1 +1 @@
-powertop-1.10.tar.gz
+powertop-1.11.tar.gz


Index: powertop.spec
===================================================================
RCS file: /cvs/pkgs/rpms/powertop/devel/powertop.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- powertop.spec	20 Nov 2008 18:16:18 -0000	1.18
+++ powertop.spec	6 Jan 2009 14:46:50 -0000	1.19
@@ -1,5 +1,5 @@
 Name:           powertop
-Version:        1.10
+Version:        1.11
 Release:        1%{?dist}
 Summary:        Power consumption monitor
 
@@ -41,6 +41,9 @@
 %{_mandir}/man1/powertop.1*
 
 %changelog
+* Tue Jan 06 2009 Adam Jackson <ajax at redhat.com> 1.11-1
+- powertop 1.11
+
 * Thu Nov 20 2008 Adam Jackson <ajax at redhat.com>
 - Spec only change, fix URL.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/powertop/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	6 Nov 2008 12:53:59 -0000	1.11
+++ sources	6 Jan 2009 14:46:50 -0000	1.12
@@ -1 +1 @@
-e09f631f60d50299d8885193e6fd3756  powertop-1.10.tar.gz
+3498f5983c683c3a57dce7379a722082  powertop-1.11.tar.gz


--- powertop-1.9-hciconfig.patch DELETED ---



From kraxel at fedoraproject.org  Tue Jan  6 14:53:38 2009
From: kraxel at fedoraproject.org (Gerd Hoffmann)
Date: Tue,  6 Jan 2009 14:53:38 +0000 (UTC)
Subject: rpms/amtterm/F-9 .cvsignore, 1.4, 1.5 amtterm.spec, 1.4, 1.5 sources,
	1.4, 1.5
Message-ID: <20090106145338.CAE1A70108@cvs1.fedora.phx.redhat.com>

Author: kraxel

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

Modified Files:
	.cvsignore amtterm.spec sources 
Log Message:
update to version 1.2


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/amtterm/F-9/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	31 Aug 2007 13:15:44 -0000	1.4
+++ .cvsignore	6 Jan 2009 14:53:08 -0000	1.5
@@ -1 +1 @@
-amtterm-1.0.tar.gz
+amtterm-1.2.tar.gz


Index: amtterm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/amtterm/F-9/amtterm.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- amtterm.spec	19 Feb 2008 10:20:31 -0000	1.4
+++ amtterm.spec	6 Jan 2009 14:53:08 -0000	1.5
@@ -1,7 +1,7 @@
 Name:         amtterm
 License:      GPLv2+
-Version:      1.0
-Release:      2%{?dist}
+Version:      1.2
+Release:      1%{?dist}
 Summary:      Serial-over-lan (sol) client for Intel AMT
 Group:        Applications/Internet
 Source:       %{name}-%{version}.tar.gz
@@ -43,6 +43,12 @@
 rm -rf %{buildroot}
 
 %changelog
+* Tue Jan 06 2009 Gerd Hoffmann <kraxel at redhat.com> - 1.2-1
+- update to version 1.2
+  * support special reboot commands (pxe, bios. ...).
+  * gamt: gui tweaks, logging support.
+  * some minor doc tweaks.
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1.0-2
 - Autorebuild for GCC 4.3
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/amtterm/F-9/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	31 Aug 2007 13:15:44 -0000	1.4
+++ sources	6 Jan 2009 14:53:08 -0000	1.5
@@ -1 +1 @@
-d39d02baae01d22084ffd47837e90d3b  amtterm-1.0.tar.gz
+74646aeab6af038bd557f344f8178adc  amtterm-1.2.tar.gz



From mcpierce at fedoraproject.org  Tue Jan  6 14:53:59 2009
From: mcpierce at fedoraproject.org (Darryl L. Pierce)
Date: Tue,  6 Jan 2009 14:53:59 +0000 (UTC)
Subject: rpms/rubygem-rubyforge/devel rubygem-rubyforge.spec,1.4,1.5
Message-ID: <20090106145359.C023970108@cvs1.fedora.phx.redhat.com>

Author: mcpierce

Update of /cvs/pkgs/rpms/rubygem-rubyforge/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32531

Modified Files:
	rubygem-rubyforge.spec 
Log Message:
Release 1.0.2 of RubyForge.



Index: rubygem-rubyforge.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-rubyforge/devel/rubygem-rubyforge.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- rubygem-rubyforge.spec	23 Oct 2008 13:57:44 -0000	1.4
+++ rubygem-rubyforge.spec	6 Jan 2009 14:53:29 -0000	1.5
@@ -6,7 +6,7 @@
 
 Summary: 	A script which automates a limited set of rubyforge operations
 Name: 		rubygem-%{gemname}
-Version: 	1.0.1
+Version: 	1.0.2
 Release: 	1%{?dist}
 Group: 		Development/Languages
 License: 	GPLv2+ or Ruby
@@ -55,6 +55,9 @@
 
 
 %changelog
+* Tue Jan 06 2009 Darryl Pierce <dpierce at redhat.com> - 1.0.2-1
+- Release 1.0.2 of Rubyforge.
+
 * Thu Oct 23 2008 Darryl Pierce <dpierce at redhat.com> - 1.0.1-1
 - Release 1.0.1 of Rubyforge.
 



From buc at fedoraproject.org  Tue Jan  6 14:54:44 2009
From: buc at fedoraproject.org (Dmitry Butskoy)
Date: Tue,  6 Jan 2009 14:54:44 +0000 (UTC)
Subject: rpms/newscache/devel newscache.spec,1.22,1.23
Message-ID: <20090106145444.7CC4170108@cvs1.fedora.phx.redhat.com>

Author: buc

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

Modified Files:
	newscache.spec 
Log Message:
Fix autotools stuff for socket++ library




Index: newscache.spec
===================================================================
RCS file: /cvs/extras/rpms/newscache/devel/newscache.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- newscache.spec	6 Jan 2009 14:25:05 -0000	1.22
+++ newscache.spec	6 Jan 2009 14:54:14 -0000	1.23
@@ -4,7 +4,7 @@
 Name: 		newscache
 Summary: 	Free cache server for USENET News
 Version: 	1.2
-Release: 	0.7.rc6%{?dist}
+Release: 	0.8.rc6%{?dist}
 Group: 		System Environment/Daemons
 License:	GPLv2+
 URL:		http://www.linuxhacker.at/newscache/
@@ -51,8 +51,7 @@
 # to ship it separately.
 
 pushd socket++-%{socketver}
-#./autogen
-libtoolize -v --force
+libtoolize --force
 aclocal
 autoheader
 automake --add-missing
@@ -157,6 +156,9 @@
 
 
 %changelog
+* Tue Jan  6 2009 Dmitry Butskoy <Dmitry at Butskoy.name> - 1.2-0.8.rc6
+- Fix autotools stuff in socket++ for libtool >= 2
+
 * Mon Jan  5 2009 Dmitry Butskoy <Dmitry at Butskoy.name> - 1.2-0.7.rc6
 - Add news user and group (#478785) since Fedora 10
 



From langel at fedoraproject.org  Tue Jan  6 14:54:51 2009
From: langel at fedoraproject.org (Lillian Angel)
Date: Tue,  6 Jan 2009 14:54:51 +0000 (UTC)
Subject: rpms/batik/devel batik.spec,1.9,1.10
Message-ID: <20090106145451.BA2EF70108@cvs1.fedora.phx.redhat.com>

Author: langel

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

Modified Files:
	batik.spec 
Log Message:
* Tue Jan 06 2009 Lillian Angel  <langel at redhat.com> - 1.7-2
- Fixed java dependencies to check for java-1.6.0-openjdk instead.




Index: batik.spec
===================================================================
RCS file: /cvs/pkgs/rpms/batik/devel/batik.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- batik.spec	5 Jan 2009 19:08:45 -0000	1.9
+++ batik.spec	6 Jan 2009 14:54:21 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           batik
 Version:        1.7
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Scalable Vector Graphics for Java
 License:        ASL 2.0
 URL:            http://xml.apache.org/batik/
@@ -33,10 +33,10 @@
 BuildRequires:  xerces-j2
 BuildRequires:  xml-commons-apis >= 1.3.04
 
-BuildRequires:  java-javadoc
+BuildRequires:  java-1.6.0-openjdk-javadoc
 BuildRequires:  rhino-javadoc
 
-Requires:       java >= 1:1.6.0.0
+Requires:       java-1.6.0-openjdk >= 1:1.6.0.0
 Requires:       rhino >= 1.5
 Requires:       xml-commons-apis >= 1.3.04
 
@@ -238,6 +238,9 @@
 
 
 %changelog
+* Tue Jan 06 2009 Lillian Angel  <langel at redhat.com> - 1.7-2
+- Fixed java dependencies to check for java-1.6.0-openjdk instead.
+
 * Mon Jan 05 2009 Lillian Angel  <langel at redhat.com> - 1.7-1
 - Updated batik-repack.sh to remove font files from test resources.
 - Resolves: rhbz#477369



From rdieter at fedoraproject.org  Tue Jan  6 14:54:54 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Tue,  6 Jan 2009 14:54:54 +0000 (UTC)
Subject: rpms/eigen2/devel .cvsignore, 1.5, 1.6 eigen2.spec, 1.4, 1.5 sources,
	1.5, 1.6
Message-ID: <20090106145454.4856870108@cvs1.fedora.phx.redhat.com>

Author: rdieter

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

Modified Files:
	.cvsignore eigen2.spec sources 
Log Message:
* Tue Jan 06 2009 Rex Dieter <rdieter at fedoraproject.org> 2.0-0.7.beta5
- eigen-2.0-beta5



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/eigen2/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	4 Jan 2009 23:23:57 -0000	1.5
+++ .cvsignore	6 Jan 2009 14:54:24 -0000	1.6
@@ -1 +1 @@
-eigen-2.0-beta4.tar.bz2
+eigen-2.0-beta5.tar.bz2


Index: eigen2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eigen2/devel/eigen2.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- eigen2.spec	4 Jan 2009 23:23:57 -0000	1.4
+++ eigen2.spec	6 Jan 2009 14:54:24 -0000	1.5
@@ -3,16 +3,16 @@
 # http://bugzilla.redhat.com/459705
 
 %define _with_check -DBUILD_TESTS=ON 
-%define pre beta4
+%define pre beta5
 
 Name:    eigen2
 Summary: A lightweight C++ template library for vector and matrix math
 Version: 2.0 
-Release: 0.6.%{pre}%{?dist} 
+Release: 0.7.%{pre}%{?dist} 
 Group:   System Environment/Libraries
 License: GPLv2+ or LGPLv3+
 URL:     http://eigen.tuxfamily.org/
-Source0: http://eigen.tuxfamily.org/eigen-%{version}-%{pre}.tar.bz2
+Source0: http://download.tuxfamily.org/eigen/eigen-%{version}-%{pre}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 
@@ -82,6 +82,9 @@
 
 
 %changelog
+* Tue Jan 06 2009 Rex Dieter <rdieter at fedoraproject.org> 2.0-0.7.beta5
+- eigen-2.0-beta5
+
 * Sun Jan 04 2009 Rex Dieter <rdieter at fedoraproject.org> 2.0-0.6.beta4
 - eigen-2.0-beta4
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eigen2/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	4 Jan 2009 23:23:57 -0000	1.5
+++ sources	6 Jan 2009 14:54:24 -0000	1.6
@@ -1 +1 @@
-2a83362c251da812be16963da0186ad5  eigen-2.0-beta4.tar.bz2
+1516005412881714f692a9f2c5c061a6  eigen-2.0-beta5.tar.bz2



From timlau at fedoraproject.org  Tue Jan  6 15:02:30 2009
From: timlau at fedoraproject.org (Tim Lauridsen)
Date: Tue,  6 Jan 2009 15:02:30 +0000 (UTC)
Subject: rpms/postr/F-9 postr.spec,1.9,1.10 sources,1.8,1.9
Message-ID: <20090106150230.0804570108@cvs1.fedora.phx.redhat.com>

Author: timlau

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

Modified Files:
	postr.spec sources 
Log Message:
upstream release 0.12.3


Index: postr.spec
===================================================================
RCS file: /cvs/pkgs/rpms/postr/F-9/postr.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- postr.spec	9 Sep 2008 07:04:12 -0000	1.9
+++ postr.spec	6 Jan 2009 15:01:59 -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:           postr
-Version:        0.12.2
+Version:        0.12.3
 Release:        1%{?dist}
 Summary:        Flickr uploader
 
@@ -71,6 +71,9 @@
 
 
 %changelog
+* Tue Jan 6 2009 Tim Lauridsen <timlau at fedoraproject.org> - 0.12.3-1
+- New upstream version 0.12.3
+
 * 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.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/postr/F-9/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	9 Sep 2008 07:04:12 -0000	1.8
+++ sources	6 Jan 2009 15:01:59 -0000	1.9
@@ -1 +1 @@
-0b823d94dd6a7e96fde94a2581aaf819  postr-0.12.2.tar.gz
+9c6452ed378eb8c8f808134a3bdcacaa  postr-0.12.3.tar.gz



From mcpierce at fedoraproject.org  Tue Jan  6 15:03:11 2009
From: mcpierce at fedoraproject.org (Darryl L. Pierce)
Date: Tue,  6 Jan 2009 15:03:11 +0000 (UTC)
Subject: rpms/rubygem-rubyforge/devel .cvsignore,1.4,1.5 sources,1.4,1.5
Message-ID: <20090106150311.5064B70108@cvs1.fedora.phx.redhat.com>

Author: mcpierce

Update of /cvs/pkgs/rpms/rubygem-rubyforge/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2690

Modified Files:
	.cvsignore sources 
Log Message:
Uploaded the wrong version of the gem previously.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-rubyforge/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	23 Oct 2008 13:57:43 -0000	1.4
+++ .cvsignore	6 Jan 2009 15:02:41 -0000	1.5
@@ -1 +1 @@
-rubyforge-1.0.1.gem
+rubyforge-1.0.2.gem


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-rubyforge/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	23 Oct 2008 13:57:44 -0000	1.4
+++ sources	6 Jan 2009 15:02:41 -0000	1.5
@@ -1 +1 @@
-108a583b38ed38c5cdc5dc8b32831238  rubyforge-1.0.1.gem
+ad35500c0187249f39f26ca490004444  rubyforge-1.0.2.gem



From mcpierce at fedoraproject.org  Tue Jan  6 15:05:31 2009
From: mcpierce at fedoraproject.org (Darryl L. Pierce)
Date: Tue,  6 Jan 2009 15:05:31 +0000 (UTC)
Subject: rpms/rubygem-rubyforge/devel rubygem-rubyforge.spec,1.5,1.6
Message-ID: <20090106150531.44E1C70108@cvs1.fedora.phx.redhat.com>

Author: mcpierce

Update of /cvs/pkgs/rpms/rubygem-rubyforge/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3369

Modified Files:
	rubygem-rubyforge.spec 
Log Message:
Bumped the released.



Index: rubygem-rubyforge.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-rubyforge/devel/rubygem-rubyforge.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- rubygem-rubyforge.spec	6 Jan 2009 14:53:29 -0000	1.5
+++ rubygem-rubyforge.spec	6 Jan 2009 15:05:00 -0000	1.6
@@ -7,7 +7,7 @@
 Summary: 	A script which automates a limited set of rubyforge operations
 Name: 		rubygem-%{gemname}
 Version: 	1.0.2
-Release: 	1%{?dist}
+Release: 	2%{?dist}
 Group: 		Development/Languages
 License: 	GPLv2+ or Ruby
 URL: 		http://rubyforge.org/projects/codeforpeople
@@ -55,6 +55,9 @@
 
 
 %changelog
+* Tue Jan 06 2009 Darryl Pierce <dpierce at redhat.com> - 1.0.2-2
+- Provided the wrong gem as source.
+
 * Tue Jan 06 2009 Darryl Pierce <dpierce at redhat.com> - 1.0.2-1
 - Release 1.0.2 of Rubyforge.
 



From limb at fedoraproject.org  Tue Jan  6 15:15:39 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Tue,  6 Jan 2009 15:15:39 +0000 (UTC)
Subject: rpms/bacula/F-10 bacula-config.patch, 1.2,
	1.3 bacula-director-configuration.patch, 1.1, 1.2 bacula.spec,
	1.14, 1.15 sources, 1.5, 1.6
Message-ID: <20090106151539.5D55670108@cvs1.fedora.phx.redhat.com>

Author: limb

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

Modified Files:
	bacula-config.patch bacula-director-configuration.patch 
	bacula.spec sources 
Log Message:
New upstream, multiple fixed synced from rawhide.


bacula-config.patch:

Index: bacula-config.patch
===================================================================
RCS file: /cvs/pkgs/rpms/bacula/F-10/bacula-config.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- bacula-config.patch	30 Jul 2008 13:52:01 -0000	1.2
+++ bacula-config.patch	6 Jan 2009 15:15:38 -0000	1.3
@@ -1,256 +1,122 @@
---- bacula-2.0.2/src/gnome2-console/bgnome-console.conf.in.orig	2007-02-06 13:35:12.000000000 +0100
-+++ bacula-2.0.2/src/gnome2-console/bgnome-console.conf.in	2007-02-06 13:35:25.000000000 +0100
-@@ -3,9 +3,9 @@
- #
- 
- Director {
+--- bacula-2.4.3/src/gnome2-console/bgnome-console.conf.in.orig	2008-12-10 10:12:18.000000000 -0600
++++ bacula-2.4.3/src/gnome2-console/bgnome-console.conf.in	2008-12-10 10:12:18.000000000 -0600
+@@ -6 +6 @@
 -  Name = @hostname at -dir
 +  Name = bacula-dir
-   DIRport = @dir_port@
+@@ -8 +8 @@
 -  address = @hostname@
 +  address = server.example.com
-   Password = "@dir_password@"
- }
- 
---- bacula-2.0.2/src/dird/bacula-dir.conf.in.orig	2007-02-06 13:33:19.000000000 +0100
-+++ bacula-2.0.2/src/dird/bacula-dir.conf.in	2007-02-06 13:34:49.000000000 +0100
-@@ -13,7 +13,7 @@
- #
- 
- Director {                            # define myself
+--- bacula-2.4.3/src/dird/bacula-dir.conf.in.orig	2008-12-10 10:17:27.000000000 -0600
++++ bacula-2.4.3/src/dird/bacula-dir.conf.in	2008-12-10 10:17:27.000000000 -0600
+@@ -16 +16 @@
 -  Name = @hostname at -dir
 +  Name = bacula-dir
-   DIRport = @dir_port@                # where we listen for UA connections
-   QueryFile = "@scriptdir@/query.sql"
-   WorkingDirectory = "@working_dir@"
-@@ -27,7 +27,7 @@
-   Name = "DefaultJob"
-   Type = Backup
-   Level = Incremental
+@@ -30 +30 @@
 -  Client = @hostname at -fd 
 +  Client = bacula-fd 
-   FileSet = "Full Set"
-   Schedule = "WeeklyCycle"
-   Storage = File
-@@ -48,7 +48,7 @@
- 
- #Job {
- #  Name = "Client2"
+@@ -51 +51 @@
 -#  Client = @hostname at 2-fd
 +#  Client = bacula2-fd
- #  JobDefs = "DefaultJob"
- #  Write Bootstrap = "@working_dir@/Client2.bsr"
- #}
-@@ -75,7 +75,7 @@
- Job {
-   Name = "RestoreFiles"
-   Type = Restore
+@@ -82 +82 @@
 -  Client=@hostname at -fd                 
 +  Client=bacula-fd                 
-   FileSet="Full Set"                  
-   Storage = File                      
-   Pool = Default
-@@ -149,8 +149,8 @@
- 
- # Client (File Services) to backup
- Client {
+@@ -157,2 +157,2 @@
 -  Name = @hostname at -fd
 -  Address = @hostname@
 +  Name = bacula-fd
 +  Address = client.example.com
-   FDPort = @fd_port@
-   Catalog = MyCatalog
-   Password = "@fd_password@"          # password for FileDaemon
-@@ -164,8 +164,8 @@
- #  You should change Name, Address, and Password before using
- #
- #Client {
+@@ -172,2 +172,2 @@
 -#  Name = @hostname at 2-fd                
 -#  Address = @hostname at 2
 +#  Name = bacula2-fd                
 +#  Address = client2.example.com
- #  FDPort = @fd_port@
- #  Catalog = MyCatalog
- #  Password = "@fd_password at 2"         # password for FileDaemon 2
-@@ -179,7 +179,7 @@
- Storage {
-   Name = File
- # Do not use "localhost" here    
+@@ -187 +187 @@
 -  Address = @hostname@                # N.B. Use a fully qualified name here
-+  Address = storage.example.com        # N.B. Use a fully qualified name here
-   SDPort = @sd_port@
-   Password = "@sd_password@"
-   Device = FileStorage
-@@ -192,7 +192,7 @@
- #Storage {
- #  Name = DDS-4    
- #  Do not use "localhost" here
++  Address = storage.example.com                # N.B. Use a fully qualified name here
+@@ -200 +200 @@
 -#  Address = @hostname@                # N.B. Use a fully qualified name here
-+#  Address = storage.example.com       # N.B. Use a fully qualified name here
- #  SDPort = @sd_port@
- #  Password = "@sd_password@"          # password for Storage daemon
- #  Device = DDS-4                      # must be same as Device in Storage daemon
-@@ -204,7 +204,7 @@
- #Storage {
- #  Name = "8mmDrive"
- #  Do not use "localhost" here
++#  Address = storage.example.com                # N.B. Use a fully qualified name here
+@@ -212 +212 @@
 -#  Address = @hostname@                # N.B. Use a fully qualified name here
-+#  Address = storage.example.com       # N.B. Use a fully qualified name here
- #  SDPort = @sd_port@
- #  Password = "@sd_password@"
- #  Device = "Exabyte 8mm"
-@@ -215,7 +215,7 @@
- #Storage {
- #  Name = "DVD"
- #  Do not use "localhost" here
++#  Address = storage.example.com                # N.B. Use a fully qualified name here
+@@ -223 +223 @@
 -#  Address = @hostname@                # N.B. Use a fully qualified name here
-+#  Address = storage.example.com       # N.B. Use a fully qualified name here
- #  SDPort = @sd_port@
- #  Password = "@sd_password@"
- #  Device = "DVD Writer"
-@@ -285,7 +285,7 @@
- # Restricted console used by tray-monitor to get the status of the director
- #
- Console {
++#  Address = storage.example.com                # N.B. Use a fully qualified name here
+@@ -299 +299 @@
 -  Name = @hostname at -mon
 +  Name = bacula-mon
-   Password = "@mon_dir_password@"
-   CommandACL = status, .status
- }
---- bacula-2.0.2/src/filed/bacula-fd.conf.in.orig	2007-02-06 13:30:59.000000000 +0100
-+++ bacula-2.0.2/src/filed/bacula-fd.conf.in	2007-02-06 13:31:25.000000000 +0100
-@@ -11,7 +11,7 @@
- # List Directors who are permitted to contact this File daemon
- #
- Director {
+--- bacula-2.4.3/src/filed/bacula-fd.conf.in.orig	2008-12-10 10:19:12.000000000 -0600
++++ bacula-2.4.3/src/filed/bacula-fd.conf.in	2008-12-10 10:19:12.000000000 -0600
+@@ -14 +14 @@
 -  Name = @hostname at -dir
 +  Name = bacula-dir
-   Password = "@fd_password@"
- }
- 
-@@ -20,7 +20,7 @@
- #   status of the file daemon
- #
- Director {
+@@ -23 +23 @@
 -  Name = @hostname at -mon
 +  Name = bacula-mon
-   Password = "@mon_fd_password@"
-   Monitor = yes
- }
-@@ -29,7 +29,7 @@
- # "Global" File daemon configuration specifications
- #
- FileDaemon {                          # this is me
+@@ -32 +32 @@
 -  Name = @hostname at -fd
 +  Name = bacula-fd
-   FDport = @fd_port@                  # where we listen for the director
-   WorkingDirectory = @working_dir@
-   Pid Directory = @piddir@
-@@ -39,5 +39,5 @@
- # Send all messages except skipped files back to Director
- Messages {
-   Name = Standard
+@@ -42 +42 @@
 -  director = @hostname at -dir = all, !skipped, !restored
 +  director = bacula-dir = all, !skipped, !restored
- }
---- bacula-2.0.2/src/console/bconsole.conf.in.orig	2007-02-06 13:32:30.000000000 +0100
-+++ bacula-2.0.2/src/console/bconsole.conf.in	2007-02-06 13:33:06.000000000 +0100
-@@ -3,8 +3,8 @@
- #
- 
- Director {
--  Name = @hostname at -dir
-+  Name = bacula-dir
-   DIRport = @dir_port@
--  address = @hostname@
-+  address = server.example.com
-   Password = "@dir_password@"
- }
---- bacula-2.0.2/src/stored/bacula-sd.conf.in.orig	2007-02-06 13:31:56.000000000 +0100
-+++ bacula-2.0.2/src/stored/bacula-sd.conf.in	2007-02-06 13:32:15.000000000 +0100
-@@ -11,7 +11,7 @@
- #
- 
- Storage {                             # definition of myself
+--- bacula-2.4.3/src/stored/bacula-sd.conf.in.orig	2008-12-10 10:21:45.000000000 -0600
++++ bacula-2.4.3/src/stored/bacula-sd.conf.in	2008-12-10 10:21:45.000000000 -0600
+@@ -14 +14 @@
 -  Name = @hostname at -sd
 +  Name = bacula-sd
-   SDPort = @sd_port@                  # Director's port      
-   WorkingDirectory = "@working_dir@"
-   Pid Directory = "@piddir@"
-@@ -22,7 +22,7 @@
- # List Directors who are permitted to contact Storage daemon
- #
- Director {
+@@ -25 +25 @@
 -  Name = @hostname at -dir
 +  Name = bacula-dir
-   Password = "@sd_password@"
- }
- 
-@@ -31,7 +31,7 @@
- #   status of the storage daemon
- #
- Director {
+@@ -34 +34 @@
 -  Name = @hostname at -mon
 +  Name = bacula-mon
-   Password = "@mon_sd_password@"
-   Monitor = yes
- }
-@@ -204,5 +204,5 @@
- #
- Messages {
-   Name = Standard
+@@ -228 +228 @@
 -  director = @hostname at -dir = all
 +  director = bacula-dir = all
- }
---- bacula-2.0.2/src/wx-console/bwx-console.conf.in.orig	2007-02-06 13:37:12.000000000 +0100
-+++ bacula-2.0.2/src/wx-console/bwx-console.conf.in	2007-02-06 13:47:02.000000000 +0100
-@@ -3,8 +3,8 @@
- #
- 
- Director {
+--- bacula-2.4.3/src/wx-console/bwx-console.conf.in.orig	2008-12-10 10:22:23.000000000 -0600
++++ bacula-2.4.3/src/wx-console/bwx-console.conf.in	2008-12-10 10:22:23.000000000 -0600
+@@ -6 +6 @@
 -  Name = @hostname at -dir
 +  Name = bacula-dir
-   DIRport = @dir_port@
+@@ -8 +8 @@
 -  address = @hostname@
 +  address = server.example.com
-   Password = "@dir_password@"
- }
---- bacula-2.0.2/src/tray-monitor/tray-monitor.conf.in.orig	2007-02-06 13:47:13.000000000 +0100
-+++ bacula-2.0.2/src/tray-monitor/tray-monitor.conf.in	2007-02-06 13:47:55.000000000 +0100
-@@ -3,27 +3,27 @@
- #
- 
- Monitor {
+--- bacula-2.4.3/src/tray-monitor/tray-monitor.conf.in.orig	2008-12-10 10:28:02.000000000 -0600
++++ bacula-2.4.3/src/tray-monitor/tray-monitor.conf.in	2008-12-10 10:28:02.000000000 -0600
+@@ -6 +6 @@
 -  Name = @hostname at -mon
 +  Name = bacula-mon
-   Password = "@mon_dir_password@"         # password for the Directors   
-   RefreshInterval = 5 seconds
- }
-    
- Client {
+@@ -12,2 +12,2 @@
 -  Name = @hostname at -fd
 -  Address = @hostname@
 +  Name = bacula-fd
 +  Address = client.example.com
-   FDPort = @fd_port@
-   Password = "@mon_fd_password@"          # password for FileDaemon
- }
- 
- Storage {
+@@ -19,2 +19,2 @@
 -  Name = @hostname at -sd
 -  Address = @hostname@
 +  Name = bacula-sd
 +  Address = storage.example.com
-   SDPort = @sd_port@
-   Password = "@mon_sd_password@"          # password for StorageDaemon
- }
- 
- Director {
+@@ -26 +26 @@
+-  Name = @hostname at -dir
++  Name = bacula-dir
+@@ -28 +27,0 @@
+-  address = @hostname@
+--- bacula-2.4.3/src/qt-console/bat.conf.in.orig	2008-12-10 10:27:02.000000000 -0600
++++ bacula-2.4.3/src/qt-console/bat.conf.in	2008-12-10 10:27:02.000000000 -0600
+@@ -6 +6 @@
 -  Name = @hostname at -dir
 +  Name = bacula-dir
-   DIRport = @dir_port@
+@@ -8 +8 @@
 -  address = @hostname@
--}
-\ No newline at end of file
 +  address = server.example.com
-+}
+--- bacula-2.4.3/src/stored/stored.conf.in.orig	2008-12-10 10:27:44.000000000 -0600
++++ bacula-2.4.3/src/stored/stored.conf.in	2008-12-10 10:27:44.000000000 -0600
+@@ -11 +11 @@
+-  Address = @hostname@
++  Address = storage.example.com
+@@ -22 +22 @@
+-  Name = @hostname at -dir
++  Name = bacula-dir
+@@ -54 +54 @@
+-  director = @hostname at -dir = all
++  director = bacula-dir = all

bacula-director-configuration.patch:

Index: bacula-director-configuration.patch
===================================================================
RCS file: /cvs/pkgs/rpms/bacula/F-10/bacula-director-configuration.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- bacula-director-configuration.patch	24 Jul 2007 20:11:04 -0000	1.1
+++ bacula-director-configuration.patch	6 Jan 2009 15:15:38 -0000	1.2
@@ -1,34 +1,17 @@
---- bacula-1.38.11/src/dird/bacula-dir.conf.in.orig	2006-09-03 03:13:26.000000000 +0200
-+++ bacula-1.38.11/src/dird/bacula-dir.conf.in	2006-09-03 03:14:46.000000000 +0200
-@@ -15,7 +15,7 @@
- Director {                            # define myself
-   Name = @hostname at -dir
-   DIRport = @dir_port@                # where we listen for UA connections
+--- bacula-2.4.3/src/dird/bacula-dir.conf.in.orig	2008-12-10 08:59:18.000000000 -0600
++++ bacula-2.4.3/src/dird/bacula-dir.conf.in	2008-12-10 08:59:18.000000000 -0600
+@@ -18 +18 @@
 -  QueryFile = "@scriptdir@/query.sql"
 +  QueryFile = "/etc/bacula/query.sql"
-   WorkingDirectory = "@working_dir@"
-   PidDirectory = "@piddir@"
-   Maximum Concurrent Jobs = 1
-@@ -101,11 +101,10 @@
- #    if you have other partitons such as /usr or /home
- #    you will probably want to add them too.
- #
+@@ -108,3 +108,2 @@
 -#  By default this is defined to point to the Bacula build
 -#    directory to give a reasonable FileSet to backup to
 -#    disk storage during initial testing.
 +#  This File-directive would backup your whole filesystem.
 +#    It is disabled by default
- #
+@@ -112 +111 @@
 -    File = @BUILD_DIR@
-+#    File = /
-   }
- 
- #
-@@ -266,7 +266,7 @@
-   mailcommand = "@sbindir@/bsmtp -h @smtp_host@ -f \"\(Bacula\) %r\" -s \"Bacula daemon message\" %r"
-   mail = @job_email@ = all, !skipped
-   console = all, !skipped, !saved
++    File = /
+@@ -263 +262 @@
 -  append = "@working_dir@/log" = all, !skipped
 +  append = "/var/log/bacula.log" = all, !skipped
- }
-


Index: bacula.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bacula/F-10/bacula.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- bacula.spec	19 Nov 2008 13:30:26 -0000	1.14
+++ bacula.spec	6 Jan 2009 15:15:38 -0000	1.15
@@ -4,12 +4,11 @@
 %define docs_version	%{version}
 %define gui_version	%{version}
 %define config_dir	%{_sysconfdir}/bacula
-%define _default_patch_fuzz 2
 
 Summary: Cross platform network backup for Linux, Unix, Mac and Windows
 Name: bacula
-Version: 2.4.3
-Release: 3%{?dist}
+Version: 2.4.4
+Release: 1%{?dist}
 # See LICENSE for details
 License: GPLv2 with exceptions
 Group: System Environment/Daemons
@@ -37,7 +36,8 @@
 #Patch8: 2.0.3-verify.patch
 #Patch9: 2.0.3-tls-disconnect.patch
 #Patch10: bacula-web-smarty.patch
-Patch11: bacula-2.4.3-orphaned-jobs.patch
+#Patch11: bacula-2.4.3-orphaned-jobs.patch
+#Patch12: bacula-2.4.3-python26.patch
 URL: http://www.bacula.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: openssl-devel, atk-devel, ncurses-devel, pango-devel, perl
@@ -121,6 +121,7 @@
 Group: System Environment/Daemons
 Requires: bacula-director = %{version}-%{release}
 Requires: bacula-common = %{version}-%{release}
+Requires: logwatch
 Requires(pre): fedora-usermgmt
 Requires(postun): fedora-usermgmt
 
@@ -224,6 +225,7 @@
 %package common
 Summary: Common Bacula utilities
 Group: System Environment/Daemons
+Requires: bacula-sysconfdir = %{version}-%{release}
 Requires(pre): fedora-usermgmt
 Requires(postun): fedora-usermgmt
 
@@ -236,6 +238,7 @@
 %package console
 Summary: Bacula management console
 Group: System Environment/Daemons
+Requires: bacula-sysconfdir = %{version}-%{release}
 
 %description console
 Bacula is a set of programs that allow you to manage the backup,
@@ -249,6 +252,7 @@
 %package console-gnome
 Summary: Bacula console for the Gnome desktop environment
 Group: System Environment/Daemons
+Requires: bacula-sysconfdir = %{version}-%{release}
 Requires: usermode
 
 %description console-gnome
@@ -261,6 +265,7 @@
 %package console-bat
 Summary: Bacula bat console
 Group: System Environment/Daemons
+Requires: bacula-sysconfdir = %{version}-%{release}
 Requires: usermode
 
 %description console-bat
@@ -274,6 +279,7 @@
 %package console-wxwidgets
 Summary: Bacula console using the wx widgets toolkit
 Group: System Environment/Daemons
+Requires: bacula-sysconfdir = %{version}-%{release}
 Requires: usermode
 
 %description console-wxwidgets
@@ -285,6 +291,18 @@
 console.
 
 
+%package sysconfdir
+Summary: /etc/bacula dependency for Bacula
+Group: System Environment/Daemons
+
+%description sysconfdir
+Bacula is a set of programs that allow you to manage the backup,
+recovery, and verification of computer data across a network of
+different computers. It is based on a client/server architecture.
+
+This package provides the /etc/bacula directory in order to satisfy
+certain scripted checks.
+
 %package traymonitor
 Summary: Bacula monitor for the Gnome and KDE system tray
 Group: System Environment/Daemons
@@ -343,7 +361,8 @@
 #%patch7 -p0
 #%patch8 -p0
 #%patch9 -p0
-%patch11 -p0
+#%patch11 -p0
+#%patch12 -p0
 
 # Remove execution permissions from files we're packaging as docs later on
 find examples -type f | xargs chmod -x
@@ -547,13 +566,16 @@
 install -m 644 -D bacula-sqlite/src/wx-console/wxwin16x16.xpm %{buildroot}%{_datadir}/pixmaps/wxwin16x16.xpm
 install -m 644 -D bacula-sqlite/scripts/wxconsole.pamd %{buildroot}%{_sysconfdir}/pam.d/wxconsole
 install -m 644 -D bacula-sqlite/scripts/wxconsole.desktop.consolehelper %{buildroot}%{_sysconfdir}/security/console.apps/wxconsole
+#bat.pamd is broken.
+install -m 644 -D bacula-sqlite/scripts/bgnome-console.pamd %{buildroot}%{_sysconfdir}/pam.d/bat
+install -m 644 -D bacula-sqlite/scripts/bat.desktop.consolehelper %{buildroot}%{_sysconfdir}/security/console.apps/bat
 install -m 644 -D bacula-sqlite/src/tray-monitor/generic.xpm %{buildroot}%{_datadir}/pixmaps/bacula-tray-monitor.xpm
 install -m 644 -D bacula-sqlite/src/qt-console/images/bat_icon.png %{buildroot}%{_datadir}/pixmaps/bat_icon.png
 
 
 ln -sf consolehelper %{buildroot}%{_bindir}/gnome-console
 ln -sf consolehelper %{buildroot}%{_bindir}/wxconsole
-#ln -sf consolehelper %{buildroot}%{_bindir}/bat
+ln -sf consolehelper %{buildroot}%{_bindir}/bat
 install -m 755 bacula-sqlite/src/qt-console/bat %{buildroot}%{_sbindir}
 
 desktop-file-install --vendor="fedora" --dir=%{buildroot}%{_datadir}/applications %{SOURCE3}
@@ -750,13 +772,19 @@
 fi
 
 
+# For this braindeadness, please see
+# https://bugzilla.redhat.com/show_bug.cgi?id=473627
+%files sysconfdir
+%defattr(-,root,root,-)
+%dir %{_sysconfdir}/bacula
+
+
 %files common
 %defattr(-,root,root,-)
 %doc bacula-%{version}/AUTHORS bacula-%{version}/ChangeLog bacula-%{version}/COPYING bacula-%{version}/LICENSE
 %doc bacula-%{version}/README bacula-%{version}/SUPPORT bacula-%{version}/VERIFYING
 %doc bacula-%{version}/examples/
 %config(noreplace) %{_sysconfdir}/logrotate.d/bacula
-%dir %{_sysconfdir}/bacula
 %dir %{_libexecdir}/bacula
 %{_sbindir}/bsmtp
 %{_sbindir}/btraceback
@@ -798,10 +826,10 @@
 
 %files console-bat
 %defattr(-,root,root,-)
-#%config %{_sysconfdir}/security/console.apps/bat
-#%config %{_sysconfdir}/pam.d/bat
+%config %{_sysconfdir}/security/console.apps/bat
+%config %{_sysconfdir}/pam.d/bat
 %attr(640,root,bacula) %config(noreplace) %{_sysconfdir}/bacula/bat.conf
-#%{_bindir}/bat
+%{_bindir}/bat
 %{_sbindir}/bat
 %{_mandir}/man1/bat.1.gz
 %{_datadir}/applications/fedora-bacula-bat.desktop
@@ -962,6 +990,22 @@
 
 
 %changelog
+* Mon Jan 05 2009 Jon Ciesla <limb at jcomserv.net - 2.4.4-1
+- Update to new upstream, 2.4.4.
+- Dropped orphaned jobs patch, python 2.6 patch, applied upstream.
+
+* Mon Dec 15 2008 Jon Ciesla <limb at jcomserv.net - 2.4.3-7
+- Patched to support Python 2.6, BZ 476547.
+
+* Fri Dec 12 2008 Jon Ciesla <limb at jcomserv.net - 2.4.3-6
+- Fix consolehelper behaviour for bat.
+
+* Wed Dec 10 2008 Jon Ciesla <limb at jcomserv.net - 2.4.3-5
+- Re-diffed fuzzy bacula-director-configuration and bacula-config patches.
+
+* Mon Dec 1 2008 Andreas Thienemann <andreas at bawue.net> - 2.4.3-4
+- Fixed dependency "issues" #473627 by adding the sysconfdir subpackage.
+
 * Mon Nov 17 2008 Jon Ciesla <limb at jcomserv.net> - 2.4.3-3
 - Added upstream orphaned jobs patch.
 - Fixed logrotate file.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bacula/F-10/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	22 Oct 2008 19:33:30 -0000	1.5
+++ sources	6 Jan 2009 15:15:38 -0000	1.6
@@ -1,2 +1,2 @@
-6c61f730e896e6161d21d67efed55a5b  bacula-2.4.3.tar.gz
-630cdd353baa3bfbf847f78b03c99bc4  bacula-docs-2.4.3.tar.bz2
+4eb6155b45611018af03002d37a2ffde  bacula-2.4.4.tar.gz
+d9bb3e8ca8c9a4c741b83569c21a4806  bacula-docs-2.4.4.tar.bz2



From mcpierce at fedoraproject.org  Tue Jan  6 15:19:15 2009
From: mcpierce at fedoraproject.org (Darryl L. Pierce)
Date: Tue,  6 Jan 2009 15:19:15 +0000 (UTC)
Subject: rpms/rubygem-rubyforge/F-9 .cvsignore, 1.4,
	1.5 rubygem-rubyforge.spec, 1.4, 1.5 sources, 1.4, 1.5
Message-ID: <20090106151915.F3B6B70140@cvs1.fedora.phx.redhat.com>

Author: mcpierce

Update of /cvs/pkgs/rpms/rubygem-rubyforge/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6467

Modified Files:
	.cvsignore rubygem-rubyforge.spec sources 
Log Message:
Release 1.0.2 of RubyForge.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-rubyforge/F-9/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	23 Oct 2008 14:28:36 -0000	1.4
+++ .cvsignore	6 Jan 2009 15:18:45 -0000	1.5
@@ -1 +1 @@
-rubyforge-1.0.1.gem
+rubyforge-1.0.2.gem


Index: rubygem-rubyforge.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-rubyforge/F-9/rubygem-rubyforge.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- rubygem-rubyforge.spec	23 Oct 2008 14:28:36 -0000	1.4
+++ rubygem-rubyforge.spec	6 Jan 2009 15:18:45 -0000	1.5
@@ -6,7 +6,7 @@
 
 Summary: 	A script which automates a limited set of rubyforge operations
 Name: 		rubygem-%{gemname}
-Version: 	1.0.1
+Version: 	1.0.2
 Release: 	1%{?dist}
 Group: 		Development/Languages
 License: 	GPLv2+ or Ruby
@@ -55,6 +55,9 @@
 
 
 %changelog
+* Tue Jan 09 2009 Darryl Pierce <dpierce at redhat.com> - 1.0.2-1
+- Release 1.0.2 of RubyForge.
+
 * Thu Oct 23 2008 Darryl Pierce <dpierce at redhat.com> - 1.0.1-1
 - Release 1.0.1 of Rubyforge.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-rubyforge/F-9/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	23 Oct 2008 14:28:36 -0000	1.4
+++ sources	6 Jan 2009 15:18:45 -0000	1.5
@@ -1 +1 @@
-108a583b38ed38c5cdc5dc8b32831238  rubyforge-1.0.1.gem
+ad35500c0187249f39f26ca490004444  rubyforge-1.0.2.gem



From kraxel at fedoraproject.org  Tue Jan  6 15:19:34 2009
From: kraxel at fedoraproject.org (Gerd Hoffmann)
Date: Tue,  6 Jan 2009 15:19:34 +0000 (UTC)
Subject: rpms/amtterm/EL-5 .cvsignore, 1.2, 1.3 amtterm.spec, 1.2,
	1.3 sources, 1.3, 1.4
Message-ID: <20090106151934.726BC70140@cvs1.fedora.phx.redhat.com>

Author: kraxel

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

Modified Files:
	.cvsignore amtterm.spec sources 
Log Message:
update to version 1.2


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/amtterm/EL-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	31 Aug 2007 14:14:15 -0000	1.2
+++ .cvsignore	6 Jan 2009 15:19:04 -0000	1.3
@@ -1 +1 @@
-amtterm-1.0.tar.gz
+amtterm-1.2.tar.gz


Index: amtterm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/amtterm/EL-5/amtterm.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- amtterm.spec	31 Aug 2007 14:14:15 -0000	1.2
+++ amtterm.spec	6 Jan 2009 15:19:04 -0000	1.3
@@ -1,6 +1,6 @@
 Name:         amtterm
 License:      GPLv2+
-Version:      1.0
+Version:      1.2
 Release:      1%{?dist}
 Summary:      Serial-over-lan (sol) client for Intel AMT
 Group:        Applications/Internet
@@ -43,6 +43,12 @@
 rm -rf %{buildroot}
 
 %changelog
+* Tue Jan 06 2009 Gerd Hoffmann <kraxel at redhat.com> - 1.2-1
+- update to version 1.2
+  * support special reboot commands (pxe, bios. ...).
+  * gamt: gui tweaks, logging support.
+  * some minor doc tweaks.
+
 * Fri Aug 31 2007 Gerd Hoffmann <kraxel at redhat.com> - 1.0-1
 - update to version 1.0
   * more amttool improvements (network config).


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/amtterm/EL-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	31 Aug 2007 14:14:15 -0000	1.3
+++ sources	6 Jan 2009 15:19:04 -0000	1.4
@@ -1 +1 @@
-d39d02baae01d22084ffd47837e90d3b  amtterm-1.0.tar.gz
+74646aeab6af038bd557f344f8178adc  amtterm-1.2.tar.gz



From bpepple at fedoraproject.org  Tue Jan  6 15:20:58 2009
From: bpepple at fedoraproject.org (Brian Pepple)
Date: Tue,  6 Jan 2009 15:20:58 +0000 (UTC)
Subject: rpms/telepathy-butterfly/devel .cvsignore, 1.8, 1.9 sources, 1.8,
	1.9 telepathy-butterfly.spec, 1.11, 1.12
Message-ID: <20090106152058.A6D1A70140@cvs1.fedora.phx.redhat.com>

Author: bpepple

Update of /cvs/pkgs/rpms/telepathy-butterfly/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7580

Modified Files:
	.cvsignore sources telepathy-butterfly.spec 
Log Message:
* Tue Jan  6 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.3.3-1
- Update to 0.3.3.
- Add NEWS.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-butterfly/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	25 Jul 2008 23:00:53 -0000	1.8
+++ .cvsignore	6 Jan 2009 15:20:28 -0000	1.9
@@ -1 +1 @@
-telepathy-butterfly-0.3.2.tar.gz
+telepathy-butterfly-0.3.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-butterfly/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	25 Jul 2008 23:00:53 -0000	1.8
+++ sources	6 Jan 2009 15:20:28 -0000	1.9
@@ -1 +1 @@
-f1db30de25daf382aa3e9b5b8efecd70  telepathy-butterfly-0.3.2.tar.gz
+0b659c575c8d1867fe4a0da13704519f  telepathy-butterfly-0.3.3.tar.gz


Index: telepathy-butterfly.spec
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-butterfly/devel/telepathy-butterfly.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- telepathy-butterfly.spec	29 Nov 2008 17:21:19 -0000	1.11
+++ telepathy-butterfly.spec	6 Jan 2009 15:20:28 -0000	1.12
@@ -1,8 +1,8 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           telepathy-butterfly
-Version:        0.3.2
-Release:        2%{?dist}
+Version:        0.3.3
+Release:        1%{?dist}
 Summary:        MSN connection manager for Telepathy
 
 Group:          Applications/Communications
@@ -50,7 +50,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc COPYING AUTHORS
+%doc COPYING AUTHORS NEWS
 %{_libexecdir}/%{name}
 %{_datadir}/dbus-1/services/*.service
 %{_datadir}/telepathy/managers/*.manager
@@ -58,6 +58,10 @@
 
 
 %changelog
+* Tue Jan  6 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.3.3-1
+- Update to 0.3.3.
+- Add NEWS.
+
 * Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 0.3.2-2
 - Rebuild for Python 2.6
 



From mcpierce at fedoraproject.org  Tue Jan  6 15:37:50 2009
From: mcpierce at fedoraproject.org (Darryl L. Pierce)
Date: Tue,  6 Jan 2009 15:37:50 +0000 (UTC)
Subject: rpms/rubygem-rubyforge/F-10 .cvsignore, 1.4,
	1.5 rubygem-rubyforge.spec, 1.4, 1.5 sources, 1.4, 1.5
Message-ID: <20090106153750.C837A70108@cvs1.fedora.phx.redhat.com>

Author: mcpierce

Update of /cvs/pkgs/rpms/rubygem-rubyforge/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14127

Modified Files:
	.cvsignore rubygem-rubyforge.spec sources 
Log Message:
Release 1.0.2 of RubyForge.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-rubyforge/F-10/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	23 Oct 2008 13:57:43 -0000	1.4
+++ .cvsignore	6 Jan 2009 15:37:20 -0000	1.5
@@ -1 +1 @@
-rubyforge-1.0.1.gem
+rubyforge-1.0.2.gem


Index: rubygem-rubyforge.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-rubyforge/F-10/rubygem-rubyforge.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- rubygem-rubyforge.spec	23 Oct 2008 13:57:44 -0000	1.4
+++ rubygem-rubyforge.spec	6 Jan 2009 15:37:20 -0000	1.5
@@ -6,7 +6,7 @@
 
 Summary: 	A script which automates a limited set of rubyforge operations
 Name: 		rubygem-%{gemname}
-Version: 	1.0.1
+Version: 	1.0.2
 Release: 	1%{?dist}
 Group: 		Development/Languages
 License: 	GPLv2+ or Ruby
@@ -55,6 +55,9 @@
 
 
 %changelog
+* Tue Jan 06 2008 Darryl Pierce <dpierce at redhat.com> - 1.0.2-1
+- Release 1.0.2 of RubyForge.
+
 * Thu Oct 23 2008 Darryl Pierce <dpierce at redhat.com> - 1.0.1-1
 - Release 1.0.1 of Rubyforge.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-rubyforge/F-10/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	23 Oct 2008 13:57:44 -0000	1.4
+++ sources	6 Jan 2009 15:37:20 -0000	1.5
@@ -1 +1 @@
-108a583b38ed38c5cdc5dc8b32831238  rubyforge-1.0.1.gem
+ad35500c0187249f39f26ca490004444  rubyforge-1.0.2.gem



From lkundrak at fedoraproject.org  Tue Jan  6 15:38:12 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Tue,  6 Jan 2009 15:38:12 +0000 (UTC)
Subject: rpms/inkscape/devel inkscape.spec, 1.55.2.3, 1.55.2.4 sources,
	1.16.2.2, 1.16.2.3 inkscape-0.45.1-desktop.patch, 1.2,
	NONE inkscape-0.46+devel-desktop.patch, 1.1.2.1,
	NONE inkscape-0.46+devel-icons.patch, 1.1.2.1,
	NONE inkscape-0.46+devel-uniconv.patch, 1.1.2.1,
	NONE inkscape-0.46-cxxinclude.patch, 1.1.2.1,
	NONE inkscape-0.46-fixlatex.patch, 1.1,
	NONE inkscape-0.46-gtk2.13.3.patch, 1.1,
	NONE inkscape-0.46-gtkopen.patch, 1.1,
	NONE inkscape-0.46pre2-icons.patch, 1.2, NONE
Message-ID: <20090106153812.30CD870108@cvs1.fedora.phx.redhat.com>

Author: lkundrak

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

Modified Files:
      Tag: inkscape-0_47-devel
	inkscape.spec sources 
Removed Files:
      Tag: inkscape-0_47-0_2_20080814svn_fc10
	inkscape-0.45.1-desktop.patch 
	inkscape-0.46+devel-desktop.patch 
	inkscape-0.46+devel-icons.patch 
	inkscape-0.46+devel-uniconv.patch 
	inkscape-0.46-cxxinclude.patch inkscape-0.46-fixlatex.patch 
	inkscape-0.46-gtk2.13.3.patch inkscape-0.46-gtkopen.patch 
	inkscape-0.46pre2-icons.patch 
Log Message:
* Tue Jan 06 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.47-0.3.20090105svn
- Update to newer SVN
- Drop upstreamed patched
- Enable WordPerfect Graphics support
- Enable embedded Perl scripting
- Enable Imagemagick support
- Disable OpenSSL due to licensing issues



Index: inkscape.spec
===================================================================
RCS file: /cvs/pkgs/rpms/inkscape/devel/inkscape.spec,v
retrieving revision 1.55.2.3
retrieving revision 1.55.2.4
diff -u -r1.55.2.3 -r1.55.2.4
--- inkscape.spec	14 Aug 2008 19:59:16 -0000	1.55.2.3
+++ inkscape.spec	6 Jan 2009 15:37:41 -0000	1.55.2.4
@@ -1,18 +1,14 @@
 Name:           inkscape
 Version:        0.47
-Release:        0.2.20080814svn%{?dist}
+Release:        0.2.20090105svn%{?dist}
 Summary:        Vector-based drawing program using SVG
 
 Group:          Applications/Productivity
 License:        GPLv2+
 URL:            http://inkscape.sourceforge.net/
 #Source0:        http://download.sourceforge.net/inkscape/%{name}-%{version}.tar.bz2
-Source0:        %{name}-0.46+devel.tar.gz
-Patch0:         inkscape-0.46-cxxinclude.patch
-Patch1:         inkscape-0.46+devel-desktop.patch
-Patch2:         inkscape-0.46+devel-icons.patch
-Patch5:         inkscape-0.46-gtk2.13.3.patch
-Patch7:         inkscape-0.46+devel-uniconv.patch
+Source0:        %{name}.tar.gz
+Patch0:         inkscape-0.46+devel-uniconv.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -31,27 +27,30 @@
 BuildRequires:  pkgconfig
 BuildRequires:  lcms-devel >= 1.13
 BuildRequires:  cairo-devel
-BuildRequires:  openssl-devel
 BuildRequires:  dos2unix
-BuildRequires:  perl-XML-Parser
 BuildRequires:  python-devel
 BuildRequires:  poppler-devel
 BuildRequires:  loudmouth-devel
 BuildRequires:  boost-devel
 BuildRequires:  gsl-devel
-
-# Use popt-devel if Fedora 8, RHEL 6, newer or unknown,
-# rely on popt otherwise
-%if %{!?fedora:8}%{?fedora} < 8 || %{!?rhel:6}%{?rhel} < 6
-BuildRequires:  popt
-%else
+BuildRequires:  libwpg-devel
 BuildRequires:  popt-devel
-%endif
+BuildRequires:  ImageMagick-c++-devel
+BuildRequires:  perl(XML::Parser)
+BuildRequires:  perl(ExtUtils::Embed)
+
+# Incompatible license
+BuildConflicts: openssl-devel
 
+Requires:       dia
 Requires:       pstoedit
+Requires:       ghostscript
 Requires:       perl(Image::Magick)
+Requires:       tex(latex)
+Requires:       tex(dvips)
+Requires:       transfig
+Requires:       gimp
 Requires:       numpy
-Requires:       PyXML
 Requires:       python-lxml
 Requires:       uniconvertor
 
@@ -59,43 +58,43 @@
 Requires(postun): desktop-file-utils
 
 %description
-Inkscape is a vector-based drawing program, like CorelDraw?? or Adobe
-Illustrator?? from the proprietary software world, and Sketch or Karbon14 from
-the free software world. It is free software, distributed under the terms of
-the Gnu General Public License, Version 2.
-
-Inkscape uses W3C SVG as its native file format. It is therefore a very useful
-tool for web designers and as an interchange format for desktop publishing.
-
-It has a relatively modern display engine, giving you finely antialiased
-display, alpha transparencies, vector fonts and so on. Inkscape is written in
-C and C++, using the Gtk+ toolkit and optionally some Gnome libraries.
+Inkscape is a vector graphics editor, with capabilities similar to
+Illustrator, CorelDraw, or Xara X, using the W3C standard Scalable Vector
+Graphics (SVG) file format.  It is therefore a very useful tool for web
+designers and as an interchange format for desktop publishing.
+
+Inkscape supports many advanced SVG features (markers, clones, alpha
+blending, etc.) and great care is taken in designing a streamlined
+interface. It is very easy to edit nodes, perform complex path operations,
+trace bitmaps and much more.
 
 
 %prep
-%setup -q -n %{name}-0.46+devel
-%patch0 -p1 -b .cxxinclude
-%patch1 -p1 -b .desktop
-%patch2 -p1 -b .icons
-%patch5 -p1 -b .gtk2.13.3
-%patch7 -p1 -b .uniconv
-find -type f -regex '.*\.\(cpp\|h\)' -perm +111 -exec chmod -x {} ';'
-find share/extensions/ -type f -regex '.*\.py' -perm +111 -exec chmod -x {} ';'
+%setup -q -n %{name}
+%patch0 -p1 -b .uniconv
+
+# https://bugs.launchpad.net/inkscape/+bug/314381
+# A couple of files have executable bits set,
+# despite not being executable
+(find . \( -name '*.cpp' -o -name '*.h' \) -perm +111
+	find share/extensions -name '*.py' -perm +111
+) |xargs chmod -x
+
+# Fix end of line encodings
 dos2unix -k -q share/extensions/*.py
 
 
 %build
-%configure                     \
---disable-dependency-tracking  \
---with-xinerama                \
---enable-static=no             \
---with-python                  \
---with-perl                    \
---with-gnome-vfs               \
---with-inkjar                  \
---enable-inkboard              \
---enable-lcms                  \
---enable-poppler-cairo
+%configure                      \
+        --with-python           \
+        --with-perl             \
+        --with-gnome-vfs        \
+        --with-xft              \
+        --enable-inkboard       \
+        --enable-lcms           \
+        --enable-poppler-cairo  \
+        --disable-dependency-tracking
+
 
 make %{?_smp_mflags}
 
@@ -103,15 +102,16 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
-%find_lang %{name}
 find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
 
-rm -f $RPM_BUILD_ROOT%{_datadir}/%{name}/extensions/outline2svg.*
-rm -f $RPM_BUILD_ROOT%{_datadir}/%{name}/extensions/txt2svg.*
+desktop-file-install --vendor fedora --delete-original  \
+        --dir $RPM_BUILD_ROOT%{_datadir}/applications   \
+        $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
+
+# No skencil yet
+$RPM_BUILD_ROOT%{_datadir}/%{name}/extensions/sk2svg.sh
 
-desktop-file-install --vendor fedora --delete-original     \
-  --dir $RPM_BUILD_ROOT%{_datadir}/applications            \
-  $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
+%find_lang %{name}
 
 
 %clean
@@ -131,13 +131,21 @@
 %doc AUTHORS COPYING ChangeLog NEWS README
 %doc %{_mandir}/man1/*
 %{_bindir}/*
-%{_datadir}/%{name}/
+%{_datadir}/%{name}
 %{_datadir}/applications/*.desktop
 %{_datadir}/pixmaps/*
 %{_mandir}/fr/man1/*
 
 
 %changelog
+* Tue Jan 06 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.47-0.3.20090105svn
+- Update to newer SVN
+- Drop upstreamed patched
+- Enable WordPerfect Graphics support
+- Enable embedded Perl scripting
+- Enable Imagemagick support
+- Disable OpenSSL due to licensing issues
+
 * Thu Aug 14 2008 Lubomir Rintel <lkundrak at v3.sk> - 0.47-0.3.20080814svn
 - Update to today's SVN snapshot
 - Drop the upstreamed poppler patch


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/inkscape/devel/sources,v
retrieving revision 1.16.2.2
retrieving revision 1.16.2.3
diff -u -r1.16.2.2 -r1.16.2.3
--- sources	14 Aug 2008 19:59:16 -0000	1.16.2.2
+++ sources	6 Jan 2009 15:37:41 -0000	1.16.2.3
@@ -1 +0,0 @@
-688fa4d72740e147d87e0dc30a7c4ca6  inkscape-0.46+devel.tar.gz


--- inkscape-0.45.1-desktop.patch DELETED ---


--- inkscape-0.46+devel-desktop.patch DELETED ---


--- inkscape-0.46+devel-icons.patch DELETED ---


--- inkscape-0.46+devel-uniconv.patch DELETED ---


--- inkscape-0.46-cxxinclude.patch DELETED ---


--- inkscape-0.46-fixlatex.patch DELETED ---


--- inkscape-0.46-gtk2.13.3.patch DELETED ---


--- inkscape-0.46-gtkopen.patch DELETED ---


--- inkscape-0.46pre2-icons.patch DELETED ---



From mcpierce at fedoraproject.org  Tue Jan  6 15:42:10 2009
From: mcpierce at fedoraproject.org (Darryl L. Pierce)
Date: Tue,  6 Jan 2009 15:42:10 +0000 (UTC)
Subject: rpms/rubygem-rubyforge/F-10 rubygem-rubyforge.spec,1.5,1.6
Message-ID: <20090106154210.645DD70108@cvs1.fedora.phx.redhat.com>

Author: mcpierce

Update of /cvs/pkgs/rpms/rubygem-rubyforge/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15587

Modified Files:
	rubygem-rubyforge.spec 
Log Message:
Had the wrong year in the latest changelog entry. 



Index: rubygem-rubyforge.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-rubyforge/F-10/rubygem-rubyforge.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- rubygem-rubyforge.spec	6 Jan 2009 15:37:20 -0000	1.5
+++ rubygem-rubyforge.spec	6 Jan 2009 15:41:39 -0000	1.6
@@ -55,7 +55,7 @@
 
 
 %changelog
-* Tue Jan 06 2008 Darryl Pierce <dpierce at redhat.com> - 1.0.2-1
+* Tue Jan 06 2009 Darryl Pierce <dpierce at redhat.com> - 1.0.2-1
 - Release 1.0.2 of RubyForge.
 
 * Thu Oct 23 2008 Darryl Pierce <dpierce at redhat.com> - 1.0.1-1



From dwalsh at fedoraproject.org  Tue Jan  6 15:45:20 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Tue,  6 Jan 2009 15:45:20 +0000 (UTC)
Subject: rpms/libselinux/devel libselinux-rhat.patch, 1.179,
	1.180 libselinux.spec, 1.353, 1.354
Message-ID: <20090106154520.5647E70108@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/libselinux/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16976

Modified Files:
	libselinux-rhat.patch libselinux.spec 
Log Message:
* Tue Jan 6 2009 Dan Walsh <dwalsh at redhat.com> - 2.0.77-2
- Fix restorecon python code


libselinux-rhat.patch:

Index: libselinux-rhat.patch
===================================================================
RCS file: /cvs/extras/rpms/libselinux/devel/libselinux-rhat.patch,v
retrieving revision 1.179
retrieving revision 1.180
diff -u -r1.179 -r1.180
--- libselinux-rhat.patch	6 Jan 2009 14:31:46 -0000	1.179
+++ libselinux-rhat.patch	6 Jan 2009 15:44:49 -0000	1.180
@@ -110,7 +110,7 @@
 +
 +def restorecon(path, recursive=False):
 +    """ Restore SELinux context on a given path """
-+    mode = os.stat(path)[stat.ST_MODE]
++    mode = os.lstat(path)[stat.ST_MODE]
 +    status, context = matchpathcon(path, mode)
 +    if status == 0:
 +        lsetfilecon(path, context)
@@ -153,7 +153,7 @@
 +
 +def restorecon(path, recursive=False):
 +    """ Restore SELinux context on a given path """
-+    mode = os.stat(path)[stat.ST_MODE]
++    mode = os.lstat(path)[stat.ST_MODE]
 +    status, context = matchpathcon(path, mode)
 +    if status == 0:
 +        lsetfilecon(path, context)


Index: libselinux.spec
===================================================================
RCS file: /cvs/extras/rpms/libselinux/devel/libselinux.spec,v
retrieving revision 1.353
retrieving revision 1.354
diff -u -r1.353 -r1.354
--- libselinux.spec	6 Jan 2009 14:31:47 -0000	1.353
+++ libselinux.spec	6 Jan 2009 15:44:49 -0000	1.354
@@ -5,7 +5,7 @@
 Summary: SELinux library and simple utilities
 Name: libselinux
 Version: 2.0.77
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: Public Domain
 Group: System Environment/Libraries
 Source: http://www.nsa.gov/selinux/archives/%{name}-%{version}.tgz
@@ -164,6 +164,9 @@
 %{ruby_sitearch}/selinux.so
 
 %changelog
+* Tue Jan 6 2009 Dan Walsh <dwalsh at redhat.com> - 2.0.77-2
+- Fix restorecon python code
+
 * Tue Jan 6 2009 Dan Walsh <dwalsh at redhat.com> - 2.0.77-1
 - Update to upstream
 



From mbarnes at fedoraproject.org  Tue Jan  6 15:46:01 2009
From: mbarnes at fedoraproject.org (Matthew Barnes)
Date: Tue,  6 Jan 2009 15:46:01 +0000 (UTC)
Subject: rpms/evolution-exchange/devel .cvsignore, 1.34,
	1.35 evolution-exchange.spec, 1.47, 1.48 sources, 1.34, 1.35
Message-ID: <20090106154601.8DEEC70108@cvs1.fedora.phx.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/evolution-exchange/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17235

Modified Files:
	.cvsignore evolution-exchange.spec sources 
Log Message:

* Tue Jan 06 2009 Matthew Barnes <mbarnes at redhat.com> - 2.25.4-1.fc11
- Update to 2.25.4



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-exchange/devel/.cvsignore,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- .cvsignore	15 Dec 2008 17:13:25 -0000	1.34
+++ .cvsignore	6 Jan 2009 15:45:31 -0000	1.35
@@ -1 +1 @@
-evolution-exchange-2.25.3.tar.bz2
+evolution-exchange-2.25.4.tar.bz2


Index: evolution-exchange.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-exchange/devel/evolution-exchange.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- evolution-exchange.spec	15 Dec 2008 17:13:25 -0000	1.47
+++ evolution-exchange.spec	6 Jan 2009 15:45:31 -0000	1.48
@@ -22,7 +22,7 @@
 ### Abstract ###
 
 Name: evolution-exchange
-Version: 2.25.3
+Version: 2.25.4
 Release: 1%{?dist}
 License: GPLv2
 Group: Applications/Productivity
@@ -156,6 +156,9 @@
 %{_sysconfdir}/gconf/schemas/apps_exchange_addressbook-%{evo_major}.schemas
 
 %changelog
+* Tue Jan 06 2009 Matthew Barnes <mbarnes at redhat.com> - 2.25.4-1.fc11
+- Update to 2.25.4
+
 * Mon Dec 15 2008 Matthew Barnes <mbarnes at redhat.com> - 2.25.3-1.fc11
 - Update to 2.25.3
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-exchange/devel/sources,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- sources	15 Dec 2008 17:13:25 -0000	1.34
+++ sources	6 Jan 2009 15:45:31 -0000	1.35
@@ -1 +1 @@
-ab2c2bc2ef67ab8091084a8117b8f2ef  evolution-exchange-2.25.3.tar.bz2
+d408c90c60752841b07751b0200b797a  evolution-exchange-2.25.4.tar.bz2



From limb at fedoraproject.org  Tue Jan  6 15:47:46 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Tue,  6 Jan 2009 15:47:46 +0000 (UTC)
Subject: rpms/bacula/F-9 bacula-bat.desktop, 1.1,
	1.2 bacula-bwxconsole.desktop, 1.1, 1.2 bacula-config.patch, 1.2,
	1.3 bacula-director-configuration.patch, 1.1,
	1.2 bacula-gconsole.desktop, 1.2, 1.3 bacula-traymonitor.desktop,
	1.1, 1.2 bacula-wxconsole.desktop, 1.2, 1.3 bacula.logrotate,
	1.2, 1.3 bacula.spec, 1.9, 1.10 sources, 1.3, 1.4
Message-ID: <20090106154746.A2A7270108@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/bacula/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18164

Modified Files:
	bacula-bat.desktop bacula-bwxconsole.desktop 
	bacula-config.patch bacula-director-configuration.patch 
	bacula-gconsole.desktop bacula-traymonitor.desktop 
	bacula-wxconsole.desktop bacula.logrotate bacula.spec sources 
Log Message:
Update to 2.4.4., multiple upstream and packaging fixes.



Index: bacula-bat.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/bacula/F-9/bacula-bat.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- bacula-bat.desktop	31 Jul 2008 12:18:40 -0000	1.1
+++ bacula-bat.desktop	6 Jan 2009 15:47:15 -0000	1.2
@@ -5,7 +5,7 @@
 GenericName=Backup Management Console
 Comment=Control your Bacula Server
 Exec=bat -c /etc/bacula/bat.conf
-Icon=bacula.png
+Icon=bat_icon
 Terminal=false
 Type=Application
 Categories=System;Application;Utility


Index: bacula-bwxconsole.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/bacula/F-9/bacula-bwxconsole.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- bacula-bwxconsole.desktop	31 Jul 2008 12:18:40 -0000	1.1
+++ bacula-bwxconsole.desktop	6 Jan 2009 15:47:15 -0000	1.2
@@ -5,7 +5,7 @@
 GenericName=Backup Management Console
 Comment=Control your Bacula Server
 Exec=bwxconsole -c /etc/bacula/bwxconsole.conf
-Icon=wxwin16x16.xpm
+Icon=wxwin16x16
 Terminal=false
 Type=Application
 Categories=System;Application;Utility

bacula-config.patch:

Index: bacula-config.patch
===================================================================
RCS file: /cvs/pkgs/rpms/bacula/F-9/bacula-config.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- bacula-config.patch	31 Jul 2008 12:18:40 -0000	1.2
+++ bacula-config.patch	6 Jan 2009 15:47:15 -0000	1.3
@@ -1,256 +1,122 @@
---- bacula-2.0.2/src/gnome2-console/bgnome-console.conf.in.orig	2007-02-06 13:35:12.000000000 +0100
-+++ bacula-2.0.2/src/gnome2-console/bgnome-console.conf.in	2007-02-06 13:35:25.000000000 +0100
-@@ -3,9 +3,9 @@
- #
- 
- Director {
+--- bacula-2.4.3/src/gnome2-console/bgnome-console.conf.in.orig	2008-12-10 10:12:18.000000000 -0600
++++ bacula-2.4.3/src/gnome2-console/bgnome-console.conf.in	2008-12-10 10:12:18.000000000 -0600
+@@ -6 +6 @@
 -  Name = @hostname at -dir
 +  Name = bacula-dir
-   DIRport = @dir_port@
+@@ -8 +8 @@
 -  address = @hostname@
 +  address = server.example.com
-   Password = "@dir_password@"
- }
- 
---- bacula-2.0.2/src/dird/bacula-dir.conf.in.orig	2007-02-06 13:33:19.000000000 +0100
-+++ bacula-2.0.2/src/dird/bacula-dir.conf.in	2007-02-06 13:34:49.000000000 +0100
-@@ -13,7 +13,7 @@
- #
- 
- Director {                            # define myself
+--- bacula-2.4.3/src/dird/bacula-dir.conf.in.orig	2008-12-10 10:17:27.000000000 -0600
++++ bacula-2.4.3/src/dird/bacula-dir.conf.in	2008-12-10 10:17:27.000000000 -0600
+@@ -16 +16 @@
 -  Name = @hostname at -dir
 +  Name = bacula-dir
-   DIRport = @dir_port@                # where we listen for UA connections
-   QueryFile = "@scriptdir@/query.sql"
-   WorkingDirectory = "@working_dir@"
-@@ -27,7 +27,7 @@
-   Name = "DefaultJob"
-   Type = Backup
-   Level = Incremental
+@@ -30 +30 @@
 -  Client = @hostname at -fd 
 +  Client = bacula-fd 
-   FileSet = "Full Set"
-   Schedule = "WeeklyCycle"
-   Storage = File
-@@ -48,7 +48,7 @@
- 
- #Job {
- #  Name = "Client2"
+@@ -51 +51 @@
 -#  Client = @hostname at 2-fd
 +#  Client = bacula2-fd
- #  JobDefs = "DefaultJob"
- #  Write Bootstrap = "@working_dir@/Client2.bsr"
- #}
-@@ -75,7 +75,7 @@
- Job {
-   Name = "RestoreFiles"
-   Type = Restore
+@@ -82 +82 @@
 -  Client=@hostname at -fd                 
 +  Client=bacula-fd                 
-   FileSet="Full Set"                  
-   Storage = File                      
-   Pool = Default
-@@ -149,8 +149,8 @@
- 
- # Client (File Services) to backup
- Client {
+@@ -157,2 +157,2 @@
 -  Name = @hostname at -fd
 -  Address = @hostname@
 +  Name = bacula-fd
 +  Address = client.example.com
-   FDPort = @fd_port@
-   Catalog = MyCatalog
-   Password = "@fd_password@"          # password for FileDaemon
-@@ -164,8 +164,8 @@
- #  You should change Name, Address, and Password before using
- #
- #Client {
+@@ -172,2 +172,2 @@
 -#  Name = @hostname at 2-fd                
 -#  Address = @hostname at 2
 +#  Name = bacula2-fd                
 +#  Address = client2.example.com
- #  FDPort = @fd_port@
- #  Catalog = MyCatalog
- #  Password = "@fd_password at 2"         # password for FileDaemon 2
-@@ -179,7 +179,7 @@
- Storage {
-   Name = File
- # Do not use "localhost" here    
+@@ -187 +187 @@
 -  Address = @hostname@                # N.B. Use a fully qualified name here
-+  Address = storage.example.com        # N.B. Use a fully qualified name here
-   SDPort = @sd_port@
-   Password = "@sd_password@"
-   Device = FileStorage
-@@ -192,7 +192,7 @@
- #Storage {
- #  Name = DDS-4    
- #  Do not use "localhost" here
++  Address = storage.example.com                # N.B. Use a fully qualified name here
+@@ -200 +200 @@
 -#  Address = @hostname@                # N.B. Use a fully qualified name here
-+#  Address = storage.example.com       # N.B. Use a fully qualified name here
- #  SDPort = @sd_port@
- #  Password = "@sd_password@"          # password for Storage daemon
- #  Device = DDS-4                      # must be same as Device in Storage daemon
-@@ -204,7 +204,7 @@
- #Storage {
- #  Name = "8mmDrive"
- #  Do not use "localhost" here
++#  Address = storage.example.com                # N.B. Use a fully qualified name here
+@@ -212 +212 @@
 -#  Address = @hostname@                # N.B. Use a fully qualified name here
-+#  Address = storage.example.com       # N.B. Use a fully qualified name here
- #  SDPort = @sd_port@
- #  Password = "@sd_password@"
- #  Device = "Exabyte 8mm"
-@@ -215,7 +215,7 @@
- #Storage {
- #  Name = "DVD"
- #  Do not use "localhost" here
++#  Address = storage.example.com                # N.B. Use a fully qualified name here
+@@ -223 +223 @@
 -#  Address = @hostname@                # N.B. Use a fully qualified name here
-+#  Address = storage.example.com       # N.B. Use a fully qualified name here
- #  SDPort = @sd_port@
- #  Password = "@sd_password@"
- #  Device = "DVD Writer"
-@@ -285,7 +285,7 @@
- # Restricted console used by tray-monitor to get the status of the director
- #
- Console {
++#  Address = storage.example.com                # N.B. Use a fully qualified name here
+@@ -299 +299 @@
 -  Name = @hostname at -mon
 +  Name = bacula-mon
-   Password = "@mon_dir_password@"
-   CommandACL = status, .status
- }
---- bacula-2.0.2/src/filed/bacula-fd.conf.in.orig	2007-02-06 13:30:59.000000000 +0100
-+++ bacula-2.0.2/src/filed/bacula-fd.conf.in	2007-02-06 13:31:25.000000000 +0100
-@@ -11,7 +11,7 @@
- # List Directors who are permitted to contact this File daemon
- #
- Director {
+--- bacula-2.4.3/src/filed/bacula-fd.conf.in.orig	2008-12-10 10:19:12.000000000 -0600
++++ bacula-2.4.3/src/filed/bacula-fd.conf.in	2008-12-10 10:19:12.000000000 -0600
+@@ -14 +14 @@
 -  Name = @hostname at -dir
 +  Name = bacula-dir
-   Password = "@fd_password@"
- }
- 
-@@ -20,7 +20,7 @@
- #   status of the file daemon
- #
- Director {
+@@ -23 +23 @@
 -  Name = @hostname at -mon
 +  Name = bacula-mon
-   Password = "@mon_fd_password@"
-   Monitor = yes
- }
-@@ -29,7 +29,7 @@
- # "Global" File daemon configuration specifications
- #
- FileDaemon {                          # this is me
+@@ -32 +32 @@
 -  Name = @hostname at -fd
 +  Name = bacula-fd
-   FDport = @fd_port@                  # where we listen for the director
-   WorkingDirectory = @working_dir@
-   Pid Directory = @piddir@
-@@ -39,5 +39,5 @@
- # Send all messages except skipped files back to Director
- Messages {
-   Name = Standard
+@@ -42 +42 @@
 -  director = @hostname at -dir = all, !skipped, !restored
 +  director = bacula-dir = all, !skipped, !restored
- }
---- bacula-2.0.2/src/console/bconsole.conf.in.orig	2007-02-06 13:32:30.000000000 +0100
-+++ bacula-2.0.2/src/console/bconsole.conf.in	2007-02-06 13:33:06.000000000 +0100
-@@ -3,8 +3,8 @@
- #
- 
- Director {
--  Name = @hostname at -dir
-+  Name = bacula-dir
-   DIRport = @dir_port@
--  address = @hostname@
-+  address = server.example.com
-   Password = "@dir_password@"
- }
---- bacula-2.0.2/src/stored/bacula-sd.conf.in.orig	2007-02-06 13:31:56.000000000 +0100
-+++ bacula-2.0.2/src/stored/bacula-sd.conf.in	2007-02-06 13:32:15.000000000 +0100
-@@ -11,7 +11,7 @@
- #
- 
- Storage {                             # definition of myself
+--- bacula-2.4.3/src/stored/bacula-sd.conf.in.orig	2008-12-10 10:21:45.000000000 -0600
++++ bacula-2.4.3/src/stored/bacula-sd.conf.in	2008-12-10 10:21:45.000000000 -0600
+@@ -14 +14 @@
 -  Name = @hostname at -sd
 +  Name = bacula-sd
-   SDPort = @sd_port@                  # Director's port      
-   WorkingDirectory = "@working_dir@"
-   Pid Directory = "@piddir@"
-@@ -22,7 +22,7 @@
- # List Directors who are permitted to contact Storage daemon
- #
- Director {
+@@ -25 +25 @@
 -  Name = @hostname at -dir
 +  Name = bacula-dir
-   Password = "@sd_password@"
- }
- 
-@@ -31,7 +31,7 @@
- #   status of the storage daemon
- #
- Director {
+@@ -34 +34 @@
 -  Name = @hostname at -mon
 +  Name = bacula-mon
-   Password = "@mon_sd_password@"
-   Monitor = yes
- }
-@@ -204,5 +204,5 @@
- #
- Messages {
-   Name = Standard
+@@ -228 +228 @@
 -  director = @hostname at -dir = all
 +  director = bacula-dir = all
- }
---- bacula-2.0.2/src/wx-console/bwx-console.conf.in.orig	2007-02-06 13:37:12.000000000 +0100
-+++ bacula-2.0.2/src/wx-console/bwx-console.conf.in	2007-02-06 13:47:02.000000000 +0100
-@@ -3,8 +3,8 @@
- #
- 
- Director {
+--- bacula-2.4.3/src/wx-console/bwx-console.conf.in.orig	2008-12-10 10:22:23.000000000 -0600
++++ bacula-2.4.3/src/wx-console/bwx-console.conf.in	2008-12-10 10:22:23.000000000 -0600
+@@ -6 +6 @@
 -  Name = @hostname at -dir
 +  Name = bacula-dir
-   DIRport = @dir_port@
+@@ -8 +8 @@
 -  address = @hostname@
 +  address = server.example.com
-   Password = "@dir_password@"
- }
---- bacula-2.0.2/src/tray-monitor/tray-monitor.conf.in.orig	2007-02-06 13:47:13.000000000 +0100
-+++ bacula-2.0.2/src/tray-monitor/tray-monitor.conf.in	2007-02-06 13:47:55.000000000 +0100
-@@ -3,27 +3,27 @@
- #
- 
- Monitor {
+--- bacula-2.4.3/src/tray-monitor/tray-monitor.conf.in.orig	2008-12-10 10:28:02.000000000 -0600
++++ bacula-2.4.3/src/tray-monitor/tray-monitor.conf.in	2008-12-10 10:28:02.000000000 -0600
+@@ -6 +6 @@
 -  Name = @hostname at -mon
 +  Name = bacula-mon
-   Password = "@mon_dir_password@"         # password for the Directors   
-   RefreshInterval = 5 seconds
- }
-    
- Client {
+@@ -12,2 +12,2 @@
 -  Name = @hostname at -fd
 -  Address = @hostname@
 +  Name = bacula-fd
 +  Address = client.example.com
-   FDPort = @fd_port@
-   Password = "@mon_fd_password@"          # password for FileDaemon
- }
- 
- Storage {
+@@ -19,2 +19,2 @@
 -  Name = @hostname at -sd
 -  Address = @hostname@
 +  Name = bacula-sd
 +  Address = storage.example.com
-   SDPort = @sd_port@
-   Password = "@mon_sd_password@"          # password for StorageDaemon
- }
- 
- Director {
+@@ -26 +26 @@
+-  Name = @hostname at -dir
++  Name = bacula-dir
+@@ -28 +27,0 @@
+-  address = @hostname@
+--- bacula-2.4.3/src/qt-console/bat.conf.in.orig	2008-12-10 10:27:02.000000000 -0600
++++ bacula-2.4.3/src/qt-console/bat.conf.in	2008-12-10 10:27:02.000000000 -0600
+@@ -6 +6 @@
 -  Name = @hostname at -dir
 +  Name = bacula-dir
-   DIRport = @dir_port@
+@@ -8 +8 @@
 -  address = @hostname@
--}
-\ No newline at end of file
 +  address = server.example.com
-+}
+--- bacula-2.4.3/src/stored/stored.conf.in.orig	2008-12-10 10:27:44.000000000 -0600
++++ bacula-2.4.3/src/stored/stored.conf.in	2008-12-10 10:27:44.000000000 -0600
+@@ -11 +11 @@
+-  Address = @hostname@
++  Address = storage.example.com
+@@ -22 +22 @@
+-  Name = @hostname at -dir
++  Name = bacula-dir
+@@ -54 +54 @@
+-  director = @hostname at -dir = all
++  director = bacula-dir = all

bacula-director-configuration.patch:

Index: bacula-director-configuration.patch
===================================================================
RCS file: /cvs/pkgs/rpms/bacula/F-9/bacula-director-configuration.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- bacula-director-configuration.patch	24 Jul 2007 20:11:04 -0000	1.1
+++ bacula-director-configuration.patch	6 Jan 2009 15:47:15 -0000	1.2
@@ -1,34 +1,17 @@
---- bacula-1.38.11/src/dird/bacula-dir.conf.in.orig	2006-09-03 03:13:26.000000000 +0200
-+++ bacula-1.38.11/src/dird/bacula-dir.conf.in	2006-09-03 03:14:46.000000000 +0200
-@@ -15,7 +15,7 @@
- Director {                            # define myself
-   Name = @hostname at -dir
-   DIRport = @dir_port@                # where we listen for UA connections
+--- bacula-2.4.3/src/dird/bacula-dir.conf.in.orig	2008-12-10 08:59:18.000000000 -0600
++++ bacula-2.4.3/src/dird/bacula-dir.conf.in	2008-12-10 08:59:18.000000000 -0600
+@@ -18 +18 @@
 -  QueryFile = "@scriptdir@/query.sql"
 +  QueryFile = "/etc/bacula/query.sql"
-   WorkingDirectory = "@working_dir@"
-   PidDirectory = "@piddir@"
-   Maximum Concurrent Jobs = 1
-@@ -101,11 +101,10 @@
- #    if you have other partitons such as /usr or /home
- #    you will probably want to add them too.
- #
+@@ -108,3 +108,2 @@
 -#  By default this is defined to point to the Bacula build
 -#    directory to give a reasonable FileSet to backup to
 -#    disk storage during initial testing.
 +#  This File-directive would backup your whole filesystem.
 +#    It is disabled by default
- #
+@@ -112 +111 @@
 -    File = @BUILD_DIR@
-+#    File = /
-   }
- 
- #
-@@ -266,7 +266,7 @@
-   mailcommand = "@sbindir@/bsmtp -h @smtp_host@ -f \"\(Bacula\) %r\" -s \"Bacula daemon message\" %r"
-   mail = @job_email@ = all, !skipped
-   console = all, !skipped, !saved
++    File = /
+@@ -263 +262 @@
 -  append = "@working_dir@/log" = all, !skipped
 +  append = "/var/log/bacula.log" = all, !skipped
- }
-


Index: bacula-gconsole.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/bacula/F-9/bacula-gconsole.desktop,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- bacula-gconsole.desktop	31 Jul 2008 12:18:40 -0000	1.2
+++ bacula-gconsole.desktop	6 Jan 2009 15:47:15 -0000	1.3
@@ -5,7 +5,7 @@
 GenericName=Backup Management Console
 Comment=Control your Bacula Server
 Exec=bgnome-console -c /etc/bacula/bgnome-console.conf
-Icon=bacula.png
+Icon=bacula
 Terminal=false
 Type=Application
 Categories=System;Application;


Index: bacula-traymonitor.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/bacula/F-9/bacula-traymonitor.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- bacula-traymonitor.desktop	24 Jul 2007 20:11:04 -0000	1.1
+++ bacula-traymonitor.desktop	6 Jan 2009 15:47:15 -0000	1.2
@@ -5,7 +5,7 @@
 GenericName=Bacula Tray Monitor
 Comment=Monitor your Bacula Backup server
 Exec=bacula-tray-monitor -c /etc/bacula/tray-monitor.conf
-Icon=bacula-tray-monitor.xpm
+Icon=bacula-tray-monitor
 Terminal=false
 Type=Application
 Categories=System;Application;Utility


Index: bacula-wxconsole.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/bacula/F-9/bacula-wxconsole.desktop,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- bacula-wxconsole.desktop	31 Jul 2008 12:18:40 -0000	1.2
+++ bacula-wxconsole.desktop	6 Jan 2009 15:47:15 -0000	1.3
@@ -5,7 +5,7 @@
 GenericName=Backup Management Console
 Comment=Control your Bacula Server
 Exec=wxconsole -c /etc/bacula/bwxconsole.conf
-Icon=wxwin16x16.xpm
+Icon=wxwin16x16
 Terminal=false
 Type=Application
 Categories=System;Application;


Index: bacula.logrotate
===================================================================
RCS file: /cvs/pkgs/rpms/bacula/F-9/bacula.logrotate,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- bacula.logrotate	29 Aug 2008 17:25:48 -0000	1.2
+++ bacula.logrotate	6 Jan 2009 15:47:15 -0000	1.3
@@ -1,6 +1,6 @@
 # Bacula logrotate script
 
-/var/log/bacula/*.log /var/spool/bacula/log {
+/var/log/bacula/*.log /var/spool/bacula/log /var/log/bacula.log {
     monthly
     rotate 4
     notifempty


Index: bacula.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bacula/F-9/bacula.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- bacula.spec	10 Sep 2008 15:39:05 -0000	1.9
+++ bacula.spec	6 Jan 2009 15:47:15 -0000	1.10
@@ -4,12 +4,11 @@
 %define docs_version	%{version}
 %define gui_version	%{version}
 %define config_dir	%{_sysconfdir}/bacula
-%define _default_patch_fuzz 2
 
 Summary: Cross platform network backup for Linux, Unix, Mac and Windows
 Name: bacula
-Version: 2.2.8
-Release: 3%{?dist}
+Version: 2.4.4
+Release: 1%{?dist}
 # See LICENSE for details
 License: GPLv2 with exceptions
 Group: System Environment/Daemons
@@ -25,6 +24,7 @@
 Source9: bacula-sd.init
 #Source10: http://download.sourceforge.net/bacula/bacula-gui-%{gui_version}.tar.gz
 #Source11: bacula-web.apache
+Source12: bacula-bat.desktop
 Patch0: bacula-director-configuration.patch
 Patch1: bacula-config.patch
 #Patch2: bacula-wxconsole.patch
@@ -36,6 +36,8 @@
 #Patch8: 2.0.3-verify.patch
 #Patch9: 2.0.3-tls-disconnect.patch
 #Patch10: bacula-web-smarty.patch
+#Patch11: bacula-2.4.3-orphaned-jobs.patch
+#Patch12: bacula-2.4.3-python26.patch
 URL: http://www.bacula.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: openssl-devel, atk-devel, ncurses-devel, pango-devel, perl
@@ -46,7 +48,7 @@
 BuildRequires: mysql-devel, cdrecord, postgresql-devel, wxGTK-devel
 BuildRequires: desktop-file-utils, python-devel, sqlite-devel, sed,
 BuildRequires: libacl-devel, latex2html, tetex-latex, tetex, ghostscript
-BuildRequires: dvipdfm
+BuildRequires: dvipdfm, qwt-devel
 
 %if 0%{?fedora} >= 7
 BuildRequires: tcp_wrappers-devel
@@ -119,6 +121,7 @@
 Group: System Environment/Daemons
 Requires: bacula-director = %{version}-%{release}
 Requires: bacula-common = %{version}-%{release}
+Requires: logwatch
 Requires(pre): fedora-usermgmt
 Requires(postun): fedora-usermgmt
 
@@ -222,6 +225,7 @@
 %package common
 Summary: Common Bacula utilities
 Group: System Environment/Daemons
+Requires: bacula-sysconfdir = %{version}-%{release}
 Requires(pre): fedora-usermgmt
 Requires(postun): fedora-usermgmt
 
@@ -234,6 +238,7 @@
 %package console
 Summary: Bacula management console
 Group: System Environment/Daemons
+Requires: bacula-sysconfdir = %{version}-%{release}
 
 %description console
 Bacula is a set of programs that allow you to manage the backup,
@@ -247,6 +252,7 @@
 %package console-gnome
 Summary: Bacula console for the Gnome desktop environment
 Group: System Environment/Daemons
+Requires: bacula-sysconfdir = %{version}-%{release}
 Requires: usermode
 
 %description console-gnome
@@ -256,10 +262,24 @@
 
 This package contains the gnome version of the bacula management console
 
+%package console-bat
+Summary: Bacula bat console
+Group: System Environment/Daemons
+Requires: bacula-sysconfdir = %{version}-%{release}
+Requires: usermode
+
+%description console-bat
+Bacula is a set of programs that allow you to manage the backup,
+recovery, and verification of computer data across a network of
+different computers. It is based on a client/server architecture.
+
+This package contains the bat version of the bacula management console
+
 
 %package console-wxwidgets
 Summary: Bacula console using the wx widgets toolkit
 Group: System Environment/Daemons
+Requires: bacula-sysconfdir = %{version}-%{release}
 Requires: usermode
 
 %description console-wxwidgets
@@ -271,6 +291,18 @@
 console.
 
 
+%package sysconfdir
+Summary: /etc/bacula dependency for Bacula
+Group: System Environment/Daemons
+
+%description sysconfdir
+Bacula is a set of programs that allow you to manage the backup,
+recovery, and verification of computer data across a network of
+different computers. It is based on a client/server architecture.
+
+This package provides the /etc/bacula directory in order to satisfy
+certain scripted checks.
+
 %package traymonitor
 Summary: Bacula monitor for the Gnome and KDE system tray
 Group: System Environment/Daemons
@@ -329,6 +361,8 @@
 #%patch7 -p0
 #%patch8 -p0
 #%patch9 -p0
+#%patch11 -p0
+#%patch12 -p0
 
 # Remove execution permissions from files we're packaging as docs later on
 find examples -type f | xargs chmod -x
@@ -387,6 +421,8 @@
 	--with-python \
 	--enable-smartalloc \
 	--with-x \
+	--enable-bat \
+	--with-qwt=/usr/lib \
 	$*
 # Scratch this, it is trouble
 #	--with-readline \
@@ -530,14 +566,22 @@
 install -m 644 -D bacula-sqlite/src/wx-console/wxwin16x16.xpm %{buildroot}%{_datadir}/pixmaps/wxwin16x16.xpm
 install -m 644 -D bacula-sqlite/scripts/wxconsole.pamd %{buildroot}%{_sysconfdir}/pam.d/wxconsole
 install -m 644 -D bacula-sqlite/scripts/wxconsole.desktop.consolehelper %{buildroot}%{_sysconfdir}/security/console.apps/wxconsole
+#bat.pamd is broken.
+install -m 644 -D bacula-sqlite/scripts/bgnome-console.pamd %{buildroot}%{_sysconfdir}/pam.d/bat
+install -m 644 -D bacula-sqlite/scripts/bat.desktop.consolehelper %{buildroot}%{_sysconfdir}/security/console.apps/bat
 install -m 644 -D bacula-sqlite/src/tray-monitor/generic.xpm %{buildroot}%{_datadir}/pixmaps/bacula-tray-monitor.xpm
+install -m 644 -D bacula-sqlite/src/qt-console/images/bat_icon.png %{buildroot}%{_datadir}/pixmaps/bat_icon.png
+
 
 ln -sf consolehelper %{buildroot}%{_bindir}/gnome-console
 ln -sf consolehelper %{buildroot}%{_bindir}/wxconsole
+ln -sf consolehelper %{buildroot}%{_bindir}/bat
+install -m 755 bacula-sqlite/src/qt-console/bat %{buildroot}%{_sbindir}
 
 desktop-file-install --vendor="fedora" --dir=%{buildroot}%{_datadir}/applications %{SOURCE3}
 desktop-file-install --vendor="fedora" --dir=%{buildroot}%{_datadir}/applications %{SOURCE4}
 desktop-file-install --vendor="fedora" --dir=%{buildroot}%{_datadir}/applications %{SOURCE5}
+desktop-file-install --vendor="fedora" --dir=%{buildroot}%{_datadir}/applications %{SOURCE12}
 
 
 # logrotate
@@ -624,11 +668,13 @@
 	/usr/sbin/alternatives --remove bacula-dir /usr/sbin/bacula-dir.mysql
 fi
 
+
 %preun director-sqlite
 if [ "$1" = 0 ]; then
 	/usr/sbin/alternatives --remove bacula-dir /usr/sbin/bacula-dir.sqlite
 fi
 
+
 %preun director-postgresql
 if [ "$1" = 0 ]; then
 	/usr/sbin/alternatives --remove bacula-dir /usr/sbin/bacula-dir.postgresql
@@ -680,7 +726,7 @@
 
 
 %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
@@ -697,7 +743,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
@@ -714,7 +760,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
@@ -726,13 +772,19 @@
 fi
 
 
+# For this braindeadness, please see
+# https://bugzilla.redhat.com/show_bug.cgi?id=473627
+%files sysconfdir
+%defattr(-,root,root,-)
+%dir %{_sysconfdir}/bacula
+
+
 %files common
 %defattr(-,root,root,-)
 %doc bacula-%{version}/AUTHORS bacula-%{version}/ChangeLog bacula-%{version}/COPYING bacula-%{version}/LICENSE
 %doc bacula-%{version}/README bacula-%{version}/SUPPORT bacula-%{version}/VERIFYING
 %doc bacula-%{version}/examples/
 %config(noreplace) %{_sysconfdir}/logrotate.d/bacula
-%dir %{_sysconfdir}/bacula
 %dir %{_libexecdir}/bacula
 %{_sbindir}/bsmtp
 %{_sbindir}/btraceback
@@ -772,6 +824,17 @@
 %{_datadir}/applications/fedora-bacula-gconsole.desktop
 %{_datadir}/pixmaps/bacula.png
 
+%files console-bat
+%defattr(-,root,root,-)
+%config %{_sysconfdir}/security/console.apps/bat
+%config %{_sysconfdir}/pam.d/bat
+%attr(640,root,bacula) %config(noreplace) %{_sysconfdir}/bacula/bat.conf
+%{_bindir}/bat
+%{_sbindir}/bat
+%{_mandir}/man1/bat.1.gz
+%{_datadir}/applications/fedora-bacula-bat.desktop
+%{_datadir}/pixmaps/bat_icon.png
+
 
 %files console-wxwidgets
 %defattr(-,root,root,-)
@@ -796,7 +859,6 @@
 %{_initrddir}/bacula-dir
 %{_sbindir}/bregex
 %{_sbindir}/bwild
-%{_mandir}/man1/bat.1.gz
 %{_mandir}/man8/dbcheck.8*
 %{_mandir}/man8/bacula-dir.8*
 %{_libexecdir}/bacula/delete_catalog_backup
@@ -928,10 +990,39 @@
 
 
 %changelog
-* Wed Sep 10 2008 Jon Ciesla <limb at jcomserv.net> - 2.2.8-3
+* Mon Jan 05 2009 Jon Ciesla <limb at jcomserv.net - 2.4.4-1
+- Update to new upstream, 2.4.4.
+- Dropped orphaned jobs patch, python 2.6 patch, applied upstream.
+
+* Mon Dec 15 2008 Jon Ciesla <limb at jcomserv.net - 2.4.3-7
+- Patched to support Python 2.6, BZ 476547.
+
+* Fri Dec 12 2008 Jon Ciesla <limb at jcomserv.net - 2.4.3-6
+- Fix consolehelper behaviour for bat.
+
+* Wed Dec 10 2008 Jon Ciesla <limb at jcomserv.net - 2.4.3-5
+- Re-diffed fuzzy bacula-director-configuration and bacula-config patches.
+
+* Mon Dec 1 2008 Andreas Thienemann <andreas at bawue.net> - 2.4.3-4
+- Fixed dependency "issues" #473627 by adding the sysconfdir subpackage.
+
+* Mon Nov 17 2008 Jon Ciesla <limb at jcomserv.net> - 2.4.3-3
+- Added upstream orphaned jobs patch.
+- Fixed logrotate file.
+
+* Mon Nov 10 2008 Jon Ciesla <limb at jcomserv.net> - 2.4.3-2
+- Added bat.  BZ 470800.
+
+* Wed Oct 22 2008 Jon Ciesla <limb at jcomserv.net> - 2.4.3-1
+- Update to 2.4.3.
+
+* 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.
+
 * Wed Jul 30 2008 Andreas Thienemann <athienem at redhat.com> - 2.2.8-2
 - Fixed %%{fedora} comparision, making bacula-sqlite build on rawhide
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bacula/F-9/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	31 Jul 2008 12:18:40 -0000	1.3
+++ sources	6 Jan 2009 15:47:16 -0000	1.4
@@ -1,2 +1,2 @@
-4547d0bf9f976d5d9ea5f21a7bd078ee  bacula-2.2.8.tar.gz
-9cc38ace92d52c7bebbbfc2ed5507b79  bacula-docs-2.2.8.tar.bz2
+4eb6155b45611018af03002d37a2ffde  bacula-2.4.4.tar.gz
+d9bb3e8ca8c9a4c741b83569c21a4806  bacula-docs-2.4.4.tar.bz2



From rdieter at fedoraproject.org  Tue Jan  6 15:49:57 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Tue,  6 Jan 2009 15:49:57 +0000 (UTC)
Subject: rpms/eigen2/F-10 .cvsignore, 1.5, 1.6 eigen2.spec, 1.4, 1.5 sources,
	1.5, 1.6
Message-ID: <20090106154957.BE3DC70108@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/eigen2/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18909

Modified Files:
	.cvsignore eigen2.spec sources 
Log Message:
* Tue Jan 06 2009 Rex Dieter <rdieter at fedoraproject.org> 2.0-0.7.beta5
- eigen-2.0-beta5



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/eigen2/F-10/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	5 Jan 2009 15:06:58 -0000	1.5
+++ .cvsignore	6 Jan 2009 15:49:27 -0000	1.6
@@ -1 +1 @@
-eigen-2.0-beta4.tar.bz2
+eigen-2.0-beta5.tar.bz2


Index: eigen2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eigen2/F-10/eigen2.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- eigen2.spec	5 Jan 2009 15:06:58 -0000	1.4
+++ eigen2.spec	6 Jan 2009 15:49:27 -0000	1.5
@@ -3,16 +3,16 @@
 # http://bugzilla.redhat.com/459705
 
 %define _with_check -DBUILD_TESTS=ON 
-%define pre beta4
+%define pre beta5
 
 Name:    eigen2
 Summary: A lightweight C++ template library for vector and matrix math
 Version: 2.0 
-Release: 0.6.%{pre}%{?dist} 
+Release: 0.7.%{pre}%{?dist} 
 Group:   System Environment/Libraries
 License: GPLv2+ or LGPLv3+
 URL:     http://eigen.tuxfamily.org/
-Source0: http://eigen.tuxfamily.org/eigen-%{version}-%{pre}.tar.bz2
+Source0: http://download.tuxfamily.org/eigen/eigen-%{version}-%{pre}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 
@@ -82,6 +82,9 @@
 
 
 %changelog
+* Tue Jan 06 2009 Rex Dieter <rdieter at fedoraproject.org> 2.0-0.7.beta5
+- eigen-2.0-beta5
+
 * Sun Jan 04 2009 Rex Dieter <rdieter at fedoraproject.org> 2.0-0.6.beta4
 - eigen-2.0-beta4
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eigen2/F-10/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	5 Jan 2009 15:06:58 -0000	1.5
+++ sources	6 Jan 2009 15:49:27 -0000	1.6
@@ -1 +1 @@
-2a83362c251da812be16963da0186ad5  eigen-2.0-beta4.tar.bz2
+1516005412881714f692a9f2c5c061a6  eigen-2.0-beta5.tar.bz2



From rdieter at fedoraproject.org  Tue Jan  6 15:50:46 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Tue,  6 Jan 2009 15:50:46 +0000 (UTC)
Subject: rpms/eigen2/F-9 .cvsignore, 1.5, 1.6 eigen2.spec, 1.4, 1.5 sources, 
	1.5, 1.6
Message-ID: <20090106155046.2ED0070108@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/eigen2/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19366

Modified Files:
	.cvsignore eigen2.spec sources 
Log Message:
* Tue Jan 06 2009 Rex Dieter <rdieter at fedoraproject.org> 2.0-0.7.beta5
- eigen-2.0-beta5



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/eigen2/F-9/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	5 Jan 2009 15:07:18 -0000	1.5
+++ .cvsignore	6 Jan 2009 15:50:15 -0000	1.6
@@ -1 +1 @@
-eigen-2.0-beta4.tar.bz2
+eigen-2.0-beta5.tar.bz2


Index: eigen2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eigen2/F-9/eigen2.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- eigen2.spec	5 Jan 2009 15:07:18 -0000	1.4
+++ eigen2.spec	6 Jan 2009 15:50:15 -0000	1.5
@@ -3,16 +3,16 @@
 # http://bugzilla.redhat.com/459705
 
 %define _with_check -DBUILD_TESTS=ON 
-%define pre beta4
+%define pre beta5
 
 Name:    eigen2
 Summary: A lightweight C++ template library for vector and matrix math
 Version: 2.0 
-Release: 0.6.%{pre}%{?dist} 
+Release: 0.7.%{pre}%{?dist} 
 Group:   System Environment/Libraries
 License: GPLv2+ or LGPLv3+
 URL:     http://eigen.tuxfamily.org/
-Source0: http://eigen.tuxfamily.org/eigen-%{version}-%{pre}.tar.bz2
+Source0: http://download.tuxfamily.org/eigen/eigen-%{version}-%{pre}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 
@@ -82,6 +82,9 @@
 
 
 %changelog
+* Tue Jan 06 2009 Rex Dieter <rdieter at fedoraproject.org> 2.0-0.7.beta5
+- eigen-2.0-beta5
+
 * Sun Jan 04 2009 Rex Dieter <rdieter at fedoraproject.org> 2.0-0.6.beta4
 - eigen-2.0-beta4
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eigen2/F-9/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	5 Jan 2009 15:07:18 -0000	1.5
+++ sources	6 Jan 2009 15:50:15 -0000	1.6
@@ -1 +1 @@
-2a83362c251da812be16963da0186ad5  eigen-2.0-beta4.tar.bz2
+1516005412881714f692a9f2c5c061a6  eigen-2.0-beta5.tar.bz2



From mbarnes at fedoraproject.org  Tue Jan  6 16:06:30 2009
From: mbarnes at fedoraproject.org (Matthew Barnes)
Date: Tue,  6 Jan 2009 16:06:30 +0000 (UTC)
Subject: rpms/evolution-exchange/devel evolution-exchange.spec,1.48,1.49
Message-ID: <20090106160630.108CE70108@cvs1.fedora.phx.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/evolution-exchange/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25116

Modified Files:
	evolution-exchange.spec 
Log Message:
Try working around libtool breakage.



Index: evolution-exchange.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-exchange/devel/evolution-exchange.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- evolution-exchange.spec	6 Jan 2009 15:45:31 -0000	1.48
+++ evolution-exchange.spec	6 Jan 2009 16:05:59 -0000	1.49
@@ -111,7 +111,7 @@
 #	-DGTK_DISABLE_DEPRECATED=1 \
 
 # Regenerate configure to pick up acinclude.m4 changes.
-autoreconf --force
+autoreconf --force --install
 
 %configure \
   --enable-gtk-doc \



From pkgdb at fedoraproject.org  Tue Jan  6 16:07:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 06 Jan 2009 16:07:27 +0000
Subject: [pkgdb] cmake had acl change status
Message-ID: <20090106160727.EA3C2208D50@bastion.fedora.phx.redhat.com>

orion has set the watchcommits acl on cmake (Fedora devel) to Approved for rdieter

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cmake



From pkgdb at fedoraproject.org  Tue Jan  6 16:07:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 06 Jan 2009 16:07:27 +0000
Subject: [pkgdb] cmake had acl change status
Message-ID: <20090106160729.6AB1A208D57@bastion.fedora.phx.redhat.com>

orion has set the watchbugzilla acl on cmake (Fedora devel) to Approved for rdieter

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cmake



From pkgdb at fedoraproject.org  Tue Jan  6 16:07:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 06 Jan 2009 16:07:30 +0000
Subject: [pkgdb] cmake had acl change status
Message-ID: <20090106160730.54A3D208D6A@bastion.fedora.phx.redhat.com>

orion has set the commit acl on cmake (Fedora devel) to Approved for rdieter

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cmake



From pkgdb at fedoraproject.org  Tue Jan  6 16:07:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 06 Jan 2009 16:07:48 +0000
Subject: [pkgdb] cmake had acl change status
Message-ID: <20090106160748.9CA6A208D4F@bastion.fedora.phx.redhat.com>

orion has set the watchbugzilla acl on cmake (Fedora 10) to Approved for rdieter

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cmake



From pkgdb at fedoraproject.org  Tue Jan  6 16:07:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 06 Jan 2009 16:07:51 +0000
Subject: [pkgdb] cmake had acl change status
Message-ID: <20090106160751.EF9DE208D51@bastion.fedora.phx.redhat.com>

orion has set the watchcommits acl on cmake (Fedora 10) to Approved for rdieter

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cmake



From pkgdb at fedoraproject.org  Tue Jan  6 16:07:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 06 Jan 2009 16:07:52 +0000
Subject: [pkgdb] cmake had acl change status
Message-ID: <20090106160752.69FBE208DA6@bastion.fedora.phx.redhat.com>

orion has set the commit acl on cmake (Fedora 10) to Approved for rdieter

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cmake



From mclasen at fedoraproject.org  Tue Jan  6 16:14:27 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue,  6 Jan 2009 16:14:27 +0000 (UTC)
Subject: rpms/gnome-games/devel .cvsignore, 1.90, 1.91 gnome-games.spec,
	1.194, 1.195 sources, 1.95, 1.96
Message-ID: <20090106161428.0082670108@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-games/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27634

Modified Files:
	.cvsignore gnome-games.spec sources 
Log Message:
2.25.4



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-games/devel/.cvsignore,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -r1.90 -r1.91
--- .cvsignore	17 Dec 2008 23:55:30 -0000	1.90
+++ .cvsignore	6 Jan 2009 16:13:57 -0000	1.91
@@ -1 +1 @@
-gnome-games-2.25.3.tar.bz2
+gnome-games-2.25.4.tar.bz2


Index: gnome-games.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-games/devel/gnome-games.spec,v
retrieving revision 1.194
retrieving revision 1.195
diff -u -r1.194 -r1.195
--- gnome-games.spec	17 Dec 2008 23:55:30 -0000	1.194
+++ gnome-games.spec	6 Jan 2009 16:13:57 -0000	1.195
@@ -43,7 +43,7 @@
 
 Summary: Games for the GNOME desktop
 Name: gnome-games
-Version: 2.25.3
+Version: 2.25.4
 Release: 1%{?dist}
 Epoch: 1
 License: GPLv2+ and GFDL
@@ -356,6 +356,9 @@
 %{_datadir}/omf/*
 
 %changelog
+* Tue Jan  6 2009 Matthias Clasen <mclasen at redhat.com> - 1:2.25.4-1
+- Update to 2.25.4
+
 * Wed Dec 17 2008 Matthias Clasen <mclasen at redhat.com> - 1:2.25.3-1
 - Update to 2.25.3
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-games/devel/sources,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -r1.95 -r1.96
--- sources	17 Dec 2008 23:55:30 -0000	1.95
+++ sources	6 Jan 2009 16:13:57 -0000	1.96
@@ -1 +1 @@
-7867045ef7ea02a5d30596868afdb0eb  gnome-games-2.25.3.tar.bz2
+f78a4141f8d634d83eb3ce1c9fc995f9  gnome-games-2.25.4.tar.bz2



From mclasen at fedoraproject.org  Tue Jan  6 16:17:46 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue,  6 Jan 2009 16:17:46 +0000 (UTC)
Subject: rpms/eog/devel .cvsignore, 1.74, 1.75 eog.spec, 1.134, 1.135 sources,
	1.74, 1.75
Message-ID: <20090106161746.1BC8170108@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/eog/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28940

Modified Files:
	.cvsignore eog.spec sources 
Log Message:
2.25.4



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/eog/devel/.cvsignore,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- .cvsignore	17 Dec 2008 17:23:53 -0000	1.74
+++ .cvsignore	6 Jan 2009 16:17:15 -0000	1.75
@@ -1 +1 @@
-eog-2.25.3.tar.bz2
+eog-2.25.4.tar.bz2


Index: eog.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eog/devel/eog.spec,v
retrieving revision 1.134
retrieving revision 1.135
diff -u -r1.134 -r1.135
--- eog.spec	17 Dec 2008 17:45:08 -0000	1.134
+++ eog.spec	6 Jan 2009 16:17:15 -0000	1.135
@@ -12,8 +12,8 @@
 
 Summary: Eye of GNOME image viewer
 Name:    eog
-Version: 2.25.3
-Release: 2%{?dist}
+Version: 2.25.4
+Release: 1%{?dist}
 URL: http://projects.gnome.org/eog/
 Source: http://download.gnome.org/sources/eog/2.25/%{name}-%{version}.tar.bz2
 Patch0: libxml.patch
@@ -181,6 +181,9 @@
 %{_datadir}/gtk-doc/html/eog
 
 %changelog
+* Tue Jan  6 2009 Matthias Clasen <mclasen at redhat.com> - 2.25.4-1
+- Update to 2.25.4
+
 * Wed Dec 17 2008 Matthias Clasen <mclasen at redhat.com> - 2.25.3-2
 - Update to 2.25.3
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eog/devel/sources,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- sources	17 Dec 2008 17:23:54 -0000	1.74
+++ sources	6 Jan 2009 16:17:15 -0000	1.75
@@ -1 +1 @@
-f0b80bc25aec29fe15c194ba63f8d072  eog-2.25.3.tar.bz2
+9fd02dae4c731e2fe2fb16ae8c09baf3  eog-2.25.4.tar.bz2



From rstrode at fedoraproject.org  Tue Jan  6 16:18:49 2009
From: rstrode at fedoraproject.org (Ray Strode)
Date: Tue,  6 Jan 2009 16:18:49 +0000 (UTC)
Subject: rpms/gnome-desktop/devel gnome-desktop-2.25.1.1-fade.patch, 1.5,
	1.6 gnome-desktop.spec, 1.194, 1.195
Message-ID: <20090106161849.2B8C870108@cvs1.fedora.phx.redhat.com>

Author: rstrode

Update of /cvs/pkgs/rpms/gnome-desktop/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29430

Modified Files:
	gnome-desktop-2.25.1.1-fade.patch gnome-desktop.spec 
Log Message:
- Stop cross fade before freeing pixmaps in finalize instead
  of after.


gnome-desktop-2.25.1.1-fade.patch:

Index: gnome-desktop-2.25.1.1-fade.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-desktop/devel/gnome-desktop-2.25.1.1-fade.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- gnome-desktop-2.25.1.1-fade.patch	5 Dec 2008 14:36:10 -0000	1.5
+++ gnome-desktop-2.25.1.1-fade.patch	6 Jan 2009 16:18:18 -0000	1.6
@@ -255,7 +255,7 @@
 new file mode 100644
 --- /dev/null
 +++ b/libgnome-desktop/gnome-bg-crossfade.c
-@@ -0,0 +1,541 @@
+@@ -0,0 +1,540 @@
 +/* gnome-bg-crossfade.h - fade window background between two pixmaps
 + *
 + * Copyright (C) 2008 Red Hat, Inc.
@@ -388,6 +388,8 @@
 +
 +	fade = GNOME_BG_CROSSFADE (object);
 +
++	gnome_bg_crossfade_stop (fade);
++
 +	if (fade->priv->fading_pixmap != NULL) {
 +		g_object_unref (fade->priv->fading_pixmap);
 +		fade->priv->fading_pixmap = NULL;
@@ -397,12 +399,6 @@
 +		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
@@ -694,6 +690,9 @@
 +static void
 +on_finished (GnomeBGCrossfade *fade)
 +{
++	if (fade->priv->timeout_id == 0)
++		return;
++
 +	g_assert (fade->priv->end_pixmap != NULL);
 +
 +	gdk_window_set_back_pixmap (fade->priv->window,


Index: gnome-desktop.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-desktop/devel/gnome-desktop.spec,v
retrieving revision 1.194
retrieving revision 1.195
diff -u -r1.194 -r1.195
--- gnome-desktop.spec	17 Dec 2008 05:14:15 -0000	1.194
+++ gnome-desktop.spec	6 Jan 2009 16:18:18 -0000	1.195
@@ -12,7 +12,7 @@
 Summary: Package containing code shared among gnome-panel, gnome-session, nautilus, etc
 Name: gnome-desktop
 Version: 2.25.3
-Release: 2%{?dist}
+Release: 3%{?dist}
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/gnome-desktop/2.25/%{name}-%{version}.tar.bz2
 License: GPLv2+ and LGPLv2+
@@ -124,6 +124,10 @@
 %doc %{_datadir}/gtk-doc/html/gnome-desktop/
 
 %changelog
+* Tue Jan  6 2009 Ray Strode <rstrode at redhat.com> - 2.25.3-3
+- Stop cross fade before freeing pixmaps in finalize instead
+  of after.
+
 * Tue Dec 16 2008 Matthias Clasen <mclasen at redhat.com> - 2.25.3-2
 - Update to 2.25.3
 



From jlaska at fedoraproject.org  Tue Jan  6 16:26:47 2009
From: jlaska at fedoraproject.org (James Laska)
Date: Tue,  6 Jan 2009 16:26:47 +0000 (UTC)
Subject: rpms/snake/EL-4 import.log, NONE, 1.1 .cvsignore, 1.3,
	1.4 snake.spec, 1.2, 1.3 sources, 1.3, 1.4
Message-ID: <20090106162647.A45E07013F@cvs1.fedora.phx.redhat.com>

Author: jlaska

Update of /cvs/pkgs/rpms/snake/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31589/EL-4

Modified Files:
	.cvsignore snake.spec sources 
Added Files:
	import.log 
Log Message:
Update to snake-0.11-0.12


--- NEW FILE import.log ---
snake-0_11-0_12_fc10:EL-4:snake-0.11-0.12.fc10.src.rpm:1231259161


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/snake/EL-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	17 Jun 2008 13:10:20 -0000	1.3
+++ .cvsignore	6 Jan 2009 16:26:17 -0000	1.4
@@ -1 +1 @@
-snake-0.11-0.7.tar.bz2
+snake-0.11-0.12.tar.bz2


Index: snake.spec
===================================================================
RCS file: /cvs/pkgs/rpms/snake/EL-4/snake.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- snake.spec	17 Jun 2008 13:10:20 -0000	1.2
+++ snake.spec	6 Jan 2009 16:26:17 -0000	1.3
@@ -4,13 +4,13 @@
 Name:           snake
 Summary:        Smart Network Automated Kickstart Environment
 Version:        0.11
-%define rel     0.7
+%define rel     0.12
 Release:        %{rel}%{?dist}
 Source0:        http://hosted.fedoraproject.org/projects/snake/SnakeReleases/%{name}-%{version}-%{rel}.tar.bz2
 License:        GPLv2+
 Group:          Applications/Internet
 URL:            http://hosted.fedoraproject.org/projects/snake/
-Requires:       yum
+Requires:       yum, pax
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildArch:      noarch
 BuildRequires:  python-devel
@@ -58,7 +58,7 @@
 %{__python} -c 'import setuptools; execfile("setup.py")' install --skip-build --root $RPM_BUILD_ROOT
 
 install -d $RPM_BUILD_ROOT/%{_localstatedir}/lib/snake
-install -d $RPM_BUILD_ROOT/%{_localstatedir}/lib/snake/{kickstarts,trees,machines}
+install -d $RPM_BUILD_ROOT/%{_localstatedir}/lib/snake/{kickstarts,templates,trees,machines}
 
 
 %clean
@@ -78,7 +78,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc README LICENSE
+%doc README LICENSE docs/DESIGN docs/cobbler.ks
 %{_sbindir}/snake-install
 %{_sbindir}/snake-install-tui
 %{_sbindir}/snake-tree
@@ -111,7 +111,6 @@
 %if %{build_server}
 %files server
 %defattr(-,root,root,-)
-%doc docs/DESIGN
 %{_sbindir}/snake-server
 %dir %{_localstatedir}/lib/snake
 %dir %{_localstatedir}/lib/snake/kickstarts
@@ -123,6 +122,7 @@
 %config(noreplace) %{_sysconfdir}/snake.conf
 %config(noreplace) %{_sysconfdir}/logrotate.d/snake-server
 %{_sysconfdir}/init.d/snake-server
+%{python_sitelib}/snake/anamon.py*
 %{python_sitelib}/snake/compose.py*
 %{python_sitelib}/snake/config.py*
 %{python_sitelib}/snake/dbushelper.py*
@@ -135,6 +135,27 @@
 
 
 %changelog
+* Mon Jan 5 2009 James Laska <jlaska at redhat.com> 0.11-0.12
+- Minor fix to cobbler template and move %doc into base package (jlaska)
+
+* Thu Dec 18 2008 James Laska <jlaska at redhat.com> 0.11-0.11
+- ticket#64 - only parse kickstarts when requested during snake-ks generate
+  (jlaska)
+
+* Fri Aug 29 2008 James Laska <jlaska at redhat.com> 0.11-0.10
+- ticket#54 - correct for older grubby that can't handle --title that contains
+  spaces (jlaska)
+- handle version parsing problems by falling back to "devel" (wwoods)
+
+* Mon Jul 28 2008 James Laska <jlaska at redhat.com> 0.11-0.9
+- ticket#60 - Added snake/anamon.py to packaging
+
+* Mon Jul 28 2008 James Laska <jlaska at redhat.com> 0.11-0.8
+- ticket#59 - snake-install-tui will auto-register an unregistered system when
+  using server-side kickstarts
+- ticket#57 - Fixed snake-install -c argument handling
+- Enable 'writefp' support for python templates
+
 * Tue Jun 17 2008 James Laska <jlaska at redhat.com> 0.11-0.7
 - ticket#56 - Fixed translate.py traceback for older python
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/snake/EL-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	17 Jun 2008 13:10:20 -0000	1.3
+++ sources	6 Jan 2009 16:26:17 -0000	1.4
@@ -1 +1 @@
-c6363556d27e081d91f3de94ca084e72  snake-0.11-0.7.tar.bz2
+0a763da58a7f8babeccae3a6d35abff6  snake-0.11-0.12.tar.bz2



From s4504kr at fedoraproject.org  Tue Jan  6 16:27:18 2009
From: s4504kr at fedoraproject.org (Jochen Schmitt)
Date: Tue,  6 Jan 2009 16:27:18 +0000 (UTC)
Subject: rpms/ksplice/devel .cvsignore, 1.6, 1.7 ksplice.spec, 1.10,
	1.11 sources, 1.6, 1.7
Message-ID: <20090106162718.54FAF7013F@cvs1.fedora.phx.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/ksplice/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31794

Modified Files:
	.cvsignore ksplice.spec sources 
Log Message:
New upstream release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ksplice/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	1 Dec 2008 18:53:41 -0000	1.6
+++ .cvsignore	6 Jan 2009 16:26:48 -0000	1.7
@@ -1 +1 @@
-ksplice-0.9.4-src.tar.gz
+ksplice-0.9.5-src.tar.gz


Index: ksplice.spec
===================================================================
RCS file: /cvs/extras/rpms/ksplice/devel/ksplice.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ksplice.spec	1 Dec 2008 18:53:41 -0000	1.10
+++ ksplice.spec	6 Jan 2009 16:26:48 -0000	1.11
@@ -1,5 +1,5 @@
 Name:		ksplice
-Version:	0.9.4
+Version:	0.9.5
 Release:	1%{?dist}
 Summary:	Patching a Linux kernel without reboot
 
@@ -84,6 +84,9 @@
 %doc COPYING README
 
 %changelog
+* Tue Jan  6 2009 Jochen Schmitt <Jochen herr-schmitt de> 0.9.5-1
+- New upstream release
+
 * Mon Dec  1 2008 Jochen Schmitt <Jochen herr-schmitt de> 0.9.4-1
 - New upstream release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ksplice/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	1 Dec 2008 18:53:41 -0000	1.6
+++ sources	6 Jan 2009 16:26:48 -0000	1.7
@@ -1 +1 @@
-c454d67280ff03a292cd623f9b5ba7ad  ksplice-0.9.4-src.tar.gz
+05afcb035e76f2b90c49d073ae395c8c  ksplice-0.9.5-src.tar.gz



From mbarnes at fedoraproject.org  Tue Jan  6 16:29:04 2009
From: mbarnes at fedoraproject.org (Matthew Barnes)
Date: Tue,  6 Jan 2009 16:29:04 +0000 (UTC)
Subject: rpms/evolution-exchange/devel
	evolution-exchange-2.25.4-compiler-warnings.patch, NONE,
	1.1 evolution-exchange.spec, 1.49, 1.50
Message-ID: <20090106162904.1B90570125@cvs1.fedora.phx.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/evolution-exchange/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv914

Modified Files:
	evolution-exchange.spec 
Added Files:
	evolution-exchange-2.25.4-compiler-warnings.patch 
Log Message:
Try again.


evolution-exchange-2.25.4-compiler-warnings.patch:

--- NEW FILE evolution-exchange-2.25.4-compiler-warnings.patch ---
diff -up evolution-exchange-2.25.4/camel/camel-exchange-folder.c.compiler-warnings evolution-exchange-2.25.4/camel/camel-exchange-folder.c
--- evolution-exchange-2.25.4/camel/camel-exchange-folder.c.compiler-warnings	2009-01-04 14:55:34.000000000 -0500
+++ evolution-exchange-2.25.4/camel/camel-exchange-folder.c	2009-01-06 11:27:25.000000000 -0500
@@ -29,7 +29,6 @@
 
 #include <glib/gi18n-lib.h>
 #include <libedataserver/e-data-server-util.h>
-#include <camel/camel-i18n.h>
 
 #include "camel-exchange-folder.h"
 #include "camel-exchange-search.h"


Index: evolution-exchange.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-exchange/devel/evolution-exchange.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- evolution-exchange.spec	6 Jan 2009 16:05:59 -0000	1.49
+++ evolution-exchange.spec	6 Jan 2009 16:28:33 -0000	1.50
@@ -44,6 +44,8 @@
 # GNOME bug #443022
 Patch13: evolution-exchange-2.11.2-fix-library-order.patch
 
+Patch14: evolution-exchange-2.25.4-compiler-warnings.patch
+
 ### Dependencies ###
 
 Requires: gnutls
@@ -75,6 +77,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"



From caolanm at fedoraproject.org  Tue Jan  6 16:37:20 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Tue,  6 Jan 2009 16:37:20 +0000 (UTC)
Subject: rpms/awn-extras-applets/devel
	awn-extras-applets-0.2.6.configure.patch, NONE,
	1.1 awn-extras-applets.spec, 1.11, 1.12
Message-ID: <20090106163720.BFE7D70108@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/awn-extras-applets/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4691

Modified Files:
	awn-extras-applets.spec 
Added Files:
	awn-extras-applets-0.2.6.configure.patch 
Log Message:
Resolves: rhbz#478696 make build again

awn-extras-applets-0.2.6.configure.patch:

--- NEW FILE awn-extras-applets-0.2.6.configure.patch ---
--- awn-extras-applets-0.2.6.orig/configure.ac	2009-01-03 16:43:10.000000000 +0000
+++ awn-extras-applets-0.2.6/configure.ac	2008-02-22 15:39:35.000000000 +0000
@@ -112,7 +112,7 @@
 fi
 
 # affinity
-affinity_pkgs="x11"
+affinity_pkgs="x11 libgnomeui-2.0"
 affinity_beagle_pkg="libbeagle-0.0 >= affinity_beagle_min_version"
 AC_MSG_CHECKING([for optional Beagle support (Affinity)])
 PKG_CHECK_EXISTS([$affinity_beagle_pkg], [


Index: awn-extras-applets.spec
===================================================================
RCS file: /cvs/pkgs/rpms/awn-extras-applets/devel/awn-extras-applets.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- awn-extras-applets.spec	29 Nov 2008 16:36:39 -0000	1.11
+++ awn-extras-applets.spec	6 Jan 2009 16:36:50 -0000	1.12
@@ -2,7 +2,7 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 Name:           awn-extras-applets
 Version:        0.2.6
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Extras applets for avant window navigator
 
 Group:          User Interface/Desktops
@@ -30,6 +30,8 @@
 BuildRequires:  pygtk2-devel
 BuildRequires:  vte-devel
 BuildRequires:  libXcomposite-devel
+BuildRequires:  libtool
+BuildRequires:  intltool 
 
 Requires:       avant-window-navigator >= 0.2.6
 Requires:       gnome-python2-gnome
@@ -52,17 +54,21 @@
 Requires(post): GConf2
 Requires(preun): GConf2
 
+Patch0: awn-extras-applets-0.2.6.configure.patch
+
 
 %description
 awn-extras-applets includes extras applets of Avant Window Navigator (Awn).
 
 %prep
 %setup -q
+%patch0 -p1
 #for f in `find -name '*.py'`; do
 #  head -n 1 $f | grep python && echo -e '1d\nwq' | ed $f 
 #done
 
 %build
+./autogen.sh --disable-pymod-checks
 %configure --disable-static --disable-pymod-checks
 make %{?_smp_mflags}
 
@@ -131,6 +137,9 @@
 %{_datadir}/awn-extras-applets/*
 
 %changelog
+* Tue Jan 06 2009 Caol??n McNamara <caolanm at redhat.com> - 0.2.6-8
+- Resolves: rhbz#478696 make build again
+
 * Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 0.2.6-7
 - Rebuild for Python 2.6
 



From s4504kr at fedoraproject.org  Tue Jan  6 16:39:23 2009
From: s4504kr at fedoraproject.org (Jochen Schmitt)
Date: Tue,  6 Jan 2009 16:39:23 +0000 (UTC)
Subject: rpms/ksplice/F-10 ksplice.spec,1.9,1.10 sources,1.6,1.7
Message-ID: <20090106163923.D129870108@cvs1.fedora.phx.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/ksplice/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5584

Modified Files:
	ksplice.spec sources 
Log Message:
New upstream release


Index: ksplice.spec
===================================================================
RCS file: /cvs/extras/rpms/ksplice/F-10/ksplice.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ksplice.spec	1 Dec 2008 19:02:11 -0000	1.9
+++ ksplice.spec	6 Jan 2009 16:38:52 -0000	1.10
@@ -1,5 +1,5 @@
 Name:		ksplice
-Version:	0.9.4
+Version:	0.9.5
 Release:	1%{?dist}
 Summary:	Patching a Linux kernel without reboot
 
@@ -84,6 +84,9 @@
 %doc COPYING README
 
 %changelog
+* Tue Jan  6 2009 Jochen Schmitt <Jochen herr-schmitt de> 0.9.5-1
+- New upstream release
+
 * Mon Dec  1 2008 Jochen Schmitt <Jochen herr-schmitt de> 0.9.4-1
 - New upstream release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ksplice/F-10/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	1 Dec 2008 19:02:11 -0000	1.6
+++ sources	6 Jan 2009 16:38:53 -0000	1.7
@@ -1 +1 @@
-c454d67280ff03a292cd623f9b5ba7ad  ksplice-0.9.4-src.tar.gz
+05afcb035e76f2b90c49d073ae395c8c  ksplice-0.9.5-src.tar.gz



From deji at fedoraproject.org  Tue Jan  6 16:41:52 2009
From: deji at fedoraproject.org (Deji Akingunola)
Date: Tue,  6 Jan 2009 16:41:52 +0000 (UTC)
Subject: rpms/exempi/devel .cvsignore, 1.8, 1.9 exempi.spec, 1.8, 1.9 sources,
	1.8, 1.9
Message-ID: <20090106164152.62DB170108@cvs1.fedora.phx.redhat.com>

Author: deji

Update of /cvs/pkgs/rpms/exempi/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6636

Modified Files:
	.cvsignore exempi.spec sources 
Log Message:
* Tue Jan 06 2009 Deji Akingunola <dakingun at gmail.com> - 2.1.0-1
- Update to 2.1.0
    
* Sat May 17 2008 Deji Akingunola <dakingun at gmail.com> - 2.0.1-1
- Update to 2.0.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/exempi/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	17 May 2008 15:42:49 -0000	1.8
+++ .cvsignore	6 Jan 2009 16:41:21 -0000	1.9
@@ -1 +1 @@
-exempi-2.0.1.tar.gz
+exempi-2.1.0.tar.gz


Index: exempi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/exempi/devel/exempi.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- exempi.spec	17 May 2008 15:42:49 -0000	1.8
+++ exempi.spec	6 Jan 2009 16:41:21 -0000	1.9
@@ -1,6 +1,6 @@
 Summary:	Library for easy parsing of XMP metadata
 Name:		exempi
-Version:	2.0.1
+Version:	2.1.0
 Release:	1%{?dist}
 License:	BSD
 Group:		System Environment/Libraries
@@ -61,6 +61,9 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Tue Jan 06 2009 Deji Akingunola <dakingun at gmail.com> - 2.1.0-1
+- Update to 2.1.0
+    
 * Sat May 17 2008 Deji Akingunola <dakingun at gmail.com> - 2.0.1-1
 - Update to 2.0.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/exempi/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	17 May 2008 15:42:49 -0000	1.8
+++ sources	6 Jan 2009 16:41:21 -0000	1.9
@@ -1 +1 @@
-8d72412c8a1e0330c4fa57da2d0ef96e  exempi-2.0.1.tar.gz
+30dfa5c394b4a3901c66f6e60e8b22e4  exempi-2.1.0.tar.gz



From jlaska at fedoraproject.org  Tue Jan  6 16:42:19 2009
From: jlaska at fedoraproject.org (James Laska)
Date: Tue,  6 Jan 2009 16:42:19 +0000 (UTC)
Subject: rpms/snake/EL-5 import.log, NONE, 1.1 .cvsignore, 1.6,
	1.7 snake.spec, 1.9, 1.10 sources, 1.10, 1.11
Message-ID: <20090106164219.D433670108@cvs1.fedora.phx.redhat.com>

Author: jlaska

Update of /cvs/pkgs/rpms/snake/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6850/EL-5

Modified Files:
	.cvsignore snake.spec sources 
Added Files:
	import.log 
Log Message:
Update to snake-0.11-0.12


--- NEW FILE import.log ---
snake-0_11-0_12_fc10:EL-5:snake-0.11-0.12.fc10.src.rpm:1231260057


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/snake/EL-5/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	16 Jun 2008 18:14:44 -0000	1.6
+++ .cvsignore	6 Jan 2009 16:41:49 -0000	1.7
@@ -1 +1 @@
-snake-0.11-0.6.tar.bz2
+snake-0.11-0.12.tar.bz2


Index: snake.spec
===================================================================
RCS file: /cvs/pkgs/rpms/snake/EL-5/snake.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- snake.spec	16 Jun 2008 18:14:44 -0000	1.9
+++ snake.spec	6 Jan 2009 16:41:49 -0000	1.10
@@ -4,13 +4,13 @@
 Name:           snake
 Summary:        Smart Network Automated Kickstart Environment
 Version:        0.11
-%define rel     0.6
+%define rel     0.12
 Release:        %{rel}%{?dist}
 Source0:        http://hosted.fedoraproject.org/projects/snake/SnakeReleases/%{name}-%{version}-%{rel}.tar.bz2
 License:        GPLv2+
 Group:          Applications/Internet
 URL:            http://hosted.fedoraproject.org/projects/snake/
-Requires:       yum
+Requires:       yum, pax
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildArch:      noarch
 BuildRequires:  python-devel
@@ -58,7 +58,7 @@
 %{__python} -c 'import setuptools; execfile("setup.py")' install --skip-build --root $RPM_BUILD_ROOT
 
 install -d $RPM_BUILD_ROOT/%{_localstatedir}/lib/snake
-install -d $RPM_BUILD_ROOT/%{_localstatedir}/lib/snake/{kickstarts,trees,machines}
+install -d $RPM_BUILD_ROOT/%{_localstatedir}/lib/snake/{kickstarts,templates,trees,machines}
 
 
 %clean
@@ -78,7 +78,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc README LICENSE
+%doc README LICENSE docs/DESIGN docs/cobbler.ks
 %{_sbindir}/snake-install
 %{_sbindir}/snake-install-tui
 %{_sbindir}/snake-tree
@@ -111,7 +111,6 @@
 %if %{build_server}
 %files server
 %defattr(-,root,root,-)
-%doc docs/DESIGN
 %{_sbindir}/snake-server
 %dir %{_localstatedir}/lib/snake
 %dir %{_localstatedir}/lib/snake/kickstarts
@@ -123,6 +122,7 @@
 %config(noreplace) %{_sysconfdir}/snake.conf
 %config(noreplace) %{_sysconfdir}/logrotate.d/snake-server
 %{_sysconfdir}/init.d/snake-server
+%{python_sitelib}/snake/anamon.py*
 %{python_sitelib}/snake/compose.py*
 %{python_sitelib}/snake/config.py*
 %{python_sitelib}/snake/dbushelper.py*
@@ -135,6 +135,30 @@
 
 
 %changelog
+* Mon Jan 5 2009 James Laska <jlaska at redhat.com> 0.11-0.12
+- Minor fix to cobbler template and move %doc into base package (jlaska)
+
+* Thu Dec 18 2008 James Laska <jlaska at redhat.com> 0.11-0.11
+- ticket#64 - only parse kickstarts when requested during snake-ks generate
+  (jlaska)
+
+* Fri Aug 29 2008 James Laska <jlaska at redhat.com> 0.11-0.10
+- ticket#54 - correct for older grubby that can't handle --title that contains
+  spaces (jlaska)
+- handle version parsing problems by falling back to "devel" (wwoods)
+
+* Mon Jul 28 2008 James Laska <jlaska at redhat.com> 0.11-0.9
+- ticket#60 - Added snake/anamon.py to packaging
+
+* Mon Jul 28 2008 James Laska <jlaska at redhat.com> 0.11-0.8
+- ticket#59 - snake-install-tui will auto-register an unregistered system when
+  using server-side kickstarts
+- ticket#57 - Fixed snake-install -c argument handling
+- Enable 'writefp' support for python templates
+
+* Tue Jun 17 2008 James Laska <jlaska at redhat.com> 0.11-0.7
+- ticket#56 - Fixed translate.py traceback for older python
+
 * Tue Jun 13 2008 James Laska <jlaska at redhat.com> 0.11-0.6
 - ticket#37 - snake-server support for hosting http,ftp and nfs kickstarts
 - ticket#42 - snake/tui.py - add ksmethod selection screen


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/snake/EL-5/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	16 Jun 2008 18:14:44 -0000	1.10
+++ sources	6 Jan 2009 16:41:49 -0000	1.11
@@ -1 +1 @@
-a05470cd7339677a27f77c396ab4462b  snake-0.11-0.6.tar.bz2
+0a763da58a7f8babeccae3a6d35abff6  snake-0.11-0.12.tar.bz2



From mclasen at fedoraproject.org  Tue Jan  6 16:47:01 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue,  6 Jan 2009 16:47:01 +0000 (UTC)
Subject: rpms/cheese/devel .cvsignore, 1.22, 1.23 cheese.spec, 1.45,
	1.46 sources, 1.22, 1.23
Message-ID: <20090106164701.69E8670108@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/cheese/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8652

Modified Files:
	.cvsignore cheese.spec sources 
Log Message:
2.25.4



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cheese/devel/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- .cvsignore	17 Dec 2008 16:49:14 -0000	1.22
+++ .cvsignore	6 Jan 2009 16:46:30 -0000	1.23
@@ -1 +1 @@
-cheese-2.25.3.tar.bz2
+cheese-2.25.4.tar.bz2


Index: cheese.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cheese/devel/cheese.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- cheese.spec	17 Dec 2008 16:49:14 -0000	1.45
+++ cheese.spec	6 Jan 2009 16:46:30 -0000	1.46
@@ -1,5 +1,5 @@
 Name:           cheese
-Version:        2.25.3
+Version:        2.25.4
 Release:        1%{?dist}
 Summary:        Application for taking pictures and movies from a webcam
 
@@ -125,6 +125,9 @@
 %{_datadir}/dbus-1/services/org.gnome.Cheese.service
 
 %changelog
+* Tue Jan  6 2009 Matthias Clasen  <mclasen at redhat.com> 2.25.4-1
+- Update to 2.25.4
+
 * Wed Dec 17 2008 Matthias Clasen  <mclasen at redhat.com> 2.25.3-1
 - Update to 2.25.3
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cheese/devel/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- sources	17 Dec 2008 16:49:14 -0000	1.22
+++ sources	6 Jan 2009 16:46:30 -0000	1.23
@@ -1 +1 @@
-89bcaa414ce0d891d31bda0504fcb082  cheese-2.25.3.tar.bz2
+f5e5c46fcd9e22ac4c156ddcac320ac2  cheese-2.25.4.tar.bz2



From s4504kr at fedoraproject.org  Tue Jan  6 16:48:24 2009
From: s4504kr at fedoraproject.org (Jochen Schmitt)
Date: Tue,  6 Jan 2009 16:48:24 +0000 (UTC)
Subject: rpms/ksplice/F-9 ksplice.spec,1.5,1.6 sources,1.6,1.7
Message-ID: <20090106164824.DE07370108@cvs1.fedora.phx.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/ksplice/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9229

Modified Files:
	ksplice.spec sources 
Log Message:
New upstream release


Index: ksplice.spec
===================================================================
RCS file: /cvs/extras/rpms/ksplice/F-9/ksplice.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ksplice.spec	1 Dec 2008 19:10:29 -0000	1.5
+++ ksplice.spec	6 Jan 2009 16:47:54 -0000	1.6
@@ -1,5 +1,5 @@
 Name:		ksplice
-Version:	0.9.4
+Version:	0.9.5
 Release:	1%{?dist}
 Summary:	Patching a Linux kernel without reboot
 
@@ -84,6 +84,9 @@
 %doc COPYING README
 
 %changelog
+* Tue Jan  6 2009 Jochen Schmitt <Jochen herr-schmitt de> 0.9.5-1
+- New upstream release
+
 * Mon Dec  1 2008 Jochen Schmitt <Jochen herr-schmitt de> 0.9.4-1
 - New upstream release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ksplice/F-9/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	1 Dec 2008 19:10:29 -0000	1.6
+++ sources	6 Jan 2009 16:47:54 -0000	1.7
@@ -1 +1 @@
-c454d67280ff03a292cd623f9b5ba7ad  ksplice-0.9.4-src.tar.gz
+05afcb035e76f2b90c49d073ae395c8c  ksplice-0.9.5-src.tar.gz



From tbzatek at fedoraproject.org  Tue Jan  6 16:50:58 2009
From: tbzatek at fedoraproject.org (Tomas Bzatek)
Date: Tue,  6 Jan 2009 16:50:58 +0000 (UTC)
Subject: rpms/gvfs/devel .cvsignore, 1.31, 1.32 gvfs.spec, 1.99,
	1.100 sources, 1.31, 1.32 fix-mounting.patch, 1.1,
	NONE gvfs-smb-browse-auth.patch, 1.2, NONE
Message-ID: <20090106165058.764C670108@cvs1.fedora.phx.redhat.com>

Author: tbzatek

Update of /cvs/extras/rpms/gvfs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10305

Modified Files:
	.cvsignore gvfs.spec sources 
Removed Files:
	fix-mounting.patch gvfs-smb-browse-auth.patch 
Log Message:
* Tue Jan  6 2009 Tomas Bzatek <tbzatek at redhat.com> - 1.1.3-1
- Update to 1.1.3



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gvfs/devel/.cvsignore,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- .cvsignore	16 Dec 2008 06:42:04 -0000	1.31
+++ .cvsignore	6 Jan 2009 16:50:27 -0000	1.32
@@ -1 +1 @@
-gvfs-1.1.2.tar.bz2
+gvfs-1.1.3.tar.bz2


Index: gvfs.spec
===================================================================
RCS file: /cvs/extras/rpms/gvfs/devel/gvfs.spec,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -r1.99 -r1.100
--- gvfs.spec	17 Dec 2008 10:12:27 -0000	1.99
+++ gvfs.spec	6 Jan 2009 16:50:27 -0000	1.100
@@ -1,7 +1,7 @@
 Summary: Backends for the gio framework in GLib
 Name: gvfs
-Version: 1.1.2
-Release: 2%{?dist}
+Version: 1.1.3
+Release: 1%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 URL: http://www.gtk.org
@@ -31,11 +31,6 @@
 Patch1: gvfs-0.99.2-archive-integration.patch
 
 
-# EXPERIMENTAL gvfsd-smb-browse auth patch
-# http://bugzilla.gnome.org/show_bug.cgi?id=524485
-Patch2: gvfs-smb-browse-auth.patch
-
-
 %description
 The gvfs package provides backend implementations for the gio 
 framework in GLib. It includes ftp, sftp, cifs. 
@@ -117,7 +112,6 @@
 %prep
 %setup -q
 %patch1 -p0 -b .archive-integration
-%patch2 -p0 -b .smb-auth
 
 %build
 
@@ -258,6 +252,9 @@
 
 
 %changelog
+* Tue Jan  6 2009 Tomas Bzatek <tbzatek at redhat.com> - 1.1.3-1
+- Update to 1.1.3
+
 * Wed Dec 17 2008 Tomas Bzatek <tbzatek at redhat.com> - 1.1.2-2
 - Update the smb-browse auth patch
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gvfs/devel/sources,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- sources	16 Dec 2008 06:42:05 -0000	1.31
+++ sources	6 Jan 2009 16:50:28 -0000	1.32
@@ -1 +1 @@
-b01a7eb5c590fb64c80fbe099500f951  gvfs-1.1.2.tar.bz2
+0ea4075dc9d1e3734805f5c43825c6eb  gvfs-1.1.3.tar.bz2


--- fix-mounting.patch DELETED ---


--- gvfs-smb-browse-auth.patch DELETED ---



From nbecker at fedoraproject.org  Tue Jan  6 16:57:17 2009
From: nbecker at fedoraproject.org (Neal Becker)
Date: Tue,  6 Jan 2009 16:57:17 +0000 (UTC)
Subject: rpms/kdiff3/devel kdiff3part.desktop.diff, NONE, 1.1 .cvsignore, 1.3,
	1.4 kdiff3.spec, 1.12, 1.13 sources, 1.3, 1.4
Message-ID: <20090106165717.0E01B70108@cvs1.fedora.phx.redhat.com>

Author: nbecker

Update of /cvs/pkgs/rpms/kdiff3/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11958

Modified Files:
	.cvsignore kdiff3.spec sources 
Added Files:
	kdiff3part.desktop.diff 
Log Message:
Update to 0.9.93


kdiff3part.desktop.diff:

--- NEW FILE kdiff3part.desktop.diff ---
--- kdiff3-0.9.93/src-QT4/kdiff3part.desktop~	2008-10-26 17:55:20.000000000 -0400
+++ kdiff3-0.9.93/src-QT4/kdiff3part.desktop	2009-01-06 11:31:20.000000000 -0500
@@ -5,7 +5,6 @@
 Name[hi]=??????-?????????3???????????????
 Name[sv]=Kdiff3-del
 Name[x-test]=xxKDiff3Partxx
-MimeType=text/x-diff;
 ServiceTypes=KParts/ReadOnlyPart,KParts/ReadWritePart
 X-KDE-Library=libkdiff3part
 Type=Service


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdiff3/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	7 Nov 2007 01:57:35 -0000	1.3
+++ .cvsignore	6 Jan 2009 16:56:46 -0000	1.4
@@ -1 +1 @@
-kdiff3-0.9.92.tar.gz
+kdiff3-0.9.93.tar.gz


Index: kdiff3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdiff3/devel/kdiff3.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- kdiff3.spec	5 Jun 2008 22:55:05 -0000	1.12
+++ kdiff3.spec	6 Jan 2009 16:56:46 -0000	1.13
@@ -1,13 +1,15 @@
 Name:           kdiff3
-Version:        0.9.92
-Release: 	14%{?dist}
+Version:        0.9.93
+Release: 	1%{?dist}
 Summary:        Compare + merge 2 or 3 files or directories
 
 Group:          Development/Tools
 License:        GPLv2
 URL:            http://kdiff3.sourceforge.net/
 Source0:        http://dl.sourceforge.net/sourceforge/kdiff3/%{name}-%{version}.tar.gz
+Patch0:		kdiff3part.desktop.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires:	gettext
 
 %if 0%{?rhel}
 BuildRequires:  kdebase-devel, kdelibs-devel, desktop-file-utils
@@ -27,14 +29,14 @@
 
 %prep
 %setup -q
-
+%patch0 -p1
 
 %build
 unset QTDIR || : ; source /etc/profile.d/qt.sh
 %configure \
          --disable-rpath
 
-make %{?_smp_mflags}
+%{cmake_kde4}
 
 
 %install
@@ -48,6 +50,9 @@
 
 # locale's
 %find_lang %{name} || touch %{name}.lang
+%find_lang %{name}plugin || touch %{name}.lang
+cat %{name}plugin.lang >> %{name}.lang
+
 # HTML (1.0)
 if [ -d $RPM_BUILD_ROOT$HTML_DIR ]; then
 for lang_dir in $RPM_BUILD_ROOT$HTML_DIR/* ; do
@@ -65,21 +70,18 @@
 fi
 
 # Desktop.
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications $RPM_BUILD_ROOT%{_datadir}/kde4/apps $RPM_BUILD_ROOT%{_datadir}/kde4/services
+
+desktop-file-install --vendor fedora \
+    --dir $RPM_BUILD_ROOT%{_datadir}/kde4/services \
+    $RPM_BUILD_ROOT%{_datadir}/kde4/services/kdiff3part.desktop
 
 desktop-file-install  --vendor fedora \
-    --dir $RPM_BUILD_ROOT%{_datadir}/applications  \
+    --dir $RPM_BUILD_ROOT%{_datadir}/applications/kde4  \
     --add-category Development \
     --add-category X-Fedora \
     --delete-original \
-        $RPM_BUILD_ROOT%{_datadir}/applnk/Development/kdiff3.desktop
-
-echo "NoDisplay=true" >> \
-$RPM_BUILD_ROOT%{_datadir}/applnk/.hidden/kdiff3plugin.desktop
-desktop-file-install  --vendor="" \
-     --dir $RPM_BUILD_ROOT%{_datadir}/applications/kde \
-     --delete-original \
-     $RPM_BUILD_ROOT%{_datadir}/applnk/.hidden/kdiff3plugin.desktop
+        $RPM_BUILD_ROOT%{_datadir}/applications/kde4/kdiff3.desktop
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -95,15 +97,17 @@
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog README TODO
-%{_bindir}/kdiff3
-%{_libdir}/kde3/*
-%{_datadir}/applications/*
-%{_datadir}/apps/*
+%{_bindir}/*
+%{_libdir}/*
+%{_datadir}/applications/kde4/*
+%{_datadir}/kde4/apps/*
 %{_datadir}/icons/*/*/*/kdiff3.png
-%{_datadir}/services/*
-%{_mandir}/man1/kdiff3*
+%{_datadir}/kde4/services/*
 
 %changelog
+* Tue Jan  6 2009 Neal Becker <ndbecker2 at gmail.com> - 0.9.93-1
+- Update to 0.9.93
+
 * Thu Jun 5 2008 Manuel Wolfshant <wolfy at fedoraproject.org> - 0.9.92-14
 - add a conditional BR, allowing build in EPEL-5
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdiff3/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	7 Nov 2007 01:57:35 -0000	1.3
+++ sources	6 Jan 2009 16:56:46 -0000	1.4
@@ -1 +1 @@
-c7b52bfee6a085393de0c4f83732e8f0  kdiff3-0.9.92.tar.gz
+3f225daebc7f94e237d66edabf2e39ab  kdiff3-0.9.93.tar.gz



From berrange at fedoraproject.org  Tue Jan  6 16:58:52 2009
From: berrange at fedoraproject.org (Daniel P. Berrange)
Date: Tue,  6 Jan 2009 16:58:52 +0000 (UTC)
Subject: rpms/kvm/devel kvm.spec,1.80,1.81
Message-ID: <20090106165852.6FD6F70108@cvs1.fedora.phx.redhat.com>

Author: berrange

Update of /cvs/pkgs/rpms/kvm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12625

Modified Files:
	kvm.spec 
Log Message:
Explicitly install newly built BIOS blobs (rhbz #478855)


Index: kvm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kvm/devel/kvm.spec,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- kvm.spec	22 Dec 2008 16:55:46 -0000	1.80
+++ kvm.spec	6 Jan 2009 16:58:22 -0000	1.81
@@ -1,7 +1,7 @@
 Summary: Kernel-based Virtual Machine
 Name: kvm
 Version: 81
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: Development/Tools
 URL: http://%{name}.sf.net
@@ -63,8 +63,13 @@
 
 # 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 --kerneldir=$(pwd)/kernel --prefix=%{_prefix} --qemu-ldflags=$qemuldflags \
---audio-drv-list=oss,alsa --disable-blobs
+./configure \
+   --with-patched-kernel \
+   --kerneldir=$(pwd)/kernel \
+   --prefix=%{_prefix} \
+   --qemu-ldflags=$qemuldflags \
+   --disable-blobs \
+   --audio-drv-list=oss,alsa
 
 # build the bios, and fix it's makefile
 sed -i 's/gcc -m32/gcc/' bios/Makefile
@@ -95,10 +100,11 @@
 # make install gives it bogus execute permissiions
 chmod -x $RPM_BUILD_ROOT/%{_mandir}/man1/qemu-kvm.1*
 
-# We're only build x86, so kill other BIOS to save disk space
-rm -f $RPM_BUILD_ROOT/%{_datadir}/%{name}/openbios-sparc32
-rm -f $RPM_BUILD_ROOT/%{_datadir}/%{name}/ppc_rom.bin
-rm -f $RPM_BUILD_ROOT/%{_datadir}/%{name}/video.x
+install -d $RPM_BUILD_ROOT/%{_datadir}/%{name}
+for i in bios.bin extboot.bin vgabios.bin vgabios-cirrus.bin
+do
+  install -m 0644 qemu/pc-bios/$i $RPM_BUILD_ROOT/%{_datadir}/%{name}/$i
+done
 
 mv $RPM_BUILD_ROOT/%{_bindir}/qemu-system-x86_64 $RPM_BUILD_ROOT/%{_bindir}/qemu-kvm
 
@@ -132,13 +138,37 @@
 
 %files
 %defattr(-,root,root,-)
-%{_bindir}/*
-%{_mandir}/*
-%{_datadir}/%{name}
+%{_bindir}/kvmtrace
+%{_bindir}/kvmtrace_format
+%{_bindir}/qemu-kvm
+%{_bindir}/qemu-nbd
+
+%dir %{_datadir}/%{name}
+%dir %{_datadir}/%{name}/keymaps
+%{_datadir}/%{name}/keymaps/*
+
+%{_datadir}/%{name}/bios.bin
+%{_datadir}/%{name}/extboot.bin
+%{_datadir}/%{name}/pxe-e1000.bin
+%{_datadir}/%{name}/pxe-ne2k_pci.bin
+%{_datadir}/%{name}/pxe-pcnet.bin
+%{_datadir}/%{name}/pxe-rtl8139.bin
+%{_datadir}/%{name}/pxe-virtio.bin
+%{_datadir}/%{name}/vgabios-cirrus.bin
+%{_datadir}/%{name}/vgabios.bin
+
+%{_mandir}/man1/qemu-kvm.1*
+%{_mandir}/man8/qemu-nbd.8*
+
 %{_sysconfdir}/sysconfig/modules/%{name}.modules
 
 
 %changelog
+* Tue Jan  6 2009 Daniel P. Berrange <berrange at redhat.com> - 81-2
+- Explicitly install newly built BIOS blobs (rhbz #478855)
+- List all files explicitly so they don't silently go missing
+- Don't claim ownership of the shared man page directories
+
 * Mon Dec 22 2008 Glauber Costa <glommer at redhat.com> - 81-1
 - Updated to kvm-81.
 - kvm-fix-pc-bios-make-install-missing-files.patch not needed anymore



From mclasen at fedoraproject.org  Tue Jan  6 17:01:47 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue,  6 Jan 2009 17:01:47 +0000 (UTC)
Subject: rpms/gnome-desktop/devel .cvsignore, 1.76, 1.77 gnome-desktop.spec, 
	1.195, 1.196 sources, 1.76, 1.77
Message-ID: <20090106170147.2B33A70140@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-desktop/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13713

Modified Files:
	.cvsignore gnome-desktop.spec sources 
Log Message:
2.25.4



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-desktop/devel/.cvsignore,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- .cvsignore	17 Dec 2008 04:42:02 -0000	1.76
+++ .cvsignore	6 Jan 2009 17:01:16 -0000	1.77
@@ -1 +1 @@
-gnome-desktop-2.25.3.tar.bz2
+gnome-desktop-2.25.4.tar.bz2


Index: gnome-desktop.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-desktop/devel/gnome-desktop.spec,v
retrieving revision 1.195
retrieving revision 1.196
diff -u -r1.195 -r1.196
--- gnome-desktop.spec	6 Jan 2009 16:18:18 -0000	1.195
+++ gnome-desktop.spec	6 Jan 2009 17:01:16 -0000	1.196
@@ -11,8 +11,8 @@
 
 Summary: Package containing code shared among gnome-panel, gnome-session, nautilus, etc
 Name: gnome-desktop
-Version: 2.25.3
-Release: 3%{?dist}
+Version: 2.25.4
+Release: 1%{?dist}
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/gnome-desktop/2.25/%{name}-%{version}.tar.bz2
 License: GPLv2+ and LGPLv2+
@@ -124,6 +124,9 @@
 %doc %{_datadir}/gtk-doc/html/gnome-desktop/
 
 %changelog
+* Tue Jan  6 2009 Matthias Clasen <mclasen at redhat.com> - 2.25.4-1
+- Update to 2.25.4
+
 * Tue Jan  6 2009 Ray Strode <rstrode at redhat.com> - 2.25.3-3
 - Stop cross fade before freeing pixmaps in finalize instead
   of after.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-desktop/devel/sources,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- sources	17 Dec 2008 04:42:02 -0000	1.76
+++ sources	6 Jan 2009 17:01:16 -0000	1.77
@@ -1 +1 @@
-9ead58606a65ec97439dadc053879c2a  gnome-desktop-2.25.3.tar.bz2
+34949b416ba1b4cf72c763f05ecf3380  gnome-desktop-2.25.4.tar.bz2



From caolanm at fedoraproject.org  Tue Jan  6 17:06:14 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Tue,  6 Jan 2009 17:06:14 +0000 (UTC)
Subject: rpms/openoffice.org/devel openoffice.org.spec,1.1741,1.1742
Message-ID: <20090106170614.5E19870108@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17430

Modified Files:
	openoffice.org.spec 
Log Message:
Resolves: rhbz#476959 openoffice.org-3.0.1.ooo97488.sw.ww8toc.patch


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1741
retrieving revision 1.1742
diff -u -r1.1741 -r1.1742
--- openoffice.org.spec	5 Jan 2009 10:58:17 -0000	1.1741
+++ openoffice.org.spec	6 Jan 2009 17:05:43 -0000	1.1742
@@ -2508,6 +2508,7 @@
 %{basisinstdir}/share/dtd/officedocument
 %{basisinstdir}/share/gallery
 %{basisinstdir}/share/psprint
+%config %{basisinstdir}/share/psprint/psprint.conf
 %dir %{basisinstdir}/share/registry
 %dir %{basisinstdir}/share/registry/data
 %dir %{basisinstdir}/share/registry/data/org
@@ -3817,7 +3818,7 @@
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
-* Mon Jan 05 2009 Caol??n McNamara <caolanm at redhat.com> - 1:3.0.1-14.3
+* Tue Jan 06 2009 Caol??n McNamara <caolanm at redhat.com> - 1:3.0.1-14.3
 - Resolves: rhbz#476959 openoffice.org-3.0.1.ooo97488.sw.ww8toc.patch
 
 * Tue Dec 23 2008 Caol??n McNamara <caolanm at redhat.com> - 1:3.0.1-14.2



From deji at fedoraproject.org  Tue Jan  6 17:24:04 2009
From: deji at fedoraproject.org (Deji Akingunola)
Date: Tue,  6 Jan 2009 17:24:04 +0000 (UTC)
Subject: rpms/exempi/devel exempi.spec,1.9,1.10
Message-ID: <20090106172404.3D1E370108@cvs1.fedora.phx.redhat.com>

Author: deji

Update of /cvs/pkgs/rpms/exempi/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22744

Modified Files:
	exempi.spec 
Log Message:
Add zlib-devel BR.



Index: exempi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/exempi/devel/exempi.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- exempi.spec	6 Jan 2009 16:41:21 -0000	1.9
+++ exempi.spec	6 Jan 2009 17:23:33 -0000	1.10
@@ -7,7 +7,7 @@
 URL:		http://libopenraw.freedesktop.org/wiki/Exempi
 Source0:	http://libopenraw.freedesktop.org/download/%{name}-%{version}.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:	boost-devel expat-devel pkgconfig
+BuildRequires:	boost-devel expat-devel zlib-devel pkgconfig
 
 %description
 Exempi provides a library for easy parsing of XMP metadata. It is a port of 



From mclasen at fedoraproject.org  Tue Jan  6 17:28:24 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue,  6 Jan 2009 17:28:24 +0000 (UTC)
Subject: rpms/vinagre/devel .cvsignore, 1.18, 1.19 sources, 1.18,
	1.19 vinagre.spec, 1.36, 1.37
Message-ID: <20090106172824.E211270108@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/vinagre/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24718

Modified Files:
	.cvsignore sources vinagre.spec 
Log Message:
2.25.4



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/vinagre/devel/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- .cvsignore	17 Dec 2008 06:00:01 -0000	1.18
+++ .cvsignore	6 Jan 2009 17:27:54 -0000	1.19
@@ -1 +1 @@
-vinagre-2.25.3.tar.bz2
+vinagre-2.25.4.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/vinagre/devel/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources	17 Dec 2008 06:00:01 -0000	1.18
+++ sources	6 Jan 2009 17:27:54 -0000	1.19
@@ -1 +1 @@
-11b958241b5d58c20cbcf5fcb4cba2c7  vinagre-2.25.3.tar.bz2
+7fe8686c28979f02e0d421690b755cd2  vinagre-2.25.4.tar.bz2


Index: vinagre.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vinagre/devel/vinagre.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- vinagre.spec	17 Dec 2008 06:00:01 -0000	1.36
+++ vinagre.spec	6 Jan 2009 17:27:54 -0000	1.37
@@ -1,5 +1,5 @@
 Name:		vinagre
-Version:	2.25.3
+Version:	2.25.4
 Release:	1%{?dist}
 Summary:	VNC client for GNOME
 
@@ -122,6 +122,9 @@
 %doc README NEWS COPYING AUTHORS
 
 %changelog
+* Tue Jan  6 2009 Matthias Clasen <mclasen at redhat.com> - 2.25.4-1
+- Update to 2.25.4
+
 * Wed Dec 17 2008 Matthias Clasen <mclasen at redhat.com> - 2.25.3-1
 - Update to 2.25.3
 



From akurtakov at fedoraproject.org  Tue Jan  6 17:29:08 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Tue,  6 Jan 2009 17:29:08 +0000 (UTC)
Subject: rpms/eclipse-rpm-editor/devel fetch-specfile-editor.sh, 1.1,
	1.2 eclipse-rpm-editor.spec, 1.23, 1.24 .cvsignore, 1.12,
	1.13 sources, 1.12, 1.13
Message-ID: <20090106172908.3A19470108@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/eclipse-rpm-editor/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25310/devel

Modified Files:
	fetch-specfile-editor.sh eclipse-rpm-editor.spec .cvsignore 
	sources 
Log Message:
New version 0.4.1.


Index: fetch-specfile-editor.sh
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-rpm-editor/devel/fetch-specfile-editor.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- fetch-specfile-editor.sh	1 Sep 2007 14:01:35 -0000	1.1
+++ fetch-specfile-editor.sh	6 Jan 2009 17:28:37 -0000	1.2
@@ -1,11 +1,12 @@
 #!/bin/sh
 name=specfile-editor
-svn_repo="svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/rpm/trunk/"
+svn_repo="svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/rpm/tags/"
 
 # Usage message
-usage="usage: $0 <svn_rev>"
+usage="usage: $0 <tag_name> <version_number>"
 tag=$1
-tar_name=$name-fetched-src-$tag
+version_number=$2
+tar_name=$name-fetched-src-$version_number
 
 # Ensure we got the desired CVS tag
 if [ "x$tag"x = "xx" ]
@@ -24,7 +25,7 @@
 "org.eclipse.linuxtools.rpm.rpmlint" \
 "org.eclipse.linuxtools.rpm.ui.editor-feature"; 
 do 
-svn export $svn_repo/$bundle 
+svn export $svn_repo/$tag/$bundle 
 done
 popd &> /dev/null
 # create archive


Index: eclipse-rpm-editor.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-rpm-editor/devel/eclipse-rpm-editor.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- eclipse-rpm-editor.spec	23 Nov 2008 11:44:22 -0000	1.23
+++ eclipse-rpm-editor.spec	6 Jan 2009 17:28:37 -0000	1.24
@@ -1,17 +1,16 @@
 %define eclipse_base        %{_libdir}/eclipse
 %define install_loc         %{_datadir}/eclipse/dropins
-%define svn_rev             18653
 
 Name:           eclipse-rpm-editor
-Version:        0.4.0
-Release:        6%{?dist}
+Version:        0.4.1
+Release:        1%{?dist}
 Summary:        RPM Specfile editor for Eclipse
 Group:          Development/Tools
 License:        EPL
-URL:            http://wiki.eclipse.org/index.php/Linux_Distributions_Project
+URL:            http://www.eclipse.org/linuxtools/
 # This tarball was made using the included script, like so:
-#   sh ./fetch-specfile-editor.sh %{svn_rev}
-Source0:        specfile-editor-fetched-src-%{svn_rev}.tar.bz2
+#   sh ./fetch-specfile-editor.sh %{tag_name} %{version}
+Source0:        specfile-editor-fetched-src-%{version}.tar.bz2
 Source1:        fetch-specfile-editor.sh
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -33,7 +32,7 @@
 useful for maintenance of RPM specfiles within the Eclipse IDE.
 
 %prep
-%setup -q -n specfile-editor-fetched-src-%{svn_rev}
+%setup -q -n specfile-editor-fetched-src-%{version}
 
 %build
 %{eclipse_base}/buildscripts/pdebuild -f  org.eclipse.linuxtools.rpm.ui.editor \
@@ -57,6 +56,10 @@
 %{install_loc}/rpm-editor
 
 %changelog
+* Tue Jan 6 2009 Alexander Kurtakov <akurtako at redhat.com> 0.4.1-1
+- New version 0.4.1.
+- Fix URL and fetch script to use tags.
+
 * Sat Oct 11 2008 Alphonse Van Assche <alcapcom at fedoraproject.org> 0.4.0-6
 - Omit empty debuginfo pkg (Ville Skytt?? #472651)
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-rpm-editor/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	29 Jun 2008 14:12:39 -0000	1.12
+++ .cvsignore	6 Jan 2009 17:28:37 -0000	1.13
@@ -1 +1,2 @@
 specfile-editor-fetched-src-18653.tar.bz2
+specfile-editor-fetched-src-0.4.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-rpm-editor/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	29 Jun 2008 14:12:39 -0000	1.12
+++ sources	6 Jan 2009 17:28:37 -0000	1.13
@@ -1 +1 @@
-67466b714c80df4e842f18c2fb625173  specfile-editor-fetched-src-18653.tar.bz2
+e509d4cefa99ef6d7cac61f77c4be94b  specfile-editor-fetched-src-0.4.1.tar.bz2



From romal at fedoraproject.org  Tue Jan  6 17:41:37 2009
From: romal at fedoraproject.org (Robert M. Albrecht)
Date: Tue,  6 Jan 2009 17:41:37 +0000 (UTC)
Subject: rpms/nagios/F-10 nagios.spec,1.63,1.64
Message-ID: <20090106174137.816F570108@cvs1.fedora.phx.redhat.com>

Author: romal

Update of /cvs/pkgs/rpms/nagios/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31323

Modified Files:
	nagios.spec 
Log Message:
New upstream release



Index: nagios.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nagios/F-10/nagios.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- nagios.spec	24 Nov 2008 21:07:16 -0000	1.63
+++ nagios.spec	6 Jan 2009 17:41:07 -0000	1.64
@@ -1,6 +1,6 @@
 Name: nagios
 
-Version: 3.0.5
+Version: 3.0.6
 Release: 1%{?dist}
 Summary: Host/service/network monitoring program
 
@@ -203,6 +203,9 @@
 %{_includedir}/%{name}
 
 %changelog
+* Tue Dec 02 2008  Robert M. Albrecht <fedora at romal.de> 3.0.6-1
+- Upstream released a new version
+
 * Mon Nov 24 2008 Mike McGrath <mmcgrath at redhat.com> 3.0.5-1
 - Upstream released a new version
 



From nbecker at fedoraproject.org  Tue Jan  6 17:43:23 2009
From: nbecker at fedoraproject.org (Neal Becker)
Date: Tue,  6 Jan 2009 17:43:23 +0000 (UTC)
Subject: rpms/kdiff3/devel kdiff3.spec,1.13,1.14
Message-ID: <20090106174323.6B2DB70108@cvs1.fedora.phx.redhat.com>

Author: nbecker

Update of /cvs/pkgs/rpms/kdiff3/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31923

Modified Files:
	kdiff3.spec 
Log Message:
add br cmake


Index: kdiff3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdiff3/devel/kdiff3.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- kdiff3.spec	6 Jan 2009 16:56:46 -0000	1.13
+++ kdiff3.spec	6 Jan 2009 17:42:53 -0000	1.14
@@ -1,6 +1,6 @@
 Name:           kdiff3
 Version:        0.9.93
-Release: 	1%{?dist}
+Release: 	2%{?dist}
 Summary:        Compare + merge 2 or 3 files or directories
 
 Group:          Development/Tools
@@ -9,7 +9,7 @@
 Source0:        http://dl.sourceforge.net/sourceforge/kdiff3/%{name}-%{version}.tar.gz
 Patch0:		kdiff3part.desktop.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:	gettext
+BuildRequires:	gettext cmake
 
 %if 0%{?rhel}
 BuildRequires:  kdebase-devel, kdelibs-devel, desktop-file-utils
@@ -105,6 +105,9 @@
 %{_datadir}/kde4/services/*
 
 %changelog
+* Tue Jan  6 2009 Neal Becker <ndbecker2 at gmail.com> - 0.9.93-2
+- Add br cmake
+
 * Tue Jan  6 2009 Neal Becker <ndbecker2 at gmail.com> - 0.9.93-1
 - Update to 0.9.93
 



From bpepple at fedoraproject.org  Tue Jan  6 17:45:27 2009
From: bpepple at fedoraproject.org (Brian Pepple)
Date: Tue,  6 Jan 2009 17:45:27 +0000 (UTC)
Subject: rpms/empathy/devel .cvsignore, 1.25, 1.26 empathy.spec, 1.45,
	1.46 sources, 1.25, 1.26
Message-ID: <20090106174527.3B78D70108@cvs1.fedora.phx.redhat.com>

Author: bpepple

Update of /cvs/pkgs/rpms/empathy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32485

Modified Files:
	.cvsignore empathy.spec sources 
Log Message:
* Tue Jan  6 2009 Brian Pepple <bpepple at fedoraproject.org> - 2.25.4-1
- Update to 2.25.4.
- Add BR on libcanberra-devel.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/empathy/devel/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- .cvsignore	18 Dec 2008 01:36:35 -0000	1.25
+++ .cvsignore	6 Jan 2009 17:44:56 -0000	1.26
@@ -1 +1 @@
-empathy-2.25.3.tar.bz2
+empathy-2.25.4.tar.bz2


Index: empathy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/empathy/devel/empathy.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- empathy.spec	30 Dec 2008 01:10:05 -0000	1.45
+++ empathy.spec	6 Jan 2009 17:44:56 -0000	1.46
@@ -2,15 +2,15 @@
 
 ## Minimum required versions of GLib, GTK+, libtelepathy, and Mission-Control,
 ## respectively.
-%global	gtk2_min_version	2.12
+%global	gtk2_min_version	2.14
 %global	glib2_min_version	2.16.0
 %global	tp_mc_min_version	4.61
 %global	tp_glib_min_version	0.7.15
 %global	enchant_version		1.2.0		
 
 Name:		empathy
-Version:	2.25.3
-Release:	4%{?dist}
+Version:	2.25.4
+Release:	1%{?dist}
 Summary:	Instant Messaging Client for GNOME
 
 Group:		Applications/Communications
@@ -37,6 +37,7 @@
 BuildRequires:	glib2-devel >= %{glib2_min_version}
 BuildRequires:	gnome-doc-utils >= 0.3.2
 BuildRequires:	gnome-panel-devel
+BuildRequires:	libcanberra-devel
 BuildRequires:	gtk2-devel >= %{gtk2_min_version}
 BuildRequires:	intltool
 BuildRequires:	libglade2-devel
@@ -227,6 +228,10 @@
 %{python_sitearch}/empathy*.so
 
 %changelog
+* Tue Jan  6 2009 Brian Pepple <bpepple at fedoraproject.org> - 2.25.4-1
+- Update to 2.25.4.
+- Add BR on libcanberra-devel.
+
 * Mon Dec 29 2008 Brian Pepple <bpepple at fedoraproject.org> - 2.25.3-4
 - Add patch to work around our broken pkgconfig.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/empathy/devel/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- sources	18 Dec 2008 01:36:35 -0000	1.25
+++ sources	6 Jan 2009 17:44:56 -0000	1.26
@@ -1 +1 @@
-bdecad21287a4f2ba69e00846812459b  empathy-2.25.3.tar.bz2
+118753a765085c3482e9bf9019a09292  empathy-2.25.4.tar.bz2



From mclasen at fedoraproject.org  Tue Jan  6 17:48:21 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue,  6 Jan 2009 17:48:21 +0000 (UTC)
Subject: rpms/vino/devel .cvsignore, 1.41, 1.42 sources, 1.41, 1.42 vino.spec,
	1.83, 1.84
Message-ID: <20090106174821.38D8670108@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/vino/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv787

Modified Files:
	.cvsignore sources vino.spec 
Log Message:
2.25.4



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/vino/devel/.cvsignore,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- .cvsignore	17 Dec 2008 06:09:51 -0000	1.41
+++ .cvsignore	6 Jan 2009 17:47:50 -0000	1.42
@@ -1 +1 @@
-vino-2.25.3.tar.bz2
+vino-2.25.4.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/vino/devel/sources,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- sources	17 Dec 2008 06:09:51 -0000	1.41
+++ sources	6 Jan 2009 17:47:50 -0000	1.42
@@ -1 +1 @@
-cfce75339d8c11b166a9ee568185f048  vino-2.25.3.tar.bz2
+0105a7edb08b8fbc99deff60b94e3f18  vino-2.25.4.tar.bz2


Index: vino.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vino/devel/vino.spec,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- vino.spec	17 Dec 2008 06:09:51 -0000	1.83
+++ vino.spec	6 Jan 2009 17:47:50 -0000	1.84
@@ -8,7 +8,7 @@
 
 Summary: A remote desktop system for GNOME
 Name: vino
-Version: 2.25.3
+Version: 2.25.4
 Release: 1%{?dist}
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/vino/2.25/%{name}-%{version}.tar.bz2
@@ -107,6 +107,9 @@
 %{_datadir}/gnome/autostart/vino-server.desktop
 
 %changelog
+* Tue Jan  6 2009 Matthias Clasen <mclasen at redhat.com> - 2.25.4-1
+- Update to 2.25.4
+
 * Wed Dec 17 2008 Matthias Clasen <mclasen at redhat.com> - 2.25.3-1
 - Update to 2.25.3
 



From kyle at fedoraproject.org  Tue Jan  6 17:50:40 2009
From: kyle at fedoraproject.org (Kyle McMartin)
Date: Tue,  6 Jan 2009 17:50:40 +0000 (UTC)
Subject: rpms/kernel/devel patch-2.6.28-git8.bz2.sign, NONE, 1.1 .cvsignore, 
	1.981, 1.982 config-generic, 1.210, 1.211 config-powerpc-generic,
	1.29, 1.30 kernel.spec, 1.1192,
	1.1193 linux-2.6-compile-fixes.patch, 1.185, 1.186 sources,
	1.943, 1.944 upstream, 1.855, 1.856 patch-2.6.28-git7.bz2.sign,
	1.1, NONE
Message-ID: <20090106175040.9DB2270108@cvs1.fedora.phx.redhat.com>

Author: kyle

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1440

Modified Files:
	.cvsignore config-generic config-powerpc-generic kernel.spec 
	linux-2.6-compile-fixes.patch sources upstream 
Added Files:
	patch-2.6.28-git8.bz2.sign 
Removed Files:
	patch-2.6.28-git7.bz2.sign 
Log Message:
* Tue Jan 06 2009 Kyle McMartin <kyle at redhat.com>
- 2.6.28-git8



--- NEW FILE patch-2.6.28-git8.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBJY0iEyGugalF9Dw4RAlcVAJsH6xznGi/+Lgj1EEfyMrv6zwEh9wCeIRhC
beL5lKicA10xRdMEAARl1j0=
=kX7f
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.981
retrieving revision 1.982
diff -u -r1.981 -r1.982
--- .cvsignore	5 Jan 2009 17:42:23 -0000	1.981
+++ .cvsignore	6 Jan 2009 17:50:08 -0000	1.982
@@ -4,4 +4,4 @@
 temp-*
 kernel-2.6.28
 linux-2.6.28.tar.bz2
-patch-2.6.28-git7.bz2
+patch-2.6.28-git8.bz2


Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-generic,v
retrieving revision 1.210
retrieving revision 1.211
diff -u -r1.210 -r1.211
--- config-generic	4 Jan 2009 01:50:32 -0000	1.210
+++ config-generic	6 Jan 2009 17:50:08 -0000	1.211
@@ -989,7 +989,7 @@
 CONFIG_IP_DCCP=m
 CONFIG_IP_DCCP_CCID2=m
 # CONFIG_IP_DCCP_CCID2_DEBUG is not set
-CONFIG_IP_DCCP_CCID3=m
+CONFIG_IP_DCCP_CCID3=y
 # CONFIG_IP_DCCP_CCID3_DEBUG is not set
 CONFIG_IP_DCCP_CCID3_RTO=100
 # CONFIG_IP_DCCP_DEBUG is not set
@@ -2487,6 +2487,7 @@
 CONFIG_FB_MB862XX_PCI_GDC=y
 CONFIG_FB_MB862XX_LIME=y
 # CONFIG_FB_PRE_INIT_FB is not set
+# CONFIG_FB_TMIO is not set
 
 # CONFIG_FIRMWARE_EDID is not set
 
@@ -2736,6 +2737,7 @@
 CONFIG_HID_PID=y
 # CONFIG_HID_COMPAT is not set
 CONFIG_LOGITECH_FF=y
+CONFIG_GREENASIA_FF=m
 CONFIG_LOGIRUMBLEPAD2_FF=y
 CONFIG_PANTHERLORD_FF=y
 CONFIG_THRUSTMASTER_FF=y
@@ -3149,6 +3151,8 @@
 CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m
 # CONFIG_OCFS2_FS_STATS is not set
 # CONFIG_OCFS2_COMPAT_JBD is not set
+CONFIG_OCFS2_FS_POSIX_ACL=y
+
 CONFIG_CONFIGFS_FS=m
 
 CONFIG_DLM=m
@@ -3799,6 +3803,7 @@
 
 CONFIG_MFD_WM8400=m
 CONFIG_MFD_WM8350_I2C=m
+CONFIG_MFD_WM8350=m
 
 CONFIG_REGULATOR=y
 # CONFIG_REGULATOR_DEBUG is not set
@@ -3808,6 +3813,8 @@
 CONFIG_REGULATOR_WM8400=m
 CONFIG_REGULATOR_DA903X=m
 
+CONFIG_WM8350_POWER=m
+
 # CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
 
 CONFIG_SOC_CAMERA_MT9M111=m


Index: config-powerpc-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-powerpc-generic,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- config-powerpc-generic	29 Dec 2008 17:30:27 -0000	1.29
+++ config-powerpc-generic	6 Jan 2009 17:50:09 -0000	1.30
@@ -280,3 +280,6 @@
 
 # CONFIG_HVC_UDBG is not set
 CONFIG_PRINT_STACK_DEPTH=64
+
+CONFIG_BATTERY_DA9030=m
+# CONFIG_TWL4030_CORE is not set


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1192
retrieving revision 1.1193
diff -u -r1.1192 -r1.1193
--- kernel.spec	5 Jan 2009 17:42:23 -0000	1.1192
+++ kernel.spec	6 Jan 2009 17:50:09 -0000	1.1193
@@ -57,7 +57,7 @@
 # The rc snapshot level
 %define rcrev 0
 # The git snapshot level
-%define gitrev 7
+%define gitrev 8
 # Set rpm version accordingly
 %define rpmversion 2.6.%{upstream_sublevel}
 %endif
@@ -1180,7 +1180,7 @@
 # hush pci bar allocation failures
 ApplyPatch linux-2.6.27-pci-hush-allocation-failures.patch
 
-ApplyPatch disable-p4-cpufreq-ui.patch
+#ApplyPatch disable-p4-cpufreq-ui.patch
 
 # END OF PATCH APPLICATIONS
 
@@ -1757,6 +1757,9 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Tue Jan 06 2009 Kyle McMartin <kyle at redhat.com>
+- 2.6.28-git8
+
 * Mon Jan 05 2009 Dave Jones <davej at redhat.com>
 - 2.6.28-git7
 

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.185
retrieving revision 1.186
diff -u -r1.185 -r1.186
--- linux-2.6-compile-fixes.patch	5 Jan 2009 18:48:25 -0000	1.185
+++ linux-2.6-compile-fixes.patch	6 Jan 2009 17:50:09 -0000	1.186
@@ -4,164 +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.
 #
-
-From davej  Sun Jan  4 17:00:52 2009
-Return-Path: linux-kernel-owner at vger.kernel.org
-X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on
-	gelk.kernelslacker.org
-X-Spam-Level: 
-X-Spam-Status: No, score=-5.8 required=5.0 tests=AWL,BAYES_00,
-	RCVD_IN_DNSWL_MED,UNPARSEABLE_RELAY autolearn=ham version=3.2.5
-Received: from mail.corp.redhat.com [10.5.5.53]
-	by gelk.kernelslacker.org with IMAP (fetchmail-6.3.8)
-	for <davej at localhost> (single-drop); Sun, 04 Jan 2009 17:00:52 -0500 (EST)
-Received: from zmta02.collab.prod.int.phx2.redhat.com (LHLO
- zmta02.collab.prod.int.phx2.redhat.com) (10.5.5.32) by
- mail01.corp.redhat.com with LMTP; Sun, 4 Jan 2009 16:57:24 -0500 (EST)
-Received: from localhost (localhost.localdomain [127.0.0.1])
-	by zmta02.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id D37809C504;
-	Sun,  4 Jan 2009 16:57:24 -0500 (EST)
-Received: from zmta02.collab.prod.int.phx2.redhat.com ([127.0.0.1])
-	by localhost (zmta02.collab.prod.int.phx2.redhat.com [127.0.0.1]) (amavisd-new, port 10024)
-	with ESMTP id Zc+IlAojNlo9; Sun,  4 Jan 2009 16:57:24 -0500 (EST)
-Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com [172.16.52.254])
-	by zmta02.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id 6E77C9C322;
-	Sun,  4 Jan 2009 16:57:24 -0500 (EST)
-Received: from mx3.redhat.com (mx3.redhat.com [172.16.48.32])
-	by int-mx1.corp.redhat.com (8.13.1/8.13.1) with ESMTP id n04LvNfd004253;
-	Sun, 4 Jan 2009 16:57:23 -0500
-Received: from vger.kernel.org (vger.kernel.org [209.132.176.167])
-	by mx3.redhat.com (8.13.8/8.13.8) with ESMTP id n04Lv8kf032280;
-	Sun, 4 Jan 2009 16:57:08 -0500
-Received: (majordomo at vger.kernel.org) by vger.kernel.org via listexpand
-	id S1757804AbZADV5H (ORCPT <rfc822;cdahlin at redhat.com> + 33 others);
-	Sun, 4 Jan 2009 16:57:07 -0500
-Received: (majordomo at vger.kernel.org) by vger.kernel.org id S1751921AbZADV44
-	(ORCPT <rfc822;linux-kernel-outgoing>);
-	Sun, 4 Jan 2009 16:56:56 -0500
-Received: from mx2.mail.elte.hu ([157.181.151.9]:58090 "EHLO mx2.mail.elte.hu"
-	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
-	id S1751332AbZADV4z (ORCPT <rfc822;linux-kernel at vger.kernel.org>);
-	Sun, 4 Jan 2009 16:56:55 -0500
-Received: from elvis.elte.hu ([157.181.1.14])
-	by mx2.mail.elte.hu with esmtp (Exim)
-	id 1LJaxm-0008Nh-7r
-	from <mingo at elte.hu>; Sun, 04 Jan 2009 22:56:52 +0100
-Received: by elvis.elte.hu (Postfix, from userid 1004)
-	id 11E833E21A7; Sun,  4 Jan 2009 22:56:43 +0100 (CET)
-Date: 	Sun, 4 Jan 2009 22:56:45 +0100
-From: Ingo Molnar <mingo at elte.hu>
-To: Linus Torvalds <torvalds at linux-foundation.org>
-Cc: linux-kernel at vger.kernel.org, Andrew Morton <akpm at linux-foundation.org>
-Subject: [git pull] core/iommu fixes
-Message-ID: <20090104215645.GA22924 at elte.hu>
-MIME-Version: 1.0
-Content-Type: text/plain; charset=us-ascii
-Content-Disposition: inline
-User-Agent: Mutt/1.5.18 (2008-05-17)
-Received-SPF: neutral (mx2: 157.181.1.14 is neither permitted nor denied by domain of elte.hu) client-ip=157.181.1.14; envelope-from=mingo at elte.hu; helo=elvis.elte.hu;
-X-ELTE-VirusStatus: clean
-X-ELTE-SpamScore: -1.5
-X-ELTE-SpamLevel: 
-X-ELTE-SpamCheck: no
-X-ELTE-SpamVersion: ELTE 2.0 
-X-ELTE-SpamCheck-Details: score=-1.5 required=5.9 tests=BAYES_00 autolearn=no SpamAssassin version=3.2.3
-	-1.5 BAYES_00               BODY: Bayesian spam probability is 0 to 1%
-	[score: 0.0000]
-Sender: linux-kernel-owner at vger.kernel.org
-Precedence: bulk
-List-ID: <linux-kernel.vger.kernel.org>
-X-Mailing-List: 	linux-kernel at vger.kernel.org
-X-RedHat-Spam-Score: -3.454 
-X-Scanned-By: MIMEDefang 2.58 on 172.16.52.254
-X-Scanned-By: MIMEDefang 2.63 on 172.16.48.32
-Status: RO
-Content-Length: 2444
-Lines: 85
-
-Linus,
-
-Please pull the latest core-fixes-for-linus git tree from:
-
-   git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git core-fixes-for-linus
-
- Thanks,
-
-	Ingo
-
------------------->
-Ingo Molnar (1):
-      intel-iommu: fix build error with INTR_REMAP=y and DMAR=n
-
-Jesper Juhl (1):
-      swiotlb: Don't include linux/swiotlb.h twice in lib/swiotlb.c
-
-Roland Dreier (1):
-      swiotlb: add missing __init annotations
-
-
- arch/x86/kernel/pci-swiotlb_64.c |    2 +-
- include/linux/dma_remapping.h    |    8 ++++++++
- lib/swiotlb.c                    |    3 +--
- 3 files changed, 10 insertions(+), 3 deletions(-)
-
-diff --git a/arch/x86/kernel/pci-swiotlb_64.c b/arch/x86/kernel/pci-swiotlb_64.c
-index 242c344..8cba374 100644
---- a/arch/x86/kernel/pci-swiotlb_64.c
-+++ b/arch/x86/kernel/pci-swiotlb_64.c
-@@ -13,7 +13,7 @@
- 
- int swiotlb __read_mostly;
- 
--void *swiotlb_alloc_boot(size_t size, unsigned long nslabs)
-+void * __init swiotlb_alloc_boot(size_t size, unsigned long nslabs)
- {
- 	return alloc_bootmem_low_pages(size);
- }
-diff --git a/include/linux/dma_remapping.h b/include/linux/dma_remapping.h
-index 136f170..af1dab4 100644
---- a/include/linux/dma_remapping.h
-+++ b/include/linux/dma_remapping.h
-@@ -17,7 +17,15 @@ struct dmar_domain;
- struct root_entry;
- 
- extern void free_dmar_iommu(struct intel_iommu *iommu);
-+
-+#ifdef CONFIG_DMAR
- extern int iommu_calculate_agaw(struct intel_iommu *iommu);
-+#else
-+static inline int iommu_calculate_agaw(struct intel_iommu *iommu)
-+{
-+	return 0;
-+}
-+#endif
- 
- extern int dmar_disabled;
- 
-diff --git a/lib/swiotlb.c b/lib/swiotlb.c
-index fa2dc4e..7f5e21b 100644
---- a/lib/swiotlb.c
-+++ b/lib/swiotlb.c
-@@ -23,7 +23,6 @@
- #include <linux/spinlock.h>
- #include <linux/swiotlb.h>
- #include <linux/string.h>
--#include <linux/swiotlb.h>
- #include <linux/types.h>
- #include <linux/ctype.h>
- #include <linux/highmem.h>
-@@ -116,7 +115,7 @@ setup_io_tlb_npages(char *str)
- __setup("swiotlb=", setup_io_tlb_npages);
- /* make io_tlb_overflow tunable too? */
- 
--void * __weak swiotlb_alloc_boot(size_t size, unsigned long nslabs)
-+void * __weak __init swiotlb_alloc_boot(size_t size, unsigned long nslabs)
- {
- 	return alloc_bootmem_low_pages(size);
- }
---
-To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
-the body of a message to majordomo at vger.kernel.org
-More majordomo info at  http://vger.kernel.org/majordomo-info.html
-Please read the FAQ at  http://www.tux.org/lkml/
-


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v
retrieving revision 1.943
retrieving revision 1.944
diff -u -r1.943 -r1.944
--- sources	5 Jan 2009 17:42:23 -0000	1.943
+++ sources	6 Jan 2009 17:50:09 -0000	1.944
@@ -1,2 +1,2 @@
 d351e44709c9810b85e29b877f50968a  linux-2.6.28.tar.bz2
-425b1d05c16ce88ba1448bf337b5175a  patch-2.6.28-git7.bz2
+1ea4d2960b1359e0ba6ed790bb4ae4f1  patch-2.6.28-git8.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v
retrieving revision 1.855
retrieving revision 1.856
diff -u -r1.855 -r1.856
--- upstream	5 Jan 2009 17:42:23 -0000	1.855
+++ upstream	6 Jan 2009 17:50:09 -0000	1.856
@@ -1,2 +1,2 @@
 linux-2.6.28.tar.bz2
-patch-2.6.28-git7.bz2
+patch-2.6.28-git8.bz2


--- patch-2.6.28-git7.bz2.sign DELETED ---



From nbecker at fedoraproject.org  Tue Jan  6 17:53:25 2009
From: nbecker at fedoraproject.org (Neal Becker)
Date: Tue,  6 Jan 2009 17:53:25 +0000 (UTC)
Subject: rpms/kdiff3/devel kdiff3.spec,1.14,1.15
Message-ID: <20090106175325.7FCFF70108@cvs1.fedora.phx.redhat.com>

Author: nbecker

Update of /cvs/pkgs/rpms/kdiff3/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2416

Modified Files:
	kdiff3.spec 
Log Message:
fix br for kde4


Index: kdiff3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdiff3/devel/kdiff3.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- kdiff3.spec	6 Jan 2009 17:42:53 -0000	1.14
+++ kdiff3.spec	6 Jan 2009 17:52:55 -0000	1.15
@@ -1,6 +1,6 @@
 Name:           kdiff3
 Version:        0.9.93
-Release: 	2%{?dist}
+Release: 	3%{?dist}
 Summary:        Compare + merge 2 or 3 files or directories
 
 Group:          Development/Tools
@@ -11,11 +11,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	gettext cmake
 
-%if 0%{?rhel}
 BuildRequires:  kdebase-devel, kdelibs-devel, desktop-file-utils
-%else
-BuildRequires:  kdebase3-devel, kdelibs3-devel, desktop-file-utils
-%endif
 
 %description
 KDiff3 is a program that
@@ -105,6 +101,9 @@
 %{_datadir}/kde4/services/*
 
 %changelog
+* Tue Jan  6 2009 Neal Becker <ndbecker2 at gmail.com> - 0.9.93-3
+- Change BR, no longer kde3
+
 * Tue Jan  6 2009 Neal Becker <ndbecker2 at gmail.com> - 0.9.93-2
 - Add br cmake
 



From kyle at fedoraproject.org  Tue Jan  6 17:54:03 2009
From: kyle at fedoraproject.org (Kyle McMartin)
Date: Tue,  6 Jan 2009 17:54:03 +0000 (UTC)
Subject: rpms/kernel/devel kernel.spec, 1.1193,
	1.1194 disable-p4-cpufreq-ui.patch, 1.3, NONE
Message-ID: <20090106175403.D181E70108@cvs1.fedora.phx.redhat.com>

Author: kyle

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2614

Modified Files:
	kernel.spec 
Removed Files:
	disable-p4-cpufreq-ui.patch 
Log Message:
kill disable-p4-cpufreq-ui.patch with fire.


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1193
retrieving revision 1.1194
diff -u -r1.1193 -r1.1194
--- kernel.spec	6 Jan 2009 17:50:09 -0000	1.1193
+++ kernel.spec	6 Jan 2009 17:53:33 -0000	1.1194
@@ -666,10 +666,6 @@
 # hush pci bar allocation failures
 Patch2804: linux-2.6.27-pci-hush-allocation-failures.patch
 
-# Provide P4 clock modulation in-kernel for thermal reasons, but don't expose
-# ui
-Patch3130: disable-p4-cpufreq-ui.patch
-
 %endif
 
 BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -1180,8 +1176,6 @@
 # hush pci bar allocation failures
 ApplyPatch linux-2.6.27-pci-hush-allocation-failures.patch
 
-#ApplyPatch disable-p4-cpufreq-ui.patch
-
 # END OF PATCH APPLICATIONS
 
 %endif


--- disable-p4-cpufreq-ui.patch DELETED ---



From steved at fedoraproject.org  Tue Jan  6 17:58:15 2009
From: steved at fedoraproject.org (Steve Dickson)
Date: Tue,  6 Jan 2009 17:58:15 +0000 (UTC)
Subject: rpms/nfs-utils/devel nfs-utils-1.1.4-mount-addrconfig.patch, NONE, 
	1.1 nfs-utils.spec, 1.204, 1.205
Message-ID: <20090106175815.B78F270108@cvs1.fedora.phx.redhat.com>

Author: steved

Update of /cvs/pkgs/rpms/nfs-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3686

Modified Files:
	nfs-utils.spec 
Added Files:
	nfs-utils-1.1.4-mount-addrconfig.patch 
Log Message:
- mount: revert recent fix for build problems on old systems
- mount: use gethostbyname(3) when building on old systems
- mount: getport: don't use getaddrinfo(3) on old systems
- mount: Random clean up


nfs-utils-1.1.4-mount-addrconfig.patch:

--- NEW FILE nfs-utils-1.1.4-mount-addrconfig.patch ---
--- nfs-utils-1.1.4/support/nfs/getport.c.save	2009-01-06 12:22:33.100864000 -0500
+++ nfs-utils-1.1.4/support/nfs/getport.c	2009-01-06 12:23:04.885428000 -0500
@@ -73,6 +73,60 @@ static const char *nfs_gp_rpcb_pgmtbl[] 
 	NULL,
 };
 
+#ifdef HAVE_DECL_AI_ADDRCONFIG
+/*
+ * getaddrinfo(3) generates a usable loopback address based on how the
+ * local network interfaces are configured.  RFC 3484 requires that the
+ * results are sorted so that the first result has the best likelihood
+ * of working, so we try just that first result.
+ *
+ * Returns TRUE on success.
+ */
+static int nfs_gp_loopback_address(struct sockaddr *sap, socklen_t *salen)
+{
+	struct addrinfo *gai_results;
+	struct addrinfo gai_hint = {
+		.ai_flags	= AI_ADDRCONFIG,
+	};
+	socklen_t len = *salen;
+	int ret = 0;
+
+	if (getaddrinfo(NULL, "sunrpc", &gai_hint, &gai_results))
+		return 0;
+
+	switch (gai_results->ai_addr->sa_family) {
+	case AF_INET:
+	case AF_INET6:
+		if (len >= gai_results->ai_addrlen) {
+			memcpy(sap, gai_results->ai_addr,
+					gai_results->ai_addrlen);
+			*salen = gai_results->ai_addrlen;
+			ret = 1;
+		}
+	}
+
+	freeaddrinfo(gai_results);
+	return ret;
+}
+#else
+/*
+ * Old versions of getaddrinfo(3) don't support AI_ADDRCONFIG, so we
+ * have a fallback for building on legacy systems.
+ */
+static int nfs_gp_loopback_address(struct sockaddr *sap, socklen_t *salen)
+{
+	struct sockaddr_in *sin = (struct sockaddr_in *)sap;
+
+	memset(sin, 0, sizeof(*sin));
+
+	sin->sin_family = AF_INET;
+	sin->sin_addr.s_addr = htonl(INADDR_LOOPBACK);
+	*salen = sizeof(*sin);
+
+	return 1;
+}
+#endif
+
 /*
  * Discover the port number that should be used to contact an
  * rpcbind service.  This will detect if the port has a local
@@ -780,12 +834,10 @@ unsigned short nfs_getlocalport(const rp
 				const rpcvers_t version,
 				const unsigned short protocol)
 {
-	struct addrinfo *gai_results;
-	struct addrinfo gai_hint = {
-		.ai_flags	= AI_ADDRCONFIG,
-	};
+	struct sockaddr_storage address;
+	struct sockaddr *lb_addr = (struct sockaddr *)&address;
+	socklen_t lb_len = sizeof(lb_addr);
 	unsigned short port = 0;
-	int error;
 
 #ifdef NFS_GP_LOCAL
 	const struct sockaddr_un sun = {
@@ -811,12 +863,9 @@ unsigned short nfs_getlocalport(const rp
 #endif	/* NFS_GP_LOCAL */
 
 	if (port == 0) {
-		error = getaddrinfo(NULL, "sunrpc", &gai_hint, &gai_results);
-		if (error == 0) {
-			port = nfs_getport(gai_results->ai_addr,
-						gai_results->ai_addrlen,
+		if (nfs_gp_loopback_address(lb_addr, &lb_len)) {
+			port = nfs_getport(lb_addr, lb_len,
 						program, version, protocol);
-			freeaddrinfo(gai_results);
 		} else
 			rpc_createerr.cf_stat = RPC_UNKNOWNADDR;
 	}
--- nfs-utils-1.1.4/utils/mount/network.c.save	2009-01-06 12:22:12.950764000 -0500
+++ nfs-utils-1.1.4/utils/mount/network.c	2009-01-06 12:23:10.432801000 -0500
@@ -50,24 +50,6 @@
 #include "nfsrpc.h"
 #include "network.h"
 
-/*
- * Earlier versions of glibc's /usr/include/netdb.h exclude these
- * definitions because it was thought they were not part of a stable
- * POSIX standard.  However, they are defined by RFC 2553 and 3493
- * and in POSIX 1003.1-2001, so these definitions were added in later
- * versions of netdb.h.
- */
-#ifndef AI_V4MAPPED
-#define AI_V4MAPPED     0x0008  /* IPv4-mapped addresses are acceptable.  */
-#endif	/* AI_V4MAPPED */
-#ifndef AI_ALL
-#define AI_ALL          0x0010  /* Return both IPv4 and IPv6 addresses.  */
-#endif	/* AI_ALL */
-#ifndef AI_ADDRCONFIG
-#define AI_ADDRCONFIG   0x0020  /* Use configuration of this host to choose \
-				   returned address type.  */
-#endif	/* AI_ADDRCONFIG */
-
 #define PMAP_TIMEOUT	(10)
 #define CONNECT_TIMEOUT	(20)
 #define MOUNT_TIMEOUT	(30)
@@ -175,9 +157,11 @@ static void nfs_set_port(struct sockaddr
 	}
 }
 
+#ifdef HAVE_DECL_AI_ADDRCONFIG
 /**
  * nfs_name_to_address - resolve hostname to an IPv4 or IPv6 socket address
  * @hostname: pointer to C string containing DNS hostname to resolve
+ * @af_hint: hint to restrict resolution to one address family
  * @sap: pointer to buffer to fill with socket address
  * @len: IN: size of buffer to fill; OUT: size of socket address
  *
@@ -228,11 +212,66 @@ int nfs_name_to_address(const char *host
 	freeaddrinfo(gai_results);
 	return ret;
 }
+#else	/* HAVE_DECL_AI_ADDRCONFIG */
+/**
+ * nfs_name_to_address - resolve hostname to an IPv4 socket address
+ * @hostname: pointer to C string containing DNS hostname to resolve
+ * @af_hint: hint to restrict resolution to one address family
+ * @sap: pointer to buffer to fill with socket address
+ * @len: IN: size of buffer to fill; OUT: size of socket address
+ *
+ * Returns 1 and places a socket address at @sap if successful;
+ * otherwise zero.
+ *
+ * Some older getaddrinfo(3) implementations don't support
+ * AI_ADDRCONFIG or AI_V4MAPPED properly.  For those cases, a DNS
+ * resolver based on the traditional gethostbyname(3) is provided.
+ */
+int nfs_name_to_address(const char *hostname,
+			const sa_family_t af_hint,
+			struct sockaddr *sap, socklen_t *salen)
+{
+	struct sockaddr_in *sin = (struct sockaddr_in *)sap;
+	socklen_t len = *salen;
+	struct hostent *hp;
+
+	*salen = 0;
+
+	if (af_hint != AF_INET) {
+		nfs_error(_("%s: address family not supported by DNS resolver\n"),
+				progname, hostname);
+		return 0;
+	}
+
+	sin->sin_family = AF_INET;
+	if (inet_aton(hostname, &sin->sin_addr)) {
+		*salen = sizeof(*sin);
+		return 1;
+	}
+
+	hp = gethostbyname(hostname);
+	if (hp == NULL) {
+		nfs_error(_("%s: DNS resolution failed for %s: %s"),
+				progname, hostname, hstrerror(h_errno));
+		return 0;
+	}
+
+	if (hp->h_length > len) {
+		nfs_error(_("%s: DNS resolution results too long for buffer\n"),
+				progname);
+		return 0;
+	}
+
+	memcpy(&sin->sin_addr, hp->h_addr, hp->h_length);
+	*salen = hp->h_length;
+	return 1;
+}
+#endif	/* HAVE_DECL_AI_ADDRCONFIG */
 
 /**
  * nfs_gethostbyname - resolve a hostname to an IPv4 address
  * @hostname: pointer to a C string containing a DNS hostname
- * @saddr: returns an IPv4 address 
+ * @sin: returns an IPv4 address 
  *
  * Returns 1 if successful, otherwise zero.
  */
--- nfs-utils-1.1.4/configure.ac.save	2009-01-06 12:22:41.437331000 -0500
+++ nfs-utils-1.1.4/configure.ac	2009-01-06 12:23:10.424809000 -0500
@@ -246,6 +246,11 @@ if test "$enable_gss" = yes; then
 
 fi
 
+AC_CHECK_DECL([AI_ADDRCONFIG],
+              AC_DEFINE([HAVE_DECL_AI_ADDRCONFIG], 1,
+                         [Define this to 1 if AI_ADDRCONFIG macro is defined]), ,
+              [ #include <netdb.h> ] )
+
 if test "$enable_ipv6" = yes; then
   AC_CHECK_FUNC(inet_ntop, , ,
                AC_MSG_ERROR(Function 'inet_ntop' not found.))
@@ -254,7 +259,10 @@ if test "$enable_ipv6" = yes; then
   AC_CHECK_LIB(tirpc, clnt_tli_create, ,
                AC_MSG_ERROR([libtirpc needed for IPv6 support]))
   AC_CHECK_HEADERS(tirpc/netconfig.h, ,
-               AC_MSG_ERROR([libtirpc-devel needed for IPv6 support]))
+               AC_MSG_ERROR([libtirpc headers needed for IPv6 support]))
+  AC_CHECK_DECL([AI_ADDRCONFIG], ,
+               AC_MSG_ERROR([full getaddrinfo(3) implementation needed for IPv6 support]),
+               [ #include <netdb.h> ] )
 fi
 
 dnl *************************************************************


Index: nfs-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nfs-utils/devel/nfs-utils.spec,v
retrieving revision 1.204
retrieving revision 1.205
diff -u -r1.204 -r1.205
--- nfs-utils.spec	5 Jan 2009 19:27:31 -0000	1.204
+++ nfs-utils.spec	6 Jan 2009 17:57:45 -0000	1.205
@@ -41,6 +41,7 @@
 Patch112: nfs-utils-1.1.4-tcpwrapper-update.patch
 Patch113: nfs-utils-1.1.4-tcpwrap-warn.patch
 Patch114: nfs-utils-1.1.4-gssd-verbosity.patch
+Patch115: nfs-utils-1.1.4-mount-addrconfig.patch
 
 %if %{enablefscache}
 Patch90: nfs-utils-1.1.0-mount-fsc.patch
@@ -110,6 +111,7 @@
 %patch112 -p1
 %patch113 -p1
 %patch114 -p1
+%patch115 -p1
 
 %if %{enablefscache}
 %patch90 -p1
@@ -277,6 +279,10 @@
 - Added warnings to tcp wrapper code when mounts are 
   denied due to misconfigured DNS configurations.
 - gssd: By default, don't spam syslog when users' credentials expire
+- mount: revert recent fix for build problems on old systems
+- mount: use gethostbyname(3) when building on old systems
+- mount: getport: don't use getaddrinfo(3) on old systems
+- mount: Random clean up
 
 * Fri Dec 19 2008 Steve Dickson <steved at redhat.com> 1.1.4-10
 - Re-enabled and fixed/enhanced tcp wrappers.



From steved at fedoraproject.org  Tue Jan  6 18:02:05 2009
From: steved at fedoraproject.org (Steve Dickson)
Date: Tue,  6 Jan 2009 18:02:05 +0000 (UTC)
Subject: rpms/nfs-utils/devel nfs-utils-1.1.4-configure-uuid.patch, NONE,
	1.1 nfs-utils.spec, 1.205, 1.206
Message-ID: <20090106180205.6597170108@cvs1.fedora.phx.redhat.com>

Author: steved

Update of /cvs/pkgs/rpms/nfs-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4783

Modified Files:
	nfs-utils.spec 
Added Files:
	nfs-utils-1.1.4-configure-uuid.patch 
Log Message:
configure: use "--disable-uuid" instead of  "--without-uuid"


nfs-utils-1.1.4-configure-uuid.patch:

--- NEW FILE nfs-utils-1.1.4-configure-uuid.patch ---
--- nfs-utils-1.1.4/configure.ac.orig	2009-01-06 12:27:23.944023000 -0500
+++ nfs-utils-1.1.4/configure.ac	2009-01-06 12:29:43.128014000 -0500
@@ -109,7 +109,7 @@ AC_ARG_WITH(rpcgen,
 	AC_SUBST(RPCGEN_PATH)
 	AM_CONDITIONAL(CONFIG_RPCGEN, [test "$RPCGEN_PATH" == ""])
 AC_ARG_ENABLE(uuid,
-	[AC_HELP_STRING([--without-uuid], [Exclude uuid support and so avoid possibly buggy libblkid])],
+	[AC_HELP_STRING([--disable-uuid], [Exclude uuid support to avoid buggy libblkid])],
 	if test "$enableval" = "yes" ; then choose_blkid=yes; else choose_blkid=no; fi,
 	choose_blkid=default)
 AC_ARG_ENABLE(mount,


Index: nfs-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nfs-utils/devel/nfs-utils.spec,v
retrieving revision 1.205
retrieving revision 1.206
diff -u -r1.205 -r1.206
--- nfs-utils.spec	6 Jan 2009 17:57:45 -0000	1.205
+++ nfs-utils.spec	6 Jan 2009 18:01:35 -0000	1.206
@@ -42,6 +42,7 @@
 Patch113: nfs-utils-1.1.4-tcpwrap-warn.patch
 Patch114: nfs-utils-1.1.4-gssd-verbosity.patch
 Patch115: nfs-utils-1.1.4-mount-addrconfig.patch
+Patch116: nfs-utils-1.1.4-configure-uuid.patch
 
 %if %{enablefscache}
 Patch90: nfs-utils-1.1.0-mount-fsc.patch
@@ -112,6 +113,7 @@
 %patch113 -p1
 %patch114 -p1
 %patch115 -p1
+%patch116 -p1
 
 %if %{enablefscache}
 %patch90 -p1
@@ -283,6 +285,7 @@
 - mount: use gethostbyname(3) when building on old systems
 - mount: getport: don't use getaddrinfo(3) on old systems
 - mount: Random clean up
+- configure: use "--disable-uuid" instead of	"--without-uuid"
 
 * Fri Dec 19 2008 Steve Dickson <steved at redhat.com> 1.1.4-10
 - Re-enabled and fixed/enhanced tcp wrappers.



From pkgdb at fedoraproject.org  Tue Jan  6 18:06:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 06 Jan 2009 18:06:19 +0000
Subject: [pkgdb] k3b-extras had acl change status
Message-ID: <20090106180619.762BC208D2B@bastion.fedora.phx.redhat.com>

toshio has set the watchbugzilla acl on k3b-extras (Fedora 10) to Obsolete for pawpawcatfish

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/k3b-extras



From nbecker at fedoraproject.org  Tue Jan  6 18:06:26 2009
From: nbecker at fedoraproject.org (Neal Becker)
Date: Tue,  6 Jan 2009 18:06:26 +0000 (UTC)
Subject: rpms/kdiff3/devel kdiff3.spec,1.15,1.16
Message-ID: <20090106180626.D66C970108@cvs1.fedora.phx.redhat.com>

Author: nbecker

Update of /cvs/pkgs/rpms/kdiff3/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5967

Modified Files:
	kdiff3.spec 
Log Message:
fix br for kde4


Index: kdiff3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdiff3/devel/kdiff3.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- kdiff3.spec	6 Jan 2009 17:52:55 -0000	1.15
+++ kdiff3.spec	6 Jan 2009 18:05:56 -0000	1.16
@@ -1,6 +1,6 @@
 Name:           kdiff3
 Version:        0.9.93
-Release: 	3%{?dist}
+Release: 	4%{?dist}
 Summary:        Compare + merge 2 or 3 files or directories
 
 Group:          Development/Tools
@@ -28,9 +28,8 @@
 %patch0 -p1
 
 %build
-unset QTDIR || : ; source /etc/profile.d/qt.sh
-%configure \
-         --disable-rpath
+#%configure \
+#         --disable-rpath
 
 %{cmake_kde4}
 
@@ -101,6 +100,9 @@
 %{_datadir}/kde4/services/*
 
 %changelog
+* Tue Jan  6 2009 Neal Becker <ndbecker2 at gmail.com> - 0.9.93-4
+- Remove /etc/profile.d/qt.sh, remove configure
+
 * Tue Jan  6 2009 Neal Becker <ndbecker2 at gmail.com> - 0.9.93-3
 - Change BR, no longer kde3
 



From pkgdb at fedoraproject.org  Tue Jan  6 18:07:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 06 Jan 2009 18:07:40 +0000
Subject: [pkgdb] wireshark had acl change status
Message-ID: <20090106180740.9ECCE208D2B@bastion.fedora.phx.redhat.com>

toshio has set the watchbugzilla acl on wireshark (Fedora 8) to Obsolete for tunis1ano

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/wireshark



From rvinyard at fedoraproject.org  Tue Jan  6 18:11:35 2009
From: rvinyard at fedoraproject.org (Rick L. Vinyard, Jr.)
Date: Tue,  6 Jan 2009 18:11:35 +0000 (UTC)
Subject: rpms/bit/F-10 bit.spec,1.12,1.13
Message-ID: <20090106181135.AD24C70125@cvs1.fedora.phx.redhat.com>

Author: rvinyard

Update of /cvs/pkgs/rpms/bit/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8277

Modified Files:
	bit.spec 
Log Message:



Index: bit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bit/F-10/bit.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- bit.spec	3 Nov 2008 19:49:42 -0000	1.12
+++ bit.spec	6 Jan 2009 18:11:05 -0000	1.13
@@ -1,7 +1,7 @@
-Summary:          Bit is a C++ library to simplify bit stream parsing
+Summary:          C++ library to simplify bit stream parsing
 Name:             bit
 Version:          0.4.90
-Release:          2%{?dist}
+Release:          3%{?dist}
 License:          GPLv3
 URL:              http://libbit.sourceforge.net
 Group:            System Environment/Libraries
@@ -21,7 +21,7 @@
 fields that are not necessarily octet (byte) oriented.
 
 %package          devel
-Summary:          Support files for developing programs that will use the bit library
+Summary:          C++ development files to simplify bit stream parsing
 Group:            Development/Libraries
 Requires:         bit = %{version}-%{release}
 Requires:         libxml++-devel >= 2.10.0
@@ -37,7 +37,7 @@
 developing applications that use the bit library.
 
 %package          gtkmm
-Summary:          This library contains gtkmm UI widgets to support the bit library
+Summary:          Gtkmm UI widgets to support bit stream processing
 Group:            System Environment/Libraries
 Requires:         bit = %{version}-%{release}
 Provides:         bitgtkmm = %{version}
@@ -47,7 +47,7 @@
 This package contains gtkmm widgets associated with the bit library.
 
 %package          gtkmm-devel
-Summary:          Support files for gtkmm applications that will use the bit-gtkmm UI widgets
+Summary:          Development files to support gtkmm UI widgets for bit stream processing
 Group:            Development/Libraries
 Requires:         bit-gtkmm = %{version}-%{release}
 Requires:         gtkmm24-devel >= 2.6.0
@@ -117,6 +117,9 @@
 %doc %{_datadir}/gtk-doc/html/bit-gtkmm/
 
 %changelog
+* Tue Jan 06 2009 Rick L Vinyard Jr <rvinyard at cs.nmsu.edu> - 0.4.90-3
+- Updated summaries
+
 * Mon Nov 03 2008 Rick L Vinyard Jr <rvinyard at cs.nmsu.edu> - 0.4.90-2
 - Excluded ppc and ppc64 arches
 



From mclasen at fedoraproject.org  Tue Jan  6 18:23:02 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue,  6 Jan 2009 18:23:02 +0000 (UTC)
Subject: rpms/gnome-applets/devel .cvsignore, 1.73,
	1.74 gnome-applets-null-battstat.patch, 1.2,
	1.3 gnome-applets.spec, 1.318, 1.319 sources, 1.81,
	1.82 gnome-applets-2.18.0-node-leak.patch, 1.1,
	NONE gnome-applets-libgnomeui.patch, 1.5,
	NONE gnome-applets-remove-mixer.patch, 1.4,
	NONE gweather-network.patch, 1.3, NONE
Message-ID: <20090106182302.D8CA370108@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-applets/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11428

Modified Files:
	.cvsignore gnome-applets-null-battstat.patch 
	gnome-applets.spec sources 
Removed Files:
	gnome-applets-2.18.0-node-leak.patch 
	gnome-applets-libgnomeui.patch 
	gnome-applets-remove-mixer.patch gweather-network.patch 
Log Message:
drop old patches



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-applets/devel/.cvsignore,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- .cvsignore	23 Dec 2008 03:32:09 -0000	1.73
+++ .cvsignore	6 Jan 2009 18:22:32 -0000	1.74
@@ -1 +1 @@
-gnome-applets-2.25.2.tar.bz2
+gnome-applets-2.25.3.tar.bz2

gnome-applets-null-battstat.patch:

Index: gnome-applets-null-battstat.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-applets/devel/gnome-applets-null-battstat.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gnome-applets-null-battstat.patch	19 Dec 2008 17:03:01 -0000	1.2
+++ gnome-applets-null-battstat.patch	6 Jan 2009 18:22:32 -0000	1.3
@@ -1,35 +1,6 @@
-diff -up gnome-applets-2.21.2/null_applet/Makefile.am.battstat gnome-applets-2.21.2/null_applet/Makefile.am
---- gnome-applets-2.21.2/null_applet/Makefile.am.battstat	2007-12-06 22:43:35.000000000 -0500
-+++ gnome-applets-2.21.2/null_applet/Makefile.am	2007-12-06 22:43:43.000000000 -0500
-@@ -9,12 +9,17 @@ null_applet_SOURCES = null_applet.c
- 
- null_applet_LDADD = $(GNOME_APPLETS_LIBS)
- 
-+if !BUILD_BATTSTAT_APPLET
-+battstat_applet=GNOME_BattstatApplet.server.in
-+endif
-+
- serverdir = $(libdir)/bonobo/servers
- server_in_files =				\
- 	GNOME_NullApplet_Factory.server.in	\
- 	GNOME_CDPlayerApplet.server.in		\
- 	GNOME_MailcheckApplet_Factory.server.in	\
--	GNOME_Panel_WirelessApplet.server.in
-+	GNOME_Panel_WirelessApplet.server.in	\
-+	$(battstat_applet)
- server_DATA = $(server_in_files:.server.in=.server)
- 
- @INTLTOOL_SERVER_RULE@
-@@ -28,4 +33,5 @@ EXTRA_DIST =					\
- 	GNOME_NullApplet_Factory.server.in.in	\
- 	GNOME_CDPlayerApplet.server.in		\
- 	GNOME_MailcheckApplet_Factory.server.in	\
--	GNOME_Panel_WirelessApplet.server.in
-+	GNOME_Panel_WirelessApplet.server.in	\
-+	GNOME_BattstatApplet.server.in
-diff -up gnome-applets-2.21.2/null_applet/GNOME_BattstatApplet.server.in.battstat gnome-applets-2.21.2/null_applet/GNOME_BattstatApplet.server.in
---- gnome-applets-2.21.2/null_applet/GNOME_BattstatApplet.server.in.battstat	2007-12-06 22:44:07.000000000 -0500
-+++ gnome-applets-2.21.2/null_applet/GNOME_BattstatApplet.server.in	2007-12-06 22:43:54.000000000 -0500
+diff -up /dev/null gnome-applets-2.25.3/null_applet/GNOME_BattstatApplet.server.in
+--- /dev/null	2009-01-06 09:07:59.720027856 -0500
++++ gnome-applets-2.25.3/null_applet/GNOME_BattstatApplet.server.in	2009-01-06 13:06:52.000000000 -0500
 @@ -0,0 +1,22 @@
 +<oaf_info>
 +
@@ -53,14 +24,35 @@
 +</oaf_server>
 +
 +</oaf_info>
---- gnome-applets-2.25.1/null_applet/null_applet.c.old	2008-12-19 16:57:54.000000000 +0000
-+++ gnome-applets-2.25.1/null_applet/null_applet.c	2008-12-19 16:58:49.000000000 +0000
-@@ -40,6 +40,8 @@ insert_oafiids (GHashTable *hash_table)
- 			"OAFIID:GNOME_MailcheckApplet", "Inbox Monitor");
+diff -up gnome-applets-2.25.3/null_applet/Makefile.am.battstat-null gnome-applets-2.25.3/null_applet/Makefile.am
+--- gnome-applets-2.25.3/null_applet/Makefile.am.battstat-null	2009-01-06 00:30:23.000000000 -0500
++++ gnome-applets-2.25.3/null_applet/Makefile.am	2009-01-06 13:08:41.000000000 -0500
+@@ -9,12 +9,15 @@ null_applet_SOURCES = null_applet.c
+ 
+ null_applet_LDADD = $(GNOME_APPLETS_LIBS)
+ 
++if !BUILD_BATTSTAT_APPLET
++battstat_applet=GNOME_BattstatApplet.server.in
++endif
++
+ serverdir = $(libdir)/bonobo/servers
+ server_in_files =				\
+ 	GNOME_NullApplet_Factory.server.in	\
+ 	GNOME_CDPlayerApplet.server.in		\
+ 	GNOME_MailcheckApplet_Factory.server.in	\
+-	GNOME_Panel_WirelessApplet.server.in	\
+ 	GNOME_MixerApplet.server.in
+ server_DATA = $(server_in_files:.server.in=.server)
+ 
+diff -up gnome-applets-2.25.3/null_applet/null_applet.c.battstat-null gnome-applets-2.25.3/null_applet/null_applet.c
+--- gnome-applets-2.25.3/null_applet/null_applet.c.battstat-null	2009-01-06 00:30:23.000000000 -0500
++++ gnome-applets-2.25.3/null_applet/null_applet.c	2009-01-06 13:09:42.000000000 -0500
+@@ -41,6 +41,8 @@ insert_oafiids (GHashTable *hash_table)
  	g_hash_table_insert (hash_table,
  			"OAFIID:GNOME_CDPlayerApplet", "CD Player");
+ 	g_hash_table_insert (hash_table,
++			"OAFIID:GNOME_BattstatApplet", "Battery Charge Monitor");
 +	g_hash_table_insert (hash_table,
-+			     "OAFIID:GNOME_BattstatApplet", "Battery Charge Monitor");
+ 			     "OAFIID:GNOME_MixerApplet_Factory", "Volume Control");
  }
  
- static gboolean already_running;


Index: gnome-applets.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-applets/devel/gnome-applets.spec,v
retrieving revision 1.318
retrieving revision 1.319
diff -u -r1.318 -r1.319
--- gnome-applets.spec	23 Dec 2008 04:48:50 -0000	1.318
+++ gnome-applets.spec	6 Jan 2009 18:22:32 -0000	1.319
@@ -34,8 +34,8 @@
 
 Summary:        Small applications for the GNOME panel
 Name:		gnome-applets
-Version:	2.25.2
-Release: 	4%{?dist}
+Version:	2.25.3
+Release: 	1%{?dist}
 Epoch:          1
 License:	GPLv2+ and GFDL
 Group:          User Interface/Desktops
@@ -57,11 +57,6 @@
 
 # do the nullapplet dance for battstat
 Patch40:	gnome-applets-null-battstat.patch
-# and for the mixer applet
-Patch42:	gnome-applets-remove-mixer.patch
-
-# make mini-commander build
-Patch43:	gnome-applets-libgnomeui.patch
 
 BuildRequires:  glib2-devel >= %{glib2_version}
 BuildRequires:  gtk2-devel >= %{gtk2_version}
@@ -146,9 +141,6 @@
 
 %patch31 -p1 -b .fix-find
 %patch40 -p1 -b .battstat-null
-mv mixer/GNOME_MixerApplet.server.in.in null_applet/GNOME_MixerApplet.server.in
-rm -rf mixer/
-%patch42 -p1 -b .mixer-null
 
 # We don't ship gnome-system-tools
 rm -rf modemlights
@@ -157,7 +149,6 @@
 %patch3 -p1 -b .ppp-command
 %patch34 -p1 -b .ppp-includes
 
-%patch43 -p1 -b .libgnomeui
 
 intltoolize --force
 autoreconf
@@ -344,6 +335,9 @@
 %{_datadir}/PolicyKit/policy/org.gnome.cpufreqselector.policy
 
 %changelog
+* Tue Jan  6 2009 Matthias Clasen <mclasen at redhat.com> - 1:2.25.3-1
+- Update to 2.25.3
+
 * Sat Dec 20 2008 Matthias Clasen <mclasen at redhat.com> - 1:2.25.2-4
 - Update to 2.25.2
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-applets/devel/sources,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- sources	23 Dec 2008 03:37:58 -0000	1.81
+++ sources	6 Jan 2009 18:22:32 -0000	1.82
@@ -1,2 +1 @@
-ee040219c868baca6c75c6525a656a0b  gnome-applets-2.25.2.tar.bz2
-ccd89d3a58076214e2f34216388c9621  gnome-applets-2.9.3.1-modemlights.tar.bz2
+ddd99d0281df4fa4458408e6cdd19cd1  gnome-applets-2.25.3.tar.bz2


--- gnome-applets-2.18.0-node-leak.patch DELETED ---


--- gnome-applets-libgnomeui.patch DELETED ---


--- gnome-applets-remove-mixer.patch DELETED ---


--- gweather-network.patch DELETED ---



From deji at fedoraproject.org  Tue Jan  6 18:23:28 2009
From: deji at fedoraproject.org (Deji Akingunola)
Date: Tue,  6 Jan 2009 18:23:28 +0000 (UTC)
Subject: rpms/exempi/F-10 .cvsignore, 1.8, 1.9 exempi.spec, 1.8, 1.9 sources,
	1.8, 1.9
Message-ID: <20090106182328.7475870108@cvs1.fedora.phx.redhat.com>

Author: deji

Update of /cvs/pkgs/rpms/exempi/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14149

Modified Files:
	.cvsignore exempi.spec sources 
Log Message:
* Tue Jan 06 2009 Deji Akingunola <dakingun at gmail.com> - 2.1.0-1
- Update to 2.1.0
    
* Sat May 17 2008 Deji Akingunola <dakingun at gmail.com> - 2.0.1-1
- Update to 2.0.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/exempi/F-10/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	17 May 2008 15:42:49 -0000	1.8
+++ .cvsignore	6 Jan 2009 18:22:58 -0000	1.9
@@ -1 +1 @@
-exempi-2.0.1.tar.gz
+exempi-2.1.0.tar.gz


Index: exempi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/exempi/F-10/exempi.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- exempi.spec	17 May 2008 15:42:49 -0000	1.8
+++ exempi.spec	6 Jan 2009 18:22:58 -0000	1.9
@@ -1,13 +1,13 @@
 Summary:	Library for easy parsing of XMP metadata
 Name:		exempi
-Version:	2.0.1
+Version:	2.1.0
 Release:	1%{?dist}
 License:	BSD
 Group:		System Environment/Libraries
 URL:		http://libopenraw.freedesktop.org/wiki/Exempi
 Source0:	http://libopenraw.freedesktop.org/download/%{name}-%{version}.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:	boost-devel expat-devel pkgconfig
+BuildRequires:	boost-devel expat-devel zlib-devel pkgconfig
 
 %description
 Exempi provides a library for easy parsing of XMP metadata. It is a port of 
@@ -61,6 +61,9 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Tue Jan 06 2009 Deji Akingunola <dakingun at gmail.com> - 2.1.0-1
+- Update to 2.1.0
+    
 * Sat May 17 2008 Deji Akingunola <dakingun at gmail.com> - 2.0.1-1
 - Update to 2.0.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/exempi/F-10/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	17 May 2008 15:42:49 -0000	1.8
+++ sources	6 Jan 2009 18:22:58 -0000	1.9
@@ -1 +1 @@
-8d72412c8a1e0330c4fa57da2d0ef96e  exempi-2.0.1.tar.gz
+30dfa5c394b4a3901c66f6e60e8b22e4  exempi-2.1.0.tar.gz



From nbecker at fedoraproject.org  Tue Jan  6 18:26:59 2009
From: nbecker at fedoraproject.org (Neal Becker)
Date: Tue,  6 Jan 2009 18:26:59 +0000 (UTC)
Subject: rpms/kdiff3/devel kdiff3.spec,1.16,1.17
Message-ID: <20090106182659.F307E70108@cvs1.fedora.phx.redhat.com>

Author: nbecker

Update of /cvs/pkgs/rpms/kdiff3/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15466

Modified Files:
	kdiff3.spec 
Log Message:
fix HTML_DIR


Index: kdiff3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdiff3/devel/kdiff3.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- kdiff3.spec	6 Jan 2009 18:05:56 -0000	1.16
+++ kdiff3.spec	6 Jan 2009 18:26:29 -0000	1.17
@@ -1,6 +1,6 @@
 Name:           kdiff3
 Version:        0.9.93
-Release: 	4%{?dist}
+Release: 	5%{?dist}
 Summary:        Compare + merge 2 or 3 files or directories
 
 Group:          Development/Tools
@@ -38,7 +38,7 @@
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
-HTML_DIR=$(kde-config --expandvars --install html)
+HTML_DIR=%{_kde4_datadir}/doc/HTML
 
 # this is junk
 rm -rf $RPM_BUILD_ROOT$HTML_DIR/%{name} 
@@ -65,41 +65,44 @@
 fi
 
 # Desktop.
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications $RPM_BUILD_ROOT%{_datadir}/kde4/apps $RPM_BUILD_ROOT%{_datadir}/kde4/services
+mkdir -p $RPM_BUILD_ROOT%{_kde4_datadir}/applications $RPM_BUILD_ROOT%{_kde4_datadir}/kde4/apps $RPM_BUILD_ROOT%{_kde4_datadir}/kde4/services
 
 desktop-file-install --vendor fedora \
-    --dir $RPM_BUILD_ROOT%{_datadir}/kde4/services \
-    $RPM_BUILD_ROOT%{_datadir}/kde4/services/kdiff3part.desktop
+    --dir $RPM_BUILD_ROOT%{_kde4_datadir}/kde4/services \
+    $RPM_BUILD_ROOT%{_kde4_datadir}/kde4/services/kdiff3part.desktop
 
 desktop-file-install  --vendor fedora \
-    --dir $RPM_BUILD_ROOT%{_datadir}/applications/kde4  \
+    --dir $RPM_BUILD_ROOT%{_kde4_datadir}/applications/kde4  \
     --add-category Development \
     --add-category X-Fedora \
     --delete-original \
-        $RPM_BUILD_ROOT%{_datadir}/applications/kde4/kdiff3.desktop
+        $RPM_BUILD_ROOT%{_kde4_datadir}/applications/kde4/kdiff3.desktop
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
-touch --no-create %{_datadir}/icons/hicolor || :
-%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+touch --no-create %{_kde4_datadir}/icons/hicolor || :
+%{_bindir}/gtk-update-icon-cache --quiet %{_kde4_datadir}/icons/hicolor || :
 
 %postun
-touch --no-create %{_datadir}/icons/hicolor || :
-%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+touch --no-create %{_kde4_datadir}/icons/hicolor || :
+%{_bindir}/gtk-update-icon-cache --quiet %{_kde4_datadir}/icons/hicolor || :
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog README TODO
-%{_bindir}/*
-%{_libdir}/*
-%{_datadir}/applications/kde4/*
-%{_datadir}/kde4/apps/*
-%{_datadir}/icons/*/*/*/kdiff3.png
-%{_datadir}/kde4/services/*
+%{_kde4_bindir}/*
+%{_kde4_libdir}/*
+%{_kde4_datadir}/applications/kde4/*
+%{_kde4_datadir}/kde4/apps/*
+%{_kde4_datadir}/icons/*/*/*/kdiff3.png
+%{_kde4_datadir}/kde4/services/*
 
 %changelog
+* Tue Jan  6 2009 Neal Becker <ndbecker2 at gmail.com> - 0.9.93-5
+- Fix HTML_DIR and use kde4_ versions of datadir, libdir, bindir
+
 * Tue Jan  6 2009 Neal Becker <ndbecker2 at gmail.com> - 0.9.93-4
 - Remove /etc/profile.d/qt.sh, remove configure
 



From deji at fedoraproject.org  Tue Jan  6 18:32:16 2009
From: deji at fedoraproject.org (Deji Akingunola)
Date: Tue,  6 Jan 2009 18:32:16 +0000 (UTC)
Subject: rpms/exempi/F-9 .cvsignore, 1.8, 1.9 exempi.spec, 1.8, 1.9 sources, 
	1.8, 1.9
Message-ID: <20090106183216.335DD70108@cvs1.fedora.phx.redhat.com>

Author: deji

Update of /cvs/pkgs/rpms/exempi/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16694

Modified Files:
	.cvsignore exempi.spec sources 
Log Message:
* Tue Jan 06 2009 Deji Akingunola <dakingun at gmail.com> - 2.1.0-1
- Update to 2.1.0
    
* Sat May 17 2008 Deji Akingunola <dakingun at gmail.com> - 2.0.1-1
- Update to 2.0.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/exempi/F-9/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	17 May 2008 16:01:54 -0000	1.8
+++ .cvsignore	6 Jan 2009 18:31:45 -0000	1.9
@@ -1 +1 @@
-exempi-2.0.1.tar.gz
+exempi-2.1.0.tar.gz


Index: exempi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/exempi/F-9/exempi.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- exempi.spec	17 May 2008 16:01:54 -0000	1.8
+++ exempi.spec	6 Jan 2009 18:31:45 -0000	1.9
@@ -1,13 +1,13 @@
 Summary:	Library for easy parsing of XMP metadata
 Name:		exempi
-Version:	2.0.1
+Version:	2.1.0
 Release:	1%{?dist}
 License:	BSD
 Group:		System Environment/Libraries
 URL:		http://libopenraw.freedesktop.org/wiki/Exempi
 Source0:	http://libopenraw.freedesktop.org/download/%{name}-%{version}.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:	boost-devel expat-devel pkgconfig
+BuildRequires:	boost-devel expat-devel zlib-devel pkgconfig
 
 %description
 Exempi provides a library for easy parsing of XMP metadata. It is a port of 
@@ -61,6 +61,9 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Tue Jan 06 2009 Deji Akingunola <dakingun at gmail.com> - 2.1.0-1
+- Update to 2.1.0
+    
 * Sat May 17 2008 Deji Akingunola <dakingun at gmail.com> - 2.0.1-1
 - Update to 2.0.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/exempi/F-9/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	17 May 2008 16:01:54 -0000	1.8
+++ sources	6 Jan 2009 18:31:45 -0000	1.9
@@ -1 +1 @@
-8d72412c8a1e0330c4fa57da2d0ef96e  exempi-2.0.1.tar.gz
+30dfa5c394b4a3901c66f6e60e8b22e4  exempi-2.1.0.tar.gz



From s4504kr at fedoraproject.org  Tue Jan  6 18:34:06 2009
From: s4504kr at fedoraproject.org (Jochen Schmitt)
Date: Tue,  6 Jan 2009 18:34:06 +0000 (UTC)
Subject: rpms/blender/devel blender.spec,1.95,1.96
Message-ID: <20090106183406.70F0E70108@cvs1.fedora.phx.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/blender/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17165

Modified Files:
	blender.spec 
Log Message:
Increase Release bc/ make tag fails


Index: blender.spec
===================================================================
RCS file: /cvs/extras/rpms/blender/devel/blender.spec,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -r1.95 -r1.96
--- blender.spec	27 Dec 2008 12:20:53 -0000	1.95
+++ blender.spec	6 Jan 2009 18:33:35 -0000	1.96
@@ -1,9 +1,11 @@
 %define blenderlib %{_datadir}/blender
 %define plugins %{_libdir}/blender/plugins
 
+%define fontname blender
+
 Name:           blender
 Version:        2.48a
-Release: 	7%{?dist}
+Release: 	8%{?dist}
 
 Summary:        3D modeling, animation, rendering and post-production
 
@@ -57,12 +59,15 @@
 buildRequires:  freetype-devel
 BuildRequires:  OpenEXR-devel
 BuildRequires:  glew-devel
+BuildRequires:	fontpackages-devel
 
 Requires(post): desktop-file-utils
 Requires(post): shared-mime-info
 Requires(postun): desktop-file-utils
 Requires(postun): shared-mime-info
 
+Requires:	  blender-fonts = %{version}-%{release}
+
 %description
 Blender is the essential software solution you need for 3D, from modeling,
 animation, rendering and post-production to interactive creation and playback.
@@ -72,6 +77,16 @@
 
 This version doesn't contains ffmpeg support.
 
+%package fonts
+Summary:	Fonts for the blender package
+BuildArch:	noarch
+Requires:	fontpackages-filesystem
+Group:		User Interface/X
+License:	Bitstream Veta Fonts
+
+%description fonts
+This package contains a font which will be used be blender
+
 %prep
 %setup -q 
 %patch1 -p1 -b .org
@@ -154,6 +169,15 @@
 
 install -d ${RPM_BUILD_ROOT}%{_libdir}/blender/scripts
 
+#
+# Install fonts
+#
+install -m 0755 -d ${RPM_BUILD_ROOT}/%{_fontdir}
+install -m 0644 -p release/datafiles/bfont.ttf ${RPM_BUILD_ROOT}/%{_fontdir}
+rm ${RPM_BUILD_ROOT}/%{_datadir}/blender/.bfont.ttf
+(cd ${RPM_BUILD_ROOT}; ln -sf %{_fontdir}/bfont.ttf ${RPM_BUILD_ROOT}/%{_datadir}/blender/.bfont.ttf)
+mv release/datafiles/LICENSE-bfont.ttf.txt release/datafiles/LICENSE
+
 %find_lang %name
 
 %clean
@@ -179,15 +203,23 @@
 %{_libdir}/blender/
 %{_datadir}/mime/packages/blender.xml
 
+%files fonts
+%defattr(-,root,root,-)
+%doc release/datafiles/LICENSE
+%{_fontdir}/
+
 %changelog
-* Sat Dec 27 2008 Lubomir Rintel <lkundrak at v3.sk> - 2.48a-7
+* Tue Jan  6 2009 Jochen Schmitt <Jochen herr-schmitt de> 2.48a-8
+- Create fonts sub-package (#477370)
+
+* Sat Dec 27 2008 Lubomir Rintel <lkundrak at v3.sk> 2.48a-7
 - Fix optflags use, this time for real
 
-* Sat Dec 27 2008 Lubomir Rintel <lkundrak at v3.sk> - 2.48a-6
+* Sat Dec 27 2008 Lubomir Rintel <lkundrak at v3.sk> 2.48a-6
 - Use proper compiler flags (see #199418)
 - Minor grammar & language fixes and tidy-ups
 
-* Sun Nov 30 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 2.48a-5
+* Sun Nov 30 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> 2.48a-5
 - Rebuild for Python 2.6
 
 * Mon Nov  3 2008 Jochen Schmitt <Jochen herr-schmitt de> 2.48a-4



From theinric at fedoraproject.org  Tue Jan  6 18:35:01 2009
From: theinric at fedoraproject.org (Tomas Heinrich)
Date: Tue,  6 Jan 2009 18:35:01 +0000 (UTC)
Subject: rpms/rsyslog/F-10 rsyslog-3.21.9-dodie.patch, NONE,
	1.1 rsyslog-3.21.9-opts.patch, NONE, 1.1 rsyslog.spec, 1.52, 1.53
Message-ID: <20090106183501.1AB0D70108@cvs1.fedora.phx.redhat.com>

Author: theinric

Update of /cvs/extras/rpms/rsyslog/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17332

Modified Files:
	rsyslog.spec 
Added Files:
	rsyslog-3.21.9-dodie.patch rsyslog-3.21.9-opts.patch 
Log Message:
- fix several legacy options handling
- fix internal message output (#478612)


rsyslog-3.21.9-dodie.patch:

--- NEW FILE rsyslog-3.21.9-dodie.patch ---
diff -up rsyslog-3.21.9/tools/syslogd.c.dodie rsyslog-3.21.9/tools/syslogd.c
--- rsyslog-3.21.9/tools/syslogd.c.dodie	2009-01-05 17:20:33.000000000 +0100
+++ rsyslog-3.21.9/tools/syslogd.c	2009-01-05 17:25:19.000000000 +0100
@@ -1877,9 +1877,11 @@ static void doDie(int sig)
 #	define MSG1 "DoDie called.\n"
 #	define MSG2 "DoDie called 5 times - unconditional exit\n"
 	static int iRetries = 0; /* debug aid */
-	write(1, MSG1, sizeof(MSG1));
+	if(Debug || NoFork)
+		write(1, MSG1, sizeof(MSG1) - 1);
 	if(iRetries++ == 4) {
-		write(1, MSG2, sizeof(MSG2));
+		if(Debug || NoFork)
+			write(1, MSG2, sizeof(MSG2) - 1);
 		abort();
 	}
 	bFinished = sig;

rsyslog-3.21.9-opts.patch:

--- NEW FILE rsyslog-3.21.9-opts.patch ---
diff -up rsyslog-3.21.9/tools/syslogd.c.opts rsyslog-3.21.9/tools/syslogd.c
--- rsyslog-3.21.9/tools/syslogd.c.opts	2008-12-09 10:36:02.000000000 +0100
+++ rsyslog-3.21.9/tools/syslogd.c	2008-12-09 10:57:03.000000000 +0100
@@ -391,8 +391,9 @@ static void processImInternal(void);
 
 static int usage(void)
 {
-	fprintf(stderr, "usage: rsyslogd [-cversion] [-46AdnqQvwx] [-lhostlist] [-sdomainlist]\n"
-			"                [-fconffile] [-ipidfile] [-Nlevel]\n"
+	fprintf(stderr, "usage: rsyslogd [-c<version>] [-46AdnqQvwx] [-l<hostlist>] [-s<domainlist>]\n"
+			"                [-f<conffile>] [-i<pidfile>] [-N<level>] [-M<module load path>]\n"
+			"                [-u<number>]\n"
 			"To run rsyslogd in native mode, use \"rsyslogd -c3 <other options>\"\n\n"
 			"For further information see http://www.rsyslog.com/doc\n");
 	exit(1); /* "good" exit - done to terminate usage() */
@@ -3164,7 +3165,7 @@ int realMain(int argc, char **argv)
 	 * only when actually neeeded. 
 	 * rgerhards, 2008-04-04
 	 */
-	while((ch = getopt(argc, argv, "46aAc:def:g:hi:l:m:M:nN:opqQr::s:t:u:vwx")) != EOF) {
+	while((ch = getopt(argc, argv, "46a:Ac:def:g:hi:l:m:M:nN:op:qQr::s:t:u:vwx")) != EOF) {
 		switch((char)ch) {
                 case '4':
                 case '6':


Index: rsyslog.spec
===================================================================
RCS file: /cvs/extras/rpms/rsyslog/F-10/rsyslog.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- rsyslog.spec	15 Dec 2008 15:25:01 -0000	1.52
+++ rsyslog.spec	6 Jan 2009 18:34:30 -0000	1.53
@@ -3,7 +3,7 @@
 Summary: Enhanced system logging and kernel message trapping daemons
 Name: rsyslog
 Version: 3.21.9
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv3+
 Group: System Environment/Daemons
 URL: http://www.rsyslog.com/
@@ -12,6 +12,8 @@
 Source2: rsyslog.conf
 Source3: rsyslog.sysconfig
 Source4: rsyslog.log
+Patch0: rsyslog-3.21.9-opts.patch
+Patch1: rsyslog-3.21.9-dodie.patch
 BuildRequires: zlib-devel
 BuildRequires: autoconf automake
 Requires: logrotate >= 3.5.2
@@ -87,6 +89,8 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .opts
+%patch1 -p1 -b .dodie
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS -DSYSLOGD_PIDNAME=\\\"syslogd.pid\\\""
@@ -96,8 +100,8 @@
 		--enable-pgsql \
 		--enable-gssapi-krb5 \
 		--enable-imfile \
-                --enable-relp \
-                --enable-gnutls
+		--enable-relp \
+		--enable-gnutls
 make %{?_smp_mflags}
 
 %install
@@ -192,6 +196,10 @@
 %{_libdir}/rsyslog/lmnsd_gtls.so
 
 %changelog
+* Tue Jan 06 2009 Tomas Heinrich <theinric at redhat.com> 3.21.9-2
+- fix several legacy options handling
+- fix internal message output (#478612)
+
 * Mon Dec 15 2008 Peter Vrabec <pvrabec at redhat.com> 3.21.9-1
 - update is fixing $AllowedSender security issue
 



From romal at fedoraproject.org  Tue Jan  6 18:38:55 2009
From: romal at fedoraproject.org (Robert M. Albrecht)
Date: Tue,  6 Jan 2009 18:38:55 +0000 (UTC)
Subject: rpms/nagios/F-10 sources,1.18,1.19
Message-ID: <20090106183855.5899D70108@cvs1.fedora.phx.redhat.com>

Author: romal

Update of /cvs/pkgs/rpms/nagios/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18423

Modified Files:
	sources 
Log Message:
New upstream release



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nagios/F-10/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources	24 Nov 2008 21:07:16 -0000	1.18
+++ sources	6 Jan 2009 18:38:24 -0000	1.19
@@ -1 +1 @@
-c607ffd5f4574cbea345bdf2e02dc480  nagios-3.0.5.tar.gz
+900e3f4164f4b2a18485420eeaefe812  nagios-3.0.6.tar.gz



From rdieter at fedoraproject.org  Tue Jan  6 18:43:06 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Tue,  6 Jan 2009 18:43:06 +0000 (UTC)
Subject: rpms/amarok/devel .cvsignore, 1.40, 1.41 amarok.spec, 1.128,
	1.129 sources, 1.41, 1.42
Message-ID: <20090106184306.5C72170140@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/amarok/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19379

Modified Files:
	.cvsignore amarok.spec sources 
Log Message:
* Tue Jan 06 2009 Rex Dieter <rdieter at fedoraproject.org> - 2.0.1-1
- amarok-2.0.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/amarok/devel/.cvsignore,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- .cvsignore	8 Dec 2008 14:03:21 -0000	1.40
+++ .cvsignore	6 Jan 2009 18:42:35 -0000	1.41
@@ -1 +1 @@
-amarok-2.0.tar.bz2
+amarok-2.0.1.tar.bz2


Index: amarok.spec
===================================================================
RCS file: /cvs/pkgs/rpms/amarok/devel/amarok.spec,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -r1.128 -r1.129
--- amarok.spec	9 Dec 2008 14:51:22 -0000	1.128
+++ amarok.spec	6 Jan 2009 18:42:35 -0000	1.129
@@ -1,8 +1,8 @@
 
 Name:    amarok
 Summary: Media player
-Version: 2.0
-Release: 2%{?dist}
+Version: 2.0.1
+Release: 1%{?dist}
 
 Group: 	 Applications/Multimedia
 License: GPLv2+
@@ -113,6 +113,9 @@
 
 
 %changelog
+* Tue Jan 06 2009 Rex Dieter <rdieter at fedoraproject.org> - 2.0.1-1
+- amarok-2.0.1
+
 * Tue Dec 09 2008 Rex Dieter <rdieter at fedoraproject.org> - 2.0-2
 - respin tarball
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/amarok/devel/sources,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- sources	9 Dec 2008 14:51:22 -0000	1.41
+++ sources	6 Jan 2009 18:42:35 -0000	1.42
@@ -1 +1 @@
-bcecfedd3976df0e8a0bd4a499b89fcb  amarok-2.0.tar.bz2
+b90f28c497ca01f08efa140d51d84eb5  amarok-2.0.1.tar.bz2



From rdieter at fedoraproject.org  Tue Jan  6 18:44:24 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Tue,  6 Jan 2009 18:44:24 +0000 (UTC)
Subject: rpms/amarok/F-10 .cvsignore, 1.40, 1.41 amarok.spec, 1.128,
	1.129 sources, 1.41, 1.42
Message-ID: <20090106184424.85AF870140@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/amarok/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20436

Modified Files:
	.cvsignore amarok.spec sources 
Log Message:
* Tue Jan 06 2009 Rex Dieter <rdieter at fedoraproject.org> - 2.0.1-1
- amarok-2.0.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/amarok/F-10/.cvsignore,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- .cvsignore	8 Dec 2008 14:51:44 -0000	1.40
+++ .cvsignore	6 Jan 2009 18:43:53 -0000	1.41
@@ -1 +1 @@
-amarok-2.0.tar.bz2
+amarok-2.0.1.tar.bz2


Index: amarok.spec
===================================================================
RCS file: /cvs/pkgs/rpms/amarok/F-10/amarok.spec,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -r1.128 -r1.129
--- amarok.spec	9 Dec 2008 14:53:20 -0000	1.128
+++ amarok.spec	6 Jan 2009 18:43:54 -0000	1.129
@@ -1,8 +1,8 @@
 
 Name:    amarok
 Summary: Media player
-Version: 2.0
-Release: 2%{?dist}
+Version: 2.0.1
+Release: 1%{?dist}
 
 Group: 	 Applications/Multimedia
 License: GPLv2+
@@ -113,6 +113,9 @@
 
 
 %changelog
+* Tue Jan 06 2009 Rex Dieter <rdieter at fedoraproject.org> - 2.0.1-1
+- amarok-2.0.1
+
 * Tue Dec 09 2008 Rex Dieter <rdieter at fedoraproject.org> - 2.0-2
 - respin tarball
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/amarok/F-10/sources,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- sources	9 Dec 2008 14:53:20 -0000	1.41
+++ sources	6 Jan 2009 18:43:54 -0000	1.42
@@ -1 +1 @@
-bcecfedd3976df0e8a0bd4a499b89fcb  amarok-2.0.tar.bz2
+b90f28c497ca01f08efa140d51d84eb5  amarok-2.0.1.tar.bz2



From scop at fedoraproject.org  Tue Jan  6 18:45:14 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Tue,  6 Jan 2009 18:45:14 +0000 (UTC)
Subject: rpms/bash-completion/devel bash-completion-20060301-man.patch, NONE,
	1.1 bash-completion-20060301-yum-available-speedup-478784.patch,
	NONE, 1.1 bash-completion-20080705-getent.patch, NONE,
	1.1 bash-completion-20080705-gzip.patch, NONE,
	1.1 bash-completion-20080705-jpeg2000-304771.patch, NONE,
	1.1 bash-completion-20080705-lzma.patch, NONE,
	1.1 bash-completion-20080705-mediafiles-444467.patch, NONE,
	1.1 bash-completion-20080705-rpm-backups.patch, NONE,
	1.1 bash-completion-20080705-rpm-installed.patch, NONE,
	1.1 bash-completion-20080705-svn-filenames-430059.patch, NONE,
	1.1 .cvsignore, 1.10, 1.11 bash-completion-lzop, 1.1,
	1.2 bash-completion-mock, 1.4, 1.5 bash-completion-plague-client,
	1.1, 1.2 bash-completion-repomanage, 1.1,
	1.2 bash-completion.spec, 1.30, 1.31 sources, 1.10,
	1.11 bash-completion-20060301-debian.patch, 1.2,
	NONE bash-completion-20060301-getent.patch, 1.1,
	NONE bash-completion-20060301-gzip.patch, 1.1,
	NONE bash-completion-20060301-jpeg2000-304771.patch, 1.1,
	NONE bash-completion-20060301-lzma.patch, 1.1,
	NONE bash-completion-20060301-mediafiles-444467.patch, 1.2,
	NONE bash-completion-20060301-perl-299571.patch, 1.1,
	NONE bash-completion-20060301-rpm-backups.patch, 1.1,
	NONE bash-completion-20060301-scp-apos-217178.patch, 1.1,
	NONE bash-completion-20060301-svn-filenames-430059.patch, 1.1, NONE
Message-ID: <20090106184514.1DEDD7013F@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/bash-completion/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21067

Modified Files:
	.cvsignore bash-completion-lzop bash-completion-mock 
	bash-completion-plague-client bash-completion-repomanage 
	bash-completion.spec sources 
Added Files:
	bash-completion-20060301-man.patch 
	bash-completion-20060301-yum-available-speedup-478784.patch 
	bash-completion-20080705-getent.patch 
	bash-completion-20080705-gzip.patch 
	bash-completion-20080705-jpeg2000-304771.patch 
	bash-completion-20080705-lzma.patch 
	bash-completion-20080705-mediafiles-444467.patch 
	bash-completion-20080705-rpm-backups.patch 
	bash-completion-20080705-rpm-installed.patch 
	bash-completion-20080705-svn-filenames-430059.patch 
Removed Files:
	bash-completion-20060301-debian.patch 
	bash-completion-20060301-getent.patch 
	bash-completion-20060301-gzip.patch 
	bash-completion-20060301-jpeg2000-304771.patch 
	bash-completion-20060301-lzma.patch 
	bash-completion-20060301-mediafiles-444467.patch 
	bash-completion-20060301-perl-299571.patch 
	bash-completion-20060301-rpm-backups.patch 
	bash-completion-20060301-scp-apos-217178.patch 
	bash-completion-20060301-svn-filenames-430059.patch 
Log Message:
* Tue Jan  6 2009 Ville Skytt?? <ville.skytta at iki.fi> - 20080705-1
- 20080705; new upstream at http://bash-completion.alioth.debian.org/
- Perl, Debian, and scp patches applied upstream.
- Patch to improve man completion: more sections, better filename handling.
- Patch to speed up yum install/deplist completion (#478784).
- Patch to fix and speed up rpm installed packages completion.
- Update mock completion.


bash-completion-20060301-man.patch:

--- NEW FILE bash-completion-20060301-man.patch ---
--- bash_completion~	2008-09-11 21:22:40.000000000 +0300
+++ bash_completion	2009-01-05 23:31:44.000000000 +0200
@@ -761,9 +761,9 @@
 
 	_expand || return 0
 
-	# default completion if parameter contains /
+	# file based completion if parameter contains /
 	if [[ "$cur" == */* ]]; then
-		_filedir
+		_filedir '@([0-9]?([px])|[ln]|man)?(.@(gz|bz2|lzma))'
 		return 0
 	fi
 
@@ -783,7 +783,7 @@
 	fi
 
 	# determine manual section to search
-	[[ "$prev" == [0-9ln] ]] && sect=$prev || sect='*'
+	[[ "$prev" == @([0-9]?([px])|[ln]) ]] && sect=$prev || sect='*'
 
 	manpath=$manpath:
 	if [ -n "$cur" ]; then
@@ -800,7 +800,14 @@
 	COMPREPLY=( ${COMPREPLY[@]%.@(gz|bz2|lzma)} )
 	COMPREPLY=( $( compgen -W '${COMPREPLY[@]%.*}' -- "${cur//\\\\/}" ) )
 
-	[[ "$prev" != [0-9ln] ]] && _filedir '[0-9ln]'
+	if [[ "$prev" != @([0-9]?([px])|[lnop]) ]]; then
+		# file based completion for the rest, prepending ./ if needed
+		local start=${#COMPREPLY[@]}
+		_filedir '@([0-9]?([px])|[ln]|man)?(.@(gz|bz2|lzma))'
+		for (( i=$start; i < ${#COMPREPLY[@]}; i++ )); do
+			[[ ${COMPREPLY[i]} == */* ]] || COMPREPLY[i]=./${COMPREPLY[i]}
+		done
+	fi
 
 	return 0
 }

bash-completion-20060301-yum-available-speedup-478784.patch:

--- NEW FILE bash-completion-20060301-yum-available-speedup-478784.patch ---
--- bash_completion~	2008-09-11 21:22:40.000000000 +0300
+++ bash_completion	2009-01-05 18:47:08.000000000 +0200
@@ -6352,7 +6352,7 @@
 	if [ -n "$special" ]; then
 	    case $special in
 		install|deplist)
-		    COMPREPLY=( $( compgen -W '$( yum -C list | cut -d" " -f1 )' -- $cur ) )
+		    COMPREPLY=( $( compgen -W "$( yum -d 0 -C list available "$cur*" | cut -d' ' -f1 )" -- $cur ) )
 		    return 0
 		    ;;
 		*)

bash-completion-20080705-getent.patch:

--- NEW FILE bash-completion-20080705-getent.patch ---
--- bash_completion~	2008-07-05 16:55:03.000000000 +0300
+++ bash_completion	2009-01-06 19:00:26.000000000 +0200
@@ -8742,19 +8742,19 @@
 			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-20080705-gzip.patch:

--- NEW FILE bash-completion-20080705-gzip.patch ---
--- bash_completion~	2008-07-05 16:55:03.000000000 +0300
+++ bash_completion	2009-01-06 19:02:34.000000000 +0200
@@ -3377,7 +3377,7 @@
 have gzip &&
 _gzip()
 {
-	local cur prev xspec IFS=$'\t\n'
+	local cur prev xspec
 
 	COMPREPLY=()
 	cur=`_get_cword`
@@ -3390,7 +3390,7 @@
 			--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-20080705-jpeg2000-304771.patch:

--- NEW FILE bash-completion-20080705-jpeg2000-304771.patch ---
--- bash_completion~	2008-07-05 16:55:03.000000000 +0300
+++ bash_completion	2009-01-06 18:39:48.000000000 +0200
@@ -99 +99 @@
-complete -f -X '!*.@(gif|jp?(e)g|miff|tif?(f)|pn[gm]|p[bgp]m|bmp|xpm|ico|xwd|tga|pcx|svg|GIF|JP?(E)G|MIFF|TIF?(F)|PN[GM]|P[BGP]M|BMP|XPM|ICO|XWD|TGA|PCX|SVG)' display
+complete -f -X '!*.@(gif|jp?(e)g|jp[2cfx]|j2k|miff|tif?(f)|pn[gm]|p[bgp]m|bmp|xpm|ico|xwd|tga|pcx|svg|GIF|JP?(E)G|JP[2CFX]|J2K|MIFF|TIF?(F)|PN[GM]|P[BGP]M|BMP|XPM|ICO|XWD|TGA|PCX|SVG)' display

bash-completion-20080705-lzma.patch:

--- NEW FILE bash-completion-20080705-lzma.patch ---
--- bash_completion~	2008-07-05 16:55:03.000000000 +0300
+++ bash_completion	2009-01-06 19:12:03.000000000 +0200
@@ -873,7 +873,7 @@
 	# 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]'
@@ -2050,7 +2050,7 @@
 		elif [[ ${COMP_WORDS[1]} == -b* ]]; then
 			_filedir 'spec'
 		else
-			_filedir '@(tgz|tar.@(gz|bz2))'
+			_filedir '@(tgz|tar.@(gz|bz2|lzma))'
 		fi
 		;;
 	--re@(build|compile))
@@ -2062,7 +2062,7 @@
 		fi
 		;;
 	--tarbuild)
-		_filedir '@(tgz|tar.@(gz|bz2))'
+		_filedir '@(tgz|tar.@(gz|bz2|lzma))'
 		;;
 	--@(re|add)sign)
 		_filedir 'rpm'
@@ -3454,6 +3454,44 @@
 } &&
 complete -F _bzip2 $filenames bzip2
 
+# lzma(1) completion
+#
+have lzma &&
+_lzma()
+{
+	local cur prev xspec
+
+	COMPREPLY=()
+	cur=`_get_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 && {
@@ -7331,7 +7369,7 @@
 		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-20080705-mediafiles-444467.patch:

--- NEW FILE bash-completion-20080705-mediafiles-444467.patch ---
--- bash_completion~	2008-07-05 16:55:03.000000000 +0300
+++ bash_completion	2009-01-06 18:55:49.000000000 +0200
@@ -112 +112 @@
-complete -f -X '!*.@(mp?(e)g|MP?(E)G|wma|avi|AVI|asf|vob|VOB|bin|dat|divx|DIVX|vcd|ps|pes|fli|flv|FLV|viv|rm|ram|yuv|mov|MOV|qt|QT|wmv|mp3|MP3|m4[pv]|M4[PV]|ogg|OGG|ogm|OGM|mp4|MP4|wav|WAV|asx|ASX|mng|MNG|srt)' xine aaxine fbxine kaffeine
+complete -f -X '!*@(.@(mp?(e)g|MP?(E)G|wm[av]|WM[AV]|avi|AVI|as[fx]|AS[FX]|vob|VOB|bin|BIN|dat|DAT|divx|DIVX|vcd|VCD|p?(e)s|P?(E)S|fl[iv]|FL[IV]|viv|VIV|rm?(j)|RM?(J)|ra?(m)|RA?(M)|yuv|YUV|mov|MOV|qt|QT|mp[234]|MP[234]|m4[pv]|M4[PV]|og[gm]|OG[GM]|wav|WAV|mng|MNG|srt|SRT|mkv|MKV|[0-9]*.@(vdr|VDR))' xine aaxine fbxine kaffeine
@@ -6090 +6090 @@
-			_filedir '@(mp?(e)g|MP?(E)G|wm[av]|WM[AV]|avi|AVI|asf|ASF|vob|VOB|bin|BIN|dat|DAT|vcd|VCD|ps|PS|pes|PES|fl[iv]|FL[IV]|viv|VIV|rm?(j)|RM?(J)|ra?(m)|RA?(M)|yuv|YUV|mov|MOV|qt|QT|mp[34]|MP[34]|m4[av]|M4[AV]|og[gm]|OG[GM]|w?(a)v|W?(A)V|dump|DUMP|mk[av]|MK[AV]|m4a|M4A|aac|AAC|m2v|M2V|dv|DV|rmvb|RMVB|mid|MID|ts|TS|3g[p2]|mpc|MPC|flac|FLAC|vro|VRO|divx|DIVX|aif?(f)|AIF?(F)|m2ts|M2TS)'
+			_filedir '@(mp?(e)g|MP?(E)G|wm[av]|WM[AV]|avi|AVI|asf|ASF|vob|VOB|bin|BIN|dat|DAT|vcd|VCD|p?(e)s|P?(E)S|fl[iv]|FL[IV]|viv|VIV|rm?(j)|RM?(J)|ra?(m)|RA?(M)|yuv|YUV|mov|MOV|qt|QT|mp[234]|MP[234]|m4[av]|M4[AV]|og[gm]|OG[GM]|w?(a)v|W?(A)V|dump|DUMP|mk[av]|MK[AV]|m4a|M4A|aac|AAC|m2v|M2V|dv|DV|rmvb|RMVB|mid|MID|ts|TS|3g[p2]|3G[P2]|mpc|MPC|flac|FLAC|vro|VRO|divx|DIVX|aif?(f)|AIF?(F)|m2ts|M2TS|vdr|VDR)'

bash-completion-20080705-rpm-backups.patch:

--- NEW FILE bash-completion-20080705-rpm-backups.patch ---
--- bash_completion~	2009-01-06 19:12:03.000000000 +0200
+++ bash_completion	2009-01-06 19:23:35.000000000 +0200
@@ -424,10 +424,10 @@
 	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 ) )
@@ -9080,7 +9080,7 @@
     [ -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 )
 
@@ -9146,7 +9146,7 @@
     [ -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 )
 
@@ -9700,7 +9700,7 @@
 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-20080705-rpm-installed.patch:

--- NEW FILE bash-completion-20080705-rpm-installed.patch ---
--- bash_completion~	2009-01-06 19:12:03.000000000 +0200
+++ bash_completion	2009-01-06 19:31:06.000000000 +0200
@@ -1811,29 +1811,28 @@
 #
 _rpm_installed_packages()
 {
-	local ver nodig nosig
+	local ver nodig="$1" nosig="$2"
 
 	if [ -r /var/log/rpmpkgs -a \
 		/var/log/rpmpkgs -nt /var/lib/rpm/Packages ]; then
 		# using RHL 7.2 or later - this is quicker than querying the DB
 		COMPREPLY=( $( sed -ne \
-		's|^\('$cur'.*\)-[0-9a-zA-Z._]\+-[0-9a-z.@]\+.*\.rpm$|\1|p' \
+		's|^\('$cur'[^[:space:]]*\)-[^[:space:]-]\+-[^[:space:]-]\+\.rpm$|\1|p' \
 				/var/log/rpmpkgs ) )
 	else
-		nodig=""
-		nosig=""
-		ver=$(rpm --version)
-		ver=${ver##* }
+		if [ -z "$nodig" -a -z "$nosig" ]; then
+			ver=$(rpm --version)
+			ver=${ver##* }
 
-		if [[ "$ver" > "4.0.4" ]]; then
-			nodig="--nodigest"
-		fi
-		if [[ "$ver" > "4.0.99" ]]; then
-			nosig="--nosignature"
+			if [[ "$ver" > "4.0.4" ]]; then
+				nodig="--nodigest"
+			fi
+			if [[ "$ver" > "4.0.99" ]]; then
+				nosig="--nosignature"
+			fi
 		fi
 
-		COMPREPLY=( $( rpm -qa $nodig $nosig | sed -ne \
-		's|^\('$cur'.*\)-[0-9a-zA-Z._]\+-[0-9a-z.@]\+$|\1|p' ) )
+		COMPREPLY=( $( rpm -qa $nodig $nosig --qf='%{NAME} ' "$cur*" ) )
 	fi
 }
 
@@ -1959,7 +1958,7 @@
 			COMPREPLY=( $( compgen -W '--allmatches --noscripts \
 			--notriggers --nodeps --test --repackage' -- $cur ) )
 		else
-			_rpm_installed_packages
+			_rpm_installed_packages "$nodig" "$nosig"
 		fi
 		;;
 	-@(q*|-query))
@@ -2011,7 +2010,7 @@
 				--fileid --tid --nodigest --nosignature \
 				--triggerscripts' -- $cur ) )
 			elif [ "${COMP_LINE#* -*([^ -])a}" == "$COMP_LINE" ]; then
-				_rpm_installed_packages
+				_rpm_installed_packages "$nodig" "$nosig"
 			fi
 		fi
 		;;
@@ -2038,7 +2037,7 @@
 		elif [ "${COMP_LINE#* -*([^ -])p}" != "$COMP_LINE" ]; then
 			_filedir 'rpm'
 		else
-			_rpm_installed_packages
+			_rpm_installed_packages "$nodig" "$nosig"
 		fi
 		;;
 	-[bt]*)
@@ -2068,7 +2067,7 @@
 		_filedir 'rpm'
 		;;
 	--set@(perms|gids))
-		_rpm_installed_packages
+		_rpm_installed_packages "$nodig" "$nosig"
 		;;
 	--@(clean|rms@(ource|pec)))
 		if [[ "$cur" == -* ]]; then

bash-completion-20080705-svn-filenames-430059.patch:

--- NEW FILE bash-completion-20080705-svn-filenames-430059.patch ---
--- bash_completion~	2008-07-05 16:55:03.000000000 +0300
+++ bash_completion	2009-01-06 18:58:11.000000000 +0200
@@ -9446,7 +9446,7 @@
 
 	return 0
 }
-complete -F _svn $default svn
+complete -F _svn $filenames svn
 
 _svnadmin()
 {


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bash-completion/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	2 Mar 2006 21:12:24 -0000	1.10
+++ .cvsignore	6 Jan 2009 18:44:43 -0000	1.11
@@ -1 +1 @@
-bash-completion-20060301.tar.bz2
+bash-completion_20080705.tar.gz


Index: bash-completion-lzop
===================================================================
RCS file: /cvs/pkgs/rpms/bash-completion/devel/bash-completion-lzop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- bash-completion-lzop	11 Sep 2008 18:20:09 -0000	1.1
+++ bash-completion-lzop	6 Jan 2009 18:44:43 -0000	1.2
@@ -6,7 +6,7 @@
 	local cur prev xspec IFS=$' \t\n'
 
 	COMPREPLY=()
-	cur=${COMP_WORDS[COMP_CWORD]}
+	cur=`_get_cword`
 	prev=${COMP_WORDS[COMP_CWORD-1]}
 
 	if [[ "$cur" == -* ]]; then


Index: bash-completion-mock
===================================================================
RCS file: /cvs/pkgs/rpms/bash-completion/devel/bash-completion-mock,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- bash-completion-mock	30 Dec 2007 22:23:36 -0000	1.4
+++ bash-completion-mock	6 Jan 2009 18:44:43 -0000	1.5
@@ -7,13 +7,13 @@
     local cur prev plugins cfgdir
 
     COMPREPLY=()
-    cur=${COMP_WORDS[COMP_CWORD]}
+    cur=`_get_cword`
     prev=${COMP_WORDS[COMP_CWORD-1]}
     plugins='ccache yum_cache root_cache bind_mount'
     cfgdir=/etc/mock
 
     count=0
-    for i in ${COMP_WORDS[@]} ; do
+    for i in "${COMP_WORDS[@]}" ; do
         [ $count -eq $COMP_CWORD ] && break
         if [[ "$i" == --configdir ]] ; then
             cfgdir="${COMP_WORDS[((count+1))]}"
@@ -24,7 +24,7 @@
     done
 
     case $prev in
-        -r)
+        -@(-root|r))
             COMPREPLY=( $( command ls $cfgdir | \
                 sed -ne 's/^\('$cur'.*\)\.cfg$/\1/p') )
             return 0
@@ -47,19 +47,20 @@
                 COMPREPLY=( $( compgen -W "$plugins" -- $cur ) )
                 return 0
                 ;;
-            --@(arch|define|with|without|uniqueext|rpmbuild_timeout))
+            --@(arch|target|define|with|without|uniqueext|rpmbuild_timeout|cwd))
                 return 0
                 ;;
         esac
     fi
 
     if [[ "$cur" == -* ]] ; then
-        COMPREPLY=( $( compgen -W '--version -h --help --rebuild --chroot \
-            --shell --clean --init --installdeps --install --update \
-            --orphanskill -r --offline --no-clean --cleanup-after \
-            --no-cleanup-after --arch= --define= --with= --without= \
-            --resultdir= --uniqueext= --configdir= --rpmbuild_timeout -v \
-            --verbose -q --quiet --trace --enable-plugin= --disable-plugin=' \
+        COMPREPLY=( $( compgen -W '--version -h --help --rebuild --shell \
+            --chroot --clean --init --installdeps --install --update \
+            --orphanskill -r --root= --offline --no-clean --cleanup-after \
+            --no-cleanup-after --arch= --target= -D --define= --with= \
+            --without= --resultdir= --uniqueext= --configdir= \
+            --rpmbuild_timeout --unpriv --cwd= -v --verbose -q --quiet \
+            --trace --enable-plugin= --disable-plugin= --print-root-path' \
             -- $cur ) )
     else
         _filedir '?(no)src.rpm'


Index: bash-completion-plague-client
===================================================================
RCS file: /cvs/pkgs/rpms/bash-completion/devel/bash-completion-plague-client,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- bash-completion-plague-client	28 Nov 2005 20:26:32 -0000	1.1
+++ bash-completion-plague-client	6 Jan 2009 18:44:43 -0000	1.2
@@ -5,7 +5,7 @@
     local cur
 
     COMPREPLY=()
-    cur=${COMP_WORDS[COMP_CWORD]}
+    cur=`_get_cword`
 
     [ $COMP_CWORD = 1 ] && \
     COMPREPLY=( $( compgen -W 'build detail finish help is_paused kill list \


Index: bash-completion-repomanage
===================================================================
RCS file: /cvs/pkgs/rpms/bash-completion/devel/bash-completion-repomanage,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- bash-completion-repomanage	28 Nov 2005 20:26:32 -0000	1.1
+++ bash-completion-repomanage	6 Jan 2009 18:44:43 -0000	1.2
@@ -5,7 +5,7 @@
     local cur prev
 
     COMPREPLY=()
-    cur=${COMP_WORDS[COMP_CWORD]}
+    cur=`_get_cword`
     prev=${COMP_WORDS[COMP_CWORD-1]}
 
     case $prev in


Index: bash-completion.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bash-completion/devel/bash-completion.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- bash-completion.spec	2 Oct 2008 19:27:50 -0000	1.30
+++ bash-completion.spec	6 Jan 2009 18:44:43 -0000	1.31
@@ -1,27 +1,27 @@
 Name:           bash-completion
-Version:        20060301
-Release:        13
+Version:        20080705
+Release:        1
 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
+URL:            http://bash-completion.alioth.debian.org/
+Source0:        http://ftp.debian.org/debian/pool/main/b/bash-completion/%{name}_%{version}.tar.gz
 Source1:        %{name}-lzop
 Source2:        %{name}-mock
 Source3:        %{name}-repomanage
 Source4:        %{name}-plague-client
-Patch0:         %{name}-20060301-scp-apos-217178.patch
-Patch1:         %{name}-20060301-debian.patch
-Patch2:         %{name}-20060301-perl-299571.patch
-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
+Patch0:         %{name}-20080705-rpm-installed.patch
+Patch1:         %{name}-20060301-yum-available-speedup-478784.patch
+Patch2:         %{name}-20060301-man.patch
+Patch3:         %{name}-20080705-jpeg2000-304771.patch
+Patch4:         %{name}-20080705-mediafiles-444467.patch
+Patch5:         %{name}-20080705-svn-filenames-430059.patch
+Patch6:         %{name}-20080705-gzip.patch
+Patch7:         %{name}-20080705-lzma.patch
+Patch8:         %{name}-20080705-rpm-backups.patch
 Patch9:         %{name}-20060301-rpm-eval.patch
-Patch10:        %{name}-20060301-getent.patch
+Patch10:        %{name}-20080705-getent.patch
 Patch11:        %{name}-20060301-sqlite.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -34,20 +34,19 @@
 
 
 %prep
-%setup -q -n bash_completion
+%setup -q -n %{name}
 %patch0
 %patch1
 %patch2
 %patch3
 %patch4
 %patch5
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
+%patch6
+%patch7
+%patch8
 %patch9 -p1
-%patch10 -p1
+%patch10
 %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
@@ -211,7 +210,7 @@
 
 %files -f %{name}-ghosts.list
 %defattr(-,root,root,-)
-%doc BUGS Changelog COPYING README
+%doc README TODO debian/changelog debian/copyright
 %config(noreplace) %{_sysconfdir}/profile.d/bash_completion.sh
 %{_sysconfdir}/bash_completion
 %dir %{_sysconfdir}/bash_completion.d/
@@ -219,6 +218,14 @@
 
 
 %changelog
+* Tue Jan  6 2009 Ville Skytt?? <ville.skytta at iki.fi> - 20080705-1
+- 20080705; new upstream at http://bash-completion.alioth.debian.org/
+- Perl, Debian, and scp patches applied upstream.
+- Patch to improve man completion: more sections, better filename handling.
+- Patch to speed up yum install/deplist completion (#478784).
+- Patch to fix and speed up rpm installed packages completion.
+- Update mock completion.
+
 * Thu Sep 25 2008 Ville Skytt?? <ville.skytta at iki.fi>
 - More Matroska associations (#463829, based on patch from Yanko Kaneti).
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bash-completion/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	2 Mar 2006 21:12:24 -0000	1.10
+++ sources	6 Jan 2009 18:44:43 -0000	1.11
@@ -1 +1 @@
-ed95a89f57357a42b8e4eb95487bf9d0  bash-completion-20060301.tar.bz2
+8bc36281bb0567bc67a9083c4c5595a9  bash-completion_20080705.tar.gz


--- bash-completion-20060301-debian.patch DELETED ---


--- bash-completion-20060301-getent.patch DELETED ---


--- bash-completion-20060301-gzip.patch DELETED ---


--- bash-completion-20060301-jpeg2000-304771.patch DELETED ---


--- bash-completion-20060301-lzma.patch DELETED ---


--- bash-completion-20060301-mediafiles-444467.patch DELETED ---


--- bash-completion-20060301-perl-299571.patch DELETED ---


--- bash-completion-20060301-rpm-backups.patch DELETED ---


--- bash-completion-20060301-scp-apos-217178.patch DELETED ---


--- bash-completion-20060301-svn-filenames-430059.patch DELETED ---



From rvinyard at fedoraproject.org  Tue Jan  6 18:48:57 2009
From: rvinyard at fedoraproject.org (Rick L. Vinyard, Jr.)
Date: Tue,  6 Jan 2009 18:48:57 +0000 (UTC)
Subject: rpms/bit/devel bit.spec,1.12,1.13
Message-ID: <20090106184857.1BA1270108@cvs1.fedora.phx.redhat.com>

Author: rvinyard

Update of /cvs/pkgs/rpms/bit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23767

Modified Files:
	bit.spec 
Log Message:



Index: bit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bit/devel/bit.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- bit.spec	3 Nov 2008 19:49:42 -0000	1.12
+++ bit.spec	6 Jan 2009 18:48:26 -0000	1.13
@@ -1,7 +1,7 @@
-Summary:          Bit is a C++ library to simplify bit stream parsing
+Summary:          C++ library to simplify bit stream parsing
 Name:             bit
 Version:          0.4.90
-Release:          2%{?dist}
+Release:          3%{?dist}
 License:          GPLv3
 URL:              http://libbit.sourceforge.net
 Group:            System Environment/Libraries
@@ -21,7 +21,7 @@
 fields that are not necessarily octet (byte) oriented.
 
 %package          devel
-Summary:          Support files for developing programs that will use the bit library
+Summary:          C++ development files to simplify bit stream parsing
 Group:            Development/Libraries
 Requires:         bit = %{version}-%{release}
 Requires:         libxml++-devel >= 2.10.0
@@ -37,7 +37,7 @@
 developing applications that use the bit library.
 
 %package          gtkmm
-Summary:          This library contains gtkmm UI widgets to support the bit library
+Summary:          Gtkmm UI widgets to support bit stream processing
 Group:            System Environment/Libraries
 Requires:         bit = %{version}-%{release}
 Provides:         bitgtkmm = %{version}
@@ -47,7 +47,7 @@
 This package contains gtkmm widgets associated with the bit library.
 
 %package          gtkmm-devel
-Summary:          Support files for gtkmm applications that will use the bit-gtkmm UI widgets
+Summary:          Development files to support gtkmm UI widgets for bit stream processing
 Group:            Development/Libraries
 Requires:         bit-gtkmm = %{version}-%{release}
 Requires:         gtkmm24-devel >= 2.6.0
@@ -117,6 +117,9 @@
 %doc %{_datadir}/gtk-doc/html/bit-gtkmm/
 
 %changelog
+* Tue Jan 06 2009 Rick L Vinyard Jr <rvinyard at cs.nmsu.edu> - 0.4.90-3
+- Updated summaries
+
 * Mon Nov 03 2008 Rick L Vinyard Jr <rvinyard at cs.nmsu.edu> - 0.4.90-2
 - Excluded ppc and ppc64 arches
 



From caillon at fedoraproject.org  Tue Jan  6 19:00:43 2009
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Tue,  6 Jan 2009 19:00:43 +0000 (UTC)
Subject: rpms/epiphany/devel epiphany-2.24-moz191.patch, NONE,
	1.1 epiphany.spec, 1.210, 1.211
Message-ID: <20090106190043.1575570108@cvs1.fedora.phx.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/epiphany/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27660

Modified Files:
	epiphany.spec 
Added Files:
	epiphany-2.24-moz191.patch 
Log Message:
* Tue Jan 06 2009 Christopher Aillon <caillon at redhat.com> - 2.24.2.1-4
- Rebuild against newer gecko


epiphany-2.24-moz191.patch:

--- NEW FILE epiphany-2.24-moz191.patch ---
diff -up epiphany-2.24.2.1/embed/mozilla/EphyBrowser.cpp.moz191 epiphany-2.24.2.1/embed/mozilla/EphyBrowser.cpp
--- epiphany-2.24.2.1/embed/mozilla/EphyBrowser.cpp.moz191	2008-10-20 17:10:43.000000000 -0400
+++ epiphany-2.24.2.1/embed/mozilla/EphyBrowser.cpp	2009-01-06 13:49:11.000000000 -0500
@@ -66,7 +66,6 @@
 #include <nsIDOMWindow2.h>
 #include <nsIDOMXMLDocument.h>
 #include <nsIDOMLocation.h>
-#include <nsIDOMNSLocation.h>
 #include <nsIHistoryEntry.h>
 #include <nsIInterfaceRequestor.h>
 #include <nsIInterfaceRequestorUtils.h>
@@ -700,9 +699,6 @@ EphyCommandEventListener::HandleEvent (n
         if (NS_FAILED (rv))
             return NS_OK;
 
-        nsCOMPtr<nsIDOMNSLocation> domNSLocation (do_QueryInterface (domLocation));
-        NS_ENSURE_TRUE (domNSLocation, NS_OK);
-
         nsString locationHref;
         domLocation->GetHref (locationHref);
 
@@ -736,7 +732,7 @@ EphyCommandEventListener::HandleEvent (n
         params->GetExceptionAdded (&exceptionAdded);
         g_print ("exceptionAdded %d\n", exceptionAdded);
         if (exceptionAdded)
-                return domNSLocation->Reload ();
+                return domLocation->Reload (PR_FALSE);
 
 
         return NS_OK;
diff -up epiphany-2.24.2.1/embed/mozilla/EventContext.cpp.moz191 epiphany-2.24.2.1/embed/mozilla/EventContext.cpp
--- epiphany-2.24.2.1/embed/mozilla/EventContext.cpp.moz191	2008-05-23 17:12:06.000000000 -0400
+++ epiphany-2.24.2.1/embed/mozilla/EventContext.cpp	2009-01-06 13:49:11.000000000 -0500
@@ -67,6 +67,7 @@
 
 #ifdef ALLOW_PRIVATE_API
 #include <nsIDOMNSEvent.h>
+#include <nsIDOMNSElement.h>
 #include <nsIDOMNSHTMLElement.h>
 #include <nsIDOMViewCSS.h>
 #include <nsIDOMViewCSS.h>
@@ -666,20 +667,21 @@ nsresult EventContext::GetCSSBackground 
 nsresult EventContext::GetTargetCoords (nsIDOMEventTarget *aTarget, PRInt32 *aX, PRInt32 *aY)
 {
 	/* Calculate the node coordinates relative to the widget origin */
-	nsCOMPtr<nsIDOMNSHTMLElement> elem (do_QueryInterface(aTarget));
+	nsCOMPtr<nsIDOMNSHTMLElement> nsHTMLElem (do_QueryInterface(aTarget));
 
 	PRInt32 x = 0, y = 0;
-	while (elem)
+	while (nsHTMLElem)
 	{
 		PRInt32 val;
-		elem->GetOffsetTop(&val);	y += val;
-		elem->GetScrollTop(&val);	y -= val;
-		elem->GetOffsetLeft(&val);	x += val;
-		elem->GetScrollLeft(&val);	x -= val;
+		nsCOMPtr<nsIDOMNSElement> nsElem (do_QueryInterface(nsHTMLElem));
+		nsHTMLElem->GetOffsetTop(&val);		y += val;
+		nsElem->GetScrollTop(&val);		y -= val;
+		nsHTMLElem->GetOffsetLeft(&val);	x += val;
+		nsElem->GetScrollLeft(&val);	x -= val;
 
 		nsCOMPtr<nsIDOMElement> parent;
-		elem->GetOffsetParent (getter_AddRefs (parent));
-		elem = do_QueryInterface(parent);
+		nsHTMLElem->GetOffsetParent (getter_AddRefs (parent));
+		nsHTMLElem = do_QueryInterface(parent);
 	}
 
 	*aX = x;
diff -up epiphany-2.24.2.1/plugins/desktop-file/plugin.cpp.moz191 epiphany-2.24.2.1/plugins/desktop-file/plugin.cpp
--- epiphany-2.24.2.1/plugins/desktop-file/plugin.cpp.moz191	2008-08-03 08:23:09.000000000 -0400
+++ epiphany-2.24.2.1/plugins/desktop-file/plugin.cpp	2009-01-06 13:51:23.000000000 -0500
@@ -34,7 +34,8 @@
 
 #include "ephy-stock-icons.h"
 
-#include <npupp.h>
+#include <npapi.h>
+#include <npfunctions.h>
 #include <nsCOMPtr.h>
 #include <nsIDOMWindow.h>
 #include "../../embed/mozilla/EphyUtils.h"
@@ -528,20 +529,20 @@ NP_Initialize (NPNetscapeFuncs *moz_func
 
 	plugin_funcs->size = sizeof (NPPluginFuncs);
 	plugin_funcs->version = (NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR;
-	plugin_funcs->newp = NewNPP_NewProc (plugin_new_instance);
-	plugin_funcs->destroy = NewNPP_DestroyProc (plugin_destroy_instance);
-	plugin_funcs->setwindow = NewNPP_SetWindowProc (NULL);
-	plugin_funcs->newstream = NewNPP_NewStreamProc (plugin_new_stream);
-	plugin_funcs->destroystream = NewNPP_DestroyStreamProc (plugin_destroy_stream);
-	plugin_funcs->asfile = NewNPP_StreamAsFileProc (plugin_stream_as_file);
-	plugin_funcs->writeready = NewNPP_WriteReadyProc (plugin_write_ready);
-	plugin_funcs->write = NewNPP_WriteProc (plugin_write);
-	plugin_funcs->print = NewNPP_PrintProc (NULL);
-	plugin_funcs->event = NewNPP_HandleEventProc (NULL);
-	plugin_funcs->urlnotify = NewNPP_URLNotifyProc (NULL);
+	plugin_funcs->newp = NPP_NewProcPtr (plugin_new_instance);
+	plugin_funcs->destroy = NPP_DestroyProcPtr (plugin_destroy_instance);
+	plugin_funcs->setwindow = NPP_SetWindowProcPtr (NULL);
+	plugin_funcs->newstream = NPP_NewStreamProcPtr (plugin_new_stream);
+	plugin_funcs->destroystream = NPP_DestroyStreamProcPtr (plugin_destroy_stream);
+	plugin_funcs->asfile = NPP_StreamAsFileProcPtr (plugin_stream_as_file);
+	plugin_funcs->writeready = NPP_WriteReadyProcPtr (plugin_write_ready);
+	plugin_funcs->write = NPP_WriteProcPtr (plugin_write);
+	plugin_funcs->print = NPP_PrintProcPtr (NULL);
+	plugin_funcs->event = NPP_HandleEventProcPtr (NULL);
+	plugin_funcs->urlnotify = NPP_URLNotifyProcPtr (NULL);
 	plugin_funcs->javaClass = NULL;
-	plugin_funcs->getvalue = NewNPP_GetValueProc (plugin_get_value);
-	plugin_funcs->setvalue = NewNPP_SetValueProc (NULL);
+	plugin_funcs->getvalue = NPP_GetValueProcPtr (plugin_get_value);
+	plugin_funcs->setvalue = NPP_SetValueProcPtr (NULL);
 
 	return NPERR_NO_ERROR;
 }


Index: epiphany.spec
===================================================================
RCS file: /cvs/extras/rpms/epiphany/devel/epiphany.spec,v
retrieving revision 1.210
retrieving revision 1.211
diff -u -r1.210 -r1.211
--- epiphany.spec	23 Dec 2008 05:31:08 -0000	1.210
+++ epiphany.spec	6 Jan 2009 19:00:12 -0000	1.211
@@ -1,4 +1,4 @@
-%define gecko_ver 1.9.0.5
+%define gecko_ver 1.9.1
 %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: Web browser for GNOME
 Name: epiphany
 Version: 2.24.2.1
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2+ and GFDL
 Group: Applications/Internet
 URL: http://www.gnome.org/projects/epiphany/
@@ -51,6 +51,7 @@
 Patch2: epiphany-2.18.1-default-bookmarks.patch
 # https://bugzilla.redhat.com/show_bug.cgi?id=334751
 Patch3: epiphany-2.20.1-wrapped-plugins.patch
+Patch4: epiphany-2.24-moz191.patch
 
 %description
 Epiphany is the web browser for the GNOME desktop. Its goal is to be
@@ -98,6 +99,7 @@
 %patch1 -p1 -b .use-pango
 %patch2 -p1 -b .default-bookmarks
 %patch3 -p1 -b .wrapped-plugins
+%patch4 -p1 -b .moz191
 # Fedora Epiphany version
 cat >> data/default-prefs-common.js << EOF
 pref("general.useragent.vendor", "Fedora");
@@ -246,6 +248,9 @@
 %{_datadir}/pygtk/2.0/defs/epiphany.defs
 
 %changelog
+* Tue Jan 06 2009 Christopher Aillon <caillon at redhat.com> - 2.24.2.1-4
+- Rebuild against newer gecko
+
 * Tue Dec 23 2008 Matthias Clasen <mclasen at redhat.com> - 2.24.2.1-3
 - Rebuild against newer gecko
 



From limb at fedoraproject.org  Tue Jan  6 19:09:13 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Tue,  6 Jan 2009 19:09:13 +0000 (UTC)
Subject: rpms/lilypond-doc/devel .cvsignore, 1.12, 1.13 lilypond-doc.spec,
	1.11, 1.12 sources, 1.12, 1.13
Message-ID: <20090106190913.DBDF070108@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/lilypond-doc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30197

Modified Files:
	.cvsignore lilypond-doc.spec sources 
Log Message:
New upstream.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/lilypond-doc/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	29 Dec 2008 18:32:34 -0000	1.12
+++ .cvsignore	6 Jan 2009 19:08:43 -0000	1.13
@@ -1 +1 @@
-lilypond-2.12.0-1.documentation.tar.bz2
+lilypond-2.12.1-1.documentation.tar.bz2


Index: lilypond-doc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lilypond-doc/devel/lilypond-doc.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- lilypond-doc.spec	29 Dec 2008 18:32:34 -0000	1.11
+++ lilypond-doc.spec	6 Jan 2009 19:08:43 -0000	1.12
@@ -1,5 +1,5 @@
 Name:           lilypond-doc
-Version:        2.12.0
+Version:        2.12.1
 Release:        1%{?dist}
 Summary:        HTML documentation for LilyPond
 
@@ -45,6 +45,9 @@
 
 
 %changelog
+* Tue Jan 06 2009 Jon Ciesla <limb at jcomserv.net> 2.12.1-1
+- Update to 2.12.1.
+
 * Mon Dec 29 2008 Jon Ciesla <limb at jcomserv.net> 2.12.0-1
 - Update to 2.12.0.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/lilypond-doc/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	29 Dec 2008 18:32:34 -0000	1.12
+++ sources	6 Jan 2009 19:08:43 -0000	1.13
@@ -1 +1 @@
-131061ce9055fa5b0d1907713bdde611  lilypond-2.12.0-1.documentation.tar.bz2
+11defaf7144c76b8a1f137f4a8030761  lilypond-2.12.1-1.documentation.tar.bz2



From s4504kr at fedoraproject.org  Tue Jan  6 19:18:12 2009
From: s4504kr at fedoraproject.org (Jochen Schmitt)
Date: Tue,  6 Jan 2009 19:18:12 +0000 (UTC)
Subject: rpms/blender/devel blender.spec,1.96,1.97
Message-ID: <20090106191812.7F8BE70125@cvs1.fedora.phx.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/blender/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv587

Modified Files:
	blender.spec 
Log Message:
Remove BuildArch: noarch from subpackage


Index: blender.spec
===================================================================
RCS file: /cvs/extras/rpms/blender/devel/blender.spec,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -r1.96 -r1.97
--- blender.spec	6 Jan 2009 18:33:35 -0000	1.96
+++ blender.spec	6 Jan 2009 19:17:42 -0000	1.97
@@ -5,7 +5,7 @@
 
 Name:           blender
 Version:        2.48a
-Release: 	8%{?dist}
+Release: 	9%{?dist}
 
 Summary:        3D modeling, animation, rendering and post-production
 
@@ -79,7 +79,6 @@
 
 %package fonts
 Summary:	Fonts for the blender package
-BuildArch:	noarch
 Requires:	fontpackages-filesystem
 Group:		User Interface/X
 License:	Bitstream Veta Fonts
@@ -209,7 +208,7 @@
 %{_fontdir}/
 
 %changelog
-* Tue Jan  6 2009 Jochen Schmitt <Jochen herr-schmitt de> 2.48a-8
+* Tue Jan  6 2009 Jochen Schmitt <Jochen herr-schmitt de> 2.48a-9
 - Create fonts sub-package (#477370)
 
 * Sat Dec 27 2008 Lubomir Rintel <lkundrak at v3.sk> 2.48a-7



From rdieter at fedoraproject.org  Tue Jan  6 19:21:13 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Tue,  6 Jan 2009 19:21:13 +0000 (UTC)
Subject: rpms/kdiff3/devel kdiff3.spec,1.17,1.18
Message-ID: <20090106192113.BB2C870108@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdiff3/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3644

Modified Files:
	kdiff3.spec 
Log Message:
* Tue Jan  6 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.9.93-6
- use kde4 macros
- add scriptlets for locolor icons
- update d-f-i usage
- include khelpcenter handbook
- update Source0 URL



Index: kdiff3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdiff3/devel/kdiff3.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- kdiff3.spec	6 Jan 2009 18:26:29 -0000	1.17
+++ kdiff3.spec	6 Jan 2009 19:20:43 -0000	1.18
@@ -1,17 +1,21 @@
 Name:           kdiff3
 Version:        0.9.93
-Release: 	5%{?dist}
+Release: 	6%{?dist}
 Summary:        Compare + merge 2 or 3 files or directories
 
 Group:          Development/Tools
 License:        GPLv2
 URL:            http://kdiff3.sourceforge.net/
-Source0:        http://dl.sourceforge.net/sourceforge/kdiff3/%{name}-%{version}.tar.gz
-Patch0:		kdiff3part.desktop.diff
+Source0:        http://downloads.sourceforge.net/sourceforge/kdiff3/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:	gettext cmake
 
-BuildRequires:  kdebase-devel, kdelibs-devel, desktop-file-utils
+# What's the purpose of this patch?  -- Rex 
+Patch0:         kdiff3part.desktop.diff
+
+BuildRequires:  desktop-file-utils
+BuildRequires:  gettext
+BuildRequires:  kdelibs4-devel
+BuildRequires:  kdebase4-devel
 
 %description
 KDiff3 is a program that
@@ -27,21 +31,22 @@
 %setup -q
 %patch0 -p1
 
+
 %build
-#%configure \
-#         --disable-rpath
+mkdir -p %{_target_platform}
+pushd %{_target_platform}
+%{cmake_kde4} ..
+popd
 
-%{cmake_kde4}
+make %{?_smp_mflags} -C %{_target_platform} VERBOSE=1
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
 
-HTML_DIR=%{_kde4_datadir}/doc/HTML
+make -C %{_target_platform} install/fast DESTDIR=$RPM_BUILD_ROOT
 
-# this is junk
-rm -rf $RPM_BUILD_ROOT$HTML_DIR/%{name} 
+HTML_DIR=%{_kde4_docdir}/HTML
 
 # locale's
 %find_lang %{name} || touch %{name}.lang
@@ -65,41 +70,53 @@
 fi
 
 # Desktop.
-mkdir -p $RPM_BUILD_ROOT%{_kde4_datadir}/applications $RPM_BUILD_ROOT%{_kde4_datadir}/kde4/apps $RPM_BUILD_ROOT%{_kde4_datadir}/kde4/services
-
-desktop-file-install --vendor fedora \
-    --dir $RPM_BUILD_ROOT%{_kde4_datadir}/kde4/services \
+desktop-file-install --vendor="" \
+    --dir=$RPM_BUILD_ROOT%{_kde4_datadir}/kde4/services \
     $RPM_BUILD_ROOT%{_kde4_datadir}/kde4/services/kdiff3part.desktop
 
-desktop-file-install  --vendor fedora \
-    --dir $RPM_BUILD_ROOT%{_kde4_datadir}/applications/kde4  \
-    --add-category Development \
-    --add-category X-Fedora \
-    --delete-original \
+desktop-file-install  --vendor="" \
+    --dir=$RPM_BUILD_ROOT%{_kde4_datadir}/applications/kde4  \
+    --add-category=Development \
         $RPM_BUILD_ROOT%{_kde4_datadir}/applications/kde4/kdiff3.desktop
 
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+
 %post
-touch --no-create %{_kde4_datadir}/icons/hicolor || :
-%{_bindir}/gtk-update-icon-cache --quiet %{_kde4_datadir}/icons/hicolor || :
+touch --no-create %{_kde4_iconsdir}/hicolor || :
+touch --no-create %{_kde4_iconsdir}/locolor || :
+%{_bindir}/gtk-update-icon-cache --quiet %{_kde4_iconsdir}/icons/hicolor 2> /dev/null || :
+%{_bindir}/gtk-update-icon-cache --quiet %{_kde4_iconsdir}/icons/locolor 2> /dev/null || :
 
 %postun
-touch --no-create %{_kde4_datadir}/icons/hicolor || :
-%{_bindir}/gtk-update-icon-cache --quiet %{_kde4_datadir}/icons/hicolor || :
+touch --no-create %{_kde4_iconsdir}/hicolor || :
+touch --no-create %{_kde4_iconsdir}/locolor || :
+%{_bindir}/gtk-update-icon-cache --quiet %{_kde4_iconsdir}/icons/hicolor 2> /dev/null || :
+%{_bindir}/gtk-update-icon-cache --quiet %{_kde4_iconsdir}/icons/locolor 2> /dev/null || :
+
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog README TODO
-%{_kde4_bindir}/*
-%{_kde4_libdir}/*
+%{_kde4_bindir}/kdiff3
+%{_kde4_libdir}/kde4/libkdiff3*.so
 %{_kde4_datadir}/applications/kde4/*
-%{_kde4_datadir}/kde4/apps/*
-%{_kde4_datadir}/icons/*/*/*/kdiff3.png
-%{_kde4_datadir}/kde4/services/*
+%{_kde4_appsdir}/kdiff3/
+%{_kde4_iconsdir}/hicolor/*/*/kdiff3.png
+%{_kde4_iconsdir}/locolor/*/*/kdiff3.png
+%{_kde4_datadir}/kde4/services/kdiff3*.desktop
+
 
 %changelog
+* Tue Jan  6 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.9.93-6
+- use kde4 macros
+- add scriptlets for locolor icons
+- update d-f-i usage
+- include khelpcenter handbook
+- update Source0 URL
+
 * Tue Jan  6 2009 Neal Becker <ndbecker2 at gmail.com> - 0.9.93-5
 - Fix HTML_DIR and use kde4_ versions of datadir, libdir, bindir
 



From rishi at fedoraproject.org  Tue Jan  6 19:36:13 2009
From: rishi at fedoraproject.org (Debarshi Ray)
Date: Tue,  6 Jan 2009 19:36:13 +0000 (UTC)
Subject: rpms/glade3/devel glade3-3.5.5-desktop.patch, NONE, 1.1 .cvsignore, 
	1.7, 1.8 glade3.spec, 1.15, 1.16 sources, 1.7,
	1.8 glade3-3.5.4-desktop.patch, 1.1, NONE
Message-ID: <20090106193613.ED95D70108@cvs1.fedora.phx.redhat.com>

Author: rishi

Update of /cvs/pkgs/rpms/glade3/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8561

Modified Files:
	.cvsignore glade3.spec sources 
Added Files:
	glade3-3.5.5-desktop.patch 
Removed Files:
	glade3-3.5.4-desktop.patch 
Log Message:
* Wed Jan 07 2009 Debarshi Ray <rishi at fedoraproject.org> - 3.5.5-1
- Version bump to 3.5.5.
- Removed 'Provides: glade'.
- Addressed warnings generated by rpmlint.


glade3-3.5.5-desktop.patch:

--- NEW FILE glade3-3.5.5-desktop.patch ---
diff -urNp glade3-3.5.5.orig/data/glade-3.desktop.in.in glade3-3.5.5/data/glade-3.desktop.in.in
--- glade3-3.5.5.orig/data/glade-3.desktop.in.in	2009-01-07 00:41:35.000000000 +0530
+++ glade3-3.5.5/data/glade-3.desktop.in.in	2009-01-07 00:42:21.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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	18 Dec 2008 18:20:53 -0000	1.7
+++ .cvsignore	6 Jan 2009 19:35:43 -0000	1.8
@@ -1 +1 @@
-glade3-3.5.4.tar.gz
+glade3-3.5.5.tar.gz


Index: glade3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/glade3/devel/glade3.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- glade3.spec	18 Dec 2008 18:20:53 -0000	1.15
+++ glade3.spec	6 Jan 2009 19:35:43 -0000	1.16
@@ -1,6 +1,6 @@
 Summary:	User Interface Designer for GTK+ and GNOME
 Name:		glade3
-Version:	3.5.4
+Version:	3.5.5
 Release:	1%{?dist}
 License:	GPLv2+
 Group:		Development/Tools
@@ -12,7 +12,7 @@
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 # Will be dropped in Fedora 10.
-Provides:	glade = 1:%{version}-%{release}
+#Provides:	glade = 1:%{version}-%{release}
 
 Requires:	hicolor-icon-theme
 Requires:	%{name}-libgladeui = %{version}-%{release}
@@ -66,6 +66,10 @@
 %setup -q
 %patch0 -p1
 
+# Suppress rpmlint warning.
+chmod 644 ./plugins/gtk+/glade-attributes.c
+chmod 644 ./plugins/gtk+/glade-attributes.h
+
 %build
 %configure --disable-static --enable-gnome --enable-gtk-doc --enable-python \
   --enable-scrollkeeper
@@ -182,6 +186,11 @@
 %{_includedir}/libgladeui-1.0/gladeui/*
 
 %changelog
+* Wed Jan 07 2009 Debarshi Ray <rishi at fedoraproject.org> - 3.5.5-1
+- Version bump to 3.5.5.
+- Removed 'Provides: glade'.
+- Addressed warnings generated by rpmlint.
+
 * Thu Dec 18 2008 Debarshi Ray <rishi at fedoraproject.org> - 3.5.4-1
 - Version bump to 3.5.4.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/glade3/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	18 Dec 2008 18:20:53 -0000	1.7
+++ sources	6 Jan 2009 19:35:43 -0000	1.8
@@ -1 +1 @@
-984a12f9df1db532232499a8a1105f03  glade3-3.5.4.tar.gz
+a4827f97468476c2e34e4932494dc570  glade3-3.5.5.tar.gz


--- glade3-3.5.4-desktop.patch DELETED ---



From caillon at fedoraproject.org  Tue Jan  6 19:40:41 2009
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Tue,  6 Jan 2009 19:40:41 +0000 (UTC)
Subject: rpms/epiphany-extensions/devel epiphany-extensions.spec,1.51,1.52
Message-ID: <20090106194041.B71DE70108@cvs1.fedora.phx.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/epiphany-extensions/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10362

Modified Files:
	epiphany-extensions.spec 
Log Message:
* Tue Jan 06 2009 Christopher Aillon <caillon at redhat.com> - 2.24.0-3
- Rebuild against newer gecko



Index: epiphany-extensions.spec
===================================================================
RCS file: /cvs/extras/rpms/epiphany-extensions/devel/epiphany-extensions.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- epiphany-extensions.spec	1 Dec 2008 15:00:22 -0000	1.51
+++ epiphany-extensions.spec	6 Jan 2009 19:40:11 -0000	1.52
@@ -1,10 +1,10 @@
 %global ephy_major          2.24
 %global ephy_min_version    %{ephy_major}.0
-%global gecko_version       1.9.0.2
+%global gecko_version       1.9.1
 
 Name:           epiphany-extensions
 Version:        %{ephy_major}.0
-Release:        2%{?dist}
+Release:        3%{?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
+* Tue Jan 06 2009 Christopher Aillon <caillon at redhat.com> - 2.24.0-3
+- Rebuild against newer gecko
+
 * Mon Dec 01 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 2.24.0-2
 - Rebuild for Python 2.6
 



From thl at fedoraproject.org  Tue Jan  6 19:59:55 2009
From: thl at fedoraproject.org (Thorsten Leemhuis)
Date: Tue,  6 Jan 2009 19:59:55 +0000 (UTC)
Subject: rpms/rss2email/devel .cvsignore, 1.2,
	1.3 rss2email-use-configpy-from-homedir.patch, 1.1,
	1.2 rss2email.spec, 1.6, 1.7 sources, 1.6, 1.7
Message-ID: <20090106195955.C74C570108@cvs1.fedora.phx.redhat.com>

Author: thl

Update of /cvs/pkgs/rpms/rss2email/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16362

Modified Files:
	.cvsignore rss2email-use-configpy-from-homedir.patch 
	rss2email.spec sources 
Log Message:
* Tue Jan 06 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 2.65-1
- update to 2.65
- recreate rss2email-use-configpy-from-homedir.patch



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rss2email/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	26 Mar 2007 08:02:19 -0000	1.2
+++ .cvsignore	6 Jan 2009 19:59:24 -0000	1.3
@@ -1,2 +1,2 @@
-CHANGELOG
 rss2email.py
+CHANGELOG

rss2email-use-configpy-from-homedir.patch:

Index: rss2email-use-configpy-from-homedir.patch
===================================================================
RCS file: /cvs/pkgs/rpms/rss2email/devel/rss2email-use-configpy-from-homedir.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- rss2email-use-configpy-from-homedir.patch	26 Mar 2007 08:02:19 -0000	1.1
+++ rss2email-use-configpy-from-homedir.patch	6 Jan 2009 19:59:25 -0000	1.2
@@ -1,13 +1,13 @@
---- rss2email.py.org	2007-03-23 23:35:20.000000000 +0100
-+++ rss2email.py	2007-03-23 23:40:37.000000000 +0100
-@@ -199,8 +199,8 @@
+--- rss2email.py.org	2009-01-05 20:15:15.000000000 +0100
++++ rss2email.py	2009-01-06 20:55:15.000000000 +0100
+@@ -227,8 +227,9 @@
  ### Load the Options ###
  
  # Read options from config file if present.
 -import sys
--sys.path.append(".")
 +import sys, os
-+sys.path.append(os.path.join(os.environ["HOME"],".rss2email/"));
+ sys.path.insert(0,".")
++sys.path.insert(0,os.path.join(os.environ["HOME"],".rss2email/"));

  try:
  	from config import *
  except:


Index: rss2email.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rss2email/devel/rss2email.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- rss2email.spec	26 Oct 2008 10:39:55 -0000	1.6
+++ rss2email.spec	6 Jan 2009 19:59:25 -0000	1.7
@@ -1,5 +1,5 @@
 Name:           rss2email
-Version:        2.64
+Version:        2.65
 Release:        1.1
 Summary:        Deliver news from RSS feeds to your smtp server as text or html mail
 
@@ -69,6 +69,10 @@
 %{_mandir}/man1/*
 
 %changelog
+* Tue Jan 06 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 2.65-1
+- update to 2.65
+- recreate rss2email-use-configpy-from-homedir.patch
+
 * Sun Oct 26 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 2.64-1
 - update to 2.64
 - drop rss2email-warn-if-problems-with-local-mta.patch, something similar now


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rss2email/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	26 Oct 2008 10:39:55 -0000	1.6
+++ sources	6 Jan 2009 19:59:25 -0000	1.7
@@ -1,2 +1,2 @@
-d4ff6068535b64a8aebcce59ed2ec61f  CHANGELOG
-d7aacc350bb1b12494776ad68594c63c  rss2email.py
+eff3f5ed82b3ccaa622f06d595b24dba  rss2email.py
+b68f79442af6ba24421ebd663cba9f58  CHANGELOG



From mclasen at fedoraproject.org  Tue Jan  6 20:03:03 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue,  6 Jan 2009 20:03:03 +0000 (UTC)
Subject: rpms/gnome-applets/devel sources,1.82,1.83
Message-ID: <20090106200303.3C9F770108@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-applets/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17184

Modified Files:
	sources 
Log Message:
fix sources



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-applets/devel/sources,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -r1.82 -r1.83
--- sources	6 Jan 2009 18:22:32 -0000	1.82
+++ sources	6 Jan 2009 20:02:32 -0000	1.83
@@ -1 +1,2 @@
 ddd99d0281df4fa4458408e6cdd19cd1  gnome-applets-2.25.3.tar.bz2
+ccd89d3a58076214e2f34216388c9621  gnome-applets-2.9.3.1-modemlights.tar.bz2



From belegdol at fedoraproject.org  Tue Jan  6 20:04:46 2009
From: belegdol at fedoraproject.org (Julian Sikorski)
Date: Tue,  6 Jan 2009 20:04:46 +0000 (UTC)
Subject: rpms/gnome-chemistry-utils/devel .cvsignore, 1.18,
	1.19 gnome-chemistry-utils.spec, 1.31, 1.32 sources, 1.18, 1.19
Message-ID: <20090106200446.A353770108@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-serv17711

Modified Files:
	.cvsignore gnome-chemistry-utils.spec sources 
Log Message:
* Tue Jan  6 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.10.3-1
- Updated to 0.10.3



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-chemistry-utils/devel/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- .cvsignore	29 Nov 2008 08:55:27 -0000	1.18
+++ .cvsignore	6 Jan 2009 20:04:16 -0000	1.19
@@ -1 +1 @@
-gnome-chemistry-utils-0.10.2.tar.bz2
+gnome-chemistry-utils-0.10.3.tar.bz2


Index: gnome-chemistry-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-chemistry-utils/devel/gnome-chemistry-utils.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- gnome-chemistry-utils.spec	29 Nov 2008 08:55:27 -0000	1.31
+++ gnome-chemistry-utils.spec	6 Jan 2009 20:04:16 -0000	1.32
@@ -1,5 +1,5 @@
 Name:           gnome-chemistry-utils
-Version:        0.10.2
+Version:        0.10.3
 Release:        1%{?dist}
 Summary:        A set of chemical utilities
 
@@ -218,6 +218,9 @@
 
 
 %changelog
+* Tue Jan  6 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.10.3-1
+- Updated to 0.10.3
+
 * Sat Nov 29 2008 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.10.2-1
 - Updated to 0.10.2
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-chemistry-utils/devel/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources	29 Nov 2008 08:55:27 -0000	1.18
+++ sources	6 Jan 2009 20:04:16 -0000	1.19
@@ -1 +1 @@
-458a232249b56eb3dd4644d399889a3d  gnome-chemistry-utils-0.10.2.tar.bz2
+2e7d56758b57b618f28600c5bcf504e3  gnome-chemistry-utils-0.10.3.tar.bz2



From james at fedoraproject.org  Tue Jan  6 20:05:37 2009
From: james at fedoraproject.org (James Antill)
Date: Tue,  6 Jan 2009 20:05:37 +0000 (UTC)
Subject: rpms/python/devel python-2.6-distutils_rpm.patch, NONE,
	1.1 python.spec, 1.139, 1.140
Message-ID: <20090106200537.B977C70108@cvs1.fedora.phx.redhat.com>

Author: james

Update of /cvs/pkgs/rpms/python/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17945

Modified Files:
	python.spec 
Added Files:
	python-2.6-distutils_rpm.patch 
Log Message:
* Tue Jan  6 2009 James Antill <james.antill at redhat.com> - 2.6-3
- Fix distutils generated rpms.
- Resolves: bug#236535


python-2.6-distutils_rpm.patch:

--- NEW FILE python-2.6-distutils_rpm.patch ---
diff -ru Python-2.6-orig/Lib/distutils/command/bdist_rpm.py Python-2.6/Lib/distutils/command/bdist_rpm.py
--- Python-2.6-orig/Lib/distutils/command/bdist_rpm.py	2008-02-23 12:40:11.000000000 -0500
+++ Python-2.6/Lib/distutils/command/bdist_rpm.py	2009-01-06 15:02:18.000000000 -0500
@@ -493,6 +493,7 @@
             ('build', 'build_script', def_build),
             ('install', 'install_script',
              ("%s install "
+              "-O1 "
               "--root=$RPM_BUILD_ROOT "
               "--record=INSTALLED_FILES") % def_setup_call),
             ('clean', 'clean_script', "rm -rf $RPM_BUILD_ROOT"),
Only in Python-2.6/Lib/distutils/command: bdist_rpm.py~


Index: python.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python/devel/python.spec,v
retrieving revision 1.139
retrieving revision 1.140
diff -u -r1.139 -r1.140
--- python.spec	10 Dec 2008 20:16:00 -0000	1.139
+++ python.spec	6 Jan 2009 20:05:07 -0000	1.140
@@ -22,7 +22,7 @@
 Summary: An interpreted, interactive, object-oriented programming language
 Name: %{python}
 Version: 2.6
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: Python
 Group: Development/Languages
 Provides: python-abi = %{pybasever}
@@ -47,6 +47,9 @@
 #Patch15: python-2.5.1-listdir.patch
 Patch16: python-2.6-rpath.patch
 
+# Fix distutils to follow the Fedora/RHEL/CentOS policies of having .pyo files
+Patch51: python-2.6-distutils_rpm.patch
+
 # upstreamed
 
 #Patch50: python-2.5-disable-egginfo.patch
@@ -216,6 +219,8 @@
 #%%patch15 -p1 -b .listdir
 %patch16 -p1 -b .rpath
 
+%patch51 -p1 -b .brprpm
+
 %ifarch alpha ia64
 # 64bit, but not lib64 arches need this too...
 %patch101 -p1 -b .lib64-regex
@@ -519,13 +524,17 @@
 %{_libdir}/python%{pybasever}/lib-dynload/_testcapimodule.so
 
 %changelog
+* Tue Jan  6 2009 James Antill <james.antill at redhat.com> - 2.6-3
+- Fix distutils generated rpms.
+- Resolves: bug#236535
+
 * Wed Dec 10 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 2.6-2
 - Enable -lcrypt for cryptmodule
 
 * Fri Nov 28 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 2.6-1
 - Update to 2.6
 
-* Tue Sep 30 2008 James Antill <katzj at redhat.com> - 2.5.2-1
+* Tue Sep 30 2008 James Antill <james.antill at redhat.com> - 2.5.2-1
 - Move to 2.5.2
 - Fix CVE-2008-2316 hashlib overflow.
 



From belegdol at fedoraproject.org  Tue Jan  6 20:12:49 2009
From: belegdol at fedoraproject.org (Julian Sikorski)
Date: Tue,  6 Jan 2009 20:12:49 +0000 (UTC)
Subject: rpms/gnome-chemistry-utils/F-10 .cvsignore, 1.18,
	1.19 gnome-chemistry-utils.spec, 1.31, 1.32 sources, 1.18, 1.19
Message-ID: <20090106201250.00A6470108@cvs1.fedora.phx.redhat.com>

Author: belegdol

Update of /cvs/extras/rpms/gnome-chemistry-utils/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19491

Modified Files:
	.cvsignore gnome-chemistry-utils.spec sources 
Log Message:
* Tue Jan  6 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.10.3-1
- Updated to 0.10.3



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-chemistry-utils/F-10/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- .cvsignore	29 Nov 2008 09:15:43 -0000	1.18
+++ .cvsignore	6 Jan 2009 20:12:19 -0000	1.19
@@ -1 +1 @@
-gnome-chemistry-utils-0.10.2.tar.bz2
+gnome-chemistry-utils-0.10.3.tar.bz2


Index: gnome-chemistry-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-chemistry-utils/F-10/gnome-chemistry-utils.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- gnome-chemistry-utils.spec	29 Nov 2008 09:15:43 -0000	1.31
+++ gnome-chemistry-utils.spec	6 Jan 2009 20:12:19 -0000	1.32
@@ -1,5 +1,5 @@
 Name:           gnome-chemistry-utils
-Version:        0.10.2
+Version:        0.10.3
 Release:        1%{?dist}
 Summary:        A set of chemical utilities
 
@@ -218,6 +218,9 @@
 
 
 %changelog
+* Tue Jan  6 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.10.3-1
+- Updated to 0.10.3
+
 * Sat Nov 29 2008 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.10.2-1
 - Updated to 0.10.2
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-chemistry-utils/F-10/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources	29 Nov 2008 09:15:43 -0000	1.18
+++ sources	6 Jan 2009 20:12:19 -0000	1.19
@@ -1 +1 @@
-458a232249b56eb3dd4644d399889a3d  gnome-chemistry-utils-0.10.2.tar.bz2
+2e7d56758b57b618f28600c5bcf504e3  gnome-chemistry-utils-0.10.3.tar.bz2



From caillon at fedoraproject.org  Tue Jan  6 20:14:45 2009
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Tue,  6 Jan 2009 20:14:45 +0000 (UTC)
Subject: rpms/gnome-web-photo/devel xulrunner191.patch, NONE,
	1.1 gnome-web-photo.spec, 1.12, 1.13 xulrunner19.patch, 1.2, NONE
Message-ID: <20090106201445.A864D70108@cvs1.fedora.phx.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/gnome-web-photo/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20275

Modified Files:
	gnome-web-photo.spec 
Added Files:
	xulrunner191.patch 
Removed Files:
	xulrunner19.patch 
Log Message:
* Tue Jan 06 2009 Christopher Aillon <caillon at redhat.com> - 0.3-13
- Rebuild against newer gecko


xulrunner191.patch:

--- NEW FILE xulrunner191.patch ---
diff -up gnome-web-photo-0.3/configure.ac.xulrunner191 gnome-web-photo-0.3/configure.ac
--- gnome-web-photo-0.3/configure.ac.xulrunner191	2007-01-29 14:07:02.000000000 -0500
+++ gnome-web-photo-0.3/configure.ac	2009-01-06 15:06:10.000000000 -0500
@@ -132,57 +132,12 @@ fi
 
 AM_GCONF_SOURCE_2
 
+# *********
+# Xulrunner
+# *********
 
-# *******
-# Mozilla
-# *******
-
-GECKO_INIT([GECKO])
-
-AC_SUBST([GECKO])
-AC_SUBST([GECKO_FLAVOUR])
-AC_SUBST([GECKO_INCLUDE_ROOT])
-AC_SUBST([GECKO_HOME])
-AC_SUBST([GECKO_PREFIX])
-
-case "$GECKO" in
-seamonkey) min_version=1.0 ;;
-*firefox) min_version=1.4 ;;
-xulrunner) min_version=1.8 ;;
-esac
-
-PKG_CHECK_MODULES([GECKO], [${gecko_cv_gecko}-xpcom >= $min_version ${gecko_cv_extra_pkg_dependencies}])
-AC_SUBST([GECKO_CFLAGS])
-AC_SUBST([GECKO_LIBS])
-
-# In xulrunner, gkgfx is in libxul; for all others we need to 
-# explicitly link against it
-
-if test "$GECKO" != "xulrunner"; then
-	GECKO_EXTRA_LIBS="$GECKO_EXTRA_LIBS -lgkgfx"
-fi
-
-AC_SUBST([GECKO_EXTRA_LIBS])
-
-# Check for PSM headers
-
-AC_MSG_CHECKING([for mozilla security compoment])
-GECKO_COMPILE_IFELSE([pipnss],
-        [AC_LANG_PROGRAM(
-                [[#include <nsIX509Cert.h>]],
-                [[nsIX509Cert *c;
-                  c->GetIssuer (nsnull);]]
-        )],
-        [AC_DEFINE([HAVE_PSM], [1],[Define if you have the mozilla NSS headers installed]) have_psm=yes],
-        [have_psm=no])
-AC_MSG_RESULT([$have_psm])
-
-AM_CONDITIONAL([HAVE_PSM],[test "x$have_psm" = "xyes"])
-
-# Needed since 1.8b2
-# Define this down here so it doesn't affect the API checks above
-
-AC_DEFINE([MOZILLA_INTERNAL_API],[1],[Define for access to internal mozilla API])
+LIBXUL_INIT
+LIBXUL_DEFINES
 
 # ******************
 # Portability checks
diff -up /dev/null gnome-web-photo-0.3/m4/libxul.m4
--- /dev/null	2009-01-06 12:29:59.871318287 -0500
+++ gnome-web-photo-0.3/m4/libxul.m4	2009-01-06 15:06:10.000000000 -0500
@@ -0,0 +1,566 @@
+# Copyright ?? 2000-2004 Marco Pesenti Gritti
+# Copyright ?? 2003, 2004, 2005, 2006, 2007 Christian Persch
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by the
+# Free Software Foundation; either version 2 of the License, or (at your
+# option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
+
+# LIBXUL_INIT([embedding],[ACTION-IF-FOUND],[ACTION-IF-NOT-FOUND])
+#
+# Checks for libxul, and aborts if it's not found
+#
+# Checks for -fshort-wchar compiler variable, and adds it to
+# AM_CXXFLAGS if found
+#
+# Checks whether RTTI is enabled, and adds -fno-rtti to 
+# AM_CXXFLAGS otherwise
+#
+# Checks whether the gecko build is a debug build, and adds
+# debug flags to AM_CXXFLAGS if it is.
+
+AC_DEFUN([LIBXUL_INIT],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
+
+if test -z "$1"; then
+  libxul_cv_libxul_pkg="libxul"
+elif test "$1" = "embedding"; then
+  libxul_cv_libxul_pkg="libxul-embedding"
+else
+  AC_MSG_ERROR([[Unsupported value passed to LIBXUL_INIT]])
+fi
+
+PKG_CHECK_EXISTS([$libxul_cv_libxul_pkg],[libxul_cv_have_libxul=yes],[libxul_cv_have_libxul=no])
+if test "$libxul_cv_have_libxul" != "yes"; then
+  # Debian/Ubuntu xulrunner-1.9-dev has versioned pc files, try again
+  libxul_cv_libxul_pkg="${libxul_cv_libxul_pkg}-1.9"
+  PKG_CHECK_EXISTS([$libxul_cv_libxul_pkg],[libxul_cv_have_libxul=yes],[libxul_cv_have_libxul=no])
+fi
+if test "$libxul_cv_have_libxul" != "yes"; then
+  # Still nothing? Error out
+  AC_MSG_ERROR([libxul not found])
+fi
+
+libxul_cv_version="$($PKG_CONFIG --modversion $libxul_cv_libxul_pkg)"
+libxul_cv_prefix="$($PKG_CONFIG --variable=prefix $libxul_cv_libxul_pkg)"
+libxul_cv_include_root="$($PKG_CONFIG --variable=includedir $libxul_cv_libxul_pkg)"
+libxul_cv_sdkdir="$($PKG_CONFIG --variable=sdkdir $libxul_cv_libxul_pkg)"
+
+# FIXMEchpe: this isn't right. The pc file seems buggy, but until
+# I can figure this out, do it like this:
+libxul_cv_libdir="$(readlink $($PKG_CONFIG --variable=sdkdir $libxul_cv_libxul_pkg)/bin)"
+
+libxul_cv_includes="$($PKG_CONFIG --cflags-only-I libxul-unstable libxul)"
+
+AC_DEFINE([HAVE_LIBXUL],[1],[Define for libxul])
+
+LIBXUL_VERSION="$libxul_cv_version"
+LIBXUL_PREFIX="$libxul_cv_prefix"
+LIBXUL_INCLUDE_ROOT="$libxul_cv_include_root"
+LIBXUL_INCLUDES="$libxul_cv_includes"
+LIBXUL_LIBDIR="$libxul_cv_libdir"
+
+LIBXUL_CXXCPPFLAGS=
+LIBXUL_CXXFLAGS=
+LIBXUL_LDFLAGS=
+
+# Can't use the value from the .pc file, since it seems buggy
+# Until I can figure it out, do this instead
+LIBXUL_LIBS="-L${libxul_cv_sdkdir}/lib -lxpcomglue_s -L${libxul_cv_sdkdir}/bin -lxul -lxpcom"
+
+# ***********************
+# Check for -fshort-wchar
+# ***********************
+
+# NOTE: This is really gcc-only
+# Do this test using CXX only since some versions of gcc
+# 2.95-2.97 have a signed wchar_t in c++ only and some versions
+# only have short-wchar support for c++.
+
+AC_LANG_PUSH([C++])
+
+_SAVE_CXXFLAGS=$CXXFLAGS
+CXXFLAGS="$CXXFLAGS $LIBXUL_CXXFLAGS -fshort-wchar"
+
+AC_CACHE_CHECK([for compiler -fshort-wchar option],
+  libxul_cv_have_usable_wchar_option,
+  [AC_RUN_IFELSE([AC_LANG_SOURCE(
+		 [[#include <stddef.h>
+		  int main () {
+		    return (sizeof(wchar_t) != 2) || (wchar_t)-1 < (wchar_t) 0 ;
+		  } ]])],
+  [libxul_cv_have_usable_wchar_option="yes"],
+  [libxul_cv_have_usable_wchar_option="no"],
+  [libxul_cv_have_usable_wchar_option="maybe (cross-compiling)"])])
+
+CXXFLAGS="$_SAVE_CXXFLAGS"
+
+AC_LANG_POP([C++])
+
+if test "$libxul_cv_have_usable_wchar_option" = "yes"; then
+  LIBXUL_CXXFLAGS="$LIBXUL_CXXFLAGS -fshort-wchar"
+fi
+
+# **************
+# Check for RTTI
+# **************
+
+AC_MSG_CHECKING([whether to enable C++ RTTI])
+AC_ARG_ENABLE([cpp-rtti],
+  AS_HELP_STRING([--enable-cpp-rtti],[Enable C++ RTTI]),
+  [],[enable_cpp_rtti=no])
+AC_MSG_RESULT([$enable_cpp_rtti])
+
+if test "$enable_cpp_rtti" = "no"; then
+  LIBXUL_CXXFLAGS="-fno-rtti $LIBXUL_CXXFLAGS"
+fi
+
+# *************
+# Various tests
+# *************
+
+# FIXMEchpe: remove this test, it shouldn't be needed anymore thanks to static glue libs
+
+AC_LANG_PUSH([C++])
+
+_SAVE_CPPFLAGS="$CPPFLAGS"
+CPPFLAGS="$CPPFLAGS $LIBXUL_CXXCPPFLAGS $LIBXUL_INCLUDES"
+
+AC_MSG_CHECKING([[whether we have a libxul debug build]])
+AC_COMPILE_IFELSE(
+  [AC_LANG_SOURCE([[#include <xpcom-config.h>
+		    #if !defined(MOZ_REFLOW_PERF) || !defined(MOZ_REFLOW_PERF_DSP)
+		    #error No
+		    #endif]]
+  )],
+  [libxul_cv_have_debug=yes],
+  [libxul_cv_have_debug=no])
+AC_MSG_RESULT([$libxul_cv_have_debug])
+
+CPPFLAGS="$_SAVE_CPPFLAGS"
+
+AC_LANG_POP([C++])
+
+if test "$libxul_cv_have_debug" = "yes"; then
+	LIBXUL_CXXCPPFLAGS="$LIBXUL_CXXCPPFLAGS -DDEBUG -D_DEBUG"
+
+	AC_DEFINE([HAVE_LIBXUL_DEBUG],[1],[Define if libxul is a debug build])
+fi
+
+# *************************************
+# Check for C++ symbol visibility stuff
+# *************************************
+
+# Check for .hidden assembler directive and visibility attribute.
+# Copied from mozilla's configure.in, which in turn was
+# borrowed from glibc's configure.in
+
+# Only do this for g++
+
+if test "$GXX" = "yes"; then
+  AC_CACHE_CHECK(for visibility(hidden) attribute,
+                 libxul_cv_visibility_hidden,
+                 [cat > conftest.c <<EOF
+                  int foo __attribute__ ((visibility ("hidden"))) = 1;
+EOF
+                  libxul_cv_visibility_hidden=no
+                  if ${CC-cc} -Werror -S conftest.c -o conftest.s >/dev/null 2>&1; then
+                    if egrep '\.(hidden|private_extern).*foo' conftest.s >/dev/null; then
+                      libxul_cv_visibility_hidden=yes
+                    fi
+                  fi
+                  rm -f conftest.[cs]
+                 ])
+  if test "$libxul_cv_visibility_hidden" = "yes"; then
+    AC_DEFINE([HAVE_VISIBILITY_HIDDEN_ATTRIBUTE],[1],[Define if the compiler supports the "hidden" visibility attribute])
+
+    AC_CACHE_CHECK(for visibility(default) attribute,
+                   libxul_cv_visibility_default,
+                   [cat > conftest.c <<EOF
+                    int foo __attribute__ ((visibility ("default"))) = 1;
+EOF
+                    libxul_cv_visibility_default=no
+                    if ${CC-cc} -fvisibility=hidden -Werror -S conftest.c -o conftest.s >/dev/null 2>&1; then
+                      if ! egrep '\.(hidden|private_extern).*foo' conftest.s >/dev/null; then
+                        libxul_cv_visibility_default=yes
+                      fi
+                    fi
+                    rm -f conftest.[cs]
+                   ])
+    if test "$libxul_cv_visibility_default" = "yes"; then
+      AC_DEFINE([HAVE_VISIBILITY_ATTRIBUTE],[1],[Define if the compiler supports the "default" visibility attribute])
+
+      AC_CACHE_CHECK(for visibility pragma support,
+                     libxul_cv_visibility_pragma,
+                     [cat > conftest.c <<EOF
+#pragma GCC visibility push(hidden)
+                      int foo_hidden = 1;
+#pragma GCC visibility push(default)
+                      int foo_default = 1;
+EOF
+                      libxul_cv_visibility_pragma=no
+                      if ${CC-cc} -Werror -S conftest.c -o conftest.s >/dev/null 2>&1; then
+                        if egrep '\.(hidden|private_extern).*foo_hidden' conftest.s >/dev/null; then
+                          if ! egrep '\.(hidden|private_extern).*foo_default' conftest.s > /dev/null; then
+                            libxul_cv_visibility_pragma=yes
+                          fi
+                        fi
+                      fi
+                      rm -f conftest.[cs]
+                    ])
+      if test "$libxul_cv_visibility_pragma" = "yes"; then
+        AC_CACHE_CHECK(For gcc visibility bug with class-level attributes (GCC bug 26905),
+                       libxul_cv_have_visibility_class_bug,
+                       [cat > conftest.c <<EOF
+#pragma GCC visibility push(hidden)
+struct __attribute__ ((visibility ("default"))) TestStruct {
+  static void Init();
+};
+__attribute__ ((visibility ("default"))) void TestFunc() {
+  TestStruct::Init();
+}
+EOF
+                       libxul_cv_have_visibility_class_bug=no
+                       if ! ${CXX-g++} ${CXXFLAGS} ${DSO_PIC_CFLAGS} ${DSO_LDOPTS} -S -o conftest.S conftest.c > /dev/null 2>&1 ; then
+                         libxul_cv_have_visibility_class_bug=yes
+                       else
+                         if test `egrep -c '@PLT|\\$stub' conftest.S` = 0; then
+                           libxul_cv_have_visibility_class_bug=yes
+                         fi
+                       fi
+                       rm -rf conftest.{c,S}
+                       ])
+
+        AC_CACHE_CHECK(For x86_64 gcc visibility bug with builtins (GCC bug 20297),
+                       libxul_cv_have_visibility_builtin_bug,
+                       [cat > conftest.c <<EOF
+#pragma GCC visibility push(hidden)
+#pragma GCC visibility push(default)
+#include <string.h>
+#pragma GCC visibility pop
+
+__attribute__ ((visibility ("default"))) void Func() {
+  char c[[100]];
+  memset(c, 0, sizeof(c));
+}
+EOF
+                       libxul_cv_have_visibility_builtin_bug=no
+                       if ! ${CC-cc} ${CFLAGS} ${DSO_PIC_CFLAGS} ${DSO_LDOPTS} -O2 -S -o conftest.S conftest.c > /dev/null 2>&1 ; then
+                         libxul_cv_have_visibility_builtin_bug=yes
+                       else
+                         if test `grep -c "@PLT" conftest.S` = 0; then
+                           libxul_cv_visibility_builtin_bug=yes
+                         fi
+                       fi
+                       rm -f conftest.{c,S}
+                       ])
+        if test "$libxul_cv_have_visibility_builtin_bug" = "no" -a \
+                "$libxul_cv_have_visibility_class_bug" = "no"; then
+          VISIBILITY_FLAGS='-I$(DIST)/include/system_wrappers -include $(topsrcdir)/config/gcc_hidden.h'
+          WRAP_SYSTEM_INCLUDES=1
+        else
+          VISIBILITY_FLAGS='-fvisibility=hidden'
+        fi # have visibility pragma bug
+      fi   # have visibility pragma
+    fi     # have visibility(default) attribute
+  fi       # have visibility(hidden) attribute
+
+  LIBXUL_CXXFLAGS="$LIBXUL_CXXFLAGS $VISIBILITY_FLAGS"
+fi         # g++
+
+# *********
+# Finish up
+# *********
+
+AC_SUBST([LIBXUL_VERSION])
+AC_SUBST([LIBXUL_PREFIX])
+AC_SUBST([LIBXUL_INCLUDE_ROOT])
+AC_SUBST([LIBXUL_INCLUDES])
+AC_SUBST([LIBXUL_LIBDIR])
+AC_SUBST([LIBXUL_CXXCPPFLAGS])
+AC_SUBST([LIBXUL_CXXFLAGS])
+AC_SUBST([LIBXUL_LDFLAGS])
+AC_SUBST([LIBXUL_LIBS])
+
+])
+
+# LIBXUL_DEFINES
+#
+# Automake defines for libxul. Not included in LIBXUL_INIT so that
+# LIBXUL_INIT may be called conditionally. If you use LIBXUL_INIT,
+# you _must_ call LIBXUL_DEFINES, unconditionally.
+
+AC_DEFUN([LIBXUL_DEFINES],
+[
+
+AM_CONDITIONAL([HAVE_LIBXUL],[test "$libxul_cv_have_libxul" = "yes"])
+AM_CONDITIONAL([HAVE_LIBXUL_DEBUG],[test "$libxul_cv_have_debug" = "yes"])
+
+])
+
+# ***************************************************************************
+# ***************************************************************************
+# ***************************************************************************
+
+# _LIBXUL_DISPATCH(MACRO, INCLUDEDIRS, ...)
+
+m4_define([_LIBXUL_DISPATCH],
+[
+
+AC_LANG_PUSH([C++])
+
+_SAVE_CPPFLAGS="$CPPFLAGS"
+_SAVE_CXXFLAGS="$CXXFLAGS"
+_SAVE_LDFLAGS="$LDFLAGS"
+_SAVE_LIBS="$LIBS"
+CPPFLAGS="$CPPFLAGS $LIBXUL_CXXCPPFLAGS $LIBXUL_INCLUDES"
+CXXFLAGS="$CXXFLAGS $LIBXUL_CXXFLAGS $($PKG_CONFIG --cflags-only-other libxul)"
+LDFLAGS="$LDFLAGS $LIBXUL_LDFLAGS -Wl,--rpath=$LIBXUL_LIBDIR"
+LIBS="$LIBS $($PKG_CONFIG --libs libxul)"
+
+# FIXMEchpe: remove this, since the header layout is now flat (only stable and unstable)
+
+_LIBXUL_DISPATCH_INCLUDEDIRS="$2"
+
+_LIBXUL_DISPATCH_INCLUDEDIRS="$_LIBXUL_DISPATCH_INCLUDEDIRS dom necko pref"
+
+# Now add them to CPPFLAGS
+for i in $_LIBXUL_DISPATCH_INCLUDEDIRS; do
+  CPPFLAGS="$CPPFLAGS -I$LIBXUL_INCLUDE_ROOT/$i"
+done
+
+m4_indir([$1],m4_shiftn(2,$@))
+
+CPPFLAGS="$_SAVE_CPPFLAGS"
+CXXFLAGS="$_SAVE_CXXFLAGS"
+LDFLAGS="$_SAVE_LDFLAGS"
+LIBS="$_SAVE_LIBS"
+
+AC_LANG_POP([C++])
+
+])# _LIBXUL_DISPATCH
+
+# ***************************************************************************
+# ***************************************************************************
+# ***************************************************************************
+
+# LIBXUL_CHECK_HEADERS(INCLUDEDIRS, HEADERS, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND], [INCLUDES])
+
+AC_DEFUN([LIBXUL_CHECK_HEADERS],[_LIBXUL_DISPATCH([AC_CHECK_HEADERS],$@)])
+
+# LIBXUL_COMPILE_IFELSE(INCLUDEDIRS, PROGRAM, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
+
+AC_DEFUN([LIBXUL_COMPILE_IFELSE],[_LIBXUL_DISPATCH([AC_COMPILE_IFELSE],$@)])
+
+# LIBXUL_RUN_IFELSE(INCLUDEDIRS, PROGRAM, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
+
+AC_DEFUN([LIBXUL_RUN_IFELSE],[_LIBXUL_DISPATCH([AC_RUN_IFELSE],$@)])
+
+# ***************************************************************************
+# ***************************************************************************
+# ***************************************************************************
+
+# LIBXUL_XPCOM_PROGRAM([PROLOGUE], [BODY])
+#
+# Produce a template C++ program which starts XPCOM up and shuts it down after
+# the BODY part has run. In BODY, the the following variables are predeclared:
+#
+# nsresult rv
+# int status = 1 (EXIT_FAILURE)
+#
+# The program's exit status will be |status|; set it to 0 (or EXIT_SUCCESS)
+# to indicate success and to a value between 1 (EXIT_FAILURE) and 120 to
+# indicate failure.
+#
+# To jump out of the BODY and exit the test program, you can use |break|.
+
+AC_DEFUN([LIBXUL_XPCOM_PROGRAM],
+[AC_LANG_PROGRAM([[
+#include <xpcom-config.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <nsXPCOM.h>
+#include <nsCOMPtr.h>
+#include <nsILocalFile.h>
+#include <nsIServiceManager.h>
+#include <nsStringGlue.h>
+]]
+[$1],
+[[
+// redirect unwanted mozilla debug output to the bit bucket
+freopen ("/dev/null", "w", stdout);
+
+nsresult rv;
+nsCOMPtr<nsILocalFile> directory;
+rv = NS_NewNativeLocalFile (NS_LITERAL_CSTRING("$_LIBXUL_HOME"), PR_FALSE,
+			    getter_AddRefs (directory));
+if (NS_FAILED (rv) || !directory) {
+	exit (126);
+}
+
+rv = NS_InitXPCOM2 (nsnull, directory, nsnull);
+if (NS_FAILED (rv)) {
+	exit (125);
+}
+
+int status = EXIT_FAILURE;
+
+// now put in the BODY, scoped with do...while(0) to ensure we don't hold a
+// COMptr after XPCOM shutdown and so we can jump out with a simple |break|.
+do {
+]]
+m4_shiftn(1,$@)
+[[
+} while (0);
+	
+NS_ShutdownXPCOM (nsnull);
+exit (status);
+]])
+]) # LIBXUL_XPCOM_PROGRAM
+
+# ***************************************************************************
+# ***************************************************************************
+# ***************************************************************************
+
+# LIBXUL_XPCOM_PROGRAM_CHECK([ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND], [ACTION-IF-CROSS-COMPILING])
+#
+# Checks whether we can build and run any XPCOM test programs at all
+
+AC_DEFUN([LIBXUL_XPCOM_PROGRAM_CHECK],
+[AC_REQUIRE([LIBXUL_INIT])dnl
+
+AC_CACHE_CHECK([whether we can compile and run XPCOM programs],
+[libxul_cv_xpcom_program_check],
+[
+libxul_cv_xpcom_program_check=no
+
+LIBXUL_RUN_IFELSE([],
+	[LIBXUL_XPCOM_PROGRAM([],[[status = EXIT_SUCCESS;]])],
+	[libxul_cv_xpcom_program_check=yes],
+	[libxul_cv_xpcom_program_check=no],
+	[libxul_cv_xpcom_program_check=maybe])
+])
+
+if test "$libxul_cv_xpcom_program_check" = "yes"; then
+	ifelse([$2],,[:],[$2])
+else
+	ifelse([$3],,[AC_MSG_FAILURE([Cannot compile and run XPCOM programs])],
+	[$3])
+fi
+
+]) # LIBXUL_XPCOM_PROGRAM_CHECK
+
+# ***************************************************************************
+# ***************************************************************************
+# ***************************************************************************
+
+# LIBXUL_CHECK_CONTRACTID(CONTRACTID, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
+#
+# Checks wheter CONTRACTID is a registered contract ID
+
+AC_DEFUN([LIBXUL_CHECK_CONTRACTID],
+[AC_REQUIRE([LIBXUL_INIT])dnl
+
+AS_VAR_PUSHDEF([libxul_cv_have_CID],[libxul_cv_have_$1])
+
+AC_CACHE_CHECK([for the $1 XPCOM component],
+libxul_cv_have_CID,
+[
+AS_VAR_SET(libxul_cv_have_CID,[no])
+
+LIBXUL_RUN_IFELSE([],
+[LIBXUL_XPCOM_PROGRAM([[
+#include <nsIComponentRegistrar.h>
+]],[[
+status = 99;
+nsCOMPtr<nsIComponentRegistrar> registrar;
+rv = NS_GetComponentRegistrar (getter_AddRefs (registrar));
+if (NS_FAILED (rv)) break;
+
+status = 98;
+PRBool isRegistered = PR_FALSE;
+rv = registrar->IsContractIDRegistered ("$1", &isRegistered);
+if (NS_FAILED (rv)) break;
+
+status = isRegistered ? EXIT_SUCCESS : 97;
+]])
+],
+[AS_VAR_SET(libxul_cv_have_CID,[yes])],
+[AS_VAR_SET(libxul_cv_have_CID,[no])],
+[AS_VAR_SET(libxul_cv_have_CID,[maybe])])
+
+])
+
+if test AS_VAR_GET(libxul_cv_have_CID) = "yes"; then
+	ifelse([$2],,[:],[$2])
+else
+	ifelse([$3],,[AC_MSG_ERROR([dnl
+Contract ID "$1" is not registered, but $PACKAGE_NAME depends on it.])],
+	[$3])
+fi
+
+AS_VAR_POPDEF([libxul_cv_have_CID])
+
+]) # LIBXUL_CHECK_CONTRACTID
+
+# LIBXUL_CHECK_CONTRACTIDS(CONTRACTID, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
+#
+# Checks wheter CONTRACTIDs are registered contract IDs.
+# If ACTION-IF-NOT-FOUND is given, it is executed when one of the contract IDs
+# is not found and the missing contract ID is in the |as_contractid| variable.
+
+AC_DEFUN([LIBXUL_CHECK_CONTRACTIDS],
+[AC_REQUIRE([LIBXUL_INIT])dnl
+
+result=yes
+as_contractid=
+for as_contractid in $1
+do
+	LIBXUL_CHECK_CONTRACTID([$as_contractid],[],[result=no; break;])
+done
+
+if test "$result" = "yes"; then
+	ifelse([$2],,[:],[$2])
+else
+	ifelse([$3],,[AC_MSG_ERROR([dnl
+Contract ID "$as_contractid" is not registered, but $PACKAGE_NAME depends on it.])],
+	[$3])
+fi
+
+]) # LIBXUL_CHECK_CONTRACTIDS
+
+# ***************************************************************************
+# ***************************************************************************
+# ***************************************************************************
+
+# LIBXUL_XPIDL([ACTION-IF-FOUND],[ACTION-IF-NOT-FOUND])
+#
+# Checks for xpidl program and include directory
+#
+# Variables set:
+# XPIDL:        the xpidl program
+# XPIDL_IDLDIR: the xpidl include directory
+
+AC_DEFUN([LIBXUL_XPIDL],
+[AC_REQUIRE([LIBXUL_INIT])dnl
+
+_C_PATH_PROG([XPIDL],[xpidl],[no],[$LIBXUL_LIBDIR:$PATH])
+
+XPIDL_IDLDIR="$($PKG_CONFIG --variable=idldir libxul)"
+
+if test "$XPIDL" != "no" -a -n "$XPIDL_IDLDIR" -a -f "$XPIDL_IDLDIR/nsISupports.idl"; then
+	ifelse([$1],,[:],[$1])
+else
+	ifelse([$2],,[AC_MSG_FAILURE([XPIDL program or include directory not found])],[$2])
+fi
+
+])
diff -up gnome-web-photo-0.3/src/Components.cpp.xulrunner191 gnome-web-photo-0.3/src/Components.cpp
--- gnome-web-photo-0.3/src/Components.cpp.xulrunner191	2006-12-31 16:48:52.000000000 -0500
+++ gnome-web-photo-0.3/src/Components.cpp	2009-01-06 15:06:10.000000000 -0500
@@ -137,80 +137,15 @@ NS_IMETHODIMP Prompter::Select(nsIDOMWin
   return NS_OK;
 }
 
-#ifdef HAVE_PSM
-
-#include <nsIBadCertListener.h>
-
-#define NSSDIALOGS_CLASSNAME "Dummy NSS Dialogs"
-#define NSSDIALOGS_CID { 0x128e643e, 0x8b28, 0x4eea, { 0x8d, 0xe7, 0x22, 0x4f, 0x5a, 0xa0, 0x56, 0x54 } }
-
-class NSSDialogs : public nsIBadCertListener
-{
-  public:
-    NS_DECL_ISUPPORTS
-    NS_DECL_NSIBADCERTLISTENER
-
-    NSSDialogs () { }
-    ~NSSDialogs () { }
-};
-
-NS_IMPL_THREADSAFE_ISUPPORTS1 (NSSDialogs, nsIBadCertListener)
-
-/* boolean confirmUnknownIssuer (in nsIInterfaceRequestor socketInfo, in nsIX509Cert cert, out short certAddType); */
-NS_IMETHODIMP
-NSSDialogs::ConfirmUnknownIssuer(nsIInterfaceRequestor *socketInfo,
-				 nsIX509Cert *cert,
-				 PRInt16 *certAddType,
-				 PRBool *_retval)
-{
-  LOG ("ConfirmUnknownIssuer\n");
-  *certAddType = nsIBadCertListener::ADD_TRUSTED_FOR_SESSION;
-  *_retval = PR_TRUE;
-  return NS_OK;
-}
-
-/* boolean confirmMismatchDomain (in nsIInterfaceRequestor socketInfo, in AUTF8String targetURL, in nsIX509Cert cert); */
-NS_IMETHODIMP
-NSSDialogs::ConfirmMismatchDomain(nsIInterfaceRequestor *socketInfo,
-				  const nsACString & targetURL,
-				  nsIX509Cert *cert,
-				  PRBool *_retval)
-{
-  LOG ("ConfirmMismatchDomain\n");
-  *_retval = PR_TRUE;
-  return NS_OK;
-}
-
-/* boolean confirmCertExpired (in nsIInterfaceRequestor socketInfo, in nsIX509Cert cert); */
-NS_IMETHODIMP
-NSSDialogs::ConfirmCertExpired(nsIInterfaceRequestor *socketInfo,
-			       nsIX509Cert *cert,
-			       PRBool *_retval)
-{
-  LOG ("ConfirmCertExpired\n");
-  *_retval = PR_TRUE;
-  return NS_OK;
-}
-
-/* void notifyCrlNextupdate (in nsIInterfaceRequestor socketInfo, in AUTF8String targetURL, in nsIX509Cert cert); */
-NS_IMETHODIMP
-NSSDialogs::NotifyCrlNextupdate(nsIInterfaceRequestor *socketInfo,
-				const nsACString & targetURL,
-				nsIX509Cert *cert)
-{
-  LOG ("NotifyCrlNextupdate\n");
-  return NS_OK;
-}
-
-#endif /* HAVE_PSM */
-
 /* -------------------------------------------------------------------------- */
 
 NS_GENERIC_FACTORY_CONSTRUCTOR(Prompter)
 
+#ifndef HAVE_GECKO_1_9
 #ifdef HAVE_PSM
 NS_GENERIC_FACTORY_CONSTRUCTOR(NSSDialogs)
 #endif
+#endif /* HAVE_GECKO_1_9 */
 
 static const nsModuleComponentInfo sAppComps[] =
 {
@@ -220,14 +155,6 @@ static const nsModuleComponentInfo sAppC
     NS_PROMPTSERVICE_CONTRACTID,
     PrompterConstructor
   },
-#ifdef HAVE_PSM
-  {
-    NSSDIALOGS_CLASSNAME,
-    NSSDIALOGS_CID,
-    NS_BADCERTLISTENER_CONTRACTID,
-    NSSDialogsConstructor
-  },
-#endif /* HAVE_PSM */
 };
 
 PRBool
diff -up gnome-web-photo-0.3/src/Listener.h.xulrunner191 gnome-web-photo-0.3/src/Listener.h
--- gnome-web-photo-0.3/src/Listener.h.xulrunner191	2006-12-31 16:48:52.000000000 -0500
+++ gnome-web-photo-0.3/src/Listener.h	2009-01-06 15:06:10.000000000 -0500
@@ -23,7 +23,7 @@
 
 #include <nsCOMPtr.h>
 #include <nsIDOMLoadListener.h>
-#include <nsString.h>
+#include <nsStringGlue.h>
 #include <gtkmozembed.h>
 
 class Listener : public nsIDOMLoadListener
diff -up gnome-web-photo-0.3/src/main.cpp.xulrunner191 gnome-web-photo-0.3/src/main.cpp
--- gnome-web-photo-0.3/src/main.cpp.xulrunner191	2007-01-29 13:53:02.000000000 -0500
+++ gnome-web-photo-0.3/src/main.cpp	2009-01-06 15:06:10.000000000 -0500
@@ -25,6 +25,7 @@
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
 #include <gtkmozembed.h>
+#include <gtkmozembed_glue.cpp>
 #include <nsCOMPtr.h>
 #include <nsIServiceManager.h>
 #include <nsIStyleSheetService.h>
@@ -336,6 +337,48 @@ state_change (StateType new_state)
 static nsresult
 gecko_startup (void)
 {
+  nsresult rv;
+
+  static const GREVersionRange greVersion = {
+    "1.9a", PR_TRUE,
+    "1.9.*", PR_TRUE
+  };
+  char xpcomLocation[4096];
+  rv = GRE_GetGREPathWithProperties(&greVersion, 1, nsnull, 0, xpcomLocation, 4096);
+  if (NS_FAILED (rv))
+  {
+    g_warning ("Could not get gre path!\n");
+    return FALSE;
+  }
+
+  // Startup the XPCOM Glue that links us up with XPCOM.
+  rv = XPCOMGlueStartup(xpcomLocation);
+  if (NS_FAILED (rv))
+  {
+    g_warning ("Could not determine locale!\n");
+    return FALSE;
+  }
+
+  rv = GTKEmbedGlueStartup();
+  if (NS_FAILED (rv))
+  {
+    g_warning ("Could not startup glue!\n");
+    return FALSE;
+  }
+
+  rv = GTKEmbedGlueStartupInternal();
+  if (NS_FAILED (rv))
+  {
+    g_warning ("Could not startup internal glue!\n");
+    return FALSE;
+  }
+
+  char *lastSlash = strrchr(xpcomLocation, '/');
+  if (lastSlash)
+    *lastSlash = '\0';
+
+  gtk_moz_embed_set_path(xpcomLocation);
+
   /* BUG ALERT! If we don't have a profile, Gecko will crash on https sites and
    * when trying to open the password manager. The prefs will be set up so that
    * no cookies or passwords etc. will be persisted.
@@ -345,12 +388,6 @@ gecko_startup (void)
   gtk_moz_embed_set_profile_path (profile, "gnome-web-photo");
   g_free (profile);
 
-#ifdef HAVE_GECKO_1_9
-  gtk_moz_embed_set_path (GECKO_HOME);
-#else
-  gtk_moz_embed_set_comp_path (GECKO_HOME);
-#endif
-
   /* Fire up the beast! */
   gtk_moz_embed_push_startup ();
 
@@ -362,8 +399,6 @@ gecko_startup (void)
     return NS_ERROR_FAILURE;
   }
 
-  nsresult rv = NS_OK;
-
   if (mode != MODE_PRINT) {
     /* This prevents us from printing all pages, so only do it for photo/thumbnail */
     nsCOMPtr<nsIStyleSheetService> sheetService (do_GetService ("@mozilla.org/content/style-sheet-service;1", &rv));
@@ -424,7 +459,6 @@ int
 main (int argc, char **argv)
 {
   GtkWidget *window;
-  GdkScreen *screen;
   GOptionContext *context;
   GError *error = NULL;
   int i, len;
@@ -596,11 +630,6 @@ main (int argc, char **argv)
   /* Create window */
   window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
 
-  gtk_window_set_role (GTK_WINDOW (window), "gnome-web-photo-hidden-window");
-  gtk_window_set_skip_taskbar_hint (GTK_WINDOW (window), TRUE);
-  gtk_window_set_skip_pager_hint (GTK_WINDOW (window), TRUE);
-  gtk_window_set_focus_on_map (GTK_WINDOW (window), FALSE);
-
   gEmbed = EMBED (g_object_new (TYPE_EMBED, NULL));
   g_signal_connect (gEmbed, "ready", G_CALLBACK (embed_ready_cb), NULL);
   g_signal_connect (gEmbed, "print-done", G_CALLBACK (print_done_cb), NULL);
@@ -608,13 +637,8 @@ main (int argc, char **argv)
   gtk_container_add (GTK_CONTAINER (window), GTK_WIDGET (gEmbed));
 
 #ifndef DEBUG_SHOW_WINDOW
-  /* Move the window off screen */
-  screen = gtk_widget_get_screen (GTK_WIDGET (window));
-  gtk_window_move (GTK_WINDOW (window),
-		   gdk_screen_get_width (screen) + 100,
-		   gdk_screen_get_height (screen) + 100);
-  gtk_widget_show_all (window);
-  gdk_window_hide (window->window);
+  gtk_widget_show(GTK_WIDGET(gEmbed));
+  gtk_widget_realize(GTK_WIDGET(gEmbed));
 #else
   gtk_widget_show_all (window);
 #endif
diff -up gnome-web-photo-0.3/src/Makefile.am.xulrunner191 gnome-web-photo-0.3/src/Makefile.am
--- gnome-web-photo-0.3/src/Makefile.am.xulrunner191	2007-01-29 13:16:18.000000000 -0500
+++ gnome-web-photo-0.3/src/Makefile.am	2009-01-06 15:06:10.000000000 -0500
@@ -36,28 +36,31 @@ gnome_web_photo_SOURCES = \
 	main.cpp
 
 gnome_web_photo_CPPFLAGS = \
+	$(DEPENDENCY_CFLAGS)			\
 	$(addprefix -I$(GECKO_INCLUDE_ROOT)/,$(gecko_include_subdirs))	\
 	-DSHARE_DIR=\"$(pkgdatadir)\"   	\
 	-DLOCALEDIR=\"$(datadir)/locale\"	\
 	-DGECKO_HOME=\"$(GECKO_HOME)\"	\
 	-DGECKO_PREFIX=\"$(GECKO_PREFIX)\"	\
+        -DXPCOM_GLUE_USE_NSPR			\
+        -DXPCOM_GLUE				\
 	$(AM_CPPFLAGS)
 
 gnome_web_photo_CXXFLAGS = \
 	$(DEPENDENCY_CFLAGS) 	\
-	$(GECKO_CFLAGS)	\
+	$(LIBXUL_INCLUDES)	\
+	$(LIBXUL_CXXFLAGS)	\
 	$(AM_CXXFLAGS)
 
 gnome_web_photo_LDFLAGS = \
-	-R$(GECKO_HOME)	\
+	-R$(LIBXUL_LIBDIR)	\
 	$(AM_LDFLAGS)
 
 gnome_web_photo_LDADD = \
 	$(DEPENDENCY_LIBS)	\
 	$(JPEG_LIBS)		\
-	$(GECKO_LIBS)		\
-	$(GECKO_EXTRA_LIBS)
-
+	$(LIBXUL_LIBS)		\
+	-lxpcomglue
 
 install-exec-hook: gnome-web-photo
 	cd $(DESTDIR)$(bindir) && \
diff -up gnome-web-photo-0.3/src/Prefs.cpp.xulrunner191 gnome-web-photo-0.3/src/Prefs.cpp
--- gnome-web-photo-0.3/src/Prefs.cpp.xulrunner191	2006-12-31 16:48:52.000000000 -0500
+++ gnome-web-photo-0.3/src/Prefs.cpp	2009-01-06 15:06:10.000000000 -0500
@@ -26,9 +26,9 @@
 #include <nsCOMPtr.h>
 #include <nsIPrefService.h>
 #include <nsIServiceManager.h>
-#include <nsIServiceManager.h>
+#include <nsServiceManagerUtils.h>
 #include <nsILocalFile.h>
-#include <nsString.h>
+#include <nsStringGlue.h>
 
 #include <pango/pango.h>
 #include <gconf/gconf-client.h>
diff -up gnome-web-photo-0.3/src/Printer.cpp.xulrunner191 gnome-web-photo-0.3/src/Printer.cpp
--- gnome-web-photo-0.3/src/Printer.cpp.xulrunner191	2006-12-31 16:48:52.000000000 -0500
+++ gnome-web-photo-0.3/src/Printer.cpp	2009-01-06 15:06:10.000000000 -0500
@@ -27,6 +27,7 @@
 #include <nsIPrintSettings.h>
 #include <nsIPrintSettingsService.h>
 #include <nsIServiceManager.h>
+#include <nsServiceManagerUtils.h>
 #include <nsIInterfaceRequestorUtils.h>
 #include <nsNativeCharsetUtils.h>
 #include <gtkmozembed_internal.h>
@@ -44,10 +45,10 @@ Printer::Printer (GtkMozEmbed *aEmbed,
 , mPrintBG(aPrintBG)
 {
   if (aFilename[0] == '/') {
-    NS_CopyNativeToUnicode (nsDependentCString(aFilename), mFilename);
+    NS_CStringToUTF16 (nsCString (aFilename), NS_CSTRING_ENCODING_UTF8, mFilename);
   } else {
     char *path = g_build_filename (g_get_current_dir(), aFilename, NULL);
-    NS_CopyNativeToUnicode (nsDependentCString(path), mFilename);
+    NS_CStringToUTF16 (nsCString (path), NS_CSTRING_ENCODING_UTF8, mFilename);
     g_free(path);
   }
 }
@@ -100,7 +101,6 @@ Printer::SetSettings(nsIPrintSettings *a
 {
 	aSettings->SetPrinterName (NS_LITERAL_STRING("PostScript/default").get());
 	aSettings->SetPrintRange (nsIPrintSettings::kRangeAllPages);
-	aSettings->SetPaperSize (nsIPrintSettings::kPaperSizeDefined);
 	aSettings->SetPaperSizeUnit (nsIPrintSettings::kPaperSizeMillimeters);
 	aSettings->SetPaperWidth (210.0);
 	aSettings->SetPaperHeight (297.0);
diff -up gnome-web-photo-0.3/src/Printer.h.xulrunner191 gnome-web-photo-0.3/src/Printer.h
--- gnome-web-photo-0.3/src/Printer.h.xulrunner191	2006-12-31 16:48:52.000000000 -0500
+++ gnome-web-photo-0.3/src/Printer.h	2009-01-06 15:06:10.000000000 -0500
@@ -27,7 +27,7 @@
 #include <nsIWebBrowserPrint.h>
 #include <nsIWebProgressListener.h>
 #include <nsIPrintProgressParams.h>
-#include <nsString.h>
+#include <nsStringGlue.h>
 #include <gtkmozembed.h>
 
 class nsIPrintSettings;
diff -up gnome-web-photo-0.3/src/Writer.cpp.xulrunner191 gnome-web-photo-0.3/src/Writer.cpp
--- gnome-web-photo-0.3/src/Writer.cpp.xulrunner191	2007-01-29 13:53:02.000000000 -0500
+++ gnome-web-photo-0.3/src/Writer.cpp	2009-01-06 15:11:26.000000000 -0500
@@ -33,17 +33,18 @@
 #include <nsIDOMWindow.h>
 #include <nsIDOMWindow2.h>
 #include <nsIDOMDocument.h>
+#include <nsIDOMNSDocument.h>
 #include <nsIDocument.h>
 #include <nsIDocShell.h>
 #include <nsIDocumentViewer.h>
 #include <nsIMarkupDocumentViewer.h>
+#include <nsIInterfaceRequestorUtils.h>
 #include <nsIPresShell.h>
-#include <nsPresContext.h>
-#include <nsIView.h>
+#include <nsIDeviceContext.h>
 #include <nsIViewManager.h>
 #include <nsIScrollableView.h>
-#include <nsIRenderingContext.h>
-#include <nsIDrawingSurface.h>
+#include <gfxContext.h>
+#include <gfxPlatform.h>
 #include <nsRect.h>
 #include <gtkmozembed_internal.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
@@ -78,43 +79,29 @@ Writer::Write()
 {
   NS_ENSURE_STATE (mEmbed);
 
-  PRBool retval = PR_FALSE;
-
   nsresult rv;
   nsCOMPtr<nsIWebBrowser> browser;
   gtk_moz_embed_get_nsIWebBrowser (mEmbed, getter_AddRefs (browser));
-  NS_ENSURE_TRUE (browser, retval);
+  NS_ENSURE_TRUE (browser, PR_FALSE);
 
   nsCOMPtr<nsIDOMWindow> domWin;
   rv = browser->GetContentDOMWindow (getter_AddRefs (domWin));
-  NS_ENSURE_SUCCESS (rv, retval);
+  NS_ENSURE_SUCCESS (rv, PR_FALSE);
 
   nsCOMPtr<nsIDOMDocument> domDoc;
   rv = domWin->GetDocument (getter_AddRefs (domDoc));
-  NS_ENSURE_SUCCESS (rv, retval);
-
-  nsCOMPtr<nsIDocument> doc (do_QueryInterface (domDoc, &rv));
-  NS_ENSURE_SUCCESS (rv, retval);
-
-  nsCOMPtr<nsISupports> docShellAsISupports (doc->GetContainer ());
-  nsCOMPtr<nsIDocShell> docShell (do_QueryInterface (docShellAsISupports, &rv));
-  NS_ENSURE_SUCCESS (rv, retval);
-
-  nsCOMPtr<nsIPresShell> presShell;
-  rv = docShell->GetPresShell (getter_AddRefs (presShell));
-  NS_ENSURE_SUCCESS (rv, retval);
+  NS_ENSURE_SUCCESS (rv, PR_FALSE);
 
-  nsCOMPtr<nsPresContext> presContext;
-  rv = docShell->GetPresContext (getter_AddRefs (presContext));
-  NS_ENSURE_SUCCESS (rv, retval);
-
-  rv = NS_ERROR_NULL_POINTER;
-  nsIViewManager *viewManager = presShell->GetViewManager ();
-  NS_ENSURE_TRUE (viewManager, retval);
+  nsCOMPtr<nsIDOMNSDocument> nsDoc (do_QueryInterface (domDoc, &rv));
+  NS_ENSURE_SUCCESS (rv, PR_FALSE);
 
   /* Get document information */
-  CopyUTF16toUTF8 (doc->GetDocumentTitle(), mTitle);
-  mTitle.CompressWhitespace(PR_TRUE, PR_TRUE);
+  nsAutoString title;
+  nsDoc->GetTitle(title);
+  CopyUTF16toUTF8(title, mTitle);
+
+  nsCOMPtr<nsIDocument> doc (do_QueryInterface (domDoc, &rv));
+  NS_ENSURE_SUCCESS (rv, PR_FALSE);
 
   nsIURI *uri = doc->GetDocumentURI();
   if (uri) {
@@ -123,6 +110,20 @@ Writer::Write()
 
   doc->FlushPendingNotifications (Flush_Display);
 
+  nsCOMPtr<nsIDocShell> docShell (do_GetInterface (browser, &rv));
+  NS_ENSURE_SUCCESS (rv, rv);
+
+  nsCOMPtr<nsIPresShell> presShell;
+  rv = docShell->GetPresShell (getter_AddRefs (presShell));
+  NS_ENSURE_SUCCESS (rv, PR_FALSE);
+
+  nsIViewManager *viewManager = presShell->GetViewManager ();
+  NS_ENSURE_TRUE (viewManager, PR_FALSE);
+
+  nsIDeviceContext *dc; 
+  viewManager->GetDeviceContext (dc);
+  NS_ENSURE_TRUE (dc, PR_FALSE);
+
   nsIScrollableView* scrollableView = nsnull;
   viewManager->GetRootScrollableView (&scrollableView);
   nsIView* view;
@@ -132,13 +133,11 @@ Writer::Write()
     viewManager->GetRootView(view);
   }
 
-  /* Get conversion factors */
-  float p2t = presContext->PixelsToTwips();
-  float t2p = presContext->TwipsToPixels();
+  PRInt32 p2a = dc->AppUnitsPerDevPixel();
 
   /* Limit the bitmap size */
-  nscoord twipLimitW = NSIntPixelsToTwips(mWidth, p2t);
-  nscoord twipLimitH = NSIntPixelsToTwips(mHeight, p2t);
+  nscoord twipLimitW = NSIntPixelsToAppUnits(mWidth, p2a);
+  nscoord twipLimitH = NSIntPixelsToAppUnits(mHeight, p2a);
 
   nsRect r = view->GetBounds() - view->GetPosition();
 
@@ -155,11 +154,11 @@ Writer::Write()
     return PR_FALSE;
   }
 
-  mWidth = NSTwipsToIntPixels(r.width, t2p);
-  mHeight = NSTwipsToIntPixels(r.height, t2p);
+  mWidth = NSAppUnitsToIntPixels(r.width, p2a);
+  mHeight = NSAppUnitsToIntPixels(r.height, p2a);
 
   PRUint32 stripe = (2 << 20) / mWidth;
-  nscoord twipStripe = NSIntPixelsToTwips(stripe, p2t);
+  nscoord twipStripe = NSIntPixelsToAppUnits(stripe, p2a);
 
   nsRect cutout(r);
   cutout.SizeTo(r.width, PR_MIN(r.height, twipStripe));
@@ -167,71 +166,62 @@ Writer::Write()
   PRUint32 roundCount = 0;
   const char* status = "";
 
+  PRUint32 width = NSAppUnitsToIntPixels(cutout.width, p2a);
+  PRUint32 height = NSAppUnitsToIntPixels(cutout.height, p2a);
+
+  nsRefPtr<gfxImageSurface> imgSurface =
+     new gfxImageSurface(gfxIntSize(width, height),
+                         gfxImageSurface::ImageFormatRGB24);
+  NS_ENSURE_TRUE(imgSurface, PR_FALSE);
+
+  nsRefPtr<gfxContext> imgContext = new gfxContext(imgSurface);
+
+  nsRefPtr<gfxASurface> surface = 
+    gfxPlatform::GetPlatform()->
+    CreateOffscreenSurface(gfxIntSize(width, height),
+      gfxASurface::ImageFormatRGB24);
+  NS_ENSURE_TRUE(surface, PR_FALSE);
+
+  nsRefPtr<gfxContext> context = new gfxContext(surface);
+  NS_ENSURE_TRUE(context, PR_FALSE);
+
   if (r.IsEmpty()) {
     status = "EMPTY";
+  } else if (!Prepare(imgSurface)) {
+    status = "PNGPREPAREFAILED";
   } else {
     PRBool failed = PR_FALSE;
+
     while (!cutout.IsEmpty() && !mHadError && !failed) {
       ++roundCount;
 
-      PRUint32 width = NSTwipsToIntPixels(cutout.width, t2p);
-      PRUint32 height = NSTwipsToIntPixels(cutout.height, t2p);
+      width = NSAppUnitsToIntPixels(cutout.width, p2a);
+      height = NSAppUnitsToIntPixels(cutout.height, p2a);
+
+      rv = presShell->RenderDocument(cutout, PR_FALSE, PR_TRUE,
+                                     NS_RGB(255, 255, 255), context);
+      if (NS_SUCCEEDED(rv)) {
+        imgContext->DrawSurface(surface, gfxSize(width, height));
+      }
 
-      nsCOMPtr<nsIRenderingContext> context;
-      rv = viewManager->RenderOffscreen (view, cutout,
-                                         PR_FALSE, PR_TRUE, NS_RGB(255, 255, 255),
-                                         getter_AddRefs(context));
       if (NS_FAILED(rv)) {
         failed = PR_TRUE;
         status = "FAILEDRENDER";
       } else {
-        nsIDrawingSurface* surface;
-        context->GetDrawingSurface(&surface);
-        if (!surface) {
-          failed = PR_TRUE;
-          status = "NOSURFACE";
-        } else {
-          PRUint32 w, h;
-          surface->GetDimensions(&w,&h);
-          /* these are computed from ScaleRoundOut(t2p) on cutout.Bounds(), and
-           * may be one pixel too wide and/or hight
-           */
-
-          if (width > w || height > h) {
-            failed = PR_TRUE;
-            status = "SIZEMISMATCH";
-          } else if (!Prepare(surface)) {
-            failed = PR_TRUE;
-            status = "PNGPREPAREFAILED";
-          } else {
-            PRUint8* data;
-            PRInt32 rowLen, rowSpan;
-            rv = surface->Lock(0, 0, w, h, (void**)&data, &rowSpan, &rowLen,
-                               NS_LOCK_SURFACE_READ_ONLY);
-            if (NS_FAILED(rv)) {
-	      failed = PR_TRUE;
-              status = "FAILEDLOCK";
-            } else {
-              LOG (".");
-              WriteSurface(surface, width, height, data, rowLen, rowSpan, rowLen/w);
-              surface->Unlock();
-            }
-          }
-        }
-        context->DestroyDrawingSurface(surface);
+        WriteSurface(imgSurface, width, height);
       }
       cutout.MoveBy(0, twipStripe);
-      cutout.IntersectRect(r, cutout);
+      cutout.height = PR_MIN(cutout.height, r.y + r.height - cutout.y);
     }
 
-    retval = Finish();
-    status = retval ? "OK" : status[0] != '\0' ? status : "FAILED";
+    rv = Finish();
+    status = rv ? "OK" : status[0] != '\0' ? status : "FAILED";
     LOG ("\n");
   }
 
   LOG ("%d round(s) of height %d, result: %s\n", roundCount, stripe, status);
 
-  return retval;
+  return rv;
 }
 
 /* PNG Writer */
@@ -267,7 +257,7 @@ PNGWriter::~PNGWriter()
 };
 
 PRBool
-PNGWriter::Prepare(nsIDrawingSurface *aSurface)
+PNGWriter::Prepare(gfxImageSurface *aSurface)
 {
   if (mInitialised) return PR_TRUE;
 
@@ -337,10 +327,6 @@ PNGWriter::Prepare(nsIDrawingSurface *aS
 //                   PNG_RESOLUTION_METER);
 // 1000 * 72 / 25.4 = 2834
 
-  nsPixelFormat format;
-  aSurface->GetPixelFormat(&format);
-  /* FIXME: assert that subsequent surfaces have same format? */
-
   /* FIXME: do I need 8, or the format.m[R|G|B]Count here? */
   png_set_IHDR (mPNG, mInfo, mWidth, mHeight, 8 /* bits per sample */ /* FIXME? */,
                 PNG_COLOR_TYPE_RGB /* FIXME: alpha? */, PNG_INTERLACE_NONE,
@@ -348,10 +334,10 @@ PNGWriter::Prepare(nsIDrawingSurface *aS
   if (mHadError) return PR_FALSE;
 
   png_color_8 sig_bit;
-  sig_bit.red = format.mRedCount;
-  sig_bit.green = format.mGreenCount;
-  sig_bit.blue = format.mBlueCount;
-  sig_bit.alpha = format.mAlphaCount;
+  sig_bit.red = 8;
+  sig_bit.green = 8;
+  sig_bit.blue = 8;
+  sig_bit.alpha = 0;
   png_set_sBIT (mPNG, mInfo, &sig_bit);
   if (mHadError) return PR_FALSE;
 
@@ -370,43 +356,27 @@ PNGWriter::Prepare(nsIDrawingSurface *aS
 }
 
 void
-PNGWriter::WriteSurface(nsIDrawingSurface *aSurface,
+PNGWriter::WriteSurface(gfxImageSurface *aSurface,
 			PRUint32 aWidth,
-			PRUint32 aHeight,
-			PRUint8 *aData,
-			PRInt32 aRowLen,
-			PRInt32 aRowSpan,
-                        PRInt32 aPixelSpan)
+			PRUint32 aHeight)
 {
-  nsPixelFormat format;
-  aSurface->GetPixelFormat(&format);
+  long cairoStride = aSurface->Stride();
+  unsigned char* cairoData = aSurface->Data();
 
-  PRUint8* buf = (PRUint8*) mRow;
-  for (PRUint32 i = 0; i < aHeight; ++i)
-    {
-      PRUint8* src = aData + i*aRowSpan;
-
-      PRUint8* dest = buf;
-      for (PRUint32 j = 0; j < aWidth; ++j)
-        {
-          /* v is the pixel value */
-#ifdef WORDS_BIGENDIAN
-          PRUint32 v = (src[0] << 24) | (src[1] << 16) | (src[2] << 8) | src[3];
-          v >>= (32 - 8*aPixelSpan);
-//maybe like this:  PRUint32 v = *((PRUint32*) src) >> (32 - 8*bytesPerPix);
-#else
-          PRUint32 v = *((PRUint32*) src);
-#endif
-	  dest[0] = ((v & format.mRedMask) >> format.mRedShift) << (8 - format.mRedCount);
-	  dest[1] = ((v & format.mGreenMask) >> format.mGreenShift) << (8 - format.mGreenCount);
-	  dest[2] = ((v & format.mBlueMask) >> format.mBlueShift) << (8 - format.mBlueCount);
-          src += aPixelSpan;
-	  dest += 3;
-        }
-
-      png_write_row (mPNG, mRow);
-      if (mHadError) break;
+  for (PRUint32 row = 0; row < aHeight; ++row) {
+    PRUint8* dest = mRow;
+    for (PRUint32 col = 0; col < aWidth; ++col) {
+      PRUint32* cairoPixel = reinterpret_cast<PRUint32*>
+                             ((cairoData + row * cairoStride + 4 * col));
+
+      dest[0] = (*cairoPixel >> 16) & 0xFF;
+      dest[1] = (*cairoPixel >>  8) & 0xFF;
+      dest[2] = (*cairoPixel >>  0) & 0xFF;
+      dest += 3;
     }
+    png_write_row (mPNG, mRow);
+    if (mHadError) break;
+  }
 }
 
 PRBool
@@ -464,7 +434,7 @@ PPMWriter::~PPMWriter()
 };
 
 PRBool
-PPMWriter::Prepare(nsIDrawingSurface *aSurface)
+PPMWriter::Prepare(gfxImageSurface *aSurface)
 {
   if (mInitialised) return PR_TRUE;
 
@@ -482,45 +452,30 @@ PPMWriter::Prepare(nsIDrawingSurface *aS
 }
 
 void
-PPMWriter::WriteSurface(nsIDrawingSurface *aSurface,
+PPMWriter::WriteSurface(gfxImageSurface *aSurface,
                         PRUint32 aWidth,
-                        PRUint32 aHeight,
-                        PRUint8 *aData,
-                        PRInt32 aRowLen,
-                        PRInt32 aRowSpan,
-                        PRInt32 aPixelSpan)
+                        PRUint32 aHeight)
 {
-  nsPixelFormat format;
-  aSurface->GetPixelFormat(&format);
+  long cairoStride = aSurface->Stride();
+  unsigned char* cairoData = aSurface->Data();
 
-  PRUint8* buf = (PRUint8*) mRow;
-  for (PRUint32 i = 0; i < aHeight; ++i)
-    {
-      PRUint8* src = aData + i*aRowSpan;
-
-      PRUint8* dest = mRow;
-      for (PRUint32 j = 0; j < aWidth; ++j)
-        {
-          /* v is the pixel value */
-#ifdef WORDS_BIGENDIAN
-          PRUint32 v = (src[0] << 24) | (src[1] << 16) | (src[2] << 8) | src[3];
-          v >>= (32 - 8*aPixelSpan);
-//maybe like this:  PRUint32 v = *((PRUint32*) src) >> (32 - 8*bytesPerPix);
-#else
-          PRUint32 v = *((PRUint32*) src);
-#endif
-          dest[0] = ((v & format.mRedMask) >> format.mRedShift) << (8 - format.mRedCount);
-          dest[1] = ((v & format.mGreenMask) >> format.mGreenShift) << (8 - format.mGreenCount);
-          dest[2] = ((v & format.mBlueMask) >> format.mBlueShift) << (8 - format.mBlueCount);
-          src += aPixelSpan;
-          dest += 3;
-        }
-
-      if (fwrite(mRow, 3, mWidth, mFile) != mWidth) {
-        mHadError = PR_TRUE;
-        break;
-      }
+  for (PRUint32 row = 0; row < aHeight; ++row) {
+    PRUint8* dest = mRow;
+    for (PRUint32 col = 0; col < aWidth; ++col) {
+      PRUint32* cairoPixel = reinterpret_cast<PRUint32*>
+                             ((cairoData + row * cairoStride + 4 * col));
+
+      dest[0] = (*cairoPixel >> 16) & 0xFF;
+      dest[1] = (*cairoPixel >>  8) & 0xFF;
+      dest[2] = (*cairoPixel >>  0) & 0xFF;
+      dest += 3;
+    }
+
+    if (fwrite(mRow, 3, mWidth, mFile) != mWidth) {
+      mHadError = PR_TRUE;
+      break;
     }
+  }
 }
 
 PRBool
@@ -553,7 +508,7 @@ ThumbnailWriter::~ThumbnailWriter()
 }
 
 PRBool
-ThumbnailWriter::Prepare(nsIDrawingSurface *aSurface)
+ThumbnailWriter::Prepare(gfxImageSurface *aSurface)
 {
   if (!mInitialised) {
     void *buf = malloc (sizeof (GdkPixdata) + 3 * THUMBNAIL_WIDTH * THUMBNAIL_HEIGHT);
@@ -576,38 +531,25 @@ ThumbnailWriter::Prepare(nsIDrawingSurfa
 }  
 
 void
-ThumbnailWriter::WriteSurface(nsIDrawingSurface *aSurface,
+ThumbnailWriter::WriteSurface(gfxImageSurface *aSurface,
 			      PRUint32 aWidth,
-			      PRUint32 aHeight,
-			      PRUint8 *aData,
-			      PRInt32 aRowLen,
-			      PRInt32 aRowSpan,
-                              PRInt32 aPixelSpan)
+			      PRUint32 aHeight)
 {
-  nsPixelFormat format;
-  aSurface->GetPixelFormat(&format);
+  long cairoStride = aSurface->Stride();
+  unsigned char* cairoData = aSurface->Data();
 
-  for (PRUint32 i = 0; i < aHeight; ++i)
-    {
-      PRUint8* src = aData + i*aRowSpan;
-      for (PRUint32 j = 0; j < aWidth; ++j)
-        {
-          /* v is the pixel value */
-#ifdef WORDS_BIGENDIAN
-          PRUint32 v = (src[0] << 24) | (src[1] << 16) | (src[2] << 8) | src[3];
-          v >>= (32 - 8*aPixelSpan);
-#else
-          PRUint32 v = *((PRUint32*) src);
-#endif
-	  mDest[0] = ((v & format.mRedMask) >> format.mRedShift) << (8 - format.mRedCount);
-	  mDest[1] = ((v & format.mGreenMask) >> format.mGreenShift) << (8 - format.mGreenCount);
-	  mDest[2] = ((v & format.mBlueMask) >> format.mBlueShift) << (8 - format.mBlueCount);
-          src += aPixelSpan;
-	  mDest += 3;
-        }
-
-      if (mHadError) break;
+  for (PRUint32 row = 0; row < aHeight; ++row) {
+    for (PRUint32 col = 0; col < aWidth; ++col) {
+      PRUint32* cairoPixel = reinterpret_cast<PRUint32*>
+                             ((cairoData + row * cairoStride + 4 * col));
+
+      mDest[0] = (*cairoPixel >> 16) & 0xFF;
+      mDest[1] = (*cairoPixel >>  8) & 0xFF;
+      mDest[2] = (*cairoPixel >>  0) & 0xFF;
+      mDest += 3;
     }
+    if (mHadError) break;
+  }
 }
 
 PRBool
@@ -670,7 +612,7 @@ JPEGWriter::~JPEGWriter()
 };
 
 PRBool
-JPEGWriter::Prepare(nsIDrawingSurface *aSurface)
+JPEGWriter::Prepare(gfxImageSurface *aSurface)
 {
   if (mInitialised) return PR_TRUE;
 
@@ -713,44 +655,29 @@ JPEGWriter::Prepare(nsIDrawingSurface *a
 }
 
 void
-JPEGWriter::WriteSurface(nsIDrawingSurface *aSurface,
+JPEGWriter::WriteSurface(gfxImageSurface *aSurface,
 			 PRUint32 aWidth,
-			 PRUint32 aHeight,
-			 PRUint8 *aData,
-			 PRInt32 aRowLen,
-		         PRInt32 aRowSpan,
-			 PRInt32 aPixelSpan)
+			 PRUint32 aHeight)
 {
-  nsPixelFormat format;
-  aSurface->GetPixelFormat(&format);
+  long cairoStride = aSurface->Stride();
+  unsigned char* cairoData = aSurface->Data();
 
-  PRUint8* buf = (PRUint8*) mRow;
-  for (PRUint32 i = 0; i < aHeight; ++i)
-    {
-      PRUint8* src = aData + i*aRowSpan;
-
-      PRUint8* dest = buf;
-      for (PRUint32 j = 0; j < aWidth; ++j)
-        {
-          /* v is the pixel value */
-#ifdef WORDS_BIGENDIAN
-          PRUint32 v = (src[0] << 24) | (src[1] << 16) | (src[2] << 8) | src[3];
-          v >>= (32 - 8*aPixelSpan);
-//maybe like this:  PRUint32 v = *((PRUint32*) src) >> (32 - 8*bytesPerPix);
-#else
-          PRUint32 v = *((PRUint32*) src);
-#endif
-	  dest[0] = ((v & format.mRedMask) >> format.mRedShift) << (8 - format.mRedCount);
-	  dest[1] = ((v & format.mGreenMask) >> format.mGreenShift) << (8 - format.mGreenCount);
-	  dest[2] = ((v & format.mBlueMask) >> format.mBlueShift) << (8 - format.mBlueCount);
-          src += aPixelSpan;
-	  dest += 3;
-        }
-
-      JSAMPROW rows[1] = { (JSAMPLE*) mRow };
-      (void) jpeg_write_scanlines (&mJPEG, rows, 1);
-      if (mHadError) break;
+  for (PRUint32 row = 0; row < aHeight; ++row) {
+    PRUint8* dest = mRow;
+    for (PRUint32 col = 0; col < aWidth; ++col) {
+      PRUint32* cairoPixel = reinterpret_cast<PRUint32*>
+                             ((cairoData + row * cairoStride + 4 * col));
+
+      dest[0] = (*cairoPixel >> 16) & 0xFF;
+      dest[1] = (*cairoPixel >>  8) & 0xFF;
+      dest[2] = (*cairoPixel >>  0) & 0xFF;
+      dest += 3;
     }
+
+    JSAMPROW rows[1] = { (JSAMPLE*) mRow };
+    (void) jpeg_write_scanlines (&mJPEG, rows, 1);
+    if (mHadError) break;
+  }
 }
 
 PRBool
diff -up gnome-web-photo-0.3/src/Writer.h.xulrunner191 gnome-web-photo-0.3/src/Writer.h
--- gnome-web-photo-0.3/src/Writer.h.xulrunner191	2007-01-29 13:53:02.000000000 -0500
+++ gnome-web-photo-0.3/src/Writer.h	2009-01-06 15:06:10.000000000 -0500
@@ -21,7 +21,8 @@
 #ifndef WRITER_H
 #define WRITER_H
 
-#include <nsString.h>
+#include <nsStringGlue.h>
+#include <gfxImageSurface.h>
 #include <gtkmozembed.h>
 #include <gdk-pixbuf/gdk-pixdata.h>
 #include <png.h>
@@ -31,8 +32,6 @@
 #include <jerror.h>
 #endif
 
-class nsIDrawingSurface;
-
 class Writer
 {
 public:
@@ -41,9 +40,9 @@ public:
 
   PRBool Write ();
 
-  virtual PRBool Prepare(nsIDrawingSurface *) = 0;
+  virtual PRBool Prepare(gfxImageSurface *) = 0;
   virtual PRBool Finish() = 0;
-  virtual void WriteSurface(nsIDrawingSurface*, PRUint32, PRUint32, PRUint8*, PRInt32, PRInt32, PRInt32) = 0;
+  virtual void WriteSurface(gfxImageSurface*, PRUint32, PRUint32) = 0;
 
 protected:
   GtkMozEmbed *mEmbed;
@@ -64,10 +63,10 @@ public:
   PNGWriter (GtkMozEmbed*, const char *);
   virtual ~PNGWriter();
 
-  virtual PRBool Prepare(nsIDrawingSurface *);
+  virtual PRBool Prepare(gfxImageSurface *);
   virtual PRBool Finish();
 
-  virtual void WriteSurface(nsIDrawingSurface*, PRUint32, PRUint32, PRUint8*, PRInt32, PRInt32, PRInt32);
+  virtual void WriteSurface(gfxImageSurface*, PRUint32, PRUint32);
 
   static void WarnCallback(png_structp, png_const_charp);
   static void ErrorCallback(png_structp, png_const_charp);
@@ -86,10 +85,10 @@ public:
   PPMWriter (GtkMozEmbed*, const char *);
   virtual ~PPMWriter();
 
-  virtual PRBool Prepare(nsIDrawingSurface *);
+  virtual PRBool Prepare(gfxImageSurface *);
   virtual PRBool Finish();
 
-  virtual void WriteSurface(nsIDrawingSurface*, PRUint32, PRUint32, PRUint8*, PRInt32, PRInt32, PRInt32);
+  virtual void WriteSurface(gfxImageSurface*, PRUint32, PRUint32);
 
 private:
   FILE *mFile;
@@ -102,9 +101,9 @@ public:
   ThumbnailWriter(GtkMozEmbed*, const char*, PRUint32);
   virtual ~ThumbnailWriter();
 
-  virtual PRBool Prepare(nsIDrawingSurface *);
+  virtual PRBool Prepare(gfxImageSurface *);
   virtual PRBool Finish();
-  virtual void WriteSurface(nsIDrawingSurface*, PRUint32, PRUint32, PRUint8*, PRInt32, PRInt32, PRInt32);
+  virtual void WriteSurface(gfxImageSurface*, PRUint32, PRUint32);
 
 private:
   GdkPixdata *mData;
@@ -119,10 +118,10 @@ public:
   JPEGWriter (GtkMozEmbed*, const char *, PRUint16);
   virtual ~JPEGWriter();
 
-  virtual PRBool Prepare(nsIDrawingSurface *);
+  virtual PRBool Prepare(gfxImageSurface *);
   virtual PRBool Finish();
 
-  virtual void WriteSurface(nsIDrawingSurface*, PRUint32, PRUint32, PRUint8*, PRInt32, PRInt32, PRInt32);
+  virtual void WriteSurface(gfxImageSurface*, PRUint32, PRUint32);
 
 private:
   PRUint16 mQuality;


Index: gnome-web-photo.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-web-photo/devel/gnome-web-photo.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- gnome-web-photo.spec	13 Nov 2008 04:18:02 -0000	1.12
+++ gnome-web-photo.spec	6 Jan 2009 20:14:15 -0000	1.13
@@ -1,9 +1,9 @@
-%define gecko_version 1.9.0.4
+%define gecko_version 1.9.1
 
 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}/
@@ -22,7 +22,7 @@
 # Required for the xulrunner patch
 BuildRequires: libtool gnome-common
 
-Patch0: xulrunner19.patch
+Patch0: xulrunner191.patch
 
 %description
 gnome-web-photo contains a thumbnailer that will be used by GNOME applications,
@@ -31,7 +31,7 @@
 %prep
 %setup -q
 
-%patch0 -p1 -b .xulrunner19
+%patch0 -p1 -b .xulrunner191
 
 %build
 autoreconf
@@ -80,6 +80,9 @@
 %{_datadir}/gnome-web-photo
 
 %changelog
+* Tue Jan 06 2009 Christopher Aillon <caillon at redhat.com> - 0.3-13
+- Rebuild against newer gecko
+
 * Wed Nov 12 2008 Christopher Aillon <caillon at redhat.com> - 0.3-12
 - Rebuild against newer gecko
 


--- xulrunner19.patch DELETED ---



From thias at fedoraproject.org  Tue Jan  6 20:16:27 2009
From: thias at fedoraproject.org (Matthias Saou)
Date: Tue,  6 Jan 2009 20:16:27 +0000 (UTC)
Subject: rpms/python-twisted-web2/F-10 .cvsignore, 1.2,
	1.3 python-twisted-web2.spec, 1.2, 1.3 sources, 1.2,
	1.3 twisted-web2_0.2.0-1.1.diff, 1.1, NONE
Message-ID: <20090106201627.38CD770108@cvs1.fedora.phx.redhat.com>

Author: thias

Update of /cvs/extras/rpms/python-twisted-web2/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19784/F-10

Modified Files:
	.cvsignore python-twisted-web2.spec sources 
Removed Files:
	twisted-web2_0.2.0-1.1.diff 
Log Message:
Update to svn code more recent than 0.2.0 to work with Twisted 2.5.0, yet much older than any 8.x release.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-twisted-web2/F-10/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	1 Jan 2009 11:18:25 -0000	1.2
+++ .cvsignore	6 Jan 2009 20:15:56 -0000	1.3
@@ -1 +1 @@
-TwistedWeb2-0.2.0.tar.bz2
+TwistedWeb2-0.2.0.r21556.tar.bz2


Index: python-twisted-web2.spec
===================================================================
RCS file: /cvs/extras/rpms/python-twisted-web2/F-10/python-twisted-web2.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- python-twisted-web2.spec	1 Jan 2009 11:24:24 -0000	1.2
+++ python-twisted-web2.spec	6 Jan 2009 20:15:56 -0000	1.3
@@ -4,12 +4,24 @@
 Summary: Experimental Twisted Web Server Framework
 Name: %{python}-twisted-web2
 Version: 0.2.0
-Release: 3%{?dist}
+Release: 4.r21556%{?dist}
 License: MIT
 Group: Development/Libraries
 URL: http://twistedmatrix.com/trac/wiki/TwistedWeb2
-Source: http://tmrc.mit.edu/mirror/twisted/Web2/TwistedWeb2-%{version}.tar.bz2
-Patch0: twisted-web2_0.2.0-1.1.diff
+# For Twisted 2.5.0 we need a snapshot newer than 0.2.0 but older than 8.x.
+#Source: http://tmrc.mit.edu/mirror/twisted/Web2/TwistedWeb2-%{version}.tar.bz2
+# svn co -r 21556 svn://svn.twistedmatrix.com/svn/Twisted/trunk Twisted
+# cp -al Twisted/doc/web2 TwistedWeb2/doc
+# mkdir -p TwistedWeb2/twisted/plugins
+# cp -al Twisted/twisted/plugins/twisted_web2.py TwistedWeb2/twisted/plugins/
+# cp -al Twisted/twisted/web2 TwistedWeb2/twisted/
+# cp -al Twisted/LICENSE TwistedWeb2/
+# mv TwistedWeb2/twisted/web2/topfiles/* TwistedWeb2/
+# find TwistedWeb2 -name .svn | xargs rm -rf {} \;
+# rmdir TwistedWeb2/twisted/web2/topfiles/
+# mv TwistedWeb2 TwistedWeb2-0.2.0.r21556
+# tar cjvf TwistedWeb2-0.2.0.r21556.tar.bz2 TwistedWeb2-0.2.0.r21556
+Source: TwistedWeb2-%{version}.r21556.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: %{python}-twisted-core >= 2.5.0
 BuildRequires: %{python}-devel
@@ -26,8 +38,7 @@
 
 
 %prep
-%setup -q -n TwistedWeb2-%{version}
-%patch0 -p1
+%setup -q -n TwistedWeb2-%{version}.r21556
 
 
 %build
@@ -69,6 +80,10 @@
 
 
 %changelog
+* Tue Jan  6 2009 Matthias Saou <http://freshrpms.net/> 0.2.0-4.r21556
+- Update to svn code more recent than 0.2.0 to work with Twisted 2.5.0, yet
+  much older than any 8.x release.
+
 * Thu Jan  1 2009 Matthias Saou <http://freshrpms.net/> 0.2.0-3
 - Backport cosmetic changes from 8.1.0 devel spec to here. This will be an
   older build to go with Twisted < 8.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-twisted-web2/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	1 Jan 2009 11:18:25 -0000	1.2
+++ sources	6 Jan 2009 20:15:56 -0000	1.3
@@ -1 +1 @@
-7d6dea006d7f1e004df9f6aad730fbee  TwistedWeb2-0.2.0.tar.bz2
+abf48cb943bbb0821177c3b044050e27  TwistedWeb2-0.2.0.r21556.tar.bz2


--- twisted-web2_0.2.0-1.1.diff DELETED ---



From thias at fedoraproject.org  Tue Jan  6 20:16:27 2009
From: thias at fedoraproject.org (Matthias Saou)
Date: Tue,  6 Jan 2009 20:16:27 +0000 (UTC)
Subject: rpms/python-twisted-web2/F-9 .cvsignore, 1.2,
	1.3 python-twisted-web2.spec, 1.2, 1.3 sources, 1.2,
	1.3 twisted-web2_0.2.0-1.1.diff, 1.1, NONE
Message-ID: <20090106201627.5EE8870140@cvs1.fedora.phx.redhat.com>

Author: thias

Update of /cvs/extras/rpms/python-twisted-web2/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19784/F-9

Modified Files:
	.cvsignore python-twisted-web2.spec sources 
Removed Files:
	twisted-web2_0.2.0-1.1.diff 
Log Message:
Update to svn code more recent than 0.2.0 to work with Twisted 2.5.0, yet much older than any 8.x release.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-twisted-web2/F-9/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	1 Jan 2009 11:18:25 -0000	1.2
+++ .cvsignore	6 Jan 2009 20:15:57 -0000	1.3
@@ -1 +1 @@
-TwistedWeb2-0.2.0.tar.bz2
+TwistedWeb2-0.2.0.r21556.tar.bz2


Index: python-twisted-web2.spec
===================================================================
RCS file: /cvs/extras/rpms/python-twisted-web2/F-9/python-twisted-web2.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- python-twisted-web2.spec	1 Jan 2009 11:24:24 -0000	1.2
+++ python-twisted-web2.spec	6 Jan 2009 20:15:57 -0000	1.3
@@ -4,12 +4,24 @@
 Summary: Experimental Twisted Web Server Framework
 Name: %{python}-twisted-web2
 Version: 0.2.0
-Release: 3%{?dist}
+Release: 4.r21556%{?dist}
 License: MIT
 Group: Development/Libraries
 URL: http://twistedmatrix.com/trac/wiki/TwistedWeb2
-Source: http://tmrc.mit.edu/mirror/twisted/Web2/TwistedWeb2-%{version}.tar.bz2
-Patch0: twisted-web2_0.2.0-1.1.diff
+# For Twisted 2.5.0 we need a snapshot newer than 0.2.0 but older than 8.x.
+#Source: http://tmrc.mit.edu/mirror/twisted/Web2/TwistedWeb2-%{version}.tar.bz2
+# svn co -r 21556 svn://svn.twistedmatrix.com/svn/Twisted/trunk Twisted
+# cp -al Twisted/doc/web2 TwistedWeb2/doc
+# mkdir -p TwistedWeb2/twisted/plugins
+# cp -al Twisted/twisted/plugins/twisted_web2.py TwistedWeb2/twisted/plugins/
+# cp -al Twisted/twisted/web2 TwistedWeb2/twisted/
+# cp -al Twisted/LICENSE TwistedWeb2/
+# mv TwistedWeb2/twisted/web2/topfiles/* TwistedWeb2/
+# find TwistedWeb2 -name .svn | xargs rm -rf {} \;
+# rmdir TwistedWeb2/twisted/web2/topfiles/
+# mv TwistedWeb2 TwistedWeb2-0.2.0.r21556
+# tar cjvf TwistedWeb2-0.2.0.r21556.tar.bz2 TwistedWeb2-0.2.0.r21556
+Source: TwistedWeb2-%{version}.r21556.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: %{python}-twisted-core >= 2.5.0
 BuildRequires: %{python}-devel
@@ -26,8 +38,7 @@
 
 
 %prep
-%setup -q -n TwistedWeb2-%{version}
-%patch0 -p1
+%setup -q -n TwistedWeb2-%{version}.r21556
 
 
 %build
@@ -69,6 +80,10 @@
 
 
 %changelog
+* Tue Jan  6 2009 Matthias Saou <http://freshrpms.net/> 0.2.0-4.r21556
+- Update to svn code more recent than 0.2.0 to work with Twisted 2.5.0, yet
+  much older than any 8.x release.
+
 * Thu Jan  1 2009 Matthias Saou <http://freshrpms.net/> 0.2.0-3
 - Backport cosmetic changes from 8.1.0 devel spec to here. This will be an
   older build to go with Twisted < 8.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-twisted-web2/F-9/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	1 Jan 2009 11:18:25 -0000	1.2
+++ sources	6 Jan 2009 20:15:57 -0000	1.3
@@ -1 +1 @@
-7d6dea006d7f1e004df9f6aad730fbee  TwistedWeb2-0.2.0.tar.bz2
+abf48cb943bbb0821177c3b044050e27  TwistedWeb2-0.2.0.r21556.tar.bz2


--- twisted-web2_0.2.0-1.1.diff DELETED ---



From belegdol at fedoraproject.org  Tue Jan  6 20:43:26 2009
From: belegdol at fedoraproject.org (Julian Sikorski)
Date: Tue,  6 Jan 2009 20:43:26 +0000 (UTC)
Subject: rpms/gnome-chemistry-utils/devel sources,1.19,1.20
Message-ID: <20090106204326.B7A4770108@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-serv29895

Modified Files:
	sources 
Log Message:
Uploaded the non-broken source


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-chemistry-utils/devel/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources	6 Jan 2009 20:04:16 -0000	1.19
+++ sources	6 Jan 2009 20:42:56 -0000	1.20
@@ -1 +1 @@
-2e7d56758b57b618f28600c5bcf504e3  gnome-chemistry-utils-0.10.3.tar.bz2
+53f73604498817a0afcc58a81d1e034a  gnome-chemistry-utils-0.10.3.tar.bz2



From belegdol at fedoraproject.org  Tue Jan  6 20:46:30 2009
From: belegdol at fedoraproject.org (Julian Sikorski)
Date: Tue,  6 Jan 2009 20:46:30 +0000 (UTC)
Subject: rpms/gnome-chemistry-utils/F-10 sources,1.19,1.20
Message-ID: <20090106204630.1BE2D70108@cvs1.fedora.phx.redhat.com>

Author: belegdol

Update of /cvs/extras/rpms/gnome-chemistry-utils/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30512

Modified Files:
	sources 
Log Message:
Uploaded the non-broken source


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-chemistry-utils/F-10/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources	6 Jan 2009 20:12:19 -0000	1.19
+++ sources	6 Jan 2009 20:45:59 -0000	1.20
@@ -1 +1 @@
-2e7d56758b57b618f28600c5bcf504e3  gnome-chemistry-utils-0.10.3.tar.bz2
+53f73604498817a0afcc58a81d1e034a  gnome-chemistry-utils-0.10.3.tar.bz2



From scop at fedoraproject.org  Tue Jan  6 21:06:43 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Tue,  6 Jan 2009 21:06:43 +0000 (UTC)
Subject: rpms/bash-completion/devel bash-completion.spec,1.31,1.32
Message-ID: <20090106210643.67AAE70108@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/bash-completion/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5223

Modified Files:
	bash-completion.spec 
Log Message:
Shuffle patches to avoid fuzz.


Index: bash-completion.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bash-completion/devel/bash-completion.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- bash-completion.spec	6 Jan 2009 18:44:43 -0000	1.31
+++ bash-completion.spec	6 Jan 2009 21:06:13 -0000	1.32
@@ -13,12 +13,12 @@
 Source4:        %{name}-plague-client
 Patch0:         %{name}-20080705-rpm-installed.patch
 Patch1:         %{name}-20060301-yum-available-speedup-478784.patch
-Patch2:         %{name}-20060301-man.patch
+Patch2:         %{name}-20080705-lzma.patch
 Patch3:         %{name}-20080705-jpeg2000-304771.patch
 Patch4:         %{name}-20080705-mediafiles-444467.patch
 Patch5:         %{name}-20080705-svn-filenames-430059.patch
 Patch6:         %{name}-20080705-gzip.patch
-Patch7:         %{name}-20080705-lzma.patch
+Patch7:         %{name}-20060301-man.patch
 Patch8:         %{name}-20080705-rpm-backups.patch
 Patch9:         %{name}-20060301-rpm-eval.patch
 Patch10:        %{name}-20080705-getent.patch



From pgordon at fedoraproject.org  Tue Jan  6 21:07:46 2009
From: pgordon at fedoraproject.org (Peter Gordon)
Date: Tue,  6 Jan 2009 21:07:46 +0000 (UTC)
Subject: rpms/deluge/devel .cvsignore, 1.49, 1.50 deluge.spec, 1.76,
	1.77 sources, 1.49, 1.50 deluge-fixed-setup.py, 1.3, NONE
Message-ID: <20090106210746.761EB70108@cvs1.fedora.phx.redhat.com>

Author: pgordon

Update of /cvs/pkgs/rpms/deluge/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5510

Modified Files:
	.cvsignore deluge.spec sources 
Removed Files:
	deluge-fixed-setup.py 
Log Message:
Update to 1.1.0_RC3; use system instead of local/in-tarball rb_libtorrent (and also make the package noarch).


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/deluge/devel/.cvsignore,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- .cvsignore	30 Dec 2008 05:58:44 -0000	1.49
+++ .cvsignore	6 Jan 2009 21:07:16 -0000	1.50
@@ -1 +1 @@
-deluge-1.1.0_RC2.tar.bz2
+deluge-1.1.0_RC3.tar.bz2


Index: deluge.spec
===================================================================
RCS file: /cvs/pkgs/rpms/deluge/devel/deluge.spec,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- deluge.spec	30 Dec 2008 05:58:44 -0000	1.76
+++ deluge.spec	6 Jan 2009 21:07:16 -0000	1.77
@@ -1,20 +1,22 @@
 %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
+## Since we're using a system copy of rb_libtorrent, we need to ensure that it
+## is a very recent version for proper API matching.
+%define	min_rblibtorrent_ver	0.14.1
+
 Name:		deluge
 Version:	1.1.0
-Release:	0.1.rc2%{?dist}
+Release:	0.2.rc3%{?dist}
 Summary:	A GTK+ BitTorrent client with support for DHT, UPnP, and PEX
 Group:		Applications/Internet
 License:	GPLv2+
 URL:		http://deluge-torrent.org/           
 
-Source0:	http://download.deluge-torrent.org/source/%{version}/%{name}-1.1.0_RC2.tar.bz2
-## Not used for now: Deluge builds against its own internal copy of
-## rb_libtorrent. See below for more details. 
-# Source1:	%{name}-fixed-setup.py
+Source0:	http://download.deluge-torrent.org/source/%{version}/%{name}-1.1.0_RC3.tar.bz2
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildArch:	noarch
 
 BuildRequires:	boost-devel
 BuildRequires:	desktop-file-utils
@@ -22,9 +24,9 @@
 BuildRequires:	openssl-devel
 BuildRequires:	python-devel
 BuildRequires:	python-setuptools
-## Not used for now: Deluge builds against its own internal copy of
-## rb_libtorrent. See below for more details. 
-# BuildRequires:	rb_libtorrent-devel
+## The build script checks for the libtorrent module and skips compiling the
+## in-tarball one if this is found.
+BuildRequires:	rb_libtorrent-python >= %{min_rblibtorrent_ver}
 
 Requires:	/bin/sh
 Requires:	dbus-python
@@ -35,16 +37,7 @@
 Requires:	pyOpenSSL
 Requires:	python-setuptools
 Requires:	pyxdg
-## Deluge is now using its own internal copy of rb_libtorrent, which they have
-## heavily modified. Patches were sent to the upstream rb_libtorrent devs,
-## and Deluge frequently re-syncs with the upstream rb_libtorrent codebase.
-## Their reason for this is that there is no rasterbar-libtorrent package in
-## neither Debian nor its derivatives such as Ubuntu, so they do this to make
-## make it simpler to package...on Debian. @_@
-## However, as of this time, it does not build against a system copy of 0.12
-## or a 0.13 nightly snapshot, so this is the only way to make this software
-## functional. (See also: README.Packagers in the root of the source tarball.)
-# Requires:	rb_libtorrent
+Requires:	rb_libtorrent-python >= %{min_rblibtorrent_ver}
 
 %description
 Deluge is a new BitTorrent client, created using Python and GTK+. It is
@@ -56,9 +49,7 @@
 
 
 %prep
-%setup -qn "%{name}-1.1.0_RC2"
-## Not building against system rb_libtorrent - see above.
-# install -m 0755 %{SOURCE1} ./setup.py
+%setup -qn "%{name}-1.1.0_RC3"
 
 
 %build
@@ -88,7 +79,7 @@
 pushd %{buildroot}
 	find -type f -o -type l \
 		| sed '
-			s:%{buildroot}%{python_sitearch}::
+			s:%{buildroot}%{python_sitelib}::
 			s:^\.::
 			s:\(.*/deluge/i18n/\)\([^/_]\+\)\(.*\.mo$\):%lang(\2) \1\2\3:
 			s:^\([^%].*\)::
@@ -99,9 +90,9 @@
 ## dirs. We can't just glob in the %%files, as that would add duplicate
 ## entries for the .mo files which we've already marked with appropriate
 ## %%lang-fu. 
-	find ./%{python_sitearch}/deluge -not -iname '%{name}.mo' -type f \
+	find ./%{python_sitelib}/deluge -not -iname '%{name}.mo' -type f \
 		| sed 's:^\./::' >> %{name}.filelist
-	find ./%{python_sitearch}/deluge -not -iname '%{name}.mo' -type d \
+	find ./%{python_sitelib}/deluge -not -iname '%{name}.mo' -type d \
 		| sed 's:^\./:%%dir :' >> %{name}.filelist	
 ## Now we move that list back to our sources, so that '%%files -f' can find it
 ## properly.
@@ -115,7 +106,7 @@
 %files -f %{name}.filelist
 %defattr(-,root,root,-)
 %doc ChangeLog
-%{python_sitearch}/%{name}-1.1.0_RC2-py?.?.egg-info
+%{python_sitelib}/%{name}-1.1.0_RC3-py?.?.egg-info/
 %{_bindir}/%{name}
 %{_bindir}/%{name}d
 %{_datadir}/applications/fedora-%{name}.desktop
@@ -142,6 +133,15 @@
 
 
 %changelog
+* Thu Jan 06 2009 Peter Gordon <peter at thecodergeek.com> - 1.1.0-0.2.rc3
+- Update to new upstream release candidate (1.1.0 RC3)
+- Build against the system rb_libtorrent instead of using the in-tarball copy
+  (requires rb_libtorrent 0.14+), and adjust dependencies accordingly. Drop
+  the hacked setup.py script formerly used to enable this (fixed upstream):
+  - fixed-setup.py
+- Make it a noarch package now that it's just python scripts and related
+  data files (translations, images, etc.)
+
 * Mon Dec 29 2008 Peter Gordon <peter at thecodergeek.com> - 1.1.0-0.1.rc2
 - Update to new upstream release candidate (1.1.0 RC2)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/deluge/devel/sources,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- sources	30 Dec 2008 05:58:44 -0000	1.49
+++ sources	6 Jan 2009 21:07:16 -0000	1.50
@@ -1 +1 @@
-0d02b33db055f2cdfae58b581741fef6  deluge-1.1.0_RC2.tar.bz2
+1d30c0e8c47159298dee31c0289a908a  deluge-1.1.0_RC3.tar.bz2


--- deluge-fixed-setup.py DELETED ---



From sandeen at fedoraproject.org  Tue Jan  6 21:10:39 2009
From: sandeen at fedoraproject.org (Eric Sandeen)
Date: Tue,  6 Jan 2009 21:10:39 +0000 (UTC)
Subject: rpms/kernel/F-10 linux-2.6.27.9-ext4-cap-check-delay.patch, NONE,
	1.1 kernel.spec, 1.1203, 1.1204
Message-ID: <20090106211039.8154470108@cvs1.fedora.phx.redhat.com>

Author: sandeen

Update of /cvs/pkgs/rpms/kernel/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6674

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6.27.9-ext4-cap-check-delay.patch 
Log Message:
* Tue Jan 06 2009 Eric Sandeen <sandeen at redhat.com> 2.6.27.10-168
- ext4 - delay capable() checks in space accounting (#478299)


linux-2.6.27.9-ext4-cap-check-delay.patch:

--- NEW FILE linux-2.6.27.9-ext4-cap-check-delay.patch ---
Safer version of upstream commit a996031c87e093017c0763326a08896a3a4817f4

Delay capable() checks to avoid (most) AVC denials when checking free blocks
(Bug 478299 -  AVC denials on kernel 2.6.27.9-159.fc10.x86_64)

Signed-off-by: Eric Sandeen <sandeen at redhat.com>
---

Index: linux-2.6.27.noarch/fs/ext4/balloc.c
===================================================================
--- linux-2.6.27.noarch.orig/fs/ext4/balloc.c	2009-01-06 14:49:05.625574969 -0600
+++ linux-2.6.27.noarch/fs/ext4/balloc.c	2009-01-06 14:49:19.181637281 -0600
@@ -1612,15 +1612,15 @@ out:
 ext4_fsblk_t ext4_has_free_blocks(struct ext4_sb_info *sbi,
 						ext4_fsblk_t nblocks)
 {
-	ext4_fsblk_t free_blocks;
-	ext4_fsblk_t root_blocks = 0;
+	ext4_fsblk_t free_blocks, root_blocks;
 
 	free_blocks = percpu_counter_read_positive(&sbi->s_freeblocks_counter);
+	root_blocks = ext4_r_blocks_count(sbi->s_es);
 
-	if (!capable(CAP_SYS_RESOURCE) &&
-		sbi->s_resuid != current->fsuid &&
-		(sbi->s_resgid == 0 || !in_group_p(sbi->s_resgid)))
-		root_blocks = ext4_r_blocks_count(sbi->s_es);
+	if (sbi->s_resuid == current->fsuid ||
+	    ((sbi->s_resgid != 0) && in_group_p(sbi->s_resgid)) ||
+	    capable(CAP_SYS_RESOURCE))
+		root_blocks = 0;
 #ifdef CONFIG_SMP
 	if (free_blocks - root_blocks < FBC_BATCH)
 		free_blocks =


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/kernel.spec,v
retrieving revision 1.1203
retrieving revision 1.1204
diff -u -r1.1203 -r1.1204
--- kernel.spec	22 Dec 2008 20:48:33 -0000	1.1203
+++ kernel.spec	6 Jan 2009 21:10:09 -0000	1.1204
@@ -742,6 +742,8 @@
 Patch2807: linux-2.6-pciehp-kill-annoying-messages.patch
 
 Patch2900: linux-2.6.27-ext4-rename-ext4dev-to-ext4.patch
+# Delay capable check to avoid most AVCs (#478299)
+Patch2901: linux-2.6.27.9-ext4-cap-check-delay.patch
 
 # Add better support for DMI-based autoloading
 Patch3110: linux-2.6-dmi-autoload.patch
@@ -1165,8 +1167,9 @@
 # bugfixes to drivers and filesystems
 #
 
-# Pending ext4 patch queue, minus fiemap, includes s/ext4dev/ext4
+# ext4
 ApplyPatch linux-2.6.27-ext4-rename-ext4dev-to-ext4.patch
+ApplyPatch linux-2.6.27.9-ext4-cap-check-delay.patch
 
 # xfs
 
@@ -1934,6 +1937,9 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Tue Jan 06 2009 Eric Sandeen <sandeen at redhat.com> 2.6.27.10-168
+- ext4 - delay capable() checks in space accounting (#478299)
+
 * Tue Dec 23 2008 Dave Airlie <airlied at redhat.com> 2.6.27.10-167
 - drm - fix issue with second driver opening DRI
 



From jcollie at fedoraproject.org  Tue Jan  6 21:19:55 2009
From: jcollie at fedoraproject.org (Jeffrey C. Ollie)
Date: Tue,  6 Jan 2009 21:19:55 +0000 (UTC)
Subject: rpms/python-lxml/F-10 .cvsignore, 1.20, 1.21 python-lxml.spec, 1.26,
	1.27 sources, 1.20, 1.21
Message-ID: <20090106211955.8ADA670108@cvs1.fedora.phx.redhat.com>

Author: jcollie

Update of /cvs/pkgs/rpms/python-lxml/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10486

Modified Files:
	.cvsignore python-lxml.spec sources 
Log Message:
* Tue Jan  6 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 2.1.5-1
- 2.1.5 (2009-01-06)
- Bugs fixed
- 
-    * Potential memory leak on exception handling. This was due to a
-      problem in Cython, not lxml itself.
-    * Failing import on systems that have an io module.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-lxml/F-10/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- .cvsignore	13 Dec 2008 01:45:08 -0000	1.20
+++ .cvsignore	6 Jan 2009 21:19:25 -0000	1.21
@@ -1 +1 @@
-lxml-2.1.4.tar.gz
+lxml-2.1.5.tar.gz


Index: python-lxml.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-lxml/F-10/python-lxml.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- python-lxml.spec	13 Dec 2008 01:45:08 -0000	1.26
+++ python-lxml.spec	6 Jan 2009 21:19:25 -0000	1.27
@@ -1,7 +1,7 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           python-lxml
-Version:        2.1.4
+Version:        2.1.5
 Release:        1%{?dist}
 Summary:        ElementTree-like Python bindings for libxml2 and libxslt
 
@@ -49,6 +49,14 @@
 %{python_sitearch}/*
 
 %changelog
+* Tue Jan  6 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 2.1.5-1
+- 2.1.5 (2009-01-06)
+- Bugs fixed
+- 
+-    * Potential memory leak on exception handling. This was due to a
+-      problem in Cython, not lxml itself.
+-    * Failing import on systems that have an io module.
+
 * Fri Dec 12 2008 Jeffrey C. Ollie <jeff at ocjtech.us> - 2.1.4-1
 - 2.1.4 (2008-12-12)
 - Bugs fixed


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-lxml/F-10/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources	13 Dec 2008 01:45:08 -0000	1.20
+++ sources	6 Jan 2009 21:19:25 -0000	1.21
@@ -1 +1 @@
-05f35b81955caf502584b685a5226417  lxml-2.1.4.tar.gz
+22567ccc6ab8ec8c90c335c810cabe11  lxml-2.1.5.tar.gz



From spot at fedoraproject.org  Tue Jan  6 21:30:50 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Tue,  6 Jan 2009 21:30:50 +0000 (UTC)
Subject: rpms/perl-Image-ExifTool/F-10 perl-Image-ExifTool.spec, 1.18,
	1.19 sources, 1.16, 1.17
Message-ID: <20090106213050.9988670108@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Image-ExifTool/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13237/F-10

Modified Files:
	perl-Image-ExifTool.spec sources 
Log Message:
update to 7.60


Index: perl-Image-ExifTool.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Image-ExifTool/F-10/perl-Image-ExifTool.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- perl-Image-ExifTool.spec	27 Oct 2008 20:53:30 -0000	1.18
+++ perl-Image-ExifTool.spec	6 Jan 2009 21:30:20 -0000	1.19
@@ -1,5 +1,5 @@
 Name:		perl-Image-ExifTool
-Version:	7.51
+Version:	7.60
 Release:	1%{?dist}
 License:	GPL+ or Artistic
 Group:		Applications/Multimedia
@@ -56,6 +56,9 @@
 %{_mandir}/man3/*.3*
 
 %changelog
+* Tue Jan  6 2009 Tom "spot" Callaway <tcallawa at redhat.com> 7.60-1
+- update to 7.60
+
 * Mon Oct 27 2008 Tom "spot" Callaway <tcallawa at redhat.com> 7.51-1
 - update to 7.51
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Image-ExifTool/F-10/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources	27 Oct 2008 20:53:30 -0000	1.16
+++ sources	6 Jan 2009 21:30:20 -0000	1.17
@@ -1 +1 @@
-2e70113ad75d608c4f5f5ce9a5c50d4e  Image-ExifTool-7.51.tar.gz
+7780ec0f370d69094998d1205100cc86  Image-ExifTool-7.60.tar.gz



From spot at fedoraproject.org  Tue Jan  6 21:30:50 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Tue,  6 Jan 2009 21:30:50 +0000 (UTC)
Subject: rpms/perl-Image-ExifTool/F-9 perl-Image-ExifTool.spec, 1.17,
	1.18 sources, 1.15, 1.16
Message-ID: <20090106213050.B285970108@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Image-ExifTool/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13237/F-9

Modified Files:
	perl-Image-ExifTool.spec sources 
Log Message:
update to 7.60


Index: perl-Image-ExifTool.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Image-ExifTool/F-9/perl-Image-ExifTool.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- perl-Image-ExifTool.spec	28 May 2008 16:01:22 -0000	1.17
+++ perl-Image-ExifTool.spec	6 Jan 2009 21:30:20 -0000	1.18
@@ -1,6 +1,6 @@
 Name:		perl-Image-ExifTool
-Version:	7.25
-Release:	2%{?dist}
+Version:	7.60
+Release:	1%{?dist}
 License:	GPL+ or Artistic
 Group:		Applications/Multimedia
 Summary:	Utility for reading and writing image meta info
@@ -56,6 +56,12 @@
 %{_mandir}/man3/*.3*
 
 %changelog
+* Tue Jan  6 2009 Tom "spot" Callaway <tcallawa at redhat.com> 7.60-1
+- update to 7.60
+
+* Mon Oct 27 2008 Tom "spot" Callaway <tcallawa at redhat.com> 7.51-1
+- update to 7.51
+
 * Wed May 28 2008 Tom "spot" Callaway <tcallawa at redhat.com> 7.25-2
 - get rid of empty arch-specific directories (bz 448744)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Image-ExifTool/F-9/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	25 Apr 2008 20:06:12 -0000	1.15
+++ sources	6 Jan 2009 21:30:20 -0000	1.16
@@ -1 +1 @@
-b57107d034ce38009ccb7f796eea6cd9  Image-ExifTool-7.25.tar.gz
+7780ec0f370d69094998d1205100cc86  Image-ExifTool-7.60.tar.gz



From spot at fedoraproject.org  Tue Jan  6 21:30:51 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Tue,  6 Jan 2009 21:30:51 +0000 (UTC)
Subject: rpms/perl-Image-ExifTool/devel .cvsignore, 1.16,
	1.17 perl-Image-ExifTool.spec, 1.18, 1.19 sources, 1.16, 1.17
Message-ID: <20090106213051.51B5A70108@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Image-ExifTool/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13237/devel

Modified Files:
	.cvsignore perl-Image-ExifTool.spec sources 
Log Message:
update to 7.60


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Image-ExifTool/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore	27 Oct 2008 20:53:30 -0000	1.16
+++ .cvsignore	6 Jan 2009 21:30:20 -0000	1.17
@@ -1 +1 @@
-Image-ExifTool-7.51.tar.gz
+Image-ExifTool-7.60.tar.gz


Index: perl-Image-ExifTool.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Image-ExifTool/devel/perl-Image-ExifTool.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- perl-Image-ExifTool.spec	27 Oct 2008 20:53:30 -0000	1.18
+++ perl-Image-ExifTool.spec	6 Jan 2009 21:30:20 -0000	1.19
@@ -1,5 +1,5 @@
 Name:		perl-Image-ExifTool
-Version:	7.51
+Version:	7.60
 Release:	1%{?dist}
 License:	GPL+ or Artistic
 Group:		Applications/Multimedia
@@ -56,6 +56,9 @@
 %{_mandir}/man3/*.3*
 
 %changelog
+* Tue Jan  6 2009 Tom "spot" Callaway <tcallawa at redhat.com> 7.60-1
+- update to 7.60
+
 * Mon Oct 27 2008 Tom "spot" Callaway <tcallawa at redhat.com> 7.51-1
 - update to 7.51
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Image-ExifTool/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources	27 Oct 2008 20:53:30 -0000	1.16
+++ sources	6 Jan 2009 21:30:20 -0000	1.17
@@ -1 +1 @@
-2e70113ad75d608c4f5f5ce9a5c50d4e  Image-ExifTool-7.51.tar.gz
+7780ec0f370d69094998d1205100cc86  Image-ExifTool-7.60.tar.gz



From jjohnstn at fedoraproject.org  Tue Jan  6 21:35:18 2009
From: jjohnstn at fedoraproject.org (Jeff Johnston)
Date: Tue,  6 Jan 2009 21:35:18 +0000 (UTC)
Subject: rpms/jetty/F-10 jetty-unix.patch, NONE, 1.1 jetty.init, 1.1,
	1.2 jetty.spec, 1.8, 1.9
Message-ID: <20090106213518.9F3DB179D1E@cvs1.fedora.phx.redhat.com>

Author: jjohnstn

Update of /cvs/pkgs/rpms/jetty/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14353

Modified Files:
	jetty.init jetty.spec 
Added Files:
	jetty-unix.patch 
Log Message:

* Tue Jan 06 2009 Jeff Johnston <jjohnstn at redhat.com> 5.1.14-1.7
- Patch init.d script to add status operation
- Patch unix djetty script so it doesn't issue error messages about /dev/tty
  and fix various inconsistencies with the init.d script



jetty-unix.patch:

--- NEW FILE jetty-unix.patch ---
diff -up ./extra/unix/bin/jetty.sh.fix ./extra/unix/bin/jetty.sh
--- ./extra/unix/bin/jetty.sh.fix	2009-01-06 16:01:00.000000000 -0500
+++ ./extra/unix/bin/jetty.sh	2009-01-06 16:03:55.000000000 -0500
@@ -1,4 +1,4 @@
-#!/bin/sh  
+#!/bin/sh
 #
 # Startup script for jetty under *nix systems (it works under NT/cygwin too).
 #
@@ -106,6 +106,13 @@ findDirectory()
     done 
 }
 
+##################################################
+# Check if we have a tty
+##################################################
+have_tty=0
+if [ "`tty`" != "not a tty" ]; then
+    have_tty=1
+fi
 
 ##################################################
 # See if there's a user-specific configuration file
@@ -323,7 +330,7 @@ then
   then
     JETTY_CONSOLE=/dev/console
   else
-    JETTY_CONSOLE=/dev/tty
+    JETTY_CONSOLE=/dev/null
   fi
 fi
 
@@ -356,7 +363,7 @@ then
                 [ -x $J ] || continue
                 VERSION=`eval $J -version 2>&1`       
                 [ $? = 0 ] || continue
-                VERSION=`expr "$VERSION" : '.*"\(1.[0-9\.]*\)"'`
+                VERSION=`expr "$VERSION" : '.*"\(1.[0-9\._]*\)"'`
                 [ "$VERSION" = "" ] && continue
                 expr $VERSION \< 1.2 >/dev/null && continue
                 echo $VERSION:$J
@@ -466,15 +473,15 @@ RUN_CMD="$JAVA $JAVA_OPTIONS -cp $CLASSP
 ##################################################
 case "$ACTION" in
   start)
-        echo "Starting Jetty: "
-
         if [ -f $JETTY_PID ]
         then
             echo "Already Running!!"
             exit 1
         fi
 
-        echo "STARTED Jetty `date`" >> $JETTY_CONSOLE
+	if [ $have_tty -eq 1 ]; then
+          echo "STARTED Jetty `date`" >> $JETTY_CONSOLE
+	fi
 
         nohup sh -c "exec $RUN_CMD >>$JETTY_CONSOLE 2>&1" >/dev/null &
         echo $! > $JETTY_PID
@@ -488,7 +495,9 @@ case "$ACTION" in
         sleep 2
         kill -9 $PID 2>/dev/null
         rm -f $JETTY_PID
-        echo "STOPPED `date`" >>$JETTY_CONSOLE
+        if [ $have_tty -eq 1 ]; then
+          echo "STOPPED `date`" >>$JETTY_CONSOLE
+        fi
         ;;
 
   restart)
@@ -533,9 +542,9 @@ case "$ACTION" in
         echo "RUN_CMD        =  $RUN_CMD"
         echo
         
-        if [ -f $JETTY_RUN/jetty.pid ]
+        if [ -s $JETTY_PID ]
         then
-            echo "Jetty running pid="`cat $JETTY_RUN/jetty.pid`
+            echo "Jetty running pid="`cat $JETTY_PID`
             exit 0
         fi
         exit 1


Index: jetty.init
===================================================================
RCS file: /cvs/pkgs/rpms/jetty/F-10/jetty.init,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- jetty.init	30 Aug 2007 19:06:45 -0000	1.1
+++ jetty.init	6 Jan 2009 21:34:48 -0000	1.2
@@ -19,9 +19,7 @@
 
 
 # Source function library.
-if [ -x /etc/rc.d/init.d/functions ]; then
-    . /etc/rc.d/init.d/functions
-fi
+. /etc/init.d/functions
 
 [ -r /etc/java/java.conf ] && . /etc/java/java.conf
 export JAVA_HOME
@@ -54,10 +52,11 @@
 fi
 
 
+prog=jetty
 RETVAL=0
 
 start() {
-    echo -n "Starting $JETTY_PROG: "
+    echo -n $"Starting $prog: "
 
         if [ -f /var/lock/subsys/jetty ] ; then
                 if [ -f $JETTY_PID ]; then
@@ -71,16 +70,13 @@
                 fi
         fi
 
-#        touch $JETTY_PID
-#        chown $JETTY_USER:$JETTY_USER $JETTY_PID
-
 #	[ -x ${JETTY_HOME}/ext ] &&
 #	  	rebuild-jar-repository -s ${JETTY_HOME}/ext
 
         if [ -x /etc/rc.d/init.d/functions ]; then
-                daemon --user $JETTY_USER $JETTY_SCRIPT start
+                daemon --user $JETTY_USER JETTY_PID=$JETTY_PID $JETTY_SCRIPT start
         else
-                su - $JETTY_USER -c "$JETTY_SCRIPT start"
+                su - $JETTY_USER -c "JETTY_PID=$JETTY_PID $JETTY_SCRIPT start"
         fi
 
         RETVAL=$?
@@ -91,20 +87,20 @@
 
 
 stop() {
-    echo -n "Stopping $JETTY_PROG: "
+    echo -n $"Stopping $prog: "
                                                                                                                                                              
     if [ -f /var/lock/subsys/jetty ] ; then
       if [ -x /etc/rc.d/init.d/functions ]; then
-          daemon --user $JETTY_USER $JETTY_SCRIPT stop
+          daemon --user $JETTY_USER JETTY_PID=$JETTY_PID $JETTY_SCRIPT stop
       else
-          su - $JETTY_USER -c "$JETTY_SCRIPT stop"
+          su - $JETTY_USER -c "JETTY_PID=$JETTY_PID $JETTY_SCRIPT stop"
       fi
       RETVAL=$?
 
       if [ $RETVAL = 0 ]; then
         count=0;
 
-        if [ -f /var/run/jetty/jetty.pid ]; then
+        if [ -f $JETTY_PID ]; then
 
             read kpid < $JETTY_PID
             let kwait=$SHUTDOWN_WAIT
@@ -136,7 +132,10 @@
   stop)
         stop
         ;;
-  restart)
+  status)
+	status -p $JETTY_PID jetty
+	;;
+  restart|reload)
         stop
         sleep 2
         start
@@ -148,7 +147,7 @@
         fi
         ;;
   *)
-        echo "Usage: $JETTY_PROG {start|stop|restart|condrestart}"
+        echo "Usage: $0 {start|stop|status|restart|reload|condrestart}"
         exit 1
 esac
                                                                                                                                                              


Index: jetty.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jetty/F-10/jetty.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- jetty.spec	12 Aug 2008 15:27:52 -0000	1.8
+++ jetty.spec	6 Jan 2009 21:34:48 -0000	1.9
@@ -54,7 +54,7 @@
 
 Name:           jetty
 Version:        5.1.14
-Release:        1.6%{?dist}
+Release:        1.7%{?dist}
 Summary:        The Jetty Webserver and Servlet Container
 
 Group:          Applications/Internet
@@ -79,6 +79,7 @@
 Patch2:         jetty-libgcj-bad-serialization.patch
 Patch3:         jetty-TestRFC2616-libgcj-bad-date-parser.patch
 Patch4:		jetty-CERT438616-CERT237888-CERT21284.patch
+Patch5:		jetty-unix.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %if ! %{gcj_support}
@@ -254,6 +255,7 @@
 %patch3 -b .sav
 
 %patch4
+%patch5
 
 # Delete this Sun specific file.
 rm src/org/mortbay/http/SunJsseListener.java
@@ -599,6 +601,11 @@
 %endif
 
 %changelog
+* Tue Jan 06 2009 Jeff Johnston <jjohnstn at redhat.com> 5.1.14-1.7
+- Patch init.d script to add status operation
+- Patch unix djetty script so it doesn't issue error messages about /dev/tty
+  and fix various inconsistencies with the init.d script
+
 * Tue Aug 12 2008 Andrew Overholt <overholt at redhat.com> 5.1.14-1.6
 - Require tomcat5 bits with proper OSGi metadata
 



From jjohnstn at fedoraproject.org  Tue Jan  6 21:37:28 2009
From: jjohnstn at fedoraproject.org (Jeff Johnston)
Date: Tue,  6 Jan 2009 21:37:28 +0000 (UTC)
Subject: rpms/jetty/F-10 jetty.spec,1.9,1.10
Message-ID: <20090106213728.09FA170108@cvs1.fedora.phx.redhat.com>

Author: jjohnstn

Update of /cvs/pkgs/rpms/jetty/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14823

Modified Files:
	jetty.spec 
Log Message:

Add resolves #473585 to latest entry.



Index: jetty.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jetty/F-10/jetty.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- jetty.spec	6 Jan 2009 21:34:48 -0000	1.9
+++ jetty.spec	6 Jan 2009 21:36:57 -0000	1.10
@@ -602,6 +602,7 @@
 
 %changelog
 * Tue Jan 06 2009 Jeff Johnston <jjohnstn at redhat.com> 5.1.14-1.7
+- Resolves #473585
 - Patch init.d script to add status operation
 - Patch unix djetty script so it doesn't issue error messages about /dev/tty
   and fix various inconsistencies with the init.d script



From spot at fedoraproject.org  Tue Jan  6 21:52:15 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Tue,  6 Jan 2009 21:52:15 +0000 (UTC)
Subject: rpms/pyke/F-10 pyke.spec,1.3,1.4 sources,1.4,1.5
Message-ID: <20090106215215.E688A70108@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/pyke/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19207/F-10

Modified Files:
	pyke.spec sources 
Log Message:
update to 0.6


Index: pyke.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pyke/F-10/pyke.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- pyke.spec	11 Nov 2008 17:08:20 -0000	1.3
+++ pyke.spec	6 Jan 2009 21:51:45 -0000	1.4
@@ -2,7 +2,7 @@
 
 Name:			pyke
 Summary: 		Knowledge-based inference engine
-Version:		0.5
+Version:		0.6
 Release:		1%{?dist}
 License:		MIT
 Group:			System Environment/Libraries
@@ -42,6 +42,12 @@
 %{python_sitelib}/%{name}-%{version}*.egg-info/
 
 %changelog
+* Tue Jan  6 2009 Tom "spot" Callaway <tcallawa at redhat.com> 0.6-1
+- update to 0.6
+
+* Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 0.5-2
+- Rebuild for Python 2.6
+
 * Tue Nov 11 2008 Tom "spot" Callaway <tcallawa at redhat.com> 0.5-1
 - update to 0.5
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pyke/F-10/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	11 Nov 2008 17:08:20 -0000	1.4
+++ sources	6 Jan 2009 21:51:45 -0000	1.5
@@ -1 +1 @@
-2da0643bb0de11c467840845acc59561  pyke-0.5.tar.gz
+ecd21dfb4f190577f39b17cb43c7cc47  pyke-0.6.tar.gz



From spot at fedoraproject.org  Tue Jan  6 21:52:16 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Tue,  6 Jan 2009 21:52:16 +0000 (UTC)
Subject: rpms/pyke/F-9 pyke.spec,1.2,1.3 sources,1.3,1.4
Message-ID: <20090106215216.38D9470108@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/pyke/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19207/F-9

Modified Files:
	pyke.spec sources 
Log Message:
update to 0.6


Index: pyke.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pyke/F-9/pyke.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- pyke.spec	11 Nov 2008 17:08:21 -0000	1.2
+++ pyke.spec	6 Jan 2009 21:51:45 -0000	1.3
@@ -2,7 +2,7 @@
 
 Name:			pyke
 Summary: 		Knowledge-based inference engine
-Version:		0.5
+Version:		0.6
 Release:		1%{?dist}
 License:		MIT
 Group:			System Environment/Libraries
@@ -42,6 +42,12 @@
 %{python_sitelib}/%{name}-%{version}*.egg-info/
 
 %changelog
+* Tue Jan  6 2009 Tom "spot" Callaway <tcallawa at redhat.com> 0.6-1
+- update to 0.6
+
+* Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 0.5-2
+- Rebuild for Python 2.6
+
 * Tue Nov 11 2008 Tom "spot" Callaway <tcallawa at redhat.com> 0.5-1
 - update to 0.5
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pyke/F-9/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	11 Nov 2008 17:08:21 -0000	1.3
+++ sources	6 Jan 2009 21:51:45 -0000	1.4
@@ -1 +1 @@
-2da0643bb0de11c467840845acc59561  pyke-0.5.tar.gz
+ecd21dfb4f190577f39b17cb43c7cc47  pyke-0.6.tar.gz



From spot at fedoraproject.org  Tue Jan  6 21:52:16 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Tue,  6 Jan 2009 21:52:16 +0000 (UTC)
Subject: rpms/pyke/devel pyke.spec,1.4,1.5 sources,1.4,1.5
Message-ID: <20090106215216.9D55970108@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/pyke/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19207/devel

Modified Files:
	pyke.spec sources 
Log Message:
update to 0.6


Index: pyke.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pyke/devel/pyke.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- pyke.spec	29 Nov 2008 18:16:49 -0000	1.4
+++ pyke.spec	6 Jan 2009 21:51:46 -0000	1.5
@@ -2,8 +2,8 @@
 
 Name:			pyke
 Summary: 		Knowledge-based inference engine
-Version:		0.5
-Release:		2%{?dist}
+Version:		0.6
+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
+* Tue Jan  6 2009 Tom "spot" Callaway <tcallawa at redhat.com> 0.6-1
+- update to 0.6
+
 * Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 0.5-2
 - Rebuild for Python 2.6
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pyke/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	11 Nov 2008 17:08:21 -0000	1.4
+++ sources	6 Jan 2009 21:51:46 -0000	1.5
@@ -1 +1 @@
-2da0643bb0de11c467840845acc59561  pyke-0.5.tar.gz
+ecd21dfb4f190577f39b17cb43c7cc47  pyke-0.6.tar.gz



From jjohnstn at fedoraproject.org  Tue Jan  6 21:58:06 2009
From: jjohnstn at fedoraproject.org (Jeff Johnston)
Date: Tue,  6 Jan 2009 21:58:06 +0000 (UTC)
Subject: rpms/jetty/devel jetty-unix.patch, NONE, 1.1 jetty.init, 1.1,
	1.2 jetty.spec, 1.8, 1.9
Message-ID: <20090106215806.AD6C270108@cvs1.fedora.phx.redhat.com>

Author: jjohnstn

Update of /cvs/pkgs/rpms/jetty/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21930

Modified Files:
	jetty.init jetty.spec 
Added Files:
	jetty-unix.patch 
Log Message:

* Tue Jan 06 2009 Jeff Johnston <jjohnstn at redhat.com> 5.1.14-1.7
- Resolves #473585
- Patch init.d script to add status operation
- Patch unix djetty script so it doesn't issue error messages about /dev/tty
  and fix various inconsistencies with the init.d script



jetty-unix.patch:

--- NEW FILE jetty-unix.patch ---
diff -up ./extra/unix/bin/jetty.sh.fix ./extra/unix/bin/jetty.sh
--- ./extra/unix/bin/jetty.sh.fix	2009-01-06 16:01:00.000000000 -0500
+++ ./extra/unix/bin/jetty.sh	2009-01-06 16:03:55.000000000 -0500
@@ -1,4 +1,4 @@
-#!/bin/sh  
+#!/bin/sh
 #
 # Startup script for jetty under *nix systems (it works under NT/cygwin too).
 #
@@ -106,6 +106,13 @@ findDirectory()
     done 
 }
 
+##################################################
+# Check if we have a tty
+##################################################
+have_tty=0
+if [ "`tty`" != "not a tty" ]; then
+    have_tty=1
+fi
 
 ##################################################
 # See if there's a user-specific configuration file
@@ -323,7 +330,7 @@ then
   then
     JETTY_CONSOLE=/dev/console
   else
-    JETTY_CONSOLE=/dev/tty
+    JETTY_CONSOLE=/dev/null
   fi
 fi
 
@@ -356,7 +363,7 @@ then
                 [ -x $J ] || continue
                 VERSION=`eval $J -version 2>&1`       
                 [ $? = 0 ] || continue
-                VERSION=`expr "$VERSION" : '.*"\(1.[0-9\.]*\)"'`
+                VERSION=`expr "$VERSION" : '.*"\(1.[0-9\._]*\)"'`
                 [ "$VERSION" = "" ] && continue
                 expr $VERSION \< 1.2 >/dev/null && continue
                 echo $VERSION:$J
@@ -466,15 +473,15 @@ RUN_CMD="$JAVA $JAVA_OPTIONS -cp $CLASSP
 ##################################################
 case "$ACTION" in
   start)
-        echo "Starting Jetty: "
-
         if [ -f $JETTY_PID ]
         then
             echo "Already Running!!"
             exit 1
         fi
 
-        echo "STARTED Jetty `date`" >> $JETTY_CONSOLE
+	if [ $have_tty -eq 1 ]; then
+          echo "STARTED Jetty `date`" >> $JETTY_CONSOLE
+	fi
 
         nohup sh -c "exec $RUN_CMD >>$JETTY_CONSOLE 2>&1" >/dev/null &
         echo $! > $JETTY_PID
@@ -488,7 +495,9 @@ case "$ACTION" in
         sleep 2
         kill -9 $PID 2>/dev/null
         rm -f $JETTY_PID
-        echo "STOPPED `date`" >>$JETTY_CONSOLE
+        if [ $have_tty -eq 1 ]; then
+          echo "STOPPED `date`" >>$JETTY_CONSOLE
+        fi
         ;;
 
   restart)
@@ -533,9 +542,9 @@ case "$ACTION" in
         echo "RUN_CMD        =  $RUN_CMD"
         echo
         
-        if [ -f $JETTY_RUN/jetty.pid ]
+        if [ -s $JETTY_PID ]
         then
-            echo "Jetty running pid="`cat $JETTY_RUN/jetty.pid`
+            echo "Jetty running pid="`cat $JETTY_PID`
             exit 0
         fi
         exit 1


Index: jetty.init
===================================================================
RCS file: /cvs/pkgs/rpms/jetty/devel/jetty.init,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- jetty.init	30 Aug 2007 19:06:45 -0000	1.1
+++ jetty.init	6 Jan 2009 21:57:36 -0000	1.2
@@ -19,9 +19,7 @@
 
 
 # Source function library.
-if [ -x /etc/rc.d/init.d/functions ]; then
-    . /etc/rc.d/init.d/functions
-fi
+. /etc/init.d/functions
 
 [ -r /etc/java/java.conf ] && . /etc/java/java.conf
 export JAVA_HOME
@@ -54,10 +52,11 @@
 fi
 
 
+prog=jetty
 RETVAL=0
 
 start() {
-    echo -n "Starting $JETTY_PROG: "
+    echo -n $"Starting $prog: "
 
         if [ -f /var/lock/subsys/jetty ] ; then
                 if [ -f $JETTY_PID ]; then
@@ -71,16 +70,13 @@
                 fi
         fi
 
-#        touch $JETTY_PID
-#        chown $JETTY_USER:$JETTY_USER $JETTY_PID
-
 #	[ -x ${JETTY_HOME}/ext ] &&
 #	  	rebuild-jar-repository -s ${JETTY_HOME}/ext
 
         if [ -x /etc/rc.d/init.d/functions ]; then
-                daemon --user $JETTY_USER $JETTY_SCRIPT start
+                daemon --user $JETTY_USER JETTY_PID=$JETTY_PID $JETTY_SCRIPT start
         else
-                su - $JETTY_USER -c "$JETTY_SCRIPT start"
+                su - $JETTY_USER -c "JETTY_PID=$JETTY_PID $JETTY_SCRIPT start"
         fi
 
         RETVAL=$?
@@ -91,20 +87,20 @@
 
 
 stop() {
-    echo -n "Stopping $JETTY_PROG: "
+    echo -n $"Stopping $prog: "
                                                                                                                                                              
     if [ -f /var/lock/subsys/jetty ] ; then
       if [ -x /etc/rc.d/init.d/functions ]; then
-          daemon --user $JETTY_USER $JETTY_SCRIPT stop
+          daemon --user $JETTY_USER JETTY_PID=$JETTY_PID $JETTY_SCRIPT stop
       else
-          su - $JETTY_USER -c "$JETTY_SCRIPT stop"
+          su - $JETTY_USER -c "JETTY_PID=$JETTY_PID $JETTY_SCRIPT stop"
       fi
       RETVAL=$?
 
       if [ $RETVAL = 0 ]; then
         count=0;
 
-        if [ -f /var/run/jetty/jetty.pid ]; then
+        if [ -f $JETTY_PID ]; then
 
             read kpid < $JETTY_PID
             let kwait=$SHUTDOWN_WAIT
@@ -136,7 +132,10 @@
   stop)
         stop
         ;;
-  restart)
+  status)
+	status -p $JETTY_PID jetty
+	;;
+  restart|reload)
         stop
         sleep 2
         start
@@ -148,7 +147,7 @@
         fi
         ;;
   *)
-        echo "Usage: $JETTY_PROG {start|stop|restart|condrestart}"
+        echo "Usage: $0 {start|stop|status|restart|reload|condrestart}"
         exit 1
 esac
                                                                                                                                                              


Index: jetty.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jetty/devel/jetty.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- jetty.spec	12 Aug 2008 15:27:52 -0000	1.8
+++ jetty.spec	6 Jan 2009 21:57:36 -0000	1.9
@@ -54,7 +54,7 @@
 
 Name:           jetty
 Version:        5.1.14
-Release:        1.6%{?dist}
+Release:        1.7%{?dist}
 Summary:        The Jetty Webserver and Servlet Container
 
 Group:          Applications/Internet
@@ -79,6 +79,7 @@
 Patch2:         jetty-libgcj-bad-serialization.patch
 Patch3:         jetty-TestRFC2616-libgcj-bad-date-parser.patch
 Patch4:		jetty-CERT438616-CERT237888-CERT21284.patch
+Patch5:		jetty-unix.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %if ! %{gcj_support}
@@ -254,6 +255,7 @@
 %patch3 -b .sav
 
 %patch4
+%patch5
 
 # Delete this Sun specific file.
 rm src/org/mortbay/http/SunJsseListener.java
@@ -599,6 +601,12 @@
 %endif
 
 %changelog
+* Tue Jan 06 2009 Jeff Johnston <jjohnstn at redhat.com> 5.1.14-1.7
+- Resolves #473585
+- Patch init.d script to add status operation
+- Patch unix djetty script so it doesn't issue error messages about /dev/tty
+  and fix various inconsistencies with the init.d script
+
 * Tue Aug 12 2008 Andrew Overholt <overholt at redhat.com> 5.1.14-1.6
 - Require tomcat5 bits with proper OSGi metadata
 



From spot at fedoraproject.org  Tue Jan  6 22:09:29 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Tue,  6 Jan 2009 22:09:29 +0000 (UTC)
Subject: rpms/check/F-10 check.spec,1.9,1.10 sources,1.3,1.4
Message-ID: <20090106220929.5BB0370108@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/check/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24230/F-10

Modified Files:
	check.spec sources 
Log Message:
update to 0.9.6


Index: check.spec
===================================================================
RCS file: /cvs/pkgs/rpms/check/F-10/check.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- check.spec	1 Dec 2008 19:44:50 -0000	1.9
+++ check.spec	6 Jan 2009 22:08:58 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           check
-Version:        0.9.5
-Release:        3%{?dist}
+Version:        0.9.6
+Release:        1%{?dist}
 Summary:        A unit test framework for C
 Source0:        http://download.sourceforge.net/check/%{name}-%{version}.tar.gz
 Group:          Development/Tools
@@ -82,6 +82,9 @@
 %{_libdir}/libcheck.a
 
 %changelog
+* Tue Jan  6 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 0.9.6-1
+- update to 0.9.6
+
 * Mon Dec  1 2008 Jerry James <loganjerry at gmail.com> - 0.9.5-3
 - Fix unowned directory (bz 473635)
 - Drop unnecessary BuildRequires


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/check/F-10/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	2 Aug 2007 20:34:23 -0000	1.3
+++ sources	6 Jan 2009 22:08:59 -0000	1.4
@@ -1 +1 @@
-30143c7974b547a12a7da47809a90951  check-0.9.5.tar.gz
+6f80cd4a24d14ad706117a7714222420  check-0.9.6.tar.gz



From spot at fedoraproject.org  Tue Jan  6 22:09:29 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Tue,  6 Jan 2009 22:09:29 +0000 (UTC)
Subject: rpms/check/F-9 check.spec,1.9,1.10 sources,1.3,1.4
Message-ID: <20090106220929.ACDCD70108@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/check/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24230/F-9

Modified Files:
	check.spec sources 
Log Message:
update to 0.9.6


Index: check.spec
===================================================================
RCS file: /cvs/pkgs/rpms/check/F-9/check.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- check.spec	1 Dec 2008 19:44:51 -0000	1.9
+++ check.spec	6 Jan 2009 22:08:59 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           check
-Version:        0.9.5
-Release:        3%{?dist}
+Version:        0.9.6
+Release:        1%{?dist}
 Summary:        A unit test framework for C
 Source0:        http://download.sourceforge.net/check/%{name}-%{version}.tar.gz
 Group:          Development/Tools
@@ -82,6 +82,9 @@
 %{_libdir}/libcheck.a
 
 %changelog
+* Tue Jan  6 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 0.9.6-1
+- update to 0.9.6
+
 * Mon Dec  1 2008 Jerry James <loganjerry at gmail.com> - 0.9.5-3
 - Fix unowned directory (bz 473635)
 - Drop unnecessary BuildRequires


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/check/F-9/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	2 Aug 2007 20:34:23 -0000	1.3
+++ sources	6 Jan 2009 22:08:59 -0000	1.4
@@ -1 +1 @@
-30143c7974b547a12a7da47809a90951  check-0.9.5.tar.gz
+6f80cd4a24d14ad706117a7714222420  check-0.9.6.tar.gz



From spot at fedoraproject.org  Tue Jan  6 22:09:30 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Tue,  6 Jan 2009 22:09:30 +0000 (UTC)
Subject: rpms/check/devel .cvsignore, 1.3, 1.4 check.spec, 1.9, 1.10 sources,
	1.3, 1.4
Message-ID: <20090106220930.5D90F70108@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/check/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24230/devel

Modified Files:
	.cvsignore check.spec sources 
Log Message:
update to 0.9.6


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/check/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	1 Dec 2008 19:44:51 -0000	1.3
+++ .cvsignore	6 Jan 2009 22:08:59 -0000	1.4
@@ -1 +1 @@
-check-0.9.5.tar.gz
+check-0.9.6.tar.gz


Index: check.spec
===================================================================
RCS file: /cvs/pkgs/rpms/check/devel/check.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- check.spec	1 Dec 2008 19:44:51 -0000	1.9
+++ check.spec	6 Jan 2009 22:09:00 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           check
-Version:        0.9.5
-Release:        3%{?dist}
+Version:        0.9.6
+Release:        1%{?dist}
 Summary:        A unit test framework for C
 Source0:        http://download.sourceforge.net/check/%{name}-%{version}.tar.gz
 Group:          Development/Tools
@@ -82,6 +82,9 @@
 %{_libdir}/libcheck.a
 
 %changelog
+* Tue Jan  6 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 0.9.6-1
+- update to 0.9.6
+
 * Mon Dec  1 2008 Jerry James <loganjerry at gmail.com> - 0.9.5-3
 - Fix unowned directory (bz 473635)
 - Drop unnecessary BuildRequires


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/check/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	2 Aug 2007 20:34:23 -0000	1.3
+++ sources	6 Jan 2009 22:09:00 -0000	1.4
@@ -1 +1 @@
-30143c7974b547a12a7da47809a90951  check-0.9.5.tar.gz
+6f80cd4a24d14ad706117a7714222420  check-0.9.6.tar.gz



From chitlesh at fedoraproject.org  Tue Jan  6 23:15:20 2009
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Tue,  6 Jan 2009 23:15:20 +0000 (UTC)
Subject: rpms/linsmith/EL-5 import.log,1.1,1.2 linsmith.spec,1.1,1.2
Message-ID: <20090106231520.E23E270108@cvs1.fedora.phx.redhat.com>

Author: chitlesh

Update of /cvs/pkgs/rpms/linsmith/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8766/EL-5

Modified Files:
	import.log linsmith.spec 
Log Message:
fix desktop file vendor


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/linsmith/EL-5/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	5 Jan 2009 23:07:41 -0000	1.1
+++ import.log	6 Jan 2009 23:14:48 -0000	1.2
@@ -1 +1,2 @@
 linsmith-0_99_11-2_fc10:EL-5:linsmith-0.99.11-2.fc10.src.rpm:1231196351
+linsmith-0_99_11-3_fc10:EL-5:linsmith-0.99.11-3.fc10.src.rpm:1231283598


Index: linsmith.spec
===================================================================
RCS file: /cvs/pkgs/rpms/linsmith/EL-5/linsmith.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linsmith.spec	5 Jan 2009 23:07:41 -0000	1.1
+++ linsmith.spec	6 Jan 2009 23:14:48 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           linsmith
 Version:        0.99.11
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A Smith charting program
 
 Group:          Applications/Engineering
@@ -45,7 +45,7 @@
 %{__rm} -rf %{buildroot}
 %{__make} install DESTDIR=%{buildroot} INSTALL="install -p"
 
-desktop-file-install                            \
+desktop-file-install --vendor fedora            \
     --dir=%{buildroot}/%{_datadir}/applications \
     --delete-original                           \
     --remove-category GTK                       \
@@ -81,6 +81,9 @@
 
 
 %changelog
+* Wed Jan 07 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 0.99.11-3
+- added vendor to skip build failure on EL-5
+
 * Mon Dec 29 2008 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 0.99.11-2
 - spec file updated as suggested in the #478368c2
 



From chitlesh at fedoraproject.org  Tue Jan  6 23:17:24 2009
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Tue,  6 Jan 2009 23:17:24 +0000 (UTC)
Subject: rpms/electric/F-9 .cvsignore, 1.2, 1.3 electric.spec, 1.2,
	1.3 import.log, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <20090106231724.95F3D70108@cvs1.fedora.phx.redhat.com>

Author: chitlesh

Update of /cvs/pkgs/rpms/electric/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9531/F-9

Modified Files:
	.cvsignore electric.spec import.log sources 
Log Message:
new release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/electric/F-9/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	1 Dec 2008 21:44:14 -0000	1.2
+++ .cvsignore	6 Jan 2009 23:16:54 -0000	1.3
@@ -1 +1 @@
-electric-8.07.jar
+electric-8.08.jar


Index: electric.spec
===================================================================
RCS file: /cvs/pkgs/rpms/electric/F-9/electric.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- electric.spec	7 Dec 2008 04:58:13 -0000	1.2
+++ electric.spec	6 Jan 2009 23:16:54 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           electric
-Version:        8.07
-Release:        2%{?dist}
+Version:        8.08
+Release:        1%{?dist}
 Summary:        Sophisticated Java based VLSI CAD System
 
 Group:          Applications/Engineering
@@ -110,6 +110,9 @@
 
 
 %changelog
+* Tue Dec 23 2008 Chitlesh GOORAH <chitlesh [AT] fedoraproject DOT org> - 8.08-1
+- new upstream release
+
 * Sun Dec 07 2008 Chitlesh GOORAH <chitlesh [AT] fedoraproject DOT org> - 8.07-2
 - Added desktop-file-utils as BR
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/electric/F-9/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	7 Dec 2008 04:58:13 -0000	1.2
+++ import.log	6 Jan 2009 23:16:54 -0000	1.3
@@ -1,2 +1,3 @@
 electric-8_07-1_fc10:F-9:electric-8.07-1.fc10.src.rpm:1228167722
 electric-8_07-2_fc10:F-9:electric-8.07-2.fc10.src.rpm:1228625852
+electric-8_08-1_fc10:F-9:electric-8.08-1.fc10.src.rpm:1231283746


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/electric/F-9/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	1 Dec 2008 21:44:14 -0000	1.2
+++ sources	6 Jan 2009 23:16:54 -0000	1.3
@@ -1 +1 @@
-b4fd104575b9c21dd2a005627f30f696  electric-8.07.jar
+57655b46f72da5e8ac647e97a40ab4b1  electric-8.08.jar



From chitlesh at fedoraproject.org  Tue Jan  6 23:17:57 2009
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Tue,  6 Jan 2009 23:17:57 +0000 (UTC)
Subject: rpms/linsmith/devel import.log,1.1,1.2 linsmith.spec,1.1,1.2
Message-ID: <20090106231757.8694570108@cvs1.fedora.phx.redhat.com>

Author: chitlesh

Update of /cvs/pkgs/rpms/linsmith/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9759/devel

Modified Files:
	import.log linsmith.spec 
Log Message:
fix desktop file vendor


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/linsmith/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	5 Jan 2009 22:52:56 -0000	1.1
+++ import.log	6 Jan 2009 23:17:27 -0000	1.2
@@ -1 +1,2 @@
 linsmith-0_99_11-2_fc10:HEAD:linsmith-0.99.11-2.fc10.src.rpm:1231195751
+linsmith-0_99_11-3_fc10:HEAD:linsmith-0.99.11-3.fc10.src.rpm:1231283751


Index: linsmith.spec
===================================================================
RCS file: /cvs/pkgs/rpms/linsmith/devel/linsmith.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linsmith.spec	5 Jan 2009 22:52:56 -0000	1.1
+++ linsmith.spec	6 Jan 2009 23:17:27 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           linsmith
 Version:        0.99.11
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A Smith charting program
 
 Group:          Applications/Engineering
@@ -45,7 +45,7 @@
 %{__rm} -rf %{buildroot}
 %{__make} install DESTDIR=%{buildroot} INSTALL="install -p"
 
-desktop-file-install                            \
+desktop-file-install --vendor fedora            \
     --dir=%{buildroot}/%{_datadir}/applications \
     --delete-original                           \
     --remove-category GTK                       \
@@ -81,6 +81,9 @@
 
 
 %changelog
+* Wed Jan 07 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 0.99.11-3
+- added vendor to skip build failure on EL-5
+
 * Mon Dec 29 2008 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 0.99.11-2
 - spec file updated as suggested in the #478368c2
 



From chitlesh at fedoraproject.org  Tue Jan  6 23:20:34 2009
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Tue,  6 Jan 2009 23:20:34 +0000 (UTC)
Subject: rpms/electric/F-10 .cvsignore, 1.2, 1.3 electric.spec, 1.2,
	1.3 import.log, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <20090106232034.A2E1970108@cvs1.fedora.phx.redhat.com>

Author: chitlesh

Update of /cvs/pkgs/rpms/electric/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10443/F-10

Modified Files:
	.cvsignore electric.spec import.log sources 
Log Message:
new release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/electric/F-10/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	1 Dec 2008 21:46:57 -0000	1.2
+++ .cvsignore	6 Jan 2009 23:20:04 -0000	1.3
@@ -1 +1 @@
-electric-8.07.jar
+electric-8.08.jar


Index: electric.spec
===================================================================
RCS file: /cvs/pkgs/rpms/electric/F-10/electric.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- electric.spec	7 Dec 2008 05:02:24 -0000	1.2
+++ electric.spec	6 Jan 2009 23:20:04 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           electric
-Version:        8.07
-Release:        2%{?dist}
+Version:        8.08
+Release:        1%{?dist}
 Summary:        Sophisticated Java based VLSI CAD System
 
 Group:          Applications/Engineering
@@ -110,6 +110,9 @@
 
 
 %changelog
+* Tue Dec 23 2008 Chitlesh GOORAH <chitlesh [AT] fedoraproject DOT org> - 8.08-1
+- new upstream release
+
 * Sun Dec 07 2008 Chitlesh GOORAH <chitlesh [AT] fedoraproject DOT org> - 8.07-2
 - Added desktop-file-utils as BR
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/electric/F-10/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	7 Dec 2008 05:02:24 -0000	1.2
+++ import.log	6 Jan 2009 23:20:04 -0000	1.3
@@ -1,2 +1,3 @@
 electric-8_07-1_fc10:F-10:electric-8.07-1.fc10.src.rpm:1228167979
 electric-8_07-2_fc10:F-10:electric-8.07-2.fc10.src.rpm:1228626007
+electric-8_08-1_fc10:F-10:electric-8.08-1.fc10.src.rpm:1231283829


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/electric/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	1 Dec 2008 21:46:57 -0000	1.2
+++ sources	6 Jan 2009 23:20:04 -0000	1.3
@@ -1 +1 @@
-b4fd104575b9c21dd2a005627f30f696  electric-8.07.jar
+57655b46f72da5e8ac647e97a40ab4b1  electric-8.08.jar



From dcantrel at fedoraproject.org  Tue Jan  6 23:46:55 2009
From: dcantrel at fedoraproject.org (David Cantrell)
Date: Tue,  6 Jan 2009 23:46:55 +0000 (UTC)
Subject: rpms/dhcp/devel dhcp-4.1.0-CLOEXEC.patch, NONE,
	1.1 dhcp-4.1.0-default-requested-options.patch, NONE,
	1.1 dhcp-4.1.0-dhclient-anycast.patch, NONE,
	1.1 dhcp-4.1.0-dhclient-decline-backoff.patch, NONE,
	1.1 dhcp-4.1.0-dhclient-usage.patch, NONE,
	1.1 dhcp-4.1.0-errwarn-message.patch, NONE,
	1.1 dhcp-4.1.0-failover-ports.patch, NONE,
	1.1 dhcp-4.1.0-garbage-chars.patch, NONE,
	1.1 dhcp-4.1.0-inherit-leases.patch, NONE,
	1.1 dhcp-4.1.0-invalid-dhclient-conf.patch, NONE,
	1.1 dhcp-4.1.0-ldap-configuration.patch, NONE,
	1.1 dhcp-4.1.0-manpages.patch, NONE, 1.1 dhcp-4.1.0-memory.patch,
	NONE, 1.1 dhcp-4.1.0-options.patch, NONE,
	1.1 dhcp-4.1.0-paths.patch, NONE,
	1.1 dhcp-4.1.0-port-validation.patch, NONE,
	1.1 dhcp-4.1.0-release-by-ifup.patch, NONE,
	1.1 dhcp-4.1.0-unicast-bootp.patch, NONE,
	1.1 dhcp-4.1.0-xen-checksum.patch, NONE, 1.1 .cvsignore, 1.22,
	1.23 dhcp.spec, 1.232, 1.233 dhcpd.init, 1.27, 1.28 sources,
	1.23, 1.24
Message-ID: <20090106234655.5E5C070108@cvs1.fedora.phx.redhat.com>

Author: dcantrel

Update of /cvs/pkgs/rpms/dhcp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16291

Modified Files:
	.cvsignore dhcp.spec dhcpd.init sources 
Added Files:
	dhcp-4.1.0-CLOEXEC.patch 
	dhcp-4.1.0-default-requested-options.patch 
	dhcp-4.1.0-dhclient-anycast.patch 
	dhcp-4.1.0-dhclient-decline-backoff.patch 
	dhcp-4.1.0-dhclient-usage.patch 
	dhcp-4.1.0-errwarn-message.patch 
	dhcp-4.1.0-failover-ports.patch dhcp-4.1.0-garbage-chars.patch 
	dhcp-4.1.0-inherit-leases.patch 
	dhcp-4.1.0-invalid-dhclient-conf.patch 
	dhcp-4.1.0-ldap-configuration.patch dhcp-4.1.0-manpages.patch 
	dhcp-4.1.0-memory.patch dhcp-4.1.0-options.patch 
	dhcp-4.1.0-paths.patch dhcp-4.1.0-port-validation.patch 
	dhcp-4.1.0-release-by-ifup.patch 
	dhcp-4.1.0-unicast-bootp.patch dhcp-4.1.0-xen-checksum.patch 
Log Message:
* Tue Jan 06 2009 David Cantrell <dcantrell at redhat.com> - 12:4.1.0-1
- Upgraded to ISC dhcp-4.1.0
- Had to rename the -T option to -timeout as ISC is now using -T
- Allow package rebuilders to easily enable DHCPv6 support with:
      rpmbuild --with DHCPv6 dhcp.spec
  Note that Fedora is still using the 'dhcpv6' package, but some
  users may want to experiment with the ISC DHCPv6 implementation
  locally.


dhcp-4.1.0-CLOEXEC.patch:

--- NEW FILE dhcp-4.1.0-CLOEXEC.patch ---
diff -up dhcp-4.1.0/client/clparse.c.cloexec dhcp-4.1.0/client/clparse.c
--- dhcp-4.1.0/client/clparse.c.cloexec	2009-01-06 11:56:11.000000000 -1000
+++ dhcp-4.1.0/client/clparse.c	2009-01-06 12:04:48.000000000 -1000
@@ -226,7 +226,7 @@ int read_client_conf_file (const char *n
 	int token;
 	isc_result_t status;
 	
-	if ((file = open (name, O_RDONLY)) < 0)
+	if ((file = open (name, O_RDONLY | O_CLOEXEC)) < 0)
 		return uerr2isc (errno);
 
 	cfile = NULL;
@@ -263,7 +263,7 @@ void read_client_leases ()
 
 	/* Open the lease file.   If we can't open it, just return -
 	   we can safely trust the server to remember our state. */
-	if ((file = open (path_dhclient_db, O_RDONLY)) < 0)
+	if ((file = open (path_dhclient_db, O_RDONLY | O_CLOEXEC)) < 0)
 		return;
 
 	cfile = NULL;
diff -up dhcp-4.1.0/client/dhclient.c.cloexec dhcp-4.1.0/client/dhclient.c
--- dhcp-4.1.0/client/dhclient.c.cloexec	2009-01-06 11:56:10.000000000 -1000
+++ dhcp-4.1.0/client/dhclient.c	2009-01-06 12:04:01.000000000 -1000
@@ -135,11 +135,11 @@ main(int argc, char **argv) {
 	/* Make sure that file descriptors 0 (stdin), 1, (stdout), and
 	   2 (stderr) are open. To do this, we assume that when we
 	   open a file the lowest available file descriptor is used. */
-	fd = open("/dev/null", O_RDWR);
+	fd = open("/dev/null", O_RDWR | O_CLOEXEC);
 	if (fd == 0)
-		fd = open("/dev/null", O_RDWR);
+		fd = open("/dev/null", O_RDWR | O_CLOEXEC);
 	if (fd == 1)
-		fd = open("/dev/null", O_RDWR);
+		fd = open("/dev/null", O_RDWR | O_CLOEXEC);
 	if (fd == 2)
 		log_perror = 0; /* No sense logging to /dev/null. */
 	else if (fd != -1)
@@ -465,7 +465,7 @@ main(int argc, char **argv) {
 		int e;
 
 		oldpid = 0;
-		if ((pidfd = fopen(path_dhclient_pid, "r")) != NULL) {
+		if ((pidfd = fopen(path_dhclient_pid, "re")) != NULL) {
 			e = fscanf(pidfd, "%ld\n", &temp);
 			oldpid = (pid_t)temp;
 
@@ -507,7 +507,7 @@ main(int argc, char **argv) {
 					strncpy(new_path_dhclient_pid, path_dhclient_pid, pfx);
 					sprintf(new_path_dhclient_pid + pfx, "-%s.pid", ip->name);
 
-					if ((pidfd = fopen(new_path_dhclient_pid, "r")) != NULL) {
+					if ((pidfd = fopen(new_path_dhclient_pid, "re")) != NULL) {
 						e = fscanf(pidfd, "%ld\n", &temp);
 						oldpid = (pid_t)temp;
 
@@ -532,7 +532,7 @@ main(int argc, char **argv) {
 		int dhc_running = 0;
 		char procfn[256] = "";
 
-		if ((pidfp = fopen(path_dhclient_pid, "r")) != NULL) {
+		if ((pidfp = fopen(path_dhclient_pid, "re")) != NULL) {
 			if ((fscanf(pidfp, "%ld", &temp)==1) && ((dhcpid=(pid_t)temp) > 0)) {
 				snprintf(procfn,256,"/proc/%u",dhcpid);
 				dhc_running = (access(procfn, F_OK) == 0);
@@ -2908,7 +2908,7 @@ void rewrite_client_leases ()
 
 	if (leaseFile != NULL)
 		fclose (leaseFile);
-	leaseFile = fopen (path_dhclient_db, "w");
+	leaseFile = fopen (path_dhclient_db, "we");
 	if (leaseFile == NULL) {
 		log_error ("can't create %s: %m", path_dhclient_db);
 		return;
@@ -3012,7 +3012,7 @@ write_duid(struct data_string *duid)
 		return ISC_R_INVALIDARG;
 
 	if (leaseFile == NULL) {	/* XXX? */
-		leaseFile = fopen(path_dhclient_db, "w");
+		leaseFile = fopen(path_dhclient_db, "we");
 		if (leaseFile == NULL) {
 			log_error("can't create %s: %m", path_dhclient_db);
 			return ISC_R_IOERROR;
@@ -3192,7 +3192,7 @@ int write_client_lease (client, lease, r
 		return 1;
 
 	if (leaseFile == NULL) {	/* XXX */
-		leaseFile = fopen (path_dhclient_db, "w");
+		leaseFile = fopen (path_dhclient_db, "we");
 		if (leaseFile == NULL) {
 			log_error ("can't create %s: %m", path_dhclient_db);
 			return 0;
@@ -3638,9 +3638,9 @@ void go_daemon ()
 	close(2);
 
 	/* Reopen them on /dev/null. */
-	open("/dev/null", O_RDWR);
-	open("/dev/null", O_RDWR);
-	open("/dev/null", O_RDWR);
+	open("/dev/null", O_RDWR | O_CLOEXEC);
+	open("/dev/null", O_RDWR | O_CLOEXEC);
+	open("/dev/null", O_RDWR | O_CLOEXEC);
 
 	write_client_pid_file ();
 
@@ -3652,14 +3652,14 @@ void write_client_pid_file ()
 	FILE *pf;
 	int pfdesc;
 
-	pfdesc = open (path_dhclient_pid, O_CREAT | O_TRUNC | O_WRONLY, 0644);
+	pfdesc = open (path_dhclient_pid, O_CREAT | O_TRUNC | O_WRONLY | O_CLOEXEC, 0644);
 
 	if (pfdesc < 0) {
 		log_error ("Can't create %s: %m", path_dhclient_pid);
 		return;
 	}
 
-	pf = fdopen (pfdesc, "w");
+	pf = fdopen (pfdesc, "we");
 	if (!pf)
 		log_error ("Can't fdopen %s: %m", path_dhclient_pid);
 	else {
diff -up dhcp-4.1.0/common/bpf.c.cloexec dhcp-4.1.0/common/bpf.c
--- dhcp-4.1.0/common/bpf.c.cloexec	2009-01-06 11:56:11.000000000 -1000
+++ dhcp-4.1.0/common/bpf.c	2009-01-06 11:56:11.000000000 -1000
@@ -94,7 +94,7 @@ int if_register_bpf (info)
 	for (b = 0; 1; b++) {
 		/* %Audit% 31 bytes max. %2004.06.17,Safe% */
 		sprintf(filename, BPF_FORMAT, b);
-		sock = open (filename, O_RDWR, 0);
+		sock = open (filename, O_RDWR | O_CLOEXEC, 0);
 		if (sock < 0) {
 			if (errno == EBUSY) {
 				continue;
diff -up dhcp-4.1.0/common/discover.c.cloexec dhcp-4.1.0/common/discover.c
--- dhcp-4.1.0/common/discover.c.cloexec	2008-08-29 07:48:57.000000000 -1000
+++ dhcp-4.1.0/common/discover.c	2009-01-06 11:56:11.000000000 -1000
@@ -409,7 +409,7 @@ begin_iface_scan(struct iface_conf_list 
 	int len;
 	int i;
 
-	ifaces->fp = fopen("/proc/net/dev", "r");
+	ifaces->fp = fopen("/proc/net/dev", "re");
 	if (ifaces->fp == NULL) {
 		log_error("Error opening '/proc/net/dev' to list interfaces");
 		return 0;
@@ -443,7 +443,7 @@ begin_iface_scan(struct iface_conf_list 
 	}
 
 #ifdef DHCPv6
-	ifaces->fp6 = fopen("/proc/net/if_inet6", "r");
+	ifaces->fp6 = fopen("/proc/net/if_inet6", "re");
 	if (ifaces->fp6 == NULL) {
 		log_error("Error opening '/proc/net/if_inet6' to "
 			  "list IPv6 interfaces; %m");
diff -up dhcp-4.1.0/common/dlpi.c.cloexec dhcp-4.1.0/common/dlpi.c
--- dhcp-4.1.0/common/dlpi.c.cloexec	2009-01-06 11:56:11.000000000 -1000
+++ dhcp-4.1.0/common/dlpi.c	2009-01-06 11:56:11.000000000 -1000
@@ -795,7 +795,7 @@ dlpiopen(const char *ifname) {
 	}
 	*dp = '\0';
 	
-	return open (devname, O_RDWR, 0);
+	return open (devname, O_RDWR | O_CLOEXEC, 0);
 }
 
 /*
diff -up dhcp-4.1.0/common/nit.c.cloexec dhcp-4.1.0/common/nit.c
--- dhcp-4.1.0/common/nit.c.cloexec	2009-01-06 11:56:11.000000000 -1000
+++ dhcp-4.1.0/common/nit.c	2009-01-06 11:56:11.000000000 -1000
@@ -81,7 +81,7 @@ int if_register_nit (info)
 	struct strioctl sio;
 
 	/* Open a NIT device */
-	sock = open ("/dev/nit", O_RDWR);
+	sock = open ("/dev/nit", O_RDWR | O_CLOEXEC);
 	if (sock < 0)
 		log_fatal ("Can't open NIT device for %s: %m", info -> name);
 
diff -up dhcp-4.1.0/common/resolv.c.cloexec dhcp-4.1.0/common/resolv.c
--- dhcp-4.1.0/common/resolv.c.cloexec	2008-03-07 10:12:44.000000000 -1000
+++ dhcp-4.1.0/common/resolv.c	2009-01-06 12:05:17.000000000 -1000
@@ -49,7 +49,7 @@ void read_resolv_conf (parse_time)
 	struct domain_search_list *dp, *dl, *nd;
 	isc_result_t status;
 
-	if ((file = open (path_resolv_conf, O_RDONLY)) < 0) {
+	if ((file = open (path_resolv_conf, O_RDONLY | O_CLOEXEC)) < 0) {
 		log_error ("Can't open %s: %m", path_resolv_conf);
 		return;
 	}
diff -up dhcp-4.1.0/common/upf.c.cloexec dhcp-4.1.0/common/upf.c
--- dhcp-4.1.0/common/upf.c.cloexec	2009-01-06 11:56:11.000000000 -1000
+++ dhcp-4.1.0/common/upf.c	2009-01-06 11:56:11.000000000 -1000
@@ -77,7 +77,7 @@ int if_register_upf (info)
 		/* %Audit% Cannot exceed 36 bytes. %2004.06.17,Safe% */
 		sprintf(filename, "/dev/pf/pfilt%d", b);
 
-		sock = open (filename, O_RDWR, 0);
+		sock = open (filename, O_RDWR | O_CLOEXEC, 0);
 		if (sock < 0) {
 			if (errno == EBUSY) {
 				continue;
diff -up dhcp-4.1.0/dst/dst_api.c.cloexec dhcp-4.1.0/dst/dst_api.c
--- dhcp-4.1.0/dst/dst_api.c.cloexec	2007-11-30 11:51:43.000000000 -1000
+++ dhcp-4.1.0/dst/dst_api.c	2009-01-06 11:56:11.000000000 -1000
@@ -436,7 +436,7 @@ dst_s_write_private_key(const DST_KEY *k
 			     PRIVATE_KEY, PATH_MAX);
 
 	/* Do not overwrite an existing file */
-	if ((fp = dst_s_fopen(file, "w", 0600)) != NULL) {
+	if ((fp = dst_s_fopen(file, "we", 0600)) != NULL) {
 		int nn;
 		if ((nn = fwrite(encoded_block, 1, len, fp)) != len) {
 			EREPORT(("dst_write_private_key(): Write failure on %s %d != %d errno=%d\n",
@@ -493,7 +493,7 @@ dst_s_read_public_key(const char *in_nam
 	 * flags, proto, alg stored as decimal (or hex numbers FIXME).
 	 * (FIXME: handle parentheses for line continuation.)
 	 */
-	if ((fp = dst_s_fopen(name, "r", 0)) == NULL) {
+	if ((fp = dst_s_fopen(name, "re", 0)) == NULL) {
 		EREPORT(("dst_read_public_key(): Public Key not found %s\n",
 			 name));
 		return (NULL);
@@ -615,7 +615,7 @@ dst_s_write_public_key(const DST_KEY *ke
 		return (0);
 	}
 	/* create public key file */
-	if ((fp = dst_s_fopen(filename, "w+", 0644)) == NULL) {
+	if ((fp = dst_s_fopen(filename, "w+e", 0644)) == NULL) {
 		EREPORT(("DST_write_public_key: open of file:%s failed (errno=%d)\n",
 			 filename, errno));
 		return (0);
@@ -849,7 +849,7 @@ dst_s_read_private_key_file(char *name, 
 		return (0);
 	}
 	/* first check if we can find the key file */
-	if ((fp = dst_s_fopen(filename, "r", 0)) == NULL) {
+	if ((fp = dst_s_fopen(filename, "re", 0)) == NULL) {
 		EREPORT(("dst_s_read_private_key_file: Could not open file %s in directory %s\n",
 			 filename, dst_path[0] ? dst_path :
 			 (char *) getcwd(NULL, PATH_MAX - 1)));
diff -up dhcp-4.1.0/dst/prandom.c.cloexec dhcp-4.1.0/dst/prandom.c
--- dhcp-4.1.0/dst/prandom.c.cloexec	2007-11-30 11:51:43.000000000 -1000
+++ dhcp-4.1.0/dst/prandom.c	2009-01-06 11:56:11.000000000 -1000
@@ -267,7 +267,7 @@ get_dev_random(u_char *output, unsigned 
 
 	s = stat("/dev/random", &st);
 	if (s == 0 && S_ISCHR(st.st_mode)) {
-		if ((fd = open("/dev/random", O_RDONLY | O_NONBLOCK)) != -1) {
+		if ((fd = open("/dev/random", O_RDONLY | O_NONBLOCK | O_CLOEXEC)) != -1) {
 			if ((n = read(fd, output, size)) < 0)
 				n = 0;
 			close(fd);
@@ -478,7 +478,7 @@ digest_file(dst_work *work) 
 		work->file_digest = dst_free_key(work->file_digest);
 		return (0);
 	}
-	if ((fp = fopen(name, "r")) == NULL) 
+	if ((fp = fopen(name, "re")) == NULL) 
 		return (0);
 	for (no = 0; (i = fread(buf, sizeof(*buf), sizeof(buf), fp)) > 0; 
 	     no += i) 
diff -up dhcp-4.1.0/minires/res_init.c.cloexec dhcp-4.1.0/minires/res_init.c
--- dhcp-4.1.0/minires/res_init.c.cloexec	2008-02-28 11:21:56.000000000 -1000
+++ dhcp-4.1.0/minires/res_init.c	2009-01-06 11:56:11.000000000 -1000
@@ -233,7 +233,7 @@ minires_vinit(res_state statp, int prein
 	(line[sizeof(name) - 1] == ' ' || \
 	 line[sizeof(name) - 1] == '\t'))
 
-	if ((fp = fopen(_PATH_RESCONF, "r")) != NULL) {
+	if ((fp = fopen(_PATH_RESCONF, "re")) != NULL) {
 	    /* read the config file */
 	    while (fgets(buf, sizeof(buf), fp) != NULL) {
 		/* skip comments */
diff -up dhcp-4.1.0/minires/res_query.c.cloexec dhcp-4.1.0/minires/res_query.c
--- dhcp-4.1.0/minires/res_query.c.cloexec	2008-02-28 11:21:56.000000000 -1000
+++ dhcp-4.1.0/minires/res_query.c	2009-01-06 11:56:11.000000000 -1000
@@ -379,7 +379,7 @@ res_hostalias(const res_state statp, con
 	if (statp->options & RES_NOALIASES)
 		return (NULL);
 	file = getenv("HOSTALIASES");
-	if (file == NULL || (fp = fopen(file, "r")) == NULL)
+	if (file == NULL || (fp = fopen(file, "re")) == NULL)
 		return (NULL);
 	setbuf(fp, NULL);
 	buf[sizeof(buf) - 1] = '\0';
diff -up dhcp-4.1.0/omapip/trace.c.cloexec dhcp-4.1.0/omapip/trace.c
--- dhcp-4.1.0/omapip/trace.c.cloexec	2007-07-12 20:43:42.000000000 -1000
+++ dhcp-4.1.0/omapip/trace.c	2009-01-06 11:56:11.000000000 -1000
@@ -140,10 +140,10 @@ isc_result_t trace_begin (const char *fi
 		return ISC_R_INVALIDARG;
 	}
 
-	traceoutfile = open (filename, O_CREAT | O_WRONLY | O_EXCL, 0600);
+	traceoutfile = open (filename, O_CREAT | O_WRONLY | O_EXCL | O_CLOEXEC, 0600);
 	if (traceoutfile < 0 && errno == EEXIST) {
 		log_error ("WARNING: Overwriting trace file \"%s\"", filename);
-		traceoutfile = open (filename, O_WRONLY | O_EXCL, 0600);
+		traceoutfile = open (filename, O_WRONLY | O_EXCL | O_CLOEXEC, 0600);
 	}
 
 	if (traceoutfile < 0) {
@@ -429,7 +429,7 @@ void trace_file_replay (const char *file
 	isc_result_t result;
 	int len;
 
-	traceinfile = fopen (filename, "r");
+	traceinfile = fopen (filename, "re");
 	if (!traceinfile) {
 		log_error ("Can't open tracefile %s: %m", filename);
 		return;
diff -up dhcp-4.1.0/relay/dhcrelay.c.cloexec dhcp-4.1.0/relay/dhcrelay.c
--- dhcp-4.1.0/relay/dhcrelay.c.cloexec	2008-11-12 13:22:14.000000000 -1000
+++ dhcp-4.1.0/relay/dhcrelay.c	2009-01-06 12:06:23.000000000 -1000
@@ -174,11 +174,11 @@ main(int argc, char **argv) {
 	/* Make sure that file descriptors 0(stdin), 1,(stdout), and
 	   2(stderr) are open. To do this, we assume that when we
 	   open a file the lowest available file descriptor is used. */
-	fd = open("/dev/null", O_RDWR);
+	fd = open("/dev/null", O_RDWR | O_CLOEXEC);
 	if (fd == 0)
-		fd = open("/dev/null", O_RDWR);
+		fd = open("/dev/null", O_RDWR | O_CLOEXEC);
 	if (fd == 1)
-		fd = open("/dev/null", O_RDWR);
+		fd = open("/dev/null", O_RDWR | O_CLOEXEC);
 	if (fd == 2)
 		log_perror = 0; /* No sense logging to /dev/null. */
 	else if (fd != -1)
@@ -511,12 +511,12 @@ main(int argc, char **argv) {
 			exit(0);
 
 		pfdesc = open(path_dhcrelay_pid,
-			       O_CREAT | O_TRUNC | O_WRONLY, 0644);
+			       O_CREAT | O_TRUNC | O_WRONLY | O_CLOEXEC, 0644);
 
 		if (pfdesc < 0) {
 			log_error("Can't create %s: %m", path_dhcrelay_pid);
 		} else {
-			pf = fdopen(pfdesc, "w");
+			pf = fdopen(pfdesc, "we");
 			if (!pf)
 				log_error("Can't fdopen %s: %m",
 				      path_dhcrelay_pid);
diff -up dhcp-4.1.0/server/confpars.c.cloexec dhcp-4.1.0/server/confpars.c
--- dhcp-4.1.0/server/confpars.c.cloexec	2009-01-06 11:56:10.000000000 -1000
+++ dhcp-4.1.0/server/confpars.c	2009-01-06 11:56:11.000000000 -1000
@@ -116,7 +116,7 @@ isc_result_t read_conf_file (const char 
 	}
 #endif
 
-	if ((file = open (filename, O_RDONLY)) < 0) {
+	if ((file = open (filename, O_RDONLY | O_CLOEXEC)) < 0) {
 		if (leasep) {
 			log_error ("Can't open lease database %s: %m --",
 				   path_dhcpd_db);
diff -up dhcp-4.1.0/server/db.c.cloexec dhcp-4.1.0/server/db.c
--- dhcp-4.1.0/server/db.c.cloexec	2008-03-31 03:49:45.000000000 -1000
+++ dhcp-4.1.0/server/db.c	2009-01-06 11:56:11.000000000 -1000
@@ -1021,7 +1021,7 @@ void db_startup (testp)
 	}
 #endif
 	if (!testp) {
-		db_file = fopen (path_dhcpd_db, "a");
+		db_file = fopen (path_dhcpd_db, "ae");
 		if (!db_file)
 			log_fatal ("Can't open %s for append.", path_dhcpd_db);
 		expire_all_pools ();
@@ -1069,12 +1069,12 @@ int new_lease_file ()
 		     path_dhcpd_db, (int)t) >= sizeof newfname)
 		log_fatal("new_lease_file: lease file path too long");
 
-	db_fd = open (newfname, O_WRONLY | O_TRUNC | O_CREAT, 0664);
+	db_fd = open (newfname, O_WRONLY | O_TRUNC | O_CREAT | O_CLOEXEC, 0664);
 	if (db_fd < 0) {
 		log_error ("Can't create new lease file: %m");
 		return 0;
 	}
-	if ((new_db_file = fdopen(db_fd, "w")) == NULL) {
+	if ((new_db_file = fdopen(db_fd, "we")) == NULL) {
 		log_error("Can't fdopen new lease file: %m");
 		close(db_fd);
 		goto fdfail;
diff -up dhcp-4.1.0/server/dhcpd.c.cloexec dhcp-4.1.0/server/dhcpd.c
--- dhcp-4.1.0/server/dhcpd.c.cloexec	2009-01-06 11:56:09.000000000 -1000
+++ dhcp-4.1.0/server/dhcpd.c	2009-01-06 12:06:49.000000000 -1000
@@ -266,11 +266,11 @@ main(int argc, char **argv) {
         /* Make sure that file descriptors 0 (stdin), 1, (stdout), and
            2 (stderr) are open. To do this, we assume that when we
            open a file the lowest available file descriptor is used. */
-        fd = open("/dev/null", O_RDWR);
+        fd = open("/dev/null", O_RDWR | O_CLOEXEC);
         if (fd == 0)
-                fd = open("/dev/null", O_RDWR);
+                fd = open("/dev/null", O_RDWR | O_CLOEXEC);
         if (fd == 1)
-                fd = open("/dev/null", O_RDWR);
+                fd = open("/dev/null", O_RDWR | O_CLOEXEC);
         if (fd == 2)
                 log_perror = 0; /* No sense logging to /dev/null. */
         else if (fd != -1)
@@ -779,7 +779,7 @@ main(int argc, char **argv) {
 #endif /* PARANOIA */
 
 	/* Read previous pid file. */
-	if ((i = open (path_dhcpd_pid, O_RDONLY)) >= 0) {
+	if ((i = open (path_dhcpd_pid, O_RDONLY | O_CLOEXEC)) >= 0) {
 		status = read(i, pbuf, (sizeof pbuf) - 1);
 		close (i);
 		if (status > 0) {
@@ -797,7 +797,7 @@ main(int argc, char **argv) {
 	}
 
         /* Write new pid file. */
-        if ((i = open(path_dhcpd_pid, O_WRONLY|O_CREAT|O_TRUNC, 0644)) >= 0) {
+        if ((i = open(path_dhcpd_pid, O_WRONLY|O_CREAT|O_TRUNC|O_CLOEXEC, 0644)) >= 0) {
                 sprintf(pbuf, "%d\n", (int) getpid());
                 write(i, pbuf, strlen(pbuf));
                 close(i);
@@ -823,9 +823,9 @@ main(int argc, char **argv) {
                 close(2);
 
                 /* Reopen them on /dev/null. */
-                open("/dev/null", O_RDWR);
-                open("/dev/null", O_RDWR);
-                open("/dev/null", O_RDWR);
+                open("/dev/null", O_RDWR | O_CLOEXEC);
+                open("/dev/null", O_RDWR | O_CLOEXEC);
+                open("/dev/null", O_RDWR | O_CLOEXEC);
                 log_perror = 0; /* No sense logging to /dev/null. */
 
                 chdir("/");
diff -up dhcp-4.1.0/server/ldap.c.cloexec dhcp-4.1.0/server/ldap.c
--- dhcp-4.1.0/server/ldap.c.cloexec	2009-01-06 11:56:09.000000000 -1000
+++ dhcp-4.1.0/server/ldap.c	2009-01-06 11:56:11.000000000 -1000
@@ -685,7 +685,7 @@ ldap_start (void)
 
   if (ldap_debug_file != NULL && ldap_debug_fd == -1)
     {
-      if ((ldap_debug_fd = open (ldap_debug_file, O_CREAT | O_TRUNC | O_WRONLY,
+      if ((ldap_debug_fd = open (ldap_debug_file, O_CREAT | O_TRUNC | O_WRONLY | O_CLOEXEC,
                                  S_IRUSR | S_IWUSR)) < 0)
         log_error ("Error opening debug LDAP log file %s: %s", ldap_debug_file,
                    strerror (errno));

dhcp-4.1.0-default-requested-options.patch:

--- NEW FILE dhcp-4.1.0-default-requested-options.patch ---
diff -up dhcp-4.1.0/client/clparse.c.requested dhcp-4.1.0/client/clparse.c
--- dhcp-4.1.0/client/clparse.c.requested	2009-01-06 10:40:46.000000000 -1000
+++ dhcp-4.1.0/client/clparse.c	2009-01-06 10:40:47.000000000 -1000
@@ -37,7 +37,7 @@
 
 struct client_config top_level_config;
 
-#define NUM_DEFAULT_REQUESTED_OPTS	9
+#define NUM_DEFAULT_REQUESTED_OPTS	12
 struct option *default_requested_options[NUM_DEFAULT_REQUESTED_OPTS + 1];
 
 static void parse_client_default_duid(struct parse *cfile);
@@ -111,6 +111,21 @@ isc_result_t read_client_conf ()
 	option_code_hash_lookup(&default_requested_options[8],
 				dhcpv6_universe.code_hash, &code, 0, MDL);
 
+	/* 10 */
+	code = DHO_NIS_DOMAIN;
+	option_code_hash_lookup(&default_requested_options[9],
+				dhcp_universe.code_hash, &code, 0, MDL);
+
+	/* 11 */
+	code = DHO_NIS_SERVERS;
+	option_code_hash_lookup(&default_requested_options[10],
+				dhcp_universe.code_hash, &code, 0, MDL);
+
+	/* 12 */
+	code = DHO_NTP_SERVERS;
+	option_code_hash_lookup(&default_requested_options[11],
+				dhcp_universe.code_hash, &code, 0, MDL);
+
 	for (code = 0 ; code < NUM_DEFAULT_REQUESTED_OPTS ; code++) {
 		if (default_requested_options[code] == NULL)
 			log_fatal("Unable to find option definition for "

dhcp-4.1.0-dhclient-anycast.patch:

--- NEW FILE dhcp-4.1.0-dhclient-anycast.patch ---
diff -up dhcp-4.1.0/client/clparse.c.anycast dhcp-4.1.0/client/clparse.c
--- dhcp-4.1.0/client/clparse.c.anycast	2009-01-06 10:43:52.000000000 -1000
+++ dhcp-4.1.0/client/clparse.c	2009-01-06 10:43:53.000000000 -1000
@@ -558,6 +558,17 @@ void parse_client_statement (cfile, ip, 
 		}
 		return;
 
+	      case ANYCAST_MAC:
+		token = next_token (&val, (unsigned *)0, cfile);
+		if (ip) {
+			parse_hardware_param (cfile, &ip -> anycast_mac_addr);
+		} else {
+			parse_warn (cfile, "anycast mac address parameter %s",
+			            "not allowed here.");
+			skip_to_semi (cfile);
+		}
+		return;
+
 	      case REQUEST:
 		token = next_token (&val, (unsigned *)0, cfile);
 		if (config -> requested_options == default_requested_options)
diff -up dhcp-4.1.0/common/conflex.c.anycast dhcp-4.1.0/common/conflex.c
--- dhcp-4.1.0/common/conflex.c.anycast	2009-01-06 10:43:52.000000000 -1000
+++ dhcp-4.1.0/common/conflex.c	2009-01-06 10:43:53.000000000 -1000
@@ -729,6 +729,8 @@ intern(char *atom, enum dhcp_token dfv) 
 		}
 		if (!strcasecmp (atom + 1, "nd"))
 			return AND;
+		if (!strcasecmp (atom + 1, "nycast-mac"))
+			return ANYCAST_MAC;
 		if (!strcasecmp (atom + 1, "ppend"))
 			return APPEND;
 		if (!strcasecmp (atom + 1, "llow"))
diff -up dhcp-4.1.0/common/lpf.c.anycast dhcp-4.1.0/common/lpf.c
--- dhcp-4.1.0/common/lpf.c.anycast	2009-01-06 10:43:52.000000000 -1000
+++ dhcp-4.1.0/common/lpf.c	2009-01-06 10:43:53.000000000 -1000
@@ -333,6 +333,9 @@ ssize_t send_packet (interface, packet, 
 		return send_fallback (interface, packet, raw,
 				      len, from, to, hto);
 
+	if (hto == NULL && interface->anycast_mac_addr.hlen)
+		hto = &interface->anycast_mac_addr;
+
 	/* Assemble the headers... */
 	assemble_hw_header (interface, (unsigned char *)hh, &hbufp, hto);
 	fudge = hbufp % 4;	/* IP header must be word-aligned. */
diff -up dhcp-4.1.0/includes/dhcpd.h.anycast dhcp-4.1.0/includes/dhcpd.h
--- dhcp-4.1.0/includes/dhcpd.h.anycast	2009-01-06 10:43:53.000000000 -1000
+++ dhcp-4.1.0/includes/dhcpd.h	2009-01-06 10:43:53.000000000 -1000
@@ -1215,6 +1215,7 @@ struct interface_info {
 	int dlpi_sap_length;
 	struct hardware dlpi_broadcast_addr;
 # endif /* DLPI_SEND || DLPI_RECEIVE */
+	struct hardware anycast_mac_addr;
 };
 
 struct hardware_link {
diff -up dhcp-4.1.0/includes/dhctoken.h.anycast dhcp-4.1.0/includes/dhctoken.h
--- dhcp-4.1.0/includes/dhctoken.h.anycast	2009-01-06 10:43:52.000000000 -1000
+++ dhcp-4.1.0/includes/dhctoken.h	2009-01-06 10:49:12.000000000 -1000
@@ -353,7 +353,8 @@ enum dhcp_token {
 	TEMPORARY = 656,
 	PREFIX6 = 657,
 	FIXED_PREFIX6 = 658,
-	BOOTP_BROADCAST_ALWAYS = 659
+	BOOTP_BROADCAST_ALWAYS = 659,
+	ANYCAST_MAC = 660
 };
 
 #define is_identifier(x)	((x) >= FIRST_TOKEN &&	\

dhcp-4.1.0-dhclient-decline-backoff.patch:

--- NEW FILE dhcp-4.1.0-dhclient-decline-backoff.patch ---
diff -up dhcp-4.1.0/client/dhclient.c.backoff dhcp-4.1.0/client/dhclient.c
--- dhcp-4.1.0/client/dhclient.c.backoff	2009-01-06 10:08:07.000000000 -1000
+++ dhcp-4.1.0/client/dhclient.c	2009-01-06 10:10:27.000000000 -1000
@@ -1185,6 +1185,7 @@ void state_init (cpp)
 	void *cpp;
 {
 	struct client_state *client = cpp;
+	enum dhcp_state init_state = client->state;
 
 	ASSERT_STATE(state, S_INIT);
 
@@ -1197,9 +1198,16 @@ void state_init (cpp)
 	client -> first_sending = cur_time;
 	client -> interval = client -> config -> initial_interval;
 
-	/* Add an immediate timeout to cause the first DHCPDISCOVER packet
-	   to go out. */
-	send_discover (client);
+	if (init_state != S_DECLINED) {
+		/* Add an immediate timeout to cause the first DHCPDISCOVER packet
+		   to go out. */
+		send_discover(client);
+	} else {
+		/* We've received an OFFER and it has been DECLINEd by dhclient-script.
+		 * wait for a random time between 1 and backoff_cutoff seconds before
+		 * trying again. */
+		add_timeout(cur_time + ((1 + (random() >> 2)) %  client->config->backoff_cutoff), send_discover, client, 0, 0);
+	}
 }
 
 /*
@@ -1478,6 +1486,7 @@ void bind_lease (client)
 		send_decline (client);
 		destroy_client_lease (client -> new);
 		client -> new = (struct client_lease *)0;
+		client -> state = S_DECLINED;
 		state_init (client);
 		return;
 	}
@@ -3680,6 +3689,7 @@ void client_location_changed ()
 			      case S_INIT:
 			      case S_REBINDING:
 			      case S_STOPPED:
+			      case S_DECLINED:
 				break;
 			}
 			client -> state = S_INIT;
diff -up dhcp-4.1.0/includes/dhcpd.h.backoff dhcp-4.1.0/includes/dhcpd.h
--- dhcp-4.1.0/includes/dhcpd.h.backoff	2009-01-06 10:08:07.000000000 -1000
+++ dhcp-4.1.0/includes/dhcpd.h	2009-01-06 10:08:07.000000000 -1000
@@ -1016,7 +1016,8 @@ enum dhcp_state {
 	S_BOUND = 5,
 	S_RENEWING = 6,
 	S_REBINDING = 7,
-	S_STOPPED = 8
+	S_STOPPED = 8,
+	S_DECLINED = 9
 };
 
 /* Authentication and BOOTP policy possibilities (not all values work

dhcp-4.1.0-dhclient-usage.patch:

--- NEW FILE dhcp-4.1.0-dhclient-usage.patch ---
diff -up dhcp-4.1.0/client/dhclient.c.usage dhcp-4.1.0/client/dhclient.c
--- dhcp-4.1.0/client/dhclient.c.usage	2009-01-06 10:36:55.000000000 -1000
+++ dhcp-4.1.0/client/dhclient.c	2009-01-06 10:39:58.000000000 -1000
@@ -990,6 +990,10 @@ static void usage()
 		  "[-s server]");
 	log_error("                [-cf config-file] [-lf lease-file]%s",
 		  "[-pf pid-file] [-e VAR=val]");
+	log_error("                [-I <dhcp-client-identifier>] [-B]");
+	log_error("                [-H <host-name> | -F <fqdn.fqdn>] [-timeout <timeout>]");
+	log_error("                [-V <vendor-class-identifier>]");
+	log_error("                [-R <request option list>]");
 	log_fatal("                [-sf script-file] [interface]");
 }
 

dhcp-4.1.0-errwarn-message.patch:

--- NEW FILE dhcp-4.1.0-errwarn-message.patch ---
diff -up dhcp-4.1.0/omapip/errwarn.c.errwarn dhcp-4.1.0/omapip/errwarn.c
--- dhcp-4.1.0/omapip/errwarn.c.errwarn	2007-07-12 20:43:42.000000000 -1000
+++ dhcp-4.1.0/omapip/errwarn.c	2009-01-06 07:02:20.000000000 -1000
@@ -76,20 +76,13 @@ void log_fatal (const char * fmt, ... )
 
 #if !defined (NOMINUM)
   log_error ("%s", "");
-  log_error ("If you did not get this software from ftp.isc.org, please");
-  log_error ("get the latest from ftp.isc.org and install that before");
-  log_error ("requesting help.");
+  log_error ("This version of ISC DHCP is based on the release available");
+  log_error ("on ftp.isc.org.  Features have been added and other changes");
+  log_error ("have been made to the base software release in order to make");
+  log_error ("it work better with this distribution.");
   log_error ("%s", "");
-  log_error ("If you did get this software from ftp.isc.org and have not");
-  log_error ("yet read the README, please read it before requesting help.");
-  log_error ("If you intend to request help from the dhcp-server at isc.org");
-  log_error ("mailing list, please read the section on the README about");
-  log_error ("submitting bug reports and requests for help.");
-  log_error ("%s", "");
-  log_error ("Please do not under any circumstances send requests for");
-  log_error ("help directly to the authors of this software - please");
-  log_error ("send them to the appropriate mailing list as described in");
-  log_error ("the README file.");
+  log_error ("Please report for this software via the Red Hat Bugzilla site:");
+  log_error ("    http://bugzilla.redhat.com");
   log_error ("%s", "");
   log_error ("exiting.");
 #endif

dhcp-4.1.0-failover-ports.patch:

--- NEW FILE dhcp-4.1.0-failover-ports.patch ---
diff -up dhcp-4.1.0/server/confpars.c.failover dhcp-4.1.0/server/confpars.c
--- dhcp-4.1.0/server/confpars.c.failover	2009-01-06 10:24:38.000000000 -1000
+++ dhcp-4.1.0/server/confpars.c	2009-01-06 10:24:38.000000000 -1000
@@ -1142,10 +1142,17 @@ void parse_failover_peer (cfile, group, 
 		parse_warn (cfile, "peer address may not be omitted");
 
 	/* XXX - when/if we get a port number assigned, just set as default */
+	/* See Red Hat Bugzilla 167292:
+	 * we do now:  dhcp-failover 647/tcp
+	 *             dhcp-failover 647/udp
+	 *             dhcp-failover 847/tcp
+	 *             dhcp-failover 847/udp
+	 * IANA registration by Bernard Volz <volz at cisco.com>
+	 */
 	if (!peer -> me.port)
-		parse_warn (cfile, "local port may not be omitted");
+		peer -> me.port = 647;
 	if (!peer -> partner.port)
-		parse_warn (cfile, "peer port may not be omitted");
+		peer -> partner.port = 847;
 
 	if (peer -> i_am == primary) {
 	    if (!peer -> hba) {

dhcp-4.1.0-garbage-chars.patch:

--- NEW FILE dhcp-4.1.0-garbage-chars.patch ---
diff -up dhcp-4.1.0/common/tables.c.garbage dhcp-4.1.0/common/tables.c
--- dhcp-4.1.0/common/tables.c.garbage	2008-01-23 16:43:04.000000000 -1000
+++ dhcp-4.1.0/common/tables.c	2009-01-06 12:09:41.000000000 -1000
@@ -207,7 +207,7 @@ static struct option dhcp_options[] = {
 	{ "netinfo-server-tag", "t",		&dhcp_universe, 113, 1 },
 	{ "default-url", "t",			&dhcp_universe, 114, 1 },
 	{ "subnet-selection", "I",		&dhcp_universe, 118, 1 },
-	{ "domain-search", "Dc",		&dhcp_universe, 119, 1 },
+	{ "domain-search", "D",		&dhcp_universe, 119, 1 },
 	{ "vivco", "Evendor-class.",		&dhcp_universe, 124, 1 },
 	{ "vivso", "Evendor.",			&dhcp_universe, 125, 1 },
 #if 0

dhcp-4.1.0-inherit-leases.patch:

--- NEW FILE dhcp-4.1.0-inherit-leases.patch ---
diff -up dhcp-4.1.0/client/dhclient.c.inherit dhcp-4.1.0/client/dhclient.c
--- dhcp-4.1.0/client/dhclient.c.inherit	2009-01-06 12:08:56.000000000 -1000
+++ dhcp-4.1.0/client/dhclient.c	2009-01-06 12:08:57.000000000 -1000
@@ -2299,6 +2299,7 @@ void send_request (cpp)
 {
 	struct client_state *client = cpp;
 
+	int i;
 	int result;
 	int interval;
 	struct sockaddr_in destination;
@@ -2358,6 +2359,22 @@ void send_request (cpp)
 		/* Now do a preinit on the interface so that we can
 		   discover a new address. */
 		script_init (client, "PREINIT", (struct string_list *)0);
+
+		/* Has an active lease */
+		if (client -> interface -> addresses != NULL) {
+			for (i = 0; i < client -> interface -> address_count; i++) {
+				if (client -> active &&
+				    client -> active -> is_bootp &&
+				    client -> active -> expiry > cur_time &&
+				    client -> interface -> addresses[i].s_addr != 0 &&
+				    client -> active -> address.len == 4 &&
+				    memcpy (client -> active -> address.iabuf, &(client -> interface -> addresses[i]), 4) == 0) {
+					client_envadd (client, "", "keep_old_ip", "%s", "yes");
+					break;
+				}
+			}
+		}
+
 		if (client -> alias)
 			script_write_params (client, "alias_",
 					     client -> alias);

dhcp-4.1.0-invalid-dhclient-conf.patch:

--- NEW FILE dhcp-4.1.0-invalid-dhclient-conf.patch ---
diff -up dhcp-4.1.0/client/dhclient.conf.supersede dhcp-4.1.0/client/dhclient.conf
--- dhcp-4.1.0/client/dhclient.conf.supersede	1997-06-02 12:50:44.000000000 -1000
+++ dhcp-4.1.0/client/dhclient.conf	2009-01-06 12:27:08.000000000 -1000
@@ -1,10 +1,10 @@
 send host-name "andare.fugue.com";
 send dhcp-client-identifier 1:0:a0:24:ab:fb:9c;
 send dhcp-lease-time 3600;
-supersede domain-name "fugue.com home.vix.com";
+supersede domain-search "fugue.com home.vix.com";
 prepend domain-name-servers 127.0.0.1;
 request subnet-mask, broadcast-address, time-offset, routers,
-	domain-name, domain-name-servers, host-name;
+	domain-search, domain-name, domain-name-servers, host-name;
 require subnet-mask, domain-name-servers;
 timeout 60;
 retry 60;

dhcp-4.1.0-ldap-configuration.patch:

--- NEW FILE dhcp-4.1.0-ldap-configuration.patch ---
diff -up dhcp-4.1.0/common/conflex.c.ldap dhcp-4.1.0/common/conflex.c
--- dhcp-4.1.0/common/conflex.c.ldap	2008-03-07 10:12:44.000000000 -1000
+++ dhcp-4.1.0/common/conflex.c	2009-01-06 07:03:13.000000000 -1000
@@ -43,6 +43,7 @@ static enum dhcp_token read_string PROTO
 static enum dhcp_token read_number PROTO ((int, struct parse *));
 static enum dhcp_token read_num_or_name PROTO ((int, struct parse *));
 static enum dhcp_token intern PROTO ((char *, enum dhcp_token));
+static int read_function PROTO ((struct parse *));
 
 isc_result_t new_parse (cfile, file, inbuf, buflen, name, eolp)
 	struct parse **cfile;
@@ -73,6 +74,10 @@ isc_result_t new_parse (cfile, file, inb
 	tmp->file = file;
 	tmp->eol_token = eolp;
 
+	if (file != -1) {
+		tmp -> read_function = read_function;
+	}
+
 	if (inbuf != NULL) {
 		tmp->inbuf = inbuf;
 		tmp->buflen = buflen;
@@ -177,9 +182,13 @@ static int get_char (cfile)
 	/* My kingdom for WITH... */
 	int c;
 
-	if (cfile->bufix == cfile->buflen)
-		c = EOF;
-	else {
+	if (cfile->bufix == cfile->buflen) {
+		if (cfile -> read_function) {
+			c = cfile -> read_function (cfile);
+		} else {
+			c = EOF;
+		}
+	} else {
 		c = cfile->inbuf [cfile->bufix];
 		cfile->bufix++;
 	}
@@ -1443,3 +1452,25 @@ intern(char *atom, enum dhcp_token dfv) 
 	}
 	return dfv;
 }
+
+static int
+read_function (struct parse * cfile)
+{
+	int c;
+
+	ssize_t n = read (cfile -> file, cfile -> inbuf, cfile -> bufsiz);
+	if (n == 0) {
+		c = EOF;
+		cfile -> bufix = 0;
+		cfile -> buflen = 0;
+	} else if (n < 0) {
+		c = EOF;
+		cfile -> bufix = cfile -> buflen = 0;
+	} else {
+		c = cfile -> inbuf [0];
+		cfile -> bufix = 1;
+		cfile -> buflen = n;
+	}
+
+	return c;
+}
diff -up dhcp-4.1.0/common/print.c.ldap dhcp-4.1.0/common/print.c
--- dhcp-4.1.0/common/print.c.ldap	2007-10-01 04:47:35.000000000 -1000
+++ dhcp-4.1.0/common/print.c	2009-01-06 07:03:13.000000000 -1000
@@ -163,9 +163,9 @@ char *print_base64 (const unsigned char 
 }
 
 char *print_hw_addr (htype, hlen, data)
-	int htype;
-	int hlen;
-	unsigned char *data;
+	const int htype;
+	const int hlen;
+	const unsigned char *data;
 {
 	static char habuf [49];
 	char *s;
diff -up dhcp-4.1.0/dst/Makefile.am.ldap dhcp-4.1.0/dst/Makefile.am
--- dhcp-4.1.0/dst/Makefile.am.ldap	2007-05-29 06:32:10.000000000 -1000
+++ dhcp-4.1.0/dst/Makefile.am	2009-01-06 07:03:13.000000000 -1000
@@ -2,7 +2,12 @@ AM_CPPFLAGS = -DMINIRES_LIB -DHMAC_MD5
 
 lib_LIBRARIES = libdst.a
 
+noinst_LIBRARIES = libdstnomd5.a
+
 libdst_a_SOURCES = dst_support.c dst_api.c hmac_link.c md5_dgst.c \
 		   base64.c prandom.c
 
+libdstnomd5_a_SOURCES = dst_support.c dst_api.c hmac_link.c \
+		   base64.c prandom.c
+
 EXTRA_DIST = dst_internal.h md5.h md5_locl.h
diff -up dhcp-4.1.0/includes/dhcpd.h.ldap dhcp-4.1.0/includes/dhcpd.h
--- dhcp-4.1.0/includes/dhcpd.h.ldap	2008-08-29 07:48:57.000000000 -1000
+++ dhcp-4.1.0/includes/dhcpd.h	2009-01-06 07:03:13.000000000 -1000
@@ -102,6 +102,11 @@ typedef time_t TIME;
 #include <isc-dhcp/result.h>
 #include <omapip/omapip_p.h>
 
+#if defined(LDAP_CONFIGURATION)
+# include <ldap.h>
+# include <sys/utsname.h> /* for uname() */
+#endif
+
 #if !defined (BYTE_NAME_HASH_SIZE)
 # define BYTE_NAME_HASH_SIZE	401	/* Default would be ridiculous. */
 #endif
@@ -291,6 +296,8 @@ struct parse {
 	size_t bufsiz;
 
 	struct parse *saved_state;
+
+	int (*read_function) (struct parse *);
 };
 
 /* Variable-length array of data. */
@@ -422,6 +429,32 @@ struct hardware {
 	u_int8_t hbuf [17];
 };
 
+#if defined(LDAP_CONFIGURATION)
+# define LDAP_BUFFER_SIZE		8192
+# define LDAP_METHOD_STATIC		0
+# define LDAP_METHOD_DYNAMIC	1
+#if defined (USE_SSL)
+# define LDAP_SSL_OFF			0
+# define LDAP_SSL_ON			1
+# define LDAP_SSL_TLS			2
+# define LDAP_SSL_LDAPS			3
+#endif
+
+/* This is a tree of the current configuration we are building from LDAP */
+struct ldap_config_stack {
+	LDAPMessage * res;	/* Pointer returned from ldap_search */
+	LDAPMessage * ldent;	/* Current item in LDAP that we're processing.
+							in res */
+	int close_brace;	/* Put a closing } after we're through with
+						this item */
+	int processed;	/* We set this flag if this base item has been
+					processed. After this base item is processed,
+					we can start processing the children */
+	struct ldap_config_stack *children;
+	struct ldap_config_stack *next;
+};
+#endif
+
 typedef enum {
 	server_startup = 0,
 	server_running = 1,
@@ -642,6 +675,29 @@ struct lease_state {
 # define DEFAULT_ACK_DELAY_USECS 250000 /* 1/4 of a second */
 #endif
 
+#if defined(LDAP_CONFIGURATION)
+# define SV_LDAP_SERVER			57
+# define SV_LDAP_PORT			58
+# define SV_LDAP_USERNAME		59
+# define SV_LDAP_PASSWORD		60
+# define SV_LDAP_BASE_DN		61
+# define SV_LDAP_METHOD			62
+# define SV_LDAP_DEBUG_FILE		63
+# define SV_LDAP_DHCP_SERVER_CN		64
+# define SV_LDAP_REFERRALS		65
+#if defined (USE_SSL)
+# define SV_LDAP_SSL			66
+# define SV_LDAP_TLS_REQCERT		67
+# define SV_LDAP_TLS_CA_FILE		68
+# define SV_LDAP_TLS_CA_DIR		69
+# define SV_LDAP_TLS_CERT		70
+# define SV_LDAP_TLS_KEY		71
+# define SV_LDAP_TLS_CRLCHECK		72
+# define SV_LDAP_TLS_CIPHERS		73
+# define SV_LDAP_TLS_RANDFILE		74
+#endif
+#endif
+
 #if !defined (DEFAULT_DEFAULT_LEASE_TIME)
 # define DEFAULT_DEFAULT_LEASE_TIME 43200
 #endif
@@ -2107,7 +2163,7 @@ extern int db_time_format;
 char *quotify_string (const char *, const char *, int);
 char *quotify_buf (const unsigned char *, unsigned, const char *, int);
 char *print_base64 (const unsigned char *, unsigned, const char *, int);
-char *print_hw_addr PROTO ((int, int, unsigned char *));
+char *print_hw_addr PROTO ((const int, const int, const unsigned char *));
 void print_lease PROTO ((struct lease *));
 void dump_raw PROTO ((const unsigned char *, unsigned));
 void dump_packet_option (struct option_cache *, struct packet *,
@@ -3228,6 +3284,20 @@ OMAPI_OBJECT_ALLOC_DECL (dhcp_failover_l
 
 const char *binding_state_print (enum failover_state);
 
+/* ldap.c */
+#if defined(LDAP_CONFIGURATION)
[...2268 lines suppressed...]
+  if (res && ent)
+    {
+#if defined (DEBUG_LDAP)
+      char *dn = ldap_get_dn (ld, ent);
+      if (dn != NULL)
+        {
+          log_info ("Found subclass LDAP entry %s", dn);
+          ldap_memfree(dn);
+        }
+#endif
+
+      status = class_allocate (newclass, MDL);
+      if (status != ISC_R_SUCCESS)
+        {
+          log_error ("Cannot allocate memory for a new class");
+          ldap_msgfree (res);
+          return (0);
+        }
+
+      group_reference (&(*newclass)->group, class->group, MDL);
+      class_reference (&(*newclass)->superclass, class, MDL);
+      lease_limit = ldap_parse_options (ent, (*newclass)->group, 
+                                        CLASS_DECL, NULL, newclass);
+      if (lease_limit == 0)
+        (*newclass)->lease_limit = class->lease_limit; 
+      else
+        class->lease_limit = lease_limit;
+
+      if ((*newclass)->lease_limit) 
+        {
+          (*newclass)->billed_leases = 
+              dmalloc ((*newclass)->lease_limit * sizeof (struct lease *), MDL);
+          if (!(*newclass)->billed_leases) 
+            {
+              log_error ("no memory for billing");
+              class_dereference (newclass, MDL);
+              ldap_msgfree (res);
+              return (0);
+            }
+          memset ((*newclass)->billed_leases, 0, 
+                ((*newclass)->lease_limit * sizeof (*newclass)->billed_leases));
+        }
+
+      data_string_copy (&(*newclass)->hash_string, data, MDL);
+
+      ldap_msgfree (res);
+      return (1);
+    }
+
+  if(res) ldap_msgfree (res);
+  return (0);
+}
+
+#endif
diff -up dhcp-4.1.0/server/Makefile.am.ldap dhcp-4.1.0/server/Makefile.am
--- dhcp-4.1.0/server/Makefile.am.ldap	2007-05-29 06:32:11.000000000 -1000
+++ dhcp-4.1.0/server/Makefile.am	2009-01-06 07:03:12.000000000 -1000
@@ -4,12 +4,10 @@ dist_sysconf_DATA = dhcpd.conf
 sbin_PROGRAMS = dhcpd
 dhcpd_SOURCES = dhcpd.c dhcp.c bootp.c confpars.c db.c class.c failover.c \
 		omapi.c mdb.c stables.c salloc.c ddns.c dhcpleasequery.c \
-		dhcpv6.c mdb6.c
+		dhcpv6.c mdb6.c ldap.c ldap_casa.c
 
-# libomapi.a this is here twice to handle circular library dependencies :(
-dhcpd_LDADD = ../common/libdhcp.a ../omapip/libomapi.a ../dst/libdst.a \
-	      ../dhcpctl/libdhcpctl.a ../minires/libres.a \
-	      ../omapip/libomapi.a
+dhcpd_LDADD = ../common/libdhcp.a ../omapip/libomapi.a ../minires/libres.a \
+	      ../dhcpctl/libdhcpctl.a ../dst/libdstnomd5.a -lldap
 
 man_MANS = dhcpd.8 dhcpd.conf.5 dhcpd.leases.5
 EXTRA_DIST = $(man_MANS)
diff -up dhcp-4.1.0/server/mdb.c.ldap dhcp-4.1.0/server/mdb.c
--- dhcp-4.1.0/server/mdb.c.ldap	2008-02-28 11:21:56.000000000 -1000
+++ dhcp-4.1.0/server/mdb.c	2009-01-06 07:03:13.000000000 -1000
@@ -600,6 +600,12 @@ int find_hosts_by_haddr (struct host_dec
 			 const char *file, int line)
 {
 	struct hardware h;
+	int ret;
+
+#if defined(LDAP_CONFIGURATION)
+	if ((ret = find_haddr_in_ldap (hp, htype, hlen, haddr, file, line)))
+		return ret;
+#endif
 
 	h.hlen = hlen + 1;
 	h.hbuf [0] = htype;
diff -up dhcp-4.1.0/server/stables.c.ldap dhcp-4.1.0/server/stables.c
--- dhcp-4.1.0/server/stables.c.ldap	2008-11-03 08:13:58.000000000 -1000
+++ dhcp-4.1.0/server/stables.c	2009-01-06 07:56:33.000000000 -1000
@@ -244,9 +244,107 @@ static struct option server_options[] = 
 	{ "delayed-ack", "S",			&server_universe,  58, 1 },
 	{ "max-ack-delay", "L",			&server_universe,  59, 1 },
 #endif
+#if defined(LDAP_CONFIGURATION)
+	{ "ldap-server", "t",			&server_universe,  60, 1 },
+	{ "ldap-port", "d",			&server_universe,  61, 1 },
+	{ "ldap-username", "t",			&server_universe,  62, 1 },
+	{ "ldap-password", "t",			&server_universe,  63, 1 },
+	{ "ldap-base-dn", "t",			&server_universe,  64, 1 },
+	{ "ldap-method", "Nldap-methods.",	&server_universe,  65, 1 },
+	{ "ldap-debug-file", "t",		&server_universe,  66, 1 },
+	{ "ldap-dhcp-server-cn", "t",		&server_universe,  67, 1 },
+	{ "ldap-referrals", "f",		&server_universe,  68, 1 },
+#if defined(USE_SSL)
+	{ "ldap-ssl", "Nldap-ssl-usage.",	&server_universe,  69, 1 },
+	{ "ldap-tls-reqcert", "Nldap-tls-reqcert.",	&server_universe,  70, 1 },
+	{ "ldap-tls-ca-file", "t",		&server_universe,  71, 1 },
+	{ "ldap-tls-ca-dir", "t",		&server_universe,  72, 1 },
+	{ "ldap-tls-cert", "t",			&server_universe,  73, 1 },
+	{ "ldap-tls-key", "t",			&server_universe,  74, 1 },
+	{ "ldap-tls-crlcheck", "Nldap-tls-crlcheck.",	&server_universe,  75, 1 },
+	{ "ldap-tls-ciphers", "t",		&server_universe,  76, 1 },
+	{ "ldap-tls-randfile", "t",		&server_universe,  77, 1 },
+#else
+	{ "unknown-69", "X",			&server_universe,  69, 1 },
+	{ "unknown-70", "X",			&server_universe,  70, 1 },
+	{ "unknown-71", "X",			&server_universe,  71, 1 },
+	{ "unknown-72", "X",			&server_universe,  72, 1 },
+	{ "unknown-73", "X",			&server_universe,  73, 1 },
+	{ "unknown-74", "X",			&server_universe,  74, 1 },
+	{ "unknown-75", "X",			&server_universe,  75, 1 },
+	{ "unknown-76", "X",			&server_universe,  76, 1 },
+	{ "unknown-77", "X",			&server_universe,  77, 1 },
+#endif
+#else
+	{ "unknown-60", "X",			&server_universe,  60, 1 },
+	{ "unknown-61", "X",			&server_universe,  61, 1 },
+	{ "unknown-62", "X",			&server_universe,  62, 1 },
+	{ "unknown-63", "X",			&server_universe,  63, 1 },
+	{ "unknown-64", "X",			&server_universe,  64, 1 },
+	{ "unknown-65", "X",			&server_universe,  65, 1 },
+	{ "unknown-66", "X",			&server_universe,  66, 1 },
+	{ "unknown-67", "X",			&server_universe,  67, 1 },
+	{ "unknown-68", "X",			&server_universe,  68, 1 },
+#endif
 	{ NULL, NULL, NULL, 0, 0 }
 };
 
+#if defined(LDAP_CONFIGURATION)
+struct enumeration_value ldap_values [] = {
+	{ "static", LDAP_METHOD_STATIC },
+	{ "dynamic", LDAP_METHOD_DYNAMIC },
+	{ (char *) 0, 0 }
+};
+
+struct enumeration ldap_methods = {
+	(struct enumeration *)0,
+	"ldap-methods", 1,
+	ldap_values
+};
+
+#if defined(USE_SSL)
+struct enumeration_value ldap_ssl_usage_values [] = {
+	{ "off", LDAP_SSL_OFF },
+	{ "on",LDAP_SSL_ON },
+	{ "ldaps", LDAP_SSL_LDAPS },
+	{ "start_tls", LDAP_SSL_TLS },
+	{ (char *) 0, 0 }
+};
+
+struct enumeration ldap_ssl_usage_enum = {
+	(struct enumeration *)0,
+	"ldap-ssl-usage", 1,
+	ldap_ssl_usage_values
+};
+
+struct enumeration_value ldap_tls_reqcert_values [] = {
+	{ "never", LDAP_OPT_X_TLS_NEVER },
+	{ "hard", LDAP_OPT_X_TLS_HARD  },
+	{ "demand", LDAP_OPT_X_TLS_DEMAND},
+	{ "allow", LDAP_OPT_X_TLS_ALLOW },
+	{ "try", LDAP_OPT_X_TLS_TRY   },
+	{ (char *) 0, 0 }
+};
+struct enumeration ldap_tls_reqcert_enum = {
+	(struct enumeration *)0,
+	"ldap-tls-reqcert", 1,
+	ldap_tls_reqcert_values
+};
+
+struct enumeration_value ldap_tls_crlcheck_values [] = {
+	{ "none", LDAP_OPT_X_TLS_CRL_NONE},
+	{ "peer", LDAP_OPT_X_TLS_CRL_PEER},
+	{ "all",  LDAP_OPT_X_TLS_CRL_ALL },
+	{ (char *) 0, 0 }
+};
+struct enumeration ldap_tls_crlcheck_enum = {
+	(struct enumeration *)0,
+	"ldap-tls-crlcheck", 1,
+	ldap_tls_crlcheck_values
+};
+#endif
+#endif
+
 struct enumeration_value ddns_styles_values [] = {
 	{ "none", 0 },
 	{ "ad-hoc", 1 },

dhcp-4.1.0-manpages.patch:

--- NEW FILE dhcp-4.1.0-manpages.patch ---
diff -up dhcp-4.1.0/client/dhclient.8.man dhcp-4.1.0/client/dhclient.8
--- dhcp-4.1.0/client/dhclient.8.man	2008-11-20 04:55:14.000000000 -1000
+++ dhcp-4.1.0/client/dhclient.8	2009-01-06 11:51:30.000000000 -1000
@@ -111,6 +111,33 @@ relay
 .B -w
 ]
 [
+.B -B
+]
+[
+.B -I
+.I dhcp-client-identifier
+]
+[
+.B -H
+.I host-name
+]
+[
+.B -F
+.I fqdn.fqdn
+]
+[
+.B -V
+.I vendor-class-identifier
+]
+[
+.B -R
+.I request-option-list
+]
+[
+.B -timeout
+.I timeout
+]
+[
 .B -v
 ]
 [
@@ -138,32 +165,6 @@ important details about the network to w
 the location of a default router, the location of a name server, and
 so on.
 .PP
-If given the -4 command line argument (default), dhclient will use the
-DHCPv4 protocol to obtain an IPv4 address and configuration parameters.
-.PP
-If given the -6 command line argument, dhclient will use the DHCPv6
-protocol to obtain whatever IPv6 addresses are available along with
-configuration parameters. But with
-.B -S
-it uses Information-request to get only (i.e., without address)
-stateless configuration parameters.
-.PP
-The default DHCPv6 behavior is modified too with
-.B -T
-which asks for IPv6 temporary addresses, one set per
-.B -T
-flag.
-.B -P
-enables the IPv6 prefix delegation.
-As temporary addresses or prefix delegation disables the normal
-address query,
-.B -N
-restores it. Note it is not recommended to mix queries of different types
-together, or even to share the lease file between them.
-.PP
-If given the --version command line argument, dhclient will print its
-version number and exit.
-.PP
 On startup, dhclient reads the
 .IR dhclient.conf
 for configuration instructions.   It then gets a list of all the
@@ -217,141 +218,259 @@ file.   If interfaces are specified in t
 only configure interfaces that are either specified in the
 configuration file or on the command line, and will ignore all other
 interfaces.
-.PP
-If the DHCP client should listen and transmit on a port other than the
-standard (port 68), the
-.B -p
-flag may used.  It should be followed by the udp port number that
-dhclient should use.  This is mostly useful for debugging purposes.
-If a different port is specified for the client to listen on and
-transmit on, the client will also use a different destination port -
-one less than the specified port.
-.PP
-The DHCP client normally transmits any protocol messages it sends
-before acquiring an IP address to, 255.255.255.255, the IP limited
-broadcast address.   For debugging purposes, it may be useful to have
-the server transmit these messages to some other address.   This can
-be specified with the 
-.B -s
-flag, followed by the IP address or domain name of the destination.
-This feature is not supported by DHCPv6.
-.PP
-For testing purposes, the giaddr field of all packets that the client
-sends can be set using the
-.B -g
-flag, followed by the IP address to send.   This is only useful for testing,
-and should not be expected to work in any consistent or useful way.
-.PP
-The DHCP client will normally run in the foreground until it has
-configured an interface, and then will revert to running in the
-background.   To run force dhclient to always run as a foreground
-process, the
-.B -d
-flag should be specified.  This is useful when running the client
-under a debugger, or when running it out of inittab on System V
-systems.
-.PP
-The dhclient daemon creates its own environment when executing the
-dhclient-script to do the grunt work of interface configuration.
-To define extra environment variables and their values, use the
-.B -e
-flag, followed by the environment variable name and value assignment,
-just as one would assign a variable in a shell.  Eg:
-.B -e
-.I IF_METRIC=1
-.PP
-The client normally prints no output during its startup sequence.  It
-can be made to emit verbose messages displaying the startup sequence events
-until it has acquired an address by supplying the
-.B -v
-command line argument.  In either case, the client logs messages using
-the
-.B syslog (3)
-facility.  A
-.B -q
-command line argument is provided for backwards compatibility, but since
-dhclient is quiet by default, it has no effect.
-.PP
-The client normally doesn't release the current lease as it is not
-required by the DHCP protocol.  Some cable ISPs require their clients
-to notify the server if they wish to release an assigned IP address.
-The
-.B -r
-flag explicitly releases the current lease, and once the lease has been
-released, the client exits.
-.PP
+.SH OPTIONS
+.TP
+.BI \-4
+Use the DHCPv4 protocol to obtain an IPv4 address and configuration
+parameters (default).
+
+.TP
+.BI \-6
+Use the DHCPv6 protocol to obtain whatever IPv6 addresses are available
+along with configuration parameters.  The functionality of DHCPv6 mode
+may be modified with the
+.BI \-S
+,
+.BI \-T
+, and
+.BI \-N
+options.
+
+.TP
+.BI \-S
+Perform an information-only request over DHCPv6 to get stateless
+configuration parameters.  It is not recommended to combine this option
+with the
+.BI \-N
+,
+.BI \-P
+, or
+.BI \-T
+options or to share lease files between different modes of operation.  Only
+valid with the
+.BI \-6
+option.
+
+.TP
+.BI \-N
+Perform a normal (IA_NA) address query over DHCPv6.  It is not recommended
+to combine this option with the
+.BI \-P
+,
+.BI \-S
+, or
+.BI \-T
+options or to share lease files between different modes of operation.  Only
+valid with the
+.BI \-6
+option.
+
+.TP
+.BI \-T
+Perform a temporary (IA_TA) address query over DHCPv6 (disables normal address
+query).  It is not recommended to combine this option with the
+.BI \-N
+,
+.BI \-P
+, or
+.BI \-S
+options or to share lease files between different modes of operation.  Only
+valid with the
+.BI \-6
+option.
+
+.TP
+.BI \-P
+Enable IPv6 prefix delegation (disables normal address query).  It is not
+not recommended to combine this option with the
+.BI \-N
+,
+.BI \-S
+, or
+.BI \-T
+options or to share lease files between different modes of operation.  Only
+valid with the
+.BI \-6
+option.
+
+.TP
+.BI \-p\ <port\ number>
+The UDP port number the DHCP client should listen and transmit on.  If
+unspecified,
+.B dhclient
+uses the default port 68.  This option is mostly useful for debugging
+purposes.  If a different port is specified for the client to listen and
+transmit on, the client will also use a different destination port - one
+less than the specified port.
+
+.TP
+.BI \-d
+Force
+.B dhclient
+to run as a foreground process.  This is useful when running the client
+under a debugger, or when running it out of inittab on System V systems.
+
+.TP
+.BI \-e\ VAR=value
+Define additional environment variables for the environment where
+dhclient-script executes.  You may specify multiplate
+.B \-e
+options on the command line.  For example:
+.B \-e IF_METRIC=1
+
+.TP
+.BI \-q
+Suppress all terminal and log output except error messages.
+
+.TP
+.BI \-1
+Try once to get a lease.  One failure, exit with code 2.
+
+.TP
+.BI \-r
+Tell
+.B dhclient
+to release the current lease it has from the server.  This is not required
+by the DHCP protocol, but some ISPs require their clients to notify the
+server if they wish to release an assigned IP address.
+
+.TP
+.BI \-lf\ <lease-file>
+Path to the lease database file.  If unspecified, the default
+.B DBDIR/dhclient.leases
+is used.
+
+.TP
+.BI \-pf\ <pid-file>
+Path to the process ID file.  If unspecified, the default
+.B RUNDIR/dhclient.pid
+is used.
+
+.TP
+.BI \-cf\ <config-file>
+Path to the client configuration file.  If unspecified, the default
+.B ETCDIR/dhclient.conf
+is used.
+
+.TP
+.BI \-sf\ <script-file>
+Path to the network configuration script invoked by
+.B dhclient
+when it gets a lease.  If unspecified, the default
+.B /sbin/dhclient-script
+is used.
+
+.TP
+.BI \-s\ <server>
+Specifiy the server IP address or fully qualified domain name to transmit
+DHCP protocol messages to.  Normally,
+.B dhclient
+transmits these messages to 255.255.255.255 (the IP limited broadcast
+address).  Overriding this is mostly useful for debugging purposes.
+
+.TP
+.BI \-g\ <relay>
+Only for debugging.  Set the giaddr field of all packets the client
+sends to the IP address specified.  This should not be expected to work
+in any consistent or useful way.
+
+.TP
+.BI \-n
+Do not configure any interfaces.  Most useful combined with the
+.B -w
+option.
+
+.TP
+.BI \-nw
+Become a daemon process immediately (nowait) rather than waiting until an IP
+address has been acquired.
+
+.TP
+.BI \-w
+Keep running even if no network interfaces are found.  The
+.B omshell
+program can be used to notify the client when a network interface has been
+added or removed so it can attempt to configure an IP address on that
+interface.
+
+.TP
+.BI \-B
+Set the BOOTP broadcast flag in request packets so servers will always
+broadcast replies.
+
+.TP
+.BI \-I\ <dhcp-client-identifier>
+Specify the dhcp-client-identifier option to send to the DHCP server.
+
+.TP
+.BI \-H\ <host-name>
+Specify the host-name option to send to the DHCP server.  The host-name
+string only contains the client's hostname prefix, to which the server will
+append the ddns-domainname or domain-name options, if any, to derive the
+fully qualified domain name of the client.  The
+.B -H
+option cannot be used with the
+.B -F
+option.
+
+.TP
+.BI \-F\ <fqdn.fqdn>
+Specify the fqdn.fqdn option to send to the DHCP server.  This option cannot
+be used with the
+.B -H
+option.  The fqdn.fqdn option must specify the complete domain name of the
+client host, which the server may use for dynamic DNS updates.
+
+.TP
+.BI \-V\ <vendor-class-identifier>
+Specify the vendor-class-identifier option to send to the DHCP server.
+
+.TP
+.BI \-R\ <option>[,<option>...]
+Specify the list of options the client is to request from the server.  The
+option list must be a single string consisting of option names separated
+by at least one command and optional space characters.  The default option
+list is:
+
+.BR
+    subnet-mask, broadcast-address, time-offset, routers,
+.BR
+    domain-name, domain-name-servers, host-name, nis-domain,
+.BR
+    nis-servers, ntp-servers
+
 The
-.B -x
-flag tells any currently running client to exit gracefully without
-releasing leases first.
+.B -R
+option does not append options to the default request, it overrides the
+default request list.  Keep this in mind if you want to request an
+additional option besides the default request list.  You will have to
+specify all option names for the
+.B -R
+parameter.
+
+.TP
+.BI \-timeout\ <timeout>
+Specify the time after which
+.B dhclient
+will decide that no DHCP servers can be contacted when no responses have been
+received.
+
+.TP
+.BI \-v
+Enable verbose log messages.
+
 .PP
-If the client is killed by a signal (for example at shutdown or reboot)
-it won't execute the
+If the client is killed by a signale (for example at shutdown or reboot), it
+will not execute the
 .B dhclient-script (8)
-at exit. However if you shut the client down gracefully with
-.B -r
+at exit.  However, if you shut the client down gracefully with
+.BI \-r
 or
-.B -x
+.BI \-x
 it will execute
 .B dhclient-script (8)
-at shutdown with the specific reason for calling the script set.
-.PP
-The
-.B -1
-flag will cause dhclient to try once to get a lease.  If it fails, dhclient
-exits with exit code two. In DHCPv6 the
-.B -1
-flag sets the max duration of the initial exchange to
-.I timeout
-(from
-.IR dhclient.conf ,
-default sixty seconds).
-.PP
-The DHCP client normally gets its configuration information from
-.B ETCDIR/dhclient.conf,
-its lease database from
-.B DBDIR/dhclient.leases,
-stores its process ID in a file called
-.B RUNDIR/dhclient.pid,
-and configures the network interface using
-.B CLIENTBINDIR/dhclient-script
-To specify different names and/or locations for these files, use the
-.B -cf,
-.B -lf,
-.B -pf
-and
-.B -sf
-flags, respectively, followed by the name of the file.   This can be
-particularly useful if, for example,
-.B DBDIR
-or
-.B RUNDIR
-has not yet been mounted when the DHCP client is started.
-.PP
-The DHCP client normally exits if it isn't able to identify any
-network interfaces to configure.   On laptop computers and other
-computers with hot-swappable I/O buses, it is possible that a
-broadcast interface may be added after system startup.   The
-.B -w
-flag can be used to cause the client not to exit when it doesn't find
-any such interfaces.   The
-.B omshell (1)
-program can then be used to notify the client when a network interface
-has been added or removed, so that the client can attempt to configure an IP
-address on that interface.
-.PP
-The DHCP client can be directed not to attempt to configure any interfaces
-using the
-.B -n
-flag.   This is most likely to be useful in combination with the
-.B -w
-flag.
-.PP
-The client can also be instructed to become a daemon immediately, rather
-than waiting until it has acquired an IP address.   This can be done by
-supplying the
-.B -nw
-flag.
+at shutdown with the specific reason for calling the script set in the
+environment table.
 .SH CONFIGURATION
 The syntax of the dhclient.conf(5) file is discussed separately.
 .SH OMAPI
@@ -386,7 +505,7 @@ do a DHCPRELEASE.   To pause it, set its
 resume it, set its state attribute to 4.
 .PP
 .SH FILES
-.B CLIENTBINDIR/dhclient-script,
+.B /sbin/dhclient-script,
 .B ETCDIR/dhclient.conf, DBDIR/dhclient.leases, RUNDIR/dhclient.pid,
 .B DBDIR/dhclient.leases~.
 .SH SEE ALSO
diff -up dhcp-4.1.0/client/dhclient.conf.5.man dhcp-4.1.0/client/dhclient.conf.5
--- dhcp-4.1.0/client/dhclient.conf.5.man	2008-03-07 08:58:29.000000000 -1000
+++ dhcp-4.1.0/client/dhclient.conf.5	2009-01-06 10:50:40.000000000 -1000
@@ -186,9 +186,9 @@ responding to the client send the client
 options.   Only the option names should be specified in the request
 statement - not option parameters.   By default, the DHCP server
 requests the subnet-mask, broadcast-address, time-offset, routers,
-domain-name, domain-name-servers and host-name options.  Note that if
-you enter a 'request' statement, you over-ride this default and these
-options will not be requested.
+domain-name, domain-name-servers host-name, nis-domain, nis-servers,
+and ntp-servers options.  Note that if you enter a 'request' statement,
+you over-ride this default and these options will not be requested.
 .PP
 In some cases, it may be desirable to send no parameter request list
 at all.   To do this, simply write the request statement but specify
@@ -627,6 +627,18 @@ database and will record the media type 
 Whenever the client tries to renew the lease, it will use that same
 media type.   The lease must expire before the client will go back to
 cycling through media types.
+.PP
+ \fBbootp-broadcast-always;\fR
+.PP
+The
+.B bootp-broadcast-always
+statement instructs dhclient to always set the bootp broadcast flag in
+request packets, so that servers will always broadcast replies.
+This is equivalent to supplying the dhclient -B argument, and has
+the same effect as specifying 'always-broadcast' in the server's dhcpd.conf.
+This option is provided as an extension to enable dhclient to work
+on IBM s390 Linux guests.
+.PP
 .SH SAMPLE
 The following configuration file is used on a laptop running NetBSD
 1.3.   The laptop has an IP alias of 192.5.5.213, and has one
@@ -648,12 +660,12 @@ interface "ep0" {
     send host-name "andare.fugue.com";
     send dhcp-client-identifier 1:0:a0:24:ab:fb:9c;
     send dhcp-lease-time 3600;
-    supersede domain-name "fugue.com rc.vix.com home.vix.com";
+    supersede domain-search "fugue.com rc.vix.com home.vix.com";
     prepend domain-name-servers 127.0.0.1;
     request subnet-mask, broadcast-address, time-offset, routers,
-	    domain-name, domain-name-servers, host-name;
+	    domain-search, domain-name, domain-name-servers, host-name;
     require subnet-mask, domain-name-servers;
-    script "CLIENTBINDIR/dhclient-script";
+    script "/sbin/dhclient-script";
     media "media 10baseT/UTP", "media 10base2/BNC";
 }
 
diff -up dhcp-4.1.0/client/dhclient-script.8.man dhcp-4.1.0/client/dhclient-script.8
--- dhcp-4.1.0/client/dhclient-script.8.man	2006-02-24 13:16:27.000000000 -1000
+++ dhcp-4.1.0/client/dhclient-script.8	2009-01-06 10:50:40.000000000 -1000
@@ -47,16 +47,16 @@ customizations are needed, they should b
 exit hooks provided (see HOOKS for details).   These hooks will allow the
 user to override the default behaviour of the client in creating a
 .B /etc/resolv.conf
-file.
+file, and to handle DHCP options not handled by default.
 .PP
 No standard client script exists for some operating systems, even though
 the actual client may work, so a pioneering user may well need to create
 a new script or modify an existing one.  In general, customizations specific
 to a particular computer should be done in the
-.B ETCDIR/dhclient.conf
+.B /usr/local/etc/dhclient.conf
 file.   If you find that you can't make such a customization without
 customizing
-.B ETCDIR/dhclient.conf
+.B /usr/local/etc/dhclient.conf
 or using the enter and exit hooks, please submit a bug report.
 .SH HOOKS
 When it starts, the client script first defines a shell function,
@@ -68,33 +68,53 @@ the enter hook script.
 .PP
 On after defining the make_resolv_conf function, the client script checks
 for the presence of an executable
-.B ETCDIR/dhclient-enter-hooks
+.B /usr/local/etc/dhclient-enter-hooks
 script, and if present, it invokes the script inline, using the Bourne
 shell '.' command.   The entire environment documented under OPERATION
 is available to this script, which may modify the environment if needed
 to change the behaviour of the script.   If an error occurs during the
 execution of the script, it can set the exit_status variable to a nonzero
 value, and
-.B CLIENTBINDIR/dhclient-script
+.B /sbin/dhclient-script
 will exit with that error code immediately after the client script exits.
 .PP
 After all processing has completed,
-.B CLIENTBINDIR/dhclient-script
+.B /sbin/dhclient-script
 checks for the presence of an executable
-.B ETCDIR/dhclient-exit-hooks
+.B /usr/local/etc/dhclient-exit-hooks
 script, which if present is invoked using the '.' command.  The exit
 status of dhclient-script will be passed to dhclient-exit-hooks in the
 exit_status shell variable, and will always be zero if the script
 succeeded at the task for which it was invoked.   The rest of the
 environment as described previously for dhclient-enter-hooks is also
 present.   The
-.B ETCDIR/dhclient-exit-hooks
+.B /usr/local/etc/dhclient-exit-hooks
 script can modify the valid of exit_status to change the exit status
 of dhclient-script.
+.PP
+Immediately after dhclient brings an interface UP with a new IP address,
+subnet mask, and routes, in the REBOOT/BOUND states, it will check for the
+existence of an executable
+.B /usr/local/etc/dhclient-up-hooks
+script, and source it if found. This script can handle DHCP options in
+the environment that are not handled by default. A per-interface.
+.B /usr/local/etc/dhclient-${IF}-up-hooks
+script will override the generic script and be sourced when interface
+$IF has been brought up.
+.PP
+Immediately before dhclient brings an interface DOWN, removing its IP
+address, subnet mask, and routes, in the STOP/RELEASE  states, it will
+check for the existence of an executable
+.B /usr/local/etc/dhclient-down-hooks
+script, and source it if found. This script can handle DHCP options in
+the environment that are not handled by default. A per-interface
+.B /usr/local/etc/dhclient-${IF}-down-hooks
+script will override the generic script and be sourced when interface
+$IF is about to be brought down.
 .SH OPERATION
 When dhclient needs to invoke the client configuration script, it
 defines a set of variables in the environment, and then invokes
-.B CLIENTBINDIR/dhclient-script.
+.B /sbin/dhclient-script.
 In all cases, $reason is set to the name of the reason why the script
 has been invoked.   The following reasons are currently defined:
 MEDIUM, PREINIT, BOUND, RENEW, REBIND, REBOOT, EXPIRE, FAIL, STOP, RELEASE,
diff -up dhcp-4.1.0/common/dhcp-options.5.man dhcp-4.1.0/common/dhcp-options.5
--- dhcp-4.1.0/common/dhcp-options.5.man	2008-11-21 03:59:56.000000000 -1000
+++ dhcp-4.1.0/common/dhcp-options.5	2009-01-06 10:50:40.000000000 -1000
@@ -905,6 +905,21 @@ classless IP routing - it does not inclu
 classless IP routing is now the most widely deployed routing standard,
 this option is virtually useless, and is not implemented by any of the
 popular DHCP clients, for example the Microsoft DHCP client.
+.PP
+NOTE to Fedora dhclient users:
+.br
+dhclient-script interprets trailing 0 octets of the target as indicating
+the subnet class of the route, so for the following static-routes value:
+.br
+        option static-routes 172.0.0.0 172.16.2.254,
+.br
+                             192.168.0.0 192.168.2.254;
+.br
+dhclient-script will create routes:
+.br
+        172/8 via 172.16.2.254 dev $interface
+.br
+        192.168/16 via 192.168.2.254 dev $interface
 .RE
 .PP
 .nf
diff -up dhcp-4.1.0/server/dhcpd.conf.5.man dhcp-4.1.0/server/dhcpd.conf.5
--- dhcp-4.1.0/server/dhcpd.conf.5.man	2008-11-03 08:13:58.000000000 -1000
+++ dhcp-4.1.0/server/dhcpd.conf.5	2009-01-06 10:50:40.000000000 -1000
@@ -519,6 +519,9 @@ pool {
 };
 .fi
 .PP
+Dynamic BOOTP leases are not compatible with failover, and, as such,
+you need to disallow BOOTP in pools that you are using failover for.
+.PP
 The  server currently  does very  little  sanity checking,  so if  you
 configure it wrong, it will just  fail in odd ways.  I would recommend
 therefore that you either do  failover or don't do failover, but don't
@@ -533,9 +536,9 @@ primary server might look like this:
 failover peer "foo" {
   primary;
   address anthrax.rc.vix.com;
-  port 519;
+  port 647;
   peer address trantor.rc.vix.com;
-  peer port 520;
+  peer port 847;
   max-response-delay 60;
   max-unacked-updates 10;
   mclt 3600;
@@ -594,9 +597,7 @@ statement
 .B port \fIport-number\fR\fB;\fR
 .PP
 The \fBport\fR statement declares the TCP port on which the server
-should listen for connections from its failover peer.   This statement
-may not currently be omitted, because the failover protocol does not
-yet have a reserved TCP port number.
+should listen for connections from its failover peer.
 .RE
 .PP
 The 
@@ -608,10 +609,8 @@ statement
 .PP
 The \fBpeer port\fR statement declares the TCP port to which the
 server should connect to reach its failover peer for failover
-messages.   This statement may not be omitted because the failover
-protocol does not yet have a reserved TCP port number.   The port
-number declared in the \fBpeer port\fR statement may be the same as
-the port number declared in the \fBport\fR statement.
+messages.  The port number declared in the \fBpeer port\fR statement
+may be the same as the port number declared in the \fBport\fR statement.
 .RE
 .PP
 The
@@ -1278,7 +1277,7 @@ the zone containing PTR records - for IS
 .PP
 .nf
 key DHCP_UPDATER {
-  algorithm HMAC-MD5.SIG-ALG.REG.INT;
+  algorithm hmac-md5;
   secret pRP5FapFoJ95JEL06sv4PQ==;
 };
 
@@ -1301,7 +1300,7 @@ dhcpd.conf file:
 .PP
 .nf
 key DHCP_UPDATER {
-  algorithm HMAC-MD5.SIG-ALG.REG.INT;
+  algorithm hmac-md5;
   secret pRP5FapFoJ95JEL06sv4PQ==;
 };
 
@@ -2302,7 +2301,7 @@ statement
 .PP
 .I Name
 should be the name of the DHCP server's lease file.   By default, this
-is DBDIR/dhcpd.leases.   This statement \fBmust\fR appear in the outer
+is /private/var/db/dhcpd/dhcpd.leases.   This statement \fBmust\fR appear in the outer
 scope of the configuration file - if it appears in some other scope,
 it will have no effect.  Furthermore, it has no effect if overridden
 by the
@@ -2337,7 +2336,7 @@ statement
 .PP
 .I Name
 is the name of the lease file to use if and only if the server is running
-in DHCPv6 mode.  By default, this is DBDIR/dhcpd6.leases.  This statement,
+in DHCPv6 mode.  By default, this is /private/var/db/dhcpd/dhcpd6.leases.  This statement,
 like
 .I lease-file-name,
 \fBmust\fR appear in the outer scope of the configuration file.  It
@@ -2495,7 +2494,8 @@ statement
 The \fInext-server\fR statement is used to specify the host address of
 the server from which the initial boot file (specified in the
 \fIfilename\fR statement) is to be loaded.   \fIServer-name\fR should
-be a numeric IP address or a domain name.
+be a numeric IP address or a domain name.  If no \fInext-server\fR statement
+applies to a given client, the address 0.0.0.0 is used.
 .RE
 .PP
 The
@@ -2540,7 +2540,7 @@ statement
 .I Name
 should be the name of the DHCP server's process ID file.   This is the
 file in which the DHCP server's process ID is stored when the server
-starts.   By default, this is RUNDIR/dhcpd.pid.   Like the
+starts.   By default, this is /private/var/run/dhcpd.pid.   Like the
 .I lease-file-name
 statement, this statement must appear in the outer scope
 of the configuration file.  It has no effect if overridden by the
@@ -2558,7 +2558,7 @@ statement
 .PP
 .I Name
 is the name of the pid file to use if and only if the server is running
-in DHCPv6 mode.  By default, this is DBDIR/dhcpd6.pid.  This statement,
+in DHCPv6 mode.  By default, this is /private/var/db/dhcpd/dhcpd6.pid.  This statement,
 like
 .I pid-file-name,
 \fBmust\fR appear in the outer scope of the configuration file.  It

dhcp-4.1.0-memory.patch:

--- NEW FILE dhcp-4.1.0-memory.patch ---
diff -up dhcp-4.1.0/common/lpf.c.memory dhcp-4.1.0/common/lpf.c
--- dhcp-4.1.0/common/lpf.c.memory	2008-03-18 08:28:14.000000000 -1000
+++ dhcp-4.1.0/common/lpf.c	2009-01-06 07:57:54.000000000 -1000
@@ -247,6 +247,7 @@ static void lpf_tr_filter_setup (info)
 	struct interface_info *info;
 {
 	struct sock_fprog p;
+	memset(&p,'\0', sizeof(struct sock_fprog));
 
 	/* Set up the bpf filter program structure.    This is defined in
 	   bpf.c */
diff -up dhcp-4.1.0/common/packet.c.memory dhcp-4.1.0/common/packet.c
--- dhcp-4.1.0/common/packet.c.memory	2007-11-30 11:51:43.000000000 -1000
+++ dhcp-4.1.0/common/packet.c	2009-01-06 07:57:54.000000000 -1000
@@ -135,6 +135,7 @@ void assemble_udp_ip_header (interface, 
 	struct ip ip;
 	struct udphdr udp;
 
+	memset( &ip, '\0', sizeof ip);
 	/* Fill out the IP header */
 	IP_V_SET (&ip, 4);
 	IP_HL_SET (&ip, 20);
diff -up dhcp-4.1.0/minires/ns_name.c.memory dhcp-4.1.0/minires/ns_name.c
--- dhcp-4.1.0/minires/ns_name.c.memory	2005-03-17 10:15:17.000000000 -1000
+++ dhcp-4.1.0/minires/ns_name.c	2009-01-06 07:57:54.000000000 -1000
@@ -71,6 +71,11 @@ ns_name_ntop(const u_char *src, char *ds
 	dn = dst;
 	eom = dst + dstsiz;
 
+	if (dn >= eom) {
+		errno = EMSGSIZE;
+		return (-1);
+	}
+
 	while ((n = *cp++) != 0) {
 		if ((n & NS_CMPRSFLGS) != 0) {
 			/* Some kind of compression pointer. */

dhcp-4.1.0-options.patch:

--- NEW FILE dhcp-4.1.0-options.patch ---
diff -up dhcp-4.1.0/client/clparse.c.options dhcp-4.1.0/client/clparse.c
--- dhcp-4.1.0/client/clparse.c.options	2008-05-23 03:22:23.000000000 -1000
+++ dhcp-4.1.0/client/clparse.c	2009-01-06 07:59:14.000000000 -1000
@@ -136,6 +136,7 @@ isc_result_t read_client_conf ()
 	/* Requested lease time, used by DHCPv6 (DHCPv4 uses the option cache)
 	 */
 	top_level_config.requested_lease = 7200;
+	top_level_config.bootp_broadcast_always = 0;
 
 	group_allocate (&top_level_config.on_receipt, MDL);
 	if (!top_level_config.on_receipt)
@@ -303,7 +304,8 @@ void read_client_leases ()
 	interface-declaration |
 	LEASE client-lease-statement |
 	ALIAS client-lease-statement |
-	KEY key-definition */
+	KEY key-definition |
+	BOOTP_BROADCAST_ALWAYS */
 
 void parse_client_statement (cfile, ip, config)
 	struct parse *cfile;
@@ -693,6 +695,12 @@ void parse_client_statement (cfile, ip, 
 		parse_reject_statement (cfile, config);
 		return;
 
+	      case BOOTP_BROADCAST_ALWAYS:
+		token = next_token(&val, (unsigned*)0, cfile);
+		config -> bootp_broadcast_always = 1;
+		parse_semi (cfile);
+		return;
+
 	      default:
 		lose = 0;
 		stmt = (struct executable_statement *)0;
diff -up dhcp-4.1.0/client/dhclient.c.options dhcp-4.1.0/client/dhclient.c
--- dhcp-4.1.0/client/dhclient.c.options	2008-06-11 10:17:10.000000000 -1000
+++ dhcp-4.1.0/client/dhclient.c	2009-01-06 08:27:57.000000000 -1000
@@ -38,6 +38,12 @@
 #include <sys/wait.h>
 #include <limits.h>
 
+/*
+ * Defined in stdio.h when _GNU_SOURCE is set, but we don't want to define
+ * that when building ISC code.
+ */
+extern int asprintf(char **strp, const char *fmt, ...);
+
 TIME default_lease_time = 43200; /* 12 hours... */
 TIME max_lease_time = 86400; /* 24 hours... */
 
@@ -80,6 +86,9 @@ int wanted_ia_na = -1;		/* the absolute 
 int wanted_ia_ta = 0;
 int wanted_ia_pd = 0;
 char *mockup_relay = NULL;
+int bootp_broadcast_always = 0;
+
+extern u_int32_t default_requested_options[];
 
 void run_stateless(int exit_mode);
 
@@ -110,6 +119,15 @@ main(int argc, char **argv) {
 	int local_family_set = 0;
 #endif /* DHCPv6 */
 	char *s;
+	char *dhcp_client_identifier_arg = NULL;
+	char *dhcp_host_name_arg = NULL;
+	char *dhcp_fqdn_arg = NULL;
+	char *dhcp_vendor_class_identifier_arg = NULL;
+	char *dhclient_request_options = NULL;
+
+	int timeout_arg = 0;
+	char *arg_conf = NULL;
+	int arg_conf_len = 0;
 
 	/* Initialize client globals. */
 	memset(&default_duid, 0, sizeof(default_duid));
@@ -274,6 +292,88 @@ main(int argc, char **argv) {
 		} else if (!strcmp(argv[i], "--version")) {
 			log_info("isc-dhclient-%s", PACKAGE_VERSION);
 			exit(0);
+		} else if (!strcmp(argv[i], "-I")) {
+			if ((++i == argc) || (argv[i] == NULL) || (*(argv[i])=='\0')) {
+				usage();
+				exit(1);
+			}
+
+			if (strlen(argv[i]) >= DHCP_MAX_OPTION_LEN) {
+				log_error("-I option dhcp-client-identifier string \"%s\" is too long - maximum length is: %d", argv[i], DHCP_MAX_OPTION_LEN-1);
+				exit(1);
+			}
+
+			dhcp_client_identifier_arg = argv[i];
+		} else if (!strcmp(argv[i], "-B")) {
+			bootp_broadcast_always = 1;
+		} else if (!strcmp(argv[i], "-H")) {
+			if ((++i == argc) || (argv[i] == NULL) || (*(argv[i])=='\0')) {
+				usage();
+				exit(1);
+			}
+
+			if (strlen(argv[i]) >= DHCP_MAX_OPTION_LEN) {
+				log_error("-H option host-name string \"%s\" is too long - maximum length is: %d", argv[i], DHCP_MAX_OPTION_LEN-1);
+				exit(1);
+			}
+
+			if (dhcp_host_name_arg != NULL) {
+				log_error("The -H <host-name> and -F <fqdn> arguments are mutually exclusive");
+				exit(1);
+			}
+
+			dhcp_host_name_arg = argv[i];
+		} else if (!strcmp(argv[i], "-F")) {
+			if ((++i == argc) || (argv[i] == NULL) || (*(argv[i])=='\0')) {
+				usage();
+				exit(1);
+			}
+
+			if (strlen(argv[i]) >= DHCP_MAX_OPTION_LEN) {
+				log_error("-F option fqdn.fqdn string \"%s\" is too long - maximum length is: %d", argv[i], DHCP_MAX_OPTION_LEN-1);
+				exit(1);
+			}
+
+			if (dhcp_fqdn_arg != NULL) {
+				log_error("Only one -F <fqdn> argument can be specified");
+				exit(1);
+			}
+
+			if (dhcp_host_name_arg != NULL) {
+				log_error("The -F <fqdn> and -H <host-name> arguments are mutually exclusive");
+				exit(1);
+			}
+
+			dhcp_fqdn_arg = argv[i];
+		} else if (!strcmp(argv[i], "-timeout")) {
+			if ((++i == argc) || (argv[i] == NULL) || (*(argv[i])=='\0')) {
+				usage();
+				exit(1);
+			}
+
+			if ((timeout_arg = atoi(argv[i])) <= 0) {
+				log_error("-T timeout option must be > 0 - bad value: %s",argv[i]);
+				exit(1);
+			}
+		} else if (!strcmp(argv[i], "-V")) {
+			if ((++i == argc) || (argv[i] == NULL) || (*(argv[i])=='\0')) {
+				usage();
+				exit(1);
+			}
+
+			if (strlen(argv[i]) >= DHCP_MAX_OPTION_LEN) {
+				log_error("-V option vendor-class-identifier string \"%s\" is too long - maximum length is: %d", argv[i], DHCP_MAX_OPTION_LEN-1);
+				exit(1);
+			}
+
+			dhcp_vendor_class_identifier_arg = argv[i];
+		} else if (!strcmp(argv[i], "-R")) {
+			if ((++i == argc) || (argv[i] == NULL) || (*(argv[i])=='\0')) {
+				usage();
+				exit(1);
+			}
+
+			dhclient_request_options = argv[i];
 		} else if (argv[i][0] == '-') {
 		    usage();
 		} else if (interfaces_requested < 0) {
@@ -443,6 +543,166 @@ main(int argc, char **argv) {
 	/* Parse the dhclient.conf file. */
 	read_client_conf();
 
+	/* Parse any extra command line configuration arguments: */
+	if ((dhcp_client_identifier_arg != NULL) && (*dhcp_client_identifier_arg != '\0')) {
+		arg_conf_len = asprintf(&arg_conf, "send dhcp-client-identifier \"%s\";", dhcp_client_identifier_arg);
+
+		if ((arg_conf == 0) || (arg_conf_len <= 0))
+			log_fatal("Unable to send -I option dhcp-client-identifier");
+	}
+
+	if ((dhcp_host_name_arg != NULL) && (*dhcp_host_name_arg != '\0')) {
+		if (arg_conf == 0) {
+			arg_conf_len = asprintf(&arg_conf, "send host-name \"%s\";", dhcp_host_name_arg);
+
+			if ((arg_conf == 0) || (arg_conf_len <= 0))
+				log_fatal("Unable to send -H option host-name");
+		} else {
+			char *last_arg_conf = arg_conf;
+			arg_conf = NULL;
+			arg_conf_len = asprintf(&arg_conf, "%s\nsend host-name \"%s\";", last_arg_conf, dhcp_host_name_arg);
+
+			if ((arg_conf == 0) || (arg_conf_len <= 0))
+				log_fatal("Unable to send -H option host-name");
+
+			free(last_arg_conf);
+		}
+	}
+
+	if ((dhcp_fqdn_arg != NULL) && (*dhcp_fqdn_arg != '\0')) {
+		if (arg_conf == 0) {
+			arg_conf_len = asprintf(&arg_conf,  "send fqdn.fqdn \"%s\";", dhcp_fqdn_arg);
+
+			if ((arg_conf == 0) || (arg_conf_len <= 0))
+				log_fatal("Unable to send -F option fqdn.fqdn");
+		} else {
+			char *last_arg_conf = arg_conf;
+			arg_conf = NULL;
+			arg_conf_len = asprintf(&arg_conf, "%s\nsend fqdn.fqdn \"%s\";", last_arg_conf, dhcp_fqdn_arg);
+
+			if ((arg_conf == 0)  || (arg_conf_len <= 0))
+				log_fatal("Unable to send -F option fqdn.fqdn");
+
+			free(last_arg_conf);
+		}
+	}
+
+	if (timeout_arg) {
+		if (arg_conf == 0) {
+			arg_conf_len = asprintf(&arg_conf,  "timeout %d;", timeout_arg);
+
+			if ((arg_conf == 0) || (arg_conf_len <= 0))
+				log_fatal("Unable to process -timeout timeout argument");
+		} else {
+			char *last_arg_conf = arg_conf;
+			arg_conf = NULL;
+			arg_conf_len = asprintf(&arg_conf, "%s\ntimeout %d;", last_arg_conf, timeout_arg);
+
+			if ((arg_conf == 0) || (arg_conf_len == 0))
+				log_fatal("Unable to process -timeout timeout argument");
+
+			free(last_arg_conf);
+		}
+	}
+
+	if ((dhcp_vendor_class_identifier_arg != NULL) && (*dhcp_vendor_class_identifier_arg != '\0')) {
+		if (arg_conf == 0) {
+			arg_conf_len = asprintf(&arg_conf,  "send vendor-class-identifier \"%s\";", dhcp_vendor_class_identifier_arg);
+
+			if ((arg_conf == 0) || (arg_conf_len <= 0))
+				log_fatal("Unable to send -V option vendor-class-identifier");
+		} else {
+			char *last_arg_conf = arg_conf;
+			arg_conf = NULL;
+			arg_conf_len = asprintf(&arg_conf, "%s\nsend vendor-class-identifier \"%s\";", last_arg_conf, dhcp_vendor_class_identifier_arg);
+
+			if ((arg_conf == 0) || (arg_conf_len <= 0))
+				log_fatal("Unable to send -V option vendor-class-identifier");
+
+			free(last_arg_conf);
+		}
+	}
+
+	if (dhclient_request_options != NULL) {
+		if (arg_conf == 0) {
+			arg_conf_len = asprintf(&arg_conf,  "request %s;", dhclient_request_options);
+
+			if ((arg_conf == 0) || (arg_conf_len <= 0))
+				log_fatal("Unable to parse -R <request options list> argument");
+		} else {
+			char *last_arg_conf = arg_conf;
+			arg_conf = NULL;
+			arg_conf_len = asprintf(&arg_conf, "%s\nrequest %s;", last_arg_conf, dhclient_request_options);
+
+			if ((arg_conf == 0)  || (arg_conf_len <= 0))
+				log_fatal("Unable to parse -R <request options list> argument");
+
+			free(last_arg_conf);
+		}
+	}
+
+	if (arg_conf) {
+		if (arg_conf_len == 0)
+			if ((arg_conf_len = strlen(arg_conf)) == 0)
+				/* huh ? cannot happen ! */
+				log_fatal("Unable to process -I/-H/-F/-timeout/-V/-R configuration arguments");
+
+		/* parse the extra dhclient.conf configuration arguments
+		 * into top level config: */
+		struct parse *cfile = (struct parse *)0;
+		const char *val = NULL;
+		int token;
+
+		status = new_parse(&cfile, -1, arg_conf, arg_conf_len, "extra dhclient -I/-H/-F/-timeout/-V/-R configuration arguments", 0);
+
+		if ((status != ISC_R_SUCCESS) || (cfile -> warnings_occurred))
+			log_fatal("Cannot parse -I/-H/-F/-timeout/-V/-R configuration arguments !");
+		/* more detailed parse failures will be logged */
+
+		do {
+			token = peek_token(&val, (unsigned *)0, cfile);
+			if (token == END_OF_FILE)
+				break;
+
+			parse_client_statement(cfile, (struct interface_info *)0, &top_level_config);
+		} while (1);
+
+		if (cfile -> warnings_occurred)
+			log_fatal("Cannot parse -I/-H/-F/-timeout/-V/-R configuration arguments !");
+		end_parse(&cfile);
+
+		if (timeout_arg) {
+			/* we just set the toplevel timeout, but per-client
+			 * timeouts may still be at defaults. Also, it makes no
+			 * sense having the reboot_timeout or backoff_cutoff
+			 * greater than the timeout:
+			 */
+			if ((top_level_config.backoff_cutoff == 15) && (top_level_config.backoff_cutoff > (timeout_arg / 2)))
+				top_level_config.backoff_cutoff = (((unsigned long)(timeout_arg / 2)) == 0) ? timeout_arg : (unsigned long)(timeout_arg / 2);
+
+			for (ip=interfaces; ip; ip = ip->next) {
+				if (ip->client->config->timeout == 60)
+					ip->client->config->timeout = timeout_arg;
+
+				if ((ip->client->config->reboot_timeout == 10) && (ip->client->config->reboot_timeout > ip->client->config->timeout))
+					ip->client->config->reboot_timeout = ip->client->config->timeout;
+				if ((ip->client->config->backoff_cutoff == 15) && (ip->client->config->backoff_cutoff > top_level_config.backoff_cutoff))
+					ip->client->config->backoff_cutoff = top_level_config.backoff_cutoff;
+			}
+		}
+
+		if ((dhclient_request_options != 0) && (top_level_config.requested_options != default_requested_options)) {
+			for (ip=interfaces; ip; ip = ip->next) {
+				if (ip->client->config->requested_options == default_requested_options)
+					ip->client->config->requested_options = top_level_config.requested_options;
+			}
+		}
+
+		free(arg_conf);
+		arg_conf = NULL;
+		arg_conf_len = 0;
+	}
+
 	/* Parse the lease database. */
 	read_client_leases();
 
@@ -2313,7 +2573,8 @@ void make_discover (client, lease)
 	client -> packet.xid = random ();
 	client -> packet.secs = 0; /* filled in by send_discover. */
 
-	if (can_receive_unicast_unconfigured (client -> interface))
+	if ((!(bootp_broadcast_always || client->config->bootp_broadcast_always))
+	    && can_receive_unicast_unconfigured(client->interface))
 		client -> packet.flags = 0;
 	else
 		client -> packet.flags = htons (BOOTP_BROADCAST);
@@ -2397,7 +2658,9 @@ void make_request (client, lease)
 	} else {
 		memset (&client -> packet.ciaddr, 0,
 			sizeof client -> packet.ciaddr);
-		if (can_receive_unicast_unconfigured (client -> interface))
+		if ((!(bootp_broadcast_always ||
+		    client ->config->bootp_broadcast_always)) &&
+		    can_receive_unicast_unconfigured (client -> interface))
 			client -> packet.flags = 0;
 		else
 			client -> packet.flags = htons (BOOTP_BROADCAST);
@@ -2459,7 +2722,8 @@ void make_decline (client, lease)
 	client -> packet.hops = 0;
 	client -> packet.xid = client -> xid;
 	client -> packet.secs = 0; /* Filled in by send_request. */
-	if (can_receive_unicast_unconfigured (client -> interface))
+	if ((!(bootp_broadcast_always || client->config-> bootp_broadcast_always))
+	    && can_receive_unicast_unconfigured (client->interface))
 		client -> packet.flags = 0;
 	else
 		client -> packet.flags = htons (BOOTP_BROADCAST);
diff -up dhcp-4.1.0/common/conflex.c.options dhcp-4.1.0/common/conflex.c
--- dhcp-4.1.0/common/conflex.c.options	2009-01-06 07:59:13.000000000 -1000
+++ dhcp-4.1.0/common/conflex.c	2009-01-06 07:59:14.000000000 -1000
@@ -783,6 +783,8 @@ intern(char *atom, enum dhcp_token dfv) 
 			return BALANCE;
 		if (!strcasecmp (atom + 1, "ound"))
 			return BOUND;
+		if (!strcasecmp (atom + 1, "ootp-broadcast-always"))
+			return BOOTP_BROADCAST_ALWAYS;
 		break;
 	      case 'c':
 		if (!strcasecmp (atom + 1, "ase"))
diff -up dhcp-4.1.0/includes/dhcpd.h.options dhcp-4.1.0/includes/dhcpd.h
--- dhcp-4.1.0/includes/dhcpd.h.options	2009-01-06 07:59:13.000000000 -1000
+++ dhcp-4.1.0/includes/dhcpd.h	2009-01-06 07:59:14.000000000 -1000
@@ -1079,6 +1079,9 @@ struct client_config {
 	int do_forward_update;		/* If nonzero, and if we have the
 					   information we need, update the
 					   A record for the address we get. */
+
+	int bootp_broadcast_always;	/* If nonzero, always set the BOOTP_BROADCAST
+					   flag in requests */
 };
 
 /* Per-interface state used in the dhcp client... */
diff -up dhcp-4.1.0/includes/dhctoken.h.options dhcp-4.1.0/includes/dhctoken.h
--- dhcp-4.1.0/includes/dhctoken.h.options	2008-02-20 02:45:53.000000000 -1000
+++ dhcp-4.1.0/includes/dhctoken.h	2009-01-06 08:00:51.000000000 -1000
@@ -352,7 +352,8 @@ enum dhcp_token {
 	ZEROLEN = 655,
 	TEMPORARY = 656,
 	PREFIX6 = 657,
-	FIXED_PREFIX6 = 658
+	FIXED_PREFIX6 = 658,
+	BOOTP_BROADCAST_ALWAYS = 659
 };
 
 #define is_identifier(x)	((x) >= FIRST_TOKEN &&	\

dhcp-4.1.0-paths.patch:

--- NEW FILE dhcp-4.1.0-paths.patch ---
diff -up dhcp-4.1.0/includes/dhcpd.h.paths dhcp-4.1.0/includes/dhcpd.h
--- dhcp-4.1.0/includes/dhcpd.h.paths	2009-01-06 11:52:57.000000000 -1000
+++ dhcp-4.1.0/includes/dhcpd.h	2009-01-06 11:52:57.000000000 -1000
@@ -1340,15 +1340,15 @@ typedef unsigned char option_mask [16];
 #else /* !DEBUG */
 
 #ifndef _PATH_DHCPD_CONF
-#define _PATH_DHCPD_CONF	"/etc/dhcpd.conf"
+#define _PATH_DHCPD_CONF	"/etc/dhcp/dhcpd.conf"
 #endif /* DEBUG */
 
 #ifndef _PATH_DHCPD_DB
-#define _PATH_DHCPD_DB		LOCALSTATEDIR"/db/dhcpd.leases"
+#define _PATH_DHCPD_DB		LOCALSTATEDIR"/dhcpd/dhcpd.leases"
 #endif
 
 #ifndef _PATH_DHCPD6_DB
-#define _PATH_DHCPD6_DB		LOCALSTATEDIR"/db/dhcpd6.leases"
+#define _PATH_DHCPD6_DB		LOCALSTATEDIR"/dhcpd/dhcpd6.leases"
 #endif
 
 #ifndef _PATH_DHCPD_PID
@@ -1362,7 +1362,7 @@ typedef unsigned char option_mask [16];
 #endif /* DEBUG */
 
 #ifndef _PATH_DHCLIENT_CONF
-#define _PATH_DHCLIENT_CONF	"/etc/dhclient.conf"
+#define _PATH_DHCLIENT_CONF	"/etc/dhcp/dhclient.conf"
 #endif
 
 #ifndef _PATH_DHCLIENT_SCRIPT
@@ -1378,11 +1378,11 @@ typedef unsigned char option_mask [16];
 #endif
 
 #ifndef _PATH_DHCLIENT_DB
-#define _PATH_DHCLIENT_DB	LOCALSTATEDIR"/db/dhclient.leases"
+#define _PATH_DHCLIENT_DB	LOCALSTATEDIR"/dhclient/dhclient.leases"
 #endif
 
 #ifndef _PATH_DHCLIENT6_DB
-#define _PATH_DHCLIENT6_DB	LOCALSTATEDIR"/db/dhclient6.leases"
+#define _PATH_DHCLIENT6_DB	LOCALSTATEDIR"/dhclient/dhclient6.leases"
 #endif
 
 #ifndef _PATH_RESOLV_CONF

dhcp-4.1.0-port-validation.patch:

--- NEW FILE dhcp-4.1.0-port-validation.patch ---
diff -up dhcp-4.1.0/client/dhclient.c.validate dhcp-4.1.0/client/dhclient.c
--- dhcp-4.1.0/client/dhclient.c.validate	2009-01-06 12:11:44.000000000 -1000
+++ dhcp-4.1.0/client/dhclient.c	2009-01-06 12:25:06.000000000 -1000
@@ -190,7 +190,7 @@ main(int argc, char **argv) {
 		} else if (!strcmp(argv[i], "-p")) {
 			if (++i == argc)
 				usage();
-			local_port = htons(atoi(argv[i]));
+			local_port = validate_port(argv[i]);
 			log_debug("binding to user-specified port %d",
 				  ntohs(local_port));
 		} else if (!strcmp(argv[i], "-d")) {
diff -up dhcp-4.1.0/common/inet.c.validate dhcp-4.1.0/common/inet.c
--- dhcp-4.1.0/common/inet.c.validate	2007-07-12 20:43:41.000000000 -1000
+++ dhcp-4.1.0/common/inet.c	2009-01-06 12:11:44.000000000 -1000
@@ -604,3 +604,20 @@ piaddrcidr(const struct iaddr *addr, uns
 	return ret;
 }
 
+/* Check the port number specified */
+u_int16_t
+validate_port(char *port) {
+	u_int16_t local_port = 0;
+	int lower = 1;
+	int upper = 65535;
+
+	errno = 0;
+	local_port = strtol(port, NULL, 10);
+	if ((errno == ERANGE) || (errno == EINVAL))
+		log_fatal ("Invalid port number specification: %s", port);
+
+	if (local_port < lower || local_port > upper)
+		log_fatal("Port number specified is out of range (%d-%d).", lower, upper);
+
+	return htons(local_port);
+}
diff -up dhcp-4.1.0/includes/dhcpd.h.validate dhcp-4.1.0/includes/dhcpd.h
--- dhcp-4.1.0/includes/dhcpd.h.validate	2009-01-06 12:11:43.000000000 -1000
+++ dhcp-4.1.0/includes/dhcpd.h	2009-01-06 12:11:44.000000000 -1000
@@ -65,6 +65,7 @@
 #endif
 
 #include <setjmp.h>
+#include <errno.h>
 
 #include "cdefs.h"
 #include "osdep.h"
@@ -2511,6 +2512,7 @@ isc_result_t free_iaddrcidrnetlist(struc
 const char *piaddr PROTO ((struct iaddr));
 char *piaddrmask(struct iaddr *, struct iaddr *);
 char *piaddrcidr(const struct iaddr *, unsigned int);
+u_int16_t validate_port(char *port);
 
 /* dhclient.c */
 extern int nowait;
diff -up dhcp-4.1.0/relay/dhcrelay.c.validate dhcp-4.1.0/relay/dhcrelay.c
--- dhcp-4.1.0/relay/dhcrelay.c.validate	2009-01-06 12:11:43.000000000 -1000
+++ dhcp-4.1.0/relay/dhcrelay.c	2009-01-06 12:23:29.000000000 -1000
@@ -222,7 +222,7 @@ main(int argc, char **argv) {
 		} else if (!strcmp(argv[i], "-p")) {
 			if (++i == argc)
 				usage();
-			local_port = htons(atoi (argv[i]));
+			local_port = validate_port(argv[i]);
 			log_debug("binding to user-specified port %d",
 				  ntohs(local_port));
 		} else if (!strcmp(argv[i], "-c")) {
diff -up dhcp-4.1.0/server/dhcpd.c.validate dhcp-4.1.0/server/dhcpd.c
--- dhcp-4.1.0/server/dhcpd.c.validate	2009-01-06 12:11:43.000000000 -1000
+++ dhcp-4.1.0/server/dhcpd.c	2009-01-06 12:11:44.000000000 -1000
@@ -298,15 +298,7 @@ main(int argc, char **argv) {
 		if (!strcmp (argv [i], "-p")) {
 			if (++i == argc)
 				usage ();
-			for (s = argv [i]; *s; s++)
-				if (!isdigit ((unsigned char)*s))
-					log_fatal ("%s: not a valid UDP port",
-					       argv [i]);
-			status = atoi (argv [i]);
-			if (status < 1 || status > 65535)
-				log_fatal ("%s: not a valid UDP port",
-				       argv [i]);
-			local_port = htons (status);
+			local_port = validate_port(argv[i]);
 			log_debug ("binding to user-specified port %d",
 			       ntohs (local_port));
 		} else if (!strcmp (argv [i], "-f")) {
@@ -531,7 +523,7 @@ main(int argc, char **argv) {
 	if (!local_port)
 	{
 		if ((s = getenv ("DHCPD_PORT"))) {
-			local_port = htons (atoi (s));
+			local_port = validate_port(s);
 			log_debug ("binding to environment-specified port %d",
 				   ntohs (local_port));
 		} else {

dhcp-4.1.0-release-by-ifup.patch:

--- NEW FILE dhcp-4.1.0-release-by-ifup.patch ---
diff -up dhcp-4.1.0/client/dhclient.c.ifup dhcp-4.1.0/client/dhclient.c
--- dhcp-4.1.0/client/dhclient.c.ifup	2009-01-06 08:29:14.000000000 -1000
+++ dhcp-4.1.0/client/dhclient.c	2009-01-06 10:07:08.000000000 -1000
@@ -474,9 +474,81 @@ main(int argc, char **argv) {
 					kill(oldpid, SIGTERM);
 			}
 			fclose(pidfd);
+		} else {
+			/* handle release for interfaces requested with Red Hat
+			 * /sbin/ifup - pidfile will be /var/run/dhclient-$interface.pid
+			 */
+
+			if ((path_dhclient_pid == NULL) || (*path_dhclient_pid == '\0'))
+				path_dhclient_pid = "/var/run/dhclient.pid";
+
+			char *new_path_dhclient_pid;
+			struct interface_info *ip;
+			int pdp_len = strlen(path_dhclient_pid), pfx, dpfx;
+
+			/* find append point: beginning of any trailing '.pid'
+			 * or '-$IF.pid' */
+			for (pfx=pdp_len; (pfx >= 0) && (path_dhclient_pid[pfx] != '.') && (path_dhclient_pid[pfx] != '/'); pfx--);
+				if (pfx == -1)
+					pfx = pdp_len;
+
+			if (path_dhclient_pid[pfx] == '/')
+				pfx += 1;
+
+			for (dpfx=pfx; (dpfx >= 0) && (path_dhclient_pid[dpfx] != '-') && (path_dhclient_pid[dpfx] != '/'); dpfx--);
+				if ((dpfx > -1) && (path_dhclient_pid[dpfx] != '/'))
+					pfx = dpfx;
+
+			for (ip = interfaces; ip; ip = ip->next) {
+				if (interfaces_requested && (ip->flags & (INTERFACE_REQUESTED)) && (ip->name != NULL)) {
+					int n_len = strlen(ip->name);
+
+					new_path_dhclient_pid = (char*) malloc(pfx + n_len + 6);
+					strncpy(new_path_dhclient_pid, path_dhclient_pid, pfx);
+					sprintf(new_path_dhclient_pid + pfx, "-%s.pid", ip->name);
+
+					if ((pidfd = fopen(new_path_dhclient_pid, "r")) != NULL) {
+						e = fscanf(pidfd, "%ld\n", &temp);
+						oldpid = (pid_t)temp;
+
+						if (e != 0 && e != EOF) {
+							if (oldpid) {
+								if (kill(oldpid, SIGTERM) == 0)
+									unlink(path_dhclient_pid);
+							}
+						}
+
+						fclose(pidfd);
+					}
+
+					free(new_path_dhclient_pid);
+				}
+			}
+		}
+	} else {
+		FILE *pidfp = NULL;
+		long temp = 0;
+		pid_t dhcpid = 0;
+		int dhc_running = 0;
+		char procfn[256] = "";
+
+		if ((pidfp = fopen(path_dhclient_pid, "r")) != NULL) {
+			if ((fscanf(pidfp, "%ld", &temp)==1) && ((dhcpid=(pid_t)temp) > 0)) {
+				snprintf(procfn,256,"/proc/%u",dhcpid);
+				dhc_running = (access(procfn, F_OK) == 0);
+			}
+
+			fclose(pidfp);
+		}
+
+		if (dhc_running) {
+			log_fatal("dhclient(%u) is already running - exiting. ", dhcpid);
+			return(1);
 		}
 	}
 
+	write_client_pid_file();
+
 	if (!quiet) {
 		log_info("%s %s", message, PACKAGE_VERSION);
 		log_info(copyright);

dhcp-4.1.0-unicast-bootp.patch:

--- NEW FILE dhcp-4.1.0-unicast-bootp.patch ---
diff -up dhcp-4.1.0/server/bootp.c.unicast dhcp-4.1.0/server/bootp.c
--- dhcp-4.1.0/server/bootp.c.unicast	2008-08-20 13:07:19.000000000 -1000
+++ dhcp-4.1.0/server/bootp.c	2009-01-06 10:13:29.000000000 -1000
@@ -58,6 +58,7 @@ void bootp (packet)
 	char msgbuf [1024];
 	int ignorep;
 	int peer_has_leases = 0;
+	int norelay = 0;
 
 	if (packet -> raw -> op != BOOTREQUEST)
 		return;
@@ -73,7 +74,7 @@ void bootp (packet)
 		 ? inet_ntoa (packet -> raw -> giaddr)
 		 : packet -> interface -> name);
 
-	if (!locate_network (packet)) {
+	if ((norelay = locate_network (packet)) == 0) {
 		log_info ("%s: network unknown", msgbuf);
 		return;
 	}
@@ -390,6 +391,13 @@ void bootp (packet)
 					      from, &to, &hto);
 			goto out;
 		}
+	} else if (norelay == 2) {
+		to.sin_addr = raw.ciaddr;
+		to.sin_port = remote_port;
+		if (fallback_interface) {
+			result = send_packet (fallback_interface, (struct packet *)0, &raw, outgoing.packet_length, from, &to, &hto);
+			goto out;
+		}
 
 	/* If it comes from a client that already knows its address
 	   and is not requesting a broadcast response, and we can
diff -up dhcp-4.1.0/server/dhcp.c.unicast dhcp-4.1.0/server/dhcp.c
--- dhcp-4.1.0/server/dhcp.c.unicast	2008-11-03 08:13:58.000000000 -1000
+++ dhcp-4.1.0/server/dhcp.c	2009-01-06 10:13:29.000000000 -1000
@@ -4111,6 +4111,7 @@ int locate_network (packet)
 	struct data_string data;
 	struct subnet *subnet = (struct subnet *)0;
 	struct option_cache *oc;
+	int norelay = 0;
 
 	/* See if there's a Relay Agent Link Selection Option, or a
 	 * Subnet Selection Option.  The Link-Select and Subnet-Select
@@ -4126,12 +4127,24 @@ int locate_network (packet)
 	   from the interface, if there is one.   If not, fail. */
 	if (!oc && !packet -> raw -> giaddr.s_addr) {
 		if (packet -> interface -> shared_network) {
-			shared_network_reference
-				(&packet -> shared_network,
-				 packet -> interface -> shared_network, MDL);
-			return 1;
+			struct in_addr any_addr;
+			any_addr.s_addr = INADDR_ANY;
+
+			if (!packet -> packet_type && memcmp(&packet -> raw -> ciaddr, &any_addr, 4)) {
+				struct iaddr cip;
+				memcpy(cip.iabuf, &packet -> raw -> ciaddr, 4);
+				cip.len = 4;
+				if (!find_grouped_subnet(&subnet, packet->interface->shared_network, cip, MDL))
+					norelay = 2;
+			}
+
+			if (!norelay) {
+				shared_network_reference(&packet -> shared_network, packet -> interface -> shared_network, MDL);
+				return 1;
+			}
+		} else {
+			return 0;
 		}
-		return 0;
 	}
 
 	/* If there's an option indicating link connection, and it's valid,
@@ -4154,7 +4167,10 @@ int locate_network (packet)
 		data_string_forget (&data, MDL);
 	} else {
 		ia.len = 4;
-		memcpy (ia.iabuf, &packet -> raw -> giaddr, 4);
+		if (norelay)
+			memcpy (ia.iabuf, &packet->raw->ciaddr, 4);
+		else
+			memcpy (ia.iabuf, &packet->raw->giaddr, 4);
 	}
 
 	/* If we know the subnet on which the IP address lives, use it. */
@@ -4162,7 +4178,10 @@ int locate_network (packet)
 		shared_network_reference (&packet -> shared_network,
 					  subnet -> shared_network, MDL);
 		subnet_dereference (&subnet, MDL);
-		return 1;
+		if (norelay)
+			return norelay;
+		else
+			return 1;
 	}
 
 	/* Otherwise, fail. */

dhcp-4.1.0-xen-checksum.patch:

--- NEW FILE dhcp-4.1.0-xen-checksum.patch ---
diff -up dhcp-4.1.0/common/bpf.c.xen dhcp-4.1.0/common/bpf.c
--- dhcp-4.1.0/common/bpf.c.xen	2007-08-22 23:49:51.000000000 -1000
+++ dhcp-4.1.0/common/bpf.c	2009-01-06 10:41:32.000000000 -1000
@@ -482,7 +482,7 @@ ssize_t receive_packet (interface, buf, 
 		offset = decode_udp_ip_header (interface,
 					       interface -> rbuf,
 					       interface -> rbuf_offset,
-  					       from, hdr.bh_caplen, &paylen);
+  					       from, hdr.bh_caplen, &paylen, 0);
 
 		/* If the IP or UDP checksum was bad, skip the packet... */
 		if (offset < 0) {
diff -up dhcp-4.1.0/common/dlpi.c.xen dhcp-4.1.0/common/dlpi.c
--- dhcp-4.1.0/common/dlpi.c.xen	2008-02-29 13:57:56.000000000 -1000
+++ dhcp-4.1.0/common/dlpi.c	2009-01-06 10:41:32.000000000 -1000
@@ -689,7 +689,7 @@ ssize_t receive_packet (interface, buf, 
 	length -= offset;
 #endif
 	offset = decode_udp_ip_header (interface, dbuf, bufix,
-				       from, length, &paylen);
+				       from, length, &paylen, 0);
 
 	/* If the IP or UDP checksum was bad, skip the packet... */
 	if (offset < 0) {
diff -up dhcp-4.1.0/common/lpf.c.xen dhcp-4.1.0/common/lpf.c
--- dhcp-4.1.0/common/lpf.c.xen	2009-01-06 10:41:31.000000000 -1000
+++ dhcp-4.1.0/common/lpf.c	2009-01-06 10:41:32.000000000 -1000
@@ -29,18 +29,33 @@
 #include "dhcpd.h"
 #if defined (USE_LPF_SEND) || defined (USE_LPF_RECEIVE)
 #include <sys/ioctl.h>
+#include <sys/socket.h>
 #include <sys/uio.h>
 #include <errno.h>
 
 #include <asm/types.h>
 #include <linux/filter.h>
 #include <linux/if_ether.h>
+#include <linux/if_packet.h>
 #include <netinet/in_systm.h>
 #include "includes/netinet/ip.h"
 #include "includes/netinet/udp.h"
 #include "includes/netinet/if_ether.h"
 #include <net/if.h>
 
+#ifndef PACKET_AUXDATA
+#define PACKET_AUXDATA 8
+
+struct tpacket_auxdata
+{
+	__u32		tp_status;
+	__u32		tp_len;
+	__u32		tp_snaplen;
+	__u16		tp_mac;
+	__u16		tp_net;
+};
+#endif
+
 /* Reinitializes the specified interface after an address change.   This
    is not required for packet-filter APIs. */
 
@@ -66,10 +81,14 @@ int if_register_lpf (info)
 	struct interface_info *info;
 {
 	int sock;
-	struct sockaddr sa;
+	union {
+		struct sockaddr_ll ll;
+		struct sockaddr common;
+	} sa;
+	struct ifreq ifr;
 
 	/* Make an LPF socket. */
-	if ((sock = socket(PF_PACKET, SOCK_PACKET,
+	if ((sock = socket(PF_PACKET, SOCK_RAW,
 			   htons((short)ETH_P_ALL))) < 0) {
 		if (errno == ENOPROTOOPT || errno == EPROTONOSUPPORT ||
 		    errno == ESOCKTNOSUPPORT || errno == EPFNOSUPPORT ||
@@ -84,11 +103,16 @@ int if_register_lpf (info)
 		log_fatal ("Open a socket for LPF: %m");
 	}
 
+	memset (&ifr, 0, sizeof ifr);
+	strncpy (ifr.ifr_name, (const char *)info -> ifp, sizeof ifr.ifr_name);
+	if (ioctl (sock, SIOCGIFINDEX, &ifr))
+		log_fatal ("Failed to get interface index: %m");
+
 	/* Bind to the interface name */
 	memset (&sa, 0, sizeof sa);
-	sa.sa_family = AF_PACKET;
-	strncpy (sa.sa_data, (const char *)info -> ifp, sizeof sa.sa_data);
-	if (bind (sock, &sa, sizeof sa)) {
+	sa.ll.sll_family = AF_PACKET;
+	sa.ll.sll_ifindex = ifr.ifr_ifindex;
+	if (bind (sock, &sa.common, sizeof sa)) {
 		if (errno == ENOPROTOOPT || errno == EPROTONOSUPPORT ||
 		    errno == ESOCKTNOSUPPORT || errno == EPFNOSUPPORT ||
 		    errno == EAFNOSUPPORT || errno == EINVAL) {
@@ -170,9 +194,18 @@ static void lpf_gen_filter_setup (struct
 void if_register_receive (info)
 	struct interface_info *info;
 {
+	int val;
+
 	/* Open a LPF device and hang it on this interface... */
 	info -> rfdesc = if_register_lpf (info);
 
+	val = 1;
+	if (setsockopt (info -> rfdesc, SOL_PACKET, PACKET_AUXDATA, &val,
+			sizeof val) < 0) {
+		if (errno != ENOPROTOOPT)
+			log_fatal ("Failed to set auxiliary packet data: %m");
+	}
+
 #if defined (HAVE_TR_SUPPORT)
 	if (info -> hw_address.hbuf [0] == HTYPE_IEEE802)
 		lpf_tr_filter_setup (info);
@@ -293,7 +326,6 @@ ssize_t send_packet (interface, packet, 
 	double hh [16];
 	double ih [1536 / sizeof (double)];
 	unsigned char *buf = (unsigned char *)ih;
-	struct sockaddr sa;
 	int result;
 	int fudge;
 
@@ -311,15 +343,7 @@ ssize_t send_packet (interface, packet, 
 				(unsigned char *)raw, len);
 	memcpy (buf + ibufp, raw, len);
 
-	/* For some reason, SOCK_PACKET sockets can't be connected,
-	   so we have to do a sentdo every time. */
-	memset (&sa, 0, sizeof sa);
-	sa.sa_family = AF_PACKET;
-	strncpy (sa.sa_data,
-		 (const char *)interface -> ifp, sizeof sa.sa_data);
-
-	result = sendto (interface -> wfdesc,
-			 buf + fudge, ibufp + len - fudge, 0, &sa, sizeof sa);
+	result = write (interface -> wfdesc, buf + fudge, ibufp + len - fudge);
 	if (result < 0)
 		log_error ("send_packet: %m");
 	return result;
@@ -336,14 +360,35 @@ ssize_t receive_packet (interface, buf, 
 {
 	int length = 0;
 	int offset = 0;
+	int nocsum = 0;
 	unsigned char ibuf [1536];
 	unsigned bufix = 0;
 	unsigned paylen;
+	unsigned char cmsgbuf[CMSG_LEN(sizeof(struct tpacket_auxdata))];
+	struct iovec iov = {
+		.iov_base = ibuf,
+		.iov_len = sizeof ibuf,
+	};
+	struct msghdr msg = {
+		.msg_iov = &iov,
+		.msg_iovlen = 1,
+		.msg_control = cmsgbuf,
+		.msg_controllen = sizeof(cmsgbuf),
+	};
+	struct cmsghdr *cmsg;
 
-	length = read (interface -> rfdesc, ibuf, sizeof ibuf);
+	length = recvmsg (interface -> rfdesc, &msg, 0);
 	if (length <= 0)
 		return length;
 
+	for (cmsg = CMSG_FIRSTHDR(&msg); cmsg; cmsg = CMSG_NXTHDR(&msg, cmsg)) {
+		if (cmsg->cmsg_level == SOL_PACKET &&
+		    cmsg->cmsg_type == PACKET_AUXDATA) {
+			struct tpacket_auxdata *aux = (void *)CMSG_DATA(cmsg);
+			nocsum = aux->tp_status & TP_STATUS_CSUMNOTREADY;
+		}
+	}
+
 	bufix = 0;
 	/* Decode the physical header... */
 	offset = decode_hw_header (interface, ibuf, bufix, hfrom);
@@ -360,7 +405,7 @@ ssize_t receive_packet (interface, buf, 
 
 	/* Decode the IP and UDP headers... */
 	offset = decode_udp_ip_header (interface, ibuf, bufix, from,
-				       (unsigned)length, &paylen);
+				       (unsigned)length, &paylen, nocsum);
 
 	/* If the IP or UDP checksum was bad, skip the packet... */
 	if (offset < 0)
diff -up dhcp-4.1.0/common/nit.c.xen dhcp-4.1.0/common/nit.c
--- dhcp-4.1.0/common/nit.c.xen	2007-09-05 07:32:10.000000000 -1000
+++ dhcp-4.1.0/common/nit.c	2009-01-06 10:41:32.000000000 -1000
@@ -366,7 +366,7 @@ ssize_t receive_packet (interface, buf, 
 
 	/* Decode the IP and UDP headers... */
 	offset = decode_udp_ip_header (interface, ibuf, bufix,
-				       from, length, &paylen);
+				       from, length, &paylen, 0);
 
 	/* If the IP or UDP checksum was bad, skip the packet... */
 	if (offset < 0)
diff -up dhcp-4.1.0/common/packet.c.xen dhcp-4.1.0/common/packet.c
--- dhcp-4.1.0/common/packet.c.xen	2009-01-06 10:41:31.000000000 -1000
+++ dhcp-4.1.0/common/packet.c	2009-01-06 10:41:32.000000000 -1000
@@ -210,7 +210,7 @@ ssize_t
 decode_udp_ip_header(struct interface_info *interface,
 		     unsigned char *buf, unsigned bufix,
 		     struct sockaddr_in *from, unsigned buflen,
-		     unsigned *rbuflen)
+		     unsigned *rbuflen, int nocsum)
 {
   unsigned char *data;
   struct ip ip;
@@ -321,7 +321,7 @@ decode_udp_ip_header(struct interface_in
 					   8, IPPROTO_UDP + ulen))));
 
   udp_packets_seen++;
-  if (usum && usum != sum) {
+  if (!nocsum && usum && usum != sum) {
 	  udp_packets_bad_checksum++;
 	  if (udp_packets_seen > 4 &&
 	      (udp_packets_seen / udp_packets_bad_checksum) < 2) {
diff -up dhcp-4.1.0/common/upf.c.xen dhcp-4.1.0/common/upf.c
--- dhcp-4.1.0/common/upf.c.xen	2007-07-12 20:43:42.000000000 -1000
+++ dhcp-4.1.0/common/upf.c	2009-01-06 10:41:32.000000000 -1000
@@ -317,7 +317,7 @@ ssize_t receive_packet (interface, buf, 
 
 	/* Decode the IP and UDP headers... */
 	offset = decode_udp_ip_header (interface, ibuf, bufix,
-				       from, length, &paylen);
+				       from, length, &paylen, 0);
 
 	/* If the IP or UDP checksum was bad, skip the packet... */
 	if (offset < 0)
diff -up dhcp-4.1.0/includes/dhcpd.h.xen dhcp-4.1.0/includes/dhcpd.h
--- dhcp-4.1.0/includes/dhcpd.h.xen	2009-01-06 10:41:32.000000000 -1000
+++ dhcp-4.1.0/includes/dhcpd.h	2009-01-06 10:41:32.000000000 -1000
@@ -2640,7 +2640,7 @@ ssize_t decode_hw_header PROTO ((struct 
 				 unsigned, struct hardware *));
 ssize_t decode_udp_ip_header PROTO ((struct interface_info *, unsigned char *,
 				     unsigned, struct sockaddr_in *,
-				     unsigned, unsigned *));
+				     unsigned, unsigned *, int));
 
 /* ethernet.c */
 void assemble_ethernet_header PROTO ((struct interface_info *, unsigned char *,


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/dhcp/devel/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- .cvsignore	13 Jan 2008 21:02:47 -0000	1.22
+++ .cvsignore	6 Jan 2009 23:46:50 -0000	1.23
@@ -1 +1 @@
-dhcp-4.0.0.tar.gz
+dhcp-4.1.0.tar.gz


Index: dhcp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dhcp/devel/dhcp.spec,v
retrieving revision 1.232
retrieving revision 1.233
diff -u -r1.232 -r1.233
--- dhcp.spec	5 Jan 2009 22:45:37 -0000	1.232
+++ dhcp.spec	6 Jan 2009 23:46:51 -0000	1.233
@@ -1,23 +1,18 @@
 # vendor string (e.g., Fedora, EL)
 %define vvendor Fedora
 
-# Make it easy for package rebuilders to select LPF or sockets
-%define netmethod USE_LPF
+# Make it easy for package rebuilders to enable DHCPv6 support
+%define dhcpv6opt --disable-dhcpv6
 
-%define with_USE_SOCKETS %{?_with_USE_SOCKETS: 1} %{?!_with_USE_SOCKETS: 0}
-%if %{with_USE_SOCKETS}
-%define netmethod USE_SOCKETS
-%endif
-
-%define with_USE_LPF %{?_with_USE_LPF: 1} %{?!_with_USE_LPF: 0}
-%if %{with_USE_LPF}
-%define netmethod USE_LPF
+%define with_DHCPv6 %{?_with_DHCPv6: 1} %{?!_with_DHCPv6: 0}
+%if %{with_DHCPv6}
+%define dhcpv6opt --enable-dhcpv6
 %endif
 
 Summary:  Dynamic host configuration protocol software
 Name:     dhcp
-Version:  4.0.0
-Release:  34%{?dist}
+Version:  4.1.0
+Release:  1%{?dist}
 # NEVER CHANGE THE EPOCH on this package.  The previous maintainer (prior to
 # dcantrell maintaining the package) made incorrect use of the epoch and
 # that's why it is at 12 now.  It should have never been used, but it was.
@@ -36,28 +31,25 @@
 Source9:  dhcp.schema
 Source10: get-ldap-patch.sh
 
-Patch0:   %{name}-4.0.0-errwarn-message.patch
-Patch1:   %{name}-4.0.0-ldap-configuration.patch
-Patch2:   %{name}-4.0.0-memory.patch
-Patch3:   %{name}-4.0.0-options.patch
-Patch4:   %{name}-4.0.0-release-by-ifup.patch
-Patch5:   %{name}-4.0.0-dhclient-decline-backoff.patch
-Patch6:   %{name}-4.0.0-enable-timeout-functions.patch
-Patch7:   %{name}-4.0.0-unicast-bootp.patch
-Patch8:   %{name}-4.0.0-fast-timeout.patch
-Patch9:   %{name}-4.0.0-failover-ports.patch
-Patch10:  %{name}-4.0.0-dhclient-usage.patch
-Patch11:  %{name}-4.0.0-default-requested-options.patch
-Patch12:  %{name}-4.0.0-xen-checksum.patch
-Patch13:  %{name}-4.0.0-dhclient-anycast.patch
-Patch14:  %{name}-4.0.0-manpages.patch
-Patch15:  %{name}-4.0.0-paths.patch
-Patch16:  %{name}-4.0.0-NetworkManager-crash.patch
-Patch17:  %{name}-4.0.0-CLOEXEC.patch
-Patch18:  %{name}-4.0.0-inherit-leases.patch
-Patch19:  %{name}-4.0.0-garbage-chars.patch
-Patch20:  %{name}-4.0.0-port-validation.patch
-Patch21:  %{name}-4.0.0-invalid-dhclient-conf.patch
+Patch0:   %{name}-4.1.0-errwarn-message.patch
+Patch1:   %{name}-4.1.0-ldap-configuration.patch
+Patch2:   %{name}-4.1.0-memory.patch
+Patch3:   %{name}-4.1.0-options.patch
+Patch4:   %{name}-4.1.0-release-by-ifup.patch
+Patch5:   %{name}-4.1.0-dhclient-decline-backoff.patch
+Patch6:   %{name}-4.1.0-unicast-bootp.patch
+Patch7:   %{name}-4.1.0-failover-ports.patch
+Patch8:   %{name}-4.1.0-dhclient-usage.patch
+Patch9:   %{name}-4.1.0-default-requested-options.patch
+Patch10:  %{name}-4.1.0-xen-checksum.patch
+Patch11:  %{name}-4.1.0-dhclient-anycast.patch
+Patch12:  %{name}-4.1.0-manpages.patch
+Patch13:  %{name}-4.1.0-paths.patch
+Patch14:  %{name}-4.1.0-CLOEXEC.patch
+Patch15:  %{name}-4.1.0-inherit-leases.patch
+Patch16:  %{name}-4.1.0-garbage-chars.patch
+Patch17:  %{name}-4.1.0-port-validation.patch
+Patch18:  %{name}-4.1.0-invalid-dhclient-conf.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: autoconf
@@ -111,16 +103,6 @@
 libdhcpctl and libomapi static libraries are also included in this package.
 
 %prep
-case "%{netmethod}" in
-    USE_LPF|USE_SOCKETS)
-        continue ;;
-    *)
-        echo >&2
-        echo "ERROR: Only --with options supported:  USE_LPF, USE_SOCKETS" >&2
-        echo >&2
-        exit 1 ;;
-esac
-
 %setup -q
 
 # Replace the standard ISC warning message about requesting help with an
@@ -138,7 +120,7 @@
 # Init struct sock_prog in common/lpf.c to NULL
 %patch2 -p1
 
-# Add more dhclient options (-I, -B, -H, -F, -T, -V, and -R)
+# Add more dhclient options (-I, -B, -H, -F, -timeout, -V, and -R)
 %patch3 -p1
 
 # Handle releasing interfaces requested by /sbin/ifup
@@ -149,62 +131,52 @@
 # backoff for an amount of time before trying again
 %patch5 -p1
 
-# Enable cancel_all_timeouts() and relinquish_timeouts() regardless of
-# the DEBUG_MEMORY_LEAKAGE_ON_EXIT macro
-%patch6 -p1
-
 # Support unicast BOOTP for IBM pSeries systems (and maybe others)
-%patch7 -p1
-
-# Fast timeout for dhclient
-%patch8 -p1
+%patch6 -p1
 
 # Use the following IANA-registered failover ports:
 # dhcp-failover 647/tcp
 # dhcp-failover 647/udp
 # dhcp-failover 847/tcp
 # dhcp-failover 847/udp
-%patch9 -p1
+%patch7 -p1
 
 # Update the usage screen for dhclient(8) indicating new options
 # Use printf() rather than log_info() to display the information
 # Also, return EXIT_FAILURE when the usage() screen is displayed (stop parsing)
-%patch10 -p1
+%patch8 -p1
 
 # Add NIS domain, NIS servers, and NTP servers to the list of default
 # requested DHCP options
-%patch11 -p1
+%patch9 -p1
 
 # Handle Xen partial UDP checksums
-%patch12 -p1
+%patch10 -p1
 
 # Add anycast support to dhclient (for OLPC)
-%patch13 -p1
+%patch11 -p1
 
 # Patch man page contents
-%patch14 -p1
+%patch12 -p1
 
 # Change paths to conform to our standards
-%patch15 -p1
-
-# Avoid crash when dhclient is run with NetworkManager
-%patch16 -p1
+%patch13 -p1
 
 # Make sure all open file descriptors are closed-on-exec for SELinux (#446632)
-%patch17 -p1
+%patch14 -p1
 
 # If we have an active lease, do not down the interface (#453982)
-%patch18 -p1
+%patch15 -p1
 
 # Fix 'garbage in format string' error (#450052)
-%patch19 -p1
+%patch16 -p1
 
 # Validate port numbers specified for dhclient, dhcpd, and dhcrelay
 # to make sure they are within 1-65535, inclusive.  (#438149)
-%patch20 -p1
+%patch17 -p1
 
 # The sample dhclient.conf should say 'supersede domain-search' (#467955)
-%patch21 -p1
+%patch18 -p1
 
 # Copy in documentation and example scripts for LDAP patch to dhcpd
 %{__install} -p -m 0644 %{SOURCE3} .
@@ -249,14 +221,14 @@
     %{__sed} -i -e 's|CLIENTBINDIR|/sbin|g' \
                 -e 's|RUNDIR|%{_localstatedir}/run|g' \
                 -e 's|DBDIR|%{_localstatedir}/db/dhclient|g' \
-                -e 's|ETCDIR|%{_sysconfdir}|g' $page
+                -e 's|ETCDIR|%{_sysconfdir}/dhcp|g' $page
 done
 
 for page in server/dhcpd.conf.5 server/dhcpd.leases.5 server/dhcpd.8 ; do
     %{__sed} -i -e 's|CLIENTBINDIR|/sbin|g' \
                 -e 's|RUNDIR|%{_localstatedir}/run|g' \
                 -e 's|DBDIR|%{_localstatedir}/db/dhcpd|g' \
-                -e 's|ETCDIR|%{_sysconfdir}|g' $page
+                -e 's|ETCDIR|%{_sysconfdir}/dhcp|g' $page
 done
 
 aclocal
@@ -266,9 +238,9 @@
 automake --foreign --add-missing --copy
 
 %build
-CFLAGS="%{optflags} -fPIC -D_GNU_SOURCE -DUSE_SSL=1 -D%{netmethod}=1" \
+CFLAGS="%{optflags} -fPIC -D_GNU_SOURCE -DLDAP_CONFIGURATION -DUSE_SSL" \
 %configure \
-    --disable-dhcpv6 \
+    %{dhcpv6opt} \
     --with-srv-lease-file=%{_localstatedir}/lib/dhcpd/dhcpd.leases \
     --with-cli-lease-file=%{_localstatedir}/lib/dhclient/dhclient.leases \
     --with-srv-pid-file=%{_localstatedir}/run/dhcpd.pid \
@@ -336,9 +308,23 @@
 %{__rm} -rf %{buildroot}
 
 %post
+if [ -f /etc/dhcpd.conf ]; then
+    /bin/cp -a /etc/dhcpd.conf /etc/dhcp/dhcpd.conf >/dev/null 2>&1
+    /bin/rm -f /etc/dhcpd.conf >/dev/null 2>&1
+fi
+
 /sbin/chkconfig --add dhcpd
 /sbin/chkconfig --add dhcrelay || :
 
+%post -n dhclient
+/bin/ls -1 /etc/dhclient* >/dev/null 2>&1
+if [ $? = 0 ]; then
+    /bin/ls -1 /etc/dhclient* 2>/dev/null | while read etcfile ; do
+        /bin/cp -a "${etcfile}" /etc/dhcp
+        /bin/rm -f "${etcfile}"
+    done || :
+fi || :
+
 %preun
 if [ $1 = 0 ]; then
     /sbin/service dhcpd status >/dev/null 2>&1
@@ -410,6 +396,15 @@
 %attr(0644,root,root) %{_mandir}/man3/omapi.3.gz
 
 %changelog
+* Tue Jan 06 2009 David Cantrell <dcantrell at redhat.com> - 12:4.1.0-1
+- Upgraded to ISC dhcp-4.1.0
+- Had to rename the -T option to -timeout as ISC is now using -T
+- Allow package rebuilders to easily enable DHCPv6 support with:
+      rpmbuild --with DHCPv6 dhcp.spec
+  Note that Fedora is still using the 'dhcpv6' package, but some
+  users may want to experiment with the ISC DHCPv6 implementation
+  locally.
+
 * Thu Dec 18 2008 David Cantrell <dcantrell at redhat.com> - 12:4.0.0-34
 - Move /etc/dhclient.conf to /etc/dhcp/dhclient.conf
 - Move /etc/dhcpd.conf to /etc/dhcp/dhcpd.conf


Index: dhcpd.init
===================================================================
RCS file: /cvs/pkgs/rpms/dhcp/devel/dhcpd.init,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- dhcpd.init	18 Dec 2008 22:47:13 -0000	1.27
+++ dhcpd.init	6 Jan 2009 23:46:51 -0000	1.28
@@ -46,7 +46,7 @@
             continue
         fi
     done
-    echo "/etc/dhcpd.conf"
+    echo "/etc/dhcp/dhcpd.conf"
 }
 
 conf="$(findConfig "$DHCPDARGS")"


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dhcp/devel/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sources	13 Jan 2008 21:02:47 -0000	1.23
+++ sources	6 Jan 2009 23:46:51 -0000	1.24
@@ -1 +1 @@
-31d79b27ce4a94089a0b9ce7f72307fa  dhcp-4.0.0.tar.gz
+1fffed2e8c3d67b111316d6a9b33db7a  dhcp-4.1.0.tar.gz



From dcantrel at fedoraproject.org  Tue Jan  6 23:50:29 2009
From: dcantrel at fedoraproject.org (David Cantrell)
Date: Tue,  6 Jan 2009 23:50:29 +0000 (UTC)
Subject: rpms/dhcp/devel dhcp-4.0.0-CLOEXEC.patch, 1.1,
	NONE dhcp-4.0.0-NetworkManager-crash.patch, 1.1,
	NONE dhcp-4.0.0-default-requested-options.patch, 1.3,
	NONE dhcp-4.0.0-dhclient-anycast.patch, 1.3,
	NONE dhcp-4.0.0-dhclient-decline-backoff.patch, 1.1,
	NONE dhcp-4.0.0-dhclient-usage.patch, 1.4,
	NONE dhcp-4.0.0-enable-timeout-functions.patch, 1.1,
	NONE dhcp-4.0.0-errwarn-message.patch, 1.1,
	NONE dhcp-4.0.0-failover-ports.patch, 1.1,
	NONE dhcp-4.0.0-fast-timeout.patch, 1.4,
	NONE dhcp-4.0.0-garbage-chars.patch, 1.1,
	NONE dhcp-4.0.0-inherit-leases.patch, 1.2,
	NONE dhcp-4.0.0-invalid-dhclient-conf.patch, 1.1,
	NONE dhcp-4.0.0-ldap-configuration.patch, 1.8,
	NONE dhcp-4.0.0-manpages.patch, 1.4,
	NONE dhcp-4.0.0-memory.patch, 1.1, NONE dhcp-4.0.0-options.patch,
	1.3, NONE dhcp-4.0.0-paths.patch, 1.4,
	NONE dhcp-4.0.0-port-validation.patch, 1.4,
	NONE dhcp-4.0.0-release-by-ifup.patch, 1.1,
	NONE dhcp-4.0.0-unicast-bootp.patch, 1.1,
	NONE dhcp-4.0.0-xen-checksum.patch, 1.3, NONE
Message-ID: <20090106235029.AAFC770108@cvs1.fedora.phx.redhat.com>

Author: dcantrel

Update of /cvs/pkgs/rpms/dhcp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17963

Removed Files:
	dhcp-4.0.0-CLOEXEC.patch dhcp-4.0.0-NetworkManager-crash.patch 
	dhcp-4.0.0-default-requested-options.patch 
	dhcp-4.0.0-dhclient-anycast.patch 
	dhcp-4.0.0-dhclient-decline-backoff.patch 
	dhcp-4.0.0-dhclient-usage.patch 
	dhcp-4.0.0-enable-timeout-functions.patch 
	dhcp-4.0.0-errwarn-message.patch 
	dhcp-4.0.0-failover-ports.patch dhcp-4.0.0-fast-timeout.patch 
	dhcp-4.0.0-garbage-chars.patch dhcp-4.0.0-inherit-leases.patch 
	dhcp-4.0.0-invalid-dhclient-conf.patch 
	dhcp-4.0.0-ldap-configuration.patch dhcp-4.0.0-manpages.patch 
	dhcp-4.0.0-memory.patch dhcp-4.0.0-options.patch 
	dhcp-4.0.0-paths.patch dhcp-4.0.0-port-validation.patch 
	dhcp-4.0.0-release-by-ifup.patch 
	dhcp-4.0.0-unicast-bootp.patch dhcp-4.0.0-xen-checksum.patch 
Log Message:
* Tue Jan 06 2009 David Cantrell <dcantrell at redhat.com> - 12:4.1.0-1
- Upgraded to ISC dhcp-4.1.0
- Had to rename the -T option to -timeout as ISC is now using -T
- Allow package rebuilders to easily enable DHCPv6 support with:
      rpmbuild --with DHCPv6 dhcp.spec
  Note that Fedora is still using the 'dhcpv6' package, but some
  users may want to experiment with the ISC DHCPv6 implementation
  locally.



--- dhcp-4.0.0-CLOEXEC.patch DELETED ---


--- dhcp-4.0.0-NetworkManager-crash.patch DELETED ---


--- dhcp-4.0.0-default-requested-options.patch DELETED ---


--- dhcp-4.0.0-dhclient-anycast.patch DELETED ---


--- dhcp-4.0.0-dhclient-decline-backoff.patch DELETED ---


--- dhcp-4.0.0-dhclient-usage.patch DELETED ---


--- dhcp-4.0.0-enable-timeout-functions.patch DELETED ---


--- dhcp-4.0.0-errwarn-message.patch DELETED ---


--- dhcp-4.0.0-failover-ports.patch DELETED ---


--- dhcp-4.0.0-fast-timeout.patch DELETED ---


--- dhcp-4.0.0-garbage-chars.patch DELETED ---


--- dhcp-4.0.0-inherit-leases.patch DELETED ---


--- dhcp-4.0.0-invalid-dhclient-conf.patch DELETED ---


--- dhcp-4.0.0-ldap-configuration.patch DELETED ---


--- dhcp-4.0.0-manpages.patch DELETED ---


--- dhcp-4.0.0-memory.patch DELETED ---


--- dhcp-4.0.0-options.patch DELETED ---


--- dhcp-4.0.0-paths.patch DELETED ---


--- dhcp-4.0.0-port-validation.patch DELETED ---


--- dhcp-4.0.0-release-by-ifup.patch DELETED ---


--- dhcp-4.0.0-unicast-bootp.patch DELETED ---


--- dhcp-4.0.0-xen-checksum.patch DELETED ---



From jjames at fedoraproject.org  Tue Jan  6 23:51:42 2009
From: jjames at fedoraproject.org (Jerry James)
Date: Tue,  6 Jan 2009 23:51:42 +0000 (UTC)
Subject: rpms/automaton/F-10 .cvsignore, 1.3, 1.4 automaton.spec, 1.2,
	1.3 sources, 1.3, 1.4
Message-ID: <20090106235142.AF55A70108@cvs1.fedora.phx.redhat.com>

Author: jjames

Update of /cvs/pkgs/rpms/automaton/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18020/F-10

Modified Files:
	.cvsignore automaton.spec sources 
Log Message:
* Tue Jan  6 2009 Jerry James <loganjerry at gmail.com> - 1.11r1-1
- Upgrade to 1.11-1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/automaton/F-10/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	12 Sep 2008 17:43:38 -0000	1.3
+++ .cvsignore	6 Jan 2009 23:51:12 -0000	1.4
@@ -1 +1 @@
-automaton-1.10-5.tar.gz
+automaton-1.11-1.tar.gz


Index: automaton.spec
===================================================================
RCS file: /cvs/pkgs/rpms/automaton/F-10/automaton.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- automaton.spec	12 Sep 2008 17:43:38 -0000	1.2
+++ automaton.spec	6 Jan 2009 23:51:12 -0000	1.3
@@ -1,6 +1,6 @@
 # Upstream uses version-release.  Control the madness here.
-%define upver 1.10
-%define uprel 5
+%define upver 1.11
+%define uprel 1
 %define filever %{upver}-%{uprel}
 
 %define with_gcj %{!?_without_gcj:1}%{?_without_gcj:0}
@@ -86,7 +86,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc COPYING README
+%doc ChangeLog COPYING README
 %{_javadir}/automaton*.jar
 %if %{with_gcj}
 %{_libdir}/gcj/%{name}
@@ -97,6 +97,9 @@
 %{_javadocdir}/automaton*
 
 %changelog
+* Tue Jan  6 2009 Jerry James <loganjerry at gmail.com> - 1.11r1-1
+- Upgrade to 1.11-1
+
 * Fri Sep 12 2008 Jerry James <loganjerry at gmail.com> - 1.10r5-1
 - Upgrade to 1.10-5
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/automaton/F-10/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	12 Sep 2008 17:43:38 -0000	1.3
+++ sources	6 Jan 2009 23:51:12 -0000	1.4
@@ -1 +1 @@
-63f6778eb5cb77f1c7d64e8710ca8a40  automaton-1.10-5.tar.gz
+e0a3716a32f997214d42824f6278c1ee  automaton-1.11-1.tar.gz



From jjames at fedoraproject.org  Tue Jan  6 23:51:43 2009
From: jjames at fedoraproject.org (Jerry James)
Date: Tue,  6 Jan 2009 23:51:43 +0000 (UTC)
Subject: rpms/automaton/F-9 .cvsignore, 1.2, 1.3 automaton.spec, 1.2,
	1.3 sources, 1.3, 1.4
Message-ID: <20090106235143.1660470108@cvs1.fedora.phx.redhat.com>

Author: jjames

Update of /cvs/pkgs/rpms/automaton/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18020/F-9

Modified Files:
	.cvsignore automaton.spec sources 
Log Message:
* Tue Jan  6 2009 Jerry James <loganjerry at gmail.com> - 1.11r1-1
- Upgrade to 1.11-1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/automaton/F-9/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	12 Sep 2008 17:43:38 -0000	1.2
+++ .cvsignore	6 Jan 2009 23:51:12 -0000	1.3
@@ -1 +1 @@
-automaton-1.10-5.tar.gz
+automaton-1.11-1.tar.gz


Index: automaton.spec
===================================================================
RCS file: /cvs/pkgs/rpms/automaton/F-9/automaton.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- automaton.spec	12 Sep 2008 17:43:38 -0000	1.2
+++ automaton.spec	6 Jan 2009 23:51:12 -0000	1.3
@@ -1,6 +1,6 @@
 # Upstream uses version-release.  Control the madness here.
-%define upver 1.10
-%define uprel 5
+%define upver 1.11
+%define uprel 1
 %define filever %{upver}-%{uprel}
 
 %define with_gcj %{!?_without_gcj:1}%{?_without_gcj:0}
@@ -86,7 +86,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc COPYING README
+%doc ChangeLog COPYING README
 %{_javadir}/automaton*.jar
 %if %{with_gcj}
 %{_libdir}/gcj/%{name}
@@ -97,6 +97,9 @@
 %{_javadocdir}/automaton*
 
 %changelog
+* Tue Jan  6 2009 Jerry James <loganjerry at gmail.com> - 1.11r1-1
+- Upgrade to 1.11-1
+
 * Fri Sep 12 2008 Jerry James <loganjerry at gmail.com> - 1.10r5-1
 - Upgrade to 1.10-5
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/automaton/F-9/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	12 Sep 2008 17:43:38 -0000	1.3
+++ sources	6 Jan 2009 23:51:12 -0000	1.4
@@ -1 +1 @@
-63f6778eb5cb77f1c7d64e8710ca8a40  automaton-1.10-5.tar.gz
+e0a3716a32f997214d42824f6278c1ee  automaton-1.11-1.tar.gz



From jjames at fedoraproject.org  Tue Jan  6 23:51:43 2009
From: jjames at fedoraproject.org (Jerry James)
Date: Tue,  6 Jan 2009 23:51:43 +0000 (UTC)
Subject: rpms/automaton/devel .cvsignore, 1.3, 1.4 automaton.spec, 1.2,
	1.3 sources, 1.3, 1.4
Message-ID: <20090106235143.5DF1C70108@cvs1.fedora.phx.redhat.com>

Author: jjames

Update of /cvs/pkgs/rpms/automaton/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18020/devel

Modified Files:
	.cvsignore automaton.spec sources 
Log Message:
* Tue Jan  6 2009 Jerry James <loganjerry at gmail.com> - 1.11r1-1
- Upgrade to 1.11-1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/automaton/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	12 Sep 2008 17:43:38 -0000	1.3
+++ .cvsignore	6 Jan 2009 23:51:13 -0000	1.4
@@ -1 +1 @@
-automaton-1.10-5.tar.gz
+automaton-1.11-1.tar.gz


Index: automaton.spec
===================================================================
RCS file: /cvs/pkgs/rpms/automaton/devel/automaton.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- automaton.spec	12 Sep 2008 17:43:38 -0000	1.2
+++ automaton.spec	6 Jan 2009 23:51:13 -0000	1.3
@@ -1,6 +1,6 @@
 # Upstream uses version-release.  Control the madness here.
-%define upver 1.10
-%define uprel 5
+%define upver 1.11
+%define uprel 1
 %define filever %{upver}-%{uprel}
 
 %define with_gcj %{!?_without_gcj:1}%{?_without_gcj:0}
@@ -86,7 +86,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc COPYING README
+%doc ChangeLog COPYING README
 %{_javadir}/automaton*.jar
 %if %{with_gcj}
 %{_libdir}/gcj/%{name}
@@ -97,6 +97,9 @@
 %{_javadocdir}/automaton*
 
 %changelog
+* Tue Jan  6 2009 Jerry James <loganjerry at gmail.com> - 1.11r1-1
+- Upgrade to 1.11-1
+
 * Fri Sep 12 2008 Jerry James <loganjerry at gmail.com> - 1.10r5-1
 - Upgrade to 1.10-5
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/automaton/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	12 Sep 2008 17:43:38 -0000	1.3
+++ sources	6 Jan 2009 23:51:13 -0000	1.4
@@ -1 +1 @@
-63f6778eb5cb77f1c7d64e8710ca8a40  automaton-1.10-5.tar.gz
+e0a3716a32f997214d42824f6278c1ee  automaton-1.11-1.tar.gz



From chitlesh at fedoraproject.org  Tue Jan  6 23:52:11 2009
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Tue,  6 Jan 2009 23:52:11 +0000 (UTC)
Subject: rpms/magic/F-9 .cvsignore, 1.9, 1.10 import.log, 1.3, 1.4 magic.spec,
	1.17, 1.18 sources, 1.9, 1.10
Message-ID: <20090106235211.7142070108@cvs1.fedora.phx.redhat.com>

Author: chitlesh

Update of /cvs/pkgs/rpms/magic/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18408/F-9

Modified Files:
	.cvsignore import.log magic.spec sources 
Log Message:
7.5.169


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/magic/F-9/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	29 Dec 2008 15:47:39 -0000	1.9
+++ .cvsignore	6 Jan 2009 23:51:40 -0000	1.10
@@ -1 +1 @@
-magic-7.5.168.tgz
+magic-7.5.169.tgz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/magic/F-9/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- import.log	29 Dec 2008 15:47:39 -0000	1.3
+++ import.log	6 Jan 2009 23:51:41 -0000	1.4
@@ -1,3 +1,4 @@
 magic-7_5_146-1_fc8:F-9:magic-7.5.146-1.fc8.src.rpm:1218807301
 magic-7_5_147-1_fc9:F-9:magic-7.5.147-1.fc9.src.rpm:1220001241
 magic-7_5_168-1_fc10:F-9:magic-7.5.168-1.fc10.src.rpm:1230565420
+magic-7_5_169-1_fc10:F-9:magic-7.5.169-1.fc10.src.rpm:1231285833


Index: magic.spec
===================================================================
RCS file: /cvs/pkgs/rpms/magic/F-9/magic.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- magic.spec	29 Dec 2008 15:47:39 -0000	1.17
+++ magic.spec	6 Jan 2009 23:51:41 -0000	1.18
@@ -1,5 +1,5 @@
 Name:             magic
-Version:          7.5.168
+Version:          7.5.169
 Release:          1%{?dist}
 Summary:          A very capable VLSI layout tool
 
@@ -148,7 +148,10 @@
 
 
 %Changelog
-* Thu Aug 28 2008 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 7.5.168-1
+* Wed Jan 07 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 7.5.169-1
+- new upstream release
+
+* Thu Dec 15 2008 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 7.5.168-1
 - new upstream release
 
 * Thu Aug 28 2008 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 7.5.147-1


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/magic/F-9/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	29 Dec 2008 15:47:39 -0000	1.9
+++ sources	6 Jan 2009 23:51:41 -0000	1.10
@@ -1 +1 @@
-6d7e302a1e7de1c70c35cf7d69161c60  magic-7.5.168.tgz
+7dbff03416d89a51b33384cd9d632723  magic-7.5.169.tgz



From chitlesh at fedoraproject.org  Tue Jan  6 23:53:45 2009
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Tue,  6 Jan 2009 23:53:45 +0000 (UTC)
Subject: rpms/magic/F-10 .cvsignore, 1.9, 1.10 import.log, 1.3,
	1.4 magic.spec, 1.14, 1.15 sources, 1.9, 1.10
Message-ID: <20090106235345.5C1A2700FB@cvs1.fedora.phx.redhat.com>

Author: chitlesh

Update of /cvs/pkgs/rpms/magic/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18965/F-10

Modified Files:
	.cvsignore import.log magic.spec sources 
Log Message:
7.5.169


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/magic/F-10/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	29 Dec 2008 15:49:40 -0000	1.9
+++ .cvsignore	6 Jan 2009 23:53:14 -0000	1.10
@@ -1 +1 @@
-magic-7.5.168.tgz
+magic-7.5.169.tgz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/magic/F-10/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- import.log	29 Dec 2008 15:49:40 -0000	1.3
+++ import.log	6 Jan 2009 23:53:15 -0000	1.4
@@ -1,3 +1,4 @@
 magic-7_5_146-1_fc8:HEAD:magic-7.5.146-1.fc8.src.rpm:1218807766
 magic-7_5_147-1_fc9:HEAD:magic-7.5.147-1.fc9.src.rpm:1220001384
 magic-7_5_168-1_fc10:F-10:magic-7.5.168-1.fc10.src.rpm:1230565722
+magic-7_5_169-1_fc10:F-10:magic-7.5.169-1.fc10.src.rpm:1231285928


Index: magic.spec
===================================================================
RCS file: /cvs/pkgs/rpms/magic/F-10/magic.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- magic.spec	29 Dec 2008 15:49:40 -0000	1.14
+++ magic.spec	6 Jan 2009 23:53:15 -0000	1.15
@@ -1,5 +1,5 @@
 Name:             magic
-Version:          7.5.168
+Version:          7.5.169
 Release:          1%{?dist}
 Summary:          A very capable VLSI layout tool
 
@@ -148,7 +148,10 @@
 
 
 %Changelog
-* Thu Aug 28 2008 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 7.5.168-1
+* Wed Jan 07 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 7.5.169-1
+- new upstream release
+
+* Thu Dec 15 2008 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 7.5.168-1
 - new upstream release
 
 * Thu Aug 28 2008 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 7.5.147-1


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/magic/F-10/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	29 Dec 2008 15:49:40 -0000	1.9
+++ sources	6 Jan 2009 23:53:15 -0000	1.10
@@ -1 +1 @@
-6d7e302a1e7de1c70c35cf7d69161c60  magic-7.5.168.tgz
+7dbff03416d89a51b33384cd9d632723  magic-7.5.169.tgz



From chitlesh at fedoraproject.org  Tue Jan  6 23:55:25 2009
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Tue,  6 Jan 2009 23:55:25 +0000 (UTC)
Subject: rpms/magic/devel .cvsignore, 1.9, 1.10 import.log, 1.3,
	1.4 magic.spec, 1.14, 1.15 sources, 1.9, 1.10
Message-ID: <20090106235525.E3145700FB@cvs1.fedora.phx.redhat.com>

Author: chitlesh

Update of /cvs/pkgs/rpms/magic/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19256/devel

Modified Files:
	.cvsignore import.log magic.spec sources 
Log Message:
7.5.169


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/magic/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	29 Dec 2008 15:53:04 -0000	1.9
+++ .cvsignore	6 Jan 2009 23:54:55 -0000	1.10
@@ -1 +1 @@
-magic-7.5.168.tgz
+magic-7.5.169.tgz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/magic/devel/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- import.log	29 Dec 2008 15:53:04 -0000	1.3
+++ import.log	6 Jan 2009 23:54:55 -0000	1.4
@@ -1,3 +1,4 @@
 magic-7_5_146-1_fc8:HEAD:magic-7.5.146-1.fc8.src.rpm:1218807766
 magic-7_5_147-1_fc9:HEAD:magic-7.5.147-1.fc9.src.rpm:1220001384
 magic-7_5_168-1_fc10:HEAD:magic-7.5.168-1.fc10.src.rpm:1230565927
+magic-7_5_169-1_fc10:HEAD:magic-7.5.169-1.fc10.src.rpm:1231286025


Index: magic.spec
===================================================================
RCS file: /cvs/pkgs/rpms/magic/devel/magic.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- magic.spec	29 Dec 2008 15:53:04 -0000	1.14
+++ magic.spec	6 Jan 2009 23:54:55 -0000	1.15
@@ -1,5 +1,5 @@
 Name:             magic
-Version:          7.5.168
+Version:          7.5.169
 Release:          1%{?dist}
 Summary:          A very capable VLSI layout tool
 
@@ -148,7 +148,10 @@
 
 
 %Changelog
-* Thu Aug 28 2008 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 7.5.168-1
+* Wed Jan 07 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 7.5.169-1
+- new upstream release
+
+* Thu Dec 15 2008 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 7.5.168-1
 - new upstream release
 
 * Thu Aug 28 2008 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 7.5.147-1


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/magic/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	29 Dec 2008 15:53:04 -0000	1.9
+++ sources	6 Jan 2009 23:54:55 -0000	1.10
@@ -1 +1 @@
-6d7e302a1e7de1c70c35cf7d69161c60  magic-7.5.168.tgz
+7dbff03416d89a51b33384cd9d632723  magic-7.5.169.tgz



From pkgdb at fedoraproject.org  Wed Jan  7 00:03:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 07 Jan 2009 00:03:56 +0000
Subject: [pkgdb] dustin-dustismo-fonts was added for slankes
Message-ID: <20090107000356.C139820831C@bastion.fedora.phx.redhat.com>

kevin has added Package dustin-dustismo-fonts with summary General purpose fonts in serif and sans-serif versions
kevin has approved Package dustin-dustismo-fonts
kevin has added a Fedora devel branch for dustin-dustismo-fonts with an owner of slankes
kevin has approved dustin-dustismo-fonts in Fedora devel
kevin has approved Package dustin-dustismo-fonts
kevin has set commit to Approved for provenpackager on dustin-dustismo-fonts (Fedora devel)
kevin has set build to Approved for provenpackager on dustin-dustismo-fonts (Fedora devel)
kevin has set checkout to Approved for provenpackager on dustin-dustismo-fonts (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/dustin-dustismo-fonts



From pkgdb at fedoraproject.org  Wed Jan  7 00:03:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 07 Jan 2009 00:03:59 +0000
Subject: [pkgdb] dustin-dustismo-fonts (Fedora, 9) updated by kevin
Message-ID: <20090107000359.1BACA208421@bastion.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for dustin-dustismo-fonts
kevin has set commit to Approved for provenpackager on dustin-dustismo-fonts (Fedora 9)
kevin has set build to Approved for provenpackager on dustin-dustismo-fonts (Fedora 9)
kevin has set checkout to Approved for provenpackager on dustin-dustismo-fonts (Fedora 9)
kevin approved watchbugzilla on dustin-dustismo-fonts (Fedora 9) for fonts-sig
kevin approved watchcommits on dustin-dustismo-fonts (Fedora 9) for fonts-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/dustin-dustismo-fonts



From pkgdb at fedoraproject.org  Wed Jan  7 00:03:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 07 Jan 2009 00:03:59 +0000
Subject: [pkgdb] dustin-dustismo-fonts (Fedora, devel) updated by kevin
Message-ID: <20090107000359.2FD6E208457@bastion.fedora.phx.redhat.com>

kevin approved watchbugzilla on dustin-dustismo-fonts (Fedora devel) for fonts-sig
kevin approved watchcommits on dustin-dustismo-fonts (Fedora devel) for fonts-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/dustin-dustismo-fonts



From kevin at fedoraproject.org  Wed Jan  7 00:04:15 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  7 Jan 2009 00:04:15 +0000 (UTC)
Subject: rpms/dustin-dustismo-fonts - New directory
Message-ID: <20090107000415.350C870100@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/dustin-dustismo-fonts
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsq22932/rpms/dustin-dustismo-fonts

Log Message:
Directory /cvs/pkgs/rpms/dustin-dustismo-fonts added to the repository




From kevin at fedoraproject.org  Wed Jan  7 00:04:15 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  7 Jan 2009 00:04:15 +0000 (UTC)
Subject: rpms/dustin-dustismo-fonts/devel - New directory
Message-ID: <20090107000415.684EB70100@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/dustin-dustismo-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsq22932/rpms/dustin-dustismo-fonts/devel

Log Message:
Directory /cvs/pkgs/rpms/dustin-dustismo-fonts/devel added to the repository




From pkgdb at fedoraproject.org  Wed Jan  7 00:03:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 07 Jan 2009 00:03:59 +0000
Subject: [pkgdb] dustin-dustismo-fonts (Fedora, 10) updated by kevin
Message-ID: <20090107000359.4C0FF208467@bastion.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for dustin-dustismo-fonts
kevin has set commit to Approved for provenpackager on dustin-dustismo-fonts (Fedora 10)
kevin has set build to Approved for provenpackager on dustin-dustismo-fonts (Fedora 10)
kevin has set checkout to Approved for provenpackager on dustin-dustismo-fonts (Fedora 10)
kevin approved watchbugzilla on dustin-dustismo-fonts (Fedora 10) for fonts-sig
kevin approved watchcommits on dustin-dustismo-fonts (Fedora 10) for fonts-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/dustin-dustismo-fonts



From kevin at fedoraproject.org  Wed Jan  7 00:04:31 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  7 Jan 2009 00:04:31 +0000 (UTC)
Subject: rpms/dustin-dustismo-fonts Makefile,NONE,1.1
Message-ID: <20090107000431.B173870100@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/dustin-dustismo-fonts
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsq22932/rpms/dustin-dustismo-fonts

Added Files:
	Makefile 
Log Message:
Setup of module dustin-dustismo-fonts


--- NEW FILE Makefile ---
# Top level Makefile for module dustin-dustismo-fonts
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Wed Jan  7 00:04:32 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  7 Jan 2009 00:04:32 +0000 (UTC)
Subject: rpms/dustin-dustismo-fonts/devel .cvsignore, NONE, 1.1 Makefile,
	NONE, 1.1 sources, NONE, 1.1
Message-ID: <20090107000432.2E41A70100@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/dustin-dustismo-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsq22932/rpms/dustin-dustismo-fonts/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module dustin-dustismo-fonts


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: dustin-dustismo-fonts
# $Id: Makefile,v 1.1 2009/01/07 00:04:31 kevin Exp $
NAME := dustin-dustismo-fonts
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Wed Jan  7 00:05:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 07 Jan 2009 00:05:12 +0000
Subject: [pkgdb] pyparsing (Fedora EPEL, 4) updated by kevin
Message-ID: <20090107000512.A882E20831C@bastion.fedora.phx.redhat.com>

kevin added a Fedora EPEL 4 branch for pyparsing
kevin has set commit to Approved for provenpackager on pyparsing (Fedora EPEL 4)
kevin has set build to Approved for provenpackager on pyparsing (Fedora EPEL 4)
kevin has set checkout to Approved for provenpackager on pyparsing (Fedora EPEL 4)
kevin changed owner of pyparsing in Fedora EPEL 4 to jamatos
kevin approved watchbugzilla on pyparsing (Fedora EPEL 4) for sharkcz
kevin approved watchcommits on pyparsing (Fedora EPEL 4) for sharkcz
kevin approved commit on pyparsing (Fedora EPEL 4) for sharkcz
kevin approved build on pyparsing (Fedora EPEL 4) for sharkcz
kevin approved approveacls on pyparsing (Fedora EPEL 4) for sharkcz

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pyparsing



From pkgdb at fedoraproject.org  Wed Jan  7 00:05:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 07 Jan 2009 00:05:12 +0000
Subject: [pkgdb] pyparsing (Fedora EPEL, 5) updated by kevin
Message-ID: <20090107000512.E0242208455@bastion.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for pyparsing
kevin has set commit to Approved for provenpackager on pyparsing (Fedora EPEL 5)
kevin has set build to Approved for provenpackager on pyparsing (Fedora EPEL 5)
kevin has set checkout to Approved for provenpackager on pyparsing (Fedora EPEL 5)
kevin changed owner of pyparsing in Fedora EPEL 5 to jamatos
kevin approved watchbugzilla on pyparsing (Fedora EPEL 5) for sharkcz
kevin approved watchcommits on pyparsing (Fedora EPEL 5) for sharkcz
kevin approved commit on pyparsing (Fedora EPEL 5) for sharkcz
kevin approved build on pyparsing (Fedora EPEL 5) for sharkcz
kevin approved approveacls on pyparsing (Fedora EPEL 5) for sharkcz

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pyparsing



From pkgdb at fedoraproject.org  Wed Jan  7 00:08:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 07 Jan 2009 00:08:10 +0000
Subject: [pkgdb] pp3 was added for mmahut
Message-ID: <20090107000810.AF03920831F@bastion.fedora.phx.redhat.com>

kevin has added Package pp3 with summary Creation of sky charts in Postscript or PDF format
kevin has approved Package pp3
kevin has added a Fedora devel branch for pp3 with an owner of mmahut
kevin has approved pp3 in Fedora devel
kevin has approved Package pp3
kevin has set commit to Approved for provenpackager on pp3 (Fedora devel)
kevin has set build to Approved for provenpackager on pp3 (Fedora devel)
kevin has set checkout to Approved for provenpackager on pp3 (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pp3



From pkgdb at fedoraproject.org  Wed Jan  7 00:08:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 07 Jan 2009 00:08:12 +0000
Subject: [pkgdb] pp3 (Fedora, 9) updated by kevin
Message-ID: <20090107000812.8AD49208456@bastion.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for pp3
kevin has set commit to Approved for provenpackager on pp3 (Fedora 9)
kevin has set build to Approved for provenpackager on pp3 (Fedora 9)
kevin has set checkout to Approved for provenpackager on pp3 (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pp3



From pkgdb at fedoraproject.org  Wed Jan  7 00:08:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 07 Jan 2009 00:08:12 +0000
Subject: [pkgdb] pp3 (Fedora, 10) updated by kevin
Message-ID: <20090107000813.3951E208466@bastion.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for pp3
kevin has set commit to Approved for provenpackager on pp3 (Fedora 10)
kevin has set build to Approved for provenpackager on pp3 (Fedora 10)
kevin has set checkout to Approved for provenpackager on pp3 (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pp3



From kevin at fedoraproject.org  Wed Jan  7 00:08:27 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  7 Jan 2009 00:08:27 +0000 (UTC)
Subject: rpms/pp3 - New directory
Message-ID: <20090107000827.218FB70100@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/pp3
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsk24462/rpms/pp3

Log Message:
Directory /cvs/pkgs/rpms/pp3 added to the repository




From kevin at fedoraproject.org  Wed Jan  7 00:08:27 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  7 Jan 2009 00:08:27 +0000 (UTC)
Subject: rpms/pp3/devel - New directory
Message-ID: <20090107000827.5A43470100@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/pp3/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsk24462/rpms/pp3/devel

Log Message:
Directory /cvs/pkgs/rpms/pp3/devel added to the repository




From pkgdb at fedoraproject.org  Wed Jan  7 00:08:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 07 Jan 2009 00:08:12 +0000
Subject: [pkgdb] pp3 (Fedora EPEL, 5) updated by kevin
Message-ID: <20090107000816.16988208317@bastion.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for pp3
kevin has set commit to Approved for provenpackager on pp3 (Fedora EPEL 5)
kevin has set build to Approved for provenpackager on pp3 (Fedora EPEL 5)
kevin has set checkout to Approved for provenpackager on pp3 (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pp3



From kevin at fedoraproject.org  Wed Jan  7 00:08:42 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  7 Jan 2009 00:08:42 +0000 (UTC)
Subject: rpms/pp3 Makefile,NONE,1.1
Message-ID: <20090107000842.7C31270100@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/pp3
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsk24462/rpms/pp3

Added Files:
	Makefile 
Log Message:
Setup of module pp3


--- NEW FILE Makefile ---
# Top level Makefile for module pp3
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Jan  7 00:08:42 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  7 Jan 2009 00:08:42 +0000 (UTC)
Subject: rpms/pp3/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <20090107000842.E057470100@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/pp3/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsk24462/rpms/pp3/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module pp3


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: pp3
# $Id: Makefile,v 1.1 2009/01/07 00:08:42 kevin Exp $
NAME := pp3
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Jan  7 00:09:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 07 Jan 2009 00:09:15 +0000
Subject: [pkgdb] cdk was added for mmahut
Message-ID: <20090107000915.49BB6208455@bastion.fedora.phx.redhat.com>

kevin has added Package cdk with summary Curses Development Kit
kevin has approved Package cdk
kevin has added a Fedora devel branch for cdk with an owner of mmahut
kevin has approved cdk in Fedora devel
kevin has approved Package cdk
kevin has set commit to Approved for provenpackager on cdk (Fedora devel)
kevin has set build to Approved for provenpackager on cdk (Fedora devel)
kevin has set checkout to Approved for provenpackager on cdk (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cdk



From pkgdb at fedoraproject.org  Wed Jan  7 00:09:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 07 Jan 2009 00:09:16 +0000
Subject: [pkgdb] cdk (Fedora, 9) updated by kevin
Message-ID: <20090107000916.755D4208466@bastion.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for cdk
kevin has set commit to Approved for provenpackager on cdk (Fedora 9)
kevin has set build to Approved for provenpackager on cdk (Fedora 9)
kevin has set checkout to Approved for provenpackager on cdk (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cdk



From pkgdb at fedoraproject.org  Wed Jan  7 00:09:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 07 Jan 2009 00:09:16 +0000
Subject: [pkgdb] cdk (Fedora, 10) updated by kevin
Message-ID: <20090107000916.7DED5208469@bastion.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for cdk
kevin has set commit to Approved for provenpackager on cdk (Fedora 10)
kevin has set build to Approved for provenpackager on cdk (Fedora 10)
kevin has set checkout to Approved for provenpackager on cdk (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cdk



From pkgdb at fedoraproject.org  Wed Jan  7 00:09:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 07 Jan 2009 00:09:16 +0000
Subject: [pkgdb] cdk (Fedora EPEL, 5) updated by kevin
Message-ID: <20090107000916.8EA5120846C@bastion.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for cdk
kevin has set commit to Approved for provenpackager on cdk (Fedora EPEL 5)
kevin has set build to Approved for provenpackager on cdk (Fedora EPEL 5)
kevin has set checkout to Approved for provenpackager on cdk (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cdk



From kevin at fedoraproject.org  Wed Jan  7 00:09:31 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  7 Jan 2009 00:09:31 +0000 (UTC)
Subject: rpms/cdk - New directory
Message-ID: <20090107000931.2839770100@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/cdk
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsZ24955/rpms/cdk

Log Message:
Directory /cvs/pkgs/rpms/cdk added to the repository




From kevin at fedoraproject.org  Wed Jan  7 00:09:31 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  7 Jan 2009 00:09:31 +0000 (UTC)
Subject: rpms/cdk/devel - New directory
Message-ID: <20090107000931.5E0DF70142@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/cdk/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsZ24955/rpms/cdk/devel

Log Message:
Directory /cvs/pkgs/rpms/cdk/devel added to the repository




From kevin at fedoraproject.org  Wed Jan  7 00:09:46 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  7 Jan 2009 00:09:46 +0000 (UTC)
Subject: rpms/cdk Makefile,NONE,1.1
Message-ID: <20090107000946.8205270100@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/cdk
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsZ24955/rpms/cdk

Added Files:
	Makefile 
Log Message:
Setup of module cdk


--- NEW FILE Makefile ---
# Top level Makefile for module cdk
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Jan  7 00:09:46 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  7 Jan 2009 00:09:46 +0000 (UTC)
Subject: rpms/cdk/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <20090107000946.CE0D870100@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/cdk/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsZ24955/rpms/cdk/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module cdk


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: cdk
# $Id: Makefile,v 1.1 2009/01/07 00:09:46 kevin Exp $
NAME := cdk
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Jan  7 00:11:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 07 Jan 2009 00:11:09 +0000
Subject: [pkgdb] nightview was added for lkundrak
Message-ID: <20090107001109.45A6920831D@bastion.fedora.phx.redhat.com>

kevin has added Package nightview with summary Software package to control a CCD camera
kevin has approved Package nightview
kevin has added a Fedora devel branch for nightview with an owner of lkundrak
kevin has approved nightview in Fedora devel
kevin has approved Package nightview
kevin has set commit to Approved for provenpackager on nightview (Fedora devel)
kevin has set build to Approved for provenpackager on nightview (Fedora devel)
kevin has set checkout to Approved for provenpackager on nightview (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/nightview



From pkgdb at fedoraproject.org  Wed Jan  7 00:11:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 07 Jan 2009 00:11:16 +0000
Subject: [pkgdb] nightview (Fedora EPEL, 5) updated by kevin
Message-ID: <20090107001116.264DC208421@bastion.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for nightview
kevin has set commit to Approved for provenpackager on nightview (Fedora EPEL 5)
kevin has set build to Approved for provenpackager on nightview (Fedora EPEL 5)
kevin has set checkout to Approved for provenpackager on nightview (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/nightview



From pkgdb at fedoraproject.org  Wed Jan  7 00:11:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 07 Jan 2009 00:11:16 +0000
Subject: [pkgdb] nightview (Fedora, 10) updated by kevin
Message-ID: <20090107001116.34DD1208457@bastion.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for nightview
kevin has set commit to Approved for provenpackager on nightview (Fedora 10)
kevin has set build to Approved for provenpackager on nightview (Fedora 10)
kevin has set checkout to Approved for provenpackager on nightview (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/nightview



From kevin at fedoraproject.org  Wed Jan  7 00:11:27 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  7 Jan 2009 00:11:27 +0000 (UTC)
Subject: rpms/nightview - New directory
Message-ID: <20090107001127.2B78770100@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/nightview
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsJ25711/rpms/nightview

Log Message:
Directory /cvs/pkgs/rpms/nightview added to the repository




From kevin at fedoraproject.org  Wed Jan  7 00:11:27 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  7 Jan 2009 00:11:27 +0000 (UTC)
Subject: rpms/nightview/devel - New directory
Message-ID: <20090107001127.6456370100@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/nightview/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsJ25711/rpms/nightview/devel

Log Message:
Directory /cvs/pkgs/rpms/nightview/devel added to the repository




From kevin at fedoraproject.org  Wed Jan  7 00:11:43 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  7 Jan 2009 00:11:43 +0000 (UTC)
Subject: rpms/nightview Makefile,NONE,1.1
Message-ID: <20090107001143.D84C470100@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/nightview
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsJ25711/rpms/nightview

Added Files:
	Makefile 
Log Message:
Setup of module nightview


--- NEW FILE Makefile ---
# Top level Makefile for module nightview
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Jan  7 00:11:44 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  7 Jan 2009 00:11:44 +0000 (UTC)
Subject: rpms/nightview/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090107001144.59B6570100@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/nightview/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsJ25711/rpms/nightview/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module nightview


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: nightview
# $Id: Makefile,v 1.1 2009/01/07 00:11:44 kevin Exp $
NAME := nightview
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Jan  7 00:12:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 07 Jan 2009 00:12:00 +0000
Subject: [pkgdb] dhcping (Fedora EPEL, 5) updated by kevin
Message-ID: <20090107001200.51812208455@bastion.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for dhcping
kevin has set commit to Approved for provenpackager on dhcping (Fedora EPEL 5)
kevin has set build to Approved for provenpackager on dhcping (Fedora EPEL 5)
kevin has set checkout to Approved for provenpackager on dhcping (Fedora EPEL 5)
kevin changed owner of dhcping in Fedora EPEL 5 to fab

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/dhcping



From bpepple at fedoraproject.org  Wed Jan  7 00:16:47 2009
From: bpepple at fedoraproject.org (Brian Pepple)
Date: Wed,  7 Jan 2009 00:16:47 +0000 (UTC)
Subject: rpms/telepathy-gabble/devel .cvsignore, 1.36, 1.37 sources, 1.36,
	1.37 telepathy-gabble.spec, 1.45, 1.46
Message-ID: <20090107001647.B218570100@cvs1.fedora.phx.redhat.com>

Author: bpepple

Update of /cvs/pkgs/rpms/telepathy-gabble/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26757

Modified Files:
	.cvsignore sources telepathy-gabble.spec 
Log Message:
* Tue Jan  6 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.7.18-1
- Update to 0.7.18.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-gabble/devel/.cvsignore,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- .cvsignore	14 Dec 2008 19:26:26 -0000	1.36
+++ .cvsignore	7 Jan 2009 00:16:16 -0000	1.37
@@ -1 +1 @@
-telepathy-gabble-0.7.17.tar.gz
+telepathy-gabble-0.7.18.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-gabble/devel/sources,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- sources	14 Dec 2008 19:26:26 -0000	1.36
+++ sources	7 Jan 2009 00:16:17 -0000	1.37
@@ -1 +1 @@
-383aa5dc559464542db4a2dc27cefe23  telepathy-gabble-0.7.17.tar.gz
+807260037be70882be3bcdb6b26ff031  telepathy-gabble-0.7.18.tar.gz


Index: telepathy-gabble.spec
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-gabble/devel/telepathy-gabble.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- telepathy-gabble.spec	14 Dec 2008 19:26:26 -0000	1.45
+++ telepathy-gabble.spec	7 Jan 2009 00:16:17 -0000	1.46
@@ -1,5 +1,5 @@
 Name:           telepathy-gabble
-Version:        0.7.17
+Version:        0.7.18
 Release:        1%{?dist}
 Summary:        A Jabber/XMPP connection manager
 
@@ -57,6 +57,9 @@
 
 
 %changelog
+* Tue Jan  6 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.7.18-1
+- Update to 0.7.18.
+
 * Sun Dec 14 2008 Brian Pepple <bpepple at fedoraproject.org> - 0.7.17-1
 - Update to 0.7.17.
 



From jjames at fedoraproject.org  Wed Jan  7 00:22:34 2009
From: jjames at fedoraproject.org (Jerry James)
Date: Wed,  7 Jan 2009 00:22:34 +0000 (UTC)
Subject: rpms/latexmk/F-10 .cvsignore, 1.6, 1.7 latexmk-conf.patch, 1.5,
	1.6 latexmk.spec, 1.7, 1.8 sources, 1.6, 1.7
Message-ID: <20090107002234.BD8C970100@cvs1.fedora.phx.redhat.com>

Author: jjames

Update of /cvs/pkgs/rpms/latexmk/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28541/F-10

Modified Files:
	.cvsignore latexmk-conf.patch latexmk.spec sources 
Log Message:
* Tue Jan  6 2009 Jerry James <loganjerry at gmail.com> - 4.03-1
- Update to 4.03 to fix log file parsing



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/latexmk/F-10/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	1 Dec 2008 20:40:53 -0000	1.6
+++ .cvsignore	7 Jan 2009 00:22:03 -0000	1.7
@@ -1 +1 @@
-latexmk-402b.zip
+latexmk-403.zip

latexmk-conf.patch:

Index: latexmk-conf.patch
===================================================================
RCS file: /cvs/pkgs/rpms/latexmk/F-10/latexmk-conf.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- latexmk-conf.patch	1 Dec 2008 20:40:53 -0000	1.5
+++ latexmk-conf.patch	7 Jan 2009 00:22:03 -0000	1.6
@@ -1,10 +1,10 @@
-diff -dur latexmk-4.02b.ORIG/latexmk.1 latexmk-4.02b/latexmk.1
---- latexmk-4.02b.ORIG/latexmk.1	2008-12-01 11:56:01.000000000 -0700
-+++ latexmk-4.02b/latexmk.1	2008-12-01 13:08:00.000000000 -0700
+diff -dur latexmk-4.03.ORIG/latexmk.1 latexmk-4.03/latexmk.1
+--- latexmk-4.03.ORIG/latexmk.1	2008-12-22 15:49:44.000000000 -0700
++++ latexmk-4.03/latexmk.1	2009-01-06 17:17:34.000000000 -0700
 @@ -1,9 +1,9 @@
--.TH LATEXMK 1L "1 December 2008" ""
+-.TH LATEXMK 1L "22 December 2008" ""
 -.SH NAME
-+.TH "LATEXMK" "1L" "1 December 2008" "" ""
++.TH "LATEXMK" "1L" "22 December 2008" "" ""
 +.SH "NAME"
  latexmk \- generate LaTeX document
 -.SH SYNOPSIS
@@ -1722,9 +1722,9 @@
 -.SH AUTHOR
 +.SH "AUTHOR"
  Current version, by John Collins (username collins at node phys.psu.edu).
- (Version 4.01a).
+ (Version 4.03).
  
- Released version (last was 4.01) can be obtained from CTAN:
+ Released version can be obtained from CTAN:
 -<http://www.tug.org/tex-archive/support/latexmk/>, and from the
 +<http://www.tug.org/tex\-archive/support/latexmk/>, and from the
  author's website <http://www.phys.psu.edu/~collins/software/latexmk/>.
@@ -1736,10 +1736,10 @@
  Original script called "go" by David J. Musliner (RCS Version 3.2)
  
  \"  LocalWords:  fR fIlatexmk dvi ps fILatexmk pdflatex bibtex makeindex fB pv
-diff -dur latexmk-4.02b.ORIG/latexmk.pl latexmk-4.02b/latexmk.pl
---- latexmk-4.02b.ORIG/latexmk.pl	2008-12-01 11:54:20.000000000 -0700
-+++ latexmk-4.02b/latexmk.pl	2008-12-01 13:04:12.000000000 -0700
-@@ -680,10 +680,8 @@
+diff -dur latexmk-4.03.ORIG/latexmk.pl latexmk-4.03/latexmk.pl
+--- latexmk-4.03.ORIG/latexmk.pl	2008-12-22 15:49:28.000000000 -0700
++++ latexmk-4.03/latexmk.pl	2009-01-06 17:16:31.000000000 -0700
+@@ -689,10 +689,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.spec
===================================================================
RCS file: /cvs/pkgs/rpms/latexmk/F-10/latexmk.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- latexmk.spec	1 Dec 2008 20:40:53 -0000	1.7
+++ latexmk.spec	7 Jan 2009 00:22:04 -0000	1.8
@@ -1,12 +1,12 @@
 Name:           latexmk
-Version:        4.02b
+Version:        4.03
 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-402b.zip
+Source0:        http://www.phys.psu.edu/~collins/software/latexmk-jcc/latexmk-403.zip
 Source1:        latexmk.conf
 Source2:        latexmk-README.fedora
 # Change the system-wide configuration file to /etc/latexmk.conf and fix the
@@ -58,6 +58,9 @@
 %doc CHANGES COPYING INSTALL README README.fedora extra-scripts
 
 %changelog
+* Tue Jan  6 2009 Jerry James <loganjerry at gmail.com> - 4.03-1
+- Update to 4.03 to fix log file parsing
+
 * Mon Dec  1 2008 Jerry James <loganjerry at gmail.com> - 4.02b-1
 - Update to 4.02b to fix bz 473430
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/latexmk/F-10/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	1 Dec 2008 20:40:53 -0000	1.6
+++ sources	7 Jan 2009 00:22:04 -0000	1.7
@@ -1 +1 @@
-8ec3792d8e557eaf6949522ab5e2deae  latexmk-402b.zip
+7925dadf697d1832f225d04e4ce445c2  latexmk-403.zip



From nbecker at fedoraproject.org  Wed Jan  7 00:22:52 2009
From: nbecker at fedoraproject.org (Neal Becker)
Date: Wed,  7 Jan 2009 00:22:52 +0000 (UTC)
Subject: rpms/kdiff3/devel .cvsignore, 1.4, 1.5 kdiff3.spec, 1.18,
	1.19 sources, 1.4, 1.5
Message-ID: <20090107002252.A51F870100@cvs1.fedora.phx.redhat.com>

Author: nbecker

Update of /cvs/pkgs/rpms/kdiff3/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28766

Modified Files:
	.cvsignore kdiff3.spec sources 
Log Message:
Update to 0.9.93-2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdiff3/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	6 Jan 2009 16:56:46 -0000	1.4
+++ .cvsignore	7 Jan 2009 00:22:21 -0000	1.5
@@ -1 +1 @@
-kdiff3-0.9.93.tar.gz
+kdiff3-0.9.93-2.tar.gz


Index: kdiff3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdiff3/devel/kdiff3.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- kdiff3.spec	6 Jan 2009 19:20:43 -0000	1.18
+++ kdiff3.spec	7 Jan 2009 00:22:22 -0000	1.19
@@ -1,12 +1,14 @@
 Name:           kdiff3
 Version:        0.9.93
-Release: 	6%{?dist}
+%define inc 2
+%define realname %{name}-%{version}-%{inc}
+Release: 	1.%{inc}%{?dist}
 Summary:        Compare + merge 2 or 3 files or directories
 
 Group:          Development/Tools
 License:        GPLv2
 URL:            http://kdiff3.sourceforge.net/
-Source0:        http://downloads.sourceforge.net/sourceforge/kdiff3/%{name}-%{version}.tar.gz
+Source0:        http://downloads.sourceforge.net/sourceforge/kdiff3/%{realname}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # What's the purpose of this patch?  -- Rex 
@@ -28,7 +30,7 @@
 
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{version}
 %patch0 -p1
 
 
@@ -110,6 +112,9 @@
 
 
 %changelog
+* Tue Jan  6 2009 Neal Becker <ndbecker2 at gmail.com> - 0.9.93-2-1
+- Update to 0.9.93-2
+
 * Tue Jan  6 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.9.93-6
 - use kde4 macros
 - add scriptlets for locolor icons


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdiff3/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	6 Jan 2009 16:56:46 -0000	1.4
+++ sources	7 Jan 2009 00:22:22 -0000	1.5
@@ -1 +1 @@
-3f225daebc7f94e237d66edabf2e39ab  kdiff3-0.9.93.tar.gz
+30b4cbf8592c83170d95e984b4047709  kdiff3-0.9.93-2.tar.gz



From jjames at fedoraproject.org  Wed Jan  7 00:22:35 2009
From: jjames at fedoraproject.org (Jerry James)
Date: Wed,  7 Jan 2009 00:22:35 +0000 (UTC)
Subject: rpms/latexmk/devel .cvsignore, 1.6, 1.7 latexmk-conf.patch, 1.5,
	1.6 latexmk.spec, 1.7, 1.8 sources, 1.6, 1.7
Message-ID: <20090107002235.0742570100@cvs1.fedora.phx.redhat.com>

Author: jjames

Update of /cvs/pkgs/rpms/latexmk/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28541/devel

Modified Files:
	.cvsignore latexmk-conf.patch latexmk.spec sources 
Log Message:
* Tue Jan  6 2009 Jerry James <loganjerry at gmail.com> - 4.03-1
- Update to 4.03 to fix log file parsing



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/latexmk/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	1 Dec 2008 20:40:53 -0000	1.6
+++ .cvsignore	7 Jan 2009 00:22:04 -0000	1.7
@@ -1 +1 @@
-latexmk-402b.zip
+latexmk-403.zip

latexmk-conf.patch:

Index: latexmk-conf.patch
===================================================================
RCS file: /cvs/pkgs/rpms/latexmk/devel/latexmk-conf.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- latexmk-conf.patch	1 Dec 2008 20:40:53 -0000	1.5
+++ latexmk-conf.patch	7 Jan 2009 00:22:04 -0000	1.6
@@ -1,10 +1,10 @@
-diff -dur latexmk-4.02b.ORIG/latexmk.1 latexmk-4.02b/latexmk.1
---- latexmk-4.02b.ORIG/latexmk.1	2008-12-01 11:56:01.000000000 -0700
-+++ latexmk-4.02b/latexmk.1	2008-12-01 13:08:00.000000000 -0700
+diff -dur latexmk-4.03.ORIG/latexmk.1 latexmk-4.03/latexmk.1
+--- latexmk-4.03.ORIG/latexmk.1	2008-12-22 15:49:44.000000000 -0700
++++ latexmk-4.03/latexmk.1	2009-01-06 17:17:34.000000000 -0700
 @@ -1,9 +1,9 @@
--.TH LATEXMK 1L "1 December 2008" ""
+-.TH LATEXMK 1L "22 December 2008" ""
 -.SH NAME
-+.TH "LATEXMK" "1L" "1 December 2008" "" ""
++.TH "LATEXMK" "1L" "22 December 2008" "" ""
 +.SH "NAME"
  latexmk \- generate LaTeX document
 -.SH SYNOPSIS
@@ -1722,9 +1722,9 @@
 -.SH AUTHOR
 +.SH "AUTHOR"
  Current version, by John Collins (username collins at node phys.psu.edu).
- (Version 4.01a).
+ (Version 4.03).
  
- Released version (last was 4.01) can be obtained from CTAN:
+ Released version can be obtained from CTAN:
 -<http://www.tug.org/tex-archive/support/latexmk/>, and from the
 +<http://www.tug.org/tex\-archive/support/latexmk/>, and from the
  author's website <http://www.phys.psu.edu/~collins/software/latexmk/>.
@@ -1736,10 +1736,10 @@
  Original script called "go" by David J. Musliner (RCS Version 3.2)
  
  \"  LocalWords:  fR fIlatexmk dvi ps fILatexmk pdflatex bibtex makeindex fB pv
-diff -dur latexmk-4.02b.ORIG/latexmk.pl latexmk-4.02b/latexmk.pl
---- latexmk-4.02b.ORIG/latexmk.pl	2008-12-01 11:54:20.000000000 -0700
-+++ latexmk-4.02b/latexmk.pl	2008-12-01 13:04:12.000000000 -0700
-@@ -680,10 +680,8 @@
+diff -dur latexmk-4.03.ORIG/latexmk.pl latexmk-4.03/latexmk.pl
+--- latexmk-4.03.ORIG/latexmk.pl	2008-12-22 15:49:28.000000000 -0700
++++ latexmk-4.03/latexmk.pl	2009-01-06 17:16:31.000000000 -0700
+@@ -689,10 +689,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.spec
===================================================================
RCS file: /cvs/pkgs/rpms/latexmk/devel/latexmk.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- latexmk.spec	1 Dec 2008 20:40:54 -0000	1.7
+++ latexmk.spec	7 Jan 2009 00:22:04 -0000	1.8
@@ -1,12 +1,12 @@
 Name:           latexmk
-Version:        4.02b
+Version:        4.03
 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-402b.zip
+Source0:        http://www.phys.psu.edu/~collins/software/latexmk-jcc/latexmk-403.zip
 Source1:        latexmk.conf
 Source2:        latexmk-README.fedora
 # Change the system-wide configuration file to /etc/latexmk.conf and fix the
@@ -58,6 +58,9 @@
 %doc CHANGES COPYING INSTALL README README.fedora extra-scripts
 
 %changelog
+* Tue Jan  6 2009 Jerry James <loganjerry at gmail.com> - 4.03-1
+- Update to 4.03 to fix log file parsing
+
 * Mon Dec  1 2008 Jerry James <loganjerry at gmail.com> - 4.02b-1
 - Update to 4.02b to fix bz 473430
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/latexmk/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	1 Dec 2008 20:40:54 -0000	1.6
+++ sources	7 Jan 2009 00:22:04 -0000	1.7
@@ -1 +1 @@
-8ec3792d8e557eaf6949522ab5e2deae  latexmk-402b.zip
+7925dadf697d1832f225d04e4ce445c2  latexmk-403.zip



From transif at fedoraproject.org  Wed Jan  7 00:49:34 2009
From: transif at fedoraproject.org (Transifex System User)
Date: Wed,  7 Jan 2009 00:49:34 +0000 (UTC)
Subject: comps/po ko.po,1.20,1.21
Message-ID: <20090107004934.8F5D170100@cvs1.fedora.phx.redhat.com>

Author: transif

Update of /cvs/pkgs/comps/po
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2273/po

Modified Files:
	ko.po 
Log Message:
    2009-01-07  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.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- ko.po	22 Dec 2008 20:51:53 -0000	1.20
+++ ko.po	7 Jan 2009 00:48:59 -0000	1.21
@@ -5,20 +5,21 @@
 # Michelle Kim <mkim at redhat.com>, 2002.
 # Michelle J Kim <mkim at redhat.com>, 2003,2004.
 # Michelle Ji Yeen Kim <mkim at redhat.com>, 2005.
-# Eunju Kim <eukim at redhat.com>, 2006, 2008.
+# Eunju Kim <eukim at redhat.com>, 2006, 2008, 2009.
 msgid ""
 msgstr ""
 "Project-Id-Version: comps.HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-22 15:50-0500\n"
-"PO-Revision-Date: 2008-12-19 14:00+1000\n"
+"POT-Creation-Date: 2009-01-06 01:34+0000\n"
+"PO-Revision-Date: 2009-01-07 10:46+1000\n"
 "Last-Translator: Eunju Kim <eukim at redhat.com>\n"
 "Language-Team: Korean <ko at li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
-"Plural-Forms:  nplurals=2; plural=(n!=1);\n"
+"Plural-Forms:  nplurals=2; plural=(n!=1);\n\n"
+"\n"
 "\n"
 "\n"
 "\n"
@@ -412,36 +413,30 @@
 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-f11.xml.in.h:83
 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-f11.xml.in.h:84 ../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 ../comps-f11.xml.in.h:85
-msgid ""
-"Install these tools to enable the system to print or act as a print server."
-msgstr ""
-"??????????????? ?????? ????????? ????????? ????????? ?????? ???????????? ??? ????????? ??????????????????."
+msgid "Install these tools to enable the system to print or act as a print server."
+msgstr "??????????????? ?????? ????????? ????????? ????????? ?????? ???????????? ??? ????????? ??????????????????."
 
 #: ../comps-f7.xml.in.h:75 ../comps-f8.xml.in.h:78 ../comps-f9.xml.in.h:79
 #: ../comps-f10.xml.in.h:82 ../comps-f11.xml.in.h:86 ../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) ????????? ?????????????????? ?????????????????? ??? ????????? ????????? ???????????????"
 "???."
@@ -689,8 +684,7 @@
 #: ../comps-f7.xml.in.h:121 ../comps-f8.xml.in.h:130 ../comps-f9.xml.in.h:137
 #: ../comps-f10.xml.in.h:145 ../comps-f11.xml.in.h:152
 #: ../comps-el4.xml.in.h:42 ../comps-el5.xml.in.h:42
-msgid ""
-"Simple window managers that aren't part of a larger desktop environment."
+msgid "Simple window managers that aren't part of a larger desktop environment."
 msgstr "?????? ???????????? ????????? ???????????? ?????? ????????? ????????? ??????????????????. "
 
 #: ../comps-f7.xml.in.h:122 ../comps-f8.xml.in.h:131 ../comps-f9.xml.in.h:138
@@ -816,15 +810,12 @@
 #: ../comps-f10.xml.in.h:170 ../comps-f11.xml.in.h:177
 #: ../comps-el4.xml.in.h:51 ../comps-el5.xml.in.h:49
 msgid "The applications include office suites, PDF viewers, and more."
-msgstr ""
-"??? ?????? ??????????????? ????????? ???????????? ??????, PDF ?????? ???????????? ?????? ???????????????."
+msgstr "??? ?????? ??????????????? ????????? ???????????? ??????, PDF ?????? ???????????? ?????? ???????????????."
 
 #: ../comps-f7.xml.in.h:145 ../comps-f8.xml.in.h:153 ../comps-f9.xml.in.h:160
 #: ../comps-f10.xml.in.h:171 ../comps-f11.xml.in.h:178
-msgid ""
-"The packages in this group are core libraries needed to develop applications."
-msgstr ""
-"??? ????????? ????????? ?????? ??????????????? ??????????????? ????????? ?????? ????????????????????????."
+msgid "The packages in this group are core libraries needed to develop applications."
+msgstr "??? ????????? ????????? ?????? ??????????????? ??????????????? ????????? ?????? ????????????????????????."
 
 #: ../comps-f7.xml.in.h:146 ../comps-f8.xml.in.h:154 ../comps-f9.xml.in.h:161
 #: ../comps-f10.xml.in.h:172 ../comps-f11.xml.in.h:179
@@ -834,21 +825,18 @@
 
 #: ../comps-f7.xml.in.h:147 ../comps-f8.xml.in.h:155 ../comps-f9.xml.in.h:162
 #: ../comps-f10.xml.in.h:173 ../comps-f11.xml.in.h:180
-msgid ""
-"These packages allow you to develop applications for the X Window System."
+msgid "These packages allow you to develop applications for the X Window System."
 msgstr "??? ???????????? X ????????? ???????????? ?????? ???????????? ????????? ???????????????."
 
 #: ../comps-f7.xml.in.h:148 ../comps-f8.xml.in.h:156 ../comps-f9.xml.in.h:163
 #: ../comps-f10.xml.in.h:174 ../comps-f11.xml.in.h:181
 #: ../comps-el4.xml.in.h:53 ../comps-el5.xml.in.h:51
-msgid ""
-"These packages are helpful when developing web applications or web pages."
+msgid "These packages are helpful when developing web applications or web pages."
 msgstr "??? ???????????? ??? ?????? ?????????????????? ??? ????????? ????????? ???????????????. "
 
 #: ../comps-f7.xml.in.h:149 ../comps-f8.xml.in.h:157 ../comps-f9.xml.in.h:164
 #: ../comps-f10.xml.in.h:175 ../comps-f11.xml.in.h:182
-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??? ?????? ????????????-?????? ????????? ???????????? ?????????"
 "???."
@@ -919,8 +907,7 @@
 #: ../comps-f7.xml.in.h:159 ../comps-f8.xml.in.h:167 ../comps-f9.xml.in.h:174
 #: ../comps-f10.xml.in.h:185 ../comps-f11.xml.in.h:192
 msgid "This group contains all of Red Hat's custom server configuration tools."
-msgstr ""
-"??? ???????????? Red Hat??? ????????? ?????? ?????? ?????? ????????? ?????? ???????????? ????????????."
+msgstr "??? ???????????? Red Hat??? ????????? ?????? ?????? ?????? ????????? ?????? ???????????? ????????????."
 
 #: ../comps-f7.xml.in.h:160 ../comps-f8.xml.in.h:168 ../comps-f9.xml.in.h:175
 #: ../comps-f10.xml.in.h:186 ../comps-f11.xml.in.h:193
@@ -976,15 +963,13 @@
 #: ../comps-f7.xml.in.h:166 ../comps-f8.xml.in.h:174 ../comps-f9.xml.in.h:181
 #: ../comps-f10.xml.in.h:192 ../comps-f11.xml.in.h:199
 #: ../comps-el4.xml.in.h:66 ../comps-el5.xml.in.h:64
-msgid ""
-"This group is a collection of tools and resources of Armenian environments."
+msgid "This group is a collection of tools and resources of Armenian environments."
 msgstr "??? ????????? ?????????????????? ????????? ?????? ?????? ??? ?????? ???????????????. "
 
 #: ../comps-f7.xml.in.h:167 ../comps-f8.xml.in.h:175 ../comps-f9.xml.in.h:182
 #: ../comps-f10.xml.in.h:193 ../comps-f11.xml.in.h:200
 #: ../comps-el4.xml.in.h:69 ../comps-el5.xml.in.h:68
-msgid ""
-"This group is a collection of tools for various hardware specific utilities."
+msgid "This group is a collection of tools for various hardware specific utilities."
 msgstr "??? ????????? ?????? ???????????? ??????????????? ?????? ?????? ???????????????. "
 
 #: ../comps-f7.xml.in.h:168 ../comps-f8.xml.in.h:176 ../comps-f9.xml.in.h:183
@@ -999,8 +984,7 @@
 
 #: ../comps-f7.xml.in.h:169 ../comps-f8.xml.in.h:177 ../comps-f9.xml.in.h:184
 #: ../comps-f10.xml.in.h:195 ../comps-f11.xml.in.h:203
-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)??? ???????????? ??? ???"
 "?????????."
@@ -1287,50 +1271,42 @@
 msgstr "??????????????? ??????  "
 
 #: ../comps-f11.xml.in.h:5
-#, fuzzy
 msgid "Amazigh Support"
-msgstr "????????? ??????"
+msgstr "??????????????? ?????? "
 
 #: ../comps-f11.xml.in.h:54
 msgid "Font design and packaging"
 msgstr "?????? ????????? ??? ????????? "
 
 #: ../comps-f11.xml.in.h:58
-#, fuzzy
 msgid "Frisian Support"
-msgstr "??????????????? ??????  "
+msgstr "??????????????? ??????   "
 
 #: ../comps-f11.xml.in.h:59
-#, fuzzy
 msgid "Friulian Support"
-msgstr "???????????? ?????? "
+msgstr "?????????????????? ??????   "
 
 #: ../comps-f11.xml.in.h:101
-#, fuzzy
 msgid "Kinyarwanda Support"
-msgstr "???????????? ??????"
+msgstr "?????????????????? ?????? "
 
 #: ../comps-f11.xml.in.h:118
-#, fuzzy
 msgid "Malagasy Support"
-msgstr "???????????? ??????"
+msgstr "??????????????? ?????? "
 
 #: ../comps-f11.xml.in.h:132
-#, fuzzy
 msgid "Occitan Support"
-msgstr "???????????? ??????  "
+msgstr "????????? ??????     "
 
 #: ../comps-f11.xml.in.h:201
 msgid ""
 "This group is a collection of tools used in the design, modification, "
 "manipulation, and packaging of fonts."
-msgstr ""
-"??? ????????? ?????? ?????????, ??????, ?????? ??? ???????????? ???????????? ?????? ???????????????.  "
+msgstr "??? ????????? ?????? ?????????, ??????, ?????? ??? ???????????? ???????????? ?????? ???????????????.  "
 
 #: ../comps-f11.xml.in.h:213
-#, fuzzy
 msgid "Turkmen Support"
-msgstr "????????? ??????"
+msgstr "??????????????? ??????  "
 
 #: ../comps-f11.xml.in.h:215
 #, fuzzy
@@ -1386,18 +1362,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
@@ -1405,6 +1378,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  Wed Jan  7 00:51:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 07 Jan 2009 00:51:12 +0000
Subject: [pkgdb] python-dbsprockets (Fedora EPEL, 5) updated by toshio
Message-ID: <20090107005112.BA94E20831B@bastion.fedora.phx.redhat.com>

toshio changed owner of python-dbsprockets in Fedora EPEL 5 to orphan

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-dbsprockets



From pkgdb at fedoraproject.org  Wed Jan  7 00:51:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 07 Jan 2009 00:51:12 +0000
Subject: [pkgdb] python-dbsprockets (Fedora, 9) updated by toshio
Message-ID: <20090107005112.C6B5420831D@bastion.fedora.phx.redhat.com>

toshio changed owner of python-dbsprockets in Fedora 9 to orphan

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-dbsprockets



From pkgdb at fedoraproject.org  Wed Jan  7 00:51:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 07 Jan 2009 00:51:12 +0000
Subject: [pkgdb] python-dbsprockets (Fedora, devel) updated by toshio
Message-ID: <20090107005112.CFB3A208421@bastion.fedora.phx.redhat.com>

toshio changed owner of python-dbsprockets in Fedora devel to orphan

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-dbsprockets



From pkgdb at fedoraproject.org  Wed Jan  7 00:51:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 07 Jan 2009 00:51:12 +0000
Subject: [pkgdb] python-dbsprockets (Fedora, 10) updated by toshio
Message-ID: <20090107005112.D5101208456@bastion.fedora.phx.redhat.com>

toshio changed owner of python-dbsprockets in Fedora 10 to orphan

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-dbsprockets



From pkgdb at fedoraproject.org  Wed Jan  7 01:15:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 07 Jan 2009 01:15:42 +0000
Subject: [pkgdb] moon-buggy was added for robert
Message-ID: <20090107011542.6F3A420831D@bastion.fedora.phx.redhat.com>

kevin has added Package moon-buggy with summary Drive and jump with some kind of car across the moon
kevin has approved Package moon-buggy
kevin has added a Fedora devel branch for moon-buggy with an owner of robert
kevin has approved moon-buggy in Fedora devel
kevin has approved Package moon-buggy
kevin has set commit to Approved for provenpackager on moon-buggy (Fedora devel)
kevin has set build to Approved for provenpackager on moon-buggy (Fedora devel)
kevin has set checkout to Approved for provenpackager on moon-buggy (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/moon-buggy



From pkgdb at fedoraproject.org  Wed Jan  7 01:15:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 07 Jan 2009 01:15:52 +0000
Subject: [pkgdb] moon-buggy (Fedora, 9) updated by kevin
Message-ID: <20090107011552.3EC2B208455@bastion.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for moon-buggy
kevin has set commit to Approved for provenpackager on moon-buggy (Fedora 9)
kevin has set build to Approved for provenpackager on moon-buggy (Fedora 9)
kevin has set checkout to Approved for provenpackager on moon-buggy (Fedora 9)
kevin approved watchbugzilla on moon-buggy (Fedora 9) for cassmodiah
kevin approved watchcommits on moon-buggy (Fedora 9) for cassmodiah
kevin approved commit on moon-buggy (Fedora 9) for cassmodiah
kevin approved build on moon-buggy (Fedora 9) for cassmodiah
kevin approved approveacls on moon-buggy (Fedora 9) for cassmodiah

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/moon-buggy



From pkgdb at fedoraproject.org  Wed Jan  7 01:15:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 07 Jan 2009 01:15:52 +0000
Subject: [pkgdb] moon-buggy (Fedora, devel) updated by kevin
Message-ID: <20090107011552.59101208466@bastion.fedora.phx.redhat.com>

kevin approved watchbugzilla on moon-buggy (Fedora devel) for cassmodiah
kevin approved watchcommits on moon-buggy (Fedora devel) for cassmodiah
kevin approved commit on moon-buggy (Fedora devel) for cassmodiah
kevin approved build on moon-buggy (Fedora devel) for cassmodiah
kevin approved approveacls on moon-buggy (Fedora devel) for cassmodiah

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/moon-buggy



From pkgdb at fedoraproject.org  Wed Jan  7 01:15:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 07 Jan 2009 01:15:52 +0000
Subject: [pkgdb] moon-buggy (Fedora EPEL, 4) updated by kevin
Message-ID: <20090107011552.6E862208469@bastion.fedora.phx.redhat.com>

kevin added a Fedora EPEL 4 branch for moon-buggy
kevin has set commit to Approved for provenpackager on moon-buggy (Fedora EPEL 4)
kevin has set build to Approved for provenpackager on moon-buggy (Fedora EPEL 4)
kevin has set checkout to Approved for provenpackager on moon-buggy (Fedora EPEL 4)
kevin approved watchbugzilla on moon-buggy (Fedora EPEL 4) for cassmodiah
kevin approved watchcommits on moon-buggy (Fedora EPEL 4) for cassmodiah
kevin approved commit on moon-buggy (Fedora EPEL 4) for cassmodiah
kevin approved build on moon-buggy (Fedora EPEL 4) for cassmodiah
kevin approved approveacls on moon-buggy (Fedora EPEL 4) for cassmodiah

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/moon-buggy



From pkgdb at fedoraproject.org  Wed Jan  7 01:15:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 07 Jan 2009 01:15:52 +0000
Subject: [pkgdb] moon-buggy (Fedora, 10) updated by kevin
Message-ID: <20090107011552.819B620846D@bastion.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for moon-buggy
kevin has set commit to Approved for provenpackager on moon-buggy (Fedora 10)
kevin has set build to Approved for provenpackager on moon-buggy (Fedora 10)
kevin has set checkout to Approved for provenpackager on moon-buggy (Fedora 10)
kevin approved watchbugzilla on moon-buggy (Fedora 10) for cassmodiah
kevin approved watchcommits on moon-buggy (Fedora 10) for cassmodiah
kevin approved commit on moon-buggy (Fedora 10) for cassmodiah
kevin approved build on moon-buggy (Fedora 10) for cassmodiah
kevin approved approveacls on moon-buggy (Fedora 10) for cassmodiah

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/moon-buggy



From pkgdb at fedoraproject.org  Wed Jan  7 01:15:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 07 Jan 2009 01:15:52 +0000
Subject: [pkgdb] moon-buggy (Fedora EPEL, 5) updated by kevin
Message-ID: <20090107011552.8F37D208471@bastion.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for moon-buggy
kevin has set commit to Approved for provenpackager on moon-buggy (Fedora EPEL 5)
kevin has set build to Approved for provenpackager on moon-buggy (Fedora EPEL 5)
kevin has set checkout to Approved for provenpackager on moon-buggy (Fedora EPEL 5)
kevin approved watchbugzilla on moon-buggy (Fedora EPEL 5) for cassmodiah
kevin approved watchcommits on moon-buggy (Fedora EPEL 5) for cassmodiah
kevin approved commit on moon-buggy (Fedora EPEL 5) for cassmodiah
kevin approved build on moon-buggy (Fedora EPEL 5) for cassmodiah
kevin approved approveacls on moon-buggy (Fedora EPEL 5) for cassmodiah

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/moon-buggy



From kevin at fedoraproject.org  Wed Jan  7 01:16:09 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  7 Jan 2009 01:16:09 +0000 (UTC)
Subject: rpms/moon-buggy - New directory
Message-ID: <20090107011609.3343870100@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/moon-buggy
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsQa9537/rpms/moon-buggy

Log Message:
Directory /cvs/pkgs/rpms/moon-buggy added to the repository




From kevin at fedoraproject.org  Wed Jan  7 01:16:09 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  7 Jan 2009 01:16:09 +0000 (UTC)
Subject: rpms/moon-buggy/devel - New directory
Message-ID: <20090107011609.6946770142@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/moon-buggy/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsQa9537/rpms/moon-buggy/devel

Log Message:
Directory /cvs/pkgs/rpms/moon-buggy/devel added to the repository




From kevin at fedoraproject.org  Wed Jan  7 01:16:24 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  7 Jan 2009 01:16:24 +0000 (UTC)
Subject: rpms/moon-buggy Makefile,NONE,1.1
Message-ID: <20090107011624.18C2970100@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/moon-buggy
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsQa9537/rpms/moon-buggy

Added Files:
	Makefile 
Log Message:
Setup of module moon-buggy


--- NEW FILE Makefile ---
# Top level Makefile for module moon-buggy
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Jan  7 01:16:24 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  7 Jan 2009 01:16:24 +0000 (UTC)
Subject: rpms/moon-buggy/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090107011624.7B0B070100@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/moon-buggy/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsQa9537/rpms/moon-buggy/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module moon-buggy


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: moon-buggy
# $Id: Makefile,v 1.1 2009/01/07 01:16:24 kevin Exp $
NAME := moon-buggy
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Jan  7 01:18:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 07 Jan 2009 01:18:45 +0000
Subject: [pkgdb] perl-Test-NeedsDisplay (Fedora, devel) updated by kevin
Message-ID: <20090107011845.71C95208455@bastion.fedora.phx.redhat.com>

kevin approved watchbugzilla on perl-Test-NeedsDisplay (Fedora devel) for perl-sig
kevin approved watchcommits on perl-Test-NeedsDisplay (Fedora devel) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Test-NeedsDisplay



From pkgdb at fedoraproject.org  Wed Jan  7 01:18:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 07 Jan 2009 01:18:43 +0000
Subject: [pkgdb] perl-Test-NeedsDisplay was added for mmaslano
Message-ID: <20090107011843.29CFB20831D@bastion.fedora.phx.redhat.com>

kevin has added Package perl-Test-NeedsDisplay with summary Ensure that tests needing a display have one
kevin has approved Package perl-Test-NeedsDisplay
kevin has added a Fedora devel branch for perl-Test-NeedsDisplay with an owner of mmaslano
kevin has approved perl-Test-NeedsDisplay in Fedora devel
kevin has approved Package perl-Test-NeedsDisplay
kevin has set commit to Approved for provenpackager on perl-Test-NeedsDisplay (Fedora devel)
kevin has set build to Approved for provenpackager on perl-Test-NeedsDisplay (Fedora devel)
kevin has set checkout to Approved for provenpackager on perl-Test-NeedsDisplay (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Test-NeedsDisplay



From kevin at fedoraproject.org  Wed Jan  7 01:19:07 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  7 Jan 2009 01:19:07 +0000 (UTC)
Subject: rpms/perl-Test-NeedsDisplay - New directory
Message-ID: <20090107011907.23A2970100@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Test-NeedsDisplay
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsf10215/rpms/perl-Test-NeedsDisplay

Log Message:
Directory /cvs/pkgs/rpms/perl-Test-NeedsDisplay added to the repository




From pkgdb at fedoraproject.org  Wed Jan  7 01:18:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 07 Jan 2009 01:18:45 +0000
Subject: [pkgdb] perl-Test-NeedsDisplay (Fedora, 10) updated by kevin
Message-ID: <20090107011845.79A70208458@bastion.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for perl-Test-NeedsDisplay
kevin has set commit to Approved for provenpackager on perl-Test-NeedsDisplay (Fedora 10)
kevin has set build to Approved for provenpackager on perl-Test-NeedsDisplay (Fedora 10)
kevin has set checkout to Approved for provenpackager on perl-Test-NeedsDisplay (Fedora 10)
kevin approved watchbugzilla on perl-Test-NeedsDisplay (Fedora 10) for perl-sig
kevin approved watchcommits on perl-Test-NeedsDisplay (Fedora 10) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Test-NeedsDisplay



From kevin at fedoraproject.org  Wed Jan  7 01:19:07 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  7 Jan 2009 01:19:07 +0000 (UTC)
Subject: rpms/perl-Test-NeedsDisplay/devel - New directory
Message-ID: <20090107011907.6340270100@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Test-NeedsDisplay/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsf10215/rpms/perl-Test-NeedsDisplay/devel

Log Message:
Directory /cvs/pkgs/rpms/perl-Test-NeedsDisplay/devel added to the repository




From kevin at fedoraproject.org  Wed Jan  7 01:19:22 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  7 Jan 2009 01:19:22 +0000 (UTC)
Subject: rpms/perl-Test-NeedsDisplay Makefile,NONE,1.1
Message-ID: <20090107011922.2C29670100@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Test-NeedsDisplay
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsf10215/rpms/perl-Test-NeedsDisplay

Added Files:
	Makefile 
Log Message:
Setup of module perl-Test-NeedsDisplay


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Test-NeedsDisplay
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Jan  7 01:19:22 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  7 Jan 2009 01:19:22 +0000 (UTC)
Subject: rpms/perl-Test-NeedsDisplay/devel .cvsignore, NONE, 1.1 Makefile,
	NONE, 1.1 sources, NONE, 1.1
Message-ID: <20090107011922.6B86370100@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Test-NeedsDisplay/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsf10215/rpms/perl-Test-NeedsDisplay/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Test-NeedsDisplay


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: perl-Test-NeedsDisplay
# $Id: Makefile,v 1.1 2009/01/07 01:19:22 kevin Exp $
NAME := perl-Test-NeedsDisplay
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Jan  7 01:22:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 07 Jan 2009 01:22:16 +0000
Subject: [pkgdb] rfdump was added for fab
Message-ID: <20090107012216.377E220831C@bastion.fedora.phx.redhat.com>

kevin has added Package rfdump with summary RFID tags detector
kevin has approved Package rfdump
kevin has added a Fedora devel branch for rfdump with an owner of fab
kevin has approved rfdump in Fedora devel
kevin has approved Package rfdump
kevin has set commit to Approved for provenpackager on rfdump (Fedora devel)
kevin has set build to Approved for provenpackager on rfdump (Fedora devel)
kevin has set checkout to Approved for provenpackager on rfdump (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rfdump



From kevin at fedoraproject.org  Wed Jan  7 01:22:35 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  7 Jan 2009 01:22:35 +0000 (UTC)
Subject: rpms/rfdump - New directory
Message-ID: <20090107012235.283CA70100@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/rfdump
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsm10754/rpms/rfdump

Log Message:
Directory /cvs/pkgs/rpms/rfdump added to the repository




From pkgdb at fedoraproject.org  Wed Jan  7 01:22:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 07 Jan 2009 01:22:18 +0000
Subject: [pkgdb] rfdump (Fedora, 10) updated by kevin
Message-ID: <20090107012218.74EFC208457@bastion.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for rfdump
kevin has set commit to Approved for provenpackager on rfdump (Fedora 10)
kevin has set build to Approved for provenpackager on rfdump (Fedora 10)
kevin has set checkout to Approved for provenpackager on rfdump (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rfdump



From pkgdb at fedoraproject.org  Wed Jan  7 01:22:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 07 Jan 2009 01:22:18 +0000
Subject: [pkgdb] rfdump (Fedora, 9) updated by kevin
Message-ID: <20090107012218.6CDA6208421@bastion.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for rfdump
kevin has set commit to Approved for provenpackager on rfdump (Fedora 9)
kevin has set build to Approved for provenpackager on rfdump (Fedora 9)
kevin has set checkout to Approved for provenpackager on rfdump (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rfdump



From kevin at fedoraproject.org  Wed Jan  7 01:22:35 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  7 Jan 2009 01:22:35 +0000 (UTC)
Subject: rpms/rfdump/devel - New directory
Message-ID: <20090107012235.5EA7670100@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/rfdump/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsm10754/rpms/rfdump/devel

Log Message:
Directory /cvs/pkgs/rpms/rfdump/devel added to the repository




From kevin at fedoraproject.org  Wed Jan  7 01:22:50 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  7 Jan 2009 01:22:50 +0000 (UTC)
Subject: rpms/rfdump Makefile,NONE,1.1
Message-ID: <20090107012250.6D96F70100@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/rfdump
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsm10754/rpms/rfdump

Added Files:
	Makefile 
Log Message:
Setup of module rfdump


--- NEW FILE Makefile ---
# Top level Makefile for module rfdump
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Jan  7 01:22:50 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  7 Jan 2009 01:22:50 +0000 (UTC)
Subject: rpms/rfdump/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <20090107012250.ADDC570100@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/rfdump/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsm10754/rpms/rfdump/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module rfdump


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: rfdump
# $Id: Makefile,v 1.1 2009/01/07 01:22:50 kevin Exp $
NAME := rfdump
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Jan  7 01:23:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 07 Jan 2009 01:23:35 +0000
Subject: [pkgdb] python-weberror was added for lmacken
Message-ID: <20090107012335.A483620831C@bastion.fedora.phx.redhat.com>

kevin has added Package python-weberror with summary Web Error handling and exception catching middleware
kevin has approved Package python-weberror
kevin has added a Fedora devel branch for python-weberror with an owner of lmacken
kevin has approved python-weberror in Fedora devel
kevin has approved Package python-weberror
kevin has set commit to Approved for provenpackager on python-weberror (Fedora devel)
kevin has set build to Approved for provenpackager on python-weberror (Fedora devel)
kevin has set checkout to Approved for provenpackager on python-weberror (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-weberror



From pkgdb at fedoraproject.org  Wed Jan  7 01:23:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 07 Jan 2009 01:23:37 +0000
Subject: [pkgdb] python-weberror (Fedora EPEL, 5) updated by kevin
Message-ID: <20090107012337.C6007208455@bastion.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for python-weberror
kevin has set commit to Approved for provenpackager on python-weberror (Fedora EPEL 5)
kevin has set build to Approved for provenpackager on python-weberror (Fedora EPEL 5)
kevin has set checkout to Approved for provenpackager on python-weberror (Fedora EPEL 5)
kevin approved watchbugzilla on python-weberror (Fedora EPEL 5) for ricky
kevin approved watchcommits on python-weberror (Fedora EPEL 5) for ricky
kevin approved commit on python-weberror (Fedora EPEL 5) for ricky
kevin approved build on python-weberror (Fedora EPEL 5) for ricky
kevin approved approveacls on python-weberror (Fedora EPEL 5) for ricky

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-weberror



From pkgdb at fedoraproject.org  Wed Jan  7 01:23:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 07 Jan 2009 01:23:37 +0000
Subject: [pkgdb] python-weberror (Fedora, 9) updated by kevin
Message-ID: <20090107012337.CEBE4208466@bastion.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for python-weberror
kevin has set commit to Approved for provenpackager on python-weberror (Fedora 9)
kevin has set build to Approved for provenpackager on python-weberror (Fedora 9)
kevin has set checkout to Approved for provenpackager on python-weberror (Fedora 9)
kevin approved watchbugzilla on python-weberror (Fedora 9) for ricky
kevin approved watchcommits on python-weberror (Fedora 9) for ricky
kevin approved commit on python-weberror (Fedora 9) for ricky
kevin approved build on python-weberror (Fedora 9) for ricky
kevin approved approveacls on python-weberror (Fedora 9) for ricky

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-weberror



From pkgdb at fedoraproject.org  Wed Jan  7 01:23:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 07 Jan 2009 01:23:37 +0000
Subject: [pkgdb] python-weberror (Fedora, 10) updated by kevin
Message-ID: <20090107012337.DDF3920846A@bastion.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for python-weberror
kevin has set commit to Approved for provenpackager on python-weberror (Fedora 10)
kevin has set build to Approved for provenpackager on python-weberror (Fedora 10)
kevin has set checkout to Approved for provenpackager on python-weberror (Fedora 10)
kevin approved watchbugzilla on python-weberror (Fedora 10) for ricky
kevin approved watchcommits on python-weberror (Fedora 10) for ricky
kevin approved commit on python-weberror (Fedora 10) for ricky
kevin approved build on python-weberror (Fedora 10) for ricky
kevin approved approveacls on python-weberror (Fedora 10) for ricky

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-weberror



From kevin at fedoraproject.org  Wed Jan  7 01:23:50 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  7 Jan 2009 01:23:50 +0000 (UTC)
Subject: rpms/python-weberror - New directory
Message-ID: <20090107012350.2B69470100@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/python-weberror
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsS11005/rpms/python-weberror

Log Message:
Directory /cvs/pkgs/rpms/python-weberror added to the repository




From kevin at fedoraproject.org  Wed Jan  7 01:23:50 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  7 Jan 2009 01:23:50 +0000 (UTC)
Subject: rpms/python-weberror/devel - New directory
Message-ID: <20090107012350.6A82870100@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/python-weberror/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsS11005/rpms/python-weberror/devel

Log Message:
Directory /cvs/pkgs/rpms/python-weberror/devel added to the repository




From pkgdb at fedoraproject.org  Wed Jan  7 01:23:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 07 Jan 2009 01:23:37 +0000
Subject: [pkgdb] python-weberror (Fedora, devel) updated by kevin
Message-ID: <20090107012337.F15BC20846E@bastion.fedora.phx.redhat.com>

kevin approved watchbugzilla on python-weberror (Fedora devel) for ricky
kevin approved watchcommits on python-weberror (Fedora devel) for ricky
kevin approved commit on python-weberror (Fedora devel) for ricky
kevin approved build on python-weberror (Fedora devel) for ricky
kevin approved approveacls on python-weberror (Fedora devel) for ricky

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-weberror



From kevin at fedoraproject.org  Wed Jan  7 01:24:06 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  7 Jan 2009 01:24:06 +0000 (UTC)
Subject: rpms/python-weberror Makefile,NONE,1.1
Message-ID: <20090107012406.1A7DD70100@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/python-weberror
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsS11005/rpms/python-weberror

Added Files:
	Makefile 
Log Message:
Setup of module python-weberror


--- NEW FILE Makefile ---
# Top level Makefile for module python-weberror
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Jan  7 01:24:06 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  7 Jan 2009 01:24:06 +0000 (UTC)
Subject: rpms/python-weberror/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090107012406.5690C70100@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/python-weberror/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsS11005/rpms/python-weberror/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module python-weberror


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: python-weberror
# $Id: Makefile,v 1.1 2009/01/07 01:24:06 kevin Exp $
NAME := python-weberror
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Jan  7 01:24:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 07 Jan 2009 01:24:43 +0000
Subject: [pkgdb] ghc-HTTP was added for petersen
Message-ID: <20090107012443.86207208455@bastion.fedora.phx.redhat.com>

kevin has added Package ghc-HTTP with summary HTTP client library for Haskell
kevin has approved Package ghc-HTTP
kevin has added a Fedora devel branch for ghc-HTTP with an owner of petersen
kevin has approved ghc-HTTP in Fedora devel
kevin has approved Package ghc-HTTP
kevin has set commit to Approved for provenpackager on ghc-HTTP (Fedora devel)
kevin has set build to Approved for provenpackager on ghc-HTTP (Fedora devel)
kevin has set checkout to Approved for provenpackager on ghc-HTTP (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ghc-HTTP



From pkgdb at fedoraproject.org  Wed Jan  7 01:24:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 07 Jan 2009 01:24:45 +0000
Subject: [pkgdb] ghc-HTTP (Fedora, devel) updated by kevin
Message-ID: <20090107012445.30A4D208457@bastion.fedora.phx.redhat.com>

kevin approved watchbugzilla on ghc-HTTP (Fedora devel) for haskell-sig
kevin approved watchcommits on ghc-HTTP (Fedora devel) for haskell-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ghc-HTTP



From pkgdb at fedoraproject.org  Wed Jan  7 01:24:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 07 Jan 2009 01:24:45 +0000
Subject: [pkgdb] ghc-HTTP (Fedora, 10) updated by kevin
Message-ID: <20090107012445.3B3C0208467@bastion.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for ghc-HTTP
kevin has set commit to Approved for provenpackager on ghc-HTTP (Fedora 10)
kevin has set build to Approved for provenpackager on ghc-HTTP (Fedora 10)
kevin has set checkout to Approved for provenpackager on ghc-HTTP (Fedora 10)
kevin approved watchbugzilla on ghc-HTTP (Fedora 10) for haskell-sig
kevin approved watchcommits on ghc-HTTP (Fedora 10) for haskell-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ghc-HTTP



From kevin at fedoraproject.org  Wed Jan  7 01:24:59 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  7 Jan 2009 01:24:59 +0000 (UTC)
Subject: rpms/ghc-HTTP - New directory
Message-ID: <20090107012459.2B80170100@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/ghc-HTTP
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsW11495/rpms/ghc-HTTP

Log Message:
Directory /cvs/pkgs/rpms/ghc-HTTP added to the repository




From kevin at fedoraproject.org  Wed Jan  7 01:24:59 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  7 Jan 2009 01:24:59 +0000 (UTC)
Subject: rpms/ghc-HTTP/devel - New directory
Message-ID: <20090107012459.7032A70100@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/ghc-HTTP/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsW11495/rpms/ghc-HTTP/devel

Log Message:
Directory /cvs/pkgs/rpms/ghc-HTTP/devel added to the repository




From kevin at fedoraproject.org  Wed Jan  7 01:25:14 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  7 Jan 2009 01:25:14 +0000 (UTC)
Subject: rpms/ghc-HTTP Makefile,NONE,1.1
Message-ID: <20090107012514.784F370100@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/ghc-HTTP
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsW11495/rpms/ghc-HTTP

Added Files:
	Makefile 
Log Message:
Setup of module ghc-HTTP


--- NEW FILE Makefile ---
# Top level Makefile for module ghc-HTTP
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Jan  7 01:25:14 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  7 Jan 2009 01:25:14 +0000 (UTC)
Subject: rpms/ghc-HTTP/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090107012514.B334570100@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/ghc-HTTP/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsW11495/rpms/ghc-HTTP/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module ghc-HTTP


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: ghc-HTTP
# $Id: Makefile,v 1.1 2009/01/07 01:25:14 kevin Exp $
NAME := ghc-HTTP
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Jan  7 01:25:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 07 Jan 2009 01:25:59 +0000
Subject: [pkgdb] cudd was added for konradm
Message-ID: <20090107012559.C7BEA20831C@bastion.fedora.phx.redhat.com>

kevin has added Package cudd with summary CU Decision Diagram Package
kevin has approved Package cudd
kevin has added a Fedora devel branch for cudd with an owner of konradm
kevin has approved cudd in Fedora devel
kevin has approved Package cudd
kevin has set commit to Approved for provenpackager on cudd (Fedora devel)
kevin has set build to Approved for provenpackager on cudd (Fedora devel)
kevin has set checkout to Approved for provenpackager on cudd (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cudd



From pkgdb at fedoraproject.org  Wed Jan  7 01:26:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 07 Jan 2009 01:26:02 +0000
Subject: [pkgdb] cudd (Fedora, 9) updated by kevin
Message-ID: <20090107012602.C1F87208421@bastion.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for cudd
kevin has set commit to Approved for provenpackager on cudd (Fedora 9)
kevin has set build to Approved for provenpackager on cudd (Fedora 9)
kevin has set checkout to Approved for provenpackager on cudd (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cudd



From kevin at fedoraproject.org  Wed Jan  7 01:26:14 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  7 Jan 2009 01:26:14 +0000 (UTC)
Subject: rpms/cudd - New directory
Message-ID: <20090107012614.2A1D570100@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/cudd
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsy12061/rpms/cudd

Log Message:
Directory /cvs/pkgs/rpms/cudd added to the repository




From kevin at fedoraproject.org  Wed Jan  7 01:26:14 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  7 Jan 2009 01:26:14 +0000 (UTC)
Subject: rpms/cudd/devel - New directory
Message-ID: <20090107012614.5F01C70100@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/cudd/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsy12061/rpms/cudd/devel

Log Message:
Directory /cvs/pkgs/rpms/cudd/devel added to the repository




From pkgdb at fedoraproject.org  Wed Jan  7 01:26:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 07 Jan 2009 01:26:02 +0000
Subject: [pkgdb] cudd (Fedora, 10) updated by kevin
Message-ID: <20090107012602.E307E208457@bastion.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for cudd
kevin has set commit to Approved for provenpackager on cudd (Fedora 10)
kevin has set build to Approved for provenpackager on cudd (Fedora 10)
kevin has set checkout to Approved for provenpackager on cudd (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cudd



From kevin at fedoraproject.org  Wed Jan  7 01:26:29 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  7 Jan 2009 01:26:29 +0000 (UTC)
Subject: rpms/cudd Makefile,NONE,1.1
Message-ID: <20090107012629.9033170100@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/cudd
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsy12061/rpms/cudd

Added Files:
	Makefile 
Log Message:
Setup of module cudd


--- NEW FILE Makefile ---
# Top level Makefile for module cudd
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Jan  7 01:26:30 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  7 Jan 2009 01:26:30 +0000 (UTC)
Subject: rpms/cudd/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <20090107012630.36BDF70100@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/cudd/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsy12061/rpms/cudd/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module cudd


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: cudd
# $Id: Makefile,v 1.1 2009/01/07 01:26:30 kevin Exp $
NAME := cudd
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Jan  7 01:28:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 07 Jan 2009 01:28:37 +0000
Subject: [pkgdb] perl-Verilog was added for chitlesh
Message-ID: <20090107012838.D9D4B20831D@bastion.fedora.phx.redhat.com>

kevin has added Package perl-Verilog with summary Verilog parsing routines
kevin has approved Package perl-Verilog
kevin has added a Fedora devel branch for perl-Verilog with an owner of chitlesh
kevin has approved perl-Verilog in Fedora devel
kevin has approved Package perl-Verilog
kevin has set commit to Approved for provenpackager on perl-Verilog (Fedora devel)
kevin has set build to Approved for provenpackager on perl-Verilog (Fedora devel)
kevin has set checkout to Approved for provenpackager on perl-Verilog (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Verilog



From pkgdb at fedoraproject.org  Wed Jan  7 01:28:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 07 Jan 2009 01:28:40 +0000
Subject: [pkgdb] perl-Verilog (Fedora EPEL, 5) updated by kevin
Message-ID: <20090107012840.DDFD5208455@bastion.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for perl-Verilog
kevin has set commit to Approved for provenpackager on perl-Verilog (Fedora EPEL 5)
kevin has set build to Approved for provenpackager on perl-Verilog (Fedora EPEL 5)
kevin has set checkout to Approved for provenpackager on perl-Verilog (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Verilog



From pkgdb at fedoraproject.org  Wed Jan  7 01:28:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 07 Jan 2009 01:28:40 +0000
Subject: [pkgdb] perl-Verilog (Fedora, 9) updated by kevin
Message-ID: <20090107012840.F3C2A208458@bastion.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for perl-Verilog
kevin has set commit to Approved for provenpackager on perl-Verilog (Fedora 9)
kevin has set build to Approved for provenpackager on perl-Verilog (Fedora 9)
kevin has set checkout to Approved for provenpackager on perl-Verilog (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Verilog



From pkgdb at fedoraproject.org  Wed Jan  7 01:28:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 07 Jan 2009 01:28:40 +0000
Subject: [pkgdb] perl-Verilog (Fedora, 10) updated by kevin
Message-ID: <20090107012841.21C8F208468@bastion.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for perl-Verilog
kevin has set commit to Approved for provenpackager on perl-Verilog (Fedora 10)
kevin has set build to Approved for provenpackager on perl-Verilog (Fedora 10)
kevin has set checkout to Approved for provenpackager on perl-Verilog (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Verilog



From kevin at fedoraproject.org  Wed Jan  7 01:29:00 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  7 Jan 2009 01:29:00 +0000 (UTC)
Subject: rpms/perl-Verilog - New directory
Message-ID: <20090107012900.2550570100@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Verilog
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsu13087/rpms/perl-Verilog

Log Message:
Directory /cvs/pkgs/rpms/perl-Verilog added to the repository




From kevin at fedoraproject.org  Wed Jan  7 01:29:00 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  7 Jan 2009 01:29:00 +0000 (UTC)
Subject: rpms/perl-Verilog/devel - New directory
Message-ID: <20090107012900.5D50170100@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Verilog/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsu13087/rpms/perl-Verilog/devel

Log Message:
Directory /cvs/pkgs/rpms/perl-Verilog/devel added to the repository




From kevin at fedoraproject.org  Wed Jan  7 01:29:17 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  7 Jan 2009 01:29:17 +0000 (UTC)
Subject: rpms/perl-Verilog Makefile,NONE,1.1
Message-ID: <20090107012917.2F5C370100@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Verilog
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsu13087/rpms/perl-Verilog

Added Files:
	Makefile 
Log Message:
Setup of module perl-Verilog


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Verilog
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Jan  7 01:29:17 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  7 Jan 2009 01:29:17 +0000 (UTC)
Subject: rpms/perl-Verilog/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090107012917.7F9F070100@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Verilog/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsu13087/rpms/perl-Verilog/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Verilog


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: perl-Verilog
# $Id: Makefile,v 1.1 2009/01/07 01:29:17 kevin Exp $
NAME := perl-Verilog
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Jan  7 01:29:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 07 Jan 2009 01:29:47 +0000
Subject: [pkgdb] hyphen-el was added for caolanm
Message-ID: <20090107012947.798CB20831C@bastion.fedora.phx.redhat.com>

kevin has added Package hyphen-el with summary Greek hyphenation rules
kevin has approved Package hyphen-el
kevin has added a Fedora devel branch for hyphen-el with an owner of caolanm
kevin has approved hyphen-el in Fedora devel
kevin has approved Package hyphen-el
kevin has set commit to Approved for provenpackager on hyphen-el (Fedora devel)
kevin has set build to Approved for provenpackager on hyphen-el (Fedora devel)
kevin has set checkout to Approved for provenpackager on hyphen-el (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/hyphen-el



From kevin at fedoraproject.org  Wed Jan  7 01:30:16 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  7 Jan 2009 01:30:16 +0000 (UTC)
Subject: rpms/hyphen-el - New directory
Message-ID: <20090107013016.23F157013F@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/hyphen-el
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsR13777/rpms/hyphen-el

Log Message:
Directory /cvs/pkgs/rpms/hyphen-el added to the repository




From kevin at fedoraproject.org  Wed Jan  7 01:30:16 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  7 Jan 2009 01:30:16 +0000 (UTC)
Subject: rpms/hyphen-el/devel - New directory
Message-ID: <20090107013016.6B2497013F@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/hyphen-el/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsR13777/rpms/hyphen-el/devel

Log Message:
Directory /cvs/pkgs/rpms/hyphen-el/devel added to the repository




From kevin at fedoraproject.org  Wed Jan  7 01:30:33 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  7 Jan 2009 01:30:33 +0000 (UTC)
Subject: rpms/hyphen-el Makefile,NONE,1.1
Message-ID: <20090107013033.0E63E70100@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/hyphen-el
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsR13777/rpms/hyphen-el

Added Files:
	Makefile 
Log Message:
Setup of module hyphen-el


--- NEW FILE Makefile ---
# Top level Makefile for module hyphen-el
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Jan  7 01:30:33 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  7 Jan 2009 01:30:33 +0000 (UTC)
Subject: rpms/hyphen-el/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090107013033.4C41170100@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/hyphen-el/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsR13777/rpms/hyphen-el/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module hyphen-el


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: hyphen-el
# $Id: Makefile,v 1.1 2009/01/07 01:30:33 kevin Exp $
NAME := hyphen-el
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Jan  7 01:30:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 07 Jan 2009 01:30:36 +0000
Subject: [pkgdb] hyphen-es was added for caolanm
Message-ID: <20090107013036.530F6208456@bastion.fedora.phx.redhat.com>

kevin has added Package hyphen-es with summary Spanish hyphenation rules
kevin has approved Package hyphen-es
kevin has added a Fedora devel branch for hyphen-es with an owner of caolanm
kevin has approved hyphen-es in Fedora devel
kevin has approved Package hyphen-es
kevin has set commit to Approved for provenpackager on hyphen-es (Fedora devel)
kevin has set build to Approved for provenpackager on hyphen-es (Fedora devel)
kevin has set checkout to Approved for provenpackager on hyphen-es (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/hyphen-es



From kevin at fedoraproject.org  Wed Jan  7 01:31:00 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  7 Jan 2009 01:31:00 +0000 (UTC)
Subject: rpms/hyphen-es - New directory
Message-ID: <20090107013100.28BFF70100@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/hyphen-es
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsB14582/rpms/hyphen-es

Log Message:
Directory /cvs/pkgs/rpms/hyphen-es added to the repository




From kevin at fedoraproject.org  Wed Jan  7 01:31:00 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  7 Jan 2009 01:31:00 +0000 (UTC)
Subject: rpms/hyphen-es/devel - New directory
Message-ID: <20090107013100.7731470100@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/hyphen-es/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsB14582/rpms/hyphen-es/devel

Log Message:
Directory /cvs/pkgs/rpms/hyphen-es/devel added to the repository




From kevin at fedoraproject.org  Wed Jan  7 01:31:16 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  7 Jan 2009 01:31:16 +0000 (UTC)
Subject: rpms/hyphen-es Makefile,NONE,1.1
Message-ID: <20090107013116.67C7270100@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/hyphen-es
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsB14582/rpms/hyphen-es

Added Files:
	Makefile 
Log Message:
Setup of module hyphen-es


--- NEW FILE Makefile ---
# Top level Makefile for module hyphen-es
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Jan  7 01:31:16 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  7 Jan 2009 01:31:16 +0000 (UTC)
Subject: rpms/hyphen-es/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090107013116.A83DA70100@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/hyphen-es/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsB14582/rpms/hyphen-es/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module hyphen-es


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: hyphen-es
# $Id: Makefile,v 1.1 2009/01/07 01:31:16 kevin Exp $
NAME := hyphen-es
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Jan  7 01:31:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 07 Jan 2009 01:31:58 +0000
Subject: [pkgdb] FlightGear-data was added for bellet
Message-ID: <20090107013158.149F520831B@bastion.fedora.phx.redhat.com>

kevin has added Package FlightGear-data with summary FlightGear base scenery and data files
kevin has approved Package FlightGear-data
kevin has added a Fedora devel branch for FlightGear-data with an owner of bellet
kevin has approved FlightGear-data in Fedora devel
kevin has approved Package FlightGear-data
kevin has set commit to Approved for provenpackager on FlightGear-data (Fedora devel)
kevin has set build to Approved for provenpackager on FlightGear-data (Fedora devel)
kevin has set checkout to Approved for provenpackager on FlightGear-data (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/FlightGear-data



From kevin at fedoraproject.org  Wed Jan  7 01:32:19 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  7 Jan 2009 01:32:19 +0000 (UTC)
Subject: rpms/FlightGear-data - New directory
Message-ID: <20090107013219.2BC8C70100@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/FlightGear-data
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsJ14958/rpms/FlightGear-data

Log Message:
Directory /cvs/pkgs/rpms/FlightGear-data added to the repository




From kevin at fedoraproject.org  Wed Jan  7 01:32:19 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  7 Jan 2009 01:32:19 +0000 (UTC)
Subject: rpms/FlightGear-data/devel - New directory
Message-ID: <20090107013219.6934370100@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/FlightGear-data/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsJ14958/rpms/FlightGear-data/devel

Log Message:
Directory /cvs/pkgs/rpms/FlightGear-data/devel added to the repository




From kevin at fedoraproject.org  Wed Jan  7 01:32:35 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  7 Jan 2009 01:32:35 +0000 (UTC)
Subject: rpms/FlightGear-data Makefile,NONE,1.1
Message-ID: <20090107013235.8C69670100@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/FlightGear-data
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsJ14958/rpms/FlightGear-data

Added Files:
	Makefile 
Log Message:
Setup of module FlightGear-data


--- NEW FILE Makefile ---
# Top level Makefile for module FlightGear-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  Wed Jan  7 01:32:35 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  7 Jan 2009 01:32:35 +0000 (UTC)
Subject: rpms/FlightGear-data/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090107013235.DEDA270100@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/FlightGear-data/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsJ14958/rpms/FlightGear-data/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module FlightGear-data


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: FlightGear-data
# $Id: Makefile,v 1.1 2009/01/07 01:32:35 kevin Exp $
NAME := FlightGear-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  Wed Jan  7 01:32:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 07 Jan 2009 01:32:43 +0000
Subject: [pkgdb] FlightGear-Atlas was added for bellet
Message-ID: <20090107013243.B31E720831C@bastion.fedora.phx.redhat.com>

kevin has added Package FlightGear-Atlas with summary Flightgear map tools
kevin has approved Package FlightGear-Atlas
kevin has added a Fedora devel branch for FlightGear-Atlas with an owner of bellet
kevin has approved FlightGear-Atlas in Fedora devel
kevin has approved Package FlightGear-Atlas
kevin has set commit to Approved for provenpackager on FlightGear-Atlas (Fedora devel)
kevin has set build to Approved for provenpackager on FlightGear-Atlas (Fedora devel)
kevin has set checkout to Approved for provenpackager on FlightGear-Atlas (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/FlightGear-Atlas



From kevin at fedoraproject.org  Wed Jan  7 01:33:02 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  7 Jan 2009 01:33:02 +0000 (UTC)
Subject: rpms/FlightGear-Atlas - New directory
Message-ID: <20090107013302.2B59970100@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/FlightGear-Atlas
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsB15069/rpms/FlightGear-Atlas

Log Message:
Directory /cvs/pkgs/rpms/FlightGear-Atlas added to the repository




From kevin at fedoraproject.org  Wed Jan  7 01:33:02 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  7 Jan 2009 01:33:02 +0000 (UTC)
Subject: rpms/FlightGear-Atlas/devel - New directory
Message-ID: <20090107013302.734DD70100@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/FlightGear-Atlas/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsB15069/rpms/FlightGear-Atlas/devel

Log Message:
Directory /cvs/pkgs/rpms/FlightGear-Atlas/devel added to the repository




From kevin at fedoraproject.org  Wed Jan  7 01:33:21 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  7 Jan 2009 01:33:21 +0000 (UTC)
Subject: rpms/FlightGear-Atlas/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090107013321.80EEA70143@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/FlightGear-Atlas/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsB15069/rpms/FlightGear-Atlas/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module FlightGear-Atlas


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: FlightGear-Atlas
# $Id: Makefile,v 1.1 2009/01/07 01:33:21 kevin Exp $
NAME := FlightGear-Atlas
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out 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 Jan  7 01:33:21 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed,  7 Jan 2009 01:33:21 +0000 (UTC)
Subject: rpms/FlightGear-Atlas Makefile,NONE,1.1
Message-ID: <20090107013321.3638570100@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/FlightGear-Atlas
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsB15069/rpms/FlightGear-Atlas

Added Files:
	Makefile 
Log Message:
Setup of module FlightGear-Atlas


--- NEW FILE Makefile ---
# Top level Makefile for module FlightGear-Atlas
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From pbrobinson at fedoraproject.org  Wed Jan  7 01:46:15 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Wed,  7 Jan 2009 01:46:15 +0000 (UTC)
Subject: rpms/hippo-canvas/F-10 hippo-canvas.spec, 1.15, 1.16 sources, 1.11,
	1.12
Message-ID: <20090107014616.0672070100@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/hippo-canvas/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16724

Modified Files:
	hippo-canvas.spec sources 
Log Message:
- Merge from OLPC-4 branch



Index: hippo-canvas.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hippo-canvas/F-10/hippo-canvas.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- hippo-canvas.spec	31 Jul 2008 17:13:57 -0000	1.15
+++ hippo-canvas.spec	7 Jan 2009 01:45:45 -0000	1.16
@@ -1,14 +1,18 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
+%define alphatag 20081014svn
+
 Name:           hippo-canvas
 Version:        0.3.0
-Release:        3%{?dist}
+#Release:        3%{?dist}
+Release:	5.%{alphatag}%{?dist}
 Summary:        A canvas widget
 
 Group:          System Environment/Libraries
 License:        LGPLv2
 URL:            http://developer.mugshot.org/wiki/Hippo_Canvas
-Source0:        ftp://ftp.gnome.org/pub/GNOME/sources/hippo-canvas/0.2/hippo-canvas-%{version}.tar.gz
+#Source0:        ftp://ftp.gnome.org/pub/GNOME/sources/hippo-canvas/0.2/hippo-canvas-%{version}.tar.gz
+Source0:        hippo-canvas-%{version}-%{alphatag}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  cairo-devel
@@ -50,7 +54,6 @@
 %setup -q
 
 %build
-autoreconf -i
 %configure --disable-static
 make %{?_smp_mflags}
 
@@ -87,6 +90,14 @@
 %{python_sitearch}/*.so
 
 %changelog
+* Fri Nov 14 2008 Tomeu Vizoso <tomeu at tomeuvizoso.net> - 0.3.0-5-20081014svn
+- Remove autoreconf call
+
+* Fri Nov 14 2008 Tomeu Vizoso <tomeu at tomeuvizoso.net> - 0.3.0-4-20081014svn
+- Use GdkRegion instead of HippoRectangle for the damage area.
+- Wrap hippo_canvas_box_sort()
+- Handle the case where hippo_canvas_box_find_box_child() returns NULL
+
 * Thu Jul 31 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.3.0-3
 - fix license tag
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hippo-canvas/F-10/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	30 Jul 2008 15:58:00 -0000	1.11
+++ sources	7 Jan 2009 01:45:45 -0000	1.12
@@ -1,2 +1 @@
-c7915c93b8b095b73808f3d3e3454c33  hippo-canvas-0.2.34.tar.gz
-64e10c73054ce10177855213152e6238  hippo-canvas-0.3.0.tar.gz
+98386861faa8fccd4dd33a0e06b6b21d  hippo-canvas-0.3.0-20081014svn.tar.gz



From mclasen at fedoraproject.org  Wed Jan  7 02:47:13 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Wed,  7 Jan 2009 02:47:13 +0000 (UTC)
Subject: rpms/gnome-applets/devel mini-commander.patch, NONE,
	1.1 gnome-applets.spec, 1.319, 1.320
Message-ID: <20090107024713.77BD470100@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-applets/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32140

Modified Files:
	gnome-applets.spec 
Added Files:
	mini-commander.patch 
Log Message:
fix the mini-commander build _again_


mini-commander.patch:

--- NEW FILE mini-commander.patch ---
diff -up gnome-applets-2.25.3/mini-commander/src/Makefile.am.mini-commander gnome-applets-2.25.3/mini-commander/src/Makefile.am
--- gnome-applets-2.25.3/mini-commander/src/Makefile.am.mini-commander	2009-01-06 21:39:16.000000000 -0500
+++ gnome-applets-2.25.3/mini-commander/src/Makefile.am	2009-01-06 21:42:34.000000000 -0500
@@ -35,6 +35,7 @@ mini_commander_applet_SOURCES =			\
 	mc-default-macros.h
 
 mini_commander_applet_LDADD =	\
+	$(GNOME_LIBS2_LIBS)	\
 	$(GNOME_APPLETS_LIBS)
 
 mc_install_default_macros_SOURCES =	\


Index: gnome-applets.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-applets/devel/gnome-applets.spec,v
retrieving revision 1.319
retrieving revision 1.320
diff -u -r1.319 -r1.320
--- gnome-applets.spec	6 Jan 2009 18:22:32 -0000	1.319
+++ gnome-applets.spec	7 Jan 2009 02:46:42 -0000	1.320
@@ -35,7 +35,7 @@
 Summary:        Small applications for the GNOME panel
 Name:		gnome-applets
 Version:	2.25.3
-Release: 	1%{?dist}
+Release: 	2%{?dist}
 Epoch:          1
 License:	GPLv2+ and GFDL
 Group:          User Interface/Desktops
@@ -58,6 +58,9 @@
 # do the nullapplet dance for battstat
 Patch40:	gnome-applets-null-battstat.patch
 
+# still doesn't build !@#$!%#
+Patch41:	mini-commander.patch
+
 BuildRequires:  glib2-devel >= %{glib2_version}
 BuildRequires:  gtk2-devel >= %{gtk2_version}
 BuildRequires:  libgnomeui-devel >= %{libgnomeui_version}
@@ -149,6 +152,7 @@
 %patch3 -p1 -b .ppp-command
 %patch34 -p1 -b .ppp-includes
 
+%patch41 -p1 -b .mini-commander
 
 intltoolize --force
 autoreconf
@@ -335,7 +339,7 @@
 %{_datadir}/PolicyKit/policy/org.gnome.cpufreqselector.policy
 
 %changelog
-* Tue Jan  6 2009 Matthias Clasen <mclasen at redhat.com> - 1:2.25.3-1
+* Tue Jan  6 2009 Matthias Clasen <mclasen at redhat.com> - 1:2.25.3-2
 - Update to 2.25.3
 
 * Sat Dec 20 2008 Matthias Clasen <mclasen at redhat.com> - 1:2.25.2-4



From konradm at fedoraproject.org  Wed Jan  7 03:02:25 2009
From: konradm at fedoraproject.org (Conrad Meyer)
Date: Wed,  7 Jan 2009 03:02:25 +0000 (UTC)
Subject: rpms/cudd/devel cudd.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090107030225.8E9ED70141@cvs1.fedora.phx.redhat.com>

Author: konradm

Update of /cvs/pkgs/rpms/cudd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3609/devel

Modified Files:
	.cvsignore sources 
Added Files:
	cudd.spec import.log 
Log Message:
Import.



--- NEW FILE cudd.spec ---
%define debug_package %{nil}
# rpmbuild doesn't get useful debuginfo from .a libs

Name:           cudd
Version:        2.4.1
Release:        2%{?dist}
Summary:        CU Decision Diagram Package
Group:          Development/Libraries
License:        BSD
URL:            http://vlsi.colorado.edu/~fabio/CUDD/
Source0:        ftp://vlsi.Colorado.EDU/pub/cudd-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)


%description
CUDD is a package for the manipulation of Binary Decision Diagrams
(BDDs), Algebraic Decision Diagrams (ADDs) and Zero-suppressed
Binary Decision Diagrams (ZDDs).


%package        devel
Summary:        Development files for %{name}
Group:          Development/Libraries
Provides:       %{name}-static = %{version}-%{release}


%description    devel
Development headers and libraries for %{name}.


%prep
%setup -q


%build
make %{?_smp_mflags} CPPFLAGS="%{optflags}" ICFLAGS="%{optflags}" \
  XCFLAGS=""


%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_libdir}/%{name}
for slib in */*.a; do
  install -p -m 644 ${slib} $RPM_BUILD_ROOT%{_libdir}/%{name}/
done
mkdir -p $RPM_BUILD_ROOT%{_includedir}/%{name}
for hdr in include/*; do
  install -p -m 644 ${hdr} $RPM_BUILD_ROOT%{_includedir}/%{name}/
done


%clean
rm -rf $RPM_BUILD_ROOT


%files devel
%defattr(-,root,root,-)
%doc README LICENSE cudd/doc
%{_libdir}/%{name}
%{_includedir}/%{name}


%changelog
* Sun Jan 4 2009 Conrad Meyer <konrad at tylerc.org> - 2.4.1-2
- Add LICENSE, cudd/doc to docs.

* Fri Dec 12 2008 Conrad Meyer <konrad at tylerc.org> - 2.4.1-1
- Initial package.


--- NEW FILE import.log ---
cudd-2_4_1-2_fc9:HEAD:cudd-2.4.1-2.fc9.src.rpm:1231297141


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cudd/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	7 Jan 2009 01:26:29 -0000	1.1
+++ .cvsignore	7 Jan 2009 03:01:55 -0000	1.2
@@ -0,0 +1 @@
+cudd-2.4.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cudd/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	7 Jan 2009 01:26:30 -0000	1.1
+++ sources	7 Jan 2009 03:01:55 -0000	1.2
@@ -0,0 +1 @@
+38f4dc5195a746222f1e51c459b49b4f  cudd-2.4.1.tar.gz



From airlied at fedoraproject.org  Wed Jan  7 03:19:16 2009
From: airlied at fedoraproject.org (Dave Airlie)
Date: Wed,  7 Jan 2009 03:19:16 +0000 (UTC)
Subject: rpms/xorg-x11-drv-ati/devel .cvsignore, 1.24, 1.25 radeon.xinf, 1.9,
	1.10 sources, 1.24, 1.25 xorg-x11-drv-ati.spec, 1.145,
	1.146 radeon-6.9.0-to-git.patch, 1.7, NONE
Message-ID: <20090107031916.1E08670100@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-serv7658

Modified Files:
	.cvsignore radeon.xinf sources xorg-x11-drv-ati.spec 
Removed Files:
	radeon-6.9.0-to-git.patch 
Log Message:
* Wed Jan 07 2009 Dave Airlie <airlied at redhat.com> 6.10.0-1
- rebase to latest upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ati/devel/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- .cvsignore	11 Aug 2008 04:14:20 -0000	1.24
+++ .cvsignore	7 Jan 2009 03:18:44 -0000	1.25
@@ -1 +1 @@
-xf86-video-ati-6.9.0.tar.bz2
+xf86-video-ati-6.10.0.tar.bz2


Index: radeon.xinf
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ati/devel/radeon.xinf,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- radeon.xinf	29 Oct 2008 05:59:58 -0000	1.9
+++ radeon.xinf	7 Jan 2009 03:18:45 -0000	1.10
@@ -225,7 +225,7 @@
 alias pcivideo:v00001002d00007288sv*sd*bc*sc*i* radeon # ATI Radeon X1950 GT
 alias pcivideo:v00001002d00007289sv*sd*bc*sc*i* radeon # ATI RV570
 alias pcivideo:v00001002d0000728Bsv*sd*bc*sc*i* radeon # ATI RV570
-alias pcivideo:v00001002d0000728Csv*sd*bc*sc*i* radeon # ATI ATI FireGL V7400
+alias pcivideo:v00001002d0000728Csv*sd*bc*sc*i* radeon # ATI FireGL V7400
 alias pcivideo:v00001002d00007290sv*sd*bc*sc*i* radeon # ATI RV560
 alias pcivideo:v00001002d00007291sv*sd*bc*sc*i* radeon # ATI Radeon X1650
 alias pcivideo:v00001002d00007293sv*sd*bc*sc*i* radeon # ATI Radeon X1650
@@ -252,13 +252,31 @@
 alias pcivideo:v00001002d00009440sv*sd*bc*sc*i* radeon # ATI Radeon 4800 Series
 alias pcivideo:v00001002d00009441sv*sd*bc*sc*i* radeon # ATI Radeon HD 4870 x2
 alias pcivideo:v00001002d00009442sv*sd*bc*sc*i* radeon # ATI Radeon 4800 Series
+alias pcivideo:v00001002d00009444sv*sd*bc*sc*i* radeon # ATI FirePro V8750 (FireGL)
+alias pcivideo:v00001002d00009446sv*sd*bc*sc*i* radeon # ATI FirePro V7760 (FireGL)
+alias pcivideo:v00001002d0000944Asv*sd*bc*sc*i* radeon # ATI Mobility RADEON HD 4850
+alias pcivideo:v00001002d0000944Bsv*sd*bc*sc*i* radeon # ATI Mobility RADEON HD 4850 X2
+alias pcivideo:v00001002d0000944Csv*sd*bc*sc*i* radeon # ATI Radeon 4800 Series
+alias pcivideo:v00001002d0000944Esv*sd*bc*sc*i* radeon # ATI FirePro RV770
+alias pcivideo:v00001002d00009450sv*sd*bc*sc*i* radeon # AMD FireStream 9270
+alias pcivideo:v00001002d00009452sv*sd*bc*sc*i* radeon # AMD FireStream 9250
+alias pcivideo:v00001002d00009456sv*sd*bc*sc*i* radeon # ATI FirePro V8700 (FireGL)
+alias pcivideo:v00001002d0000945Asv*sd*bc*sc*i* radeon # ATI Mobility RADEON HD 4870
+alias pcivideo:v00001002d0000945Bsv*sd*bc*sc*i* radeon # ATI Mobility RADEON M98
+alias pcivideo:v00001002d00009487sv*sd*bc*sc*i* radeon # ATI Radeon RV730 (AGP)
+alias pcivideo:v00001002d0000948Fsv*sd*bc*sc*i* radeon # ATI Radeon RV730 (AGP)
+alias pcivideo:v00001002d00009490sv*sd*bc*sc*i* radeon # ATI RV730XT [Radeon HD 4670]
+alias pcivideo:v00001002d00009498sv*sd*bc*sc*i* radeon # ATI RV730 PRO [Radeon HD 4650]
+alias pcivideo:v00001002d0000949Csv*sd*bc*sc*i* radeon # ATI FirePro V7750 (FireGL)
+alias pcivideo:v00001002d0000949Esv*sd*bc*sc*i* radeon # ATI FirePro V5700 (FireGL)
+alias pcivideo:v00001002d0000949Fsv*sd*bc*sc*i* radeon # ATI FirePro V3750 (FireGL)
 alias pcivideo:v00001002d000094C0sv*sd*bc*sc*i* radeon # ATI RV610
 alias pcivideo:v00001002d000094C1sv*sd*bc*sc*i* radeon # ATI Radeon HD 2400 XT
 alias pcivideo:v00001002d000094C3sv*sd*bc*sc*i* radeon # ATI Radeon HD 2400 Pro
 alias pcivideo:v00001002d000094C4sv*sd*bc*sc*i* radeon # ATI Radeon HD 2400 PRO AGP
 alias pcivideo:v00001002d000094C5sv*sd*bc*sc*i* radeon # ATI FireGL V4000
 alias pcivideo:v00001002d000094C6sv*sd*bc*sc*i* radeon # ATI RV610
-alias pcivideo:v00001002d000094C7sv*sd*bc*sc*i* radeon # ATI ATI Radeon HD 2350
+alias pcivideo:v00001002d000094C7sv*sd*bc*sc*i* radeon # ATI Radeon HD 2350
 alias pcivideo:v00001002d000094C8sv*sd*bc*sc*i* radeon # ATI Mobility Radeon HD 2400 XT
 alias pcivideo:v00001002d000094C9sv*sd*bc*sc*i* radeon # ATI Mobility Radeon HD 2400
 alias pcivideo:v00001002d000094CBsv*sd*bc*sc*i* radeon # ATI RADEON E2400
@@ -270,6 +288,12 @@
 alias pcivideo:v00001002d0000950Fsv*sd*bc*sc*i* radeon # ATI Radeon HD3870 X2
 alias pcivideo:v00001002d00009511sv*sd*bc*sc*i* radeon # ATI FireGL V7700
 alias pcivideo:v00001002d00009515sv*sd*bc*sc*i* radeon # ATI Radeon HD3850
+alias pcivideo:v00001002d00009540sv*sd*bc*sc*i* radeon # ATI Radeon HD 4550
+alias pcivideo:v00001002d00009541sv*sd*bc*sc*i* radeon # ATI Radeon RV710
+alias pcivideo:v00001002d0000954Esv*sd*bc*sc*i* radeon # ATI Radeon RV710
+alias pcivideo:v00001002d0000954Fsv*sd*bc*sc*i* radeon # ATI Radeon HD 4350
+alias pcivideo:v00001002d00009552sv*sd*bc*sc*i* radeon # ATI Mobility Radeon 4300 Series
+alias pcivideo:v00001002d00009553sv*sd*bc*sc*i* radeon # ATI Mobility Radeon 4500 Series
 alias pcivideo:v00001002d00009580sv*sd*bc*sc*i* radeon # ATI RV630
 alias pcivideo:v00001002d00009581sv*sd*bc*sc*i* radeon # ATI Mobility Radeon HD 2600
 alias pcivideo:v00001002d00009583sv*sd*bc*sc*i* radeon # ATI Mobility Radeon HD 2600 XT
@@ -282,19 +306,20 @@
 alias pcivideo:v00001002d0000958Csv*sd*bc*sc*i* radeon # ATI FireGL V5600
 alias pcivideo:v00001002d0000958Dsv*sd*bc*sc*i* radeon # ATI FireGL V3600
 alias pcivideo:v00001002d0000958Esv*sd*bc*sc*i* radeon # ATI Radeon HD 2600 LE
+alias pcivideo:v00001002d00009592sv*sd*bc*sc*i* radeon # ATI Radeon RV710
 alias pcivideo:v00001002d000095C0sv*sd*bc*sc*i* radeon # ATI Radeon HD 3470
-alias pcivideo:v00001002d000095C5sv*sd*bc*sc*i* radeon # ATI Radeon HD 3450
-alias pcivideo:v00001002d000095C7sv*sd*bc*sc*i* radeon # ATI Radeon HD 3430
 alias pcivideo:v00001002d000095C2sv*sd*bc*sc*i* radeon # ATI Mobility Radeon HD 3430
 alias pcivideo:v00001002d000095C4sv*sd*bc*sc*i* radeon # ATI Mobility Radeon HD 3400 Series
+alias pcivideo:v00001002d000095C5sv*sd*bc*sc*i* radeon # ATI Radeon HD 3450
+alias pcivideo:v00001002d000095C7sv*sd*bc*sc*i* radeon # ATI Radeon HD 3430
 alias pcivideo:v00001002d000095CDsv*sd*bc*sc*i* radeon # ATI FireMV 2450
 alias pcivideo:v00001002d000095CEsv*sd*bc*sc*i* radeon # ATI FireMV 2260
 alias pcivideo:v00001002d000095CFsv*sd*bc*sc*i* radeon # ATI FireMV 2260
-alias pcivideo:v00001002d00009590sv*sd*bc*sc*i* radeon # ATI ATI Radeon HD 3600 Series
-alias pcivideo:v00001002d00009596sv*sd*bc*sc*i* radeon # ATI ATI Radeon HD 3650 AGP
-alias pcivideo:v00001002d00009597sv*sd*bc*sc*i* radeon # ATI ATI Radeon HD 3600 PRO
-alias pcivideo:v00001002d00009598sv*sd*bc*sc*i* radeon # ATI ATI Radeon HD 3600 XT
-alias pcivideo:v00001002d00009599sv*sd*bc*sc*i* radeon # ATI ATI Radeon HD 3600 PRO
+alias pcivideo:v00001002d00009590sv*sd*bc*sc*i* radeon # ATI Radeon HD 3600 Series
+alias pcivideo:v00001002d00009596sv*sd*bc*sc*i* radeon # ATI Radeon HD 3650 AGP
+alias pcivideo:v00001002d00009597sv*sd*bc*sc*i* radeon # ATI Radeon HD 3600 PRO
+alias pcivideo:v00001002d00009598sv*sd*bc*sc*i* radeon # ATI Radeon HD 3600 XT
+alias pcivideo:v00001002d00009599sv*sd*bc*sc*i* radeon # ATI Radeon HD 3600 PRO
 alias pcivideo:v00001002d00009591sv*sd*bc*sc*i* radeon # ATI Mobility Radeon HD 3650
 alias pcivideo:v00001002d00009593sv*sd*bc*sc*i* radeon # ATI Mobility Radeon HD 3670
 alias pcivideo:v00001002d00009610sv*sd*bc*sc*i* radeon # ATI Radeon HD 3200 Graphics


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ati/devel/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- sources	11 Aug 2008 04:14:20 -0000	1.24
+++ sources	7 Jan 2009 03:18:45 -0000	1.25
@@ -1 +1 @@
-afa4873f58ae6fa31fedeb9ed31531db  xf86-video-ati-6.9.0.tar.bz2
+6445815b12ffa4ccd1aafd43640f466d  xf86-video-ati-6.10.0.tar.bz2


Index: xorg-x11-drv-ati.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ati/devel/xorg-x11-drv-ati.spec,v
retrieving revision 1.145
retrieving revision 1.146
diff -u -r1.145 -r1.146
--- xorg-x11-drv-ati.spec	22 Dec 2008 02:33:14 -0000	1.145
+++ xorg-x11-drv-ati.spec	7 Jan 2009 03:18:45 -0000	1.146
@@ -4,8 +4,8 @@
 
 Summary:   Xorg X11 ati video driver
 Name:      xorg-x11-drv-ati
-Version:   6.9.0
-Release:   65%{?dist}
+Version:   6.10.0
+Release:   1%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -14,7 +14,6 @@
 Source0:   http://www.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
 Source1:   radeon.xinf
 
-Patch0:	    radeon-6.9.0-to-git.patch
 Patch1:     radeon-modeset.patch
 Patch4:     radeon-6.9.0-remove-limit-heuristics.patch
 Patch5:	    radeon-6.9.0-panel-size-sanity.patch
@@ -41,7 +40,6 @@
 
 %prep
 %setup -q -n %{tarball}-%{version}
-%patch0 -p1 -b .git
 %patch1 -p1 -b .modeset
 %patch4 -p1 -b .remove-limit-heuristics
 %patch5 -p1 -b .panel-size
@@ -79,6 +77,9 @@
 %{_mandir}/man4/radeon.4*
 
 %changelog
+* Wed Jan 07 2009 Dave Airlie <airlied at redhat.com> 6.10.0-1
+- rebase to latest upstream release
+
 * Mon Dec 22 2008 Dave Airlie <airlied at redhat.com> 6.9.0-65
 - fix rotate API
 


--- radeon-6.9.0-to-git.patch DELETED ---



From konradm at fedoraproject.org  Wed Jan  7 03:26:38 2009
From: konradm at fedoraproject.org (Conrad Meyer)
Date: Wed,  7 Jan 2009 03:26:38 +0000 (UTC)
Subject: rpms/cudd/F-10 cudd.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <20090107032638.AAC0070100@cvs1.fedora.phx.redhat.com>

Author: konradm

Update of /cvs/pkgs/rpms/cudd/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8766

Modified Files:
	.cvsignore sources 
Added Files:
	cudd.spec 
Log Message:
Import.


--- NEW FILE cudd.spec ---
%define debug_package %{nil}
# rpmbuild doesn't get useful debuginfo from .a libs

Name:           cudd
Version:        2.4.1
Release:        2%{?dist}
Summary:        CU Decision Diagram Package
Group:          Development/Libraries
License:        BSD
URL:            http://vlsi.colorado.edu/~fabio/CUDD/
Source0:        ftp://vlsi.Colorado.EDU/pub/cudd-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)


%description
CUDD is a package for the manipulation of Binary Decision Diagrams
(BDDs), Algebraic Decision Diagrams (ADDs) and Zero-suppressed
Binary Decision Diagrams (ZDDs).


%package        devel
Summary:        Development files for %{name}
Group:          Development/Libraries
Provides:       %{name}-static = %{version}-%{release}


%description    devel
Development headers and libraries for %{name}.


%prep
%setup -q


%build
make %{?_smp_mflags} CPPFLAGS="%{optflags}" ICFLAGS="%{optflags}" \
  XCFLAGS=""


%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_libdir}/%{name}
for slib in */*.a; do
  install -p -m 644 ${slib} $RPM_BUILD_ROOT%{_libdir}/%{name}/
done
mkdir -p $RPM_BUILD_ROOT%{_includedir}/%{name}
for hdr in include/*; do
  install -p -m 644 ${hdr} $RPM_BUILD_ROOT%{_includedir}/%{name}/
done


%clean
rm -rf $RPM_BUILD_ROOT


%files devel
%defattr(-,root,root,-)
%doc README LICENSE cudd/doc
%{_libdir}/%{name}
%{_includedir}/%{name}


%changelog
* Sun Jan 4 2009 Conrad Meyer <konrad at tylerc.org> - 2.4.1-2
- Add LICENSE, cudd/doc to docs.

* Fri Dec 12 2008 Conrad Meyer <konrad at tylerc.org> - 2.4.1-1
- Initial package.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cudd/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	7 Jan 2009 01:26:29 -0000	1.1
+++ .cvsignore	7 Jan 2009 03:26:06 -0000	1.2
@@ -0,0 +1 @@
+cudd-2.4.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cudd/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	7 Jan 2009 01:26:30 -0000	1.1
+++ sources	7 Jan 2009 03:26:06 -0000	1.2
@@ -0,0 +1 @@
+38f4dc5195a746222f1e51c459b49b4f  cudd-2.4.1.tar.gz



From mclasen at fedoraproject.org  Wed Jan  7 03:28:10 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Wed,  7 Jan 2009 03:28:10 +0000 (UTC)
Subject: rpms/gnome-applets/devel mini-commander.patch,1.1,1.2
Message-ID: <20090107032810.10FFC70100@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-applets/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9074

Modified Files:
	mini-commander.patch 
Log Message:
fix build


mini-commander.patch:

Index: mini-commander.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-applets/devel/mini-commander.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mini-commander.patch	7 Jan 2009 02:46:43 -0000	1.1
+++ mini-commander.patch	7 Jan 2009 03:27:39 -0000	1.2
@@ -9,3 +9,22 @@
  	$(GNOME_APPLETS_LIBS)
  
  mc_install_default_macros_SOURCES =	\
+diff -up gnome-applets-2.25.3/modemlights/Makefile.am.mini-commander gnome-applets-2.25.3/modemlights/Makefile.am
+--- gnome-applets-2.25.3/modemlights/Makefile.am.mini-commander	2009-01-06 22:00:00.000000000 -0500
++++ gnome-applets-2.25.3/modemlights/Makefile.am	2009-01-06 21:59:20.000000000 -0500
+@@ -2,6 +2,7 @@ SUBDIRS = docs
+ 
+ INCLUDES = -I. -I$(srcdir) 				\
+ 	$(GNOME_APPLETS_CFLAGS)				\
++	$(GNOME_LIBS2_CFLAGS)				\
+ 	-DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" 	\
+ 	-DVERSION=\""$(VERSION)"\"
+ 
+@@ -13,6 +14,7 @@ modemlights_applet2_SOURCES = \
+ 	properties.c
+ 
+ modemlights_applet2_LDADD = \
++		$(GNOME_LIBS2_LIBS)	\
+ 		     $(GNOME_APPLETS_LIBS)
+ 
+ uidir		= $(datadir)/gnome-2.0/ui



From konradm at fedoraproject.org  Wed Jan  7 03:31:35 2009
From: konradm at fedoraproject.org (Conrad Meyer)
Date: Wed,  7 Jan 2009 03:31:35 +0000 (UTC)
Subject: rpms/cudd/F-9 cudd.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1,
	1.2
Message-ID: <20090107033135.61C7970100@cvs1.fedora.phx.redhat.com>

Author: konradm

Update of /cvs/pkgs/rpms/cudd/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9692

Modified Files:
	.cvsignore sources 
Added Files:
	cudd.spec 
Log Message:
Import.


--- NEW FILE cudd.spec ---
%define debug_package %{nil}
# rpmbuild doesn't get useful debuginfo from .a libs

Name:           cudd
Version:        2.4.1
Release:        2%{?dist}
Summary:        CU Decision Diagram Package
Group:          Development/Libraries
License:        BSD
URL:            http://vlsi.colorado.edu/~fabio/CUDD/
Source0:        ftp://vlsi.Colorado.EDU/pub/cudd-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)


%description
CUDD is a package for the manipulation of Binary Decision Diagrams
(BDDs), Algebraic Decision Diagrams (ADDs) and Zero-suppressed
Binary Decision Diagrams (ZDDs).


%package        devel
Summary:        Development files for %{name}
Group:          Development/Libraries
Provides:       %{name}-static = %{version}-%{release}


%description    devel
Development headers and libraries for %{name}.


%prep
%setup -q


%build
make %{?_smp_mflags} CPPFLAGS="%{optflags}" ICFLAGS="%{optflags}" \
  XCFLAGS=""


%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_libdir}/%{name}
for slib in */*.a; do
  install -p -m 644 ${slib} $RPM_BUILD_ROOT%{_libdir}/%{name}/
done
mkdir -p $RPM_BUILD_ROOT%{_includedir}/%{name}
for hdr in include/*; do
  install -p -m 644 ${hdr} $RPM_BUILD_ROOT%{_includedir}/%{name}/
done


%clean
rm -rf $RPM_BUILD_ROOT


%files devel
%defattr(-,root,root,-)
%doc README LICENSE cudd/doc
%{_libdir}/%{name}
%{_includedir}/%{name}


%changelog
* Sun Jan 4 2009 Conrad Meyer <konrad at tylerc.org> - 2.4.1-2
- Add LICENSE, cudd/doc to docs.

* Fri Dec 12 2008 Conrad Meyer <konrad at tylerc.org> - 2.4.1-1
- Initial package.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cudd/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	7 Jan 2009 01:26:29 -0000	1.1
+++ .cvsignore	7 Jan 2009 03:31:04 -0000	1.2
@@ -0,0 +1 @@
+cudd-2.4.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cudd/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	7 Jan 2009 01:26:30 -0000	1.1
+++ sources	7 Jan 2009 03:31:05 -0000	1.2
@@ -0,0 +1 @@
+38f4dc5195a746222f1e51c459b49b4f  cudd-2.4.1.tar.gz



From mclasen at fedoraproject.org  Wed Jan  7 03:55:44 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Wed,  7 Jan 2009 03:55:44 +0000 (UTC)
Subject: rpms/evince/devel .cvsignore, 1.55, 1.56 evince.spec, 1.143,
	1.144 sources, 1.54, 1.55
Message-ID: <20090107035544.DD36D70100@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/evince/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13341

Modified Files:
	.cvsignore evince.spec sources 
Log Message:
2.25.4



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/evince/devel/.cvsignore,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- .cvsignore	3 Dec 2008 22:06:13 -0000	1.55
+++ .cvsignore	7 Jan 2009 03:55:12 -0000	1.56
@@ -1 +1 @@
-evince-2.25.2.tar.bz2
+evince-2.25.4.tar.bz2


Index: evince.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evince/devel/evince.spec,v
retrieving revision 1.143
retrieving revision 1.144
diff -u -r1.143 -r1.144
--- evince.spec	3 Dec 2008 22:08:19 -0000	1.143
+++ evince.spec	7 Jan 2009 03:55:12 -0000	1.144
@@ -5,15 +5,16 @@
 %define theme_version 2.17.1
 
 Name:		evince
-Version:	2.25.2
-Release:	2%{?dist}
+Version:	2.25.4
+Release:	1%{?dist}
 Summary:	Document viewer
 
 License:	GPLv2+ and GFDL
 Group:		Applications/Publishing
 URL:		http://projects.gnome.org/evince/
 Source0:	http://download.gnome.org/sources/%{name}/2.25/%{name}-%{version}.tar.bz2
-Patch1:		duplex-copies.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=455759
+# Patch1:		duplex-copies.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	gtk2-devel >= %{gtk2_version}
@@ -93,7 +94,7 @@
 
 %prep
 %setup -q
-%patch1 -p0 -b .duplex-copies
+# %patch1 -p0 -b .duplex-copies
 
 %build
 %configure --disable-static --disable-scrollkeeper \
@@ -236,6 +237,10 @@
 %{_libdir}/evince/backends/djvudocument.evince-backend
 
 %changelog
+* Mon Jan  5 2009 Matthias Clasen  <mclasen at redhat.com> - 2.25.4-1
+- Update to 2.25.4
+- Temporarily drop the duplex patch, it needs updating
+
 * Wed Dec  3 2008 Matthias Clasen  <mclasen at redhat.com> - 2.25.2-2
 - Update to 2.25.2
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/evince/devel/sources,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- sources	3 Dec 2008 22:06:13 -0000	1.54
+++ sources	7 Jan 2009 03:55:12 -0000	1.55
@@ -1 +1 @@
-9dda86a6b2f40a43117aaf551ef90140  evince-2.25.2.tar.bz2
+851bfed355d0010ddcdc530f50c0147f  evince-2.25.4.tar.bz2



From petersen at fedoraproject.org  Wed Jan  7 04:32:23 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Wed,  7 Jan 2009 04:32:23 +0000 (UTC)
Subject: rpms/ghc-HTTP/devel ghc-HTTP.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090107043223.DADF370100@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/ghc-HTTP/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19238/devel

Modified Files:
	.cvsignore sources 
Added Files:
	ghc-HTTP.spec import.log 
Log Message:
initial import



--- NEW FILE ghc-HTTP.spec ---
%define pkg_name HTTP
%define ghc_version 6.10.1

%define pkg_libdir %{_libdir}/ghc-%{ghc_version}/%{pkg_name}-%{version}
%define pkg_docdir %{_docdir}/ghc/libraries/%{pkg_name}-%{version}

%bcond_without prof
%bcond_without doc

# ghc does not emit debug information
%define debug_package %{nil}

Name:		ghc-%{pkg_name}
Version:	3001.1.5
Release:	1%{?dist}
Summary:	HTTP library for Haskell

Group:		Development/Libraries
License:	BSD
URL:		http://hackage.haskell.org/cgi-bin/hackage-scripts/package/%{pkg_name}
Source0:	http://hackage.haskell.org/packages/archive/%{pkg_name}/%{version}/%{pkg_name}-%{version}.tar.gz
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Provides:	%{name}-devel = %{version}-%{release}
# ghc has only been bootstrapped on the following archs:
ExclusiveArch:  i386 x86_64 ppc
BuildRequires:  ghc = %{ghc_version}
%if %{with prof}
BuildRequires:  ghc-prof = %{ghc_version}
%endif
Requires:	ghc = %{ghc_version}
Requires(post):	ghc = %{ghc_version}
Requires(preun): ghc = %{ghc_version}
Requires(postun): ghc = %{ghc_version}

%description
A Haskell library for client-side HTTP.


%if %{with prof}
%package prof
Summary: Profiling libraries for %{name}
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
Requires: ghc-prof = %{ghc_version}

%description prof
This package contains profiling libraries for %{name}.
%endif


%prep
%setup -q -n %{pkg_name}-%{version}


%build
%cabal_configure --ghc %{!?without_prof:-p}
%cabal build
%if %{with doc}
%cabal haddock
%endif
%ghc_gen_scripts


%install
rm -rf $RPM_BUILD_ROOT
%cabal_install
%ghc_install_scripts
%ghc_gen_filelists %{name}


%clean
rm -rf $RPM_BUILD_ROOT


%post 
%ghc_register_pkg
%if %{with doc}
%ghc_reindex_haddock
%endif


%preun 
if [ "$1" -eq 0 ] ; then
  %ghc_unregister_pkg
fi


%postun
if [ "$1" -eq 0 ] ; then
%if %{with doc}
  %ghc_reindex_haddock
%endif
fi


%files -f %{name}.files
%defattr(-,root,root,-)
%doc LICENSE
%if %{with doc}
%{pkg_docdir}
%endif


%if %{with prof}
%files prof -f %{name}-prof.files
%defattr(-,root,root,-)
%endif


%changelog
* Tue Dec 23 2008 Jens Petersen <petersen at redhat.com> - 3001.1.5-1
- update to 3001.1.5
- use bcond for doc and prof
- minor tweaks for latest packaging guidelines

* Fri Nov 28 2008 Jens Petersen <petersen at redhat.com> - 3001.1.4-4
- drop LICENSE from -prof subpackage

* Tue Nov 25 2008 Jens Petersen <petersen at redhat.com> - 3001.1.4-3
- add build_doc and build_prof switches
- provide -devel
- drop redundant pre script
- only regenerate doc index in postun if uninstalling

* Mon Nov 10 2008 Jens Petersen <petersen at redhat.com> - 3001.1.4-2
- only build on ghc archs
- version install script requires

* Mon Nov 10 2008 Jens Petersen <petersen at redhat.com> - 3001.1.4-1
- initial packaging for fedora


--- NEW FILE import.log ---
ghc-HTTP-3001_1_5-1_fc10:HEAD:ghc-HTTP-3001.1.5-1.fc10.src.rpm:1231302667


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ghc-HTTP/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	7 Jan 2009 01:25:14 -0000	1.1
+++ .cvsignore	7 Jan 2009 04:31:51 -0000	1.2
@@ -0,0 +1 @@
+HTTP-3001.1.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ghc-HTTP/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	7 Jan 2009 01:25:14 -0000	1.1
+++ sources	7 Jan 2009 04:31:51 -0000	1.2
@@ -0,0 +1 @@
+28f68138bc026f14e61c5dbdb9b6f990  HTTP-3001.1.5.tar.gz



From pkgdb at fedoraproject.org  Wed Jan  7 04:52:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 07 Jan 2009 04:52:44 +0000
Subject: [pkgdb] xorg-x11-drv-nouveau: bskeggs has requested watchcommits
Message-ID: <20090107045244.9358420831C@bastion.fedora.phx.redhat.com>

bskeggs has requested the watchcommits acl on xorg-x11-drv-nouveau (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/xorg-x11-drv-nouveau



From pkgdb at fedoraproject.org  Wed Jan  7 04:52:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 07 Jan 2009 04:52:47 +0000
Subject: [pkgdb] xorg-x11-drv-nouveau: bskeggs has requested watchbugzilla
Message-ID: <20090107045247.4CC2A208421@bastion.fedora.phx.redhat.com>

bskeggs has requested the watchbugzilla acl on xorg-x11-drv-nouveau (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/xorg-x11-drv-nouveau



From pkgdb at fedoraproject.org  Wed Jan  7 04:53:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 07 Jan 2009 04:53:06 +0000
Subject: [pkgdb] xorg-x11-drv-nouveau: bskeggs has requested watchbugzilla
Message-ID: <20090107045306.ADA38208456@bastion.fedora.phx.redhat.com>

bskeggs has requested the watchbugzilla acl on xorg-x11-drv-nouveau (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/xorg-x11-drv-nouveau



From pkgdb at fedoraproject.org  Wed Jan  7 04:53:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 07 Jan 2009 04:53:13 +0000
Subject: [pkgdb] xorg-x11-drv-nouveau: bskeggs has requested watchcommits
Message-ID: <20090107045313.A403720831D@bastion.fedora.phx.redhat.com>

bskeggs has requested the watchcommits acl on xorg-x11-drv-nouveau (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/xorg-x11-drv-nouveau



From pkgdb at fedoraproject.org  Wed Jan  7 04:53:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 07 Jan 2009 04:53:20 +0000
Subject: [pkgdb] xorg-x11-drv-nouveau: bskeggs has requested watchbugzilla
Message-ID: <20090107045320.711FB208457@bastion.fedora.phx.redhat.com>

bskeggs has requested the watchbugzilla acl on xorg-x11-drv-nouveau (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/xorg-x11-drv-nouveau



From pkgdb at fedoraproject.org  Wed Jan  7 04:53:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 07 Jan 2009 04:53:23 +0000
Subject: [pkgdb] xorg-x11-drv-nouveau: bskeggs has requested watchcommits
Message-ID: <20090107045323.1E4CF20831C@bastion.fedora.phx.redhat.com>

bskeggs has requested the watchcommits acl on xorg-x11-drv-nouveau (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/xorg-x11-drv-nouveau



From matt at fedoraproject.org  Wed Jan  7 04:53:45 2009
From: matt at fedoraproject.org (Matthew Farrellee)
Date: Wed,  7 Jan 2009 04:53:45 +0000 (UTC)
Subject: rpms/gsoap/F-10 unused_args.patch, NONE,
	1.1 use_libtool-2.7.12.patch, 
	NONE, 1.1 .cvsignore, 1.4, 1.5 gsoap.spec, 1.9, 1.10 sources,
	1.5, 1.6 2.7.10-upd.patch, 1.1, NONE tru64_hp_ux_c-2.7.10.patch,
	1.2, NONE tru64_hp_ux_cpp-2.7.10.patch, 1.2, NONE
Message-ID: <20090107045346.1267470100@cvs1.fedora.phx.redhat.com>

Author: matt

Update of /cvs/pkgs/rpms/gsoap/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23386

Modified Files:
	.cvsignore gsoap.spec sources 
Added Files:
	unused_args.patch use_libtool-2.7.12.patch 
Removed Files:
	2.7.10-upd.patch tru64_hp_ux_c-2.7.10.patch 
	tru64_hp_ux_cpp-2.7.10.patch 
Log Message:
update to gsoap 2.7.12

unused_args.patch:

--- NEW FILE unused_args.patch ---
--- gsoap-2.7/gsoap/src/symbol2.c	2008-10-02 12:36:22.000000000 -0500
+++ gsoap-2.7mf/gsoap/src/symbol2.c	2008-12-25 09:14:14.000000000 -0600
@@ -6127,7 +6127,7 @@
 }
 
 /* c_type_id returns the arraytype to be used in parameter declaration
-   Allows you to specify the identifier that acts acts as teh name of teh
+   Allows you to specify the identifier that acts acts as the name of the
    type of array */
 char *
 c_type_id(Tnode *typ, char *name)
@@ -7278,6 +7278,7 @@
   fprintf(fout,"\n\nSOAP_FMAC5 void SOAP_FMAC6 soap_delete_%s(struct soap *soap, %s)\n{\tsoap_delete(soap, p);\n}", c_ident(typ), c_type_id(typ, "*p"));
   fprintf(fout,"\n\nSOAP_FMAC3 %s * SOAP_FMAC4 soap_instantiate_%s(struct soap *soap, int n, const char *type, const char *arrayType, size_t *size)", c_type(typ), c_ident(typ));
   fprintf(fout,"\n{");
+  fprintf(fout,"\n\t(void)type; (void)arrayType; /* appease -Wall -Werror */");
   fprintf(fout, "\n\tDBGLOG(TEST, SOAP_MESSAGE(fdebug, \"soap_instantiate_%s(%%d, %%s, %%s)\\n\", n, type?type:\"\", arrayType?arrayType:\"\"));", c_ident(typ));
 
   fprintf(fout,"\n\tstruct soap_clist *cp = soap_link(soap, NULL, %s, n, soap_fdelete);", soap_type(typ));
@@ -7347,7 +7348,7 @@
   fprintf(fhead,"\nSOAP_FMAC3 void SOAP_FMAC4 soap_copy_%s(struct soap*, int, int, void*, size_t, const void*, size_t);", c_ident(typ));
   /* fprintf(fhead,"\n#ifdef __cplusplus\n}\n#endif"); */
   /* fprintf(fout,"\n\n#ifdef __cplusplus\nextern \"C\" {\n#endif"); */
-  fprintf(fout,"\nSOAP_FMAC3 void SOAP_FMAC4 soap_copy_%s(struct soap *soap, int st, int tt, void *p, size_t len, const void *q, size_t n)", c_ident(typ));
+  fprintf(fout,"\nSOAP_FMAC3 void SOAP_FMAC4 soap_copy_%s(struct soap */*soap*/, int /*st*/, int /*tt*/, void *p, size_t /*len*/, const void *q, size_t /*n*/)", c_ident(typ));
   fprintf(fout,"\n{");
   fprintf(fout,"\n\tDBGLOG(TEST, SOAP_MESSAGE(fdebug, \"Copying %s %%p -> %%p\\n\", q, p));", c_type(typ));
   fprintf(fout,"\n\t*(%s*)p = *(%s*)q;\n}", c_type(typ), c_type(typ));
@@ -7809,6 +7810,7 @@
     { if (is_external(typ))
         return;
         fprintf(fout,"\n\nvoid %s::soap_default(struct soap *soap)\n{", c_ident(typ)); 
+		fprintf(fout,"\n\t(void)soap; /* appease -Wall -Werror */");
         if ((s = has_soapref(typ)))
           fprintf(fout,"\n\tthis->%s = soap;", s);
 	d = get_Darraydims(typ);
@@ -7836,6 +7838,7 @@
 	}
         fprintf(fhead,"\nSOAP_FMAC3 void SOAP_FMAC4 soap_default_%s(struct soap*, %s);",c_ident(typ),c_type_id(typ, "*")); 
         fprintf(fout,"\n\nSOAP_FMAC3 void SOAP_FMAC4 soap_default_%s(struct soap *soap, %s)\n{", c_ident(typ),c_type_id(typ, "*a")); 
+		fprintf(fout,"\n\t(void)soap; /* appease -Wall -Werror */");
         if ((s = has_soapref(typ)))
           fprintf(fout,"\n\ta->%s = soap;", s);
 	d = get_Darraydims(typ);
@@ -9054,7 +9057,7 @@
       if (is_typedef(typ))
         fprintf(fout, "\n{\treturn soap_%s2s(soap, n);\n}", t_ident(typ));
       else if (is_boolean(typ))
-        fprintf(fout, "\n{\treturn soap_code_str(soap_codes_%s, n!=0);\n}", c_ident(typ));
+        fprintf(fout, "\n{\t(void)soap; /* appease -Wall -Werror */\n\treturn soap_code_str(soap_codes_%s, n!=0);\n}", c_ident(typ));
       else if (!is_mask(typ))
       { fprintf(fout, "\n{\tconst char *s = soap_code_str(soap_codes_%s, (long)n);", c_ident(typ));
         fprintf(fout, "\n\tif (s)\n\t\treturn s;");

use_libtool-2.7.12.patch:

--- NEW FILE use_libtool-2.7.12.patch ---
diff -ur gsoap-2.7/configure.in gsoap-2.7mf/configure.in
--- gsoap-2.7/configure.in	2008-10-02 12:36:28.000000000 -0500
+++ gsoap-2.7mf/configure.in	2008-12-24 15:05:11.000000000 -0600
@@ -15,7 +15,7 @@
 AM_PROG_LEX
 AC_PROG_YACC
 AC_PROG_CPP
-AC_PROG_RANLIB
+AM_PROG_LIBTOOL
 AC_PROG_LN_S
 AC_PROG_AWK
 AC_PROG_INSTALL
@@ -157,12 +157,12 @@
   AC_MSG_RESULT(no)
   WSDL2H_EXTRA_FLAGS="-DWITH_OPENSSL -DWITH_GZIP"
   WSDL2H_EXTRA_LIBS="-lssl -lcrypto -lz"
-  WSDL2H_SOAP_CPP_LIB="libgsoapssl++.a"
+  WSDL2H_SOAP_CPP_LIB="libgsoapssl++.la"
 else
   AC_MSG_RESULT(yes)
   WSDL2H_EXTRA_FLAGS=
   WSDL2H_EXTRA_LIBS=
-  WSDL2H_SOAP_CPP_LIB="libgsoap++.a"
+  WSDL2H_SOAP_CPP_LIB="libgsoap++.la"
 fi
 AC_SUBST(WSDL2H_EXTRA_FLAGS)
 AC_SUBST(WSDL2H_EXTRA_LIBS)
diff -ur gsoap-2.7/gsoap/Makefile.am gsoap-2.7mf/gsoap/Makefile.am
--- gsoap-2.7/gsoap/Makefile.am	2008-10-02 12:36:28.000000000 -0500
+++ gsoap-2.7mf/gsoap/Makefile.am	2008-12-24 15:43:06.000000000 -0600
@@ -3,7 +3,7 @@
 ## you have all needed files, that a GNU package needs
 AUTOMAKE_OPTIONS = foreign 1.4
 
-SUBDIRS = src wsdl @SAMPLE_DIRS@
+SUBDIRS = . src wsdl @SAMPLE_DIRS@
 CLEANFILES = soapcpp2 wsdl2h stdsoap2_cpp.cpp stdsoap2_ck.c stdsoap2_ck_cpp.cpp stdsoap2_ssl.c stdsoap2_ssl_cpp.cpp
 
 ##	*~ *.req.xml *.res.xml *.nsmap *.wsdl *.xsd *Proxy.h \
@@ -31,19 +31,19 @@
 stdsoap2_ssl_cpp.cpp: stdsoap2.cpp
 	$(LN_S) -f $(srcdir)/stdsoap2.cpp stdsoap2_ssl_cpp.cpp
 
-lib_LIBRARIES = libgsoap.a libgsoap++.a libgsoapck.a libgsoapck++.a libgsoapssl.a libgsoapssl++.a
-libgsoap_a_SOURCES = stdsoap2.c
-libgsoap_a_CFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) -D$(platform)
-libgsoap___a_SOURCES = stdsoap2_cpp.cpp
-libgsoap___a_CXXFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) -D$(platform)
-libgsoapck_a_SOURCES = stdsoap2_ck.c
-libgsoapck_a_CFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) -D$(platform) -DWITH_COOKIES
-libgsoapck___a_SOURCES = stdsoap2_ck_cpp.cpp
-libgsoapck___a_CXXFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) -D$(platform) -DWITH_COOKIES
-libgsoapssl_a_SOURCES = stdsoap2_ssl.c
-libgsoapssl_a_CFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) -D$(platform) -DWITH_OPENSSL -DWITH_DOM -DWITH_GZIP
-libgsoapssl___a_SOURCES = stdsoap2_ssl_cpp.cpp
-libgsoapssl___a_CXXFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) -D$(platform) -DWITH_OPENSSL -DWITH_DOM -DWITH_GZIP
+lib_LTLIBRARIES = libgsoap.la libgsoap++.la libgsoapck.la libgsoapck++.la libgsoapssl.la libgsoapssl++.la
+libgsoap_la_SOURCES = stdsoap2.c
+libgsoap_la_CFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) -D$(platform)
+libgsoap___la_SOURCES = stdsoap2_cpp.cpp
+libgsoap___la_CXXFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) -D$(platform)
+libgsoapck_la_SOURCES = stdsoap2_ck.c
+libgsoapck_la_CFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) -D$(platform) -DWITH_COOKIES
+libgsoapck___la_SOURCES = stdsoap2_ck_cpp.cpp
+libgsoapck___la_CXXFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) -D$(platform) -DWITH_COOKIES
+libgsoapssl_la_SOURCES = stdsoap2_ssl.c
+libgsoapssl_la_CFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) -D$(platform) -DWITH_OPENSSL -DWITH_DOM -DWITH_GZIP
+libgsoapssl___la_SOURCES = stdsoap2_ssl_cpp.cpp
+libgsoapssl___la_CXXFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) -D$(platform) -DWITH_OPENSSL -DWITH_DOM -DWITH_GZIP
 
 BUILT_SOURCES = stdsoap2_cpp.cpp $(lib_LIBRARIES)
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gsoap/F-10/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	28 Jan 2008 18:57:00 -0000	1.4
+++ .cvsignore	7 Jan 2009 04:53:13 -0000	1.5
@@ -1 +1 @@
-gsoap_2.7.10.tar.gz
+gsoap_2.7.12.tar.gz


Index: gsoap.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gsoap/F-10/gsoap.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- gsoap.spec	27 Feb 2008 20:37:12 -0000	1.9
+++ gsoap.spec	7 Jan 2009 04:53:13 -0000	1.10
@@ -1,16 +1,13 @@
 Summary: Generator Tools for Coding SOAP/XML Web Services in C and C++
 Name: gsoap
-Version: 2.7.10
-Release: 4%{?dist}
+Version: 2.7.12
+Release: 1%{?dist}
 License: GPLv2+
 Group: Development/Tools
 URL: http://gsoap2.sourceforge.net
-Source0: http://downloads.sourceforge.net/gsoap2/gsoap_2.7.10.tar.gz
-Patch0: datadir_importpath-2.7.10.patch
-Patch1: use_libtool-2.7.10.patch
-Patch2: install_soapcpp2_wsdl2h_aux-2.7.10.patch
-Patch3: 2.7.10-upd.patch
-Patch4: no_locale.patch
+Source0: http://downloads.sourceforge.net/gsoap2/gsoap_2.7.12.tar.gz
+Patch0: use_libtool-2.7.12.patch
+Patch1: unused_args.patch
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 BuildRequires: flex
@@ -46,25 +43,11 @@
 %prep
 %setup -q -n gsoap-2.7
 
-# use ${datadir}, not `pwd`, when setting *_IMPORT_PATH locations
+# enable use of libtool in configure.in and a few Makefile.am files
 %patch0 -p1
 
-# enable use of libtool in configure.in and a few Makefile.am files
 %patch1 -p1
 
-# update gsoap/Makefile.am so that it installs gsoap/import,
-# gsoap/plugin, gsoap/WS, gsoap/custom and gsoap/extras into
-# ${prefix}/share/gsoap
-%patch2 -p1
-
-# patch from upstream that fixes glibc C locale issues, hp-ux errno
-# definition, and xsd_dateTime timezone processing for WS-I
-%patch3 -p1
-
-# using locale functions in glibc is experimental, so this patch stops
-# testing for them so they won't be used
-%patch4 -p1
-
 # a number of ~ files are distribute, but we do not want them
 find . -name "*~" -exec rm {} \;
 
@@ -248,6 +231,15 @@
 %_libdir/pkgconfig/gsoap++.pc
 %_libdir/pkgconfig/gsoapssl.pc
 %_libdir/pkgconfig/gsoapssl++.pc
+# Additions in 2.7.12-1
+%_datadir/gsoap/WS/WS-ReliableMessaging.wsdl
+%_datadir/gsoap/WS/WS-ReliableMessaging.xsd
+%_datadir/gsoap/WS/reference-1.1.xsd
+%_datadir/gsoap/WS/ws-reliability-1.1.xsd
+%_datadir/gsoap/import/ref.h
+%_datadir/gsoap/import/wsrm.h
+%_datadir/gsoap/import/wsrm4.h
+%_datadir/gsoap/import/wsrx.h
 
 
 %post -p /sbin/ldconfig
@@ -257,6 +249,17 @@
 
 
 %changelog
+* Wed Dec 24 2008  <matt at redhat> - 2.7.12-1
+- Updated to gsoap 2.7.12:
+-  Numerous bug fixes - xml:lang, maxOccurs="unbounded", SSL, xmlns="", ...
+-  New features, maintaining backward compatibility - MinGW, wsseapi, multi-endpoint connect, ...
+- Patches removed (incorporated upstream):
+-  datadir_importpath-2.7.10.patch
+-  install_soapcpp2_wsdl2h_aux-2.7.10.patch
+-  no_locale.patch as default off, enable by defining WITH_C_LOCALE
+- Patches added (sent upstream):
+-  unused_args.patch - eliminate many unused param warnings
+
 * Thu Feb 21 2008  <mfarrellee at redhat> - 2.7.10-4
 - Applied upd patch from upstream. It fixes glibc C locale issues,
   hp-ux h_errno definition, and xsd:dateTime timezone processing for


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gsoap/F-10/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	28 Jan 2008 18:57:01 -0000	1.5
+++ sources	7 Jan 2009 04:53:13 -0000	1.6
@@ -1 +1 @@
-31ac50314900d87c43f8f008c8de712f  gsoap_2.7.10.tar.gz
+2ad798072cd812a0d8c3aebadf557762  gsoap_2.7.12.tar.gz


--- 2.7.10-upd.patch DELETED ---


--- tru64_hp_ux_c-2.7.10.patch DELETED ---


--- tru64_hp_ux_cpp-2.7.10.patch DELETED ---



From lmacken at fedoraproject.org  Wed Jan  7 04:58:12 2009
From: lmacken at fedoraproject.org (Luke Macken)
Date: Wed,  7 Jan 2009 04:58:12 +0000 (UTC)
Subject: rpms/python-beaker/devel .cvsignore, 1.5, 1.6 python-beaker.spec,
	1.5, 1.6 sources, 1.5, 1.6
Message-ID: <20090107045812.B790870100@cvs1.fedora.phx.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/python-beaker/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24346

Modified Files:
	.cvsignore python-beaker.spec sources 
Log Message:
* Tue Jan 06 2009 Luke Macken <lmacken at redhat.com> - 1.1.3-1
- Update to 1.1.3




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-beaker/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	20 Dec 2008 13:49:16 -0000	1.5
+++ .cvsignore	7 Jan 2009 04:57:41 -0000	1.6
@@ -1 +1 @@
-Beaker-1.1.2.tar.gz
+Beaker-1.1.3.tar.gz


Index: python-beaker.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-beaker/devel/python-beaker.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- python-beaker.spec	20 Dec 2008 13:49:16 -0000	1.5
+++ python-beaker.spec	7 Jan 2009 04:57:42 -0000	1.6
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name: python-beaker
-Version: 1.1.2
+Version: 1.1.3
 Release: 1%{?dist}
 Summary: WSGI middleware layer to provide sessions
 
@@ -44,9 +44,12 @@
 
 
 %changelog
+* Tue Jan 06 2009 Luke Macken <lmacken at redhat.com> - 1.1.3-1
+- Update to 1.1.3
+
 * Sat Dec 20 2008 Felix Schwarz <felix.schwarz at oss.schwarz.eu> - 1.1.2-1
 - Update to 1.1.2
-
+ 
 * Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 1.0.3-2
 - Rebuild for Python 2.6
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-beaker/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	20 Dec 2008 13:49:16 -0000	1.5
+++ sources	7 Jan 2009 04:57:42 -0000	1.6
@@ -1 +1 @@
-9331ef7df88a5329623ba6b3c71818ee  Beaker-1.1.2.tar.gz
+bac93e2f39e15aa145dabacc5f15fc2e  Beaker-1.1.3.tar.gz



From lmacken at fedoraproject.org  Wed Jan  7 05:01:01 2009
From: lmacken at fedoraproject.org (Luke Macken)
Date: Wed,  7 Jan 2009 05:01:01 +0000 (UTC)
Subject: rpms/python-formencode/devel import.log, NONE, 1.1 .cvsignore, 1.10,
	1.11 python-formencode.spec, 1.23, 1.24 sources, 1.10,
	1.11 formencode-translations-system.patch, 1.1, NONE
Message-ID: <20090107050101.CAF4B70100@cvs1.fedora.phx.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/python-formencode/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25075/devel

Modified Files:
	.cvsignore python-formencode.spec sources 
Added Files:
	import.log 
Removed Files:
	formencode-translations-system.patch 
Log Message:
* Tue Jan 06 2009 Luke Macken <lmacken at redhat.com> - 1.2-1
- Update to 1.2
- Run the test suite
- Remove formencode-translations-system.patch




--- NEW FILE import.log ---
python-formencode-1_2-1_fc10:HEAD:python-formencode-1.2-1.fc10.src.rpm:1231304406


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-formencode/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	11 Jul 2008 16:27:51 -0000	1.10
+++ .cvsignore	7 Jan 2009 05:00:30 -0000	1.11
@@ -1 +1 @@
-FormEncode-1.0.1.tar.gz
+FormEncode-1.2.tar.gz


Index: python-formencode.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-formencode/devel/python-formencode.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- python-formencode.spec	29 Nov 2008 15:27:27 -0000	1.23
+++ python-formencode.spec	7 Jan 2009 05:00:31 -0000	1.24
@@ -4,15 +4,14 @@
 %define srcname FormEncode
 
 Name:           python-formencode
-Version:        1.0.1
-Release:        3%{?dist}
+Version:        1.2
+Release:        1%{?dist}
 Summary:        HTML form validation, generation, and convertion package  
 
 Group:          Development/Libraries
 License:        Python
 URL:            http://formencode.org/
 Source0:        http://cheeseshop.python.org/packages/source/F/%{srcname}/%{srcname}-%{version}.tar.gz
-Patch0:         formencode-translations-system.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildArch:      noarch
@@ -21,6 +20,7 @@
 BuildRequires: python-devel
 BuildRequires: python-setuptools-devel
 BuildRequires: python-docutils
+BuildRequires: python-nose
 
 
 %description
@@ -30,7 +30,6 @@
 
 %prep
 %setup -q -n %{srcname}-%{version}
-%patch0 -p1 -b .locale
 
 %build
 %{__python} setup.py build
@@ -65,6 +64,8 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%check
+PYTHONPATH=$(pwd) nosetests
 
 %files -f %{srcname}.lang
 %defattr(-,root,root,-)
@@ -73,6 +74,11 @@
 %{python_sitelib}/%{srcname}-%{version}-py%{pyver}.egg-info
 
 %changelog
+* Tue Jan 06 2009 Luke Macken <lmacken at redhat.com> - 1.2-1
+- Update to 1.2
+- Run the test suite
+- Remove formencode-translations-system.patch
+
 * Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 1.0.1-3
 - Rebuild for Python 2.6
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-formencode/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	11 Jul 2008 16:27:51 -0000	1.10
+++ sources	7 Jan 2009 05:00:31 -0000	1.11
@@ -1 +1 @@
-544e3fd5d9ff8bb6532e1c6f176e7a0d  FormEncode-1.0.1.tar.gz
+da9d30ad0115ed8de86dc3b796899b41  FormEncode-1.2.tar.gz


--- formencode-translations-system.patch DELETED ---



From lmacken at fedoraproject.org  Wed Jan  7 05:03:44 2009
From: lmacken at fedoraproject.org (Luke Macken)
Date: Wed,  7 Jan 2009 05:03:44 +0000 (UTC)
Subject: rpms/python-mako/devel .cvsignore, 1.2, 1.3 python-mako.spec, 1.2, 
	1.3 sources, 1.2, 1.3
Message-ID: <20090107050344.6275870100@cvs1.fedora.phx.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/python-mako/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25871

Modified Files:
	.cvsignore python-mako.spec sources 
Log Message:
Update to 0.2.4


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-mako/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	31 May 2008 20:47:02 -0000	1.2
+++ .cvsignore	7 Jan 2009 05:03:13 -0000	1.3
@@ -1 +1 @@
-Mako-0.1.10.tar.gz
+Mako-0.2.4.tar.gz


Index: python-mako.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-mako/devel/python-mako.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- python-mako.spec	29 Nov 2008 15:36:08 -0000	1.2
+++ python-mako.spec	7 Jan 2009 05:03:13 -0000	1.3
@@ -1,8 +1,8 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name: python-mako
-Version: 0.1.10
-Release: 3%{?dist}
+Version: 0.2.4
+Release: 1%{?dist}
 Summary: Mako template library for Python
 
 Group: Development/Languages
@@ -45,10 +45,14 @@
 %files
 %defattr(-,root,root,-)
 %doc CHANGES LICENSE README doc examples
+%{_bindir}/mako-render
 %{python_sitelib}/*
 
 
 %changelog
+* Tue Jan 06 2009 Luke Macken <lmacken at redhat.com> - 0.2.4-1
+- Update to 0.2.4
+
 * Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 0.1.10-3
 - Rebuild for Python 2.6
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-mako/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	31 May 2008 20:47:02 -0000	1.2
+++ sources	7 Jan 2009 05:03:13 -0000	1.3
@@ -1 +1 @@
-fd9c9f8175b6558c2a74b3f93dedb5e7  Mako-0.1.10.tar.gz
+f1a3d79bb79f6787e6d5c70dfd1c8ff8  Mako-0.2.4.tar.gz



From mclasen at fedoraproject.org  Wed Jan  7 05:05:37 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Wed,  7 Jan 2009 05:05:37 +0000 (UTC)
Subject: rpms/cairo/devel .cvsignore, 1.46, 1.47 cairo.spec, 1.96,
	1.97 sources, 1.46, 1.47
Message-ID: <20090107050537.5453570100@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/cairo/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26368

Modified Files:
	.cvsignore cairo.spec sources 
Log Message:
1.8.6



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cairo/devel/.cvsignore,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- .cvsignore	25 Sep 2008 23:24:42 -0000	1.46
+++ .cvsignore	7 Jan 2009 05:05:05 -0000	1.47
@@ -1 +1 @@
-cairo-1.8.0.tar.gz
+cairo-1.8.6.tar.gz


Index: cairo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cairo/devel/cairo.spec,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -r1.96 -r1.97
--- cairo.spec	13 Dec 2008 19:22:26 -0000	1.96
+++ cairo.spec	7 Jan 2009 05:05:06 -0000	1.97
@@ -4,8 +4,8 @@
 
 Summary:	A 2D graphics library
 Name:		cairo
-Version:	1.8.0
-Release:	3%{?dist}
+Version:	1.8.6
+Release:	1%{?dist}
 URL:		http://cairographics.org
 Source0:	http://cairographics.org/releases/%{name}-%{version}.tar.gz
 License:	LGPLv2 or MPLv1.1
@@ -88,6 +88,9 @@
 %{_datadir}/gtk-doc/html/cairo
 
 %changelog
+* Wed Jan  7 2008 Matthias Clasen <mclasen at redhat.com> 1.8.6-1
+- Update to 1.8.6
+
 * Sun Dec 14 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> 1.8.0-3
 - Rebuild for pkgconfig provides
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cairo/devel/sources,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- sources	25 Sep 2008 23:24:42 -0000	1.46
+++ sources	7 Jan 2009 05:05:06 -0000	1.47
@@ -1 +1 @@
-4ea70ea87b47e92d318d4e7f5b940f47  cairo-1.8.0.tar.gz
+4e64139ef6f668df24450f3b81dd0771  cairo-1.8.6.tar.gz



From lmacken at fedoraproject.org  Wed Jan  7 05:06:27 2009
From: lmacken at fedoraproject.org (Luke Macken)
Date: Wed,  7 Jan 2009 05:06:27 +0000 (UTC)
Subject: rpms/python-paste/devel .cvsignore, 1.9, 1.10 python-paste.spec,
	1.12, 1.13 sources, 1.9, 1.10
Message-ID: <20090107050627.E10957013F@cvs1.fedora.phx.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/python-paste/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26748

Modified Files:
	.cvsignore python-paste.spec sources 
Log Message:
Update to 1.7.2


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-paste/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	14 Jun 2008 06:46:07 -0000	1.9
+++ .cvsignore	7 Jan 2009 05:05:57 -0000	1.10
@@ -1 +1 @@
-Paste-1.7.1.tar.gz
+Paste-1.7.2.tar.gz


Index: python-paste.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-paste/devel/python-paste.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- python-paste.spec	29 Nov 2008 15:52:13 -0000	1.12
+++ python-paste.spec	7 Jan 2009 05:05:57 -0000	1.13
@@ -2,8 +2,8 @@
 %{!?pyver: %define pyver %(%{__python} -c "import sys ; print sys.version[:3]")}
 
 Name:           python-paste
-Version:        1.7.1
-Release:        2%{?dist}
+Version:        1.7.2
+Release:        1%{?dist}
 Summary:        Tools for using a Web Server Gateway Interface stack
 Group:          System Environment/Libraries
 License:        MIT
@@ -62,6 +62,9 @@
 
 
 %changelog
+* Tue Jan 06 2009 Luke Macken <lmacken at redhat.com> - 1.7.2-1
+- Update to 1.7.2
+
 * Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 1.7.1-2
 - Rebuild for Python 2.6
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-paste/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	14 Jun 2008 06:46:07 -0000	1.9
+++ sources	7 Jan 2009 05:05:57 -0000	1.10
@@ -1 +1 @@
-1c975cd645cd4aff86dab47c6d9059e1  Paste-1.7.1.tar.gz
+a6a58d08dc4bff91d5d1c519d2277f8a  Paste-1.7.2.tar.gz



From mclasen at fedoraproject.org  Wed Jan  7 05:08:34 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Wed,  7 Jan 2009 05:08:34 +0000 (UTC)
Subject: rpms/cairo/devel cairo.spec,1.97,1.98
Message-ID: <20090107050834.3275F70100@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/cairo/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27944

Modified Files:
	cairo.spec 
Log Message:
fix spec



Index: cairo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cairo/devel/cairo.spec,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -r1.97 -r1.98
--- cairo.spec	7 Jan 2009 05:05:06 -0000	1.97
+++ cairo.spec	7 Jan 2009 05:08:03 -0000	1.98
@@ -88,7 +88,7 @@
 %{_datadir}/gtk-doc/html/cairo
 
 %changelog
-* Wed Jan  7 2008 Matthias Clasen <mclasen at redhat.com> 1.8.6-1
+* Wed Jan  7 2009 Matthias Clasen <mclasen at redhat.com> 1.8.6-1
 - Update to 1.8.6
 
 * Sun Dec 14 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> 1.8.0-3



From alexlan at fedoraproject.org  Wed Jan  7 05:22:42 2009
From: alexlan at fedoraproject.org (Alex Lancaster)
Date: Wed,  7 Jan 2009 05:22:42 +0000 (UTC)
Subject: rpms/galeon/devel galeon-2.0.7-moz191.patch, NONE, 1.1 galeon.spec, 
	1.57, 1.58
Message-ID: <20090107052242.2AFED70100@cvs1.fedora.phx.redhat.com>

Author: alexlan

Update of /cvs/extras/rpms/galeon/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30411

Modified Files:
	galeon.spec 
Added Files:
	galeon-2.0.7-moz191.patch 
Log Message:
* Tue Jan  6 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 2.0.7-5
- Apply modified patch for epiphany for building against xulrunner
  1.9.1 from Christopher Aillon (#478666)


galeon-2.0.7-moz191.patch:

--- NEW FILE galeon-2.0.7-moz191.patch ---
diff -ur galeon-2.0.7.umg/mozilla/EventContext.cpp galeon-2.0.7/mozilla/EventContext.cpp
--- galeon-2.0.7.umg/mozilla/EventContext.cpp	2008-07-18 07:41:08.000000000 +0300
+++ galeon-2.0.7/mozilla/EventContext.cpp	2009-01-06 23:17:32.000000000 +0200
@@ -35,6 +35,7 @@
 #include <nsIDOMXULDocument.h>
 #include <nsIURI.h>
 #include <nsIDOMNSEvent.h>
+#include <nsIDOMNSElement.h>
 #include <nsIDOMNSHTMLElement.h>
 #include <nsIDOMCharacterData.h>
 #include <nsIDOMHTMLButtonElement.h>
@@ -518,20 +519,21 @@
 nsresult EventContext::GetTargetCoords (nsIDOMEventTarget *aTarget, PRInt32 *aX, PRInt32 *aY)
 {
 	/* Calculate the node coordinates relative to the widget origin */
-	nsCOMPtr<nsIDOMNSHTMLElement> elem = do_QueryInterface(aTarget);
+	nsCOMPtr<nsIDOMNSHTMLElement> nsHTMLElem (do_QueryInterface(aTarget));
 
 	PRInt32 x = 0, y = 0;
-	while (elem)
+	while (nsHTMLElem)
 	{
 		PRInt32 val;
-		elem->GetOffsetTop(&val);	y += val;
-		elem->GetScrollTop(&val);	y -= val;
-		elem->GetOffsetLeft(&val);	x += val;
-		elem->GetScrollLeft(&val);	x -= val;
+		nsCOMPtr<nsIDOMNSElement> nsElem (do_QueryInterface(nsHTMLElem));   
+		nsHTMLElem->GetOffsetTop(&val);         y += val;
+		nsElem->GetScrollTop(&val);             y -= val;
+		nsHTMLElem->GetOffsetLeft(&val);        x += val;
+		nsElem->GetScrollLeft(&val);    x -= val;
 
 		nsCOMPtr<nsIDOMElement> parent;
-		elem->GetOffsetParent(getter_AddRefs(parent));
-		elem = do_QueryInterface(parent);
+		nsHTMLElem->GetOffsetParent (getter_AddRefs (parent));
+		nsHTMLElem = do_QueryInterface(parent);
 	}
 	*aX = x;
 	*aY = y;


Index: galeon.spec
===================================================================
RCS file: /cvs/extras/rpms/galeon/devel/galeon.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- galeon.spec	26 Dec 2008 09:33:55 -0000	1.57
+++ galeon.spec	7 Jan 2009 05:22:11 -0000	1.58
@@ -1,9 +1,9 @@
-%define gecko_ver 1.9
+%define gecko_ver 1.9.1
 
 Summary:	GNOME2 Web browser based on Mozilla
 Name:		galeon
 Version:	2.0.7
-Release:	4%{?dist}
+Release:	5%{?dist}
 License:	GPLv2+
 Group:		Applications/Internet
 URL:		http://galeon.sourceforge.net/
@@ -13,6 +13,7 @@
 Patch2:		galeon-2.0.7-print.patch
 Patch3:		galeon-2.0.7-dfltfont.patch
 Patch4:		galeon-2.0.7-warnings.patch
+Patch5:		galeon-2.0.7-moz191.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n)
 
 BuildRequires:	gettext desktop-file-utils
@@ -49,6 +50,7 @@
 %patch2 -p1 -b .print
 %patch3 -p1 -b .dfltfont
 %patch4 -p1 -b .warnings
+%patch5 -p1 -b .moz191
 
 
 %build
@@ -123,6 +125,10 @@
 
 
 %changelog
+* Tue Jan  6 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 2.0.7-5
+- Apply modified patch for epiphany for building against xulrunner
+  1.9.1 from Christopher Aillon (#478666)
+
 * Fri Dec 26 2008 Denis Leroy <denis at poolshark.org> - 2.0.7-4
 - Rebuild for newer gnome desktop library
 



From lmacken at fedoraproject.org  Wed Jan  7 05:25:21 2009
From: lmacken at fedoraproject.org (Luke Macken)
Date: Wed,  7 Jan 2009 05:25:21 +0000 (UTC)
Subject: rpms/python-routes/devel .cvsignore, 1.2, 1.3 python-routes.spec,
	1.2, 1.3 sources, 1.2, 1.3
Message-ID: <20090107052521.632FE70100@cvs1.fedora.phx.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/python-routes/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31233

Modified Files:
	.cvsignore python-routes.spec sources 
Log Message:
* Tue Jan 06 2009 Luke Macken <lmacken at redhat.com> - 1.10.1-2
- Update to 1.10.1
- Run the test suite




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-routes/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	31 May 2008 21:19:09 -0000	1.2
+++ .cvsignore	7 Jan 2009 05:24:50 -0000	1.3
@@ -1 +1 @@
-Routes-1.8.tar.gz
+Routes-1.10.1.tar.gz


Index: python-routes.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-routes/devel/python-routes.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- python-routes.spec	29 Nov 2008 15:52:23 -0000	1.2
+++ python-routes.spec	7 Jan 2009 05:24:51 -0000	1.3
@@ -1,8 +1,8 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name: python-routes
-Version: 1.8
-Release: 3%{?dist}
+Version: 1.10.1
+Release: 1%{?dist}
 Summary: Rails-like routes for Python
 
 Group: Development/Languages
@@ -11,7 +11,8 @@
 Source0: http://pypi.python.org/packages/source/R/Routes/Routes-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
-BuildRequires: python-setuptools-devel
+BuildRequires: python-setuptools-devel 
+BuildRequires: python-nose python-webtest python-paste
 
 
 %description
@@ -33,6 +34,10 @@
 %{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
 
 
+%check
+PYTHONPATH=$(pwd) nosetests
+
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -44,6 +49,10 @@
 
 
 %changelog
+* Tue Jan 06 2009 Luke Macken <lmacken at redhat.com> - 1.10.1-2
+- Update to 1.10.1
+- Run the test suite
+
 * Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 1.8-3
 - Rebuild for Python 2.6
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-routes/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	31 May 2008 21:19:09 -0000	1.2
+++ sources	7 Jan 2009 05:24:51 -0000	1.3
@@ -1 +1 @@
-56b2425abe4c585fa5043122d1e75eca  Routes-1.8.tar.gz
+c54285a1642c644a915dabba8bf5480b  Routes-1.10.1.tar.gz



From lmacken at fedoraproject.org  Wed Jan  7 05:32:40 2009
From: lmacken at fedoraproject.org (Luke Macken)
Date: Wed,  7 Jan 2009 05:32:40 +0000 (UTC)
Subject: rpms/python-simplejson/devel .cvsignore, 1.13,
	1.14 python-simplejson.spec, 1.23, 1.24 sources, 1.13, 1.14
Message-ID: <20090107053240.7F64970100@cvs1.fedora.phx.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/python-simplejson/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32707

Modified Files:
	.cvsignore python-simplejson.spec sources 
Log Message:
Update to 2.0.7


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-simplejson/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	20 Oct 2008 19:19:47 -0000	1.13
+++ .cvsignore	7 Jan 2009 05:32:09 -0000	1.14
@@ -1 +1 @@
-simplejson-2.0.3.tar.gz
+simplejson-2.0.7.tar.gz


Index: python-simplejson.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-simplejson/devel/python-simplejson.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- python-simplejson.spec	29 Nov 2008 15:52:24 -0000	1.23
+++ python-simplejson.spec	7 Jan 2009 05:32:10 -0000	1.24
@@ -2,8 +2,8 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           python-simplejson
-Version:        2.0.3
-Release:        3%{?dist}
+Version:        2.0.7
+Release:        1%{?dist}
 Summary:        Simple, fast, extensible JSON encoder/decoder for Python
 
 Group:          System Environment/Libraries
@@ -65,6 +65,9 @@
 
 
 %changelog
+* Tue Jan 06 2009 Luke Macken <lmacken at redhat.com> 2.0.7-1
+- Update to 2.0.7
+
 * Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 2.0.3-3
 - Rebuild for Python 2.6
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-simplejson/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	20 Oct 2008 19:19:47 -0000	1.13
+++ sources	7 Jan 2009 05:32:10 -0000	1.14
@@ -1 +1 @@
-6da5d665c9e772ac65eae9b4ce6d737b  simplejson-2.0.3.tar.gz
+9d02273f8615b8e3fceda891ffff10d1  simplejson-2.0.7.tar.gz



From lmacken at fedoraproject.org  Wed Jan  7 05:36:00 2009
From: lmacken at fedoraproject.org (Luke Macken)
Date: Wed,  7 Jan 2009 05:36:00 +0000 (UTC)
Subject: rpms/python-toscawidgets/devel .cvsignore, 1.7,
	1.8 python-toscawidgets.spec, 1.8, 1.9 sources, 1.7, 1.8
Message-ID: <20090107053600.EDB5470100@cvs1.fedora.phx.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/python-toscawidgets/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1228

Modified Files:
	.cvsignore python-toscawidgets.spec sources 
Log Message:
Update to 0.9.4


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-toscawidgets/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	26 Aug 2008 07:53:31 -0000	1.7
+++ .cvsignore	7 Jan 2009 05:35:30 -0000	1.8
@@ -1 +1 @@
-ToscaWidgets-0.9.3.tar.gz
+ToscaWidgets-0.9.4.tar.gz


Index: python-toscawidgets.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-toscawidgets/devel/python-toscawidgets.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- python-toscawidgets.spec	29 Nov 2008 16:01:51 -0000	1.8
+++ python-toscawidgets.spec	7 Jan 2009 05:35:30 -0000	1.9
@@ -4,8 +4,8 @@
 %define srcname ToscaWidgets
 
 Name:           python-toscawidgets
-Version:        0.9.3
-Release:        2%{?dist}
+Version:        0.9.4
+Release:        1%{?dist}
 Summary:        Toolkit to help create widgets for WSGI web apps
 Group:          Development/Languages
 License:        MIT
@@ -56,6 +56,9 @@
 
 
 %changelog
+* Tue Jan 06 2009 Luke Macken <lmacken at redhat.com> - 0.9.4-1
+- Update to 0.9.4
+
 * Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 0.9.3-2
 - Rebuild for Python 2.6
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-toscawidgets/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	26 Aug 2008 07:53:31 -0000	1.7
+++ sources	7 Jan 2009 05:35:30 -0000	1.8
@@ -1 +1 @@
-8b7ab6572e5487cc3609b2e097fadcf3  ToscaWidgets-0.9.3.tar.gz
+b0816c432869eae996b3e33fd2bbf4a0  ToscaWidgets-0.9.4.tar.gz



From lmacken at fedoraproject.org  Wed Jan  7 05:40:57 2009
From: lmacken at fedoraproject.org (Luke Macken)
Date: Wed,  7 Jan 2009 05:40:57 +0000 (UTC)
Subject: rpms/python-weberror/devel import.log, NONE,
	1.1 python-weberror.spec, 
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090107054057.C975C70100@cvs1.fedora.phx.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/python-weberror/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3181/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log python-weberror.spec 
Log Message:
Initial import of python-weberror



--- NEW FILE import.log ---
python-weberror-0_10_1-1_fc10:HEAD:python-weberror-0.10.1-1.fc10.src.rpm:1231306753


--- NEW FILE python-weberror.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

Name:           python-weberror
Version:        0.10.1
Release:        1%{?dist}
Summary:        Web Error handling and exception catching middleware

Group:          Development/Languages
License:        MIT
URL:            http://pypi.python.org/pypi/WebError
Source0:        http://pypi.python.org/packages/source/W/WebError/WebError-%{version}.tar.gz
BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildArch:      noarch

BuildRequires:  python-devel
BuildRequires:  python-setuptools-devel
BuildRequires:  python-nose
BuildRequires:  python-webob
BuildRequires:  python-webtest
BuildRequires:  python-paste
BuildRequires:  python-pygments
BuildRequires:  python-tempita
BuildRequires:  python-simplejson

Requires:       python-webob
Requires:       python-tempita
Requires:       python-pygments
Requires:       python-simplejson

%description
WebError is WSGI middleware that performs error handling and exception
catching.

%prep
%setup -q -n WebError-%{version}
find . -type f -name ._\* -exec rm -f {} \;
%{__chmod} 0644 WebError.egg-info/*


%build
%{__python} setup.py build


%check
nosetests


%install
%{__rm} -rf %{buildroot}
%{__python} setup.py install --skip-build --root %{buildroot}

 
%clean
%{__rm} -rf %{buildroot}


%files
%defattr(-,root,root,-)
%doc CHANGELOG LICENSE
%{python_sitelib}/weberror
%{python_sitelib}/*.egg-info


%changelog
* Tue Jan 06 2009 Luke Macken <lmacken at redhat.com> - 0.10.1-1
- Update to 0.10.1
- Remove the wsgiref patch

* Wed Oct 22 2008 Luke Macken <lmacken at redhat.com> - 0.9-3
- Add python-{paste,pygments,tempita,simplejson} to the BuildRequires
- Add python-{tempita,pygments,simplejson} to the Requires

* Tue Oct 21 2008 Luke Macken <lmacken at redhat.com> - 0.9-2
- Add a patch to remove the wsgiref requirement, as it is now in Python2.5

* Tue Oct 21 2008 Luke Macken <lmacken at redhat.com> - 0.9-1
- Update to 0.9
- Add python-tempita to the BuildRequires

* Thu Jul 17 2008 Ricky Zhou <ricky at fedoraproject.org> - 0.8-3
- Update Requires for python-webob rename.
- Add BuildRequires on python-webob and python-webtest.

* Mon Jul 07 2008 Ricky Zhou <ricky at fedoraproject.org> - 0.8-2
- Add %%check section.

* Sat Jun 14 2008 Ricky Zhou <ricky at fedoraproject.org> - 0.8-1
- Initial RPM Package.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-weberror/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	7 Jan 2009 01:24:06 -0000	1.1
+++ .cvsignore	7 Jan 2009 05:40:26 -0000	1.2
@@ -0,0 +1 @@
+WebError-0.10.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-weberror/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	7 Jan 2009 01:24:06 -0000	1.1
+++ sources	7 Jan 2009 05:40:27 -0000	1.2
@@ -0,0 +1 @@
+51e69120f19624430853cf493d59e68d  WebError-0.10.1.tar.gz



From matt at fedoraproject.org  Wed Jan  7 05:43:03 2009
From: matt at fedoraproject.org (Matthew Farrellee)
Date: Wed,  7 Jan 2009 05:43:03 +0000 (UTC)
Subject: rpms/gsoap/F-9 unused_args.patch, NONE, 1.1 use_libtool-2.7.12.patch,
	NONE, 1.1 .cvsignore, 1.4, 1.5 gsoap.spec, 1.9, 1.10 sources,
	1.5, 1.6 2.7.10-upd.patch, 1.1, NONE tru64_hp_ux_c-2.7.10.patch,
	1.2, NONE tru64_hp_ux_cpp-2.7.10.patch, 1.2, NONE
Message-ID: <20090107054303.2B37B70100@cvs1.fedora.phx.redhat.com>

Author: matt

Update of /cvs/pkgs/rpms/gsoap/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4037

Modified Files:
	.cvsignore gsoap.spec sources 
Added Files:
	unused_args.patch use_libtool-2.7.12.patch 
Removed Files:
	2.7.10-upd.patch tru64_hp_ux_c-2.7.10.patch 
	tru64_hp_ux_cpp-2.7.10.patch 
Log Message:
update to gsoap 2.7.12

unused_args.patch:

--- NEW FILE unused_args.patch ---
--- gsoap-2.7/gsoap/src/symbol2.c	2008-10-02 12:36:22.000000000 -0500
+++ gsoap-2.7mf/gsoap/src/symbol2.c	2008-12-25 09:14:14.000000000 -0600
@@ -6127,7 +6127,7 @@
 }
 
 /* c_type_id returns the arraytype to be used in parameter declaration
-   Allows you to specify the identifier that acts acts as teh name of teh
+   Allows you to specify the identifier that acts acts as the name of the
    type of array */
 char *
 c_type_id(Tnode *typ, char *name)
@@ -7278,6 +7278,7 @@
   fprintf(fout,"\n\nSOAP_FMAC5 void SOAP_FMAC6 soap_delete_%s(struct soap *soap, %s)\n{\tsoap_delete(soap, p);\n}", c_ident(typ), c_type_id(typ, "*p"));
   fprintf(fout,"\n\nSOAP_FMAC3 %s * SOAP_FMAC4 soap_instantiate_%s(struct soap *soap, int n, const char *type, const char *arrayType, size_t *size)", c_type(typ), c_ident(typ));
   fprintf(fout,"\n{");
+  fprintf(fout,"\n\t(void)type; (void)arrayType; /* appease -Wall -Werror */");
   fprintf(fout, "\n\tDBGLOG(TEST, SOAP_MESSAGE(fdebug, \"soap_instantiate_%s(%%d, %%s, %%s)\\n\", n, type?type:\"\", arrayType?arrayType:\"\"));", c_ident(typ));
 
   fprintf(fout,"\n\tstruct soap_clist *cp = soap_link(soap, NULL, %s, n, soap_fdelete);", soap_type(typ));
@@ -7347,7 +7348,7 @@
   fprintf(fhead,"\nSOAP_FMAC3 void SOAP_FMAC4 soap_copy_%s(struct soap*, int, int, void*, size_t, const void*, size_t);", c_ident(typ));
   /* fprintf(fhead,"\n#ifdef __cplusplus\n}\n#endif"); */
   /* fprintf(fout,"\n\n#ifdef __cplusplus\nextern \"C\" {\n#endif"); */
-  fprintf(fout,"\nSOAP_FMAC3 void SOAP_FMAC4 soap_copy_%s(struct soap *soap, int st, int tt, void *p, size_t len, const void *q, size_t n)", c_ident(typ));
+  fprintf(fout,"\nSOAP_FMAC3 void SOAP_FMAC4 soap_copy_%s(struct soap */*soap*/, int /*st*/, int /*tt*/, void *p, size_t /*len*/, const void *q, size_t /*n*/)", c_ident(typ));
   fprintf(fout,"\n{");
   fprintf(fout,"\n\tDBGLOG(TEST, SOAP_MESSAGE(fdebug, \"Copying %s %%p -> %%p\\n\", q, p));", c_type(typ));
   fprintf(fout,"\n\t*(%s*)p = *(%s*)q;\n}", c_type(typ), c_type(typ));
@@ -7809,6 +7810,7 @@
     { if (is_external(typ))
         return;
         fprintf(fout,"\n\nvoid %s::soap_default(struct soap *soap)\n{", c_ident(typ)); 
+		fprintf(fout,"\n\t(void)soap; /* appease -Wall -Werror */");
         if ((s = has_soapref(typ)))
           fprintf(fout,"\n\tthis->%s = soap;", s);
 	d = get_Darraydims(typ);
@@ -7836,6 +7838,7 @@
 	}
         fprintf(fhead,"\nSOAP_FMAC3 void SOAP_FMAC4 soap_default_%s(struct soap*, %s);",c_ident(typ),c_type_id(typ, "*")); 
         fprintf(fout,"\n\nSOAP_FMAC3 void SOAP_FMAC4 soap_default_%s(struct soap *soap, %s)\n{", c_ident(typ),c_type_id(typ, "*a")); 
+		fprintf(fout,"\n\t(void)soap; /* appease -Wall -Werror */");
         if ((s = has_soapref(typ)))
           fprintf(fout,"\n\ta->%s = soap;", s);
 	d = get_Darraydims(typ);
@@ -9054,7 +9057,7 @@
       if (is_typedef(typ))
         fprintf(fout, "\n{\treturn soap_%s2s(soap, n);\n}", t_ident(typ));
       else if (is_boolean(typ))
-        fprintf(fout, "\n{\treturn soap_code_str(soap_codes_%s, n!=0);\n}", c_ident(typ));
+        fprintf(fout, "\n{\t(void)soap; /* appease -Wall -Werror */\n\treturn soap_code_str(soap_codes_%s, n!=0);\n}", c_ident(typ));
       else if (!is_mask(typ))
       { fprintf(fout, "\n{\tconst char *s = soap_code_str(soap_codes_%s, (long)n);", c_ident(typ));
         fprintf(fout, "\n\tif (s)\n\t\treturn s;");

use_libtool-2.7.12.patch:

--- NEW FILE use_libtool-2.7.12.patch ---
diff -ur gsoap-2.7/configure.in gsoap-2.7mf/configure.in
--- gsoap-2.7/configure.in	2008-10-02 12:36:28.000000000 -0500
+++ gsoap-2.7mf/configure.in	2008-12-24 15:05:11.000000000 -0600
@@ -15,7 +15,7 @@
 AM_PROG_LEX
 AC_PROG_YACC
 AC_PROG_CPP
-AC_PROG_RANLIB
+AM_PROG_LIBTOOL
 AC_PROG_LN_S
 AC_PROG_AWK
 AC_PROG_INSTALL
@@ -157,12 +157,12 @@
   AC_MSG_RESULT(no)
   WSDL2H_EXTRA_FLAGS="-DWITH_OPENSSL -DWITH_GZIP"
   WSDL2H_EXTRA_LIBS="-lssl -lcrypto -lz"
-  WSDL2H_SOAP_CPP_LIB="libgsoapssl++.a"
+  WSDL2H_SOAP_CPP_LIB="libgsoapssl++.la"
 else
   AC_MSG_RESULT(yes)
   WSDL2H_EXTRA_FLAGS=
   WSDL2H_EXTRA_LIBS=
-  WSDL2H_SOAP_CPP_LIB="libgsoap++.a"
+  WSDL2H_SOAP_CPP_LIB="libgsoap++.la"
 fi
 AC_SUBST(WSDL2H_EXTRA_FLAGS)
 AC_SUBST(WSDL2H_EXTRA_LIBS)
diff -ur gsoap-2.7/gsoap/Makefile.am gsoap-2.7mf/gsoap/Makefile.am
--- gsoap-2.7/gsoap/Makefile.am	2008-10-02 12:36:28.000000000 -0500
+++ gsoap-2.7mf/gsoap/Makefile.am	2008-12-24 15:43:06.000000000 -0600
@@ -3,7 +3,7 @@
 ## you have all needed files, that a GNU package needs
 AUTOMAKE_OPTIONS = foreign 1.4
 
-SUBDIRS = src wsdl @SAMPLE_DIRS@
+SUBDIRS = . src wsdl @SAMPLE_DIRS@
 CLEANFILES = soapcpp2 wsdl2h stdsoap2_cpp.cpp stdsoap2_ck.c stdsoap2_ck_cpp.cpp stdsoap2_ssl.c stdsoap2_ssl_cpp.cpp
 
 ##	*~ *.req.xml *.res.xml *.nsmap *.wsdl *.xsd *Proxy.h \
@@ -31,19 +31,19 @@
 stdsoap2_ssl_cpp.cpp: stdsoap2.cpp
 	$(LN_S) -f $(srcdir)/stdsoap2.cpp stdsoap2_ssl_cpp.cpp
 
-lib_LIBRARIES = libgsoap.a libgsoap++.a libgsoapck.a libgsoapck++.a libgsoapssl.a libgsoapssl++.a
-libgsoap_a_SOURCES = stdsoap2.c
-libgsoap_a_CFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) -D$(platform)
-libgsoap___a_SOURCES = stdsoap2_cpp.cpp
-libgsoap___a_CXXFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) -D$(platform)
-libgsoapck_a_SOURCES = stdsoap2_ck.c
-libgsoapck_a_CFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) -D$(platform) -DWITH_COOKIES
-libgsoapck___a_SOURCES = stdsoap2_ck_cpp.cpp
-libgsoapck___a_CXXFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) -D$(platform) -DWITH_COOKIES
-libgsoapssl_a_SOURCES = stdsoap2_ssl.c
-libgsoapssl_a_CFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) -D$(platform) -DWITH_OPENSSL -DWITH_DOM -DWITH_GZIP
-libgsoapssl___a_SOURCES = stdsoap2_ssl_cpp.cpp
-libgsoapssl___a_CXXFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) -D$(platform) -DWITH_OPENSSL -DWITH_DOM -DWITH_GZIP
+lib_LTLIBRARIES = libgsoap.la libgsoap++.la libgsoapck.la libgsoapck++.la libgsoapssl.la libgsoapssl++.la
+libgsoap_la_SOURCES = stdsoap2.c
+libgsoap_la_CFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) -D$(platform)
+libgsoap___la_SOURCES = stdsoap2_cpp.cpp
+libgsoap___la_CXXFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) -D$(platform)
+libgsoapck_la_SOURCES = stdsoap2_ck.c
+libgsoapck_la_CFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) -D$(platform) -DWITH_COOKIES
+libgsoapck___la_SOURCES = stdsoap2_ck_cpp.cpp
+libgsoapck___la_CXXFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) -D$(platform) -DWITH_COOKIES
+libgsoapssl_la_SOURCES = stdsoap2_ssl.c
+libgsoapssl_la_CFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) -D$(platform) -DWITH_OPENSSL -DWITH_DOM -DWITH_GZIP
+libgsoapssl___la_SOURCES = stdsoap2_ssl_cpp.cpp
+libgsoapssl___la_CXXFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) -D$(platform) -DWITH_OPENSSL -DWITH_DOM -DWITH_GZIP
 
 BUILT_SOURCES = stdsoap2_cpp.cpp $(lib_LIBRARIES)
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gsoap/F-9/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	28 Jan 2008 18:57:00 -0000	1.4
+++ .cvsignore	7 Jan 2009 05:42:31 -0000	1.5
@@ -1 +1 @@
-gsoap_2.7.10.tar.gz
+gsoap_2.7.12.tar.gz


Index: gsoap.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gsoap/F-9/gsoap.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- gsoap.spec	27 Feb 2008 20:37:12 -0000	1.9
+++ gsoap.spec	7 Jan 2009 05:42:32 -0000	1.10
@@ -1,16 +1,13 @@
 Summary: Generator Tools for Coding SOAP/XML Web Services in C and C++
 Name: gsoap
-Version: 2.7.10
-Release: 4%{?dist}
+Version: 2.7.12
+Release: 1%{?dist}
 License: GPLv2+
 Group: Development/Tools
 URL: http://gsoap2.sourceforge.net
-Source0: http://downloads.sourceforge.net/gsoap2/gsoap_2.7.10.tar.gz
-Patch0: datadir_importpath-2.7.10.patch
-Patch1: use_libtool-2.7.10.patch
-Patch2: install_soapcpp2_wsdl2h_aux-2.7.10.patch
-Patch3: 2.7.10-upd.patch
-Patch4: no_locale.patch
+Source0: http://downloads.sourceforge.net/gsoap2/gsoap_2.7.12.tar.gz
+Patch0: use_libtool-2.7.12.patch
+Patch1: unused_args.patch
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 BuildRequires: flex
@@ -46,25 +43,11 @@
 %prep
 %setup -q -n gsoap-2.7
 
-# use ${datadir}, not `pwd`, when setting *_IMPORT_PATH locations
+# enable use of libtool in configure.in and a few Makefile.am files
 %patch0 -p1
 
-# enable use of libtool in configure.in and a few Makefile.am files
 %patch1 -p1
 
-# update gsoap/Makefile.am so that it installs gsoap/import,
-# gsoap/plugin, gsoap/WS, gsoap/custom and gsoap/extras into
-# ${prefix}/share/gsoap
-%patch2 -p1
-
-# patch from upstream that fixes glibc C locale issues, hp-ux errno
-# definition, and xsd_dateTime timezone processing for WS-I
-%patch3 -p1
-
-# using locale functions in glibc is experimental, so this patch stops
-# testing for them so they won't be used
-%patch4 -p1
-
 # a number of ~ files are distribute, but we do not want them
 find . -name "*~" -exec rm {} \;
 
@@ -248,6 +231,15 @@
 %_libdir/pkgconfig/gsoap++.pc
 %_libdir/pkgconfig/gsoapssl.pc
 %_libdir/pkgconfig/gsoapssl++.pc
+# Additions in 2.7.12-1
+%_datadir/gsoap/WS/WS-ReliableMessaging.wsdl
+%_datadir/gsoap/WS/WS-ReliableMessaging.xsd
+%_datadir/gsoap/WS/reference-1.1.xsd
+%_datadir/gsoap/WS/ws-reliability-1.1.xsd
+%_datadir/gsoap/import/ref.h
+%_datadir/gsoap/import/wsrm.h
+%_datadir/gsoap/import/wsrm4.h
+%_datadir/gsoap/import/wsrx.h
 
 
 %post -p /sbin/ldconfig
@@ -257,6 +249,17 @@
 
 
 %changelog
+* Wed Dec 24 2008  <matt at redhat> - 2.7.12-1
+- Updated to gsoap 2.7.12:
+-  Numerous bug fixes - xml:lang, maxOccurs="unbounded", SSL, xmlns="", ...
+-  New features, maintaining backward compatibility - MinGW, wsseapi, multi-endpoint connect, ...
+- Patches removed (incorporated upstream):
+-  datadir_importpath-2.7.10.patch
+-  install_soapcpp2_wsdl2h_aux-2.7.10.patch
+-  no_locale.patch as default off, enable by defining WITH_C_LOCALE
+- Patches added (sent upstream):
+-  unused_args.patch - eliminate many unused param warnings
+
 * Thu Feb 21 2008  <mfarrellee at redhat> - 2.7.10-4
 - Applied upd patch from upstream. It fixes glibc C locale issues,
   hp-ux h_errno definition, and xsd:dateTime timezone processing for


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gsoap/F-9/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	28 Jan 2008 18:57:01 -0000	1.5
+++ sources	7 Jan 2009 05:42:32 -0000	1.6
@@ -1 +1 @@
-31ac50314900d87c43f8f008c8de712f  gsoap_2.7.10.tar.gz
+2ad798072cd812a0d8c3aebadf557762  gsoap_2.7.12.tar.gz


--- 2.7.10-upd.patch DELETED ---


--- tru64_hp_ux_c-2.7.10.patch DELETED ---


--- tru64_hp_ux_cpp-2.7.10.patch DELETED ---



From pbrobinson at fedoraproject.org  Wed Jan  7 05:43:43 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Wed,  7 Jan 2009 05:43:43 +0000 (UTC)
Subject: rpms/ptlib/devel ptlib.spec,1.6,1.7
Message-ID: <20090107054343.5230D70100@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/ptlib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4009

Modified Files:
	ptlib.spec 
Log Message:
- remove --enable-opal termpoarily, ironically so opal will compil



Index: ptlib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ptlib/devel/ptlib.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ptlib.spec	6 Jan 2009 06:13:20 -0000	1.6
+++ ptlib.spec	7 Jan 2009 05:43:12 -0000	1.7
@@ -1,7 +1,7 @@
 Name:		ptlib
 Summary:	Portable Tools Library
 Version:	2.5.2
-Release:	1%{?dist}
+Release:	2%{?dist}
 URL:		http://www.opalvoip.org/
 Source0:	ftp://ftp.gnome.org/pub/gnome/sources/%{name}/2.5/%{name}-%{version}.tar.bz2
 License:	MPLv1.0
@@ -38,7 +38,7 @@
 
 %build
 export CFLAGS="$CFLAGS -DLDAP_DEPRECATED"
-%configure --prefix=%{_prefix} --disable-static --enable-opal --enable-plugins --disable-oss --enable-v4l2 --disable-avc --disable-v4l
+%configure --prefix=%{_prefix} --disable-static --enable-plugins --disable-oss --enable-v4l2 --disable-avc --disable-v4l
 make %{?_smp_mflags}
 
 %install
@@ -82,6 +82,9 @@
 %attr(755,root,root) %{_bindir}/*
 
 %changelog
+* Tue Jan  6 2009 Peter Robinson <pbrobinson at gmail.com> - 2.5.2-2
+- remove --enable-opal termpoarily, ironically so opal will compile
+
 * Tue Jan  6 2009 Peter Robinson <pbrobinson at gmail.com> - 2.5.2-1
 - New release for ekiga 3.1.0 beta
 



From lmacken at fedoraproject.org  Wed Jan  7 05:45:16 2009
From: lmacken at fedoraproject.org (Luke Macken)
Date: Wed,  7 Jan 2009 05:45:16 +0000 (UTC)
Subject: rpms/python-webhelpers/devel .cvsignore, 1.2,
	1.3 python-webhelpers.spec, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <20090107054516.B03497013F@cvs1.fedora.phx.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/python-webhelpers/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4677

Modified Files:
	.cvsignore python-webhelpers.spec sources 
Log Message:
* Tue Jan 06 2009 Luke Macken <lmacken at redhat.com> - 0.6.4-1
- Update to 0.6.4
- Run the test suite




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-webhelpers/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	31 May 2008 21:07:48 -0000	1.2
+++ .cvsignore	7 Jan 2009 05:44:46 -0000	1.3
@@ -1 +1 @@
-WebHelpers-0.3.4.tar.gz
+WebHelpers-0.6.4.tar.gz


Index: python-webhelpers.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-webhelpers/devel/python-webhelpers.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- python-webhelpers.spec	29 Nov 2008 16:02:01 -0000	1.2
+++ python-webhelpers.spec	7 Jan 2009 05:44:46 -0000	1.3
@@ -1,8 +1,8 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name: python-webhelpers
-Version: 0.3.4
-Release: 3%{?dist}
+Version: 0.6.4
+Release: 1%{?dist}
 Summary: Helper library for aiding the writing of web templates in Python
 
 Group: Development/Languages
@@ -12,6 +12,7 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 BuildRequires: python-setuptools-devel
+BuildRequires: python-nose python-routes python-simplejson
 Requires: python-routes >= 1.7, python-simplejson >= 1.4
 
 %description
@@ -38,17 +39,28 @@
 %{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
 
 
+%check
+PYTHONPATH=$(pwd) nosetests
+
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 
 %files
 %defattr(-,root,root,-)
-%doc CHANGELOG LICENSE docs
+%doc README.txt CHANGELOG LICENSE docs
 %{python_sitelib}/*
 
 
 %changelog
+* Tue Jan 06 2009 Luke Macken <lmacken at redhat.com> - 0.6.4-1
+- Update to 0.6.4
+- Run the test suite
+
+* Tue Oct 21 2008 Luke Macken <lmacken at redhat.com> - 0.6.3-1
+- Update to 0.6.3
+
 * Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 0.3.4-3
 - Rebuild for Python 2.6
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-webhelpers/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	31 May 2008 21:07:48 -0000	1.2
+++ sources	7 Jan 2009 05:44:46 -0000	1.3
@@ -1 +1 @@
-16aacff76caf2e3c2284f1915e2fc57f  WebHelpers-0.3.4.tar.gz
+d11ed399068aac9368281497d40a4436  WebHelpers-0.6.4.tar.gz



From lmacken at fedoraproject.org  Wed Jan  7 05:46:34 2009
From: lmacken at fedoraproject.org (Luke Macken)
Date: Wed,  7 Jan 2009 05:46:34 +0000 (UTC)
Subject: rpms/python-webhelpers/devel python-webhelpers.spec,1.3,1.4
Message-ID: <20090107054634.325727013F@cvs1.fedora.phx.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/python-webhelpers/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5173

Modified Files:
	python-webhelpers.spec 
Log Message:
Remove busted changelog entry


Index: python-webhelpers.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-webhelpers/devel/python-webhelpers.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- python-webhelpers.spec	7 Jan 2009 05:44:46 -0000	1.3
+++ python-webhelpers.spec	7 Jan 2009 05:46:03 -0000	1.4
@@ -58,9 +58,6 @@
 - Update to 0.6.4
 - Run the test suite
 
-* Tue Oct 21 2008 Luke Macken <lmacken at redhat.com> - 0.6.3-1
-- Update to 0.6.3
-
 * Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 0.3.4-3
 - Rebuild for Python 2.6
 



From lmacken at fedoraproject.org  Wed Jan  7 05:49:28 2009
From: lmacken at fedoraproject.org (Luke Macken)
Date: Wed,  7 Jan 2009 05:49:28 +0000 (UTC)
Subject: rpms/python-webob/devel .cvsignore, 1.4, 1.5 python-webob.spec, 1.7,
	1.8 sources, 1.4, 1.5
Message-ID: <20090107054928.7EEE07013F@cvs1.fedora.phx.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/python-webob/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5898

Modified Files:
	.cvsignore python-webob.spec sources 
Log Message:
Update to 0.9.5


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-webob/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	6 Dec 2008 17:21:30 -0000	1.4
+++ .cvsignore	7 Jan 2009 05:48:57 -0000	1.5
@@ -1 +1 @@
-WebOb-0.9.4.tar.gz
+WebOb-0.9.5.tar.gz


Index: python-webob.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-webob/devel/python-webob.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- python-webob.spec	6 Dec 2008 17:30:15 -0000	1.7
+++ python-webob.spec	7 Jan 2009 05:48:58 -0000	1.8
@@ -2,7 +2,7 @@
 
 Name:           python-webob
 Summary:        WSGI request and response object
-Version:        0.9.4
+Version:        0.9.5
 Release:        1%{?dist}
 License:        MIT
 Group:          System Environment/Libraries
@@ -56,6 +56,9 @@
 %{python_sitelib}/WebOb*.egg-info/
 
 %changelog
+* Tue Jan 06 2009 Luke Macken <lmacken at redhat.com> 0.9.5-1
+- Update to 0.9.5
+
 * Sat Dec 06 2008 Ricky Zhou <ricky at fedoraproject.org> 0.9.4-1
 - Upstream released new version.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-webob/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	6 Dec 2008 17:21:30 -0000	1.4
+++ sources	7 Jan 2009 05:48:58 -0000	1.5
@@ -1 +1 @@
-95b6bb266470f04ca670a17ed7b05cfe  WebOb-0.9.4.tar.gz
+d72ab688057fbdd99dc24f568e5b5630  WebOb-0.9.5.tar.gz



From matt at fedoraproject.org  Wed Jan  7 05:55:12 2009
From: matt at fedoraproject.org (Matthew Farrellee)
Date: Wed,  7 Jan 2009 05:55:12 +0000 (UTC)
Subject: rpms/gsoap/devel unused_args.patch, NONE,
	1.1 use_libtool-2.7.12.patch, 
	NONE, 1.1 .cvsignore, 1.4, 1.5 gsoap.spec, 1.9, 1.10 sources,
	1.5, 1.6 2.7.10-upd.patch, 1.1, NONE tru64_hp_ux_c-2.7.10.patch,
	1.2, NONE tru64_hp_ux_cpp-2.7.10.patch, 1.2, NONE
Message-ID: <20090107055512.7A45B7013F@cvs1.fedora.phx.redhat.com>

Author: matt

Update of /cvs/pkgs/rpms/gsoap/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6707

Modified Files:
	.cvsignore gsoap.spec sources 
Added Files:
	unused_args.patch use_libtool-2.7.12.patch 
Removed Files:
	2.7.10-upd.patch tru64_hp_ux_c-2.7.10.patch 
	tru64_hp_ux_cpp-2.7.10.patch 
Log Message:
update to gsoap 2.7.12

unused_args.patch:

--- NEW FILE unused_args.patch ---
--- gsoap-2.7/gsoap/src/symbol2.c	2008-10-02 12:36:22.000000000 -0500
+++ gsoap-2.7mf/gsoap/src/symbol2.c	2008-12-25 09:14:14.000000000 -0600
@@ -6127,7 +6127,7 @@
 }
 
 /* c_type_id returns the arraytype to be used in parameter declaration
-   Allows you to specify the identifier that acts acts as teh name of teh
+   Allows you to specify the identifier that acts acts as the name of the
    type of array */
 char *
 c_type_id(Tnode *typ, char *name)
@@ -7278,6 +7278,7 @@
   fprintf(fout,"\n\nSOAP_FMAC5 void SOAP_FMAC6 soap_delete_%s(struct soap *soap, %s)\n{\tsoap_delete(soap, p);\n}", c_ident(typ), c_type_id(typ, "*p"));
   fprintf(fout,"\n\nSOAP_FMAC3 %s * SOAP_FMAC4 soap_instantiate_%s(struct soap *soap, int n, const char *type, const char *arrayType, size_t *size)", c_type(typ), c_ident(typ));
   fprintf(fout,"\n{");
+  fprintf(fout,"\n\t(void)type; (void)arrayType; /* appease -Wall -Werror */");
   fprintf(fout, "\n\tDBGLOG(TEST, SOAP_MESSAGE(fdebug, \"soap_instantiate_%s(%%d, %%s, %%s)\\n\", n, type?type:\"\", arrayType?arrayType:\"\"));", c_ident(typ));
 
   fprintf(fout,"\n\tstruct soap_clist *cp = soap_link(soap, NULL, %s, n, soap_fdelete);", soap_type(typ));
@@ -7347,7 +7348,7 @@
   fprintf(fhead,"\nSOAP_FMAC3 void SOAP_FMAC4 soap_copy_%s(struct soap*, int, int, void*, size_t, const void*, size_t);", c_ident(typ));
   /* fprintf(fhead,"\n#ifdef __cplusplus\n}\n#endif"); */
   /* fprintf(fout,"\n\n#ifdef __cplusplus\nextern \"C\" {\n#endif"); */
-  fprintf(fout,"\nSOAP_FMAC3 void SOAP_FMAC4 soap_copy_%s(struct soap *soap, int st, int tt, void *p, size_t len, const void *q, size_t n)", c_ident(typ));
+  fprintf(fout,"\nSOAP_FMAC3 void SOAP_FMAC4 soap_copy_%s(struct soap */*soap*/, int /*st*/, int /*tt*/, void *p, size_t /*len*/, const void *q, size_t /*n*/)", c_ident(typ));
   fprintf(fout,"\n{");
   fprintf(fout,"\n\tDBGLOG(TEST, SOAP_MESSAGE(fdebug, \"Copying %s %%p -> %%p\\n\", q, p));", c_type(typ));
   fprintf(fout,"\n\t*(%s*)p = *(%s*)q;\n}", c_type(typ), c_type(typ));
@@ -7809,6 +7810,7 @@
     { if (is_external(typ))
         return;
         fprintf(fout,"\n\nvoid %s::soap_default(struct soap *soap)\n{", c_ident(typ)); 
+		fprintf(fout,"\n\t(void)soap; /* appease -Wall -Werror */");
         if ((s = has_soapref(typ)))
           fprintf(fout,"\n\tthis->%s = soap;", s);
 	d = get_Darraydims(typ);
@@ -7836,6 +7838,7 @@
 	}
         fprintf(fhead,"\nSOAP_FMAC3 void SOAP_FMAC4 soap_default_%s(struct soap*, %s);",c_ident(typ),c_type_id(typ, "*")); 
         fprintf(fout,"\n\nSOAP_FMAC3 void SOAP_FMAC4 soap_default_%s(struct soap *soap, %s)\n{", c_ident(typ),c_type_id(typ, "*a")); 
+		fprintf(fout,"\n\t(void)soap; /* appease -Wall -Werror */");
         if ((s = has_soapref(typ)))
           fprintf(fout,"\n\ta->%s = soap;", s);
 	d = get_Darraydims(typ);
@@ -9054,7 +9057,7 @@
       if (is_typedef(typ))
         fprintf(fout, "\n{\treturn soap_%s2s(soap, n);\n}", t_ident(typ));
       else if (is_boolean(typ))
-        fprintf(fout, "\n{\treturn soap_code_str(soap_codes_%s, n!=0);\n}", c_ident(typ));
+        fprintf(fout, "\n{\t(void)soap; /* appease -Wall -Werror */\n\treturn soap_code_str(soap_codes_%s, n!=0);\n}", c_ident(typ));
       else if (!is_mask(typ))
       { fprintf(fout, "\n{\tconst char *s = soap_code_str(soap_codes_%s, (long)n);", c_ident(typ));
         fprintf(fout, "\n\tif (s)\n\t\treturn s;");

use_libtool-2.7.12.patch:

--- NEW FILE use_libtool-2.7.12.patch ---
diff -ur gsoap-2.7/configure.in gsoap-2.7mf/configure.in
--- gsoap-2.7/configure.in	2008-10-02 12:36:28.000000000 -0500
+++ gsoap-2.7mf/configure.in	2008-12-24 15:05:11.000000000 -0600
@@ -15,7 +15,7 @@
 AM_PROG_LEX
 AC_PROG_YACC
 AC_PROG_CPP
-AC_PROG_RANLIB
+AM_PROG_LIBTOOL
 AC_PROG_LN_S
 AC_PROG_AWK
 AC_PROG_INSTALL
@@ -157,12 +157,12 @@
   AC_MSG_RESULT(no)
   WSDL2H_EXTRA_FLAGS="-DWITH_OPENSSL -DWITH_GZIP"
   WSDL2H_EXTRA_LIBS="-lssl -lcrypto -lz"
-  WSDL2H_SOAP_CPP_LIB="libgsoapssl++.a"
+  WSDL2H_SOAP_CPP_LIB="libgsoapssl++.la"
 else
   AC_MSG_RESULT(yes)
   WSDL2H_EXTRA_FLAGS=
   WSDL2H_EXTRA_LIBS=
-  WSDL2H_SOAP_CPP_LIB="libgsoap++.a"
+  WSDL2H_SOAP_CPP_LIB="libgsoap++.la"
 fi
 AC_SUBST(WSDL2H_EXTRA_FLAGS)
 AC_SUBST(WSDL2H_EXTRA_LIBS)
diff -ur gsoap-2.7/gsoap/Makefile.am gsoap-2.7mf/gsoap/Makefile.am
--- gsoap-2.7/gsoap/Makefile.am	2008-10-02 12:36:28.000000000 -0500
+++ gsoap-2.7mf/gsoap/Makefile.am	2008-12-24 15:43:06.000000000 -0600
@@ -3,7 +3,7 @@
 ## you have all needed files, that a GNU package needs
 AUTOMAKE_OPTIONS = foreign 1.4
 
-SUBDIRS = src wsdl @SAMPLE_DIRS@
+SUBDIRS = . src wsdl @SAMPLE_DIRS@
 CLEANFILES = soapcpp2 wsdl2h stdsoap2_cpp.cpp stdsoap2_ck.c stdsoap2_ck_cpp.cpp stdsoap2_ssl.c stdsoap2_ssl_cpp.cpp
 
 ##	*~ *.req.xml *.res.xml *.nsmap *.wsdl *.xsd *Proxy.h \
@@ -31,19 +31,19 @@
 stdsoap2_ssl_cpp.cpp: stdsoap2.cpp
 	$(LN_S) -f $(srcdir)/stdsoap2.cpp stdsoap2_ssl_cpp.cpp
 
-lib_LIBRARIES = libgsoap.a libgsoap++.a libgsoapck.a libgsoapck++.a libgsoapssl.a libgsoapssl++.a
-libgsoap_a_SOURCES = stdsoap2.c
-libgsoap_a_CFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) -D$(platform)
-libgsoap___a_SOURCES = stdsoap2_cpp.cpp
-libgsoap___a_CXXFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) -D$(platform)
-libgsoapck_a_SOURCES = stdsoap2_ck.c
-libgsoapck_a_CFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) -D$(platform) -DWITH_COOKIES
-libgsoapck___a_SOURCES = stdsoap2_ck_cpp.cpp
-libgsoapck___a_CXXFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) -D$(platform) -DWITH_COOKIES
-libgsoapssl_a_SOURCES = stdsoap2_ssl.c
-libgsoapssl_a_CFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) -D$(platform) -DWITH_OPENSSL -DWITH_DOM -DWITH_GZIP
-libgsoapssl___a_SOURCES = stdsoap2_ssl_cpp.cpp
-libgsoapssl___a_CXXFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) -D$(platform) -DWITH_OPENSSL -DWITH_DOM -DWITH_GZIP
+lib_LTLIBRARIES = libgsoap.la libgsoap++.la libgsoapck.la libgsoapck++.la libgsoapssl.la libgsoapssl++.la
+libgsoap_la_SOURCES = stdsoap2.c
+libgsoap_la_CFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) -D$(platform)
+libgsoap___la_SOURCES = stdsoap2_cpp.cpp
+libgsoap___la_CXXFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) -D$(platform)
+libgsoapck_la_SOURCES = stdsoap2_ck.c
+libgsoapck_la_CFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) -D$(platform) -DWITH_COOKIES
+libgsoapck___la_SOURCES = stdsoap2_ck_cpp.cpp
+libgsoapck___la_CXXFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) -D$(platform) -DWITH_COOKIES
+libgsoapssl_la_SOURCES = stdsoap2_ssl.c
+libgsoapssl_la_CFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) -D$(platform) -DWITH_OPENSSL -DWITH_DOM -DWITH_GZIP
+libgsoapssl___la_SOURCES = stdsoap2_ssl_cpp.cpp
+libgsoapssl___la_CXXFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) -D$(platform) -DWITH_OPENSSL -DWITH_DOM -DWITH_GZIP
 
 BUILT_SOURCES = stdsoap2_cpp.cpp $(lib_LIBRARIES)
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gsoap/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	28 Jan 2008 18:57:00 -0000	1.4
+++ .cvsignore	7 Jan 2009 05:54:41 -0000	1.5
@@ -1 +1 @@
-gsoap_2.7.10.tar.gz
+gsoap_2.7.12.tar.gz


Index: gsoap.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gsoap/devel/gsoap.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- gsoap.spec	27 Feb 2008 20:37:12 -0000	1.9
+++ gsoap.spec	7 Jan 2009 05:54:41 -0000	1.10
@@ -1,16 +1,13 @@
 Summary: Generator Tools for Coding SOAP/XML Web Services in C and C++
 Name: gsoap
-Version: 2.7.10
-Release: 4%{?dist}
+Version: 2.7.12
+Release: 1%{?dist}
 License: GPLv2+
 Group: Development/Tools
 URL: http://gsoap2.sourceforge.net
-Source0: http://downloads.sourceforge.net/gsoap2/gsoap_2.7.10.tar.gz
-Patch0: datadir_importpath-2.7.10.patch
-Patch1: use_libtool-2.7.10.patch
-Patch2: install_soapcpp2_wsdl2h_aux-2.7.10.patch
-Patch3: 2.7.10-upd.patch
-Patch4: no_locale.patch
+Source0: http://downloads.sourceforge.net/gsoap2/gsoap_2.7.12.tar.gz
+Patch0: use_libtool-2.7.12.patch
+Patch1: unused_args.patch
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 BuildRequires: flex
@@ -46,25 +43,11 @@
 %prep
 %setup -q -n gsoap-2.7
 
-# use ${datadir}, not `pwd`, when setting *_IMPORT_PATH locations
+# enable use of libtool in configure.in and a few Makefile.am files
 %patch0 -p1
 
-# enable use of libtool in configure.in and a few Makefile.am files
 %patch1 -p1
 
-# update gsoap/Makefile.am so that it installs gsoap/import,
-# gsoap/plugin, gsoap/WS, gsoap/custom and gsoap/extras into
-# ${prefix}/share/gsoap
-%patch2 -p1
-
-# patch from upstream that fixes glibc C locale issues, hp-ux errno
-# definition, and xsd_dateTime timezone processing for WS-I
-%patch3 -p1
-
-# using locale functions in glibc is experimental, so this patch stops
-# testing for them so they won't be used
-%patch4 -p1
-
 # a number of ~ files are distribute, but we do not want them
 find . -name "*~" -exec rm {} \;
 
@@ -248,6 +231,15 @@
 %_libdir/pkgconfig/gsoap++.pc
 %_libdir/pkgconfig/gsoapssl.pc
 %_libdir/pkgconfig/gsoapssl++.pc
+# Additions in 2.7.12-1
+%_datadir/gsoap/WS/WS-ReliableMessaging.wsdl
+%_datadir/gsoap/WS/WS-ReliableMessaging.xsd
+%_datadir/gsoap/WS/reference-1.1.xsd
+%_datadir/gsoap/WS/ws-reliability-1.1.xsd
+%_datadir/gsoap/import/ref.h
+%_datadir/gsoap/import/wsrm.h
+%_datadir/gsoap/import/wsrm4.h
+%_datadir/gsoap/import/wsrx.h
 
 
 %post -p /sbin/ldconfig
@@ -257,6 +249,17 @@
 
 
 %changelog
+* Wed Dec 24 2008  <matt at redhat> - 2.7.12-1
+- Updated to gsoap 2.7.12:
+-  Numerous bug fixes - xml:lang, maxOccurs="unbounded", SSL, xmlns="", ...
+-  New features, maintaining backward compatibility - MinGW, wsseapi, multi-endpoint connect, ...
+- Patches removed (incorporated upstream):
+-  datadir_importpath-2.7.10.patch
+-  install_soapcpp2_wsdl2h_aux-2.7.10.patch
+-  no_locale.patch as default off, enable by defining WITH_C_LOCALE
+- Patches added (sent upstream):
+-  unused_args.patch - eliminate many unused param warnings
+
 * Thu Feb 21 2008  <mfarrellee at redhat> - 2.7.10-4
 - Applied upd patch from upstream. It fixes glibc C locale issues,
   hp-ux h_errno definition, and xsd:dateTime timezone processing for


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gsoap/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	28 Jan 2008 18:57:01 -0000	1.5
+++ sources	7 Jan 2009 05:54:41 -0000	1.6
@@ -1 +1 @@
-31ac50314900d87c43f8f008c8de712f  gsoap_2.7.10.tar.gz
+2ad798072cd812a0d8c3aebadf557762  gsoap_2.7.12.tar.gz


--- 2.7.10-upd.patch DELETED ---


--- tru64_hp_ux_c-2.7.10.patch DELETED ---


--- tru64_hp_ux_cpp-2.7.10.patch DELETED ---



From pkgdb at fedoraproject.org  Wed Jan  7 05:55:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 07 Jan 2009 05:55:12 +0000
Subject: [pkgdb] xorg-x11-drv-nouveau had acl change status
Message-ID: <20090107055512.424BD208455@bastion.fedora.phx.redhat.com>

airlied has set the commit acl on xorg-x11-drv-nouveau (Fedora devel) to Approved for bskeggs

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/xorg-x11-drv-nouveau



From pkgdb at fedoraproject.org  Wed Jan  7 05:55:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 07 Jan 2009 05:55:08 +0000
Subject: [pkgdb] xorg-x11-drv-nouveau had acl change status
Message-ID: <20090107055508.3FAF820831D@bastion.fedora.phx.redhat.com>

airlied has set the watchbugzilla acl on xorg-x11-drv-nouveau (Fedora devel) to Approved for bskeggs

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/xorg-x11-drv-nouveau



From pkgdb at fedoraproject.org  Wed Jan  7 05:55:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 07 Jan 2009 05:55:13 +0000
Subject: [pkgdb] xorg-x11-drv-nouveau had acl change status
Message-ID: <20090107055513.E8181208466@bastion.fedora.phx.redhat.com>

airlied has set the watchcommits acl on xorg-x11-drv-nouveau (Fedora devel) to Approved for bskeggs

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/xorg-x11-drv-nouveau



From pkgdb at fedoraproject.org  Wed Jan  7 05:55:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 07 Jan 2009 05:55:14 +0000
Subject: [pkgdb] xorg-x11-drv-nouveau had acl change status
Message-ID: <20090107055514.3338A208469@bastion.fedora.phx.redhat.com>

airlied has set the commit acl on xorg-x11-drv-nouveau (Fedora devel) to Approved for ajax

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/xorg-x11-drv-nouveau



From pkgdb at fedoraproject.org  Wed Jan  7 05:55:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 07 Jan 2009 05:55:16 +0000
Subject: [pkgdb] xorg-x11-drv-nouveau had acl change status
Message-ID: <20090107055516.979D720846C@bastion.fedora.phx.redhat.com>

airlied has set the watchcommits acl on xorg-x11-drv-nouveau (Fedora 9) to Approved for bskeggs

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/xorg-x11-drv-nouveau



From pkgdb at fedoraproject.org  Wed Jan  7 05:55:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 07 Jan 2009 05:55:20 +0000
Subject: [pkgdb] xorg-x11-drv-nouveau had acl change status
Message-ID: <20090107055520.E349A20846D@bastion.fedora.phx.redhat.com>

airlied has set the approveacls acl on xorg-x11-drv-nouveau (Fedora devel) to Approved for ajax

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/xorg-x11-drv-nouveau



From pkgdb at fedoraproject.org  Wed Jan  7 05:55:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 07 Jan 2009 05:55:24 +0000
Subject: [pkgdb] xorg-x11-drv-nouveau had acl change status
Message-ID: <20090107055524.33A2320846F@bastion.fedora.phx.redhat.com>

airlied has set the watchbugzilla acl on xorg-x11-drv-nouveau (Fedora 9) to Approved for bskeggs

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/xorg-x11-drv-nouveau



From pkgdb at fedoraproject.org  Wed Jan  7 05:55:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 07 Jan 2009 05:55:27 +0000
Subject: [pkgdb] xorg-x11-drv-nouveau had acl change status
Message-ID: <20090107055527.B823B208473@bastion.fedora.phx.redhat.com>

airlied has set the commit acl on xorg-x11-drv-nouveau (Fedora 9) to Approved for ajax

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/xorg-x11-drv-nouveau



From pkgdb at fedoraproject.org  Wed Jan  7 05:55:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 07 Jan 2009 05:55:27 +0000
Subject: [pkgdb] xorg-x11-drv-nouveau had acl change status
Message-ID: <20090107055527.EE112208475@bastion.fedora.phx.redhat.com>

airlied has set the commit acl on xorg-x11-drv-nouveau (Fedora 9) to Approved for bskeggs

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/xorg-x11-drv-nouveau



From pkgdb at fedoraproject.org  Wed Jan  7 05:55:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 07 Jan 2009 05:55:30 +0000
Subject: [pkgdb] xorg-x11-drv-nouveau had acl change status
Message-ID: <20090107055530.4AC86208478@bastion.fedora.phx.redhat.com>

airlied has set the approveacls acl on xorg-x11-drv-nouveau (Fedora 9) to Approved for ajax

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/xorg-x11-drv-nouveau



From pkgdb at fedoraproject.org  Wed Jan  7 05:55:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 07 Jan 2009 05:55:32 +0000
Subject: [pkgdb] xorg-x11-drv-nouveau had acl change status
Message-ID: <20090107055532.BF0E9208421@bastion.fedora.phx.redhat.com>

airlied has set the watchbugzilla acl on xorg-x11-drv-nouveau (Fedora 10) to Approved for bskeggs

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/xorg-x11-drv-nouveau



From pkgdb at fedoraproject.org  Wed Jan  7 05:55:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 07 Jan 2009 05:55:35 +0000
Subject: [pkgdb] xorg-x11-drv-nouveau had acl change status
Message-ID: <20090107055535.EA1A8208479@bastion.fedora.phx.redhat.com>

airlied has set the watchcommits acl on xorg-x11-drv-nouveau (Fedora 10) to Approved for bskeggs

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/xorg-x11-drv-nouveau



From pkgdb at fedoraproject.org  Wed Jan  7 05:55:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 07 Jan 2009 05:55:39 +0000
Subject: [pkgdb] xorg-x11-drv-nouveau had acl change status
Message-ID: <20090107055539.4821E20847C@bastion.fedora.phx.redhat.com>

airlied has set the approveacls acl on xorg-x11-drv-nouveau (Fedora 10) to Approved for ajax

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/xorg-x11-drv-nouveau



From pkgdb at fedoraproject.org  Wed Jan  7 05:55:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 07 Jan 2009 05:55:40 +0000
Subject: [pkgdb] xorg-x11-drv-nouveau had acl change status
Message-ID: <20090107055540.2B18D208480@bastion.fedora.phx.redhat.com>

airlied has set the commit acl on xorg-x11-drv-nouveau (Fedora 10) to Approved for ajax

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/xorg-x11-drv-nouveau



From pkgdb at fedoraproject.org  Wed Jan  7 05:55:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 07 Jan 2009 05:55:40 +0000
Subject: [pkgdb] xorg-x11-drv-nouveau had acl change status
Message-ID: <20090107055541.40711208484@bastion.fedora.phx.redhat.com>

airlied has set the commit acl on xorg-x11-drv-nouveau (Fedora 10) to Approved for bskeggs

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/xorg-x11-drv-nouveau



From pkgdb at fedoraproject.org  Wed Jan  7 05:55:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 07 Jan 2009 05:55:43 +0000
Subject: [pkgdb] xorg-x11-drv-nouveau had acl change status
Message-ID: <20090107055543.AB41A208469@bastion.fedora.phx.redhat.com>

airlied has set the approveacls acl on xorg-x11-drv-nouveau (Fedora 10) to Approved for bskeggs

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/xorg-x11-drv-nouveau



From pkgdb at fedoraproject.org  Wed Jan  7 05:55:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 07 Jan 2009 05:55:48 +0000
Subject: [pkgdb] xorg-x11-drv-nouveau had acl change status
Message-ID: <20090107055548.5976A208488@bastion.fedora.phx.redhat.com>

airlied has set the approveacls acl on xorg-x11-drv-nouveau (Fedora devel) to Approved for bskeggs

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/xorg-x11-drv-nouveau



From pkgdb at fedoraproject.org  Wed Jan  7 05:55:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 07 Jan 2009 05:55:53 +0000
Subject: [pkgdb] xorg-x11-drv-nouveau had acl change status
Message-ID: <20090107055554.00B0E20846B@bastion.fedora.phx.redhat.com>

airlied has set the approveacls acl on xorg-x11-drv-nouveau (Fedora 9) to Approved for bskeggs

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/xorg-x11-drv-nouveau



From pkgdb at fedoraproject.org  Wed Jan  7 05:55:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 07 Jan 2009 05:55:55 +0000
Subject: [pkgdb] xorg-x11-drv-nouveau had acl change status
Message-ID: <20090107055555.C618920848B@bastion.fedora.phx.redhat.com>

airlied has set the approveacls acl on xorg-x11-drv-nouveau (Fedora 9) to Obsolete for bskeggs

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/xorg-x11-drv-nouveau



From pkgdb at fedoraproject.org  Wed Jan  7 05:56:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 07 Jan 2009 05:56:00 +0000
Subject: [pkgdb] xorg-x11-drv-nouveau had acl change status
Message-ID: <20090107055600.C360F208491@bastion.fedora.phx.redhat.com>

airlied has set the approveacls acl on xorg-x11-drv-nouveau (Fedora 9) to Approved for bskeggs

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/xorg-x11-drv-nouveau



From lmacken at fedoraproject.org  Wed Jan  7 05:58:56 2009
From: lmacken at fedoraproject.org (Luke Macken)
Date: Wed,  7 Jan 2009 05:58:56 +0000 (UTC)
Subject: rpms/python-paste-script/devel .cvsignore, 1.9,
	1.10 python-paste-script.spec, 1.18, 1.19 sources, 1.9, 1.10
Message-ID: <20090107055856.9549E7013F@cvs1.fedora.phx.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/python-paste-script/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7152

Modified Files:
	.cvsignore python-paste-script.spec sources 
Log Message:
Update to 1.7.3


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-paste-script/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	14 Jun 2008 06:47:16 -0000	1.9
+++ .cvsignore	7 Jan 2009 05:58:26 -0000	1.10
@@ -1 +1 @@
-PasteScript-1.6.3.tar.gz
+PasteScript-1.7.3.tar.gz


Index: python-paste-script.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-paste-script/devel/python-paste-script.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- python-paste-script.spec	9 Dec 2008 18:22:58 -0000	1.18
+++ python-paste-script.spec	7 Jan 2009 05:58:26 -0000	1.19
@@ -2,14 +2,13 @@
 %{!?pyver: %define pyver %(%{__python} -c "import sys ; print sys.version[:3]")}
 
 Name:           python-paste-script
-Version:        1.6.3
-Release:        5%{?dist}
+Version:        1.7.3
+Release:        1%{?dist}
 Summary:        A pluggable command-line frontend
 Group:          System Environment/Libraries
 License:        MIT
 URL:            http://pythonpaste.org/script
 Source0:        http://cheeseshop.python.org/packages/source/P/PasteScript/PasteScript-%{version}.tar.gz
-Patch0:         http://trac.pythonpaste.org/pythonpaste/raw-attachment/ticket/313/copydir_re_fix.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
@@ -34,7 +33,6 @@
 
 %prep
 %setup -q -n PasteScript-%{version}
-%patch0 -p 2 -b .copydir
 
 %build
 %{__python} setup.py build
@@ -64,6 +62,10 @@
 
 
 %changelog
+* Tue Jan 06 2009 Luke Macken <lmacken at redhat.com> - 1.7.3-1
+- Update to 1.7.3
+- Remove copydir_re_fix.patch
+
 * Tue Dec  9 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 1.6.3-5
 - Add patch for copydir re error
 -   (http://trac.pythonpaste.org/pythonpaste/ticket/313)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-paste-script/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	14 Jun 2008 06:47:16 -0000	1.9
+++ sources	7 Jan 2009 05:58:26 -0000	1.10
@@ -1 +1 @@
-d91ad7e03d07f94a3206fef13c18cf49  PasteScript-1.6.3.tar.gz
+9101a3a23809d3413b39ba8b75dd0bce  PasteScript-1.7.3.tar.gz



From lmacken at fedoraproject.org  Wed Jan  7 06:06:41 2009
From: lmacken at fedoraproject.org (Luke Macken)
Date: Wed,  7 Jan 2009 06:06:41 +0000 (UTC)
Subject: rpms/python-pylons/devel .cvsignore, 1.2, 1.3 python-pylons.spec,
	1.2, 1.3 sources, 1.2, 1.3
Message-ID: <20090107060641.8CF3870100@cvs1.fedora.phx.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/python-pylons/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8145

Modified Files:
	.cvsignore python-pylons.spec sources 
Log Message:
* Tue Jan 06 2009 Luke Macken <lmacken at redhat.com> - 0.9.7-0.1.rc4
- Update to 0.9.7rc4
- Update all requirements, and add python-webtest
- Run the test suite




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-pylons/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	27 Jun 2008 23:35:10 -0000	1.2
+++ .cvsignore	7 Jan 2009 06:06:11 -0000	1.3
@@ -1 +1 @@
-Pylons-0.9.6.2.tar.gz
+Pylons-0.9.7rc4.tar.gz


Index: python-pylons.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-pylons/devel/python-pylons.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- python-pylons.spec	29 Nov 2008 15:52:20 -0000	1.2
+++ python-pylons.spec	7 Jan 2009 06:06:11 -0000	1.3
@@ -1,22 +1,43 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
+%define _rc rc4
+
 Name: python-pylons
-Version: 0.9.6.2
-Release: 2%{?dist}
+Version: 0.9.7
+Release: 0.1.%{_rc}%{?dist}
 Summary: Pylons web framework
 
 Group: Development/Languages
 License: BSD
 URL: http://www.pylonshq.com/
-Source0: http://pypi.python.org/packages/source/P/Pylons/Pylons-0.9.6.2.tar.gz
+Source0: http://pypi.python.org/packages/source/P/Pylons/Pylons-%{version}%{_rc}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 BuildRequires: python-setuptools-devel
-Requires: python-routes >= 1.7, python-webhelpers >= 0.3.2, python-beaker >= 0.7.5
-Requires: python-paste >= 1.4, python-paste-script >= 1.3.6, python-paste-deploy >= 1.3.1
-Requires: python-formencode >= 0.7, python-simplejson >= 1.7.1
-Requires: python-decorator >= 2.1.0
-Requires: python-nose >= 0.9.3, python-mako >= 0.1.8
+
+# For the test suite
+BuildRequires: python-routes python-webhelpers python-beaker
+BuildRequires: python-paste python-paste-script python-paste-deploy
+BuildRequires: python-formencode python-simplejson python-decorator
+BuildRequires: python-nose python-mako python-webob python-weberror
+BuildRequires: python-tempita python-webtest python-turbocheetah
+BuildRequires: python-turbokid
+
+Requires: python-routes >= 1.10.1
+Requires: python-webhelpers >= 0.6.3
+Requires: python-beaker >= 1.1.2
+Requires: python-paste >= 1.7.2
+Requires: python-paste-script >= 1.7.3
+Requires: python-paste-deploy >= 1.3.2
+Requires: python-formencode >= 1.2
+Requires: python-simplejson >= 2.0.4
+Requires: python-decorator >= 2.2.0
+Requires: python-nose >= 0.10.4
+Requires: python-mako >= 0.2.3
+Requires: python-webob >= 0.9.4
+Requires: python-weberror >= 0.9.1
+Requires: python-tempita >= 0.2
+Requires: python-webtest >= 1.0.3
 
 
 %description
@@ -31,7 +52,7 @@
 
 
 %prep
-%setup -q -n Pylons-%{version}
+%setup -q -n Pylons-%{version}%{_rc}
 # Trash up OSX tar'ed useless resource files.
 find . -name '._*' -delete
 
@@ -47,6 +68,10 @@
 rm -rf %{buildroot}/%{python_sitelib}/tests
 
 
+%check
+PYTHONPATH=$(pwd) nosetests -v
+
+
 %clean
 rm -rf %{buildroot}
 
@@ -58,6 +83,11 @@
 
 
 %changelog
+* Tue Jan 06 2009 Luke Macken <lmacken at redhat.com> - 0.9.7-0.1.rc4
+- Update to 0.9.7rc4
+- Update all requirements, and add python-webtest
+- Run the test suite
+
 * Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 0.9.6.2-2
 - Rebuild for Python 2.6
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-pylons/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	27 Jun 2008 23:35:10 -0000	1.2
+++ sources	7 Jan 2009 06:06:11 -0000	1.3
@@ -1 +1 @@
-01d0e1ca95cfbfa1f73b8b5ae9a5f0a5  Pylons-0.9.6.2.tar.gz
+464e5fa61f7d899899fd767176b9f42a  Pylons-0.9.7rc4.tar.gz



From lmacken at fedoraproject.org  Wed Jan  7 06:15:08 2009
From: lmacken at fedoraproject.org (Luke Macken)
Date: Wed,  7 Jan 2009 06:15:08 +0000 (UTC)
Subject: rpms/python-webhelpers/devel python-webhelpers.spec,1.4,1.5
Message-ID: <20090107061508.E535270100@cvs1.fedora.phx.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/python-webhelpers/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9605

Modified Files:
	python-webhelpers.spec 
Log Message:
Remove some non-existent files.


Index: python-webhelpers.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-webhelpers/devel/python-webhelpers.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- python-webhelpers.spec	7 Jan 2009 05:46:03 -0000	1.4
+++ python-webhelpers.spec	7 Jan 2009 06:14:38 -0000	1.5
@@ -2,7 +2,7 @@
 
 Name: python-webhelpers
 Version: 0.6.4
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: Helper library for aiding the writing of web templates in Python
 
 Group: Development/Languages
@@ -26,8 +26,6 @@
 
 %prep
 %setup -q -n WebHelpers-%{version}
-# Pointless updstream executable bit
-chmod a-x CHANGELOG
 
 
 %build
@@ -49,11 +47,14 @@
 
 %files
 %defattr(-,root,root,-)
-%doc README.txt CHANGELOG LICENSE docs
+%doc README.txt
 %{python_sitelib}/*
 
 
 %changelog
+* Wed Jan 07 2009 Luke Macken <lmacken at redhat.com> - 0.6.4-2
+- Remove some non-existent files.
+
 * Tue Jan 06 2009 Luke Macken <lmacken at redhat.com> - 0.6.4-1
 - Update to 0.6.4
 - Run the test suite



From pbrobinson at fedoraproject.org  Wed Jan  7 07:03:08 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Wed,  7 Jan 2009 07:03:08 +0000 (UTC)
Subject: rpms/ekiga/devel ekiga.spec,1.63,1.64
Message-ID: <20090107070308.7C8AA70100@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/ekiga/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14028

Modified Files:
	ekiga.spec 
Log Message:
 - Fix issues with the desktop file



Index: ekiga.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ekiga/devel/ekiga.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- ekiga.spec	6 Jan 2009 07:11:15 -0000	1.63
+++ ekiga.spec	7 Jan 2009 07:02:38 -0000	1.64
@@ -1,9 +1,10 @@
 Summary:	A Gnome based SIP/H323 teleconferencing application
 Name:		ekiga
 Version:	3.1.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
+Source1:	ekiga.desktop
 License:	GPLv2+
 Group:		Applications/Communications
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -13,8 +14,6 @@
 Requires:	GConf2
 BuildRequires:	gtk2-devel >= 2.12
 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
@@ -32,7 +31,6 @@
 BuildRequires:	gettext
 BuildRequires:	evolution-data-server-devel
 BuildRequires:	gnome-doc-utils >= 0.3.2
-BuildRequires:	desktop-file-utils
 BuildRequires:	libsigc++20-devel
 BuildRequires:	speex-devel
 BuildRequires:	gstreamer-devel
@@ -65,11 +63,9 @@
 
 rm -rf $RPM_BUILD_ROOT/var/scrollkeeper
 
-desktop-file-install --vendor gnome \
-  --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
-  --delete-original \
-  --copy-generic-name-to-name \
-  $RPM_BUILD_ROOT%{_datadir}/applications/ekiga.desktop
+# Temporarily remove the desktop.in.in file and replace with the real thing
+rm -rf $RPM_BUILD_ROOT%{_datadir}/applications/ekiga.desktop.in.in
+cp %{SOURCE1}  $RPM_BUILD_ROOT%{_datadir}/applications/ekiga.desktop
 
 # Replace identical images in the help by links.
 # This reduces the RPM size by several megabytes.
@@ -133,7 +129,7 @@
 %{_bindir}/ekiga
 %{_bindir}/ekiga-helper
 %{_bindir}/ekiga-config-tool
-%{_datadir}/applications/gnome-ekiga.desktop
+%{_datadir}/applications/ekiga.desktop
 %{_datadir}/pixmaps/ekiga
 %{_datadir}/man/*/*
 %{_datadir}/sounds/ekiga
@@ -142,6 +138,9 @@
 %{_sysconfdir}/gconf/schemas/ekiga.schemas
 
 %changelog
+* Wed Jan  7 2009 Peter Robinson <pbrobinson at gmail.com> - 3.1.0-2
+- Fix issues with the desktop file
+
 * Mon Jan  5 2009 Peter Robinson <pbrobinson at gmail.com> - 3.1.0-1
 - Upgrade to the 3.1.0 devel release, enable gstreamer and xcap, remove libgnome
 



From pkgdb at fedoraproject.org  Wed Jan  7 08:36:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 07 Jan 2009 08:36:23 +0000
Subject: [pkgdb] postr had acl change status
Message-ID: <20090107083623.5692820831B@bastion.fedora.phx.redhat.com>

timlau has set the watchbugzilla acl on postr (Fedora 9) to Approved for timlau

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/postr



From pkgdb at fedoraproject.org  Wed Jan  7 08:36:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 07 Jan 2009 08:36:28 +0000
Subject: [pkgdb] postr had acl change status
Message-ID: <20090107083628.2DC5920831D@bastion.fedora.phx.redhat.com>

timlau has set the commit acl on postr (Fedora 9) to Approved for timlau

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/postr



From pkgdb at fedoraproject.org  Wed Jan  7 08:36:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 07 Jan 2009 08:36:30 +0000
Subject: [pkgdb] postr had acl change status
Message-ID: <20090107083631.08352208421@bastion.fedora.phx.redhat.com>

timlau has set the approveacls acl on postr (Fedora 9) to Approved for timlau

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/postr



From pkgdb at fedoraproject.org  Wed Jan  7 08:36:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 07 Jan 2009 08:36:31 +0000
Subject: [pkgdb] postr had acl change status
Message-ID: <20090107083631.6C25A208456@bastion.fedora.phx.redhat.com>

timlau has set the watchcommits acl on postr (Fedora 9) to Approved for timlau

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/postr



From bojan at fedoraproject.org  Wed Jan  7 08:39:35 2009
From: bojan at fedoraproject.org (Bojan Smojver)
Date: Wed,  7 Jan 2009 08:39:35 +0000 (UTC)
Subject: rpms/libapreq2/devel libapreq2.spec,1.42,1.43
Message-ID: <20090107083935.5472570100@cvs1.fedora.phx.redhat.com>

Author: bojan

Update of /cvs/pkgs/rpms/libapreq2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26545

Modified Files:
	libapreq2.spec 
Log Message:
Delay changing apreq2-config, so we don't pick up wrong libs.


Index: libapreq2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libapreq2/devel/libapreq2.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- libapreq2.spec	13 Nov 2008 07:17:11 -0000	1.42
+++ libapreq2.spec	7 Jan 2009 08:39:04 -0000	1.43
@@ -2,7 +2,7 @@
 
 Name:           libapreq2
 Version:        2.10
-Release:        0.rc1.1%{?dist}
+Release:        0.rc1.2%{?dist}
 Summary:        Apache HTTP request library
 
 Group:          System Environment/Libraries
@@ -89,13 +89,6 @@
 %patch1
 %patch2
 
-# Fix multilib
-sed -i -e 's,^libdir=.*,libdir=`pkg-config --variable=libdir %{name}`,' \
-       -e 's,^LDFLAGS=.*,LDFLAGS=`pkg-config --libs %{name}`,' \
-       -e 's,^LIBS=.*,LIBS=`pkg-config --libs %{name}`,' \
-       -e 's,^INCLUDES=.*,INCLUDES=`pkg-config --cflags-only-I %{name}`,' \
-        apreq2-config.in
-
 cp %{SOURCE2} .
 
 ./buildconf
@@ -111,6 +104,16 @@
   --with-mm-opts=INSTALLDIRS=vendor
 make %{?_smp_mflags}
 
+# Fix multilib
+sed -i -e 's,^libdir=.*,libdir=`pkg-config --variable=libdir %{name}`,' \
+       -e 's,^LDFLAGS=.*,LDFLAGS=`pkg-config --libs %{name}`,' \
+       -e 's,^LIBS=.*,LIBS=`pkg-config --libs %{name}`,' \
+       -e 's,^INCLUDES=.*,INCLUDES=`pkg-config --cflags-only-I %{name}`,' \
+        apreq2-config.in
+
+# Now build apreq2-config again
+make %{?_smp_mflags}
+
 
 %install
 rm -rf $RPM_BUILD_ROOT __docs
@@ -170,6 +173,10 @@
 
 
 %changelog
+
+* Wed Jan  7 2009 Bojan Smojver <bojan at rexursive.com> - 2.10-0.rc1.2
+- delay changing apreq2-config, so we don't pick up wrong libs
+
 * Thu Nov 13 2008 Bojan Smojver <bojan at rexursive.com> - 2.10-0.rc1.1
 - bump up to 2.10-RC1
 



From pgordon at fedoraproject.org  Wed Jan  7 08:40:07 2009
From: pgordon at fedoraproject.org (Peter Gordon)
Date: Wed,  7 Jan 2009 08:40:07 +0000 (UTC)
Subject: rpms/gnome-applet-music/devel .cvsignore, 1.12,
	1.13 gnome-applet-music.spec, 1.27, 1.28 sources, 1.12, 1.13
Message-ID: <20090107084007.EBB5470100@cvs1.fedora.phx.redhat.com>

Author: pgordon

Update of /cvs/pkgs/rpms/gnome-applet-music/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26666

Modified Files:
	.cvsignore gnome-applet-music.spec sources 
Log Message:
Update to 2.5.0 - lots of nice bugfixes and enhancements.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-applet-music/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	23 Aug 2008 03:02:58 -0000	1.12
+++ .cvsignore	7 Jan 2009 08:39:37 -0000	1.13
@@ -1 +1 @@
-music-applet-2.4.2.tar.gz
+music-applet-2.5.0.tar.gz


Index: gnome-applet-music.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-applet-music/devel/gnome-applet-music.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- gnome-applet-music.spec	29 Nov 2008 16:37:04 -0000	1.27
+++ gnome-applet-music.spec	7 Jan 2009 08:39:37 -0000	1.28
@@ -3,8 +3,8 @@
 %global	python_module_name	musicapplet
 
 Name:		gnome-applet-music
-Version:	2.4.2
-Release:	2%{?dist}
+Version:	2.5.0
+Release:	1%{?dist}
 Summary:	A GNOME panel applet to control various music players
 Summary(es):	Miniaplicaci??n del panel GNOME para controlar reproductores de m??sica
 
@@ -149,11 +149,19 @@
 
 
 %changelog
+* Wed Jan 07 2009 Peter Gordon <peter at thecodergeek.com> - 2.5.0-1
+- Update to new upstream release (2.5.0), which adds support for Amarok 2,
+  fixes uncontrolled growth in applet with long metadata strings (#452420),
+  improved loading of album art from Rhythmbox, fixes for the rating scale
+  change in Exaile 0.2.14 (from 8-star to 5-star), fixes improper entity
+  encodings of song titles in notification popups, and replaces the deprecated
+  mpdclient2 library with python-mpd in the MPD plugin.  
+
 * Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 2.4.2-2
 - Rebuild for Python 2.6
 
 * Fri Aug 22 2008 Peter Gordon <peter at thecodergeek.com> - 2.4.2-1
-- update to new upstream bug-fix release, which fixed gradual increase in CPU
+- Update to new upstream bug-fix release, which fixed gradual increase in CPU
   on each song change, MPD password handling, and contains an updated Polish
   (pl) translation.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-applet-music/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	23 Aug 2008 03:02:58 -0000	1.12
+++ sources	7 Jan 2009 08:39:37 -0000	1.13
@@ -1 +1 @@
-89944849b131a7f0adf7c67932986f33  music-applet-2.4.2.tar.gz
+01c85378fbbacea334fa009f94243f78  music-applet-2.5.0.tar.gz



From bojan at fedoraproject.org  Wed Jan  7 08:42:44 2009
From: bojan at fedoraproject.org (Bojan Smojver)
Date: Wed,  7 Jan 2009 08:42:44 +0000 (UTC)
Subject: rpms/libapreq2/F-10 libapreq2.spec,1.41,1.42
Message-ID: <20090107084244.5769A70100@cvs1.fedora.phx.redhat.com>

Author: bojan

Update of /cvs/pkgs/rpms/libapreq2/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27706

Modified Files:
	libapreq2.spec 
Log Message:
Delay changing apreq2-config, so we don't pick up wrong libs.


Index: libapreq2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libapreq2/F-10/libapreq2.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- libapreq2.spec	7 Jul 2008 22:21:13 -0000	1.41
+++ libapreq2.spec	7 Jan 2009 08:42:13 -0000	1.42
@@ -2,7 +2,7 @@
 
 Name:           libapreq2
 Version:        2.09
-Release:        0.18.rc2%{?dist}
+Release:        0.19.rc2%{?dist}
 Summary:        Apache HTTP request library
 
 Group:          System Environment/Libraries
@@ -95,13 +95,6 @@
 %patch4
 %patch5
 
-# Fix multilib
-sed -i -e 's,^libdir=.*,libdir=`pkg-config --variable=libdir %{name}`,' \
-       -e 's,^LDFLAGS=.*,LDFLAGS=`pkg-config --libs %{name}`,' \
-       -e 's,^LIBS=.*,LIBS=`pkg-config --libs %{name}`,' \
-       -e 's,^INCLUDES=.*,INCLUDES=`pkg-config --cflags-only-I %{name}`,' \
-        apreq2-config.in
-
 cp %{SOURCE2} .
 
 ./buildconf
@@ -117,6 +110,16 @@
   --with-mm-opts=INSTALLDIRS=vendor
 make %{?_smp_mflags}
 
+# Fix multilib
+sed -i -e 's,^libdir=.*,libdir=`pkg-config --variable=libdir %{name}`,' \
+       -e 's,^LDFLAGS=.*,LDFLAGS=`pkg-config --libs %{name}`,' \
+       -e 's,^LIBS=.*,LIBS=`pkg-config --libs %{name}`,' \
+       -e 's,^INCLUDES=.*,INCLUDES=`pkg-config --cflags-only-I %{name}`,' \
+        apreq2-config.in
+
+# Now build apreq2-config again
+make %{?_smp_mflags}
+
 
 %install
 rm -rf $RPM_BUILD_ROOT __docs
@@ -176,6 +179,9 @@
 
 
 %changelog
+* Wed Jan  7 2009 Bojan Smojver <bojan at rexursive.com> - 2.09-0.19.rc2
+- delay changing apreq2-config, so we don't pick up wrong libs
+
 * Tue Jul  8 2008 Bojan Smojver <bojan at rexursive.com> - 2.09-0.18.rc2
 - add patch to use --avoid-ldap with apu-1-config
 



From bojan at fedoraproject.org  Wed Jan  7 08:42:59 2009
From: bojan at fedoraproject.org (Bojan Smojver)
Date: Wed,  7 Jan 2009 08:42:59 +0000 (UTC)
Subject: rpms/libapreq2/F-9 libapreq2.spec,1.38,1.39
Message-ID: <20090107084259.2361770100@cvs1.fedora.phx.redhat.com>

Author: bojan

Update of /cvs/pkgs/rpms/libapreq2/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27810

Modified Files:
	libapreq2.spec 
Log Message:
Delay changing apreq2-config, so we don't pick up wrong libs.


Index: libapreq2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libapreq2/F-9/libapreq2.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- libapreq2.spec	9 Mar 2008 18:05:53 -0000	1.38
+++ libapreq2.spec	7 Jan 2009 08:42:28 -0000	1.39
@@ -2,7 +2,7 @@
 
 Name:           libapreq2
 Version:        2.09
-Release:        0.15.rc2%{?dist}
+Release:        0.16.rc2%{?dist}
 Summary:        Apache HTTP request library
 
 Group:          System Environment/Libraries
@@ -91,13 +91,6 @@
 %patch2
 %patch3
 
-# Fix multilib
-sed -i -e 's,^libdir=.*,libdir=`pkg-config --variable=libdir %{name}`,' \
-       -e 's,^LDFLAGS=.*,LDFLAGS=`pkg-config --libs %{name}`,' \
-       -e 's,^LIBS=.*,LIBS=`pkg-config --libs %{name}`,' \
-       -e 's,^INCLUDES=.*,INCLUDES=`pkg-config --cflags-only-I %{name}`,' \
-        apreq2-config.in
-
 cp %{SOURCE2} .
 
 ./buildconf
@@ -113,6 +106,16 @@
   --with-mm-opts=INSTALLDIRS=vendor
 make %{?_smp_mflags}
 
+# Fix multilib
+sed -i -e 's,^libdir=.*,libdir=`pkg-config --variable=libdir %{name}`,' \
+       -e 's,^LDFLAGS=.*,LDFLAGS=`pkg-config --libs %{name}`,' \
+       -e 's,^LIBS=.*,LIBS=`pkg-config --libs %{name}`,' \
+       -e 's,^INCLUDES=.*,INCLUDES=`pkg-config --cflags-only-I %{name}`,' \
+        apreq2-config.in
+
+# Now build apreq2-config again
+make %{?_smp_mflags}
+
 
 %install
 rm -rf $RPM_BUILD_ROOT __docs
@@ -172,6 +175,9 @@
 
 
 %changelog
+* Wed Jan  7 2009 Bojan Smojver <bojan at rexursive.com> - 2.09-0.16.rc2
+- delay changing apreq2-config, so we don't pick up wrong libs
+
 * Wed Feb 27 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 2.09-0.15.rc2
 - Rebuild for perl 5.10 (again)
 



From caolanm at fedoraproject.org  Wed Jan  7 08:44:20 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Wed,  7 Jan 2009 08:44:20 +0000 (UTC)
Subject: rpms/hyphen-el/devel hyphen-el.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090107084420.2C2FE70100@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/hyphen-el/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28747/devel

Modified Files:
	.cvsignore sources 
Added Files:
	hyphen-el.spec import.log 
Log Message:



--- NEW FILE hyphen-el.spec ---
Name: hyphen-el
Summary: Greek hyphenation rules
%define upstreamid 20051018
Version: 0.%{upstreamid}
Release: 1%{?dist}
Source: http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/dictionaries/hyph_el_GR.zip
Group: Applications/Text
URL: http://wiki.services.openoffice.org/wiki/Dictionaries
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
License: LGPLv2+
BuildArch: noarch

Requires: hyphen

%description
Greek hyphenation rules.

%prep
%setup -q -c

%build

%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT/%{_datadir}/hyphen
cp -p *.dic $RPM_BUILD_ROOT/%{_datadir}/hyphen

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc README_hyph_el_GR.txt
%{_datadir}/hyphen/*

%changelog
* Mon Jan 05 2008 Caolan McNamara <caolanm at redhat.com> - 0.20051018-1
- initial version


--- NEW FILE import.log ---
hyphen-el-0_20051018-1_fc10:HEAD:hyphen-el-0.20051018-1.fc10.src.rpm:1231317784


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hyphen-el/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	7 Jan 2009 01:30:33 -0000	1.1
+++ .cvsignore	7 Jan 2009 08:43:49 -0000	1.2
@@ -0,0 +1 @@
+hyph_el_GR.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hyphen-el/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	7 Jan 2009 01:30:33 -0000	1.1
+++ sources	7 Jan 2009 08:43:49 -0000	1.2
@@ -0,0 +1 @@
+73c0d55de8ad750557b0703c5004279e  hyph_el_GR.zip



From caolanm at fedoraproject.org  Wed Jan  7 08:47:47 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Wed,  7 Jan 2009 08:47:47 +0000 (UTC)
Subject: rpms/hyphen-es/devel hyphen-es.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090107084747.E40D870100@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/hyphen-es/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29663/devel

Modified Files:
	.cvsignore sources 
Added Files:
	hyphen-es.spec import.log 
Log Message:



--- NEW FILE hyphen-es.spec ---
Name: hyphen-es
Summary: Spanish hyphenation rules
%define upstreamid 20040810
Version: 0.%{upstreamid}
Release: 1%{?dist}
Source: http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/dictionaries/hyph_es_ES.zip
Group: Applications/Text
URL: http://wiki.services.openoffice.org/wiki/Dictionaries
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
License: LGPLv2+
BuildArch: noarch

Requires: hyphen

%description
Spanish hyphenation rules.

%prep
%setup -q -c

%build
chmod -x README_hyph_es_ES.txt

%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT/%{_datadir}/hyphen
cp -p *.dic $RPM_BUILD_ROOT/%{_datadir}/hyphen

pushd $RPM_BUILD_ROOT/%{_datadir}/hyphen/
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 hyph_es_ES.dic hyph_$lang.dic
done
popd

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc README_hyph_es_ES.txt
%{_datadir}/hyphen/*

%changelog
* Tue Jan 06 2008 Caolan McNamara <caolanm at redhat.com> - 0.20040810-1
- initial version


--- NEW FILE import.log ---
hyphen-es-0_20040810-1_fc10:HEAD:hyphen-es-0.20040810-1.fc10.src.rpm:1231317987


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hyphen-es/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	7 Jan 2009 01:31:16 -0000	1.1
+++ .cvsignore	7 Jan 2009 08:47:17 -0000	1.2
@@ -0,0 +1 @@
+hyph_es_ES.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hyphen-es/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	7 Jan 2009 01:31:16 -0000	1.1
+++ sources	7 Jan 2009 08:47:17 -0000	1.2
@@ -0,0 +1 @@
+d34ab9eefdb49147c57c01227eeb0c66  hyph_es_ES.zip



From mzazrive at fedoraproject.org  Wed Jan  7 08:48:05 2009
From: mzazrive at fedoraproject.org (Milan Zazrivec)
Date: Wed,  7 Jan 2009 08:48:05 +0000 (UTC)
Subject: rpms/xqilla/F-9 xqilla.spec,1.7,1.8
Message-ID: <20090107084805.6942D70100@cvs1.fedora.phx.redhat.com>

Author: mzazrive

Update of /cvs/pkgs/rpms/xqilla/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29775

Modified Files:
	xqilla.spec 
Log Message:
fixed package requirements (bz #473574)


Index: xqilla.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xqilla/F-9/xqilla.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- xqilla.spec	29 Aug 2008 13:25:16 -0000	1.7
+++ xqilla.spec	7 Jan 2009 08:47:34 -0000	1.8
@@ -7,7 +7,7 @@
 Summary: XQilla is an XQuery and XPath 2.0 library, built on top of Xerces-C
 Group: System Environment/Libraries
 Version: 2.0.0
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: ASL 2.0
 URL: http://xqilla.sourceforge.net/HomePage
 # Original upstream source:
@@ -20,10 +20,10 @@
 # It was taken from MAPM library ver. 4.9.5 and modified to work with
 # XQilla ver. 2.0.0. It's purpose is to replace the removed mapm_mt.cpp.
 Source2: mapm_mt.c
-Requires: libstdc++ >= 4.1.1 xerces-c >= 2.7.0
+Requires: libstdc++ >= 4.1.1 xerces-c >= 2.8.0
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-build
-BuildRequires: xerces-c-devel >= 2.7.0 
+BuildRequires: xerces-c-devel >= 2.8.0 
 BuildRequires: autoconf automake libtool
 BuildRequires: doxygen graphviz
 
@@ -117,6 +117,9 @@
 %{_defaultdocdir}/%{name}-%{version}/simple-api
 
 %changelog
+* Wed Jan  7 2008 Milan Zazrivec <mzazrivec at redhat.com> 2.0.0-7
+- fixed package requirements (bz #473574)
+
 * Fri Aug 29 2008 Milan Zazrivec <mzazrivec at redhat.com 2.0.0-6
 - Fix files sections in spec file (documentation was included twice)
 



From mzazrive at fedoraproject.org  Wed Jan  7 08:50:37 2009
From: mzazrive at fedoraproject.org (Milan Zazrivec)
Date: Wed,  7 Jan 2009 08:50:37 +0000 (UTC)
Subject: rpms/xqilla/F-9 xqilla.spec,1.8,1.9
Message-ID: <20090107085037.7257770100@cvs1.fedora.phx.redhat.com>

Author: mzazrive

Update of /cvs/pkgs/rpms/xqilla/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30111

Modified Files:
	xqilla.spec 
Log Message:
changelog: it's 2009, not 2008


Index: xqilla.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xqilla/F-9/xqilla.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- xqilla.spec	7 Jan 2009 08:47:34 -0000	1.8
+++ xqilla.spec	7 Jan 2009 08:50:07 -0000	1.9
@@ -117,7 +117,7 @@
 %{_defaultdocdir}/%{name}-%{version}/simple-api
 
 %changelog
-* Wed Jan  7 2008 Milan Zazrivec <mzazrivec at redhat.com> 2.0.0-7
+* Wed Jan  7 2009 Milan Zazrivec <mzazrivec at redhat.com> 2.0.0-7
 - fixed package requirements (bz #473574)
 
 * Fri Aug 29 2008 Milan Zazrivec <mzazrivec at redhat.com 2.0.0-6



From caolanm at fedoraproject.org  Wed Jan  7 09:07:29 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Wed,  7 Jan 2009 09:07:29 +0000 (UTC)
Subject: rpms/openoffice.org/devel openoffice.org.spec,1.1742,1.1743
Message-ID: <20090107090729.36C7D70100@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31907

Modified Files:
	openoffice.org.spec 
Log Message:
add hyphen-el, hyphen-es


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1742
retrieving revision 1.1743
diff -u -r1.1742 -r1.1743
--- openoffice.org.spec	6 Jan 2009 17:05:43 -0000	1.1742
+++ openoffice.org.spec	7 Jan 2009 09:06:58 -0000	1.1743
@@ -1,6 +1,6 @@
 %define oootag OOO300
 %define ooomilestone 14
-%define rh_rpm_release 3
+%define rh_rpm_release 4
 
 # rhbz#465664 jar-repacking breaks help by reordering META-INF/MANIFEST.MF
 %define __jar_repack %{nil}
@@ -731,7 +731,7 @@
 Summary: Greek language pack for %{name}
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
-Requires: hunspell-el
+Requires: hunspell-el, hyphen-el
 Obsoletes: openoffice.org-i18n < 1.9.0
 Obsoletes: openoffice.org-langpack-el < 1:2.0.3
 Obsoletes: openoffice.org2-langpack-el_GR < 1:3.0.0
@@ -753,7 +753,7 @@
 Summary: Spanish language pack for %{name}
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
-Requires: hunspell-es
+Requires: hunspell-es, hyphen-es
 Obsoletes: openoffice.org-i18n < 1.9.0
 Obsoletes: openoffice.org2-langpack-es < 1:3.0.0
 
@@ -3818,6 +3818,9 @@
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
+* Wed Jan 07 2009 Caol??n McNamara <caolanm at redhat.com> - 1:3.0.1-14.4
+- add hyphen-el, hyphen-es
+
 * Tue Jan 06 2009 Caol??n McNamara <caolanm at redhat.com> - 1:3.0.1-14.3
 - Resolves: rhbz#476959 openoffice.org-3.0.1.ooo97488.sw.ww8toc.patch
 



From caolanm at fedoraproject.org  Wed Jan  7 09:10:53 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Wed,  7 Jan 2009 09:10:53 +0000 (UTC)
Subject: rpms/desktop-data-model/devel desktop-data-model.spec,1.9,1.10
Message-ID: <20090107091053.60CC670100@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/desktop-data-model/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32276

Modified Files:
	desktop-data-model.spec 
Log Message:
rebuild for dependancies


Index: desktop-data-model.spec
===================================================================
RCS file: /cvs/pkgs/rpms/desktop-data-model/devel/desktop-data-model.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- desktop-data-model.spec	30 Dec 2008 14:27:42 -0000	1.9
+++ desktop-data-model.spec	7 Jan 2009 09:10:23 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           desktop-data-model
 Version:        1.2.5
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Engine providing live updates of online data to the desktop
 
 Group:          System Environment/Libraries
@@ -82,6 +82,9 @@
 %{_libdir}/*.so
 
 %changelog
+* Wed Jan 07 2009 Caol??n McNamara <caolanm at redhat.com> - 1.2.5-4
+- rebuild for dependancies
+
 * Tue Dec 30 2008 Caol??n McNamara <caolanm at redhat.com> - 1.2.5-3
 - rebuild for dependancies
 



From caolanm at fedoraproject.org  Wed Jan  7 09:13:11 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Wed,  7 Jan 2009 09:13:11 +0000 (UTC)
Subject: rpms/libgsf/devel .cvsignore, 1.23, 1.24 libgsf.spec, 1.62,
	1.63 sources, 1.23, 1.24
Message-ID: <20090107091311.884AA70100@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/libgsf/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32556

Modified Files:
	.cvsignore libgsf.spec sources 
Log Message:
latest version


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libgsf/devel/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- .cvsignore	20 Oct 2008 16:05:45 -0000	1.23
+++ .cvsignore	7 Jan 2009 09:12:40 -0000	1.24
@@ -1 +1 @@
-libgsf-1.14.10.tar.bz2
+libgsf-1.14.11.tar.bz2


Index: libgsf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libgsf/devel/libgsf.spec,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- libgsf.spec	29 Nov 2008 16:48:01 -0000	1.62
+++ libgsf.spec	7 Jan 2009 09:12:41 -0000	1.63
@@ -3,8 +3,8 @@
 
 Summary: GNOME Structured File library
 Name: libgsf
-Version: 1.14.10
-Release: 2%{?dist}
+Version: 1.14.11
+Release: 1%{?dist}
 Group: System Environment/Libraries
 License: LGPLv2
 Source: ftp://ftp.gnome.org/pub/GNOME/sources/%{name}/1.14/%{name}-%{version}.tar.bz2
@@ -132,6 +132,9 @@
 rm -r $RPM_BUILD_ROOT
 
 %changelog
+* Wed Jan 07 2009 Caol??n McNamara <caolanm at redhat.com> 1.14.11-1
+- latest version
+
 * Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 1.14.10-2
 - Rebuild for Python 2.6
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libgsf/devel/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sources	20 Oct 2008 16:05:46 -0000	1.23
+++ sources	7 Jan 2009 09:12:41 -0000	1.24
@@ -1 +1 @@
-f9b2f309089af683066ff0b319227e57  libgsf-1.14.10.tar.bz2
+86bec0012435fbafe02a6e4c88bdf9ba  libgsf-1.14.11.tar.bz2



From caolanm at fedoraproject.org  Wed Jan  7 09:21:51 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Wed,  7 Jan 2009 09:21:51 +0000 (UTC)
Subject: rpms/syck/devel syck.spec,1.27,1.28
Message-ID: <20090107092151.77A9270100@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/syck/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2035

Modified Files:
	syck.spec 
Log Message:
build isn't parallel-make safe


Index: syck.spec
===================================================================
RCS file: /cvs/pkgs/rpms/syck/devel/syck.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- syck.spec	19 Dec 2008 14:15:54 -0000	1.27
+++ syck.spec	7 Jan 2009 09:21:20 -0000	1.28
@@ -6,7 +6,7 @@
 Summary:	YAML for C, Python, and PHP
 
 Version:	0.61
-Release:	7.1%{?dist}
+Release:	7.2%{?dist}
 
 License:	BSD
 Group:		System Environment/Libraries
@@ -112,7 +112,9 @@
 %build
 libtoolize --force --copy && aclocal && automake --add-missing && autoconf
 %configure
-%{__make} %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS"
+#%{__make} %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS"
+#not parallel-build-safe
+%{__make} CFLAGS="$RPM_OPT_FLAGS"
 
 rm lib/*.la lib/.libs/*.la lib/.libs/*.lai
 # Go into extensions directory
@@ -190,6 +192,9 @@
 %config(noreplace) %{_sysconfdir}/php.d/syck.ini
 
 %changelog
+* Wed Jan 07 2009 Caol??n McNamara <caolanm at redhat.com> - 0.61-7.2
+- build isn't parallel-make safe
+
 * Fri Dec 19 2008 Oliver Falk <oliver at linux-kernel.at>	- 0.61-7.1
 - Add bison-devel as BR
 



From pgordon at fedoraproject.org  Wed Jan  7 09:29:42 2009
From: pgordon at fedoraproject.org (Peter Gordon)
Date: Wed,  7 Jan 2009 09:29:42 +0000 (UTC)
Subject: rpms/gnome-applet-music/F-10 .cvsignore, 1.12,
	1.13 gnome-applet-music.spec, 1.26, 1.27 sources, 1.12, 1.13
Message-ID: <20090107092942.E5D4370100@cvs1.fedora.phx.redhat.com>

Author: pgordon

Update of /cvs/pkgs/rpms/gnome-applet-music/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3363/F-10

Modified Files:
	.cvsignore gnome-applet-music.spec sources 
Log Message:
Update to 2.5.0 - lots of nice bugfixes and enhancements.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-applet-music/F-10/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	23 Aug 2008 03:02:58 -0000	1.12
+++ .cvsignore	7 Jan 2009 09:29:12 -0000	1.13
@@ -1 +1 @@
-music-applet-2.4.2.tar.gz
+music-applet-2.5.0.tar.gz


Index: gnome-applet-music.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-applet-music/F-10/gnome-applet-music.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- gnome-applet-music.spec	23 Aug 2008 03:02:58 -0000	1.26
+++ gnome-applet-music.spec	7 Jan 2009 09:29:12 -0000	1.27
@@ -3,7 +3,7 @@
 %global	python_module_name	musicapplet
 
 Name:		gnome-applet-music
-Version:	2.4.2
+Version:	2.5.0
 Release:	1%{?dist}
 Summary:	A GNOME panel applet to control various music players
 Summary(es):	Miniaplicaci??n del panel GNOME para controlar reproductores de m??sica
@@ -149,6 +149,14 @@
 
 
 %changelog
+* Wed Jan 07 2009 Peter Gordon <peter at thecodergeek.com> - 2.5.0-1
+- Update to new upstream release (2.5.0), which adds support for Amarok 2,
+  fixes uncontrolled growth in applet with long metadata strings (#452420),
+  improved loading of album art from Rhythmbox, fixes for the rating scale
+  change in Exaile 0.2.14 (from 8-star to 5-star), fixes improper entity
+  encodings of song titles in notification popups, and replaces the deprecated
+  mpdclient2 library with python-mpd in the MPD plugin.  
+
 * Fri Aug 22 2008 Peter Gordon <peter at thecodergeek.com> - 2.4.2-1
 - update to new upstream bug-fix release, which fixed gradual increase in CPU
   on each song change, MPD password handling, and contains an updated Polish


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-applet-music/F-10/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	23 Aug 2008 03:02:58 -0000	1.12
+++ sources	7 Jan 2009 09:29:12 -0000	1.13
@@ -1 +1 @@
-89944849b131a7f0adf7c67932986f33  music-applet-2.4.2.tar.gz
+01c85378fbbacea334fa009f94243f78  music-applet-2.5.0.tar.gz



From pgordon at fedoraproject.org  Wed Jan  7 09:34:55 2009
From: pgordon at fedoraproject.org (Peter Gordon)
Date: Wed,  7 Jan 2009 09:34:55 +0000 (UTC)
Subject: rpms/gnome-applet-music/F-9 .cvsignore, 1.12,
	1.13 gnome-applet-music.spec, 1.26, 1.27 sources, 1.12, 1.13
Message-ID: <20090107093455.D34B670100@cvs1.fedora.phx.redhat.com>

Author: pgordon

Update of /cvs/pkgs/rpms/gnome-applet-music/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4283/F-9

Modified Files:
	.cvsignore gnome-applet-music.spec sources 
Log Message:
Update to 2.5.0 - lots of nice bugfixes and enhancments


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-applet-music/F-9/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	23 Aug 2008 03:03:50 -0000	1.12
+++ .cvsignore	7 Jan 2009 09:34:25 -0000	1.13
@@ -1 +1 @@
-music-applet-2.4.2.tar.gz
+music-applet-2.5.0.tar.gz


Index: gnome-applet-music.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-applet-music/F-9/gnome-applet-music.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- gnome-applet-music.spec	23 Aug 2008 03:03:50 -0000	1.26
+++ gnome-applet-music.spec	7 Jan 2009 09:34:25 -0000	1.27
@@ -3,7 +3,7 @@
 %global	python_module_name	musicapplet
 
 Name:		gnome-applet-music
-Version:	2.4.2
+Version:	2.5.0
 Release:	1%{?dist}
 Summary:	A GNOME panel applet to control various music players
 Summary(es):	Miniaplicaci??n del panel GNOME para controlar reproductores de m??sica
@@ -149,6 +149,14 @@
 
 
 %changelog
+* Wed Jan 07 2009 Peter Gordon <peter at thecodergeek.com> - 2.5.0-1
+- Update to new upstream release (2.5.0), which adds support for Amarok 2,
+  fixes uncontrolled growth in applet with long metadata strings (#452420),
+  improved loading of album art from Rhythmbox, fixes for the rating scale
+  change in Exaile 0.2.14 (from 8-star to 5-star), fixes improper entity
+  encodings of song titles in notification popups, and replaces the deprecated
+  mpdclient2 library with python-mpd in the MPD plugin.  
+
 * Fri Aug 22 2008 Peter Gordon <peter at thecodergeek.com> - 2.4.2-1
 - update to new upstream bug-fix release, which fixed gradual increase in CPU
   on each song change, MPD password handling, and contains an updated Polish


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-applet-music/F-9/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	23 Aug 2008 03:03:50 -0000	1.12
+++ sources	7 Jan 2009 09:34:25 -0000	1.13
@@ -1 +1 @@
-89944849b131a7f0adf7c67932986f33  music-applet-2.4.2.tar.gz
+01c85378fbbacea334fa009f94243f78  music-applet-2.5.0.tar.gz



From sharkcz at fedoraproject.org  Wed Jan  7 09:41:55 2009
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Wed,  7 Jan 2009 09:41:55 +0000 (UTC)
Subject: rpms/pyparsing/EL-4 .cvsignore, 1.2, 1.3 pyparsing.spec, 1.2,
	1.3 sources, 1.2, 1.3
Message-ID: <20090107094155.9BF6D70100@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/pyparsing/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5236

Modified Files:
	.cvsignore pyparsing.spec sources 
Log Message:
import 1.4.11 into EPEL


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pyparsing/EL-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	3 Aug 2005 19:08:56 -0000	1.2
+++ .cvsignore	7 Jan 2009 09:41:25 -0000	1.3
@@ -1 +1 @@
-pyparsing-1.3.tar.gz
+pyparsing-1.4.11.tar.gz


Index: pyparsing.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pyparsing/EL-4/pyparsing.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- pyparsing.spec	3 Aug 2005 20:15:58 -0000	1.2
+++ pyparsing.spec	7 Jan 2009 09:41:25 -0000	1.3
@@ -1,19 +1,19 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           pyparsing
-Version:        1.3
+Version:        1.4.11
 Release:        1%{?dist}
 Summary:        An object-oriented approach to text processing
 
 Group:          Development/Libraries
 License:        MIT
-URL:            http://pyparsing.sourceforge.net/
-Source0:        http://prdownloads.sourceforge.net/pyparsing/pyparsing-1.3.tar.gz
+URL:            http://pyparsing.wikispaces.com/
+Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 Source1:        pyparsing-LICENSE
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
-BuildRequires:  %{__python}
+BuildRequires:  python-devel
 
 %description
 pyparsing is a module that can be used to easily and directly configure syntax
@@ -36,10 +36,28 @@
 
 %files
 %defattr(-,root,root,-)
-%doc CHANGES examples HowToUsePyparsing.html htmldoc pyparsingClassDiagram.png README LICENSE
-%{python_sitelib}/pyparsing.py
-%{python_sitelib}/pyparsing.py[co]
+%doc CHANGES docs examples HowToUsePyparsing.html htmldoc pyparsingClassDiagram.* README LICENSE
+%if 0%{?fedora} >= 9
+%{python_sitelib}/pyparsing*egg-info
+%endif
+%{python_sitelib}/pyparsing.py*
+
 
 %changelog
+* Tue Apr  1 2008 Jos?? Matos <jamatos[AT]fc.up.pt> - 1.4.11-1
+- New upstream version, add egg-info for F9+.
+
+* Wed Aug 29 2007 Jos?? Matos <jamatos[AT]fc.up.pt> - 1.4.7-1
+- New upstream version.
+
+* Sat Apr 21 2007 Jos?? Matos <jamatos[AT]fc.up.pt> - 1.4.6-1
+- New upstream version.
+
+* Mon Dec 11 2006 Jos?? Matos <jamatos[AT]fc.up.pt> - 1.4.4-1
+- New upstream version.
+
+* Mon Sep 11 2006 Jos?? Matos <jamatos[AT]fc.up.pt> - 1.4.3-1
+- New version.
+
 * Wed Aug  3 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.3-1
 - Initial RPM release


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pyparsing/EL-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	3 Aug 2005 19:08:56 -0000	1.2
+++ sources	7 Jan 2009 09:41:25 -0000	1.3
@@ -1 +1 @@
-d7e36e248fe9096faa950cb7718e6f04  pyparsing-1.3.tar.gz
+f5c26d14fba7bc4e1372e79375b0a77f  pyparsing-1.4.11.tar.gz



From sharkcz at fedoraproject.org  Wed Jan  7 09:44:03 2009
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Wed,  7 Jan 2009 09:44:03 +0000 (UTC)
Subject: rpms/pyparsing/EL-5 .cvsignore, 1.6, 1.7 pyparsing.spec, 1.6,
	1.7 sources, 1.6, 1.7
Message-ID: <20090107094403.9489B70100@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/pyparsing/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5685

Modified Files:
	.cvsignore pyparsing.spec sources 
Log Message:
import 1.5.0 into EPEL


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pyparsing/EL-5/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	29 Aug 2007 16:03:11 -0000	1.6
+++ .cvsignore	7 Jan 2009 09:43:33 -0000	1.7
@@ -1 +1 @@
-pyparsing-1.4.7.tar.gz
+pyparsing-1.5.0.tar.gz


Index: pyparsing.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pyparsing/EL-5/pyparsing.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- pyparsing.spec	29 Aug 2007 16:03:11 -0000	1.6
+++ pyparsing.spec	7 Jan 2009 09:43:33 -0000	1.7
@@ -1,14 +1,14 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           pyparsing
-Version:        1.4.7
-Release:        1%{?dist}
+Version:        1.5.0
+Release:        3%{?dist}
 Summary:        An object-oriented approach to text processing
 
 Group:          Development/Libraries
 License:        MIT
 URL:            http://pyparsing.wikispaces.com/
-Source0:        http://download.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
+Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 Source1:        pyparsing-LICENSE
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
@@ -37,10 +37,25 @@
 %files
 %defattr(-,root,root,-)
 %doc CHANGES docs examples HowToUsePyparsing.html htmldoc pyparsingClassDiagram.* README LICENSE
-%{python_sitelib}/pyparsing.py
-%{python_sitelib}/pyparsing.py[co]
+%if 0%{?fedora} >= 9
+%{python_sitelib}/pyparsing*egg-info
+%endif
+%{python_sitelib}/pyparsing.py*
+
 
 %changelog
+* Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 1.5.0-3
+- Rebuild for Python 2.6
+
+* Mon Aug  4 2008 Jos?? Matos <jamatos[AT]fc.up.pt> - 1.5.0-2
+- respun (now with the right sources)
+
+* Mon Aug  4 2008 Jos?? Matos <jamatos[AT]fc.up.pt> - 1.5.0-1
+- new upstream release.
+
+* Tue Apr  1 2008 Jos?? Matos <jamatos[AT]fc.up.pt> - 1.4.11-1
+- New upstream version, add egg-info for F9+.
+
 * Wed Aug 29 2007 Jos?? Matos <jamatos[AT]fc.up.pt> - 1.4.7-1
 - New upstream version.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pyparsing/EL-5/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	29 Aug 2007 16:03:11 -0000	1.6
+++ sources	7 Jan 2009 09:43:33 -0000	1.7
@@ -1 +1 @@
-144b8854de246c321093d9f80727de9e  pyparsing-1.4.7.tar.gz
+ee318f600fcf34966daeb1bf9bebda8c  pyparsing-1.5.0.tar.gz



From xavierb at fedoraproject.org  Wed Jan  7 09:51:09 2009
From: xavierb at fedoraproject.org (Xavier Bachelot)
Date: Wed,  7 Jan 2009 09:51:09 +0000 (UTC)
Subject: rpms/xorg-x11-drv-openchrome/devel
	openchrome-0.2.903-PreInitCRTC.patch, NONE,
	1.1 xorg-x11-drv-openchrome.spec, 1.36, 1.37
Message-ID: <20090107095109.4D86270100@cvs1.fedora.phx.redhat.com>

Author: xavierb

Update of /cvs/pkgs/rpms/xorg-x11-drv-openchrome/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7003

Modified Files:
	xorg-x11-drv-openchrome.spec 
Added Files:
	openchrome-0.2.903-PreInitCRTC.patch 
Log Message:
fix CRTCInit crash

openchrome-0.2.903-PreInitCRTC.patch:

--- NEW FILE openchrome-0.2.903-PreInitCRTC.patch ---
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 711)
+++ ChangeLog	(revision 712)
@@ -1,3 +1,14 @@
+2009-01-07  Jon Nettleton <jon.nettleton at gmail.com>
+
+	* src/via_bios.h:
+	* src/via_crtc.c: (via_xf86crtc_resize), (ViaPreInitCRTCConfig):
+	* src/via_driver.c: (VIAPreInit):
+
+	Temporary hack to fix a bug with newer Xorg and DRI
+	that crashes if CRTC is not setup.  I am adding this
+	because I am working on this part of the code anyways
+	so it won't get lost in bit rot.
+
 2009-01-06  Jon Nettleton  <jon.nettleton at gmail.com>
 
 	* src/via_mode.c: (ViaModesMonitorFixup), (ViaModesAttachHelper):
Index: src/via_driver.c
===================================================================
--- src/via_driver.c	(revision 711)
+++ src/via_driver.c	(revision 712)
@@ -1665,6 +1665,9 @@
         return FALSE;
     }
 
+	/* Might not belong here temporary fix for bug fix */
+    ViaPreInitCRTCConfig(pScrn);
+
     if (!pVia->UseLegacyModeSwitch) {
         if (pBIOSInfo->Panel->IsActive)
             ViaPanelPreInit(pScrn);
Index: src/via_crtc.c
===================================================================
--- src/via_crtc.c	(revision 711)
+++ src/via_crtc.c	(revision 712)
@@ -35,6 +35,8 @@
 
 #include "via_mode.h"
 
+#include <xorg/xf86Crtc.h>
+
 static void
 ViaCRTCSetGraphicsRegisters(ScrnInfoPtr pScrn)
 {
@@ -73,6 +75,26 @@
     hwp->writeAttr(hwp, 0x14, 0x00);
 }
 
+static Bool
+via_xf86crtc_resize (ScrnInfoPtr scrn, int width, int height)
+{
+    scrn->virtualX = width;
+    scrn->virtualY = height;
+    return TRUE;
+}
+
+static const
+xf86CrtcConfigFuncsRec via_xf86crtc_config_funcs = {
+    via_xf86crtc_resize
+};
+
+void 
+ViaPreInitCRTCConfig(ScrnInfoPtr pScrn)
+{
+     xf86CrtcConfigInit (pScrn, &via_xf86crtc_config_funcs);
+}
+
+
 void
 ViaCRTCInit(ScrnInfoPtr pScrn)
 {
Index: src/via_bios.h
===================================================================
--- src/via_bios.h	(revision 711)
+++ src/via_bios.h	(revision 712)
@@ -227,6 +227,7 @@
 void ViaModeSet(ScrnInfoPtr pScrn, DisplayModePtr mode);
 
 /* via_crtc.c */
+void ViaPreInitCRTCConfig(ScrnInfoPtr pScrn);
 void ViaCRTCInit(ScrnInfoPtr pScrn);
 void ViaFirstCRTCSetStartingAddress(ScrnInfoPtr pSCrn, int x, int y);
 void ViaFirstCRTCSetMode(ScrnInfoPtr pScrn, DisplayModePtr mode);


Index: xorg-x11-drv-openchrome.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-openchrome/devel/xorg-x11-drv-openchrome.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- xorg-x11-drv-openchrome.spec	5 Jan 2009 19:46:11 -0000	1.36
+++ xorg-x11-drv-openchrome.spec	7 Jan 2009 09:50:38 -0000	1.37
@@ -21,7 +21,9 @@
 
 # Patches from upstream trunk :
 #Patch1:         openchrome-0.2.903-sync_pciids.patch
-Patch2:         openchrome-0.2.903-latest_snapshot.patch
+#Patch2:         openchrome-0.2.903-fix_bltsize.patch
+Patch98:          openchrome-0.2.903-PreInitCRTC.patch
+Patch99:         openchrome-0.2.903-latest_snapshot.patch
 # Fedora specific patches :
 #Patch100:       openchrome-0.2.903-re_enable_AGPDMA.patch
 # Experimental patches (branch backport, etc...): 
@@ -63,7 +65,9 @@
 %prep
 %setup -q -n %{tarball}-%{version}
 #%patch1 -p0 -b .pciids
-%patch2 -p0 -b .latest
+#%patch2 -p0 -b .bltsize
+%patch99 -p0 -b .latest
+%patch98 -p0 -b .PreInitCRTC
 #%patch100 -p0 -b .agpdma
 #%patch200 -p0 -b .panel
 
@@ -123,6 +127,9 @@
 
 
 %changelog
+* Wed Jan 07 2009 Xavier Bachelot <xavier at bachelot.org> - 0.2.903-6
+- Fix crash with xserver 1.6 (changeset 712).
+
 * Mon Jan 05 2009 Xavier Bachelot <xavier at bachelot.org> - 0.2.903-5
 - Update to latest snapshot (svn 711), fix hardware cursor and add VX800 Xv.
 



From nphilipp at fedoraproject.org  Wed Jan  7 10:00:08 2009
From: nphilipp at fedoraproject.org (Nils Philippsen)
Date: Wed,  7 Jan 2009 10:00:08 +0000 (UTC)
Subject: rpms/gimp/devel gimp.spec,1.179,1.180
Message-ID: <20090107100008.67FBB70100@cvs1.fedora.phx.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/gimp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7797

Modified Files:
	gimp.spec 
Log Message:
split off gimptool into new gimp-devel-tools subpackage to avoid multilib conflicts (#477789)
require poppler-glib-devel for building from F9 on (#478691)
fix gimp-devel package group



Index: gimp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gimp/devel/gimp.spec,v
retrieving revision 1.179
retrieving revision 1.180
diff -u -r1.179 -r1.180
--- gimp.spec	4 Jan 2009 12:17:48 -0000	1.179
+++ gimp.spec	7 Jan 2009 09:59:37 -0000	1.180
@@ -29,7 +29,7 @@
 %define age 0
 %define minorver 600
 %define microver %(ver=%{version}; echo ${ver##*.*.})
-Release:        2%{?dist}
+Release:        3%{?dist}
 Epoch:          2
 License:        GPLv2+
 Group:          Applications/Multimedia
@@ -62,7 +62,11 @@
 BuildRequires:  libtiff-devel
 BuildRequires:  libwmf-devel >= 0.2.8
 BuildRequires:  pango-devel >= 1.18.0
+%if 0%{?fedora}%{?rhel} == 0 || 0%{?fedora} > 8 || 0%{?rhel} > 5
+BuildRequires:  poppler-glib-devel >= 0.4.1
+%else
 BuildRequires:  poppler-devel >= 0.4.1
+%endif
 BuildRequires:  python-devel
 BuildRequires:  pygtk2-devel >= 2.10.4
 BuildRequires:  pygobject2-devel
@@ -125,9 +129,10 @@
 
 %package devel
 Summary:        GIMP plugin and extension development kit
-Group:          Applications/Multimedia
+Group:          Development/Libraries
 License:        LGPLv2+
 Requires:       gimp-libs-%{_arch} = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:       gimp-devel-tools = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires:       gtk2-devel
 Requires:       glib2-devel
 Requires:       pkgconfig
@@ -137,6 +142,16 @@
 for writing GNU Image Manipulation Program (GIMP) plug-ins and
 extensions.
 
+%package devel-tools
+Summary:        GIMP plugin and extension development tools
+Group:          Development/Tools
+License:        LGPLv2+
+Requires:       gimp-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description devel-tools
+The gimp-devel-tools package contains gimptool, a helper program to build GNU
+Image Manipulation Program (GIMP) plug-ins and extensions.
+
 %package help-browser
 Summary:        GIMP help browser plug-in
 Group:          Applications/Multimedia
@@ -421,14 +436,6 @@
 %doc HACKING README.i18n
 %doc %{_datadir}/gtk-doc/*
 
-%{_bindir}/gimptool-%{interfacever}
-%{_mandir}/man1/gimptool-%{interfacever}.1*
-
-%if %{with convenience}
-%{_bindir}/gimptool
-%{_mandir}/man1/gimptool.1*
-%endif
-
 %{_libdir}/*.so
 %dir %{_libdir}/gimp
 %dir %{_libdir}/gimp/%{interfacever}
@@ -441,11 +448,27 @@
 %{_includedir}/gimp-%{interfacever}
 %{_libdir}/pkgconfig/*
 
+%files devel-tools
+%defattr (-, root, root, 0755)
+%{_bindir}/gimptool-%{interfacever}
+%{_mandir}/man1/gimptool-%{interfacever}.1*
+
+%if %{with convenience}
+%{_bindir}/gimptool
+%{_mandir}/man1/gimptool.1*
+%endif
+
 %files help-browser
 %defattr (-, root, root, 0755)
 %{_libdir}/gimp/%{interfacever}/plug-ins/help-browser
 
 %changelog
+* Wed Jan 07 2009 Nils Philippsen <nils at redhat.com> - 2:2.6.4-3
+- split off gimptool into new gimp-devel-tools subpackage to avoid multilib
+  conflicts (#477789)
+- require poppler-glib-devel for building from F9 on (#478691)
+- fix gimp-devel package group
+
 * Sun Jan 04 2009 Nils Philippsen <nils at redhat.com> - 2:2.6.4-2
 - enable building with aalib
 



From nphilipp at fedoraproject.org  Wed Jan  7 10:00:34 2009
From: nphilipp at fedoraproject.org (Nils Philippsen)
Date: Wed,  7 Jan 2009 10:00:34 +0000 (UTC)
Subject: rpms/gimp/F-10 gimp.spec,1.178,1.179
Message-ID: <20090107100034.B438D70100@cvs1.fedora.phx.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/gimp/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7875

Modified Files:
	gimp.spec 
Log Message:
split off gimptool into new gimp-devel-tools subpackage to avoid multilib conflicts (#477789)
require poppler-glib-devel for building from F9 on (#478691)
fix gimp-devel package group



Index: gimp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gimp/F-10/gimp.spec,v
retrieving revision 1.178
retrieving revision 1.179
diff -u -r1.178 -r1.179
--- gimp.spec	4 Jan 2009 12:17:51 -0000	1.178
+++ gimp.spec	7 Jan 2009 10:00:04 -0000	1.179
@@ -29,7 +29,7 @@
 %define age 0
 %define minorver 600
 %define microver %(ver=%{version}; echo ${ver##*.*.})
-Release:        2%{?dist}
+Release:        3%{?dist}
 Epoch:          2
 License:        GPLv2+
 Group:          Applications/Multimedia
@@ -62,7 +62,11 @@
 BuildRequires:  libtiff-devel
 BuildRequires:  libwmf-devel >= 0.2.8
 BuildRequires:  pango-devel >= 1.18.0
+%if 0%{?fedora}%{?rhel} == 0 || 0%{?fedora} > 8 || 0%{?rhel} > 5
+BuildRequires:  poppler-glib-devel >= 0.4.1
+%else
 BuildRequires:  poppler-devel >= 0.4.1
+%endif
 BuildRequires:  python-devel
 BuildRequires:  pygtk2-devel >= 2.10.4
 BuildRequires:  pygobject2-devel
@@ -125,9 +129,10 @@
 
 %package devel
 Summary:        GIMP plugin and extension development kit
-Group:          Applications/Multimedia
+Group:          Development/Libraries
 License:        LGPLv2+
 Requires:       gimp-libs-%{_arch} = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:       gimp-devel-tools = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires:       gtk2-devel
 Requires:       glib2-devel
 Requires:       pkgconfig
@@ -137,6 +142,16 @@
 for writing GNU Image Manipulation Program (GIMP) plug-ins and
 extensions.
 
+%package devel-tools
+Summary:        GIMP plugin and extension development tools
+Group:          Development/Tools
+License:        LGPLv2+
+Requires:       gimp-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description devel-tools
+The gimp-devel-tools package contains gimptool, a helper program to build GNU
+Image Manipulation Program (GIMP) plug-ins and extensions.
+
 %package help-browser
 Summary:        GIMP help browser plug-in
 Group:          Applications/Multimedia
@@ -421,14 +436,6 @@
 %doc HACKING README.i18n
 %doc %{_datadir}/gtk-doc/*
 
-%{_bindir}/gimptool-%{interfacever}
-%{_mandir}/man1/gimptool-%{interfacever}.1*
-
-%if %{with convenience}
-%{_bindir}/gimptool
-%{_mandir}/man1/gimptool.1*
-%endif
-
 %{_libdir}/*.so
 %dir %{_libdir}/gimp
 %dir %{_libdir}/gimp/%{interfacever}
@@ -441,11 +448,27 @@
 %{_includedir}/gimp-%{interfacever}
 %{_libdir}/pkgconfig/*
 
+%files devel-tools
+%defattr (-, root, root, 0755)
+%{_bindir}/gimptool-%{interfacever}
+%{_mandir}/man1/gimptool-%{interfacever}.1*
+
+%if %{with convenience}
+%{_bindir}/gimptool
+%{_mandir}/man1/gimptool.1*
+%endif
+
 %files help-browser
 %defattr (-, root, root, 0755)
 %{_libdir}/gimp/%{interfacever}/plug-ins/help-browser
 
 %changelog
+* Wed Jan 07 2009 Nils Philippsen <nils at redhat.com> - 2:2.6.4-3
+- split off gimptool into new gimp-devel-tools subpackage to avoid multilib
+  conflicts (#477789)
+- require poppler-glib-devel for building from F9 on (#478691)
+- fix gimp-devel package group
+
 * Sun Jan 04 2009 Nils Philippsen <nils at redhat.com> - 2:2.6.4-2
 - enable building with aalib
 



From nphilipp at fedoraproject.org  Wed Jan  7 10:00:45 2009
From: nphilipp at fedoraproject.org (Nils Philippsen)
Date: Wed,  7 Jan 2009 10:00:45 +0000 (UTC)
Subject: rpms/gimp/F-9 gimp.spec,1.168,1.169
Message-ID: <20090107100045.52B2270100@cvs1.fedora.phx.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/gimp/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7913

Modified Files:
	gimp.spec 
Log Message:
split off gimptool into new gimp-devel-tools subpackage to avoid multilib conflicts (#477789)
require poppler-glib-devel for building from F9 on (#478691)
fix gimp-devel package group



Index: gimp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gimp/F-9/gimp.spec,v
retrieving revision 1.168
retrieving revision 1.169
diff -u -r1.168 -r1.169
--- gimp.spec	4 Jan 2009 12:17:52 -0000	1.168
+++ gimp.spec	7 Jan 2009 10:00:15 -0000	1.169
@@ -29,7 +29,7 @@
 %define age 0
 %define minorver 600
 %define microver %(ver=%{version}; echo ${ver##*.*.})
-Release:        2%{?dist}
+Release:        3%{?dist}
 Epoch:          2
 License:        GPLv2+
 Group:          Applications/Multimedia
@@ -62,7 +62,11 @@
 BuildRequires:  libtiff-devel
 BuildRequires:  libwmf-devel >= 0.2.8
 BuildRequires:  pango-devel >= 1.18.0
+%if 0%{?fedora}%{?rhel} == 0 || 0%{?fedora} > 8 || 0%{?rhel} > 5
+BuildRequires:  poppler-glib-devel >= 0.4.1
+%else
 BuildRequires:  poppler-devel >= 0.4.1
+%endif
 BuildRequires:  python-devel
 BuildRequires:  pygtk2-devel >= 2.10.4
 BuildRequires:  pygobject2-devel
@@ -125,9 +129,10 @@
 
 %package devel
 Summary:        GIMP plugin and extension development kit
-Group:          Applications/Multimedia
+Group:          Development/Libraries
 License:        LGPLv2+
 Requires:       gimp-libs-%{_arch} = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:       gimp-devel-tools = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires:       gtk2-devel
 Requires:       glib2-devel
 Requires:       pkgconfig
@@ -137,6 +142,16 @@
 for writing GNU Image Manipulation Program (GIMP) plug-ins and
 extensions.
 
+%package devel-tools
+Summary:        GIMP plugin and extension development tools
+Group:          Development/Tools
+License:        LGPLv2+
+Requires:       gimp-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description devel-tools
+The gimp-devel-tools package contains gimptool, a helper program to build GNU
+Image Manipulation Program (GIMP) plug-ins and extensions.
+
 %package help-browser
 Summary:        GIMP help browser plug-in
 Group:          Applications/Multimedia
@@ -421,14 +436,6 @@
 %doc HACKING README.i18n
 %doc %{_datadir}/gtk-doc/*
 
-%{_bindir}/gimptool-%{interfacever}
-%{_mandir}/man1/gimptool-%{interfacever}.1*
-
-%if %{with convenience}
-%{_bindir}/gimptool
-%{_mandir}/man1/gimptool.1*
-%endif
-
 %{_libdir}/*.so
 %dir %{_libdir}/gimp
 %dir %{_libdir}/gimp/%{interfacever}
@@ -441,11 +448,27 @@
 %{_includedir}/gimp-%{interfacever}
 %{_libdir}/pkgconfig/*
 
+%files devel-tools
+%defattr (-, root, root, 0755)
+%{_bindir}/gimptool-%{interfacever}
+%{_mandir}/man1/gimptool-%{interfacever}.1*
+
+%if %{with convenience}
+%{_bindir}/gimptool
+%{_mandir}/man1/gimptool.1*
+%endif
+
 %files help-browser
 %defattr (-, root, root, 0755)
 %{_libdir}/gimp/%{interfacever}/plug-ins/help-browser
 
 %changelog
+* Wed Jan 07 2009 Nils Philippsen <nils at redhat.com> - 2:2.6.4-3
+- split off gimptool into new gimp-devel-tools subpackage to avoid multilib
+  conflicts (#477789)
+- require poppler-glib-devel for building from F9 on (#478691)
+- fix gimp-devel package group
+
 * Sun Jan 04 2009 Nils Philippsen <nils at redhat.com> - 2:2.6.4-2
 - enable building with aalib
 



From xavierb at fedoraproject.org  Wed Jan  7 10:09:18 2009
From: xavierb at fedoraproject.org (Xavier Bachelot)
Date: Wed,  7 Jan 2009 10:09:18 +0000 (UTC)
Subject: rpms/xorg-x11-drv-openchrome/devel xorg-x11-drv-openchrome.spec,
	1.37, 1.38
Message-ID: <20090107100918.0A87470100@cvs1.fedora.phx.redhat.com>

Author: xavierb

Update of /cvs/pkgs/rpms/xorg-x11-drv-openchrome/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8838

Modified Files:
	xorg-x11-drv-openchrome.spec 
Log Message:
bump release


Index: xorg-x11-drv-openchrome.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-openchrome/devel/xorg-x11-drv-openchrome.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- xorg-x11-drv-openchrome.spec	7 Jan 2009 09:50:38 -0000	1.37
+++ xorg-x11-drv-openchrome.spec	7 Jan 2009 10:08:47 -0000	1.38
@@ -10,7 +10,7 @@
 Summary:	Xorg X11 openchrome video driver
 Name:		xorg-x11-drv-openchrome
 Version:	0.2.903
-Release:	5%{?dist}
+Release:	6%{?dist}
 URL:		http://www.openchrome.org
 License:	MIT
 Group:		User Interface/X Hardware Support



From kwizart at fedoraproject.org  Wed Jan  7 10:12:59 2009
From: kwizart at fedoraproject.org (Chauvet Nicolas)
Date: Wed,  7 Jan 2009 10:12:59 +0000 (UTC)
Subject: rpms/perl-AnyEvent-AIO/F-10 perl-AnyEvent-AIO.spec, NONE,
	1.1 sources, 1.1, 1.2
Message-ID: <20090107101259.E4C9170100@cvs1.fedora.phx.redhat.com>

Author: kwizart

Update of /cvs/pkgs/rpms/perl-AnyEvent-AIO/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9270

Modified Files:
	sources 
Added Files:
	perl-AnyEvent-AIO.spec 
Log Message:
Initial import for F-10



--- NEW FILE perl-AnyEvent-AIO.spec ---
Name:           perl-AnyEvent-AIO
Version:        1.0
Release:        1%{?dist}
Summary:        Truly asynchronous file and directrory I/O

Group:          Development/Libraries
License:        GPL+ or Artistic
URL:            http://search.cpan.org/dist/AnyEvent-AIO/
Source0:        http://search.cpan.org/CPAN/authors/id/M/ML/MLEHMANN/AnyEvent-AIO-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  perl(ExtUtils::MakeMaker)
BuildRequires:  perl(IO::AIO) >= 3
BuildRequires:  perl(AnyEvent)
Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
Truly asynchronous file and directrory I/O.

%prep
%setup -q -n AnyEvent-AIO-%{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 COPYING README
%{perl_vendorlib}/*
%{_mandir}/man3/*.3*


%changelog
* Fri Nov 29 2008 kwizart < kwizart at gmail.com > - 1.0-1
- Initial package.



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-AnyEvent-AIO/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	14 Dec 2008 05:17:21 -0000	1.1
+++ sources	7 Jan 2009 10:12:29 -0000	1.2
@@ -0,0 +1 @@
+90205654d87e93ca4bef5299d00677e9  AnyEvent-AIO-1.0.tar.gz



From pgordon at fedoraproject.org  Wed Jan  7 10:15:36 2009
From: pgordon at fedoraproject.org (Peter Gordon)
Date: Wed,  7 Jan 2009 10:15:36 +0000 (UTC)
Subject: rpms/gnome-applet-music/F-8 .cvsignore, 1.12,
	1.13 gnome-applet-music.spec, 1.24, 1.25 sources, 1.12, 1.13
Message-ID: <20090107101536.E33B970100@cvs1.fedora.phx.redhat.com>

Author: pgordon

Update of /cvs/pkgs/rpms/gnome-applet-music/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9643/F-8

Modified Files:
	.cvsignore gnome-applet-music.spec sources 
Log Message:
Update to 2.5.0 - lots of nice bugfixes and enhancments. (This is quite probably the final F8 update of this package.)


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-applet-music/F-8/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	23 Aug 2008 04:12:09 -0000	1.12
+++ .cvsignore	7 Jan 2009 10:15:06 -0000	1.13
@@ -1 +1 @@
-music-applet-2.4.2.tar.gz
+music-applet-2.5.0.tar.gz


Index: gnome-applet-music.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-applet-music/F-8/gnome-applet-music.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- gnome-applet-music.spec	23 Aug 2008 04:12:09 -0000	1.24
+++ gnome-applet-music.spec	7 Jan 2009 10:15:06 -0000	1.25
@@ -3,7 +3,7 @@
 %global	python_module_name	musicapplet
 
 Name:		gnome-applet-music
-Version:	2.4.2
+Version:	2.5.0
 Release:	1%{?dist}
 Summary:	A GNOME panel applet to control various music players
 Summary(es):	Miniaplicaci??n del panel GNOME para controlar reproductores de m??sica
@@ -149,6 +149,14 @@
 
 
 %changelog
+* Wed Jan 07 2009 Peter Gordon <peter at thecodergeek.com> - 2.5.0-1
+- Update to new upstream release (2.5.0), which adds support for Amarok 2,
+  fixes uncontrolled growth in applet with long metadata strings (#452420),
+  improved loading of album art from Rhythmbox, fixes for the rating scale
+  change in Exaile 0.2.14 (from 8-star to 5-star), fixes improper entity
+  encodings of song titles in notification popups, and replaces the deprecated
+  mpdclient2 library with python-mpd in the MPD plugin.  
+
 * Fri Aug 22 2008 Peter Gordon <peter at thecodergeek.com> - 2.4.2-1
 - update to new upstream bug-fix release, which fixed gradual increase in CPU
   on each song change, MPD password handling, and contains an updated Polish


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-applet-music/F-8/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	23 Aug 2008 04:12:09 -0000	1.12
+++ sources	7 Jan 2009 10:15:06 -0000	1.13
@@ -1 +1 @@
-89944849b131a7f0adf7c67932986f33  music-applet-2.4.2.tar.gz
+01c85378fbbacea334fa009f94243f78  music-applet-2.5.0.tar.gz



From caolanm at fedoraproject.org  Wed Jan  7 10:22:43 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Wed,  7 Jan 2009 10:22:43 +0000 (UTC)
Subject: rpms/openoffice.org/devel workspace.selinux01.patch, NONE,
	1.1 openoffice.org.spec, 1.1743,
	1.1744 openoffice.org-2.0.3.ooo97320.selinux.bridges.patch, 1.1, NONE
Message-ID: <20090107102243.BBC0870100@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11171

Modified Files:
	openoffice.org.spec 
Added Files:
	workspace.selinux01.patch 
Removed Files:
	openoffice.org-2.0.3.ooo97320.selinux.bridges.patch 
Log Message:
selinux stuff merged into an upstream workspace now

workspace.selinux01.patch:

--- NEW FILE workspace.selinux01.patch ---
Index: source/cpp_uno/gcc3_linux_ia64/cpp2uno.cxx
===================================================================
--- openoffice.org.orig/bridges/source/cpp_uno/gcc3_linux_ia64/cpp2uno.cxx	(revision 265903)
+++ openoffice.org/bridges/source/cpp_uno/gcc3_linux_ia64/cpp2uno.cxx	(working copy)
@@ -575,7 +575,7 @@
 {
 const int codeSnippetSize = 40;
 
-bridges::cpp_uno::shared::VtableFactory::Slot codeSnippet( unsigned char * code, sal_Int32 nFunctionIndex, sal_Int32 nVtableOffset, 
+bridges::cpp_uno::shared::VtableFactory::Slot codeSnippet( unsigned char * code, sal_PtrDiff writetoexecdiff, sal_Int32 nFunctionIndex, sal_Int32 nVtableOffset, 
                               bool bHasHiddenParam )
 {
 #ifdef CMC_DEBUG
@@ -598,7 +598,7 @@
     raw[2] = nOffsetAndIndex;
     raw[3] = destination->gp_value;
 
-    return *(bridges::cpp_uno::shared::VtableFactory::Slot*)(code);
+    return *(bridges::cpp_uno::shared::VtableFactory::Slot*)(code+writetoexecdiff);
 }
 }
 
@@ -628,7 +628,7 @@
 }
 
 unsigned char * bridges::cpp_uno::shared::VtableFactory::addLocalFunctions(
-    Slot ** in_slots, unsigned char * code,
+    Slot ** in_slots, unsigned char * code, sal_PtrDiff writetoexecdiff,
     typelib_InterfaceTypeDescription const * type, sal_Int32 functionOffset,
     sal_Int32 functionCount, sal_Int32 vtableOffset)
 {
@@ -647,7 +647,7 @@
         case typelib_TypeClass_INTERFACE_ATTRIBUTE:
             // Getter:
             *slots++ = codeSnippet(
-                code, functionOffset++, vtableOffset,
+                code, writetoexecdiff, functionOffset++, vtableOffset,
                 ia64::return_in_hidden_param(
                     reinterpret_cast<
                     typelib_InterfaceAttributeTypeDescription * >(
@@ -660,14 +660,14 @@
                 typelib_InterfaceAttributeTypeDescription * >(
                     member)->bReadOnly)
             {
-                *slots++ = codeSnippet(code, functionOffset++, vtableOffset, false);
+                *slots++ = codeSnippet(code, writetoexecdiff, functionOffset++, vtableOffset, false);
             	code += codeSnippetSize;
             }
             break;
 
         case typelib_TypeClass_INTERFACE_METHOD:
             *slots++ = codeSnippet(
-                code, functionOffset++, vtableOffset,
+                code, writetoexecdiff, functionOffset++, vtableOffset,
                 ia64::return_in_hidden_param(
                     reinterpret_cast<
                     typelib_InterfaceMethodTypeDescription * >(
Index: source/cpp_uno/gcc3_linux_mips/cpp2uno.cxx
===================================================================
--- openoffice.org.orig/bridges/source/cpp_uno/gcc3_linux_mips/cpp2uno.cxx	(revision 265903)
+++ openoffice.org/bridges/source/cpp_uno/gcc3_linux_mips/cpp2uno.cxx	(working copy)
@@ -747,7 +747,7 @@
 }
 
 unsigned char * bridges::cpp_uno::shared::VtableFactory::addLocalFunctions(
-	Slot ** slots, unsigned char * code,
+	Slot ** slots, unsigned char * code, sal_PtrDiff writetoexecdiff,
 	typelib_InterfaceTypeDescription const * type, sal_Int32 functionOffset,
 	sal_Int32 functionCount, sal_Int32 vtableOffset)
 {
@@ -767,7 +767,7 @@
 	switch (member->eTypeClass) {
 	  case typelib_TypeClass_INTERFACE_ATTRIBUTE:
 		// Getter:
-		(s++)->fn = code;
+		(s++)->fn = code + writetoexecdiff;
 		code = codeSnippet(
 			code, functionOffset++, vtableOffset,
 			bridges::cpp_uno::shared::isSimpleType(
@@ -780,13 +780,13 @@
 			typelib_InterfaceAttributeTypeDescription * >(
 			  member)->bReadOnly)
 		{
-		  (s++)->fn = code;
+		  (s++)->fn = code + writetoexecdiff;
 		  code = codeSnippet(code, functionOffset++, vtableOffset, true);
 		}
 		break;
 
 	  case typelib_TypeClass_INTERFACE_METHOD:
-		(s++)->fn = code;
+		(s++)->fn = code + writetoexecdiff;
 		code = codeSnippet(
 			code, functionOffset++, vtableOffset,
 			bridges::cpp_uno::shared::isSimpleType(
Index: source/cpp_uno/gcc3_linux_sparc/cpp2uno.cxx
===================================================================
--- openoffice.org.orig/bridges/source/cpp_uno/gcc3_linux_sparc/cpp2uno.cxx	(revision 265903)
+++ openoffice.org/bridges/source/cpp_uno/gcc3_linux_sparc/cpp2uno.cxx	(working copy)
@@ -513,7 +513,7 @@
 }
 
 unsigned char * bridges::cpp_uno::shared::VtableFactory::addLocalFunctions(
-    Slot ** slots, unsigned char * code,
+    Slot ** slots, unsigned char * code, sal_PtrDiff writetoexecdiff,
     typelib_InterfaceTypeDescription const * type, sal_Int32 functionOffset,
     sal_Int32 functionCount, sal_Int32 vTableOffset)
 {
@@ -526,7 +526,7 @@
         switch (member->eTypeClass) {
         case typelib_TypeClass_INTERFACE_ATTRIBUTE:
             // Getter:
-            (s++)->fn = code;
+            (s++)->fn = code + writetoexecdiff;
             code = codeSnippet(
                 code, functionOffset++, vTableOffset,
                 bridges::cpp_uno::shared::isSimpleType(
@@ -538,13 +538,13 @@
                 typelib_InterfaceAttributeTypeDescription * >(
                     member)->bReadOnly)
             {
-                (s++)->fn = code;
+                (s++)->fn = code + writetoexecdiff;
                 code = codeSnippet(code, functionOffset++, vTableOffset, true);
             }
             break;
 
         case typelib_TypeClass_INTERFACE_METHOD:
-            (s++)->fn = code;
+            (s++)->fn = code + writetoexecdiff;
             code = codeSnippet(
                 code, functionOffset++, vTableOffset,
                 bridges::cpp_uno::shared::isSimpleType(
Index: source/cpp_uno/gcc3_linux_intel/cpp2uno.cxx
===================================================================
--- openoffice.org.orig/bridges/source/cpp_uno/gcc3_linux_intel/cpp2uno.cxx	(revision 265903)
+++ openoffice.org/bridges/source/cpp_uno/gcc3_linux_intel/cpp2uno.cxx	(working copy)
@@ -362,7 +362,7 @@
 int const codeSnippetSize = 16;
 
 unsigned char * codeSnippet(
-    unsigned char * code, sal_Int32 functionIndex, sal_Int32 vtableOffset,
+    unsigned char * code, sal_PtrDiff writetoexecdiff, sal_Int32 functionIndex, sal_Int32 vtableOffset,
     typelib_TypeClass returnTypeClass)
 {
     if (!bridges::cpp_uno::shared::isSimpleType(returnTypeClass)) {
@@ -408,7 +408,7 @@
     // jmp privateSnippetExecutor:
     *p++ = 0xE9;
     *reinterpret_cast< sal_Int32 * >(p)
-        = ((unsigned char *) exec) - p - sizeof (sal_Int32);
+        = ((unsigned char *) exec) - p - sizeof (sal_Int32) - writetoexecdiff;
     p += sizeof (sal_Int32);
     OSL_ASSERT(p - code <= codeSnippetSize);
     return code + codeSnippetSize;
@@ -440,7 +440,7 @@
 }
 
 unsigned char * bridges::cpp_uno::shared::VtableFactory::addLocalFunctions(
-    Slot ** slots, unsigned char * code,
+    Slot ** slots, unsigned char * code, sal_PtrDiff writetoexecdiff,
     typelib_InterfaceTypeDescription const * type, sal_Int32 functionOffset,
     sal_Int32 functionCount, sal_Int32 vtableOffset)
 {
@@ -453,9 +453,9 @@
         switch (member->eTypeClass) {
         case typelib_TypeClass_INTERFACE_ATTRIBUTE:
             // Getter:
-            (s++)->fn = code;
+            (s++)->fn = code + writetoexecdiff;
             code = codeSnippet(
-                code, functionOffset++, vtableOffset,
+                code, writetoexecdiff, functionOffset++, vtableOffset,
                 reinterpret_cast< typelib_InterfaceAttributeTypeDescription * >(
                     member)->pAttributeTypeRef->eTypeClass);
             // Setter:
@@ -463,17 +463,17 @@
                 typelib_InterfaceAttributeTypeDescription * >(
                     member)->bReadOnly)
             {
-                (s++)->fn = code;
+                (s++)->fn = code + writetoexecdiff;
                 code = codeSnippet(
-                    code, functionOffset++, vtableOffset,
+                    code, writetoexecdiff, functionOffset++, vtableOffset,
                     typelib_TypeClass_VOID);
             }
             break;
 
         case typelib_TypeClass_INTERFACE_METHOD:
-            (s++)->fn = code;
+            (s++)->fn = code + writetoexecdiff;
             code = codeSnippet(
-                code, functionOffset++, vtableOffset,
+                code, writetoexecdiff, functionOffset++, vtableOffset,
                 reinterpret_cast< typelib_InterfaceMethodTypeDescription * >(
                     member)->pReturnTypeRef->eTypeClass);
             break;
Index: source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx
===================================================================
--- openoffice.org.orig/bridges/source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx	(revision 265903)
+++ openoffice.org/bridges/source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx	(working copy)
@@ -489,7 +489,7 @@
 //==================================================================================================
 
 unsigned char * bridges::cpp_uno::shared::VtableFactory::addLocalFunctions(
-	Slot ** slots, unsigned char * code,
+	Slot ** slots, unsigned char * code, sal_PtrDiff writetoexecdiff,
 	typelib_InterfaceTypeDescription const * type, sal_Int32 nFunctionOffset,
 	sal_Int32 functionCount, sal_Int32 nVtableOffset )
 {
@@ -508,14 +508,14 @@
 				reinterpret_cast<typelib_InterfaceAttributeTypeDescription *>( pTD );
 
 			// get method
-			(s++)->fn = code;
+			(s++)->fn = code + writetoexecdiff;
 			code = codeSnippet( code, nFunctionOffset++, nVtableOffset,
 								x86_64::return_in_hidden_param( pAttrTD->pAttributeTypeRef ) );
 
 			if ( ! pAttrTD->bReadOnly )
 			{
 				// set method
-				(s++)->fn = code;
+				(s++)->fn = code + writetoexecdiff;
 				code = codeSnippet( code, nFunctionOffset++, nVtableOffset, false );
 			}
 		}
@@ -524,7 +524,7 @@
 			typelib_InterfaceMethodTypeDescription *pMethodTD =
 				reinterpret_cast<typelib_InterfaceMethodTypeDescription *>( pTD );
 			
-			(s++)->fn = code;
+			(s++)->fn = code + writetoexecdiff;
 			code = codeSnippet( code, nFunctionOffset++, nVtableOffset,
 								x86_64::return_in_hidden_param( pMethodTD->pReturnTypeRef ) );
 		}
Index: source/cpp_uno/gcc3_linux_arm/cpp2uno.cxx
===================================================================
--- openoffice.org.orig/bridges/source/cpp_uno/gcc3_linux_arm/cpp2uno.cxx	(revision 265903)
+++ openoffice.org/bridges/source/cpp_uno/gcc3_linux_arm/cpp2uno.cxx	(working copy)
@@ -467,7 +467,7 @@
 }
 
 unsigned char * bridges::cpp_uno::shared::VtableFactory::addLocalFunctions(
-    Slot ** slots, unsigned char * code,
+    Slot ** slots, unsigned char * code, sal_PtrDiff writetoexecdiff,
     typelib_InterfaceTypeDescription const * type, sal_Int32 functionOffset,
     sal_Int32 functionCount, sal_Int32 vtableOffset)
 {
@@ -482,7 +482,7 @@
         {
             case typelib_TypeClass_INTERFACE_ATTRIBUTE:
                 // Getter:
-                (s++)->fn = code;
+                (s++)->fn = code + writetoexecdiff;
                 code = codeSnippet(
                     code, functionOffset++, vtableOffset,
                     bridges::cpp_uno::shared::isSimpleType(
@@ -494,14 +494,14 @@
                     typelib_InterfaceAttributeTypeDescription * >(
                         member)->bReadOnly)
                 {
-                    (s++)->fn = code;
+                    (s++)->fn = code + writetoexecdiff;
                     code = codeSnippet(
                         code, functionOffset++, vtableOffset, true);
                 }
                 break;
             case typelib_TypeClass_INTERFACE_METHOD:
             {
-                (s++)->fn = code;
+                (s++)->fn = code + writetoexecdiff;
 
                 typelib_InterfaceMethodTypeDescription *pMethodTD = 
                     reinterpret_cast<
Index: source/cpp_uno/gcc3_linux_powerpc/cpp2uno.cxx
===================================================================
--- openoffice.org.orig/bridges/source/cpp_uno/gcc3_linux_powerpc/cpp2uno.cxx	(revision 265903)
+++ openoffice.org/bridges/source/cpp_uno/gcc3_linux_powerpc/cpp2uno.cxx	(working copy)
@@ -681,7 +681,7 @@
 }
 
 unsigned char * bridges::cpp_uno::shared::VtableFactory::addLocalFunctions(
-    Slot ** slots, unsigned char * code,
+    Slot ** slots, unsigned char * code, sal_PtrDiff writetoexecdiff,
     typelib_InterfaceTypeDescription const * type, sal_Int32 functionOffset,
     sal_Int32 functionCount, sal_Int32 vtableOffset)
 {
@@ -698,7 +698,7 @@
         switch (member->eTypeClass) {
         case typelib_TypeClass_INTERFACE_ATTRIBUTE:
             // Getter:
-            (s++)->fn = code;
+            (s++)->fn = code + writetoexecdiff;
             code = codeSnippet(
                 code, functionOffset++, vtableOffset,
                 bridges::cpp_uno::shared::isSimpleType(
@@ -711,13 +711,13 @@
                 typelib_InterfaceAttributeTypeDescription * >(
                     member)->bReadOnly)
             {
-                (s++)->fn = code;
+                (s++)->fn = code + writetoexecdiff;
                 code = codeSnippet(code, functionOffset++, vtableOffset, true);
             }
             break;
 
         case typelib_TypeClass_INTERFACE_METHOD:
-            (s++)->fn = code;
+            (s++)->fn = code + writetoexecdiff;
             code = codeSnippet(
                 code, functionOffset++, vtableOffset,
                 bridges::cpp_uno::shared::isSimpleType(
Index: source/cpp_uno/gcc3_linux_m68k/cpp2uno.cxx
===================================================================
--- openoffice.org.orig/bridges/source/cpp_uno/gcc3_linux_m68k/cpp2uno.cxx	(revision 265903)
+++ openoffice.org/bridges/source/cpp_uno/gcc3_linux_m68k/cpp2uno.cxx	(working copy)
@@ -482,7 +482,7 @@
 }
 
 unsigned char * bridges::cpp_uno::shared::VtableFactory::addLocalFunctions(
-    Slot ** slots, unsigned char * code,
+    Slot ** slots, unsigned char * code, sal_PtrDiff writetoexecdiff,
     typelib_InterfaceTypeDescription const * type, sal_Int32 functionOffset,
     sal_Int32 functionCount, sal_Int32 vtableOffset)
 {
@@ -497,20 +497,20 @@
         {
             case typelib_TypeClass_INTERFACE_ATTRIBUTE:
                 // Getter:
-                (s++)->fn = code;
+                (s++)->fn = code + writetoexecdiff;
                 code = codeSnippet(code, functionOffset++, vtableOffset);
                 // Setter:
                 if (!reinterpret_cast<
                     typelib_InterfaceAttributeTypeDescription * >(
                         member)->bReadOnly)
                 {
-                    (s++)->fn = code;
+                    (s++)->fn = code + writetoexecdiff;
                     code = codeSnippet(code, functionOffset++, vtableOffset);
                 }
                 break;
             case typelib_TypeClass_INTERFACE_METHOD:
             {
-                (s++)->fn = code;
+                (s++)->fn = code + writetoexecdiff;
 
                 typelib_InterfaceMethodTypeDescription *pMethodTD = 
                     reinterpret_cast<
Index: source/cpp_uno/gcc3_linux_s390x/cpp2uno.cxx
===================================================================
--- openoffice.org.orig/bridges/source/cpp_uno/gcc3_linux_s390x/cpp2uno.cxx	(revision 265903)
+++ openoffice.org/bridges/source/cpp_uno/gcc3_linux_s390x/cpp2uno.cxx	(working copy)
@@ -597,7 +597,7 @@
 }
 
 unsigned char * bridges::cpp_uno::shared::VtableFactory::addLocalFunctions(
-    Slot ** slots, unsigned char * code, 
+    Slot ** slots, unsigned char * code, sal_PtrDiff writetoexecdiff,
     typelib_InterfaceTypeDescription const * type, sal_Int32 functionOffset,
     sal_Int32 functionCount, sal_Int32 vtableOffset)
 {
@@ -615,7 +615,7 @@
         switch (member->eTypeClass) {
         case typelib_TypeClass_INTERFACE_ATTRIBUTE:
             // Getter:
-            (s++)->fn = code;
+            (s++)->fn = code + writetoexecdiff;
             code = codeSnippet(
                 code, functionOffset++, vtableOffset,
                 bridges::cpp_uno::shared::isSimpleType(
@@ -628,13 +628,13 @@
                 typelib_InterfaceAttributeTypeDescription * >(
                     member)->bReadOnly)
             {
-                (s++)->fn = code;
+                (s++)->fn = code + writetoexecdiff;
                 code = codeSnippet(code, functionOffset++, vtableOffset, true);
             }
             break;
 
         case typelib_TypeClass_INTERFACE_METHOD:
-            (s++)->fn = code;
+            (s++)->fn = code + writetoexecdiff;
             code = codeSnippet(
                 code, functionOffset++, vtableOffset,
                 bridges::cpp_uno::shared::isSimpleType(
Index: source/cpp_uno/shared/vtablefactory.cxx
===================================================================
--- openoffice.org.orig/bridges/source/cpp_uno/shared/vtablefactory.cxx	(revision 265903)
+++ openoffice.org/bridges/source/cpp_uno/shared/vtablefactory.cxx	(working copy)
@@ -42,6 +42,9 @@
 
 #include "bridges/cpp_uno/shared/vtables.hxx"
 
+#include "osl/thread.h"
+#include "osl/security.hxx"
+#include "osl/file.hxx"
 #include "osl/diagnose.h"
 #include "osl/mutex.hxx"
 #include "rtl/alloc.h"
@@ -55,6 +58,7 @@
 
 #if defined SAL_UNX
 #include <unistd.h>
+#include <string.h>
 #include <sys/mman.h>
 #elif defined SAL_W32
 #define WIN32_LEAN_AND_MEAN
@@ -243,9 +247,92 @@
     return i->second;
 }
 
+#ifdef USE_DOUBLE_MMAP
+bool VtableFactory::createBlock(Block &block, sal_Int32 slotCount) const
+{
+    sal_Size size = getBlockSize(slotCount);
+    sal_Size pagesize = sysconf(_SC_PAGESIZE);
+    block.size = (size + (pagesize - 1)) & ~(pagesize - 1);
+    block.start = block.exec = NULL;
+    block.fd = -1;
+
+    osl::Security aSecurity;
+    rtl::OUString strDirectory;
+    rtl::OUString strURLDirectory;
+    if (aSecurity.getHomeDir(strURLDirectory))
+        osl::File::getSystemPathFromFileURL(strURLDirectory, strDirectory);
+
+    for (int i = strDirectory.getLength() == 0 ? 1 : 0; i < 2; ++i)
+    {
+        if (!strDirectory.getLength())
+            strDirectory = rtl::OUString::createFromAscii("/tmp");
+
+        strDirectory += rtl::OUString::createFromAscii("/.execoooXXXXXX");
+        rtl::OString aTmpName = rtl::OUStringToOString(strDirectory, osl_getThreadTextEncoding());
+        char *tmpfname = new char[aTmpName.getLength()+1];
+        strncpy(tmpfname, aTmpName.getStr(), aTmpName.getLength()+1);
+        if ((block.fd = mkstemp(tmpfname)) == -1)
+          perror("creation of executable memory area failed");
+        if (block.fd == -1)
+        {
+            delete[] tmpfname;
+            break;
+        }
+        unlink(tmpfname);
+        delete[] tmpfname;
+        ftruncate(block.fd, block.size);
+        block.start = mmap(NULL, block.size, PROT_READ | PROT_WRITE, MAP_SHARED, block.fd, 0);
+        if (block.start== MAP_FAILED) {
+            block.start = 0;
+        }
+        block.exec = mmap(NULL, block.size, PROT_READ | PROT_EXEC, MAP_SHARED, block.fd, 0);
+        if (block.exec == MAP_FAILED) {
+           block.exec = 0;
+        }
+
+        //All good
+        if (block.start && block.exec && block.fd != -1)
+            break;
+
+        freeBlock(block);
+
+        strDirectory = rtl::OUString();
+    }
+    if (!block.start || !block.exec || block.fd == -1)
+    {
+       fprintf(stderr, "Could not mmap a file for executable memory either in home dir or in /tmp\n");
+       fprintf(stderr, "Falling back to mmapping anonymous memory, this may cause a fatal error on\n");
+       fprintf(stderr, "systems where e.g. SELinux is enabled\n");
+       //Fall back to non-doublemmaped allocation
+       block.fd = -1;
+       block.start = block.exec = rtl_arena_alloc(m_arena, &block.size);
+    }
+    return (block.start != 0 && block.exec != 0);
+}
+
 void VtableFactory::freeBlock(Block const & block) const {
+    //if the double-map failed we were allocated on the arena
+    if (block.fd == -1 && block.start == block.exec && block.start != NULL)
+        rtl_arena_free(m_arena, block.start, block.size);
+    else
+    {
+        if (block.start) munmap(block.start, block.size);
+        if (block.exec) munmap(block.exec, block.size);
+        if (block.fd != -1) close(block.fd);
+    }
+}
+#else
+bool VtableFactory::createBlock(Block &block, sal_Int32 slotCount) const
+{
+    block.size = getBlockSize(slotCount);
+    block.start = rtl_arena_alloc(m_arena, &block.size);
+    return block.start != 0;
+}
+
+void VtableFactory::freeBlock(Block const & block) const {
     rtl_arena_free(m_arena, block.start, block.size);
 }
+#endif
 
 void VtableFactory::createVtables(
     GuardedBlocks & blocks, BaseOffset const & baseOffset,
@@ -255,9 +342,7 @@
         sal_Int32 slotCount
             = bridges::cpp_uno::shared::getPrimaryFunctions(type);
         Block block;
-        block.size = getBlockSize(slotCount);
-        block.start = rtl_arena_alloc(m_arena, &block.size);
-        if (block.start == 0) {
+        if (!createBlock(block, slotCount)) {
             throw std::bad_alloc();
         }
         try {
@@ -270,12 +355,21 @@
                  type2 != 0; type2 = type2->pBaseTypeDescription)
             {
                 code = addLocalFunctions(
-                    &slots, code, type2,
+                    &slots, code,
+#ifdef USE_DOUBLE_MMAP
+                    sal_IntPtr(block.exec) - sal_IntPtr(block.start),
+#endif
+                    type2,
                     baseOffset.getFunctionOffset(type2->aBase.pTypeName),
                     bridges::cpp_uno::shared::getLocalFunctions(type2),
                     vtableOffset);
             }
             flushCode(codeBegin, code);
+#ifdef USE_DOUBLE_MMAP
+	    //Finished generating block, swap writable pointer with executable
+	    //pointer
+            ::std::swap(block.start, block.exec);
+#endif
             blocks.push_back(block);
         } catch (...) {
             freeBlock(block);
Index: source/cpp_uno/gcc3_linux_powerpc64/cpp2uno.cxx
===================================================================
--- openoffice.org.orig/bridges/source/cpp_uno/gcc3_linux_powerpc64/cpp2uno.cxx	(revision 265903)
+++ openoffice.org/bridges/source/cpp_uno/gcc3_linux_powerpc64/cpp2uno.cxx	(working copy)
@@ -667,7 +667,7 @@
 }
 
 unsigned char * bridges::cpp_uno::shared::VtableFactory::addLocalFunctions(
-    Slot ** slots, unsigned char * code, 
+    Slot ** slots, unsigned char * code, sal_PtrDiff writetoexecdiff,
     typelib_InterfaceTypeDescription const * type, sal_Int32 functionOffset,
     sal_Int32 functionCount, sal_Int32 vtableOffset)
 {
@@ -685,7 +685,7 @@
         switch (member->eTypeClass) {
         case typelib_TypeClass_INTERFACE_ATTRIBUTE:
             // Getter:
-            (s++)->fn = code;
+            (s++)->fn = code + writetoexecdiff;
             code = codeSnippet(
                 code, functionOffset++, vtableOffset,
                 bridges::cpp_uno::shared::isSimpleType(
@@ -698,13 +698,13 @@
                 typelib_InterfaceAttributeTypeDescription * >(
                     member)->bReadOnly)
             {
-                (s++)->fn = code;
+                (s++)->fn = code + writetoexecdiff;
                 code = codeSnippet(code, functionOffset++, vtableOffset, true);
             }
             break;
 
         case typelib_TypeClass_INTERFACE_METHOD:
-            (s++)->fn = code;
+            (s++)->fn = code + writetoexecdiff;
             code = codeSnippet(
                 code, functionOffset++, vtableOffset,
                 bridges::cpp_uno::shared::isSimpleType(
Index: source/cpp_uno/gcc3_linux_s390/cpp2uno.cxx
===================================================================
--- openoffice.org.orig/bridges/source/cpp_uno/gcc3_linux_s390/cpp2uno.cxx	(revision 265903)
+++ openoffice.org/bridges/source/cpp_uno/gcc3_linux_s390/cpp2uno.cxx	(working copy)
@@ -640,7 +640,7 @@
 }
 
 unsigned char * bridges::cpp_uno::shared::VtableFactory::addLocalFunctions(
-    Slot ** slots, unsigned char * code,
+    Slot ** slots, unsigned char * code, sal_PtrDiff writetoexecdiff,
     typelib_InterfaceTypeDescription const * type, sal_Int32 functionOffset,
     sal_Int32 functionCount, sal_Int32 vtableOffset)
 {
@@ -658,7 +658,7 @@
         switch (member->eTypeClass) {
         case typelib_TypeClass_INTERFACE_ATTRIBUTE:
             // Getter:
-            (s++)->fn = code;
+            (s++)->fn = code + writetoexecdiff;
             code = codeSnippet(
                 code, functionOffset++, vtableOffset,
                 bridges::cpp_uno::shared::isSimpleType(
@@ -671,13 +671,13 @@
                 typelib_InterfaceAttributeTypeDescription * >(
                     member)->bReadOnly)
             {
-                (s++)->fn = code;
+                (s++)->fn = code + writetoexecdiff;
                 code = codeSnippet(code, functionOffset++, vtableOffset, true);
             }
             break;
 
         case typelib_TypeClass_INTERFACE_METHOD:
-            (s++)->fn = code;
+            (s++)->fn = code + writetoexecdiff;
             code = codeSnippet(
                 code, functionOffset++, vtableOffset,
                 bridges::cpp_uno::shared::isSimpleType(
Index: inc/bridges/cpp_uno/shared/vtablefactory.hxx
===================================================================
--- openoffice.org.orig/bridges/inc/bridges/cpp_uno/shared/vtablefactory.hxx	(revision 265903)
+++ openoffice.org/bridges/inc/bridges/cpp_uno/shared/vtablefactory.hxx	(working copy)
@@ -39,6 +39,11 @@
 
 #include <hash_map>
 
+/*See: http://people.redhat.com/drepper/selinux-mem.html*/
+#ifdef LINUX
+#define USE_DOUBLE_MMAP
+#endif
+
 namespace bridges { namespace cpp_uno { namespace shared {
 
 /** Hand out vtable structures for interface type descriptions.
@@ -63,6 +68,18 @@
          */
         void * start;
 
+#ifdef USE_DOUBLE_MMAP
+	/** When seperately mmapping the block for writing and executing
+            exec points to the same memory as start, except start is used
+            exclusively for writing and exec for executing
+         */
+        void * exec;
+
+	/** File handle for the underlying anonymous file
+         */
+        int fd;
+#endif
+
         /** The size of the raw vtable block, in bytes.
          */
         sal_Size size;
@@ -111,6 +128,8 @@
     VtableFactory(VtableFactory &); // not implemented
     void operator =(VtableFactory); // not implemented
 
+    bool createBlock(Block &block, sal_Int32 slotCount) const;
+
     void freeBlock(Block const & block) const;
 
     void createVtables(
@@ -151,6 +170,9 @@
         given type
         @param code  points to the start of the area where code snippets can be
         generated
+        @param writetoexecdiff when the same code area is mmaped twice, once for
+        writing for code-generation, and once for code-execution, then this
+        records the offset from a writable address to its executable address
         @param type  the interface type description for which to generate vtable
         slots
         @param functionOffset  the function offset of the first vtable slot
@@ -165,6 +187,9 @@
      */
     static unsigned char * addLocalFunctions(
         Slot ** slots, unsigned char * code,
+#ifdef USE_DOUBLE_MMAP
+        sal_PtrDiff writetoexecdiff,
+#endif
         typelib_InterfaceTypeDescription const * type, sal_Int32 functionOffset,
         sal_Int32 functionCount, sal_Int32 vtableOffset);
 


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1743
retrieving revision 1.1744
diff -u -r1.1743 -r1.1744
--- openoffice.org.spec	7 Jan 2009 09:06:58 -0000	1.1743
+++ openoffice.org.spec	7 Jan 2009 10:22:13 -0000	1.1744
@@ -88,7 +88,7 @@
 Patch15: openoffice.org-2.2.0.ooo68717.gstreamer.video.patch
 Patch16: openoffice.org-2.2.0.ooo63159.sal.dtype.patch
 Patch17: openoffice.org-2.2.0.ooo76393.sal.dynamicsection.patch
-Patch18: openoffice.org-2.0.3.ooo97320.selinux.bridges.patch
+Patch18: workspace.selinux01.patch
 Patch19: openoffice.org-2.2.1.ooo7065.sw.titlepagedialog.patch
 Patch20: workspace.impressfontsize.patch
 Patch21: workspace.impressfontsize.tar.gz
@@ -1368,7 +1368,7 @@
 %patch15 -p0 -b .ooo68717.gstreamer.video.patch
 %patch16 -p1 -b .ooo63159.sal.dtype.patch
 %patch17 -p1 -b .ooo76393.sal.dynamicsection.patch
-%patch18 -p1 -b .ooo97320.selinux.bridges.patch
+%patch18 -p1 -b .workspace.selinux01.patch
 %patch19 -p1 -b .ooo7065.sw.titlepagedialog.patch
 %patch20 -p1 -b .workspace.impressfontsize.patch
 tar xzf %{PATCH21}


--- openoffice.org-2.0.3.ooo97320.selinux.bridges.patch DELETED ---



From kwizart at fedoraproject.org  Wed Jan  7 10:32:15 2009
From: kwizart at fedoraproject.org (Chauvet Nicolas)
Date: Wed,  7 Jan 2009 10:32:15 +0000 (UTC)
Subject: rpms/perl-AnyEvent-AIO/F-9 perl-AnyEvent-AIO.spec, NONE, 1.1 sources,
	1.1, 1.2
Message-ID: <20090107103215.23D5770100@cvs1.fedora.phx.redhat.com>

Author: kwizart

Update of /cvs/pkgs/rpms/perl-AnyEvent-AIO/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12053

Modified Files:
	sources 
Added Files:
	perl-AnyEvent-AIO.spec 
Log Message:
Initial import for F-9



--- NEW FILE perl-AnyEvent-AIO.spec ---
Name:           perl-AnyEvent-AIO
Version:        1.0
Release:        1%{?dist}
Summary:        Truly asynchronous file and directrory I/O

Group:          Development/Libraries
License:        GPL+ or Artistic
URL:            http://search.cpan.org/dist/AnyEvent-AIO/
Source0:        http://search.cpan.org/CPAN/authors/id/M/ML/MLEHMANN/AnyEvent-AIO-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  perl(ExtUtils::MakeMaker)
BuildRequires:  perl(IO::AIO) >= 3
BuildRequires:  perl(AnyEvent)
Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
Truly asynchronous file and directrory I/O.

%prep
%setup -q -n AnyEvent-AIO-%{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 COPYING README
%{perl_vendorlib}/*
%{_mandir}/man3/*.3*


%changelog
* Fri Nov 29 2008 kwizart < kwizart at gmail.com > - 1.0-1
- Initial package.



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-AnyEvent-AIO/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	14 Dec 2008 05:17:21 -0000	1.1
+++ sources	7 Jan 2009 10:31:44 -0000	1.2
@@ -0,0 +1 @@
+90205654d87e93ca4bef5299d00677e9  AnyEvent-AIO-1.0.tar.gz



From than at fedoraproject.org  Wed Jan  7 10:36:05 2009
From: than at fedoraproject.org (Than Ngo)
Date: Wed,  7 Jan 2009 10:36:05 +0000 (UTC)
Subject: rpms/kdeaccessibility/F-10 .cvsignore, 1.32,
	1.33 kdeaccessibility.spec, 1.61, 1.62 sources, 1.34, 1.35
Message-ID: <20090107103605.0822770100@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdeaccessibility/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12533

Modified Files:
	.cvsignore kdeaccessibility.spec sources 
Log Message:
4.1.4



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdeaccessibility/F-10/.cvsignore,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- .cvsignore	27 Sep 2008 01:57:23 -0000	1.32
+++ .cvsignore	7 Jan 2009 10:35:34 -0000	1.33
@@ -1 +1,2 @@
 kdeaccessibility-4.1.2.tar.bz2
+kdeaccessibility-4.1.4.tar.bz2


Index: kdeaccessibility.spec
===================================================================
RCS file: /cvs/extras/rpms/kdeaccessibility/F-10/kdeaccessibility.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- kdeaccessibility.spec	11 Nov 2008 22:47:15 -0000	1.61
+++ kdeaccessibility.spec	7 Jan 2009 10:35:34 -0000	1.62
@@ -1,7 +1,7 @@
 Summary:        K Desktop Environment - Accessibility
 Name:           kdeaccessibility
 Epoch:          1
-Version:        4.1.3
+Version:        4.1.4
 Release:        1%{?dist}
 
 Group:          User Interface/Desktops
@@ -98,6 +98,9 @@
 
 
 %changelog
+* Wed Jan 07 2009 Than Ngo <than at redhat.com> - 4.1.4-1
+- 4.1.4
+
 * Tue Nov 11 2008 Than Ngo <than at redhat.com> 4.1.3-1
 - KDE 4.1.3
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdeaccessibility/F-10/sources,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- sources	11 Nov 2008 22:47:15 -0000	1.34
+++ sources	7 Jan 2009 10:35:34 -0000	1.35
@@ -1 +1 @@
-85011b7ec7c8591f492f4dbf444408b3  kdeaccessibility-4.1.3.tar.bz2
+da6c157741d73eb1445cd60d9b78cd2e  kdeaccessibility-4.1.4.tar.bz2



From bojan at fedoraproject.org  Wed Jan  7 10:39:16 2009
From: bojan at fedoraproject.org (Bojan Smojver)
Date: Wed,  7 Jan 2009 10:39:16 +0000 (UTC)
Subject: rpms/libapreq2/devel libapreq2.spec,1.43,1.44
Message-ID: <20090107103916.C862070100@cvs1.fedora.phx.redhat.com>

Author: bojan

Update of /cvs/pkgs/rpms/libapreq2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13027

Modified Files:
	libapreq2.spec 
Log Message:
Better fix for apreq2-config.


Index: libapreq2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libapreq2/devel/libapreq2.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- libapreq2.spec	7 Jan 2009 08:39:04 -0000	1.43
+++ libapreq2.spec	7 Jan 2009 10:38:46 -0000	1.44
@@ -2,7 +2,7 @@
 
 Name:           libapreq2
 Version:        2.10
-Release:        0.rc1.2%{?dist}
+Release:        0.rc1.3%{?dist}
 Summary:        Apache HTTP request library
 
 Group:          System Environment/Libraries
@@ -105,14 +105,11 @@
 make %{?_smp_mflags}
 
 # Fix multilib
-sed -i -e 's,^libdir=.*,libdir=`pkg-config --variable=libdir %{name}`,' \
-       -e 's,^LDFLAGS=.*,LDFLAGS=`pkg-config --libs %{name}`,' \
-       -e 's,^LIBS=.*,LIBS=`pkg-config --libs %{name}`,' \
-       -e 's,^INCLUDES=.*,INCLUDES=`pkg-config --cflags-only-I %{name}`,' \
-        apreq2-config.in
-
-# Now build apreq2-config again
-make %{?_smp_mflags}
+sed -i -e 's,^libdir=.*,libdir="`pkg-config --variable=libdir %{name}`",' \
+       -e 's,^LDFLAGS=.*,LDFLAGS="`pkg-config --libs %{name}`",' \
+       -e 's,^LIBS=.*,LIBS="`pkg-config --libs %{name}`",' \
+       -e 's,^INCLUDES=.*,INCLUDES="`pkg-config --cflags-only-I %{name}`",' \
+        apreq2-config
 
 
 %install
@@ -173,6 +170,8 @@
 
 
 %changelog
+* Wed Jan  7 2009 Bojan Smojver <bojan at rexursive.com> - 2.10-0.rc1.3
+- better fix for apreq2-config
 
 * Wed Jan  7 2009 Bojan Smojver <bojan at rexursive.com> - 2.10-0.rc1.2
 - delay changing apreq2-config, so we don't pick up wrong libs



From bojan at fedoraproject.org  Wed Jan  7 10:39:22 2009
From: bojan at fedoraproject.org (Bojan Smojver)
Date: Wed,  7 Jan 2009 10:39:22 +0000 (UTC)
Subject: rpms/libapreq2/F-10 libapreq2.spec,1.42,1.43
Message-ID: <20090107103922.C99D370100@cvs1.fedora.phx.redhat.com>

Author: bojan

Update of /cvs/pkgs/rpms/libapreq2/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13054

Modified Files:
	libapreq2.spec 
Log Message:
Better fix for apreq2-config.


Index: libapreq2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libapreq2/F-10/libapreq2.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- libapreq2.spec	7 Jan 2009 08:42:13 -0000	1.42
+++ libapreq2.spec	7 Jan 2009 10:38:52 -0000	1.43
@@ -2,7 +2,7 @@
 
 Name:           libapreq2
 Version:        2.09
-Release:        0.19.rc2%{?dist}
+Release:        0.20.rc2%{?dist}
 Summary:        Apache HTTP request library
 
 Group:          System Environment/Libraries
@@ -111,14 +111,11 @@
 make %{?_smp_mflags}
 
 # Fix multilib
-sed -i -e 's,^libdir=.*,libdir=`pkg-config --variable=libdir %{name}`,' \
-       -e 's,^LDFLAGS=.*,LDFLAGS=`pkg-config --libs %{name}`,' \
-       -e 's,^LIBS=.*,LIBS=`pkg-config --libs %{name}`,' \
-       -e 's,^INCLUDES=.*,INCLUDES=`pkg-config --cflags-only-I %{name}`,' \
-        apreq2-config.in
-
-# Now build apreq2-config again
-make %{?_smp_mflags}
+sed -i -e 's,^libdir=.*,libdir="`pkg-config --variable=libdir %{name}`",' \
+       -e 's,^LDFLAGS=.*,LDFLAGS="`pkg-config --libs %{name}`",' \
+       -e 's,^LIBS=.*,LIBS="`pkg-config --libs %{name}`",' \
+       -e 's,^INCLUDES=.*,INCLUDES="`pkg-config --cflags-only-I %{name}`",' \
+        apreq2-config
 
 
 %install
@@ -179,6 +176,9 @@
 
 
 %changelog
+* Wed Jan  7 2009 Bojan Smojver <bojan at rexursive.com> - 2.09-0.20.rc2
+- better fix for apreq2-config
+
 * Wed Jan  7 2009 Bojan Smojver <bojan at rexursive.com> - 2.09-0.19.rc2
 - delay changing apreq2-config, so we don't pick up wrong libs
 



From bojan at fedoraproject.org  Wed Jan  7 10:39:25 2009
From: bojan at fedoraproject.org (Bojan Smojver)
Date: Wed,  7 Jan 2009 10:39:25 +0000 (UTC)
Subject: rpms/libapreq2/F-9 libapreq2.spec,1.39,1.40
Message-ID: <20090107103925.A78E470100@cvs1.fedora.phx.redhat.com>

Author: bojan

Update of /cvs/pkgs/rpms/libapreq2/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13075

Modified Files:
	libapreq2.spec 
Log Message:
Better fix for apreq2-config.


Index: libapreq2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libapreq2/F-9/libapreq2.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- libapreq2.spec	7 Jan 2009 08:42:28 -0000	1.39
+++ libapreq2.spec	7 Jan 2009 10:38:55 -0000	1.40
@@ -2,7 +2,7 @@
 
 Name:           libapreq2
 Version:        2.09
-Release:        0.16.rc2%{?dist}
+Release:        0.17.rc2%{?dist}
 Summary:        Apache HTTP request library
 
 Group:          System Environment/Libraries
@@ -107,14 +107,11 @@
 make %{?_smp_mflags}
 
 # Fix multilib
-sed -i -e 's,^libdir=.*,libdir=`pkg-config --variable=libdir %{name}`,' \
-       -e 's,^LDFLAGS=.*,LDFLAGS=`pkg-config --libs %{name}`,' \
-       -e 's,^LIBS=.*,LIBS=`pkg-config --libs %{name}`,' \
-       -e 's,^INCLUDES=.*,INCLUDES=`pkg-config --cflags-only-I %{name}`,' \
-        apreq2-config.in
-
-# Now build apreq2-config again
-make %{?_smp_mflags}
+sed -i -e 's,^libdir=.*,libdir="`pkg-config --variable=libdir %{name}`",' \
+       -e 's,^LDFLAGS=.*,LDFLAGS="`pkg-config --libs %{name}`",' \
+       -e 's,^LIBS=.*,LIBS="`pkg-config --libs %{name}`",' \
+       -e 's,^INCLUDES=.*,INCLUDES="`pkg-config --cflags-only-I %{name}`",' \
+        apreq2-config
 
 
 %install
@@ -175,6 +172,9 @@
 
 
 %changelog
+* Wed Jan  7 2009 Bojan Smojver <bojan at rexursive.com> - 2.09-0.17.rc2
+- better fix for apreq2-config
+
 * Wed Jan  7 2009 Bojan Smojver <bojan at rexursive.com> - 2.09-0.16.rc2
 - delay changing apreq2-config, so we don't pick up wrong libs
 



From than at fedoraproject.org  Wed Jan  7 10:42:28 2009
From: than at fedoraproject.org (Than Ngo)
Date: Wed,  7 Jan 2009 10:42:28 +0000 (UTC)
Subject: rpms/kdeaccessibility/F-9 kdeaccessibility.spec, 1.56, 1.57 sources,
	1.29, 1.30
Message-ID: <20090107104229.0491770100@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdeaccessibility/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13573

Modified Files:
	kdeaccessibility.spec sources 
Log Message:
4.1.4



Index: kdeaccessibility.spec
===================================================================
RCS file: /cvs/extras/rpms/kdeaccessibility/F-9/kdeaccessibility.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- kdeaccessibility.spec	5 Nov 2008 15:56:12 -0000	1.56
+++ kdeaccessibility.spec	7 Jan 2009 10:41:58 -0000	1.57
@@ -1,7 +1,7 @@
 Summary:        K Desktop Environment - Accessibility
 Name:           kdeaccessibility
 Epoch:          1
-Version:        4.1.3
+Version:        4.1.4
 Release:        1%{?dist}
 
 Group:          User Interface/Desktops
@@ -98,7 +98,10 @@
 
 
 %changelog
-* Wed Nov  5 2008 Luk???? Tinkl <ltinkl at redhat.com> 4.1.3-1
+* Wed Jan 07 2009 Than Ngo <than at redhat.com> - 4.1.4-1
+- 4.1.4
+
+* Tue Nov 11 2008 Than Ngo <than at redhat.com> 4.1.3-1
 - KDE 4.1.3
 
 * Mon Sep 29 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdeaccessibility/F-9/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- sources	5 Nov 2008 15:56:12 -0000	1.29
+++ sources	7 Jan 2009 10:41:58 -0000	1.30
@@ -1 +1 @@
-85011b7ec7c8591f492f4dbf444408b3  kdeaccessibility-4.1.3.tar.bz2
+da6c157741d73eb1445cd60d9b78cd2e  kdeaccessibility-4.1.4.tar.bz2



From than at fedoraproject.org  Wed Jan  7 10:47:57 2009
From: than at fedoraproject.org (Than Ngo)
Date: Wed,  7 Jan 2009 10:47:57 +0000 (UTC)
Subject: rpms/kdeadmin/F-10 .cvsignore, 1.53, 1.54 kdeadmin.spec, 1.114,
	1.115 sources, 1.56, 1.57
Message-ID: <20090107104757.6E0B170100@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdeadmin/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14301

Modified Files:
	.cvsignore kdeadmin.spec sources 
Log Message:
4.1.4



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdeadmin/F-10/.cvsignore,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- .cvsignore	27 Sep 2008 01:54:45 -0000	1.53
+++ .cvsignore	7 Jan 2009 10:47:26 -0000	1.54
@@ -1 +1,2 @@
 kdeadmin-4.1.2.tar.bz2
+kdeadmin-4.1.4.tar.bz2


Index: kdeadmin.spec
===================================================================
RCS file: /cvs/extras/rpms/kdeadmin/F-10/kdeadmin.spec,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -r1.114 -r1.115
--- kdeadmin.spec	11 Nov 2008 22:54:17 -0000	1.114
+++ kdeadmin.spec	7 Jan 2009 10:47:26 -0000	1.115
@@ -1,6 +1,6 @@
 Name:           kdeadmin
 Epoch:          7
-Version:        4.1.3
+Version:        4.1.4
 Release:        1%{?dist}
 Summary:        K Desktop Environment - Administrative tools
 
@@ -120,6 +120,9 @@
 
 
 %changelog
+* Wed Jan 07 2009 Than Ngo <than at redhat.com> - 4.1.4-1
+- 4.1.4
+
 * Tue Nov 11 2008 Than Ngo <than at redhat.com> 4.1.3-1
 - 4.1.3
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdeadmin/F-10/sources,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- sources	11 Nov 2008 22:54:17 -0000	1.56
+++ sources	7 Jan 2009 10:47:26 -0000	1.57
@@ -1 +1 @@
-a1b3c8e3c1dccbfff477dc6939f78d5e  kdeadmin-4.1.3.tar.bz2
+c3194bc30daacae33322993f2dba0074  kdeadmin-4.1.4.tar.bz2



From drago01 at fedoraproject.org  Wed Jan  7 10:53:03 2009
From: drago01 at fedoraproject.org (Adel Gadllah)
Date: Wed,  7 Jan 2009 10:53:03 +0000 (UTC)
Subject: rpms/nvclock/F-10 nvclock-0.8b4-buildfix.patch, NONE, 1.1 .cvsignore,
	1.2, 1.3 nvclock.spec, 1.4, 1.5 sources, 1.2,
	1.3 nvclock-attrib-check.patch, 1.1,
	NONE nvclock0.8b3a-missingheader.patch, 1.1, NONE
Message-ID: <20090107105303.2726E70100@cvs1.fedora.phx.redhat.com>

Author: drago01

Update of /cvs/pkgs/rpms/nvclock/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15685

Modified Files:
	.cvsignore nvclock.spec sources 
Added Files:
	nvclock-0.8b4-buildfix.patch 
Removed Files:
	nvclock-attrib-check.patch nvclock0.8b3a-missingheader.patch 
Log Message:
New upstream beta release

nvclock-0.8b4-buildfix.patch:

--- NEW FILE nvclock-0.8b4-buildfix.patch ---
diff -upNr nvclock0.8b4.orign/src/Makefile.in nvclock0.8b4/src/Makefile.in
--- nvclock0.8b4.orign/src/Makefile.in	2009-01-03 18:02:54.000000000 +0100
+++ nvclock0.8b4/src/Makefile.in	2009-01-07 11:37:39.000000000 +0100
@@ -50,8 +50,8 @@ distclean: distclean-recursive clean-app
 install: install-recursive install-app
 install-app:
 	mkdir -p $(bindir)
-	$(INSTALL) -c nvclock $(DESTDIR)$(bindir)/nvclock
-	$(INSTALL) -c smartdimmer $(DESTDIR)$(bindir)/smartdimmer
+	$(INSTALL) -c nvclock $(bindir)/nvclock
+	$(INSTALL) -c smartdimmer $(bindir)/smartdimmer
 
 
 uninstall: uninstall-recursive uninstall-app


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/nvclock/F-10/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	6 Jan 2008 18:17:46 -0000	1.2
+++ .cvsignore	7 Jan 2009 10:52:31 -0000	1.3
@@ -1 +1 @@
-nvclock0.8b3a.tar.gz
+nvclock0.8b4.tar.gz


Index: nvclock.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nvclock/F-10/nvclock.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- nvclock.spec	12 May 2008 20:23:09 -0000	1.4
+++ nvclock.spec	7 Jan 2009 10:52:31 -0000	1.5
@@ -1,7 +1,7 @@
-%define beta_version b3a
+%define beta_version b4
 Name: nvclock
 Version: 0.8       
-Release: 0.6.%{beta_version}%{?dist}
+Release: 0.7.%{beta_version}%{?dist}
 Summary: Utility that allows users to overclock NVIDIA based video cards       
 
 Group: Applications/System          
@@ -11,8 +11,7 @@
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Patch0: nvclock0.8b3a-missingheader.patch
-Patch1: nvclock-attrib-check.patch
+Patch0: nvclock-0.8b4-buildfix.patch
 
 BuildRequires: gtk2-devel      
 BuildRequires: pkgconfig
@@ -33,13 +32,14 @@
 
 %prep
 %setup -q -n %{name}%{version}%{beta_version}
-%patch0 -p1 -b .header
-%patch1 -p1 -b .crash
+%patch0 -p1 -b .build
+
 
 %build
+export CC="gcc %{optflags}"
 %configure --disable-qt
 #FIXME: smpbuild currently broken
-make
+make 
 
 
 %install
@@ -70,6 +70,7 @@
 %files
 %defattr(-,root,root,-)
 %{_bindir}/nvclock
+%{_bindir}/smartdimmer
 %{_docdir}/nvclock
 %{_mandir}/man1/nvclock.*
 
@@ -80,6 +81,10 @@
 %{_datadir}/applications/fedora-nvclock.desktop
 
 %changelog
+* Wed Jan 07 2009 Adel Gadllah <adel.gadllah at gmail.com> 0.8-0.7.b4
+- Update to new beta release
+- New smartdimmer utility to control backlight on some NBs
+
 * Mon May 12 2008 Adel Gadllah <adel.gadllah at gmail.com> 0.8-0.6.b3a
 - Fix possible crasher
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nvclock/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	6 Jan 2008 18:17:46 -0000	1.2
+++ sources	7 Jan 2009 10:52:31 -0000	1.3
@@ -1 +1 @@
-8e5c47ff638603e4a7ccd1325ef765ef  nvclock0.8b3a.tar.gz
+23f1b3ebf40f35d76d5fdac50f66ab11  nvclock0.8b4.tar.gz


--- nvclock-attrib-check.patch DELETED ---


--- nvclock0.8b3a-missingheader.patch DELETED ---



From than at fedoraproject.org  Wed Jan  7 10:53:35 2009
From: than at fedoraproject.org (Than Ngo)
Date: Wed,  7 Jan 2009 10:53:35 +0000 (UTC)
Subject: rpms/kdeadmin/F-9 kdeadmin.spec,1.99,1.100 sources,1.51,1.52
Message-ID: <20090107105335.B3B8E70100@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdeadmin/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15787

Modified Files:
	kdeadmin.spec sources 
Log Message:
4.1.4



Index: kdeadmin.spec
===================================================================
RCS file: /cvs/extras/rpms/kdeadmin/F-9/kdeadmin.spec,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -r1.99 -r1.100
--- kdeadmin.spec	5 Nov 2008 16:30:35 -0000	1.99
+++ kdeadmin.spec	7 Jan 2009 10:53:05 -0000	1.100
@@ -1,6 +1,6 @@
 Name:           kdeadmin
 Epoch:          7
-Version:        4.1.3
+Version:        4.1.4
 Release:        1%{?dist}
 Summary:        K Desktop Environment - Administrative tools
 
@@ -24,14 +24,16 @@
 Requires(postun): /sbin/ldconfig xdg-utils
 Requires: kdelibs4 >= %{version}
 Requires: kdepimlibs >= %{version}
+# kcron/knetworkconf kcm modules
+Requires: kdebase-workspace
 
 
 %description
 The %{name} package includes administrative tools including:
-* kcron (editor for the cron command scheduler)
-* knetworkconf (network configuration module for KDE's settings manager)
-* ksystemlog (system log viewer)
-* kuser (user manager)
+* kcron: systemsettings module for the cron task scheduler
+* knetworkconf: systemsettings module for network settings
+* ksystemlog: system log viewer
+* kuser: user manager
 
 %package kpackage
 Summary: An RPM package manager
@@ -74,18 +76,16 @@
 
 
 %post
-/sbin/ldconfig ||:
-%{_bindir}/xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
+xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
 
 %postun
-/sbin/ldconfig ||:
-%{_bindir}/xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
+xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
 
 %post kpackage
-%{_bindir}/xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
+xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
 
 %postun kpackage
-%{_bindir}/xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
+xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
 
 
 %files
@@ -102,7 +102,6 @@
 %{_kde4_datadir}/kde4/services/*
 %{_kde4_docdir}/HTML/en/kcontrol/
 %{_kde4_docdir}/HTML/en/kcron/
-#{_kde4_docdir}/HTML/en/knetworkconf/
 %{_kde4_docdir}/HTML/en/ksystemlog/
 %{_kde4_docdir}/HTML/en/kuser/
 %{_kde4_iconsdir}/hicolor/*/*/*
@@ -121,8 +120,16 @@
 
 
 %changelog
-* Wed Nov  5 2008 Luk???? Tinkl <ltinkl at redhat.com> 4.1.3-1
-- KDE 4.1.3
+* Wed Jan 07 2009 Than Ngo <than at redhat.com> - 4.1.4-1
+- 4.1.4
+
+* Tue Nov 11 2008 Than Ngo <than at redhat.com> 4.1.3-1
+- 4.1.3
+
+* Mon Oct 20 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-4
+- make %%description for kcron, knetworkconf more clear (#467650)
+- Requires: kdebase-workspace (for kcm modules)
+- cleanup extraneous scriptlets
 
 * Mon Sep 29 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-3
 - make VERBOSE=1


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdeadmin/F-9/sources,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- sources	5 Nov 2008 16:30:35 -0000	1.51
+++ sources	7 Jan 2009 10:53:05 -0000	1.52
@@ -1 +1 @@
-a1b3c8e3c1dccbfff477dc6939f78d5e  kdeadmin-4.1.3.tar.bz2
+c3194bc30daacae33322993f2dba0074  kdeadmin-4.1.4.tar.bz2



From drago01 at fedoraproject.org  Wed Jan  7 10:53:38 2009
From: drago01 at fedoraproject.org (Adel Gadllah)
Date: Wed,  7 Jan 2009 10:53:38 +0000 (UTC)
Subject: rpms/nvclock/devel nvclock-0.8b4-buildfix.patch, NONE,
	1.1 .cvsignore, 1.2, 1.3 nvclock.spec, 1.4, 1.5 sources, 1.2,
	1.3 nvclock-attrib-check.patch, 1.1,
	NONE nvclock0.8b3a-missingheader.patch, 1.1, NONE
Message-ID: <20090107105338.964B570100@cvs1.fedora.phx.redhat.com>

Author: drago01

Update of /cvs/pkgs/rpms/nvclock/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15820

Modified Files:
	.cvsignore nvclock.spec sources 
Added Files:
	nvclock-0.8b4-buildfix.patch 
Removed Files:
	nvclock-attrib-check.patch nvclock0.8b3a-missingheader.patch 
Log Message:
New upstream beta release

nvclock-0.8b4-buildfix.patch:

--- NEW FILE nvclock-0.8b4-buildfix.patch ---
diff -upNr nvclock0.8b4.orign/src/Makefile.in nvclock0.8b4/src/Makefile.in
--- nvclock0.8b4.orign/src/Makefile.in	2009-01-03 18:02:54.000000000 +0100
+++ nvclock0.8b4/src/Makefile.in	2009-01-07 11:37:39.000000000 +0100
@@ -50,8 +50,8 @@ distclean: distclean-recursive clean-app
 install: install-recursive install-app
 install-app:
 	mkdir -p $(bindir)
-	$(INSTALL) -c nvclock $(DESTDIR)$(bindir)/nvclock
-	$(INSTALL) -c smartdimmer $(DESTDIR)$(bindir)/smartdimmer
+	$(INSTALL) -c nvclock $(bindir)/nvclock
+	$(INSTALL) -c smartdimmer $(bindir)/smartdimmer
 
 
 uninstall: uninstall-recursive uninstall-app


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/nvclock/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	6 Jan 2008 18:17:46 -0000	1.2
+++ .cvsignore	7 Jan 2009 10:53:08 -0000	1.3
@@ -1 +1 @@
-nvclock0.8b3a.tar.gz
+nvclock0.8b4.tar.gz


Index: nvclock.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nvclock/devel/nvclock.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- nvclock.spec	12 May 2008 20:23:09 -0000	1.4
+++ nvclock.spec	7 Jan 2009 10:53:08 -0000	1.5
@@ -1,7 +1,7 @@
-%define beta_version b3a
+%define beta_version b4
 Name: nvclock
 Version: 0.8       
-Release: 0.6.%{beta_version}%{?dist}
+Release: 0.7.%{beta_version}%{?dist}
 Summary: Utility that allows users to overclock NVIDIA based video cards       
 
 Group: Applications/System          
@@ -11,8 +11,7 @@
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Patch0: nvclock0.8b3a-missingheader.patch
-Patch1: nvclock-attrib-check.patch
+Patch0: nvclock-0.8b4-buildfix.patch
 
 BuildRequires: gtk2-devel      
 BuildRequires: pkgconfig
@@ -33,13 +32,14 @@
 
 %prep
 %setup -q -n %{name}%{version}%{beta_version}
-%patch0 -p1 -b .header
-%patch1 -p1 -b .crash
+%patch0 -p1 -b .build
+
 
 %build
+export CC="gcc %{optflags}"
 %configure --disable-qt
 #FIXME: smpbuild currently broken
-make
+make 
 
 
 %install
@@ -70,6 +70,7 @@
 %files
 %defattr(-,root,root,-)
 %{_bindir}/nvclock
+%{_bindir}/smartdimmer
 %{_docdir}/nvclock
 %{_mandir}/man1/nvclock.*
 
@@ -80,6 +81,10 @@
 %{_datadir}/applications/fedora-nvclock.desktop
 
 %changelog
+* Wed Jan 07 2009 Adel Gadllah <adel.gadllah at gmail.com> 0.8-0.7.b4
+- Update to new beta release
+- New smartdimmer utility to control backlight on some NBs
+
 * Mon May 12 2008 Adel Gadllah <adel.gadllah at gmail.com> 0.8-0.6.b3a
 - Fix possible crasher
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nvclock/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	6 Jan 2008 18:17:46 -0000	1.2
+++ sources	7 Jan 2009 10:53:08 -0000	1.3
@@ -1 +1 @@
-8e5c47ff638603e4a7ccd1325ef765ef  nvclock0.8b3a.tar.gz
+23f1b3ebf40f35d76d5fdac50f66ab11  nvclock0.8b4.tar.gz


--- nvclock-attrib-check.patch DELETED ---


--- nvclock0.8b3a-missingheader.patch DELETED ---



From drago01 at fedoraproject.org  Wed Jan  7 10:55:04 2009
From: drago01 at fedoraproject.org (Adel Gadllah)
Date: Wed,  7 Jan 2009 10:55:04 +0000 (UTC)
Subject: rpms/nvclock/F-9 nvclock-0.8b4-buildfix.patch, NONE, 1.1 .cvsignore,
	1.2, 1.3 nvclock.spec, 1.4, 1.5 sources, 1.2,
	1.3 nvclock-attrib-check.patch, 1.1,
	NONE nvclock0.8b3a-missingheader.patch, 1.1, NONE
Message-ID: <20090107105504.E8B8270100@cvs1.fedora.phx.redhat.com>

Author: drago01

Update of /cvs/pkgs/rpms/nvclock/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16336

Modified Files:
	.cvsignore nvclock.spec sources 
Added Files:
	nvclock-0.8b4-buildfix.patch 
Removed Files:
	nvclock-attrib-check.patch nvclock0.8b3a-missingheader.patch 
Log Message:
New upstream beta release

nvclock-0.8b4-buildfix.patch:

--- NEW FILE nvclock-0.8b4-buildfix.patch ---
diff -upNr nvclock0.8b4.orign/src/Makefile.in nvclock0.8b4/src/Makefile.in
--- nvclock0.8b4.orign/src/Makefile.in	2009-01-03 18:02:54.000000000 +0100
+++ nvclock0.8b4/src/Makefile.in	2009-01-07 11:37:39.000000000 +0100
@@ -50,8 +50,8 @@ distclean: distclean-recursive clean-app
 install: install-recursive install-app
 install-app:
 	mkdir -p $(bindir)
-	$(INSTALL) -c nvclock $(DESTDIR)$(bindir)/nvclock
-	$(INSTALL) -c smartdimmer $(DESTDIR)$(bindir)/smartdimmer
+	$(INSTALL) -c nvclock $(bindir)/nvclock
+	$(INSTALL) -c smartdimmer $(bindir)/smartdimmer
 
 
 uninstall: uninstall-recursive uninstall-app


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/nvclock/F-9/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	6 Jan 2008 18:17:46 -0000	1.2
+++ .cvsignore	7 Jan 2009 10:54:34 -0000	1.3
@@ -1 +1 @@
-nvclock0.8b3a.tar.gz
+nvclock0.8b4.tar.gz


Index: nvclock.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nvclock/F-9/nvclock.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- nvclock.spec	12 May 2008 20:22:50 -0000	1.4
+++ nvclock.spec	7 Jan 2009 10:54:34 -0000	1.5
@@ -1,7 +1,7 @@
-%define beta_version b3a
+%define beta_version b4
 Name: nvclock
 Version: 0.8       
-Release: 0.6.%{beta_version}%{?dist}
+Release: 0.7.%{beta_version}%{?dist}
 Summary: Utility that allows users to overclock NVIDIA based video cards       
 
 Group: Applications/System          
@@ -11,8 +11,7 @@
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Patch0: nvclock0.8b3a-missingheader.patch
-Patch1: nvclock-attrib-check.patch
+Patch0: nvclock-0.8b4-buildfix.patch
 
 BuildRequires: gtk2-devel      
 BuildRequires: pkgconfig
@@ -33,13 +32,14 @@
 
 %prep
 %setup -q -n %{name}%{version}%{beta_version}
-%patch0 -p1 -b .header
-%patch1 -p1 -b .crash
+%patch0 -p1 -b .build
+
 
 %build
+export CC="gcc %{optflags}"
 %configure --disable-qt
 #FIXME: smpbuild currently broken
-make
+make 
 
 
 %install
@@ -70,6 +70,7 @@
 %files
 %defattr(-,root,root,-)
 %{_bindir}/nvclock
+%{_bindir}/smartdimmer
 %{_docdir}/nvclock
 %{_mandir}/man1/nvclock.*
 
@@ -80,6 +81,10 @@
 %{_datadir}/applications/fedora-nvclock.desktop
 
 %changelog
+* Wed Jan 07 2009 Adel Gadllah <adel.gadllah at gmail.com> 0.8-0.7.b4
+- Update to new beta release
+- New smartdimmer utility to control backlight on some NBs
+
 * Mon May 12 2008 Adel Gadllah <adel.gadllah at gmail.com> 0.8-0.6.b3a
 - Fix possible crasher
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nvclock/F-9/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	6 Jan 2008 18:17:46 -0000	1.2
+++ sources	7 Jan 2009 10:54:34 -0000	1.3
@@ -1 +1 @@
-8e5c47ff638603e4a7ccd1325ef765ef  nvclock0.8b3a.tar.gz
+23f1b3ebf40f35d76d5fdac50f66ab11  nvclock0.8b4.tar.gz


--- nvclock-attrib-check.patch DELETED ---


--- nvclock0.8b3a-missingheader.patch DELETED ---



From than at fedoraproject.org  Wed Jan  7 11:06:00 2009
From: than at fedoraproject.org (Than Ngo)
Date: Wed,  7 Jan 2009 11:06:00 +0000 (UTC)
Subject: rpms/kdeartwork/F-10 .cvsignore, 1.50, 1.51 kdeartwork.spec, 1.93, 
	1.94 sources, 1.53, 1.54
Message-ID: <20090107110600.21AED70100@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdeartwork/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17877

Modified Files:
	.cvsignore kdeartwork.spec sources 
Log Message:
4.1.4



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdeartwork/F-10/.cvsignore,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- .cvsignore	27 Sep 2008 02:05:58 -0000	1.50
+++ .cvsignore	7 Jan 2009 11:05:29 -0000	1.51
@@ -2,3 +2,4 @@
 kdeartwork-4.1.0.tar.bz2
 kdeartwork-4.1.1.tar.bz2
 kdeartwork-4.1.2.tar.bz2
+kdeartwork-4.1.4.tar.bz2


Index: kdeartwork.spec
===================================================================
RCS file: /cvs/extras/rpms/kdeartwork/F-10/kdeartwork.spec,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -r1.93 -r1.94
--- kdeartwork.spec	27 Nov 2008 21:33:04 -0000	1.93
+++ kdeartwork.spec	7 Jan 2009 11:05:29 -0000	1.94
@@ -1,7 +1,6 @@
-
 Name:           kdeartwork
-Version:        4.1.3
-Release:        3%{?dist}
+Version:        4.1.4
+Release:        1%{?dist}
 Summary:        Additional artwork (themes, sound themes, ...) for KDE
 
 License:        GPLv2
@@ -196,6 +195,9 @@
 
 
 %changelog
+* Wed Jan 07 2009 Than Ngo <than at redhat.com> - 4.1.4-1
+- 4.1.4
+
 * Thu Nov 27 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.3-3
 - reenable webcollage since xscreensaver now has a sane default setting for it
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdeartwork/F-10/sources,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- sources	11 Nov 2008 23:03:05 -0000	1.53
+++ sources	7 Jan 2009 11:05:29 -0000	1.54
@@ -1 +1 @@
-131ffcd97e392053a65c9e97161508f9  kdeartwork-4.1.3.tar.bz2
+6b53365e45fdcd227e7e7c546e25cb36  kdeartwork-4.1.4.tar.bz2



From than at fedoraproject.org  Wed Jan  7 11:14:41 2009
From: than at fedoraproject.org (Than Ngo)
Date: Wed,  7 Jan 2009 11:14:41 +0000 (UTC)
Subject: rpms/kdeartwork/F-9 kdeartwork.spec,1.87,1.88 sources,1.48,1.49
Message-ID: <20090107111441.A75BD70100@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdeartwork/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18749

Modified Files:
	kdeartwork.spec sources 
Log Message:
4.1.4



Index: kdeartwork.spec
===================================================================
RCS file: /cvs/extras/rpms/kdeartwork/F-9/kdeartwork.spec,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -r1.87 -r1.88
--- kdeartwork.spec	27 Nov 2008 21:33:04 -0000	1.87
+++ kdeartwork.spec	7 Jan 2009 11:14:09 -0000	1.88
@@ -1,7 +1,6 @@
-
 Name:           kdeartwork
-Version:        4.1.3
-Release:        3%{?dist}
+Version:        4.1.4
+Release:        1%{?dist}
 Summary:        Additional artwork (themes, sound themes, ...) for KDE
 
 License:        GPLv2
@@ -196,6 +195,9 @@
 
 
 %changelog
+* Wed Jan 07 2009 Than Ngo <than at redhat.com> - 4.1.4-1
+- 4.1.4
+
 * Thu Nov 27 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.3-3
 - reenable webcollage since xscreensaver now has a sane default setting for it
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdeartwork/F-9/sources,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- sources	5 Nov 2008 17:24:56 -0000	1.48
+++ sources	7 Jan 2009 11:14:10 -0000	1.49
@@ -1 +1 @@
-131ffcd97e392053a65c9e97161508f9  kdeartwork-4.1.3.tar.bz2
+6b53365e45fdcd227e7e7c546e25cb36  kdeartwork-4.1.4.tar.bz2



From kwizart at fedoraproject.org  Wed Jan  7 11:22:44 2009
From: kwizart at fedoraproject.org (Chauvet Nicolas)
Date: Wed,  7 Jan 2009 11:22:44 +0000 (UTC)
Subject: rpms/perl-BDB/devel .cvsignore, 1.3, 1.4 sources, 1.4,
	1.5 perl-BDB.spec, 1.3, 1.4
Message-ID: <20090107112244.AA21D70100@cvs1.fedora.phx.redhat.com>

Author: kwizart

Update of /cvs/pkgs/rpms/perl-BDB/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20376

Modified Files:
	.cvsignore sources perl-BDB.spec 
Log Message:
Update to 1.82



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-BDB/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	28 Nov 2008 17:56:31 -0000	1.3
+++ .cvsignore	7 Jan 2009 11:22:13 -0000	1.4
@@ -1 +1 @@
-BDB-1.81.tar.gz
+BDB-1.82.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-BDB/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	28 Nov 2008 17:56:31 -0000	1.4
+++ sources	7 Jan 2009 11:22:13 -0000	1.5
@@ -1 +1 @@
-0fb8332eb11c664bea84b23519fb8e44  BDB-1.81.tar.gz
+f1ac96102289aac4377d8cca6c9f15b0  BDB-1.82.tar.gz


Index: perl-BDB.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-BDB/devel/perl-BDB.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- perl-BDB.spec	28 Nov 2008 17:56:31 -0000	1.3
+++ perl-BDB.spec	7 Jan 2009 11:22:13 -0000	1.4
@@ -1,5 +1,5 @@
 Name:           perl-BDB
-Version:        1.81
+Version:        1.82
 Release:        1%{?dist}
 Summary:        Asynchronous Berkeley DB access
 
@@ -52,6 +52,9 @@
 
 
 %changelog
+* Wed Jan  7 2008 kwizart < kwizart at gmail.com > - 1.82-1
+- Update to 1.82
+
 * Fri Nov 28 2008 kwizart < kwizart at gmail.com > - 1.81-1
 - Update to 1.81
 



From kwizart at fedoraproject.org  Wed Jan  7 11:25:23 2009
From: kwizart at fedoraproject.org (Chauvet Nicolas)
Date: Wed,  7 Jan 2009 11:25:23 +0000 (UTC)
Subject: rpms/perl-BDB/devel perl-BDB.spec,1.4,1.5
Message-ID: <20090107112523.26EA270100@cvs1.fedora.phx.redhat.com>

Author: kwizart

Update of /cvs/pkgs/rpms/perl-BDB/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20900

Modified Files:
	perl-BDB.spec 
Log Message:
HNY fix



Index: perl-BDB.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-BDB/devel/perl-BDB.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-BDB.spec	7 Jan 2009 11:22:13 -0000	1.4
+++ perl-BDB.spec	7 Jan 2009 11:24:52 -0000	1.5
@@ -52,7 +52,7 @@
 
 
 %changelog
-* Wed Jan  7 2008 kwizart < kwizart at gmail.com > - 1.82-1
+* Wed Jan  7 2009 kwizart < kwizart at gmail.com > - 1.82-1
 - Update to 1.82
 
 * Fri Nov 28 2008 kwizart < kwizart at gmail.com > - 1.81-1



From rrankin at fedoraproject.org  Wed Jan  7 11:29:02 2009
From: rrankin at fedoraproject.org (Roy Rankin)
Date: Wed,  7 Jan 2009 11:29:02 +0000 (UTC)
Subject: rpms/denemo/devel denemo-0.8.0-make.patch, NONE, 1.1 .cvsignore, 1.2,
	1.3 sources, 1.2, 1.3
Message-ID: <20090107112902.28E7970100@cvs1.fedora.phx.redhat.com>

Author: rrankin

Update of /cvs/pkgs/rpms/denemo/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21321

Modified Files:
	.cvsignore sources 
Added Files:
	denemo-0.8.0-make.patch 
Log Message:
new upstream version


denemo-0.8.0-make.patch:

--- NEW FILE denemo-0.8.0-make.patch ---
--- Makefile.am.org	2008-11-30 15:53:12.000000000 +1100
+++ Makefile.am	2008-11-30 15:54:19.000000000 +1100
@@ -16,9 +16,9 @@
 	depcomp
 
 install-data-hook:
-	cp -r actions  $(datadir)/${PACKAGE}/
-	chmod -R 755 $(datadir)/${PACKAGE}/actions
+	cp -r actions  $(DESTDIR)$(datadir)/${PACKAGE}/
+	chmod -R 755 $(DESTDIR)$(datadir)/${PACKAGE}/actions
 dist-hook: @PACKAGE at .spec
-	cp $(srcdir)/@PACKAGE at .spec $(distdir)
+	cp $(srcdir)/@PACKAGE at .spec $(DESTDIR)$(distdir)
 
 ACLOCAL_AMFLAGS = -I m4
--- Makefile.in.org	2008-11-30 15:55:58.000000000 +1100
+++ Makefile.in	2008-11-30 15:57:25.000000000 +1100
@@ -648,10 +648,10 @@
 
 
 install-data-hook:
-	cp -r actions  $(datadir)/${PACKAGE}/
-	chmod -R 755 $(datadir)/${PACKAGE}/actions
+	cp -r actions  $(DESTDIR)$(datadir)/${PACKAGE}/
+	chmod -R 755 $(DESTDIR)$(datadir)/${PACKAGE}/actions
 dist-hook: @PACKAGE at .spec
-	cp $(srcdir)/@PACKAGE at .spec $(distdir)
+	cp $(srcdir)/@PACKAGE at .spec $(DESTDIR)$(distdir)
 # 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/denemo/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	24 Aug 2008 23:05:19 -0000	1.2
+++ .cvsignore	7 Jan 2009 11:29:00 -0000	1.3
@@ -1 +1 @@
-denemo-0.7.9.tar.gz
+denemo-0.8.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/denemo/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	24 Aug 2008 23:05:19 -0000	1.2
+++ sources	7 Jan 2009 11:29:00 -0000	1.3
@@ -1 +1 @@
-d48936ed56aea5d6afc7f061169e2891  denemo-0.7.9.tar.gz
+a19e15130f9c7fcdcef03daefc342d0c  denemo-0.8.0.tar.gz



From rrankin at fedoraproject.org  Wed Jan  7 11:32:46 2009
From: rrankin at fedoraproject.org (Roy Rankin)
Date: Wed,  7 Jan 2009 11:32:46 +0000 (UTC)
Subject: rpms/denemo/devel denemo.spec,1.2,1.3
Message-ID: <20090107113246.98FE570100@cvs1.fedora.phx.redhat.com>

Author: rrankin

Update of /cvs/pkgs/rpms/denemo/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21878

Modified Files:
	denemo.spec 
Log Message:
specfile for new upstream release



Index: denemo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/denemo/devel/denemo.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- denemo.spec	3 Sep 2008 11:16:14 -0000	1.2
+++ denemo.spec	7 Jan 2009 11:32:16 -0000	1.3
@@ -1,19 +1,18 @@
 Summary: Graphical music notation program
 Name: denemo
-Version: 0.7.9
-Release: 5%{?dist}
+Version: 0.8.0
+Release: 1%{?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
+Patch0: %{name}-0.8.0-make.patch
 
 URL: http://www.denemo.org/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires: portaudio-devel aubio-devel gtk2-devel
+BuildRequires: portaudio-devel aubio-devel gtk2-devel guile-devel
 BuildRequires: gettext libxml2-devel fftw-devel desktop-file-utils
+BuildRequires: libtool-ltdl-devel
 Requires: bug-buddy
 
 
@@ -28,9 +27,7 @@
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
+%patch0 -p0
 
 %build
 %configure 
@@ -59,6 +56,9 @@
 %doc COPYING README README.lilypond ChangeLog 
 
 %changelog
+* Sun Nov 30 2008 Roy Rankin <rrankin at ihug.com.au> - 0.8.0-1
+-Update for Denemo release 0.8.0
+
 * 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



From ovasik at fedoraproject.org  Wed Jan  7 11:44:14 2009
From: ovasik at fedoraproject.org (Ondrej Vasik)
Date: Wed,  7 Jan 2009 11:44:14 +0000 (UTC)
Subject: rpms/setup/devel setup.spec,1.65,1.66
Message-ID: <20090107114414.EB25F70100@cvs1.fedora.phx.redhat.com>

Author: ovasik

Update of /cvs/extras/rpms/setup/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23508

Modified Files:
	setup.spec 
Log Message:
use lua instead of default /bin/sh post script to prevent external dependencies(#477769)


Index: setup.spec
===================================================================
RCS file: /cvs/extras/rpms/setup/devel/setup.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- setup.spec	18 Dec 2008 11:49:16 -0000	1.65
+++ setup.spec	7 Jan 2009 11:43:41 -0000	1.66
@@ -1,7 +1,7 @@
 Summary: A set of system configuration and setup files
 Name: setup
 Version: 2.7.5
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: Public Domain
 Group: System Environment/Base
 URL: https://fedorahosted.org/setup/
@@ -10,7 +10,6 @@
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 BuildRequires: bash tcsh perl
-Requires(post): grep
 
 Conflicts: initscripts < 4.26, bash <= 2.0.4-21
 
@@ -52,13 +51,12 @@
 %clean
 rm -rf %{buildroot}
 
-%post
-if [ `grep -c video /etc/group` -eq 0 ] ; then
-  groupadd -g 39 video
-fi
-if [ `grep -c audio /etc/group` -eq 0 ] ; then
-  groupadd -g 63 audio
-fi
+#remove post script after F10 EOL (and for RHEL-6)
+%post -p <lua>
+if arg[2] > 1 and posix.access("/usr/sbin/groupadd", "x") then
+   os.execute("/usr/sbin/groupadd -g 39 video &>/dev/null")
+   os.execute("/usr/sbin/groupadd -g 63 audio &>/dev/null")
+end
 
 %files
 %defattr(-,root,root)
@@ -91,6 +89,10 @@
 %ghost %verify(not md5 size mtime) %config(noreplace,missingok) /etc/mtab
 
 %changelog
+* Tue Jan 06 2009 Ondrej Vasik <ovasik at redhat.com> 2.7.5-4
+- use lua language in post to prevent additional
+  dependencies
+
 * Thu Dec 18 2008 Ondrej Vasik <ovasik at redhat.com> 2.7.5-3
 - add pkiuser (17:17) to uidgid
 - temporarily create video/audio group in post section



From caolanm at fedoraproject.org  Wed Jan  7 11:44:15 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Wed,  7 Jan 2009 11:44:15 +0000 (UTC)
Subject: rpms/bigboard/devel bigboard.spec,1.70,1.71
Message-ID: <20090107114415.8DCF870141@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/bigboard/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23538

Modified Files:
	bigboard.spec 
Log Message:
rebuild for dependancies


Index: bigboard.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bigboard/devel/bigboard.spec,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- bigboard.spec	29 Nov 2008 16:36:40 -0000	1.70
+++ bigboard.spec	7 Jan 2009 11:43:45 -0000	1.71
@@ -3,7 +3,7 @@
 
 Name:           bigboard
 Version:        0.6.4
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Sidebar application launcher using mugshot.org
 
 Group:          Applications/Internet
@@ -125,6 +125,9 @@
 killall -HUP gconfd-2 || :
 
 %changelog
+* Wed Jan 07 2009 Caol??n McNamara <caolanm at redhat.com> - 0.6.4-5
+- rebuild for dependancies
+
 * Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 0.6.4-4
 - Rebuild for Python 2.6
 



From theinric at fedoraproject.org  Wed Jan  7 12:09:09 2009
From: theinric at fedoraproject.org (Tomas Heinrich)
Date: Wed,  7 Jan 2009 12:09:09 +0000 (UTC)
Subject: rpms/rsyslog/devel rsyslog-3.21.9-dodie.patch, NONE,
	1.1 rsyslog-3.21.9-opts.patch, NONE, 1.1 rsyslog.spec, 1.52, 1.53
Message-ID: <20090107120910.587B070100@cvs1.fedora.phx.redhat.com>

Author: theinric

Update of /cvs/extras/rpms/rsyslog/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27502

Modified Files:
	rsyslog.spec 
Added Files:
	rsyslog-3.21.9-dodie.patch rsyslog-3.21.9-opts.patch 
Log Message:
- fix several legacy options handling
- fix internal message output (#478612)


rsyslog-3.21.9-dodie.patch:

--- NEW FILE rsyslog-3.21.9-dodie.patch ---
diff -up rsyslog-3.21.9/tools/syslogd.c.dodie rsyslog-3.21.9/tools/syslogd.c
--- rsyslog-3.21.9/tools/syslogd.c.dodie	2009-01-05 17:20:33.000000000 +0100
+++ rsyslog-3.21.9/tools/syslogd.c	2009-01-05 17:25:19.000000000 +0100
@@ -1877,9 +1877,11 @@ static void doDie(int sig)
 #	define MSG1 "DoDie called.\n"
 #	define MSG2 "DoDie called 5 times - unconditional exit\n"
 	static int iRetries = 0; /* debug aid */
-	write(1, MSG1, sizeof(MSG1));
+	if(Debug || NoFork)
+		write(1, MSG1, sizeof(MSG1) - 1);
 	if(iRetries++ == 4) {
-		write(1, MSG2, sizeof(MSG2));
+		if(Debug || NoFork)
+			write(1, MSG2, sizeof(MSG2) - 1);
 		abort();
 	}
 	bFinished = sig;

rsyslog-3.21.9-opts.patch:

--- NEW FILE rsyslog-3.21.9-opts.patch ---
diff -up rsyslog-3.21.9/tools/syslogd.c.opts rsyslog-3.21.9/tools/syslogd.c
--- rsyslog-3.21.9/tools/syslogd.c.opts	2008-12-09 10:36:02.000000000 +0100
+++ rsyslog-3.21.9/tools/syslogd.c	2008-12-09 10:57:03.000000000 +0100
@@ -391,8 +391,9 @@ static void processImInternal(void);
 
 static int usage(void)
 {
-	fprintf(stderr, "usage: rsyslogd [-cversion] [-46AdnqQvwx] [-lhostlist] [-sdomainlist]\n"
-			"                [-fconffile] [-ipidfile] [-Nlevel]\n"
+	fprintf(stderr, "usage: rsyslogd [-c<version>] [-46AdnqQvwx] [-l<hostlist>] [-s<domainlist>]\n"
+			"                [-f<conffile>] [-i<pidfile>] [-N<level>] [-M<module load path>]\n"
+			"                [-u<number>]\n"
 			"To run rsyslogd in native mode, use \"rsyslogd -c3 <other options>\"\n\n"
 			"For further information see http://www.rsyslog.com/doc\n");
 	exit(1); /* "good" exit - done to terminate usage() */
@@ -3164,7 +3165,7 @@ int realMain(int argc, char **argv)
 	 * only when actually neeeded. 
 	 * rgerhards, 2008-04-04
 	 */
-	while((ch = getopt(argc, argv, "46aAc:def:g:hi:l:m:M:nN:opqQr::s:t:u:vwx")) != EOF) {
+	while((ch = getopt(argc, argv, "46a:Ac:def:g:hi:l:m:M:nN:op:qQr::s:t:u:vwx")) != EOF) {
 		switch((char)ch) {
                 case '4':
                 case '6':


Index: rsyslog.spec
===================================================================
RCS file: /cvs/extras/rpms/rsyslog/devel/rsyslog.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- rsyslog.spec	15 Dec 2008 15:05:45 -0000	1.52
+++ rsyslog.spec	7 Jan 2009 12:08:38 -0000	1.53
@@ -3,7 +3,7 @@
 Summary: Enhanced system logging and kernel message trapping daemons
 Name: rsyslog
 Version: 3.21.9
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv3+
 Group: System Environment/Daemons
 URL: http://www.rsyslog.com/
@@ -12,6 +12,8 @@
 Source2: rsyslog.conf
 Source3: rsyslog.sysconfig
 Source4: rsyslog.log
+Patch0: rsyslog-3.21.9-opts.patch
+Patch1: rsyslog-3.21.9-dodie.patch
 BuildRequires: zlib-devel
 BuildRequires: autoconf automake
 Requires: logrotate >= 3.5.2
@@ -87,6 +89,8 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .opts
+%patch1 -p1 -b .dodie
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS -DSYSLOGD_PIDNAME=\\\"syslogd.pid\\\""
@@ -96,8 +100,8 @@
 		--enable-pgsql \
 		--enable-gssapi-krb5 \
 		--enable-imfile \
-                --enable-relp \
-                --enable-gnutls
+		--enable-relp \
+		--enable-gnutls
 make %{?_smp_mflags}
 
 %install
@@ -192,6 +196,10 @@
 %{_libdir}/rsyslog/lmnsd_gtls.so
 
 %changelog
+* Tue Jan 07 2009 Tomas Heinrich <theinric at redhat.com> 3.21.9-2
+- fix several legacy options handling
+- fix internal message output (#478612)
+
 * Mon Dec 15 2008 Peter Vrabec <pvrabec at redhat.com> 3.21.9-1
 - update is fixing $AllowedSender security issue
 



From caolanm at fedoraproject.org  Wed Jan  7 12:23:40 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Wed,  7 Jan 2009 12:23:40 +0000 (UTC)
Subject: rpms/openoffice.org/devel openoffice.org.spec, 1.1744,
	1.1745 workspace.vcl98.patch, 1.2,
	1.3 openoffice.org-3.0.1.ooo97196.vcl.ensuretheme.whenqttesting.patch,
	1.1, NONE
Message-ID: <20090107122340.F321970100@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29785

Modified Files:
	openoffice.org.spec workspace.vcl98.patch 
Removed Files:
	openoffice.org-3.0.1.ooo97196.vcl.ensuretheme.whenqttesting.patch 
Log Message:
patch merged into upstream workspace


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1744
retrieving revision 1.1745
diff -u -r1.1744 -r1.1745
--- openoffice.org.spec	7 Jan 2009 10:22:13 -0000	1.1744
+++ openoffice.org.spec	7 Jan 2009 12:23:10 -0000	1.1745
@@ -129,10 +129,9 @@
 Patch56: openoffice.org-3.0.1.ooo97088.sd.accel-fallback.patch
 Patch57: workspace.transogl03.patch
 Patch58: workspace.vcl97.patch
-Patch59: openoffice.org-3.0.1.ooo97196.vcl.ensuretheme.whenqttesting.patch
-Patch60: workspace.vcl98.patch
-Patch61: openoffice.org-3.0.1.ooo97428.config_office.xinerama-on-x86_64.patch
-Patch62: openoffice.org-3.0.1.oooXXXXX.extensions.npapi.patch
+Patch59: workspace.vcl98.patch
+Patch60: openoffice.org-3.0.1.ooo97428.config_office.xinerama-on-x86_64.patch
+Patch61: openoffice.org-3.0.1.oooXXXXX.extensions.npapi.patch
 
 %define instdir %{_libdir}
 %define baseinstdir %{instdir}/openoffice.org
@@ -1409,10 +1408,9 @@
 %patch56 -p1
 %patch57 -p0 -b .workspace.transogl03.patch
 %patch58 -p1 -b .workspace.vcl97.patch
-%patch59 -p1 -b .ooo97196.vcl.ensuretheme.whenqttesting.patch
-%patch60 -p1 -b .workspace.vcl98.patch
-%patch61 -p1 -b .ooo97428.config_office.xinerama-on-x86_64.patch
-%patch62 -p1 -b .oooXXXXX.extensions.npapi.patch
+%patch59 -p1 -b .workspace.vcl98.patch
+%patch60 -p1 -b .ooo97428.config_office.xinerama-on-x86_64.patch
+%patch61 -p1 -b .oooXXXXX.extensions.npapi.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`

workspace.vcl98.patch:

Index: workspace.vcl98.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/workspace.vcl98.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- workspace.vcl98.patch	17 Dec 2008 19:13:45 -0000	1.2
+++ workspace.vcl98.patch	7 Jan 2009 12:23:10 -0000	1.3
@@ -100,3 +100,27 @@
  	int i;
  
  	for( i = 0; i < TOGGLE_LAST; i++ )
+Index: unx/gtk/gdi/salnativewidgets-gtk.cxx
+===================================================================
+RCS file: /cvs/gsl/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx,v
+retrieving revision 1.47
+diff -u -r1.47 salnativewidgets-gtk.cxx
+--- openoffice.org.orig/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx	16 Jun 2008 14:30:38 -0000	1.47
++++ openoffice.org/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx	12 Dec 2008 11:14:39 -0000
+@@ -405,6 +408,8 @@
+     
+     if( SalGetDesktopEnvironment().equalsAscii( "KDE" ) )
+     {
++        // Ensure that theme is instantiated to test for QtEngineStyle
++        GtkWidget *pThemeInstantiater = gtk_button_new();
+         if( g_type_from_name( "QtEngineStyle" ) )
+         {
+             // KDE 3.3 invented a bug in the qt<->gtk theme engine
+@@ -412,6 +417,7 @@
+             // ignore the clip rectangle passed to the paint methods
+             GtkSalGraphics::bNeedPixmapPaint = GtkSalGraphics::bGlobalNeedPixmapPaint = true;
+         }
++        gtk_widget_destroy(pThemeInstantiater);
+     }
+     static const char* pEnv = getenv( "SAL_GTK_USE_PIXMAPPAINT" );
+     if( pEnv && *pEnv )


--- openoffice.org-3.0.1.ooo97196.vcl.ensuretheme.whenqttesting.patch DELETED ---



From ltinkl at fedoraproject.org  Wed Jan  7 12:27:50 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Wed,  7 Jan 2009 12:27:50 +0000 (UTC)
Subject: rpms/kdelibs/F-10 .cvsignore, 1.60, 1.61 kdelibs.spec, 1.389,
	1.390 sources, 1.72, 1.73
Message-ID: <20090107122750.4B9E770100@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kdelibs/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28060

Modified Files:
	.cvsignore kdelibs.spec sources 
Log Message:
KDE 4.1.4



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdelibs/F-10/.cvsignore,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- .cvsignore	20 Nov 2008 18:20:57 -0000	1.60
+++ .cvsignore	7 Jan 2009 12:27:19 -0000	1.61
@@ -1 +1 @@
-kdelibs-4.1.3.tar.bz2
+kdelibs-4.1.4.tar.bz2


Index: kdelibs.spec
===================================================================
RCS file: /cvs/extras/rpms/kdelibs/F-10/kdelibs.spec,v
retrieving revision 1.389
retrieving revision 1.390
diff -u -r1.389 -r1.390
--- kdelibs.spec	8 Dec 2008 01:12:23 -0000	1.389
+++ kdelibs.spec	7 Jan 2009 12:27:19 -0000	1.390
@@ -1,8 +1,8 @@
 %define _default_patch_fuzz 2
 
 Summary: K Desktop Environment 4 - Libraries
-Version: 4.1.3
-Release: 4%{?dist}
+Version: 4.1.4
+Release: 1%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs
@@ -19,7 +19,7 @@
 License: LGPLv2
 URL:     http://www.kde.org/
 Group:   System Environment/Libraries
-Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdelibs-%{version}.tar.bz2
+Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdelibs-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %ifarch noarch
@@ -368,6 +368,9 @@
 
 
 %changelog
+* Wed Jan  7 2009 Luk???? Tinkl <ltinkl at redhat.com> 4.1.4-1
+- KDE 4.1.4
+
 * Mon Dec 08 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.3-4
 - restore NTFS workaround which accidentally got dropped in the 4.1.3 update
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdelibs/F-10/sources,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- sources	12 Nov 2008 00:04:55 -0000	1.72
+++ sources	7 Jan 2009 12:27:19 -0000	1.73
@@ -1 +1 @@
-562090d3c1d891081bc4a392e0b513ac  kdelibs-4.1.3.tar.bz2
+ffdb0340a72aaf06a0b98f354c0c59ef  kdelibs-4.1.4.tar.bz2



From caolanm at fedoraproject.org  Wed Jan  7 12:28:29 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Wed,  7 Jan 2009 12:28:29 +0000 (UTC)
Subject: rpms/openoffice.org/devel openoffice.org.spec, 1.1745,
	1.1746 workspace.impressfontsize.patch, 1.2,
	1.3 openoffice.org-3.0.0.ooo91924.svx.consistentordering.patch,
	1.1, NONE
Message-ID: <20090107122829.9D96370100@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30248

Modified Files:
	openoffice.org.spec workspace.impressfontsize.patch 
Removed Files:
	openoffice.org-3.0.0.ooo91924.svx.consistentordering.patch 
Log Message:
rename to upstream workspace


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1745
retrieving revision 1.1746
diff -u -r1.1745 -r1.1746
--- openoffice.org.spec	7 Jan 2009 12:23:10 -0000	1.1745
+++ openoffice.org.spec	7 Jan 2009 12:27:59 -0000	1.1746
@@ -107,7 +107,7 @@
 Patch34: workspace.locales31.patch
 Patch35: workspace.fpicker8.patch
 Patch36: workspace.cmcfixes49.patch
-Patch37: openoffice.org-3.0.0.ooo91924.svx.consistentordering.patch
+Patch37: workspace.impressfontsize.patch
 Patch38: workspace.cmcfixes50.patch
 Patch39: openoffice.org-3.0.0.ooo93515.vcl.jrb-frames.patch
 Patch40: workspace.vcl94.patch
@@ -1386,7 +1386,7 @@
 %patch34 -p1 -b .workspace.locales31.patch
 %patch35 -p1 -b .workspace.fpicker8.patch
 %patch36 -p0 -b .workspace.cmcfixes49.patch
-%patch37 -p1 -b .ooo91924.svx.consistentordering.patch
+%patch37 -p1 -b .workspace.impressfontsize.patch
 %patch38 -p1 -b .workspace.cmcfixes50.patch
 %patch39 -p1 -b .ooo93515.vcl.jrb-frames.patch
 %patch40 -p1 -b .workspace.vcl94.patch

workspace.impressfontsize.patch:

Index: workspace.impressfontsize.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/workspace.impressfontsize.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- workspace.impressfontsize.patch	8 Dec 2008 16:38:18 -0000	1.2
+++ workspace.impressfontsize.patch	7 Jan 2009 12:27:59 -0000	1.3
@@ -1,143 +1,19 @@
-diff -ruN sd.orig/inc/pres.hxx sd/inc/pres.hxx
---- openoffice.org.orig/sd/inc/pres.hxx	2006-12-12 17:23:42.000000000 +0100
-+++ openoffice.org/sd/inc/pres.hxx	2007-07-24 14:27:46.000000000 +0200
-@@ -82,6 +82,7 @@
- 	AUTOLAYOUT_TEXTOVEROBJ,
- 	AUTOLAYOUT_4OBJ,
- 	AUTOLAYOUT_ONLY_TITLE,
-+	AUTOLAYOUT_ONLY_TEXT,
- 	AUTOLAYOUT_NONE,
- 	AUTOLAYOUT_NOTES,
- 	AUTOLAYOUT_HANDOUT1,
-diff -ruN sd.orig/source/core/sdpage.cxx sd/source/core/sdpage.cxx
---- openoffice.org.orig/sd/source/core/sdpage.cxx	2006-12-12 17:33:13.000000000 +0100
-+++ openoffice.org/sd/source/core/sdpage.cxx	2007-07-26 14:53:24.000000000 +0200
-@@ -1244,6 +1244,7 @@
- 		LayoutDescriptor( 6, PRESOBJ_TITLE, PRESOBJ_OBJECT, PRESOBJ_OBJECT,					// AUTOLAYOUT_4OBJ
- 			PRESOBJ_OBJECT, PRESOBJ_OBJECT ),
- 		LayoutDescriptor( 0, PRESOBJ_TITLE, PRESOBJ_NONE ),									// AUTOLAYOUT_ONLY_TITLE
-+		LayoutDescriptor( 10, PRESOBJ_TITLE, PRESOBJ_NONE ),								// AUTOLAYOUT_ONLY_TEXT
- 		LayoutDescriptor( 0, PRESOBJ_NONE ),												// AUTOLAYOUT_NONE
- 		LayoutDescriptor( 0, PRESOBJ_PAGE, PRESOBJ_NOTES ),									// AUTOLAYOUT_NOTES
- 		LayoutDescriptor( 0 ),																// AUTOLAYOUT_HANDOUT1
-@@ -1436,6 +1437,13 @@
- 		rRectangle[1].SetSize( aSize );
- 		break;
- 	}
-+	case 10: // onlytext
-+	{
-+		Size aSize( rRectangle[0].GetSize().Width(), rRectangle[1].BottomLeft().Y() - rRectangle[0].TopLeft().Y() );
-+		rRectangle[0].SetSize( aSize );
-+		rRectangle[0].SetPos( aTitlePos);
-+		break;
-+	}
- 	}
- }
+--- openoffice.org.orig/svx/source/dialog/optgdlg.cxx	2008-08-29 08:29:20.000000000 +0100
++++ openoffice.org/svx/source/dialog/optgdlg.cxx	2008-08-29 08:31:35.000000000 +0100
+@@ -795,11 +795,11 @@
+         switch( Application::GetSettings().GetStyleSettings().GetAutoSymbolsStyle() )
+         {
+             case STYLE_SYMBOLS_DEFAULT:     aAutoStr += aIconStyleLB.GetEntry( 1 ); break;
+-            case STYLE_SYMBOLS_INDUSTRIAL:  aAutoStr += aIconStyleLB.GetEntry( 2 ); break;
+-            case STYLE_SYMBOLS_CRYSTAL:     aAutoStr += aIconStyleLB.GetEntry( 3 ); break;
+-            case STYLE_SYMBOLS_TANGO:       aAutoStr += aIconStyleLB.GetEntry( 4 ); break;
+-            case STYLE_SYMBOLS_CLASSIC:     aAutoStr += aIconStyleLB.GetEntry( 5 ); break;
+-            case STYLE_SYMBOLS_HICONTRAST:  aAutoStr += aIconStyleLB.GetEntry( 6 ); break;
++            case STYLE_SYMBOLS_HICONTRAST:  aAutoStr += aIconStyleLB.GetEntry( 2 ); break;
++            case STYLE_SYMBOLS_INDUSTRIAL:  aAutoStr += aIconStyleLB.GetEntry( 3 ); break;
++            case STYLE_SYMBOLS_CRYSTAL:     aAutoStr += aIconStyleLB.GetEntry( 4 ); break;
++            case STYLE_SYMBOLS_TANGO:       aAutoStr += aIconStyleLB.GetEntry( 5 ); break;
++            case STYLE_SYMBOLS_CLASSIC:     aAutoStr += aIconStyleLB.GetEntry( 6 ); break;
+         }
  
-diff -ruN sd.orig/source/ui/app/res_bmp.src sd/source/ui/app/res_bmp.src
---- openoffice.org.orig/sd/source/ui/app/res_bmp.src	2005-09-23 14:28:54.000000000 +0200
-+++ openoffice.org/sd/source/ui/app/res_bmp.src	2007-07-27 14:55:46.000000000 +0200
-@@ -322,6 +322,14 @@
- {
- 	File = "foil24_h.bmp" ;
- };
-+Bitmap BMP_FOIL_25
-+{
-+	File = "foil25.bmp" ;
-+};
-+Bitmap BMP_FOIL_25_H
-+{
-+	File = "foil25_h.bmp" ;
-+};
- Bitmap BMP_FOILH_01
- {
- 	File = "foilh01.bmp" ;
-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
-@@ -177,6 +177,10 @@
- {
- 	Text [ en-US ] = "Title Only" ;
- };
-+String STR_AUTOLAYOUT_ONLY_TEXT
-+{
-+	Text [ en-US ] = "Centered Text" ;
-+};
- String STR_AUTOLAYOUT_TITLE
- {
- 	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
-@@ -111,6 +111,7 @@
- #define BMP_FOIL_18 			RID_APP_START+28
- #define BMP_FOIL_19 			RID_APP_START+29
- #define BMP_FOIL_20 			RID_APP_START+30
-+#define BMP_FOIL_25			RID_APP_START+41
- #define BMP_FOILH_01			RID_APP_START+31
- #define BMP_FOILH_02			RID_APP_START+32
- #define BMP_FOILH_03			RID_APP_START+33
-@@ -289,6 +290,7 @@
- #define BMP_FOIL_22_H 						RID_SD_START+204
- #define BMP_FOIL_23_H 						RID_SD_START+205
- #define BMP_FOIL_24_H 						RID_SD_START+206
-+#define BMP_FOIL_25_H 						RID_SD_START+334
- #define BMP_FOILH_01_H						RID_SD_START+207
- #define BMP_FOILH_02_H						RID_SD_START+208
- #define BMP_FOILH_03_H						RID_SD_START+209
-diff -ruN sd.orig/source/ui/inc/strings.hrc sd/source/ui/inc/strings.hrc
---- openoffice.org.orig/sd/source/ui/inc/strings.hrc	2006-07-05 23:53:36.000000000 +0200
-+++ openoffice.org/sd/source/ui/inc/strings.hrc	2007-07-27 15:13:52.000000000 +0200
-@@ -202,6 +202,7 @@
- #define STR_AUTOLAYOUT_HANDOUT6 	(RID_APP_START+235)
- #define STR_AUTOLAYOUT_NOTES		(RID_APP_START+236)
- #define STR_AUTOLAYOUT_HANDOUT9		(RID_APP_START+237)
-+#define STR_AUTOLAYOUT_ONLY_TEXT	(RID_APP_START+238)
- 
- #define STR_TRANSFORM				(RID_APP_START+240)
- 
-diff -ruN sd.orig/source/ui/toolpanel/LayoutMenu.cxx sd/source/ui/toolpanel/LayoutMenu.cxx
---- openoffice.org.orig/sd/source/ui/toolpanel/LayoutMenu.cxx	2006-12-12 19:40:07.000000000 +0100
-+++ openoffice.org/sd/source/ui/toolpanel/LayoutMenu.cxx	2007-07-27 15:13:02.000000000 +0200
-@@ -185,6 +185,8 @@
-      AUTOLAYOUT_2TEXT},
-     {BMP_FOIL_19, BMP_FOIL_19_H, STR_AUTOLAYOUT_ONLY_TITLE, WritingMode_LR_TB,
-      AUTOLAYOUT_ONLY_TITLE},
-+    {BMP_FOIL_25, BMP_FOIL_25_H, STR_AUTOLAYOUT_ONLY_TEXT, WritingMode_LR_TB,
-+     AUTOLAYOUT_ONLY_TEXT},
-     {BMP_FOIL_11, BMP_FOIL_11_H, STR_AUTOLAYOUT_OBJ, WritingMode_LR_TB,
-      AUTOLAYOUT_OBJ},
-     {BMP_FOIL_02, BMP_FOIL_02_H, STR_AUTOLAYOUT_CHART, WritingMode_LR_TB,
-Index: source/token/tokens.txt
-===================================================================
-RCS file: /cvs/xml/oox/source/token/tokens.txt,v
-retrieving revision 1.2
-diff -u -r1.2 tokens.txt
---- openoffice.org.orig/oox/source/token/tokens.txt	17 Jan 2008 08:06:07 -0000	1.2
-+++ openoffice.org/oox/source/token/tokens.txt	10 Mar 2008 15:57:51 -0000
-@@ -2431,6 +2431,7 @@
- handoutMasterId
- handoutMasterIdLst
- handoutView
-+handouts
- handouts1
- handouts2
- handouts3
-Index: source/ui/app/optsitem.cxx
-===================================================================
-RCS file: /cvs/graphics/sd/source/ui/app/optsitem.cxx,v
-retrieving revision 1.43
-diff -u -r1.43 optsitem.cxx
---- openoffice.org.orig/sd/source/ui/app/optsitem.cxx	10 Apr 2008 19:25:45 -0000	1.43
-+++ openoffice.org/sd/source/ui/app/optsitem.cxx	21 Jul 2008 09:50:19 -0000
-@@ -1584,8 +1584,8 @@
- 		if( pValues[12].hasValue() ) SetNotes( *(sal_Bool*) pValues[ 12 ].getValue() ); 
- 		if( pValues[13].hasValue() ) SetHandout( *(sal_Bool*) pValues[ 13 ].getValue() ); 
- 		if( pValues[14].hasValue() ) SetOutline( *(sal_Bool*) pValues[ 14 ].getValue() ); 
--		if( pValues[15].hasValue() ) SetHandoutHorizontal( *(sal_Bool*) pValues[12].getValue() );
--		if( pValues[16].hasValue() ) SetHandoutPages( (UINT16)*(sal_Int32*) pValues[13].getValue() );
-+		if( pValues[15].hasValue() ) SetHandoutHorizontal( *(sal_Bool*) pValues[15].getValue() );
-+		if( pValues[16].hasValue() ) SetHandoutPages( (UINT16)*(sal_Int32*) pValues[16].getValue() );
- 	}
- 
- 	return TRUE;
+         aIconStyleLB.RemoveEntry( 0 );


--- openoffice.org-3.0.0.ooo91924.svx.consistentordering.patch DELETED ---



From ltinkl at fedoraproject.org  Wed Jan  7 12:29:30 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Wed,  7 Jan 2009 12:29:30 +0000 (UTC)
Subject: rpms/kdelibs/F-9 .cvsignore, 1.54, 1.55 kdelibs.spec, 1.367,
	1.368 sources, 1.66, 1.67
Message-ID: <20090107122930.C8D8770100@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kdelibs/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30369

Modified Files:
	.cvsignore kdelibs.spec sources 
Log Message:
KDE 4.1.4



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdelibs/F-9/.cvsignore,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- .cvsignore	4 Nov 2008 13:10:12 -0000	1.54
+++ .cvsignore	7 Jan 2009 12:29:00 -0000	1.55
@@ -1 +1 @@
-kdelibs-4.1.3.tar.bz2
+kdelibs-4.1.4.tar.bz2


Index: kdelibs.spec
===================================================================
RCS file: /cvs/extras/rpms/kdelibs/F-9/kdelibs.spec,v
retrieving revision 1.367
retrieving revision 1.368
diff -u -r1.367 -r1.368
--- kdelibs.spec	8 Dec 2008 01:12:23 -0000	1.367
+++ kdelibs.spec	7 Jan 2009 12:29:00 -0000	1.368
@@ -1,8 +1,8 @@
 %define _default_patch_fuzz 2
 
 Summary: K Desktop Environment 4 - Libraries
-Version: 4.1.3
-Release: 4%{?dist}
+Version: 4.1.4
+Release: 1%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs
@@ -19,7 +19,7 @@
 License: LGPLv2
 URL:     http://www.kde.org/
 Group:   System Environment/Libraries
-Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdelibs-%{version}.tar.bz2
+Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdelibs-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %ifarch noarch
@@ -368,6 +368,9 @@
 
 
 %changelog
+* Wed Jan  7 2009 Luk???? Tinkl <ltinkl at redhat.com> 4.1.4-1
+- KDE 4.1.4
+
 * Mon Dec 08 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.3-4
 - restore NTFS workaround which accidentally got dropped in the 4.1.3 update
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdelibs/F-9/sources,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- sources	4 Nov 2008 13:10:13 -0000	1.66
+++ sources	7 Jan 2009 12:29:00 -0000	1.67
@@ -1 +1 @@
-562090d3c1d891081bc4a392e0b513ac  kdelibs-4.1.3.tar.bz2
+ffdb0340a72aaf06a0b98f354c0c59ef  kdelibs-4.1.4.tar.bz2



From caolanm at fedoraproject.org  Wed Jan  7 12:51:54 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Wed,  7 Jan 2009 12:51:54 +0000 (UTC)
Subject: rpms/openoffice.org/devel
	openoffice.org-3.0.0.ooo91924.svx.consistentordering.patch, 1.2,
	1.3 openoffice.org.spec, 1.1746,
	1.1747 workspace.impressfontsize.patch, 1.3, 1.4
Message-ID: <20090107125154.EE26570100@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv832

Modified Files:
	openoffice.org.spec workspace.impressfontsize.patch 
Added Files:
	openoffice.org-3.0.0.ooo91924.svx.consistentordering.patch 
Log Message:
fixup

openoffice.org-3.0.0.ooo91924.svx.consistentordering.patch:

Index: openoffice.org-3.0.0.ooo91924.svx.consistentordering.patch
===================================================================
RCS file: openoffice.org-3.0.0.ooo91924.svx.consistentordering.patch
diff -N openoffice.org-3.0.0.ooo91924.svx.consistentordering.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openoffice.org-3.0.0.ooo91924.svx.consistentordering.patch	7 Jan 2009 12:51:24 -0000	1.3
@@ -0,0 +1,19 @@
+--- openoffice.org.orig/svx/source/dialog/optgdlg.cxx	2008-08-29 08:29:20.000000000 +0100
++++ openoffice.org/svx/source/dialog/optgdlg.cxx	2008-08-29 08:31:35.000000000 +0100
+@@ -795,11 +795,11 @@
+         switch( Application::GetSettings().GetStyleSettings().GetAutoSymbolsStyle() )
+         {
+             case STYLE_SYMBOLS_DEFAULT:     aAutoStr += aIconStyleLB.GetEntry( 1 ); break;
+-            case STYLE_SYMBOLS_INDUSTRIAL:  aAutoStr += aIconStyleLB.GetEntry( 2 ); break;
+-            case STYLE_SYMBOLS_CRYSTAL:     aAutoStr += aIconStyleLB.GetEntry( 3 ); break;
+-            case STYLE_SYMBOLS_TANGO:       aAutoStr += aIconStyleLB.GetEntry( 4 ); break;
+-            case STYLE_SYMBOLS_CLASSIC:     aAutoStr += aIconStyleLB.GetEntry( 5 ); break;
+-            case STYLE_SYMBOLS_HICONTRAST:  aAutoStr += aIconStyleLB.GetEntry( 6 ); break;
++            case STYLE_SYMBOLS_HICONTRAST:  aAutoStr += aIconStyleLB.GetEntry( 2 ); break;
++            case STYLE_SYMBOLS_INDUSTRIAL:  aAutoStr += aIconStyleLB.GetEntry( 3 ); break;
++            case STYLE_SYMBOLS_CRYSTAL:     aAutoStr += aIconStyleLB.GetEntry( 4 ); break;
++            case STYLE_SYMBOLS_TANGO:       aAutoStr += aIconStyleLB.GetEntry( 5 ); break;
++            case STYLE_SYMBOLS_CLASSIC:     aAutoStr += aIconStyleLB.GetEntry( 6 ); break;
+         }
+ 
+         aIconStyleLB.RemoveEntry( 0 );


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1746
retrieving revision 1.1747
diff -u -r1.1746 -r1.1747
--- openoffice.org.spec	7 Jan 2009 12:27:59 -0000	1.1746
+++ openoffice.org.spec	7 Jan 2009 12:51:24 -0000	1.1747
@@ -107,7 +107,7 @@
 Patch34: workspace.locales31.patch
 Patch35: workspace.fpicker8.patch
 Patch36: workspace.cmcfixes49.patch
-Patch37: workspace.impressfontsize.patch
+Patch37: openoffice.org-3.0.0.ooo91924.svx.consistentordering.patch
 Patch38: workspace.cmcfixes50.patch
 Patch39: openoffice.org-3.0.0.ooo93515.vcl.jrb-frames.patch
 Patch40: workspace.vcl94.patch
@@ -1386,7 +1386,7 @@
 %patch34 -p1 -b .workspace.locales31.patch
 %patch35 -p1 -b .workspace.fpicker8.patch
 %patch36 -p0 -b .workspace.cmcfixes49.patch
-%patch37 -p1 -b .workspace.impressfontsize.patch
+%patch37 -p1 -b .ooo91924.svx.consistentordering.patch
 %patch38 -p1 -b .workspace.cmcfixes50.patch
 %patch39 -p1 -b .ooo93515.vcl.jrb-frames.patch
 %patch40 -p1 -b .workspace.vcl94.patch

workspace.impressfontsize.patch:

Index: workspace.impressfontsize.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/workspace.impressfontsize.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- workspace.impressfontsize.patch	7 Jan 2009 12:27:59 -0000	1.3
+++ workspace.impressfontsize.patch	7 Jan 2009 12:51:24 -0000	1.4
@@ -1,19 +1,143 @@
---- openoffice.org.orig/svx/source/dialog/optgdlg.cxx	2008-08-29 08:29:20.000000000 +0100
-+++ openoffice.org/svx/source/dialog/optgdlg.cxx	2008-08-29 08:31:35.000000000 +0100
-@@ -795,11 +795,11 @@
-         switch( Application::GetSettings().GetStyleSettings().GetAutoSymbolsStyle() )
-         {
-             case STYLE_SYMBOLS_DEFAULT:     aAutoStr += aIconStyleLB.GetEntry( 1 ); break;
--            case STYLE_SYMBOLS_INDUSTRIAL:  aAutoStr += aIconStyleLB.GetEntry( 2 ); break;
--            case STYLE_SYMBOLS_CRYSTAL:     aAutoStr += aIconStyleLB.GetEntry( 3 ); break;
--            case STYLE_SYMBOLS_TANGO:       aAutoStr += aIconStyleLB.GetEntry( 4 ); break;
--            case STYLE_SYMBOLS_CLASSIC:     aAutoStr += aIconStyleLB.GetEntry( 5 ); break;
--            case STYLE_SYMBOLS_HICONTRAST:  aAutoStr += aIconStyleLB.GetEntry( 6 ); break;
-+            case STYLE_SYMBOLS_HICONTRAST:  aAutoStr += aIconStyleLB.GetEntry( 2 ); break;
-+            case STYLE_SYMBOLS_INDUSTRIAL:  aAutoStr += aIconStyleLB.GetEntry( 3 ); break;
-+            case STYLE_SYMBOLS_CRYSTAL:     aAutoStr += aIconStyleLB.GetEntry( 4 ); break;
-+            case STYLE_SYMBOLS_TANGO:       aAutoStr += aIconStyleLB.GetEntry( 5 ); break;
-+            case STYLE_SYMBOLS_CLASSIC:     aAutoStr += aIconStyleLB.GetEntry( 6 ); break;
-         }
+diff -ruN sd.orig/inc/pres.hxx sd/inc/pres.hxx
+--- openoffice.org.orig/sd/inc/pres.hxx	2006-12-12 17:23:42.000000000 +0100
++++ openoffice.org/sd/inc/pres.hxx	2007-07-24 14:27:46.000000000 +0200
+@@ -82,6 +82,7 @@
+ 	AUTOLAYOUT_TEXTOVEROBJ,
+ 	AUTOLAYOUT_4OBJ,
+ 	AUTOLAYOUT_ONLY_TITLE,
++	AUTOLAYOUT_ONLY_TEXT,
+ 	AUTOLAYOUT_NONE,
+ 	AUTOLAYOUT_NOTES,
+ 	AUTOLAYOUT_HANDOUT1,
+diff -ruN sd.orig/source/core/sdpage.cxx sd/source/core/sdpage.cxx
+--- openoffice.org.orig/sd/source/core/sdpage.cxx	2006-12-12 17:33:13.000000000 +0100
++++ openoffice.org/sd/source/core/sdpage.cxx	2007-07-26 14:53:24.000000000 +0200
+@@ -1244,6 +1244,7 @@
+ 		LayoutDescriptor( 6, PRESOBJ_TITLE, PRESOBJ_OBJECT, PRESOBJ_OBJECT,					// AUTOLAYOUT_4OBJ
+ 			PRESOBJ_OBJECT, PRESOBJ_OBJECT ),
+ 		LayoutDescriptor( 0, PRESOBJ_TITLE, PRESOBJ_NONE ),									// AUTOLAYOUT_ONLY_TITLE
++		LayoutDescriptor( 10, PRESOBJ_TITLE, PRESOBJ_NONE ),								// AUTOLAYOUT_ONLY_TEXT
+ 		LayoutDescriptor( 0, PRESOBJ_NONE ),												// AUTOLAYOUT_NONE
+ 		LayoutDescriptor( 0, PRESOBJ_PAGE, PRESOBJ_NOTES ),									// AUTOLAYOUT_NOTES
+ 		LayoutDescriptor( 0 ),																// AUTOLAYOUT_HANDOUT1
+@@ -1436,6 +1437,13 @@
+ 		rRectangle[1].SetSize( aSize );
+ 		break;
+ 	}
++	case 10: // onlytext
++	{
++		Size aSize( rRectangle[0].GetSize().Width(), rRectangle[1].BottomLeft().Y() - rRectangle[0].TopLeft().Y() );
++		rRectangle[0].SetSize( aSize );
++		rRectangle[0].SetPos( aTitlePos);
++		break;
++	}
+ 	}
+ }
  
-         aIconStyleLB.RemoveEntry( 0 );
+diff -ruN sd.orig/source/ui/app/res_bmp.src sd/source/ui/app/res_bmp.src
+--- openoffice.org.orig/sd/source/ui/app/res_bmp.src	2005-09-23 14:28:54.000000000 +0200
++++ openoffice.org/sd/source/ui/app/res_bmp.src	2007-07-27 14:55:46.000000000 +0200
+@@ -322,6 +322,14 @@
+ {
+ 	File = "foil24_h.bmp" ;
+ };
++Bitmap BMP_FOIL_25
++{
++	File = "foil25.bmp" ;
++};
++Bitmap BMP_FOIL_25_H
++{
++	File = "foil25_h.bmp" ;
++};
+ Bitmap BMP_FOILH_01
+ {
+ 	File = "foilh01.bmp" ;
+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
+@@ -177,6 +177,10 @@
+ {
+ 	Text [ en-US ] = "Title Only" ;
+ };
++String STR_AUTOLAYOUT_ONLY_TEXT
++{
++	Text [ en-US ] = "Centered Text" ;
++};
+ String STR_AUTOLAYOUT_TITLE
+ {
+ 	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
+@@ -111,6 +111,7 @@
+ #define BMP_FOIL_18 			RID_APP_START+28
+ #define BMP_FOIL_19 			RID_APP_START+29
+ #define BMP_FOIL_20 			RID_APP_START+30
++#define BMP_FOIL_25			RID_APP_START+41
+ #define BMP_FOILH_01			RID_APP_START+31
+ #define BMP_FOILH_02			RID_APP_START+32
+ #define BMP_FOILH_03			RID_APP_START+33
+@@ -289,6 +290,7 @@
+ #define BMP_FOIL_22_H 						RID_SD_START+204
+ #define BMP_FOIL_23_H 						RID_SD_START+205
+ #define BMP_FOIL_24_H 						RID_SD_START+206
++#define BMP_FOIL_25_H 						RID_SD_START+334
+ #define BMP_FOILH_01_H						RID_SD_START+207
+ #define BMP_FOILH_02_H						RID_SD_START+208
+ #define BMP_FOILH_03_H						RID_SD_START+209
+diff -ruN sd.orig/source/ui/inc/strings.hrc sd/source/ui/inc/strings.hrc
+--- openoffice.org.orig/sd/source/ui/inc/strings.hrc	2006-07-05 23:53:36.000000000 +0200
++++ openoffice.org/sd/source/ui/inc/strings.hrc	2007-07-27 15:13:52.000000000 +0200
+@@ -202,6 +202,7 @@
+ #define STR_AUTOLAYOUT_HANDOUT6 	(RID_APP_START+235)
+ #define STR_AUTOLAYOUT_NOTES		(RID_APP_START+236)
+ #define STR_AUTOLAYOUT_HANDOUT9		(RID_APP_START+237)
++#define STR_AUTOLAYOUT_ONLY_TEXT	(RID_APP_START+238)
+ 
+ #define STR_TRANSFORM				(RID_APP_START+240)
+ 
+diff -ruN sd.orig/source/ui/toolpanel/LayoutMenu.cxx sd/source/ui/toolpanel/LayoutMenu.cxx
+--- openoffice.org.orig/sd/source/ui/toolpanel/LayoutMenu.cxx	2006-12-12 19:40:07.000000000 +0100
++++ openoffice.org/sd/source/ui/toolpanel/LayoutMenu.cxx	2007-07-27 15:13:02.000000000 +0200
+@@ -185,6 +185,8 @@
+      AUTOLAYOUT_2TEXT},
+     {BMP_FOIL_19, BMP_FOIL_19_H, STR_AUTOLAYOUT_ONLY_TITLE, WritingMode_LR_TB,
+      AUTOLAYOUT_ONLY_TITLE},
++    {BMP_FOIL_25, BMP_FOIL_25_H, STR_AUTOLAYOUT_ONLY_TEXT, WritingMode_LR_TB,
++     AUTOLAYOUT_ONLY_TEXT},
+     {BMP_FOIL_11, BMP_FOIL_11_H, STR_AUTOLAYOUT_OBJ, WritingMode_LR_TB,
+      AUTOLAYOUT_OBJ},
+     {BMP_FOIL_02, BMP_FOIL_02_H, STR_AUTOLAYOUT_CHART, WritingMode_LR_TB,
+Index: source/token/tokens.txt
+===================================================================
+RCS file: /cvs/xml/oox/source/token/tokens.txt,v
+retrieving revision 1.2
+diff -u -r1.2 tokens.txt
+--- openoffice.org.orig/oox/source/token/tokens.txt	17 Jan 2008 08:06:07 -0000	1.2
++++ openoffice.org/oox/source/token/tokens.txt	10 Mar 2008 15:57:51 -0000
+@@ -2431,6 +2431,7 @@
+ handoutMasterId
+ handoutMasterIdLst
+ handoutView
++handouts
+ handouts1
+ handouts2
+ handouts3
+Index: source/ui/app/optsitem.cxx
+===================================================================
+RCS file: /cvs/graphics/sd/source/ui/app/optsitem.cxx,v
+retrieving revision 1.43
+diff -u -r1.43 optsitem.cxx
+--- openoffice.org.orig/sd/source/ui/app/optsitem.cxx	10 Apr 2008 19:25:45 -0000	1.43
++++ openoffice.org/sd/source/ui/app/optsitem.cxx	21 Jul 2008 09:50:19 -0000
+@@ -1584,8 +1584,8 @@
+ 		if( pValues[12].hasValue() ) SetNotes( *(sal_Bool*) pValues[ 12 ].getValue() ); 
+ 		if( pValues[13].hasValue() ) SetHandout( *(sal_Bool*) pValues[ 13 ].getValue() ); 
+ 		if( pValues[14].hasValue() ) SetOutline( *(sal_Bool*) pValues[ 14 ].getValue() ); 
+-		if( pValues[15].hasValue() ) SetHandoutHorizontal( *(sal_Bool*) pValues[12].getValue() );
+-		if( pValues[16].hasValue() ) SetHandoutPages( (UINT16)*(sal_Int32*) pValues[13].getValue() );
++		if( pValues[15].hasValue() ) SetHandoutHorizontal( *(sal_Bool*) pValues[15].getValue() );
++		if( pValues[16].hasValue() ) SetHandoutPages( (UINT16)*(sal_Int32*) pValues[16].getValue() );
+ 	}
+ 
+ 	return TRUE;



From pkgdb at fedoraproject.org  Wed Jan  7 12:59:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 07 Jan 2009 12:59:49 +0000
Subject: [pkgdb] sos: astokes has requested watchbugzilla
Message-ID: <20090107125949.6F037208319@bastion.fedora.phx.redhat.com>

astokes has requested the watchbugzilla acl on sos (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sos



From pkgdb at fedoraproject.org  Wed Jan  7 12:59:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 07 Jan 2009 12:59:54 +0000
Subject: [pkgdb] sos: astokes has given up watchbugzilla
Message-ID: <20090107125954.CBED620831D@bastion.fedora.phx.redhat.com>

astokes has given up the watchbugzilla acl on sos (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sos



From mzazrive at fedoraproject.org  Wed Jan  7 13:16:51 2009
From: mzazrive at fedoraproject.org (Milan Zazrivec)
Date: Wed,  7 Jan 2009 13:16:51 +0000 (UTC)
Subject: rpms/xqilla/F-9 xqilla.spec,1.9,1.10
Message-ID: <20090107131651.3F7B670100@cvs1.fedora.phx.redhat.com>

Author: mzazrive

Update of /cvs/pkgs/rpms/xqilla/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3490

Modified Files:
	xqilla.spec 
Log Message:
fixed package requirements again (bz #473574)


Index: xqilla.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xqilla/F-9/xqilla.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- xqilla.spec	7 Jan 2009 08:50:07 -0000	1.9
+++ xqilla.spec	7 Jan 2009 13:16:20 -0000	1.10
@@ -7,7 +7,7 @@
 Summary: XQilla is an XQuery and XPath 2.0 library, built on top of Xerces-C
 Group: System Environment/Libraries
 Version: 2.0.0
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: ASL 2.0
 URL: http://xqilla.sourceforge.net/HomePage
 # Original upstream source:
@@ -41,7 +41,7 @@
 %package devel
 Group: Development/Libraries
 Summary: XQilla is an XQuery and XPath 2.0 library, built on top of Xerces-C
-Requires: %{name} = %{version}-%{release} xerces-c-devel >= 2.7.0
+Requires: %{name} = %{version}-%{release} xerces-c-devel >= 2.8.0
 
 %description devel
 XQilla is an XQuery and XPath 2.0 implementation written in C++ and based
@@ -117,7 +117,7 @@
 %{_defaultdocdir}/%{name}-%{version}/simple-api
 
 %changelog
-* Wed Jan  7 2009 Milan Zazrivec <mzazrivec at redhat.com> 2.0.0-7
+* Wed Jan  7 2009 Milan Zazrivec <mzazrivec at redhat.com> 2.0.0-8
 - fixed package requirements (bz #473574)
 
 * Fri Aug 29 2008 Milan Zazrivec <mzazrivec at redhat.com 2.0.0-6



From mzazrive at fedoraproject.org  Wed Jan  7 13:19:39 2009
From: mzazrive at fedoraproject.org (Milan Zazrivec)
Date: Wed,  7 Jan 2009 13:19:39 +0000 (UTC)
Subject: rpms/xqilla/F-10 xqilla.spec,1.7,1.8
Message-ID: <20090107131940.0489D70100@cvs1.fedora.phx.redhat.com>

Author: mzazrive

Update of /cvs/pkgs/rpms/xqilla/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4103

Modified Files:
	xqilla.spec 
Log Message:
fixed requirements for xqilla-devel package


Index: xqilla.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xqilla/F-10/xqilla.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- xqilla.spec	29 Aug 2008 13:18:14 -0000	1.7
+++ xqilla.spec	7 Jan 2009 13:19:09 -0000	1.8
@@ -7,7 +7,7 @@
 Summary: XQilla is an XQuery and XPath 2.0 library, built on top of Xerces-C
 Group: System Environment/Libraries
 Version: 2.1.3
-Release: 0.2%{?dist}
+Release: 0.3%{?dist}
 License: ASL 2.0
 URL: http://xqilla.sourceforge.net/HomePage
 Source0: http://downloads.sourceforge.net/xqilla/XQilla-%{version}.tar.gz
@@ -34,7 +34,7 @@
 %package devel
 Group: Development/Libraries
 Summary: XQilla is an XQuery and XPath 2.0 library, built on top of Xerces-C
-Requires: %{name} = %{version}-%{release} xerces-c-devel >= 2.7.0
+Requires: %{name} = %{version}-%{release} xerces-c-devel >= 2.8.0
 
 %description devel
 XQilla is an XQuery and XPath 2.0 implementation written in C++ and based
@@ -107,6 +107,9 @@
 %{_defaultdocdir}/%{name}-%{version}/simple-api
 
 %changelog
+* Wed Jan  7 2009 Milan Zazrivec <mzazrivec at redhat.com 2.1.3-0.3
+- fixed requirements for xqilla-devel package
+
 * Fri Aug 29 2008 Milan Zazrivec <mzazrivec at redhat.com> 2.1.3-0.2
 - Rebased XQilla to latest upstream version 2.1.3
 - Fixed files section in spec (documentation was included twice)



From robert at fedoraproject.org  Wed Jan  7 13:22:09 2009
From: robert at fedoraproject.org (Robert Scheck)
Date: Wed,  7 Jan 2009 13:22:09 +0000 (UTC)
Subject: rpms/moon-buggy/EL-4 moon-buggy-1.0.51-pause.patch, NONE,
	1.1 moon-buggy-1.0.51-sound.patch, NONE,
	1.1 moon-buggy-sound.desktop, NONE, 1.1 moon-buggy.desktop, NONE,
	1.1 moon-buggy.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090107132209.994D370100@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/pkgs/rpms/moon-buggy/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4467/EL-4

Modified Files:
	.cvsignore sources 
Added Files:
	moon-buggy-1.0.51-pause.patch moon-buggy-1.0.51-sound.patch 
	moon-buggy-sound.desktop moon-buggy.desktop moon-buggy.spec 
Log Message:
Initial import of moon-buggy into Fedora and EPEL


moon-buggy-1.0.51-pause.patch:

--- NEW FILE moon-buggy-1.0.51-pause.patch ---
Patch by Robert Scheck <robert at fedoraproject.org> originally based on a patch by
Christian T. Steigies <cts at debian.org> for moon-buggy >= 1.0.51. This patch adds
the ability to pause moon-buggy without dying. But this "feature" will never get
accepted by upstream, as upstream maintainer thinks, that if you play moon-buggy
you just have to concentrate onto moon-buggy. And for further information, please
have a look to Debian bug ID #76430.

--- moon-buggy-1.0.51/game.c			2003-04-13 21:06:31.000000000 +0200
+++ moon-buggy-1.0.51/game.c.pause		2009-01-03 18:32:47.000000000 +0100
@@ -117,6 +117,15 @@
     print_message ("aborted at user's request");
     mode_change (crash_mode, 0);
     break;
+  case 4:
+    clock_freeze ();
+    wnoutrefresh (moon);
+    print_message ("PAUSED (press any key to continue)");
+    doupdate ();
+    wait_for_key ();
+    mode_redraw ();
+    clock_thaw ();
+    break;
   }
 }
 
@@ -214,6 +223,7 @@
   mode_add_key (game_mode, mbk_jump, "jump", 1);
   mode_add_key (game_mode, mbk_fire, "fire", 2);
   mode_add_key (game_mode, mbk_end, "abort game", 3);
+  mode_add_key (game_mode, mbk_pause, "pause", 4);
   mode_complete (game_mode);
 
   crash_mode = new_mode ();
--- moon-buggy-1.0.51/keyboard.c		2003-04-13 21:06:29.000000000 +0200
+++ moon-buggy-1.0.51/keyboard.c.pause		2009-01-03 18:33:34.000000000 +0100
@@ -124,6 +124,8 @@
 
   add_key ('s', mbk_scores, 100);
 
+  add_key ('p', mbk_pause, 100);
+
   add_key ('r', mbk_redraw, 20);
   add_key (12, mbk_redraw, 10);	/* \C-l */
 }
--- moon-buggy-1.0.51/moon-buggy.h		2003-04-13 21:07:04.000000000 +0200
+++ moon-buggy-1.0.51/moon-buggy.h.pause	2009-01-03 18:34:39.000000000 +0100
@@ -42,6 +42,7 @@
 
 extern  game_time  current_time (void);
 
+extern  void  wait_for_key (void);
 extern  void  clock_reset (void);
 extern  void  clock_thaw (void);
 extern  void  clear_queue (void);
@@ -149,8 +150,9 @@
   mbk_copyright = 1, mbk_down = 2, mbk_end = 4, mbk_fire = 8, mbk_first = 16,
   mbk_jump = 32, mbk_last = 64, mbk_pagedown = 128, mbk_pageup = 256,
   mbk_start = 512, mbk_up = 1024, mbk_warranty = 2048, mbk_scores = 4096,
+  mbk_pause = 8192,
   
-  mbk_redraw = 8192		/* specially handled in `mode_keypress' */
+  mbk_redraw = 16384		/* specially handled in `mode_keypress' */
 };
 struct binding {
   int  meanings;
--- moon-buggy-1.0.51/queue.c			2003-04-13 21:06:32.000000000 +0200
+++ moon-buggy-1.0.51/queue.c.pause		2009-01-03 18:35:09.000000000 +0100
@@ -120,7 +120,7 @@
   return  res;
 }
 
-static void
+void
 wait_for_key (void)
 {
   int  res;

moon-buggy-1.0.51-sound.patch:

--- NEW FILE moon-buggy-1.0.51-sound.patch ---
Patch by Robert Scheck <robert at fedoraproject.org> for moon-buggy >= 1.0.51, basing
on the original, but experimental, esound-based moon-buggy sound add-on patch of
the upstream maintainer Jochen Voss <voss at seehuhn.de>. Main differences are, that
the use of autoreconf is needed, because no direct patching of configure/Makefile
is done.

I also ensured, that moon-buggy still can be played without any sound, which isn't
possible with the upstream version of the patch. Upstream enforces, once the patch
is used, that a sound card is available on the machine moon-buggy is run. If you
would like to use moon-buggy with the esd sound add-on, add the parameter '-w' or
the long form '--with-sound' when calling the moon-buggy binary.

My suggestion was sent upstream - but I think, the esd sound add-on for moon-buggy
first needs to get implemented better before such an enhancement can be done on the
upstream side.

--- moon-buggy-1.0.51/Makefile.am		2004-12-27 16:34:32.000000000 +0100
+++ moon-buggy-1.0.51/Makefile.am.sound		2009-01-03 18:44:46.000000000 +0100
@@ -2,7 +2,9 @@
 # Copyright 1999, 2000, 2001  Jochen Voss
 # $Id: Makefile.am 6092 2004-12-27 15:34:32Z voss $
 
-EXTRA_DIST = manpage.in car.img \
+SOUND_FILES = jump.wav laser.wav crash.wav
+
+EXTRA_DIST = manpage.in car.img $(SOUND_FILES) README.sound \
 	text2c.sed img.sed ANNOUNCE moon-buggy.lsm \
 	moon-buggy.png moon-buggy.xpm title.eps
 DISTCLEANFILES = moon-buggy.6
@@ -14,8 +16,8 @@
 	game.c level.c ground.c buggy.c buggy.h laser.c meteor.c highscore.c \
 	realname.c queue.c vclock.c date.c persona.c signal.c keyboard.c \
 	terminal.c cursor.c random.c error.c xmalloc.c xstrdup.c darray.h \
-	hpath.c
-moon_buggy_LDADD = @CURSES_LIBS@
+	hpath.c sound.c
+moon_buggy_LDADD = @CURSES_LIBS@ @ESD_LIBS@
 
 info_TEXINFOS = moon-buggy.texi
 man_MANS = moon-buggy.6
@@ -24,6 +26,11 @@
 hpath.o: hpath.c moon-buggy.h Makefile
 	$(COMPILE) -DSCORE_DIR=\"$(scoredir)\" -c $<
 
+sounddir = @SOUND_DIR@
+sound_DATA = $(SOUND_FILES)
+sound.o: sound.c moon-buggy.h
+	$(COMPILE) -DSOUND_DIR=\"$(sounddir)\" @ESD_CFLAGS@ -c $<
+
 BUILT_SOURCES = copying.h buggy.h
 copying.h: COPYING text2c.sed
 	cd $(srcdir) && sed -f text2c.sed $(srcdir)/COPYING >$@
--- moon-buggy-1.0.51/buggy.c			2004-12-27 16:58:57.000000000 +0100
+++ moon-buggy-1.0.51/buggy.c.sound		2009-01-03 19:11:21.000000000 +0100
@@ -179,6 +179,9 @@
       state = sz_sit;
       start_wheel ();
       crash_detected = 1;
+      if (sound_flag == 1) {
+        play_sound (mev_CRASH);
+      }
     }
   }
   print_buggy ();
@@ -193,6 +196,9 @@
   assert (state->has_ground);
   remove_event (jump_handler);	/* only one jump at a time */
   add_event (t, jump_handler, sz_jump);
+  if (sound_flag == 1) {
+    play_sound (mev_JUMP);
+  }
 }
 
 int
@@ -215,6 +221,9 @@
     state = sz_crash;
     print_buggy ();
     start_wheel ();
+    if (sound_flag == 1) {
+      play_sound (mev_CRASH);
+    }
     return 1;
   }
   
@@ -232,6 +241,9 @@
     print_buggy ();
     start_wheel ();
     crash_detected = 1;
+    if (sound_flag == 1) {
+      play_sound (mev_CRASH);
+    }
     return 1;
   }
 
--- moon-buggy-1.0.51/configure.ac		2005-01-07 15:55:57.000000000 +0100
+++ moon-buggy-1.0.51/configure.ac.sound	2009-01-03 19:19:07.000000000 +0100
@@ -1,7 +1,7 @@
 dnl Process this file with autoconf to produce a configure script.
 AC_REVISION($Revision: 1.4 $)
 
-AC_INIT(moon-buggy, 1.0.51, voss at seehuhn.de)
+AC_INIT(moon-buggy, 1.0.51+esd, voss at seehuhn.de)
 AC_CONFIG_SRCDIR([moon-buggy.h])
 AM_INIT_AUTOMAKE
 AM_CONFIG_HEADER(config.h)
@@ -28,6 +28,9 @@
 
 dnl Checks for libraries.
 AC_CHECK_LIB(m, modf)
+PKG_CHECK_MODULES(ESD, esound)
+AC_SUBST(ESD_CFLAGS)
+AC_SUBST(ESD_LIBS)
 JV_CHECK_CURSES
 
 dnl Checks for header files.
@@ -63,5 +66,8 @@
 
 AM_CONDITIONAL(short_getopt, test "x$ac_cv_func_getopt_long" != xyes)
 
+SOUND_DIR='$(datadir)/moon-buggy/sounds/'
+AC_SUBST(SOUND_DIR)
+
 AC_CONFIG_FILES([Makefile])
 AC_OUTPUT
--- moon-buggy-1.0.51/laser.c			2003-04-13 21:06:31.000000000 +0200
+++ moon-buggy-1.0.51/laser.c.sound		2009-01-03 19:13:33.000000000 +0100
@@ -108,6 +108,9 @@
   DA_ADD (beam_table, struct beam *, b);
   add_event (t+TICK(0.25), beam_handler, b);
   adjust_score (-1);
+  if (sound_flag == 1) {
+    play_sound (mev_LASER);
+  }
 }
 
 void
--- moon-buggy-1.0.51/moon-buggy.h		2003-04-13 21:07:04.000000000 +0200
+++ moon-buggy-1.0.51/moon-buggy.h.sound	2009-01-03 19:14:25.000000000 +0100
@@ -28,6 +28,7 @@
 extern  WINDOW *moon, *status, *message;
 
 extern int  car_base;
+extern int  sound_flag;
 
 extern  void  print_message (const char *str);
 extern  void  print_hint (const char *str);
@@ -217,4 +218,8 @@
 /* from "hpath.c" */
 extern  const char *score_dir;
 
+/* from "sound.c" */
+enum event_type { mev_JUMP, mev_LASER, mev_CRASH };
+extern  void  play_sound (enum event_type type);
+
 #endif /* FILE_MOON_BUGGY_H_SEEN */
--- moon-buggy-1.0.51/moon-buggy.info		2005-01-07 15:59:15.000000000 +0100
+++ moon-buggy-1.0.51/moon-buggy.info.sound	2009-01-03 19:15:37.000000000 +0100
@@ -32,7 +32,7 @@
 dangerous craters there.  Fortunately your car can jump over them!
 
    This edition (last updated 27 December 2004) of the manual applies to
-version 1.0.51 of the program.
+version 1.0.51+esd of the program.
 
 * Menu:
 
--- moon-buggy-1.0.51/stamp-vti			2006-03-19 20:25:18.000000000 +0100
+++ moon-buggy-1.0.51/stamp-vti.sound		2009-01-03 19:15:52.000000000 +0100
@@ -1,4 +1,4 @@
 @set UPDATED 27 December 2004
 @set UPDATED-MONTH December 2004
- at set EDITION 1.0.51
- at set VERSION 1.0.51
+ at set EDITION 1.0.51+esd
+ at set VERSION 1.0.51+esd
--- moon-buggy-1.0.51/version.texi		2005-01-07 15:57:00.000000000 +0100
+++ moon-buggy-1.0.51/version.texi.sound	2009-01-03 19:16:07.000000000 +0100
@@ -1,4 +1,4 @@
 @set UPDATED 27 December 2004
 @set UPDATED-MONTH December 2004
- at set EDITION 1.0.51
- at set VERSION 1.0.51
+ at set EDITION 1.0.51+esd
+ at set VERSION 1.0.51+esd
--- moon-buggy-1.0.51/main.c			2006-03-19 20:24:14.000000000 +0100
+++ moon-buggy-1.0.51/main.c.sound.c		2009-01-03 19:06:56.000000000 +0100
@@ -30,6 +30,7 @@
 WINDOW *moon, *status, *message;
 
 int  car_base;
+int  sound_flag = 0;
 
 
 void
@@ -135,11 +136,12 @@
     { "mesg", no_argument, 0, 'm' },
     { "no-title", no_argument, 0, 'n' },
     { "show-scores", no_argument, 0, 's' },
+    { "with-sound", no_argument, 0, 'w' },
     { "version", no_argument, 0, 'V' },
     { NULL, 0, NULL, 0}
   };
 #endif
-#define MB_SHORT_OPTIONS "chmnsV"
+#define MB_SHORT_OPTIONS "chmnswV"
   int  help_flag = 0;
   int  highscore_flag = 0;
   int  title_flag = 1;
@@ -182,6 +184,9 @@
     case 's':
       highscore_flag = 1;
       break;
+    case 'w':
+      sound_flag = 1;
+      break;
     case 'V':
       version_flag = 1;
       break;
@@ -221,6 +226,8 @@
 	   out);
     fputs (OPT("-n","--no-title     ") "omit the title screen\n", out);
     fputs (OPT("-s","--show-scores  ") "only show the highscore list\n", out);
+    fputs (OPT("-w","--with-sound   ") "enable sound using esd feature\n",
+           out);
     fputs (OPT("-V","--version      ") "show the version number and exit\n\n",
 	   out);
     fputs ("Please report bugs to <voss at seehuhn.de>.\n", out);
--- moon-buggy-1.0.51/README			2004-12-27 16:51:24.000000000 +0100
+++ moon-buggy-1.0.51/README.sound		2009-01-03 20:02:52.000000000 +0100
@@ -18,6 +18,19 @@
 by the command 'moon-buggy -V'.
 
 
+SOUND FEATURE:
+
+   This version of moon-buggy includes the very experimental sound add-
+on using esd.  It can only be used in conjunction with moon-buggy in
+version 1.0.51.  As moon-buggy should be able to run on a simple VT100
+terminal, this add-on is not part of the main moon-buggy distribution.
+
+   In Fedora, the experimental sound add-on was added more lightweight
+than upstream wrote the original patch.  The parameter '-w' or the long
+form '--with-sound' can be appended when calling the moon-buggy binary.
+If no parameter is given, moon-buggy will run without any sounds.
+
+
 INSTALLATION:
 
    Moon-buggy requires the curses library as a prerequisite.  If
--- moon-buggy-1.0.51/manpage.in		2004-12-27 16:58:57.000000000 +0100
+++ moon-buggy-1.0.51/manpage.in.sound		2009-01-03 21:20:43.000000000 +0100
@@ -32,6 +32,9 @@
 .Op s show\-scores
 shows the current highscore list and exits.
 .TP
+.Op w with\-sound
+enables experimental sound add-on using esd.
+.TP
 .Op V version
 prints the program\'s version to standard output and exits.
 .SH KEYS


--- NEW FILE moon-buggy-sound.desktop ---
[Desktop Entry]
Categories=Game;ArcadeGame;
Name=moon-buggy (with sounds)
Type=Application
Terminal=true
Exec=moon-buggy --with-sound
Icon=moon-buggy
Comment=Drive and jump with some kind of car across the moon (enhanced with some sounds)
Encoding=UTF-8


--- NEW FILE moon-buggy.desktop ---
[Desktop Entry]
Categories=Game;ArcadeGame;
Name=moon-buggy
Type=Application
Terminal=true
Exec=moon-buggy
Icon=moon-buggy
Comment=Drive and jump with some kind of car across the moon
Encoding=UTF-8


--- NEW FILE moon-buggy.spec ---
# Enable oldstyle to have a nearly nothing requiring package after rebuilding
%define oldstyle 0

Summary:         Drive and jump with some kind of car across the moon
Name:            moon-buggy
Version:         1.0.51
Release:         2%{?dist}
License:         GPL+
Group:           Amusements/Games
URL:             http://seehuhn.de/pages/%{name}
Source0:         http://seehuhn.de/media/programs/%{name}-%{version}.tar.gz
Source1:         http://seehuhn.de/media/programs/%{name}-sound-%{version}.tar.gz
Source2:         %{name}.desktop
Source3:         %{name}-sound.desktop
Patch0:          moon-buggy-1.0.51-pause.patch
Patch1:          moon-buggy-1.0.51-sound.patch
Requires(post):  /sbin/install-info
Requires(preun): /sbin/install-info
BuildRequires:   ncurses-devel
%if !%{oldstyle}
BuildRequires:   esound-devel, desktop-file-utils, autoconf, automake
%endif
BuildRoot:       %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%description
Moon-buggy is a simple character graphics game where you drive some kind
of car across the moon's surface. Unfortunately there are dangerous craters
there. Fortunately your car can jump over them! 

The game has some resemblance of the classic arcade game moon-patrol which
was released in 1982. A clone of this game was relased for the Commodore
C64 in 1983. The present, ASCII art version of moon-buggy was written many
years later by Jochen Voss.

%prep
%setup -q -a 1
%patch0 -p1 -b .pause
%if !%{oldstyle}
%patch1 -p1 -b .sound
mv -f %{name}-%{version}/* .
autoreconf -f
%endif

%build
%configure --sharedstatedir=%{_localstatedir}/games
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" install

# Create zero-sized highscore file
touch $RPM_BUILD_ROOT%{_localstatedir}/games/%{name}/mbscore

# Install working *.desktop files and an icon
%if !%{oldstyle}
desktop-file-install --vendor "" --dir=$RPM_BUILD_ROOT%{_datadir}/applications %{SOURCE2}
desktop-file-install --vendor "" --dir=$RPM_BUILD_ROOT%{_datadir}/applications %{SOURCE3}

install -D -p -m 644 %{name}.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/%{name}.png
%endif

# Some file cleanups
rm -f $RPM_BUILD_ROOT%{_infodir}/dir

# Convert everything to UTF-8
iconv -f iso-8859-1 -t utf-8 -o ChangeLog.utf8 ChangeLog
sed -i 's|\r$||g' ChangeLog.utf8
touch -c -r ChangeLog ChangeLog.utf8
mv -f ChangeLog.utf8 ChangeLog

iconv -f iso-8859-1 -t utf-8 -o TODO.utf8 TODO
sed -i 's|\r$||g' TODO.utf8
touch -c -r TODO TODO.utf8
mv -f TODO.utf8 TODO

%post
/sbin/install-info %{_infodir}/%{name}.info.gz %{_infodir}/dir

%preun
if [ $1 = 0 ]; then
  /sbin/install-info --delete %{_infodir}/%{name}.info.gz %{_infodir}/dir || :
fi

%clean
rm -rf $RPM_BUILD_ROOT

%files 
%defattr(-,root,root,-)
%doc ANNOUNCE AUTHORS ChangeLog COPYING README THANKS
%if !%{oldstyle}
%doc README.sound
%{_datadir}/%{name}/
%{_datadir}/pixmaps/%{name}.png
%{_datadir}/applications/%{name}.desktop
%{_datadir}/applications/%{name}-sound.desktop
%endif
%attr(2755,root,games) %{_bindir}/%{name}
%{_mandir}/man6/%{name}.6*
%{_infodir}/%{name}.info.gz
%attr(0775,root,games) %{_localstatedir}/games/%{name}
%verify(not md5 size mtime) %config(noreplace) %attr(664,root,games) %{_localstatedir}/games/%{name}/mbscore

%changelog
* Sun Jan 04 2009 Robert Scheck <robert at fedoraproject.org> 1.0.51-2
- Avoid arbitrary modification of highscore file (#469585 #c25)

* Sat Jan 03 2009 Robert Scheck <robert at fedoraproject.org> 1.0.51-1
- Upgrade to 1.0.51
- Initial spec file for Fedora and Red Hat Enterprise Linux (based
  on a spec file of Simon Wesp <cassmodiah at fedoraproject.org>)


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/moon-buggy/EL-4/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	7 Jan 2009 01:16:24 -0000	1.1
+++ .cvsignore	7 Jan 2009 13:21:39 -0000	1.2
@@ -0,0 +1,2 @@
+moon-buggy-1.0.51.tar.gz
+moon-buggy-sound-1.0.51.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/moon-buggy/EL-4/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	7 Jan 2009 01:16:24 -0000	1.1
+++ sources	7 Jan 2009 13:21:39 -0000	1.2
@@ -0,0 +1,2 @@
+bfe23ef5cfa838ac261eee34ea5322f3  moon-buggy-1.0.51.tar.gz
+8a43b7c1baf583314e4cf0dde0ea9b85  moon-buggy-sound-1.0.51.tar.gz



From robert at fedoraproject.org  Wed Jan  7 13:22:09 2009
From: robert at fedoraproject.org (Robert Scheck)
Date: Wed,  7 Jan 2009 13:22:09 +0000 (UTC)
Subject: rpms/moon-buggy/EL-5 moon-buggy-1.0.51-pause.patch, NONE,
	1.1 moon-buggy-1.0.51-sound.patch, NONE,
	1.1 moon-buggy-sound.desktop, NONE, 1.1 moon-buggy.desktop, NONE,
	1.1 moon-buggy.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090107132209.C848770100@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/pkgs/rpms/moon-buggy/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4467/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	moon-buggy-1.0.51-pause.patch moon-buggy-1.0.51-sound.patch 
	moon-buggy-sound.desktop moon-buggy.desktop moon-buggy.spec 
Log Message:
Initial import of moon-buggy into Fedora and EPEL


moon-buggy-1.0.51-pause.patch:

--- NEW FILE moon-buggy-1.0.51-pause.patch ---
Patch by Robert Scheck <robert at fedoraproject.org> originally based on a patch by
Christian T. Steigies <cts at debian.org> for moon-buggy >= 1.0.51. This patch adds
the ability to pause moon-buggy without dying. But this "feature" will never get
accepted by upstream, as upstream maintainer thinks, that if you play moon-buggy
you just have to concentrate onto moon-buggy. And for further information, please
have a look to Debian bug ID #76430.

--- moon-buggy-1.0.51/game.c			2003-04-13 21:06:31.000000000 +0200
+++ moon-buggy-1.0.51/game.c.pause		2009-01-03 18:32:47.000000000 +0100
@@ -117,6 +117,15 @@
     print_message ("aborted at user's request");
     mode_change (crash_mode, 0);
     break;
+  case 4:
+    clock_freeze ();
+    wnoutrefresh (moon);
+    print_message ("PAUSED (press any key to continue)");
+    doupdate ();
+    wait_for_key ();
+    mode_redraw ();
+    clock_thaw ();
+    break;
   }
 }
 
@@ -214,6 +223,7 @@
   mode_add_key (game_mode, mbk_jump, "jump", 1);
   mode_add_key (game_mode, mbk_fire, "fire", 2);
   mode_add_key (game_mode, mbk_end, "abort game", 3);
+  mode_add_key (game_mode, mbk_pause, "pause", 4);
   mode_complete (game_mode);
 
   crash_mode = new_mode ();
--- moon-buggy-1.0.51/keyboard.c		2003-04-13 21:06:29.000000000 +0200
+++ moon-buggy-1.0.51/keyboard.c.pause		2009-01-03 18:33:34.000000000 +0100
@@ -124,6 +124,8 @@
 
   add_key ('s', mbk_scores, 100);
 
+  add_key ('p', mbk_pause, 100);
+
   add_key ('r', mbk_redraw, 20);
   add_key (12, mbk_redraw, 10);	/* \C-l */
 }
--- moon-buggy-1.0.51/moon-buggy.h		2003-04-13 21:07:04.000000000 +0200
+++ moon-buggy-1.0.51/moon-buggy.h.pause	2009-01-03 18:34:39.000000000 +0100
@@ -42,6 +42,7 @@
 
 extern  game_time  current_time (void);
 
+extern  void  wait_for_key (void);
 extern  void  clock_reset (void);
 extern  void  clock_thaw (void);
 extern  void  clear_queue (void);
@@ -149,8 +150,9 @@
   mbk_copyright = 1, mbk_down = 2, mbk_end = 4, mbk_fire = 8, mbk_first = 16,
   mbk_jump = 32, mbk_last = 64, mbk_pagedown = 128, mbk_pageup = 256,
   mbk_start = 512, mbk_up = 1024, mbk_warranty = 2048, mbk_scores = 4096,
+  mbk_pause = 8192,
   
-  mbk_redraw = 8192		/* specially handled in `mode_keypress' */
+  mbk_redraw = 16384		/* specially handled in `mode_keypress' */
 };
 struct binding {
   int  meanings;
--- moon-buggy-1.0.51/queue.c			2003-04-13 21:06:32.000000000 +0200
+++ moon-buggy-1.0.51/queue.c.pause		2009-01-03 18:35:09.000000000 +0100
@@ -120,7 +120,7 @@
   return  res;
 }
 
-static void
+void
 wait_for_key (void)
 {
   int  res;

moon-buggy-1.0.51-sound.patch:

--- NEW FILE moon-buggy-1.0.51-sound.patch ---
Patch by Robert Scheck <robert at fedoraproject.org> for moon-buggy >= 1.0.51, basing
on the original, but experimental, esound-based moon-buggy sound add-on patch of
the upstream maintainer Jochen Voss <voss at seehuhn.de>. Main differences are, that
the use of autoreconf is needed, because no direct patching of configure/Makefile
is done.

I also ensured, that moon-buggy still can be played without any sound, which isn't
possible with the upstream version of the patch. Upstream enforces, once the patch
is used, that a sound card is available on the machine moon-buggy is run. If you
would like to use moon-buggy with the esd sound add-on, add the parameter '-w' or
the long form '--with-sound' when calling the moon-buggy binary.

My suggestion was sent upstream - but I think, the esd sound add-on for moon-buggy
first needs to get implemented better before such an enhancement can be done on the
upstream side.

--- moon-buggy-1.0.51/Makefile.am		2004-12-27 16:34:32.000000000 +0100
+++ moon-buggy-1.0.51/Makefile.am.sound		2009-01-03 18:44:46.000000000 +0100
@@ -2,7 +2,9 @@
 # Copyright 1999, 2000, 2001  Jochen Voss
 # $Id: Makefile.am 6092 2004-12-27 15:34:32Z voss $
 
-EXTRA_DIST = manpage.in car.img \
+SOUND_FILES = jump.wav laser.wav crash.wav
+
+EXTRA_DIST = manpage.in car.img $(SOUND_FILES) README.sound \
 	text2c.sed img.sed ANNOUNCE moon-buggy.lsm \
 	moon-buggy.png moon-buggy.xpm title.eps
 DISTCLEANFILES = moon-buggy.6
@@ -14,8 +16,8 @@
 	game.c level.c ground.c buggy.c buggy.h laser.c meteor.c highscore.c \
 	realname.c queue.c vclock.c date.c persona.c signal.c keyboard.c \
 	terminal.c cursor.c random.c error.c xmalloc.c xstrdup.c darray.h \
-	hpath.c
-moon_buggy_LDADD = @CURSES_LIBS@
+	hpath.c sound.c
+moon_buggy_LDADD = @CURSES_LIBS@ @ESD_LIBS@
 
 info_TEXINFOS = moon-buggy.texi
 man_MANS = moon-buggy.6
@@ -24,6 +26,11 @@
 hpath.o: hpath.c moon-buggy.h Makefile
 	$(COMPILE) -DSCORE_DIR=\"$(scoredir)\" -c $<
 
+sounddir = @SOUND_DIR@
+sound_DATA = $(SOUND_FILES)
+sound.o: sound.c moon-buggy.h
+	$(COMPILE) -DSOUND_DIR=\"$(sounddir)\" @ESD_CFLAGS@ -c $<
+
 BUILT_SOURCES = copying.h buggy.h
 copying.h: COPYING text2c.sed
 	cd $(srcdir) && sed -f text2c.sed $(srcdir)/COPYING >$@
--- moon-buggy-1.0.51/buggy.c			2004-12-27 16:58:57.000000000 +0100
+++ moon-buggy-1.0.51/buggy.c.sound		2009-01-03 19:11:21.000000000 +0100
@@ -179,6 +179,9 @@
       state = sz_sit;
       start_wheel ();
       crash_detected = 1;
+      if (sound_flag == 1) {
+        play_sound (mev_CRASH);
+      }
     }
   }
   print_buggy ();
@@ -193,6 +196,9 @@
   assert (state->has_ground);
   remove_event (jump_handler);	/* only one jump at a time */
   add_event (t, jump_handler, sz_jump);
+  if (sound_flag == 1) {
+    play_sound (mev_JUMP);
+  }
 }
 
 int
@@ -215,6 +221,9 @@
     state = sz_crash;
     print_buggy ();
     start_wheel ();
+    if (sound_flag == 1) {
+      play_sound (mev_CRASH);
+    }
     return 1;
   }
   
@@ -232,6 +241,9 @@
     print_buggy ();
     start_wheel ();
     crash_detected = 1;
+    if (sound_flag == 1) {
+      play_sound (mev_CRASH);
+    }
     return 1;
   }
 
--- moon-buggy-1.0.51/configure.ac		2005-01-07 15:55:57.000000000 +0100
+++ moon-buggy-1.0.51/configure.ac.sound	2009-01-03 19:19:07.000000000 +0100
@@ -1,7 +1,7 @@
 dnl Process this file with autoconf to produce a configure script.
 AC_REVISION($Revision: 1.4 $)
 
-AC_INIT(moon-buggy, 1.0.51, voss at seehuhn.de)
+AC_INIT(moon-buggy, 1.0.51+esd, voss at seehuhn.de)
 AC_CONFIG_SRCDIR([moon-buggy.h])
 AM_INIT_AUTOMAKE
 AM_CONFIG_HEADER(config.h)
@@ -28,6 +28,9 @@
 
 dnl Checks for libraries.
 AC_CHECK_LIB(m, modf)
+PKG_CHECK_MODULES(ESD, esound)
+AC_SUBST(ESD_CFLAGS)
+AC_SUBST(ESD_LIBS)
 JV_CHECK_CURSES
 
 dnl Checks for header files.
@@ -63,5 +66,8 @@
 
 AM_CONDITIONAL(short_getopt, test "x$ac_cv_func_getopt_long" != xyes)
 
+SOUND_DIR='$(datadir)/moon-buggy/sounds/'
+AC_SUBST(SOUND_DIR)
+
 AC_CONFIG_FILES([Makefile])
 AC_OUTPUT
--- moon-buggy-1.0.51/laser.c			2003-04-13 21:06:31.000000000 +0200
+++ moon-buggy-1.0.51/laser.c.sound		2009-01-03 19:13:33.000000000 +0100
@@ -108,6 +108,9 @@
   DA_ADD (beam_table, struct beam *, b);
   add_event (t+TICK(0.25), beam_handler, b);
   adjust_score (-1);
+  if (sound_flag == 1) {
+    play_sound (mev_LASER);
+  }
 }
 
 void
--- moon-buggy-1.0.51/moon-buggy.h		2003-04-13 21:07:04.000000000 +0200
+++ moon-buggy-1.0.51/moon-buggy.h.sound	2009-01-03 19:14:25.000000000 +0100
@@ -28,6 +28,7 @@
 extern  WINDOW *moon, *status, *message;
 
 extern int  car_base;
+extern int  sound_flag;
 
 extern  void  print_message (const char *str);
 extern  void  print_hint (const char *str);
@@ -217,4 +218,8 @@
 /* from "hpath.c" */
 extern  const char *score_dir;
 
+/* from "sound.c" */
+enum event_type { mev_JUMP, mev_LASER, mev_CRASH };
+extern  void  play_sound (enum event_type type);
+
 #endif /* FILE_MOON_BUGGY_H_SEEN */
--- moon-buggy-1.0.51/moon-buggy.info		2005-01-07 15:59:15.000000000 +0100
+++ moon-buggy-1.0.51/moon-buggy.info.sound	2009-01-03 19:15:37.000000000 +0100
@@ -32,7 +32,7 @@
 dangerous craters there.  Fortunately your car can jump over them!
 
    This edition (last updated 27 December 2004) of the manual applies to
-version 1.0.51 of the program.
+version 1.0.51+esd of the program.
 
 * Menu:
 
--- moon-buggy-1.0.51/stamp-vti			2006-03-19 20:25:18.000000000 +0100
+++ moon-buggy-1.0.51/stamp-vti.sound		2009-01-03 19:15:52.000000000 +0100
@@ -1,4 +1,4 @@
 @set UPDATED 27 December 2004
 @set UPDATED-MONTH December 2004
- at set EDITION 1.0.51
- at set VERSION 1.0.51
+ at set EDITION 1.0.51+esd
+ at set VERSION 1.0.51+esd
--- moon-buggy-1.0.51/version.texi		2005-01-07 15:57:00.000000000 +0100
+++ moon-buggy-1.0.51/version.texi.sound	2009-01-03 19:16:07.000000000 +0100
@@ -1,4 +1,4 @@
 @set UPDATED 27 December 2004
 @set UPDATED-MONTH December 2004
- at set EDITION 1.0.51
- at set VERSION 1.0.51
+ at set EDITION 1.0.51+esd
+ at set VERSION 1.0.51+esd
--- moon-buggy-1.0.51/main.c			2006-03-19 20:24:14.000000000 +0100
+++ moon-buggy-1.0.51/main.c.sound.c		2009-01-03 19:06:56.000000000 +0100
@@ -30,6 +30,7 @@
 WINDOW *moon, *status, *message;
 
 int  car_base;
+int  sound_flag = 0;
 
 
 void
@@ -135,11 +136,12 @@
     { "mesg", no_argument, 0, 'm' },
     { "no-title", no_argument, 0, 'n' },
     { "show-scores", no_argument, 0, 's' },
+    { "with-sound", no_argument, 0, 'w' },
     { "version", no_argument, 0, 'V' },
     { NULL, 0, NULL, 0}
   };
 #endif
-#define MB_SHORT_OPTIONS "chmnsV"
+#define MB_SHORT_OPTIONS "chmnswV"
   int  help_flag = 0;
   int  highscore_flag = 0;
   int  title_flag = 1;
@@ -182,6 +184,9 @@
     case 's':
       highscore_flag = 1;
       break;
+    case 'w':
+      sound_flag = 1;
+      break;
     case 'V':
       version_flag = 1;
       break;
@@ -221,6 +226,8 @@
 	   out);
     fputs (OPT("-n","--no-title     ") "omit the title screen\n", out);
     fputs (OPT("-s","--show-scores  ") "only show the highscore list\n", out);
+    fputs (OPT("-w","--with-sound   ") "enable sound using esd feature\n",
+           out);
     fputs (OPT("-V","--version      ") "show the version number and exit\n\n",
 	   out);
     fputs ("Please report bugs to <voss at seehuhn.de>.\n", out);
--- moon-buggy-1.0.51/README			2004-12-27 16:51:24.000000000 +0100
+++ moon-buggy-1.0.51/README.sound		2009-01-03 20:02:52.000000000 +0100
@@ -18,6 +18,19 @@
 by the command 'moon-buggy -V'.
 
 
+SOUND FEATURE:
+
+   This version of moon-buggy includes the very experimental sound add-
+on using esd.  It can only be used in conjunction with moon-buggy in
+version 1.0.51.  As moon-buggy should be able to run on a simple VT100
+terminal, this add-on is not part of the main moon-buggy distribution.
+
+   In Fedora, the experimental sound add-on was added more lightweight
+than upstream wrote the original patch.  The parameter '-w' or the long
+form '--with-sound' can be appended when calling the moon-buggy binary.
+If no parameter is given, moon-buggy will run without any sounds.
+
+
 INSTALLATION:
 
    Moon-buggy requires the curses library as a prerequisite.  If
--- moon-buggy-1.0.51/manpage.in		2004-12-27 16:58:57.000000000 +0100
+++ moon-buggy-1.0.51/manpage.in.sound		2009-01-03 21:20:43.000000000 +0100
@@ -32,6 +32,9 @@
 .Op s show\-scores
 shows the current highscore list and exits.
 .TP
+.Op w with\-sound
+enables experimental sound add-on using esd.
+.TP
 .Op V version
 prints the program\'s version to standard output and exits.
 .SH KEYS


--- NEW FILE moon-buggy-sound.desktop ---
[Desktop Entry]
Categories=Game;ArcadeGame;
Name=moon-buggy (with sounds)
Type=Application
Terminal=true
Exec=moon-buggy --with-sound
Icon=moon-buggy
Comment=Drive and jump with some kind of car across the moon (enhanced with some sounds)
Encoding=UTF-8


--- NEW FILE moon-buggy.desktop ---
[Desktop Entry]
Categories=Game;ArcadeGame;
Name=moon-buggy
Type=Application
Terminal=true
Exec=moon-buggy
Icon=moon-buggy
Comment=Drive and jump with some kind of car across the moon
Encoding=UTF-8


--- NEW FILE moon-buggy.spec ---
# Enable oldstyle to have a nearly nothing requiring package after rebuilding
%define oldstyle 0

Summary:         Drive and jump with some kind of car across the moon
Name:            moon-buggy
Version:         1.0.51
Release:         2%{?dist}
License:         GPL+
Group:           Amusements/Games
URL:             http://seehuhn.de/pages/%{name}
Source0:         http://seehuhn.de/media/programs/%{name}-%{version}.tar.gz
Source1:         http://seehuhn.de/media/programs/%{name}-sound-%{version}.tar.gz
Source2:         %{name}.desktop
Source3:         %{name}-sound.desktop
Patch0:          moon-buggy-1.0.51-pause.patch
Patch1:          moon-buggy-1.0.51-sound.patch
Requires(post):  /sbin/install-info
Requires(preun): /sbin/install-info
BuildRequires:   ncurses-devel
%if !%{oldstyle}
BuildRequires:   esound-devel, desktop-file-utils, autoconf, automake
%endif
BuildRoot:       %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%description
Moon-buggy is a simple character graphics game where you drive some kind
of car across the moon's surface. Unfortunately there are dangerous craters
there. Fortunately your car can jump over them! 

The game has some resemblance of the classic arcade game moon-patrol which
was released in 1982. A clone of this game was relased for the Commodore
C64 in 1983. The present, ASCII art version of moon-buggy was written many
years later by Jochen Voss.

%prep
%setup -q -a 1
%patch0 -p1 -b .pause
%if !%{oldstyle}
%patch1 -p1 -b .sound
mv -f %{name}-%{version}/* .
autoreconf -f
%endif

%build
%configure --sharedstatedir=%{_localstatedir}/games
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" install

# Create zero-sized highscore file
touch $RPM_BUILD_ROOT%{_localstatedir}/games/%{name}/mbscore

# Install working *.desktop files and an icon
%if !%{oldstyle}
desktop-file-install --vendor "" --dir=$RPM_BUILD_ROOT%{_datadir}/applications %{SOURCE2}
desktop-file-install --vendor "" --dir=$RPM_BUILD_ROOT%{_datadir}/applications %{SOURCE3}

install -D -p -m 644 %{name}.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/%{name}.png
%endif

# Some file cleanups
rm -f $RPM_BUILD_ROOT%{_infodir}/dir

# Convert everything to UTF-8
iconv -f iso-8859-1 -t utf-8 -o ChangeLog.utf8 ChangeLog
sed -i 's|\r$||g' ChangeLog.utf8
touch -c -r ChangeLog ChangeLog.utf8
mv -f ChangeLog.utf8 ChangeLog

iconv -f iso-8859-1 -t utf-8 -o TODO.utf8 TODO
sed -i 's|\r$||g' TODO.utf8
touch -c -r TODO TODO.utf8
mv -f TODO.utf8 TODO

%post
/sbin/install-info %{_infodir}/%{name}.info.gz %{_infodir}/dir

%preun
if [ $1 = 0 ]; then
  /sbin/install-info --delete %{_infodir}/%{name}.info.gz %{_infodir}/dir || :
fi

%clean
rm -rf $RPM_BUILD_ROOT

%files 
%defattr(-,root,root,-)
%doc ANNOUNCE AUTHORS ChangeLog COPYING README THANKS
%if !%{oldstyle}
%doc README.sound
%{_datadir}/%{name}/
%{_datadir}/pixmaps/%{name}.png
%{_datadir}/applications/%{name}.desktop
%{_datadir}/applications/%{name}-sound.desktop
%endif
%attr(2755,root,games) %{_bindir}/%{name}
%{_mandir}/man6/%{name}.6*
%{_infodir}/%{name}.info.gz
%attr(0775,root,games) %{_localstatedir}/games/%{name}
%verify(not md5 size mtime) %config(noreplace) %attr(664,root,games) %{_localstatedir}/games/%{name}/mbscore

%changelog
* Sun Jan 04 2009 Robert Scheck <robert at fedoraproject.org> 1.0.51-2
- Avoid arbitrary modification of highscore file (#469585 #c25)

* Sat Jan 03 2009 Robert Scheck <robert at fedoraproject.org> 1.0.51-1
- Upgrade to 1.0.51
- Initial spec file for Fedora and Red Hat Enterprise Linux (based
  on a spec file of Simon Wesp <cassmodiah at fedoraproject.org>)


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/moon-buggy/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	7 Jan 2009 01:16:24 -0000	1.1
+++ .cvsignore	7 Jan 2009 13:21:39 -0000	1.2
@@ -0,0 +1,2 @@
+moon-buggy-1.0.51.tar.gz
+moon-buggy-sound-1.0.51.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/moon-buggy/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	7 Jan 2009 01:16:24 -0000	1.1
+++ sources	7 Jan 2009 13:21:39 -0000	1.2
@@ -0,0 +1,2 @@
+bfe23ef5cfa838ac261eee34ea5322f3  moon-buggy-1.0.51.tar.gz
+8a43b7c1baf583314e4cf0dde0ea9b85  moon-buggy-sound-1.0.51.tar.gz



From robert at fedoraproject.org  Wed Jan  7 13:22:10 2009
From: robert at fedoraproject.org (Robert Scheck)
Date: Wed,  7 Jan 2009 13:22:10 +0000 (UTC)
Subject: rpms/moon-buggy/F-9 moon-buggy-1.0.51-pause.patch, NONE,
	1.1 moon-buggy-1.0.51-sound.patch, NONE,
	1.1 moon-buggy-sound.desktop, NONE, 1.1 moon-buggy.desktop, NONE,
	1.1 moon-buggy.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090107132210.6056B70100@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/pkgs/rpms/moon-buggy/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4467/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	moon-buggy-1.0.51-pause.patch moon-buggy-1.0.51-sound.patch 
	moon-buggy-sound.desktop moon-buggy.desktop moon-buggy.spec 
Log Message:
Initial import of moon-buggy into Fedora and EPEL


moon-buggy-1.0.51-pause.patch:

--- NEW FILE moon-buggy-1.0.51-pause.patch ---
Patch by Robert Scheck <robert at fedoraproject.org> originally based on a patch by
Christian T. Steigies <cts at debian.org> for moon-buggy >= 1.0.51. This patch adds
the ability to pause moon-buggy without dying. But this "feature" will never get
accepted by upstream, as upstream maintainer thinks, that if you play moon-buggy
you just have to concentrate onto moon-buggy. And for further information, please
have a look to Debian bug ID #76430.

--- moon-buggy-1.0.51/game.c			2003-04-13 21:06:31.000000000 +0200
+++ moon-buggy-1.0.51/game.c.pause		2009-01-03 18:32:47.000000000 +0100
@@ -117,6 +117,15 @@
     print_message ("aborted at user's request");
     mode_change (crash_mode, 0);
     break;
+  case 4:
+    clock_freeze ();
+    wnoutrefresh (moon);
+    print_message ("PAUSED (press any key to continue)");
+    doupdate ();
+    wait_for_key ();
+    mode_redraw ();
+    clock_thaw ();
+    break;
   }
 }
 
@@ -214,6 +223,7 @@
   mode_add_key (game_mode, mbk_jump, "jump", 1);
   mode_add_key (game_mode, mbk_fire, "fire", 2);
   mode_add_key (game_mode, mbk_end, "abort game", 3);
+  mode_add_key (game_mode, mbk_pause, "pause", 4);
   mode_complete (game_mode);
 
   crash_mode = new_mode ();
--- moon-buggy-1.0.51/keyboard.c		2003-04-13 21:06:29.000000000 +0200
+++ moon-buggy-1.0.51/keyboard.c.pause		2009-01-03 18:33:34.000000000 +0100
@@ -124,6 +124,8 @@
 
   add_key ('s', mbk_scores, 100);
 
+  add_key ('p', mbk_pause, 100);
+
   add_key ('r', mbk_redraw, 20);
   add_key (12, mbk_redraw, 10);	/* \C-l */
 }
--- moon-buggy-1.0.51/moon-buggy.h		2003-04-13 21:07:04.000000000 +0200
+++ moon-buggy-1.0.51/moon-buggy.h.pause	2009-01-03 18:34:39.000000000 +0100
@@ -42,6 +42,7 @@
 
 extern  game_time  current_time (void);
 
+extern  void  wait_for_key (void);
 extern  void  clock_reset (void);
 extern  void  clock_thaw (void);
 extern  void  clear_queue (void);
@@ -149,8 +150,9 @@
   mbk_copyright = 1, mbk_down = 2, mbk_end = 4, mbk_fire = 8, mbk_first = 16,
   mbk_jump = 32, mbk_last = 64, mbk_pagedown = 128, mbk_pageup = 256,
   mbk_start = 512, mbk_up = 1024, mbk_warranty = 2048, mbk_scores = 4096,
+  mbk_pause = 8192,
   
-  mbk_redraw = 8192		/* specially handled in `mode_keypress' */
+  mbk_redraw = 16384		/* specially handled in `mode_keypress' */
 };
 struct binding {
   int  meanings;
--- moon-buggy-1.0.51/queue.c			2003-04-13 21:06:32.000000000 +0200
+++ moon-buggy-1.0.51/queue.c.pause		2009-01-03 18:35:09.000000000 +0100
@@ -120,7 +120,7 @@
   return  res;
 }
 
-static void
+void
 wait_for_key (void)
 {
   int  res;

moon-buggy-1.0.51-sound.patch:

--- NEW FILE moon-buggy-1.0.51-sound.patch ---
Patch by Robert Scheck <robert at fedoraproject.org> for moon-buggy >= 1.0.51, basing
on the original, but experimental, esound-based moon-buggy sound add-on patch of
the upstream maintainer Jochen Voss <voss at seehuhn.de>. Main differences are, that
the use of autoreconf is needed, because no direct patching of configure/Makefile
is done.

I also ensured, that moon-buggy still can be played without any sound, which isn't
possible with the upstream version of the patch. Upstream enforces, once the patch
is used, that a sound card is available on the machine moon-buggy is run. If you
would like to use moon-buggy with the esd sound add-on, add the parameter '-w' or
the long form '--with-sound' when calling the moon-buggy binary.

My suggestion was sent upstream - but I think, the esd sound add-on for moon-buggy
first needs to get implemented better before such an enhancement can be done on the
upstream side.

--- moon-buggy-1.0.51/Makefile.am		2004-12-27 16:34:32.000000000 +0100
+++ moon-buggy-1.0.51/Makefile.am.sound		2009-01-03 18:44:46.000000000 +0100
@@ -2,7 +2,9 @@
 # Copyright 1999, 2000, 2001  Jochen Voss
 # $Id: Makefile.am 6092 2004-12-27 15:34:32Z voss $
 
-EXTRA_DIST = manpage.in car.img \
+SOUND_FILES = jump.wav laser.wav crash.wav
+
+EXTRA_DIST = manpage.in car.img $(SOUND_FILES) README.sound \
 	text2c.sed img.sed ANNOUNCE moon-buggy.lsm \
 	moon-buggy.png moon-buggy.xpm title.eps
 DISTCLEANFILES = moon-buggy.6
@@ -14,8 +16,8 @@
 	game.c level.c ground.c buggy.c buggy.h laser.c meteor.c highscore.c \
 	realname.c queue.c vclock.c date.c persona.c signal.c keyboard.c \
 	terminal.c cursor.c random.c error.c xmalloc.c xstrdup.c darray.h \
-	hpath.c
-moon_buggy_LDADD = @CURSES_LIBS@
+	hpath.c sound.c
+moon_buggy_LDADD = @CURSES_LIBS@ @ESD_LIBS@
 
 info_TEXINFOS = moon-buggy.texi
 man_MANS = moon-buggy.6
@@ -24,6 +26,11 @@
 hpath.o: hpath.c moon-buggy.h Makefile
 	$(COMPILE) -DSCORE_DIR=\"$(scoredir)\" -c $<
 
+sounddir = @SOUND_DIR@
+sound_DATA = $(SOUND_FILES)
+sound.o: sound.c moon-buggy.h
+	$(COMPILE) -DSOUND_DIR=\"$(sounddir)\" @ESD_CFLAGS@ -c $<
+
 BUILT_SOURCES = copying.h buggy.h
 copying.h: COPYING text2c.sed
 	cd $(srcdir) && sed -f text2c.sed $(srcdir)/COPYING >$@
--- moon-buggy-1.0.51/buggy.c			2004-12-27 16:58:57.000000000 +0100
+++ moon-buggy-1.0.51/buggy.c.sound		2009-01-03 19:11:21.000000000 +0100
@@ -179,6 +179,9 @@
       state = sz_sit;
       start_wheel ();
       crash_detected = 1;
+      if (sound_flag == 1) {
+        play_sound (mev_CRASH);
+      }
     }
   }
   print_buggy ();
@@ -193,6 +196,9 @@
   assert (state->has_ground);
   remove_event (jump_handler);	/* only one jump at a time */
   add_event (t, jump_handler, sz_jump);
+  if (sound_flag == 1) {
+    play_sound (mev_JUMP);
+  }
 }
 
 int
@@ -215,6 +221,9 @@
     state = sz_crash;
     print_buggy ();
     start_wheel ();
+    if (sound_flag == 1) {
+      play_sound (mev_CRASH);
+    }
     return 1;
   }
   
@@ -232,6 +241,9 @@
     print_buggy ();
     start_wheel ();
     crash_detected = 1;
+    if (sound_flag == 1) {
+      play_sound (mev_CRASH);
+    }
     return 1;
   }
 
--- moon-buggy-1.0.51/configure.ac		2005-01-07 15:55:57.000000000 +0100
+++ moon-buggy-1.0.51/configure.ac.sound	2009-01-03 19:19:07.000000000 +0100
@@ -1,7 +1,7 @@
 dnl Process this file with autoconf to produce a configure script.
 AC_REVISION($Revision: 1.4 $)
 
-AC_INIT(moon-buggy, 1.0.51, voss at seehuhn.de)
+AC_INIT(moon-buggy, 1.0.51+esd, voss at seehuhn.de)
 AC_CONFIG_SRCDIR([moon-buggy.h])
 AM_INIT_AUTOMAKE
 AM_CONFIG_HEADER(config.h)
@@ -28,6 +28,9 @@
 
 dnl Checks for libraries.
 AC_CHECK_LIB(m, modf)
+PKG_CHECK_MODULES(ESD, esound)
+AC_SUBST(ESD_CFLAGS)
+AC_SUBST(ESD_LIBS)
 JV_CHECK_CURSES
 
 dnl Checks for header files.
@@ -63,5 +66,8 @@
 
 AM_CONDITIONAL(short_getopt, test "x$ac_cv_func_getopt_long" != xyes)
 
+SOUND_DIR='$(datadir)/moon-buggy/sounds/'
+AC_SUBST(SOUND_DIR)
+
 AC_CONFIG_FILES([Makefile])
 AC_OUTPUT
--- moon-buggy-1.0.51/laser.c			2003-04-13 21:06:31.000000000 +0200
+++ moon-buggy-1.0.51/laser.c.sound		2009-01-03 19:13:33.000000000 +0100
@@ -108,6 +108,9 @@
   DA_ADD (beam_table, struct beam *, b);
   add_event (t+TICK(0.25), beam_handler, b);
   adjust_score (-1);
+  if (sound_flag == 1) {
+    play_sound (mev_LASER);
+  }
 }
 
 void
--- moon-buggy-1.0.51/moon-buggy.h		2003-04-13 21:07:04.000000000 +0200
+++ moon-buggy-1.0.51/moon-buggy.h.sound	2009-01-03 19:14:25.000000000 +0100
@@ -28,6 +28,7 @@
 extern  WINDOW *moon, *status, *message;
 
 extern int  car_base;
+extern int  sound_flag;
 
 extern  void  print_message (const char *str);
 extern  void  print_hint (const char *str);
@@ -217,4 +218,8 @@
 /* from "hpath.c" */
 extern  const char *score_dir;
 
+/* from "sound.c" */
+enum event_type { mev_JUMP, mev_LASER, mev_CRASH };
+extern  void  play_sound (enum event_type type);
+
 #endif /* FILE_MOON_BUGGY_H_SEEN */
--- moon-buggy-1.0.51/moon-buggy.info		2005-01-07 15:59:15.000000000 +0100
+++ moon-buggy-1.0.51/moon-buggy.info.sound	2009-01-03 19:15:37.000000000 +0100
@@ -32,7 +32,7 @@
 dangerous craters there.  Fortunately your car can jump over them!
 
    This edition (last updated 27 December 2004) of the manual applies to
-version 1.0.51 of the program.
+version 1.0.51+esd of the program.
 
 * Menu:
 
--- moon-buggy-1.0.51/stamp-vti			2006-03-19 20:25:18.000000000 +0100
+++ moon-buggy-1.0.51/stamp-vti.sound		2009-01-03 19:15:52.000000000 +0100
@@ -1,4 +1,4 @@
 @set UPDATED 27 December 2004
 @set UPDATED-MONTH December 2004
- at set EDITION 1.0.51
- at set VERSION 1.0.51
+ at set EDITION 1.0.51+esd
+ at set VERSION 1.0.51+esd
--- moon-buggy-1.0.51/version.texi		2005-01-07 15:57:00.000000000 +0100
+++ moon-buggy-1.0.51/version.texi.sound	2009-01-03 19:16:07.000000000 +0100
@@ -1,4 +1,4 @@
 @set UPDATED 27 December 2004
 @set UPDATED-MONTH December 2004
- at set EDITION 1.0.51
- at set VERSION 1.0.51
+ at set EDITION 1.0.51+esd
+ at set VERSION 1.0.51+esd
--- moon-buggy-1.0.51/main.c			2006-03-19 20:24:14.000000000 +0100
+++ moon-buggy-1.0.51/main.c.sound.c		2009-01-03 19:06:56.000000000 +0100
@@ -30,6 +30,7 @@
 WINDOW *moon, *status, *message;
 
 int  car_base;
+int  sound_flag = 0;
 
 
 void
@@ -135,11 +136,12 @@
     { "mesg", no_argument, 0, 'm' },
     { "no-title", no_argument, 0, 'n' },
     { "show-scores", no_argument, 0, 's' },
+    { "with-sound", no_argument, 0, 'w' },
     { "version", no_argument, 0, 'V' },
     { NULL, 0, NULL, 0}
   };
 #endif
-#define MB_SHORT_OPTIONS "chmnsV"
+#define MB_SHORT_OPTIONS "chmnswV"
   int  help_flag = 0;
   int  highscore_flag = 0;
   int  title_flag = 1;
@@ -182,6 +184,9 @@
     case 's':
       highscore_flag = 1;
       break;
+    case 'w':
+      sound_flag = 1;
+      break;
     case 'V':
       version_flag = 1;
       break;
@@ -221,6 +226,8 @@
 	   out);
     fputs (OPT("-n","--no-title     ") "omit the title screen\n", out);
     fputs (OPT("-s","--show-scores  ") "only show the highscore list\n", out);
+    fputs (OPT("-w","--with-sound   ") "enable sound using esd feature\n",
+           out);
     fputs (OPT("-V","--version      ") "show the version number and exit\n\n",
 	   out);
     fputs ("Please report bugs to <voss at seehuhn.de>.\n", out);
--- moon-buggy-1.0.51/README			2004-12-27 16:51:24.000000000 +0100
+++ moon-buggy-1.0.51/README.sound		2009-01-03 20:02:52.000000000 +0100
@@ -18,6 +18,19 @@
 by the command 'moon-buggy -V'.
 
 
+SOUND FEATURE:
+
+   This version of moon-buggy includes the very experimental sound add-
+on using esd.  It can only be used in conjunction with moon-buggy in
+version 1.0.51.  As moon-buggy should be able to run on a simple VT100
+terminal, this add-on is not part of the main moon-buggy distribution.
+
+   In Fedora, the experimental sound add-on was added more lightweight
+than upstream wrote the original patch.  The parameter '-w' or the long
+form '--with-sound' can be appended when calling the moon-buggy binary.
+If no parameter is given, moon-buggy will run without any sounds.
+
+
 INSTALLATION:
 
    Moon-buggy requires the curses library as a prerequisite.  If
--- moon-buggy-1.0.51/manpage.in		2004-12-27 16:58:57.000000000 +0100
+++ moon-buggy-1.0.51/manpage.in.sound		2009-01-03 21:20:43.000000000 +0100
@@ -32,6 +32,9 @@
 .Op s show\-scores
 shows the current highscore list and exits.
 .TP
+.Op w with\-sound
+enables experimental sound add-on using esd.
+.TP
 .Op V version
 prints the program\'s version to standard output and exits.
 .SH KEYS


--- NEW FILE moon-buggy-sound.desktop ---
[Desktop Entry]
Categories=Game;ArcadeGame;
Name=moon-buggy (with sounds)
Type=Application
Terminal=true
Exec=moon-buggy --with-sound
Icon=moon-buggy
Comment=Drive and jump with some kind of car across the moon (enhanced with some sounds)
Encoding=UTF-8


--- NEW FILE moon-buggy.desktop ---
[Desktop Entry]
Categories=Game;ArcadeGame;
Name=moon-buggy
Type=Application
Terminal=true
Exec=moon-buggy
Icon=moon-buggy
Comment=Drive and jump with some kind of car across the moon
Encoding=UTF-8


--- NEW FILE moon-buggy.spec ---
# Enable oldstyle to have a nearly nothing requiring package after rebuilding
%define oldstyle 0

Summary:         Drive and jump with some kind of car across the moon
Name:            moon-buggy
Version:         1.0.51
Release:         2%{?dist}
License:         GPL+
Group:           Amusements/Games
URL:             http://seehuhn.de/pages/%{name}
Source0:         http://seehuhn.de/media/programs/%{name}-%{version}.tar.gz
Source1:         http://seehuhn.de/media/programs/%{name}-sound-%{version}.tar.gz
Source2:         %{name}.desktop
Source3:         %{name}-sound.desktop
Patch0:          moon-buggy-1.0.51-pause.patch
Patch1:          moon-buggy-1.0.51-sound.patch
Requires(post):  /sbin/install-info
Requires(preun): /sbin/install-info
BuildRequires:   ncurses-devel
%if !%{oldstyle}
BuildRequires:   esound-devel, desktop-file-utils, autoconf, automake
%endif
BuildRoot:       %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%description
Moon-buggy is a simple character graphics game where you drive some kind
of car across the moon's surface. Unfortunately there are dangerous craters
there. Fortunately your car can jump over them! 

The game has some resemblance of the classic arcade game moon-patrol which
was released in 1982. A clone of this game was relased for the Commodore
C64 in 1983. The present, ASCII art version of moon-buggy was written many
years later by Jochen Voss.

%prep
%setup -q -a 1
%patch0 -p1 -b .pause
%if !%{oldstyle}
%patch1 -p1 -b .sound
mv -f %{name}-%{version}/* .
autoreconf -f
%endif

%build
%configure --sharedstatedir=%{_localstatedir}/games
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" install

# Create zero-sized highscore file
touch $RPM_BUILD_ROOT%{_localstatedir}/games/%{name}/mbscore

# Install working *.desktop files and an icon
%if !%{oldstyle}
desktop-file-install --vendor "" --dir=$RPM_BUILD_ROOT%{_datadir}/applications %{SOURCE2}
desktop-file-install --vendor "" --dir=$RPM_BUILD_ROOT%{_datadir}/applications %{SOURCE3}

install -D -p -m 644 %{name}.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/%{name}.png
%endif

# Some file cleanups
rm -f $RPM_BUILD_ROOT%{_infodir}/dir

# Convert everything to UTF-8
iconv -f iso-8859-1 -t utf-8 -o ChangeLog.utf8 ChangeLog
sed -i 's|\r$||g' ChangeLog.utf8
touch -c -r ChangeLog ChangeLog.utf8
mv -f ChangeLog.utf8 ChangeLog

iconv -f iso-8859-1 -t utf-8 -o TODO.utf8 TODO
sed -i 's|\r$||g' TODO.utf8
touch -c -r TODO TODO.utf8
mv -f TODO.utf8 TODO

%post
/sbin/install-info %{_infodir}/%{name}.info.gz %{_infodir}/dir

%preun
if [ $1 = 0 ]; then
  /sbin/install-info --delete %{_infodir}/%{name}.info.gz %{_infodir}/dir || :
fi

%clean
rm -rf $RPM_BUILD_ROOT

%files 
%defattr(-,root,root,-)
%doc ANNOUNCE AUTHORS ChangeLog COPYING README THANKS
%if !%{oldstyle}
%doc README.sound
%{_datadir}/%{name}/
%{_datadir}/pixmaps/%{name}.png
%{_datadir}/applications/%{name}.desktop
%{_datadir}/applications/%{name}-sound.desktop
%endif
%attr(2755,root,games) %{_bindir}/%{name}
%{_mandir}/man6/%{name}.6*
%{_infodir}/%{name}.info.gz
%attr(0775,root,games) %{_localstatedir}/games/%{name}
%verify(not md5 size mtime) %config(noreplace) %attr(664,root,games) %{_localstatedir}/games/%{name}/mbscore

%changelog
* Sun Jan 04 2009 Robert Scheck <robert at fedoraproject.org> 1.0.51-2
- Avoid arbitrary modification of highscore file (#469585 #c25)

* Sat Jan 03 2009 Robert Scheck <robert at fedoraproject.org> 1.0.51-1
- Upgrade to 1.0.51
- Initial spec file for Fedora and Red Hat Enterprise Linux (based
  on a spec file of Simon Wesp <cassmodiah at fedoraproject.org>)


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/moon-buggy/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	7 Jan 2009 01:16:24 -0000	1.1
+++ .cvsignore	7 Jan 2009 13:21:40 -0000	1.2
@@ -0,0 +1,2 @@
+moon-buggy-1.0.51.tar.gz
+moon-buggy-sound-1.0.51.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/moon-buggy/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	7 Jan 2009 01:16:24 -0000	1.1
+++ sources	7 Jan 2009 13:21:40 -0000	1.2
@@ -0,0 +1,2 @@
+bfe23ef5cfa838ac261eee34ea5322f3  moon-buggy-1.0.51.tar.gz
+8a43b7c1baf583314e4cf0dde0ea9b85  moon-buggy-sound-1.0.51.tar.gz



From robert at fedoraproject.org  Wed Jan  7 13:22:10 2009
From: robert at fedoraproject.org (Robert Scheck)
Date: Wed,  7 Jan 2009 13:22:10 +0000 (UTC)
Subject: rpms/moon-buggy/F-10 moon-buggy-1.0.51-pause.patch, NONE,
	1.1 moon-buggy-1.0.51-sound.patch, NONE,
	1.1 moon-buggy-sound.desktop, NONE, 1.1 moon-buggy.desktop, NONE,
	1.1 moon-buggy.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090107132210.13AA070100@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/pkgs/rpms/moon-buggy/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4467/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	moon-buggy-1.0.51-pause.patch moon-buggy-1.0.51-sound.patch 
	moon-buggy-sound.desktop moon-buggy.desktop moon-buggy.spec 
Log Message:
Initial import of moon-buggy into Fedora and EPEL


moon-buggy-1.0.51-pause.patch:

--- NEW FILE moon-buggy-1.0.51-pause.patch ---
Patch by Robert Scheck <robert at fedoraproject.org> originally based on a patch by
Christian T. Steigies <cts at debian.org> for moon-buggy >= 1.0.51. This patch adds
the ability to pause moon-buggy without dying. But this "feature" will never get
accepted by upstream, as upstream maintainer thinks, that if you play moon-buggy
you just have to concentrate onto moon-buggy. And for further information, please
have a look to Debian bug ID #76430.

--- moon-buggy-1.0.51/game.c			2003-04-13 21:06:31.000000000 +0200
+++ moon-buggy-1.0.51/game.c.pause		2009-01-03 18:32:47.000000000 +0100
@@ -117,6 +117,15 @@
     print_message ("aborted at user's request");
     mode_change (crash_mode, 0);
     break;
+  case 4:
+    clock_freeze ();
+    wnoutrefresh (moon);
+    print_message ("PAUSED (press any key to continue)");
+    doupdate ();
+    wait_for_key ();
+    mode_redraw ();
+    clock_thaw ();
+    break;
   }
 }
 
@@ -214,6 +223,7 @@
   mode_add_key (game_mode, mbk_jump, "jump", 1);
   mode_add_key (game_mode, mbk_fire, "fire", 2);
   mode_add_key (game_mode, mbk_end, "abort game", 3);
+  mode_add_key (game_mode, mbk_pause, "pause", 4);
   mode_complete (game_mode);
 
   crash_mode = new_mode ();
--- moon-buggy-1.0.51/keyboard.c		2003-04-13 21:06:29.000000000 +0200
+++ moon-buggy-1.0.51/keyboard.c.pause		2009-01-03 18:33:34.000000000 +0100
@@ -124,6 +124,8 @@
 
   add_key ('s', mbk_scores, 100);
 
+  add_key ('p', mbk_pause, 100);
+
   add_key ('r', mbk_redraw, 20);
   add_key (12, mbk_redraw, 10);	/* \C-l */
 }
--- moon-buggy-1.0.51/moon-buggy.h		2003-04-13 21:07:04.000000000 +0200
+++ moon-buggy-1.0.51/moon-buggy.h.pause	2009-01-03 18:34:39.000000000 +0100
@@ -42,6 +42,7 @@
 
 extern  game_time  current_time (void);
 
+extern  void  wait_for_key (void);
 extern  void  clock_reset (void);
 extern  void  clock_thaw (void);
 extern  void  clear_queue (void);
@@ -149,8 +150,9 @@
   mbk_copyright = 1, mbk_down = 2, mbk_end = 4, mbk_fire = 8, mbk_first = 16,
   mbk_jump = 32, mbk_last = 64, mbk_pagedown = 128, mbk_pageup = 256,
   mbk_start = 512, mbk_up = 1024, mbk_warranty = 2048, mbk_scores = 4096,
+  mbk_pause = 8192,
   
-  mbk_redraw = 8192		/* specially handled in `mode_keypress' */
+  mbk_redraw = 16384		/* specially handled in `mode_keypress' */
 };
 struct binding {
   int  meanings;
--- moon-buggy-1.0.51/queue.c			2003-04-13 21:06:32.000000000 +0200
+++ moon-buggy-1.0.51/queue.c.pause		2009-01-03 18:35:09.000000000 +0100
@@ -120,7 +120,7 @@
   return  res;
 }
 
-static void
+void
 wait_for_key (void)
 {
   int  res;

moon-buggy-1.0.51-sound.patch:

--- NEW FILE moon-buggy-1.0.51-sound.patch ---
Patch by Robert Scheck <robert at fedoraproject.org> for moon-buggy >= 1.0.51, basing
on the original, but experimental, esound-based moon-buggy sound add-on patch of
the upstream maintainer Jochen Voss <voss at seehuhn.de>. Main differences are, that
the use of autoreconf is needed, because no direct patching of configure/Makefile
is done.

I also ensured, that moon-buggy still can be played without any sound, which isn't
possible with the upstream version of the patch. Upstream enforces, once the patch
is used, that a sound card is available on the machine moon-buggy is run. If you
would like to use moon-buggy with the esd sound add-on, add the parameter '-w' or
the long form '--with-sound' when calling the moon-buggy binary.

My suggestion was sent upstream - but I think, the esd sound add-on for moon-buggy
first needs to get implemented better before such an enhancement can be done on the
upstream side.

--- moon-buggy-1.0.51/Makefile.am		2004-12-27 16:34:32.000000000 +0100
+++ moon-buggy-1.0.51/Makefile.am.sound		2009-01-03 18:44:46.000000000 +0100
@@ -2,7 +2,9 @@
 # Copyright 1999, 2000, 2001  Jochen Voss
 # $Id: Makefile.am 6092 2004-12-27 15:34:32Z voss $
 
-EXTRA_DIST = manpage.in car.img \
+SOUND_FILES = jump.wav laser.wav crash.wav
+
+EXTRA_DIST = manpage.in car.img $(SOUND_FILES) README.sound \
 	text2c.sed img.sed ANNOUNCE moon-buggy.lsm \
 	moon-buggy.png moon-buggy.xpm title.eps
 DISTCLEANFILES = moon-buggy.6
@@ -14,8 +16,8 @@
 	game.c level.c ground.c buggy.c buggy.h laser.c meteor.c highscore.c \
 	realname.c queue.c vclock.c date.c persona.c signal.c keyboard.c \
 	terminal.c cursor.c random.c error.c xmalloc.c xstrdup.c darray.h \
-	hpath.c
-moon_buggy_LDADD = @CURSES_LIBS@
+	hpath.c sound.c
+moon_buggy_LDADD = @CURSES_LIBS@ @ESD_LIBS@
 
 info_TEXINFOS = moon-buggy.texi
 man_MANS = moon-buggy.6
@@ -24,6 +26,11 @@
 hpath.o: hpath.c moon-buggy.h Makefile
 	$(COMPILE) -DSCORE_DIR=\"$(scoredir)\" -c $<
 
+sounddir = @SOUND_DIR@
+sound_DATA = $(SOUND_FILES)
+sound.o: sound.c moon-buggy.h
+	$(COMPILE) -DSOUND_DIR=\"$(sounddir)\" @ESD_CFLAGS@ -c $<
+
 BUILT_SOURCES = copying.h buggy.h
 copying.h: COPYING text2c.sed
 	cd $(srcdir) && sed -f text2c.sed $(srcdir)/COPYING >$@
--- moon-buggy-1.0.51/buggy.c			2004-12-27 16:58:57.000000000 +0100
+++ moon-buggy-1.0.51/buggy.c.sound		2009-01-03 19:11:21.000000000 +0100
@@ -179,6 +179,9 @@
       state = sz_sit;
       start_wheel ();
       crash_detected = 1;
+      if (sound_flag == 1) {
+        play_sound (mev_CRASH);
+      }
     }
   }
   print_buggy ();
@@ -193,6 +196,9 @@
   assert (state->has_ground);
   remove_event (jump_handler);	/* only one jump at a time */
   add_event (t, jump_handler, sz_jump);
+  if (sound_flag == 1) {
+    play_sound (mev_JUMP);
+  }
 }
 
 int
@@ -215,6 +221,9 @@
     state = sz_crash;
     print_buggy ();
     start_wheel ();
+    if (sound_flag == 1) {
+      play_sound (mev_CRASH);
+    }
     return 1;
   }
   
@@ -232,6 +241,9 @@
     print_buggy ();
     start_wheel ();
     crash_detected = 1;
+    if (sound_flag == 1) {
+      play_sound (mev_CRASH);
+    }
     return 1;
   }
 
--- moon-buggy-1.0.51/configure.ac		2005-01-07 15:55:57.000000000 +0100
+++ moon-buggy-1.0.51/configure.ac.sound	2009-01-03 19:19:07.000000000 +0100
@@ -1,7 +1,7 @@
 dnl Process this file with autoconf to produce a configure script.
 AC_REVISION($Revision: 1.4 $)
 
-AC_INIT(moon-buggy, 1.0.51, voss at seehuhn.de)
+AC_INIT(moon-buggy, 1.0.51+esd, voss at seehuhn.de)
 AC_CONFIG_SRCDIR([moon-buggy.h])
 AM_INIT_AUTOMAKE
 AM_CONFIG_HEADER(config.h)
@@ -28,6 +28,9 @@
 
 dnl Checks for libraries.
 AC_CHECK_LIB(m, modf)
+PKG_CHECK_MODULES(ESD, esound)
+AC_SUBST(ESD_CFLAGS)
+AC_SUBST(ESD_LIBS)
 JV_CHECK_CURSES
 
 dnl Checks for header files.
@@ -63,5 +66,8 @@
 
 AM_CONDITIONAL(short_getopt, test "x$ac_cv_func_getopt_long" != xyes)
 
+SOUND_DIR='$(datadir)/moon-buggy/sounds/'
+AC_SUBST(SOUND_DIR)
+
 AC_CONFIG_FILES([Makefile])
 AC_OUTPUT
--- moon-buggy-1.0.51/laser.c			2003-04-13 21:06:31.000000000 +0200
+++ moon-buggy-1.0.51/laser.c.sound		2009-01-03 19:13:33.000000000 +0100
@@ -108,6 +108,9 @@
   DA_ADD (beam_table, struct beam *, b);
   add_event (t+TICK(0.25), beam_handler, b);
   adjust_score (-1);
+  if (sound_flag == 1) {
+    play_sound (mev_LASER);
+  }
 }
 
 void
--- moon-buggy-1.0.51/moon-buggy.h		2003-04-13 21:07:04.000000000 +0200
+++ moon-buggy-1.0.51/moon-buggy.h.sound	2009-01-03 19:14:25.000000000 +0100
@@ -28,6 +28,7 @@
 extern  WINDOW *moon, *status, *message;
 
 extern int  car_base;
+extern int  sound_flag;
 
 extern  void  print_message (const char *str);
 extern  void  print_hint (const char *str);
@@ -217,4 +218,8 @@
 /* from "hpath.c" */
 extern  const char *score_dir;
 
+/* from "sound.c" */
+enum event_type { mev_JUMP, mev_LASER, mev_CRASH };
+extern  void  play_sound (enum event_type type);
+
 #endif /* FILE_MOON_BUGGY_H_SEEN */
--- moon-buggy-1.0.51/moon-buggy.info		2005-01-07 15:59:15.000000000 +0100
+++ moon-buggy-1.0.51/moon-buggy.info.sound	2009-01-03 19:15:37.000000000 +0100
@@ -32,7 +32,7 @@
 dangerous craters there.  Fortunately your car can jump over them!
 
    This edition (last updated 27 December 2004) of the manual applies to
-version 1.0.51 of the program.
+version 1.0.51+esd of the program.
 
 * Menu:
 
--- moon-buggy-1.0.51/stamp-vti			2006-03-19 20:25:18.000000000 +0100
+++ moon-buggy-1.0.51/stamp-vti.sound		2009-01-03 19:15:52.000000000 +0100
@@ -1,4 +1,4 @@
 @set UPDATED 27 December 2004
 @set UPDATED-MONTH December 2004
- at set EDITION 1.0.51
- at set VERSION 1.0.51
+ at set EDITION 1.0.51+esd
+ at set VERSION 1.0.51+esd
--- moon-buggy-1.0.51/version.texi		2005-01-07 15:57:00.000000000 +0100
+++ moon-buggy-1.0.51/version.texi.sound	2009-01-03 19:16:07.000000000 +0100
@@ -1,4 +1,4 @@
 @set UPDATED 27 December 2004
 @set UPDATED-MONTH December 2004
- at set EDITION 1.0.51
- at set VERSION 1.0.51
+ at set EDITION 1.0.51+esd
+ at set VERSION 1.0.51+esd
--- moon-buggy-1.0.51/main.c			2006-03-19 20:24:14.000000000 +0100
+++ moon-buggy-1.0.51/main.c.sound.c		2009-01-03 19:06:56.000000000 +0100
@@ -30,6 +30,7 @@
 WINDOW *moon, *status, *message;
 
 int  car_base;
+int  sound_flag = 0;
 
 
 void
@@ -135,11 +136,12 @@
     { "mesg", no_argument, 0, 'm' },
     { "no-title", no_argument, 0, 'n' },
     { "show-scores", no_argument, 0, 's' },
+    { "with-sound", no_argument, 0, 'w' },
     { "version", no_argument, 0, 'V' },
     { NULL, 0, NULL, 0}
   };
 #endif
-#define MB_SHORT_OPTIONS "chmnsV"
+#define MB_SHORT_OPTIONS "chmnswV"
   int  help_flag = 0;
   int  highscore_flag = 0;
   int  title_flag = 1;
@@ -182,6 +184,9 @@
     case 's':
       highscore_flag = 1;
       break;
+    case 'w':
+      sound_flag = 1;
+      break;
     case 'V':
       version_flag = 1;
       break;
@@ -221,6 +226,8 @@
 	   out);
     fputs (OPT("-n","--no-title     ") "omit the title screen\n", out);
     fputs (OPT("-s","--show-scores  ") "only show the highscore list\n", out);
+    fputs (OPT("-w","--with-sound   ") "enable sound using esd feature\n",
+           out);
     fputs (OPT("-V","--version      ") "show the version number and exit\n\n",
 	   out);
     fputs ("Please report bugs to <voss at seehuhn.de>.\n", out);
--- moon-buggy-1.0.51/README			2004-12-27 16:51:24.000000000 +0100
+++ moon-buggy-1.0.51/README.sound		2009-01-03 20:02:52.000000000 +0100
@@ -18,6 +18,19 @@
 by the command 'moon-buggy -V'.
 
 
+SOUND FEATURE:
+
+   This version of moon-buggy includes the very experimental sound add-
+on using esd.  It can only be used in conjunction with moon-buggy in
+version 1.0.51.  As moon-buggy should be able to run on a simple VT100
+terminal, this add-on is not part of the main moon-buggy distribution.
+
+   In Fedora, the experimental sound add-on was added more lightweight
+than upstream wrote the original patch.  The parameter '-w' or the long
+form '--with-sound' can be appended when calling the moon-buggy binary.
+If no parameter is given, moon-buggy will run without any sounds.
+
+
 INSTALLATION:
 
    Moon-buggy requires the curses library as a prerequisite.  If
--- moon-buggy-1.0.51/manpage.in		2004-12-27 16:58:57.000000000 +0100
+++ moon-buggy-1.0.51/manpage.in.sound		2009-01-03 21:20:43.000000000 +0100
@@ -32,6 +32,9 @@
 .Op s show\-scores
 shows the current highscore list and exits.
 .TP
+.Op w with\-sound
+enables experimental sound add-on using esd.
+.TP
 .Op V version
 prints the program\'s version to standard output and exits.
 .SH KEYS


--- NEW FILE moon-buggy-sound.desktop ---
[Desktop Entry]
Categories=Game;ArcadeGame;
Name=moon-buggy (with sounds)
Type=Application
Terminal=true
Exec=moon-buggy --with-sound
Icon=moon-buggy
Comment=Drive and jump with some kind of car across the moon (enhanced with some sounds)
Encoding=UTF-8


--- NEW FILE moon-buggy.desktop ---
[Desktop Entry]
Categories=Game;ArcadeGame;
Name=moon-buggy
Type=Application
Terminal=true
Exec=moon-buggy
Icon=moon-buggy
Comment=Drive and jump with some kind of car across the moon
Encoding=UTF-8


--- NEW FILE moon-buggy.spec ---
# Enable oldstyle to have a nearly nothing requiring package after rebuilding
%define oldstyle 0

Summary:         Drive and jump with some kind of car across the moon
Name:            moon-buggy
Version:         1.0.51
Release:         2%{?dist}
License:         GPL+
Group:           Amusements/Games
URL:             http://seehuhn.de/pages/%{name}
Source0:         http://seehuhn.de/media/programs/%{name}-%{version}.tar.gz
Source1:         http://seehuhn.de/media/programs/%{name}-sound-%{version}.tar.gz
Source2:         %{name}.desktop
Source3:         %{name}-sound.desktop
Patch0:          moon-buggy-1.0.51-pause.patch
Patch1:          moon-buggy-1.0.51-sound.patch
Requires(post):  /sbin/install-info
Requires(preun): /sbin/install-info
BuildRequires:   ncurses-devel
%if !%{oldstyle}
BuildRequires:   esound-devel, desktop-file-utils, autoconf, automake
%endif
BuildRoot:       %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%description
Moon-buggy is a simple character graphics game where you drive some kind
of car across the moon's surface. Unfortunately there are dangerous craters
there. Fortunately your car can jump over them! 

The game has some resemblance of the classic arcade game moon-patrol which
was released in 1982. A clone of this game was relased for the Commodore
C64 in 1983. The present, ASCII art version of moon-buggy was written many
years later by Jochen Voss.

%prep
%setup -q -a 1
%patch0 -p1 -b .pause
%if !%{oldstyle}
%patch1 -p1 -b .sound
mv -f %{name}-%{version}/* .
autoreconf -f
%endif

%build
%configure --sharedstatedir=%{_localstatedir}/games
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" install

# Create zero-sized highscore file
touch $RPM_BUILD_ROOT%{_localstatedir}/games/%{name}/mbscore

# Install working *.desktop files and an icon
%if !%{oldstyle}
desktop-file-install --vendor "" --dir=$RPM_BUILD_ROOT%{_datadir}/applications %{SOURCE2}
desktop-file-install --vendor "" --dir=$RPM_BUILD_ROOT%{_datadir}/applications %{SOURCE3}

install -D -p -m 644 %{name}.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/%{name}.png
%endif

# Some file cleanups
rm -f $RPM_BUILD_ROOT%{_infodir}/dir

# Convert everything to UTF-8
iconv -f iso-8859-1 -t utf-8 -o ChangeLog.utf8 ChangeLog
sed -i 's|\r$||g' ChangeLog.utf8
touch -c -r ChangeLog ChangeLog.utf8
mv -f ChangeLog.utf8 ChangeLog

iconv -f iso-8859-1 -t utf-8 -o TODO.utf8 TODO
sed -i 's|\r$||g' TODO.utf8
touch -c -r TODO TODO.utf8
mv -f TODO.utf8 TODO

%post
/sbin/install-info %{_infodir}/%{name}.info.gz %{_infodir}/dir

%preun
if [ $1 = 0 ]; then
  /sbin/install-info --delete %{_infodir}/%{name}.info.gz %{_infodir}/dir || :
fi

%clean
rm -rf $RPM_BUILD_ROOT

%files 
%defattr(-,root,root,-)
%doc ANNOUNCE AUTHORS ChangeLog COPYING README THANKS
%if !%{oldstyle}
%doc README.sound
%{_datadir}/%{name}/
%{_datadir}/pixmaps/%{name}.png
%{_datadir}/applications/%{name}.desktop
%{_datadir}/applications/%{name}-sound.desktop
%endif
%attr(2755,root,games) %{_bindir}/%{name}
%{_mandir}/man6/%{name}.6*
%{_infodir}/%{name}.info.gz
%attr(0775,root,games) %{_localstatedir}/games/%{name}
%verify(not md5 size mtime) %config(noreplace) %attr(664,root,games) %{_localstatedir}/games/%{name}/mbscore

%changelog
* Sun Jan 04 2009 Robert Scheck <robert at fedoraproject.org> 1.0.51-2
- Avoid arbitrary modification of highscore file (#469585 #c25)

* Sat Jan 03 2009 Robert Scheck <robert at fedoraproject.org> 1.0.51-1
- Upgrade to 1.0.51
- Initial spec file for Fedora and Red Hat Enterprise Linux (based
  on a spec file of Simon Wesp <cassmodiah at fedoraproject.org>)


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/moon-buggy/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	7 Jan 2009 01:16:24 -0000	1.1
+++ .cvsignore	7 Jan 2009 13:21:39 -0000	1.2
@@ -0,0 +1,2 @@
+moon-buggy-1.0.51.tar.gz
+moon-buggy-sound-1.0.51.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/moon-buggy/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	7 Jan 2009 01:16:24 -0000	1.1
+++ sources	7 Jan 2009 13:21:39 -0000	1.2
@@ -0,0 +1,2 @@
+bfe23ef5cfa838ac261eee34ea5322f3  moon-buggy-1.0.51.tar.gz
+8a43b7c1baf583314e4cf0dde0ea9b85  moon-buggy-sound-1.0.51.tar.gz



From robert at fedoraproject.org  Wed Jan  7 13:22:10 2009
From: robert at fedoraproject.org (Robert Scheck)
Date: Wed,  7 Jan 2009 13:22:10 +0000 (UTC)
Subject: rpms/moon-buggy/devel moon-buggy-1.0.51-pause.patch, NONE,
	1.1 moon-buggy-1.0.51-sound.patch, NONE,
	1.1 moon-buggy-sound.desktop, NONE, 1.1 moon-buggy.desktop, NONE,
	1.1 moon-buggy.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090107132210.A0F2070100@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/pkgs/rpms/moon-buggy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4467/devel

Modified Files:
	.cvsignore sources 
Added Files:
	moon-buggy-1.0.51-pause.patch moon-buggy-1.0.51-sound.patch 
	moon-buggy-sound.desktop moon-buggy.desktop moon-buggy.spec 
Log Message:
Initial import of moon-buggy into Fedora and EPEL


moon-buggy-1.0.51-pause.patch:

--- NEW FILE moon-buggy-1.0.51-pause.patch ---
Patch by Robert Scheck <robert at fedoraproject.org> originally based on a patch by
Christian T. Steigies <cts at debian.org> for moon-buggy >= 1.0.51. This patch adds
the ability to pause moon-buggy without dying. But this "feature" will never get
accepted by upstream, as upstream maintainer thinks, that if you play moon-buggy
you just have to concentrate onto moon-buggy. And for further information, please
have a look to Debian bug ID #76430.

--- moon-buggy-1.0.51/game.c			2003-04-13 21:06:31.000000000 +0200
+++ moon-buggy-1.0.51/game.c.pause		2009-01-03 18:32:47.000000000 +0100
@@ -117,6 +117,15 @@
     print_message ("aborted at user's request");
     mode_change (crash_mode, 0);
     break;
+  case 4:
+    clock_freeze ();
+    wnoutrefresh (moon);
+    print_message ("PAUSED (press any key to continue)");
+    doupdate ();
+    wait_for_key ();
+    mode_redraw ();
+    clock_thaw ();
+    break;
   }
 }
 
@@ -214,6 +223,7 @@
   mode_add_key (game_mode, mbk_jump, "jump", 1);
   mode_add_key (game_mode, mbk_fire, "fire", 2);
   mode_add_key (game_mode, mbk_end, "abort game", 3);
+  mode_add_key (game_mode, mbk_pause, "pause", 4);
   mode_complete (game_mode);
 
   crash_mode = new_mode ();
--- moon-buggy-1.0.51/keyboard.c		2003-04-13 21:06:29.000000000 +0200
+++ moon-buggy-1.0.51/keyboard.c.pause		2009-01-03 18:33:34.000000000 +0100
@@ -124,6 +124,8 @@
 
   add_key ('s', mbk_scores, 100);
 
+  add_key ('p', mbk_pause, 100);
+
   add_key ('r', mbk_redraw, 20);
   add_key (12, mbk_redraw, 10);	/* \C-l */
 }
--- moon-buggy-1.0.51/moon-buggy.h		2003-04-13 21:07:04.000000000 +0200
+++ moon-buggy-1.0.51/moon-buggy.h.pause	2009-01-03 18:34:39.000000000 +0100
@@ -42,6 +42,7 @@
 
 extern  game_time  current_time (void);
 
+extern  void  wait_for_key (void);
 extern  void  clock_reset (void);
 extern  void  clock_thaw (void);
 extern  void  clear_queue (void);
@@ -149,8 +150,9 @@
   mbk_copyright = 1, mbk_down = 2, mbk_end = 4, mbk_fire = 8, mbk_first = 16,
   mbk_jump = 32, mbk_last = 64, mbk_pagedown = 128, mbk_pageup = 256,
   mbk_start = 512, mbk_up = 1024, mbk_warranty = 2048, mbk_scores = 4096,
+  mbk_pause = 8192,
   
-  mbk_redraw = 8192		/* specially handled in `mode_keypress' */
+  mbk_redraw = 16384		/* specially handled in `mode_keypress' */
 };
 struct binding {
   int  meanings;
--- moon-buggy-1.0.51/queue.c			2003-04-13 21:06:32.000000000 +0200
+++ moon-buggy-1.0.51/queue.c.pause		2009-01-03 18:35:09.000000000 +0100
@@ -120,7 +120,7 @@
   return  res;
 }
 
-static void
+void
 wait_for_key (void)
 {
   int  res;

moon-buggy-1.0.51-sound.patch:

--- NEW FILE moon-buggy-1.0.51-sound.patch ---
Patch by Robert Scheck <robert at fedoraproject.org> for moon-buggy >= 1.0.51, basing
on the original, but experimental, esound-based moon-buggy sound add-on patch of
the upstream maintainer Jochen Voss <voss at seehuhn.de>. Main differences are, that
the use of autoreconf is needed, because no direct patching of configure/Makefile
is done.

I also ensured, that moon-buggy still can be played without any sound, which isn't
possible with the upstream version of the patch. Upstream enforces, once the patch
is used, that a sound card is available on the machine moon-buggy is run. If you
would like to use moon-buggy with the esd sound add-on, add the parameter '-w' or
the long form '--with-sound' when calling the moon-buggy binary.

My suggestion was sent upstream - but I think, the esd sound add-on for moon-buggy
first needs to get implemented better before such an enhancement can be done on the
upstream side.

--- moon-buggy-1.0.51/Makefile.am		2004-12-27 16:34:32.000000000 +0100
+++ moon-buggy-1.0.51/Makefile.am.sound		2009-01-03 18:44:46.000000000 +0100
@@ -2,7 +2,9 @@
 # Copyright 1999, 2000, 2001  Jochen Voss
 # $Id: Makefile.am 6092 2004-12-27 15:34:32Z voss $
 
-EXTRA_DIST = manpage.in car.img \
+SOUND_FILES = jump.wav laser.wav crash.wav
+
+EXTRA_DIST = manpage.in car.img $(SOUND_FILES) README.sound \
 	text2c.sed img.sed ANNOUNCE moon-buggy.lsm \
 	moon-buggy.png moon-buggy.xpm title.eps
 DISTCLEANFILES = moon-buggy.6
@@ -14,8 +16,8 @@
 	game.c level.c ground.c buggy.c buggy.h laser.c meteor.c highscore.c \
 	realname.c queue.c vclock.c date.c persona.c signal.c keyboard.c \
 	terminal.c cursor.c random.c error.c xmalloc.c xstrdup.c darray.h \
-	hpath.c
-moon_buggy_LDADD = @CURSES_LIBS@
+	hpath.c sound.c
+moon_buggy_LDADD = @CURSES_LIBS@ @ESD_LIBS@
 
 info_TEXINFOS = moon-buggy.texi
 man_MANS = moon-buggy.6
@@ -24,6 +26,11 @@
 hpath.o: hpath.c moon-buggy.h Makefile
 	$(COMPILE) -DSCORE_DIR=\"$(scoredir)\" -c $<
 
+sounddir = @SOUND_DIR@
+sound_DATA = $(SOUND_FILES)
+sound.o: sound.c moon-buggy.h
+	$(COMPILE) -DSOUND_DIR=\"$(sounddir)\" @ESD_CFLAGS@ -c $<
+
 BUILT_SOURCES = copying.h buggy.h
 copying.h: COPYING text2c.sed
 	cd $(srcdir) && sed -f text2c.sed $(srcdir)/COPYING >$@
--- moon-buggy-1.0.51/buggy.c			2004-12-27 16:58:57.000000000 +0100
+++ moon-buggy-1.0.51/buggy.c.sound		2009-01-03 19:11:21.000000000 +0100
@@ -179,6 +179,9 @@
       state = sz_sit;
       start_wheel ();
       crash_detected = 1;
+      if (sound_flag == 1) {
+        play_sound (mev_CRASH);
+      }
     }
   }
   print_buggy ();
@@ -193,6 +196,9 @@
   assert (state->has_ground);
   remove_event (jump_handler);	/* only one jump at a time */
   add_event (t, jump_handler, sz_jump);
+  if (sound_flag == 1) {
+    play_sound (mev_JUMP);
+  }
 }
 
 int
@@ -215,6 +221,9 @@
     state = sz_crash;
     print_buggy ();
     start_wheel ();
+    if (sound_flag == 1) {
+      play_sound (mev_CRASH);
+    }
     return 1;
   }
   
@@ -232,6 +241,9 @@
     print_buggy ();
     start_wheel ();
     crash_detected = 1;
+    if (sound_flag == 1) {
+      play_sound (mev_CRASH);
+    }
     return 1;
   }
 
--- moon-buggy-1.0.51/configure.ac		2005-01-07 15:55:57.000000000 +0100
+++ moon-buggy-1.0.51/configure.ac.sound	2009-01-03 19:19:07.000000000 +0100
@@ -1,7 +1,7 @@
 dnl Process this file with autoconf to produce a configure script.
 AC_REVISION($Revision: 1.4 $)
 
-AC_INIT(moon-buggy, 1.0.51, voss at seehuhn.de)
+AC_INIT(moon-buggy, 1.0.51+esd, voss at seehuhn.de)
 AC_CONFIG_SRCDIR([moon-buggy.h])
 AM_INIT_AUTOMAKE
 AM_CONFIG_HEADER(config.h)
@@ -28,6 +28,9 @@
 
 dnl Checks for libraries.
 AC_CHECK_LIB(m, modf)
+PKG_CHECK_MODULES(ESD, esound)
+AC_SUBST(ESD_CFLAGS)
+AC_SUBST(ESD_LIBS)
 JV_CHECK_CURSES
 
 dnl Checks for header files.
@@ -63,5 +66,8 @@
 
 AM_CONDITIONAL(short_getopt, test "x$ac_cv_func_getopt_long" != xyes)
 
+SOUND_DIR='$(datadir)/moon-buggy/sounds/'
+AC_SUBST(SOUND_DIR)
+
 AC_CONFIG_FILES([Makefile])
 AC_OUTPUT
--- moon-buggy-1.0.51/laser.c			2003-04-13 21:06:31.000000000 +0200
+++ moon-buggy-1.0.51/laser.c.sound		2009-01-03 19:13:33.000000000 +0100
@@ -108,6 +108,9 @@
   DA_ADD (beam_table, struct beam *, b);
   add_event (t+TICK(0.25), beam_handler, b);
   adjust_score (-1);
+  if (sound_flag == 1) {
+    play_sound (mev_LASER);
+  }
 }
 
 void
--- moon-buggy-1.0.51/moon-buggy.h		2003-04-13 21:07:04.000000000 +0200
+++ moon-buggy-1.0.51/moon-buggy.h.sound	2009-01-03 19:14:25.000000000 +0100
@@ -28,6 +28,7 @@
 extern  WINDOW *moon, *status, *message;
 
 extern int  car_base;
+extern int  sound_flag;
 
 extern  void  print_message (const char *str);
 extern  void  print_hint (const char *str);
@@ -217,4 +218,8 @@
 /* from "hpath.c" */
 extern  const char *score_dir;
 
+/* from "sound.c" */
+enum event_type { mev_JUMP, mev_LASER, mev_CRASH };
+extern  void  play_sound (enum event_type type);
+
 #endif /* FILE_MOON_BUGGY_H_SEEN */
--- moon-buggy-1.0.51/moon-buggy.info		2005-01-07 15:59:15.000000000 +0100
+++ moon-buggy-1.0.51/moon-buggy.info.sound	2009-01-03 19:15:37.000000000 +0100
@@ -32,7 +32,7 @@
 dangerous craters there.  Fortunately your car can jump over them!
 
    This edition (last updated 27 December 2004) of the manual applies to
-version 1.0.51 of the program.
+version 1.0.51+esd of the program.
 
 * Menu:
 
--- moon-buggy-1.0.51/stamp-vti			2006-03-19 20:25:18.000000000 +0100
+++ moon-buggy-1.0.51/stamp-vti.sound		2009-01-03 19:15:52.000000000 +0100
@@ -1,4 +1,4 @@
 @set UPDATED 27 December 2004
 @set UPDATED-MONTH December 2004
- at set EDITION 1.0.51
- at set VERSION 1.0.51
+ at set EDITION 1.0.51+esd
+ at set VERSION 1.0.51+esd
--- moon-buggy-1.0.51/version.texi		2005-01-07 15:57:00.000000000 +0100
+++ moon-buggy-1.0.51/version.texi.sound	2009-01-03 19:16:07.000000000 +0100
@@ -1,4 +1,4 @@
 @set UPDATED 27 December 2004
 @set UPDATED-MONTH December 2004
- at set EDITION 1.0.51
- at set VERSION 1.0.51
+ at set EDITION 1.0.51+esd
+ at set VERSION 1.0.51+esd
--- moon-buggy-1.0.51/main.c			2006-03-19 20:24:14.000000000 +0100
+++ moon-buggy-1.0.51/main.c.sound.c		2009-01-03 19:06:56.000000000 +0100
@@ -30,6 +30,7 @@
 WINDOW *moon, *status, *message;
 
 int  car_base;
+int  sound_flag = 0;
 
 
 void
@@ -135,11 +136,12 @@
     { "mesg", no_argument, 0, 'm' },
     { "no-title", no_argument, 0, 'n' },
     { "show-scores", no_argument, 0, 's' },
+    { "with-sound", no_argument, 0, 'w' },
     { "version", no_argument, 0, 'V' },
     { NULL, 0, NULL, 0}
   };
 #endif
-#define MB_SHORT_OPTIONS "chmnsV"
+#define MB_SHORT_OPTIONS "chmnswV"
   int  help_flag = 0;
   int  highscore_flag = 0;
   int  title_flag = 1;
@@ -182,6 +184,9 @@
     case 's':
       highscore_flag = 1;
       break;
+    case 'w':
+      sound_flag = 1;
+      break;
     case 'V':
       version_flag = 1;
       break;
@@ -221,6 +226,8 @@
 	   out);
     fputs (OPT("-n","--no-title     ") "omit the title screen\n", out);
     fputs (OPT("-s","--show-scores  ") "only show the highscore list\n", out);
+    fputs (OPT("-w","--with-sound   ") "enable sound using esd feature\n",
+           out);
     fputs (OPT("-V","--version      ") "show the version number and exit\n\n",
 	   out);
     fputs ("Please report bugs to <voss at seehuhn.de>.\n", out);
--- moon-buggy-1.0.51/README			2004-12-27 16:51:24.000000000 +0100
+++ moon-buggy-1.0.51/README.sound		2009-01-03 20:02:52.000000000 +0100
@@ -18,6 +18,19 @@
 by the command 'moon-buggy -V'.
 
 
+SOUND FEATURE:
+
+   This version of moon-buggy includes the very experimental sound add-
+on using esd.  It can only be used in conjunction with moon-buggy in
+version 1.0.51.  As moon-buggy should be able to run on a simple VT100
+terminal, this add-on is not part of the main moon-buggy distribution.
+
+   In Fedora, the experimental sound add-on was added more lightweight
+than upstream wrote the original patch.  The parameter '-w' or the long
+form '--with-sound' can be appended when calling the moon-buggy binary.
+If no parameter is given, moon-buggy will run without any sounds.
+
+
 INSTALLATION:
 
    Moon-buggy requires the curses library as a prerequisite.  If
--- moon-buggy-1.0.51/manpage.in		2004-12-27 16:58:57.000000000 +0100
+++ moon-buggy-1.0.51/manpage.in.sound		2009-01-03 21:20:43.000000000 +0100
@@ -32,6 +32,9 @@
 .Op s show\-scores
 shows the current highscore list and exits.
 .TP
+.Op w with\-sound
+enables experimental sound add-on using esd.
+.TP
 .Op V version
 prints the program\'s version to standard output and exits.
 .SH KEYS


--- NEW FILE moon-buggy-sound.desktop ---
[Desktop Entry]
Categories=Game;ArcadeGame;
Name=moon-buggy (with sounds)
Type=Application
Terminal=true
Exec=moon-buggy --with-sound
Icon=moon-buggy
Comment=Drive and jump with some kind of car across the moon (enhanced with some sounds)
Encoding=UTF-8


--- NEW FILE moon-buggy.desktop ---
[Desktop Entry]
Categories=Game;ArcadeGame;
Name=moon-buggy
Type=Application
Terminal=true
Exec=moon-buggy
Icon=moon-buggy
Comment=Drive and jump with some kind of car across the moon
Encoding=UTF-8


--- NEW FILE moon-buggy.spec ---
# Enable oldstyle to have a nearly nothing requiring package after rebuilding
%define oldstyle 0

Summary:         Drive and jump with some kind of car across the moon
Name:            moon-buggy
Version:         1.0.51
Release:         2%{?dist}
License:         GPL+
Group:           Amusements/Games
URL:             http://seehuhn.de/pages/%{name}
Source0:         http://seehuhn.de/media/programs/%{name}-%{version}.tar.gz
Source1:         http://seehuhn.de/media/programs/%{name}-sound-%{version}.tar.gz
Source2:         %{name}.desktop
Source3:         %{name}-sound.desktop
Patch0:          moon-buggy-1.0.51-pause.patch
Patch1:          moon-buggy-1.0.51-sound.patch
Requires(post):  /sbin/install-info
Requires(preun): /sbin/install-info
BuildRequires:   ncurses-devel
%if !%{oldstyle}
BuildRequires:   esound-devel, desktop-file-utils, autoconf, automake
%endif
BuildRoot:       %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%description
Moon-buggy is a simple character graphics game where you drive some kind
of car across the moon's surface. Unfortunately there are dangerous craters
there. Fortunately your car can jump over them! 

The game has some resemblance of the classic arcade game moon-patrol which
was released in 1982. A clone of this game was relased for the Commodore
C64 in 1983. The present, ASCII art version of moon-buggy was written many
years later by Jochen Voss.

%prep
%setup -q -a 1
%patch0 -p1 -b .pause
%if !%{oldstyle}
%patch1 -p1 -b .sound
mv -f %{name}-%{version}/* .
autoreconf -f
%endif

%build
%configure --sharedstatedir=%{_localstatedir}/games
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" install

# Create zero-sized highscore file
touch $RPM_BUILD_ROOT%{_localstatedir}/games/%{name}/mbscore

# Install working *.desktop files and an icon
%if !%{oldstyle}
desktop-file-install --vendor "" --dir=$RPM_BUILD_ROOT%{_datadir}/applications %{SOURCE2}
desktop-file-install --vendor "" --dir=$RPM_BUILD_ROOT%{_datadir}/applications %{SOURCE3}

install -D -p -m 644 %{name}.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/%{name}.png
%endif

# Some file cleanups
rm -f $RPM_BUILD_ROOT%{_infodir}/dir

# Convert everything to UTF-8
iconv -f iso-8859-1 -t utf-8 -o ChangeLog.utf8 ChangeLog
sed -i 's|\r$||g' ChangeLog.utf8
touch -c -r ChangeLog ChangeLog.utf8
mv -f ChangeLog.utf8 ChangeLog

iconv -f iso-8859-1 -t utf-8 -o TODO.utf8 TODO
sed -i 's|\r$||g' TODO.utf8
touch -c -r TODO TODO.utf8
mv -f TODO.utf8 TODO

%post
/sbin/install-info %{_infodir}/%{name}.info.gz %{_infodir}/dir

%preun
if [ $1 = 0 ]; then
  /sbin/install-info --delete %{_infodir}/%{name}.info.gz %{_infodir}/dir || :
fi

%clean
rm -rf $RPM_BUILD_ROOT

%files 
%defattr(-,root,root,-)
%doc ANNOUNCE AUTHORS ChangeLog COPYING README THANKS
%if !%{oldstyle}
%doc README.sound
%{_datadir}/%{name}/
%{_datadir}/pixmaps/%{name}.png
%{_datadir}/applications/%{name}.desktop
%{_datadir}/applications/%{name}-sound.desktop
%endif
%attr(2755,root,games) %{_bindir}/%{name}
%{_mandir}/man6/%{name}.6*
%{_infodir}/%{name}.info.gz
%attr(0775,root,games) %{_localstatedir}/games/%{name}
%verify(not md5 size mtime) %config(noreplace) %attr(664,root,games) %{_localstatedir}/games/%{name}/mbscore

%changelog
* Sun Jan 04 2009 Robert Scheck <robert at fedoraproject.org> 1.0.51-2
- Avoid arbitrary modification of highscore file (#469585 #c25)

* Sat Jan 03 2009 Robert Scheck <robert at fedoraproject.org> 1.0.51-1
- Upgrade to 1.0.51
- Initial spec file for Fedora and Red Hat Enterprise Linux (based
  on a spec file of Simon Wesp <cassmodiah at fedoraproject.org>)


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/moon-buggy/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	7 Jan 2009 01:16:24 -0000	1.1
+++ .cvsignore	7 Jan 2009 13:21:40 -0000	1.2
@@ -0,0 +1,2 @@
+moon-buggy-1.0.51.tar.gz
+moon-buggy-sound-1.0.51.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/moon-buggy/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	7 Jan 2009 01:16:24 -0000	1.1
+++ sources	7 Jan 2009 13:21:40 -0000	1.2
@@ -0,0 +1,2 @@
+bfe23ef5cfa838ac261eee34ea5322f3  moon-buggy-1.0.51.tar.gz
+8a43b7c1baf583314e4cf0dde0ea9b85  moon-buggy-sound-1.0.51.tar.gz



From mzazrive at fedoraproject.org  Wed Jan  7 13:29:02 2009
From: mzazrive at fedoraproject.org (Milan Zazrivec)
Date: Wed,  7 Jan 2009 13:29:02 +0000 (UTC)
Subject: rpms/xqilla/devel xqilla.spec,1.8,1.9
Message-ID: <20090107132902.BE9A670100@cvs1.fedora.phx.redhat.com>

Author: mzazrive

Update of /cvs/pkgs/rpms/xqilla/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6353

Modified Files:
	xqilla.spec 
Log Message:
fixed requirements for xqilla-devel package


Index: xqilla.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xqilla/devel/xqilla.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- xqilla.spec	2 Dec 2008 10:23:51 -0000	1.8
+++ xqilla.spec	7 Jan 2009 13:28:32 -0000	1.9
@@ -1,13 +1,10 @@
-%define _unpackaged_files_terminate_build  1
-%define _missing_doc_files_terminate_build 1
-
 %define xercesc_dir xerces-c-src_2_8_0
 
 Name: xqilla
 Summary: XQilla is an XQuery and XPath 2.0 library, built on top of Xerces-C
 Group: System Environment/Libraries
 Version: 2.1.3
-Release: 0.3%{?dist}
+Release: 0.4%{?dist}
 License: ASL 2.0
 URL: http://xqilla.sourceforge.net/HomePage
 Source0: http://downloads.sourceforge.net/xqilla/XQilla-%{version}.tar.gz
@@ -34,7 +31,7 @@
 %package devel
 Group: Development/Libraries
 Summary: XQilla is an XQuery and XPath 2.0 library, built on top of Xerces-C
-Requires: %{name} = %{version}-%{release} xerces-c-devel >= 2.7.0
+Requires: %{name} = %{version}-%{release} xerces-c-devel >= 2.8.0
 
 %description devel
 XQilla is an XQuery and XPath 2.0 implementation written in C++ and based
@@ -108,6 +105,9 @@
 %{_defaultdocdir}/%{name}-%{version}/simple-api
 
 %changelog
+* Wed Jan  7 2009 Milan Zazrivec <mzazrivec at redhat.com> 2.1.3-0.4
+- fixed requirements for xqilla-devel package
+
 * Tue Dec  2 2008 Milan Zazrivec <mzazrivec at redhat.com 2.1.3-0.3
 - fix for bz #473997 - xqilla : Unowned directories
 



From limb at fedoraproject.org  Wed Jan  7 13:31:37 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Wed,  7 Jan 2009 13:31:37 +0000 (UTC)
Subject: rpms/lilypond/devel .cvsignore, 1.22, 1.23 lilypond.spec, 1.33,
	1.34 sources, 1.22, 1.23
Message-ID: <20090107133137.8646370100@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/lilypond/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6807

Modified Files:
	.cvsignore lilypond.spec sources 
Log Message:
New upstream.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/lilypond/devel/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- .cvsignore	29 Dec 2008 18:34:50 -0000	1.22
+++ .cvsignore	7 Jan 2009 13:31:06 -0000	1.23
@@ -1 +1 @@
-lilypond-2.12.0.tar.gz
+lilypond-2.12.1.tar.gz


Index: lilypond.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lilypond/devel/lilypond.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- lilypond.spec	31 Dec 2008 13:13:13 -0000	1.33
+++ lilypond.spec	7 Jan 2009 13:31:06 -0000	1.34
@@ -1,6 +1,6 @@
 Name:		lilypond
-Version:	2.12.0
-Release:	3%{?dist}
+Version:	2.12.1
+Release:	1%{?dist}
 Summary:	A typesetting system for music notation
 
 Group:		Applications/Publishing
@@ -9,7 +9,7 @@
 Source0:	http://download.linuxaudio.org/lilypond/sources/v2.12/%{name}-%{version}.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Patch0:		lilypond-2.11.65-python26.patch
-Patch1:		lilypond-2.12.0-parse-scm.patch
+#Patch1:		lilypond-2.12.0-parse-scm.patch
 
 Requires:	ghostscript >= 8.15
 Requires(post): /sbin/install-info
@@ -45,7 +45,7 @@
 %setup -q
 
 %patch0 -p0
-%patch1 -p0
+#%patch1 -p0
 
 %build
 %configure --without-kpathsea --disable-checking \
@@ -111,6 +111,10 @@
 %{_datadir}/lilypond/%{version}/fonts
 
 %changelog
+* Tue Jan 06 2009 Jon Ciesla <limb at jcomserv.net> - 2.12.1-1
+- Update to 2.12.1.
+- Droppedn parse-scm patch, applied upstream.
+
 * Tue Dec 30 2008 Jon Ciesla <limb at jcomserv.net> - 2.12.0-3
 - Split out fonts subpackage, BZ 477416.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/lilypond/devel/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- sources	29 Dec 2008 18:34:50 -0000	1.22
+++ sources	7 Jan 2009 13:31:06 -0000	1.23
@@ -1 +1 @@
-592581b3e8e022a8152d3325eefd9e88  lilypond-2.12.0.tar.gz
+487d62b20d14faea3edc7561dece3ff2  lilypond-2.12.1.tar.gz



From limb at fedoraproject.org  Wed Jan  7 13:41:27 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Wed,  7 Jan 2009 13:41:27 +0000 (UTC)
Subject: rpms/roundcubemail/devel .cvsignore, 1.9, 1.10 roundcubemail.spec, 
	1.17, 1.18 sources, 1.10, 1.11
Message-ID: <20090107134127.5B33870100@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/roundcubemail/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8246

Modified Files:
	.cvsignore roundcubemail.spec sources 
Log Message:
New upstream.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/roundcubemail/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	9 Oct 2008 12:53:18 -0000	1.9
+++ .cvsignore	7 Jan 2009 13:40:56 -0000	1.10
@@ -1 +1 @@
-roundcubemail-0.2-beta-dep.tar.gz
+roundcubemail-0.2-stable-dep.tar.gz


Index: roundcubemail.spec
===================================================================
RCS file: /cvs/pkgs/rpms/roundcubemail/devel/roundcubemail.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- roundcubemail.spec	17 Dec 2008 17:37:12 -0000	1.17
+++ roundcubemail.spec	7 Jan 2009 13:40:57 -0000	1.18
@@ -1,21 +1,21 @@
 %define roundcubedir %{_datadir}/roundcubemail
 Name: roundcubemail
 Version:  0.2
-Release:  5.beta%{?dist}
+Release:  6.stable%{?dist}
 Summary: Round Cube Webmail is a browser-based multilingual IMAP client
 
 Group: Applications/System         
 License: GPLv2
 URL: http://www.roundcube.net
-Source0: roundcubemail-%{version}-beta-dep.tar.gz
+Source0: roundcubemail-%{version}-stable-dep.tar.gz
 Source1: roundcubemail.conf
 Source2: roundcubemail.logrotate
 Source4: roundcubemail-README.fedora
 Patch0: roundcubemail-0.2-beta-confpath.patch
 # From upstream, not in a release yet, BZ 476223.
-Patch1: roundcubemail-0.2-beta-html2text.patch
+#Patch1: roundcubemail-0.2-beta-html2text.patch
 # From upstream, not in a release yet, BZ 476830.
-Patch2: roundcubemail-0.2-beta-CVE-2008-5620.patch
+#Patch2: roundcubemail-0.2-beta-CVE-2008-5620.patch
 
 BuildArch: noarch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root%(%{__id_u} -n)
@@ -43,11 +43,11 @@
 interface is fully skinnable using XHTML and CSS 2.
 
 %prep
-%setup -q -n roundcubemail-0.2-beta-dep
+%setup -q -n roundcubemail-0.2-stable-dep
 
 %patch0 -p0
-%patch1 -p0
-%patch2 -p0
+#%patch1 -p0
+#%patch2 -p0
 
 # fix permissions and remove any .htaccess files
 find . -type f -print | xargs chmod a-x
@@ -135,6 +135,10 @@
 %config(noreplace) %{_sysconfdir}/logrotate.d/roundcubemail
 
 %changelog
+* Mon Jan 05 2009 Jon Ciesla <limb at jcomserv.net> = 0.2-6.stable
+- New upstream.
+- Dropped two most recent patches, applied upstream.
+
 * Wed Dec 17 2008 Jon Ciesla <limb at jcomserv.net> = 0.2-5.beta
 - Security fix, BZ 476830.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/roundcubemail/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	9 Oct 2008 12:53:18 -0000	1.10
+++ sources	7 Jan 2009 13:40:57 -0000	1.11
@@ -1 +1 @@
-496f5c5645c9bc77c733622182d2fabe  roundcubemail-0.2-beta-dep.tar.gz
+dac7776b063bf2314f7d7730af2b1b0f  roundcubemail-0.2-stable-dep.tar.gz



From caolanm at fedoraproject.org  Wed Jan  7 13:43:31 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Wed,  7 Jan 2009 13:43:31 +0000 (UTC)
Subject: rpms/libzzub/devel libzzub-buildfix.patch, 1.2,
	1.3 libzzub-gcc43.patch, 1.1, 1.2 libzzub.spec, 1.8, 1.9
Message-ID: <20090107134331.1714570100@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/libzzub/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8618

Modified Files:
	libzzub-buildfix.patch libzzub-gcc43.patch libzzub.spec 
Log Message:
defuzz patches and extend buildfix to get building again

libzzub-buildfix.patch:

Index: libzzub-buildfix.patch
===================================================================
RCS file: /cvs/pkgs/rpms/libzzub/devel/libzzub-buildfix.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- libzzub-buildfix.patch	20 Nov 2007 10:12:43 -0000	1.2
+++ libzzub-buildfix.patch	7 Jan 2009 13:43:30 -0000	1.3
@@ -49,3 +49,12 @@
  if cl:
  	env.Append(CCFLAGS=[
  		'-nologo',
+@@ -329,7 +329,7 @@
+ 
+ def is_cleaning():
+ 	import SCons.Script.Main 
+-	return SCons.Script.Main.options.clean
++	return False
+ 
+ if (not is_cleaning()) and ('configure' in COMMAND_LINE_TARGETS):
+ 	import os

libzzub-gcc43.patch:

Index: libzzub-gcc43.patch
===================================================================
RCS file: /cvs/pkgs/rpms/libzzub/devel/libzzub-gcc43.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libzzub-gcc43.patch	2 Mar 2008 14:13:32 -0000	1.1
+++ libzzub-gcc43.patch	7 Jan 2009 13:43:30 -0000	1.2
@@ -12,7 +12,8 @@
 diff -up libzzub-0.2.3/src/plugins/joachims_multi_v2/main.cpp.gcc43 libzzub-0.2.3/src/plugins/joachims_multi_v2/main.cpp
 --- libzzub-0.2.3/src/plugins/joachims_multi_v2/main.cpp.gcc43	2008-03-02 14:40:56.000000000 +0100
 +++ libzzub-0.2.3/src/plugins/joachims_multi_v2/main.cpp	2008-03-02 14:41:46.000000000 +0100
-@@ -17,5 +17,7 @@
+@@ -16,6 +16,8 @@
+ // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  
  #include <algorithm>
 +#include <cstring>


Index: libzzub.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libzzub/devel/libzzub.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- libzzub.spec	29 Nov 2008 16:48:07 -0000	1.8
+++ libzzub.spec	7 Jan 2009 13:43:30 -0000	1.9
@@ -1,6 +1,6 @@
 Name:		libzzub
 Version:	0.2.3
-Release:	13%{?dist}
+Release:	14%{?dist}
 Summary:	Powerful music sequencing library
 
 Group:		System Environment/Libraries
@@ -157,6 +157,9 @@
 %{python_sitelib}/*
 
 %changelog
+* Wed Jan  7 2009 Caol??n McNamara <caolanm at redhat.com> - 0.2.3-14
+- defuzz patches and extend buildfix to get building again
+
 * Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 0.2.3-13
 - Rebuild for Python 2.6
 



From jwilson at fedoraproject.org  Wed Jan  7 14:00:57 2009
From: jwilson at fedoraproject.org (Jarod Wilson)
Date: Wed,  7 Jan 2009 14:00:57 +0000 (UTC)
Subject: rpms/kernel/devel patch-2.6.28-git9.bz2.sign, NONE, 1.1 .cvsignore, 
	1.982, 1.983 kernel.spec, 1.1194, 1.1195 sources, 1.944,
	1.945 upstream, 1.856, 1.857 patch-2.6.28-git8.bz2.sign, 1.1, NONE
Message-ID: <20090107140057.10E2470100@cvs1.fedora.phx.redhat.com>

Author: jwilson

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11750

Modified Files:
	.cvsignore kernel.spec sources upstream 
Added Files:
	patch-2.6.28-git9.bz2.sign 
Removed Files:
	patch-2.6.28-git8.bz2.sign 
Log Message:
* Wed Jan 07 2009 Jarod Wilson <jarod at redhat.com>
- 2.6.28-git9
- Should resolve broken byteorder.h issues (#478663)



--- NEW FILE patch-2.6.28-git9.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBJZJpTyGugalF9Dw4RAhiOAJ9TLveme6+cJ85bINQDebm6YGLh9wCffPyC
t+QIC6FzBGcxcYSor+uUA2E=
=9XJw
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.982
retrieving revision 1.983
diff -u -r1.982 -r1.983
--- .cvsignore	6 Jan 2009 17:50:08 -0000	1.982
+++ .cvsignore	7 Jan 2009 14:00:26 -0000	1.983
@@ -4,4 +4,4 @@
 temp-*
 kernel-2.6.28
 linux-2.6.28.tar.bz2
-patch-2.6.28-git8.bz2
+patch-2.6.28-git9.bz2


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1194
retrieving revision 1.1195
diff -u -r1.1194 -r1.1195
--- kernel.spec	6 Jan 2009 17:53:33 -0000	1.1194
+++ kernel.spec	7 Jan 2009 14:00:26 -0000	1.1195
@@ -57,7 +57,7 @@
 # The rc snapshot level
 %define rcrev 0
 # The git snapshot level
-%define gitrev 8
+%define gitrev 9
 # Set rpm version accordingly
 %define rpmversion 2.6.%{upstream_sublevel}
 %endif
@@ -1751,6 +1751,10 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Wed Jan 07 2009 Jarod Wilson <jarod at redhat.com>
+- 2.6.28-git9
+- Should resolve broken byteorder.h issues (#478663)
+
 * Tue Jan 06 2009 Kyle McMartin <kyle at redhat.com>
 - 2.6.28-git8
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v
retrieving revision 1.944
retrieving revision 1.945
diff -u -r1.944 -r1.945
--- sources	6 Jan 2009 17:50:09 -0000	1.944
+++ sources	7 Jan 2009 14:00:26 -0000	1.945
@@ -1,2 +1,2 @@
 d351e44709c9810b85e29b877f50968a  linux-2.6.28.tar.bz2
-1ea4d2960b1359e0ba6ed790bb4ae4f1  patch-2.6.28-git8.bz2
+34659e8d421dce6877ba2a5a243b0533  patch-2.6.28-git9.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v
retrieving revision 1.856
retrieving revision 1.857
diff -u -r1.856 -r1.857
--- upstream	6 Jan 2009 17:50:09 -0000	1.856
+++ upstream	7 Jan 2009 14:00:26 -0000	1.857
@@ -1,2 +1,2 @@
 linux-2.6.28.tar.bz2
-patch-2.6.28-git8.bz2
+patch-2.6.28-git9.bz2


--- patch-2.6.28-git8.bz2.sign DELETED ---



From limb at fedoraproject.org  Wed Jan  7 14:04:21 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Wed,  7 Jan 2009 14:04:21 +0000 (UTC)
Subject: rpms/roundcubemail/F-10 roundcubemail.spec, 1.17, 1.18 sources, 1.10,
	1.11
Message-ID: <20090107140421.22C1170100@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/roundcubemail/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12155

Modified Files:
	roundcubemail.spec sources 
Log Message:
New upstream.



Index: roundcubemail.spec
===================================================================
RCS file: /cvs/pkgs/rpms/roundcubemail/F-10/roundcubemail.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- roundcubemail.spec	17 Dec 2008 21:02:48 -0000	1.17
+++ roundcubemail.spec	7 Jan 2009 14:03:50 -0000	1.18
@@ -1,21 +1,21 @@
 %define roundcubedir %{_datadir}/roundcubemail
 Name: roundcubemail
 Version:  0.2
-Release:  5.beta%{?dist}
+Release:  6.stable%{?dist}
 Summary: Round Cube Webmail is a browser-based multilingual IMAP client
 
 Group: Applications/System         
 License: GPLv2
 URL: http://www.roundcube.net
-Source0: roundcubemail-%{version}-beta-dep.tar.gz
+Source0: roundcubemail-%{version}-stable-dep.tar.gz
 Source1: roundcubemail.conf
 Source2: roundcubemail.logrotate
 Source4: roundcubemail-README.fedora
 Patch0: roundcubemail-0.2-beta-confpath.patch
 # From upstream, not in a release yet, BZ 476223.
-Patch1: roundcubemail-0.2-beta-html2text.patch
+#Patch1: roundcubemail-0.2-beta-html2text.patch
 # From upstream, not in a release yet, BZ 476830.
-Patch2: roundcubemail-0.2-beta-CVE-2008-5620.patch
+#Patch2: roundcubemail-0.2-beta-CVE-2008-5620.patch
 
 BuildArch: noarch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root%(%{__id_u} -n)
@@ -43,11 +43,11 @@
 interface is fully skinnable using XHTML and CSS 2.
 
 %prep
-%setup -q -n roundcubemail-0.2-beta-dep
+%setup -q -n roundcubemail-0.2-stable-dep
 
 %patch0 -p0
-%patch1 -p0
-%patch2 -p0
+#%patch1 -p0
+#%patch2 -p0
 
 # fix permissions and remove any .htaccess files
 find . -type f -print | xargs chmod a-x
@@ -135,6 +135,10 @@
 %config(noreplace) %{_sysconfdir}/logrotate.d/roundcubemail
 
 %changelog
+* Mon Jan 05 2009 Jon Ciesla <limb at jcomserv.net> = 0.2-6.stable
+- New upstream.
+- Dropped two most recent patches, applied upstream.
+
 * Wed Dec 17 2008 Jon Ciesla <limb at jcomserv.net> = 0.2-5.beta
 - Security fix, BZ 476830.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/roundcubemail/F-10/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	9 Oct 2008 12:53:18 -0000	1.10
+++ sources	7 Jan 2009 14:03:50 -0000	1.11
@@ -1 +1 @@
-496f5c5645c9bc77c733622182d2fabe  roundcubemail-0.2-beta-dep.tar.gz
+dac7776b063bf2314f7d7730af2b1b0f  roundcubemail-0.2-stable-dep.tar.gz



From mlichvar at fedoraproject.org  Wed Jan  7 14:06:51 2009
From: mlichvar at fedoraproject.org (Miroslav Lichvar)
Date: Wed,  7 Jan 2009 14:06:51 +0000 (UTC)
Subject: rpms/mutt/devel mutt-1.5.19-db47.patch, NONE, 1.1 .cvsignore, 1.18, 
	1.19 mutt.spec, 1.57, 1.58 sources, 1.18,
	1.19 mutt-1.5.18-db47.patch, 1.1, NONE mutt-1.5.18-imap.patch,
	1.1, NONE mutt-1.5.18-intr.patch, 1.1, NONE
Message-ID: <20090107140651.A758F70100@cvs1.fedora.phx.redhat.com>

Author: mlichvar

Update of /cvs/pkgs/rpms/mutt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12512

Modified Files:
	.cvsignore mutt.spec sources 
Added Files:
	mutt-1.5.19-db47.patch 
Removed Files:
	mutt-1.5.18-db47.patch mutt-1.5.18-imap.patch 
	mutt-1.5.18-intr.patch 
Log Message:
- update to 1.5.19
- switch hcache backend to tokyocabinet
- drop intr patch


mutt-1.5.19-db47.patch:

--- NEW FILE mutt-1.5.19-db47.patch ---
diff -up mutt-1.5.19/configure.db47 mutt-1.5.19/configure
--- mutt-1.5.19/configure.db47	2009-01-06 17:03:22.000000000 +0100
+++ mutt-1.5.19/configure	2009-01-06 17:05:19.000000000 +0100
@@ -16074,7 +16074,7 @@ echo "$as_me: error: GDBM could not be u
                 bdbpfx="$bdbpfx $d/$v"
             done
         done
-        BDB_VERSIONS="db-4 db4 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 ''"
+        BDB_VERSIONS="db-4 db4 db-4.7 db4.7 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 ''"
         { echo "$as_me:$LINENO: checking for BerkeleyDB > 4.0" >&5
 echo $ECHO_N "checking for BerkeleyDB > 4.0... $ECHO_C" >&6; }
         for d in $bdbpfx; do


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mutt/devel/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- .cvsignore	19 May 2008 10:50:48 -0000	1.18
+++ .cvsignore	7 Jan 2009 14:06:21 -0000	1.19
@@ -1 +1 @@
-mutt-1.5.18.tar.gz
+mutt-1.5.19.tar.gz


Index: mutt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mutt/devel/mutt.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- mutt.spec	28 Jul 2008 12:25:21 -0000	1.57
+++ mutt.spec	7 Jan 2009 14:06:21 -0000	1.58
@@ -7,15 +7,16 @@
 %bcond_without sasl
 %bcond_without idn
 %bcond_without hcache
-%bcond_without bdb
+%bcond_without tokyocabinet
+%bcond_with bdb
 %bcond_with qdbm
 %bcond_with gdbm
 %bcond_with gpgme
 
 Summary: A text mode mail user agent
 Name: mutt
-Version: 1.5.18
-Release: 4%{?dist}
+Version: 1.5.19
+Release: 1%{?dist}
 Epoch: 5
 # The entire source code is GPLv2+ except
 # pgpewrap.c setenv.c sha1.c wcwidth.c which are Public Domain
@@ -26,9 +27,7 @@
 Patch2: mutt-1.5.13-nodotlock.patch
 Patch3: mutt-1.5.18-muttrc.patch
 Patch4: mutt-1.5.18-manual.patch
-Patch5: mutt-1.5.18-intr.patch
-Patch6: mutt-1.5.18-imap.patch
-Patch7: mutt-1.5.18-db47.patch
+Patch7: mutt-1.5.19-db47.patch
 Url: http://www.mutt.org/
 Requires: mailcap urlview
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -39,6 +38,7 @@
 BuildRequires: docbook-style-xsl libxslt lynx
 
 %if %{with hcache}
+%{?with_tokyocabinet:BuildRequires: tokyocabinet-devel}
 %{?with_bdb:BuildRequires: db4-devel}
 %{?with_qdbm:BuildRequires: qdbm-devel}
 %{?with_gdbm:BuildRequires: gdbm-devel}
@@ -66,8 +66,6 @@
 %patch2 -p1 -b .nodl
 %patch3 -p1 -b .muttrc
 %patch4 -p1 -b .manual
-%patch5 -p1 -b .intr
-%patch6 -p1 -b .imap
 %patch7 -p1 -b .db47
 
 install -p -m644 %{SOURCE1} mutt_ldap_query
@@ -80,6 +78,7 @@
 %{?with_smtp:	--enable-smtp} \
 %if %{with hcache}
 		--enable-hcache \
+%{!?with_tokyocabinet:	--without-tokyocabinet} \
 %{!?with_gdbm:	--without-gdbm} \
 %{!?with_qdbm:	--without-qdbm} \
 %endif
@@ -143,6 +142,11 @@
 %{_mandir}/man5/muttrc.*
 
 %changelog
+* Wed Jan 07 2009 Miroslav Lichvar <mlichvar at redhat.com> 5:1.5.19-1
+- update to 1.5.19
+- switch hcache backend to tokyocabinet
+- drop intr patch
+
 * Mon Jul 28 2008 Miroslav Lichvar <mlichvar at redhat.com> 5:1.5.18-4
 - rebuild with db4.7 (Robert Scheck) (#455144)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mutt/devel/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources	19 May 2008 10:50:48 -0000	1.18
+++ sources	7 Jan 2009 14:06:21 -0000	1.19
@@ -1 +1 @@
-27c30037120189b9f9c0d3e76361b8f8  mutt-1.5.18.tar.gz
+73b3747bc7f7c805921e8d24ebac693f  mutt-1.5.19.tar.gz


--- mutt-1.5.18-db47.patch DELETED ---


--- mutt-1.5.18-imap.patch DELETED ---


--- mutt-1.5.18-intr.patch DELETED ---



From mlichvar at fedoraproject.org  Wed Jan  7 14:15:29 2009
From: mlichvar at fedoraproject.org (Miroslav Lichvar)
Date: Wed,  7 Jan 2009 14:15:29 +0000 (UTC)
Subject: rpms/mutt/F-10 mutt-1.5.19-db47.patch, NONE, 1.1 .cvsignore, 1.18, 
	1.19 mutt.spec, 1.57, 1.58 sources, 1.18,
	1.19 mutt-1.5.18-db47.patch, 1.1, NONE mutt-1.5.18-imap.patch,
	1.1, NONE mutt-1.5.18-intr.patch, 1.1, NONE
Message-ID: <20090107141529.A5E6E70100@cvs1.fedora.phx.redhat.com>

Author: mlichvar

Update of /cvs/pkgs/rpms/mutt/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13701

Modified Files:
	.cvsignore mutt.spec sources 
Added Files:
	mutt-1.5.19-db47.patch 
Removed Files:
	mutt-1.5.18-db47.patch mutt-1.5.18-imap.patch 
	mutt-1.5.18-intr.patch 
Log Message:
- update to 1.5.19
- switch hcache backend to tokyocabinet
- drop intr patch


mutt-1.5.19-db47.patch:

--- NEW FILE mutt-1.5.19-db47.patch ---
diff -up mutt-1.5.19/configure.db47 mutt-1.5.19/configure
--- mutt-1.5.19/configure.db47	2009-01-06 17:03:22.000000000 +0100
+++ mutt-1.5.19/configure	2009-01-06 17:05:19.000000000 +0100
@@ -16074,7 +16074,7 @@ echo "$as_me: error: GDBM could not be u
                 bdbpfx="$bdbpfx $d/$v"
             done
         done
-        BDB_VERSIONS="db-4 db4 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 ''"
+        BDB_VERSIONS="db-4 db4 db-4.7 db4.7 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 ''"
         { echo "$as_me:$LINENO: checking for BerkeleyDB > 4.0" >&5
 echo $ECHO_N "checking for BerkeleyDB > 4.0... $ECHO_C" >&6; }
         for d in $bdbpfx; do


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mutt/F-10/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- .cvsignore	19 May 2008 10:50:48 -0000	1.18
+++ .cvsignore	7 Jan 2009 14:14:59 -0000	1.19
@@ -1 +1 @@
-mutt-1.5.18.tar.gz
+mutt-1.5.19.tar.gz


Index: mutt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mutt/F-10/mutt.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- mutt.spec	28 Jul 2008 12:25:21 -0000	1.57
+++ mutt.spec	7 Jan 2009 14:14:59 -0000	1.58
@@ -7,15 +7,16 @@
 %bcond_without sasl
 %bcond_without idn
 %bcond_without hcache
-%bcond_without bdb
+%bcond_without tokyocabinet
+%bcond_with bdb
 %bcond_with qdbm
 %bcond_with gdbm
 %bcond_with gpgme
 
 Summary: A text mode mail user agent
 Name: mutt
-Version: 1.5.18
-Release: 4%{?dist}
+Version: 1.5.19
+Release: 1%{?dist}
 Epoch: 5
 # The entire source code is GPLv2+ except
 # pgpewrap.c setenv.c sha1.c wcwidth.c which are Public Domain
@@ -26,9 +27,7 @@
 Patch2: mutt-1.5.13-nodotlock.patch
 Patch3: mutt-1.5.18-muttrc.patch
 Patch4: mutt-1.5.18-manual.patch
-Patch5: mutt-1.5.18-intr.patch
-Patch6: mutt-1.5.18-imap.patch
-Patch7: mutt-1.5.18-db47.patch
+Patch7: mutt-1.5.19-db47.patch
 Url: http://www.mutt.org/
 Requires: mailcap urlview
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -39,6 +38,7 @@
 BuildRequires: docbook-style-xsl libxslt lynx
 
 %if %{with hcache}
+%{?with_tokyocabinet:BuildRequires: tokyocabinet-devel}
 %{?with_bdb:BuildRequires: db4-devel}
 %{?with_qdbm:BuildRequires: qdbm-devel}
 %{?with_gdbm:BuildRequires: gdbm-devel}
@@ -66,8 +66,6 @@
 %patch2 -p1 -b .nodl
 %patch3 -p1 -b .muttrc
 %patch4 -p1 -b .manual
-%patch5 -p1 -b .intr
-%patch6 -p1 -b .imap
 %patch7 -p1 -b .db47
 
 install -p -m644 %{SOURCE1} mutt_ldap_query
@@ -80,6 +78,7 @@
 %{?with_smtp:	--enable-smtp} \
 %if %{with hcache}
 		--enable-hcache \
+%{!?with_tokyocabinet:	--without-tokyocabinet} \
 %{!?with_gdbm:	--without-gdbm} \
 %{!?with_qdbm:	--without-qdbm} \
 %endif
@@ -143,6 +142,11 @@
 %{_mandir}/man5/muttrc.*
 
 %changelog
+* Wed Jan 07 2009 Miroslav Lichvar <mlichvar at redhat.com> 5:1.5.19-1
+- update to 1.5.19
+- switch hcache backend to tokyocabinet
+- drop intr patch
+
 * Mon Jul 28 2008 Miroslav Lichvar <mlichvar at redhat.com> 5:1.5.18-4
 - rebuild with db4.7 (Robert Scheck) (#455144)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mutt/F-10/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources	19 May 2008 10:50:48 -0000	1.18
+++ sources	7 Jan 2009 14:14:59 -0000	1.19
@@ -1 +1 @@
-27c30037120189b9f9c0d3e76361b8f8  mutt-1.5.18.tar.gz
+73b3747bc7f7c805921e8d24ebac693f  mutt-1.5.19.tar.gz


--- mutt-1.5.18-db47.patch DELETED ---


--- mutt-1.5.18-imap.patch DELETED ---


--- mutt-1.5.18-intr.patch DELETED ---



From bkearney at fedoraproject.org  Wed Jan  7 14:17:59 2009
From: bkearney at fedoraproject.org (Bryan Kearney)
Date: Wed,  7 Jan 2009 14:17:59 +0000 (UTC)
Subject: rpms/ace/devel .cvsignore, 1.3, 1.4 ace.spec, 1.5, 1.6 import.log,
	1.2, 1.3 sources, 1.3, 1.4
Message-ID: <20090107141759.9E29570100@cvs1.fedora.phx.redhat.com>

Author: bkearney

Update of /cvs/pkgs/rpms/ace/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14224/devel

Modified Files:
	.cvsignore ace.spec import.log sources 
Log Message:
- Status of puppet script is reflected in command line and init script
- Executingn 'ace --verbose' now provides real time view of puppet output
- Will work with new puppet which includes the augas plugin




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ace/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	16 Dec 2008 21:26:12 -0000	1.3
+++ .cvsignore	7 Jan 2009 14:17:29 -0000	1.4
@@ -1 +1 @@
-ace-0.0.4.tar.gz
+ace-0.0.5.tar.gz


Index: ace.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ace/devel/ace.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ace.spec	16 Dec 2008 21:26:12 -0000	1.5
+++ ace.spec	7 Jan 2009 14:17:29 -0000	1.6
@@ -11,7 +11,7 @@
 ##############
 Summary: 			Appliance Configuration Engine
 Name: 				ace
-Version: 			0.0.4
+Version: 			0.0.5
 Release: 			1%{?dist}
 
 Group: 				Applications/Internet
@@ -20,9 +20,9 @@
 Source0: 			%{url}/download/%{name}-%{version}.tar.gz
 BuildRoot: 			%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: 			noarch
-BuildRequires:			ruby(abi) = 1.8
-BuildRequires:  		ruby-devel >=  1.8
-BuildRequires:  		ruby
+BuildRequires:		ruby(abi) = 1.8
+BuildRequires:  	ruby-devel >=  1.8
+BuildRequires:  	ruby
 Requires: 			yum
 Requires:			ruby(abi) = 1.8
 Requires: 			puppet
@@ -256,6 +256,15 @@
 # Changelog
 ###########
 %changelog
+* Tue Jan 07 2009 Bryan Kearney <bkearney at redhat.com> 0.0.5-1
+- Status of puppet script is reflected in command line and init script
+- Executingn 'ace --verbose' now provides real time view of puppet output
+- Will work with new puppet which includes the augas plugin
+
+* Tue Dec 16 2008 Bryan Kearney <bkearney at redhat.com> 0.0.4-1
+- Postgres packages did not enforfce dependencies correctly
+- init script can handle many appliances
+
 * Tue Dec 2 2008 Bryan Kearney <bkearney at redhat.com> 0.0.3-7
 - Modify the build requires to include the ruby binary
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/ace/devel/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	16 Dec 2008 21:26:12 -0000	1.2
+++ import.log	7 Jan 2009 14:17:29 -0000	1.3
@@ -1,2 +1,3 @@
 ace-0_0_3-5_fc9:HEAD:ace-0.0.3-5.fc9.src.rpm:1227642317
 ace-0_0_4-1_fc10:HEAD:ace-0.0.4-1.fc10.src.rpm:1229462438
+ace-0_0_5-1_fc10:HEAD:ace-0.0.5-1.fc10.src.rpm:1231337529


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ace/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	16 Dec 2008 21:26:12 -0000	1.3
+++ sources	7 Jan 2009 14:17:29 -0000	1.4
@@ -1 +1 @@
-9870c9bab904e8a6640b9a9beeed9f41  ace-0.0.4.tar.gz
+a89ca5cf9a73bc6229737f43fe7efdbe  ace-0.0.5.tar.gz



From bkearney at fedoraproject.org  Wed Jan  7 14:25:11 2009
From: bkearney at fedoraproject.org (Bryan Kearney)
Date: Wed,  7 Jan 2009 14:25:11 +0000 (UTC)
Subject: rpms/ace/F-10 .cvsignore, 1.3, 1.4 ace.spec, 1.4, 1.5 import.log,
	1.2, 1.3 sources, 1.3, 1.4
Message-ID: <20090107142511.73B5B70100@cvs1.fedora.phx.redhat.com>

Author: bkearney

Update of /cvs/pkgs/rpms/ace/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15800/F-10

Modified Files:
	.cvsignore ace.spec import.log sources 
Log Message:
- Status of puppet script is reflected in command line and init script
- Executingn 'ace --verbose' now provides real time view of puppet output
- Will work with new puppet which includes the augas plugin




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ace/F-10/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	16 Dec 2008 21:39:51 -0000	1.3
+++ .cvsignore	7 Jan 2009 14:24:40 -0000	1.4
@@ -1 +1 @@
-ace-0.0.4.tar.gz
+ace-0.0.5.tar.gz


Index: ace.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ace/F-10/ace.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ace.spec	16 Dec 2008 22:00:57 -0000	1.4
+++ ace.spec	7 Jan 2009 14:24:41 -0000	1.5
@@ -11,7 +11,7 @@
 ##############
 Summary: 			Appliance Configuration Engine
 Name: 				ace
-Version: 			0.0.4
+Version: 			0.0.5
 Release: 			1%{?dist}
 
 Group: 				Applications/Internet
@@ -20,9 +20,9 @@
 Source0: 			%{url}/download/%{name}-%{version}.tar.gz
 BuildRoot: 			%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: 			noarch
-BuildRequires:			ruby(abi) = 1.8
-BuildRequires:  		ruby-devel >=  1.8
-BuildRequires:  		ruby
+BuildRequires:		ruby(abi) = 1.8
+BuildRequires:  	ruby-devel >=  1.8
+BuildRequires:  	ruby
 Requires: 			yum
 Requires:			ruby(abi) = 1.8
 Requires: 			puppet
@@ -256,6 +256,11 @@
 # Changelog
 ###########
 %changelog
+* Tue Jan 07 2009 Bryan Kearney <bkearney at redhat.com> 0.0.5-1
+- Status of puppet script is reflected in command line and init script
+- Executingn 'ace --verbose' now provides real time view of puppet output
+- Will work with new puppet which includes the augas plugin
+
 * Tue Dec 16 2008 Bryan Kearney <bkearney at redhat.com> 0.0.4-1
 - Postgres packages did not enforfce dependencies correctly
 - init script can handle many appliances


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/ace/F-10/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	16 Dec 2008 21:39:52 -0000	1.2
+++ import.log	7 Jan 2009 14:24:41 -0000	1.3
@@ -1,2 +1,3 @@
 ace-0_0_3-5_fc9:F-10:ace-0.0.3-5.fc9.src.rpm:1227643185
 ace-0_0_4-1_fc10:F-10:ace-0.0.4-1.fc10.src.rpm:1229462881
+ace-0_0_5-1_fc10:F-10:ace-0.0.5-1.fc10.src.rpm:1231337987


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ace/F-10/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	16 Dec 2008 21:39:52 -0000	1.3
+++ sources	7 Jan 2009 14:24:41 -0000	1.4
@@ -1 +1 @@
-9870c9bab904e8a6640b9a9beeed9f41  ace-0.0.4.tar.gz
+a89ca5cf9a73bc6229737f43fe7efdbe  ace-0.0.5.tar.gz



From ltinkl at fedoraproject.org  Wed Jan  7 14:32:30 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Wed,  7 Jan 2009 14:32:30 +0000 (UTC)
Subject: rpms/kdelibs/F-10 kdelibs-4.1.4-policykit-workaround.patch, NONE,
	1.1 kdelibs.spec, 1.390,
	1.391 kdelibs-4.1.3-policykit-workaround.patch, 1.2, NONE
Message-ID: <20090107143230.5C28E70100@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kdelibs/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16869

Modified Files:
	kdelibs.spec 
Added Files:
	kdelibs-4.1.4-policykit-workaround.patch 
Removed Files:
	kdelibs-4.1.3-policykit-workaround.patch 
Log Message:
fix PolicyKit patch


kdelibs-4.1.4-policykit-workaround.patch:

--- NEW FILE kdelibs-4.1.4-policykit-workaround.patch ---
Pouze v kdelibs-4.1.4: kdelibs-4.1.3-policykit-workaround.patch
diff -ur kdelibs-orig/solid/solid/backends/hal/halstorageaccess.cpp kdelibs-4.1.4/solid/solid/backends/hal/halstorageaccess.cpp
--- kdelibs-orig/solid/solid/backends/hal/halstorageaccess.cpp	2009-01-07 00:34:55.000000000 +0100
+++ kdelibs-4.1.4/solid/solid/backends/hal/halstorageaccess.cpp	2009-01-07 15:26:27.000000000 +0100
@@ -17,10 +17,13 @@
 
 */
 
+#include <config-prefix.h> // for LIBEXEC_INSTALL_DIR
+
 #include "halstorageaccess.h"
 
 #include <QtCore/QLocale>
 #include <QtCore/QDebug>
+#include <QtCore/QProcess>
 #include <QtDBus/QDBusConnection>
 #include <QtDBus/QDBusInterface>
 #include <QtDBus/QDBusReply>
@@ -137,11 +140,21 @@
 {
     // TODO: Better error reporting here
     if (m_setupInProgress) {
+        if (error.name() == "org.freedesktop.Hal.Device.PermissionDeniedByPolicy") {
+            if (callPrivilegedMount())
+              return;
+            // if we fail to run kdesu, fall through and emit the original PermissionDeniedByPolicy error
+        }
         m_setupInProgress = false;
         emit setupDone(Solid::UnauthorizedOperation,
                        error.name()+": "+error.message(),
                        m_device->udi());
     } else if (m_teardownInProgress) {
+        if (error.name() == "org.freedesktop.Hal.Device.PermissionDeniedByPolicy") {
+            if (callPrivilegedUnmount())
+              return;
+            // if we fail to run kdesu, fall through and emit the original PermissionDeniedByPolicy error
+        }
         m_teardownInProgress = false;
         emit teardownDone(Solid::UnauthorizedOperation,
                           error.name()+": "+error.message(),
@@ -314,6 +327,59 @@
                               SLOT(slotDBusError(const QDBusError &)));
 }
 
+bool Solid::Backends::Hal::StorageAccess::callPrivilegedMount()
+{
+    QString udi = m_device->udi();
+    QString options;
+    QStringList halOptions = m_device->property("volume.mount.valid_options").toStringList();
+    QString fstype = m_device->property("volume.fstype").toString();
+
+    if (halOptions.contains("uid=")
+        && (fstype == "vfat" || fstype == "iso9660" || fstype == "hfs" || fstype == "udf")) {
+        options = "uid="+QString::number(::getuid());
+    }
+
+    m_process = new QProcess(this);
+
+    connect(m_process, SIGNAL(finished(int, QProcess::ExitStatus)),
+            this, SLOT(slotProcessFinished(int, QProcess::ExitStatus)));
+
+    m_process->start(LIBEXEC_INSTALL_DIR "/kdesu", QStringList() << "-d" << "-t"
+        << "--noignorebutton" << "-c"
+        << QString::fromLatin1("dbus-send  --system --print-reply --dest=org.freedesktop.Hal %1 "
+                               "org.freedesktop.Hal.Device.Volume.Mount string: string: "
+                               "array:string:%2").arg(udi).arg(options));
+
+    if (m_process->waitForStarted()) {
+        return true;
+    } else {
+        delete m_process;
+        return false;
+    }
+}
+
+bool Solid::Backends::Hal::StorageAccess::callPrivilegedUnmount()
+{
+    QString udi = m_device->udi();
+
+    m_process = new QProcess(this);
+
+    connect(m_process, SIGNAL(finished(int, QProcess::ExitStatus)),
+            this, SLOT(slotProcessFinished(int, QProcess::ExitStatus)));
+
+    m_process->start(LIBEXEC_INSTALL_DIR "/kdesu", QStringList() << "-d" << "-t"
+        << "--noignorebutton" << "-c"
+        << QString::fromLatin1("dbus-send  --system --print-reply --dest=org.freedesktop.Hal %1 "
+                               "org.freedesktop.Hal.Device.Volume.Unmount array:string:").arg(udi));
+
+    if (m_process->waitForStarted()) {
+        return true;
+    } else {
+        delete m_process;
+        return false;
+    }
+}
+
 bool Solid::Backends::Hal::StorageAccess::callSystemMount()
 {
     const QString device = m_device->property("block.device").toString();
diff -ur kdelibs-orig/solid/solid/backends/hal/halstorageaccess.h kdelibs-4.1.4/solid/solid/backends/hal/halstorageaccess.h
--- kdelibs-orig/solid/solid/backends/hal/halstorageaccess.h	2009-01-07 00:34:55.000000000 +0100
+++ kdelibs-4.1.4/solid/solid/backends/hal/halstorageaccess.h	2009-01-07 15:26:27.000000000 +0100
@@ -69,6 +69,9 @@
     bool callSystemMount();
     bool callSystemUnmount();
 
+    bool callPrivilegedMount();
+    bool callPrivilegedUnmount();
+
     bool requestPassphrase();
     void callCryptoSetup(const QString &passphrase);
     bool callCryptoTeardown();


Index: kdelibs.spec
===================================================================
RCS file: /cvs/extras/rpms/kdelibs/F-10/kdelibs.spec,v
retrieving revision 1.390
retrieving revision 1.391
diff -u -r1.390 -r1.391
--- kdelibs.spec	7 Jan 2009 12:27:19 -0000	1.390
+++ kdelibs.spec	7 Jan 2009 14:31:59 -0000	1.391
@@ -69,7 +69,7 @@
 # are loaded from kde4rc
 Patch10: kdelibs-4.0.2-no-cache-kdeglobals-paths.patch
 # workarounds for policykit and NTFS
-Patch11: kdelibs-4.1.3-policykit-workaround.patch
+Patch11: kdelibs-4.1.4-policykit-workaround.patch
 Patch12: kdelibs-4.1.0-xdg-menu.patch
 # patch KStandardDirs to use %{_libexecdir}/kde4 instead of %{_libdir}/kde4/libexec
 Patch14: kdelibs-4.0.85-libexecdir.patch


--- kdelibs-4.1.3-policykit-workaround.patch DELETED ---



From matt at fedoraproject.org  Wed Jan  7 14:33:15 2009
From: matt at fedoraproject.org (Matthew Farrellee)
Date: Wed,  7 Jan 2009 14:33:15 +0000 (UTC)
Subject: rpms/classads/F-9 .cvsignore, 1.3, 1.4 classads.spec, 1.3,
	1.4 sources, 1.3, 1.4
Message-ID: <20090107143315.7459370100@cvs1.fedora.phx.redhat.com>

Author: matt

Update of /cvs/pkgs/rpms/classads/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17020

Modified Files:
	.cvsignore classads.spec sources 
Log Message:
update to classads 1.0.1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/classads/F-9/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	7 Apr 2008 13:12:01 -0000	1.3
+++ .cvsignore	7 Jan 2009 14:32:44 -0000	1.4
@@ -1 +1 @@
-classads-1.0.tar.gz
+classads-1.0.1.tar.gz


Index: classads.spec
===================================================================
RCS file: /cvs/pkgs/rpms/classads/F-9/classads.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- classads.spec	7 Apr 2008 13:27:04 -0000	1.3
+++ classads.spec	7 Jan 2009 14:32:45 -0000	1.4
@@ -1,13 +1,11 @@
-# NOTE: When updating the version change the Source0 and %setup lines
-
-Summary: Condor's ClassAd Library
+Summary: Condor's classified advertisement language
 Name: classads
-Version: 1.0
+Version: 1.0.1
 Release: 1%{?dist}
 License: ASL 2.0
 Group: Development/Libraries
 URL: http://www.cs.wisc.edu/condor/classad/
-Source0: ftp://ftp.cs.wisc.edu/condor/classad/c++/classads-1.0.tar.gz
+Source0: ftp://ftp.cs.wisc.edu/condor/classad/c++/classads-1.0.1.tar.gz
 Patch0: f9_gcc_header.patch
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
@@ -38,7 +36,7 @@
 compatibility of jobs and workstations where they may be run.
 
 %package devel
-Summary: Headers for Condor's ClassAd Library
+Summary: Headers for Condor's classified advertisement language
 Group: Development/System
 Requires: %name = %version-%release
 Requires: pcre-devel
@@ -48,7 +46,7 @@
 semi-structured representation of data.
 
 %package static
-Summary: Condor's ClassAd Library's static libraries
+Summary: Condor's classified advertisement language's static libraries
 Group: Development/System
 Requires: %name = %version-%release
 
@@ -57,7 +55,7 @@
 and flexible, semi-structured representation of data.
 
 %prep
-%setup -q -n classads-1.0
+%setup -q
 %patch0 -p1
 
 %build
@@ -95,6 +93,7 @@
 %_bindir/cxi_ns
 %_libdir/libclassad.so
 %_libdir/libclassad_ns.so
+%dir %_includedir/classad/
 %_includedir/classad/attrrefs.h
 %_includedir/classad/cclassad.h
 %_includedir/classad/classad_distribution.h
@@ -138,6 +137,13 @@
 
 
 %changelog
+* Tue Jan  6 2009  <matt at redhat> - 1.0.1-1
+- Upgraded to 1.0.1 release:
+-  New functions: ifThenElse, regexps, interval
+-  Source files renamed from .C to .cpp
+- Fixed unowned /usr/include/classad directory (BZ473636)
+- Updated summaries
+
 * Mon Apr  7 2008  <mfarrellee at redhat> - 1.0-1
 - Upgraded to 1.0 release
 - Resolved: bz432211, bz432212, and bz432213


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/classads/F-9/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	7 Apr 2008 13:12:01 -0000	1.3
+++ sources	7 Jan 2009 14:32:45 -0000	1.4
@@ -1 +1 @@
-10cf1743ed838b4d606b6d86d7494595  classads-1.0.tar.gz
+c98906c025ab9a9381e644e9d7094d6d  classads-1.0.1.tar.gz



From bkearney at fedoraproject.org  Wed Jan  7 14:33:33 2009
From: bkearney at fedoraproject.org (Bryan Kearney)
Date: Wed,  7 Jan 2009 14:33:33 +0000 (UTC)
Subject: rpms/ace/F-9 .cvsignore, 1.3, 1.4 ace.spec, 1.4, 1.5 import.log, 1.2,
	1.3 sources, 1.3, 1.4
Message-ID: <20090107143333.0D9EB70100@cvs1.fedora.phx.redhat.com>

Author: bkearney

Update of /cvs/pkgs/rpms/ace/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17131/F-9

Modified Files:
	.cvsignore ace.spec import.log sources 
Log Message:
- Status of puppet script is reflected in command line and init script
- Executingn 'ace --verbose' now provides real time view of puppet output
- Will work with new puppet which includes the augas plugin



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ace/F-9/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	16 Dec 2008 21:47:21 -0000	1.3
+++ .cvsignore	7 Jan 2009 14:33:02 -0000	1.4
@@ -1 +1 @@
-ace-0.0.4.tar.gz
+ace-0.0.5.tar.gz


Index: ace.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ace/F-9/ace.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ace.spec	17 Dec 2008 14:10:52 -0000	1.4
+++ ace.spec	7 Jan 2009 14:33:02 -0000	1.5
@@ -11,7 +11,7 @@
 ##############
 Summary: 			Appliance Configuration Engine
 Name: 				ace
-Version: 			0.0.4
+Version: 			0.0.5
 Release: 			1%{?dist}
 
 Group: 				Applications/Internet
@@ -20,9 +20,9 @@
 Source0: 			%{url}/download/%{name}-%{version}.tar.gz
 BuildRoot: 			%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: 			noarch
-BuildRequires:			ruby(abi) = 1.8
-BuildRequires:  		ruby-devel >=  1.8
-BuildRequires:  		ruby
+BuildRequires:		ruby(abi) = 1.8
+BuildRequires:  	ruby-devel >=  1.8
+BuildRequires:  	ruby
 Requires: 			yum
 Requires:			ruby(abi) = 1.8
 Requires: 			puppet
@@ -256,6 +256,11 @@
 # Changelog
 ###########
 %changelog
+* Tue Jan 07 2009 Bryan Kearney <bkearney at redhat.com> 0.0.5-1
+- Status of puppet script is reflected in command line and init script
+- Executingn 'ace --verbose' now provides real time view of puppet output
+- Will work with new puppet which includes the augas plugin
+
 * Tue Dec 16 2008 Bryan Kearney <bkearney at redhat.com> 0.0.4-1
 - Postgres packages did not enforfce dependencies correctly
 - init script can handle many appliances


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/ace/F-9/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	16 Dec 2008 21:47:22 -0000	1.2
+++ import.log	7 Jan 2009 14:33:02 -0000	1.3
@@ -1,2 +1,3 @@
 ace-0_0_3-5_fc9:F-9:ace-0.0.3-5.fc9.src.rpm:1227642960
 ace-0_0_4-1_fc10:F-9:ace-0.0.4-1.fc10.src.rpm:1229463386
+ace-0_0_5-1_fc10:F-9:ace-0.0.5-1.fc10.src.rpm:1231338427


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ace/F-9/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	16 Dec 2008 21:47:22 -0000	1.3
+++ sources	7 Jan 2009 14:33:02 -0000	1.4
@@ -1 +1 @@
-9870c9bab904e8a6640b9a9beeed9f41  ace-0.0.4.tar.gz
+a89ca5cf9a73bc6229737f43fe7efdbe  ace-0.0.5.tar.gz



From ltinkl at fedoraproject.org  Wed Jan  7 14:35:06 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Wed,  7 Jan 2009 14:35:06 +0000 (UTC)
Subject: rpms/kdelibs/F-9 kdelibs-4.1.4-policykit-workaround.patch, NONE,
	1.1 kdelibs.spec, 1.368,
	1.369 kdelibs-4.1.3-policykit-workaround.patch, 1.2, NONE
Message-ID: <20090107143506.817C270100@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kdelibs/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17443

Modified Files:
	kdelibs.spec 
Added Files:
	kdelibs-4.1.4-policykit-workaround.patch 
Removed Files:
	kdelibs-4.1.3-policykit-workaround.patch 
Log Message:
fix PolicyKit patch


kdelibs-4.1.4-policykit-workaround.patch:

--- NEW FILE kdelibs-4.1.4-policykit-workaround.patch ---
Pouze v kdelibs-4.1.4: kdelibs-4.1.3-policykit-workaround.patch
diff -ur kdelibs-orig/solid/solid/backends/hal/halstorageaccess.cpp kdelibs-4.1.4/solid/solid/backends/hal/halstorageaccess.cpp
--- kdelibs-orig/solid/solid/backends/hal/halstorageaccess.cpp	2009-01-07 00:34:55.000000000 +0100
+++ kdelibs-4.1.4/solid/solid/backends/hal/halstorageaccess.cpp	2009-01-07 15:26:27.000000000 +0100
@@ -17,10 +17,13 @@
 
 */
 
+#include <config-prefix.h> // for LIBEXEC_INSTALL_DIR
+
 #include "halstorageaccess.h"
 
 #include <QtCore/QLocale>
 #include <QtCore/QDebug>
+#include <QtCore/QProcess>
 #include <QtDBus/QDBusConnection>
 #include <QtDBus/QDBusInterface>
 #include <QtDBus/QDBusReply>
@@ -137,11 +140,21 @@
 {
     // TODO: Better error reporting here
     if (m_setupInProgress) {
+        if (error.name() == "org.freedesktop.Hal.Device.PermissionDeniedByPolicy") {
+            if (callPrivilegedMount())
+              return;
+            // if we fail to run kdesu, fall through and emit the original PermissionDeniedByPolicy error
+        }
         m_setupInProgress = false;
         emit setupDone(Solid::UnauthorizedOperation,
                        error.name()+": "+error.message(),
                        m_device->udi());
     } else if (m_teardownInProgress) {
+        if (error.name() == "org.freedesktop.Hal.Device.PermissionDeniedByPolicy") {
+            if (callPrivilegedUnmount())
+              return;
+            // if we fail to run kdesu, fall through and emit the original PermissionDeniedByPolicy error
+        }
         m_teardownInProgress = false;
         emit teardownDone(Solid::UnauthorizedOperation,
                           error.name()+": "+error.message(),
@@ -314,6 +327,59 @@
                               SLOT(slotDBusError(const QDBusError &)));
 }
 
+bool Solid::Backends::Hal::StorageAccess::callPrivilegedMount()
+{
+    QString udi = m_device->udi();
+    QString options;
+    QStringList halOptions = m_device->property("volume.mount.valid_options").toStringList();
+    QString fstype = m_device->property("volume.fstype").toString();
+
+    if (halOptions.contains("uid=")
+        && (fstype == "vfat" || fstype == "iso9660" || fstype == "hfs" || fstype == "udf")) {
+        options = "uid="+QString::number(::getuid());
+    }
+
+    m_process = new QProcess(this);
+
+    connect(m_process, SIGNAL(finished(int, QProcess::ExitStatus)),
+            this, SLOT(slotProcessFinished(int, QProcess::ExitStatus)));
+
+    m_process->start(LIBEXEC_INSTALL_DIR "/kdesu", QStringList() << "-d" << "-t"
+        << "--noignorebutton" << "-c"
+        << QString::fromLatin1("dbus-send  --system --print-reply --dest=org.freedesktop.Hal %1 "
+                               "org.freedesktop.Hal.Device.Volume.Mount string: string: "
+                               "array:string:%2").arg(udi).arg(options));
+
+    if (m_process->waitForStarted()) {
+        return true;
+    } else {
+        delete m_process;
+        return false;
+    }
+}
+
+bool Solid::Backends::Hal::StorageAccess::callPrivilegedUnmount()
+{
+    QString udi = m_device->udi();
+
+    m_process = new QProcess(this);
+
+    connect(m_process, SIGNAL(finished(int, QProcess::ExitStatus)),
+            this, SLOT(slotProcessFinished(int, QProcess::ExitStatus)));
+
+    m_process->start(LIBEXEC_INSTALL_DIR "/kdesu", QStringList() << "-d" << "-t"
+        << "--noignorebutton" << "-c"
+        << QString::fromLatin1("dbus-send  --system --print-reply --dest=org.freedesktop.Hal %1 "
+                               "org.freedesktop.Hal.Device.Volume.Unmount array:string:").arg(udi));
+
+    if (m_process->waitForStarted()) {
+        return true;
+    } else {
+        delete m_process;
+        return false;
+    }
+}
+
 bool Solid::Backends::Hal::StorageAccess::callSystemMount()
 {
     const QString device = m_device->property("block.device").toString();
diff -ur kdelibs-orig/solid/solid/backends/hal/halstorageaccess.h kdelibs-4.1.4/solid/solid/backends/hal/halstorageaccess.h
--- kdelibs-orig/solid/solid/backends/hal/halstorageaccess.h	2009-01-07 00:34:55.000000000 +0100
+++ kdelibs-4.1.4/solid/solid/backends/hal/halstorageaccess.h	2009-01-07 15:26:27.000000000 +0100
@@ -69,6 +69,9 @@
     bool callSystemMount();
     bool callSystemUnmount();
 
+    bool callPrivilegedMount();
+    bool callPrivilegedUnmount();
+
     bool requestPassphrase();
     void callCryptoSetup(const QString &passphrase);
     bool callCryptoTeardown();


Index: kdelibs.spec
===================================================================
RCS file: /cvs/extras/rpms/kdelibs/F-9/kdelibs.spec,v
retrieving revision 1.368
retrieving revision 1.369
diff -u -r1.368 -r1.369
--- kdelibs.spec	7 Jan 2009 12:29:00 -0000	1.368
+++ kdelibs.spec	7 Jan 2009 14:34:36 -0000	1.369
@@ -69,7 +69,7 @@
 # are loaded from kde4rc
 Patch10: kdelibs-4.0.2-no-cache-kdeglobals-paths.patch
 # workarounds for policykit and NTFS
-Patch11: kdelibs-4.1.3-policykit-workaround.patch
+Patch11: kdelibs-4.1.4-policykit-workaround.patch
 Patch12: kdelibs-4.1.0-xdg-menu.patch
 # patch KStandardDirs to use %{_libexecdir}/kde4 instead of %{_libdir}/kde4/libexec
 Patch14: kdelibs-4.0.85-libexecdir.patch


--- kdelibs-4.1.3-policykit-workaround.patch DELETED ---



From drago01 at fedoraproject.org  Wed Jan  7 14:37:30 2009
From: drago01 at fedoraproject.org (Adel Gadllah)
Date: Wed,  7 Jan 2009 14:37:30 +0000 (UTC)
Subject: rpms/libburn/devel .cvsignore, 1.7, 1.8 libburn.spec, 1.13,
	1.14 sources, 1.8, 1.9
Message-ID: <20090107143730.D1E2E70100@cvs1.fedora.phx.redhat.com>

Author: drago01

Update of /cvs/pkgs/rpms/libburn/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18024

Modified Files:
	.cvsignore libburn.spec sources 
Log Message:
Update to 0.6.0


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libburn/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	11 Jun 2008 07:18:50 -0000	1.7
+++ .cvsignore	7 Jan 2009 14:37:00 -0000	1.8
@@ -1 +1 @@
-libburn-0.4.8.pl00.tar.gz
+libburn-0.6.0.pl00.tar.gz


Index: libburn.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libburn/devel/libburn.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- libburn.spec	5 Aug 2008 21:20:19 -0000	1.13
+++ libburn.spec	7 Jan 2009 14:37:00 -0000	1.14
@@ -1,6 +1,6 @@
 Name:           libburn
-Version:        0.4.8
-Release:        2%{?dist}
+Version:        0.6.0
+Release:        1%{?dist}
 Summary:        Library for reading, mastering and writing optical discs
 
 Group:          System Environment/Libraries
@@ -92,6 +92,9 @@
 
 
 %changelog
+* Wed Jan 07 2009 Adel Gadllah <adel.gadllah at gmail.com> - 0.6.0-1
+- New upstream version
+
 * Tue Aug  5 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.4.8-2
 - fix license tag
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libburn/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	11 Jun 2008 07:18:50 -0000	1.8
+++ sources	7 Jan 2009 14:37:00 -0000	1.9
@@ -1 +1 @@
-c1322d307d51a53c279520f8b124ba9b  libburn-0.4.8.pl00.tar.gz
+3c8ec5a3e129099fb31f91b2c081fa5a  libburn-0.6.0.pl00.tar.gz



From drago01 at fedoraproject.org  Wed Jan  7 14:39:47 2009
From: drago01 at fedoraproject.org (Adel Gadllah)
Date: Wed,  7 Jan 2009 14:39:47 +0000 (UTC)
Subject: rpms/libburn/F-10 .cvsignore, 1.7, 1.8 libburn.spec, 1.13,
	1.14 sources, 1.8, 1.9
Message-ID: <20090107143947.ED23570100@cvs1.fedora.phx.redhat.com>

Author: drago01

Update of /cvs/pkgs/rpms/libburn/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18465

Modified Files:
	.cvsignore libburn.spec sources 
Log Message:
Update to 0.6.0


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libburn/F-10/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	11 Jun 2008 07:18:50 -0000	1.7
+++ .cvsignore	7 Jan 2009 14:39:17 -0000	1.8
@@ -1 +1 @@
-libburn-0.4.8.pl00.tar.gz
+libburn-0.6.0.pl00.tar.gz


Index: libburn.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libburn/F-10/libburn.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- libburn.spec	5 Aug 2008 21:20:19 -0000	1.13
+++ libburn.spec	7 Jan 2009 14:39:17 -0000	1.14
@@ -1,6 +1,6 @@
 Name:           libburn
-Version:        0.4.8
-Release:        2%{?dist}
+Version:        0.6.0
+Release:        1%{?dist}
 Summary:        Library for reading, mastering and writing optical discs
 
 Group:          System Environment/Libraries
@@ -92,6 +92,9 @@
 
 
 %changelog
+* Wed Jan 07 2009 Adel Gadllah <adel.gadllah at gmail.com> - 0.6.0-1
+- New upstream version
+
 * Tue Aug  5 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.4.8-2
 - fix license tag
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libburn/F-10/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	11 Jun 2008 07:18:50 -0000	1.8
+++ sources	7 Jan 2009 14:39:17 -0000	1.9
@@ -1 +1 @@
-c1322d307d51a53c279520f8b124ba9b  libburn-0.4.8.pl00.tar.gz
+3c8ec5a3e129099fb31f91b2c081fa5a  libburn-0.6.0.pl00.tar.gz



From drago01 at fedoraproject.org  Wed Jan  7 14:40:03 2009
From: drago01 at fedoraproject.org (Adel Gadllah)
Date: Wed,  7 Jan 2009 14:40:03 +0000 (UTC)
Subject: rpms/libburn/F-9 .cvsignore, 1.6, 1.7 libburn.spec, 1.11,
	1.12 sources, 1.7, 1.8
Message-ID: <20090107144003.804C370100@cvs1.fedora.phx.redhat.com>

Author: drago01

Update of /cvs/pkgs/rpms/libburn/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18521

Modified Files:
	.cvsignore libburn.spec sources 
Log Message:
Update to 0.6.0


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libburn/F-9/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	30 Dec 2007 09:58:28 -0000	1.6
+++ .cvsignore	7 Jan 2009 14:39:33 -0000	1.7
@@ -1 +1 @@
-libburn-0.4.0.tar.gz
+libburn-0.6.0.pl00.tar.gz


Index: libburn.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libburn/F-9/libburn.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- libburn.spec	14 Feb 2008 21:03:25 -0000	1.11
+++ libburn.spec	7 Jan 2009 14:39:33 -0000	1.12
@@ -1,10 +1,10 @@
 Name:           libburn
-Version:        0.4.0
-Release:        2%{?dist}
+Version:        0.6.0
+Release:        1%{?dist}
 Summary:        Library for reading, mastering and writing optical discs
 
 Group:          System Environment/Libraries
-License:        GPL
+License:        GPLv2
 URL:            http://libburn.pykix.org/
 Source0:        http://files.libburnia-project.org/releases/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -92,6 +92,10 @@
 
 
 %changelog
+* Wed Jan 07 2009 Adel Gadllah <adel.gadllah at gmail.com> - 0.6.0-1
+- New upstream version
+- Fix license tag
+
 * Thu Feb 14 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.4.0-2
 - Autorebuild for GCC 4.3
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libburn/F-9/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	30 Dec 2007 09:58:28 -0000	1.7
+++ sources	7 Jan 2009 14:39:33 -0000	1.8
@@ -1 +1 @@
-0cfe4daff5d36284d03ed8170eecac7c  libburn-0.4.0.tar.gz
+3c8ec5a3e129099fb31f91b2c081fa5a  libburn-0.6.0.pl00.tar.gz



From than at fedoraproject.org  Wed Jan  7 14:40:51 2009
From: than at fedoraproject.org (Than Ngo)
Date: Wed,  7 Jan 2009 14:40:51 +0000 (UTC)
Subject: rpms/kdeaccessibility/devel .cvsignore, 1.34,
	1.35 kdeaccessibility.spec, 1.67, 1.68 sources, 1.35, 1.36
Message-ID: <20090107144051.4974470100@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdeaccessibility/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18697

Modified Files:
	.cvsignore kdeaccessibility.spec sources 
Log Message:
4.2rc1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdeaccessibility/devel/.cvsignore,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- .cvsignore	11 Dec 2008 12:29:45 -0000	1.34
+++ .cvsignore	7 Jan 2009 14:40:20 -0000	1.35
@@ -1,3 +1,4 @@
 kdeaccessibility-4.1.2.tar.bz2
 kdeaccessibility-4.1.80.tar.bz2
 kdeaccessibility-4.1.85.tar.bz2
+kdeaccessibility-4.1.96.tar.bz2


Index: kdeaccessibility.spec
===================================================================
RCS file: /cvs/extras/rpms/kdeaccessibility/devel/kdeaccessibility.spec,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- kdeaccessibility.spec	11 Dec 2008 12:29:45 -0000	1.67
+++ kdeaccessibility.spec	7 Jan 2009 14:40:20 -0000	1.68
@@ -1,7 +1,7 @@
 Summary:        K Desktop Environment - Accessibility
 Name:           kdeaccessibility
 Epoch:          1
-Version:        4.1.85
+Version:        4.1.96
 Release:        1%{?dist}
 
 Group:          User Interface/Desktops
@@ -93,6 +93,9 @@
 
 
 %changelog
+* Wed Jan 07 2009 Than Ngo <than at redhat.com> - 4.1.96-1
+- 4.2rc1
+
 * Thu Dec 11 2008 Than Ngo <than at redhat.com> -  4.1.85-1
 - 4.2beta2
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdeaccessibility/devel/sources,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- sources	11 Dec 2008 12:29:45 -0000	1.35
+++ sources	7 Jan 2009 14:40:20 -0000	1.36
@@ -1 +1 @@
-9d99981713d0e36bf85dc70081562a25  kdeaccessibility-4.1.85.tar.bz2
+13d430b62f0b345b7e53b54e9236550d  kdeaccessibility-4.1.96.tar.bz2



From drago01 at fedoraproject.org  Wed Jan  7 14:44:13 2009
From: drago01 at fedoraproject.org (Adel Gadllah)
Date: Wed,  7 Jan 2009 14:44:13 +0000 (UTC)
Subject: rpms/libburn/F-9 libburn.spec,1.12,1.13
Message-ID: <20090107144413.0E8DB70100@cvs1.fedora.phx.redhat.com>

Author: drago01

Update of /cvs/pkgs/rpms/libburn/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19221

Modified Files:
	libburn.spec 
Log Message:
update url & tarball name


Index: libburn.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libburn/F-9/libburn.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- libburn.spec	7 Jan 2009 14:39:33 -0000	1.12
+++ libburn.spec	7 Jan 2009 14:43:42 -0000	1.13
@@ -6,7 +6,7 @@
 Group:          System Environment/Libraries
 License:        GPLv2
 URL:            http://libburn.pykix.org/
-Source0:        http://files.libburnia-project.org/releases/%{name}-%{version}.tar.gz
+Source0:        http://files.libburnia-project.org/releases/%{name}-%{version}.pl00.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:   libtool intltool gettext doxygen graphviz



From matt at fedoraproject.org  Wed Jan  7 14:46:35 2009
From: matt at fedoraproject.org (Matthew Farrellee)
Date: Wed,  7 Jan 2009 14:46:35 +0000 (UTC)
Subject: rpms/classads/F-10 .cvsignore, 1.3, 1.4 classads.spec, 1.3,
	1.4 sources, 1.3, 1.4
Message-ID: <20090107144635.4377370100@cvs1.fedora.phx.redhat.com>

Author: matt

Update of /cvs/pkgs/rpms/classads/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19649

Modified Files:
	.cvsignore classads.spec sources 
Log Message:
update to classads 1.0.1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/classads/F-10/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	7 Apr 2008 13:12:01 -0000	1.3
+++ .cvsignore	7 Jan 2009 14:46:04 -0000	1.4
@@ -1 +1 @@
-classads-1.0.tar.gz
+classads-1.0.1.tar.gz


Index: classads.spec
===================================================================
RCS file: /cvs/pkgs/rpms/classads/F-10/classads.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- classads.spec	7 Apr 2008 13:27:04 -0000	1.3
+++ classads.spec	7 Jan 2009 14:46:04 -0000	1.4
@@ -1,13 +1,11 @@
-# NOTE: When updating the version change the Source0 and %setup lines
-
-Summary: Condor's ClassAd Library
+Summary: Condor's classified advertisement language
 Name: classads
-Version: 1.0
+Version: 1.0.1
 Release: 1%{?dist}
 License: ASL 2.0
 Group: Development/Libraries
 URL: http://www.cs.wisc.edu/condor/classad/
-Source0: ftp://ftp.cs.wisc.edu/condor/classad/c++/classads-1.0.tar.gz
+Source0: ftp://ftp.cs.wisc.edu/condor/classad/c++/classads-1.0.1.tar.gz
 Patch0: f9_gcc_header.patch
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
@@ -38,7 +36,7 @@
 compatibility of jobs and workstations where they may be run.
 
 %package devel
-Summary: Headers for Condor's ClassAd Library
+Summary: Headers for Condor's classified advertisement language
 Group: Development/System
 Requires: %name = %version-%release
 Requires: pcre-devel
@@ -48,7 +46,7 @@
 semi-structured representation of data.
 
 %package static
-Summary: Condor's ClassAd Library's static libraries
+Summary: Condor's classified advertisement language's static libraries
 Group: Development/System
 Requires: %name = %version-%release
 
@@ -57,7 +55,7 @@
 and flexible, semi-structured representation of data.
 
 %prep
-%setup -q -n classads-1.0
+%setup -q
 %patch0 -p1
 
 %build
@@ -95,6 +93,7 @@
 %_bindir/cxi_ns
 %_libdir/libclassad.so
 %_libdir/libclassad_ns.so
+%dir %_includedir/classad/
 %_includedir/classad/attrrefs.h
 %_includedir/classad/cclassad.h
 %_includedir/classad/classad_distribution.h
@@ -138,6 +137,13 @@
 
 
 %changelog
+* Tue Jan  6 2009  <matt at redhat> - 1.0.1-1
+- Upgraded to 1.0.1 release:
+-  New functions: ifThenElse, regexps, interval
+-  Source files renamed from .C to .cpp
+- Fixed unowned /usr/include/classad directory (BZ473636)
+- Updated summaries
+
 * Mon Apr  7 2008  <mfarrellee at redhat> - 1.0-1
 - Upgraded to 1.0 release
 - Resolved: bz432211, bz432212, and bz432213


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/classads/F-10/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	7 Apr 2008 13:12:01 -0000	1.3
+++ sources	7 Jan 2009 14:46:04 -0000	1.4
@@ -1 +1 @@
-10cf1743ed838b4d606b6d86d7494595  classads-1.0.tar.gz
+c98906c025ab9a9381e644e9d7094d6d  classads-1.0.1.tar.gz



From ltinkl at fedoraproject.org  Wed Jan  7 14:48:12 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Wed,  7 Jan 2009 14:48:12 +0000 (UTC)
Subject: rpms/kdelibs/F-9 kdelibs.spec, 1.369,
	1.370 kdelibs-4.1.3-kde#161117.patch, 1.1, NONE
Message-ID: <20090107144812.B23F270100@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kdelibs/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19885/F-9

Modified Files:
	kdelibs.spec 
Removed Files:
	kdelibs-4.1.3-kde#161117.patch 
Log Message:
drop upstream patches



Index: kdelibs.spec
===================================================================
RCS file: /cvs/extras/rpms/kdelibs/F-9/kdelibs.spec,v
retrieving revision 1.369
retrieving revision 1.370
diff -u -r1.369 -r1.370
--- kdelibs.spec	7 Jan 2009 14:34:36 -0000	1.369
+++ kdelibs.spec	7 Jan 2009 14:47:42 -0000	1.370
@@ -78,8 +78,6 @@
 Patch20: kdelibs-4.1.1-cmake.patch
 
 ## upstream patches
-# unmess Utilities menu
-Patch100: kdelibs-4.1.3-kde#161117.patch
 Patch103: kdelibs-4.1.2-kde#172182-http_cache_cleaner.patch
 
 BuildRequires: qt4-devel >= 4.4.0


--- kdelibs-4.1.3-kde#161117.patch DELETED ---



From ltinkl at fedoraproject.org  Wed Jan  7 14:48:12 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Wed,  7 Jan 2009 14:48:12 +0000 (UTC)
Subject: rpms/kdelibs/F-10 kdelibs.spec, 1.391,
	1.392 kdelibs-4.1.3-kde#161117.patch, 1.1, NONE
Message-ID: <20090107144812.7413770100@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kdelibs/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19885/F-10

Modified Files:
	kdelibs.spec 
Removed Files:
	kdelibs-4.1.3-kde#161117.patch 
Log Message:
drop upstream patches



Index: kdelibs.spec
===================================================================
RCS file: /cvs/extras/rpms/kdelibs/F-10/kdelibs.spec,v
retrieving revision 1.391
retrieving revision 1.392
diff -u -r1.391 -r1.392
--- kdelibs.spec	7 Jan 2009 14:31:59 -0000	1.391
+++ kdelibs.spec	7 Jan 2009 14:47:42 -0000	1.392
@@ -78,8 +78,6 @@
 Patch20: kdelibs-4.1.1-cmake.patch
 
 ## upstream patches
-# unmess Utilities menu
-Patch100: kdelibs-4.1.3-kde#161117.patch
 Patch103: kdelibs-4.1.2-kde#172182-http_cache_cleaner.patch
 
 BuildRequires: qt4-devel >= 4.4.0


--- kdelibs-4.1.3-kde#161117.patch DELETED ---



From rdieter at fedoraproject.org  Wed Jan  7 14:51:47 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed,  7 Jan 2009 14:51:47 +0000 (UTC)
Subject: rpms/scidavis/devel scidavis-0.1.3-sip.patch, NONE,
	1.1 scidavis.spec, 1.7, 1.8
Message-ID: <20090107145147.B526E70100@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/scidavis/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20513

Modified Files:
	scidavis.spec 
Added Files:
	scidavis-0.1.3-sip.patch 
Log Message:
* Wed Jan 07 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.1.3-4
- sip patch (#479118)


scidavis-0.1.3-sip.patch:

--- NEW FILE scidavis-0.1.3-sip.patch ---
--- scidavis-0.1.3.orig/scidavis/src/scidavis.sip	2007-07-21 21:32:13.000000000 +0100
+++ scidavis-0.1.3/scidavis/src/scidavis.sip	2009-01-07 11:12:51.000000000 +0000
@@ -78,8 +78,6 @@
   MyWidget(const MyWidget&);
 };
 
-typedef QList<MyWidget*> MDIWindowList;
-
 class Table: MyWidget
 {
 %TypeHeaderCode
@@ -1027,7 +1025,6 @@
   SIPSCIDAVIS_APP(new sipInterpolation(app, a0, *a1, a2, a3, a4))
 %End
 
-  void setMethod(int n);
   void setMethod(InterpolationMethod m);
   bool run();
 };
@@ -1051,7 +1048,6 @@
   SIPSCIDAVIS_APP(new sipSmoothFilter(app, a0, *a1, a2, a3, a4))
 %End
 
-  void setMethod(int);
   void setMethod(SmoothMethod);
 
   void setSmoothPoints(int, int = 0);
@@ -1079,7 +1075,6 @@
   SIPSCIDAVIS_APP(new sipFFTFilter(app, a0, *a1, a2, a3, a4))
 %End
 
-  void setFilterType(int);
   void setFilterType(FilterType);
 
   void setCutoff(double);
@@ -1194,7 +1189,7 @@
 #include "src/Folder.h"
 %End
 public:
-  MDIWindowList windowsList() /PyName=windows/;
+  QList<MyWidget*> windowsList() /PyName=windows/;
 // TODO: implement signal Folder::nameChanged and make it update the project explorer; adjust renaming from GUI accordingly
 //  void setFolderName(const QString&) /PyName=setName/;
   QString name();


Index: scidavis.spec
===================================================================
RCS file: /cvs/pkgs/rpms/scidavis/devel/scidavis.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- scidavis.spec	5 Jan 2009 16:57:36 -0000	1.7
+++ scidavis.spec	7 Jan 2009 14:51:17 -0000	1.8
@@ -1,11 +1,13 @@
 Summary:	Scientific Data Analysis and Visualization
 Name:		scidavis
 Version:	0.1.3
-Release: 	3%{?dist}
+Release: 	4%{?dist}
 Source0:	http://download.sourceforge.net/sourceforge/scidavis/%{name}-%{version}.tar.bz2
 Source1:	http://download.sourceforge.net/sourceforge/scidavis/scidavis-manual-0.1_2008-02-28.tar.bz2
 Patch0:		scidavis-0.1.3-pro.patch
 Patch1:		scidavis-0.1.3-python26.patch
+# 		http://bugzilla.redhat.com/479118
+Patch2:		scidavis-0.1.3-sip.patch	
 URL:		http://scidavis.sourceforge.net/
 License:	GPLv2
 Group: 		Applications/Engineering
@@ -31,6 +33,7 @@
 %setup -q -a 1
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1 -b .bz#479118
 
 sed -i -e 's/x-sciprj/x-sciprj;/' scidavis/scidavis.desktop
 sed -i -e 's/50/100/' scidavis/scidavis.xml
@@ -99,6 +102,9 @@
 %doc manual/*
 
 %changelog
+* Wed Jan 07 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.1.3-4
+- sip patch (#479118)
+
 * Sun Nov 30 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 0.1.3-3
 - Rebuild for Python 2.6
 



From ltinkl at fedoraproject.org  Wed Jan  7 14:52:14 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Wed,  7 Jan 2009 14:52:14 +0000 (UTC)
Subject: rpms/kdelibs/F-10 kdelibs.spec,1.392,1.393
Message-ID: <20090107145214.88B8470100@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kdelibs/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20558/F-10

Modified Files:
	kdelibs.spec 
Log Message:
really drop it :)



Index: kdelibs.spec
===================================================================
RCS file: /cvs/extras/rpms/kdelibs/F-10/kdelibs.spec,v
retrieving revision 1.392
retrieving revision 1.393
diff -u -r1.392 -r1.393
--- kdelibs.spec	7 Jan 2009 14:47:42 -0000	1.392
+++ kdelibs.spec	7 Jan 2009 14:51:44 -0000	1.393
@@ -204,7 +204,6 @@
 %patch20 -p1 -b .cmake
 
 ## upstream patches
-%patch100 -p4 -b .kde#161117
 %patch103 -p1 -b .kde#172182-http_cache_cleaner
 
 



From ltinkl at fedoraproject.org  Wed Jan  7 14:52:14 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Wed,  7 Jan 2009 14:52:14 +0000 (UTC)
Subject: rpms/kdelibs/F-9 kdelibs.spec,1.370,1.371
Message-ID: <20090107145214.CDFDD70100@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kdelibs/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20558/F-9

Modified Files:
	kdelibs.spec 
Log Message:
really drop it :)



Index: kdelibs.spec
===================================================================
RCS file: /cvs/extras/rpms/kdelibs/F-9/kdelibs.spec,v
retrieving revision 1.370
retrieving revision 1.371
diff -u -r1.370 -r1.371
--- kdelibs.spec	7 Jan 2009 14:47:42 -0000	1.370
+++ kdelibs.spec	7 Jan 2009 14:51:44 -0000	1.371
@@ -204,7 +204,6 @@
 %patch20 -p1 -b .cmake
 
 ## upstream patches
-%patch100 -p4 -b .kde#161117
 %patch103 -p1 -b .kde#172182-http_cache_cleaner
 
 



From matt at fedoraproject.org  Wed Jan  7 14:57:56 2009
From: matt at fedoraproject.org (Matthew Farrellee)
Date: Wed,  7 Jan 2009 14:57:56 +0000 (UTC)
Subject: rpms/classads/devel .cvsignore, 1.3, 1.4 classads.spec, 1.3,
	1.4 sources, 1.3, 1.4
Message-ID: <20090107145756.8357370100@cvs1.fedora.phx.redhat.com>

Author: matt

Update of /cvs/pkgs/rpms/classads/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22022

Modified Files:
	.cvsignore classads.spec sources 
Log Message:
update to classads 1.0.1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/classads/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	7 Apr 2008 13:12:01 -0000	1.3
+++ .cvsignore	7 Jan 2009 14:57:25 -0000	1.4
@@ -1 +1 @@
-classads-1.0.tar.gz
+classads-1.0.1.tar.gz


Index: classads.spec
===================================================================
RCS file: /cvs/pkgs/rpms/classads/devel/classads.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- classads.spec	7 Apr 2008 13:27:04 -0000	1.3
+++ classads.spec	7 Jan 2009 14:57:25 -0000	1.4
@@ -1,13 +1,11 @@
-# NOTE: When updating the version change the Source0 and %setup lines
-
-Summary: Condor's ClassAd Library
+Summary: Condor's classified advertisement language
 Name: classads
-Version: 1.0
+Version: 1.0.1
 Release: 1%{?dist}
 License: ASL 2.0
 Group: Development/Libraries
 URL: http://www.cs.wisc.edu/condor/classad/
-Source0: ftp://ftp.cs.wisc.edu/condor/classad/c++/classads-1.0.tar.gz
+Source0: ftp://ftp.cs.wisc.edu/condor/classad/c++/classads-1.0.1.tar.gz
 Patch0: f9_gcc_header.patch
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
@@ -38,7 +36,7 @@
 compatibility of jobs and workstations where they may be run.
 
 %package devel
-Summary: Headers for Condor's ClassAd Library
+Summary: Headers for Condor's classified advertisement language
 Group: Development/System
 Requires: %name = %version-%release
 Requires: pcre-devel
@@ -48,7 +46,7 @@
 semi-structured representation of data.
 
 %package static
-Summary: Condor's ClassAd Library's static libraries
+Summary: Condor's classified advertisement language's static libraries
 Group: Development/System
 Requires: %name = %version-%release
 
@@ -57,7 +55,7 @@
 and flexible, semi-structured representation of data.
 
 %prep
-%setup -q -n classads-1.0
+%setup -q
 %patch0 -p1
 
 %build
@@ -95,6 +93,7 @@
 %_bindir/cxi_ns
 %_libdir/libclassad.so
 %_libdir/libclassad_ns.so
+%dir %_includedir/classad/
 %_includedir/classad/attrrefs.h
 %_includedir/classad/cclassad.h
 %_includedir/classad/classad_distribution.h
@@ -138,6 +137,13 @@
 
 
 %changelog
+* Tue Jan  6 2009  <matt at redhat> - 1.0.1-1
+- Upgraded to 1.0.1 release:
+-  New functions: ifThenElse, regexps, interval
+-  Source files renamed from .C to .cpp
+- Fixed unowned /usr/include/classad directory (BZ473636)
+- Updated summaries
+
 * Mon Apr  7 2008  <mfarrellee at redhat> - 1.0-1
 - Upgraded to 1.0 release
 - Resolved: bz432211, bz432212, and bz432213


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/classads/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	7 Apr 2008 13:12:01 -0000	1.3
+++ sources	7 Jan 2009 14:57:25 -0000	1.4
@@ -1 +1 @@
-10cf1743ed838b4d606b6d86d7494595  classads-1.0.tar.gz
+c98906c025ab9a9381e644e9d7094d6d  classads-1.0.1.tar.gz



From than at fedoraproject.org  Wed Jan  7 14:59:29 2009
From: than at fedoraproject.org (Than Ngo)
Date: Wed,  7 Jan 2009 14:59:29 +0000 (UTC)
Subject: rpms/kdeadmin/devel .cvsignore, 1.55, 1.56 kdeadmin.spec, 1.119,
	1.120 sources, 1.57, 1.58
Message-ID: <20090107145929.99B2A70100@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdeadmin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22375

Modified Files:
	.cvsignore kdeadmin.spec sources 
Log Message:
4.2rc1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdeadmin/devel/.cvsignore,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- .cvsignore	11 Dec 2008 13:27:52 -0000	1.55
+++ .cvsignore	7 Jan 2009 14:58:59 -0000	1.56
@@ -1,3 +1,4 @@
 kdeadmin-4.1.2.tar.bz2
 kdeadmin-4.1.80.tar.bz2
 kdeadmin-4.1.85.tar.bz2
+kdeadmin-4.1.96.tar.bz2


Index: kdeadmin.spec
===================================================================
RCS file: /cvs/extras/rpms/kdeadmin/devel/kdeadmin.spec,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -r1.119 -r1.120
--- kdeadmin.spec	11 Dec 2008 13:27:52 -0000	1.119
+++ kdeadmin.spec	7 Jan 2009 14:58:59 -0000	1.120
@@ -1,6 +1,6 @@
 Name:           kdeadmin
 Epoch:          7
-Version:        4.1.85
+Version:        4.1.96
 Release:        1%{?dist}
 Summary:        K Desktop Environment - Administrative tools
 
@@ -116,6 +116,9 @@
 
 
 %changelog
+* Wed Jan 07 2009 Than Ngo <than at redhat.com> - 4.1.96-1
+- 4.2rc1
+
 * Thu Dec 11 2008 Than Ngo <than at redhat.com> -  4.1.85-1
 - 4.2beta2
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdeadmin/devel/sources,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- sources	11 Dec 2008 13:27:52 -0000	1.57
+++ sources	7 Jan 2009 14:58:59 -0000	1.58
@@ -1 +1 @@
-612a2b1257186ec4aa86137690be8a71  kdeadmin-4.1.85.tar.bz2
+6c7af1887587a5f864344550fa6c9af0  kdeadmin-4.1.96.tar.bz2



From xhorak at fedoraproject.org  Wed Jan  7 15:02:55 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Wed,  7 Jan 2009 15:02:55 +0000 (UTC)
Subject: rpms/firefox/F-9 firefox.sh.in,1.32,1.33 firefox.spec,1.308,1.309
Message-ID: <20090107150255.D17E570100@cvs1.fedora.phx.redhat.com>

Author: xhorak

Update of /cvs/pkgs/rpms/firefox/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23072

Modified Files:
	firefox.sh.in firefox.spec 
Log Message:
Resolves: #441973, Firefox ignores 


Index: firefox.sh.in
===================================================================
RCS file: /cvs/pkgs/rpms/firefox/F-9/firefox.sh.in,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- firefox.sh.in	2 Jun 2008 12:51:50 -0000	1.32
+++ firefox.sh.in	7 Jan 2009 15:02:25 -0000	1.33
@@ -140,10 +140,10 @@
 MOZARGS=
 # Try without a local variant first, then with a local variant
 # So that pt-BR doesn't try to use pt for example
-SHORTMOZLOCALE=`echo $LANG | sed "s|_\([^.]*\).*||g"`
+SHORTMOZLOCALE=`echo $LC_MESSAGES | sed "s|_\([^.]*\).*||g"`
 [ -f $MOZ_EXTENSIONS_DIR/langpack-${SHORTMOZLOCALE}@firefox.mozilla.org/chrome/$SHORTMOZLOCALE.jar ] && MOZARGS="-UILocale $SHORTMOZLOCALE"
 
-MOZLOCALE=`echo $LANG | sed "s|_\([^.]*\).*|-\1|g"`
+MOZLOCALE=`echo $LC_MESSAGES | sed "s|_\([^.]*\).*|-\1|g"`
 [ -f $MOZ_EXTENSIONS_DIR/langpack-${MOZLOCALE}@firefox.mozilla.org/chrome/$MOZLOCALE.jar ] && MOZARGS="-UILocale $MOZLOCALE"
 
 # Prepare command line arguments


Index: firefox.spec
===================================================================
RCS file: /cvs/pkgs/rpms/firefox/F-9/firefox.spec,v
retrieving revision 1.308
retrieving revision 1.309
diff -u -r1.308 -r1.309
--- firefox.spec	17 Dec 2008 18:37:33 -0000	1.308
+++ firefox.spec	7 Jan 2009 15:02:25 -0000	1.309
@@ -18,7 +18,7 @@
 Summary:        Mozilla Firefox Web browser
 Name:           firefox
 Version:        3.0.5
-Release:        1%{?dist}
+Release:        2%{?dist}
 URL:            http://www.mozilla.org/projects/firefox/
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 Group:          Applications/Internet
@@ -322,6 +322,10 @@
 #---------------------------------------------------------------------
 
 %changelog
+* Wed Jan  7 2009 Jan Horak <jhorak at redhat.com> - 3.0.5-2
+- Fixed wrong LANG and LC_MESSAGES variables interpretation (#441973) 
+  in startup script.
+
 * Tue Dec 16 2008 Christopher Aillon <caillon at redhat.com> 3.0.5-1
 - Update to 3.0.5
 



From caolanm at fedoraproject.org  Wed Jan  7 15:06:31 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Wed,  7 Jan 2009 15:06:31 +0000 (UTC)
Subject: rpms/librra/devel librra-0.11.1-fixpyx.patch, NONE, 1.1 librra.spec,
	1.10, 1.11
Message-ID: <20090107150631.4ECE170100@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/librra/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23657

Modified Files:
	librra.spec 
Added Files:
	librra-0.11.1-fixpyx.patch 
Log Message:
Resolves: rhbz#465100 backport upstream pyrra.pyx fix to make build

librra-0.11.1-fixpyx.patch:

--- NEW FILE librra-0.11.1-fixpyx.patch ---
--- trunk/librra/python/pyrra.pyx	2008/01/07 10:49:17	3156
+++ trunk/librra/python/pyrra.pyx	2008/05/23 18:20:04	3466
@@ -132,7 +132,7 @@
 cdef bool _CB_TypesCallback(RRA_SyncMgrTypeEvent event, uint32_t type, uint32_t count, uint32_t * ids, context):
 	ida=[]
 	cdef bool rc
-	for i from 0 <= i < count:
+	for 0 <= i < count:
 		ida.append(ids[i])
 	rc=context.CB_TypeCallback(<RRA_SyncMgrTypeEvent> event,type,ida)
 	return rc
@@ -192,9 +192,9 @@
 	# Event processing
 	#
 
-	def SubscribeObjectEvents(self,type):
+	def SubscribeObjectEvents(self,type_id):
 		if self.connected != 0:
-			rra_syncmgr_subscribe(self.instance, type, _CB_TypesCallback, self)
+			rra_syncmgr_subscribe(self.instance, type_id, _CB_TypesCallback, self)
 			return 0
 		return -1
 
@@ -260,7 +260,7 @@
 		c_oids = <uint32_t *>malloc(sizeof(uint32_t)*c_cnt)
 		rc=0
 		if c_oids != NULL:
-			for i from 0 <= i < c_cnt:
+			for 0 <= i < c_cnt:
 				c_oids[i] = oids[i]
 			rc= rra_syncmgr_get_multiple_objects(self.instance,type_id, c_cnt, c_oids,_CB_WriterCallback, self)
 			free(c_oids)
@@ -291,7 +291,7 @@
 				rc = rra_syncmgr_put_multiple_objects(self.instance,type_id,c_oidcount,
 								      c_oids,c_newoids,flags,_CB_ReaderCallback,self)
 				if rc == True:
-					for i from 0 <= i < c_oidcount:
+					for 0 <= i < c_oidcount:
 						newoid_array.append(c_newoids[i])
 			free(c_oids)
 		return rc
@@ -312,7 +312,7 @@
 	# (to be overloaded by user)
 	#
 
-	def CB_TypeCallback(self, event, type, idarray):
+	def CB_TypeCallback(self, event, type_id, idarray):
 		return False
 		
 	def CB_ObjectWriterCallback(self,type_id, obj_id, data):


Index: librra.spec
===================================================================
RCS file: /cvs/pkgs/rpms/librra/devel/librra.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- librra.spec	29 Nov 2008 16:48:04 -0000	1.10
+++ librra.spec	7 Jan 2009 15:06:00 -0000	1.11
@@ -2,7 +2,7 @@
 
 Name:           librra
 Version:        0.11.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Connection to Pocket PC devices, part of SynCE
 
 Group:          System Environment/Libraries
@@ -16,6 +16,8 @@
 BuildRequires:  libmimedir-devel
 BuildRequires:  libtool, Pyrex
 
+Patch0: librra-0.11.1-fixpyx.patch
+
 # Provide an upgrade path from the monilithic synce package
 Provides:       synce = %{version}-%{release}
 Obsoletes:      synce <= 0.9.1-10
@@ -47,6 +49,7 @@
 
 %prep
 %setup -q
+%patch0 -p2 -b.fixpyx
 
 %build
 %configure --disable-static --disable-rpath
@@ -89,6 +92,9 @@
 
 
 %changelog
+* Wed Jan  7 2009 Caol??n McNamara <caolanm at redhat.com> - 0.11.1-3
+- Resolves: rhbz#465100 backport upstream pyrra.pyx fix to make build
+
 * Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 0.11.1-2
 - Rebuild for Python 2.6
 



From than at fedoraproject.org  Wed Jan  7 15:10:35 2009
From: than at fedoraproject.org (Than Ngo)
Date: Wed,  7 Jan 2009 15:10:35 +0000 (UTC)
Subject: rpms/kdeartwork/devel .cvsignore, 1.53, 1.54 kdeartwork.spec, 1.95, 
	1.96 sources, 1.55, 1.56
Message-ID: <20090107151035.8546770100@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdeartwork/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24417

Modified Files:
	.cvsignore kdeartwork.spec sources 
Log Message:
4.2rc1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdeartwork/devel/.cvsignore,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- .cvsignore	13 Dec 2008 14:16:26 -0000	1.53
+++ .cvsignore	7 Jan 2009 15:10:05 -0000	1.54
@@ -1 +1,2 @@
 kdeartwork-4.1.85.tar.bz2
+kdeartwork-4.1.96.tar.bz2


Index: kdeartwork.spec
===================================================================
RCS file: /cvs/extras/rpms/kdeartwork/devel/kdeartwork.spec,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -r1.95 -r1.96
--- kdeartwork.spec	11 Dec 2008 14:00:24 -0000	1.95
+++ kdeartwork.spec	7 Jan 2009 15:10:05 -0000	1.96
@@ -1,5 +1,5 @@
 Name:           kdeartwork
-Version:        4.1.85
+Version:        4.1.96
 Release:        1%{?dist}
 Summary:        Additional artwork (themes, sound themes, ...) for KDE
 
@@ -192,6 +192,9 @@
 
 
 %changelog
+* Wed Jan 07 2009 Than Ngo <than at redhat.com> - 4.1.96-1
+- 4.2rc1
+
 * Thu Dec 11 2008 Than Ngo <than at redhat.com> -  4.1.85-1
 - 4.2beta2
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdeartwork/devel/sources,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- sources	13 Dec 2008 14:16:26 -0000	1.55
+++ sources	7 Jan 2009 15:10:05 -0000	1.56
@@ -1 +1 @@
-bd9a81e95cf9b6d7aff427fef343f5f1  kdeartwork-4.1.85.tar.bz2
+2c4f0cd7bf767551df395645248d5cb8  kdeartwork-4.1.96.tar.bz2



From ltinkl at fedoraproject.org  Wed Jan  7 15:11:05 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Wed,  7 Jan 2009 15:11:05 +0000 (UTC)
Subject: rpms/kdelibs/F-10 kdelibs.spec, 1.393,
	1.394 kdelibs-4.1.2-kde#172182-http_cache_cleaner.patch, 1.1, NONE
Message-ID: <20090107151105.3429C70100@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kdelibs/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24539/F-10

Modified Files:
	kdelibs.spec 
Removed Files:
	kdelibs-4.1.2-kde#172182-http_cache_cleaner.patch 
Log Message:
another upstream patch



Index: kdelibs.spec
===================================================================
RCS file: /cvs/extras/rpms/kdelibs/F-10/kdelibs.spec,v
retrieving revision 1.393
retrieving revision 1.394
diff -u -r1.393 -r1.394
--- kdelibs.spec	7 Jan 2009 14:51:44 -0000	1.393
+++ kdelibs.spec	7 Jan 2009 15:10:34 -0000	1.394
@@ -78,7 +78,6 @@
 Patch20: kdelibs-4.1.1-cmake.patch
 
 ## upstream patches
-Patch103: kdelibs-4.1.2-kde#172182-http_cache_cleaner.patch
 
 BuildRequires: qt4-devel >= 4.4.0
 Requires: qt4 >= %{_qt4_version} 
@@ -204,7 +203,6 @@
 %patch20 -p1 -b .cmake
 
 ## upstream patches
-%patch103 -p1 -b .kde#172182-http_cache_cleaner
 
 
 %build


--- kdelibs-4.1.2-kde#172182-http_cache_cleaner.patch DELETED ---



From ltinkl at fedoraproject.org  Wed Jan  7 15:11:05 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Wed,  7 Jan 2009 15:11:05 +0000 (UTC)
Subject: rpms/kdelibs/F-9 kdelibs.spec, 1.371,
	1.372 kdelibs-4.1.2-kde#172182-http_cache_cleaner.patch, 1.1, NONE
Message-ID: <20090107151105.8F16570100@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kdelibs/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24539/F-9

Modified Files:
	kdelibs.spec 
Removed Files:
	kdelibs-4.1.2-kde#172182-http_cache_cleaner.patch 
Log Message:
another upstream patch



Index: kdelibs.spec
===================================================================
RCS file: /cvs/extras/rpms/kdelibs/F-9/kdelibs.spec,v
retrieving revision 1.371
retrieving revision 1.372
diff -u -r1.371 -r1.372
--- kdelibs.spec	7 Jan 2009 14:51:44 -0000	1.371
+++ kdelibs.spec	7 Jan 2009 15:10:35 -0000	1.372
@@ -78,7 +78,6 @@
 Patch20: kdelibs-4.1.1-cmake.patch
 
 ## upstream patches
-Patch103: kdelibs-4.1.2-kde#172182-http_cache_cleaner.patch
 
 BuildRequires: qt4-devel >= 4.4.0
 Requires: qt4 >= %{_qt4_version} 
@@ -204,7 +203,6 @@
 %patch20 -p1 -b .cmake
 
 ## upstream patches
-%patch103 -p1 -b .kde#172182-http_cache_cleaner
 
 
 %build


--- kdelibs-4.1.2-kde#172182-http_cache_cleaner.patch DELETED ---



From davej at fedoraproject.org  Wed Jan  7 15:13:11 2009
From: davej at fedoraproject.org (Dave Jones)
Date: Wed,  7 Jan 2009 15:13:11 +0000 (UTC)
Subject: rpms/kernel/devel config-generic, 1.211,
	1.212 config-powerpc-generic, 
	1.30, 1.31 config-x86-generic, 1.57, 1.58 config-x86_64-generic,
	1.57, 1.58 kernel.spec, 1.1195,
	1.1196 linux-2.6-debug-vm-would-have-oomkilled.patch, 1.1, 1.2
Message-ID: <20090107151311.6A31370100@cvs1.fedora.phx.redhat.com>

Author: davej

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24983

Modified Files:
	config-generic config-powerpc-generic config-x86-generic 
	config-x86_64-generic kernel.spec 
	linux-2.6-debug-vm-would-have-oomkilled.patch 
Log Message:
Fix up broken rebase.


Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-generic,v
retrieving revision 1.211
retrieving revision 1.212
diff -u -r1.211 -r1.212
--- config-generic	6 Jan 2009 17:50:08 -0000	1.211
+++ config-generic	7 Jan 2009 15:12:40 -0000	1.212
@@ -1778,6 +1778,7 @@
 CONFIG_JOYSTICK_TURBOGRAFX=m
 CONFIG_JOYSTICK_JOYDUMP=m
 CONFIG_JOYSTICK_TWIDJOY=m
+CONFIG_JOYSTICK_WALKERA0701=m
 CONFIG_JOYSTICK_XPAD=m
 CONFIG_JOYSTICK_XPAD_FF=y
 CONFIG_JOYSTICK_XPAD_LEDS=y
@@ -1791,10 +1792,12 @@
 CONFIG_TOUCHSCREEN_MTOUCH=m
 CONFIG_TOUCHSCREEN_MK712=m
 CONFIG_TOUCHSCREEN_PENMOUNT=m
+CONFIG_TOUCHSCREEN_TSC2007=m
 CONFIG_TOUCHSCREEN_TOUCHIT213=m
 CONFIG_TOUCHSCREEN_TOUCHRIGHT=m
 CONFIG_TOUCHSCREEN_TOUCHWIN=m
 CONFIG_TOUCHSCREEN_UCB1400=m
+CONFIG_TOUCHSCREEN_WACOM_W8001=m
 CONFIG_TOUCHSCREEN_USB_COMPOSITE=m
 # CONFIG_TOUCHSCREEN_WM97XX is not set
 CONFIG_INPUT_MISC=y
@@ -2982,6 +2985,8 @@
 #
 # File systems
 #
+CONFIG_MISC_FILESYSTEMS=y
+
 CONFIG_EXT2_FS=m
 CONFIG_EXT2_FS_XATTR=y
 CONFIG_EXT2_FS_POSIX_ACL=y
@@ -3857,4 +3862,3 @@
 CONFIG_DVB_DYNAMIC_MINORS=y
 CONFIG_DVB_LGDT3304=m
 CONFIG_DVB_S921=m
-


Index: config-powerpc-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-powerpc-generic,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- config-powerpc-generic	6 Jan 2009 17:50:09 -0000	1.30
+++ config-powerpc-generic	7 Jan 2009 15:12:40 -0000	1.31
@@ -283,3 +283,7 @@
 
 CONFIG_BATTERY_DA9030=m
 # CONFIG_TWL4030_CORE is not set
+
+CONFIG_BLK_DEV_IT8172=m
+CONFIG_TOUCHSCREEN_DA9034=m
+


Index: config-x86-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-x86-generic,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- config-x86-generic	31 Dec 2008 16:12:35 -0000	1.57
+++ config-x86-generic	7 Jan 2009 15:12:40 -0000	1.58
@@ -290,6 +290,7 @@
 CONFIG_EDAC_I3000=m
 CONFIG_EDAC_I5000=m
 CONFIG_EDAC_I5100=m
+CONFIG_EDAC_I5400=m
 CONFIG_EDAC_R82600=m
 
 CONFIG_SCHED_MC=y


Index: config-x86_64-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-x86_64-generic,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- config-x86_64-generic	4 Jan 2009 01:50:32 -0000	1.57
+++ config-x86_64-generic	7 Jan 2009 15:12:40 -0000	1.58
@@ -180,6 +180,7 @@
 CONFIG_EDAC_E752X=m
 CONFIG_EDAC_I5000=m
 CONFIG_EDAC_I5100=m
+CONFIG_EDAC_I5400=m
 CONFIG_EDAC_I82875P=m
 CONFIG_EDAC_I82860=m
 CONFIG_EDAC_I82975X=m


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1195
retrieving revision 1.1196
diff -u -r1.1195 -r1.1196
--- kernel.spec	7 Jan 2009 14:00:26 -0000	1.1195
+++ kernel.spec	7 Jan 2009 15:12:40 -0000	1.1196
@@ -1159,7 +1159,7 @@
 
 # Nouveau DRM + drm fixes
 #ApplyPatch drm-next.patch
-ApplyPatch drm-modesetting-radeon.patch
+#ApplyPatch drm-modesetting-radeon.patch
 #ApplyPatch drm-nouveau.patch
 
 # linux1394 git patches
@@ -1751,6 +1751,9 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Wed Jan 07 2009 Dave Jones <davej at redhat.com>
+- Fix up broken rebase.
+
 * Wed Jan 07 2009 Jarod Wilson <jarod at redhat.com>
 - 2.6.28-git9
 - Should resolve broken byteorder.h issues (#478663)

linux-2.6-debug-vm-would-have-oomkilled.patch:

Index: linux-2.6-debug-vm-would-have-oomkilled.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-debug-vm-would-have-oomkilled.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-debug-vm-would-have-oomkilled.patch	29 Mar 2008 19:03:01 -0000	1.1
+++ linux-2.6-debug-vm-would-have-oomkilled.patch	7 Jan 2009 15:12:40 -0000	1.2
@@ -29,12 +29,12 @@
 index f255eda..3335a94 100644
 --- a/mm/oom_kill.c
 +++ b/mm/oom_kill.c
-@@ -30,6 +30,7 @@
+@@ -31,6 +31,7 @@
  int sysctl_panic_on_oom;
  int sysctl_oom_kill_allocating_task;
  int sysctl_oom_dump_tasks;
 +int sysctl_would_have_oomkilled;
- static DEFINE_SPINLOCK(zone_scan_mutex);
+ static DEFINE_SPINLOCK(zone_scan_lock);
  /* #define DEBUG */
  
 @@ -321,6 +322,12 @@ static void __oom_kill_task(struct task_struct *p, int verbose)



From caolanm at fedoraproject.org  Wed Jan  7 15:15:46 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Wed,  7 Jan 2009 15:15:46 +0000 (UTC)
Subject: rpms/librra/devel librra.spec,1.11,1.12
Message-ID: <20090107151546.5223370100@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/librra/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25423

Modified Files:
	librra.spec 
Log Message:
Resolves: rhbz#465100 backport upstream pyrra.pyx fix to make build


Index: librra.spec
===================================================================
RCS file: /cvs/pkgs/rpms/librra/devel/librra.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- librra.spec	7 Jan 2009 15:06:00 -0000	1.11
+++ librra.spec	7 Jan 2009 15:15:15 -0000	1.12
@@ -49,7 +49,7 @@
 
 %prep
 %setup -q
-%patch0 -p2 -b.fixpyx
+%patch0 -p2 -b .fixpyx
 
 %build
 %configure --disable-static --disable-rpath



From than at fedoraproject.org  Wed Jan  7 15:20:15 2009
From: than at fedoraproject.org (Than Ngo)
Date: Wed,  7 Jan 2009 15:20:15 +0000 (UTC)
Subject: rpms/kdebase/devel .cvsignore, 1.81, 1.82 kdebase.spec, 1.353,
	1.354 sources, 1.104, 1.105
Message-ID: <20090107152015.A960870100@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdebase/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26027

Modified Files:
	.cvsignore kdebase.spec sources 
Log Message:
4.2rc1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdebase/devel/.cvsignore,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- .cvsignore	11 Dec 2008 14:05:26 -0000	1.81
+++ .cvsignore	7 Jan 2009 15:19:45 -0000	1.82
@@ -1,3 +1,4 @@
 kdebase-4.1.2.tar.bz2
 kdebase-4.1.80.tar.bz2
 kdebase-4.1.85.tar.bz2
+kdebase-4.1.96.tar.bz2


Index: kdebase.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebase/devel/kdebase.spec,v
retrieving revision 1.353
retrieving revision 1.354
diff -u -r1.353 -r1.354
--- kdebase.spec	11 Dec 2008 14:05:26 -0000	1.353
+++ kdebase.spec	7 Jan 2009 15:19:45 -0000	1.354
@@ -1,5 +1,5 @@
 Summary: K Desktop Environment 4 - Core Files
-Version: 4.1.85
+Version: 4.1.96
 Release: 1%{?dist}
 
 %if 0%{?fedora} > 8
@@ -304,6 +304,9 @@
 
 
 %changelog
+* Wed Jan 07 2009 Than Ngo <than at redhat.com> - 4.1.96-1
+- 4.2rc1
+
 * Thu Dec 11 2008 Than Ngo <than at redhat.com> -  4.1.85-1
 - 4.2beta2
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdebase/devel/sources,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -r1.104 -r1.105
--- sources	11 Dec 2008 14:05:27 -0000	1.104
+++ sources	7 Jan 2009 15:19:45 -0000	1.105
@@ -1 +1 @@
-891466362da4d839c15e824d1008f043  kdebase-4.1.85.tar.bz2
+d9010a13848e17d6f1cef3003a035b13  kdebase-4.1.96.tar.bz2



From tmraz at fedoraproject.org  Wed Jan  7 15:23:12 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Wed,  7 Jan 2009 15:23:12 +0000 (UTC)
Subject: rpms/openssl/F-10 openssl-0.9.8g-cve-2008-5077.patch, NONE,
	1.1 openssl-0.9.8g-no-ign-eof.patch, NONE, 1.1 openssl.spec,
	1.113, 1.114
Message-ID: <20090107152312.9092070100@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/openssl/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26452

Modified Files:
	openssl.spec 
Added Files:
	openssl-0.9.8g-cve-2008-5077.patch 
	openssl-0.9.8g-no-ign-eof.patch 
Log Message:
* Wed Jan  7 2009 Tomas Mraz <tmraz at redhat.com> 0.9.8g-12
- fix CVE-2008-5077 - incorrect checks for malformed signatures (#476671)
- add -no_ign_eof option (#462393)


openssl-0.9.8g-cve-2008-5077.patch:

--- NEW FILE openssl-0.9.8g-cve-2008-5077.patch ---
diff -up openssl-0.9.8g/apps/speed.c.verifysig openssl-0.9.8g/apps/speed.c
--- openssl-0.9.8g/apps/speed.c.verifysig	2009-01-07 16:09:11.000000000 +0100
+++ openssl-0.9.8g/apps/speed.c	2009-01-07 16:11:13.000000000 +0100
@@ -2132,7 +2132,7 @@ int MAIN(int argc, char **argv)
 				{
 				ret=RSA_verify(NID_md5_sha1, buf,36, buf2,
 					rsa_num, rsa_key[j]);
-				if (ret == 0)
+				if (ret <= 0)
 					{
 					BIO_printf(bio_err,
 						"RSA verify failure\n");
diff -up openssl-0.9.8g/apps/verify.c.verifysig openssl-0.9.8g/apps/verify.c
--- openssl-0.9.8g/apps/verify.c.verifysig	2004-11-29 12:28:07.000000000 +0100
+++ openssl-0.9.8g/apps/verify.c	2009-01-07 16:11:13.000000000 +0100
@@ -266,7 +266,7 @@ static int check(X509_STORE *ctx, char *
 
 	ret=0;
 end:
-	if (i)
+	if (i > 0)
 		{
 		fprintf(stdout,"OK\n");
 		ret=1;
@@ -367,4 +367,3 @@ static int MS_CALLBACK cb(int ok, X509_S
 		ERR_clear_error();
 	return(ok);
 	}
-
diff -up openssl-0.9.8g/apps/spkac.c.verifysig openssl-0.9.8g/apps/spkac.c
--- openssl-0.9.8g/apps/spkac.c.verifysig	2005-04-05 21:11:18.000000000 +0200
+++ openssl-0.9.8g/apps/spkac.c	2009-01-07 16:11:13.000000000 +0100
@@ -285,7 +285,7 @@ bad:
 	pkey = NETSCAPE_SPKI_get_pubkey(spki);
 	if(verify) {
 		i = NETSCAPE_SPKI_verify(spki, pkey);
-		if(i) BIO_printf(bio_err, "Signature OK\n");
+		if (i > 0) BIO_printf(bio_err, "Signature OK\n");
 		else {
 			BIO_printf(bio_err, "Signature Failure\n");
 			ERR_print_errors(bio_err);
diff -up openssl-0.9.8g/apps/x509.c.verifysig openssl-0.9.8g/apps/x509.c
--- openssl-0.9.8g/apps/x509.c.verifysig	2005-07-16 13:13:03.000000000 +0200
+++ openssl-0.9.8g/apps/x509.c	2009-01-07 16:11:13.000000000 +0100
@@ -1144,7 +1144,7 @@ static int x509_certify(X509_STORE *ctx,
 	/* NOTE: this certificate can/should be self signed, unless it was
 	 * a certificate request in which case it is not. */
 	X509_STORE_CTX_set_cert(&xsc,x);
-	if (!reqfile && !X509_verify_cert(&xsc))
+	if (!reqfile && X509_verify_cert(&xsc) <= 0)
 		goto end;
 
 	if (!X509_check_private_key(xca,pkey))
diff -up openssl-0.9.8g/ssl/s2_clnt.c.verifysig openssl-0.9.8g/ssl/s2_clnt.c
--- openssl-0.9.8g/ssl/s2_clnt.c.verifysig	2007-09-06 14:43:53.000000000 +0200
+++ openssl-0.9.8g/ssl/s2_clnt.c	2009-01-07 16:11:32.000000000 +0100
@@ -1044,7 +1044,7 @@ int ssl2_set_certificate(SSL *s, int typ
 
 	i=ssl_verify_cert_chain(s,sk);
 		
-	if ((s->verify_mode != SSL_VERIFY_NONE) && (!i))
+	if ((s->verify_mode != SSL_VERIFY_NONE) && (i <= 0))
 		{
 		SSLerr(SSL_F_SSL2_SET_CERTIFICATE,SSL_R_CERTIFICATE_VERIFY_FAILED);
 		goto err;
diff -up openssl-0.9.8g/ssl/s2_srvr.c.verifysig openssl-0.9.8g/ssl/s2_srvr.c
--- openssl-0.9.8g/ssl/s2_srvr.c.verifysig	2007-09-06 14:43:53.000000000 +0200
+++ openssl-0.9.8g/ssl/s2_srvr.c	2009-01-07 16:12:54.000000000 +0100
@@ -1054,7 +1054,7 @@ static int request_certificate(SSL *s)
 
 	i=ssl_verify_cert_chain(s,sk);
 
-	if (i)	/* we like the packet, now check the chksum */
+	if (i > 0)	/* we like the packet, now check the chksum */
 		{
 		EVP_MD_CTX ctx;
 		EVP_PKEY *pkey=NULL;
@@ -1083,7 +1083,7 @@ static int request_certificate(SSL *s)
 		EVP_PKEY_free(pkey);
 		EVP_MD_CTX_cleanup(&ctx);
 
-		if (i) 
+		if (i > 0) 
 			{
 			if (s->session->peer != NULL)
 				X509_free(s->session->peer);
diff -up openssl-0.9.8g/ssl/s3_clnt.c.verifysig openssl-0.9.8g/ssl/s3_clnt.c
--- openssl-0.9.8g/ssl/s3_clnt.c.verifysig	2009-01-07 16:09:11.000000000 +0100
+++ openssl-0.9.8g/ssl/s3_clnt.c	2009-01-07 16:11:32.000000000 +0100
@@ -940,7 +940,7 @@ int ssl3_get_server_certificate(SSL *s)
 		}
 
 	i=ssl_verify_cert_chain(s,sk);
-	if ((s->verify_mode != SSL_VERIFY_NONE) && (!i)
+	if ((s->verify_mode != SSL_VERIFY_NONE) && (i <= 0)
 #ifndef OPENSSL_NO_KRB5
 	        && (s->s3->tmp.new_cipher->algorithms & (SSL_MKEY_MASK|SSL_AUTH_MASK))
 	        != (SSL_aKRB5|SSL_kKRB5)
@@ -1425,7 +1425,7 @@ int ssl3_get_key_exchange(SSL *s)
 			EVP_VerifyUpdate(&md_ctx,&(s->s3->client_random[0]),SSL3_RANDOM_SIZE);
 			EVP_VerifyUpdate(&md_ctx,&(s->s3->server_random[0]),SSL3_RANDOM_SIZE);
 			EVP_VerifyUpdate(&md_ctx,param,param_len);
-			if (!EVP_VerifyFinal(&md_ctx,p,(int)n,pkey))
+			if (EVP_VerifyFinal(&md_ctx,p,(int)n,pkey) <= 0)
 				{
 				/* bad signature */
 				al=SSL_AD_DECRYPT_ERROR;
@@ -1443,7 +1443,7 @@ int ssl3_get_key_exchange(SSL *s)
 			EVP_VerifyUpdate(&md_ctx,&(s->s3->client_random[0]),SSL3_RANDOM_SIZE);
 			EVP_VerifyUpdate(&md_ctx,&(s->s3->server_random[0]),SSL3_RANDOM_SIZE);
 			EVP_VerifyUpdate(&md_ctx,param,param_len);
-			if (!EVP_VerifyFinal(&md_ctx,p,(int)n,pkey))
+			if (EVP_VerifyFinal(&md_ctx,p,(int)n,pkey) <= 0)
 				{
 				/* bad signature */
 				al=SSL_AD_DECRYPT_ERROR;
diff -up openssl-0.9.8g/ssl/ssltest.c.verifysig openssl-0.9.8g/ssl/ssltest.c
--- openssl-0.9.8g/ssl/ssltest.c.verifysig	2009-01-07 16:09:11.000000000 +0100
+++ openssl-0.9.8g/ssl/ssltest.c	2009-01-07 16:11:32.000000000 +0100
@@ -2061,7 +2061,7 @@ static int MS_CALLBACK app_verify_callba
 
 	if (cb_arg->proxy_auth)
 		{
-		if (ok)
+		if (ok > 0)
 			{
 			const char *cond_end = NULL;
 
diff -up openssl-0.9.8g/ssl/s3_srvr.c.verifysig openssl-0.9.8g/ssl/s3_srvr.c
--- openssl-0.9.8g/ssl/s3_srvr.c.verifysig	2007-09-30 20:55:59.000000000 +0200
+++ openssl-0.9.8g/ssl/s3_srvr.c	2009-01-07 16:11:32.000000000 +0100
@@ -2519,7 +2519,7 @@ int ssl3_get_client_certificate(SSL *s)
 	else
 		{
 		i=ssl_verify_cert_chain(s,sk);
-		if (!i)
+		if (i <= 0)
 			{
 			al=ssl_verify_alarm_type(s->verify_result);
 			SSLerr(SSL_F_SSL3_GET_CLIENT_CERTIFICATE,SSL_R_NO_CERTIFICATE_RETURNED);

openssl-0.9.8g-no-ign-eof.patch:

--- NEW FILE openssl-0.9.8g-no-ign-eof.patch ---
diff -up openssl-0.9.8g/apps/s_client.c.no-ign-eof openssl-0.9.8g/apps/s_client.c
--- openssl-0.9.8g/apps/s_client.c.no-ign-eof	2009-01-07 16:09:11.000000000 +0100
+++ openssl-0.9.8g/apps/s_client.c	2009-01-07 16:21:03.000000000 +0100
@@ -216,6 +216,7 @@ static void sc_usage(void)
 	BIO_printf(bio_err," -crlf         - convert LF from terminal into CRLF\n");
 	BIO_printf(bio_err," -quiet        - no s_client output\n");
 	BIO_printf(bio_err," -ign_eof      - ignore input eof (default when -quiet)\n");
+	BIO_printf(bio_err," -no_ign_eof   - don't ignore input eof\n");
 	BIO_printf(bio_err," -ssl2         - just use SSLv2\n");
 	BIO_printf(bio_err," -ssl3         - just use SSLv3\n");
 	BIO_printf(bio_err," -tls1         - just use TLSv1\n");
@@ -427,6 +428,8 @@ int MAIN(int argc, char **argv)
 			}
 		else if	(strcmp(*argv,"-ign_eof") == 0)
 			c_ign_eof=1;
+		else if (strcmp(*argv,"-no_ign_eof") == 0)
+			c_ign_eof=0;
 		else if	(strcmp(*argv,"-pause") == 0)
 			c_Pause=1;
 		else if	(strcmp(*argv,"-debug") == 0)


Index: openssl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openssl/F-10/openssl.spec,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -r1.113 -r1.114
--- openssl.spec	10 Aug 2008 20:36:12 -0000	1.113
+++ openssl.spec	7 Jan 2009 15:22:42 -0000	1.114
@@ -22,7 +22,7 @@
 Summary: The OpenSSL toolkit
 Name: openssl
 Version: 0.9.8g
-Release: 11%{?dist}
+Release: 12%{?dist}
 # We remove certain patented algorithms from the openssl source tarball
 # with the hobble-openssl script which is included below.
 Source: openssl-%{version}-usa.tar.bz2
@@ -58,6 +58,8 @@
 Patch51: openssl-0.9.8g-bn-mul-bug.patch
 Patch52: openssl-0.9.8g-cve-2008-0891.patch
 Patch53: openssl-0.9.8g-cve-2008-1671.patch
+Patch54: openssl-0.9.8g-cve-2008-5077.patch
+Patch55: openssl-0.9.8g-no-ign-eof.patch
 
 License: OpenSSL
 Group: System Environment/Libraries
@@ -125,6 +127,8 @@
 %patch51 -p1 -b .bn-mul-bug
 %patch52 -p0 -b .srvname-crash
 %patch53 -p0 -b .srv-kex-crash
+%patch54 -p1 -b .verifysig
+%patch55 -p1 -b .no-ign-eof
 
 # Modify the various perl scripts to reference perl in the right location.
 perl util/perlpath.pl `dirname %{__perl}`
@@ -368,6 +372,10 @@
 %postun -p /sbin/ldconfig
 
 %changelog
+* Wed Jan  7 2009 Tomas Mraz <tmraz at redhat.com> 0.9.8g-12
+- fix CVE-2008-5077 - incorrect checks for malformed signatures (#476671)
+- add -no_ign_eof option (#462393)
+
 * Sun Aug 10 2008 Tomas Mraz <tmraz at redhat.com> 0.9.8g-11
 - do not add tls extensions to server hello for SSLv3 either
 



From than at fedoraproject.org  Wed Jan  7 15:30:03 2009
From: than at fedoraproject.org (Than Ngo)
Date: Wed,  7 Jan 2009 15:30:03 +0000 (UTC)
Subject: rpms/kdebase-runtime/devel .cvsignore, 1.24,
	1.25 kdebase-runtime.spec, 1.84, 1.85 sources, 1.25, 1.26
Message-ID: <20090107153003.C650C70100@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdebase-runtime/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27767

Modified Files:
	.cvsignore kdebase-runtime.spec sources 
Log Message:
4.2rc1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdebase-runtime/devel/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- .cvsignore	11 Dec 2008 14:21:51 -0000	1.24
+++ .cvsignore	7 Jan 2009 15:29:33 -0000	1.25
@@ -9,3 +9,4 @@
 audio-headset-usb.svgz
 kdebase-runtime-4.1.80.tar.bz2
 kdebase-runtime-4.1.85.tar.bz2
+kdebase-runtime-4.1.96.tar.bz2


Index: kdebase-runtime.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebase-runtime/devel/kdebase-runtime.spec,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -r1.84 -r1.85
--- kdebase-runtime.spec	22 Dec 2008 16:24:50 -0000	1.84
+++ kdebase-runtime.spec	7 Jan 2009 15:29:33 -0000	1.85
@@ -7,8 +7,8 @@
 
 Name:          kdebase-runtime
 Summary:       K Desktop Environment - Runtime
-Version:       4.1.85
-Release:       2%{?dist}
+Version:       4.1.96
+Release:       1%{?dist}
 
 License:       GPLv2
 Group:         User Interface/Desktops
@@ -338,6 +338,9 @@
 
 
 %changelog
+* Wed Jan 07 2009 Than Ngo <than at redhat.com> - 4.1.96-1
+- 4.2rc1
+
 * Mon Dec 22 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.85-2
 - include %%_bindir/kdesu symlink
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdebase-runtime/devel/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- sources	11 Dec 2008 14:21:51 -0000	1.25
+++ sources	7 Jan 2009 15:29:33 -0000	1.26
@@ -1 +1 @@
-100cdcc07031bf04d12f7e23f9bc5945  kdebase-runtime-4.1.85.tar.bz2
+a3fbdae9774545991aac839d9971f62c  kdebase-runtime-4.1.96.tar.bz2



From tmraz at fedoraproject.org  Wed Jan  7 15:39:14 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Wed,  7 Jan 2009 15:39:14 +0000 (UTC)
Subject: rpms/openssl/F-9 openssl-0.9.8g-cve-2008-5077.patch, NONE,
	1.1 openssl-0.9.8g-no-ign-eof.patch, NONE,
	1.1 openssl-0.9.8g-no-extssl.patch, 1.1, 1.2 openssl.spec, 1.106,
	1.107
Message-ID: <20090107153914.DFBE270100@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/openssl/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28836

Modified Files:
	openssl-0.9.8g-no-extssl.patch openssl.spec 
Added Files:
	openssl-0.9.8g-cve-2008-5077.patch 
	openssl-0.9.8g-no-ign-eof.patch 
Log Message:
* Wed Jan  7 2009 Tomas Mraz <tmraz at redhat.com> 0.9.8g-9.12
- fix CVE-2008-5077 - incorrect checks for malformed signatures (#476671)
- add -no_ign_eof option (#462393)
- do not add tls extensions to server hello for SSLv3 either


openssl-0.9.8g-cve-2008-5077.patch:

--- NEW FILE openssl-0.9.8g-cve-2008-5077.patch ---
diff -up openssl-0.9.8g/apps/speed.c.verifysig openssl-0.9.8g/apps/speed.c
--- openssl-0.9.8g/apps/speed.c.verifysig	2009-01-07 16:09:11.000000000 +0100
+++ openssl-0.9.8g/apps/speed.c	2009-01-07 16:11:13.000000000 +0100
@@ -2132,7 +2132,7 @@ int MAIN(int argc, char **argv)
 				{
 				ret=RSA_verify(NID_md5_sha1, buf,36, buf2,
 					rsa_num, rsa_key[j]);
-				if (ret == 0)
+				if (ret <= 0)
 					{
 					BIO_printf(bio_err,
 						"RSA verify failure\n");
diff -up openssl-0.9.8g/apps/verify.c.verifysig openssl-0.9.8g/apps/verify.c
--- openssl-0.9.8g/apps/verify.c.verifysig	2004-11-29 12:28:07.000000000 +0100
+++ openssl-0.9.8g/apps/verify.c	2009-01-07 16:11:13.000000000 +0100
@@ -266,7 +266,7 @@ static int check(X509_STORE *ctx, char *
 
 	ret=0;
 end:
-	if (i)
+	if (i > 0)
 		{
 		fprintf(stdout,"OK\n");
 		ret=1;
@@ -367,4 +367,3 @@ static int MS_CALLBACK cb(int ok, X509_S
 		ERR_clear_error();
 	return(ok);
 	}
-
diff -up openssl-0.9.8g/apps/spkac.c.verifysig openssl-0.9.8g/apps/spkac.c
--- openssl-0.9.8g/apps/spkac.c.verifysig	2005-04-05 21:11:18.000000000 +0200
+++ openssl-0.9.8g/apps/spkac.c	2009-01-07 16:11:13.000000000 +0100
@@ -285,7 +285,7 @@ bad:
 	pkey = NETSCAPE_SPKI_get_pubkey(spki);
 	if(verify) {
 		i = NETSCAPE_SPKI_verify(spki, pkey);
-		if(i) BIO_printf(bio_err, "Signature OK\n");
+		if (i > 0) BIO_printf(bio_err, "Signature OK\n");
 		else {
 			BIO_printf(bio_err, "Signature Failure\n");
 			ERR_print_errors(bio_err);
diff -up openssl-0.9.8g/apps/x509.c.verifysig openssl-0.9.8g/apps/x509.c
--- openssl-0.9.8g/apps/x509.c.verifysig	2005-07-16 13:13:03.000000000 +0200
+++ openssl-0.9.8g/apps/x509.c	2009-01-07 16:11:13.000000000 +0100
@@ -1144,7 +1144,7 @@ static int x509_certify(X509_STORE *ctx,
 	/* NOTE: this certificate can/should be self signed, unless it was
 	 * a certificate request in which case it is not. */
 	X509_STORE_CTX_set_cert(&xsc,x);
-	if (!reqfile && !X509_verify_cert(&xsc))
+	if (!reqfile && X509_verify_cert(&xsc) <= 0)
 		goto end;
 
 	if (!X509_check_private_key(xca,pkey))
diff -up openssl-0.9.8g/ssl/s2_clnt.c.verifysig openssl-0.9.8g/ssl/s2_clnt.c
--- openssl-0.9.8g/ssl/s2_clnt.c.verifysig	2007-09-06 14:43:53.000000000 +0200
+++ openssl-0.9.8g/ssl/s2_clnt.c	2009-01-07 16:11:32.000000000 +0100
@@ -1044,7 +1044,7 @@ int ssl2_set_certificate(SSL *s, int typ
 
 	i=ssl_verify_cert_chain(s,sk);
 		
-	if ((s->verify_mode != SSL_VERIFY_NONE) && (!i))
+	if ((s->verify_mode != SSL_VERIFY_NONE) && (i <= 0))
 		{
 		SSLerr(SSL_F_SSL2_SET_CERTIFICATE,SSL_R_CERTIFICATE_VERIFY_FAILED);
 		goto err;
diff -up openssl-0.9.8g/ssl/s2_srvr.c.verifysig openssl-0.9.8g/ssl/s2_srvr.c
--- openssl-0.9.8g/ssl/s2_srvr.c.verifysig	2007-09-06 14:43:53.000000000 +0200
+++ openssl-0.9.8g/ssl/s2_srvr.c	2009-01-07 16:12:54.000000000 +0100
@@ -1054,7 +1054,7 @@ static int request_certificate(SSL *s)
 
 	i=ssl_verify_cert_chain(s,sk);
 
-	if (i)	/* we like the packet, now check the chksum */
+	if (i > 0)	/* we like the packet, now check the chksum */
 		{
 		EVP_MD_CTX ctx;
 		EVP_PKEY *pkey=NULL;
@@ -1083,7 +1083,7 @@ static int request_certificate(SSL *s)
 		EVP_PKEY_free(pkey);
 		EVP_MD_CTX_cleanup(&ctx);
 
-		if (i) 
+		if (i > 0) 
 			{
 			if (s->session->peer != NULL)
 				X509_free(s->session->peer);
diff -up openssl-0.9.8g/ssl/s3_clnt.c.verifysig openssl-0.9.8g/ssl/s3_clnt.c
--- openssl-0.9.8g/ssl/s3_clnt.c.verifysig	2009-01-07 16:09:11.000000000 +0100
+++ openssl-0.9.8g/ssl/s3_clnt.c	2009-01-07 16:11:32.000000000 +0100
@@ -940,7 +940,7 @@ int ssl3_get_server_certificate(SSL *s)
 		}
 
 	i=ssl_verify_cert_chain(s,sk);
-	if ((s->verify_mode != SSL_VERIFY_NONE) && (!i)
+	if ((s->verify_mode != SSL_VERIFY_NONE) && (i <= 0)
 #ifndef OPENSSL_NO_KRB5
 	        && (s->s3->tmp.new_cipher->algorithms & (SSL_MKEY_MASK|SSL_AUTH_MASK))
 	        != (SSL_aKRB5|SSL_kKRB5)
@@ -1425,7 +1425,7 @@ int ssl3_get_key_exchange(SSL *s)
 			EVP_VerifyUpdate(&md_ctx,&(s->s3->client_random[0]),SSL3_RANDOM_SIZE);
 			EVP_VerifyUpdate(&md_ctx,&(s->s3->server_random[0]),SSL3_RANDOM_SIZE);
 			EVP_VerifyUpdate(&md_ctx,param,param_len);
-			if (!EVP_VerifyFinal(&md_ctx,p,(int)n,pkey))
+			if (EVP_VerifyFinal(&md_ctx,p,(int)n,pkey) <= 0)
 				{
 				/* bad signature */
 				al=SSL_AD_DECRYPT_ERROR;
@@ -1443,7 +1443,7 @@ int ssl3_get_key_exchange(SSL *s)
 			EVP_VerifyUpdate(&md_ctx,&(s->s3->client_random[0]),SSL3_RANDOM_SIZE);
 			EVP_VerifyUpdate(&md_ctx,&(s->s3->server_random[0]),SSL3_RANDOM_SIZE);
 			EVP_VerifyUpdate(&md_ctx,param,param_len);
-			if (!EVP_VerifyFinal(&md_ctx,p,(int)n,pkey))
+			if (EVP_VerifyFinal(&md_ctx,p,(int)n,pkey) <= 0)
 				{
 				/* bad signature */
 				al=SSL_AD_DECRYPT_ERROR;
diff -up openssl-0.9.8g/ssl/ssltest.c.verifysig openssl-0.9.8g/ssl/ssltest.c
--- openssl-0.9.8g/ssl/ssltest.c.verifysig	2009-01-07 16:09:11.000000000 +0100
+++ openssl-0.9.8g/ssl/ssltest.c	2009-01-07 16:11:32.000000000 +0100
@@ -2061,7 +2061,7 @@ static int MS_CALLBACK app_verify_callba
 
 	if (cb_arg->proxy_auth)
 		{
-		if (ok)
+		if (ok > 0)
 			{
 			const char *cond_end = NULL;
 
diff -up openssl-0.9.8g/ssl/s3_srvr.c.verifysig openssl-0.9.8g/ssl/s3_srvr.c
--- openssl-0.9.8g/ssl/s3_srvr.c.verifysig	2007-09-30 20:55:59.000000000 +0200
+++ openssl-0.9.8g/ssl/s3_srvr.c	2009-01-07 16:11:32.000000000 +0100
@@ -2519,7 +2519,7 @@ int ssl3_get_client_certificate(SSL *s)
 	else
 		{
 		i=ssl_verify_cert_chain(s,sk);
-		if (!i)
+		if (i <= 0)
 			{
 			al=ssl_verify_alarm_type(s->verify_result);
 			SSLerr(SSL_F_SSL3_GET_CLIENT_CERTIFICATE,SSL_R_NO_CERTIFICATE_RETURNED);

openssl-0.9.8g-no-ign-eof.patch:

--- NEW FILE openssl-0.9.8g-no-ign-eof.patch ---
diff -up openssl-0.9.8g/apps/s_client.c.no-ign-eof openssl-0.9.8g/apps/s_client.c
--- openssl-0.9.8g/apps/s_client.c.no-ign-eof	2009-01-07 16:09:11.000000000 +0100
+++ openssl-0.9.8g/apps/s_client.c	2009-01-07 16:21:03.000000000 +0100
@@ -216,6 +216,7 @@ static void sc_usage(void)
 	BIO_printf(bio_err," -crlf         - convert LF from terminal into CRLF\n");
 	BIO_printf(bio_err," -quiet        - no s_client output\n");
 	BIO_printf(bio_err," -ign_eof      - ignore input eof (default when -quiet)\n");
+	BIO_printf(bio_err," -no_ign_eof   - don't ignore input eof\n");
 	BIO_printf(bio_err," -ssl2         - just use SSLv2\n");
 	BIO_printf(bio_err," -ssl3         - just use SSLv3\n");
 	BIO_printf(bio_err," -tls1         - just use TLSv1\n");
@@ -427,6 +428,8 @@ int MAIN(int argc, char **argv)
 			}
 		else if	(strcmp(*argv,"-ign_eof") == 0)
 			c_ign_eof=1;
+		else if (strcmp(*argv,"-no_ign_eof") == 0)
+			c_ign_eof=0;
 		else if	(strcmp(*argv,"-pause") == 0)
 			c_Pause=1;
 		else if	(strcmp(*argv,"-debug") == 0)

openssl-0.9.8g-no-extssl.patch:

Index: openssl-0.9.8g-no-extssl.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openssl/F-9/openssl-0.9.8g-no-extssl.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openssl-0.9.8g-no-extssl.patch	13 Dec 2007 17:16:43 -0000	1.1
+++ openssl-0.9.8g-no-extssl.patch	7 Jan 2009 15:39:14 -0000	1.2
@@ -1,17 +1,27 @@
-Skip adding tls extensions to client hello when protocol version is
-not TLS.
 diff -up openssl-0.9.8g/ssl/t1_lib.c.no-extssl openssl-0.9.8g/ssl/t1_lib.c
 --- openssl-0.9.8g/ssl/t1_lib.c.no-extssl	2007-10-19 09:44:10.000000000 +0200
-+++ openssl-0.9.8g/ssl/t1_lib.c	2007-12-13 17:22:10.000000000 +0100
++++ openssl-0.9.8g/ssl/t1_lib.c	2008-08-10 21:42:11.000000000 +0200
 @@ -132,6 +132,11 @@ unsigned char *ssl_add_clienthello_tlsex
  	int extdatalen=0;
  	unsigned char *ret = p;
  
 +	if (s->client_version != TLS1_VERSION && s->client_version != DTLS1_VERSION)
-+	{
++		{
 +		return ret;
-+	}
++		}
 +
  	ret+=2;
  
  	if (ret>=limit) return NULL; /* this really never occurs, but ... */
+@@ -202,6 +207,11 @@ unsigned char *ssl_add_serverhello_tlsex
+ 	int extdatalen=0;
+ 	unsigned char *ret = p;
+ 
++	if (s->version != TLS1_VERSION && s->version != DTLS1_VERSION)
++		{
++		return ret;
++		}
++
+ 	ret+=2;
+ 	if (ret>=limit) return NULL; /* this really never occurs, but ... */
+ 


Index: openssl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openssl/F-9/openssl.spec,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -r1.106 -r1.107
--- openssl.spec	28 May 2008 17:38:52 -0000	1.106
+++ openssl.spec	7 Jan 2009 15:39:14 -0000	1.107
@@ -22,7 +22,7 @@
 Summary: The OpenSSL toolkit
 Name: openssl
 Version: 0.9.8g
-Release: 9%{?dist}
+Release: 9.12%{?dist}
 # We remove certain patented algorithms from the openssl source tarball
 # with the hobble-openssl script which is included below.
 Source: openssl-%{version}-usa.tar.bz2
@@ -61,6 +61,8 @@
 Patch51: openssl-0.9.8g-bn-mul-bug.patch
 Patch52: openssl-0.9.8g-cve-2008-0891.patch
 Patch53: openssl-0.9.8g-cve-2008-1671.patch
+Patch54: openssl-0.9.8g-cve-2008-5077.patch
+Patch55: openssl-0.9.8g-no-ign-eof.patch
 
 License: OpenSSL
 Group: System Environment/Libraries
@@ -128,6 +130,8 @@
 %patch51 -p1 -b .bn-mul-bug
 %patch52 -p0 -b .srvname-crash
 %patch53 -p0 -b .srv-kex-crash
+%patch54 -p1 -b .verifysig
+%patch55 -p1 -b .no-ign-eof
 
 # Modify the various perl scripts to reference perl in the right location.
 perl util/perlpath.pl `dirname %{__perl}`
@@ -382,6 +386,11 @@
 %postun -p /sbin/ldconfig
 
 %changelog
+* Wed Jan  7 2009 Tomas Mraz <tmraz at redhat.com> 0.9.8g-9.12
+- fix CVE-2008-5077 - incorrect checks for malformed signatures (#476671)
+- add -no_ign_eof option (#462393)
+- do not add tls extensions to server hello for SSLv3 either
+
 * Wed May 28 2008 Tomas Mraz <tmraz at redhat.com> 0.9.8g-9
 - fix CVE-2008-0891 - server name extension crash (#448492)
 - fix CVE-2008-1672 - server key exchange message omit crash (#448495)



From than at fedoraproject.org  Wed Jan  7 15:40:45 2009
From: than at fedoraproject.org (Than Ngo)
Date: Wed,  7 Jan 2009 15:40:45 +0000 (UTC)
Subject: rpms/kdebase-workspace/devel .cvsignore, 1.24,
	1.25 kdebase-workspace.spec, 1.161, 1.162 sources, 1.29, 1.30
Message-ID: <20090107154045.012A070100@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdebase-workspace/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28980

Modified Files:
	.cvsignore kdebase-workspace.spec sources 
Log Message:
4.2rc1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdebase-workspace/devel/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- .cvsignore	16 Dec 2008 19:53:41 -0000	1.24
+++ .cvsignore	7 Jan 2009 15:40:14 -0000	1.25
@@ -1 +1,2 @@
 kdebase-workspace-4.1.85.tar.bz2
+kdebase-workspace-4.1.96.tar.bz2


Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebase-workspace/devel/kdebase-workspace.spec,v
retrieving revision 1.161
retrieving revision 1.162
diff -u -r1.161 -r1.162
--- kdebase-workspace.spec	23 Dec 2008 16:09:42 -0000	1.161
+++ kdebase-workspace.spec	7 Jan 2009 15:40:14 -0000	1.162
@@ -2,9 +2,9 @@
 
 Summary: K Desktop Environment - Workspace
 Name: kdebase-workspace
-Version: 4.1.85
+Version: 4.1.96
 
-Release: 7%{?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
@@ -290,6 +290,9 @@
 
 
 %changelog
+* Wed Jan 07 2009 Than Ngo <than at redhat.com> - 4.1.96-1
+- 4.2rc1
+
 * Tue Dec 23 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.85-7
 - Obsoletes: kpowersave (kpowersave -> powerdevil upgrade path, F-11+)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdebase-workspace/devel/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- sources	16 Dec 2008 19:53:41 -0000	1.29
+++ sources	7 Jan 2009 15:40:14 -0000	1.30
@@ -1 +1 @@
-2efd6fbcbebea61bd63f66e6a7ab6117  kdebase-workspace-4.1.85.tar.bz2
+e4fd6e11f45e5099de521867797bf86b  kdebase-workspace-4.1.96.tar.bz2



From than at fedoraproject.org  Wed Jan  7 15:47:25 2009
From: than at fedoraproject.org (Than Ngo)
Date: Wed,  7 Jan 2009 15:47:25 +0000 (UTC)
Subject: rpms/kdebindings/devel .cvsignore, 1.51, 1.52 kdebindings.spec,
	1.162, 1.163 sources, 1.57, 1.58
Message-ID: <20090107154725.6B46B70100@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdebindings/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29657

Modified Files:
	.cvsignore kdebindings.spec sources 
Log Message:
4.2rc1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdebindings/devel/.cvsignore,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- .cvsignore	12 Dec 2008 10:31:04 -0000	1.51
+++ .cvsignore	7 Jan 2009 15:46:54 -0000	1.52
@@ -1,3 +1,4 @@
 kdebindings-4.1.2.tar.bz2
 kdebindings-4.1.80.tar.bz2
 kdebindings-4.1.85.tar.bz2
+kdebindings-4.1.96.tar.bz2


Index: kdebindings.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebindings/devel/kdebindings.spec,v
retrieving revision 1.162
retrieving revision 1.163
diff -u -r1.162 -r1.163
--- kdebindings.spec	13 Dec 2008 02:20:20 -0000	1.162
+++ kdebindings.spec	7 Jan 2009 15:46:54 -0000	1.163
@@ -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.85
-Release: 2%{?dist}
+Version: 4.1.96
+Release: 1%{?dist}
 Summary: KDE bindings to non-C++ languages
 
 Group: User Interface/Desktops
@@ -162,6 +162,9 @@
 
 
 %changelog
+* Wed Jan 07 2009 Than Ngo <than at redhat.com> - 4.1.96-1
+- 4.2rc1
+
 * Fri Dec 12 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.85-2
 - reenable smoke, ruby
 - disable NepomukSmoke for now: it wasn't actually used (the corresponding


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdebindings/devel/sources,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- sources	12 Dec 2008 10:31:04 -0000	1.57
+++ sources	7 Jan 2009 15:46:55 -0000	1.58
@@ -1 +1 @@
-31b04d423ebbce5faf7eaa2f92409083  kdebindings-4.1.85.tar.bz2
+7669193f0ce227bd7e113aaedc131225  kdebindings-4.1.96.tar.bz2



From xhorak at fedoraproject.org  Wed Jan  7 15:48:17 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Wed,  7 Jan 2009 15:48:17 +0000 (UTC)
Subject: rpms/firefox/F-10 firefox.sh.in,1.32,1.33 firefox.spec,1.317,1.318
Message-ID: <20090107154817.D7F3570100@cvs1.fedora.phx.redhat.com>

Author: xhorak

Update of /cvs/pkgs/rpms/firefox/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29771

Modified Files:
	firefox.sh.in firefox.spec 
Log Message:



Index: firefox.sh.in
===================================================================
RCS file: /cvs/pkgs/rpms/firefox/F-10/firefox.sh.in,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- firefox.sh.in	2 Jun 2008 12:49:37 -0000	1.32
+++ firefox.sh.in	7 Jan 2009 15:47:47 -0000	1.33
@@ -140,10 +140,10 @@
 MOZARGS=
 # Try without a local variant first, then with a local variant
 # So that pt-BR doesn't try to use pt for example
-SHORTMOZLOCALE=`echo $LANG | sed "s|_\([^.]*\).*||g"`
+SHORTMOZLOCALE=`echo $LC_MESSAGES | sed "s|_\([^.]*\).*||g"`
 [ -f $MOZ_EXTENSIONS_DIR/langpack-${SHORTMOZLOCALE}@firefox.mozilla.org/chrome/$SHORTMOZLOCALE.jar ] && MOZARGS="-UILocale $SHORTMOZLOCALE"
 
-MOZLOCALE=`echo $LANG | sed "s|_\([^.]*\).*|-\1|g"`
+MOZLOCALE=`echo $LC_MESSAGES | sed "s|_\([^.]*\).*|-\1|g"`
 [ -f $MOZ_EXTENSIONS_DIR/langpack-${MOZLOCALE}@firefox.mozilla.org/chrome/$MOZLOCALE.jar ] && MOZARGS="-UILocale $MOZLOCALE"
 
 # Prepare command line arguments


Index: firefox.spec
===================================================================
RCS file: /cvs/pkgs/rpms/firefox/F-10/firefox.spec,v
retrieving revision 1.317
retrieving revision 1.318
diff -u -r1.317 -r1.318
--- firefox.spec	17 Dec 2008 18:35:34 -0000	1.317
+++ firefox.spec	7 Jan 2009 15:47:47 -0000	1.318
@@ -18,7 +18,7 @@
 Summary:        Mozilla Firefox Web browser
 Name:           firefox
 Version:        3.0.5
-Release:        1%{?dist}
+Release:        2%{?dist}
 URL:            http://www.mozilla.org/projects/firefox/
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 Group:          Applications/Internet
@@ -322,6 +322,10 @@
 #---------------------------------------------------------------------
 
 %changelog
+* Wed Jan  7 2009 Jan Horak <jhorak at redhat.com> - 3.0.5-2
+- Fixed wrong LANG and LC_MESSAGES variables interpretation (#441973) 
+  in startup script.
+
 * Tue Dec 16 2008 Christopher Aillon <caillon at redhat.com> 3.0.5-1
 - Update to 3.0.5
 



From xhorak at fedoraproject.org  Wed Jan  7 15:49:35 2009
From: xhorak at fedoraproject.org (Jan Horak)
Date: Wed,  7 Jan 2009 15:49:35 +0000 (UTC)
Subject: rpms/firefox/devel firefox.sh.in, 1.32, 1.33 firefox.spec, 1.320,
	1.321
Message-ID: <20090107154935.7E44470100@cvs1.fedora.phx.redhat.com>

Author: xhorak

Update of /cvs/pkgs/rpms/firefox/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29919

Modified Files:
	firefox.sh.in firefox.spec 
Log Message:
Fixed wrong LANG and LC_MESSAGES variables interpretation (#441973)\nin startup script.


Index: firefox.sh.in
===================================================================
RCS file: /cvs/pkgs/rpms/firefox/devel/firefox.sh.in,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- firefox.sh.in	2 Jun 2008 12:49:37 -0000	1.32
+++ firefox.sh.in	7 Jan 2009 15:49:05 -0000	1.33
@@ -140,10 +140,10 @@
 MOZARGS=
 # Try without a local variant first, then with a local variant
 # So that pt-BR doesn't try to use pt for example
-SHORTMOZLOCALE=`echo $LANG | sed "s|_\([^.]*\).*||g"`
+SHORTMOZLOCALE=`echo $LC_MESSAGES | sed "s|_\([^.]*\).*||g"`
 [ -f $MOZ_EXTENSIONS_DIR/langpack-${SHORTMOZLOCALE}@firefox.mozilla.org/chrome/$SHORTMOZLOCALE.jar ] && MOZARGS="-UILocale $SHORTMOZLOCALE"
 
-MOZLOCALE=`echo $LANG | sed "s|_\([^.]*\).*|-\1|g"`
+MOZLOCALE=`echo $LC_MESSAGES | sed "s|_\([^.]*\).*|-\1|g"`
 [ -f $MOZ_EXTENSIONS_DIR/langpack-${MOZLOCALE}@firefox.mozilla.org/chrome/$MOZLOCALE.jar ] && MOZARGS="-UILocale $MOZLOCALE"
 
 # Prepare command line arguments


Index: firefox.spec
===================================================================
RCS file: /cvs/pkgs/rpms/firefox/devel/firefox.spec,v
retrieving revision 1.320
retrieving revision 1.321
diff -u -r1.320 -r1.321
--- firefox.spec	21 Dec 2008 22:29:35 -0000	1.320
+++ firefox.spec	7 Jan 2009 15:49:05 -0000	1.321
@@ -19,7 +19,7 @@
 Summary:        Mozilla Firefox Web browser
 Name:           firefox
 Version:        3.1
-Release:        0.4.beta2%{?dist}
+Release:        0.5.beta2%{?dist}
 URL:            http://www.mozilla.org/projects/firefox/
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 Group:          Applications/Internet
@@ -326,6 +326,10 @@
 #---------------------------------------------------------------------
 
 %changelog
+* Wed Jan  7 2009 Jan Horak <jhorak at redhat.com> - 3.1-0.5
+- Fixed wrong LANG and LC_MESSAGES variables interpretation (#441973) 
+  in startup script.
+
 * Sat Dec 20 2008 Christopher Aillon <caillon at redhat.com> 3.1-0.4
 - 3.1 beta 2
 



From atkac at fedoraproject.org  Wed Jan  7 15:57:37 2009
From: atkac at fedoraproject.org (Adam Tkac)
Date: Wed,  7 Jan 2009 15:57:37 +0000 (UTC)
Subject: rpms/xorg-x11-server/devel xorg-x11-server.spec,1.385,1.386
Message-ID: <20090107155737.97D2570100@cvs1.fedora.phx.redhat.com>

Author: atkac

Update of /cvs/pkgs/rpms/xorg-x11-server/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31454

Modified Files:
	xorg-x11-server.spec 
Log Message:
- use "git am" instead of "git-am"
- added more sources into xorg-x11-server-source to make source compilable



Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.385
retrieving revision 1.386
diff -u -r1.385 -r1.386
--- xorg-x11-server.spec	29 Dec 2008 01:36:55 -0000	1.385
+++ xorg-x11-server.spec	7 Jan 2009 15:57:07 -0000	1.386
@@ -19,7 +19,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.5.99.3
-Release:   5%{?dist}
+Release:   6%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -284,7 +284,7 @@
 
 # Apply all the patches.
 #git-am -p1 %{patches}
-git-am -p1 $(awk '/^Patch.*:/ { print "%{_sourcedir}/"$2 }' %{_specdir}/%{name}.spec)
+git am -p1 $(awk '/^Patch.*:/ { print "%{_sourcedir}/"$2 }' %{_specdir}/%{name}.spec)
 
 %build
 
@@ -331,8 +331,9 @@
 # Make the source package
 %define xserver_source_dir %{_datadir}/xorg-x11-server-source
 %define inst_srcdir %{buildroot}/%{xserver_source_dir}
-mkdir -p %{inst_srcdir}/{Xext,xkb,GL,hw/xfree86/common}
+mkdir -p %{inst_srcdir}/{Xext,xkb,GL,hw/{xquartz/bundle,xfree86/common}}
 cp cpprules.in %{inst_srcdir}
+cp {,%{inst_srcdir}/}hw/xquartz/bundle/cpprules.in
 cp xkb/README.compiled %{inst_srcdir}/xkb
 cp hw/xfree86/{xorgconf.cpp,Options} %{inst_srcdir}/hw/xfree86
 cp hw/xfree86/common/{vesamodes,extramodes} %{inst_srcdir}/hw/xfree86/common
@@ -491,6 +492,10 @@
 
 
 %changelog
+* Wed Jan 07 2009 Adam Tkac <atkac redhat com> 1.5.99.3-6
+- use "git am" instead of "git-am"
+- added more sources into xorg-x11-server-source to make source compilable
+
 * Mon Dec 29 2008 Dave Airlie <airlied at redhat.com> 1.5.99.3-5
 - remove unused build options - enable dri2
 



From caolanm at fedoraproject.org  Wed Jan  7 15:58:24 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Wed,  7 Jan 2009 15:58:24 +0000 (UTC)
Subject: rpms/python-gtkextra/devel python-gtkextra-1.1.0-codegenmoved.patch,
	NONE, 1.1 python-gtkextra.spec, 1.3, 1.4
Message-ID: <20090107155824.C7C2470100@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/python-gtkextra/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31643

Modified Files:
	python-gtkextra.spec 
Added Files:
	python-gtkextra-1.1.0-codegenmoved.patch 
Log Message:
codegen moved from pygtk to pygobject, fix to rebuild

python-gtkextra-1.1.0-codegenmoved.patch:

--- NEW FILE python-gtkextra-1.1.0-codegenmoved.patch ---
diff -ru python-gtkextra-1.1.0/gtkextra/mycodegen.py python-gtkextra-1.1.0.new/gtkextra/mycodegen.py
--- python-gtkextra-1.1.0.orig/gtkextra/mycodegen.py	2009-01-07 15:46:34.000000000 +0000
+++ python-gtkextra-1.1.0w/gtkextra/mycodegen.py	2009-01-07 15:45:52.000000000 +0000
@@ -6,7 +6,7 @@
 import _config
 import sys
 import os
-sys.path.append(os.path.join(_config.PYGTK_DEFSDIR, '../'))
+sys.path.append(os.path.join(_config.PYGTK_DEFSDIR.replace('pygtk','pygobject'), '../'))
 
 from codegen.argtypes import matcher
 import codegen.codegen


Index: python-gtkextra.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-gtkextra/devel/python-gtkextra.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- python-gtkextra.spec	29 Nov 2008 15:36:01 -0000	1.3
+++ python-gtkextra.spec	7 Jan 2009 15:57:54 -0000	1.4
@@ -3,7 +3,7 @@
 Summary: Python bindings for gtkextra
 Name: python-gtkextra
 Version: 1.1.0
-Release: 4%{?dist}
+Release: 5%{?dist}
 # FIXME: the license is not quite clear, using the most restrictive license
 # for this field.  See
 # http://sourceforge.net/tracker/index.php?func=detail&aid=1941652&group_id=35371&atid=414148
@@ -12,6 +12,7 @@
 Group: Development/Libraries
 Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 Patch0: python-gtkextra-1.1.0-update.patch
+Patch1: python-gtkextra-1.1.0-codegenmoved.patch
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildRequires: gtk+extra-devel, pygtk2-devel, python-devel
 Requires: pygtk2, pkgconfig
@@ -22,6 +23,7 @@
 %prep
 %setup -q
 %patch0 -p1 -b .update
+%patch1 -p1 -b .codegenmoved
 
 %build
 
@@ -47,6 +49,9 @@
 %{_datadir}/pygtk/2.0/defs/gtkextra*.defs
 
 %changelog
+* Wed Jan 07 2009 Caol??n McNamara <caolanm at redhat.com> - 1.1.0-5
+- codegen moved from pygtk to pygobject, fix to rebuild
+
 * Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 1.1.0-4
 - Rebuild for Python 2.6
 



From than at fedoraproject.org  Wed Jan  7 15:59:28 2009
From: than at fedoraproject.org (Than Ngo)
Date: Wed,  7 Jan 2009 15:59:28 +0000 (UTC)
Subject: rpms/kdeedu/devel .cvsignore, 1.56, 1.57 kdeedu.spec, 1.151,
	1.152 sources, 1.60, 1.61
Message-ID: <20090107155928.C491270100@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdeedu/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31780

Modified Files:
	.cvsignore kdeedu.spec sources 
Log Message:
4.2rc1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdeedu/devel/.cvsignore,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- .cvsignore	12 Dec 2008 17:48:17 -0000	1.56
+++ .cvsignore	7 Jan 2009 15:58:58 -0000	1.57
@@ -1 +1,2 @@
 kdeedu-4.1.85.tar.bz2
+kdeedu-4.1.96.tar.bz2


Index: kdeedu.spec
===================================================================
RCS file: /cvs/extras/rpms/kdeedu/devel/kdeedu.spec,v
retrieving revision 1.151
retrieving revision 1.152
diff -u -r1.151 -r1.152
--- kdeedu.spec	18 Dec 2008 22:24:21 -0000	1.151
+++ kdeedu.spec	7 Jan 2009 15:58:58 -0000	1.152
@@ -13,8 +13,8 @@
 
 Name:    kdeedu
 Summary: Educational/Edutainment applications
-Version: 4.1.85
-Release: 5%{?dist}
+Version: 4.1.96
+Release: 1%{?dist}
 
 License: GPLv2
 Group:	 Amusements/Games
@@ -389,6 +389,9 @@
 
 
 %changelog
+* Wed Jan 07 2009 Than Ngo <than at redhat.com> - 4.1.96-1
+- 4.2rc1
+
 * Thu Dec 18 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.85-5
 - and fix cfitsio detection yet again (upstream revision 898747)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdeedu/devel/sources,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- sources	12 Dec 2008 17:48:17 -0000	1.60
+++ sources	7 Jan 2009 15:58:58 -0000	1.61
@@ -1 +1 @@
-2e29ee1e501d46bd00c67c0b5bfdebd4  kdeedu-4.1.85.tar.bz2
+b8c1cc06d06dff0852ca16daabeec51b  kdeedu-4.1.96.tar.bz2



From than at fedoraproject.org  Wed Jan  7 16:09:20 2009
From: than at fedoraproject.org (Than Ngo)
Date: Wed,  7 Jan 2009 16:09:20 +0000 (UTC)
Subject: rpms/kdegames/devel .cvsignore, 1.60, 1.61 kdegames.spec, 1.111,
	1.112 sources, 1.63, 1.64
Message-ID: <20090107160920.6798B70100@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdegames/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv760

Modified Files:
	.cvsignore kdegames.spec sources 
Log Message:
4.2rc1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdegames/devel/.cvsignore,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- .cvsignore	12 Dec 2008 10:55:29 -0000	1.60
+++ .cvsignore	7 Jan 2009 16:08:49 -0000	1.61
@@ -1,3 +1,4 @@
 kdegames-4.1.2.tar.bz2
 kdegames-4.1.80.tar.bz2
 kdegames-4.1.85.tar.bz2
+kdegames-4.1.96.tar.bz2


Index: kdegames.spec
===================================================================
RCS file: /cvs/extras/rpms/kdegames/devel/kdegames.spec,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -r1.111 -r1.112
--- kdegames.spec	12 Dec 2008 10:55:29 -0000	1.111
+++ kdegames.spec	7 Jan 2009 16:08:49 -0000	1.112
@@ -3,7 +3,7 @@
 Name:    kdegames
 Summary: K Desktop Environment 4 - Games
 Epoch:   6
-Version: 4.1.85
+Version: 4.1.96
 Release: 1%{?dist}
 
 License: GPLv2
@@ -177,6 +177,9 @@
 
 
 %changelog
+* Wed Jan 07 2009 Than Ngo <than at redhat.com> - 4.1.96-1
+- 4.2rc1
+
 * Fri Dec 12 2008 <than at redhat.com> 4.1.85-1
 - 4.2beta2
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdegames/devel/sources,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- sources	12 Dec 2008 10:55:29 -0000	1.63
+++ sources	7 Jan 2009 16:08:49 -0000	1.64
@@ -1 +1 @@
-eb54c3b627f382fa694fa0ab8a40b3bb  kdegames-4.1.85.tar.bz2
+7d9be8e33e9626774cb6893259564620  kdegames-4.1.96.tar.bz2



From nsantos at fedoraproject.org  Wed Jan  7 16:09:59 2009
From: nsantos at fedoraproject.org (Nuno Santos)
Date: Wed,  7 Jan 2009 16:09:59 +0000 (UTC)
Subject: rpms/qpidc/devel corosync.patch,NONE,1.1 qpidc.spec,1.55,1.56
Message-ID: <20090107160959.C68A670100@cvs1.fedora.phx.redhat.com>

Author: nsantos

Update of /cvs/extras/rpms/qpidc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv927

Modified Files:
	qpidc.spec 
Added Files:
	corosync.patch 
Log Message:
add corosync patch

corosync.patch:

--- NEW FILE corosync.patch ---
--- qpidc-0.4.728142/src/qpid/cluster/types.h (original)
+++ qpidc-0.4.728142/src/qpid/cluster/types.h Wed Jan  7 07:00:55 2009
@@ -34,9 +34,9 @@
 #include <stdint.h>
 
 extern "C" {
-#ifdef HAVE_OPENAIS_CPG_H    
-#include <openais/cpg.h>
-#elif HAVE_COROSYNC_CPG_H    
+#if defined (HAVE_OPENAIS_CPG_H)
+#  include <openais/cpg.h>
+#elif defined (HAVE_COROSYNC_CPG_H)
 #  include <corosync/cpg.h>
 #else
 #  error "No cpg.h header file available"




Index: qpidc.spec
===================================================================
RCS file: /cvs/extras/rpms/qpidc/devel/qpidc.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- qpidc.spec	23 Dec 2008 20:25:25 -0000	1.55
+++ qpidc.spec	7 Jan 2009 16:09:29 -0000	1.56
@@ -13,6 +13,7 @@
 License:        ASL 2.0
 URL:            http://qpid.apache.org
 Source0:        %{name}-%{version}.tar.gz
+Patch0:		corosync.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: boost-devel
@@ -181,6 +182,7 @@
 
 %prep
 %setup -q
+%patch
 
 %define perftests "perftest topic_listener topic_publisher \
 	latencytest client_test txtest"



From than at fedoraproject.org  Wed Jan  7 16:13:50 2009
From: than at fedoraproject.org (Than Ngo)
Date: Wed,  7 Jan 2009 16:13:50 +0000 (UTC)
Subject: rpms/kdegraphics/devel .cvsignore, 1.53, 1.54 kdegraphics.spec,
	1.183, 1.184 sources, 1.60, 1.61
Message-ID: <20090107161350.7907270100@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdegraphics/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1600

Modified Files:
	.cvsignore kdegraphics.spec sources 
Log Message:
4.2rc1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdegraphics/devel/.cvsignore,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- .cvsignore	12 Dec 2008 11:11:39 -0000	1.53
+++ .cvsignore	7 Jan 2009 16:13:19 -0000	1.54
@@ -1,3 +1,4 @@
 kdegraphics-4.1.2.tar.bz2
 kdegraphics-4.1.80.tar.bz2
 kdegraphics-4.1.85.tar.bz2
+kdegraphics-4.1.96.tar.bz2


Index: kdegraphics.spec
===================================================================
RCS file: /cvs/extras/rpms/kdegraphics/devel/kdegraphics.spec,v
retrieving revision 1.183
retrieving revision 1.184
diff -u -r1.183 -r1.184
--- kdegraphics.spec	22 Dec 2008 20:59:44 -0000	1.183
+++ kdegraphics.spec	7 Jan 2009 16:13:19 -0000	1.184
@@ -6,8 +6,8 @@
 
 Summary:        K Desktop Environment - Graphics Applications
 Epoch:          7
-Version:        4.1.85
-Release:        4%{?dist}
+Version:        4.1.96
+Release:        1%{?dist}
 
 Name:           kdegraphics
 #Obsoletes:     kdegraphics4 < %{version}-%{release}
@@ -179,6 +179,9 @@
 
 
 %changelog
+* Wed Jan 07 2009 Than Ngo <than at redhat.com> - 4.1.96-1
+- 4.2rc1
+
 * Mon Dec 22 2008 Rex Dieter <rdieter at fedoraproject.org> - 4.1.85-4
 - -devel: Provides: libkipi-devel = 0.3.0
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdegraphics/devel/sources,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- sources	12 Dec 2008 11:11:40 -0000	1.60
+++ sources	7 Jan 2009 16:13:20 -0000	1.61
@@ -1 +1 @@
-8a73aa0b31d58b9eacb69b465c779a52  kdegraphics-4.1.85.tar.bz2
+7c8d131404c8e464f553fa1515cebc40  kdegraphics-4.1.96.tar.bz2



From mtasaka at fedoraproject.org  Wed Jan  7 16:17:15 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Wed,  7 Jan 2009 16:17:15 +0000 (UTC)
Subject: rpms/ruby-marc/F-10 .cvsignore, 1.6, 1.7 ruby-marc.spec, 1.5,
	1.6 sources, 1.6, 1.7
Message-ID: <20090107161715.AB86C70100@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/ruby-marc/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2191/F-10

Modified Files:
	.cvsignore ruby-marc.spec sources 
Log Message:
* Thu Jan  8 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.2.2-1
- 0.2.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ruby-marc/F-10/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	22 Aug 2008 16:07:55 -0000	1.6
+++ .cvsignore	7 Jan 2009 16:16:45 -0000	1.7
@@ -1 +1 @@
-marc-0.2.1.tgz
+marc-0.2.2.tgz


Index: ruby-marc.spec
===================================================================
RCS file: /cvs/extras/rpms/ruby-marc/F-10/ruby-marc.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ruby-marc.spec	22 Aug 2008 16:07:55 -0000	1.5
+++ ruby-marc.spec	7 Jan 2009 16:16:45 -0000	1.6
@@ -1,12 +1,12 @@
 %{!?ruby_sitelib:	%define ruby_sitelib	%(ruby -rrbconfig -e "puts Config::CONFIG['sitelibdir']")}
 
 %define		rubyabi		1.8
-%define		repoid		41416
+%define		repoid		49330
 
 %define		modname		marc
 
 Name:		ruby-%{modname}
-Version:	0.2.1
+Version:	0.2.2
 Release:	1%{?dist}
 Summary:	Ruby library for MARC catalog
 Group:		Development/Languages
@@ -19,6 +19,7 @@
 BuildArch:	noarch
 BuildRequires:	ruby(abi) = %{rubyabi}
 BuildRequires:	ruby
+BuildRequires(check):	rubygem(rake)
 Requires:	ruby(abi) = %{rubyabi}
 Provides:	ruby(%{modname}) = %{version}-%{release}
 
@@ -41,9 +42,7 @@
 
 
 %check
-# No check for now..
-exit 0
-# rake test
+rake -v test || :
 
 %clean
 %{__rm} -rf $RPM_BUILD_ROOT
@@ -58,6 +57,9 @@
 %{ruby_sitelib}/%{modname}/
 
 %changelog
+* Thu Jan  8 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.2.2-1
+- 0.2.2
+
 * Thu Aug 21 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.2.1-1
 - 0.2.1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ruby-marc/F-10/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	22 Aug 2008 16:07:55 -0000	1.6
+++ sources	7 Jan 2009 16:16:45 -0000	1.7
@@ -1 +1 @@
-8843030ff5152a31cd97858b62a4246b  marc-0.2.1.tgz
+72eb63c9ff64001a9bc416aa63cf4269  marc-0.2.2.tgz



From mtasaka at fedoraproject.org  Wed Jan  7 16:17:16 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Wed,  7 Jan 2009 16:17:16 +0000 (UTC)
Subject: rpms/ruby-marc/F-9 .cvsignore, 1.6, 1.7 ruby-marc.spec, 1.5,
	1.6 sources, 1.6, 1.7
Message-ID: <20090107161716.1EE1770100@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/ruby-marc/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2191/F-9

Modified Files:
	.cvsignore ruby-marc.spec sources 
Log Message:
* Thu Jan  8 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.2.2-1
- 0.2.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ruby-marc/F-9/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	22 Aug 2008 16:01:54 -0000	1.6
+++ .cvsignore	7 Jan 2009 16:16:45 -0000	1.7
@@ -1 +1 @@
-marc-0.2.1.tgz
+marc-0.2.2.tgz


Index: ruby-marc.spec
===================================================================
RCS file: /cvs/extras/rpms/ruby-marc/F-9/ruby-marc.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ruby-marc.spec	22 Aug 2008 16:01:54 -0000	1.5
+++ ruby-marc.spec	7 Jan 2009 16:16:45 -0000	1.6
@@ -1,12 +1,12 @@
 %{!?ruby_sitelib:	%define ruby_sitelib	%(ruby -rrbconfig -e "puts Config::CONFIG['sitelibdir']")}
 
 %define		rubyabi		1.8
-%define		repoid		41416
+%define		repoid		49330
 
 %define		modname		marc
 
 Name:		ruby-%{modname}
-Version:	0.2.1
+Version:	0.2.2
 Release:	1%{?dist}
 Summary:	Ruby library for MARC catalog
 Group:		Development/Languages
@@ -19,6 +19,7 @@
 BuildArch:	noarch
 BuildRequires:	ruby(abi) = %{rubyabi}
 BuildRequires:	ruby
+BuildRequires(check):	rubygem(rake)
 Requires:	ruby(abi) = %{rubyabi}
 Provides:	ruby(%{modname}) = %{version}-%{release}
 
@@ -41,9 +42,7 @@
 
 
 %check
-# No check for now..
-exit 0
-# rake test
+rake -v test || :
 
 %clean
 %{__rm} -rf $RPM_BUILD_ROOT
@@ -58,6 +57,9 @@
 %{ruby_sitelib}/%{modname}/
 
 %changelog
+* Thu Jan  8 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.2.2-1
+- 0.2.2
+
 * Thu Aug 21 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.2.1-1
 - 0.2.1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ruby-marc/F-9/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	22 Aug 2008 16:01:54 -0000	1.6
+++ sources	7 Jan 2009 16:16:45 -0000	1.7
@@ -1 +1 @@
-8843030ff5152a31cd97858b62a4246b  marc-0.2.1.tgz
+72eb63c9ff64001a9bc416aa63cf4269  marc-0.2.2.tgz



From mtasaka at fedoraproject.org  Wed Jan  7 16:17:16 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Wed,  7 Jan 2009 16:17:16 +0000 (UTC)
Subject: rpms/ruby-marc/devel .cvsignore, 1.6, 1.7 ruby-marc.spec, 1.5,
	1.6 sources, 1.6, 1.7
Message-ID: <20090107161716.87F5D70100@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/ruby-marc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2191/devel

Modified Files:
	.cvsignore ruby-marc.spec sources 
Log Message:
* Thu Jan  8 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.2.2-1
- 0.2.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ruby-marc/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	22 Aug 2008 16:07:55 -0000	1.6
+++ .cvsignore	7 Jan 2009 16:16:46 -0000	1.7
@@ -1 +1 @@
-marc-0.2.1.tgz
+marc-0.2.2.tgz


Index: ruby-marc.spec
===================================================================
RCS file: /cvs/extras/rpms/ruby-marc/devel/ruby-marc.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ruby-marc.spec	22 Aug 2008 16:07:55 -0000	1.5
+++ ruby-marc.spec	7 Jan 2009 16:16:46 -0000	1.6
@@ -1,12 +1,12 @@
 %{!?ruby_sitelib:	%define ruby_sitelib	%(ruby -rrbconfig -e "puts Config::CONFIG['sitelibdir']")}
 
 %define		rubyabi		1.8
-%define		repoid		41416
+%define		repoid		49330
 
 %define		modname		marc
 
 Name:		ruby-%{modname}
-Version:	0.2.1
+Version:	0.2.2
 Release:	1%{?dist}
 Summary:	Ruby library for MARC catalog
 Group:		Development/Languages
@@ -19,6 +19,7 @@
 BuildArch:	noarch
 BuildRequires:	ruby(abi) = %{rubyabi}
 BuildRequires:	ruby
+BuildRequires(check):	rubygem(rake)
 Requires:	ruby(abi) = %{rubyabi}
 Provides:	ruby(%{modname}) = %{version}-%{release}
 
@@ -41,9 +42,7 @@
 
 
 %check
-# No check for now..
-exit 0
-# rake test
+rake -v test || :
 
 %clean
 %{__rm} -rf $RPM_BUILD_ROOT
@@ -58,6 +57,9 @@
 %{ruby_sitelib}/%{modname}/
 
 %changelog
+* Thu Jan  8 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.2.2-1
+- 0.2.2
+
 * Thu Aug 21 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.2.1-1
 - 0.2.1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ruby-marc/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	22 Aug 2008 16:07:55 -0000	1.6
+++ sources	7 Jan 2009 16:16:46 -0000	1.7
@@ -1 +1 @@
-8843030ff5152a31cd97858b62a4246b  marc-0.2.1.tgz
+72eb63c9ff64001a9bc416aa63cf4269  marc-0.2.2.tgz



From than at fedoraproject.org  Wed Jan  7 16:23:54 2009
From: than at fedoraproject.org (Than Ngo)
Date: Wed,  7 Jan 2009 16:23:54 +0000 (UTC)
Subject: rpms/kdelibs/devel .cvsignore, 1.64, 1.65 kdelibs.spec, 1.406,
	1.407 sources, 1.79, 1.80
Message-ID: <20090107162354.772A970100@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdelibs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3053

Modified Files:
	.cvsignore kdelibs.spec sources 
Log Message:
4.2rc1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdelibs/devel/.cvsignore,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- .cvsignore	16 Dec 2008 19:35:48 -0000	1.64
+++ .cvsignore	7 Jan 2009 16:23:23 -0000	1.65
@@ -1 +1,2 @@
 kdelibs-4.1.85.tar.bz2
+kdelibs-4.1.96.tar.bz2


Index: kdelibs.spec
===================================================================
RCS file: /cvs/extras/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.406
retrieving revision 1.407
diff -u -r1.406 -r1.407
--- kdelibs.spec	19 Dec 2008 01:31:10 -0000	1.406
+++ kdelibs.spec	7 Jan 2009 16:23:24 -0000	1.407
@@ -1,6 +1,6 @@
 Summary: K Desktop Environment 4 - Libraries
-Version: 4.1.85
-Release: 6%{?dist}
+Version: 4.1.96
+Release: 1%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs
@@ -358,6 +358,9 @@
 
 
 %changelog
+* Wed Jan 07 2009 Than Ngo <than at redhat.com> - 4.1.96-1
+- 4.2rc1
+
 * Fri Dec 19 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.85-6
 - add plasma-default-wallpaper libplasma patch from kdebase-workspace-4.1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdelibs/devel/sources,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- sources	16 Dec 2008 20:54:23 -0000	1.79
+++ sources	7 Jan 2009 16:23:24 -0000	1.80
@@ -1 +1 @@
-20aa488389768aea440d211b66437f5b  kdelibs-4.1.85.tar.bz2
+b9254b5afda5bf1855b8d381b6d4509b  kdelibs-4.1.96.tar.bz2



From bellet at fedoraproject.org  Wed Jan  7 16:32:11 2009
From: bellet at fedoraproject.org (Fabrice Bellet)
Date: Wed,  7 Jan 2009 16:32:11 +0000 (UTC)
Subject: rpms/SimGear/devel SimGear-1.9.0-headers.patch, NONE,
	1.1 SimGear-1.9.0-more-archs.patch, NONE,
	1.1 SimGear-1.9.0-notabbed_value_test.patch, NONE,
	1.1 SimGear-1.9.0-shared.patch, NONE,
	1.1 SimGear-1.9.0-untangle.patch, NONE, 1.1 .cvsignore, 1.4,
	1.5 SimGear.spec, 1.12, 1.13 sources, 1.4,
	1.5 SimGear-0.3.10-notabbed_value_test.patch, 1.2,
	NONE SimGear-0.3.10-thesky.patch, 1.1,
	NONE SimGear-1.0.0-headers.patch, 1.1,
	NONE SimGear-1.0.0-more-archs.patch, 1.1,
	NONE SimGear-1.0.0-shared-auto.patch, 1.1,
	NONE SimGear-1.0.0-shared.patch, 1.1,
	NONE SimGear-1.0.0-untangle.patch, 1.1, NONE
Message-ID: <20090107163211.6C69B70100@cvs1.fedora.phx.redhat.com>

Author: bellet

Update of /cvs/extras/rpms/SimGear/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5146

Modified Files:
	.cvsignore SimGear.spec sources 
Added Files:
	SimGear-1.9.0-headers.patch SimGear-1.9.0-more-archs.patch 
	SimGear-1.9.0-notabbed_value_test.patch 
	SimGear-1.9.0-shared.patch SimGear-1.9.0-untangle.patch 
Removed Files:
	SimGear-0.3.10-notabbed_value_test.patch 
	SimGear-0.3.10-thesky.patch SimGear-1.0.0-headers.patch 
	SimGear-1.0.0-more-archs.patch SimGear-1.0.0-shared-auto.patch 
	SimGear-1.0.0-shared.patch SimGear-1.0.0-untangle.patch 
Log Message:
* Tue Jan 06 2009 Fabrice Bellet <fabrice at bellet.info> 1.9.0-1
- New upstream release


SimGear-1.9.0-headers.patch:

--- NEW FILE SimGear-1.9.0-headers.patch ---
--- misc/stopwatch.hxx.BAD	2006-10-18 14:57:56.000000000 -0500
+++ misc/stopwatch.hxx	2006-10-18 14:58:06.000000000 -0500
@@ -42,10 +42,6 @@
 # error This library requires C++
 #endif
 
-#ifdef HAVE_CONFIG_H
-#  include <simgear_config.h>
-#endif
-
 #if defined(__linux__) && ! defined(HAVE_GETRUSAGE)
 #  define HAVE_GETRUSAGE
 #endif
--- structure/SGSmplhist.hxx.BAD	2008-01-07 21:44:55.000000000 +0100
+++ structure/SGSmplhist.hxx	2008-01-07 21:46:29.000000000 +0100
@@ -16,9 +16,6 @@
 Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */
 
-#ifdef HAVE_CONFIG_H
-#include <simgear_config.h>
-#endif
 #ifndef SampleHistogram_h
 #ifdef __GNUG__
 #pragma interface
--- timing/timestamp.hxx.BAD	2008-01-07 11:03:49.000000000 +0100
+++ timing/timestamp.hxx	2008-01-07 21:47:15.000000000 +0100
@@ -32,9 +32,8 @@
 # error This library requires C++
 #endif
 
-#ifdef HAVE_CONFIG_H
-#  include <simgear_config.h>
-#endif
+#define HAVE_GETTIMEOFDAY 1
+#define HAVE_SYS_TIME_H 1
 
 #include <simgear/compiler.h>
 

SimGear-1.9.0-more-archs.patch:

--- NEW FILE SimGear-1.9.0-more-archs.patch ---
diff -uNrp SimGear-1.9.0.orig/simgear/nasal/naref.h SimGear-1.9.0/simgear/nasal/naref.h
--- SimGear-1.9.0.orig/simgear/nasal/naref.h	2008-10-23 21:34:02.000000000 +0200
+++ SimGear-1.9.0/simgear/nasal/naref.h	2008-11-23 00:37:02.000000000 +0100
@@ -14,7 +14,7 @@
       defined(__ia64__) || defined(_M_IA64) || defined(__ARMEL__) 
 # define NASAL_LE
 #elif defined(__sparc) || defined(__ppc__) || defined(__PPC) || \
-      defined(__mips) || defined(__ARMEB__)
+      defined(__mips) || defined(__ARMEB__) || defined (__powerpc__) || defined (__powerpc64__) || defined (__alpha__)
 # define NASAL_BE
 #else
 # error Unrecognized CPU architecture

SimGear-1.9.0-notabbed_value_test.patch:

--- NEW FILE SimGear-1.9.0-notabbed_value_test.patch ---
diff -uNrp SimGear-1.9.0.orig/simgear/misc/Makefile.am SimGear-1.9.0/simgear/misc/Makefile.am
--- SimGear-1.9.0.orig/simgear/misc/Makefile.am	2008-11-26 19:59:38.000000000 +0100
+++ SimGear-1.9.0/simgear/misc/Makefile.am	2008-11-26 20:00:45.000000000 +0100
@@ -31,16 +31,7 @@ libsgmisc_la_LIBADD = \
 	$(top_builddir)/simgear/props/libsgprops.la \
 	-losg -losgDB
 
-noinst_PROGRAMS = tabbed_value_test swap_test
-
-tabbed_value_test_SOURCES = tabbed_values_test.cxx
-tabbed_value_test_LDFLAGS = \
-	$(top_builddir)/simgear/misc/libsgmisc.la \
-	$(top_builddir)/simgear/xml/libsgxml.la \
-	$(top_builddir)/simgear/debug/libsgdebug.la \
-	$(top_builddir)/simgear/structure/libsgstructure.la \
-	$(top_builddir)/simgear/props/libsgprops.la \
-	-lz
+noinst_PROGRAMS = swap_test
 
 swap_test_SOURCES = swap_test.cpp
 

SimGear-1.9.0-shared.patch:

--- NEW FILE SimGear-1.9.0-shared.patch ---
diff -uNrp SimGear-1.9.0.orig/configure.ac SimGear-1.9.0/configure.ac
--- SimGear-1.9.0.orig/configure.ac	2008-12-20 07:39:46.000000000 +0100
+++ SimGear-1.9.0/configure.ac	2009-01-06 09:48:09.000000000 +0100
@@ -3,6 +3,7 @@ dnl script.
 
 AC_INIT
 AC_CONFIG_SRCDIR([simgear/bucket/newbucket.cxx])
+AC_PROG_LIBTOOL
 
 dnl Require at least automake 2.52
 AC_PREREQ(2.52)
diff -uNrp SimGear-1.9.0.orig/simgear/bucket/Makefile.am SimGear-1.9.0/simgear/bucket/Makefile.am
--- SimGear-1.9.0.orig/simgear/bucket/Makefile.am	2007-07-23 00:37:26.000000000 +0200
+++ SimGear-1.9.0/simgear/bucket/Makefile.am	2009-01-06 09:48:09.000000000 +0100
@@ -1,10 +1,11 @@
 includedir = @includedir@/bucket
 
-lib_LIBRARIES = libsgbucket.a
+lib_LTLIBRARIES = libsgbucket.la
 
 include_HEADERS = newbucket.hxx
 
-libsgbucket_a_SOURCES = newbucket.cxx
+libsgbucket_la_SOURCES = newbucket.cxx
+libsgbucket_la_LDFLAGS = -release @VERSION@ -module
 
 # noinst_PROGRAMS = testbucket
 
diff -uNrp SimGear-1.9.0.orig/simgear/debug/Makefile.am SimGear-1.9.0/simgear/debug/Makefile.am
--- SimGear-1.9.0.orig/simgear/debug/Makefile.am	2002-09-07 04:58:19.000000000 +0200
+++ SimGear-1.9.0/simgear/debug/Makefile.am	2009-01-06 09:48:09.000000000 +0100
@@ -2,10 +2,11 @@ includedir = @includedir@/debug
 
 EXTRA_DIST = logtest.cxx
 
-lib_LIBRARIES = libsgdebug.a
+lib_LTLIBRARIES = libsgdebug.la
 
 include_HEADERS = debug_types.h logstream.hxx
 
-libsgdebug_a_SOURCES = logstream.cxx
+libsgdebug_la_SOURCES = logstream.cxx
+libsgdebug_la_LDFLAGS = -release @VERSION@ -module
 
 INCLUDES = -I$(top_srcdir)
diff -uNrp SimGear-1.9.0.orig/simgear/environment/Makefile.am SimGear-1.9.0/simgear/environment/Makefile.am
--- SimGear-1.9.0.orig/simgear/environment/Makefile.am	2008-03-04 09:54:00.000000000 +0100
+++ SimGear-1.9.0/simgear/environment/Makefile.am	2009-01-06 09:48:09.000000000 +0100
@@ -1,9 +1,17 @@
 includedir = @includedir@/environment
 
-lib_LIBRARIES = libsgenvironment.a
+lib_LTLIBRARIES = libsgenvironment.la
 
 include_HEADERS = metar.hxx visual_enviro.hxx precipitation.hxx
 
-libsgenvironment_a_SOURCES = metar.cxx visual_enviro.cxx precipitation.cxx
+libsgenvironment_la_SOURCES = metar.cxx visual_enviro.cxx precipitation.cxx
+libsgenvironment_la_LDFLAGS = -release @VERSION@ -module -lGL -lplibssg
+libsgenvironment_la_LIBADD = \
+	$(top_builddir)/simgear/structure/libsgstructure.la \
+	$(top_builddir)/simgear/props/libsgprops.la \
+	$(top_builddir)/simgear/io/libsgio.la \
+	$(top_builddir)/simgear/sound/libsgsound.la \
+	$(top_builddir)/simgear/scene/sky/libsgsky.la
+	$(top_builddir)/simgear/math/libsgmath.la
 
 INCLUDES = -I$(top_srcdir)
diff -uNrp SimGear-1.9.0.orig/simgear/ephemeris/Makefile.am SimGear-1.9.0/simgear/ephemeris/Makefile.am
--- SimGear-1.9.0.orig/simgear/ephemeris/Makefile.am	2003-08-29 09:35:55.000000000 +0200
+++ SimGear-1.9.0/simgear/ephemeris/Makefile.am	2009-01-06 09:48:09.000000000 +0100
@@ -1,6 +1,6 @@
 includedir = @includedir@/ephemeris
 
-lib_LIBRARIES = libsgephem.a
+lib_LTLIBRARIES = libsgephem.la
 
 include_HEADERS = \
 	celestialBody.hxx \
@@ -16,7 +16,7 @@ include_HEADERS = \
 	uranus.hxx \
 	venus.hxx
 
-libsgephem_a_SOURCES = \
+libsgephem_la_SOURCES = \
 	celestialBody.cxx \
 	ephemeris.cxx \
 	jupiter.cxx \
@@ -31,4 +31,10 @@ libsgephem_a_SOURCES = \
 	uranus.cxx \
 	venus.cxx
 
+libsgephem_la_LDFLAGS = -release @VERSION@ -module
+
+libsgephem_la_LIBADD = \
+	$(top_builddir)/simgear/misc/libsgmisc.la \
+	$(top_builddir)/simgear/debug/libsgdebug.la
+
 INCLUDES = -I$(top_srcdir)
diff -uNrp SimGear-1.9.0.orig/simgear/io/Makefile.am SimGear-1.9.0/simgear/io/Makefile.am
--- SimGear-1.9.0.orig/simgear/io/Makefile.am	2007-07-23 00:37:26.000000000 +0200
+++ SimGear-1.9.0/simgear/io/Makefile.am	2009-01-06 09:48:09.000000000 +0100
@@ -1,6 +1,6 @@
 includedir = @includedir@/io
 
-lib_LIBRARIES = libsgio.a
+lib_LTLIBRARIES = libsgio.la
 
 include_HEADERS = \
 	iochannel.hxx \
@@ -11,7 +11,7 @@ include_HEADERS = \
 	sg_socket.hxx \
 	sg_socket_udp.hxx
 
-libsgio_a_SOURCES = \
+libsgio_la_SOURCES = \
 	iochannel.cxx \
 	lowlevel.cxx \
 	sg_binobj.cxx \
@@ -22,55 +22,82 @@ libsgio_a_SOURCES = \
 
 INCLUDES = -I$(top_srcdir)
 
+libsgio_la_LDFLAGS = -release @VERSION@ -module -lplibnet -lz
+
+libsgio_la_LIBADD = \
+	$(top_builddir)/simgear/serial/libsgserial.la \
+	$(top_builddir)/simgear/debug/libsgdebug.la \
+	$(top_builddir)/simgear/bucket/libsgbucket.la
+
 noinst_PROGRAMS = decode_binobj socktest lowtest tcp_server tcp_client
 
 tcp_server_SOURCES = tcp_server.cxx
 
-tcp_server_LDADD = \
-	libsgio.a \
-	$(top_builddir)/simgear/debug/libsgdebug.a \
-	$(top_builddir)/simgear/bucket/libsgbucket.a \
-	$(top_builddir)/simgear/misc/libsgmisc.a \
+tcp_server_LDFLAGS = \
+	$(top_builddir)/simgear/io/libsgio.la \
+	$(top_builddir)/simgear/debug/libsgdebug.la \
+	$(top_builddir)/simgear/bucket/libsgbucket.la \
+	$(top_builddir)/simgear/misc/libsgmisc.la \
+	$(top_builddir)/simgear/serial/libsgserial.la \
+	$(top_builddir)/simgear/structure/libsgstructure.la \
+	$(top_builddir)/simgear/props/libsgprops.la \
+	$(top_builddir)/simgear/xml/libsgxml.la \
 	-lplibnet -lplibul -lz \
 	$(network_LIBS) \
 	$(base_LIBS)
 
 tcp_client_SOURCES = tcp_client.cxx
 
-tcp_client_LDADD = \
-	libsgio.a \
-	$(top_builddir)/simgear/debug/libsgdebug.a \
-	$(top_builddir)/simgear/bucket/libsgbucket.a \
-	$(top_builddir)/simgear/misc/libsgmisc.a \
+tcp_client_LDFLAGS = \
+	$(top_builddir)/simgear/io/libsgio.la \
+	$(top_builddir)/simgear/debug/libsgdebug.la \
+	$(top_builddir)/simgear/bucket/libsgbucket.la \
+	$(top_builddir)/simgear/misc/libsgmisc.la \
+	$(top_builddir)/simgear/serial/libsgserial.la \
+	$(top_builddir)/simgear/structure/libsgstructure.la \
+	$(top_builddir)/simgear/props/libsgprops.la \
+	$(top_builddir)/simgear/xml/libsgxml.la \
 	-lplibnet -lplibul -lz \
 	$(network_LIBS) \
 	$(base_LIBS)
 
 socktest_SOURCES = socktest.cxx
 
-socktest_LDADD = \
-	libsgio.a \
-	$(top_builddir)/simgear/debug/libsgdebug.a \
-	$(top_builddir)/simgear/bucket/libsgbucket.a \
-	$(top_builddir)/simgear/misc/libsgmisc.a \
-	-lplibnet -lplibul -lz \
+socktest_LDFLAGS = \
+	$(top_builddir)/simgear/io/libsgio.la \
+	$(top_builddir)/simgear/debug/libsgdebug.la \
+	$(top_builddir)/simgear/bucket/libsgbucket.la \
+	$(top_builddir)/simgear/misc/libsgmisc.la \
+	$(top_builddir)/simgear/serial/libsgserial.la \
+	$(top_builddir)/simgear/structure/libsgstructure.la \
+	$(top_builddir)/simgear/props/libsgprops.la \
+	$(top_builddir)/simgear/xml/libsgxml.la \
+	-lplibnet -lz \
 	$(network_LIBS) \
 	$(base_LIBS)
 
 lowtest_SOURCES = lowtest.cxx
 
-lowtest_LDADD = \
-	libsgio.a \
-	$(top_builddir)/simgear/debug/libsgdebug.a \
-	$(top_builddir)/simgear/bucket/libsgbucket.a \
-	$(top_builddir)/simgear/misc/libsgmisc.a \
-	$(base_LIBS) -lz
+lowtest_LDFLAGS = \
+	$(top_builddir)/simgear/io/libsgio.la \
+	$(top_builddir)/simgear/debug/libsgdebug.la \
+	$(top_builddir)/simgear/bucket/libsgbucket.la \
+	$(top_builddir)/simgear/misc/libsgmisc.la \
+	$(top_builddir)/simgear/serial/libsgserial.la \
+	$(top_builddir)/simgear/structure/libsgstructure.la \
+	$(top_builddir)/simgear/props/libsgprops.la \
+	$(top_builddir)/simgear/xml/libsgxml.la \
+	$(base_LIBS) -lz -lplibnet -lplibul
 
 decode_binobj_SOURCES = decode_binobj.cxx
 
-decode_binobj_LDADD = \
-	libsgio.a \
-	$(top_builddir)/simgear/debug/libsgdebug.a \
-	$(top_builddir)/simgear/bucket/libsgbucket.a \
-	$(top_builddir)/simgear/misc/libsgmisc.a \
-	$(base_LIBS) -lz
+decode_binobj_LDFLAGS = \
+	$(top_builddir)/simgear/io/libsgio.la \
+	$(top_builddir)/simgear/debug/libsgdebug.la \
+	$(top_builddir)/simgear/bucket/libsgbucket.la \
+	$(top_builddir)/simgear/misc/libsgmisc.la \
+	$(top_builddir)/simgear/serial/libsgserial.la \
+	$(top_builddir)/simgear/structure/libsgstructure.la \
+	$(top_builddir)/simgear/props/libsgprops.la \
+	$(top_builddir)/simgear/xml/libsgxml.la \
+	$(base_LIBS) -lz -lplibnet -lplibul
diff -uNrp SimGear-1.9.0.orig/simgear/magvar/Makefile.am SimGear-1.9.0/simgear/magvar/Makefile.am
--- SimGear-1.9.0.orig/simgear/magvar/Makefile.am	2007-07-23 00:37:26.000000000 +0200
+++ SimGear-1.9.0/simgear/magvar/Makefile.am	2009-01-06 09:48:09.000000000 +0100
@@ -1,19 +1,21 @@
 includedir = @includedir@/magvar
 
-lib_LIBRARIES = libsgmagvar.a
+lib_LTLIBRARIES = libsgmagvar.la
 
 include_HEADERS = magvar.hxx
 
-libsgmagvar_a_SOURCES = \
+libsgmagvar_la_SOURCES = \
 	coremag.hxx coremag.cxx \
 	magvar.cxx
 
+libsgmagvar_la_LDFLAGS = -release @VERSION@ -module
+
 noinst_PROGRAMS = testmagvar
 
 testmagvar_SOURCES = testmagvar.cxx
 
-testmagvar_LDADD = \
-	libsgmagvar.a \
+testmagvar_LDFLAGS = \
+	$(top_builddir)/simgear/magvar/libsgmagvar.la \
 	$(base_LIBS)
 
 INCLUDES = -I$(top_srcdir)
diff -uNrp SimGear-1.9.0.orig/simgear/Makefile.am SimGear-1.9.0/simgear/Makefile.am
--- SimGear-1.9.0.orig/simgear/Makefile.am	2008-07-25 20:35:40.000000000 +0200
+++ SimGear-1.9.0/simgear/Makefile.am	2009-01-06 09:48:09.000000000 +0100
@@ -14,23 +14,25 @@ include_HEADERS = \
 
 SUBDIRS = \
 	$(compatibility_DIR) \
-	xml \
 	debug \
-	misc \
 	structure \
+	xml \
+	props \
+	misc \
 	bucket \
 	ephemeris \
+	serial \
 	io \
 	magvar \
 	math \
+	sound \
+	screen \
+	scene/util \
+	scene/sky \
 	$(METAR_DIRS) \
 	nasal \
-	props \
 	route \
 	scene \
-	screen \
-	serial \
-	sound \
 	$(SGTHREAD_DIR) \
 	timing
 
diff -uNrp SimGear-1.9.0.orig/simgear/math/Makefile.am SimGear-1.9.0/simgear/math/Makefile.am
--- SimGear-1.9.0.orig/simgear/math/Makefile.am	2008-04-14 23:44:21.000000000 +0200
+++ SimGear-1.9.0/simgear/math/Makefile.am	2009-01-06 09:48:09.000000000 +0100
@@ -4,12 +4,20 @@ check_PROGRAMS  = SGMathTest SGGeometryT
 TESTS           = $(check_PROGRAMS)
 
 SGMathTest_SOURCES = SGMathTest.cxx
-SGMathTest_LDADD = libsgmath.a $(base_LIBS)
+SGMathTest_LDFLAGS = $(top_builddir)/simgear/io/libsgio.la \
+		     $(top_builddir)/simgear/debug/libsgdebug.la \
+		     $(top_builddir)/simgear/bucket/libsgbucket.la \
+		     $(top_builddir)/simgear/misc/libsgmisc.la \
+		     $(top_builddir)/simgear/serial/libsgserial.la \
+		     $(top_builddir)/simgear/structure/libsgstructure.la \
+		     $(top_builddir)/simgear/props/libsgprops.la \
+		     $(top_builddir)/simgear/xml/libsgxml.la \
+		     libsgmath.la $(base_LIBS) -lz -lplibnet -lplibul
 
 SGGeometryTest_SOURCES = SGGeometryTest.cxx
-SGGeometryTest_LDADD = libsgmath.a $(base_LIBS)
+SGGeometryTest_LDFLAGS = libsgmath.la $(base_LIBS)
 
-lib_LIBRARIES = libsgmath.a
+lib_LTLIBRARIES = libsgmath.la
 
 include_HEADERS = \
 	interpolater.hxx \
@@ -44,7 +52,7 @@ include_HEADERS = \
 	SGVec3.hxx \
 	SGVec4.hxx
 
-libsgmath_a_SOURCES = \
+libsgmath_la_SOURCES = \
 	interpolater.cxx \
 	leastsqs.cxx \
 	sg_random.c \
@@ -52,4 +60,11 @@ libsgmath_a_SOURCES = \
 	SGGeod.cxx \
 	SGGeodesy.cxx
 
+libsgmath_la_LDFLAGS = -release @VERSION@ -module
+
+libsgmath_la_LIBADD = \
+	$(top_builddir)/simgear/debug/libsgdebug.la \
+	$(top_builddir)/simgear/misc/libsgmisc.la \
+	$(top_builddir)/simgear/props/libsgprops.la
+
 INCLUDES = -I$(top_srcdir)
diff -uNrp SimGear-1.9.0.orig/simgear/misc/Makefile.am SimGear-1.9.0/simgear/misc/Makefile.am
--- SimGear-1.9.0.orig/simgear/misc/Makefile.am	2007-12-04 23:38:41.000000000 +0100
+++ SimGear-1.9.0/simgear/misc/Makefile.am	2009-01-06 09:48:09.000000000 +0100
@@ -1,6 +1,6 @@
 includedir = @includedir@/misc
 
-lib_LIBRARIES = libsgmisc.a
+lib_LTLIBRARIES = libsgmisc.la
 
 include_HEADERS = \
 	sg_path.hxx \
@@ -14,7 +14,7 @@ include_HEADERS = \
 	stdint.hxx \
 	PathOptions.hxx
 
-libsgmisc_a_SOURCES = \
+libsgmisc_la_SOURCES = \
 	sg_path.cxx \
 	sgstream.cxx \
 	strutils.cxx \
@@ -24,19 +24,23 @@ libsgmisc_a_SOURCES = \
 	interpolator.cxx \
 	PathOptions.cxx
 
-noinst_PROGRAMS = tabbed_value_test swap_test
+libsgmisc_la_LDFLAGS = -release @VERSION@ -module -lz
 
-tabbed_value_test_SOURCES = tabbed_values_test.cxx
-tabbed_value_test_LDADD = \
-	libsgmisc.a \
-	$(top_builddir)/simgear/xml/libsgxml.a \
-	$(top_builddir)/simgear/debug/libsgdebug.a
+libsgmisc_la_LIBADD = \
+	$(top_builddir)/simgear/structure/libsgstructure.la \
+	$(top_builddir)/simgear/props/libsgprops.la \
+	-losg -losgDB
 
-$(top_builddir)/simgear/xml/libsgxml.a:
-	cd $(top_builddir)/simgear/xml && $(MAKE) $(AM_MAKEFLAGS) libsgxml.a
+noinst_PROGRAMS = tabbed_value_test swap_test
 
-$(top_builddir)/simgear/debug/libsgdebug.a:
-	cd $(top_builddir)/simgear/debug && $(MAKE) $(AM_MAKEFLAGS) libsgdebug.a
+tabbed_value_test_SOURCES = tabbed_values_test.cxx
+tabbed_value_test_LDFLAGS = \
+	$(top_builddir)/simgear/misc/libsgmisc.la \
+	$(top_builddir)/simgear/xml/libsgxml.la \
+	$(top_builddir)/simgear/debug/libsgdebug.la \
+	$(top_builddir)/simgear/structure/libsgstructure.la \
+	$(top_builddir)/simgear/props/libsgprops.la \
+	-lz
 
 swap_test_SOURCES = swap_test.cpp
 
diff -uNrp SimGear-1.9.0.orig/simgear/nasal/Makefile.am SimGear-1.9.0/simgear/nasal/Makefile.am
--- SimGear-1.9.0.orig/simgear/nasal/Makefile.am	2007-03-29 20:50:12.000000000 +0200
+++ SimGear-1.9.0/simgear/nasal/Makefile.am	2009-01-06 09:48:09.000000000 +0100
@@ -1,13 +1,15 @@
 includedir = @includedir@/nasal
 
-lib_LIBRARIES = libsgnasal.a
+lib_LTLIBRARIES = libsgnasal.la
 
 include_HEADERS = nasal.h naref.h
 
-libsgnasal_a_SOURCES = bitslib.c code.c code.h codegen.c data.h gc.c	\
-                       hash.c iolib.c iolib.h lex.c lib.c mathlib.c	\
-                       misc.c naref.h nasal.h parse.c parse.h string.c	\
-                       thread-posix.c thread-win32.c threadlib.c	\
-                       utf8lib.c vector.c
+libsgnasal_la_SOURCES = bitslib.c code.c code.h codegen.c data.h gc.c	\
+                        hash.c iolib.c iolib.h lex.c lib.c mathlib.c	\
+                        misc.c naref.h nasal.h parse.c parse.h string.c	\
+                        thread-posix.c thread-win32.c threadlib.c	\
+                        utf8lib.c vector.c
+
+libsgnasal_la_LDFLAGS = -release @VERSION@ -module -lm -lpthread
 
 INCLUDES = -I$(top_srcdir)
diff -uNrp SimGear-1.9.0.orig/simgear/props/Makefile.am SimGear-1.9.0/simgear/props/Makefile.am
--- SimGear-1.9.0.orig/simgear/props/Makefile.am	2007-07-23 00:37:27.000000000 +0200
+++ SimGear-1.9.0/simgear/props/Makefile.am	2009-01-06 09:48:09.000000000 +0100
@@ -1,25 +1,32 @@
 includedir = @includedir@/props
 
-lib_LIBRARIES = libsgprops.a
+lib_LTLIBRARIES = libsgprops.la
 
 include_HEADERS = \
 	condition.hxx \
 	props.hxx \
 	props_io.hxx
 
-libsgprops_a_SOURCES = \
+libsgprops_la_SOURCES = \
 	condition.cxx \
 	props.cxx \
 	props_io.cxx
 
+libsgprops_la_LDFLAGS = -release @VERSION@ -module
+
+libsgprops_la_LIBADD = \
+	$(top_builddir)/simgear/xml/libsgxml.la \
+	$(top_builddir)/simgear/structure/libsgstructure.la \
+	$(top_builddir)/simgear/debug/libsgdebug.la
+
 noinst_PROGRAMS = props_test
 
 props_test_SOURCES = props_test.cxx
-props_test_LDADD = \
-	libsgprops.a \
-	$(top_builddir)/simgear/xml/libsgxml.a \
-	$(top_builddir)/simgear/misc/libsgmisc.a \
-	$(top_builddir)/simgear/debug/libsgdebug.a \
-	$(top_builddir)/simgear/structure/libsgstructure.a
+props_test_LDFLAGS = \
+	$(top_builddir)/simgear/props/libsgprops.la \
+	$(top_builddir)/simgear/xml/libsgxml.la \
+	$(top_builddir)/simgear/debug/libsgdebug.la \
+	$(top_builddir)/simgear/structure/libsgstructure.la \
+	-lz
 
 INCLUDES = -I$(top_srcdir)
diff -uNrp SimGear-1.9.0.orig/simgear/route/Makefile.am SimGear-1.9.0/simgear/route/Makefile.am
--- SimGear-1.9.0.orig/simgear/route/Makefile.am	2007-07-23 00:37:27.000000000 +0200
+++ SimGear-1.9.0/simgear/route/Makefile.am	2009-01-06 09:48:09.000000000 +0100
@@ -1,34 +1,43 @@
 includedir = @includedir@/route
 
-lib_LIBRARIES = libsgroute.a
+lib_LTLIBRARIES = libsgroute.la
 
 include_HEADERS = route.hxx waypoint.hxx
 
-libsgroute_a_SOURCES = \
+libsgroute_la_SOURCES = \
 	route.cxx \
 	waypoint.cxx
 
+libsgroute_la_LDFLAGS = -release @VERSION@ -module
+
+libsgroute_la_LIBADD = \
+	$(top_builddir)/simgear/math/libsgmath.la
+
 INCLUDES = -I$(top_srcdir)
 
 noinst_PROGRAMS = waytest routetest
 
 waytest_SOURCES = waytest.cxx
 
-waytest_LDADD = \
-	libsgroute.a \
-	$(top_builddir)/simgear/math/libsgmath.a \
-	$(top_builddir)/simgear/debug/libsgdebug.a \
-	$(top_builddir)/simgear/misc/libsgmisc.a \
-	$(top_builddir)/simgear/props/libsgprops.a \
-	$(top_builddir)/simgear/structure/libsgstructure.a \
-	$(top_builddir)/simgear/xml/libsgxml.a \
+waytest_LDFLAGS = \
+	$(top_builddir)/simgear/route/libsgroute.la \
+	$(top_builddir)/simgear/math/libsgmath.la \
+	$(top_builddir)/simgear/debug/libsgdebug.la \
+	$(top_builddir)/simgear/misc/libsgmisc.la \
+	$(top_builddir)/simgear/structure/libsgstructure.la \
+	$(top_builddir)/simgear/props/libsgprops.la \
+	$(top_builddir)/simgear/xml/libsgxml.la \
 	$(base_LIBS) \
 	-lz
 
 routetest_SOURCES = routetest.cxx
 
-routetest_LDADD = \
-	libsgroute.a \
-	$(top_builddir)/simgear/math/libsgmath.a \
-	$(top_builddir)/simgear/debug/libsgdebug.a \
-	$(base_LIBS)
+routetest_LDFLAGS = \
+	$(top_builddir)/simgear/route/libsgroute.la \
+	$(top_builddir)/simgear/math/libsgmath.la \
+	$(top_builddir)/simgear/debug/libsgdebug.la \
+	$(top_builddir)/simgear/misc/libsgmisc.la \
+	$(top_builddir)/simgear/structure/libsgstructure.la \
+	$(top_builddir)/simgear/props/libsgprops.la \
+	$(top_builddir)/simgear/xml/libsgxml.la \
+	$(base_LIBS) -lz
diff -uNrp SimGear-1.9.0.orig/simgear/scene/material/Makefile.am SimGear-1.9.0/simgear/scene/material/Makefile.am
--- SimGear-1.9.0.orig/simgear/scene/material/Makefile.am	2003-05-15 18:19:56.000000000 +0200
+++ SimGear-1.9.0/simgear/scene/material/Makefile.am	2009-01-06 09:48:09.000000000 +0100
@@ -1,6 +1,6 @@
 includedir = @includedir@/scene/material
 
-lib_LIBRARIES = libsgmaterial.a
+lib_LTLIBRARIES = libsgmaterial.la
 
 noinst_HEADERS =
 
@@ -9,9 +9,17 @@ include_HEADERS = \
 	matlib.hxx \
 	matmodel.hxx
 
-libsgmaterial_a_SOURCES = \
+libsgmaterial_la_SOURCES = \
 	mat.cxx \
 	matlib.cxx \
 	matmodel.cxx
 
+libsgmaterial_la_LDFLAGS = -release @VERSION@ -module -lplibssg -lGL
+
+libsgmaterial_la_LIBADD = \
+	$(top_builddir)/simgear/debug/libsgdebug.la \
+	$(top_builddir)/simgear/structure/libsgstructure.la \
+	$(top_builddir)/simgear/props/libsgprops.la \
+	$(top_builddir)/simgear/math/libsgmath.la
+
 INCLUDES = -I$(top_srcdir)
diff -uNrp SimGear-1.9.0.orig/simgear/scene/model/Makefile.am SimGear-1.9.0/simgear/scene/model/Makefile.am
--- SimGear-1.9.0.orig/simgear/scene/model/Makefile.am	2008-03-22 10:30:26.000000000 +0100
+++ SimGear-1.9.0/simgear/scene/model/Makefile.am	2009-01-06 09:48:09.000000000 +0100
@@ -1,6 +1,6 @@
 includedir = @includedir@/scene/model
 
-lib_LIBRARIES = libsgmodel.a
+lib_LTLIBRARIES = libsgmodel.la
 
 noinst_HEADERS =
 
@@ -25,7 +25,7 @@ include_HEADERS = \
 	SGScaleTransform.hxx \
 	SGTranslateTransform.hxx
 
-libsgmodel_a_SOURCES = \
+libsgmodel_la_SOURCES = \
 	animation.cxx \
 	particles.cxx \
 	location.cxx \
@@ -46,4 +46,14 @@ libsgmodel_a_SOURCES = \
 	SGScaleTransform.cxx \
 	SGTranslateTransform.cxx
 
+libsgmodel_la_LDFLAGS = -release @VERSION@ -module -lplibssg -lplibsg -lGL
+
+libsgmodel_la_LIBADD = \
+	$(top_builddir)/simgear/debug/libsgdebug.la \
+	$(top_builddir)/simgear/structure/libsgstructure.la \
+	$(top_builddir)/simgear/props/libsgprops.la \
+	$(top_builddir)/simgear/screen/libsgscreen.la \
+	$(top_builddir)/simgear/environment/libsgenvironment.la \
+	$(top_builddir)/simgear/math/libsgmath.la
+
 INCLUDES = -I$(top_srcdir)
diff -uNrp SimGear-1.9.0.orig/simgear/scene/sky/Makefile.am SimGear-1.9.0/simgear/scene/sky/Makefile.am
--- SimGear-1.9.0.orig/simgear/scene/sky/Makefile.am	2008-10-26 10:37:18.000000000 +0100
+++ SimGear-1.9.0/simgear/scene/sky/Makefile.am	2009-01-06 09:48:09.000000000 +0100
@@ -1,6 +1,6 @@
 includedir = @includedir@/scene/sky
 
-lib_LIBRARIES = libsgsky.a
+lib_LTLIBRARIES = libsgsky.la
 
 include_HEADERS = \
 	cloud.hxx \
@@ -15,7 +15,7 @@ include_HEADERS = \
 	newcloud.hxx \
 	CloudShaderGeometry.hxx
 
-libsgsky_a_SOURCES = \
+libsgsky_la_SOURCES = \
 	cloud.cxx \
 	dome.cxx \
 	moon.cxx \
@@ -28,4 +28,15 @@ libsgsky_a_SOURCES = \
 	newcloud.cxx \
 	CloudShaderGeometry.cxx
 
+libsgsky_la_LDFLAGS = -release @VERSION@ -module -lplibssg -lplibul -lplibsg \
+	-lGL -lGLU
+
+libsgsky_la_LIBADD = \
+	$(top_builddir)/simgear/screen/libsgscreen.la \
+	$(top_builddir)/simgear/debug/libsgdebug.la \
+	$(top_builddir)/simgear/misc/libsgmisc.la \
+	$(top_builddir)/simgear/props/libsgprops.la \
+	$(top_builddir)/simgear/math/libsgmath.la \
+	$(top_builddir)/simgear/scene/util/libsgutil.la
+
 INCLUDES = -I$(top_srcdir)
diff -uNrp SimGear-1.9.0.orig/simgear/scene/tgdb/Makefile.am SimGear-1.9.0/simgear/scene/tgdb/Makefile.am
--- SimGear-1.9.0.orig/simgear/scene/tgdb/Makefile.am	2008-08-28 19:52:44.000000000 +0200
+++ SimGear-1.9.0/simgear/scene/tgdb/Makefile.am	2009-01-06 09:48:09.000000000 +0100
@@ -1,6 +1,6 @@
 includedir = @includedir@/scene/tgdb
 
-lib_LIBRARIES = libsgtgdb.a
+lib_LTLIBRARIES = libsgtgdb.la
 
 noinst_HEADERS =
 
@@ -24,7 +24,7 @@ include_HEADERS = \
 	TileCache.hxx \
 	TileEntry.hxx
 
-libsgtgdb_a_SOURCES = \
+libsgtgdb_la_SOURCES = \
 	apt_signs.cxx \
 	obj.cxx \
 	pt_lights.cxx \
@@ -40,4 +40,14 @@ libsgtgdb_a_SOURCES = \
 	TileEntry.cxx \
 	TreeBin.cxx TreeBin.hxx
 
+libsgtgdb_la_LDFLAGS = -release @VERSION@ -module -lplibssg -lplibul -lGL
+
+libsgtgdb_la_LIBADD = \
+	$(top_builddir)/simgear/debug/libsgdebug.la \
+	$(top_builddir)/simgear/bucket/libsgbucket.la \
+	$(top_builddir)/simgear/io/libsgio.la \
+	$(top_builddir)/simgear/scene/material/libsgmaterial.la \
+	$(top_builddir)/simgear/screen/libsgscreen.la \
+	$(top_builddir)/simgear/math/libsgmath.la
+
 INCLUDES = -I$(top_srcdir)
diff -uNrp SimGear-1.9.0.orig/simgear/scene/util/Makefile.am SimGear-1.9.0/simgear/scene/util/Makefile.am
--- SimGear-1.9.0.orig/simgear/scene/util/Makefile.am	2008-04-23 20:13:51.000000000 +0200
+++ SimGear-1.9.0/simgear/scene/util/Makefile.am	2009-01-06 09:48:09.000000000 +0100
@@ -1,6 +1,6 @@
 includedir = @includedir@/scene/util
 
-lib_LIBRARIES = libsgutil.a
+lib_LTLIBRARIES = libsgutil.la
 
 noinst_HEADERS =
 
@@ -21,7 +21,7 @@ include_HEADERS = \
 	VectorArrayAdapter.hxx
 
 
-libsgutil_a_SOURCES = \
+libsgutil_la_SOURCES = \
 	SGEnlargeBoundingBox.cxx \
 	SGSceneFeatures.cxx \
 	SGSceneUserData.cxx \
@@ -31,4 +31,6 @@ libsgutil_a_SOURCES = \
 	StateAttributeFactory.cxx \
 	QuadTreeBuilder.cxx
 
+libsgutil_la_LDFLAGS = -release @VERSION@ -module
+
 INCLUDES = -I$(top_srcdir)
diff -uNrp SimGear-1.9.0.orig/simgear/screen/Makefile.am SimGear-1.9.0/simgear/screen/Makefile.am
--- SimGear-1.9.0.orig/simgear/screen/Makefile.am	2007-07-23 00:37:27.000000000 +0200
+++ SimGear-1.9.0/simgear/screen/Makefile.am	2009-01-06 09:48:09.000000000 +0100
@@ -1,6 +1,6 @@
 includedir = @includedir@/screen
 
-lib_LIBRARIES = libsgscreen.a
+lib_LTLIBRARIES = libsgscreen.la
 
 EXTRA_DIST = jpgfactory.cxx jpgfactory.hxx
 
@@ -24,7 +24,7 @@ include_HEADERS = \
 	shader.h \
 	tr.h
 
-libsgscreen_a_SOURCES = \
+libsgscreen_la_SOURCES = \
 	texture.cxx \
 	GLBitmaps.cxx \
 	$(IMAGE_SERVER_SRCS) \
@@ -35,15 +35,21 @@ libsgscreen_a_SOURCES = \
 	shader.cpp \
 	win32-printer.h
 
+libsgscreen_la_LDFLAGS = -release @VERSION@ -module -lGL -lGLU -lX11 -lz \
+	-ldl -ljpeg -lplibssg
+
+libsgscreen_la_LIBADD = \
+	$(top_builddir)/simgear/debug/libsgdebug.la
+
 if HAVE_GLUT
 noinst_PROGRAMS = TestRenderTexture
 
 TestRenderTexture_SOURCES = TestRenderTexture.cpp
 
-TestRenderTexture_LDADD = \
-	libsgscreen.a \
-	$(top_builddir)/simgear/debug/libsgdebug.a \
-	$(opengl_LIBS)
+TestRenderTexture_LDFLAGS = \
+	$(top_builddir)/simgear/screen/libsgscreen.la \
+	$(top_builddir)/simgear/debug/libsgdebug.la \
+	$(opengl_LIBS) -lz -lplibssg -ljpeg
 endif
 
 INCLUDES = -I$(top_srcdir) -I$(top_builddir) -DGLX_GLXEXT_PROTOTYPES
diff -uNrp SimGear-1.9.0.orig/simgear/serial/Makefile.am SimGear-1.9.0/simgear/serial/Makefile.am
--- SimGear-1.9.0.orig/simgear/serial/Makefile.am	2007-07-23 00:37:27.000000000 +0200
+++ SimGear-1.9.0/simgear/serial/Makefile.am	2009-01-06 09:48:09.000000000 +0100
@@ -1,17 +1,21 @@
 includedir = @includedir@/serial
 
-lib_LIBRARIES = libsgserial.a
+lib_LTLIBRARIES = libsgserial.la
 
 include_HEADERS = serial.hxx
 
-libsgserial_a_SOURCES = serial.cxx
+libsgserial_la_SOURCES = serial.cxx
+
+libsgserial_la_LDFLAGS = -release @VERSION@ -module
+libsgserial_la_LIBADD = \
+	$(top_builddir)/simgear/debug/libsgdebug.la
 
 noinst_PROGRAMS = testserial
 
 testserial_SOURCES = testserial.cxx
 
-testserial_LDADD = \
-	libsgserial.a \
-	$(top_builddir)/simgear/debug/libsgdebug.a
+testserial_LDFLAGS = \
+	$(top_builddir)/simgear/serial/libsgserial.la \
+	$(top_builddir)/simgear/debug/libsgdebug.la
 
 INCLUDES = -I$(top_srcdir)
diff -uNrp SimGear-1.9.0.orig/simgear/sound/Makefile.am SimGear-1.9.0/simgear/sound/Makefile.am
--- SimGear-1.9.0.orig/simgear/sound/Makefile.am	2007-07-23 00:37:27.000000000 +0200
+++ SimGear-1.9.0/simgear/sound/Makefile.am	2009-01-06 09:48:09.000000000 +0100
@@ -2,7 +2,7 @@ includedir = @includedir@/sound
 
 EXTRA_DIST = jet.wav
 
-lib_LIBRARIES = libsgsound.a
+lib_LTLIBRARIES = libsgsound.la
 
 noinst_HEADERS =
 
@@ -11,25 +11,33 @@ include_HEADERS = \
 	soundmgr_openal.hxx \
 	xmlsound.hxx 
 
-libsgsound_a_SOURCES = \
+libsgsound_la_SOURCES = \
 	sample_openal.cxx  \
 	soundmgr_openal.cxx \
 	xmlsound.cxx 
 
+libsgsound_la_LDFLAGS = -release @VERSION@ -module $(openal_LIBS)
+libsgsound_la_LIBADD = \
+	$(top_builddir)/simgear/structure/libsgstructure.la \
+	$(top_builddir)/simgear/debug/libsgdebug.la \
+	$(top_builddir)/simgear/props/libsgprops.la
+
 noinst_PROGRAMS = openal_test1 openal_test2
 
 openal_test1_SOURCES = openal_test1.cxx
 openal_test2_SOURCES = openal_test2.cxx
 
-openal_test1_LDADD = \
-	$(top_builddir)/simgear/debug/libsgdebug.a \
+openal_test1_LDFLAGS = \
+	$(top_builddir)/simgear/debug/libsgdebug.la \
 	$(openal_LIBS)
 
-openal_test2_LDADD = \
-	libsgsound.a \
-	$(top_builddir)/simgear/debug/libsgdebug.a \
-	$(top_builddir)/simgear/misc/libsgmisc.a \
-	$(top_builddir)/simgear/structure/libsgstructure.a \
+openal_test2_LDFLAGS = \
+	$(top_builddir)/simgear/sound/libsgsound.la \
+	$(top_builddir)/simgear/debug/libsgdebug.la \
+	$(top_builddir)/simgear/misc/libsgmisc.la \
+	$(top_builddir)/simgear/structure/libsgstructure.la \
+	$(top_builddir)/simgear/props/libsgprops.la \
+	$(top_builddir)/simgear/xml/libsgxml.la \
 	$(openal_LIBS)
 
 INCLUDES = -I$(top_srcdir) -DSRC_DIR=\"$(top_srcdir)/simgear/sound\"
diff -uNrp SimGear-1.9.0.orig/simgear/structure/Makefile.am SimGear-1.9.0/simgear/structure/Makefile.am
--- SimGear-1.9.0.orig/simgear/structure/Makefile.am	2008-12-11 18:35:14.000000000 +0100
+++ SimGear-1.9.0/simgear/structure/Makefile.am	2009-01-06 09:50:22.000000000 +0100
@@ -1,6 +1,6 @@
 includedir = @includedir@/structure
 
-lib_LIBRARIES = libsgstructure.a
+lib_LTLIBRARIES = libsgstructure.la
 
 include_HEADERS = \
 	callback.hxx \
@@ -19,7 +19,7 @@ include_HEADERS = \
 	SGSmplstat.hxx \
 	Singleton.hxx
 
-libsgstructure_a_SOURCES = \
+libsgstructure_la_SOURCES = \
 	commands.cxx \
 	exception.cxx \
 	event_mgr.cxx\
@@ -30,5 +30,10 @@ libsgstructure_a_SOURCES = \
 	SGSmplhist.cxx \
 	SGSmplstat.cxx
 
+libsgstructure_la_LDFLAGS = -release @VERSION@ -module
+
+libsgstructure_la_LIBADD = \
+	$(top_builddir)/simgear/debug/libsgdebug.la
+
 INCLUDES = -I$(top_srcdir)
 
diff -uNrp SimGear-1.9.0.orig/simgear/structure/Makefile.am.orig SimGear-1.9.0/simgear/structure/Makefile.am.orig
--- SimGear-1.9.0.orig/simgear/structure/Makefile.am.orig	1970-01-01 01:00:00.000000000 +0100
+++ SimGear-1.9.0/simgear/structure/Makefile.am.orig	2008-12-11 18:35:14.000000000 +0100
@@ -0,0 +1,34 @@
+includedir = @includedir@/structure
+
+lib_LIBRARIES = libsgstructure.a
+
+include_HEADERS = \
+	callback.hxx \
+	commands.hxx \
+	exception.hxx \
+	event_mgr.hxx \
+	subsystem_mgr.hxx \
+	OSGUtils.hxx \
+	OSGVersion.hxx \
+	SGAtomic.hxx \
+	SGBinding.hxx \
+	SGExpression.hxx \
+	SGReferenced.hxx \
+	SGSharedPtr.hxx \
+	SGSmplhist.hxx \
+	SGSmplstat.hxx \
+	Singleton.hxx
+
+libsgstructure_a_SOURCES = \
+	commands.cxx \
+	exception.cxx \
+	event_mgr.cxx\
+	subsystem_mgr.cxx \
+	SGAtomic.cxx \
+	SGBinding.cxx \
+	SGExpression.cxx \
+	SGSmplhist.cxx \
+	SGSmplstat.cxx
+
+INCLUDES = -I$(top_srcdir)
+
diff -uNrp SimGear-1.9.0.orig/simgear/structure/Makefile.am.rej SimGear-1.9.0/simgear/structure/Makefile.am.rej
--- SimGear-1.9.0.orig/simgear/structure/Makefile.am.rej	1970-01-01 01:00:00.000000000 +0100
+++ SimGear-1.9.0/simgear/structure/Makefile.am.rej	2009-01-06 09:48:09.000000000 +0100
@@ -0,0 +1,17 @@
+***************
+*** 17,23 ****
+  	SGSmplhist.hxx \
+  	SGSmplstat.hxx
+  
+- libsgstructure_a_SOURCES = \
+  	commands.cxx \
+  	exception.cxx \
+  	event_mgr.cxx\
+--- 17,23 ----
+  	SGSmplhist.hxx \
+  	SGSmplstat.hxx
+  
++ libsgstructure_la_SOURCES = \
+  	commands.cxx \
+  	exception.cxx \
+  	event_mgr.cxx\
Binary files SimGear-1.9.0.orig/simgear/structure/.Makefile.am.rej.swp and SimGear-1.9.0/simgear/structure/.Makefile.am.rej.swp differ
diff -uNrp SimGear-1.9.0.orig/simgear/threads/Makefile.am SimGear-1.9.0/simgear/threads/Makefile.am
--- SimGear-1.9.0.orig/simgear/threads/Makefile.am	2002-09-07 04:58:20.000000000 +0200
+++ SimGear-1.9.0/simgear/threads/Makefile.am	2009-01-06 09:48:09.000000000 +0100
@@ -1,13 +1,15 @@
 includedir = @includedir@/threads
 
-lib_LIBRARIES = libsgthreads.a
+lib_LTLIBRARIES = libsgthreads.la
 
 include_HEADERS = \
 	SGGuard.hxx \
 	SGQueue.hxx \
 	SGThread.hxx
 
-libsgthreads_a_SOURCES = \
+libsgthreads_la_SOURCES = \
 	SGThread.cxx
 
+libsgthreads_la_LDFLAGS = -release @VERSION@ -module
+
 INCLUDES = -I$(top_srcdir)
diff -uNrp SimGear-1.9.0.orig/simgear/timing/Makefile.am SimGear-1.9.0/simgear/timing/Makefile.am
--- SimGear-1.9.0.orig/simgear/timing/Makefile.am	2002-09-07 04:58:19.000000000 +0200
+++ SimGear-1.9.0/simgear/timing/Makefile.am	2009-01-06 09:48:09.000000000 +0100
@@ -1,6 +1,6 @@
 includedir = @includedir@/timing
 
-lib_LIBRARIES = libsgtiming.a
+lib_LTLIBRARIES = libsgtiming.la
 
 include_HEADERS = \
 	geocoord.h \
@@ -9,11 +9,17 @@ include_HEADERS = \
 	timestamp.hxx \
 	timezone.h
 
-libsgtiming_a_SOURCES = \
+libsgtiming_la_SOURCES = \
 	geocoord.cxx \
 	lowleveltime.cxx \
 	sg_time.cxx \
 	timestamp.cxx \
 	timezone.cxx
 
+libsgtiming_la_LDFLAGS = -release @VERSION@ -module
+
+libsgtiming_la_LIBADD = \
+	$(top_builddir)/simgear/debug/libsgdebug.la \
+	$(top_builddir)/simgear/misc/libsgmisc.la
+
 INCLUDES = -I$(top_srcdir)
diff -uNrp SimGear-1.9.0.orig/simgear/xml/Makefile.am SimGear-1.9.0/simgear/xml/Makefile.am
--- SimGear-1.9.0.orig/simgear/xml/Makefile.am	2003-08-29 09:35:57.000000000 +0200
+++ SimGear-1.9.0/simgear/xml/Makefile.am	2009-01-06 09:48:09.000000000 +0100
@@ -1,6 +1,6 @@
 includedir = @includedir@/xml
 
-lib_LIBRARIES = libsgxml.a
+lib_LTLIBRARIES = libsgxml.la
 
 include_HEADERS = \
 	easyxml.hxx
@@ -8,7 +8,7 @@ include_HEADERS = \
 noinst_HEADERS = \
 	xmltok_impl.c xmltok_ns.c
 
-libsgxml_a_SOURCES = \
+libsgxml_la_SOURCES = \
 	asciitab.h \
 	easyxml.cxx \
 	hashtable.h hashtable.c \
@@ -18,4 +18,9 @@ libsgxml_a_SOURCES = \
 	xmltok.h xmltok.c \
 	xmltok_impl.h
 
+libsgxml_la_LDFLAGS = -release @VERSION@ -module
+
+libsgxml_la_LIBADD = \
+	$(top_builddir)/simgear/structure/libsgstructure.la
+
 INCLUDES = -I$(top_srcdir)

SimGear-1.9.0-untangle.patch:

--- NEW FILE SimGear-1.9.0-untangle.patch ---
diff -uNrp SimGear-1.9.0.orig/simgear/misc/sg_path.cxx SimGear-1.9.0/simgear/misc/sg_path.cxx
--- SimGear-1.9.0.orig/simgear/misc/sg_path.cxx	2008-08-05 03:12:20.000000000 +0200
+++ SimGear-1.9.0/simgear/misc/sg_path.cxx	2008-11-23 23:27:54.000000000 +0100
@@ -35,42 +35,6 @@
 #include "sg_path.hxx"
 
 
-/**
- * define directory path separators
- */
-
-static const char sgDirPathSep = '/';
-static const char sgDirPathSepBad = '\\';
-
-#if defined( WIN32 ) && !defined(__CYGWIN__)
-static const char sgSearchPathSep = ';';
-#else
-static const char sgSearchPathSep = ':';
-#endif
-
-
-// If Unix, replace all ":" with "/".  If MacOS, replace all "/" with
-// ":" it should go without saying that neither of these characters
-// should be used in file or directory names.  In windoze, allow the
-// second character to be a ":" for things like c:\foo\bar
-
-void
-SGPath::fix()
-{
-    for ( string::size_type i = 0; i < path.size(); ++i ) {
-#if defined( WIN32 )
-	// for windoze, don't replace the ":" for the second character
-	if ( i == 1 ) {
-	    continue;
-	}
-#endif
-	if ( path[i] == sgDirPathSepBad ) {
-	    path[i] = sgDirPathSep;
-	}
-    }
-}
-
-
 // default constructor
 SGPath::SGPath()
     : path("")
@@ -78,19 +42,6 @@ SGPath::SGPath()
 }
 
 
-// create a path based on "path"
-SGPath::SGPath( const std::string& p )
-    : path(p)
-{
-    fix();
-}
-
-
-// destructor
-SGPath::~SGPath() {
-}
-
-
 // set path
 void SGPath::set( const string& p ) {
     path = p;
@@ -98,40 +49,15 @@ void SGPath::set( const string& p ) {
 }
 
 
-// append another piece to the existing path
-void SGPath::append( const string& p ) {
-    if ( path.size() == 0 ) {
-	path = p;
-    } else {
-	if ( p[0] != sgDirPathSep ) {
-	    path += sgDirPathSep;
-	}
-	path += p;
-    }
-    fix();
-}
-
 //add a new path component to the existing path string
 void SGPath::add( const string& p ) {
-    append( sgSearchPathSep+p );
-}
-
-
-// concatenate a string to the end of the path without inserting a
-// path separator
-void SGPath::concat( const string& p ) {
-    if ( path.size() == 0 ) {
-	path = p;
-    } else {
-	path += p;
-    }
-    fix();
+    append( SGPATH_sgSearchPathSep+p );
 }
 
 
 // Get the file part of the path (everything after the last path sep)
 string SGPath::file() const {
-    int index = path.rfind(sgDirPathSep);
+    int index = path.rfind(SGPATH_sgDirPathSep);
     if (index >= 0) {
 	return path.substr(index + 1);
     } else {
@@ -140,16 +66,6 @@ string SGPath::file() const {
 }
   
 
-// get the directory part of the path.
-string SGPath::dir() const {
-    int index = path.rfind(sgDirPathSep);
-    if (index >= 0) {
-	return path.substr(0, index);
-    } else {
-	return "";
-    }
-}
-
 // get the base part of the path (everything but the extension.)
 string SGPath::base() const {
     int index = path.rfind(".");
@@ -180,91 +96,3 @@ bool SGPath::exists() const {
     fclose(fp);
     return true;
 }
-
-#if defined( _MSC_VER) || defined(__MINGW32__)
-#  define sgMkDir(d,m)       _mkdir(d)
-#else
-#  define sgMkDir(d,m)       mkdir(d,m)
-#endif
-
-
-int SGPath::create_dir( mode_t mode ) {
-    string_list dirlist = sgPathSplit(dir());
-    if ( dirlist.empty() )
-        return -1;
-    string path = dirlist[0];
-    string_list path_elements = sgPathBranchSplit(path);
-    bool absolute = !path.empty() && path[0] == sgDirPathSep;
-
-    unsigned int i = 1;
-    SGPath dir = absolute ? string( 1, sgDirPathSep ) : "";
-    dir.concat( path_elements[0] );
-#if defined( _MSC_VER) || defined(__MINGW32__)
-    if ( dir.str().find(':') != string::npos && path_elements.size() >= 2 ) {
-        dir.append( path_elements[1] );
-        i = 2;
-    }
-#endif
-    struct stat info;
-    int r;
-    for(; ( r = stat( dir.c_str(), &info ) ) == 0 && i < path_elements.size(); i++) {
-        dir.append(path_elements[i]);
-    }
-    if ( r == 0 ) {
-        return 0; // Directory already exists
-    }
-    if ( sgMkDir( dir.c_str(), mode) ) {
-        SG_LOG( SG_IO, SG_ALERT, "Error creating directory: " + dir.str() );
-        return -2;
-    }
-    for(; i < path_elements.size(); i++) {
-        dir.append(path_elements[i]);
-        if ( sgMkDir( dir.c_str(), mode) ) {
-            SG_LOG( SG_IO, SG_ALERT, "Error creating directory: " + dir.str() );
-            return -2;
-        }
-    }
-
-    return 0;
-}
-
-string_list sgPathBranchSplit( const string &dirpath ) {
-    string_list path_elements;
-    string element, path = dirpath;
-    while ( path.size() ) {
-        size_t p = path.find( sgDirPathSep );
-        if ( p != string::npos ) {
-            element = path.substr( 0, p );
-            path.erase( 0, p + 1 );
-        } else {
-            element = path;
-            path = "";
-        }
-        if ( element.size() )
-            path_elements.push_back( element );
-    }
-    return path_elements;
-}
-
-
-string_list sgPathSplit( const string &search_path ) {
-    string tmp = search_path;
-    string_list result;
-    result.clear();
-
-    bool done = false;
-
-    while ( !done ) {
-        int index = tmp.find(sgSearchPathSep);
-        if (index >= 0) {
-            result.push_back( tmp.substr(0, index) );
-            tmp = tmp.substr( index + 1 );
-        } else {
-            if ( !tmp.empty() )
-                result.push_back( tmp );
-            done = true;
-        }
-    }
-
-    return result;
-}
diff -uNrp SimGear-1.9.0.orig/simgear/misc/sg_path.hxx SimGear-1.9.0/simgear/misc/sg_path.hxx
--- SimGear-1.9.0.orig/simgear/misc/sg_path.hxx	2008-08-05 03:12:20.000000000 +0200
+++ SimGear-1.9.0/simgear/misc/sg_path.hxx	2008-11-23 23:27:54.000000000 +0100
@@ -34,6 +34,7 @@
 #include <string>
 
 #include <simgear/math/sg_types.hxx>
+#include <simgear/debug/logstream.hxx>
 
 using std::string;
 
@@ -42,6 +43,67 @@ using std::string;
 #endif
 
 /**
+ * define directory path separators
+ */
+
+static const char SGPATH_sgDirPathSep = '/';
+static const char SGPATH_sgDirPathSepBad = '\\';
+
+#if defined( WIN32 ) && !defined(__CYGWIN__)
+static const char SGPATH_sgSearchPathSep = ';';
+#else
+static const char SGPATH_sgSearchPathSep = ':';
+#endif
+
+/**
+ * Split a directory string into a list of it's parent directories.
+ */
+static inline string_list sgPathBranchSplit( const string &dirpath ) {
+    string_list path_elements;
+    string element, path = dirpath;
+    while ( path.size() ) {
+        size_t p = path.find( SGPATH_sgDirPathSep );
+        if ( p != string::npos ) {
+            element = path.substr( 0, p );
+            path.erase( 0, p + 1 );
+        } else {
+            element = path;
+            path = "";
+        }
+        if ( element.size() )
+            path_elements.push_back( element );
+    }
+    return path_elements;
+}
+
+
+/**
+ * Split a directory search path into a vector of individual paths
+ */
+static inline string_list sgPathSplit( const string &search_path ) {
+    string tmp = search_path;
+    string_list result;
+    result.clear();
+
+    bool done = false;
+
+    while ( !done ) {
+        int index = tmp.find(SGPATH_sgSearchPathSep);
+        if (index >= 0) {
+            result.push_back( tmp.substr(0, index) );
+            tmp = tmp.substr( index + 1 );
+        } else {
+            if ( !tmp.empty() )
+                result.push_back( tmp );
+            done = true;
+        }
+    }
+
+    return result;
+}
+
+
+/**
  * A class to hide path separator difference across platforms and assist
  * in managing file system path names.
  *
@@ -64,10 +126,13 @@ public:
      * Construct a path based on the starting path provided.
      * @param p initial path
      */
-    SGPath( const string& p );
+    SGPath( const string& p ) : path(p)
+    {
+        fix();
+    }
 
     /** Destructor */
-    ~SGPath();
+    ~SGPath() {}
 
     /**
      * Set path to a new value
@@ -80,7 +145,17 @@ public:
      * Append another piece to the existing path.  Inserts a path
      * separator between the existing component and the new component.
      * @param p additional path component */
-    void append( const string& p );
+    void append( const string& p ) {
+        if ( path.size() == 0 ) {
+	    path = p;
+        } else {
+	    if ( p[0] != SGPATH_sgDirPathSep ) {
+	        path += SGPATH_sgDirPathSep;
+	    }
+	    path += p;
+        }
+        fix();
+    }
 
     /**
      * Append a new piece to the existing path.  Inserts a search path
@@ -93,7 +168,14 @@ public:
      * path separator.
      * @param p additional path suffix
      */
-    void concat( const string& p );
+    void concat( const string& p ) {
+    if ( path.size() == 0 ) {
+	    path = p;
+        } else {
+	    path += p;
+        }
+        fix();
+    }
 
     /**
      * Get the file part of the path (everything after the last path sep)
@@ -105,7 +187,14 @@ public:
      * Get the directory part of the path.
      * @return directory string
      */
-    string dir() const;
+    string dir() const {
+        int index = path.rfind(SGPATH_sgDirPathSep);
+        if (index >= 0) {
+	    return path.substr(0, index);
+        } else {
+	    return "";
+        }
+    }
   
     /**
      * Get the base part of the path (everything but the extension.)
@@ -141,26 +230,77 @@ public:
      * Create the designated directory.
      * @return 0 on success, or <0 on failure.
      */
-    int create_dir(mode_t mode);
+    int create_dir(mode_t mode) {
+        string_list dirlist = sgPathSplit(dir());
+        if ( dirlist.empty() )
+            return -1;
+        string path = dirlist[0];
+        string_list path_elements = sgPathBranchSplit(path);
+        bool absolute = !path.empty() && path[0] == SGPATH_sgDirPathSep;
+
+        unsigned int i = 1;
+        SGPath dir = absolute ? string( 1, SGPATH_sgDirPathSep ) : "";
+        dir.concat( path_elements[0] );
+#if defined( _MSC_VER) || defined(__MINGW32__)
+        if ( dir.str().find(':') != string::npos && path_elements.size() >= 2 ) {
+            dir.append( path_elements[1] );
+            i = 2;
+        }
+#endif
+        struct stat info;
+        int r;
+        for(; ( r = stat( dir.c_str(), &info ) ) == 0 && i < path_elements.size(); i++) {
+            dir.append(path_elements[i]);
+        }
+        if ( r == 0 ) {
+            return 0; // Directory already exists
+        }
+#if defined( _MSC_VER) || defined(__MINGW32__)
+#  define sgMkDir(d,m)       _mkdir(d)
+#else
+#  define sgMkDir(d,m)       mkdir(d,m)
+#endif
+        if ( sgMkDir( dir.c_str(), mode) ) {
+            SG_LOG( SG_IO, SG_ALERT, "Error creating directory: " + dir.str() );
+            return -2;
+        }
+        for(; i < path_elements.size(); i++) {
+            dir.append(path_elements[i]);
+            if ( sgMkDir( dir.c_str(), mode) ) {
+                SG_LOG( SG_IO, SG_ALERT, "Error creating directory: " + dir.str() );
+                return -2;
+            }
+        }
+#undef sgMkDir
+
+        return 0;
+    }
 
 private:
 
-    void fix();
+    // If Unix, replace all ":" with "/".  If MacOS, replace all "/" with
+    // ":" it should go without saying that neither of these characters
+    // should be used in file or directory names.  In windoze, allow the
+    // second character to be a ":" for things like c:\foo\bar
+
+    void fix()
+    {
+        for ( string::size_type i = 0; i < path.size(); ++i ) {
+#if defined( WIN32 )
+	    // for windoze, don't replace the ":" for the second character
+	    if ( i == 1 ) {
+	        continue;
+	    }
+#endif
+	    if ( path[i] == SGPATH_sgDirPathSepBad ) {
+	        path[i] = SGPATH_sgDirPathSep;
+	    }
+        }
+    }
 
 };
 
 
-/**
- * Split a directory string into a list of it's parent directories.
- */
-string_list sgPathBranchSplit( const string &path );
-
-/**
- * Split a directory search path into a vector of individual paths
- */
-string_list sgPathSplit( const string &search_path );
-
-
 #endif // _SG_PATH_HXX
 
 
diff -uNrp SimGear-1.9.0.orig/simgear/props/props.cxx SimGear-1.9.0/simgear/props/props.cxx
--- SimGear-1.9.0.orig/simgear/props/props.cxx	2008-08-05 03:12:20.000000000 +0200
+++ SimGear-1.9.0/simgear/props/props.cxx	2008-11-23 23:27:54.000000000 +0100
@@ -314,60 +314,6 @@ find_node (SGPropertyNode * current,
 ////////////////////////////////////////////////////////////////////////
 
 inline bool
-SGPropertyNode::get_bool () const
-{
-  if (_tied)
-    return _value.bool_val->getValue();
-  else
-    return _local_val.bool_val;
-}
-
-inline int
-SGPropertyNode::get_int () const
-{
-  if (_tied)
-    return _value.int_val->getValue();
-  else
-    return _local_val.int_val;
-}
-
-inline long
-SGPropertyNode::get_long () const
-{
-  if (_tied)
-    return _value.long_val->getValue();
-  else
-    return _local_val.long_val;
-}
-
-inline float
-SGPropertyNode::get_float () const
-{
-  if (_tied)
-    return _value.float_val->getValue();
-  else
-    return _local_val.float_val;
-}
-
-inline double
-SGPropertyNode::get_double () const
-{
-  if (_tied)
-    return _value.double_val->getValue();
-  else
-    return _local_val.double_val;
-}
-
-inline const char *
-SGPropertyNode::get_string () const
-{
-  if (_tied)
-    return _value.string_val->getValue();
-  else
-    return _local_val.string_val;
-}
-
-inline bool
 SGPropertyNode::set_bool (bool val)
 {
   if (_tied) {
@@ -1170,40 +1116,6 @@ SGPropertyNode::getFloatValue () const
   }
 }
 
-double 
-SGPropertyNode::getDoubleValue () const
-{
-				// Shortcut for common case
-  if (_attr == (READ|WRITE) && _type == DOUBLE)
-    return get_double();
-
-  if (getAttribute(TRACE_READ))
-    trace_read();
-  if (!getAttribute(READ))
-    return SGRawValue<double>::DefaultValue;
-
-  switch (_type) {
-  case ALIAS:
-    return _value.alias->getDoubleValue();
-  case BOOL:
-    return double(get_bool());
-  case INT:
-    return double(get_int());
-  case LONG:
-    return double(get_long());
-  case FLOAT:
-    return double(get_float());
-  case DOUBLE:
-    return get_double();
-  case STRING:
-  case UNSPECIFIED:
-    return strtod(get_string(), 0);
-  case NONE:
-  default:
-    return SGRawValue<double>::DefaultValue;
-  }
-}
-
 const char *
 SGPropertyNode::getStringValue () const
 {
diff -uNrp SimGear-1.9.0.orig/simgear/props/props.hxx SimGear-1.9.0/simgear/props/props.hxx
--- SimGear-1.9.0.orig/simgear/props/props.hxx	2008-06-03 02:21:38.000000000 +0200
+++ SimGear-1.9.0/simgear/props/props.hxx	2008-11-23 23:27:54.000000000 +0100
@@ -18,6 +18,7 @@
 
 #include <vector>
 #include <string>
+#include <cstdlib>
 
 #if PROPS_STANDALONE
 #else
@@ -900,7 +901,38 @@ public:
   /**
    * Get a double value for this node.
    */
-  double getDoubleValue () const;
+  double getDoubleValue () const
+  {
+				// Shortcut for common case
+    if (_attr == (READ|WRITE) && _type == DOUBLE)
+      return get_double();
+
+    if (getAttribute(TRACE_READ))
+      trace_read();
+    if (!getAttribute(READ))
+      return SGRawValue<double>::DefaultValue;
+
+    switch (_type) {
+    case ALIAS:
+      return _value.alias->getDoubleValue();
+    case BOOL:
+      return double(get_bool());
+    case INT:
+      return double(get_int());
+    case LONG:
+      return double(get_long());
+    case FLOAT:
+      return double(get_float());
+    case DOUBLE:
+      return get_double();
+    case STRING:
+    case UNSPECIFIED:
+      return strtod(get_string(), 0);
+    case NONE:
+    default:
+      return SGRawValue<double>::DefaultValue;
+    }
+  }
 
 
   /**
@@ -1365,12 +1397,54 @@ protected:
 private:
 
 				// Get the raw value
-  bool get_bool () const;
-  int get_int () const;
-  long get_long () const;
-  float get_float () const;
-  double get_double () const;
-  const char * get_string () const;
+  inline bool get_bool () const
+  {
+    if (_tied)
+      return _value.bool_val->getValue();
+    else
+      return _local_val.bool_val;
+  }
+
+  inline int get_int () const
+  {
+    if (_tied)
+      return _value.int_val->getValue();
+    else
+      return _local_val.int_val;
+  }
+
+  inline long get_long () const
+  {
+    if (_tied)
+      return _value.long_val->getValue();
+    else
+      return _local_val.long_val;
+  }
+
+  inline float get_float () const
+  {
+    if (_tied)
+      return _value.float_val->getValue();
+    else
+      return _local_val.float_val;
+  }
+
+  inline double get_double () const
+  {
+    if (_tied)
+      return _value.double_val->getValue();
+    else
+      return _local_val.double_val;
+  }
+
+  inline const char * get_string () const
+  {
+    if (_tied)
+      return _value.string_val->getValue();
+    else
+      return _local_val.string_val;
+  }
+
 
 				// Set the raw value
   bool set_bool (bool value);
diff -uNrp SimGear-1.9.0.orig/simgear/scene/model/model.cxx SimGear-1.9.0/simgear/scene/model/model.cxx
--- SimGear-1.9.0.orig/simgear/scene/model/model.cxx	2008-08-29 23:16:43.000000000 +0200
+++ SimGear-1.9.0/simgear/scene/model/model.cxx	2008-11-23 23:19:45.000000000 +0100
@@ -20,43 +20,6 @@
 
 #include "model.hxx"
 
-using std::vector;
-
-osg::Texture2D*
-SGLoadTexture2D(bool staticTexture, const std::string& path,
-                const osgDB::ReaderWriter::Options* options,
-                bool wrapu, bool wrapv, int)
-{
-  osg::Image* image;
-  if (options)
-    image = osgDB::readImageFile(path, options);
-  else
-    image = osgDB::readImageFile(path);
-  osg::ref_ptr<osg::Texture2D> texture = new osg::Texture2D;
-  texture->setImage(image);
-  if (staticTexture)
-    texture->setDataVariance(osg::Object::STATIC);
-  if (wrapu)
-    texture->setWrap(osg::Texture::WRAP_S, osg::Texture::REPEAT);
-  else
-    texture->setWrap(osg::Texture::WRAP_S, osg::Texture::CLAMP);
-  if (wrapv)
-    texture->setWrap(osg::Texture::WRAP_T, osg::Texture::REPEAT);
-  else
-    texture->setWrap(osg::Texture::WRAP_T, osg::Texture::CLAMP);
-
-  if (image) {
-    int s = image->s();
-    int t = image->t();
-
-    if (s <= t && 32 <= s) {
-      SGSceneFeatures::instance()->setTextureCompression(texture.get());
-    } else if (t < s && 32 <= t) {
-      SGSceneFeatures::instance()->setTextureCompression(texture.get());
-    }
-  }
-
-  return texture.release();
-}
+// empty, all inline class now.
 
 // end of model.cxx
diff -uNrp SimGear-1.9.0.orig/simgear/scene/model/model.hxx SimGear-1.9.0/simgear/scene/model/model.hxx
--- SimGear-1.9.0.orig/simgear/scene/model/model.hxx	2008-08-05 03:12:21.000000000 +0200
+++ SimGear-1.9.0/simgear/scene/model/model.hxx	2008-11-23 23:23:19.000000000 +0100
@@ -24,10 +24,53 @@ using std::set;
 
 #include <simgear/misc/sg_path.hxx>
 
-osg::Texture2D*
+#include <osg/ref_ptr>
+#include <osgDB/ReadFile>
+#include <osgDB/SharedStateManager>
+
+#include <simgear/scene/util/SGSceneFeatures.hxx>
+
+#include <simgear/structure/exception.hxx>
+#include <simgear/props/props.hxx>
+#include <simgear/props/props_io.hxx>
+#include <simgear/props/condition.hxx>
+
+inline osg::Texture2D*
 SGLoadTexture2D(bool staticTexture, const std::string& path,
                 const osgDB::ReaderWriter::Options* options = 0,
-                bool wrapu = true, bool wrapv = true, int mipmaplevels = -1);
+                bool wrapu = true, bool wrapv = true, int mipmaplevels = -1)
+{
+  osg::Image* image;
+  if (options)
+    image = osgDB::readImageFile(path, options);
+  else
+    image = osgDB::readImageFile(path);
+  osg::ref_ptr<osg::Texture2D> texture = new osg::Texture2D;
+  texture->setImage(image);
+  if (staticTexture)
+    texture->setDataVariance(osg::Object::STATIC);
+  if (wrapu)
+    texture->setWrap(osg::Texture::WRAP_S, osg::Texture::REPEAT);
+  else
+    texture->setWrap(osg::Texture::WRAP_S, osg::Texture::CLAMP);
+  if (wrapv)
+    texture->setWrap(osg::Texture::WRAP_T, osg::Texture::REPEAT);
+  else
+    texture->setWrap(osg::Texture::WRAP_T, osg::Texture::CLAMP);
+
+  if (image) {
+    int s = image->s();
+    int t = image->t();
+
+    if (s <= t && 32 <= s) {
+      SGSceneFeatures::instance()->setTextureCompression(texture.get());
+    } else if (t < s && 32 <= t) {
+      SGSceneFeatures::instance()->setTextureCompression(texture.get());
+    }
+  }
+
+  return texture.release();
+}
 
 inline osg::Texture2D*
 SGLoadTexture2D(const std::string& path,
diff -uNrp SimGear-1.9.0.orig/simgear/timing/timestamp.cxx SimGear-1.9.0/simgear/timing/timestamp.cxx
--- SimGear-1.9.0.orig/simgear/timing/timestamp.cxx	2008-08-05 03:12:21.000000000 +0200
+++ SimGear-1.9.0/simgear/timing/timestamp.cxx	2008-11-23 23:27:54.000000000 +0100
@@ -24,72 +24,8 @@
 // $Id: timestamp.cxx,v 1.9 2008/07/27 15:15:34 fredb Exp $
 
 
-#ifdef HAVE_CONFIG_H
-#  include <simgear_config.h>
-#endif
-
-#include <simgear/compiler.h>
-
-#include <ctime>
-
-#ifdef HAVE_SYS_TIMEB_H
-#  include <sys/timeb.h> // for ftime() and struct timeb
-#endif
-#ifdef HAVE_UNISTD_H
-#  include <unistd.h>    // for gettimeofday()
-#endif
-#ifdef HAVE_SYS_TIME_H
-#  include <sys/time.h>  // for get/setitimer, gettimeofday, struct timeval
-#endif
-
-#ifdef WIN32
-#  include <windows.h>
-#  if defined( __CYGWIN__ ) || defined( __CYGWIN32__ )
-#    define NEAR /* */
-#    define FAR  /* */
-#  endif
-#  include <mmsystem.h>
-#endif
+// empty, all inline class now.
 
 #include "timestamp.hxx"
 
 
-void SGTimeStamp::stamp() {
-#if defined( WIN32 ) && !defined(__CYGWIN__)
-    unsigned int t;
-    t = timeGetTime();
-    seconds = t / 1000;
-    usec = ( t - ( seconds * 1000 ) ) * 1000;
-#elif defined( HAVE_GETTIMEOFDAY )
-    struct timeval current;
-    struct timezone tz;
-    // sg_timestamp currtime;
-    gettimeofday(&current, &tz);
-    seconds = current.tv_sec;
-    usec = current.tv_usec;
-#elif defined( HAVE_GETLOCALTIME )
-    SYSTEMTIME current;
-    GetLocalTime(&current);
-    seconds = current.wSecond;
-    usec = current.wMilliseconds * 1000;
-#elif defined( HAVE_FTIME )
-    struct timeb current;
-    ftime(&current);
-    seconds = current.time;
-    usec = current.millitm * 1000;
-#else
-# error Port me
-#endif
-}
-
-// increment the time stamp by the number of microseconds (usec)
-SGTimeStamp operator + (const SGTimeStamp& t, const long& m) {
-    return SGTimeStamp( t.seconds + ( t.usec + m ) / 1000000,
-			( t.usec + m ) % 1000000 );
-}
-
-// difference between time stamps in microseconds (usec)
-long operator - (const SGTimeStamp& a, const SGTimeStamp& b)
-{
-    return 1000000 * (a.seconds - b.seconds) + (a.usec - b.usec);
-}
diff -uNrp SimGear-1.9.0.orig/simgear/timing/timestamp.hxx SimGear-1.9.0/simgear/timing/timestamp.hxx
--- SimGear-1.9.0.orig/simgear/timing/timestamp.hxx	2006-10-31 06:41:32.000000000 +0100
+++ SimGear-1.9.0/simgear/timing/timestamp.hxx	2008-11-23 23:27:54.000000000 +0100
@@ -32,9 +32,33 @@
 # error This library requires C++
 #endif
 
+#ifdef HAVE_CONFIG_H
+#  include <simgear_config.h>
+#endif
 
 #include <simgear/compiler.h>
 
+#include <ctime>
+
+#ifdef HAVE_SYS_TIMEB_H
+#  include <sys/timeb.h> // for ftime() and struct timeb
+#endif
+#ifdef HAVE_UNISTD_H
+#  include <unistd.h>    // for gettimeofday()
+#endif
+#ifdef HAVE_SYS_TIME_H
+#  include <sys/time.h>  // for get/setitimer, gettimeofday, struct timeval
+#endif
+
+#ifdef WIN32
+#  include <windows.h>
+#  if defined( __CYGWIN__ ) || defined( __CYGWIN32__ )
+#    define NEAR /* */
+#    define FAR  /* */
+#  endif
+#  include <mmsystem.h>
+#endif
+
 
 // MSVC++ 6.0 kuldge - Need forward declaration of friends.
 class SGTimeStamp;
@@ -73,7 +97,33 @@ public:
     SGTimeStamp( const long s, const long m );
 
     /** Update stored time to current time (seconds and microseconds) */
-    void stamp();
+    inline void stamp() {
+#if defined( WIN32 ) && !defined(__CYGWIN__)
+        unsigned int t;
+        t = timeGetTime();
+        seconds = t / 1000;
+        usec = ( t - ( seconds * 1000 ) ) * 1000;
+#elif defined( HAVE_GETTIMEOFDAY )
+        struct timeval current;
+        struct timezone tz;
+        // sg_timestamp currtime;
+        gettimeofday(&current, &tz);
+        seconds = current.tv_sec;
+        usec = current.tv_usec;
+#elif defined( HAVE_GETLOCALTIME )
+        SYSTEMTIME current;
+        GetLocalTime(&current);
+        seconds = current.wSecond;
+        usec = current.wMilliseconds * 1000;
+#elif defined( HAVE_FTIME )
+        struct timeb current;
+        ftime(&current);
+        seconds = current.time;
+        usec = current.millitm * 1000;
+#else
+# error Port me
+#endif
+    }
 
     /**
      * Increment the saved time by the specified number of microseconds
@@ -81,7 +131,10 @@ public:
      * @param m microseconds increment
      * @return new time stamp
      */
-    friend SGTimeStamp operator + (const SGTimeStamp& t, const long& m);
+    friend SGTimeStamp operator + (const SGTimeStamp& t, const long& m) {
+        return SGTimeStamp( t.seconds + ( t.usec + m ) / 1000000,
+			    ( t.usec + m ) % 1000000 );
+    }
 
     /**
      * Subtract two time stamps returning the difference in microseconds.
@@ -89,7 +142,9 @@ public:
      * @param b timestame 2
      * @return difference in microseconds
      */
-    friend long operator - (const SGTimeStamp& a, const SGTimeStamp& b);
+    friend long operator - (const SGTimeStamp& a, const SGTimeStamp& b) {
+        return 1000000 * (a.seconds - b.seconds) + (a.usec - b.usec);
+    }
 
     /** @return the saved seconds of this time stamp */
     inline long get_seconds() const { return seconds; }


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/SimGear/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	6 Jan 2008 18:08:02 -0000	1.4
+++ .cvsignore	7 Jan 2009 16:32:09 -0000	1.5
@@ -1 +1 @@
-SimGear-1.0.0.tar.gz
+SimGear-1.9.0.tar.gz


Index: SimGear.spec
===================================================================
RCS file: /cvs/extras/rpms/SimGear/devel/SimGear.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- SimGear.spec	24 Sep 2008 20:24:40 -0000	1.12
+++ SimGear.spec	7 Jan 2009 16:32:10 -0000	1.13
@@ -1,22 +1,24 @@
 Name:		SimGear
-Version:	1.0.0
-Release:	5%{?dist}
+Version:	1.9.0
+Release:	1%{?dist}
 License:	GPLv2+
 Group:		System Environment/Libraries
 Summary:	Simulation library components
 URL:		http://www.simgear.org
 Source0:	ftp://ftp.simgear.org/pub/simgear/Source/SimGear-%{version}.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Patch0:		SimGear-1.0.0-shared.patch
-Patch1:		SimGear-0.3.10-notabbed_value_test.patch
-Patch2:		SimGear-1.0.0-headers.patch
-Patch3:		SimGear-1.0.0-shared-auto.patch
-Patch4:		SimGear-0.3.10-thesky.patch
-Patch5:		SimGear-1.0.0-untangle.patch
-Patch7:		SimGear-1.0.0-more-archs.patch
-BuildRequires:	openal-devel, plib-devel, libXt-devel, libXext-devel
+Patch0:		SimGear-1.9.0-shared.patch
+Patch1:		SimGear-1.9.0-notabbed_value_test.patch
+Patch2:		SimGear-1.9.0-headers.patch
+Patch5:		SimGear-1.9.0-untangle.patch
+Patch7:		SimGear-1.9.0-more-archs.patch
+BuildRequires:	openal-devel, plib-devel >= 1.8.5
+BuildRequires:	OpenSceneGraph-devel >= 2.6.0
+BuildRequires:	boost-devel >= 1.34.0
+BuildRequires:	libXt-devel, libXext-devel
 BuildRequires:	libXi-devel, libXmu-devel, freeglut-devel, freealut-devel
 BuildRequires:	zlib-devel, libjpeg-devel
+BuildRequires:	automake autoconf intltool libtool
 
 %description
 SimGear is a set of open-source libraries designed to be used as building
@@ -38,20 +40,19 @@
 %setup -q
 # automake / autoconf input file changes
 %patch0 -p1
-# automake / autoconf auto generated changes
-%patch3 -p1
 # Have to disable the tabbed_value_test, because otherwise
 # we get caught in a loop between libsgprops and libsgmisc.
 %patch1 -p1
-# The Sky issue, see bz 208678
-%patch4 -p1
 # Some circular dependcy fixing, see bz 208678
 %patch5 -p1
 # Fix compiling on pcc and alpha
 %patch7 -p1
-chmod -x simgear/screen/GLBitmaps.cxx simgear/scene/model/*.?xx
+chmod -x simgear/screen/GLBitmaps.cxx \
+	simgear/scene/model/persparam.?xx \
+	simgear/scene/sky/CloudShaderGeometry.?xx
 
 %build
+autoreconf -i
 %configure --with-jpeg-factory --disable-static
 # We do not want -lm by default!
 sed -i 's/ -lm / /g' libtool
@@ -107,9 +108,13 @@
 %{_libdir}/libsgtgdb.so
 %{_libdir}/libsgthreads.so
 %{_libdir}/libsgtiming.so
+%{_libdir}/libsgutil.so
 %{_libdir}/libsgxml.so
 
 %changelog
+* Tue Jan 06 2009 Fabrice Bellet <fabrice at bellet.info> 1.9.0-1
+- New upstream release
+
 * 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
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/SimGear/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	6 Jan 2008 18:08:02 -0000	1.4
+++ sources	7 Jan 2009 16:32:10 -0000	1.5
@@ -1 +1 @@
-6d90c1b9e6fdd3d7a4a39bef027bfd10  SimGear-1.0.0.tar.gz
+c9e532dc8e80025bbd90c6be4a72aad1  SimGear-1.9.0.tar.gz


--- SimGear-0.3.10-notabbed_value_test.patch DELETED ---


--- SimGear-0.3.10-thesky.patch DELETED ---


--- SimGear-1.0.0-headers.patch DELETED ---


--- SimGear-1.0.0-more-archs.patch DELETED ---


--- SimGear-1.0.0-shared-auto.patch DELETED ---


--- SimGear-1.0.0-shared.patch DELETED ---


--- SimGear-1.0.0-untangle.patch DELETED ---



From nsantos at fedoraproject.org  Wed Jan  7 16:35:11 2009
From: nsantos at fedoraproject.org (Nuno Santos)
Date: Wed,  7 Jan 2009 16:35:11 +0000 (UTC)
Subject: rpms/qpidc/devel qpidc.spec,1.56,1.57
Message-ID: <20090107163511.32E9170100@cvs1.fedora.phx.redhat.com>

Author: nsantos

Update of /cvs/extras/rpms/qpidc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5554

Modified Files:
	qpidc.spec 
Log Message:
add corosync patch


Index: qpidc.spec
===================================================================
RCS file: /cvs/extras/rpms/qpidc/devel/qpidc.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- qpidc.spec	7 Jan 2009 16:09:29 -0000	1.56
+++ qpidc.spec	7 Jan 2009 16:34:40 -0000	1.57
@@ -182,7 +182,7 @@
 
 %prep
 %setup -q
-%patch
+%patch0
 
 %define perftests "perftest topic_listener topic_publisher \
 	latencytest client_test txtest"



From pkgdb at fedoraproject.org  Wed Jan  7 16:45:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 07 Jan 2009 16:45:09 +0000
Subject: [pkgdb] cudd: jjames has requested watchbugzilla
Message-ID: <20090107164509.A27D820831C@bastion.fedora.phx.redhat.com>

jjames has requested the watchbugzilla acl on cudd (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cudd



From pkgdb at fedoraproject.org  Wed Jan  7 16:45:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 07 Jan 2009 16:45:15 +0000
Subject: [pkgdb] cudd: jjames has requested commit
Message-ID: <20090107164515.8A7F320831F@bastion.fedora.phx.redhat.com>

jjames has requested the commit acl on cudd (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cudd



From pkgdb at fedoraproject.org  Wed Jan  7 16:45:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 07 Jan 2009 16:45:18 +0000
Subject: [pkgdb] cudd: jjames has requested watchcommits
Message-ID: <20090107164518.5673C208456@bastion.fedora.phx.redhat.com>

jjames has requested the watchcommits acl on cudd (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cudd



From pkgdb at fedoraproject.org  Wed Jan  7 16:45:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 07 Jan 2009 16:45:18 +0000
Subject: [pkgdb] cudd: jjames has requested approveacls
Message-ID: <20090107164519.77471208466@bastion.fedora.phx.redhat.com>

jjames has requested the approveacls acl on cudd (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cudd



From pkgdb at fedoraproject.org  Wed Jan  7 16:45:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 07 Jan 2009 16:45:26 +0000
Subject: [pkgdb] cudd: jjames has requested watchbugzilla
Message-ID: <20090107164527.26040208469@bastion.fedora.phx.redhat.com>

jjames has requested the watchbugzilla acl on cudd (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cudd



From pkgdb at fedoraproject.org  Wed Jan  7 16:45:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 07 Jan 2009 16:45:30 +0000
Subject: [pkgdb] cudd: jjames has requested commit
Message-ID: <20090107164533.2BBC4208319@bastion.fedora.phx.redhat.com>

jjames has requested the commit acl on cudd (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cudd



From pkgdb at fedoraproject.org  Wed Jan  7 16:45:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 07 Jan 2009 16:45:33 +0000
Subject: [pkgdb] cudd: jjames has requested watchcommits
Message-ID: <20090107164533.C4566208467@bastion.fedora.phx.redhat.com>

jjames has requested the watchcommits acl on cudd (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cudd



From pkgdb at fedoraproject.org  Wed Jan  7 16:45:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 07 Jan 2009 16:45:36 +0000
Subject: [pkgdb] cudd: jjames has requested approveacls
Message-ID: <20090107164536.E466920846B@bastion.fedora.phx.redhat.com>

jjames has requested the approveacls acl on cudd (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cudd



From pkgdb at fedoraproject.org  Wed Jan  7 16:45:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 07 Jan 2009 16:45:43 +0000
Subject: [pkgdb] cudd: jjames has requested watchbugzilla
Message-ID: <20090107164543.87E2B20846C@bastion.fedora.phx.redhat.com>

jjames has requested the watchbugzilla acl on cudd (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cudd



From pkgdb at fedoraproject.org  Wed Jan  7 16:45:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 07 Jan 2009 16:45:46 +0000
Subject: [pkgdb] cudd: jjames has requested watchcommits
Message-ID: <20090107164546.A1B6520846D@bastion.fedora.phx.redhat.com>

jjames has requested the watchcommits acl on cudd (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cudd



From pkgdb at fedoraproject.org  Wed Jan  7 16:45:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 07 Jan 2009 16:45:53 +0000
Subject: [pkgdb] cudd: jjames has requested commit
Message-ID: <20090107164553.7D342208468@bastion.fedora.phx.redhat.com>

jjames has requested the commit acl on cudd (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cudd



From pkgdb at fedoraproject.org  Wed Jan  7 16:45:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 07 Jan 2009 16:45:56 +0000
Subject: [pkgdb] cudd: jjames has requested approveacls
Message-ID: <20090107164556.389D2208471@bastion.fedora.phx.redhat.com>

jjames has requested the approveacls acl on cudd (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cudd



From pkgdb at fedoraproject.org  Wed Jan  7 16:50:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 07 Jan 2009 16:50:59 +0000
Subject: [pkgdb] cudd had acl change status
Message-ID: <20090107165059.C472F20831C@bastion.fedora.phx.redhat.com>

konradm has set the approveacls acl on cudd (Fedora devel) to Approved for jjames

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cudd



From pkgdb at fedoraproject.org  Wed Jan  7 16:51:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 07 Jan 2009 16:51:03 +0000
Subject: [pkgdb] cudd had acl change status
Message-ID: <20090107165103.D460C208421@bastion.fedora.phx.redhat.com>

konradm has set the watchbugzilla acl on cudd (Fedora devel) to Approved for jjames

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cudd



From pkgdb at fedoraproject.org  Wed Jan  7 16:51:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 07 Jan 2009 16:51:07 +0000
Subject: [pkgdb] cudd had acl change status
Message-ID: <20090107165107.EC4F0208466@bastion.fedora.phx.redhat.com>

konradm has set the commit acl on cudd (Fedora devel) to Approved for jjames

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cudd



From pkgdb at fedoraproject.org  Wed Jan  7 16:51:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 07 Jan 2009 16:51:07 +0000
Subject: [pkgdb] cudd had acl change status
Message-ID: <20090107165107.EEB9A208467@bastion.fedora.phx.redhat.com>

konradm has set the watchcommits acl on cudd (Fedora devel) to Approved for jjames

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cudd



From pkgdb at fedoraproject.org  Wed Jan  7 16:51:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 07 Jan 2009 16:51:09 +0000
Subject: [pkgdb] cudd had acl change status
Message-ID: <20090107165109.4FD7920846A@bastion.fedora.phx.redhat.com>

konradm has set the watchbugzilla acl on cudd (Fedora 10) to Approved for jjames

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cudd



From pkgdb at fedoraproject.org  Wed Jan  7 16:51:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 07 Jan 2009 16:51:10 +0000
Subject: [pkgdb] cudd had acl change status
Message-ID: <20090107165110.D185B20846D@bastion.fedora.phx.redhat.com>

konradm has set the watchcommits acl on cudd (Fedora 10) to Approved for jjames

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cudd



From pkgdb at fedoraproject.org  Wed Jan  7 16:51:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 07 Jan 2009 16:51:12 +0000
Subject: [pkgdb] cudd had acl change status
Message-ID: <20090107165112.5562220846E@bastion.fedora.phx.redhat.com>

konradm has set the commit acl on cudd (Fedora 10) to Approved for jjames

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cudd



From pkgdb at fedoraproject.org  Wed Jan  7 16:51:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 07 Jan 2009 16:51:12 +0000
Subject: [pkgdb] cudd had acl change status
Message-ID: <20090107165112.C78F8208471@bastion.fedora.phx.redhat.com>

konradm has set the approveacls acl on cudd (Fedora 10) to Approved for jjames

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cudd



From pkgdb at fedoraproject.org  Wed Jan  7 16:51:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 07 Jan 2009 16:51:14 +0000
Subject: [pkgdb] cudd had acl change status
Message-ID: <20090107165114.4F180208474@bastion.fedora.phx.redhat.com>

konradm has set the watchbugzilla acl on cudd (Fedora 9) to Approved for jjames

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cudd



From pkgdb at fedoraproject.org  Wed Jan  7 16:51:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 07 Jan 2009 16:51:15 +0000
Subject: [pkgdb] cudd had acl change status
Message-ID: <20090107165115.C55B6208477@bastion.fedora.phx.redhat.com>

konradm has set the watchcommits acl on cudd (Fedora 9) to Approved for jjames

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cudd



From pkgdb at fedoraproject.org  Wed Jan  7 16:51:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 07 Jan 2009 16:51:18 +0000
Subject: [pkgdb] cudd had acl change status
Message-ID: <20090107165118.6118F20847A@bastion.fedora.phx.redhat.com>

konradm has set the approveacls acl on cudd (Fedora 9) to Approved for jjames

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cudd



From pkgdb at fedoraproject.org  Wed Jan  7 16:51:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 07 Jan 2009 16:51:18 +0000
Subject: [pkgdb] cudd had acl change status
Message-ID: <20090107165118.D9FB720847D@bastion.fedora.phx.redhat.com>

konradm has set the commit acl on cudd (Fedora 9) to Approved for jjames

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cudd



From nsantos at fedoraproject.org  Wed Jan  7 16:51:43 2009
From: nsantos at fedoraproject.org (Nuno Santos)
Date: Wed,  7 Jan 2009 16:51:43 +0000 (UTC)
Subject: rpms/qpidc/devel corosync.patch,1.1,1.2
Message-ID: <20090107165143.177B570100@cvs1.fedora.phx.redhat.com>

Author: nsantos

Update of /cvs/extras/rpms/qpidc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7856

Modified Files:
	corosync.patch 
Log Message:
add corosync patch

corosync.patch:

Index: corosync.patch
===================================================================
RCS file: /cvs/extras/rpms/qpidc/devel/corosync.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- corosync.patch	7 Jan 2009 16:09:29 -0000	1.1
+++ corosync.patch	7 Jan 2009 16:51:12 -0000	1.2
@@ -1,5 +1,5 @@
---- qpidc-0.4.728142/src/qpid/cluster/types.h (original)
-+++ qpidc-0.4.728142/src/qpid/cluster/types.h Wed Jan  7 07:00:55 2009
+--- src/qpid/cluster/types.h (original)
++++ src/qpid/cluster/types.h Wed Jan  7 07:00:55 2009
 @@ -34,9 +34,9 @@
  #include <stdint.h>
  



From bpepple at fedoraproject.org  Wed Jan  7 17:00:00 2009
From: bpepple at fedoraproject.org (Brian Pepple)
Date: Wed,  7 Jan 2009 17:00:00 +0000 (UTC)
Subject: rpms/python-telepathy/devel .cvsignore, 1.16,
	1.17 python-telepathy.spec, 1.26, 1.27 sources, 1.16, 1.17
Message-ID: <20090107170000.476D770100@cvs1.fedora.phx.redhat.com>

Author: bpepple

Update of /cvs/pkgs/rpms/python-telepathy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9565

Modified Files:
	.cvsignore python-telepathy.spec sources 
Log Message:
* Wed Jan  7 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.15.6-1
- Update to 0.15.6.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-telepathy/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore	6 Jan 2009 14:27:59 -0000	1.16
+++ .cvsignore	7 Jan 2009 16:59:29 -0000	1.17
@@ -1 +1 @@
-telepathy-python-0.15.5.tar.gz
+telepathy-python-0.15.6.tar.gz


Index: python-telepathy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-telepathy/devel/python-telepathy.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- python-telepathy.spec	6 Jan 2009 14:27:59 -0000	1.26
+++ python-telepathy.spec	7 Jan 2009 16:59:29 -0000	1.27
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           python-telepathy
-Version:        0.15.5
+Version:        0.15.6
 Release:        1%{?dist}
 Summary:        Python libraries for Telepathy
 
@@ -49,6 +49,9 @@
 
 
 %changelog
+* Wed Jan  7 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.15.6-1
+- Update to 0.15.6.
+
 * Tue Jan  6 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.15.5-1
 - Update to 0.15.5.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-telepathy/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources	6 Jan 2009 14:27:59 -0000	1.16
+++ sources	7 Jan 2009 16:59:29 -0000	1.17
@@ -1 +1 @@
-f732c165dd8c0f79248fd2dd123ce430  telepathy-python-0.15.5.tar.gz
+b79886e73bf20eb7af300a6408e53fa6  telepathy-python-0.15.6.tar.gz



From bellet at fedoraproject.org  Wed Jan  7 17:16:48 2009
From: bellet at fedoraproject.org (Fabrice Bellet)
Date: Wed,  7 Jan 2009 17:16:48 +0000 (UTC)
Subject: rpms/fgfs-base/devel dead.package, NONE, 1.1 .cvsignore, 1.4,
	NONE Makefile, 1.1, NONE fgfs-base.spec, 1.4, NONE sources, 1.4, NONE
Message-ID: <20090107171649.0883C70100@cvs1.fedora.phx.redhat.com>

Author: bellet

Update of /cvs/extras/rpms/fgfs-base/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11437

Added Files:
	dead.package 
Removed Files:
	.cvsignore Makefile fgfs-base.spec sources 
Log Message:
package renamed to FlightGear-data



--- NEW FILE dead.package ---
package renamed to FlightGear-data


--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- fgfs-base.spec DELETED ---


--- sources DELETED ---



From bellet at fedoraproject.org  Wed Jan  7 17:19:50 2009
From: bellet at fedoraproject.org (Fabrice Bellet)
Date: Wed,  7 Jan 2009 17:19:50 +0000 (UTC)
Subject: rpms/FlightGear-data/devel FlightGear-data.spec, NONE,
	1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090107171950.BD1F670100@cvs1.fedora.phx.redhat.com>

Author: bellet

Update of /cvs/pkgs/rpms/FlightGear-data/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11244/devel

Modified Files:
	.cvsignore sources 
Added Files:
	FlightGear-data.spec import.log 
Log Message:
Setup of module FlightGear-data



--- NEW FILE FlightGear-data.spec ---
Name:		FlightGear-data
Summary:	FlightGear base scenery and data files
Version:	1.9.0
Release:	1%{?dist}

License:	GPLv2+
Group:		Amusements/Games
Source0:	ftp://ftp.flightgear.org/pub/fgfs/Shared/FlightGear-data-%{version}.tar.bz2
URL:		http://www.flightgear.org/
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:	noarch
Obsoletes:	fgfs-base < 1.9.0-1

%description
This package contains the base scenery for FlightGear and must be
installed

%prep

%build

%install
rm -rf $RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT%{_datadir}/FlightGear
tar jxf %{SOURCE0} --strip-components 1 \
	-C $RPM_BUILD_ROOT/%{_datadir}/FlightGear

# cleanup temporary files and fix permissions
find $RPM_BUILD_ROOT/%{_datadir}/FlightGear -name '*#*' -exec rm {} \;
find $RPM_BUILD_ROOT/%{_datadir}/FlightGear -type f -exec chmod 644 {} \;

# fix wrong eol encoding on some doc files
for f in Docs/FGShortRef.css Docs/README.kln89.html Docs/FGShortRef.html \
	Docs/README.submodels Docs/README.yasim Docs/README.xmlparticles
do
	sed -i 's/\r//' $RPM_BUILD_ROOT/%{_datadir}/FlightGear/$f
done

# remove hidden dirs
for d in Aircraft/c172/Panels/Textures/.xvpics \
	Textures/Runway/.xvpics
do
	rm -rf $RPM_BUILD_ROOT/%{_datadir}/FlightGear/$d
done

# fix files not in utf-8
for f in Thanks Docs/README.xmlparticles
do
	path=$RPM_BUILD_ROOT/%{_datadir}/FlightGear/$f
	iconv -f iso-8859-1 -t utf-8 -o ${path}.utf8 $path
	mv -f ${path}.utf8 ${path}
done

# put documentation and license in the proper location
mkdir -p $RPM_BUILD_ROOT/%{_docdir}/%{name}-%{version}
for f in COPYING AUTHORS NEWS README Thanks Docs
do
	mv $RPM_BUILD_ROOT/%{_datadir}/FlightGear/$f \
		$RPM_BUILD_ROOT/%{_docdir}/%{name}-%{version}
done

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-, root, root, 0755)
%doc %{_docdir}/%{name}-%{version}
%{_datadir}/FlightGear

%changelog
* Tue Jan 06 2009 Fabrice Bellet <fabrice at bellet.info> 1.9.0-1
- new upstream release

* Mon Jan  7 2008 Fabrice Bellet <fabrice at bellet.info> 1.0.0-1
- new upstream release

* Sun Sep 23 2007 Fabrice Bellet <fabrice at bellet.info> 0.9.11-0.2.pre1
- update License tag

* Wed Jun 27 2007 Fabrice Bellet <fabrice at bellet.info> 0.9.11-0.1.pre1
- new upstream (pre-)release

* Sat Apr  7 2007 Fabrice Bellet <fabrice at bellet.info> 0.9.10-3
- use sed instead of dos2unix to correct end-of-line encoding

* Mon Apr  2 2007 Fabrice Bellet <fabrice at bellet.info> 0.9.10-2
- Move documentation and license to a better place and mark it as %%doc
- Fix wrong end-of-line encoding in some doc files

* Tue Mar 20 2007 Fabrice Bellet <fabrice at bellet.info> 0.9.10-1
- Initial packaging


--- NEW FILE import.log ---
FlightGear-data-1_9_0-1_fc11:HEAD:FlightGear-data-1.9.0-1.fc11.src.rpm:1231348440


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/FlightGear-data/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	7 Jan 2009 01:32:35 -0000	1.1
+++ .cvsignore	7 Jan 2009 17:19:20 -0000	1.2
@@ -0,0 +1 @@
+FlightGear-data-1.9.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/FlightGear-data/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	7 Jan 2009 01:32:35 -0000	1.1
+++ sources	7 Jan 2009 17:19:20 -0000	1.2
@@ -0,0 +1 @@
+4a6eabe5cd9f9b4063efbc38908ab068  FlightGear-data-1.9.0.tar.bz2



From pkgdb at fedoraproject.org  Wed Jan  7 17:20:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 07 Jan 2009 17:20:12 +0000
Subject: [pkgdb] wireshark: dhurander3 has requested watchbugzilla
Message-ID: <20090107172013.10CF020831C@bastion.fedora.phx.redhat.com>

dhurander3 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 bellet at fedoraproject.org  Wed Jan  7 17:22:21 2009
From: bellet at fedoraproject.org (Fabrice Bellet)
Date: Wed,  7 Jan 2009 17:22:21 +0000 (UTC)
Subject: rpms/fgfs-Atlas/devel dead.package, NONE, 1.1 .cvsignore, 1.2,
	NONE Makefile, 1.1, NONE fgfs-Atlas-0.3.1-gcc43.patch, 1.1,
	NONE fgfs-Atlas.spec, 1.7, NONE sources, 1.2, NONE
Message-ID: <20090107172221.1B69570100@cvs1.fedora.phx.redhat.com>

Author: bellet

Update of /cvs/extras/rpms/fgfs-Atlas/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12124

Added Files:
	dead.package 
Removed Files:
	.cvsignore Makefile fgfs-Atlas-0.3.1-gcc43.patch 
	fgfs-Atlas.spec sources 
Log Message:
package renamed to FlightGear-Atlas



--- NEW FILE dead.package ---
package renamed to FlightGear-Atlas


--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- fgfs-Atlas-0.3.1-gcc43.patch DELETED ---


--- fgfs-Atlas.spec DELETED ---


--- sources DELETED ---



From bellet at fedoraproject.org  Wed Jan  7 17:25:19 2009
From: bellet at fedoraproject.org (Fabrice Bellet)
Date: Wed,  7 Jan 2009 17:25:19 +0000 (UTC)
Subject: rpms/FlightGear-Atlas/devel
	FlightGear-Atlas-0.3.1-build-fixes.patch, 
	NONE, 1.1 FlightGear-Atlas.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090107172519.7F42270100@cvs1.fedora.phx.redhat.com>

Author: bellet

Update of /cvs/pkgs/rpms/FlightGear-Atlas/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12494/devel

Modified Files:
	.cvsignore sources 
Added Files:
	FlightGear-Atlas-0.3.1-build-fixes.patch FlightGear-Atlas.spec 
	import.log 
Log Message:
Setup of module FlightGear-Atlas


FlightGear-Atlas-0.3.1-build-fixes.patch:

--- NEW FILE FlightGear-Atlas-0.3.1-build-fixes.patch ---
diff -uNrp Atlas-0.3.1.orig/src/Atlas.cxx Atlas-0.3.1.buildfixes/src/Atlas.cxx
--- Atlas-0.3.1.orig/src/Atlas.cxx	2006-10-28 18:28:32.000000000 +0200
+++ Atlas-0.3.1.buildfixes/src/Atlas.cxx	2008-12-14 19:18:15.000000000 +0100
@@ -29,12 +29,14 @@
 #include <memory.h>
 #include <stdio.h>
 #include <simgear/compiler.h>
-#include SG_GLUT_H
+#include <GL/gl.h>
+#include <GL/glut.h>
 #include <plib/fnt.h>
 #include <plib/pu.h>
 #include <string>
 #include <simgear/io/sg_socket.hxx>
 #include <simgear/io/sg_serial.hxx>
+#include <iostream>
 
 #include "MapBrowser.hxx"
 #include "Overlays.hxx"
@@ -42,6 +44,8 @@
 
 #define SCALECHANGEFACTOR 1.3f
 
+using namespace std;
+
 SGIOChannel *input_channel;
 
 bool dragmode = false;
diff -uNrp Atlas-0.3.1.orig/src/fg_mkdir.cxx Atlas-0.3.1.buildfixes/src/fg_mkdir.cxx
--- Atlas-0.3.1.orig/src/fg_mkdir.cxx	2005-01-28 13:54:12.000000000 +0100
+++ Atlas-0.3.1.buildfixes/src/fg_mkdir.cxx	2008-12-14 19:29:06.000000000 +0100
@@ -34,6 +34,7 @@
 #endif
 #include <string.h>
 #include <string>
+#include <stdlib.h>
 
 using namespace std;
 
diff -uNrp Atlas-0.3.1.orig/src/FlightTrack.hxx Atlas-0.3.1.buildfixes/src/FlightTrack.hxx
--- Atlas-0.3.1.orig/src/FlightTrack.hxx	2003-01-07 22:51:12.000000000 +0100
+++ Atlas-0.3.1.buildfixes/src/FlightTrack.hxx	2008-12-14 19:16:24.000000000 +0100
@@ -27,7 +27,7 @@
 #include <plib/sg.h>
 #include <simgear/compiler.h>
 
-SG_USING_STD(list);
+using namespace std;
 
 struct FlightData {
   float lat, lon, alt, hdg, spd;
diff -uNrp Atlas-0.3.1.orig/src/MapBrowser.hxx Atlas-0.3.1.buildfixes/src/MapBrowser.hxx
--- Atlas-0.3.1.orig/src/MapBrowser.hxx	2006-10-28 18:28:32.000000000 +0200
+++ Atlas-0.3.1.buildfixes/src/MapBrowser.hxx	2008-12-14 19:15:36.000000000 +0100
@@ -27,11 +27,13 @@
 #include "FlightTrack.hxx"
 #include "Projection.hxx"
 #include <simgear/compiler.h>
-#include SG_GL_H
+#include <osg/GL>
 #include <math.h>
 #include <list>
 #include <map>
 
+using namespace std;
+
 class MapBrowser {
 public:
   static const int CACHE_LIMIT = 2;
diff -uNrp Atlas-0.3.1.orig/src/Map.cxx Atlas-0.3.1.buildfixes/src/Map.cxx
--- Atlas-0.3.1.orig/src/Map.cxx	2006-10-26 23:45:05.000000000 +0200
+++ Atlas-0.3.1.buildfixes/src/Map.cxx	2008-12-14 19:22:18.000000000 +0100
@@ -39,7 +39,7 @@
 #include <plib/ul.h>
 
 #include <simgear/compiler.h>
-#include SG_GL_H
+#include <osg/GL>
 #ifdef UL_GLX
 #  define GLX_GLXEXT_PROTOTYPES
 #  ifdef __APPLE__
@@ -50,7 +50,8 @@
 #elif defined UL_WIN32
 #  include <windows.h>
 #endif
-#include SG_GLUT_H
+#include <GL/gl.h>
+#include <GL/glut.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <sys/stat.h>
@@ -65,10 +66,10 @@
 #include <simgear/screen/RenderTexture.h>
 #include "Scenery.hxx"
 #include <vector>
-#include STL_STRING
+#include <string>
+#include <iostream>
 
-SG_USING_STD(vector);
-SG_USING_STD(string);
+using namespace std;
 
 typedef vector<string> string_list;
 
diff -uNrp Atlas-0.3.1.orig/src/MapMaker.cxx Atlas-0.3.1.buildfixes/src/MapMaker.cxx
--- Atlas-0.3.1.orig/src/MapMaker.cxx	2005-09-29 21:18:01.000000000 +0200
+++ Atlas-0.3.1.buildfixes/src/MapMaker.cxx	2008-12-14 19:25:59.000000000 +0100
@@ -31,8 +31,12 @@
 #endif
 #include <sys/stat.h>
 #include <plib/ul.h>
+#include <iostream>
 
 #include "MapMaker.hxx"
+
+using namespace std;
+
 /*#include <simgear/magvar/magvar.hxx>*/
 
 // Utility function that I needed to put somewhere - this probably isn't the best place for it.
@@ -653,15 +657,13 @@ int MapMaker::process_binary_file( char 
 
   /* convert point_list of wgs84 nodes to a list of points transformed
      into the maps local coordinate system */
-  const point_list wgs84_nodes = tile.get_wgs84_nodes();
-  for ( point_list::const_iterator node = wgs84_nodes . begin(); 
-	node != wgs84_nodes . end();
-	node++ ) {
+  std::vector<SGVec3d> wgs84_nodes = tile.get_wgs84_nodes();
+  for ( i = 0; i < (int)wgs84_nodes.size(); ++i ) {
 
     float *nv = new sgVec3;
-    for (i = 0; i < 3; i++) {
-      tmp[i] = (*node)[i];
-    }
+    tmp[0] = wgs84_nodes[i].x();
+    tmp[1] = wgs84_nodes[i].y();
+    tmp[2] = wgs84_nodes[i].z();
     
     sgAddVec3(tmp, gbs);
     double pr = sgLengthVec3( tmp );
@@ -674,17 +676,15 @@ int MapMaker::process_binary_file( char 
   }
 
   // same as above for normals
-  const point_list m_norms = tile.get_normals();
-  for ( point_list::const_iterator normal = m_norms.begin(); 
-	normal != m_norms.end();
-	normal++ ) {
+  std::vector<SGVec3f> m_norms = tile.get_normals();
+  for ( i = 0; i < (int)m_norms.size(); ++i ) {
     // Make a new normal
     float *nn = new sgVec3;
     
-    for (i = 0; i < 3; i++) {
-      nn[i] = (*normal)[i];
-    }
-    
+    nn[0]=m_norms[i].x();
+    nn[1]=m_norms[i].y();
+    nn[2]=m_norms[i].z();
+
     n.push_back( nn );
     normals++;
   }
diff -uNrp Atlas-0.3.1.orig/src/MapMaker.hxx Atlas-0.3.1.buildfixes/src/MapMaker.hxx
--- Atlas-0.3.1.orig/src/MapMaker.hxx	2005-02-26 19:40:36.000000000 +0100
+++ Atlas-0.3.1.buildfixes/src/MapMaker.hxx	2008-12-14 19:21:14.000000000 +0100
@@ -31,15 +31,12 @@
 #include <vector>
 #include <list>
 #include <map>
-#include STL_STRING
+#include <string>
 
 #include "Output.hxx"
 #include "Overlays.hxx"
 #include "Geodesy.hxx"
 
-SG_USING_STD(vector);
-SG_USING_STD(string);
-
 // Utility function that I needed to put somewhere - this probably isn't the best place for it.
 // Appends a path separator to a directory path if not present.
 // Calling function MUST ENSURE that there is space allocated for the potential strcat.
diff -uNrp Atlas-0.3.1.orig/src/MapPS.cxx Atlas-0.3.1.buildfixes/src/MapPS.cxx
--- Atlas-0.3.1.orig/src/MapPS.cxx	2005-09-29 21:18:01.000000000 +0200
+++ Atlas-0.3.1.buildfixes/src/MapPS.cxx	2008-12-14 19:30:05.000000000 +0100
@@ -38,9 +38,9 @@
 #include "OutputPS.hxx"
 #include <plib/ul.h>
 #include "Scenery.hxx"
+#include <iostream>
 
-SG_USING_STD(vector);
-SG_USING_STD(string);
+using namespace std;
 
 typedef vector<string> string_list;
 
diff -uNrp Atlas-0.3.1.orig/src/OutputGL.hxx Atlas-0.3.1.buildfixes/src/OutputGL.hxx
--- Atlas-0.3.1.orig/src/OutputGL.hxx	2005-02-26 19:40:37.000000000 +0100
+++ Atlas-0.3.1.buildfixes/src/OutputGL.hxx	2008-12-09 16:24:17.000000000 +0100
@@ -2,7 +2,8 @@
 #define __OUTPUTGL_H__
 
 #include <simgear/compiler.h>
-#include SG_GLUT_H
+#include <GL/gl.h>
+#include <GL/glut.h>
 #include <plib/fnt.h>
 #include <plib/pu.h>
 #include "Output.hxx"
diff -uNrp Atlas-0.3.1.orig/src/Overlays.cxx Atlas-0.3.1.buildfixes/src/Overlays.cxx
--- Atlas-0.3.1.orig/src/Overlays.cxx	2006-10-26 13:56:25.000000000 +0200
+++ Atlas-0.3.1.buildfixes/src/Overlays.cxx	2008-12-14 19:13:40.000000000 +0100
@@ -27,7 +27,7 @@
 #include "Overlays.hxx"
 #include "Geodesy.hxx"
 
-SG_USING_STD(map);
+using namespace std;
 
 #ifdef _MSC_VER
 
diff -uNrp Atlas-0.3.1.orig/src/Overlays.hxx Atlas-0.3.1.buildfixes/src/Overlays.hxx
--- Atlas-0.3.1.orig/src/Overlays.hxx	2005-01-10 14:15:53.000000000 +0100
+++ Atlas-0.3.1.buildfixes/src/Overlays.hxx	2008-12-14 19:14:53.000000000 +0100
@@ -35,6 +35,8 @@
 #include "FlightTrack.hxx"
 #include "Projection.hxx"
 
+using namespace std;
+
 class Overlays {
 public:
   static const int OVERLAY_AIRPORTS    = 1 << 0;
diff -uNrp Atlas-0.3.1.orig/src/Scenery.cxx Atlas-0.3.1.buildfixes/src/Scenery.cxx
--- Atlas-0.3.1.orig/src/Scenery.cxx	2005-02-26 19:39:14.000000000 +0100
+++ Atlas-0.3.1.buildfixes/src/Scenery.cxx	2008-12-14 19:27:15.000000000 +0100
@@ -3,8 +3,7 @@
 
 #include "MapMaker.hxx"
 
-SG_USING_STD(vector);
-SG_USING_STD(string);
+using namespace std;
 
 typedef vector<string> string_list;
 


--- NEW FILE FlightGear-Atlas.spec ---
Name:		FlightGear-Atlas
Summary:	Flightgear map tools
Version:	0.3.1
Release:	10%{?dist}

License:	GPLv2+
Group:		Amusements/Games
Source0:	http://downloads.sourceforge.net/sourceforge/atlas/Atlas-%{version}.tar.gz
Source1:	Atlas-default-maps.tar.gz
Patch0:		FlightGear-Atlas-0.3.1-build-fixes.patch
URL:		http://atlas.sourceforge.net
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:	freeglut-devel, curl-devel, libpng-devel
BuildRequires:	SimGear-devel >= 1.9.0, OpenSceneGraph-devel
Requires:	FlightGear-data
Obsoletes:	fgfs-Atlas < 0.3.1-10

%description
Atlas aims to produce and display high quality charts of the world for
users of FlightGear, an open source flight simulator. This is achieved
through two main parts: The map creator (simply called Map) and the
Atlas viewer

%prep
%setup -q -n Atlas-%{version}
%patch0 -p1 -b .buildfixes
find -type f -name '*.[hc]xx' -exec chmod a-x {} \;

%build
%configure CXXFLAGS="$RPM_OPT_FLAGS -fPIC" --with-fgbase=%{_datadir}/FlightGear
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT%{_datadir}/FlightGear
tar zxf %{SOURCE1} -C $RPM_BUILD_ROOT%{_datadir}/FlightGear

# this script is buggy and duplicates a fonctionnality now included in
# the Atlas program
rm -f $RPM_BUILD_ROOT%{_bindir}/buildmaps.sh

# the palette file must be installed
install -m 0644 src/AtlasPalette $RPM_BUILD_ROOT%{_datadir}/FlightGear

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-, root, root, 0755)
%doc AUTHORS COPYING NEWS README
%{_bindir}/*
%{_datadir}/FlightGear/*

%changelog
* Tue Jan 06 2009 Fabrice Bellet <fabrice at bellet.info> 0.3.1-10
- new build fixes for newer SimGear

* Tue May 13 2008 Fabrice Bellet <fabrice at bellet.info> 0.3.1-9
- rebuild with newer plib

* Mon Feb  4 2008 Fabrice Bellet <fabrice at bellet.info> 0.3.1-8
- fix gcc43 build

* Mon Jan  7 2008 Fabrice Bellet <fabrice at bellet.info> 0.3.1-7
- rebuild with newer SimGear

* Sun Sep 23 2007 Fabrice Bellet <fabrice at bellet.info> 0.3.1-6
- update License tag

* Tue Aug 28 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 0.3.1-5
- Rebuild for selinux ppc32 issue.

* Wed Jun 27 2007 Fabrice Bellet <fabrice at bellet.info> 0.3.1-4
- Rebuild with newer version of SimGear
- Add the missing Palette file to the package
- Remove the buildmaps.sh script (the functionnality provided
  by this script is now part of the Atlas program)

* Mon Apr  2 2007 Fabrice Bellet <fabrice at bellet.info> 0.3.1-3
- Fixed duplicate BuildRequires

* Sun Apr  1 2007 Fabrice Bellet <fabrice at bellet.info> 0.3.1-2
- Rebuild with new SimGear

* Tue Mar 20 2007 Fabrice Bellet <fabrice at bellet.info> 0.3.1-1
- Initial packaging


--- NEW FILE import.log ---
FlightGear-Atlas-0_3_1-10_fc11:HEAD:FlightGear-Atlas-0.3.1-10.fc11.src.rpm:1231349040


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/FlightGear-Atlas/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	7 Jan 2009 01:33:21 -0000	1.1
+++ .cvsignore	7 Jan 2009 17:24:49 -0000	1.2
@@ -0,0 +1,2 @@
+Atlas-0.3.1.tar.gz
+Atlas-default-maps.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/FlightGear-Atlas/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	7 Jan 2009 01:33:21 -0000	1.1
+++ sources	7 Jan 2009 17:24:49 -0000	1.2
@@ -0,0 +1,2 @@
+15bba54523a29928a14f17af449f960e  Atlas-0.3.1.tar.gz
+eacd2574d952eb79f0adde7827d6b2cf  Atlas-default-maps.tar.gz



From mtasaka at fedoraproject.org  Wed Jan  7 17:41:38 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Wed,  7 Jan 2009 17:41:38 +0000 (UTC)
Subject: rpms/xtide/F-9 .cvsignore, 1.27, 1.28 sources, 1.27,
	1.28 xtide-get_harmonics-data.sh, 1.2, 1.3 xtide.spec, 1.40, 1.41
Message-ID: <20090107174138.5C6E570100@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/xtide/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14644/F-9

Modified Files:
	.cvsignore sources xtide-get_harmonics-data.sh xtide.spec 
Log Message:
* Thu Jan  8 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.10-3
- Update harmonics data to 20081228
- Update xtide-get_harmonics-data.sh following harmonics tarball 
  format change



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xtide/F-9/.cvsignore,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- .cvsignore	6 Feb 2008 13:46:03 -0000	1.27
+++ .cvsignore	7 Jan 2009 17:41:08 -0000	1.28
@@ -1,3 +1,2 @@
-Harminics-USpart-recreate-sh.tar.bz2
-harmonics-dwf-20071228-free.tcd.bz2
 xtide-2.10.tar.bz2
+harmonics-dwf-20081228-free.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xtide/F-9/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- sources	6 Feb 2008 13:46:03 -0000	1.27
+++ sources	7 Jan 2009 17:41:08 -0000	1.28
@@ -1,3 +1,2 @@
-83be2fa5c0c4bb3b264c9965803e409b  Harminics-USpart-recreate-sh.tar.bz2
-1f9802af5a1b17491b31b6c827b56bf3  harmonics-dwf-20071228-free.tcd.bz2
 a14d9db748a86bed37769f38c4320ddd  xtide-2.10.tar.bz2
+2e1ee564394a7b6f034f7f9be1ce5394  harmonics-dwf-20081228-free.tar.bz2


Index: xtide-get_harmonics-data.sh
===================================================================
RCS file: /cvs/extras/rpms/xtide/F-9/xtide-get_harmonics-data.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xtide-get_harmonics-data.sh	23 Nov 2007 13:45:57 -0000	1.2
+++ xtide-get_harmonics-data.sh	7 Jan 2009 17:41:08 -0000	1.3
@@ -1,20 +1,27 @@
 #!/bin/sh
 
-DATE=${DATE:-20071122}
+DATE=${DATE:-20081228}
 INSTALL_DIR=${INSTALL_DIR:-/usr/share/xtide-harmonics/}
 
-FILE=harmonics-dwf-${DATE}-nonfree.tcd.bz2
-INSTALLFILE=${FILE%.bz2}
+FILE=harmonics-dwf-${DATE}-nonfree.tar.bz2
+INSTALLFILE=${FILE%.tar.bz2}.tcd
 
 if [ "`id -u -n`" != "root" ] ; then
     echo "You must do this by root"
     exit 1
 fi
 
+TMPDIR=$(mktemp -d /tmp/xtide-XXXXXXX)
+cd $TMPDIR
+
 wget -N ftp://ftp.flaterco.com/xtide/$FILE || \
-    ( echo ; echo "Downloading failed." ; exit 1 )
+    { echo ; echo "Downloading failed." ; exit 1 ; }
 
-bzip2 -d $FILE
-mkdir -p $INSTALL_DIR
+bzip2 -dc $FILE | tar xf -
+mkdir -p -m 0755 $INSTALL_DIR
 install -m 644 $INSTALLFILE $INSTALL_DIR
-rm -f $INSTALLFILE
+cd
+rm -f $TMPDIR/harmonics*
+rmdir $TMPDIR
+
+echo "Installed $INSTALLFILE to $INSTALL_DIR."


Index: xtide.spec
===================================================================
RCS file: /cvs/extras/rpms/xtide/F-9/xtide.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- xtide.spec	6 Feb 2008 18:14:50 -0000	1.40
+++ xtide.spec	7 Jan 2009 17:41:08 -0000	1.41
@@ -1,9 +1,9 @@
 %define          mainver   2.10
 %undefine          betatag
-%define          dwfdate   20071228
+%define          dwfdate   20081228
 
 
-%define          fedorarel  2
+%define          fedorarel  3
 
 
 %define          rel        %{?betatag:0.}%{fedorarel}%{?betatag:.%betatag}
@@ -29,7 +29,7 @@
 #                     
 #Source40:        Harminics-USpart-recreate-sh.tar.bz2
 #Source41:        harmonics-dwf-%{dwfdate}-dump-US.tar.bz2
-Source42:        ftp://ftp.flaterco.com/xtide/harmonics-dwf-%{dwfdate}-free.tcd.bz2
+Source42:        ftp://ftp.flaterco.com/xtide/harmonics-dwf-%{dwfdate}-free.tar.bz2
 
 License:         GPLv3+
 Group:           Applications/Engineering
@@ -91,7 +91,8 @@
 Please read README.fedora for Fedora specific issue.
 
 %prep
-%setup -q -n %{name}-%{version}%{?betatag:-%betatag}
+%setup -q -T -c -n %{name}-%{version}%{?betatag:-%betatag}/TMPDIR -a 42
+%setup -q -D -n %{name}-%{version}%{?betatag:-%betatag}
 
 # Dstr -> Dstr.h
 set +x
@@ -106,12 +107,6 @@
 echo
 set -x
 
-%{__mkdir} TMPDIR
-pushd TMPDIR
-%{__cp} -p %{SOURCE42} .
-%{__bzip2} -d *.bz2
-popd
-
 %build
 %configure \
    --with-xttpd-user=xttpd \
@@ -145,7 +140,7 @@
 
 # xttpd treatment
 # xttpd is wrapped
-%{__sed} -e 's|20071122|%{dwfdate}|' %{SOURCE14} \
+%{__sed} -e 's|20081228|%{dwfdate}|' %{SOURCE14} \
    > xtide-get_harmonics-data.sh
 %{__install} -c -p -m 755 xtide-get_harmonics-data.sh \
    $RPM_BUILD_ROOT%{_sbindir}
@@ -247,6 +242,7 @@
 
 %files common
 %doc README.fedora
+%doc TMPDIR/harmonics_boilerplate.txt
 %config(noreplace) %{_sysconfdir}/%{name}.conf
 
 %dir %{_datadir}/%{name}
@@ -280,6 +276,11 @@
 %{_datadir}/man/man8/xttpd.8*
 
 %changelog
+* Thu Jan  8 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.10-3
+- Update harmonics data to 20081228
+- Update xtide-get_harmonics-data.sh following harmonics tarball 
+  format change
+
 * Thu Feb  7 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.10-2
 - Use system-wide libdstr (review request 431692 passed)
 



From mtasaka at fedoraproject.org  Wed Jan  7 17:41:38 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Wed,  7 Jan 2009 17:41:38 +0000 (UTC)
Subject: rpms/xtide/F-10 .cvsignore, 1.27, 1.28 sources, 1.27,
	1.28 xtide-get_harmonics-data.sh, 1.2, 1.3 xtide.spec, 1.40, 1.41
Message-ID: <20090107174138.23CD270100@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/xtide/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14644/F-10

Modified Files:
	.cvsignore sources xtide-get_harmonics-data.sh xtide.spec 
Log Message:
* Thu Jan  8 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.10-3
- Update harmonics data to 20081228
- Update xtide-get_harmonics-data.sh following harmonics tarball 
  format change



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xtide/F-10/.cvsignore,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- .cvsignore	6 Feb 2008 13:46:03 -0000	1.27
+++ .cvsignore	7 Jan 2009 17:41:07 -0000	1.28
@@ -1,3 +1,2 @@
-Harminics-USpart-recreate-sh.tar.bz2
-harmonics-dwf-20071228-free.tcd.bz2
 xtide-2.10.tar.bz2
+harmonics-dwf-20081228-free.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xtide/F-10/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- sources	6 Feb 2008 13:46:03 -0000	1.27
+++ sources	7 Jan 2009 17:41:07 -0000	1.28
@@ -1,3 +1,2 @@
-83be2fa5c0c4bb3b264c9965803e409b  Harminics-USpart-recreate-sh.tar.bz2
-1f9802af5a1b17491b31b6c827b56bf3  harmonics-dwf-20071228-free.tcd.bz2
 a14d9db748a86bed37769f38c4320ddd  xtide-2.10.tar.bz2
+2e1ee564394a7b6f034f7f9be1ce5394  harmonics-dwf-20081228-free.tar.bz2


Index: xtide-get_harmonics-data.sh
===================================================================
RCS file: /cvs/extras/rpms/xtide/F-10/xtide-get_harmonics-data.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xtide-get_harmonics-data.sh	23 Nov 2007 13:45:57 -0000	1.2
+++ xtide-get_harmonics-data.sh	7 Jan 2009 17:41:07 -0000	1.3
@@ -1,20 +1,27 @@
 #!/bin/sh
 
-DATE=${DATE:-20071122}
+DATE=${DATE:-20081228}
 INSTALL_DIR=${INSTALL_DIR:-/usr/share/xtide-harmonics/}
 
-FILE=harmonics-dwf-${DATE}-nonfree.tcd.bz2
-INSTALLFILE=${FILE%.bz2}
+FILE=harmonics-dwf-${DATE}-nonfree.tar.bz2
+INSTALLFILE=${FILE%.tar.bz2}.tcd
 
 if [ "`id -u -n`" != "root" ] ; then
     echo "You must do this by root"
     exit 1
 fi
 
+TMPDIR=$(mktemp -d /tmp/xtide-XXXXXXX)
+cd $TMPDIR
+
 wget -N ftp://ftp.flaterco.com/xtide/$FILE || \
-    ( echo ; echo "Downloading failed." ; exit 1 )
+    { echo ; echo "Downloading failed." ; exit 1 ; }
 
-bzip2 -d $FILE
-mkdir -p $INSTALL_DIR
+bzip2 -dc $FILE | tar xf -
+mkdir -p -m 0755 $INSTALL_DIR
 install -m 644 $INSTALLFILE $INSTALL_DIR
-rm -f $INSTALLFILE
+cd
+rm -f $TMPDIR/harmonics*
+rmdir $TMPDIR
+
+echo "Installed $INSTALLFILE to $INSTALL_DIR."


Index: xtide.spec
===================================================================
RCS file: /cvs/extras/rpms/xtide/F-10/xtide.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- xtide.spec	6 Feb 2008 18:14:50 -0000	1.40
+++ xtide.spec	7 Jan 2009 17:41:07 -0000	1.41
@@ -1,9 +1,9 @@
 %define          mainver   2.10
 %undefine          betatag
-%define          dwfdate   20071228
+%define          dwfdate   20081228
 
 
-%define          fedorarel  2
+%define          fedorarel  3
 
 
 %define          rel        %{?betatag:0.}%{fedorarel}%{?betatag:.%betatag}
@@ -29,7 +29,7 @@
 #                     
 #Source40:        Harminics-USpart-recreate-sh.tar.bz2
 #Source41:        harmonics-dwf-%{dwfdate}-dump-US.tar.bz2
-Source42:        ftp://ftp.flaterco.com/xtide/harmonics-dwf-%{dwfdate}-free.tcd.bz2
+Source42:        ftp://ftp.flaterco.com/xtide/harmonics-dwf-%{dwfdate}-free.tar.bz2
 
 License:         GPLv3+
 Group:           Applications/Engineering
@@ -91,7 +91,8 @@
 Please read README.fedora for Fedora specific issue.
 
 %prep
-%setup -q -n %{name}-%{version}%{?betatag:-%betatag}
+%setup -q -T -c -n %{name}-%{version}%{?betatag:-%betatag}/TMPDIR -a 42
+%setup -q -D -n %{name}-%{version}%{?betatag:-%betatag}
 
 # Dstr -> Dstr.h
 set +x
@@ -106,12 +107,6 @@
 echo
 set -x
 
-%{__mkdir} TMPDIR
-pushd TMPDIR
-%{__cp} -p %{SOURCE42} .
-%{__bzip2} -d *.bz2
-popd
-
 %build
 %configure \
    --with-xttpd-user=xttpd \
@@ -145,7 +140,7 @@
 
 # xttpd treatment
 # xttpd is wrapped
-%{__sed} -e 's|20071122|%{dwfdate}|' %{SOURCE14} \
+%{__sed} -e 's|20081228|%{dwfdate}|' %{SOURCE14} \
    > xtide-get_harmonics-data.sh
 %{__install} -c -p -m 755 xtide-get_harmonics-data.sh \
    $RPM_BUILD_ROOT%{_sbindir}
@@ -247,6 +242,7 @@
 
 %files common
 %doc README.fedora
+%doc TMPDIR/harmonics_boilerplate.txt
 %config(noreplace) %{_sysconfdir}/%{name}.conf
 
 %dir %{_datadir}/%{name}
@@ -280,6 +276,11 @@
 %{_datadir}/man/man8/xttpd.8*
 
 %changelog
+* Thu Jan  8 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.10-3
+- Update harmonics data to 20081228
+- Update xtide-get_harmonics-data.sh following harmonics tarball 
+  format change
+
 * Thu Feb  7 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.10-2
 - Use system-wide libdstr (review request 431692 passed)
 



From mtasaka at fedoraproject.org  Wed Jan  7 17:41:38 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Wed,  7 Jan 2009 17:41:38 +0000 (UTC)
Subject: rpms/xtide/devel .cvsignore, 1.27, 1.28 sources, 1.27,
	1.28 xtide-get_harmonics-data.sh, 1.2, 1.3 xtide.spec, 1.40, 1.41
Message-ID: <20090107174138.CB8DA70100@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/xtide/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14644/devel

Modified Files:
	.cvsignore sources xtide-get_harmonics-data.sh xtide.spec 
Log Message:
* Thu Jan  8 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.10-3
- Update harmonics data to 20081228
- Update xtide-get_harmonics-data.sh following harmonics tarball 
  format change



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xtide/devel/.cvsignore,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- .cvsignore	6 Feb 2008 13:46:03 -0000	1.27
+++ .cvsignore	7 Jan 2009 17:41:08 -0000	1.28
@@ -1,3 +1,2 @@
-Harminics-USpart-recreate-sh.tar.bz2
-harmonics-dwf-20071228-free.tcd.bz2
 xtide-2.10.tar.bz2
+harmonics-dwf-20081228-free.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xtide/devel/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- sources	6 Feb 2008 13:46:03 -0000	1.27
+++ sources	7 Jan 2009 17:41:08 -0000	1.28
@@ -1,3 +1,2 @@
-83be2fa5c0c4bb3b264c9965803e409b  Harminics-USpart-recreate-sh.tar.bz2
-1f9802af5a1b17491b31b6c827b56bf3  harmonics-dwf-20071228-free.tcd.bz2
 a14d9db748a86bed37769f38c4320ddd  xtide-2.10.tar.bz2
+2e1ee564394a7b6f034f7f9be1ce5394  harmonics-dwf-20081228-free.tar.bz2


Index: xtide-get_harmonics-data.sh
===================================================================
RCS file: /cvs/extras/rpms/xtide/devel/xtide-get_harmonics-data.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xtide-get_harmonics-data.sh	23 Nov 2007 13:45:57 -0000	1.2
+++ xtide-get_harmonics-data.sh	7 Jan 2009 17:41:08 -0000	1.3
@@ -1,20 +1,27 @@
 #!/bin/sh
 
-DATE=${DATE:-20071122}
+DATE=${DATE:-20081228}
 INSTALL_DIR=${INSTALL_DIR:-/usr/share/xtide-harmonics/}
 
-FILE=harmonics-dwf-${DATE}-nonfree.tcd.bz2
-INSTALLFILE=${FILE%.bz2}
+FILE=harmonics-dwf-${DATE}-nonfree.tar.bz2
+INSTALLFILE=${FILE%.tar.bz2}.tcd
 
 if [ "`id -u -n`" != "root" ] ; then
     echo "You must do this by root"
     exit 1
 fi
 
+TMPDIR=$(mktemp -d /tmp/xtide-XXXXXXX)
+cd $TMPDIR
+
 wget -N ftp://ftp.flaterco.com/xtide/$FILE || \
-    ( echo ; echo "Downloading failed." ; exit 1 )
+    { echo ; echo "Downloading failed." ; exit 1 ; }
 
-bzip2 -d $FILE
-mkdir -p $INSTALL_DIR
+bzip2 -dc $FILE | tar xf -
+mkdir -p -m 0755 $INSTALL_DIR
 install -m 644 $INSTALLFILE $INSTALL_DIR
-rm -f $INSTALLFILE
+cd
+rm -f $TMPDIR/harmonics*
+rmdir $TMPDIR
+
+echo "Installed $INSTALLFILE to $INSTALL_DIR."


Index: xtide.spec
===================================================================
RCS file: /cvs/extras/rpms/xtide/devel/xtide.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- xtide.spec	6 Feb 2008 18:14:50 -0000	1.40
+++ xtide.spec	7 Jan 2009 17:41:08 -0000	1.41
@@ -1,9 +1,9 @@
 %define          mainver   2.10
 %undefine          betatag
-%define          dwfdate   20071228
+%define          dwfdate   20081228
 
 
-%define          fedorarel  2
+%define          fedorarel  3
 
 
 %define          rel        %{?betatag:0.}%{fedorarel}%{?betatag:.%betatag}
@@ -29,7 +29,7 @@
 #                     
 #Source40:        Harminics-USpart-recreate-sh.tar.bz2
 #Source41:        harmonics-dwf-%{dwfdate}-dump-US.tar.bz2
-Source42:        ftp://ftp.flaterco.com/xtide/harmonics-dwf-%{dwfdate}-free.tcd.bz2
+Source42:        ftp://ftp.flaterco.com/xtide/harmonics-dwf-%{dwfdate}-free.tar.bz2
 
 License:         GPLv3+
 Group:           Applications/Engineering
@@ -91,7 +91,8 @@
 Please read README.fedora for Fedora specific issue.
 
 %prep
-%setup -q -n %{name}-%{version}%{?betatag:-%betatag}
+%setup -q -T -c -n %{name}-%{version}%{?betatag:-%betatag}/TMPDIR -a 42
+%setup -q -D -n %{name}-%{version}%{?betatag:-%betatag}
 
 # Dstr -> Dstr.h
 set +x
@@ -106,12 +107,6 @@
 echo
 set -x
 
-%{__mkdir} TMPDIR
-pushd TMPDIR
-%{__cp} -p %{SOURCE42} .
-%{__bzip2} -d *.bz2
-popd
-
 %build
 %configure \
    --with-xttpd-user=xttpd \
@@ -145,7 +140,7 @@
 
 # xttpd treatment
 # xttpd is wrapped
-%{__sed} -e 's|20071122|%{dwfdate}|' %{SOURCE14} \
+%{__sed} -e 's|20081228|%{dwfdate}|' %{SOURCE14} \
    > xtide-get_harmonics-data.sh
 %{__install} -c -p -m 755 xtide-get_harmonics-data.sh \
    $RPM_BUILD_ROOT%{_sbindir}
@@ -247,6 +242,7 @@
 
 %files common
 %doc README.fedora
+%doc TMPDIR/harmonics_boilerplate.txt
 %config(noreplace) %{_sysconfdir}/%{name}.conf
 
 %dir %{_datadir}/%{name}
@@ -280,6 +276,11 @@
 %{_datadir}/man/man8/xttpd.8*
 
 %changelog
+* Thu Jan  8 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.10-3
+- Update harmonics data to 20081228
+- Update xtide-get_harmonics-data.sh following harmonics tarball 
+  format change
+
 * Thu Feb  7 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.10-2
 - Use system-wide libdstr (review request 431692 passed)
 



From bellet at fedoraproject.org  Wed Jan  7 17:53:00 2009
From: bellet at fedoraproject.org (Fabrice Bellet)
Date: Wed,  7 Jan 2009 17:53:00 +0000 (UTC)
Subject: rpms/FlightGear/devel .cvsignore, 1.4, 1.5 FlightGear.spec, 1.9,
	1.10 sources, 1.4, 1.5
Message-ID: <20090107175300.6A76670100@cvs1.fedora.phx.redhat.com>

Author: bellet

Update of /cvs/extras/rpms/FlightGear/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16175

Modified Files:
	.cvsignore FlightGear.spec sources 
Log Message:
* Tue Jan 06 2009 Fabrice Bellet <fabrice at bellet.info> 1.9.0-1
- new upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/FlightGear/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	7 Jan 2008 21:58:29 -0000	1.4
+++ .cvsignore	7 Jan 2009 17:52:29 -0000	1.5
@@ -1 +1 @@
-FlightGear-1.0.0.tar.gz
+FlightGear-1.9.0.tar.gz


Index: FlightGear.spec
===================================================================
RCS file: /cvs/extras/rpms/FlightGear/devel/FlightGear.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- FlightGear.spec	6 Oct 2008 09:01:19 -0000	1.9
+++ FlightGear.spec	7 Jan 2009 17:52:30 -0000	1.10
@@ -1,7 +1,7 @@
 Name:		FlightGear
 Summary:	The FlightGear Flight Simulator
-Version:	1.0.0
-Release:	4%{?dist}
+Version:	1.9.0
+Release:	1%{?dist}
 
 License:	GPLv2+
 Group:		Amusements/Games
@@ -16,9 +16,10 @@
 Patch0:		FlightGear-0.9.10-no-automake-in-configure.patch
 URL:		http://www.flightgear.org/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:	openal-devel, SimGear-devel >= 1.0.0, freeglut-devel
+BuildRequires:	openal-devel, SimGear-devel >= %{version}, freeglut-devel
+BuildRequires:	OpenSceneGraph-devel >= 2.6.0, boost-devel >= 1.34.0
 BuildRequires:	desktop-file-utils
-Requires:	fgfs-base = %{version}, opengl-games-utils
+Requires:	FlightGear-data = %{version}, opengl-games-utils
 
 %description
 The Flight Gear project is working to create a sophisticated flight
@@ -33,7 +34,13 @@
 # make rpmlint happy
 find -name \*.h -o -name \*.cpp -o -name \*.cxx -o -name \*.hxx \
 	-o -name \*.hpp |xargs chmod -x
-rm -f docs-mini/FlightGear-FAQ.html.~1.3.~
+rm -f docs-mini/README.electrical.~1.5.~ \
+	docs-mini/README.xmlsound.~1.1.1.1.~
+for f in docs-mini/README.xmlparticles Thanks
+do
+	iconv -f iso-8859-1 -t utf-8 -o ${f}.utf8 ${f}
+	mv -f ${f}.utf8 ${f}
+done
 sed -i 's/\r//' docs-mini/AptNavFAQ.FlightGear.html
 # remove some unneeded files for %doc
 for ext in Cygwin IRIX Joystick Linux MSVC MSVC8 MacOS SimGear Unix \
@@ -102,6 +109,9 @@
 %{_datadir}/icons/hicolor/*/apps/*
 
 %changelog
+* Tue Jan 06 2009 Fabrice Bellet <fabrice at bellet.info> 1.9.0-1
+- new upstream release
+
 * Sun Oct  5 2008 Fabrice Bellet <fabrice at bellet.info> 1.0.0-4
 - fixed category of the menu entry (rh#465698)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/FlightGear/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	7 Jan 2008 21:58:29 -0000	1.4
+++ sources	7 Jan 2009 17:52:30 -0000	1.5
@@ -1 +1 @@
-fd960c6c8c537bdb8764c111ad4b1356  FlightGear-1.0.0.tar.gz
+b9eb97efd5c42a37e64cb228fdcdf13b  FlightGear-1.9.0.tar.gz



From sharkcz at fedoraproject.org  Wed Jan  7 17:59:14 2009
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Wed,  7 Jan 2009 17:59:14 +0000 (UTC)
Subject: rpms/tryton/devel .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 tryton.spec,
	1.1, 1.2
Message-ID: <20090107175914.AC7A67013F@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/tryton/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17182

Modified Files:
	.cvsignore sources tryton.spec 
Log Message:
* Wed Jan  7 2009 Dan Hor??k <dan[at]danny.cz> 1.0.2-1
- update to upstream version 1.0.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/tryton/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	31 Dec 2008 18:12:17 -0000	1.2
+++ .cvsignore	7 Jan 2009 17:58:44 -0000	1.3
@@ -1 +1 @@
-tryton-1.0.1.tar.gz
+tryton-1.0.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tryton/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	31 Dec 2008 18:12:17 -0000	1.2
+++ sources	7 Jan 2009 17:58:44 -0000	1.3
@@ -1 +1 @@
-35c76be93c2a8a0fd5c1b51eae88280c  tryton-1.0.1.tar.gz
+4391876eb92b972d0594a48569c38cae  tryton-1.0.2.tar.gz


Index: tryton.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tryton/devel/tryton.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tryton.spec	31 Dec 2008 18:12:17 -0000	1.1
+++ tryton.spec	7 Jan 2009 17:58:44 -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:           tryton
-Version:        1.0.1
-Release:        2%{?dist}
+Version:        1.0.2
+Release:        1%{?dist}
 Summary:        Client for the Tryton application framework
 
 Group:          Applications/Productivity
@@ -56,6 +56,9 @@
 
 
 %changelog
+* Wed Jan  7 2009 Dan Hor??k <dan[at]danny.cz> 1.0.2-1
+- update to upstream version 1.0.2
+
 * Mon Dec 29 2008 Dan Hor??k <dan[at]danny.cz> 1.0.1-2
 - set vendor for the desktop file
 - improve Description



From steved at fedoraproject.org  Wed Jan  7 17:59:19 2009
From: steved at fedoraproject.org (Steve Dickson)
Date: Wed,  7 Jan 2009 17:59:19 +0000 (UTC)
Subject: rpms/nfs-utils/devel nfs-utils-1.1.4-configure-tirpc.patch, NONE,
	1.1 nfs-utils.spec, 1.206, 1.207
Message-ID: <20090107175919.23B2170100@cvs1.fedora.phx.redhat.com>

Author: steved

Update of /cvs/pkgs/rpms/nfs-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17090

Modified Files:
	nfs-utils.spec 
Added Files:
	nfs-utils-1.1.4-configure-tirpc.patch 
Log Message:
- configure: Remove inet_ntop(3) check from configure.ac
- configure: Add new build option "--enable-tirpc"
- showmount command: Quiesce warning when TI-RPC is disabled



nfs-utils-1.1.4-configure-tirpc.patch:

--- NEW FILE nfs-utils-1.1.4-configure-tirpc.patch ---
commit aee8b1ab778f8e07b30305f10d4f9427023e314d
Author: Chuck Lever <chuck.lever at oracle.com>
Date:   Wed Jan 7 12:06:14 2009 -0500

    configure: Remove inet_ntop(3) check from configure.ac
    
    nfs-utils no longer uses inet_ntop(3) so remove checks for it from
    configure.ac.

commit ba05418f589c2d01f4e7e44c70d4844f43511927
Author: Chuck Lever <chuck.lever at oracle.com>
Date:   Wed Jan 7 12:18:11 2009 -0500

    configure: Add new build option "--enable-tirpc"
    
    Allow easier testing of nfs-utils in legacy environments by providing
    a "configure" option to force the build not to use libtirpc, even if
    it's present on the build system.  This can also be tried as a
    fallback if problems are found with the new TI-RPC-based nfs-utils
    code.
    
    The new option is:
    
      --enable-tirpc          enable use of TI-RPC [default=no]
    
    Build option matrix:
    
       --disable-tirpc   --disable-ipv6	Default; IPv4 only, glibc RPC
       --disable-tirpc   --enable-ipv6	'configure' will fail
       --enable-tirpc    --disable-ipv6	IPv4 only, TI-RPC
       --enable-tirpc    --enable-ipv6	IPv4 and IPv6, TI-RPC
    
commit 29ac873f9024c8fcbca38ab09ba54cda3765b746
Author: Chuck Lever <chuck.lever at oracle.com>
Date:   Wed Jan 7 12:33:09 2009 -0500

    showmount command: Quiesce warning when TI-RPC is disabled
    
    Make sure nfs_sm_pgmtbl is not compiled if TI-RPC functions are not
    available.  This quiesces the following compiler warning:
    
      showmount.c:53: warning: nfs_sm_pgmtbl defined but not used

diff -up nfs-utils-1.1.4/configure.ac.save nfs-utils-1.1.4/configure.ac
--- nfs-utils-1.1.4/configure.ac.save	2009-01-07 12:52:29.000000000 -0500
+++ nfs-utils-1.1.4/configure.ac	2009-01-07 12:52:50.000000000 -0500
@@ -131,6 +131,14 @@ AC_ARG_ENABLE(ipv6,
 	AC_SUBST(enable_ipv6)
 	AM_CONDITIONAL(CONFIG_IPV6, [test "$enable_ipv6" = "yes"])
 
+AC_ARG_ENABLE(tirpc,
+	[AC_HELP_STRING([--enable-tirpc],
+                        [enable use of TI-RPC @<:@default=no@:>@])],
+	enable_tirpc=$enableval,
+	enable_tirpc=no)
+	AC_SUBST(enable_tirpc)
+	AM_CONDITIONAL(CONFIG_TIRPC, [test "$enable_tirpc" = "yes"])
+
 # Check whether user wants TCP wrappers support
 AC_TCP_WRAPPERS
 
@@ -251,15 +259,22 @@ AC_CHECK_DECL([AI_ADDRCONFIG],
                          [Define this to 1 if AI_ADDRCONFIG macro is defined]), ,
               [ #include <netdb.h> ] )
 
+if test "$enable_tirpc" = yes; then
+  AC_CHECK_LIB(tirpc, clnt_tli_create, ,
+           AC_MSG_ERROR([libtirpc not found.]))
+  AC_CHECK_HEADERS(tirpc/netconfig.h, ,
+                   AC_MSG_ERROR([libtirpc headers not found.]))
+  AC_CHECK_FUNCS([bindresvport_sa getnetconfig \
+                  clnt_create clnt_create_timed \
+                  clnt_vc_create clnt_dg_create xdr_rpcb])
+fi
+
 if test "$enable_ipv6" = yes; then
-  AC_CHECK_FUNC(inet_ntop, , ,
-               AC_MSG_ERROR(Function 'inet_ntop' not found.))
+  if test "$enable_tirpc" = no; then
+    AC_MSG_ERROR('--enable-ipv6' requires '--enable-tirpc'.)
+  fi
   AC_CHECK_FUNC(getnameinfo, , ,
                AC_MSG_ERROR(Function 'getnameinfo' not found.))
-  AC_CHECK_LIB(tirpc, clnt_tli_create, ,
-               AC_MSG_ERROR([libtirpc needed for IPv6 support]))
-  AC_CHECK_HEADERS(tirpc/netconfig.h, ,
-               AC_MSG_ERROR([libtirpc headers needed for IPv6 support]))
   AC_CHECK_DECL([AI_ADDRCONFIG], ,
                AC_MSG_ERROR([full getaddrinfo(3) implementation needed for IPv6 support]),
                [ #include <netdb.h> ] )
@@ -273,7 +288,7 @@ AC_CHECK_HEADERS([arpa/inet.h fcntl.h li
                  stdlib.h string.h sys/file.h sys/ioctl.h sys/mount.h \
                  sys/param.h sys/socket.h sys/time.h sys/vfs.h \
                  syslog.h unistd.h com_err.h et/com_err.h \
-                 ifaddrs.h tirpc/netconfig.h])
+                 ifaddrs.h])
 
 dnl *************************************************************
 dnl Checks for typedefs, structures, and compiler characteristics
@@ -309,10 +324,7 @@ AC_FUNC_STAT
 AC_FUNC_VPRINTF
 AC_CHECK_FUNCS([alarm atexit dup2 fdatasync ftruncate getcwd \
                gethostbyaddr gethostbyname gethostname getmntent \
-               inet_ntop getnameinfo getrpcbyname \
-               bindresvport_sa getnetconfig \
-               clnt_create clnt_create_timed \
-               clnt_tli_create clnt_vc_create clnt_dg_create xdr_rpcb \
+               getnameinfo getrpcbyname \
                gettimeofday hasmntopt inet_ntoa innetgr memset mkdir pathconf \
                realpath rmdir select socket strcasecmp strchr strdup \
                strerror strrchr strtol strtoul sigprocmask])
diff -up nfs-utils-1.1.4/utils/showmount/showmount.c.save nfs-utils-1.1.4/utils/showmount/showmount.c
--- nfs-utils-1.1.4/utils/showmount/showmount.c.save	2009-01-07 12:53:26.000000000 -0500
+++ nfs-utils-1.1.4/utils/showmount/showmount.c	2009-01-07 12:53:37.000000000 -0500
@@ -50,13 +50,6 @@ static int	aflag = 0;
 static int	dflag = 0;
 static int	eflag = 0;
 
-static const char *nfs_sm_pgmtbl[] = {
-	"showmount",
-	"mount",
-	"mountd",
-	NULL,
-};
-
 static struct option longopts[] =
 {
 	{ "all", 0, 0, 'a' },
@@ -87,6 +80,13 @@ static void usage(FILE *fp, int n)
 
 #ifdef HAVE_CLNT_CREATE
 
+static const char *nfs_sm_pgmtbl[] = {
+	"showmount",
+	"mount",
+	"mountd",
+	NULL,
+};
+
 /*
  * Generate an RPC client handle connected to the mountd service
  * at @hostname, or die trying.


Index: nfs-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nfs-utils/devel/nfs-utils.spec,v
retrieving revision 1.206
retrieving revision 1.207
diff -u -r1.206 -r1.207
--- nfs-utils.spec	6 Jan 2009 18:01:35 -0000	1.206
+++ nfs-utils.spec	7 Jan 2009 17:58:48 -0000	1.207
@@ -2,7 +2,7 @@
 Name: nfs-utils
 URL: http://sourceforge.net/projects/nfs
 Version: 1.1.4
-Release: 11%{?dist}
+Release: 12%{?dist}
 Epoch: 1
 
 # group all 32bit related archs
@@ -43,6 +43,7 @@
 Patch114: nfs-utils-1.1.4-gssd-verbosity.patch
 Patch115: nfs-utils-1.1.4-mount-addrconfig.patch
 Patch116: nfs-utils-1.1.4-configure-uuid.patch
+Patch117: nfs-utils-1.1.4-configure-tirpc.patch
 
 %if %{enablefscache}
 Patch90: nfs-utils-1.1.0-mount-fsc.patch
@@ -114,6 +115,7 @@
 %patch114 -p1
 %patch115 -p1
 %patch116 -p1
+%patch117 -p1
 
 %if %{enablefscache}
 %patch90 -p1
@@ -277,6 +279,11 @@
 %attr(4755,root,root)   /sbin/umount.nfs4
 
 %changelog
+* Wed Jan  7 2009 Steve Dickson <steved at redhat.com> 1.1.4-12
+- configure: Remove inet_ntop(3) check from configure.ac
+- configure: Add new build option "--enable-tirpc"
+- showmount command: Quiesce warning when TI-RPC is disabled
+
 * Sat Jan  3 2009 Steve Dickson <steved at redhat.com> 1.1.4-11
 - Added warnings to tcp wrapper code when mounts are 
   denied due to misconfigured DNS configurations.



From tanguy at fedoraproject.org  Wed Jan  7 18:03:54 2009
From: tanguy at fedoraproject.org (Eric Tanguy)
Date: Wed,  7 Jan 2009 18:03:54 +0000 (UTC)
Subject: rpms/scidavis/devel scidavis.spec,1.8,1.9
Message-ID: <20090107180354.8937470100@cvs1.fedora.phx.redhat.com>

Author: tanguy

Update of /cvs/extras/rpms/scidavis/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18347

Modified Files:
	scidavis.spec 
Log Message:



Index: scidavis.spec
===================================================================
RCS file: /cvs/extras/rpms/scidavis/devel/scidavis.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- scidavis.spec	7 Jan 2009 14:51:17 -0000	1.8
+++ scidavis.spec	7 Jan 2009 18:03:24 -0000	1.9
@@ -1,13 +1,12 @@
 Summary:	Scientific Data Analysis and Visualization
 Name:		scidavis
 Version:	0.1.3
-Release: 	4%{?dist}
+Release: 	5%{?dist}
 Source0:	http://download.sourceforge.net/sourceforge/scidavis/%{name}-%{version}.tar.bz2
 Source1:	http://download.sourceforge.net/sourceforge/scidavis/scidavis-manual-0.1_2008-02-28.tar.bz2
 Patch0:		scidavis-0.1.3-pro.patch
-Patch1:		scidavis-0.1.3-python26.patch
 # 		http://bugzilla.redhat.com/479118
-Patch2:		scidavis-0.1.3-sip.patch	
+Patch1:		scidavis-0.1.3-sip.patch	
 URL:		http://scidavis.sourceforge.net/
 License:	GPLv2
 Group: 		Applications/Engineering
@@ -32,15 +31,15 @@
 %prep
 %setup -q -a 1
 %patch0 -p1
-%patch1 -p1
-%patch2 -p1 -b .bz#479118
+%patch1 -p1 -b .bz#479118
 
 sed -i -e 's/x-sciprj/x-sciprj;/' scidavis/scidavis.desktop
 sed -i -e 's/50/100/' scidavis/scidavis.xml
 
 %build
 qmake-qt4 scidavis.pro
-make %{?_smp_mflags}
+#make %{?_smp_mflags}
+make
 
 %install
 rm -rf %{buildroot}
@@ -102,6 +101,9 @@
 %doc manual/*
 
 %changelog
+* Wed Jan 07 2009 Eric Tanguy <eric.tanguy at univ-nantes.fr> - 0.1.3-5
+- Rebuild
+
 * Wed Jan 07 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.1.3-4
 - sip patch (#479118)
 



From tanguy at fedoraproject.org  Wed Jan  7 18:05:04 2009
From: tanguy at fedoraproject.org (Eric Tanguy)
Date: Wed,  7 Jan 2009 18:05:04 +0000 (UTC)
Subject: rpms/scidavis/devel scidavis.spec,1.9,1.10
Message-ID: <20090107180504.9F9CB70100@cvs1.fedora.phx.redhat.com>

Author: tanguy

Update of /cvs/extras/rpms/scidavis/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18568

Modified Files:
	scidavis.spec 
Log Message:



Index: scidavis.spec
===================================================================
RCS file: /cvs/extras/rpms/scidavis/devel/scidavis.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- scidavis.spec	7 Jan 2009 18:03:24 -0000	1.9
+++ scidavis.spec	7 Jan 2009 18:04:34 -0000	1.10
@@ -38,8 +38,7 @@
 
 %build
 qmake-qt4 scidavis.pro
-#make %{?_smp_mflags}
-make
+make %{?_smp_mflags}
 
 %install
 rm -rf %{buildroot}



From chitlesh at fedoraproject.org  Wed Jan  7 18:05:14 2009
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Wed,  7 Jan 2009 18:05:14 +0000 (UTC)
Subject: rpms/perl-Verilog/F-9 import.log, NONE, 1.1 perl-Verilog.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090107180514.298D770100@cvs1.fedora.phx.redhat.com>

Author: chitlesh

Update of /cvs/pkgs/rpms/perl-Verilog/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18637/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-Verilog.spec 
Log Message:
new package


--- NEW FILE import.log ---
perl-Verilog-3_100-1_fc10:F-9:perl-Verilog-3.100-1.fc10.src.rpm:1231351418


--- NEW FILE perl-Verilog.spec ---
Name:          perl-Verilog
Version:       3.100
Release:       1%{?dist}
Summary:       Verilog parsing routines

License:       LGPL+ or Artistic
Group:         Applications/Engineering

Url:           http://www.veripool.org/wiki/verilog-perl
Source0:       http://search.cpan.org/CPAN/authors/id/W/WS/WSNYDER/Verilog-Perl-%{version}.tar.gz

BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires: perl(Test::Pod)
BuildRequires: perl(ExtUtils::MakeMaker)
BuildRequires: gdbm-devel
BuildRequires: flex bison

Requires:      perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))


%description
This package provides functions to support writing utilities
that use the Verilog language.

%prep
%setup -q -n Verilog-Perl-%{version}

%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 {} ';'
find %{buildroot} -type f -name '*.bs' -size 0 -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 COPYING README verilog/
%{_bindir}/*
%dir %{perl_vendorarch}/Verilog
%{perl_vendorarch}/Verilog/*
%dir %{perl_vendorarch}/auto/Verilog
%{perl_vendorarch}/auto/Verilog/*
%{_mandir}/man?/*


%changelog
* Sat Jan 03 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> 3.100-1
- upstream v3.100
- removed patch for rawhide's bison

* Sat Dec 20 2008 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> 3.045-1
- upstream v3.045
- updated to the recommendations of #476386-c3

* Sun Dec 14 2008 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> 3.044-2
- Added Bison and flex as BR
- fixed the arch build

* Sat Dec 06 2008 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> 3.044-1
- Initial package for fedora

Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Verilog/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	7 Jan 2009 01:29:17 -0000	1.1
+++ .cvsignore	7 Jan 2009 18:04:43 -0000	1.2
@@ -0,0 +1 @@
+Verilog-Perl-3.100.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Verilog/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	7 Jan 2009 01:29:17 -0000	1.1
+++ sources	7 Jan 2009 18:04:43 -0000	1.2
@@ -0,0 +1 @@
+d4bf1748258c6df43db91c74a1fc9268  Verilog-Perl-3.100.tar.gz



From tanguy at fedoraproject.org  Wed Jan  7 18:07:12 2009
From: tanguy at fedoraproject.org (Eric Tanguy)
Date: Wed,  7 Jan 2009 18:07:12 +0000 (UTC)
Subject: rpms/scidavis/devel scidavis-0.1.3-python26.patch,1.1,NONE
Message-ID: <20090107180712.3EFEB70100@cvs1.fedora.phx.redhat.com>

Author: tanguy

Update of /cvs/extras/rpms/scidavis/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19084

Removed Files:
	scidavis-0.1.3-python26.patch 
Log Message:



--- scidavis-0.1.3-python26.patch DELETED ---



From chitlesh at fedoraproject.org  Wed Jan  7 18:07:20 2009
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Wed,  7 Jan 2009 18:07:20 +0000 (UTC)
Subject: rpms/perl-Verilog/F-10 import.log, NONE, 1.1 perl-Verilog.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090107180720.9B90770100@cvs1.fedora.phx.redhat.com>

Author: chitlesh

Update of /cvs/pkgs/rpms/perl-Verilog/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19011/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-Verilog.spec 
Log Message:
new package


--- NEW FILE import.log ---
perl-Verilog-3_100-1_fc10:F-10:perl-Verilog-3.100-1.fc10.src.rpm:1231351547


--- NEW FILE perl-Verilog.spec ---
Name:          perl-Verilog
Version:       3.100
Release:       1%{?dist}
Summary:       Verilog parsing routines

License:       LGPL+ or Artistic
Group:         Applications/Engineering

Url:           http://www.veripool.org/wiki/verilog-perl
Source0:       http://search.cpan.org/CPAN/authors/id/W/WS/WSNYDER/Verilog-Perl-%{version}.tar.gz

BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires: perl(Test::Pod)
BuildRequires: perl(ExtUtils::MakeMaker)
BuildRequires: gdbm-devel
BuildRequires: flex bison

Requires:      perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))


%description
This package provides functions to support writing utilities
that use the Verilog language.

%prep
%setup -q -n Verilog-Perl-%{version}

%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 {} ';'
find %{buildroot} -type f -name '*.bs' -size 0 -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 COPYING README verilog/
%{_bindir}/*
%dir %{perl_vendorarch}/Verilog
%{perl_vendorarch}/Verilog/*
%dir %{perl_vendorarch}/auto/Verilog
%{perl_vendorarch}/auto/Verilog/*
%{_mandir}/man?/*


%changelog
* Sat Jan 03 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> 3.100-1
- upstream v3.100
- removed patch for rawhide's bison

* Sat Dec 20 2008 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> 3.045-1
- upstream v3.045
- updated to the recommendations of #476386-c3

* Sun Dec 14 2008 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> 3.044-2
- Added Bison and flex as BR
- fixed the arch build

* Sat Dec 06 2008 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> 3.044-1
- Initial package for fedora

Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Verilog/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	7 Jan 2009 01:29:17 -0000	1.1
+++ .cvsignore	7 Jan 2009 18:06:50 -0000	1.2
@@ -0,0 +1 @@
+Verilog-Perl-3.100.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Verilog/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	7 Jan 2009 01:29:17 -0000	1.1
+++ sources	7 Jan 2009 18:06:50 -0000	1.2
@@ -0,0 +1 @@
+d4bf1748258c6df43db91c74a1fc9268  Verilog-Perl-3.100.tar.gz



From chitlesh at fedoraproject.org  Wed Jan  7 18:09:05 2009
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Wed,  7 Jan 2009 18:09:05 +0000 (UTC)
Subject: rpms/perl-Verilog/EL-5 import.log, NONE, 1.1 perl-Verilog.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090107180905.D3D5570100@cvs1.fedora.phx.redhat.com>

Author: chitlesh

Update of /cvs/pkgs/rpms/perl-Verilog/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19526/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-Verilog.spec 
Log Message:
new package


--- NEW FILE import.log ---
perl-Verilog-3_100-1_fc10:EL-5:perl-Verilog-3.100-1.fc10.src.rpm:1231351639


--- NEW FILE perl-Verilog.spec ---
Name:          perl-Verilog
Version:       3.100
Release:       1%{?dist}
Summary:       Verilog parsing routines

License:       LGPL+ or Artistic
Group:         Applications/Engineering

Url:           http://www.veripool.org/wiki/verilog-perl
Source0:       http://search.cpan.org/CPAN/authors/id/W/WS/WSNYDER/Verilog-Perl-%{version}.tar.gz

BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires: perl(Test::Pod)
BuildRequires: perl(ExtUtils::MakeMaker)
BuildRequires: gdbm-devel
BuildRequires: flex bison

Requires:      perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))


%description
This package provides functions to support writing utilities
that use the Verilog language.

%prep
%setup -q -n Verilog-Perl-%{version}

%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 {} ';'
find %{buildroot} -type f -name '*.bs' -size 0 -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 COPYING README verilog/
%{_bindir}/*
%dir %{perl_vendorarch}/Verilog
%{perl_vendorarch}/Verilog/*
%dir %{perl_vendorarch}/auto/Verilog
%{perl_vendorarch}/auto/Verilog/*
%{_mandir}/man?/*


%changelog
* Sat Jan 03 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> 3.100-1
- upstream v3.100
- removed patch for rawhide's bison

* Sat Dec 20 2008 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> 3.045-1
- upstream v3.045
- updated to the recommendations of #476386-c3

* Sun Dec 14 2008 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> 3.044-2
- Added Bison and flex as BR
- fixed the arch build

* Sat Dec 06 2008 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> 3.044-1
- Initial package for fedora

Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Verilog/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	7 Jan 2009 01:29:17 -0000	1.1
+++ .cvsignore	7 Jan 2009 18:08:35 -0000	1.2
@@ -0,0 +1 @@
+Verilog-Perl-3.100.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Verilog/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	7 Jan 2009 01:29:17 -0000	1.1
+++ sources	7 Jan 2009 18:08:35 -0000	1.2
@@ -0,0 +1 @@
+d4bf1748258c6df43db91c74a1fc9268  Verilog-Perl-3.100.tar.gz



From chitlesh at fedoraproject.org  Wed Jan  7 18:11:10 2009
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Wed,  7 Jan 2009 18:11:10 +0000 (UTC)
Subject: rpms/perl-Verilog/devel import.log, NONE, 1.1 perl-Verilog.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090107181110.951E770100@cvs1.fedora.phx.redhat.com>

Author: chitlesh

Update of /cvs/pkgs/rpms/perl-Verilog/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19924/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-Verilog.spec 
Log Message:
new package


--- NEW FILE import.log ---
perl-Verilog-3_100-1_fc10:HEAD:perl-Verilog-3.100-1.fc10.src.rpm:1231351758


--- NEW FILE perl-Verilog.spec ---
Name:          perl-Verilog
Version:       3.100
Release:       1%{?dist}
Summary:       Verilog parsing routines

License:       LGPL+ or Artistic
Group:         Applications/Engineering

Url:           http://www.veripool.org/wiki/verilog-perl
Source0:       http://search.cpan.org/CPAN/authors/id/W/WS/WSNYDER/Verilog-Perl-%{version}.tar.gz

BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires: perl(Test::Pod)
BuildRequires: perl(ExtUtils::MakeMaker)
BuildRequires: gdbm-devel
BuildRequires: flex bison

Requires:      perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))


%description
This package provides functions to support writing utilities
that use the Verilog language.

%prep
%setup -q -n Verilog-Perl-%{version}

%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 {} ';'
find %{buildroot} -type f -name '*.bs' -size 0 -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 COPYING README verilog/
%{_bindir}/*
%dir %{perl_vendorarch}/Verilog
%{perl_vendorarch}/Verilog/*
%dir %{perl_vendorarch}/auto/Verilog
%{perl_vendorarch}/auto/Verilog/*
%{_mandir}/man?/*


%changelog
* Sat Jan 03 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> 3.100-1
- upstream v3.100
- removed patch for rawhide's bison

* Sat Dec 20 2008 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> 3.045-1
- upstream v3.045
- updated to the recommendations of #476386-c3

* Sun Dec 14 2008 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> 3.044-2
- Added Bison and flex as BR
- fixed the arch build

* Sat Dec 06 2008 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> 3.044-1
- Initial package for fedora

Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Verilog/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	7 Jan 2009 01:29:17 -0000	1.1
+++ .cvsignore	7 Jan 2009 18:10:40 -0000	1.2
@@ -0,0 +1 @@
+Verilog-Perl-3.100.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Verilog/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	7 Jan 2009 01:29:17 -0000	1.1
+++ sources	7 Jan 2009 18:10:40 -0000	1.2
@@ -0,0 +1 @@
+d4bf1748258c6df43db91c74a1fc9268  Verilog-Perl-3.100.tar.gz



From tanguy at fedoraproject.org  Wed Jan  7 18:20:46 2009
From: tanguy at fedoraproject.org (Eric Tanguy)
Date: Wed,  7 Jan 2009 18:20:46 +0000 (UTC)
Subject: rpms/scidavis/F-10 scidavis-0.1.3-sip.patch, NONE, 1.1 scidavis.spec,
	1.4, 1.5
Message-ID: <20090107182046.3701D70100@cvs1.fedora.phx.redhat.com>

Author: tanguy

Update of /cvs/extras/rpms/scidavis/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20894

Modified Files:
	scidavis.spec 
Added Files:
	scidavis-0.1.3-sip.patch 
Log Message:


scidavis-0.1.3-sip.patch:

--- NEW FILE scidavis-0.1.3-sip.patch ---
--- scidavis-0.1.3.orig/scidavis/src/scidavis.sip	2007-07-21 21:32:13.000000000 +0100
+++ scidavis-0.1.3/scidavis/src/scidavis.sip	2009-01-07 11:12:51.000000000 +0000
@@ -78,8 +78,6 @@
   MyWidget(const MyWidget&);
 };
 
-typedef QList<MyWidget*> MDIWindowList;
-
 class Table: MyWidget
 {
 %TypeHeaderCode
@@ -1027,7 +1025,6 @@
   SIPSCIDAVIS_APP(new sipInterpolation(app, a0, *a1, a2, a3, a4))
 %End
 
-  void setMethod(int n);
   void setMethod(InterpolationMethod m);
   bool run();
 };
@@ -1051,7 +1048,6 @@
   SIPSCIDAVIS_APP(new sipSmoothFilter(app, a0, *a1, a2, a3, a4))
 %End
 
-  void setMethod(int);
   void setMethod(SmoothMethod);
 
   void setSmoothPoints(int, int = 0);
@@ -1079,7 +1075,6 @@
   SIPSCIDAVIS_APP(new sipFFTFilter(app, a0, *a1, a2, a3, a4))
 %End
 
-  void setFilterType(int);
   void setFilterType(FilterType);
 
   void setCutoff(double);
@@ -1194,7 +1189,7 @@
 #include "src/Folder.h"
 %End
 public:
-  MDIWindowList windowsList() /PyName=windows/;
+  QList<MyWidget*> windowsList() /PyName=windows/;
 // TODO: implement signal Folder::nameChanged and make it update the project explorer; adjust renaming from GUI accordingly
 //  void setFolderName(const QString&) /PyName=setName/;
   QString name();


Index: scidavis.spec
===================================================================
RCS file: /cvs/extras/rpms/scidavis/F-10/scidavis.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- scidavis.spec	24 Apr 2008 09:03:30 -0000	1.4
+++ scidavis.spec	7 Jan 2009 18:20:15 -0000	1.5
@@ -1,10 +1,12 @@
 Summary:	Scientific Data Analysis and Visualization
 Name:		scidavis
 Version:	0.1.3
-Release: 	2%{?dist}
+Release: 	5%{?dist}
 Source0:	http://download.sourceforge.net/sourceforge/scidavis/%{name}-%{version}.tar.bz2
 Source1:	http://download.sourceforge.net/sourceforge/scidavis/scidavis-manual-0.1_2008-02-28.tar.bz2
 Patch0:		scidavis-0.1.3-pro.patch
+# 		http://bugzilla.redhat.com/479118
+Patch1:		scidavis-0.1.3-sip.patch	
 URL:		http://scidavis.sourceforge.net/
 License:	GPLv2
 Group: 		Applications/Engineering
@@ -29,6 +31,7 @@
 %prep
 %setup -q -a 1
 %patch0 -p1
+%patch1 -p1 -b .bz#479118
 
 sed -i -e 's/x-sciprj/x-sciprj;/' scidavis/scidavis.desktop
 sed -i -e 's/50/100/' scidavis/scidavis.xml
@@ -97,6 +100,15 @@
 %doc manual/*
 
 %changelog
+* Wed Jan 07 2009 Eric Tanguy <eric.tanguy at univ-nantes.fr> - 0.1.3-5
+- Rebuild
+
+* Wed Jan 07 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.1.3-4
+- sip patch (#479118)
+
+* Sun Nov 30 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 0.1.3-3
+- Rebuild for Python 2.6
+
 * Wed Apr 23 2008 Eric Tanguy <eric.tanguy at univ-nantes.fr> - 0.1.3-2
 - Handle correctly the icons
 



From davej at fedoraproject.org  Wed Jan  7 18:29:53 2009
From: davej at fedoraproject.org (Dave Jones)
Date: Wed,  7 Jan 2009 18:29:53 +0000 (UTC)
Subject: rpms/kernel/devel config-ia64-generic, 1.20,
	1.21 config-x86_64-generic, 1.58, 1.59 kernel.spec, 1.1196, 1.1197
Message-ID: <20090107182953.60B5470141@cvs1.fedora.phx.redhat.com>

Author: davej

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21862

Modified Files:
	config-ia64-generic config-x86_64-generic kernel.spec 
Log Message:
Build ACPI_AC in on x86-64/ia64, as we do on x86-32


Index: config-ia64-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-ia64-generic,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- config-ia64-generic	29 Dec 2008 02:48:00 -0000	1.20
+++ config-ia64-generic	7 Jan 2009 18:29:22 -0000	1.21
@@ -123,7 +123,7 @@
 
 #
 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


Index: config-x86_64-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-x86_64-generic,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- config-x86_64-generic	7 Jan 2009 15:12:40 -0000	1.58
+++ config-x86_64-generic	7 Jan 2009 18:29:22 -0000	1.59
@@ -70,7 +70,7 @@
 CONFIG_CPU_FREQ_STAT_DETAILS=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


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1196
retrieving revision 1.1197
diff -u -r1.1196 -r1.1197
--- kernel.spec	7 Jan 2009 15:12:40 -0000	1.1196
+++ kernel.spec	7 Jan 2009 18:29:22 -0000	1.1197
@@ -1752,6 +1752,9 @@
 
 %changelog
 * Wed Jan 07 2009 Dave Jones <davej at redhat.com>
+- Build ACPI_AC in on x86-64/ia64, as we do on x86-32
+
+* Wed Jan 07 2009 Dave Jones <davej at redhat.com>
 - Fix up broken rebase.
 
 * Wed Jan 07 2009 Jarod Wilson <jarod at redhat.com>



From davej at fedoraproject.org  Wed Jan  7 18:31:27 2009
From: davej at fedoraproject.org (Dave Jones)
Date: Wed,  7 Jan 2009 18:31:27 +0000 (UTC)
Subject: rpms/kernel/devel config-x86_64-generic, 1.59, 1.60 kernel.spec,
	1.1197, 1.1198
Message-ID: <20090107183127.95C1970100@cvs1.fedora.phx.redhat.com>

Author: davej

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22692

Modified Files:
	config-x86_64-generic kernel.spec 
Log Message:
Build ACPI_BATTERY in on x86-64, as we do on x86-32


Index: config-x86_64-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-x86_64-generic,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- config-x86_64-generic	7 Jan 2009 18:29:22 -0000	1.59
+++ config-x86_64-generic	7 Jan 2009 18:30:56 -0000	1.60
@@ -74,7 +74,7 @@
 # CONFIG_ACPI_ASUS is not set
 CONFIG_ACPI_PROCFS_POWER=y
 CONFIG_ACPI_SYSFS_POWER=y
-CONFIG_ACPI_BATTERY=m
+CONFIG_ACPI_BATTERY=y
 CONFIG_ACPI_BAY=m
 CONFIG_ACPI_BLACKLIST_YEAR=0
 CONFIG_ACPI_BUTTON=y


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1197
retrieving revision 1.1198
diff -u -r1.1197 -r1.1198
--- kernel.spec	7 Jan 2009 18:29:22 -0000	1.1197
+++ kernel.spec	7 Jan 2009 18:30:56 -0000	1.1198
@@ -1752,6 +1752,9 @@
 
 %changelog
 * Wed Jan 07 2009 Dave Jones <davej at redhat.com>
+- Build ACPI_BATTERY in on x86-64, as we do on x86-32
+
+* Wed Jan 07 2009 Dave Jones <davej at redhat.com>
 - Build ACPI_AC in on x86-64/ia64, as we do on x86-32
 
 * Wed Jan 07 2009 Dave Jones <davej at redhat.com>



From matt at fedoraproject.org  Wed Jan  7 18:35:27 2009
From: matt at fedoraproject.org (Matthew Farrellee)
Date: Wed,  7 Jan 2009 18:35:27 +0000 (UTC)
Subject: rpms/condor/F-9 stdsoap2.h.patch.patch, NONE, 1.1 .cvsignore, 1.5, 
	1.6 DetectGCC430.patch, 1.1, 1.2 condor.spec, 1.13,
	1.14 condor_config.generic.patch, 1.2, 1.3 generate-tarball.sh,
	1.2, 1.3 sources, 1.5, 1.6 better-analyze-everywhere.patch, 1.1, NONE
Message-ID: <20090107183527.D02A970100@cvs1.fedora.phx.redhat.com>

Author: matt

Update of /cvs/pkgs/rpms/condor/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23434

Modified Files:
	.cvsignore DetectGCC430.patch condor.spec 
	condor_config.generic.patch generate-tarball.sh sources 
Added Files:
	stdsoap2.h.patch.patch 
Removed Files:
	better-analyze-everywhere.patch 
Log Message:
update to condor 7.2.0

stdsoap2.h.patch.patch:

--- NEW FILE stdsoap2.h.patch.patch ---
diff --git a/src/condor_daemon_core.V6/stdsoap2.h.patch b/src/condor_daemon_core.V6/stdsoap2.h.patch
index a0fe3ed..c84abe7 100644
--- a/src/condor_daemon_core.V6/stdsoap2.h.patch
+++ b/src/condor_daemon_core.V6/stdsoap2.h.patch
@@ -47,7 +47,7 @@
 @@ -418,8 +427,8 @@
  #endif
  
- #if defined(__cplusplus) && !defined(WITH_LEAN)
+ #if defined(__cplusplus) && !defined(WITH_LEAN) && !defined(WITH_COMPAT)
 -# include <string>
 -# include <iostream>
 +# include <string.h>


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/condor/F-9/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	8 Oct 2008 13:34:47 -0000	1.5
+++ .cvsignore	7 Jan 2009 18:34:56 -0000	1.6
@@ -1 +1 @@
-condor-7.0.5-105846-RH.tar.gz
+condor-7.2.0-121001-RH.tar.gz

DetectGCC430.patch:

Index: DetectGCC430.patch
===================================================================
RCS file: /cvs/pkgs/rpms/condor/F-9/DetectGCC430.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DetectGCC430.patch	11 Jun 2008 15:07:19 -0000	1.1
+++ DetectGCC430.patch	7 Jan 2009 18:34:56 -0000	1.2
@@ -2,7 +2,7 @@
 --- condor-7.0.2.orig/src/configure.ac	2008-06-11 10:04:54.000000000 -0500
 +++ condor-7.0.2/src/configure.ac	2008-06-11 10:04:07.000000000 -0500
 @@ -877,6 +877,12 @@
-     CompilerMinor="2"
+     CompilerMinor="3"
      CompilerPatch="1"
      ;;
 + "4.3.0" )


Index: condor.spec
===================================================================
RCS file: /cvs/pkgs/rpms/condor/F-9/condor.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- condor.spec	8 Oct 2008 13:34:47 -0000	1.13
+++ condor.spec	7 Jan 2009 18:34:56 -0000	1.14
@@ -1,6 +1,6 @@
 Summary: Condor: High Throughput Computing
 Name: condor
-Version: 7.0.5
+Version: 7.2.0
 Release: 1%{?dist}
 License: ASL 2.0
 Group: Applications/System
@@ -17,36 +17,39 @@
 #   b08743cfa2e87adbcda042896e8ef537  condor_src-7.0.2-all-all.tar.gz
 #   5f326ad522b63eacf34c6c563cf46910  condor_src-7.0.4-all-all.tar.gz
 #   73323100c5b2259f3b9c042fa05451e0  condor_src-7.0.5-all-all.tar.gz
+#   a2dd96ea537b2c6d105b6c8dad563ddc  condor_src-7.2.0-all-all.tar.gz
 # Note: The md5sum of each generated tarball may be different
-Source0: condor-7.0.5-105846-RH.tar.gz
+Source0: condor-7.2.0-121001-RH.tar.gz
 Source1: generate-tarball.sh
+Source2: NOTICE.txt
 Patch0: condor_config.generic.patch
-Patch2: GLibCFlag28.patch
-Patch3: DetectGCC430.patch
+Patch1: stdsoap2.h.patch.patch
+Patch2: DetectGCC430.patch
 
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 BuildRequires: imake
 BuildRequires: flex
 BuildRequires: byacc
-BuildRequires: tcsh
 BuildRequires: pcre-devel
 BuildRequires: postgresql-devel
 BuildRequires: openssl-devel
 BuildRequires: krb5-devel
-BuildRequires: gsoap-devel >= 2.7.10-2
+BuildRequires: gsoap-devel >= 2.7.12-1
 BuildRequires: bind-utils
 BuildRequires: m4
 BuildRequires: autoconf
 BuildRequires: classads-devel
+BuildRequires: libX11-devel
 
 Requires: pcre
 Requires: postgresql-libs
 Requires: openssl
 Requires: krb5-libs
-Requires: gsoap >= 2.7.10-2
+Requires: gsoap >= 2.7.12-1
 Requires: mailx
 Requires: classads
+Requires: python >= 2.2
 
 Requires(pre): shadow-utils
 
@@ -70,14 +73,26 @@
 completion.
 
 
-%package static
-Summary: Headers and libraries for interacting with Condor
-Group: Development/System
-Requires: %name = %version-%release
+#%package static
+#Summary: Headers and libraries for interacting with Condor
+#Group: Development/System
+#Requires: %name = %version-%release
+#
+#
+#%description static
+#Headers and libraries for interacting with Condor and its components.
 
 
-%description static
-Headers and libraries for interacting with Condor and its components.
+%package kbdd
+Summary: Condor Keyboard Daemon
+Group: Applications/System
+Requires: %name = %version-%release
+Requires: libX11
+
+%description kbdd
+The condor_kbdd monitors logged in X users for activity. It is only
+useful on systems where no device (e.g. /dev/*) can be used to
+determine console idle time.
 
 
 %pre
@@ -91,9 +106,11 @@
 %prep
 %setup -q -n %{name}-%{version}
 
+cp %{SOURCE2} .
+
 %patch0 -p1
+%patch1 -p1
 %patch2 -p1
-%patch3 -p1
 
 # fix errant execute permissions
 find src -perm /a+x -type f -name "*.[Cch]" -exec chmod a-x {} \;
@@ -112,18 +129,22 @@
 
 cd src
 ./build_init
-%configure --enable-proper \
+%configure --with-buildid=Fedora-%{version}-%{release} \
+   --enable-proper \
    --disable-full-port \
    --disable-gcc-version-check \
    --disable-glibc-version-check \
    --disable-static \
    --disable-rpm \
+   --enable-kbdd \
+   --disable-hibernation \
+   --disable-lease-manager \
    --without-zlib \
    --with-openssl \
    --with-krb5 \
    --with-postgresql \
    --with-gsoap \
-   --without-classads \
+   --with-classads \
    --with-man=$PWD/../externals/bundles/man/current
 
 # SMP_NUM_JOBS must be set properly to pass -j to make
@@ -146,7 +167,8 @@
 rm -rf %{buildroot}
 
 # make public creates release tarballs which we will install
-cd public/v7.0
+oldpwd=$PWD
+cd public/v7.2
 gzip -cd condor-%{version}-*-dynamic-unstripped.tar.gz | tar x
 cd condor-%{version}
 
@@ -156,6 +178,21 @@
 
 cp $PREFIX/etc/examples/condor_config.generic $PREFIX/etc/condor_config
 
+# the default condor_config file is not architecture aware and thus
+# sets the LIB directory to always be /usr/lib, we want to do better
+# than that. this is, so far, the best place to do this
+# specialization. we strip the "lib" or "lib64" part from _libdir and
+# stick it in the LIB variable in the config.
+LIB=$(echo %{?_libdir} | sed -e 's:/usr/\(.*\):\1:')
+if [ "$LIB" = "%_libdir" ]; then
+  echo "_libdir does not contain /usr, sed expression needs attention"
+  exit 1
+fi
+sed -e "s:^LIB\s*=.*:LIB = \$(RELEASE_DIR)/$LIB/condor:" \
+  $PREFIX/etc/examples/condor_config.generic \
+  > $PREFIX/etc/condor_config
+
+
 mkdir $PREFIX/local_dir
 mkdir -m1777 $PREFIX/local_dir/execute
 mkdir -m0755 $PREFIX/local_dir/log
@@ -189,9 +226,117 @@
 # the libcondorapi.so is not properly created, instead of providing it
 # we will provide the .a version in a static package
 rm $PREFIX/lib/libcondorapi.so
-# sbin/condor and uniq_pid_command are pointless hard links
+# sbin/condor is a pointless hard links
 rm $PREFIX/sbin/condor
+
+# not packaging the condor_startd_factory right now
+rm $PREFIX/sbin/condor_startd_factory
+rm $PREFIX/lib/webservice/condorStartdFactory.wsdl
+rm $PREFIX/libexec/bgp_available_partitions
+rm $PREFIX/libexec/bgp_back_partition
+rm $PREFIX/libexec/bgp_boot_partition
+rm $PREFIX/libexec/bgp_destroy_partition
+rm $PREFIX/libexec/bgp_generate_partition
+rm $PREFIX/libexec/bgp_query_work_loads
+rm $PREFIX/libexec/bgp_shutdown_partition
+
+# not packaging uninteresting WSDL files, except for the master
+rm $PREFIX/lib/webservice/condorCgahp.wsdl
+rm $PREFIX/lib/webservice/condorDagman.wsdl
+rm $PREFIX/lib/webservice/condorDbmsd.wsdl
+rm $PREFIX/lib/webservice/condorDcskel.wsdl
+rm $PREFIX/lib/webservice/condorEventd.wsdl
+rm $PREFIX/lib/webservice/condorGridmanager.wsdl
+rm $PREFIX/lib/webservice/condorHad.wsdl
+rm $PREFIX/lib/webservice/condorJobRouter.wsdl
+rm $PREFIX/lib/webservice/condorKbdd.wsdl
+rm $PREFIX/lib/webservice/condorNegotiator.wsdl
+rm $PREFIX/lib/webservice/condorShadow.wsdl
+rm $PREFIX/lib/webservice/condorStartd.wsdl
+rm $PREFIX/lib/webservice/condorStarter.wsdl
+rm $PREFIX/lib/webservice/condorTransferd.wsdl
+rm $PREFIX/lib/webservice/condorTt.wsdl
+rm $PREFIX/lib/webservice/condorVMgahp.wsdl
+
+
+# not packaging glexec support right now
+rm $PREFIX/libexec/condor_glexec_cleanup
+rm $PREFIX/libexec/condor_glexec_job_wrapper
+rm $PREFIX/libexec/condor_glexec_kill
+rm $PREFIX/libexec/condor_glexec_run
+rm $PREFIX/libexec/condor_glexec_setup
+# not shipping gt42 gahp right now
+rm $PREFIX/sbin/gt42_gahp
+
+# not going to package the sc2005 negotiator
+#rm $PREFIX/sbin/condor_lease_manager
+
+# not going to package these until we know what they are
+rm $PREFIX/bin/condor_power
+rm $PREFIX/sbin/condor_set_shutdown
+
+# not packaging glidein support, depends on globus
+rm $PREFIX/man/man1/condor_glidein.1
+rm $PREFIX/bin/condor_glidein
+
+# not packaging deployment tools
+# sbin/uniq_pid_command is a link for uniq_pid_midwife/undertaker
 rm $PREFIX/sbin/uniq_pid_command
+rm $PREFIX/sbin/uniq_pid_midwife
+rm $PREFIX/sbin/uniq_pid_undertaker
+rm $PREFIX/sbin/cleanup_release
+rm $PREFIX/sbin/condor_local_stop
+rm $PREFIX/sbin/condor_cleanup_local
+rm $PREFIX/sbin/condor_cold_start
+rm $PREFIX/sbin/condor_cold_stop
+rm $PREFIX/sbin/condor_config_bind
+rm $PREFIX/sbin/filelock_midwife
+rm $PREFIX/sbin/filelock_undertaker
+rm $PREFIX/sbin/condor_install_local
+rm $PREFIX/sbin/condor_local_start
+rm $PREFIX/sbin/install_release
+rm $PREFIX/lib/Execute.pm
+rm $PREFIX/lib/FileLock.pm
+rm $PREFIX/man/man1/condor_config_bind.1
+rm $PREFIX/man/man1/condor_cold_start.1
+rm $PREFIX/man/man1/condor_cold_stop.1
+
+# not packaging the ckpt server
+rm $PREFIX/sbin/condor_ckpt_server
+
+# not packaging standard universe
+rm $PREFIX/bin/condor_checkpoint
+rm $PREFIX/sbin/condor_shadow.std
+rm $PREFIX/sbin/condor_starter.std
+rm $PREFIX/bin/condor_compile
+rm $PREFIX/man/man1/condor_compile.1
+rm $PREFIX/man/man1/condor_checkpoint.1
+rm $PREFIX/libexec/condor_ckpt_probe
+
+# not packaging configure/install scripts
+rm $PREFIX/man/man1/condor_configure.1
+rm $PREFIX/sbin/condor_configure
+rm $PREFIX/sbin/condor_install
+
+# not packaging legacy cruft
+rm $PREFIX/man/man1/condor_master_off.1
+rm $PREFIX/sbin/condor_master_off
+rm $PREFIX/man/man1/condor_reconfig_schedd.1
+rm $PREFIX/sbin/condor_reconfig_schedd
+rm $PREFIX/man/man1/condor_convert_history.1
+rm $PREFIX/sbin/condor_convert_history
+
+# not packaging anything globus related
+rm $PREFIX/sbin/condor_gridshell
+rm $PREFIX/sbin/grid_monitor.sh
+rm $PREFIX/sbin/gt4_gahp
+
+# not packaging unsupported gahps
+rm $PREFIX/sbin/unicore_gahp
+
+# not packaging libcondorapi.a
+rm $PREFIX/lib/libcondorapi.a
+
 
 # some scripts are examples but have exec bits set anyway
 chmod a-x $PREFIX/etc/examples/condor.boot
@@ -202,14 +347,17 @@
 populate %_mandir/man1 $PREFIX/man/man1/*
 populate %_bindir $PREFIX/bin/*
 populate %_sbindir $PREFIX/sbin/*
-populate %_usrsrc $PREFIX/src/chirp
 populate %_sysconfdir/condor $PREFIX/etc/condor_config
-populate %_includedir/condor $PREFIX/include/*
-populate %_libdir $PREFIX/lib/libcondorapi.a
+# no -static package
+#populate %_usrsrc $PREFIX/src/chirp
+#populate %_includedir/condor $PREFIX/include/*
+#populate %_libdir $PREFIX/lib/libcondorapi.a
 populate %_datadir/condor $PREFIX/lib/*
+populate %_datadir/condor/sql $PREFIX/sql/*
 populate %_libexecdir/condor $PREFIX/libexec/*
 populate %_var/lib/condor $PREFIX/local_dir/*
 
+
 # install the lsb init script
 install -Dp -m0755 $PREFIX/etc/examples/condor.init %buildroot/%_initrddir/condor
 
@@ -241,54 +389,35 @@
 %_datadir/condor/CondorJavaInfo.class
 %_datadir/condor/CondorJavaWrapper.class
 %_datadir/condor/Condor.pm
-%_datadir/condor/Execute.pm
-%_datadir/condor/FileLock.pm
 %_datadir/condor/scimark2lib.jar
 %dir %_datadir/condor/webservice/
-%_datadir/condor/webservice/condorAccountant.wsdl
-%_datadir/condor/webservice/condorCgahp.wsdl
 %_datadir/condor/webservice/condorCollector.wsdl
-%_datadir/condor/webservice/condorDagman.wsdl
-%_datadir/condor/webservice/condorDbmsd.wsdl
-%_datadir/condor/webservice/condorDcskel.wsdl
-%_datadir/condor/webservice/condorEventd.wsdl
-%_datadir/condor/webservice/condorGridmanager.wsdl
-%_datadir/condor/webservice/condorHad.wsdl
 %_datadir/condor/webservice/condorMaster.wsdl
-%_datadir/condor/webservice/condorNegotiator.wsdl
 %_datadir/condor/webservice/condorSchedd.wsdl
-%_datadir/condor/webservice/condorShadow.wsdl
-%_datadir/condor/webservice/condorStartd.wsdl
-%_datadir/condor/webservice/condorStarter.wsdl
-%_datadir/condor/webservice/condorTransferd.wsdl
-%_datadir/condor/webservice/condorVMgahp.wsdl
+%dir %_datadir/condor/sql/
+%_datadir/condor/sql/common_createddl.sql
+%_datadir/condor/sql/oracle_createddl.sql
+%_datadir/condor/sql/oracle_dropddl.sql
+%_datadir/condor/sql/pgsql_createddl.sql
+%_datadir/condor/sql/pgsql_dropddl.sql
 %dir %_libexecdir/condor/
 %_libexecdir/condor/condor_chirp
 %_libexecdir/condor/condor_ssh
 %_libexecdir/condor/sshd.sh
-%_libexecdir/condor/condor_ckpt_probe
+%_libexecdir/condor/condor_job_router
 %_libexecdir/condor/gridftp_wrapper.sh
 %_mandir/man1/condor_advertise.1.gz
-%_mandir/man1/condor_checkpoint.1.gz
 %_mandir/man1/condor_check_userlogs.1.gz
 %_mandir/man1/condor_chirp.1.gz
 %_mandir/man1/condor_cod.1.gz
-%_mandir/man1/condor_cold_start.1.gz
-%_mandir/man1/condor_cold_stop.1.gz
-%_mandir/man1/condor_compile.1.gz
-%_mandir/man1/condor_config_bind.1.gz
-%_mandir/man1/condor_convert_history.1.gz
-%_mandir/man1/condor_configure.1.gz
 %_mandir/man1/condor_config_val.1.gz
 %_mandir/man1/condor_dagman.1.gz
 %_mandir/man1/condor_fetchlog.1.gz
 %_mandir/man1/condor_findhost.1.gz
-%_mandir/man1/condor_glidein.1.gz
 %_mandir/man1/condor_history.1.gz
 %_mandir/man1/condor_hold.1.gz
 %_mandir/man1/condor_load_history.1.gz
 %_mandir/man1/condor_master.1.gz
-%_mandir/man1/condor_master_off.1.gz
 %_mandir/man1/condor_off.1.gz
 %_mandir/man1/condor_on.1.gz
 %_mandir/man1/condor_preen.1.gz
@@ -296,7 +425,6 @@
 %_mandir/man1/condor_q.1.gz
 %_mandir/man1/condor_qedit.1.gz
 %_mandir/man1/condor_reconfig.1.gz
-%_mandir/man1/condor_reconfig_schedd.1.gz
 %_mandir/man1/condor_release.1.gz
 %_mandir/man1/condor_reschedule.1.gz
 %_mandir/man1/condor_restart.1.gz
@@ -317,10 +445,8 @@
 %_mandir/man1/condor_wait.1.gz
 # bin/condor is a link for checkpoint, reschedule, vacate
 %_bindir/condor
-%_bindir/condor_glidein
 %_bindir/condor_load_history
 %_bindir/condor_submit_dag
-%_bindir/condor_checkpoint
 %_bindir/condor_prio
 %_bindir/condor_transfer_data
 %_bindir/condor_check_userlogs
@@ -329,7 +455,6 @@
 %_bindir/condor_cod
 %_bindir/condor_qedit
 %_bindir/condor_userlog
-%_bindir/condor_compile
 %_bindir/condor_release
 %_bindir/condor_userlog_job_counter
 %_bindir/condor_config_val
@@ -340,6 +465,9 @@
 %_bindir/condor_vacate
 %_bindir/condor_dump_history
 %_bindir/condor_run
+%_bindir/condor_router_history
+%_bindir/condor_router_q
+%_bindir/condor_router_rm
 %_bindir/condor_vacate_job
 %_bindir/condor_findhost
 %_bindir/condor_stats
@@ -349,31 +477,17 @@
 %_bindir/condor_wait
 %_bindir/condor_hold
 %_bindir/condor_submit
-%_sbindir/cleanup_release
 # sbin/condor is a link for master_off, off, on, reconfig,
 # reconfig_schedd, restart
 %_sbindir/condor_advertise
 %_sbindir/condor_c-gahp
 %_sbindir/condor_c-gahp_worker_thread
-%_sbindir/condor_ckpt_server
-%_sbindir/condor_cleanup_local
-%_sbindir/condor_cold_start
-%_sbindir/condor_cold_stop
 %_sbindir/condor_collector
-%_sbindir/condor_config_bind
-%_sbindir/condor_configure
-%_sbindir/condor_convert_history
 %_sbindir/condor_dbmsd
 %_sbindir/condor_fetchlog
-%_sbindir/condor_gridshell
 %_sbindir/condor_had
 %_sbindir/condor_init
-%_sbindir/condor_install
-%_sbindir/condor_install_local
-%_sbindir/condor_local_start
-%_sbindir/condor_local_stop
 %_sbindir/condor_master
-%_sbindir/condor_master_off
 %_sbindir/condor_negotiator
 %_sbindir/condor_off
 %_sbindir/condor_on
@@ -381,32 +495,21 @@
 %_sbindir/condor_procd
 %_sbindir/condor_quill
 %_sbindir/condor_reconfig
-%_sbindir/condor_reconfig_schedd
 %_sbindir/condor_replication
 %_sbindir/condor_restart
 %_sbindir/condor_root_switchboard
 %_sbindir/condor_schedd
 %_sbindir/condor_shadow
-%_sbindir/condor_shadow.std
 %_sbindir/condor_startd
 %_sbindir/condor_starter
-%_sbindir/condor_starter.std
 %_sbindir/condor_store_cred
 %_sbindir/condor_transferd
 %_sbindir/condor_updates_stats
 %_sbindir/condor_vm-gahp
+%_sbindir/amazon_gahp
 %_sbindir/condor_vm_vmware.pl
 %_sbindir/condor_vm_xen.sh
-%_sbindir/filelock_midwife
-%_sbindir/filelock_undertaker
-%_sbindir/install_release
 %_sbindir/condor_gridmanager
-%_sbindir/grid_monitor.sh
-%_sbindir/gt4_gahp
-%_sbindir/unicore_gahp
-# sbin/uniq_pid_command is a link for uniq_pid_midwife/undertaker
-%_sbindir/uniq_pid_midwife
-%_sbindir/uniq_pid_undertaker
 %config(noreplace) %_var/lib/condor/condor_config.local
 %defattr(-,condor,condor,-)
 %dir %_var/lib/condor/
@@ -415,26 +518,37 @@
 %dir %_var/lib/condor/spool/
 
 
-%files static
+#%files static
+#%defattr(-,root,root,-)
+#%doc LICENSE-2.0.txt
+#%_libdir/libcondorapi.a
+#%dir %_includedir/condor/
+#%_includedir/condor/condor_constants.h
+#%_includedir/condor/condor_event.h
+#%_includedir/condor/condor_holdcodes.h
+#%_includedir/condor/file_lock.h
+#%_includedir/condor/user_log.c++.h
+#%doc %_includedir/condor/user_log.README
+#%dir %_usrsrc/chirp/
+#%_usrsrc/chirp/chirp_client.c
+#%_usrsrc/chirp/chirp_client.h
+#%_usrsrc/chirp/chirp_protocol.h
+
+
+%files kbdd
 %defattr(-,root,root,-)
-%doc LICENSE-2.0.txt
-%_libdir/libcondorapi.a
-%dir %_includedir/condor/
-%_includedir/condor/condor_constants.h
-%_includedir/condor/condor_event.h
-%_includedir/condor/condor_holdcodes.h
-%_includedir/condor/file_lock.h
-%_includedir/condor/user_log.c++.h
-%doc %_includedir/condor/user_log.README
-%dir %_usrsrc/chirp/
-%_usrsrc/chirp/chirp_client.c
-%_usrsrc/chirp/chirp_client.h
-%_usrsrc/chirp/chirp_protocol.h
+%doc LICENSE-2.0.txt NOTICE.txt
+%_sbindir/condor_kbdd
 
 
 %post -n condor
 /sbin/chkconfig --add condor
 /sbin/ldconfig
+test -x /usr/sbin/selinuxenabled && /usr/sbin/selinuxenabled
+if [ $? = 0 ]; then
+   semanage fcontext -a -t unconfined_execmem_exec_t %_sbindir/condor_startd 
+   restorecon  %_sbindir/condor_startd
+fi
 
 
 %preun -n condor
@@ -452,6 +566,13 @@
 
 
 %changelog
+* Wed Jan  7 2009  <matt at redhat> - 7.2.0-1
+- Upgraded to 7.2.0 release
+- Removed -static package
+- Added Fedora specific buildid
+- Enabled KBDD, daemon to monitor X usage on systems with only USB devs
+- Updated install process
+
 * Wed Oct  8 2008  <matt at redhat> - 7.0.5-1
 - Rebased on 7.0.5, security update
 

condor_config.generic.patch:

Index: condor_config.generic.patch
===================================================================
RCS file: /cvs/pkgs/rpms/condor/F-9/condor_config.generic.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- condor_config.generic.patch	6 Aug 2008 14:38:48 -0000	1.2
+++ condor_config.generic.patch	7 Jan 2009 18:34:56 -0000	1.3
@@ -1,8 +1,66 @@
 diff --git a/src/condor_examples/condor_config.generic b/src/condor_examples/condor_config.generic
-index c119679..e795a15 100644
+index f3f60a5..94c146f 100644
 --- a/src/condor_examples/condor_config.generic
 +++ b/src/condor_examples/condor_config.generic
-@@ -51,19 +51,16 @@
+@@ -1,15 +1,35 @@
+ ######################################################################
++######################################################################
++##                                                                  ##
++##  N O T I C E:                                                    ##
++##                                                                  ##
++##       Customization of this file should be done via the          ##
++##       LOCAL_CONFIG_FILE.                                         ##
++##                                                                  ##
++######################################################################
++######################################################################
++
++
++######################################################################
+ ##
+ ##  condor_config
+ ##
+ ##  This is the global configuration file for condor.  Any settings
+-##  made here may potentially be overridden in the local configuration
+-##  file.  KEEP THAT IN MIND!  To double-check that a variable is
+-##  getting set from the configuration file that you expect, use
+-##  condor_config_val -v <variable name>
++##  found here * * s h o u l d   b e   c u s t o m i z e d   i n
++##  t h e   l o c a l   c o n f i g u r a t i o n   f i l e. * *
++##
++##  The local configuration file is specified by LOCAL_CONFIG_FILE
++##  below.
++##
++##  For a basic configuration, you may only want to start by
++##  customizing CONDOR_ADMIN.
++##
++##  Note: To double-check where a configuration variable is set from
++##  you can use condor_config_val -v <variable name>,
++##  e.g. condor_config_val -v CONDOR_ADMIN.
+ ##
+ ##  The file is divided into four main parts:
+-##  Part 1:  Settings you MUST customize 
++##  Part 1:  Settings you likely want to customize 
+ ##  Part 2:  Settings you may want to customize
+ ##  Part 3:  Settings that control the policy of when condor will
+ ##           start and stop jobs on your machines
+@@ -21,11 +41,6 @@
+ ##  various settings in here and possible ways to configure your
+ ##  pool. 
+ ##
+-##  If you are installing Condor as root and then handing over the
+-##  administration of this file to a person you do not trust with
+-##  root access, please read the Installation chapter paying careful
+-##  note to the condor_config.root entries.
+-##
+ ##  Unless otherwise specified, settings that are commented out show
+ ##  the defaults that are used if you don't define a value.  Settings
+ ##  that are defined here MUST BE DEFINED since they have no default
+@@ -47,18 +62,15 @@
+ ##  #        #    #  #   #      #              #
+ ##  #        #    #  #    #     #            #####
+ ##
+-##  Part 1:  Settings you must customize:
++##  Part 1:  Settings you likely want to customize:
  ######################################################################
  ######################################################################
  
@@ -18,13 +76,25 @@
  
  ##  Where is the local condor directory for each host?  
  ##  This is where the local config file(s), logs and
- ##  spool/execute directories are located
--LOCAL_DIR		= $(TILDE)
-+LOCAL_DIR		= /var/lib/condor
- #LOCAL_DIR		= $(RELEASE_DIR)/hosts/$(HOSTNAME)
+@@ -72,7 +84,7 @@ LOCAL_CONFIG_FILE	= $(LOCAL_DIR)/condor_config.local
+ 
+ ## If the local config file is not present, is it an error?
+ ## WARNING: This is a potential security issue. 
+-## If not specificed, te default is True
++## If not specificed, the default is True
+ #REQUIRE_LOCAL_CONFIG_FILE = TRUE
+ 
+ ##--------------------------------------------------------------------
+@@ -84,7 +96,7 @@ CONDOR_ADMIN		= condor-admin at your.domain
  
- ##  Where is the machine-specific local config file for each host?
-@@ -93,13 +90,13 @@ MAIL			= /usr/bin/mail
+ ##  Full path to a mail delivery program that understands that "-s"
+ ##  means you want to specify a subject:
+-MAIL			= /usr/bin/mail
++MAIL			= /bin/mail
+ 
+ ##--------------------------------------------------------------------
+ ##  Network domain parameters:
+@@ -93,13 +105,13 @@ MAIL			= /usr/bin/mail
  ##  machines don't share a common UID space, set it to 
  ##  UID_DOMAIN = $(FULL_HOSTNAME)
  ##  to specify that each machine has its own UID space.
@@ -40,7 +110,7 @@
  
  ##  This macro is used to specify a short description of your pool. 
  ##  It should be about 20 characters long. For example, the name of 
-@@ -218,7 +215,7 @@ HOSTALLOW_READ = *
+@@ -218,7 +230,7 @@ HOSTALLOW_READ = *
  ##    HOSTALLOW_WRITE = *
  ##  but note that this will allow anyone to submit jobs or add
  ##  machines to your pool and is serious security risk.
@@ -49,17 +119,61 @@
  #HOSTALLOW_WRITE = *.your.domain, your-friend's-machine.other.domain
  #HOSTDENY_WRITE = bad-machine.your.domain
  
-@@ -859,10 +856,10 @@ LOG		= $(LOCAL_DIR)/log
- SPOOL		= $(LOCAL_DIR)/spool
+@@ -231,10 +243,9 @@ HOSTALLOW_NEGOTIATOR = $(CONDOR_HOST)
+ HOSTALLOW_NEGOTIATOR_SCHEDD = $(CONDOR_HOST), $(FLOCK_NEGOTIATOR_HOSTS)
+ 
+ ##  Config access.  Machines listed here can use the condor_config_val
+-##  tool to modify all daemon configurations except those specified in
+-##  the condor_config.root file.  This level of host-wide access
+-##  should only be granted with extreme caution.  By default, config
+-##  access is denied from all hosts.
++##  tool to modify all daemon configurations.  This level of host-wide
++##  access should only be granted with extreme caution.  By default,
++##  config access is denied from all hosts.
+ #HOSTALLOW_CONFIG = trusted-host.your.domain
+ 
+ ##  Flocking Configs.  These are the real things that Condor looks at,
+@@ -872,9 +883,10 @@ SPOOL		= $(LOCAL_DIR)/spool
  EXECUTE		= $(LOCAL_DIR)/execute
  BIN		= $(RELEASE_DIR)/bin
--LIB		= $(RELEASE_DIR)/lib
+ LIB		= $(RELEASE_DIR)/lib
 -INCLUDE		= $(RELEASE_DIR)/include
-+LIB		= $(RELEASE_DIR)/share/condor
 +INCLUDE		= $(RELEASE_DIR)/include/condor
  SBIN		= $(RELEASE_DIR)/sbin
 -LIBEXEC		= $(RELEASE_DIR)/libexec
 +LIBEXEC		= $(RELEASE_DIR)/libexec/condor
++SHARE		= $(RELEASE_DIR)/share/condor
  
  ## If you leave HISTORY undefined (comment it out), no history file
  ## will be created. 
+@@ -1655,7 +1667,7 @@ JAVA_MAXHEAP_ARGUMENT = -Xmx
+ ## them here.  However, do not remove the existing entries, as Condor
+ ## needs them.
+ 
+-JAVA_CLASSPATH_DEFAULT = $(LIB) $(LIB)/scimark2lib.jar .
++JAVA_CLASSPATH_DEFAULT = $(SHARE) $(SHARE)/scimark2lib.jar .
+ 
+ ##  JAVA_CLASSPATH_ARGUMENT describes the command-line parameter
+ ##  used to introduce a new classpath:
+@@ -2299,7 +2311,7 @@ LeaseManager			= $(SBIN)/condor_lease_manager
+ # Turn on the lease manager
+ #DAEMON_LIST			= $(DAEMON_LIST), LeaseManager
+ 
+-# The identification and location of the quill daemon for local clients.
++# The identification and location of the lease manager for local clients.
+ LeaseManger_ADDRESS_FILE	= $(LOG)/.lease_manager_address
+ 
+ ## LeaseManager startup arguments
+diff --git a/src/condor_examples/customize b/src/condor_examples/customize
+index b1c5710..cb2dea1 100644
+--- a/src/condor_examples/customize
++++ b/src/condor_examples/customize
+@@ -54,7 +54,7 @@ sub get_platform_defaults {
+     $_ = $os;
+   SWITCH: {
+       if(/^Linux/) { 
+-	  $mail_path="/usr/bin/mail";
++	  $mail_path="/bin/mail";
+ 	  $ps_path="/bin/ps auwx";
+ 	  $console_devs="mouse, console";
+ 	  last SWITCH;


Index: generate-tarball.sh
===================================================================
RCS file: /cvs/pkgs/rpms/condor/F-9/generate-tarball.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- generate-tarball.sh	11 Jun 2008 13:36:39 -0000	1.2
+++ generate-tarball.sh	7 Jan 2009 18:34:57 -0000	1.3
@@ -12,6 +12,7 @@
 echo "...extracting $input"
 tar xzf $input
 
+#cd condor_src-$1
 cd condor-$1
 
 if [ ! -f BUILD-ID ] ; then
@@ -22,16 +23,57 @@
 
 echo "...recording BUILD-ID: $build"
 
-echo "...removing NTconfig directory"
-rm -rf NTconfig
+for f in \
+    src/condor_mail \
+    src/condor_vm-gahp/cygwin1.dll \
+    src/condor_vm-gahp/mkisofs.exe \
+    config/CONDOR_TEST_LRG \
+    src/condor_tests/job_vmu_basic.sh \
+    src/condor_tests/job_vmu_cdrom.run \
+    src/condor_tests/job_vmu_cdrom.sh \
+    src/condor_tests/job_vmu_ckpt.run \
+    src/condor_tests/job_vmu_ckpt.sh \
+    src/condor_tests/job_vmu_network.key \
+    src/condor_tests/job_vmu_network.run \
+    src/condor_tests/job_vmu_network.sh \
+    src/condor_tests/job_vmu_basic.run \
+    src/condor_tests/x_vm_utils.pm \
+    src/condor_tests/x_param.vmware \
+    src/condor_tests/x_vmware_test_vm.cmd \
+    src/condor_tests/x_vmware_test_vm.tar.gz \
+    src/condor_tests/x_vmware_configpostsrc \
+    config/CONDOR_TEST_CNFDTL \
+    src/condor_tests/job_ligo_x86-64-chkpttst.cmd \
+    src/condor_tests/job_ligo_x86-64-chkpttst.run \
+    src/condor_tests/x_job_ligo_x86-64-chkpttst.tar.gz \
+    src/condor_tests/job_quill_basic.cmd \
+    src/condor_tests/job_quill_basic.pl \
+    src/condor_tests/job_quill_basic.run \
+    src/condor_tests/x_job_quill_basic.template \
+    src/condor_tests/x_job_quill_supw \
+    src/condor_tests/x_param.quill \
+    src/condor_tests/x_postgress_quill.conf \
+    src/condor_tests/x_quill_buildperlmods.pl \
+    src/condor_tests/x_quill_config_postsrc.template \
+    src/condor_tests/x_quill_Expect-1.20.tar.gz \
+    src/condor_tests/x_quill_IO-Tty-1.07.tar.gz \
+    src/condor_tests/x_quill_pgsqlinstall.pl \
+    src/condor_tests/x_quill_pgsqlstop.pl \
+    src/condor_tests/x_quill_readline-5.2.tar.gz \
+    src/condor_tests/x_quill_readlineinstall.pl;
+do
+    echo "...removing $f";
+    rm -r $f;
+done;
 
 echo "...removing all externals except 'man'"
 mv externals/bundles/man externals/
-rm -rf externals/bundles/*
+rm -r externals/bundles/*
 mv externals/man externals/bundles/
 
 echo "...creating condor-$1-$build-RH.tar.gz"
 cd ..
+#mv condor_src-$1 condor-$1
 tar czfsp condor-$1-$build-RH.tar.gz condor-$1
 
 echo "...cleaning up"


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/condor/F-9/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	8 Oct 2008 13:34:47 -0000	1.5
+++ sources	7 Jan 2009 18:34:57 -0000	1.6
@@ -1 +1 @@
-132e01af31659d71c5f3c5d850f9c3eb  condor-7.0.5-105846-RH.tar.gz
+e84581852745cc46b25a7e9b28e2046f  condor-7.2.0-121001-RH.tar.gz


--- better-analyze-everywhere.patch DELETED ---



From tanguy at fedoraproject.org  Wed Jan  7 18:38:37 2009
From: tanguy at fedoraproject.org (Eric Tanguy)
Date: Wed,  7 Jan 2009 18:38:37 +0000 (UTC)
Subject: rpms/scidavis/F-9 scidavis-0.1.3-sip.patch, NONE, 1.1 scidavis.spec,
	1.3, 1.4
Message-ID: <20090107183837.1E31F70100@cvs1.fedora.phx.redhat.com>

Author: tanguy

Update of /cvs/extras/rpms/scidavis/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23994

Modified Files:
	scidavis.spec 
Added Files:
	scidavis-0.1.3-sip.patch 
Log Message:


scidavis-0.1.3-sip.patch:

--- NEW FILE scidavis-0.1.3-sip.patch ---
--- scidavis-0.1.3.orig/scidavis/src/scidavis.sip	2007-07-21 21:32:13.000000000 +0100
+++ scidavis-0.1.3/scidavis/src/scidavis.sip	2009-01-07 11:12:51.000000000 +0000
@@ -78,8 +78,6 @@
   MyWidget(const MyWidget&);
 };
 
-typedef QList<MyWidget*> MDIWindowList;
-
 class Table: MyWidget
 {
 %TypeHeaderCode
@@ -1027,7 +1025,6 @@
   SIPSCIDAVIS_APP(new sipInterpolation(app, a0, *a1, a2, a3, a4))
 %End
 
-  void setMethod(int n);
   void setMethod(InterpolationMethod m);
   bool run();
 };
@@ -1051,7 +1048,6 @@
   SIPSCIDAVIS_APP(new sipSmoothFilter(app, a0, *a1, a2, a3, a4))
 %End
 
-  void setMethod(int);
   void setMethod(SmoothMethod);
 
   void setSmoothPoints(int, int = 0);
@@ -1079,7 +1075,6 @@
   SIPSCIDAVIS_APP(new sipFFTFilter(app, a0, *a1, a2, a3, a4))
 %End
 
-  void setFilterType(int);
   void setFilterType(FilterType);
 
   void setCutoff(double);
@@ -1194,7 +1189,7 @@
 #include "src/Folder.h"
 %End
 public:
-  MDIWindowList windowsList() /PyName=windows/;
+  QList<MyWidget*> windowsList() /PyName=windows/;
 // TODO: implement signal Folder::nameChanged and make it update the project explorer; adjust renaming from GUI accordingly
 //  void setFolderName(const QString&) /PyName=setName/;
   QString name();


Index: scidavis.spec
===================================================================
RCS file: /cvs/extras/rpms/scidavis/F-9/scidavis.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- scidavis.spec	24 Apr 2008 09:05:22 -0000	1.3
+++ scidavis.spec	7 Jan 2009 18:38:06 -0000	1.4
@@ -1,10 +1,12 @@
 Summary:	Scientific Data Analysis and Visualization
 Name:		scidavis
 Version:	0.1.3
-Release: 	2%{?dist}
+Release: 	5%{?dist}
 Source0:	http://download.sourceforge.net/sourceforge/scidavis/%{name}-%{version}.tar.bz2
 Source1:	http://download.sourceforge.net/sourceforge/scidavis/scidavis-manual-0.1_2008-02-28.tar.bz2
 Patch0:		scidavis-0.1.3-pro.patch
+# 		http://bugzilla.redhat.com/479118
+Patch1:		scidavis-0.1.3-sip.patch	
 URL:		http://scidavis.sourceforge.net/
 License:	GPLv2
 Group: 		Applications/Engineering
@@ -29,6 +31,7 @@
 %prep
 %setup -q -a 1
 %patch0 -p1
+%patch1 -p1 -b .bz#479118
 
 sed -i -e 's/x-sciprj/x-sciprj;/' scidavis/scidavis.desktop
 sed -i -e 's/50/100/' scidavis/scidavis.xml
@@ -97,6 +100,15 @@
 %doc manual/*
 
 %changelog
+* Wed Jan 07 2009 Eric Tanguy <eric.tanguy at univ-nantes.fr> - 0.1.3-5
+- Rebuild
+
+* Wed Jan 07 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.1.3-4
+- sip patch (#479118)
+
+* Sun Nov 30 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 0.1.3-3
+- Rebuild for Python 2.6
+
 * Wed Apr 23 2008 Eric Tanguy <eric.tanguy at univ-nantes.fr> - 0.1.3-2
 - Handle correctly the icons
 



From s4504kr at fedoraproject.org  Wed Jan  7 18:38:48 2009
From: s4504kr at fedoraproject.org (Jochen Schmitt)
Date: Wed,  7 Jan 2009 18:38:48 +0000 (UTC)
Subject: rpms/aplus-fsf/devel aplus-fsf-4.22.4-makefile.patch, 1.1,
	1.2 aplus-fsf.spec, 1.28, 1.29
Message-ID: <20090107183848.72ACD70100@cvs1.fedora.phx.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/aplus-fsf/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24067

Modified Files:
	aplus-fsf-4.22.4-makefile.patch aplus-fsf.spec 
Log Message:
reorg of the apl fonts

aplus-fsf-4.22.4-makefile.patch:

Index: aplus-fsf-4.22.4-makefile.patch
===================================================================
RCS file: /cvs/extras/rpms/aplus-fsf/devel/aplus-fsf-4.22.4-makefile.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- aplus-fsf-4.22.4-makefile.patch	17 Nov 2008 19:53:38 -0000	1.1
+++ aplus-fsf-4.22.4-makefile.patch	7 Jan 2009 18:38:17 -0000	1.2
@@ -1,6 +1,6 @@
 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-11-17 20:28:05.000000000 +0100
++++ aplus-fsf-4.22/configure.in	2009-01-07 18:30:28.000000000 +0100
 @@ -14,9 +14,13 @@ dnl Checks for programs.
  AC_PROG_CC
  AC_PROG_CXX
@@ -40,7 +40,7 @@
     X_LIBS=""
 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-09-09 16:37:58.000000000 +0200
++++ aplus-fsf-4.22/src/acore/Makefile.am	2009-01-07 18:30:28.000000000 +0100
 @@ -8,7 +8,7 @@
  ##                                                                           ##
  ###############################################################################
@@ -52,7 +52,7 @@
  	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-09-09 16:37:58.000000000 +0200
++++ aplus-fsf-4.22/src/a/Makefile.am	2009-01-07 18:30:28.000000000 +0100
 @@ -50,7 +50,7 @@ liba_la_SOURCES = \
  	x.h
  
@@ -64,7 +64,7 @@
  
 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-09-09 16:37:58.000000000 +0200
++++ aplus-fsf-4.22/src/AplusGUI/Makefile.am	2009-01-07 18:30:28.000000000 +0100
 @@ -125,5 +125,7 @@ libAplusGUI_la_SOURCES= \
  	EnumTables.H\
  	Macros.H
@@ -75,7 +75,7 @@
  
 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-09-09 16:37:58.000000000 +0200
++++ aplus-fsf-4.22/src/app-defaults/Makefile.am	2009-01-07 18:30:28.000000000 +0100
 @@ -8,7 +8,7 @@
  ##                                                                           ##
  ###############################################################################
@@ -87,7 +87,7 @@
  
 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-09-09 16:37:58.000000000 +0200
++++ aplus-fsf-4.22/src/autils/Makefile.am	2009-01-07 18:30:28.000000000 +0100
 @@ -8,7 +8,7 @@
  ##                                                                           ##
  ###############################################################################
@@ -99,7 +99,7 @@
  	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-09-09 16:37:58.000000000 +0200
++++ aplus-fsf-4.22/src/cxb/Makefile.am	2009-01-07 18:30:28.000000000 +0100
 @@ -13,5 +13,7 @@ lib_LTLIBRARIES = libcxb.la
  libcxb_la_SOURCES = \
  	binary.c
@@ -110,7 +110,7 @@
  
 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-09-09 16:37:58.000000000 +0200
++++ aplus-fsf-4.22/src/cxc/Makefile.am	2009-01-07 18:30:28.000000000 +0100
 @@ -15,5 +15,7 @@ libcxc_la_SOURCES = \
  	cform.c \
  	cxc.h
@@ -121,7 +121,7 @@
  
 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-09-09 16:37:58.000000000 +0200
++++ aplus-fsf-4.22/src/cxs/Makefile.am	2009-01-07 18:30:28.000000000 +0100
 @@ -12,6 +12,8 @@ lib_LTLIBRARIES = libcxs.la
  
  libcxs_la_SOURCES = S.c
@@ -133,7 +133,7 @@
  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-09-09 16:37:58.000000000 +0200
++++ aplus-fsf-4.22/src/cxsys/Makefile.am	2009-01-07 18:30:28.000000000 +0100
 @@ -20,5 +20,7 @@ libcxsys_la_SOURCES = \
  	impexp.c \
  	impexp.h
@@ -144,7 +144,7 @@
  
 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-09-09 16:37:58.000000000 +0200
++++ aplus-fsf-4.22/src/esf/Makefile.am	2009-01-07 18:30:28.000000000 +0100
 @@ -24,5 +24,7 @@ libesf_la_SOURCES = \
  	kcheck.c \
  	dyld2.c
@@ -153,21 +153,30 @@
 +
  INCLUDES = -I..
  
+diff -up aplus-fsf-4.22/src/fonts/Makefile.am.org aplus-fsf-4.22/src/fonts/Makefile.am
+--- aplus-fsf-4.22/src/fonts/Makefile.am.org	2009-01-07 18:31:27.000000000 +0100
++++ aplus-fsf-4.22/src/fonts/Makefile.am	2009-01-07 18:31:38.000000000 +0100
+@@ -8,4 +8,4 @@
+ ##                                                                           ##
+ ###############################################################################
+ 
+-SUBDIRS = TrueType X11
++SUBDIRS = TrueType
 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-09-09 16:37:58.000000000 +0200
++++ aplus-fsf-4.22/src/fonts/TrueType/Makefile.am	2009-01-07 18:32:20.000000000 +0100
 @@ -8,7 +8,7 @@
  ##                                                                           ##
  ###############################################################################
  
 -TrueTypedir =  $(prefix)/fonts/TrueType
-+TrueTypedir =  @datadir@/fonts/apl/TrueType
++TrueTypedir =  @datadir@/fonts/aplus-fsf
  
  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-09-09 16:37:58.000000000 +0200
++++ aplus-fsf-4.22/src/fonts/X11/Makefile.am	2009-01-07 18:30:28.000000000 +0100
 @@ -8,4 +8,4 @@
  ##                                                                           ##
  ###############################################################################
@@ -176,7 +185,7 @@
 +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-09-09 16:37:58.000000000 +0200
++++ aplus-fsf-4.22/src/fonts/X11/pcf/Makefile.am	2009-01-07 18:30:28.000000000 +0100
 @@ -8,7 +8,7 @@
  ##                                                                           ##
  ###############################################################################
@@ -188,7 +197,7 @@
  	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-09-09 16:37:58.000000000 +0200
++++ aplus-fsf-4.22/src/html/Makefile.am	2009-01-07 18:30:28.000000000 +0100
 @@ -10,7 +10,7 @@
  
  SUBDIRS = tutorials
@@ -208,7 +217,7 @@
 +	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-09-09 16:37:58.000000000 +0200
++++ aplus-fsf-4.22/src/html/tutorials/graphs/Makefile.am	2009-01-07 18:30:28.000000000 +0100
 @@ -8,7 +8,7 @@
  ##                                                                           ##
  ###############################################################################
@@ -220,7 +229,7 @@
  	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-09-09 16:37:58.000000000 +0200
++++ aplus-fsf-4.22/src/html/tutorials/Makefile.am	2009-01-07 18:30:28.000000000 +0100
 @@ -10,7 +10,7 @@
  
  SUBDIRS = graphs s.tutorials
@@ -232,7 +241,7 @@
  	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-09-09 16:37:58.000000000 +0200
++++ aplus-fsf-4.22/src/html/tutorials/s.tutorials/Makefile.am	2009-01-07 18:30:28.000000000 +0100
 @@ -8,7 +8,7 @@
  ##                                                                           ##
  ###############################################################################
@@ -244,7 +253,7 @@
  	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-09-09 16:37:58.000000000 +0200
++++ aplus-fsf-4.22/src/html/tutorials/t.tutorial/Makefile.am	2009-01-07 18:30:28.000000000 +0100
 @@ -10,7 +10,7 @@
  
  SUBDIRS = files
@@ -256,7 +265,7 @@
  	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-09-09 16:37:58.000000000 +0200
++++ aplus-fsf-4.22/src/IPC/Makefile.am	2009-01-07 18:30:28.000000000 +0100
 @@ -52,6 +52,8 @@ libIPC_la_SOURCES = \
  	pString_Connection.H\
  	pString_Listener.H
@@ -268,7 +277,7 @@
  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-09-09 16:38:05.000000000 +0200
++++ aplus-fsf-4.22/src/lisp.0/Makefile.in	2009-01-07 18:30:28.000000000 +0100
 @@ -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.
@@ -722,7 +731,7 @@
  # 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-09-09 16:37:58.000000000 +0200
++++ aplus-fsf-4.22/src/lisp.1/Makefile.am	2009-01-07 18:30:28.000000000 +0100
 @@ -8,10 +8,9 @@
  ##                                                                           ##
  ###############################################################################
@@ -745,7 +754,7 @@
  	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-09-09 16:37:58.000000000 +0200
++++ aplus-fsf-4.22/src/main/aplus_main.c	2009-01-07 18:30:28.000000000 +0100
 @@ -64,7 +64,7 @@ static C *_releaseCode = RELEASE_CODE;
  static C *_whoseTree = "";
  static C *_banner = BANNER;
@@ -757,7 +766,7 @@
  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-09-09 16:37:58.000000000 +0200
++++ aplus-fsf-4.22/src/main/Makefile.am	2009-01-07 18:30:28.000000000 +0100
 @@ -21,7 +21,7 @@ aplus_SOURCES = \
  	matherr.c \
  	version.h
@@ -769,7 +778,7 @@
  
 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-09-09 16:37:58.000000000 +0200
++++ aplus-fsf-4.22/src/Makefile.am	2009-01-07 18:30:28.000000000 +0100
 @@ -9,18 +9,18 @@
  ###############################################################################
  
@@ -799,7 +808,7 @@
  	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-09-09 16:37:58.000000000 +0200
++++ aplus-fsf-4.22/src/MSGUI/Makefile.am	2009-01-07 18:30:28.000000000 +0100
 @@ -382,6 +382,8 @@ libMSGUI_la_SOURCES = \
  	MSWidgetView.H\
  	MSWindow.H
@@ -811,7 +820,7 @@
  	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-09-09 16:37:58.000000000 +0200
++++ aplus-fsf-4.22/src/MSIPC/Makefile.am	2009-01-07 18:30:28.000000000 +0100
 @@ -52,6 +52,8 @@ libMSIPC_la_SOURCES = \
  	MSTimer.H\
  	MSTv.H
@@ -823,7 +832,7 @@
  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-09-09 16:37:58.000000000 +0200
++++ aplus-fsf-4.22/src/MSTypes/Makefile.am	2009-01-07 18:30:28.000000000 +0100
 @@ -298,8 +298,7 @@ EXTRA_DIST = \
  	MSTypeMatrix.C\
  	MSTypeVector.C
@@ -836,7 +845,7 @@
  
 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-09-09 16:37:58.000000000 +0200
++++ aplus-fsf-4.22/src/tutorials/graphs/Makefile.am	2009-01-07 18:30:28.000000000 +0100
 @@ -8,7 +8,7 @@
  ##                                                                           ##
  ###############################################################################
@@ -848,7 +857,7 @@
  	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-09-09 16:37:58.000000000 +0200
++++ aplus-fsf-4.22/src/tutorials/Makefile.am	2009-01-07 18:30:28.000000000 +0100
 @@ -10,7 +10,7 @@
  
  SUBDIRS = graphs s.tutorials
@@ -860,7 +869,7 @@
  	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-09-09 16:37:58.000000000 +0200
++++ aplus-fsf-4.22/src/tutorials/s.tutorials/Makefile.am	2009-01-07 18:30:28.000000000 +0100
 @@ -8,7 +8,7 @@
  ##                                                                           ##
  ###############################################################################


Index: aplus-fsf.spec
===================================================================
RCS file: /cvs/extras/rpms/aplus-fsf/devel/aplus-fsf.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- aplus-fsf.spec	17 Nov 2008 19:53:38 -0000	1.28
+++ aplus-fsf.spec	7 Jan 2009 18:38:18 -0000	1.29
@@ -1,3 +1,5 @@
+%define fontname aplus-fsf
+
 %define catalogue %{_sysconfdir}/X11/fontpath.d/
 %define name aplus-fsf
 %define ver 4.22
@@ -8,14 +10,11 @@
 %define _lispdir %{_datadir}/xemacs/site-packages/lisp
 %define _lispstart %{_lispdir}/site-start.d
 %define _x11lib %{_libdir}
-%define _fonts %{_datadir}/fonts
-%define _x11fonts %{_fonts}/apl/pcf
-%define _ttffonts %{_fonts}/apl/TrueType
 %define _x11appdef %{_x11pref}/app-defaults
 
 Name: %name
 Version: 4.22.4
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPLv2
 
 Summary: Advanced APL interpreter with s interface
@@ -32,12 +31,14 @@
 
 BuildRequires: libtool
 BuildRequires: xorg-x11-proto-devel
+BuildRequires: libX11-devel
 BuildRequires: xorg-x11-font-utils
 BuildRequires: automake autoconf
+BuildRequires: fontpackages-devel
 
 Requires: xterm
 
-Requires: fonts-apl
+Requires: apl-fonts
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -50,28 +51,13 @@
 communication, calls to user C subroutines, and many other features. 
 Execution is by a very efficient interpreter. 
 
-%package -n fonts-x11-apl
-Summary: X11 Fonts for the Advanced APL Interpreter
-Group: User Interface/X
-Provides: fonts-apl
-Requires(post): fontconfig
-Requires(postun): fontconfig
-%description -n fonts-x11-apl
-The A+ programming language development environment requires these 
-APL fonts to properly display A+ code in XTerm or XEmacs.
-
-This packages contains the fonts in the PCF format.
-
-They are not required to run a A+ program.
-
-%package -n fonts-truetype-apl
+%package fonts
 Summary: TrueType fonts for the Advanced APL Interpreter
 Group: User Interface/X
-Provides: fonts-apl
-Requires(post): fontconfig
-Requires(postun): fontconfig
+Provides: apl-fonts
+Requires: fontpackages-filesystem
 
-%description -n fonts-truetype-apl
+%description fonts
 The A+ programming language development environment requires these 
 APL fonts to properly display A+ code in XTerm or XEmacs.
 
@@ -137,63 +123,22 @@
 
 mv $RPM_BUILD_ROOT/%{_includedir}/a $RPM_BUILD_ROOT/%{_includedir}/a+
 
-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
-
-mv $RPM_BUILD_ROOT/%{_x11fonts}/Kapl.alias \
-   $RPM_BUILD_ROOT/%{_x11fonts}/fonts.alias
-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
-
-mkfontdir $RPM_BUILD_ROOT/%{_ttffonts}
-mkfontscale $RPM_BUILD_ROOT/%{_ttffonts}
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post -n fonts-x11-apl
-
-  FONTDIR=%{_x11fonts}
-  fc-cache $FONTDIR
-
-%post -n fonts-truetype-apl
-
-  FONTDIR=%{_ttffonts} 
-  fc-cache $FONTDIR
-
 %post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
 
-%postun -n fonts-x11-apl
-
-  FONTDIR=%{_x11fonts}
-  if [ "$1" = "0" ]; then
-    fc-cache $FONTDIR:unscaled
-  fi
-
-%postun -n fonts-truetype-apl
-
-  FONTDIR=%{_ttffonts}
-  if [ "$1" = "0" ]; then
-    fc-cache $FONTDIR
-  fi
+%_font_pkg -n fonts *.TTF
 
 %files
 %defattr(-,root,root,-)
@@ -201,9 +146,7 @@
 %attr(0755,root,root) %{_bindir}/a+.bin
 %{_libdir}/aplus-fsf/
 %{_prefix}/lib/a+/
-%dir %{_x11appdef}
 %{_x11appdef}/XTerm-apl
-%dir %{_fonts}/apl
 %{_sysconfdir}/ld.so.conf.d/aplus-fsf-%{_arch}.conf
 %{_datadir}/aplus-fsf/
 
@@ -220,27 +163,10 @@
 %{_lispdir}/aplus-fsf
 %{_lispstart}/aplus-fsf-init.el
 
-%files -n fonts-x11-apl
-%defattr(-,root,root,-)
-%dir %{_x11fonts}
-%{_x11fonts}/K*
-# %verify(not md5 size mtime) %{_x11fonts}/encodings.dir
-%verify(not md5 size mtime) %{_x11fonts}/fonts.scale
-%verify(not md5 size mtime) %{_x11fonts}/fonts.dir
-%verify(not md5 size mtime) %{_x11fonts}/fonts.alias
-%{catalogue}/apl-x11
-
-%files -n fonts-truetype-apl
-%defattr(-,root,root,-)
-%dir %{_ttffonts}
-%{_ttffonts}/K*
-# %verify(not md5 size mtime) %{_ttffonts}/encodings.dir
-%verify(not md5 size mtime) %{_ttffonts}/fonts.dir
-# %verify(not md5 size mtime) %{_ttffonts}/fonts.alias
-%verify(not md5 size mtime) %{_ttffonts}/fonts.scale
-%{catalogue}/apl-truetype
-
 %Changelog
+* Wed Jan  7 2009 Jochen Schmitt <Jochen herr-schmitt de> 4.22.4-6
+- Reorganization of apl fonts
+
 * Mon Nov 17 2008 Jochen Schmitt <Jochen herr-schmitt de> 4.22.4-5
 - Try to fix build issue agains libtools-2
 



From matt at fedoraproject.org  Wed Jan  7 18:42:55 2009
From: matt at fedoraproject.org (Matthew Farrellee)
Date: Wed,  7 Jan 2009 18:42:55 +0000 (UTC)
Subject: rpms/condor/F-9 DetectGCC.patch, NONE, 1.1 condor.spec, 1.14,
	1.15 DetectGCC430.patch, 1.2, NONE
Message-ID: <20090107184255.D81EB70100@cvs1.fedora.phx.redhat.com>

Author: matt

Update of /cvs/pkgs/rpms/condor/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24622

Modified Files:
	condor.spec 
Added Files:
	DetectGCC.patch 
Removed Files:
	DetectGCC430.patch 
Log Message:
updated DetectGCC patch name to be more generic for use across F9 and beyond

DetectGCC.patch:

--- NEW FILE DetectGCC.patch ---
diff -ru condor-7.0.2.orig/src/configure.ac condor-7.0.2/src/configure.ac
--- condor-7.0.2.orig/src/configure.ac	2008-06-11 10:04:54.000000000 -0500
+++ condor-7.0.2/src/configure.ac	2008-06-11 10:04:07.000000000 -0500
@@ -877,6 +877,12 @@
     CompilerMinor="3"
     CompilerPatch="1"
     ;;
+ "4.3.0" )
+    CompilerKind="GCC"
+    CompilerMajor="4"
+    CompilerMinor="3"
+    CompilerPatch="0"
+    ;;
  * )
     if test "x$enable_gcc_version_check" = "xyes"; then
       AC_MSG_RESULT([ERROR])


Index: condor.spec
===================================================================
RCS file: /cvs/pkgs/rpms/condor/F-9/condor.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- condor.spec	7 Jan 2009 18:34:56 -0000	1.14
+++ condor.spec	7 Jan 2009 18:42:25 -0000	1.15
@@ -24,7 +24,7 @@
 Source2: NOTICE.txt
 Patch0: condor_config.generic.patch
 Patch1: stdsoap2.h.patch.patch
-Patch2: DetectGCC430.patch
+Patch2: DetectGCC.patch
 
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 


--- DetectGCC430.patch DELETED ---



From pkgdb at fedoraproject.org  Wed Jan  7 18:49:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 07 Jan 2009 18:49:58 +0000
Subject: [pkgdb] asana-math-fonts had group_acl changed
Message-ID: <20090107184958.917C1208319@bastion.fedora.phx.redhat.com>

jstanley has set the commit acl on asana-math-fonts (Fedora devel) to Denied for provenpackager

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/asana-math-fonts



From pkgdb at fedoraproject.org  Wed Jan  7 18:50:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 07 Jan 2009 18:50:02 +0000
Subject: [pkgdb] asana-math-fonts had group_acl changed
Message-ID: <20090107185002.560AA20831D@bastion.fedora.phx.redhat.com>

jstanley has set the commit acl on asana-math-fonts (Fedora devel) to Approved for provenpackager

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/asana-math-fonts



From matt at fedoraproject.org  Wed Jan  7 18:51:46 2009
From: matt at fedoraproject.org (Matthew Farrellee)
Date: Wed,  7 Jan 2009 18:51:46 +0000 (UTC)
Subject: rpms/condor/F-10 DetectGCC.patch, NONE, 1.1 NOTICE.txt, NONE,
	1.1 stdsoap2.h.patch.patch, NONE, 1.1 .cvsignore, 1.4,
	1.5 condor.spec, 1.9, 1.10 condor_config.generic.patch, 1.1,
	1.2 generate-tarball.sh, 1.2, 1.3 sources, 1.4,
	1.5 DetectGCC432.patch, 1.1, NONE GLibCFlag28.patch, 1.1,
	NONE better-analyze-everywhere.patch, 1.1, NONE
Message-ID: <20090107185146.5463970100@cvs1.fedora.phx.redhat.com>

Author: matt

Update of /cvs/pkgs/rpms/condor/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25702

Modified Files:
	.cvsignore condor.spec condor_config.generic.patch 
	generate-tarball.sh sources 
Added Files:
	DetectGCC.patch NOTICE.txt stdsoap2.h.patch.patch 
Removed Files:
	DetectGCC432.patch GLibCFlag28.patch 
	better-analyze-everywhere.patch 
Log Message:
update to condor 7.2.0

DetectGCC.patch:

--- NEW FILE DetectGCC.patch ---
diff -ru condor-7.0.2.orig/src/configure.ac condor-7.0.2/src/configure.ac
--- condor-7.0.2.orig/src/configure.ac	2008-06-11 10:04:54.000000000 -0500
+++ condor-7.0.2/src/configure.ac	2008-06-11 10:04:07.000000000 -0500
@@ -877,6 +877,12 @@
     CompilerMinor="3"
     CompilerPatch="1"
     ;;
+ "4.3.2" )
+    CompilerKind="GCC"
+    CompilerMajor="4"
+    CompilerMinor="3"
+    CompilerPatch="2"
+    ;;
  * )
     if test "x$enable_gcc_version_check" = "xyes"; then
       AC_MSG_RESULT([ERROR])


--- NEW FILE NOTICE.txt ---
Condor

Copyright (C) 1990-2007, Condor Team, Computer Sciences Department,
University of Wisconsin-Madison, WI.

This source code is covered by the Apache License, Version 2.0, which
can be found in the accompanying LICENSE-2.0.txt file, or online at
http://www.apache.org/licenses/ .

This product includes software developed by and/or derived from the
Globus Project (http://www.globus.org/) to which the U.S. Government
retains certain rights. Copyright (c) 1999 University of Chicago and
The University of Southern California. All Rights Reserved.

This product includes software developed by the OpenSSL Project for
use in the OpenSSL Toolkit (http://www.openssl.org/).  Complete
conditions and disclaimers for OpenSSL can be found at
http://www.openssl.org/source/license.html

Some distributions of Condor include software developed by the 
Info-ZIP Project (http://www.info-zip.org/).  Complete conditions 
and disclaimers for Info-ZIP can be found at 
http://www.info-zip.org/doc/LICENSE

Some distributions of Condor include MAKEMSI software developed by 
Dennis Bareis (http://dennisbareis.com/makemsi.htm).  Complete 
conditions and disclaimers for MAKEMSI can be found at 
http://makemsi-manual.dennisbareis.com/disclaimer.htm

Some distributions of Condor include a compiled, unmodified version
of the GNU C library. The complete source code to GNU glibc can be
found at http://www.gnu.org/software/libc/.

Part of the software embedded in this product is gSOAP software.
Portions created by gSOAP are Copyright (C) 2001-2004 Robert A. van
Engelen, Genivia inc. All Rights Reserved.
THE SOFTWARE IN THIS PRODUCT WAS IN PART PROVIDED BY GENIVIA INC 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.

stdsoap2.h.patch.patch:

--- NEW FILE stdsoap2.h.patch.patch ---
diff --git a/src/condor_daemon_core.V6/stdsoap2.h.patch b/src/condor_daemon_core.V6/stdsoap2.h.patch
index a0fe3ed..c84abe7 100644
--- a/src/condor_daemon_core.V6/stdsoap2.h.patch
+++ b/src/condor_daemon_core.V6/stdsoap2.h.patch
@@ -47,7 +47,7 @@
 @@ -418,8 +427,8 @@
  #endif
  
- #if defined(__cplusplus) && !defined(WITH_LEAN)
+ #if defined(__cplusplus) && !defined(WITH_LEAN) && !defined(WITH_COMPAT)
 -# include <string>
 -# include <iostream>
 +# include <string.h>


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/condor/F-10/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	8 Oct 2008 14:14:17 -0000	1.4
+++ .cvsignore	7 Jan 2009 18:51:15 -0000	1.5
@@ -1 +1 @@
-condor-7.0.5-105846-RH.tar.gz
+condor-7.2.0-121001-RH.tar.gz


Index: condor.spec
===================================================================
RCS file: /cvs/pkgs/rpms/condor/F-10/condor.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- condor.spec	8 Oct 2008 14:53:04 -0000	1.9
+++ condor.spec	7 Jan 2009 18:51:15 -0000	1.10
@@ -1,6 +1,6 @@
 Summary: Condor: High Throughput Computing
 Name: condor
-Version: 7.0.5
+Version: 7.2.0
 Release: 1%{?dist}
 License: ASL 2.0
 Group: Applications/System
@@ -17,37 +17,39 @@
 #   b08743cfa2e87adbcda042896e8ef537  condor_src-7.0.2-all-all.tar.gz
 #   5f326ad522b63eacf34c6c563cf46910  condor_src-7.0.4-all-all.tar.gz
 #   73323100c5b2259f3b9c042fa05451e0  condor_src-7.0.5-all-all.tar.gz
+#   a2dd96ea537b2c6d105b6c8dad563ddc  condor_src-7.2.0-all-all.tar.gz
 # Note: The md5sum of each generated tarball may be different
-Source0: condor-7.0.5-105846-RH.tar.gz
+Source0: condor-7.2.0-121001-RH.tar.gz
 Source1: generate-tarball.sh
+Source2: NOTICE.txt
 Patch0: condor_config.generic.patch
-Patch2: GLibCFlag28.patch
-Patch3: DetectGCC432.patch
-Patch4: autoconf-relax-quoting.patch
+Patch1: stdsoap2.h.patch.patch
+Patch2: DetectGCC.patch
 
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 BuildRequires: imake
 BuildRequires: flex
 BuildRequires: byacc
-BuildRequires: tcsh
 BuildRequires: pcre-devel
 BuildRequires: postgresql-devel
 BuildRequires: openssl-devel
 BuildRequires: krb5-devel
-BuildRequires: gsoap-devel >= 2.7.10-2
+BuildRequires: gsoap-devel >= 2.7.12-1
 BuildRequires: bind-utils
 BuildRequires: m4
 BuildRequires: autoconf
 BuildRequires: classads-devel
+BuildRequires: libX11-devel
 
 Requires: pcre
 Requires: postgresql-libs
 Requires: openssl
 Requires: krb5-libs
-Requires: gsoap >= 2.7.10-2
+Requires: gsoap >= 2.7.12-1
 Requires: mailx
 Requires: classads
+Requires: python >= 2.2
 
 Requires(pre): shadow-utils
 
@@ -71,14 +73,26 @@
 completion.
 
 
-%package static
-Summary: Headers and libraries for interacting with Condor
-Group: Development/System
-Requires: %name = %version-%release
+#%package static
+#Summary: Headers and libraries for interacting with Condor
+#Group: Development/System
+#Requires: %name = %version-%release
+#
+#
+#%description static
+#Headers and libraries for interacting with Condor and its components.
 
 
-%description static
-Headers and libraries for interacting with Condor and its components.
+%package kbdd
+Summary: Condor Keyboard Daemon
+Group: Applications/System
+Requires: %name = %version-%release
+Requires: libX11
+
+%description kbdd
+The condor_kbdd monitors logged in X users for activity. It is only
+useful on systems where no device (e.g. /dev/*) can be used to
+determine console idle time.
 
 
 %pre
@@ -92,10 +106,11 @@
 %prep
 %setup -q -n %{name}-%{version}
 
+cp %{SOURCE2} .
+
 %patch0 -p1
+%patch1 -p1
 %patch2 -p1
-%patch3 -p1
-%patch4 -p1
 
 # fix errant execute permissions
 find src -perm /a+x -type f -name "*.[Cch]" -exec chmod a-x {} \;
@@ -114,18 +129,22 @@
 
 cd src
 ./build_init
-%configure --enable-proper \
+%configure --with-buildid=Fedora-%{version}-%{release} \
+   --enable-proper \
    --disable-full-port \
    --disable-gcc-version-check \
    --disable-glibc-version-check \
    --disable-static \
    --disable-rpm \
+   --enable-kbdd \
+   --disable-hibernation \
+   --disable-lease-manager \
    --without-zlib \
    --with-openssl \
    --with-krb5 \
    --with-postgresql \
    --with-gsoap \
-   --without-classads \
+   --with-classads \
    --with-man=$PWD/../externals/bundles/man/current
 
 # SMP_NUM_JOBS must be set properly to pass -j to make
@@ -148,7 +167,8 @@
 rm -rf %{buildroot}
 
 # make public creates release tarballs which we will install
-cd public/v7.0
+oldpwd=$PWD
+cd public/v7.2
 gzip -cd condor-%{version}-*-dynamic-unstripped.tar.gz | tar x
 cd condor-%{version}
 
@@ -158,6 +178,21 @@
 
 cp $PREFIX/etc/examples/condor_config.generic $PREFIX/etc/condor_config
 
+# the default condor_config file is not architecture aware and thus
+# sets the LIB directory to always be /usr/lib, we want to do better
+# than that. this is, so far, the best place to do this
+# specialization. we strip the "lib" or "lib64" part from _libdir and
+# stick it in the LIB variable in the config.
+LIB=$(echo %{?_libdir} | sed -e 's:/usr/\(.*\):\1:')
+if [ "$LIB" = "%_libdir" ]; then
+  echo "_libdir does not contain /usr, sed expression needs attention"
+  exit 1
+fi
+sed -e "s:^LIB\s*=.*:LIB = \$(RELEASE_DIR)/$LIB/condor:" \
+  $PREFIX/etc/examples/condor_config.generic \
+  > $PREFIX/etc/condor_config
+
+
 mkdir $PREFIX/local_dir
 mkdir -m1777 $PREFIX/local_dir/execute
 mkdir -m0755 $PREFIX/local_dir/log
@@ -191,9 +226,117 @@
 # the libcondorapi.so is not properly created, instead of providing it
 # we will provide the .a version in a static package
 rm $PREFIX/lib/libcondorapi.so
-# sbin/condor and uniq_pid_command are pointless hard links
+# sbin/condor is a pointless hard links
 rm $PREFIX/sbin/condor
+
+# not packaging the condor_startd_factory right now
+rm $PREFIX/sbin/condor_startd_factory
+rm $PREFIX/lib/webservice/condorStartdFactory.wsdl
+rm $PREFIX/libexec/bgp_available_partitions
+rm $PREFIX/libexec/bgp_back_partition
+rm $PREFIX/libexec/bgp_boot_partition
+rm $PREFIX/libexec/bgp_destroy_partition
+rm $PREFIX/libexec/bgp_generate_partition
+rm $PREFIX/libexec/bgp_query_work_loads
+rm $PREFIX/libexec/bgp_shutdown_partition
+
+# not packaging uninteresting WSDL files, except for the master
+rm $PREFIX/lib/webservice/condorCgahp.wsdl
+rm $PREFIX/lib/webservice/condorDagman.wsdl
+rm $PREFIX/lib/webservice/condorDbmsd.wsdl
+rm $PREFIX/lib/webservice/condorDcskel.wsdl
+rm $PREFIX/lib/webservice/condorEventd.wsdl
+rm $PREFIX/lib/webservice/condorGridmanager.wsdl
+rm $PREFIX/lib/webservice/condorHad.wsdl
+rm $PREFIX/lib/webservice/condorJobRouter.wsdl
+rm $PREFIX/lib/webservice/condorKbdd.wsdl
+rm $PREFIX/lib/webservice/condorNegotiator.wsdl
+rm $PREFIX/lib/webservice/condorShadow.wsdl
+rm $PREFIX/lib/webservice/condorStartd.wsdl
+rm $PREFIX/lib/webservice/condorStarter.wsdl
+rm $PREFIX/lib/webservice/condorTransferd.wsdl
+rm $PREFIX/lib/webservice/condorTt.wsdl
+rm $PREFIX/lib/webservice/condorVMgahp.wsdl
+
+
+# not packaging glexec support right now
+rm $PREFIX/libexec/condor_glexec_cleanup
+rm $PREFIX/libexec/condor_glexec_job_wrapper
+rm $PREFIX/libexec/condor_glexec_kill
+rm $PREFIX/libexec/condor_glexec_run
+rm $PREFIX/libexec/condor_glexec_setup
+# not shipping gt42 gahp right now
+rm $PREFIX/sbin/gt42_gahp
+
+# not going to package the sc2005 negotiator
+#rm $PREFIX/sbin/condor_lease_manager
+
+# not going to package these until we know what they are
+rm $PREFIX/bin/condor_power
+rm $PREFIX/sbin/condor_set_shutdown
+
+# not packaging glidein support, depends on globus
+rm $PREFIX/man/man1/condor_glidein.1
+rm $PREFIX/bin/condor_glidein
+
+# not packaging deployment tools
+# sbin/uniq_pid_command is a link for uniq_pid_midwife/undertaker
 rm $PREFIX/sbin/uniq_pid_command
+rm $PREFIX/sbin/uniq_pid_midwife
+rm $PREFIX/sbin/uniq_pid_undertaker
+rm $PREFIX/sbin/cleanup_release
+rm $PREFIX/sbin/condor_local_stop
+rm $PREFIX/sbin/condor_cleanup_local
+rm $PREFIX/sbin/condor_cold_start
+rm $PREFIX/sbin/condor_cold_stop
+rm $PREFIX/sbin/condor_config_bind
+rm $PREFIX/sbin/filelock_midwife
+rm $PREFIX/sbin/filelock_undertaker
+rm $PREFIX/sbin/condor_install_local
+rm $PREFIX/sbin/condor_local_start
+rm $PREFIX/sbin/install_release
+rm $PREFIX/lib/Execute.pm
+rm $PREFIX/lib/FileLock.pm
+rm $PREFIX/man/man1/condor_config_bind.1
+rm $PREFIX/man/man1/condor_cold_start.1
+rm $PREFIX/man/man1/condor_cold_stop.1
+
+# not packaging the ckpt server
+rm $PREFIX/sbin/condor_ckpt_server
+
+# not packaging standard universe
+rm $PREFIX/bin/condor_checkpoint
+rm $PREFIX/sbin/condor_shadow.std
+rm $PREFIX/sbin/condor_starter.std
+rm $PREFIX/bin/condor_compile
+rm $PREFIX/man/man1/condor_compile.1
+rm $PREFIX/man/man1/condor_checkpoint.1
+rm $PREFIX/libexec/condor_ckpt_probe
+
+# not packaging configure/install scripts
+rm $PREFIX/man/man1/condor_configure.1
+rm $PREFIX/sbin/condor_configure
+rm $PREFIX/sbin/condor_install
+
+# not packaging legacy cruft
+rm $PREFIX/man/man1/condor_master_off.1
+rm $PREFIX/sbin/condor_master_off
+rm $PREFIX/man/man1/condor_reconfig_schedd.1
+rm $PREFIX/sbin/condor_reconfig_schedd
+rm $PREFIX/man/man1/condor_convert_history.1
+rm $PREFIX/sbin/condor_convert_history
+
+# not packaging anything globus related
+rm $PREFIX/sbin/condor_gridshell
+rm $PREFIX/sbin/grid_monitor.sh
+rm $PREFIX/sbin/gt4_gahp
+
+# not packaging unsupported gahps
+rm $PREFIX/sbin/unicore_gahp
+
+# not packaging libcondorapi.a
+rm $PREFIX/lib/libcondorapi.a
+
 
 # some scripts are examples but have exec bits set anyway
 chmod a-x $PREFIX/etc/examples/condor.boot
@@ -204,14 +347,17 @@
 populate %_mandir/man1 $PREFIX/man/man1/*
 populate %_bindir $PREFIX/bin/*
 populate %_sbindir $PREFIX/sbin/*
-populate %_usrsrc $PREFIX/src/chirp
 populate %_sysconfdir/condor $PREFIX/etc/condor_config
-populate %_includedir/condor $PREFIX/include/*
-populate %_libdir $PREFIX/lib/libcondorapi.a
+# no -static package
+#populate %_usrsrc $PREFIX/src/chirp
+#populate %_includedir/condor $PREFIX/include/*
+#populate %_libdir $PREFIX/lib/libcondorapi.a
 populate %_datadir/condor $PREFIX/lib/*
+populate %_datadir/condor/sql $PREFIX/sql/*
 populate %_libexecdir/condor $PREFIX/libexec/*
 populate %_var/lib/condor $PREFIX/local_dir/*
 
+
 # install the lsb init script
 install -Dp -m0755 $PREFIX/etc/examples/condor.init %buildroot/%_initrddir/condor
 
@@ -243,54 +389,35 @@
 %_datadir/condor/CondorJavaInfo.class
 %_datadir/condor/CondorJavaWrapper.class
 %_datadir/condor/Condor.pm
-%_datadir/condor/Execute.pm
-%_datadir/condor/FileLock.pm
 %_datadir/condor/scimark2lib.jar
 %dir %_datadir/condor/webservice/
-%_datadir/condor/webservice/condorAccountant.wsdl
-%_datadir/condor/webservice/condorCgahp.wsdl
 %_datadir/condor/webservice/condorCollector.wsdl
-%_datadir/condor/webservice/condorDagman.wsdl
-%_datadir/condor/webservice/condorDbmsd.wsdl
-%_datadir/condor/webservice/condorDcskel.wsdl
-%_datadir/condor/webservice/condorEventd.wsdl
-%_datadir/condor/webservice/condorGridmanager.wsdl
-%_datadir/condor/webservice/condorHad.wsdl
 %_datadir/condor/webservice/condorMaster.wsdl
-%_datadir/condor/webservice/condorNegotiator.wsdl
 %_datadir/condor/webservice/condorSchedd.wsdl
-%_datadir/condor/webservice/condorShadow.wsdl
-%_datadir/condor/webservice/condorStartd.wsdl
-%_datadir/condor/webservice/condorStarter.wsdl
-%_datadir/condor/webservice/condorTransferd.wsdl
-%_datadir/condor/webservice/condorVMgahp.wsdl
+%dir %_datadir/condor/sql/
+%_datadir/condor/sql/common_createddl.sql
+%_datadir/condor/sql/oracle_createddl.sql
+%_datadir/condor/sql/oracle_dropddl.sql
+%_datadir/condor/sql/pgsql_createddl.sql
+%_datadir/condor/sql/pgsql_dropddl.sql
 %dir %_libexecdir/condor/
 %_libexecdir/condor/condor_chirp
 %_libexecdir/condor/condor_ssh
 %_libexecdir/condor/sshd.sh
-%_libexecdir/condor/condor_ckpt_probe
+%_libexecdir/condor/condor_job_router
 %_libexecdir/condor/gridftp_wrapper.sh
 %_mandir/man1/condor_advertise.1.gz
-%_mandir/man1/condor_checkpoint.1.gz
 %_mandir/man1/condor_check_userlogs.1.gz
 %_mandir/man1/condor_chirp.1.gz
 %_mandir/man1/condor_cod.1.gz
-%_mandir/man1/condor_cold_start.1.gz
-%_mandir/man1/condor_cold_stop.1.gz
-%_mandir/man1/condor_compile.1.gz
-%_mandir/man1/condor_config_bind.1.gz
-%_mandir/man1/condor_convert_history.1.gz
-%_mandir/man1/condor_configure.1.gz
 %_mandir/man1/condor_config_val.1.gz
 %_mandir/man1/condor_dagman.1.gz
 %_mandir/man1/condor_fetchlog.1.gz
 %_mandir/man1/condor_findhost.1.gz
-%_mandir/man1/condor_glidein.1.gz
 %_mandir/man1/condor_history.1.gz
 %_mandir/man1/condor_hold.1.gz
 %_mandir/man1/condor_load_history.1.gz
 %_mandir/man1/condor_master.1.gz
-%_mandir/man1/condor_master_off.1.gz
 %_mandir/man1/condor_off.1.gz
 %_mandir/man1/condor_on.1.gz
 %_mandir/man1/condor_preen.1.gz
@@ -298,7 +425,6 @@
 %_mandir/man1/condor_q.1.gz
 %_mandir/man1/condor_qedit.1.gz
 %_mandir/man1/condor_reconfig.1.gz
-%_mandir/man1/condor_reconfig_schedd.1.gz
 %_mandir/man1/condor_release.1.gz
 %_mandir/man1/condor_reschedule.1.gz
 %_mandir/man1/condor_restart.1.gz
@@ -319,10 +445,8 @@
 %_mandir/man1/condor_wait.1.gz
 # bin/condor is a link for checkpoint, reschedule, vacate
 %_bindir/condor
-%_bindir/condor_glidein
 %_bindir/condor_load_history
 %_bindir/condor_submit_dag
-%_bindir/condor_checkpoint
 %_bindir/condor_prio
 %_bindir/condor_transfer_data
 %_bindir/condor_check_userlogs
@@ -331,7 +455,6 @@
 %_bindir/condor_cod
 %_bindir/condor_qedit
 %_bindir/condor_userlog
-%_bindir/condor_compile
 %_bindir/condor_release
 %_bindir/condor_userlog_job_counter
 %_bindir/condor_config_val
@@ -342,6 +465,9 @@
 %_bindir/condor_vacate
 %_bindir/condor_dump_history
 %_bindir/condor_run
+%_bindir/condor_router_history
+%_bindir/condor_router_q
+%_bindir/condor_router_rm
 %_bindir/condor_vacate_job
 %_bindir/condor_findhost
 %_bindir/condor_stats
@@ -351,31 +477,17 @@
 %_bindir/condor_wait
 %_bindir/condor_hold
 %_bindir/condor_submit
-%_sbindir/cleanup_release
 # sbin/condor is a link for master_off, off, on, reconfig,
 # reconfig_schedd, restart
 %_sbindir/condor_advertise
 %_sbindir/condor_c-gahp
 %_sbindir/condor_c-gahp_worker_thread
-%_sbindir/condor_ckpt_server
-%_sbindir/condor_cleanup_local
-%_sbindir/condor_cold_start
-%_sbindir/condor_cold_stop
 %_sbindir/condor_collector
-%_sbindir/condor_config_bind
-%_sbindir/condor_configure
-%_sbindir/condor_convert_history
 %_sbindir/condor_dbmsd
 %_sbindir/condor_fetchlog
-%_sbindir/condor_gridshell
 %_sbindir/condor_had
 %_sbindir/condor_init
-%_sbindir/condor_install
-%_sbindir/condor_install_local
-%_sbindir/condor_local_start
-%_sbindir/condor_local_stop
 %_sbindir/condor_master
-%_sbindir/condor_master_off
 %_sbindir/condor_negotiator
 %_sbindir/condor_off
 %_sbindir/condor_on
@@ -383,32 +495,21 @@
 %_sbindir/condor_procd
 %_sbindir/condor_quill
 %_sbindir/condor_reconfig
-%_sbindir/condor_reconfig_schedd
 %_sbindir/condor_replication
 %_sbindir/condor_restart
 %_sbindir/condor_root_switchboard
 %_sbindir/condor_schedd
 %_sbindir/condor_shadow
-%_sbindir/condor_shadow.std
 %_sbindir/condor_startd
 %_sbindir/condor_starter
-%_sbindir/condor_starter.std
 %_sbindir/condor_store_cred
 %_sbindir/condor_transferd
 %_sbindir/condor_updates_stats
 %_sbindir/condor_vm-gahp
+%_sbindir/amazon_gahp
 %_sbindir/condor_vm_vmware.pl
 %_sbindir/condor_vm_xen.sh
-%_sbindir/filelock_midwife
-%_sbindir/filelock_undertaker
-%_sbindir/install_release
 %_sbindir/condor_gridmanager
-%_sbindir/grid_monitor.sh
-%_sbindir/gt4_gahp
-%_sbindir/unicore_gahp
-# sbin/uniq_pid_command is a link for uniq_pid_midwife/undertaker
-%_sbindir/uniq_pid_midwife
-%_sbindir/uniq_pid_undertaker
 %config(noreplace) %_var/lib/condor/condor_config.local
 %defattr(-,condor,condor,-)
 %dir %_var/lib/condor/
@@ -417,26 +518,37 @@
 %dir %_var/lib/condor/spool/
 
 
-%files static
+#%files static
+#%defattr(-,root,root,-)
+#%doc LICENSE-2.0.txt
+#%_libdir/libcondorapi.a
+#%dir %_includedir/condor/
+#%_includedir/condor/condor_constants.h
+#%_includedir/condor/condor_event.h
+#%_includedir/condor/condor_holdcodes.h
+#%_includedir/condor/file_lock.h
+#%_includedir/condor/user_log.c++.h
+#%doc %_includedir/condor/user_log.README
+#%dir %_usrsrc/chirp/
+#%_usrsrc/chirp/chirp_client.c
+#%_usrsrc/chirp/chirp_client.h
+#%_usrsrc/chirp/chirp_protocol.h
+
+
+%files kbdd
 %defattr(-,root,root,-)
-%doc LICENSE-2.0.txt
-%_libdir/libcondorapi.a
-%dir %_includedir/condor/
-%_includedir/condor/condor_constants.h
-%_includedir/condor/condor_event.h
-%_includedir/condor/condor_holdcodes.h
-%_includedir/condor/file_lock.h
-%_includedir/condor/user_log.c++.h
-%doc %_includedir/condor/user_log.README
-%dir %_usrsrc/chirp/
-%_usrsrc/chirp/chirp_client.c
-%_usrsrc/chirp/chirp_client.h
-%_usrsrc/chirp/chirp_protocol.h
+%doc LICENSE-2.0.txt NOTICE.txt
+%_sbindir/condor_kbdd
 
 
 %post -n condor
 /sbin/chkconfig --add condor
 /sbin/ldconfig
+test -x /usr/sbin/selinuxenabled && /usr/sbin/selinuxenabled
+if [ $? = 0 ]; then
+   semanage fcontext -a -t unconfined_execmem_exec_t %_sbindir/condor_startd 
+   restorecon  %_sbindir/condor_startd
+fi
 
 
 %preun -n condor
@@ -454,14 +566,19 @@
 
 
 %changelog
+* Wed Jan  7 2009  <matt at redhat> - 7.2.0-1
+- Upgraded to 7.2.0 release
+- Removed -static package
+- Added Fedora specific buildid
+- Enabled KBDD, daemon to monitor X usage on systems with only USB devs
+- Updated install process
+
 * Wed Oct  8 2008  <matt at redhat> - 7.0.5-1
 - Rebased on 7.0.5, security update
 
 * Wed Aug  6 2008  <mfarrellee at redhat> - 7.0.4-1
 - Updated to 7.0.4 source
 - Stopped using condor_configure in install step
-- Patched aclocal.m4 to handle autoconf 2.62
-- Patched configure.ac to handle gcc-4.3.1
 
 * Tue Jun 10 2008  <mfarrellee at redhat> - 7.0.2-1
 - Updated to 7.0.2 source

condor_config.generic.patch:

Index: condor_config.generic.patch
===================================================================
RCS file: /cvs/pkgs/rpms/condor/F-10/condor_config.generic.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- condor_config.generic.patch	6 Aug 2008 15:04:10 -0000	1.1
+++ condor_config.generic.patch	7 Jan 2009 18:51:15 -0000	1.2
@@ -1,8 +1,66 @@
 diff --git a/src/condor_examples/condor_config.generic b/src/condor_examples/condor_config.generic
-index c119679..e795a15 100644
+index f3f60a5..94c146f 100644
 --- a/src/condor_examples/condor_config.generic
 +++ b/src/condor_examples/condor_config.generic
-@@ -51,19 +51,16 @@
+@@ -1,15 +1,35 @@
+ ######################################################################
++######################################################################
++##                                                                  ##
++##  N O T I C E:                                                    ##
++##                                                                  ##
++##       Customization of this file should be done via the          ##
++##       LOCAL_CONFIG_FILE.                                         ##
++##                                                                  ##
++######################################################################
++######################################################################
++
++
++######################################################################
+ ##
+ ##  condor_config
+ ##
+ ##  This is the global configuration file for condor.  Any settings
+-##  made here may potentially be overridden in the local configuration
+-##  file.  KEEP THAT IN MIND!  To double-check that a variable is
+-##  getting set from the configuration file that you expect, use
+-##  condor_config_val -v <variable name>
++##  found here * * s h o u l d   b e   c u s t o m i z e d   i n
++##  t h e   l o c a l   c o n f i g u r a t i o n   f i l e. * *
++##
++##  The local configuration file is specified by LOCAL_CONFIG_FILE
++##  below.
++##
++##  For a basic configuration, you may only want to start by
++##  customizing CONDOR_ADMIN.
++##
++##  Note: To double-check where a configuration variable is set from
++##  you can use condor_config_val -v <variable name>,
++##  e.g. condor_config_val -v CONDOR_ADMIN.
+ ##
+ ##  The file is divided into four main parts:
+-##  Part 1:  Settings you MUST customize 
++##  Part 1:  Settings you likely want to customize 
+ ##  Part 2:  Settings you may want to customize
+ ##  Part 3:  Settings that control the policy of when condor will
+ ##           start and stop jobs on your machines
+@@ -21,11 +41,6 @@
+ ##  various settings in here and possible ways to configure your
+ ##  pool. 
+ ##
+-##  If you are installing Condor as root and then handing over the
+-##  administration of this file to a person you do not trust with
+-##  root access, please read the Installation chapter paying careful
+-##  note to the condor_config.root entries.
+-##
+ ##  Unless otherwise specified, settings that are commented out show
+ ##  the defaults that are used if you don't define a value.  Settings
+ ##  that are defined here MUST BE DEFINED since they have no default
+@@ -47,18 +62,15 @@
+ ##  #        #    #  #   #      #              #
+ ##  #        #    #  #    #     #            #####
+ ##
+-##  Part 1:  Settings you must customize:
++##  Part 1:  Settings you likely want to customize:
  ######################################################################
  ######################################################################
  
@@ -18,13 +76,25 @@
  
  ##  Where is the local condor directory for each host?  
  ##  This is where the local config file(s), logs and
- ##  spool/execute directories are located
--LOCAL_DIR		= $(TILDE)
-+LOCAL_DIR		= /var/lib/condor
- #LOCAL_DIR		= $(RELEASE_DIR)/hosts/$(HOSTNAME)
+@@ -72,7 +84,7 @@ LOCAL_CONFIG_FILE	= $(LOCAL_DIR)/condor_config.local
+ 
+ ## If the local config file is not present, is it an error?
+ ## WARNING: This is a potential security issue. 
+-## If not specificed, te default is True
++## If not specificed, the default is True
+ #REQUIRE_LOCAL_CONFIG_FILE = TRUE
+ 
+ ##--------------------------------------------------------------------
+@@ -84,7 +96,7 @@ CONDOR_ADMIN		= condor-admin at your.domain
  
- ##  Where is the machine-specific local config file for each host?
-@@ -93,13 +90,13 @@ MAIL			= /usr/bin/mail
+ ##  Full path to a mail delivery program that understands that "-s"
+ ##  means you want to specify a subject:
+-MAIL			= /usr/bin/mail
++MAIL			= /bin/mail
+ 
+ ##--------------------------------------------------------------------
+ ##  Network domain parameters:
+@@ -93,13 +105,13 @@ MAIL			= /usr/bin/mail
  ##  machines don't share a common UID space, set it to 
  ##  UID_DOMAIN = $(FULL_HOSTNAME)
  ##  to specify that each machine has its own UID space.
@@ -40,7 +110,7 @@
  
  ##  This macro is used to specify a short description of your pool. 
  ##  It should be about 20 characters long. For example, the name of 
-@@ -218,7 +215,7 @@ HOSTALLOW_READ = *
+@@ -218,7 +230,7 @@ HOSTALLOW_READ = *
  ##    HOSTALLOW_WRITE = *
  ##  but note that this will allow anyone to submit jobs or add
  ##  machines to your pool and is serious security risk.
@@ -49,17 +119,61 @@
  #HOSTALLOW_WRITE = *.your.domain, your-friend's-machine.other.domain
  #HOSTDENY_WRITE = bad-machine.your.domain
  
-@@ -859,10 +856,10 @@ LOG		= $(LOCAL_DIR)/log
- SPOOL		= $(LOCAL_DIR)/spool
+@@ -231,10 +243,9 @@ HOSTALLOW_NEGOTIATOR = $(CONDOR_HOST)
+ HOSTALLOW_NEGOTIATOR_SCHEDD = $(CONDOR_HOST), $(FLOCK_NEGOTIATOR_HOSTS)
+ 
+ ##  Config access.  Machines listed here can use the condor_config_val
+-##  tool to modify all daemon configurations except those specified in
+-##  the condor_config.root file.  This level of host-wide access
+-##  should only be granted with extreme caution.  By default, config
+-##  access is denied from all hosts.
++##  tool to modify all daemon configurations.  This level of host-wide
++##  access should only be granted with extreme caution.  By default,
++##  config access is denied from all hosts.
+ #HOSTALLOW_CONFIG = trusted-host.your.domain
+ 
+ ##  Flocking Configs.  These are the real things that Condor looks at,
+@@ -872,9 +883,10 @@ SPOOL		= $(LOCAL_DIR)/spool
  EXECUTE		= $(LOCAL_DIR)/execute
  BIN		= $(RELEASE_DIR)/bin
--LIB		= $(RELEASE_DIR)/lib
+ LIB		= $(RELEASE_DIR)/lib
 -INCLUDE		= $(RELEASE_DIR)/include
-+LIB		= $(RELEASE_DIR)/share/condor
 +INCLUDE		= $(RELEASE_DIR)/include/condor
  SBIN		= $(RELEASE_DIR)/sbin
 -LIBEXEC		= $(RELEASE_DIR)/libexec
 +LIBEXEC		= $(RELEASE_DIR)/libexec/condor
++SHARE		= $(RELEASE_DIR)/share/condor
  
  ## If you leave HISTORY undefined (comment it out), no history file
  ## will be created. 
+@@ -1655,7 +1667,7 @@ JAVA_MAXHEAP_ARGUMENT = -Xmx
+ ## them here.  However, do not remove the existing entries, as Condor
+ ## needs them.
+ 
+-JAVA_CLASSPATH_DEFAULT = $(LIB) $(LIB)/scimark2lib.jar .
++JAVA_CLASSPATH_DEFAULT = $(SHARE) $(SHARE)/scimark2lib.jar .
+ 
+ ##  JAVA_CLASSPATH_ARGUMENT describes the command-line parameter
+ ##  used to introduce a new classpath:
+@@ -2299,7 +2311,7 @@ LeaseManager			= $(SBIN)/condor_lease_manager
+ # Turn on the lease manager
+ #DAEMON_LIST			= $(DAEMON_LIST), LeaseManager
+ 
+-# The identification and location of the quill daemon for local clients.
++# The identification and location of the lease manager for local clients.
+ LeaseManger_ADDRESS_FILE	= $(LOG)/.lease_manager_address
+ 
+ ## LeaseManager startup arguments
+diff --git a/src/condor_examples/customize b/src/condor_examples/customize
+index b1c5710..cb2dea1 100644
+--- a/src/condor_examples/customize
++++ b/src/condor_examples/customize
+@@ -54,7 +54,7 @@ sub get_platform_defaults {
+     $_ = $os;
+   SWITCH: {
+       if(/^Linux/) { 
+-	  $mail_path="/usr/bin/mail";
++	  $mail_path="/bin/mail";
+ 	  $ps_path="/bin/ps auwx";
+ 	  $console_devs="mouse, console";
+ 	  last SWITCH;


Index: generate-tarball.sh
===================================================================
RCS file: /cvs/pkgs/rpms/condor/F-10/generate-tarball.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- generate-tarball.sh	6 Aug 2008 15:04:10 -0000	1.2
+++ generate-tarball.sh	7 Jan 2009 18:51:15 -0000	1.3
@@ -12,6 +12,7 @@
 echo "...extracting $input"
 tar xzf $input
 
+#cd condor_src-$1
 cd condor-$1
 
 if [ ! -f BUILD-ID ] ; then
@@ -22,16 +23,57 @@
 
 echo "...recording BUILD-ID: $build"
 
-echo "...removing NTconfig directory"
-rm -rf NTconfig
+for f in \
+    src/condor_mail \
+    src/condor_vm-gahp/cygwin1.dll \
+    src/condor_vm-gahp/mkisofs.exe \
+    config/CONDOR_TEST_LRG \
+    src/condor_tests/job_vmu_basic.sh \
+    src/condor_tests/job_vmu_cdrom.run \
+    src/condor_tests/job_vmu_cdrom.sh \
+    src/condor_tests/job_vmu_ckpt.run \
+    src/condor_tests/job_vmu_ckpt.sh \
+    src/condor_tests/job_vmu_network.key \
+    src/condor_tests/job_vmu_network.run \
+    src/condor_tests/job_vmu_network.sh \
+    src/condor_tests/job_vmu_basic.run \
+    src/condor_tests/x_vm_utils.pm \
+    src/condor_tests/x_param.vmware \
+    src/condor_tests/x_vmware_test_vm.cmd \
+    src/condor_tests/x_vmware_test_vm.tar.gz \
+    src/condor_tests/x_vmware_configpostsrc \
+    config/CONDOR_TEST_CNFDTL \
+    src/condor_tests/job_ligo_x86-64-chkpttst.cmd \
+    src/condor_tests/job_ligo_x86-64-chkpttst.run \
+    src/condor_tests/x_job_ligo_x86-64-chkpttst.tar.gz \
+    src/condor_tests/job_quill_basic.cmd \
+    src/condor_tests/job_quill_basic.pl \
+    src/condor_tests/job_quill_basic.run \
+    src/condor_tests/x_job_quill_basic.template \
+    src/condor_tests/x_job_quill_supw \
+    src/condor_tests/x_param.quill \
+    src/condor_tests/x_postgress_quill.conf \
+    src/condor_tests/x_quill_buildperlmods.pl \
+    src/condor_tests/x_quill_config_postsrc.template \
+    src/condor_tests/x_quill_Expect-1.20.tar.gz \
+    src/condor_tests/x_quill_IO-Tty-1.07.tar.gz \
+    src/condor_tests/x_quill_pgsqlinstall.pl \
+    src/condor_tests/x_quill_pgsqlstop.pl \
+    src/condor_tests/x_quill_readline-5.2.tar.gz \
+    src/condor_tests/x_quill_readlineinstall.pl;
+do
+    echo "...removing $f";
+    rm -r $f;
+done;
 
 echo "...removing all externals except 'man'"
 mv externals/bundles/man externals/
-rm -rf externals/bundles/*
+rm -r externals/bundles/*
 mv externals/man externals/bundles/
 
 echo "...creating condor-$1-$build-RH.tar.gz"
 cd ..
+#mv condor_src-$1 condor-$1
 tar czfsp condor-$1-$build-RH.tar.gz condor-$1
 
 echo "...cleaning up"


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/condor/F-10/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	8 Oct 2008 14:14:17 -0000	1.4
+++ sources	7 Jan 2009 18:51:15 -0000	1.5
@@ -1 +1 @@
-132e01af31659d71c5f3c5d850f9c3eb  condor-7.0.5-105846-RH.tar.gz
+e84581852745cc46b25a7e9b28e2046f  condor-7.2.0-121001-RH.tar.gz


--- DetectGCC432.patch DELETED ---


--- GLibCFlag28.patch DELETED ---


--- better-analyze-everywhere.patch DELETED ---



From matt at fedoraproject.org  Wed Jan  7 18:57:20 2009
From: matt at fedoraproject.org (Matthew Farrellee)
Date: Wed,  7 Jan 2009 18:57:20 +0000 (UTC)
Subject: rpms/condor/F-9 NOTICE.txt,NONE,1.1
Message-ID: <20090107185720.9B57370100@cvs1.fedora.phx.redhat.com>

Author: matt

Update of /cvs/pkgs/rpms/condor/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26348

Added Files:
	NOTICE.txt 
Log Message:
missed NOTICE.txt


--- NEW FILE NOTICE.txt ---
Condor

Copyright (C) 1990-2007, Condor Team, Computer Sciences Department,
University of Wisconsin-Madison, WI.

This source code is covered by the Apache License, Version 2.0, which
can be found in the accompanying LICENSE-2.0.txt file, or online at
http://www.apache.org/licenses/ .

This product includes software developed by and/or derived from the
Globus Project (http://www.globus.org/) to which the U.S. Government
retains certain rights. Copyright (c) 1999 University of Chicago and
The University of Southern California. All Rights Reserved.

This product includes software developed by the OpenSSL Project for
use in the OpenSSL Toolkit (http://www.openssl.org/).  Complete
conditions and disclaimers for OpenSSL can be found at
http://www.openssl.org/source/license.html

Some distributions of Condor include software developed by the 
Info-ZIP Project (http://www.info-zip.org/).  Complete conditions 
and disclaimers for Info-ZIP can be found at 
http://www.info-zip.org/doc/LICENSE

Some distributions of Condor include MAKEMSI software developed by 
Dennis Bareis (http://dennisbareis.com/makemsi.htm).  Complete 
conditions and disclaimers for MAKEMSI can be found at 
http://makemsi-manual.dennisbareis.com/disclaimer.htm

Some distributions of Condor include a compiled, unmodified version
of the GNU C library. The complete source code to GNU glibc can be
found at http://www.gnu.org/software/libc/.

Part of the software embedded in this product is gSOAP software.
Portions created by gSOAP are Copyright (C) 2001-2004 Robert A. van
Engelen, Genivia inc. All Rights Reserved.
THE SOFTWARE IN THIS PRODUCT WAS IN PART PROVIDED BY GENIVIA INC 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.



From scop at fedoraproject.org  Wed Jan  7 19:08:09 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Wed,  7 Jan 2009 19:08:09 +0000 (UTC)
Subject: rpms/vdr-femon/devel .cvsignore, 1.13, 1.14 sources, 1.13,
	1.14 vdr-femon.spec, 1.17, 1.18
Message-ID: <20090107190809.8675670100@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/vdr-femon/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28180

Modified Files:
	.cvsignore sources vdr-femon.spec 
Log Message:
* Wed Jan  7 2009 Ville Skytt?? <ville.skytta at iki.fi> - 1.6.6-1
- 1.6.6.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/vdr-femon/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	17 Dec 2008 22:18:48 -0000	1.13
+++ .cvsignore	7 Jan 2009 19:07:39 -0000	1.14
@@ -1 +1 @@
-vdr-femon-1.6.5.tgz
+vdr-femon-1.6.6.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/vdr-femon/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	17 Dec 2008 22:18:48 -0000	1.13
+++ sources	7 Jan 2009 19:07:39 -0000	1.14
@@ -1 +1 @@
-3030bbd30aa161944ff74b744473d920  vdr-femon-1.6.5.tgz
+f8ce11ac52b1dc4f851c17610904d9bf  vdr-femon-1.6.6.tgz


Index: vdr-femon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vdr-femon/devel/vdr-femon.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- vdr-femon.spec	17 Dec 2008 22:18:48 -0000	1.17
+++ vdr-femon.spec	7 Jan 2009 19:07:39 -0000	1.18
@@ -3,7 +3,7 @@
 %define apiver    %(vdr-config --apiversion 2>/dev/null || echo ERROR)
 
 Name:           vdr-%{pname}
-Version:        1.6.5
+Version:        1.6.6
 Release:        1%{?dist}
 Summary:        DVB frontend status monitor plugin for VDR
 
@@ -61,6 +61,9 @@
 
 
 %changelog
+* Wed Jan  7 2009 Ville Skytt?? <ville.skytta at iki.fi> - 1.6.6-1
+- 1.6.6.
+
 * Wed Dec 17 2008 Ville Skytt?? <ville.skytta at iki.fi> - 1.6.5-1
 - 1.6.5.
 



From rdieter at fedoraproject.org  Wed Jan  7 19:19:16 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed,  7 Jan 2009 19:19:16 +0000 (UTC)
Subject: rpms/xine-lib/devel .cvsignore, 1.17, 1.18 sources, 1.18,
	1.19 xine-lib-cleanup-sources.sh, 1.7, 1.8 xine-lib.spec, 1.50,
	1.51 xine-lib-1.1.15-ansi.patch, 1.1, NONE
Message-ID: <20090107191916.9AD3D70100@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/xine-lib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29475

Modified Files:
	.cvsignore sources xine-lib-cleanup-sources.sh xine-lib.spec 
Removed Files:
	xine-lib-1.1.15-ansi.patch 
Log Message:
* Wed Jan 07 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.1.16-1
- xine-lib-1.1.16, plugin ABI 1.25
- --with-external-libdvdnav, include demuxers (#213597)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xine-lib/devel/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- .cvsignore	15 Aug 2008 19:38:41 -0000	1.17
+++ .cvsignore	7 Jan 2009 19:18:46 -0000	1.18
@@ -1,2 +1,2 @@
-xine-lib-1.1.15-autotools.patch.bz2
-xine-lib-1.1.15-pruned.tar.bz2
+xine-lib-1.1.16-autotools.patch.bz2
+xine-lib-1.1.16-pruned.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xine-lib/devel/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources	15 Aug 2008 19:38:41 -0000	1.18
+++ sources	7 Jan 2009 19:18:46 -0000	1.19
@@ -1,2 +1,2 @@
-ffd74ec893a5f1167c69987a68f436fd  xine-lib-1.1.15-autotools.patch.bz2
-acdbdc024382afac111eb076304448ed  xine-lib-1.1.15-pruned.tar.bz2
+5caed155987cd453b6e23b8720dfbd3d  xine-lib-1.1.16-autotools.patch.bz2
+512f31d8414ef4654ca366c0dce37301  xine-lib-1.1.16-pruned.tar.bz2


Index: xine-lib-cleanup-sources.sh
===================================================================
RCS file: /cvs/pkgs/rpms/xine-lib/devel/xine-lib-cleanup-sources.sh,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- xine-lib-cleanup-sources.sh	19 Mar 2008 19:51:59 -0000	1.7
+++ xine-lib-cleanup-sources.sh	7 Jan 2009 19:18:46 -0000	1.8
@@ -56,11 +56,12 @@
   sed -i -e "/xineplug_inp_$p/d" src/input/Makefile.am
 done
 # Demuxers
-for p in mpeg mpeg_block mpeg_ts mpeg_elem mpeg_pes yuv4mpeg2; do
-  echo "removing $p demuxer..."
-  [ -f src/demuxers/demux_$p.c ] && rm -f src/demuxers/demux_$p.c
-  sed -i -e "/xineplug_dmx_$p/d" src/demuxers/Makefile.am
-done
+# These are ok now ( http://bugzilla.redhat.com/213597 )
+#for p in mpeg mpeg_block mpeg_ts mpeg_elem mpeg_pes yuv4mpeg2; do
+#  echo "removing $p demuxer..."
+#  [ -f src/demuxers/demux_$p.c ] && rm -f src/demuxers/demux_$p.c
+#  sed -i -e "/xineplug_dmx_$p/d" src/demuxers/Makefile.am
+#done
 # Postprocessors
 echo "removing planar and deinterlace postprocessors..."
 sed -i -e 's/deinterlace //g' src/post/Makefile.am # see comments in speedy.c


Index: xine-lib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xine-lib/devel/xine-lib.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- xine-lib.spec	12 Dec 2008 21:17:03 -0000	1.50
+++ xine-lib.spec	7 Jan 2009 19:18:46 -0000	1.51
@@ -2,10 +2,9 @@
 # - 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
-# - external dvdnav - not compatible as of 1.1.11 and 4.1.1
 # - deprecate ESD support?
 
-%define         abiver      1.24
+%define         abiver      1.25
 %define         codecdir    %{_libdir}/codecs
 
 %ifarch %{ix86}
@@ -32,8 +31,8 @@
 
 Summary:        Xine library
 Name:           xine-lib
-Version:        1.1.15
-Release:        4%{?dist}
+Version:        1.1.16
+Release:        1%{?dist}
 License:        GPLv2+
 Group:          System Environment/Libraries
 URL:            http://xinehq.de/
@@ -50,8 +49,6 @@
 Patch1:         %{name}-1.1.4-optflags.patch
 Patch6:         %{name}-1.1.1-deepbind-939.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
 
 Provides:       xine-lib(plugin-abi) = %{abiver}
 # X11
@@ -111,6 +108,7 @@
 %else
 BuildRequires:  samba-common
 %endif
+BuildRequires:  libdvdnav-devel
 
 %description
 This package contains the Xine library. Xine is a free multimedia player.
@@ -191,10 +189,8 @@
 # Patch6 needed at least when compiling with external ffmpeg, #939.
 %patch6 -p1 -b .deepbind
 
-%patch100 -p1 -b .ansi
-
-# Avoid standard rpaths on lib64 archs:
-sed -i -e 's|"/lib /usr/lib\b|"/%{_lib} %{_libdir}|' configure
+# Avoid standard rpaths on lib64 archs: (autotools patch should handle this, no? -- Rex )
+#sed -i -e 's|"/lib /usr/lib\b|"/%{_lib} %{_libdir}|' configure
 
 
 %build
@@ -223,6 +219,7 @@
     --with-external-ffmpeg \
     --with-xv-path=%{_libdir} \
     --with-libflac \
+    --with-external-libdvdnav \
     --with-external-libmpcdec \
 %if 0%{?_without_imagemagick:1}
     --without-imagemagick \
@@ -418,6 +415,10 @@
 
 
 %changelog
+* Wed Jan 07 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.1.16-1
+- xine-lib-1.1.16, plugin ABI 1.25
+- --with-external-libdvdnav, include demuxers (#213597)
+
 * Fri Dec 12 2008 Rex Dieter <rdieter at fedoraproject.org> - 1.1.15-4
 - rebuild for pkgconfig deps
 


--- xine-lib-1.1.15-ansi.patch DELETED ---



From pkgdb at fedoraproject.org  Wed Jan  7 19:20:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 07 Jan 2009 19:20:18 +0000
Subject: [pkgdb] yakuake had acl change status
Message-ID: <20090107192018.06114208319@bastion.fedora.phx.redhat.com>

mmahut has set the approveacls acl on yakuake (Fedora devel) to Approved for trasher

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/yakuake



From pkgdb at fedoraproject.org  Wed Jan  7 19:20:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 07 Jan 2009 19:20:24 +0000
Subject: [pkgdb] yakuake ownership updated
Message-ID: <20090107192024.A7E5E20831F@bastion.fedora.phx.redhat.com>

Package yakuake in Fedora devel was orphaned by mmahut

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/yakuake



From pkgdb at fedoraproject.org  Wed Jan  7 19:20:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 07 Jan 2009 19:20:44 +0000
Subject: [pkgdb] yakuake had acl change status
Message-ID: <20090107192044.84F1A20831C@bastion.fedora.phx.redhat.com>

mmahut has set the approveacls acl on yakuake (Fedora 9) to Approved for trasher

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/yakuake



From pkgdb at fedoraproject.org  Wed Jan  7 19:20:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 07 Jan 2009 19:20:27 +0000
Subject: [pkgdb] yakuake had acl change status
Message-ID: <20090107192027.5C0C3208456@bastion.fedora.phx.redhat.com>

mmahut has set the approveacls acl on yakuake (Fedora 7) to Approved for trasher

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/yakuake



From pkgdb at fedoraproject.org  Wed Jan  7 19:20:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 07 Jan 2009 19:20:44 +0000
Subject: [pkgdb] yakuake ownership updated
Message-ID: <20090107192044.E6D0420831F@bastion.fedora.phx.redhat.com>

Package yakuake in Fedora 9 was orphaned by mmahut

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/yakuake



From pkgdb at fedoraproject.org  Wed Jan  7 19:20:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 07 Jan 2009 19:20:47 +0000
Subject: [pkgdb] yakuake had acl change status
Message-ID: <20090107192047.DBDEF208458@bastion.fedora.phx.redhat.com>

mmahut has set the approveacls acl on yakuake (Fedora 10) to Approved for trasher

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/yakuake



From pkgdb at fedoraproject.org  Wed Jan  7 19:20:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 07 Jan 2009 19:20:53 +0000
Subject: [pkgdb] yakuake ownership updated
Message-ID: <20090107192053.A50AB208457@bastion.fedora.phx.redhat.com>

Package yakuake in Fedora 10 was orphaned by mmahut

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/yakuake



From ajax at fedoraproject.org  Wed Jan  7 19:22:12 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Wed,  7 Jan 2009 19:22:12 +0000 (UTC)
Subject: rpms/procps/devel procps-3.2.7-vmstat-header.patch, NONE,
	1.1 procps.spec, 1.74, 1.75
Message-ID: <20090107192212.55E9970100@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/procps/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29973

Modified Files:
	procps.spec 
Added Files:
	procps-3.2.7-vmstat-header.patch 
Log Message:
* Wed Jan 07 2009 Adam Jackson <ajax at redhat.com> 3.2.7-23
- procps-3.2.7-vmstat-header.patch: Fix vmstat header to fit on a single line.


procps-3.2.7-vmstat-header.patch:

--- NEW FILE procps-3.2.7-vmstat-header.patch ---
diff -up procps-3.2.7/vmstat.c.jx procps-3.2.7/vmstat.c
--- procps-3.2.7/vmstat.c.jx	2009-01-07 14:13:52.000000000 -0500
+++ procps-3.2.7/vmstat.c	2009-01-07 14:17:07.000000000 -0500
@@ -150,7 +150,7 @@ static int format_1000(unsigned long lon
 ////////////////////////////////////////////////////////////////////////////
 
 static void new_header(void){
-  printf("procs -----------memory---------- ---swap-- -----io---- --system-- -----cpu------\n");
+  printf("procs -----------memory---------- ---swap-- -----io---- --system-- -----cpu-----\n");
   printf(
     "%2s %2s %6s %6s %6s %6s %4s %4s %5s %5s %4s %4s %2s %2s %2s %2s %2s\n",
     "r","b",


Index: procps.spec
===================================================================
RCS file: /cvs/pkgs/rpms/procps/devel/procps.spec,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- procps.spec	4 Dec 2008 16:31:41 -0000	1.74
+++ procps.spec	7 Jan 2009 19:21:41 -0000	1.75
@@ -1,7 +1,7 @@
 Summary: System and process monitoring utilities
 Name: procps
 Version: 3.2.7
-Release: 22%{?dist}
+Release: 23%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: Applications/System
 URL: http://procps.sourceforge.net
@@ -75,6 +75,8 @@
 #472783 - 'vmstat -p <partition name>', 
 # the detailed statistics of the partition name is not output.
 Patch36: procps-3.2.7-vmstat-partstats-long.patch
+# Fix vmstat header to be 80 chars not 81
+Patch37: procps-3.2.7-vmstat-header.patch
 
 BuildRequires: ncurses-devel
 
@@ -136,6 +138,7 @@
 %patch34 -p1
 %patch35 -p1
 %patch36 -p1
+%patch37 -p1
 
 cp %SOURCE1 .
 
@@ -173,6 +176,9 @@
 %attr(0644,root,root) %{_mandir}/man5/*
 
 %changelog
+* Wed Jan 07 2009 Adam Jackson <ajax at redhat.com> 3.2.7-23
+- procps-3.2.7-vmstat-header.patch: Fix vmstat header to fit on a single line.
+
 * Thu Dec 04 2008 Daniel Novotny <dnovotny at redhat.com> 3.2.7-22
 - fix #472783 vmstat -p <partition name> not working
 - extended diskstat parameters to unsigned long to avoid overflow



From matt at fedoraproject.org  Wed Jan  7 19:22:47 2009
From: matt at fedoraproject.org (Matthew Farrellee)
Date: Wed,  7 Jan 2009 19:22:47 +0000 (UTC)
Subject: rpms/condor/devel DetectGCC.patch, NONE, 1.1 NOTICE.txt, NONE,
	1.1 stdsoap2.h.patch.patch, NONE, 1.1 .cvsignore, 1.4,
	1.5 condor.spec, 1.9, 1.10 condor_config.generic.patch, 1.1,
	1.2 generate-tarball.sh, 1.2, 1.3 sources, 1.4,
	1.5 GLibCFlag28.patch, 1.1, NONE
Message-ID: <20090107192247.964B270100@cvs1.fedora.phx.redhat.com>

Author: matt

Update of /cvs/pkgs/rpms/condor/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30074

Modified Files:
	.cvsignore condor.spec condor_config.generic.patch 
	generate-tarball.sh sources 
Added Files:
	DetectGCC.patch NOTICE.txt stdsoap2.h.patch.patch 
Removed Files:
	GLibCFlag28.patch 
Log Message:
update to condor 7.2.0

DetectGCC.patch:

--- NEW FILE DetectGCC.patch ---
diff -ru condor-7.0.2.orig/src/configure.ac condor-7.0.2/src/configure.ac
--- condor-7.0.2.orig/src/configure.ac	2008-06-11 10:04:54.000000000 -0500
+++ condor-7.0.2/src/configure.ac	2008-06-11 10:04:07.000000000 -0500
@@ -877,6 +877,12 @@
     CompilerMinor="3"
     CompilerPatch="1"
     ;;
+ "4.3.2" )
+    CompilerKind="GCC"
+    CompilerMajor="4"
+    CompilerMinor="3"
+    CompilerPatch="2"
+    ;;
  * )
     if test "x$enable_gcc_version_check" = "xyes"; then
       AC_MSG_RESULT([ERROR])


--- NEW FILE NOTICE.txt ---
Condor

Copyright (C) 1990-2007, Condor Team, Computer Sciences Department,
University of Wisconsin-Madison, WI.

This source code is covered by the Apache License, Version 2.0, which
can be found in the accompanying LICENSE-2.0.txt file, or online at
http://www.apache.org/licenses/ .

This product includes software developed by and/or derived from the
Globus Project (http://www.globus.org/) to which the U.S. Government
retains certain rights. Copyright (c) 1999 University of Chicago and
The University of Southern California. All Rights Reserved.

This product includes software developed by the OpenSSL Project for
use in the OpenSSL Toolkit (http://www.openssl.org/).  Complete
conditions and disclaimers for OpenSSL can be found at
http://www.openssl.org/source/license.html

Some distributions of Condor include software developed by the 
Info-ZIP Project (http://www.info-zip.org/).  Complete conditions 
and disclaimers for Info-ZIP can be found at 
http://www.info-zip.org/doc/LICENSE

Some distributions of Condor include MAKEMSI software developed by 
Dennis Bareis (http://dennisbareis.com/makemsi.htm).  Complete 
conditions and disclaimers for MAKEMSI can be found at 
http://makemsi-manual.dennisbareis.com/disclaimer.htm

Some distributions of Condor include a compiled, unmodified version
of the GNU C library. The complete source code to GNU glibc can be
found at http://www.gnu.org/software/libc/.

Part of the software embedded in this product is gSOAP software.
Portions created by gSOAP are Copyright (C) 2001-2004 Robert A. van
Engelen, Genivia inc. All Rights Reserved.
THE SOFTWARE IN THIS PRODUCT WAS IN PART PROVIDED BY GENIVIA INC 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.

stdsoap2.h.patch.patch:

--- NEW FILE stdsoap2.h.patch.patch ---
diff --git a/src/condor_daemon_core.V6/stdsoap2.h.patch b/src/condor_daemon_core.V6/stdsoap2.h.patch
index a0fe3ed..c84abe7 100644
--- a/src/condor_daemon_core.V6/stdsoap2.h.patch
+++ b/src/condor_daemon_core.V6/stdsoap2.h.patch
@@ -47,7 +47,7 @@
 @@ -418,8 +427,8 @@
  #endif
  
- #if defined(__cplusplus) && !defined(WITH_LEAN)
+ #if defined(__cplusplus) && !defined(WITH_LEAN) && !defined(WITH_COMPAT)
 -# include <string>
 -# include <iostream>
 +# include <string.h>


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/condor/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	8 Oct 2008 14:14:17 -0000	1.4
+++ .cvsignore	7 Jan 2009 19:22:17 -0000	1.5
@@ -1 +1 @@
-condor-7.0.5-105846-RH.tar.gz
+condor-7.2.0-121001-RH.tar.gz


Index: condor.spec
===================================================================
RCS file: /cvs/pkgs/rpms/condor/devel/condor.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- condor.spec	8 Oct 2008 14:53:04 -0000	1.9
+++ condor.spec	7 Jan 2009 19:22:17 -0000	1.10
@@ -1,6 +1,6 @@
 Summary: Condor: High Throughput Computing
 Name: condor
-Version: 7.0.5
+Version: 7.2.0
 Release: 1%{?dist}
 License: ASL 2.0
 Group: Applications/System
@@ -17,37 +17,39 @@
 #   b08743cfa2e87adbcda042896e8ef537  condor_src-7.0.2-all-all.tar.gz
 #   5f326ad522b63eacf34c6c563cf46910  condor_src-7.0.4-all-all.tar.gz
 #   73323100c5b2259f3b9c042fa05451e0  condor_src-7.0.5-all-all.tar.gz
+#   a2dd96ea537b2c6d105b6c8dad563ddc  condor_src-7.2.0-all-all.tar.gz
 # Note: The md5sum of each generated tarball may be different
-Source0: condor-7.0.5-105846-RH.tar.gz
+Source0: condor-7.2.0-121001-RH.tar.gz
 Source1: generate-tarball.sh
+Source2: NOTICE.txt
 Patch0: condor_config.generic.patch
-Patch2: GLibCFlag28.patch
-Patch3: DetectGCC432.patch
-Patch4: autoconf-relax-quoting.patch
+Patch1: stdsoap2.h.patch.patch
+Patch2: DetectGCC.patch
 
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 BuildRequires: imake
 BuildRequires: flex
 BuildRequires: byacc
-BuildRequires: tcsh
 BuildRequires: pcre-devel
 BuildRequires: postgresql-devel
 BuildRequires: openssl-devel
 BuildRequires: krb5-devel
-BuildRequires: gsoap-devel >= 2.7.10-2
+BuildRequires: gsoap-devel >= 2.7.12-1
 BuildRequires: bind-utils
 BuildRequires: m4
 BuildRequires: autoconf
 BuildRequires: classads-devel
+BuildRequires: libX11-devel
 
 Requires: pcre
 Requires: postgresql-libs
 Requires: openssl
 Requires: krb5-libs
-Requires: gsoap >= 2.7.10-2
+Requires: gsoap >= 2.7.12-1
 Requires: mailx
 Requires: classads
+Requires: python >= 2.2
 
 Requires(pre): shadow-utils
 
@@ -71,14 +73,26 @@
 completion.
 
 
-%package static
-Summary: Headers and libraries for interacting with Condor
-Group: Development/System
-Requires: %name = %version-%release
+#%package static
+#Summary: Headers and libraries for interacting with Condor
+#Group: Development/System
+#Requires: %name = %version-%release
+#
+#
+#%description static
+#Headers and libraries for interacting with Condor and its components.
 
 
-%description static
-Headers and libraries for interacting with Condor and its components.
+%package kbdd
+Summary: Condor Keyboard Daemon
+Group: Applications/System
+Requires: %name = %version-%release
+Requires: libX11
+
+%description kbdd
+The condor_kbdd monitors logged in X users for activity. It is only
+useful on systems where no device (e.g. /dev/*) can be used to
+determine console idle time.
 
 
 %pre
@@ -92,10 +106,11 @@
 %prep
 %setup -q -n %{name}-%{version}
 
+cp %{SOURCE2} .
+
 %patch0 -p1
+%patch1 -p1
 %patch2 -p1
-%patch3 -p1
-%patch4 -p1
 
 # fix errant execute permissions
 find src -perm /a+x -type f -name "*.[Cch]" -exec chmod a-x {} \;
@@ -114,18 +129,22 @@
 
 cd src
 ./build_init
-%configure --enable-proper \
+%configure --with-buildid=Fedora-%{version}-%{release} \
+   --enable-proper \
    --disable-full-port \
    --disable-gcc-version-check \
    --disable-glibc-version-check \
    --disable-static \
    --disable-rpm \
+   --enable-kbdd \
+   --disable-hibernation \
+   --disable-lease-manager \
    --without-zlib \
    --with-openssl \
    --with-krb5 \
    --with-postgresql \
    --with-gsoap \
-   --without-classads \
+   --with-classads \
    --with-man=$PWD/../externals/bundles/man/current
 
 # SMP_NUM_JOBS must be set properly to pass -j to make
@@ -148,7 +167,8 @@
 rm -rf %{buildroot}
 
 # make public creates release tarballs which we will install
-cd public/v7.0
+oldpwd=$PWD
+cd public/v7.2
 gzip -cd condor-%{version}-*-dynamic-unstripped.tar.gz | tar x
 cd condor-%{version}
 
@@ -158,6 +178,21 @@
 
 cp $PREFIX/etc/examples/condor_config.generic $PREFIX/etc/condor_config
 
+# the default condor_config file is not architecture aware and thus
+# sets the LIB directory to always be /usr/lib, we want to do better
+# than that. this is, so far, the best place to do this
+# specialization. we strip the "lib" or "lib64" part from _libdir and
+# stick it in the LIB variable in the config.
+LIB=$(echo %{?_libdir} | sed -e 's:/usr/\(.*\):\1:')
+if [ "$LIB" = "%_libdir" ]; then
+  echo "_libdir does not contain /usr, sed expression needs attention"
+  exit 1
+fi
+sed -e "s:^LIB\s*=.*:LIB = \$(RELEASE_DIR)/$LIB/condor:" \
+  $PREFIX/etc/examples/condor_config.generic \
+  > $PREFIX/etc/condor_config
+
+
 mkdir $PREFIX/local_dir
 mkdir -m1777 $PREFIX/local_dir/execute
 mkdir -m0755 $PREFIX/local_dir/log
@@ -191,9 +226,117 @@
 # the libcondorapi.so is not properly created, instead of providing it
 # we will provide the .a version in a static package
 rm $PREFIX/lib/libcondorapi.so
-# sbin/condor and uniq_pid_command are pointless hard links
+# sbin/condor is a pointless hard links
 rm $PREFIX/sbin/condor
+
+# not packaging the condor_startd_factory right now
+rm $PREFIX/sbin/condor_startd_factory
+rm $PREFIX/lib/webservice/condorStartdFactory.wsdl
+rm $PREFIX/libexec/bgp_available_partitions
+rm $PREFIX/libexec/bgp_back_partition
+rm $PREFIX/libexec/bgp_boot_partition
+rm $PREFIX/libexec/bgp_destroy_partition
+rm $PREFIX/libexec/bgp_generate_partition
+rm $PREFIX/libexec/bgp_query_work_loads
+rm $PREFIX/libexec/bgp_shutdown_partition
+
+# not packaging uninteresting WSDL files, except for the master
+rm $PREFIX/lib/webservice/condorCgahp.wsdl
+rm $PREFIX/lib/webservice/condorDagman.wsdl
+rm $PREFIX/lib/webservice/condorDbmsd.wsdl
+rm $PREFIX/lib/webservice/condorDcskel.wsdl
+rm $PREFIX/lib/webservice/condorEventd.wsdl
+rm $PREFIX/lib/webservice/condorGridmanager.wsdl
+rm $PREFIX/lib/webservice/condorHad.wsdl
+rm $PREFIX/lib/webservice/condorJobRouter.wsdl
+rm $PREFIX/lib/webservice/condorKbdd.wsdl
+rm $PREFIX/lib/webservice/condorNegotiator.wsdl
+rm $PREFIX/lib/webservice/condorShadow.wsdl
+rm $PREFIX/lib/webservice/condorStartd.wsdl
+rm $PREFIX/lib/webservice/condorStarter.wsdl
+rm $PREFIX/lib/webservice/condorTransferd.wsdl
+rm $PREFIX/lib/webservice/condorTt.wsdl
+rm $PREFIX/lib/webservice/condorVMgahp.wsdl
+
+
+# not packaging glexec support right now
+rm $PREFIX/libexec/condor_glexec_cleanup
+rm $PREFIX/libexec/condor_glexec_job_wrapper
+rm $PREFIX/libexec/condor_glexec_kill
+rm $PREFIX/libexec/condor_glexec_run
+rm $PREFIX/libexec/condor_glexec_setup
+# not shipping gt42 gahp right now
+rm $PREFIX/sbin/gt42_gahp
+
+# not going to package the sc2005 negotiator
+#rm $PREFIX/sbin/condor_lease_manager
+
+# not going to package these until we know what they are
+rm $PREFIX/bin/condor_power
+rm $PREFIX/sbin/condor_set_shutdown
+
+# not packaging glidein support, depends on globus
+rm $PREFIX/man/man1/condor_glidein.1
+rm $PREFIX/bin/condor_glidein
+
+# not packaging deployment tools
+# sbin/uniq_pid_command is a link for uniq_pid_midwife/undertaker
 rm $PREFIX/sbin/uniq_pid_command
+rm $PREFIX/sbin/uniq_pid_midwife
+rm $PREFIX/sbin/uniq_pid_undertaker
+rm $PREFIX/sbin/cleanup_release
+rm $PREFIX/sbin/condor_local_stop
+rm $PREFIX/sbin/condor_cleanup_local
+rm $PREFIX/sbin/condor_cold_start
+rm $PREFIX/sbin/condor_cold_stop
+rm $PREFIX/sbin/condor_config_bind
+rm $PREFIX/sbin/filelock_midwife
+rm $PREFIX/sbin/filelock_undertaker
+rm $PREFIX/sbin/condor_install_local
+rm $PREFIX/sbin/condor_local_start
+rm $PREFIX/sbin/install_release
+rm $PREFIX/lib/Execute.pm
+rm $PREFIX/lib/FileLock.pm
+rm $PREFIX/man/man1/condor_config_bind.1
+rm $PREFIX/man/man1/condor_cold_start.1
+rm $PREFIX/man/man1/condor_cold_stop.1
+
+# not packaging the ckpt server
+rm $PREFIX/sbin/condor_ckpt_server
+
+# not packaging standard universe
+rm $PREFIX/bin/condor_checkpoint
+rm $PREFIX/sbin/condor_shadow.std
+rm $PREFIX/sbin/condor_starter.std
+rm $PREFIX/bin/condor_compile
+rm $PREFIX/man/man1/condor_compile.1
+rm $PREFIX/man/man1/condor_checkpoint.1
+rm $PREFIX/libexec/condor_ckpt_probe
+
+# not packaging configure/install scripts
+rm $PREFIX/man/man1/condor_configure.1
+rm $PREFIX/sbin/condor_configure
+rm $PREFIX/sbin/condor_install
+
+# not packaging legacy cruft
+rm $PREFIX/man/man1/condor_master_off.1
+rm $PREFIX/sbin/condor_master_off
+rm $PREFIX/man/man1/condor_reconfig_schedd.1
+rm $PREFIX/sbin/condor_reconfig_schedd
+rm $PREFIX/man/man1/condor_convert_history.1
+rm $PREFIX/sbin/condor_convert_history
+
+# not packaging anything globus related
+rm $PREFIX/sbin/condor_gridshell
+rm $PREFIX/sbin/grid_monitor.sh
+rm $PREFIX/sbin/gt4_gahp
+
+# not packaging unsupported gahps
+rm $PREFIX/sbin/unicore_gahp
+
+# not packaging libcondorapi.a
+rm $PREFIX/lib/libcondorapi.a
+
 
 # some scripts are examples but have exec bits set anyway
 chmod a-x $PREFIX/etc/examples/condor.boot
@@ -204,14 +347,17 @@
 populate %_mandir/man1 $PREFIX/man/man1/*
 populate %_bindir $PREFIX/bin/*
 populate %_sbindir $PREFIX/sbin/*
-populate %_usrsrc $PREFIX/src/chirp
 populate %_sysconfdir/condor $PREFIX/etc/condor_config
-populate %_includedir/condor $PREFIX/include/*
-populate %_libdir $PREFIX/lib/libcondorapi.a
+# no -static package
+#populate %_usrsrc $PREFIX/src/chirp
+#populate %_includedir/condor $PREFIX/include/*
+#populate %_libdir $PREFIX/lib/libcondorapi.a
 populate %_datadir/condor $PREFIX/lib/*
+populate %_datadir/condor/sql $PREFIX/sql/*
 populate %_libexecdir/condor $PREFIX/libexec/*
 populate %_var/lib/condor $PREFIX/local_dir/*
 
+
 # install the lsb init script
 install -Dp -m0755 $PREFIX/etc/examples/condor.init %buildroot/%_initrddir/condor
 
@@ -243,54 +389,35 @@
 %_datadir/condor/CondorJavaInfo.class
 %_datadir/condor/CondorJavaWrapper.class
 %_datadir/condor/Condor.pm
-%_datadir/condor/Execute.pm
-%_datadir/condor/FileLock.pm
 %_datadir/condor/scimark2lib.jar
 %dir %_datadir/condor/webservice/
-%_datadir/condor/webservice/condorAccountant.wsdl
-%_datadir/condor/webservice/condorCgahp.wsdl
 %_datadir/condor/webservice/condorCollector.wsdl
-%_datadir/condor/webservice/condorDagman.wsdl
-%_datadir/condor/webservice/condorDbmsd.wsdl
-%_datadir/condor/webservice/condorDcskel.wsdl
-%_datadir/condor/webservice/condorEventd.wsdl
-%_datadir/condor/webservice/condorGridmanager.wsdl
-%_datadir/condor/webservice/condorHad.wsdl
 %_datadir/condor/webservice/condorMaster.wsdl
-%_datadir/condor/webservice/condorNegotiator.wsdl
 %_datadir/condor/webservice/condorSchedd.wsdl
-%_datadir/condor/webservice/condorShadow.wsdl
-%_datadir/condor/webservice/condorStartd.wsdl
-%_datadir/condor/webservice/condorStarter.wsdl
-%_datadir/condor/webservice/condorTransferd.wsdl
-%_datadir/condor/webservice/condorVMgahp.wsdl
+%dir %_datadir/condor/sql/
+%_datadir/condor/sql/common_createddl.sql
+%_datadir/condor/sql/oracle_createddl.sql
+%_datadir/condor/sql/oracle_dropddl.sql
+%_datadir/condor/sql/pgsql_createddl.sql
+%_datadir/condor/sql/pgsql_dropddl.sql
 %dir %_libexecdir/condor/
 %_libexecdir/condor/condor_chirp
 %_libexecdir/condor/condor_ssh
 %_libexecdir/condor/sshd.sh
-%_libexecdir/condor/condor_ckpt_probe
+%_libexecdir/condor/condor_job_router
 %_libexecdir/condor/gridftp_wrapper.sh
 %_mandir/man1/condor_advertise.1.gz
-%_mandir/man1/condor_checkpoint.1.gz
 %_mandir/man1/condor_check_userlogs.1.gz
 %_mandir/man1/condor_chirp.1.gz
 %_mandir/man1/condor_cod.1.gz
-%_mandir/man1/condor_cold_start.1.gz
-%_mandir/man1/condor_cold_stop.1.gz
-%_mandir/man1/condor_compile.1.gz
-%_mandir/man1/condor_config_bind.1.gz
-%_mandir/man1/condor_convert_history.1.gz
-%_mandir/man1/condor_configure.1.gz
 %_mandir/man1/condor_config_val.1.gz
 %_mandir/man1/condor_dagman.1.gz
 %_mandir/man1/condor_fetchlog.1.gz
 %_mandir/man1/condor_findhost.1.gz
-%_mandir/man1/condor_glidein.1.gz
 %_mandir/man1/condor_history.1.gz
 %_mandir/man1/condor_hold.1.gz
 %_mandir/man1/condor_load_history.1.gz
 %_mandir/man1/condor_master.1.gz
-%_mandir/man1/condor_master_off.1.gz
 %_mandir/man1/condor_off.1.gz
 %_mandir/man1/condor_on.1.gz
 %_mandir/man1/condor_preen.1.gz
@@ -298,7 +425,6 @@
 %_mandir/man1/condor_q.1.gz
 %_mandir/man1/condor_qedit.1.gz
 %_mandir/man1/condor_reconfig.1.gz
-%_mandir/man1/condor_reconfig_schedd.1.gz
 %_mandir/man1/condor_release.1.gz
 %_mandir/man1/condor_reschedule.1.gz
 %_mandir/man1/condor_restart.1.gz
@@ -319,10 +445,8 @@
 %_mandir/man1/condor_wait.1.gz
 # bin/condor is a link for checkpoint, reschedule, vacate
 %_bindir/condor
-%_bindir/condor_glidein
 %_bindir/condor_load_history
 %_bindir/condor_submit_dag
-%_bindir/condor_checkpoint
 %_bindir/condor_prio
 %_bindir/condor_transfer_data
 %_bindir/condor_check_userlogs
@@ -331,7 +455,6 @@
 %_bindir/condor_cod
 %_bindir/condor_qedit
 %_bindir/condor_userlog
-%_bindir/condor_compile
 %_bindir/condor_release
 %_bindir/condor_userlog_job_counter
 %_bindir/condor_config_val
@@ -342,6 +465,9 @@
 %_bindir/condor_vacate
 %_bindir/condor_dump_history
 %_bindir/condor_run
+%_bindir/condor_router_history
+%_bindir/condor_router_q
+%_bindir/condor_router_rm
 %_bindir/condor_vacate_job
 %_bindir/condor_findhost
 %_bindir/condor_stats
@@ -351,31 +477,17 @@
 %_bindir/condor_wait
 %_bindir/condor_hold
 %_bindir/condor_submit
-%_sbindir/cleanup_release
 # sbin/condor is a link for master_off, off, on, reconfig,
 # reconfig_schedd, restart
 %_sbindir/condor_advertise
 %_sbindir/condor_c-gahp
 %_sbindir/condor_c-gahp_worker_thread
-%_sbindir/condor_ckpt_server
-%_sbindir/condor_cleanup_local
-%_sbindir/condor_cold_start
-%_sbindir/condor_cold_stop
 %_sbindir/condor_collector
-%_sbindir/condor_config_bind
-%_sbindir/condor_configure
-%_sbindir/condor_convert_history
 %_sbindir/condor_dbmsd
 %_sbindir/condor_fetchlog
-%_sbindir/condor_gridshell
 %_sbindir/condor_had
 %_sbindir/condor_init
-%_sbindir/condor_install
-%_sbindir/condor_install_local
-%_sbindir/condor_local_start
-%_sbindir/condor_local_stop
 %_sbindir/condor_master
-%_sbindir/condor_master_off
 %_sbindir/condor_negotiator
 %_sbindir/condor_off
 %_sbindir/condor_on
@@ -383,32 +495,21 @@
 %_sbindir/condor_procd
 %_sbindir/condor_quill
 %_sbindir/condor_reconfig
-%_sbindir/condor_reconfig_schedd
 %_sbindir/condor_replication
 %_sbindir/condor_restart
 %_sbindir/condor_root_switchboard
 %_sbindir/condor_schedd
 %_sbindir/condor_shadow
-%_sbindir/condor_shadow.std
 %_sbindir/condor_startd
 %_sbindir/condor_starter
-%_sbindir/condor_starter.std
 %_sbindir/condor_store_cred
 %_sbindir/condor_transferd
 %_sbindir/condor_updates_stats
 %_sbindir/condor_vm-gahp
+%_sbindir/amazon_gahp
 %_sbindir/condor_vm_vmware.pl
 %_sbindir/condor_vm_xen.sh
-%_sbindir/filelock_midwife
-%_sbindir/filelock_undertaker
-%_sbindir/install_release
 %_sbindir/condor_gridmanager
-%_sbindir/grid_monitor.sh
-%_sbindir/gt4_gahp
-%_sbindir/unicore_gahp
-# sbin/uniq_pid_command is a link for uniq_pid_midwife/undertaker
-%_sbindir/uniq_pid_midwife
-%_sbindir/uniq_pid_undertaker
 %config(noreplace) %_var/lib/condor/condor_config.local
 %defattr(-,condor,condor,-)
 %dir %_var/lib/condor/
@@ -417,26 +518,37 @@
 %dir %_var/lib/condor/spool/
 
 
-%files static
+#%files static
+#%defattr(-,root,root,-)
+#%doc LICENSE-2.0.txt
+#%_libdir/libcondorapi.a
+#%dir %_includedir/condor/
+#%_includedir/condor/condor_constants.h
+#%_includedir/condor/condor_event.h
+#%_includedir/condor/condor_holdcodes.h
+#%_includedir/condor/file_lock.h
+#%_includedir/condor/user_log.c++.h
+#%doc %_includedir/condor/user_log.README
+#%dir %_usrsrc/chirp/
+#%_usrsrc/chirp/chirp_client.c
+#%_usrsrc/chirp/chirp_client.h
+#%_usrsrc/chirp/chirp_protocol.h
+
+
+%files kbdd
 %defattr(-,root,root,-)
-%doc LICENSE-2.0.txt
-%_libdir/libcondorapi.a
-%dir %_includedir/condor/
-%_includedir/condor/condor_constants.h
-%_includedir/condor/condor_event.h
-%_includedir/condor/condor_holdcodes.h
-%_includedir/condor/file_lock.h
-%_includedir/condor/user_log.c++.h
-%doc %_includedir/condor/user_log.README
-%dir %_usrsrc/chirp/
-%_usrsrc/chirp/chirp_client.c
-%_usrsrc/chirp/chirp_client.h
-%_usrsrc/chirp/chirp_protocol.h
+%doc LICENSE-2.0.txt NOTICE.txt
+%_sbindir/condor_kbdd
 
 
 %post -n condor
 /sbin/chkconfig --add condor
 /sbin/ldconfig
+test -x /usr/sbin/selinuxenabled && /usr/sbin/selinuxenabled
+if [ $? = 0 ]; then
+   semanage fcontext -a -t unconfined_execmem_exec_t %_sbindir/condor_startd 
+   restorecon  %_sbindir/condor_startd
+fi
 
 
 %preun -n condor
@@ -454,14 +566,19 @@
 
 
 %changelog
+* Wed Jan  7 2009  <matt at redhat> - 7.2.0-1
+- Upgraded to 7.2.0 release
+- Removed -static package
+- Added Fedora specific buildid
+- Enabled KBDD, daemon to monitor X usage on systems with only USB devs
+- Updated install process
+
 * Wed Oct  8 2008  <matt at redhat> - 7.0.5-1
 - Rebased on 7.0.5, security update
 
 * Wed Aug  6 2008  <mfarrellee at redhat> - 7.0.4-1
 - Updated to 7.0.4 source
 - Stopped using condor_configure in install step
-- Patched aclocal.m4 to handle autoconf 2.62
-- Patched configure.ac to handle gcc-4.3.1
 
 * Tue Jun 10 2008  <mfarrellee at redhat> - 7.0.2-1
 - Updated to 7.0.2 source

condor_config.generic.patch:

Index: condor_config.generic.patch
===================================================================
RCS file: /cvs/pkgs/rpms/condor/devel/condor_config.generic.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- condor_config.generic.patch	6 Aug 2008 15:04:10 -0000	1.1
+++ condor_config.generic.patch	7 Jan 2009 19:22:17 -0000	1.2
@@ -1,8 +1,66 @@
 diff --git a/src/condor_examples/condor_config.generic b/src/condor_examples/condor_config.generic
-index c119679..e795a15 100644
+index f3f60a5..94c146f 100644
 --- a/src/condor_examples/condor_config.generic
 +++ b/src/condor_examples/condor_config.generic
-@@ -51,19 +51,16 @@
+@@ -1,15 +1,35 @@
+ ######################################################################
++######################################################################
++##                                                                  ##
++##  N O T I C E:                                                    ##
++##                                                                  ##
++##       Customization of this file should be done via the          ##
++##       LOCAL_CONFIG_FILE.                                         ##
++##                                                                  ##
++######################################################################
++######################################################################
++
++
++######################################################################
+ ##
+ ##  condor_config
+ ##
+ ##  This is the global configuration file for condor.  Any settings
+-##  made here may potentially be overridden in the local configuration
+-##  file.  KEEP THAT IN MIND!  To double-check that a variable is
+-##  getting set from the configuration file that you expect, use
+-##  condor_config_val -v <variable name>
++##  found here * * s h o u l d   b e   c u s t o m i z e d   i n
++##  t h e   l o c a l   c o n f i g u r a t i o n   f i l e. * *
++##
++##  The local configuration file is specified by LOCAL_CONFIG_FILE
++##  below.
++##
++##  For a basic configuration, you may only want to start by
++##  customizing CONDOR_ADMIN.
++##
++##  Note: To double-check where a configuration variable is set from
++##  you can use condor_config_val -v <variable name>,
++##  e.g. condor_config_val -v CONDOR_ADMIN.
+ ##
+ ##  The file is divided into four main parts:
+-##  Part 1:  Settings you MUST customize 
++##  Part 1:  Settings you likely want to customize 
+ ##  Part 2:  Settings you may want to customize
+ ##  Part 3:  Settings that control the policy of when condor will
+ ##           start and stop jobs on your machines
+@@ -21,11 +41,6 @@
+ ##  various settings in here and possible ways to configure your
+ ##  pool. 
+ ##
+-##  If you are installing Condor as root and then handing over the
+-##  administration of this file to a person you do not trust with
+-##  root access, please read the Installation chapter paying careful
+-##  note to the condor_config.root entries.
+-##
+ ##  Unless otherwise specified, settings that are commented out show
+ ##  the defaults that are used if you don't define a value.  Settings
+ ##  that are defined here MUST BE DEFINED since they have no default
+@@ -47,18 +62,15 @@
+ ##  #        #    #  #   #      #              #
+ ##  #        #    #  #    #     #            #####
+ ##
+-##  Part 1:  Settings you must customize:
++##  Part 1:  Settings you likely want to customize:
  ######################################################################
  ######################################################################
  
@@ -18,13 +76,25 @@
  
  ##  Where is the local condor directory for each host?  
  ##  This is where the local config file(s), logs and
- ##  spool/execute directories are located
--LOCAL_DIR		= $(TILDE)
-+LOCAL_DIR		= /var/lib/condor
- #LOCAL_DIR		= $(RELEASE_DIR)/hosts/$(HOSTNAME)
+@@ -72,7 +84,7 @@ LOCAL_CONFIG_FILE	= $(LOCAL_DIR)/condor_config.local
+ 
+ ## If the local config file is not present, is it an error?
+ ## WARNING: This is a potential security issue. 
+-## If not specificed, te default is True
++## If not specificed, the default is True
+ #REQUIRE_LOCAL_CONFIG_FILE = TRUE
+ 
+ ##--------------------------------------------------------------------
+@@ -84,7 +96,7 @@ CONDOR_ADMIN		= condor-admin at your.domain
  
- ##  Where is the machine-specific local config file for each host?
-@@ -93,13 +90,13 @@ MAIL			= /usr/bin/mail
+ ##  Full path to a mail delivery program that understands that "-s"
+ ##  means you want to specify a subject:
+-MAIL			= /usr/bin/mail
++MAIL			= /bin/mail
+ 
+ ##--------------------------------------------------------------------
+ ##  Network domain parameters:
+@@ -93,13 +105,13 @@ MAIL			= /usr/bin/mail
  ##  machines don't share a common UID space, set it to 
  ##  UID_DOMAIN = $(FULL_HOSTNAME)
  ##  to specify that each machine has its own UID space.
@@ -40,7 +110,7 @@
  
  ##  This macro is used to specify a short description of your pool. 
  ##  It should be about 20 characters long. For example, the name of 
-@@ -218,7 +215,7 @@ HOSTALLOW_READ = *
+@@ -218,7 +230,7 @@ HOSTALLOW_READ = *
  ##    HOSTALLOW_WRITE = *
  ##  but note that this will allow anyone to submit jobs or add
  ##  machines to your pool and is serious security risk.
@@ -49,17 +119,61 @@
  #HOSTALLOW_WRITE = *.your.domain, your-friend's-machine.other.domain
  #HOSTDENY_WRITE = bad-machine.your.domain
  
-@@ -859,10 +856,10 @@ LOG		= $(LOCAL_DIR)/log
- SPOOL		= $(LOCAL_DIR)/spool
+@@ -231,10 +243,9 @@ HOSTALLOW_NEGOTIATOR = $(CONDOR_HOST)
+ HOSTALLOW_NEGOTIATOR_SCHEDD = $(CONDOR_HOST), $(FLOCK_NEGOTIATOR_HOSTS)
+ 
+ ##  Config access.  Machines listed here can use the condor_config_val
+-##  tool to modify all daemon configurations except those specified in
+-##  the condor_config.root file.  This level of host-wide access
+-##  should only be granted with extreme caution.  By default, config
+-##  access is denied from all hosts.
++##  tool to modify all daemon configurations.  This level of host-wide
++##  access should only be granted with extreme caution.  By default,
++##  config access is denied from all hosts.
+ #HOSTALLOW_CONFIG = trusted-host.your.domain
+ 
+ ##  Flocking Configs.  These are the real things that Condor looks at,
+@@ -872,9 +883,10 @@ SPOOL		= $(LOCAL_DIR)/spool
  EXECUTE		= $(LOCAL_DIR)/execute
  BIN		= $(RELEASE_DIR)/bin
--LIB		= $(RELEASE_DIR)/lib
+ LIB		= $(RELEASE_DIR)/lib
 -INCLUDE		= $(RELEASE_DIR)/include
-+LIB		= $(RELEASE_DIR)/share/condor
 +INCLUDE		= $(RELEASE_DIR)/include/condor
  SBIN		= $(RELEASE_DIR)/sbin
 -LIBEXEC		= $(RELEASE_DIR)/libexec
 +LIBEXEC		= $(RELEASE_DIR)/libexec/condor
++SHARE		= $(RELEASE_DIR)/share/condor
  
  ## If you leave HISTORY undefined (comment it out), no history file
  ## will be created. 
+@@ -1655,7 +1667,7 @@ JAVA_MAXHEAP_ARGUMENT = -Xmx
+ ## them here.  However, do not remove the existing entries, as Condor
+ ## needs them.
+ 
+-JAVA_CLASSPATH_DEFAULT = $(LIB) $(LIB)/scimark2lib.jar .
++JAVA_CLASSPATH_DEFAULT = $(SHARE) $(SHARE)/scimark2lib.jar .
+ 
+ ##  JAVA_CLASSPATH_ARGUMENT describes the command-line parameter
+ ##  used to introduce a new classpath:
+@@ -2299,7 +2311,7 @@ LeaseManager			= $(SBIN)/condor_lease_manager
+ # Turn on the lease manager
+ #DAEMON_LIST			= $(DAEMON_LIST), LeaseManager
+ 
+-# The identification and location of the quill daemon for local clients.
++# The identification and location of the lease manager for local clients.
+ LeaseManger_ADDRESS_FILE	= $(LOG)/.lease_manager_address
+ 
+ ## LeaseManager startup arguments
+diff --git a/src/condor_examples/customize b/src/condor_examples/customize
+index b1c5710..cb2dea1 100644
+--- a/src/condor_examples/customize
++++ b/src/condor_examples/customize
+@@ -54,7 +54,7 @@ sub get_platform_defaults {
+     $_ = $os;
+   SWITCH: {
+       if(/^Linux/) { 
+-	  $mail_path="/usr/bin/mail";
++	  $mail_path="/bin/mail";
+ 	  $ps_path="/bin/ps auwx";
+ 	  $console_devs="mouse, console";
+ 	  last SWITCH;


Index: generate-tarball.sh
===================================================================
RCS file: /cvs/pkgs/rpms/condor/devel/generate-tarball.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- generate-tarball.sh	6 Aug 2008 15:04:10 -0000	1.2
+++ generate-tarball.sh	7 Jan 2009 19:22:17 -0000	1.3
@@ -12,6 +12,7 @@
 echo "...extracting $input"
 tar xzf $input
 
+#cd condor_src-$1
 cd condor-$1
 
 if [ ! -f BUILD-ID ] ; then
@@ -22,16 +23,57 @@
 
 echo "...recording BUILD-ID: $build"
 
-echo "...removing NTconfig directory"
-rm -rf NTconfig
+for f in \
+    src/condor_mail \
+    src/condor_vm-gahp/cygwin1.dll \
+    src/condor_vm-gahp/mkisofs.exe \
+    config/CONDOR_TEST_LRG \
+    src/condor_tests/job_vmu_basic.sh \
+    src/condor_tests/job_vmu_cdrom.run \
+    src/condor_tests/job_vmu_cdrom.sh \
+    src/condor_tests/job_vmu_ckpt.run \
+    src/condor_tests/job_vmu_ckpt.sh \
+    src/condor_tests/job_vmu_network.key \
+    src/condor_tests/job_vmu_network.run \
+    src/condor_tests/job_vmu_network.sh \
+    src/condor_tests/job_vmu_basic.run \
+    src/condor_tests/x_vm_utils.pm \
+    src/condor_tests/x_param.vmware \
+    src/condor_tests/x_vmware_test_vm.cmd \
+    src/condor_tests/x_vmware_test_vm.tar.gz \
+    src/condor_tests/x_vmware_configpostsrc \
+    config/CONDOR_TEST_CNFDTL \
+    src/condor_tests/job_ligo_x86-64-chkpttst.cmd \
+    src/condor_tests/job_ligo_x86-64-chkpttst.run \
+    src/condor_tests/x_job_ligo_x86-64-chkpttst.tar.gz \
+    src/condor_tests/job_quill_basic.cmd \
+    src/condor_tests/job_quill_basic.pl \
+    src/condor_tests/job_quill_basic.run \
+    src/condor_tests/x_job_quill_basic.template \
+    src/condor_tests/x_job_quill_supw \
+    src/condor_tests/x_param.quill \
+    src/condor_tests/x_postgress_quill.conf \
+    src/condor_tests/x_quill_buildperlmods.pl \
+    src/condor_tests/x_quill_config_postsrc.template \
+    src/condor_tests/x_quill_Expect-1.20.tar.gz \
+    src/condor_tests/x_quill_IO-Tty-1.07.tar.gz \
+    src/condor_tests/x_quill_pgsqlinstall.pl \
+    src/condor_tests/x_quill_pgsqlstop.pl \
+    src/condor_tests/x_quill_readline-5.2.tar.gz \
+    src/condor_tests/x_quill_readlineinstall.pl;
+do
+    echo "...removing $f";
+    rm -r $f;
+done;
 
 echo "...removing all externals except 'man'"
 mv externals/bundles/man externals/
-rm -rf externals/bundles/*
+rm -r externals/bundles/*
 mv externals/man externals/bundles/
 
 echo "...creating condor-$1-$build-RH.tar.gz"
 cd ..
+#mv condor_src-$1 condor-$1
 tar czfsp condor-$1-$build-RH.tar.gz condor-$1
 
 echo "...cleaning up"


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/condor/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	8 Oct 2008 14:14:17 -0000	1.4
+++ sources	7 Jan 2009 19:22:17 -0000	1.5
@@ -1 +1 @@
-132e01af31659d71c5f3c5d850f9c3eb  condor-7.0.5-105846-RH.tar.gz
+e84581852745cc46b25a7e9b28e2046f  condor-7.2.0-121001-RH.tar.gz


--- GLibCFlag28.patch DELETED ---



From matt at fedoraproject.org  Wed Jan  7 19:24:23 2009
From: matt at fedoraproject.org (Matthew Farrellee)
Date: Wed,  7 Jan 2009 19:24:23 +0000 (UTC)
Subject: rpms/condor/devel DetectGCC432.patch, 1.1,
	NONE autoconf-relax-quoting.patch, 1.1,
	NONE better-analyze-everywhere.patch, 1.1, NONE
Message-ID: <20090107192423.48A1070100@cvs1.fedora.phx.redhat.com>

Author: matt

Update of /cvs/pkgs/rpms/condor/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30564

Removed Files:
	DetectGCC432.patch autoconf-relax-quoting.patch 
	better-analyze-everywhere.patch 
Log Message:
removed unused patches


--- DetectGCC432.patch DELETED ---


--- autoconf-relax-quoting.patch DELETED ---


--- better-analyze-everywhere.patch DELETED ---



From mmahut at fedoraproject.org  Wed Jan  7 19:26:30 2009
From: mmahut at fedoraproject.org (Marek Mahut)
Date: Wed,  7 Jan 2009 19:26:30 +0000 (UTC)
Subject: rpms/comedilib/devel comedilib.spec,1.2,1.3
Message-ID: <20090107192630.8CE3870100@cvs1.fedora.phx.redhat.com>

Author: mmahut

Update of /cvs/pkgs/rpms/comedilib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30785

Modified Files:
	comedilib.spec 
Log Message:
Bug 473642 -  comedilib : Unowned directories



Index: comedilib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/comedilib/devel/comedilib.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- comedilib.spec	29 Nov 2008 16:36:45 -0000	1.2
+++ comedilib.spec	7 Jan 2009 19:25:59 -0000	1.3
@@ -2,7 +2,7 @@
 
 Name:		comedilib
 Version:	0.8.1
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Data Acquisition library for the Comedi driver
 License:	LGPLv2
 Group:		System Environment/Kernel
@@ -79,11 +79,15 @@
 %exclude %{python_sitelib}/*.la
 %exclude %{python_sitelib}/*.a
 %{_includedir}/comedi*
+%{_datadir}/doc/%{name}
 %{_datadir}/doc/%{name}/html/*
 %{_datadir}/doc/%{name}/*.conf
 %{_mandir}/man3/*
 
 %changelog
+* Wed Jan  7 2009 Marek Mahut <mmahut at fedoraproject.org> - 0.8.1-3
+- RHBZ#473642 Unowned directories
+
 * Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 0.8.1-2
 - Rebuild for Python 2.6
 



From dwayne at fedoraproject.org  Wed Jan  7 19:27:45 2009
From: dwayne at fedoraproject.org (Dwayne Bailey)
Date: Wed,  7 Jan 2009 19:27:45 +0000 (UTC)
Subject: rpms/virtaal/EL-5 import.log, NONE,
	1.1 virtaal-0.2-setup_drop_MO_generation.patch, NONE,
	1.1 virtaal.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090107192745.6D83F70100@cvs1.fedora.phx.redhat.com>

Author: dwayne

Update of /cvs/pkgs/rpms/virtaal/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31042/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	import.log virtaal-0.2-setup_drop_MO_generation.patch 
	virtaal.spec 
Log Message:
Import Virtaal 0.2-2 for EL-5



--- NEW FILE import.log ---
virtaal-0_2-2_fc9:EL-5:virtaal-0.2-2.fc9.src.rpm:1231356369

virtaal-0.2-setup_drop_MO_generation.patch:

--- NEW FILE virtaal-0.2-setup_drop_MO_generation.patch ---
diff -ur virtaal-0.2.old/setup.py virtaal-0.2/setup.py
--- virtaal-0.2.old/setup.py	2008-10-16 15:11:04.000000000 +0200
+++ virtaal-0.2/setup.py	2008-11-15 20:11:10.000000000 +0200
@@ -60,23 +60,6 @@
 ]
 #TODO: add Natural Language classifiers
 
-# Compile .mo files from available .po files
-from translate.tools.pocompile import convertmo
-mo_files = []
-
-for po_filename in glob.glob(path.join('po', '*.po')):
-    lang = path.split(po_filename[:-3])[1] # Chop off '.po'
-    mo_filename = path.join('mo', lang, 'virtaal.mo')
-
-    if not path.exists(path.join('mo', lang)):
-        os.makedirs(path.join('mo', lang))
-
-    convertmo(open(po_filename), open(mo_filename, 'w'), None)
-
-    mo_files.append(
-        ( path.join(TARGET_DATA_DIR, 'locale', lang, 'LC_MESSAGES'), [mo_filename])
-    )
-
 # Some of these depend on some files to be built externally before running 
 # setup.py, like the .xml and .desktop files
 options = {
@@ -84,7 +67,7 @@
         (path.join(TARGET_DATA_DIR, "virtaal"), glob.glob(path.join(SOURCE_DATA_DIR, "virtaal", "*.*"))),
         (path.join(TARGET_DATA_DIR, "virtaal", "autocorr"), glob.glob(path.join(SOURCE_DATA_DIR, "virtaal", "autocorr", "*"))),
         (path.join(TARGET_DATA_DIR, "icons"), glob.glob(path.join(SOURCE_DATA_DIR, "icons", "*.*"))),
-    ] + mo_files,
+    ],
     'scripts': [
         "bin/virtaal"
     ],


--- NEW FILE virtaal.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

Name:           virtaal
Version:        0.2
Release:        2%{?dist}
Summary:        Localization and translation editor

Group:          Development/Tools
License:        GPLv2+
URL:            http://translate.sourceforge.net/wiki/virtaal/index
Source0:        http://downloads.sourceforge.net/translate/%{name}-%{version}.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Patch0:         virtaal-0.2-setup_drop_MO_generation.patch

BuildArch:      noarch
BuildRequires:  python
BuildRequires:  python-devel
BuildRequires:  desktop-file-utils
BuildRequires:  gettext
BuildRequires:  intltool
Requires:       translate-toolkit >= 1.2
Requires:       pygtk2
Requires:       pygtk2-libglade
Requires:       python-lxml
Requires:       gnome-python2-gtkspell
Requires:       xdg-utils


%description
A program for Computer Aided Translation (CAT) built on the Translate Toolkit.

Virtaal includes features that allow a localizer to work effectively including:
syntax highlighting, autocomplete and autocorrect.  Showing only 
the data that is needed through its simple and effective user interface it
ensures that you can focus on the translation task straight away.

By building on the Translate Toolkit, Virtaal is able to edit any of the
following formats: XLIFF, Gettext PO and .mo, Qt .ts, .qph and .qm, Wordfast 
TM, TMX, TBX.  By using the Translate Toolkit converters a translator can edit:
OpenOffice.org SDF, Java (and Mozilla) .properties and Mozilla DTD.
 

%prep
%setup -q -n %{name}-%{version}
%patch0 -p1

%build
%{__python} setup.py build
./maketranslations %{name}
pushd po
for po in $(ls *.po | egrep -v de_DE)
do
    mkdir -p locale/$(basename $po .po)/LC_MESSAGES/
    msgfmt $po --output-file=locale/$(basename $po .po)/LC_MESSAGES/%{name}.mo
done
popd


%install
rm -rf %{buildroot}
%{__python} setup.py install -O1 --skip-build --install-data=/usr --root %{buildroot}

desktop-file-install                                     \
   --delete-original                                     \
   --dir=%{buildroot}%{_datadir}/applications            \
   %{buildroot}%{_datadir}/applications/%{name}.desktop
cp -rp po/locale %{buildroot}%{_datadir}/
%find_lang %{name}


%post
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


%postun
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


%clean
rm -rf %{buildroot}


%files -f %{name}.lang
%defattr(-,root,root,-)
%doc README LICENSE po/*.pot
%{_bindir}/*
%{_datadir}/applications/*
%{_datadir}/mime/packages/*
%{_datadir}/virtaal
%{_datadir}/icons/*
%{python_sitelib}/*


%changelog
* Sat Dec 6 2008 Dwayne Bailey <dwayne at translate.org.za> - 0.2-2
- Cleanups from package review

* Thu Oct 16 2008 Dwayne Bailey <dwayne at translate.org.za> - 0.2-1
- Build for final 0.2 release
- Add pygtk2-libglade dependency

* Thu Oct 2 2008 Dwayne Bailey <dwayne at translate.org.za> - 0.2-0.3.rc1
- Rebuild after tarball restructuring

* Wed Oct 1 2008 Dwayne Bailey <dwayne at translate.org.za> - 0.2-0.2.rc1
- Fix file locations

* Wed Oct 1 2008 Dwayne Bailey <dwayne at translate.org.za> - 0.2-0.1.rc1
- Update to RC1

* Sat Sep 20 2008 Dwayne Bailey <dwayne at translate.org.za> - 0.1-12
- Include LICENSE

* Thu Sep 11 2008 Dwayne Bailey <dwayne at translate.org.za> - 0.1-11
- Update for various file moves.
- Package virtaal.pot and gtk+-lite.pot
- Exclude the de_DE.mo debug translations

* Sat Jul 26 2008 Dwayne Bailey <dwayne at translate.org.za> - 0.1-10
- Package autocorrect files

* Thu Jul 24 2008 Dwayne Bailey <dwayne at translate.org.za> - 0.1-9
- Rebuild after upstream data location changes

* Tue Jun 3 2008 Dwayne Bailey <dwayne at translate.org.za> - 0.1-8
- Rebuild for fc9

* Fri May 9 2008 Dwayne Bailey <dwayne at translate.org.za> - 0.1-8
- Add xdg-utils as a requirement as we are using xdg-open

* Wed May 7 2008 Dwayne Bailey <dwayne at translate.org.za> - 0.1-7
- Adjust to changes in source package

* Wed Apr 30 2008 Dwayne Bailey <dwayne at translate.org.za> - 0.1-6
- Adjust to changes in source package

* Thu Apr 17 2008 Dwayne Bailey <dwayne at translate.org.za> - 0.1-5
- Install icon

* Thu Apr 17 2008 Dwayne Bailey <dwayne at translate.org.za> - 0.1-4
- Build translatable files using intltool

* Mon Apr 14 2008 Dwayne Bailey <dwayne at translate.org.za> - 0.1-3
- Install translations

* Sat Apr 12 2008 Dwayne Bailey <dwayne at translate.org.za> - 0.1-2
- Executable s/run_virtaal.py/virtaal/
- Remove .glade movement, ./setup.py install it correctly now
- Install .desktop, locale, mime files
- Update desktop- and mime-database

* Sat Apr 5 2008 Dwayne Bailey <dwayne at translate.org.za> - 0.1-1
- Initial packaging


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/virtaal/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	4 Jan 2009 20:16:29 -0000	1.1
+++ .cvsignore	7 Jan 2009 19:27:15 -0000	1.2
@@ -0,0 +1 @@
+virtaal-0.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/virtaal/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	4 Jan 2009 20:16:30 -0000	1.1
+++ sources	7 Jan 2009 19:27:15 -0000	1.2
@@ -0,0 +1 @@
+cd01398cc6c916317829a88c72af2253  virtaal-0.2.tar.bz2



From mmahut at fedoraproject.org  Wed Jan  7 19:31:35 2009
From: mmahut at fedoraproject.org (Marek Mahut)
Date: Wed,  7 Jan 2009 19:31:35 +0000 (UTC)
Subject: rpms/grc/devel grc.spec,1.1,1.2
Message-ID: <20090107193135.0EE5E70141@cvs1.fedora.phx.redhat.com>

Author: mmahut

Update of /cvs/pkgs/rpms/grc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31546

Modified Files:
	grc.spec 
Log Message:
Bug 473924 -  grc : Unowned directories



Index: grc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/grc/devel/grc.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- grc.spec	29 Aug 2008 07:47:44 -0000	1.1
+++ grc.spec	7 Jan 2009 19:31:04 -0000	1.2
@@ -45,11 +45,15 @@
 %defattr(-,root,root,-)
 %doc readme.txt license/creative_commons_legal_code.txt license/free_software_message.txt license/gpl.txt notes/release_notes.txt notes/creating_a_signal_block_def.txt notes/todo.txt notes/programming_style.txt
 %{_bindir}/grc
+%{_datadir}/%{name}
 %{_datadir}/%{name}/data
 %{_datadir}/%{name}/examples
 %{_datadir}/%{name}/src
 %{_datadir}/applications/fedora-grc.desktop
 
 %changelog
+* Wed Jan 7 2009 Marek Mahut <mmahut at fedoraproject.org> - 0.70-3
+- RHBZ#473924 Unowned directories
+
 * Fri Aug 8 2008 Marek Mahut <mmahut at fedoraproject.org> - 0.70-2
 - Initial package release



From slankes at fedoraproject.org  Wed Jan  7 19:40:23 2009
From: slankes at fedoraproject.org (Sven Lankes)
Date: Wed,  7 Jan 2009 19:40:23 +0000 (UTC)
Subject: rpms/dustin-dustismo-fonts/devel
	dustin-dustismo-fonts-fontconfig.conf, NONE,
	1.1 dustin-dustismo-fonts-roman-fontconfig.conf, NONE,
	1.1 dustin-dustismo-fonts.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090107194023.6F77070100@cvs1.fedora.phx.redhat.com>

Author: slankes

Update of /cvs/pkgs/rpms/dustin-dustismo-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv772

Modified Files:
	.cvsignore sources 
Added Files:
	dustin-dustismo-fonts-fontconfig.conf 
	dustin-dustismo-fonts-roman-fontconfig.conf 
	dustin-dustismo-fonts.spec 
Log Message:
initial import


--- NEW FILE dustin-dustismo-fonts-fontconfig.conf ---
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
<fontconfig>
  <alias>
    <family>sans-serif</family>
    <prefer>
      <family>Dustismo</family>
    </prefer>
  </alias>
  <alias>
    <family>Dustismo</family>
    <default>
      <family>sans-serif</family>
    </default>
  </alias>
</fontconfig>



--- NEW FILE dustin-dustismo-fonts-roman-fontconfig.conf ---
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
<fontconfig>
  <alias>
    <family>serif</family>
    <prefer>
      <family>Dustismo</family>
    </prefer>
  </alias>
  <alias>
    <family>Dustismo</family>
    <default>
      <family>serif</family>
    </default>
  </alias>
</fontconfig>



--- NEW FILE dustin-dustismo-fonts.spec ---
%define fontname dustin-dustismo
%define fontconf 63-%{fontname}

%define common_desc General purpose fonts by Dustin Norlander available in \
serif and sans-serif versions. The fonts cover all European Latin characters.

Name:          %{fontname}-fonts
Version:       20030318
Release:       2%{?dist}
Summary:       General purpose sans-serif font with bold, italic and bold-italic variations

Group:         User Interface/X
License:       GPLv2+
URL:           http://www.dustismo.com
# Actual download URL
#URL:           http://ftp.de.debian.org/debian/pool/main/t/ttf-dustin/ttf-dustin_20030517.orig.tar.gz 
Source0:       Dustismo.zip
Source1:       %{name}-fontconfig.conf
Source2:       %{name}-roman-fontconfig.conf
BuildRoot:     %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

BuildArch:     noarch
BuildRequires: fontpackages-devel

%description
%common_desc

%_font_pkg -f %{fontconf}.conf dustismo_bold_italic.ttf dustismo_bold.ttf dustismo_italic.ttf Dustismo.ttf

%package common
Summary:       Common files for %{name}
Group:         User Interface/X
Requires:      fontpackages-filesystem

%description common
%common_desc

This package consists of files used by other %{name} packages.

%package       roman
Summary:       General purpose serif font
Group:         User Interface/X
Requires:      %{name}-common = %{version}-%{release}

%description roman
%common_desc

General purpose serif font with bold, italic and bold-italic variations

%_font_pkg -n roman -f %{fontconf}-roman.conf Dustismo_Roman_Bold.ttf Dustismo_Roman.ttf Dustismo_Roman_Italic_Bold.ttf Dustismo_Roman_Italic.ttf      

%prep
%setup -q -c %{name}
sed -i 's/\r//' license.txt

%build

%install
rm -rf $RPM_BUILD_ROOT

install -m 0755 -d %{buildroot}%{_fontdir}
install -m 0644 -p *.ttf %{buildroot}%{_fontdir}

install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} %{buildroot}%{_fontconfig_confdir}

install -m 0644 -p %{SOURCE1} %{buildroot}%{_fontconfig_templatedir}/%{fontconf}.conf
install -m 0644 -p %{SOURCE2} %{buildroot}%{_fontconfig_templatedir}/%{fontconf}-roman.conf

for fontconf in %{fontconf}.conf %{fontconf}-roman.conf ; do
  ln -s %{_fontconfig_templatedir}/$fontconf %{buildroot}%{_fontconfig_confdir}/$fontconf
done

%clean
rm -rf $RPM_BUILD_ROOT

%files common
%defattr(0644,root,root,0755)
%doc license.txt

%dir %{_fontdir}

%changelog
* Wed Dec 07 2009 Sven Lankes <sven at lank.es> - 20030318-2
- Change package-name to dustin-dustistmo-fonts

* Sun Dec 04 2009 Sven Lankes <sven at lank.es> - 20030318-1
- Use newer debian-source as source
- Convert to -multi spec

* Wed Dec 31 2008 Sven Lankes <sven at lank.es> - 20030207-1
- Initial packaging



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/dustin-dustismo-fonts/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	7 Jan 2009 00:04:31 -0000	1.1
+++ .cvsignore	7 Jan 2009 19:39:53 -0000	1.2
@@ -0,0 +1 @@
+Dustismo.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dustin-dustismo-fonts/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	7 Jan 2009 00:04:31 -0000	1.1
+++ sources	7 Jan 2009 19:39:53 -0000	1.2
@@ -0,0 +1 @@
+de74f82082b7dba21e457b8bb32b88a5  Dustismo.zip



From s4504kr at fedoraproject.org  Wed Jan  7 19:42:44 2009
From: s4504kr at fedoraproject.org (Jochen Schmitt)
Date: Wed,  7 Jan 2009 19:42:44 +0000 (UTC)
Subject: rpms/aplus-fsf/devel aplus-fsf.spec,1.29,1.30
Message-ID: <20090107194244.E389E70100@cvs1.fedora.phx.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/aplus-fsf/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1162

Modified Files:
	aplus-fsf.spec 
Log Message:
Add missing Provides/Obsoletes


Index: aplus-fsf.spec
===================================================================
RCS file: /cvs/extras/rpms/aplus-fsf/devel/aplus-fsf.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- aplus-fsf.spec	7 Jan 2009 18:38:18 -0000	1.29
+++ aplus-fsf.spec	7 Jan 2009 19:42:14 -0000	1.30
@@ -14,7 +14,7 @@
 
 Name: %name
 Version: 4.22.4
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: GPLv2
 
 Summary: Advanced APL interpreter with s interface
@@ -55,8 +55,14 @@
 Summary: TrueType fonts for the Advanced APL Interpreter
 Group: User Interface/X
 Provides: apl-fonts
+Provides: fonts-x11-apl = %{version}-%{release}
+Provides: fonts-truetype-apl = %{version}-%{release}
+Obsoletes: fonts-x11-apl < 4.22.4-6
+Obsoletes: fonts-truetype-apl < 2.44.4-6
+
 Requires: fontpackages-filesystem
 
+
 %description fonts
 The A+ programming language development environment requires these 
 APL fonts to properly display A+ code in XTerm or XEmacs.
@@ -164,7 +170,7 @@
 %{_lispstart}/aplus-fsf-init.el
 
 %Changelog
-* Wed Jan  7 2009 Jochen Schmitt <Jochen herr-schmitt de> 4.22.4-6
+* Wed Jan  7 2009 Jochen Schmitt <Jochen herr-schmitt de> 4.22.4-7
 - Reorganization of apl fonts
 
 * Mon Nov 17 2008 Jochen Schmitt <Jochen herr-schmitt de> 4.22.4-5



From than at fedoraproject.org  Wed Jan  7 19:46:37 2009
From: than at fedoraproject.org (Than Ngo)
Date: Wed,  7 Jan 2009 19:46:37 +0000 (UTC)
Subject: rpms/kdemultimedia/devel .cvsignore, 1.57, 1.58 kdemultimedia.spec, 
	1.131, 1.132 sources, 1.59, 1.60
Message-ID: <20090107194637.3E25270100@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdemultimedia/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1727

Modified Files:
	.cvsignore kdemultimedia.spec sources 
Log Message:
4.2rc1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdemultimedia/devel/.cvsignore,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- .cvsignore	12 Dec 2008 11:18:19 -0000	1.57
+++ .cvsignore	7 Jan 2009 19:46:06 -0000	1.58
@@ -1,3 +1,4 @@
 kdemultimedia-4.1.2.tar.bz2
 kdemultimedia-4.1.80.tar.bz2
 kdemultimedia-4.1.85.tar.bz2
+kdemultimedia-4.1.96.tar.bz2


Index: kdemultimedia.spec
===================================================================
RCS file: /cvs/extras/rpms/kdemultimedia/devel/kdemultimedia.spec,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -r1.131 -r1.132
--- kdemultimedia.spec	13 Dec 2008 03:05:28 -0000	1.131
+++ kdemultimedia.spec	7 Jan 2009 19:46:06 -0000	1.132
@@ -1,7 +1,7 @@
 Name: kdemultimedia
 Epoch: 6
-Version: 4.1.85
-Release: 2%{?dist}
+Version: 4.1.96
+Release: 1%{?dist}
 Summary: K Desktop Environment - Multimedia applications
 
 Group:     Applications/Multimedia
@@ -146,6 +146,9 @@
 
 
 %changelog
+* Wed Jan 07 2009 Than Ngo <than at redhat.com> - 4.1.96-1
+- 4.2rc1
+
 * Sat Dec 13 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.85-2
 - restore BR libtunepimp-devel libmusicbrainz-devel for now, needed by Kscd
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdemultimedia/devel/sources,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- sources	12 Dec 2008 11:18:19 -0000	1.59
+++ sources	7 Jan 2009 19:46:06 -0000	1.60
@@ -1 +1 @@
-a2339f800000e2c3cc687a8535da6ed7  kdemultimedia-4.1.85.tar.bz2
+98d66627f6ae4376b6415ed1ad23ded4  kdemultimedia-4.1.96.tar.bz2



From pkgdb at fedoraproject.org  Wed Jan  7 19:46:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 07 Jan 2009 19:46:41 +0000
Subject: [pkgdb] yakuake ownership updated
Message-ID: <20090107194641.B48EE208317@bastion.fedora.phx.redhat.com>

Package yakuake in Fedora devel is now owned by trasher

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/yakuake



From pkgdb at fedoraproject.org  Wed Jan  7 19:46:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 07 Jan 2009 19:46:57 +0000
Subject: [pkgdb] yakuake ownership updated
Message-ID: <20090107194658.02A1E208317@bastion.fedora.phx.redhat.com>

Package yakuake in Fedora 9 is now owned by trasher

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/yakuake



From pkgdb at fedoraproject.org  Wed Jan  7 19:47:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 07 Jan 2009 19:47:00 +0000
Subject: [pkgdb] yakuake ownership updated
Message-ID: <20090107194700.5696220831D@bastion.fedora.phx.redhat.com>

Package yakuake in Fedora 10 is now owned by trasher

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/yakuake



From slankes at fedoraproject.org  Wed Jan  7 19:56:40 2009
From: slankes at fedoraproject.org (Sven Lankes)
Date: Wed,  7 Jan 2009 19:56:40 +0000 (UTC)
Subject: rpms/dustin-dustismo-fonts/F-10
	dustin-dustismo-fonts-fontconfig.conf, 
	NONE, 1.1 dustin-dustismo-fonts-roman-fontconfig.conf, NONE,
	1.1 dustin-dustismo-fonts.spec, NONE, 1.1
Message-ID: <20090107195640.B593770100@cvs1.fedora.phx.redhat.com>

Author: slankes

Update of /cvs/pkgs/rpms/dustin-dustismo-fonts/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2891/F-10

Added Files:
	dustin-dustismo-fonts-fontconfig.conf 
	dustin-dustismo-fonts-roman-fontconfig.conf 
	dustin-dustismo-fonts.spec 
Log Message:
initial import


--- NEW FILE dustin-dustismo-fonts-fontconfig.conf ---
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
<fontconfig>
  <alias>
    <family>sans-serif</family>
    <prefer>
      <family>Dustismo</family>
    </prefer>
  </alias>
  <alias>
    <family>Dustismo</family>
    <default>
      <family>sans-serif</family>
    </default>
  </alias>
</fontconfig>



--- NEW FILE dustin-dustismo-fonts-roman-fontconfig.conf ---
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
<fontconfig>
  <alias>
    <family>serif</family>
    <prefer>
      <family>Dustismo</family>
    </prefer>
  </alias>
  <alias>
    <family>Dustismo</family>
    <default>
      <family>serif</family>
    </default>
  </alias>
</fontconfig>



--- NEW FILE dustin-dustismo-fonts.spec ---
%define fontname dustin-dustismo
%define fontconf 63-%{fontname}

%define common_desc General purpose fonts by Dustin Norlander available in \
serif and sans-serif versions. The fonts cover all European Latin characters.

Name:          %{fontname}-fonts
Version:       20030318
Release:       2%{?dist}
Summary:       General purpose sans-serif font with bold, italic and bold-italic variations

Group:         User Interface/X
License:       GPLv2+
URL:           http://www.dustismo.com
# Actual download URL
#URL:           http://ftp.de.debian.org/debian/pool/main/t/ttf-dustin/ttf-dustin_20030517.orig.tar.gz 
Source0:       Dustismo.zip
Source1:       %{name}-fontconfig.conf
Source2:       %{name}-roman-fontconfig.conf
BuildRoot:     %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

BuildArch:     noarch
BuildRequires: fontpackages-devel

%description
%common_desc

%_font_pkg -f %{fontconf}.conf dustismo_bold_italic.ttf dustismo_bold.ttf dustismo_italic.ttf Dustismo.ttf

%package common
Summary:       Common files for %{name}
Group:         User Interface/X
Requires:      fontpackages-filesystem

%description common
%common_desc

This package consists of files used by other %{name} packages.

%package       roman
Summary:       General purpose serif font
Group:         User Interface/X
Requires:      %{name}-common = %{version}-%{release}

%description roman
%common_desc

General purpose serif font with bold, italic and bold-italic variations

%_font_pkg -n roman -f %{fontconf}-roman.conf Dustismo_Roman_Bold.ttf Dustismo_Roman.ttf Dustismo_Roman_Italic_Bold.ttf Dustismo_Roman_Italic.ttf      

%prep
%setup -q -c %{name}
sed -i 's/\r//' license.txt

%build

%install
rm -rf $RPM_BUILD_ROOT

install -m 0755 -d %{buildroot}%{_fontdir}
install -m 0644 -p *.ttf %{buildroot}%{_fontdir}

install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} %{buildroot}%{_fontconfig_confdir}

install -m 0644 -p %{SOURCE1} %{buildroot}%{_fontconfig_templatedir}/%{fontconf}.conf
install -m 0644 -p %{SOURCE2} %{buildroot}%{_fontconfig_templatedir}/%{fontconf}-roman.conf

for fontconf in %{fontconf}.conf %{fontconf}-roman.conf ; do
  ln -s %{_fontconfig_templatedir}/$fontconf %{buildroot}%{_fontconfig_confdir}/$fontconf
done

%clean
rm -rf $RPM_BUILD_ROOT

%files common
%defattr(0644,root,root,0755)
%doc license.txt

%dir %{_fontdir}

%changelog
* Wed Dec 07 2009 Sven Lankes <sven at lank.es> - 20030318-2
- Change package-name to dustin-dustistmo-fonts

* Sun Dec 04 2009 Sven Lankes <sven at lank.es> - 20030318-1
- Use newer debian-source as source
- Convert to -multi spec

* Wed Dec 31 2008 Sven Lankes <sven at lank.es> - 20030207-1
- Initial packaging




From slankes at fedoraproject.org  Wed Jan  7 19:56:40 2009
From: slankes at fedoraproject.org (Sven Lankes)
Date: Wed,  7 Jan 2009 19:56:40 +0000 (UTC)
Subject: rpms/dustin-dustismo-fonts/F-9
	dustin-dustismo-fonts-fontconfig.conf, 
	NONE, 1.1 dustin-dustismo-fonts-roman-fontconfig.conf, NONE,
	1.1 dustin-dustismo-fonts.spec, NONE, 1.1
Message-ID: <20090107195640.F190570100@cvs1.fedora.phx.redhat.com>

Author: slankes

Update of /cvs/pkgs/rpms/dustin-dustismo-fonts/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2891/F-9

Added Files:
	dustin-dustismo-fonts-fontconfig.conf 
	dustin-dustismo-fonts-roman-fontconfig.conf 
	dustin-dustismo-fonts.spec 
Log Message:
initial import


--- NEW FILE dustin-dustismo-fonts-fontconfig.conf ---
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
<fontconfig>
  <alias>
    <family>sans-serif</family>
    <prefer>
      <family>Dustismo</family>
    </prefer>
  </alias>
  <alias>
    <family>Dustismo</family>
    <default>
      <family>sans-serif</family>
    </default>
  </alias>
</fontconfig>



--- NEW FILE dustin-dustismo-fonts-roman-fontconfig.conf ---
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
<fontconfig>
  <alias>
    <family>serif</family>
    <prefer>
      <family>Dustismo</family>
    </prefer>
  </alias>
  <alias>
    <family>Dustismo</family>
    <default>
      <family>serif</family>
    </default>
  </alias>
</fontconfig>



--- NEW FILE dustin-dustismo-fonts.spec ---
%define fontname dustin-dustismo
%define fontconf 63-%{fontname}

%define common_desc General purpose fonts by Dustin Norlander available in \
serif and sans-serif versions. The fonts cover all European Latin characters.

Name:          %{fontname}-fonts
Version:       20030318
Release:       2%{?dist}
Summary:       General purpose sans-serif font with bold, italic and bold-italic variations

Group:         User Interface/X
License:       GPLv2+
URL:           http://www.dustismo.com
# Actual download URL
#URL:           http://ftp.de.debian.org/debian/pool/main/t/ttf-dustin/ttf-dustin_20030517.orig.tar.gz 
Source0:       Dustismo.zip
Source1:       %{name}-fontconfig.conf
Source2:       %{name}-roman-fontconfig.conf
BuildRoot:     %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

BuildArch:     noarch
BuildRequires: fontpackages-devel

%description
%common_desc

%_font_pkg -f %{fontconf}.conf dustismo_bold_italic.ttf dustismo_bold.ttf dustismo_italic.ttf Dustismo.ttf

%package common
Summary:       Common files for %{name}
Group:         User Interface/X
Requires:      fontpackages-filesystem

%description common
%common_desc

This package consists of files used by other %{name} packages.

%package       roman
Summary:       General purpose serif font
Group:         User Interface/X
Requires:      %{name}-common = %{version}-%{release}

%description roman
%common_desc

General purpose serif font with bold, italic and bold-italic variations

%_font_pkg -n roman -f %{fontconf}-roman.conf Dustismo_Roman_Bold.ttf Dustismo_Roman.ttf Dustismo_Roman_Italic_Bold.ttf Dustismo_Roman_Italic.ttf      

%prep
%setup -q -c %{name}
sed -i 's/\r//' license.txt

%build

%install
rm -rf $RPM_BUILD_ROOT

install -m 0755 -d %{buildroot}%{_fontdir}
install -m 0644 -p *.ttf %{buildroot}%{_fontdir}

install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} %{buildroot}%{_fontconfig_confdir}

install -m 0644 -p %{SOURCE1} %{buildroot}%{_fontconfig_templatedir}/%{fontconf}.conf
install -m 0644 -p %{SOURCE2} %{buildroot}%{_fontconfig_templatedir}/%{fontconf}-roman.conf

for fontconf in %{fontconf}.conf %{fontconf}-roman.conf ; do
  ln -s %{_fontconfig_templatedir}/$fontconf %{buildroot}%{_fontconfig_confdir}/$fontconf
done

%clean
rm -rf $RPM_BUILD_ROOT

%files common
%defattr(0644,root,root,0755)
%doc license.txt

%dir %{_fontdir}

%changelog
* Wed Dec 07 2009 Sven Lankes <sven at lank.es> - 20030318-2
- Change package-name to dustin-dustistmo-fonts

* Sun Dec 04 2009 Sven Lankes <sven at lank.es> - 20030318-1
- Use newer debian-source as source
- Convert to -multi spec

* Wed Dec 31 2008 Sven Lankes <sven at lank.es> - 20030207-1
- Initial packaging




From rdieter at fedoraproject.org  Wed Jan  7 19:57:18 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed,  7 Jan 2009 19:57:18 +0000 (UTC)
Subject: rpms/xine-lib/devel sources,1.19,1.20 xine-lib.spec,1.51,1.52
Message-ID: <20090107195718.CCFDC70100@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/xine-lib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2937

Modified Files:
	sources xine-lib.spec 
Log Message:
respin autotools patch



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xine-lib/devel/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources	7 Jan 2009 19:18:46 -0000	1.19
+++ sources	7 Jan 2009 19:56:48 -0000	1.20
@@ -1,2 +1,2 @@
-5caed155987cd453b6e23b8720dfbd3d  xine-lib-1.1.16-autotools.patch.bz2
+fe8148f2a0ec7b2e75ad509e8086e33f  xine-lib-1.1.16-autotools.patch.bz2
 512f31d8414ef4654ca366c0dce37301  xine-lib-1.1.16-pruned.tar.bz2


Index: xine-lib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xine-lib/devel/xine-lib.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- xine-lib.spec	7 Jan 2009 19:18:46 -0000	1.51
+++ xine-lib.spec	7 Jan 2009 19:56:48 -0000	1.52
@@ -327,6 +327,11 @@
 %{_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_mpeg.so
+%{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_mpeg_block.so
+%{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_mpeg_elem.so
+%{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_mpeg_pes.so
+%{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_mpeg_ts.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
@@ -336,6 +341,7 @@
 %{_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_dmx_yuv4mpeg2.so
 %{_libdir}/xine/plugins/%{abiver}/xineplug_flac.so
 %{_libdir}/xine/plugins/%{abiver}/xineplug_inp_cdda.so
 %{_libdir}/xine/plugins/%{abiver}/xineplug_inp_dvb.so
@@ -417,7 +423,7 @@
 %changelog
 * Wed Jan 07 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.1.16-1
 - xine-lib-1.1.16, plugin ABI 1.25
-- --with-external-libdvdnav, include demuxers (#213597)
+- --with-external-libdvdnav, include mpeg demuxers (#213597)
 
 * Fri Dec 12 2008 Rex Dieter <rdieter at fedoraproject.org> - 1.1.15-4
 - rebuild for pkgconfig deps



From than at fedoraproject.org  Wed Jan  7 19:58:17 2009
From: than at fedoraproject.org (Than Ngo)
Date: Wed,  7 Jan 2009 19:58:17 +0000 (UTC)
Subject: rpms/kdenetwork/devel .cvsignore, 1.60, 1.61 kdenetwork.spec, 1.164,
	1.165 sources, 1.67, 1.68
Message-ID: <20090107195817.6375F70100@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdenetwork/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3096

Modified Files:
	.cvsignore kdenetwork.spec sources 
Log Message:
4.2rc1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdenetwork/devel/.cvsignore,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- .cvsignore	12 Dec 2008 11:28:54 -0000	1.60
+++ .cvsignore	7 Jan 2009 19:57:46 -0000	1.61
@@ -1,3 +1,4 @@
 kdenetwork-4.1.2.tar.bz2
 kdenetwork-4.1.80.tar.bz2
 kdenetwork-4.1.85.tar.bz2
+kdenetwork-4.1.96.tar.bz2


Index: kdenetwork.spec
===================================================================
RCS file: /cvs/extras/rpms/kdenetwork/devel/kdenetwork.spec,v
retrieving revision 1.164
retrieving revision 1.165
diff -u -r1.164 -r1.165
--- kdenetwork.spec	12 Dec 2008 21:27:06 -0000	1.164
+++ kdenetwork.spec	7 Jan 2009 19:57:47 -0000	1.165
@@ -1,7 +1,7 @@
 Summary: K Desktop Environment - Network Applications
 Name: kdenetwork
 Epoch: 7
-Version: 4.1.85
+Version: 4.1.96
 Release: 1%{?dist}
 
 License: GPLv2
@@ -155,6 +155,9 @@
 
 
 %changelog
+* Wed Jan 07 2009 Than Ngo <than at redhat.com> - 4.1.96-1
+- 4.2rc1
+
 * Fri Dec 12 2008 Than Ngo <than at redhat.com> 4.1.85-1
 - 4.2beta2
 - BR: libmsn-devel


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdenetwork/devel/sources,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- sources	12 Dec 2008 11:28:55 -0000	1.67
+++ sources	7 Jan 2009 19:57:47 -0000	1.68
@@ -1 +1 @@
-609e06dce93a061addce565dc3820540  kdenetwork-4.1.85.tar.bz2
+01c69a5982758b4939627a6c4aa8fd55  kdenetwork-4.1.96.tar.bz2



From dwayne at fedoraproject.org  Wed Jan  7 20:01:09 2009
From: dwayne at fedoraproject.org (Dwayne Bailey)
Date: Wed,  7 Jan 2009 20:01:09 +0000 (UTC)
Subject: rpms/virtaal/EL-5 virtaal.spec,1.1,1.2
Message-ID: <20090107200109.41C5270100@cvs1.fedora.phx.redhat.com>

Author: dwayne

Update of /cvs/pkgs/rpms/virtaal/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3572

Modified Files:
	virtaal.spec 
Log Message:
* Wed Jan 7 2009 Dwayne Bailey <dwayne at translate.org.za> - 0.2-3
- vendor tag is needed for desktop-file-install



Index: virtaal.spec
===================================================================
RCS file: /cvs/pkgs/rpms/virtaal/EL-5/virtaal.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- virtaal.spec	7 Jan 2009 19:27:15 -0000	1.1
+++ virtaal.spec	7 Jan 2009 20:00:38 -0000	1.2
@@ -2,7 +2,7 @@
 
 Name:           virtaal
 Version:        0.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Localization and translation editor
 
 Group:          Development/Tools
@@ -62,6 +62,7 @@
 %{__python} setup.py install -O1 --skip-build --install-data=/usr --root %{buildroot}
 
 desktop-file-install                                     \
+   --vendor=""                                           \
    --delete-original                                     \
    --dir=%{buildroot}%{_datadir}/applications            \
    %{buildroot}%{_datadir}/applications/%{name}.desktop
@@ -103,6 +104,9 @@
 
 
 %changelog
+* Wed Jan 7 2009 Dwayne Bailey <dwayne at translate.org.za> - 0.2-3
+- vendor tag is needed for desktop-file-install
+
 * Sat Dec 6 2008 Dwayne Bailey <dwayne at translate.org.za> - 0.2-2
 - Cleanups from package review
 



From slankes at fedoraproject.org  Wed Jan  7 20:02:07 2009
From: slankes at fedoraproject.org (Sven Lankes)
Date: Wed,  7 Jan 2009 20:02:07 +0000 (UTC)
Subject: rpms/dustin-dustismo-fonts/F-10 .cvsignore,1.1,1.2 sources,1.1,1.2
Message-ID: <20090107200207.7A98A70100@cvs1.fedora.phx.redhat.com>

Author: slankes

Update of /cvs/pkgs/rpms/dustin-dustismo-fonts/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3724/F-10

Modified Files:
	.cvsignore sources 
Log Message:
add the source file for the release branches


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/dustin-dustismo-fonts/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	7 Jan 2009 00:04:31 -0000	1.1
+++ .cvsignore	7 Jan 2009 20:01:37 -0000	1.2
@@ -0,0 +1 @@
+Dustismo.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dustin-dustismo-fonts/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	7 Jan 2009 00:04:31 -0000	1.1
+++ sources	7 Jan 2009 20:01:37 -0000	1.2
@@ -0,0 +1 @@
+de74f82082b7dba21e457b8bb32b88a5  Dustismo.zip



From slankes at fedoraproject.org  Wed Jan  7 20:02:07 2009
From: slankes at fedoraproject.org (Sven Lankes)
Date: Wed,  7 Jan 2009 20:02:07 +0000 (UTC)
Subject: rpms/dustin-dustismo-fonts/F-9 .cvsignore,1.1,1.2 sources,1.1,1.2
Message-ID: <20090107200207.CA72270100@cvs1.fedora.phx.redhat.com>

Author: slankes

Update of /cvs/pkgs/rpms/dustin-dustismo-fonts/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3724/F-9

Modified Files:
	.cvsignore sources 
Log Message:
add the source file for the release branches


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/dustin-dustismo-fonts/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	7 Jan 2009 00:04:31 -0000	1.1
+++ .cvsignore	7 Jan 2009 20:01:37 -0000	1.2
@@ -0,0 +1 @@
+Dustismo.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dustin-dustismo-fonts/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	7 Jan 2009 00:04:31 -0000	1.1
+++ sources	7 Jan 2009 20:01:37 -0000	1.2
@@ -0,0 +1 @@
+de74f82082b7dba21e457b8bb32b88a5  Dustismo.zip



From s4504kr at fedoraproject.org  Wed Jan  7 20:02:23 2009
From: s4504kr at fedoraproject.org (Jochen Schmitt)
Date: Wed,  7 Jan 2009 20:02:23 +0000 (UTC)
Subject: rpms/aplus-fsf/devel aplus-fsf.spec,1.30,1.31
Message-ID: <20090107200223.11D2470141@cvs1.fedora.phx.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/aplus-fsf/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3865

Modified Files:
	aplus-fsf.spec 
Log Message:
fix typo on obsolete statement


Index: aplus-fsf.spec
===================================================================
RCS file: /cvs/extras/rpms/aplus-fsf/devel/aplus-fsf.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- aplus-fsf.spec	7 Jan 2009 19:42:14 -0000	1.30
+++ aplus-fsf.spec	7 Jan 2009 20:01:52 -0000	1.31
@@ -14,7 +14,7 @@
 
 Name: %name
 Version: 4.22.4
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: GPLv2
 
 Summary: Advanced APL interpreter with s interface
@@ -58,7 +58,7 @@
 Provides: fonts-x11-apl = %{version}-%{release}
 Provides: fonts-truetype-apl = %{version}-%{release}
 Obsoletes: fonts-x11-apl < 4.22.4-6
-Obsoletes: fonts-truetype-apl < 2.44.4-6
+Obsoletes: fonts-truetype-apl < 4.22.4-6
 
 Requires: fontpackages-filesystem
 
@@ -170,7 +170,7 @@
 %{_lispstart}/aplus-fsf-init.el
 
 %Changelog
-* Wed Jan  7 2009 Jochen Schmitt <Jochen herr-schmitt de> 4.22.4-7
+* Wed Jan  7 2009 Jochen Schmitt <Jochen herr-schmitt de> 4.22.4-8
 - Reorganization of apl fonts
 
 * Mon Nov 17 2008 Jochen Schmitt <Jochen herr-schmitt de> 4.22.4-5



From rdieter at fedoraproject.org  Wed Jan  7 20:09:02 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed,  7 Jan 2009 20:09:02 +0000 (UTC)
Subject: rpms/xine-lib/devel xine-lib.spec,1.52,1.53
Message-ID: <20090107200902.628B770100@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/xine-lib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5376

Modified Files:
	xine-lib.spec 
Log Message:
fix failure for awol ffmpeg



Index: xine-lib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xine-lib/devel/xine-lib.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- xine-lib.spec	7 Jan 2009 19:56:48 -0000	1.52
+++ xine-lib.spec	7 Jan 2009 20:08:32 -0000	1.53
@@ -196,6 +196,7 @@
 %build
 export FFMPEG_CFLAGS=" " FFMPEG_LIBS=" "
 export FFMPEG_POSTPROC_CFLAGS=" " FFMPEG_POSTPROC_LIBS=" "
+export FFMPEG_UTIL_CFLAGS=" " FFMPEG_UTIL_LIBS=" "
 export SDL_CFLAGS="$(sdl-config --cflags)" SDL_LIBS="$(sdl-config --libs)"
 # Keep list of options in mostly the same order as ./configure --help.
 %configure \



From than at fedoraproject.org  Wed Jan  7 20:10:37 2009
From: than at fedoraproject.org (Than Ngo)
Date: Wed,  7 Jan 2009 20:10:37 +0000 (UTC)
Subject: rpms/kdepim/devel .cvsignore, 1.55, 1.56 kdepim.spec, 1.200,
	1.201 sources, 1.64, 1.65
Message-ID: <20090107201037.CA00C70100@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdepim/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5214

Modified Files:
	.cvsignore kdepim.spec sources 
Log Message:
4.2rc1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdepim/devel/.cvsignore,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- .cvsignore	12 Dec 2008 11:35:58 -0000	1.55
+++ .cvsignore	7 Jan 2009 20:10:07 -0000	1.56
@@ -1,3 +1,4 @@
 kdepim-4.1.2.tar.bz2
 kdepim-4.1.80.tar.bz2
 kdepim-4.1.85.tar.bz2
+kdepim-4.1.96.tar.bz2


Index: kdepim.spec
===================================================================
RCS file: /cvs/extras/rpms/kdepim/devel/kdepim.spec,v
retrieving revision 1.200
retrieving revision 1.201
diff -u -r1.200 -r1.201
--- kdepim.spec	14 Dec 2008 02:23:28 -0000	1.200
+++ kdepim.spec	7 Jan 2009 20:10:07 -0000	1.201
@@ -5,7 +5,7 @@
 Name:    kdepim
 Summary: PIM (Personal Information Manager) applications
 Epoch:   6
-Version: 4.1.85
+Version: 4.1.96
 Release: 1%{?dist}
 
 License: GPLv2
@@ -174,6 +174,9 @@
 
 
 %changelog
+* Wed Jan 07 2009 Than Ngo <than at redhat.com> - 4.1.96-1
+- 4.2rc1
+
 * Fri Dec 12 2008 Than Ngo <than at redhat.com> 4.1.85-1
 - 4.2beta2
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdepim/devel/sources,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- sources	12 Dec 2008 11:35:59 -0000	1.64
+++ sources	7 Jan 2009 20:10:07 -0000	1.65
@@ -1 +1 @@
-73ab9aef5017936e6e0d6f17506ab32d  kdepim-4.1.85.tar.bz2
+4dceae1e430dfef40551f94495cb1f53  kdepim-4.1.96.tar.bz2



From than at fedoraproject.org  Wed Jan  7 20:16:30 2009
From: than at fedoraproject.org (Than Ngo)
Date: Wed,  7 Jan 2009 20:16:30 +0000 (UTC)
Subject: rpms/kdepimlibs/devel .cvsignore, 1.30, 1.31 kdepimlibs.spec, 1.63, 
	1.64 sources, 1.30, 1.31
Message-ID: <20090107201630.22D1C70100@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdepimlibs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6305

Modified Files:
	.cvsignore kdepimlibs.spec sources 
Log Message:
4.2rc1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdepimlibs/devel/.cvsignore,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- .cvsignore	11 Dec 2008 21:31:51 -0000	1.30
+++ .cvsignore	7 Jan 2009 20:15:59 -0000	1.31
@@ -1 +1,2 @@
 kdepimlibs-4.1.85.tar.bz2
+kdepimlibs-4.1.96.tar.bz2


Index: kdepimlibs.spec
===================================================================
RCS file: /cvs/extras/rpms/kdepimlibs/devel/kdepimlibs.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- kdepimlibs.spec	17 Dec 2008 15:26:10 -0000	1.63
+++ kdepimlibs.spec	7 Jan 2009 20:15:59 -0000	1.64
@@ -14,8 +14,8 @@
 %define akonadi_version 1.0.81
 
 Name: kdepimlibs
-Version: 4.1.85
-Release: 2%{?dist}
+Version: 4.1.96
+Release: 1%{?dist}
 Summary: K Desktop Environment 4 - PIM Libraries
 
 License: LGPLv2
@@ -172,6 +172,9 @@
 
 
 %changelog
+* Wed Jan 07 2009 Than Ngo <than at redhat.com> - 4.1.96-1
+- 4.2rc1
+
 * Wed Dec 17 2008 Rex Dieter <rdieter at fedoraproject.org> - 4.1.85-2
 - versioned akonadi(-devel) deps
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdepimlibs/devel/sources,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- sources	11 Dec 2008 21:31:51 -0000	1.30
+++ sources	7 Jan 2009 20:15:59 -0000	1.31
@@ -1 +1 @@
-fd82b2b05cece9d02ae3228bc715b0e3  kdepimlibs-4.1.85.tar.bz2
+1ce1fd2ad92e765678c3f858c2a89fd0  kdepimlibs-4.1.96.tar.bz2



From rdieter at fedoraproject.org  Wed Jan  7 20:16:52 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed,  7 Jan 2009 20:16:52 +0000 (UTC)
Subject: rpms/gnome-media/devel gnome-media.spec,1.146,1.147
Message-ID: <20090107201652.830E670100@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/gnome-media/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6404

Modified Files:
	gnome-media.spec 
Log Message:
* Wed Jan 07 2009 - Rex Dieter <rdieter at fedoraproject.org> - 2.25.1-3
- gnome-media should not depend on -devel packages (#479181)



Index: gnome-media.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-media/devel/gnome-media.spec,v
retrieving revision 1.146
retrieving revision 1.147
diff -u -r1.146 -r1.147
--- gnome-media.spec	5 Jan 2009 15:09:03 -0000	1.146
+++ gnome-media.spec	7 Jan 2009 20:16:21 -0000	1.147
@@ -14,7 +14,7 @@
 Summary:        GNOME media programs
 Name:           gnome-media
 Version:        2.25.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 License:        GPLv2+ and GFDL
 Group:          Applications/Multimedia
 Source:         http://download.gnome.org/sources/gnome-media/2.25/gnome-media-%{version}.tar.bz2
@@ -66,10 +66,6 @@
 Summary: Development files for gnome-media
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
-Requires: gtk2-devel >= %{gtk2_version}
-Requires: libgnome-devel >= %{libgnome_version}
-Requires: libgnomeui-devel >= %{libgnomeui_version}
-Requires: pkgconfig
 
 %description libs
 This package contains the libraries required for using encoding profiles
@@ -244,6 +240,9 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Wed Jan 07 2009 - Rex Dieter <rdieter at fedoraproject.org> - 2.25.1-3
+- gnome-media should not depend on -devel packages (#479181)
+
 * Mon Jan 05 2009 - Bastien Nocera <bnocera at redhat.com> - 2.25.1-2
 - Split applications and the media profiles library
 - Remove some unneeded BuildRequires



From than at fedoraproject.org  Wed Jan  7 20:22:06 2009
From: than at fedoraproject.org (Than Ngo)
Date: Wed,  7 Jan 2009 20:22:06 +0000 (UTC)
Subject: rpms/kdeplasma-addons/devel .cvsignore, 1.8,
	1.9 kdeplasma-addons.spec, 1.19, 1.20 sources, 1.8, 1.9
Message-ID: <20090107202206.319FA70100@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdeplasma-addons/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6967

Modified Files:
	.cvsignore kdeplasma-addons.spec sources 
Log Message:
4.2rc1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdeplasma-addons/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	12 Dec 2008 11:39:57 -0000	1.8
+++ .cvsignore	7 Jan 2009 20:21:35 -0000	1.9
@@ -1,3 +1,4 @@
 kdeplasma-addons-4.1.2.tar.bz2
 kdeplasma-addons-4.1.80.tar.bz2
 kdeplasma-addons-4.1.85.tar.bz2
+kdeplasma-addons-4.1.96.tar.bz2


Index: kdeplasma-addons.spec
===================================================================
RCS file: /cvs/extras/rpms/kdeplasma-addons/devel/kdeplasma-addons.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- kdeplasma-addons.spec	16 Dec 2008 19:52:48 -0000	1.19
+++ kdeplasma-addons.spec	7 Jan 2009 20:21:35 -0000	1.20
@@ -1,6 +1,6 @@
 Name:           kdeplasma-addons
-Version:        4.1.85
-Release:        2%{?dist}
+Version:        4.1.96
+Release:        1%{?dist}
 Summary:        Additional plasmoids for KDE
 
 Group:          User Interface/Desktops
@@ -107,6 +107,9 @@
 
 
 %changelog
+* Wed Jan 07 2009 Than Ngo <than at redhat.com> - 4.1.96-1
+- 4.2rc1
+
 * Tue Dec 16 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.85-2
 - saner versioned Obsoletes
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdeplasma-addons/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	12 Dec 2008 11:39:57 -0000	1.8
+++ sources	7 Jan 2009 20:21:35 -0000	1.9
@@ -1 +1 @@
-c961f6b0391646224aaf21b9aa63af04  kdeplasma-addons-4.1.85.tar.bz2
+323cc2d3da230e1916ad2fda0784da38  kdeplasma-addons-4.1.96.tar.bz2



From rdieter at fedoraproject.org  Wed Jan  7 20:23:06 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed,  7 Jan 2009 20:23:06 +0000 (UTC)
Subject: rpms/xine-lib/F-10 .cvsignore, 1.17, 1.18 sources, 1.18,
	1.19 xine-lib-cleanup-sources.sh, 1.7, 1.8 xine-lib.spec, 1.49,
	1.50 xine-lib-1.1.15-ansi.patch, 1.1, NONE
Message-ID: <20090107202306.1B68870100@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/xine-lib/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7169

Modified Files:
	.cvsignore sources xine-lib-cleanup-sources.sh xine-lib.spec 
Removed Files:
	xine-lib-1.1.15-ansi.patch 
Log Message:
* Wed Jan 07 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.1.16-1
- xine-lib-1.1.16, plugin ABI 1.25
- --with-external-libdvdnav, include mpeg demuxers (#213597)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xine-lib/F-10/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- .cvsignore	15 Aug 2008 19:38:41 -0000	1.17
+++ .cvsignore	7 Jan 2009 20:22:35 -0000	1.18
@@ -1,2 +1,2 @@
-xine-lib-1.1.15-autotools.patch.bz2
-xine-lib-1.1.15-pruned.tar.bz2
+xine-lib-1.1.16-autotools.patch.bz2
+xine-lib-1.1.16-pruned.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xine-lib/F-10/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources	15 Aug 2008 19:38:41 -0000	1.18
+++ sources	7 Jan 2009 20:22:35 -0000	1.19
@@ -1,2 +1,2 @@
-ffd74ec893a5f1167c69987a68f436fd  xine-lib-1.1.15-autotools.patch.bz2
-acdbdc024382afac111eb076304448ed  xine-lib-1.1.15-pruned.tar.bz2
+fe8148f2a0ec7b2e75ad509e8086e33f  xine-lib-1.1.16-autotools.patch.bz2
+512f31d8414ef4654ca366c0dce37301  xine-lib-1.1.16-pruned.tar.bz2


Index: xine-lib-cleanup-sources.sh
===================================================================
RCS file: /cvs/pkgs/rpms/xine-lib/F-10/xine-lib-cleanup-sources.sh,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- xine-lib-cleanup-sources.sh	19 Mar 2008 19:51:59 -0000	1.7
+++ xine-lib-cleanup-sources.sh	7 Jan 2009 20:22:35 -0000	1.8
@@ -56,11 +56,12 @@
   sed -i -e "/xineplug_inp_$p/d" src/input/Makefile.am
 done
 # Demuxers
-for p in mpeg mpeg_block mpeg_ts mpeg_elem mpeg_pes yuv4mpeg2; do
-  echo "removing $p demuxer..."
-  [ -f src/demuxers/demux_$p.c ] && rm -f src/demuxers/demux_$p.c
-  sed -i -e "/xineplug_dmx_$p/d" src/demuxers/Makefile.am
-done
+# These are ok now ( http://bugzilla.redhat.com/213597 )
+#for p in mpeg mpeg_block mpeg_ts mpeg_elem mpeg_pes yuv4mpeg2; do
+#  echo "removing $p demuxer..."
+#  [ -f src/demuxers/demux_$p.c ] && rm -f src/demuxers/demux_$p.c
+#  sed -i -e "/xineplug_dmx_$p/d" src/demuxers/Makefile.am
+#done
 # Postprocessors
 echo "removing planar and deinterlace postprocessors..."
 sed -i -e 's/deinterlace //g' src/post/Makefile.am # see comments in speedy.c


Index: xine-lib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xine-lib/F-10/xine-lib.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- xine-lib.spec	28 Oct 2008 03:57:04 -0000	1.49
+++ xine-lib.spec	7 Jan 2009 20:22:35 -0000	1.50
@@ -2,10 +2,9 @@
 # - 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
-# - external dvdnav - not compatible as of 1.1.11 and 4.1.1
 # - deprecate ESD support?
 
-%define         abiver      1.24
+%define         abiver      1.25
 %define         codecdir    %{_libdir}/codecs
 
 %ifarch %{ix86}
@@ -32,8 +31,8 @@
 
 Summary:        Xine library
 Name:           xine-lib
-Version:        1.1.15
-Release:        3%{?dist}
+Version:        1.1.16
+Release:        1%{?dist}
 License:        GPLv2+
 Group:          System Environment/Libraries
 URL:            http://xinehq.de/
@@ -50,8 +49,6 @@
 Patch1:         %{name}-1.1.4-optflags.patch
 Patch6:         %{name}-1.1.1-deepbind-939.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
 
 Provides:       xine-lib(plugin-abi) = %{abiver}
 # X11
@@ -111,6 +108,7 @@
 %else
 BuildRequires:  samba-common
 %endif
+BuildRequires:  libdvdnav-devel
 
 %description
 This package contains the Xine library. Xine is a free multimedia player.
@@ -191,15 +189,14 @@
 # Patch6 needed at least when compiling with external ffmpeg, #939.
 %patch6 -p1 -b .deepbind
 
-%patch100 -p1 -b .ansi
-
-# Avoid standard rpaths on lib64 archs:
-sed -i -e 's|"/lib /usr/lib\b|"/%{_lib} %{_libdir}|' configure
+# Avoid standard rpaths on lib64 archs: (autotools patch should handle this, no? -- Rex )
+#sed -i -e 's|"/lib /usr/lib\b|"/%{_lib} %{_libdir}|' configure
 
 
 %build
 export FFMPEG_CFLAGS=" " FFMPEG_LIBS=" "
 export FFMPEG_POSTPROC_CFLAGS=" " FFMPEG_POSTPROC_LIBS=" "
+export FFMPEG_UTIL_CFLAGS=" " FFMPEG_UTIL_LIBS=" "
 export SDL_CFLAGS="$(sdl-config --cflags)" SDL_LIBS="$(sdl-config --libs)"
 # Keep list of options in mostly the same order as ./configure --help.
 %configure \
@@ -223,6 +220,7 @@
     --with-external-ffmpeg \
     --with-xv-path=%{_libdir} \
     --with-libflac \
+    --with-external-libdvdnav \
     --with-external-libmpcdec \
 %if 0%{?_without_imagemagick:1}
     --without-imagemagick \
@@ -330,6 +328,11 @@
 %{_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_mpeg.so
+%{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_mpeg_block.so
+%{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_mpeg_elem.so
+%{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_mpeg_pes.so
+%{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_mpeg_ts.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
@@ -339,6 +342,7 @@
 %{_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_dmx_yuv4mpeg2.so
 %{_libdir}/xine/plugins/%{abiver}/xineplug_flac.so
 %{_libdir}/xine/plugins/%{abiver}/xineplug_inp_cdda.so
 %{_libdir}/xine/plugins/%{abiver}/xineplug_inp_dvb.so
@@ -418,6 +422,13 @@
 
 
 %changelog
+* Wed Jan 07 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.1.16-1
+- xine-lib-1.1.16, plugin ABI 1.25
+- --with-external-libdvdnav, include mpeg demuxers (#213597)
+
+* Fri Dec 12 2008 Rex Dieter <rdieter at fedoraproject.org> - 1.1.15-4
+- rebuild for pkgconfig deps
+
 * Tue Oct 28 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> - 1.1.15-3
 - rebuild for new libcaca
 


--- xine-lib-1.1.15-ansi.patch DELETED ---



From sharkcz at fedoraproject.org  Wed Jan  7 20:25:29 2009
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Wed,  7 Jan 2009 20:25:29 +0000 (UTC)
Subject: rpms/tryton/F-10 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 tryton.spec,
	1.1, 1.2
Message-ID: <20090107202529.1D88470100@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/tryton/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7473

Modified Files:
	.cvsignore sources tryton.spec 
Log Message:
* Wed Jan  7 2009 Dan Hor??k <dan[at]danny.cz> 1.0.2-1
- update to upstream version 1.0.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/tryton/F-10/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	31 Dec 2008 18:30:01 -0000	1.2
+++ .cvsignore	7 Jan 2009 20:24:58 -0000	1.3
@@ -1 +1 @@
-tryton-1.0.1.tar.gz
+tryton-1.0.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tryton/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	31 Dec 2008 18:30:01 -0000	1.2
+++ sources	7 Jan 2009 20:24:58 -0000	1.3
@@ -1 +1 @@
-35c76be93c2a8a0fd5c1b51eae88280c  tryton-1.0.1.tar.gz
+4391876eb92b972d0594a48569c38cae  tryton-1.0.2.tar.gz


Index: tryton.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tryton/F-10/tryton.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tryton.spec	31 Dec 2008 18:30:01 -0000	1.1
+++ tryton.spec	7 Jan 2009 20:24:58 -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:           tryton
-Version:        1.0.1
-Release:        2%{?dist}
+Version:        1.0.2
+Release:        1%{?dist}
 Summary:        Client for the Tryton application framework
 
 Group:          Applications/Productivity
@@ -56,6 +56,9 @@
 
 
 %changelog
+* Wed Jan  7 2009 Dan Hor??k <dan[at]danny.cz> 1.0.2-1
+- update to upstream version 1.0.2
+
 * Mon Dec 29 2008 Dan Hor??k <dan[at]danny.cz> 1.0.1-2
 - set vendor for the desktop file
 - improve Description



From sharkcz at fedoraproject.org  Wed Jan  7 20:27:39 2009
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Wed,  7 Jan 2009 20:27:39 +0000 (UTC)
Subject: rpms/tryton/F-9 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 tryton.spec, 
	1.1, 1.2
Message-ID: <20090107202739.A80CB70100@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/tryton/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7727

Modified Files:
	.cvsignore sources tryton.spec 
Log Message:
* Wed Jan  7 2009 Dan Hor??k <dan[at]danny.cz> 1.0.2-1
- update to upstream version 1.0.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/tryton/F-9/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	31 Dec 2008 18:41:34 -0000	1.2
+++ .cvsignore	7 Jan 2009 20:27:09 -0000	1.3
@@ -1 +1 @@
-tryton-1.0.1.tar.gz
+tryton-1.0.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tryton/F-9/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	31 Dec 2008 18:41:34 -0000	1.2
+++ sources	7 Jan 2009 20:27:09 -0000	1.3
@@ -1 +1 @@
-35c76be93c2a8a0fd5c1b51eae88280c  tryton-1.0.1.tar.gz
+4391876eb92b972d0594a48569c38cae  tryton-1.0.2.tar.gz


Index: tryton.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tryton/F-9/tryton.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tryton.spec	31 Dec 2008 18:41:34 -0000	1.1
+++ tryton.spec	7 Jan 2009 20:27:09 -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:           tryton
-Version:        1.0.1
-Release:        2%{?dist}
+Version:        1.0.2
+Release:        1%{?dist}
 Summary:        Client for the Tryton application framework
 
 Group:          Applications/Productivity
@@ -56,6 +56,9 @@
 
 
 %changelog
+* Wed Jan  7 2009 Dan Hor??k <dan[at]danny.cz> 1.0.2-1
+- update to upstream version 1.0.2
+
 * Mon Dec 29 2008 Dan Hor??k <dan[at]danny.cz> 1.0.1-2
 - set vendor for the desktop file
 - improve Description



From than at fedoraproject.org  Wed Jan  7 20:29:27 2009
From: than at fedoraproject.org (Than Ngo)
Date: Wed,  7 Jan 2009 20:29:27 +0000 (UTC)
Subject: rpms/kdesdk/devel .cvsignore, 1.52, 1.53 kdesdk.spec, 1.128,
	1.129 sources, 1.54, 1.55 kdesdk-4.1.80-quit.patch, 1.1, NONE
Message-ID: <20090107202927.98F1170100@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdesdk/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8043

Modified Files:
	.cvsignore kdesdk.spec sources 
Removed Files:
	kdesdk-4.1.80-quit.patch 
Log Message:
4.2rc1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdesdk/devel/.cvsignore,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- .cvsignore	12 Dec 2008 11:51:20 -0000	1.52
+++ .cvsignore	7 Jan 2009 20:28:57 -0000	1.53
@@ -1,3 +1,4 @@
 kdesdk-4.1.2.tar.bz2
 kdesdk-4.1.80.tar.bz2
 kdesdk-4.1.85.tar.bz2
+kdesdk-4.1.96.tar.bz2


Index: kdesdk.spec
===================================================================
RCS file: /cvs/extras/rpms/kdesdk/devel/kdesdk.spec,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -r1.128 -r1.129
--- kdesdk.spec	12 Dec 2008 22:09:21 -0000	1.128
+++ kdesdk.spec	7 Jan 2009 20:28:57 -0000	1.129
@@ -1,5 +1,5 @@
 Name:           kdesdk
-Version:        4.1.85
+Version:        4.1.96
 Release:        1%{?dist}
 Summary:        The KDE Software Development Kit (SDK)
 
@@ -8,7 +8,6 @@
 License:        GPLv2
 URL:            http://www.kde.org/
 Source0:        ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/%{name}-%{version}.tar.bz2
-Patch0:         kdesdk-4.1.80-quit.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  kdepimlibs-devel >= %{version}
@@ -80,7 +79,6 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .quit
 
 
 %build
@@ -212,6 +210,9 @@
 
 
 %changelog
+* Wed Jan 07 2009 Than Ngo <than at redhat.com> - 4.1.96-1
+- 4.2rc1
+
 * Fri Dec 12 2008 Than Ngo <than at redhat.com> 4.1.85-1
 - 4.2beta2
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdesdk/devel/sources,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- sources	12 Dec 2008 11:51:20 -0000	1.54
+++ sources	7 Jan 2009 20:28:57 -0000	1.55
@@ -1 +1 @@
-9fff92efdd5ca6f8b60f293a6830fe70  kdesdk-4.1.85.tar.bz2
+19ed9d019b0dd81dcb442bffb0561457  kdesdk-4.1.96.tar.bz2


--- kdesdk-4.1.80-quit.patch DELETED ---



From sharkcz at fedoraproject.org  Wed Jan  7 20:30:03 2009
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Wed,  7 Jan 2009 20:30:03 +0000 (UTC)
Subject: rpms/tryton/EL-5 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 tryton.spec,
	1.1, 1.2
Message-ID: <20090107203003.4415070100@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/tryton/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8128

Modified Files:
	.cvsignore sources tryton.spec 
Log Message:
* Wed Jan  7 2009 Dan Hor??k <dan[at]danny.cz> 1.0.2-1
- update to upstream version 1.0.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/tryton/EL-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	31 Dec 2008 18:44:22 -0000	1.2
+++ .cvsignore	7 Jan 2009 20:29:32 -0000	1.3
@@ -1 +1 @@
-tryton-1.0.1.tar.gz
+tryton-1.0.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tryton/EL-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	31 Dec 2008 18:44:22 -0000	1.2
+++ sources	7 Jan 2009 20:29:33 -0000	1.3
@@ -1 +1 @@
-35c76be93c2a8a0fd5c1b51eae88280c  tryton-1.0.1.tar.gz
+4391876eb92b972d0594a48569c38cae  tryton-1.0.2.tar.gz


Index: tryton.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tryton/EL-5/tryton.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tryton.spec	31 Dec 2008 18:44:22 -0000	1.1
+++ tryton.spec	7 Jan 2009 20:29:33 -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:           tryton
-Version:        1.0.1
-Release:        2%{?dist}
+Version:        1.0.2
+Release:        1%{?dist}
 Summary:        Client for the Tryton application framework
 
 Group:          Applications/Productivity
@@ -56,6 +56,9 @@
 
 
 %changelog
+* Wed Jan  7 2009 Dan Hor??k <dan[at]danny.cz> 1.0.2-1
+- update to upstream version 1.0.2
+
 * Mon Dec 29 2008 Dan Hor??k <dan[at]danny.cz> 1.0.1-2
 - set vendor for the desktop file
 - improve Description



From slankes at fedoraproject.org  Wed Jan  7 20:32:35 2009
From: slankes at fedoraproject.org (Sven Lankes)
Date: Wed,  7 Jan 2009 20:32:35 +0000 (UTC)
Subject: comps comps-f11.xml.in,1.50,1.51
Message-ID: <20090107203235.A05F470100@cvs1.fedora.phx.redhat.com>

Author: slankes

Update of /cvs/pkgs/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8442

Modified Files:
	comps-f11.xml.in 
Log Message:
add dustin-dustismo-fonts


Index: comps-f11.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f11.xml.in,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- comps-f11.xml.in	6 Jan 2009 07:53:44 -0000	1.50
+++ comps-f11.xml.in	7 Jan 2009 20:32:05 -0000	1.51
@@ -1500,6 +1500,7 @@
       <packagereq type="optional">dejavu-fonts-lgc-sans-mono</packagereq>
       <packagereq type="optional">dejavu-fonts-lgc-serif</packagereq>
       <packagereq type="optional">doulos-fonts</packagereq>
+      <packagereq type="optional">dustin-dustismo-fonts</packagereq>
       <packagereq type="optional">ecolier-court-fonts</packagereq>
       <packagereq type="optional">edrip-fonts</packagereq>
       <packagereq type="optional">fonts-truetype-apl</packagereq>



From rdieter at fedoraproject.org  Wed Jan  7 20:33:28 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed,  7 Jan 2009 20:33:28 +0000 (UTC)
Subject: rpms/xine-lib/F-9 .cvsignore, 1.17, 1.18 sources, 1.18,
	1.19 xine-lib-cleanup-sources.sh, 1.7, 1.8 xine-lib.spec, 1.44,
	1.45 xine-lib-1.1.15-ansi.patch, 1.1, NONE
Message-ID: <20090107203328.7774E70141@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/xine-lib/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8656

Modified Files:
	.cvsignore sources xine-lib-cleanup-sources.sh xine-lib.spec 
Removed Files:
	xine-lib-1.1.15-ansi.patch 
Log Message:
* Wed Jan 07 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.1.16-1
- xine-lib-1.1.16, plugin ABI 1.25
- --with-external-libdvdnav, include mpeg demuxers (#213597)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xine-lib/F-9/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- .cvsignore	22 Aug 2008 17:07:03 -0000	1.17
+++ .cvsignore	7 Jan 2009 20:32:58 -0000	1.18
@@ -1,2 +1,2 @@
-xine-lib-1.1.15-autotools.patch.bz2
-xine-lib-1.1.15-pruned.tar.bz2
+xine-lib-1.1.16-autotools.patch.bz2
+xine-lib-1.1.16-pruned.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xine-lib/F-9/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources	22 Aug 2008 17:07:03 -0000	1.18
+++ sources	7 Jan 2009 20:32:58 -0000	1.19
@@ -1,2 +1,2 @@
-ffd74ec893a5f1167c69987a68f436fd  xine-lib-1.1.15-autotools.patch.bz2
-acdbdc024382afac111eb076304448ed  xine-lib-1.1.15-pruned.tar.bz2
+fe8148f2a0ec7b2e75ad509e8086e33f  xine-lib-1.1.16-autotools.patch.bz2
+512f31d8414ef4654ca366c0dce37301  xine-lib-1.1.16-pruned.tar.bz2


Index: xine-lib-cleanup-sources.sh
===================================================================
RCS file: /cvs/pkgs/rpms/xine-lib/F-9/xine-lib-cleanup-sources.sh,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- xine-lib-cleanup-sources.sh	19 Mar 2008 19:51:59 -0000	1.7
+++ xine-lib-cleanup-sources.sh	7 Jan 2009 20:32:58 -0000	1.8
@@ -56,11 +56,12 @@
   sed -i -e "/xineplug_inp_$p/d" src/input/Makefile.am
 done
 # Demuxers
-for p in mpeg mpeg_block mpeg_ts mpeg_elem mpeg_pes yuv4mpeg2; do
-  echo "removing $p demuxer..."
-  [ -f src/demuxers/demux_$p.c ] && rm -f src/demuxers/demux_$p.c
-  sed -i -e "/xineplug_dmx_$p/d" src/demuxers/Makefile.am
-done
+# These are ok now ( http://bugzilla.redhat.com/213597 )
+#for p in mpeg mpeg_block mpeg_ts mpeg_elem mpeg_pes yuv4mpeg2; do
+#  echo "removing $p demuxer..."
+#  [ -f src/demuxers/demux_$p.c ] && rm -f src/demuxers/demux_$p.c
+#  sed -i -e "/xineplug_dmx_$p/d" src/demuxers/Makefile.am
+#done
 # Postprocessors
 echo "removing planar and deinterlace postprocessors..."
 sed -i -e 's/deinterlace //g' src/post/Makefile.am # see comments in speedy.c


Index: xine-lib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xine-lib/F-9/xine-lib.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- xine-lib.spec	22 Aug 2008 17:34:12 -0000	1.44
+++ xine-lib.spec	7 Jan 2009 20:32:58 -0000	1.45
@@ -2,10 +2,9 @@
 # - 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
-# - external dvdnav - not compatible as of 1.1.11 and 4.1.1
 # - deprecate ESD support?
 
-%define         abiver      1.24
+%define         abiver      1.25
 %define         codecdir    %{_libdir}/codecs
 
 %ifarch %{ix86}
@@ -32,7 +31,7 @@
 
 Summary:        Xine library
 Name:           xine-lib
-Version:        1.1.15
+Version:        1.1.16
 Release:        1%{?dist}
 License:        GPLv2+
 Group:          System Environment/Libraries
@@ -50,8 +49,6 @@
 Patch1:         %{name}-1.1.4-optflags.patch
 Patch6:         %{name}-1.1.1-deepbind-939.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
 
 Provides:       xine-lib(plugin-abi) = %{abiver}
 # X11
@@ -111,6 +108,7 @@
 %else
 BuildRequires:  samba-common
 %endif
+BuildRequires:  libdvdnav-devel
 
 %description
 This package contains the Xine library. Xine is a free multimedia player.
@@ -191,15 +189,14 @@
 # Patch6 needed at least when compiling with external ffmpeg, #939.
 %patch6 -p1 -b .deepbind
 
-%patch100 -p1 -b .ansi
-
-# Avoid standard rpaths on lib64 archs:
-sed -i -e 's|"/lib /usr/lib\b|"/%{_lib} %{_libdir}|' configure
+# Avoid standard rpaths on lib64 archs: (autotools patch should handle this, no? -- Rex )
+#sed -i -e 's|"/lib /usr/lib\b|"/%{_lib} %{_libdir}|' configure
 
 
 %build
 export FFMPEG_CFLAGS=" " FFMPEG_LIBS=" "
 export FFMPEG_POSTPROC_CFLAGS=" " FFMPEG_POSTPROC_LIBS=" "
+export FFMPEG_UTIL_CFLAGS=" " FFMPEG_UTIL_LIBS=" "
 export SDL_CFLAGS="$(sdl-config --cflags)" SDL_LIBS="$(sdl-config --libs)"
 # Keep list of options in mostly the same order as ./configure --help.
 %configure \
@@ -223,6 +220,7 @@
     --with-external-ffmpeg \
     --with-xv-path=%{_libdir} \
     --with-libflac \
+    --with-external-libdvdnav \
     --with-external-libmpcdec \
 %if 0%{?_without_imagemagick:1}
     --without-imagemagick \
@@ -330,6 +328,11 @@
 %{_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_mpeg.so
+%{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_mpeg_block.so
+%{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_mpeg_elem.so
+%{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_mpeg_pes.so
+%{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_mpeg_ts.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
@@ -339,6 +342,7 @@
 %{_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_dmx_yuv4mpeg2.so
 %{_libdir}/xine/plugins/%{abiver}/xineplug_flac.so
 %{_libdir}/xine/plugins/%{abiver}/xineplug_inp_cdda.so
 %{_libdir}/xine/plugins/%{abiver}/xineplug_inp_dvb.so
@@ -418,6 +422,19 @@
 
 
 %changelog
+* Wed Jan 07 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.1.16-1
+- xine-lib-1.1.16, plugin ABI 1.25
+- --with-external-libdvdnav, include mpeg demuxers (#213597)
+
+* Fri Dec 12 2008 Rex Dieter <rdieter at fedoraproject.org> - 1.1.15-4
+- rebuild for pkgconfig deps
+
+* Tue Oct 28 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> - 1.1.15-3
+- rebuild for new libcaca
+
+* Thu Oct 23 2008 Rex Dieter <rdieter at fedoraproject.org> - 1.1.15-2
+- respin
+
 * 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 DELETED ---



From than at fedoraproject.org  Wed Jan  7 20:34:05 2009
From: than at fedoraproject.org (Than Ngo)
Date: Wed,  7 Jan 2009 20:34:05 +0000 (UTC)
Subject: rpms/kdetoys/devel .cvsignore, 1.29, 1.30 kdetoys.spec, 1.40,
	1.41 sources, 1.27, 1.28
Message-ID: <20090107203405.E599170100@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdetoys/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8811

Modified Files:
	.cvsignore kdetoys.spec sources 
Log Message:
4.2rc1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdetoys/devel/.cvsignore,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- .cvsignore	12 Dec 2008 11:56:11 -0000	1.29
+++ .cvsignore	7 Jan 2009 20:33:35 -0000	1.30
@@ -1,3 +1,4 @@
 kdetoys-4.1.2.tar.bz2
 kdetoys-4.1.80.tar.bz2
 kdetoys-4.1.85.tar.bz2
+kdetoys-4.1.96.tar.bz2


Index: kdetoys.spec
===================================================================
RCS file: /cvs/extras/rpms/kdetoys/devel/kdetoys.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- kdetoys.spec	12 Dec 2008 11:56:11 -0000	1.40
+++ kdetoys.spec	7 Jan 2009 20:33:35 -0000	1.41
@@ -1,7 +1,7 @@
 Name:           kdetoys
 Summary:        K Desktop Environment - Toys and Amusements
 Epoch:          7
-Version:        4.1.85
+Version:        4.1.96
 Release:        1%{?dist}
 
 License:        GPLv2
@@ -75,6 +75,9 @@
 
 
 %changelog
+* Wed Jan 07 2009 Than Ngo <than at redhat.com> - 4.1.96-1
+- 4.2rc1
+
 * Fri Dec 12 2008 Than Ngo <than at redhat.com> 4.1.85-1
 - 4.2beta2
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdetoys/devel/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- sources	12 Dec 2008 11:56:11 -0000	1.27
+++ sources	7 Jan 2009 20:33:35 -0000	1.28
@@ -1 +1 @@
-63380dbff8492b5183230bb3a2634d80  kdetoys-4.1.85.tar.bz2
+9a822c9986bc29eab0d92a0598b12dd5  kdetoys-4.1.96.tar.bz2



From rdieter at fedoraproject.org  Wed Jan  7 20:38:13 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed,  7 Jan 2009 20:38:13 +0000 (UTC)
Subject: rpms/xine-lib/F-8 .cvsignore, 1.17, 1.18 sources, 1.17,
	1.18 xine-lib-cleanup-sources.sh, 1.7, 1.8 xine-lib.spec, 1.39,
	1.40 xine-lib-1.1.15-ansi.patch, 1.1, NONE
Message-ID: <20090107203813.A49AF70100@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/xine-lib/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9838

Modified Files:
	.cvsignore sources xine-lib-cleanup-sources.sh xine-lib.spec 
Removed Files:
	xine-lib-1.1.15-ansi.patch 
Log Message:
* Wed Jan 07 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.1.16-1
- xine-lib-1.1.16, plugin ABI 1.25
- --with-external-libdvdnav, include mpeg demuxers (#213597)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xine-lib/F-8/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- .cvsignore	22 Aug 2008 18:34:49 -0000	1.17
+++ .cvsignore	7 Jan 2009 20:37:43 -0000	1.18
@@ -1,2 +1,2 @@
-xine-lib-1.1.15-autotools.patch.bz2
-xine-lib-1.1.15-pruned.tar.bz2
+xine-lib-1.1.16-autotools.patch.bz2
+xine-lib-1.1.16-pruned.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xine-lib/F-8/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources	22 Aug 2008 18:34:49 -0000	1.17
+++ sources	7 Jan 2009 20:37:43 -0000	1.18
@@ -1,2 +1,2 @@
-ffd74ec893a5f1167c69987a68f436fd  xine-lib-1.1.15-autotools.patch.bz2
-acdbdc024382afac111eb076304448ed  xine-lib-1.1.15-pruned.tar.bz2
+fe8148f2a0ec7b2e75ad509e8086e33f  xine-lib-1.1.16-autotools.patch.bz2
+512f31d8414ef4654ca366c0dce37301  xine-lib-1.1.16-pruned.tar.bz2


Index: xine-lib-cleanup-sources.sh
===================================================================
RCS file: /cvs/pkgs/rpms/xine-lib/F-8/xine-lib-cleanup-sources.sh,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- xine-lib-cleanup-sources.sh	19 Mar 2008 19:51:43 -0000	1.7
+++ xine-lib-cleanup-sources.sh	7 Jan 2009 20:37:43 -0000	1.8
@@ -56,11 +56,12 @@
   sed -i -e "/xineplug_inp_$p/d" src/input/Makefile.am
 done
 # Demuxers
-for p in mpeg mpeg_block mpeg_ts mpeg_elem mpeg_pes yuv4mpeg2; do
-  echo "removing $p demuxer..."
-  [ -f src/demuxers/demux_$p.c ] && rm -f src/demuxers/demux_$p.c
-  sed -i -e "/xineplug_dmx_$p/d" src/demuxers/Makefile.am
-done
+# These are ok now ( http://bugzilla.redhat.com/213597 )
+#for p in mpeg mpeg_block mpeg_ts mpeg_elem mpeg_pes yuv4mpeg2; do
+#  echo "removing $p demuxer..."
+#  [ -f src/demuxers/demux_$p.c ] && rm -f src/demuxers/demux_$p.c
+#  sed -i -e "/xineplug_dmx_$p/d" src/demuxers/Makefile.am
+#done
 # Postprocessors
 echo "removing planar and deinterlace postprocessors..."
 sed -i -e 's/deinterlace //g' src/post/Makefile.am # see comments in speedy.c


Index: xine-lib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xine-lib/F-8/xine-lib.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- xine-lib.spec	22 Aug 2008 18:34:49 -0000	1.39
+++ xine-lib.spec	7 Jan 2009 20:37:43 -0000	1.40
@@ -2,10 +2,9 @@
 # - 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
-# - external dvdnav - not compatible as of 1.1.11 and 4.1.1
 # - deprecate ESD support?
 
-%define         abiver      1.24
+%define         abiver      1.25
 %define         codecdir    %{_libdir}/codecs
 
 %ifarch %{ix86}
@@ -32,7 +31,7 @@
 
 Summary:        Xine library
 Name:           xine-lib
-Version:        1.1.15
+Version:        1.1.16
 Release:        1%{?dist}
 License:        GPLv2+
 Group:          System Environment/Libraries
@@ -41,17 +40,15 @@
 # the script in SOURCE1. It prunes potentially patented code
 #Source0:        http://downloads.sourceforge.net/xine/xine-lib-%{version}.tar.bz2
 Source0:        %{name}-%{version}-pruned.tar.bz2
-Source1:        xine-lib-cleanup-sources.sh
-Source2:        xine-lib-mk-autotools-patch.sh
+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:         xine-lib-1.1.4-optflags.patch
-Patch6:         xine-lib-1.1.1-deepbind-939.patch
+Patch1:         %{name}-1.1.4-optflags.patch
+Patch6:         %{name}-1.1.1-deepbind-939.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
 
 Provides:       xine-lib(plugin-abi) = %{abiver}
 # X11
@@ -111,6 +108,7 @@
 %else
 BuildRequires:  samba-common
 %endif
+BuildRequires:  libdvdnav-devel
 
 %description
 This package contains the Xine library. Xine is a free multimedia player.
@@ -191,15 +189,14 @@
 # Patch6 needed at least when compiling with external ffmpeg, #939.
 %patch6 -p1 -b .deepbind
 
-%patch100 -p1 -b .ansi
-
-# Avoid standard rpaths on lib64 archs:
-sed -i -e 's|"/lib /usr/lib\b|"/%{_lib} %{_libdir}|' configure
+# Avoid standard rpaths on lib64 archs: (autotools patch should handle this, no? -- Rex )
+#sed -i -e 's|"/lib /usr/lib\b|"/%{_lib} %{_libdir}|' configure
 
 
 %build
 export FFMPEG_CFLAGS=" " FFMPEG_LIBS=" "
 export FFMPEG_POSTPROC_CFLAGS=" " FFMPEG_POSTPROC_LIBS=" "
+export FFMPEG_UTIL_CFLAGS=" " FFMPEG_UTIL_LIBS=" "
 export SDL_CFLAGS="$(sdl-config --cflags)" SDL_LIBS="$(sdl-config --libs)"
 # Keep list of options in mostly the same order as ./configure --help.
 %configure \
@@ -223,6 +220,7 @@
     --with-external-ffmpeg \
     --with-xv-path=%{_libdir} \
     --with-libflac \
+    --with-external-libdvdnav \
     --with-external-libmpcdec \
 %if 0%{?_without_imagemagick:1}
     --without-imagemagick \
@@ -330,6 +328,11 @@
 %{_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_mpeg.so
+%{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_mpeg_block.so
+%{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_mpeg_elem.so
+%{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_mpeg_pes.so
+%{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_mpeg_ts.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
@@ -339,6 +342,7 @@
 %{_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_dmx_yuv4mpeg2.so
 %{_libdir}/xine/plugins/%{abiver}/xineplug_flac.so
 %{_libdir}/xine/plugins/%{abiver}/xineplug_inp_cdda.so
 %{_libdir}/xine/plugins/%{abiver}/xineplug_inp_dvb.so
@@ -418,6 +422,19 @@
 
 
 %changelog
+* Wed Jan 07 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.1.16-1
+- xine-lib-1.1.16, plugin ABI 1.25
+- --with-external-libdvdnav, include mpeg demuxers (#213597)
+
+* Fri Dec 12 2008 Rex Dieter <rdieter at fedoraproject.org> - 1.1.15-4
+- rebuild for pkgconfig deps
+
+* Tue Oct 28 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> - 1.1.15-3
+- rebuild for new libcaca
+
+* Thu Oct 23 2008 Rex Dieter <rdieter at fedoraproject.org> - 1.1.15-2
+- respin
+
 * 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 DELETED ---



From than at fedoraproject.org  Wed Jan  7 20:39:27 2009
From: than at fedoraproject.org (Than Ngo)
Date: Wed,  7 Jan 2009 20:39:27 +0000 (UTC)
Subject: rpms/kdeutils/devel .cvsignore, 1.56, 1.57 kdeutils.spec, 1.153,
	1.154 sources, 1.58, 1.59
Message-ID: <20090107203927.EA24370100@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdeutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10005

Modified Files:
	.cvsignore kdeutils.spec sources 
Log Message:
4.2rc1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdeutils/devel/.cvsignore,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- .cvsignore	12 Dec 2008 12:05:29 -0000	1.56
+++ .cvsignore	7 Jan 2009 20:38:57 -0000	1.57
@@ -1,3 +1,4 @@
 kdeutils-4.1.2.tar.bz2
 kdeutils-4.1.80.tar.bz2
 kdeutils-4.1.85.tar.bz2
+kdeutils-4.1.96.tar.bz2


Index: kdeutils.spec
===================================================================
RCS file: /cvs/extras/rpms/kdeutils/devel/kdeutils.spec,v
retrieving revision 1.153
retrieving revision 1.154
diff -u -r1.153 -r1.154
--- kdeutils.spec	12 Dec 2008 12:05:29 -0000	1.153
+++ kdeutils.spec	7 Jan 2009 20:38:57 -0000	1.154
@@ -10,7 +10,7 @@
 
 Name:           kdeutils
 Epoch:          6
-Version:        4.1.85
+Version:        4.1.96
 Release:        1%{?dist}
 Summary:        K Desktop Environment - Utilities
 
@@ -196,6 +196,9 @@
 
 
 %changelog
+* Wed Jan 07 2009 Than Ngo <than at redhat.com> - 4.1.96-1
+- 4.2rc1
+
 * Fri Dec 12 2008 Than Ngo <than at redhat.com> 4.1.85-1
 - 4.2beta2
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdeutils/devel/sources,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- sources	12 Dec 2008 12:05:29 -0000	1.58
+++ sources	7 Jan 2009 20:38:57 -0000	1.59
@@ -1 +1 @@
-c5767898344b613a98f66664c1507d77  kdeutils-4.1.85.tar.bz2
+3e154bdb5d84501b372e2305150c4b47  kdeutils-4.1.96.tar.bz2



From walters at fedoraproject.org  Wed Jan  7 20:40:45 2009
From: walters at fedoraproject.org (Colin Walters)
Date: Wed,  7 Jan 2009 20:40:45 +0000 (UTC)
Subject: rpms/dbus/devel .cvsignore, 1.38, 1.39 dbus.spec, 1.161,
	1.162 sources, 1.39, 1.40
Message-ID: <20090107204045.E9D7670100@cvs1.fedora.phx.redhat.com>

Author: walters

Update of /cvs/pkgs/rpms/dbus/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10287

Modified Files:
	.cvsignore dbus.spec sources 
Log Message:
* Tue Jan 06 2009 Colin Walters <walters at redhat.com> - 1:1.2.4.4.permissive-1
- New upstream



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/dbus/devel/.cvsignore,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- .cvsignore	19 Dec 2008 20:41:25 -0000	1.38
+++ .cvsignore	7 Jan 2009 20:40:15 -0000	1.39
@@ -1 +1 @@
-dbus-1.2.4.2permissive.tar.gz
+dbus-1.2.4.4permissive.tar.gz


Index: dbus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dbus/devel/dbus.spec,v
retrieving revision 1.161
retrieving revision 1.162
diff -u -r1.161 -r1.162
--- dbus.spec	19 Dec 2008 20:41:26 -0000	1.161
+++ dbus.spec	7 Jan 2009 20:40:15 -0000	1.162
@@ -8,7 +8,7 @@
 Summary: D-BUS message bus
 Name: dbus
 Epoch: 1
-Version: 1.2.4.2permissive
+Version: 1.2.4.4permissive
 Release: 1%{?dist}
 URL: http://www.freedesktop.org/software/dbus/
 Source0: http://dbus.freedesktop.org/releases/dbus/%{name}-%{version}.tar.gz
@@ -226,6 +226,9 @@
 %{_includedir}/*
 
 %changelog
+* Tue Jan 06 2009 Colin Walters <walters at redhat.com> - 1:1.2.4.4.permissive-1
+- New upstream
+
 * Thu Dec 18 2008 Colin Walters <walters at redhat.com> - 1:1.2.4.2.permissive-1
 - New upstream
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dbus/devel/sources,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- sources	19 Dec 2008 20:41:26 -0000	1.39
+++ sources	7 Jan 2009 20:40:15 -0000	1.40
@@ -1 +1 @@
-92418f1d2932c2f4980b815e00c993cc  dbus-1.2.4.2permissive.tar.gz
+ec09ba2632edbc79133f2a5efaf0249b  dbus-1.2.4.4permissive.tar.gz



From walters at fedoraproject.org  Wed Jan  7 20:44:16 2009
From: walters at fedoraproject.org (Colin Walters)
Date: Wed,  7 Jan 2009 20:44:16 +0000 (UTC)
Subject: rpms/dbus-glib/devel
	0001-Bug-19441-Don-t-send-reply-when-none-is-requested.patch,
	NONE, 1.1 dbus-glib.spec, 1.34, 1.35
Message-ID: <20090107204416.5006F70100@cvs1.fedora.phx.redhat.com>

Author: walters

Update of /cvs/pkgs/rpms/dbus-glib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10768

Modified Files:
	dbus-glib.spec 
Added Files:
	0001-Bug-19441-Don-t-send-reply-when-none-is-requested.patch 
Log Message:
* Wed Jan 07 2009 Colin Walters <walters at verbum.org> - 0.78-2
- Add patch to avoid sending reply to noreply messages; this avoids
  some spurious dbus denial logs during system startup from NM


0001-Bug-19441-Don-t-send-reply-when-none-is-requested.patch:

--- NEW FILE 0001-Bug-19441-Don-t-send-reply-when-none-is-requested.patch ---
>From a9eaac78c30a9a2728384b88eb6667504b758e24 Mon Sep 17 00:00:00 2001
From: Colin Walters <walters at verbum.org>
Date: Wed, 7 Jan 2009 10:02:12 -0500
Subject: [PATCH] Bug 19441 - Don't send reply when none is requested

It's normally harmless, but unrequested replies now get noisly
denied by the system bus.
---
 dbus/dbus-gobject.c |   42 ++++++++++++++++++++++++------------------
 1 files changed, 24 insertions(+), 18 deletions(-)

diff --git a/dbus/dbus-gobject.c b/dbus/dbus-gobject.c
index 572fafd..107dd10 100644
--- a/dbus/dbus-gobject.c
+++ b/dbus/dbus-gobject.c
@@ -1117,7 +1117,7 @@ invoke_object_method (GObject         *object,
 		      DBusConnection  *connection,
 		      DBusMessage     *message)
 {
-  gboolean had_error, call_only;
+  gboolean had_error, use_thread, send_reply;
   GError *gerror;
   GValueArray *value_array;
   GValue return_value = {0,};
@@ -1128,7 +1128,7 @@ invoke_object_method (GObject         *object,
   int out_param_count;
   int out_param_pos, out_param_gvalue_pos;
   DBusHandlerResult result;
-  DBusMessage *reply;
+  DBusMessage *reply = NULL;
   gboolean have_retval;
   gboolean retval_signals_error;
   gboolean retval_is_synthetic;
@@ -1140,10 +1140,8 @@ invoke_object_method (GObject         *object,
   /* Determine whether or not this method should be invoked in a new
      thread
    */
-  if (strcmp (string_table_lookup (get_method_data (object_info, method), 2), "A") == 0)
-    call_only = TRUE;
-  else
-    call_only = FALSE;
+  use_thread = strcmp (string_table_lookup (get_method_data (object_info, method), 2), "A") == 0;
+  send_reply = !dbus_message_get_no_reply (message); 
 
   have_retval = FALSE;
   retval_signals_error = FALSE;
@@ -1194,7 +1192,7 @@ invoke_object_method (GObject         *object,
   g_value_init (g_value_array_get_nth (value_array, 0), G_TYPE_OBJECT);
   g_value_set_object (g_value_array_get_nth (value_array, 0), object);
   
-  if (call_only)
+  if (use_thread)
     {
       GValue context_value = {0,};
       DBusGMethodInvocation *context;
@@ -1340,7 +1338,7 @@ invoke_object_method (GObject         *object,
 		      value_array->n_values,
 		      value_array->values,
 		      NULL, method->function);
-  if (call_only)
+  if (use_thread)
     {
       result = DBUS_HANDLER_RESULT_HANDLED;
       goto done;
@@ -1354,17 +1352,25 @@ invoke_object_method (GObject         *object,
     {
       DBusMessageIter iter;
 
-      reply = dbus_message_new_method_return (message);
-      if (reply == NULL)
-	goto nomem;
+      /* Careful here - there are two major cases in this section of the code.
+       * If send_reply is TRUE, we're constructing a dbus message and freeing
+       * the return values.  If it's FALSE, then we just need to free the
+       * values.
+       */
+      if (send_reply)
+        {
+          reply = dbus_message_new_method_return (message);
+          if (reply == NULL)
+            goto nomem;
 
-      /* Append output arguments to reply */
-      dbus_message_iter_init_append (reply, &iter);
+          /* Append output arguments to reply */
+          dbus_message_iter_init_append (reply, &iter);
+        }
 
       /* First, append the return value, unless it's synthetic */
       if (have_retval && !retval_is_synthetic)
-	{
-	  if (!_dbus_gvalue_marshal (&iter, &return_value))
+	{ 
+	  if (send_reply && !_dbus_gvalue_marshal (&iter, &return_value))
 	    goto nomem;
 	  if (!retval_is_constant)
 	    g_value_unset (&return_value);
@@ -1416,7 +1422,7 @@ invoke_object_method (GObject         *object,
 	      out_param_gvalue_pos++;
 	    }
 	      
-	  if (!_dbus_gvalue_marshal (&iter, &gvalue))
+	  if (send_reply && !_dbus_gvalue_marshal (&iter, &gvalue))
 	    goto nomem;
 	  /* Here we actually free the allocated value; we
 	   * took ownership of it with _dbus_gvalue_take, unless
@@ -1426,7 +1432,7 @@ invoke_object_method (GObject         *object,
 	    g_value_unset (&gvalue);
 	}
     }
-  else
+  else if (send_reply)
     reply = gerror_to_dbus_error_message (object_info, message, gerror);
 
   if (reply)
@@ -1438,7 +1444,7 @@ invoke_object_method (GObject         *object,
   result = DBUS_HANDLER_RESULT_HANDLED;
  done:
   g_free (in_signature);
-  if (!call_only)
+  if (!use_thread)
     {
       g_array_free (out_param_values, TRUE);
       g_value_array_free (out_param_gvalues);
-- 
1.6.0.6



Index: dbus-glib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dbus-glib/devel/dbus-glib.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- dbus-glib.spec	4 Dec 2008 21:26:22 -0000	1.34
+++ dbus-glib.spec	7 Jan 2009 20:43:45 -0000	1.35
@@ -8,7 +8,7 @@
 Summary: GLib bindings for D-Bus
 Name: dbus-glib
 Version: 0.78
-Release: 1%{?dist}
+Release: 2%{?dist}
 URL: http://www.freedesktop.org/software/dbus/
 Source0: http://dbus.freedesktop.org/releases/dbus-glib/%{name}-%{version}.tar.gz
 Source1: dbus-bus-introspect.xml
@@ -27,6 +27,9 @@
 # this patch requires autoreconf
 BuildRequires: autoconf automake libtool gettext-devel gtk-doc
 
+#http://bugs.freedesktop.org/show_bug.cgi?id=19441
+Patch0: 0001-Bug-19441-Don-t-send-reply-when-none-is-requested.patch
+
 %description
 
 D-Bus add-on library to integrate the standard D-Bus library with
@@ -59,6 +62,7 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .noreply
 
 %build
 libtoolize --force --copy
@@ -119,6 +123,10 @@
 %endif
 
 %changelog
+* Wed Jan 07 2009 Colin Walters <walters at verbum.org> - 0.78-2
+- Add patch to avoid sending reply to noreply messages; this avoids
+  some spurious dbus denial logs during system startup from NM
+
 * Thu Dec 04 2008 Colin Walters <walters at verbum.org> - 0.78-1
 - New upstream release, drop upstreamed patches
 



From rstrode at fedoraproject.org  Wed Jan  7 20:45:31 2009
From: rstrode at fedoraproject.org (Ray Strode)
Date: Wed,  7 Jan 2009 20:45:31 +0000 (UTC)
Subject: rpms/nautilus/devel nautilus-2.25.2-fix-crasher.patch, NONE,
	1.1 eel-2.24.0-fade.patch, 1.1, 1.2 nautilus.spec, 1.249, 1.250
Message-ID: <20090107204531.28DBC70100@cvs1.fedora.phx.redhat.com>

Author: rstrode

Update of /cvs/pkgs/rpms/nautilus/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11085

Modified Files:
	eel-2.24.0-fade.patch nautilus.spec 
Added Files:
	nautilus-2.25.2-fix-crasher.patch 
Log Message:
- Don't crash when closing spatial window very quickly after
  opening it (gnome bug 552859)


nautilus-2.25.2-fix-crasher.patch:

--- NEW FILE nautilus-2.25.2-fix-crasher.patch ---
diff -up nautilus-2.25.2/src/nautilus-window-slot.c.fix-crasher nautilus-2.25.2/src/nautilus-window-slot.c
--- nautilus-2.25.2/src/nautilus-window-slot.c.fix-crasher	2009-01-07 14:19:02.542397115 -0500
+++ nautilus-2.25.2/src/nautilus-window-slot.c	2009-01-07 14:15:25.815412326 -0500
@@ -570,6 +570,20 @@ nautilus_window_slot_dispose (GObject *o
 
 	slot = NAUTILUS_WINDOW_SLOT (object);
 
+	if (slot->content_view) {
+		widget = nautilus_view_get_widget (slot->content_view);
+		gtk_widget_destroy (widget);
+		g_object_unref (slot->content_view);
+		slot->content_view = NULL;
+	}
+
+	if (slot->new_content_view) {
+		widget = nautilus_view_get_widget (slot->new_content_view);
+		gtk_widget_destroy (widget);
+		g_object_unref (slot->new_content_view);
+		slot->new_content_view = NULL;
+	}
+
 	nautilus_window_slot_set_viewed_file (slot, NULL);
 	/* TODO? why do we unref here? the file is NULL.
 	 * It was already here before the slot move, though */
@@ -598,20 +612,6 @@ nautilus_window_slot_dispose (GObject *o
 		slot->find_mount_cancellable = NULL;
 	}
 
-	if (slot->content_view) {
-		widget = nautilus_view_get_widget (slot->content_view);
-		gtk_widget_destroy (widget);
-		g_object_unref (slot->content_view);
-		slot->content_view = NULL;
-	}
-
-	if (slot->new_content_view) {
-		widget = nautilus_view_get_widget (slot->new_content_view);
-		gtk_widget_destroy (widget);
-		g_object_unref (slot->new_content_view);
-		slot->new_content_view = NULL;
-	}
-
 	slot->window = NULL;
 
 	g_free (slot->title);

eel-2.24.0-fade.patch:

Index: eel-2.24.0-fade.patch
===================================================================
RCS file: /cvs/pkgs/rpms/nautilus/devel/eel-2.24.0-fade.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- eel-2.24.0-fade.patch	18 Dec 2008 21:15:09 -0000	1.1
+++ eel-2.24.0-fade.patch	7 Jan 2009 20:45:30 -0000	1.2
@@ -108,6 +108,45 @@
  	if (pixmap) {
 
 ============================================================
+ Store widget in background details
+
+  It will get used in various places, so keeping
+
+diff --git a/eel/eel-background.c b/eel/eel-background.c
+--- a/eel/eel-background.c
++++ b/eel/eel-background.c
+@@ -74,6 +74,7 @@ struct EelBackgroundDetails {
+ 	char *color;
+ 	
+ 	GnomeBG *bg;
++	GtkWidget *widget;
+ 
+ 	/* Realized data: */
+ 	gboolean background_changes_with_size;
+@@ -806,6 +807,12 @@ eel_background_is_desktop (EelBackground *background)
+ 	return background->details->is_desktop;
+ }
+ 
++static void
++on_widget_destroyed (GtkWidget *widget, EelBackground *background)
++{
++	background->details->widget = NULL;
++}
++
+ /* Gets the background attached to a widget.
+ 
+    If the widget doesn't already have a EelBackground object,
+@@ -841,6 +848,8 @@ eel_get_widget_background (GtkWidget *widget)
+ 	gtk_object_sink (GTK_OBJECT (background));
+ 	g_object_set_data_full (G_OBJECT (widget), "eel_background",
+ 				background, g_object_unref);
++	background->details->widget = widget;
++ 	g_signal_connect_object (widget, "destroy", G_CALLBACK (on_widget_destroyed), background, 0);
+ 
+ 	/* Arrange to get the signal whenever the background changes. */
+ 	g_signal_connect_object (background, "appearance_changed",
+
+============================================================
  Compress multiple background change requests into 1
 
   We may end up in a situation where we need to deal
@@ -119,7 +158,7 @@
 diff --git a/eel/eel-background.c b/eel/eel-background.c
 --- a/eel/eel-background.c
 +++ b/eel/eel-background.c
-@@ -90,6 +90,7 @@ struct EelBackgroundDetails {
+@@ -91,6 +90,7 @@ struct EelBackgroundDetails {
  	gulong screen_size_handler;
  	/* Can we use common pixmap for root window and desktop window */
  	gboolean use_common_pixmap;
@@ -127,26 +166,28 @@
  };
  
  static void
-@@ -701,13 +702,35 @@ eel_background_set_up_widget (EelBackground *background, GtkWidget *widget)
+@@ -702,13 +702,35 @@ eel_background_set_up_widget (EelBackground *background, GtkWidget *widget)
  	}
  }
  
 -static void
 -eel_widget_background_changed (GtkWidget *widget, EelBackground *background)
 +static gboolean
-+on_background_changed (GtkWidget *widget)
++on_background_changed (EelBackground *background)
  {
-+	EelBackground *background;
-+	
-+	background = eel_get_widget_background (widget);
++	if (background->details->change_idle_id == 0) {
++		return FALSE;
++	}
 +
 +	background->details->change_idle_id = 0;
 +
  	eel_background_unrealize (background);
- 	eel_background_set_up_widget (background, widget);
- 
- 	gtk_widget_queue_draw (widget);
+-	eel_background_set_up_widget (background, widget);
++	eel_background_set_up_widget (background, background->details->widget);
 +
++	gtk_widget_queue_draw (background->details->widget);
+ 
+-	gtk_widget_queue_draw (widget);
 +	return FALSE;
 +}
 +
@@ -154,18 +195,18 @@
 +eel_widget_queue_background_change (GtkWidget *widget)
 +{
 +	EelBackground *background;
-+	
++
 +	background = eel_get_widget_background (widget);
 +
 +	if (background->details->change_idle_id > 0) {
 +		return;
 +	}
 +
-+	background->details->change_idle_id = g_idle_add ((GSourceFunc) on_background_changed, widget);
++	background->details->change_idle_id = g_idle_add ((GSourceFunc) on_background_changed, background);
  }
  
  /* Callback used when the style of a widget changes.  We have to regenerate its
-@@ -720,7 +743,7 @@ widget_style_set_cb (GtkWidget *widget, GtkStyle *previous_style, gpointer data)
+@@ -721,7 +743,7 @@ widget_style_set_cb (GtkWidget *widget, GtkStyle *previous_style, gpointer data)
  	
  	background = EEL_BACKGROUND (data);
  	
@@ -174,7 +215,19 @@
  }
  
  static void
-@@ -844,8 +867,8 @@ eel_get_widget_background (GtkWidget *widget)
+@@ -810,6 +832,11 @@ eel_background_is_desktop (EelBackground *background)
+ static void
+ on_widget_destroyed (GtkWidget *widget, EelBackground *background)
+ {
++	if (background->details->change_idle_id != 0) {
++		g_source_remove (background->details->change_idle_id);
++		background->details->change_idle_id = 0;
++	}
++
+ 	background->details->widget = NULL;
+ }
+ 
+@@ -853,8 +880,8 @@ eel_get_widget_background (GtkWidget *widget)
  
  	/* Arrange to get the signal whenever the background changes. */
  	g_signal_connect_object (background, "appearance_changed",
@@ -187,43 +240,13 @@
  				 G_CALLBACK (widget_style_set_cb),
 
 ============================================================
- Store widget in background details
-
-  It will get used in various places, so keeping
-it around simplifies things.  Note, backgrounds
-are already tied to the lifetime of their widgets
-by a g_object_set_data_full call, so we don't need
-to worry about nullifying the assignment later,
-or taking a reference.
-
-diff --git a/eel/eel-background.c b/eel/eel-background.c
---- a/eel/eel-background.c
-+++ b/eel/eel-background.c
-@@ -74,6 +74,7 @@ struct EelBackgroundDetails {
- 	char *color;
- 	
- 	GnomeBG *bg;
-+	GtkWidget *widget;
- 
- 	/* Realized data: */
- 	gboolean background_changes_with_size;
-@@ -864,6 +865,7 @@ eel_get_widget_background (GtkWidget *widget)
- 	gtk_object_sink (GTK_OBJECT (background));
- 	g_object_set_data_full (G_OBJECT (widget), "eel_background",
- 				background, g_object_unref);
-+	background->details->widget = widget;
- 
- 	/* Arrange to get the signal whenever the background changes. */
- 	g_signal_connect_object (background, "appearance_changed",
-
-============================================================
  Add the crossfade transition
 
   
 diff --git a/eel/eel-background.c b/eel/eel-background.c
 --- a/eel/eel-background.c
 +++ b/eel/eel-background.c
-@@ -54,6 +54,9 @@ static GdkPixmap *eel_background_get_pixmap_and_color      (EelBackground *backg
+@@ -53,6 +53,9 @@ static GdkPixmap *eel_background_get_pixmap_and_color      (EelBackground *backg
  							    gboolean      *changes_with_size);
  static void set_image_properties (EelBackground *background);
  
@@ -233,7 +256,7 @@
  EEL_CLASS_BOILERPLATE (EelBackground, eel_background, GTK_TYPE_OBJECT)
  
  enum {
-@@ -79,6 +82,7 @@ struct EelBackgroundDetails {
+@@ -78,6 +81,7 @@ struct EelBackgroundDetails {
  	/* Realized data: */
  	gboolean background_changes_with_size;
  	GdkPixmap *background_pixmap;
@@ -241,7 +264,7 @@
  	int background_entire_width;
  	int background_entire_height;
  	GdkColor default_color;
-@@ -140,6 +144,7 @@ eel_background_class_init (gpointer klass)
+@@ -139,6 +143,7 @@ eel_background_class_init (gpointer klass)
  static void
  on_bg_changed (GnomeBG *bg, EelBackground *background)
  {
@@ -249,7 +272,7 @@
  	g_signal_emit (G_OBJECT (background),
  		       signals[APPEARANCE_CHANGED], 0);
  }
-@@ -147,6 +152,7 @@ on_bg_changed (GnomeBG *bg, EelBackground *background)
+@@ -146,6 +151,7 @@ on_bg_changed (GnomeBG *bg, EelBackground *background)
  static void
  on_bg_transitioned (GnomeBG *bg, EelBackground *background)
  {
@@ -257,7 +280,7 @@
  	g_signal_emit (G_OBJECT (background),
  		       signals[APPEARANCE_CHANGED], 0);
  }
-@@ -186,6 +192,15 @@ eel_background_remove_current_image (EelBackground *background)
+@@ -185,6 +191,15 @@ eel_background_remove_current_image (EelBackground *background)
  }
  
  static void
@@ -273,7 +296,7 @@
  eel_background_finalize (GObject *object)
  {
  	EelBackground *background;
-@@ -200,6 +215,8 @@ eel_background_finalize (GObject *object)
+@@ -199,6 +214,8 @@ eel_background_finalize (GObject *object)
  		background->details->background_pixmap = NULL;
  	}
  
@@ -282,7 +305,7 @@
  	g_free (background->details);
  
  	EEL_CALL_PARENT (G_OBJECT_CLASS, finalize, (object));
-@@ -649,6 +666,33 @@ set_root_pixmap (EelBackground *background,
+@@ -648,6 +665,33 @@ set_root_pixmap (EelBackground *background,
  	g_object_unref (root_pixmap);
  }
  
@@ -316,7 +339,7 @@
  static void
  eel_background_set_up_widget (EelBackground *background, GtkWidget *widget)
  {
-@@ -661,6 +705,7 @@ eel_background_set_up_widget (EelBackground *background, GtkWidget *widget)
+@@ -660,6 +704,7 @@ eel_background_set_up_widget (EelBackground *background, GtkWidget *widget)
  	
  	GdkWindow *window;
  	gboolean changes_with_size;
@@ -324,7 +347,7 @@
  
  	if (!GTK_WIDGET_REALIZED (widget)) {
  		return;
-@@ -683,18 +728,25 @@ eel_background_set_up_widget (EelBackground *background, GtkWidget *widget)
+@@ -682,18 +727,25 @@ eel_background_set_up_widget (EelBackground *background, GtkWidget *widget)
  		window = widget->window;
  	}
  
@@ -352,16 +375,7 @@
  		set_root_pixmap (background, window);
  	}
  	
-@@ -707,7 +759,7 @@ static gboolean
- on_background_changed (GtkWidget *widget)
- {
- 	EelBackground *background;
--	
-+
- 	background = eel_get_widget_background (widget);
- 
- 	background->details->change_idle_id = 0;
-@@ -721,10 +773,40 @@ on_background_changed (GtkWidget *widget)
+@@ -720,6 +772,36 @@ on_background_changed (EelBackground *background)
  }
  
  static void
@@ -398,8 +412,3 @@
  eel_widget_queue_background_change (GtkWidget *widget)
  {
  	EelBackground *background;
--	
-+
- 	background = eel_get_widget_background (widget);
- 
- 	if (background->details->change_idle_id > 0) {


Index: nautilus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nautilus/devel/nautilus.spec,v
retrieving revision 1.249
retrieving revision 1.250
diff -u -r1.249 -r1.250
--- nautilus.spec	19 Dec 2008 04:21:40 -0000	1.249
+++ nautilus.spec	7 Jan 2009 20:45:30 -0000	1.250
@@ -16,7 +16,7 @@
 Name:		nautilus
 Summary:        File manager for GNOME
 Version: 	2.25.2
-Release:	5%{?dist}
+Release:	6%{?dist}
 License: 	GPLv2+
 Group:          User Interface/Desktops
 Source: 	http://download.gnome.org/sources/%{name}/2.25/%{name}-%{version}.tar.bz2
@@ -91,6 +91,7 @@
 
 # http://bugzilla.gnome.org/show_bug.cgi?id=552859
 Patch18:	eel-2.24.0-fade.patch
+Patch19:	nautilus-2.25.2-fix-crasher.patch
 
 
 %description
@@ -132,6 +133,7 @@
 %patch15 -p1 -b .xds
 %patch17 -p0 -b .symlink
 %patch18 -p1 -b .fade
+%patch19 -p1 -b .fix-crasher
 
 %build
 
@@ -263,6 +265,10 @@
 
 
 %changelog
+* Wed Jan  7 2009 Ray Strode <rstrode at redhat.com> - 2.25.2-6
+- Don't crash when closing spatial window very quickly after
+  opening it (gnome bug 552859)
+
 * Thu Dec 18 2008 Matthias Clasen <mclasen at redhat.com> - 2.25.2-5
 - Fix spec
 



From lkundrak at fedoraproject.org  Wed Jan  7 20:53:20 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Wed,  7 Jan 2009 20:53:20 +0000 (UTC)
Subject: rpms/nightview/devel nighthttpd.sysvinit, NONE,
	1.1 nightview-0.3.1-doc.patch, NONE,
	1.1 nightview-0.3.2-fitslib.patch, NONE,
	1.1 nightview-0.3.2-initscript.patch, NONE, 1.1 nightview.spec,
	NONE, 1.1 xmove.desktop, NONE, 1.1 xnightview.desktop, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090107205320.0D09D70100@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/nightview/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12397/devel

Modified Files:
	.cvsignore sources 
Added Files:
	nighthttpd.sysvinit nightview-0.3.1-doc.patch 
	nightview-0.3.2-fitslib.patch nightview-0.3.2-initscript.patch 
	nightview.spec xmove.desktop xnightview.desktop 
Log Message:
Import nightview


--- NEW FILE nighthttpd.sysvinit ---
#! /bin/bash
#
# nighthttpd: init script for nighthttpd
#
# Author: Lubomir Rintel <lkundrak at v3.sk>
# 
# chkconfig: - 96 04
# description: NightView HTTP daemon
# processname: nighthttpd
# config: /etc/sysconfig/nightview
#
### BEGIN INIT INFO
# Provides: nighthttpd
# Required-Start: network
# Required-Stop:
# Default-Start:
# Default-Stop: 0 1 2 6
# Short-Description: NightView HTTP daemon
# Description: Daemon for remote access to NightView via HTTP protocol
### END INIT INFO

SERVICE=nighthttpd
PROCESS=nighthttpd
DAEMON=/usr/sbin/nighthttpd

# Source function library.
. /etc/init.d/functions

# Source networking configuration.
. /etc/sysconfig/network

# Source service configuration.
[ -f /etc/sysconfig/nightview ] && . /etc/sysconfig/nightview

# Check that networking is up.
[ ${NETWORKING} = "no" ] && exit 0

[ -x $DAEMON ] || exit 1

start() {
        echo -n $"Starting $SERVICE: "
        daemon --user nobody $DAEMON
	echo
        [ $RETVAL = 0 ] && touch /var/lock/subsys/$SERVICE
        return $RETVAL
}

stop() {
        echo -n $"Stopping $SERVICE:"
        killproc $PROCESS
	RETVAL=$?
        echo
        if [ $RETVAL -eq 0 ]; then
        	rm -f /var/lock/subsys/$SERVICE
        fi
        return $RETVAL
}

restart() {
	stop && start
}

RETVAL=0
case "$1" in
  start)
	start
	RETVAL=$?
	;;
  stop)
	stop
	RETVAL=$?
	;;
  restart)
	restart
	RETVAL=$?
	;;
  reload)
	echo "$0 does not support configuration reloading, you have to restart it."
	RETVAL=1
	;;
  status)
	status $PROCESS
	RETVAL=$?
	;;
  *)
	echo $"Usage: $0 {start|stop|restart|reload|status}"
	RETVAL=1
esac

exit $RETVAL

nightview-0.3.1-doc.patch:

--- NEW FILE nightview-0.3.1-doc.patch ---
* Replace a couple of Debian specific paths with Fedora specific (*sigh*)
* Fix DOCTYPE by changing local reference to DTD into global
* Increase quality of PDF documentation by bypassing PostScript, ps2pdf

Lubomir Rintel (Fedora Astronomy) <lkundrak at v3.sk>

diff -up nightview-0.3.1/doc/hack/sample-both.dsl.doc nightview-0.3.1/doc/hack/sample-both.dsl
--- nightview-0.3.1/doc/hack/sample-both.dsl.doc	2003-05-14 18:44:19.000000000 +0200
+++ nightview-0.3.1/doc/hack/sample-both.dsl	2008-11-05 00:06:08.000000000 +0100
@@ -2,11 +2,11 @@
 <!ENTITY % html "IGNORE">
 <![%html;[
 <!ENTITY % print "IGNORE">
-<!ENTITY docbook.dsl SYSTEM "/usr/share/sgml/docbook/stylesheet/dsssl/modular/html/docbook.dsl" CDATA dsssl>
+<!ENTITY docbook.dsl SYSTEM "/usr/share/sgml/docbook/dsssl-stylesheets/html/docbook.dsl" CDATA dsssl>
 ]]>
 <!ENTITY % print "INCLUDE">
 <![%print;[
-<!ENTITY docbook.dsl SYSTEM "/usr/share/sgml/docbook/stylesheet/dsssl/modular/print/docbook.dsl" CDATA dsssl>
+<!ENTITY docbook.dsl SYSTEM "/usr/share/sgml/docbook/dsssl-stylesheets/print/docbook.dsl" CDATA dsssl>
 ]]>
 <!ENTITY htmlmath.dsl SYSTEM "HTMLMath.dsl">
 <!ENTITY texmath.dsl SYSTEM "TeXMath.dsl">
diff -up nightview-0.3.1/doc/Makefile.nightview.doc nightview-0.3.1/doc/Makefile.nightview
--- nightview-0.3.1/doc/Makefile.nightview.doc	2003-09-23 16:41:50.000000000 +0200
+++ nightview-0.3.1/doc/Makefile.nightview	2008-11-05 00:13:32.000000000 +0100
@@ -11,14 +11,14 @@ JADEHTML = 1
 XSLTPROC= xsltproc
 #
 #  XSLT-stylesheet
-HTMLSHIT= /usr/share/sgml/docbook/stylesheet/xsl/nwalsh/html/docbook.xsl
+HTMLSHIT=/usr/share/sgml/docbook/xsl-stylesheets/html/docbook.xsl 
 #
 # DSSSL stylesheet
 DSLSHIT= /usr/lib/sgml/stylesheet/dsssl/docbook/nwalsh/print/docbook.dsl
 DSLSHIT= hack/sample-both.dsl
 #
 # XML declaration
-XMLDEC= /usr/lib/sgml/declaration/xml.decl
+XMLDEC= /usr/share/sgml/docbook/dsssl-stylesheets/dtds/decls/xml.dcl
 #
 JADE=jade    # JADE = [ jade | openjade ]
 #
@@ -38,8 +38,8 @@ nightview.ps: nightview.dvi
 #; rm -f *.dvi *.aux *.log;
 
 # pdf version
-nightview.pdf: nightview.ps
-	ps2pdf nightview.ps nightview.pdf
+nightview.pdf: nightview.dvi
+	dvipdf nightview.dvi nightview.pdf
 
 # pdf version
 #
diff -up nightview-0.3.1/doc/nightview.xml.doc nightview-0.3.1/doc/nightview.xml
--- nightview-0.3.1/doc/nightview.xml.doc	2004-12-24 17:29:37.000000000 +0100
+++ nightview-0.3.1/doc/nightview.xml	2008-11-05 00:06:08.000000000 +0100
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <?xml-stylesheet href="nightview.css" type="text/css"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2CR1//EN" "/usr/share/sgml/docbook/dtd/xml/4.2.cr1/docbookx.dtd" [
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
 <!ENTITY latex "LaTeX">
 <!ENTITY tex "TeX">
 ]>

nightview-0.3.2-fitslib.patch:

--- NEW FILE nightview-0.3.2-fitslib.patch ---
Our convention is to put application-specific headers into a
separate subdirectory.

Lubomir Rintel (Fedora Astronomy) <lkundrak at v3.sk>

diff -up nightview-0.3.2/gtknightview/fits.c.fitslib nightview-0.3.2/gtknightview/fits.c
--- nightview-0.3.2/gtknightview/fits.c.fitslib	2002-07-16 17:08:29.000000000 +0200
+++ nightview-0.3.2/gtknightview/fits.c	2009-01-06 10:40:06.000000000 +0100
@@ -9,7 +9,7 @@
 #include "fitsadd.h"
 #include "gtknightview.h"
 #include "string.h"
-#include <fitsio.h>
+#include <cfitsio/fitsio.h>
 #include <sys/stat.h>
 
 #define FWHM_BOX 5
diff -up nightview-0.3.2/lib/fitsadd.c.fitslib nightview-0.3.2/lib/fitsadd.c
--- nightview-0.3.2/lib/fitsadd.c.fitslib	2003-06-25 15:49:00.000000000 +0200
+++ nightview-0.3.2/lib/fitsadd.c	2009-01-06 10:40:06.000000000 +0100
@@ -1,7 +1,7 @@
 
 #include "fitsadd.h"
 #include <sys/stat.h>
-#include <fitsio.h>
+#include <cfitsio/fitsio.h>
 #include <unistd.h>
 #include <string.h>
 
diff -up nightview-0.3.2/libsbig/ccdfits.c.fitslib nightview-0.3.2/libsbig/ccdfits.c
--- nightview-0.3.2/libsbig/ccdfits.c.fitslib	2007-06-16 13:36:04.000000000 +0200
+++ nightview-0.3.2/libsbig/ccdfits.c	2009-01-06 10:40:06.000000000 +0100
@@ -9,7 +9,7 @@
 #include <stdio.h>
 #include <syslog.h>
 #include <string.h>
-#include <fitsio.h>
+#include <cfitsio/fitsio.h>
 #include "nightview.h"
 #include "ccdtypes.h"
 #include "ccdcommon.h"
diff -up nightview-0.3.2/libsbig/ccdsbig.c.fitslib nightview-0.3.2/libsbig/ccdsbig.c
--- nightview-0.3.2/libsbig/ccdsbig.c.fitslib	2007-05-07 20:36:48.000000000 +0200
+++ nightview-0.3.2/libsbig/ccdsbig.c	2009-01-06 10:40:06.000000000 +0100
@@ -25,7 +25,7 @@
 #include <sys/wait.h>
 #include <signal.h>
 #include <syslog.h>
-#include <fitsio.h>
+#include <cfitsio/fitsio.h>
 #include <sbig.h>
 #include "nightview.h"
 #include "ccdtypes.h"
diff -up nightview-0.3.2/libsbig/systime.c.fitslib nightview-0.3.2/libsbig/systime.c
--- nightview-0.3.2/libsbig/systime.c.fitslib	2007-05-07 20:36:48.000000000 +0200
+++ nightview-0.3.2/libsbig/systime.c	2009-01-06 10:40:06.000000000 +0100
@@ -11,7 +11,7 @@
 #include <time.h>
 #include <sys/time.h>
 #include <syslog.h>
-#include <fitsio.h>
+#include <cfitsio/fitsio.h>
 #include <string.h>
 
 
diff -up nightview-0.3.2/shell/night_pointer.cpp.fitslib nightview-0.3.2/shell/night_pointer.cpp
--- nightview-0.3.2/shell/night_pointer.cpp.fitslib	2008-10-29 23:04:07.000000000 +0100
+++ nightview-0.3.2/shell/night_pointer.cpp	2009-01-06 10:40:06.000000000 +0100
@@ -15,7 +15,7 @@
 #include <cstring>
 #include <iostream>
 #include <stdexcept>
-#include <fitsio.h>
+#include <cfitsio/fitsio.h>
 
 
 using namespace std;
diff -up nightview-0.3.2/xnightview/fits.cpp.fitslib nightview-0.3.2/xnightview/fits.cpp
--- nightview-0.3.2/xnightview/fits.cpp.fitslib	2008-02-13 00:04:24.000000000 +0100
+++ nightview-0.3.2/xnightview/fits.cpp	2009-01-06 10:40:06.000000000 +0100
@@ -10,7 +10,7 @@
 
 #include "xnightview.h"
 #include <math.h>
-#include <fitsio.h>
+#include <cfitsio/fitsio.h>
 
 // For compilers that support precompilation, includes "wx/wx.h".
 #include "wx/wxprec.h"

nightview-0.3.2-initscript.patch:

--- NEW FILE nightview-0.3.2-initscript.patch ---
Most important part of this is not to enable the service by default.

Lubomir Rintel (Fedora Astronomy) <lkundrak at v3.sk>

diff -up nightview-0.3.2/rpm/mount-server.init.redhat.initscript nightview-0.3.2/rpm/mount-server.init.redhat
--- nightview-0.3.2/rpm/mount-server.init.redhat.initscript	2003-06-20 22:05:43.000000000 +0200
+++ nightview-0.3.2/rpm/mount-server.init.redhat	2009-01-06 10:40:06.000000000 +0100
@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# chkconfig: 2345 96 04
+# chkconfig: - 96 04
 # description: mount server
 # processname: telescoped
 # pidfile: /var/run/telescoped.pid
@@ -8,8 +8,16 @@
 #
 # $Id: mount-server.init.redhat,v 1.2 2003-06-20 20:05:43 hroch Exp $
 #
+### BEGIN INIT INFO
+# Provides: telescoped
+# Required-Start: network
+# Required-Stop:
+# Default-Start:
+# Default-Stop: 0 1 2 6
+# Short-Description: Telescope mount server
+# Description: Remote control for telescope from NightView suite
+### END INIT INFO
 
-PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
 
 # source function library
 . /etc/init.d/functions


--- NEW FILE nightview.spec ---
Name:           nightview
Version:        0.3.2
Release:        1%{?dist}
Summary:        A general astronomical software package to control of a CCD camera

Group:          Amusements/Graphics
License:        GPLv2
URL:            http://www.physics.muni.cz/mb/nightview/
Source0:        ftp://integral.physics.muni.cz/pub/nightview/%{name}-%{version}.tar.gz
Source1:        xnightview.desktop
Source2:        xmove.desktop
Source3:        nighthttpd.sysvinit
Patch0:         nightview-0.3.2-fitslib.patch
Patch1:         nightview-0.3.2-initscript.patch
Patch2:         nightview-0.3.1-doc.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  cfitsio-devel
BuildRequires:  wxGTK-devel
BuildRequires:  curl-devel
BuildRequires:  ImageMagick
BuildRequires:  jadetex
BuildRequires:  /usr/bin/dvipdf
BuildRequires:  docbook-style-dsssl
BuildRequires:  docbook-dtd42-xml
BuildRequires:  transfig
BuildRequires:  desktop-file-utils

Requires:       nightview-server = %{version}
Requires:       nightview-cli = %{version}
Requires:       nightview-gui = %{version}
Requires:       nightview-doc = %{version}

%description
Nightview is a general astronomical software package to control of a CCD
camera together with a telescope. It provides an intuitive graphical
interface for getting of individual exposures and a telescope possitioning.
An advanced command line interface is also offered to support of a scripting
and a long time serie imaging.

Nightview is designed as a fully network transparent providing maximum
flexibility of its usage. Moreover, all components are prepared with
possibility to be simply superseded by an user's equivalent for support of
individual improvements and possible requested extendings. 


%package server
Summary:        Server-side tools from NightView suite
Group:          Amusements/Graphics

Requires(post): chkconfig
Requires(preun): chkconfig
Requires(preun): initscripts

%description server
Server tools from NightView suite.
See description of "nightview" package for more details.


%package cli
Summary:        Non-GUI tools from NightView suite
Group:          Amusements/Graphics

%description cli
Text based tools from NightView suite.
See description of "nightview" package for more details.


%package gui
Summary:        GUI tools from NightView suite
Group:          Amusements/Graphics

%description gui
Graphically oriented tools from NightView suite.
See description of "nightview" package for more details.


%package doc
Summary:        Documentation for NightView suite
Group:          Amusements/Graphics

%description doc
Documentation files for NightView suite in PDF, PostScript and HTML.
See description of "nightview" package for more details.


%prep
%setup -q
%patch0 -p1 -b .fitslib
%patch1 -p1 -b .initscript
%patch2 -p1 -b .doc

# Hack around #478680
sed "s,http://www.oasis-open.org/docbook/xml/4.2,$(
        cd /usr/share/sgml
        ls -d docbook/xml-dtd-4.2-* |head -n1
)," -i doc/nightview.xml


%build
# configure.in has a typo, patching it would need regeneration of configure
# Real fix is s/ac_cv_header_curl_h/ac_cv_header_curl_curl_h/
export ac_cv_header_curl_h=yes
# Unfortunately *sad panda* SBIG protocols are not open
%configure --without-sbigudrv --disable-static --with-curl
# configure overrides CFLAGS to a value that does not make much sense
make %{?_smp_mflags} CFLAGS="%{optflags}" CXXFLAGS="%{optflags}"

# Build documentation (not _smp_mflags safe)
make -C doc

# Create Icon Theme Specification compilant icons
convert xnightview/xnightview-icon.xpm xnightview.png
convert xmove/xmove-icon.xpm xmove.png


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

# Directory structure
install -d $RPM_BUILD_ROOT%{_datadir}/pixmaps
install -d $RPM_BUILD_ROOT%{_datadir}/applications
install -d $RPM_BUILD_ROOT%{_docdir}/nightview-doc
install -d $RPM_BUILD_ROOT%{_initrddir}

# Icons and menu entries
install -pm 0644 xnightview.png xmove.png \
        $RPM_BUILD_ROOT%{_datadir}/pixmaps
desktop-file-install --vendor=fedora %{SOURCE1} \
        --dir=$RPM_BUILD_ROOT%{_datadir}/applications
desktop-file-install --vendor=fedora %{SOURCE2} \
        --dir=$RPM_BUILD_ROOT%{_datadir}/applications

# Init scripts
install -pm 0755 rpm/mount-server.init.redhat \
        $RPM_BUILD_ROOT%{_initrddir}/telescoped
install -pm 0755 %{SOURCE3} \
        $RPM_BUILD_ROOT%{_initrddir}/nighthttpd

# Documentation
make -f Makefile.nightview -C doc install DESTDIR=$RPM_BUILD_ROOT


%clean
rm -rf $RPM_BUILD_ROOT


%post server
/sbin/chkconfig --add telescoped
/sbin/chkconfig --add nighthttpd


%preun server
if [ $1 = 0 ]
then
        /sbin/service telescoped stop >/dev/null 2>&1
        /sbin/chkconfig --del telescoped
        /sbin/service nighthttpd stop >/dev/null 2>&1
        /sbin/chkconfig --del nighthttpd
fi


%post cli -p /sbin/ldconfig
%postun cli -p /sbin/ldconfig


%files
%defattr(-,root,root,-)
# Nothing external links against this so far, and this saves us
# from overhead of creating a useless devel package.
%exclude %{_libdir}/libccdnet.so
%exclude %{_libdir}/libccdnet.la
# This seems usless in a package
%exclude %{_sbindir}/nighthttpd_setup.sh
%exclude %{_sbindir}/telescoped_setup.sh
%exclude %{_bindir}/nightview-test
%exclude %{_mandir}/man1/nightview-test.1*
%doc COPYING


%files server
%defattr(-,root,root,-)
%{_initrddir}/nighthttpd
%{_initrddir}/telescoped
%{_sbindir}/nighthttpd
%{_sbindir}/telescoped
%{_mandir}/man8/nighthttpd.8*
%{_mandir}/man8/telescoped.8*
%doc COPYING


%files cli
%defattr(-,root,root,-)
%{_bindir}/night_batch
%{_bindir}/night_control
%{_bindir}/night_dark
%{_bindir}/night_darks
%{_bindir}/night_exposure
%{_bindir}/night_filter
%{_bindir}/night_flats
%{_bindir}/night_keylist
%{_bindir}/night_pointer
%{_bindir}/night_power
%{_bindir}/night_temperature
%{_bindir}/telescope
%{_libdir}/libccdnet.so.0
%{_libdir}/libccdnet.so.0.0.0
%{_mandir}/man1/night_batch.1*
%{_mandir}/man1/night_control.1*
%{_mandir}/man1/night_dark.1*
%{_mandir}/man1/night_darks.1*
%{_mandir}/man1/night_exposure.1*
%{_mandir}/man1/night_filter.1*
%{_mandir}/man1/night_flats.1*
%{_mandir}/man1/night_keylist.1*
%{_mandir}/man1/night_power.1*
%{_mandir}/man1/night_temperature.1*
%{_mandir}/man1/telescope.1*
%doc COPYING


%files gui
%defattr(-,root,root,-)
%{_bindir}/xnightview
%{_bindir}/xmove
%{_mandir}/man1/xmove.1*
%{_mandir}/man1/xnightview.1*
%{_datadir}/pixmaps
%{_datadir}/applications
%doc COPYING


%files doc
%defattr(-,root,root,-)
%dir %{_docdir}/nightview-doc
%{_docdir}/nightview-doc/html
%{_docdir}/nightview-doc/nightview.pdf
%{_docdir}/nightview-doc/nightview.ps
# Do not include sources
%exclude %{_docdir}/nightview-doc/*.fig
%exclude %{_docdir}/nightview-doc/*.eps
%exclude %{_docdir}/nightview-doc/*.jpg
%exclude %{_docdir}/nightview-doc/*.png
%exclude %{_docdir}/nightview-doc/*.css
%exclude %{_docdir}/nightview-doc/*.xml
%doc COPYING


%changelog
* Tue Jan 06 2009 Lubomir Rintel (Fedora Astronomy) <lkundrak at v3.sk> - 0.3.2-3
- Bump to 0.3.2

* Mon Jan 05 2009 Lubomir Rintel (Fedora Astronomy) <lkundrak at v3.sk> - 0.3.1-3
- Work around (#478680)

* Wed Nov 05 2008 Lubomir Rintel (Fedora Astronomy) <lkundrak at v3.sk> - 0.3.1-2
- Fixes for problems found during review by Marek Mahut

* Sun Oct 26 2008 Lubomir Rintel (Fedora Astronomy) <lkundrak at v3.sk> - 0.3.1-1
- Initial packaging attempt


--- NEW FILE xmove.desktop ---
[Desktop Entry]
Encoding=UTF-8
Type=Application
Name=XMove
Comment=Tool for moving a telescope from NightView suite
GenericName=Move Telescope
Exec=xmove %f
Icon=xmove
Categories=Graphics;Education;
Terminal=false


--- NEW FILE xnightview.desktop ---
[Desktop Entry]
Encoding=UTF-8
Type=Application
Name=NightView
Comment=Tool for working with pictures from SBIG cameras
GenericName=NightView
Exec=xnightview %f
Icon=xnightview
Categories=Graphics;Education;
Terminal=false


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/nightview/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	7 Jan 2009 00:11:44 -0000	1.1
+++ .cvsignore	7 Jan 2009 20:52:49 -0000	1.2
@@ -0,0 +1 @@
+nightview-0.3.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nightview/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	7 Jan 2009 00:11:44 -0000	1.1
+++ sources	7 Jan 2009 20:52:49 -0000	1.2
@@ -0,0 +1 @@
+4644a08d2a75ca9ec58ff659519b0a93  nightview-0.3.2.tar.gz



From lkundrak at fedoraproject.org  Wed Jan  7 20:53:19 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Wed,  7 Jan 2009 20:53:19 +0000 (UTC)
Subject: rpms/nightview/EL-5 nighthttpd.sysvinit, NONE,
	1.1 nightview-0.3.1-doc.patch, NONE,
	1.1 nightview-0.3.2-fitslib.patch, NONE,
	1.1 nightview-0.3.2-initscript.patch, NONE, 1.1 nightview.spec,
	NONE, 1.1 xmove.desktop, NONE, 1.1 xnightview.desktop, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090107205319.48FC870100@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/nightview/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12397/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	nighthttpd.sysvinit nightview-0.3.1-doc.patch 
	nightview-0.3.2-fitslib.patch nightview-0.3.2-initscript.patch 
	nightview.spec xmove.desktop xnightview.desktop 
Log Message:
Import nightview


--- NEW FILE nighthttpd.sysvinit ---
#! /bin/bash
#
# nighthttpd: init script for nighthttpd
#
# Author: Lubomir Rintel <lkundrak at v3.sk>
# 
# chkconfig: - 96 04
# description: NightView HTTP daemon
# processname: nighthttpd
# config: /etc/sysconfig/nightview
#
### BEGIN INIT INFO
# Provides: nighthttpd
# Required-Start: network
# Required-Stop:
# Default-Start:
# Default-Stop: 0 1 2 6
# Short-Description: NightView HTTP daemon
# Description: Daemon for remote access to NightView via HTTP protocol
### END INIT INFO

SERVICE=nighthttpd
PROCESS=nighthttpd
DAEMON=/usr/sbin/nighthttpd

# Source function library.
. /etc/init.d/functions

# Source networking configuration.
. /etc/sysconfig/network

# Source service configuration.
[ -f /etc/sysconfig/nightview ] && . /etc/sysconfig/nightview

# Check that networking is up.
[ ${NETWORKING} = "no" ] && exit 0

[ -x $DAEMON ] || exit 1

start() {
        echo -n $"Starting $SERVICE: "
        daemon --user nobody $DAEMON
	echo
        [ $RETVAL = 0 ] && touch /var/lock/subsys/$SERVICE
        return $RETVAL
}

stop() {
        echo -n $"Stopping $SERVICE:"
        killproc $PROCESS
	RETVAL=$?
        echo
        if [ $RETVAL -eq 0 ]; then
        	rm -f /var/lock/subsys/$SERVICE
        fi
        return $RETVAL
}

restart() {
	stop && start
}

RETVAL=0
case "$1" in
  start)
	start
	RETVAL=$?
	;;
  stop)
	stop
	RETVAL=$?
	;;
  restart)
	restart
	RETVAL=$?
	;;
  reload)
	echo "$0 does not support configuration reloading, you have to restart it."
	RETVAL=1
	;;
  status)
	status $PROCESS
	RETVAL=$?
	;;
  *)
	echo $"Usage: $0 {start|stop|restart|reload|status}"
	RETVAL=1
esac

exit $RETVAL

nightview-0.3.1-doc.patch:

--- NEW FILE nightview-0.3.1-doc.patch ---
* Replace a couple of Debian specific paths with Fedora specific (*sigh*)
* Fix DOCTYPE by changing local reference to DTD into global
* Increase quality of PDF documentation by bypassing PostScript, ps2pdf

Lubomir Rintel (Fedora Astronomy) <lkundrak at v3.sk>

diff -up nightview-0.3.1/doc/hack/sample-both.dsl.doc nightview-0.3.1/doc/hack/sample-both.dsl
--- nightview-0.3.1/doc/hack/sample-both.dsl.doc	2003-05-14 18:44:19.000000000 +0200
+++ nightview-0.3.1/doc/hack/sample-both.dsl	2008-11-05 00:06:08.000000000 +0100
@@ -2,11 +2,11 @@
 <!ENTITY % html "IGNORE">
 <![%html;[
 <!ENTITY % print "IGNORE">
-<!ENTITY docbook.dsl SYSTEM "/usr/share/sgml/docbook/stylesheet/dsssl/modular/html/docbook.dsl" CDATA dsssl>
+<!ENTITY docbook.dsl SYSTEM "/usr/share/sgml/docbook/dsssl-stylesheets/html/docbook.dsl" CDATA dsssl>
 ]]>
 <!ENTITY % print "INCLUDE">
 <![%print;[
-<!ENTITY docbook.dsl SYSTEM "/usr/share/sgml/docbook/stylesheet/dsssl/modular/print/docbook.dsl" CDATA dsssl>
+<!ENTITY docbook.dsl SYSTEM "/usr/share/sgml/docbook/dsssl-stylesheets/print/docbook.dsl" CDATA dsssl>
 ]]>
 <!ENTITY htmlmath.dsl SYSTEM "HTMLMath.dsl">
 <!ENTITY texmath.dsl SYSTEM "TeXMath.dsl">
diff -up nightview-0.3.1/doc/Makefile.nightview.doc nightview-0.3.1/doc/Makefile.nightview
--- nightview-0.3.1/doc/Makefile.nightview.doc	2003-09-23 16:41:50.000000000 +0200
+++ nightview-0.3.1/doc/Makefile.nightview	2008-11-05 00:13:32.000000000 +0100
@@ -11,14 +11,14 @@ JADEHTML = 1
 XSLTPROC= xsltproc
 #
 #  XSLT-stylesheet
-HTMLSHIT= /usr/share/sgml/docbook/stylesheet/xsl/nwalsh/html/docbook.xsl
+HTMLSHIT=/usr/share/sgml/docbook/xsl-stylesheets/html/docbook.xsl 
 #
 # DSSSL stylesheet
 DSLSHIT= /usr/lib/sgml/stylesheet/dsssl/docbook/nwalsh/print/docbook.dsl
 DSLSHIT= hack/sample-both.dsl
 #
 # XML declaration
-XMLDEC= /usr/lib/sgml/declaration/xml.decl
+XMLDEC= /usr/share/sgml/docbook/dsssl-stylesheets/dtds/decls/xml.dcl
 #
 JADE=jade    # JADE = [ jade | openjade ]
 #
@@ -38,8 +38,8 @@ nightview.ps: nightview.dvi
 #; rm -f *.dvi *.aux *.log;
 
 # pdf version
-nightview.pdf: nightview.ps
-	ps2pdf nightview.ps nightview.pdf
+nightview.pdf: nightview.dvi
+	dvipdf nightview.dvi nightview.pdf
 
 # pdf version
 #
diff -up nightview-0.3.1/doc/nightview.xml.doc nightview-0.3.1/doc/nightview.xml
--- nightview-0.3.1/doc/nightview.xml.doc	2004-12-24 17:29:37.000000000 +0100
+++ nightview-0.3.1/doc/nightview.xml	2008-11-05 00:06:08.000000000 +0100
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <?xml-stylesheet href="nightview.css" type="text/css"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2CR1//EN" "/usr/share/sgml/docbook/dtd/xml/4.2.cr1/docbookx.dtd" [
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
 <!ENTITY latex "LaTeX">
 <!ENTITY tex "TeX">
 ]>

nightview-0.3.2-fitslib.patch:

--- NEW FILE nightview-0.3.2-fitslib.patch ---
Our convention is to put application-specific headers into a
separate subdirectory.

Lubomir Rintel (Fedora Astronomy) <lkundrak at v3.sk>

diff -up nightview-0.3.2/gtknightview/fits.c.fitslib nightview-0.3.2/gtknightview/fits.c
--- nightview-0.3.2/gtknightview/fits.c.fitslib	2002-07-16 17:08:29.000000000 +0200
+++ nightview-0.3.2/gtknightview/fits.c	2009-01-06 10:40:06.000000000 +0100
@@ -9,7 +9,7 @@
 #include "fitsadd.h"
 #include "gtknightview.h"
 #include "string.h"
-#include <fitsio.h>
+#include <cfitsio/fitsio.h>
 #include <sys/stat.h>
 
 #define FWHM_BOX 5
diff -up nightview-0.3.2/lib/fitsadd.c.fitslib nightview-0.3.2/lib/fitsadd.c
--- nightview-0.3.2/lib/fitsadd.c.fitslib	2003-06-25 15:49:00.000000000 +0200
+++ nightview-0.3.2/lib/fitsadd.c	2009-01-06 10:40:06.000000000 +0100
@@ -1,7 +1,7 @@
 
 #include "fitsadd.h"
 #include <sys/stat.h>
-#include <fitsio.h>
+#include <cfitsio/fitsio.h>
 #include <unistd.h>
 #include <string.h>
 
diff -up nightview-0.3.2/libsbig/ccdfits.c.fitslib nightview-0.3.2/libsbig/ccdfits.c
--- nightview-0.3.2/libsbig/ccdfits.c.fitslib	2007-06-16 13:36:04.000000000 +0200
+++ nightview-0.3.2/libsbig/ccdfits.c	2009-01-06 10:40:06.000000000 +0100
@@ -9,7 +9,7 @@
 #include <stdio.h>
 #include <syslog.h>
 #include <string.h>
-#include <fitsio.h>
+#include <cfitsio/fitsio.h>
 #include "nightview.h"
 #include "ccdtypes.h"
 #include "ccdcommon.h"
diff -up nightview-0.3.2/libsbig/ccdsbig.c.fitslib nightview-0.3.2/libsbig/ccdsbig.c
--- nightview-0.3.2/libsbig/ccdsbig.c.fitslib	2007-05-07 20:36:48.000000000 +0200
+++ nightview-0.3.2/libsbig/ccdsbig.c	2009-01-06 10:40:06.000000000 +0100
@@ -25,7 +25,7 @@
 #include <sys/wait.h>
 #include <signal.h>
 #include <syslog.h>
-#include <fitsio.h>
+#include <cfitsio/fitsio.h>
 #include <sbig.h>
 #include "nightview.h"
 #include "ccdtypes.h"
diff -up nightview-0.3.2/libsbig/systime.c.fitslib nightview-0.3.2/libsbig/systime.c
--- nightview-0.3.2/libsbig/systime.c.fitslib	2007-05-07 20:36:48.000000000 +0200
+++ nightview-0.3.2/libsbig/systime.c	2009-01-06 10:40:06.000000000 +0100
@@ -11,7 +11,7 @@
 #include <time.h>
 #include <sys/time.h>
 #include <syslog.h>
-#include <fitsio.h>
+#include <cfitsio/fitsio.h>
 #include <string.h>
 
 
diff -up nightview-0.3.2/shell/night_pointer.cpp.fitslib nightview-0.3.2/shell/night_pointer.cpp
--- nightview-0.3.2/shell/night_pointer.cpp.fitslib	2008-10-29 23:04:07.000000000 +0100
+++ nightview-0.3.2/shell/night_pointer.cpp	2009-01-06 10:40:06.000000000 +0100
@@ -15,7 +15,7 @@
 #include <cstring>
 #include <iostream>
 #include <stdexcept>
-#include <fitsio.h>
+#include <cfitsio/fitsio.h>
 
 
 using namespace std;
diff -up nightview-0.3.2/xnightview/fits.cpp.fitslib nightview-0.3.2/xnightview/fits.cpp
--- nightview-0.3.2/xnightview/fits.cpp.fitslib	2008-02-13 00:04:24.000000000 +0100
+++ nightview-0.3.2/xnightview/fits.cpp	2009-01-06 10:40:06.000000000 +0100
@@ -10,7 +10,7 @@
 
 #include "xnightview.h"
 #include <math.h>
-#include <fitsio.h>
+#include <cfitsio/fitsio.h>
 
 // For compilers that support precompilation, includes "wx/wx.h".
 #include "wx/wxprec.h"

nightview-0.3.2-initscript.patch:

--- NEW FILE nightview-0.3.2-initscript.patch ---
Most important part of this is not to enable the service by default.

Lubomir Rintel (Fedora Astronomy) <lkundrak at v3.sk>

diff -up nightview-0.3.2/rpm/mount-server.init.redhat.initscript nightview-0.3.2/rpm/mount-server.init.redhat
--- nightview-0.3.2/rpm/mount-server.init.redhat.initscript	2003-06-20 22:05:43.000000000 +0200
+++ nightview-0.3.2/rpm/mount-server.init.redhat	2009-01-06 10:40:06.000000000 +0100
@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# chkconfig: 2345 96 04
+# chkconfig: - 96 04
 # description: mount server
 # processname: telescoped
 # pidfile: /var/run/telescoped.pid
@@ -8,8 +8,16 @@
 #
 # $Id: mount-server.init.redhat,v 1.2 2003-06-20 20:05:43 hroch Exp $
 #
+### BEGIN INIT INFO
+# Provides: telescoped
+# Required-Start: network
+# Required-Stop:
+# Default-Start:
+# Default-Stop: 0 1 2 6
+# Short-Description: Telescope mount server
+# Description: Remote control for telescope from NightView suite
+### END INIT INFO
 
-PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
 
 # source function library
 . /etc/init.d/functions


--- NEW FILE nightview.spec ---
Name:           nightview
Version:        0.3.2
Release:        1%{?dist}
Summary:        A general astronomical software package to control of a CCD camera

Group:          Amusements/Graphics
License:        GPLv2
URL:            http://www.physics.muni.cz/mb/nightview/
Source0:        ftp://integral.physics.muni.cz/pub/nightview/%{name}-%{version}.tar.gz
Source1:        xnightview.desktop
Source2:        xmove.desktop
Source3:        nighthttpd.sysvinit
Patch0:         nightview-0.3.2-fitslib.patch
Patch1:         nightview-0.3.2-initscript.patch
Patch2:         nightview-0.3.1-doc.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  cfitsio-devel
BuildRequires:  wxGTK-devel
BuildRequires:  curl-devel
BuildRequires:  ImageMagick
BuildRequires:  jadetex
BuildRequires:  /usr/bin/dvipdf
BuildRequires:  docbook-style-dsssl
BuildRequires:  docbook-dtd42-xml
BuildRequires:  transfig
BuildRequires:  desktop-file-utils

Requires:       nightview-server = %{version}
Requires:       nightview-cli = %{version}
Requires:       nightview-gui = %{version}
Requires:       nightview-doc = %{version}

%description
Nightview is a general astronomical software package to control of a CCD
camera together with a telescope. It provides an intuitive graphical
interface for getting of individual exposures and a telescope possitioning.
An advanced command line interface is also offered to support of a scripting
and a long time serie imaging.

Nightview is designed as a fully network transparent providing maximum
flexibility of its usage. Moreover, all components are prepared with
possibility to be simply superseded by an user's equivalent for support of
individual improvements and possible requested extendings. 


%package server
Summary:        Server-side tools from NightView suite
Group:          Amusements/Graphics

Requires(post): chkconfig
Requires(preun): chkconfig
Requires(preun): initscripts

%description server
Server tools from NightView suite.
See description of "nightview" package for more details.


%package cli
Summary:        Non-GUI tools from NightView suite
Group:          Amusements/Graphics

%description cli
Text based tools from NightView suite.
See description of "nightview" package for more details.


%package gui
Summary:        GUI tools from NightView suite
Group:          Amusements/Graphics

%description gui
Graphically oriented tools from NightView suite.
See description of "nightview" package for more details.


%package doc
Summary:        Documentation for NightView suite
Group:          Amusements/Graphics

%description doc
Documentation files for NightView suite in PDF, PostScript and HTML.
See description of "nightview" package for more details.


%prep
%setup -q
%patch0 -p1 -b .fitslib
%patch1 -p1 -b .initscript
%patch2 -p1 -b .doc

# Hack around #478680
sed "s,http://www.oasis-open.org/docbook/xml/4.2,$(
        cd /usr/share/sgml
        ls -d docbook/xml-dtd-4.2-* |head -n1
)," -i doc/nightview.xml


%build
# configure.in has a typo, patching it would need regeneration of configure
# Real fix is s/ac_cv_header_curl_h/ac_cv_header_curl_curl_h/
export ac_cv_header_curl_h=yes
# Unfortunately *sad panda* SBIG protocols are not open
%configure --without-sbigudrv --disable-static --with-curl
# configure overrides CFLAGS to a value that does not make much sense
make %{?_smp_mflags} CFLAGS="%{optflags}" CXXFLAGS="%{optflags}"

# Build documentation (not _smp_mflags safe)
make -C doc

# Create Icon Theme Specification compilant icons
convert xnightview/xnightview-icon.xpm xnightview.png
convert xmove/xmove-icon.xpm xmove.png


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

# Directory structure
install -d $RPM_BUILD_ROOT%{_datadir}/pixmaps
install -d $RPM_BUILD_ROOT%{_datadir}/applications
install -d $RPM_BUILD_ROOT%{_docdir}/nightview-doc
install -d $RPM_BUILD_ROOT%{_initrddir}

# Icons and menu entries
install -pm 0644 xnightview.png xmove.png \
        $RPM_BUILD_ROOT%{_datadir}/pixmaps
desktop-file-install --vendor=fedora %{SOURCE1} \
        --dir=$RPM_BUILD_ROOT%{_datadir}/applications
desktop-file-install --vendor=fedora %{SOURCE2} \
        --dir=$RPM_BUILD_ROOT%{_datadir}/applications

# Init scripts
install -pm 0755 rpm/mount-server.init.redhat \
        $RPM_BUILD_ROOT%{_initrddir}/telescoped
install -pm 0755 %{SOURCE3} \
        $RPM_BUILD_ROOT%{_initrddir}/nighthttpd

# Documentation
make -f Makefile.nightview -C doc install DESTDIR=$RPM_BUILD_ROOT


%clean
rm -rf $RPM_BUILD_ROOT


%post server
/sbin/chkconfig --add telescoped
/sbin/chkconfig --add nighthttpd


%preun server
if [ $1 = 0 ]
then
        /sbin/service telescoped stop >/dev/null 2>&1
        /sbin/chkconfig --del telescoped
        /sbin/service nighthttpd stop >/dev/null 2>&1
        /sbin/chkconfig --del nighthttpd
fi


%post cli -p /sbin/ldconfig
%postun cli -p /sbin/ldconfig


%files
%defattr(-,root,root,-)
# Nothing external links against this so far, and this saves us
# from overhead of creating a useless devel package.
%exclude %{_libdir}/libccdnet.so
%exclude %{_libdir}/libccdnet.la
# This seems usless in a package
%exclude %{_sbindir}/nighthttpd_setup.sh
%exclude %{_sbindir}/telescoped_setup.sh
%exclude %{_bindir}/nightview-test
%exclude %{_mandir}/man1/nightview-test.1*
%doc COPYING


%files server
%defattr(-,root,root,-)
%{_initrddir}/nighthttpd
%{_initrddir}/telescoped
%{_sbindir}/nighthttpd
%{_sbindir}/telescoped
%{_mandir}/man8/nighthttpd.8*
%{_mandir}/man8/telescoped.8*
%doc COPYING


%files cli
%defattr(-,root,root,-)
%{_bindir}/night_batch
%{_bindir}/night_control
%{_bindir}/night_dark
%{_bindir}/night_darks
%{_bindir}/night_exposure
%{_bindir}/night_filter
%{_bindir}/night_flats
%{_bindir}/night_keylist
%{_bindir}/night_pointer
%{_bindir}/night_power
%{_bindir}/night_temperature
%{_bindir}/telescope
%{_libdir}/libccdnet.so.0
%{_libdir}/libccdnet.so.0.0.0
%{_mandir}/man1/night_batch.1*
%{_mandir}/man1/night_control.1*
%{_mandir}/man1/night_dark.1*
%{_mandir}/man1/night_darks.1*
%{_mandir}/man1/night_exposure.1*
%{_mandir}/man1/night_filter.1*
%{_mandir}/man1/night_flats.1*
%{_mandir}/man1/night_keylist.1*
%{_mandir}/man1/night_power.1*
%{_mandir}/man1/night_temperature.1*
%{_mandir}/man1/telescope.1*
%doc COPYING


%files gui
%defattr(-,root,root,-)
%{_bindir}/xnightview
%{_bindir}/xmove
%{_mandir}/man1/xmove.1*
%{_mandir}/man1/xnightview.1*
%{_datadir}/pixmaps
%{_datadir}/applications
%doc COPYING


%files doc
%defattr(-,root,root,-)
%dir %{_docdir}/nightview-doc
%{_docdir}/nightview-doc/html
%{_docdir}/nightview-doc/nightview.pdf
%{_docdir}/nightview-doc/nightview.ps
# Do not include sources
%exclude %{_docdir}/nightview-doc/*.fig
%exclude %{_docdir}/nightview-doc/*.eps
%exclude %{_docdir}/nightview-doc/*.jpg
%exclude %{_docdir}/nightview-doc/*.png
%exclude %{_docdir}/nightview-doc/*.css
%exclude %{_docdir}/nightview-doc/*.xml
%doc COPYING


%changelog
* Tue Jan 06 2009 Lubomir Rintel (Fedora Astronomy) <lkundrak at v3.sk> - 0.3.2-3
- Bump to 0.3.2

* Mon Jan 05 2009 Lubomir Rintel (Fedora Astronomy) <lkundrak at v3.sk> - 0.3.1-3
- Work around (#478680)

* Wed Nov 05 2008 Lubomir Rintel (Fedora Astronomy) <lkundrak at v3.sk> - 0.3.1-2
- Fixes for problems found during review by Marek Mahut

* Sun Oct 26 2008 Lubomir Rintel (Fedora Astronomy) <lkundrak at v3.sk> - 0.3.1-1
- Initial packaging attempt


--- NEW FILE xmove.desktop ---
[Desktop Entry]
Encoding=UTF-8
Type=Application
Name=XMove
Comment=Tool for moving a telescope from NightView suite
GenericName=Move Telescope
Exec=xmove %f
Icon=xmove
Categories=Graphics;Education;
Terminal=false


--- NEW FILE xnightview.desktop ---
[Desktop Entry]
Encoding=UTF-8
Type=Application
Name=NightView
Comment=Tool for working with pictures from SBIG cameras
GenericName=NightView
Exec=xnightview %f
Icon=xnightview
Categories=Graphics;Education;
Terminal=false


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/nightview/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	7 Jan 2009 00:11:44 -0000	1.1
+++ .cvsignore	7 Jan 2009 20:52:48 -0000	1.2
@@ -0,0 +1 @@
+nightview-0.3.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nightview/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	7 Jan 2009 00:11:44 -0000	1.1
+++ sources	7 Jan 2009 20:52:48 -0000	1.2
@@ -0,0 +1 @@
+4644a08d2a75ca9ec58ff659519b0a93  nightview-0.3.2.tar.gz



From lkundrak at fedoraproject.org  Wed Jan  7 20:53:19 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Wed,  7 Jan 2009 20:53:19 +0000 (UTC)
Subject: rpms/nightview/F-10 nighthttpd.sysvinit, NONE,
	1.1 nightview-0.3.1-doc.patch, NONE,
	1.1 nightview-0.3.2-fitslib.patch, NONE,
	1.1 nightview-0.3.2-initscript.patch, NONE, 1.1 nightview.spec,
	NONE, 1.1 xmove.desktop, NONE, 1.1 xnightview.desktop, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090107205319.89E2A70100@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/nightview/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12397/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	nighthttpd.sysvinit nightview-0.3.1-doc.patch 
	nightview-0.3.2-fitslib.patch nightview-0.3.2-initscript.patch 
	nightview.spec xmove.desktop xnightview.desktop 
Log Message:
Import nightview


--- NEW FILE nighthttpd.sysvinit ---
#! /bin/bash
#
# nighthttpd: init script for nighthttpd
#
# Author: Lubomir Rintel <lkundrak at v3.sk>
# 
# chkconfig: - 96 04
# description: NightView HTTP daemon
# processname: nighthttpd
# config: /etc/sysconfig/nightview
#
### BEGIN INIT INFO
# Provides: nighthttpd
# Required-Start: network
# Required-Stop:
# Default-Start:
# Default-Stop: 0 1 2 6
# Short-Description: NightView HTTP daemon
# Description: Daemon for remote access to NightView via HTTP protocol
### END INIT INFO

SERVICE=nighthttpd
PROCESS=nighthttpd
DAEMON=/usr/sbin/nighthttpd

# Source function library.
. /etc/init.d/functions

# Source networking configuration.
. /etc/sysconfig/network

# Source service configuration.
[ -f /etc/sysconfig/nightview ] && . /etc/sysconfig/nightview

# Check that networking is up.
[ ${NETWORKING} = "no" ] && exit 0

[ -x $DAEMON ] || exit 1

start() {
        echo -n $"Starting $SERVICE: "
        daemon --user nobody $DAEMON
	echo
        [ $RETVAL = 0 ] && touch /var/lock/subsys/$SERVICE
        return $RETVAL
}

stop() {
        echo -n $"Stopping $SERVICE:"
        killproc $PROCESS
	RETVAL=$?
        echo
        if [ $RETVAL -eq 0 ]; then
        	rm -f /var/lock/subsys/$SERVICE
        fi
        return $RETVAL
}

restart() {
	stop && start
}

RETVAL=0
case "$1" in
  start)
	start
	RETVAL=$?
	;;
  stop)
	stop
	RETVAL=$?
	;;
  restart)
	restart
	RETVAL=$?
	;;
  reload)
	echo "$0 does not support configuration reloading, you have to restart it."
	RETVAL=1
	;;
  status)
	status $PROCESS
	RETVAL=$?
	;;
  *)
	echo $"Usage: $0 {start|stop|restart|reload|status}"
	RETVAL=1
esac

exit $RETVAL

nightview-0.3.1-doc.patch:

--- NEW FILE nightview-0.3.1-doc.patch ---
* Replace a couple of Debian specific paths with Fedora specific (*sigh*)
* Fix DOCTYPE by changing local reference to DTD into global
* Increase quality of PDF documentation by bypassing PostScript, ps2pdf

Lubomir Rintel (Fedora Astronomy) <lkundrak at v3.sk>

diff -up nightview-0.3.1/doc/hack/sample-both.dsl.doc nightview-0.3.1/doc/hack/sample-both.dsl
--- nightview-0.3.1/doc/hack/sample-both.dsl.doc	2003-05-14 18:44:19.000000000 +0200
+++ nightview-0.3.1/doc/hack/sample-both.dsl	2008-11-05 00:06:08.000000000 +0100
@@ -2,11 +2,11 @@
 <!ENTITY % html "IGNORE">
 <![%html;[
 <!ENTITY % print "IGNORE">
-<!ENTITY docbook.dsl SYSTEM "/usr/share/sgml/docbook/stylesheet/dsssl/modular/html/docbook.dsl" CDATA dsssl>
+<!ENTITY docbook.dsl SYSTEM "/usr/share/sgml/docbook/dsssl-stylesheets/html/docbook.dsl" CDATA dsssl>
 ]]>
 <!ENTITY % print "INCLUDE">
 <![%print;[
-<!ENTITY docbook.dsl SYSTEM "/usr/share/sgml/docbook/stylesheet/dsssl/modular/print/docbook.dsl" CDATA dsssl>
+<!ENTITY docbook.dsl SYSTEM "/usr/share/sgml/docbook/dsssl-stylesheets/print/docbook.dsl" CDATA dsssl>
 ]]>
 <!ENTITY htmlmath.dsl SYSTEM "HTMLMath.dsl">
 <!ENTITY texmath.dsl SYSTEM "TeXMath.dsl">
diff -up nightview-0.3.1/doc/Makefile.nightview.doc nightview-0.3.1/doc/Makefile.nightview
--- nightview-0.3.1/doc/Makefile.nightview.doc	2003-09-23 16:41:50.000000000 +0200
+++ nightview-0.3.1/doc/Makefile.nightview	2008-11-05 00:13:32.000000000 +0100
@@ -11,14 +11,14 @@ JADEHTML = 1
 XSLTPROC= xsltproc
 #
 #  XSLT-stylesheet
-HTMLSHIT= /usr/share/sgml/docbook/stylesheet/xsl/nwalsh/html/docbook.xsl
+HTMLSHIT=/usr/share/sgml/docbook/xsl-stylesheets/html/docbook.xsl 
 #
 # DSSSL stylesheet
 DSLSHIT= /usr/lib/sgml/stylesheet/dsssl/docbook/nwalsh/print/docbook.dsl
 DSLSHIT= hack/sample-both.dsl
 #
 # XML declaration
-XMLDEC= /usr/lib/sgml/declaration/xml.decl
+XMLDEC= /usr/share/sgml/docbook/dsssl-stylesheets/dtds/decls/xml.dcl
 #
 JADE=jade    # JADE = [ jade | openjade ]
 #
@@ -38,8 +38,8 @@ nightview.ps: nightview.dvi
 #; rm -f *.dvi *.aux *.log;
 
 # pdf version
-nightview.pdf: nightview.ps
-	ps2pdf nightview.ps nightview.pdf
+nightview.pdf: nightview.dvi
+	dvipdf nightview.dvi nightview.pdf
 
 # pdf version
 #
diff -up nightview-0.3.1/doc/nightview.xml.doc nightview-0.3.1/doc/nightview.xml
--- nightview-0.3.1/doc/nightview.xml.doc	2004-12-24 17:29:37.000000000 +0100
+++ nightview-0.3.1/doc/nightview.xml	2008-11-05 00:06:08.000000000 +0100
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <?xml-stylesheet href="nightview.css" type="text/css"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2CR1//EN" "/usr/share/sgml/docbook/dtd/xml/4.2.cr1/docbookx.dtd" [
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
 <!ENTITY latex "LaTeX">
 <!ENTITY tex "TeX">
 ]>

nightview-0.3.2-fitslib.patch:

--- NEW FILE nightview-0.3.2-fitslib.patch ---
Our convention is to put application-specific headers into a
separate subdirectory.

Lubomir Rintel (Fedora Astronomy) <lkundrak at v3.sk>

diff -up nightview-0.3.2/gtknightview/fits.c.fitslib nightview-0.3.2/gtknightview/fits.c
--- nightview-0.3.2/gtknightview/fits.c.fitslib	2002-07-16 17:08:29.000000000 +0200
+++ nightview-0.3.2/gtknightview/fits.c	2009-01-06 10:40:06.000000000 +0100
@@ -9,7 +9,7 @@
 #include "fitsadd.h"
 #include "gtknightview.h"
 #include "string.h"
-#include <fitsio.h>
+#include <cfitsio/fitsio.h>
 #include <sys/stat.h>
 
 #define FWHM_BOX 5
diff -up nightview-0.3.2/lib/fitsadd.c.fitslib nightview-0.3.2/lib/fitsadd.c
--- nightview-0.3.2/lib/fitsadd.c.fitslib	2003-06-25 15:49:00.000000000 +0200
+++ nightview-0.3.2/lib/fitsadd.c	2009-01-06 10:40:06.000000000 +0100
@@ -1,7 +1,7 @@
 
 #include "fitsadd.h"
 #include <sys/stat.h>
-#include <fitsio.h>
+#include <cfitsio/fitsio.h>
 #include <unistd.h>
 #include <string.h>
 
diff -up nightview-0.3.2/libsbig/ccdfits.c.fitslib nightview-0.3.2/libsbig/ccdfits.c
--- nightview-0.3.2/libsbig/ccdfits.c.fitslib	2007-06-16 13:36:04.000000000 +0200
+++ nightview-0.3.2/libsbig/ccdfits.c	2009-01-06 10:40:06.000000000 +0100
@@ -9,7 +9,7 @@
 #include <stdio.h>
 #include <syslog.h>
 #include <string.h>
-#include <fitsio.h>
+#include <cfitsio/fitsio.h>
 #include "nightview.h"
 #include "ccdtypes.h"
 #include "ccdcommon.h"
diff -up nightview-0.3.2/libsbig/ccdsbig.c.fitslib nightview-0.3.2/libsbig/ccdsbig.c
--- nightview-0.3.2/libsbig/ccdsbig.c.fitslib	2007-05-07 20:36:48.000000000 +0200
+++ nightview-0.3.2/libsbig/ccdsbig.c	2009-01-06 10:40:06.000000000 +0100
@@ -25,7 +25,7 @@
 #include <sys/wait.h>
 #include <signal.h>
 #include <syslog.h>
-#include <fitsio.h>
+#include <cfitsio/fitsio.h>
 #include <sbig.h>
 #include "nightview.h"
 #include "ccdtypes.h"
diff -up nightview-0.3.2/libsbig/systime.c.fitslib nightview-0.3.2/libsbig/systime.c
--- nightview-0.3.2/libsbig/systime.c.fitslib	2007-05-07 20:36:48.000000000 +0200
+++ nightview-0.3.2/libsbig/systime.c	2009-01-06 10:40:06.000000000 +0100
@@ -11,7 +11,7 @@
 #include <time.h>
 #include <sys/time.h>
 #include <syslog.h>
-#include <fitsio.h>
+#include <cfitsio/fitsio.h>
 #include <string.h>
 
 
diff -up nightview-0.3.2/shell/night_pointer.cpp.fitslib nightview-0.3.2/shell/night_pointer.cpp
--- nightview-0.3.2/shell/night_pointer.cpp.fitslib	2008-10-29 23:04:07.000000000 +0100
+++ nightview-0.3.2/shell/night_pointer.cpp	2009-01-06 10:40:06.000000000 +0100
@@ -15,7 +15,7 @@
 #include <cstring>
 #include <iostream>
 #include <stdexcept>
-#include <fitsio.h>
+#include <cfitsio/fitsio.h>
 
 
 using namespace std;
diff -up nightview-0.3.2/xnightview/fits.cpp.fitslib nightview-0.3.2/xnightview/fits.cpp
--- nightview-0.3.2/xnightview/fits.cpp.fitslib	2008-02-13 00:04:24.000000000 +0100
+++ nightview-0.3.2/xnightview/fits.cpp	2009-01-06 10:40:06.000000000 +0100
@@ -10,7 +10,7 @@
 
 #include "xnightview.h"
 #include <math.h>
-#include <fitsio.h>
+#include <cfitsio/fitsio.h>
 
 // For compilers that support precompilation, includes "wx/wx.h".
 #include "wx/wxprec.h"

nightview-0.3.2-initscript.patch:

--- NEW FILE nightview-0.3.2-initscript.patch ---
Most important part of this is not to enable the service by default.

Lubomir Rintel (Fedora Astronomy) <lkundrak at v3.sk>

diff -up nightview-0.3.2/rpm/mount-server.init.redhat.initscript nightview-0.3.2/rpm/mount-server.init.redhat
--- nightview-0.3.2/rpm/mount-server.init.redhat.initscript	2003-06-20 22:05:43.000000000 +0200
+++ nightview-0.3.2/rpm/mount-server.init.redhat	2009-01-06 10:40:06.000000000 +0100
@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# chkconfig: 2345 96 04
+# chkconfig: - 96 04
 # description: mount server
 # processname: telescoped
 # pidfile: /var/run/telescoped.pid
@@ -8,8 +8,16 @@
 #
 # $Id: mount-server.init.redhat,v 1.2 2003-06-20 20:05:43 hroch Exp $
 #
+### BEGIN INIT INFO
+# Provides: telescoped
+# Required-Start: network
+# Required-Stop:
+# Default-Start:
+# Default-Stop: 0 1 2 6
+# Short-Description: Telescope mount server
+# Description: Remote control for telescope from NightView suite
+### END INIT INFO
 
-PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
 
 # source function library
 . /etc/init.d/functions


--- NEW FILE nightview.spec ---
Name:           nightview
Version:        0.3.2
Release:        1%{?dist}
Summary:        A general astronomical software package to control of a CCD camera

Group:          Amusements/Graphics
License:        GPLv2
URL:            http://www.physics.muni.cz/mb/nightview/
Source0:        ftp://integral.physics.muni.cz/pub/nightview/%{name}-%{version}.tar.gz
Source1:        xnightview.desktop
Source2:        xmove.desktop
Source3:        nighthttpd.sysvinit
Patch0:         nightview-0.3.2-fitslib.patch
Patch1:         nightview-0.3.2-initscript.patch
Patch2:         nightview-0.3.1-doc.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  cfitsio-devel
BuildRequires:  wxGTK-devel
BuildRequires:  curl-devel
BuildRequires:  ImageMagick
BuildRequires:  jadetex
BuildRequires:  /usr/bin/dvipdf
BuildRequires:  docbook-style-dsssl
BuildRequires:  docbook-dtd42-xml
BuildRequires:  transfig
BuildRequires:  desktop-file-utils

Requires:       nightview-server = %{version}
Requires:       nightview-cli = %{version}
Requires:       nightview-gui = %{version}
Requires:       nightview-doc = %{version}

%description
Nightview is a general astronomical software package to control of a CCD
camera together with a telescope. It provides an intuitive graphical
interface for getting of individual exposures and a telescope possitioning.
An advanced command line interface is also offered to support of a scripting
and a long time serie imaging.

Nightview is designed as a fully network transparent providing maximum
flexibility of its usage. Moreover, all components are prepared with
possibility to be simply superseded by an user's equivalent for support of
individual improvements and possible requested extendings. 


%package server
Summary:        Server-side tools from NightView suite
Group:          Amusements/Graphics

Requires(post): chkconfig
Requires(preun): chkconfig
Requires(preun): initscripts

%description server
Server tools from NightView suite.
See description of "nightview" package for more details.


%package cli
Summary:        Non-GUI tools from NightView suite
Group:          Amusements/Graphics

%description cli
Text based tools from NightView suite.
See description of "nightview" package for more details.


%package gui
Summary:        GUI tools from NightView suite
Group:          Amusements/Graphics

%description gui
Graphically oriented tools from NightView suite.
See description of "nightview" package for more details.


%package doc
Summary:        Documentation for NightView suite
Group:          Amusements/Graphics

%description doc
Documentation files for NightView suite in PDF, PostScript and HTML.
See description of "nightview" package for more details.


%prep
%setup -q
%patch0 -p1 -b .fitslib
%patch1 -p1 -b .initscript
%patch2 -p1 -b .doc

# Hack around #478680
sed "s,http://www.oasis-open.org/docbook/xml/4.2,$(
        cd /usr/share/sgml
        ls -d docbook/xml-dtd-4.2-* |head -n1
)," -i doc/nightview.xml


%build
# configure.in has a typo, patching it would need regeneration of configure
# Real fix is s/ac_cv_header_curl_h/ac_cv_header_curl_curl_h/
export ac_cv_header_curl_h=yes
# Unfortunately *sad panda* SBIG protocols are not open
%configure --without-sbigudrv --disable-static --with-curl
# configure overrides CFLAGS to a value that does not make much sense
make %{?_smp_mflags} CFLAGS="%{optflags}" CXXFLAGS="%{optflags}"

# Build documentation (not _smp_mflags safe)
make -C doc

# Create Icon Theme Specification compilant icons
convert xnightview/xnightview-icon.xpm xnightview.png
convert xmove/xmove-icon.xpm xmove.png


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

# Directory structure
install -d $RPM_BUILD_ROOT%{_datadir}/pixmaps
install -d $RPM_BUILD_ROOT%{_datadir}/applications
install -d $RPM_BUILD_ROOT%{_docdir}/nightview-doc
install -d $RPM_BUILD_ROOT%{_initrddir}

# Icons and menu entries
install -pm 0644 xnightview.png xmove.png \
        $RPM_BUILD_ROOT%{_datadir}/pixmaps
desktop-file-install --vendor=fedora %{SOURCE1} \
        --dir=$RPM_BUILD_ROOT%{_datadir}/applications
desktop-file-install --vendor=fedora %{SOURCE2} \
        --dir=$RPM_BUILD_ROOT%{_datadir}/applications

# Init scripts
install -pm 0755 rpm/mount-server.init.redhat \
        $RPM_BUILD_ROOT%{_initrddir}/telescoped
install -pm 0755 %{SOURCE3} \
        $RPM_BUILD_ROOT%{_initrddir}/nighthttpd

# Documentation
make -f Makefile.nightview -C doc install DESTDIR=$RPM_BUILD_ROOT


%clean
rm -rf $RPM_BUILD_ROOT


%post server
/sbin/chkconfig --add telescoped
/sbin/chkconfig --add nighthttpd


%preun server
if [ $1 = 0 ]
then
        /sbin/service telescoped stop >/dev/null 2>&1
        /sbin/chkconfig --del telescoped
        /sbin/service nighthttpd stop >/dev/null 2>&1
        /sbin/chkconfig --del nighthttpd
fi


%post cli -p /sbin/ldconfig
%postun cli -p /sbin/ldconfig


%files
%defattr(-,root,root,-)
# Nothing external links against this so far, and this saves us
# from overhead of creating a useless devel package.
%exclude %{_libdir}/libccdnet.so
%exclude %{_libdir}/libccdnet.la
# This seems usless in a package
%exclude %{_sbindir}/nighthttpd_setup.sh
%exclude %{_sbindir}/telescoped_setup.sh
%exclude %{_bindir}/nightview-test
%exclude %{_mandir}/man1/nightview-test.1*
%doc COPYING


%files server
%defattr(-,root,root,-)
%{_initrddir}/nighthttpd
%{_initrddir}/telescoped
%{_sbindir}/nighthttpd
%{_sbindir}/telescoped
%{_mandir}/man8/nighthttpd.8*
%{_mandir}/man8/telescoped.8*
%doc COPYING


%files cli
%defattr(-,root,root,-)
%{_bindir}/night_batch
%{_bindir}/night_control
%{_bindir}/night_dark
%{_bindir}/night_darks
%{_bindir}/night_exposure
%{_bindir}/night_filter
%{_bindir}/night_flats
%{_bindir}/night_keylist
%{_bindir}/night_pointer
%{_bindir}/night_power
%{_bindir}/night_temperature
%{_bindir}/telescope
%{_libdir}/libccdnet.so.0
%{_libdir}/libccdnet.so.0.0.0
%{_mandir}/man1/night_batch.1*
%{_mandir}/man1/night_control.1*
%{_mandir}/man1/night_dark.1*
%{_mandir}/man1/night_darks.1*
%{_mandir}/man1/night_exposure.1*
%{_mandir}/man1/night_filter.1*
%{_mandir}/man1/night_flats.1*
%{_mandir}/man1/night_keylist.1*
%{_mandir}/man1/night_power.1*
%{_mandir}/man1/night_temperature.1*
%{_mandir}/man1/telescope.1*
%doc COPYING


%files gui
%defattr(-,root,root,-)
%{_bindir}/xnightview
%{_bindir}/xmove
%{_mandir}/man1/xmove.1*
%{_mandir}/man1/xnightview.1*
%{_datadir}/pixmaps
%{_datadir}/applications
%doc COPYING


%files doc
%defattr(-,root,root,-)
%dir %{_docdir}/nightview-doc
%{_docdir}/nightview-doc/html
%{_docdir}/nightview-doc/nightview.pdf
%{_docdir}/nightview-doc/nightview.ps
# Do not include sources
%exclude %{_docdir}/nightview-doc/*.fig
%exclude %{_docdir}/nightview-doc/*.eps
%exclude %{_docdir}/nightview-doc/*.jpg
%exclude %{_docdir}/nightview-doc/*.png
%exclude %{_docdir}/nightview-doc/*.css
%exclude %{_docdir}/nightview-doc/*.xml
%doc COPYING


%changelog
* Tue Jan 06 2009 Lubomir Rintel (Fedora Astronomy) <lkundrak at v3.sk> - 0.3.2-3
- Bump to 0.3.2

* Mon Jan 05 2009 Lubomir Rintel (Fedora Astronomy) <lkundrak at v3.sk> - 0.3.1-3
- Work around (#478680)

* Wed Nov 05 2008 Lubomir Rintel (Fedora Astronomy) <lkundrak at v3.sk> - 0.3.1-2
- Fixes for problems found during review by Marek Mahut

* Sun Oct 26 2008 Lubomir Rintel (Fedora Astronomy) <lkundrak at v3.sk> - 0.3.1-1
- Initial packaging attempt


--- NEW FILE xmove.desktop ---
[Desktop Entry]
Encoding=UTF-8
Type=Application
Name=XMove
Comment=Tool for moving a telescope from NightView suite
GenericName=Move Telescope
Exec=xmove %f
Icon=xmove
Categories=Graphics;Education;
Terminal=false


--- NEW FILE xnightview.desktop ---
[Desktop Entry]
Encoding=UTF-8
Type=Application
Name=NightView
Comment=Tool for working with pictures from SBIG cameras
GenericName=NightView
Exec=xnightview %f
Icon=xnightview
Categories=Graphics;Education;
Terminal=false


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/nightview/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	7 Jan 2009 00:11:44 -0000	1.1
+++ .cvsignore	7 Jan 2009 20:52:49 -0000	1.2
@@ -0,0 +1 @@
+nightview-0.3.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nightview/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	7 Jan 2009 00:11:44 -0000	1.1
+++ sources	7 Jan 2009 20:52:49 -0000	1.2
@@ -0,0 +1 @@
+4644a08d2a75ca9ec58ff659519b0a93  nightview-0.3.2.tar.gz



From rdieter at fedoraproject.org  Wed Jan  7 21:03:59 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed,  7 Jan 2009 21:03:59 +0000 (UTC)
Subject: rpms/xine-lib/devel xine-lib.spec,1.53,1.54
Message-ID: <20090107210359.0A83F7013F@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/xine-lib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14392/devel

Modified Files:
	xine-lib.spec 
Log Message:
ugh, looks like caca support needs libcaca-devel >= 0.99-0.5.beta16



Index: xine-lib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xine-lib/devel/xine-lib.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- xine-lib.spec	7 Jan 2009 20:08:32 -0000	1.53
+++ xine-lib.spec	7 Jan 2009 21:03:28 -0000	1.54
@@ -68,7 +68,7 @@
 BuildRequires:  aalib-devel >= 1.4
 %endif # aalib
 %if %{with_caca}
-BuildRequires:  libcaca-devel >= 0.99
+BuildRequires:  libcaca-devel >= 0.99-0.5.beta16 
 %endif # caca
 %if 0%{!?_without_directfb:1}
 BuildRequires:  directfb-devel



From rdieter at fedoraproject.org  Wed Jan  7 21:03:59 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed,  7 Jan 2009 21:03:59 +0000 (UTC)
Subject: rpms/xine-lib/F-9 xine-lib.spec,1.45,1.46
Message-ID: <20090107210359.2D9AB70142@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/xine-lib/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14392/F-9

Modified Files:
	xine-lib.spec 
Log Message:
ugh, looks like caca support needs libcaca-devel >= 0.99-0.5.beta16



Index: xine-lib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xine-lib/F-9/xine-lib.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- xine-lib.spec	7 Jan 2009 20:32:58 -0000	1.45
+++ xine-lib.spec	7 Jan 2009 21:03:28 -0000	1.46
@@ -68,7 +68,7 @@
 BuildRequires:  aalib-devel >= 1.4
 %endif # aalib
 %if %{with_caca}
-BuildRequires:  libcaca-devel >= 0.99
+BuildRequires:  libcaca-devel >= 0.99-0.5.beta16 
 %endif # caca
 %if 0%{!?_without_directfb:1}
 BuildRequires:  directfb-devel



From rdieter at fedoraproject.org  Wed Jan  7 21:03:59 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed,  7 Jan 2009 21:03:59 +0000 (UTC)
Subject: rpms/xine-lib/F-8 xine-lib.spec,1.40,1.41
Message-ID: <20090107210359.A40147013F@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/xine-lib/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14392/F-8

Modified Files:
	xine-lib.spec 
Log Message:
ugh, looks like caca support needs libcaca-devel >= 0.99-0.5.beta16



Index: xine-lib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xine-lib/F-8/xine-lib.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- xine-lib.spec	7 Jan 2009 20:37:43 -0000	1.40
+++ xine-lib.spec	7 Jan 2009 21:03:29 -0000	1.41
@@ -68,7 +68,7 @@
 BuildRequires:  aalib-devel >= 1.4
 %endif # aalib
 %if %{with_caca}
-BuildRequires:  libcaca-devel >= 0.99
+BuildRequires:  libcaca-devel >= 0.99-0.5.beta16 
 %endif # caca
 %if 0%{!?_without_directfb:1}
 BuildRequires:  directfb-devel



From rdieter at fedoraproject.org  Wed Jan  7 21:03:59 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed,  7 Jan 2009 21:03:59 +0000 (UTC)
Subject: rpms/xine-lib/F-10 xine-lib.spec,1.50,1.51
Message-ID: <20090107210359.66DD77013F@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/xine-lib/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14392/F-10

Modified Files:
	xine-lib.spec 
Log Message:
ugh, looks like caca support needs libcaca-devel >= 0.99-0.5.beta16



Index: xine-lib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xine-lib/F-10/xine-lib.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- xine-lib.spec	7 Jan 2009 20:22:35 -0000	1.50
+++ xine-lib.spec	7 Jan 2009 21:03:29 -0000	1.51
@@ -68,7 +68,7 @@
 BuildRequires:  aalib-devel >= 1.4
 %endif # aalib
 %if %{with_caca}
-BuildRequires:  libcaca-devel >= 0.99
+BuildRequires:  libcaca-devel >= 0.99-0.5.beta16 
 %endif # caca
 %if 0%{!?_without_directfb:1}
 BuildRequires:  directfb-devel



From dwayne at fedoraproject.org  Wed Jan  7 21:05:16 2009
From: dwayne at fedoraproject.org (Dwayne Bailey)
Date: Wed,  7 Jan 2009 21:05:16 +0000 (UTC)
Subject: comps comps-f11.xml.in,1.51,1.52
Message-ID: <20090107210516.1DEC370100@cvs1.fedora.phx.redhat.com>

Author: dwayne

Update of /cvs/pkgs/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15174

Modified Files:
	comps-f11.xml.in 
Log Message:
Remove trailing whitespace



Index: comps-f11.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f11.xml.in,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- comps-f11.xml.in	7 Jan 2009 20:32:05 -0000	1.51
+++ comps-f11.xml.in	7 Jan 2009 21:04:45 -0000	1.52
@@ -5136,7 +5136,7 @@
       <packagereq type="optional">xfce4-notes-plugin</packagereq>
       <packagereq type="optional">xfce4-places-plugin</packagereq>
       <packagereq type="optional">xfce4-quicklauncher-plugin</packagereq>
-      <packagereq type="optional">xfce4-screenshooter</packagereq>	  
+      <packagereq type="optional">xfce4-screenshooter</packagereq>
       <packagereq type="optional">xfce4-screenshooter-plugin</packagereq>
       <packagereq type="optional">xfce4-sensors-plugin</packagereq>
       <packagereq type="optional">xfce4-smartbookmark-plugin</packagereq>



From than at fedoraproject.org  Wed Jan  7 21:06:23 2009
From: than at fedoraproject.org (Than Ngo)
Date: Wed,  7 Jan 2009 21:06:23 +0000 (UTC)
Subject: rpms/kde-l10n/devel .cvsignore, 1.16, 1.17 kde-l10n.spec, 1.54,
	1.55 sources, 1.17, 1.18
Message-ID: <20090107210623.04CEF70100@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kde-l10n/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15596

Modified Files:
	.cvsignore kde-l10n.spec sources 
Log Message:
4.2rc1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kde-l10n/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore	12 Dec 2008 14:30:30 -0000	1.16
+++ .cvsignore	7 Jan 2009 21:05:52 -0000	1.17
@@ -139,3 +139,50 @@
 kde-l10n-wa-4.1.85.tar.bz2
 kde-l10n-zh_CN-4.1.85.tar.bz2
 kde-l10n-zh_TW-4.1.85.tar.bz2
+kde-l10n-bg-4.1.96.tar.bz2
+kde-l10n-ca-4.1.96.tar.bz2
+kde-l10n-cs-4.1.96.tar.bz2
+kde-l10n-csb-4.1.96.tar.bz2
+kde-l10n-da-4.1.96.tar.bz2
+kde-l10n-de-4.1.96.tar.bz2
+kde-l10n-el-4.1.96.tar.bz2
+kde-l10n-en_GB-4.1.96.tar.bz2
+kde-l10n-eo-4.1.96.tar.bz2
+kde-l10n-es-4.1.96.tar.bz2
+kde-l10n-et-4.1.96.tar.bz2
+kde-l10n-fi-4.1.96.tar.bz2
+kde-l10n-fr-4.1.96.tar.bz2
+kde-l10n-fy-4.1.96.tar.bz2
+kde-l10n-ga-4.1.96.tar.bz2
+kde-l10n-gl-4.1.96.tar.bz2
+kde-l10n-hi-4.1.96.tar.bz2
+kde-l10n-hu-4.1.96.tar.bz2
+kde-l10n-it-4.1.96.tar.bz2
+kde-l10n-ja-4.1.96.tar.bz2
+kde-l10n-kk-4.1.96.tar.bz2
+kde-l10n-km-4.1.96.tar.bz2
+kde-l10n-ko-4.1.96.tar.bz2
+kde-l10n-ku-4.1.96.tar.bz2
+kde-l10n-lt-4.1.96.tar.bz2
+kde-l10n-lv-4.1.96.tar.bz2
+kde-l10n-mk-4.1.96.tar.bz2
+kde-l10n-ml-4.1.96.tar.bz2
+kde-l10n-nb-4.1.96.tar.bz2
+kde-l10n-nds-4.1.96.tar.bz2
+kde-l10n-nl-4.1.96.tar.bz2
+kde-l10n-nn-4.1.96.tar.bz2
+kde-l10n-pa-4.1.96.tar.bz2
+kde-l10n-pl-4.1.96.tar.bz2
+kde-l10n-pt-4.1.96.tar.bz2
+kde-l10n-pt_BR-4.1.96.tar.bz2
+kde-l10n-ru-4.1.96.tar.bz2
+kde-l10n-sl-4.1.96.tar.bz2
+kde-l10n-sr-4.1.96.tar.bz2
+kde-l10n-sv-4.1.96.tar.bz2
+kde-l10n-ta-4.1.96.tar.bz2
+kde-l10n-th-4.1.96.tar.bz2
+kde-l10n-tr-4.1.96.tar.bz2
+kde-l10n-uk-4.1.96.tar.bz2
+kde-l10n-wa-4.1.96.tar.bz2
+kde-l10n-zh_CN-4.1.96.tar.bz2
+kde-l10n-zh_TW-4.1.96.tar.bz2


Index: kde-l10n.spec
===================================================================
RCS file: /cvs/extras/rpms/kde-l10n/devel/kde-l10n.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- kde-l10n.spec	17 Dec 2008 03:55:49 -0000	1.54
+++ kde-l10n.spec	7 Jan 2009 21:05:52 -0000	1.55
@@ -1,7 +1,7 @@
 %define buildall 0
 
 Name: kde-l10n
-Version: 4.1.85
+Version: 4.1.96
 Release: 1%{dist}
 Url: http://www.kde.org
 Summary: Internationalization support for KDE
@@ -1309,6 +1309,9 @@
 %lang(zh_TW) %{_kde4_docdir}/HTML/zh_TW
 
 %changelog
+* Wed Jan 07 2009 Than Ngo <than at redhat.com> - 4.1.96-1
+- 4.2rc1
+
 * Fri Dec 12 2008 Than Ngo <than at redhat.com> - 4.1.85-1
 - 4.2beta2
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kde-l10n/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources	12 Dec 2008 14:30:30 -0000	1.17
+++ sources	7 Jan 2009 21:05:52 -0000	1.18
@@ -1,47 +1,47 @@
-30288e016b9a7cf95ba1c17520c7091a  kde-l10n-bg-4.1.85.tar.bz2
-8ecbf56b4f5ef7fb464e4cbb69d0decc  kde-l10n-ca-4.1.85.tar.bz2
-5010ec9749d73f89a355cdc31f1b5bb9  kde-l10n-cs-4.1.85.tar.bz2
-db52741f2ce70f243d9f88e53e8dd16d  kde-l10n-csb-4.1.85.tar.bz2
-81464c91f9541b9c10492eaf8fc9bea7  kde-l10n-da-4.1.85.tar.bz2
-3f148e613c57e7f63e605a97f790ce66  kde-l10n-de-4.1.85.tar.bz2
-58d3f7bcd6d0115b8c78ffb3c9ad1045  kde-l10n-el-4.1.85.tar.bz2
-b6d00e1666cb9206bf020ba2d651502f  kde-l10n-en_GB-4.1.85.tar.bz2
-dd0f2ce45d26b0ab1fac42ea58d304d9  kde-l10n-eo-4.1.85.tar.bz2
-2170723cc79612ab3f71441591e89b8c  kde-l10n-es-4.1.85.tar.bz2
-1fe01a03da283e0dca0b646428874dba  kde-l10n-et-4.1.85.tar.bz2
-820456241ac39aab9c1942ec1d174ee9  kde-l10n-fi-4.1.85.tar.bz2
-15e69250431a4a6ecd86bd9cb6829fec  kde-l10n-fr-4.1.85.tar.bz2
-1bc0333fbbf50957e975c339e09b60d1  kde-l10n-fy-4.1.85.tar.bz2
-edba2129cd25640cae50949057dd0eaa  kde-l10n-ga-4.1.85.tar.bz2
-5a160f295c92b641f6aa2de631f02bd5  kde-l10n-gl-4.1.85.tar.bz2
-459f4dad25ab5e00a057a769424d2ff3  kde-l10n-hi-4.1.85.tar.bz2
-e1b3189930b1e1782feea68f3dcdffb1  kde-l10n-hu-4.1.85.tar.bz2
-4f4b48f12e4e133c85d75009b9262c47  kde-l10n-it-4.1.85.tar.bz2
-00ce8151a310d93150a36590c1cc57ca  kde-l10n-ja-4.1.85.tar.bz2
-8e18dbe6df45f9b5186f44119afdf47b  kde-l10n-kk-4.1.85.tar.bz2
-8066cfb496a7308b39f9b2fd34294351  kde-l10n-km-4.1.85.tar.bz2
-529f487af3eb5b30f6a6cf22bcb4c895  kde-l10n-ko-4.1.85.tar.bz2
-9a27255c4b8486d4ee9f58d77ce1779d  kde-l10n-ku-4.1.85.tar.bz2
-45f9e140ce36a2165a2a05bf181441ba  kde-l10n-lt-4.1.85.tar.bz2
-97155ac423ac3b69501db76a76f57208  kde-l10n-lv-4.1.85.tar.bz2
-ee175d6790887f585e3e284179eb6c5b  kde-l10n-mk-4.1.85.tar.bz2
-13aefdaca19a007c9ac13d5f9bc1f3d9  kde-l10n-ml-4.1.85.tar.bz2
-af3c7eb995d7a881b8036a06100702df  kde-l10n-nb-4.1.85.tar.bz2
-bca6044d2e6975072dd5c118dc34c05e  kde-l10n-nds-4.1.85.tar.bz2
-bf37b3bfc85c0d53a97d7494d76e5512  kde-l10n-nl-4.1.85.tar.bz2
-494cdfbf2545dc2e18c45bec5fed3ad3  kde-l10n-nn-4.1.85.tar.bz2
-85fcfe6180fad24b8f274fbbe745023f  kde-l10n-pa-4.1.85.tar.bz2
-ea6c99eb5a5327e1d1a9bd65d12a1654  kde-l10n-pl-4.1.85.tar.bz2
-46980b9101141f8e801791d3ef42dd45  kde-l10n-pt-4.1.85.tar.bz2
-70e0be91dbb0795c6ed13ec3749f2e3c  kde-l10n-pt_BR-4.1.85.tar.bz2
-b9794915ecb46dbeb563efc502dc4ce8  kde-l10n-ru-4.1.85.tar.bz2
-5e27ac8d295505c024935784b5aca2b5  kde-l10n-sl-4.1.85.tar.bz2
-14e0b1b3cdaad01e425c1a7351f24183  kde-l10n-sr-4.1.85.tar.bz2
-9c125748180cb4be4ab34ca4fe70c90f  kde-l10n-sv-4.1.85.tar.bz2
-64958f660c55ffaac051f9d5cc965b85  kde-l10n-ta-4.1.85.tar.bz2
-2be08a25b86497aa6fcfb239e8b184f8  kde-l10n-th-4.1.85.tar.bz2
-5d0bc9cb697ab3272161356f87a2e442  kde-l10n-tr-4.1.85.tar.bz2
-bc9e575f20c4876e2bd26f5b2d536bd5  kde-l10n-uk-4.1.85.tar.bz2
-d68beea25bf418402e04d484fc7a91cd  kde-l10n-wa-4.1.85.tar.bz2
-e5cc5c82937c3323155408820aac7222  kde-l10n-zh_CN-4.1.85.tar.bz2
-ca5d127e59ee976adc712ec9cf2149d8  kde-l10n-zh_TW-4.1.85.tar.bz2
+62095495040db4df27ba910e4baf1654  kde-l10n-bg-4.1.96.tar.bz2
+23e9a8fc183373884bac7f723ee0fac2  kde-l10n-ca-4.1.96.tar.bz2
+b12eb1339de5ee9a8a4306d4f78263de  kde-l10n-cs-4.1.96.tar.bz2
+af896b1c81041b40a5b192f6f8843bd0  kde-l10n-csb-4.1.96.tar.bz2
+32dc82514e6583d97541cb43d6cb1e20  kde-l10n-da-4.1.96.tar.bz2
+69928e97897eb9cea1f8304484075b77  kde-l10n-de-4.1.96.tar.bz2
+7d3d8e145046aa433f418a81b6e7095d  kde-l10n-el-4.1.96.tar.bz2
+d29e0ebd2b94044db2572f55efc14c56  kde-l10n-en_GB-4.1.96.tar.bz2
+59f6247d771d39abc48ec803cc0a1cfa  kde-l10n-eo-4.1.96.tar.bz2
+8c6e2507c6853809cac9aa66d3eb087f  kde-l10n-es-4.1.96.tar.bz2
+8fc95ce4d7b80927062557479d6abc24  kde-l10n-et-4.1.96.tar.bz2
+e3ef31668dd60dbd39646d55c4a34614  kde-l10n-fi-4.1.96.tar.bz2
+e48e82644ebbfe56becbd35ed21e7777  kde-l10n-fr-4.1.96.tar.bz2
+e5046259747f18c9d017f3606eda444c  kde-l10n-fy-4.1.96.tar.bz2
+f875d7f5f1d3efa984cd56eff0235784  kde-l10n-ga-4.1.96.tar.bz2
+c122bebcd1bd5ed799e3856f3a4f0cdd  kde-l10n-gl-4.1.96.tar.bz2
+4e143bc481106e01d38b396e5df44416  kde-l10n-hi-4.1.96.tar.bz2
+b153b9ba4bcfd29f55fb648acbb9e759  kde-l10n-hu-4.1.96.tar.bz2
+a26a6e3ecdbbde48aecbcffba1399cf5  kde-l10n-it-4.1.96.tar.bz2
+386aecfdbf000a507a5c0430d8906c33  kde-l10n-ja-4.1.96.tar.bz2
+c14fcfe7b1874160e8c526305a5f55d6  kde-l10n-kk-4.1.96.tar.bz2
+f8dc5ce78e5c2d1a44e60bce84279f38  kde-l10n-km-4.1.96.tar.bz2
+50d5d0c2fb064a8787f285eb7ba279b0  kde-l10n-ko-4.1.96.tar.bz2
+2ede6e6fa858bf12266244f3cdfbed0c  kde-l10n-ku-4.1.96.tar.bz2
+1b179c6f33c3ae5c18382f131d9608f9  kde-l10n-lt-4.1.96.tar.bz2
+a206b118c13b57818a76b1a3b5714916  kde-l10n-lv-4.1.96.tar.bz2
+79d31732e541070392c169c249780efd  kde-l10n-mk-4.1.96.tar.bz2
+d14930ca1f29cc9a8d60f848d32b2e5b  kde-l10n-ml-4.1.96.tar.bz2
+fb6d8dd2e74e9e0862fe2b693d522a57  kde-l10n-nb-4.1.96.tar.bz2
+39d9ac7aa022b0df2cecd9eea76cdfe4  kde-l10n-nds-4.1.96.tar.bz2
+40fa9ae5d2989291b2d1460b1598d6da  kde-l10n-nl-4.1.96.tar.bz2
+f182724525952817b5f11152d9085c94  kde-l10n-nn-4.1.96.tar.bz2
+bf879ef593a49729d8e743f2791d5df4  kde-l10n-pa-4.1.96.tar.bz2
+3fd8eb6aa9fdef775ea435e64bd9d310  kde-l10n-pl-4.1.96.tar.bz2
+81a45e66e12b5b3aaacae7c21498f834  kde-l10n-pt-4.1.96.tar.bz2
+bec1cf6f3d8870c16fe495c52a83587f  kde-l10n-pt_BR-4.1.96.tar.bz2
+b677e7bc523aa6fd75ed39dff1bcae9a  kde-l10n-ru-4.1.96.tar.bz2
+bbfb5135bf89a52765294414b51ce772  kde-l10n-sl-4.1.96.tar.bz2
+59aa3d00f5b26c2067a6f82e48f0fc78  kde-l10n-sr-4.1.96.tar.bz2
+46d4d350e862184b2ac8dd5b0ad8d815  kde-l10n-sv-4.1.96.tar.bz2
+586ccb6fa1f2ef63aa1823c57201feb1  kde-l10n-ta-4.1.96.tar.bz2
+fdf666417ed2c529cb0e3a4eb495b524  kde-l10n-th-4.1.96.tar.bz2
+0a5a3c13a01635e9060b238036f5a851  kde-l10n-tr-4.1.96.tar.bz2
+d3f1d1090c98eba59367451ee8fec601  kde-l10n-uk-4.1.96.tar.bz2
+ec57fe2c312e23c7226094ead62a24b8  kde-l10n-wa-4.1.96.tar.bz2
+33579ad111bd05d5eb4620c7eae22462  kde-l10n-zh_CN-4.1.96.tar.bz2
+61a0356a4dc25f9d388bc6696ac787c8  kde-l10n-zh_TW-4.1.96.tar.bz2



From rdieter at fedoraproject.org  Wed Jan  7 21:17:43 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed,  7 Jan 2009 21:17:43 +0000 (UTC)
Subject: rpms/xine-lib/F-9 xine-lib.spec,1.46,1.47
Message-ID: <20090107211743.7309E70100@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/xine-lib/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16837/F-9

Modified Files:
	xine-lib.spec 
Log Message:
enable caca for f10+ only



Index: xine-lib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xine-lib/F-9/xine-lib.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- xine-lib.spec	7 Jan 2009 21:03:28 -0000	1.46
+++ xine-lib.spec	7 Jan 2009 21:17:13 -0000	1.47
@@ -13,14 +13,16 @@
     %define     have_vidix  0
 %endif # ix86
 
+%if 0%{?fedora} > 9
+%define _with_caca --with-caca 
+%endif
+
 %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
@@ -67,7 +69,7 @@
 %if %{with_aalib}
 BuildRequires:  aalib-devel >= 1.4
 %endif # aalib
-%if %{with_caca}
+%if 0%{?_with_caca:1}
 BuildRequires:  libcaca-devel >= 0.99-0.5.beta16 
 %endif # caca
 %if 0%{!?_without_directfb:1}
@@ -168,7 +170,7 @@
 %if %{with_aalib}
   - AA-lib
 %endif # aalib
-%if %{with_caca}
+%if 0%{?with_caca:1}
   - Libcaca
 %endif # caca
 %if 0%{!?_without_imagemagick:1}
@@ -225,6 +227,7 @@
 %if 0%{?_without_imagemagick:1}
     --without-imagemagick \
 %endif # imagemagick
+    %{?_with_caca} %{!?_with_caca:--without-caca} \
     %{!?_without_arts:--with-arts} %{?_without_arts} \
     --with-wavpack \
     --with-real-codecs-path=%{codecdir} \
@@ -398,7 +401,7 @@
 %if %{with_aalib}
 %{_libdir}/xine/plugins/%{abiver}/xineplug_vo_out_aa.so
 %endif # aalib
-%if %{with_caca}
+%if 0%{?_with_caca}
 %{_libdir}/xine/plugins/%{abiver}/xineplug_vo_out_caca.so
 %endif # caca
 %if 0%{!?_without_directfb:1}



From rdieter at fedoraproject.org  Wed Jan  7 21:17:43 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed,  7 Jan 2009 21:17:43 +0000 (UTC)
Subject: rpms/xine-lib/F-8 xine-lib.spec,1.41,1.42
Message-ID: <20090107211743.BA6EC70100@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/xine-lib/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16837/F-8

Modified Files:
	xine-lib.spec 
Log Message:
enable caca for f10+ only



Index: xine-lib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xine-lib/F-8/xine-lib.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- xine-lib.spec	7 Jan 2009 21:03:29 -0000	1.41
+++ xine-lib.spec	7 Jan 2009 21:17:13 -0000	1.42
@@ -13,14 +13,16 @@
     %define     have_vidix  0
 %endif # ix86
 
+%if 0%{?fedora} > 9
+%define _with_caca --with-caca 
+%endif
+
 %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
@@ -67,7 +69,7 @@
 %if %{with_aalib}
 BuildRequires:  aalib-devel >= 1.4
 %endif # aalib
-%if %{with_caca}
+%if 0%{?_with_caca:1}
 BuildRequires:  libcaca-devel >= 0.99-0.5.beta16 
 %endif # caca
 %if 0%{!?_without_directfb:1}
@@ -168,7 +170,7 @@
 %if %{with_aalib}
   - AA-lib
 %endif # aalib
-%if %{with_caca}
+%if 0%{?with_caca:1}
   - Libcaca
 %endif # caca
 %if 0%{!?_without_imagemagick:1}
@@ -225,6 +227,7 @@
 %if 0%{?_without_imagemagick:1}
     --without-imagemagick \
 %endif # imagemagick
+    %{?_with_caca} %{!?_with_caca:--without-caca} \
     %{!?_without_arts:--with-arts} %{?_without_arts} \
     --with-wavpack \
     --with-real-codecs-path=%{codecdir} \
@@ -398,7 +401,7 @@
 %if %{with_aalib}
 %{_libdir}/xine/plugins/%{abiver}/xineplug_vo_out_aa.so
 %endif # aalib
-%if %{with_caca}
+%if 0%{?_with_caca}
 %{_libdir}/xine/plugins/%{abiver}/xineplug_vo_out_caca.so
 %endif # caca
 %if 0%{!?_without_directfb:1}



From rdieter at fedoraproject.org  Wed Jan  7 21:17:42 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed,  7 Jan 2009 21:17:42 +0000 (UTC)
Subject: rpms/xine-lib/devel xine-lib.spec,1.54,1.55
Message-ID: <20090107211742.DBCE170100@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/xine-lib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16837/devel

Modified Files:
	xine-lib.spec 
Log Message:
enable caca for f10+ only



Index: xine-lib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xine-lib/devel/xine-lib.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- xine-lib.spec	7 Jan 2009 21:03:28 -0000	1.54
+++ xine-lib.spec	7 Jan 2009 21:17:12 -0000	1.55
@@ -13,14 +13,16 @@
     %define     have_vidix  0
 %endif # ix86
 
+%if 0%{?fedora} > 9
+%define _with_caca --with-caca 
+%endif
+
 %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
@@ -67,7 +69,7 @@
 %if %{with_aalib}
 BuildRequires:  aalib-devel >= 1.4
 %endif # aalib
-%if %{with_caca}
+%if 0%{?_with_caca:1}
 BuildRequires:  libcaca-devel >= 0.99-0.5.beta16 
 %endif # caca
 %if 0%{!?_without_directfb:1}
@@ -168,7 +170,7 @@
 %if %{with_aalib}
   - AA-lib
 %endif # aalib
-%if %{with_caca}
+%if 0%{?with_caca:1}
   - Libcaca
 %endif # caca
 %if 0%{!?_without_imagemagick:1}
@@ -225,6 +227,7 @@
 %if 0%{?_without_imagemagick:1}
     --without-imagemagick \
 %endif # imagemagick
+    %{?_with_caca} %{!?_with_caca:--without-caca} \
     %{!?_without_arts:--with-arts} %{?_without_arts} \
     --with-wavpack \
     --with-real-codecs-path=%{codecdir} \
@@ -398,7 +401,7 @@
 %if %{with_aalib}
 %{_libdir}/xine/plugins/%{abiver}/xineplug_vo_out_aa.so
 %endif # aalib
-%if %{with_caca}
+%if 0%{?_with_caca}
 %{_libdir}/xine/plugins/%{abiver}/xineplug_vo_out_caca.so
 %endif # caca
 %if 0%{!?_without_directfb:1}



From rdieter at fedoraproject.org  Wed Jan  7 21:17:43 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed,  7 Jan 2009 21:17:43 +0000 (UTC)
Subject: rpms/xine-lib/F-10 xine-lib.spec,1.51,1.52
Message-ID: <20090107211743.3948A70100@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/xine-lib/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16837/F-10

Modified Files:
	xine-lib.spec 
Log Message:
enable caca for f10+ only



Index: xine-lib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xine-lib/F-10/xine-lib.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- xine-lib.spec	7 Jan 2009 21:03:29 -0000	1.51
+++ xine-lib.spec	7 Jan 2009 21:17:12 -0000	1.52
@@ -13,14 +13,16 @@
     %define     have_vidix  0
 %endif # ix86
 
+%if 0%{?fedora} > 9
+%define _with_caca --with-caca 
+%endif
+
 %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
@@ -67,7 +69,7 @@
 %if %{with_aalib}
 BuildRequires:  aalib-devel >= 1.4
 %endif # aalib
-%if %{with_caca}
+%if 0%{?_with_caca:1}
 BuildRequires:  libcaca-devel >= 0.99-0.5.beta16 
 %endif # caca
 %if 0%{!?_without_directfb:1}
@@ -168,7 +170,7 @@
 %if %{with_aalib}
   - AA-lib
 %endif # aalib
-%if %{with_caca}
+%if 0%{?with_caca:1}
   - Libcaca
 %endif # caca
 %if 0%{!?_without_imagemagick:1}
@@ -225,6 +227,7 @@
 %if 0%{?_without_imagemagick:1}
     --without-imagemagick \
 %endif # imagemagick
+    %{?_with_caca} %{!?_with_caca:--without-caca} \
     %{!?_without_arts:--with-arts} %{?_without_arts} \
     --with-wavpack \
     --with-real-codecs-path=%{codecdir} \
@@ -398,7 +401,7 @@
 %if %{with_aalib}
 %{_libdir}/xine/plugins/%{abiver}/xineplug_vo_out_aa.so
 %endif # aalib
-%if %{with_caca}
+%if 0%{?_with_caca}
 %{_libdir}/xine/plugins/%{abiver}/xineplug_vo_out_caca.so
 %endif # caca
 %if 0%{!?_without_directfb:1}



From rdieter at fedoraproject.org  Wed Jan  7 21:21:04 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed,  7 Jan 2009 21:21:04 +0000 (UTC)
Subject: rpms/xine-lib/devel xine-lib.spec,1.55,1.56
Message-ID: <20090107212104.4B69870100@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/xine-lib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17405

Modified Files:
	xine-lib.spec 
Log Message:
typo



Index: xine-lib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xine-lib/devel/xine-lib.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- xine-lib.spec	7 Jan 2009 21:17:12 -0000	1.55
+++ xine-lib.spec	7 Jan 2009 21:20:33 -0000	1.56
@@ -170,7 +170,7 @@
 %if %{with_aalib}
   - AA-lib
 %endif # aalib
-%if 0%{?with_caca:1}
+%if 0%{?_with_caca:1}
   - Libcaca
 %endif # caca
 %if 0%{!?_without_imagemagick:1}



From stransky at fedoraproject.org  Wed Jan  7 21:28:36 2009
From: stransky at fedoraproject.org (Martin Stransky)
Date: Wed,  7 Jan 2009 21:28:36 +0000 (UTC)
Subject: rpms/xulrunner/devel xulrunner.spec,1.145,1.146
Message-ID: <20090107212836.F050B70100@cvs1.fedora.phx.redhat.com>

Author: stransky

Update of /cvs/pkgs/rpms/xulrunner/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19486

Modified Files:
	xulrunner.spec 
Log Message:
* Wed Jan 7 2009 Martin Stransky <stransky at redhat.com> 1.9.1-0.6
- Copied mozilla-config.h to stable include dir (#478445)




Index: xulrunner.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xulrunner/devel/xulrunner.spec,v
retrieving revision 1.145
retrieving revision 1.146
diff -u -r1.145 -r1.146
--- xulrunner.spec	22 Dec 2008 16:32:22 -0000	1.145
+++ xulrunner.spec	7 Jan 2009 21:28:06 -0000	1.146
@@ -11,7 +11,7 @@
 Summary:        XUL Runtime for Gecko Applications
 Name:           xulrunner
 Version:        1.9.1
-Release:        0.5.beta2%{?dist}
+Release:        0.6.beta2%{?dist}
 URL:            http://developer.mozilla.org/En/XULRunner
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 Group:          Applications/Internet
@@ -237,6 +237,10 @@
 %{__cp} -rL dist/include/* \
   $RPM_BUILD_ROOT/%{_includedir}/${INTERNAL_APP_SDK_NAME}
 
+# Copy mozilla-config to stable include dir
+%{__cp} dist/include/mozilla-config.h \
+  $RPM_BUILD_ROOT/%{_includedir}/${INTERNAL_APP_SDK_NAME}/stable
+
 # Fix multilib devel conflicts...
 %ifarch x86_64 ia64 s390x ppc64
 %define mozbits 64
@@ -261,6 +265,10 @@
 install_file "mozilla-config"
 popd
 
+pushd $RPM_BUILD_ROOT/%{_includedir}/${INTERNAL_APP_SDK_NAME}/stable
+install_file "mozilla-config"
+popd
+
 pushd $RPM_BUILD_ROOT/%{_includedir}/${INTERNAL_APP_SDK_NAME}/unstable
 install_file "mozilla-config"
 popd
@@ -443,6 +451,9 @@
 #---------------------------------------------------------------------
 
 %changelog
+* Wed Jan 7 2009 Martin Stransky <stransky at redhat.com> 1.9.1-0.6
+- Copied mozilla-config.h to stable include dir (#478445)
+
 * Mon Dec 22 2008 Christopher Aillon <caillon at redhat.com> 1.9.1-0.5
 - Typo fix
 



From rdieter at fedoraproject.org  Wed Jan  7 21:29:26 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed,  7 Jan 2009 21:29:26 +0000 (UTC)
Subject: rpms/xine-lib/devel xine-lib.spec,1.56,1.57
Message-ID: <20090107212926.04C5E70100@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/xine-lib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19673

Modified Files:
	xine-lib.spec 
Log Message:
fix thinko'd typo-fix (are we there yet?)



Index: xine-lib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xine-lib/devel/xine-lib.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- xine-lib.spec	7 Jan 2009 21:20:33 -0000	1.56
+++ xine-lib.spec	7 Jan 2009 21:28:55 -0000	1.57
@@ -401,7 +401,7 @@
 %if %{with_aalib}
 %{_libdir}/xine/plugins/%{abiver}/xineplug_vo_out_aa.so
 %endif # aalib
-%if 0%{?_with_caca}
+%if 0%{?_with_caca:1}
 %{_libdir}/xine/plugins/%{abiver}/xineplug_vo_out_caca.so
 %endif # caca
 %if 0%{!?_without_directfb:1}



From rdieter at fedoraproject.org  Wed Jan  7 21:38:36 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed,  7 Jan 2009 21:38:36 +0000 (UTC)
Subject: rpms/xine-lib/EL-5 .cvsignore, 1.9, 1.10 sources, 1.9,
	1.10 xine-lib-cleanup-sources.sh, 1.4, 1.5 xine-lib.spec, 1.20,
	1.21 xine-lib-1.1.15-ansi.patch, 1.1, NONE
Message-ID: <20090107213836.3263170100@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-serv22276

Modified Files:
	.cvsignore sources xine-lib-cleanup-sources.sh xine-lib.spec 
Removed Files:
	xine-lib-1.1.15-ansi.patch 
Log Message:
* Wed Jan 07 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.1.16-1
- xine-lib-1.1.16, plugin ABI 1.25
- --with-external-libdvdnav, include mpeg demuxers (#213597)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xine-lib/EL-5/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	22 Sep 2008 21:01:29 -0000	1.9
+++ .cvsignore	7 Jan 2009 21:38:05 -0000	1.10
@@ -1,2 +1,2 @@
-xine-lib-1.1.15-autotools.patch.bz2
-xine-lib-1.1.15-pruned.tar.bz2
+xine-lib-1.1.16-autotools.patch.bz2
+xine-lib-1.1.16-pruned.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xine-lib/EL-5/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	22 Sep 2008 21:01:29 -0000	1.9
+++ sources	7 Jan 2009 21:38:05 -0000	1.10
@@ -1,2 +1,2 @@
-ffd74ec893a5f1167c69987a68f436fd  xine-lib-1.1.15-autotools.patch.bz2
-acdbdc024382afac111eb076304448ed  xine-lib-1.1.15-pruned.tar.bz2
+fe8148f2a0ec7b2e75ad509e8086e33f  xine-lib-1.1.16-autotools.patch.bz2
+512f31d8414ef4654ca366c0dce37301  xine-lib-1.1.16-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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- xine-lib-cleanup-sources.sh	22 Sep 2008 21:01:29 -0000	1.4
+++ xine-lib-cleanup-sources.sh	7 Jan 2009 21:38:05 -0000	1.5
@@ -56,11 +56,12 @@
   sed -i -e "/xineplug_inp_$p/d" src/input/Makefile.am
 done
 # Demuxers
-for p in mpeg mpeg_block mpeg_ts mpeg_elem mpeg_pes yuv4mpeg2; do
-  echo "removing $p demuxer..."
-  [ -f src/demuxers/demux_$p.c ] && rm -f src/demuxers/demux_$p.c
-  sed -i -e "/xineplug_dmx_$p/d" src/demuxers/Makefile.am
-done
+# These are ok now ( http://bugzilla.redhat.com/213597 )
+#for p in mpeg mpeg_block mpeg_ts mpeg_elem mpeg_pes yuv4mpeg2; do
+#  echo "removing $p demuxer..."
+#  [ -f src/demuxers/demux_$p.c ] && rm -f src/demuxers/demux_$p.c
+#  sed -i -e "/xineplug_dmx_$p/d" src/demuxers/Makefile.am
+#done
 # Postprocessors
 echo "removing planar and deinterlace postprocessors..."
 sed -i -e 's/deinterlace //g' src/post/Makefile.am # see comments in speedy.c


Index: xine-lib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xine-lib/EL-5/xine-lib.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- xine-lib.spec	22 Sep 2008 21:01:29 -0000	1.20
+++ xine-lib.spec	7 Jan 2009 21:38:05 -0000	1.21
@@ -2,10 +2,9 @@
 # - 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
-# - external dvdnav - not compatible as of 1.1.11 and 4.1.1
 # - deprecate ESD support?
 
-%define         abiver      1.24
+%define         abiver      1.25
 %define         codecdir    %{_libdir}/codecs
 
 %ifarch %{ix86}
@@ -14,14 +13,16 @@
     %define     have_vidix  0
 %endif # ix86
 
+%if 0%{?fedora} > 9
+%define _with_caca --with-caca 
+%endif
+
 %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
@@ -32,7 +33,7 @@
 
 Summary:        Xine library
 Name:           xine-lib
-Version:        1.1.15
+Version:        1.1.16
 Release:        1%{?dist}
 License:        GPLv2+
 Group:          System Environment/Libraries
@@ -50,8 +51,6 @@
 Patch1:         %{name}-1.1.4-optflags.patch
 Patch6:         %{name}-1.1.1-deepbind-939.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
 
 Provides:       xine-lib(plugin-abi) = %{abiver}
 # X11
@@ -70,8 +69,8 @@
 %if %{with_aalib}
 BuildRequires:  aalib-devel >= 1.4
 %endif # aalib
-%if %{with_caca}
-BuildRequires:  libcaca-devel >= 0.99
+%if 0%{?_with_caca:1}
+BuildRequires:  libcaca-devel >= 0.99-0.5.beta16 
 %endif # caca
 %if 0%{!?_without_directfb:1}
 BuildRequires:  directfb-devel
@@ -111,6 +110,7 @@
 %else
 BuildRequires:  samba-common
 %endif
+BuildRequires:  libdvdnav-devel
 
 %description
 This package contains the Xine library. Xine is a free multimedia player.
@@ -170,7 +170,7 @@
 %if %{with_aalib}
   - AA-lib
 %endif # aalib
-%if %{with_caca}
+%if 0%{?_with_caca:1}
   - Libcaca
 %endif # caca
 %if 0%{!?_without_imagemagick:1}
@@ -191,15 +191,14 @@
 # Patch6 needed at least when compiling with external ffmpeg, #939.
 %patch6 -p1 -b .deepbind
 
-%patch100 -p1 -b .ansi
-
-# Avoid standard rpaths on lib64 archs:
-sed -i -e 's|"/lib /usr/lib\b|"/%{_lib} %{_libdir}|' configure
+# Avoid standard rpaths on lib64 archs: (autotools patch should handle this, no? -- Rex )
+#sed -i -e 's|"/lib /usr/lib\b|"/%{_lib} %{_libdir}|' configure
 
 
 %build
 export FFMPEG_CFLAGS=" " FFMPEG_LIBS=" "
 export FFMPEG_POSTPROC_CFLAGS=" " FFMPEG_POSTPROC_LIBS=" "
+export FFMPEG_UTIL_CFLAGS=" " FFMPEG_UTIL_LIBS=" "
 export SDL_CFLAGS="$(sdl-config --cflags)" SDL_LIBS="$(sdl-config --libs)"
 # Keep list of options in mostly the same order as ./configure --help.
 %configure \
@@ -223,10 +222,12 @@
     --with-external-ffmpeg \
     --with-xv-path=%{_libdir} \
     --with-libflac \
+    --with-external-libdvdnav \
     --with-external-libmpcdec \
 %if 0%{?_without_imagemagick:1}
     --without-imagemagick \
 %endif # imagemagick
+    %{?_with_caca} %{!?_with_caca:--without-caca} \
     %{!?_without_arts:--with-arts} %{?_without_arts} \
     --with-wavpack \
     --with-real-codecs-path=%{codecdir} \
@@ -330,6 +331,11 @@
 %{_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_mpeg.so
+%{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_mpeg_block.so
+%{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_mpeg_elem.so
+%{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_mpeg_pes.so
+%{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_mpeg_ts.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
@@ -339,6 +345,7 @@
 %{_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_dmx_yuv4mpeg2.so
 %{_libdir}/xine/plugins/%{abiver}/xineplug_flac.so
 %{_libdir}/xine/plugins/%{abiver}/xineplug_inp_cdda.so
 %{_libdir}/xine/plugins/%{abiver}/xineplug_inp_dvb.so
@@ -394,7 +401,7 @@
 %if %{with_aalib}
 %{_libdir}/xine/plugins/%{abiver}/xineplug_vo_out_aa.so
 %endif # aalib
-%if %{with_caca}
+%if 0%{?_with_caca:1}
 %{_libdir}/xine/plugins/%{abiver}/xineplug_vo_out_caca.so
 %endif # caca
 %if 0%{!?_without_directfb:1}
@@ -418,6 +425,19 @@
 
 
 %changelog
+* Wed Jan 07 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.1.16-1
+- xine-lib-1.1.16, plugin ABI 1.25
+- --with-external-libdvdnav, include mpeg demuxers (#213597)
+
+* Fri Dec 12 2008 Rex Dieter <rdieter at fedoraproject.org> - 1.1.15-4
+- rebuild for pkgconfig deps
+
+* Tue Oct 28 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> - 1.1.15-3
+- rebuild for new libcaca
+
+* Thu Oct 23 2008 Rex Dieter <rdieter at fedoraproject.org> - 1.1.15-2
+- respin
+
 * 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 DELETED ---



From chitlesh at fedoraproject.org  Wed Jan  7 21:44:27 2009
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Wed,  7 Jan 2009 21:44:27 +0000 (UTC)
Subject: rpms/perl-Hardware-Verilog-Parser/devel import.log, NONE,
	1.1 perl-Hardware-Verilog-Parser.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090107214427.62F5770100@cvs1.fedora.phx.redhat.com>

Author: chitlesh

Update of /cvs/pkgs/rpms/perl-Hardware-Verilog-Parser/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23382/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-Hardware-Verilog-Parser.spec 
Log Message:
new release


--- NEW FILE import.log ---
perl-Hardware-Verilog-Parser-0_13-1_fc10:HEAD:perl-Hardware-Verilog-Parser-0.13-1.fc10.src.rpm:1231364559


--- NEW FILE perl-Hardware-Verilog-Parser.spec ---
Name:           perl-Hardware-Verilog-Parser
Version:        0.13
Release:        1%{?dist}
Summary:        Complete grammar for parsing Verilog code using perl
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Hardware-Verilog-Parser/
Source0:        http://www.cpan.org/authors/id/G/GS/GSLONDON/Hardware-Verilog-Parser-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  perl(ExtUtils::MakeMaker)
BuildRequires:  perl(Parse::RecDescent)

Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
This module defines the complete grammar needed to parse any Verilog code.
By overloading this grammar, it is possible to easily create perl scripts
which run through Verilog code and perform specific functions.

%prep
%setup -q -n Hardware-Verilog-Parser-%{version}

find . -type f | xargs %{__perl} -pi -e 's|#! /bin/perl|#! /usr/bin/perl|'

%build
./generate_precompiled_parser.pl

%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{perl_vendorlib}/Hardware

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.txt test1.v
%dir %{perl_vendorlib}/Hardware/Verilog/
%{perl_vendorlib}/Hardware/Verilog/*
%{_mandir}/man3/*

%changelog
* Sun Dec 14 2008 Chitlesh GOORAH <chitlesh [AT] fedoraproject DOT org> 0.13-1
- Specfile autogenerated by cpanspec 1.77.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Hardware-Verilog-Parser/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	28 Dec 2008 19:07:51 -0000	1.1
+++ .cvsignore	7 Jan 2009 21:43:56 -0000	1.2
@@ -0,0 +1 @@
+Hardware-Verilog-Parser-0.13.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Hardware-Verilog-Parser/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	28 Dec 2008 19:07:51 -0000	1.1
+++ sources	7 Jan 2009 21:43:56 -0000	1.2
@@ -0,0 +1 @@
+13e484832847e133675160862b43d933  Hardware-Verilog-Parser-0.13.tar.gz



From stransky at fedoraproject.org  Wed Jan  7 21:45:05 2009
From: stransky at fedoraproject.org (Martin Stransky)
Date: Wed,  7 Jan 2009 21:45:05 +0000 (UTC)
Subject: rpms/pcmanx-gtk2/devel pcmanx-gtk2-0.3.8-xulrunner.patch, NONE,
	1.1 pcmanx-gtk2.spec, 1.7, 1.8
Message-ID: <20090107214505.239E370100@cvs1.fedora.phx.redhat.com>

Author: stransky

Update of /cvs/pkgs/rpms/pcmanx-gtk2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23519

Modified Files:
	pcmanx-gtk2.spec 
Added Files:
	pcmanx-gtk2-0.3.8-xulrunner.patch 
Log Message:
* Wed Jan 7 2008 Martin Stransky <stransky at redhat.com> - 0.3.8-3
- updated for xulrunner 1.9.1



pcmanx-gtk2-0.3.8-xulrunner.patch:

--- NEW FILE pcmanx-gtk2-0.3.8-xulrunner.patch ---
diff -up pcmanx-gtk2-0.3.8/plugin/src/np_entry.cpp.xul pcmanx-gtk2-0.3.8/plugin/src/np_entry.cpp
--- pcmanx-gtk2-0.3.8/plugin/src/np_entry.cpp.xul	2009-01-07 22:39:27.000000000 +0100
+++ pcmanx-gtk2-0.3.8/plugin/src/np_entry.cpp	2009-01-07 22:39:51.000000000 +0100
@@ -40,6 +40,7 @@
 // Main plugin entry point implementation -- exports from the 
 // plugin library
 //
+#include "mozilla-config.h"
 #include "npplat.h"
 #include "pluginbase.h"
 
diff -up pcmanx-gtk2-0.3.8/plugin/src/npn_gate.cpp.xul pcmanx-gtk2-0.3.8/plugin/src/npn_gate.cpp
--- pcmanx-gtk2-0.3.8/plugin/src/npn_gate.cpp.xul	2008-08-10 09:06:29.000000000 +0200
+++ pcmanx-gtk2-0.3.8/plugin/src/npn_gate.cpp	2009-01-07 22:36:21.000000000 +0100
@@ -42,6 +42,126 @@
 //
 #include "npplat.h"
 
+// For 1.9 compatibility
+// ------------------------------------------------
+
+typedef NPError (*NPN_GetURLNotifyUPP)(NPP instance, const char* url, const char* window, void* notifyData);
+#define NewNPN_GetURLNotifyProc(FUNC)   \
+    ((NPN_GetURLNotifyUPP) (FUNC))
+#define CallNPN_GetURLNotifyProc(FUNC, ARG1, ARG2, ARG3, ARG4)    \
+    (*(FUNC))((ARG1), (ARG2), (ARG3), (ARG4))
+
+typedef NPError (*NPN_GetURLUPP)(NPP instance, const char* url, const char* window);
+#define NewNPN_GetURLProc(FUNC)   \
+    ((NPN_GetURLUPP) (FUNC))
+#define CallNPN_GetURLProc(FUNC, ARG1, ARG2, ARG3)    \
+    (*(FUNC))((ARG1), (ARG2), (ARG3))
+
+typedef NPError (*NPN_PostURLNotifyUPP)(NPP instance, const char* url, const char* window, uint32_t len, const char* buf, NPBool file, void* notifyData);
+#define NewNPN_PostURLNotifyProc(FUNC)    \
+    ((NPN_PostURLNotifyUPP) (FUNC))
+#define CallNPN_PostURLNotifyProc(FUNC, ARG1, ARG2, ARG3, ARG4, ARG5, ARG6, ARG7) \
+    (*(FUNC))((ARG1), (ARG2), (ARG3), (ARG4), (ARG5), (ARG6), (ARG7))
+
+typedef NPError (*NPN_PostURLUPP)(NPP instance, const char* url, const char* window, uint32_t len, const char* buf, NPBool file);
+#define NewNPN_PostURLProc(FUNC)    \
+    ((NPN_PostURLUPP) (FUNC))
+#define CallNPN_PostURLProc(FUNC, ARG1, ARG2, ARG3, ARG4, ARG5, ARG6) \
+    (*(FUNC))((ARG1), (ARG2), (ARG3), (ARG4), (ARG5), (ARG6))
+
+typedef NPError (*NPN_RequestReadUPP)(NPStream* stream, NPByteRange* rangeList);
+#define NewNPN_RequestReadProc(FUNC)    \
+    ((NPN_RequestReadUPP) (FUNC))
+#define CallNPN_RequestReadProc(FUNC, stream, range)    \
+    (*(FUNC))((stream), (range))
+
+typedef NPError (*NPN_NewStreamUPP)(NPP instance, NPMIMEType type, const char* window, NPStream** stream);
+#define NewNPN_NewStreamProc(FUNC)    \
+    ((NPN_NewStreamUPP) (FUNC))
+#define CallNPN_NewStreamProc(FUNC, npp, type, window, stream)    \
+    (*(FUNC))((npp), (type), (window), (stream))
+
+typedef int32_t (*NPN_WriteUPP)(NPP instance, NPStream* stream, int32_t len, void* buffer);
+#define NewNPN_WriteProc(FUNC)    \
+    ((NPN_WriteUPP) (FUNC))
+#define CallNPN_WriteProc(FUNC, npp, stream, len, buffer)   \
+    (*(FUNC))((npp), (stream), (len), (buffer))
+
+typedef NPError (*NPN_DestroyStreamUPP)(NPP instance, NPStream* stream, NPReason reason);
+#define NewNPN_DestroyStreamProc(FUNC)    \
+    ((NPN_DestroyStreamUPP) (FUNC))
+#define CallNPN_DestroyStreamProc(FUNC, npp, stream, reason)    \
+    (*(FUNC))((npp), (stream), (reason))
+
+typedef void (*NPN_StatusUPP)(NPP instance, const char* message);
+#define NewNPN_StatusProc(FUNC)   \
+    ((NPN_StatusUPP) (FUNC))
+#define CallNPN_StatusProc(FUNC, npp, msg)    \
+    (*(FUNC))((npp), (msg)) 
+
+typedef const char* (*NPN_UserAgentUPP)(NPP instance);
+#define NewNPN_UserAgentProc(FUNC)              \
+                ((NPN_UserAgentUPP) (FUNC))
+#define CallNPN_UserAgentProc(FUNC, ARG1)               \
+                (*(FUNC))((ARG1))
+
+typedef void* (*NPN_MemAllocUPP)(uint32_t size);
+#define NewNPN_MemAllocProc(FUNC)   \
+    ((NPN_MemAllocUPP) (FUNC))
+#define CallNPN_MemAllocProc(FUNC, ARG1)    \
+    (*(FUNC))((ARG1)) 
+
+typedef void (*NPN_MemFreeUPP)(void* ptr);
+#define NewNPN_MemFreeProc(FUNC)    \
+    ((NPN_MemFreeUPP) (FUNC))
+#define CallNPN_MemFreeProc(FUNC, ARG1)   \
+    (*(FUNC))((ARG1)) 
+
+typedef void (*NPN_ReloadPluginsUPP)(NPBool reloadPages);
+#define NewNPN_ReloadPluginsProc(FUNC)    \
+    ((NPN_ReloadPluginsUPP) (FUNC))
+#define CallNPN_ReloadPluginsProc(FUNC, ARG1)   \
+    (*(FUNC))((ARG1)) 
+
+typedef uint32_t (*NPN_MemFlushUPP)(uint32_t size);
+#define NewNPN_MemFlushProc(FUNC)   \
+    ((NPN_MemFlushUPP) (FUNC))
+#define CallNPN_MemFlushProc(FUNC, ARG1)    \
+    (*(FUNC))((ARG1)) 
+
+typedef NPError (*NPN_GetValueUPP)(NPP instance, NPNVariable variable, void *ret_alue);
+#define NewNPN_GetValueProc(FUNC)   \
+    ((NPN_GetValueUPP) (FUNC))
+#define CallNPN_GetValueProc(FUNC, ARG1, ARG2, ARG3)    \
+    (*(FUNC))((ARG1), (ARG2), (ARG3))
+
+typedef NPError (*NPN_SetValueUPP)(NPP instance, NPPVariable variable, void *ret_alue);
+#define NewNPN_SetValueProc(FUNC)   \
+    ((NPN_SetValueUPP) (FUNC))
+#define CallNPN_SetValueProc(FUNC, ARG1, ARG2, ARG3)    \
+    (*(FUNC))((ARG1), (ARG2), (ARG3))
+
+typedef void (*NPN_InvalidateRectUPP)(NPP instance, NPRect *rect);
+#define NewNPN_InvalidateRectProc(FUNC)   \
+    ((NPN_InvalidateRectUPP) (FUNC))
+#define CallNPN_InvalidateRectProc(FUNC, ARG1, ARG2)    \
+    (*(FUNC))((ARG1), (ARG2)) 
+
+typedef void (*NPN_InvalidateRegionUPP)(NPP instance, NPRegion region);
+#define NewNPN_InvalidateRegionProc(FUNC)   \
+    ((NPN_InvalidateRegionUPP) (FUNC))
+#define CallNPN_InvalidateRegionProc(FUNC, ARG1, ARG2)    \
+    (*(FUNC))((ARG1), (ARG2)) 
+
+typedef void (*NPN_ForceRedrawUPP)(NPP instance);
+#define NewNPN_ForceRedrawProc(FUNC)    \
+    ((NPN_ForceRedrawUPP) (FUNC))
+#define CallNPN_ForceRedrawProc(FUNC, ARG1)   \
+    (*(FUNC))((ARG1)) 
+
+// ------------------------------------------------
+
+
 extern NPNetscapeFuncs NPNFuncs;
 
 void NPN_Version(int* plugin_major, int* plugin_minor, int* netscape_major, int* netscape_minor)
@@ -71,7 +191,7 @@ NPError NPN_GetURL(NPP instance, const c
   return rv;
 }
 
-NPError NPN_PostURLNotify(NPP instance, const char* url, const char* window, uint32 len, const char* buf, NPBool file, void* notifyData)
+NPError NPN_PostURLNotify(NPP instance, const char* url, const char* window, uint32_t len, const char* buf, NPBool file, void* notifyData)
 {
 	int navMinorVers = NPNFuncs.version & 0xFF;
   NPError rv = NPERR_NO_ERROR;
@@ -84,7 +204,7 @@ NPError NPN_PostURLNotify(NPP instance, 
   return rv;
 }
 
-NPError NPN_PostURL(NPP instance, const char* url, const char* window, uint32 len, const char* buf, NPBool file)
+NPError NPN_PostURL(NPP instance, const char* url, const char* window, uint32_t len, const char* buf, NPBool file)
 {
   NPError rv = CallNPN_PostURLProc(NPNFuncs.posturl, instance, url, window, len, buf, file);
   return rv;
@@ -110,10 +230,10 @@ NPError NPN_NewStream(NPP instance, NPMI
   return rv;
 }
 
-int32 NPN_Write(NPP instance, NPStream *stream, int32 len, void *buffer)
+int32_t NPN_Write(NPP instance, NPStream *stream, int32_t len, void *buffer)
 {
 	int navMinorVersion = NPNFuncs.version & 0xFF;
-  int32 rv = 0;
+  int32_t rv = 0;
 
   if( navMinorVersion >= NPVERS_HAS_STREAMOUTPUT )
 		rv = CallNPN_WriteProc(NPNFuncs.write, instance, stream, len, buffer);
@@ -143,12 +263,12 @@ void NPN_Status(NPP instance, const char
 
 const char* NPN_UserAgent(NPP instance)
 {
-  const char * rv = NULL;
+  const char * rv = (const char *)NULL;
   rv = CallNPN_UserAgentProc(NPNFuncs.uagent, instance);
   return rv;
 }
 
-void* NPN_MemAlloc(uint32 size)
+void* NPN_MemAlloc(uint32_t size)
 {
   void * rv = NULL;
   rv = CallNPN_MemAllocProc(NPNFuncs.memalloc, size);
@@ -160,9 +280,9 @@ void NPN_MemFree(void* ptr)
   CallNPN_MemFreeProc(NPNFuncs.memfree, ptr);
 }
 
-uint32 NPN_MemFlush(uint32 size)
+uint32_t NPN_MemFlush(uint32_t size)
 {
-  uint32 rv = CallNPN_MemFlushProc(NPNFuncs.memflush, size);
+  uint32_t rv = CallNPN_MemFlushProc(NPNFuncs.memflush, size);
   return rv;
 }
 
diff -up pcmanx-gtk2-0.3.8/plugin/src/npp_gate.cpp.xul pcmanx-gtk2-0.3.8/plugin/src/npp_gate.cpp
--- pcmanx-gtk2-0.3.8/plugin/src/npp_gate.cpp.xul	2008-08-10 09:06:29.000000000 +0200
+++ pcmanx-gtk2-0.3.8/plugin/src/npp_gate.cpp	2009-01-07 22:36:21.000000000 +0100
@@ -45,7 +45,7 @@
 // here the plugin creates a plugin instance object which 
 // will be associated with this newly created NPP instance and 
 // will do all the necessary job
-NPError NPP_New(NPMIMEType pluginType, NPP instance, uint16 mode, int16 argc, char* argn[], char* argv[], NPSavedData* saved)
+NPError NPP_New(NPMIMEType pluginType, NPP instance, uint16_t mode, int16_t argc, char* argn[], char* argv[], NPSavedData* saved)
 {   
   if(instance == NULL)
     return NPERR_INVALID_INSTANCE_ERROR;
@@ -130,7 +130,7 @@ NPError NPP_SetWindow (NPP instance, NPW
   return rv;
 }
 
-NPError NPP_NewStream(NPP instance, NPMIMEType type, NPStream* stream, NPBool seekable, uint16* stype)
+NPError NPP_NewStream(NPP instance, NPMIMEType type, NPStream* stream, NPBool seekable, uint16_t* stype)
 {
   if(instance == NULL)
     return NPERR_INVALID_INSTANCE_ERROR;
@@ -143,7 +143,7 @@ NPError NPP_NewStream(NPP instance, NPMI
   return rv;
 }
 
-int32 NPP_WriteReady (NPP instance, NPStream *stream)
+int32_t NPP_WriteReady (NPP instance, NPStream *stream)
 {
   if(instance == NULL)
     return 0x0fffffff;
@@ -152,11 +152,11 @@ int32 NPP_WriteReady (NPP instance, NPSt
   if(plugin == NULL) 
     return 0x0fffffff;
 
-  int32 rv = plugin->WriteReady(stream);
+  int32_t rv = plugin->WriteReady(stream);
   return rv;
 }
 
-int32 NPP_Write (NPP instance, NPStream *stream, int32 offset, int32 len, void *buffer)
+int32_t NPP_Write (NPP instance, NPStream *stream, int32_t offset, int32_t len, void *buffer)
 {   
   if(instance == NULL)
     return len;
@@ -165,7 +165,7 @@ int32 NPP_Write (NPP instance, NPStream 
   if(plugin == NULL) 
     return len;
 
-  int32 rv = plugin->Write(stream, offset, len, buffer);
+  int32_t rv = plugin->Write(stream, offset, len, buffer);
   return rv;
 }
 
@@ -244,7 +244,7 @@ NPError NPP_SetValue(NPP instance, NPNVa
   return rv;
 }
 
-int16	NPP_HandleEvent(NPP instance, void* event)
+int16_t	NPP_HandleEvent(NPP instance, void* event)
 {
   if(instance == NULL)
     return 0;
@@ -253,7 +253,7 @@ int16	NPP_HandleEvent(NPP instance, void
   if(plugin == NULL) 
     return 0;
 
-  uint16 rv = plugin->HandleEvent(event);
+  uint16_t rv = plugin->HandleEvent(event);
   return rv;
 }
 
diff -up pcmanx-gtk2-0.3.8/plugin/src/npplat.h.xul pcmanx-gtk2-0.3.8/plugin/src/npplat.h
--- pcmanx-gtk2-0.3.8/plugin/src/npplat.h.xul	2008-08-10 09:06:29.000000000 +0200
+++ pcmanx-gtk2-0.3.8/plugin/src/npplat.h	2009-01-07 22:36:21.000000000 +0100
@@ -39,7 +39,7 @@
 #define _NPPLAT_H_
 
 #include "npapi.h"
-#include "npupp.h"
+#include "npfunctions.h"
 
 /**************************************************/
 /*                                                */
@@ -147,4 +147,8 @@ NPError Private_SetValue(NPP instance, N
 #define LOBYTE(i) (i & 0xff)
 #endif
 
+#ifndef NULL
+#define NULL ((void *)0)
+#endif
+
 #endif //_NPPLAT_H_
diff -up pcmanx-gtk2-0.3.8/plugin/src/pluginbase.h.xul pcmanx-gtk2-0.3.8/plugin/src/pluginbase.h
--- pcmanx-gtk2-0.3.8/plugin/src/pluginbase.h.xul	2008-08-10 09:06:29.000000000 +0200
+++ pcmanx-gtk2-0.3.8/plugin/src/pluginbase.h	2009-01-07 22:36:21.000000000 +0100
@@ -38,14 +38,16 @@
 #ifndef __PLUGININSTANCEBASE_H__
 #define __PLUGININSTANCEBASE_H__
 
+#include "mozilla-config.h"
+#include "npapi.h"
 #include "npplat.h"
 
 struct nsPluginCreateData
 {
   NPP instance;
   NPMIMEType type; 
-  uint16 mode; 
-  int16 argc; 
+  uint16_t mode; 
+  int16_t argc; 
   char** argn; 
   char** argv; 
   NPSavedData* saved;
@@ -64,14 +66,14 @@ public:
   // class as needed
   virtual NPError SetWindow(NPWindow* pNPWindow)                    { return NPERR_NO_ERROR; }
   virtual NPError NewStream(NPMIMEType type, NPStream* stream, 
-                            NPBool seekable, uint16* stype)         { return NPERR_NO_ERROR; }
+                            NPBool seekable, uint16_t* stype)       { return NPERR_NO_ERROR; }
   virtual NPError DestroyStream(NPStream *stream, NPError reason)   { return NPERR_NO_ERROR; }
   virtual void    StreamAsFile(NPStream* stream, const char* fname) { return; }
-  virtual int32   WriteReady(NPStream *stream)                      { return 0x0fffffff; }
-  virtual int32   Write(NPStream *stream, int32 offset, 
-                        int32 len, void *buffer)                    { return len; }
+  virtual int32_t WriteReady(NPStream *stream)                      { return 0x0fffffff; }
+  virtual int32_t Write(NPStream *stream, int32_t offset, 
+                        int32_t len, void *buffer)                  { return len; }
   virtual void    Print(NPPrint* printInfo)                         { return; }
-  virtual uint16  HandleEvent(void* event)                          { return 0; }
+  virtual uint16_t HandleEvent(void* event)                          { return 0; }
   virtual void    URLNotify(const char* url, NPReason reason, 
                             void* notifyData)                       { return; }
   virtual NPError GetValue(NPPVariable variable, void *value)       { return NPERR_NO_ERROR; }


Index: pcmanx-gtk2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pcmanx-gtk2/devel/pcmanx-gtk2.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- pcmanx-gtk2.spec	13 Nov 2008 01:45:18 -0000	1.7
+++ pcmanx-gtk2.spec	7 Jan 2009 21:44:34 -0000	1.8
@@ -2,12 +2,12 @@
 # We hardcode this here because everytime xulrunner increments
 # it tends to break things that depend on it.
 %define xulmajorver 1.9
-%define xulver 1.9.0.2
+%define xulver 1.9.1
 
 Summary:   Telnet client designed for BBS browsing
 Name:      pcmanx-gtk2
 Version:   0.3.8
-Release:   2%{?dist}
+Release:   3%{?dist}
 License:   GPLv2+
 Group:     Applications/Internet
 Source0:   http://pcmanx.csie.net/release/%{name}-%{version}.tar.bz2
@@ -18,6 +18,7 @@
 Patch1:    pcmanx-gtk2-0.3.8-Fedora-xpidl.patch
 # The idldir in our libxul already has "stable" in it.
 Patch2:    pcmanx-gtk2-0.3.8-Fedora-idldir.patch
+Patch3:    pcmanx-gtk2-0.3.8-xulrunner.patch
 URL:       http://pcmanx.csie.net
 BuildRequires:     gtk2-devel desktop-file-utils gettext libnotify-devel
 BuildRequires:     libXft-devel
@@ -54,6 +55,7 @@
 %patch0 -p1 -b .svn444
 %patch1 -p1 -b .xpidl
 %patch2 -p1 -b .idldir
+%patch3 -p1 -b .xul
 
 ########################################################################
 # automake 1.10 fails without config.rpath.
@@ -124,6 +126,9 @@
 %{_libdir}/mozilla/plugins/
 
 %changelog
+* Wed Jan 7 2008 Martin Stransky <stransky at redhat.com> - 0.3.8-3
+- updated for xulrunner 1.9.1
+
 * Thu Sep 25 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.3.8-2
 - rebuild against xulrunner 1.9.0.2
 



From stransky at fedoraproject.org  Wed Jan  7 21:46:32 2009
From: stransky at fedoraproject.org (Martin Stransky)
Date: Wed,  7 Jan 2009 21:46:32 +0000 (UTC)
Subject: rpms/pcmanx-gtk2/devel pcmanx-gtk2.spec,1.8,1.9
Message-ID: <20090107214632.1921470100@cvs1.fedora.phx.redhat.com>

Author: stransky

Update of /cvs/pkgs/rpms/pcmanx-gtk2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23942

Modified Files:
	pcmanx-gtk2.spec 
Log Message:
changelog fix


Index: pcmanx-gtk2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pcmanx-gtk2/devel/pcmanx-gtk2.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- pcmanx-gtk2.spec	7 Jan 2009 21:44:34 -0000	1.8
+++ pcmanx-gtk2.spec	7 Jan 2009 21:46:01 -0000	1.9
@@ -126,7 +126,7 @@
 %{_libdir}/mozilla/plugins/
 
 %changelog
-* Wed Jan 7 2008 Martin Stransky <stransky at redhat.com> - 0.3.8-3
+* Wed Jan 7 2009 Martin Stransky <stransky at redhat.com> - 0.3.8-3
 - updated for xulrunner 1.9.1
 
 * Thu Sep 25 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.3.8-2



From than at fedoraproject.org  Wed Jan  7 21:52:20 2009
From: than at fedoraproject.org (Than Ngo)
Date: Wed,  7 Jan 2009 21:52:20 +0000 (UTC)
Subject: rpms/kdelibs/devel kdelibs-4.1.96-parallel_devel.patch, NONE,
	1.1 kdelibs.spec, 1.407,
	1.408 kdelibs-4.1.85-parallel_devel.patch, 1.2, NONE
Message-ID: <20090107215220.E480B70100@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdelibs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25142

Modified Files:
	kdelibs.spec 
Added Files:
	kdelibs-4.1.96-parallel_devel.patch 
Removed Files:
	kdelibs-4.1.85-parallel_devel.patch 
Log Message:
adapted kdelibs-4.1.96-parallel_devel.patch


kdelibs-4.1.96-parallel_devel.patch:

--- NEW FILE kdelibs-4.1.96-parallel_devel.patch ---
diff -up kdelibs-4.1.96/cmake/modules/FindKDE4Internal.cmake.parallel_devel kdelibs-4.1.96/cmake/modules/FindKDE4Internal.cmake
--- kdelibs-4.1.96/cmake/modules/FindKDE4Internal.cmake.parallel_devel	2009-01-07 01:13:55.000000000 +0100
+++ kdelibs-4.1.96/cmake/modules/FindKDE4Internal.cmake	2009-01-07 22:42:22.000000000 +0100
@@ -15,10 +15,10 @@
 # The following variables are defined for the various tools required to
 # compile KDE software:
 #
-#  KDE4_KCFGC_EXECUTABLE    - the kconfig_compiler executable
+#  KDE4_KCFGC_EXECUTABLE    - the kconfig_compiler4 executable
 #  KDE4_AUTOMOC_EXECUTABLE  - the kde4automoc executable, deprecated, use AUTOMOC4_EXECUTABLE instead
 #  KDE4_MEINPROC_EXECUTABLE - the meinproc4 executable
-#  KDE4_MAKEKDEWIDGETS_EXECUTABLE - the makekdewidgets executable
+#  KDE4_MAKEKDEWIDGETS_EXECUTABLE - the makekdewidgets4 executable
 #
 # The following variables point to the location of the KDE libraries,
 # but shouldn't be used directly:
@@ -131,7 +131,7 @@
 #    Use optional GENERATE_MOC to generate moc if you use signals in your kcfg files.
 #
 #  KDE4_ADD_WIDGET_FILES (SRCS_VAR file1.widgets ... fileN.widgets)
-#    Use this to add widget description files for the makekdewidgets code generator
+#    Use this to add widget description files for the makekdewidgets4 code generator
 #    for Qt Designer plugins.
 #
 #  KDE4_CREATE_FINAL_FILES (filename_CXX filename_C file1 ... fileN)
@@ -370,23 +370,23 @@ if (_kdeBootStrapping)
    if (WIN32)
       set(LIBRARY_OUTPUT_PATH            ${EXECUTABLE_OUTPUT_PATH} )
       # CMAKE_CFG_INTDIR is the output subdirectory created e.g. by XCode and MSVC
-      set(KDE4_KCFGC_EXECUTABLE          ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/kconfig_compiler )
+      set(KDE4_KCFGC_EXECUTABLE          ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/kconfig_compiler4 )
 
       set(KDE4_MEINPROC_EXECUTABLE       ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/meinproc4 )
-      set(KDE4_MAKEKDEWIDGETS_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/makekdewidgets )
+      set(KDE4_MAKEKDEWIDGETS_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/makekdewidgets4 )
    else (WIN32)
       set(LIBRARY_OUTPUT_PATH            ${CMAKE_BINARY_DIR}/lib )
-      set(KDE4_KCFGC_EXECUTABLE          ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/kconfig_compiler.shell )
+      set(KDE4_KCFGC_EXECUTABLE          ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/kconfig_compiler4.shell )
 
       set(KDE4_MEINPROC_EXECUTABLE       ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/meinproc4.shell )
-      set(KDE4_MAKEKDEWIDGETS_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/makekdewidgets.shell )
+      set(KDE4_MAKEKDEWIDGETS_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/makekdewidgets4.shell )
    endif (WIN32)
 
    set(KDE4_LIB_DIR ${LIBRARY_OUTPUT_PATH}/${CMAKE_CFG_INTDIR})
 
    # when building kdelibs, make the kcfg rules depend on the binaries...
-   set( _KDE4_KCONFIG_COMPILER_DEP kconfig_compiler)
-   set( _KDE4_MAKEKDEWIDGETS_DEP makekdewidgets)
+   set( _KDE4_KCONFIG_COMPILER_DEP kconfig_compiler4)
+   set( _KDE4_MAKEKDEWIDGETS_DEP makekdewidgets4)
    set( _KDE4_MEINPROC_EXECUTABLE_DEP meinproc4)
 
    set(KDE4_INSTALLED_VERSION_OK TRUE)
@@ -488,7 +488,8 @@ else (_kdeBootStrapping)
 
    # KDE4_LIB_INSTALL_DIR and KDE4_INCLUDE_INSTALL_DIR are set in KDELibsDependencies.cmake,
    # use them to set the KDE4_LIB_DIR and KDE4_INCLUDE_DIR "public interface" variables
-   set(KDE4_LIB_DIR ${KDE4_LIB_INSTALL_DIR} )
+   set(KDE4_LIB_DIR ${KDE4_LIB_INSTALL_DIR}/kde4/devel )
+   link_directories("${KDE4_LIB_DIR}")
    set(KDE4_INCLUDE_DIR ${KDE4_INCLUDE_INSTALL_DIR} )
 
 
@@ -501,12 +502,12 @@ else (_kdeBootStrapping)
 
    # get the build CONFIGURATIONS which were exported in this file, and use just the first
    # of them to get the location of the installed executables
-   get_target_property(_importedConfigurations  ${KDE4_TARGET_PREFIX}kconfig_compiler IMPORTED_CONFIGURATIONS )
+   get_target_property(_importedConfigurations  ${KDE4_TARGET_PREFIX}kconfig_compiler4 IMPORTED_CONFIGURATIONS )
    list(GET _importedConfigurations 0 _firstConfig)
 
-   get_target_property(KDE4_KCFGC_EXECUTABLE          ${KDE4_TARGET_PREFIX}kconfig_compiler LOCATION_${firstConfig})
+   get_target_property(KDE4_KCFGC_EXECUTABLE          ${KDE4_TARGET_PREFIX}kconfig_compiler4 LOCATION_${firstConfig})
    get_target_property(KDE4_MEINPROC_EXECUTABLE       ${KDE4_TARGET_PREFIX}meinproc4        LOCATION_${firstConfig})
-   get_target_property(KDE4_MAKEKDEWIDGETS_EXECUTABLE ${KDE4_TARGET_PREFIX}makekdewidgets   LOCATION_${firstConfig})
+   get_target_property(KDE4_MAKEKDEWIDGETS_EXECUTABLE ${KDE4_TARGET_PREFIX}makekdewidgets4   LOCATION_${firstConfig})
 
    # allow searching cmake modules in all given kde install locations (KDEDIRS based)
    execute_process(COMMAND "${KDE4_KDECONFIG_EXECUTABLE}" --path data OUTPUT_VARIABLE _data_DIR ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE)
@@ -738,7 +739,8 @@ set(CMAKE_SYSTEM_INCLUDE_PATH ${CMAKE_SY
 set(CMAKE_SYSTEM_PROGRAM_PATH ${CMAKE_SYSTEM_PROGRAM_PATH}
                               "${KDE4_BIN_INSTALL_DIR}" )
 
-set(CMAKE_SYSTEM_LIBRARY_PATH ${CMAKE_SYSTEM_LIBRARY_PATH} 
+set(CMAKE_SYSTEM_LIBRARY_PATH "${KDE4_LIB_INSTALL_DIR}/kde4/devel"
+                              ${CMAKE_SYSTEM_LIBRARY_PATH}
                               "${KDE4_LIB_INSTALL_DIR}" )
 
 # under Windows dlls may be also installed in bin/
@@ -1121,9 +1123,9 @@ macro (KDE4_PRINT_RESULTS)
    endif (NOT _kdeBootStrapping)
 
    if(KDE4_KCFGC_EXECUTABLE)
-      message(STATUS "Found the KDE4 kconfig_compiler preprocessor: ${KDE4_KCFGC_EXECUTABLE}")
+      message(STATUS "Found the KDE4 kconfig_compiler4 preprocessor: ${KDE4_KCFGC_EXECUTABLE}")
    else(KDE4_KCFGC_EXECUTABLE)
-      message(STATUS "Didn't find the KDE4 kconfig_compiler preprocessor")
+      message(STATUS "Didn't find the KDE4 kconfig_compiler4 preprocessor")
    endif(KDE4_KCFGC_EXECUTABLE)
 
    if(AUTOMOC4_EXECUTABLE)
diff -up kdelibs-4.1.96/doc/api/doxygen-preprocess-kcfg.sh.parallel_devel kdelibs-4.1.96/doc/api/doxygen-preprocess-kcfg.sh
--- kdelibs-4.1.96/doc/api/doxygen-preprocess-kcfg.sh.parallel_devel	2008-05-21 13:07:26.000000000 +0200
+++ kdelibs-4.1.96/doc/api/doxygen-preprocess-kcfg.sh	2009-01-07 22:04:13.000000000 +0100
@@ -2,9 +2,9 @@
 # Generates and cleans KConfigXT source code during a API dox build
 #
 
-kcfg_compiler="`kde4-config --prefix`/bin/kconfig_compiler"
+kcfg_compiler="`kde4-config --prefix`/bin/kconfig_compiler4"
 if test -z "$kcfg_compiler"; then
-	echo "kconfig_compiler not found!"
+	echo "kconfig_compiler4 not found!"
 	exit 1;
 fi
 
diff -up kdelibs-4.1.96/kdecore/kconfig_compiler/checkkcfg.pl.parallel_devel kdelibs-4.1.96/kdecore/kconfig_compiler/checkkcfg.pl
--- kdelibs-4.1.96/kdecore/kconfig_compiler/checkkcfg.pl.parallel_devel	2008-05-21 13:09:13.000000000 +0200
+++ kdelibs-4.1.96/kdecore/kconfig_compiler/checkkcfg.pl	2009-01-07 22:04:13.000000000 +0100
@@ -15,12 +15,12 @@ $file_cpp = "$filebase.cpp";
 
 $kcfgc = $file . "c";
 
-$cmd = "./kconfig_compiler $file $kcfgc";
+$cmd = "./kconfig_compiler4 $file $kcfgc";
 
 #print "CMD $cmd\n";
 
 if ( system( $cmd ) != 0 ) {
-  print STDERR "Unable to run kconfig_compiler\n";
+  print STDERR "Unable to run kconfig_compiler4\n";
   exit 1;
 }
 
diff -up kdelibs-4.1.96/kdecore/kconfig_compiler/CMakeLists.txt.parallel_devel kdelibs-4.1.96/kdecore/kconfig_compiler/CMakeLists.txt
--- kdelibs-4.1.96/kdecore/kconfig_compiler/CMakeLists.txt.parallel_devel	2009-01-06 18:27:49.000000000 +0100
+++ kdelibs-4.1.96/kdecore/kconfig_compiler/CMakeLists.txt	2009-01-07 22:44:57.000000000 +0100
@@ -8,13 +8,13 @@ add_subdirectory( example )
 set(kconfig_compiler_SRCS kconfig_compiler.cpp)
 
 
-kde4_add_executable(kconfig_compiler NOGUI RUN_UNINSTALLED ${kconfig_compiler_SRCS})
+kde4_add_executable(kconfig_compiler4 NOGUI RUN_UNINSTALLED ${kconfig_compiler_SRCS})
 
-target_link_libraries(kconfig_compiler  ${QT_QTCORE_LIBRARY} ${QT_QTXML_LIBRARY} )
+target_link_libraries(kconfig_compiler4  ${QT_QTCORE_LIBRARY} ${QT_QTXML_LIBRARY} )
 
 # "export" this target too so we can use the LOCATION property of the imported target in
 # FindKDE4Internal.cmake to get the full path to the installed executable instead of using FIND_PROGRAM(), Alex
-install(TARGETS kconfig_compiler EXPORT kdelibsToolsTargets ${INSTALL_TARGETS_DEFAULT_ARGS} )
+install(TARGETS kconfig_compiler4 EXPORT kdelibsToolsTargets ${INSTALL_TARGETS_DEFAULT_ARGS} )
 
 
 ########### install files ###############
diff -up kdelibs-4.1.96/kdeui/tests/kconfig_compiler/CMakeLists.txt.parallel_devel kdelibs-4.1.96/kdeui/tests/kconfig_compiler/CMakeLists.txt
--- kdelibs-4.1.96/kdeui/tests/kconfig_compiler/CMakeLists.txt.parallel_devel	2008-05-21 13:08:30.000000000 +0200
+++ kdelibs-4.1.96/kdeui/tests/kconfig_compiler/CMakeLists.txt	2009-01-07 22:04:13.000000000 +0100
@@ -9,7 +9,7 @@ macro(GEN_KCFG_TEST_SOURCE _testName _sr
    add_custom_command(
       OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${_testName}.cpp ${CMAKE_CURRENT_BINARY_DIR}/${_testName}.h
       COMMAND ${KDE4_KCFGC_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/${_testName}.kcfg ${CMAKE_CURRENT_SOURCE_DIR}/${_testName}.kcfgc
-      DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_testName}.kcfg ${CMAKE_CURRENT_SOURCE_DIR}/${_testName}.kcfgc kconfig_compiler)
+      DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_testName}.kcfg ${CMAKE_CURRENT_SOURCE_DIR}/${_testName}.kcfgc kconfig_compiler4)
 
 #   set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/${_testName}.h PROPERTIES GENERATED TRUE)
    qt4_generate_moc(${CMAKE_CURRENT_BINARY_DIR}/${_testName}.h ${CMAKE_CURRENT_BINARY_DIR}/${_testName}.moc )
diff -up kdelibs-4.1.96/kdewidgets/CMakeLists.txt.parallel_devel kdelibs-4.1.96/kdewidgets/CMakeLists.txt
--- kdelibs-4.1.96/kdewidgets/CMakeLists.txt.parallel_devel	2009-01-06 18:27:44.000000000 +0100
+++ kdelibs-4.1.96/kdewidgets/CMakeLists.txt	2009-01-07 22:46:30.000000000 +0100
@@ -14,24 +14,24 @@ include_directories( 
 set(makekdewidgets_SRCS makekdewidgets.cpp )
 
 
-kde4_add_executable(makekdewidgets NOGUI RUN_UNINSTALLED ${makekdewidgets_SRCS})
+kde4_add_executable(makekdewidgets4 NOGUI RUN_UNINSTALLED ${makekdewidgets_SRCS})
 
-target_link_libraries(makekdewidgets  ${KDE4_KDECORE_LIBS} )
+target_link_libraries(makekdewidgets4  ${KDE4_KDECORE_LIBS} )
 
 # "export" this target too so we can use the LOCATION property of the imported target in
 # FindKDE4Internal.cmake to get the full path to the installed executable instead of using FIND_PROGRAM(), Alex
-install(TARGETS makekdewidgets  EXPORT kdelibsToolsTargets ${INSTALL_TARGETS_DEFAULT_ARGS} )
+install(TARGETS makekdewidgets4  EXPORT kdelibsToolsTargets ${INSTALL_TARGETS_DEFAULT_ARGS} )
 
 
 ########### next target ###############
 
 
 # get the name of the generated wrapper script (which sets up LD_LIBRARY_PATH)
-get_target_property(MAKEKDEWIDGETS_EXECUTABLE makekdewidgets WRAPPER_SCRIPT)
+get_target_property(MAKEKDEWIDGETS_EXECUTABLE makekdewidgets4 WRAPPER_SCRIPT)
 
 add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/kdewidgets.cpp
   COMMAND "${MAKEKDEWIDGETS_EXECUTABLE}" -o ${CMAKE_CURRENT_BINARY_DIR}/kdewidgets.cpp ${CMAKE_CURRENT_SOURCE_DIR}/kde.widgets
-  MAIN_DEPENDENCY kde.widgets DEPENDS makekdewidgets)
+  MAIN_DEPENDENCY kde.widgets DEPENDS makekdewidgets4)
 
 set(kdewidgets_PART_SRCS
    classpreviews.cpp


Index: kdelibs.spec
===================================================================
RCS file: /cvs/extras/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.407
retrieving revision 1.408
diff -u -r1.407 -r1.408
--- kdelibs.spec	7 Jan 2009 16:23:24 -0000	1.407
+++ kdelibs.spec	7 Jan 2009 21:51:50 -0000	1.408
@@ -46,7 +46,7 @@
 Source2: kde4.csh
 
 # make -devel packages parallel-installable
-Patch0: kdelibs-4.1.85-parallel_devel.patch
+Patch0: kdelibs-4.1.96-parallel_devel.patch
 # fix kde#149705
 Patch2: kdelibs-4.1.82-kde149705.patch
 # Hunspell support for K3Spell


--- kdelibs-4.1.85-parallel_devel.patch DELETED ---



From chitlesh at fedoraproject.org  Wed Jan  7 21:54:44 2009
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Wed,  7 Jan 2009 21:54:44 +0000 (UTC)
Subject: rpms/perl-Hardware-Verilog-Parser/EL-5 import.log, NONE,
	1.1 perl-Hardware-Verilog-Parser.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090107215444.5B83070100@cvs1.fedora.phx.redhat.com>

Author: chitlesh

Update of /cvs/pkgs/rpms/perl-Hardware-Verilog-Parser/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25802/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-Hardware-Verilog-Parser.spec 
Log Message:
new release


--- NEW FILE import.log ---
perl-Hardware-Verilog-Parser-0_13-1_fc10:EL-5:perl-Hardware-Verilog-Parser-0.13-1.fc10.src.rpm:1231365159


--- NEW FILE perl-Hardware-Verilog-Parser.spec ---
Name:           perl-Hardware-Verilog-Parser
Version:        0.13
Release:        1%{?dist}
Summary:        Complete grammar for parsing Verilog code using perl
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Hardware-Verilog-Parser/
Source0:        http://www.cpan.org/authors/id/G/GS/GSLONDON/Hardware-Verilog-Parser-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  perl(ExtUtils::MakeMaker)
BuildRequires:  perl(Parse::RecDescent)

Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
This module defines the complete grammar needed to parse any Verilog code.
By overloading this grammar, it is possible to easily create perl scripts
which run through Verilog code and perform specific functions.

%prep
%setup -q -n Hardware-Verilog-Parser-%{version}

find . -type f | xargs %{__perl} -pi -e 's|#! /bin/perl|#! /usr/bin/perl|'

%build
./generate_precompiled_parser.pl

%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{perl_vendorlib}/Hardware

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.txt test1.v
%dir %{perl_vendorlib}/Hardware/Verilog/
%{perl_vendorlib}/Hardware/Verilog/*
%{_mandir}/man3/*

%changelog
* Sun Dec 14 2008 Chitlesh GOORAH <chitlesh [AT] fedoraproject DOT org> 0.13-1
- Specfile autogenerated by cpanspec 1.77.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Hardware-Verilog-Parser/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	28 Dec 2008 19:07:51 -0000	1.1
+++ .cvsignore	7 Jan 2009 21:54:13 -0000	1.2
@@ -0,0 +1 @@
+Hardware-Verilog-Parser-0.13.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Hardware-Verilog-Parser/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	28 Dec 2008 19:07:51 -0000	1.1
+++ sources	7 Jan 2009 21:54:13 -0000	1.2
@@ -0,0 +1 @@
+13e484832847e133675160862b43d933  Hardware-Verilog-Parser-0.13.tar.gz



From chitlesh at fedoraproject.org  Wed Jan  7 21:59:12 2009
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Wed,  7 Jan 2009 21:59:12 +0000 (UTC)
Subject: rpms/perl-Hardware-Vhdl-Tidy/devel import.log, 1.1,
	1.2 perl-Hardware-Vhdl-Tidy.spec, 1.1, 1.2
Message-ID: <20090107215912.1239370100@cvs1.fedora.phx.redhat.com>

Author: chitlesh

Update of /cvs/pkgs/rpms/perl-Hardware-Vhdl-Tidy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26647/devel

Modified Files:
	import.log perl-Hardware-Vhdl-Tidy.spec 
Log Message:
perl\(Test::Pod::Coverage\)


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Hardware-Vhdl-Tidy/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	24 Dec 2008 14:23:30 -0000	1.1
+++ import.log	7 Jan 2009 21:58:41 -0000	1.2
@@ -1 +1,2 @@
 perl-Hardware-Vhdl-Tidy-0_8-2_fc10:HEAD:perl-Hardware-Vhdl-Tidy-0.8-2.fc10.src.rpm:1230128474
+perl-Hardware-Vhdl-Tidy-0_8-3_fc10:HEAD:perl-Hardware-Vhdl-Tidy-0.8-3.fc10.src.rpm:1231365408


Index: perl-Hardware-Vhdl-Tidy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Hardware-Vhdl-Tidy/devel/perl-Hardware-Vhdl-Tidy.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Hardware-Vhdl-Tidy.spec	24 Dec 2008 14:23:30 -0000	1.1
+++ perl-Hardware-Vhdl-Tidy.spec	7 Jan 2009 21:58:41 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-Hardware-Vhdl-Tidy
 Version:        0.8
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        VHDL code prettifier
 
 License:        GPL+ or Artistic
@@ -16,6 +16,7 @@
 BuildRequires:  perl(Hardware::Vhdl::Lexer)
 BuildRequires:  perl(Test::More)
 BuildRequires:  perl(Test::Pod)
+BuildRequires:  perl(Test::Pod::Coverage)
 
 # %%dir %%{perl_vendorlib}/Hardware/Vhdl/ is owned by perl-Hardware-Vhdl-Parser
 # perl(Hardware::Vhdl::Lexer) requires perl-Hardware-Vhdl-Parser
@@ -74,6 +75,9 @@
 
 
 %changelog
+* Wed Jan 07 2009 Chitlesh GOORAH <chitlesh [AT] fedoraproject DOT org> 0.8-3
+- added perl(Test::Pod::Coverage) as BR
+
 * Sun Dec 21 2008 Chitlesh GOORAH <chitlesh [AT] fedoraproject DOT org> 0.8-2
 - updated as suggestion on review RHBZ 477520#c1
 



From than at fedoraproject.org  Wed Jan  7 22:02:34 2009
From: than at fedoraproject.org (Than Ngo)
Date: Wed,  7 Jan 2009 22:02:34 +0000 (UTC)
Subject: rpms/kdelibs/devel kdelibs-4.1.96-parallel_devel.patch,1.1,1.2
Message-ID: <20090107220234.A15AF70100@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdelibs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27426

Modified Files:
	kdelibs-4.1.96-parallel_devel.patch 
Log Message:
adapted kdelibs-4.1.96-parallel_devel.patch


kdelibs-4.1.96-parallel_devel.patch:

Index: kdelibs-4.1.96-parallel_devel.patch
===================================================================
RCS file: /cvs/extras/rpms/kdelibs/devel/kdelibs-4.1.96-parallel_devel.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kdelibs-4.1.96-parallel_devel.patch	7 Jan 2009 21:51:50 -0000	1.1
+++ kdelibs-4.1.96-parallel_devel.patch	7 Jan 2009 22:02:34 -0000	1.2
@@ -101,6 +101,15 @@
     endif(KDE4_KCFGC_EXECUTABLE)
  
     if(AUTOMOC4_EXECUTABLE)
+@@ -1142,7 +1145,7 @@ if (KDE4Internal_FIND_REQUIRED AND NOT K
+    endif (NOT KDE4_INSTALLED_VERSION_OK)
+ 
+    if (NOT KDE4_KCFGC_EXECUTABLE)
+-     message(FATAL_ERROR "ERROR: could not detect a usable kconfig_compiler")
++     message(FATAL_ERROR "ERROR: could not detect a usable kconfig_compiler4")
+    endif (NOT KDE4_KCFGC_EXECUTABLE)
+ 
+    message(FATAL_ERROR "ERROR: could NOT find everything required for compiling KDE 4 programs")
 diff -up kdelibs-4.1.96/doc/api/doxygen-preprocess-kcfg.sh.parallel_devel kdelibs-4.1.96/doc/api/doxygen-preprocess-kcfg.sh
 --- kdelibs-4.1.96/doc/api/doxygen-preprocess-kcfg.sh.parallel_devel	2008-05-21 13:07:26.000000000 +0200
 +++ kdelibs-4.1.96/doc/api/doxygen-preprocess-kcfg.sh	2009-01-07 22:04:13.000000000 +0100



From chitlesh at fedoraproject.org  Wed Jan  7 22:02:42 2009
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Wed,  7 Jan 2009 22:02:42 +0000 (UTC)
Subject: rpms/linsmith/devel import.log,1.2,1.3 linsmith.spec,1.2,1.3
Message-ID: <20090107220242.8532170100@cvs1.fedora.phx.redhat.com>

Author: chitlesh

Update of /cvs/pkgs/rpms/linsmith/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27388/devel

Modified Files:
	import.log linsmith.spec 
Log Message:
vendor fix


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/linsmith/devel/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	6 Jan 2009 23:17:27 -0000	1.2
+++ import.log	7 Jan 2009 22:02:12 -0000	1.3
@@ -1,2 +1,3 @@
 linsmith-0_99_11-2_fc10:HEAD:linsmith-0.99.11-2.fc10.src.rpm:1231195751
 linsmith-0_99_11-3_fc10:HEAD:linsmith-0.99.11-3.fc10.src.rpm:1231283751
+linsmith-0_99_11-4_fc10:HEAD:linsmith-0.99.11-4.fc10.src.rpm:1231365603


Index: linsmith.spec
===================================================================
RCS file: /cvs/pkgs/rpms/linsmith/devel/linsmith.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- linsmith.spec	6 Jan 2009 23:17:27 -0000	1.2
+++ linsmith.spec	7 Jan 2009 22:02:12 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           linsmith
 Version:        0.99.11
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        A Smith charting program
 
 Group:          Applications/Engineering
@@ -75,12 +75,15 @@
 %doc AUTHORS ChangeLog COPYING NEWS README THANKS doc/manual.pdf
 %doc examples/
 %{_bindir}/%{name}
-%{_datadir}/applications/%{name}.desktop
+%{_datadir}/applications/fedora-%{name}.desktop
 %{_datadir}/pixmaps/%{name}
 %{_datadir}/man/man1/%{name}.1.gz
 
 
 %changelog
+* Wed Jan 07 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 0.99.11-4
+- fixed vendor
+
 * Wed Jan 07 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 0.99.11-3
 - added vendor to skip build failure on EL-5
 



From chitlesh at fedoraproject.org  Wed Jan  7 22:03:32 2009
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Wed,  7 Jan 2009 22:03:32 +0000 (UTC)
Subject: rpms/perl-Hardware-Vhdl-Tidy/F-9 import.log, 1.1,
	1.2 perl-Hardware-Vhdl-Tidy.spec, 1.1, 1.2
Message-ID: <20090107220332.6A43070100@cvs1.fedora.phx.redhat.com>

Author: chitlesh

Update of /cvs/pkgs/rpms/perl-Hardware-Vhdl-Tidy/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27630/F-9

Modified Files:
	import.log perl-Hardware-Vhdl-Tidy.spec 
Log Message:
perl\(Test::Pod::Coverage\)


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Hardware-Vhdl-Tidy/F-9/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	24 Dec 2008 14:15:33 -0000	1.1
+++ import.log	7 Jan 2009 22:03:02 -0000	1.2
@@ -1 +1,2 @@
 perl-Hardware-Vhdl-Tidy-0_8-2_fc10:F-9:perl-Hardware-Vhdl-Tidy-0.8-2.fc10.src.rpm:1230128090
+perl-Hardware-Vhdl-Tidy-0_8-3_fc10:F-9:perl-Hardware-Vhdl-Tidy-0.8-3.fc10.src.rpm:1231365711


Index: perl-Hardware-Vhdl-Tidy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Hardware-Vhdl-Tidy/F-9/perl-Hardware-Vhdl-Tidy.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Hardware-Vhdl-Tidy.spec	24 Dec 2008 14:15:33 -0000	1.1
+++ perl-Hardware-Vhdl-Tidy.spec	7 Jan 2009 22:03:02 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-Hardware-Vhdl-Tidy
 Version:        0.8
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        VHDL code prettifier
 
 License:        GPL+ or Artistic
@@ -16,6 +16,7 @@
 BuildRequires:  perl(Hardware::Vhdl::Lexer)
 BuildRequires:  perl(Test::More)
 BuildRequires:  perl(Test::Pod)
+BuildRequires:  perl(Test::Pod::Coverage)
 
 # %%dir %%{perl_vendorlib}/Hardware/Vhdl/ is owned by perl-Hardware-Vhdl-Parser
 # perl(Hardware::Vhdl::Lexer) requires perl-Hardware-Vhdl-Parser
@@ -74,6 +75,9 @@
 
 
 %changelog
+* Wed Jan 07 2009 Chitlesh GOORAH <chitlesh [AT] fedoraproject DOT org> 0.8-3
+- added perl(Test::Pod::Coverage) as BR
+
 * Sun Dec 21 2008 Chitlesh GOORAH <chitlesh [AT] fedoraproject DOT org> 0.8-2
 - updated as suggestion on review RHBZ 477520#c1
 



From chitlesh at fedoraproject.org  Wed Jan  7 22:07:01 2009
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Wed,  7 Jan 2009 22:07:01 +0000 (UTC)
Subject: rpms/perl-Hardware-Vhdl-Tidy/EL-5 import.log, 1.1,
	1.2 perl-Hardware-Vhdl-Tidy.spec, 1.1, 1.2
Message-ID: <20090107220701.434B870100@cvs1.fedora.phx.redhat.com>

Author: chitlesh

Update of /cvs/pkgs/rpms/perl-Hardware-Vhdl-Tidy/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28740/EL-5

Modified Files:
	import.log perl-Hardware-Vhdl-Tidy.spec 
Log Message:
perl\(Test::Pod::Coverage\)


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Hardware-Vhdl-Tidy/EL-5/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	24 Dec 2008 14:20:24 -0000	1.1
+++ import.log	7 Jan 2009 22:06:30 -0000	1.2
@@ -1 +1,2 @@
 perl-Hardware-Vhdl-Tidy-0_8-2_fc10:EL-5:perl-Hardware-Vhdl-Tidy-0.8-2.fc10.src.rpm:1230128381
+perl-Hardware-Vhdl-Tidy-0_8-3_fc10:EL-5:perl-Hardware-Vhdl-Tidy-0.8-3.fc10.src.rpm:1231365823


Index: perl-Hardware-Vhdl-Tidy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Hardware-Vhdl-Tidy/EL-5/perl-Hardware-Vhdl-Tidy.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Hardware-Vhdl-Tidy.spec	24 Dec 2008 14:20:24 -0000	1.1
+++ perl-Hardware-Vhdl-Tidy.spec	7 Jan 2009 22:06:30 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-Hardware-Vhdl-Tidy
 Version:        0.8
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        VHDL code prettifier
 
 License:        GPL+ or Artistic
@@ -16,6 +16,7 @@
 BuildRequires:  perl(Hardware::Vhdl::Lexer)
 BuildRequires:  perl(Test::More)
 BuildRequires:  perl(Test::Pod)
+BuildRequires:  perl(Test::Pod::Coverage)
 
 # %%dir %%{perl_vendorlib}/Hardware/Vhdl/ is owned by perl-Hardware-Vhdl-Parser
 # perl(Hardware::Vhdl::Lexer) requires perl-Hardware-Vhdl-Parser
@@ -74,6 +75,9 @@
 
 
 %changelog
+* Wed Jan 07 2009 Chitlesh GOORAH <chitlesh [AT] fedoraproject DOT org> 0.8-3
+- added perl(Test::Pod::Coverage) as BR
+
 * Sun Dec 21 2008 Chitlesh GOORAH <chitlesh [AT] fedoraproject DOT org> 0.8-2
 - updated as suggestion on review RHBZ 477520#c1
 



From chitlesh at fedoraproject.org  Wed Jan  7 22:16:07 2009
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Wed,  7 Jan 2009 22:16:07 +0000 (UTC)
Subject: rpms/linsmith/EL-5 import.log,1.2,1.3 linsmith.spec,1.2,1.3
Message-ID: <20090107221607.CD2B970100@cvs1.fedora.phx.redhat.com>

Author: chitlesh

Update of /cvs/pkgs/rpms/linsmith/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29756/EL-5

Modified Files:
	import.log linsmith.spec 
Log Message:
vendor fix


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/linsmith/EL-5/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	6 Jan 2009 23:14:48 -0000	1.2
+++ import.log	7 Jan 2009 22:15:37 -0000	1.3
@@ -1,2 +1,3 @@
 linsmith-0_99_11-2_fc10:EL-5:linsmith-0.99.11-2.fc10.src.rpm:1231196351
 linsmith-0_99_11-3_fc10:EL-5:linsmith-0.99.11-3.fc10.src.rpm:1231283598
+linsmith-0_99_11-4_fc10:EL-5:linsmith-0.99.11-4.fc10.src.rpm:1231366266


Index: linsmith.spec
===================================================================
RCS file: /cvs/pkgs/rpms/linsmith/EL-5/linsmith.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- linsmith.spec	6 Jan 2009 23:14:48 -0000	1.2
+++ linsmith.spec	7 Jan 2009 22:15:37 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           linsmith
 Version:        0.99.11
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        A Smith charting program
 
 Group:          Applications/Engineering
@@ -75,12 +75,15 @@
 %doc AUTHORS ChangeLog COPYING NEWS README THANKS doc/manual.pdf
 %doc examples/
 %{_bindir}/%{name}
-%{_datadir}/applications/%{name}.desktop
+%{_datadir}/applications/fedora-%{name}.desktop
 %{_datadir}/pixmaps/%{name}
 %{_datadir}/man/man1/%{name}.1.gz
 
 
 %changelog
+* Wed Jan 07 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 0.99.11-4
+- fixed vendor
+
 * Wed Jan 07 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 0.99.11-3
 - added vendor to skip build failure on EL-5
 



From ajax at fedoraproject.org  Wed Jan  7 22:16:27 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Wed,  7 Jan 2009 22:16:27 +0000 (UTC)
Subject: rpms/xorg-x11-server/devel xserver-1.5.99.3-offscreen-pixmaps.patch,
	NONE, 1.1 xorg-x11-server.spec, 1.386, 1.387
Message-ID: <20090107221627.62BA670100@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-serv29847

Modified Files:
	xorg-x11-server.spec 
Added Files:
	xserver-1.5.99.3-offscreen-pixmaps.patch 
Log Message:
* Wed Jan 07 2009 Adam Jackson <ajax at redhat.com> 1.5.99.3-7
- xserver-1.5.99.3-offscreen-pixmaps.patch: Turn off offscreen pixmaps in XAA.
  Again.  Sigh.


xserver-1.5.99.3-offscreen-pixmaps.patch:

--- NEW FILE xserver-1.5.99.3-offscreen-pixmaps.patch ---
>From 70e14e1dd95ba965ffd3264af1f2d4b207c67f73 Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax at redhat.com>
Date: Wed, 7 Jan 2009 17:14:34 -0500
Subject: [PATCH] XAA: turn off offscreen pixmaps by default.  again.

---
 hw/xfree86/xaa/xaaInitAccel.c |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/hw/xfree86/xaa/xaaInitAccel.c b/hw/xfree86/xaa/xaaInitAccel.c
index 4087142..3b397dc 100644
--- a/hw/xfree86/xaa/xaaInitAccel.c
+++ b/hw/xfree86/xaa/xaaInitAccel.c
@@ -41,7 +41,8 @@ typedef enum {
     XAAOPT_WRITE_BITMAP,
     XAAOPT_WRITE_PIXMAP,
     XAAOPT_PIXMAP_CACHE,
-    XAAOPT_OFFSCREEN_PIXMAPS
+    XAAOPT_OFFSCREEN_PIXMAPS,
+    XAAOPT_HAS_DUMB_INVERTED_OPTION_SENSE
 } XAAOpts;
 
 static const OptionInfoRec XAAOptions[] = {
@@ -87,6 +88,8 @@ static const OptionInfoRec XAAOptions[] = {
 				OPTV_BOOLEAN,	{0}, FALSE },
     {XAAOPT_OFFSCREEN_PIXMAPS,		"XaaNoOffscreenPixmaps",
 				OPTV_BOOLEAN,	{0}, FALSE },
+    {XAAOPT_HAS_DUMB_INVERTED_OPTION_SENSE, "XaaOffscreenPixmaps",
+				OPTV_BOOLEAN,   {0}, FALSE },
     { -1,				NULL,
 				OPTV_NONE,	{0}, FALSE }
 };
@@ -525,8 +528,8 @@ XAAInitAccel(ScreenPtr pScreen, XAAInfoRecPtr infoRec)
 #define XAAMSG(s) do { if (serverGeneration == 1) xf86ErrorF(s); } while (0)
 
     if((infoRec->Flags & OFFSCREEN_PIXMAPS) && HaveScreenToScreenCopy &&
-		!xf86ReturnOptValBool(options, XAAOPT_OFFSCREEN_PIXMAPS,
-		                      FALSE)) {
+		xf86IsOptionSet(options, XAAOPT_HAS_DUMB_INVERTED_OPTION_SENSE))
+    {
 	XAAMSG("\tOffscreen Pixmaps\n");
     } else {
 	infoRec->Flags &= ~OFFSCREEN_PIXMAPS;
-- 
1.6.0.3



Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.386
retrieving revision 1.387
diff -u -r1.386 -r1.387
--- xorg-x11-server.spec	7 Jan 2009 15:57:07 -0000	1.386
+++ xorg-x11-server.spec	7 Jan 2009 22:15:57 -0000	1.387
@@ -19,7 +19,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.5.99.3
-Release:   6%{?dist}
+Release:   7%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -75,6 +75,7 @@
 Patch6004: xserver-1.5.99.3-dmx-xcalloc.patch
 # 6005 should be in 1.5.99.4
 Patch6005: xserver-1.5.99.3-ddx-rules.patch
+Patch6006: xserver-1.5.99.3-offscreen-pixmaps.patch
 
 %define moduledir	%{_libdir}/xorg/modules
 %define drimoduledir	%{_libdir}/dri
@@ -492,6 +493,10 @@
 
 
 %changelog
+* Wed Jan 07 2009 Adam Jackson <ajax at redhat.com> 1.5.99.3-7
+- xserver-1.5.99.3-offscreen-pixmaps.patch: Turn off offscreen pixmaps in XAA.
+  Again.  Sigh.
+
 * Wed Jan 07 2009 Adam Tkac <atkac redhat com> 1.5.99.3-6
 - use "git am" instead of "git-am"
 - added more sources into xorg-x11-server-source to make source compilable



From caillon at fedoraproject.org  Wed Jan  7 22:28:43 2009
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Wed,  7 Jan 2009 22:28:43 +0000 (UTC)
Subject: rpms/seamonkey/devel seamonkey.sh.in, 1.5, 1.6 seamonkey.spec, 1.47,
	1.48
Message-ID: <20090107222843.5422A70100@cvs1.fedora.phx.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/seamonkey/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31137

Modified Files:
	seamonkey.sh.in seamonkey.spec 
Log Message:
* Wed Jan 07 2009 Christopher Aillon <caillon at redhat.com> - 1.1.14-2
- Disable the crash dialog



Index: seamonkey.sh.in
===================================================================
RCS file: /cvs/extras/rpms/seamonkey/devel/seamonkey.sh.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- seamonkey.sh.in	1 Oct 2007 10:27:50 -0000	1.5
+++ seamonkey.sh.in	7 Jan 2009 22:28:12 -0000	1.6
@@ -91,6 +91,12 @@
 #MOZ_DISABLE_PANGO=1
 #export MOZ_DISABLE_PANGO
 
+##
+## Disable the GNOME crash dialog, Moz has it's own
+## 
+GNOME_DISABLE_CRASH_DIALOG=1
+export GNOME_DISABLE_CRASH_DIALOG
+
 function check_running() {
     $MOZ_CLIENT_PROGRAM 'ping()' 2>/dev/null >/dev/null
     RETURN_VAL=$?


Index: seamonkey.spec
===================================================================
RCS file: /cvs/extras/rpms/seamonkey/devel/seamonkey.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- seamonkey.spec	17 Dec 2008 22:32:40 -0000	1.47
+++ seamonkey.spec	7 Jan 2009 22:28:12 -0000	1.48
@@ -12,7 +12,7 @@
 Name:           seamonkey
 Summary:        Web browser, e-mail, news, IRC client, HTML editor
 Version:        1.1.14
-Release:        1%{?dist}
+Release:        2%{?dist}
 URL:            http://www.mozilla.org/projects/seamonkey/
 License:        MPLv1.1
 Group:          Applications/Internet
@@ -435,6 +435,9 @@
 
 
 %changelog
+* Wed Jan 07 2009 Christopher Aillon <caillon at redhat.com> - 1.1.14-2
+- Disable the crash dialog
+
 * Wed Dec 17 2008 Kai Engert <kengert at redhat.com> - 1.1.14-1
 - Update to 1.1.14
 * Thu Dec 11 2008 Kai Engert <kengert at redhat.com> - 1.1.13-1



From mclasen at fedoraproject.org  Wed Jan  7 22:30:42 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Wed,  7 Jan 2009 22:30:42 +0000 (UTC)
Subject: rpms/gnome-power-manager/devel .cvsignore, 1.52,
	1.53 gnome-power-manager.spec, 1.139, 1.140 sources, 1.52, 1.53
Message-ID: <20090107223042.C59D770100@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-power-manager/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31374

Modified Files:
	.cvsignore gnome-power-manager.spec sources 
Log Message:
2.25.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-power-manager/devel/.cvsignore,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- .cvsignore	18 Dec 2008 17:41:59 -0000	1.52
+++ .cvsignore	7 Jan 2009 22:30:12 -0000	1.53
@@ -1 +1 @@
-gnome-power-manager-2.25.1.tar.gz
+gnome-power-manager-2.25.2.tar.bz2


Index: gnome-power-manager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-power-manager/devel/gnome-power-manager.spec,v
retrieving revision 1.139
retrieving revision 1.140
diff -u -r1.139 -r1.140
--- gnome-power-manager.spec	20 Dec 2008 00:36:50 -0000	1.139
+++ gnome-power-manager.spec	7 Jan 2009 22:30:12 -0000	1.140
@@ -3,8 +3,8 @@
 
 Summary: GNOME Power Manager
 Name: gnome-power-manager
-Version: 2.25.1
-Release: 2%{?dist}
+Version: 2.25.2
+Release: 1%{?dist}
 License: GPLv2+ and GFDL
 Group: Applications/System
 Source: http://download.gnome.org/sources/gnome-power-manager/2.25/gnome-power-manager-%{version}.tar.gz
@@ -160,6 +160,9 @@
 %{_datadir}/gnome-2.0/ui/GNOME_InhibitApplet.xml
 
 %changelog
+* Wed Jan  7 2009 Matthias Clasen <mclasen at redhat.com> - 2.25.2-1
+- Update to 2.25.2
+
 * Fri Dec 19 2008 Matthias Clasen <mclasen at redhat.com> - 2.25.1-2
 - Fix the spec file 
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-power-manager/devel/sources,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- sources	18 Dec 2008 17:42:00 -0000	1.52
+++ sources	7 Jan 2009 22:30:12 -0000	1.53
@@ -1 +1 @@
-0233c51cfbf51bee580b664d9fda2cc3  gnome-power-manager-2.25.1.tar.gz
+6441aa7af3d2ee822954e8279e0d9b3a  gnome-power-manager-2.25.2.tar.bz2



From caillon at fedoraproject.org  Wed Jan  7 22:31:12 2009
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Wed,  7 Jan 2009 22:31:12 +0000 (UTC)
Subject: rpms/seamonkey/F-10 seamonkey.sh.in, 1.5, 1.6 seamonkey.spec, 1.48,
	1.49
Message-ID: <20090107223112.0297370100@cvs1.fedora.phx.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/seamonkey/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31488

Modified Files:
	seamonkey.sh.in seamonkey.spec 
Log Message:
* Wed Jan 07 2009 Christopher Aillon <caillon at redhat.com> - 1.1.14-3
- Disable the crash dialog



Index: seamonkey.sh.in
===================================================================
RCS file: /cvs/extras/rpms/seamonkey/F-10/seamonkey.sh.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- seamonkey.sh.in	1 Oct 2007 10:27:50 -0000	1.5
+++ seamonkey.sh.in	7 Jan 2009 22:30:41 -0000	1.6
@@ -91,6 +91,12 @@
 #MOZ_DISABLE_PANGO=1
 #export MOZ_DISABLE_PANGO
 
+##
+## Disable the GNOME crash dialog, Moz has it's own
+## 
+GNOME_DISABLE_CRASH_DIALOG=1
+export GNOME_DISABLE_CRASH_DIALOG
+
 function check_running() {
     $MOZ_CLIENT_PROGRAM 'ping()' 2>/dev/null >/dev/null
     RETURN_VAL=$?


Index: seamonkey.spec
===================================================================
RCS file: /cvs/extras/rpms/seamonkey/F-10/seamonkey.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- seamonkey.spec	5 Jan 2009 14:14:59 -0000	1.48
+++ seamonkey.spec	7 Jan 2009 22:30:41 -0000	1.49
@@ -12,7 +12,7 @@
 Name:           seamonkey
 Summary:        Web browser, e-mail, news, IRC client, HTML editor
 Version:        1.1.14
-Release:        2%{?dist}
+Release:        3%{?dist}
 URL:            http://www.mozilla.org/projects/seamonkey/
 License:        MPLv1.1
 Group:          Applications/Internet
@@ -437,6 +437,9 @@
 
 
 %changelog
+* Wed Jan 07 2009 Christopher Aillon <caillon at redhat.com> - 1.1.14-3
+- Disable the crash dialog
+
 * Mon Jan 5 2009 Martin Stransky <stransky at redhat.com> 1.1.14-2
 - disabled -O2 optimalization for i386 as a workaround for #468415
 * Wed Dec 17 2008 Kai Engert <kengert at redhat.com> - 1.1.14-1



From caillon at fedoraproject.org  Wed Jan  7 22:32:23 2009
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Wed,  7 Jan 2009 22:32:23 +0000 (UTC)
Subject: rpms/seamonkey/F-9 seamonkey.sh.in, 1.5, 1.6 seamonkey.spec, 1.49,
	1.50
Message-ID: <20090107223223.DDCB070100@cvs1.fedora.phx.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/seamonkey/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31684

Modified Files:
	seamonkey.sh.in seamonkey.spec 
Log Message:
* Wed Jan 07 2009 Christopher Aillon <caillon at redhat.com> - 1.1.14-2
- Disable the crash dialog



Index: seamonkey.sh.in
===================================================================
RCS file: /cvs/extras/rpms/seamonkey/F-9/seamonkey.sh.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- seamonkey.sh.in	1 Oct 2007 10:27:50 -0000	1.5
+++ seamonkey.sh.in	7 Jan 2009 22:31:53 -0000	1.6
@@ -91,6 +91,12 @@
 #MOZ_DISABLE_PANGO=1
 #export MOZ_DISABLE_PANGO
 
+##
+## Disable the GNOME crash dialog, Moz has it's own
+## 
+GNOME_DISABLE_CRASH_DIALOG=1
+export GNOME_DISABLE_CRASH_DIALOG
+
 function check_running() {
     $MOZ_CLIENT_PROGRAM 'ping()' 2>/dev/null >/dev/null
     RETURN_VAL=$?


Index: seamonkey.spec
===================================================================
RCS file: /cvs/extras/rpms/seamonkey/F-9/seamonkey.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- seamonkey.spec	18 Dec 2008 00:26:55 -0000	1.49
+++ seamonkey.spec	7 Jan 2009 22:31:53 -0000	1.50
@@ -12,7 +12,7 @@
 Name:           seamonkey
 Summary:        Web browser, e-mail, news, IRC client, HTML editor
 Version:        1.1.14
-Release:        1%{?dist}
+Release:        2%{?dist}
 URL:            http://www.mozilla.org/projects/seamonkey/
 License:        MPLv1.1
 Group:          Applications/Internet
@@ -432,6 +432,9 @@
 
 
 %changelog
+* Wed Jan 07 2009 Christopher Aillon <caillon at redhat.com> - 1.1.14-2
+- Disable the crash dialog
+
 * Wed Dec 17 2008 Kai Engert <kengert at redhat.com> - 1.1.14-1
 - Update to 1.1.14
 * Wed Nov 12 2008 Christopher Aillon <caillon at redhat.com> - 1.1.13-1



From mnowak at fedoraproject.org  Wed Jan  7 22:34:36 2009
From: mnowak at fedoraproject.org (Michal Nowak)
Date: Wed,  7 Jan 2009 22:34:36 +0000 (UTC)
Subject: rpms/libev/devel .cvsignore, 1.4, 1.5 import.log, 1.3,
	1.4 libev.spec, 1.3, 1.4 sources, 1.4, 1.5
Message-ID: <20090107223436.981F870100@cvs1.fedora.phx.redhat.com>

Author: mnowak

Update of /cvs/pkgs/rpms/libev/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32125/devel

Modified Files:
	.cvsignore import.log libev.spec sources 
Log Message:
3.52



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libev/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	24 Dec 2008 22:57:20 -0000	1.4
+++ .cvsignore	7 Jan 2009 22:34:05 -0000	1.5
@@ -1 +1 @@
-libev-3.51.tar.gz
+libev-3.52.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/libev/devel/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- import.log	24 Dec 2008 22:57:20 -0000	1.3
+++ import.log	7 Jan 2009 22:34:05 -0000	1.4
@@ -1,3 +1,4 @@
 libev-3_48-1_fc10:HEAD:libev-3.48-1.fc10.src.rpm:1226235699
 libev-3_49-1_fc10:HEAD:libev-3.49-1.fc10.src.rpm:1227205127
 libev-3_51-1_fc10:HEAD:libev-3.51-1.fc10.src.rpm:1230159384
+libev-3_52-1_fc10:HEAD:libev-3.52-1.fc10.src.rpm:1231367575


Index: libev.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libev/devel/libev.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- libev.spec	24 Dec 2008 22:57:20 -0000	1.3
+++ libev.spec	7 Jan 2009 22:34:06 -0000	1.4
@@ -1,5 +1,5 @@
 Name:		libev
-Version:	3.51
+Version:	3.52
 Release:	1%{?dist}
 Summary:	High-performance event loop/event model with lots of features
 
@@ -82,6 +82,9 @@
 
 
 %changelog
+* Wed Jan 07 2009 Michal Nowak <mnowak at redhat.com> - 3.52-1
+- 3.52
+
 * Wed Dec 24 2008 Michal Nowak <mnowak at redhat.com> - 3.51-1
 - 3.51
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libev/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	24 Dec 2008 22:57:20 -0000	1.4
+++ sources	7 Jan 2009 22:34:06 -0000	1.5
@@ -1 +1 @@
-a756eb5c2fabf99212dde568627cf58a  libev-3.51.tar.gz
+5bdabddcd63680b31cff97aa668e5b03  libev-3.52.tar.gz



From caillon at fedoraproject.org  Wed Jan  7 22:34:52 2009
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Wed,  7 Jan 2009 22:34:52 +0000 (UTC)
Subject: rpms/thunderbird/devel thunderbird.sh.in, 1.9, 1.10 thunderbird.spec,
	1.120, 1.121
Message-ID: <20090107223452.8AD9A70100@cvs1.fedora.phx.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/thunderbird/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32171

Modified Files:
	thunderbird.sh.in thunderbird.spec 
Log Message:
* Wed Jan 07 2009 Christopher Aillon <caillon at redhat.com> - 2.0.0.18-2
- Disable the crash dialog



Index: thunderbird.sh.in
===================================================================
RCS file: /cvs/extras/rpms/thunderbird/devel/thunderbird.sh.in,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- thunderbird.sh.in	3 Mar 2008 14:23:29 -0000	1.9
+++ thunderbird.sh.in	7 Jan 2009 22:34:21 -0000	1.10
@@ -40,4 +40,10 @@
 #MOZ_DISABLE_PANGO=1
 #export MOZ_DISABLE_PANGO
 
+##
+## Disable the GNOME crash dialog, Moz has it's own
+## 
+GNOME_DISABLE_CRASH_DIALOG=1
+export GNOME_DISABLE_CRASH_DIALOG
+
 exec $MOZ_PROGRAM "$@"


Index: thunderbird.spec
===================================================================
RCS file: /cvs/extras/rpms/thunderbird/devel/thunderbird.spec,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -r1.120 -r1.121
--- thunderbird.spec	20 Nov 2008 00:24:37 -0000	1.120
+++ thunderbird.spec	7 Jan 2009 22:34:22 -0000	1.121
@@ -8,7 +8,7 @@
 Summary:        Mozilla Thunderbird mail/newsgroup client
 Name:           thunderbird
 Version:        2.0.0.18
-Release:        1%{?dist}
+Release:        2%{?dist}
 URL:            http://www.mozilla.org/projects/thunderbird/
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 Group:          Applications/Internet
@@ -329,6 +329,9 @@
 #===============================================================================
 
 %changelog
+* Wed Jan 07 2009 Christopher Aillon <caillon at redhat.com> - 2.0.0.18-2
+- Disable the crash dialog
+
 * Wed Nov 19 2008 Christopher Aillon <caillon at redhat.com> 2.0.0.18-1
 - Update to 2.0.0.18
 



From caillon at fedoraproject.org  Wed Jan  7 22:35:54 2009
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Wed,  7 Jan 2009 22:35:54 +0000 (UTC)
Subject: rpms/thunderbird/F-10 thunderbird.sh.in, 1.9, 1.10 thunderbird.spec,
	1.121, 1.122
Message-ID: <20090107223554.E2E2270100@cvs1.fedora.phx.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/thunderbird/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32423

Modified Files:
	thunderbird.sh.in thunderbird.spec 
Log Message:
* Wed Jan 07 2009 Christopher Aillon <caillon at redhat.com> - 2.0.0.19-2
- Disable the crash dialog



Index: thunderbird.sh.in
===================================================================
RCS file: /cvs/extras/rpms/thunderbird/F-10/thunderbird.sh.in,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- thunderbird.sh.in	3 Mar 2008 14:23:29 -0000	1.9
+++ thunderbird.sh.in	7 Jan 2009 22:35:23 -0000	1.10
@@ -40,4 +40,10 @@
 #MOZ_DISABLE_PANGO=1
 #export MOZ_DISABLE_PANGO
 
+##
+## Disable the GNOME crash dialog, Moz has it's own
+## 
+GNOME_DISABLE_CRASH_DIALOG=1
+export GNOME_DISABLE_CRASH_DIALOG
+
 exec $MOZ_PROGRAM "$@"


Index: thunderbird.spec
===================================================================
RCS file: /cvs/extras/rpms/thunderbird/F-10/thunderbird.spec,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -r1.121 -r1.122
--- thunderbird.spec	5 Jan 2009 17:59:09 -0000	1.121
+++ thunderbird.spec	7 Jan 2009 22:35:24 -0000	1.122
@@ -8,7 +8,7 @@
 Summary:        Mozilla Thunderbird mail/newsgroup client
 Name:           thunderbird
 Version:        2.0.0.19
-Release:        1%{?dist}
+Release:        2%{?dist}
 URL:            http://www.mozilla.org/projects/thunderbird/
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 Group:          Applications/Internet
@@ -329,6 +329,9 @@
 #===============================================================================
 
 %changelog
+* Wed Jan 07 2009 Christopher Aillon <caillon at redhat.com> - 2.0.0.19-2
+- Disable the crash dialog
+
 * Mon Jan  5 2009 Christopher Aillon <caillon at redhat.com> 2.0.0.19-1
 - Update to 2.0.0.19
 



From caillon at fedoraproject.org  Wed Jan  7 22:36:59 2009
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Wed,  7 Jan 2009 22:36:59 +0000 (UTC)
Subject: rpms/thunderbird/F-9 thunderbird.sh.in, 1.9, 1.10 thunderbird.spec, 
	1.123, 1.124
Message-ID: <20090107223659.0455F70141@cvs1.fedora.phx.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/thunderbird/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32703

Modified Files:
	thunderbird.sh.in thunderbird.spec 
Log Message:
* Wed Jan 07 2009 Christopher Aillon <caillon at redhat.com> - 2.0.0.19-2
- Disable the crash dialog



Index: thunderbird.sh.in
===================================================================
RCS file: /cvs/extras/rpms/thunderbird/F-9/thunderbird.sh.in,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- thunderbird.sh.in	3 Mar 2008 14:23:29 -0000	1.9
+++ thunderbird.sh.in	7 Jan 2009 22:36:28 -0000	1.10
@@ -40,4 +40,10 @@
 #MOZ_DISABLE_PANGO=1
 #export MOZ_DISABLE_PANGO
 
+##
+## Disable the GNOME crash dialog, Moz has it's own
+## 
+GNOME_DISABLE_CRASH_DIALOG=1
+export GNOME_DISABLE_CRASH_DIALOG
+
 exec $MOZ_PROGRAM "$@"


Index: thunderbird.spec
===================================================================
RCS file: /cvs/extras/rpms/thunderbird/F-9/thunderbird.spec,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -r1.123 -r1.124
--- thunderbird.spec	5 Jan 2009 18:04:35 -0000	1.123
+++ thunderbird.spec	7 Jan 2009 22:36:28 -0000	1.124
@@ -8,7 +8,7 @@
 Summary:        Mozilla Thunderbird mail/newsgroup client
 Name:           thunderbird
 Version:        2.0.0.19
-Release:        1%{?dist}
+Release:        2%{?dist}
 URL:            http://www.mozilla.org/projects/thunderbird/
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 Group:          Applications/Internet
@@ -329,6 +329,9 @@
 #===============================================================================
 
 %changelog
+* Wed Jan 07 2009 Christopher Aillon <caillon at redhat.com> - 2.0.0.19-2
+- Disable the crash dialog
+
 * Mon Jan  5 2009 Christopher Aillon <caillon at redhat.com> 2.0.0.19-1
 - Update to 2.0.0.19
 



From mclasen at fedoraproject.org  Wed Jan  7 22:37:06 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Wed,  7 Jan 2009 22:37:06 +0000 (UTC)
Subject: rpms/seahorse/devel .cvsignore, 1.22, 1.23 seahorse.spec, 1.57,
	1.58 sources, 1.24, 1.25
Message-ID: <20090107223706.1390570141@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/seahorse/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32741

Modified Files:
	.cvsignore seahorse.spec sources 
Log Message:
2.25.4



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/seahorse/devel/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- .cvsignore	22 Dec 2008 13:19:57 -0000	1.22
+++ .cvsignore	7 Jan 2009 22:36:35 -0000	1.23
@@ -1 +1 @@
-seahorse-2.25.3.tar.bz2
+seahorse-2.25.4.tar.bz2


Index: seahorse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/seahorse/devel/seahorse.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- seahorse.spec	22 Dec 2008 13:19:58 -0000	1.57
+++ seahorse.spec	7 Jan 2009 22:36:35 -0000	1.58
@@ -1,5 +1,5 @@
 Name: 		seahorse
-Version: 	2.25.3
+Version: 	2.25.4
 Release:        1%{?dist}
 Summary:	A GNOME application for managing encryption keys
 Group: 		User Interface/Desktops
@@ -10,10 +10,7 @@
 Source:         http://download.gnome.org/sources/seahorse/2.25/%{name}-%{version}.tar.bz2
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Patch0:         seahorse-2.23.90-gpg2.patch
-
-# Fix compilation by reverting upstream commit 2671
-Patch1:		seahorse-2.25.3-pkcs11-slot.patch
+#Patch0:         seahorse-2.23.90-gpg2.patch
 
 BuildRequires:  desktop-file-utils
 BuildRequires:  gettext
@@ -62,8 +59,7 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .gpg2
-%patch1 -p1 -b .pcks11-slot
+#%patch0 -p1 -b .gpg2
 
 %build
 %configure --disable-scrollkeeper
@@ -165,6 +161,9 @@
 %{_libdir}/pkgconfig/cryptui-0.0.pc
 
 %changelog
+* Wed Jan  7 2009 Matthias Clasen <mclasen at redhat.com> 2.25.4-1
+- Update to 2.25.4
+
 * Mon Dec 22 2008 Tomas Bzatek <tbzatek at redhat.com> 2.25.3-1
 - Update to 2.25.3
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/seahorse/devel/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- sources	22 Dec 2008 13:19:58 -0000	1.24
+++ sources	7 Jan 2009 22:36:35 -0000	1.25
@@ -1 +1 @@
-914a8eb10695ae26d02d2a63698ab956  seahorse-2.25.3.tar.bz2
+4a7f3aaf17683eb2639088e70a921a50  seahorse-2.25.4.tar.bz2



From mclasen at fedoraproject.org  Wed Jan  7 22:39:08 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Wed,  7 Jan 2009 22:39:08 +0000 (UTC)
Subject: rpms/gnome-power-manager/devel gnome-power-manager.spec, 1.140,
	1.141
Message-ID: <20090107223908.3FAE870100@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-power-manager/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1173

Modified Files:
	gnome-power-manager.spec 
Log Message:
fix source



Index: gnome-power-manager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-power-manager/devel/gnome-power-manager.spec,v
retrieving revision 1.140
retrieving revision 1.141
diff -u -r1.140 -r1.141
--- gnome-power-manager.spec	7 Jan 2009 22:30:12 -0000	1.140
+++ gnome-power-manager.spec	7 Jan 2009 22:38:37 -0000	1.141
@@ -7,7 +7,7 @@
 Release: 1%{?dist}
 License: GPLv2+ and GFDL
 Group: Applications/System
-Source: http://download.gnome.org/sources/gnome-power-manager/2.25/gnome-power-manager-%{version}.tar.gz
+Source: http://download.gnome.org/sources/gnome-power-manager/2.25/gnome-power-manager-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 URL: http://projects.gnome.org/gnome-power-manager/
 



From sandeen at fedoraproject.org  Wed Jan  7 22:53:40 2009
From: sandeen at fedoraproject.org (Eric Sandeen)
Date: Wed,  7 Jan 2009 22:53:40 +0000 (UTC)
Subject: rpms/xfsprogs/devel xfsprogs-2.10.2-fix-lib-perms.patch, NONE,
	1.1 xfsprogs.spec, 1.47, 1.48
Message-ID: <20090107225340.6860970100@cvs1.fedora.phx.redhat.com>

Author: sandeen

Update of /cvs/pkgs/rpms/xfsprogs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2649

Modified Files:
	xfsprogs.spec 
Added Files:
	xfsprogs-2.10.2-fix-lib-perms.patch 
Log Message:
* Wed Jan 07 2009 Eric Sandeen <sandeen at redhat.com> 2.10.2-2
- Fix perms of libhandle.so so that it's properly stripped


xfsprogs-2.10.2-fix-lib-perms.patch:

--- NEW FILE xfsprogs-2.10.2-fix-lib-perms.patch ---
Index: xfsprogs-2.10.2/include/buildmacros
===================================================================
--- xfsprogs-2.10.2.orig/include/buildmacros
+++ xfsprogs-2.10.2/include/buildmacros
@@ -56,7 +56,7 @@ ifeq ($(ENABLE_SHARED),yes)
 INSTALL_LTLIB = \
 	cd $(TOPDIR)/$(LIBNAME)/.libs; \
 	../$(INSTALL) -m 755 -d $(PKG_LIB_DIR); \
-	../$(INSTALL) -m 644 -T so_dot_version $(LIBNAME).lai $(PKG_LIB_DIR); \
+	../$(INSTALL) -m 755 -T so_dot_version $(LIBNAME).lai $(PKG_LIB_DIR); \
 	../$(INSTALL) -T so_dot_current $(LIBNAME).lai $(PKG_LIB_DIR)
 endif
 


Index: xfsprogs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfsprogs/devel/xfsprogs.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- xfsprogs.spec	8 Dec 2008 04:30:03 -0000	1.47
+++ xfsprogs.spec	7 Jan 2009 22:53:10 -0000	1.48
@@ -1,7 +1,7 @@
 Summary:	Utilities for managing the XFS filesystem
 Name:		xfsprogs
 Version:	2.10.2
-Release:	1%{?dist}
+Release:	2%{?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
@@ -21,6 +21,7 @@
 Patch0:		xfsprogs-2.10.1-parallel-build.patch
 Patch1:		xfsprogs-2.10.1-libdisk-gfs2.patch
 Patch2:		xfsprogs-2.10.1-ustat.patch
+Patch3:		xfsprogs-2.10.2-fix-lib-perms.patch
 
 %description
 A set of commands to use the XFS filesystem, including mkfs.xfs.
@@ -54,6 +55,7 @@
 %patch0 -p2
 %patch1 -p2
 %patch2 -p2
+%patch3 -p1
 
 %build
 # xfsprogs abuses libexecdir
@@ -117,6 +119,9 @@
 %{_libdir}/*.so
 
 %changelog
+* Wed Jan 07 2009 Eric Sandeen <sandeen at redhat.com> 2.10.2-2
+- Fix perms of libhandle.so so that it's properly stripped
+
 * Sun Dec 07 2008 Eric Sandeen <sandeen at redhat.com> 2.10.2-1
 - New upstream release, bugfix only.
 



From pgordon at fedoraproject.org  Wed Jan  7 23:02:05 2009
From: pgordon at fedoraproject.org (Peter Gordon)
Date: Wed,  7 Jan 2009 23:02:05 +0000 (UTC)
Subject: rpms/deluge/devel deluge-fix-get_tracker_host-if-no-tracker.patch, 
	NONE, 1.1 deluge.spec, 1.77, 1.78
Message-ID: <20090107230205.D5D1470100@cvs1.fedora.phx.redhat.com>

Author: pgordon

Update of /cvs/pkgs/rpms/deluge/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3585

Modified Files:
	deluge.spec 
Added Files:
	deluge-fix-get_tracker_host-if-no-tracker.patch 
Log Message:
Add upstreamed patch to fix RHBZ# 479097 (upstream ticket #704)

deluge-fix-get_tracker_host-if-no-tracker.patch:

--- NEW FILE deluge-fix-get_tracker_host-if-no-tracker.patch ---
If the torrent has no tracker, the call to inet_aton will fail because the
hostname is empty. This causes torrents to not be shown, or to be shown with
an error status.  Replacing this parameter with host ensures that this is no
longer the case. (From upstream changeset 4492.)

Index: /branches/1.1.0_RC/deluge/core/torrent.py
===================================================================
--- /branches/1.1.0_RC/deluge/core/torrent.py (revision 4488)
+++ /branches/1.1.0_RC/deluge/core/torrent.py (revision 4492)
@@ -523,5 +523,5 @@
                 import socket
                 try:
-                    socket.inet_aton(url.hostname)
+                    socket.inet_aton(host)
                 except socket.error:
                     pass
Index: /branches/1.1.0_RC/ChangeLog
===================================================================
--- /branches/1.1.0_RC/ChangeLog (revision 4488)
+++ /branches/1.1.0_RC/ChangeLog (revision 4492)
@@ -1,2 +1,6 @@
+Deluge 1.1.0_RC4 (In Development)
+ Core:
+  * Fix issue in get_tracker_host when the torrent has no tracker
+
 Deluge 1.1.0_RC3 (05 January 2009)
  Core:


Index: deluge.spec
===================================================================
RCS file: /cvs/pkgs/rpms/deluge/devel/deluge.spec,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- deluge.spec	6 Jan 2009 21:07:16 -0000	1.77
+++ deluge.spec	7 Jan 2009 23:01:35 -0000	1.78
@@ -7,7 +7,7 @@
 
 Name:		deluge
 Version:	1.1.0
-Release:	0.2.rc3%{?dist}
+Release:	0.3.rc3%{?dist}
 Summary:	A GTK+ BitTorrent client with support for DHT, UPnP, and PEX
 Group:		Applications/Internet
 License:	GPLv2+
@@ -15,6 +15,12 @@
 
 Source0:	http://download.deluge-torrent.org/source/%{version}/%{name}-1.1.0_RC3.tar.bz2
 
+## Fix issue in get_tracker_host when the torrent has no tracker; from
+## upstream SVN (changeset 4492 - will be in 1.1.0 RC4).
+## Fedora bug:   https://bugzilla.redhat.com/show_bug.cgi?id=479097
+## Upstream bug: http://dev.deluge-torrent.org/ticket/704
+Patch0: 	%{name}-fix-get_tracker_host-if-no-tracker.patch
+
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:	noarch
 
@@ -50,6 +56,7 @@
 
 %prep
 %setup -qn "%{name}-1.1.0_RC3"
+%patch0 -p3 -b .fix-get_tracker-host-if-no-tracker
 
 
 %build
@@ -133,7 +140,15 @@
 
 
 %changelog
-* Thu Jan 06 2009 Peter Gordon <peter at thecodergeek.com> - 1.1.0-0.2.rc3
+* Wed Jan 07 2009 Peter Gordon <peter at thecodergeek.com> - 1.1.0-0.3.rc3
+- Add patch from upstream SVN to fix an error where torrents are not shown (or
+  possibly shown in "Error" states) due to a bad inet_aton call:
+  + fix-get_tracker-host-if-no-tracker.patch
+- Resolves: #479097 (No torrent shown in menu); thanks to Mamoru Tasaka for
+  the bug report.
+- Fix day of previous %%changelog entry.
+
+* Tue Jan 06 2009 Peter Gordon <peter at thecodergeek.com> - 1.1.0-0.2.rc3
 - Update to new upstream release candidate (1.1.0 RC3)
 - Build against the system rb_libtorrent instead of using the in-tarball copy
   (requires rb_libtorrent 0.14+), and adjust dependencies accordingly. Drop



From kkofler at fedoraproject.org  Wed Jan  7 23:14:59 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Wed,  7 Jan 2009 23:14:59 +0000 (UTC)
Subject: rpms/xine-lib/F-8 xine-lib-1.1.16-old-caca.patch, NONE,
	1.1 xine-lib.spec, 1.42, 1.43
Message-ID: <20090107231459.51A8470100@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/xine-lib/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5736/F-8

Modified Files:
	xine-lib.spec 
Added Files:
	xine-lib-1.1.16-old-caca.patch 
Log Message:
* Wed Jan 07 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 1.1.16-1.1
- patch for old libcaca in F9-

xine-lib-1.1.16-old-caca.patch:

--- NEW FILE xine-lib-1.1.16-old-caca.patch ---
--- src/video_out/video_out_caca.c	Tue Nov 18 21:13:55 2008 +0100
+++ src/video_out/video_out_caca.c	Mon Nov 10 16:33:51 2008 +0100
@@ -276,7 +276,6 @@ static int caca_redraw_needed (vo_driver
 
 static vo_driver_t *open_plugin (video_driver_class_t *class_gen, const void *visual_gen) {
   caca_class_t         *class = (caca_class_t *) class_gen;
-  caca_display_t       *dp = (caca_display_t *)visual_gen;
   caca_driver_t        *this;
 
   this = calloc(1, sizeof (caca_driver_t));
@@ -301,13 +300,8 @@ static vo_driver_t *open_plugin (video_d
   this->yuv2rgb_factory = yuv2rgb_factory_init(MODE_32_RGB, 0, NULL);
   this->yuv2rgb_factory->set_csc_levels(this->yuv2rgb_factory, 0, 128, 128);
 
-  if (dp) {
-    this->cv = caca_get_canvas(dp);
-    this->dp = dp;
-  } else {
-    this->cv = cucul_create_canvas(0, 0);
-    this->dp = caca_create_display(this->cv);
-  }
+  this->cv = cucul_create_canvas(0, 0);
+  this->dp = caca_create_display(this->cv);
 
   caca_refresh_display(this->dp);
   return &this->vo_driver;



Index: xine-lib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xine-lib/F-8/xine-lib.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- xine-lib.spec	7 Jan 2009 21:17:13 -0000	1.42
+++ xine-lib.spec	7 Jan 2009 23:14:28 -0000	1.43
@@ -13,16 +13,18 @@
     %define     have_vidix  0
 %endif # ix86
 
-%if 0%{?fedora} > 9
-%define _with_caca --with-caca 
+%if 0%{?fedora} <= 9
+    %define     old_caca    1
 %endif
 
 %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
@@ -34,7 +36,7 @@
 Summary:        Xine library
 Name:           xine-lib
 Version:        1.1.16
-Release:        1%{?dist}
+Release:        1%{?dist}.1
 License:        GPLv2+
 Group:          System Environment/Libraries
 URL:            http://xinehq.de/
@@ -50,6 +52,7 @@
 
 Patch1:         %{name}-1.1.4-optflags.patch
 Patch6:         %{name}-1.1.1-deepbind-939.patch
+Patch7:         %{name}-1.1.16-old-caca.patch
 ## upstream patches
 
 Provides:       xine-lib(plugin-abi) = %{abiver}
@@ -69,8 +72,12 @@
 %if %{with_aalib}
 BuildRequires:  aalib-devel >= 1.4
 %endif # aalib
-%if 0%{?_with_caca:1}
-BuildRequires:  libcaca-devel >= 0.99-0.5.beta16 
+%if %{with_caca}
+%if 0%{?old_caca}
+BuildRequires:  libcaca-devel >= 0.99
+%else
+BuildRequires:  libcaca-devel >= 0.99-0.5.beta16
+%endif
 %endif # caca
 %if 0%{!?_without_directfb:1}
 BuildRequires:  directfb-devel
@@ -170,7 +177,7 @@
 %if %{with_aalib}
   - AA-lib
 %endif # aalib
-%if 0%{?with_caca:1}
+%if %{with_caca}
   - Libcaca
 %endif # caca
 %if 0%{!?_without_imagemagick:1}
@@ -190,6 +197,9 @@
 touch -r m4/optimizations.m4.stamp m4/optimizations.m4
 # Patch6 needed at least when compiling with external ffmpeg, #939.
 %patch6 -p1 -b .deepbind
+%if 0%{?old_caca}
+%patch7 -p0 -b .old-caca
+%endif
 
 # Avoid standard rpaths on lib64 archs: (autotools patch should handle this, no? -- Rex )
 #sed -i -e 's|"/lib /usr/lib\b|"/%{_lib} %{_libdir}|' configure
@@ -227,7 +237,6 @@
 %if 0%{?_without_imagemagick:1}
     --without-imagemagick \
 %endif # imagemagick
-    %{?_with_caca} %{!?_with_caca:--without-caca} \
     %{!?_without_arts:--with-arts} %{?_without_arts} \
     --with-wavpack \
     --with-real-codecs-path=%{codecdir} \
@@ -401,7 +410,7 @@
 %if %{with_aalib}
 %{_libdir}/xine/plugins/%{abiver}/xineplug_vo_out_aa.so
 %endif # aalib
-%if 0%{?_with_caca}
+%if %{with_caca}
 %{_libdir}/xine/plugins/%{abiver}/xineplug_vo_out_caca.so
 %endif # caca
 %if 0%{!?_without_directfb:1}
@@ -425,6 +434,9 @@
 
 
 %changelog
+* Wed Jan 07 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 1.1.16-1.1
+- patch for old libcaca in F9-
+
 * Wed Jan 07 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.1.16-1
 - xine-lib-1.1.16, plugin ABI 1.25
 - --with-external-libdvdnav, include mpeg demuxers (#213597)



From kkofler at fedoraproject.org  Wed Jan  7 23:14:59 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Wed,  7 Jan 2009 23:14:59 +0000 (UTC)
Subject: rpms/xine-lib/F-9 xine-lib-1.1.16-old-caca.patch, NONE,
	1.1 xine-lib.spec, 1.47, 1.48
Message-ID: <20090107231459.599067013F@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/xine-lib/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5736/F-9

Modified Files:
	xine-lib.spec 
Added Files:
	xine-lib-1.1.16-old-caca.patch 
Log Message:
* Wed Jan 07 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 1.1.16-1.1
- patch for old libcaca in F9-

xine-lib-1.1.16-old-caca.patch:

--- NEW FILE xine-lib-1.1.16-old-caca.patch ---
--- src/video_out/video_out_caca.c	Tue Nov 18 21:13:55 2008 +0100
+++ src/video_out/video_out_caca.c	Mon Nov 10 16:33:51 2008 +0100
@@ -276,7 +276,6 @@ static int caca_redraw_needed (vo_driver
 
 static vo_driver_t *open_plugin (video_driver_class_t *class_gen, const void *visual_gen) {
   caca_class_t         *class = (caca_class_t *) class_gen;
-  caca_display_t       *dp = (caca_display_t *)visual_gen;
   caca_driver_t        *this;
 
   this = calloc(1, sizeof (caca_driver_t));
@@ -301,13 +300,8 @@ static vo_driver_t *open_plugin (video_d
   this->yuv2rgb_factory = yuv2rgb_factory_init(MODE_32_RGB, 0, NULL);
   this->yuv2rgb_factory->set_csc_levels(this->yuv2rgb_factory, 0, 128, 128);
 
-  if (dp) {
-    this->cv = caca_get_canvas(dp);
-    this->dp = dp;
-  } else {
-    this->cv = cucul_create_canvas(0, 0);
-    this->dp = caca_create_display(this->cv);
-  }
+  this->cv = cucul_create_canvas(0, 0);
+  this->dp = caca_create_display(this->cv);
 
   caca_refresh_display(this->dp);
   return &this->vo_driver;



Index: xine-lib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xine-lib/F-9/xine-lib.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- xine-lib.spec	7 Jan 2009 21:17:13 -0000	1.47
+++ xine-lib.spec	7 Jan 2009 23:14:28 -0000	1.48
@@ -13,16 +13,18 @@
     %define     have_vidix  0
 %endif # ix86
 
-%if 0%{?fedora} > 9
-%define _with_caca --with-caca 
+%if 0%{?fedora} <= 9
+    %define     old_caca    1
 %endif
 
 %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
@@ -34,7 +36,7 @@
 Summary:        Xine library
 Name:           xine-lib
 Version:        1.1.16
-Release:        1%{?dist}
+Release:        1%{?dist}.1
 License:        GPLv2+
 Group:          System Environment/Libraries
 URL:            http://xinehq.de/
@@ -50,6 +52,7 @@
 
 Patch1:         %{name}-1.1.4-optflags.patch
 Patch6:         %{name}-1.1.1-deepbind-939.patch
+Patch7:         %{name}-1.1.16-old-caca.patch
 ## upstream patches
 
 Provides:       xine-lib(plugin-abi) = %{abiver}
@@ -69,8 +72,12 @@
 %if %{with_aalib}
 BuildRequires:  aalib-devel >= 1.4
 %endif # aalib
-%if 0%{?_with_caca:1}
-BuildRequires:  libcaca-devel >= 0.99-0.5.beta16 
+%if %{with_caca}
+%if 0%{?old_caca}
+BuildRequires:  libcaca-devel >= 0.99
+%else
+BuildRequires:  libcaca-devel >= 0.99-0.5.beta16
+%endif
 %endif # caca
 %if 0%{!?_without_directfb:1}
 BuildRequires:  directfb-devel
@@ -170,7 +177,7 @@
 %if %{with_aalib}
   - AA-lib
 %endif # aalib
-%if 0%{?with_caca:1}
+%if %{with_caca}
   - Libcaca
 %endif # caca
 %if 0%{!?_without_imagemagick:1}
@@ -190,6 +197,9 @@
 touch -r m4/optimizations.m4.stamp m4/optimizations.m4
 # Patch6 needed at least when compiling with external ffmpeg, #939.
 %patch6 -p1 -b .deepbind
+%if 0%{?old_caca}
+%patch7 -p0 -b .old-caca
+%endif
 
 # Avoid standard rpaths on lib64 archs: (autotools patch should handle this, no? -- Rex )
 #sed -i -e 's|"/lib /usr/lib\b|"/%{_lib} %{_libdir}|' configure
@@ -227,7 +237,6 @@
 %if 0%{?_without_imagemagick:1}
     --without-imagemagick \
 %endif # imagemagick
-    %{?_with_caca} %{!?_with_caca:--without-caca} \
     %{!?_without_arts:--with-arts} %{?_without_arts} \
     --with-wavpack \
     --with-real-codecs-path=%{codecdir} \
@@ -401,7 +410,7 @@
 %if %{with_aalib}
 %{_libdir}/xine/plugins/%{abiver}/xineplug_vo_out_aa.so
 %endif # aalib
-%if 0%{?_with_caca}
+%if %{with_caca}
 %{_libdir}/xine/plugins/%{abiver}/xineplug_vo_out_caca.so
 %endif # caca
 %if 0%{!?_without_directfb:1}
@@ -425,6 +434,9 @@
 
 
 %changelog
+* Wed Jan 07 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 1.1.16-1.1
+- patch for old libcaca in F9-
+
 * Wed Jan 07 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.1.16-1
 - xine-lib-1.1.16, plugin ABI 1.25
 - --with-external-libdvdnav, include mpeg demuxers (#213597)



From kkofler at fedoraproject.org  Wed Jan  7 23:14:59 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Wed,  7 Jan 2009 23:14:59 +0000 (UTC)
Subject: rpms/xine-lib/devel xine-lib-1.1.16-old-caca.patch, NONE,
	1.1 xine-lib.spec, 1.57, 1.58
Message-ID: <20090107231459.81CD570100@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/xine-lib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5736/devel

Modified Files:
	xine-lib.spec 
Added Files:
	xine-lib-1.1.16-old-caca.patch 
Log Message:
* Wed Jan 07 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 1.1.16-1.1
- patch for old libcaca in F9-

xine-lib-1.1.16-old-caca.patch:

--- NEW FILE xine-lib-1.1.16-old-caca.patch ---
--- src/video_out/video_out_caca.c	Tue Nov 18 21:13:55 2008 +0100
+++ src/video_out/video_out_caca.c	Mon Nov 10 16:33:51 2008 +0100
@@ -276,7 +276,6 @@ static int caca_redraw_needed (vo_driver
 
 static vo_driver_t *open_plugin (video_driver_class_t *class_gen, const void *visual_gen) {
   caca_class_t         *class = (caca_class_t *) class_gen;
-  caca_display_t       *dp = (caca_display_t *)visual_gen;
   caca_driver_t        *this;
 
   this = calloc(1, sizeof (caca_driver_t));
@@ -301,13 +300,8 @@ static vo_driver_t *open_plugin (video_d
   this->yuv2rgb_factory = yuv2rgb_factory_init(MODE_32_RGB, 0, NULL);
   this->yuv2rgb_factory->set_csc_levels(this->yuv2rgb_factory, 0, 128, 128);
 
-  if (dp) {
-    this->cv = caca_get_canvas(dp);
-    this->dp = dp;
-  } else {
-    this->cv = cucul_create_canvas(0, 0);
-    this->dp = caca_create_display(this->cv);
-  }
+  this->cv = cucul_create_canvas(0, 0);
+  this->dp = caca_create_display(this->cv);
 
   caca_refresh_display(this->dp);
   return &this->vo_driver;



Index: xine-lib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xine-lib/devel/xine-lib.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- xine-lib.spec	7 Jan 2009 21:28:55 -0000	1.57
+++ xine-lib.spec	7 Jan 2009 23:14:29 -0000	1.58
@@ -13,16 +13,18 @@
     %define     have_vidix  0
 %endif # ix86
 
-%if 0%{?fedora} > 9
-%define _with_caca --with-caca 
+%if 0%{?fedora} <= 9
+    %define     old_caca    1
 %endif
 
 %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
@@ -34,7 +36,7 @@
 Summary:        Xine library
 Name:           xine-lib
 Version:        1.1.16
-Release:        1%{?dist}
+Release:        1%{?dist}.1
 License:        GPLv2+
 Group:          System Environment/Libraries
 URL:            http://xinehq.de/
@@ -50,6 +52,7 @@
 
 Patch1:         %{name}-1.1.4-optflags.patch
 Patch6:         %{name}-1.1.1-deepbind-939.patch
+Patch7:         %{name}-1.1.16-old-caca.patch
 ## upstream patches
 
 Provides:       xine-lib(plugin-abi) = %{abiver}
@@ -69,8 +72,12 @@
 %if %{with_aalib}
 BuildRequires:  aalib-devel >= 1.4
 %endif # aalib
-%if 0%{?_with_caca:1}
-BuildRequires:  libcaca-devel >= 0.99-0.5.beta16 
+%if %{with_caca}
+%if 0%{?old_caca}
+BuildRequires:  libcaca-devel >= 0.99
+%else
+BuildRequires:  libcaca-devel >= 0.99-0.5.beta16
+%endif
 %endif # caca
 %if 0%{!?_without_directfb:1}
 BuildRequires:  directfb-devel
@@ -170,7 +177,7 @@
 %if %{with_aalib}
   - AA-lib
 %endif # aalib
-%if 0%{?_with_caca:1}
+%if %{with_caca}
   - Libcaca
 %endif # caca
 %if 0%{!?_without_imagemagick:1}
@@ -190,6 +197,9 @@
 touch -r m4/optimizations.m4.stamp m4/optimizations.m4
 # Patch6 needed at least when compiling with external ffmpeg, #939.
 %patch6 -p1 -b .deepbind
+%if 0%{?old_caca}
+%patch7 -p0 -b .old-caca
+%endif
 
 # Avoid standard rpaths on lib64 archs: (autotools patch should handle this, no? -- Rex )
 #sed -i -e 's|"/lib /usr/lib\b|"/%{_lib} %{_libdir}|' configure
@@ -227,7 +237,6 @@
 %if 0%{?_without_imagemagick:1}
     --without-imagemagick \
 %endif # imagemagick
-    %{?_with_caca} %{!?_with_caca:--without-caca} \
     %{!?_without_arts:--with-arts} %{?_without_arts} \
     --with-wavpack \
     --with-real-codecs-path=%{codecdir} \
@@ -401,7 +410,7 @@
 %if %{with_aalib}
 %{_libdir}/xine/plugins/%{abiver}/xineplug_vo_out_aa.so
 %endif # aalib
-%if 0%{?_with_caca:1}
+%if %{with_caca}
 %{_libdir}/xine/plugins/%{abiver}/xineplug_vo_out_caca.so
 %endif # caca
 %if 0%{!?_without_directfb:1}
@@ -425,6 +434,9 @@
 
 
 %changelog
+* Wed Jan 07 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 1.1.16-1.1
+- patch for old libcaca in F9-
+
 * Wed Jan 07 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.1.16-1
 - xine-lib-1.1.16, plugin ABI 1.25
 - --with-external-libdvdnav, include mpeg demuxers (#213597)



From lkundrak at fedoraproject.org  Wed Jan  7 23:17:41 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Wed,  7 Jan 2009 23:17:41 +0000 (UTC)
Subject: rpms/centerim/devel centerim-4.22.6-url-escape-fedora.patch, NONE, 
	1.1 .cvsignore, 1.10, 1.11 centerim.spec, 1.18, 1.19 sources,
	1.10, 1.11 centerim-4.22.3-url-escape-fedora.patch, 1.1, NONE
Message-ID: <20090107231741.1B3CA70100@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/centerim/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6230

Modified Files:
	.cvsignore centerim.spec sources 
Added Files:
	centerim-4.22.6-url-escape-fedora.patch 
Removed Files:
	centerim-4.22.3-url-escape-fedora.patch 
Log Message:
* Wed Jan 09 2009 Lubomir Rintel <lkundrak at v3.sk> - 1:4.22.6-1
- New upstream release
- Disable openssl due to licensing trouble
- Fix dependencies


centerim-4.22.6-url-escape-fedora.patch:

--- NEW FILE centerim-4.22.6-url-escape-fedora.patch ---
This disables actions -- they're mostly useless anyways, and possess a security
hazard (in past, configuation file with broken escaping was created, and we
have to ignore it).

Lubomir Rintel <lkundrak at v3.sk>

diff -urp centerim-4.22.6.orig/src/centerim.cc centerim-4.22.6/src/centerim.cc
--- centerim-4.22.6.orig/src/centerim.cc	2008-10-26 16:53:16.000000000 +0100
+++ centerim-4.22.6/src/centerim.cc	2009-01-07 23:36:20.000000000 +0100
@@ -755,7 +755,7 @@ void centerim::checkmail() {
 
 void centerim::checkconfigs() {
     static const char *configs[] = {
-	"sounds", "colorscheme", "actions", "external", "keybindings", 0
+	"sounds", "colorscheme", "external", "keybindings", 0
     };
 
     struct stat st;
@@ -778,12 +778,9 @@ void centerim::checkconfigs() {
 			face.redraw();
 			break;
 		    case 2:
-			conf->loadactions();
-			break;
-		    case 3:
 			external.load();
 			break;
-		    case 4:
+		    case 3:
 			conf->loadkeys();
 			break;
 		}
@@ -1147,8 +1144,13 @@ icqface::eventviewresult centerim::reade
 	    break;
 
 	case icqface::open:
-	    if(const imurl *m = static_cast<const imurl *>(&ev))
-		conf->execaction("openurl", m->geturl());
+	    if(const imurl *m = static_cast<const imurl *>(&ev)) {
+		if (fork () == 0) {
+		    face.log (m->geturl());
+		    execlp("xdg-open", "xdg-open", m->geturl().c_str(), NULL);
+		    exit (-1);
+		}
+	    }
 	    break;
 
 	case icqface::accept:
diff -urp centerim-4.22.6.orig/src/icqconf.cc centerim-4.22.6/src/icqconf.cc
--- centerim-4.22.6.orig/src/icqconf.cc	2008-10-26 16:53:16.000000000 +0100
+++ centerim-4.22.6/src/icqconf.cc	2009-01-07 23:39:35.000000000 +0100
@@ -274,7 +274,6 @@ void icqconf::load() {
     loadmainconfig();
     loadkeys();
     loadcolors();
-    loadactions();
     loadcaptcha();
     external.load();
 }
@@ -1240,74 +1239,6 @@ void icqconf::setcpconvert(protocolname 
     cpconvert[pname] = fcpconvert;
 }
 
-string icqconf::execaction(const string &name, const string &param) {
-    int inpipe[2], outpipe[2], pid, npos;
-    struct sigaction sact, osact;
-    string torun = actions[name], out;
-    fd_set rfds;
-    char ch;
-
-    if(name == "openurl")
-    {
-	string url = param;
-	int pos = 0, fnd = -1;
-	
-	char enc[4];
-	
-	while( ((fnd = url.find("'", pos)) != -1) || ((fnd = url.find("\"", pos)) != -1) ) {
-		snprintf(enc, 4, "%%%02X", url[fnd]);
-	    url.replace(fnd, 1, enc);
-    	pos = fnd+3;
-	}
-	
-	while((npos = torun.find("$url$")) != -1)
-	    torun.replace(npos, 5, url);
-    }
-
-    if(!pipe(inpipe) && !pipe(outpipe)) {
-	memset(&sact, 0, sizeof(sact));
-	sigaction(SIGCHLD, &sact, &osact);
-	pid = fork();
-
-	if(!pid) {
-	    dup2(inpipe[1], STDOUT_FILENO);
-	    dup2(outpipe[0], STDIN_FILENO);
-
-	    close(inpipe[1]);
-	    close(inpipe[0]);
-	    close(outpipe[0]);
-	    close(outpipe[1]);
-
-	    execl("/bin/sh", "/bin/sh", "-c", torun.c_str(), (char *)NULL );
-	    _exit(0);
-	} else {
-	    close(outpipe[0]);
-	    close(inpipe[1]);
-
-	    while(1) {
-		FD_ZERO(&rfds);
-		FD_SET(inpipe[0], &rfds);
-
-		if(select(inpipe[0]+1, &rfds, 0, 0, 0) < 0) break; else {
-		    if(FD_ISSET(inpipe[0], &rfds)) {
-			if(read(inpipe[0], &ch, 1) != 1) break; else {
-			    out += ch;
-			}
-		    }
-		}
-	    }
-
-	    waitpid(pid, 0, 0);
-	    close(inpipe[0]);
-	    close(outpipe[1]);
-	}
-
-	sigaction(SIGCHLD, &osact, 0);
-    }
-    face.log(_("+ launched the %s action command"), name.c_str());
-    return out;
-}
-
 string icqconf::getprotocolname(protocolname pname) const {
     static const string ptextnames[protocolname_size] = {
 	"icq", "yahoo", "msn", "aim", "irc", "jab", "rss", "lj", "gg", "infocard"
diff -urp centerim-4.22.6.orig/src/icqconf.h centerim-4.22.6/src/icqconf.h
--- centerim-4.22.6.orig/src/icqconf.h	2008-10-26 16:53:16.000000000 +0100
+++ centerim-4.22.6/src/icqconf.h	2009-01-07 23:39:15.000000000 +0100
@@ -344,8 +344,6 @@ class icqconf {
 	bool getshowopenedchats() const { return showopenedchats; }
 	void setshowopenedchats(bool fsoc);
 
-	string execaction(const string &action, const string &param = "");
-
 	imstatus getstatus(protocolname pname);
 	void savestatus(protocolname pname, imstatus st);
 	void setavatar(protocolname pname, const string &ava);
diff -urp centerim-4.22.6.orig/src/icqdialogs.cc centerim-4.22.6/src/icqdialogs.cc
--- centerim-4.22.6.orig/src/icqdialogs.cc	2008-10-26 16:53:16.000000000 +0100
+++ centerim-4.22.6/src/icqdialogs.cc	2009-01-07 23:38:51.000000000 +0100
@@ -1284,7 +1284,6 @@ bool icqface::updateconf(icqconf::regsou
 
 	i = t.addnode(_(" Communications "));
 	t.addleaff(i, 0, 19, _(" SMTP server : %s "), smtp.c_str());
-	t.addleaff(i, 0, 31, _(" HTTP browser : %s "), browser.c_str());
 	t.addleaff(i, 0, 24, _(" HTTP proxy server : %s "), httpproxy.c_str());
 
 	if(!httpproxy.empty())
@@ -1438,10 +1437,6 @@ bool icqface::updateconf(icqconf::regsou
 		    case 30:
 			cm = (cm == icqconf::cmproto ? icqconf::cmstatus : icqconf::cmproto );
 			break;
-		    case 31:
-		        tmp = inputstr(_("HTTP browser to use: "), browser);
-			if(!tmp.empty()) browser = tmp;
-		        break;
 		    case 32:    
 		        conf->setleftpanelwidth(atol(inputstr(_("Left panel width: "), 
 		            strint(conf->getleftpanelwidth())).c_str()));
@@ -2083,7 +2078,6 @@ bool icqface::setljparams(imxmlevent *ev
 			break;
 
 		    case 20: LJP_LIST("mood", moods, _("(none/custom)")); break;
-		    case 21: LJP_STR("music", _("Currently playing: ")); break;
 		    case 22: LJP_LIST("picture", pictures, _("(default)")); break;
 		    case 23: LJP_STR("mood", _("Current mood: ")); break;
 		    case 25: LJP_STR("taglist", _("Tags for the entry: ")); break;
@@ -2093,9 +2087,6 @@ bool icqface::setljparams(imxmlevent *ev
 		    case 33: LJP_BOOL("backdated"); break;
 		}
 
-	    } else if(b == 1) {
-		ev->setfield("music", conf->execaction("detectmusic"));
-
 	    } else if(b == 2) {
 		r = true;
 
diff -urp centerim-4.22.6.orig/src/icqface.cc centerim-4.22.6/src/icqface.cc
--- centerim-4.22.6.orig/src/icqface.cc	2008-10-26 16:53:16.000000000 +0100
+++ centerim-4.22.6/src/icqface.cc	2009-01-07 23:38:19.000000000 +0100
@@ -2371,8 +2371,13 @@ void icqface::showextractedurls() {
 	for(i = extractedurls.begin(); i != extractedurls.end(); ++i)
 	    m.additem(" " + *i);
 
-	if(n = m.open())
-	    conf->execaction("openurl", extractedurls[n-1]);
+	if(n = m.open()) {
+	    if (fork () == 0) {
+		log (extractedurls[n-1]);
+		execlp("xdg-open", "xdg-open", extractedurls[n-1].c_str(), NULL);
+		exit (-1);
+	    }
+	}
 
 	restoreworkarea();
     }


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/centerim/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	5 Jul 2008 21:47:31 -0000	1.10
+++ .cvsignore	7 Jan 2009 23:17:10 -0000	1.11
@@ -1 +1 @@
-centerim-4.22.5-54-ga7548-dirty.tar.gz
+centerim-4.22.6.tar.gz


Index: centerim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/centerim/devel/centerim.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- centerim.spec	1 Dec 2008 15:00:18 -0000	1.18
+++ centerim.spec	7 Jan 2009 23:17:10 -0000	1.19
@@ -1,6 +1,6 @@
 Name:           centerim
 Version:        4.22.6
-Release:        0.2.20080705git%{?dist}
+Release:        1
 Epoch:          1
 
 Summary:        Text mode menu- and window-driven IM
@@ -8,12 +8,11 @@
 Group:          Applications/Internet
 License:        GPLv2+
 URL:            http://www.centerim.org/
-#Source0:        http://www.centerim.org/download/releases/%{name}-%{version}.tar.gz
-Source0:        centerim-4.22.5-54-ga7548-dirty.tar.gz
+Source0:        http://www.centerim.org/download/releases/%{name}-%{version}.tar.gz
 Source1:        http://www.centerim.org/images/b/b5/Centerim_b.svg
 Source2:        centerim.desktop
 
-Patch8:         centerim-4.22.3-url-escape-fedora.patch
+Patch0:         centerim-4.22.6-url-escape-fedora.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -21,13 +20,16 @@
 BuildRequires:  ncurses-devel >= 4.2
 BuildRequires:  gettext-devel
 BuildRequires:  gpgme-devel
-BuildRequires:  openssl-devel
 BuildRequires:  libjpeg-devel
 BuildRequires:  desktop-file-utils
+BuildRequires:  lzo-devel >= 2
+
+BuildConflicts: openssl-devel
 
 Requires:       xdg-utils
+Requires:       python
 
-Provides:       centericq = %{version}
+Provides:       centericq = 4.21.0
 Obsoletes:      centericq <= 4.21.0
 
 %description
@@ -37,8 +39,8 @@
 
 
 %prep
-%setup -q -n centerim-4.22.5-54-ga7548-dirty
-%patch8 -p1 -b .url-escape-fedora
+%setup -q
+%patch0 -p1 -b .url-escape-fedora
 
 
 %build
@@ -60,7 +62,7 @@
 
 # Remove unnecessary stuff
 rm -f $RPM_BUILD_ROOT%{_infodir}/dir
-find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
+find $RPM_BUILD_ROOT -type f -name "*.la" -delete
 
 # Install Icon and Menu entry
 install -d $RPM_BUILD_ROOT%{_datadir}/icons
@@ -77,7 +79,10 @@
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc ABOUT-NLS AUTHORS COPYING ChangeLog FAQ NEWS README THANKS TODO
-%{_bindir}/*
+%{_bindir}/centerim
+%{_bindir}/cimconv
+%{_bindir}/CenterIMLog2HTML.py
+%exclude %{_bindir}/CenterIMLog2HTML.py?
 %{_datadir}/%{name}
 %{_datadir}/applications/*.desktop
 %{_datadir}/icons/*.svg
@@ -85,6 +90,11 @@
 
 
 %changelog
+* Wed Jan 09 2009 Lubomir Rintel <lkundrak at v3.sk> - 1:4.22.6-1
+- New upstream release
+- Disable openssl due to licensing trouble
+- Fix dependencies
+
 * Mon Dec 01 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 1:4.22.6-0.2.20080705git
 - Rebuild for Python 2.6
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/centerim/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	5 Jul 2008 21:47:31 -0000	1.10
+++ sources	7 Jan 2009 23:17:10 -0000	1.11
@@ -1 +1 @@
-ede0db8393b9c8f35333bee593abf998  centerim-4.22.5-54-ga7548-dirty.tar.gz
+b26cb94fc5cb68fd3ca8a11ab0bb031c  centerim-4.22.6.tar.gz


--- centerim-4.22.3-url-escape-fedora.patch DELETED ---



From pgordon at fedoraproject.org  Wed Jan  7 23:24:50 2009
From: pgordon at fedoraproject.org (Peter Gordon)
Date: Wed,  7 Jan 2009 23:24:50 +0000 (UTC)
Subject: rpms/glabels/devel .cvsignore, 1.8, 1.9 glabels.spec, 1.20,
	1.21 sources, 1.8, 1.9 glabels-fix-batch-segfault.patch, 1.1, NONE
Message-ID: <20090107232450.2B1C870100@cvs1.fedora.phx.redhat.com>

Author: pgordon

Update of /cvs/pkgs/rpms/glabels/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6966

Modified Files:
	.cvsignore glabels.spec sources 
Removed Files:
	glabels-fix-batch-segfault.patch 
Log Message:
Update to 2.2.4; remove old batch-segfault patch.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/glabels/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	22 Aug 2008 23:16:38 -0000	1.8
+++ .cvsignore	7 Jan 2009 23:24:19 -0000	1.9
@@ -1 +1 @@
-glabels-2.2.3.tar.gz
+glabels-2.2.4.tar.gz


Index: glabels.spec
===================================================================
RCS file: /cvs/pkgs/rpms/glabels/devel/glabels.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- glabels.spec	26 Aug 2008 22:43:54 -0000	1.20
+++ glabels.spec	7 Jan 2009 23:24:19 -0000	1.21
@@ -1,6 +1,6 @@
 Name:		glabels
-Version:	2.2.3
-Release:	2%{?dist}
+Version:	2.2.4
+Release:	1%{?dist}
 Summary:	A program for creating labels and business cards for GNOME
 
 Group:		Applications/Publishing
@@ -158,6 +158,15 @@
 
 
 %changelog
+* Wed Jan 07 2009 Peter Gordon <peter at thecodergeek.com> - 2.2.4-1
+- Update to new upstream bug-fix release (2.2.4):
+  * Corrected button order in "Open" and "Save as" dialogs.
+  * Fixed performance problem when large number of fonts are installed.
+  * Corrected several i18n problems.
+  * Fixed "paste" bug that created phantom object views.
+  * Fixed performance problem when many objects are selected.
+  * New templates.  
+
 * Tue Aug 26 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 2.2.3-2
 - fix license tag (again)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/glabels/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	22 Aug 2008 23:16:38 -0000	1.8
+++ sources	7 Jan 2009 23:24:19 -0000	1.9
@@ -1 +1 @@
-fa2cb3669950fdfe2250dc0ce52ac4d2  glabels-2.2.3.tar.gz
+16e48877708a2c8755ade709ea397fc1  glabels-2.2.4.tar.gz


--- glabels-fix-batch-segfault.patch DELETED ---



From than at fedoraproject.org  Wed Jan  7 23:42:17 2009
From: than at fedoraproject.org (Than Ngo)
Date: Wed,  7 Jan 2009 23:42:17 +0000 (UTC)
Subject: rpms/kdepimlibs/devel kdepimlibs.spec,1.64,1.65
Message-ID: <20090107234217.91E3470100@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdepimlibs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9867

Modified Files:
	kdepimlibs.spec 
Log Message:
fix rpm file list



Index: kdepimlibs.spec
===================================================================
RCS file: /cvs/extras/rpms/kdepimlibs/devel/kdepimlibs.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- kdepimlibs.spec	7 Jan 2009 20:15:59 -0000	1.64
+++ kdepimlibs.spec	7 Jan 2009 23:41:45 -0000	1.65
@@ -161,7 +161,7 @@
 %{_kde4_appsdir}/cmake/modules/*
 %{_kde4_includedir}/*
 %{_kde4_libdir}/kde4/devel/lib*.so
-%{_kde4_libdir}/KdepimLibs/
+%{_kde4_libdir}/KdepimLibs*
 %endif
 
 %if 0%{?apidocs}



From pgordon at fedoraproject.org  Thu Jan  8 00:01:35 2009
From: pgordon at fedoraproject.org (Peter Gordon)
Date: Thu,  8 Jan 2009 00:01:35 +0000 (UTC)
Subject: rpms/glabels/F-10 .cvsignore, 1.8, 1.9 glabels.spec, 1.20,
	1.21 sources, 1.8, 1.9 glabels-fix-batch-segfault.patch, 1.1, NONE
Message-ID: <20090108000136.521DF700FD@cvs1.fedora.phx.redhat.com>

Author: pgordon

Update of /cvs/pkgs/rpms/glabels/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15010/F-10

Modified Files:
	.cvsignore glabels.spec sources 
Removed Files:
	glabels-fix-batch-segfault.patch 
Log Message:
Update to 2.2.4; remove old batch-segfault patch.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/glabels/F-10/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	22 Aug 2008 23:16:38 -0000	1.8
+++ .cvsignore	8 Jan 2009 00:01:03 -0000	1.9
@@ -1 +1 @@
-glabels-2.2.3.tar.gz
+glabels-2.2.4.tar.gz


Index: glabels.spec
===================================================================
RCS file: /cvs/pkgs/rpms/glabels/F-10/glabels.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- glabels.spec	26 Aug 2008 22:43:54 -0000	1.20
+++ glabels.spec	8 Jan 2009 00:01:03 -0000	1.21
@@ -1,6 +1,6 @@
 Name:		glabels
-Version:	2.2.3
-Release:	2%{?dist}
+Version:	2.2.4
+Release:	1%{?dist}
 Summary:	A program for creating labels and business cards for GNOME
 
 Group:		Applications/Publishing
@@ -158,6 +158,15 @@
 
 
 %changelog
+* Wed Jan 07 2009 Peter Gordon <peter at thecodergeek.com> - 2.2.4-1
+- Update to new upstream bug-fix release (2.2.4):
+  * Corrected button order in "Open" and "Save as" dialogs.
+  * Fixed performance problem when large number of fonts are installed.
+  * Corrected several i18n problems.
+  * Fixed "paste" bug that created phantom object views.
+  * Fixed performance problem when many objects are selected.
+  * New templates.  
+
 * Tue Aug 26 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 2.2.3-2
 - fix license tag (again)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/glabels/F-10/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	22 Aug 2008 23:16:38 -0000	1.8
+++ sources	8 Jan 2009 00:01:03 -0000	1.9
@@ -1 +1 @@
-fa2cb3669950fdfe2250dc0ce52ac4d2  glabels-2.2.3.tar.gz
+16e48877708a2c8755ade709ea397fc1  glabels-2.2.4.tar.gz


--- glabels-fix-batch-segfault.patch DELETED ---



From lkundrak at fedoraproject.org  Thu Jan  8 00:02:43 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Thu,  8 Jan 2009 00:02:43 +0000 (UTC)
Subject: rpms/gnubversion/F-10 gnubversion.spec,1.1,1.2
Message-ID: <20090108000243.ED05D700FD@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/gnubversion/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15137

Modified Files:
	gnubversion.spec 
Log Message:
* Thu Jan 08 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.5-4
- Place the library to libdir



Index: gnubversion.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnubversion/F-10/gnubversion.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gnubversion.spec	20 Dec 2008 21:01:00 -0000	1.1
+++ gnubversion.spec	8 Jan 2009 00:02:13 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           gnubversion
 Version:        0.5
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Gnome Interface to Subversion
 
 Group:          Applications/System
@@ -39,6 +39,11 @@
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT CPPROG='install -p'
 
+# Place the libraries where they belong, so that
+# we don't rely on rpath uselessly
+mv $RPM_BUILD_ROOT%{_libdir}/%{name}/*.so.* $RPM_BUILD_ROOT%{_libdir}
+rm -rf $RPM_BUILD_ROOT%{_libdir}/%{name}
+
 desktop-file-install                                    \
         --vendor ""                                     \
         --dir $RPM_BUILD_ROOT/%{_datadir}/applications  \
@@ -70,12 +75,14 @@
 
 
 %post
+/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
 
 %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 || :
@@ -86,9 +93,8 @@
 %defattr(-,root,root,-)
 %doc ChangeLog AUTHORS COPYING NEWS README TODO
 %{_bindir}/gvn-*
-%{_libdir}/%{name}
-%{_libdir}/nautilus/extensions-1.0/*.so.*
-%{_libdir}/nautilus/extensions-1.0/*.so
+%{_libdir}/*.so.*
+%{_libdir}/nautilus/extensions-1.0/*.so*
 %{_datadir}/%{name}
 %{_datadir}/applications/*.desktop
 %{_datadir}/icons/hicolor/??x??/apps/*.png
@@ -96,6 +102,9 @@
 
 
 %changelog
+* Thu Jan 08 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.5-4
+- Place the library to libdir
+
 * Sun Jul 27 2008 Xavier Lamien <lxtnow[at]gmail.com - 0.5-3
 - Remove redundant BR.
 



From pgordon at fedoraproject.org  Thu Jan  8 00:08:06 2009
From: pgordon at fedoraproject.org (Peter Gordon)
Date: Thu,  8 Jan 2009 00:08:06 +0000 (UTC)
Subject: rpms/glabels/F-9 .cvsignore, 1.8, 1.9 glabels.spec, 1.18,
	1.19 sources, 1.8, 1.9 glabels-fix-batch-segfault.patch, 1.1, NONE
Message-ID: <20090108000806.CCFBE700FD@cvs1.fedora.phx.redhat.com>

Author: pgordon

Update of /cvs/pkgs/rpms/glabels/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15726/F-9

Modified Files:
	.cvsignore glabels.spec sources 
Removed Files:
	glabels-fix-batch-segfault.patch 
Log Message:
Update to 2.2.4; remove old batch-segfault patch.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/glabels/F-9/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	22 Aug 2008 23:30:18 -0000	1.8
+++ .cvsignore	8 Jan 2009 00:07:36 -0000	1.9
@@ -1 +1 @@
-glabels-2.2.3.tar.gz
+glabels-2.2.4.tar.gz


Index: glabels.spec
===================================================================
RCS file: /cvs/pkgs/rpms/glabels/F-9/glabels.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- glabels.spec	22 Aug 2008 23:30:18 -0000	1.18
+++ glabels.spec	8 Jan 2009 00:07:36 -0000	1.19
@@ -1,5 +1,5 @@
 Name:		glabels
-Version:	2.2.3
+Version:	2.2.4
 Release:	1%{?dist}
 Summary:	A program for creating labels and business cards for GNOME
 
@@ -158,6 +158,15 @@
 
 
 %changelog
+* Wed Jan 07 2009 Peter Gordon <peter at thecodergeek.com> - 2.2.4-1
+- Update to new upstream bug-fix release (2.2.4):
+  * Corrected button order in "Open" and "Save as" dialogs.
+  * Fixed performance problem when large number of fonts are installed.
+  * Corrected several i18n problems.
+  * Fixed "paste" bug that created phantom object views.
+  * Fixed performance problem when many objects are selected.
+  * New templates.
+
 * Fri Aug 22 2008 Peter Gordon <peter at thecodergeek.com> - 2.2.3-1
 - Update to new upstream bug-fix release (2.2.3).
 - Drop glabels-batch segfault patch (fixed upstream).


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/glabels/F-9/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	22 Aug 2008 23:30:18 -0000	1.8
+++ sources	8 Jan 2009 00:07:36 -0000	1.9
@@ -1 +1 @@
-fa2cb3669950fdfe2250dc0ce52ac4d2  glabels-2.2.3.tar.gz
+16e48877708a2c8755ade709ea397fc1  glabels-2.2.4.tar.gz


--- glabels-fix-batch-segfault.patch DELETED ---



From pkgdb at fedoraproject.org  Thu Jan  8 00:09:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 08 Jan 2009 00:09:21 +0000
Subject: [pkgdb] ss5: itamarjp has requested watchbugzilla
Message-ID: <20090108000921.CB8E120831D@bastion.fedora.phx.redhat.com>

itamarjp has requested the watchbugzilla acl on ss5 (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ss5



From pkgdb at fedoraproject.org  Thu Jan  8 00:09:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 08 Jan 2009 00:09:25 +0000
Subject: [pkgdb] ss5: itamarjp has requested approveacls
Message-ID: <20090108000925.45D2A208457@bastion.fedora.phx.redhat.com>

itamarjp has requested the approveacls acl on ss5 (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ss5



From pkgdb at fedoraproject.org  Thu Jan  8 00:09:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 08 Jan 2009 00:09:24 +0000
Subject: [pkgdb] ss5: itamarjp has requested watchcommits
Message-ID: <20090108000924.D243D208455@bastion.fedora.phx.redhat.com>

itamarjp has requested the watchcommits acl on ss5 (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ss5



From pkgdb at fedoraproject.org  Thu Jan  8 00:09:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 08 Jan 2009 00:09:26 +0000
Subject: [pkgdb] ss5: itamarjp has requested commit
Message-ID: <20090108000926.17388208468@bastion.fedora.phx.redhat.com>

itamarjp has requested the commit acl on ss5 (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ss5



From pkgdb at fedoraproject.org  Thu Jan  8 00:09:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 08 Jan 2009 00:09:27 +0000
Subject: [pkgdb] ss5: itamarjp has requested watchbugzilla
Message-ID: <20090108000927.6231F20846C@bastion.fedora.phx.redhat.com>

itamarjp has requested the watchbugzilla acl on ss5 (Fedora 6)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ss5



From pkgdb at fedoraproject.org  Thu Jan  8 00:09:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 08 Jan 2009 00:09:28 +0000
Subject: [pkgdb] ss5: itamarjp has requested watchcommits
Message-ID: <20090108000928.1E66120846F@bastion.fedora.phx.redhat.com>

itamarjp has requested the watchcommits acl on ss5 (Fedora 6)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ss5



From pkgdb at fedoraproject.org  Thu Jan  8 00:09:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 08 Jan 2009 00:09:29 +0000
Subject: [pkgdb] ss5: itamarjp has requested commit
Message-ID: <20090108000929.D34BE208471@bastion.fedora.phx.redhat.com>

itamarjp has requested the commit acl on ss5 (Fedora 6)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ss5



From pkgdb at fedoraproject.org  Thu Jan  8 00:09:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 08 Jan 2009 00:09:30 +0000
Subject: [pkgdb] ss5: itamarjp has requested approveacls
Message-ID: <20090108000930.27D02208474@bastion.fedora.phx.redhat.com>

itamarjp has requested the approveacls acl on ss5 (Fedora 6)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ss5



From pkgdb at fedoraproject.org  Thu Jan  8 00:09:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 08 Jan 2009 00:09:34 +0000
Subject: [pkgdb] ss5: itamarjp has requested watchbugzilla
Message-ID: <20090108000934.1BA7E208476@bastion.fedora.phx.redhat.com>

itamarjp has requested the watchbugzilla acl on ss5 (Fedora 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ss5



From pkgdb at fedoraproject.org  Thu Jan  8 00:09:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 08 Jan 2009 00:09:35 +0000
Subject: [pkgdb] ss5: itamarjp has requested commit
Message-ID: <20090108000936.3B920208479@bastion.fedora.phx.redhat.com>

itamarjp has requested the commit acl on ss5 (Fedora 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ss5



From pkgdb at fedoraproject.org  Thu Jan  8 00:09:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 08 Jan 2009 00:09:39 +0000
Subject: [pkgdb] ss5: itamarjp has requested approveacls
Message-ID: <20090108000939.5492120847C@bastion.fedora.phx.redhat.com>

itamarjp has requested the approveacls acl on ss5 (Fedora 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ss5



From pkgdb at fedoraproject.org  Thu Jan  8 00:09:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 08 Jan 2009 00:09:40 +0000
Subject: [pkgdb] ss5: itamarjp has requested watchcommits
Message-ID: <20090108000940.8A27A208481@bastion.fedora.phx.redhat.com>

itamarjp has requested the watchcommits acl on ss5 (Fedora 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ss5



From pkgdb at fedoraproject.org  Thu Jan  8 00:09:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 08 Jan 2009 00:09:45 +0000
Subject: [pkgdb] ss5: itamarjp has requested watchcommits
Message-ID: <20090108000945.56EA9208456@bastion.fedora.phx.redhat.com>

itamarjp has requested the watchcommits acl on ss5 (Fedora 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ss5



From pkgdb at fedoraproject.org  Thu Jan  8 00:09:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 08 Jan 2009 00:09:46 +0000
Subject: [pkgdb] ss5: itamarjp has requested watchbugzilla
Message-ID: <20090108000946.5933E20847F@bastion.fedora.phx.redhat.com>

itamarjp has requested the watchbugzilla acl on ss5 (Fedora 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ss5



From pkgdb at fedoraproject.org  Thu Jan  8 00:09:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 08 Jan 2009 00:09:46 +0000
Subject: [pkgdb] ss5: itamarjp has requested commit
Message-ID: <20090108000947.0477D208484@bastion.fedora.phx.redhat.com>

itamarjp has requested the commit acl on ss5 (Fedora 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ss5



From pkgdb at fedoraproject.org  Thu Jan  8 00:09:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 08 Jan 2009 00:09:51 +0000
Subject: [pkgdb] ss5: itamarjp has requested watchbugzilla
Message-ID: <20090108000951.C0193208486@bastion.fedora.phx.redhat.com>

itamarjp has requested the watchbugzilla acl on ss5 (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ss5



From pkgdb at fedoraproject.org  Thu Jan  8 00:09:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 08 Jan 2009 00:09:54 +0000
Subject: [pkgdb] ss5: itamarjp has requested approveacls
Message-ID: <20090108000954.899E7208458@bastion.fedora.phx.redhat.com>

itamarjp has requested the approveacls acl on ss5 (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ss5



From pkgdb at fedoraproject.org  Thu Jan  8 00:09:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 08 Jan 2009 00:09:55 +0000
Subject: [pkgdb] ss5: itamarjp has requested approveacls
Message-ID: <20090108000955.80692208488@bastion.fedora.phx.redhat.com>

itamarjp has requested the approveacls acl on ss5 (Fedora 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ss5



From pkgdb at fedoraproject.org  Thu Jan  8 00:09:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 08 Jan 2009 00:09:55 +0000
Subject: [pkgdb] ss5: itamarjp has requested commit
Message-ID: <20090108000955.CE33120848B@bastion.fedora.phx.redhat.com>

itamarjp has requested the commit acl on ss5 (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ss5



From pkgdb at fedoraproject.org  Thu Jan  8 00:10:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 08 Jan 2009 00:10:27 +0000
Subject: [pkgdb] ss5: itamarjp has requested watchcommits
Message-ID: <20090108001027.F38D420846E@bastion.fedora.phx.redhat.com>

itamarjp has requested the watchcommits acl on ss5 (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ss5



From mclasen at fedoraproject.org  Thu Jan  8 00:12:26 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Thu,  8 Jan 2009 00:12:26 +0000 (UTC)
Subject: rpms/gtk2/F-10 .cvsignore, 1.96, 1.97 gtk2.spec, 1.339,
	1.340 sources, 1.104, 1.105
Message-ID: <20090108001226.C2689700FD@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gtk2/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16589

Modified Files:
	.cvsignore gtk2.spec sources 
Log Message:
2.14.7



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gtk2/F-10/.cvsignore,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -r1.96 -r1.97
--- .cvsignore	24 Nov 2008 18:55:04 -0000	1.96
+++ .cvsignore	8 Jan 2009 00:11:56 -0000	1.97
@@ -1 +1 @@
-gtk+-2.14.5.tar.bz2
+gtk+-2.14.7.tar.bz2


Index: gtk2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtk2/F-10/gtk2.spec,v
retrieving revision 1.339
retrieving revision 1.340
diff -u -r1.339 -r1.340
--- gtk2.spec	4 Jan 2009 02:49:32 -0000	1.339
+++ gtk2.spec	8 Jan 2009 00:11:56 -0000	1.340
@@ -10,13 +10,13 @@
 %define cairo_version %{cairo_base_version}-1
 %define libpng_version 2:1.2.2-16
 
-%define base_version 2.14.5
+%define base_version 2.14.7
 %define bin_version 2.10.0
 
 Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X
 Name: gtk2
 Version: %{base_version}
-Release: 4%{?dist}
+Release: 1%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 Source: http://download.gnome.org/sources/gtk+/2.14/gtk+-%{version}.tar.bz2
@@ -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
-Patch3: missing-compose-seqs.patch
-#
-Patch4: wmspec-recheck.patch
 
 BuildRequires: atk-devel >= %{atk_version}
 BuildRequires: pango-devel >= %{pango_version}
@@ -120,8 +116,6 @@
 %patch0 -p1 -b .lib64
 %patch1 -p1 -b .set-invisible-char-to-bullet
 %patch2 -p1 -b .workaround
-%patch3 -p1 -b .missing-compose-seqs
-%patch4 -p0 -b .wmspec-recheck
 
 for i in config.guess config.sub ; do
   test -f %{_datadir}/libtool/$i && cp %{_datadir}/libtool/$i .
@@ -303,6 +297,9 @@
 %{_datadir}/gtk-2.0
 
 %changelog
+* Wed Jan  7 2009 Matthias Clasen <mclasen at redhat.com> - 2.14.7-1
+- Upate to 2.14.7
+
 * Sat Jan  3 2009 Matthias Clasen <mclasen at redhat.com> - 2.14.5-4
 - Recheck _NET_SUPPORTING_WM_CHECK every now and then
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gtk2/F-10/sources,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -r1.104 -r1.105
--- sources	24 Nov 2008 18:55:04 -0000	1.104
+++ sources	8 Jan 2009 00:11:56 -0000	1.105
@@ -1 +1 @@
-1b1b5d7ab5a25e84682cb27ee4808a40  gtk+-2.14.5.tar.bz2
+fb1614d4b2adba7b078e2e799b5db604  gtk+-2.14.7.tar.bz2



From pgordon at fedoraproject.org  Thu Jan  8 00:26:47 2009
From: pgordon at fedoraproject.org (Peter Gordon)
Date: Thu,  8 Jan 2009 00:26:47 +0000 (UTC)
Subject: rpms/glabels/F-8 .cvsignore, 1.7, 1.8 glabels.spec, 1.16,
	1.17 sources, 1.7, 1.8
Message-ID: <20090108002647.E9BEC700FD@cvs1.fedora.phx.redhat.com>

Author: pgordon

Update of /cvs/pkgs/rpms/glabels/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18089/F-8

Modified Files:
	.cvsignore glabels.spec sources 
Log Message:
One last bugfix update for F-8: Update to 2.2.4


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/glabels/F-8/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	24 Aug 2008 18:52:54 -0000	1.7
+++ .cvsignore	8 Jan 2009 00:26:17 -0000	1.8
@@ -1 +1 @@
-glabels-2.2.3.tar.gz
+glabels-2.2.4.tar.gz


Index: glabels.spec
===================================================================
RCS file: /cvs/pkgs/rpms/glabels/F-8/glabels.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- glabels.spec	24 Aug 2008 18:52:54 -0000	1.16
+++ glabels.spec	8 Jan 2009 00:26:17 -0000	1.17
@@ -1,5 +1,5 @@
 Name:		glabels
-Version:	2.2.3
+Version:	2.2.4
 Release:	1%{?dist}
 Summary:	A program for creating labels and business cards for GNOME
 
@@ -158,6 +158,15 @@
 
 
 %changelog
+* Wed Jan 07 2009 Peter Gordon <peter at thecodergeek.com> - 2.2.4-1
+- Update to new upstream bug-fix release (2.2.4):
+  * Corrected button order in "Open" and "Save as" dialogs.
+  * Fixed performance problem when large number of fonts are installed.
+  * Corrected several i18n problems.
+  * Fixed "paste" bug that created phantom object views.
+  * Fixed performance problem when many objects are selected.
+  * New templates.
+
 * Fri Aug 22 2008 Peter Gordon <peter at thecodergeek.com> - 2.2.3-1
 - Update to new upstream bug-fix release (2.2.3).
 - Drop glabels-batch segfault patch (fixed upstream).


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/glabels/F-8/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	24 Aug 2008 18:52:54 -0000	1.7
+++ sources	8 Jan 2009 00:26:17 -0000	1.8
@@ -1 +1 @@
-fa2cb3669950fdfe2250dc0ce52ac4d2  glabels-2.2.3.tar.gz
+16e48877708a2c8755ade709ea397fc1  glabels-2.2.4.tar.gz



From lkundrak at fedoraproject.org  Thu Jan  8 00:37:11 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Thu,  8 Jan 2009 00:37:11 +0000 (UTC)
Subject: rpms/gnubversion/devel gnubversion.spec, NONE, 1.1 .cvsignore, 1.1, 
	1.2 sources, 1.1, 1.2
Message-ID: <20090108003711.46F34700FD@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/gnubversion/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19168

Modified Files:
	.cvsignore sources 
Added Files:
	gnubversion.spec 
Log Message:
Import into devel


--- NEW FILE gnubversion.spec ---
Name:           gnubversion
Version:        0.5
Release:        4%{?dist}
Summary:        Gnome Interface to Subversion

Group:          Applications/System
License:        GPLv3
URL:            https://sourceforge.net/projects/gnubversion 
Source0:        http://downloads.sourceforge.net/gnubversion/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  nautilus-devel, libgnomeui-devel
BuildRequires:  subversion-devel, e2fsprogs-devel
BuildRequires:  desktop-file-utils
Requires:       nautilus-extensions

%description
GnubVersion is a GNOME interface to Subversion. It integrates with the
Nautilus file manager to allow access to (eventually) all subversion
client-side functions, without having to resort to the command line.

Provides graphical equivalents to "svn checkout", "svn update" etc.


%prep
%setup -q


%build
%configure --disable-static
#Remove Rpath
sed -i 's|^hardcode_libdir_flag_spec="\\${wl}--rpath \\${wl}\\$libdir"|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 CPPROG='install -p'

# Place the libraries where they belong, so that
# we don't rely on rpath uselessly
mv $RPM_BUILD_ROOT%{_libdir}/%{name}/*.so.* $RPM_BUILD_ROOT%{_libdir}
rm -rf $RPM_BUILD_ROOT%{_libdir}/%{name}

desktop-file-install                                    \
        --vendor ""                                     \
        --dir $RPM_BUILD_ROOT/%{_datadir}/applications  \
        --mode 0644                                     \
        --remove-category=Application                   \
        $RPM_BUILD_ROOT%{_datadir}/applications/gvn-checkout.desktop

#Remove default installed docs
rm -rf $RPM_BUILD_ROOT%{_docdir}

#Remove libtool archives
find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
find $RPM_BUILD_ROOT -name '*.a' -exec rm -f {} ';'

#Fix .desktop file
echo "Encoding=UTF-8" >> $RPM_BUILD_ROOT%{_datadir}/applications/gvn-checkout.desktop

#Fix relative-link issue
pushd $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/24x24/apps
for imgs in gvn-commit.png gvn-update.png gvn-add.png gvn-remove.png gvn-revert.png ; do
        unlink $RPM_BUILD_ROOT%{_datadir}/%{name}/$imgs
        ln -s $imgs $RPM_BUILD_ROOT%{_datadir}/%{name}/$imgs
done
popd

%clean
rm -rf $RPM_BUILD_ROOT



%post
/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

%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


%files
%defattr(-,root,root,-)
%doc ChangeLog AUTHORS COPYING NEWS README TODO
%{_bindir}/gvn-*
%{_libdir}/*.so.*
%{_libdir}/nautilus/extensions-1.0/*.so*
%{_datadir}/%{name}
%{_datadir}/applications/*.desktop
%{_datadir}/icons/hicolor/??x??/apps/*.png
%{_datadir}/icons/hicolor/scalable/apps/*.svg


%changelog
* Thu Jan 08 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.5-4
- Place the library to libdir

* Sun Jul 27 2008 Xavier Lamien <lxtnow[at]gmail.com - 0.5-3
- Remove redundant BR.

* Sun Jan 20 2008 Xavier Lamien <lxtnow[at]gmail.com> - 0.5-2
- Added Scriptlets.

* Sat Jan 19 2008 Xavier Lamien <lxtnow[at]gmail.com> - 0.5-1
- Initial RPM Release.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnubversion/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	29 Jul 2008 15:39:16 -0000	1.1
+++ .cvsignore	8 Jan 2009 00:36:40 -0000	1.2
@@ -0,0 +1 @@
+gnubversion-0.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnubversion/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	29 Jul 2008 15:39:16 -0000	1.1
+++ sources	8 Jan 2009 00:36:40 -0000	1.2
@@ -0,0 +1 @@
+e97e65eb15dcffe2665a6a8f609bac6a  gnubversion-0.5.tar.gz



From whot at fedoraproject.org  Thu Jan  8 00:40:35 2009
From: whot at fedoraproject.org (Peter Hutterer)
Date: Thu,  8 Jan 2009 00:40:35 +0000 (UTC)
Subject: rpms/xorg-x11-drv-keyboard/devel .cvsignore, 1.11, 1.12 sources,
	1.11, 1.12 xorg-x11-drv-keyboard.spec, 1.26, 1.27
Message-ID: <20090108004035.B55C6700FD@cvs1.fedora.phx.redhat.com>

Author: whot

Update of /cvs/pkgs/rpms/xorg-x11-drv-keyboard/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19503

Modified Files:
	.cvsignore sources xorg-x11-drv-keyboard.spec 
Log Message:
* Thu Jan 08 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.3.2-1
- keyboard 1.3.2

VS: ----------------------------------------------------------------------



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-keyboard/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	22 Dec 2008 01:25:16 -0000	1.11
+++ .cvsignore	8 Jan 2009 00:40:05 -0000	1.12
@@ -1 +1 @@
-xf86-input-keyboard-20081222.tar.bz2
+xf86-input-keyboard-1.3.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-keyboard/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	22 Dec 2008 01:25:16 -0000	1.11
+++ sources	8 Jan 2009 00:40:05 -0000	1.12
@@ -1 +1 @@
-3f2935ba231a7da2442a0c739cafeded  xf86-input-keyboard-20081222.tar.bz2
+d6fe929c4f6085d6dd67f197ae9c42f6  xf86-input-keyboard-1.3.2.tar.bz2


Index: xorg-x11-drv-keyboard.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-keyboard/devel/xorg-x11-drv-keyboard.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- xorg-x11-drv-keyboard.spec	22 Dec 2008 01:25:16 -0000	1.26
+++ xorg-x11-drv-keyboard.spec	8 Jan 2009 00:40:05 -0000	1.27
@@ -6,15 +6,15 @@
 
 Summary:    Xorg X11 keyboard input driver
 Name:	    xorg-x11-drv-keyboard
-Version:    1.3.1
-Release:    1.20081222git%{?dist}
+Version:    1.3.2
+Release:    1%{?dist}
 URL:	    http://www.x.org
 License:    MIT
 Group:	    User Interface/X Hardware Support
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-#Source0:    ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
-Source0:    %{tarball}-%{gitdate}.tar.bz2
+Source0:    ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
+#Source0:    %{tarball}-%{gitdate}.tar.bz2
 Source1:    make-git-snapshot.sh
 
 ExcludeArch: s390 s390x
@@ -29,8 +29,8 @@
 X.Org X11 keyboard input driver.
 
 %prep
-%setup -q -n %{tarball}-%{gitdate}
-#%setup -q -n %{tarball}-%{version}
+#%setup -q -n %{tarball}-%{gitdate}
+%setup -q -n %{tarball}-%{version}
 
 %build
 autoreconf -v --install || exit 1
@@ -57,6 +57,9 @@
 #{_mandir}/man4/keyboard.4*
 
 %changelog
+* Thu Jan 08 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.3.2-1
+- keyboard 1.3.2
+
 * Mon Dec 22 2008 Peter Hutterer <peter.hutterer at redhat.com> 1.3.1-1.20081222
 - Today's git snapshot.
 



From rrankin at fedoraproject.org  Thu Jan  8 00:45:24 2009
From: rrankin at fedoraproject.org (Roy Rankin)
Date: Thu,  8 Jan 2009 00:45:24 +0000 (UTC)
Subject: rpms/denemo/F-10 denemo-0.8.0-make.patch, NONE, 1.1 .cvsignore, 1.2,
	1.3 denemo.spec, 1.2, 1.3 sources, 1.2,
	1.3 denemo-binreloc.patch, 1.1, NONE denemo-block_debug.patch,
	1.1, NONE denemo-undo-assert.patch, 1.1, NONE
Message-ID: <20090108004525.0461D700FD@cvs1.fedora.phx.redhat.com>

Author: rrankin

Update of /cvs/pkgs/rpms/denemo/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20495

Modified Files:
	.cvsignore denemo.spec sources 
Added Files:
	denemo-0.8.0-make.patch 
Removed Files:
	denemo-binreloc.patch denemo-block_debug.patch 
	denemo-undo-assert.patch 
Log Message:
upstream patch release


denemo-0.8.0-make.patch:

--- NEW FILE denemo-0.8.0-make.patch ---
--- Makefile.am.org	2008-11-30 15:53:12.000000000 +1100
+++ Makefile.am	2008-11-30 15:54:19.000000000 +1100
@@ -16,9 +16,9 @@
 	depcomp
 
 install-data-hook:
-	cp -r actions  $(datadir)/${PACKAGE}/
-	chmod -R 755 $(datadir)/${PACKAGE}/actions
+	cp -r actions  $(DESTDIR)$(datadir)/${PACKAGE}/
+	chmod -R 755 $(DESTDIR)$(datadir)/${PACKAGE}/actions
 dist-hook: @PACKAGE at .spec
-	cp $(srcdir)/@PACKAGE at .spec $(distdir)
+	cp $(srcdir)/@PACKAGE at .spec $(DESTDIR)$(distdir)
 
 ACLOCAL_AMFLAGS = -I m4
--- Makefile.in.org	2008-11-30 15:55:58.000000000 +1100
+++ Makefile.in	2008-11-30 15:57:25.000000000 +1100
@@ -648,10 +648,10 @@
 
 
 install-data-hook:
-	cp -r actions  $(datadir)/${PACKAGE}/
-	chmod -R 755 $(datadir)/${PACKAGE}/actions
+	cp -r actions  $(DESTDIR)$(datadir)/${PACKAGE}/
+	chmod -R 755 $(DESTDIR)$(datadir)/${PACKAGE}/actions
 dist-hook: @PACKAGE at .spec
-	cp $(srcdir)/@PACKAGE at .spec $(distdir)
+	cp $(srcdir)/@PACKAGE at .spec $(DESTDIR)$(distdir)
 # 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/denemo/F-10/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	24 Aug 2008 23:05:19 -0000	1.2
+++ .cvsignore	8 Jan 2009 00:44:54 -0000	1.3
@@ -1 +1 @@
-denemo-0.7.9.tar.gz
+denemo-0.8.0.tar.gz


Index: denemo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/denemo/F-10/denemo.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- denemo.spec	3 Sep 2008 11:16:14 -0000	1.2
+++ denemo.spec	8 Jan 2009 00:44:54 -0000	1.3
@@ -1,19 +1,18 @@
 Summary: Graphical music notation program
 Name: denemo
-Version: 0.7.9
-Release: 5%{?dist}
+Version: 0.8.0
+Release: 1%{?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
+Patch0: %{name}-0.8.0-make.patch
 
 URL: http://www.denemo.org/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires: portaudio-devel aubio-devel gtk2-devel
+BuildRequires: portaudio-devel aubio-devel gtk2-devel guile-devel
 BuildRequires: gettext libxml2-devel fftw-devel desktop-file-utils
+BuildRequires: libtool-ltdl-devel
 Requires: bug-buddy
 
 
@@ -28,9 +27,7 @@
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
+%patch0 -p0
 
 %build
 %configure 
@@ -59,6 +56,9 @@
 %doc COPYING README README.lilypond ChangeLog 
 
 %changelog
+* Sun Nov 30 2008 Roy Rankin <rrankin at ihug.com.au> - 0.8.0-1
+-Update for Denemo release 0.8.0
+
 * 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


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/denemo/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	24 Aug 2008 23:05:19 -0000	1.2
+++ sources	8 Jan 2009 00:44:54 -0000	1.3
@@ -1 +1 @@
-d48936ed56aea5d6afc7f061169e2891  denemo-0.7.9.tar.gz
+a19e15130f9c7fcdcef03daefc342d0c  denemo-0.8.0.tar.gz


--- denemo-binreloc.patch DELETED ---


--- denemo-block_debug.patch DELETED ---


--- denemo-undo-assert.patch DELETED ---



From whot at fedoraproject.org  Thu Jan  8 01:10:43 2009
From: whot at fedoraproject.org (Peter Hutterer)
Date: Thu,  8 Jan 2009 01:10:43 +0000 (UTC)
Subject: rpms/xorg-x11-drv-keyboard/F-10 .cvsignore, 1.10, 1.11 sources, 1.10,
	1.11 xorg-x11-drv-keyboard.spec, 1.25, 1.26
Message-ID: <20090108011043.EA178700FD@cvs1.fedora.phx.redhat.com>

Author: whot

Update of /cvs/pkgs/rpms/xorg-x11-drv-keyboard/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22204

Modified Files:
	.cvsignore sources xorg-x11-drv-keyboard.spec 
Log Message:
* Thu Jan 08 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.3.2-1
- keyboard 1.3.2




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-keyboard/F-10/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	22 Dec 2008 00:54:02 -0000	1.10
+++ .cvsignore	8 Jan 2009 01:10:13 -0000	1.11
@@ -1 +1 @@
-xf86-input-keyboard-1.3.1.tar.bz2
+xf86-input-keyboard-1.3.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-keyboard/F-10/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	22 Dec 2008 00:54:02 -0000	1.10
+++ sources	8 Jan 2009 01:10:13 -0000	1.11
@@ -1 +1 @@
-ebe5dcf8eed819103909f18321fc3b9d  xf86-input-keyboard-1.3.1.tar.bz2
+d6fe929c4f6085d6dd67f197ae9c42f6  xf86-input-keyboard-1.3.2.tar.bz2


Index: xorg-x11-drv-keyboard.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-keyboard/F-10/xorg-x11-drv-keyboard.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- xorg-x11-drv-keyboard.spec	22 Dec 2008 00:54:02 -0000	1.25
+++ xorg-x11-drv-keyboard.spec	8 Jan 2009 01:10:13 -0000	1.26
@@ -4,8 +4,8 @@
 
 Summary:    Xorg X11 keyboard input driver
 Name:	    xorg-x11-drv-keyboard
-Version:    1.3.1
-Release:    2%{?dist}
+Version:    1.3.2
+Release:    1%{?dist}
 URL:	    http://www.x.org
 License:    MIT
 Group:	    User Interface/X Hardware Support
@@ -50,6 +50,9 @@
 #{_mandir}/man4/keyboard.4*
 
 %changelog
+* Thu Jan 08 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.3.2-1
+- keyboard 1.3.2
+
 * Mon Dec 22 2008 Peter Hutterer <peter.hutterer at redhat.com> 1.3.1-2
 - keyboard 1.3.1 
   (cvs devel/F10 mixup, jumping tag to 1.3.1-2)



From rishi at fedoraproject.org  Thu Jan  8 04:01:49 2009
From: rishi at fedoraproject.org (Debarshi Ray)
Date: Thu,  8 Jan 2009 04:01:49 +0000 (UTC)
Subject: rpms/libical/F-9 libical-0.41-configure.patch, NONE,
	1.1 libical.spec, 1.10, 1.11
Message-ID: <20090108040149.DDC14700FD@cvs1.fedora.phx.redhat.com>

Author: rishi

Update of /cvs/pkgs/rpms/libical/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3607

Modified Files:
	libical.spec 
Added Files:
	libical-0.41-configure.patch 
Log Message:
* Thu Jan 08 2009 Debarshi Ray <rishi at fedoraproject.org> - 0.41-2
- Switched off ICAL_ERRORS_ARE_FATAL for all distributions, except Fedora 11.
  Closes Red Hat Bugzilla bug #478331.


libical-0.41-configure.patch:

--- NEW FILE libical-0.41-configure.patch ---
diff -urNp libical-0.41.orig/configure libical-0.41/configure
--- libical-0.41.orig/configure	2009-01-08 00:38:26.000000000 +0530
+++ libical-0.41/configure	2009-01-08 00:43:43.000000000 +0530
@@ -20519,17 +20519,17 @@ fi;
 
 
 cat >>confdefs.h <<\_ACEOF
-#define ICAL_ERRORS_ARE_FATAL 1
+#define ICAL_ERRORS_ARE_FATAL 0
 _ACEOF
 
 
 cat >>confdefs.h <<\_ACEOF
-#define NO_WARN_DEPRECATED 1
+#define NO_WARN_DEPRECATED 0
 _ACEOF
 
 
 cat >>confdefs.h <<\_ACEOF
-#define NO_WARN_ICAL_MALFORMEDDATA_ERROR_HACK 1
+#define NO_WARN_ICAL_MALFORMEDDATA_ERROR_HACK 0
 _ACEOF
 
 


Index: libical.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libical/F-9/libical.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- libical.spec	25 Nov 2008 08:39:46 -0000	1.10
+++ libical.spec	8 Jan 2009 04:01:19 -0000	1.11
@@ -1,6 +1,6 @@
 Name:		libical
 Version:	0.41
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Reference implementation of the iCalendar data type and serialization format
 Summary(pl):	Implementacja formatu iCalendar
 
@@ -9,7 +9,12 @@
 URL:		http://freeassociation.sourceforge.net/
 Source0:	http://downloads.sourceforge.net/freeassociation/%{name}-%{version}.tar.gz
 
-Patch0:		%{name}-%{version}-makefile.patch
+%if 0%{?fc11}
+%else
+Patch0:		%{name}-%{version}-configure.patch
+%endif
+
+Patch1:		%{name}-%{version}-makefile.patch
 
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
@@ -42,7 +47,13 @@
 
 %prep
 %setup -q
+
+%if 0%{?fc11}
+%else
 %patch0 -p1
+%endif
+
+%patch1 -p1
 
 %build
 %configure --disable-static --enable-reentrant
@@ -99,6 +110,10 @@
 %{_includedir}/%{name}/vobject.h
 
 %changelog
+* Thu Jan 08 2009 Debarshi Ray <rishi at fedoraproject.org> - 0.41-2
+- Switched off ICAL_ERRORS_ARE_FATAL for all distributions, except Fedora 11.
+  Closes Red Hat Bugzilla bug #478331.
+
 * Sun Nov 23 2008 Debarshi Ray <rishi at fedoraproject.org> - 0.41-1
 - Version bump to 0.41. Closes Red Hat Bugzilla bug #469252.
 - Disabled C++ bindings.



From rishi at fedoraproject.org  Thu Jan  8 04:04:58 2009
From: rishi at fedoraproject.org (Debarshi Ray)
Date: Thu,  8 Jan 2009 04:04:58 +0000 (UTC)
Subject: rpms/libical/F-10 libical-0.41-configure.patch, NONE,
	1.1 libical.spec, 1.15, 1.16
Message-ID: <20090108040458.3F4E7700FD@cvs1.fedora.phx.redhat.com>

Author: rishi

Update of /cvs/pkgs/rpms/libical/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3860

Modified Files:
	libical.spec 
Added Files:
	libical-0.41-configure.patch 
Log Message:
* Thu Jan 08 2009 Debarshi Ray <rishi at fedoraproject.org> - 0.41-2
- Switched off ICAL_ERRORS_ARE_FATAL for all distributions, except Fedora 11.
  Closes Red Hat Bugzilla bug #478331.


libical-0.41-configure.patch:

--- NEW FILE libical-0.41-configure.patch ---
diff -urNp libical-0.41.orig/configure libical-0.41/configure
--- libical-0.41.orig/configure	2009-01-08 00:38:26.000000000 +0530
+++ libical-0.41/configure	2009-01-08 00:43:43.000000000 +0530
@@ -20519,17 +20519,17 @@ fi;
 
 
 cat >>confdefs.h <<\_ACEOF
-#define ICAL_ERRORS_ARE_FATAL 1
+#define ICAL_ERRORS_ARE_FATAL 0
 _ACEOF
 
 
 cat >>confdefs.h <<\_ACEOF
-#define NO_WARN_DEPRECATED 1
+#define NO_WARN_DEPRECATED 0
 _ACEOF
 
 
 cat >>confdefs.h <<\_ACEOF
-#define NO_WARN_ICAL_MALFORMEDDATA_ERROR_HACK 1
+#define NO_WARN_ICAL_MALFORMEDDATA_ERROR_HACK 0
 _ACEOF
 
 


Index: libical.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libical/F-10/libical.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- libical.spec	25 Nov 2008 08:44:54 -0000	1.15
+++ libical.spec	8 Jan 2009 04:04:27 -0000	1.16
@@ -1,6 +1,6 @@
 Name:		libical
 Version:	0.41
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Reference implementation of the iCalendar data type and serialization format
 Summary(pl):	Implementacja formatu iCalendar
 
@@ -9,7 +9,12 @@
 URL:		http://freeassociation.sourceforge.net/
 Source0:	http://downloads.sourceforge.net/freeassociation/%{name}-%{version}.tar.gz
 
-Patch0:		%{name}-%{version}-makefile.patch
+%if 0%{?fc11}
+%else
+Patch0:		%{name}-%{version}-configure.patch
+%endif
+
+Patch1:		%{name}-%{version}-makefile.patch
 
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
@@ -42,7 +47,13 @@
 
 %prep
 %setup -q
+
+%if 0%{?fc11}
+%else
 %patch0 -p1
+%endif
+
+%patch1 -p1
 
 %build
 %configure --disable-static --enable-reentrant
@@ -99,6 +110,10 @@
 %{_includedir}/%{name}/vobject.h
 
 %changelog
+* Thu Jan 08 2009 Debarshi Ray <rishi at fedoraproject.org> - 0.41-2
+- Switched off ICAL_ERRORS_ARE_FATAL for all distributions, except Fedora 11.
+  Closes Red Hat Bugzilla bug #478331.
+
 * Sun Nov 23 2008 Debarshi Ray <rishi at fedoraproject.org> - 0.41-1
 - Version bump to 0.41. Closes Red Hat Bugzilla bug #469252.
 - Disabled C++ bindings.



From rishi at fedoraproject.org  Thu Jan  8 04:07:32 2009
From: rishi at fedoraproject.org (Debarshi Ray)
Date: Thu,  8 Jan 2009 04:07:32 +0000 (UTC)
Subject: rpms/libical/devel libical-0.41-configure.patch, NONE,
	1.1 libical.spec, 1.15, 1.16
Message-ID: <20090108040732.6B409700FD@cvs1.fedora.phx.redhat.com>

Author: rishi

Update of /cvs/pkgs/rpms/libical/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4106

Modified Files:
	libical.spec 
Added Files:
	libical-0.41-configure.patch 
Log Message:
* Thu Jan 08 2009 Debarshi Ray <rishi at fedoraproject.org> - 0.41-2
- Switched off ICAL_ERRORS_ARE_FATAL for all distributions, except Fedora 11.
  Closes Red Hat Bugzilla bug #478331.


libical-0.41-configure.patch:

--- NEW FILE libical-0.41-configure.patch ---
diff -urNp libical-0.41.orig/configure libical-0.41/configure
--- libical-0.41.orig/configure	2009-01-08 00:38:26.000000000 +0530
+++ libical-0.41/configure	2009-01-08 00:43:43.000000000 +0530
@@ -20519,17 +20519,17 @@ fi;
 
 
 cat >>confdefs.h <<\_ACEOF
-#define ICAL_ERRORS_ARE_FATAL 1
+#define ICAL_ERRORS_ARE_FATAL 0
 _ACEOF
 
 
 cat >>confdefs.h <<\_ACEOF
-#define NO_WARN_DEPRECATED 1
+#define NO_WARN_DEPRECATED 0
 _ACEOF
 
 
 cat >>confdefs.h <<\_ACEOF
-#define NO_WARN_ICAL_MALFORMEDDATA_ERROR_HACK 1
+#define NO_WARN_ICAL_MALFORMEDDATA_ERROR_HACK 0
 _ACEOF
 
 


Index: libical.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libical/devel/libical.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- libical.spec	25 Nov 2008 08:50:48 -0000	1.15
+++ libical.spec	8 Jan 2009 04:07:02 -0000	1.16
@@ -1,6 +1,6 @@
 Name:		libical
 Version:	0.41
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Reference implementation of the iCalendar data type and serialization format
 Summary(pl):	Implementacja formatu iCalendar
 
@@ -9,7 +9,12 @@
 URL:		http://freeassociation.sourceforge.net/
 Source0:	http://downloads.sourceforge.net/freeassociation/%{name}-%{version}.tar.gz
 
-Patch0:		%{name}-%{version}-makefile.patch
+%if 0%{?fc11}
+%else
+Patch0:		%{name}-%{version}-configure.patch
+%endif
+
+Patch1:		%{name}-%{version}-makefile.patch
 
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
@@ -42,7 +47,13 @@
 
 %prep
 %setup -q
+
+%if 0%{?fc11}
+%else
 %patch0 -p1
+%endif
+
+%patch1 -p1
 
 %build
 %configure --disable-static --enable-reentrant
@@ -99,6 +110,10 @@
 %{_includedir}/%{name}/vobject.h
 
 %changelog
+* Thu Jan 08 2009 Debarshi Ray <rishi at fedoraproject.org> - 0.41-2
+- Switched off ICAL_ERRORS_ARE_FATAL for all distributions, except Fedora 11.
+  Closes Red Hat Bugzilla bug #478331.
+
 * Sun Nov 23 2008 Debarshi Ray <rishi at fedoraproject.org> - 0.41-1
 - Version bump to 0.41. Closes Red Hat Bugzilla bug #469252.
 - Disabled C++ bindings.



From xulchris at fedoraproject.org  Thu Jan  8 04:13:02 2009
From: xulchris at fedoraproject.org (Christopher Stone)
Date: Thu,  8 Jan 2009 04:13:02 +0000 (UTC)
Subject: rpms/poker2d/F-10 .cvsignore, 1.9, 1.10 poker2d.spec, 1.13,
	1.14 sources, 1.9, 1.10
Message-ID: <20090108041302.D22F6700FD@cvs1.fedora.phx.redhat.com>

Author: xulchris

Update of /cvs/pkgs/rpms/poker2d/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4494/F-10

Modified Files:
	.cvsignore poker2d.spec sources 
Log Message:
upstream sync


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/poker2d/F-10/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	29 May 2008 17:25:17 -0000	1.9
+++ .cvsignore	8 Jan 2009 04:12:32 -0000	1.10
@@ -1 +1 @@
-poker-network-1.6.0.tar.gz
+poker-network-1.7.3.tar.gz


Index: poker2d.spec
===================================================================
RCS file: /cvs/pkgs/rpms/poker2d/F-10/poker2d.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- poker2d.spec	2 Dec 2008 21:20:10 -0000	1.13
+++ poker2d.spec	8 Jan 2009 04:12:32 -0000	1.14
@@ -2,16 +2,14 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           poker2d
-Version:        1.6.0
-Release:        3%{?dist}
+Version:        1.7.3
+Release:        1%{?dist}
 Summary:        GTK poker client to play on a poker-network server
 
 Group:          Amusements/Games
 License:        GPLv2+
 URL:            http://pokersource.org/poker-network
 Source0:        http://download.gna.org/pokersource/sources/poker-network-%{version}.tar.gz
-Patch0:         %{name}-1.6.0-python26.patch
-Patch1:         %{name}-1.6.0-libtool22.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libtool gettext cvs
@@ -53,9 +51,6 @@
 
 %prep
 %setup -qn poker-network-%{version}
-%patch0 -p0 -b .python26~
-%patch1 -p0 -b .libtool22~
-autoreconf --force --install
 
 # create poker2d desktop file
 cat > %{name}.desktop << EOF
@@ -129,10 +124,14 @@
 rm -f  $RPM_BUILD_ROOT%{_sysconfdir}/poker-network/poker.client.xml
 rm -fr $RPM_BUILD_ROOT%{_sysconfdir}/poker-web
 rm -f  $RPM_BUILD_ROOT%{python_sitelib}/pokernetwork/__init__*
+rm -f  $RPM_BUILD_ROOT%{python_sitelib}/pokernetwork/attrpack*
 rm -f  $RPM_BUILD_ROOT%{python_sitelib}/pokernetwork/client*
+rm -f  $RPM_BUILD_ROOT%{python_sitelib}/pokernetwork/countfilter*
 rm -f  $RPM_BUILD_ROOT%{python_sitelib}/pokernetwork/currencyclient*
 rm -f  $RPM_BUILD_ROOT%{python_sitelib}/pokernetwork/dispatch*
+rm -f  $RPM_BUILD_ROOT%{python_sitelib}/pokernetwork/nullfilter*
 rm -f  $RPM_BUILD_ROOT%{python_sitelib}/pokernetwork/packets*
+rm -f  $RPM_BUILD_ROOT%{python_sitelib}/pokernetwork/pokerauth*
 rm -f  $RPM_BUILD_ROOT%{python_sitelib}/pokernetwork/pokeravatar*
 rm -f  $RPM_BUILD_ROOT%{python_sitelib}/pokernetwork/pokerbot*
 rm -f  $RPM_BUILD_ROOT%{python_sitelib}/pokernetwork/pokercashier*
@@ -142,25 +141,33 @@
 rm -f  $RPM_BUILD_ROOT%{python_sitelib}/pokernetwork/pokerexplain*
 rm -f  $RPM_BUILD_ROOT%{python_sitelib}/pokernetwork/pokergameclient*
 rm -f  $RPM_BUILD_ROOT%{python_sitelib}/pokernetwork/pokerlock*
+rm -f  $RPM_BUILD_ROOT%{python_sitelib}/pokernetwork/pokermemcache*
 rm -f  $RPM_BUILD_ROOT%{python_sitelib}/pokernetwork/pokernetworkconfig*
 rm -f  $RPM_BUILD_ROOT%{python_sitelib}/pokernetwork/pokerpackets*
 rm -f  $RPM_BUILD_ROOT%{python_sitelib}/pokernetwork/pokerserver*
 rm -f  $RPM_BUILD_ROOT%{python_sitelib}/pokernetwork/pokerservice*
+rm -f  $RPM_BUILD_ROOT%{python_sitelib}/pokernetwork/pokersite*
 rm -f  $RPM_BUILD_ROOT%{python_sitelib}/pokernetwork/pokertable*
 rm -f  $RPM_BUILD_ROOT%{python_sitelib}/pokernetwork/protocol*
 rm -f  $RPM_BUILD_ROOT%{python_sitelib}/pokernetwork/proxy*
 rm -f  $RPM_BUILD_ROOT%{python_sitelib}/pokernetwork/server*
+rm -f  $RPM_BUILD_ROOT%{python_sitelib}/pokernetwork/tourneyattrs*
 rm -f  $RPM_BUILD_ROOT%{python_sitelib}/pokernetwork/upgrade*
 rm -f  $RPM_BUILD_ROOT%{python_sitelib}/pokernetwork/user*
 rm -f  $RPM_BUILD_ROOT%{python_sitelib}/pokernetwork/version*
+rm -f  $RPM_BUILD_ROOT%{python_sitelib}/pokerstats/*
 rm -fr $RPM_BUILD_ROOT%{python_sitelib}/pokerui
+rm -fr $RPM_BUILD_ROOT%{python_sitelib}/twisted*
 rm -f  $RPM_BUILD_ROOT%{_sbindir}/*
+rm -f  $RPM_BUILD_ROOT%{_bindir}/pokerstats
+rm -fr $RPM_BUILD_ROOT%{_datadir}/man/man1
 rm -fr $RPM_BUILD_ROOT%{_datadir}/man/man8
 rm -f  $RPM_BUILD_ROOT%{_datadir}/poker-network/*.sql
 rm -f  $RPM_BUILD_ROOT%{_datadir}/poker-network/conf/poker.pem
 rm -f  $RPM_BUILD_ROOT%{_datadir}/poker-network/conf/poker.bot.xml
 rm -f  $RPM_BUILD_ROOT%{_datadir}/poker-network/conf/poker.server.xml
 rm -f  $RPM_BUILD_ROOT%{_datadir}/poker-network/conf/poker.client.xml
+rm -f  $RPM_BUILD_ROOT%{_datadir}/poker-network/conf/poker.stats.xml
 rm -fr $RPM_BUILD_ROOT%{_datadir}/poker-network/upgrades/poker.bot
 rm -fr $RPM_BUILD_ROOT%{_datadir}/poker-network/upgrades/poker.server
 rm -fr $RPM_BUILD_ROOT%{_datadir}/poker-network/upgrades/poker.client
@@ -215,6 +222,14 @@
 
 
 %changelog
+* Wed Jan 07 2009 Christopher Stone <chris.stone at gmail.com> 1.7.3-1
+- Upstream sync
+- Remove no longer needed patches
+- Remove new files in poker-network package
+
+* Tue Dec 02 2008 Christopher Stone <chris.stone at gmail.com> 1.6.0-3.1
+- Release bump for dist-f11-python build
+
 * Mon Dec 01 2008 Christopher Stone <chris.stone at gmail.com> 1.6.0-3
 - Add python2.6 patch
 - Add libtool2.2 patch


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/poker2d/F-10/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	29 May 2008 17:25:17 -0000	1.9
+++ sources	8 Jan 2009 04:12:32 -0000	1.10
@@ -1 +1 @@
-1ba14542d834edcfac9782d0caeff8ba  poker-network-1.6.0.tar.gz
+9680fe96f33c678dd4825251f07d6823  poker-network-1.7.3.tar.gz



From xulchris at fedoraproject.org  Thu Jan  8 04:13:03 2009
From: xulchris at fedoraproject.org (Christopher Stone)
Date: Thu,  8 Jan 2009 04:13:03 +0000 (UTC)
Subject: rpms/poker2d/F-8 .cvsignore, 1.9, 1.10 poker2d.spec, 1.13,
	1.14 sources, 1.9, 1.10
Message-ID: <20090108041303.08BDA700FD@cvs1.fedora.phx.redhat.com>

Author: xulchris

Update of /cvs/pkgs/rpms/poker2d/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4494/F-8

Modified Files:
	.cvsignore poker2d.spec sources 
Log Message:
upstream sync


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/poker2d/F-8/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	29 May 2008 17:24:42 -0000	1.9
+++ .cvsignore	8 Jan 2009 04:12:32 -0000	1.10
@@ -1 +1 @@
-poker-network-1.6.0.tar.gz
+poker-network-1.7.3.tar.gz


Index: poker2d.spec
===================================================================
RCS file: /cvs/pkgs/rpms/poker2d/F-8/poker2d.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- poker2d.spec	2 Dec 2008 22:00:51 -0000	1.13
+++ poker2d.spec	8 Jan 2009 04:12:32 -0000	1.14
@@ -2,19 +2,17 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           poker2d
-Version:        1.6.0
-Release:        3%{?dist}.1
+Version:        1.7.3
+Release:        1%{?dist}
 Summary:        GTK poker client to play on a poker-network server
 
 Group:          Amusements/Games
 License:        GPLv2+
 URL:            http://pokersource.org/poker-network
 Source0:        http://download.gna.org/pokersource/sources/poker-network-%{version}.tar.gz
-Patch0:         %{name}-1.6.0-python26.patch
-Patch1:         %{name}-1.6.0-libtool22.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  libtool gettext-devel cvs
+BuildRequires:  libtool gettext cvs
 BuildRequires:  desktop-file-utils hicolor-icon-theme ImageMagick
 BuildRequires:  apg python-devel poker-engine-devel >= 1.0.21
 BuildRequires:  glib2-devel libglade2-devel pygtk2-devel pygtk2-libglade
@@ -53,9 +51,6 @@
 
 %prep
 %setup -qn poker-network-%{version}
-%patch0 -p0 -b .python26~
-%patch1 -p0 -b .libtool22~
-autoreconf --force --install
 
 # create poker2d desktop file
 cat > %{name}.desktop << EOF
@@ -129,10 +124,14 @@
 rm -f  $RPM_BUILD_ROOT%{_sysconfdir}/poker-network/poker.client.xml
 rm -fr $RPM_BUILD_ROOT%{_sysconfdir}/poker-web
 rm -f  $RPM_BUILD_ROOT%{python_sitelib}/pokernetwork/__init__*
+rm -f  $RPM_BUILD_ROOT%{python_sitelib}/pokernetwork/attrpack*
 rm -f  $RPM_BUILD_ROOT%{python_sitelib}/pokernetwork/client*
+rm -f  $RPM_BUILD_ROOT%{python_sitelib}/pokernetwork/countfilter*
 rm -f  $RPM_BUILD_ROOT%{python_sitelib}/pokernetwork/currencyclient*
 rm -f  $RPM_BUILD_ROOT%{python_sitelib}/pokernetwork/dispatch*
+rm -f  $RPM_BUILD_ROOT%{python_sitelib}/pokernetwork/nullfilter*
 rm -f  $RPM_BUILD_ROOT%{python_sitelib}/pokernetwork/packets*
+rm -f  $RPM_BUILD_ROOT%{python_sitelib}/pokernetwork/pokerauth*
 rm -f  $RPM_BUILD_ROOT%{python_sitelib}/pokernetwork/pokeravatar*
 rm -f  $RPM_BUILD_ROOT%{python_sitelib}/pokernetwork/pokerbot*
 rm -f  $RPM_BUILD_ROOT%{python_sitelib}/pokernetwork/pokercashier*
@@ -142,25 +141,33 @@
 rm -f  $RPM_BUILD_ROOT%{python_sitelib}/pokernetwork/pokerexplain*
 rm -f  $RPM_BUILD_ROOT%{python_sitelib}/pokernetwork/pokergameclient*
 rm -f  $RPM_BUILD_ROOT%{python_sitelib}/pokernetwork/pokerlock*
+rm -f  $RPM_BUILD_ROOT%{python_sitelib}/pokernetwork/pokermemcache*
 rm -f  $RPM_BUILD_ROOT%{python_sitelib}/pokernetwork/pokernetworkconfig*
 rm -f  $RPM_BUILD_ROOT%{python_sitelib}/pokernetwork/pokerpackets*
 rm -f  $RPM_BUILD_ROOT%{python_sitelib}/pokernetwork/pokerserver*
 rm -f  $RPM_BUILD_ROOT%{python_sitelib}/pokernetwork/pokerservice*
+rm -f  $RPM_BUILD_ROOT%{python_sitelib}/pokernetwork/pokersite*
 rm -f  $RPM_BUILD_ROOT%{python_sitelib}/pokernetwork/pokertable*
 rm -f  $RPM_BUILD_ROOT%{python_sitelib}/pokernetwork/protocol*
 rm -f  $RPM_BUILD_ROOT%{python_sitelib}/pokernetwork/proxy*
 rm -f  $RPM_BUILD_ROOT%{python_sitelib}/pokernetwork/server*
+rm -f  $RPM_BUILD_ROOT%{python_sitelib}/pokernetwork/tourneyattrs*
 rm -f  $RPM_BUILD_ROOT%{python_sitelib}/pokernetwork/upgrade*
 rm -f  $RPM_BUILD_ROOT%{python_sitelib}/pokernetwork/user*
 rm -f  $RPM_BUILD_ROOT%{python_sitelib}/pokernetwork/version*
+rm -f  $RPM_BUILD_ROOT%{python_sitelib}/pokerstats/*
 rm -fr $RPM_BUILD_ROOT%{python_sitelib}/pokerui
+rm -fr $RPM_BUILD_ROOT%{python_sitelib}/twisted*
 rm -f  $RPM_BUILD_ROOT%{_sbindir}/*
+rm -f  $RPM_BUILD_ROOT%{_bindir}/pokerstats
+rm -fr $RPM_BUILD_ROOT%{_datadir}/man/man1
 rm -fr $RPM_BUILD_ROOT%{_datadir}/man/man8
 rm -f  $RPM_BUILD_ROOT%{_datadir}/poker-network/*.sql
 rm -f  $RPM_BUILD_ROOT%{_datadir}/poker-network/conf/poker.pem
 rm -f  $RPM_BUILD_ROOT%{_datadir}/poker-network/conf/poker.bot.xml
 rm -f  $RPM_BUILD_ROOT%{_datadir}/poker-network/conf/poker.server.xml
 rm -f  $RPM_BUILD_ROOT%{_datadir}/poker-network/conf/poker.client.xml
+rm -f  $RPM_BUILD_ROOT%{_datadir}/poker-network/conf/poker.stats.xml
 rm -fr $RPM_BUILD_ROOT%{_datadir}/poker-network/upgrades/poker.bot
 rm -fr $RPM_BUILD_ROOT%{_datadir}/poker-network/upgrades/poker.server
 rm -fr $RPM_BUILD_ROOT%{_datadir}/poker-network/upgrades/poker.client
@@ -215,8 +222,13 @@
 
 
 %changelog
-* Mon Dec 01 2008 Christopher Stone <chris.stone at gmail.com> 1.6.0-3.1
-- Use a BR of gettext-devel for FC8
+* Wed Jan 07 2009 Christopher Stone <chris.stone at gmail.com> 1.7.3-1
+- Upstream sync
+- Remove no longer needed patches
+- Remove new files in poker-network package
+
+* Tue Dec 02 2008 Christopher Stone <chris.stone at gmail.com> 1.6.0-3.1
+- Release bump for dist-f11-python build
 
 * Mon Dec 01 2008 Christopher Stone <chris.stone at gmail.com> 1.6.0-3
 - Add python2.6 patch


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/poker2d/F-8/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	29 May 2008 17:24:42 -0000	1.9
+++ sources	8 Jan 2009 04:12:32 -0000	1.10
@@ -1 +1 @@
-1ba14542d834edcfac9782d0caeff8ba  poker-network-1.6.0.tar.gz
+9680fe96f33c678dd4825251f07d6823  poker-network-1.7.3.tar.gz



From xulchris at fedoraproject.org  Thu Jan  8 04:13:03 2009
From: xulchris at fedoraproject.org (Christopher Stone)
Date: Thu,  8 Jan 2009 04:13:03 +0000 (UTC)
Subject: rpms/poker2d/F-9 .cvsignore, 1.9, 1.10 poker2d.spec, 1.13,
	1.14 sources, 1.9, 1.10
Message-ID: <20090108041303.4751E700FD@cvs1.fedora.phx.redhat.com>

Author: xulchris

Update of /cvs/pkgs/rpms/poker2d/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4494/F-9

Modified Files:
	.cvsignore poker2d.spec sources 
Log Message:
upstream sync


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/poker2d/F-9/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	29 May 2008 17:25:03 -0000	1.9
+++ .cvsignore	8 Jan 2009 04:12:33 -0000	1.10
@@ -1 +1 @@
-poker-network-1.6.0.tar.gz
+poker-network-1.7.3.tar.gz


Index: poker2d.spec
===================================================================
RCS file: /cvs/pkgs/rpms/poker2d/F-9/poker2d.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- poker2d.spec	2 Dec 2008 21:20:11 -0000	1.13
+++ poker2d.spec	8 Jan 2009 04:12:33 -0000	1.14
@@ -2,16 +2,14 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           poker2d
-Version:        1.6.0
-Release:        3%{?dist}
+Version:        1.7.3
+Release:        1%{?dist}
 Summary:        GTK poker client to play on a poker-network server
 
 Group:          Amusements/Games
 License:        GPLv2+
 URL:            http://pokersource.org/poker-network
 Source0:        http://download.gna.org/pokersource/sources/poker-network-%{version}.tar.gz
-Patch0:         %{name}-1.6.0-python26.patch
-Patch1:         %{name}-1.6.0-libtool22.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libtool gettext cvs
@@ -53,9 +51,6 @@
 
 %prep
 %setup -qn poker-network-%{version}
-%patch0 -p0 -b .python26~
-%patch1 -p0 -b .libtool22~
-autoreconf --force --install
 
 # create poker2d desktop file
 cat > %{name}.desktop << EOF
@@ -129,10 +124,14 @@
 rm -f  $RPM_BUILD_ROOT%{_sysconfdir}/poker-network/poker.client.xml
 rm -fr $RPM_BUILD_ROOT%{_sysconfdir}/poker-web
 rm -f  $RPM_BUILD_ROOT%{python_sitelib}/pokernetwork/__init__*
+rm -f  $RPM_BUILD_ROOT%{python_sitelib}/pokernetwork/attrpack*
 rm -f  $RPM_BUILD_ROOT%{python_sitelib}/pokernetwork/client*
+rm -f  $RPM_BUILD_ROOT%{python_sitelib}/pokernetwork/countfilter*
 rm -f  $RPM_BUILD_ROOT%{python_sitelib}/pokernetwork/currencyclient*
 rm -f  $RPM_BUILD_ROOT%{python_sitelib}/pokernetwork/dispatch*
+rm -f  $RPM_BUILD_ROOT%{python_sitelib}/pokernetwork/nullfilter*
 rm -f  $RPM_BUILD_ROOT%{python_sitelib}/pokernetwork/packets*
+rm -f  $RPM_BUILD_ROOT%{python_sitelib}/pokernetwork/pokerauth*
 rm -f  $RPM_BUILD_ROOT%{python_sitelib}/pokernetwork/pokeravatar*
 rm -f  $RPM_BUILD_ROOT%{python_sitelib}/pokernetwork/pokerbot*
 rm -f  $RPM_BUILD_ROOT%{python_sitelib}/pokernetwork/pokercashier*
@@ -142,25 +141,33 @@
 rm -f  $RPM_BUILD_ROOT%{python_sitelib}/pokernetwork/pokerexplain*
 rm -f  $RPM_BUILD_ROOT%{python_sitelib}/pokernetwork/pokergameclient*
 rm -f  $RPM_BUILD_ROOT%{python_sitelib}/pokernetwork/pokerlock*
+rm -f  $RPM_BUILD_ROOT%{python_sitelib}/pokernetwork/pokermemcache*
 rm -f  $RPM_BUILD_ROOT%{python_sitelib}/pokernetwork/pokernetworkconfig*
 rm -f  $RPM_BUILD_ROOT%{python_sitelib}/pokernetwork/pokerpackets*
 rm -f  $RPM_BUILD_ROOT%{python_sitelib}/pokernetwork/pokerserver*
 rm -f  $RPM_BUILD_ROOT%{python_sitelib}/pokernetwork/pokerservice*
+rm -f  $RPM_BUILD_ROOT%{python_sitelib}/pokernetwork/pokersite*
 rm -f  $RPM_BUILD_ROOT%{python_sitelib}/pokernetwork/pokertable*
 rm -f  $RPM_BUILD_ROOT%{python_sitelib}/pokernetwork/protocol*
 rm -f  $RPM_BUILD_ROOT%{python_sitelib}/pokernetwork/proxy*
 rm -f  $RPM_BUILD_ROOT%{python_sitelib}/pokernetwork/server*
+rm -f  $RPM_BUILD_ROOT%{python_sitelib}/pokernetwork/tourneyattrs*
 rm -f  $RPM_BUILD_ROOT%{python_sitelib}/pokernetwork/upgrade*
 rm -f  $RPM_BUILD_ROOT%{python_sitelib}/pokernetwork/user*
 rm -f  $RPM_BUILD_ROOT%{python_sitelib}/pokernetwork/version*
+rm -f  $RPM_BUILD_ROOT%{python_sitelib}/pokerstats/*
 rm -fr $RPM_BUILD_ROOT%{python_sitelib}/pokerui
+rm -fr $RPM_BUILD_ROOT%{python_sitelib}/twisted*
 rm -f  $RPM_BUILD_ROOT%{_sbindir}/*
+rm -f  $RPM_BUILD_ROOT%{_bindir}/pokerstats
+rm -fr $RPM_BUILD_ROOT%{_datadir}/man/man1
 rm -fr $RPM_BUILD_ROOT%{_datadir}/man/man8
 rm -f  $RPM_BUILD_ROOT%{_datadir}/poker-network/*.sql
 rm -f  $RPM_BUILD_ROOT%{_datadir}/poker-network/conf/poker.pem
 rm -f  $RPM_BUILD_ROOT%{_datadir}/poker-network/conf/poker.bot.xml
 rm -f  $RPM_BUILD_ROOT%{_datadir}/poker-network/conf/poker.server.xml
 rm -f  $RPM_BUILD_ROOT%{_datadir}/poker-network/conf/poker.client.xml
+rm -f  $RPM_BUILD_ROOT%{_datadir}/poker-network/conf/poker.stats.xml
 rm -fr $RPM_BUILD_ROOT%{_datadir}/poker-network/upgrades/poker.bot
 rm -fr $RPM_BUILD_ROOT%{_datadir}/poker-network/upgrades/poker.server
 rm -fr $RPM_BUILD_ROOT%{_datadir}/poker-network/upgrades/poker.client
@@ -215,6 +222,14 @@
 
 
 %changelog
+* Wed Jan 07 2009 Christopher Stone <chris.stone at gmail.com> 1.7.3-1
+- Upstream sync
+- Remove no longer needed patches
+- Remove new files in poker-network package
+
+* Tue Dec 02 2008 Christopher Stone <chris.stone at gmail.com> 1.6.0-3.1
+- Release bump for dist-f11-python build
+
 * Mon Dec 01 2008 Christopher Stone <chris.stone at gmail.com> 1.6.0-3
 - Add python2.6 patch
 - Add libtool2.2 patch


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/poker2d/F-9/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	29 May 2008 17:25:03 -0000	1.9
+++ sources	8 Jan 2009 04:12:33 -0000	1.10
@@ -1 +1 @@
-1ba14542d834edcfac9782d0caeff8ba  poker-network-1.6.0.tar.gz
+9680fe96f33c678dd4825251f07d6823  poker-network-1.7.3.tar.gz



From xulchris at fedoraproject.org  Thu Jan  8 04:13:03 2009
From: xulchris at fedoraproject.org (Christopher Stone)
Date: Thu,  8 Jan 2009 04:13:03 +0000 (UTC)
Subject: rpms/poker2d/devel .cvsignore, 1.9, 1.10 poker2d.spec, 1.15,
	1.16 sources, 1.9, 1.10
Message-ID: <20090108041303.96057700FD@cvs1.fedora.phx.redhat.com>

Author: xulchris

Update of /cvs/pkgs/rpms/poker2d/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4494/devel

Modified Files:
	.cvsignore poker2d.spec sources 
Log Message:
upstream sync


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/poker2d/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	29 May 2008 17:25:17 -0000	1.9
+++ .cvsignore	8 Jan 2009 04:12:33 -0000	1.10
@@ -1 +1 @@
-poker-network-1.6.0.tar.gz
+poker-network-1.7.3.tar.gz


Index: poker2d.spec
===================================================================
RCS file: /cvs/pkgs/rpms/poker2d/devel/poker2d.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- poker2d.spec	3 Dec 2008 03:37:33 -0000	1.15
+++ poker2d.spec	8 Jan 2009 04:12:33 -0000	1.16
@@ -2,16 +2,14 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           poker2d
-Version:        1.6.0
-Release:        3%{?dist}.1
+Version:        1.7.3
+Release:        1%{?dist}
 Summary:        GTK poker client to play on a poker-network server
 
 Group:          Amusements/Games
 License:        GPLv2+
 URL:            http://pokersource.org/poker-network
 Source0:        http://download.gna.org/pokersource/sources/poker-network-%{version}.tar.gz
-Patch0:         %{name}-1.6.0-python26.patch
-Patch1:         %{name}-1.6.0-libtool22.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libtool gettext cvs
@@ -53,9 +51,6 @@
 
 %prep
 %setup -qn poker-network-%{version}
-%patch0 -p0 -b .python26~
-%patch1 -p0 -b .libtool22~
-autoreconf --force --install
 
 # create poker2d desktop file
 cat > %{name}.desktop << EOF
@@ -129,10 +124,14 @@
 rm -f  $RPM_BUILD_ROOT%{_sysconfdir}/poker-network/poker.client.xml
 rm -fr $RPM_BUILD_ROOT%{_sysconfdir}/poker-web
 rm -f  $RPM_BUILD_ROOT%{python_sitelib}/pokernetwork/__init__*
+rm -f  $RPM_BUILD_ROOT%{python_sitelib}/pokernetwork/attrpack*
 rm -f  $RPM_BUILD_ROOT%{python_sitelib}/pokernetwork/client*
+rm -f  $RPM_BUILD_ROOT%{python_sitelib}/pokernetwork/countfilter*
 rm -f  $RPM_BUILD_ROOT%{python_sitelib}/pokernetwork/currencyclient*
 rm -f  $RPM_BUILD_ROOT%{python_sitelib}/pokernetwork/dispatch*
+rm -f  $RPM_BUILD_ROOT%{python_sitelib}/pokernetwork/nullfilter*
 rm -f  $RPM_BUILD_ROOT%{python_sitelib}/pokernetwork/packets*
+rm -f  $RPM_BUILD_ROOT%{python_sitelib}/pokernetwork/pokerauth*
 rm -f  $RPM_BUILD_ROOT%{python_sitelib}/pokernetwork/pokeravatar*
 rm -f  $RPM_BUILD_ROOT%{python_sitelib}/pokernetwork/pokerbot*
 rm -f  $RPM_BUILD_ROOT%{python_sitelib}/pokernetwork/pokercashier*
@@ -142,25 +141,33 @@
 rm -f  $RPM_BUILD_ROOT%{python_sitelib}/pokernetwork/pokerexplain*
 rm -f  $RPM_BUILD_ROOT%{python_sitelib}/pokernetwork/pokergameclient*
 rm -f  $RPM_BUILD_ROOT%{python_sitelib}/pokernetwork/pokerlock*
+rm -f  $RPM_BUILD_ROOT%{python_sitelib}/pokernetwork/pokermemcache*
 rm -f  $RPM_BUILD_ROOT%{python_sitelib}/pokernetwork/pokernetworkconfig*
 rm -f  $RPM_BUILD_ROOT%{python_sitelib}/pokernetwork/pokerpackets*
 rm -f  $RPM_BUILD_ROOT%{python_sitelib}/pokernetwork/pokerserver*
 rm -f  $RPM_BUILD_ROOT%{python_sitelib}/pokernetwork/pokerservice*
+rm -f  $RPM_BUILD_ROOT%{python_sitelib}/pokernetwork/pokersite*
 rm -f  $RPM_BUILD_ROOT%{python_sitelib}/pokernetwork/pokertable*
 rm -f  $RPM_BUILD_ROOT%{python_sitelib}/pokernetwork/protocol*
 rm -f  $RPM_BUILD_ROOT%{python_sitelib}/pokernetwork/proxy*
 rm -f  $RPM_BUILD_ROOT%{python_sitelib}/pokernetwork/server*
+rm -f  $RPM_BUILD_ROOT%{python_sitelib}/pokernetwork/tourneyattrs*
 rm -f  $RPM_BUILD_ROOT%{python_sitelib}/pokernetwork/upgrade*
 rm -f  $RPM_BUILD_ROOT%{python_sitelib}/pokernetwork/user*
 rm -f  $RPM_BUILD_ROOT%{python_sitelib}/pokernetwork/version*
+rm -f  $RPM_BUILD_ROOT%{python_sitelib}/pokerstats/*
 rm -fr $RPM_BUILD_ROOT%{python_sitelib}/pokerui
+rm -fr $RPM_BUILD_ROOT%{python_sitelib}/twisted*
 rm -f  $RPM_BUILD_ROOT%{_sbindir}/*
+rm -f  $RPM_BUILD_ROOT%{_bindir}/pokerstats
+rm -fr $RPM_BUILD_ROOT%{_datadir}/man/man1
 rm -fr $RPM_BUILD_ROOT%{_datadir}/man/man8
 rm -f  $RPM_BUILD_ROOT%{_datadir}/poker-network/*.sql
 rm -f  $RPM_BUILD_ROOT%{_datadir}/poker-network/conf/poker.pem
 rm -f  $RPM_BUILD_ROOT%{_datadir}/poker-network/conf/poker.bot.xml
 rm -f  $RPM_BUILD_ROOT%{_datadir}/poker-network/conf/poker.server.xml
 rm -f  $RPM_BUILD_ROOT%{_datadir}/poker-network/conf/poker.client.xml
+rm -f  $RPM_BUILD_ROOT%{_datadir}/poker-network/conf/poker.stats.xml
 rm -fr $RPM_BUILD_ROOT%{_datadir}/poker-network/upgrades/poker.bot
 rm -fr $RPM_BUILD_ROOT%{_datadir}/poker-network/upgrades/poker.server
 rm -fr $RPM_BUILD_ROOT%{_datadir}/poker-network/upgrades/poker.client
@@ -215,6 +222,11 @@
 
 
 %changelog
+* Wed Jan 07 2009 Christopher Stone <chris.stone at gmail.com> 1.7.3-1
+- Upstream sync
+- Remove no longer needed patches
+- Remove new files in poker-network package
+
 * Tue Dec 02 2008 Christopher Stone <chris.stone at gmail.com> 1.6.0-3.1
 - Release bump for dist-f11-python build
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/poker2d/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	29 May 2008 17:25:17 -0000	1.9
+++ sources	8 Jan 2009 04:12:33 -0000	1.10
@@ -1 +1 @@
-1ba14542d834edcfac9782d0caeff8ba  poker-network-1.6.0.tar.gz
+9680fe96f33c678dd4825251f07d6823  poker-network-1.7.3.tar.gz



From xulchris at fedoraproject.org  Thu Jan  8 04:15:51 2009
From: xulchris at fedoraproject.org (Christopher Stone)
Date: Thu,  8 Jan 2009 04:15:51 +0000 (UTC)
Subject: rpms/poker2d/F-8 poker2d-1.6.0-libtool22.patch, 1.1,
	NONE poker2d-1.6.0-python26.patch, 1.1, NONE
Message-ID: <20090108041551.DE3BB7013F@cvs1.fedora.phx.redhat.com>

Author: xulchris

Update of /cvs/pkgs/rpms/poker2d/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4834/F-8

Removed Files:
	poker2d-1.6.0-libtool22.patch poker2d-1.6.0-python26.patch 
Log Message:
remove unneeded patches from cvs


--- poker2d-1.6.0-libtool22.patch DELETED ---


--- poker2d-1.6.0-python26.patch DELETED ---



From xulchris at fedoraproject.org  Thu Jan  8 04:15:51 2009
From: xulchris at fedoraproject.org (Christopher Stone)
Date: Thu,  8 Jan 2009 04:15:51 +0000 (UTC)
Subject: rpms/poker2d/F-10 poker2d-1.6.0-libtool22.patch, 1.1,
	NONE poker2d-1.6.0-python26.patch, 1.1, NONE
Message-ID: <20090108041551.B141F7013F@cvs1.fedora.phx.redhat.com>

Author: xulchris

Update of /cvs/pkgs/rpms/poker2d/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4834/F-10

Removed Files:
	poker2d-1.6.0-libtool22.patch poker2d-1.6.0-python26.patch 
Log Message:
remove unneeded patches from cvs


--- poker2d-1.6.0-libtool22.patch DELETED ---


--- poker2d-1.6.0-python26.patch DELETED ---



From xulchris at fedoraproject.org  Thu Jan  8 04:15:52 2009
From: xulchris at fedoraproject.org (Christopher Stone)
Date: Thu,  8 Jan 2009 04:15:52 +0000 (UTC)
Subject: rpms/poker2d/devel poker2d-1.6.0-libtool22.patch, 1.1,
	NONE poker2d-1.6.0-python26.patch, 1.1, NONE
Message-ID: <20090108041552.8CE1A7013F@cvs1.fedora.phx.redhat.com>

Author: xulchris

Update of /cvs/pkgs/rpms/poker2d/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4834/devel

Removed Files:
	poker2d-1.6.0-libtool22.patch poker2d-1.6.0-python26.patch 
Log Message:
remove unneeded patches from cvs


--- poker2d-1.6.0-libtool22.patch DELETED ---


--- poker2d-1.6.0-python26.patch DELETED ---



From xulchris at fedoraproject.org  Thu Jan  8 04:15:52 2009
From: xulchris at fedoraproject.org (Christopher Stone)
Date: Thu,  8 Jan 2009 04:15:52 +0000 (UTC)
Subject: rpms/poker2d/F-9 poker2d-1.6.0-libtool22.patch, 1.1,
	NONE poker2d-1.6.0-python26.patch, 1.1, NONE
Message-ID: <20090108041552.3EDE97013F@cvs1.fedora.phx.redhat.com>

Author: xulchris

Update of /cvs/pkgs/rpms/poker2d/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4834/F-9

Removed Files:
	poker2d-1.6.0-libtool22.patch poker2d-1.6.0-python26.patch 
Log Message:
remove unneeded patches from cvs


--- poker2d-1.6.0-libtool22.patch DELETED ---


--- poker2d-1.6.0-python26.patch DELETED ---



From roland at fedoraproject.org  Thu Jan  8 04:42:55 2009
From: roland at fedoraproject.org (Roland McGrath)
Date: Thu,  8 Jan 2009 04:42:55 +0000 (UTC)
Subject: rpms/kernel/devel kernel.spec, 1.1198, 1.1199 linux-2.6-utrace.patch,
	1.106, 1.107
Message-ID: <20090108044255.168C0700FD@cvs1.fedora.phx.redhat.com>

Author: roland

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7886

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.1198
retrieving revision 1.1199
diff -u -r1.1198 -r1.1199
--- kernel.spec	7 Jan 2009 18:30:56 -0000	1.1198
+++ kernel.spec	8 Jan 2009 04:42:23 -0000	1.1199
@@ -1751,6 +1751,9 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Wed Jan  7 2009 Roland McGrath <roland at redhat.com>
+- utrace update
+
 * Wed Jan 07 2009 Dave Jones <davej at redhat.com>
 - Build ACPI_BATTERY in on x86-64, as we do on x86-32
 

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.106
retrieving revision 1.107
diff -u -r1.106 -r1.107
--- linux-2.6-utrace.patch	29 Dec 2008 03:52:45 -0000	1.106
+++ linux-2.6-utrace.patch	8 Jan 2009 04:42:24 -0000	1.107
@@ -1,5 +1,5 @@
  Documentation/DocBook/Makefile    |    2 +-
- Documentation/DocBook/utrace.tmpl |  566 ++++++++
+ Documentation/DocBook/utrace.tmpl |  571 ++++++++
  fs/proc/array.c                   |    3 +
  include/linux/ptrace.h            |   21 +
  include/linux/sched.h             |    6 +
@@ -9,8 +9,8 @@
  kernel/Makefile                   |    1 +
  kernel/ptrace.c                   |  791 +++++++++++-
  kernel/signal.c                   |   14 +-
- kernel/utrace.c                   | 2587 +++++++++++++++++++++++++++++++++++++
- 12 files changed, 4781 insertions(+), 11 deletions(-)
+ kernel/utrace.c                   | 2590 +++++++++++++++++++++++++++++++++++++
+ 12 files changed, 4789 insertions(+), 11 deletions(-)
 
 diff --git a/Documentation/DocBook/Makefile b/Documentation/DocBook/Makefile
 index 0a08126..7570189 100644  
@@ -27,10 +27,10 @@
  	    mac80211.xml debugobjects.xml sh.xml
 diff --git a/Documentation/DocBook/utrace.tmpl b/Documentation/DocBook/utrace.tmpl
 new file mode 100644
-index ...1c37104 100644  
+index ...f253402 100644  
 --- /dev/null
 +++ b/Documentation/DocBook/utrace.tmpl
-@@ -0,0 +1,566 @@
+@@ -0,0 +1,571 @@
 +<?xml version="1.0" encoding="UTF-8"?>
 +<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
 +"http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" []>
@@ -97,6 +97,11 @@
 +    Many engines can be attached to each thread.  When a thread has an
 +    event, each engine gets a callback if it has set the event flag for
 +    that event type.  Engines are called in the order they attached.
++    Engines that attach after the event has occurred do not get callbacks
++    for that event.  This includes any new engines just attached by an
++    existing engine's callback function.  Once the sequence of callbacks
++    for that one event has completed, such new engines are then eligible in
++    the next sequence that starts when there is another event.
 +  </para>
 +
 +  <para>
@@ -658,10 +663,10 @@
   * 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 8395e71..edf9b54 100644  
+index 4cae9b8..ca0861e 100644  
 --- a/include/linux/sched.h
 +++ b/include/linux/sched.h
-@@ -1211,6 +1211,11 @@ struct task_struct {
+@@ -1266,6 +1266,11 @@ struct task_struct {
  #endif
  	seccomp_t seccomp;
  
@@ -673,7 +678,7 @@
  /* Thread group tracking */
     	u32 parent_exec_id;
     	u32 self_exec_id;
-@@ -1810,6 +1815,7 @@ extern int kill_pgrp(struct pid *pid, in
+@@ -1865,6 +1870,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);
@@ -1628,10 +1633,10 @@
 +
 +#endif	/* linux/utrace.h */
 diff --git a/init/Kconfig b/init/Kconfig
-index 8a63c40..8fbc607 100644  
+index e7893b1..6a5bcbc 100644  
 --- a/init/Kconfig
 +++ b/init/Kconfig
-@@ -931,6 +931,32 @@ config STOP_MACHINE
+@@ -940,6 +940,32 @@ config STOP_MACHINE
  	help
  	  Need stop_machine() primitive.
  
@@ -1665,10 +1670,10 @@
  
  config PREEMPT_NOTIFIERS
 diff --git a/kernel/Makefile b/kernel/Makefile
-index 027edda..15fd878 100644  
+index 2921d90..16df880 100644  
 --- a/kernel/Makefile
 +++ b/kernel/Makefile
-@@ -63,6 +63,7 @@ obj-$(CONFIG_IKCONFIG) += configs.o
+@@ -64,6 +64,7 @@ obj-$(CONFIG_IKCONFIG) += configs.o
  obj-$(CONFIG_RESOURCE_COUNTERS) += res_counter.o
  obj-$(CONFIG_STOP_MACHINE) += stop_machine.o
  obj-$(CONFIG_KPROBES_SANITY_TEST) += test_kprobes.o
@@ -2570,10 +2575,10 @@
  
  /**
 diff --git a/kernel/signal.c b/kernel/signal.c
-index 8e95855..f966b6a 100644  
+index 3152ac3..f431662 100644  
 --- a/kernel/signal.c
 +++ b/kernel/signal.c
-@@ -1440,7 +1440,7 @@ int do_notify_parent(struct task_struct 
+@@ -1441,7 +1441,7 @@ int do_notify_parent(struct task_struct 
  	return ret;
  }
  
@@ -2582,7 +2587,7 @@
  {
  	struct siginfo info;
  	unsigned long flags;
-@@ -1494,6 +1494,8 @@ static void do_notify_parent_cldstop(str
+@@ -1495,6 +1495,8 @@ static void do_notify_parent_cldstop(str
  	spin_unlock_irqrestore(&sighand->siglock, flags);
  }
  
@@ -2591,7 +2596,7 @@
  static inline int may_ptrace_stop(void)
  {
  	if (!likely(current->ptrace & PT_PTRACED))
-@@ -1626,6 +1628,8 @@ void ptrace_notify(int exit_code)
+@@ -1627,6 +1629,8 @@ void ptrace_notify(int exit_code)
  	spin_unlock_irq(&current->sighand->siglock);
  }
  
@@ -2600,7 +2605,7 @@
  static void
  finish_stop(int stop_count)
  {
-@@ -1703,6 +1707,7 @@ static int do_signal_stop(int signr)
+@@ -1704,6 +1708,7 @@ static int do_signal_stop(int signr)
  	return 1;
  }
  
@@ -2608,7 +2613,7 @@
  static int ptrace_signal(int signr, siginfo_t *info,
  			 struct pt_regs *regs, void *cookie)
  {
-@@ -1741,6 +1746,13 @@ static int ptrace_signal(int signr, sigi
+@@ -1742,6 +1747,13 @@ static int ptrace_signal(int signr, sigi
  
  	return signr;
  }
@@ -2624,14 +2629,14 @@
  			  struct pt_regs *regs, void *cookie)
 diff --git a/kernel/utrace.c b/kernel/utrace.c
 new file mode 100644
-index ...3e2191c 100644  
+index ...1873b9d 100644  
 --- /dev/null
 +++ b/kernel/utrace.c
-@@ -0,0 +1,2587 @@
+@@ -0,0 +1,2590 @@
 +/*
 + * utrace infrastructure interface for debugging user processes
 + *
-+ * Copyright (C) 2006, 2007, 2008 Red Hat, Inc.  All rights reserved.
++ * Copyright (C) 2006-2009 Red Hat, Inc.  All rights reserved.
 + *
 + * This copyrighted material is made available to anyone wishing to use,
 + * modify, copy, or redistribute it subject to the terms and conditions
@@ -3006,27 +3011,25 @@
 +	list_add_tail(&engine->entry, &utrace->attaching);
 +
 +	/*
-+	 * 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.
++	 * 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 target == current, it would be safe just to call
++	 * splice_attaching() right here.  But if we're inside a
++	 * callback, that would mean the new engine also gets
++	 * notified about the event that precipitated its own
++	 * creation.  This is not what the user wants.
++	 *
++	 * Setting ->report ensures that start_report() takes the
++	 * lock and does it next time.  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.
 +	 */
-+
-+	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);
-+	}
++	utrace->report = 1;
++	set_notify_resume(target);
 +	goto finish;
 +
 +first:
@@ -3450,6 +3453,12 @@
 + *
 + * To synchronize after an -%EINPROGRESS return, see utrace_barrier().
 + *
++ * When @target is @current, -%EINPROGRESS is not returned.  But
++ * note that a newly-created engine will not receive any callbacks
++ * related to an event notification already in progress.  This call
++ * enables @events callbacks to be made as soon as @engine becomes
++ * eligible for any callbacks, see utrace_attach_task().
++ *
 + * These rules provide for coherent synchronization based on %UTRACE_STOP,
 + * even when %SIGKILL is breaking its normal simple rules.
 + */
@@ -3904,11 +3913,10 @@
 +	case UTRACE_REPORT:
 +		/*
 +		 * Make the thread call tracehook_notify_resume() soon.
-+		 * But don't bother if it's already been stopped or
-+		 * interrupted.  In those cases, utrace_get_signal()
-+		 * will be reporting soon.
++		 * But don't bother if it's already been interrupted.
++		 * In that case, utrace_get_signal() will be reporting soon.
 +		 */
-+		if (!utrace->report && !utrace->interrupt && !utrace->stopped) {
++		if (!utrace->report && !utrace->interrupt) {
 +			utrace->report = 1;
 +			set_notify_resume(target);
 +		}



From roland at fedoraproject.org  Thu Jan  8 04:42:55 2009
From: roland at fedoraproject.org (Roland McGrath)
Date: Thu,  8 Jan 2009 04:42:55 +0000 (UTC)
Subject: rpms/kernel/devel/scripts pull-upstreams.sh,1.5,1.6
Message-ID: <20090108044255.30FB27013F@cvs1.fedora.phx.redhat.com>

Author: roland

Update of /cvs/pkgs/rpms/kernel/devel/scripts
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7886/scripts

Modified Files:
	pull-upstreams.sh 
Log Message:
utrace update


Index: pull-upstreams.sh
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/scripts/pull-upstreams.sh,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- pull-upstreams.sh	9 Nov 2007 01:11:24 -0000	1.5
+++ pull-upstreams.sh	8 Jan 2009 04:42:24 -0000	1.6
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-url=http://people.redhat.com/roland/utrace/2.6-current
+url=http://people.redhat.com/roland/utrace/${1:-2.6-current}
 
 wget -q -O /dev/stdout $url/series | grep 'patch$' |
 while read i



From roland at fedoraproject.org  Thu Jan  8 04:44:33 2009
From: roland at fedoraproject.org (Roland McGrath)
Date: Thu,  8 Jan 2009 04:44:33 +0000 (UTC)
Subject: rpms/kernel/F-10 kernel.spec, 1.1204, 1.1205 linux-2.6-utrace.patch,
	1.102, 1.103 linux-2.6-x86-tracehook.patch, 1.9, 1.10
Message-ID: <20090108044433.9BCD3700FD@cvs1.fedora.phx.redhat.com>

Author: roland

Update of /cvs/pkgs/rpms/kernel/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8129

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/F-10/kernel.spec,v
retrieving revision 1.1204
retrieving revision 1.1205
diff -u -r1.1204 -r1.1205
--- kernel.spec	6 Jan 2009 21:10:09 -0000	1.1204
+++ kernel.spec	8 Jan 2009 04:44:02 -0000	1.1205
@@ -1937,6 +1937,9 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Wed Jan  7 2009 Roland McGrath <roland at redhat.com> - 2.6.27.10-169
+- utrace update
+
 * Tue Jan 06 2009 Eric Sandeen <sandeen at redhat.com> 2.6.27.10-168
 - ext4 - delay capable() checks in space accounting (#478299)
 

linux-2.6-utrace.patch:

Index: linux-2.6-utrace.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/linux-2.6-utrace.patch,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -r1.102 -r1.103
--- linux-2.6-utrace.patch	15 Oct 2008 05:15:44 -0000	1.102
+++ linux-2.6-utrace.patch	8 Jan 2009 04:44:02 -0000	1.103
@@ -1,5 +1,5 @@
  Documentation/DocBook/Makefile    |    2 +-
- Documentation/DocBook/utrace.tmpl |  566 ++++++++
+ Documentation/DocBook/utrace.tmpl |  571 ++++++++
  fs/proc/array.c                   |    3 +
  include/linux/ptrace.h            |   21 +
  include/linux/sched.h             |    6 +
@@ -7,30 +7,30 @@
  include/linux/utrace.h            |  707 ++++++++++
  init/Kconfig                      |   26 +
  kernel/Makefile                   |    1 +
- kernel/ptrace.c                   |  612 +++++++++-
+ kernel/ptrace.c                   |  793 +++++++++++-
  kernel/signal.c                   |   14 +-
- kernel/utrace.c                   | 2586 +++++++++++++++++++++++++++++++++++++
- 12 files changed, 4604 insertions(+), 8 deletions(-)
+ kernel/utrace.c                   | 2590 +++++++++++++++++++++++++++++++++++++
+ 12 files changed, 4790 insertions(+), 12 deletions(-)
 
 diff --git a/Documentation/DocBook/Makefile b/Documentation/DocBook/Makefile
-index 1615350..92ca631 100644  
+index 1615350..d27e093 100644  
 --- a/Documentation/DocBook/Makefile
 +++ b/Documentation/DocBook/Makefile
-@@ -7,7 +7,7 @@
- # list of DOCBOOKS.
- 
+@@ -9,7 +9,7 @@
  DOCBOOKS := wanbook.xml z8530book.xml mcabook.xml videobook.xml \
--	    kernel-hacking.xml kernel-locking.xml deviceiobook.xml \
-+	    kernel-hacking.xml kernel-locking.xml deviceiobook.xml utrace.xml \
+ 	    kernel-hacking.xml kernel-locking.xml deviceiobook.xml \
  	    procfs-guide.xml writing_usb_driver.xml networking.xml \
- 	    kernel-api.xml filesystems.xml lsm.xml usb.xml kgdb.xml \
+-	    kernel-api.xml filesystems.xml lsm.xml usb.xml kgdb.xml \
++	    kernel-api.xml filesystems.xml lsm.xml usb.xml kgdb.xml utrace.xml \
  	    gadget.xml libata.xml mtdnand.xml librs.xml rapidio.xml \
+ 	    genericirq.xml s390-drivers.xml uio-howto.xml scsi.xml \
+ 	    mac80211.xml debugobjects.xml sh.xml
 diff --git a/Documentation/DocBook/utrace.tmpl b/Documentation/DocBook/utrace.tmpl
 new file mode 100644
-index ...1c37104 100644  
+index ...f253402 100644  
 --- /dev/null
 +++ b/Documentation/DocBook/utrace.tmpl
-@@ -0,0 +1,566 @@
+@@ -0,0 +1,571 @@
 +<?xml version="1.0" encoding="UTF-8"?>
 +<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
 +"http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" []>
@@ -97,6 +97,11 @@
 +    Many engines can be attached to each thread.  When a thread has an
 +    event, each engine gets a callback if it has set the event flag for
 +    that event type.  Engines are called in the order they attached.
++    Engines that attach after the event has occurred do not get callbacks
++    for that event.  This includes any new engines just attached by an
++    existing engine's callback function.  Once the sequence of callbacks
++    for that one event has completed, such new engines are then eligible in
++    the next sequence that starts when there is another event.
 +  </para>
 +
 +  <para>
@@ -598,7 +603,7 @@
 +
 +</book>
 diff --git a/fs/proc/array.c b/fs/proc/array.c
-index f4bc0e7..469903f 100644  
+index 71c9be5..adc7a53 100644  
 --- a/fs/proc/array.c
 +++ b/fs/proc/array.c
 @@ -81,6 +81,7 @@
@@ -609,7 +614,7 @@
  
  #include <asm/pgtable.h>
  #include <asm/processor.h>
-@@ -185,6 +186,8 @@ static inline void task_state(struct seq
+@@ -190,6 +191,8 @@ static inline void task_state(struct seq
  		p->uid, p->euid, p->suid, p->fsuid,
  		p->gid, p->egid, p->sgid, p->fsgid);
  
@@ -658,10 +663,10 @@
   * 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 c226c7b..97e3606 100644  
+index 086f5e1..b0be16c 100644  
 --- a/include/linux/sched.h
 +++ b/include/linux/sched.h
-@@ -1199,6 +1199,11 @@ struct task_struct {
+@@ -1200,6 +1200,11 @@ struct task_struct {
  #endif
  	seccomp_t seccomp;
  
@@ -673,7 +678,7 @@
  /* Thread group tracking */
     	u32 parent_exec_id;
     	u32 self_exec_id;
-@@ -1775,6 +1780,7 @@ extern int kill_pgrp(struct pid *pid, in
+@@ -1778,6 +1783,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);
@@ -1628,10 +1633,10 @@
 +
 +#endif	/* linux/utrace.h */
 diff --git a/init/Kconfig b/init/Kconfig
-index 8a8e2d0..e52678f 100644  
+index c11da38..9ca2a8f 100644  
 --- a/init/Kconfig
 +++ b/init/Kconfig
-@@ -888,6 +888,32 @@ config STOP_MACHINE
+@@ -898,6 +898,32 @@ config STOP_MACHINE
  	help
  	  Need stop_machine() primitive.
  
@@ -1665,10 +1670,10 @@
  
  config PREEMPT_NOTIFIERS
 diff --git a/kernel/Makefile b/kernel/Makefile
-index 4e1d7df..eca21ef 100644  
+index 143e8b6..a1e4b62 100644  
 --- a/kernel/Makefile
 +++ b/kernel/Makefile
-@@ -64,6 +64,7 @@ obj-$(CONFIG_IKCONFIG) += configs.o
+@@ -62,6 +62,7 @@ obj-$(CONFIG_IKCONFIG) += configs.o
  obj-$(CONFIG_RESOURCE_COUNTERS) += res_counter.o
  obj-$(CONFIG_STOP_MACHINE) += stop_machine.o
  obj-$(CONFIG_KPROBES_SANITY_TEST) += test_kprobes.o
@@ -1677,7 +1682,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..29c60d1 100644  
+index 356699a..bc81174 100644  
 --- a/kernel/ptrace.c
 +++ b/kernel/ptrace.c
 @@ -16,6 +16,7 @@
@@ -1696,7 +1701,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,55 @@ void ptrace_untrace(struct task_struct *
+@@ -58,6 +60,72 @@ void ptrace_untrace(struct task_struct *
  	spin_unlock(&child->sighand->siglock);
  }
  
@@ -1706,7 +1711,7 @@
 +		ptrace_untrace(child);
 +}
 +
-+static void ptrace_detach_task(struct task_struct *child)
++static void ptrace_detach_task(struct task_struct *child, int sig)
 +{
 +	/* Architecture-specific hardware disable .. */
 +	ptrace_disable(child);
@@ -1721,17 +1726,34 @@
 +
 +static const struct utrace_engine_ops ptrace_utrace_ops; /* forward decl */
 +
-+static void ptrace_detach_task(struct task_struct *child)
++static void ptrace_detach_task(struct task_struct *child, int sig)
 +{
++	enum utrace_resume_action action = UTRACE_DETACH;
 +	struct utrace_attached_engine *engine;
++	int ret;
++
 +	engine = utrace_attach_task(child, UTRACE_ATTACH_MATCH_OPS,
 +				    &ptrace_utrace_ops, NULL);
-+	if (likely(!IS_ERR(engine))) {
-+		int ret = utrace_control(child, engine, UTRACE_DETACH);
-+		WARN_ON(ret && ret != -EINPROGRESS &&
-+			ret != -ESRCH && ret != -EALREADY);
-+		utrace_engine_put(engine);
++	if (unlikely(IS_ERR(engine)))
++		return;
++
++	/*
++	 * When leaving a parting signal to deliver, we cannot detach our
++	 * utrace engine yet.  We need it there to get a report_signal()
++	 * callback that can inject our parting signal.  Instead, we'll
++	 * mark our engine by clearing its data pointer.  Our callbacks
++	 * will see this and know it's a PTRACE_DETACH still in progress.
++	 */
++	if (sig) {
++		engine->data = NULL;
++		action = UTRACE_INTERRUPT;
 +	}
++
++	ret = utrace_control(child, engine, action);
++	WARN_ON(ret && ret != -EINPROGRESS &&
++		ret != -ESRCH && ret != -EALREADY);
++
++	utrace_engine_put(engine);
 +}
 +
 +void ptrace_utrace_exit(struct task_struct *task)
@@ -1739,7 +1761,7 @@
 +	struct task_struct *child;
 +	read_lock(&tasklist_lock);
 +	list_for_each_entry(child, &task->ptraced, ptrace_entry)
-+		ptrace_detach_task(child);
++		ptrace_detach_task(child, 0);
 +	read_unlock(&tasklist_lock);
 +}
 +
@@ -1752,7 +1774,7 @@
  /*
   * unptrace a task: move it back to its original parent and
   * remove it from the ptrace list.
-@@ -72,10 +123,11 @@ void __ptrace_unlink(struct task_struct 
+@@ -72,10 +140,11 @@ void __ptrace_unlink(struct task_struct 
  	child->parent = child->real_parent;
  	list_del_init(&child->ptrace_entry);
  
@@ -1766,19 +1788,21 @@
  /*
   * Check that we have indeed attached to the thing..
   */
-@@ -113,6 +165,464 @@ int ptrace_check_attach(struct task_stru
+@@ -113,6 +182,536 @@ int ptrace_check_attach(struct task_stru
  	return ret;
  }
  
-+static struct utrace_attached_engine *ptrace_attach_utrace(
-+	struct task_struct *task)
++static struct utrace_attached_engine *prepare_ptrace_attach(
++	struct task_struct *child, struct task_struct *parent)
 +{
 +	return NULL;
 +}
 +
-+static void ptrace_detach_utrace(struct task_struct *task,
-+				 struct utrace_attached_engine *engine)
++static int finish_ptrace_attach(struct task_struct *task,
++				 struct utrace_attached_engine *engine,
++				 int retval)
 +{
++	return retval;
 +}
 +
 +static int ptrace_update_utrace(struct task_struct *task,
@@ -1863,7 +1887,31 @@
 +	return (task->ptrace >> 16) & UTRACE_SYSCALL_MASK;
 +}
 +
-+static u32 utrace_ptrace_report(u32 action, struct task_struct *task, int code)
++/*
++ * Remember which event stop this was.  We have to keep a record that
++ * won't be wiped by ptrace_do_wait() when @task->exit_code is cleared.
++ * So we store the PTRACE_EVENT_* value in a nybble of @task->ptrace.
++ */
++static void ptrace_set_stop_event(struct task_struct *task, int event)
++{
++	task->ptrace &= 0xf0ffffffU;
++	task->ptrace |= event << 24;
++}
++
++static int ptrace_stop_event(struct task_struct *task)
++{
++	return (task->ptrace >> 24) & 0xf;
++}
++
++/*
++ * This doesn't really exist in the user API, but we pick an unused value
++ * encoded with ptrace_set_stop_event() to record when the last stop was
++ * for a syscall stop.
++ */
++#define PTRACE_EVENT_SYSCALL	0xf
++
++static u32 utrace_ptrace_report(u32 action, struct task_struct *task,
++				int event, int code)
 +{
 +	/*
 +	 * Special kludge magic in utrace.c (utrace_stop) sees this
@@ -1872,7 +1920,15 @@
 +	 */
 +	ptrace_set_action(task, UTRACE_STOP, 0);
 +
-+	task->exit_code = code;
++	/*
++	 * If we already have a pending stop event, then don't override it.
++	 * We'll simulate this stop when the pending one is cleared,
++	 * in ptrace_resume(), below.
++	 */
++	if (ptrace_stop_event(task) == 0) {
++		ptrace_set_stop_event(task, event);
++		task->exit_code = code;
++	}
 +
 +	return action | UTRACE_STOP;
 +}
@@ -1881,7 +1937,7 @@
 +			       int event, unsigned long msg)
 +{
 +	task->ptrace_message = msg;
-+	return utrace_ptrace_report(0, task, (event << 8) | SIGTRAP);
++	return utrace_ptrace_report(0, task, event, (event << 8) | SIGTRAP);
 +}
 +
 +static u32 ptrace_report_exec(enum utrace_resume_action action,
@@ -1909,8 +1965,6 @@
 +	return utrace_ptrace_event(task, PTRACE_EVENT_EXIT, *code);
 +}
 +
-+#define	PT_VFORKING	PT_DTRACE /* reuse obsolete bit */
-+
 +static u32 ptrace_report_clone(enum utrace_resume_action action,
 +			       struct utrace_attached_engine *engine,
 +			       struct task_struct *parent,
@@ -1920,22 +1974,20 @@
 +	int event;
 +	struct utrace_attached_engine *child_engine;
 +
-+	/*
-+	 * To simulate vfork-done tracing, we'll have to catch the
-+	 * parent's syscall-exit event for this vfork/clone system call.
-+	 * Since PTRACE_SETOPTIONS can enable PTRACE_O_TRACEVFORKDONE
-+	 * during the PTRACE_EVENT_VFORK stop, we must do this if either
-+	 * is enabled right now.
-+	 */
 +	if ((clone_flags & CLONE_VFORK) &&
-+	    (parent->ptrace & (PT_TRACE_VFORK | PT_TRACE_VFORK_DONE))) {
-+		if (!(engine->flags & UTRACE_EVENT(SYSCALL_EXIT))) {
-+			int ret = utrace_set_events(parent, engine,
-+						    engine->flags |
-+						    UTRACE_EVENT(SYSCALL_EXIT));
-+			WARN_ON(ret);
-+		}
-+		parent->ptrace |= PT_VFORKING;
++	    (parent->ptrace & PT_TRACE_VFORK_DONE)) {
++		/*
++		 * Stash the child PID for a PTRACE_EVENT_VFORK_DONE report,
++		 * even if we don't report this clone event itself.  Mark
++		 * that we vfork'd even if we don't actually stop here, so
++		 * that we'll know to do the vfork-done report.  (This
++		 * matters when is PTRACE_O_TRACEVFORKDONE set but
++		 * PTRACE_O_TRACEVFORK is not set.)
++		 */
++		int rc = utrace_control(parent, engine, UTRACE_REPORT);
++		WARN_ON(rc);
++		parent->ptrace_message = child->pid;
++		ptrace_set_stop_event(parent, PTRACE_EVENT_VFORK);
 +	}
 +
 +	if (clone_flags & CLONE_UNTRACED)
@@ -1960,7 +2012,8 @@
 +		child_engine = utrace_attach_task(child, UTRACE_ATTACH_CREATE |
 +						  UTRACE_ATTACH_EXCLUSIVE |
 +						  UTRACE_ATTACH_MATCH_OPS,
-+						  &ptrace_utrace_ops, NULL);
++						  &ptrace_utrace_ops,
++						  parent->parent);
 +		if (unlikely(IS_ERR(child_engine))) {
 +			WARN_ON(1);	/* XXX */
 +		} else {
@@ -1982,13 +2035,12 @@
 +	return UTRACE_RESUME;
 +}
 +
-+
 +static u32 ptrace_report_syscall(u32 action, struct task_struct *task)
 +{
 +	int code = SIGTRAP;
 +	if (task->ptrace & PT_TRACESYSGOOD)
 +		code |= 0x80;
-+	return utrace_ptrace_report(action, task, code);
++	return utrace_ptrace_report(action, task, PTRACE_EVENT_SYSCALL, code);
 +}
 +
 +static u32 ptrace_report_syscall_entry(u32 action,
@@ -2006,38 +2058,31 @@
 +	return ptrace_report_syscall(UTRACE_SYSCALL_RUN, task);
 +}
 +
++/*
++ * Report a vfork-done event to precede another event report.
++ * There is no utrace callback associated directly with vfork-done.
++ * Instead, after seeing CLONE_VFORK in report_clone() we notice
++ * the following syscall-exit, signal, or quiesce callback and
++ * inject the PTRACE_EVENT_VFORK_DONE stop there.
++ */
++static u32 ptrace_report_vfork_done(struct task_struct *task)
++{
++	/*
++	 * We got here after a vfork, when vfork-done tracing
++	 * was enabled.
++	 */
++	ptrace_set_stop_event(task, 0);
++	return utrace_ptrace_event(task, PTRACE_EVENT_VFORK_DONE,
++				   task->ptrace_message);
++}
++
 +static u32 ptrace_report_syscall_exit(enum utrace_resume_action action,
 +				      struct utrace_attached_engine *engine,
 +				      struct task_struct *task,
 +				      struct pt_regs *regs)
 +{
-+	if (!(engine->flags & UTRACE_EVENT(SYSCALL_ENTRY))) {
-+		/*
-+		 * We were not really using PTRACE_SYSCALL.
-+		 * SYSCALL_EXIT was only caught for vfork-done tracing.
-+		 */
-+		int ret = utrace_set_events(
-+			task, engine,
-+			engine->flags & ~UTRACE_EVENT(SYSCALL_EXIT));
-+		WARN_ON(ret);
-+		WARN_ON(!(task->ptrace & PT_VFORKING));
-+		task->ptrace &= ~PT_VFORKING;
-+		if (task->ptrace & PT_TRACE_VFORK_DONE)
-+			return utrace_ptrace_event(task,
-+						   PTRACE_EVENT_VFORK_DONE, 0);
-+		return UTRACE_RESUME;
-+	}
-+
-+	if (task->ptrace & PT_VFORKING) {
-+		/*
-+		 * If we're reporting vfork-done, we'll have to
-+		 * remember to report syscall-exit after that.
-+		 */
-+		if (task->ptrace & PT_TRACE_VFORK_DONE)
-+			return utrace_ptrace_event(task,
-+						   PTRACE_EVENT_VFORK_DONE, 0);
-+		task->ptrace &= ~PT_VFORKING;
-+	}
++	if (unlikely(ptrace_stop_event(task) == PTRACE_EVENT_VFORK))
++		return ptrace_report_vfork_done(task);
 +
 +	if (unlikely(ptrace_syscall_action(task)) &&
 +	    unlikely(ptrace_resume_action(task) == UTRACE_SINGLESTEP))
@@ -2051,24 +2096,43 @@
 +	return ptrace_report_syscall(0, task);
 +}
 +
-+static u32 ptrace_resumed(struct task_struct *task, struct pt_regs *regs,
++static u32 ptrace_resumed(struct task_struct *task,
++			  struct utrace_attached_engine *engine,
 +			  siginfo_t *info, struct k_sigaction *return_ka)
 +{
++	enum utrace_resume_action resume = ptrace_resume_action(task);
++
++	if (unlikely(ptrace_stop_event(task) == PTRACE_EVENT_VFORK))
++		return UTRACE_SIGNAL_REPORT | ptrace_report_vfork_done(task);
++
++	/*
++	 * If PTRACE_DETACH had a signal for us to deliver,
++	 * it didn't detach the engine, but marked it for us.
++	 */
++	if (!engine->data) {
++		read_lock(&tasklist_lock);
++		if (task->ptrace & PT_PTRACED)
++			engine->data = task->parent;
++		else
++			resume = UTRACE_DETACH;
++		read_unlock(&tasklist_lock);
++	}
++
 +	/*
-+	 * This is not a new signal, but just a notification we
-+	 * asked for.  Either we're stopping after another report
-+	 * like exec or syscall, or we're resuming.
++	 * If we're stopping, or we haven't reported any signal,
++	 * then we're all done for now.
 +	 */
-+	if (ptrace_resume_action(task) == UTRACE_STOP)
-+		return UTRACE_SIGNAL_REPORT | UTRACE_STOP;
++	if (resume == UTRACE_STOP || !task->last_siginfo)
++		return UTRACE_SIGNAL_REPORT | resume;
 +
 +	/*
 +	 * We're resuming.  If there's no signal to deliver, just go.
 +	 * If we were given a signal, deliver it now.
 +	 */
++	WARN_ON(task->last_siginfo != info);
 +	task->last_siginfo = NULL;
 +	if (!task->exit_code)
-+		return UTRACE_SIGNAL_REPORT | ptrace_resume_action(task);
++		return UTRACE_SIGNAL_REPORT | resume;
 +
 +	/* Update the siginfo structure if the signal has
 +	   changed.  If the debugger wanted something
@@ -2088,7 +2152,7 @@
 +	*return_ka = task->sighand->action[info->si_signo - 1];
 +	spin_unlock_irq(&task->sighand->siglock);
 +
-+	return UTRACE_SIGNAL_DELIVER | ptrace_resume_action(task);
++	return UTRACE_SIGNAL_DELIVER | resume;
 +}
 +
 +static u32 ptrace_report_signal(u32 action,
@@ -2099,28 +2163,12 @@
 +				const struct k_sigaction *orig_ka,
 +				struct k_sigaction *return_ka)
 +{
-+	/*
-+	 * Deal with a pending vfork-done event.  We'll stop again now
-+	 * for the syscall-exit report that was replaced with vfork-done.
-+	 */
-+	if (unlikely(task->ptrace & PT_VFORKING)) {
-+		task->ptrace &= ~PT_VFORKING;
-+		if ((engine->flags & UTRACE_EVENT(SYSCALL_ENTRY)) &&
-+		    utrace_signal_action(action) == UTRACE_SIGNAL_REPORT) {
-+			/*
-+			 * Make sure we get another report on wakeup.
-+			 */
-+			int x = utrace_control(task, engine, UTRACE_INTERRUPT);
-+			WARN_ON(x);
-+			return ptrace_report_syscall(UTRACE_SIGNAL_REPORT,
-+						     task);
-+		}
-+	}
-+
 +	switch (utrace_signal_action(action)) {
 +	default:
++		WARN_ON(ptrace_stop_event(task) && info->si_signo != SIGKILL);
 +		break;
 +	case UTRACE_SIGNAL_HANDLER:
++		WARN_ON(ptrace_stop_event(task));
 +		/*
 +		 * A handler was set up.  If we are stepping, pretend
 +		 * another SIGTRAP arrived.
@@ -2136,11 +2184,17 @@
 +		}
 +		/* Fall through.  */
 +	case UTRACE_SIGNAL_REPORT:
-+		return ptrace_resumed(task, regs, info, return_ka);
++		/*
++		 * This is not a new signal, but just a notification we
++		 * asked for.  Either we're stopping after another report
++		 * like exec or syscall, or we're resuming.
++		 */
++		return ptrace_resumed(task, engine, info, return_ka);
 +	}
 +
++	WARN_ON(!valid_signal(info->si_signo));
 +	task->last_siginfo = info;
-+	return utrace_ptrace_report(UTRACE_SIGNAL_IGN, task, info->si_signo);
++	return utrace_ptrace_report(UTRACE_SIGNAL_IGN, task, 0, info->si_signo);
 +}
 +
 +static u32 ptrace_report_quiesce(u32 action,
@@ -2148,13 +2202,13 @@
 +				 struct task_struct *task,
 +				 unsigned long event)
 +{
-+	/*
-+	 * Make sure we deal with a pending vfork-done event (see above).
-+	 */
-+	if (unlikely(task->ptrace & PT_VFORKING))
-+		return UTRACE_INTERRUPT;
++	if (event == 0) {
++		task->last_siginfo = NULL;
++
++		if (unlikely(ptrace_stop_event(task) == PTRACE_EVENT_VFORK))
++			return ptrace_report_vfork_done(task);
++	}
 +
-+	task->last_siginfo = NULL;
 +	return ptrace_resume_action(task);
 +}
 +
@@ -2171,34 +2225,74 @@
 +};
 +
 +/*
-+ * Detach the utrace engine.
++ * Detach the utrace engine on error.  On success, set @engine->data to
++ * the ptracer's task_struct pointer.  This distinguishes an engine for
++ * attached ptrace from an engine left behind after a PTRACE_DETACH call
++ * that left a parting signal to deliver.
 + */
-+static void ptrace_detach_utrace(struct task_struct *task,
-+				 struct utrace_attached_engine *engine)
++static int finish_ptrace_attach(struct task_struct *task,
++				struct utrace_attached_engine *engine,
++				int retval)
 +{
-+	int ret = utrace_control(task, engine, UTRACE_DETACH);
-+	WARN_ON(ret && ret != -ESRCH && ret != -EALREADY);
++	if (retval) {
++		int error = utrace_control(task, engine, UTRACE_DETACH);
++		WARN_ON(error && error != -ESRCH && error != -EALREADY);
++	} else {
++		engine->data = task->parent;
++	}
++	utrace_engine_put(engine);
++	return retval;
 +}
 +
 +/*
 + * Attach a utrace engine for ptrace and set up its event mask.
 + * Returns the engine pointer or an IS_ERR() pointer.
 + */
-+static struct utrace_attached_engine *ptrace_attach_utrace(
-+	struct task_struct *child)
++static struct utrace_attached_engine *prepare_ptrace_attach(
++	struct task_struct *child, struct task_struct *parent)
 +{
 +	struct utrace_attached_engine *engine;
++restart:
 +	engine = utrace_attach_task(child, UTRACE_ATTACH_CREATE |
 +				    UTRACE_ATTACH_EXCLUSIVE |
 +				    UTRACE_ATTACH_MATCH_OPS,
-+				    &ptrace_utrace_ops, NULL);
-+	if (IS_ERR(engine))
-+		return engine;
-+	if (likely(!ptrace_update_utrace(child, engine)))
-+		return engine;
-+	ptrace_detach_utrace(child, engine);
-+	utrace_engine_put(engine);
-+	return ERR_PTR(-ESRCH);
++				    &ptrace_utrace_ops, parent);
++	if (engine == ERR_PTR(-EEXIST)) {
++		/*
++		 * There is already some ptrace engine attached.  Either
++		 * this attach will fail because another ptracer is
++		 * already attached, or else this engine was left behind
++		 * by PTRACE_DETACH to deliver a signal.
++		 */
++		engine = utrace_attach_task(child,
++					    UTRACE_ATTACH_MATCH_OPS,
++					    &ptrace_utrace_ops, NULL);
++		if (IS_ERR(engine)) {
++			BUG_ON(PTR_ERR(engine) != -ENOENT);
++			goto restart;
++		}
++		if (engine->data) {
++			utrace_engine_put(engine);
++			engine = ERR_PTR(-EEXIST);
++		}
++	}
++	if (IS_ERR(engine)) {
++		if (engine != ERR_PTR(-ESRCH))
++			engine = ERR_PTR(-EPERM);
++	} else {
++		int ret = ptrace_update_utrace(child, engine);
++		if (ret == -EINPROGRESS) {
++			ret = utrace_barrier(child, engine);
++			utrace_engine_put(engine);
++			if (ret != -ERESTARTSYS)
++				goto restart;
++			return ERR_PTR(-ERESTARTNOINTR);
++		}
++		if (ret)
++			engine = ERR_PTR(finish_ptrace_attach(child, engine,
++							      -ESRCH));
++	}
++	return engine;
 +}
 +
 +int ptrace_check_attach(struct task_struct *child, int kill)
@@ -2231,7 +2325,7 @@
  int __ptrace_may_access(struct task_struct *task, unsigned int mode)
  {
  	/* May we inspect the given task?
-@@ -156,6 +666,7 @@ int ptrace_attach(struct task_struct *ta
+@@ -156,12 +755,17 @@ int ptrace_attach(struct task_struct *ta
  {
  	int retval;
  	unsigned long flags;
@@ -2239,44 +2333,40 @@
  
  	audit_ptrace(task);
  
-@@ -163,6 +674,13 @@ int ptrace_attach(struct task_struct *ta
+ 	retval = -EPERM;
  	if (same_thread_group(task, current))
- 		goto out;
- 
-+	engine = ptrace_attach_utrace(task);
-+	if (unlikely(IS_ERR(engine))) {
-+		if (PTR_ERR(engine) == -ESRCH)
-+			retval = -ESRCH;
-+		goto out;
-+	}
+-		goto out;
++		return retval;
 +
++	engine = prepare_ptrace_attach(task, current);
++	if (unlikely(IS_ERR(engine)))
++		return PTR_ERR(engine);
+ 
  repeat:
  	/*
- 	 * Nasty, nasty.
-@@ -202,6 +720,11 @@ repeat:
+@@ -202,8 +806,8 @@ repeat:
  bad:
  	write_unlock_irqrestore(&tasklist_lock, flags);
  	task_unlock(task);
-+	if (!IS_ERR(engine)) {
-+		if (retval)
-+			ptrace_detach_utrace(task, engine);
-+		utrace_engine_put(engine);
-+	}
- out:
- 	return retval;
+-out:
+-	return retval;
++
++	return finish_ptrace_attach(task, engine, retval);
  }
-@@ -221,9 +744,7 @@ int ptrace_detach(struct task_struct *ch
+ 
+ static inline void __ptrace_detach(struct task_struct *child, unsigned int data)
+@@ -221,9 +825,7 @@ int ptrace_detach(struct task_struct *ch
  	if (!valid_signal(data))
  		return -EIO;
  
 -	/* Architecture-specific hardware disable .. */
 -	ptrace_disable(child);
 -	clear_tsk_thread_flag(child, TIF_SYSCALL_TRACE);
-+	ptrace_detach_task(child);
++	ptrace_detach_task(child, data);
  
  	write_lock_irq(&tasklist_lock);
  	/* protect against de_thread()->release_task() */
-@@ -309,6 +830,8 @@ static int ptrace_setoptions(struct task
+@@ -309,6 +911,8 @@ static int ptrace_setoptions(struct task
  	if (data & PTRACE_O_TRACEEXIT)
  		child->ptrace |= PT_TRACE_EXIT;
  
@@ -2285,7 +2375,7 @@
  	return (data & ~PTRACE_O_MASK) ? -EINVAL : 0;
  }
  
-@@ -367,6 +890,7 @@ static int ptrace_setsiginfo(struct task
+@@ -367,6 +971,7 @@ static int ptrace_setsiginfo(struct task
  #define is_sysemu_singlestep(request)	0
  #endif
  
@@ -2293,7 +2383,7 @@
  static int ptrace_resume(struct task_struct *child, long request, long data)
  {
  	if (!valid_signal(data))
-@@ -401,6 +925,76 @@ static int ptrace_resume(struct task_str
+@@ -401,6 +1006,170 @@ static int ptrace_resume(struct task_str
  
  	return 0;
  }
@@ -2342,24 +2432,118 @@
 +	}
 +
 +	if (!ret) {
-+		child->exit_code = data;
++		/*
++		 * If there was a non-signal event reported last time,
++		 * we may need to simulate another event that follows
++		 * it, or do some other special case.  We'll set @event
++		 * nonzero here if there is an event to simulate.
++		 */
++		int event = ptrace_stop_event(child);
++		ptrace_set_stop_event(child, 0);
 +
-+		ptrace_set_action(child, action, syscall);
++		switch (event) {
++		case 0:
++			break;
++
++		default:
++			WARN_ON(1);
++		case PTRACE_EVENT_EXIT:
++			event = 0;
++			break;
 +
-+		if (task_is_stopped(child)) {
-+			spin_lock_irq(&child->sighand->siglock);
-+			child->signal->flags &= ~SIGNAL_STOP_STOPPED;
-+			spin_unlock_irq(&child->sighand->siglock);
++		case PTRACE_EVENT_FORK:
++		case PTRACE_EVENT_CLONE:
++		case PTRACE_EVENT_EXEC:
++		case PTRACE_EVENT_VFORK_DONE:
++			/*
++			 * At these events, @data is ignored.
++			 * After these there might be a syscall-exit stop.
++			 */
++			if (request == PTRACE_SYSCALL) {
++				data = SIGTRAP;
++				if (child->ptrace & PT_TRACESYSGOOD)
++					data |= 0x80;
++				ptrace_set_stop_event(child,
++						      PTRACE_EVENT_SYSCALL);
++			} else {
++				data = 0;
++				event = 0;
++			}
++			break;
++
++		case PTRACE_EVENT_SYSCALL:
++			/*
++			 * After a syscall stop, @data is treated specially.
++			 * It just queues the signal.
++			 */
++			if (data)
++				send_sig(data, child, 1);
++			data = 0;
++			event = 0;
++			break;
++
++		case PTRACE_EVENT_VFORK:
++			/*
++			 * For this event, @data is ignored.  We did have a
++			 * utrace stop right after, so on resuming there
++			 * can be a normal syscall-exit stop next if needed.
++			 * But we may need to simulate a vfork-done stop,
++			 * so we leave the marker in place.
++			 */
++			data = 0;
++			event = 0;
++			if (child->ptrace & PT_TRACE_VFORK_DONE) {
++				ptrace_set_stop_event(child,
++						      PTRACE_EVENT_VFORK);
++				action = UTRACE_REPORT;
++			}
++			break;
 +		}
 +
++		child->exit_code = data;
++
++		ptrace_set_action(child, action, syscall);
++
 +		/*
-+		 * To resume with a signal we must hit ptrace_report_signal.
++		 * Whatever action we want to resume with, we need to make
++		 * sure the child gets into ptrace_report_quiesce() so that
++		 * it clears last_siginfo before going back to user mode.
 +		 */
-+		if (data)
-+			action = UTRACE_INTERRUPT;
++		if (child->last_siginfo)
++			action = UTRACE_REPORT;
 +
-+		if (utrace_control(child, engine, action))
-+			ret = -ESRCH;
++		if (event) {
++			/*
++			 * We have a stacked event.  That is, @child is
++			 * already at the last utrace stop point before
++			 * returning to user mode.  But the ptrace API
++			 * wants multiple stops on the way out.  Here the
++			 * original ptrace would resume the child and have
++			 * to stop again almost immediately.  Instead we
++			 * just leave it stopped and simulate the wake-up
++			 * and new stop by notifying the parent, i.e.
++			 * current's own thread group.
++			 */
++			read_lock(&tasklist_lock);
++			do_notify_parent_cldstop(child, CLD_TRAPPED);
++			read_unlock(&tasklist_lock);
++		} else {
++			if (task_is_stopped(child)) {
++				spin_lock_irq(&child->sighand->siglock);
++				child->signal->flags &= ~SIGNAL_STOP_STOPPED;
++				spin_unlock_irq(&child->sighand->siglock);
++			}
++
++			/*
++			 * To resume with a signal we must arrange
++			 * to enter ptrace_report_signal().
++			 */
++			if (data)
++				action = UTRACE_INTERRUPT;
++
++			if (utrace_control(child, engine, action))
++				ret = -ESRCH;
++		}
 +	}
 +
 +	utrace_engine_put(engine);
@@ -2370,28 +2554,28 @@
  
  int ptrace_request(struct task_struct *child, long request,
  		   long addr, long data)
-@@ -480,6 +1074,11 @@ int ptrace_request(struct task_struct *c
+@@ -480,6 +1249,11 @@ int ptrace_request(struct task_struct *c
  int ptrace_traceme(void)
  {
  	int ret = -EPERM;
 +	struct utrace_attached_engine *engine;
 +
-+	engine = ptrace_attach_utrace(current);
++	engine = prepare_ptrace_attach(current, current->parent);
 +	if (unlikely(IS_ERR(engine)))
-+		return ret;
++		return PTR_ERR(engine);
  
  	/*
  	 * Are we already being traced?
-@@ -513,6 +1112,9 @@ repeat:
+@@ -513,7 +1287,8 @@ repeat:
  		write_unlock_irqrestore(&tasklist_lock, flags);
  	}
  	task_unlock(current);
-+	if (ret)
-+		ptrace_detach_utrace(current, engine);
-+	utrace_engine_put(engine);
- 	return ret;
+-	return ret;
++
++	return finish_ptrace_attach(current, engine, ret);
  }
  
+ /**
 diff --git a/kernel/signal.c b/kernel/signal.c
 index e661b01..1effefc 100644  
 --- a/kernel/signal.c
@@ -2447,14 +2631,14 @@
  			  struct pt_regs *regs, void *cookie)
 diff --git a/kernel/utrace.c b/kernel/utrace.c
 new file mode 100644
-index ...ff58017 100644  
+index ...1873b9d 100644  
 --- /dev/null
 +++ b/kernel/utrace.c
-@@ -0,0 +1,2586 @@
+@@ -0,0 +1,2590 @@
 +/*
 + * utrace infrastructure interface for debugging user processes
 + *
-+ * Copyright (C) 2006, 2007, 2008 Red Hat, Inc.  All rights reserved.
++ * Copyright (C) 2006-2009 Red Hat, Inc.  All rights reserved.
 + *
 + * This copyrighted material is made available to anyone wishing to use,
 + * modify, copy, or redistribute it subject to the terms and conditions
@@ -2829,27 +3013,25 @@
 +	list_add_tail(&engine->entry, &utrace->attaching);
 +
 +	/*
-+	 * 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.
++	 * 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 target == current, it would be safe just to call
++	 * splice_attaching() right here.  But if we're inside a
++	 * callback, that would mean the new engine also gets
++	 * notified about the event that precipitated its own
++	 * creation.  This is not what the user wants.
++	 *
++	 * Setting ->report ensures that start_report() takes the
++	 * lock and does it next time.  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.
 +	 */
-+
-+	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);
-+	}
++	utrace->report = 1;
++	set_notify_resume(target);
 +	goto finish;
 +
 +first:
@@ -2986,7 +3168,8 @@
 +	 * be done after we are in TASK_TRACED.  This makes the
 +	 * synchronization with ptrace_do_wait() work right.
 +	 */
-+	if ((task->ptrace >> 16) == UTRACE_RESUME - UTRACE_STOP) {
++	if (((task->ptrace >> 16) & UTRACE_RESUME_MASK) ==
++	    UTRACE_RESUME - UTRACE_STOP) {
 +		read_lock(&tasklist_lock);
 +		do_notify_parent_cldstop(task, CLD_TRAPPED);
 +		read_unlock(&tasklist_lock);
@@ -3026,6 +3209,15 @@
 +	}
 +	rcu_read_unlock();
 +
++	/*
++	 * While we were in TASK_TRACED, complete_signal() considered
++	 * us "uninterested" in signal wakeups.  Now make sure we our
++	 * TIF_SIGPENDING state is correct for normal running.
++	 */
++	spin_lock_irq(&task->sighand->siglock);
++	recalc_sigpending();
++	spin_unlock_irq(&task->sighand->siglock);
++
 +	return killed;
 +}
 +
@@ -3263,6 +3455,12 @@
 + *
 + * To synchronize after an -%EINPROGRESS return, see utrace_barrier().
 + *
++ * When @target is @current, -%EINPROGRESS is not returned.  But
++ * note that a newly-created engine will not receive any callbacks
++ * related to an event notification already in progress.  This call
++ * enables @events callbacks to be made as soon as @engine becomes
++ * eligible for any callbacks, see utrace_attach_task().
++ *
 + * These rules provide for coherent synchronization based on %UTRACE_STOP,
 + * even when %SIGKILL is breaking its normal simple rules.
 + */
@@ -3717,11 +3915,10 @@
 +	case UTRACE_REPORT:
 +		/*
 +		 * Make the thread call tracehook_notify_resume() soon.
-+		 * But don't bother if it's already been stopped or
-+		 * interrupted.  In those cases, utrace_get_signal()
-+		 * will be reporting soon.
++		 * But don't bother if it's already been interrupted.
++		 * In that case, utrace_get_signal() will be reporting soon.
 +		 */
-+		if (!utrace->report && !utrace->interrupt && !utrace->stopped) {
++		if (!utrace->report && !utrace->interrupt) {
 +			utrace->report = 1;
 +			set_notify_resume(target);
 +		}
@@ -4320,12 +4517,8 @@
 +
 +/*
 + * Finish the last reporting pass before returning to user mode.
-+ *
-+ * Returns true if we might have been in TASK_TRACED and then resumed.
-+ * In that event, signal_pending() might not be set when it should be,
-+ * as the signals code passes us over while we're in TASK_TRACED.
 + */
-+static bool finish_resume_report(struct utrace_report *report,
++static void finish_resume_report(struct utrace_report *report,
 +				 struct task_struct *task,
 +				 struct utrace *utrace)
 +{
@@ -4350,7 +4543,7 @@
 +
 +	case UTRACE_STOP:
 +		report->killed = utrace_stop(task, utrace);
-+		return likely(!report->killed);
++		break;
 +
 +	case UTRACE_REPORT:
 +	case UTRACE_RESUME:
@@ -4358,8 +4551,6 @@
 +		user_disable_single_step(task);
 +		break;
 +	}
-+
-+	return false;
 +}
 +
 +/*
@@ -4414,15 +4605,8 @@
 +
 +	/*
 +	 * Finish the report and either stop or get ready to resume.
-+	 * If we stop and then signal_pending() is clear, we
-+	 * should recompute it before returning to user mode.
 +	 */
-+	if (finish_resume_report(&report, task, utrace) &&
-+	    !signal_pending(task)) {
-+		spin_lock_irq(&task->sighand->siglock);
-+		recalc_sigpending();
-+		spin_unlock_irq(&task->sighand->siglock);
-+	}
++	finish_resume_report(&report, task, utrace);
 +}
 +
 +/*
@@ -4741,16 +4925,14 @@
 +		} else if (return_ka->sa.sa_handler != SIG_IGN &&
 +			   likely(signr)) {
 +			/*
++			 * Complete the bookkeeping after the report.
 +			 * The handler will run.  If an engine wanted to
 +			 * stop or step, then make sure we do another
 +			 * report after signal handler setup.
 +			 */
-+			if (report.action != UTRACE_RESUME) {
-+				spin_lock(&utrace->lock);
-+				utrace->interrupt = 1;
-+				spin_unlock(&utrace->lock);
-+				set_tsk_thread_flag(task, TIF_SIGPENDING);
-+			}
++			if (report.action != UTRACE_RESUME)
++				report.action = UTRACE_INTERRUPT;
++			finish_report(&report, task, utrace);
 +
 +			if (unlikely(report.result & UTRACE_SIGNAL_HOLD))
 +				push_back_signal(task, info);
@@ -4813,6 +4995,12 @@
 +		return -1;
 +	}
 +
++	/*
++	 * Complete the bookkeeping after the report.
++	 * This sets utrace->report if UTRACE_STOP was used.
++	 */
++	finish_report(&report, task, utrace);
++
 +	return_ka->sa.sa_handler = SIG_DFL;
 +
 +	if (unlikely(report.result & UTRACE_SIGNAL_HOLD))

linux-2.6-x86-tracehook.patch:

Index: linux-2.6-x86-tracehook.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/linux-2.6-x86-tracehook.patch,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- linux-2.6-x86-tracehook.patch	22 Sep 2008 20:10:55 -0000	1.9
+++ linux-2.6-x86-tracehook.patch	8 Jan 2009 04:44:02 -0000	1.10
@@ -8,7 +8,7 @@
  7 files changed, 249 insertions(+), 66 deletions(-)
 
 diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
-index ed92864..ebfd7ff 100644  
+index 552d2b7..5096db4 100644  
 --- a/arch/x86/Kconfig
 +++ b/arch/x86/Kconfig
 @@ -29,6 +29,7 @@ config X86



From roland at fedoraproject.org  Thu Jan  8 04:44:33 2009
From: roland at fedoraproject.org (Roland McGrath)
Date: Thu,  8 Jan 2009 04:44:33 +0000 (UTC)
Subject: rpms/kernel/F-10/scripts pull-upstreams.sh,1.5,1.6
Message-ID: <20090108044433.C9F9F700FD@cvs1.fedora.phx.redhat.com>

Author: roland

Update of /cvs/pkgs/rpms/kernel/F-10/scripts
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8129/scripts

Modified Files:
	pull-upstreams.sh 
Log Message:
utrace update


Index: pull-upstreams.sh
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/scripts/pull-upstreams.sh,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- pull-upstreams.sh	9 Nov 2007 01:11:24 -0000	1.5
+++ pull-upstreams.sh	8 Jan 2009 04:44:03 -0000	1.6
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-url=http://people.redhat.com/roland/utrace/2.6-current
+url=http://people.redhat.com/roland/utrace/${1:-2.6.27}
 
 wget -q -O /dev/stdout $url/series | grep 'patch$' |
 while read i



From kkofler at fedoraproject.org  Thu Jan  8 05:00:46 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Thu,  8 Jan 2009 05:00:46 +0000 (UTC)
Subject: rpms/kdelibs/F-10 kdelibs-4.1.4-policykit-workaround.patch, 1.1,
	1.2 kdelibs.spec, 1.394, 1.395
Message-ID: <20090108050046.92462700FD@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdelibs/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10087/F-10

Modified Files:
	kdelibs-4.1.4-policykit-workaround.patch kdelibs.spec 
Log Message:
Oops, it's 2009 already. ;-)

kdelibs-4.1.4-policykit-workaround.patch:

Index: kdelibs-4.1.4-policykit-workaround.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/F-10/kdelibs-4.1.4-policykit-workaround.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kdelibs-4.1.4-policykit-workaround.patch	7 Jan 2009 14:31:59 -0000	1.1
+++ kdelibs-4.1.4-policykit-workaround.patch	8 Jan 2009 05:00:14 -0000	1.2
@@ -1,7 +1,6 @@
-Pouze v kdelibs-4.1.4: kdelibs-4.1.3-policykit-workaround.patch
-diff -ur kdelibs-orig/solid/solid/backends/hal/halstorageaccess.cpp kdelibs-4.1.4/solid/solid/backends/hal/halstorageaccess.cpp
---- kdelibs-orig/solid/solid/backends/hal/halstorageaccess.cpp	2009-01-07 00:34:55.000000000 +0100
-+++ kdelibs-4.1.4/solid/solid/backends/hal/halstorageaccess.cpp	2009-01-07 15:26:27.000000000 +0100
+diff -ur kdelibs-4.1.4/solid/solid/backends/hal/halstorageaccess.cpp kdelibs-4.1.4-policykit-workaround/solid/solid/backends/hal/halstorageaccess.cpp
+--- kdelibs-4.1.4/solid/solid/backends/hal/halstorageaccess.cpp	2009-01-07 00:34:55.000000000 +0100
++++ kdelibs-4.1.4-policykit-workaround/solid/solid/backends/hal/halstorageaccess.cpp	2009-01-08 05:56:56.000000000 +0100
 @@ -17,10 +17,13 @@
  
  */
@@ -38,7 +37,17 @@
          m_teardownInProgress = false;
          emit teardownDone(Solid::UnauthorizedOperation,
                            error.name()+": "+error.message(),
-@@ -314,6 +327,59 @@
+@@ -259,7 +272,8 @@
+ #else
+     QString uid="uid=";
+ #endif
+-    if (halOptions.contains(uid)) {
++    if (halOptions.contains(uid)
++        && (fstype == "vfat" || fstype == "iso9660" || fstype == "hfs" || fstype == "udf")) {
+         options << uid+QString::number(::getuid());
+     }
+ 
+@@ -314,6 +328,59 @@
                                SLOT(slotDBusError(const QDBusError &)));
  }
  
@@ -98,9 +107,9 @@
  bool Solid::Backends::Hal::StorageAccess::callSystemMount()
  {
      const QString device = m_device->property("block.device").toString();
-diff -ur kdelibs-orig/solid/solid/backends/hal/halstorageaccess.h kdelibs-4.1.4/solid/solid/backends/hal/halstorageaccess.h
---- kdelibs-orig/solid/solid/backends/hal/halstorageaccess.h	2009-01-07 00:34:55.000000000 +0100
-+++ kdelibs-4.1.4/solid/solid/backends/hal/halstorageaccess.h	2009-01-07 15:26:27.000000000 +0100
+diff -ur kdelibs-4.1.4/solid/solid/backends/hal/halstorageaccess.h kdelibs-4.1.4-policykit-workaround/solid/solid/backends/hal/halstorageaccess.h
+--- kdelibs-4.1.4/solid/solid/backends/hal/halstorageaccess.h	2009-01-07 00:34:55.000000000 +0100
++++ kdelibs-4.1.4-policykit-workaround/solid/solid/backends/hal/halstorageaccess.h	2009-01-08 05:37:59.000000000 +0100
 @@ -69,6 +69,9 @@
      bool callSystemMount();
      bool callSystemUnmount();


Index: kdelibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/F-10/kdelibs.spec,v
retrieving revision 1.394
retrieving revision 1.395
diff -u -r1.394 -r1.395
--- kdelibs.spec	7 Jan 2009 15:10:34 -0000	1.394
+++ kdelibs.spec	8 Jan 2009 05:00:14 -0000	1.395
@@ -2,7 +2,7 @@
 
 Summary: K Desktop Environment 4 - Libraries
 Version: 4.1.4
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs
@@ -363,6 +363,9 @@
 
 
 %changelog
+* Thu Jan 08 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.4-2
+- restore AWOL NTFS workaround yet again
+
 * Wed Jan  7 2009 Luk???? Tinkl <ltinkl at redhat.com> 4.1.4-1
 - KDE 4.1.4
 



From kkofler at fedoraproject.org  Thu Jan  8 05:00:46 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Thu,  8 Jan 2009 05:00:46 +0000 (UTC)
Subject: rpms/kdelibs/F-9 kdelibs-4.1.4-policykit-workaround.patch, 1.1,
	1.2 kdelibs.spec, 1.372, 1.373
Message-ID: <20090108050046.A29817011C@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdelibs/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10087/F-9

Modified Files:
	kdelibs-4.1.4-policykit-workaround.patch kdelibs.spec 
Log Message:
Oops, it's 2009 already. ;-)

kdelibs-4.1.4-policykit-workaround.patch:

Index: kdelibs-4.1.4-policykit-workaround.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/F-9/kdelibs-4.1.4-policykit-workaround.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kdelibs-4.1.4-policykit-workaround.patch	7 Jan 2009 14:34:36 -0000	1.1
+++ kdelibs-4.1.4-policykit-workaround.patch	8 Jan 2009 05:00:15 -0000	1.2
@@ -1,7 +1,6 @@
-Pouze v kdelibs-4.1.4: kdelibs-4.1.3-policykit-workaround.patch
-diff -ur kdelibs-orig/solid/solid/backends/hal/halstorageaccess.cpp kdelibs-4.1.4/solid/solid/backends/hal/halstorageaccess.cpp
---- kdelibs-orig/solid/solid/backends/hal/halstorageaccess.cpp	2009-01-07 00:34:55.000000000 +0100
-+++ kdelibs-4.1.4/solid/solid/backends/hal/halstorageaccess.cpp	2009-01-07 15:26:27.000000000 +0100
+diff -ur kdelibs-4.1.4/solid/solid/backends/hal/halstorageaccess.cpp kdelibs-4.1.4-policykit-workaround/solid/solid/backends/hal/halstorageaccess.cpp
+--- kdelibs-4.1.4/solid/solid/backends/hal/halstorageaccess.cpp	2009-01-07 00:34:55.000000000 +0100
++++ kdelibs-4.1.4-policykit-workaround/solid/solid/backends/hal/halstorageaccess.cpp	2009-01-08 05:56:56.000000000 +0100
 @@ -17,10 +17,13 @@
  
  */
@@ -38,7 +37,17 @@
          m_teardownInProgress = false;
          emit teardownDone(Solid::UnauthorizedOperation,
                            error.name()+": "+error.message(),
-@@ -314,6 +327,59 @@
+@@ -259,7 +272,8 @@
+ #else
+     QString uid="uid=";
+ #endif
+-    if (halOptions.contains(uid)) {
++    if (halOptions.contains(uid)
++        && (fstype == "vfat" || fstype == "iso9660" || fstype == "hfs" || fstype == "udf")) {
+         options << uid+QString::number(::getuid());
+     }
+ 
+@@ -314,6 +328,59 @@
                                SLOT(slotDBusError(const QDBusError &)));
  }
  
@@ -98,9 +107,9 @@
  bool Solid::Backends::Hal::StorageAccess::callSystemMount()
  {
      const QString device = m_device->property("block.device").toString();
-diff -ur kdelibs-orig/solid/solid/backends/hal/halstorageaccess.h kdelibs-4.1.4/solid/solid/backends/hal/halstorageaccess.h
---- kdelibs-orig/solid/solid/backends/hal/halstorageaccess.h	2009-01-07 00:34:55.000000000 +0100
-+++ kdelibs-4.1.4/solid/solid/backends/hal/halstorageaccess.h	2009-01-07 15:26:27.000000000 +0100
+diff -ur kdelibs-4.1.4/solid/solid/backends/hal/halstorageaccess.h kdelibs-4.1.4-policykit-workaround/solid/solid/backends/hal/halstorageaccess.h
+--- kdelibs-4.1.4/solid/solid/backends/hal/halstorageaccess.h	2009-01-07 00:34:55.000000000 +0100
++++ kdelibs-4.1.4-policykit-workaround/solid/solid/backends/hal/halstorageaccess.h	2009-01-08 05:37:59.000000000 +0100
 @@ -69,6 +69,9 @@
      bool callSystemMount();
      bool callSystemUnmount();


Index: kdelibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/F-9/kdelibs.spec,v
retrieving revision 1.372
retrieving revision 1.373
diff -u -r1.372 -r1.373
--- kdelibs.spec	7 Jan 2009 15:10:35 -0000	1.372
+++ kdelibs.spec	8 Jan 2009 05:00:15 -0000	1.373
@@ -2,7 +2,7 @@
 
 Summary: K Desktop Environment 4 - Libraries
 Version: 4.1.4
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs
@@ -363,6 +363,9 @@
 
 
 %changelog
+* Thu Jan 08 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.4-2
+- restore AWOL NTFS workaround yet again
+
 * Wed Jan  7 2009 Luk???? Tinkl <ltinkl at redhat.com> 4.1.4-1
 - KDE 4.1.4
 



From rakesh at fedoraproject.org  Thu Jan  8 05:40:05 2009
From: rakesh at fedoraproject.org (Rakesh Pandit)
Date: Thu,  8 Jan 2009 05:40:05 +0000 (UTC)
Subject: rpms/unhide/devel import.log, NONE, 1.1 unhide.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090108054005.9E4AD700FD@cvs1.fedora.phx.redhat.com>

Author: rakesh

Update of /cvs/pkgs/rpms/unhide/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13424/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log unhide.spec 
Log Message:
initial import



--- NEW FILE import.log ---
unhide-1_0-2_fc10_20080519:HEAD:unhide-1.0-2.fc10.20080519.src.rpm:1231349998


--- NEW FILE unhide.spec ---
Name:           unhide
Version:        1.0
Release:        2%{?dist}.20080519
Summary:        Tool to find hidden processes and TCP/UDP ports from rootkits

Group:          Applications/System
License:        GPLv3
URL:            http://www.security-projects.com/?Unhide
Source0:        http://www.security-projects.com/unhide20080519.tgz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%description
Unhide is a forensic tool to find processes and TCP/UDP ports hidden by
rootkits, Linux kernel modules or by other techniques. It includes two
utilities: unhide and unhide-tcp.

Unhide detects hidden processes using three techniques:

 - comparing the output of /proc and /bin/ps
 - comparing the information gathered from /bin/ps with the one gathered
   from system calls (syscall scanning)
 - full scan of the process ID space (PIDs bruteforcing)

unhide-tcp identifies TCP/UDP ports that are listening but are not listed
in /bin/netstat through brute forcing of all TCP/UDP ports available.


%prep
%setup -q -n %{name}-20080519

%build
%{__cc} %{optflags} unhide-linux26.c -o unhide
%{__cc} %{optflags} unhide-tcp.c -o unhide-tcp


%install
rm -rf %{buildroot}
%{__install} -Dp -m0755 unhide %{buildroot}%{_sbindir}/unhide
%{__install} -Dp -m0755 unhide-tcp %{buildroot}%{_sbindir}/unhide-tcp
%{__install} -Dp -m0644 man/unhide.8 %{buildroot}%{_mandir}/man8/unhide.8
%{__install} -Dp -m0644 man/unhide-tcp.8 %{buildroot}%{_mandir}/man8/unhide-tcp.8

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc COPYING LEEME.txt README.txt
%doc %{_mandir}/man8/unhide.8*
%doc %{_mandir}/man8/unhide-tcp.8*
%{_sbindir}/unhide
%{_sbindir}/unhide-tcp

%changelog
* Thu Jan 08 2009 Rakesh Pandit <rakesh at fedoraproject.org> 1.0-2
- clarified from upstream about license - fixed.

* Sat Dec 06 2008 Rakesh Pandit <rakesh at fedoraproject.org> 1.0-1
- Fixed %%Version and %%Release fields.

* Fri Nov 07 2008 Rakesh Pandit <rakesh at fedoraproject.org> 20080519-2
- Clear %%install, consistency of macro use

* Tue Nov 04 2008 Rakesh Pandit <rakesh at fedoraproject.org> 20080519-1
- Initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/unhide/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	14 Dec 2008 05:25:02 -0000	1.1
+++ .cvsignore	8 Jan 2009 05:39:35 -0000	1.2
@@ -0,0 +1 @@
+unhide20080519.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/unhide/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	14 Dec 2008 05:25:02 -0000	1.1
+++ sources	8 Jan 2009 05:39:35 -0000	1.2
@@ -0,0 +1 @@
+1194ec0f89c6f28e8eb64fb66836f70f  unhide20080519.tgz



From rakesh at fedoraproject.org  Thu Jan  8 05:40:15 2009
From: rakesh at fedoraproject.org (Rakesh Pandit)
Date: Thu,  8 Jan 2009 05:40:15 +0000 (UTC)
Subject: rpms/unhide/F-10 import.log, NONE, 1.1 unhide.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090108054015.27537700FD@cvs1.fedora.phx.redhat.com>

Author: rakesh

Update of /cvs/pkgs/rpms/unhide/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13376/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	import.log unhide.spec 
Log Message:
initial import



--- NEW FILE import.log ---
unhide-1_0-2_fc10_20080519:F-10:unhide-1.0-2.fc10.20080519.src.rpm:1231349988


--- NEW FILE unhide.spec ---
Name:           unhide
Version:        1.0
Release:        2%{?dist}.20080519
Summary:        Tool to find hidden processes and TCP/UDP ports from rootkits

Group:          Applications/System
License:        GPLv3
URL:            http://www.security-projects.com/?Unhide
Source0:        http://www.security-projects.com/unhide20080519.tgz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%description
Unhide is a forensic tool to find processes and TCP/UDP ports hidden by
rootkits, Linux kernel modules or by other techniques. It includes two
utilities: unhide and unhide-tcp.

Unhide detects hidden processes using three techniques:

 - comparing the output of /proc and /bin/ps
 - comparing the information gathered from /bin/ps with the one gathered
   from system calls (syscall scanning)
 - full scan of the process ID space (PIDs bruteforcing)

unhide-tcp identifies TCP/UDP ports that are listening but are not listed
in /bin/netstat through brute forcing of all TCP/UDP ports available.


%prep
%setup -q -n %{name}-20080519

%build
%{__cc} %{optflags} unhide-linux26.c -o unhide
%{__cc} %{optflags} unhide-tcp.c -o unhide-tcp


%install
rm -rf %{buildroot}
%{__install} -Dp -m0755 unhide %{buildroot}%{_sbindir}/unhide
%{__install} -Dp -m0755 unhide-tcp %{buildroot}%{_sbindir}/unhide-tcp
%{__install} -Dp -m0644 man/unhide.8 %{buildroot}%{_mandir}/man8/unhide.8
%{__install} -Dp -m0644 man/unhide-tcp.8 %{buildroot}%{_mandir}/man8/unhide-tcp.8

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc COPYING LEEME.txt README.txt
%doc %{_mandir}/man8/unhide.8*
%doc %{_mandir}/man8/unhide-tcp.8*
%{_sbindir}/unhide
%{_sbindir}/unhide-tcp

%changelog
* Thu Jan 08 2009 Rakesh Pandit <rakesh at fedoraproject.org> 1.0-2
- clarified from upstream about license - fixed.

* Sat Dec 06 2008 Rakesh Pandit <rakesh at fedoraproject.org> 1.0-1
- Fixed %%Version and %%Release fields.

* Fri Nov 07 2008 Rakesh Pandit <rakesh at fedoraproject.org> 20080519-2
- Clear %%install, consistency of macro use

* Tue Nov 04 2008 Rakesh Pandit <rakesh at fedoraproject.org> 20080519-1
- Initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/unhide/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	14 Dec 2008 05:25:02 -0000	1.1
+++ .cvsignore	8 Jan 2009 05:39:44 -0000	1.2
@@ -0,0 +1 @@
+unhide20080519.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/unhide/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	14 Dec 2008 05:25:02 -0000	1.1
+++ sources	8 Jan 2009 05:39:44 -0000	1.2
@@ -0,0 +1 @@
+1194ec0f89c6f28e8eb64fb66836f70f  unhide20080519.tgz



From rakesh at fedoraproject.org  Thu Jan  8 05:40:23 2009
From: rakesh at fedoraproject.org (Rakesh Pandit)
Date: Thu,  8 Jan 2009 05:40:23 +0000 (UTC)
Subject: rpms/unhide/F-9 import.log, NONE, 1.1 unhide.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090108054023.8E2F0700FD@cvs1.fedora.phx.redhat.com>

Author: rakesh

Update of /cvs/pkgs/rpms/unhide/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13336/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	import.log unhide.spec 
Log Message:
initial import



--- NEW FILE import.log ---
unhide-1_0-2_fc10_20080519:F-9:unhide-1.0-2.fc10.20080519.src.rpm:1231349979


--- NEW FILE unhide.spec ---
Name:           unhide
Version:        1.0
Release:        2%{?dist}.20080519
Summary:        Tool to find hidden processes and TCP/UDP ports from rootkits

Group:          Applications/System
License:        GPLv3
URL:            http://www.security-projects.com/?Unhide
Source0:        http://www.security-projects.com/unhide20080519.tgz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%description
Unhide is a forensic tool to find processes and TCP/UDP ports hidden by
rootkits, Linux kernel modules or by other techniques. It includes two
utilities: unhide and unhide-tcp.

Unhide detects hidden processes using three techniques:

 - comparing the output of /proc and /bin/ps
 - comparing the information gathered from /bin/ps with the one gathered
   from system calls (syscall scanning)
 - full scan of the process ID space (PIDs bruteforcing)

unhide-tcp identifies TCP/UDP ports that are listening but are not listed
in /bin/netstat through brute forcing of all TCP/UDP ports available.


%prep
%setup -q -n %{name}-20080519

%build
%{__cc} %{optflags} unhide-linux26.c -o unhide
%{__cc} %{optflags} unhide-tcp.c -o unhide-tcp


%install
rm -rf %{buildroot}
%{__install} -Dp -m0755 unhide %{buildroot}%{_sbindir}/unhide
%{__install} -Dp -m0755 unhide-tcp %{buildroot}%{_sbindir}/unhide-tcp
%{__install} -Dp -m0644 man/unhide.8 %{buildroot}%{_mandir}/man8/unhide.8
%{__install} -Dp -m0644 man/unhide-tcp.8 %{buildroot}%{_mandir}/man8/unhide-tcp.8

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc COPYING LEEME.txt README.txt
%doc %{_mandir}/man8/unhide.8*
%doc %{_mandir}/man8/unhide-tcp.8*
%{_sbindir}/unhide
%{_sbindir}/unhide-tcp

%changelog
* Thu Jan 08 2009 Rakesh Pandit <rakesh at fedoraproject.org> 1.0-2
- clarified from upstream about license - fixed.

* Sat Dec 06 2008 Rakesh Pandit <rakesh at fedoraproject.org> 1.0-1
- Fixed %%Version and %%Release fields.

* Fri Nov 07 2008 Rakesh Pandit <rakesh at fedoraproject.org> 20080519-2
- Clear %%install, consistency of macro use

* Tue Nov 04 2008 Rakesh Pandit <rakesh at fedoraproject.org> 20080519-1
- Initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/unhide/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	14 Dec 2008 05:25:02 -0000	1.1
+++ .cvsignore	8 Jan 2009 05:39:53 -0000	1.2
@@ -0,0 +1 @@
+unhide20080519.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/unhide/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	14 Dec 2008 05:25:02 -0000	1.1
+++ sources	8 Jan 2009 05:39:53 -0000	1.2
@@ -0,0 +1 @@
+1194ec0f89c6f28e8eb64fb66836f70f  unhide20080519.tgz



From mtasaka at fedoraproject.org  Thu Jan  8 05:44:09 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Thu,  8 Jan 2009 05:44:09 +0000 (UTC)
Subject: rpms/cairo-dock/devel .cvsignore, 1.93, 1.94 cairo-dock.spec, 1.124,
	1.125 sources, 1.93, 1.94
Message-ID: <20090108054409.AB587700FD@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/cairo-dock/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14061

Modified Files:
	.cvsignore cairo-dock.spec sources 
Log Message:
* Thu Jan  8 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
- rev 1475



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cairo-dock/devel/.cvsignore,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -r1.93 -r1.94
--- .cvsignore	6 Jan 2009 05:42:33 -0000	1.93
+++ .cvsignore	8 Jan 2009 05:43:39 -0000	1.94
@@ -1 +1 @@
-cairo-dock-sources-svn1470_trunk.tar.bz2
+cairo-dock-sources-svn1475_trunk.tar.bz2


Index: cairo-dock.spec
===================================================================
RCS file: /cvs/extras/rpms/cairo-dock/devel/cairo-dock.spec,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -r1.124 -r1.125
--- cairo-dock.spec	6 Jan 2009 05:42:33 -0000	1.124
+++ cairo-dock.spec	8 Jan 2009 05:43:39 -0000	1.125
@@ -11,7 +11,7 @@
 %undefine		betaver		
 %define		build_webkit	1
 %define		build_xfce	1
-%define		tarballver	svn1470_trunk
+%define		tarballver	svn1475_trunk
 
 %define		fedora_main_rel	3
 
@@ -47,7 +47,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
-Patch10:	cairo-dock-rev1455-compile.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	automake
@@ -219,7 +218,6 @@
 find . -name \*.h -or -name \*.c | xargs %{__chmod} 0644
 
 # source code fix	
-%patch10 -p1 -b .debug
 
 # Cairo-Penguin
 ## Need ask
@@ -635,8 +633,8 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
-* Tue Jan  6 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
-- rev 1470
+* Thu Jan  8 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- rev 1475
 
 * Thu Dec 25 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
 - rev 1451


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cairo-dock/devel/sources,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -r1.93 -r1.94
--- sources	6 Jan 2009 05:42:33 -0000	1.93
+++ sources	8 Jan 2009 05:43:39 -0000	1.94
@@ -1 +1 @@
-885e64b62b9cd5d446ca7a93dd08f101  cairo-dock-sources-svn1470_trunk.tar.bz2
+1767c74610beec35b78d80b33fa2ce37  cairo-dock-sources-svn1475_trunk.tar.bz2



From kkofler at fedoraproject.org  Thu Jan  8 05:50:53 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Thu,  8 Jan 2009 05:50:53 +0000 (UTC)
Subject: rpms/kdegraphics/F-10 kdegraphics.spec,1.180,1.181
Message-ID: <20090108055053.981D37011C@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdegraphics/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15180/F-10

Modified Files:
	kdegraphics.spec 
Log Message:
* Thu Jan 08 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.3-6
- BR ebook-tools-devel


Index: kdegraphics.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdegraphics/F-10/kdegraphics.spec,v
retrieving revision 1.180
retrieving revision 1.181
diff -u -r1.180 -r1.181
--- kdegraphics.spec	22 Dec 2008 19:44:52 -0000	1.180
+++ kdegraphics.spec	8 Jan 2009 05:50:23 -0000	1.181
@@ -8,7 +8,7 @@
 Summary:        K Desktop Environment - Graphics Applications
 Epoch:          7
 Version:        4.1.3
-Release:        5%{?dist}
+Release:        6%{?dist}
 
 Name:           kdegraphics
 #Obsoletes:     kdegraphics4 < %{version}-%{release}
@@ -39,6 +39,7 @@
 BuildRequires:  cmake
 BuildRequires:  chmlib-devel
 BuildRequires:  djvulibre-devel
+BuildRequires:  ebook-tools-devel
 BuildRequires:  exiv2-devel
 BuildRequires:  giflib-devel
 %if 0%{?fedora} > 9
@@ -55,9 +56,6 @@
 BuildRequires:  qimageblitz-devel
 BuildRequires:  sane-backends-devel
 BuildRequires:  lcms-devel
-# TODO (not packaged yet):
-# + libepub: A library for reading EPub documents <http://sourceforge.net/projects/ebook-tools>
-# Support for EPub documents in Okular.
 
 %{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
 Requires: kdelibs4 >= %{version}
@@ -228,6 +226,9 @@
 
 
 %changelog
+* Thu Jan 08 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.3-6
+- BR ebook-tools-devel
+
 * Mon Dec 22 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.3-5
 - libkipi backport too (makes kde42 transition easier later)
 



From kkofler at fedoraproject.org  Thu Jan  8 05:50:53 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Thu,  8 Jan 2009 05:50:53 +0000 (UTC)
Subject: rpms/kdegraphics/F-9 kdegraphics.spec,1.159,1.160
Message-ID: <20090108055053.E24DC7011C@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdegraphics/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15180/F-9

Modified Files:
	kdegraphics.spec 
Log Message:
* Thu Jan 08 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.3-6
- BR ebook-tools-devel


Index: kdegraphics.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdegraphics/F-9/kdegraphics.spec,v
retrieving revision 1.159
retrieving revision 1.160
diff -u -r1.159 -r1.160
--- kdegraphics.spec	14 Nov 2008 16:21:24 -0000	1.159
+++ kdegraphics.spec	8 Jan 2009 05:50:23 -0000	1.160
@@ -1,12 +1,14 @@
 
-%if 0%{?fedora} < 10
+%if 0%{?fedora} > 9 
+%define obsolete_kde3_kipi 1
+%else
 %define omit_kde3_conflicts 1
 %endif
 
 Summary:        K Desktop Environment - Graphics Applications
 Epoch:          7
 Version:        4.1.3
-Release:        1%{?dist}.1
+Release:        6%{?dist}
 
 Name:           kdegraphics
 #Obsoletes:     kdegraphics4 < %{version}-%{release}
@@ -22,18 +24,22 @@
 
 ## kipi framework backports from trunk (4.2)
 ## don't bother updating these, rediff them from the next tag instead!
-# LANG=en_US.UTF-8 svn diff svn://anonsvn.kde.org/home/kde/tags/KDE/4.1.2/kdegraphics/libs/libkexiv2 \
-# svn://anonsvn.kde.org/home/kde/trunk/KDE/kdegraphics/libs/libkexiv2 >kdegraphics-4.1.2-libkexiv2-0.4.0.patch
-Patch200: kdegraphics-4.1.2-libkexiv2-0.4.0.patch
-# LANG=en_US.UTF-8 svn diff svn://anonsvn.kde.org/home/kde/tags/KDE/4.1.2/kdegraphics/libs/libkdcraw \
-# svn://anonsvn.kde.org/home/kde/trunk/KDE/kdegraphics/libs/libkdcraw >kdegraphics-4.1.2-libkdcraw-0.4.0.patch
-Patch201: kdegraphics-4.1.2-libkdcraw-0.4.0.patch
+# LANG=en_US.UTF-8 svn diff svn://anonsvn.kde.org/home/kde/tags/KDE/4.1.3/kdegraphics/libs/libkexiv2 \
+# svn://anonsvn.kde.org/home/kde/trunk/KDE/kdegraphics/libs/libkexiv2 >kdegraphics-4.1.3-libkexiv2-0.5.0.patch
+Patch200: kdegraphics-4.1.3-libkexiv2-0.5.0.patch
+# LANG=en_US.UTF-8 svn diff svn://anonsvn.kde.org/home/kde/tags/KDE/4.1.3/kdegraphics/libs/libkdcraw \
+# svn://anonsvn.kde.org/home/kde/trunk/KDE/kdegraphics/libs/libkdcraw >kdegraphics-4.1.3-libkdcraw-0.4.0.patch
+Patch201: kdegraphics-4.1.3-libkdcraw-0.4.0.patch
+# LANG=en_US.UTF-8 svn diff svn://anonsvn.kde.org/home/kde/tags/KDE/4.1.3/kdegraphics/libs/libkipi \
+# svn://anonsvn.kde.org/home/kde/trunk/KDE/kdegraphics/libs/libkipi >kdegraphics-4.1.3-libkipi-0.3.0.patch
+Patch202: kdegraphics-4.1.3-libkipi-0.3.0.patch
 
 BuildRequires:  kde-filesystem >= 4
 BuildRequires:  kdelibs4-devel >= %{version}
 BuildRequires:  cmake
 BuildRequires:  chmlib-devel
 BuildRequires:  djvulibre-devel
+BuildRequires:  ebook-tools-devel
 BuildRequires:  exiv2-devel
 BuildRequires:  giflib-devel
 %if 0%{?fedora} > 9
@@ -50,9 +56,6 @@
 BuildRequires:  qimageblitz-devel
 BuildRequires:  sane-backends-devel
 BuildRequires:  lcms-devel
-# TODO (not packaged yet):
-# + libepub: A library for reading EPub documents <http://sourceforge.net/projects/ebook-tools>
-# Support for EPub documents in Okular.
 
 %{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
 Requires: kdelibs4 >= %{version}
@@ -61,7 +64,7 @@
 Requires(post): xdg-utils
 Requires(postun): xdg-utils
 
-Obsoletes: %{name}-extras < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes: kdegraphics-extras < 7:4.0.0 
 Obsoletes: gwenview < 2
 Provides: gwenview = 2
 
@@ -78,7 +81,11 @@
 %package libs
 Summary: Runtime libraries for %{name}
 Group:   System Environment/Libraries
-Obsoletes: %{name}-libs-extras < %{?epoch:%{epoch}:}%{version}-%{release}
+%if 0%{?obsolete_kde3_kipi}
+Obsoletes: libkdcraw < 0.2.0, libkexiv2 < 0.4.0, libkipi < 0.2.0
+%endif
+Requires(post): xdg-utils
+Requires(postun): xdg-utils
 %description libs
 %{summary}.
 
@@ -92,7 +99,7 @@
 Requires: pkgconfig
 %if ! 0%{?omit_kde3_conflicts}
 Obsoletes: libkdcraw-devel < 0.4.0, libkexiv2-devel < 0.4.0, libkipi-devel < 0.2.0
-Provides:  libkdcraw-devel = 0.4.0-2, libkexiv2-devel = 0.4.0-2, libkipi-devel = 0.2.0-1
+Provides:  libkdcraw-devel = 0.4.0-2, libkexiv2-devel = 0.5.0-1, libkipi-devel = 0.3.0-1
 %endif
 %description devel
 %{summary}.
@@ -102,14 +109,18 @@
 %setup -q -n kdegraphics-%{version}
 
 # upstream patches
-# libkexiv2 0.4.0 backport
+# libkexiv2 backport
 pushd libs/libkexiv2
 %patch200 -p0
 popd
-# libkdcraw 0.4.0 backport
+# libkdcraw backport
 pushd libs/libkdcraw
 %patch201 -p0
 popd
+# libkipi backport
+pushd libs/libkipi
+%patch202 -p0
+popd
 
 
 %build
@@ -146,9 +157,13 @@
 %{_bindir}/xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
 %{_bindir}/xdg-desktop-menu forceupdate 2> /dev/null || :
 
-%post libs -p /sbin/ldconfig
+%post libs
+/sbin/ldconfig
+%{_bindir}/xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
 
-%postun libs -p /sbin/ldconfig
+%postun libs
+/sbin/ldconfig
+%{_bindir}/xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
 
 
 %files
@@ -161,7 +176,7 @@
 %{_kde4_datadir}/applications/kde4/*
 %{_kde4_datadir}/config.kcfg/*
 %{_kde4_datadir}/kde4/services/*
-%{_kde4_datadir}/kde4/servicetypes/*
+%{_kde4_datadir}/kde4/servicetypes/okularGenerator.desktop
 %{_kde4_docdir}/HTML/en/okular/
 %{_kde4_appsdir}/gvpart/
 %{_kde4_appsdir}/gwenview/
@@ -171,11 +186,18 @@
 %{_datadir}/dbus-1/interfaces/*
 %{_kde4_docdir}/HTML/en/gwenview/
 %{_kde4_docdir}/HTML/en/kamera/
-%{_kde4_docdir}/HTML/en/ksnapshot/
+%{_kde4_docdir}/HTML/en/kgamma/
 %{_kde4_docdir}/HTML/en/kolourpaint/
+%{_kde4_docdir}/HTML/en/ksnapshot/
 %{_kde4_docdir}/HTML/en/kruler/
-%{_kde4_docdir}/HTML/en/kgamma/
-%{_kde4_iconsdir}/hicolor/*/*/*
+%{_kde4_iconsdir}/hicolor/*/actions/*
+%{_kde4_iconsdir}/hicolor/*/apps/gwenview.*
+%{_kde4_iconsdir}/hicolor/*/apps/kcolorchooser.*
+%{_kde4_iconsdir}/hicolor/*/apps/kgamma.*
+%{_kde4_iconsdir}/hicolor/*/apps/kolourpaint.*
+%{_kde4_iconsdir}/hicolor/*/apps/kruler.*
+%{_kde4_iconsdir}/hicolor/*/apps/ksnapshot.*
+%{_kde4_iconsdir}/hicolor/*/apps/okular.*
 
 %files libs 
 %defattr(-,root,root,-)
@@ -184,6 +206,9 @@
 %{_kde4_libdir}/lib*.so.*
 %{_kde4_libdir}/kde4/*
 %{_kde4_libdir}/strigi/*
+%{_kde4_iconsdir}/hicolor/*/apps/kdcraw.*
+%{_kde4_iconsdir}/hicolor/*/apps/kipi.*
+%{_kde4_datadir}/kde4/servicetypes/kipiplugin.desktop
 
 %files devel
 %defattr(-,root,root,-)
@@ -201,8 +226,21 @@
 
 
 %changelog
-* Fri Nov 14 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.3-1.1
-- include libkdcraw/libkexiv2 backports
+* Thu Jan 08 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.3-6
+- BR ebook-tools-devel
+
+* Mon Dec 22 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.3-5
+- libkipi backport too (makes kde42 transition easier later)
+
+* Mon Dec 01 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.3-4
+- cleanup Obsoletes: kdegraphics-extras
+
+* Tue Nov 25 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.3-3
+- respin libkdcraw/libkexiv2 patches
+- Obsoletes: libkdcraw libkexiv2 libkipi (F10+)
+
+* Tue Nov 25 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.3-2
+- move (remaining) libkipi/libkdcraw runtime bits to -libs (#472874)
 
 * Wed Nov 12 2008 Than Ngo <than at redhat.com> 4.1.3-1
 - 4.1.3



From pbrobinson at fedoraproject.org  Thu Jan  8 06:19:45 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Thu,  8 Jan 2009 06:19:45 +0000 (UTC)
Subject: rpms/hulahop/OLPC-4 README, NONE, 1.1 hulahop.spec, 1.7,
	NONE sources, 1.4, NONE
Message-ID: <20090108061946.0680A7013F@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/hulahop/OLPC-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17447

Added Files:
	README 
Removed Files:
	hulahop.spec sources 
Log Message:
- remove old files as its now in mainline F-10. Added readme covering the detials



--- NEW FILE README ---
The OLPC-4 branch is now dead. Please make all updates for the OLPC-4 release in the F-10 branch and push update through the usual Fedora release system.


--- hulahop.spec DELETED ---


--- sources DELETED ---



From mhlavink at fedoraproject.org  Thu Jan  8 06:32:50 2009
From: mhlavink at fedoraproject.org (Michal Hlavinka)
Date: Thu,  8 Jan 2009 06:32:50 +0000 (UTC)
Subject: rpms/dovecot/devel .cvsignore, 1.45, 1.46 dovecot.spec, 1.116,
	1.117 sources, 1.48, 1.49
Message-ID: <20090108063250.E40B2700FD@cvs1.fedora.phx.redhat.com>

Author: mhlavink

Update of /cvs/extras/rpms/dovecot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19018

Modified Files:
	.cvsignore dovecot.spec sources 
Log Message:
dovecot updated to 1.1.8
sieve-plugin updated to 1.1.6



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/dovecot/devel/.cvsignore,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- .cvsignore	2 Dec 2008 14:16:32 -0000	1.45
+++ .cvsignore	8 Jan 2009 06:32:20 -0000	1.46
@@ -1,4 +1,4 @@
-dovecot-1.1.7.tar.gz
-dovecot-1.1.7.tar.gz.sig
-dovecot-sieve-1.1.5.tar.gz
-dovecot-sieve-1.1.5.tar.gz.sig
+dovecot-1.1.8.tar.gz
+dovecot-1.1.8.tar.gz.sig
+dovecot-sieve-1.1.6.tar.gz
+dovecot-sieve-1.1.6.tar.gz.sig


Index: dovecot.spec
===================================================================
RCS file: /cvs/extras/rpms/dovecot/devel/dovecot.spec,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -r1.116 -r1.117
--- dovecot.spec	2 Dec 2008 16:58:17 -0000	1.116
+++ dovecot.spec	8 Jan 2009 06:32:20 -0000	1.117
@@ -1,8 +1,8 @@
 Summary: Dovecot Secure imap server
 Name: dovecot
 Epoch: 1
-Version: 1.1.7
-Release: 2%{?dist}
+Version: 1.1.8
+Release: 1%{?dist}
 License: MIT and LGPLv2 and BSD with advertising
 Group: System Environment/Daemons
 
@@ -13,7 +13,7 @@
 %define build_gssapi 1
 
 %define build_sieve 1
-%define sieve_version 1.1.5
+%define sieve_version 1.1.6
 %define sieve_name dovecot-sieve
 
 URL: http://www.dovecot.org/
@@ -374,6 +374,10 @@
 
 
 %changelog
+* Thu Jan 8 2009 Michal Hlavinka <mhlavink at redhat.com> - 1:1.1.8-1
+- dovecot updated to 1.1.8
+- sieve-plugin updated to 1.1.6
+
 * Tue Dec 2 2008 Michal Hlavinka <mhlavink at redhat.com> - 1:1.1.7-2
 - revert changes from 1:1.1.6-2 and 1:1.1.6-1
 - password can be stored in different file readable only for root 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/dovecot/devel/sources,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- sources	2 Dec 2008 14:16:32 -0000	1.48
+++ sources	8 Jan 2009 06:32:20 -0000	1.49
@@ -1,4 +1,4 @@
-ea83ea2000a5b2e1744c7c97eb5585d1  dovecot-1.1.7.tar.gz
-4d82f184f5509bf0908fe49443c128a1  dovecot-1.1.7.tar.gz.sig
-b4362defe3fc18865db8cf8e1c940b13  dovecot-sieve-1.1.5.tar.gz
-0fdb01f9fd960fbd5a8271584ac62cb8  dovecot-sieve-1.1.5.tar.gz.sig
+bc23a919c7ad2b3c5ba69e19f1b46eb2  dovecot-1.1.8.tar.gz
+085419d609721f2281f38cbda7c897fd  dovecot-1.1.8.tar.gz.sig
+7acf3d98974a515b868addbdb73054eb  dovecot-sieve-1.1.6.tar.gz
+a9c6b8b2eab4d6a72395ffde1fb53327  dovecot-sieve-1.1.6.tar.gz.sig



From mhlavink at fedoraproject.org  Thu Jan  8 06:33:55 2009
From: mhlavink at fedoraproject.org (Michal Hlavinka)
Date: Thu,  8 Jan 2009 06:33:55 +0000 (UTC)
Subject: rpms/dovecot/F-10 .cvsignore, 1.45, 1.46 dovecot.spec, 1.115,
	1.116 sources, 1.48, 1.49
Message-ID: <20090108063355.BC00C700FD@cvs1.fedora.phx.redhat.com>

Author: mhlavink

Update of /cvs/extras/rpms/dovecot/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19129

Modified Files:
	.cvsignore dovecot.spec sources 
Log Message:
update dovecot to 1.1.8 (Resolves: #475848)
update dovecot sieve plugin to 1.1.6



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/dovecot/F-10/.cvsignore,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- .cvsignore	2 Dec 2008 16:55:56 -0000	1.45
+++ .cvsignore	8 Jan 2009 06:33:25 -0000	1.46
@@ -1,4 +1,4 @@
-dovecot-1.1.7.tar.gz
-dovecot-1.1.7.tar.gz.sig
-dovecot-sieve-1.1.5.tar.gz
-dovecot-sieve-1.1.5.tar.gz.sig
+dovecot-1.1.8.tar.gz
+dovecot-1.1.8.tar.gz.sig
+dovecot-sieve-1.1.6.tar.gz
+dovecot-sieve-1.1.6.tar.gz.sig


Index: dovecot.spec
===================================================================
RCS file: /cvs/extras/rpms/dovecot/F-10/dovecot.spec,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -r1.115 -r1.116
--- dovecot.spec	2 Dec 2008 16:55:56 -0000	1.115
+++ dovecot.spec	8 Jan 2009 06:33:25 -0000	1.116
@@ -1,7 +1,7 @@
 Summary: Dovecot Secure imap server
 Name: dovecot
 Epoch: 1
-Version: 1.1.7
+Version: 1.1.8
 Release: 1%{?dist}
 License: MIT and LGPLv2 and BSD with advertising
 Group: System Environment/Daemons
@@ -13,7 +13,7 @@
 %define build_gssapi 1
 
 %define build_sieve 1
-%define sieve_version 1.1.5
+%define sieve_version 1.1.6
 %define sieve_name dovecot-sieve
 
 URL: http://www.dovecot.org/
@@ -374,6 +374,10 @@
 
 
 %changelog
+* Thu Jan 8 2009 Michal Hlavinka <mhlavink at redhat.com> - 1:1.1.8-1
+- update dovecot to 1.1.8 (Resolves: #475848)
+- update dovecot sieve plugin to 1.1.6
+
 * Mon Nov 3 2008 Michal Hlavinka <mhlavink at redhat.com> - 1:1.1.7-1
 - update to upstream version 1.1.7
 - revert changes from 1.1.6-2 and 1.1.6-1


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/dovecot/F-10/sources,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- sources	2 Dec 2008 16:55:56 -0000	1.48
+++ sources	8 Jan 2009 06:33:25 -0000	1.49
@@ -1,4 +1,4 @@
-ea83ea2000a5b2e1744c7c97eb5585d1  dovecot-1.1.7.tar.gz
-4d82f184f5509bf0908fe49443c128a1  dovecot-1.1.7.tar.gz.sig
-b4362defe3fc18865db8cf8e1c940b13  dovecot-sieve-1.1.5.tar.gz
-0fdb01f9fd960fbd5a8271584ac62cb8  dovecot-sieve-1.1.5.tar.gz.sig
+bc23a919c7ad2b3c5ba69e19f1b46eb2  dovecot-1.1.8.tar.gz
+085419d609721f2281f38cbda7c897fd  dovecot-1.1.8.tar.gz.sig
+7acf3d98974a515b868addbdb73054eb  dovecot-sieve-1.1.6.tar.gz
+a9c6b8b2eab4d6a72395ffde1fb53327  dovecot-sieve-1.1.6.tar.gz.sig



From alexlan at fedoraproject.org  Thu Jan  8 06:49:13 2009
From: alexlan at fedoraproject.org (Alex Lancaster)
Date: Thu,  8 Jan 2009 06:49:13 +0000 (UTC)
Subject: rpms/perl-bioperl/devel .cvsignore, 1.4, 1.5 perl-bioperl.spec, 1.16,
	1.17 sources, 1.5, 1.6
Message-ID: <20090108064913.CE4F1700FD@cvs1.fedora.phx.redhat.com>

Author: alexlan

Update of /cvs/extras/rpms/perl-bioperl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20254

Modified Files:
	.cvsignore perl-bioperl.spec sources 
Log Message:
- Update to 1.6.0 release candidate 2
- Remove filter for Bio::Graphics*, upstream removed them from the
  tarball



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-bioperl/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	28 Dec 2008 04:23:11 -0000	1.4
+++ .cvsignore	8 Jan 2009 06:48:43 -0000	1.5
@@ -1 +1 @@
-BioPerl-1.5.9_1.tar.bz2
+BioPerl-1.5.9_2.tar.bz2


Index: perl-bioperl.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-bioperl/devel/perl-bioperl.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- perl-bioperl.spec	28 Dec 2008 23:56:06 -0000	1.16
+++ perl-bioperl.spec	8 Jan 2009 06:48:43 -0000	1.17
@@ -1,12 +1,12 @@
 Name:           perl-bioperl
 Version:        1.5.9
-Release:        0.2.1%{?dist}
+Release:        0.3.2%{?dist}
 Summary:        Perl tools for computational molecular biology
 
 Group:          Development/Libraries
 License:        GPL+ or Artistic
 URL:            http://www.bioperl.org/
-Source0:        http://bioperl.org/DIST/BioPerl-%{version}_1.tar.bz2
+Source0:        http://bioperl.org/DIST/BioPerl-%{version}_2.tar.bz2
 Patch0:         bioperl-1.5.9-paths.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -58,7 +58,7 @@
 many modules depend on each other to achieve a task.
 
 %prep
-%setup -q -n bioperl-%{version}._1
+%setup -q -n BioPerl-%{version}._2
 %patch0 -p1 
 
 # temporarily remove PhyloNetwork before compiling until upstream says
@@ -67,20 +67,17 @@
 rm -r Bio/PhyloNetwork*
 rm -r t/Tree/PhyloNetwork
 
-# Filter unwanted Requires:  Bio::Graphics
-cat << \EOF > %{_builddir}/bioperl-%{version}._1/%{name}-req
-#!/bin/sh
-%{__perl_requires} $* |\
-   sed -e '/perl(Bio::Graphics)/d; /perl(Bio::Graphics::Panel)/d'
-EOF
- 
-%define __perl_requires %{_builddir}/bioperl-%{version}._1/%{name}-req
-chmod +x %{__perl_requires}
-
 # these are the unwanted Requires for perl-bioperl-run, keeping in
 # case we need to do the temporary hack for bootstrapping again
 
+#cat << \EOF > %{_builddir}/BioPerl-%{version}._2/%{name}-req
+##!/bin/sh
+#%{__perl_requires} $* |\
 #   sed -e '/perl(Bio::Tools::Run::Alignment::Clustalw)/d; /perl(Bio::Tools::Run::GenericParameters)/d; /perl(Bio::Tools::Run::Phylo::Molphy::ProtML)/d; /perl(Bio::Tools::Run::Phylo::Phylip::Neighbor)/d; /perl(Bio::Tools::Run::Phylo::Phylip::ProtDist)/d; /perl(Bio::Tools::Run::Phylo::Phylip::ProtPars)/d; /perl(Bio::Tools::Run::RemoteBlast)/d'
+#EOF
+ 
+#%%define __perl_requires %{_builddir}/BioPerl-%{version}._2/%{name}-req
+#chmod +x %{__perl_requires}
 
 # remove all execute bits from the doc stuff
 find examples -type f -exec chmod -x {} 2>/dev/null ';'
@@ -125,13 +122,18 @@
 %defattr(-,root,root,-)
 ## don't distribute "doc" subdirectory,  doesn't contain docs
 %doc examples models 
-%doc AUTHORS BUGS Changes ChangeLog DEPRECATED INSTALL LICENSE PLATFORMS README
+%doc AUTHORS BUGS Changes DEPRECATED INSTALL LICENSE PLATFORMS README
 %{_bindir}/*
 %{perl_vendorlib}/*
 %{_mandir}/man1/*.1*
 %{_mandir}/man3/*.3*    
 
 %changelog
+* Wed Jan  7 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 1.5.9-0.3.2
+- Update to 1.6.0 release candidate 2
+- Remove filter for Bio::Graphics*, upstream removed them from the
+  tarball
+
 * Sun Dec 28 2008 Alex Lancaster <alexlan[AT]fedoraproject org> - 1.5.9-0.2.1
 - Filter unwanted Requires: Bio::Graphics and Bio::Graphics::Panel
   fixes broken deps until the .pl demo scripts remove them to the


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-bioperl/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	28 Dec 2008 04:23:11 -0000	1.5
+++ sources	8 Jan 2009 06:48:43 -0000	1.6
@@ -1 +1 @@
-f7c85ef9cf175055eb56a097ae9d49b4  BioPerl-1.5.9_1.tar.bz2
+e01ce300592c8a5f7f1f1d2eba5405bc  BioPerl-1.5.9_2.tar.bz2



From cchance at fedoraproject.org  Thu Jan  8 07:01:14 2009
From: cchance at fedoraproject.org (Caius Chance)
Date: Thu,  8 Jan 2009 07:01:14 +0000 (UTC)
Subject: rpms/cjkunifonts/devel cjkunifonts.spec,1.28,1.29
Message-ID: <20090108070114.CD6AB700FD@cvs1.fedora.phx.redhat.com>

Author: cchance

Update of /cvs/pkgs/rpms/cjkunifonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21724

Modified Files:
	cjkunifonts.spec 
Log Message:
repatched rev 11



Index: cjkunifonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cjkunifonts/devel/cjkunifonts.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- cjkunifonts.spec	6 Jan 2009 02:24:34 -0000	1.28
+++ cjkunifonts.spec	8 Jan 2009 07:00:44 -0000	1.29
@@ -5,6 +5,8 @@
 Chinese Unicode TrueType fonts derived from the original fonts generously made \available by Arphic Technology under the "Arphic Public License" and extended \
 by the CJK Unifonts project.
 
+%define umingbuilddir   ../%{name}-uming-%{version}
+%define ukaibuilddir    ../%{name}-ukai-%{version}
 %define umingfontdir    %{_datadir}/fonts/%{name}-uming
 %define ukaifontdir     %{_datadir}/fonts/%{name}-ukai
 %define cidmapdir       %{_datadir}/ghostscript/conf.d
@@ -12,7 +14,7 @@
 
 Name:        %{fontname}
 Version:     0.2.20080216.1
-Release:     11.2%{?dist}
+Release:     12%{?dist}
 Summary:     Chinese TrueType Fonts -- Simplified and Traditional Chinese Ming and Kai Face
 License:     Arphic
 Group:       User Interface/X
@@ -95,23 +97,23 @@
 install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} \
     %{buildroot}%{_fontconfig_confdir}
 
-cd %{name}-uming-%{version}
+cd %{umingbuilddir}
 for fconf in `ls *-ttf-arphic-uming*.conf`
 do
     install -m 0644 $fconf %{buildroot}%{_fontconfig_templatedir}/
-    ln -s %{buildroot}%{_fontconfig_templatedir}/$fconf \
-        %{buildroot}%{_fontconfig_confdir}/$fconf
+    cd %{buildroot}%{_fontconfig_confdir}/ && \
+        ln -s %{_fontconfig_templatedir}/$fconf $fconf && \
+        cd -
 done
-cd ..
-
-cd %{name}-ukai-%{version}
+cd %{ukaibuilddir}
 for fconf in `ls *-ttf-arphic-ukai*.conf`
 do
     install -m 0644 $fconf %{buildroot}%{_fontconfig_templatedir}/
-    ln -s %{buildroot}%{_fontconfig_templatedir}/$fconf \
-        %{buildroot}%{_fontconfig_confdir}/$fconf
+    cd %{buildroot}%{_fontconfig_confdir}/ && \
+        ln -s %{_fontconfig_templatedir}/$fconf $fconf && \
+        cd -
 done
-cd ..
+cd -
 
 # backward compat
 install -d %{buildroot}%{_datadir}/fonts/zh_CN/TrueType
@@ -176,14 +178,15 @@
 %dir %{_datadir}/fonts/zh_TW
 %dir %{_datadir}/fonts/zh_CN/TrueType
 %dir %{_datadir}/fonts/zh_TW/TrueType
-%{umingfontdir}/*.ttc
-%{_fontconfig_templatedir}/*-ttf-arphic-uming*.conf
 %{cidmapdir}/FAPIcidfmap.zh_TW
 %{cidmapdir}/FAPIcidfmap.zh_CN
 %{cidmapdir}/cidfmap.zh_TW
 %{cidmapdir}/cidfmap.zh_CN
 %{cidmapdir}/CIDFnmap.zh_TW
 %{cidmapdir}/CIDFnmap.zh_CN
+%{umingfontdir}/*.ttc
+%{_fontconfig_templatedir}/*-ttf-arphic-uming*.conf
+%verify(not md5 size mtime) %{_fontconfig_confdir}/*-ttf-arphic-uming*.conf
 %verify(not md5 size mtime) %{umingfontdir}/fonts.dir
 %verify(not md5 size mtime) %{umingfontdir}/fonts.scale
 %verify(not md5 size mtime) %{_datadir}/fonts/zh_CN/TrueType/zysong.ttf
@@ -203,20 +206,21 @@
 %doc %{ukaibuilddir}/README
 %doc %{ukaibuilddir}/TODO
 %dir %{ukaifontdir}
-%{ukaifontdir}/*.ttc
-%{_fontconfig_templatedir}/*-ttf-arphic-ukai*.conf
 %{cidmapdir}/FAPIcidfmap.zh_TW
 %{cidmapdir}/FAPIcidfmap.zh_CN
 %{cidmapdir}/cidfmap.zh_TW
 %{cidmapdir}/cidfmap.zh_CN
 %{cidmapdir}/CIDFnmap.zh_TW
 %{cidmapdir}/CIDFnmap.zh_CN
+%{ukaifontdir}/*.ttc
+%{_fontconfig_templatedir}/*-ttf-arphic-ukai*.conf
+%verify(not md5 size mtime) %{_fontconfig_confdir}/*-ttf-arphic-ukai*.conf
 %verify(not md5 size mtime) %{ukaifontdir}/fonts.dir
 %verify(not md5 size mtime) %{ukaifontdir}/fonts.scale
 %{catalogue}/%{name}-ukai
 
 %changelog
-* Tue Jan 06 2009 Caius Chance <cchance at redhat.com> - 0.2.20080216.1-11.2.fc11
+* Tue Jan 06 2009 Caius Chance <cchance at redhat.com> - 0.2.20080216.1-12.fc11
 - Resolves: rhbz#477373 (Converted to new font packaging guidelines.)
 
 * Sun Dec  7 2008 Behdad Esfahbod <besfahbo at redhat.com> - 0.2.20080216.1-10.fc11



From pkgdb at fedoraproject.org  Thu Jan  8 08:17:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 08 Jan 2009 08:17:30 +0000
Subject: [pkgdb] wireshark had acl change status
Message-ID: <20090108081731.519FB20831D@bastion.fedora.phx.redhat.com>

rvokal has set the watchbugzilla acl on wireshark (Fedora devel) to Approved for dhurander3

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/wireshark



From pkgdb at fedoraproject.org  Thu Jan  8 08:44:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 08 Jan 2009 08:44:46 +0000
Subject: [pkgdb] dovecot had group_acl changed
Message-ID: <20090108084446.EDA2B20831F@bastion.fedora.phx.redhat.com>

sharkcz has set the commit acl on dovecot (Fedora devel) to Approved for provenpackager

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/dovecot



From pkgdb at fedoraproject.org  Thu Jan  8 08:44:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 08 Jan 2009 08:44:56 +0000
Subject: [pkgdb] dovecot had group_acl changed
Message-ID: <20090108084456.ACBF3208456@bastion.fedora.phx.redhat.com>

sharkcz has set the commit acl on dovecot (Fedora 9) to Approved for provenpackager

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/dovecot



From pkgdb at fedoraproject.org  Thu Jan  8 08:45:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 08 Jan 2009 08:45:04 +0000
Subject: [pkgdb] dovecot had group_acl changed
Message-ID: <20090108084504.E6767208458@bastion.fedora.phx.redhat.com>

sharkcz has set the commit acl on dovecot (Fedora 7) to Approved for provenpackager

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/dovecot



From pkgdb at fedoraproject.org  Thu Jan  8 08:44:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 08 Jan 2009 08:44:59 +0000
Subject: [pkgdb] dovecot had group_acl changed
Message-ID: <20090108084459.57F4020831F@bastion.fedora.phx.redhat.com>

sharkcz has set the commit acl on dovecot (Fedora 10) to Approved for provenpackager

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/dovecot



From pkgdb at fedoraproject.org  Thu Jan  8 08:45:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 08 Jan 2009 08:45:06 +0000
Subject: [pkgdb] dovecot had group_acl changed
Message-ID: <20090108084507.15635208467@bastion.fedora.phx.redhat.com>

sharkcz has set the commit acl on dovecot (Fedora 8) to Approved for provenpackager

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/dovecot



From pkgdb at fedoraproject.org  Thu Jan  8 08:59:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 08 Jan 2009 08:59:32 +0000
Subject: [pkgdb] libsyncml: heffer has requested commit
Message-ID: <20090108085932.E519A20831C@bastion.fedora.phx.redhat.com>

heffer has requested the commit acl on libsyncml (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libsyncml



From pkgdb at fedoraproject.org  Thu Jan  8 08:59:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 08 Jan 2009 08:59:38 +0000
Subject: [pkgdb] libsyncml: heffer has requested commit
Message-ID: <20090108085938.D97AD208456@bastion.fedora.phx.redhat.com>

heffer has requested the commit acl on libsyncml (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libsyncml



From stransky at fedoraproject.org  Thu Jan  8 09:03:43 2009
From: stransky at fedoraproject.org (Martin Stransky)
Date: Thu,  8 Jan 2009 09:03:43 +0000 (UTC)
Subject: rpms/xulrunner/F-10 xulrunner.spec,1.139,1.140
Message-ID: <20090108090343.E00C6700FD@cvs1.fedora.phx.redhat.com>

Author: stransky

Update of /cvs/pkgs/rpms/xulrunner/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv503

Modified Files:
	xulrunner.spec 
Log Message:
* Wed Jan 8 2009 Martin Stransky <stransky at redhat.com> 1.9.0.5-2
- Copied mozilla-config.h to stable include dir (#478445)




Index: xulrunner.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xulrunner/F-10/xulrunner.spec,v
retrieving revision 1.139
retrieving revision 1.140
diff -u -r1.139 -r1.140
--- xulrunner.spec	17 Dec 2008 03:10:22 -0000	1.139
+++ xulrunner.spec	8 Jan 2009 09:03:13 -0000	1.140
@@ -8,7 +8,7 @@
 Summary:        XUL Runtime for Gecko Applications
 Name:           xulrunner
 Version:        1.9.0.5
-Release:        1%{?dist}
+Release:        2%{?dist}
 URL:            http://developer.mozilla.org/En/XULRunner
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 Group:          Applications/Internet
@@ -208,6 +208,10 @@
 %{__cp} -rL dist/include/* \
   $RPM_BUILD_ROOT/%{_includedir}/${INTERNAL_APP_SDK_NAME}
 
+# Copy mozilla-config to stable include dir
+%{__cp} dist/include/mozilla-config.h \
+  $RPM_BUILD_ROOT/%{_includedir}/${INTERNAL_APP_SDK_NAME}/stable
+
 # Fix multilib devel conflicts...
 %ifarch x86_64 ia64 s390x ppc64
 %define mozbits 64
@@ -232,6 +236,10 @@
 install_file "mozilla-config"
 popd
 
+pushd $RPM_BUILD_ROOT/%{_includedir}/${INTERNAL_APP_SDK_NAME}/stable
+install_file "mozilla-config"
+popd
+
 pushd $RPM_BUILD_ROOT/%{_includedir}/${INTERNAL_APP_SDK_NAME}/unstable
 install_file "mozilla-config"
 popd
@@ -413,6 +421,9 @@
 #---------------------------------------------------------------------
 
 %changelog
+* Wed Jan 8 2009 Martin Stransky <stransky at redhat.com> 1.9.0.5-2
+- Copied mozilla-config.h to stable include dir (#478445)
+
 * Tue Dec 16 2008 Christopher Aillon <caillon at redhat.com> 1.9.0.5-1
 - Update to 1.9.0.5
 



From kasal at fedoraproject.org  Thu Jan  8 09:17:13 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Thu,  8 Jan 2009 09:17:13 +0000 (UTC)
Subject: rpms/grep/devel grep-bz460641.patch,NONE,1.1 grep.spec,1.73,1.74
Message-ID: <20090108091713.AEDD0700FD@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/extras/rpms/grep/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1596

Modified Files:
	grep.spec 
Added Files:
	grep-bz460641.patch 
Log Message:
bug #460641 (a.k.a. 479152)

grep-bz460641.patch:

--- NEW FILE grep-bz460641.patch ---
diff -up grep-2.5.3/src/search.c.bz479152 grep-2.5.3/src/search.c
--- grep-2.5.3/src/search.c.bz479152	2009-01-08 09:57:12.000000000 +0100
+++ grep-2.5.3/src/search.c	2009-01-08 09:58:57.000000000 +0100
@@ -757,7 +757,7 @@ EXECUTE_FCT(Fexecute)
   const char *last_char = NULL;
 #endif /* MBS_SUPPORT */
 
-  for (beg = start_ptr ? start_ptr : buf; beg <= buf + size; beg++)
+  for (beg = start_ptr ? start_ptr : buf; beg < buf + size; beg++)
     {
       size_t offset = kwsexec (kwset, beg, buf + size - beg, &kwsmatch);
       if (offset == (size_t) -1)


Index: grep.spec
===================================================================
RCS file: /cvs/extras/rpms/grep/devel/grep.spec,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- grep.spec	24 Nov 2008 09:52:09 -0000	1.73
+++ grep.spec	8 Jan 2009 09:16:42 -0000	1.74
@@ -3,7 +3,7 @@
 Summary: Pattern matching utilities
 Name: grep
 Version: 2.5.3
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv3+
 Group: Applications/Text
 Source: ftp://ftp.gnu.org/pub/gnu/grep/grep-%{version}.tar.bz2
@@ -12,6 +12,8 @@
 Patch2: grep-2.5.3-pcrewrap.patch
 Patch3: grep-2.5.3-case.patch
 Patch4: grep-2.5.3-egf-speedup.patch
+# bug #460641 (a.k.a. 479152)
+Patch40: grep-bz460641.patch
 Patch5: grep-2.5.1a-utf8.patch
 URL: http://www.gnu.org/software/grep/
 Requires(post): /sbin/install-info
@@ -34,6 +36,7 @@
 %patch2 -p1 -b .pcrewrap
 %patch3 -p1 -b .case
 %patch4 -p1 -b .egf-speedup
+%patch40 -p1 -b .bz460641
 %patch5 -p1 -b .utf8
 
 %build
@@ -73,6 +76,9 @@
 %{_mandir}/*/*
 
 %changelog
+* Thu Jan  8 2009 Stepan Kasal <skasal at redhat.com> 2.5.3-2
+- fix bug #460641 (a.k.a. 479152)
+
 * Thu Nov 20 2008 Lubomir Rintel <lkundrak at v3.sk> 2.5.3-1
 - Update to latest upstream version
 - Drop upstreamed patches



From pkgdb at fedoraproject.org  Thu Jan  8 09:22:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 08 Jan 2009 09:22:39 +0000
Subject: [pkgdb] libsyncml had acl change status
Message-ID: <20090108092239.0BF1F20831C@bastion.fedora.phx.redhat.com>

rineau has set the commit acl on libsyncml (Fedora 9) to Approved for heffer

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libsyncml



From pkgdb at fedoraproject.org  Thu Jan  8 09:22:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 08 Jan 2009 09:22:40 +0000
Subject: [pkgdb] libsyncml had acl change status
Message-ID: <20090108092240.A92AE208421@bastion.fedora.phx.redhat.com>

rineau has set the commit acl on libsyncml (Fedora 10) to Approved for heffer

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libsyncml



From pkgdb at fedoraproject.org  Thu Jan  8 09:22:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 08 Jan 2009 09:22:48 +0000
Subject: [pkgdb] libsyncml ownership updated
Message-ID: <20090108092248.DDB4A208458@bastion.fedora.phx.redhat.com>

Package libsyncml in Fedora 9 was orphaned by rineau

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libsyncml



From pkgdb at fedoraproject.org  Thu Jan  8 09:22:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 08 Jan 2009 09:22:55 +0000
Subject: [pkgdb] libsyncml ownership updated
Message-ID: <20090108092255.96D0220831C@bastion.fedora.phx.redhat.com>

Package libsyncml in Fedora 9 is now owned by rineau

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libsyncml



From pkgdb at fedoraproject.org  Thu Jan  8 09:23:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 08 Jan 2009 09:23:05 +0000
Subject: [pkgdb] libsyncml: rineau has requested commit
Message-ID: <20090108092305.2040E208469@bastion.fedora.phx.redhat.com>

rineau has requested the commit acl on libsyncml (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libsyncml



From pkgdb at fedoraproject.org  Thu Jan  8 09:23:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 08 Jan 2009 09:23:03 +0000
Subject: [pkgdb] libsyncml: rineau has requested commit
Message-ID: <20090108092303.4198F20831F@bastion.fedora.phx.redhat.com>

rineau has requested the commit acl on libsyncml (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libsyncml



From pkgdb at fedoraproject.org  Thu Jan  8 09:23:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 08 Jan 2009 09:23:14 +0000
Subject: [pkgdb] libsyncml ownership updated
Message-ID: <20090108092314.80FF6208457@bastion.fedora.phx.redhat.com>

Package libsyncml in Fedora 9 was orphaned by rineau

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libsyncml



From pkgdb at fedoraproject.org  Thu Jan  8 09:23:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 08 Jan 2009 09:23:40 +0000
Subject: [pkgdb] libsyncml ownership updated
Message-ID: <20090108092340.A497E208455@bastion.fedora.phx.redhat.com>

Package libsyncml in Fedora 10 was orphaned by rineau

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libsyncml



From pkgdb at fedoraproject.org  Thu Jan  8 09:24:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 08 Jan 2009 09:24:58 +0000
Subject: [pkgdb] libsyncml ownership updated
Message-ID: <20090108092458.909C720831F@bastion.fedora.phx.redhat.com>

Package libsyncml in Fedora 9 is now owned by heffer

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libsyncml



From pkgdb at fedoraproject.org  Thu Jan  8 09:24:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 08 Jan 2009 09:24:56 +0000
Subject: [pkgdb] libsyncml: rineau has requested commit
Message-ID: <20090108092456.A2BC520831D@bastion.fedora.phx.redhat.com>

rineau has requested the commit acl on libsyncml (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libsyncml



From pkgdb at fedoraproject.org  Thu Jan  8 09:25:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 08 Jan 2009 09:25:05 +0000
Subject: [pkgdb] libsyncml had acl change status
Message-ID: <20090108092505.AAD0B208455@bastion.fedora.phx.redhat.com>

heffer has set the watchcommits acl on libsyncml (Fedora 9) to Approved for heffer

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libsyncml



From pkgdb at fedoraproject.org  Thu Jan  8 09:25:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 08 Jan 2009 09:25:06 +0000
Subject: [pkgdb] libsyncml had acl change status
Message-ID: <20090108092506.50A0E208319@bastion.fedora.phx.redhat.com>

heffer has set the watchbugzilla acl on libsyncml (Fedora 9) to Approved for heffer

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libsyncml



From pkgdb at fedoraproject.org  Thu Jan  8 09:25:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 08 Jan 2009 09:25:07 +0000
Subject: [pkgdb] libsyncml had acl change status
Message-ID: <20090108092507.1C7A6208458@bastion.fedora.phx.redhat.com>

heffer has set the approveacls acl on libsyncml (Fedora 9) to Approved for heffer

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libsyncml



From pkgdb at fedoraproject.org  Thu Jan  8 09:25:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 08 Jan 2009 09:25:16 +0000
Subject: [pkgdb] libsyncml had acl change status
Message-ID: <20090108092516.9142520846B@bastion.fedora.phx.redhat.com>

heffer has set the commit acl on libsyncml (Fedora 9) to Approved for rineau

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libsyncml



From pkgdb at fedoraproject.org  Thu Jan  8 09:25:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 08 Jan 2009 09:25:21 +0000
Subject: [pkgdb] libsyncml had acl change status
Message-ID: <20090108092521.F1BA5208455@bastion.fedora.phx.redhat.com>

heffer has set the watchcommits acl on libsyncml (Fedora 10) to Approved for heffer

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libsyncml



From pkgdb at fedoraproject.org  Thu Jan  8 09:25:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 08 Jan 2009 09:25:25 +0000
Subject: [pkgdb] libsyncml had acl change status
Message-ID: <20090108092525.139E820846D@bastion.fedora.phx.redhat.com>

heffer has set the approveacls acl on libsyncml (Fedora 10) to Approved for heffer

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libsyncml



From pkgdb at fedoraproject.org  Thu Jan  8 09:25:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 08 Jan 2009 09:25:17 +0000
Subject: [pkgdb] libsyncml ownership updated
Message-ID: <20090108092517.E992B208421@bastion.fedora.phx.redhat.com>

Package libsyncml in Fedora 10 is now owned by heffer

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libsyncml



From pkgdb at fedoraproject.org  Thu Jan  8 09:25:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 08 Jan 2009 09:25:26 +0000
Subject: [pkgdb] libsyncml had acl change status
Message-ID: <20090108092526.EE089208470@bastion.fedora.phx.redhat.com>

heffer has set the watchbugzilla acl on libsyncml (Fedora 10) to Approved for heffer

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libsyncml



From pkgdb at fedoraproject.org  Thu Jan  8 09:25:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 08 Jan 2009 09:25:27 +0000
Subject: [pkgdb] libsyncml had acl change status
Message-ID: <20090108092527.26EE4208472@bastion.fedora.phx.redhat.com>

heffer has set the commit acl on libsyncml (Fedora 10) to Approved for rineau

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libsyncml



From pkgdb at fedoraproject.org  Thu Jan  8 09:25:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 08 Jan 2009 09:25:58 +0000
Subject: [pkgdb] libsyncml had acl change status
Message-ID: <20090108092558.EB1A320831C@bastion.fedora.phx.redhat.com>

rineau has set the commit acl on libsyncml (Fedora devel) to Approved for rineau

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libsyncml



From stransky at fedoraproject.org  Thu Jan  8 09:27:28 2009
From: stransky at fedoraproject.org (Martin Stransky)
Date: Thu,  8 Jan 2009 09:27:28 +0000 (UTC)
Subject: rpms/seamonkey/F-10 seamonkey-mozconfig, 1.5, 1.6 seamonkey.spec,
	1.49, 1.50
Message-ID: <20090108092728.8B103700FD@cvs1.fedora.phx.redhat.com>

Author: stransky

Update of /cvs/pkgs/rpms/seamonkey/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2995

Modified Files:
	seamonkey-mozconfig seamonkey.spec 
Log Message:
* Mon Jan 8 2009 Martin Stransky <stransky at redhat.com> 1.1.14-4
- build with -fno-strict-aliasing (#468415)




Index: seamonkey-mozconfig
===================================================================
RCS file: /cvs/pkgs/rpms/seamonkey/F-10/seamonkey-mozconfig,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- seamonkey-mozconfig	5 Jan 2009 14:14:59 -0000	1.5
+++ seamonkey-mozconfig	8 Jan 2009 09:26:58 -0000	1.6
@@ -7,8 +7,6 @@
 ac_add_options --disable-tests
 ac_add_options --disable-debug
 ac_add_options --disable-installer
-#Workaround for BZ468415
-#ac_add_options --enable-optimize="$RPM_OPT_FLAGS"
 ac_add_options --enable-xinerama
 ac_add_options --enable-default-toolkit=gtk2
 ac_add_options --disable-xprint


Index: seamonkey.spec
===================================================================
RCS file: /cvs/pkgs/rpms/seamonkey/F-10/seamonkey.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- seamonkey.spec	7 Jan 2009 22:30:41 -0000	1.49
+++ seamonkey.spec	8 Jan 2009 09:26:58 -0000	1.50
@@ -12,7 +12,7 @@
 Name:           seamonkey
 Summary:        Web browser, e-mail, news, IRC client, HTML editor
 Version:        1.1.14
-Release:        3%{?dist}
+Release:        4%{?dist}
 URL:            http://www.mozilla.org/projects/seamonkey/
 License:        MPLv1.1
 Group:          Applications/Internet
@@ -146,6 +146,10 @@
 %build
 cd mozilla
 
+# Set up build flags (#468415)
+OPT_FLAGS="$RPM_OPT_FLAGS"
+OPT_FLAGS+=" -fno-strict-aliasing"
+
 XCFLAGS=-g \
 CFLAGS=-g \
 %ifarch ia64 ppc
@@ -157,11 +161,7 @@
 ./configure --prefix=%{_prefix} --libdir=%{_libdir} \
 --with-default-mozilla-five-home=%{mozdir} \
 --mandir=%{_mandir} \
-%ifarch i386
---enable-optimize="$RPM_OPT_FLAGS"" -O0" \
-%else
---enable-optimize="$RPM_OPT_FLAGS" \
-%endif
+--enable-optimize="$OPT_FLAGS"
 
 BUILD_OFFICIAL=1 MOZILLA_OFFICIAL=1 make export
 BUILD_OFFICIAL=1 MOZILLA_OFFICIAL=1 make %{?_smp_mflags} libs
@@ -437,6 +437,9 @@
 
 
 %changelog
+* Mon Jan 8 2009 Martin Stransky <stransky at redhat.com> 1.1.14-4
+- build with -fno-strict-aliasing (#468415)
+
 * Wed Jan 07 2009 Christopher Aillon <caillon at redhat.com> - 1.1.14-3
 - Disable the crash dialog
 



From pkgdb at fedoraproject.org  Thu Jan  8 09:31:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 08 Jan 2009 09:31:06 +0000
Subject: [pkgdb] libsyncml: heffer has requested commit
Message-ID: <20090108093106.A14E520831D@bastion.fedora.phx.redhat.com>

heffer has requested the commit acl on libsyncml (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libsyncml



From mmahut at fedoraproject.org  Thu Jan  8 09:45:37 2009
From: mmahut at fedoraproject.org (Marek Mahut)
Date: Thu,  8 Jan 2009 09:45:37 +0000 (UTC)
Subject: rpms/mod_scgi/devel import.log, NONE, 1.1 mod_scgi.spec, NONE,
	1.1 scgi.conf, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090108094537.66064700FD@cvs1.fedora.phx.redhat.com>

Author: mmahut

Update of /cvs/pkgs/rpms/mod_scgi/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5127/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log mod_scgi.spec scgi.conf 
Log Message:
initial import



--- NEW FILE import.log ---
mod_scgi-1_13-1_fc8:HEAD:mod_scgi-1.13-1.fc8.src.rpm:1231407878


--- NEW FILE mod_scgi.spec ---
%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}

Name:           mod_scgi
Version:        1.13
Release:        1%{?dist}
Summary:        Python implementation of the SCGI protocol

Group:          Applications/Internet
License:        CNRI
URL:            http://python.ca/scgi/
Source0:        http://python.ca/scgi/releases/scgi-%{version}.tar.gz
Source1:	scgi.conf
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  httpd-devel, python-devel, pcre-devel
Requires:       httpd-mmn = %(cat %{_includedir}/httpd/.mmn || echo missing)

%description
The SCGI protocol is a replacement for the Common Gateway
Interface (CGI) protocol. It is a standard for applications
to interface with HTTP servers. It is similar to FastCGI
but is designed to be easier to implement.

%prep
%setup -q -n scgi-%{version}


%build
CFLAGS="%{optflags}" %{__python} setup.py build
%{_sbindir}/apxs -c apache2/mod_scgi.c

%install
rm -rf $RPM_BUILD_ROOT
%{__python} setup.py install --root $RPM_BUILD_ROOT 
install -D -m 0755 apache2/.libs/mod_scgi.so  $RPM_BUILD_ROOT/%{_libdir}/httpd/modules/mod_scgi.so
install -D -m 644 %{SOURCE1} $RPM_BUILD_ROOT/%{_sysconfdir}/httpd/conf.d/scgi.conf
mkdir -p $RPM_BUILD_ROOT%{_bindir}
mv $RPM_BUILD_ROOT%{python_sitearch}/scgi/scgi_server.py $RPM_BUILD_ROOT%{_bindir}/scgi_server
mv $RPM_BUILD_ROOT%{python_sitearch}/scgi/quixote_handler.py $RPM_BUILD_ROOT%{_bindir}/quixote_handler


%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc CHANGES.txt LICENSE.txt README.txt doc/* scgi/test_passfd.py
%config(noreplace) %{_sysconfdir}/httpd/conf.d/scgi.conf
%if 0%{?fedora} > 8 
%{python_sitearch}/*egg-info
%endif 
%{python_sitearch}/scgi
%exclude %{python_sitearch}/scgi/test_passfd.py*
%{_bindir}/scgi_server
%{_bindir}/quixote_handler
%{_libdir}/httpd/modules/mod_scgi.so


%changelog
* Wed Nov 12 2008 Marek Mahut <mmahut at fedoraproject.org> - 1.13-1
- Initial build


--- NEW FILE scgi.conf ---
# (This actually better set up permanently with the command line
# "a2enmod scgi" but shown here for completeness)
LoadModule scgi_module modules/mod_scgi.so

# Set up a location to be served by an SCGI server process

# uncomment next line to serve SCGI process under /dynamic/
# SCGIMount /dynamic/ 127.0.0.1:4000


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mod_scgi/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	23 Dec 2008 02:41:27 -0000	1.1
+++ .cvsignore	8 Jan 2009 09:45:06 -0000	1.2
@@ -0,0 +1 @@
+scgi-1.13.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mod_scgi/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	23 Dec 2008 02:41:27 -0000	1.1
+++ sources	8 Jan 2009 09:45:06 -0000	1.2
@@ -0,0 +1 @@
+5cc79e59130ae9efc20388cc8ce906ba  scgi-1.13.tar.gz



From pkgdb at fedoraproject.org  Thu Jan  8 10:00:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 08 Jan 2009 10:00:14 +0000
Subject: [pkgdb] libsyncml had acl change status
Message-ID: <20090108100014.39E2920831F@bastion.fedora.phx.redhat.com>

rineau has set the commit acl on libsyncml (Fedora devel) to Approved for heffer

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libsyncml



From pkgdb at fedoraproject.org  Thu Jan  8 10:00:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 08 Jan 2009 10:00:21 +0000
Subject: [pkgdb] libsyncml ownership updated
Message-ID: <20090108100022.025CB208421@bastion.fedora.phx.redhat.com>

Package libsyncml in Fedora devel was orphaned by rineau

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libsyncml



From mmahut at fedoraproject.org  Thu Jan  8 10:04:20 2009
From: mmahut at fedoraproject.org (Marek Mahut)
Date: Thu,  8 Jan 2009 10:04:20 +0000 (UTC)
Subject: rpms/mod_scgi/F-10 mod_scgi.spec, NONE, 1.1 scgi.conf, NONE,
	1.1 sources, 1.1, 1.2
Message-ID: <20090108100420.0E8E5700FD@cvs1.fedora.phx.redhat.com>

Author: mmahut

Update of /cvs/pkgs/rpms/mod_scgi/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7577

Modified Files:
	sources 
Added Files:
	mod_scgi.spec scgi.conf 
Log Message:
inital import



--- NEW FILE mod_scgi.spec ---
%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}

Name:           mod_scgi
Version:        1.13
Release:        1%{?dist}
Summary:        Python implementation of the SCGI protocol

Group:          Applications/Internet
License:        CNRI
URL:            http://python.ca/scgi/
Source0:        http://python.ca/scgi/releases/scgi-%{version}.tar.gz
Source1:	scgi.conf
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  httpd-devel, python-devel, pcre-devel
Requires:       httpd-mmn = %(cat %{_includedir}/httpd/.mmn || echo missing)

%description
The SCGI protocol is a replacement for the Common Gateway
Interface (CGI) protocol. It is a standard for applications
to interface with HTTP servers. It is similar to FastCGI
but is designed to be easier to implement.

%prep
%setup -q -n scgi-%{version}


%build
CFLAGS="%{optflags}" %{__python} setup.py build
%{_sbindir}/apxs -c apache2/mod_scgi.c

%install
rm -rf $RPM_BUILD_ROOT
%{__python} setup.py install --root $RPM_BUILD_ROOT 
install -D -m 0755 apache2/.libs/mod_scgi.so  $RPM_BUILD_ROOT/%{_libdir}/httpd/modules/mod_scgi.so
install -D -m 644 %{SOURCE1} $RPM_BUILD_ROOT/%{_sysconfdir}/httpd/conf.d/scgi.conf
mkdir -p $RPM_BUILD_ROOT%{_bindir}
mv $RPM_BUILD_ROOT%{python_sitearch}/scgi/scgi_server.py $RPM_BUILD_ROOT%{_bindir}/scgi_server
mv $RPM_BUILD_ROOT%{python_sitearch}/scgi/quixote_handler.py $RPM_BUILD_ROOT%{_bindir}/quixote_handler


%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc CHANGES.txt LICENSE.txt README.txt doc/* scgi/test_passfd.py
%config(noreplace) %{_sysconfdir}/httpd/conf.d/scgi.conf
%if 0%{?fedora} > 8 
%{python_sitearch}/*egg-info
%endif 
%{python_sitearch}/scgi
%exclude %{python_sitearch}/scgi/test_passfd.py*
%{_bindir}/scgi_server
%{_bindir}/quixote_handler
%{_libdir}/httpd/modules/mod_scgi.so


%changelog
* Wed Nov 12 2008 Marek Mahut <mmahut at fedoraproject.org> - 1.13-1
- Initial build


--- NEW FILE scgi.conf ---
# (This actually better set up permanently with the command line
# "a2enmod scgi" but shown here for completeness)
LoadModule scgi_module modules/mod_scgi.so

# Set up a location to be served by an SCGI server process

# uncomment next line to serve SCGI process under /dynamic/
# SCGIMount /dynamic/ 127.0.0.1:4000


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mod_scgi/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	23 Dec 2008 02:41:27 -0000	1.1
+++ sources	8 Jan 2009 10:03:49 -0000	1.2
@@ -0,0 +1 @@
+5cc79e59130ae9efc20388cc8ce906ba  scgi-1.13.tar.gz



From kkofler at fedoraproject.org  Thu Jan  8 10:08:02 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Thu,  8 Jan 2009 10:08:02 +0000 (UTC)
Subject: rpms/kdepimlibs/F-10 .cvsignore, 1.27, 1.28 kdepimlibs.spec, 1.55, 
	1.56 sources, 1.28, 1.29
Message-ID: <20090108100802.B6E71700FD@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdepimlibs/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8041/F-10

Modified Files:
	.cvsignore kdepimlibs.spec sources 
Log Message:
* Thu Jan 08 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.4-1
- update to 4.1.4
- reenable system libical, #469228 reportedly fixed upstream now
- also use the system libical on F9


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdepimlibs/F-10/.cvsignore,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- .cvsignore	26 Sep 2008 19:39:33 -0000	1.27
+++ .cvsignore	8 Jan 2009 10:07:30 -0000	1.28
@@ -1 +1 @@
-kdepimlibs-4.1.2.tar.bz2
+kdepimlibs-4.1.4.tar.bz2


Index: kdepimlibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdepimlibs/F-10/kdepimlibs.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- kdepimlibs.spec	12 Nov 2008 13:20:35 -0000	1.55
+++ kdepimlibs.spec	8 Jan 2009 10:07:32 -0000	1.56
@@ -11,8 +11,7 @@
 %define rest 1
 #endif
 
-%if 0
-#if 0%{?fedora} > 9
+%if 0%{?fedora} >= 9
 # Use system libical (requires libical-devel >= 0.33)
 # Disabled for now because of #469228
 %define with_libical 1
@@ -20,7 +19,7 @@
 
 Name: kdepimlibs
 
-Version: 4.1.3
+Version: 4.1.4
 Release: 1%{?dist}
 Summary: K Desktop Environment 4 - PIM Libraries
 
@@ -48,10 +47,6 @@
 %endif
 %{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
 
-# work around circular dependency from kdelibs4-devel 
-# pulling in phonon-backend-xine
-#BuildRequires: phonon-backend-gstreamer
-
 ## upstream patches
 
 %if 0%{?apidocs}
@@ -186,6 +181,11 @@
 
 
 %changelog
+* Thu Jan 08 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.4-1
+- update to 4.1.4
+- reenable system libical, #469228 reportedly fixed upstream now
+- also use the system libical on F9
+
 * Wed Nov 12 2008 Than Ngo <than at redhat.com> 4.1.3-1
 - 4.1.3
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdepimlibs/F-10/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- sources	12 Nov 2008 13:20:35 -0000	1.28
+++ sources	8 Jan 2009 10:07:32 -0000	1.29
@@ -1 +1 @@
-e6db27f7074d31cdad26fb705ece2825  kdepimlibs-4.1.3.tar.bz2
+9546430309b1f34707bffdceec0fbc4b  kdepimlibs-4.1.4.tar.bz2



From kkofler at fedoraproject.org  Thu Jan  8 10:08:03 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Thu,  8 Jan 2009 10:08:03 +0000 (UTC)
Subject: rpms/kdepimlibs/F-9 kdepimlibs-4.1.2-system-libical.patch, NONE,
	1.1 .cvsignore, 1.23, 1.24 kdepimlibs.spec, 1.43, 1.44 sources,
	1.22, 1.23
Message-ID: <20090108100803.181FC700FD@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdepimlibs/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8041/F-9

Modified Files:
	.cvsignore kdepimlibs.spec sources 
Added Files:
	kdepimlibs-4.1.2-system-libical.patch 
Log Message:
* Thu Jan 08 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.4-1
- update to 4.1.4
- reenable system libical, #469228 reportedly fixed upstream now
- also use the system libical on F9

kdepimlibs-4.1.2-system-libical.patch:

--- NEW FILE kdepimlibs-4.1.2-system-libical.patch ---
diff -Nur kdepimlibs-4.1.2/cmake/modules/FindLibical.cmake kdepimlibs-4.1.2-system-libical/cmake/modules/FindLibical.cmake
--- kdepimlibs-4.1.2/cmake/modules/FindLibical.cmake	2008-05-21 13:05:50.000000000 +0200
+++ kdepimlibs-4.1.2-system-libical/cmake/modules/FindLibical.cmake	2008-10-27 08:51:37.000000000 +0100
@@ -1,29 +1,89 @@
 # Find Libical
 #
-#  LIBICAL_FOUND - system has Libical
-#  LIBICAL_INCLUDE_DIRS - the Libical include directory
+#  LIBICAL_FOUND - system has Libical with the minimum version needed
+#  LIBICAL_INCLUDE_DIRS - the Libical include directories
 #  LIBICAL_LIBRARIES - The libraries needed to use Libical
+#  LIBICAL_VERSION = The value of ICAL_VERSION defined in ical.h
 
 # Copyright (c) 2008, Allen Winter <winter at kde.org>
 #
 # Redistribution and use is allowed according to the terms of the BSD license.
 # For details see the accompanying COPYING-CMAKE-SCRIPTS file.
 
-SET (LIBICAL_FIND_REQUIRED ${Libical_FIND_REQUIRED})
-if (LIBICAL_INCLUDE_DIR AND LIBICAL_LIBRARIES)
+if(NOT LIBICAL_MIN_VERSION)
+  set(LIBICAL_MIN_VERSION "0.33")
+endif(NOT LIBICAL_MIN_VERSION)
+
+if (WIN32)
+  file(TO_CMAKE_PATH "$ENV{PROGRAMFILES}" _program_FILES_DIR)
+  string(REPLACE "\\" "/" _program_FILES_DIR "${_program_FILES_DIR}")
+endif(WIN32)
+
+set(LIBICAL_FIND_REQUIRED ${Libical_FIND_REQUIRED})
+if(LIBICAL_INCLUDE_DIRS AND LIBICAL_LIBRARIES)
 
   # Already in cache, be silent
   set(LIBICAL_FIND_QUIETLY TRUE)
 
-else (LIBICAL_INCLUDE_DIR AND LIBICAL_LIBRARIES)
+endif(LIBICAL_INCLUDE_DIRS AND LIBICAL_LIBRARIES)
+
+#set the root from the LIBICAL_BASE environment
+string(REPLACE "\\" "/" libical_root "$ENV{LIBICAL_BASE}")
+#override the root from LIBICAL_BASE defined to cmake
+if(DEFINED LIBICAL_BASE)
+  string(REPLACE "\\" "/" libical_root ${LIBICAL_BASE})
+endif(DEFINED LIBICAL_BASE)
+
+find_path(LIBICAL_INCLUDE_DIRS NAMES ical.h
+  PATH_SUFFIXES libical
+  PATHS ${libical_root}/include ${_program_FILES_DIR}/libical/include /usr/local/include /usr/include
+  NO_CMAKE_SYSTEM_PATH
+)
+
+find_library(LIBICAL_LIBRARY NAMES ical libical
+  PATHS ${libical_root}/lib ${_program_FILES_DIR}/libical/lib /usr/local/lib /usr/lib
+  NO_CMAKE_SYSTEM_PATH
+)
+find_library(LIBICALSS_LIBRARY NAMES icalss libicalss
+  PATHS ${libical_root}/lib ${_program_FILES_DIR}/libical/lib /usr/local/lib /usr/lib
+  NO_CMAKE_SYSTEM_PATH
+)
+set(LIBICAL_LIBRARIES ${LIBICAL_LIBRARY} ${LIBICALSS_LIBRARY})
+
+if(LIBICAL_INCLUDE_DIRS AND LIBICAL_LIBRARIES)
+  set(FIND_LIBICAL_VERSION_SOURCE
+    "#include <ical.h>\n int main()\n {\n printf(\"%s\",ICAL_VERSION);return 1;\n }\n")
+  set(FIND_LIBICAL_VERSION_SOURCE_FILE ${CMAKE_BINARY_DIR}/CMakeTmp/FindLIBICAL.cxx)
+  file(WRITE "${FIND_LIBICAL_VERSION_SOURCE_FILE}" "${FIND_LIBICAL_VERSION_SOURCE}")
+
+  set(FIND_LIBICAL_VERSION_ADD_INCLUDES
+    "-DINCLUDE_DIRECTORIES:STRING=${LIBICAL_INCLUDE_DIRS}")
+
+  try_run(RUN_RESULT COMPILE_RESULT
+    ${CMAKE_BINARY_DIR}
+    ${FIND_LIBICAL_VERSION_SOURCE_FILE}
+    CMAKE_FLAGS "${FIND_LIBICAL_VERSION_ADD_INCLUDES}"
+    RUN_OUTPUT_VARIABLE LIBICAL_VERSION)
+
+  if(COMPILE_RESULT AND RUN_RESULT EQUAL 1)
+    message(STATUS "Found Libical version ${LIBICAL_VERSION}")
+    macro_ensure_version(${LIBICAL_MIN_VERSION} ${LIBICAL_VERSION} LIBICAL_VERSION_OK)
+    if(NOT LIBICAL_VERSION_OK)
+      message(STATUS "Libcal version ${LIBICAL_VERSION} is too old. At least version ${LIBICAL_MIN_VERSION} is needed.")
+      set(LIBICAL_INCLUDE_DIRS "")
+      set(LIBICAL_LIBRARIES "")
+    endif(NOT LIBICAL_VERSION_OK)
+  else(COMPILE_RESULT AND RUN_RESULT EQ 1)
+    #Enable this line the 13 october
+    #message(FATAL_ERROR "Unable to compile or run the libical version detection program.")
+    #Delete this line the 13 october
+    message(STATUS "Unable to compile or run the libical version detection program.")
+  endif(COMPILE_RESULT AND RUN_RESULT EQUAL 1)
 
-  find_path(LIBICAL_INCLUDE_DIR ical.h)
-  find_library(LIBICAL_LIBRARIES NAMES ical )
+endif(LIBICAL_INCLUDE_DIRS AND LIBICAL_LIBRARIES)
 
-  include(FindPackageHandleStandardArgs)
-  FIND_PACKAGE_HANDLE_STANDARD_ARGS(LIBICAL DEFAULT_MSG
-                                    LIBICAL_LIBRARIES LIBICAL_INCLUDE_DIR)
+include(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(LIBICAL DEFAULT_MSG LIBICAL_LIBRARIES LIBICAL_INCLUDE_DIRS)
 
-  mark_as_advanced(LIBICAL_INCLUDE_DIR LIBICAL_LIBRARIES)
+mark_as_advanced(LIBICAL_INCLUDE_DIRS LIBICAL_LIBRARIES)
 
-endif (LIBICAL_INCLUDE_DIR AND LIBICAL_LIBRARIES)
diff -Nur kdepimlibs-4.1.2/kcal/CMakeLists.txt kdepimlibs-4.1.2-system-libical/kcal/CMakeLists.txt
--- kdepimlibs-4.1.2/kcal/CMakeLists.txt	2008-07-03 07:05:12.000000000 +0200
+++ kdepimlibs-4.1.2-system-libical/kcal/CMakeLists.txt	2008-10-27 08:56:38.000000000 +0100
@@ -1,209 +1,32 @@
 project(kcal)
 
-# was used by libical, but not anymore
-#if (UNIX)
-#  add_definitions(-DICAL_UNIX_NEWLINE=1)
-#endif (UNIX)
-
-add_definitions(-DPACKAGE_DATA_DIR=\\""${DATA_INSTALL_DIR}/libical"\\" ) # added manually
+find_package(Libical REQUIRED)
 
 add_definitions(-DKDE_DEFAULT_DEBUG_AREA=5800)
 
 include (ConfigureChecks.cmake)
-configure_file (libical/config-libical.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/libical/config-libical.h)
 
 if(KDE4_BUILD_TESTS)
     add_definitions(-DCOMPILING_TESTS)
 endif(KDE4_BUILD_TESTS)
 
 include_directories(
-	${CMAKE_CURRENT_SOURCE_DIR}/libical/src/libicalss/
-	${CMAKE_CURRENT_BINARY_DIR}/libical/src/libicalss/
+	${LIBICAL_INCLUDE_DIRS}
 	${CMAKE_CURRENT_SOURCE_DIR}/versit/
-	${CMAKE_CURRENT_SOURCE_DIR}/libical/src/libical/
-	${CMAKE_CURRENT_BINARY_DIR}/libical/src/libical/
-	${CMAKE_CURRENT_BINARY_DIR}/libical # for config.h
-	${CMAKE_SOURCE_DIR}
+	${CMAKE_CURRENT_SOURCE_DIR}
 	${CMAKE_SOURCE_DIR}/kabc
 	${CMAKE_BINARY_DIR}/kabc
         ${KDE4_INCLUDE_DIR}
 )
 
-set(ICALSCRIPTS ${CMAKE_SOURCE_DIR}/kcal/libical/scripts/ )
-
-set(PROPERTYDEPS 
-        ${ICALSCRIPTS}/mkderivedproperties.pl 
-        ${CMAKE_SOURCE_DIR}/kcal/libical/design-data/properties.csv	
-        ${CMAKE_SOURCE_DIR}/kcal/libical/design-data/value-types.csv
-        ${CMAKE_SOURCE_DIR}/kcal/libical/src/libical/icalderivedproperty.h.in 
-        ${CMAKE_SOURCE_DIR}/kcal/libical/src/libical/icalderivedproperty.c.in 
-)
-
-add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/kcal/libical/icalderivedproperty.h
-                   COMMAND ${PERL_EXECUTABLE} -I ${ICALSCRIPTS} ${ICALSCRIPTS}/mkderivedproperties.pl -i
-                           ${CMAKE_SOURCE_DIR}/kcal/libical/src/libical/icalderivedproperty.h.in
-                           -h  ${CMAKE_SOURCE_DIR}/kcal/libical/design-data/properties.csv 
-                           ${CMAKE_SOURCE_DIR}/kcal/libical/design-data/value-types.csv > ${CMAKE_BINARY_DIR}/kcal/libical/icalderivedproperty.h
-                   DEPENDS  ${PROPERTYDEPS} )
-
-
-add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/kcal/libical/icalderivedproperty.c
-                   COMMAND ${PERL_EXECUTABLE} -I${ICALSCRIPTS} ${ICALSCRIPTS}/mkderivedproperties.pl -i
-                           ${CMAKE_SOURCE_DIR}/kcal/libical/src/libical/icalderivedproperty.c.in
-                           -c ${CMAKE_SOURCE_DIR}/kcal/libical/design-data/properties.csv
-                           ${CMAKE_SOURCE_DIR}/kcal/libical/design-data/value-types.csv > ${CMAKE_BINARY_DIR}/kcal/libical/icalderivedproperty.c
-                   DEPENDS  ${PROPERTYDEPS} ${CMAKE_BINARY_DIR}/kcal/libical/icalderivedproperty.h )
-
-
-# files generated via add_custom_command are added automatically to the clean files, Alex
-#macro_additional_clean_files( 
-#                              ${CMAKE_BINARY_DIR}/kcal/libical/icalderivedproperty.c 
-#                              ${CMAKE_BINARY_DIR}/kcal/libical/icalderivedproperty.h 
-#)
-
-
-set(PARAMETERDEPS 
-	${ICALSCRIPTS}/mkderivedparameters.pl 
-	${CMAKE_SOURCE_DIR}/kcal/libical/design-data/parameters.csv 
-	${CMAKE_SOURCE_DIR}/kcal/libical/src/libical/icalderivedparameter.c.in
-	${CMAKE_SOURCE_DIR}/kcal/libical/src/libical/icalderivedparameter.h.in
-)
-
-add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/kcal/libical/icalderivedparameter.h
-                   COMMAND ${PERL_EXECUTABLE} -I ${ICALSCRIPTS} ${ICALSCRIPTS}/mkderivedparameters.pl -i ${CMAKE_SOURCE_DIR}/kcal/libical/src/libical/icalderivedparameter.h.in 
-                           -h ${CMAKE_SOURCE_DIR}/kcal/libical/design-data/parameters.csv > ${CMAKE_BINARY_DIR}/kcal/libical/icalderivedparameter.h
-                   DEPENDS  ${PARAMETERDEPS} )
-
-add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/kcal/libical/icalderivedparameter.c
-                   COMMAND ${PERL_EXECUTABLE} -I ${ICALSCRIPTS} ${ICALSCRIPTS}/mkderivedparameters.pl -i ${CMAKE_SOURCE_DIR}/kcal/libical/src/libical/icalderivedparameter.c.in 
-                           -c ${CMAKE_SOURCE_DIR}/kcal/libical/design-data/parameters.csv > ${CMAKE_BINARY_DIR}/kcal/libical/icalderivedparameter.c
-                   DEPENDS  ${PARAMETERDEPS} ${CMAKE_BINARY_DIR}/kcal/libical/icalderivedparameter.h )
-
-#files generated via add_custom_command are added automatically to the clean files, Alex
-#macro_additional_clean_files( 
-#	${CMAKE_BINARY_DIR}/kcal/libical/icalderivedparameter.c 
-#	${CMAKE_BINARY_DIR}/kcal/libical/icalderivedparameter.h 
-#)
-
-
-set(RESTRICTIONDEPS 
-	${ICALSCRIPTS}/mkrestrictiontable.pl
-	${CMAKE_SOURCE_DIR}/kcal/libical/design-data/restrictions.csv
-	${CMAKE_SOURCE_DIR}/kcal/libical/src/libical/icalrestriction.c.in
-)
-
-add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/kcal/libical/src/libical/icalrestriction.c
-                   COMMAND ${PERL_EXECUTABLE} -I ${ICALSCRIPTS} ${ICALSCRIPTS}/mkrestrictiontable.pl -i ${CMAKE_SOURCE_DIR}/kcal/libical/src/libical/icalrestriction.c.in 
-                           ${CMAKE_SOURCE_DIR}/kcal/libical/design-data/restrictions.csv > ${CMAKE_BINARY_DIR}/kcal/libical/src/libical/icalrestriction.c   
-                   DEPENDS  ${RESTRICTIONDEPS} )
-
-
-#files generated via add_custom_command are added automatically to the clean files, Alex
-#macro_additional_clean_files( ${CMAKE_BINARY_DIR}/kcal/libical/src/libical/icalrestriction.c)
-
-set(VALUEDEPS
-	${CMAKE_SOURCE_DIR}/kcal/libical/scripts/mkderivedvalues.pl
-	${CMAKE_SOURCE_DIR}/kcal/libical/design-data/value-types.csv
-	${CMAKE_SOURCE_DIR}/kcal/libical/src/libical/icalderivedvalue.c.in
-	${CMAKE_SOURCE_DIR}/kcal/libical/src/libical/icalderivedvalue.h.in
-)
-
-add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/kcal/libical/icalderivedvalue.h 
-                   COMMAND ${PERL_EXECUTABLE} -I${ICALSCRIPTS} ${ICALSCRIPTS}/mkderivedvalues.pl -i ${CMAKE_SOURCE_DIR}/kcal/libical/src/libical/icalderivedvalue.h.in -h ${CMAKE_SOURCE_DIR}/kcal/libical/design-data/value-types.csv > ${CMAKE_BINARY_DIR}/kcal/libical/icalderivedvalue.h   
-                   DEPENDS  ${VALUEDEPS} )
-
-
-add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/kcal/libical/icalderivedvalue.c 
-                   COMMAND ${PERL_EXECUTABLE} -I${ICALSCRIPTS} ${ICALSCRIPTS}/mkderivedvalues.pl -i ${CMAKE_SOURCE_DIR}/kcal/libical/src/libical/icalderivedvalue.c.in -c ${CMAKE_SOURCE_DIR}/kcal/libical/design-data/value-types.csv > ${CMAKE_BINARY_DIR}/kcal/libical/icalderivedvalue.c   
-                   DEPENDS  ${VALUEDEPS} ${CMAKE_BINARY_DIR}/kcal/libical/icalderivedvalue.h )
-
-#files generated via add_custom_command are added automatically to the clean files, Alex
-#macro_additional_clean_files(
-#	${CMAKE_BINARY_DIR}/kcal/libical/icalderivedvalue.h
-#	${CMAKE_BINARY_DIR}/kcal/libical/icalderivedvalue.c
-#)
-
-
-
 set(libversit_SRCS 
    ${CMAKE_SOURCE_DIR}/kcal/versit/vcc.c 
    ${CMAKE_SOURCE_DIR}/kcal/versit/vobject.c 
 )
 
-# Keep absolute paths here, they are used in tests/CMakeLists.txt too.
-set(libical_SRCS
-   ${CMAKE_SOURCE_DIR}/kcal/libical/src/libical/caldate.c       
-   ${CMAKE_SOURCE_DIR}/kcal/libical/src/libical/icalarray.c     
-   ${CMAKE_SOURCE_DIR}/kcal/libical/src/libical/icalattach.c        
-   ${CMAKE_BINARY_DIR}/kcal/libical/icalderivedparameter.c  
-   ${CMAKE_SOURCE_DIR}/kcal/libical/src/libical/icalrecur.c     
-   ${CMAKE_BINARY_DIR}/kcal/libical/src/libical/icalrestriction.c   
-   ${CMAKE_SOURCE_DIR}/kcal/libical/src/libical/icalcomponent.c     
-   ${CMAKE_SOURCE_DIR}/kcal/libical/src/libical/icalenums.c     
-   ${CMAKE_SOURCE_DIR}/kcal/libical/src/libical/icalerror.c     
-   ${CMAKE_SOURCE_DIR}/kcal/libical/src/libical/icalmemory.c        
-   ${CMAKE_SOURCE_DIR}/kcal/libical/src/libical/icalmime.c      
-   ${CMAKE_SOURCE_DIR}/kcal/libical/src/libical/icalparameter.c    
-   ${CMAKE_SOURCE_DIR}/kcal/libical/src/libical/icalparser.c        
-   ${CMAKE_BINARY_DIR}/kcal/libical/icalderivedproperty.c   
-   ${CMAKE_SOURCE_DIR}/kcal/libical/src/libical/icalproperty.c      
-   ${CMAKE_SOURCE_DIR}/kcal/libical/src/libical/icaltime.c      
-   ${CMAKE_SOURCE_DIR}/kcal/libical/src/libical/icalduration.c      
-   ${CMAKE_SOURCE_DIR}/kcal/libical/src/libical/icalperiod.c        
-   ${CMAKE_SOURCE_DIR}/kcal/libical/src/libical/icaltimezone.c      
-   ${CMAKE_SOURCE_DIR}/kcal/libical/src/libical/icaltypes.c     
-   ${CMAKE_SOURCE_DIR}/kcal/libical/src/libical/icalvalue.c     
-   ${CMAKE_BINARY_DIR}/kcal/libical/icalderivedvalue.c  
-   ${CMAKE_SOURCE_DIR}/kcal/libical/src/libical/pvl.c           
-   ${CMAKE_SOURCE_DIR}/kcal/libical/src/libical/sspm.c          
-   ${CMAKE_SOURCE_DIR}/kcal/libical/src/libical/vsnprintf.c     
-)
-
-set(libicalss_SRCS
-   ${CMAKE_SOURCE_DIR}/kcal/libical/src/libicalss/icalclassify.c
-   ${CMAKE_SOURCE_DIR}/kcal/libical/src/libicalss/icalclassify.h
-)
-
-
-macro_additional_clean_files(${CMAKE_BINARY_DIR}/kcal/libical/src/libical/ical.h)
-
-if(WIN32)
-  set(TOPS "\"${CMAKE_SOURCE_DIR}\"")
-  set(TOPB "\"${CMAKE_BINARY_DIR}\"")
-else(WIN32)
-  set(TOPS "${CMAKE_SOURCE_DIR}")
-  set(TOPB "${CMAKE_BINARY_DIR}")
-endif(WIN32)
-
-add_custom_command(OUTPUT
-   ${CMAKE_BINARY_DIR}/kcal/libical/src/libical/ical.h 
-   COMMAND 
-   ${CMAKE_COMMAND} 
-   -DTOPS:FILEPATH=${TOPS}
-   -DTOPB:FILEPATH=${TOPB}
-   -DKDE_FILE_H_FILE:FILEPATH=${CMAKE_BINARY_DIR}/kcal/libical/src/libical/ical.h
-   -P ${CMAKE_SOURCE_DIR}/kcal/ical_file.cmake
-   DEPENDS
-   ${CMAKE_BINARY_DIR}/kcal/libical/icalderivedproperty.h
-   ${CMAKE_BINARY_DIR}/kcal/libical/icalderivedparameter.h
-   ${CMAKE_BINARY_DIR}/kcal/libical/icalderivedvalue.h
-)
-
-macro_additional_clean_files(${CMAKE_BINARY_DIR}/libical/src/libicalss/icalss.h)
-
-add_custom_command(OUTPUT
-   ${CMAKE_BINARY_DIR}/kcal/libical/src/libicalss/icalss.h 
-   COMMAND 
-   ${CMAKE_COMMAND} 
-   -DTOP:FILEPATH=${TOPS}
-   -DKDE_FILE_H_FILE:FILEPATH=${CMAKE_BINARY_DIR}/kcal/libical/src/libicalss/icalss.h
-   -P ${CMAKE_SOURCE_DIR}/kcal/icalss_file.cmake
-)
-
-
 ########### next target ###############
 
-set(kcal_LIB_SRCS ${libversit_SRCS} ${libical_SRCS} ${libicalss_SRCS}
+set(kcal_LIB_SRCS ${libversit_SRCS}
    incidencebase.cpp
    incidence.cpp
    journal.cpp
@@ -258,18 +81,11 @@
 
 kde4_add_library(kcal SHARED ${kcal_LIB_SRCS})
 
-target_link_libraries(kcal ${KDE4_KDEUI_LIBS} ${KDE4_KIO_LIBS} ${QT_QTXML_LIBRARY} kresources kabc kpimutils )
+target_link_libraries(kcal ${KDE4_KDEUI_LIBS} ${KDE4_KIO_LIBS} ${QT_QTXML_LIBRARY} kresources kabc kpimutils ${LIBICAL_LIBRARIES})
 
 set_target_properties(kcal PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION})
 install(TARGETS kcal ${INSTALL_TARGETS_DEFAULT_ARGS} COMPONENT Devel)
 
-# hack to force ical[ss].h creation
-add_custom_target(ical-headers DEPENDS
-        ${CMAKE_BINARY_DIR}/kcal/libical/src/libical/ical.h
-        ${CMAKE_BINARY_DIR}/kcal/libical/src/libicalss/icalss.h
-)
-add_dependencies(kcal ical-headers)
-
 ########### next target ###############
 
 set(kcal_local_PART_SRCS resourcelocal_plugin.cpp )
@@ -296,7 +112,6 @@
 install(TARGETS kcal_localdir  DESTINATION ${PLUGIN_INSTALL_DIR})
 
 
-add_subdirectory( libical )
 add_subdirectory( tests )
 
 ########### install files ###############
diff -Nur kdepimlibs-4.1.2/kcal/tests/CMakeLists.txt kdepimlibs-4.1.2-system-libical/kcal/tests/CMakeLists.txt
--- kdepimlibs-4.1.2/kcal/tests/CMakeLists.txt	2008-06-03 11:34:13.000000000 +0200
+++ kdepimlibs-4.1.2-system-libical/kcal/tests/CMakeLists.txt	2008-10-27 08:49:28.000000000 +0100
@@ -2,20 +2,20 @@
 
 include_directories(
  ${CMAKE_SOURCE_DIR}/kcal
- ${CMAKE_BINARY_DIR}/kcal/libical/src
+ ${LIBICAL_INCLUDE_DIRS}
 )
 
 MACRO(KCAL_UNIT_TESTS)
   FOREACH(_testname ${ARGN})
     kde4_add_unit_test(${_testname} NOGUI ${_testname}.cpp)
-    target_link_libraries(${_testname} ${KDE4_KDECORE_LIBS} kcal ${QT_QTTEST_LIBRARY})
+    target_link_libraries(${_testname} ${KDE4_KDECORE_LIBS} kcal ${QT_QTTEST_LIBRARY} ${LIBICAL_LIBRARIES})
   ENDFOREACH(_testname)
 ENDMACRO(KCAL_UNIT_TESTS)
 
 MACRO(KCAL_EXECUTABLE_TESTS)
   FOREACH(_testname ${ARGN})
     kde4_add_executable(${_testname} NOGUI TEST ${_testname}.cpp)
-    target_link_libraries(${_testname} ${KDE4_KDECORE_LIBS} kcal ${QT_QTTEST_LIBRARY})
+    target_link_libraries(${_testname} ${KDE4_KDECORE_LIBS} kcal ${QT_QTTEST_LIBRARY} ${LIBICAL_LIBRARIES})
   ENDFOREACH(_testname)
 ENDMACRO(KCAL_EXECUTABLE_TESTS)
 
@@ -82,32 +82,32 @@
 
 FOREACH( file ${testFiles} )
   GET_FILENAME_COMPONENT( fn ${file} NAME)
-  ADD_TEST( RecurNext-${fn} ${CMAKE_CURRENT_SOURCE_DIR}/runsingletestcase.pl ${EXECUTABLE_OUTPUT_PATH}/testrecurrence "next" ${file} )
+  ADD_TEST( RecurNext-${fn} ${CMAKE_CURRENT_SOURCE_DIR}/runsingletestcase.pl ${EXECUTABLE_OUTPUT_PATH}/testrecurrence.shell "next" ${file} )
 ENDFOREACH(file)
 
 FOREACH( file ${testFiles} )
   GET_FILENAME_COMPONENT( fn ${file} NAME)
-  ADD_TEST( RecurPrev-${fn} ${CMAKE_CURRENT_SOURCE_DIR}/runsingletestcase.pl ${EXECUTABLE_OUTPUT_PATH}/testrecurprevious "prev" ${file} )
+  ADD_TEST( RecurPrev-${fn} ${CMAKE_CURRENT_SOURCE_DIR}/runsingletestcase.pl ${EXECUTABLE_OUTPUT_PATH}/testrecurprevious.shell "prev" ${file} )
 ENDFOREACH(file)
 
 FOREACH( file ${testFiles} )
   GET_FILENAME_COMPONENT( fn ${file} NAME)
-  ADD_TEST( RecursOn-${fn} ${CMAKE_CURRENT_SOURCE_DIR}/runsingletestcase.pl ${EXECUTABLE_OUTPUT_PATH}/testrecurson "recurson" ${file} )
+  ADD_TEST( RecursOn-${fn} ${CMAKE_CURRENT_SOURCE_DIR}/runsingletestcase.pl ${EXECUTABLE_OUTPUT_PATH}/testrecurson.shell "recurson" ${file} )
 ENDFOREACH(file)
 
 FOREACH( file ${compatFiles} )
   GET_FILENAME_COMPONENT( fn ${file} NAME)
-  ADD_TEST( Compat-${fn} ${CMAKE_CURRENT_SOURCE_DIR}/runsingletestcase.pl ${EXECUTABLE_OUTPUT_PATH}/readandwrite "ical" ${file} )
+  ADD_TEST( Compat-${fn} ${CMAKE_CURRENT_SOURCE_DIR}/runsingletestcase.pl ${EXECUTABLE_OUTPUT_PATH}/readandwrite.shell "ical" ${file} )
 ENDFOREACH(file)
 
 FOREACH( file ${vCalFilesAsIcal} )
   GET_FILENAME_COMPONENT( fn ${file} NAME)
-  ADD_TEST( VCalOut-${fn} ${CMAKE_CURRENT_SOURCE_DIR}/runsingletestcase.pl ${EXECUTABLE_OUTPUT_PATH}/testvcalexport "vcal" ${file} )
+  ADD_TEST( VCalOut-${fn} ${CMAKE_CURRENT_SOURCE_DIR}/runsingletestcase.pl ${EXECUTABLE_OUTPUT_PATH}/testvcalexport.shell "vcal" ${file} )
 ENDFOREACH(file)
 
 FOREACH( file ${vCalFiles} )
   GET_FILENAME_COMPONENT( fn ${file} NAME)
-  ADD_TEST( VCalIn-${fn} ${CMAKE_CURRENT_SOURCE_DIR}/runsingletestcase.pl ${EXECUTABLE_OUTPUT_PATH}/readandwrite "ical" ${file} )
+  ADD_TEST( VCalIn-${fn} ${CMAKE_CURRENT_SOURCE_DIR}/runsingletestcase.pl ${EXECUTABLE_OUTPUT_PATH}/readandwrite.shell "ical" ${file} )
 ENDFOREACH(file)
 
 # ADD_TEST( TestRecurrence  runtestcase.pl testrecurrence    "next" ${CMAKE_CURRENT_SOURCE_DIR} data/RecurrenceRule/ "*.ics" )
diff -Nur kdepimlibs-4.1.2/kcal/tests/data/vCalendar/KOrganizer_vCalTestCase04.ics.vcal.ref kdepimlibs-4.1.2-system-libical/kcal/tests/data/vCalendar/KOrganizer_vCalTestCase04.ics.vcal.ref
--- kdepimlibs-4.1.2/kcal/tests/data/vCalendar/KOrganizer_vCalTestCase04.ics.vcal.ref	2008-01-05 00:53:12.000000000 +0100
+++ kdepimlibs-4.1.2-system-libical/kcal/tests/data/vCalendar/KOrganizer_vCalTestCase04.ics.vcal.ref	2008-10-27 08:44:14.000000000 +0100
@@ -9,7 +9,7 @@
 SEQUENCE:4
 LAST-MODIFIED:20050520T105750Z
 X-ORGANIZER:MAILTO:reinhold at kainhofer.com
-RRULE:MD3 20 20060630T000000
+RRULE:MD3 20 20060630T040000
 SUMMARY:20. Mai 2005, 16-17 Uhr, alle 3 Monate am 20., bis 30. Juni 2006
 CLASS:PUBLIC
 PRIORITY:5
diff -Nur kdepimlibs-4.1.2/kcal/tests/data/vCalendar/KOrganizer_vCalTestCase05.ics.vcal.ref kdepimlibs-4.1.2-system-libical/kcal/tests/data/vCalendar/KOrganizer_vCalTestCase05.ics.vcal.ref
--- kdepimlibs-4.1.2/kcal/tests/data/vCalendar/KOrganizer_vCalTestCase05.ics.vcal.ref	2008-01-05 00:53:12.000000000 +0100
+++ kdepimlibs-4.1.2-system-libical/kcal/tests/data/vCalendar/KOrganizer_vCalTestCase05.ics.vcal.ref	2008-10-27 08:44:36.000000000 +0100
@@ -9,7 +9,7 @@
 SEQUENCE:2
 LAST-MODIFIED:20050520T105740Z
 X-ORGANIZER:MAILTO:reinhold at kainhofer.com
-RRULE:W2 MO WE FR 20050630T000000
+RRULE:W2 MO WE FR 20050630T040000
 SUMMARY:20. Mai 2005, 14-15 Uhr, alle 2 Wochen am Mo/Mi/Fr, bis 30. Juni 2005
 CLASS:PUBLIC
 PRIORITY:5
diff -Nur kdepimlibs-4.1.2/kcal/tests/data/vCalendar/KOrganizer_vCalTestCase12.ics.vcal.ref kdepimlibs-4.1.2-system-libical/kcal/tests/data/vCalendar/KOrganizer_vCalTestCase12.ics.vcal.ref
--- kdepimlibs-4.1.2/kcal/tests/data/vCalendar/KOrganizer_vCalTestCase12.ics.vcal.ref	2008-01-05 00:53:12.000000000 +0100
+++ kdepimlibs-4.1.2-system-libical/kcal/tests/data/vCalendar/KOrganizer_vCalTestCase12.ics.vcal.ref	2008-10-27 08:45:07.000000000 +0100
@@ -9,7 +9,7 @@
 SEQUENCE:1
 LAST-MODIFIED:20050520T104819Z
 X-ORGANIZER:MAILTO:reinhold at kainhofer.com
-RRULE:D3 20050630T000000
+RRULE:D3 20050630T040000
 SUMMARY:20. Mai 2005, 13-14 Uhr, alle 3 Tage, bis 30. Juni 2005
 CLASS:PUBLIC
 PRIORITY:5
diff -Nur kdepimlibs-4.1.2/kcal/tests/data/vCalendar/KOrganizer_vCalTestCase13.ics.vcal.ref kdepimlibs-4.1.2-system-libical/kcal/tests/data/vCalendar/KOrganizer_vCalTestCase13.ics.vcal.ref
--- kdepimlibs-4.1.2/kcal/tests/data/vCalendar/KOrganizer_vCalTestCase13.ics.vcal.ref	2008-01-05 00:53:12.000000000 +0100
+++ kdepimlibs-4.1.2-system-libical/kcal/tests/data/vCalendar/KOrganizer_vCalTestCase13.ics.vcal.ref	2008-10-27 09:04:55.000000000 +0100
@@ -9,7 +9,7 @@
 SEQUENCE:1
 LAST-MODIFIED:20050520T105327Z
 X-ORGANIZER:MAILTO:reinhold at kainhofer.com
-RRULE:MP3 1- TH 20061231T000000
+RRULE:MP3 1- TH 20061231T050000
 SUMMARY:20. Mai 2005, 20-21 Uhr, alle 3 Monate am letzten Do, bis 31. 12. 2006
 CLASS:PUBLIC
 PRIORITY:5
diff -Nur kdepimlibs-4.1.2/kcal/tests/testicaltimezones.cpp kdepimlibs-4.1.2-system-libical/kcal/tests/testicaltimezones.cpp
--- kdepimlibs-4.1.2/kcal/tests/testicaltimezones.cpp	2008-01-05 00:53:16.000000000 +0100
+++ kdepimlibs-4.1.2-system-libical/kcal/tests/testicaltimezones.cpp	2008-10-27 08:40:27.000000000 +0100
@@ -33,7 +33,7 @@
 QTEST_KDEMAIN( ICalTimeZonesTest, NoGUI )
 
 extern "C" {
-  #include "kcal/libical/src/libical/ical.h"
+  #include <ical.h>
 }
 #include "kcal/icaltimezones.h"
 using namespace KCal;
@@ -72,22 +72,22 @@
   "TZOFFSETFROM:-0400\r\n"
   "TZOFFSETTO:-0500\r\n"
   "TZNAME:WST\r\n"
-  "END:STANDARD\r\n\r\n"
+  "END:STANDARD\r\n"
   "BEGIN:DAYLIGHT\r\n"
   "DTSTART:19870405T020000\r\n"
   "RRULE:FREQ=YEARLY;UNTIL=19970406T070000Z;BYDAY=1SU;BYMONTH=4\r\n"
   "TZOFFSETFROM:-0500\r\n"
   "TZOFFSETTO:-0400\r\n"
   "TZNAME:WDT1\r\n"
-  "END:DAYLIGHT\r\n\r\n"
+  "END:DAYLIGHT\r\n"
   "BEGIN:DAYLIGHT\r\n"
   "DTSTART:19990425T020000\r\n"
   "RDATE;VALUE=DATE-TIME:20000430T020000\r\n"
   "TZOFFSETFROM:-0500\r\n"
   "TZOFFSETTO:-0400\r\n"
   "TZNAME:WDT2\r\n"
-  "END:DAYLIGHT\r\n\r\n"
-  "END:VTIMEZONE\r\n\r\n";
+  "END:DAYLIGHT\r\n"
+  "END:VTIMEZONE\r\n";
 
 // Standard time only
 static const char *VTZ_other =
@@ -101,8 +101,8 @@
   "TZOFFSETFROM:+0000\r\n"
   "TZOFFSETTO:+0300\r\n"
   "TZNAME:OST\r\n"
-  "END:STANDARD\r\n\r\n"
-  "END:VTIMEZONE\r\n\r\n";
+  "END:STANDARD\r\n"
+  "END:VTIMEZONE\r\n";
 
 // CALENDAR component header and footer
 static const char *calendarHeader =
@@ -183,6 +183,7 @@
     QCOMPARE(tz.vtimezone(), QByteArray(VTZ_Western));
 
     ICalTimeZone tz1(tz);
+
     QCOMPARE(tz1.name(), tz.name());
     QCOMPARE(tz1.url(), tz.url());
     QCOMPARE(tz1.city(), tz.city());


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdepimlibs/F-9/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- .cvsignore	4 Nov 2008 15:41:44 -0000	1.23
+++ .cvsignore	8 Jan 2009 10:07:32 -0000	1.24
@@ -1 +1 @@
-kdepimlibs-4.1.3.tar.bz2
+kdepimlibs-4.1.4.tar.bz2


Index: kdepimlibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdepimlibs/F-9/kdepimlibs.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- kdepimlibs.spec	4 Nov 2008 15:41:44 -0000	1.43
+++ kdepimlibs.spec	8 Jan 2009 10:07:32 -0000	1.44
@@ -11,9 +11,15 @@
 %define rest 1
 #endif
 
+%if 0%{?fedora} >= 9
+# Use system libical (requires libical-devel >= 0.33)
+# Disabled for now because of #469228
+%define with_libical 1
+%endif
+
 Name: kdepimlibs
 
-Version: 4.1.3
+Version: 4.1.4
 Release: 1%{?dist}
 Summary: K Desktop Environment 4 - PIM Libraries
 
@@ -21,7 +27,9 @@
 Group: System Environment/Libraries
 
 URL: http://www.kde.org/
-Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdepimlibs-%{version}.tar.bz2
+Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdepimlibs-%{version}.tar.bz2
+# Use system libical (will be in 4.2)
+Patch100:      kdepimlibs-4.1.2-system-libical.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires: kdelibs4 >= %{version}
@@ -34,12 +42,11 @@
 BuildRequires: kdelibs4-devel >= %{version}
 BuildRequires: libXpm-devel libXtst-devel
 BuildRequires: openldap-devel
+%if 0%{?with_libical}
+BuildRequires: libical-devel >= 0.33
+%endif
 %{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
 
-# work around circular dependency from kdelibs4-devel 
-# pulling in phonon-backend-xine
-#BuildRequires: phonon-backend-gstreamer
-
 ## upstream patches
 
 %if 0%{?apidocs}
@@ -76,6 +83,11 @@
 
 %prep
 %setup -q -n kdepimlibs-%{version}
+%if 0%{?with_libical}
+# use system libical
+%patch100 -p1
+rm -rf kcal/libical
+%endif
 
 
 %build
@@ -141,7 +153,9 @@
 %defattr(-,root,root,-)
 %{_kde4_appsdir}/akonadi-kde/
 %{_kde4_appsdir}/kabc/
+%if !0%{?with_libical}
 %{_kde4_appsdir}/libical/
+%endif
 %{_kde4_appsdir}/kconf_update/*
 %{_kde4_datadir}/config.kcfg/*
 %{_datadir}/dbus-1/interfaces/*
@@ -167,8 +181,19 @@
 
 
 %changelog
-* Tue Nov  4 2008 Luk???? Tinkl <ltinkl at redhat.com> 4.1.3-1
-- KDE 4.1.3
+* Thu Jan 08 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.4-1
+- update to 4.1.4
+- reenable system libical, #469228 reportedly fixed upstream now
+- also use the system libical on F9
+
+* Wed Nov 12 2008 Than Ngo <than at redhat.com> 4.1.3-1
+- 4.1.3
+
+* Sat Nov 01 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.2-4
+- turn off system libical for now, crashes KOrganizer (#469228)
+
+* Tue Oct 28 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.2-3
+- build against the system libical (F10+ only for now)
 
 * Sun Sep 28 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-2
 - make VERBOSE=1


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdepimlibs/F-9/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- sources	4 Nov 2008 15:41:44 -0000	1.22
+++ sources	8 Jan 2009 10:07:32 -0000	1.23
@@ -1 +1 @@
-e6db27f7074d31cdad26fb705ece2825  kdepimlibs-4.1.3.tar.bz2
+9546430309b1f34707bffdceec0fbc4b  kdepimlibs-4.1.4.tar.bz2



From kkofler at fedoraproject.org  Thu Jan  8 10:20:59 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Thu,  8 Jan 2009 10:20:59 +0000 (UTC)
Subject: rpms/kdepimlibs/F-10 kdepimlibs-4.1.4-system-libical.patch, NONE,
	1.1 kdepimlibs.spec, 1.56,
	1.57 kdepimlibs-4.1.2-system-libical.patch, 1.1, NONE
Message-ID: <20090108102059.10C37700FD@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdepimlibs/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9245/F-10

Modified Files:
	kdepimlibs.spec 
Added Files:
	kdepimlibs-4.1.4-system-libical.patch 
Removed Files:
	kdepimlibs-4.1.2-system-libical.patch 
Log Message:
- rebase system-libical patch (some line endings changed from CR LF to LF)

kdepimlibs-4.1.4-system-libical.patch:

--- NEW FILE kdepimlibs-4.1.4-system-libical.patch ---
diff -ur kdepimlibs-4.1.4/cmake/modules/FindLibical.cmake kdepimlibs-4.1.4-system-libical/cmake/modules/FindLibical.cmake
--- kdepimlibs-4.1.4/cmake/modules/FindLibical.cmake	2008-05-21 13:05:50.000000000 +0200
+++ kdepimlibs-4.1.4-system-libical/cmake/modules/FindLibical.cmake	2009-01-08 11:10:35.000000000 +0100
@@ -1,29 +1,89 @@
 # Find Libical
 #
-#  LIBICAL_FOUND - system has Libical
-#  LIBICAL_INCLUDE_DIRS - the Libical include directory
+#  LIBICAL_FOUND - system has Libical with the minimum version needed
+#  LIBICAL_INCLUDE_DIRS - the Libical include directories
 #  LIBICAL_LIBRARIES - The libraries needed to use Libical
+#  LIBICAL_VERSION = The value of ICAL_VERSION defined in ical.h
 
 # Copyright (c) 2008, Allen Winter <winter at kde.org>
 #
 # Redistribution and use is allowed according to the terms of the BSD license.
 # For details see the accompanying COPYING-CMAKE-SCRIPTS file.
 
-SET (LIBICAL_FIND_REQUIRED ${Libical_FIND_REQUIRED})
-if (LIBICAL_INCLUDE_DIR AND LIBICAL_LIBRARIES)
+if(NOT LIBICAL_MIN_VERSION)
+  set(LIBICAL_MIN_VERSION "0.33")
+endif(NOT LIBICAL_MIN_VERSION)
+
+if (WIN32)
+  file(TO_CMAKE_PATH "$ENV{PROGRAMFILES}" _program_FILES_DIR)
+  string(REPLACE "\\" "/" _program_FILES_DIR "${_program_FILES_DIR}")
+endif(WIN32)
+
+set(LIBICAL_FIND_REQUIRED ${Libical_FIND_REQUIRED})
+if(LIBICAL_INCLUDE_DIRS AND LIBICAL_LIBRARIES)
 
   # Already in cache, be silent
   set(LIBICAL_FIND_QUIETLY TRUE)
 
-else (LIBICAL_INCLUDE_DIR AND LIBICAL_LIBRARIES)
+endif(LIBICAL_INCLUDE_DIRS AND LIBICAL_LIBRARIES)
+
+#set the root from the LIBICAL_BASE environment
+string(REPLACE "\\" "/" libical_root "$ENV{LIBICAL_BASE}")
+#override the root from LIBICAL_BASE defined to cmake
+if(DEFINED LIBICAL_BASE)
+  string(REPLACE "\\" "/" libical_root ${LIBICAL_BASE})
+endif(DEFINED LIBICAL_BASE)
+
+find_path(LIBICAL_INCLUDE_DIRS NAMES ical.h
+  PATH_SUFFIXES libical
+  PATHS ${libical_root}/include ${_program_FILES_DIR}/libical/include /usr/local/include /usr/include
+  NO_CMAKE_SYSTEM_PATH
+)
+
+find_library(LIBICAL_LIBRARY NAMES ical libical
+  PATHS ${libical_root}/lib ${_program_FILES_DIR}/libical/lib /usr/local/lib /usr/lib
+  NO_CMAKE_SYSTEM_PATH
+)
+find_library(LIBICALSS_LIBRARY NAMES icalss libicalss
+  PATHS ${libical_root}/lib ${_program_FILES_DIR}/libical/lib /usr/local/lib /usr/lib
+  NO_CMAKE_SYSTEM_PATH
+)
+set(LIBICAL_LIBRARIES ${LIBICAL_LIBRARY} ${LIBICALSS_LIBRARY})
+
+if(LIBICAL_INCLUDE_DIRS AND LIBICAL_LIBRARIES)
+  set(FIND_LIBICAL_VERSION_SOURCE
+    "#include <ical.h>\n int main()\n {\n printf(\"%s\",ICAL_VERSION);return 1;\n }\n")
+  set(FIND_LIBICAL_VERSION_SOURCE_FILE ${CMAKE_BINARY_DIR}/CMakeTmp/FindLIBICAL.cxx)
+  file(WRITE "${FIND_LIBICAL_VERSION_SOURCE_FILE}" "${FIND_LIBICAL_VERSION_SOURCE}")
+
+  set(FIND_LIBICAL_VERSION_ADD_INCLUDES
+    "-DINCLUDE_DIRECTORIES:STRING=${LIBICAL_INCLUDE_DIRS}")
+
+  try_run(RUN_RESULT COMPILE_RESULT
+    ${CMAKE_BINARY_DIR}
+    ${FIND_LIBICAL_VERSION_SOURCE_FILE}
+    CMAKE_FLAGS "${FIND_LIBICAL_VERSION_ADD_INCLUDES}"
+    RUN_OUTPUT_VARIABLE LIBICAL_VERSION)
+
+  if(COMPILE_RESULT AND RUN_RESULT EQUAL 1)
+    message(STATUS "Found Libical version ${LIBICAL_VERSION}")
+    macro_ensure_version(${LIBICAL_MIN_VERSION} ${LIBICAL_VERSION} LIBICAL_VERSION_OK)
+    if(NOT LIBICAL_VERSION_OK)
+      message(STATUS "Libcal version ${LIBICAL_VERSION} is too old. At least version ${LIBICAL_MIN_VERSION} is needed.")
+      set(LIBICAL_INCLUDE_DIRS "")
+      set(LIBICAL_LIBRARIES "")
+    endif(NOT LIBICAL_VERSION_OK)
+  else(COMPILE_RESULT AND RUN_RESULT EQ 1)
+    #Enable this line the 13 october
+    #message(FATAL_ERROR "Unable to compile or run the libical version detection program.")
+    #Delete this line the 13 october
+    message(STATUS "Unable to compile or run the libical version detection program.")
+  endif(COMPILE_RESULT AND RUN_RESULT EQUAL 1)
 
-  find_path(LIBICAL_INCLUDE_DIR ical.h)
-  find_library(LIBICAL_LIBRARIES NAMES ical )
+endif(LIBICAL_INCLUDE_DIRS AND LIBICAL_LIBRARIES)
 
-  include(FindPackageHandleStandardArgs)
-  FIND_PACKAGE_HANDLE_STANDARD_ARGS(LIBICAL DEFAULT_MSG
-                                    LIBICAL_LIBRARIES LIBICAL_INCLUDE_DIR)
+include(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(LIBICAL DEFAULT_MSG LIBICAL_LIBRARIES LIBICAL_INCLUDE_DIRS)
 
-  mark_as_advanced(LIBICAL_INCLUDE_DIR LIBICAL_LIBRARIES)
+mark_as_advanced(LIBICAL_INCLUDE_DIRS LIBICAL_LIBRARIES)
 
-endif (LIBICAL_INCLUDE_DIR AND LIBICAL_LIBRARIES)
diff -ur kdepimlibs-4.1.4/kcal/CMakeLists.txt kdepimlibs-4.1.4-system-libical/kcal/CMakeLists.txt
--- kdepimlibs-4.1.4/kcal/CMakeLists.txt	2008-07-03 07:05:12.000000000 +0200
+++ kdepimlibs-4.1.4-system-libical/kcal/CMakeLists.txt	2009-01-08 11:10:35.000000000 +0100
@@ -1,209 +1,32 @@
 project(kcal)
 
-# was used by libical, but not anymore
-#if (UNIX)
-#  add_definitions(-DICAL_UNIX_NEWLINE=1)
-#endif (UNIX)
-
-add_definitions(-DPACKAGE_DATA_DIR=\\""${DATA_INSTALL_DIR}/libical"\\" ) # added manually
+find_package(Libical REQUIRED)
 
 add_definitions(-DKDE_DEFAULT_DEBUG_AREA=5800)
 
 include (ConfigureChecks.cmake)
-configure_file (libical/config-libical.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/libical/config-libical.h)
 
 if(KDE4_BUILD_TESTS)
     add_definitions(-DCOMPILING_TESTS)
 endif(KDE4_BUILD_TESTS)
 
 include_directories(
-	${CMAKE_CURRENT_SOURCE_DIR}/libical/src/libicalss/
-	${CMAKE_CURRENT_BINARY_DIR}/libical/src/libicalss/
+	${LIBICAL_INCLUDE_DIRS}
 	${CMAKE_CURRENT_SOURCE_DIR}/versit/
-	${CMAKE_CURRENT_SOURCE_DIR}/libical/src/libical/
-	${CMAKE_CURRENT_BINARY_DIR}/libical/src/libical/
-	${CMAKE_CURRENT_BINARY_DIR}/libical # for config.h
-	${CMAKE_SOURCE_DIR}
+	${CMAKE_CURRENT_SOURCE_DIR}
 	${CMAKE_SOURCE_DIR}/kabc
 	${CMAKE_BINARY_DIR}/kabc
         ${KDE4_INCLUDE_DIR}
 )
 
-set(ICALSCRIPTS ${CMAKE_SOURCE_DIR}/kcal/libical/scripts/ )
-
-set(PROPERTYDEPS 
-        ${ICALSCRIPTS}/mkderivedproperties.pl 
-        ${CMAKE_SOURCE_DIR}/kcal/libical/design-data/properties.csv	
-        ${CMAKE_SOURCE_DIR}/kcal/libical/design-data/value-types.csv
-        ${CMAKE_SOURCE_DIR}/kcal/libical/src/libical/icalderivedproperty.h.in 
-        ${CMAKE_SOURCE_DIR}/kcal/libical/src/libical/icalderivedproperty.c.in 
-)
-
-add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/kcal/libical/icalderivedproperty.h
-                   COMMAND ${PERL_EXECUTABLE} -I ${ICALSCRIPTS} ${ICALSCRIPTS}/mkderivedproperties.pl -i
-                           ${CMAKE_SOURCE_DIR}/kcal/libical/src/libical/icalderivedproperty.h.in
-                           -h  ${CMAKE_SOURCE_DIR}/kcal/libical/design-data/properties.csv 
-                           ${CMAKE_SOURCE_DIR}/kcal/libical/design-data/value-types.csv > ${CMAKE_BINARY_DIR}/kcal/libical/icalderivedproperty.h
-                   DEPENDS  ${PROPERTYDEPS} )
-
-
-add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/kcal/libical/icalderivedproperty.c
-                   COMMAND ${PERL_EXECUTABLE} -I${ICALSCRIPTS} ${ICALSCRIPTS}/mkderivedproperties.pl -i
-                           ${CMAKE_SOURCE_DIR}/kcal/libical/src/libical/icalderivedproperty.c.in
-                           -c ${CMAKE_SOURCE_DIR}/kcal/libical/design-data/properties.csv
-                           ${CMAKE_SOURCE_DIR}/kcal/libical/design-data/value-types.csv > ${CMAKE_BINARY_DIR}/kcal/libical/icalderivedproperty.c
-                   DEPENDS  ${PROPERTYDEPS} ${CMAKE_BINARY_DIR}/kcal/libical/icalderivedproperty.h )
-
-
-# files generated via add_custom_command are added automatically to the clean files, Alex
-#macro_additional_clean_files( 
-#                              ${CMAKE_BINARY_DIR}/kcal/libical/icalderivedproperty.c 
-#                              ${CMAKE_BINARY_DIR}/kcal/libical/icalderivedproperty.h 
-#)
-
-
-set(PARAMETERDEPS 
-	${ICALSCRIPTS}/mkderivedparameters.pl 
-	${CMAKE_SOURCE_DIR}/kcal/libical/design-data/parameters.csv 
-	${CMAKE_SOURCE_DIR}/kcal/libical/src/libical/icalderivedparameter.c.in
-	${CMAKE_SOURCE_DIR}/kcal/libical/src/libical/icalderivedparameter.h.in
-)
-
-add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/kcal/libical/icalderivedparameter.h
-                   COMMAND ${PERL_EXECUTABLE} -I ${ICALSCRIPTS} ${ICALSCRIPTS}/mkderivedparameters.pl -i ${CMAKE_SOURCE_DIR}/kcal/libical/src/libical/icalderivedparameter.h.in 
-                           -h ${CMAKE_SOURCE_DIR}/kcal/libical/design-data/parameters.csv > ${CMAKE_BINARY_DIR}/kcal/libical/icalderivedparameter.h
-                   DEPENDS  ${PARAMETERDEPS} )
-
-add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/kcal/libical/icalderivedparameter.c
-                   COMMAND ${PERL_EXECUTABLE} -I ${ICALSCRIPTS} ${ICALSCRIPTS}/mkderivedparameters.pl -i ${CMAKE_SOURCE_DIR}/kcal/libical/src/libical/icalderivedparameter.c.in 
-                           -c ${CMAKE_SOURCE_DIR}/kcal/libical/design-data/parameters.csv > ${CMAKE_BINARY_DIR}/kcal/libical/icalderivedparameter.c
-                   DEPENDS  ${PARAMETERDEPS} ${CMAKE_BINARY_DIR}/kcal/libical/icalderivedparameter.h )
-
-#files generated via add_custom_command are added automatically to the clean files, Alex
-#macro_additional_clean_files( 
-#	${CMAKE_BINARY_DIR}/kcal/libical/icalderivedparameter.c 
-#	${CMAKE_BINARY_DIR}/kcal/libical/icalderivedparameter.h 
-#)
-
-
-set(RESTRICTIONDEPS 
-	${ICALSCRIPTS}/mkrestrictiontable.pl
-	${CMAKE_SOURCE_DIR}/kcal/libical/design-data/restrictions.csv
-	${CMAKE_SOURCE_DIR}/kcal/libical/src/libical/icalrestriction.c.in
-)
-
-add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/kcal/libical/src/libical/icalrestriction.c
-                   COMMAND ${PERL_EXECUTABLE} -I ${ICALSCRIPTS} ${ICALSCRIPTS}/mkrestrictiontable.pl -i ${CMAKE_SOURCE_DIR}/kcal/libical/src/libical/icalrestriction.c.in 
-                           ${CMAKE_SOURCE_DIR}/kcal/libical/design-data/restrictions.csv > ${CMAKE_BINARY_DIR}/kcal/libical/src/libical/icalrestriction.c   
-                   DEPENDS  ${RESTRICTIONDEPS} )
-
-
-#files generated via add_custom_command are added automatically to the clean files, Alex
-#macro_additional_clean_files( ${CMAKE_BINARY_DIR}/kcal/libical/src/libical/icalrestriction.c)
-
-set(VALUEDEPS
-	${CMAKE_SOURCE_DIR}/kcal/libical/scripts/mkderivedvalues.pl
-	${CMAKE_SOURCE_DIR}/kcal/libical/design-data/value-types.csv
-	${CMAKE_SOURCE_DIR}/kcal/libical/src/libical/icalderivedvalue.c.in
-	${CMAKE_SOURCE_DIR}/kcal/libical/src/libical/icalderivedvalue.h.in
-)
-
-add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/kcal/libical/icalderivedvalue.h 
-                   COMMAND ${PERL_EXECUTABLE} -I${ICALSCRIPTS} ${ICALSCRIPTS}/mkderivedvalues.pl -i ${CMAKE_SOURCE_DIR}/kcal/libical/src/libical/icalderivedvalue.h.in -h ${CMAKE_SOURCE_DIR}/kcal/libical/design-data/value-types.csv > ${CMAKE_BINARY_DIR}/kcal/libical/icalderivedvalue.h   
-                   DEPENDS  ${VALUEDEPS} )
-
-
-add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/kcal/libical/icalderivedvalue.c 
-                   COMMAND ${PERL_EXECUTABLE} -I${ICALSCRIPTS} ${ICALSCRIPTS}/mkderivedvalues.pl -i ${CMAKE_SOURCE_DIR}/kcal/libical/src/libical/icalderivedvalue.c.in -c ${CMAKE_SOURCE_DIR}/kcal/libical/design-data/value-types.csv > ${CMAKE_BINARY_DIR}/kcal/libical/icalderivedvalue.c   
-                   DEPENDS  ${VALUEDEPS} ${CMAKE_BINARY_DIR}/kcal/libical/icalderivedvalue.h )
-
-#files generated via add_custom_command are added automatically to the clean files, Alex
-#macro_additional_clean_files(
-#	${CMAKE_BINARY_DIR}/kcal/libical/icalderivedvalue.h
-#	${CMAKE_BINARY_DIR}/kcal/libical/icalderivedvalue.c
-#)
-
-
-
 set(libversit_SRCS 
    ${CMAKE_SOURCE_DIR}/kcal/versit/vcc.c 
    ${CMAKE_SOURCE_DIR}/kcal/versit/vobject.c 
 )
 
-# Keep absolute paths here, they are used in tests/CMakeLists.txt too.
-set(libical_SRCS
-   ${CMAKE_SOURCE_DIR}/kcal/libical/src/libical/caldate.c       
-   ${CMAKE_SOURCE_DIR}/kcal/libical/src/libical/icalarray.c     
-   ${CMAKE_SOURCE_DIR}/kcal/libical/src/libical/icalattach.c        
-   ${CMAKE_BINARY_DIR}/kcal/libical/icalderivedparameter.c  
-   ${CMAKE_SOURCE_DIR}/kcal/libical/src/libical/icalrecur.c     
-   ${CMAKE_BINARY_DIR}/kcal/libical/src/libical/icalrestriction.c   
-   ${CMAKE_SOURCE_DIR}/kcal/libical/src/libical/icalcomponent.c     
-   ${CMAKE_SOURCE_DIR}/kcal/libical/src/libical/icalenums.c     
-   ${CMAKE_SOURCE_DIR}/kcal/libical/src/libical/icalerror.c     
-   ${CMAKE_SOURCE_DIR}/kcal/libical/src/libical/icalmemory.c        
-   ${CMAKE_SOURCE_DIR}/kcal/libical/src/libical/icalmime.c      
-   ${CMAKE_SOURCE_DIR}/kcal/libical/src/libical/icalparameter.c    
-   ${CMAKE_SOURCE_DIR}/kcal/libical/src/libical/icalparser.c        
-   ${CMAKE_BINARY_DIR}/kcal/libical/icalderivedproperty.c   
-   ${CMAKE_SOURCE_DIR}/kcal/libical/src/libical/icalproperty.c      
-   ${CMAKE_SOURCE_DIR}/kcal/libical/src/libical/icaltime.c      
-   ${CMAKE_SOURCE_DIR}/kcal/libical/src/libical/icalduration.c      
-   ${CMAKE_SOURCE_DIR}/kcal/libical/src/libical/icalperiod.c        
-   ${CMAKE_SOURCE_DIR}/kcal/libical/src/libical/icaltimezone.c      
-   ${CMAKE_SOURCE_DIR}/kcal/libical/src/libical/icaltypes.c     
-   ${CMAKE_SOURCE_DIR}/kcal/libical/src/libical/icalvalue.c     
-   ${CMAKE_BINARY_DIR}/kcal/libical/icalderivedvalue.c  
-   ${CMAKE_SOURCE_DIR}/kcal/libical/src/libical/pvl.c           
-   ${CMAKE_SOURCE_DIR}/kcal/libical/src/libical/sspm.c          
-   ${CMAKE_SOURCE_DIR}/kcal/libical/src/libical/vsnprintf.c     
-)
-
-set(libicalss_SRCS
-   ${CMAKE_SOURCE_DIR}/kcal/libical/src/libicalss/icalclassify.c
-   ${CMAKE_SOURCE_DIR}/kcal/libical/src/libicalss/icalclassify.h
-)
-
-
-macro_additional_clean_files(${CMAKE_BINARY_DIR}/kcal/libical/src/libical/ical.h)
-
-if(WIN32)
-  set(TOPS "\"${CMAKE_SOURCE_DIR}\"")
-  set(TOPB "\"${CMAKE_BINARY_DIR}\"")
-else(WIN32)
-  set(TOPS "${CMAKE_SOURCE_DIR}")
-  set(TOPB "${CMAKE_BINARY_DIR}")
-endif(WIN32)
-
-add_custom_command(OUTPUT
-   ${CMAKE_BINARY_DIR}/kcal/libical/src/libical/ical.h 
-   COMMAND 
-   ${CMAKE_COMMAND} 
-   -DTOPS:FILEPATH=${TOPS}
-   -DTOPB:FILEPATH=${TOPB}
-   -DKDE_FILE_H_FILE:FILEPATH=${CMAKE_BINARY_DIR}/kcal/libical/src/libical/ical.h
-   -P ${CMAKE_SOURCE_DIR}/kcal/ical_file.cmake
-   DEPENDS
-   ${CMAKE_BINARY_DIR}/kcal/libical/icalderivedproperty.h
-   ${CMAKE_BINARY_DIR}/kcal/libical/icalderivedparameter.h
-   ${CMAKE_BINARY_DIR}/kcal/libical/icalderivedvalue.h
-)
-
-macro_additional_clean_files(${CMAKE_BINARY_DIR}/libical/src/libicalss/icalss.h)
-
-add_custom_command(OUTPUT
-   ${CMAKE_BINARY_DIR}/kcal/libical/src/libicalss/icalss.h 
-   COMMAND 
-   ${CMAKE_COMMAND} 
-   -DTOP:FILEPATH=${TOPS}
-   -DKDE_FILE_H_FILE:FILEPATH=${CMAKE_BINARY_DIR}/kcal/libical/src/libicalss/icalss.h
-   -P ${CMAKE_SOURCE_DIR}/kcal/icalss_file.cmake
-)
-
-
 ########### next target ###############
 
-set(kcal_LIB_SRCS ${libversit_SRCS} ${libical_SRCS} ${libicalss_SRCS}
+set(kcal_LIB_SRCS ${libversit_SRCS}
    incidencebase.cpp
    incidence.cpp
    journal.cpp
@@ -258,18 +81,11 @@
 
 kde4_add_library(kcal SHARED ${kcal_LIB_SRCS})
 
-target_link_libraries(kcal ${KDE4_KDEUI_LIBS} ${KDE4_KIO_LIBS} ${QT_QTXML_LIBRARY} kresources kabc kpimutils )
+target_link_libraries(kcal ${KDE4_KDEUI_LIBS} ${KDE4_KIO_LIBS} ${QT_QTXML_LIBRARY} kresources kabc kpimutils ${LIBICAL_LIBRARIES})
 
 set_target_properties(kcal PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION})
 install(TARGETS kcal ${INSTALL_TARGETS_DEFAULT_ARGS} COMPONENT Devel)
 
-# hack to force ical[ss].h creation
-add_custom_target(ical-headers DEPENDS
-        ${CMAKE_BINARY_DIR}/kcal/libical/src/libical/ical.h
-        ${CMAKE_BINARY_DIR}/kcal/libical/src/libicalss/icalss.h
-)
-add_dependencies(kcal ical-headers)
-
 ########### next target ###############
 
 set(kcal_local_PART_SRCS resourcelocal_plugin.cpp )
@@ -296,7 +112,6 @@
 install(TARGETS kcal_localdir  DESTINATION ${PLUGIN_INSTALL_DIR})
 
 
-add_subdirectory( libical )
 add_subdirectory( tests )
 
 ########### install files ###############
diff -ur kdepimlibs-4.1.4/kcal/tests/CMakeLists.txt kdepimlibs-4.1.4-system-libical/kcal/tests/CMakeLists.txt
--- kdepimlibs-4.1.4/kcal/tests/CMakeLists.txt	2008-06-03 11:34:13.000000000 +0200
+++ kdepimlibs-4.1.4-system-libical/kcal/tests/CMakeLists.txt	2009-01-08 11:10:35.000000000 +0100
@@ -2,20 +2,20 @@
 
 include_directories(
  ${CMAKE_SOURCE_DIR}/kcal
- ${CMAKE_BINARY_DIR}/kcal/libical/src
+ ${LIBICAL_INCLUDE_DIRS}
 )
 
 MACRO(KCAL_UNIT_TESTS)
   FOREACH(_testname ${ARGN})
     kde4_add_unit_test(${_testname} NOGUI ${_testname}.cpp)
-    target_link_libraries(${_testname} ${KDE4_KDECORE_LIBS} kcal ${QT_QTTEST_LIBRARY})
+    target_link_libraries(${_testname} ${KDE4_KDECORE_LIBS} kcal ${QT_QTTEST_LIBRARY} ${LIBICAL_LIBRARIES})
   ENDFOREACH(_testname)
 ENDMACRO(KCAL_UNIT_TESTS)
 
 MACRO(KCAL_EXECUTABLE_TESTS)
   FOREACH(_testname ${ARGN})
     kde4_add_executable(${_testname} NOGUI TEST ${_testname}.cpp)
-    target_link_libraries(${_testname} ${KDE4_KDECORE_LIBS} kcal ${QT_QTTEST_LIBRARY})
+    target_link_libraries(${_testname} ${KDE4_KDECORE_LIBS} kcal ${QT_QTTEST_LIBRARY} ${LIBICAL_LIBRARIES})
   ENDFOREACH(_testname)
 ENDMACRO(KCAL_EXECUTABLE_TESTS)
 
@@ -82,32 +82,32 @@
 
 FOREACH( file ${testFiles} )
   GET_FILENAME_COMPONENT( fn ${file} NAME)
-  ADD_TEST( RecurNext-${fn} ${CMAKE_CURRENT_SOURCE_DIR}/runsingletestcase.pl ${EXECUTABLE_OUTPUT_PATH}/testrecurrence "next" ${file} )
+  ADD_TEST( RecurNext-${fn} ${CMAKE_CURRENT_SOURCE_DIR}/runsingletestcase.pl ${EXECUTABLE_OUTPUT_PATH}/testrecurrence.shell "next" ${file} )
 ENDFOREACH(file)
 
 FOREACH( file ${testFiles} )
   GET_FILENAME_COMPONENT( fn ${file} NAME)
-  ADD_TEST( RecurPrev-${fn} ${CMAKE_CURRENT_SOURCE_DIR}/runsingletestcase.pl ${EXECUTABLE_OUTPUT_PATH}/testrecurprevious "prev" ${file} )
+  ADD_TEST( RecurPrev-${fn} ${CMAKE_CURRENT_SOURCE_DIR}/runsingletestcase.pl ${EXECUTABLE_OUTPUT_PATH}/testrecurprevious.shell "prev" ${file} )
 ENDFOREACH(file)
 
 FOREACH( file ${testFiles} )
   GET_FILENAME_COMPONENT( fn ${file} NAME)
-  ADD_TEST( RecursOn-${fn} ${CMAKE_CURRENT_SOURCE_DIR}/runsingletestcase.pl ${EXECUTABLE_OUTPUT_PATH}/testrecurson "recurson" ${file} )
+  ADD_TEST( RecursOn-${fn} ${CMAKE_CURRENT_SOURCE_DIR}/runsingletestcase.pl ${EXECUTABLE_OUTPUT_PATH}/testrecurson.shell "recurson" ${file} )
 ENDFOREACH(file)
 
 FOREACH( file ${compatFiles} )
   GET_FILENAME_COMPONENT( fn ${file} NAME)
-  ADD_TEST( Compat-${fn} ${CMAKE_CURRENT_SOURCE_DIR}/runsingletestcase.pl ${EXECUTABLE_OUTPUT_PATH}/readandwrite "ical" ${file} )
+  ADD_TEST( Compat-${fn} ${CMAKE_CURRENT_SOURCE_DIR}/runsingletestcase.pl ${EXECUTABLE_OUTPUT_PATH}/readandwrite.shell "ical" ${file} )
 ENDFOREACH(file)
 
 FOREACH( file ${vCalFilesAsIcal} )
   GET_FILENAME_COMPONENT( fn ${file} NAME)
-  ADD_TEST( VCalOut-${fn} ${CMAKE_CURRENT_SOURCE_DIR}/runsingletestcase.pl ${EXECUTABLE_OUTPUT_PATH}/testvcalexport "vcal" ${file} )
+  ADD_TEST( VCalOut-${fn} ${CMAKE_CURRENT_SOURCE_DIR}/runsingletestcase.pl ${EXECUTABLE_OUTPUT_PATH}/testvcalexport.shell "vcal" ${file} )
 ENDFOREACH(file)
 
 FOREACH( file ${vCalFiles} )
   GET_FILENAME_COMPONENT( fn ${file} NAME)
-  ADD_TEST( VCalIn-${fn} ${CMAKE_CURRENT_SOURCE_DIR}/runsingletestcase.pl ${EXECUTABLE_OUTPUT_PATH}/readandwrite "ical" ${file} )
+  ADD_TEST( VCalIn-${fn} ${CMAKE_CURRENT_SOURCE_DIR}/runsingletestcase.pl ${EXECUTABLE_OUTPUT_PATH}/readandwrite.shell "ical" ${file} )
 ENDFOREACH(file)
 
 # ADD_TEST( TestRecurrence  runtestcase.pl testrecurrence    "next" ${CMAKE_CURRENT_SOURCE_DIR} data/RecurrenceRule/ "*.ics" )
diff -ur kdepimlibs-4.1.4/kcal/tests/data/vCalendar/KOrganizer_vCalTestCase04.ics.vcal.ref kdepimlibs-4.1.4-system-libical/kcal/tests/data/vCalendar/KOrganizer_vCalTestCase04.ics.vcal.ref
--- kdepimlibs-4.1.4/kcal/tests/data/vCalendar/KOrganizer_vCalTestCase04.ics.vcal.ref	2009-01-06 17:18:55.000000000 +0100
+++ kdepimlibs-4.1.4-system-libical/kcal/tests/data/vCalendar/KOrganizer_vCalTestCase04.ics.vcal.ref	2009-01-08 11:15:32.000000000 +0100
@@ -9,7 +9,7 @@
 SEQUENCE:4
 LAST-MODIFIED:20050520T105750Z
 X-ORGANIZER:MAILTO:reinhold at kainhofer.com
-RRULE:MD3 20 20060630T000000
+RRULE:MD3 20 20060630T040000
 SUMMARY:20. Mai 2005, 16-17 Uhr, alle 3 Monate am 20., bis 30. Juni 2006
 CLASS:PUBLIC
 PRIORITY:5
diff -ur kdepimlibs-4.1.4/kcal/tests/data/vCalendar/KOrganizer_vCalTestCase05.ics.vcal.ref kdepimlibs-4.1.4-system-libical/kcal/tests/data/vCalendar/KOrganizer_vCalTestCase05.ics.vcal.ref
--- kdepimlibs-4.1.4/kcal/tests/data/vCalendar/KOrganizer_vCalTestCase05.ics.vcal.ref	2009-01-06 17:18:55.000000000 +0100
+++ kdepimlibs-4.1.4-system-libical/kcal/tests/data/vCalendar/KOrganizer_vCalTestCase05.ics.vcal.ref	2009-01-08 11:16:12.000000000 +0100
@@ -9,7 +9,7 @@
 SEQUENCE:2
 LAST-MODIFIED:20050520T105740Z
 X-ORGANIZER:MAILTO:reinhold at kainhofer.com
-RRULE:W2 MO WE FR 20050630T000000
+RRULE:W2 MO WE FR 20050630T040000
 SUMMARY:20. Mai 2005, 14-15 Uhr, alle 2 Wochen am Mo/Mi/Fr, bis 30. Juni 2005
 CLASS:PUBLIC
 PRIORITY:5
diff -ur kdepimlibs-4.1.4/kcal/tests/data/vCalendar/KOrganizer_vCalTestCase12.ics.vcal.ref kdepimlibs-4.1.4-system-libical/kcal/tests/data/vCalendar/KOrganizer_vCalTestCase12.ics.vcal.ref
--- kdepimlibs-4.1.4/kcal/tests/data/vCalendar/KOrganizer_vCalTestCase12.ics.vcal.ref	2009-01-06 17:18:55.000000000 +0100
+++ kdepimlibs-4.1.4-system-libical/kcal/tests/data/vCalendar/KOrganizer_vCalTestCase12.ics.vcal.ref	2009-01-08 11:16:50.000000000 +0100
@@ -9,7 +9,7 @@
 SEQUENCE:1
 LAST-MODIFIED:20050520T104819Z
 X-ORGANIZER:MAILTO:reinhold at kainhofer.com
-RRULE:D3 20050630T000000
+RRULE:D3 20050630T040000
 SUMMARY:20. Mai 2005, 13-14 Uhr, alle 3 Tage, bis 30. Juni 2005
 CLASS:PUBLIC
 PRIORITY:5
diff -ur kdepimlibs-4.1.4/kcal/tests/data/vCalendar/KOrganizer_vCalTestCase13.ics.vcal.ref kdepimlibs-4.1.4-system-libical/kcal/tests/data/vCalendar/KOrganizer_vCalTestCase13.ics.vcal.ref
--- kdepimlibs-4.1.4/kcal/tests/data/vCalendar/KOrganizer_vCalTestCase13.ics.vcal.ref	2009-01-06 17:18:55.000000000 +0100
+++ kdepimlibs-4.1.4-system-libical/kcal/tests/data/vCalendar/KOrganizer_vCalTestCase13.ics.vcal.ref	2009-01-08 11:17:14.000000000 +0100
@@ -9,7 +9,7 @@
 SEQUENCE:1
 LAST-MODIFIED:20050520T105327Z
 X-ORGANIZER:MAILTO:reinhold at kainhofer.com
-RRULE:MP3 1- TH 20061231T000000
+RRULE:MP3 1- TH 20061231T050000
 SUMMARY:20. Mai 2005, 20-21 Uhr, alle 3 Monate am letzten Do, bis 31. 12. 2006
 CLASS:PUBLIC
 PRIORITY:5
diff -ur kdepimlibs-4.1.4/kcal/tests/testicaltimezones.cpp kdepimlibs-4.1.4-system-libical/kcal/tests/testicaltimezones.cpp
--- kdepimlibs-4.1.4/kcal/tests/testicaltimezones.cpp	2008-01-05 00:53:16.000000000 +0100
+++ kdepimlibs-4.1.4-system-libical/kcal/tests/testicaltimezones.cpp	2009-01-08 11:10:35.000000000 +0100
@@ -33,7 +33,7 @@
 QTEST_KDEMAIN( ICalTimeZonesTest, NoGUI )
 
 extern "C" {
-  #include "kcal/libical/src/libical/ical.h"
+  #include <ical.h>
 }
 #include "kcal/icaltimezones.h"
 using namespace KCal;
@@ -72,22 +72,22 @@
   "TZOFFSETFROM:-0400\r\n"
   "TZOFFSETTO:-0500\r\n"
   "TZNAME:WST\r\n"
-  "END:STANDARD\r\n\r\n"
+  "END:STANDARD\r\n"
   "BEGIN:DAYLIGHT\r\n"
   "DTSTART:19870405T020000\r\n"
   "RRULE:FREQ=YEARLY;UNTIL=19970406T070000Z;BYDAY=1SU;BYMONTH=4\r\n"
   "TZOFFSETFROM:-0500\r\n"
   "TZOFFSETTO:-0400\r\n"
   "TZNAME:WDT1\r\n"
-  "END:DAYLIGHT\r\n\r\n"
+  "END:DAYLIGHT\r\n"
   "BEGIN:DAYLIGHT\r\n"
   "DTSTART:19990425T020000\r\n"
   "RDATE;VALUE=DATE-TIME:20000430T020000\r\n"
   "TZOFFSETFROM:-0500\r\n"
   "TZOFFSETTO:-0400\r\n"
   "TZNAME:WDT2\r\n"
-  "END:DAYLIGHT\r\n\r\n"
-  "END:VTIMEZONE\r\n\r\n";
+  "END:DAYLIGHT\r\n"
+  "END:VTIMEZONE\r\n";
 
 // Standard time only
 static const char *VTZ_other =
@@ -101,8 +101,8 @@
   "TZOFFSETFROM:+0000\r\n"
   "TZOFFSETTO:+0300\r\n"
   "TZNAME:OST\r\n"
-  "END:STANDARD\r\n\r\n"
-  "END:VTIMEZONE\r\n\r\n";
+  "END:STANDARD\r\n"
+  "END:VTIMEZONE\r\n";
 
 // CALENDAR component header and footer
 static const char *calendarHeader =
@@ -183,6 +183,7 @@
     QCOMPARE(tz.vtimezone(), QByteArray(VTZ_Western));
 
     ICalTimeZone tz1(tz);
+
     QCOMPARE(tz1.name(), tz.name());
     QCOMPARE(tz1.url(), tz.url());
     QCOMPARE(tz1.city(), tz.city());


Index: kdepimlibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdepimlibs/F-10/kdepimlibs.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- kdepimlibs.spec	8 Jan 2009 10:07:32 -0000	1.56
+++ kdepimlibs.spec	8 Jan 2009 10:20:28 -0000	1.57
@@ -29,7 +29,7 @@
 URL: http://www.kde.org/
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdepimlibs-%{version}.tar.bz2
 # Use system libical (will be in 4.2)
-Patch100:      kdepimlibs-4.1.2-system-libical.patch
+Patch100:      kdepimlibs-4.1.4-system-libical.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires: kdelibs4 >= %{version}
@@ -185,6 +185,7 @@
 - update to 4.1.4
 - reenable system libical, #469228 reportedly fixed upstream now
 - also use the system libical on F9
+- rebase system-libical patch (some line endings changed from CR LF to LF)
 
 * Wed Nov 12 2008 Than Ngo <than at redhat.com> 4.1.3-1
 - 4.1.3


--- kdepimlibs-4.1.2-system-libical.patch DELETED ---



From kkofler at fedoraproject.org  Thu Jan  8 10:20:59 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Thu,  8 Jan 2009 10:20:59 +0000 (UTC)
Subject: rpms/kdepimlibs/F-9 kdepimlibs-4.1.4-system-libical.patch, NONE,
	1.1 kdepimlibs.spec, 1.44,
	1.45 kdepimlibs-4.1.2-system-libical.patch, 1.1, NONE
Message-ID: <20090108102059.647B7700FD@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdepimlibs/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9245/F-9

Modified Files:
	kdepimlibs.spec 
Added Files:
	kdepimlibs-4.1.4-system-libical.patch 
Removed Files:
	kdepimlibs-4.1.2-system-libical.patch 
Log Message:
- rebase system-libical patch (some line endings changed from CR LF to LF)

kdepimlibs-4.1.4-system-libical.patch:

--- NEW FILE kdepimlibs-4.1.4-system-libical.patch ---
diff -ur kdepimlibs-4.1.4/cmake/modules/FindLibical.cmake kdepimlibs-4.1.4-system-libical/cmake/modules/FindLibical.cmake
--- kdepimlibs-4.1.4/cmake/modules/FindLibical.cmake	2008-05-21 13:05:50.000000000 +0200
+++ kdepimlibs-4.1.4-system-libical/cmake/modules/FindLibical.cmake	2009-01-08 11:10:35.000000000 +0100
@@ -1,29 +1,89 @@
 # Find Libical
 #
-#  LIBICAL_FOUND - system has Libical
-#  LIBICAL_INCLUDE_DIRS - the Libical include directory
+#  LIBICAL_FOUND - system has Libical with the minimum version needed
+#  LIBICAL_INCLUDE_DIRS - the Libical include directories
 #  LIBICAL_LIBRARIES - The libraries needed to use Libical
+#  LIBICAL_VERSION = The value of ICAL_VERSION defined in ical.h
 
 # Copyright (c) 2008, Allen Winter <winter at kde.org>
 #
 # Redistribution and use is allowed according to the terms of the BSD license.
 # For details see the accompanying COPYING-CMAKE-SCRIPTS file.
 
-SET (LIBICAL_FIND_REQUIRED ${Libical_FIND_REQUIRED})
-if (LIBICAL_INCLUDE_DIR AND LIBICAL_LIBRARIES)
+if(NOT LIBICAL_MIN_VERSION)
+  set(LIBICAL_MIN_VERSION "0.33")
+endif(NOT LIBICAL_MIN_VERSION)
+
+if (WIN32)
+  file(TO_CMAKE_PATH "$ENV{PROGRAMFILES}" _program_FILES_DIR)
+  string(REPLACE "\\" "/" _program_FILES_DIR "${_program_FILES_DIR}")
+endif(WIN32)
+
+set(LIBICAL_FIND_REQUIRED ${Libical_FIND_REQUIRED})
+if(LIBICAL_INCLUDE_DIRS AND LIBICAL_LIBRARIES)
 
   # Already in cache, be silent
   set(LIBICAL_FIND_QUIETLY TRUE)
 
-else (LIBICAL_INCLUDE_DIR AND LIBICAL_LIBRARIES)
+endif(LIBICAL_INCLUDE_DIRS AND LIBICAL_LIBRARIES)
+
+#set the root from the LIBICAL_BASE environment
+string(REPLACE "\\" "/" libical_root "$ENV{LIBICAL_BASE}")
+#override the root from LIBICAL_BASE defined to cmake
+if(DEFINED LIBICAL_BASE)
+  string(REPLACE "\\" "/" libical_root ${LIBICAL_BASE})
+endif(DEFINED LIBICAL_BASE)
+
+find_path(LIBICAL_INCLUDE_DIRS NAMES ical.h
+  PATH_SUFFIXES libical
+  PATHS ${libical_root}/include ${_program_FILES_DIR}/libical/include /usr/local/include /usr/include
+  NO_CMAKE_SYSTEM_PATH
+)
+
+find_library(LIBICAL_LIBRARY NAMES ical libical
+  PATHS ${libical_root}/lib ${_program_FILES_DIR}/libical/lib /usr/local/lib /usr/lib
+  NO_CMAKE_SYSTEM_PATH
+)
+find_library(LIBICALSS_LIBRARY NAMES icalss libicalss
+  PATHS ${libical_root}/lib ${_program_FILES_DIR}/libical/lib /usr/local/lib /usr/lib
+  NO_CMAKE_SYSTEM_PATH
+)
+set(LIBICAL_LIBRARIES ${LIBICAL_LIBRARY} ${LIBICALSS_LIBRARY})
+
+if(LIBICAL_INCLUDE_DIRS AND LIBICAL_LIBRARIES)
+  set(FIND_LIBICAL_VERSION_SOURCE
+    "#include <ical.h>\n int main()\n {\n printf(\"%s\",ICAL_VERSION);return 1;\n }\n")
+  set(FIND_LIBICAL_VERSION_SOURCE_FILE ${CMAKE_BINARY_DIR}/CMakeTmp/FindLIBICAL.cxx)
+  file(WRITE "${FIND_LIBICAL_VERSION_SOURCE_FILE}" "${FIND_LIBICAL_VERSION_SOURCE}")
+
+  set(FIND_LIBICAL_VERSION_ADD_INCLUDES
+    "-DINCLUDE_DIRECTORIES:STRING=${LIBICAL_INCLUDE_DIRS}")
+
+  try_run(RUN_RESULT COMPILE_RESULT
+    ${CMAKE_BINARY_DIR}
+    ${FIND_LIBICAL_VERSION_SOURCE_FILE}
+    CMAKE_FLAGS "${FIND_LIBICAL_VERSION_ADD_INCLUDES}"
+    RUN_OUTPUT_VARIABLE LIBICAL_VERSION)
+
+  if(COMPILE_RESULT AND RUN_RESULT EQUAL 1)
+    message(STATUS "Found Libical version ${LIBICAL_VERSION}")
+    macro_ensure_version(${LIBICAL_MIN_VERSION} ${LIBICAL_VERSION} LIBICAL_VERSION_OK)
+    if(NOT LIBICAL_VERSION_OK)
+      message(STATUS "Libcal version ${LIBICAL_VERSION} is too old. At least version ${LIBICAL_MIN_VERSION} is needed.")
+      set(LIBICAL_INCLUDE_DIRS "")
+      set(LIBICAL_LIBRARIES "")
+    endif(NOT LIBICAL_VERSION_OK)
+  else(COMPILE_RESULT AND RUN_RESULT EQ 1)
+    #Enable this line the 13 october
+    #message(FATAL_ERROR "Unable to compile or run the libical version detection program.")
+    #Delete this line the 13 october
+    message(STATUS "Unable to compile or run the libical version detection program.")
+  endif(COMPILE_RESULT AND RUN_RESULT EQUAL 1)
 
-  find_path(LIBICAL_INCLUDE_DIR ical.h)
-  find_library(LIBICAL_LIBRARIES NAMES ical )
+endif(LIBICAL_INCLUDE_DIRS AND LIBICAL_LIBRARIES)
 
-  include(FindPackageHandleStandardArgs)
-  FIND_PACKAGE_HANDLE_STANDARD_ARGS(LIBICAL DEFAULT_MSG
-                                    LIBICAL_LIBRARIES LIBICAL_INCLUDE_DIR)
+include(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(LIBICAL DEFAULT_MSG LIBICAL_LIBRARIES LIBICAL_INCLUDE_DIRS)
 
-  mark_as_advanced(LIBICAL_INCLUDE_DIR LIBICAL_LIBRARIES)
+mark_as_advanced(LIBICAL_INCLUDE_DIRS LIBICAL_LIBRARIES)
 
-endif (LIBICAL_INCLUDE_DIR AND LIBICAL_LIBRARIES)
diff -ur kdepimlibs-4.1.4/kcal/CMakeLists.txt kdepimlibs-4.1.4-system-libical/kcal/CMakeLists.txt
--- kdepimlibs-4.1.4/kcal/CMakeLists.txt	2008-07-03 07:05:12.000000000 +0200
+++ kdepimlibs-4.1.4-system-libical/kcal/CMakeLists.txt	2009-01-08 11:10:35.000000000 +0100
@@ -1,209 +1,32 @@
 project(kcal)
 
-# was used by libical, but not anymore
-#if (UNIX)
-#  add_definitions(-DICAL_UNIX_NEWLINE=1)
-#endif (UNIX)
-
-add_definitions(-DPACKAGE_DATA_DIR=\\""${DATA_INSTALL_DIR}/libical"\\" ) # added manually
+find_package(Libical REQUIRED)
 
 add_definitions(-DKDE_DEFAULT_DEBUG_AREA=5800)
 
 include (ConfigureChecks.cmake)
-configure_file (libical/config-libical.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/libical/config-libical.h)
 
 if(KDE4_BUILD_TESTS)
     add_definitions(-DCOMPILING_TESTS)
 endif(KDE4_BUILD_TESTS)
 
 include_directories(
-	${CMAKE_CURRENT_SOURCE_DIR}/libical/src/libicalss/
-	${CMAKE_CURRENT_BINARY_DIR}/libical/src/libicalss/
+	${LIBICAL_INCLUDE_DIRS}
 	${CMAKE_CURRENT_SOURCE_DIR}/versit/
-	${CMAKE_CURRENT_SOURCE_DIR}/libical/src/libical/
-	${CMAKE_CURRENT_BINARY_DIR}/libical/src/libical/
-	${CMAKE_CURRENT_BINARY_DIR}/libical # for config.h
-	${CMAKE_SOURCE_DIR}
+	${CMAKE_CURRENT_SOURCE_DIR}
 	${CMAKE_SOURCE_DIR}/kabc
 	${CMAKE_BINARY_DIR}/kabc
         ${KDE4_INCLUDE_DIR}
 )
 
-set(ICALSCRIPTS ${CMAKE_SOURCE_DIR}/kcal/libical/scripts/ )
-
-set(PROPERTYDEPS 
-        ${ICALSCRIPTS}/mkderivedproperties.pl 
-        ${CMAKE_SOURCE_DIR}/kcal/libical/design-data/properties.csv	
-        ${CMAKE_SOURCE_DIR}/kcal/libical/design-data/value-types.csv
-        ${CMAKE_SOURCE_DIR}/kcal/libical/src/libical/icalderivedproperty.h.in 
-        ${CMAKE_SOURCE_DIR}/kcal/libical/src/libical/icalderivedproperty.c.in 
-)
-
-add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/kcal/libical/icalderivedproperty.h
-                   COMMAND ${PERL_EXECUTABLE} -I ${ICALSCRIPTS} ${ICALSCRIPTS}/mkderivedproperties.pl -i
-                           ${CMAKE_SOURCE_DIR}/kcal/libical/src/libical/icalderivedproperty.h.in
-                           -h  ${CMAKE_SOURCE_DIR}/kcal/libical/design-data/properties.csv 
-                           ${CMAKE_SOURCE_DIR}/kcal/libical/design-data/value-types.csv > ${CMAKE_BINARY_DIR}/kcal/libical/icalderivedproperty.h
-                   DEPENDS  ${PROPERTYDEPS} )
-
-
-add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/kcal/libical/icalderivedproperty.c
-                   COMMAND ${PERL_EXECUTABLE} -I${ICALSCRIPTS} ${ICALSCRIPTS}/mkderivedproperties.pl -i
-                           ${CMAKE_SOURCE_DIR}/kcal/libical/src/libical/icalderivedproperty.c.in
-                           -c ${CMAKE_SOURCE_DIR}/kcal/libical/design-data/properties.csv
-                           ${CMAKE_SOURCE_DIR}/kcal/libical/design-data/value-types.csv > ${CMAKE_BINARY_DIR}/kcal/libical/icalderivedproperty.c
-                   DEPENDS  ${PROPERTYDEPS} ${CMAKE_BINARY_DIR}/kcal/libical/icalderivedproperty.h )
-
-
-# files generated via add_custom_command are added automatically to the clean files, Alex
-#macro_additional_clean_files( 
-#                              ${CMAKE_BINARY_DIR}/kcal/libical/icalderivedproperty.c 
-#                              ${CMAKE_BINARY_DIR}/kcal/libical/icalderivedproperty.h 
-#)
-
-
-set(PARAMETERDEPS 
-	${ICALSCRIPTS}/mkderivedparameters.pl 
-	${CMAKE_SOURCE_DIR}/kcal/libical/design-data/parameters.csv 
-	${CMAKE_SOURCE_DIR}/kcal/libical/src/libical/icalderivedparameter.c.in
-	${CMAKE_SOURCE_DIR}/kcal/libical/src/libical/icalderivedparameter.h.in
-)
-
-add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/kcal/libical/icalderivedparameter.h
-                   COMMAND ${PERL_EXECUTABLE} -I ${ICALSCRIPTS} ${ICALSCRIPTS}/mkderivedparameters.pl -i ${CMAKE_SOURCE_DIR}/kcal/libical/src/libical/icalderivedparameter.h.in 
-                           -h ${CMAKE_SOURCE_DIR}/kcal/libical/design-data/parameters.csv > ${CMAKE_BINARY_DIR}/kcal/libical/icalderivedparameter.h
-                   DEPENDS  ${PARAMETERDEPS} )
-
-add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/kcal/libical/icalderivedparameter.c
-                   COMMAND ${PERL_EXECUTABLE} -I ${ICALSCRIPTS} ${ICALSCRIPTS}/mkderivedparameters.pl -i ${CMAKE_SOURCE_DIR}/kcal/libical/src/libical/icalderivedparameter.c.in 
-                           -c ${CMAKE_SOURCE_DIR}/kcal/libical/design-data/parameters.csv > ${CMAKE_BINARY_DIR}/kcal/libical/icalderivedparameter.c
-                   DEPENDS  ${PARAMETERDEPS} ${CMAKE_BINARY_DIR}/kcal/libical/icalderivedparameter.h )
-
-#files generated via add_custom_command are added automatically to the clean files, Alex
-#macro_additional_clean_files( 
-#	${CMAKE_BINARY_DIR}/kcal/libical/icalderivedparameter.c 
-#	${CMAKE_BINARY_DIR}/kcal/libical/icalderivedparameter.h 
-#)
-
-
-set(RESTRICTIONDEPS 
-	${ICALSCRIPTS}/mkrestrictiontable.pl
-	${CMAKE_SOURCE_DIR}/kcal/libical/design-data/restrictions.csv
-	${CMAKE_SOURCE_DIR}/kcal/libical/src/libical/icalrestriction.c.in
-)
-
-add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/kcal/libical/src/libical/icalrestriction.c
-                   COMMAND ${PERL_EXECUTABLE} -I ${ICALSCRIPTS} ${ICALSCRIPTS}/mkrestrictiontable.pl -i ${CMAKE_SOURCE_DIR}/kcal/libical/src/libical/icalrestriction.c.in 
-                           ${CMAKE_SOURCE_DIR}/kcal/libical/design-data/restrictions.csv > ${CMAKE_BINARY_DIR}/kcal/libical/src/libical/icalrestriction.c   
-                   DEPENDS  ${RESTRICTIONDEPS} )
-
-
-#files generated via add_custom_command are added automatically to the clean files, Alex
-#macro_additional_clean_files( ${CMAKE_BINARY_DIR}/kcal/libical/src/libical/icalrestriction.c)
-
-set(VALUEDEPS
-	${CMAKE_SOURCE_DIR}/kcal/libical/scripts/mkderivedvalues.pl
-	${CMAKE_SOURCE_DIR}/kcal/libical/design-data/value-types.csv
-	${CMAKE_SOURCE_DIR}/kcal/libical/src/libical/icalderivedvalue.c.in
-	${CMAKE_SOURCE_DIR}/kcal/libical/src/libical/icalderivedvalue.h.in
-)
-
-add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/kcal/libical/icalderivedvalue.h 
-                   COMMAND ${PERL_EXECUTABLE} -I${ICALSCRIPTS} ${ICALSCRIPTS}/mkderivedvalues.pl -i ${CMAKE_SOURCE_DIR}/kcal/libical/src/libical/icalderivedvalue.h.in -h ${CMAKE_SOURCE_DIR}/kcal/libical/design-data/value-types.csv > ${CMAKE_BINARY_DIR}/kcal/libical/icalderivedvalue.h   
-                   DEPENDS  ${VALUEDEPS} )
-
-
-add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/kcal/libical/icalderivedvalue.c 
-                   COMMAND ${PERL_EXECUTABLE} -I${ICALSCRIPTS} ${ICALSCRIPTS}/mkderivedvalues.pl -i ${CMAKE_SOURCE_DIR}/kcal/libical/src/libical/icalderivedvalue.c.in -c ${CMAKE_SOURCE_DIR}/kcal/libical/design-data/value-types.csv > ${CMAKE_BINARY_DIR}/kcal/libical/icalderivedvalue.c   
-                   DEPENDS  ${VALUEDEPS} ${CMAKE_BINARY_DIR}/kcal/libical/icalderivedvalue.h )
-
-#files generated via add_custom_command are added automatically to the clean files, Alex
-#macro_additional_clean_files(
-#	${CMAKE_BINARY_DIR}/kcal/libical/icalderivedvalue.h
-#	${CMAKE_BINARY_DIR}/kcal/libical/icalderivedvalue.c
-#)
-
-
-
 set(libversit_SRCS 
    ${CMAKE_SOURCE_DIR}/kcal/versit/vcc.c 
    ${CMAKE_SOURCE_DIR}/kcal/versit/vobject.c 
 )
 
-# Keep absolute paths here, they are used in tests/CMakeLists.txt too.
-set(libical_SRCS
-   ${CMAKE_SOURCE_DIR}/kcal/libical/src/libical/caldate.c       
-   ${CMAKE_SOURCE_DIR}/kcal/libical/src/libical/icalarray.c     
-   ${CMAKE_SOURCE_DIR}/kcal/libical/src/libical/icalattach.c        
-   ${CMAKE_BINARY_DIR}/kcal/libical/icalderivedparameter.c  
-   ${CMAKE_SOURCE_DIR}/kcal/libical/src/libical/icalrecur.c     
-   ${CMAKE_BINARY_DIR}/kcal/libical/src/libical/icalrestriction.c   
-   ${CMAKE_SOURCE_DIR}/kcal/libical/src/libical/icalcomponent.c     
-   ${CMAKE_SOURCE_DIR}/kcal/libical/src/libical/icalenums.c     
-   ${CMAKE_SOURCE_DIR}/kcal/libical/src/libical/icalerror.c     
-   ${CMAKE_SOURCE_DIR}/kcal/libical/src/libical/icalmemory.c        
-   ${CMAKE_SOURCE_DIR}/kcal/libical/src/libical/icalmime.c      
-   ${CMAKE_SOURCE_DIR}/kcal/libical/src/libical/icalparameter.c    
-   ${CMAKE_SOURCE_DIR}/kcal/libical/src/libical/icalparser.c        
-   ${CMAKE_BINARY_DIR}/kcal/libical/icalderivedproperty.c   
-   ${CMAKE_SOURCE_DIR}/kcal/libical/src/libical/icalproperty.c      
-   ${CMAKE_SOURCE_DIR}/kcal/libical/src/libical/icaltime.c      
-   ${CMAKE_SOURCE_DIR}/kcal/libical/src/libical/icalduration.c      
-   ${CMAKE_SOURCE_DIR}/kcal/libical/src/libical/icalperiod.c        
-   ${CMAKE_SOURCE_DIR}/kcal/libical/src/libical/icaltimezone.c      
-   ${CMAKE_SOURCE_DIR}/kcal/libical/src/libical/icaltypes.c     
-   ${CMAKE_SOURCE_DIR}/kcal/libical/src/libical/icalvalue.c     
-   ${CMAKE_BINARY_DIR}/kcal/libical/icalderivedvalue.c  
-   ${CMAKE_SOURCE_DIR}/kcal/libical/src/libical/pvl.c           
-   ${CMAKE_SOURCE_DIR}/kcal/libical/src/libical/sspm.c          
-   ${CMAKE_SOURCE_DIR}/kcal/libical/src/libical/vsnprintf.c     
-)
-
-set(libicalss_SRCS
-   ${CMAKE_SOURCE_DIR}/kcal/libical/src/libicalss/icalclassify.c
-   ${CMAKE_SOURCE_DIR}/kcal/libical/src/libicalss/icalclassify.h
-)
-
-
-macro_additional_clean_files(${CMAKE_BINARY_DIR}/kcal/libical/src/libical/ical.h)
-
-if(WIN32)
-  set(TOPS "\"${CMAKE_SOURCE_DIR}\"")
-  set(TOPB "\"${CMAKE_BINARY_DIR}\"")
-else(WIN32)
-  set(TOPS "${CMAKE_SOURCE_DIR}")
-  set(TOPB "${CMAKE_BINARY_DIR}")
-endif(WIN32)
-
-add_custom_command(OUTPUT
-   ${CMAKE_BINARY_DIR}/kcal/libical/src/libical/ical.h 
-   COMMAND 
-   ${CMAKE_COMMAND} 
-   -DTOPS:FILEPATH=${TOPS}
-   -DTOPB:FILEPATH=${TOPB}
-   -DKDE_FILE_H_FILE:FILEPATH=${CMAKE_BINARY_DIR}/kcal/libical/src/libical/ical.h
-   -P ${CMAKE_SOURCE_DIR}/kcal/ical_file.cmake
-   DEPENDS
-   ${CMAKE_BINARY_DIR}/kcal/libical/icalderivedproperty.h
-   ${CMAKE_BINARY_DIR}/kcal/libical/icalderivedparameter.h
-   ${CMAKE_BINARY_DIR}/kcal/libical/icalderivedvalue.h
-)
-
-macro_additional_clean_files(${CMAKE_BINARY_DIR}/libical/src/libicalss/icalss.h)
-
-add_custom_command(OUTPUT
-   ${CMAKE_BINARY_DIR}/kcal/libical/src/libicalss/icalss.h 
-   COMMAND 
-   ${CMAKE_COMMAND} 
-   -DTOP:FILEPATH=${TOPS}
-   -DKDE_FILE_H_FILE:FILEPATH=${CMAKE_BINARY_DIR}/kcal/libical/src/libicalss/icalss.h
-   -P ${CMAKE_SOURCE_DIR}/kcal/icalss_file.cmake
-)
-
-
 ########### next target ###############
 
-set(kcal_LIB_SRCS ${libversit_SRCS} ${libical_SRCS} ${libicalss_SRCS}
+set(kcal_LIB_SRCS ${libversit_SRCS}
    incidencebase.cpp
    incidence.cpp
    journal.cpp
@@ -258,18 +81,11 @@
 
 kde4_add_library(kcal SHARED ${kcal_LIB_SRCS})
 
-target_link_libraries(kcal ${KDE4_KDEUI_LIBS} ${KDE4_KIO_LIBS} ${QT_QTXML_LIBRARY} kresources kabc kpimutils )
+target_link_libraries(kcal ${KDE4_KDEUI_LIBS} ${KDE4_KIO_LIBS} ${QT_QTXML_LIBRARY} kresources kabc kpimutils ${LIBICAL_LIBRARIES})
 
 set_target_properties(kcal PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION})
 install(TARGETS kcal ${INSTALL_TARGETS_DEFAULT_ARGS} COMPONENT Devel)
 
-# hack to force ical[ss].h creation
-add_custom_target(ical-headers DEPENDS
-        ${CMAKE_BINARY_DIR}/kcal/libical/src/libical/ical.h
-        ${CMAKE_BINARY_DIR}/kcal/libical/src/libicalss/icalss.h
-)
-add_dependencies(kcal ical-headers)
-
 ########### next target ###############
 
 set(kcal_local_PART_SRCS resourcelocal_plugin.cpp )
@@ -296,7 +112,6 @@
 install(TARGETS kcal_localdir  DESTINATION ${PLUGIN_INSTALL_DIR})
 
 
-add_subdirectory( libical )
 add_subdirectory( tests )
 
 ########### install files ###############
diff -ur kdepimlibs-4.1.4/kcal/tests/CMakeLists.txt kdepimlibs-4.1.4-system-libical/kcal/tests/CMakeLists.txt
--- kdepimlibs-4.1.4/kcal/tests/CMakeLists.txt	2008-06-03 11:34:13.000000000 +0200
+++ kdepimlibs-4.1.4-system-libical/kcal/tests/CMakeLists.txt	2009-01-08 11:10:35.000000000 +0100
@@ -2,20 +2,20 @@
 
 include_directories(
  ${CMAKE_SOURCE_DIR}/kcal
- ${CMAKE_BINARY_DIR}/kcal/libical/src
+ ${LIBICAL_INCLUDE_DIRS}
 )
 
 MACRO(KCAL_UNIT_TESTS)
   FOREACH(_testname ${ARGN})
     kde4_add_unit_test(${_testname} NOGUI ${_testname}.cpp)
-    target_link_libraries(${_testname} ${KDE4_KDECORE_LIBS} kcal ${QT_QTTEST_LIBRARY})
+    target_link_libraries(${_testname} ${KDE4_KDECORE_LIBS} kcal ${QT_QTTEST_LIBRARY} ${LIBICAL_LIBRARIES})
   ENDFOREACH(_testname)
 ENDMACRO(KCAL_UNIT_TESTS)
 
 MACRO(KCAL_EXECUTABLE_TESTS)
   FOREACH(_testname ${ARGN})
     kde4_add_executable(${_testname} NOGUI TEST ${_testname}.cpp)
-    target_link_libraries(${_testname} ${KDE4_KDECORE_LIBS} kcal ${QT_QTTEST_LIBRARY})
+    target_link_libraries(${_testname} ${KDE4_KDECORE_LIBS} kcal ${QT_QTTEST_LIBRARY} ${LIBICAL_LIBRARIES})
   ENDFOREACH(_testname)
 ENDMACRO(KCAL_EXECUTABLE_TESTS)
 
@@ -82,32 +82,32 @@
 
 FOREACH( file ${testFiles} )
   GET_FILENAME_COMPONENT( fn ${file} NAME)
-  ADD_TEST( RecurNext-${fn} ${CMAKE_CURRENT_SOURCE_DIR}/runsingletestcase.pl ${EXECUTABLE_OUTPUT_PATH}/testrecurrence "next" ${file} )
+  ADD_TEST( RecurNext-${fn} ${CMAKE_CURRENT_SOURCE_DIR}/runsingletestcase.pl ${EXECUTABLE_OUTPUT_PATH}/testrecurrence.shell "next" ${file} )
 ENDFOREACH(file)
 
 FOREACH( file ${testFiles} )
   GET_FILENAME_COMPONENT( fn ${file} NAME)
-  ADD_TEST( RecurPrev-${fn} ${CMAKE_CURRENT_SOURCE_DIR}/runsingletestcase.pl ${EXECUTABLE_OUTPUT_PATH}/testrecurprevious "prev" ${file} )
+  ADD_TEST( RecurPrev-${fn} ${CMAKE_CURRENT_SOURCE_DIR}/runsingletestcase.pl ${EXECUTABLE_OUTPUT_PATH}/testrecurprevious.shell "prev" ${file} )
 ENDFOREACH(file)
 
 FOREACH( file ${testFiles} )
   GET_FILENAME_COMPONENT( fn ${file} NAME)
-  ADD_TEST( RecursOn-${fn} ${CMAKE_CURRENT_SOURCE_DIR}/runsingletestcase.pl ${EXECUTABLE_OUTPUT_PATH}/testrecurson "recurson" ${file} )
+  ADD_TEST( RecursOn-${fn} ${CMAKE_CURRENT_SOURCE_DIR}/runsingletestcase.pl ${EXECUTABLE_OUTPUT_PATH}/testrecurson.shell "recurson" ${file} )
 ENDFOREACH(file)
 
 FOREACH( file ${compatFiles} )
   GET_FILENAME_COMPONENT( fn ${file} NAME)
-  ADD_TEST( Compat-${fn} ${CMAKE_CURRENT_SOURCE_DIR}/runsingletestcase.pl ${EXECUTABLE_OUTPUT_PATH}/readandwrite "ical" ${file} )
+  ADD_TEST( Compat-${fn} ${CMAKE_CURRENT_SOURCE_DIR}/runsingletestcase.pl ${EXECUTABLE_OUTPUT_PATH}/readandwrite.shell "ical" ${file} )
 ENDFOREACH(file)
 
 FOREACH( file ${vCalFilesAsIcal} )
   GET_FILENAME_COMPONENT( fn ${file} NAME)
-  ADD_TEST( VCalOut-${fn} ${CMAKE_CURRENT_SOURCE_DIR}/runsingletestcase.pl ${EXECUTABLE_OUTPUT_PATH}/testvcalexport "vcal" ${file} )
+  ADD_TEST( VCalOut-${fn} ${CMAKE_CURRENT_SOURCE_DIR}/runsingletestcase.pl ${EXECUTABLE_OUTPUT_PATH}/testvcalexport.shell "vcal" ${file} )
 ENDFOREACH(file)
 
 FOREACH( file ${vCalFiles} )
   GET_FILENAME_COMPONENT( fn ${file} NAME)
-  ADD_TEST( VCalIn-${fn} ${CMAKE_CURRENT_SOURCE_DIR}/runsingletestcase.pl ${EXECUTABLE_OUTPUT_PATH}/readandwrite "ical" ${file} )
+  ADD_TEST( VCalIn-${fn} ${CMAKE_CURRENT_SOURCE_DIR}/runsingletestcase.pl ${EXECUTABLE_OUTPUT_PATH}/readandwrite.shell "ical" ${file} )
 ENDFOREACH(file)
 
 # ADD_TEST( TestRecurrence  runtestcase.pl testrecurrence    "next" ${CMAKE_CURRENT_SOURCE_DIR} data/RecurrenceRule/ "*.ics" )
diff -ur kdepimlibs-4.1.4/kcal/tests/data/vCalendar/KOrganizer_vCalTestCase04.ics.vcal.ref kdepimlibs-4.1.4-system-libical/kcal/tests/data/vCalendar/KOrganizer_vCalTestCase04.ics.vcal.ref
--- kdepimlibs-4.1.4/kcal/tests/data/vCalendar/KOrganizer_vCalTestCase04.ics.vcal.ref	2009-01-06 17:18:55.000000000 +0100
+++ kdepimlibs-4.1.4-system-libical/kcal/tests/data/vCalendar/KOrganizer_vCalTestCase04.ics.vcal.ref	2009-01-08 11:15:32.000000000 +0100
@@ -9,7 +9,7 @@
 SEQUENCE:4
 LAST-MODIFIED:20050520T105750Z
 X-ORGANIZER:MAILTO:reinhold at kainhofer.com
-RRULE:MD3 20 20060630T000000
+RRULE:MD3 20 20060630T040000
 SUMMARY:20. Mai 2005, 16-17 Uhr, alle 3 Monate am 20., bis 30. Juni 2006
 CLASS:PUBLIC
 PRIORITY:5
diff -ur kdepimlibs-4.1.4/kcal/tests/data/vCalendar/KOrganizer_vCalTestCase05.ics.vcal.ref kdepimlibs-4.1.4-system-libical/kcal/tests/data/vCalendar/KOrganizer_vCalTestCase05.ics.vcal.ref
--- kdepimlibs-4.1.4/kcal/tests/data/vCalendar/KOrganizer_vCalTestCase05.ics.vcal.ref	2009-01-06 17:18:55.000000000 +0100
+++ kdepimlibs-4.1.4-system-libical/kcal/tests/data/vCalendar/KOrganizer_vCalTestCase05.ics.vcal.ref	2009-01-08 11:16:12.000000000 +0100
@@ -9,7 +9,7 @@
 SEQUENCE:2
 LAST-MODIFIED:20050520T105740Z
 X-ORGANIZER:MAILTO:reinhold at kainhofer.com
-RRULE:W2 MO WE FR 20050630T000000
+RRULE:W2 MO WE FR 20050630T040000
 SUMMARY:20. Mai 2005, 14-15 Uhr, alle 2 Wochen am Mo/Mi/Fr, bis 30. Juni 2005
 CLASS:PUBLIC
 PRIORITY:5
diff -ur kdepimlibs-4.1.4/kcal/tests/data/vCalendar/KOrganizer_vCalTestCase12.ics.vcal.ref kdepimlibs-4.1.4-system-libical/kcal/tests/data/vCalendar/KOrganizer_vCalTestCase12.ics.vcal.ref
--- kdepimlibs-4.1.4/kcal/tests/data/vCalendar/KOrganizer_vCalTestCase12.ics.vcal.ref	2009-01-06 17:18:55.000000000 +0100
+++ kdepimlibs-4.1.4-system-libical/kcal/tests/data/vCalendar/KOrganizer_vCalTestCase12.ics.vcal.ref	2009-01-08 11:16:50.000000000 +0100
@@ -9,7 +9,7 @@
 SEQUENCE:1
 LAST-MODIFIED:20050520T104819Z
 X-ORGANIZER:MAILTO:reinhold at kainhofer.com
-RRULE:D3 20050630T000000
+RRULE:D3 20050630T040000
 SUMMARY:20. Mai 2005, 13-14 Uhr, alle 3 Tage, bis 30. Juni 2005
 CLASS:PUBLIC
 PRIORITY:5
diff -ur kdepimlibs-4.1.4/kcal/tests/data/vCalendar/KOrganizer_vCalTestCase13.ics.vcal.ref kdepimlibs-4.1.4-system-libical/kcal/tests/data/vCalendar/KOrganizer_vCalTestCase13.ics.vcal.ref
--- kdepimlibs-4.1.4/kcal/tests/data/vCalendar/KOrganizer_vCalTestCase13.ics.vcal.ref	2009-01-06 17:18:55.000000000 +0100
+++ kdepimlibs-4.1.4-system-libical/kcal/tests/data/vCalendar/KOrganizer_vCalTestCase13.ics.vcal.ref	2009-01-08 11:17:14.000000000 +0100
@@ -9,7 +9,7 @@
 SEQUENCE:1
 LAST-MODIFIED:20050520T105327Z
 X-ORGANIZER:MAILTO:reinhold at kainhofer.com
-RRULE:MP3 1- TH 20061231T000000
+RRULE:MP3 1- TH 20061231T050000
 SUMMARY:20. Mai 2005, 20-21 Uhr, alle 3 Monate am letzten Do, bis 31. 12. 2006
 CLASS:PUBLIC
 PRIORITY:5
diff -ur kdepimlibs-4.1.4/kcal/tests/testicaltimezones.cpp kdepimlibs-4.1.4-system-libical/kcal/tests/testicaltimezones.cpp
--- kdepimlibs-4.1.4/kcal/tests/testicaltimezones.cpp	2008-01-05 00:53:16.000000000 +0100
+++ kdepimlibs-4.1.4-system-libical/kcal/tests/testicaltimezones.cpp	2009-01-08 11:10:35.000000000 +0100
@@ -33,7 +33,7 @@
 QTEST_KDEMAIN( ICalTimeZonesTest, NoGUI )
 
 extern "C" {
-  #include "kcal/libical/src/libical/ical.h"
+  #include <ical.h>
 }
 #include "kcal/icaltimezones.h"
 using namespace KCal;
@@ -72,22 +72,22 @@
   "TZOFFSETFROM:-0400\r\n"
   "TZOFFSETTO:-0500\r\n"
   "TZNAME:WST\r\n"
-  "END:STANDARD\r\n\r\n"
+  "END:STANDARD\r\n"
   "BEGIN:DAYLIGHT\r\n"
   "DTSTART:19870405T020000\r\n"
   "RRULE:FREQ=YEARLY;UNTIL=19970406T070000Z;BYDAY=1SU;BYMONTH=4\r\n"
   "TZOFFSETFROM:-0500\r\n"
   "TZOFFSETTO:-0400\r\n"
   "TZNAME:WDT1\r\n"
-  "END:DAYLIGHT\r\n\r\n"
+  "END:DAYLIGHT\r\n"
   "BEGIN:DAYLIGHT\r\n"
   "DTSTART:19990425T020000\r\n"
   "RDATE;VALUE=DATE-TIME:20000430T020000\r\n"
   "TZOFFSETFROM:-0500\r\n"
   "TZOFFSETTO:-0400\r\n"
   "TZNAME:WDT2\r\n"
-  "END:DAYLIGHT\r\n\r\n"
-  "END:VTIMEZONE\r\n\r\n";
+  "END:DAYLIGHT\r\n"
+  "END:VTIMEZONE\r\n";
 
 // Standard time only
 static const char *VTZ_other =
@@ -101,8 +101,8 @@
   "TZOFFSETFROM:+0000\r\n"
   "TZOFFSETTO:+0300\r\n"
   "TZNAME:OST\r\n"
-  "END:STANDARD\r\n\r\n"
-  "END:VTIMEZONE\r\n\r\n";
+  "END:STANDARD\r\n"
+  "END:VTIMEZONE\r\n";
 
 // CALENDAR component header and footer
 static const char *calendarHeader =
@@ -183,6 +183,7 @@
     QCOMPARE(tz.vtimezone(), QByteArray(VTZ_Western));
 
     ICalTimeZone tz1(tz);
+
     QCOMPARE(tz1.name(), tz.name());
     QCOMPARE(tz1.url(), tz.url());
     QCOMPARE(tz1.city(), tz.city());


Index: kdepimlibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdepimlibs/F-9/kdepimlibs.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- kdepimlibs.spec	8 Jan 2009 10:07:32 -0000	1.44
+++ kdepimlibs.spec	8 Jan 2009 10:20:29 -0000	1.45
@@ -29,7 +29,7 @@
 URL: http://www.kde.org/
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdepimlibs-%{version}.tar.bz2
 # Use system libical (will be in 4.2)
-Patch100:      kdepimlibs-4.1.2-system-libical.patch
+Patch100:      kdepimlibs-4.1.4-system-libical.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires: kdelibs4 >= %{version}
@@ -185,6 +185,7 @@
 - update to 4.1.4
 - reenable system libical, #469228 reportedly fixed upstream now
 - also use the system libical on F9
+- rebase system-libical patch (some line endings changed from CR LF to LF)
 
 * Wed Nov 12 2008 Than Ngo <than at redhat.com> 4.1.3-1
 - 4.1.3


--- kdepimlibs-4.1.2-system-libical.patch DELETED ---



From pkgdb at fedoraproject.org  Thu Jan  8 10:24:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 08 Jan 2009 10:24:39 +0000
Subject: [pkgdb] libsyncml ownership updated
Message-ID: <20090108102439.2D7C220831C@bastion.fedora.phx.redhat.com>

Package libsyncml in Fedora devel is now owned by heffer

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libsyncml



From pkgdb at fedoraproject.org  Thu Jan  8 10:24:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 08 Jan 2009 10:24:43 +0000
Subject: [pkgdb] libsyncml had acl change status
Message-ID: <20090108102444.06D99208455@bastion.fedora.phx.redhat.com>

heffer has set the watchcommits acl on libsyncml (Fedora devel) to Approved for heffer

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libsyncml



From pkgdb at fedoraproject.org  Thu Jan  8 10:24:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 08 Jan 2009 10:24:42 +0000
Subject: [pkgdb] libsyncml had acl change status
Message-ID: <20090108102442.0EF3620831F@bastion.fedora.phx.redhat.com>

heffer has set the watchbugzilla acl on libsyncml (Fedora devel) to Approved for heffer

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libsyncml



From pkgdb at fedoraproject.org  Thu Jan  8 10:24:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 08 Jan 2009 10:24:44 +0000
Subject: [pkgdb] libsyncml had acl change status
Message-ID: <20090108102444.DF48A208457@bastion.fedora.phx.redhat.com>

heffer has set the approveacls acl on libsyncml (Fedora devel) to Approved for heffer

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libsyncml



From peter at fedoraproject.org  Thu Jan  8 10:26:45 2009
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Thu,  8 Jan 2009 10:26:45 +0000 (UTC)
Subject: rpms/flashrom/devel .cvsignore, 1.11,
	1.12 flashrom--Makefile_cleanup.diff, 1.4, 1.5 flashrom.spec,
	1.14, 1.15 import.log, 1.3, 1.4 sources, 1.11, 1.12
Message-ID: <20090108102645.8E4AA7013F@cvs1.fedora.phx.redhat.com>

Author: peter

Update of /cvs/extras/rpms/flashrom/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9904/devel

Modified Files:
	.cvsignore flashrom--Makefile_cleanup.diff flashrom.spec 
	import.log sources 
Log Message:
svn ver. 3852


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/flashrom/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	3 Nov 2008 08:40:38 -0000	1.11
+++ .cvsignore	8 Jan 2009 10:26:14 -0000	1.12
@@ -1 +1 @@
-flashrom-3723.tar.bz2
+flashrom-3852.tar.bz2

flashrom--Makefile_cleanup.diff:

Index: flashrom--Makefile_cleanup.diff
===================================================================
RCS file: /cvs/extras/rpms/flashrom/devel/flashrom--Makefile_cleanup.diff,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- flashrom--Makefile_cleanup.diff	7 Jul 2008 17:38:19 -0000	1.4
+++ flashrom--Makefile_cleanup.diff	8 Jan 2009 10:26:15 -0000	1.5
@@ -7,8 +7,8 @@
 -PREFIX  = /usr/local
 +PREFIX  = /usr
  #CFLAGS  = -O2 -g -Wall -Werror
--CFLAGS  = -Os -Wall -Werror # -DTS5300
-+#CFLAGS  = -Os -Wall -Werror # -DTS5300
+-CFLAGS  = -Os -Wall -Werror
++#CFLAGS  = -Os -Wall -Werror
  OS_ARCH	= $(shell uname)
  ifeq ($(OS_ARCH), SunOS)
  LDFLAGS = -lpci -lz


Index: flashrom.spec
===================================================================
RCS file: /cvs/extras/rpms/flashrom/devel/flashrom.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- flashrom.spec	3 Nov 2008 08:40:38 -0000	1.14
+++ flashrom.spec	8 Jan 2009 10:26:15 -0000	1.15
@@ -1,9 +1,9 @@
-%define svnver 3723
+%define svnver 3852
 Summary:	Simple program for reading/writing BIOS chips content
 Name:		flashrom
 Version:	0
-Release:	0.14.20081103svn%{svnver}%{?dist}
-License:	GPLv2+
+Release:	0.15.20090112svn%{svnver}%{?dist}
+License:	GPLv2
 Group:		Applications/System
 # svn -r %{svnver} export svn://coreboot.org/repos/trunk/util/flashrom flashrom
 # tar -cjvf flashrom-%{svnver}.tar.bz2 flashrom
@@ -45,6 +45,18 @@
 %{_mandir}/man8/%{name}.*
 
 %changelog
+* Thu Jan  8 2009 Peter Lemenkov <lemenkov at gmail.com> 0-0.15.20090112svn3852
+- Changed license to GPLv2
+- SST49LF020 support
+- AMD-768 chipset support
+- i631x LPC support
+- Support the MX29LV040C
+- AMD SB700 flash enable
+- Support for the AMD/ATI SB600 southbridge SPI
+- SST25VF080B flash chip support
+- Support for 32Mbit SPI flash SST25VF032B
+- Support for bunch of Fujitsu and Macronix chips
+
 * Mon Nov  3 2008 Peter Lemenkov <lemenkov at gmail.com> 0-0.14.20081103svn3723
 - Dump ICH8/ICH9/ICH10 SPI registers
 - Add additional SPI sector erase and chip erase command


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/flashrom/devel/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- import.log	3 Nov 2008 08:40:38 -0000	1.3
+++ import.log	8 Jan 2009 10:26:15 -0000	1.4
@@ -1,3 +1,4 @@
 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
 flashrom-0-0_14_20081103svn3723_fc9:HEAD:flashrom-0-0.14.20081103svn3723.fc9.src.rpm:1225701590
+flashrom-0-0_15_20090112svn3852_fc10:HEAD:flashrom-0-0.15.20090112svn3852.fc10.src.rpm:1231410331


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/flashrom/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	3 Nov 2008 08:40:38 -0000	1.11
+++ sources	8 Jan 2009 10:26:15 -0000	1.12
@@ -1 +1 @@
-37fb45aa795a6c79f0518d99e33626d4  flashrom-3723.tar.bz2
+4253d2a2a70ec3335c4b2a2bf40eefb8  flashrom-3852.tar.bz2



From tbzatek at fedoraproject.org  Thu Jan  8 10:33:34 2009
From: tbzatek at fedoraproject.org (Tomas Bzatek)
Date: Thu,  8 Jan 2009 10:33:34 +0000 (UTC)
Subject: rpms/libarchive/devel .cvsignore, 1.6, 1.7 libarchive.spec, 1.6,
	1.7 sources, 1.6, 1.7
Message-ID: <20090108103334.0C995700FD@cvs1.fedora.phx.redhat.com>

Author: tbzatek

Update of /cvs/extras/rpms/libarchive/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11162

Modified Files:
	.cvsignore libarchive.spec sources 
Log Message:
* Thu Jan  8 2009 Tomas Bzatek <tbzatek at redhat.com> 2.6.0-1
- Update to 2.6.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libarchive/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	15 Dec 2008 16:24:46 -0000	1.6
+++ .cvsignore	8 Jan 2009 10:33:03 -0000	1.7
@@ -1 +1 @@
-libarchive-2.5.904a.tar.gz
+libarchive-2.6.0.tar.gz


Index: libarchive.spec
===================================================================
RCS file: /cvs/extras/rpms/libarchive/devel/libarchive.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- libarchive.spec	15 Dec 2008 16:24:46 -0000	1.6
+++ libarchive.spec	8 Jan 2009 10:33:03 -0000	1.7
@@ -1,12 +1,12 @@
 Name:           libarchive
-Version:        2.5.904a
+Version:        2.6.0
 Release:        1%{?dist}
 Summary:        A library for handling streaming archive formats 
 
 Group:          System Environment/Libraries
 License:        BSD
-URL:            http://people.freebsd.org/~kientzle/libarchive/
-Source0:        http://people.freebsd.org/~kientzle/libarchive/src/libarchive-%{version}.tar.gz
+URL:            http://code.google.com/p/libarchive/
+Source0:        http://libarchive.googlecode.com/files/libarchive-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: zlib-devel
@@ -76,6 +76,9 @@
 
 
 %changelog
+* Thu Jan  8 2009 Tomas Bzatek <tbzatek at redhat.com> 2.6.0-1
+- Update to 2.6.0
+
 * Mon Dec 15 2008 Tomas Bzatek <tbzatek at redhat.com> 2.5.904a-1
 - Update to 2.5.904a
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libarchive/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	15 Dec 2008 16:24:46 -0000	1.6
+++ sources	8 Jan 2009 10:33:03 -0000	1.7
@@ -1 +1 @@
-ecb969989db30203458bf218590efb7a  libarchive-2.5.904a.tar.gz
+e8ceea99a86b022e192a06d2b411a29b  libarchive-2.6.0.tar.gz



From jakub at fedoraproject.org  Thu Jan  8 10:44:39 2009
From: jakub at fedoraproject.org (Jakub Jelinek)
Date: Thu,  8 Jan 2009 10:44:39 +0000 (UTC)
Subject: rpms/glibc/devel .cvsignore, 1.259, 1.260 glibc-fedora.patch, 1.289,
	1.290 glibc.spec, 1.374, 1.375 import.log, 1.3, 1.4 sources,
	1.284, 1.285
Message-ID: <20090108104439.6F10E700FD@cvs1.fedora.phx.redhat.com>

Author: jakub

Update of /cvs/pkgs/rpms/glibc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12232/devel

Modified Files:
	.cvsignore glibc-fedora.patch glibc.spec import.log sources 
Log Message:
2.9.90-2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/glibc/devel/.cvsignore,v
retrieving revision 1.259
retrieving revision 1.260
diff -u -r1.259 -r1.260
--- .cvsignore	2 Jan 2009 22:17:46 -0000	1.259
+++ .cvsignore	8 Jan 2009 10:44:07 -0000	1.260
@@ -1,2 +1,2 @@
-glibc-20090102T2110.tar.bz2
-glibc-fedora-20090102T2110.tar.bz2
+glibc-20090108T1017.tar.bz2
+glibc-fedora-20090108T1017.tar.bz2

glibc-fedora.patch:

Index: glibc-fedora.patch
===================================================================
RCS file: /cvs/pkgs/rpms/glibc/devel/glibc-fedora.patch,v
retrieving revision 1.289
retrieving revision 1.290
diff -u -r1.289 -r1.290
--- glibc-fedora.patch	2 Jan 2009 22:17:46 -0000	1.289
+++ glibc-fedora.patch	8 Jan 2009 10:44:07 -0000	1.290
@@ -1,6 +1,6 @@
---- glibc-20090102T2110/ChangeLog	2 Jan 2009 19:28:55 -0000	1.11430
-+++ glibc-20090102T2110-fedora/ChangeLog	2 Jan 2009 21:13:52 -0000	1.8782.2.316
-@@ -6135,6 +6135,13 @@
+--- glibc-20090108T1017/ChangeLog	8 Jan 2009 10:16:11 -0000	1.11440
++++ glibc-20090108T1017-fedora/ChangeLog	8 Jan 2009 10:27:02 -0000	1.8782.2.317
+@@ -6207,6 +6207,13 @@
  	* include/sys/cdefs.h: Redefine __nonnull so that test for
  	incorrect parameters in the libc code itself are not omitted.
  
@@ -14,7 +14,7 @@
  2007-05-09  Jakub Jelinek  <jakub at redhat.com>
  
  	* sysdeps/ia64/fpu/fraiseexcpt.c (feraiseexcept): Don't raise overflow
-@@ -6430,6 +6437,10 @@
+@@ -6502,6 +6509,10 @@
  	[BZ #4368]
  	* stdlib/stdlib.h: Remove obsolete part of comment for realpath.
  
@@ -25,7 +25,7 @@
  2007-04-16  Ulrich Drepper  <drepper at redhat.com>
  
  	[BZ #4364]
-@@ -7687,6 +7698,15 @@
+@@ -7759,6 +7770,15 @@
  	separators also if no non-zero digits found.
  	* stdlib/Makefile (tests): Add tst-strtod3.
  
@@ -41,8 +41,8 @@
  2006-12-09  Ulrich Drepper  <drepper at redhat.com>
  
  	[BZ #3632]
---- glibc-20090102T2110/ChangeLog.15	16 Feb 2005 07:34:17 -0000	1.1
-+++ glibc-20090102T2110-fedora/ChangeLog.15	19 Dec 2006 19:05:40 -0000	1.1.6.3
+--- glibc-20090108T1017/ChangeLog.15	16 Feb 2005 07:34:17 -0000	1.1
++++ glibc-20090108T1017-fedora/ChangeLog.15	19 Dec 2006 19:05:40 -0000	1.1.6.3
 @@ -477,6 +477,14 @@
  
  2004-11-26  Jakub Jelinek  <jakub at redhat.com>
@@ -108,8 +108,8 @@
  2004-08-30  Roland McGrath  <roland at frob.com>
  
  	* scripts/extract-abilist.awk: If `lastversion' variable defined, omit
---- glibc-20090102T2110/ChangeLog.16	4 May 2006 16:05:24 -0000	1.1
-+++ glibc-20090102T2110-fedora/ChangeLog.16	5 May 2006 06:11:52 -0000	1.1.2.1
+--- glibc-20090108T1017/ChangeLog.16	4 May 2006 16:05:24 -0000	1.1
++++ glibc-20090108T1017-fedora/ChangeLog.16	5 May 2006 06:11:52 -0000	1.1.2.1
 @@ -171,6 +171,11 @@
  	[BZ #2611]
  	* stdio-common/renameat.c (renameat): Fix typo.
@@ -281,8 +281,8 @@
  2005-02-10  Roland McGrath  <roland at redhat.com>
  
  	[BZ #157]
---- glibc-20090102T2110/csu/Makefile	1 Mar 2006 10:35:47 -0000	1.79
-+++ glibc-20090102T2110-fedora/csu/Makefile	30 Nov 2006 17:07:37 -0000	1.74.2.6
+--- glibc-20090108T1017/csu/Makefile	1 Mar 2006 10:35:47 -0000	1.79
++++ glibc-20090108T1017-fedora/csu/Makefile	30 Nov 2006 17:07:37 -0000	1.74.2.6
 @@ -93,7 +93,8 @@ omit-deps += $(crtstuff)
  $(crtstuff:%=$(objpfx)%.o): %.o: %.S $(objpfx)defs.h
  	$(compile.S) -g0 $(ASFLAGS-.os) -o $@
@@ -293,8 +293,8 @@
  
  vpath initfini.c $(sysdirs)
  
---- glibc-20090102T2110/csu/elf-init.c	5 Nov 2005 17:41:38 -0000	1.8
-+++ glibc-20090102T2110-fedora/csu/elf-init.c	15 Nov 2005 09:54:10 -0000	1.3.2.6
+--- glibc-20090108T1017/csu/elf-init.c	5 Nov 2005 17:41:38 -0000	1.8
++++ glibc-20090108T1017-fedora/csu/elf-init.c	15 Nov 2005 09:54:10 -0000	1.3.2.6
 @@ -49,6 +49,23 @@ extern void (*__init_array_end []) (int,
  extern void (*__fini_array_start []) (void) attribute_hidden;
  extern void (*__fini_array_end []) (void) attribute_hidden;
@@ -319,8 +319,8 @@
  
  /* These function symbols are provided for the .init/.fini section entry
     points automagically by the linker.  */
---- glibc-20090102T2110/debug/tst-chk1.c	5 Mar 2008 06:51:37 -0000	1.19
-+++ glibc-20090102T2110-fedora/debug/tst-chk1.c	5 Mar 2008 09:37:40 -0000	1.1.2.19
+--- glibc-20090108T1017/debug/tst-chk1.c	5 Mar 2008 06:51:37 -0000	1.19
++++ glibc-20090108T1017-fedora/debug/tst-chk1.c	5 Mar 2008 09:37:40 -0000	1.1.2.19
 @@ -17,6 +17,9 @@
     Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
     02111-1307 USA.  */
@@ -349,8 +349,8 @@
  #  define O 0
  # else
  #  define O 1
---- glibc-20090102T2110/elf/ldconfig.c	2 Jan 2009 08:46:29 -0000	1.64
-+++ glibc-20090102T2110-fedora/elf/ldconfig.c	2 Jan 2009 21:13:54 -0000	1.47.2.19
+--- glibc-20090108T1017/elf/ldconfig.c	2 Jan 2009 08:46:29 -0000	1.64
++++ glibc-20090108T1017-fedora/elf/ldconfig.c	2 Jan 2009 21:13:54 -0000	1.47.2.19
 @@ -1000,17 +1000,19 @@ search_dirs (void)
  
  
@@ -432,8 +432,8 @@
      }
  
    if (! opt_ignore_aux_cache)
---- glibc-20090102T2110/elf/tst-stackguard1.c	26 Jun 2005 18:08:36 -0000	1.1
-+++ glibc-20090102T2110-fedora/elf/tst-stackguard1.c	8 Aug 2005 21:24:27 -0000	1.1.2.3
+--- glibc-20090108T1017/elf/tst-stackguard1.c	26 Jun 2005 18:08:36 -0000	1.1
++++ glibc-20090108T1017-fedora/elf/tst-stackguard1.c	8 Aug 2005 21:24:27 -0000	1.1.2.3
 @@ -160,17 +160,21 @@ do_test (void)
       the 16 runs, something is very wrong.  */
    int ndifferences = 0;
@@ -458,8 +458,8 @@
      {
        puts ("stack guard canaries are not randomized enough");
        puts ("nor equal to the default canary value");
---- glibc-20090102T2110/include/features.h	13 Nov 2008 21:41:25 -0000	1.51
-+++ glibc-20090102T2110-fedora/include/features.h	13 Nov 2008 22:19:33 -0000	1.35.2.21
+--- glibc-20090108T1017/include/features.h	13 Nov 2008 21:41:25 -0000	1.51
++++ glibc-20090108T1017-fedora/include/features.h	13 Nov 2008 22:19:33 -0000	1.35.2.21
 @@ -282,8 +282,13 @@
  #endif
  
@@ -476,16 +476,16 @@
  #  define __USE_FORTIFY_LEVEL 2
  # else
  #  define __USE_FORTIFY_LEVEL 1
---- glibc-20090102T2110/include/bits/stdlib-ldbl.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20090102T2110-fedora/include/bits/stdlib-ldbl.h	1 Feb 2006 09:30:43 -0000	1.1.2.1
+--- glibc-20090108T1017/include/bits/stdlib-ldbl.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20090108T1017-fedora/include/bits/stdlib-ldbl.h	1 Feb 2006 09:30:43 -0000	1.1.2.1
 @@ -0,0 +1 @@
 +#include <stdlib/bits/stdlib-ldbl.h>
---- glibc-20090102T2110/include/bits/wchar-ldbl.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20090102T2110-fedora/include/bits/wchar-ldbl.h	1 Feb 2006 09:30:43 -0000	1.1.2.1
+--- glibc-20090108T1017/include/bits/wchar-ldbl.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20090108T1017-fedora/include/bits/wchar-ldbl.h	1 Feb 2006 09:30:43 -0000	1.1.2.1
 @@ -0,0 +1 @@
 +#include <wcsmbs/bits/wchar-ldbl.h>
---- glibc-20090102T2110/intl/locale.alias	28 Oct 2007 01:39:54 -0000	1.24
-+++ glibc-20090102T2110-fedora/intl/locale.alias	12 Dec 2007 18:13:23 -0000	1.23.2.2
+--- glibc-20090108T1017/intl/locale.alias	28 Oct 2007 01:39:54 -0000	1.24
++++ glibc-20090108T1017-fedora/intl/locale.alias	12 Dec 2007 18:13:23 -0000	1.23.2.2
 @@ -57,8 +57,6 @@ korean		ko_KR.eucKR
  korean.euc 	ko_KR.eucKR
  ko_KR		ko_KR.eucKR
@@ -495,8 +495,8 @@
  norwegian       nb_NO.ISO-8859-1
  nynorsk		nn_NO.ISO-8859-1
  polish          pl_PL.ISO-8859-2
---- glibc-20090102T2110/libio/stdio.h	24 May 2008 18:14:36 -0000	1.93
-+++ glibc-20090102T2110-fedora/libio/stdio.h	24 May 2008 22:22:18 -0000	1.78.2.14
+--- glibc-20090108T1017/libio/stdio.h	24 May 2008 18:14:36 -0000	1.93
++++ glibc-20090108T1017-fedora/libio/stdio.h	24 May 2008 22:22:18 -0000	1.78.2.14
 @@ -145,10 +145,12 @@ typedef _G_fpos64_t fpos64_t;
  extern struct _IO_FILE *stdin;		/* Standard input stream.  */
  extern struct _IO_FILE *stdout;		/* Standard output stream.  */
@@ -510,8 +510,8 @@
  
  __BEGIN_NAMESPACE_STD
  /* Remove file FILENAME.  */
---- glibc-20090102T2110/locale/iso-4217.def	17 Feb 2007 07:46:20 -0000	1.20
-+++ glibc-20090102T2110-fedora/locale/iso-4217.def	21 Feb 2007 11:15:50 -0000	1.15.2.5
+--- glibc-20090108T1017/locale/iso-4217.def	17 Feb 2007 07:46:20 -0000	1.20
++++ glibc-20090108T1017-fedora/locale/iso-4217.def	21 Feb 2007 11:15:50 -0000	1.15.2.5
 @@ -8,6 +8,7 @@
   *
   * !!! The list has to be sorted !!!
@@ -603,8 +603,8 @@
  DEFINE_INT_CURR("PYG")		/* Paraguay Guarani  */
  DEFINE_INT_CURR("QAR")		/* Qatar Rial  */
  DEFINE_INT_CURR("ROL")		/* Romanian Leu  */
---- glibc-20090102T2110/locale/programs/locarchive.c	16 Jul 2007 00:54:59 -0000	1.25
-+++ glibc-20090102T2110-fedora/locale/programs/locarchive.c	31 Jul 2007 17:45:53 -0000	1.21.2.4
+--- glibc-20090108T1017/locale/programs/locarchive.c	16 Jul 2007 00:54:59 -0000	1.25
++++ glibc-20090108T1017-fedora/locale/programs/locarchive.c	31 Jul 2007 17:45:53 -0000	1.21.2.4
 @@ -222,9 +222,9 @@ oldlocrecentcmp (const void *a, const vo
  /* forward decls for below */
  static uint32_t add_locale (struct locarhandle *ah, const char *name,
@@ -636,8 +636,8 @@
  add_alias (struct locarhandle *ah, const char *alias, bool replace,
  	   const char *oldname, uint32_t *locrec_offset_p)
  {
---- glibc-20090102T2110/localedata/Makefile	31 Oct 2008 15:12:03 -0000	1.109
-+++ glibc-20090102T2110-fedora/localedata/Makefile	31 Oct 2008 21:33:57 -0000	1.101.2.9
+--- glibc-20090108T1017/localedata/Makefile	31 Oct 2008 15:12:03 -0000	1.109
++++ glibc-20090108T1017-fedora/localedata/Makefile	31 Oct 2008 21:33:57 -0000	1.101.2.9
 @@ -225,6 +225,7 @@ $(INSTALL-SUPPORTED-LOCALES): install-lo
  	echo -n '...'; \
  	input=`echo $$locale | sed 's/\([^.]*\)[^@]*\(.*\)/\1\2/'`; \
@@ -646,8 +646,8 @@
  		     -i locales/$$input -c -f charmaps/$$charset \
  		     $(addprefix --prefix=,$(install_root)) $$locale; \
  	echo ' done'; \
---- glibc-20090102T2110/localedata/SUPPORTED	6 Dec 2008 03:02:45 -0000	1.115
-+++ glibc-20090102T2110-fedora/localedata/SUPPORTED	2 Jan 2009 21:13:56 -0000	1.71.2.23
+--- glibc-20090108T1017/localedata/SUPPORTED	6 Dec 2008 03:02:45 -0000	1.115
++++ glibc-20090108T1017-fedora/localedata/SUPPORTED	2 Jan 2009 21:13:56 -0000	1.71.2.23
 @@ -84,6 +84,7 @@ cy_GB.UTF-8/UTF-8 \
  cy_GB/ISO-8859-14 \
  da_DK.UTF-8/UTF-8 \
@@ -689,8 +689,8 @@
  ta_IN/UTF-8 \
  te_IN/UTF-8 \
  tg_TJ.UTF-8/UTF-8 \
---- glibc-20090102T2110/localedata/locales/cy_GB	28 Sep 2004 04:37:33 -0000	1.4
-+++ glibc-20090102T2110-fedora/localedata/locales/cy_GB	29 Sep 2004 08:48:23 -0000	1.3.2.2
+--- glibc-20090108T1017/localedata/locales/cy_GB	28 Sep 2004 04:37:33 -0000	1.4
++++ glibc-20090108T1017-fedora/localedata/locales/cy_GB	29 Sep 2004 08:48:23 -0000	1.3.2.2
 @@ -248,8 +248,11 @@ mon         "<U0049><U006F><U006E><U0061
  d_t_fmt     "<U0044><U0079><U0064><U0064><U0020><U0025><U0041><U0020><U0025><U0064><U0020><U006d><U0069><U0073><U0020><U0025><U0042><U0020><U0025><U0059><U0020><U0025><U0054><U0020><U0025><U005A>"
  d_fmt       "<U0025><U0064><U002E><U0025><U006D><U002E><U0025><U0079>"
@@ -705,8 +705,8 @@
  END LC_TIME
  
  LC_MESSAGES
---- glibc-20090102T2110/localedata/locales/en_GB	31 Oct 2008 19:00:57 -0000	1.18
-+++ glibc-20090102T2110-fedora/localedata/locales/en_GB	31 Oct 2008 21:33:57 -0000	1.10.2.7
+--- glibc-20090108T1017/localedata/locales/en_GB	31 Oct 2008 19:00:57 -0000	1.18
++++ glibc-20090108T1017-fedora/localedata/locales/en_GB	31 Oct 2008 21:33:57 -0000	1.10.2.7
 @@ -116,8 +116,8 @@ mon         "<U004A><U0061><U006E><U0075
  d_t_fmt     "<U0025><U0061><U0020><U0025><U0064><U0020><U0025><U0062><U0020><U0025><U0059><U0020><U0025><U0054><U0020><U0025><U005A>"
  d_fmt       "<U0025><U0064><U002F><U0025><U006D><U002F><U0025><U0079>"
@@ -718,8 +718,8 @@
  date_fmt	"<U0025><U0061><U0020><U0025><U0062><U0020><U0025><U0065>/
  <U0020><U0025><U0048><U003A><U0025><U004D><U003A><U0025><U0053><U0020>/
  <U0025><U005A><U0020><U0025><U0059>"
---- glibc-20090102T2110/localedata/locales/no_NO 1 Jan 1970 00:00:00 -0000
-+++ glibc-20090102T2110-fedora/localedata/locales/no_NO	22 Sep 2004 21:21:01 -0000	1.11.2.1
+--- glibc-20090108T1017/localedata/locales/no_NO 1 Jan 1970 00:00:00 -0000
++++ glibc-20090108T1017-fedora/localedata/locales/no_NO	22 Sep 2004 21:21:01 -0000	1.11.2.1
 @@ -0,0 +1,69 @@
 +escape_char	/
 +comment_char    %
@@ -790,8 +790,8 @@
 +LC_ADDRESS
 +copy "nb_NO"
 +END LC_ADDRESS
---- glibc-20090102T2110/localedata/locales/zh_TW	31 Oct 2004 23:42:28 -0000	1.7
-+++ glibc-20090102T2110-fedora/localedata/locales/zh_TW	2 Nov 2004 12:25:57 -0000	1.5.2.2
+--- glibc-20090108T1017/localedata/locales/zh_TW	31 Oct 2004 23:42:28 -0000	1.7
++++ glibc-20090108T1017-fedora/localedata/locales/zh_TW	2 Nov 2004 12:25:57 -0000	1.5.2.2
 @@ -1,7 +1,7 @@
  comment_char %
  escape_char /
@@ -819,8 +819,8 @@
  revision   "0.2"
  date       "2000-08-02"
  %
---- glibc-20090102T2110/malloc/mcheck.c	19 May 2007 04:27:20 -0000	1.20
-+++ glibc-20090102T2110-fedora/malloc/mcheck.c	21 May 2007 20:01:08 -0000	1.18.2.2
+--- glibc-20090108T1017/malloc/mcheck.c	19 May 2007 04:27:20 -0000	1.20
++++ glibc-20090108T1017-fedora/malloc/mcheck.c	21 May 2007 20:01:08 -0000	1.18.2.2
 @@ -24,9 +24,25 @@
  # include <mcheck.h>
  # include <stdint.h>
@@ -896,8 +896,8 @@
  
        old_free_hook = __free_hook;
        __free_hook = freehook;
---- glibc-20090102T2110/manual/libc.texinfo	31 Jan 2008 01:43:04 -0000	1.98
-+++ glibc-20090102T2110-fedora/manual/libc.texinfo	31 Jan 2008 08:43:19 -0000	1.94.2.4
+--- glibc-20090108T1017/manual/libc.texinfo	31 Jan 2008 01:43:04 -0000	1.98
++++ glibc-20090108T1017-fedora/manual/libc.texinfo	31 Jan 2008 08:43:19 -0000	1.94.2.4
 @@ -5,7 +5,7 @@
  @c setchapternewpage odd
  
@@ -907,8 +907,8 @@
  @direntry
  * Libc: (libc).                 C library.
  @end direntry
---- glibc-20090102T2110/misc/sys/cdefs.h	3 Oct 2007 18:27:02 -0000	1.73
-+++ glibc-20090102T2110-fedora/misc/sys/cdefs.h	3 Oct 2007 19:32:28 -0000	1.58.2.10
+--- glibc-20090108T1017/misc/sys/cdefs.h	3 Oct 2007 18:27:02 -0000	1.73
++++ glibc-20090108T1017-fedora/misc/sys/cdefs.h	3 Oct 2007 19:32:28 -0000	1.58.2.10
 @@ -132,7 +132,10 @@
  #define __bos(ptr) __builtin_object_size (ptr, __USE_FORTIFY_LEVEL > 1)
  #define __bos0(ptr) __builtin_object_size (ptr, 0)
@@ -952,17 +952,17 @@
  # define __va_arg_pack() __builtin_va_arg_pack ()
  # define __va_arg_pack_len() __builtin_va_arg_pack_len ()
  #endif
---- glibc-20090102T2110/nis/nss	28 Apr 2006 21:02:23 -0000	1.3
-+++ glibc-20090102T2110-fedora/nis/nss	1 May 2006 08:02:53 -0000	1.2.2.2
+--- glibc-20090108T1017/nis/nss	28 Apr 2006 21:02:23 -0000	1.3
++++ glibc-20090108T1017-fedora/nis/nss	1 May 2006 08:02:53 -0000	1.2.2.2
 @@ -25,4 +25,4 @@
  #  memory with every getXXent() call.  Otherwise each getXXent() call
  #  might result into a network communication with the server to get
  #  the next entry.
 -#SETENT_BATCH_READ=TRUE
 +SETENT_BATCH_READ=TRUE
---- glibc-20090102T2110/nptl/ChangeLog	29 Dec 2008 19:34:02 -0000	1.1091
-+++ glibc-20090102T2110-fedora/nptl/ChangeLog	2 Jan 2009 21:13:57 -0000	1.706.2.165
-@@ -3341,6 +3341,15 @@
+--- glibc-20090108T1017/nptl/ChangeLog	4 Jan 2009 18:10:04 -0000	1.1096
++++ glibc-20090108T1017-fedora/nptl/ChangeLog	8 Jan 2009 10:27:03 -0000	1.706.2.166
+@@ -3370,6 +3370,15 @@
  	Use __sigfillset.  Document that sigfillset does the right thing wrt
  	to SIGSETXID.
  
@@ -978,7 +978,7 @@
  2005-07-11  Jakub Jelinek  <jakub at redhat.com>
  
  	[BZ #1102]
-@@ -4077,6 +4086,11 @@
+@@ -4106,6 +4115,11 @@
  	Move definition inside libpthread, libc, librt check.  Provide
  	definition for rtld.
  
@@ -990,7 +990,7 @@
  2004-09-02  Ulrich Drepper  <drepper at redhat.com>
  
  	* sysdeps/alpha/jmpbuf-unwind.h: Define __libc_unwind_longjmp.
-@@ -6151,6 +6165,11 @@
+@@ -6180,6 +6194,11 @@
  
  	* Makefile [$(build-shared) = yes] (tests): Depend on $(test-modules).
  
@@ -1002,8 +1002,8 @@
  2003-07-25  Jakub Jelinek  <jakub at redhat.com>
  
  	* tst-cancel17.c (do_test): Check if aio_cancel failed.
---- glibc-20090102T2110/nptl/Makefile	12 Nov 2008 13:38:23 -0000	1.195
-+++ glibc-20090102T2110-fedora/nptl/Makefile	12 Nov 2008 20:29:34 -0000	1.157.2.37
+--- glibc-20090108T1017/nptl/Makefile	12 Nov 2008 13:38:23 -0000	1.195
++++ glibc-20090108T1017-fedora/nptl/Makefile	12 Nov 2008 20:29:34 -0000	1.157.2.37
 @@ -339,7 +339,8 @@ endif
  extra-objs += $(crti-objs) $(crtn-objs)
  omit-deps += crti crtn
@@ -1036,8 +1036,8 @@
  else
  $(addprefix $(objpfx),$(tests) $(test-srcs)): $(objpfx)libpthread.a
  endif
---- glibc-20090102T2110/nptl/tst-stackguard1.c	26 Jun 2005 17:44:14 -0000	1.1
-+++ glibc-20090102T2110-fedora/nptl/tst-stackguard1.c	8 Aug 2005 21:24:28 -0000	1.1.2.3
+--- glibc-20090108T1017/nptl/tst-stackguard1.c	26 Jun 2005 17:44:14 -0000	1.1
++++ glibc-20090108T1017-fedora/nptl/tst-stackguard1.c	8 Aug 2005 21:24:28 -0000	1.1.2.3
 @@ -190,17 +190,21 @@ do_test (void)
       the 16 runs, something is very wrong.  */
    int ndifferences = 0;
@@ -1062,8 +1062,8 @@
      {
        puts ("stack guard canaries are not randomized enough");
        puts ("nor equal to the default canary value");
---- glibc-20090102T2110/nptl/sysdeps/unix/sysv/linux/kernel-features.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20090102T2110-fedora/nptl/sysdeps/unix/sysv/linux/kernel-features.h	22 Sep 2004 21:21:02 -0000	1.1.2.1
+--- glibc-20090108T1017/nptl/sysdeps/unix/sysv/linux/kernel-features.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20090108T1017-fedora/nptl/sysdeps/unix/sysv/linux/kernel-features.h	22 Sep 2004 21:21:02 -0000	1.1.2.1
 @@ -0,0 +1,6 @@
 +#include_next <kernel-features.h>
 +
@@ -1071,8 +1071,8 @@
 +#ifndef __ASSUME_CLONE_THREAD_FLAGS
 +# define __ASSUME_CLONE_THREAD_FLAGS	1
 +#endif
---- glibc-20090102T2110/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h	8 Mar 2008 01:57:04 -0000	1.16
-+++ glibc-20090102T2110-fedora/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h	14 Mar 2008 22:36:45 -0000	1.8.2.9
+--- glibc-20090108T1017/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h	8 Mar 2008 01:57:04 -0000	1.16
++++ glibc-20090108T1017-fedora/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h	14 Mar 2008 22:36:45 -0000	1.8.2.9
 @@ -181,4 +181,7 @@
  /* Typed memory objects are not available.  */
  #define _POSIX_TYPED_MEMORY_OBJECTS	-1
@@ -1081,8 +1081,8 @@
 +#define _XOPEN_STREAMS	-1
 +
  #endif /* posix_opt.h */
---- glibc-20090102T2110/nscd/nscd.conf	6 Nov 2007 00:50:48 -0000	1.16
-+++ glibc-20090102T2110-fedora/nscd/nscd.conf	12 Dec 2007 18:13:28 -0000	1.8.2.7
+--- glibc-20090108T1017/nscd/nscd.conf	6 Nov 2007 00:50:48 -0000	1.16
++++ glibc-20090108T1017-fedora/nscd/nscd.conf	12 Dec 2007 18:13:28 -0000	1.8.2.7
 @@ -33,7 +33,7 @@
  #	logfile			/var/log/nscd.log
  #	threads			4
@@ -1092,8 +1092,8 @@
  #	stat-user		somebody
  	debug-level		0
  #	reload-count		5
---- glibc-20090102T2110/nscd/nscd.init	1 Dec 2006 20:12:45 -0000	1.10
-+++ glibc-20090102T2110-fedora/nscd/nscd.init	12 Dec 2007 18:13:28 -0000	1.6.2.6
+--- glibc-20090108T1017/nscd/nscd.init	1 Dec 2006 20:12:45 -0000	1.10
++++ glibc-20090108T1017-fedora/nscd/nscd.init	12 Dec 2007 18:13:28 -0000	1.6.2.6
 @@ -9,6 +9,7 @@
  #		slow naming services like NIS, NIS+, LDAP, or hesiod.
  # processname: /usr/sbin/nscd
@@ -1150,8 +1150,8 @@
  	;;
      *)
  	echo $"Usage: $0 {start|stop|status|restart|reload|condrestart}"
---- glibc-20090102T2110/posix/Makefile	20 Nov 2007 00:41:16 -0000	1.203
-+++ glibc-20090102T2110-fedora/posix/Makefile	12 Dec 2007 18:13:30 -0000	1.171.2.27
+--- glibc-20090108T1017/posix/Makefile	20 Nov 2007 00:41:16 -0000	1.203
++++ glibc-20090108T1017-fedora/posix/Makefile	12 Dec 2007 18:13:30 -0000	1.171.2.27
 @@ -301,11 +301,8 @@ $(inst_libexecdir)/getconf: $(inst_bindi
  	  mv -f $@/$$spec.new $@/$$spec; \
  	done < $(objpfx)getconf.speclist
@@ -1168,8 +1168,8 @@
 +	  | sed -n -e '/START_OF_STRINGS/,$${/POSIX_V6_/{s/^[^"]*"//;s/".*$$//;p}}' \
 +	  > $@.new
  	mv -f $@.new $@
---- glibc-20090102T2110/posix/getconf.speclist.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20090102T2110-fedora/posix/getconf.speclist.h	13 Dec 2004 23:32:37 -0000	1.1.2.2
+--- glibc-20090108T1017/posix/getconf.speclist.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20090108T1017-fedora/posix/getconf.speclist.h	13 Dec 2004 23:32:37 -0000	1.1.2.2
 @@ -0,0 +1,15 @@
 +#include <unistd.h>
 +const char *START_OF_STRINGS =
@@ -1186,8 +1186,8 @@
 +"POSIX_V6_LPBIG_OFFBIG"
 +#endif
 +"";
---- glibc-20090102T2110/resolv/Versions	1 Aug 2008 17:15:34 -0000	1.25
-+++ glibc-20090102T2110-fedora/resolv/Versions	2 Jan 2009 21:14:01 -0000	1.20.2.6
+--- glibc-20090108T1017/resolv/Versions	1 Aug 2008 17:15:34 -0000	1.25
++++ glibc-20090108T1017-fedora/resolv/Versions	2 Jan 2009 21:14:01 -0000	1.20.2.6
 @@ -102,7 +102,7 @@ libnss_dns {
      _nss_dns_gethostbyname_r; _nss_dns_getnetbyaddr_r;
      _nss_dns_getnetbyname_r; _nss_dns_getcanonname_r;
@@ -1197,8 +1197,8 @@
    }
  }
  
---- glibc-20090102T2110/streams/Makefile	23 Oct 2002 23:48:41 -0000	1.4
-+++ glibc-20090102T2110-fedora/streams/Makefile	14 Mar 2008 22:36:46 -0000	1.4.2.1
+--- glibc-20090108T1017/streams/Makefile	23 Oct 2002 23:48:41 -0000	1.4
++++ glibc-20090108T1017-fedora/streams/Makefile	14 Mar 2008 22:36:46 -0000	1.4.2.1
 @@ -21,7 +21,7 @@
  #
  subdir	:= streams
@@ -1208,8 +1208,8 @@
  routines	= isastream getmsg getpmsg putmsg putpmsg fattach fdetach
  
  include ../Rules
---- glibc-20090102T2110/sysdeps/generic/dl-cache.h	25 Jun 2003 08:01:22 -0000	1.13
-+++ glibc-20090102T2110-fedora/sysdeps/generic/dl-cache.h	22 Sep 2004 21:21:07 -0000	1.13.2.1
+--- glibc-20090108T1017/sysdeps/generic/dl-cache.h	25 Jun 2003 08:01:22 -0000	1.13
++++ glibc-20090108T1017-fedora/sysdeps/generic/dl-cache.h	22 Sep 2004 21:21:07 -0000	1.13.2.1
 @@ -36,6 +36,14 @@
  # define add_system_dir(dir) add_dir (dir)
  #endif
@@ -1225,8 +1225,8 @@
  #define CACHEMAGIC "ld.so-1.7.0"
  
  /* libc5 and glibc 2.0/2.1 use the same format.  For glibc 2.2 another
---- glibc-20090102T2110/sysdeps/i386/Makefile	13 May 2008 05:30:43 -0000	1.21
-+++ glibc-20090102T2110-fedora/sysdeps/i386/Makefile	15 May 2008 07:57:47 -0000	1.16.2.5
+--- glibc-20090108T1017/sysdeps/i386/Makefile	13 May 2008 05:30:43 -0000	1.21
++++ glibc-20090108T1017-fedora/sysdeps/i386/Makefile	15 May 2008 07:57:47 -0000	1.16.2.5
 @@ -64,6 +64,14 @@ endif
  
  ifneq (,$(filter -mno-tls-direct-seg-refs,$(CFLAGS)))
@@ -1242,8 +1242,8 @@
  endif
  
  ifeq ($(subdir),elf)
---- glibc-20090102T2110/sysdeps/ia64/Makefile	16 Aug 2004 06:46:14 -0000	1.10
-+++ glibc-20090102T2110-fedora/sysdeps/ia64/Makefile	22 Sep 2004 21:21:07 -0000	1.10.2.1
+--- glibc-20090108T1017/sysdeps/ia64/Makefile	16 Aug 2004 06:46:14 -0000	1.10
++++ glibc-20090108T1017-fedora/sysdeps/ia64/Makefile	22 Sep 2004 21:21:07 -0000	1.10.2.1
 @@ -12,8 +12,8 @@ elide-routines.os += hp-timing
  
  ifeq (yes,$(build-shared))
@@ -1255,8 +1255,8 @@
  endif
  endif
  
---- glibc-20090102T2110/sysdeps/ia64/ia64libgcc.S	11 May 2002 05:12:35 -0000	1.2
-+++ glibc-20090102T2110-fedora/sysdeps/ia64/ia64libgcc.S	22 Sep 2004 21:21:07 -0000	1.2.2.1
+--- glibc-20090108T1017/sysdeps/ia64/ia64libgcc.S	11 May 2002 05:12:35 -0000	1.2
++++ glibc-20090108T1017-fedora/sysdeps/ia64/ia64libgcc.S	22 Sep 2004 21:21:07 -0000	1.2.2.1
 @@ -1,350 +0,0 @@
 -/* From the Intel IA-64 Optimization Guide, choose the minimum latency
 -   alternative.  */
@@ -1608,8 +1608,8 @@
 -	.symver	___multi3, __multi3 at GLIBC_2.2
 -
 -#endif
---- glibc-20090102T2110/sysdeps/ia64/libgcc-compat.c 1 Jan 1970 00:00:00 -0000
-+++ glibc-20090102T2110-fedora/sysdeps/ia64/libgcc-compat.c	22 Sep 2004 21:21:08 -0000	1.1.2.1
+--- glibc-20090108T1017/sysdeps/ia64/libgcc-compat.c 1 Jan 1970 00:00:00 -0000
++++ glibc-20090108T1017-fedora/sysdeps/ia64/libgcc-compat.c	22 Sep 2004 21:21:08 -0000	1.1.2.1
 @@ -0,0 +1,84 @@
 +/* pre-.hidden libgcc compatibility
 +   Copyright (C) 2002 Free Software Foundation, Inc.
@@ -1695,8 +1695,8 @@
 +symbol_version (INTUSE (__multi3), __multi3, GLIBC_2.2);
 +
 +#endif
---- glibc-20090102T2110/sysdeps/powerpc/powerpc64/Makefile	2 Feb 2006 08:23:44 -0000	1.8
-+++ glibc-20090102T2110-fedora/sysdeps/powerpc/powerpc64/Makefile	30 Nov 2006 17:07:38 -0000	1.4.2.5
+--- glibc-20090108T1017/sysdeps/powerpc/powerpc64/Makefile	2 Feb 2006 08:23:44 -0000	1.8
++++ glibc-20090108T1017-fedora/sysdeps/powerpc/powerpc64/Makefile	30 Nov 2006 17:07:38 -0000	1.4.2.5
 @@ -30,6 +30,7 @@ ifneq ($(elf),no)
  # we use -fpic instead which is much better.
  CFLAGS-initfini.s += -fpic -O1
@@ -1705,8 +1705,8 @@
  endif
  
  ifeq ($(subdir),elf)
---- glibc-20090102T2110/sysdeps/unix/nice.c	15 Aug 2006 05:24:45 -0000	1.7
-+++ glibc-20090102T2110-fedora/sysdeps/unix/nice.c	15 Aug 2006 05:53:50 -0000	1.6.2.2
+--- glibc-20090108T1017/sysdeps/unix/nice.c	15 Aug 2006 05:24:45 -0000	1.7
++++ glibc-20090108T1017-fedora/sysdeps/unix/nice.c	15 Aug 2006 05:53:50 -0000	1.6.2.2
 @@ -42,7 +42,12 @@ nice (int incr)
  	__set_errno (save);
      }
@@ -1721,8 +1721,8 @@
    if (result == -1)
      {
        if (errno == EACCES)
---- glibc-20090102T2110/sysdeps/unix/sysv/linux/check_pf.c	3 Jan 2008 00:24:52 -0000	1.15
-+++ glibc-20090102T2110-fedora/sysdeps/unix/sysv/linux/check_pf.c	3 Jan 2008 20:20:42 -0000	1.3.2.11
+--- glibc-20090108T1017/sysdeps/unix/sysv/linux/check_pf.c	3 Jan 2008 00:24:52 -0000	1.15
++++ glibc-20090108T1017-fedora/sysdeps/unix/sysv/linux/check_pf.c	3 Jan 2008 20:20:42 -0000	1.3.2.11
 @@ -27,13 +27,10 @@
  #include <unistd.h>
  #include <sys/socket.h>
@@ -1738,8 +1738,8 @@
  
  #ifndef IFA_F_HOMEADDRESS
  # define IFA_F_HOMEADDRESS 0
---- glibc-20090102T2110/sysdeps/unix/sysv/linux/dl-osinfo.h	17 Apr 2008 08:32:24 -0000	1.28
-+++ glibc-20090102T2110-fedora/sysdeps/unix/sysv/linux/dl-osinfo.h	15 May 2008 07:57:48 -0000	1.14.2.14
+--- glibc-20090108T1017/sysdeps/unix/sysv/linux/dl-osinfo.h	17 Apr 2008 08:32:24 -0000	1.28
++++ glibc-20090108T1017-fedora/sysdeps/unix/sysv/linux/dl-osinfo.h	15 May 2008 07:57:48 -0000	1.14.2.14
 @@ -17,10 +17,13 @@
     Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
     02111-1307 USA.  */
@@ -1786,8 +1786,8 @@
 +  ret ^= stk;
    return ret;
  }
---- glibc-20090102T2110/sysdeps/unix/sysv/linux/futimesat.c	3 Feb 2006 05:26:34 -0000	1.6
-+++ glibc-20090102T2110-fedora/sysdeps/unix/sysv/linux/futimesat.c	3 Feb 2006 09:43:55 -0000	1.1.2.7
+--- glibc-20090108T1017/sysdeps/unix/sysv/linux/futimesat.c	3 Feb 2006 05:26:34 -0000	1.6
++++ glibc-20090108T1017-fedora/sysdeps/unix/sysv/linux/futimesat.c	3 Feb 2006 09:43:55 -0000	1.1.2.7
 @@ -37,14 +37,14 @@ futimesat (fd, file, tvp)
  {
    int result;
@@ -1830,8 +1830,8 @@
      {
        size_t filelen = strlen (file);
        static const char procfd[] = "/proc/self/fd/%d/%s";
---- glibc-20090102T2110/sysdeps/unix/sysv/linux/netlinkaccess.h	8 Jan 2006 08:21:15 -0000	1.3
-+++ glibc-20090102T2110-fedora/sysdeps/unix/sysv/linux/netlinkaccess.h	10 Dec 2006 10:51:12 -0000	1.1.2.3
+--- glibc-20090108T1017/sysdeps/unix/sysv/linux/netlinkaccess.h	8 Jan 2006 08:21:15 -0000	1.3
++++ glibc-20090108T1017-fedora/sysdeps/unix/sysv/linux/netlinkaccess.h	10 Dec 2006 10:51:12 -0000	1.1.2.3
 @@ -25,6 +25,24 @@
  
  #include <kernel-features.h>
@@ -1857,8 +1857,8 @@
  
  struct netlink_res
  {
---- glibc-20090102T2110/sysdeps/unix/sysv/linux/paths.h	15 Nov 2000 23:06:47 -0000	1.11
-+++ glibc-20090102T2110-fedora/sysdeps/unix/sysv/linux/paths.h	22 Sep 2004 21:21:08 -0000	1.11.4.1
+--- glibc-20090108T1017/sysdeps/unix/sysv/linux/paths.h	15 Nov 2000 23:06:47 -0000	1.11
++++ glibc-20090108T1017-fedora/sysdeps/unix/sysv/linux/paths.h	22 Sep 2004 21:21:08 -0000	1.11.4.1
 @@ -61,7 +61,7 @@
  #define	_PATH_TTY	"/dev/tty"
  #define	_PATH_UNIX	"/boot/vmlinux"
@@ -1868,8 +1868,8 @@
  #define _PATH_WTMP	"/var/log/wtmp"
  
  /* Provide trailing slash, since mostly used for building pathnames. */
---- glibc-20090102T2110/sysdeps/unix/sysv/linux/tcsetattr.c	10 Sep 2003 19:16:07 -0000	1.16
-+++ glibc-20090102T2110-fedora/sysdeps/unix/sysv/linux/tcsetattr.c	22 Sep 2004 21:21:08 -0000	1.16.2.1
+--- glibc-20090108T1017/sysdeps/unix/sysv/linux/tcsetattr.c	10 Sep 2003 19:16:07 -0000	1.16
++++ glibc-20090108T1017-fedora/sysdeps/unix/sysv/linux/tcsetattr.c	22 Sep 2004 21:21:08 -0000	1.16.2.1
 @@ -49,6 +49,7 @@ tcsetattr (fd, optional_actions, termios
  {
    struct __kernel_termios k_termios;
@@ -1915,8 +1915,8 @@
 +  return retval;
  }
  libc_hidden_def (tcsetattr)
---- glibc-20090102T2110/sysdeps/unix/sysv/linux/i386/clone.S	3 Dec 2006 23:12:36 -0000	1.27
-+++ glibc-20090102T2110-fedora/sysdeps/unix/sysv/linux/i386/clone.S	14 Dec 2006 09:06:34 -0000	1.22.2.6
+--- glibc-20090108T1017/sysdeps/unix/sysv/linux/i386/clone.S	3 Dec 2006 23:12:36 -0000	1.27
++++ glibc-20090108T1017-fedora/sysdeps/unix/sysv/linux/i386/clone.S	14 Dec 2006 09:06:34 -0000	1.22.2.6
 @@ -120,9 +120,6 @@ L(pseudo_end):
  	ret
  
@@ -1935,8 +1935,8 @@
  
  	cfi_startproc
  PSEUDO_END (BP_SYM (__clone))
---- glibc-20090102T2110/sysdeps/unix/sysv/linux/i386/dl-cache.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20090102T2110-fedora/sysdeps/unix/sysv/linux/i386/dl-cache.h	22 Sep 2004 21:21:08 -0000	1.1.2.1
+--- glibc-20090108T1017/sysdeps/unix/sysv/linux/i386/dl-cache.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20090108T1017-fedora/sysdeps/unix/sysv/linux/i386/dl-cache.h	22 Sep 2004 21:21:08 -0000	1.1.2.1
 @@ -0,0 +1,59 @@
 +/* Support for reading /etc/ld.so.cache files written by Linux ldconfig.
 +   Copyright (C) 2004 Free Software Foundation, Inc.
@@ -1997,8 +1997,8 @@
 +  } while (0)
 +
 +#include_next <dl-cache.h>
---- glibc-20090102T2110/sysdeps/unix/sysv/linux/ia64/dl-cache.h	6 Jul 2001 04:56:17 -0000	1.2
-+++ glibc-20090102T2110-fedora/sysdeps/unix/sysv/linux/ia64/dl-cache.h	22 Sep 2004 21:21:09 -0000	1.2.4.1
+--- glibc-20090108T1017/sysdeps/unix/sysv/linux/ia64/dl-cache.h	6 Jul 2001 04:56:17 -0000	1.2
++++ glibc-20090108T1017-fedora/sysdeps/unix/sysv/linux/ia64/dl-cache.h	22 Sep 2004 21:21:09 -0000	1.2.4.1
 @@ -22,4 +22,31 @@
  #define _dl_cache_check_flags(flags) \
    ((flags) == _DL_CACHE_DEFAULT_ID)
@@ -2031,29 +2031,29 @@
 +  } while (0)
 +
  #include_next <dl-cache.h>
---- glibc-20090102T2110/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 1 Jan 1970 00:00:00 -0000
-+++ glibc-20090102T2110-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c	22 Sep 2004 21:21:09 -0000	1.1.2.1
+--- glibc-20090108T1017/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 1 Jan 1970 00:00:00 -0000
++++ glibc-20090108T1017-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c	22 Sep 2004 21:21:09 -0000	1.1.2.1
 @@ -0,0 +1,5 @@
 +#ifdef IS_IN_ldconfig
 +#include <sysdeps/i386/dl-procinfo.c>
 +#else
 +#include <sysdeps/generic/dl-procinfo.c>
 +#endif
---- glibc-20090102T2110/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20090102T2110-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h	22 Sep 2004 21:21:09 -0000	1.1.2.1
+--- glibc-20090108T1017/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20090108T1017-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h	22 Sep 2004 21:21:09 -0000	1.1.2.1
 @@ -0,0 +1,5 @@
 +#ifdef IS_IN_ldconfig
 +#include <sysdeps/unix/sysv/linux/i386/dl-procinfo.h>
 +#else
 +#include <sysdeps/generic/dl-procinfo.h>
 +#endif
---- glibc-20090102T2110/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed	17 Jan 2002 06:49:28 -0000	1.2
-+++ glibc-20090102T2110-fedora/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed	22 Sep 2004 21:21:09 -0000	1.2.2.1
+--- glibc-20090108T1017/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed	17 Jan 2002 06:49:28 -0000	1.2
++++ glibc-20090108T1017-fedora/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed	22 Sep 2004 21:21:09 -0000	1.2.2.1
 @@ -1 +1 @@
 -s_^\(RTLDLIST=\)\([^ 	]*\)-ia64\(\.so\.[0-9.]*\)[ 	]*$_\1"\2-ia64\3 \2\3"_
 +s_^\(RTLDLIST=\)\([^ 	]*\)-ia64\(\.so\.[0-9.]*\)[ 	]*$_\1"\2-ia64\3 /emul/ia32-linux\2\3"_
---- glibc-20090102T2110/sysdeps/unix/sysv/linux/x86_64/clone.S	3 Dec 2006 23:12:36 -0000	1.7
-+++ glibc-20090102T2110-fedora/sysdeps/unix/sysv/linux/x86_64/clone.S	14 Dec 2006 09:06:34 -0000	1.4.2.4
+--- glibc-20090108T1017/sysdeps/unix/sysv/linux/x86_64/clone.S	3 Dec 2006 23:12:36 -0000	1.7
++++ glibc-20090108T1017-fedora/sysdeps/unix/sysv/linux/x86_64/clone.S	14 Dec 2006 09:06:34 -0000	1.4.2.4
 @@ -89,9 +89,6 @@ L(pseudo_end):
  	ret
  


Index: glibc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/glibc/devel/glibc.spec,v
retrieving revision 1.374
retrieving revision 1.375
diff -u -r1.374 -r1.375
--- glibc.spec	2 Jan 2009 22:17:46 -0000	1.374
+++ glibc.spec	8 Jan 2009 10:44:08 -0000	1.375
@@ -1,6 +1,6 @@
-%define glibcdate 20090102T2110
+%define glibcdate 20090108T1017
 %define glibcname glibc
-%define glibcsrcdir glibc-20090102T2110
+%define glibcsrcdir glibc-20090108T1017
 %define glibc_release_tarballs 0
 %define run_glibc_tests 1
 %define auxarches i586 i686 athlon sparcv9v sparc64v alphaev6
@@ -23,7 +23,7 @@
 Summary: The GNU libc libraries
 Name: glibc
 Version: 2.9.90
-Release: 1
+Release: 2
 # GPLv2+ is used in a bunch of programs, LGPLv2+ is used for libraries.
 # Things that are linked directly into dynamically linked programs
 # and shared libraries (e.g. crt files, lib*_nonshared.a) have an additional
@@ -988,6 +988,9 @@
 %endif
 
 %changelog
+* Thu Jan  8 2009 Jakub Jelinek <jakub at redhat.com> 2.9.90-2
+- update from trunk
+
 * Fri Jan  2 2009 Jakub Jelinek <jakub at redhat.com> 2.9.90-1
 - update from trunk (#478314)
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/glibc/devel/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- import.log	2 Jan 2009 22:17:46 -0000	1.3
+++ import.log	8 Jan 2009 10:44:08 -0000	1.4
@@ -1,3 +1,4 @@
 glibc-2_8_90-17:HEAD:glibc-2.8.90-17.src.rpm:1226522699
 glibc-2_9-1:HEAD:glibc-2.9-1.src.rpm:1226616331
 glibc-2_9_90-1:HEAD:glibc-2.9.90-1.src.rpm:1230934009
+glibc-2_9_90-2:HEAD:glibc-2.9.90-2.src.rpm:1231411404


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/glibc/devel/sources,v
retrieving revision 1.284
retrieving revision 1.285
diff -u -r1.284 -r1.285
--- sources	2 Jan 2009 22:17:46 -0000	1.284
+++ sources	8 Jan 2009 10:44:08 -0000	1.285
@@ -1,2 +1,2 @@
-9af466a43650290c3762ace76df57b62  glibc-20090102T2110.tar.bz2
-df962506987b8d817230af26a98be5fb  glibc-fedora-20090102T2110.tar.bz2
+02617df696883fd79038360cb3835031  glibc-20090108T1017.tar.bz2
+021ca18e8040bf543f8648440b66e7d8  glibc-fedora-20090108T1017.tar.bz2



From ltinkl at fedoraproject.org  Thu Jan  8 11:13:42 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Thu,  8 Jan 2009 11:13:42 +0000 (UTC)
Subject: rpms/kdebase-workspace/F-10 .cvsignore, 1.20,
	1.21 kdebase-workspace.spec, 1.146, 1.147 sources, 1.24, 1.25
Message-ID: <20090108111343.4F13C700FD@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kdebase-workspace/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15799

Modified Files:
	.cvsignore kdebase-workspace.spec sources 
Log Message:
KDE 4.1.4



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdebase-workspace/F-10/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- .cvsignore	26 Sep 2008 19:40:20 -0000	1.20
+++ .cvsignore	8 Jan 2009 11:13:10 -0000	1.21
@@ -1 +1 @@
-kdebase-workspace-4.1.2.tar.bz2
+kdebase-workspace-4.1.4.tar.bz2


Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebase-workspace/F-10/kdebase-workspace.spec,v
retrieving revision 1.146
retrieving revision 1.147
diff -u -r1.146 -r1.147
--- kdebase-workspace.spec	10 Dec 2008 12:27:04 -0000	1.146
+++ kdebase-workspace.spec	8 Jan 2009 11:13:10 -0000	1.147
@@ -2,8 +2,8 @@
 
 Summary: K Desktop Environment - Workspace
 Name: kdebase-workspace
-Version: 4.1.3
-Release: 7%{?dist}
+Version: 4.1.4
+Release: 1%{?dist}
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-workspace-%{version}.tar.bz2
 License: GPLv2
 Group: User Interface/Desktops
@@ -365,6 +365,9 @@
 
 
 %changelog
+* Thu Jan  8 2009 Luk???? Tinkl <ltinkl at redhat.com> 4.1.4-1
+- KDE 4.1.4
+
 * Wed Dec 10 2008 Luk???? Tinkl <ltinkl at redhat.com> 4.1.3-7
 - fix krunner (aka minicli) not remembering command history between
   sessions (kdebug:159510)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdebase-workspace/F-10/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- sources	11 Nov 2008 23:25:10 -0000	1.24
+++ sources	8 Jan 2009 11:13:10 -0000	1.25
@@ -1 +1 @@
-42233b75ce73eaaacae61c0d5db8befa  kdebase-workspace-4.1.3.tar.bz2
+bdac9ac8055b976845587fe544d568be  kdebase-workspace-4.1.4.tar.bz2



From mlichvar at fedoraproject.org  Thu Jan  8 11:22:43 2009
From: mlichvar at fedoraproject.org (Miroslav Lichvar)
Date: Thu,  8 Jan 2009 11:22:43 +0000 (UTC)
Subject: rpms/guile/devel guile.spec,1.61,1.62
Message-ID: <20090108112244.3E29E700FD@cvs1.fedora.phx.redhat.com>

Author: mlichvar

Update of /cvs/pkgs/rpms/guile/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17197

Modified Files:
	guile.spec 
Log Message:
- include Emacs support (#478468)



Index: guile.spec
===================================================================
RCS file: /cvs/pkgs/rpms/guile/devel/guile.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- guile.spec	9 Dec 2008 12:12:42 -0000	1.61
+++ guile.spec	8 Jan 2009 11:22:12 -0000	1.62
@@ -2,7 +2,7 @@
 Name: guile
 %define mver 1.8
 Version: 1.8.6
-Release: 1%{?dist}
+Release: 2%{?dist}
 Source: ftp://ftp.gnu.org/pub/gnu/guile/guile-%{version}.tar.gz
 URL: http://www.gnu.org/software/guile/
 Patch1: guile-1.8.4-multilib.patch
@@ -12,7 +12,7 @@
 Group: Development/Languages
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: libtool libtool-ltdl-devel gmp-devel readline-devel
-Buildrequires: gettext-devel
+BuildRequires: gettext-devel emacs
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
 Requires: coreutils
@@ -148,6 +148,8 @@
 %ghost %{_datadir}/guile/%{mver}/slibcat
 %ghost %{_datadir}/guile/%{mver}/slib
 %dir %{_datadir}/guile/site
+%dir %{_datadir}/emacs/site-lisp
+%{_datadir}/emacs/site-lisp/*.el
 %{_infodir}/*
 %{_mandir}/man1/guile.1*
 
@@ -163,6 +165,9 @@
 %{_includedir}/libguile.h
 
 %changelog
+* Thu Jan 08 2009 Miroslav Lichvar <mlichvar at redhat.com> - 5:1.8.6-2
+- include Emacs support (#478468)
+
 * Tue Dec 09 2008 Miroslav Lichvar <mlichvar at redhat.com> - 5:1.8.6-1
 - update to 1.8.6
 



From mmahut at fedoraproject.org  Thu Jan  8 11:22:56 2009
From: mmahut at fedoraproject.org (Marek Mahut)
Date: Thu,  8 Jan 2009 11:22:56 +0000 (UTC)
Subject: rpms/mod_scgi/F-9 mod_scgi.spec, NONE, 1.1 scgi.conf, NONE,
	1.1 sources, 1.1, 1.2
Message-ID: <20090108112256.1DB95700FD@cvs1.fedora.phx.redhat.com>

Author: mmahut

Update of /cvs/pkgs/rpms/mod_scgi/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17274

Modified Files:
	sources 
Added Files:
	mod_scgi.spec scgi.conf 
Log Message:
initial import



--- NEW FILE mod_scgi.spec ---
%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}

Name:           mod_scgi
Version:        1.13
Release:        1%{?dist}
Summary:        Python implementation of the SCGI protocol

Group:          Applications/Internet
License:        CNRI
URL:            http://python.ca/scgi/
Source0:        http://python.ca/scgi/releases/scgi-%{version}.tar.gz
Source1:	scgi.conf
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  httpd-devel, python-devel, pcre-devel
Requires:       httpd-mmn = %(cat %{_includedir}/httpd/.mmn || echo missing)

%description
The SCGI protocol is a replacement for the Common Gateway
Interface (CGI) protocol. It is a standard for applications
to interface with HTTP servers. It is similar to FastCGI
but is designed to be easier to implement.

%prep
%setup -q -n scgi-%{version}


%build
CFLAGS="%{optflags}" %{__python} setup.py build
%{_sbindir}/apxs -c apache2/mod_scgi.c

%install
rm -rf $RPM_BUILD_ROOT
%{__python} setup.py install --root $RPM_BUILD_ROOT 
install -D -m 0755 apache2/.libs/mod_scgi.so  $RPM_BUILD_ROOT/%{_libdir}/httpd/modules/mod_scgi.so
install -D -m 644 %{SOURCE1} $RPM_BUILD_ROOT/%{_sysconfdir}/httpd/conf.d/scgi.conf
mkdir -p $RPM_BUILD_ROOT%{_bindir}
mv $RPM_BUILD_ROOT%{python_sitearch}/scgi/scgi_server.py $RPM_BUILD_ROOT%{_bindir}/scgi_server
mv $RPM_BUILD_ROOT%{python_sitearch}/scgi/quixote_handler.py $RPM_BUILD_ROOT%{_bindir}/quixote_handler


%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc CHANGES.txt LICENSE.txt README.txt doc/* scgi/test_passfd.py
%config(noreplace) %{_sysconfdir}/httpd/conf.d/scgi.conf
%if 0%{?fedora} > 8 
%{python_sitearch}/*egg-info
%endif 
%{python_sitearch}/scgi
%exclude %{python_sitearch}/scgi/test_passfd.py*
%{_bindir}/scgi_server
%{_bindir}/quixote_handler
%{_libdir}/httpd/modules/mod_scgi.so


%changelog
* Wed Nov 12 2008 Marek Mahut <mmahut at fedoraproject.org> - 1.13-1
- Initial build


--- NEW FILE scgi.conf ---
# (This actually better set up permanently with the command line
# "a2enmod scgi" but shown here for completeness)
LoadModule scgi_module modules/mod_scgi.so

# Set up a location to be served by an SCGI server process

# uncomment next line to serve SCGI process under /dynamic/
# SCGIMount /dynamic/ 127.0.0.1:4000


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mod_scgi/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	23 Dec 2008 02:41:27 -0000	1.1
+++ sources	8 Jan 2009 11:22:25 -0000	1.2
@@ -0,0 +1 @@
+5cc79e59130ae9efc20388cc8ce906ba  scgi-1.13.tar.gz



From ltinkl at fedoraproject.org  Thu Jan  8 11:24:58 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Thu,  8 Jan 2009 11:24:58 +0000 (UTC)
Subject: rpms/kdebase-workspace/F-10 kdebase-workspace.spec, 1.147,
	1.148 kdebase-workspace-4.1.3-kwin-kde#174782.patch, 1.1, NONE
Message-ID: <20090108112458.6FABF700FD@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kdebase-workspace/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17770

Modified Files:
	kdebase-workspace.spec 
Removed Files:
	kdebase-workspace-4.1.3-kwin-kde#174782.patch 
Log Message:
drop upstream patches



Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebase-workspace/F-10/kdebase-workspace.spec,v
retrieving revision 1.147
retrieving revision 1.148
diff -u -r1.147 -r1.148
--- kdebase-workspace.spec	8 Jan 2009 11:13:10 -0000	1.147
+++ kdebase-workspace.spec	8 Jan 2009 11:24:27 -0000	1.148
@@ -43,7 +43,6 @@
 # reenable KWin taskbarthumbnail effect (already done upstream in 4.2, was
 # disabled in 4.1 due to no tooltip support - see also Patch100)
 Patch102: kdebase-workspace-4.1.0-enable-kwin-taskbarthumbnail.patch
-Patch103: kdebase-workspace-4.1.3-kwin-kde#174782.patch
 
 # backport of panel autohide from KDE 4.2
 # from plasma-4.1-openSUSE: http://websvn.kde.org/?view=rev&revision=864493
@@ -220,7 +219,6 @@
 # upstream patches
 %patch100 -p1 -b .plasma-tooltips
 %patch102 -p0 -b .kwin-taskbarthumbnail
-%patch103 -p1 -b .opengl
 %patch104 -p0 -b .panel-autohide
 %patch105 -p0 -b .panel-autohide2
 %patch106 -p0 -b .panel-autohide3


--- kdebase-workspace-4.1.3-kwin-kde#174782.patch DELETED ---



From mmahut at fedoraproject.org  Thu Jan  8 11:29:33 2009
From: mmahut at fedoraproject.org (Marek Mahut)
Date: Thu,  8 Jan 2009 11:29:33 +0000 (UTC)
Subject: rpms/mod_scgi/EL-5 mod_scgi.spec, NONE, 1.1 scgi.conf, NONE,
	1.1 sources, 1.1, 1.2
Message-ID: <20090108112933.F03657013F@cvs1.fedora.phx.redhat.com>

Author: mmahut

Update of /cvs/pkgs/rpms/mod_scgi/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18351

Modified Files:
	sources 
Added Files:
	mod_scgi.spec scgi.conf 
Log Message:
initial build



--- NEW FILE mod_scgi.spec ---
%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}

Name:           mod_scgi
Version:        1.13
Release:        1%{?dist}
Summary:        Python implementation of the SCGI protocol

Group:          Applications/Internet
License:        CNRI
URL:            http://python.ca/scgi/
Source0:        http://python.ca/scgi/releases/scgi-%{version}.tar.gz
Source1:	scgi.conf
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  httpd-devel, python-devel, pcre-devel
Requires:       httpd-mmn = %(cat %{_includedir}/httpd/.mmn || echo missing)

%description
The SCGI protocol is a replacement for the Common Gateway
Interface (CGI) protocol. It is a standard for applications
to interface with HTTP servers. It is similar to FastCGI
but is designed to be easier to implement.

%prep
%setup -q -n scgi-%{version}


%build
CFLAGS="%{optflags}" %{__python} setup.py build
%{_sbindir}/apxs -c apache2/mod_scgi.c

%install
rm -rf $RPM_BUILD_ROOT
%{__python} setup.py install --root $RPM_BUILD_ROOT 
install -D -m 0755 apache2/.libs/mod_scgi.so  $RPM_BUILD_ROOT/%{_libdir}/httpd/modules/mod_scgi.so
install -D -m 644 %{SOURCE1} $RPM_BUILD_ROOT/%{_sysconfdir}/httpd/conf.d/scgi.conf
mkdir -p $RPM_BUILD_ROOT%{_bindir}
mv $RPM_BUILD_ROOT%{python_sitearch}/scgi/scgi_server.py $RPM_BUILD_ROOT%{_bindir}/scgi_server
mv $RPM_BUILD_ROOT%{python_sitearch}/scgi/quixote_handler.py $RPM_BUILD_ROOT%{_bindir}/quixote_handler


%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc CHANGES.txt LICENSE.txt README.txt doc/* scgi/test_passfd.py
%config(noreplace) %{_sysconfdir}/httpd/conf.d/scgi.conf
%if 0%{?fedora} > 8 
%{python_sitearch}/*egg-info
%endif 
%{python_sitearch}/scgi
%exclude %{python_sitearch}/scgi/test_passfd.py*
%{_bindir}/scgi_server
%{_bindir}/quixote_handler
%{_libdir}/httpd/modules/mod_scgi.so


%changelog
* Wed Nov 12 2008 Marek Mahut <mmahut at fedoraproject.org> - 1.13-1
- Initial build


--- NEW FILE scgi.conf ---
# (This actually better set up permanently with the command line
# "a2enmod scgi" but shown here for completeness)
LoadModule scgi_module modules/mod_scgi.so

# Set up a location to be served by an SCGI server process

# uncomment next line to serve SCGI process under /dynamic/
# SCGIMount /dynamic/ 127.0.0.1:4000


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mod_scgi/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	23 Dec 2008 02:41:27 -0000	1.1
+++ sources	8 Jan 2009 11:29:02 -0000	1.2
@@ -0,0 +1 @@
+5cc79e59130ae9efc20388cc8ce906ba  scgi-1.13.tar.gz



From ovasik at fedoraproject.org  Thu Jan  8 11:49:50 2009
From: ovasik at fedoraproject.org (Ondrej Vasik)
Date: Thu,  8 Jan 2009 11:49:50 +0000 (UTC)
Subject: rpms/libwvstreams/devel .cvsignore, 1.9, 1.10 libwvstreams.spec,
	1.32, 1.33 sources, 1.9, 1.10 wvstreams-4.2.2-multilib.patch, 1.4,
	1.5 libwvstreams-4.4.1-gcc43.patch, 1.2,
	NONE wvstreams-4.4-no_sarestorer.patch, 1.1, NONE
Message-ID: <20090108114950.D55D6700FD@cvs1.fedora.phx.redhat.com>

Author: ovasik

Update of /cvs/extras/rpms/libwvstreams/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21358

Modified Files:
	.cvsignore libwvstreams.spec sources 
	wvstreams-4.2.2-multilib.patch 
Removed Files:
	libwvstreams-4.4.1-gcc43.patch 
	wvstreams-4.4-no_sarestorer.patch 
Log Message:
new upstream version, activate --with-dbus (#479144), removed applied patches


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libwvstreams/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	21 Nov 2008 16:37:39 -0000	1.9
+++ .cvsignore	8 Jan 2009 11:49:15 -0000	1.10
@@ -1 +1 @@
-wvstreams-4.5.tar.gz
+wvstreams-4.5.1.tar.gz


Index: libwvstreams.spec
===================================================================
RCS file: /cvs/extras/rpms/libwvstreams/devel/libwvstreams.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- libwvstreams.spec	21 Nov 2008 16:37:39 -0000	1.32
+++ libwvstreams.spec	8 Jan 2009 11:49:15 -0000	1.33
@@ -1,12 +1,10 @@
 Name: libwvstreams
-Version: 4.5
+Version: 4.5.1
 Release: 1%{?dist}
 Summary: WvStreams is a network programming library written in C++
 Source: http://wvstreams.googlecode.com/files/wvstreams-%{version}.tar.gz
 Patch1: wvstreams-4.2.2-multilib.patch
-Patch2: wvstreams-4.4-no_sarestorer.patch
-Patch3: libwvstreams-4.4.1-gcc43.patch
-Patch4: wvstreams-4.5-noxplctarget.patch
+Patch2: wvstreams-4.5-noxplctarget.patch
 URL: http://alumnit.ca/wiki/index.php?page=WvStreams
 Group: System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -30,9 +28,7 @@
 %prep
 %setup -q -n wvstreams-%{version}
 %patch1 -p1 -b .multilib
-%patch2 -p1 -b .no_sarestore
-%patch3 -p1 -b .gcc43
-%patch4 -p1 -b .xplctarget
+%patch2 -p1 -b .xplctarget
 
 %build
 #  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
@@ -43,7 +39,7 @@
 #  --with-qt               Qt
 #  --with-zlib             zlib (required)
 touch configure
-%configure --with-dbus=no --with-pam --with-openssl --without-tcl --with-qt=no --disable-static
+%configure --with-dbus=yes --with-pam --with-openssl --without-tcl --with-qt=no --disable-static
 
 make COPTS="$RPM_OPT_FLAGS -fPIC -fpermissive" CXXOPTS="$RPM_OPT_FLAGS -fPIC -fpermissive" VERBOSE=1
 
@@ -69,12 +65,12 @@
 rm -rf $RPM_BUILD_ROOT
 
 %files
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc LICENSE README
 %{_libdir}/*.so.*
 
 %files devel
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %{_includedir}/wvstreams
 %{_libdir}/*.so
 %{_libdir}/*.a
@@ -85,6 +81,10 @@
 %postun -p /sbin/ldconfig
 
 %changelog
+* Thu Jan 08 2009 Ondrej Vasik <ovasik at redhat.com> - 4.5.1-1
+- new upstream release 4.5.1 , removed applied patches
+- activate --with-dbus(#479144)
+
 * Fri Nov 22 2008 Ondrej Vasik <ovasik at redhat.com> - 4.5-1
 - new upstream release
 - fixed issue with missing install-xplc target and std::sort


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libwvstreams/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	21 Nov 2008 16:37:39 -0000	1.9
+++ sources	8 Jan 2009 11:49:15 -0000	1.10
@@ -1 +1 @@
-8cc00e69d70fa0071595b7e919cbb1e0  wvstreams-4.5.tar.gz
+d092f6a80d38d361cb7a6d54d7699678  wvstreams-4.5.1.tar.gz

wvstreams-4.2.2-multilib.patch:

Index: wvstreams-4.2.2-multilib.patch
===================================================================
RCS file: /cvs/extras/rpms/libwvstreams/devel/wvstreams-4.2.2-multilib.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- wvstreams-4.2.2-multilib.patch	21 Nov 2008 16:37:39 -0000	1.4
+++ wvstreams-4.2.2-multilib.patch	8 Jan 2009 11:49:15 -0000	1.5
@@ -18,14 +18,3 @@
  
  /* Define to enable DBUS support. */
  #undef WITH_DBUS
-@@ -208,7 +208,9 @@
- 
- /* Define to 1 if your processor stores words with the most significant byte
-    first (like Motorola and SPARC, unlike Intel and VAX). */
--#undef WORDS_BIGENDIAN
-+#if defined(__BIG_ENDIAN__)
-+#define WORDS_BIGENDIAN 1
-+#endif
- 
- /* Define to disable WvResolver forking for debugging with gdb. */
- #undef WVRESOLVER_SKIP_FORK


--- libwvstreams-4.4.1-gcc43.patch DELETED ---


--- wvstreams-4.4-no_sarestorer.patch DELETED ---



From ltinkl at fedoraproject.org  Thu Jan  8 11:50:46 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Thu,  8 Jan 2009 11:50:46 +0000 (UTC)
Subject: rpms/kdebase-workspace/F-9 .cvsignore, 1.15,
	1.16 kdebase-workspace.spec, 1.123, 1.124 sources, 1.18,
	1.19 kdebase-workspace-4.1.3-kwin-kde#174782.patch, 1.1, NONE
Message-ID: <20090108115046.315E2700FD@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kdebase-workspace/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21437

Modified Files:
	.cvsignore kdebase-workspace.spec sources 
Removed Files:
	kdebase-workspace-4.1.3-kwin-kde#174782.patch 
Log Message:
KDE 4.1.4



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdebase-workspace/F-9/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	4 Nov 2008 21:51:40 -0000	1.15
+++ .cvsignore	8 Jan 2009 11:50:15 -0000	1.16
@@ -1 +1 @@
-kdebase-workspace-4.1.3.tar.bz2
+kdebase-workspace-4.1.4.tar.bz2


Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebase-workspace/F-9/kdebase-workspace.spec,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -r1.123 -r1.124
--- kdebase-workspace.spec	11 Dec 2008 12:47:06 -0000	1.123
+++ kdebase-workspace.spec	8 Jan 2009 11:50:15 -0000	1.124
@@ -2,8 +2,8 @@
 
 Summary: K Desktop Environment - Workspace
 Name: kdebase-workspace
-Version: 4.1.3
-Release: 7%{?dist}
+Version: 4.1.4
+Release: 1%{?dist}
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-workspace-%{version}.tar.bz2
 License: GPLv2
 Group: User Interface/Desktops
@@ -43,7 +43,6 @@
 # reenable KWin taskbarthumbnail effect (already done upstream in 4.2, was
 # disabled in 4.1 due to no tooltip support - see also Patch100)
 Patch102: kdebase-workspace-4.1.0-enable-kwin-taskbarthumbnail.patch
-Patch103: kdebase-workspace-4.1.3-kwin-kde#174782.patch
 
 # backport of panel autohide from KDE 4.2
 # from plasma-4.1-openSUSE: http://websvn.kde.org/?view=rev&revision=864493
@@ -220,7 +219,6 @@
 # upstream patches
 %patch100 -p1 -b .plasma-tooltips
 %patch102 -p0 -b .kwin-taskbarthumbnail
-%patch103 -p1 -b .opengl
 %patch104 -p0 -b .panel-autohide
 %patch105 -p0 -b .panel-autohide2
 %patch106 -p0 -b .panel-autohide3
@@ -365,6 +363,9 @@
 
 
 %changelog
+* Thu Jan  8 2009 Luk???? Tinkl <ltinkl at redhat.com> KDE 4.1.4-1
+- KDE 4.1.4
+
 * Thu Dec 11 2008 Luk???? Tinkl <ltinkl at redhat.com> 4.1.3-7
 - fix krunner (aka minicli) not remembering command history between
   sessions (kdebug:159510)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdebase-workspace/F-9/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources	4 Nov 2008 21:51:40 -0000	1.18
+++ sources	8 Jan 2009 11:50:15 -0000	1.19
@@ -1 +1 @@
-42233b75ce73eaaacae61c0d5db8befa  kdebase-workspace-4.1.3.tar.bz2
+bdac9ac8055b976845587fe544d568be  kdebase-workspace-4.1.4.tar.bz2


--- kdebase-workspace-4.1.3-kwin-kde#174782.patch DELETED ---



From lkundrak at fedoraproject.org  Thu Jan  8 11:52:15 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Thu,  8 Jan 2009 11:52:15 +0000 (UTC)
Subject: rpms/gnubversion/devel gnubversion.spec,1.1,1.2
Message-ID: <20090108115215.737F8700FD@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/gnubversion/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21727

Modified Files:
	gnubversion.spec 
Log Message:
* Thu Jan 08 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.5-5
- Fix BRs.



Index: gnubversion.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnubversion/devel/gnubversion.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gnubversion.spec	8 Jan 2009 00:36:40 -0000	1.1
+++ gnubversion.spec	8 Jan 2009 11:51:45 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           gnubversion
 Version:        0.5
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Gnome Interface to Subversion
 
 Group:          Applications/System
@@ -12,6 +12,7 @@
 BuildRequires:  nautilus-devel, libgnomeui-devel
 BuildRequires:  subversion-devel, e2fsprogs-devel
 BuildRequires:  desktop-file-utils
+BuildRequires:  librsvg2
 Requires:       nautilus-extensions
 
 %description
@@ -102,6 +103,9 @@
 
 
 %changelog
+* Thu Jan 08 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.5-5
+- Fix BRs.
+
 * Thu Jan 08 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.5-4
 - Place the library to libdir
 



From pkgdb at fedoraproject.org  Thu Jan  8 12:00:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 08 Jan 2009 12:00:01 +0000
Subject: [pkgdb] php-xmpphp had acl change status
Message-ID: <20090108120001.AD42920831C@bastion.fedora.phx.redhat.com>

rakesh has set the watchbugzilla acl on php-xmpphp (Fedora devel) to Approved for itamarjp

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/php-xmpphp



From pkgdb at fedoraproject.org  Thu Jan  8 12:00:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 08 Jan 2009 12:00:07 +0000
Subject: [pkgdb] php-xmpphp had acl change status
Message-ID: <20090108120007.4995A20846D@bastion.fedora.phx.redhat.com>

rakesh has set the commit acl on php-xmpphp (Fedora devel) to Approved for itamarjp

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/php-xmpphp



From pkgdb at fedoraproject.org  Thu Jan  8 12:00:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 08 Jan 2009 12:00:09 +0000
Subject: [pkgdb] php-xmpphp had acl change status
Message-ID: <20090108120009.64B95208470@bastion.fedora.phx.redhat.com>

rakesh has set the watchbugzilla acl on php-xmpphp (Fedora 8) to Approved for itamarjp

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/php-xmpphp



From pkgdb at fedoraproject.org  Thu Jan  8 12:00:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 08 Jan 2009 12:00:10 +0000
Subject: [pkgdb] php-xmpphp had acl change status
Message-ID: <20090108120010.6E2ED208473@bastion.fedora.phx.redhat.com>

rakesh has set the watchcommits acl on php-xmpphp (Fedora 8) to Approved for itamarjp

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/php-xmpphp



From pkgdb at fedoraproject.org  Thu Jan  8 12:00:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 08 Jan 2009 12:00:14 +0000
Subject: [pkgdb] php-xmpphp had acl change status
Message-ID: <20090108120014.603C720831C@bastion.fedora.phx.redhat.com>

rakesh has set the commit acl on php-xmpphp (Fedora 8) to Approved for itamarjp

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/php-xmpphp



From pkgdb at fedoraproject.org  Thu Jan  8 12:00:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 08 Jan 2009 12:00:17 +0000
Subject: [pkgdb] php-xmpphp had acl change status
Message-ID: <20090108120017.D56BF208481@bastion.fedora.phx.redhat.com>

rakesh has set the watchcommits acl on php-xmpphp (Fedora 10) to Approved for itamarjp

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/php-xmpphp



From pkgdb at fedoraproject.org  Thu Jan  8 12:00:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 08 Jan 2009 12:00:18 +0000
Subject: [pkgdb] php-xmpphp had acl change status
Message-ID: <20090108120018.17625208484@bastion.fedora.phx.redhat.com>

rakesh has set the approveacls acl on php-xmpphp (Fedora 8) to Approved for itamarjp

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/php-xmpphp



From pkgdb at fedoraproject.org  Thu Jan  8 12:00:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 08 Jan 2009 12:00:19 +0000
Subject: [pkgdb] php-xmpphp had acl change status
Message-ID: <20090108120019.52510208487@bastion.fedora.phx.redhat.com>

rakesh has set the approveacls acl on php-xmpphp (Fedora 10) to Approved for itamarjp

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/php-xmpphp



From pkgdb at fedoraproject.org  Thu Jan  8 12:00:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 08 Jan 2009 12:00:21 +0000
Subject: [pkgdb] php-xmpphp had acl change status
Message-ID: <20090108120021.2812620848A@bastion.fedora.phx.redhat.com>

rakesh has set the watchbugzilla acl on php-xmpphp (Fedora 10) to Approved for itamarjp

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/php-xmpphp



From pkgdb at fedoraproject.org  Thu Jan  8 12:00:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 08 Jan 2009 12:00:26 +0000
Subject: [pkgdb] php-xmpphp had acl change status
Message-ID: <20090108120027.4188B20831F@bastion.fedora.phx.redhat.com>

rakesh has set the watchcommits acl on php-xmpphp (Fedora devel) to Approved for itamarjp

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/php-xmpphp



From pkgdb at fedoraproject.org  Thu Jan  8 12:00:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 08 Jan 2009 12:00:27 +0000
Subject: [pkgdb] php-xmpphp had acl change status
Message-ID: <20090108120028.431E220848F@bastion.fedora.phx.redhat.com>

rakesh has set the commit acl on php-xmpphp (Fedora 10) to Approved for itamarjp

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/php-xmpphp



From pkgdb at fedoraproject.org  Thu Jan  8 12:00:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 08 Jan 2009 12:00:27 +0000
Subject: [pkgdb] php-xmpphp had acl change status
Message-ID: <20090108120027.72F87208456@bastion.fedora.phx.redhat.com>

rakesh has set the approveacls acl on php-xmpphp (Fedora devel) to Approved for itamarjp

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/php-xmpphp



From mmahut at fedoraproject.org  Thu Jan  8 12:00:34 2009
From: mmahut at fedoraproject.org (Marek Mahut)
Date: Thu,  8 Jan 2009 12:00:34 +0000 (UTC)
Subject: rpms/cdk/devel cdk-5.0.20081105-make.patch, NONE, 1.1 cdk.spec, NONE,
	1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090108120034.7CF937013F@cvs1.fedora.phx.redhat.com>

Author: mmahut

Update of /cvs/pkgs/rpms/cdk/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22391/devel

Modified Files:
	.cvsignore sources 
Added Files:
	cdk-5.0.20081105-make.patch cdk.spec import.log 
Log Message:
initial build


cdk-5.0.20081105-make.patch:

--- NEW FILE cdk-5.0.20081105-make.patch ---
diff -Naur cdk-5.0-20081105-upstream/Makefile.in cdk-5.0-20081105/Makefile.in
--- cdk-5.0-20081105-upstream/Makefile.in	2009-01-04 21:35:53.000000000 +0100
+++ cdk-5.0-20081105/Makefile.in	2009-01-04 21:51:18.000000000 +0100
@@ -311,7 +311,7 @@
 	@echo "Installing CDK Readme files in $(DOCUMENT_DIR)..."
 	@for i in $(CDKREADME); do \
 	   echo "	... $$i"; \
-	   $(INSTALL_DATA) $(srcdir)/$$i $(DOCUMENT_DIR)/$$i; \
+	$(INSTALL_DATA) $(srcdir)/$$i $(DESTDIR)/$(DOCUMENT_DIR)/$$i; \
 	done
 
 uninstall \
@@ -491,7 +491,7 @@
 $(DOCUMENT_DIR) \
 $(INCLUDE_DIR) \
 $(LIB_DIR) \
-$(MAN_DIR) : ; $(srcdir)/mkdirs.sh $@
+$(MAN_DIR) : ; $(srcdir)/mkdirs.sh $(DESTDIR)$@
 
 #
 # Files generated from templates:


--- NEW FILE cdk.spec ---
Name:		cdk
Version:	5.0.20081105
Release:	1%{?dist}
Summary:	Curses Development Kit

Group:		Development/Libraries
License:	BSD with Advertising
URL:		http://invisible-island.net/cdk/
Source0:	ftp://invisible-island.net/%{name}/%{name}.tar.gz
Patch0:		cdk-5.0.20081105-make.patch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:	ncurses-devel

%description
Cdk stands for 'Curses Development Kit' and it currently contains 21 ready
to use widgets which facilitate the speedy development of full screen
curses programs.

%package devel
Summary:	Curses Development Kit
Group:		Development/Libraries
Requires:	%{name} = %{version}-%{release}

%description devel
Development headers for cdk (Curses Development Kit)

%prep
%setup -q -n %{name}-5.0-20081105
%patch0 -p1 


%build
%configure 
make %{?_smp_mflags} cdkshlib

%install
rm -rf $RPM_BUILD_ROOT
make install installCDKSHLibrary DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p -D"
rm -fr $RPM_BUILD_ROOT/usr/doc # we don't need this
chmod +x $RPM_BUILD_ROOT%{_libdir}/*.so # fixes rpmlint unstripped-binary-or-object

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig

%files
%defattr(-,root,root,-)
%doc CHANGES COPYING INSTALL NOTES README VERSION 
%{_libdir}/*.so.*
%exclude %{_libdir}/*.a
%{_mandir}/man3/*

%files devel
%defattr(-,root,root,-)
%doc EXPANDING TODO examples demos
%{_libdir}/*.so
%{_bindir}/cdk5-config
%{_includedir}/%{name}

%changelog
* Sun Jan 4 2009 Marek Mahut <mmahut at fedoraproject.org> - 5.0.20081105-1
- Initial build


--- NEW FILE import.log ---
cdk-5_0_20081105-1_fc8:HEAD:cdk-5.0.20081105-1.fc8.src.rpm:1231414461


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cdk/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	7 Jan 2009 00:09:46 -0000	1.1
+++ .cvsignore	8 Jan 2009 12:00:03 -0000	1.2
@@ -0,0 +1 @@
+cdk.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cdk/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	7 Jan 2009 00:09:46 -0000	1.1
+++ sources	8 Jan 2009 12:00:03 -0000	1.2
@@ -0,0 +1 @@
+e882c1f6f441efb970d51dbe71fc9f57  cdk.tar.gz



From atorkhov at fedoraproject.org  Thu Jan  8 12:49:18 2009
From: atorkhov at fedoraproject.org (Alexey Torkhov)
Date: Thu,  8 Jan 2009 12:49:18 +0000 (UTC)
Subject: rpms/cyphesis/devel cyphesis-0.5.15-gcc43.patch, 1.2,
	NONE cyphesis-0.5.15-init.patch, 1.2,
	NONE cyphesis-0.5.15-sockpath.patch, 1.1,
	NONE cyphesis-0.5.16-destdir.patch, 1.1,
	NONE cyphesis-0.5.17-gcrypt-init-fix.patch, 1.1,
	NONE cyphesis-0.5.17-init.patch, 1.1,
	NONE cyphesis-0.5.17-sockpath.patch, 1.1, NONE
Message-ID: <20090108124918.2E5EE700FD@cvs1.fedora.phx.redhat.com>

Author: atorkhov

Update of /cvs/pkgs/rpms/cyphesis/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29145

Removed Files:
	cyphesis-0.5.15-gcc43.patch cyphesis-0.5.15-init.patch 
	cyphesis-0.5.15-sockpath.patch cyphesis-0.5.16-destdir.patch 
	cyphesis-0.5.17-gcrypt-init-fix.patch 
	cyphesis-0.5.17-init.patch cyphesis-0.5.17-sockpath.patch 
Log Message:
Removing unused patches.


--- cyphesis-0.5.15-gcc43.patch DELETED ---


--- cyphesis-0.5.15-init.patch DELETED ---


--- cyphesis-0.5.15-sockpath.patch DELETED ---


--- cyphesis-0.5.16-destdir.patch DELETED ---


--- cyphesis-0.5.17-gcrypt-init-fix.patch DELETED ---


--- cyphesis-0.5.17-init.patch DELETED ---


--- cyphesis-0.5.17-sockpath.patch DELETED ---



From karsten at fedoraproject.org  Thu Jan  8 12:54:28 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Thu,  8 Jan 2009 12:54:28 +0000 (UTC)
Subject: rpms/vim/devel 7.2.061,NONE,1.1
Message-ID: <20090108125428.A3B51700FD@cvs1.fedora.phx.redhat.com>

Author: karsten

Update of /cvs/extras/rpms/vim/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29750

Added Files:
	7.2.061 
Log Message:
- patchlevel 061


--- NEW FILE 7.2.061 ---
To: vim-dev at vim.org
Subject: Patch 7.2.061
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.061
Problem:    Can't create a funcref for an autoload function without loading
	    the script first. (Marc Weber)
Solution:   Accept autoload functions that don't exist yet in function().
Files:	    src/eval.c


*** ../vim-7.2.060/src/eval.c	Fri Nov 28 21:26:50 2008
--- src/eval.c	Sat Nov 29 12:28:51 2008
***************
*** 10339,10345 ****
      s = get_tv_string(&argvars[0]);
      if (s == NULL || *s == NUL || VIM_ISDIGIT(*s))
  	EMSG2(_(e_invarg2), s);
!     else if (!function_exists(s))
  	EMSG2(_("E700: Unknown function: %s"), s);
      else
      {
--- 10339,10346 ----
      s = get_tv_string(&argvars[0]);
      if (s == NULL || *s == NUL || VIM_ISDIGIT(*s))
  	EMSG2(_(e_invarg2), s);
!     /* Don't check an autoload name for existence here. */
!     else if (vim_strchr(s, AUTOLOAD_CHAR) == NULL && !function_exists(s))
  	EMSG2(_("E700: Unknown function: %s"), s);
      else
      {
*** ../vim-7.2.060/src/version.c	Sun Nov 30 21:11:54 2008
--- src/version.c	Wed Dec  3 09:49:07 2008
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     61,
  /**/

-- 
There are 2 kinds of people in my world: those who know Unix, Perl, Vim, GNU,
Linux, etc, and those who know COBOL.  It gets very difficult for me at
parties, not knowing which group to socialise with :-)
						Sitaram Chamarty

 /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- 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  Thu Jan  8 12:54:41 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Thu,  8 Jan 2009 12:54:41 +0000 (UTC)
Subject: rpms/vim/devel 7.2.062,NONE,1.1
Message-ID: <20090108125441.EED67700FD@cvs1.fedora.phx.redhat.com>

Author: karsten

Update of /cvs/extras/rpms/vim/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29796

Added Files:
	7.2.062 
Log Message:
- patchlevel 062


--- NEW FILE 7.2.062 ---
To: vim-dev at vim.org
Subject: Patch 7.2.062
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.062
Problem:    "[Scratch]" is not translated.
Solution:   Mark the string for translation. (Dominique Pelle)
Files:	    src/buffer.c


*** ../vim-7.2.061/src/buffer.c	Sat Nov 15 16:05:30 2008
--- src/buffer.c	Tue Dec  2 21:51:02 2008
***************
*** 5118,5124 ****
      {
  	if (buf->b_sfname != NULL)
  	    return (char *)buf->b_sfname;
! 	return "[Scratch]";
      }
  #endif
      if (buf->b_fname == NULL)
--- 5118,5124 ----
      {
  	if (buf->b_sfname != NULL)
  	    return (char *)buf->b_sfname;
! 	return _("[Scratch]");
      }
  #endif
      if (buf->b_fname == NULL)
*** ../vim-7.2.061/src/version.c	Wed Dec  3 09:51:19 2008
--- src/version.c	Wed Dec  3 11:20:30 2008
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     62,
  /**/

-- 
DENNIS:  Listen -- strange women lying in ponds distributing swords is no
         basis for a system of government.  Supreme executive power derives
         from a mandate from the masses, not from some farcical aquatic
         ceremony.
                                  The Quest for the Holy Grail (Monty Python)

 /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\        download, build and distribute -- http://www.A-A-P.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///



From karsten at fedoraproject.org  Thu Jan  8 12:54:56 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Thu,  8 Jan 2009 12:54:56 +0000 (UTC)
Subject: rpms/vim/devel 7.2.063,NONE,1.1
Message-ID: <20090108125456.499D6700FD@cvs1.fedora.phx.redhat.com>

Author: karsten

Update of /cvs/extras/rpms/vim/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29831

Added Files:
	7.2.063 
Log Message:
- patchlevel 063


--- NEW FILE 7.2.063 ---
To: vim-dev at vim.org
Subject: Patch 7.2.063
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.063
Problem:    Warning for NULL argument of Perl_sys_init3().
Solution:   Use Perl_sys_init() instead. (partly by Dominique Pelle)
Files:	    src/if_perl.xs


*** ../vim-7.2.062/src/if_perl.xs	Mon Sep  1 17:56:05 2008
--- src/if_perl.xs	Wed Dec  3 12:44:38 2008
***************
*** 166,172 ****
  # define Perl_Isv_yes_ptr dll_Perl_Isv_yes_ptr
  # define boot_DynaLoader dll_boot_DynaLoader
  
! # define Perl_sys_init3 dll_Perl_sys_init3
  # define Perl_sys_term dll_Perl_sys_term
  # define Perl_ISv_ptr dll_Perl_ISv_ptr
  # define Perl_Istack_max_ptr dll_Perl_Istack_max_ptr
--- 166,172 ----
  # define Perl_Isv_yes_ptr dll_Perl_Isv_yes_ptr
  # define boot_DynaLoader dll_boot_DynaLoader
  
! # define Perl_sys_init dll_Perl_sys_init
  # define Perl_sys_term dll_Perl_sys_term
  # define Perl_ISv_ptr dll_Perl_ISv_ptr
  # define Perl_Istack_max_ptr dll_Perl_Istack_max_ptr
***************
*** 272,278 ****
  
  #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*);
  static SV*** (*Perl_Istack_max_ptr)(register PerlInterpreter*);
--- 272,278 ----
  
  #if (PERL_REVISION == 5) && (PERL_VERSION >= 10)
  static void (*Perl_sv_free2)(pTHX_ SV*);
! static void (*Perl_sys_init)(int* argc, char*** argv);
  static void (*Perl_sys_term)(void);
  static SV** (*Perl_ISv_ptr)(register PerlInterpreter*);
  static SV*** (*Perl_Istack_max_ptr)(register PerlInterpreter*);
***************
*** 372,378 ****
      {"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},
      {"Perl_Istack_sp_ptr", (PERL_PROC*)&Perl_Istack_sp_ptr},
--- 372,378 ----
      {"Perl_Tna_ptr", (PERL_PROC*)&Perl_Tna_ptr},
  #else
      {"Perl_sv_free2", (PERL_PROC*)&Perl_sv_free2},
!     {"Perl_sys_init", (PERL_PROC*)&Perl_sys_init},
      {"Perl_sys_term", (PERL_PROC*)&Perl_sys_term},
      {"Perl_ISv_ptr", (PERL_PROC*)&Perl_ISv_ptr},
      {"Perl_Istack_sp_ptr", (PERL_PROC*)&Perl_Istack_sp_ptr},
***************
*** 460,466 ****
      static char *argv[] = { "", "-e", "" };
  
  #if (PERL_REVISION == 5) && (PERL_VERSION >= 10)
!     Perl_sys_init3(&argc, (char***)&argv, NULL);
  #endif
      perl_interp = perl_alloc();
      perl_construct(perl_interp);
--- 460,466 ----
      static char *argv[] = { "", "-e", "" };
  
  #if (PERL_REVISION == 5) && (PERL_VERSION >= 10)
!     Perl_sys_init(&argc, (char***)&argv);
  #endif
      perl_interp = perl_alloc();
      perl_construct(perl_interp);
*** ../vim-7.2.062/src/version.c	Wed Dec  3 11:21:20 2008
--- src/version.c	Wed Dec  3 12:42:50 2008
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     63,
  /**/

-- 
Windows
M!uqoms

 /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\        download, build and distribute -- http://www.A-A-P.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///



From karsten at fedoraproject.org  Thu Jan  8 12:55:10 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Thu,  8 Jan 2009 12:55:10 +0000 (UTC)
Subject: rpms/vim/devel 7.2.064,NONE,1.1
Message-ID: <20090108125510.57444700FD@cvs1.fedora.phx.redhat.com>

Author: karsten

Update of /cvs/extras/rpms/vim/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29894

Added Files:
	7.2.064 
Log Message:
- patchlevel 064


--- NEW FILE 7.2.064 ---
To: vim-dev at vim.org
Subject: Patch 7.2.064
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.064
Problem:    Screen update bug when repeating "~" on a Visual block and the
	    last line doesn't change.
Solution:   Keep track of changes for all lines.  (Moritz Orbach)
Files:	    src/ops.c


*** ../vim-7.2.063/src/ops.c	Tue Jun 24 23:59:55 2008
--- src/ops.c	Wed Dec  3 13:12:06 2008
***************
*** 2209,2220 ****
      {
  	for (; pos.lnum <= oap->end.lnum; ++pos.lnum)
  	{
  	    block_prep(oap, &bd, pos.lnum, FALSE);
  	    pos.col = bd.textcol;
! 	    did_change = swapchars(oap->op_type, &pos, bd.textlen);
  
  # ifdef FEAT_NETBEANS_INTG
! 	    if (usingNetbeans && did_change)
  	    {
  		char_u *ptr = ml_get_buf(curbuf, pos.lnum, FALSE);
  
--- 2209,2223 ----
      {
  	for (; pos.lnum <= oap->end.lnum; ++pos.lnum)
  	{
+ 	    int one_change;
+ 
  	    block_prep(oap, &bd, pos.lnum, FALSE);
  	    pos.col = bd.textcol;
! 	    one_change = swapchars(oap->op_type, &pos, bd.textlen);
! 	    did_change |= one_change;
  
  # ifdef FEAT_NETBEANS_INTG
! 	    if (usingNetbeans && one_change)
  	    {
  		char_u *ptr = ml_get_buf(curbuf, pos.lnum, FALSE);
  
*** ../vim-7.2.063/src/version.c	Wed Dec  3 13:18:16 2008
--- src/version.c	Wed Dec  3 13:14:46 2008
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     64,
  /**/

-- 
Q:   How many hardware engineers does it take to change a lightbulb?
A:   None.  We'll fix it in software.

 /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\        download, build and distribute -- http://www.A-A-P.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///



From karsten at fedoraproject.org  Thu Jan  8 12:55:23 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Thu,  8 Jan 2009 12:55:23 +0000 (UTC)
Subject: rpms/vim/devel 7.2.065,NONE,1.1
Message-ID: <20090108125523.DA50A700FD@cvs1.fedora.phx.redhat.com>

Author: karsten

Update of /cvs/extras/rpms/vim/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29931

Added Files:
	7.2.065 
Log Message:
- patchlevel 065


--- NEW FILE 7.2.065 ---
To: vim-dev at vim.org
Subject: Patch 7.2.065
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.065
Problem:    GTK GUI: the cursor disappears when doing ":vsp" and the Vim
	    window is maximized.  (Dominique Pelle, Denis Smolyar)
Solution:   Don't change "Columns" back to an old value at a wrong moment.
	    Do change "Rows" when it should not be a problem.
Files:	    src/gui.c


*** ../vim-7.2.064/src/gui.c	Fri Nov 28 21:26:50 2008
--- src/gui.c	Wed Dec  3 18:01:21 2008
***************
*** 3241,3247 ****
  	    i = Rows;
  	    gui_update_tabline();
  	    Rows = i;
! 	    need_set_size = RESIZE_VERT;
  	    if (using_tabline)
  		fix_size = TRUE;
  	    if (!gui_use_tabline())
--- 3241,3247 ----
  	    i = Rows;
  	    gui_update_tabline();
  	    Rows = i;
! 	    need_set_size |= RESIZE_VERT;
  	    if (using_tabline)
  		fix_size = TRUE;
  	    if (!gui_use_tabline())
***************
*** 3275,3283 ****
  		if (gui.which_scrollbars[i] != prev_which_scrollbars[i])
  		{
  		    if (i == SBAR_BOTTOM)
! 			need_set_size = RESIZE_VERT;
  		    else
! 			need_set_size = RESIZE_HOR;
  		    if (gui.which_scrollbars[i])
  			fix_size = TRUE;
  		}
--- 3275,3283 ----
  		if (gui.which_scrollbars[i] != prev_which_scrollbars[i])
  		{
  		    if (i == SBAR_BOTTOM)
! 			need_set_size |= RESIZE_VERT;
  		    else
! 			need_set_size |= RESIZE_HOR;
  		    if (gui.which_scrollbars[i])
  			fix_size = TRUE;
  		}
***************
*** 3297,3303 ****
  	    gui_mch_enable_menu(gui.menu_is_active);
  	    Rows = i;
  	    prev_menu_is_active = gui.menu_is_active;
! 	    need_set_size = RESIZE_VERT;
  	    if (gui.menu_is_active)
  		fix_size = TRUE;
  	}
--- 3297,3303 ----
  	    gui_mch_enable_menu(gui.menu_is_active);
  	    Rows = i;
  	    prev_menu_is_active = gui.menu_is_active;
! 	    need_set_size |= RESIZE_VERT;
  	    if (gui.menu_is_active)
  		fix_size = TRUE;
  	}
***************
*** 3308,3314 ****
  	{
  	    gui_mch_show_toolbar(using_toolbar);
  	    prev_toolbar = using_toolbar;
! 	    need_set_size = RESIZE_VERT;
  	    if (using_toolbar)
  		fix_size = TRUE;
  	}
--- 3308,3314 ----
  	{
  	    gui_mch_show_toolbar(using_toolbar);
  	    prev_toolbar = using_toolbar;
! 	    need_set_size |= RESIZE_VERT;
  	    if (using_toolbar)
  		fix_size = TRUE;
  	}
***************
*** 3318,3324 ****
  	{
  	    gui_mch_enable_footer(using_footer);
  	    prev_footer = using_footer;
! 	    need_set_size = RESIZE_VERT;
  	    if (using_footer)
  		fix_size = TRUE;
  	}
--- 3318,3324 ----
  	{
  	    gui_mch_enable_footer(using_footer);
  	    prev_footer = using_footer;
! 	    need_set_size |= RESIZE_VERT;
  	    if (using_footer)
  		fix_size = TRUE;
  	}
***************
*** 3330,3339 ****
  	    prev_tearoff = using_tearoff;
  	}
  #endif
! 	if (need_set_size)
  	{
  #ifdef FEAT_GUI_GTK
! 	    long    c = Columns;
  #endif
  	    /* Adjust the size of the window to make the text area keep the
  	     * same size and to avoid that part of our window is off-screen
--- 3330,3340 ----
  	    prev_tearoff = using_tearoff;
  	}
  #endif
! 	if (need_set_size != 0)
  	{
  #ifdef FEAT_GUI_GTK
! 	    long    prev_Columns = Columns;
! 	    long    prev_Rows = Rows;
  #endif
  	    /* Adjust the size of the window to make the text area keep the
  	     * same size and to avoid that part of our window is off-screen
***************
*** 3349,3359 ****
  	     * If you remove this, please test this command for resizing
  	     * effects (with optional left scrollbar): ":vsp|q|vsp|q|vsp|q".
  	     * Don't do this while starting up though.
! 	     * And don't change Rows, it may have be reduced intentionally
! 	     * when adding menu/toolbar/tabline. */
! 	    if (!gui.starting)
  		(void)char_avail();
! 	    Columns = c;
  #endif
  	}
  #ifdef FEAT_WINDOWS
--- 3350,3363 ----
  	     * If you remove this, please test this command for resizing
  	     * effects (with optional left scrollbar): ":vsp|q|vsp|q|vsp|q".
  	     * Don't do this while starting up though.
! 	     * Don't change Rows when adding menu/toolbar/tabline.
! 	     * Don't change Columns when adding vertical toolbar. */
! 	    if (!gui.starting && need_set_size != (RESIZE_VERT | RESIZE_HOR))
  		(void)char_avail();
! 	    if ((need_set_size & RESIZE_VERT) == 0)
! 		Rows = prev_Rows;
! 	    if ((need_set_size & RESIZE_HOR) == 0)
! 		Columns = prev_Columns;
  #endif
  	}
  #ifdef FEAT_WINDOWS
*** ../vim-7.2.064/src/version.c	Wed Dec  3 13:38:00 2008
--- src/version.c	Wed Dec  3 18:47:11 2008
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     65,
  /**/

-- 
Seen on the back of a biker's vest: If you can read this, my wife fell off.

 /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- 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  Thu Jan  8 12:55:37 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Thu,  8 Jan 2009 12:55:37 +0000 (UTC)
Subject: rpms/vim/devel 7.2.066,NONE,1.1
Message-ID: <20090108125537.A52F4700FD@cvs1.fedora.phx.redhat.com>

Author: karsten

Update of /cvs/extras/rpms/vim/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29974

Added Files:
	7.2.066 
Log Message:
- patchlevel 066


--- NEW FILE 7.2.066 ---
To: vim-dev at vim.org
Subject: Patch 7.2.066
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.066
Problem:    It's not easy to see whether 'encoding' is a multi-byte encoding.
Solution:   Add has('multi_byte_encoding').
Files:	    runtime/doc/eval.txt, src/eval.c


*** ../vim-7.2.065/runtime/doc/eval.txt	Fri Nov 28 11:15:10 2008
--- runtime/doc/eval.txt	Tue Dec  9 10:55:59 2008
***************
*** 5841,5847 ****
  mouse_pterm		Compiled with support for qnx pterm mouse.
  mouse_sysmouse		Compiled with support for sysmouse (*BSD console mouse)
  mouse_xterm		Compiled with support for xterm mouse.
! multi_byte		Compiled with support for editing Korean et al.
  multi_byte_ime		Compiled with support for IME input method.
  multi_lang		Compiled with support for multiple languages.
  mzscheme		Compiled with MzScheme interface |mzscheme|.
--- 5852,5859 ----
  mouse_pterm		Compiled with support for qnx pterm mouse.
  mouse_sysmouse		Compiled with support for sysmouse (*BSD console mouse)
  mouse_xterm		Compiled with support for xterm mouse.
! multi_byte		Compiled with support for 'encoding'
! multi_byte_encoding	'encoding' is set to a multi-byte encoding.
  multi_byte_ime		Compiled with support for IME input method.
  multi_lang		Compiled with support for multiple languages.
  mzscheme		Compiled with MzScheme interface |mzscheme|.
*** ../vim-7.2.065/src/eval.c	Wed Dec  3 09:51:19 2008
--- src/eval.c	Wed Dec  3 14:29:09 2008
***************
*** 11842,11847 ****
--- 11842,11851 ----
  	    n = has_patch(atoi((char *)name + 5));
  	else if (STRICMP(name, "vim_starting") == 0)
  	    n = (starting != 0);
+ #ifdef FEAT_MBYTE
+ 	else if (STRICMP(name, "multi_byte_encoding") == 0)
+ 	    n = has_mbyte;
+ #endif
  #if defined(FEAT_BEVAL) && defined(FEAT_GUI_W32)
  	else if (STRICMP(name, "balloon_multiline") == 0)
  	    n = multiline_balloon_available();
*** ../vim-7.2.065/src/version.c	Wed Dec  3 18:50:09 2008
--- src/version.c	Tue Dec  9 10:48:49 2008
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     66,
  /**/

-- 
ARTHUR: Listen, old crone!  Unless you tell us where we can buy a shrubbery,
        my friend and I will ... we will say "Ni!"
CRONE:  Do your worst!
                 "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD

 /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\        download, build and distribute -- http://www.A-A-P.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///



From karsten at fedoraproject.org  Thu Jan  8 12:55:51 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Thu,  8 Jan 2009 12:55:51 +0000 (UTC)
Subject: rpms/vim/devel 7.2.067,NONE,1.1
Message-ID: <20090108125551.3A5F7700FD@cvs1.fedora.phx.redhat.com>

Author: karsten

Update of /cvs/extras/rpms/vim/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30048

Added Files:
	7.2.067 
Log Message:
- patchlevel 067


--- NEW FILE 7.2.067 ---
To: vim-dev at vim.org
Subject: Patch 7.2.067
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.067
Problem:    Session file can't load extra file when the path contains special
	    characters.
Solution:   Escape the file name. (Lech Lorens)
Files:	    src/ex_docmd.c


*** ../vim-7.2.066/src/ex_docmd.c	Fri Nov 28 21:26:50 2008
--- src/ex_docmd.c	Fri Dec  5 21:34:11 2008
***************
*** 10106,10112 ****
       */
      if (put_line(fd, "let s:sx = expand(\"<sfile>:p:r\").\"x.vim\"") == FAIL
  	    || put_line(fd, "if file_readable(s:sx)") == FAIL
! 	    || put_line(fd, "  exe \"source \" . s:sx") == FAIL
  	    || put_line(fd, "endif") == FAIL)
  	return FAIL;
  
--- 10106,10112 ----
       */
      if (put_line(fd, "let s:sx = expand(\"<sfile>:p:r\").\"x.vim\"") == FAIL
  	    || put_line(fd, "if file_readable(s:sx)") == FAIL
! 	    || put_line(fd, "  exe \"source \" . fnameescape(s:sx)") == FAIL
  	    || put_line(fd, "endif") == FAIL)
  	return FAIL;
  
*** ../vim-7.2.066/src/version.c	Tue Dec  9 10:56:50 2008
--- src/version.c	Tue Dec  9 11:16:27 2008
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     67,
  /**/

-- 
Life is a gift, living is an art.		(Bram Moolenaar)

 /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- 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  Thu Jan  8 12:56:04 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Thu,  8 Jan 2009 12:56:04 +0000 (UTC)
Subject: rpms/vim/devel 7.2.068,NONE,1.1
Message-ID: <20090108125604.C7079700FD@cvs1.fedora.phx.redhat.com>

Author: karsten

Update of /cvs/extras/rpms/vim/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30091

Added Files:
	7.2.068 
Log Message:
- patchlevel 068


--- NEW FILE 7.2.068 ---
To: vim-dev at vim.org
Subject: Patch 7.2.068
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.068
Problem:    Emacs tags file lines can be too long, resulting in an error
	    message. (James Vega)
Solution:   Ignore lines with errors if they are too long.
Files:	    src/tag.c


*** ../vim-7.2.067/src/tag.c	Fri Jul 18 11:26:12 2008
--- src/tag.c	Sat Dec  6 13:54:33 2008
***************
*** 2725,2731 ****
--- 2725,2748 ----
  	 */
  	p_7f = vim_strchr(lbuf, 0x7f);
  	if (p_7f == NULL)
+ 	{
+ etag_fail:
+ 	    if (vim_strchr(lbuf, '\n') == NULL)
+ 	    {
+ 		/* Truncated line.  Ignore it. */
+ 		if (p_verbose >= 5)
+ 		{
+ 		    verbose_enter();
+ 		    MSG(_("Ignoring long line in tags file"));
+ 		    verbose_leave();
+ 		}
+ 		tagp->command = lbuf;
+ 		tagp->tagname = lbuf;
+ 		tagp->tagname_end = lbuf;
+ 		return OK;
+ 	    }
  	    return FAIL;
+ 	}
  
  	/* Find ^A.  If not found the line number is after the 0x7f */
  	p = vim_strchr(p_7f, Ctrl_A);
***************
*** 2735,2741 ****
  	    ++p;
  
  	if (!VIM_ISDIGIT(*p))	    /* check for start of line number */
! 	    return FAIL;
  	tagp->command = p;
  
  
--- 2752,2758 ----
  	    ++p;
  
  	if (!VIM_ISDIGIT(*p))	    /* check for start of line number */
! 	    goto etag_fail;
  	tagp->command = p;
  
  
***************
*** 2749,2755 ****
  	    /* find end of tagname */
  	    for (p = p_7f - 1; !vim_iswordc(*p); --p)
  		if (p == lbuf)
! 		    return FAIL;
  	    tagp->tagname_end = p + 1;
  	    while (p >= lbuf && vim_iswordc(*p))
  		--p;
--- 2766,2772 ----
  	    /* find end of tagname */
  	    for (p = p_7f - 1; !vim_iswordc(*p); --p)
  		if (p == lbuf)
! 		    goto etag_fail;
  	    tagp->tagname_end = p + 1;
  	    while (p >= lbuf && vim_iswordc(*p))
  		--p;
*** ../vim-7.2.067/src/version.c	Tue Dec  9 11:17:23 2008
--- src/version.c	Tue Dec  9 12:05:41 2008
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     68,
  /**/

-- 
Q: What do you call a fish without an eye?
A: fsh!
Q: What do you call a deer with no eyes?
A: no eye deer.
Q: What do you call a deer with no eyes and no legs?
A: still no eye deer.

 /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- 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 pvrabec at fedoraproject.org  Thu Jan  8 12:56:20 2009
From: pvrabec at fedoraproject.org (Peter Vrabec)
Date: Thu,  8 Jan 2009 12:56:20 +0000 (UTC)
Subject: rpms/netlabel_tools/devel .cvsignore, 1.4, 1.5 netlabel_tools.spec, 
	1.11, 1.12 sources, 1.4, 1.5
Message-ID: <20090108125620.DD616700FD@cvs1.fedora.phx.redhat.com>

Author: pvrabec

Update of /cvs/extras/rpms/netlabel_tools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30030

Modified Files:
	.cvsignore netlabel_tools.spec sources 
Log Message:
upgrade (#478903)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/netlabel_tools/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	27 Oct 2008 15:37:04 -0000	1.4
+++ .cvsignore	8 Jan 2009 12:55:50 -0000	1.5
@@ -1 +1 @@
-netlabel_tools-0.18.tar.gz
+netlabel_tools-0.19.tar.gz


Index: netlabel_tools.spec
===================================================================
RCS file: /cvs/extras/rpms/netlabel_tools/devel/netlabel_tools.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- netlabel_tools.spec	27 Oct 2008 15:37:04 -0000	1.11
+++ netlabel_tools.spec	8 Jan 2009 12:55:50 -0000	1.12
@@ -1,6 +1,6 @@
 Summary: Tools to manage the Linux NetLabel subsystem
 Name: netlabel_tools
-Version: 0.18
+Version: 0.19
 Release: 1%{?dist}
 License: GPLv2+
 Group: System Environment/Daemons
@@ -51,6 +51,9 @@
 %attr(0644,root,root) %{_mandir}/man8/*
 
 %changelog
+* Thu Jan 08 2009 Peter Vrabec <pvrabec at redhat.com> - 0.19-1
+- upgrade (#478903)
+
 * Mon Oct 27 2008 Peter Vrabec <pvrabec at redhat.com> - 0.18-1
 - upgrade (#439833)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/netlabel_tools/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	27 Oct 2008 15:37:04 -0000	1.4
+++ sources	8 Jan 2009 12:55:50 -0000	1.5
@@ -1 +1 @@
-963fad62ad186080bce32075f25e58d3  netlabel_tools-0.18.tar.gz
+f7a9f397e5bf2364676e2beba1a61beb  netlabel_tools-0.19.tar.gz



From karsten at fedoraproject.org  Thu Jan  8 12:56:18 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Thu,  8 Jan 2009 12:56:18 +0000 (UTC)
Subject: rpms/vim/devel 7.2.069,NONE,1.1
Message-ID: <20090108125618.EB967700FD@cvs1.fedora.phx.redhat.com>

Author: karsten

Update of /cvs/extras/rpms/vim/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30135

Added Files:
	7.2.069 
Log Message:
- patchlevel 069


--- NEW FILE 7.2.069 ---
To: vim-dev at vim.org
Subject: Patch 7.2.069
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.069 (after 7.2.060)
Problem:    Compiler warning for storing size_t in int.
Solution:   Add type cast.
Files:      src/spell.c


*** ../vim-7.2.068/src/spell.c	Sun Nov 30 21:11:54 2008
--- src/spell.c	Tue Dec  9 22:19:04 2008
***************
*** 1765,1771 ****
  	    /* Second part matches at start of following compound word, now
  	     * check if first part matches at end of previous word. */
  	    p = ((char_u **)gap->ga_data)[i];
! 	    len = STRLEN(p);
  	    if (len <= wlen && STRNCMP(ptr + wlen - len, p, len) == 0)
  		return TRUE;
  	}
--- 1765,1771 ----
  	    /* Second part matches at start of following compound word, now
  	     * check if first part matches at end of previous word. */
  	    p = ((char_u **)gap->ga_data)[i];
! 	    len = (int)STRLEN(p);
  	    if (len <= wlen && STRNCMP(ptr + wlen - len, p, len) == 0)
  		return TRUE;
  	}
*** ../vim-7.2.068/src/version.c	Tue Dec  9 12:12:31 2008
--- src/version.c	Tue Dec  9 22:21:15 2008
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     69,
  /**/

-- 
The war between Emacs and Vi is over.  Vi has won with 3 to 1.
			http://www.ssc.com/lg/issue30/raymond.html

 /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\        download, build and distribute -- http://www.A-A-P.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///



From karsten at fedoraproject.org  Thu Jan  8 12:56:33 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Thu,  8 Jan 2009 12:56:33 +0000 (UTC)
Subject: rpms/vim/devel 7.2.070,NONE,1.1
Message-ID: <20090108125633.6AAE5700FD@cvs1.fedora.phx.redhat.com>

Author: karsten

Update of /cvs/extras/rpms/vim/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30187

Added Files:
	7.2.070 
Log Message:
- patchlevel 070


--- NEW FILE 7.2.070 ---
To: vim-dev at vim.org
Subject: Patch 7.2.070
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.070
Problem:    Crash when a function returns a:000. (Matt Wozkiski)
Solution:   Don't put the function struct on the stack, allocate it.  Free it
	    only when nothing in it is used.
Files:	    src/eval.c


*** ../vim-7.2.069/src/eval.c	Tue Dec  9 10:56:50 2008
--- src/eval.c	Wed Dec 17 21:32:26 2008
***************
*** 32,37 ****
--- 32,40 ----
  
  #define DICT_MAXNEST 100	/* maximum nesting of lists and dicts */
  
+ #define DO_NOT_FREE_CNT 99999	/* refcount for dict or list that should not
+ 				   be freed. */
+ 
  /*
   * In a hashtab item "hi_key" points to "di_key" in a dictitem.
   * This avoids adding a pointer to the hashtab item.
***************
*** 789,794 ****
--- 792,799 ----
  static void func_unref __ARGS((char_u *name));
  static void func_ref __ARGS((char_u *name));
  static void call_user_func __ARGS((ufunc_T *fp, int argcount, typval_T *argvars, typval_T *rettv, linenr_T firstline, linenr_T lastline, dict_T *selfdict));
+ static int can_free_funccal __ARGS((funccall_T *fc, int copyID)) ;
+ static void free_funccal __ARGS((funccall_T *fc, int free_val));
  static void add_nr_var __ARGS((dict_T *dp, dictitem_T *v, char *name, varnumber_T nr));
  static win_T *find_win_by_nr __ARGS((typval_T *vp, tabpage_T *tp));
  static void getwinvar __ARGS((typval_T *argvars, typval_T *rettv, int off));
***************
*** 923,928 ****
--- 928,937 ----
  /* pointer to funccal for currently active function */
  funccall_T *current_funccal = NULL;
  
+ /* pointer to list of previously used funccal, still around because some
+  * item in it is still being used. */
+ funccall_T *previous_funccal = NULL;
+ 
  /*
   * Return TRUE when a function was ended by a ":return" command.
   */
***************
*** 6490,6496 ****
      buf_T	*buf;
      win_T	*wp;
      int		i;
!     funccall_T	*fc;
      int		did_free = FALSE;
  #ifdef FEAT_WINDOWS
      tabpage_T	*tp;
--- 6499,6505 ----
      buf_T	*buf;
      win_T	*wp;
      int		i;
!     funccall_T	*fc, **pfc;
      int		did_free = FALSE;
  #ifdef FEAT_WINDOWS
      tabpage_T	*tp;
***************
*** 6574,6579 ****
--- 6583,6602 ----
  	else
  	    ll = ll->lv_used_next;
  
+     /* check if any funccal can be freed now */
+     for (pfc = &previous_funccal; *pfc != NULL; )
+     {
+ 	if (can_free_funccal(*pfc, copyID))
+ 	{
+ 	    fc = *pfc;
+ 	    *pfc = fc->caller;
+ 	    free_funccal(fc, TRUE);
+ 	    did_free = TRUE;
+ 	}
+ 	else
+ 	    pfc = &(*pfc)->caller;
+     }
+ 
      return did_free;
  }
  
***************
*** 18962,18968 ****
      dictitem_T	*dict_var;
  {
      hash_init(&dict->dv_hashtab);
!     dict->dv_refcount = 99999;
      dict_var->di_tv.vval.v_dict = dict;
      dict_var->di_tv.v_type = VAR_DICT;
      dict_var->di_tv.v_lock = VAR_FIXED;
--- 18985,18991 ----
      dictitem_T	*dict_var;
  {
      hash_init(&dict->dv_hashtab);
!     dict->dv_refcount = DO_NOT_FREE_CNT;
      dict_var->di_tv.vval.v_dict = dict;
      dict_var->di_tv.v_type = VAR_DICT;
      dict_var->di_tv.v_lock = VAR_FIXED;
***************
*** 19299,19304 ****
--- 19322,19329 ----
   * Copy the values from typval_T "from" to typval_T "to".
   * When needed allocates string or increases reference count.
   * Does not make a copy of a list or dict but copies the reference!
+  * It is OK for "from" and "to" to point to the same item.  This is used to
+  * make a copy later.
   */
      static void
  copy_tv(from, to)
***************
*** 21111,21117 ****
      char_u	*save_sourcing_name;
      linenr_T	save_sourcing_lnum;
      scid_T	save_current_SID;
!     funccall_T	fc;
      int		save_did_emsg;
      static int	depth = 0;
      dictitem_T	*v;
--- 21136,21142 ----
      char_u	*save_sourcing_name;
      linenr_T	save_sourcing_lnum;
      scid_T	save_current_SID;
!     funccall_T	*fc;
      int		save_did_emsg;
      static int	depth = 0;
      dictitem_T	*v;
***************
*** 21137,21172 ****
  
      line_breakcheck();		/* check for CTRL-C hit */
  
!     fc.caller = current_funccal;
!     current_funccal = &fc;
!     fc.func = fp;
!     fc.rettv = rettv;
      rettv->vval.v_number = 0;
!     fc.linenr = 0;
!     fc.returned = FALSE;
!     fc.level = ex_nesting_level;
      /* Check if this function has a breakpoint. */
!     fc.breakpoint = dbg_find_breakpoint(FALSE, fp->uf_name, (linenr_T)0);
!     fc.dbg_tick = debug_tick;
  
      /*
!      * Note about using fc.fixvar[]: This is an array of FIXVAR_CNT variables
       * with names up to VAR_SHORT_LEN long.  This avoids having to alloc/free
       * each argument variable and saves a lot of time.
       */
      /*
       * Init l: variables.
       */
!     init_var_dict(&fc.l_vars, &fc.l_vars_var);
      if (selfdict != NULL)
      {
  	/* Set l:self to "selfdict".  Use "name" to avoid a warning from
  	 * some compiler that checks the destination size. */
! 	v = &fc.fixvar[fixvar_idx++].var;
  	name = v->di_key;
  	STRCPY(name, "self");
  	v->di_flags = DI_FLAGS_RO + DI_FLAGS_FIX;
! 	hash_add(&fc.l_vars.dv_hashtab, DI2HIKEY(v));
  	v->di_tv.v_type = VAR_DICT;
  	v->di_tv.v_lock = 0;
  	v->di_tv.vval.v_dict = selfdict;
--- 21162,21198 ----
  
      line_breakcheck();		/* check for CTRL-C hit */
  
!     fc = (funccall_T *)alloc(sizeof(funccall_T));
!     fc->caller = current_funccal;
!     current_funccal = fc;
!     fc->func = fp;
!     fc->rettv = rettv;
      rettv->vval.v_number = 0;
!     fc->linenr = 0;
!     fc->returned = FALSE;
!     fc->level = ex_nesting_level;
      /* Check if this function has a breakpoint. */
!     fc->breakpoint = dbg_find_breakpoint(FALSE, fp->uf_name, (linenr_T)0);
!     fc->dbg_tick = debug_tick;
  
      /*
!      * Note about using fc->fixvar[]: This is an array of FIXVAR_CNT variables
       * with names up to VAR_SHORT_LEN long.  This avoids having to alloc/free
       * each argument variable and saves a lot of time.
       */
      /*
       * Init l: variables.
       */
!     init_var_dict(&fc->l_vars, &fc->l_vars_var);
      if (selfdict != NULL)
      {
  	/* Set l:self to "selfdict".  Use "name" to avoid a warning from
  	 * some compiler that checks the destination size. */
! 	v = &fc->fixvar[fixvar_idx++].var;
  	name = v->di_key;
  	STRCPY(name, "self");
  	v->di_flags = DI_FLAGS_RO + DI_FLAGS_FIX;
! 	hash_add(&fc->l_vars.dv_hashtab, DI2HIKEY(v));
  	v->di_tv.v_type = VAR_DICT;
  	v->di_tv.v_lock = 0;
  	v->di_tv.vval.v_dict = selfdict;
***************
*** 21178,21208 ****
       * Set a:0 to "argcount".
       * Set a:000 to a list with room for the "..." arguments.
       */
!     init_var_dict(&fc.l_avars, &fc.l_avars_var);
!     add_nr_var(&fc.l_avars, &fc.fixvar[fixvar_idx++].var, "0",
  				(varnumber_T)(argcount - fp->uf_args.ga_len));
      /* Use "name" to avoid a warning from some compiler that checks the
       * destination size. */
!     v = &fc.fixvar[fixvar_idx++].var;
      name = v->di_key;
      STRCPY(name, "000");
      v->di_flags = DI_FLAGS_RO | DI_FLAGS_FIX;
!     hash_add(&fc.l_avars.dv_hashtab, DI2HIKEY(v));
      v->di_tv.v_type = VAR_LIST;
      v->di_tv.v_lock = VAR_FIXED;
!     v->di_tv.vval.v_list = &fc.l_varlist;
!     vim_memset(&fc.l_varlist, 0, sizeof(list_T));
!     fc.l_varlist.lv_refcount = 99999;
!     fc.l_varlist.lv_lock = VAR_FIXED;
  
      /*
       * Set a:firstline to "firstline" and a:lastline to "lastline".
       * Set a:name to named arguments.
       * Set a:N to the "..." arguments.
       */
!     add_nr_var(&fc.l_avars, &fc.fixvar[fixvar_idx++].var, "firstline",
  						      (varnumber_T)firstline);
!     add_nr_var(&fc.l_avars, &fc.fixvar[fixvar_idx++].var, "lastline",
  						       (varnumber_T)lastline);
      for (i = 0; i < argcount; ++i)
      {
--- 21204,21234 ----
       * Set a:0 to "argcount".
       * Set a:000 to a list with room for the "..." arguments.
       */
!     init_var_dict(&fc->l_avars, &fc->l_avars_var);
!     add_nr_var(&fc->l_avars, &fc->fixvar[fixvar_idx++].var, "0",
  				(varnumber_T)(argcount - fp->uf_args.ga_len));
      /* Use "name" to avoid a warning from some compiler that checks the
       * destination size. */
!     v = &fc->fixvar[fixvar_idx++].var;
      name = v->di_key;
      STRCPY(name, "000");
      v->di_flags = DI_FLAGS_RO | DI_FLAGS_FIX;
!     hash_add(&fc->l_avars.dv_hashtab, DI2HIKEY(v));
      v->di_tv.v_type = VAR_LIST;
      v->di_tv.v_lock = VAR_FIXED;
!     v->di_tv.vval.v_list = &fc->l_varlist;
!     vim_memset(&fc->l_varlist, 0, sizeof(list_T));
!     fc->l_varlist.lv_refcount = DO_NOT_FREE_CNT;
!     fc->l_varlist.lv_lock = VAR_FIXED;
  
      /*
       * Set a:firstline to "firstline" and a:lastline to "lastline".
       * Set a:name to named arguments.
       * Set a:N to the "..." arguments.
       */
!     add_nr_var(&fc->l_avars, &fc->fixvar[fixvar_idx++].var, "firstline",
  						      (varnumber_T)firstline);
!     add_nr_var(&fc->l_avars, &fc->fixvar[fixvar_idx++].var, "lastline",
  						       (varnumber_T)lastline);
      for (i = 0; i < argcount; ++i)
      {
***************
*** 21218,21224 ****
  	}
  	if (fixvar_idx < FIXVAR_CNT && STRLEN(name) <= VAR_SHORT_LEN)
  	{
! 	    v = &fc.fixvar[fixvar_idx++].var;
  	    v->di_flags = DI_FLAGS_RO | DI_FLAGS_FIX;
  	}
  	else
--- 21244,21250 ----
  	}
  	if (fixvar_idx < FIXVAR_CNT && STRLEN(name) <= VAR_SHORT_LEN)
  	{
! 	    v = &fc->fixvar[fixvar_idx++].var;
  	    v->di_flags = DI_FLAGS_RO | DI_FLAGS_FIX;
  	}
  	else
***************
*** 21230,21236 ****
  	    v->di_flags = DI_FLAGS_RO;
  	}
  	STRCPY(v->di_key, name);
! 	hash_add(&fc.l_avars.dv_hashtab, DI2HIKEY(v));
  
  	/* Note: the values are copied directly to avoid alloc/free.
  	 * "argvars" must have VAR_FIXED for v_lock. */
--- 21256,21262 ----
  	    v->di_flags = DI_FLAGS_RO;
  	}
  	STRCPY(v->di_key, name);
! 	hash_add(&fc->l_avars.dv_hashtab, DI2HIKEY(v));
  
  	/* Note: the values are copied directly to avoid alloc/free.
  	 * "argvars" must have VAR_FIXED for v_lock. */
***************
*** 21239,21247 ****
  
  	if (ai >= 0 && ai < MAX_FUNC_ARGS)
  	{
! 	    list_append(&fc.l_varlist, &fc.l_listitems[ai]);
! 	    fc.l_listitems[ai].li_tv = argvars[i];
! 	    fc.l_listitems[ai].li_tv.v_lock = VAR_FIXED;
  	}
      }
  
--- 21265,21273 ----
  
  	if (ai >= 0 && ai < MAX_FUNC_ARGS)
  	{
! 	    list_append(&fc->l_varlist, &fc->l_listitems[ai]);
! 	    fc->l_listitems[ai].li_tv = argvars[i];
! 	    fc->l_listitems[ai].li_tv.v_lock = VAR_FIXED;
  	}
      }
  
***************
*** 21306,21312 ****
  	if (!fp->uf_profiling && has_profiling(FALSE, fp->uf_name, NULL))
  	    func_do_profile(fp);
  	if (fp->uf_profiling
! 		       || (fc.caller != NULL && fc.caller->func->uf_profiling))
  	{
  	    ++fp->uf_tm_count;
  	    profile_start(&call_start);
--- 21332,21338 ----
  	if (!fp->uf_profiling && has_profiling(FALSE, fp->uf_name, NULL))
  	    func_do_profile(fp);
  	if (fp->uf_profiling
! 		    || (fc->caller != NULL && fc->caller->func->uf_profiling))
  	{
  	    ++fp->uf_tm_count;
  	    profile_start(&call_start);
***************
*** 21322,21328 ****
      did_emsg = FALSE;
  
      /* call do_cmdline() to execute the lines */
!     do_cmdline(NULL, get_func_line, (void *)&fc,
  				     DOCMD_NOWAIT|DOCMD_VERBOSE|DOCMD_REPEAT);
  
      --RedrawingDisabled;
--- 21348,21354 ----
      did_emsg = FALSE;
  
      /* call do_cmdline() to execute the lines */
!     do_cmdline(NULL, get_func_line, (void *)fc,
  				     DOCMD_NOWAIT|DOCMD_VERBOSE|DOCMD_REPEAT);
  
      --RedrawingDisabled;
***************
*** 21337,21352 ****
  
  #ifdef FEAT_PROFILE
      if (do_profiling == PROF_YES && (fp->uf_profiling
! 		    || (fc.caller != NULL && fc.caller->func->uf_profiling)))
      {
  	profile_end(&call_start);
  	profile_sub_wait(&wait_start, &call_start);
  	profile_add(&fp->uf_tm_total, &call_start);
  	profile_self(&fp->uf_tm_self, &call_start, &fp->uf_tm_children);
! 	if (fc.caller != NULL && fc.caller->func->uf_profiling)
  	{
! 	    profile_add(&fc.caller->func->uf_tm_children, &call_start);
! 	    profile_add(&fc.caller->func->uf_tml_children, &call_start);
  	}
      }
  #endif
--- 21363,21378 ----
  
  #ifdef FEAT_PROFILE
      if (do_profiling == PROF_YES && (fp->uf_profiling
! 		    || (fc->caller != NULL && fc->caller->func->uf_profiling)))
      {
  	profile_end(&call_start);
  	profile_sub_wait(&wait_start, &call_start);
  	profile_add(&fp->uf_tm_total, &call_start);
  	profile_self(&fp->uf_tm_self, &call_start, &fp->uf_tm_children);
! 	if (fc->caller != NULL && fc->caller->func->uf_profiling)
  	{
! 	    profile_add(&fc->caller->func->uf_tm_children, &call_start);
! 	    profile_add(&fc->caller->func->uf_tml_children, &call_start);
  	}
      }
  #endif
***************
*** 21359,21367 ****
  
  	if (aborting())
  	    smsg((char_u *)_("%s aborted"), sourcing_name);
! 	else if (fc.rettv->v_type == VAR_NUMBER)
  	    smsg((char_u *)_("%s returning #%ld"), sourcing_name,
! 					       (long)fc.rettv->vval.v_number);
  	else
  	{
  	    char_u	buf[MSG_BUF_LEN];
--- 21385,21393 ----
  
  	if (aborting())
  	    smsg((char_u *)_("%s aborted"), sourcing_name);
! 	else if (fc->rettv->v_type == VAR_NUMBER)
  	    smsg((char_u *)_("%s returning #%ld"), sourcing_name,
! 					       (long)fc->rettv->vval.v_number);
  	else
  	{
  	    char_u	buf[MSG_BUF_LEN];
***************
*** 21372,21378 ****
  	    /* The value may be very long.  Skip the middle part, so that we
  	     * have some idea how it starts and ends. smsg() would always
  	     * truncate it at the end. */
! 	    s = tv2string(fc.rettv, &tofree, numbuf2, 0);
  	    if (s != NULL)
  	    {
  		trunc_string(s, buf, MSG_BUF_CLEN);
--- 21398,21404 ----
  	    /* The value may be very long.  Skip the middle part, so that we
  	     * have some idea how it starts and ends. smsg() would always
  	     * truncate it at the end. */
! 	    s = tv2string(fc->rettv, &tofree, numbuf2, 0);
  	    if (s != NULL)
  	    {
  		trunc_string(s, buf, MSG_BUF_CLEN);
***************
*** 21408,21421 ****
      }
  
      did_emsg |= save_did_emsg;
!     current_funccal = fc.caller;
  
!     /* The a: variables typevals were not allocated, only free the allocated
!      * variables. */
!     vars_clear_ext(&fc.l_avars.dv_hashtab, FALSE);
  
!     vars_clear(&fc.l_vars.dv_hashtab);		/* free all l: variables */
!     --depth;
  }
  
  /*
--- 21434,21517 ----
      }
  
      did_emsg |= save_did_emsg;
!     current_funccal = fc->caller;
!     --depth;
  
!     /* if the a:000 list and the a: dict are not referenced we can free the
!      * funccall_T and what's in it. */
!     if (fc->l_varlist.lv_refcount == DO_NOT_FREE_CNT
! 	    && fc->l_vars.dv_refcount == DO_NOT_FREE_CNT
! 	    && fc->l_avars.dv_refcount == DO_NOT_FREE_CNT)
!     {
! 	free_funccal(fc, FALSE);
!     }
!     else
!     {
! 	hashitem_T	*hi;
! 	listitem_T	*li;
! 	int		todo;
  
! 	/* "fc" is still in use.  This can happen when returning "a:000" or
! 	 * assigning "l:" to a global variable.
! 	 * Link "fc" in the list for garbage collection later. */
! 	fc->caller = previous_funccal;
! 	previous_funccal = fc;
! 
! 	/* Make a copy of the a: variables, since we didn't do that above. */
! 	todo = (int)fc->l_avars.dv_hashtab.ht_used;
! 	for (hi = fc->l_avars.dv_hashtab.ht_array; todo > 0; ++hi)
! 	{
! 	    if (!HASHITEM_EMPTY(hi))
! 	    {
! 		--todo;
! 		v = HI2DI(hi);
! 		copy_tv(&v->di_tv, &v->di_tv);
! 	    }
! 	}
! 
! 	/* Make a copy of the a:000 items, since we didn't do that above. */
! 	for (li = fc->l_varlist.lv_first; li != NULL; li = li->li_next)
! 	    copy_tv(&li->li_tv, &li->li_tv);
!     }
! }
! 
! /*
!  * Return TRUE if items in "fc" do not have "copyID".  That means they are not
!  * referenced from anywyere.
!  */
!     static int
! can_free_funccal(fc, copyID)
!     funccall_T	*fc;
!     int		copyID;
! {
!     return (fc->l_varlist.lv_copyID != copyID
! 	    && fc->l_vars.dv_copyID != copyID
! 	    && fc->l_avars.dv_copyID != copyID);
! }
! 
! /*
!  * Free "fc" and what it contains.
!  */
!    static void
! free_funccal(fc, free_val)
!     funccall_T	*fc;
!     int		free_val;  /* a: vars were allocated */
! {
!     listitem_T	*li;
! 
!     /* The a: variables typevals may not have been allocated, only free the
!      * allocated variables. */
!     vars_clear_ext(&fc->l_avars.dv_hashtab, free_val);
! 
!     /* free all l: variables */
!     vars_clear(&fc->l_vars.dv_hashtab);
! 
!     /* Free the a:000 variables if they were allocated. */
!     if (free_val)
! 	for (li = fc->l_varlist.lv_first; li != NULL; li = li->li_next)
! 	    clear_tv(&li->li_tv);
! 
!     vim_free(fc);
  }
  
  /*
*** ../vim-7.2.069/src/version.c	Tue Dec  9 22:34:02 2008
--- src/version.c	Sun Dec 21 12:47:07 2008
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     70,
  /**/

-- 
Close your shells, or I'll kill -9 you
Tomorrow I'll quota you
Remember the disks'll always be full
And then while I'm away
I'll write ~ everyday
And I'll send-pr all my buggings to you.
    [ CVS log "Beatles style" for FreeBSD ports/INDEX, Satoshi Asami ]

 /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- 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  Thu Jan  8 12:56:46 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Thu,  8 Jan 2009 12:56:46 +0000 (UTC)
Subject: rpms/vim/devel 7.2.071,NONE,1.1
Message-ID: <20090108125646.B83EF700FD@cvs1.fedora.phx.redhat.com>

Author: karsten

Update of /cvs/extras/rpms/vim/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30238

Added Files:
	7.2.071 
Log Message:
- patchlevel 071


--- NEW FILE 7.2.071 ---
To: vim-dev at vim.org
Subject: Patch 7.2.071
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.071 (extra)
Problem:    Win32: Handling netbeans events while Vim is busy updating the
	    screen may cause a crash.
Solution:   Like with GTK, only handle netbeans messages in the main loop.
	    (Xavier de Gaye)
Files:	    src/gui_w48.c, src/netbeans.c


*** ../vim-7.2.070/src/gui_w48.c	Thu Nov 20 17:09:09 2008
--- src/gui_w48.c	Thu Dec 11 23:47:18 2008
***************
*** 1937,1942 ****
--- 1937,1947 ----
  	    s_need_activate = FALSE;
  	}
  
+ #ifdef FEAT_NETBEANS_INTG
+ 	/* Process the queued netbeans messages. */
+ 	netbeans_parse_messages();
+ #endif
+ 
  	/*
  	 * Don't use gui_mch_update() because then we will spin-lock until a
  	 * char arrives, instead we use GetMessage() to hang until an
*** ../vim-7.2.070/src/netbeans.c	Fri Nov 28 21:26:50 2008
--- src/netbeans.c	Sun Nov 30 12:07:00 2008
***************
*** 769,779 ****
  	return; /* don't try to parse it */
      }
  
! #ifdef FEAT_GUI_GTK
      if (gtk_main_level() > 0)
  	gtk_main_quit();
  #else
!     /* Parse the messages, but avoid recursion. */
      if (level == 1)
  	netbeans_parse_messages();
  
--- 769,782 ----
  	return; /* don't try to parse it */
      }
  
! #if defined(FEAT_GUI_GTK) || defined(FEAT_GUI_W32)
!     /* Let the main loop handle messages. */
! # ifdef FEAT_GUI_GTK
      if (gtk_main_level() > 0)
  	gtk_main_quit();
+ # endif
  #else
!     /* Parse the messages now, but avoid recursion. */
      if (level == 1)
  	netbeans_parse_messages();
  
*** ../vim-7.2.070/src/version.c	Sun Dec 21 13:02:47 2008
--- src/version.c	Wed Dec 24 12:18:59 2008
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     71,
  /**/

-- 
No children may attend school with their breath smelling of "wild onions."
		[real standing law in West Virginia, United States of America]

 /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\        download, build and distribute -- http://www.A-A-P.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///



From karsten at fedoraproject.org  Thu Jan  8 12:57:00 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Thu,  8 Jan 2009 12:57:00 +0000 (UTC)
Subject: rpms/vim/devel 7.2.072,NONE,1.1
Message-ID: <20090108125700.8F279700FD@cvs1.fedora.phx.redhat.com>

Author: karsten

Update of /cvs/extras/rpms/vim/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30279

Added Files:
	7.2.072 
Log Message:
- patchlevel 072


--- NEW FILE 7.2.072 ---
To: vim-dev at vim.org
Subject: Patch 7.2.072 (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.072 (extra)
Problem:    Compiler warning in Sniff code.
Solution:   Use return value of pipe(). (Dominique Pelle)
Files:	    src/if_sniff.c

NOTE: Patch was adjusted to avoid problems with CVS interference.

*** ../vim-7.2.071/src/if_sniff.c	Sat Nov 15 14:11:10 2008
--- src/if_sniff.c	Sat Dec  6 14:01:57 2008
***************
*** 716,723 ****
  #else		/* UNIX Version of the Code */
      int ToSniffEmacs[2], FromSniffEmacs[2];
  
!     pipe(ToSniffEmacs);
!     pipe(FromSniffEmacs);
  
      /* fork */
      if ((sniffemacs_pid=fork()) == 0)
--- 714,723 ----
  #else		/* UNIX Version of the Code */
      int ToSniffEmacs[2], FromSniffEmacs[2];
  
!     if (pipe(ToSniffEmacs) != 0)
! 	return 1;
!     if (pipe(FromSniffEmacs) != 0)
! 	return 1;
  
      /* fork */
      if ((sniffemacs_pid=fork()) == 0)
*** ../vim-7.2.071/src/version.c	Wed Dec 24 12:20:10 2008
--- src/version.c	Wed Dec 24 12:42:13 2008
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     72,
  /**/

-- 
SIGIRO -- irony detected (iron core dumped)

 /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\        download, build and distribute -- http://www.A-A-P.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///



From karsten at fedoraproject.org  Thu Jan  8 12:57:15 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Thu,  8 Jan 2009 12:57:15 +0000 (UTC)
Subject: rpms/vim/devel 7.2.073,NONE,1.1
Message-ID: <20090108125715.4A7A6700FD@cvs1.fedora.phx.redhat.com>

Author: karsten

Update of /cvs/extras/rpms/vim/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30319

Added Files:
	7.2.073 
Log Message:
- patchlevel 073


--- NEW FILE 7.2.073 ---
To: vim-dev at vim.org
Subject: Patch 7.2.073
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.073
Problem:    ":set <xHome>" has the same output as ":set <Home>". (Matt
	    Wozniski)
Solution:   Don't translate "x" keys to its alternative for ":set".
Files:	    src/misc2.c, src/option.c, src/proto/misc2.pro


*** ../vim-7.2.072/src/misc2.c	Wed Nov 12 13:07:48 2008
--- src/misc2.c	Sun Dec 14 12:28:47 2008
***************
*** 2561,2567 ****
      int		key;
      int		dlen = 0;
  
!     key = find_special_key(srcp, &modifiers, keycode);
      if (key == 0)
  	return 0;
  
--- 2561,2567 ----
      int		key;
      int		dlen = 0;
  
!     key = find_special_key(srcp, &modifiers, keycode, FALSE);
      if (key == 0)
  	return 0;
  
***************
*** 2597,2606 ****
   * returns 0 if there is no match.
   */
      int
! find_special_key(srcp, modp, keycode)
      char_u	**srcp;
      int		*modp;
!     int		keycode; /* prefer key code, e.g. K_DEL instead of DEL */
  {
      char_u	*last_dash;
      char_u	*end_of_name;
--- 2597,2607 ----
   * returns 0 if there is no match.
   */
      int
! find_special_key(srcp, modp, keycode, keep_x_key)
      char_u	**srcp;
      int		*modp;
!     int		keycode;     /* prefer key code, e.g. K_DEL instead of DEL */
!     int		keep_x_key;  /* don't translate xHome to Home key */
  {
      char_u	*last_dash;
      char_u	*end_of_name;
***************
*** 2668,2674 ****
  	    else
  	    {
  		key = get_special_key_code(last_dash + 1);
! 		key = handle_x_keys(key);
  	    }
  
  	    /*
--- 2669,2676 ----
  	    else
  	    {
  		key = get_special_key_code(last_dash + 1);
! 		if (!keep_x_key)
! 		    key = handle_x_keys(key);
  	    }
  
  	    /*
*** ../vim-7.2.072/src/option.c	Fri Nov 28 21:26:50 2008
--- src/option.c	Sun Dec 14 12:28:56 2008
***************
*** 8328,8334 ****
      {
  	--arg;			    /* put arg at the '<' */
  	modifiers = 0;
! 	key = find_special_key(&arg, &modifiers, TRUE);
  	if (modifiers)		    /* can't handle modifiers here */
  	    key = 0;
      }
--- 8328,8334 ----
      {
  	--arg;			    /* put arg at the '<' */
  	modifiers = 0;
! 	key = find_special_key(&arg, &modifiers, TRUE, TRUE);
  	if (modifiers)		    /* can't handle modifiers here */
  	    key = 0;
      }
*** ../vim-7.2.072/src/proto/misc2.pro	Thu Jul 24 20:29:37 2008
--- src/proto/misc2.pro	Sun Dec 14 12:29:05 2008
***************
*** 59,65 ****
  int handle_x_keys __ARGS((int key));
  char_u *get_special_key_name __ARGS((int c, int modifiers));
  int trans_special __ARGS((char_u **srcp, char_u *dst, int keycode));
! int find_special_key __ARGS((char_u **srcp, int *modp, int keycode));
  int extract_modifiers __ARGS((int key, int *modp));
  int find_special_key_in_table __ARGS((int c));
  int get_special_key_code __ARGS((char_u *name));
--- 59,65 ----
  int handle_x_keys __ARGS((int key));
  char_u *get_special_key_name __ARGS((int c, int modifiers));
  int trans_special __ARGS((char_u **srcp, char_u *dst, int keycode));
! int find_special_key __ARGS((char_u **srcp, int *modp, int keycode, int keep_x_key));
  int extract_modifiers __ARGS((int key, int *modp));
  int find_special_key_in_table __ARGS((int c));
  int get_special_key_code __ARGS((char_u *name));
*** ../vim-7.2.072/src/version.c	Wed Dec 24 12:43:15 2008
--- src/version.c	Wed Dec 24 12:51:26 2008
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     73,
  /**/


-- 
ARTHUR: If you do not open these doors, we will take this castle by force ...
   [A bucket of slops land on ARTHUR.  He tries to retain his dignity.]
                 "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD

 /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\        download, build and distribute -- http://www.A-A-P.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///



From karsten at fedoraproject.org  Thu Jan  8 12:57:29 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Thu,  8 Jan 2009 12:57:29 +0000 (UTC)
Subject: rpms/vim/devel 7.2.074,NONE,1.1
Message-ID: <20090108125729.7FB16700FD@cvs1.fedora.phx.redhat.com>

Author: karsten

Update of /cvs/extras/rpms/vim/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30416

Added Files:
	7.2.074 
Log Message:
- patchlevel 074


--- NEW FILE 7.2.074 ---
To: vim-dev at vim.org
Subject: Patch 7.2.074 (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.074 (extra, after 7.2.073)
Problem:    ":set <xHome>" has the same output as ":set <Home>". (Matt
	    Wozniski)
Solution:   Don't translate "x" keys to its alternative for ":set".
Files:	    src/gui_mac.c


*** ../vim-7.2.073/src/gui_mac.c	Sat Aug  9 19:37:28 2008
--- src/gui_mac.c	Sun Dec 14 12:28:26 2008
***************
*** 4966,4972 ****
  	char_u	    *p_actext;
  
  	p_actext = menu->actext;
! 	key = find_special_key(&p_actext, &modifiers, /*keycode=*/0);
  	if (*p_actext != 0)
  	    key = 0; /* error: trailing text */
  	/* find_special_key() returns a keycode with as many of the
--- 4966,4972 ----
  	char_u	    *p_actext;
  
  	p_actext = menu->actext;
! 	key = find_special_key(&p_actext, &modifiers, FALSE, FALSE);
  	if (*p_actext != 0)
  	    key = 0; /* error: trailing text */
  	/* find_special_key() returns a keycode with as many of the
*** ../vim-7.2.073/src/version.c	Wed Dec 24 12:53:33 2008
--- src/version.c	Wed Dec 24 12:55:42 2008
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     74,
  /**/

-- 
   Another bucket of what can only be described as human ordure hits ARTHUR.
ARTHUR: ... Right!  (to the KNIGHTS) That settles it!
                 "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD

 /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\        download, build and distribute -- http://www.A-A-P.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///



From karsten at fedoraproject.org  Thu Jan  8 12:57:43 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Thu,  8 Jan 2009 12:57:43 +0000 (UTC)
Subject: rpms/vim/devel 7.2.075,NONE,1.1
Message-ID: <20090108125743.3E163700FD@cvs1.fedora.phx.redhat.com>

Author: karsten

Update of /cvs/extras/rpms/vim/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30468

Added Files:
	7.2.075 
Log Message:
- patchlevel 075


--- NEW FILE 7.2.075 ---
To: vim-dev at vim.org
Subject: Patch 7.2.075
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.075 (after 7.2.058)
Problem:    Explanation about making a diff for extra_patches is unclear.
Solution:   Adjust comment.
Files:	    src/version.c


*** ../vim-7.2.074/src/version.c	Wed Dec 24 13:04:41 2008
--- src/version.c	Wed Dec 24 13:07:47 2008
***************
*** 833,839 ****
   * Keep it short, e.g.,: "relative numbers", "persistent undo".
   * Also add a comment marker to separate the lines.
   * See the official Vim patches for the diff format: It must use a context of
!  * one line only.  Use "diff -C2".
   */
  static char *(extra_patches[]) =
  {   /* Add your patch description below this line */
--- 835,841 ----
   * Keep it short, e.g.,: "relative numbers", "persistent undo".
   * Also add a comment marker to separate the lines.
   * See the official Vim patches for the diff format: It must use a context of
!  * one line only.  Create it by hand or use "diff -C2" and edit the patch.
   */
  static char *(extra_patches[]) =
  {   /* Add your patch description below this line */
*** ../vim-7.2.074/src/version.c	Wed Dec 24 13:04:41 2008
--- src/version.c	Wed Dec 24 13:07:47 2008
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     75,
  /**/

-- 
BEDEVERE: Stand by for attack!!
   [CUT TO enormous army forming up.  Trebuchets, rows of PIKEMEN, siege
   towers, pennants flying, shouts of "Stand by for attack!"  Traditional
   army build-up shots.  The shouts echo across the ranks of the army.
   We see various groups reacting, and stirring themselves in readiness.]
ARTHUR:   Who are they?
BEDEVERE: Oh, just some friends!
                 "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD

 /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\        download, build and distribute -- http://www.A-A-P.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///



From karsten at fedoraproject.org  Thu Jan  8 12:57:57 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Thu,  8 Jan 2009 12:57:57 +0000 (UTC)
Subject: rpms/vim/devel 7.2.076,NONE,1.1
Message-ID: <20090108125757.6FF57700FD@cvs1.fedora.phx.redhat.com>

Author: karsten

Update of /cvs/extras/rpms/vim/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30567

Added Files:
	7.2.076 
Log Message:
- patchlevel 076


--- NEW FILE 7.2.076 ---
To: vim-dev at vim.org
Subject: Patch 7.2.076
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.076
Problem:    rename(from, to) deletes the file if "from" and "to" are not equal
	    but still refer to the same file.  E.g., on a FAT32 filesystem
	    under Unix.
Solution:   Go through another file name.
Files:	    src/fileio.c


*** ../vim-7.2.075/src/fileio.c	Fri Nov 28 21:26:50 2008
--- src/fileio.c	Tue Dec 30 16:04:44 2008
***************
*** 6119,6124 ****
--- 6119,6165 ----
      if (mch_stat((char *)from, &st) < 0)
  	return -1;
  
+ #ifdef UNIX
+     {
+ 	struct stat	st_to;
+ 	char		tempname[MAXPATHL + 1];
+ 
+ 	/* It's possible for the source and destination to be the same file.
+ 	 * This happens when "from" and "to" differ in case and are on a FAT32
+ 	 * filesystem.  In that case go through a temp file name. */
+ 	if (mch_stat((char *)to, &st_to) >= 0
+ 		&& st.st_dev == st_to.st_dev
+ 		&& st.st_ino == st_to.st_ino)
+ 	{
+ 	    /* Find a name that doesn't exist and is in the same directory.
+ 	     * Move "from" to "tempname" and then to "to". */
+ 	    if (STRLEN(from) >= MAXPATHL - 5)
+ 		return -1;
+ 	    STRCPY(tempname, from);
+ 	    for (n = 123; n < 99999; ++n)
+ 	    {
+ 		sprintf(gettail(tempname), "%d", n);
+ 		if (mch_stat(tempname, &st_to) < 0)
+ 		{
+ 		    if (mch_rename((char *)from, tempname) == 0)
+ 		    {
+ 			if (mch_rename(tempname, (char *)to) == 0)
+ 			    return 0;
+ 			/* Strange, the second step failed.  Try moving the
+ 			 * file back and return failure. */
+ 			mch_rename(tempname, (char *)from);
+ 			return -1;
+ 		    }
+ 		    /* If it fails for one temp name it will most likely fail
+ 		     * for any temp name, give up. */
+ 		    return -1;
+ 		}
+ 	    }
+ 	    return -1;
+ 	}
+     }
+ #endif
+ 
      /*
       * Delete the "to" file, this is required on some systems to make the
       * mch_rename() work, on other systems it makes sure that we don't have
*** ../vim-7.2.075/src/version.c	Wed Dec 24 14:24:41 2008
--- src/version.c	Tue Dec 30 16:09:51 2008
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     76,
  /**/

-- 
FATAL ERROR! SYSTEM HALTED! - Press any key to continue doing nothing.

 /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\        download, build and distribute -- http://www.A-A-P.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///



From karsten at fedoraproject.org  Thu Jan  8 12:58:11 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Thu,  8 Jan 2009 12:58:11 +0000 (UTC)
Subject: rpms/vim/devel 7.2.077,NONE,1.1
Message-ID: <20090108125811.19453700FD@cvs1.fedora.phx.redhat.com>

Author: karsten

Update of /cvs/extras/rpms/vim/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30621

Added Files:
	7.2.077 
Log Message:
- patchlevel 077


--- NEW FILE 7.2.077 ---
To: vim-dev at vim.org
Subject: Patch 7.2.077
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.077 (after 7.2.076)
Problem:    rename(from, to) doesn't work if "from" and "to" differ only in
	    case on a system that ignores case in file names.
Solution:   Go through another file name.
Files:	    src/fileio.c


*** ../vim-7.2.076/src/fileio.c	Tue Dec 30 16:15:16 2008
--- src/fileio.c	Wed Dec 31 14:59:59 2008
***************
*** 6106,6117 ****
  #ifdef HAVE_ACL
      vim_acl_T	acl;		/* ACL from original file */
  #endif
  
      /*
!      * When the names are identical, there is nothing to do.
       */
      if (fnamecmp(from, to) == 0)
! 	return 0;
  
      /*
       * Fail if the "from" file doesn't exist.  Avoids that "to" is deleted.
--- 6106,6129 ----
  #ifdef HAVE_ACL
      vim_acl_T	acl;		/* ACL from original file */
  #endif
+ #if defined(UNIX) || defined(CASE_INSENSITIVE_FILENAME)
+     int		use_tmp_file = FALSE;
+ #endif
  
      /*
!      * When the names are identical, there is nothing to do.  When they refer
!      * to the same file (ignoring case and slash/backslash differences) but
!      * the file name differs we need to go through a temp file.
       */
      if (fnamecmp(from, to) == 0)
!     {
! #ifdef CASE_INSENSITIVE_FILENAME
! 	if (STRCMP(gettail(from), gettail(to)) != 0)
! 	    use_tmp_file = TRUE;
! 	else
! #endif
! 	    return 0;
!     }
  
      /*
       * Fail if the "from" file doesn't exist.  Avoids that "to" is deleted.
***************
*** 6122,6128 ****
  #ifdef UNIX
      {
  	struct stat	st_to;
- 	char		tempname[MAXPATHL + 1];
  
  	/* It's possible for the source and destination to be the same file.
  	 * This happens when "from" and "to" differ in case and are on a FAT32
--- 6134,6139 ----
***************
*** 6130,6162 ****
  	if (mch_stat((char *)to, &st_to) >= 0
  		&& st.st_dev == st_to.st_dev
  		&& st.st_ino == st_to.st_ino)
  	{
! 	    /* Find a name that doesn't exist and is in the same directory.
! 	     * Move "from" to "tempname" and then to "to". */
! 	    if (STRLEN(from) >= MAXPATHL - 5)
! 		return -1;
! 	    STRCPY(tempname, from);
! 	    for (n = 123; n < 99999; ++n)
  	    {
! 		sprintf(gettail(tempname), "%d", n);
! 		if (mch_stat(tempname, &st_to) < 0)
  		{
! 		    if (mch_rename((char *)from, tempname) == 0)
! 		    {
! 			if (mch_rename(tempname, (char *)to) == 0)
! 			    return 0;
! 			/* Strange, the second step failed.  Try moving the
! 			 * file back and return failure. */
! 			mch_rename(tempname, (char *)from);
! 			return -1;
! 		    }
! 		    /* If it fails for one temp name it will most likely fail
! 		     * for any temp name, give up. */
  		    return -1;
  		}
  	    }
- 	    return -1;
  	}
      }
  #endif
  
--- 6141,6182 ----
  	if (mch_stat((char *)to, &st_to) >= 0
  		&& st.st_dev == st_to.st_dev
  		&& st.st_ino == st_to.st_ino)
+ 	    use_tmp_file = TRUE;
+     }
+ #endif
+ 
+ #if defined(UNIX) || defined(CASE_INSENSITIVE_FILENAME)
+     if (use_tmp_file)
+     {
+ 	char	tempname[MAXPATHL + 1];
+ 
+ 	/*
+ 	 * Find a name that doesn't exist and is in the same directory.
+ 	 * Rename "from" to "tempname" and then rename "tempname" to "to".
+ 	 */
+ 	if (STRLEN(from) >= MAXPATHL - 5)
+ 	    return -1;
+ 	STRCPY(tempname, from);
+ 	for (n = 123; n < 99999; ++n)
  	{
! 	    sprintf((char *)gettail((char_u *)tempname), "%d", n);
! 	    if (mch_stat(tempname, &st) < 0)
  	    {
! 		if (mch_rename((char *)from, tempname) == 0)
  		{
! 		    if (mch_rename(tempname, (char *)to) == 0)
! 			return 0;
! 		    /* Strange, the second step failed.  Try moving the
! 		     * file back and return failure. */
! 		    mch_rename(tempname, (char *)from);
  		    return -1;
  		}
+ 		/* If it fails for one temp name it will most likely fail
+ 		 * for any temp name, give up. */
+ 		return -1;
  	    }
  	}
+ 	return -1;
      }
  #endif
  
*** ../vim-7.2.076/src/version.c	Tue Dec 30 16:15:16 2008
--- src/version.c	Wed Dec 31 16:19:29 2008
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     77,
  /**/

-- 
We apologise again for the fault in the subtitles.  Those responsible for
sacking the people who have just been sacked have been sacked.
                 "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD

 /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\        download, build and distribute -- http://www.A-A-P.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///



From karsten at fedoraproject.org  Thu Jan  8 12:58:25 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Thu,  8 Jan 2009 12:58:25 +0000 (UTC)
Subject: rpms/vim/devel 7.2.078,NONE,1.1
Message-ID: <20090108125825.D87D1700FD@cvs1.fedora.phx.redhat.com>

Author: karsten

Update of /cvs/extras/rpms/vim/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30671

Added Files:
	7.2.078 
Log Message:
- patchlevel 078


--- NEW FILE 7.2.078 ---
To: vim-dev at vim.org
Subject: Patch 7.2.078
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.078
Problem:    When deleting a fold that is specified with markers the cursor
	    position may be wrong.  Folds may not be displayed properly after
	    a delete.  Wrong fold may be deleted.
Solution:   Fix the problems. (mostly by Lech Lorens)
Files:	    src/fold.c


*** ../vim-7.2.077/src/fold.c	Fri Nov 28 21:26:50 2008
--- src/fold.c	Tue Jan  6 14:53:26 2009
***************
*** 740,746 ****
      garray_T	*found_ga;
      fold_T	*found_fp = NULL;
      linenr_T	found_off = 0;
!     int		use_level = FALSE;
      int		maybe_small = FALSE;
      int		level = 0;
      linenr_T	lnum = start;
--- 740,746 ----
      garray_T	*found_ga;
      fold_T	*found_fp = NULL;
      linenr_T	found_off = 0;
!     int		use_level;
      int		maybe_small = FALSE;
      int		level = 0;
      linenr_T	lnum = start;
***************
*** 757,762 ****
--- 757,763 ----
  	gap = &curwin->w_folds;
  	found_ga = NULL;
  	lnum_off = 0;
+ 	use_level = FALSE;
  	for (;;)
  	{
  	    if (!foldFind(gap, lnum - lnum_off, &fp))
***************
*** 783,802 ****
  	else
  	{
  	    lnum = found_fp->fd_top + found_fp->fd_len + found_off;
- 	    did_one = TRUE;
  
  	    if (foldmethodIsManual(curwin))
  		deleteFoldEntry(found_ga,
  		    (int)(found_fp - (fold_T *)found_ga->ga_data), recursive);
  	    else
  	    {
! 		if (found_fp->fd_top + found_off < first_lnum)
! 		    first_lnum = found_fp->fd_top;
! 		if (lnum > last_lnum)
  		    last_lnum = lnum;
! 		parseMarker(curwin);
  		deleteFoldMarkers(found_fp, recursive, found_off);
  	    }
  
  	    /* redraw window */
  	    changed_window_setting();
--- 784,804 ----
  	else
  	{
  	    lnum = found_fp->fd_top + found_fp->fd_len + found_off;
  
  	    if (foldmethodIsManual(curwin))
  		deleteFoldEntry(found_ga,
  		    (int)(found_fp - (fold_T *)found_ga->ga_data), recursive);
  	    else
  	    {
! 		if (first_lnum > found_fp->fd_top + found_off)
! 		    first_lnum = found_fp->fd_top + found_off;
! 		if (last_lnum < lnum)
  		    last_lnum = lnum;
! 		if (!did_one)
! 		    parseMarker(curwin);
  		deleteFoldMarkers(found_fp, recursive, found_off);
  	    }
+ 	    did_one = TRUE;
  
  	    /* redraw window */
  	    changed_window_setting();
***************
*** 811,816 ****
--- 813,822 ----
  	    redraw_curbuf_later(INVERTED);
  #endif
      }
+     else
+ 	/* Deleting markers may make cursor column invalid. */
+ 	check_cursor_col();
+ 
      if (last_lnum > 0)
  	changed_lines(first_lnum, (colnr_T)0, last_lnum, 0L);
  }
*** ../vim-7.2.077/src/version.c	Wed Dec 31 16:20:54 2008
--- src/version.c	Tue Jan  6 15:00:36 2009
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     78,
  /**/

-- 
Looking at Perl through Lisp glasses, Perl looks atrocious.

 /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- 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 mmahut at fedoraproject.org  Thu Jan  8 12:59:24 2009
From: mmahut at fedoraproject.org (Marek Mahut)
Date: Thu,  8 Jan 2009 12:59:24 +0000 (UTC)
Subject: rpms/cdk/F-10 cdk-5.0.20081105-make.patch, NONE, 1.1 cdk.spec, NONE,
	1.1 sources, 1.1, 1.2
Message-ID: <20090108125924.EBFED700FD@cvs1.fedora.phx.redhat.com>

Author: mmahut

Update of /cvs/pkgs/rpms/cdk/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30770

Modified Files:
	sources 
Added Files:
	cdk-5.0.20081105-make.patch cdk.spec 
Log Message:
initial build


cdk-5.0.20081105-make.patch:

--- NEW FILE cdk-5.0.20081105-make.patch ---
diff -Naur cdk-5.0-20081105-upstream/Makefile.in cdk-5.0-20081105/Makefile.in
--- cdk-5.0-20081105-upstream/Makefile.in	2009-01-04 21:35:53.000000000 +0100
+++ cdk-5.0-20081105/Makefile.in	2009-01-04 21:51:18.000000000 +0100
@@ -311,7 +311,7 @@
 	@echo "Installing CDK Readme files in $(DOCUMENT_DIR)..."
 	@for i in $(CDKREADME); do \
 	   echo "	... $$i"; \
-	   $(INSTALL_DATA) $(srcdir)/$$i $(DOCUMENT_DIR)/$$i; \
+	$(INSTALL_DATA) $(srcdir)/$$i $(DESTDIR)/$(DOCUMENT_DIR)/$$i; \
 	done
 
 uninstall \
@@ -491,7 +491,7 @@
 $(DOCUMENT_DIR) \
 $(INCLUDE_DIR) \
 $(LIB_DIR) \
-$(MAN_DIR) : ; $(srcdir)/mkdirs.sh $@
+$(MAN_DIR) : ; $(srcdir)/mkdirs.sh $(DESTDIR)$@
 
 #
 # Files generated from templates:


--- NEW FILE cdk.spec ---
Name:		cdk
Version:	5.0.20081105
Release:	1%{?dist}
Summary:	Curses Development Kit

Group:		Development/Libraries
License:	BSD with Advertising
URL:		http://invisible-island.net/cdk/
Source0:	ftp://invisible-island.net/%{name}/%{name}.tar.gz
Patch0:		cdk-5.0.20081105-make.patch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:	ncurses-devel

%description
Cdk stands for 'Curses Development Kit' and it currently contains 21 ready
to use widgets which facilitate the speedy development of full screen
curses programs.

%package devel
Summary:	Curses Development Kit
Group:		Development/Libraries
Requires:	%{name} = %{version}-%{release}

%description devel
Development headers for cdk (Curses Development Kit)

%prep
%setup -q -n %{name}-5.0-20081105
%patch0 -p1 


%build
%configure 
make %{?_smp_mflags} cdkshlib

%install
rm -rf $RPM_BUILD_ROOT
make install installCDKSHLibrary DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p -D"
rm -fr $RPM_BUILD_ROOT/usr/doc # we don't need this
chmod +x $RPM_BUILD_ROOT%{_libdir}/*.so # fixes rpmlint unstripped-binary-or-object

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig

%files
%defattr(-,root,root,-)
%doc CHANGES COPYING INSTALL NOTES README VERSION 
%{_libdir}/*.so.*
%exclude %{_libdir}/*.a
%{_mandir}/man3/*

%files devel
%defattr(-,root,root,-)
%doc EXPANDING TODO examples demos
%{_libdir}/*.so
%{_bindir}/cdk5-config
%{_includedir}/%{name}

%changelog
* Sun Jan 4 2009 Marek Mahut <mmahut at fedoraproject.org> - 5.0.20081105-1
- Initial build


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cdk/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	7 Jan 2009 00:09:46 -0000	1.1
+++ sources	8 Jan 2009 12:58:54 -0000	1.2
@@ -0,0 +1 @@
+e882c1f6f441efb970d51dbe71fc9f57  cdk.tar.gz



From mmahut at fedoraproject.org  Thu Jan  8 13:09:12 2009
From: mmahut at fedoraproject.org (Marek Mahut)
Date: Thu,  8 Jan 2009 13:09:12 +0000 (UTC)
Subject: rpms/cdk/F-9 cdk-5.0.20081105-make.patch, NONE, 1.1 cdk.spec, NONE, 
	1.1 sources, 1.1, 1.2
Message-ID: <20090108130912.56B62700FD@cvs1.fedora.phx.redhat.com>

Author: mmahut

Update of /cvs/pkgs/rpms/cdk/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32308

Modified Files:
	sources 
Added Files:
	cdk-5.0.20081105-make.patch cdk.spec 
Log Message:
initial build


cdk-5.0.20081105-make.patch:

--- NEW FILE cdk-5.0.20081105-make.patch ---
diff -Naur cdk-5.0-20081105-upstream/Makefile.in cdk-5.0-20081105/Makefile.in
--- cdk-5.0-20081105-upstream/Makefile.in	2009-01-04 21:35:53.000000000 +0100
+++ cdk-5.0-20081105/Makefile.in	2009-01-04 21:51:18.000000000 +0100
@@ -311,7 +311,7 @@
 	@echo "Installing CDK Readme files in $(DOCUMENT_DIR)..."
 	@for i in $(CDKREADME); do \
 	   echo "	... $$i"; \
-	   $(INSTALL_DATA) $(srcdir)/$$i $(DOCUMENT_DIR)/$$i; \
+	$(INSTALL_DATA) $(srcdir)/$$i $(DESTDIR)/$(DOCUMENT_DIR)/$$i; \
 	done
 
 uninstall \
@@ -491,7 +491,7 @@
 $(DOCUMENT_DIR) \
 $(INCLUDE_DIR) \
 $(LIB_DIR) \
-$(MAN_DIR) : ; $(srcdir)/mkdirs.sh $@
+$(MAN_DIR) : ; $(srcdir)/mkdirs.sh $(DESTDIR)$@
 
 #
 # Files generated from templates:


--- NEW FILE cdk.spec ---
Name:		cdk
Version:	5.0.20081105
Release:	1%{?dist}
Summary:	Curses Development Kit

Group:		Development/Libraries
License:	BSD with Advertising
URL:		http://invisible-island.net/cdk/
Source0:	ftp://invisible-island.net/%{name}/%{name}.tar.gz
Patch0:		cdk-5.0.20081105-make.patch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:	ncurses-devel

%description
Cdk stands for 'Curses Development Kit' and it currently contains 21 ready
to use widgets which facilitate the speedy development of full screen
curses programs.

%package devel
Summary:	Curses Development Kit
Group:		Development/Libraries
Requires:	%{name} = %{version}-%{release}

%description devel
Development headers for cdk (Curses Development Kit)

%prep
%setup -q -n %{name}-5.0-20081105
%patch0 -p1 


%build
%configure 
make %{?_smp_mflags} cdkshlib

%install
rm -rf $RPM_BUILD_ROOT
make install installCDKSHLibrary DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p -D"
rm -fr $RPM_BUILD_ROOT/usr/doc # we don't need this
chmod +x $RPM_BUILD_ROOT%{_libdir}/*.so # fixes rpmlint unstripped-binary-or-object

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig

%files
%defattr(-,root,root,-)
%doc CHANGES COPYING INSTALL NOTES README VERSION 
%{_libdir}/*.so.*
%exclude %{_libdir}/*.a
%{_mandir}/man3/*

%files devel
%defattr(-,root,root,-)
%doc EXPANDING TODO examples demos
%{_libdir}/*.so
%{_bindir}/cdk5-config
%{_includedir}/%{name}

%changelog
* Sun Jan 4 2009 Marek Mahut <mmahut at fedoraproject.org> - 5.0.20081105-1
- Initial build


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cdk/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	7 Jan 2009 00:09:46 -0000	1.1
+++ sources	8 Jan 2009 13:08:42 -0000	1.2
@@ -0,0 +1 @@
+e882c1f6f441efb970d51dbe71fc9f57  cdk.tar.gz



From than at fedoraproject.org  Thu Jan  8 13:12:42 2009
From: than at fedoraproject.org (Than Ngo)
Date: Thu,  8 Jan 2009 13:12:42 +0000 (UTC)
Subject: rpms/kdepimlibs/devel kdepimlibs.spec,1.65,1.66
Message-ID: <20090108131242.43F04700FD@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdepimlibs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32642

Modified Files:
	kdepimlibs.spec 
Log Message:
fix rpm file list



Index: kdepimlibs.spec
===================================================================
RCS file: /cvs/extras/rpms/kdepimlibs/devel/kdepimlibs.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- kdepimlibs.spec	7 Jan 2009 23:41:45 -0000	1.65
+++ kdepimlibs.spec	8 Jan 2009 13:12:11 -0000	1.66
@@ -161,7 +161,8 @@
 %{_kde4_appsdir}/cmake/modules/*
 %{_kde4_includedir}/*
 %{_kde4_libdir}/kde4/devel/lib*.so
-%{_kde4_libdir}/KdepimLibs*
+%{_kde4_libdir}/cmake/KdepimLibs*
+%{_kde4_libdir}/gpgmepp/
 %endif
 
 %if 0%{?apidocs}



From red at fedoraproject.org  Thu Jan  8 13:17:52 2009
From: red at fedoraproject.org (Sandro Mathys)
Date: Thu,  8 Jan 2009 13:17:52 +0000 (UTC)
Subject: rpms/nachocalendar/devel import.log, NONE, 1.1 nachocalendar.spec, 
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090108131752.8E433700FD@cvs1.fedora.phx.redhat.com>

Author: red

Update of /cvs/pkgs/rpms/nachocalendar/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv736/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log nachocalendar.spec 
Log Message:
* Thu Jan 08 2009 Sandro Mathys <red at fedoraproject.org> - 0.23-1
- initial commit




--- NEW FILE import.log ---
nachocalendar-0_23-1_fc11:HEAD:nachocalendar-0.23-1.fc11.src.rpm:1231420483


--- NEW FILE nachocalendar.spec ---
Name:           nachocalendar
Version:        0.23
Release:        1%{?dist}
Summary:        Provides a flexible Calendar component to the Java Platform
Group:          Development/Libraries
License:        LGPLv2+
URL:            http://nachocalendar.sourceforge.net/
Source0:        http://downloads.sourceforge.net/%{name}/%{name}-src-%{version}.tar.bz2
BuildArch:      noarch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:     java-devel >= 1:1.6.0
BuildRequires:     jpackage-utils
BuildRequires:     ant
Requires:          java >= 1:1.6.0
Requires:          jpackage-utils

%description
Provide a flexible Calendar component to the Java Platform.
Currently is under early development but can be used safely. It comes with
conventient factory classes, providing a fast and easy way to start using
them.


%package javadoc
Summary:           Javadocs for nachocalendar
Group:             Documentation
Requires:          %name = %{version}-%{release}
Requires:          jpackage-utils

%description javadoc
NachoCalendar development documentation.


%prep
%setup -q # -n %{name}-%{version}

rm -rf doc lib/*


%build
ant clean jar javadoc

%install
rm -rf $RPM_BUILD_ROOT

# jar
install -d $RPM_BUILD_ROOT%{_javadir}/
install -m644 lib/%{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar

# javadoc
install -d $RPM_BUILD_ROOT%{_javadocdir}/%{name}
cp -rp doc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc LICENSE.txt CHANGELOG.txt
%{_javadir}/%{name}.jar
%{_javadir}/%{name}-%{version}.jar

%files javadoc
%defattr(-,root,root,-)
%dir %{_javadocdir}/%{name}
%{_javadocdir}/%{name}/*


%changelog
* Tue Dec 16 2008 Sandro Mathys <red at fedoraproject.org> - 0.23-1
- initial build


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/nachocalendar/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	18 Dec 2008 00:17:20 -0000	1.1
+++ .cvsignore	8 Jan 2009 13:17:22 -0000	1.2
@@ -0,0 +1 @@
+nachocalendar-src-0.23.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nachocalendar/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	18 Dec 2008 00:17:20 -0000	1.1
+++ sources	8 Jan 2009 13:17:22 -0000	1.2
@@ -0,0 +1 @@
+3009f004487650d9a4439292077590ed  nachocalendar-src-0.23.tar.bz2



From karsten at fedoraproject.org  Thu Jan  8 13:20:52 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Thu,  8 Jan 2009 13:20:52 +0000 (UTC)
Subject: rpms/vim/devel 7.2.079, NONE, 1.1 vim.spec, 1.228,
	1.229 README.patches, 1.115, 1.116
Message-ID: <20090108132052.5882A700FD@cvs1.fedora.phx.redhat.com>

Author: karsten

Update of /cvs/extras/rpms/vim/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1267

Modified Files:
	vim.spec README.patches 
Added Files:
	7.2.079 
Log Message:
- patchlevel 079


--- NEW FILE 7.2.079 ---
To: vim-dev at vim.org
Subject: Patch 7.2.079
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.079
Problem:    "killed" netbeans events are not handled correctly.
Solution:   A "killed" netbeans event is sent when the buffer is deleted or
	    wiped out (in this case, the netbeans annotations in this buffer
	    have been removed).  A user can still remove a sign with the
	    command ":sign unplace" and this does not trigger a "killed"
	    event.  (Xavier de Gaye)
Files:	    runtime/doc/netbeans.txt, src/buffer.c, src/globals.h,
	    src/netbeans.c, src/proto/netbeans.pro


*** ../vim-7.2.078/runtime/doc/netbeans.txt	Sat Aug  9 19:36:49 2008
--- runtime/doc/netbeans.txt	Tue Jan  6 15:23:39 2009
***************
*** 1,4 ****
! *netbeans.txt*  For Vim version 7.2.  Last change: 2008 Jun 28
  
  
  		  VIM REFERENCE MANUAL    by Gordon Prieur et al.
--- 1,4 ----
! *netbeans.txt*  For Vim version 7.2.  Last change: 2009 Jan 06
  
  
  		  VIM REFERENCE MANUAL    by Gordon Prieur et al.
***************
*** 722,729 ****
  		of the cursor.
  		New in version 2.1.
  
! killed		A file was closed by the user.  Only for files that have been
! 		assigned a number by the IDE.
  
  newDotAndMark off off
  		Reports the position of the cursor being at "off" bytes into
--- 722,731 ----
  		of the cursor.
  		New in version 2.1.
  
! killed		A file was deleted or wiped out by the user and the buffer
! 		annotations have been removed.  The bufID number for this
! 		buffer has become invalid.  Only for files that have been
! 		assigned a bufID number by the IDE.
  
  newDotAndMark off off
  		Reports the position of the cursor being at "off" bytes into
*** ../vim-7.2.078/src/buffer.c	Wed Dec  3 11:21:20 2008
--- src/buffer.c	Tue Jan  6 15:23:02 2009
***************
*** 437,446 ****
  	return;
  #endif
  
- #ifdef FEAT_NETBEANS_INTG
-     if (usingNetbeans)
- 	netbeans_file_closed(buf);
- #endif
      /* Change directories when the 'acd' option is set. */
      DO_AUTOCHDIR
  
--- 437,442 ----
***************
*** 639,644 ****
--- 635,644 ----
  #ifdef FEAT_SIGNS
      buf_delete_signs(buf);		/* delete any signs */
  #endif
+ #ifdef FEAT_NETBEANS_INTG
+     if (usingNetbeans)
+         netbeans_file_killed(buf);
+ #endif
  #ifdef FEAT_LOCALMAP
      map_clear_int(buf, MAP_ALL_MODES, TRUE, FALSE);  /* clear local mappings */
      map_clear_int(buf, MAP_ALL_MODES, TRUE, TRUE);   /* clear local abbrevs */
***************
*** 815,823 ****
      int		bnr;		/* buffer number */
      char_u	*p;
  
- #ifdef FEAT_NETBEANS_INTG
-     netbeansCloseFile = 1;
- #endif
      if (addr_count == 0)
      {
  	(void)do_buffer(command, DOBUF_CURRENT, FORWARD, 0, forceit);
--- 815,820 ----
***************
*** 912,920 ****
  	}
      }
  
- #ifdef FEAT_NETBEANS_INTG
-     netbeansCloseFile = 0;
- #endif
  
      return errormsg;
  }
--- 909,914 ----
*** ../vim-7.2.078/src/globals.h	Fri Nov 28 21:26:50 2008
--- src/globals.h	Tue Jan  6 15:23:02 2009
***************
*** 1340,1346 ****
  
  #ifdef FEAT_NETBEANS_INTG
  EXTERN char *netbeansArg INIT(= NULL);	/* the -nb[:host:port:passwd] arg */
- EXTERN int netbeansCloseFile INIT(= 0);	/* send killed if != 0 */
  EXTERN int netbeansFireChanges INIT(= 1); /* send buffer changes if != 0 */
  EXTERN int netbeansForcedQuit INIT(= 0);/* don't write modified files */
  EXTERN int netbeansReadFile INIT(= 1);	/* OK to read from disk if != 0 */
--- 1340,1345 ----
*** ../vim-7.2.078/src/netbeans.c	Wed Dec 24 12:20:10 2008
--- src/netbeans.c	Tue Jan  6 15:23:02 2009
***************
*** 2921,2964 ****
  }
  
  /*
!  * Tell netbeans a file was closed.
   */
      void
! netbeans_file_closed(buf_T *bufp)
  {
      int		bufno = nb_getbufno(bufp);
      nbbuf_T	*nbbuf = nb_get_buf(bufno);
      char	buffer[2*MAXPATHL];
  
!     if (!haveConnection || bufno < 0)
  	return;
  
!     if (!netbeansCloseFile)
!     {
! 	nbdebug(("Ignoring file_closed for %s. File was closed from IDE\n",
! 		    bufp->b_ffname));
! 	return;
!     }
! 
!     nbdebug(("netbeans_file_closed:\n"));
!     nbdebug(("    Closing bufno: %d", bufno));
!     if (curbuf != NULL && curbuf != bufp)
!     {
! 	nbdebug(("    Curbuf bufno:  %d\n", nb_getbufno(curbuf)));
!     }
!     else if (curbuf == bufp)
!     {
! 	nbdebug(("    curbuf == bufp\n"));
!     }
! 
!     if (bufno <= 0)
! 	return;
  
      sprintf(buffer, "%d:killed=%d\n", bufno, r_cmdno);
  
      nbdebug(("EVT: %s", buffer));
  
!     nb_send(buffer, "netbeans_file_closed");
  
      if (nbbuf != NULL)
  	nbbuf->bufp = NULL;
--- 2921,2946 ----
  }
  
  /*
!  * Tell netbeans that a file was deleted or wiped out.
   */
      void
! netbeans_file_killed(buf_T *bufp)
  {
      int		bufno = nb_getbufno(bufp);
      nbbuf_T	*nbbuf = nb_get_buf(bufno);
      char	buffer[2*MAXPATHL];
  
!     if (!haveConnection || bufno == -1)
  	return;
  
!     nbdebug(("netbeans_file_killed:\n"));
!     nbdebug(("    Killing bufno: %d", bufno));
  
      sprintf(buffer, "%d:killed=%d\n", bufno, r_cmdno);
  
      nbdebug(("EVT: %s", buffer));
  
!     nb_send(buffer, "netbeans_file_killed");
  
      if (nbbuf != NULL)
  	nbbuf->bufp = NULL;
*** ../vim-7.2.078/src/proto/netbeans.pro	Tue Jun 24 23:25:53 2008
--- src/proto/netbeans.pro	Tue Jan  6 15:23:02 2009
***************
*** 11,17 ****
  void netbeans_frame_moved __ARGS((int new_x, int new_y));
  void netbeans_file_activated __ARGS((buf_T *bufp));
  void netbeans_file_opened __ARGS((buf_T *bufp));
! void netbeans_file_closed __ARGS((buf_T *bufp));
  void netbeans_inserted __ARGS((buf_T *bufp, linenr_T linenr, colnr_T col, char_u *txt, int newlen));
  void netbeans_removed __ARGS((buf_T *bufp, linenr_T linenr, colnr_T col, long len));
  void netbeans_unmodified __ARGS((buf_T *bufp));
--- 11,17 ----
  void netbeans_frame_moved __ARGS((int new_x, int new_y));
  void netbeans_file_activated __ARGS((buf_T *bufp));
  void netbeans_file_opened __ARGS((buf_T *bufp));
! void netbeans_file_killed __ARGS((buf_T *bufp));
  void netbeans_inserted __ARGS((buf_T *bufp, linenr_T linenr, colnr_T col, char_u *txt, int newlen));
  void netbeans_removed __ARGS((buf_T *bufp, linenr_T linenr, colnr_T col, long len));
  void netbeans_unmodified __ARGS((buf_T *bufp));
*** ../vim-7.2.078/src/version.c	Tue Jan  6 15:01:58 2009
--- src/version.c	Tue Jan  6 16:11:11 2009
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     79,
  /**/

-- 
Friends?  I have lots of friends!  In fact, I have every episode ever made.

 /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\        download, build and distribute -- http://www.A-A-P.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///


Index: vim.spec
===================================================================
RCS file: /cvs/extras/rpms/vim/devel/vim.spec,v
retrieving revision 1.228
retrieving revision 1.229
diff -u -r1.228 -r1.229
--- vim.spec	4 Dec 2008 23:35:58 -0000	1.228
+++ vim.spec	8 Jan 2009 13:20:21 -0000	1.229
@@ -18,7 +18,7 @@
 #used for pre-releases:
 %define beta %{nil}
 %define vimdir vim72%{?beta}
-%define patchlevel 060
+%define patchlevel 079
 
 Summary: The VIM editor
 URL:     http://www.vim.org/
@@ -126,6 +126,25 @@
 Patch058: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.058
 Patch059: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.059
 Patch060: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.060
+Patch061: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.061
+Patch062: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.062
+Patch063: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.063
+Patch064: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.064
+Patch065: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.065
+Patch066: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.066
+Patch067: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.067
+Patch068: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.068
+Patch069: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.069
+Patch070: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.070
+Patch071: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.071
+Patch072: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.072
+Patch073: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.073
+Patch074: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.074
+Patch075: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.075
+Patch076: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.076
+Patch077: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.077
+Patch078: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.078
+Patch079: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.079
 
 Patch3000: vim-7.0-syntax.patch
 Patch3002: vim-7.1-nowarnings.patch
@@ -319,6 +338,25 @@
 %patch058 -p0
 %patch059 -p0
 %patch060 -p0
+%patch061 -p0                                          
+%patch062 -p0
+%patch063 -p0
+%patch064 -p0
+%patch065 -p0
+%patch066 -p0
+%patch067 -p0
+%patch068 -p0
+%patch069 -p0
+%patch070 -p0
+%patch071 -p0
+%patch072 -p0
+%patch073 -p0
+%patch074 -p0
+%patch075 -p0
+%patch076 -p0
+%patch077 -p0
+%patch078 -p0
+%patch079 -p0
 
 
 # install spell files
@@ -778,6 +816,9 @@
 %{_datadir}/icons/hicolor/*/apps/*
 
 %changelog
+* Thu Jan 08 2009 Karsten Hopp <karsten at redhat.com> 7.2.079-2
+- patchlevel 79
+
 * Thu Dec 04 2008 Jesse Keating <jkeating at redhat.com> - 7.2.060-2
 - Rebuild for new python.
 


Index: README.patches
===================================================================
RCS file: /cvs/extras/rpms/vim/devel/README.patches,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -r1.115 -r1.116
--- README.patches	1 Dec 2008 14:31:11 -0000	1.115
+++ README.patches	8 Jan 2009 13:20:21 -0000	1.116
@@ -65,7 +65,7 @@
   2438  7.2.038  overlapping arguments to memcpy()
   1378  7.2.039  accessing freed memory on exit when EXITFREE is defined
   1836  7.2.040  ":e ++ff=dos foo" gets "unix" 'ff' when CR before NL missing
- 22993  7.2.041  diff messed up when editing a diff buffer in another tab page
+ 22993  7.2.041  (extra) diff wrong when edit diff buffer in another tab page
   4987  7.2.042  restoring view in autocmd sometimes doesn't work completely
   2550  7.2.043  VMS: Too many chars escaped in filename and shell commands
   5639  7.2.044  crash because of gcc 4 being over protective for strcpy()
@@ -85,3 +85,22 @@
   2338  7.2.058  can't add a feature name in the :version output
   1847  7.2.059  diff is not always displayed properly
  34772  7.2.060  spell checking doesn't work well for compound words
+  1886  7.2.061  creating funcref requires loading the autoload script first
+  1657  7.2.062  "[Scratch]" is not translated
+  3558  7.2.063  warning for NULL argument of Perl_sys_init3()
+  1942  7.2.064  repeating "~" on a Visual block doesn't always update screen
+  5149  7.2.065  GTK GUI: cursor disappears doing ":vsp" when maximized
+  2759  7.2.066  not easy to check if 'encoding' is a multi-byte encoding
+  1683  7.2.067  can't load sesison extra file when it contains special chars
+  2598  7.2.068  error when Emacs tags file line is too long
+  1726  7.2.069  (after 7.2.060) compiler warning for putting size_t in int
+ 17606  7.2.070  crash when a function returns a:000
+  2353  7.2.071  (extra) Win32: Handling netbeans events may cause a crash
+  1615  7.2.072  (extra, fixed patch) compiler warning in Sniff code
+  4121  7.2.073  ":set <xHome>" has the same output as ":set <Home>"
+  1832  7.2.074  (extra, after 7.2.073) extra part of 7.2.073
+  2218  7.2.075  (after 7.2.058) unclear comment about making a diff
+  2666  7.2.076  rename(from, to) deletes file if names refer to the same file
+  4745  7.2.077  (after 7.2.076) rename() fails if names differ only in case
+  3298  7.2.078  problems with deleting folds
+  6947  7.2.079  "killed" netbeans events are not handled correctly



From red at fedoraproject.org  Thu Jan  8 13:22:15 2009
From: red at fedoraproject.org (Sandro Mathys)
Date: Thu,  8 Jan 2009 13:22:15 +0000 (UTC)
Subject: rpms/nachocalendar/F-9 import.log, NONE, 1.1 nachocalendar.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090108132215.93220700FD@cvs1.fedora.phx.redhat.com>

Author: red

Update of /cvs/pkgs/rpms/nachocalendar/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1354/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	import.log nachocalendar.spec 
Log Message:
* Thu Jan 08 2009 Sandro Mathys <red at fedoraproject.org> - 0.23-1
- initial commit




--- NEW FILE import.log ---
nachocalendar-0_23-1_fc11:F-9:nachocalendar-0.23-1.fc11.src.rpm:1231420849


--- NEW FILE nachocalendar.spec ---
Name:           nachocalendar
Version:        0.23
Release:        1%{?dist}
Summary:        Provides a flexible Calendar component to the Java Platform
Group:          Development/Libraries
License:        LGPLv2+
URL:            http://nachocalendar.sourceforge.net/
Source0:        http://downloads.sourceforge.net/%{name}/%{name}-src-%{version}.tar.bz2
BuildArch:      noarch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:     java-devel >= 1:1.6.0
BuildRequires:     jpackage-utils
BuildRequires:     ant
Requires:          java >= 1:1.6.0
Requires:          jpackage-utils

%description
Provide a flexible Calendar component to the Java Platform.
Currently is under early development but can be used safely. It comes with
conventient factory classes, providing a fast and easy way to start using
them.


%package javadoc
Summary:           Javadocs for nachocalendar
Group:             Documentation
Requires:          %name = %{version}-%{release}
Requires:          jpackage-utils

%description javadoc
NachoCalendar development documentation.


%prep
%setup -q # -n %{name}-%{version}

rm -rf doc lib/*


%build
ant clean jar javadoc

%install
rm -rf $RPM_BUILD_ROOT

# jar
install -d $RPM_BUILD_ROOT%{_javadir}/
install -m644 lib/%{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar

# javadoc
install -d $RPM_BUILD_ROOT%{_javadocdir}/%{name}
cp -rp doc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc LICENSE.txt CHANGELOG.txt
%{_javadir}/%{name}.jar
%{_javadir}/%{name}-%{version}.jar

%files javadoc
%defattr(-,root,root,-)
%dir %{_javadocdir}/%{name}
%{_javadocdir}/%{name}/*


%changelog
* Tue Dec 16 2008 Sandro Mathys <red at fedoraproject.org> - 0.23-1
- initial build


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/nachocalendar/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	18 Dec 2008 00:17:20 -0000	1.1
+++ .cvsignore	8 Jan 2009 13:21:45 -0000	1.2
@@ -0,0 +1 @@
+nachocalendar-src-0.23.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nachocalendar/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	18 Dec 2008 00:17:20 -0000	1.1
+++ sources	8 Jan 2009 13:21:45 -0000	1.2
@@ -0,0 +1 @@
+3009f004487650d9a4439292077590ed  nachocalendar-src-0.23.tar.bz2



From red at fedoraproject.org  Thu Jan  8 13:24:36 2009
From: red at fedoraproject.org (Sandro Mathys)
Date: Thu,  8 Jan 2009 13:24:36 +0000 (UTC)
Subject: rpms/nachocalendar/F-10 import.log, NONE, 1.1 nachocalendar.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090108132436.4D2C0700FD@cvs1.fedora.phx.redhat.com>

Author: red

Update of /cvs/pkgs/rpms/nachocalendar/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1787/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	import.log nachocalendar.spec 
Log Message:
* Thu Jan 08 2009 Sandro Mathys <red at fedoraproject.org> - 0.23-1
- initial commit




--- NEW FILE import.log ---
nachocalendar-0_23-1_fc11:F-10:nachocalendar-0.23-1.fc11.src.rpm:1231421040


--- NEW FILE nachocalendar.spec ---
Name:           nachocalendar
Version:        0.23
Release:        1%{?dist}
Summary:        Provides a flexible Calendar component to the Java Platform
Group:          Development/Libraries
License:        LGPLv2+
URL:            http://nachocalendar.sourceforge.net/
Source0:        http://downloads.sourceforge.net/%{name}/%{name}-src-%{version}.tar.bz2
BuildArch:      noarch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:     java-devel >= 1:1.6.0
BuildRequires:     jpackage-utils
BuildRequires:     ant
Requires:          java >= 1:1.6.0
Requires:          jpackage-utils

%description
Provide a flexible Calendar component to the Java Platform.
Currently is under early development but can be used safely. It comes with
conventient factory classes, providing a fast and easy way to start using
them.


%package javadoc
Summary:           Javadocs for nachocalendar
Group:             Documentation
Requires:          %name = %{version}-%{release}
Requires:          jpackage-utils

%description javadoc
NachoCalendar development documentation.


%prep
%setup -q # -n %{name}-%{version}

rm -rf doc lib/*


%build
ant clean jar javadoc

%install
rm -rf $RPM_BUILD_ROOT

# jar
install -d $RPM_BUILD_ROOT%{_javadir}/
install -m644 lib/%{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar

# javadoc
install -d $RPM_BUILD_ROOT%{_javadocdir}/%{name}
cp -rp doc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc LICENSE.txt CHANGELOG.txt
%{_javadir}/%{name}.jar
%{_javadir}/%{name}-%{version}.jar

%files javadoc
%defattr(-,root,root,-)
%dir %{_javadocdir}/%{name}
%{_javadocdir}/%{name}/*


%changelog
* Tue Dec 16 2008 Sandro Mathys <red at fedoraproject.org> - 0.23-1
- initial build


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/nachocalendar/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	18 Dec 2008 00:17:20 -0000	1.1
+++ .cvsignore	8 Jan 2009 13:24:05 -0000	1.2
@@ -0,0 +1 @@
+nachocalendar-src-0.23.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nachocalendar/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	18 Dec 2008 00:17:20 -0000	1.1
+++ sources	8 Jan 2009 13:24:05 -0000	1.2
@@ -0,0 +1 @@
+3009f004487650d9a4439292077590ed  nachocalendar-src-0.23.tar.bz2



From mildew at fedoraproject.org  Thu Jan  8 13:40:18 2009
From: mildew at fedoraproject.org (=?utf-8?q?Daniel_Kope=C4=8Dek?=)
Date: Thu,  8 Jan 2009 13:40:18 +0000 (UTC)
Subject: rpms/sudo/F-10 sudo.spec,1.70,1.71
Message-ID: <20090108134018.4192E700FD@cvs1.fedora.phx.redhat.com>

Author: mildew

Update of /cvs/pkgs/rpms/sudo/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4078

Modified Files:
	sudo.spec 
Log Message:
Added /usr/local/bin to secure-path


Index: sudo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sudo/F-10/sudo.spec,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- sudo.spec	3 Sep 2008 08:59:59 -0000	1.70
+++ sudo.spec	8 Jan 2009 13:39:47 -0000	1.71
@@ -1,7 +1,7 @@
 Summary: Allows restricted root access for specified users
 Name: sudo
 Version: 1.6.9p17
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: BSD
 Group: Applications/System
 URL: http://www.courtesan.com/sudo/
@@ -74,7 +74,7 @@
         --with-ldap \
 	--with-selinux \
 	--with-passprompt="[sudo] password for %p: " \
-	--with-secure-path="/sbin:/bin:/usr/sbin:/usr/bin"
+	--with-secure-path="/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/bin"
 #	--without-kerb5 \
 #	--without-kerb4
 make
@@ -132,6 +132,9 @@
 /bin/chmod 0440 /etc/sudoers || :
 
 %changelog
+* Thu Jan 08 2009 Daniel Kopecek <dkopecek at redhat.com> 1.6.9p17-3
+- Added /usr/local/bin to secure-path
+
 * 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)



From rakesh at fedoraproject.org  Thu Jan  8 13:54:01 2009
From: rakesh at fedoraproject.org (Rakesh Pandit)
Date: Thu,  8 Jan 2009 13:54:01 +0000 (UTC)
Subject: rpms/php-xmpphp/F-10 .cvsignore, 1.2, 1.3 import.log, 1.1,
	1.2 php-xmpphp.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20090108135401.EBAF2700FD@cvs1.fedora.phx.redhat.com>

Author: rakesh

Update of /cvs/pkgs/rpms/php-xmpphp/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5511/F-10

Modified Files:
	.cvsignore import.log php-xmpphp.spec sources 
Log Message:
Updated to 0.1rc1-r70



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-xmpphp/F-10/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	23 Aug 2008 18:51:51 -0000	1.2
+++ .cvsignore	8 Jan 2009 13:53:31 -0000	1.3
@@ -1 +1 @@
-xmpphp-0.1beta-r50.tar.gz
+xmpphp-0.1rc1-r70.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/php-xmpphp/F-10/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	23 Aug 2008 18:51:51 -0000	1.1
+++ import.log	8 Jan 2009 13:53:31 -0000	1.2
@@ -1 +1,2 @@
 php-xmpphp-0_1-0_2_beta_r50_fc9:HEAD:php-xmpphp-0.1-0.2.beta_r50.fc9.src.rpm:1219516820
+php-xmpphp-0_1-0_4_rc1_r70_fc10:F-10:php-xmpphp-0.1-0.4.rc1_r70.fc10.src.rpm:1231379619


Index: php-xmpphp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php-xmpphp/F-10/php-xmpphp.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- php-xmpphp.spec	23 Aug 2008 18:51:51 -0000	1.1
+++ php-xmpphp.spec	8 Jan 2009 13:53:31 -0000	1.2
@@ -1,17 +1,17 @@
-%define prerelease r50
-%define beta beta
+%define prerelease r70
+%define relcand rc1
 %define realname xmpphp
 %define REALNAME XMPPHP
 
 Name:           php-%{realname}
 Version:        0.1
-Release:        0.2.%{beta}_%{prerelease}%{?dist}
+Release:        0.4.%{relcand}_%{prerelease}%{?dist}
 Summary:        XMPPHP is the successor to Class.Jabber.PHP
 
 Group:          Development/Libraries
 License:        GPLv2+
 URL:            http://code.google.com/p/xmpphp/
-Source0:        http://xmpphp.googlecode.com/files/%{realname}-%{version}%{beta}-%{prerelease}.tar.gz
+Source0:        http://xmpphp.googlecode.com/files/%{realname}-%{version}%{relcand}-%{prerelease}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -46,11 +46,19 @@
 %defattr(-,root,root,-)
 %doc README LICENSE examples
 %{_datadir}/php/%{realname}/*.php
+%dir %{_datadir}/php/%{realname}
+%dir %{_datadir}/php/%{realname}/tests
 %dir %{_datadir}/php/%{realname}/tests/%{REALNAME}
 %{_datadir}/php/%{realname}/tests/*.php
 %{_datadir}/php/%{realname}/tests/%{REALNAME}/*.php
 
 %changelog
+* Thu Jan  8 2009 Rakesh Pandit <rakesh at fedoraproject.org> 0.1-0.4.rc1_r70
+- Updated to 0.1rc1-r70
+
+* Thu Dec  4 2008 Michael Schwendt <mschwendt at fedoraproject.org> 0.1-0.3.beta_r50
+- Include unowned directories.
+
 * Sat Aug 23 2008 Rakesh Pandit <rakesh at fedoraproject.org> 0.1-0.2.beta_r50
  - moved examples to doc
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-xmpphp/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	23 Aug 2008 18:51:51 -0000	1.2
+++ sources	8 Jan 2009 13:53:31 -0000	1.3
@@ -1 +1 @@
-ab0fd09f9508f99bbfbf08850695de96  xmpphp-0.1beta-r50.tar.gz
+5c47578c92188d43199511358dee8f61  xmpphp-0.1rc1-r70.tar.gz



From rakesh at fedoraproject.org  Thu Jan  8 13:54:58 2009
From: rakesh at fedoraproject.org (Rakesh Pandit)
Date: Thu,  8 Jan 2009 13:54:58 +0000 (UTC)
Subject: rpms/php-xmpphp/F-9 .cvsignore, 1.2, 1.3 import.log, 1.1,
	1.2 php-xmpphp.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20090108135458.1816B700FD@cvs1.fedora.phx.redhat.com>

Author: rakesh

Update of /cvs/pkgs/rpms/php-xmpphp/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5489/F-9

Modified Files:
	.cvsignore import.log php-xmpphp.spec sources 
Log Message:
Updated to 0.1rc1-r70



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-xmpphp/F-9/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	23 Aug 2008 18:55:15 -0000	1.2
+++ .cvsignore	8 Jan 2009 13:54:27 -0000	1.3
@@ -1 +1 @@
-xmpphp-0.1beta-r50.tar.gz
+xmpphp-0.1rc1-r70.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/php-xmpphp/F-9/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	23 Aug 2008 18:55:15 -0000	1.1
+++ import.log	8 Jan 2009 13:54:27 -0000	1.2
@@ -1 +1,2 @@
 php-xmpphp-0_1-0_2_beta_r50_fc9:F-9:php-xmpphp-0.1-0.2.beta_r50.fc9.src.rpm:1219517034
+php-xmpphp-0_1-0_4_rc1_r70_fc10:F-9:php-xmpphp-0.1-0.4.rc1_r70.fc10.src.rpm:1231379587


Index: php-xmpphp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php-xmpphp/F-9/php-xmpphp.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- php-xmpphp.spec	23 Aug 2008 18:55:15 -0000	1.1
+++ php-xmpphp.spec	8 Jan 2009 13:54:27 -0000	1.2
@@ -1,17 +1,17 @@
-%define prerelease r50
-%define beta beta
+%define prerelease r70
+%define relcand rc1
 %define realname xmpphp
 %define REALNAME XMPPHP
 
 Name:           php-%{realname}
 Version:        0.1
-Release:        0.2.%{beta}_%{prerelease}%{?dist}
+Release:        0.4.%{relcand}_%{prerelease}%{?dist}
 Summary:        XMPPHP is the successor to Class.Jabber.PHP
 
 Group:          Development/Libraries
 License:        GPLv2+
 URL:            http://code.google.com/p/xmpphp/
-Source0:        http://xmpphp.googlecode.com/files/%{realname}-%{version}%{beta}-%{prerelease}.tar.gz
+Source0:        http://xmpphp.googlecode.com/files/%{realname}-%{version}%{relcand}-%{prerelease}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -46,11 +46,19 @@
 %defattr(-,root,root,-)
 %doc README LICENSE examples
 %{_datadir}/php/%{realname}/*.php
+%dir %{_datadir}/php/%{realname}
+%dir %{_datadir}/php/%{realname}/tests
 %dir %{_datadir}/php/%{realname}/tests/%{REALNAME}
 %{_datadir}/php/%{realname}/tests/*.php
 %{_datadir}/php/%{realname}/tests/%{REALNAME}/*.php
 
 %changelog
+* Thu Jan  8 2009 Rakesh Pandit <rakesh at fedoraproject.org> 0.1-0.4.rc1_r70
+- Updated to 0.1rc1-r70
+
+* Thu Dec  4 2008 Michael Schwendt <mschwendt at fedoraproject.org> 0.1-0.3.beta_r50
+- Include unowned directories.
+
 * Sat Aug 23 2008 Rakesh Pandit <rakesh at fedoraproject.org> 0.1-0.2.beta_r50
  - moved examples to doc
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-xmpphp/F-9/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	23 Aug 2008 18:55:15 -0000	1.2
+++ sources	8 Jan 2009 13:54:27 -0000	1.3
@@ -1 +1 @@
-ab0fd09f9508f99bbfbf08850695de96  xmpphp-0.1beta-r50.tar.gz
+5c47578c92188d43199511358dee8f61  xmpphp-0.1rc1-r70.tar.gz



From dtardon at fedoraproject.org  Thu Jan  8 13:54:56 2009
From: dtardon at fedoraproject.org (David Tardon)
Date: Thu,  8 Jan 2009 13:54:56 +0000 (UTC)
Subject: rpms/openoffice.org/F-10
	openoffice.org-3.0.1.ooo97428.config_office.xinerama-on-x86_64.patch, 
	1.1, 1.2
Message-ID: <20090108135456.7D2B7700FD@cvs1.fedora.phx.redhat.com>

Author: dtardon

Update of /cvs/extras/rpms/openoffice.org/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5893

Modified Files:
	openoffice.org-3.0.1.ooo97428.config_office.xinerama-on-x86_64.patch 
Log Message:
Resolves: rhbz#474719 openoffice.org-3.0.1.ooo97428.config_office.xinerama-on-x86_64.patch

openoffice.org-3.0.1.ooo97428.config_office.xinerama-on-x86_64.patch:

Index: openoffice.org-3.0.1.ooo97428.config_office.xinerama-on-x86_64.patch
===================================================================
RCS file: /cvs/extras/rpms/openoffice.org/F-10/openoffice.org-3.0.1.ooo97428.config_office.xinerama-on-x86_64.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openoffice.org-3.0.1.ooo97428.config_office.xinerama-on-x86_64.patch	19 Dec 2008 11:49:45 -0000	1.1
+++ openoffice.org-3.0.1.ooo97428.config_office.xinerama-on-x86_64.patch	8 Jan 2009 13:54:56 -0000	1.2
@@ -1,15 +1,18 @@
 diff -up OOO300_m9/config_office/configure.in.orig OOO300_m9.old3/config_office/configure.in
 --- OOO300_m9/config_office/configure.in.orig	2008-12-18 10:51:57.000000000 +0100
 +++ OOO300_m9/config_office/configure.in	2008-12-18 10:52:26.000000000 +0100
-@@ -4320,7 +4320,11 @@ else
+@@ -4320,7 +4320,14 @@ else
  fi
  AC_SUBST(XINC)
  if test "$x_libraries" = "default_x_libraries"; then
 -   XLIB="/usr/lib"
-+   if test "$build_cpu" != "x86_64" ; then
-+      XLIB="/usr/lib"
-+   else
++   if test "$build_cpu" = "x86_64" -o "$build_cpu" = "powerpc64"; then
 +      XLIB="/usr/lib64"
++      if ! test -d "$XLIB"; then
++          XLIB="/usr/lib"
++      fi
++   else
++      XLIB="/usr/lib"
 +   fi
  else
     XLIB="$x_libraries"



From rakesh at fedoraproject.org  Thu Jan  8 13:55:25 2009
From: rakesh at fedoraproject.org (Rakesh Pandit)
Date: Thu,  8 Jan 2009 13:55:25 +0000 (UTC)
Subject: rpms/php-xmpphp/devel .cvsignore, 1.2, 1.3 import.log, 1.1,
	1.2 php-xmpphp.spec, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <20090108135525.0C022700FD@cvs1.fedora.phx.redhat.com>

Author: rakesh

Update of /cvs/pkgs/rpms/php-xmpphp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5844/devel

Modified Files:
	.cvsignore import.log php-xmpphp.spec sources 
Log Message:
Updated to 0.1rc1-r70



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-xmpphp/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	23 Aug 2008 18:51:51 -0000	1.2
+++ .cvsignore	8 Jan 2009 13:54:54 -0000	1.3
@@ -1 +1 @@
-xmpphp-0.1beta-r50.tar.gz
+xmpphp-0.1rc1-r70.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/php-xmpphp/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	23 Aug 2008 18:51:51 -0000	1.1
+++ import.log	8 Jan 2009 13:54:54 -0000	1.2
@@ -1 +1,2 @@
 php-xmpphp-0_1-0_2_beta_r50_fc9:HEAD:php-xmpphp-0.1-0.2.beta_r50.fc9.src.rpm:1219516820
+php-xmpphp-0_1-0_4_rc1_r70_fc10:HEAD:php-xmpphp-0.1-0.4.rc1_r70.fc10.src.rpm:1231379636


Index: php-xmpphp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php-xmpphp/devel/php-xmpphp.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- php-xmpphp.spec	4 Dec 2008 20:45:15 -0000	1.2
+++ php-xmpphp.spec	8 Jan 2009 13:54:54 -0000	1.3
@@ -1,17 +1,17 @@
-%define prerelease r50
-%define beta beta
+%define prerelease r70
+%define relcand rc1
 %define realname xmpphp
 %define REALNAME XMPPHP
 
 Name:           php-%{realname}
 Version:        0.1
-Release:        0.3.%{beta}_%{prerelease}%{?dist}
+Release:        0.4.%{relcand}_%{prerelease}%{?dist}
 Summary:        XMPPHP is the successor to Class.Jabber.PHP
 
 Group:          Development/Libraries
 License:        GPLv2+
 URL:            http://code.google.com/p/xmpphp/
-Source0:        http://xmpphp.googlecode.com/files/%{realname}-%{version}%{beta}-%{prerelease}.tar.gz
+Source0:        http://xmpphp.googlecode.com/files/%{realname}-%{version}%{relcand}-%{prerelease}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -53,6 +53,9 @@
 %{_datadir}/php/%{realname}/tests/%{REALNAME}/*.php
 
 %changelog
+* Thu Jan  8 2009 Rakesh Pandit <rakesh at fedoraproject.org> 0.1-0.4.rc1_r70
+- Updated to 0.1rc1-r70
+
 * Thu Dec  4 2008 Michael Schwendt <mschwendt at fedoraproject.org> 0.1-0.3.beta_r50
 - Include unowned directories.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-xmpphp/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	23 Aug 2008 18:51:51 -0000	1.2
+++ sources	8 Jan 2009 13:54:54 -0000	1.3
@@ -1 +1 @@
-ab0fd09f9508f99bbfbf08850695de96  xmpphp-0.1beta-r50.tar.gz
+5c47578c92188d43199511358dee8f61  xmpphp-0.1rc1-r70.tar.gz



From red at fedoraproject.org  Thu Jan  8 13:57:48 2009
From: red at fedoraproject.org (Sandro Mathys)
Date: Thu,  8 Jan 2009 13:57:48 +0000 (UTC)
Subject: rpms/jcalendar/devel import.log, NONE,
	1.1 jcalendar-buildfile-noclean-on-javadocs.patch, NONE,
	1.1 jcalendar.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090108135748.92F91700FD@cvs1.fedora.phx.redhat.com>

Author: red

Update of /cvs/pkgs/rpms/jcalendar/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6071/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log jcalendar-buildfile-noclean-on-javadocs.patch 
	jcalendar.spec 
Log Message:
* Thu Jan 08 2009 Sandro Mathys <red at fedoraproject.org> - 1.3.2-1
- inital commit




--- NEW FILE import.log ---
jcalendar-1_3_2-1_fc11:HEAD:jcalendar-1.3.2-1.fc11.src.rpm:1231422907

jcalendar-buildfile-noclean-on-javadocs.patch:

--- NEW FILE jcalendar-buildfile-noclean-on-javadocs.patch ---
--- src/build.xml.old	2008-12-06 11:46:48.000000000 +0100
+++ src/build.xml	2008-12-06 11:48:15.000000000 +0100
@@ -50,7 +50,7 @@
 	<!-- PREPARE BUILD                                                         -->
 	<!-- ===================================================================== -->
 
-	<target name="prepare" depends="clean">
+	<target name="prepare">
 		<mkdir dir="${build.dir}" />
 	</target>
 
@@ -58,7 +58,7 @@
 	<!-- COMPILE                                                               -->
 	<!-- ===================================================================== -->
 
-	<target name="compile" depends="prepare">
+	<target name="compile" depends="clean,prepare">
 		<copy todir="${build.dir}">
 			<fileset dir="${src.dir}">
 				<patternset>


--- NEW FILE jcalendar.spec ---
Name:           jcalendar
Version:        1.3.2
Release:        1%{?dist}
Summary:        A Java date chooser bean for graphically picking a date
Group:          Development/Libraries
License:        LGPLv2+
URL:            http://www.toedter.com/en/jcalendar/
Source0:        http://www.toedter.com/download/%{name}-%{version}.zip
# both targets, jar and javadocs do a clean first for some weird reason.
Patch0:         jcalendar-buildfile-noclean-on-javadocs.patch
BuildArch:      noarch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:     java-devel >= 1:1.6.0
BuildRequires:     jpackage-utils
BuildRequires:     ant
Requires:          java >= 1:1.6.0
Requires:          jpackage-utils

%description
A Java date chooser bean for graphically picking a date.
JCalendar is composed of several other Java beans, a JDayChooser, a
JMonthChooser and a JYearChooser. All these beans have a locale property,
provide several icons (Color 16x16, Color 32x32, Mono 16x16 and Mono 32x32)
and their own locale property editor. So they can easily be used in GUI
builders. Also part of the package is a JDateChooser, a bean composed of an
IDateEditor (for direct date editing) and a button for opening a JCalendar
for selecting the date.


%package javadoc
Summary:           Javadocs for jcalendar
Group:             Documentation
Requires:          %name = %{version}-%{release}
Requires:          jpackage-utils

%description javadoc
JCalendar development documentation.


%prep
%setup -q -c %{name}-%{version}
%patch0 -p0

rm -rf bin/* doc/api lib/*

# Change the line endings but preserve the timestamp
%{__sed} -i.tmp 's/\r//' jcalendar-license.txt
touch -r jcalendar-license.txt.tmp jcalendar-license.txt

%build
pushd src
ant jar javadocs # includes clean
popd

%install
rm -rf $RPM_BUILD_ROOT

# jar
install -d $RPM_BUILD_ROOT%{_javadir}
install -m644 lib/%{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar

# javadoc
install -d $RPM_BUILD_ROOT%{_javadocdir}/%{name}
cp -rp doc/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc jcalendar-license.txt
%{_javadir}/%{name}.jar
%{_javadir}/%{name}-%{version}.jar

%files javadoc
%defattr(-,root,root,-)
%dir %{_javadocdir}/%{name}
%{_javadocdir}/%{name}/*


%changelog
* Sun Dec 14 2008 Sandro Mathys <red at fedoraproject.org> - 1.3.2-1
- initial build


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/jcalendar/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	18 Dec 2008 00:16:16 -0000	1.1
+++ .cvsignore	8 Jan 2009 13:57:18 -0000	1.2
@@ -0,0 +1 @@
+jcalendar-1.3.2.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/jcalendar/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	18 Dec 2008 00:16:16 -0000	1.1
+++ sources	8 Jan 2009 13:57:18 -0000	1.2
@@ -0,0 +1 @@
+aebe82a498fcc2493bb2859b8f62d344  jcalendar-1.3.2.zip



From red at fedoraproject.org  Thu Jan  8 14:00:44 2009
From: red at fedoraproject.org (Sandro Mathys)
Date: Thu,  8 Jan 2009 14:00:44 +0000 (UTC)
Subject: rpms/jcalendar/F-9 import.log, NONE,
	1.1 jcalendar-buildfile-noclean-on-javadocs.patch, NONE,
	1.1 jcalendar.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090108140044.68C94700FD@cvs1.fedora.phx.redhat.com>

Author: red

Update of /cvs/pkgs/rpms/jcalendar/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7039/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	import.log jcalendar-buildfile-noclean-on-javadocs.patch 
	jcalendar.spec 
Log Message:
* Thu Jan 08 2009 Sandro Mathys <red at fedoraproject.org> - 1.3.2-1
- inital commit




--- NEW FILE import.log ---
jcalendar-1_3_2-1_fc11:F-9:jcalendar-1.3.2-1.fc11.src.rpm:1231423193

jcalendar-buildfile-noclean-on-javadocs.patch:

--- NEW FILE jcalendar-buildfile-noclean-on-javadocs.patch ---
--- src/build.xml.old	2008-12-06 11:46:48.000000000 +0100
+++ src/build.xml	2008-12-06 11:48:15.000000000 +0100
@@ -50,7 +50,7 @@
 	<!-- PREPARE BUILD                                                         -->
 	<!-- ===================================================================== -->
 
-	<target name="prepare" depends="clean">
+	<target name="prepare">
 		<mkdir dir="${build.dir}" />
 	</target>
 
@@ -58,7 +58,7 @@
 	<!-- COMPILE                                                               -->
 	<!-- ===================================================================== -->
 
-	<target name="compile" depends="prepare">
+	<target name="compile" depends="clean,prepare">
 		<copy todir="${build.dir}">
 			<fileset dir="${src.dir}">
 				<patternset>


--- NEW FILE jcalendar.spec ---
Name:           jcalendar
Version:        1.3.2
Release:        1%{?dist}
Summary:        A Java date chooser bean for graphically picking a date
Group:          Development/Libraries
License:        LGPLv2+
URL:            http://www.toedter.com/en/jcalendar/
Source0:        http://www.toedter.com/download/%{name}-%{version}.zip
# both targets, jar and javadocs do a clean first for some weird reason.
Patch0:         jcalendar-buildfile-noclean-on-javadocs.patch
BuildArch:      noarch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:     java-devel >= 1:1.6.0
BuildRequires:     jpackage-utils
BuildRequires:     ant
Requires:          java >= 1:1.6.0
Requires:          jpackage-utils

%description
A Java date chooser bean for graphically picking a date.
JCalendar is composed of several other Java beans, a JDayChooser, a
JMonthChooser and a JYearChooser. All these beans have a locale property,
provide several icons (Color 16x16, Color 32x32, Mono 16x16 and Mono 32x32)
and their own locale property editor. So they can easily be used in GUI
builders. Also part of the package is a JDateChooser, a bean composed of an
IDateEditor (for direct date editing) and a button for opening a JCalendar
for selecting the date.


%package javadoc
Summary:           Javadocs for jcalendar
Group:             Documentation
Requires:          %name = %{version}-%{release}
Requires:          jpackage-utils

%description javadoc
JCalendar development documentation.


%prep
%setup -q -c %{name}-%{version}
%patch0 -p0

rm -rf bin/* doc/api lib/*

# Change the line endings but preserve the timestamp
%{__sed} -i.tmp 's/\r//' jcalendar-license.txt
touch -r jcalendar-license.txt.tmp jcalendar-license.txt

%build
pushd src
ant jar javadocs # includes clean
popd

%install
rm -rf $RPM_BUILD_ROOT

# jar
install -d $RPM_BUILD_ROOT%{_javadir}
install -m644 lib/%{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar

# javadoc
install -d $RPM_BUILD_ROOT%{_javadocdir}/%{name}
cp -rp doc/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc jcalendar-license.txt
%{_javadir}/%{name}.jar
%{_javadir}/%{name}-%{version}.jar

%files javadoc
%defattr(-,root,root,-)
%dir %{_javadocdir}/%{name}
%{_javadocdir}/%{name}/*


%changelog
* Sun Dec 14 2008 Sandro Mathys <red at fedoraproject.org> - 1.3.2-1
- initial build


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/jcalendar/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	18 Dec 2008 00:16:16 -0000	1.1
+++ .cvsignore	8 Jan 2009 14:00:13 -0000	1.2
@@ -0,0 +1 @@
+jcalendar-1.3.2.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/jcalendar/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	18 Dec 2008 00:16:16 -0000	1.1
+++ sources	8 Jan 2009 14:00:13 -0000	1.2
@@ -0,0 +1 @@
+aebe82a498fcc2493bb2859b8f62d344  jcalendar-1.3.2.zip



From red at fedoraproject.org  Thu Jan  8 14:03:03 2009
From: red at fedoraproject.org (Sandro Mathys)
Date: Thu,  8 Jan 2009 14:03:03 +0000 (UTC)
Subject: rpms/jcalendar/F-10 import.log, NONE,
	1.1 jcalendar-buildfile-noclean-on-javadocs.patch, NONE,
	1.1 jcalendar.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090108140303.67AFA700FD@cvs1.fedora.phx.redhat.com>

Author: red

Update of /cvs/pkgs/rpms/jcalendar/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7597/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	import.log jcalendar-buildfile-noclean-on-javadocs.patch 
	jcalendar.spec 
Log Message:
* Thu Jan 08 2009 Sandro Mathys <red at fedoraproject.org> - 1.3.2-1
- inital commit




--- NEW FILE import.log ---
jcalendar-1_3_2-1_fc11:F-10:jcalendar-1.3.2-1.fc11.src.rpm:1231423351

jcalendar-buildfile-noclean-on-javadocs.patch:

--- NEW FILE jcalendar-buildfile-noclean-on-javadocs.patch ---
--- src/build.xml.old	2008-12-06 11:46:48.000000000 +0100
+++ src/build.xml	2008-12-06 11:48:15.000000000 +0100
@@ -50,7 +50,7 @@
 	<!-- PREPARE BUILD                                                         -->
 	<!-- ===================================================================== -->
 
-	<target name="prepare" depends="clean">
+	<target name="prepare">
 		<mkdir dir="${build.dir}" />
 	</target>
 
@@ -58,7 +58,7 @@
 	<!-- COMPILE                                                               -->
 	<!-- ===================================================================== -->
 
-	<target name="compile" depends="prepare">
+	<target name="compile" depends="clean,prepare">
 		<copy todir="${build.dir}">
 			<fileset dir="${src.dir}">
 				<patternset>


--- NEW FILE jcalendar.spec ---
Name:           jcalendar
Version:        1.3.2
Release:        1%{?dist}
Summary:        A Java date chooser bean for graphically picking a date
Group:          Development/Libraries
License:        LGPLv2+
URL:            http://www.toedter.com/en/jcalendar/
Source0:        http://www.toedter.com/download/%{name}-%{version}.zip
# both targets, jar and javadocs do a clean first for some weird reason.
Patch0:         jcalendar-buildfile-noclean-on-javadocs.patch
BuildArch:      noarch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:     java-devel >= 1:1.6.0
BuildRequires:     jpackage-utils
BuildRequires:     ant
Requires:          java >= 1:1.6.0
Requires:          jpackage-utils

%description
A Java date chooser bean for graphically picking a date.
JCalendar is composed of several other Java beans, a JDayChooser, a
JMonthChooser and a JYearChooser. All these beans have a locale property,
provide several icons (Color 16x16, Color 32x32, Mono 16x16 and Mono 32x32)
and their own locale property editor. So they can easily be used in GUI
builders. Also part of the package is a JDateChooser, a bean composed of an
IDateEditor (for direct date editing) and a button for opening a JCalendar
for selecting the date.


%package javadoc
Summary:           Javadocs for jcalendar
Group:             Documentation
Requires:          %name = %{version}-%{release}
Requires:          jpackage-utils

%description javadoc
JCalendar development documentation.


%prep
%setup -q -c %{name}-%{version}
%patch0 -p0

rm -rf bin/* doc/api lib/*

# Change the line endings but preserve the timestamp
%{__sed} -i.tmp 's/\r//' jcalendar-license.txt
touch -r jcalendar-license.txt.tmp jcalendar-license.txt

%build
pushd src
ant jar javadocs # includes clean
popd

%install
rm -rf $RPM_BUILD_ROOT

# jar
install -d $RPM_BUILD_ROOT%{_javadir}
install -m644 lib/%{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar

# javadoc
install -d $RPM_BUILD_ROOT%{_javadocdir}/%{name}
cp -rp doc/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc jcalendar-license.txt
%{_javadir}/%{name}.jar
%{_javadir}/%{name}-%{version}.jar

%files javadoc
%defattr(-,root,root,-)
%dir %{_javadocdir}/%{name}
%{_javadocdir}/%{name}/*


%changelog
* Sun Dec 14 2008 Sandro Mathys <red at fedoraproject.org> - 1.3.2-1
- initial build


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/jcalendar/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	18 Dec 2008 00:16:16 -0000	1.1
+++ .cvsignore	8 Jan 2009 14:02:33 -0000	1.2
@@ -0,0 +1 @@
+jcalendar-1.3.2.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/jcalendar/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	18 Dec 2008 00:16:16 -0000	1.1
+++ sources	8 Jan 2009 14:02:33 -0000	1.2
@@ -0,0 +1 @@
+aebe82a498fcc2493bb2859b8f62d344  jcalendar-1.3.2.zip



From atkac at fedoraproject.org  Thu Jan  8 14:05:34 2009
From: atkac at fedoraproject.org (Adam Tkac)
Date: Thu,  8 Jan 2009 14:05:34 +0000 (UTC)
Subject: rpms/bind/devel .cvsignore, 1.49, 1.50 bind.spec, 1.297,
	1.298 sources, 1.58, 1.59
Message-ID: <20090108140534.86C7F700FD@cvs1.fedora.phx.redhat.com>

Author: atkac

Update of /cvs/pkgs/rpms/bind/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8292

Modified Files:
	.cvsignore bind.spec sources 
Log Message:
- 9.6.0-P1 release (CVE-2009-0025)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bind/devel/.cvsignore,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- .cvsignore	5 Jan 2009 08:17:46 -0000	1.49
+++ .cvsignore	8 Jan 2009 14:05:03 -0000	1.50
@@ -1,5 +1,5 @@
 config-4.tar.bz2
 libbind-man.tar.gz
 bind-chroot.tar.bz2
-bind-9.6.0.tar.gz
+bind-9.6.0-P1.tar.gz
 libbind-9.5.1b2.tar.bz2


Index: bind.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bind/devel/bind.spec,v
retrieving revision 1.297
retrieving revision 1.298
diff -u -r1.297 -r1.298
--- bind.spec	5 Jan 2009 08:17:46 -0000	1.297
+++ bind.spec	8 Jan 2009 14:05:03 -0000	1.298
@@ -2,9 +2,11 @@
 # Red Hat BIND package .spec file
 #
 
+%define PATCHVER P1
 #%define PREVER rc2
 #%define VERSION %{version}%{PREVER}
-%define VERSION %{version}
+#%define VERSION %{version}
+%define VERSION %{version}-%{PATCHVER}
 
 %{?!SDB:       %define SDB       1}
 %{?!LIBBIND:   %define LIBBIND   1}
@@ -19,7 +21,7 @@
 Name:     bind
 License:  ISC
 Version:  9.6.0
-Release:  1%{?dist}
+Release:  2.%{PATCHVER}%{?dist}
 Epoch:    32
 Url:      http://www.isc.org/products/BIND/
 Buildroot:%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -600,6 +602,9 @@
 %ghost %{chroot_prefix}/etc/localtime
 
 %changelog
+* Thu Jan 08 2009 Adam Tkac <atkac redhat com> 32:9.6.0-2.P1
+- 9.6.0-P1 release (CVE-2009-0025)
+
 * Mon Jan 05 2009 Adam Tkac <atkac redhat com> 32:9.6.0-1
 - Happy new year
 - 9.6.0 release


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bind/devel/sources,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- sources	5 Jan 2009 08:17:46 -0000	1.58
+++ sources	8 Jan 2009 14:05:04 -0000	1.59
@@ -1,5 +1,5 @@
 de68e10e91e05ab100be879b5bcaa6cb  config-4.tar.bz2
 13fef79f99fcefebb51d84b08805de51  libbind-man.tar.gz
 4faa4395b955e5f8a3d50f308b9fabc8  bind-chroot.tar.bz2
-287231d759ad83ed51f60f8a9f8176b9  bind-9.6.0.tar.gz
+886b7eae55cfdc8cd8d2ca74a2f99c6e  bind-9.6.0-P1.tar.gz
 3d1dad3630ec3510c8ab0ac2217a3317  libbind-9.5.1b2.tar.bz2



From mildew at fedoraproject.org  Thu Jan  8 14:12:10 2009
From: mildew at fedoraproject.org (=?utf-8?q?Daniel_Kope=C4=8Dek?=)
Date: Thu,  8 Jan 2009 14:12:10 +0000 (UTC)
Subject: rpms/sudo/F-9 sudo.spec,1.68,1.69
Message-ID: <20090108141210.D590B700FD@cvs1.fedora.phx.redhat.com>

Author: mildew

Update of /cvs/pkgs/rpms/sudo/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9719

Modified Files:
	sudo.spec 
Log Message:
Added /usr/local/bin to secure-path


Index: sudo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sudo/F-9/sudo.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- sudo.spec	30 Oct 2008 13:34:55 -0000	1.68
+++ sudo.spec	8 Jan 2009 14:11:40 -0000	1.69
@@ -1,7 +1,7 @@
 Summary: Allows restricted root access for specified users
 Name: sudo
 Version: 1.6.9p13
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: BSD
 Group: Applications/System
 URL: http://www.courtesan.com/sudo/
@@ -75,7 +75,7 @@
         --with-ldap \
 	--with-selinux \
 	--with-passprompt="[sudo] password for %p: " \
-        --with-secure-path="/sbin:/bin:/usr/sbin:/usr/bin"
+        --with-secure-path="/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/bin"
 #	--without-kerb5 \
 #	--without-kerb4
 make
@@ -134,6 +134,9 @@
 /bin/chmod 0440 /etc/sudoers || :
 
 %changelog
+* Thu Jan 08 2009 Daniel Kopecek <dkopecek at redhat.com> 1.6.9p13-8
+- Added /usr/local/bin to secure-path
+
 * Thu Oct 30 2008 Daniel Kopecek <dkopecek at redhat.com> 1.6.9p13-7
 - Fixed type/role parsing (#466292)
 - Release set to 7 because 6 is already used in devel branch



From mmahut at fedoraproject.org  Thu Jan  8 14:14:34 2009
From: mmahut at fedoraproject.org (Marek Mahut)
Date: Thu,  8 Jan 2009 14:14:34 +0000 (UTC)
Subject: rpms/eboard/devel eboard.desktop, NONE, 1.1 eboard.spec, NONE,
	1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090108141434.39F6A700FD@cvs1.fedora.phx.redhat.com>

Author: mmahut

Update of /cvs/pkgs/rpms/eboard/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10091/devel

Modified Files:
	.cvsignore sources 
Added Files:
	eboard.desktop eboard.spec import.log 
Log Message:
initial import



--- NEW FILE eboard.desktop ---
[Desktop Entry]
Name=Eboard
Comment=Play chess against an engine, on a LAN or on the Internet
Exec=eboard
Terminal=false
Type=Application
Categories=Application;BoardGame;


--- NEW FILE eboard.spec ---
Name:		eboard
Version:	1.1.1
Release:	1%{?dist}
Summary:	Chess board interface for ICS

Group:		Amusements/Games
License:	GPLv2+
URL:		http://eboard.sourceforge.net/
Source0:	http://dl.sf.net/%{name}/%{name}-%{version}.tar.bz2
Source1:	eboard.desktop
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	libstdc++-devel
BuildRequires:	libpng-devel
BuildRequires:	cairo-devel
BuildRequires:	pango-devel
BuildRequires:	perl
BuildRequires:	gtk2-devel
BuildRequires:	desktop-file-utils

%description
Eboard provides a chess board interface to ICS (Internet Chess Servers)
like FICS and to chess engines like GNU Chess, Sjeng and Crafty.

%prep 
%setup -q

%build
export EXTRAFLAGS=`echo '%{optflags}' | sed 's/ /:/g'`
./configure --prefix="/usr" --man-prefix="%{_mandir}" --extra-flags="$EXTRAFLAGS"
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR="$RPM_BUILD_ROOT"
desktop-file-install --vendor fedora --dir ${RPM_BUILD_ROOT}%{_datadir}/applications %{SOURCE1}

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING Documentation/*.txt INSTALL README TODO
%{_bindir}/eboard
%{_bindir}/eboard-addtheme
%{_bindir}/eboard-config
%{_datadir}/eboard/
%{_datadir}/applications/fedora-%{name}.desktop
%{_mandir}/man6/eboard.6*
%{_mandir}/man1/eboard-addtheme.1*
%{_mandir}/man1/eboard-config.1*

%changelog
* Wed Jul 30 2008 Marek Mahut <mmahut at fedoraproject.org> - 1.1.1-1
- Initial build


--- NEW FILE import.log ---
eboard-1_1_1-1_fc8:HEAD:eboard-1.1.1-1.fc8.src.rpm:1231423706


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/eboard/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	23 Dec 2008 02:40:33 -0000	1.1
+++ .cvsignore	8 Jan 2009 14:14:03 -0000	1.2
@@ -0,0 +1 @@
+eboard-1.1.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eboard/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	23 Dec 2008 02:40:33 -0000	1.1
+++ sources	8 Jan 2009 14:14:03 -0000	1.2
@@ -0,0 +1 @@
+03dcdaa2bc85218b1b18c4bee276fea7  eboard-1.1.1.tar.bz2



From lkundrak at fedoraproject.org  Thu Jan  8 14:15:41 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Thu,  8 Jan 2009 14:15:41 +0000 (UTC)
Subject: rpms/libglfw/devel glfw-2.6-dso.patch, NONE,
	1.1 glfw-makefiles.patch, 1.1, NONE glfw.spec, 1.1, NONE
Message-ID: <20090108141541.1797C700FD@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/libglfw/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10515

Added Files:
	glfw-2.6-dso.patch 
Removed Files:
	glfw-makefiles.patch glfw.spec 
Log Message:
* Thu Jan 08 2009 Lubomir Rintel <lkundrak at v3.sk> 2.6-3
- Major refactor, since this was not properly reviewed
- Get rid of ugly sedding
- Install a DSO properly
- Use SONAME
- Fix Source URL
- Rename SPEC file to match the package name
- Nuke -doc subpackage, move development documentation into -devel
- Include all documentation
- Use macros consistently
- Indent consistently


glfw-2.6-dso.patch:

--- NEW FILE glfw-2.6-dso.patch ---
Make only DSO, not a static library
Use SONAME
Make it possible to slecify libdir (lib vs. lib64)
Make it possibel to specify an installation root

Lubomir Rintel <lkundrak at v3.sk>

diff -up glfw/compile.sh.dso glfw/compile.sh
--- glfw/compile.sh.dso	2009-01-08 14:46:02.000000000 +0100
+++ glfw/compile.sh	2009-01-08 14:46:15.000000000 +0100
@@ -594,7 +594,7 @@ echo "$config_script: Creating ""$MKNAME
 cat > "$MKNAME" <<EOF
 prefix=@PREFIX@
 exec_prefix=@PREFIX@
-libdir=@PREFIX@/lib
+libdir=@PREFIX@/@LIB@
 includedir=@PREFIX@/include
 
 Name: GLFW
diff -up glfw/lib/x11/Makefile.x11.in.dso glfw/lib/x11/Makefile.x11.in
--- glfw/lib/x11/Makefile.x11.in.dso	2007-07-01 11:46:46.000000000 +0200
+++ glfw/lib/x11/Makefile.x11.in	2009-01-08 14:44:52.000000000 +0100
@@ -3,12 +3,19 @@
 # Installation prefix (default to /usr/local)
 ##########################################################################
 PREFIX ?= /usr/local
+LIB ?= lib
 
 
 ##########################################################################
-# Default: Build GLFW static library
+# Default: Build GLFW shared library
 ##########################################################################
-default: libglfw.a libglfw.so
+
+# API Version: 2.6
+# We assume API corresponds to ABI for now
+ABI_MAJOR=2.6
+ABI_MINOR=0
+SONAME=libglfw.so.$(ABI_MAJOR)
+default: $(SONAME)
 
 
 ##########################################################################
@@ -20,17 +27,18 @@ SED      = sed
 INSTALL  = install
 ARFLAGS  = -rcs
 
-
 ##########################################################################
 # Install GLFW static library
 ##########################################################################
-install: libglfw.a libglfw.pc
-	$(INSTALL) -d $(PREFIX)/lib
-	$(INSTALL) -c -m 644 libglfw.a $(PREFIX)/lib/libglfw.a
-	$(INSTALL) -d $(PREFIX)/include/GL
-	$(INSTALL) -c -m 644 ../../include/GL/glfw.h $(PREFIX)/include/GL/glfw.h
-	$(INSTALL) -d $(PREFIX)/lib/pkgconfig
-	$(INSTALL) -c -m 644 libglfw.pc $(PREFIX)/lib/pkgconfig/libglfw.pc
+install: $(SONAME) libglfw.pc
+	$(INSTALL) -d $(DESTDIR)$(PREFIX)/$(LIB)
+	$(INSTALL) -c -m 755 $(SONAME) $(DESTDIR)$(PREFIX)/$(LIB)
+	ln -sf $(SONAME) $(DESTDIR)$(PREFIX)/$(LIB)/$(SONAME).$(ABI_MINOR)
+	ln -sf $(SONAME) $(DESTDIR)$(PREFIX)/$(LIB)/libglfw.so
+	$(INSTALL) -d $(DESTDIR)$(PREFIX)/include/GL
+	$(INSTALL) -c -m 644 ../../include/GL/glfw.h $(DESTDIR)$(PREFIX)/include/GL
+	$(INSTALL) -d $(DESTDIR)$(PREFIX)/lib/pkgconfig
+	$(INSTALL) -c -m 644 libglfw.pc $(DESTDIR)$(PREFIX)/lib/pkgconfig
 
 
 ##########################################################################
@@ -91,7 +99,7 @@ SHARED_OBJS = \
 # Rule for building libglfw.pc
 ##########################################################################
 libglfw.pc: libglfw.pc.in
-	$(SED) -e 's,\@PREFIX\@,$(PREFIX),' libglfw.pc.in > libglfw.pc
+	$(SED) -e 's,\@PREFIX\@,$(PREFIX),;s,\@LIB\@,$(LIB),' libglfw.pc.in > libglfw.pc
 
 
 ##########################################################################
@@ -104,8 +112,8 @@ libglfw.a: $(STATIC_OBJS)
 ##########################################################################
 # Rule for building shared library
 ##########################################################################
-libglfw.so: $(SHARED_OBJS)
-	$(CC) $(LDFLAGS) -o $@ $(SHARED_OBJS) $(LFLAGS) $(LIBS)
+$(SONAME): $(SHARED_OBJS)
+	$(CC) $(LDFLAGS) -o $@ -Wl,--soname,$(SONAME) $(SHARED_OBJS) $(LFLAGS) $(LIBS)
 
 
 ##########################################################################


--- glfw-makefiles.patch DELETED ---


--- glfw.spec DELETED ---



From atkac at fedoraproject.org  Thu Jan  8 14:16:01 2009
From: atkac at fedoraproject.org (Adam Tkac)
Date: Thu,  8 Jan 2009 14:16:01 +0000 (UTC)
Subject: rpms/bind/F-10 .cvsignore, 1.46, 1.47 bind.spec, 1.289,
	1.290 sources, 1.55, 1.56 bind-95-sdlz-include.patch, 1.1,
	NONE bind-96-rh475120.patch, 1.1, NONE
Message-ID: <20090108141602.002D2700FD@cvs1.fedora.phx.redhat.com>

Author: atkac

Update of /cvs/pkgs/rpms/bind/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10479

Modified Files:
	.cvsignore bind.spec sources 
Removed Files:
	bind-95-sdlz-include.patch bind-96-rh475120.patch 
Log Message:
- 9.5.1-P1 release (CVE-2009-0025)
- patches merged
  - bind-95-sdlz-include.patch
  - bind-96-rh475120.patch



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bind/F-10/.cvsignore,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- .cvsignore	11 Nov 2008 14:24:46 -0000	1.46
+++ .cvsignore	8 Jan 2009 14:15:31 -0000	1.47
@@ -1,4 +1,4 @@
 config-4.tar.bz2
 libbind-man.tar.gz
 bind-chroot.tar.bz2
-bind-9.5.1b3.tar.gz
+bind-9.5.1-P1.tar.gz


Index: bind.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bind/F-10/bind.spec,v
retrieving revision 1.289
retrieving revision 1.290
diff -u -r1.289 -r1.290
--- bind.spec	9 Dec 2008 15:35:38 -0000	1.289
+++ bind.spec	8 Jan 2009 14:15:31 -0000	1.290
@@ -2,8 +2,10 @@
 # Red Hat BIND package .spec file
 #
 
-%define PREVER b3
-%define VERSION %{version}%{PREVER}
+#%define PREVER b3
+#%define VERSION %{version}%{PREVER}
+%define PATCHVER P1
+%define VERSION %{version}-%{PATCHVER}
 
 %{?!SDB:       %define SDB       1}
 %{?!LIBBIND:   %define LIBBIND   1}
@@ -19,7 +21,7 @@
 Name:     bind
 License:  ISC
 Version:  9.5.1
-Release:  0.9.3.%{PREVER}%{?dist}
+Release:  1.%{PATCHVER}%{?dist}
 Epoch:    32
 Url:      http://www.isc.org/products/BIND/
 Buildroot:%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -56,10 +58,8 @@
 Patch71: bind-9.5-overflow.patch
 Patch72: bind-9.5-dlz-64bit.patch
 Patch87: bind-9.5-parallel-build.patch
-Patch95: bind-95-sdlz-include.patch
 Patch96: bind-95-rh469440.patch
 Patch97: bind-95-rh452060.patch
-Patch98: bind-96-rh475120.patch
 
 # SDB patches
 Patch11: bind-9.3.2b2-sdbsrc.patch
@@ -239,7 +239,6 @@
 %patch85 -p1 -b .libidn3
 %patch87 -p1 -b .parallel
 %patch94 -p1 -b .rh461409
-%patch95 -p1 -b .includes
 %patch96 -p1 -b .rh469440
 %patch97 -p1 -b .rh452060
 
@@ -250,7 +249,6 @@
 done
 %endif
 
-%patch98 -p1 -b .rh475120
 :;
 
 %build
@@ -640,6 +638,12 @@
 %{_sbindir}/bind-chroot-admin
 
 %changelog
+* Thu Jan 08 2009 Adam Tkac <atkac redhat com> 32:9.5.1-1.P1
+- 9.5.1-P1 release (CVE-2009-0025)
+- patches merged
+  - bind-95-sdlz-include.patch
+  - bind-96-rh475120.patch
+
 * Tue Dec 09 2008 Adam Tkac <atkac redhat com> 32:9.5.1-0.9.3.b3
 - allow to reuse address for non-random query-source ports (#475120)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bind/F-10/sources,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- sources	11 Nov 2008 14:24:46 -0000	1.55
+++ sources	8 Jan 2009 14:15:31 -0000	1.56
@@ -1,4 +1,4 @@
 de68e10e91e05ab100be879b5bcaa6cb  config-4.tar.bz2
 13fef79f99fcefebb51d84b08805de51  libbind-man.tar.gz
 4faa4395b955e5f8a3d50f308b9fabc8  bind-chroot.tar.bz2
-6618149cd0dc702ce98085b415955a6e  bind-9.5.1b3.tar.gz
+8afc7f95f4fad1eaaba09596617b8089  bind-9.5.1-P1.tar.gz


--- bind-95-sdlz-include.patch DELETED ---


--- bind-96-rh475120.patch DELETED ---



From ltinkl at fedoraproject.org  Thu Jan  8 14:17:14 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Thu,  8 Jan 2009 14:17:14 +0000 (UTC)
Subject: rpms/kdebase-runtime/F-10 .cvsignore, 1.22,
	1.23 kdebase-runtime.spec, 1.77, 1.78 sources, 1.24, 1.25
Message-ID: <20090108141714.A0BDC700FD@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kdebase-runtime/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10653

Modified Files:
	.cvsignore kdebase-runtime.spec sources 
Log Message:
KDE 4.1.4



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdebase-runtime/F-10/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- .cvsignore	30 Sep 2008 15:05:49 -0000	1.22
+++ .cvsignore	8 Jan 2009 14:16:44 -0000	1.23
@@ -1,9 +1 @@
-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
+kdebase-runtime-4.1.4.tar.bz2


Index: kdebase-runtime.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebase-runtime/F-10/kdebase-runtime.spec,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- kdebase-runtime.spec	11 Nov 2008 23:18:13 -0000	1.77
+++ kdebase-runtime.spec	8 Jan 2009 14:16:44 -0000	1.78
@@ -9,7 +9,7 @@
 
 Name:          kdebase-runtime
 Summary:       K Desktop Environment - Runtime 
-Version:       4.1.3
+Version:       4.1.4
 Release:       1%{?dist}
 
 License:       GPLv2
@@ -381,6 +381,9 @@
 
 
 %changelog
+* Thu Jan  8 2009 Luk???? Tinkl <ltinkl at redhat.com> 4.1.4-1
+- KDE 4.1.4
+
 * Wed Nov 12 2008 Than Ngo <than at redhat.com> 4.1.3-1
 - KDE 4.1.3
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdebase-runtime/F-10/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- sources	11 Nov 2008 23:18:13 -0000	1.24
+++ sources	8 Jan 2009 14:16:44 -0000	1.25
@@ -6,4 +6,4 @@
 6fb861774412d3f63accf480980c0488  audio-headset-bluetooth.svgz
 b75bce5f507225e0760061a7276271a5  audio-headset-usb.svgz
 26411a187b7aa9a722f91ead4e557aa0  audio-backend-jack.svgz
-9fe84d0fa5fac149ba6cefeb004775ac  kdebase-runtime-4.1.3.tar.bz2
+fad82875745bacbb52001eabf9c71202  kdebase-runtime-4.1.4.tar.bz2



From ltinkl at fedoraproject.org  Thu Jan  8 14:17:28 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Thu,  8 Jan 2009 14:17:28 +0000 (UTC)
Subject: rpms/kdebase-runtime/F-9 .cvsignore, 1.16, 1.17 kdebase-runtime.spec,
	1.60, 1.61 sources, 1.19, 1.20
Message-ID: <20090108141728.03CFF700FD@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kdebase-runtime/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10769

Modified Files:
	.cvsignore kdebase-runtime.spec sources 
Log Message:
KDE 4.1.4



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdebase-runtime/F-9/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore	5 Nov 2008 11:56:09 -0000	1.16
+++ .cvsignore	8 Jan 2009 14:16:57 -0000	1.17
@@ -1 +1 @@
-kdebase-runtime-4.1.3.tar.bz2
+kdebase-runtime-4.1.4.tar.bz2


Index: kdebase-runtime.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebase-runtime/F-9/kdebase-runtime.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- kdebase-runtime.spec	5 Nov 2008 12:22:57 -0000	1.60
+++ kdebase-runtime.spec	8 Jan 2009 14:16:57 -0000	1.61
@@ -9,7 +9,7 @@
 
 Name:          kdebase-runtime
 Summary:       K Desktop Environment - Runtime 
-Version:       4.1.3
+Version:       4.1.4
 Release:       1%{?dist}
 
 License:       GPLv2
@@ -381,6 +381,9 @@
 
 
 %changelog
+* Thu Jan  8 2009 Luk???? Tinkl <ltinkl at redhat.com> 4.1.4-1
+- KDE 4.1.4
+
 * Wed Nov  5 2008 Luk???? Tinkl <ltinkl at redhat.com> 4.1.3-1
 - KDE 4.1.3
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdebase-runtime/F-9/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources	5 Nov 2008 12:11:09 -0000	1.19
+++ sources	8 Jan 2009 14:16:57 -0000	1.20
@@ -6,4 +6,4 @@
 6fb861774412d3f63accf480980c0488  audio-headset-bluetooth.svgz
 b75bce5f507225e0760061a7276271a5  audio-headset-usb.svgz
 26411a187b7aa9a722f91ead4e557aa0  audio-backend-jack.svgz
-9fe84d0fa5fac149ba6cefeb004775ac  kdebase-runtime-4.1.3.tar.bz2
+fad82875745bacbb52001eabf9c71202  kdebase-runtime-4.1.4.tar.bz2



From lkundrak at fedoraproject.org  Thu Jan  8 14:19:07 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Thu,  8 Jan 2009 14:19:07 +0000 (UTC)
Subject: rpms/libglfw/devel libglfw.spec,NONE,1.1
Message-ID: <20090108141907.D7149700FD@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/libglfw/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11214

Added Files:
	libglfw.spec 
Log Message:
Add the spec file after move


--- NEW FILE libglfw.spec ---
Name:           libglfw
Version:        2.6
Release:        3%{?dist}
Summary:        Framework for OpenGL application development

Group:          System Environment/Libraries
License:        zlib
URL:            http://glfw.sourceforge.net
Source0:        http://downloads.sourceforge.net/glfw/glfw-%{version}.tar.bz2
Patch0:         glfw-2.6-dso.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  libX11-devel, libXrandr-devel, pth-devel, freeglut-devel

%description
GLFW is a free, open source, portable framework for OpenGL 
application development.

%package devel
Summary:        Development files for %{name}
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}
Requires:       pkgconfig

%description devel
The %{name}-devel package contains libraries, header files
and documentation for developing applications that use %{name}.

%prep
%setup -q -n glfw
%patch0 -p1 -b .dso

%build
sh compile.sh 
make %{?_smp_mflags} CC="gcc %{optflags}" PREFIX=%{_prefix} LIB=%{_lib} \
       -C lib/x11 -f Makefile.x11 default libglfw.pc

%install
rm -rf %{buildroot}
make %{?_smp_mflags} PREFIX=%{_prefix} DESTDIR=%{buildroot} LIB=%{_lib} \
        -C lib/x11 -f Makefile.x11 install

%clean
rm -rf %{buildroot}

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files
%defattr(-,root,root,-)
%{_libdir}/libglfw.so.*
%doc readme.html
%doc license.txt 

%files devel
%defattr(-,root,root,-)
%{_includedir}/GL/glfw.h
%{_libdir}/libglfw.so
%{_libdir}/pkgconfig/*
%doc docs/*.pdf docs/*.txt examples

%changelog
* Thu Jan 08 2009 Lubomir Rintel <lkundrak at v3.sk> 2.6-3
- Major refactor, since this was not properly reviewed
- Get rid of ugly sedding
- Install a DSO properly
- Use SONAME
- Fix Source URL
- Rename SPEC file to match the package name
- Nuke -doc subpackage, move development documentation into -devel
- Include all documentation
- Use macros consistently
- Indent consistently

* Sat Nov 08 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.6-2
- spec fixes for review 
- added doc subpackage

* Fri Oct 03 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.6-1
- Initial version



From lkundrak at fedoraproject.org  Thu Jan  8 14:28:48 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Thu,  8 Jan 2009 14:28:48 +0000 (UTC)
Subject: rpms/libglfw/devel glfw-2.6-dso.patch,1.1,1.2
Message-ID: <20090108142848.76579700FD@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/libglfw/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12494

Modified Files:
	glfw-2.6-dso.patch 
Log Message:
pkgconfig goes to lib64 on 64bits

glfw-2.6-dso.patch:

Index: glfw-2.6-dso.patch
===================================================================
RCS file: /cvs/pkgs/rpms/libglfw/devel/glfw-2.6-dso.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- glfw-2.6-dso.patch	8 Jan 2009 14:15:40 -0000	1.1
+++ glfw-2.6-dso.patch	8 Jan 2009 14:28:18 -0000	1.2
@@ -64,8 +64,8 @@
 +	ln -sf $(SONAME) $(DESTDIR)$(PREFIX)/$(LIB)/libglfw.so
 +	$(INSTALL) -d $(DESTDIR)$(PREFIX)/include/GL
 +	$(INSTALL) -c -m 644 ../../include/GL/glfw.h $(DESTDIR)$(PREFIX)/include/GL
-+	$(INSTALL) -d $(DESTDIR)$(PREFIX)/lib/pkgconfig
-+	$(INSTALL) -c -m 644 libglfw.pc $(DESTDIR)$(PREFIX)/lib/pkgconfig
++	$(INSTALL) -d $(DESTDIR)$(PREFIX)/$(LIB)/pkgconfig
++	$(INSTALL) -c -m 644 libglfw.pc $(DESTDIR)$(PREFIX)/$(LIB)/pkgconfig
  
  
  ##########################################################################



From mmahut at fedoraproject.org  Thu Jan  8 14:40:03 2009
From: mmahut at fedoraproject.org (Marek Mahut)
Date: Thu,  8 Jan 2009 14:40:03 +0000 (UTC)
Subject: rpms/eboard/F-10 eboard.desktop, NONE, 1.1 eboard.spec, NONE,
	1.1 sources, 1.1, 1.2
Message-ID: <20090108144003.5301F700FD@cvs1.fedora.phx.redhat.com>

Author: mmahut

Update of /cvs/pkgs/rpms/eboard/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14827

Modified Files:
	sources 
Added Files:
	eboard.desktop eboard.spec 
Log Message:
initial import



--- NEW FILE eboard.desktop ---
[Desktop Entry]
Name=Eboard
Comment=Play chess against an engine, on a LAN or on the Internet
Exec=eboard
Terminal=false
Type=Application
Categories=Application;BoardGame;


--- NEW FILE eboard.spec ---
Name:		eboard
Version:	1.1.1
Release:	1%{?dist}
Summary:	Chess board interface for ICS

Group:		Amusements/Games
License:	GPLv2+
URL:		http://eboard.sourceforge.net/
Source0:	http://dl.sf.net/%{name}/%{name}-%{version}.tar.bz2
Source1:	eboard.desktop
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	libstdc++-devel
BuildRequires:	libpng-devel
BuildRequires:	cairo-devel
BuildRequires:	pango-devel
BuildRequires:	perl
BuildRequires:	gtk2-devel
BuildRequires:	desktop-file-utils

%description
Eboard provides a chess board interface to ICS (Internet Chess Servers)
like FICS and to chess engines like GNU Chess, Sjeng and Crafty.

%prep 
%setup -q

%build
export EXTRAFLAGS=`echo '%{optflags}' | sed 's/ /:/g'`
./configure --prefix="/usr" --man-prefix="%{_mandir}" --extra-flags="$EXTRAFLAGS"
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR="$RPM_BUILD_ROOT"
desktop-file-install --vendor fedora --dir ${RPM_BUILD_ROOT}%{_datadir}/applications %{SOURCE1}

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING Documentation/*.txt INSTALL README TODO
%{_bindir}/eboard
%{_bindir}/eboard-addtheme
%{_bindir}/eboard-config
%{_datadir}/eboard/
%{_datadir}/applications/fedora-%{name}.desktop
%{_mandir}/man6/eboard.6*
%{_mandir}/man1/eboard-addtheme.1*
%{_mandir}/man1/eboard-config.1*

%changelog
* Wed Jul 30 2008 Marek Mahut <mmahut at fedoraproject.org> - 1.1.1-1
- Initial build


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eboard/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	23 Dec 2008 02:40:33 -0000	1.1
+++ sources	8 Jan 2009 14:39:33 -0000	1.2
@@ -0,0 +1 @@
+03dcdaa2bc85218b1b18c4bee276fea7  eboard-1.1.1.tar.bz2



From peter at fedoraproject.org  Thu Jan  8 14:39:58 2009
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Thu,  8 Jan 2009 14:39:58 +0000 (UTC)
Subject: rpms/flashrom/F-9 .cvsignore, 1.11,
	1.12 flashrom--Makefile_cleanup.diff, 1.4, 1.5 flashrom.spec,
	1.13, 1.14 import.log, 1.3, 1.4 sources, 1.11, 1.12
Message-ID: <20090108143958.99DF6700FD@cvs1.fedora.phx.redhat.com>

Author: peter

Update of /cvs/extras/rpms/flashrom/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14805/F-9

Modified Files:
	.cvsignore flashrom--Makefile_cleanup.diff flashrom.spec 
	import.log sources 
Log Message:
svn ver. 3852


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/flashrom/F-9/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	3 Nov 2008 08:42:11 -0000	1.11
+++ .cvsignore	8 Jan 2009 14:39:28 -0000	1.12
@@ -1 +1 @@
-flashrom-3723.tar.bz2
+flashrom-3852.tar.bz2

flashrom--Makefile_cleanup.diff:

Index: flashrom--Makefile_cleanup.diff
===================================================================
RCS file: /cvs/extras/rpms/flashrom/F-9/flashrom--Makefile_cleanup.diff,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- flashrom--Makefile_cleanup.diff	7 Jul 2008 17:40:21 -0000	1.4
+++ flashrom--Makefile_cleanup.diff	8 Jan 2009 14:39:28 -0000	1.5
@@ -7,8 +7,8 @@
 -PREFIX  = /usr/local
 +PREFIX  = /usr
  #CFLAGS  = -O2 -g -Wall -Werror
--CFLAGS  = -Os -Wall -Werror # -DTS5300
-+#CFLAGS  = -Os -Wall -Werror # -DTS5300
+-CFLAGS  = -Os -Wall -Werror
++#CFLAGS  = -Os -Wall -Werror
  OS_ARCH	= $(shell uname)
  ifeq ($(OS_ARCH), SunOS)
  LDFLAGS = -lpci -lz


Index: flashrom.spec
===================================================================
RCS file: /cvs/extras/rpms/flashrom/F-9/flashrom.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- flashrom.spec	3 Nov 2008 08:42:11 -0000	1.13
+++ flashrom.spec	8 Jan 2009 14:39:28 -0000	1.14
@@ -1,9 +1,9 @@
-%define svnver 3723
+%define svnver 3852
 Summary:	Simple program for reading/writing BIOS chips content
 Name:		flashrom
 Version:	0
-Release:	0.14.20081103svn%{svnver}%{?dist}
-License:	GPLv2+
+Release:	0.15.20090112svn%{svnver}%{?dist}
+License:	GPLv2
 Group:		Applications/System
 # svn -r %{svnver} export svn://coreboot.org/repos/trunk/util/flashrom flashrom
 # tar -cjvf flashrom-%{svnver}.tar.bz2 flashrom
@@ -45,6 +45,18 @@
 %{_mandir}/man8/%{name}.*
 
 %changelog
+* Thu Jan  8 2009 Peter Lemenkov <lemenkov at gmail.com> 0-0.15.20090112svn3852
+- Changed license to GPLv2
+- SST49LF020 support
+- AMD-768 chipset support
+- i631x LPC support
+- Support the MX29LV040C
+- AMD SB700 flash enable
+- Support for the AMD/ATI SB600 southbridge SPI
+- SST25VF080B flash chip support
+- Support for 32Mbit SPI flash SST25VF032B
+- Support for bunch of Fujitsu and Macronix chips
+
 * Mon Nov  3 2008 Peter Lemenkov <lemenkov at gmail.com> 0-0.14.20081103svn3723
 - Dump ICH8/ICH9/ICH10 SPI registers
 - Add additional SPI sector erase and chip erase command


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/flashrom/F-9/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- import.log	3 Nov 2008 08:42:11 -0000	1.3
+++ import.log	8 Jan 2009 14:39:28 -0000	1.4
@@ -1,3 +1,4 @@
 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
 flashrom-0-0_14_20081103svn3723_fc9:F-9:flashrom-0-0.14.20081103svn3723.fc9.src.rpm:1225701693
+flashrom-0-0_15_20090112svn3852_fc10:F-9:flashrom-0-0.15.20090112svn3852.fc10.src.rpm:1231412366


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/flashrom/F-9/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	3 Nov 2008 08:42:11 -0000	1.11
+++ sources	8 Jan 2009 14:39:28 -0000	1.12
@@ -1 +1 @@
-37fb45aa795a6c79f0518d99e33626d4  flashrom-3723.tar.bz2
+4253d2a2a70ec3335c4b2a2bf40eefb8  flashrom-3852.tar.bz2



From lkundrak at fedoraproject.org  Thu Jan  8 14:41:48 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Thu,  8 Jan 2009 14:41:48 +0000 (UTC)
Subject: rpms/libglfw/F-10 glfw-2.6-dso.patch, NONE, 1.1 libglfw.spec, NONE, 
	1.1 glfw-makefiles.patch, 1.1, NONE glfw.spec, 1.1,
	NONE import.log, 1.1, NONE
Message-ID: <20090108144148.E638D700FD@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/libglfw/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15425/F-10

Added Files:
	glfw-2.6-dso.patch libglfw.spec 
Removed Files:
	glfw-makefiles.patch glfw.spec import.log 
Log Message:
Merge to branches

glfw-2.6-dso.patch:

--- NEW FILE glfw-2.6-dso.patch ---
Make only DSO, not a static library
Use SONAME
Make it possible to slecify libdir (lib vs. lib64)
Make it possibel to specify an installation root

Lubomir Rintel <lkundrak at v3.sk>

diff -up glfw/compile.sh.dso glfw/compile.sh
--- glfw/compile.sh.dso	2009-01-08 14:46:02.000000000 +0100
+++ glfw/compile.sh	2009-01-08 14:46:15.000000000 +0100
@@ -594,7 +594,7 @@ echo "$config_script: Creating ""$MKNAME
 cat > "$MKNAME" <<EOF
 prefix=@PREFIX@
 exec_prefix=@PREFIX@
-libdir=@PREFIX@/lib
+libdir=@PREFIX@/@LIB@
 includedir=@PREFIX@/include
 
 Name: GLFW
diff -up glfw/lib/x11/Makefile.x11.in.dso glfw/lib/x11/Makefile.x11.in
--- glfw/lib/x11/Makefile.x11.in.dso	2007-07-01 11:46:46.000000000 +0200
+++ glfw/lib/x11/Makefile.x11.in	2009-01-08 14:44:52.000000000 +0100
@@ -3,12 +3,19 @@
 # Installation prefix (default to /usr/local)
 ##########################################################################
 PREFIX ?= /usr/local
+LIB ?= lib
 
 
 ##########################################################################
-# Default: Build GLFW static library
+# Default: Build GLFW shared library
 ##########################################################################
-default: libglfw.a libglfw.so
+
+# API Version: 2.6
+# We assume API corresponds to ABI for now
+ABI_MAJOR=2.6
+ABI_MINOR=0
+SONAME=libglfw.so.$(ABI_MAJOR)
+default: $(SONAME)
 
 
 ##########################################################################
@@ -20,17 +27,18 @@ SED      = sed
 INSTALL  = install
 ARFLAGS  = -rcs
 
-
 ##########################################################################
 # Install GLFW static library
 ##########################################################################
-install: libglfw.a libglfw.pc
-	$(INSTALL) -d $(PREFIX)/lib
-	$(INSTALL) -c -m 644 libglfw.a $(PREFIX)/lib/libglfw.a
-	$(INSTALL) -d $(PREFIX)/include/GL
-	$(INSTALL) -c -m 644 ../../include/GL/glfw.h $(PREFIX)/include/GL/glfw.h
-	$(INSTALL) -d $(PREFIX)/lib/pkgconfig
-	$(INSTALL) -c -m 644 libglfw.pc $(PREFIX)/lib/pkgconfig/libglfw.pc
+install: $(SONAME) libglfw.pc
+	$(INSTALL) -d $(DESTDIR)$(PREFIX)/$(LIB)
+	$(INSTALL) -c -m 755 $(SONAME) $(DESTDIR)$(PREFIX)/$(LIB)
+	ln -sf $(SONAME) $(DESTDIR)$(PREFIX)/$(LIB)/$(SONAME).$(ABI_MINOR)
+	ln -sf $(SONAME) $(DESTDIR)$(PREFIX)/$(LIB)/libglfw.so
+	$(INSTALL) -d $(DESTDIR)$(PREFIX)/include/GL
+	$(INSTALL) -c -m 644 ../../include/GL/glfw.h $(DESTDIR)$(PREFIX)/include/GL
+	$(INSTALL) -d $(DESTDIR)$(PREFIX)/$(LIB)/pkgconfig
+	$(INSTALL) -c -m 644 libglfw.pc $(DESTDIR)$(PREFIX)/$(LIB)/pkgconfig
 
 
 ##########################################################################
@@ -91,7 +99,7 @@ SHARED_OBJS = \
 # Rule for building libglfw.pc
 ##########################################################################
 libglfw.pc: libglfw.pc.in
-	$(SED) -e 's,\@PREFIX\@,$(PREFIX),' libglfw.pc.in > libglfw.pc
+	$(SED) -e 's,\@PREFIX\@,$(PREFIX),;s,\@LIB\@,$(LIB),' libglfw.pc.in > libglfw.pc
 
 
 ##########################################################################
@@ -104,8 +112,8 @@ libglfw.a: $(STATIC_OBJS)
 ##########################################################################
 # Rule for building shared library
 ##########################################################################
-libglfw.so: $(SHARED_OBJS)
-	$(CC) $(LDFLAGS) -o $@ $(SHARED_OBJS) $(LFLAGS) $(LIBS)
+$(SONAME): $(SHARED_OBJS)
+	$(CC) $(LDFLAGS) -o $@ -Wl,--soname,$(SONAME) $(SHARED_OBJS) $(LFLAGS) $(LIBS)
 
 
 ##########################################################################


--- NEW FILE libglfw.spec ---
Name:           libglfw
Version:        2.6
Release:        3%{?dist}
Summary:        Framework for OpenGL application development

Group:          System Environment/Libraries
License:        zlib
URL:            http://glfw.sourceforge.net
Source0:        http://downloads.sourceforge.net/glfw/glfw-%{version}.tar.bz2
Patch0:         glfw-2.6-dso.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  libX11-devel, libXrandr-devel, pth-devel, freeglut-devel

%description
GLFW is a free, open source, portable framework for OpenGL 
application development.

%package devel
Summary:        Development files for %{name}
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}
Requires:       pkgconfig

%description devel
The %{name}-devel package contains libraries, header files
and documentation for developing applications that use %{name}.

%prep
%setup -q -n glfw
%patch0 -p1 -b .dso

%build
sh compile.sh 
make %{?_smp_mflags} CC="gcc %{optflags}" PREFIX=%{_prefix} LIB=%{_lib} \
       -C lib/x11 -f Makefile.x11 default libglfw.pc

%install
rm -rf %{buildroot}
make %{?_smp_mflags} PREFIX=%{_prefix} DESTDIR=%{buildroot} LIB=%{_lib} \
        -C lib/x11 -f Makefile.x11 install

%clean
rm -rf %{buildroot}

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files
%defattr(-,root,root,-)
%{_libdir}/libglfw.so.*
%doc readme.html
%doc license.txt 

%files devel
%defattr(-,root,root,-)
%{_includedir}/GL/glfw.h
%{_libdir}/libglfw.so
%{_libdir}/pkgconfig/*
%doc docs/*.pdf docs/*.txt examples

%changelog
* Thu Jan 08 2009 Lubomir Rintel <lkundrak at v3.sk> 2.6-3
- Major refactor, since this was not properly reviewed
- Get rid of ugly sedding
- Install a DSO properly
- Use SONAME
- Fix Source URL
- Rename SPEC file to match the package name
- Nuke -doc subpackage, move development documentation into -devel
- Include all documentation
- Use macros consistently
- Indent consistently

* Sat Nov 08 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.6-2
- spec fixes for review 
- added doc subpackage

* Fri Oct 03 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.6-1
- Initial version


--- glfw-makefiles.patch DELETED ---


--- glfw.spec DELETED ---


--- import.log DELETED ---



From pkgdb at fedoraproject.org  Thu Jan  8 14:42:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 08 Jan 2009 14:42:09 +0000
Subject: [pkgdb] mon: lucilanga has requested watchbugzilla
Message-ID: <20090108144209.DE17F20831F@bastion.fedora.phx.redhat.com>

lucilanga has requested the watchbugzilla acl on mon (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mon



From pkgdb at fedoraproject.org  Thu Jan  8 14:42:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 08 Jan 2009 14:42:12 +0000
Subject: [pkgdb] mon: lucilanga has requested commit
Message-ID: <20090108144212.E0CBC208456@bastion.fedora.phx.redhat.com>

lucilanga has requested the commit acl on mon (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mon



From pkgdb at fedoraproject.org  Thu Jan  8 14:42:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 08 Jan 2009 14:42:14 +0000
Subject: [pkgdb] mon: lucilanga has requested watchcommits
Message-ID: <20090108144214.96CFE208319@bastion.fedora.phx.redhat.com>

lucilanga has requested the watchcommits acl on mon (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mon



From lkundrak at fedoraproject.org  Thu Jan  8 14:42:19 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Thu,  8 Jan 2009 14:42:19 +0000 (UTC)
Subject: rpms/libglfw/F-9 glfw-2.6-dso.patch, NONE, 1.1 libglfw.spec, NONE, 
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090108144219.42F8B700FD@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/libglfw/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15425/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	glfw-2.6-dso.patch libglfw.spec 
Log Message:
Merge to branches

glfw-2.6-dso.patch:

--- NEW FILE glfw-2.6-dso.patch ---
Make only DSO, not a static library
Use SONAME
Make it possible to slecify libdir (lib vs. lib64)
Make it possibel to specify an installation root

Lubomir Rintel <lkundrak at v3.sk>

diff -up glfw/compile.sh.dso glfw/compile.sh
--- glfw/compile.sh.dso	2009-01-08 14:46:02.000000000 +0100
+++ glfw/compile.sh	2009-01-08 14:46:15.000000000 +0100
@@ -594,7 +594,7 @@ echo "$config_script: Creating ""$MKNAME
 cat > "$MKNAME" <<EOF
 prefix=@PREFIX@
 exec_prefix=@PREFIX@
-libdir=@PREFIX@/lib
+libdir=@PREFIX@/@LIB@
 includedir=@PREFIX@/include
 
 Name: GLFW
diff -up glfw/lib/x11/Makefile.x11.in.dso glfw/lib/x11/Makefile.x11.in
--- glfw/lib/x11/Makefile.x11.in.dso	2007-07-01 11:46:46.000000000 +0200
+++ glfw/lib/x11/Makefile.x11.in	2009-01-08 14:44:52.000000000 +0100
@@ -3,12 +3,19 @@
 # Installation prefix (default to /usr/local)
 ##########################################################################
 PREFIX ?= /usr/local
+LIB ?= lib
 
 
 ##########################################################################
-# Default: Build GLFW static library
+# Default: Build GLFW shared library
 ##########################################################################
-default: libglfw.a libglfw.so
+
+# API Version: 2.6
+# We assume API corresponds to ABI for now
+ABI_MAJOR=2.6
+ABI_MINOR=0
+SONAME=libglfw.so.$(ABI_MAJOR)
+default: $(SONAME)
 
 
 ##########################################################################
@@ -20,17 +27,18 @@ SED      = sed
 INSTALL  = install
 ARFLAGS  = -rcs
 
-
 ##########################################################################
 # Install GLFW static library
 ##########################################################################
-install: libglfw.a libglfw.pc
-	$(INSTALL) -d $(PREFIX)/lib
-	$(INSTALL) -c -m 644 libglfw.a $(PREFIX)/lib/libglfw.a
-	$(INSTALL) -d $(PREFIX)/include/GL
-	$(INSTALL) -c -m 644 ../../include/GL/glfw.h $(PREFIX)/include/GL/glfw.h
-	$(INSTALL) -d $(PREFIX)/lib/pkgconfig
-	$(INSTALL) -c -m 644 libglfw.pc $(PREFIX)/lib/pkgconfig/libglfw.pc
+install: $(SONAME) libglfw.pc
+	$(INSTALL) -d $(DESTDIR)$(PREFIX)/$(LIB)
+	$(INSTALL) -c -m 755 $(SONAME) $(DESTDIR)$(PREFIX)/$(LIB)
+	ln -sf $(SONAME) $(DESTDIR)$(PREFIX)/$(LIB)/$(SONAME).$(ABI_MINOR)
+	ln -sf $(SONAME) $(DESTDIR)$(PREFIX)/$(LIB)/libglfw.so
+	$(INSTALL) -d $(DESTDIR)$(PREFIX)/include/GL
+	$(INSTALL) -c -m 644 ../../include/GL/glfw.h $(DESTDIR)$(PREFIX)/include/GL
+	$(INSTALL) -d $(DESTDIR)$(PREFIX)/$(LIB)/pkgconfig
+	$(INSTALL) -c -m 644 libglfw.pc $(DESTDIR)$(PREFIX)/$(LIB)/pkgconfig
 
 
 ##########################################################################
@@ -91,7 +99,7 @@ SHARED_OBJS = \
 # Rule for building libglfw.pc
 ##########################################################################
 libglfw.pc: libglfw.pc.in
-	$(SED) -e 's,\@PREFIX\@,$(PREFIX),' libglfw.pc.in > libglfw.pc
+	$(SED) -e 's,\@PREFIX\@,$(PREFIX),;s,\@LIB\@,$(LIB),' libglfw.pc.in > libglfw.pc
 
 
 ##########################################################################
@@ -104,8 +112,8 @@ libglfw.a: $(STATIC_OBJS)
 ##########################################################################
 # Rule for building shared library
 ##########################################################################
-libglfw.so: $(SHARED_OBJS)
-	$(CC) $(LDFLAGS) -o $@ $(SHARED_OBJS) $(LFLAGS) $(LIBS)
+$(SONAME): $(SHARED_OBJS)
+	$(CC) $(LDFLAGS) -o $@ -Wl,--soname,$(SONAME) $(SHARED_OBJS) $(LFLAGS) $(LIBS)
 
 
 ##########################################################################


--- NEW FILE libglfw.spec ---
Name:           libglfw
Version:        2.6
Release:        3%{?dist}
Summary:        Framework for OpenGL application development

Group:          System Environment/Libraries
License:        zlib
URL:            http://glfw.sourceforge.net
Source0:        http://downloads.sourceforge.net/glfw/glfw-%{version}.tar.bz2
Patch0:         glfw-2.6-dso.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  libX11-devel, libXrandr-devel, pth-devel, freeglut-devel

%description
GLFW is a free, open source, portable framework for OpenGL 
application development.

%package devel
Summary:        Development files for %{name}
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}
Requires:       pkgconfig

%description devel
The %{name}-devel package contains libraries, header files
and documentation for developing applications that use %{name}.

%prep
%setup -q -n glfw
%patch0 -p1 -b .dso

%build
sh compile.sh 
make %{?_smp_mflags} CC="gcc %{optflags}" PREFIX=%{_prefix} LIB=%{_lib} \
       -C lib/x11 -f Makefile.x11 default libglfw.pc

%install
rm -rf %{buildroot}
make %{?_smp_mflags} PREFIX=%{_prefix} DESTDIR=%{buildroot} LIB=%{_lib} \
        -C lib/x11 -f Makefile.x11 install

%clean
rm -rf %{buildroot}

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files
%defattr(-,root,root,-)
%{_libdir}/libglfw.so.*
%doc readme.html
%doc license.txt 

%files devel
%defattr(-,root,root,-)
%{_includedir}/GL/glfw.h
%{_libdir}/libglfw.so
%{_libdir}/pkgconfig/*
%doc docs/*.pdf docs/*.txt examples

%changelog
* Thu Jan 08 2009 Lubomir Rintel <lkundrak at v3.sk> 2.6-3
- Major refactor, since this was not properly reviewed
- Get rid of ugly sedding
- Install a DSO properly
- Use SONAME
- Fix Source URL
- Rename SPEC file to match the package name
- Nuke -doc subpackage, move development documentation into -devel
- Include all documentation
- Use macros consistently
- Indent consistently

* Sat Nov 08 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.6-2
- spec fixes for review 
- added doc subpackage

* Fri Oct 03 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.6-1
- Initial version


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libglfw/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	16 Nov 2008 20:20:14 -0000	1.1
+++ .cvsignore	8 Jan 2009 14:41:48 -0000	1.2
@@ -0,0 +1 @@
+glfw-2.6.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libglfw/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	16 Nov 2008 20:20:14 -0000	1.1
+++ sources	8 Jan 2009 14:41:48 -0000	1.2
@@ -0,0 +1 @@
+0d9b93e6194c3805be9e1c855a985a24  glfw-2.6.tar.bz2



From pkgdb at fedoraproject.org  Thu Jan  8 14:42:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 08 Jan 2009 14:42:21 +0000
Subject: [pkgdb] mon: lucilanga has requested watchbugzilla
Message-ID: <20090108144222.0330E208468@bastion.fedora.phx.redhat.com>

lucilanga has requested the watchbugzilla acl on mon (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mon



From pkgdb at fedoraproject.org  Thu Jan  8 14:42:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 08 Jan 2009 14:42:23 +0000
Subject: [pkgdb] mon: lucilanga has requested watchcommits
Message-ID: <20090108144224.0245520846C@bastion.fedora.phx.redhat.com>

lucilanga has requested the watchcommits acl on mon (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mon



From pkgdb at fedoraproject.org  Thu Jan  8 14:42:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 08 Jan 2009 14:42:25 +0000
Subject: [pkgdb] mon: lucilanga has requested commit
Message-ID: <20090108144225.3248F20846F@bastion.fedora.phx.redhat.com>

lucilanga has requested the commit acl on mon (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mon



From pkgdb at fedoraproject.org  Thu Jan  8 14:42:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 08 Jan 2009 14:42:30 +0000
Subject: [pkgdb] mon: lucilanga has requested watchbugzilla
Message-ID: <20090108144231.47FAE208421@bastion.fedora.phx.redhat.com>

lucilanga has requested the watchbugzilla acl on mon (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mon



From pkgdb at fedoraproject.org  Thu Jan  8 14:42:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 08 Jan 2009 14:42:33 +0000
Subject: [pkgdb] mon: lucilanga has requested commit
Message-ID: <20090108144233.C1FC6208473@bastion.fedora.phx.redhat.com>

lucilanga has requested the commit acl on mon (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mon



From pkgdb at fedoraproject.org  Thu Jan  8 14:42:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 08 Jan 2009 14:42:31 +0000
Subject: [pkgdb] mon: lucilanga has requested watchcommits
Message-ID: <20090108144231.E9FD3208471@bastion.fedora.phx.redhat.com>

lucilanga has requested the watchcommits acl on mon (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mon



From vcrhonek at fedoraproject.org  Thu Jan  8 14:46:31 2009
From: vcrhonek at fedoraproject.org (Vitezslav Crhonek)
Date: Thu,  8 Jan 2009 14:46:31 +0000 (UTC)
Subject: rpms/kbd/devel kbd-1.15-keycodes-man.patch, NONE,
	1.1 kbd-1.15-po.patch, NONE, 1.1 kbd-1.15-resizecon-x86_64.patch,
	NONE, 1.1 kbd-1.15-sparc.patch, NONE,
	1.1 kbd-1.15-unicode_start.patch, NONE, 1.1 .cvsignore, 1.11,
	1.12 kbd.spec, 1.55, 1.56 sources, 1.14,
	1.15 kbd-1.08-compose.patch, 1.4, NONE kbd-1.08-rukbd.patch, 1.4,
	NONE kbd-1.08-terminal.patch, 1.4, NONE kbd-1.12-Meta_utf8.patch,
	1.4, NONE kbd-1.12-alias.patch, 1.5, NONE kbd-1.12-dir.patch,
	1.4, NONE kbd-1.12-gr-el.patch, 1.2,
	NONE kbd-1.12-keycodes-man.patch, 1.2,
	NONE kbd-1.12-no-user-map.patch, 1.2,
	NONE kbd-1.12-nostrip.patch, 1.2,
	NONE kbd-1.12-resizecon-x86.patch, 1.2,
	NONE kbd-1.12-setfont-man.patch, 1.2, NONE kbd-1.12-sparc.patch,
	1.2, NONE kbd-1.12-trq-map.patch, 1.2,
	NONE kbd-1.12.tar.bz2.sign, 1.1, NONE
Message-ID: <20090108144631.50AE3700FD@cvs1.fedora.phx.redhat.com>

Author: vcrhonek

Update of /cvs/extras/rpms/kbd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16402

Modified Files:
	.cvsignore kbd.spec sources 
Added Files:
	kbd-1.15-keycodes-man.patch kbd-1.15-po.patch 
	kbd-1.15-resizecon-x86_64.patch kbd-1.15-sparc.patch 
	kbd-1.15-unicode_start.patch 
Removed 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-1.12.tar.bz2.sign 
Log Message:
Update to kbd-1.15

kbd-1.15-keycodes-man.patch:

--- NEW FILE kbd-1.15-keycodes-man.patch ---
diff -up kbd-1.15/man/man1/showkey.1_old kbd-1.15/man/man1/showkey.1
--- kbd-1.15/man/man1/showkey.1_old	2008-03-13 17:46:23.000000000 +0100
+++ kbd-1.15/man/man1/showkey.1	2008-12-10 12:31:38.000000000 +0100
@@ -80,6 +80,19 @@ corresponds to what the keyboard hardwar
 to know the scan codes sent by various keys it is better to boot a
 2.4 kernel. Since 2.6.9 there also is the boot option atkbd.softraw=0
 that tells the 2.6 kernel to return the actual scan codes.
+
+.SH NOTES
+The raw scan codes are available only on AT and PS/2 keyboards,
+and even then they are disabled unless the
+.B atkbd.softraw=0
+kernel parameter is used.
+When the raw scan codes are not available, the kernel uses a fixed built-in
+table to produce scan codes from keycodes.  Thus,
+.BR setkeycodes (8)
+can affect the output of
+.B showkey
+in scan code dump mode.
+
 .SH "SEE ALSO"
 .BR loadkeys (1),
 .BR dumpkeys (1),
diff -up kbd-1.15/man/man8/setkeycodes.8_old kbd-1.15/man/man8/setkeycodes.8
--- kbd-1.15/man/man8/setkeycodes.8_old	2008-12-10 12:31:56.000000000 +0100
+++ kbd-1.15/man/man8/setkeycodes.8	2008-12-10 12:37:36.000000000 +0100
@@ -41,6 +41,10 @@ to showkey(1), the command
 will assign the keycode 112 to it, and then loadkeys(1) can be used
 to define the function of this key.
 
+USB keyboards have standardized keycodes and
+.B setkeycodes
+doesn't affect them at all.
+
 .SH "2.6 KERNELS"
 In 2.6 kernels key codes lie in the range 1-255, instead of 1-127.
 (It might be best to confine oneself to the range 1-239.)
@@ -54,6 +58,14 @@ None.
 .SH BUGS
 The keycodes of X have nothing to do with those of Linux.
 Unusual keys can be made visible under Linux, but not under X.
+
+.B setkeycodes
+affects only the "first" input device
+that has modifiable scancode-to-keycode mapping.
+If there is more than one such device,
+.B setkeycodes
+cannot change the mapping of other devices than the "first" one.
+
 .SH "SEE ALSO"
 .I "dumpkeys (1), loadkeys (1), showkey (1), getkeycodes (8)"
 

kbd-1.15-po.patch:

--- NEW FILE kbd-1.15-po.patch ---
diff -up kbd-1.15/po/Makefile.in_old kbd-1.15/po/Makefile.in
--- kbd-1.15/po/Makefile.in_old	2008-10-23 21:03:59.000000000 +0200
+++ kbd-1.15/po/Makefile.in	2008-12-09 15:35:58.000000000 +0100
@@ -4,10 +4,10 @@ srcdir = @srcdir@
 
 prefix        = @prefix@
 datarootdir   = @datarootdir@
-datadir       = @datadir@
-localedir     = $(DESTDIR)$(datadir)/locale
-gnulocaledir  = $(DESTDIR)$(datadir)/locale
-gettextsrcdir = $(DESTDIR)$(datadir)/gettext/po
+datadir       = $(DESTDIR)@datadir@
+localedir     = $(DESTDIR)@localedir@
+gnulocaledir  = $(DESTDIR)@localedir@
+gettextsrcdir = $(datadir)/gettext/po
 
 FOREIGN       = @FOREIGN@
 HAVE_XGETTEXT = @HAVE_XGETTEXT@
@@ -36,10 +36,10 @@ INCLUDES = -I.. -I$(INTL)
 COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS)
 
 # Enter here all .po files
-POFILES =  cs.po da.po de.po el.po es.po fr.po gr.po nl.po pl.po \
+POFILES =  cs.po da.po de.po el.po es.po fr.po nl.po pl.po \
  ro.po ru.po sv.po tr.po
 # the same but with .gmo
-GMOFILES = cs.gmo da.gmo de.gmo el.gmo es.gmo fr.gmo gr.gmo nl.gmo \
+GMOFILES = cs.gmo da.gmo de.gmo el.gmo es.gmo fr.gmo nl.gmo \
  pl.gmo ro.gmo ru.gmo sv.gmo tr.gmo
 
 CATALOGS = $(GMOFILES)

kbd-1.15-resizecon-x86_64.patch:

--- NEW FILE kbd-1.15-resizecon-x86_64.patch ---
diff -up kbd-1.15/configure_old kbd-1.15/configure
--- kbd-1.15/configure_old	2009-01-08 15:11:04.000000000 +0100
+++ kbd-1.15/configure	2009-01-08 15:11:45.000000000 +0100
@@ -7637,8 +7637,9 @@ fi
 
 
 case $host_cpu in
-	i?86*) RESIZECONS_PROGS=yes ;;
-	*)     RESIZECONS_PROGS=no ;;
+	i?86*)   RESIZECONS_PROGS=yes ;;
+	x86_64*) RESIZECONS_PROGS=yes ;;
+	*)       RESIZECONS_PROGS=no ;;
 esac
  if test "$RESIZECONS_PROGS" = "yes"; then
   RESIZECONS_PROGS_TRUE=

kbd-1.15-sparc.patch:

--- NEW FILE kbd-1.15-sparc.patch ---
diff -up kbd-1.15/man/man8/kbdrate.8_old kbd-1.15/man/man8/kbdrate.8
--- kbd-1.15/man/man8/kbdrate.8_old	2008-12-10 14:20:33.000000000 +0100
+++ kbd-1.15/man/man8/kbdrate.8	2008-12-10 14:41:10.000000000 +0100
@@ -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.
 
 .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
diff -up kbd-1.15/src/kbdrate.c_old kbd-1.15/src/kbdrate.c
--- kbd-1.15/src/kbdrate.c_old	2008-12-10 14:00:25.000000000 +0100
+++ kbd-1.15/src/kbdrate.c	2008-12-10 14:20:11.000000000 +0100
@@ -77,7 +77,6 @@ beats rebuilding the kernel!
 
 #ifdef __sparc__
 #include <asm/param.h>
-#include <asm/kbio.h>
 #endif
 
 #ifndef KDKBDREP
@@ -109,11 +108,15 @@ static int valid_delays[] = { 250, 500, 
 
 static int
 KDKBDREP_ioctl_ok(double rate, int delay, int silent) {
+#if defined(KDKBDREP) && !defined(__sparc__)
 	/*
 	 * This ioctl is defined in <linux/kd.h> but is not
 	 * implemented anywhere - must be in some m68k patches.
+         * We cannot blindly try unimplemented ioctls on sparc64 -
+         * the 32<->64bit transition layer does not like it.
 	 * Since 2.4.9 also on i386.
-	 */
+         */
+
 	struct my_kbd_repeat kbdrep_s;
 
 	/* don't change, just test */
@@ -177,6 +180,9 @@ KDKBDREP_ioctl_ok(double rate, int delay
 			rate, kbdrep_s.delay );
 
 	return 1;			/* success! */
+#else /* no KDKBDREP or __sparc__ */
+        return 0;
+#endif /* KDKBDREP */
 }
 
 static int
@@ -221,7 +227,7 @@ sigalrmhandler( int sig ) {
 int
 main( int argc, char **argv ) {
 #ifdef __sparc__
-	double      rate = 5.0;      /* Default rate */
+        double      rate = 20.0;      /* Default rate */
 	int         delay = 200;     /* Default delay */
 #else
 	double      rate = 10.9;     /* Default rate */
@@ -272,7 +278,9 @@ main( int argc, char **argv ) {
 
 
 	/* The ioport way */
+        /* The ioport way - will crash on sparc */
 
+#ifndef __sparc__
 	for (i = 0; i < RATE_COUNT; i++)
 		if (rate * 10 >= valid_rates[i]) {
 			value &= 0x60;
@@ -335,5 +343,7 @@ main( int argc, char **argv ) {
 			valid_rates[value & 0x1f] / 10.0,
 			valid_delays[ (value & 0x60) >> 5 ] );
 
+#endif
+
 	return 0;
 }
diff -up kbd-1.15/src/setleds.c_old kbd-1.15/src/setleds.c
--- kbd-1.15/src/setleds.c_old	2008-12-10 14:00:02.000000000 +0100
+++ kbd-1.15/src/setleds.c	2008-12-10 14:00:16.000000000 +0100
@@ -14,10 +14,6 @@
 #include "nls.h"
 #include "version.h"
 
-#ifdef __sparc__
-#include <asm/kbio.h>
-#endif
-
 static void
 usage(void)
 {

kbd-1.15-unicode_start.patch:

--- NEW FILE kbd-1.15-unicode_start.patch ---
diff -up kbd-1.15/src/unicode_start_old kbd-1.15/src/unicode_start
--- kbd-1.15/src/unicode_start_old	2009-01-08 13:34:10.000000000 +0100
+++ kbd-1.15/src/unicode_start	2009-01-08 14:02:12.000000000 +0100
@@ -72,6 +72,9 @@ stty iutf8
 # have a Unicode map attached, or explicitly specified, e.g.,
 # by giving `def.uni' as a second argument.
 
+DEFAULT_UNICODE_FONT=latarcyrheb-sun16
+# Also drdos8x16 is a good candidate.
+
 case "$#" in
 	2)
 		setfont "$1" -u "$2"
@@ -80,6 +83,7 @@ case "$#" in
 		setfont "$1"
 		;;
 	0)
+		setfont $DEFAULT_UNICODE_FONT
 		;;
 	*)
 		echo "usage: unicode_start [font [unicode map]]"


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kbd/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	10 Dec 2007 15:45:17 -0000	1.11
+++ .cvsignore	8 Jan 2009 14:46:00 -0000	1.12
@@ -8,3 +8,4 @@
 ro_maps.tar.bz2
 terminus.tar.bz2
 kbd-1.13wip.tar.gz
+kbd-1.15.tar.gz


Index: kbd.spec
===================================================================
RCS file: /cvs/extras/rpms/kbd/devel/kbd.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- kbd.spec	18 Sep 2008 10:25:02 -0000	1.55
+++ kbd.spec	8 Jan 2009 14:46:00 -0000	1.56
@@ -1,38 +1,27 @@
-Summary: Tools for configuring the console (keyboard, virtual terminals, etc.)
-Name: kbd
-Version: 1.12
-Release: 32%{?dist}
-# Except possibly for the restrictions mentioned in the directory consolefonts
-License: GPL+
-Group: System Environment/Base
-Source0: ftp://ftp.kernel.org/pub/linux/utils/kbd/kbd-%{version}.tar.bz2
-Source1: ftp://ftp.kernel.org/pub/linux/utils/kbd/kbd-%{version}.tar.bz2.sign
-Source2: kbd-latsun-fonts.tar.bz2
-Source3: kbd-sun12x22-fixed.tar.bz2
-Source4: ro_maps.tar.bz2
-Source5: terminus.tar.bz2
-Source6: kbd-latarcyrheb-16-fixed.tar.bz2
-BuildRequires: bison, flex, gettext
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Patch0: kbd-1.12-sparc.patch
-Patch1: kbd-1.08-compose.patch
-Patch2: kbd-1.08-terminal.patch
-Patch3: kbd-1.08-rukbd.patch
-Patch4: kbd-1.12-setfont-man.patch
-Patch5: kbd-1.12-Meta_utf8.patch
-Patch6: kbd-1.12-nostrip.patch
-Patch7: kbd-1.12-alias.patch
-Patch8: kbd-1.12-dir.patch
-Patch9: kbd-1.12-no-user-map.patch
-Patch10: kbd-1.12-gr-el.patch
-Patch11: kbd-1.12-keycodes-man.patch
-Patch12: kbd-1.12-resizecon-x86.patch
-Patch13: kbd-1.12-trq-map.patch
-Obsoletes: console-tools open
-Provides: console-tools open
-Conflicts: util-linux < 2.11r-9
-Prereq: initscripts >= 5.86-1
-ExcludeArch: s390 s390x
+Name:           kbd
+Version:        1.15
+Release:        1%{?dist}
+Summary:        Tools for configuring the console (keyboard, virtual terminals, etc.)
+
+Group:          System Environment/Base
+License:        GPLv2+
+Source0:        http://ftp.altlinux.org/pub/people/legion/kbd/kbd-%{version}.tar.gz
+Source1:        kbd-latsun-fonts.tar.bz2
+Source2:        ro_maps.tar.bz2
+Source3:        kbd-latarcyrheb-16-fixed.tar.bz2
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Patch0:         kbd-1.15-po.patch
+Patch1:         kbd-1.15-keycodes-man.patch
+Patch2:         kbd-1.15-sparc.patch
+Patch3:         kbd-1.15-unicode_start.patch
+Patch4:         kbd-1.15-resizecon-x86_64.patch
+
+BuildRequires:  bison, flex, gettext
+Obsoletes:      console-tools open
+Provides:       console-tools open
+Conflicts:      util-linux < 2.11r-9
+Prereq:         initscripts >= 5.86-1
+ExcludeArch:    s390 s390x
 
 %description
 The %{name} package contains tools for managing a Linux
@@ -40,21 +29,12 @@
 fonts, the virtual terminals and font files.
 
 %prep
-%setup -q -a 2 -a 3 -a 4 -a 5 -a 6
-%patch0 -p1 -b .sparc
-%patch1 -p1 -b .compose
-%patch2 -p1 -b .terminal
-%patch3 -p1 -b .rukbd
-%patch4 -p1 -b .man
-%patch5 -p1 -b .Meta_utf8
-%patch6 -p1 -b .nostrip
-%patch7 -p1 -b .alias
-%patch8 -p1 -b .dir
-%patch9 -p1 -b .no-user-map
-%patch10 -p1 -b .gr-el
-%patch11 -p1 -b .keycodes-man
-%patch12 -p1 -b .resizecon-x86
-%patch13 -p1 -b .trq-map
+%setup -q -a 1 -a 2 -a 3
+%patch0 -p1 -b .po
+%patch1 -p1 -b .keycodes-man
+%patch2 -p1 -b .sparc
+%patch3 -p1 -b .unicode_start
+%patch4 -p1 -b .resizecon_x86_64
 
 # 7-bit maps are obsolete; so are non-euro maps
 pushd data/keymaps/i386
@@ -69,30 +49,17 @@
 cp azerty/fr-latin9.map azerty/fr-latin0.map # legacy alias
 popd
 
-# Default to latarcyrheb-sun16 font for unicode
-perl -pi -e 's/LatArCyrHeb-16/latarcyrheb-sun16/' src/unicode_start
-
 %build
-export OLD_PO_FILE_INPUT=yes
-
-# We don't use % {configure} because the ./configure included here does not
-# understand most of the options.
-CFLAGS="$RPM_OPT_FLAGS"; export CFLAGS
-./configure --prefix=%{_prefix} --datadir=/lib/kbd --mandir=%{_mandir}
-
-make CFLAGS="$RPM_OPT_FLAGS" LDFLAGS="-static"
+%configure --prefix=%{_prefix} --datadir=/lib/kbd --mandir=%{_mandir} --localedir=/usr/share/locale --enable-nls
+make %{?_smp_mflags} 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=
+%configure --prefix=%{_prefix} --datadir=/lib/kbd --mandir=%{_mandir} --localedir=/usr/share/locale --enable-nls
+make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-
-# Basic install.
 make install DESTDIR=$RPM_BUILD_ROOT
 
 # ro_win.map.gz is useless
@@ -106,13 +73,14 @@
 ln -s us.map.gz $RPM_BUILD_ROOT/lib/kbd/keymaps/i386/qwerty/ko.map.gz
 
 # Move binaries which we use before /usr is mounted from %{_bindir} to /bin.
+mkdir -p $RPM_BUILD_ROOT/bin
 for binary in setfont dumpkeys kbd_mode unicode_start unicode_stop ; do
-  mv $RPM_BUILD_ROOT%{_bindir}/$binary $RPM_BUILD_ROOT/bin
+  mv $RPM_BUILD_ROOT%{_bindir}/$binary $RPM_BUILD_ROOT/bin/
 done
 
 # Some microoptimization
 sed -i -e 's,\<kbd_mode\>,/bin/kbd_mode,g;s,\<setfont\>,/bin/setfont,g' \
-	$RPM_BUILD_ROOT/bin/unicode_start
+        $RPM_BUILD_ROOT/bin/unicode_start
 
 # Link open to openvt
 ln -s openvt $RPM_BUILD_ROOT%{_bindir}/open
@@ -123,20 +91,20 @@
 %find_lang %{name}
 
 %clean
-rm -rf ${RPM_BUILD_ROOT}
-
-%triggerun -- kbd < 1.08-10.2
-/sbin/chkconfig --del keytable || :
+rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
-%defattr(-,root,root)
-%doc CHANGES CREDITS README doc/kbd.FAQ*.html doc/font-formats/*.html doc/utf/utf*
+%defattr(-,root,root,-)
+%doc ChangeLog AUTHORS README doc/kbd.FAQ*.html doc/font-formats/*.html doc/utf/utf*
 /bin/*
 %{_bindir}/*
 %{_mandir}/*/*
 /lib/kbd
 
 %changelog
+* Thu Jan  8 2009 Vitezslav Crhonek <vcrhonek at redhat.com> - 1.15-1
+- Update to kbd-1.15
+
 * 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
@@ -266,7 +234,7 @@
 
 * Sat Feb 19 2005 Miloslav Trmac <mitr at redhat.com> - 1.12-4
 - Don't ship a patch backup file
-- Mention in setfont.8 that 512-glyph fonts reduce the number of available 
+- Mention in setfont.8 that 512-glyph fonts reduce the number of available
   colors (#140935, patch by Dmitry Butskoj)
 - Remove "Meta_acute" from German keymaps (#143124)
 - Make the %%triggerun script condition more precise, ignore failure of the
@@ -287,6 +255,9 @@
 * Wed Jan 14 2004 Bill Nottingham <notting at redhat.com> 1.08-12
 - remove speakup patch at request of author
 
+* Wed Jan 14 2004 Bill Nottingham <notting at redhat.com> 1.08-12
+- remove speakup patch at request of author
+
 * Fri Oct 10 2003 Bill Nottingham <notting at redhat.com> 1.08-11
 - remove keytable init script (#106783)
 
@@ -354,7 +325,7 @@
 - add back lat[02]-sun16 fonts plus latarcyrheb-sun16 font
 
 * Thu Aug 22 2002 Karsten Hopp <karsten at redhat.de>
-- needs to conflict with older util-linux packages 
+- needs to conflict with older util-linux packages
   (kbdrate moved between packages)
 
 * Tue Aug 13 2002 Bill Nottingham <notting at redhat.com> 1.06-21


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kbd/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	22 Feb 2008 09:58:17 -0000	1.14
+++ sources	8 Jan 2009 14:46:00 -0000	1.15
@@ -1,6 +1,4 @@
-069d1175b4891343b107a8ac2b4a39f6  kbd-1.12.tar.bz2
 050e1e454e9c01e22f198303d649efb8  kbd-latsun-fonts.tar.bz2
-e56c7766760c16d4c7cbc16fc722c7f9  kbd-sun12x22-fixed.tar.bz2
 06ac1d4a6c014f6de9a29222497d70c8  ro_maps.tar.bz2
-0d894c1c024f531eb6d247ecc2bc4523  terminus.tar.bz2
 884fdbb0b952b2e3e8389a0c40a3e301  kbd-latarcyrheb-16-fixed.tar.bz2
+ba3fd20e6c79e58422c3cc6b28718939  kbd-1.15.tar.gz


--- kbd-1.08-compose.patch DELETED ---


--- kbd-1.08-rukbd.patch DELETED ---


--- kbd-1.08-terminal.patch DELETED ---


--- kbd-1.12-Meta_utf8.patch DELETED ---


--- kbd-1.12-alias.patch DELETED ---


--- kbd-1.12-dir.patch DELETED ---


--- kbd-1.12-gr-el.patch DELETED ---


--- kbd-1.12-keycodes-man.patch DELETED ---


--- kbd-1.12-no-user-map.patch DELETED ---


--- kbd-1.12-nostrip.patch DELETED ---


--- kbd-1.12-resizecon-x86.patch DELETED ---


--- kbd-1.12-setfont-man.patch DELETED ---


--- kbd-1.12-sparc.patch DELETED ---


--- kbd-1.12-trq-map.patch DELETED ---


--- kbd-1.12.tar.bz2.sign DELETED ---



From atkac at fedoraproject.org  Thu Jan  8 14:47:34 2009
From: atkac at fedoraproject.org (Adam Tkac)
Date: Thu,  8 Jan 2009 14:47:34 +0000 (UTC)
Subject: rpms/bind/F-9 .cvsignore, 1.44, 1.45 bind-9.5-dlz-64bit.patch, 1.1, 
	1.2 bind.spec, 1.270, 1.271 sources, 1.53,
	1.54 bind-9.5-edns.patch, 1.4, NONE bind-9.5-recv-race.patch,
	1.1, NONE bind95-rh454783.patch, 1.1, NONE bind95-rh457175.patch,
	1.1, NONE
Message-ID: <20090108144734.14873700FD@cvs1.fedora.phx.redhat.com>

Author: atkac

Update of /cvs/pkgs/rpms/bind/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16611

Modified Files:
	.cvsignore bind-9.5-dlz-64bit.patch bind.spec sources 
Removed Files:
	bind-9.5-edns.patch bind-9.5-recv-race.patch 
	bind95-rh454783.patch bind95-rh457175.patch 
Log Message:
- 9.5.1-P1 release (CVE-2009-0025)
- patches merged
  - bind95-rh454783.patch
  - bind-9.5-recv-race.patch
  - bind-9.5-edns.patch
  - bind95-rh457175.patch



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bind/F-9/.cvsignore,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- .cvsignore	6 Aug 2008 09:59:26 -0000	1.44
+++ .cvsignore	8 Jan 2009 14:47:03 -0000	1.45
@@ -1,4 +1,4 @@
 bind-chroot.tar.bz2
 config-3.tar.bz2
 libbind-man.tar.gz
-bind-9.5.0-P2.tar.gz
+bind-9.5.1-P1.tar.gz

bind-9.5-dlz-64bit.patch:

Index: bind-9.5-dlz-64bit.patch
===================================================================
RCS file: /cvs/pkgs/rpms/bind/F-9/bind-9.5-dlz-64bit.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- bind-9.5-dlz-64bit.patch	23 Jul 2007 14:27:48 -0000	1.1
+++ bind-9.5-dlz-64bit.patch	8 Jan 2009 14:47:03 -0000	1.2
@@ -1,6 +1,6 @@
-diff -up bind-9.5.0a5/contrib/dlz/config.dlz.in.64bit bind-9.5.0a5/contrib/dlz/config.dlz.in
---- bind-9.5.0a5/contrib/dlz/config.dlz.in.64bit	2006-06-07 04:21:50.000000000 +0200
-+++ bind-9.5.0a5/contrib/dlz/config.dlz.in	2007-07-23 11:18:54.000000000 +0200
+diff -up bind-9.5.1b1/contrib/dlz/config.dlz.in.64bit bind-9.5.1b1/contrib/dlz/config.dlz.in
+--- bind-9.5.1b1/contrib/dlz/config.dlz.in.64bit	2008-06-17 06:03:31.000000000 +0200
++++ bind-9.5.1b1/contrib/dlz/config.dlz.in	2008-07-11 12:08:43.000000000 +0200
 @@ -17,6 +17,13 @@
  #
  dlzdir='${DLZ_DRIVER_DIR}'
@@ -15,29 +15,19 @@
  #
  # Private autoconf macro to simplify configuring drivers:
  #
-@@ -83,7 +90,7 @@ then
- 		if test -f $d/include/libpq-fe.h
+@@ -135,9 +142,9 @@ then
  		then
- 			use_dlz_postgres=$d/include
--			use_dlz_postgres_lib=$d/lib
-+			use_dlz_postgres_lib=$d/${target_lib}
- 			break
- 		fi
- 	done
-@@ -151,10 +158,10 @@ case "$use_dlz_mysql" in
- 	*)
- 		DLZ_ADD_DRIVER(MYSQL, dlz_mysql_driver,
- 				[-I$use_dlz_mysql/include/mysql],
--				[-L$use_dlz_mysql/lib/mysql -lmysqlclient -lz -lcrypt -lm])
-+				[-L$use_dlz_mysql/${target_lib}/mysql -lmysqlclient -lz -lcrypt -lm])
- 
- 		AC_MSG_RESULT(
--[using mysql from $use_dlz_mysql/lib/mysql and $use_dlz_mysql/include/mysql])
-+[using mysql from $use_dlz_mysql/${target_lib}/mysql and $use_dlz_mysql/include/mysql])
- 		;;
- esac
- 
-@@ -232,11 +239,11 @@ case "$use_dlz_bdb" in
+ 			use_dlz_mysql=$d
+ 			mysql_include=$d/include/mysql
+-			if test -d $d/lib/mysql
++			if test -d $d/${target_lib}/mysql
+ 			then
+-				mysql_lib=$d/lib/mysql
++				mysql_lib=$d/${target_lib}/mysql
+ 			else
+ 				mysql_lib=$d/lib
+ 			fi
+@@ -274,11 +281,11 @@ case "$use_dlz_bdb" in
  			bdb_libnames="db42 db-4.2 db41 db-4.1 db"
  			for d in $bdb_libnames
  			do
@@ -51,7 +41,7 @@
  					else
  						dlz_bdb_libs=""
  					fi
-@@ -341,10 +348,10 @@ case "$use_dlz_ldap" in
+@@ -383,7 +390,7 @@ case "$use_dlz_ldap" in
  	*)
  		DLZ_ADD_DRIVER(LDAP, dlz_ldap_driver,
  				[-I$use_dlz_ldap/include],
@@ -59,12 +49,8 @@
 +				[-L$use_dlz_ldap/${target_lib} -lldap -llber])
  
  		AC_MSG_RESULT(
--[using LDAP from $use_dlz_ldap/lib and $use_dlz_ldap/include])
-+[using LDAP from $use_dlz_ldap/${target_lib} and $use_dlz_ldap/include])
- 		;;
- esac
- 
-@@ -365,7 +372,7 @@ then
+ [using LDAP from $use_dlz_ldap/lib and $use_dlz_ldap/include])
+@@ -407,7 +414,7 @@ then
  	odbcdirs="/usr /usr/local /usr/pkg"
  	for d in $odbcdirs
  	do
@@ -73,7 +59,7 @@
  		then
  			use_dlz_odbc=$d
  			break
-@@ -385,7 +392,7 @@ case "$use_dlz_odbc" in
+@@ -427,7 +434,7 @@ case "$use_dlz_odbc" in
  	*)
  		DLZ_ADD_DRIVER(ODBC, dlz_odbc_driver,
  				[-I$use_dlz_odbc/include],


Index: bind.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bind/F-9/bind.spec,v
retrieving revision 1.270
retrieving revision 1.271
diff -u -r1.270 -r1.271
--- bind.spec	3 Dec 2008 12:21:13 -0000	1.270
+++ bind.spec	8 Jan 2009 14:47:03 -0000	1.271
@@ -2,7 +2,7 @@
 #               Red Hat BIND package .spec file
 #
 
-%define PATCHVER P2
+%define PATCHVER P1
 %define VERSION %{version}-%{PATCHVER}
 %define _default_patch_fuzz 2
 
@@ -19,8 +19,8 @@
 Summary: 	The Berkeley Internet Name Domain (BIND) DNS (Domain Name System) server
 Name: 		bind
 License: 	ISC
-Version: 	9.5.0
-Release: 	35.1.%{PATCHVER}%{?dist}
+Version: 	9.5.1
+Release: 	1.%{PATCHVER}%{?dist}
 Epoch:   	32
 Url: 		http://www.isc.org/products/BIND/
 Buildroot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -59,10 +59,6 @@
 Patch71:	bind-9.5-overflow.patch
 Patch72:	bind-9.5-dlz-64bit.patch
 Patch87:	bind-9.5-parallel-build.patch
-Patch91:	bind-9.5-recv-race.patch
-Patch92:	bind-9.5-edns.patch
-Patch94:	bind95-rh457175.patch
-Patch95:	bind95-rh454783.patch
 Patch96:	bind-95-rh452060.patch
 
 # SDB patches
@@ -186,7 +182,6 @@
 %patch5 -p1 -b .nonexec
 %patch10 -p1 -b .PIE
 %patch16 -p1 -b .redhat_doc
-%patch95 -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
-%patch91 -p1 -b .recv-race
-%patch92 -p1 -b .edns
-%patch94 -p1 -b .rh457175
 %patch96 -p1 -b .rh452060
 
 # Sparc and s390 arches need to use -fPIE                                                           
@@ -659,6 +651,14 @@
 %{_sbindir}/bind-chroot-admin
 
 %changelog
+* Thu Jan 08 2009 Adam Tkac <atkac redhat com> 32:9.5.1-1.P1
+- 9.5.1-P1 release (CVE-2009-0025)
+- patches merged
+  - bind95-rh454783.patch
+  - bind-9.5-recv-race.patch
+  - bind-9.5-edns.patch
+  - bind95-rh457175.patch
+
 * Tue Dec 02 2008 Adam Tkac <atkac redhat com> 32:9.5.0-35.1.P2
 - fixed rare use-after-free problem in host utility (#452060)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bind/F-9/sources,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- sources	6 Aug 2008 09:59:26 -0000	1.53
+++ sources	8 Jan 2009 14:47:03 -0000	1.54
@@ -1,4 +1,4 @@
 4faa4395b955e5f8a3d50f308b9fabc8  bind-chroot.tar.bz2
 d4bc7234a0d7b93328335ed9c076c6e9  config-3.tar.bz2
 13fef79f99fcefebb51d84b08805de51  libbind-man.tar.gz
-16c893f73a394c8cc36d7900cb9bb801  bind-9.5.0-P2.tar.gz
+8afc7f95f4fad1eaaba09596617b8089  bind-9.5.1-P1.tar.gz


--- bind-9.5-edns.patch DELETED ---


--- bind-9.5-recv-race.patch DELETED ---


--- bind95-rh454783.patch DELETED ---


--- bind95-rh457175.patch DELETED ---



From lkundrak at fedoraproject.org  Thu Jan  8 14:49:52 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Thu,  8 Jan 2009 14:49:52 +0000 (UTC)
Subject: rpms/teeworlds/F-9 teeworlds-datadir.patch, NONE,
	1.1 teeworlds-extlibs.patch, NONE, 1.1 teeworlds.desktop, NONE,
	1.1 teeworlds.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090108144952.9AC6C700FD@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/teeworlds/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17025/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	teeworlds-datadir.patch teeworlds-extlibs.patch 
	teeworlds.desktop teeworlds.spec 
Log Message:
Import teeworlds

teeworlds-datadir.patch:

--- NEW FILE teeworlds-datadir.patch ---
diff -Naur teeworlds-0.4.3-src.old/datasrc/data.ds teeworlds-0.4.3-src/datasrc/data.ds
--- teeworlds-0.4.3-src.old/datasrc/data.ds	2008-08-31 15:30:59.000000000 +0200
+++ teeworlds-0.4.3-src/datasrc/data.ds	2008-11-04 18:45:37.000000000 +0100
@@ -1,228 +1,228 @@
 sounds {
 	gun_fire {
-		"data/audio/wp_gun_fire-01.wv"
-		"data/audio/wp_gun_fire-02.wv"
-		"data/audio/wp_gun_fire-03.wv"
+		"/usr/share/teeworlds/audio/wp_gun_fire-01.wv"
+		"/usr/share/teeworlds/audio/wp_gun_fire-02.wv"
+		"/usr/share/teeworlds/audio/wp_gun_fire-03.wv"
 	}
 
 	shotgun_fire {
-		"data/audio/wp_shotty_fire-01.wv"
-		"data/audio/wp_shotty_fire-02.wv"
-		"data/audio/wp_shotty_fire-03.wv"
+		"/usr/share/teeworlds/audio/wp_shotty_fire-01.wv"
+		"/usr/share/teeworlds/audio/wp_shotty_fire-02.wv"
+		"/usr/share/teeworlds/audio/wp_shotty_fire-03.wv"
 	}
 	
 	grenade_fire {
-		"data/audio/wp_flump_launch-01.wv"
-		"data/audio/wp_flump_launch-02.wv"
-		"data/audio/wp_flump_launch-03.wv"
+		"/usr/share/teeworlds/audio/wp_flump_launch-01.wv"
+		"/usr/share/teeworlds/audio/wp_flump_launch-02.wv"
+		"/usr/share/teeworlds/audio/wp_flump_launch-03.wv"
 	}
 	
 	hammer_fire {
-		"data/audio/wp_hammer_swing-01.wv"
-		"data/audio/wp_hammer_swing-02.wv"
-		"data/audio/wp_hammer_swing-03.wv"
+		"/usr/share/teeworlds/audio/wp_hammer_swing-01.wv"
+		"/usr/share/teeworlds/audio/wp_hammer_swing-02.wv"
+		"/usr/share/teeworlds/audio/wp_hammer_swing-03.wv"
 	}
 
 	hammer_hit {
-		"data/audio/wp_hammer_hit-01.wv"
-		"data/audio/wp_hammer_hit-02.wv"
-		"data/audio/wp_hammer_hit-03.wv"
+		"/usr/share/teeworlds/audio/wp_hammer_hit-01.wv"
+		"/usr/share/teeworlds/audio/wp_hammer_hit-02.wv"
+		"/usr/share/teeworlds/audio/wp_hammer_hit-03.wv"
 	}
 	
 	ninja_fire { 
-		"data/audio/wp_ninja_attack-01.wv"
-		"data/audio/wp_ninja_attack-02.wv"
-		"data/audio/wp_ninja_attack-03.wv"
+		"/usr/share/teeworlds/audio/wp_ninja_attack-01.wv"
+		"/usr/share/teeworlds/audio/wp_ninja_attack-02.wv"
+		"/usr/share/teeworlds/audio/wp_ninja_attack-03.wv"
 	}
 
 	grenade_explode {
-		"data/audio/wp_flump_explo-01.wv"
-		"data/audio/wp_flump_explo-02.wv"
-		"data/audio/wp_flump_explo-03.wv"
+		"/usr/share/teeworlds/audio/wp_flump_explo-01.wv"
+		"/usr/share/teeworlds/audio/wp_flump_explo-02.wv"
+		"/usr/share/teeworlds/audio/wp_flump_explo-03.wv"
 	}
 	
 	ninja_hit {
-		"data/audio/wp_ninja_hit-01.wv"
-		"data/audio/wp_ninja_hit-02.wv"
-		"data/audio/wp_ninja_hit-03.wv"
+		"/usr/share/teeworlds/audio/wp_ninja_hit-01.wv"
+		"/usr/share/teeworlds/audio/wp_ninja_hit-02.wv"
+		"/usr/share/teeworlds/audio/wp_ninja_hit-03.wv"
 	}
 	
 	rifle_fire {
-		"data/audio/wp_rifle_fire-01.wv"
-		"data/audio/wp_rifle_fire-02.wv"
-		"data/audio/wp_rifle_fire-03.wv"
+		"/usr/share/teeworlds/audio/wp_rifle_fire-01.wv"
+		"/usr/share/teeworlds/audio/wp_rifle_fire-02.wv"
+		"/usr/share/teeworlds/audio/wp_rifle_fire-03.wv"
 	}
 
 	rifle_bounce {
-		"data/audio/wp_rifle_bnce-01.wv"
-		"data/audio/wp_rifle_bnce-02.wv"
-		"data/audio/wp_rifle_bnce-03.wv"
+		"/usr/share/teeworlds/audio/wp_rifle_bnce-01.wv"
+		"/usr/share/teeworlds/audio/wp_rifle_bnce-02.wv"
+		"/usr/share/teeworlds/audio/wp_rifle_bnce-03.wv"
 	}
 
 	weapon_switch { 
-		"data/audio/wp_switch-01.wv"
-		"data/audio/wp_switch-02.wv"
-		"data/audio/wp_switch-03.wv"
+		"/usr/share/teeworlds/audio/wp_switch-01.wv"
+		"/usr/share/teeworlds/audio/wp_switch-02.wv"
+		"/usr/share/teeworlds/audio/wp_switch-03.wv"
 	}
 
 	player_pain_short {
-		"data/audio/vo_teefault_pain_short-01.wv"
-		"data/audio/vo_teefault_pain_short-02.wv"
-		"data/audio/vo_teefault_pain_short-03.wv"
-		"data/audio/vo_teefault_pain_short-04.wv"
-		"data/audio/vo_teefault_pain_short-05.wv"
-		"data/audio/vo_teefault_pain_short-06.wv"
-		"data/audio/vo_teefault_pain_short-07.wv"
-		"data/audio/vo_teefault_pain_short-08.wv"
-		"data/audio/vo_teefault_pain_short-09.wv"
-		"data/audio/vo_teefault_pain_short-10.wv"
-		"data/audio/vo_teefault_pain_short-11.wv"
-		"data/audio/vo_teefault_pain_short-12.wv"
+		"/usr/share/teeworlds/audio/vo_teefault_pain_short-01.wv"
+		"/usr/share/teeworlds/audio/vo_teefault_pain_short-02.wv"
+		"/usr/share/teeworlds/audio/vo_teefault_pain_short-03.wv"
+		"/usr/share/teeworlds/audio/vo_teefault_pain_short-04.wv"
+		"/usr/share/teeworlds/audio/vo_teefault_pain_short-05.wv"
+		"/usr/share/teeworlds/audio/vo_teefault_pain_short-06.wv"
+		"/usr/share/teeworlds/audio/vo_teefault_pain_short-07.wv"
+		"/usr/share/teeworlds/audio/vo_teefault_pain_short-08.wv"
+		"/usr/share/teeworlds/audio/vo_teefault_pain_short-09.wv"
+		"/usr/share/teeworlds/audio/vo_teefault_pain_short-10.wv"
+		"/usr/share/teeworlds/audio/vo_teefault_pain_short-11.wv"
+		"/usr/share/teeworlds/audio/vo_teefault_pain_short-12.wv"
 	}
 
 	player_pain_long {
-		"data/audio/vo_teefault_pain_long-01.wv"
-		"data/audio/vo_teefault_pain_long-02.wv"
+		"/usr/share/teeworlds/audio/vo_teefault_pain_long-01.wv"
+		"/usr/share/teeworlds/audio/vo_teefault_pain_long-02.wv"
 	}
 
 	body_land {
-		"data/audio/foley_land-01.wv"
-		"data/audio/foley_land-02.wv"
-		"data/audio/foley_land-03.wv"
-		"data/audio/foley_land-04.wv"
+		"/usr/share/teeworlds/audio/foley_land-01.wv"
+		"/usr/share/teeworlds/audio/foley_land-02.wv"
+		"/usr/share/teeworlds/audio/foley_land-03.wv"
+		"/usr/share/teeworlds/audio/foley_land-04.wv"
 	}
 	
 	player_airjump {
-		"data/audio/foley_dbljump-01.wv"
-		"data/audio/foley_dbljump-02.wv"
-		"data/audio/foley_dbljump-03.wv"
+		"/usr/share/teeworlds/audio/foley_dbljump-01.wv"
+		"/usr/share/teeworlds/audio/foley_dbljump-02.wv"
+		"/usr/share/teeworlds/audio/foley_dbljump-03.wv"
 	}
 
 	player_jump {
-		"data/audio/foley_foot_left-01.wv"
-		"data/audio/foley_foot_left-02.wv"
-		"data/audio/foley_foot_left-03.wv"
-		"data/audio/foley_foot_left-04.wv"
-		"data/audio/foley_foot_right-01.wv"
-		"data/audio/foley_foot_right-02.wv"
-		"data/audio/foley_foot_right-03.wv"
-		"data/audio/foley_foot_right-04.wv"
+		"/usr/share/teeworlds/audio/foley_foot_left-01.wv"
+		"/usr/share/teeworlds/audio/foley_foot_left-02.wv"
+		"/usr/share/teeworlds/audio/foley_foot_left-03.wv"
+		"/usr/share/teeworlds/audio/foley_foot_left-04.wv"
+		"/usr/share/teeworlds/audio/foley_foot_right-01.wv"
+		"/usr/share/teeworlds/audio/foley_foot_right-02.wv"
+		"/usr/share/teeworlds/audio/foley_foot_right-03.wv"
+		"/usr/share/teeworlds/audio/foley_foot_right-04.wv"
 	}
 
 	player_die {
-		"data/audio/foley_body_splat-02.wv"
-		"data/audio/foley_body_splat-03.wv"
-		"data/audio/foley_body_splat-04.wv"
+		"/usr/share/teeworlds/audio/foley_body_splat-02.wv"
+		"/usr/share/teeworlds/audio/foley_body_splat-03.wv"
+		"/usr/share/teeworlds/audio/foley_body_splat-04.wv"
 	}
 	
 	player_spawn {
-		"data/audio/vo_teefault_spawn-01.wv"
-		"data/audio/vo_teefault_spawn-02.wv"
-		"data/audio/vo_teefault_spawn-03.wv"
-		"data/audio/vo_teefault_spawn-04.wv"
-		"data/audio/vo_teefault_spawn-05.wv"
-		"data/audio/vo_teefault_spawn-06.wv"
-		"data/audio/vo_teefault_spawn-07.wv"
+		"/usr/share/teeworlds/audio/vo_teefault_spawn-01.wv"
+		"/usr/share/teeworlds/audio/vo_teefault_spawn-02.wv"
+		"/usr/share/teeworlds/audio/vo_teefault_spawn-03.wv"
+		"/usr/share/teeworlds/audio/vo_teefault_spawn-04.wv"
+		"/usr/share/teeworlds/audio/vo_teefault_spawn-05.wv"
+		"/usr/share/teeworlds/audio/vo_teefault_spawn-06.wv"
+		"/usr/share/teeworlds/audio/vo_teefault_spawn-07.wv"
 	}
 	
 	player_skid {
-		"data/audio/sfx_skid-01.wv"
-		"data/audio/sfx_skid-02.wv"
-		"data/audio/sfx_skid-03.wv"
-		"data/audio/sfx_skid-04.wv"
+		"/usr/share/teeworlds/audio/sfx_skid-01.wv"
+		"/usr/share/teeworlds/audio/sfx_skid-02.wv"
+		"/usr/share/teeworlds/audio/sfx_skid-03.wv"
+		"/usr/share/teeworlds/audio/sfx_skid-04.wv"
 	}
 
 	tee_cry {
-		"data/audio/vo_teefault_cry-01.wv"
-		"data/audio/vo_teefault_cry-02.wv"
+		"/usr/share/teeworlds/audio/vo_teefault_cry-01.wv"
+		"/usr/share/teeworlds/audio/vo_teefault_cry-02.wv"
 	}
 
 	hook_loop { 
-		"data/audio/hook_loop-01.wv"
-		"data/audio/hook_loop-02.wv"
+		"/usr/share/teeworlds/audio/hook_loop-01.wv"
+		"/usr/share/teeworlds/audio/hook_loop-02.wv"
 	}
 	
 	hook_attach_ground {
-		"data/audio/hook_attach-01.wv"
-		"data/audio/hook_attach-02.wv"
-		"data/audio/hook_attach-03.wv"
+		"/usr/share/teeworlds/audio/hook_attach-01.wv"
+		"/usr/share/teeworlds/audio/hook_attach-02.wv"
+		"/usr/share/teeworlds/audio/hook_attach-03.wv"
 	}
 	
 	hook_attach_player {
-		"data/audio/foley_body_impact-01.wv"
-		"data/audio/foley_body_impact-02.wv"
-		"data/audio/foley_body_impact-03.wv"
+		"/usr/share/teeworlds/audio/foley_body_impact-01.wv"
+		"/usr/share/teeworlds/audio/foley_body_impact-02.wv"
+		"/usr/share/teeworlds/audio/foley_body_impact-03.wv"
 	}
 		
 	pickup_health {
-		"data/audio/sfx_pickup_hrt-01.wv"
-		"data/audio/sfx_pickup_hrt-02.wv"
+		"/usr/share/teeworlds/audio/sfx_pickup_hrt-01.wv"
+		"/usr/share/teeworlds/audio/sfx_pickup_hrt-02.wv"
 	}
 	
 	pickup_armor {
-		"data/audio/sfx_pickup_arm-01.wv"
-		"data/audio/sfx_pickup_arm-02.wv"
-		"data/audio/sfx_pickup_arm-03.wv"
-		"data/audio/sfx_pickup_arm-04.wv"
+		"/usr/share/teeworlds/audio/sfx_pickup_arm-01.wv"
+		"/usr/share/teeworlds/audio/sfx_pickup_arm-02.wv"
+		"/usr/share/teeworlds/audio/sfx_pickup_arm-03.wv"
+		"/usr/share/teeworlds/audio/sfx_pickup_arm-04.wv"
 	}
 	
 	pickup_grenade {
-		"data/audio/sfx_pickup_launcher.wv"
+		"/usr/share/teeworlds/audio/sfx_pickup_launcher.wv"
 	}
 	
 	pickup_shotgun {
-		"data/audio/sfx_pickup_sg.wv"
+		"/usr/share/teeworlds/audio/sfx_pickup_sg.wv"
 	}
 	
 	pickup_ninja {
-		"data/audio/sfx_pickup_ninja.wv"
+		"/usr/share/teeworlds/audio/sfx_pickup_ninja.wv"
 	}
 		
 	weapon_spawn {
-		"data/audio/sfx_spawn_wpn-01.wv"
-		"data/audio/sfx_spawn_wpn-02.wv"
-		"data/audio/sfx_spawn_wpn-03.wv"
+		"/usr/share/teeworlds/audio/sfx_spawn_wpn-01.wv"
+		"/usr/share/teeworlds/audio/sfx_spawn_wpn-02.wv"
+		"/usr/share/teeworlds/audio/sfx_spawn_wpn-03.wv"
 	}
 
 	weapon_noammo {
-		"data/audio/wp_noammo-01.wv"
-		"data/audio/wp_noammo-02.wv"
-		"data/audio/wp_noammo-03.wv"
-		"data/audio/wp_noammo-04.wv"
-		"data/audio/wp_noammo-05.wv"
+		"/usr/share/teeworlds/audio/wp_noammo-01.wv"
+		"/usr/share/teeworlds/audio/wp_noammo-02.wv"
+		"/usr/share/teeworlds/audio/wp_noammo-03.wv"
+		"/usr/share/teeworlds/audio/wp_noammo-04.wv"
+		"/usr/share/teeworlds/audio/wp_noammo-05.wv"
 	}
 
 	hit {
-		"data/audio/sfx_hit_weak-01.wv"
-		"data/audio/sfx_hit_weak-02.wv"
+		"/usr/share/teeworlds/audio/sfx_hit_weak-01.wv"
+		"/usr/share/teeworlds/audio/sfx_hit_weak-02.wv"
 	}
 
 	chat_server {
-		"data/audio/sfx_msg-server.wv"
+		"/usr/share/teeworlds/audio/sfx_msg-server.wv"
 	}
 	
 	chat_client {
-		"data/audio/sfx_msg-client.wv"
+		"/usr/share/teeworlds/audio/sfx_msg-client.wv"
 	}
 
 	ctf_drop {
-		"data/audio/sfx_ctf_drop.wv"
+		"/usr/share/teeworlds/audio/sfx_ctf_drop.wv"
 	}
 
 	ctf_return {
-		"data/audio/sfx_ctf_rtn.wv"
+		"/usr/share/teeworlds/audio/sfx_ctf_rtn.wv"
 	}
 	
 	ctf_grab_pl {
-		"data/audio/sfx_ctf_grab_pl.wv"
+		"/usr/share/teeworlds/audio/sfx_ctf_grab_pl.wv"
 	}
 
 	ctf_grab_en {
-		"data/audio/sfx_ctf_grab_en.wv"
+		"/usr/share/teeworlds/audio/sfx_ctf_grab_en.wv"
 	}
 
 	ctf_capture {
-		"data/audio/sfx_ctf_cap_pl.wv"
+		"/usr/share/teeworlds/audio/sfx_ctf_cap_pl.wv"
 	}
 }
 
@@ -233,34 +233,34 @@
 	}
 
 	game {
-		filename "data/game.png"
+		filename "/usr/share/teeworlds/game.png"
 	}
 
 	particles {
-		filename "data/particles.png"
+		filename "/usr/share/teeworlds/particles.png"
 	}
 
 	cursor {
-		filename "data/gui_cursor.png"
+		filename "/usr/share/teeworlds/gui_cursor.png"
 	}
 
 	banner {
-		filename "data/gui_logo.png"
+		filename "/usr/share/teeworlds/gui_logo.png"
 	}
 
 	emoticons {
-		filename "data/emoticons.png"
+		filename "/usr/share/teeworlds/emoticons.png"
 	}
 	
 	browseicons {
-		filename "data/browse_icons.png"
+		filename "/usr/share/teeworlds/browse_icons.png"
 	}
 
 	console_bg {
-		filename "data/console.png"
+		filename "/usr/share/teeworlds/console.png"
 	}
 	console_bar {
-		filename "data/console_bar.png"
+		filename "/usr/share/teeworlds/console_bar.png"
 	}
 }
 
diff -Naur teeworlds-0.4.3-src.old/src/game/client/gc_hooks.cpp teeworlds-0.4.3-src/src/game/client/gc_hooks.cpp
--- teeworlds-0.4.3-src.old/src/game/client/gc_hooks.cpp	2008-08-31 15:30:59.000000000 +0200
+++ teeworlds-0.4.3-src/src/game/client/gc_hooks.cpp	2008-11-04 18:45:37.000000000 +0100
@@ -68,7 +68,7 @@
 	
 	
 	int before = gfx_memory_usage();
-	font_set_load(&default_font, "data/fonts/default_font%d.tfnt", "data/fonts/default_font%d.png", "data/fonts/default_font%d_b.png", 14, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 36);
+	font_set_load(&default_font, "/usr/share/teeworlds/fonts/default_font%d.tfnt", "/usr/share/teeworlds/fonts/default_font%d.png", "/usr/share/teeworlds/fonts/default_font%d_b.png", 14, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 36);
 	dbg_msg("font", "gfx memory used for font textures: %d", gfx_memory_usage()-before);
 	
 	gfx_text_set_default_font(&default_font);
diff -Naur teeworlds-0.4.3-src.old/src/game/client/gc_map_image.cpp teeworlds-0.4.3-src/src/game/client/gc_map_image.cpp
--- teeworlds-0.4.3-src.old/src/game/client/gc_map_image.cpp	2008-08-31 15:30:59.000000000 +0200
+++ teeworlds-0.4.3-src/src/game/client/gc_map_image.cpp	2008-11-04 18:45:37.000000000 +0100
@@ -110,7 +110,7 @@
 		{
 			char buf[256];
 			char *name = (char *)map_get_data(img->image_name);
-			str_format(buf, sizeof(buf), "data/mapres/%s.png", name);
+			str_format(buf, sizeof(buf), "/usr/share/teeworlds/mapres/%s.png", name);
 			map_textures[i] = gfx_load_texture(buf, IMG_AUTO, 0);
 		}
 		else
diff -Naur teeworlds-0.4.3-src.old/src/game/client/gc_skin.cpp teeworlds-0.4.3-src/src/game/client/gc_skin.cpp
--- teeworlds-0.4.3-src.old/src/game/client/gc_skin.cpp	2008-08-31 15:30:58.000000000 +0200
+++ teeworlds-0.4.3-src/src/game/client/gc_skin.cpp	2008-11-04 18:45:37.000000000 +0100
@@ -24,7 +24,7 @@
 		return;
 		
 	char buf[512];
-	str_format(buf, sizeof(buf), "data/skins/%s", name);
+	str_format(buf, sizeof(buf), "/usr/share/teeworlds/skins/%s", name);
 	IMAGE_INFO info;
 	if(!gfx_load_png(&info, buf))
 	{
@@ -118,7 +118,7 @@
 void skin_init()
 {
 	// load skins
-	fs_listdir("data/skins", skinscan, 0);
+	fs_listdir("/usr/share/teeworlds/skins", skinscan, 0);
 }
 
 int skin_num()
diff -Naur teeworlds-0.4.3-src.old/src/game/editor/ed_editor.cpp teeworlds-0.4.3-src/src/game/editor/ed_editor.cpp
--- teeworlds-0.4.3-src.old/src/game/editor/ed_editor.cpp	2008-08-31 15:30:58.000000000 +0200
+++ teeworlds-0.4.3-src/src/game/editor/ed_editor.cpp	2008-11-04 18:45:37.000000000 +0100
@@ -422,11 +422,11 @@
 	
 	// ctrl+o to open
 	if(inp_key_down('O') && (inp_key_pressed(KEY_LCTRL) || inp_key_pressed(KEY_RCTRL)))
-		editor.invoke_file_dialog("Open Map", "Open", "data/maps/", "", callback_open_map);
+		editor.invoke_file_dialog("Open Map", "Open", "/usr/share/teeworlds/maps/", "", callback_open_map);
 	
 	// ctrl+s to save
 	if(inp_key_down('S') && (inp_key_pressed(KEY_LCTRL) || inp_key_pressed(KEY_RCTRL)))
-		editor.invoke_file_dialog("Save Map", "Save", "data/maps/", "", callback_save_map);
+		editor.invoke_file_dialog("Save Map", "Save", "/usr/share/teeworlds/maps/", "", callback_save_map);
 
 	// animate button
 	ui_vsplit_l(&toolbar, 30.0f, &button, &toolbar);
@@ -1551,7 +1551,7 @@
 	ui_hsplit_t(&view, 12.0f, &slot, &view);
 	if(do_editor_button(&replace_button, "Replace", 0, &slot, draw_editor_button_menuitem, 0, "Replaces the image with a new one"))
 	{
-		editor.invoke_file_dialog("Replace Image", "Replace", "data/mapres/", "", replace_image);
+		editor.invoke_file_dialog("Replace Image", "Replace", "/usr/share/teeworlds/mapres/", "", replace_image);
 		return 1;
 	}
 
@@ -1632,7 +1632,7 @@
 	ui_hsplit_t(&toolbox, 10.0f, &slot, &toolbox);
 	ui_hsplit_t(&toolbox, 12.0f, &slot, &toolbox);
 	if(do_editor_button(&new_image_button, "Add", 0, &slot, draw_editor_button, 0, "Load a new image to use in the map"))
-		editor.invoke_file_dialog("Add Image", "Add", "data/mapres/", "", add_image);
+		editor.invoke_file_dialog("Add Image", "Add", "/usr/share/teeworlds/mapres/", "", add_image);
 }
 
 
@@ -2168,7 +2168,7 @@
 	ui_hsplit_t(&view, 12.0f, &slot, &view);
 	if(do_editor_button(&open_button, "Open", 0, &slot, draw_editor_button_menuitem, 0, "Opens a map for editing"))
 	{
-		editor.invoke_file_dialog("Open Map", "Open", "data/maps/", "", callback_open_map);
+		editor.invoke_file_dialog("Open Map", "Open", "/usr/share/teeworlds/maps/", "", callback_open_map);
 		return 1;
 	}
 
@@ -2176,7 +2176,7 @@
 	ui_hsplit_t(&view, 12.0f, &slot, &view);
 	if(do_editor_button(&append_button, "Append", 0, &slot, draw_editor_button_menuitem, 0, "Opens a map and adds everything from that map to the current one"))
 	{
-		editor.invoke_file_dialog("Append Map", "Append", "data/maps/", "", callback_append_map);
+		editor.invoke_file_dialog("Append Map", "Append", "/usr/share/teeworlds/maps/", "", callback_append_map);
 		return 1;
 	}
 
@@ -2191,7 +2191,7 @@
 	ui_hsplit_t(&view, 12.0f, &slot, &view);
 	if(do_editor_button(&save_as_button, "Save As", 0, &slot, draw_editor_button_menuitem, 0, "Saves the current map under a new name"))
 	{
-		editor.invoke_file_dialog("Save Map", "Save", "data/maps/", "", callback_save_map);
+		editor.invoke_file_dialog("Save Map", "Save", "/usr/share/teeworlds/maps/", "", callback_save_map);
 		return 1;
 	}
 		
@@ -2402,10 +2402,10 @@
 
 extern "C" void editor_init()
 {
-	checker_texture = gfx_load_texture("data/editor/checker.png", IMG_AUTO, 0);
-	background_texture = gfx_load_texture("data/editor/background.png", IMG_AUTO, 0);
-	cursor_texture = gfx_load_texture("data/editor/cursor.png", IMG_AUTO, 0);
-	entities_texture = gfx_load_texture("data/editor/entities.png", IMG_AUTO, 0);
+	checker_texture = gfx_load_texture("/usr/share/teeworlds/editor/checker.png", IMG_AUTO, 0);
+	background_texture = gfx_load_texture("/usr/share/teeworlds/editor/background.png", IMG_AUTO, 0);
+	cursor_texture = gfx_load_texture("/usr/share/teeworlds/editor/cursor.png", IMG_AUTO, 0);
+	entities_texture = gfx_load_texture("/usr/share/teeworlds/editor/entities.png", IMG_AUTO, 0);
 	
 	tileset_picker.make_palette();
 	tileset_picker.readonly = true;
@@ -2478,13 +2478,13 @@
 		editor.gui_active = !editor.gui_active;
 
 	if(inp_key_down(KEY_F5))
-		editor.save("data/maps/debug_test2.map");
+		editor.save("/usr/share/teeworlds/maps/debug_test2.map");
 
 	if(inp_key_down(KEY_F6))
-		editor.load("data/maps/debug_test2.map");
+		editor.load("/usr/share/teeworlds/maps/debug_test2.map");
 	
 	if(inp_key_down(KEY_F8))
-		editor.load("data/maps/debug_test.map");
+		editor.load("/usr/share/teeworlds/maps/debug_test.map");
 	
 	if(inp_key_down(KEY_F10))
 		editor.show_mouse_pointer = false;
diff -Naur teeworlds-0.4.3-src.old/src/game/editor/ed_io.cpp teeworlds-0.4.3-src/src/game/editor/ed_io.cpp
--- teeworlds-0.4.3-src.old/src/game/editor/ed_io.cpp	2008-08-31 15:30:58.000000000 +0200
+++ teeworlds-0.4.3-src/src/game/editor/ed_io.cpp	2008-11-04 18:45:37.000000000 +0100
@@ -398,7 +398,7 @@
 				if(item->external)
 				{
 					char buf[256];
-					sprintf(buf, "data/mapres/%s.png", name);
+					sprintf(buf, "/usr/share/teeworlds/mapres/%s.png", name);
 					
 					// load external
 					IMAGE imginfo;

teeworlds-extlibs.patch:

--- NEW FILE teeworlds-extlibs.patch ---
* Do not use bundled libraries, link against Fedora-packaged ones
* Substitute compiler flags with a magic string, so we can sed it in SPEC file
  - Is there a way to pass BAM parameters? I guess not.
  - The magic string is "-D__OPTFLAGS__", which is useful to compile this without sedding

Lubomir Rintel <lkundrak at v3.sk>

diff -up teeworlds-0.4.3-src/default.bam.extlibs teeworlds-0.4.3-src/default.bam
--- teeworlds-0.4.3-src/default.bam.extlibs	2008-08-31 15:30:59.000000000 +0200
+++ teeworlds-0.4.3-src/default.bam	2009-01-08 15:43:48.000000000 +0100
@@ -214,7 +214,7 @@ function build(settings)
 
 	-- set some platform specific settings
 	settings.cc.includes:add("src")
-	settings.cc.includes:add("src/external/zlib")
+	--# settings.cc.includes:add("src/external/zlib")
 
 	if family == "unix" then
    		if platform == "macosx" then
@@ -232,6 +232,7 @@ function build(settings)
 			end
 			
 			settings.linker.libs:add("pthread")
+			settings.linker.libs:add("z")
 		end
 	elseif family == "windows" then
 		glfw_platform = "win32"
@@ -245,28 +246,31 @@ function build(settings)
 	end
 	
 	-- build glfw
-	glfw_settings = settings:copy()
-	glfw_settings.cc.includes:add("src/external/glfw/include")
-	glfw_settings.cc.includes:add("src/engine/external/glfw/lib")
-	glfw_settings.cc.includes:add("src/engine/external/glfw/lib/" .. glfw_platform)
-
-	glfw = Compile(glfw_settings, Collect(
-		"src/engine/external/glfw/lib/*.c",
-		"src/engine/external/glfw/lib/" .. glfw_platform .. "/*.c"))
+	--#plfw_settings = settings:copy()
+	--#plfw_settings.cc.includes:add("src/external/glfw/include")
+	--#plfw_settings.cc.includes:add("src/engine/external/glfw/lib")
+	--#plfw_settings.cc.includes:add("src/engine/external/glfw/lib/" .. glfw_platform)
+
+	--#plfw = Compile(glfw_settings, Collect(
+	--#	"src/en--#pine/external/glfw/lib/*.c",
+	--#	"src/en--#pine/external/glfw/lib/" .. glfw_platform .. "/*.c"))
 		
 	-- build portaudio
-	pa_settings = settings:copy()
-	pa_settings.cc.defines:add("PA_USE_" .. string.upper(pa_hostapi))
-	pa_settings.cc.defines:add("PA_NO_WMME")
-	pa_settings.cc.defines:add("PA_NO_ASIO")
-	pa_settings.cc.includes:add("src/engine/external/portaudio/include")
-	pa_settings.cc.includes:add("src/engine/external/portaudio/src/common")
-	pa_settings.cc.includes:add("src/engine/external/portaudio/src/os/" .. pa_platform)
-	
-	portaudio = Compile(pa_settings,
-		Collect("src/engine/external/portaudio/src/common/*.c"),
-		Collect("src/engine/external/portaudio/src/os/" .. pa_platform .. "/*.c"),
-		Collect("src/engine/external/portaudio/src/hostapi/" .. pa_hostapi .. "/*.c"))
+	--#pa_settings = settings:copy()
+	--#pa_settings.cc.defines:add("PA_USE_" .. string.upper(pa_hostapi))
+	--#pa_settings.cc.defines:add("PA_NO_WMME")
+	--#pa_settings.cc.defines:add("PA_NO_ASIO")
+	--#pa_settings.cc.includes:add("src/engine/external/portaudio/include")
+	--#pa_settings.cc.includes:add("src/engine/external/portaudio/src/common")
+	--#pa_settings.cc.includes:add("src/engine/external/portaudio/src/os/" .. pa_platform)
+	
+	--#portaudio = Compile(pa_settings,
+	--#	Collect("src/engine/external/portaudio/src/common/*.c"),
+	--#	Collect("src/engine/external/portaudio/src/os/" .. pa_platform .. "/*.c"),
+	--#	Collect("src/engine/external/portaudio/src/hostapi/" .. pa_hostapi .. "/*.c"))
+
+	settings.cc.flags = "-D__OPTFLAGS__"
+	settings.linker.flags = "-D__OPTFLAGS__"
 	
 	-- build game components
 	engine_settings = settings:copy()
@@ -275,11 +279,11 @@ function build(settings)
 		engine_settings.cc.flags = "/wd4244"
 	else
    		if platform == "macosx" then
-			engine_settings.cc.flags = "-Wall"
+			engine_settings.cc.flags = "-D__OPTFLAGS__"
 		else
-			engine_settings.cc.flags = "-Wall -pedantic-errors"
+			engine_settings.cc.flags = "-D__OPTFLAGS__ -pedantic-errors"
 		end
-		engine_settings.linker.flags = ""
+		engine_settings.linker.flags = "-D__OPTFLAGS__"
 	end
 
 	-- server
@@ -287,7 +291,7 @@ function build(settings)
 
 	-- client
 	client_settings = engine_settings:copy()
-	client_settings.cc.includes:add("src/external/glfw/include")
+	--#client_settings.cc.includes:add("src/external/glfw/include")
 
 	if family == "unix" then
    		if platform == "macosx" then
@@ -303,6 +307,10 @@ function build(settings)
 			client_settings.linker.libs:add("X11")
 			client_settings.linker.libs:add("GL")
 			client_settings.linker.libs:add("GLU")
+			client_settings.linker.libs:add("wavpack")
+			client_settings.linker.libs:add("portaudio")
+			client_settings.linker.libs:add("pnglite")
+			client_settings.linker.libs:add("glfw")
 		end
 	elseif family == "windows" then
 		client_settings.linker.libs:add("opengl32.lib")
@@ -311,9 +319,9 @@ function build(settings)
 	end
 
 	external_settings = settings:copy()
-	zlib = Compile(external_settings, Collect("src/engine/external/zlib/*.c"))
-	wavpack = Compile(external_settings, Collect("src/engine/external/wavpack/*.c"))
-	pnglite = Compile(external_settings, Collect("src/engine/external/pnglite/*.c"))
+	--#zlib = Compile(external_settings, Collect("src/engine/external/zlib/*.c"))
+	--#wavpack = Compile(external_settings, Collect("src/engine/external/wavpack/*.c"))
+	--#pnglite = Compile(external_settings, Collect("src/engine/external/pnglite/*.c"))
 
 	engine = Compile(engine_settings, Collect("src/engine/*.c"))
 	client = Compile(client_settings, Collect("src/engine/client/*.c"))
@@ -333,22 +341,26 @@ function build(settings)
 	tools = {}
 	for i,v in objs do
 		toolname = PathFilename(PathBase(v))
-		tools[i] = Link(settings, toolname, v, engine, zlib)
+		tools_settings = settings:copy()
+		if toolname == "tileset_borderfix" or toolname == "dilate" then
+			tools_settings.linker.libs:add("pnglite")
+		end
+		tools[i] = Link(tools_settings, toolname, v, engine)
 	end
 	
 	-- build client, server, version server and master server
 	client_exe = Link(client_settings, "teeworlds", game_shared, game_client,
-		engine, client, game_editor, glfw, portaudio, zlib, pnglite, wavpack,
+		engine, client, game_editor,
 		client_link_other)
 
 	server_exe = Link(server_settings, "teeworlds_srv", engine, server,
-		game_shared, game_server, zlib)
+		game_shared, game_server)
 
 	versionserver_exe = Link(server_settings, "versionsrv", versionserver,
-		engine, zlib)
+		engine)
 		
 	masterserver_exe = Link(server_settings, "mastersrv", masterserver,
-		engine, zlib)
+		engine)
 
 	if platform == "macosx" then
 		osxlaunch_exe = Link(client_settings, "TeeLaunch", osxlaunch)
diff -up teeworlds-0.4.3-src/src/engine/client/ec_gfx.c.extlibs teeworlds-0.4.3-src/src/engine/client/ec_gfx.c
--- teeworlds-0.4.3-src/src/engine/client/ec_gfx.c.extlibs	2008-08-31 15:30:58.000000000 +0200
+++ teeworlds-0.4.3-src/src/engine/client/ec_gfx.c	2009-01-08 15:42:46.000000000 +0100
@@ -1,6 +1,6 @@
 /* copyright (c) 2007 magnus auvinen, see licence.txt for more info */
-#include <engine/external/glfw/include/GL/glfw.h>
-#include <engine/external/pnglite/pnglite.h>
+#include <GL/glfw.h>
+#include <pnglite.h>
 
 #include <engine/e_system.h>
 #include <engine/e_client_interface.h>
diff -up teeworlds-0.4.3-src/src/engine/client/ec_inp.c.extlibs teeworlds-0.4.3-src/src/engine/client/ec_inp.c
--- teeworlds-0.4.3-src/src/engine/client/ec_inp.c.extlibs	2008-08-31 15:30:58.000000000 +0200
+++ teeworlds-0.4.3-src/src/engine/client/ec_inp.c	2009-01-08 15:42:46.000000000 +0100
@@ -1,6 +1,6 @@
 /* copyright (c) 2007 magnus auvinen, see licence.txt for more info */
 #include <string.h>
-#include <engine/external/glfw/include/GL/glfw.h>
+#include <GL/glfw.h>
 
 #include <engine/e_system.h>
 #include <engine/e_client_interface.h>
diff -up teeworlds-0.4.3-src/src/engine/client/ec_snd.c.extlibs teeworlds-0.4.3-src/src/engine/client/ec_snd.c
--- teeworlds-0.4.3-src/src/engine/client/ec_snd.c.extlibs	2008-08-31 15:30:58.000000000 +0200
+++ teeworlds-0.4.3-src/src/engine/client/ec_snd.c	2009-01-08 15:42:46.000000000 +0100
@@ -3,8 +3,8 @@
 #include <engine/e_client_interface.h>
 #include <engine/e_config.h>
 
-#include <engine/external/portaudio/include/portaudio.h>
-#include <engine/external/wavpack/wavpack.h>
+#include <portaudio.h>
+#include <wavpack/wavpack.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <math.h>
@@ -372,13 +372,6 @@ static void rate_convert(int sid)
 }
 
 
-static FILE *file = NULL;
-
-static int read_data(void *buffer, int size)
-{
-	return fread(buffer, 1, size, file);	
-}
-
 int snd_load_wv(const char *filename)
 {
 	SAMPLE *snd;
@@ -394,19 +387,12 @@ int snd_load_wv(const char *filename)
 	if(!sound_enabled)
 		return 1;
 
-	file = fopen(filename, "rb"); /* TODO: use system.h stuff for this */
-	if(!file)
-	{
-		dbg_msg("sound/wv", "failed to open %s", filename);
-		return -1;
-	}
-
 	sid = snd_alloc_id();
 	if(sid < 0)
 		return -1;
 	snd = &samples[sid];
 
-	context = WavpackOpenFileInput(read_data, error);
+	context = WavpackOpenFileInput(filename, error, 0, 0);
 	if (context)
 	{
 		int samples = WavpackGetNumSamples(context);
@@ -461,9 +447,6 @@ int snd_load_wv(const char *filename)
 		dbg_msg("sound/wv", "failed to open %s: %s", filename, error);
 	}
 
-	fclose(file);
-	file = NULL;
-
 	if(config.debug)
 		dbg_msg("sound/wv", "loaded %s", filename);
 
diff -up teeworlds-0.4.3-src/src/engine/e_datafile.c.extlibs teeworlds-0.4.3-src/src/engine/e_datafile.c
--- teeworlds-0.4.3-src/src/engine/e_datafile.c.extlibs	2008-08-31 15:30:58.000000000 +0200
+++ teeworlds-0.4.3-src/src/engine/e_datafile.c	2009-01-08 15:42:46.000000000 +0100
@@ -1,7 +1,7 @@
 /* copyright (c) 2007 magnus auvinen, see licence.txt for more info */
 #include "e_system.h"
 #include "e_datafile.h"
-#include "external/zlib/zlib.h"
+#include <zlib.h>
 
 static const int DEBUG=0;
 
diff -up teeworlds-0.4.3-src/src/tools/dilate.c.extlibs teeworlds-0.4.3-src/src/tools/dilate.c
--- teeworlds-0.4.3-src/src/tools/dilate.c.extlibs	2008-08-31 15:30:58.000000000 +0200
+++ teeworlds-0.4.3-src/src/tools/dilate.c	2009-01-08 15:42:46.000000000 +0100
@@ -1,6 +1,9 @@
 /* copyright (c) 2007 magnus auvinen, see licence.txt for more info */
 
-#include "../engine/external/pnglite/pnglite.c"
+#include <sys/types.h>
+#include <string.h>
+#include <stdio.h>
+#include <pnglite.h>
 
 typedef struct pixel_t
 {
diff -up teeworlds-0.4.3-src/src/tools/tileset_borderfix.c.extlibs teeworlds-0.4.3-src/src/tools/tileset_borderfix.c
--- teeworlds-0.4.3-src/src/tools/tileset_borderfix.c.extlibs	2008-08-31 15:30:58.000000000 +0200
+++ teeworlds-0.4.3-src/src/tools/tileset_borderfix.c	2009-01-08 15:42:46.000000000 +0100
@@ -1,6 +1,9 @@
 /* copyright (c) 2007 magnus auvinen, see licence.txt for more info */
 
-#include "../engine/external/pnglite/pnglite.c"
+#include <sys/types.h>
+#include <string.h>
+#include <stdio.h>
+#include <pnglite.h>
 
 typedef struct pixel_t
 {


--- NEW FILE teeworlds.desktop ---
[Desktop Entry]
Categories=Game;ArcadeGame;
Name=Teeworlds
Type=Application
Terminal=false
Exec=teeworlds
Icon=teeworlds
Comment=Online multi-player platform 2D shooter
Encoding=UTF-8


--- NEW FILE teeworlds.spec ---
Name:           teeworlds
Version:        0.4.3
Release:        5%{?dist}
Summary:        Online multi-player platform 2D shooter

Group:          Amusements/Games
License:        Teeworlds
URL:            http://www.teeworlds.com/
Source0:        http://www.teeworlds.com/files/%{name}-%{version}-src.tar.gz
Source1:        %{name}.png
Source2:        %{name}.desktop
Patch0:         %{name}-datadir.patch
Patch1:         %{name}-extlibs.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  mesa-libGLU-devel
BuildRequires:  bam = 0.0.%{version}
BuildRequires:  python-devel
BuildRequires:  alsa-lib-devel
BuildRequires:  desktop-file-utils
BuildRequires:  zlib-devel
BuildRequires:  libglfw-devel
BuildRequires:  wavpack-devel
BuildRequires:  portaudio-devel
BuildRequires:  pnglite-devel
Requires:       %{name}-data
   

%description
The game features cartoon-themed graphics and physics, 
and relies heavily on classic shooter weaponry and gameplay. 
The controls are heavily inspired by the FPS genre of computer games. 

%package        server
Summary:        Server for %{name}
Group:          Amusements/Games
Requires:       %{name}-data


%description    server
Data for %{name}, an online multi-player platform 2D shooter. 

%package        data
Summary:        Data-files for %{name}
Group:          Amusements/Games


%description    data
Data-files for %{name}, an online multi-player platform 2D shooter.


%prep
%setup -q -n %{name}-%{version}-src

%patch0 -p1 -b .datadir
%patch1 -p1 -b .extlibs
rm -rf src/engine/external

iconv -f iso-8859-1 -t utf-8 readme.txt > readme.txt.utf8
sed -i 's|\r$||g' readme.txt.utf8
touch -c -r readme.txt readme.txt.utf8
mv readme.txt.utf8 readme.txt

%build
sed 's|-D__OPTFLAGS__|%{optflags}|' -i default.bam
bam -v release


%install
rm -rf %{buildroot}
mkdir -p %{buildroot}%{_datadir}/%{name}/data
mkdir -p %{buildroot}%{_datadir}/pixmaps

install -D -m 0755 %{name} \
        %{buildroot}%{_bindir}/%{name}

install -D -m 0755 %{name}_srv \
        %{buildroot}%{_bindir}/%{name}-srv

cp -pr data/* \
   %{buildroot}%{_datadir}/%{name}

install -p -m 0644 %{SOURCE1} \
        %{buildroot}%{_datadir}/pixmaps/%{name}.png


desktop-file-install \
                     %if 0%{?rhel}
                     --vendor="" \
                     %endif
                     --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
                     %{SOURCE2}


%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%doc readme.txt license.txt
%{_bindir}/%{name}
%{_datadir}/pixmaps/%{name}.png
%{_datadir}/applications/%{name}.desktop


%files data
%defattr(-,root,root,-)
%{_datadir}/%{name}/


%files server
%defattr(-,root,root,-)
%doc readme.txt license.txt
%{_bindir}/%{name}-srv


%changelog
* Fri Jan 02 2009 Simon Wesp <cassmodiah at fedoraproject.org> 0.4.3-5
- Remove requires from subpackage 'data'
- Correct description 

* Thu Jan 01 2009 Simon Wesp <cassmodiah at fedoraproject.org> 0.4.3-4
- Drop desktop-file and icon for subpackage 'server'
- Honor timestamp for converted file
- Add and correct Lubomir's changes
- Remove all comments
- Correct License-Tag (again)
- Add datadir patch

* Wed Dec 31 2008 Lubomir Rintel <lkundrak at v3.sk> 0.4.3-3
- Outsource the dependencies (extlib-patch)
- Use optflags

* Thu Sep 18 2008 Simon Wesp <cassmodiah at fedoraproject.org> 0.4.3-2
- Recheck and conform licensing and list it in a comment
- Correct BuildRequires

* Sat Sep 13 2008 Simon Wesp <cassmodiah at fedoraproject.org> 0.4.3-1
- Initial Release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/teeworlds/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	4 Jan 2009 20:09:55 -0000	1.1
+++ .cvsignore	8 Jan 2009 14:49:22 -0000	1.2
@@ -0,0 +1,2 @@
+teeworlds-0.4.3-src.tar.gz
+teeworlds.png


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/teeworlds/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	4 Jan 2009 20:09:55 -0000	1.1
+++ sources	8 Jan 2009 14:49:22 -0000	1.2
@@ -0,0 +1,2 @@
+a31a8cbd1af3f71a462122166e5872d6  teeworlds-0.4.3-src.tar.gz
+d541e3afa7809bd73bb64adb0795cb65  teeworlds.png



From lkundrak at fedoraproject.org  Thu Jan  8 14:49:52 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Thu,  8 Jan 2009 14:49:52 +0000 (UTC)
Subject: rpms/teeworlds/F-10 teeworlds-datadir.patch, NONE,
	1.1 teeworlds-extlibs.patch, NONE, 1.1 teeworlds.desktop, NONE,
	1.1 teeworlds.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090108144952.5CA3C700FD@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/teeworlds/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17025/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	teeworlds-datadir.patch teeworlds-extlibs.patch 
	teeworlds.desktop teeworlds.spec 
Log Message:
Import teeworlds

teeworlds-datadir.patch:

--- NEW FILE teeworlds-datadir.patch ---
diff -Naur teeworlds-0.4.3-src.old/datasrc/data.ds teeworlds-0.4.3-src/datasrc/data.ds
--- teeworlds-0.4.3-src.old/datasrc/data.ds	2008-08-31 15:30:59.000000000 +0200
+++ teeworlds-0.4.3-src/datasrc/data.ds	2008-11-04 18:45:37.000000000 +0100
@@ -1,228 +1,228 @@
 sounds {
 	gun_fire {
-		"data/audio/wp_gun_fire-01.wv"
-		"data/audio/wp_gun_fire-02.wv"
-		"data/audio/wp_gun_fire-03.wv"
+		"/usr/share/teeworlds/audio/wp_gun_fire-01.wv"
+		"/usr/share/teeworlds/audio/wp_gun_fire-02.wv"
+		"/usr/share/teeworlds/audio/wp_gun_fire-03.wv"
 	}
 
 	shotgun_fire {
-		"data/audio/wp_shotty_fire-01.wv"
-		"data/audio/wp_shotty_fire-02.wv"
-		"data/audio/wp_shotty_fire-03.wv"
+		"/usr/share/teeworlds/audio/wp_shotty_fire-01.wv"
+		"/usr/share/teeworlds/audio/wp_shotty_fire-02.wv"
+		"/usr/share/teeworlds/audio/wp_shotty_fire-03.wv"
 	}
 	
 	grenade_fire {
-		"data/audio/wp_flump_launch-01.wv"
-		"data/audio/wp_flump_launch-02.wv"
-		"data/audio/wp_flump_launch-03.wv"
+		"/usr/share/teeworlds/audio/wp_flump_launch-01.wv"
+		"/usr/share/teeworlds/audio/wp_flump_launch-02.wv"
+		"/usr/share/teeworlds/audio/wp_flump_launch-03.wv"
 	}
 	
 	hammer_fire {
-		"data/audio/wp_hammer_swing-01.wv"
-		"data/audio/wp_hammer_swing-02.wv"
-		"data/audio/wp_hammer_swing-03.wv"
+		"/usr/share/teeworlds/audio/wp_hammer_swing-01.wv"
+		"/usr/share/teeworlds/audio/wp_hammer_swing-02.wv"
+		"/usr/share/teeworlds/audio/wp_hammer_swing-03.wv"
 	}
 
 	hammer_hit {
-		"data/audio/wp_hammer_hit-01.wv"
-		"data/audio/wp_hammer_hit-02.wv"
-		"data/audio/wp_hammer_hit-03.wv"
+		"/usr/share/teeworlds/audio/wp_hammer_hit-01.wv"
+		"/usr/share/teeworlds/audio/wp_hammer_hit-02.wv"
+		"/usr/share/teeworlds/audio/wp_hammer_hit-03.wv"
 	}
 	
 	ninja_fire { 
-		"data/audio/wp_ninja_attack-01.wv"
-		"data/audio/wp_ninja_attack-02.wv"
-		"data/audio/wp_ninja_attack-03.wv"
+		"/usr/share/teeworlds/audio/wp_ninja_attack-01.wv"
+		"/usr/share/teeworlds/audio/wp_ninja_attack-02.wv"
+		"/usr/share/teeworlds/audio/wp_ninja_attack-03.wv"
 	}
 
 	grenade_explode {
-		"data/audio/wp_flump_explo-01.wv"
-		"data/audio/wp_flump_explo-02.wv"
-		"data/audio/wp_flump_explo-03.wv"
+		"/usr/share/teeworlds/audio/wp_flump_explo-01.wv"
+		"/usr/share/teeworlds/audio/wp_flump_explo-02.wv"
+		"/usr/share/teeworlds/audio/wp_flump_explo-03.wv"
 	}
 	
 	ninja_hit {
-		"data/audio/wp_ninja_hit-01.wv"
-		"data/audio/wp_ninja_hit-02.wv"
-		"data/audio/wp_ninja_hit-03.wv"
+		"/usr/share/teeworlds/audio/wp_ninja_hit-01.wv"
+		"/usr/share/teeworlds/audio/wp_ninja_hit-02.wv"
+		"/usr/share/teeworlds/audio/wp_ninja_hit-03.wv"
 	}
 	
 	rifle_fire {
-		"data/audio/wp_rifle_fire-01.wv"
-		"data/audio/wp_rifle_fire-02.wv"
-		"data/audio/wp_rifle_fire-03.wv"
+		"/usr/share/teeworlds/audio/wp_rifle_fire-01.wv"
+		"/usr/share/teeworlds/audio/wp_rifle_fire-02.wv"
+		"/usr/share/teeworlds/audio/wp_rifle_fire-03.wv"
 	}
 
 	rifle_bounce {
-		"data/audio/wp_rifle_bnce-01.wv"
-		"data/audio/wp_rifle_bnce-02.wv"
-		"data/audio/wp_rifle_bnce-03.wv"
+		"/usr/share/teeworlds/audio/wp_rifle_bnce-01.wv"
+		"/usr/share/teeworlds/audio/wp_rifle_bnce-02.wv"
+		"/usr/share/teeworlds/audio/wp_rifle_bnce-03.wv"
 	}
 
 	weapon_switch { 
-		"data/audio/wp_switch-01.wv"
-		"data/audio/wp_switch-02.wv"
-		"data/audio/wp_switch-03.wv"
+		"/usr/share/teeworlds/audio/wp_switch-01.wv"
+		"/usr/share/teeworlds/audio/wp_switch-02.wv"
+		"/usr/share/teeworlds/audio/wp_switch-03.wv"
 	}
 
 	player_pain_short {
-		"data/audio/vo_teefault_pain_short-01.wv"
-		"data/audio/vo_teefault_pain_short-02.wv"
-		"data/audio/vo_teefault_pain_short-03.wv"
-		"data/audio/vo_teefault_pain_short-04.wv"
-		"data/audio/vo_teefault_pain_short-05.wv"
-		"data/audio/vo_teefault_pain_short-06.wv"
-		"data/audio/vo_teefault_pain_short-07.wv"
-		"data/audio/vo_teefault_pain_short-08.wv"
-		"data/audio/vo_teefault_pain_short-09.wv"
-		"data/audio/vo_teefault_pain_short-10.wv"
-		"data/audio/vo_teefault_pain_short-11.wv"
-		"data/audio/vo_teefault_pain_short-12.wv"
+		"/usr/share/teeworlds/audio/vo_teefault_pain_short-01.wv"
+		"/usr/share/teeworlds/audio/vo_teefault_pain_short-02.wv"
+		"/usr/share/teeworlds/audio/vo_teefault_pain_short-03.wv"
+		"/usr/share/teeworlds/audio/vo_teefault_pain_short-04.wv"
+		"/usr/share/teeworlds/audio/vo_teefault_pain_short-05.wv"
+		"/usr/share/teeworlds/audio/vo_teefault_pain_short-06.wv"
+		"/usr/share/teeworlds/audio/vo_teefault_pain_short-07.wv"
+		"/usr/share/teeworlds/audio/vo_teefault_pain_short-08.wv"
+		"/usr/share/teeworlds/audio/vo_teefault_pain_short-09.wv"
+		"/usr/share/teeworlds/audio/vo_teefault_pain_short-10.wv"
+		"/usr/share/teeworlds/audio/vo_teefault_pain_short-11.wv"
+		"/usr/share/teeworlds/audio/vo_teefault_pain_short-12.wv"
 	}
 
 	player_pain_long {
-		"data/audio/vo_teefault_pain_long-01.wv"
-		"data/audio/vo_teefault_pain_long-02.wv"
+		"/usr/share/teeworlds/audio/vo_teefault_pain_long-01.wv"
+		"/usr/share/teeworlds/audio/vo_teefault_pain_long-02.wv"
 	}
 
 	body_land {
-		"data/audio/foley_land-01.wv"
-		"data/audio/foley_land-02.wv"
-		"data/audio/foley_land-03.wv"
-		"data/audio/foley_land-04.wv"
+		"/usr/share/teeworlds/audio/foley_land-01.wv"
+		"/usr/share/teeworlds/audio/foley_land-02.wv"
+		"/usr/share/teeworlds/audio/foley_land-03.wv"
+		"/usr/share/teeworlds/audio/foley_land-04.wv"
 	}
 	
 	player_airjump {
-		"data/audio/foley_dbljump-01.wv"
-		"data/audio/foley_dbljump-02.wv"
-		"data/audio/foley_dbljump-03.wv"
+		"/usr/share/teeworlds/audio/foley_dbljump-01.wv"
+		"/usr/share/teeworlds/audio/foley_dbljump-02.wv"
+		"/usr/share/teeworlds/audio/foley_dbljump-03.wv"
 	}
 
 	player_jump {
-		"data/audio/foley_foot_left-01.wv"
-		"data/audio/foley_foot_left-02.wv"
-		"data/audio/foley_foot_left-03.wv"
-		"data/audio/foley_foot_left-04.wv"
-		"data/audio/foley_foot_right-01.wv"
-		"data/audio/foley_foot_right-02.wv"
-		"data/audio/foley_foot_right-03.wv"
-		"data/audio/foley_foot_right-04.wv"
+		"/usr/share/teeworlds/audio/foley_foot_left-01.wv"
+		"/usr/share/teeworlds/audio/foley_foot_left-02.wv"
+		"/usr/share/teeworlds/audio/foley_foot_left-03.wv"
+		"/usr/share/teeworlds/audio/foley_foot_left-04.wv"
+		"/usr/share/teeworlds/audio/foley_foot_right-01.wv"
+		"/usr/share/teeworlds/audio/foley_foot_right-02.wv"
+		"/usr/share/teeworlds/audio/foley_foot_right-03.wv"
+		"/usr/share/teeworlds/audio/foley_foot_right-04.wv"
 	}
 
 	player_die {
-		"data/audio/foley_body_splat-02.wv"
-		"data/audio/foley_body_splat-03.wv"
-		"data/audio/foley_body_splat-04.wv"
+		"/usr/share/teeworlds/audio/foley_body_splat-02.wv"
+		"/usr/share/teeworlds/audio/foley_body_splat-03.wv"
+		"/usr/share/teeworlds/audio/foley_body_splat-04.wv"
 	}
 	
 	player_spawn {
-		"data/audio/vo_teefault_spawn-01.wv"
-		"data/audio/vo_teefault_spawn-02.wv"
-		"data/audio/vo_teefault_spawn-03.wv"
-		"data/audio/vo_teefault_spawn-04.wv"
-		"data/audio/vo_teefault_spawn-05.wv"
-		"data/audio/vo_teefault_spawn-06.wv"
-		"data/audio/vo_teefault_spawn-07.wv"
+		"/usr/share/teeworlds/audio/vo_teefault_spawn-01.wv"
+		"/usr/share/teeworlds/audio/vo_teefault_spawn-02.wv"
+		"/usr/share/teeworlds/audio/vo_teefault_spawn-03.wv"
+		"/usr/share/teeworlds/audio/vo_teefault_spawn-04.wv"
+		"/usr/share/teeworlds/audio/vo_teefault_spawn-05.wv"
+		"/usr/share/teeworlds/audio/vo_teefault_spawn-06.wv"
+		"/usr/share/teeworlds/audio/vo_teefault_spawn-07.wv"
 	}
 	
 	player_skid {
-		"data/audio/sfx_skid-01.wv"
-		"data/audio/sfx_skid-02.wv"
-		"data/audio/sfx_skid-03.wv"
-		"data/audio/sfx_skid-04.wv"
+		"/usr/share/teeworlds/audio/sfx_skid-01.wv"
+		"/usr/share/teeworlds/audio/sfx_skid-02.wv"
+		"/usr/share/teeworlds/audio/sfx_skid-03.wv"
+		"/usr/share/teeworlds/audio/sfx_skid-04.wv"
 	}
 
 	tee_cry {
-		"data/audio/vo_teefault_cry-01.wv"
-		"data/audio/vo_teefault_cry-02.wv"
+		"/usr/share/teeworlds/audio/vo_teefault_cry-01.wv"
+		"/usr/share/teeworlds/audio/vo_teefault_cry-02.wv"
 	}
 
 	hook_loop { 
-		"data/audio/hook_loop-01.wv"
-		"data/audio/hook_loop-02.wv"
+		"/usr/share/teeworlds/audio/hook_loop-01.wv"
+		"/usr/share/teeworlds/audio/hook_loop-02.wv"
 	}
 	
 	hook_attach_ground {
-		"data/audio/hook_attach-01.wv"
-		"data/audio/hook_attach-02.wv"
-		"data/audio/hook_attach-03.wv"
+		"/usr/share/teeworlds/audio/hook_attach-01.wv"
+		"/usr/share/teeworlds/audio/hook_attach-02.wv"
+		"/usr/share/teeworlds/audio/hook_attach-03.wv"
 	}
 	
 	hook_attach_player {
-		"data/audio/foley_body_impact-01.wv"
-		"data/audio/foley_body_impact-02.wv"
-		"data/audio/foley_body_impact-03.wv"
+		"/usr/share/teeworlds/audio/foley_body_impact-01.wv"
+		"/usr/share/teeworlds/audio/foley_body_impact-02.wv"
+		"/usr/share/teeworlds/audio/foley_body_impact-03.wv"
 	}
 		
 	pickup_health {
-		"data/audio/sfx_pickup_hrt-01.wv"
-		"data/audio/sfx_pickup_hrt-02.wv"
+		"/usr/share/teeworlds/audio/sfx_pickup_hrt-01.wv"
+		"/usr/share/teeworlds/audio/sfx_pickup_hrt-02.wv"
 	}
 	
 	pickup_armor {
-		"data/audio/sfx_pickup_arm-01.wv"
-		"data/audio/sfx_pickup_arm-02.wv"
-		"data/audio/sfx_pickup_arm-03.wv"
-		"data/audio/sfx_pickup_arm-04.wv"
+		"/usr/share/teeworlds/audio/sfx_pickup_arm-01.wv"
+		"/usr/share/teeworlds/audio/sfx_pickup_arm-02.wv"
+		"/usr/share/teeworlds/audio/sfx_pickup_arm-03.wv"
+		"/usr/share/teeworlds/audio/sfx_pickup_arm-04.wv"
 	}
 	
 	pickup_grenade {
-		"data/audio/sfx_pickup_launcher.wv"
+		"/usr/share/teeworlds/audio/sfx_pickup_launcher.wv"
 	}
 	
 	pickup_shotgun {
-		"data/audio/sfx_pickup_sg.wv"
+		"/usr/share/teeworlds/audio/sfx_pickup_sg.wv"
 	}
 	
 	pickup_ninja {
-		"data/audio/sfx_pickup_ninja.wv"
+		"/usr/share/teeworlds/audio/sfx_pickup_ninja.wv"
 	}
 		
 	weapon_spawn {
-		"data/audio/sfx_spawn_wpn-01.wv"
-		"data/audio/sfx_spawn_wpn-02.wv"
-		"data/audio/sfx_spawn_wpn-03.wv"
+		"/usr/share/teeworlds/audio/sfx_spawn_wpn-01.wv"
+		"/usr/share/teeworlds/audio/sfx_spawn_wpn-02.wv"
+		"/usr/share/teeworlds/audio/sfx_spawn_wpn-03.wv"
 	}
 
 	weapon_noammo {
-		"data/audio/wp_noammo-01.wv"
-		"data/audio/wp_noammo-02.wv"
-		"data/audio/wp_noammo-03.wv"
-		"data/audio/wp_noammo-04.wv"
-		"data/audio/wp_noammo-05.wv"
+		"/usr/share/teeworlds/audio/wp_noammo-01.wv"
+		"/usr/share/teeworlds/audio/wp_noammo-02.wv"
+		"/usr/share/teeworlds/audio/wp_noammo-03.wv"
+		"/usr/share/teeworlds/audio/wp_noammo-04.wv"
+		"/usr/share/teeworlds/audio/wp_noammo-05.wv"
 	}
 
 	hit {
-		"data/audio/sfx_hit_weak-01.wv"
-		"data/audio/sfx_hit_weak-02.wv"
+		"/usr/share/teeworlds/audio/sfx_hit_weak-01.wv"
+		"/usr/share/teeworlds/audio/sfx_hit_weak-02.wv"
 	}
 
 	chat_server {
-		"data/audio/sfx_msg-server.wv"
+		"/usr/share/teeworlds/audio/sfx_msg-server.wv"
 	}
 	
 	chat_client {
-		"data/audio/sfx_msg-client.wv"
+		"/usr/share/teeworlds/audio/sfx_msg-client.wv"
 	}
 
 	ctf_drop {
-		"data/audio/sfx_ctf_drop.wv"
+		"/usr/share/teeworlds/audio/sfx_ctf_drop.wv"
 	}
 
 	ctf_return {
-		"data/audio/sfx_ctf_rtn.wv"
+		"/usr/share/teeworlds/audio/sfx_ctf_rtn.wv"
 	}
 	
 	ctf_grab_pl {
-		"data/audio/sfx_ctf_grab_pl.wv"
+		"/usr/share/teeworlds/audio/sfx_ctf_grab_pl.wv"
 	}
 
 	ctf_grab_en {
-		"data/audio/sfx_ctf_grab_en.wv"
+		"/usr/share/teeworlds/audio/sfx_ctf_grab_en.wv"
 	}
 
 	ctf_capture {
-		"data/audio/sfx_ctf_cap_pl.wv"
+		"/usr/share/teeworlds/audio/sfx_ctf_cap_pl.wv"
 	}
 }
 
@@ -233,34 +233,34 @@
 	}
 
 	game {
-		filename "data/game.png"
+		filename "/usr/share/teeworlds/game.png"
 	}
 
 	particles {
-		filename "data/particles.png"
+		filename "/usr/share/teeworlds/particles.png"
 	}
 
 	cursor {
-		filename "data/gui_cursor.png"
+		filename "/usr/share/teeworlds/gui_cursor.png"
 	}
 
 	banner {
-		filename "data/gui_logo.png"
+		filename "/usr/share/teeworlds/gui_logo.png"
 	}
 
 	emoticons {
-		filename "data/emoticons.png"
+		filename "/usr/share/teeworlds/emoticons.png"
 	}
 	
 	browseicons {
-		filename "data/browse_icons.png"
+		filename "/usr/share/teeworlds/browse_icons.png"
 	}
 
 	console_bg {
-		filename "data/console.png"
+		filename "/usr/share/teeworlds/console.png"
 	}
 	console_bar {
-		filename "data/console_bar.png"
+		filename "/usr/share/teeworlds/console_bar.png"
 	}
 }
 
diff -Naur teeworlds-0.4.3-src.old/src/game/client/gc_hooks.cpp teeworlds-0.4.3-src/src/game/client/gc_hooks.cpp
--- teeworlds-0.4.3-src.old/src/game/client/gc_hooks.cpp	2008-08-31 15:30:59.000000000 +0200
+++ teeworlds-0.4.3-src/src/game/client/gc_hooks.cpp	2008-11-04 18:45:37.000000000 +0100
@@ -68,7 +68,7 @@
 	
 	
 	int before = gfx_memory_usage();
-	font_set_load(&default_font, "data/fonts/default_font%d.tfnt", "data/fonts/default_font%d.png", "data/fonts/default_font%d_b.png", 14, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 36);
+	font_set_load(&default_font, "/usr/share/teeworlds/fonts/default_font%d.tfnt", "/usr/share/teeworlds/fonts/default_font%d.png", "/usr/share/teeworlds/fonts/default_font%d_b.png", 14, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 36);
 	dbg_msg("font", "gfx memory used for font textures: %d", gfx_memory_usage()-before);
 	
 	gfx_text_set_default_font(&default_font);
diff -Naur teeworlds-0.4.3-src.old/src/game/client/gc_map_image.cpp teeworlds-0.4.3-src/src/game/client/gc_map_image.cpp
--- teeworlds-0.4.3-src.old/src/game/client/gc_map_image.cpp	2008-08-31 15:30:59.000000000 +0200
+++ teeworlds-0.4.3-src/src/game/client/gc_map_image.cpp	2008-11-04 18:45:37.000000000 +0100
@@ -110,7 +110,7 @@
 		{
 			char buf[256];
 			char *name = (char *)map_get_data(img->image_name);
-			str_format(buf, sizeof(buf), "data/mapres/%s.png", name);
+			str_format(buf, sizeof(buf), "/usr/share/teeworlds/mapres/%s.png", name);
 			map_textures[i] = gfx_load_texture(buf, IMG_AUTO, 0);
 		}
 		else
diff -Naur teeworlds-0.4.3-src.old/src/game/client/gc_skin.cpp teeworlds-0.4.3-src/src/game/client/gc_skin.cpp
--- teeworlds-0.4.3-src.old/src/game/client/gc_skin.cpp	2008-08-31 15:30:58.000000000 +0200
+++ teeworlds-0.4.3-src/src/game/client/gc_skin.cpp	2008-11-04 18:45:37.000000000 +0100
@@ -24,7 +24,7 @@
 		return;
 		
 	char buf[512];
-	str_format(buf, sizeof(buf), "data/skins/%s", name);
+	str_format(buf, sizeof(buf), "/usr/share/teeworlds/skins/%s", name);
 	IMAGE_INFO info;
 	if(!gfx_load_png(&info, buf))
 	{
@@ -118,7 +118,7 @@
 void skin_init()
 {
 	// load skins
-	fs_listdir("data/skins", skinscan, 0);
+	fs_listdir("/usr/share/teeworlds/skins", skinscan, 0);
 }
 
 int skin_num()
diff -Naur teeworlds-0.4.3-src.old/src/game/editor/ed_editor.cpp teeworlds-0.4.3-src/src/game/editor/ed_editor.cpp
--- teeworlds-0.4.3-src.old/src/game/editor/ed_editor.cpp	2008-08-31 15:30:58.000000000 +0200
+++ teeworlds-0.4.3-src/src/game/editor/ed_editor.cpp	2008-11-04 18:45:37.000000000 +0100
@@ -422,11 +422,11 @@
 	
 	// ctrl+o to open
 	if(inp_key_down('O') && (inp_key_pressed(KEY_LCTRL) || inp_key_pressed(KEY_RCTRL)))
-		editor.invoke_file_dialog("Open Map", "Open", "data/maps/", "", callback_open_map);
+		editor.invoke_file_dialog("Open Map", "Open", "/usr/share/teeworlds/maps/", "", callback_open_map);
 	
 	// ctrl+s to save
 	if(inp_key_down('S') && (inp_key_pressed(KEY_LCTRL) || inp_key_pressed(KEY_RCTRL)))
-		editor.invoke_file_dialog("Save Map", "Save", "data/maps/", "", callback_save_map);
+		editor.invoke_file_dialog("Save Map", "Save", "/usr/share/teeworlds/maps/", "", callback_save_map);
 
 	// animate button
 	ui_vsplit_l(&toolbar, 30.0f, &button, &toolbar);
@@ -1551,7 +1551,7 @@
 	ui_hsplit_t(&view, 12.0f, &slot, &view);
 	if(do_editor_button(&replace_button, "Replace", 0, &slot, draw_editor_button_menuitem, 0, "Replaces the image with a new one"))
 	{
-		editor.invoke_file_dialog("Replace Image", "Replace", "data/mapres/", "", replace_image);
+		editor.invoke_file_dialog("Replace Image", "Replace", "/usr/share/teeworlds/mapres/", "", replace_image);
 		return 1;
 	}
 
@@ -1632,7 +1632,7 @@
 	ui_hsplit_t(&toolbox, 10.0f, &slot, &toolbox);
 	ui_hsplit_t(&toolbox, 12.0f, &slot, &toolbox);
 	if(do_editor_button(&new_image_button, "Add", 0, &slot, draw_editor_button, 0, "Load a new image to use in the map"))
-		editor.invoke_file_dialog("Add Image", "Add", "data/mapres/", "", add_image);
+		editor.invoke_file_dialog("Add Image", "Add", "/usr/share/teeworlds/mapres/", "", add_image);
 }
 
 
@@ -2168,7 +2168,7 @@
 	ui_hsplit_t(&view, 12.0f, &slot, &view);
 	if(do_editor_button(&open_button, "Open", 0, &slot, draw_editor_button_menuitem, 0, "Opens a map for editing"))
 	{
-		editor.invoke_file_dialog("Open Map", "Open", "data/maps/", "", callback_open_map);
+		editor.invoke_file_dialog("Open Map", "Open", "/usr/share/teeworlds/maps/", "", callback_open_map);
 		return 1;
 	}
 
@@ -2176,7 +2176,7 @@
 	ui_hsplit_t(&view, 12.0f, &slot, &view);
 	if(do_editor_button(&append_button, "Append", 0, &slot, draw_editor_button_menuitem, 0, "Opens a map and adds everything from that map to the current one"))
 	{
-		editor.invoke_file_dialog("Append Map", "Append", "data/maps/", "", callback_append_map);
+		editor.invoke_file_dialog("Append Map", "Append", "/usr/share/teeworlds/maps/", "", callback_append_map);
 		return 1;
 	}
 
@@ -2191,7 +2191,7 @@
 	ui_hsplit_t(&view, 12.0f, &slot, &view);
 	if(do_editor_button(&save_as_button, "Save As", 0, &slot, draw_editor_button_menuitem, 0, "Saves the current map under a new name"))
 	{
-		editor.invoke_file_dialog("Save Map", "Save", "data/maps/", "", callback_save_map);
+		editor.invoke_file_dialog("Save Map", "Save", "/usr/share/teeworlds/maps/", "", callback_save_map);
 		return 1;
 	}
 		
@@ -2402,10 +2402,10 @@
 
 extern "C" void editor_init()
 {
-	checker_texture = gfx_load_texture("data/editor/checker.png", IMG_AUTO, 0);
-	background_texture = gfx_load_texture("data/editor/background.png", IMG_AUTO, 0);
-	cursor_texture = gfx_load_texture("data/editor/cursor.png", IMG_AUTO, 0);
-	entities_texture = gfx_load_texture("data/editor/entities.png", IMG_AUTO, 0);
+	checker_texture = gfx_load_texture("/usr/share/teeworlds/editor/checker.png", IMG_AUTO, 0);
+	background_texture = gfx_load_texture("/usr/share/teeworlds/editor/background.png", IMG_AUTO, 0);
+	cursor_texture = gfx_load_texture("/usr/share/teeworlds/editor/cursor.png", IMG_AUTO, 0);
+	entities_texture = gfx_load_texture("/usr/share/teeworlds/editor/entities.png", IMG_AUTO, 0);
 	
 	tileset_picker.make_palette();
 	tileset_picker.readonly = true;
@@ -2478,13 +2478,13 @@
 		editor.gui_active = !editor.gui_active;
 
 	if(inp_key_down(KEY_F5))
-		editor.save("data/maps/debug_test2.map");
+		editor.save("/usr/share/teeworlds/maps/debug_test2.map");
 
 	if(inp_key_down(KEY_F6))
-		editor.load("data/maps/debug_test2.map");
+		editor.load("/usr/share/teeworlds/maps/debug_test2.map");
 	
 	if(inp_key_down(KEY_F8))
-		editor.load("data/maps/debug_test.map");
+		editor.load("/usr/share/teeworlds/maps/debug_test.map");
 	
 	if(inp_key_down(KEY_F10))
 		editor.show_mouse_pointer = false;
diff -Naur teeworlds-0.4.3-src.old/src/game/editor/ed_io.cpp teeworlds-0.4.3-src/src/game/editor/ed_io.cpp
--- teeworlds-0.4.3-src.old/src/game/editor/ed_io.cpp	2008-08-31 15:30:58.000000000 +0200
+++ teeworlds-0.4.3-src/src/game/editor/ed_io.cpp	2008-11-04 18:45:37.000000000 +0100
@@ -398,7 +398,7 @@
 				if(item->external)
 				{
 					char buf[256];
-					sprintf(buf, "data/mapres/%s.png", name);
+					sprintf(buf, "/usr/share/teeworlds/mapres/%s.png", name);
 					
 					// load external
 					IMAGE imginfo;

teeworlds-extlibs.patch:

--- NEW FILE teeworlds-extlibs.patch ---
* Do not use bundled libraries, link against Fedora-packaged ones
* Substitute compiler flags with a magic string, so we can sed it in SPEC file
  - Is there a way to pass BAM parameters? I guess not.
  - The magic string is "-D__OPTFLAGS__", which is useful to compile this without sedding

Lubomir Rintel <lkundrak at v3.sk>

diff -up teeworlds-0.4.3-src/default.bam.extlibs teeworlds-0.4.3-src/default.bam
--- teeworlds-0.4.3-src/default.bam.extlibs	2008-08-31 15:30:59.000000000 +0200
+++ teeworlds-0.4.3-src/default.bam	2009-01-08 15:43:48.000000000 +0100
@@ -214,7 +214,7 @@ function build(settings)
 
 	-- set some platform specific settings
 	settings.cc.includes:add("src")
-	settings.cc.includes:add("src/external/zlib")
+	--# settings.cc.includes:add("src/external/zlib")
 
 	if family == "unix" then
    		if platform == "macosx" then
@@ -232,6 +232,7 @@ function build(settings)
 			end
 			
 			settings.linker.libs:add("pthread")
+			settings.linker.libs:add("z")
 		end
 	elseif family == "windows" then
 		glfw_platform = "win32"
@@ -245,28 +246,31 @@ function build(settings)
 	end
 	
 	-- build glfw
-	glfw_settings = settings:copy()
-	glfw_settings.cc.includes:add("src/external/glfw/include")
-	glfw_settings.cc.includes:add("src/engine/external/glfw/lib")
-	glfw_settings.cc.includes:add("src/engine/external/glfw/lib/" .. glfw_platform)
-
-	glfw = Compile(glfw_settings, Collect(
-		"src/engine/external/glfw/lib/*.c",
-		"src/engine/external/glfw/lib/" .. glfw_platform .. "/*.c"))
+	--#plfw_settings = settings:copy()
+	--#plfw_settings.cc.includes:add("src/external/glfw/include")
+	--#plfw_settings.cc.includes:add("src/engine/external/glfw/lib")
+	--#plfw_settings.cc.includes:add("src/engine/external/glfw/lib/" .. glfw_platform)
+
+	--#plfw = Compile(glfw_settings, Collect(
+	--#	"src/en--#pine/external/glfw/lib/*.c",
+	--#	"src/en--#pine/external/glfw/lib/" .. glfw_platform .. "/*.c"))
 		
 	-- build portaudio
-	pa_settings = settings:copy()
-	pa_settings.cc.defines:add("PA_USE_" .. string.upper(pa_hostapi))
-	pa_settings.cc.defines:add("PA_NO_WMME")
-	pa_settings.cc.defines:add("PA_NO_ASIO")
-	pa_settings.cc.includes:add("src/engine/external/portaudio/include")
-	pa_settings.cc.includes:add("src/engine/external/portaudio/src/common")
-	pa_settings.cc.includes:add("src/engine/external/portaudio/src/os/" .. pa_platform)
-	
-	portaudio = Compile(pa_settings,
-		Collect("src/engine/external/portaudio/src/common/*.c"),
-		Collect("src/engine/external/portaudio/src/os/" .. pa_platform .. "/*.c"),
-		Collect("src/engine/external/portaudio/src/hostapi/" .. pa_hostapi .. "/*.c"))
+	--#pa_settings = settings:copy()
+	--#pa_settings.cc.defines:add("PA_USE_" .. string.upper(pa_hostapi))
+	--#pa_settings.cc.defines:add("PA_NO_WMME")
+	--#pa_settings.cc.defines:add("PA_NO_ASIO")
+	--#pa_settings.cc.includes:add("src/engine/external/portaudio/include")
+	--#pa_settings.cc.includes:add("src/engine/external/portaudio/src/common")
+	--#pa_settings.cc.includes:add("src/engine/external/portaudio/src/os/" .. pa_platform)
+	
+	--#portaudio = Compile(pa_settings,
+	--#	Collect("src/engine/external/portaudio/src/common/*.c"),
+	--#	Collect("src/engine/external/portaudio/src/os/" .. pa_platform .. "/*.c"),
+	--#	Collect("src/engine/external/portaudio/src/hostapi/" .. pa_hostapi .. "/*.c"))
+
+	settings.cc.flags = "-D__OPTFLAGS__"
+	settings.linker.flags = "-D__OPTFLAGS__"
 	
 	-- build game components
 	engine_settings = settings:copy()
@@ -275,11 +279,11 @@ function build(settings)
 		engine_settings.cc.flags = "/wd4244"
 	else
    		if platform == "macosx" then
-			engine_settings.cc.flags = "-Wall"
+			engine_settings.cc.flags = "-D__OPTFLAGS__"
 		else
-			engine_settings.cc.flags = "-Wall -pedantic-errors"
+			engine_settings.cc.flags = "-D__OPTFLAGS__ -pedantic-errors"
 		end
-		engine_settings.linker.flags = ""
+		engine_settings.linker.flags = "-D__OPTFLAGS__"
 	end
 
 	-- server
@@ -287,7 +291,7 @@ function build(settings)
 
 	-- client
 	client_settings = engine_settings:copy()
-	client_settings.cc.includes:add("src/external/glfw/include")
+	--#client_settings.cc.includes:add("src/external/glfw/include")
 
 	if family == "unix" then
    		if platform == "macosx" then
@@ -303,6 +307,10 @@ function build(settings)
 			client_settings.linker.libs:add("X11")
 			client_settings.linker.libs:add("GL")
 			client_settings.linker.libs:add("GLU")
+			client_settings.linker.libs:add("wavpack")
+			client_settings.linker.libs:add("portaudio")
+			client_settings.linker.libs:add("pnglite")
+			client_settings.linker.libs:add("glfw")
 		end
 	elseif family == "windows" then
 		client_settings.linker.libs:add("opengl32.lib")
@@ -311,9 +319,9 @@ function build(settings)
 	end
 
 	external_settings = settings:copy()
-	zlib = Compile(external_settings, Collect("src/engine/external/zlib/*.c"))
-	wavpack = Compile(external_settings, Collect("src/engine/external/wavpack/*.c"))
-	pnglite = Compile(external_settings, Collect("src/engine/external/pnglite/*.c"))
+	--#zlib = Compile(external_settings, Collect("src/engine/external/zlib/*.c"))
+	--#wavpack = Compile(external_settings, Collect("src/engine/external/wavpack/*.c"))
+	--#pnglite = Compile(external_settings, Collect("src/engine/external/pnglite/*.c"))
 
 	engine = Compile(engine_settings, Collect("src/engine/*.c"))
 	client = Compile(client_settings, Collect("src/engine/client/*.c"))
@@ -333,22 +341,26 @@ function build(settings)
 	tools = {}
 	for i,v in objs do
 		toolname = PathFilename(PathBase(v))
-		tools[i] = Link(settings, toolname, v, engine, zlib)
+		tools_settings = settings:copy()
+		if toolname == "tileset_borderfix" or toolname == "dilate" then
+			tools_settings.linker.libs:add("pnglite")
+		end
+		tools[i] = Link(tools_settings, toolname, v, engine)
 	end
 	
 	-- build client, server, version server and master server
 	client_exe = Link(client_settings, "teeworlds", game_shared, game_client,
-		engine, client, game_editor, glfw, portaudio, zlib, pnglite, wavpack,
+		engine, client, game_editor,
 		client_link_other)
 
 	server_exe = Link(server_settings, "teeworlds_srv", engine, server,
-		game_shared, game_server, zlib)
+		game_shared, game_server)
 
 	versionserver_exe = Link(server_settings, "versionsrv", versionserver,
-		engine, zlib)
+		engine)
 		
 	masterserver_exe = Link(server_settings, "mastersrv", masterserver,
-		engine, zlib)
+		engine)
 
 	if platform == "macosx" then
 		osxlaunch_exe = Link(client_settings, "TeeLaunch", osxlaunch)
diff -up teeworlds-0.4.3-src/src/engine/client/ec_gfx.c.extlibs teeworlds-0.4.3-src/src/engine/client/ec_gfx.c
--- teeworlds-0.4.3-src/src/engine/client/ec_gfx.c.extlibs	2008-08-31 15:30:58.000000000 +0200
+++ teeworlds-0.4.3-src/src/engine/client/ec_gfx.c	2009-01-08 15:42:46.000000000 +0100
@@ -1,6 +1,6 @@
 /* copyright (c) 2007 magnus auvinen, see licence.txt for more info */
-#include <engine/external/glfw/include/GL/glfw.h>
-#include <engine/external/pnglite/pnglite.h>
+#include <GL/glfw.h>
+#include <pnglite.h>
 
 #include <engine/e_system.h>
 #include <engine/e_client_interface.h>
diff -up teeworlds-0.4.3-src/src/engine/client/ec_inp.c.extlibs teeworlds-0.4.3-src/src/engine/client/ec_inp.c
--- teeworlds-0.4.3-src/src/engine/client/ec_inp.c.extlibs	2008-08-31 15:30:58.000000000 +0200
+++ teeworlds-0.4.3-src/src/engine/client/ec_inp.c	2009-01-08 15:42:46.000000000 +0100
@@ -1,6 +1,6 @@
 /* copyright (c) 2007 magnus auvinen, see licence.txt for more info */
 #include <string.h>
-#include <engine/external/glfw/include/GL/glfw.h>
+#include <GL/glfw.h>
 
 #include <engine/e_system.h>
 #include <engine/e_client_interface.h>
diff -up teeworlds-0.4.3-src/src/engine/client/ec_snd.c.extlibs teeworlds-0.4.3-src/src/engine/client/ec_snd.c
--- teeworlds-0.4.3-src/src/engine/client/ec_snd.c.extlibs	2008-08-31 15:30:58.000000000 +0200
+++ teeworlds-0.4.3-src/src/engine/client/ec_snd.c	2009-01-08 15:42:46.000000000 +0100
@@ -3,8 +3,8 @@
 #include <engine/e_client_interface.h>
 #include <engine/e_config.h>
 
-#include <engine/external/portaudio/include/portaudio.h>
-#include <engine/external/wavpack/wavpack.h>
+#include <portaudio.h>
+#include <wavpack/wavpack.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <math.h>
@@ -372,13 +372,6 @@ static void rate_convert(int sid)
 }
 
 
-static FILE *file = NULL;
-
-static int read_data(void *buffer, int size)
-{
-	return fread(buffer, 1, size, file);	
-}
-
 int snd_load_wv(const char *filename)
 {
 	SAMPLE *snd;
@@ -394,19 +387,12 @@ int snd_load_wv(const char *filename)
 	if(!sound_enabled)
 		return 1;
 
-	file = fopen(filename, "rb"); /* TODO: use system.h stuff for this */
-	if(!file)
-	{
-		dbg_msg("sound/wv", "failed to open %s", filename);
-		return -1;
-	}
-
 	sid = snd_alloc_id();
 	if(sid < 0)
 		return -1;
 	snd = &samples[sid];
 
-	context = WavpackOpenFileInput(read_data, error);
+	context = WavpackOpenFileInput(filename, error, 0, 0);
 	if (context)
 	{
 		int samples = WavpackGetNumSamples(context);
@@ -461,9 +447,6 @@ int snd_load_wv(const char *filename)
 		dbg_msg("sound/wv", "failed to open %s: %s", filename, error);
 	}
 
-	fclose(file);
-	file = NULL;
-
 	if(config.debug)
 		dbg_msg("sound/wv", "loaded %s", filename);
 
diff -up teeworlds-0.4.3-src/src/engine/e_datafile.c.extlibs teeworlds-0.4.3-src/src/engine/e_datafile.c
--- teeworlds-0.4.3-src/src/engine/e_datafile.c.extlibs	2008-08-31 15:30:58.000000000 +0200
+++ teeworlds-0.4.3-src/src/engine/e_datafile.c	2009-01-08 15:42:46.000000000 +0100
@@ -1,7 +1,7 @@
 /* copyright (c) 2007 magnus auvinen, see licence.txt for more info */
 #include "e_system.h"
 #include "e_datafile.h"
-#include "external/zlib/zlib.h"
+#include <zlib.h>
 
 static const int DEBUG=0;
 
diff -up teeworlds-0.4.3-src/src/tools/dilate.c.extlibs teeworlds-0.4.3-src/src/tools/dilate.c
--- teeworlds-0.4.3-src/src/tools/dilate.c.extlibs	2008-08-31 15:30:58.000000000 +0200
+++ teeworlds-0.4.3-src/src/tools/dilate.c	2009-01-08 15:42:46.000000000 +0100
@@ -1,6 +1,9 @@
 /* copyright (c) 2007 magnus auvinen, see licence.txt for more info */
 
-#include "../engine/external/pnglite/pnglite.c"
+#include <sys/types.h>
+#include <string.h>
+#include <stdio.h>
+#include <pnglite.h>
 
 typedef struct pixel_t
 {
diff -up teeworlds-0.4.3-src/src/tools/tileset_borderfix.c.extlibs teeworlds-0.4.3-src/src/tools/tileset_borderfix.c
--- teeworlds-0.4.3-src/src/tools/tileset_borderfix.c.extlibs	2008-08-31 15:30:58.000000000 +0200
+++ teeworlds-0.4.3-src/src/tools/tileset_borderfix.c	2009-01-08 15:42:46.000000000 +0100
@@ -1,6 +1,9 @@
 /* copyright (c) 2007 magnus auvinen, see licence.txt for more info */
 
-#include "../engine/external/pnglite/pnglite.c"
+#include <sys/types.h>
+#include <string.h>
+#include <stdio.h>
+#include <pnglite.h>
 
 typedef struct pixel_t
 {


--- NEW FILE teeworlds.desktop ---
[Desktop Entry]
Categories=Game;ArcadeGame;
Name=Teeworlds
Type=Application
Terminal=false
Exec=teeworlds
Icon=teeworlds
Comment=Online multi-player platform 2D shooter
Encoding=UTF-8


--- NEW FILE teeworlds.spec ---
Name:           teeworlds
Version:        0.4.3
Release:        5%{?dist}
Summary:        Online multi-player platform 2D shooter

Group:          Amusements/Games
License:        Teeworlds
URL:            http://www.teeworlds.com/
Source0:        http://www.teeworlds.com/files/%{name}-%{version}-src.tar.gz
Source1:        %{name}.png
Source2:        %{name}.desktop
Patch0:         %{name}-datadir.patch
Patch1:         %{name}-extlibs.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  mesa-libGLU-devel
BuildRequires:  bam = 0.0.%{version}
BuildRequires:  python-devel
BuildRequires:  alsa-lib-devel
BuildRequires:  desktop-file-utils
BuildRequires:  zlib-devel
BuildRequires:  libglfw-devel
BuildRequires:  wavpack-devel
BuildRequires:  portaudio-devel
BuildRequires:  pnglite-devel
Requires:       %{name}-data
   

%description
The game features cartoon-themed graphics and physics, 
and relies heavily on classic shooter weaponry and gameplay. 
The controls are heavily inspired by the FPS genre of computer games. 

%package        server
Summary:        Server for %{name}
Group:          Amusements/Games
Requires:       %{name}-data


%description    server
Data for %{name}, an online multi-player platform 2D shooter. 

%package        data
Summary:        Data-files for %{name}
Group:          Amusements/Games


%description    data
Data-files for %{name}, an online multi-player platform 2D shooter.


%prep
%setup -q -n %{name}-%{version}-src

%patch0 -p1 -b .datadir
%patch1 -p1 -b .extlibs
rm -rf src/engine/external

iconv -f iso-8859-1 -t utf-8 readme.txt > readme.txt.utf8
sed -i 's|\r$||g' readme.txt.utf8
touch -c -r readme.txt readme.txt.utf8
mv readme.txt.utf8 readme.txt

%build
sed 's|-D__OPTFLAGS__|%{optflags}|' -i default.bam
bam -v release


%install
rm -rf %{buildroot}
mkdir -p %{buildroot}%{_datadir}/%{name}/data
mkdir -p %{buildroot}%{_datadir}/pixmaps

install -D -m 0755 %{name} \
        %{buildroot}%{_bindir}/%{name}

install -D -m 0755 %{name}_srv \
        %{buildroot}%{_bindir}/%{name}-srv

cp -pr data/* \
   %{buildroot}%{_datadir}/%{name}

install -p -m 0644 %{SOURCE1} \
        %{buildroot}%{_datadir}/pixmaps/%{name}.png


desktop-file-install \
                     %if 0%{?rhel}
                     --vendor="" \
                     %endif
                     --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
                     %{SOURCE2}


%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%doc readme.txt license.txt
%{_bindir}/%{name}
%{_datadir}/pixmaps/%{name}.png
%{_datadir}/applications/%{name}.desktop


%files data
%defattr(-,root,root,-)
%{_datadir}/%{name}/


%files server
%defattr(-,root,root,-)
%doc readme.txt license.txt
%{_bindir}/%{name}-srv


%changelog
* Fri Jan 02 2009 Simon Wesp <cassmodiah at fedoraproject.org> 0.4.3-5
- Remove requires from subpackage 'data'
- Correct description 

* Thu Jan 01 2009 Simon Wesp <cassmodiah at fedoraproject.org> 0.4.3-4
- Drop desktop-file and icon for subpackage 'server'
- Honor timestamp for converted file
- Add and correct Lubomir's changes
- Remove all comments
- Correct License-Tag (again)
- Add datadir patch

* Wed Dec 31 2008 Lubomir Rintel <lkundrak at v3.sk> 0.4.3-3
- Outsource the dependencies (extlib-patch)
- Use optflags

* Thu Sep 18 2008 Simon Wesp <cassmodiah at fedoraproject.org> 0.4.3-2
- Recheck and conform licensing and list it in a comment
- Correct BuildRequires

* Sat Sep 13 2008 Simon Wesp <cassmodiah at fedoraproject.org> 0.4.3-1
- Initial Release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/teeworlds/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	4 Jan 2009 20:09:55 -0000	1.1
+++ .cvsignore	8 Jan 2009 14:49:21 -0000	1.2
@@ -0,0 +1,2 @@
+teeworlds-0.4.3-src.tar.gz
+teeworlds.png


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/teeworlds/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	4 Jan 2009 20:09:55 -0000	1.1
+++ sources	8 Jan 2009 14:49:21 -0000	1.2
@@ -0,0 +1,2 @@
+a31a8cbd1af3f71a462122166e5872d6  teeworlds-0.4.3-src.tar.gz
+d541e3afa7809bd73bb64adb0795cb65  teeworlds.png



From lkundrak at fedoraproject.org  Thu Jan  8 14:49:53 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Thu,  8 Jan 2009 14:49:53 +0000 (UTC)
Subject: rpms/teeworlds/devel teeworlds-datadir.patch, NONE,
	1.1 teeworlds-extlibs.patch, NONE, 1.1 teeworlds.desktop, NONE,
	1.1 teeworlds.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090108144953.0B64C700FD@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/teeworlds/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17025/devel

Modified Files:
	.cvsignore sources 
Added Files:
	teeworlds-datadir.patch teeworlds-extlibs.patch 
	teeworlds.desktop teeworlds.spec 
Log Message:
Import teeworlds

teeworlds-datadir.patch:

--- NEW FILE teeworlds-datadir.patch ---
diff -Naur teeworlds-0.4.3-src.old/datasrc/data.ds teeworlds-0.4.3-src/datasrc/data.ds
--- teeworlds-0.4.3-src.old/datasrc/data.ds	2008-08-31 15:30:59.000000000 +0200
+++ teeworlds-0.4.3-src/datasrc/data.ds	2008-11-04 18:45:37.000000000 +0100
@@ -1,228 +1,228 @@
 sounds {
 	gun_fire {
-		"data/audio/wp_gun_fire-01.wv"
-		"data/audio/wp_gun_fire-02.wv"
-		"data/audio/wp_gun_fire-03.wv"
+		"/usr/share/teeworlds/audio/wp_gun_fire-01.wv"
+		"/usr/share/teeworlds/audio/wp_gun_fire-02.wv"
+		"/usr/share/teeworlds/audio/wp_gun_fire-03.wv"
 	}
 
 	shotgun_fire {
-		"data/audio/wp_shotty_fire-01.wv"
-		"data/audio/wp_shotty_fire-02.wv"
-		"data/audio/wp_shotty_fire-03.wv"
+		"/usr/share/teeworlds/audio/wp_shotty_fire-01.wv"
+		"/usr/share/teeworlds/audio/wp_shotty_fire-02.wv"
+		"/usr/share/teeworlds/audio/wp_shotty_fire-03.wv"
 	}
 	
 	grenade_fire {
-		"data/audio/wp_flump_launch-01.wv"
-		"data/audio/wp_flump_launch-02.wv"
-		"data/audio/wp_flump_launch-03.wv"
+		"/usr/share/teeworlds/audio/wp_flump_launch-01.wv"
+		"/usr/share/teeworlds/audio/wp_flump_launch-02.wv"
+		"/usr/share/teeworlds/audio/wp_flump_launch-03.wv"
 	}
 	
 	hammer_fire {
-		"data/audio/wp_hammer_swing-01.wv"
-		"data/audio/wp_hammer_swing-02.wv"
-		"data/audio/wp_hammer_swing-03.wv"
+		"/usr/share/teeworlds/audio/wp_hammer_swing-01.wv"
+		"/usr/share/teeworlds/audio/wp_hammer_swing-02.wv"
+		"/usr/share/teeworlds/audio/wp_hammer_swing-03.wv"
 	}
 
 	hammer_hit {
-		"data/audio/wp_hammer_hit-01.wv"
-		"data/audio/wp_hammer_hit-02.wv"
-		"data/audio/wp_hammer_hit-03.wv"
+		"/usr/share/teeworlds/audio/wp_hammer_hit-01.wv"
+		"/usr/share/teeworlds/audio/wp_hammer_hit-02.wv"
+		"/usr/share/teeworlds/audio/wp_hammer_hit-03.wv"
 	}
 	
 	ninja_fire { 
-		"data/audio/wp_ninja_attack-01.wv"
-		"data/audio/wp_ninja_attack-02.wv"
-		"data/audio/wp_ninja_attack-03.wv"
+		"/usr/share/teeworlds/audio/wp_ninja_attack-01.wv"
+		"/usr/share/teeworlds/audio/wp_ninja_attack-02.wv"
+		"/usr/share/teeworlds/audio/wp_ninja_attack-03.wv"
 	}
 
 	grenade_explode {
-		"data/audio/wp_flump_explo-01.wv"
-		"data/audio/wp_flump_explo-02.wv"
-		"data/audio/wp_flump_explo-03.wv"
+		"/usr/share/teeworlds/audio/wp_flump_explo-01.wv"
+		"/usr/share/teeworlds/audio/wp_flump_explo-02.wv"
+		"/usr/share/teeworlds/audio/wp_flump_explo-03.wv"
 	}
 	
 	ninja_hit {
-		"data/audio/wp_ninja_hit-01.wv"
-		"data/audio/wp_ninja_hit-02.wv"
-		"data/audio/wp_ninja_hit-03.wv"
+		"/usr/share/teeworlds/audio/wp_ninja_hit-01.wv"
+		"/usr/share/teeworlds/audio/wp_ninja_hit-02.wv"
+		"/usr/share/teeworlds/audio/wp_ninja_hit-03.wv"
 	}
 	
 	rifle_fire {
-		"data/audio/wp_rifle_fire-01.wv"
-		"data/audio/wp_rifle_fire-02.wv"
-		"data/audio/wp_rifle_fire-03.wv"
+		"/usr/share/teeworlds/audio/wp_rifle_fire-01.wv"
+		"/usr/share/teeworlds/audio/wp_rifle_fire-02.wv"
+		"/usr/share/teeworlds/audio/wp_rifle_fire-03.wv"
 	}
 
 	rifle_bounce {
-		"data/audio/wp_rifle_bnce-01.wv"
-		"data/audio/wp_rifle_bnce-02.wv"
-		"data/audio/wp_rifle_bnce-03.wv"
+		"/usr/share/teeworlds/audio/wp_rifle_bnce-01.wv"
+		"/usr/share/teeworlds/audio/wp_rifle_bnce-02.wv"
+		"/usr/share/teeworlds/audio/wp_rifle_bnce-03.wv"
 	}
 
 	weapon_switch { 
-		"data/audio/wp_switch-01.wv"
-		"data/audio/wp_switch-02.wv"
-		"data/audio/wp_switch-03.wv"
+		"/usr/share/teeworlds/audio/wp_switch-01.wv"
+		"/usr/share/teeworlds/audio/wp_switch-02.wv"
+		"/usr/share/teeworlds/audio/wp_switch-03.wv"
 	}
 
 	player_pain_short {
-		"data/audio/vo_teefault_pain_short-01.wv"
-		"data/audio/vo_teefault_pain_short-02.wv"
-		"data/audio/vo_teefault_pain_short-03.wv"
-		"data/audio/vo_teefault_pain_short-04.wv"
-		"data/audio/vo_teefault_pain_short-05.wv"
-		"data/audio/vo_teefault_pain_short-06.wv"
-		"data/audio/vo_teefault_pain_short-07.wv"
-		"data/audio/vo_teefault_pain_short-08.wv"
-		"data/audio/vo_teefault_pain_short-09.wv"
-		"data/audio/vo_teefault_pain_short-10.wv"
-		"data/audio/vo_teefault_pain_short-11.wv"
-		"data/audio/vo_teefault_pain_short-12.wv"
+		"/usr/share/teeworlds/audio/vo_teefault_pain_short-01.wv"
+		"/usr/share/teeworlds/audio/vo_teefault_pain_short-02.wv"
+		"/usr/share/teeworlds/audio/vo_teefault_pain_short-03.wv"
+		"/usr/share/teeworlds/audio/vo_teefault_pain_short-04.wv"
+		"/usr/share/teeworlds/audio/vo_teefault_pain_short-05.wv"
+		"/usr/share/teeworlds/audio/vo_teefault_pain_short-06.wv"
+		"/usr/share/teeworlds/audio/vo_teefault_pain_short-07.wv"
+		"/usr/share/teeworlds/audio/vo_teefault_pain_short-08.wv"
+		"/usr/share/teeworlds/audio/vo_teefault_pain_short-09.wv"
+		"/usr/share/teeworlds/audio/vo_teefault_pain_short-10.wv"
+		"/usr/share/teeworlds/audio/vo_teefault_pain_short-11.wv"
+		"/usr/share/teeworlds/audio/vo_teefault_pain_short-12.wv"
 	}
 
 	player_pain_long {
-		"data/audio/vo_teefault_pain_long-01.wv"
-		"data/audio/vo_teefault_pain_long-02.wv"
+		"/usr/share/teeworlds/audio/vo_teefault_pain_long-01.wv"
+		"/usr/share/teeworlds/audio/vo_teefault_pain_long-02.wv"
 	}
 
 	body_land {
-		"data/audio/foley_land-01.wv"
-		"data/audio/foley_land-02.wv"
-		"data/audio/foley_land-03.wv"
-		"data/audio/foley_land-04.wv"
+		"/usr/share/teeworlds/audio/foley_land-01.wv"
+		"/usr/share/teeworlds/audio/foley_land-02.wv"
+		"/usr/share/teeworlds/audio/foley_land-03.wv"
+		"/usr/share/teeworlds/audio/foley_land-04.wv"
 	}
 	
 	player_airjump {
-		"data/audio/foley_dbljump-01.wv"
-		"data/audio/foley_dbljump-02.wv"
-		"data/audio/foley_dbljump-03.wv"
+		"/usr/share/teeworlds/audio/foley_dbljump-01.wv"
+		"/usr/share/teeworlds/audio/foley_dbljump-02.wv"
+		"/usr/share/teeworlds/audio/foley_dbljump-03.wv"
 	}
 
 	player_jump {
-		"data/audio/foley_foot_left-01.wv"
-		"data/audio/foley_foot_left-02.wv"
-		"data/audio/foley_foot_left-03.wv"
-		"data/audio/foley_foot_left-04.wv"
-		"data/audio/foley_foot_right-01.wv"
-		"data/audio/foley_foot_right-02.wv"
-		"data/audio/foley_foot_right-03.wv"
-		"data/audio/foley_foot_right-04.wv"
+		"/usr/share/teeworlds/audio/foley_foot_left-01.wv"
+		"/usr/share/teeworlds/audio/foley_foot_left-02.wv"
+		"/usr/share/teeworlds/audio/foley_foot_left-03.wv"
+		"/usr/share/teeworlds/audio/foley_foot_left-04.wv"
+		"/usr/share/teeworlds/audio/foley_foot_right-01.wv"
+		"/usr/share/teeworlds/audio/foley_foot_right-02.wv"
+		"/usr/share/teeworlds/audio/foley_foot_right-03.wv"
+		"/usr/share/teeworlds/audio/foley_foot_right-04.wv"
 	}
 
 	player_die {
-		"data/audio/foley_body_splat-02.wv"
-		"data/audio/foley_body_splat-03.wv"
-		"data/audio/foley_body_splat-04.wv"
+		"/usr/share/teeworlds/audio/foley_body_splat-02.wv"
+		"/usr/share/teeworlds/audio/foley_body_splat-03.wv"
+		"/usr/share/teeworlds/audio/foley_body_splat-04.wv"
 	}
 	
 	player_spawn {
-		"data/audio/vo_teefault_spawn-01.wv"
-		"data/audio/vo_teefault_spawn-02.wv"
-		"data/audio/vo_teefault_spawn-03.wv"
-		"data/audio/vo_teefault_spawn-04.wv"
-		"data/audio/vo_teefault_spawn-05.wv"
-		"data/audio/vo_teefault_spawn-06.wv"
-		"data/audio/vo_teefault_spawn-07.wv"
+		"/usr/share/teeworlds/audio/vo_teefault_spawn-01.wv"
+		"/usr/share/teeworlds/audio/vo_teefault_spawn-02.wv"
+		"/usr/share/teeworlds/audio/vo_teefault_spawn-03.wv"
+		"/usr/share/teeworlds/audio/vo_teefault_spawn-04.wv"
+		"/usr/share/teeworlds/audio/vo_teefault_spawn-05.wv"
+		"/usr/share/teeworlds/audio/vo_teefault_spawn-06.wv"
+		"/usr/share/teeworlds/audio/vo_teefault_spawn-07.wv"
 	}
 	
 	player_skid {
-		"data/audio/sfx_skid-01.wv"
-		"data/audio/sfx_skid-02.wv"
-		"data/audio/sfx_skid-03.wv"
-		"data/audio/sfx_skid-04.wv"
+		"/usr/share/teeworlds/audio/sfx_skid-01.wv"
+		"/usr/share/teeworlds/audio/sfx_skid-02.wv"
+		"/usr/share/teeworlds/audio/sfx_skid-03.wv"
+		"/usr/share/teeworlds/audio/sfx_skid-04.wv"
 	}
 
 	tee_cry {
-		"data/audio/vo_teefault_cry-01.wv"
-		"data/audio/vo_teefault_cry-02.wv"
+		"/usr/share/teeworlds/audio/vo_teefault_cry-01.wv"
+		"/usr/share/teeworlds/audio/vo_teefault_cry-02.wv"
 	}
 
 	hook_loop { 
-		"data/audio/hook_loop-01.wv"
-		"data/audio/hook_loop-02.wv"
+		"/usr/share/teeworlds/audio/hook_loop-01.wv"
+		"/usr/share/teeworlds/audio/hook_loop-02.wv"
 	}
 	
 	hook_attach_ground {
-		"data/audio/hook_attach-01.wv"
-		"data/audio/hook_attach-02.wv"
-		"data/audio/hook_attach-03.wv"
+		"/usr/share/teeworlds/audio/hook_attach-01.wv"
+		"/usr/share/teeworlds/audio/hook_attach-02.wv"
+		"/usr/share/teeworlds/audio/hook_attach-03.wv"
 	}
 	
 	hook_attach_player {
-		"data/audio/foley_body_impact-01.wv"
-		"data/audio/foley_body_impact-02.wv"
-		"data/audio/foley_body_impact-03.wv"
+		"/usr/share/teeworlds/audio/foley_body_impact-01.wv"
+		"/usr/share/teeworlds/audio/foley_body_impact-02.wv"
+		"/usr/share/teeworlds/audio/foley_body_impact-03.wv"
 	}
 		
 	pickup_health {
-		"data/audio/sfx_pickup_hrt-01.wv"
-		"data/audio/sfx_pickup_hrt-02.wv"
+		"/usr/share/teeworlds/audio/sfx_pickup_hrt-01.wv"
+		"/usr/share/teeworlds/audio/sfx_pickup_hrt-02.wv"
 	}
 	
 	pickup_armor {
-		"data/audio/sfx_pickup_arm-01.wv"
-		"data/audio/sfx_pickup_arm-02.wv"
-		"data/audio/sfx_pickup_arm-03.wv"
-		"data/audio/sfx_pickup_arm-04.wv"
+		"/usr/share/teeworlds/audio/sfx_pickup_arm-01.wv"
+		"/usr/share/teeworlds/audio/sfx_pickup_arm-02.wv"
+		"/usr/share/teeworlds/audio/sfx_pickup_arm-03.wv"
+		"/usr/share/teeworlds/audio/sfx_pickup_arm-04.wv"
 	}
 	
 	pickup_grenade {
-		"data/audio/sfx_pickup_launcher.wv"
+		"/usr/share/teeworlds/audio/sfx_pickup_launcher.wv"
 	}
 	
 	pickup_shotgun {
-		"data/audio/sfx_pickup_sg.wv"
+		"/usr/share/teeworlds/audio/sfx_pickup_sg.wv"
 	}
 	
 	pickup_ninja {
-		"data/audio/sfx_pickup_ninja.wv"
+		"/usr/share/teeworlds/audio/sfx_pickup_ninja.wv"
 	}
 		
 	weapon_spawn {
-		"data/audio/sfx_spawn_wpn-01.wv"
-		"data/audio/sfx_spawn_wpn-02.wv"
-		"data/audio/sfx_spawn_wpn-03.wv"
+		"/usr/share/teeworlds/audio/sfx_spawn_wpn-01.wv"
+		"/usr/share/teeworlds/audio/sfx_spawn_wpn-02.wv"
+		"/usr/share/teeworlds/audio/sfx_spawn_wpn-03.wv"
 	}
 
 	weapon_noammo {
-		"data/audio/wp_noammo-01.wv"
-		"data/audio/wp_noammo-02.wv"
-		"data/audio/wp_noammo-03.wv"
-		"data/audio/wp_noammo-04.wv"
-		"data/audio/wp_noammo-05.wv"
+		"/usr/share/teeworlds/audio/wp_noammo-01.wv"
+		"/usr/share/teeworlds/audio/wp_noammo-02.wv"
+		"/usr/share/teeworlds/audio/wp_noammo-03.wv"
+		"/usr/share/teeworlds/audio/wp_noammo-04.wv"
+		"/usr/share/teeworlds/audio/wp_noammo-05.wv"
 	}
 
 	hit {
-		"data/audio/sfx_hit_weak-01.wv"
-		"data/audio/sfx_hit_weak-02.wv"
+		"/usr/share/teeworlds/audio/sfx_hit_weak-01.wv"
+		"/usr/share/teeworlds/audio/sfx_hit_weak-02.wv"
 	}
 
 	chat_server {
-		"data/audio/sfx_msg-server.wv"
+		"/usr/share/teeworlds/audio/sfx_msg-server.wv"
 	}
 	
 	chat_client {
-		"data/audio/sfx_msg-client.wv"
+		"/usr/share/teeworlds/audio/sfx_msg-client.wv"
 	}
 
 	ctf_drop {
-		"data/audio/sfx_ctf_drop.wv"
+		"/usr/share/teeworlds/audio/sfx_ctf_drop.wv"
 	}
 
 	ctf_return {
-		"data/audio/sfx_ctf_rtn.wv"
+		"/usr/share/teeworlds/audio/sfx_ctf_rtn.wv"
 	}
 	
 	ctf_grab_pl {
-		"data/audio/sfx_ctf_grab_pl.wv"
+		"/usr/share/teeworlds/audio/sfx_ctf_grab_pl.wv"
 	}
 
 	ctf_grab_en {
-		"data/audio/sfx_ctf_grab_en.wv"
+		"/usr/share/teeworlds/audio/sfx_ctf_grab_en.wv"
 	}
 
 	ctf_capture {
-		"data/audio/sfx_ctf_cap_pl.wv"
+		"/usr/share/teeworlds/audio/sfx_ctf_cap_pl.wv"
 	}
 }
 
@@ -233,34 +233,34 @@
 	}
 
 	game {
-		filename "data/game.png"
+		filename "/usr/share/teeworlds/game.png"
 	}
 
 	particles {
-		filename "data/particles.png"
+		filename "/usr/share/teeworlds/particles.png"
 	}
 
 	cursor {
-		filename "data/gui_cursor.png"
+		filename "/usr/share/teeworlds/gui_cursor.png"
 	}
 
 	banner {
-		filename "data/gui_logo.png"
+		filename "/usr/share/teeworlds/gui_logo.png"
 	}
 
 	emoticons {
-		filename "data/emoticons.png"
+		filename "/usr/share/teeworlds/emoticons.png"
 	}
 	
 	browseicons {
-		filename "data/browse_icons.png"
+		filename "/usr/share/teeworlds/browse_icons.png"
 	}
 
 	console_bg {
-		filename "data/console.png"
+		filename "/usr/share/teeworlds/console.png"
 	}
 	console_bar {
-		filename "data/console_bar.png"
+		filename "/usr/share/teeworlds/console_bar.png"
 	}
 }
 
diff -Naur teeworlds-0.4.3-src.old/src/game/client/gc_hooks.cpp teeworlds-0.4.3-src/src/game/client/gc_hooks.cpp
--- teeworlds-0.4.3-src.old/src/game/client/gc_hooks.cpp	2008-08-31 15:30:59.000000000 +0200
+++ teeworlds-0.4.3-src/src/game/client/gc_hooks.cpp	2008-11-04 18:45:37.000000000 +0100
@@ -68,7 +68,7 @@
 	
 	
 	int before = gfx_memory_usage();
-	font_set_load(&default_font, "data/fonts/default_font%d.tfnt", "data/fonts/default_font%d.png", "data/fonts/default_font%d_b.png", 14, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 36);
+	font_set_load(&default_font, "/usr/share/teeworlds/fonts/default_font%d.tfnt", "/usr/share/teeworlds/fonts/default_font%d.png", "/usr/share/teeworlds/fonts/default_font%d_b.png", 14, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 36);
 	dbg_msg("font", "gfx memory used for font textures: %d", gfx_memory_usage()-before);
 	
 	gfx_text_set_default_font(&default_font);
diff -Naur teeworlds-0.4.3-src.old/src/game/client/gc_map_image.cpp teeworlds-0.4.3-src/src/game/client/gc_map_image.cpp
--- teeworlds-0.4.3-src.old/src/game/client/gc_map_image.cpp	2008-08-31 15:30:59.000000000 +0200
+++ teeworlds-0.4.3-src/src/game/client/gc_map_image.cpp	2008-11-04 18:45:37.000000000 +0100
@@ -110,7 +110,7 @@
 		{
 			char buf[256];
 			char *name = (char *)map_get_data(img->image_name);
-			str_format(buf, sizeof(buf), "data/mapres/%s.png", name);
+			str_format(buf, sizeof(buf), "/usr/share/teeworlds/mapres/%s.png", name);
 			map_textures[i] = gfx_load_texture(buf, IMG_AUTO, 0);
 		}
 		else
diff -Naur teeworlds-0.4.3-src.old/src/game/client/gc_skin.cpp teeworlds-0.4.3-src/src/game/client/gc_skin.cpp
--- teeworlds-0.4.3-src.old/src/game/client/gc_skin.cpp	2008-08-31 15:30:58.000000000 +0200
+++ teeworlds-0.4.3-src/src/game/client/gc_skin.cpp	2008-11-04 18:45:37.000000000 +0100
@@ -24,7 +24,7 @@
 		return;
 		
 	char buf[512];
-	str_format(buf, sizeof(buf), "data/skins/%s", name);
+	str_format(buf, sizeof(buf), "/usr/share/teeworlds/skins/%s", name);
 	IMAGE_INFO info;
 	if(!gfx_load_png(&info, buf))
 	{
@@ -118,7 +118,7 @@
 void skin_init()
 {
 	// load skins
-	fs_listdir("data/skins", skinscan, 0);
+	fs_listdir("/usr/share/teeworlds/skins", skinscan, 0);
 }
 
 int skin_num()
diff -Naur teeworlds-0.4.3-src.old/src/game/editor/ed_editor.cpp teeworlds-0.4.3-src/src/game/editor/ed_editor.cpp
--- teeworlds-0.4.3-src.old/src/game/editor/ed_editor.cpp	2008-08-31 15:30:58.000000000 +0200
+++ teeworlds-0.4.3-src/src/game/editor/ed_editor.cpp	2008-11-04 18:45:37.000000000 +0100
@@ -422,11 +422,11 @@
 	
 	// ctrl+o to open
 	if(inp_key_down('O') && (inp_key_pressed(KEY_LCTRL) || inp_key_pressed(KEY_RCTRL)))
-		editor.invoke_file_dialog("Open Map", "Open", "data/maps/", "", callback_open_map);
+		editor.invoke_file_dialog("Open Map", "Open", "/usr/share/teeworlds/maps/", "", callback_open_map);
 	
 	// ctrl+s to save
 	if(inp_key_down('S') && (inp_key_pressed(KEY_LCTRL) || inp_key_pressed(KEY_RCTRL)))
-		editor.invoke_file_dialog("Save Map", "Save", "data/maps/", "", callback_save_map);
+		editor.invoke_file_dialog("Save Map", "Save", "/usr/share/teeworlds/maps/", "", callback_save_map);
 
 	// animate button
 	ui_vsplit_l(&toolbar, 30.0f, &button, &toolbar);
@@ -1551,7 +1551,7 @@
 	ui_hsplit_t(&view, 12.0f, &slot, &view);
 	if(do_editor_button(&replace_button, "Replace", 0, &slot, draw_editor_button_menuitem, 0, "Replaces the image with a new one"))
 	{
-		editor.invoke_file_dialog("Replace Image", "Replace", "data/mapres/", "", replace_image);
+		editor.invoke_file_dialog("Replace Image", "Replace", "/usr/share/teeworlds/mapres/", "", replace_image);
 		return 1;
 	}
 
@@ -1632,7 +1632,7 @@
 	ui_hsplit_t(&toolbox, 10.0f, &slot, &toolbox);
 	ui_hsplit_t(&toolbox, 12.0f, &slot, &toolbox);
 	if(do_editor_button(&new_image_button, "Add", 0, &slot, draw_editor_button, 0, "Load a new image to use in the map"))
-		editor.invoke_file_dialog("Add Image", "Add", "data/mapres/", "", add_image);
+		editor.invoke_file_dialog("Add Image", "Add", "/usr/share/teeworlds/mapres/", "", add_image);
 }
 
 
@@ -2168,7 +2168,7 @@
 	ui_hsplit_t(&view, 12.0f, &slot, &view);
 	if(do_editor_button(&open_button, "Open", 0, &slot, draw_editor_button_menuitem, 0, "Opens a map for editing"))
 	{
-		editor.invoke_file_dialog("Open Map", "Open", "data/maps/", "", callback_open_map);
+		editor.invoke_file_dialog("Open Map", "Open", "/usr/share/teeworlds/maps/", "", callback_open_map);
 		return 1;
 	}
 
@@ -2176,7 +2176,7 @@
 	ui_hsplit_t(&view, 12.0f, &slot, &view);
 	if(do_editor_button(&append_button, "Append", 0, &slot, draw_editor_button_menuitem, 0, "Opens a map and adds everything from that map to the current one"))
 	{
-		editor.invoke_file_dialog("Append Map", "Append", "data/maps/", "", callback_append_map);
+		editor.invoke_file_dialog("Append Map", "Append", "/usr/share/teeworlds/maps/", "", callback_append_map);
 		return 1;
 	}
 
@@ -2191,7 +2191,7 @@
 	ui_hsplit_t(&view, 12.0f, &slot, &view);
 	if(do_editor_button(&save_as_button, "Save As", 0, &slot, draw_editor_button_menuitem, 0, "Saves the current map under a new name"))
 	{
-		editor.invoke_file_dialog("Save Map", "Save", "data/maps/", "", callback_save_map);
+		editor.invoke_file_dialog("Save Map", "Save", "/usr/share/teeworlds/maps/", "", callback_save_map);
 		return 1;
 	}
 		
@@ -2402,10 +2402,10 @@
 
 extern "C" void editor_init()
 {
-	checker_texture = gfx_load_texture("data/editor/checker.png", IMG_AUTO, 0);
-	background_texture = gfx_load_texture("data/editor/background.png", IMG_AUTO, 0);
-	cursor_texture = gfx_load_texture("data/editor/cursor.png", IMG_AUTO, 0);
-	entities_texture = gfx_load_texture("data/editor/entities.png", IMG_AUTO, 0);
+	checker_texture = gfx_load_texture("/usr/share/teeworlds/editor/checker.png", IMG_AUTO, 0);
+	background_texture = gfx_load_texture("/usr/share/teeworlds/editor/background.png", IMG_AUTO, 0);
+	cursor_texture = gfx_load_texture("/usr/share/teeworlds/editor/cursor.png", IMG_AUTO, 0);
+	entities_texture = gfx_load_texture("/usr/share/teeworlds/editor/entities.png", IMG_AUTO, 0);
 	
 	tileset_picker.make_palette();
 	tileset_picker.readonly = true;
@@ -2478,13 +2478,13 @@
 		editor.gui_active = !editor.gui_active;
 
 	if(inp_key_down(KEY_F5))
-		editor.save("data/maps/debug_test2.map");
+		editor.save("/usr/share/teeworlds/maps/debug_test2.map");
 
 	if(inp_key_down(KEY_F6))
-		editor.load("data/maps/debug_test2.map");
+		editor.load("/usr/share/teeworlds/maps/debug_test2.map");
 	
 	if(inp_key_down(KEY_F8))
-		editor.load("data/maps/debug_test.map");
+		editor.load("/usr/share/teeworlds/maps/debug_test.map");
 	
 	if(inp_key_down(KEY_F10))
 		editor.show_mouse_pointer = false;
diff -Naur teeworlds-0.4.3-src.old/src/game/editor/ed_io.cpp teeworlds-0.4.3-src/src/game/editor/ed_io.cpp
--- teeworlds-0.4.3-src.old/src/game/editor/ed_io.cpp	2008-08-31 15:30:58.000000000 +0200
+++ teeworlds-0.4.3-src/src/game/editor/ed_io.cpp	2008-11-04 18:45:37.000000000 +0100
@@ -398,7 +398,7 @@
 				if(item->external)
 				{
 					char buf[256];
-					sprintf(buf, "data/mapres/%s.png", name);
+					sprintf(buf, "/usr/share/teeworlds/mapres/%s.png", name);
 					
 					// load external
 					IMAGE imginfo;

teeworlds-extlibs.patch:

--- NEW FILE teeworlds-extlibs.patch ---
* Do not use bundled libraries, link against Fedora-packaged ones
* Substitute compiler flags with a magic string, so we can sed it in SPEC file
  - Is there a way to pass BAM parameters? I guess not.
  - The magic string is "-D__OPTFLAGS__", which is useful to compile this without sedding

Lubomir Rintel <lkundrak at v3.sk>

diff -up teeworlds-0.4.3-src/default.bam.extlibs teeworlds-0.4.3-src/default.bam
--- teeworlds-0.4.3-src/default.bam.extlibs	2008-08-31 15:30:59.000000000 +0200
+++ teeworlds-0.4.3-src/default.bam	2009-01-08 15:43:48.000000000 +0100
@@ -214,7 +214,7 @@ function build(settings)
 
 	-- set some platform specific settings
 	settings.cc.includes:add("src")
-	settings.cc.includes:add("src/external/zlib")
+	--# settings.cc.includes:add("src/external/zlib")
 
 	if family == "unix" then
    		if platform == "macosx" then
@@ -232,6 +232,7 @@ function build(settings)
 			end
 			
 			settings.linker.libs:add("pthread")
+			settings.linker.libs:add("z")
 		end
 	elseif family == "windows" then
 		glfw_platform = "win32"
@@ -245,28 +246,31 @@ function build(settings)
 	end
 	
 	-- build glfw
-	glfw_settings = settings:copy()
-	glfw_settings.cc.includes:add("src/external/glfw/include")
-	glfw_settings.cc.includes:add("src/engine/external/glfw/lib")
-	glfw_settings.cc.includes:add("src/engine/external/glfw/lib/" .. glfw_platform)
-
-	glfw = Compile(glfw_settings, Collect(
-		"src/engine/external/glfw/lib/*.c",
-		"src/engine/external/glfw/lib/" .. glfw_platform .. "/*.c"))
+	--#plfw_settings = settings:copy()
+	--#plfw_settings.cc.includes:add("src/external/glfw/include")
+	--#plfw_settings.cc.includes:add("src/engine/external/glfw/lib")
+	--#plfw_settings.cc.includes:add("src/engine/external/glfw/lib/" .. glfw_platform)
+
+	--#plfw = Compile(glfw_settings, Collect(
+	--#	"src/en--#pine/external/glfw/lib/*.c",
+	--#	"src/en--#pine/external/glfw/lib/" .. glfw_platform .. "/*.c"))
 		
 	-- build portaudio
-	pa_settings = settings:copy()
-	pa_settings.cc.defines:add("PA_USE_" .. string.upper(pa_hostapi))
-	pa_settings.cc.defines:add("PA_NO_WMME")
-	pa_settings.cc.defines:add("PA_NO_ASIO")
-	pa_settings.cc.includes:add("src/engine/external/portaudio/include")
-	pa_settings.cc.includes:add("src/engine/external/portaudio/src/common")
-	pa_settings.cc.includes:add("src/engine/external/portaudio/src/os/" .. pa_platform)
-	
-	portaudio = Compile(pa_settings,
-		Collect("src/engine/external/portaudio/src/common/*.c"),
-		Collect("src/engine/external/portaudio/src/os/" .. pa_platform .. "/*.c"),
-		Collect("src/engine/external/portaudio/src/hostapi/" .. pa_hostapi .. "/*.c"))
+	--#pa_settings = settings:copy()
+	--#pa_settings.cc.defines:add("PA_USE_" .. string.upper(pa_hostapi))
+	--#pa_settings.cc.defines:add("PA_NO_WMME")
+	--#pa_settings.cc.defines:add("PA_NO_ASIO")
+	--#pa_settings.cc.includes:add("src/engine/external/portaudio/include")
+	--#pa_settings.cc.includes:add("src/engine/external/portaudio/src/common")
+	--#pa_settings.cc.includes:add("src/engine/external/portaudio/src/os/" .. pa_platform)
+	
+	--#portaudio = Compile(pa_settings,
+	--#	Collect("src/engine/external/portaudio/src/common/*.c"),
+	--#	Collect("src/engine/external/portaudio/src/os/" .. pa_platform .. "/*.c"),
+	--#	Collect("src/engine/external/portaudio/src/hostapi/" .. pa_hostapi .. "/*.c"))
+
+	settings.cc.flags = "-D__OPTFLAGS__"
+	settings.linker.flags = "-D__OPTFLAGS__"
 	
 	-- build game components
 	engine_settings = settings:copy()
@@ -275,11 +279,11 @@ function build(settings)
 		engine_settings.cc.flags = "/wd4244"
 	else
    		if platform == "macosx" then
-			engine_settings.cc.flags = "-Wall"
+			engine_settings.cc.flags = "-D__OPTFLAGS__"
 		else
-			engine_settings.cc.flags = "-Wall -pedantic-errors"
+			engine_settings.cc.flags = "-D__OPTFLAGS__ -pedantic-errors"
 		end
-		engine_settings.linker.flags = ""
+		engine_settings.linker.flags = "-D__OPTFLAGS__"
 	end
 
 	-- server
@@ -287,7 +291,7 @@ function build(settings)
 
 	-- client
 	client_settings = engine_settings:copy()
-	client_settings.cc.includes:add("src/external/glfw/include")
+	--#client_settings.cc.includes:add("src/external/glfw/include")
 
 	if family == "unix" then
    		if platform == "macosx" then
@@ -303,6 +307,10 @@ function build(settings)
 			client_settings.linker.libs:add("X11")
 			client_settings.linker.libs:add("GL")
 			client_settings.linker.libs:add("GLU")
+			client_settings.linker.libs:add("wavpack")
+			client_settings.linker.libs:add("portaudio")
+			client_settings.linker.libs:add("pnglite")
+			client_settings.linker.libs:add("glfw")
 		end
 	elseif family == "windows" then
 		client_settings.linker.libs:add("opengl32.lib")
@@ -311,9 +319,9 @@ function build(settings)
 	end
 
 	external_settings = settings:copy()
-	zlib = Compile(external_settings, Collect("src/engine/external/zlib/*.c"))
-	wavpack = Compile(external_settings, Collect("src/engine/external/wavpack/*.c"))
-	pnglite = Compile(external_settings, Collect("src/engine/external/pnglite/*.c"))
+	--#zlib = Compile(external_settings, Collect("src/engine/external/zlib/*.c"))
+	--#wavpack = Compile(external_settings, Collect("src/engine/external/wavpack/*.c"))
+	--#pnglite = Compile(external_settings, Collect("src/engine/external/pnglite/*.c"))
 
 	engine = Compile(engine_settings, Collect("src/engine/*.c"))
 	client = Compile(client_settings, Collect("src/engine/client/*.c"))
@@ -333,22 +341,26 @@ function build(settings)
 	tools = {}
 	for i,v in objs do
 		toolname = PathFilename(PathBase(v))
-		tools[i] = Link(settings, toolname, v, engine, zlib)
+		tools_settings = settings:copy()
+		if toolname == "tileset_borderfix" or toolname == "dilate" then
+			tools_settings.linker.libs:add("pnglite")
+		end
+		tools[i] = Link(tools_settings, toolname, v, engine)
 	end
 	
 	-- build client, server, version server and master server
 	client_exe = Link(client_settings, "teeworlds", game_shared, game_client,
-		engine, client, game_editor, glfw, portaudio, zlib, pnglite, wavpack,
+		engine, client, game_editor,
 		client_link_other)
 
 	server_exe = Link(server_settings, "teeworlds_srv", engine, server,
-		game_shared, game_server, zlib)
+		game_shared, game_server)
 
 	versionserver_exe = Link(server_settings, "versionsrv", versionserver,
-		engine, zlib)
+		engine)
 		
 	masterserver_exe = Link(server_settings, "mastersrv", masterserver,
-		engine, zlib)
+		engine)
 
 	if platform == "macosx" then
 		osxlaunch_exe = Link(client_settings, "TeeLaunch", osxlaunch)
diff -up teeworlds-0.4.3-src/src/engine/client/ec_gfx.c.extlibs teeworlds-0.4.3-src/src/engine/client/ec_gfx.c
--- teeworlds-0.4.3-src/src/engine/client/ec_gfx.c.extlibs	2008-08-31 15:30:58.000000000 +0200
+++ teeworlds-0.4.3-src/src/engine/client/ec_gfx.c	2009-01-08 15:42:46.000000000 +0100
@@ -1,6 +1,6 @@
 /* copyright (c) 2007 magnus auvinen, see licence.txt for more info */
-#include <engine/external/glfw/include/GL/glfw.h>
-#include <engine/external/pnglite/pnglite.h>
+#include <GL/glfw.h>
+#include <pnglite.h>
 
 #include <engine/e_system.h>
 #include <engine/e_client_interface.h>
diff -up teeworlds-0.4.3-src/src/engine/client/ec_inp.c.extlibs teeworlds-0.4.3-src/src/engine/client/ec_inp.c
--- teeworlds-0.4.3-src/src/engine/client/ec_inp.c.extlibs	2008-08-31 15:30:58.000000000 +0200
+++ teeworlds-0.4.3-src/src/engine/client/ec_inp.c	2009-01-08 15:42:46.000000000 +0100
@@ -1,6 +1,6 @@
 /* copyright (c) 2007 magnus auvinen, see licence.txt for more info */
 #include <string.h>
-#include <engine/external/glfw/include/GL/glfw.h>
+#include <GL/glfw.h>
 
 #include <engine/e_system.h>
 #include <engine/e_client_interface.h>
diff -up teeworlds-0.4.3-src/src/engine/client/ec_snd.c.extlibs teeworlds-0.4.3-src/src/engine/client/ec_snd.c
--- teeworlds-0.4.3-src/src/engine/client/ec_snd.c.extlibs	2008-08-31 15:30:58.000000000 +0200
+++ teeworlds-0.4.3-src/src/engine/client/ec_snd.c	2009-01-08 15:42:46.000000000 +0100
@@ -3,8 +3,8 @@
 #include <engine/e_client_interface.h>
 #include <engine/e_config.h>
 
-#include <engine/external/portaudio/include/portaudio.h>
-#include <engine/external/wavpack/wavpack.h>
+#include <portaudio.h>
+#include <wavpack/wavpack.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <math.h>
@@ -372,13 +372,6 @@ static void rate_convert(int sid)
 }
 
 
-static FILE *file = NULL;
-
-static int read_data(void *buffer, int size)
-{
-	return fread(buffer, 1, size, file);	
-}
-
 int snd_load_wv(const char *filename)
 {
 	SAMPLE *snd;
@@ -394,19 +387,12 @@ int snd_load_wv(const char *filename)
 	if(!sound_enabled)
 		return 1;
 
-	file = fopen(filename, "rb"); /* TODO: use system.h stuff for this */
-	if(!file)
-	{
-		dbg_msg("sound/wv", "failed to open %s", filename);
-		return -1;
-	}
-
 	sid = snd_alloc_id();
 	if(sid < 0)
 		return -1;
 	snd = &samples[sid];
 
-	context = WavpackOpenFileInput(read_data, error);
+	context = WavpackOpenFileInput(filename, error, 0, 0);
 	if (context)
 	{
 		int samples = WavpackGetNumSamples(context);
@@ -461,9 +447,6 @@ int snd_load_wv(const char *filename)
 		dbg_msg("sound/wv", "failed to open %s: %s", filename, error);
 	}
 
-	fclose(file);
-	file = NULL;
-
 	if(config.debug)
 		dbg_msg("sound/wv", "loaded %s", filename);
 
diff -up teeworlds-0.4.3-src/src/engine/e_datafile.c.extlibs teeworlds-0.4.3-src/src/engine/e_datafile.c
--- teeworlds-0.4.3-src/src/engine/e_datafile.c.extlibs	2008-08-31 15:30:58.000000000 +0200
+++ teeworlds-0.4.3-src/src/engine/e_datafile.c	2009-01-08 15:42:46.000000000 +0100
@@ -1,7 +1,7 @@
 /* copyright (c) 2007 magnus auvinen, see licence.txt for more info */
 #include "e_system.h"
 #include "e_datafile.h"
-#include "external/zlib/zlib.h"
+#include <zlib.h>
 
 static const int DEBUG=0;
 
diff -up teeworlds-0.4.3-src/src/tools/dilate.c.extlibs teeworlds-0.4.3-src/src/tools/dilate.c
--- teeworlds-0.4.3-src/src/tools/dilate.c.extlibs	2008-08-31 15:30:58.000000000 +0200
+++ teeworlds-0.4.3-src/src/tools/dilate.c	2009-01-08 15:42:46.000000000 +0100
@@ -1,6 +1,9 @@
 /* copyright (c) 2007 magnus auvinen, see licence.txt for more info */
 
-#include "../engine/external/pnglite/pnglite.c"
+#include <sys/types.h>
+#include <string.h>
+#include <stdio.h>
+#include <pnglite.h>
 
 typedef struct pixel_t
 {
diff -up teeworlds-0.4.3-src/src/tools/tileset_borderfix.c.extlibs teeworlds-0.4.3-src/src/tools/tileset_borderfix.c
--- teeworlds-0.4.3-src/src/tools/tileset_borderfix.c.extlibs	2008-08-31 15:30:58.000000000 +0200
+++ teeworlds-0.4.3-src/src/tools/tileset_borderfix.c	2009-01-08 15:42:46.000000000 +0100
@@ -1,6 +1,9 @@
 /* copyright (c) 2007 magnus auvinen, see licence.txt for more info */
 
-#include "../engine/external/pnglite/pnglite.c"
+#include <sys/types.h>
+#include <string.h>
+#include <stdio.h>
+#include <pnglite.h>
 
 typedef struct pixel_t
 {


--- NEW FILE teeworlds.desktop ---
[Desktop Entry]
Categories=Game;ArcadeGame;
Name=Teeworlds
Type=Application
Terminal=false
Exec=teeworlds
Icon=teeworlds
Comment=Online multi-player platform 2D shooter
Encoding=UTF-8


--- NEW FILE teeworlds.spec ---
Name:           teeworlds
Version:        0.4.3
Release:        5%{?dist}
Summary:        Online multi-player platform 2D shooter

Group:          Amusements/Games
License:        Teeworlds
URL:            http://www.teeworlds.com/
Source0:        http://www.teeworlds.com/files/%{name}-%{version}-src.tar.gz
Source1:        %{name}.png
Source2:        %{name}.desktop
Patch0:         %{name}-datadir.patch
Patch1:         %{name}-extlibs.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  mesa-libGLU-devel
BuildRequires:  bam = 0.0.%{version}
BuildRequires:  python-devel
BuildRequires:  alsa-lib-devel
BuildRequires:  desktop-file-utils
BuildRequires:  zlib-devel
BuildRequires:  libglfw-devel
BuildRequires:  wavpack-devel
BuildRequires:  portaudio-devel
BuildRequires:  pnglite-devel
Requires:       %{name}-data
   

%description
The game features cartoon-themed graphics and physics, 
and relies heavily on classic shooter weaponry and gameplay. 
The controls are heavily inspired by the FPS genre of computer games. 

%package        server
Summary:        Server for %{name}
Group:          Amusements/Games
Requires:       %{name}-data


%description    server
Data for %{name}, an online multi-player platform 2D shooter. 

%package        data
Summary:        Data-files for %{name}
Group:          Amusements/Games


%description    data
Data-files for %{name}, an online multi-player platform 2D shooter.


%prep
%setup -q -n %{name}-%{version}-src

%patch0 -p1 -b .datadir
%patch1 -p1 -b .extlibs
rm -rf src/engine/external

iconv -f iso-8859-1 -t utf-8 readme.txt > readme.txt.utf8
sed -i 's|\r$||g' readme.txt.utf8
touch -c -r readme.txt readme.txt.utf8
mv readme.txt.utf8 readme.txt

%build
sed 's|-D__OPTFLAGS__|%{optflags}|' -i default.bam
bam -v release


%install
rm -rf %{buildroot}
mkdir -p %{buildroot}%{_datadir}/%{name}/data
mkdir -p %{buildroot}%{_datadir}/pixmaps

install -D -m 0755 %{name} \
        %{buildroot}%{_bindir}/%{name}

install -D -m 0755 %{name}_srv \
        %{buildroot}%{_bindir}/%{name}-srv

cp -pr data/* \
   %{buildroot}%{_datadir}/%{name}

install -p -m 0644 %{SOURCE1} \
        %{buildroot}%{_datadir}/pixmaps/%{name}.png


desktop-file-install \
                     %if 0%{?rhel}
                     --vendor="" \
                     %endif
                     --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
                     %{SOURCE2}


%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%doc readme.txt license.txt
%{_bindir}/%{name}
%{_datadir}/pixmaps/%{name}.png
%{_datadir}/applications/%{name}.desktop


%files data
%defattr(-,root,root,-)
%{_datadir}/%{name}/


%files server
%defattr(-,root,root,-)
%doc readme.txt license.txt
%{_bindir}/%{name}-srv


%changelog
* Fri Jan 02 2009 Simon Wesp <cassmodiah at fedoraproject.org> 0.4.3-5
- Remove requires from subpackage 'data'
- Correct description 

* Thu Jan 01 2009 Simon Wesp <cassmodiah at fedoraproject.org> 0.4.3-4
- Drop desktop-file and icon for subpackage 'server'
- Honor timestamp for converted file
- Add and correct Lubomir's changes
- Remove all comments
- Correct License-Tag (again)
- Add datadir patch

* Wed Dec 31 2008 Lubomir Rintel <lkundrak at v3.sk> 0.4.3-3
- Outsource the dependencies (extlib-patch)
- Use optflags

* Thu Sep 18 2008 Simon Wesp <cassmodiah at fedoraproject.org> 0.4.3-2
- Recheck and conform licensing and list it in a comment
- Correct BuildRequires

* Sat Sep 13 2008 Simon Wesp <cassmodiah at fedoraproject.org> 0.4.3-1
- Initial Release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/teeworlds/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	4 Jan 2009 20:09:55 -0000	1.1
+++ .cvsignore	8 Jan 2009 14:49:22 -0000	1.2
@@ -0,0 +1,2 @@
+teeworlds-0.4.3-src.tar.gz
+teeworlds.png


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/teeworlds/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	4 Jan 2009 20:09:55 -0000	1.1
+++ sources	8 Jan 2009 14:49:22 -0000	1.2
@@ -0,0 +1,2 @@
+a31a8cbd1af3f71a462122166e5872d6  teeworlds-0.4.3-src.tar.gz
+d541e3afa7809bd73bb64adb0795cb65  teeworlds.png



From peter at fedoraproject.org  Thu Jan  8 14:52:06 2009
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Thu,  8 Jan 2009 14:52:06 +0000 (UTC)
Subject: rpms/flashrom/F-8 .cvsignore, 1.11,
	1.12 flashrom--Makefile_cleanup.diff, 1.4, 1.5 flashrom.spec,
	1.13, 1.14 import.log, 1.3, 1.4 sources, 1.11, 1.12
Message-ID: <20090108145206.534B6700FD@cvs1.fedora.phx.redhat.com>

Author: peter

Update of /cvs/extras/rpms/flashrom/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17538/F-8

Modified Files:
	.cvsignore flashrom--Makefile_cleanup.diff flashrom.spec 
	import.log sources 
Log Message:
svn ver. 3852


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/flashrom/F-8/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	3 Nov 2008 08:44:24 -0000	1.11
+++ .cvsignore	8 Jan 2009 14:51:35 -0000	1.12
@@ -1 +1 @@
-flashrom-3723.tar.bz2
+flashrom-3852.tar.bz2

flashrom--Makefile_cleanup.diff:

Index: flashrom--Makefile_cleanup.diff
===================================================================
RCS file: /cvs/extras/rpms/flashrom/F-8/flashrom--Makefile_cleanup.diff,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- flashrom--Makefile_cleanup.diff	7 Jul 2008 17:42:08 -0000	1.4
+++ flashrom--Makefile_cleanup.diff	8 Jan 2009 14:51:35 -0000	1.5
@@ -7,8 +7,8 @@
 -PREFIX  = /usr/local
 +PREFIX  = /usr
  #CFLAGS  = -O2 -g -Wall -Werror
--CFLAGS  = -Os -Wall -Werror # -DTS5300
-+#CFLAGS  = -Os -Wall -Werror # -DTS5300
+-CFLAGS  = -Os -Wall -Werror
++#CFLAGS  = -Os -Wall -Werror
  OS_ARCH	= $(shell uname)
  ifeq ($(OS_ARCH), SunOS)
  LDFLAGS = -lpci -lz


Index: flashrom.spec
===================================================================
RCS file: /cvs/extras/rpms/flashrom/F-8/flashrom.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- flashrom.spec	3 Nov 2008 08:44:24 -0000	1.13
+++ flashrom.spec	8 Jan 2009 14:51:35 -0000	1.14
@@ -1,9 +1,9 @@
-%define svnver 3723
+%define svnver 3852
 Summary:	Simple program for reading/writing BIOS chips content
 Name:		flashrom
 Version:	0
-Release:	0.14.20081103svn%{svnver}%{?dist}
-License:	GPLv2+
+Release:	0.15.20090112svn%{svnver}%{?dist}
+License:	GPLv2
 Group:		Applications/System
 # svn -r %{svnver} export svn://coreboot.org/repos/trunk/util/flashrom flashrom
 # tar -cjvf flashrom-%{svnver}.tar.bz2 flashrom
@@ -45,6 +45,18 @@
 %{_mandir}/man8/%{name}.*
 
 %changelog
+* Thu Jan  8 2009 Peter Lemenkov <lemenkov at gmail.com> 0-0.15.20090112svn3852
+- Changed license to GPLv2
+- SST49LF020 support
+- AMD-768 chipset support
+- i631x LPC support
+- Support the MX29LV040C
+- AMD SB700 flash enable
+- Support for the AMD/ATI SB600 southbridge SPI
+- SST25VF080B flash chip support
+- Support for 32Mbit SPI flash SST25VF032B
+- Support for bunch of Fujitsu and Macronix chips
+
 * Mon Nov  3 2008 Peter Lemenkov <lemenkov at gmail.com> 0-0.14.20081103svn3723
 - Dump ICH8/ICH9/ICH10 SPI registers
 - Add additional SPI sector erase and chip erase command


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/flashrom/F-8/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- import.log	3 Nov 2008 08:44:24 -0000	1.3
+++ import.log	8 Jan 2009 14:51:35 -0000	1.4
@@ -1,3 +1,4 @@
 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
 flashrom-0-0_14_20081103svn3723_fc9:F-8:flashrom-0-0.14.20081103svn3723.fc9.src.rpm:1225701812
+flashrom-0-0_15_20090112svn3852_fc10:F-8:flashrom-0-0.15.20090112svn3852.fc10.src.rpm:1231426185


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/flashrom/F-8/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	3 Nov 2008 08:44:24 -0000	1.11
+++ sources	8 Jan 2009 14:51:35 -0000	1.12
@@ -1 +1 @@
-37fb45aa795a6c79f0518d99e33626d4  flashrom-3723.tar.bz2
+4253d2a2a70ec3335c4b2a2bf40eefb8  flashrom-3852.tar.bz2



From mmahut at fedoraproject.org  Thu Jan  8 14:53:14 2009
From: mmahut at fedoraproject.org (Marek Mahut)
Date: Thu,  8 Jan 2009 14:53:14 +0000 (UTC)
Subject: rpms/eboard/F-9 eboard.desktop, NONE, 1.1 eboard.spec, NONE,
	1.1 sources, 1.1, 1.2
Message-ID: <20090108145314.DCD6A700FD@cvs1.fedora.phx.redhat.com>

Author: mmahut

Update of /cvs/pkgs/rpms/eboard/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17831

Modified Files:
	sources 
Added Files:
	eboard.desktop eboard.spec 
Log Message:
initial import



--- NEW FILE eboard.desktop ---
[Desktop Entry]
Name=Eboard
Comment=Play chess against an engine, on a LAN or on the Internet
Exec=eboard
Terminal=false
Type=Application
Categories=Application;BoardGame;


--- NEW FILE eboard.spec ---
Name:		eboard
Version:	1.1.1
Release:	1%{?dist}
Summary:	Chess board interface for ICS

Group:		Amusements/Games
License:	GPLv2+
URL:		http://eboard.sourceforge.net/
Source0:	http://dl.sf.net/%{name}/%{name}-%{version}.tar.bz2
Source1:	eboard.desktop
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	libstdc++-devel
BuildRequires:	libpng-devel
BuildRequires:	cairo-devel
BuildRequires:	pango-devel
BuildRequires:	perl
BuildRequires:	gtk2-devel
BuildRequires:	desktop-file-utils

%description
Eboard provides a chess board interface to ICS (Internet Chess Servers)
like FICS and to chess engines like GNU Chess, Sjeng and Crafty.

%prep 
%setup -q

%build
export EXTRAFLAGS=`echo '%{optflags}' | sed 's/ /:/g'`
./configure --prefix="/usr" --man-prefix="%{_mandir}" --extra-flags="$EXTRAFLAGS"
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR="$RPM_BUILD_ROOT"
desktop-file-install --vendor fedora --dir ${RPM_BUILD_ROOT}%{_datadir}/applications %{SOURCE1}

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING Documentation/*.txt INSTALL README TODO
%{_bindir}/eboard
%{_bindir}/eboard-addtheme
%{_bindir}/eboard-config
%{_datadir}/eboard/
%{_datadir}/applications/fedora-%{name}.desktop
%{_mandir}/man6/eboard.6*
%{_mandir}/man1/eboard-addtheme.1*
%{_mandir}/man1/eboard-config.1*

%changelog
* Wed Jul 30 2008 Marek Mahut <mmahut at fedoraproject.org> - 1.1.1-1
- Initial build


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eboard/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	23 Dec 2008 02:40:33 -0000	1.1
+++ sources	8 Jan 2009 14:52:44 -0000	1.2
@@ -0,0 +1 @@
+03dcdaa2bc85218b1b18c4bee276fea7  eboard-1.1.1.tar.bz2



From kwizart at fedoraproject.org  Thu Jan  8 14:57:25 2009
From: kwizart at fedoraproject.org (Chauvet Nicolas)
Date: Thu,  8 Jan 2009 14:57:25 +0000 (UTC)
Subject: rpms/filezilla/devel filezilla.spec, 1.27, 1.28 .cvsignore, 1.22,
	1.23 sources, 1.26, 1.27
Message-ID: <20090108145725.19515700FD@cvs1.fedora.phx.redhat.com>

Author: kwizart

Update of /cvs/pkgs/rpms/filezilla/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18737

Modified Files:
	filezilla.spec .cvsignore sources 
Log Message:
Update to 3.2.0



Index: filezilla.spec
===================================================================
RCS file: /cvs/pkgs/rpms/filezilla/devel/filezilla.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- filezilla.spec	4 Dec 2008 18:06:00 -0000	1.27
+++ filezilla.spec	8 Jan 2009 14:56:54 -0000	1.28
@@ -1,12 +1,14 @@
+#define fz_rc   rc2
+
 Name:           filezilla
-Version:        3.1.6
-Release:        1%{?dist}
+Version:        3.2.0
+Release:        1%{?fz_rc:_%{?fz_rc}}%{?dist}
 Summary:        FileZilla FTP, FTPS and SFTP client
 
 Group:          Applications/Internet
 License:        GPLv2+
 URL:            http://filezilla-project.org/
-Source0:        http://downloads.sourceforge.net/%{name}/FileZilla_%{version}_src.tar.bz2
+Source0:        http://downloads.sourceforge.net/%{name}/FileZilla_%{version}%{?fz_rc:-%{?fz_rc}}_src.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 ## Needed if autogen.sh is invoked
@@ -16,6 +18,8 @@
 BuildRequires:  cppunit-devel >= 1.10.2
 ##
 BuildRequires:  desktop-file-utils
+
+BuildRequires:  dbus-devel
 BuildRequires:  gettext
 BuildRequires:  gnutls-devel >= 2.0.4
 BuildRequires:  libidn-devel
@@ -38,9 +42,7 @@
 
 
 %prep
-%setup -q -n %{name}-%{version}
-
-#sed -i -e 's/2.0.4/1.6.3/' configure.in
+%setup -q -n %{name}-%{version}%{?fz_rc:-%{?fz_rc}}
 
 # Run autotools if needed
 # sh autoconf
@@ -117,6 +119,14 @@
 
 
 %changelog
+* Thu Jan  8 2009 kwizart < kwizart at gmail.com > - 3.2.0-1
+- Update to 3.2.0 stable
+
+* Tue Jan  6 2009 kwizart < kwizart at gmail.com > - 3.2.0-0.1_rc2
+- Update to 3.2.0-rc2
+- Add BR dbus-devel - Needs a fix for gnome-session
+  see http://bugzilla.gnome.org/show_bug.cgi?id=559469
+
 * Thu Dec  4 2008 kwizart < kwizart at gmail.com > - 3.1.6-1
 - Update to 3.1.6
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/filezilla/devel/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- .cvsignore	4 Dec 2008 18:06:00 -0000	1.22
+++ .cvsignore	8 Jan 2009 14:56:54 -0000	1.23
@@ -1 +1 @@
-FileZilla_3.1.6_src.tar.bz2
+FileZilla_3.2.0_src.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/filezilla/devel/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- sources	4 Dec 2008 18:06:00 -0000	1.26
+++ sources	8 Jan 2009 14:56:54 -0000	1.27
@@ -1 +1 @@
-c72dffb9a56086f7d94cba045035d77e  FileZilla_3.1.6_src.tar.bz2
+b57fa73db4028b81efc275b911cfc3c2  FileZilla_3.2.0_src.tar.bz2



From atkac at fedoraproject.org  Thu Jan  8 14:59:44 2009
From: atkac at fedoraproject.org (Adam Tkac)
Date: Thu,  8 Jan 2009 14:59:44 +0000 (UTC)
Subject: rpms/bind/F-9 bind.spec,1.271,1.272
Message-ID: <20090108145944.DC690700FD@cvs1.fedora.phx.redhat.com>

Author: atkac

Update of /cvs/pkgs/rpms/bind/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19031

Modified Files:
	bind.spec 
Log Message:
- nsupdate.man has been moved to first section of manpages



Index: bind.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bind/F-9/bind.spec,v
retrieving revision 1.271
retrieving revision 1.272
diff -u -r1.271 -r1.272
--- bind.spec	8 Jan 2009 14:47:03 -0000	1.271
+++ bind.spec	8 Jan 2009 14:59:14 -0000	1.272
@@ -589,7 +589,7 @@
 %{_bindir}/nsupdate
 %defattr(0644,root,root,0755)
 %{_mandir}/man1/host.1*
-%{_mandir}/man8/nsupdate.8*
+%{_mandir}/man8/nsupdate.1*
 %{_mandir}/man1/dig.1*
 %{_mandir}/man1/nslookup.1*
 



From peter at fedoraproject.org  Thu Jan  8 15:03:03 2009
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Thu,  8 Jan 2009 15:03:03 +0000 (UTC)
Subject: rpms/flashrom/EL-5 .cvsignore, 1.11,
	1.12 flashrom--Makefile_cleanup.diff, 1.4, 1.5 flashrom.spec,
	1.13, 1.14 import.log, 1.3, 1.4 sources, 1.11, 1.12
Message-ID: <20090108150303.42FA4700FD@cvs1.fedora.phx.redhat.com>

Author: peter

Update of /cvs/extras/rpms/flashrom/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19808/EL-5

Modified Files:
	.cvsignore flashrom--Makefile_cleanup.diff flashrom.spec 
	import.log sources 
Log Message:
svn ver. 3852


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/flashrom/EL-5/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	3 Nov 2008 08:47:04 -0000	1.11
+++ .cvsignore	8 Jan 2009 15:02:32 -0000	1.12
@@ -1 +1 @@
-flashrom-3723.tar.bz2
+flashrom-3852.tar.bz2

flashrom--Makefile_cleanup.diff:

Index: flashrom--Makefile_cleanup.diff
===================================================================
RCS file: /cvs/extras/rpms/flashrom/EL-5/flashrom--Makefile_cleanup.diff,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- flashrom--Makefile_cleanup.diff	7 Jul 2008 17:46:03 -0000	1.4
+++ flashrom--Makefile_cleanup.diff	8 Jan 2009 15:02:32 -0000	1.5
@@ -7,8 +7,8 @@
 -PREFIX  = /usr/local
 +PREFIX  = /usr
  #CFLAGS  = -O2 -g -Wall -Werror
--CFLAGS  = -Os -Wall -Werror # -DTS5300
-+#CFLAGS  = -Os -Wall -Werror # -DTS5300
+-CFLAGS  = -Os -Wall -Werror
++#CFLAGS  = -Os -Wall -Werror
  OS_ARCH	= $(shell uname)
  ifeq ($(OS_ARCH), SunOS)
  LDFLAGS = -lpci -lz


Index: flashrom.spec
===================================================================
RCS file: /cvs/extras/rpms/flashrom/EL-5/flashrom.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- flashrom.spec	3 Nov 2008 08:47:04 -0000	1.13
+++ flashrom.spec	8 Jan 2009 15:02:32 -0000	1.14
@@ -1,9 +1,9 @@
-%define svnver 3723
+%define svnver 3852
 Summary:	Simple program for reading/writing BIOS chips content
 Name:		flashrom
 Version:	0
-Release:	0.14.20081103svn%{svnver}%{?dist}
-License:	GPLv2+
+Release:	0.15.20090112svn%{svnver}%{?dist}
+License:	GPLv2
 Group:		Applications/System
 # svn -r %{svnver} export svn://coreboot.org/repos/trunk/util/flashrom flashrom
 # tar -cjvf flashrom-%{svnver}.tar.bz2 flashrom
@@ -45,6 +45,18 @@
 %{_mandir}/man8/%{name}.*
 
 %changelog
+* Thu Jan  8 2009 Peter Lemenkov <lemenkov at gmail.com> 0-0.15.20090112svn3852
+- Changed license to GPLv2
+- SST49LF020 support
+- AMD-768 chipset support
+- i631x LPC support
+- Support the MX29LV040C
+- AMD SB700 flash enable
+- Support for the AMD/ATI SB600 southbridge SPI
+- SST25VF080B flash chip support
+- Support for 32Mbit SPI flash SST25VF032B
+- Support for bunch of Fujitsu and Macronix chips
+
 * Mon Nov  3 2008 Peter Lemenkov <lemenkov at gmail.com> 0-0.14.20081103svn3723
 - Dump ICH8/ICH9/ICH10 SPI registers
 - Add additional SPI sector erase and chip erase command


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/flashrom/EL-5/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- import.log	3 Nov 2008 08:47:04 -0000	1.3
+++ import.log	8 Jan 2009 15:02:32 -0000	1.4
@@ -1,3 +1,4 @@
 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
 flashrom-0-0_14_20081103svn3723_fc9:EL-5:flashrom-0-0.14.20081103svn3723.fc9.src.rpm:1225701973
+flashrom-0-0_15_20090112svn3852_fc10:EL-5:flashrom-0-0.15.20090112svn3852.fc10.src.rpm:1231426886


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/flashrom/EL-5/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	3 Nov 2008 08:47:04 -0000	1.11
+++ sources	8 Jan 2009 15:02:32 -0000	1.12
@@ -1 +1 @@
-37fb45aa795a6c79f0518d99e33626d4  flashrom-3723.tar.bz2
+4253d2a2a70ec3335c4b2a2bf40eefb8  flashrom-3852.tar.bz2



From ajax at fedoraproject.org  Thu Jan  8 15:07:25 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Thu,  8 Jan 2009 15:07:25 +0000 (UTC)
Subject: rpms/xorg-x11-server/devel
	xserver-1.5.99.3-broken-mtrr-header.patch, 
	NONE, 1.1 xorg-x11-server.spec, 1.387, 1.388
Message-ID: <20090108150725.A2D59700FD@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-serv20911

Modified Files:
	xorg-x11-server.spec 
Added Files:
	xserver-1.5.99.3-broken-mtrr-header.patch 
Log Message:
* Thu Jan 08 2009 Adam Jackson <ajax at redhat.com> 1.5.99.3-8
- xserver-1.5.99.3-broken-mtrr-header.patch: Unbreak broken mtrr.h.


xserver-1.5.99.3-broken-mtrr-header.patch:

--- NEW FILE xserver-1.5.99.3-broken-mtrr-header.patch ---
>From 32a51abce25df28d579eb73b42f06cc63741f17b Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax at redhat.com>
Date: Thu, 8 Jan 2009 10:03:52 -0500
Subject: [PATCH] HACK: Work around broken mtrr.h

---
 hw/kdrive/src/kmap.c                    |    1 +
 hw/xfree86/os-support/linux/lnx_video.c |    1 +
 2 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/hw/kdrive/src/kmap.c b/hw/kdrive/src/kmap.c
index 60e8ae1..537d740 100644
--- a/hw/kdrive/src/kmap.c
+++ b/hw/kdrive/src/kmap.c
@@ -27,6 +27,7 @@
 #include <unistd.h>
 #include <sys/mman.h>
 #ifdef HAVE_ASM_MTRR_H
+typedef unsigned int u32;
 #include <asm/mtrr.h>
 #endif
 
diff --git a/hw/xfree86/os-support/linux/lnx_video.c b/hw/xfree86/os-support/linux/lnx_video.c
index 688106a..535c3a0 100644
--- a/hw/xfree86/os-support/linux/lnx_video.c
+++ b/hw/xfree86/os-support/linux/lnx_video.c
@@ -44,6 +44,7 @@
 #endif
 
 #ifdef HAS_MTRR_SUPPORT
+typedef unsigned int u32;
 #include <asm/mtrr.h>
 #endif
 
-- 
1.6.0.3



Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.387
retrieving revision 1.388
diff -u -r1.387 -r1.388
--- xorg-x11-server.spec	7 Jan 2009 22:15:57 -0000	1.387
+++ xorg-x11-server.spec	8 Jan 2009 15:06:55 -0000	1.388
@@ -19,7 +19,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.5.99.3
-Release:   7%{?dist}
+Release:   8%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -76,6 +76,8 @@
 # 6005 should be in 1.5.99.4
 Patch6005: xserver-1.5.99.3-ddx-rules.patch
 Patch6006: xserver-1.5.99.3-offscreen-pixmaps.patch
+# hack around broken mtrr.h.  drop me as soon as possible.
+Patch6007: xserver-1.5.99.3-broken-mtrr-header.patch
 
 %define moduledir	%{_libdir}/xorg/modules
 %define drimoduledir	%{_libdir}/dri
@@ -493,6 +495,9 @@
 
 
 %changelog
+* Thu Jan 08 2009 Adam Jackson <ajax at redhat.com> 1.5.99.3-8
+- xserver-1.5.99.3-broken-mtrr-header.patch: Unbreak broken mtrr.h.
+
 * Wed Jan 07 2009 Adam Jackson <ajax at redhat.com> 1.5.99.3-7
 - xserver-1.5.99.3-offscreen-pixmaps.patch: Turn off offscreen pixmaps in XAA.
   Again.  Sigh.



From mmahut at fedoraproject.org  Thu Jan  8 15:08:47 2009
From: mmahut at fedoraproject.org (Marek Mahut)
Date: Thu,  8 Jan 2009 15:08:47 +0000 (UTC)
Subject: rpms/eboard/EL-5 eboard.desktop, NONE, 1.1 eboard.spec, NONE,
	1.1 sources, 1.1, 1.2
Message-ID: <20090108150847.A94FC700FD@cvs1.fedora.phx.redhat.com>

Author: mmahut

Update of /cvs/pkgs/rpms/eboard/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21154

Modified Files:
	sources 
Added Files:
	eboard.desktop eboard.spec 
Log Message:
initial import



--- NEW FILE eboard.desktop ---
[Desktop Entry]
Name=Eboard
Comment=Play chess against an engine, on a LAN or on the Internet
Exec=eboard
Terminal=false
Type=Application
Categories=Application;BoardGame;


--- NEW FILE eboard.spec ---
Name:		eboard
Version:	1.1.1
Release:	1%{?dist}
Summary:	Chess board interface for ICS

Group:		Amusements/Games
License:	GPLv2+
URL:		http://eboard.sourceforge.net/
Source0:	http://dl.sf.net/%{name}/%{name}-%{version}.tar.bz2
Source1:	eboard.desktop
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	libstdc++-devel
BuildRequires:	libpng-devel
BuildRequires:	cairo-devel
BuildRequires:	pango-devel
BuildRequires:	perl
BuildRequires:	gtk2-devel
BuildRequires:	desktop-file-utils

%description
Eboard provides a chess board interface to ICS (Internet Chess Servers)
like FICS and to chess engines like GNU Chess, Sjeng and Crafty.

%prep 
%setup -q

%build
export EXTRAFLAGS=`echo '%{optflags}' | sed 's/ /:/g'`
./configure --prefix="/usr" --man-prefix="%{_mandir}" --extra-flags="$EXTRAFLAGS"
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR="$RPM_BUILD_ROOT"
desktop-file-install --vendor fedora --dir ${RPM_BUILD_ROOT}%{_datadir}/applications %{SOURCE1}

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING Documentation/*.txt INSTALL README TODO
%{_bindir}/eboard
%{_bindir}/eboard-addtheme
%{_bindir}/eboard-config
%{_datadir}/eboard/
%{_datadir}/applications/fedora-%{name}.desktop
%{_mandir}/man6/eboard.6*
%{_mandir}/man1/eboard-addtheme.1*
%{_mandir}/man1/eboard-config.1*

%changelog
* Wed Jul 30 2008 Marek Mahut <mmahut at fedoraproject.org> - 1.1.1-1
- Initial build


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eboard/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	23 Dec 2008 02:40:33 -0000	1.1
+++ sources	8 Jan 2009 15:08:17 -0000	1.2
@@ -0,0 +1 @@
+03dcdaa2bc85218b1b18c4bee276fea7  eboard-1.1.1.tar.bz2



From atkac at fedoraproject.org  Thu Jan  8 15:09:36 2009
From: atkac at fedoraproject.org (Adam Tkac)
Date: Thu,  8 Jan 2009 15:09:36 +0000 (UTC)
Subject: rpms/bind/F-9 bind.spec,1.272,1.273
Message-ID: <20090108150936.C032F700FD@cvs1.fedora.phx.redhat.com>

Author: atkac

Update of /cvs/pkgs/rpms/bind/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21204

Modified Files:
	bind.spec 
Log Message:
and again. nsupdate.1.gz is in man1/ instead of man8/



Index: bind.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bind/F-9/bind.spec,v
retrieving revision 1.272
retrieving revision 1.273
diff -u -r1.272 -r1.273
--- bind.spec	8 Jan 2009 14:59:14 -0000	1.272
+++ bind.spec	8 Jan 2009 15:09:06 -0000	1.273
@@ -589,7 +589,7 @@
 %{_bindir}/nsupdate
 %defattr(0644,root,root,0755)
 %{_mandir}/man1/host.1*
-%{_mandir}/man8/nsupdate.1*
+%{_mandir}/man1/nsupdate.1*
 %{_mandir}/man1/dig.1*
 %{_mandir}/man1/nslookup.1*
 



From atkac at fedoraproject.org  Thu Jan  8 15:10:32 2009
From: atkac at fedoraproject.org (Adam Tkac)
Date: Thu,  8 Jan 2009 15:10:32 +0000 (UTC)
Subject: rpms/dnsperf/F-9 dnsperf.spec,1.1,1.2
Message-ID: <20090108151032.98B4B700FD@cvs1.fedora.phx.redhat.com>

Author: atkac

Update of /cvs/pkgs/rpms/dnsperf/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21495

Modified Files:
	dnsperf.spec 
Log Message:
- rebuild against updated bind



Index: dnsperf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dnsperf/F-9/dnsperf.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- dnsperf.spec	1 Nov 2008 17:11:44 -0000	1.1
+++ dnsperf.spec	8 Jan 2009 15:10:02 -0000	1.2
@@ -1,7 +1,7 @@
 Summary: Benchmarking authorative and recursing DNS servers
 Name: dnsperf
 Version: 1.0.1.0
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: MIT
 Url: http://www.nominum.com/services/measurement_tools.php
 Source: ftp://ftp.nominum.com/pub/nominum/dnsperf/%{version}/dnsperf-src-%{version}-1.tar.gz
@@ -41,6 +41,9 @@
 %{_mandir}/*/*
 
 %changelog
+* Thu Jan 08 2009 Adam Tkac <atkac redhat com> - 1.0.1.0-5
+- rebuild against updated bind
+
 * Wed Oct 31 2008 Paul Wouters <paul at xelerance.com> - 1.0.1.0-4
 - Changed license from BSD to MIT
 



From davej at fedoraproject.org  Thu Jan  8 15:11:09 2009
From: davej at fedoraproject.org (Dave Jones)
Date: Thu,  8 Jan 2009 15:11:09 +0000 (UTC)
Subject: rpms/kernel/devel patch-2.6.28-git11.bz2.sign, NONE, 1.1 .cvsignore,
	1.983, 1.984 config-generic, 1.212,
	1.213 config-powerpc32-generic, 1.28, 1.29 kernel.spec, 1.1199,
	1.1200 linux-2.6-defaults-pci_no_msi.patch, 1.2, 1.3 sources,
	1.945, 1.946 upstream, 1.857,
	1.858 linux-2.6-piix3-silence-quirk.patch, 1.1,
	NONE linux-2.6.27-pci-hush-allocation-failures.patch, 1.3,
	NONE patch-2.6.28-git9.bz2.sign, 1.1, NONE
Message-ID: <20090108151109.DD645700FD@cvs1.fedora.phx.redhat.com>

Author: davej

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21741

Modified Files:
	.cvsignore config-generic config-powerpc32-generic kernel.spec 
	linux-2.6-defaults-pci_no_msi.patch sources upstream 
Added Files:
	patch-2.6.28-git11.bz2.sign 
Removed Files:
	linux-2.6-piix3-silence-quirk.patch 
	linux-2.6.27-pci-hush-allocation-failures.patch 
	patch-2.6.28-git9.bz2.sign 
Log Message:
2.6.28-git11


--- NEW FILE patch-2.6.28-git11.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBJZev5yGugalF9Dw4RAi9HAJ4sR7Y36XDBHUeXEuK4QFTmW+KsZQCeIiQ8
XSXMVGkKv3MNQ+QowxFTwus=
=Y9qu
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.983
retrieving revision 1.984
diff -u -r1.983 -r1.984
--- .cvsignore	7 Jan 2009 14:00:26 -0000	1.983
+++ .cvsignore	8 Jan 2009 15:10:39 -0000	1.984
@@ -4,4 +4,4 @@
 temp-*
 kernel-2.6.28
 linux-2.6.28.tar.bz2
-patch-2.6.28-git9.bz2
+patch-2.6.28-git11.bz2


Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-generic,v
retrieving revision 1.212
retrieving revision 1.213
diff -u -r1.212 -r1.213
--- config-generic	7 Jan 2009 15:12:40 -0000	1.212
+++ config-generic	8 Jan 2009 15:10:39 -0000	1.213
@@ -77,6 +77,7 @@
 #
 CONFIG_PCI=y
 # CONFIG_PCI_DEBUG is not set
+# CONFIG_PCI_STUB is not set
 CONFIG_HT_IRQ=y
 CONFIG_PCI_MSI=y
 CONFIG_PCIEPORTBUS=y
@@ -1338,6 +1339,12 @@
 CONFIG_WIRELESS_EXT=y
 CONFIG_WIRELESS_EXT_SYSFS=y
 
+CONFIG_WIMAX=y
+CONFIG_WIMAX_DEBUG_LEVEL=8
+CONFIG_WIMAX_I2400M_USB=m
+CONFIG_WIMAX_I2400M_SDIO=m
+CONFIG_WIMAX_I2400M_DEBUG_LEVEL=8
+
 CONFIG_ADM8211=m
 CONFIG_ATH5K=m
 CONFIG_ATH5K_DEBUG=y
@@ -1987,6 +1994,7 @@
 CONFIG_SENSORS_LM90=m
 CONFIG_SENSORS_LM92=m
 CONFIG_SENSORS_LM93=m
+CONFIG_SENSORS_LTC4245=m
 CONFIG_SENSORS_MAX1619=m
 CONFIG_SENSORS_MAX6650=m
 CONFIG_SENSORS_MAX6875=m
@@ -2889,11 +2897,13 @@
 CONFIG_USB_SERIAL_NAVMAN=m
 CONFIG_USB_SERIAL_OPTION=y
 CONFIG_USB_SERIAL_OTI6858=m
+CONFIG_USB_SERIAL_OPTICON=m
 CONFIG_USB_SERIAL_OMNINET=m
 CONFIG_USB_SERIAL_PL2303=m
 CONFIG_USB_SERIAL_SAFE=m
 CONFIG_USB_SERIAL_SAFE_PADDED=y
-CONFIG_USB_SERIAL_SIERRAWIRELESS=y
+CONFIG_USB_SERIAL_SIERRAWIRELESS=m
+CONFIG_USB_SERIAL_SIEMENS_MPI=m
 CONFIG_USB_SERIAL_SPCP8X5=m
 CONFIG_USB_SERIAL_TI=m
 CONFIG_USB_SERIAL_VISOR=m
@@ -2934,6 +2944,7 @@
 # CONFIG_USB_HIDINPUT_POWERBOOK is not set
 # CONFIG_USB_ISP116X_HCD is not set
 # CONFIG_USB_ISP1760_HCD is not set
+# CONFIG_USB_OXU210HP_HCD is not set
 CONFIG_USB_IOWARRIOR=m
 CONFIG_USB_ISIGHTFW=m
 CONFIG_USB_VST=m


Index: config-powerpc32-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-powerpc32-generic,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- config-powerpc32-generic	29 Dec 2008 05:44:13 -0000	1.28
+++ config-powerpc32-generic	8 Jan 2009 15:10:39 -0000	1.29
@@ -183,3 +183,5 @@
 
 CONFIG_MTD_NAND_FSL_UPM=m
 
+CONFIG_USB_GPIO_VBUS=m
+


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1199
retrieving revision 1.1200
diff -u -r1.1199 -r1.1200
--- kernel.spec	8 Jan 2009 04:42:23 -0000	1.1199
+++ kernel.spec	8 Jan 2009 15:10:39 -0000	1.1200
@@ -57,7 +57,7 @@
 # The rc snapshot level
 %define rcrev 0
 # The git snapshot level
-%define gitrev 9
+%define gitrev 11
 # Set rpm version accordingly
 %define rpmversion 2.6.%{upstream_sublevel}
 %endif
@@ -659,12 +659,8 @@
 Patch2201: linux-2.6-firewire-git-pending.patch
 
 # Quiet boot fixes
-# silence piix3 in quiet boot (ie, qemu)
-Patch2800: linux-2.6-piix3-silence-quirk.patch
 # silence the ACPI blacklist code
 Patch2802: linux-2.6-silence-acpi-blacklist.patch
-# hush pci bar allocation failures
-Patch2804: linux-2.6.27-pci-hush-allocation-failures.patch
 
 %endif
 
@@ -1093,9 +1089,9 @@
 # disable message signaled interrupts
 ApplyPatch linux-2.6-defaults-pci_no_msi.patch
 # update the pciehp driver
-ApplyPatch linux-2.6-pciehp-update.patch
+#ApplyPatch linux-2.6-pciehp-update.patch
 # default to enabling passively listening for hotplug events
-ApplyPatch linux-2.6-defaults-pciehp.patch
+#ApplyPatch linux-2.6-defaults-pciehp.patch
 
 #
 # SCSI Bits.
@@ -1169,12 +1165,8 @@
 ApplyPatch linux-2.6-firewire-git-pending.patch
 fi
 
-# silence piix3 in quiet boot (ie, qemu)
-ApplyPatch linux-2.6-piix3-silence-quirk.patch
 # silence the ACPI blacklist code
 ApplyPatch linux-2.6-silence-acpi-blacklist.patch
-# hush pci bar allocation failures
-ApplyPatch linux-2.6.27-pci-hush-allocation-failures.patch
 
 # END OF PATCH APPLICATIONS
 
@@ -1751,6 +1743,9 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Thu Jan 08 2009 Dave Jones <davej at redhat.com>
+- 2.6.28-git11
+
 * Wed Jan  7 2009 Roland McGrath <roland at redhat.com>
 - utrace update
 

linux-2.6-defaults-pci_no_msi.patch:

Index: linux-2.6-defaults-pci_no_msi.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-defaults-pci_no_msi.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- linux-2.6-defaults-pci_no_msi.patch	8 Dec 2008 16:27:32 -0000	1.2
+++ linux-2.6-defaults-pci_no_msi.patch	8 Jan 2009 15:10:39 -0000	1.3
@@ -25,9 +25,9 @@
  
  /* Arch hooks */
  
-@@ -755,6 +755,11 @@ void pci_no_msi(void)
- 	pci_msi_enable = 0;
+@@ -788,6 +788,11 @@ int pci_msi_enabled(void)
  }
+ EXPORT_SYMBOL(pci_msi_enabled);
  
 +void pci_yes_msi(void)
 +{
@@ -50,20 +50,17 @@
  			} else if (!strcmp(str, "noaer")) {
  				pci_no_aer();
  			} else if (!strcmp(str, "nodomains")) {
-diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h
-index 9de87e9..c0327e7 100644
---- a/drivers/pci/pci.h
-+++ b/drivers/pci/pci.h
-@@ -97,10 +97,12 @@ extern unsigned int pci_pm_d3_delay;
+--- linux-2.6.28.noarch/drivers/pci/pci.h~	2009-01-08 09:45:35.000000000 -0500
++++ linux-2.6.28.noarch/drivers/pci/pci.h	2009-01-08 09:45:49.000000000 -0500
+@@ -105,9 +105,11 @@ extern unsigned int pci_pm_d3_delay;
  
  #ifdef CONFIG_PCI_MSI
  void pci_no_msi(void);
 +void pci_yes_msi(void);
  extern void pci_msi_init_pci_dev(struct pci_dev *dev);
- extern void __devinit msi_init(void);
  #else
  static inline void pci_no_msi(void) { }
 +static inline void pci_yes_msi(void) { }
  static inline void pci_msi_init_pci_dev(struct pci_dev *dev) { }
- static inline void msi_init(void) { }
  #endif
+ 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v
retrieving revision 1.945
retrieving revision 1.946
diff -u -r1.945 -r1.946
--- sources	7 Jan 2009 14:00:26 -0000	1.945
+++ sources	8 Jan 2009 15:10:39 -0000	1.946
@@ -1,2 +1,2 @@
 d351e44709c9810b85e29b877f50968a  linux-2.6.28.tar.bz2
-34659e8d421dce6877ba2a5a243b0533  patch-2.6.28-git9.bz2
+38a96fab0225830238c14cfd469a3721  patch-2.6.28-git11.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v
retrieving revision 1.857
retrieving revision 1.858
diff -u -r1.857 -r1.858
--- upstream	7 Jan 2009 14:00:26 -0000	1.857
+++ upstream	8 Jan 2009 15:10:39 -0000	1.858
@@ -1,2 +1,2 @@
 linux-2.6.28.tar.bz2
-patch-2.6.28-git9.bz2
+patch-2.6.28-git11.bz2


--- linux-2.6-piix3-silence-quirk.patch DELETED ---


--- linux-2.6.27-pci-hush-allocation-failures.patch DELETED ---


--- patch-2.6.28-git9.bz2.sign DELETED ---



From akurtakov at fedoraproject.org  Thu Jan  8 15:12:14 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Thu,  8 Jan 2009 15:12:14 +0000 (UTC)
Subject: rpms/eclipse-shelled/devel eclipse-shelled.spec, 1.1, 1.2 .cvsignore,
	1.2, 1.3 sources, 1.2, 1.3 fetch-shelled.sh, 1.1, 1.2
Message-ID: <20090108151214.97C95700FD@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/eclipse-shelled/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22136/devel

Modified Files:
	eclipse-shelled.spec .cvsignore sources fetch-shelled.sh 
Log Message:
Update to version 1.0.4.


Index: eclipse-shelled.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-shelled/devel/eclipse-shelled.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- eclipse-shelled.spec	2 Dec 2008 11:29:40 -0000	1.1
+++ eclipse-shelled.spec	8 Jan 2009 15:11:44 -0000	1.2
@@ -3,13 +3,13 @@
 
 Summary:          Eclipse Shell script editor
 Name:             eclipse-shelled
-Version:          1.0.3
-Release:          3%{?dist}
+Version:          1.0.4
+Release:          1%{?dist}
 License:          CPL
 URL:              http://sourceforge.net/projects/shelled
 Group:            Development/Tools
 ## sh fetch-shelled.sh
-Source0:          %{name}-src-%{version}.tar.bz2
+Source0:          http://superb-east.dl.sourceforge.net/sourceforge/shelled/shelled-src_1_0_4.tar.bz2
 Source1:          fetch-shelled.sh
 Requires:         eclipse-platform >= 1:3.4.0
 BuildRequires:    eclipse-pde
@@ -27,7 +27,7 @@
 
 %build
 # build the main shelled feature
-%{eclipse_base}/buildscripts/pdebuild
+%{eclipse_base}/buildscripts/pdebuild -a "-DjavacSource=1.5 -DjavacTarget=1.5"
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -48,6 +48,9 @@
 %doc com.something.eclipse.shelled.resources/about.html
 
 %changelog
+* Thu Jan 8 2009 Alexander Kurtakov <akurtako at redhat.com> 1.0.4-1
+- Update to version 1.0.4.
+
 * Thu Nov 27 2008 Alexander Kurtakov <akurtakov at redhat.com> 1.0.3-3
 - FIx %%doc handling.
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-shelled/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	2 Dec 2008 11:29:40 -0000	1.2
+++ .cvsignore	8 Jan 2009 15:11:44 -0000	1.3
@@ -1 +1,2 @@
 eclipse-shelled-src-1.0.3.tar.bz2
+shelled-src_1_0_4.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-shelled/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	2 Dec 2008 11:29:40 -0000	1.2
+++ sources	8 Jan 2009 15:11:44 -0000	1.3
@@ -1 +1 @@
-98cfa7cf5ab33802f2940066acca254e  eclipse-shelled-src-1.0.3.tar.bz2
+149af21e2495f6b6a1c82d09e509c734  shelled-src_1_0_4.tar.bz2


Index: fetch-shelled.sh
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-shelled/devel/fetch-shelled.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- fetch-shelled.sh	2 Dec 2008 11:29:40 -0000	1.1
+++ fetch-shelled.sh	8 Jan 2009 15:11:44 -0000	1.2
@@ -10,6 +10,6 @@
  com.something.eclipse.shelled.ui \
  ;
  do 
-  cvs -z3 -d:pserver:anonymous at shelled.cvs.sourceforge.net:/cvsroot/shelled export -r R1_0_3 $f
+  cvs -z3 -d:pserver:anonymous at shelled.cvs.sourceforge.net:/cvsroot/shelled export -r R1_0_4 $f
  done
-tar -cjf  ../eclipse-shelled-src-1.0.3.tar.bz2 *
\ No newline at end of file
+tar -cjf  ../shelled-src_1_0_4.tar.bz2 *
\ No newline at end of file



From ajax at fedoraproject.org  Thu Jan  8 15:26:19 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Thu,  8 Jan 2009 15:26:19 +0000 (UTC)
Subject: rpms/xorg-x11-server/devel
	xserver-1.5.99.3-broken-mtrr-header.patch, 1.1, 1.2
Message-ID: <20090108152619.2CAC4700FD@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-serv23538

Modified Files:
	xserver-1.5.99.3-broken-mtrr-header.patch 
Log Message:
more typedef lols

xserver-1.5.99.3-broken-mtrr-header.patch:

Index: xserver-1.5.99.3-broken-mtrr-header.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/xserver-1.5.99.3-broken-mtrr-header.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xserver-1.5.99.3-broken-mtrr-header.patch	8 Jan 2009 15:06:55 -0000	1.1
+++ xserver-1.5.99.3-broken-mtrr-header.patch	8 Jan 2009 15:25:48 -0000	1.2
@@ -12,10 +12,11 @@
 index 60e8ae1..537d740 100644
 --- a/hw/kdrive/src/kmap.c
 +++ b/hw/kdrive/src/kmap.c
-@@ -27,6 +27,7 @@
+@@ -27,6 +27,8 @@
  #include <unistd.h>
  #include <sys/mman.h>
  #ifdef HAVE_ASM_MTRR_H
++typedef unsigned char u8;
 +typedef unsigned int u32;
  #include <asm/mtrr.h>
  #endif
@@ -24,10 +25,11 @@
 index 688106a..535c3a0 100644
 --- a/hw/xfree86/os-support/linux/lnx_video.c
 +++ b/hw/xfree86/os-support/linux/lnx_video.c
-@@ -44,6 +44,7 @@
+@@ -44,6 +45,8 @@
  #endif
  
  #ifdef HAS_MTRR_SUPPORT
++typedef unsigned char u8;
 +typedef unsigned int u32;
  #include <asm/mtrr.h>
  #endif



From pkgdb at fedoraproject.org  Thu Jan  8 15:27:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 08 Jan 2009 15:27:03 +0000
Subject: [pkgdb] wireshark: dhurander3 has given up watchbugzilla
Message-ID: <20090108152703.85925208421@bastion.fedora.phx.redhat.com>

dhurander3 has given up the watchbugzilla acl on wireshark (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/wireshark



From sandeen at fedoraproject.org  Thu Jan  8 15:38:13 2009
From: sandeen at fedoraproject.org (Eric Sandeen)
Date: Thu,  8 Jan 2009 15:38:13 +0000 (UTC)
Subject: rpms/xfsprogs/devel xfsprogs.spec, 1.48,
	1.49 xfsprogs-2.10.2-fix-lib-perms.patch, 1.1, NONE
Message-ID: <20090108153813.E9DC9700FD@cvs1.fedora.phx.redhat.com>

Author: sandeen

Update of /cvs/pkgs/rpms/xfsprogs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25537

Modified Files:
	xfsprogs.spec 
Removed Files:
	xfsprogs-2.10.2-fix-lib-perms.patch 
Log Message:
* Thu Jan 08 2009 Eric Sandeen <sandeen at redhat.com> 2.10.2-3
- Fix perms of libhandle.so in specfile, not makefile



Index: xfsprogs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfsprogs/devel/xfsprogs.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- xfsprogs.spec	7 Jan 2009 22:53:10 -0000	1.48
+++ xfsprogs.spec	8 Jan 2009 15:37:43 -0000	1.49
@@ -1,7 +1,7 @@
 Summary:	Utilities for managing the XFS filesystem
 Name:		xfsprogs
 Version:	2.10.2
-Release:	2%{?dist}
+Release:	3%{?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
@@ -21,7 +21,6 @@
 Patch0:		xfsprogs-2.10.1-parallel-build.patch
 Patch1:		xfsprogs-2.10.1-libdisk-gfs2.patch
 Patch2:		xfsprogs-2.10.1-ustat.patch
-Patch3:		xfsprogs-2.10.2-fix-lib-perms.patch
 
 %description
 A set of commands to use the XFS filesystem, including mkfs.xfs.
@@ -55,7 +54,6 @@
 %patch0 -p2
 %patch1 -p2
 %patch2 -p2
-%patch3 -p1
 
 %build
 # xfsprogs abuses libexecdir
@@ -78,6 +76,8 @@
 # fix up symlink to be correct
 rm -f $RPM_BUILD_ROOT/%{_libdir}/libhandle.so
 ln -s ../../%{_lib}/libhandle.so.1 $RPM_BUILD_ROOT/%{_libdir}/libhandle.so
+chmod 0755 $RPM_BUILD_ROOT/%{_lib}/libhandle.so.*.*.*
+
 # remove non-versioned docs location
 rm -rf $RPM_BUILD_ROOT/%{_datadir}/doc/xfsprogs/
 
@@ -119,6 +119,9 @@
 %{_libdir}/*.so
 
 %changelog
+* Thu Jan 08 2009 Eric Sandeen <sandeen at redhat.com> 2.10.2-3
+- Fix perms of libhandle.so in specfile, not makefile
+
 * Wed Jan 07 2009 Eric Sandeen <sandeen at redhat.com> 2.10.2-2
 - Fix perms of libhandle.so so that it's properly stripped
 


--- xfsprogs-2.10.2-fix-lib-perms.patch DELETED ---



From akurtakov at fedoraproject.org  Thu Jan  8 15:38:30 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Thu,  8 Jan 2009 15:38:30 +0000 (UTC)
Subject: rpms/eclipse-shelled/F-10 fetch-shelled.sh, 1.1, 1.2 sources, 1.2, 
	1.3 eclipse-shelled.spec, 1.1, 1.2 .cvsignore, 1.2, 1.3
Message-ID: <20090108153830.5B778700FD@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/eclipse-shelled/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25585/F-10

Modified Files:
	fetch-shelled.sh sources eclipse-shelled.spec .cvsignore 
Log Message:
Update to version 1.0.4.


Index: fetch-shelled.sh
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-shelled/F-10/fetch-shelled.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- fetch-shelled.sh	2 Dec 2008 11:35:34 -0000	1.1
+++ fetch-shelled.sh	8 Jan 2009 15:38:00 -0000	1.2
@@ -10,6 +10,6 @@
  com.something.eclipse.shelled.ui \
  ;
  do 
-  cvs -z3 -d:pserver:anonymous at shelled.cvs.sourceforge.net:/cvsroot/shelled export -r R1_0_3 $f
+  cvs -z3 -d:pserver:anonymous at shelled.cvs.sourceforge.net:/cvsroot/shelled export -r R1_0_4 $f
  done
-tar -cjf  ../eclipse-shelled-src-1.0.3.tar.bz2 *
\ No newline at end of file
+tar -cjf  ../shelled-src_1_0_4.tar.bz2 *
\ No newline at end of file


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-shelled/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	2 Dec 2008 11:35:34 -0000	1.2
+++ sources	8 Jan 2009 15:38:00 -0000	1.3
@@ -1 +1 @@
-98cfa7cf5ab33802f2940066acca254e  eclipse-shelled-src-1.0.3.tar.bz2
+149af21e2495f6b6a1c82d09e509c734  shelled-src_1_0_4.tar.bz2


Index: eclipse-shelled.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-shelled/F-10/eclipse-shelled.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- eclipse-shelled.spec	2 Dec 2008 11:35:34 -0000	1.1
+++ eclipse-shelled.spec	8 Jan 2009 15:38:00 -0000	1.2
@@ -3,13 +3,13 @@
 
 Summary:          Eclipse Shell script editor
 Name:             eclipse-shelled
-Version:          1.0.3
-Release:          3%{?dist}
+Version:          1.0.4
+Release:          1%{?dist}
 License:          CPL
 URL:              http://sourceforge.net/projects/shelled
 Group:            Development/Tools
 ## sh fetch-shelled.sh
-Source0:          %{name}-src-%{version}.tar.bz2
+Source0:          http://superb-east.dl.sourceforge.net/sourceforge/shelled/shelled-src_1_0_4.tar.bz2
 Source1:          fetch-shelled.sh
 Requires:         eclipse-platform >= 1:3.4.0
 BuildRequires:    eclipse-pde
@@ -27,7 +27,7 @@
 
 %build
 # build the main shelled feature
-%{eclipse_base}/buildscripts/pdebuild
+%{eclipse_base}/buildscripts/pdebuild -a "-DjavacSource=1.5 -DjavacTarget=1.5"
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -48,6 +48,9 @@
 %doc com.something.eclipse.shelled.resources/about.html
 
 %changelog
+* Thu Jan 8 2009 Alexander Kurtakov <akurtako at redhat.com> 1.0.4-1
+- Update to version 1.0.4.
+
 * Thu Nov 27 2008 Alexander Kurtakov <akurtakov at redhat.com> 1.0.3-3
 - FIx %%doc handling.
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-shelled/F-10/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	2 Dec 2008 11:35:34 -0000	1.2
+++ .cvsignore	8 Jan 2009 15:38:00 -0000	1.3
@@ -1 +1,2 @@
 eclipse-shelled-src-1.0.3.tar.bz2
+shelled-src_1_0_4.tar.bz2



From stransky at fedoraproject.org  Thu Jan  8 15:39:41 2009
From: stransky at fedoraproject.org (Martin Stransky)
Date: Thu,  8 Jan 2009 15:39:41 +0000 (UTC)
Subject: rpms/nspluginwrapper/devel nspluginwrapper-1.3.0-configure.patch,
	NONE, 1.1 nspluginwrapper-1.3.0-directory.patch, NONE,
	1.1 nspluginwrapper-1.3.0-make.patch, NONE,
	1.1 plugin-config-native.patch, NONE, 1.1 .cvsignore, 1.9,
	1.10 nspluginwrapper.spec, 1.71, 1.72 sources, 1.13,
	1.14 nspluginwrapper-1.1.4-configure.patch, 1.1,
	NONE nspluginwrapper-1.1.4-make.patch, 1.1,
	NONE nspluginwrapper-1.1.8-directory.patch, 1.1,
	NONE nspluginwrapper-1.1.8-fix-invalid-RPC-after-NPP_Destroy.patch,
	1.1, NONE
Message-ID: <20090108153941.26243700FD@cvs1.fedora.phx.redhat.com>

Author: stransky

Update of /cvs/pkgs/rpms/nspluginwrapper/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25895

Modified Files:
	.cvsignore nspluginwrapper.spec sources 
Added Files:
	nspluginwrapper-1.3.0-configure.patch 
	nspluginwrapper-1.3.0-directory.patch 
	nspluginwrapper-1.3.0-make.patch plugin-config-native.patch 
Removed Files:
	nspluginwrapper-1.1.4-configure.patch 
	nspluginwrapper-1.1.4-make.patch 
	nspluginwrapper-1.1.8-directory.patch 
	nspluginwrapper-1.1.8-fix-invalid-RPC-after-NPP_Destroy.patch 
Log Message:
* Thu Jan 8 2009 Martin Stransky <stransky at redhat.com> 1.1.8-3
- Updated to 1.3.0 and removed some fedora build patches



nspluginwrapper-1.3.0-configure.patch:

--- NEW FILE nspluginwrapper-1.3.0-configure.patch ---
diff -up nspluginwrapper-1.3.0/configure.conf nspluginwrapper-1.3.0/configure
--- nspluginwrapper-1.3.0/configure.conf	2009-01-02 15:22:29.000000000 +0100
+++ nspluginwrapper-1.3.0/configure	2009-01-07 12:06:21.000000000 +0100
@@ -559,10 +559,6 @@ for dir in $x_base_dirs; do
 	fi
     fi
 done
-if test -z "$x_base_dir"; then
-    echo "X11/Xt environment not found"
-    exit 1
-fi
 
 # big/little endian test
 cat > $TMPC << EOF
@@ -763,6 +759,7 @@ echo "COMPILER=$compiler" >> $config_mak
 echo "CC=$cc" >> $config_mak
 echo "CXX=$cxx" >> $config_mak
 echo "CFLAGS=$CFLAGS" >> $config_mak
+echo "LDFLAGS=$LDFLAGS" >> $config_mak
 echo "GLIB_CFLAGS=$GLIB_CFLAGS" >> $config_mak
 echo "GLIB_LDFLAGS=$GLIB_LDFLAGS" >> $config_mak
 echo "GTK_CFLAGS=$GTK_CFLAGS" >> $config_mak

nspluginwrapper-1.3.0-directory.patch:

--- NEW FILE nspluginwrapper-1.3.0-directory.patch ---
diff -up nspluginwrapper-1.3.0/src/npw-config.c.dir nspluginwrapper-1.3.0/src/npw-config.c
--- nspluginwrapper-1.3.0/src/npw-config.c.dir	2009-01-02 15:22:29.000000000 +0100
+++ nspluginwrapper-1.3.0/src/npw-config.c	2009-01-08 16:29:55.000000000 +0100
@@ -38,11 +38,14 @@
 #include <pwd.h>
 #include <dirent.h>
 
+#include <asm/types.h> 
 
 static bool g_auto = false;
 static bool g_verbose = false;
 static bool g_allow_native = false;
 static const char NPW_CONFIG[] = "nspluginwrapper";
+static char *p_plugin_dir = NULL;
+static char *p_plugin_prefix = NULL;
 
 static void error(const char *format, ...)
 {
@@ -858,7 +861,9 @@ static int do_install_plugin(const char 
   plugin_base += 1;
 
   char d_plugin_path[PATH_MAX];
-  int n = snprintf(d_plugin_path, sizeof(d_plugin_path), "%s/%s.%s", plugin_dir, NPW_WRAPPER_BASE, plugin_base);
+  int n = snprintf(d_plugin_path, sizeof(d_plugin_path), 
+                   "%s/%s.%s", plugin_dir, p_plugin_prefix ? p_plugin_prefix : NPW_WRAPPER_BASE, 
+                   plugin_base);
   if (n < 0 || n >= sizeof(d_plugin_path))
 	return 3;
 
@@ -951,28 +956,32 @@ static int install_plugin(const char *pl
   if (g_verbose)
 	printf("Install plugin %s\n", plugin_path);
 
-  // don't install plugin system-wide if it is only accessible by root
-  if (!is_root_only_accessible_plugin(plugin_path)) {
-	ret = do_install_plugin(plugin_path, get_system_mozilla_plugin_dir(), plugin_info);
-	if (ret == 0)
-	  return 0;
+  if(p_plugin_dir) {
+	ret = do_install_plugin(plugin_path, p_plugin_dir, plugin_info);
   }
+  else {
+	// don't install plugin system-wide if it is only accessible by root
+	if (!is_root_only_accessible_plugin(plugin_path)) {
+		ret = do_install_plugin(plugin_path, get_system_mozilla_plugin_dir(), plugin_info);
+	if (ret == 0)
+	  	return 0;
+  	}
 
-  // don't install plugin in user home dir if already available system-wide
-  if (has_system_wide_wrapper_plugin(plugin_path, true)) {
-	if (g_verbose)
-	  printf(" ... already installed system-wide, skipping\n");
-	return 0;
+  	// don't install plugin in user home dir if already available system-wide
+  	if (has_system_wide_wrapper_plugin(plugin_path, true)) {
+		if (g_verbose)
+	  		printf(" ... already installed system-wide, skipping\n");
+		return 0;
+  	}
+
+  	const char *user_plugin_dir = get_user_mozilla_plugin_dir();
+  	if (access(user_plugin_dir, R_OK | W_OK) < 0 && mkdir_p(user_plugin_dir) < 0)
+		return 1;
+
+  	ret = do_install_plugin(plugin_path, user_plugin_dir, plugin_info);
+  	if (ret == 0)
+		return 0;
   }
-
-  const char *user_plugin_dir = get_user_mozilla_plugin_dir();
-  if (access(user_plugin_dir, R_OK | W_OK) < 0 && mkdir_p(user_plugin_dir) < 0)
-	return 1;
-
-  ret = do_install_plugin(plugin_path, user_plugin_dir, plugin_info);
-  if (ret == 0)
-	return 0;
-
   return ret;
 }
 
@@ -1139,6 +1148,8 @@ static void print_usage(void)
   printf("   -h --help               print this message\n");
   printf("   -v --verbose            flag: set verbose mode\n");
   printf("   -a --auto               flag: set automatic mode for plugins discovery\n");
+  printf("   -d --dir plugin-dir     flag: target plugin(s) directory\n");
+  printf("   -p --prefix prefix      flag: a prefix of wrapped plugin file\n");
   printf("   -n --native             flag: allow native plugin(s) to be wrapped\n");
   printf("   -l --list               list plugins currently installed\n");
   printf("   -u --update             update plugin(s) currently installed\n");
@@ -1171,6 +1182,18 @@ static int process_native(int argc, char
   return 0;
 }
 
+static int process_dir(int argc, char *argv[])
+{ 
+  p_plugin_dir = argv[0];
+  return 0;
+}
+
+static int process_prefix(int argc, char *argv[])
+{ 
+  p_plugin_prefix = argv[0];
+  return 0;
+}
+
 static int process_list(int argvc, char *argv[])
 {
   const char **plugin_dirs = get_mozilla_plugin_dirs();
@@ -1266,57 +1287,56 @@ static int process_remove(int argc, char
 
 int main(int argc, char *argv[])
 {
-  char **args;
-  int i, j, n_args;
-
-  n_args = argc - 1;
-  args = argv + 1;
+  int i, j;
 
-  if (n_args < 1) {
+  if (argc < 2) {
 	print_usage();
 	return 1;
   }
-
-  if (args[0][0] != '-') {
-	print_usage();
-	return 1;
+  
+  if (argv[1][0] != '-') {
+  	print_usage();
+  	return 1;
   }
-
+  
   static const struct option {
-	char short_option;
-	const char *long_option;
-	int (*process_callback)(int argc, char *argv[]);
-	bool terminal;
+	const char *short_option;
+  	const char *long_option;
+  	int (*process_callback)(int argc, char *argv[]);
+  	bool terminal;
+ 	int  extra_args;
   }
   options[] = {
-	{ 'h', "help",		process_help,		1 },
-	{ 'v', "verbose",	process_verbose,	0 },
-	{ 'a', "auto",		process_auto,		0 },
-	{ 'n', "native",	process_native,		0 },
-	{ 'l', "list",		process_list,		1 },
-	{ 'u', "update",	process_update,		1 },
-	{ 'i', "install",	process_install,	1 },
-	{ 'r', "remove",	process_remove,		1 },
-	{  0,   NULL,		NULL,				1 }
-  };
-
-  for (i = 0; i < n_args; i++) {
-	const char *arg = args[i];
+	{ "-h", "--help",          process_help,           1, 0 },
+        { "-v", "--verbose",       process_verbose,        0, 0 },
+        { "-a", "--auto",          process_auto,           0, 0 },
+        { "-d", "--dir",           process_dir,            0, 1 },
+        { "-p", "--prefix",        process_prefix,         0, 1 },
+        { "-n", "--native",        process_native,         0, 0 },
+        { "-l", "--list",          process_list,           1, 0 },
+        { "-u", "--update",        process_update,         1, 0 },
+        { "-i", "--install",       process_install,        1, 0 },
+        { "-r", "--remove",        process_remove,         1, 0 }
+   };
+ 
+   for (i = 1; i < argc; i++) {
 	const struct option *opt = NULL;
-	for (j = 0; opt == NULL && options[j].process_callback != NULL; j++) {
-	  if ((arg[0] == '-' && arg[1] == options[j].short_option && arg[2] == '\0') ||
-		  (arg[0] == '-' && arg[1] == '-' && strcmp(&arg[2], options[j].long_option) == 0))
-		opt = &options[j];
-	}
-	if (opt == NULL) {
-	  fprintf(stderr, "invalid option %s\n", arg);
-	  print_usage();
-	  return 1;
-	}
-	int ret = opt->process_callback(n_args - i - 1, args + i + 1);
-	if (opt->terminal)
-	  return ret;
+ 	for (j = 0; j < sizeof(options)/sizeof(options[0]); j++) {
+ 	  if (!strcmp(options[j].short_option,argv[i]) || !strcmp(options[j].long_option,argv[i])) {
+ 	     opt = &options[j];
+        	     break;
+ 	  }
+  	}
+  	if (opt == NULL) {
+ 	  fprintf(stderr, "invalid option %s\n", argv[i]);
+  	  print_usage();
+  	  return 1;
+  	}
+ 	int ret = opt->process_callback(argc - i - 1, argv + i + 1);
+  	if (opt->terminal)
+  	  return ret;
+ 	i += opt->extra_args;
   }
-
+  
   return 0;
 }
diff -up nspluginwrapper-1.3.0/src/npw-viewer.sh.dir nspluginwrapper-1.3.0/src/npw-viewer.sh
--- nspluginwrapper-1.3.0/src/npw-viewer.sh.dir	2009-01-02 15:22:29.000000000 +0100
+++ nspluginwrapper-1.3.0/src/npw-viewer.sh	2009-01-08 16:29:40.000000000 +0100
@@ -100,6 +100,9 @@ if test "$ARCH" != "$TARGET_ARCH"; then
 	    NPW_USE_XSHM="no"
 	fi
 	;;
+    x86_64)
+	LOADER=""
+	;;
     ppc)
 	if test "$ARCH" = "ppc64"; then
 	    case "$OS" in

nspluginwrapper-1.3.0-make.patch:

--- NEW FILE nspluginwrapper-1.3.0-make.patch ---
diff -up nspluginwrapper-1.3.0/Makefile.make nspluginwrapper-1.3.0/Makefile
--- nspluginwrapper-1.3.0/Makefile.make	2009-01-02 15:22:29.000000000 +0100
+++ nspluginwrapper-1.3.0/Makefile	2009-01-07 13:00:40.000000000 +0100
@@ -364,13 +364,13 @@ changelog.commit: changelog
 	svn commit -m "Generated by svn2cl." ChangeLog
 
 $(npwrapper_LIBRARY): $(npwrapper_OBJECTS)
-	$(CC) -o $@ $(DSO_LDFLAGS) $(npwrapper_OBJECTS) $(npwrapper_LDFLAGS)
+	$(CC) -o $@ $(DSO_LDFLAGS) $(npwrapper_OBJECTS) $(npwrapper_LDFLAGS) $(LDFLAGS)
 
 npwrapper-%.os: $(SRC_PATH)/src/%.c
 	$(CC) -o $@ -c $< $(PIC_CFLAGS) $(CPPFLAGS) $(npwrapper_CFLAGS) -DBUILD_WRAPPER
 
 $(npviewer_PROGRAM): $(npviewer_OBJECTS) $(npviewer_MAPFILE) $(LSB_OBJ_DIR) $(LSB_LIBS)
-	$(CC) $(LDFLAGS_32) -o $@ $(npviewer_OBJECTS) $(npviewer_LDFLAGS)
+	$(CC) $(LDFLAGS_32) -o $@ $(npviewer_OBJECTS) $(npviewer_LDFLAGS) $(LDFLAGS)
 
 npviewer-%.o: $(SRC_PATH)/src/%.c
 	$(CC) $(CFLAGS_32) -o $@ -c $< $(CPPFLAGS) $(npviewer_CFLAGS) -DBUILD_VIEWER
@@ -387,19 +387,19 @@ npplayer-%.o: $(SRC_PATH)/src/tidy/%.c
 	$(CC) $(CFLAGS) -o $@ -c $< $(CPPFLAGS) $(npplayer_CFLAGS) -DBUILD_PLAYER
 
 $(libxpcom_LIBRARY): $(libxpcom_OBJECTS) $(LSB_OBJ_DIR) $(LSB_LIBS)
-	$(CC) $(LDFLAGS_32) $(DSO_LDFLAGS) -o $@ $(libxpcom_OBJECTS) $(libxpcom_LDFLAGS) -Wl,$(LD_soname),libxpcom.so
+	$(CC) $(LDFLAGS) $(LDFLAGS_32) $(DSO_LDFLAGS) -o $@ $(libxpcom_OBJECTS) $(libxpcom_LDFLAGS) -Wl,$(LD_soname),libxpcom.so
 
 libxpcom-%.o: $(SRC_PATH)/src/%.c
 	$(CC) $(CFLAGS_32) -o $@ -c $< $(CPPFLAGS) $(libxpcom_CFLAGS) -DBUILD_XPCOM
 
 $(libnoxshm_LIBRARY): $(libnoxshm_OBJECTS) $(LSB_OBJ_DIR) $(LSB_LIBS)
-	$(CC) $(LDFLAGS_32) $(DSO_LDFLAGS) -o $@ $(libnoxshm_OBJECTS) $(libnoxshm_LDFLAGS) -Wl,$(LD_soname),libnoxshm.so
+	$(CC) $(LDFLAGS) $(LDFLAGS_32) $(DSO_LDFLAGS) -o $@ $(libnoxshm_OBJECTS) $(libnoxshm_LDFLAGS) -Wl,$(LD_soname),libnoxshm.so
 
 libnoxshm-%.o: $(SRC_PATH)/src/%.c
 	$(CC) $(CFLAGS_32) -o $@ -c $< $(CPPFLAGS) $(libnoxshm_CFLAGS)
 
 $(npconfig_PROGRAM): $(npconfig_OBJECTS)
-	$(CC) -o $@ $(npconfig_OBJECTS) $(npconfig_LDFLAGS)
+	$(CC) -o $@ $(npconfig_OBJECTS) $(npconfig_LDFLAGS) $(LDFLAGS)
 
 npconfig-%.o: $(SRC_PATH)/src/%.c
 	$(CC) -o $@ -c $< $(CPPFLAGS) $(CFLAGS)
@@ -425,7 +425,7 @@ $(LSB_OBJ_DIR)/libgcc_s_32.so: $(LSB_OBJ
 	$(LN_S) libgcc_s.so $@
 
 $(LSB_OBJ_DIR)/%.so: $(LSB_OBJ_DIR)/%.o
-	$(CC) $(LDFLAGS_32) -nostdlib $(DSO_LDFLAGS) $< -o $@ \
+	$(CC) $(LDFLAGS) $(LDFLAGS_32) -nostdlib $(DSO_LDFLAGS) $< -o $@ \
 		-Wl,--version-script,$(patsubst $(LSB_OBJ_DIR)/%.o,$(LSB_SRC_DIR)/%.Version,$<) \
 		-Wl,-soname,`grep "$(patsubst $(LSB_OBJ_DIR)/%.o,%,$<) " $(LSB_SRC_DIR)/LibNameMap.txt | cut -f2 -d' '`
 

plugin-config-native.patch:

--- NEW FILE plugin-config-native.patch ---
diff -up nspluginwrapper-1.3.0/plugin-config-1.9/src/plugin-config.c.native nspluginwrapper-1.3.0/plugin-config-1.9/src/plugin-config.c
--- nspluginwrapper-1.3.0/plugin-config-1.9/src/plugin-config.c.native	2009-01-06 17:20:02.000000000 +0100
+++ nspluginwrapper-1.3.0/plugin-config-1.9/src/plugin-config.c	2009-01-06 17:22:43.000000000 +0100
@@ -444,6 +444,7 @@ int wrap_plugin_2(WRAP_PLUGIN *p_plugin,
       char *params[] = 
       {
         p_wrapper,
+        "-n",
         "-p", 
         prefix,
         "-d", 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/nspluginwrapper/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	1 Dec 2008 14:57:55 -0000	1.9
+++ .cvsignore	8 Jan 2009 15:39:10 -0000	1.10
@@ -6,3 +6,4 @@
 plugin-config-1.9.tar.gz
 nspluginwrapper-1.1.4.tar.bz2
 nspluginwrapper-1.1.8.tar.bz2
+nspluginwrapper-1.3.0.tar.bz2


Index: nspluginwrapper.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nspluginwrapper/devel/nspluginwrapper.spec,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- nspluginwrapper.spec	3 Dec 2008 04:06:14 -0000	1.71
+++ nspluginwrapper.spec	8 Jan 2009 15:39:10 -0000	1.72
@@ -64,20 +64,20 @@
 
 Summary:	A compatibility layer for Netscape 4 plugins
 Name:		nspluginwrapper
-Version:	1.1.8
-Release:	2%{?dist}
+Version:	1.3.0
+Release:	1%{?dist}
 Source0:	%{name}-%{version}%{?svndate:-%{svndate}}.tar.bz2
-Source1:        %{plugin_config_name}.tar.gz 
+Source1:        %{plugin_config_name}.tar.gz
 Source2:        plugin-config.sh.in
 Source3:        %{name}.sh.in
-Patch1:         nspluginwrapper-1.1.4-make.patch
-Patch2:         nspluginwrapper-1.1.4-configure.patch
-Patch3:         nspluginwrapper-1.1.8-directory.patch
+Patch1:         nspluginwrapper-1.3.0-make.patch
+Patch2:         nspluginwrapper-1.3.0-configure.patch
+Patch3:         nspluginwrapper-1.3.0-directory.patch
 Patch10:        nspluginwrapper-1.1.2-event.patch
-Patch11:        nspluginwrapper-1.1.8-fix-invalid-RPC-after-NPP_Destroy.patch
 Patch100:       plugin-config-setuid.patch
 Patch101:       plugin-config-umask.patch
 Patch102:       plugin-config-print.patch
+Patch103:       plugin-config-native.patch
 License:	GPLv2+
 Group:		Networking/WWW
 Url:		http://gwenole.beauchesne.info/projects/nspluginwrapper/
@@ -108,21 +108,16 @@
 %patch3 -p1 -b .dir
 
 # Package fixes
-%patch10 -p1 -b .event
-%patch11 -p0 -b .invalid-RPC
+#%patch10 -p1 -b .event
 
 # Plugin-config patches
 pushd %plugin_config_name
 %patch100 -p2
 %patch101 -p2 -b .umask
 %patch102 -p2 -b .print
+%patch103 -p2 -b .native
 popd
 
-
-# remove old/incompatibile stuff
-rm -rf npapi
-rm -rf lsb-build
-
 %build
 # Build wrapper
 
@@ -154,11 +149,14 @@
 	    --with-lib32=%{lib32}		\
 	    --with-lib64=%{lib64}		\
 	    --with-base-lib=%{lib}		\
-	    --with-xpcom=no			\
 	    --with-base-libdir=%{libdir}	\
-	    --with-x11-prefix=/usr	        \
-	    --with-gecko=%{gecko_flavour}
-	    
+	    --viewer-paths=%{pkgdir}		\
+	    --with-x11-prefix=/usr		\
+	    --with-gecko=%{gecko_flavour}	\
+	    --enable-viewer			\
+	    --viewer-paths="%{pkgdir32}:%{pkgdir64}"\
+	    --disable-biarch
+	
 make
 popd
 
@@ -226,16 +224,25 @@
 %{pkgdir}/npconfig
 %{pkgdir}/npwrapper.so
 %{pkgdir}/npviewer.bin
+%{pkgdir}/npviewer.sh
 %{pkgdir}/npviewer
 %{pkgdir}/npplayer
+%{pkgdir}/libxpcom.so
+%{pkgdir}/libnoxshm.so
 %{pkgdir}/nspluginplayer
 %{plugindir}/npwrapper.so
 %{_bindir}/mozilla-plugin-config
 %config %{_sysconfdir}/sysconfig/%{name}
 
+%exclude %{_bindir}/nspluginplayer
+%exclude %{_bindir}/nspluginwrapper
+
 %changelog
+* Thu Jan 8 2009 Martin Stransky <stransky at redhat.com> 1.1.8-3
+- Updated to 1.3.0 and removed some fedora build patches
+
 * Tue Dec 02 2008 Warren Togami <wtogami at redhat.com> 1.1.8-2
-- fix-invalid-RPC-after-NPP_Destroy fixes a crasher 
+- fix-invalid-RPC-after-NPP_Destroy fixes a crasher
 
 * Mon Dec 1 2008 Martin Stransky <stransky at redhat.com> 1.1.8-1
 - Updated to 1.1.8


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nspluginwrapper/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	1 Dec 2008 14:57:55 -0000	1.13
+++ sources	8 Jan 2009 15:39:10 -0000	1.14
@@ -1,2 +1,2 @@
 0a00e94ba608dfea365851af9deb20dc  plugin-config-1.9.tar.gz
-73ea7ed696cd9d0502ad0522036ee68b  nspluginwrapper-1.1.8.tar.bz2
+188f77bd3427c131ccba4bfdb25892a9  nspluginwrapper-1.3.0.tar.bz2


--- nspluginwrapper-1.1.4-configure.patch DELETED ---


--- nspluginwrapper-1.1.4-make.patch DELETED ---


--- nspluginwrapper-1.1.8-directory.patch DELETED ---


--- nspluginwrapper-1.1.8-fix-invalid-RPC-after-NPP_Destroy.patch DELETED ---



From matt at fedoraproject.org  Thu Jan  8 15:50:56 2009
From: matt at fedoraproject.org (Matthew Farrellee)
Date: Thu,  8 Jan 2009 15:50:56 +0000 (UTC)
Subject: rpms/condor/F-9 condor.spec,1.15,1.16
Message-ID: <20090108155056.97FAA700FD@cvs1.fedora.phx.redhat.com>

Author: matt

Update of /cvs/pkgs/rpms/condor/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27207

Modified Files:
	condor.spec 
Log Message:
7.2.0-2 fixes obsoletes


Index: condor.spec
===================================================================
RCS file: /cvs/pkgs/rpms/condor/F-9/condor.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- condor.spec	7 Jan 2009 18:42:25 -0000	1.15
+++ condor.spec	8 Jan 2009 15:50:26 -0000	1.16
@@ -1,7 +1,7 @@
 Summary: Condor: High Throughput Computing
 Name: condor
 Version: 7.2.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: ASL 2.0
 Group: Applications/System
 URL: http://www.cs.wisc.edu/condor/
@@ -61,6 +61,8 @@
 #Provides: user(condor) = 43
 #Provides: group(condor) = 43
 
+Obsoletes: condor-static < 7.2.0
+
 
 %description
 Condor is a specialized workload management system for
@@ -199,6 +201,7 @@
 mkdir -m0755 $PREFIX/local_dir/spool
 
 cat >> $PREFIX/local_dir/condor_config.local << EOF
+CONDOR_DEVELOPERS = NONE
 CONDOR_HOST = \$(FULL_HOSTNAME)
 COLLECTOR_NAME = Personal Condor
 START = TRUE
@@ -566,6 +569,10 @@
 
 
 %changelog
+* Thu Jan  8 2009  <matt at redhat> - 7.2.0-2
+- (Re)added CONDOR_DEVELOPERS=NONE to the default condor_config.local
+- Added missing Obsoletes for condor-static (thanks Michael Schwendt)
+
 * Wed Jan  7 2009  <matt at redhat> - 7.2.0-1
 - Upgraded to 7.2.0 release
 - Removed -static package



From matt at fedoraproject.org  Thu Jan  8 15:52:45 2009
From: matt at fedoraproject.org (Matthew Farrellee)
Date: Thu,  8 Jan 2009 15:52:45 +0000 (UTC)
Subject: rpms/condor/F-10 condor.spec,1.10,1.11
Message-ID: <20090108155245.70FDA700FD@cvs1.fedora.phx.redhat.com>

Author: matt

Update of /cvs/pkgs/rpms/condor/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27449

Modified Files:
	condor.spec 
Log Message:
7.2.0-2 fixes obsoletes


Index: condor.spec
===================================================================
RCS file: /cvs/pkgs/rpms/condor/F-10/condor.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- condor.spec	7 Jan 2009 18:51:15 -0000	1.10
+++ condor.spec	8 Jan 2009 15:52:15 -0000	1.11
@@ -1,7 +1,7 @@
 Summary: Condor: High Throughput Computing
 Name: condor
 Version: 7.2.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: ASL 2.0
 Group: Applications/System
 URL: http://www.cs.wisc.edu/condor/
@@ -61,6 +61,8 @@
 #Provides: user(condor) = 43
 #Provides: group(condor) = 43
 
+Obsoletes: condor-static < 7.2.0
+
 
 %description
 Condor is a specialized workload management system for
@@ -199,6 +201,7 @@
 mkdir -m0755 $PREFIX/local_dir/spool
 
 cat >> $PREFIX/local_dir/condor_config.local << EOF
+CONDOR_DEVELOPERS = NONE
 CONDOR_HOST = \$(FULL_HOSTNAME)
 COLLECTOR_NAME = Personal Condor
 START = TRUE
@@ -566,6 +569,10 @@
 
 
 %changelog
+* Thu Jan  8 2009  <matt at redhat> - 7.2.0-2
+- (Re)added CONDOR_DEVELOPERS=NONE to the default condor_config.local
+- Added missing Obsoletes for condor-static (thanks Michael Schwendt)
+
 * Wed Jan  7 2009  <matt at redhat> - 7.2.0-1
 - Upgraded to 7.2.0 release
 - Removed -static package



From matt at fedoraproject.org  Thu Jan  8 15:54:24 2009
From: matt at fedoraproject.org (Matthew Farrellee)
Date: Thu,  8 Jan 2009 15:54:24 +0000 (UTC)
Subject: rpms/condor/devel condor.spec,1.10,1.11
Message-ID: <20090108155424.58B21700FD@cvs1.fedora.phx.redhat.com>

Author: matt

Update of /cvs/pkgs/rpms/condor/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27819

Modified Files:
	condor.spec 
Log Message:
7.2.0-2 fixes obsoletes


Index: condor.spec
===================================================================
RCS file: /cvs/pkgs/rpms/condor/devel/condor.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- condor.spec	7 Jan 2009 19:22:17 -0000	1.10
+++ condor.spec	8 Jan 2009 15:53:54 -0000	1.11
@@ -1,7 +1,7 @@
 Summary: Condor: High Throughput Computing
 Name: condor
 Version: 7.2.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: ASL 2.0
 Group: Applications/System
 URL: http://www.cs.wisc.edu/condor/
@@ -61,6 +61,8 @@
 #Provides: user(condor) = 43
 #Provides: group(condor) = 43
 
+Obsoletes: condor-static < 7.2.0
+
 
 %description
 Condor is a specialized workload management system for
@@ -199,6 +201,7 @@
 mkdir -m0755 $PREFIX/local_dir/spool
 
 cat >> $PREFIX/local_dir/condor_config.local << EOF
+CONDOR_DEVELOPERS = NONE
 CONDOR_HOST = \$(FULL_HOSTNAME)
 COLLECTOR_NAME = Personal Condor
 START = TRUE
@@ -566,6 +569,10 @@
 
 
 %changelog
+* Thu Jan  8 2009  <matt at redhat> - 7.2.0-2
+- (Re)added CONDOR_DEVELOPERS=NONE to the default condor_config.local
+- Added missing Obsoletes for condor-static (thanks Michael Schwendt)
+
 * Wed Jan  7 2009  <matt at redhat> - 7.2.0-1
 - Upgraded to 7.2.0 release
 - Removed -static package



From pkgdb at fedoraproject.org  Thu Jan  8 15:56:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 08 Jan 2009 15:56:12 +0000
Subject: [pkgdb] gpsbabel: silfreed has requested watchbugzilla
Message-ID: <20090108155612.9827520831D@bastion.fedora.phx.redhat.com>

silfreed has requested the watchbugzilla acl on gpsbabel (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gpsbabel



From pkgdb at fedoraproject.org  Thu Jan  8 15:56:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 08 Jan 2009 15:56:14 +0000
Subject: [pkgdb] gpsbabel: silfreed has requested watchcommits
Message-ID: <20090108155614.0FF14208455@bastion.fedora.phx.redhat.com>

silfreed has requested the watchcommits acl on gpsbabel (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gpsbabel



From pkgdb at fedoraproject.org  Thu Jan  8 15:56:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 08 Jan 2009 15:56:15 +0000
Subject: [pkgdb] gpsbabel: silfreed has requested commit
Message-ID: <20090108155615.CB982208458@bastion.fedora.phx.redhat.com>

silfreed has requested the commit acl on gpsbabel (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gpsbabel



From twaugh at fedoraproject.org  Thu Jan  8 16:19:17 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Thu,  8 Jan 2009 16:19:17 +0000 (UTC)
Subject: rpms/gutenprint/devel gutenprint-foomaticppdupdate, 1.1,
	1.2 gutenprint.spec, 1.43, 1.44
Message-ID: <20090108161917.4CC33700FD@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/gutenprint/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31499

Modified Files:
	gutenprint-foomaticppdupdate gutenprint.spec 
Log Message:
* Thu Jan  8 2009 Tim Waugh <twaugh at redhat.com> 5.2.3-2
- Only run the foomatic PPD update script on update, and make sure the
  script can deal with major version upgrades (bug #478328).



Index: gutenprint-foomaticppdupdate
===================================================================
RCS file: /cvs/pkgs/rpms/gutenprint/devel/gutenprint-foomaticppdupdate,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gutenprint-foomaticppdupdate	2 Jul 2007 17:19:02 -0000	1.1
+++ gutenprint-foomaticppdupdate	8 Jan 2009 16:18:46 -0000	1.2
@@ -5,8 +5,8 @@
 ## A utility for updating foomatic-generated PPDs so that they work with
 ## a newly-installed gutenprint package.
 
-## Copyright (C) 2007 Red Hat, Inc.
-## Copyright (C) 2007 Tim Waugh <twaugh at redhat.com
+## Copyright (C) 2007, 2009 Red Hat, Inc.
+## Copyright (C) 2007, 2009 Tim Waugh <twaugh at redhat.com
 
 ## This program is free software; you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
@@ -93,8 +93,15 @@
         return
 
     # Needs updating.
+    firstdot = gutenprint_version.find ('.')
+    seconddot = firstdot + 1 + gutenprint_version[1 + firstdot:].find ('.')
+    major = gutenprint_version[:seconddot]
+
+    driver = IDs[1]
+    dot = driver.find ('.')
+    driver = driver[:dot] + "." + major
     try:
-        genppd = generate_ppd (ppdfile, IDs[0], IDs[1])
+        genppd = generate_ppd (ppdfile, IDs[0], driver)
     except:
         return
 


Index: gutenprint.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gutenprint/devel/gutenprint.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- gutenprint.spec	23 Dec 2008 11:33:41 -0000	1.43
+++ gutenprint.spec	8 Jan 2009 16:18:46 -0000	1.44
@@ -4,7 +4,7 @@
 Name:           gutenprint
 Summary:        Printer Drivers Package.
 Version:        5.2.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Group:          System Environment/Base
 URL:            http://gimp-print.sourceforge.net/
 Source0:        http://dl.sf.net/gimp-print/gutenprint-%{version}.tar.bz2
@@ -246,12 +246,18 @@
 
 %post foomatic
 /bin/rm -f /var/cache/foomatic/*
-%{_sbindir}/gutenprint-foomaticppdupdate %{version} || :
+if [ $1 -eq 2 ]; then
+  %{_sbindir}/gutenprint-foomaticppdupdate %{version} || :
+fi
 
 %postun foomatic
 /bin/rm -f /var/cache/foomatic/*
 
 %changelog
+* Thu Jan  8 2009 Tim Waugh <twaugh at redhat.com> 5.2.3-2
+- Only run the foomatic PPD update script on update, and make sure the
+  script can deal with major version upgrades (bug #478328).
+
 * Tue Dec 23 2008 Tim Waugh <twaugh at redhat.com> 5.2.3-1
 - 5.2.3.
 



From peter at fedoraproject.org  Thu Jan  8 16:19:20 2009
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Thu,  8 Jan 2009 16:19:20 +0000 (UTC)
Subject: rpms/flashrom/EL-4 .cvsignore, 1.11,
	1.12 flashrom--Makefile_cleanup.diff, 1.4, 1.5 flashrom.spec,
	1.13, 1.14 import.log, 1.3, 1.4 sources, 1.11, 1.12
Message-ID: <20090108161920.1F2BF700FD@cvs1.fedora.phx.redhat.com>

Author: peter

Update of /cvs/extras/rpms/flashrom/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31525/EL-4

Modified Files:
	.cvsignore flashrom--Makefile_cleanup.diff flashrom.spec 
	import.log sources 
Log Message:
svn ver. 3852


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/flashrom/EL-4/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	3 Nov 2008 08:51:17 -0000	1.11
+++ .cvsignore	8 Jan 2009 16:18:49 -0000	1.12
@@ -1 +1 @@
-flashrom-3723.tar.bz2
+flashrom-3852.tar.bz2

flashrom--Makefile_cleanup.diff:

Index: flashrom--Makefile_cleanup.diff
===================================================================
RCS file: /cvs/extras/rpms/flashrom/EL-4/flashrom--Makefile_cleanup.diff,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- flashrom--Makefile_cleanup.diff	7 Jul 2008 17:48:02 -0000	1.4
+++ flashrom--Makefile_cleanup.diff	8 Jan 2009 16:18:49 -0000	1.5
@@ -7,8 +7,8 @@
 -PREFIX  = /usr/local
 +PREFIX  = /usr
  #CFLAGS  = -O2 -g -Wall -Werror
--CFLAGS  = -Os -Wall -Werror # -DTS5300
-+#CFLAGS  = -Os -Wall -Werror # -DTS5300
+-CFLAGS  = -Os -Wall -Werror
++#CFLAGS  = -Os -Wall -Werror
  OS_ARCH	= $(shell uname)
  ifeq ($(OS_ARCH), SunOS)
  LDFLAGS = -lpci -lz


Index: flashrom.spec
===================================================================
RCS file: /cvs/extras/rpms/flashrom/EL-4/flashrom.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- flashrom.spec	3 Nov 2008 08:51:18 -0000	1.13
+++ flashrom.spec	8 Jan 2009 16:18:49 -0000	1.14
@@ -1,9 +1,9 @@
-%define svnver 3723
+%define svnver 3852
 Summary:	Simple program for reading/writing BIOS chips content
 Name:		flashrom
 Version:	0
-Release:	0.14.20081103svn%{svnver}%{?dist}
-License:	GPLv2+
+Release:	0.15.20090112svn%{svnver}%{?dist}
+License:	GPLv2
 Group:		Applications/System
 # svn -r %{svnver} export svn://coreboot.org/repos/trunk/util/flashrom flashrom
 # tar -cjvf flashrom-%{svnver}.tar.bz2 flashrom
@@ -45,6 +45,18 @@
 %{_mandir}/man8/%{name}.*
 
 %changelog
+* Thu Jan  8 2009 Peter Lemenkov <lemenkov at gmail.com> 0-0.15.20090112svn3852
+- Changed license to GPLv2
+- SST49LF020 support
+- AMD-768 chipset support
+- i631x LPC support
+- Support the MX29LV040C
+- AMD SB700 flash enable
+- Support for the AMD/ATI SB600 southbridge SPI
+- SST25VF080B flash chip support
+- Support for 32Mbit SPI flash SST25VF032B
+- Support for bunch of Fujitsu and Macronix chips
+
 * Mon Nov  3 2008 Peter Lemenkov <lemenkov at gmail.com> 0-0.14.20081103svn3723
 - Dump ICH8/ICH9/ICH10 SPI registers
 - Add additional SPI sector erase and chip erase command


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/flashrom/EL-4/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- import.log	3 Nov 2008 08:51:18 -0000	1.3
+++ import.log	8 Jan 2009 16:18:49 -0000	1.4
@@ -1,3 +1,4 @@
 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
 flashrom-0-0_14_20081103svn3723_fc9:EL-4:flashrom-0-0.14.20081103svn3723.fc9.src.rpm:1225702185
+flashrom-0-0_15_20090112svn3852_fc10:EL-4:flashrom-0-0.15.20090112svn3852.fc10.src.rpm:1231431453


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/flashrom/EL-4/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	3 Nov 2008 08:51:18 -0000	1.11
+++ sources	8 Jan 2009 16:18:49 -0000	1.12
@@ -1 +1 @@
-37fb45aa795a6c79f0518d99e33626d4  flashrom-3723.tar.bz2
+4253d2a2a70ec3335c4b2a2bf40eefb8  flashrom-3852.tar.bz2



From twaugh at fedoraproject.org  Thu Jan  8 16:20:14 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Thu,  8 Jan 2009 16:20:14 +0000 (UTC)
Subject: rpms/gutenprint/F-10 gutenprint-foomaticppdupdate, 1.1,
	1.2 gutenprint.spec, 1.42, 1.43
Message-ID: <20090108162014.86D37700FD@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/gutenprint/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31764

Modified Files:
	gutenprint-foomaticppdupdate gutenprint.spec 
Log Message:
* Thu Jan  8 2009 Tim Waugh <twaugh at redhat.com> 5.2.3-2
- Only run the foomatic PPD update script on update, and make sure the
  script can deal with major version upgrades (bug #478328).



Index: gutenprint-foomaticppdupdate
===================================================================
RCS file: /cvs/pkgs/rpms/gutenprint/F-10/gutenprint-foomaticppdupdate,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gutenprint-foomaticppdupdate	2 Jul 2007 17:19:02 -0000	1.1
+++ gutenprint-foomaticppdupdate	8 Jan 2009 16:19:44 -0000	1.2
@@ -5,8 +5,8 @@
 ## A utility for updating foomatic-generated PPDs so that they work with
 ## a newly-installed gutenprint package.
 
-## Copyright (C) 2007 Red Hat, Inc.
-## Copyright (C) 2007 Tim Waugh <twaugh at redhat.com
+## Copyright (C) 2007, 2009 Red Hat, Inc.
+## Copyright (C) 2007, 2009 Tim Waugh <twaugh at redhat.com
 
 ## This program is free software; you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
@@ -93,8 +93,15 @@
         return
 
     # Needs updating.
+    firstdot = gutenprint_version.find ('.')
+    seconddot = firstdot + 1 + gutenprint_version[1 + firstdot:].find ('.')
+    major = gutenprint_version[:seconddot]
+
+    driver = IDs[1]
+    dot = driver.find ('.')
+    driver = driver[:dot] + "." + major
     try:
-        genppd = generate_ppd (ppdfile, IDs[0], IDs[1])
+        genppd = generate_ppd (ppdfile, IDs[0], driver)
     except:
         return
 


Index: gutenprint.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gutenprint/F-10/gutenprint.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- gutenprint.spec	23 Dec 2008 11:47:15 -0000	1.42
+++ gutenprint.spec	8 Jan 2009 16:19:44 -0000	1.43
@@ -4,7 +4,7 @@
 Name:           gutenprint
 Summary:        Printer Drivers Package.
 Version:        5.2.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Group:          System Environment/Base
 URL:            http://gimp-print.sourceforge.net/
 Source0:        http://dl.sf.net/gimp-print/gutenprint-%{version}.tar.bz2
@@ -246,12 +246,18 @@
 
 %post foomatic
 /bin/rm -f /var/cache/foomatic/*
-%{_sbindir}/gutenprint-foomaticppdupdate %{version} || :
+if [ $1 -eq 2 ]; then
+  %{_sbindir}/gutenprint-foomaticppdupdate %{version} || :
+fi
 
 %postun foomatic
 /bin/rm -f /var/cache/foomatic/*
 
 %changelog
+* Thu Jan  8 2009 Tim Waugh <twaugh at redhat.com> 5.2.3-2
+- Only run the foomatic PPD update script on update, and make sure the
+  script can deal with major version upgrades (bug #478328).
+
 * Tue Dec 23 2008 Tim Waugh <twaugh at redhat.com> 5.2.3-1
 - 5.2.3.
 



From peter at fedoraproject.org  Thu Jan  8 16:23:54 2009
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Thu,  8 Jan 2009 16:23:54 +0000 (UTC)
Subject: rpms/flashrom/F-10 .cvsignore, 1.11,
	1.12 flashrom--Makefile_cleanup.diff, 1.4, 1.5 flashrom.spec,
	1.14, 1.15 import.log, 1.3, 1.4 sources, 1.11, 1.12
Message-ID: <20090108162354.738EA700FD@cvs1.fedora.phx.redhat.com>

Author: peter

Update of /cvs/extras/rpms/flashrom/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32449/F-10

Modified Files:
	.cvsignore flashrom--Makefile_cleanup.diff flashrom.spec 
	import.log sources 
Log Message:
svn ver. 3852


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/flashrom/F-10/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	3 Nov 2008 08:40:38 -0000	1.11
+++ .cvsignore	8 Jan 2009 16:23:23 -0000	1.12
@@ -1 +1 @@
-flashrom-3723.tar.bz2
+flashrom-3852.tar.bz2

flashrom--Makefile_cleanup.diff:

Index: flashrom--Makefile_cleanup.diff
===================================================================
RCS file: /cvs/extras/rpms/flashrom/F-10/flashrom--Makefile_cleanup.diff,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- flashrom--Makefile_cleanup.diff	7 Jul 2008 17:38:19 -0000	1.4
+++ flashrom--Makefile_cleanup.diff	8 Jan 2009 16:23:23 -0000	1.5
@@ -7,8 +7,8 @@
 -PREFIX  = /usr/local
 +PREFIX  = /usr
  #CFLAGS  = -O2 -g -Wall -Werror
--CFLAGS  = -Os -Wall -Werror # -DTS5300
-+#CFLAGS  = -Os -Wall -Werror # -DTS5300
+-CFLAGS  = -Os -Wall -Werror
++#CFLAGS  = -Os -Wall -Werror
  OS_ARCH	= $(shell uname)
  ifeq ($(OS_ARCH), SunOS)
  LDFLAGS = -lpci -lz


Index: flashrom.spec
===================================================================
RCS file: /cvs/extras/rpms/flashrom/F-10/flashrom.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- flashrom.spec	3 Nov 2008 08:40:38 -0000	1.14
+++ flashrom.spec	8 Jan 2009 16:23:23 -0000	1.15
@@ -1,9 +1,9 @@
-%define svnver 3723
+%define svnver 3852
 Summary:	Simple program for reading/writing BIOS chips content
 Name:		flashrom
 Version:	0
-Release:	0.14.20081103svn%{svnver}%{?dist}
-License:	GPLv2+
+Release:	0.15.20090112svn%{svnver}%{?dist}
+License:	GPLv2
 Group:		Applications/System
 # svn -r %{svnver} export svn://coreboot.org/repos/trunk/util/flashrom flashrom
 # tar -cjvf flashrom-%{svnver}.tar.bz2 flashrom
@@ -45,6 +45,18 @@
 %{_mandir}/man8/%{name}.*
 
 %changelog
+* Thu Jan  8 2009 Peter Lemenkov <lemenkov at gmail.com> 0-0.15.20090112svn3852
+- Changed license to GPLv2
+- SST49LF020 support
+- AMD-768 chipset support
+- i631x LPC support
+- Support the MX29LV040C
+- AMD SB700 flash enable
+- Support for the AMD/ATI SB600 southbridge SPI
+- SST25VF080B flash chip support
+- Support for 32Mbit SPI flash SST25VF032B
+- Support for bunch of Fujitsu and Macronix chips
+
 * Mon Nov  3 2008 Peter Lemenkov <lemenkov at gmail.com> 0-0.14.20081103svn3723
 - Dump ICH8/ICH9/ICH10 SPI registers
 - Add additional SPI sector erase and chip erase command


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/flashrom/F-10/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- import.log	3 Nov 2008 08:40:38 -0000	1.3
+++ import.log	8 Jan 2009 16:23:23 -0000	1.4
@@ -1,3 +1,4 @@
 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
 flashrom-0-0_14_20081103svn3723_fc9:HEAD:flashrom-0-0.14.20081103svn3723.fc9.src.rpm:1225701590
+flashrom-0-0_15_20090112svn3852_fc10:F-10:flashrom-0-0.15.20090112svn3852.fc10.src.rpm:1231431767


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/flashrom/F-10/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	3 Nov 2008 08:40:38 -0000	1.11
+++ sources	8 Jan 2009 16:23:23 -0000	1.12
@@ -1 +1 @@
-37fb45aa795a6c79f0518d99e33626d4  flashrom-3723.tar.bz2
+4253d2a2a70ec3335c4b2a2bf40eefb8  flashrom-3852.tar.bz2



From rhughes at fedoraproject.org  Thu Jan  8 16:40:37 2009
From: rhughes at fedoraproject.org (Richard Hughes)
Date: Thu,  8 Jan 2009 16:40:37 +0000 (UTC)
Subject: rpms/PackageKit/F-10 .cvsignore, 1.37, 1.38 PackageKit.spec, 1.88, 
	1.89 sources, 1.38, 1.39
Message-ID: <20090108164037.C7267700FD@cvs1.fedora.phx.redhat.com>

Author: rhughes

Update of /cvs/pkgs/rpms/PackageKit/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2330

Modified Files:
	.cvsignore PackageKit.spec sources 
Log Message:
* Thu Jan 08 2009 Richard Hughes  <rhughes at redhat.com> - 0.3.13-1
- New upstream version



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/PackageKit/F-10/.cvsignore,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- .cvsignore	8 Dec 2008 22:42:04 -0000	1.37
+++ .cvsignore	8 Jan 2009 16:40:07 -0000	1.38
@@ -1 +1 @@
-PackageKit-0.3.12.tar.gz
+PackageKit-0.3.13.tar.gz


Index: PackageKit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/PackageKit/F-10/PackageKit.spec,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -r1.88 -r1.89
--- PackageKit.spec	8 Dec 2008 22:42:05 -0000	1.88
+++ PackageKit.spec	8 Jan 2009 16:40:07 -0000	1.89
@@ -7,7 +7,7 @@
 
 Summary:   Package management service
 Name:      PackageKit
-Version:   0.3.12
+Version:   0.3.13
 Release:   1%{?dist}
 License:   GPLv2+
 Group:     System Environment/Libraries
@@ -379,6 +379,9 @@
 %{_includedir}/PackageKit/backend/*.h
 
 %changelog
+* Thu Jan 08 2009 Richard Hughes  <rhughes at redhat.com> - 0.3.13-1
+- New upstream version
+
 * Mon Dec 08 2008 Richard Hughes  <rhughes at redhat.com> - 0.3.12-1
 - New upstream version
 - Drop all upstreamed patches


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/PackageKit/F-10/sources,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- sources	8 Dec 2008 22:42:05 -0000	1.38
+++ sources	8 Jan 2009 16:40:07 -0000	1.39
@@ -1 +1 @@
-e6189d0882812744b87aecef25a4ac08  PackageKit-0.3.12.tar.gz
+b03a579e7decd3d3230b0b813d2447a3  PackageKit-0.3.13.tar.gz



From rhughes at fedoraproject.org  Thu Jan  8 16:40:44 2009
From: rhughes at fedoraproject.org (Richard Hughes)
Date: Thu,  8 Jan 2009 16:40:44 +0000 (UTC)
Subject: rpms/gnome-packagekit/F-10 .cvsignore, 1.36,
	1.37 gnome-packagekit.spec, 1.69, 1.70 sources, 1.36, 1.37
Message-ID: <20090108164044.4883A700FD@cvs1.fedora.phx.redhat.com>

Author: rhughes

Update of /cvs/pkgs/rpms/gnome-packagekit/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2360

Modified Files:
	.cvsignore gnome-packagekit.spec sources 
Log Message:
* Thu Jan 08 2009 Richard Hughes  <rhughes at redhat.com> - 0.3.13-1
- New upstream version



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-packagekit/F-10/.cvsignore,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- .cvsignore	8 Dec 2008 22:42:10 -0000	1.36
+++ .cvsignore	8 Jan 2009 16:40:13 -0000	1.37
@@ -1 +1 @@
-gnome-packagekit-0.3.12.tar.gz
+gnome-packagekit-0.3.13.tar.gz


Index: gnome-packagekit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-packagekit/F-10/gnome-packagekit.spec,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- gnome-packagekit.spec	8 Dec 2008 22:42:10 -0000	1.69
+++ gnome-packagekit.spec	8 Jan 2009 16:40:14 -0000	1.70
@@ -5,7 +5,7 @@
 
 Summary:   GNOME PackageKit Client
 Name:      gnome-packagekit
-Version:   0.3.12
+Version:   0.3.13
 Release:   1%{?dist}
 License:   GPLv2+
 Group:     Applications/System
@@ -208,6 +208,9 @@
 %{_datadir}/applications/gpk-service-pack.desktop
 
 %changelog
+* Thu Jan 08 2009 Richard Hughes  <rhughes at redhat.com> - 0.3.13-1
+- New upstream version
+
 * Mon Dec 08 2008 Richard Hughes  <rhughes at redhat.com> - 0.3.12-1
 - New upstream version
 - Drop all upstreamed patches


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-packagekit/F-10/sources,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- sources	8 Dec 2008 22:42:10 -0000	1.36
+++ sources	8 Jan 2009 16:40:14 -0000	1.37
@@ -1 +1 @@
-97545c284c74c974ee0a259af9eaf461  gnome-packagekit-0.3.12.tar.gz
+a6b59dcc8576552db68331ba8f2d615c  gnome-packagekit-0.3.13.tar.gz



From caolanm at fedoraproject.org  Thu Jan  8 16:48:00 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Thu,  8 Jan 2009 16:48:00 +0000 (UTC)
Subject: rpms/python-gammu/devel .cvsignore, 1.7, 1.8 python-gammu.spec, 1.14,
	1.15 sources, 1.7, 1.8
Message-ID: <20090108164800.ECB93700FD@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/python-gammu/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3088

Modified Files:
	.cvsignore python-gammu.spec sources 
Log Message:
devel n-v-r < F-10, syncing to rebuild against libGammu


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-gammu/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	12 Oct 2008 14:04:41 -0000	1.7
+++ .cvsignore	8 Jan 2009 16:47:30 -0000	1.8
@@ -1 +1 @@
-python-gammu-0.27.tar.bz2
+python-gammu-0.28.tar.bz2


Index: python-gammu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-gammu/devel/python-gammu.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- python-gammu.spec	30 Nov 2008 00:53:24 -0000	1.14
+++ python-gammu.spec	8 Jan 2009 16:47:30 -0000	1.15
@@ -1,8 +1,8 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:		python-gammu
-Version:	0.27
-Release:	3%{?dist}
+Version:	0.28
+Release:	1%{?dist}
 Summary:	Python bindings for Gammu
 
 Group:		Development/Languages
@@ -54,6 +54,9 @@
 
 
 %changelog
+* Thu Jan  8 2009 Caol??n McNamara <caolanm at redhat.com> - 0.28-1
+- devel n-v-r < F-10, syncing to rebuild against libGammu
+
 * Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 0.27-3
 - Fix locations for Python 2.6
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-gammu/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	12 Oct 2008 14:04:41 -0000	1.7
+++ sources	8 Jan 2009 16:47:30 -0000	1.8
@@ -1 +1 @@
-f99dd6378731f3a6bb1756d2bb8bb50d  python-gammu-0.27.tar.bz2
+4519a314eeec896cd4b311427348e72c  python-gammu-0.28.tar.bz2



From hadess at fedoraproject.org  Thu Jan  8 17:13:12 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Thu,  8 Jan 2009 17:13:12 +0000 (UTC)
Subject: rpms/gnome-web-photo/devel gnome-web-photo.spec,1.13,1.14
Message-ID: <20090108171312.E7F43700FD@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/gnome-web-photo/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5590

Modified Files:
	gnome-web-photo.spec 
Log Message:
Run libtoolize to allow compilation



Index: gnome-web-photo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-web-photo/devel/gnome-web-photo.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- gnome-web-photo.spec	6 Jan 2009 20:14:15 -0000	1.13
+++ gnome-web-photo.spec	8 Jan 2009 17:12:42 -0000	1.14
@@ -35,6 +35,7 @@
 
 %build
 autoreconf
+libtoolize -f
 %configure
 make %{?_smp_mflags}
 



From ltinkl at fedoraproject.org  Thu Jan  8 17:25:22 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Thu,  8 Jan 2009 17:25:22 +0000 (UTC)
Subject: rpms/kdebase/F-10 .cvsignore, 1.79, 1.80 kdebase.spec, 1.348,
	1.349 sources, 1.103, 1.104
Message-ID: <20090108172522.E3AD1700FD@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kdebase/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6505/F-10

Modified Files:
	.cvsignore kdebase.spec sources 
Log Message:
KDE 4.1.4



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdebase/F-10/.cvsignore,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- .cvsignore	26 Sep 2008 19:44:10 -0000	1.79
+++ .cvsignore	8 Jan 2009 17:24:52 -0000	1.80
@@ -1 +1 @@
-kdebase-4.1.2.tar.bz2
+kdebase-4.1.4.tar.bz2


Index: kdebase.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebase/F-10/kdebase.spec,v
retrieving revision 1.348
retrieving revision 1.349
diff -u -r1.348 -r1.349
--- kdebase.spec	12 Nov 2008 16:13:24 -0000	1.348
+++ kdebase.spec	8 Jan 2009 17:24:52 -0000	1.349
@@ -1,7 +1,7 @@
 
 Summary: K Desktop Environment 4 - Core Files
-Version: 4.1.3
-Release: 2%{?dist}
+Version: 4.1.4
+Release: 1%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdebase
@@ -314,6 +314,9 @@
 
 
 %changelog
+* Thu Jan  8 2009 Luk???? Tinkl <ltinkl at redhat.com> 4.1.4-1
+- KDE 4.1.4
+
 * Wed Nov 12 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.3-2
 - readd kde#156636 patch (Konsole keyboard actions backport)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdebase/F-10/sources,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -r1.103 -r1.104
--- sources	11 Nov 2008 23:10:20 -0000	1.103
+++ sources	8 Jan 2009 17:24:52 -0000	1.104
@@ -1 +1 @@
-cfeea9d5eb9004810b6e8a67ae937e6b  kdebase-4.1.3.tar.bz2
+d693d77d88c5b57eb506d405c2f61449  kdebase-4.1.4.tar.bz2



From ltinkl at fedoraproject.org  Thu Jan  8 17:25:23 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Thu,  8 Jan 2009 17:25:23 +0000 (UTC)
Subject: rpms/kdebase/F-9 .cvsignore, 1.73, 1.74 kdebase.spec, 1.339,
	1.340 sources, 1.98, 1.99
Message-ID: <20090108172523.4297A700FD@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kdebase/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6505/F-9

Modified Files:
	.cvsignore kdebase.spec sources 
Log Message:
KDE 4.1.4



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdebase/F-9/.cvsignore,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- .cvsignore	4 Nov 2008 19:16:42 -0000	1.73
+++ .cvsignore	8 Jan 2009 17:24:52 -0000	1.74
@@ -1 +1 @@
-kdebase-4.1.3.tar.bz2
+kdebase-4.1.4.tar.bz2


Index: kdebase.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebase/F-9/kdebase.spec,v
retrieving revision 1.339
retrieving revision 1.340
diff -u -r1.339 -r1.340
--- kdebase.spec	12 Nov 2008 16:13:25 -0000	1.339
+++ kdebase.spec	8 Jan 2009 17:24:52 -0000	1.340
@@ -1,7 +1,7 @@
 
 Summary: K Desktop Environment 4 - Core Files
-Version: 4.1.3
-Release: 2%{?dist}
+Version: 4.1.4
+Release: 1%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdebase
@@ -314,6 +314,9 @@
 
 
 %changelog
+* Thu Jan  8 2009 Luk???? Tinkl <ltinkl at redhat.com> 4.1.4-1
+- KDE 4.1.4
+
 * Wed Nov 12 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.3-2
 - readd kde#156636 patch (Konsole keyboard actions backport)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdebase/F-9/sources,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -r1.98 -r1.99
--- sources	4 Nov 2008 19:16:42 -0000	1.98
+++ sources	8 Jan 2009 17:24:53 -0000	1.99
@@ -1 +1 @@
-cfeea9d5eb9004810b6e8a67ae937e6b  kdebase-4.1.3.tar.bz2
+d693d77d88c5b57eb506d405c2f61449  kdebase-4.1.4.tar.bz2



From nsantos at fedoraproject.org  Thu Jan  8 17:44:33 2009
From: nsantos at fedoraproject.org (Nuno Santos)
Date: Thu,  8 Jan 2009 17:44:33 +0000 (UTC)
Subject: rpms/python-qpid/devel python-qpid.spec,1.18,1.19
Message-ID: <20090108174433.B709F700FD@cvs1.fedora.phx.redhat.com>

Author: nsantos

Update of /cvs/extras/rpms/python-qpid/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8992

Modified Files:
	python-qpid.spec 
Log Message:
BZ 479212: add qmf dirs


Index: python-qpid.spec
===================================================================
RCS file: /cvs/extras/rpms/python-qpid/devel/python-qpid.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- python-qpid.spec	23 Dec 2008 16:28:52 -0000	1.18
+++ python-qpid.spec	8 Jan 2009 17:44:03 -0000	1.19
@@ -1,6 +1,6 @@
 Name:           python-qpid
 Version:        0.4.728142
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Python language client for AMQP
 
 Group:          Development/Python
@@ -56,6 +56,8 @@
 install -pm 0644 tests_0-9/*.* $RPM_BUILD_ROOT%{python_sitelib}/qpid/tests_0-9
 install -d $RPM_BUILD_ROOT%{python_sitelib}/qpid/tests_0-10
 install -pm 0644 tests_0-10/*.* $RPM_BUILD_ROOT%{python_sitelib}/qpid/tests_0-10
+install -d $RPM_BUILD_ROOT%{python_sitelib}/qmf
+install -pm 0644 qmf/* $RPM_BUILD_ROOT%{python_sitelib}/qmf
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -64,11 +66,17 @@
 %defattr(-,root,root,-)
 %{python_sitelib}/qpid
 %{python_sitelib}/qpid_config.*
+%{python_sitelib}/qmf
 %{_bindir}/python-qpid-tests
 %{_bindir}/qpid-*
 %doc LICENSE.txt NOTICE.txt README.txt doc/test-requirements.txt
 
+
+
 %changelog
+* Thu Jan  8 2009 Nuno Santos <nsantos at redhat.com> - 0.4.728142-3
+- BZ 479212: add qmf dirs
+
 * Tue Dec 23 2008 Nuno Santos <nsantos at redhat.com> - 0.4.728142-1
 - Rebased to svn rev 728142
 



From nsantos at fedoraproject.org  Thu Jan  8 17:49:48 2009
From: nsantos at fedoraproject.org (Nuno Santos)
Date: Thu,  8 Jan 2009 17:49:48 +0000 (UTC)
Subject: rpms/python-qpid/F-10 python-qpid.spec,1.16,1.17
Message-ID: <20090108174948.16732700FD@cvs1.fedora.phx.redhat.com>

Author: nsantos

Update of /cvs/extras/rpms/python-qpid/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9354

Modified Files:
	python-qpid.spec 
Log Message:
BZ 479212: add qmf dirs


Index: python-qpid.spec
===================================================================
RCS file: /cvs/extras/rpms/python-qpid/F-10/python-qpid.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- python-qpid.spec	23 Dec 2008 16:32:42 -0000	1.16
+++ python-qpid.spec	8 Jan 2009 17:49:17 -0000	1.17
@@ -1,6 +1,6 @@
 Name:           python-qpid
 Version:        0.4.728142
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Python language client for AMQP
 
 Group:          Development/Python
@@ -56,6 +56,8 @@
 install -pm 0644 tests_0-9/*.* $RPM_BUILD_ROOT%{python_sitelib}/qpid/tests_0-9
 install -d $RPM_BUILD_ROOT%{python_sitelib}/qpid/tests_0-10
 install -pm 0644 tests_0-10/*.* $RPM_BUILD_ROOT%{python_sitelib}/qpid/tests_0-10
+install -d $RPM_BUILD_ROOT%{python_sitelib}/qmf
+install -pm 0644 qmf/* $RPM_BUILD_ROOT%{python_sitelib}/qmf
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -64,11 +66,17 @@
 %defattr(-,root,root,-)
 %{python_sitelib}/qpid
 %{python_sitelib}/qpid_config.*
+%{python_sitelib}/qmf
 %{_bindir}/python-qpid-tests
 %{_bindir}/qpid-*
 %doc LICENSE.txt NOTICE.txt README.txt doc/test-requirements.txt
 
+
+
 %changelog
+* Thu Jan  8 2009 Nuno Santos <nsantos at redhat.com> - 0.4.728142-3
+- BZ 479212: add qmf dirs
+
 * Tue Dec 23 2008 Nuno Santos <nsantos at redhat.com> - 0.4.728142-1
 - Rebased to svn rev 728142
 



From nsantos at fedoraproject.org  Thu Jan  8 17:53:43 2009
From: nsantos at fedoraproject.org (Nuno Santos)
Date: Thu,  8 Jan 2009 17:53:43 +0000 (UTC)
Subject: rpms/python-qpid/F-9 python-qpid.spec,1.14,1.15
Message-ID: <20090108175343.CC13E700FD@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-serv9720

Modified Files:
	python-qpid.spec 
Log Message:
BZ 479212: add qmf dirs


Index: python-qpid.spec
===================================================================
RCS file: /cvs/extras/rpms/python-qpid/F-9/python-qpid.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- python-qpid.spec	23 Dec 2008 16:08:45 -0000	1.14
+++ python-qpid.spec	8 Jan 2009 17:53:13 -0000	1.15
@@ -1,6 +1,6 @@
 Name:           python-qpid
 Version:        0.4.728142
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Python language client for AMQP
 
 Group:          Development/Python
@@ -56,6 +56,8 @@
 install -pm 0644 tests_0-9/*.* $RPM_BUILD_ROOT%{python_sitelib}/qpid/tests_0-9
 install -d $RPM_BUILD_ROOT%{python_sitelib}/qpid/tests_0-10
 install -pm 0644 tests_0-10/*.* $RPM_BUILD_ROOT%{python_sitelib}/qpid/tests_0-10
+install -d $RPM_BUILD_ROOT%{python_sitelib}/qmf
+install -pm 0644 qmf/* $RPM_BUILD_ROOT%{python_sitelib}/qmf
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -64,12 +66,18 @@
 %defattr(-,root,root,-)
 %{python_sitelib}/qpid
 %{python_sitelib}/qpid_config.*
+%{python_sitelib}/qmf
 %{_bindir}/python-qpid-tests
 %{_bindir}/qpid-*
 %doc LICENSE.txt NOTICE.txt README.txt doc/test-requirements.txt
 
+
+
 %changelog
-* Tue Dec 23 2008 Nuno Santos <nsantos at redhat.com> - 0.4.728142-2
+* Thu Jan  8 2009 Nuno Santos <nsantos at redhat.com> - 0.4.728142-3
+- BZ 479212: add qmf dirs
+
+* Tue Dec 23 2008 Nuno Santos <nsantos at redhat.com> - 0.4.728142-1
 - Rebased to svn rev 728142
 
 * Thu Dec 04 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 0.3.722557-2



From awjb at fedoraproject.org  Thu Jan  8 17:58:47 2009
From: awjb at fedoraproject.org (Andreas Bierfert)
Date: Thu,  8 Jan 2009 17:58:47 +0000 (UTC)
Subject: rpms/wine/F-9 .cvsignore, 1.67, 1.68 sources, 1.68, 1.69 wine.spec, 
	1.97, 1.98
Message-ID: <20090108175847.DEBB3700FD@cvs1.fedora.phx.redhat.com>

Author: awjb

Update of /cvs/pkgs/rpms/wine/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10107/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.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- .cvsignore	10 Dec 2008 05:27:03 -0000	1.67
+++ .cvsignore	8 Jan 2009 17:58:17 -0000	1.68
@@ -1 +1 @@
-wine-1.1.10-fe.tar.bz2
+wine-1.1.12-fe.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/wine/F-9/sources,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- sources	10 Dec 2008 05:27:03 -0000	1.68
+++ sources	8 Jan 2009 17:58:17 -0000	1.69
@@ -1 +1 @@
-e8e6a40936896d488bae6d517ececed9  wine-1.1.10-fe.tar.bz2
+038acc9568ecf813ecd0b108e83a946d  wine-1.1.12-fe.tar.bz2


Index: wine.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wine/F-9/wine.spec,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -r1.97 -r1.98
--- wine.spec	10 Dec 2008 05:27:03 -0000	1.97
+++ wine.spec	8 Jan 2009 17:58:17 -0000	1.98
@@ -1,5 +1,5 @@
 Name:		wine
-Version:	1.1.10
+Version:	1.1.12
 Release:	1%{?dist}
 Summary:	A Windows 16/32/64 bit emulator
 
@@ -628,6 +628,7 @@
 %{_libdir}/wine/olesvr32.dll.so
 %{_libdir}/wine/olethk32.dll.so
 %{_libdir}/wine/pdh.dll.so
+%{_libdir}/wine/pidgen.dll.so
 %{_libdir}/wine/powrprof.dll.so
 %{_libdir}/wine/printui.dll.so
 %{_libdir}/wine/propsys.dll.so
@@ -730,6 +731,7 @@
 %{_libdir}/wine/ws2_32.dll.so
 %{_libdir}/wine/wsock32.dll.so
 %{_libdir}/wine/wtsapi32.dll.so
+%{_libdir}/wine/wuapi.dll.so
 %{_libdir}/wine/security.dll.so
 %{_libdir}/wine/sfc.dll.so
 %{_datadir}/wine/fonts/
@@ -854,6 +856,10 @@
 %{_libdir}/wine/winepulse.drv.so
 
 %changelog
+* Mon Jan 05 2009 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- 1.1.12-1
+- version upgrade
+
 * Sat Dec 06 2008 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 - 1.1.10-1
 - version upgrade



From awjb at fedoraproject.org  Thu Jan  8 17:58:48 2009
From: awjb at fedoraproject.org (Andreas Bierfert)
Date: Thu,  8 Jan 2009 17:58:48 +0000 (UTC)
Subject: rpms/wine/devel .cvsignore, 1.68, 1.69 sources, 1.69, 1.70 wine.spec,
	1.95, 1.96
Message-ID: <20090108175848.BE455700FD@cvs1.fedora.phx.redhat.com>

Author: awjb

Update of /cvs/pkgs/rpms/wine/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10107/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.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- .cvsignore	10 Dec 2008 05:27:04 -0000	1.68
+++ .cvsignore	8 Jan 2009 17:58:18 -0000	1.69
@@ -1 +1 @@
-wine-1.1.10-fe.tar.bz2
+wine-1.1.12-fe.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/wine/devel/sources,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- sources	10 Dec 2008 05:27:04 -0000	1.69
+++ sources	8 Jan 2009 17:58:18 -0000	1.70
@@ -1 +1 @@
-e8e6a40936896d488bae6d517ececed9  wine-1.1.10-fe.tar.bz2
+038acc9568ecf813ecd0b108e83a946d  wine-1.1.12-fe.tar.bz2


Index: wine.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wine/devel/wine.spec,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -r1.95 -r1.96
--- wine.spec	10 Dec 2008 05:27:04 -0000	1.95
+++ wine.spec	8 Jan 2009 17:58:18 -0000	1.96
@@ -1,5 +1,5 @@
 Name:		wine
-Version:	1.1.10
+Version:	1.1.12
 Release:	1%{?dist}
 Summary:	A Windows 16/32/64 bit emulator
 
@@ -628,6 +628,7 @@
 %{_libdir}/wine/olesvr32.dll.so
 %{_libdir}/wine/olethk32.dll.so
 %{_libdir}/wine/pdh.dll.so
+%{_libdir}/wine/pidgen.dll.so
 %{_libdir}/wine/powrprof.dll.so
 %{_libdir}/wine/printui.dll.so
 %{_libdir}/wine/propsys.dll.so
@@ -730,6 +731,7 @@
 %{_libdir}/wine/ws2_32.dll.so
 %{_libdir}/wine/wsock32.dll.so
 %{_libdir}/wine/wtsapi32.dll.so
+%{_libdir}/wine/wuapi.dll.so
 %{_libdir}/wine/security.dll.so
 %{_libdir}/wine/sfc.dll.so
 %{_datadir}/wine/fonts/
@@ -854,6 +856,10 @@
 %{_libdir}/wine/winepulse.drv.so
 
 %changelog
+* Mon Jan 05 2009 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- 1.1.12-1
+- version upgrade
+
 * Sat Dec 06 2008 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 - 1.1.10-1
 - version upgrade



From awjb at fedoraproject.org  Thu Jan  8 17:58:48 2009
From: awjb at fedoraproject.org (Andreas Bierfert)
Date: Thu,  8 Jan 2009 17:58:48 +0000 (UTC)
Subject: rpms/wine/F-10 .cvsignore, 1.68, 1.69 sources, 1.69, 1.70 wine.spec,
	1.95, 1.96
Message-ID: <20090108175848.565CB700FD@cvs1.fedora.phx.redhat.com>

Author: awjb

Update of /cvs/pkgs/rpms/wine/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10107/F-10

Modified Files:
	.cvsignore sources wine.spec 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/wine/F-10/.cvsignore,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- .cvsignore	10 Dec 2008 05:27:04 -0000	1.68
+++ .cvsignore	8 Jan 2009 17:58:17 -0000	1.69
@@ -1 +1 @@
-wine-1.1.10-fe.tar.bz2
+wine-1.1.12-fe.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/wine/F-10/sources,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- sources	10 Dec 2008 05:27:04 -0000	1.69
+++ sources	8 Jan 2009 17:58:18 -0000	1.70
@@ -1 +1 @@
-e8e6a40936896d488bae6d517ececed9  wine-1.1.10-fe.tar.bz2
+038acc9568ecf813ecd0b108e83a946d  wine-1.1.12-fe.tar.bz2


Index: wine.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wine/F-10/wine.spec,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -r1.95 -r1.96
--- wine.spec	10 Dec 2008 05:27:04 -0000	1.95
+++ wine.spec	8 Jan 2009 17:58:18 -0000	1.96
@@ -1,5 +1,5 @@
 Name:		wine
-Version:	1.1.10
+Version:	1.1.12
 Release:	1%{?dist}
 Summary:	A Windows 16/32/64 bit emulator
 
@@ -628,6 +628,7 @@
 %{_libdir}/wine/olesvr32.dll.so
 %{_libdir}/wine/olethk32.dll.so
 %{_libdir}/wine/pdh.dll.so
+%{_libdir}/wine/pidgen.dll.so
 %{_libdir}/wine/powrprof.dll.so
 %{_libdir}/wine/printui.dll.so
 %{_libdir}/wine/propsys.dll.so
@@ -730,6 +731,7 @@
 %{_libdir}/wine/ws2_32.dll.so
 %{_libdir}/wine/wsock32.dll.so
 %{_libdir}/wine/wtsapi32.dll.so
+%{_libdir}/wine/wuapi.dll.so
 %{_libdir}/wine/security.dll.so
 %{_libdir}/wine/sfc.dll.so
 %{_datadir}/wine/fonts/
@@ -854,6 +856,10 @@
 %{_libdir}/wine/winepulse.drv.so
 
 %changelog
+* Mon Jan 05 2009 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- 1.1.12-1
+- version upgrade
+
 * Sat Dec 06 2008 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 - 1.1.10-1
 - version upgrade



From twaugh at fedoraproject.org  Thu Jan  8 18:05:26 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Thu,  8 Jan 2009 18:05:26 +0000 (UTC)
Subject: rpms/system-config-printer/devel pycups-1.9.45.tar.bz2.sig, NONE,
	1.1 .cvsignore, 1.193, 1.194 sources, 1.199,
	1.200 system-config-printer.spec, 1.239,
	1.240 pycups-1.9.44.tar.bz2.sig, 1.1, NONE pycups-git.patch, 1.1, NONE
Message-ID: <20090108180526.A3C8A700FD@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-serv10816

Modified Files:
	.cvsignore sources system-config-printer.spec 
Added Files:
	pycups-1.9.45.tar.bz2.sig 
Removed Files:
	pycups-1.9.44.tar.bz2.sig pycups-git.patch 
Log Message:
* Thu Jan  8 2009 Tim Waugh <twaugh at redhat.com> 1.1.1-2
- Updated pycups to 1.9.45.



--- NEW FILE pycups-1.9.45.tar.bz2.sig ---
??

Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/devel/.cvsignore,v
retrieving revision 1.193
retrieving revision 1.194
diff -u -r1.193 -r1.194
--- .cvsignore	20 Dec 2008 12:05:44 -0000	1.193
+++ .cvsignore	8 Jan 2009 18:04:55 -0000	1.194
@@ -192,3 +192,4 @@
 system-config-printer-1.0.12.tar.bz2
 system-config-printer-1.1.0.tar.bz2
 system-config-printer-1.1.1.tar.bz2
+pycups-1.9.45.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/devel/sources,v
retrieving revision 1.199
retrieving revision 1.200
diff -u -r1.199 -r1.200
--- sources	20 Dec 2008 12:05:44 -0000	1.199
+++ sources	8 Jan 2009 18:04:56 -0000	1.200
@@ -1,3 +1,3 @@
 ac8f98a40b0fc4b6ab4470f10489887a  pysmbc-1.0.6.tar.bz2
-181f413546676e098352860e3ce57465  pycups-1.9.44.tar.bz2
 95ad721f3d274557144ddcf5e458a9e4  system-config-printer-1.1.1.tar.bz2
+ff634a6751f8a859ed26751bf03abef0  pycups-1.9.45.tar.bz2


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/devel/system-config-printer.spec,v
retrieving revision 1.239
retrieving revision 1.240
diff -u -r1.239 -r1.240
--- system-config-printer.spec	20 Dec 2008 12:05:45 -0000	1.239
+++ system-config-printer.spec	8 Jan 2009 18:04:56 -0000	1.240
@@ -1,4 +1,4 @@
-%define pycups_version 1.9.44
+%define pycups_version 1.9.45
 %define pysmbc_version 1.0.6
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
@@ -7,7 +7,7 @@
 Summary: A printer administration tool
 Name: system-config-printer
 Version: 1.1.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 URL: http://cyberelk.net/tim/software/system-config-printer/
 Group: System Environment/Base
@@ -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
 
-Patch10: pycups-git.patch
-
 BuildRequires: cups-devel >= 1.2
 BuildRequires: python-devel >= 2.4
 BuildRequires: libsmbclient-devel >= 3.2
@@ -62,9 +60,6 @@
 
 %prep
 %setup -q -a 1 -a 2
-pushd pycups-%{pycups_version}
-%patch10 -p1 -b .pycups-git
-popd
 
 %build
 %configure
@@ -164,6 +159,9 @@
 exit 0
 
 %changelog
+* Thu Jan  8 2009 Tim Waugh <twaugh at redhat.com> 1.1.1-2
+- Updated pycups to 1.9.45.
+
 * Sat Dec 20 2008 Tim Waugh <twaugh at redhat.com> 1.1.1-1
 - 1.1.1.
 


--- pycups-1.9.44.tar.bz2.sig DELETED ---


--- pycups-git.patch DELETED ---



From notting at fedoraproject.org  Thu Jan  8 18:17:16 2009
From: notting at fedoraproject.org (Bill Nottingham)
Date: Thu,  8 Jan 2009 18:17:16 +0000 (UTC)
Subject: rpms/mash/devel .cvsignore, 1.39, 1.40 mash.spec, 1.43, 1.44 sources,
	1.41, 1.42
Message-ID: <20090108181716.F2EC4700FD@cvs1.fedora.phx.redhat.com>

Author: notting

Update of /cvs/extras/rpms/mash/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12390

Modified Files:
	.cvsignore mash.spec sources 
Log Message:
0.4.9



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mash/devel/.cvsignore,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- .cvsignore	19 Dec 2008 04:33:51 -0000	1.39
+++ .cvsignore	8 Jan 2009 18:16:46 -0000	1.40
@@ -1 +1 @@
-mash-0.4.8.tar.gz
+mash-0.4.9.tar.gz


Index: mash.spec
===================================================================
RCS file: /cvs/extras/rpms/mash/devel/mash.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- mash.spec	19 Dec 2008 04:33:52 -0000	1.43
+++ mash.spec	8 Jan 2009 18:16:46 -0000	1.44
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           mash
-Version:        0.4.8
+Version:        0.4.9
 Release:        1%{?dist}
 Summary:        Koji buildsystem to yum repository converter
 Group:          Development/Tools
@@ -44,6 +44,9 @@
 /var/cache/mash
 
 %changelog
+* Thu Jan  8 2009 Bill Nottingham <notting at redhat.com> 0.4.9-1
+- error out if strict_keys is set and we can't download the signed package
+
 * Thu Dec 18 2008 Bill Nottingham <notting at redhat.com> 0.4.8-1
 - Fix debuginfo exclusion
 - Fix --skip-stat with old createrepo


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mash/devel/sources,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- sources	19 Dec 2008 04:33:52 -0000	1.41
+++ sources	8 Jan 2009 18:16:46 -0000	1.42
@@ -1 +1 @@
-7f1792534f6ff80e3077517776656594  mash-0.4.8.tar.gz
+7306348a2a2dec270bc03e348817683b  mash-0.4.9.tar.gz



From ltinkl at fedoraproject.org  Thu Jan  8 18:25:44 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Thu,  8 Jan 2009 18:25:44 +0000 (UTC)
Subject: rpms/kdebindings/F-10 .cvsignore, 1.49, 1.50 kdebindings.spec, 1.147,
	1.148 sources, 1.56, 1.57
Message-ID: <20090108182544.D1244700FD@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kdebindings/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13112/F-10

Modified Files:
	.cvsignore kdebindings.spec sources 
Log Message:
KDE 4.1.4



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdebindings/F-10/.cvsignore,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- .cvsignore	27 Sep 2008 01:59:15 -0000	1.49
+++ .cvsignore	8 Jan 2009 18:25:14 -0000	1.50
@@ -1 +1 @@
-kdebindings-4.1.2.tar.bz2
+kdebindings-4.1.4.tar.bz2


Index: kdebindings.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebindings/F-10/kdebindings.spec,v
retrieving revision 1.147
retrieving revision 1.148
diff -u -r1.147 -r1.148
--- kdebindings.spec	11 Nov 2008 23:35:53 -0000	1.147
+++ kdebindings.spec	8 Jan 2009 18:25:14 -0000	1.148
@@ -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.3
+Version: 4.1.4
 Release: 1%{?dist}
 Summary: KDE bindings to non-C++ languages
 
@@ -166,6 +166,9 @@
 
 
 %changelog
+* Thu Jan  8 2009 Luk???? Tinkl <ltinkl at redhat.com> 4.1.4-1
+- KDE 4.1.4
+
 * Wed Nov 12 2008 Than Ngo <than at redhat.com>  4.1.3-1
 - 4.1.3
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdebindings/F-10/sources,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- sources	11 Nov 2008 23:35:53 -0000	1.56
+++ sources	8 Jan 2009 18:25:14 -0000	1.57
@@ -1 +1 @@
-653539f01d018b746a5131beb11fc205  kdebindings-4.1.3.tar.bz2
+d96fc787abcc6d7d9b3f2f1467fe226b  kdebindings-4.1.4.tar.bz2



From ltinkl at fedoraproject.org  Thu Jan  8 18:25:44 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Thu,  8 Jan 2009 18:25:44 +0000 (UTC)
Subject: rpms/kdebindings/F-9 .cvsignore, 1.44, 1.45 kdebindings.spec, 1.110,
	1.111 sources, 1.51, 1.52
Message-ID: <20090108182544.F3DB1700FD@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kdebindings/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13112/F-9

Modified Files:
	.cvsignore kdebindings.spec sources 
Log Message:
KDE 4.1.4



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdebindings/F-9/.cvsignore,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- .cvsignore	7 Nov 2008 12:29:42 -0000	1.44
+++ .cvsignore	8 Jan 2009 18:25:14 -0000	1.45
@@ -1 +1 @@
-kdebindings-4.1.3.tar.bz2
+kdebindings-4.1.4.tar.bz2


Index: kdebindings.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebindings/F-9/kdebindings.spec,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -r1.110 -r1.111
--- kdebindings.spec	7 Nov 2008 13:01:15 -0000	1.110
+++ kdebindings.spec	8 Jan 2009 18:25:14 -0000	1.111
@@ -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.3
+Version: 4.1.4
 Release: 1%{?dist}
 Summary: KDE bindings to non-C++ languages
 
@@ -166,6 +166,9 @@
 
 
 %changelog
+* Thu Jan  8 2009 Luk???? Tinkl <ltinkl at redhat.com> 4.1.4-1
+- KDE 4.1.4
+
 * Fri Nov  7 2008 Luk???? Tinkl <ltinkl at redhat.com> 4.1.3-1
 - KDE 4.1.3
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdebindings/F-9/sources,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- sources	7 Nov 2008 12:29:42 -0000	1.51
+++ sources	8 Jan 2009 18:25:14 -0000	1.52
@@ -1 +1 @@
-653539f01d018b746a5131beb11fc205  kdebindings-4.1.3.tar.bz2
+d96fc787abcc6d7d9b3f2f1467fe226b  kdebindings-4.1.4.tar.bz2



From kyle at fedoraproject.org  Thu Jan  8 18:33:10 2009
From: kyle at fedoraproject.org (Kyle McMartin)
Date: Thu,  8 Jan 2009 18:33:10 +0000 (UTC)
Subject: rpms/kernel/devel linux-2.6.27-lirc.patch,1.2,1.3
Message-ID: <20090108183310.30906700FD@cvs1.fedora.phx.redhat.com>

Author: kyle

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13996

Modified Files:
	linux-2.6.27-lirc.patch 
Log Message:
fixup lirc for info/warn macro removal

linux-2.6.27-lirc.patch:

Index: linux-2.6.27-lirc.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6.27-lirc.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- linux-2.6.27-lirc.patch	8 Dec 2008 18:59:40 -0000	1.2
+++ linux-2.6.27-lirc.patch	8 Jan 2009 18:33:09 -0000	1.3
@@ -3298,7 +3298,7 @@
 +	kfree(context);
 +
 +	if (debug)
-+		info("%s: context deleted", __func__);
++		printk(KERN_INFO "%s: context deleted\n", __func__);
 +}
 +
 +static inline void deregister_from_lirc(struct imon_context *context)
@@ -3311,7 +3311,7 @@
 +		err("%s: unable to deregister from lirc(%d)",
 +			__func__, retval);
 +	else
-+		info("Deregistered iMON plugin(minor:%d)", minor);
++		printk(KERN_INFO "Deregistered iMON plugin(minor:%d)\n", minor);
 +
 +}
 +
@@ -3357,7 +3357,7 @@
 +	} else {
 +		context->vfd_isopen = TRUE;
 +		file->private_data = context;
-+		info("VFD port opened");
++		printk(KERN_INFO "VFD port opened\n");
 +	}
 +
 +	UNLOCK_CONTEXT;
@@ -3393,7 +3393,7 @@
 +		retval = -EIO;
 +	} else {
 +		context->vfd_isopen = FALSE;
-+		info("VFD port closed");
++		printk(KERN_INFO "VFD port closed\n");
 +		if (!context->dev_present && !context->ir_isopen) {
 +			/* Device disconnected before close and IR port is not
 +			 * open. If IR port is open, context will be deleted by
@@ -3718,7 +3718,7 @@
 +		err("%s: send packet failed!", __func__);
 +		goto exit;
 +	} else if (debug) {
-+		info("%s: write %d bytes to LCD", __func__, (int) n_bytes);
++		printk(KERN_INFO "%s: write %d bytes to LCD\n", __func__, (int) n_bytes);
 +	}
 +exit:
 +	UNLOCK_CONTEXT;
@@ -3786,7 +3786,7 @@
 +		    __func__, retval);
 +	else {
 +		context->ir_isopen = TRUE;
-+		info("IR port opened");
++		printk(KERN_INFO "IR port opened\n");
 +	}
 +
 +exit:
@@ -3814,7 +3814,7 @@
 +	usb_kill_urb(context->rx_urb);
 +	context->ir_isopen = FALSE;
 +	context->ir_isassociating = FALSE;
-+	info("IR port closed");
++	printk(KERN_INFO "IR port closed\n");
 +
 +	if (!context->dev_present) {
 +		/* Device disconnected while IR port was
@@ -3845,7 +3845,7 @@
 +	int i;
 +
 +	if (debug)
-+		info("submitting data to LIRC\n");
++		printk(KERN_INFO "submitting data to LIRC\n");
 +
 +	value *= BIT_DURATION;
 +	value &= PULSE_MASK;
@@ -3910,7 +3910,7 @@
 +	}
 +
 +	if (len != 8) {
-+		warn("%s: invalid incoming packet size(%d)",
++		printk(KERN_WARN "%s: invalid incoming packet size(%d)\n",
 +		     __func__, len);
 +		return;
 +	}
@@ -3923,7 +3923,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", __func__, buf[1]);
++		printk(KERN_WARN "%s: remote associated refid=%02X\n", __func__, buf[1]);
 +		context->ir_isassociating = FALSE;
 +	}
 +
@@ -4021,7 +4021,7 @@
 +			incoming_packet(context, urb);
 +		break;
 +	default:
-+		warn("%s: status(%d): ignored", __func__, urb->status);
++		printk(KERN_WARN "%s: status(%d): ignored\n", __func__, urb->status);
 +		break;
 +	}
 +
@@ -4058,7 +4058,7 @@
 +	struct imon_context *context = NULL;
 +	int i;
 +
-+	info("%s: found IMON device", __func__);
++	printk(KERN_INFO "%s: found IMON device\n", __func__);
 +
 +	/*
 +	 * If it's the LCD, as opposed to the VFD, we just need to replace
@@ -4099,7 +4099,7 @@
 +			rx_endpoint = ep;
 +			ir_ep_found = TRUE;
 +			if (debug)
-+				info("%s: found IR endpoint", __func__);
++				printk(KERN_INFO "%s: found IR endpoint\n", __func__);
 +
 +		} else if (!vfd_ep_found &&
 +			   ep_dir == USB_DIR_OUT &&
@@ -4107,7 +4107,7 @@
 +			tx_endpoint = ep;
 +			vfd_ep_found = TRUE;
 +			if (debug)
-+				info("%s: found VFD endpoint", __func__);
++				printk(KERN_INFO "%s: found VFD endpoint\n", __func__);
 +		}
 +	}
 +
@@ -4120,8 +4120,8 @@
 +			tx_control = 1;
 +			vfd_ep_found = TRUE;
 +			if (debug)
-+				info("%s: LCD device uses control endpoint, "
-+				     "not interface OUT endpoint", __func__);
++				printk(KERN_INFO "%s: LCD device uses control endpoint, "
++				     "not interface OUT endpoint\n", __func__);
 +		}
 +	}
 +
@@ -4136,7 +4136,7 @@
 +		tx_control = 0;
 +		vfd_ep_found = FALSE;
 +		if (debug)
-+			info("%s: device has no display", __func__);
++			printk(KERN_INFO "%s: device has no display\n", __func__);
 +	}
 +
 +	/* Input endpoint is mandatory */
@@ -4150,7 +4150,7 @@
 +			ir_onboard_decode = TRUE;
 +
 +		if (debug)
-+			info("ir_onboard_decode: %d", ir_onboard_decode);
++			printk(KERN_INFO "ir_onboard_decode: %d\n", ir_onboard_decode);
 +	}
 +
 +	/* Determine if VFD requires 6 packets */
@@ -4159,7 +4159,7 @@
 +			vfd_proto_6p = TRUE;
 +
 +		if (debug)
-+			info("vfd_proto_6p: %d", vfd_proto_6p);
++			printk(KERN_INFO "vfd_proto_6p: %d\n", vfd_proto_6p);
 +	}
 +
 +
@@ -4237,7 +4237,7 @@
 +		UNLOCK_CONTEXT;
 +		goto alloc_status_switch;
 +	} else
-+		info("%s: Registered iMON plugin(minor:%d)",
++		printk(KERN_INFO "%s: Registered iMON plugin(minor:%d)\n",
 +		     __func__, lirc_minor);
 +
 +	/* Needed while unregistering! */
@@ -4269,15 +4269,15 @@
 +
 +	if (vfd_ep_found) {
 +		if (debug)
-+			info("Registering VFD with sysfs");
++			printk(KERN_INFO "Registering VFD with sysfs\n");
 +		if (usb_register_dev(interface, &imon_class)) {
 +			/* Not a fatal error, so ignore */
-+			info("%s: could not get a minor number for VFD",
++			printk(KERN_INFO "%s: could not get a minor number for VFD\n",
 +				__func__);
 +		}
 +	}
 +
-+	info("%s: iMON device on usb<%d:%d> initialized",
++	printk(KERN_INFO "%s: iMON device on usb<%d:%d> initialized\n",
 +			__func__, dev->bus->busnum, dev->devnum);
 +
 +	UNLOCK_CONTEXT;
@@ -4322,7 +4322,7 @@
 +	context = usb_get_intfdata(interface);
 +	LOCK_CONTEXT;
 +
-+	info("%s: iMON device disconnected", __func__);
++	printk(KERN_INFO "%s: iMON device disconnected\n", __func__);
 +
 +	/* sysfs_remove_group is safe to call even if sysfs_create_group
 +	 * hasn't been called */
@@ -4359,8 +4359,8 @@
 +{
 +	int rc;
 +
-+	info(MOD_DESC ", v" MOD_VERSION);
-+	info(MOD_AUTHOR);
++	printk(KERN_INFO MOD_DESC ", v" MOD_VERSION "\n");
++	printk(KERN_INFO MOD_AUTHOR "\n");
 +
 +	rc = usb_register(&imon_driver);
 +	if (rc) {
@@ -4373,7 +4373,7 @@
 +static void __exit imon_exit(void)
 +{
 +	usb_deregister(&imon_driver);
-+	info("module removed. Goodbye!");
++	printk(KERN_INFO "module removed. Goodbye!\n");
 +}
 +
 +#ifdef MODULE
@@ -6715,8 +6715,8 @@
 +			break;
 +	}
 +	if (minor >= MAX_DEVICES) {
-+		info("Too many devices plugged in, "
-+		     "can not handle this device.");
++		printk(KERN_INFO "Too many devices plugged in, "
++		     "can not handle this device.\n");
 +		goto error;
 +	}
 +
@@ -6856,7 +6856,7 @@
 +	/* we can register the device now, as it is ready */
 +	usb_set_intfdata(interface, dev);
 +	/* let the user know what node this device is now attached to */
-+	/* info("USB Microsoft IR Transceiver device now attached to msir%d",
++	/* printk(KERN_INFO "USB Microsoft IR Transceiver device now attached to msir%d",
 +		dev->minor); */
 +	up(&minor_table_mutex);
 +	return 0;
@@ -6906,7 +6906,7 @@
 +
 +	mceusb_delete(dev);
 +
-+	info("Microsoft IR Transceiver #%d now disconnected", minor);
++	printk(KERN_INFO "Microsoft IR Transceiver #%d now disconnected\n", minor);
 +	mutex_unlock(&dev->sem);
 +	up(&minor_table_mutex);
 +}
@@ -6928,7 +6928,7 @@
 +		return result;
 +	}
 +
-+	info(DRIVER_DESC " " DRIVER_VERSION);
++	printk(KERN_INFO DRIVER_DESC " " DRIVER_VERSION "\n");
 +	return 0;
 +}
 +
@@ -9075,7 +9075,7 @@
 +	kfree(context);
 +
 +	if (debug)
-+		info("%s: context deleted", __func__);
++		printk(KERN_INFO "%s: context deleted\n", __func__);
 +}
 +
 +static inline void deregister_from_lirc(struct sasem_context *context)
@@ -9088,7 +9088,7 @@
 +		err("%s: unable to deregister from lirc (%d)",
 +			__func__, retval);
 +	else
-+		info("Deregistered Sasem plugin (minor:%d)", minor);
++		printk(KERN_INFO "Deregistered Sasem plugin (minor:%d)\n", minor);
 +
 +}
 +
@@ -9131,7 +9131,7 @@
 +	} else {
 +		context->vfd_isopen = TRUE;
 +		file->private_data = context;
-+		info("VFD port opened");
++		printk(KERN_INFO "VFD port opened\n");
 +	}
 +
 +	UNLOCK_CONTEXT;
@@ -9168,7 +9168,7 @@
 +		context->vfd_contrast = (unsigned int)arg;
 +		break;
 +	default:
-+		info("Unknown IOCTL command");
++		printk(KERN_INFO "Unknown IOCTL command\n");
 +		UNLOCK_CONTEXT;
 +		return -ENOIOCTLCMD;  /* not supported */
 +	}
@@ -9200,7 +9200,7 @@
 +		retval = -EIO;
 +	} else {
 +		context->vfd_isopen = FALSE;
-+		info("VFD port closed");
++		printk(KERN_INFO "VFD port closed\n");
 +		if (!context->dev_present && !context->ir_isopen) {
 +
 +			/* Device disconnected before close and IR port is
@@ -9406,7 +9406,7 @@
 +		    __func__, retval);
 +	else {
 +		context->ir_isopen = TRUE;
-+		info("IR port opened");
++		printk(KERN_INFO "IR port opened\n");
 +	}
 +
 +exit:
@@ -9433,7 +9433,7 @@
 +
 +	usb_kill_urb(context->rx_urb);
 +	context->ir_isopen = FALSE;
-+	info("IR port closed");
++	printk(KERN_INFO "IR port closed\n");
 +
 +	if (!context->dev_present) {
 +
@@ -9469,7 +9469,7 @@
 +	struct timeval tv;
 +
 +	if (len != 8) {
-+		warn("%s: invalid incoming packet size (%d)",
++		printk(KERN_WARN "%s: invalid incoming packet size (%d)\n",
 +		     __func__, len);
 +		return;
 +	}
@@ -9540,7 +9540,7 @@
 +		break;
 +
 +	default:
-+		warn("%s: status (%d): ignored",
++		printk(KERN_WARN "%s: status (%d): ignored\n",
 +			 __func__, urb->status);
 +		break;
 +	}
@@ -9574,7 +9574,7 @@
 +	struct sasem_context *context = NULL;
 +	int i;
 +
-+	info("%s: found Sasem device", __func__);
++	printk(KERN_INFO "%s: found Sasem device\n", __func__);
 +
 +
 +	dev = usb_get_dev(interface_to_usbdev(interface));
@@ -9606,7 +9606,7 @@
 +			rx_endpoint = ep;
 +			ir_ep_found = TRUE;
 +			if (debug)
-+				info("%s: found IR endpoint", __func__);
++				printk(KERN_INFO "%s: found IR endpoint\n", __func__);
 +
 +		} else if (!vfd_ep_found &&
 +			ep_dir == USB_DIR_OUT &&
@@ -9615,7 +9615,7 @@
 +			tx_endpoint = ep;
 +			vfd_ep_found = TRUE;
 +			if (debug)
-+				info("%s: found VFD endpoint", __func__);
++				printk(KERN_INFO "%s: found VFD endpoint\n", __func__);
 +		}
 +	}
 +
@@ -9629,7 +9629,7 @@
 +
 +	/* Warning if no VFD endpoint */
 +	if (!vfd_ep_found)
-+		info("%s: no valid output (VFD) endpoint found.", __func__);
++		printk(KERN_INFO "%s: no valid output (VFD) endpoint found.\n", __func__);
 +
 +
 +	/* Allocate memory */
@@ -9700,7 +9700,7 @@
 +		alloc_status = 7;
 +		UNLOCK_CONTEXT;
 +	} else
-+		info("%s: Registered Sasem plugin (minor:%d)",
++		printk(KERN_INFO "%s: Registered Sasem plugin (minor:%d)\n",
 +			__func__, lirc_minor);
 +
 +alloc_status_switch:
@@ -9745,14 +9745,14 @@
 +	if (vfd_ep_found) {
 +
 +		if (debug)
-+			info("Registering VFD with sysfs");
++			printk(KERN_INFO "Registering VFD with sysfs\n");
 +		if (usb_register_dev(interface, &sasem_class))
 +			/* Not a fatal error, so ignore */
-+			info("%s: could not get a minor number for VFD",
++			printk(KERN_INFO "%s: could not get a minor number for VFD\n",
 +				__func__);
 +	}
 +
-+	info("%s: Sasem device on usb<%d:%d> initialized",
++	printk(KERN_INFO "%s: Sasem device on usb<%d:%d> initialized\n",
 +			__func__, dev->bus->busnum, dev->devnum);
 +
 +	UNLOCK_CONTEXT;
@@ -9773,7 +9773,7 @@
 +	context = usb_get_intfdata(interface);
 +	LOCK_CONTEXT;
 +
-+	info("%s: Sasem device disconnected", __func__);
++	printk(KERN_INFO "%s: Sasem device disconnected\n", __func__);
 +
 +	usb_set_intfdata(interface, NULL);
 +	context->dev_present = FALSE;
@@ -9807,8 +9807,8 @@
 +{
 +	int rc;
 +
-+	info(MOD_DESC ", v" MOD_VERSION);
-+	info(MOD_AUTHOR);
++	printk(KERN_INFO MOD_DESC ", v" MOD_VERSION "\n");
++	printk(KERN_INFO MOD_AUTHOR "\n");
 +
 +	rc = usb_register(&sasem_driver);
 +	if (rc < 0) {
@@ -9821,7 +9821,7 @@
 +static void __exit sasem_exit(void)
 +{
 +	usb_deregister(&sasem_driver);
-+	info("module removed. Goodbye!");
++	printk(KERN_INFO "module removed. Goodbye!\n");
 +}
 +
 +



From twaugh at fedoraproject.org  Thu Jan  8 18:36:28 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Thu,  8 Jan 2009 18:36:28 +0000 (UTC)
Subject: rpms/system-config-printer/F-10 pycups-1.9.45.tar.bz2.sig, NONE,
	1.1 .cvsignore, 1.190, 1.191 sources, 1.197,
	1.198 system-config-printer.spec, 1.233,
	1.234 pycups-1.9.44.tar.bz2.sig, 1.1, NONE pycups-git.patch, 1.1, NONE
Message-ID: <20090108183628.1CB7B700FD@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/system-config-printer/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14348

Modified Files:
	.cvsignore sources system-config-printer.spec 
Added Files:
	pycups-1.9.45.tar.bz2.sig 
Removed Files:
	pycups-1.9.44.tar.bz2.sig pycups-git.patch 
Log Message:
* Thu Jan  8 2009 Tim Waugh <twaugh at redhat.com>
- Updated pycups to 1.9.45.



--- NEW FILE pycups-1.9.45.tar.bz2.sig ---
??

Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/F-10/.cvsignore,v
retrieving revision 1.190
retrieving revision 1.191
diff -u -r1.190 -r1.191
--- .cvsignore	1 Dec 2008 14:15:37 -0000	1.190
+++ .cvsignore	8 Jan 2009 18:35:57 -0000	1.191
@@ -189,3 +189,4 @@
 pycups-1.9.43.tar.bz2
 pycups-1.9.44.tar.bz2
 system-config-printer-1.0.12.tar.bz2
+pycups-1.9.45.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/F-10/sources,v
retrieving revision 1.197
retrieving revision 1.198
diff -u -r1.197 -r1.198
--- sources	1 Dec 2008 14:15:37 -0000	1.197
+++ sources	8 Jan 2009 18:35:57 -0000	1.198
@@ -1,3 +1,3 @@
 ac8f98a40b0fc4b6ab4470f10489887a  pysmbc-1.0.6.tar.bz2
-181f413546676e098352860e3ce57465  pycups-1.9.44.tar.bz2
 5ba48202a4416d55dde55b4eb0d64ec2  system-config-printer-1.0.12.tar.bz2
+ff634a6751f8a859ed26751bf03abef0  pycups-1.9.45.tar.bz2


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/F-10/system-config-printer.spec,v
retrieving revision 1.233
retrieving revision 1.234
diff -u -r1.233 -r1.234
--- system-config-printer.spec	19 Dec 2008 13:04:13 -0000	1.233
+++ system-config-printer.spec	8 Jan 2009 18:35:57 -0000	1.234
@@ -1,4 +1,4 @@
-%define pycups_version 1.9.44
+%define pycups_version 1.9.45
 %define pysmbc_version 1.0.6
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
@@ -16,7 +16,6 @@
 Source2: http://cyberelk.net/tim/data/pysmbc/pysmbc-%{pysmbc_version}.tar.bz2
 
 Patch0: system-config-printer-1.0.x.patch
-Patch10: pycups-git.patch
 
 BuildRequires: cups-devel >= 1.2
 BuildRequires: python-devel >= 2.4
@@ -64,9 +63,6 @@
 %prep
 %setup -q -a 1 -a 2
 %patch0 -p1 -b .1.0.x
-pushd pycups-%{pycups_version}
-%patch10 -p1 -b .pycups-git
-popd
 
 %build
 %configure
@@ -156,6 +152,9 @@
 exit 0
 
 %changelog
+* Thu Jan  8 2009 Tim Waugh <twaugh at redhat.com>
+- Updated pycups to 1.9.45.
+
 * Fri Dec 19 2008 Tim Waugh <twaugh at redhat.com> 1.0.12-7
 - Updated patch for 1.0.x changes:
   - Fixed stub scripts (bug #477107).


--- pycups-1.9.44.tar.bz2.sig DELETED ---


--- pycups-git.patch DELETED ---



From twaugh at fedoraproject.org  Thu Jan  8 18:36:35 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Thu,  8 Jan 2009 18:36:35 +0000 (UTC)
Subject: rpms/system-config-printer/F-9 .cvsignore, 1.173, 1.174 sources,
	1.180, 
	1.181 system-config-printer.spec, 1.207, 1.208 pycups-git.patch,
	1.1, NONE
Message-ID: <20090108183635.9708D700FD@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/system-config-printer/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14374

Modified Files:
	.cvsignore sources system-config-printer.spec 
Removed Files:
	pycups-git.patch 
Log Message:
* Thu Jan  8 2009 Tim Waugh <twaugh at redhat.com>
- Updated pycups to 1.9.45.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/F-9/.cvsignore,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -r1.173 -r1.174
--- .cvsignore	1 Dec 2008 14:27:13 -0000	1.173
+++ .cvsignore	8 Jan 2009 18:36:05 -0000	1.174
@@ -172,3 +172,4 @@
 pycups-1.9.43.tar.bz2
 pycups-1.9.44.tar.bz2
 system-config-printer-1.0.12.tar.bz2
+pycups-1.9.45.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/F-9/sources,v
retrieving revision 1.180
retrieving revision 1.181
diff -u -r1.180 -r1.181
--- sources	1 Dec 2008 14:27:13 -0000	1.180
+++ sources	8 Jan 2009 18:36:05 -0000	1.181
@@ -1,3 +1,3 @@
 ac8f98a40b0fc4b6ab4470f10489887a  pysmbc-1.0.6.tar.bz2
-181f413546676e098352860e3ce57465  pycups-1.9.44.tar.bz2
 5ba48202a4416d55dde55b4eb0d64ec2  system-config-printer-1.0.12.tar.bz2
+ff634a6751f8a859ed26751bf03abef0  pycups-1.9.45.tar.bz2


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/F-9/system-config-printer.spec,v
retrieving revision 1.207
retrieving revision 1.208
diff -u -r1.207 -r1.208
--- system-config-printer.spec	19 Dec 2008 13:04:54 -0000	1.207
+++ system-config-printer.spec	8 Jan 2009 18:36:05 -0000	1.208
@@ -1,4 +1,4 @@
-%define pycups_version 1.9.44
+%define pycups_version 1.9.45
 %define pysmbc_version 1.0.6
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
@@ -16,7 +16,6 @@
 Source2: http://cyberelk.net/tim/data/pysmbc/pysmbc-%{pysmbc_version}.tar.bz2
 
 Patch0: system-config-printer-1.0.x.patch
-Patch10: pycups-git.patch
 
 BuildRequires: cups-devel >= 1.2
 BuildRequires: python-devel >= 2.4
@@ -64,9 +63,6 @@
 %prep
 %setup -q -a 1 -a 2
 %patch0 -p1 -b .1.0.x
-pushd pycups-%{pycups_version}
-%patch10 -p1 -b .pycups-git
-popd
 
 %build
 %configure
@@ -156,6 +152,9 @@
 exit 0
 
 %changelog
+* Thu Jan  8 2009 Tim Waugh <twaugh at redhat.com>
+- Updated pycups to 1.9.45.
+
 * Fri Dec 19 2008 Tim Waugh <twaugh at redhat.com> 1.0.12-7
 - Updated patch for 1.0.x changes:
   - Fixed stub scripts (bug #477107).


--- pycups-git.patch DELETED ---



From terjeros at fedoraproject.org  Thu Jan  8 18:38:24 2009
From: terjeros at fedoraproject.org (=?utf-8?q?Terje_R=C3=B8sten?=)
Date: Thu,  8 Jan 2009 18:38:24 +0000 (UTC)
Subject: rpms/e16/devel .cvsignore,1.4,1.5 e16.spec,1.7,1.8 sources,1.4,1.5
Message-ID: <20090108183824.2C63E700FD@cvs1.fedora.phx.redhat.com>

Author: terjeros

Update of /cvs/extras/rpms/e16/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14692

Modified Files:
	.cvsignore e16.spec sources 
Log Message:
* Thu Jan  8 2009 Terje Rosten <terjeros at phys.ntnu.no> - 0.16.8.15-1
- 0.16.8.15



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/e16/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	22 Aug 2008 19:56:58 -0000	1.4
+++ .cvsignore	8 Jan 2009 18:37:53 -0000	1.5
@@ -1 +1 @@
-e16-0.16.8.14.tar.gz
+e16-0.16.8.15.tar.gz


Index: e16.spec
===================================================================
RCS file: /cvs/extras/rpms/e16/devel/e16.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- e16.spec	28 Dec 2008 20:38:32 -0000	1.7
+++ e16.spec	8 Jan 2009 18:37:53 -0000	1.8
@@ -2,8 +2,8 @@
 
 Summary:       The Enlightenment window manager, DR16
 Name:          e16
-Version:       0.16.8.14
-Release:       4%{?dist}
+Version:       0.16.8.15
+Release:       1%{?dist}
 License:       MIT with advertising and GPLv2+
 Group:         User Interface/Desktops
 URL:           http://www.enlightenment.org/
@@ -49,23 +49,17 @@
 %{__rm} -f %{buildroot}%{_libdir}/%{name}/libhack*.{a,la} 
 %{__chmod} 0644 %{buildroot}%{_datadir}/%{name}/themes/winter/ABOUT/MAIN
 
-%{__rm} -rf %{buildroot}%{_datadir}/%{name}/themes/winter/ttfonts
-%{__ln_s} ../../fonts %{buildroot}%{_datadir}/%{name}/themes/winter/ttfonts
-
-# Vera -> Dejavu
-%{__install} -d %{buildroot}%{_datadir}/%{name}/fonts
-%{__ln_s}  ../../fonts/dejavu/DejaVuSans.ttf %{buildroot}%{_datadir}/%{name}/fonts/Vera.ttf
-%{__ln_s}  ../../fonts/dejavu/DejaVuSans-Bold.ttf %{buildroot}%{_datadir}/%{name}/fonts/VeraBd.ttf
+# Vera -> DejaVu
+%{__rm} -f %{buildroot}%{_datadir}/%{name}/fonts/COPYRIGHT.Vera
+%{__rm} -f %{buildroot}%{_datadir}/%{name}/fonts/*.ttf
+%{__ln_s}  ../../fonts/dejavu/DejaVuSans.ttf %{buildroot}%{_datadir}/%{name}/fonts/normal.ttf
+%{__ln_s}  ../../fonts/dejavu/DejaVuSans-Bold.ttf %{buildroot}%{_datadir}/%{name}/fonts/bold.ttf
 
 %find_lang %{name}
 
 %clean
 %{__rm} -rf %{buildroot}
 
-%pretrans
-[ -L %{_datadir}/%{name}/themes/winter/ttfonts ] && \
-    %{__rm} -f %{_datadir}/%{name}/themes/winter/ttfonts
-
 %files -f %{name}.lang
 %defattr(-, root, root, -) 
 %doc AUTHORS COPYING ChangeLog README docs/README-0.16.8
@@ -77,6 +71,9 @@
 %{_datadir}/xsessions/*
 
 %changelog
+* Thu Jan  8 2009 Terje Rosten <terjeros at phys.ntnu.no> - 0.16.8.15-1
+- 0.16.8.15
+
 * Sun Dec 28 2008 Terje Rosten <terjeros at phys.ntnu.no> - 0.16.8.14-4
 - Various hacks (fonts dir, %%pretrans) to make update smooth
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/e16/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	22 Aug 2008 19:56:58 -0000	1.4
+++ sources	8 Jan 2009 18:37:53 -0000	1.5
@@ -1 +1 @@
-a6a345ada7b60a44df3759e4cd1682c1  e16-0.16.8.14.tar.gz
+65c753282965985a11447bf7a8bfabab  e16-0.16.8.15.tar.gz



From heffer at fedoraproject.org  Thu Jan  8 18:44:27 2009
From: heffer at fedoraproject.org (Felix Kaechele)
Date: Thu,  8 Jan 2009 18:44:27 +0000 (UTC)
Subject: rpms/libsyncml/F-10 .cvsignore, 1.5, 1.6 libsyncml.spec, 1.6,
	1.7 sources, 1.5, 1.6
Message-ID: <20090108184427.E2598700FD@cvs1.fedora.phx.redhat.com>

Author: heffer

Update of /cvs/pkgs/rpms/libsyncml/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15844

Modified Files:
	.cvsignore libsyncml.spec sources 
Log Message:
* Thu Jan 08 2009 Felix Kaechele <felix at fetzig dot org> - 0.5.0-1
- upstream 0.5.0
- buildsystem changed to cmake



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libsyncml/F-10/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	21 Oct 2007 22:38:01 -0000	1.5
+++ .cvsignore	8 Jan 2009 18:43:57 -0000	1.6
@@ -1 +1 @@
-libsyncml-0.4.5.tar.bz2
+libsyncml-0.5.0.tar.bz2


Index: libsyncml.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libsyncml/F-10/libsyncml.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- libsyncml.spec	11 Sep 2008 14:20:33 -0000	1.6
+++ libsyncml.spec	8 Jan 2009 18:43:57 -0000	1.7
@@ -1,6 +1,6 @@
 Name:		libsyncml
-Version:	0.4.5
-Release:	3%{?dist}
+Version:	0.5.0
+Release:	1%{?dist}
 Summary:	SyncML protocol library
 
 Group:		System Environment/Libraries
@@ -29,23 +29,19 @@
 %prep
 %setup -q
 
-# Fix some permissions
-chmod a-x libsyncml/syncml.h \
-          libsyncml/syncml_internals.h
 
 %build
-%configure --disable-static
-
-# Disable rpath.
-sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
-sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
-
-make %{?_smp_mflags}
-
+mkdir -p %{_target_platform}
+cd %{_target_platform}
+%cmake ..
+make VERBOSE=1 %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
+
+pushd %{_target_platform}
 make install DESTDIR=$RPM_BUILD_ROOT
+popd
 
 
 %clean
@@ -63,24 +59,23 @@
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING README
-%{_bindir}/syncml-http-server
-%{_bindir}/syncml-http-client
-%{_bindir}/syncml-obex-client
-%{_libdir}/libsyncml.so.0*
-%{_mandir}/man1/syncml-http-server.1.gz
-%{_mandir}/man1/syncml-obex-client.1.gz
+%doc AUTHORS COPYING INSTALL LICENSE README
+%{_bindir}/syncml-ds-tool
+%{_libdir}/libsyncml.so.*
 
 %files devel
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING README
+%doc AUTHORS CODING COPYING INSTALL LICENSE README RELEASE
 %{_includedir}/libsyncml-1.0/
 %{_libdir}/libsyncml.so
-%exclude %{_libdir}/libsyncml.la
 %{_libdir}/pkgconfig/libsyncml-1.0.pc
 
 
 %changelog
+* Thu Jan 08 2009 Felix Kaechele <felix at fetzig dot org> - 0.5.0-1
+- upstream 0.5.0
+- buildsystem changed to cmake
+
 * Thu Sep 11 2008 - Bastien Nocera <bnocera at redhat.com> - 0.4.5-3
 - Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libsyncml/F-10/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	21 Oct 2007 22:38:01 -0000	1.5
+++ sources	8 Jan 2009 18:43:57 -0000	1.6
@@ -1 +1 @@
-90f4285cf04b70d92fdbe4fece148385  libsyncml-0.4.5.tar.bz2
+284660f3ec85d711d097e542d84e5a5c  libsyncml-0.5.0.tar.bz2



From terjeros at fedoraproject.org  Thu Jan  8 18:45:58 2009
From: terjeros at fedoraproject.org (=?utf-8?q?Terje_R=C3=B8sten?=)
Date: Thu,  8 Jan 2009 18:45:58 +0000 (UTC)
Subject: rpms/e16-docs/devel .cvsignore, 1.2, 1.3 e16-docs.spec, 1.3,
	1.4 sources, 1.2, 1.3
Message-ID: <20090108184558.4470C700FD@cvs1.fedora.phx.redhat.com>

Author: terjeros

Update of /cvs/extras/rpms/e16-docs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16076

Modified Files:
	.cvsignore e16-docs.spec sources 
Log Message:
* Thu Jan  8 2009 Terje Rosten <terjeros at phys.ntnu.no> - 0.16.8.0.2-1
- 0.16.8.0.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/e16-docs/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	1 May 2008 19:05:38 -0000	1.2
+++ .cvsignore	8 Jan 2009 18:45:27 -0000	1.3
@@ -1 +1 @@
-e16-docs-0.16.8.0.1.tar.gz
+e16-docs-0.16.8.0.2.tar.gz


Index: e16-docs.spec
===================================================================
RCS file: /cvs/extras/rpms/e16-docs/devel/e16-docs.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- e16-docs.spec	27 Dec 2008 10:40:44 -0000	1.3
+++ e16-docs.spec	8 Jan 2009 18:45:27 -0000	1.4
@@ -1,7 +1,7 @@
 Summary:   Documentation for Enlightenment, DR16
 Name:      e16-docs
-Version:   0.16.8.0.1
-Release:   4%{?dist}
+Version:   0.16.8.0.2
+Release:   1%{?dist}
 License:   MIT with advertising
 URL:       http://www.enlightenment.org/
 Group:     User Interface/Desktops
@@ -23,11 +23,12 @@
 %install
 %{__rm} -rf %{buildroot}
 %{__make} install DESTDIR=%{buildroot} INSTALL="%{__install} -p"
+
 # Vera -> Dejavu
-%{__rm} -f %{buildroot}/usr/share/e16/E-docs/Vera.ttf
-%{__ln_s} ../../fonts/dejavu/DejaVuSans.ttf %{buildroot}/usr/share/e16/E-docs/Vera.ttf
-%{__rm} -f %{buildroot}/usr/share/e16/E-docs/VeraBd.ttf
-%{__ln_s} ../../fonts/dejavu/DejaVuSans-Bold.ttf %{buildroot}/usr/share/e16/E-docs/VeraBd.ttf
+#{__rm} -f %{buildroot}/usr/share/e16/E-docs/Vera.ttf
+#{__ln_s} ../../fonts/dejavu/DejaVuSans.ttf %{buildroot}/usr/share/e16/E-docs/Vera.ttf
+#{__rm} -f %{buildroot}/usr/share/e16/E-docs/VeraBd.ttf
+#{__ln_s} ../../fonts/dejavu/DejaVuSans-Bold.ttf %{buildroot}/usr/share/e16/E-docs/VeraBd.ttf
 
 %clean
 %{__rm} -rf %{buildroot}
@@ -38,6 +39,9 @@
 %{_datadir}/e16/E-docs
 
 %changelog
+* Thu Jan  8 2009 Terje Rosten <terjeros at phys.ntnu.no> - 0.16.8.0.2-1
+- 0.16.8.0.2
+
 * Sat Dec 27 2008 Terje Rosten <terjeros at phys.ntnu.no> - 0.16.8.0.1-4
 - Use Dejavu fonts 
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/e16-docs/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	1 May 2008 19:05:38 -0000	1.2
+++ sources	8 Jan 2009 18:45:27 -0000	1.3
@@ -1 +1 @@
-d92e6a7153b5433bafb2ff6561640dc4  e16-docs-0.16.8.0.1.tar.gz
+46bcdcc5cdad76159923671cfcea93f9  e16-docs-0.16.8.0.2.tar.gz



From kyle at fedoraproject.org  Thu Jan  8 18:46:36 2009
From: kyle at fedoraproject.org (Kyle McMartin)
Date: Thu,  8 Jan 2009 18:46:36 +0000 (UTC)
Subject: rpms/kernel/devel linux-2.6.27-lirc.patch,1.3,1.4
Message-ID: <20090108184636.9B543700FD@cvs1.fedora.phx.redhat.com>

Author: kyle

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16281

Modified Files:
	linux-2.6.27-lirc.patch 
Log Message:
oops WARN->WARNING muppetry

linux-2.6.27-lirc.patch:

Index: linux-2.6.27-lirc.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6.27-lirc.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- linux-2.6.27-lirc.patch	8 Jan 2009 18:33:09 -0000	1.3
+++ linux-2.6.27-lirc.patch	8 Jan 2009 18:46:36 -0000	1.4
@@ -3910,7 +3910,7 @@
 +	}
 +
 +	if (len != 8) {
-+		printk(KERN_WARN "%s: invalid incoming packet size(%d)\n",
++		printk(KERN_WARNING "%s: invalid incoming packet size(%d)\n",
 +		     __func__, len);
 +		return;
 +	}
@@ -3923,7 +3923,7 @@
 +	    buf[5] == 0xFF &&				/* iMON 2.4G */
 +	   ((buf[6] == 0x4E && buf[7] == 0xDF) ||	/* LT */
 +	    (buf[6] == 0x5E && buf[7] == 0xDF))) {	/* DT */
-+		printk(KERN_WARN "%s: remote associated refid=%02X\n", __func__, buf[1]);
++		printk(KERN_WARNING "%s: remote associated refid=%02X\n", __func__, buf[1]);
 +		context->ir_isassociating = FALSE;
 +	}
 +
@@ -4021,7 +4021,7 @@
 +			incoming_packet(context, urb);
 +		break;
 +	default:
-+		printk(KERN_WARN "%s: status(%d): ignored\n", __func__, urb->status);
++		printk(KERN_WARNING "%s: status(%d): ignored\n", __func__, urb->status);
 +		break;
 +	}
 +
@@ -9469,7 +9469,7 @@
 +	struct timeval tv;
 +
 +	if (len != 8) {
-+		printk(KERN_WARN "%s: invalid incoming packet size (%d)\n",
++		printk(KERN_WARNING "%s: invalid incoming packet size (%d)\n",
 +		     __func__, len);
 +		return;
 +	}
@@ -9540,7 +9540,7 @@
 +		break;
 +
 +	default:
-+		printk(KERN_WARN "%s: status (%d): ignored\n",
++		printk(KERN_WARNING "%s: status (%d): ignored\n",
 +			 __func__, urb->status);
 +		break;
 +	}



From twaugh at fedoraproject.org  Thu Jan  8 18:49:32 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Thu,  8 Jan 2009 18:49:32 +0000 (UTC)
Subject: rpms/system-config-printer/F-10 system-config-printer-1.0.x.patch, 
	1.12, 1.13 system-config-printer.spec, 1.234, 1.235
Message-ID: <20090108184932.7F667700FD@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/system-config-printer/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16575

Modified Files:
	system-config-printer-1.0.x.patch system-config-printer.spec 
Log Message:
* Thu Jan  8 2009 Tim Waugh <twaugh at redhat.com> 1.0.12-8
- Updated patch for 1.0.x changes:
  - More cursor/selection fixes.
  - Notification fix.
  - Advertise correct defaults for page-* job options (bug #468553).


system-config-printer-1.0.x.patch:

Index: system-config-printer-1.0.x.patch
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/F-10/system-config-printer-1.0.x.patch,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- system-config-printer-1.0.x.patch	19 Dec 2008 13:04:13 -0000	1.12
+++ system-config-printer-1.0.x.patch	8 Jan 2009 18:49:01 -0000	1.13
@@ -1,8 +1,33 @@
 diff --git a/ChangeLog b/ChangeLog
-index 2851eeb..db57408 100644
+index 2851eeb..01c8757 100644
 --- a/ChangeLog
 +++ b/ChangeLog
-@@ -1,3 +1,115 @@
+@@ -1,3 +1,140 @@
++2009-01-08  Tim Waugh  <twaugh at redhat.com>
++
++	* system-config-printer.py (GUI.dests_iconview_item_activated):
++	Use set_cursor here to match change introduced when fixing
++	Ubuntu #282634.
++
++2009-01-08  Tim Waugh  <twaugh at redhat.com>
++
++	* jobviewer.py (JobViewer.now_connected): Handle notification
++	closure for re-connected printers correctly.
++
++2009-01-07  Tim Waugh  <twaugh at redhat.com>
++
++	* system-config-printer.py (GUI.__init__): Advertise correct
++	defaults for page-left, page-right, page-top and page-bottom job
++	options (bug #468553).
++
++2009-01-07  Tim Waugh  <twaugh at redhat.com>
++
++	* system-config-printer.py
++	(NewPrinterGUI.on_tvNPMakes_cursor_changed): Use get_cursor here.
++	(NewPrinterGUI.on_tvNPModels_cursor_changed): Likewise (Ubuntu
++	#299724).
++	(NewPrinterGUI.on_tvNPDevices_cursor_changed): Likewise.
++
 +2008-12-19  Tim Waugh  <twaugh at redhat.com>
 +
 +	* system-config-printer.in: Set prefix environment variable here,
@@ -351,7 +376,7 @@
              modelnumber = 0
              if digits > 0:
 diff --git a/jobviewer.py b/jobviewer.py
-index 5005305..a247a2e 100644
+index 5005305..16ac6c5 100644
 --- a/jobviewer.py
 +++ b/jobviewer.py
 @@ -49,7 +49,7 @@ from statereason import StateReason
@@ -363,6 +388,17 @@
  GLADE="applet.glade"
  ICON="printer"
  SEARCHING_ICON="document-print-preview"
+@@ -1334,7 +1334,9 @@ class JobViewer (monitor.Watcher):
+             debugprint ("Unexpected now_connected signal")
+             return
+ 
+-        notification.close ()
++        if notification.get_data ('closed') != True:
++            notification.close ()
++            notification.set_data ('closed', True)
+ 
+     def printer_event (self, mon, printer, eventname, event):
+         monitor.Watcher.printer_event (self, mon, printer, eventname, event)
 diff --git a/monitor.py b/monitor.py
 index 3748d45..43e151f 100644
 --- a/monitor.py
@@ -4468,9 +4504,21 @@
  #~ msgstr "Ok??nd"
 +
 diff --git a/system-config-printer.py b/system-config-printer.py
-index 349c6f0..c225b95 100755
+index 349c6f0..966759c 100755
 --- a/system-config-printer.py
 +++ b/system-config-printer.py
+@@ -2,9 +2,9 @@
+ 
+ ## system-config-printer
+ 
+-## Copyright (C) 2006, 2007, 2008 Red Hat, Inc.
++## Copyright (C) 2006, 2007, 2008, 2009 Red Hat, Inc.
++## Copyright (C) 2006, 2007, 2008, 2009 Tim Waugh <twaugh at redhat.com>
+ ## Copyright (C) 2006, 2007 Florian Festi <ffesti at redhat.com>
+-## Copyright (C) 2006, 2007, 2008 Tim Waugh <twaugh at redhat.com>
+ 
+ ## This program is free software; you can redistribute it and/or modify
+ ## it under the terms of the GNU General Public License as published by
 @@ -87,10 +87,13 @@ from gettext import gettext as _
  monitor.set_gettext_function (_)
  errordialogs.set_gettext_function (_)
@@ -4487,6 +4535,30 @@
  iconpath = os.path.join (pkgdata, 'icons/')
  sys.path.append (pkgdata)
  
+@@ -537,19 +540,19 @@ class GUI(GtkGUI, monitor.Watcher):
+                  options.OptionAlwaysShown ("lpi", float, 6.0,
+                                             self.sbJOLpi, self.btnJOResetLpi),
+ 
+-                 options.OptionAlwaysShown ("page-left", int, 18,
++                 options.OptionAlwaysShown ("page-left", int, 0,
+                                             self.sbJOPageLeft,
+                                             self.btnJOResetPageLeft),
+ 
+-                 options.OptionAlwaysShown ("page-right", int, 18,
++                 options.OptionAlwaysShown ("page-right", int, 0,
+                                             self.sbJOPageRight,
+                                             self.btnJOResetPageRight),
+ 
+-                 options.OptionAlwaysShown ("page-top", int, 36,
++                 options.OptionAlwaysShown ("page-top", int, 0,
+                                             self.sbJOPageTop,
+                                             self.btnJOResetPageTop),
+ 
+-                 options.OptionAlwaysShown ("page-bottom", int, 36,
++                 options.OptionAlwaysShown ("page-bottom", int, 0,
+                                             self.sbJOPageBottom,
+                                             self.btnJOResetPageBottom),
+ 
 @@ -612,7 +615,7 @@ class GUI(GtkGUI, monitor.Watcher):
              model = self.dests_iconview.get_model ()
              iter = model.get_iter_first ()
@@ -4505,7 +4577,19 @@
          object = model.get_value (iter, 0)
          try:
              self.fillPrinterTab (name)
-@@ -692,7 +695,7 @@ class GUI(GtkGUI, monitor.Watcher):
+@@ -653,10 +656,7 @@ class GUI(GtkGUI, monitor.Watcher):
+             self.btnPrinterPropertiesClose.hide ()
+         self.setDataButtonState ()
+         treeview = self.tvPrinterProperties
+-        sel = treeview.get_selection ()
+-        sel.select_path ((0,))
+-        self.on_tvPrinterProperties_selection_changed (sel)
+-        self.on_tvPrinterProperties_cursor_changed (treeview)
++        treeview.set_cursor ((0,))
+         host = CUPS_server_hostname ()
+         self.PrinterPropertiesDialog.set_title (_("Printer Properties - "
+                                                   "`%s' on %s") % (name, host))
+@@ -692,7 +692,7 @@ class GUI(GtkGUI, monitor.Watcher):
              model = iconview.get_model ()
              iter = model.get_iter (paths[i])
              object = model.get_value (iter, 0)
@@ -4514,7 +4598,7 @@
              if object.discovered:
                  any_discovered = True
              if object.enabled:
-@@ -765,6 +768,11 @@ class GUI(GtkGUI, monitor.Watcher):
+@@ -765,6 +765,11 @@ class GUI(GtkGUI, monitor.Watcher):
                  AdvancedServerSettingsDialog (self.cups, dialog)
              except:
                  return
@@ -4526,7 +4610,7 @@
          else:
              dialog.hide ()
  
-@@ -834,7 +842,7 @@ class GUI(GtkGUI, monitor.Watcher):
+@@ -834,7 +839,7 @@ class GUI(GtkGUI, monitor.Watcher):
          model = self.dests_iconview.get_model ()
          for path in paths:
              iter = model.get_iter (path)
@@ -4535,7 +4619,7 @@
              selected_printers.add (name)
  
          if self.cups:
-@@ -858,6 +866,8 @@ class GUI(GtkGUI, monitor.Watcher):
+@@ -858,6 +863,8 @@ class GUI(GtkGUI, monitor.Watcher):
                  show_IPP_Error(e, m, self.MainWindow)
                  self.printers = {}
                  self.default_printer = None
@@ -4544,7 +4628,7 @@
          else:
              self.printers = {}
              self.default_printer = None
-@@ -987,7 +997,7 @@ class GUI(GtkGUI, monitor.Watcher):
+@@ -987,7 +994,7 @@ class GUI(GtkGUI, monitor.Watcher):
          # Restore selection of printers.
          model = self.dests_iconview.get_model ()
          def maybe_select (model, path, iter):
@@ -4553,7 +4637,7 @@
              if name in selected_printers:
                  self.dests_iconview.select_path (path)
          model.foreach (maybe_select)
-@@ -1593,9 +1603,12 @@ class GUI(GtkGUI, monitor.Watcher):
+@@ -1593,9 +1600,12 @@ class GUI(GtkGUI, monitor.Watcher):
  
      def on_tvPrinterProperties_cursor_changed (self, treeview):
          # Adjust notebook to reflect selected item.
@@ -4569,7 +4653,7 @@
  
      # set default printer
      def set_system_or_user_default_printer (self, name):
-@@ -1674,6 +1687,8 @@ class GUI(GtkGUI, monitor.Watcher):
+@@ -1674,6 +1684,8 @@ class GUI(GtkGUI, monitor.Watcher):
              show_info_dialog (_("Submitted"),
                                _("Test page submitted as job %d") % job_id,
                                parent=self.MainWindow)
@@ -4578,7 +4662,7 @@
          except cups.IPPError, (e, msg):
              if (e == cups.IPP_NOT_AUTHORIZED and
                  self.connect_server != 'localhost' and
-@@ -1750,6 +1765,8 @@ class GUI(GtkGUI, monitor.Watcher):
+@@ -1750,6 +1762,8 @@ class GUI(GtkGUI, monitor.Watcher):
  
          try:
              self.ppd = printer.getPPD()
@@ -4587,7 +4671,7 @@
          except cups.IPPError, (e, m):
              # Some IPP error other than IPP_NOT_FOUND.
              show_IPP_Error(e, m, self.MainWindow)
-@@ -1988,19 +2005,20 @@ class GUI(GtkGUI, monitor.Watcher):
+@@ -1988,19 +2002,20 @@ class GUI(GtkGUI, monitor.Watcher):
              return
          ppd = self.ppd
          ppd.markDefaults()
@@ -4612,7 +4696,7 @@
                  tab_label = self.lblPInstallOptions
              else:
                  frame = gtk.Frame("<b>%s</b>" % group.text)
-@@ -2147,7 +2165,7 @@ class GUI(GtkGUI, monitor.Watcher):
+@@ -2147,7 +2162,7 @@ class GUI(GtkGUI, monitor.Watcher):
          (path, cell) = tuple
          model = self.dests_iconview.get_model ()
          iter = model.get_iter (path)
@@ -4621,7 +4705,7 @@
          if not self.is_rename_possible (name):
              return
          cell.set_property ('editable', True)
-@@ -2161,7 +2179,7 @@ class GUI(GtkGUI, monitor.Watcher):
+@@ -2161,7 +2176,7 @@ class GUI(GtkGUI, monitor.Watcher):
      def printer_name_edited (self, cell, path, newname):
          model = self.dests_iconview.get_model ()
          iter = model.get_iter (path)
@@ -4630,7 +4714,7 @@
          debugprint ("edited: %s -> %s" % (name, newname))
          try:
              self.rename_printer (name, newname)
-@@ -2255,7 +2273,7 @@ class GUI(GtkGUI, monitor.Watcher):
+@@ -2255,7 +2270,7 @@ class GUI(GtkGUI, monitor.Watcher):
  
          # ..and select the new printer.
          def select_new_printer (model, path, iter):
@@ -4639,7 +4723,7 @@
              print name, new_name
              if name == new_name:
                  self.dests_iconview.select_path (path)
-@@ -2278,7 +2296,7 @@ class GUI(GtkGUI, monitor.Watcher):
+@@ -2278,7 +2293,7 @@ class GUI(GtkGUI, monitor.Watcher):
          paths = iconview.get_selected_items ()
          model = self.dests_iconview.get_model ()
          iter = model.get_iter (paths[0])
@@ -4648,7 +4732,7 @@
          self.entCopyName.set_text(name)
          self.NewPrinterName.set_transient_for (self.MainWindow)
          result = self.NewPrinterName.run()
-@@ -2298,7 +2316,7 @@ class GUI(GtkGUI, monitor.Watcher):
+@@ -2298,7 +2313,7 @@ class GUI(GtkGUI, monitor.Watcher):
  
      def on_entCopyName_changed(self, widget):
          # restrict
@@ -4657,7 +4741,7 @@
          new_text = text
          new_text = new_text.replace("/", "")
          new_text = new_text.replace("#", "")
-@@ -2337,7 +2355,7 @@ class GUI(GtkGUI, monitor.Watcher):
+@@ -2337,7 +2352,7 @@ class GUI(GtkGUI, monitor.Watcher):
          try:
              for i in range (n):
                  iter = model.get_iter (paths[i])
@@ -4666,7 +4750,7 @@
                  self.cups.deletePrinter (name)
          except cups.IPPError, (e, msg):
              show_IPP_Error(e, msg, self.MainWindow)
-@@ -2402,7 +2420,7 @@ class GUI(GtkGUI, monitor.Watcher):
+@@ -2402,7 +2417,7 @@ class GUI(GtkGUI, monitor.Watcher):
          paths = iconview.get_selected_items ()
          model = iconview.get_model ()
          iter = model.get_iter (paths[0])
@@ -4675,7 +4759,7 @@
          self.set_system_or_user_default_printer (name)
  
      def on_troubleshoot_activate(self, widget):
-@@ -2556,7 +2574,7 @@ class GUI(GtkGUI, monitor.Watcher):
+@@ -2556,7 +2571,7 @@ class GUI(GtkGUI, monitor.Watcher):
  
      def checkNPName(self, name):
          if not name: return False
@@ -4684,7 +4768,7 @@
          for printer in self.printers.values():
              if not printer.discovered and printer.name.lower()==name:
                  return False
-@@ -3168,8 +3186,7 @@ class NewPrinterGUI(GtkGUI):
+@@ -3168,8 +3183,7 @@ class NewPrinterGUI(GtkGUI):
                  self.auto_make, self.auto_model = None, None
                  self.device.uri = self.getDeviceURI()
                  if self.device.type in ["socket", "lpd", "ipp"]:
@@ -4694,7 +4778,7 @@
                      faxuri = None
                      if host:
                          faxuri = self.get_hplip_uri_for_network_printer(host,
-@@ -3570,7 +3587,7 @@ class NewPrinterGUI(GtkGUI):
+@@ -3570,7 +3584,7 @@ class NewPrinterGUI(GtkGUI):
              
      def on_entNPName_changed(self, widget):
          # restrict
@@ -4703,7 +4787,7 @@
          new_text = text
          new_text = new_text.replace("/", "")
          new_text = new_text.replace("#", "")
-@@ -3659,6 +3676,12 @@ class NewPrinterGUI(GtkGUI):
+@@ -3659,6 +3673,12 @@ class NewPrinterGUI(GtkGUI):
          return uri
  
      def getNetworkPrinterMakeModel(self):
@@ -4716,7 +4800,7 @@
          device = self.device
          # Determine host name/IP
          host = None
-@@ -3705,6 +3728,8 @@ class NewPrinterGUI(GtkGUI):
+@@ -3705,6 +3725,8 @@ class NewPrinterGUI(GtkGUI):
              device.id = "MFG:" + mk + ";MDL:" + md + ";DES:" + mk + " " + md + ";"
              device.id_dict = cupshelpers.parseDeviceID (device.id)
  
@@ -4725,7 +4809,7 @@
      def fillDeviceTab(self, current_uri=None):
          try:
              devices = self.fetchDevices()
-@@ -4322,6 +4347,7 @@ class NewPrinterGUI(GtkGUI):
+@@ -4322,6 +4344,7 @@ class NewPrinterGUI(GtkGUI):
          thread.start_new_thread(self.browse_ipp_queues_thread, ())
  
      def browse_ipp_queues_thread(self):
@@ -4733,7 +4817,7 @@
          gtk.gdk.threads_enter()
          try:
              store = self.ipp_store
-@@ -4340,12 +4366,19 @@ class NewPrinterGUI(GtkGUI):
+@@ -4340,12 +4363,19 @@ class NewPrinterGUI(GtkGUI):
          oldserver = cups.getServer ()
          printers = classes = {}
          failed = False
@@ -4755,7 +4839,63 @@
                  c = cups.Connection()
  
              printers = c.getPrinters ()
-@@ -5110,7 +5143,6 @@ class NewPrinterGUI(GtkGUI):
+@@ -4435,8 +4465,11 @@ class NewPrinterGUI(GtkGUI):
+                                   padding, pack_type)
+ 
+     def on_tvNPDevices_cursor_changed(self, widget):
+-        model, iter = widget.get_selection ().get_selected()
+-        path = model.get_path (iter)
++        path, column = widget.get_cursor ()
++        if path == None:
++            return
++
++        model = widget.get_model ()
+         physicaldevice = self.devices[path[0]]
+         model = gtk.ListStore (str,                    # printer-info
+                                gobject.TYPE_PYOBJECT)  # cupshelpers.Device
+@@ -4919,14 +4952,12 @@ class NewPrinterGUI(GtkGUI):
+         self.entNPDownloadableDriverSearch.set_text (search)
+ 
+     def on_tvNPMakes_cursor_changed(self, tvNPMakes):
+-        selection = tvNPMakes.get_selection()
+-        model, iter = selection.get_selected()
+-        if not iter:
+-            # Interactively searching.
+-            path, column = tvNPMakes.get_cursor()
++        path, column = tvNPMakes.get_cursor()
++        if path != None:
++            model = tvNPMakes.get_model ()
+             iter = model.get_iter (path)
+-        self.NPMake = model.get(iter, 0)[0]
+-        self.fillModelList()
++            self.NPMake = model.get(iter, 0)[0]
++            self.fillModelList()
+ 
+     def fillModelList(self):
+         models = self.ppds.getModels(self.NPMake)
+@@ -4986,15 +5017,13 @@ class NewPrinterGUI(GtkGUI):
+         return markup
+ 
+     def on_tvNPModels_cursor_changed(self, widget):        
+-        model, iter = widget.get_selection().get_selected()
+-        if not iter:
+-            # Interactively searching.
+-            path, column = widget.get_cursor()
++        path, column = widget.get_cursor()
++        if path != None:
++            model = widget.get_model ()
+             iter = model.get_iter (path)
+-        pmodel = model.get(iter, 0)[0]
+-        self.fillDriverList(self.NPMake, pmodel)
+-
+-        self.on_tvNPDrivers_cursor_changed(self.tvNPDrivers)
++            pmodel = model.get(iter, 0)[0]
++            self.fillDriverList(self.NPMake, pmodel)
++            self.on_tvNPDrivers_cursor_changed(self.tvNPDrivers)
+ 
+     def on_tvNPDrivers_cursor_changed(self, widget):
+         self.setNPButtons()
+@@ -5110,7 +5139,6 @@ class NewPrinterGUI(GtkGUI):
                  ppd = self.NPDrivers[nr]
              elif self.rbtnNPPPD.get_active():
                  ppd = cups.PPD(self.filechooserPPD.get_filename())
@@ -4763,7 +4903,7 @@
              else:
                  # PPD of the driver downloaded from OpenPrinting XXX
                  treeview = self.tvNPDownloadableDrivers
-@@ -5132,7 +5164,6 @@ class NewPrinterGUI(GtkGUI):
+@@ -5132,7 +5160,6 @@ class NewPrinterGUI(GtkGUI):
                              ppdfile.write(ppdcontent)
                              ppdfile.close()
                              ppd = cups.PPD(ppdname)
@@ -4771,7 +4911,7 @@
                              os.unlink(ppdname)
  
          except RuntimeError, e:
-@@ -5188,7 +5219,6 @@ class NewPrinterGUI(GtkGUI):
+@@ -5188,7 +5215,6 @@ class NewPrinterGUI(GtkGUI):
                  if (ppd != "raw"):
                      f = self.mainapp.cups.getServerPPD(ppd)
                      ppd = cups.PPD(f)
@@ -4779,7 +4919,7 @@
                      os.unlink(f)
              except AttributeError:
                  nonfatalException()
-@@ -5262,9 +5292,9 @@ class NewPrinterGUI(GtkGUI):
+@@ -5262,9 +5288,9 @@ class NewPrinterGUI(GtkGUI):
      # Create new Printer
      def on_btnNPApply_clicked(self, widget):
          if self.dialog_mode in ("class", "printer"):
@@ -4792,7 +4932,7 @@
          else:
              name = self.mainapp.printer.name
  
-@@ -5373,7 +5403,6 @@ class NewPrinterGUI(GtkGUI):
+@@ -5373,7 +5399,6 @@ class NewPrinterGUI(GtkGUI):
                  try:
                      filename = self.mainapp.cups.getPPD(name)
                      ppd = cups.PPD(filename)
@@ -4800,7 +4940,7 @@
                      os.unlink(filename)
                  except cups.IPPError, (e, msg):
                      if e == cups.IPP_NOT_FOUND:
-@@ -5383,8 +5412,9 @@ class NewPrinterGUI(GtkGUI):
+@@ -5383,8 +5408,9 @@ class NewPrinterGUI(GtkGUI):
                          return
              else:
                  # We have an actual PPD to upload, not just a name.


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/F-10/system-config-printer.spec,v
retrieving revision 1.234
retrieving revision 1.235
diff -u -r1.234 -r1.235
--- system-config-printer.spec	8 Jan 2009 18:35:57 -0000	1.234
+++ system-config-printer.spec	8 Jan 2009 18:49:02 -0000	1.235
@@ -7,7 +7,7 @@
 Summary: A printer administration tool
 Name: system-config-printer
 Version: 1.0.12
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: GPLv2+
 URL: http://cyberelk.net/tim/software/system-config-printer/
 Group: System Environment/Base
@@ -152,8 +152,12 @@
 exit 0
 
 %changelog
-* Thu Jan  8 2009 Tim Waugh <twaugh at redhat.com>
+* Thu Jan  8 2009 Tim Waugh <twaugh at redhat.com> 1.0.12-8
 - Updated pycups to 1.9.45.
+- Updated patch for 1.0.x changes:
+  - More cursor/selection fixes.
+  - Notification fix.
+  - Advertise correct defaults for page-* job options (bug #468553).
 
 * Fri Dec 19 2008 Tim Waugh <twaugh at redhat.com> 1.0.12-7
 - Updated patch for 1.0.x changes:



From clumens at fedoraproject.org  Thu Jan  8 18:50:34 2009
From: clumens at fedoraproject.org (Christopher Edward Lumens)
Date: Thu,  8 Jan 2009 18:50:34 +0000 (UTC)
Subject: rpms/anaconda/devel .cvsignore, 1.594, 1.595 anaconda.spec, 1.738, 
	1.739 sources, 1.729, 1.730
Message-ID: <20090108185034.48BDA700FD@cvs1.fedora.phx.redhat.com>

Author: clumens

Update of /cvs/pkgs/rpms/anaconda/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16772

Modified Files:
	.cvsignore anaconda.spec sources 
Log Message:
New version.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/devel/.cvsignore,v
retrieving revision 1.594
retrieving revision 1.595
diff -u -r1.594 -r1.595
--- .cvsignore	5 Jan 2009 22:20:35 -0000	1.594
+++ .cvsignore	8 Jan 2009 18:50:03 -0000	1.595
@@ -1,2 +1,3 @@
 anaconda-11.5.0.3.tar.bz2
 anaconda-11.5.0.4.tar.bz2
+anaconda-11.5.0.5.tar.bz2


Index: anaconda.spec
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/devel/anaconda.spec,v
retrieving revision 1.738
retrieving revision 1.739
diff -u -r1.738 -r1.739
--- anaconda.spec	5 Jan 2009 23:37:47 -0000	1.738
+++ anaconda.spec	8 Jan 2009 18:50:03 -0000	1.739
@@ -2,7 +2,7 @@
 
 Summary: Graphical system installer
 Name:    anaconda
-Version: 11.5.0.4
+Version: 11.5.0.5
 Release: 1
 License: GPLv2+
 Group:   Applications/System
@@ -204,6 +204,24 @@
 %endif
 
 %changelog
+* Thu Jan 08 2009 Chris Lumens <clumens at redhat.com> - 11.5.0.5-1
+- NetworkManager system settings plugins were renamed, change mk-images.
+  (dcantrell)
+- Add a message to install.log when package installation is done (#476953).
+  (clumens)
+- Add support for specifying which partition to upgrade (atodorov, #471232).
+  (clumens)
+- pykickstart has a new version of the upgrade command. (clumens)
+- Log all calls to mount to /tmp/program.log as well. (clumens)
+- Log everything from execWithRedirect or execWithCapture (#467690).
+  (clumens)
+- Update partedUtils.py:findExistingRootPartitions to return UUID
+  (atodorov). (clumens)
+- Don't skip the method screen when going back and forth (#477991). (clumens)
+- Die on errors from upd-instroot/mk-images rather than continuing on (katzj)
+- The FTP USER command does not need to be followed by a PASS (#477536).
+  (clumens)
+
 * Mon Jan 05 2009 David Cantrell <dcantrell at redhat.com> - 11.5.0.4-1
 - Workaround compile error due to (# 478663) (hdegoede)
 - Various packaging fixed from review (#225246) (hdegoede)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/devel/sources,v
retrieving revision 1.729
retrieving revision 1.730
diff -u -r1.729 -r1.730
--- sources	5 Jan 2009 23:37:48 -0000	1.729
+++ sources	8 Jan 2009 18:50:03 -0000	1.730
@@ -1 +1 @@
-5f32eee4e0d921598f538c0d208740a0  anaconda-11.5.0.4.tar.bz2
+b7b95ccf39efde688acfe6f2cd6d8451  anaconda-11.5.0.5.tar.bz2



From twaugh at fedoraproject.org  Thu Jan  8 18:56:46 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Thu,  8 Jan 2009 18:56:46 +0000 (UTC)
Subject: rpms/system-config-printer/F-9 system-config-printer-1.0.x.patch,
	1.9, 1.10 system-config-printer.spec, 1.208, 1.209
Message-ID: <20090108185646.992E7700FD@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/system-config-printer/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17352

Modified Files:
	system-config-printer-1.0.x.patch system-config-printer.spec 
Log Message:
* Thu Jan  8 2009 Tim Waugh <twaugh at redhat.com> 1.0.12-8
- Updated patch for 1.0.x changes:
  - More cursor/selection fixes.
  - Notification fix.
  - Advertise correct defaults for page-* job options (bug #468553).


system-config-printer-1.0.x.patch:

Index: system-config-printer-1.0.x.patch
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/F-9/system-config-printer-1.0.x.patch,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- system-config-printer-1.0.x.patch	19 Dec 2008 13:04:53 -0000	1.9
+++ system-config-printer-1.0.x.patch	8 Jan 2009 18:56:15 -0000	1.10
@@ -1,8 +1,33 @@
 diff --git a/ChangeLog b/ChangeLog
-index 2851eeb..db57408 100644
+index 2851eeb..01c8757 100644
 --- a/ChangeLog
 +++ b/ChangeLog
-@@ -1,3 +1,115 @@
+@@ -1,3 +1,140 @@
++2009-01-08  Tim Waugh  <twaugh at redhat.com>
++
++	* system-config-printer.py (GUI.dests_iconview_item_activated):
++	Use set_cursor here to match change introduced when fixing
++	Ubuntu #282634.
++
++2009-01-08  Tim Waugh  <twaugh at redhat.com>
++
++	* jobviewer.py (JobViewer.now_connected): Handle notification
++	closure for re-connected printers correctly.
++
++2009-01-07  Tim Waugh  <twaugh at redhat.com>
++
++	* system-config-printer.py (GUI.__init__): Advertise correct
++	defaults for page-left, page-right, page-top and page-bottom job
++	options (bug #468553).
++
++2009-01-07  Tim Waugh  <twaugh at redhat.com>
++
++	* system-config-printer.py
++	(NewPrinterGUI.on_tvNPMakes_cursor_changed): Use get_cursor here.
++	(NewPrinterGUI.on_tvNPModels_cursor_changed): Likewise (Ubuntu
++	#299724).
++	(NewPrinterGUI.on_tvNPDevices_cursor_changed): Likewise.
++
 +2008-12-19  Tim Waugh  <twaugh at redhat.com>
 +
 +	* system-config-printer.in: Set prefix environment variable here,
@@ -351,7 +376,7 @@
              modelnumber = 0
              if digits > 0:
 diff --git a/jobviewer.py b/jobviewer.py
-index 5005305..a247a2e 100644
+index 5005305..16ac6c5 100644
 --- a/jobviewer.py
 +++ b/jobviewer.py
 @@ -49,7 +49,7 @@ from statereason import StateReason
@@ -363,6 +388,17 @@
  GLADE="applet.glade"
  ICON="printer"
  SEARCHING_ICON="document-print-preview"
+@@ -1334,7 +1334,9 @@ class JobViewer (monitor.Watcher):
+             debugprint ("Unexpected now_connected signal")
+             return
+ 
+-        notification.close ()
++        if notification.get_data ('closed') != True:
++            notification.close ()
++            notification.set_data ('closed', True)
+ 
+     def printer_event (self, mon, printer, eventname, event):
+         monitor.Watcher.printer_event (self, mon, printer, eventname, event)
 diff --git a/monitor.py b/monitor.py
 index 3748d45..43e151f 100644
 --- a/monitor.py
@@ -4468,9 +4504,21 @@
  #~ msgstr "Ok??nd"
 +
 diff --git a/system-config-printer.py b/system-config-printer.py
-index 349c6f0..c225b95 100755
+index 349c6f0..966759c 100755
 --- a/system-config-printer.py
 +++ b/system-config-printer.py
+@@ -2,9 +2,9 @@
+ 
+ ## system-config-printer
+ 
+-## Copyright (C) 2006, 2007, 2008 Red Hat, Inc.
++## Copyright (C) 2006, 2007, 2008, 2009 Red Hat, Inc.
++## Copyright (C) 2006, 2007, 2008, 2009 Tim Waugh <twaugh at redhat.com>
+ ## Copyright (C) 2006, 2007 Florian Festi <ffesti at redhat.com>
+-## Copyright (C) 2006, 2007, 2008 Tim Waugh <twaugh at redhat.com>
+ 
+ ## This program is free software; you can redistribute it and/or modify
+ ## it under the terms of the GNU General Public License as published by
 @@ -87,10 +87,13 @@ from gettext import gettext as _
  monitor.set_gettext_function (_)
  errordialogs.set_gettext_function (_)
@@ -4487,6 +4535,30 @@
  iconpath = os.path.join (pkgdata, 'icons/')
  sys.path.append (pkgdata)
  
+@@ -537,19 +540,19 @@ class GUI(GtkGUI, monitor.Watcher):
+                  options.OptionAlwaysShown ("lpi", float, 6.0,
+                                             self.sbJOLpi, self.btnJOResetLpi),
+ 
+-                 options.OptionAlwaysShown ("page-left", int, 18,
++                 options.OptionAlwaysShown ("page-left", int, 0,
+                                             self.sbJOPageLeft,
+                                             self.btnJOResetPageLeft),
+ 
+-                 options.OptionAlwaysShown ("page-right", int, 18,
++                 options.OptionAlwaysShown ("page-right", int, 0,
+                                             self.sbJOPageRight,
+                                             self.btnJOResetPageRight),
+ 
+-                 options.OptionAlwaysShown ("page-top", int, 36,
++                 options.OptionAlwaysShown ("page-top", int, 0,
+                                             self.sbJOPageTop,
+                                             self.btnJOResetPageTop),
+ 
+-                 options.OptionAlwaysShown ("page-bottom", int, 36,
++                 options.OptionAlwaysShown ("page-bottom", int, 0,
+                                             self.sbJOPageBottom,
+                                             self.btnJOResetPageBottom),
+ 
 @@ -612,7 +615,7 @@ class GUI(GtkGUI, monitor.Watcher):
              model = self.dests_iconview.get_model ()
              iter = model.get_iter_first ()
@@ -4505,7 +4577,19 @@
          object = model.get_value (iter, 0)
          try:
              self.fillPrinterTab (name)
-@@ -692,7 +695,7 @@ class GUI(GtkGUI, monitor.Watcher):
+@@ -653,10 +656,7 @@ class GUI(GtkGUI, monitor.Watcher):
+             self.btnPrinterPropertiesClose.hide ()
+         self.setDataButtonState ()
+         treeview = self.tvPrinterProperties
+-        sel = treeview.get_selection ()
+-        sel.select_path ((0,))
+-        self.on_tvPrinterProperties_selection_changed (sel)
+-        self.on_tvPrinterProperties_cursor_changed (treeview)
++        treeview.set_cursor ((0,))
+         host = CUPS_server_hostname ()
+         self.PrinterPropertiesDialog.set_title (_("Printer Properties - "
+                                                   "`%s' on %s") % (name, host))
+@@ -692,7 +692,7 @@ class GUI(GtkGUI, monitor.Watcher):
              model = iconview.get_model ()
              iter = model.get_iter (paths[i])
              object = model.get_value (iter, 0)
@@ -4514,7 +4598,7 @@
              if object.discovered:
                  any_discovered = True
              if object.enabled:
-@@ -765,6 +768,11 @@ class GUI(GtkGUI, monitor.Watcher):
+@@ -765,6 +765,11 @@ class GUI(GtkGUI, monitor.Watcher):
                  AdvancedServerSettingsDialog (self.cups, dialog)
              except:
                  return
@@ -4526,7 +4610,7 @@
          else:
              dialog.hide ()
  
-@@ -834,7 +842,7 @@ class GUI(GtkGUI, monitor.Watcher):
+@@ -834,7 +839,7 @@ class GUI(GtkGUI, monitor.Watcher):
          model = self.dests_iconview.get_model ()
          for path in paths:
              iter = model.get_iter (path)
@@ -4535,7 +4619,7 @@
              selected_printers.add (name)
  
          if self.cups:
-@@ -858,6 +866,8 @@ class GUI(GtkGUI, monitor.Watcher):
+@@ -858,6 +863,8 @@ class GUI(GtkGUI, monitor.Watcher):
                  show_IPP_Error(e, m, self.MainWindow)
                  self.printers = {}
                  self.default_printer = None
@@ -4544,7 +4628,7 @@
          else:
              self.printers = {}
              self.default_printer = None
-@@ -987,7 +997,7 @@ class GUI(GtkGUI, monitor.Watcher):
+@@ -987,7 +994,7 @@ class GUI(GtkGUI, monitor.Watcher):
          # Restore selection of printers.
          model = self.dests_iconview.get_model ()
          def maybe_select (model, path, iter):
@@ -4553,7 +4637,7 @@
              if name in selected_printers:
                  self.dests_iconview.select_path (path)
          model.foreach (maybe_select)
-@@ -1593,9 +1603,12 @@ class GUI(GtkGUI, monitor.Watcher):
+@@ -1593,9 +1600,12 @@ class GUI(GtkGUI, monitor.Watcher):
  
      def on_tvPrinterProperties_cursor_changed (self, treeview):
          # Adjust notebook to reflect selected item.
@@ -4569,7 +4653,7 @@
  
      # set default printer
      def set_system_or_user_default_printer (self, name):
-@@ -1674,6 +1687,8 @@ class GUI(GtkGUI, monitor.Watcher):
+@@ -1674,6 +1684,8 @@ class GUI(GtkGUI, monitor.Watcher):
              show_info_dialog (_("Submitted"),
                                _("Test page submitted as job %d") % job_id,
                                parent=self.MainWindow)
@@ -4578,7 +4662,7 @@
          except cups.IPPError, (e, msg):
              if (e == cups.IPP_NOT_AUTHORIZED and
                  self.connect_server != 'localhost' and
-@@ -1750,6 +1765,8 @@ class GUI(GtkGUI, monitor.Watcher):
+@@ -1750,6 +1762,8 @@ class GUI(GtkGUI, monitor.Watcher):
  
          try:
              self.ppd = printer.getPPD()
@@ -4587,7 +4671,7 @@
          except cups.IPPError, (e, m):
              # Some IPP error other than IPP_NOT_FOUND.
              show_IPP_Error(e, m, self.MainWindow)
-@@ -1988,19 +2005,20 @@ class GUI(GtkGUI, monitor.Watcher):
+@@ -1988,19 +2002,20 @@ class GUI(GtkGUI, monitor.Watcher):
              return
          ppd = self.ppd
          ppd.markDefaults()
@@ -4612,7 +4696,7 @@
                  tab_label = self.lblPInstallOptions
              else:
                  frame = gtk.Frame("<b>%s</b>" % group.text)
-@@ -2147,7 +2165,7 @@ class GUI(GtkGUI, monitor.Watcher):
+@@ -2147,7 +2162,7 @@ class GUI(GtkGUI, monitor.Watcher):
          (path, cell) = tuple
          model = self.dests_iconview.get_model ()
          iter = model.get_iter (path)
@@ -4621,7 +4705,7 @@
          if not self.is_rename_possible (name):
              return
          cell.set_property ('editable', True)
-@@ -2161,7 +2179,7 @@ class GUI(GtkGUI, monitor.Watcher):
+@@ -2161,7 +2176,7 @@ class GUI(GtkGUI, monitor.Watcher):
      def printer_name_edited (self, cell, path, newname):
          model = self.dests_iconview.get_model ()
          iter = model.get_iter (path)
@@ -4630,7 +4714,7 @@
          debugprint ("edited: %s -> %s" % (name, newname))
          try:
              self.rename_printer (name, newname)
-@@ -2255,7 +2273,7 @@ class GUI(GtkGUI, monitor.Watcher):
+@@ -2255,7 +2270,7 @@ class GUI(GtkGUI, monitor.Watcher):
  
          # ..and select the new printer.
          def select_new_printer (model, path, iter):
@@ -4639,7 +4723,7 @@
              print name, new_name
              if name == new_name:
                  self.dests_iconview.select_path (path)
-@@ -2278,7 +2296,7 @@ class GUI(GtkGUI, monitor.Watcher):
+@@ -2278,7 +2293,7 @@ class GUI(GtkGUI, monitor.Watcher):
          paths = iconview.get_selected_items ()
          model = self.dests_iconview.get_model ()
          iter = model.get_iter (paths[0])
@@ -4648,7 +4732,7 @@
          self.entCopyName.set_text(name)
          self.NewPrinterName.set_transient_for (self.MainWindow)
          result = self.NewPrinterName.run()
-@@ -2298,7 +2316,7 @@ class GUI(GtkGUI, monitor.Watcher):
+@@ -2298,7 +2313,7 @@ class GUI(GtkGUI, monitor.Watcher):
  
      def on_entCopyName_changed(self, widget):
          # restrict
@@ -4657,7 +4741,7 @@
          new_text = text
          new_text = new_text.replace("/", "")
          new_text = new_text.replace("#", "")
-@@ -2337,7 +2355,7 @@ class GUI(GtkGUI, monitor.Watcher):
+@@ -2337,7 +2352,7 @@ class GUI(GtkGUI, monitor.Watcher):
          try:
              for i in range (n):
                  iter = model.get_iter (paths[i])
@@ -4666,7 +4750,7 @@
                  self.cups.deletePrinter (name)
          except cups.IPPError, (e, msg):
              show_IPP_Error(e, msg, self.MainWindow)
-@@ -2402,7 +2420,7 @@ class GUI(GtkGUI, monitor.Watcher):
+@@ -2402,7 +2417,7 @@ class GUI(GtkGUI, monitor.Watcher):
          paths = iconview.get_selected_items ()
          model = iconview.get_model ()
          iter = model.get_iter (paths[0])
@@ -4675,7 +4759,7 @@
          self.set_system_or_user_default_printer (name)
  
      def on_troubleshoot_activate(self, widget):
-@@ -2556,7 +2574,7 @@ class GUI(GtkGUI, monitor.Watcher):
+@@ -2556,7 +2571,7 @@ class GUI(GtkGUI, monitor.Watcher):
  
      def checkNPName(self, name):
          if not name: return False
@@ -4684,7 +4768,7 @@
          for printer in self.printers.values():
              if not printer.discovered and printer.name.lower()==name:
                  return False
-@@ -3168,8 +3186,7 @@ class NewPrinterGUI(GtkGUI):
+@@ -3168,8 +3183,7 @@ class NewPrinterGUI(GtkGUI):
                  self.auto_make, self.auto_model = None, None
                  self.device.uri = self.getDeviceURI()
                  if self.device.type in ["socket", "lpd", "ipp"]:
@@ -4694,7 +4778,7 @@
                      faxuri = None
                      if host:
                          faxuri = self.get_hplip_uri_for_network_printer(host,
-@@ -3570,7 +3587,7 @@ class NewPrinterGUI(GtkGUI):
+@@ -3570,7 +3584,7 @@ class NewPrinterGUI(GtkGUI):
              
      def on_entNPName_changed(self, widget):
          # restrict
@@ -4703,7 +4787,7 @@
          new_text = text
          new_text = new_text.replace("/", "")
          new_text = new_text.replace("#", "")
-@@ -3659,6 +3676,12 @@ class NewPrinterGUI(GtkGUI):
+@@ -3659,6 +3673,12 @@ class NewPrinterGUI(GtkGUI):
          return uri
  
      def getNetworkPrinterMakeModel(self):
@@ -4716,7 +4800,7 @@
          device = self.device
          # Determine host name/IP
          host = None
-@@ -3705,6 +3728,8 @@ class NewPrinterGUI(GtkGUI):
+@@ -3705,6 +3725,8 @@ class NewPrinterGUI(GtkGUI):
              device.id = "MFG:" + mk + ";MDL:" + md + ";DES:" + mk + " " + md + ";"
              device.id_dict = cupshelpers.parseDeviceID (device.id)
  
@@ -4725,7 +4809,7 @@
      def fillDeviceTab(self, current_uri=None):
          try:
              devices = self.fetchDevices()
-@@ -4322,6 +4347,7 @@ class NewPrinterGUI(GtkGUI):
+@@ -4322,6 +4344,7 @@ class NewPrinterGUI(GtkGUI):
          thread.start_new_thread(self.browse_ipp_queues_thread, ())
  
      def browse_ipp_queues_thread(self):
@@ -4733,7 +4817,7 @@
          gtk.gdk.threads_enter()
          try:
              store = self.ipp_store
-@@ -4340,12 +4366,19 @@ class NewPrinterGUI(GtkGUI):
+@@ -4340,12 +4363,19 @@ class NewPrinterGUI(GtkGUI):
          oldserver = cups.getServer ()
          printers = classes = {}
          failed = False
@@ -4755,7 +4839,63 @@
                  c = cups.Connection()
  
              printers = c.getPrinters ()
-@@ -5110,7 +5143,6 @@ class NewPrinterGUI(GtkGUI):
+@@ -4435,8 +4465,11 @@ class NewPrinterGUI(GtkGUI):
+                                   padding, pack_type)
+ 
+     def on_tvNPDevices_cursor_changed(self, widget):
+-        model, iter = widget.get_selection ().get_selected()
+-        path = model.get_path (iter)
++        path, column = widget.get_cursor ()
++        if path == None:
++            return
++
++        model = widget.get_model ()
+         physicaldevice = self.devices[path[0]]
+         model = gtk.ListStore (str,                    # printer-info
+                                gobject.TYPE_PYOBJECT)  # cupshelpers.Device
+@@ -4919,14 +4952,12 @@ class NewPrinterGUI(GtkGUI):
+         self.entNPDownloadableDriverSearch.set_text (search)
+ 
+     def on_tvNPMakes_cursor_changed(self, tvNPMakes):
+-        selection = tvNPMakes.get_selection()
+-        model, iter = selection.get_selected()
+-        if not iter:
+-            # Interactively searching.
+-            path, column = tvNPMakes.get_cursor()
++        path, column = tvNPMakes.get_cursor()
++        if path != None:
++            model = tvNPMakes.get_model ()
+             iter = model.get_iter (path)
+-        self.NPMake = model.get(iter, 0)[0]
+-        self.fillModelList()
++            self.NPMake = model.get(iter, 0)[0]
++            self.fillModelList()
+ 
+     def fillModelList(self):
+         models = self.ppds.getModels(self.NPMake)
+@@ -4986,15 +5017,13 @@ class NewPrinterGUI(GtkGUI):
+         return markup
+ 
+     def on_tvNPModels_cursor_changed(self, widget):        
+-        model, iter = widget.get_selection().get_selected()
+-        if not iter:
+-            # Interactively searching.
+-            path, column = widget.get_cursor()
++        path, column = widget.get_cursor()
++        if path != None:
++            model = widget.get_model ()
+             iter = model.get_iter (path)
+-        pmodel = model.get(iter, 0)[0]
+-        self.fillDriverList(self.NPMake, pmodel)
+-
+-        self.on_tvNPDrivers_cursor_changed(self.tvNPDrivers)
++            pmodel = model.get(iter, 0)[0]
++            self.fillDriverList(self.NPMake, pmodel)
++            self.on_tvNPDrivers_cursor_changed(self.tvNPDrivers)
+ 
+     def on_tvNPDrivers_cursor_changed(self, widget):
+         self.setNPButtons()
+@@ -5110,7 +5139,6 @@ class NewPrinterGUI(GtkGUI):
                  ppd = self.NPDrivers[nr]
              elif self.rbtnNPPPD.get_active():
                  ppd = cups.PPD(self.filechooserPPD.get_filename())
@@ -4763,7 +4903,7 @@
              else:
                  # PPD of the driver downloaded from OpenPrinting XXX
                  treeview = self.tvNPDownloadableDrivers
-@@ -5132,7 +5164,6 @@ class NewPrinterGUI(GtkGUI):
+@@ -5132,7 +5160,6 @@ class NewPrinterGUI(GtkGUI):
                              ppdfile.write(ppdcontent)
                              ppdfile.close()
                              ppd = cups.PPD(ppdname)
@@ -4771,7 +4911,7 @@
                              os.unlink(ppdname)
  
          except RuntimeError, e:
-@@ -5188,7 +5219,6 @@ class NewPrinterGUI(GtkGUI):
+@@ -5188,7 +5215,6 @@ class NewPrinterGUI(GtkGUI):
                  if (ppd != "raw"):
                      f = self.mainapp.cups.getServerPPD(ppd)
                      ppd = cups.PPD(f)
@@ -4779,7 +4919,7 @@
                      os.unlink(f)
              except AttributeError:
                  nonfatalException()
-@@ -5262,9 +5292,9 @@ class NewPrinterGUI(GtkGUI):
+@@ -5262,9 +5288,9 @@ class NewPrinterGUI(GtkGUI):
      # Create new Printer
      def on_btnNPApply_clicked(self, widget):
          if self.dialog_mode in ("class", "printer"):
@@ -4792,7 +4932,7 @@
          else:
              name = self.mainapp.printer.name
  
-@@ -5373,7 +5403,6 @@ class NewPrinterGUI(GtkGUI):
+@@ -5373,7 +5399,6 @@ class NewPrinterGUI(GtkGUI):
                  try:
                      filename = self.mainapp.cups.getPPD(name)
                      ppd = cups.PPD(filename)
@@ -4800,7 +4940,7 @@
                      os.unlink(filename)
                  except cups.IPPError, (e, msg):
                      if e == cups.IPP_NOT_FOUND:
-@@ -5383,8 +5412,9 @@ class NewPrinterGUI(GtkGUI):
+@@ -5383,8 +5408,9 @@ class NewPrinterGUI(GtkGUI):
                          return
              else:
                  # We have an actual PPD to upload, not just a name.


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/F-9/system-config-printer.spec,v
retrieving revision 1.208
retrieving revision 1.209
diff -u -r1.208 -r1.209
--- system-config-printer.spec	8 Jan 2009 18:36:05 -0000	1.208
+++ system-config-printer.spec	8 Jan 2009 18:56:16 -0000	1.209
@@ -7,7 +7,7 @@
 Summary: A printer administration tool
 Name: system-config-printer
 Version: 1.0.12
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: GPLv2+
 URL: http://cyberelk.net/tim/software/system-config-printer/
 Group: System Environment/Base
@@ -152,8 +152,12 @@
 exit 0
 
 %changelog
-* Thu Jan  8 2009 Tim Waugh <twaugh at redhat.com>
+* Thu Jan  8 2009 Tim Waugh <twaugh at redhat.com> 1.0.12-8
 - Updated pycups to 1.9.45.
+- Updated patch for 1.0.x changes:
+  - More cursor/selection fixes.
+  - Notification fix.
+  - Advertise correct defaults for page-* job options (bug #468553).
 
 * Fri Dec 19 2008 Tim Waugh <twaugh at redhat.com> 1.0.12-7
 - Updated patch for 1.0.x changes:



From chitlesh at fedoraproject.org  Thu Jan  8 18:57:57 2009
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Thu,  8 Jan 2009 18:57:57 +0000 (UTC)
Subject: rpms/libgeda/F-9 .cvsignore, 1.14, 1.15 import.log, 1.2,
	1.3 libgeda.spec, 1.16, 1.17 sources, 1.14, 1.15
Message-ID: <20090108185757.727F3700FD@cvs1.fedora.phx.redhat.com>

Author: chitlesh

Update of /cvs/pkgs/rpms/libgeda/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17608/F-9

Modified Files:
	.cvsignore import.log libgeda.spec sources 
Log Message:
20081231


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libgeda/F-9/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	22 Dec 2008 21:40:01 -0000	1.14
+++ .cvsignore	8 Jan 2009 18:57:27 -0000	1.15
@@ -1 +1 @@
-libgeda-1.4.2.tar.gz
+libgeda-1.4.3.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/libgeda/F-9/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	22 Dec 2008 21:40:01 -0000	1.2
+++ import.log	8 Jan 2009 18:57:27 -0000	1.3
@@ -1,2 +1,3 @@
 libgeda-20080929-1_fc9:F-9:libgeda-20080929-1.fc9.src.rpm:1226442743
 libgeda-20081220-1_fc10:F-9:libgeda-20081220-1.fc10.src.rpm:1229981952
+libgeda-20081231-1_fc10:F-9:libgeda-20081231-1.fc10.src.rpm:1231440855


Index: libgeda.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libgeda/F-9/libgeda.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- libgeda.spec	22 Dec 2008 21:40:01 -0000	1.16
+++ libgeda.spec	8 Jan 2009 18:57:27 -0000	1.17
@@ -1,7 +1,7 @@
-%define          real_ver   1.4.2
+%define          real_ver   1.4.3
 
 Name:            libgeda
-Version:         20081220
+Version:         20081231
 Release:         1%{?dist}
 Summary:         Libraries for the gEDA project
 
@@ -9,7 +9,7 @@
 License:         GPLv2
 URL:             http://www.geda.seul.org
 
-Source:          http://geda.seul.org/release/v1.4/%{realver}/%{name}-%{real_ver}.tar.gz
+Source:          http://geda.seul.org/release/v1.4/%{real_ver}/%{name}-%{real_ver}.tar.gz
 
 BuildRoot:       %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -62,8 +62,6 @@
 
 
 %{__install} -d %{buildroot}%{_docdir}/gEDA/
-#%{__install} -pm 0644 docs/*.html   %{buildroot}%{_docdir}/gEDA/
-#%{__install} -pm 0644 docs/logo.png %{buildroot}%{_docdir}/gEDA/
 
 
 # locale's
@@ -95,7 +93,6 @@
 
 # geda-symbols is the Owner of the following directories
 #%dir %{_docdir}/gEDA/readmes
-#%dir %{_docdir}/gEDA/man
 #%dir %{_docdir}/gEDA/examples
 #%dir %{_datadir}/gEDA/bitmap
 
@@ -129,6 +126,9 @@
 
 
 %Changelog
+* Wed Dec 31 2008 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20081231-1
+- new upstream release
+
 * Sun Dec 22 2008 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20081220-1
 - new upstream release
 - stripped off contents that upstream accepted from us.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libgeda/F-9/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	22 Dec 2008 21:40:01 -0000	1.14
+++ sources	8 Jan 2009 18:57:27 -0000	1.15
@@ -1 +1 @@
-e22e28cf3684efcf42f6591995fe943b  libgeda-1.4.2.tar.gz
+f4254f345b5d1a1f3ae4e2e27ae38b0a  libgeda-1.4.3.tar.gz



From mbarnes at fedoraproject.org  Thu Jan  8 18:58:17 2009
From: mbarnes at fedoraproject.org (Matthew Barnes)
Date: Thu,  8 Jan 2009 18:58:17 +0000 (UTC)
Subject: rpms/gnome-pilot/devel gnome-pilot-2.0.17-fix-conduit-dir.patch,
	NONE, 
	1.1 .cvsignore, 1.12, 1.13 gnome-pilot.spec, 1.67, 1.68 sources,
	1.12, 1.13 gnome-pilot-2.0.14-fix-conduit-dir.patch, 1.1, NONE
Message-ID: <20090108185817.68E84700FD@cvs1.fedora.phx.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/gnome-pilot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17637

Modified Files:
	.cvsignore gnome-pilot.spec sources 
Added Files:
	gnome-pilot-2.0.17-fix-conduit-dir.patch 
Removed Files:
	gnome-pilot-2.0.14-fix-conduit-dir.patch 
Log Message:

* Thu Jan 08 2009 Matthew Barnes <mbarnes at redhat.com> - 2.0.17-1
- Update to 2.0.17


gnome-pilot-2.0.17-fix-conduit-dir.patch:

--- NEW FILE gnome-pilot-2.0.17-fix-conduit-dir.patch ---
diff -up gnome-pilot-2.0.17/gpilotd/Makefile.am.fix-conduit-dir gnome-pilot-2.0.17/gpilotd/Makefile.am
--- gnome-pilot-2.0.17/gpilotd/Makefile.am.fix-conduit-dir	2009-01-08 13:40:33.000000000 -0500
+++ gnome-pilot-2.0.17/gpilotd/Makefile.am	2009-01-08 13:40:43.000000000 -0500
@@ -9,7 +9,7 @@ INCLUDES = 							\
 	-DGP_PILOT_LINK_VERSION=\"@PILOT_LINK_VERSION@\" 	\
 	-DDEVICE_XML_DIR=\"$(datadir)/gnome-pilot\" 	\
 	-DGNOMELOCALEDIR=\""$(datadir)/locale"\" 		\
-	-DCONDUITDIR=\"$(datadir)\"				\
+	-DCONDUITDIR=\"$(libdir)\"				\
 	$(GNOME_PILOT_CFLAGS)	
 
 gpmarshal.h: gpmarshal.list
diff -up gnome-pilot-2.0.17/gpilotd/Makefile.in.fix-conduit-dir gnome-pilot-2.0.17/gpilotd/Makefile.in
--- gnome-pilot-2.0.17/gpilotd/Makefile.in.fix-conduit-dir	2009-01-08 13:41:03.000000000 -0500
+++ gnome-pilot-2.0.17/gpilotd/Makefile.in	2009-01-08 13:41:16.000000000 -0500
@@ -335,7 +335,7 @@ INCLUDES = \
 	-DGP_PILOT_LINK_VERSION=\"@PILOT_LINK_VERSION@\" 	\
 	-DDEVICE_XML_DIR=\"$(datadir)/gnome-pilot\" 	\
 	-DGNOMELOCALEDIR=\""$(datadir)/locale"\" 		\
-	-DCONDUITDIR=\"$(datadir)\"				\
+	-DCONDUITDIR=\"$(libdir)\"				\
 	$(GNOME_PILOT_CFLAGS)	
 
 gpilotdlibsdir = $(libdir)


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-pilot/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	27 Feb 2008 02:45:16 -0000	1.12
+++ .cvsignore	8 Jan 2009 18:57:46 -0000	1.13
@@ -1 +1 @@
-gnome-pilot-2.0.16.tar.bz2
+gnome-pilot-2.0.17.tar.bz2


Index: gnome-pilot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-pilot/devel/gnome-pilot.spec,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- gnome-pilot.spec	23 Jul 2008 16:42:06 -0000	1.67
+++ gnome-pilot.spec	8 Jan 2009 18:57:47 -0000	1.68
@@ -3,8 +3,8 @@
 ### Abstract ###
 
 Name: gnome-pilot
-Version: 2.0.16
-Release: 3%{?dist}
+Version: 2.0.17
+Release: 1%{?dist}
 License: LGPLv2+ and GPLv2+
 Group: Applications/Communications
 Summary: GNOME pilot programs
@@ -15,7 +15,7 @@
 ### Patches ###
 
 # RH bug #135304 (sort of)
-Patch1: gnome-pilot-2.0.14-fix-conduit-dir.patch
+Patch1: gnome-pilot-2.0.17-fix-conduit-dir.patch
 
 ### Dependencies ###
 
@@ -68,7 +68,7 @@
 %patch1 -p1 -b .fix-conduit-dir
 
 %build
-autoreconf --force
+autoreconf --force --install
 intltoolize --force
 %configure --disable-static
 cp %{_bindir}/libtool .
@@ -163,6 +163,9 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Thu Jan 08 2009 Matthew Barnes <mbarnes at redhat.com> - 2.0.17-1
+- Update to 2.0.17
+
 * Wed Jul 23 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 2.0.16-3
 - fix license tag
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-pilot/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	27 Feb 2008 02:45:16 -0000	1.12
+++ sources	8 Jan 2009 18:57:47 -0000	1.13
@@ -1 +1 @@
-f14e87d89902f82981f106c8df9277c9  gnome-pilot-2.0.16.tar.bz2
+6086573332d607ddba06fe705667b240  gnome-pilot-2.0.17.tar.bz2


--- gnome-pilot-2.0.14-fix-conduit-dir.patch DELETED ---



From mbarnes at fedoraproject.org  Thu Jan  8 18:58:42 2009
From: mbarnes at fedoraproject.org (Matthew Barnes)
Date: Thu,  8 Jan 2009 18:58:42 +0000 (UTC)
Subject: rpms/gnome-pilot-conduits/devel .cvsignore, 1.8,
	1.9 gnome-pilot-conduits.spec, 1.31, 1.32 sources, 1.8, 1.9
Message-ID: <20090108185842.9C97C700FD@cvs1.fedora.phx.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/gnome-pilot-conduits/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17741

Modified Files:
	.cvsignore gnome-pilot-conduits.spec sources 
Log Message:

* Thu Jan 08 2009 Matthew Barnes <mbarnes at redhat.com> - 2.0.17-1
- Update to 2.0.17



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-pilot-conduits/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	27 Feb 2008 02:45:14 -0000	1.8
+++ .cvsignore	8 Jan 2009 18:58:12 -0000	1.9
@@ -1 +1 @@
-gnome-pilot-conduits-2.0.16.tar.bz2
+gnome-pilot-conduits-2.0.17.tar.bz2


Index: gnome-pilot-conduits.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-pilot-conduits/devel/gnome-pilot-conduits.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- gnome-pilot-conduits.spec	23 Jul 2008 16:45:53 -0000	1.31
+++ gnome-pilot-conduits.spec	8 Jan 2009 18:58:12 -0000	1.32
@@ -3,8 +3,8 @@
 ### Abstract ###
 
 Name: gnome-pilot-conduits
-Version: 2.0.16
-Release: 2%{?dist}
+Version: 2.0.17
+Release: 1%{?dist}
 License: GPLv2+ and MPLv1.0
 Group: Applications/Communications
 Summary: Additional conduits for gnome-pilot
@@ -69,6 +69,9 @@
 %{_libdir}/gnome-pilot/conduits/*.so
 
 %changelog
+* Thu Jan 08 2009 Matthew Barnes <mbarnes at redhat.com> - 2.0.17-1
+- Update to 2.0.17
+
 * Wed Jul 23 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 2.0.16-2
 - fix license tag
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-pilot-conduits/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	27 Feb 2008 02:45:14 -0000	1.8
+++ sources	8 Jan 2009 18:58:12 -0000	1.9
@@ -1 +1 @@
-c66944dcf035e4d334350728bec41ead  gnome-pilot-conduits-2.0.16.tar.bz2
+27c7f665660ef68ec23552bdd0c9a571  gnome-pilot-conduits-2.0.17.tar.bz2



From chitlesh at fedoraproject.org  Thu Jan  8 19:00:24 2009
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Thu,  8 Jan 2009 19:00:24 +0000 (UTC)
Subject: rpms/libgeda/F-10 .cvsignore, 1.14, 1.15 import.log, 1.2,
	1.3 libgeda.spec, 1.16, 1.17 sources, 1.14, 1.15
Message-ID: <20090108190024.A68E8700FD@cvs1.fedora.phx.redhat.com>

Author: chitlesh

Update of /cvs/pkgs/rpms/libgeda/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18014/F-10

Modified Files:
	.cvsignore import.log libgeda.spec sources 
Log Message:
20081231


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libgeda/F-10/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	22 Dec 2008 21:43:51 -0000	1.14
+++ .cvsignore	8 Jan 2009 18:59:54 -0000	1.15
@@ -1 +1 @@
-libgeda-1.4.2.tar.gz
+libgeda-1.4.3.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/libgeda/F-10/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	22 Dec 2008 21:43:52 -0000	1.2
+++ import.log	8 Jan 2009 18:59:54 -0000	1.3
@@ -1,2 +1,3 @@
 libgeda-20080929-1_fc9:F-10:libgeda-20080929-1.fc9.src.rpm:1226443193
 libgeda-20081220-1_fc10:F-10:libgeda-20081220-1.fc10.src.rpm:1229982060
+libgeda-20081231-1_fc10:F-10:libgeda-20081231-1.fc10.src.rpm:1231441107


Index: libgeda.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libgeda/F-10/libgeda.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- libgeda.spec	22 Dec 2008 21:43:52 -0000	1.16
+++ libgeda.spec	8 Jan 2009 18:59:54 -0000	1.17
@@ -1,7 +1,7 @@
-%define          real_ver   1.4.2
+%define          real_ver   1.4.3
 
 Name:            libgeda
-Version:         20081220
+Version:         20081231
 Release:         1%{?dist}
 Summary:         Libraries for the gEDA project
 
@@ -9,7 +9,7 @@
 License:         GPLv2
 URL:             http://www.geda.seul.org
 
-Source:          http://geda.seul.org/release/v1.4/%{realver}/%{name}-%{real_ver}.tar.gz
+Source:          http://geda.seul.org/release/v1.4/%{real_ver}/%{name}-%{real_ver}.tar.gz
 
 BuildRoot:       %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -62,8 +62,6 @@
 
 
 %{__install} -d %{buildroot}%{_docdir}/gEDA/
-#%{__install} -pm 0644 docs/*.html   %{buildroot}%{_docdir}/gEDA/
-#%{__install} -pm 0644 docs/logo.png %{buildroot}%{_docdir}/gEDA/
 
 
 # locale's
@@ -95,7 +93,6 @@
 
 # geda-symbols is the Owner of the following directories
 #%dir %{_docdir}/gEDA/readmes
-#%dir %{_docdir}/gEDA/man
 #%dir %{_docdir}/gEDA/examples
 #%dir %{_datadir}/gEDA/bitmap
 
@@ -129,6 +126,9 @@
 
 
 %Changelog
+* Wed Dec 31 2008 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20081231-1
+- new upstream release
+
 * Sun Dec 22 2008 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20081220-1
 - new upstream release
 - stripped off contents that upstream accepted from us.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libgeda/F-10/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	22 Dec 2008 21:43:52 -0000	1.14
+++ sources	8 Jan 2009 18:59:54 -0000	1.15
@@ -1 +1 @@
-e22e28cf3684efcf42f6591995fe943b  libgeda-1.4.2.tar.gz
+f4254f345b5d1a1f3ae4e2e27ae38b0a  libgeda-1.4.3.tar.gz



From limb at fedoraproject.org  Thu Jan  8 19:01:12 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Thu,  8 Jan 2009 19:01:12 +0000 (UTC)
Subject: rpms/nethack-vultures/devel nethack-vultures.spec,1.40,1.41
Message-ID: <20090108190112.D7A93700FD@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/nethack-vultures/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18156

Modified Files:
	nethack-vultures.spec 
Log Message:
Fix Requires(pre), BZ 475919.



Index: nethack-vultures.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nethack-vultures/devel/nethack-vultures.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- nethack-vultures.spec	11 Aug 2008 18:56:49 -0000	1.40
+++ nethack-vultures.spec	8 Jan 2009 19:00:42 -0000	1.41
@@ -1,6 +1,6 @@
 Name:           nethack-vultures
 Version:        2.1.0
-Release:        14%{?dist}
+Release:        15%{?dist}
 Summary:        NetHack - Vulture's Eye and Vulture's Claw
 
 Group:          Amusements/Games
@@ -26,7 +26,8 @@
 BuildRequires:  groff
 BuildRequires:  util-linux
 Requires:       /usr/bin/bzip2
-Requires(pre):  /usr/sbin/groupadd
+Requires(pre):  shadow-utils
+Requires(pre):  coreutils
 Obsoletes:      nethack-falconseye <= 1.9.4-6.a
 
 %define _default_patch_fuzz 2
@@ -183,6 +184,9 @@
 
 
 %changelog
+* Thu Jan 08 2009 Jon Ciesla <limb at jcomserv.net> - 2.1.0-15
+- Fix Requires(pre), BZ 475919.
+
 * Mon Aug 11 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 2.1.0-14
 - fix license tag
 



From heffer at fedoraproject.org  Thu Jan  8 19:01:14 2009
From: heffer at fedoraproject.org (Felix Kaechele)
Date: Thu,  8 Jan 2009 19:01:14 +0000 (UTC)
Subject: rpms/libsyncml/F-10 libsyncml.spec,1.7,1.8
Message-ID: <20090108190114.F01FB700FD@cvs1.fedora.phx.redhat.com>

Author: heffer

Update of /cvs/pkgs/rpms/libsyncml/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18241

Modified Files:
	libsyncml.spec 
Log Message:
* Thu Jan 08 2009 Felix Kaechele <felix at fetzig dot org> - 0.5.0-2
- added BuildRequires cmake



Index: libsyncml.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libsyncml/F-10/libsyncml.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- libsyncml.spec	8 Jan 2009 18:43:57 -0000	1.7
+++ libsyncml.spec	8 Jan 2009 19:00:44 -0000	1.8
@@ -1,6 +1,6 @@
 Name:		libsyncml
 Version:	0.5.0
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	SyncML protocol library
 
 Group:		System Environment/Libraries
@@ -10,8 +10,8 @@
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	wbxml2-devel >= 0.9.2
-BuildRequires:	libxml2-devel libsoup-devel
-BuildRequires:	openobex-devel bluez-libs-devel
+BuildRequires:  cmake, libxml2-devel, libsoup-devel, openobex-devel
+BuildRequires:  bluez-libs-devel
 
 %description
 %{summary}.
@@ -72,6 +72,9 @@
 
 
 %changelog
+* Thu Jan 08 2009 Felix Kaechele <felix at fetzig dot org> - 0.5.0-2
+- added BuildRequires cmake
+
 * Thu Jan 08 2009 Felix Kaechele <felix at fetzig dot org> - 0.5.0-1
 - upstream 0.5.0
 - buildsystem changed to cmake



From chitlesh at fedoraproject.org  Thu Jan  8 19:02:30 2009
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Thu,  8 Jan 2009 19:02:30 +0000 (UTC)
Subject: rpms/libgeda/devel .cvsignore, 1.14, 1.15 import.log, 1.2,
	1.3 libgeda.spec, 1.16, 1.17 sources, 1.14, 1.15
Message-ID: <20090108190230.0C09F700FD@cvs1.fedora.phx.redhat.com>

Author: chitlesh

Update of /cvs/pkgs/rpms/libgeda/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18515/devel

Modified Files:
	.cvsignore import.log libgeda.spec sources 
Log Message:
20081231


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libgeda/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	22 Dec 2008 21:48:42 -0000	1.14
+++ .cvsignore	8 Jan 2009 19:01:59 -0000	1.15
@@ -1 +1 @@
-libgeda-1.4.2.tar.gz
+libgeda-1.4.3.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/libgeda/devel/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	22 Dec 2008 21:48:42 -0000	1.2
+++ import.log	8 Jan 2009 19:01:59 -0000	1.3
@@ -1,2 +1,3 @@
 libgeda-20080929-1_fc9:HEAD:libgeda-20080929-1.fc9.src.rpm:1226427037
 libgeda-20081220-1_fc10:HEAD:libgeda-20081220-1.fc10.src.rpm:1229982434
+libgeda-20081231-1_fc10:HEAD:libgeda-20081231-1.fc10.src.rpm:1231441224


Index: libgeda.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libgeda/devel/libgeda.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- libgeda.spec	22 Dec 2008 21:48:42 -0000	1.16
+++ libgeda.spec	8 Jan 2009 19:01:59 -0000	1.17
@@ -1,7 +1,7 @@
-%define          real_ver   1.4.2
+%define          real_ver   1.4.3
 
 Name:            libgeda
-Version:         20081220
+Version:         20081231
 Release:         1%{?dist}
 Summary:         Libraries for the gEDA project
 
@@ -9,7 +9,7 @@
 License:         GPLv2
 URL:             http://www.geda.seul.org
 
-Source:          http://geda.seul.org/release/v1.4/%{realver}/%{name}-%{real_ver}.tar.gz
+Source:          http://geda.seul.org/release/v1.4/%{real_ver}/%{name}-%{real_ver}.tar.gz
 
 BuildRoot:       %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -62,8 +62,6 @@
 
 
 %{__install} -d %{buildroot}%{_docdir}/gEDA/
-#%{__install} -pm 0644 docs/*.html   %{buildroot}%{_docdir}/gEDA/
-#%{__install} -pm 0644 docs/logo.png %{buildroot}%{_docdir}/gEDA/
 
 
 # locale's
@@ -95,7 +93,6 @@
 
 # geda-symbols is the Owner of the following directories
 #%dir %{_docdir}/gEDA/readmes
-#%dir %{_docdir}/gEDA/man
 #%dir %{_docdir}/gEDA/examples
 #%dir %{_datadir}/gEDA/bitmap
 
@@ -129,6 +126,9 @@
 
 
 %Changelog
+* Wed Dec 31 2008 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20081231-1
+- new upstream release
+
 * Sun Dec 22 2008 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20081220-1
 - new upstream release
 - stripped off contents that upstream accepted from us.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libgeda/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	22 Dec 2008 21:48:42 -0000	1.14
+++ sources	8 Jan 2009 19:01:59 -0000	1.15
@@ -1 +1 @@
-e22e28cf3684efcf42f6591995fe943b  libgeda-1.4.2.tar.gz
+f4254f345b5d1a1f3ae4e2e27ae38b0a  libgeda-1.4.3.tar.gz



From arbiter at fedoraproject.org  Thu Jan  8 19:04:44 2009
From: arbiter at fedoraproject.org (Lorenzo Villani)
Date: Thu,  8 Jan 2009 19:04:44 +0000 (UTC)
Subject: rpms/kdepimlibs/devel kdepimlibs.spec,1.66,1.67
Message-ID: <20090108190444.8087E700FD@cvs1.fedora.phx.redhat.com>

Author: arbiter

Update of /cvs/pkgs/rpms/kdepimlibs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19046

Modified Files:
	kdepimlibs.spec 
Log Message:
- conditional: use a different path on systems with cmake < 2.6.3


Index: kdepimlibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdepimlibs/devel/kdepimlibs.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- kdepimlibs.spec	8 Jan 2009 13:12:11 -0000	1.66
+++ kdepimlibs.spec	8 Jan 2009 19:04:14 -0000	1.67
@@ -15,7 +15,7 @@
 
 Name: kdepimlibs
 Version: 4.1.96
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: K Desktop Environment 4 - PIM Libraries
 
 License: LGPLv2
@@ -161,7 +161,14 @@
 %{_kde4_appsdir}/cmake/modules/*
 %{_kde4_includedir}/*
 %{_kde4_libdir}/kde4/devel/lib*.so
+
+# CMake seems to change behaviour between F11's cmake (2.6.3rc5)
+# and F10's cmake (2.6.2) -- Lorenzo
+%if 0%{?fedora} > 10
 %{_kde4_libdir}/cmake/KdepimLibs*
+%else
+%{_kde4_libdir}/KdepimLibs*
+%endif
 %{_kde4_libdir}/gpgmepp/
 %endif
 
@@ -173,6 +180,10 @@
 
 
 %changelog
+* Thu Jan 08 2009 Lorenzo Villani <lvillani at binaryhelix.net> - 4.1.96-2
+- fix build on Fedora 10 (cmake < 2.6.3 seems to have a different
+  behaviour here)
+
 * Wed Jan 07 2009 Than Ngo <than at redhat.com> - 4.1.96-1
 - 4.2rc1
 



From chitlesh at fedoraproject.org  Thu Jan  8 19:07:57 2009
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Thu,  8 Jan 2009 19:07:57 +0000 (UTC)
Subject: rpms/geda-symbols/devel .cvsignore, 1.13, 1.14 geda-symbols.spec,
	1.14, 1.15 import.log, 1.2, 1.3 sources, 1.13, 1.14
Message-ID: <20090108190757.7BE7D700FD@cvs1.fedora.phx.redhat.com>

Author: chitlesh

Update of /cvs/pkgs/rpms/geda-symbols/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19415/devel

Modified Files:
	.cvsignore geda-symbols.spec import.log sources 
Log Message:
20081231


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/geda-symbols/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	22 Dec 2008 22:14:13 -0000	1.13
+++ .cvsignore	8 Jan 2009 19:07:27 -0000	1.14
@@ -1 +1 @@
-geda-symbols-1.4.2.tar.gz
+geda-symbols-1.4.3.tar.gz


Index: geda-symbols.spec
===================================================================
RCS file: /cvs/pkgs/rpms/geda-symbols/devel/geda-symbols.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- geda-symbols.spec	22 Dec 2008 22:14:13 -0000	1.14
+++ geda-symbols.spec	8 Jan 2009 19:07:27 -0000	1.15
@@ -1,7 +1,7 @@
-%define     real_ver 1.4.2
+%define     real_ver 1.4.3
 
 Name:       geda-symbols
-Version:    20081220
+Version:    20081231
 Release:    1%{?dist}
 Summary:    Electronic symbols for gEDA
 
@@ -9,7 +9,7 @@
 License:    GPLv2
 URL:        http://www.geda.seul.org
 
-Source:     http://geda.seul.org/release/v1.4/%{relver}/%{name}-%{real_ver}.tar.gz
+Source:     http://geda.seul.org/release/v1.4/%{real_ver}/%{name}-%{real_ver}.tar.gz
 
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:  noarch
@@ -71,6 +71,9 @@
 
 
 %Changelog
+* Wed Dec 31 2008 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20081231-1
+- new upstream release
+
 * Sun Dec 21 2008 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20081220-1
 - new upstream release
 - stripped off contents that upstream accepted from us.


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/geda-symbols/devel/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	22 Dec 2008 22:14:13 -0000	1.2
+++ import.log	8 Jan 2009 19:07:27 -0000	1.3
@@ -1,2 +1,3 @@
 geda-symbols-20080929-1_fc9:HEAD:geda-symbols-20080929-1.fc9.src.rpm:1226428013
 geda-symbols-20081220-1_fc10:HEAD:geda-symbols-20081220-1.fc10.src.rpm:1229984007
+geda-symbols-20081231-1_fc10:HEAD:geda-symbols-20081231-1.fc10.src.rpm:1231441567


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/geda-symbols/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	22 Dec 2008 22:14:13 -0000	1.13
+++ sources	8 Jan 2009 19:07:27 -0000	1.14
@@ -1 +1 @@
-c84ec8c400958108279a4d96161e01f0  geda-symbols-1.4.2.tar.gz
+e93f0c9747a66ce229702418b49e128f  geda-symbols-1.4.3.tar.gz



From kyle at fedoraproject.org  Thu Jan  8 19:08:10 2009
From: kyle at fedoraproject.org (Kyle McMartin)
Date: Thu,  8 Jan 2009 19:08:10 +0000 (UTC)
Subject: rpms/kernel/devel linux-2.6-at76.patch,1.12,1.13
Message-ID: <20090108190810.7674E700FD@cvs1.fedora.phx.redhat.com>

Author: kyle

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19448

Modified Files:
	linux-2.6-at76.patch 
Log Message:
more warn removal fallout

linux-2.6-at76.patch:

Index: linux-2.6-at76.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-at76.patch,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- linux-2.6-at76.patch	1 Aug 2008 15:43:56 -0000	1.12
+++ linux-2.6-at76.patch	8 Jan 2009 19:07:40 -0000	1.13
@@ -3951,7 +3951,7 @@
 +
 +	if (!priv)
 +		return;
-+	warn("%s: tx timeout.", netdev->name);
++	printk(KERN_WARNING "%s: tx timeout.\n", netdev->name);
 +
 +	usb_unlink_urb(priv->tx_urb);
 +	priv->stats.tx_errors++;



From limb at fedoraproject.org  Thu Jan  8 19:13:55 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Thu,  8 Jan 2009 19:13:55 +0000 (UTC)
Subject: rpms/nethack-vultures/F-10 nethack-vultures.spec,1.40,1.41
Message-ID: <20090108191355.504F9700FD@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/nethack-vultures/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20001

Modified Files:
	nethack-vultures.spec 
Log Message:
Fix Requires(pre), BZ 475919.



Index: nethack-vultures.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nethack-vultures/F-10/nethack-vultures.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- nethack-vultures.spec	11 Aug 2008 18:56:49 -0000	1.40
+++ nethack-vultures.spec	8 Jan 2009 19:13:25 -0000	1.41
@@ -1,6 +1,6 @@
 Name:           nethack-vultures
 Version:        2.1.0
-Release:        14%{?dist}
+Release:        15%{?dist}
 Summary:        NetHack - Vulture's Eye and Vulture's Claw
 
 Group:          Amusements/Games
@@ -26,7 +26,8 @@
 BuildRequires:  groff
 BuildRequires:  util-linux
 Requires:       /usr/bin/bzip2
-Requires(pre):  /usr/sbin/groupadd
+Requires(pre):  shadow-utils
+Requires(pre):  coreutils
 Obsoletes:      nethack-falconseye <= 1.9.4-6.a
 
 %define _default_patch_fuzz 2
@@ -183,6 +184,9 @@
 
 
 %changelog
+* Thu Jan 08 2009 Jon Ciesla <limb at jcomserv.net> - 2.1.0-15
+- Fix Requires(pre), BZ 475919.
+
 * Mon Aug 11 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 2.1.0-14
 - fix license tag
 



From chitlesh at fedoraproject.org  Thu Jan  8 19:13:51 2009
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Thu,  8 Jan 2009 19:13:51 +0000 (UTC)
Subject: rpms/geda-symbols/F-9 .cvsignore, 1.13, 1.14 geda-symbols.spec, 1.14,
	1.15 import.log, 1.2, 1.3 sources, 1.13, 1.14
Message-ID: <20090108191351.96F0C700FD@cvs1.fedora.phx.redhat.com>

Author: chitlesh

Update of /cvs/pkgs/rpms/geda-symbols/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20732/F-9

Modified Files:
	.cvsignore geda-symbols.spec import.log sources 
Log Message:
20081231


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/geda-symbols/F-9/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	22 Dec 2008 22:06:39 -0000	1.13
+++ .cvsignore	8 Jan 2009 19:13:21 -0000	1.14
@@ -1 +1 @@
-geda-symbols-1.4.2.tar.gz
+geda-symbols-1.4.3.tar.gz


Index: geda-symbols.spec
===================================================================
RCS file: /cvs/pkgs/rpms/geda-symbols/F-9/geda-symbols.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- geda-symbols.spec	22 Dec 2008 22:06:39 -0000	1.14
+++ geda-symbols.spec	8 Jan 2009 19:13:21 -0000	1.15
@@ -1,7 +1,7 @@
-%define     real_ver 1.4.2
+%define     real_ver 1.4.3
 
 Name:       geda-symbols
-Version:    20081220
+Version:    20081231
 Release:    1%{?dist}
 Summary:    Electronic symbols for gEDA
 
@@ -9,7 +9,7 @@
 License:    GPLv2
 URL:        http://www.geda.seul.org
 
-Source:     http://geda.seul.org/release/v1.4/%{relver}/%{name}-%{real_ver}.tar.gz
+Source:     http://geda.seul.org/release/v1.4/%{real_ver}/%{name}-%{real_ver}.tar.gz
 
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:  noarch
@@ -71,6 +71,9 @@
 
 
 %Changelog
+* Wed Dec 31 2008 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20081231-1
+- new upstream release
+
 * Sun Dec 21 2008 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20081220-1
 - new upstream release
 - stripped off contents that upstream accepted from us.


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/geda-symbols/F-9/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	22 Dec 2008 22:06:39 -0000	1.2
+++ import.log	8 Jan 2009 19:13:21 -0000	1.3
@@ -1,2 +1,3 @@
 geda-symbols-20080929-1_fc9:F-9:geda-symbols-20080929-1.fc9.src.rpm:1226442981
 geda-symbols-20081220-1_fc10:F-9:geda-symbols-20081220-1.fc10.src.rpm:1229983392
+geda-symbols-20081231-1_fc10:F-9:geda-symbols-20081231-1.fc10.src.rpm:1231441887


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/geda-symbols/F-9/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	22 Dec 2008 22:06:39 -0000	1.13
+++ sources	8 Jan 2009 19:13:21 -0000	1.14
@@ -1 +1 @@
-c84ec8c400958108279a4d96161e01f0  geda-symbols-1.4.2.tar.gz
+e93f0c9747a66ce229702418b49e128f  geda-symbols-1.4.3.tar.gz



From terjeros at fedoraproject.org  Thu Jan  8 19:14:48 2009
From: terjeros at fedoraproject.org (=?utf-8?q?Terje_R=C3=B8sten?=)
Date: Thu,  8 Jan 2009 19:14:48 +0000 (UTC)
Subject: rpms/e16-epplets/devel .cvsignore, 1.2, 1.3 e16-epplets.spec, 1.3, 
	1.4 sources, 1.2, 1.3
Message-ID: <20090108191448.25529700FD@cvs1.fedora.phx.redhat.com>

Author: terjeros

Update of /cvs/extras/rpms/e16-epplets/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20882

Modified Files:
	.cvsignore e16-epplets.spec sources 
Log Message:
* Thu Jan  8 2009 Terje Rosten <terjeros at phys.ntnu.no> - 0.12-1
- 0.12



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/e16-epplets/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	16 Apr 2008 16:49:25 -0000	1.2
+++ .cvsignore	8 Jan 2009 19:14:17 -0000	1.3
@@ -1 +1 @@
-epplets-0.10.tar.gz
+epplets-0.12.tar.gz


Index: e16-epplets.spec
===================================================================
RCS file: /cvs/extras/rpms/e16-epplets/devel/e16-epplets.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- e16-epplets.spec	27 Dec 2008 13:01:52 -0000	1.3
+++ e16-epplets.spec	8 Jan 2009 19:14:17 -0000	1.4
@@ -2,15 +2,16 @@
 
 Summary:          Epplets for Enlightenment, DR16
 Name:             e16-epplets
-Version:          0.10
-Release:          4%{?dist}
+Version:          0.12
+Release:          1%{?dist}
 License:          MIT with advertising and GPL+ and GPLv2+
 Group:            User Interface/Desktops
 URL:              http://www.enlightenment.org/
 Source:           http://downloads.sourceforge.net/enlightenment/%{oname}-%{version}.tar.gz
-BuildRequires:    imlib2-devel autoconf automake libtool 
-BuildRequires:    mesa-libGLU-devel freeglut-devel
+BuildRequires:    imlib2-devel mesa-libGLU-devel freeglut-devel 
 Requires:         e16 >= 0.16.8
+Requires(postun): /sbin/ldconfig
+Requires(post):   /sbin/ldconfig
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -33,8 +34,7 @@
 %setup -q -n %{oname}-%{version}
 
 %build
-%{__sed} -i -e 's/-rpath $(libdir):$(pkglibdir)//' epplets/Makefile.am
-./autogen.sh
+%{__sed} -i -e 's/-rpath $(libdir)//' epplets/Makefile.in
 %configure
 %{__make} %{?_smp_mflags}
 
@@ -43,11 +43,7 @@
 %{__make} install DESTDIR=%{buildroot}
 %{__install} -d %{buildroot}%{_sysconfdir}/ld.so.conf.d
 echo "%{_libdir}/%{oname}" > %{buildroot}%{_sysconfdir}/ld.so.conf.d/%{oname}-%{_arch}.conf
-%{__rm} -f %{buildroot}%{_libdir}/libepplet.{a,la}
-
-# Use dejavu fonts
-%{__rm} -f %{buildroot}%{_datadir}/e16/epplet_data/aircut3.ttf
-%{__ln_s} ../../fonts/dejavu/DejaVuSans.ttf %{buildroot}%{_datadir}/e16/epplet_data/aircut3.ttf
+%{__rm} -f %{buildroot}%{_libdir}/libepplet{,_glx}.{a,la}
 
 %clean
 %{__rm} -rf %{buildroot}
@@ -59,6 +55,7 @@
 %defattr(-, root, root, -)
 %doc ChangeLog 
 %{_libdir}/libepplet.so.*
+%{_libdir}/libepplet_glx.so.*
 %{_bindir}/E*.epplet
 %{_datadir}/e16/epplet_icons
 %{_datadir}/e16/epplet_data
@@ -68,8 +65,12 @@
 %defattr(-, root, root, -)
 %{_includedir}/epplet.h
 %{_libdir}/libepplet.so
+%{_libdir}/libepplet_glx.so
 
 %changelog
+* Thu Jan  8 2009 Terje Rosten <terjeros at phys.ntnu.no> - 0.12-1
+- 0.12
+
 * Sat Dec 27 2008 Terje Rosten <terjeros at phys.ntnu.no> - 0.10-4
 - Use Dejavu fonts
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/e16-epplets/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	16 Apr 2008 16:49:25 -0000	1.2
+++ sources	8 Jan 2009 19:14:17 -0000	1.3
@@ -1 +1 @@
-19f881141e18a4f4402af16738ee5ae7  epplets-0.10.tar.gz
+7f5119eeac9b938e6d64b972e4b9d984  epplets-0.12.tar.gz



From chitlesh at fedoraproject.org  Thu Jan  8 19:17:09 2009
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Thu,  8 Jan 2009 19:17:09 +0000 (UTC)
Subject: rpms/geda-symbols/F-10 .cvsignore, 1.13, 1.14 geda-symbols.spec,
	1.14, 1.15 import.log, 1.2, 1.3 sources, 1.13, 1.14
Message-ID: <20090108191709.8D987700FD@cvs1.fedora.phx.redhat.com>

Author: chitlesh

Update of /cvs/pkgs/rpms/geda-symbols/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21221/F-10

Modified Files:
	.cvsignore geda-symbols.spec import.log sources 
Log Message:
20081231


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/geda-symbols/F-10/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	22 Dec 2008 22:08:23 -0000	1.13
+++ .cvsignore	8 Jan 2009 19:16:38 -0000	1.14
@@ -1 +1 @@
-geda-symbols-1.4.2.tar.gz
+geda-symbols-1.4.3.tar.gz


Index: geda-symbols.spec
===================================================================
RCS file: /cvs/pkgs/rpms/geda-symbols/F-10/geda-symbols.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- geda-symbols.spec	22 Dec 2008 22:08:23 -0000	1.14
+++ geda-symbols.spec	8 Jan 2009 19:16:39 -0000	1.15
@@ -1,7 +1,7 @@
-%define     real_ver 1.4.2
+%define     real_ver 1.4.3
 
 Name:       geda-symbols
-Version:    20081220
+Version:    20081231
 Release:    1%{?dist}
 Summary:    Electronic symbols for gEDA
 
@@ -9,7 +9,7 @@
 License:    GPLv2
 URL:        http://www.geda.seul.org
 
-Source:     http://geda.seul.org/release/v1.4/%{relver}/%{name}-%{real_ver}.tar.gz
+Source:     http://geda.seul.org/release/v1.4/%{real_ver}/%{name}-%{real_ver}.tar.gz
 
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:  noarch
@@ -71,6 +71,9 @@
 
 
 %Changelog
+* Wed Dec 31 2008 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20081231-1
+- new upstream release
+
 * Sun Dec 21 2008 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20081220-1
 - new upstream release
 - stripped off contents that upstream accepted from us.


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/geda-symbols/F-10/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	22 Dec 2008 22:08:23 -0000	1.2
+++ import.log	8 Jan 2009 19:16:39 -0000	1.3
@@ -1,2 +1,3 @@
 geda-symbols-20080929-1_fc9:F-10:geda-symbols-20080929-1.fc9.src.rpm:1226443076
 geda-symbols-20081220-1_fc10:F-10:geda-symbols-20081220-1.fc10.src.rpm:1229983659
+geda-symbols-20081231-1_fc10:F-10:geda-symbols-20081231-1.fc10.src.rpm:1231442049


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/geda-symbols/F-10/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	22 Dec 2008 22:08:23 -0000	1.13
+++ sources	8 Jan 2009 19:16:39 -0000	1.14
@@ -1 +1 @@
-c84ec8c400958108279a4d96161e01f0  geda-symbols-1.4.2.tar.gz
+e93f0c9747a66ce229702418b49e128f  geda-symbols-1.4.3.tar.gz



From chitlesh at fedoraproject.org  Thu Jan  8 19:20:03 2009
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Thu,  8 Jan 2009 19:20:03 +0000 (UTC)
Subject: rpms/geda-utils/F-10 .cvsignore, 1.12, 1.13 geda-utils.spec, 1.14, 
	1.15 import.log, 1.2, 1.3 sources, 1.12, 1.13
Message-ID: <20090108192004.0CBFE700FD@cvs1.fedora.phx.redhat.com>

Author: chitlesh

Update of /cvs/pkgs/rpms/geda-utils/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21545/F-10

Modified Files:
	.cvsignore geda-utils.spec import.log sources 
Log Message:
20081231


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/geda-utils/F-10/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	22 Dec 2008 22:47:31 -0000	1.12
+++ .cvsignore	8 Jan 2009 19:19:33 -0000	1.13
@@ -1 +1 @@
-geda-utils-1.4.2.tar.gz
+geda-utils-1.4.3.tar.gz


Index: geda-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/geda-utils/F-10/geda-utils.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- geda-utils.spec	22 Dec 2008 22:47:31 -0000	1.14
+++ geda-utils.spec	8 Jan 2009 19:19:33 -0000	1.15
@@ -1,7 +1,7 @@
-%define         real_ver   1.4.2
+%define         real_ver   1.4.3
 
 Name:           geda-utils
-Version:        20081220
+Version:        20081231
 Release:        1%{?dist}
 
 Summary:        Several utilities for the gEDA project
@@ -78,6 +78,9 @@
 %{_docdir}/gEDA/readmes/README*
 
 %Changelog
+* Wed Dec 31 2008 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20081231-1
+- new upstream release
+
 * Sun Dec 21 2008 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20081220-1
 - new upstream release
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/geda-utils/F-10/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	22 Dec 2008 22:47:31 -0000	1.2
+++ import.log	8 Jan 2009 19:19:33 -0000	1.3
@@ -1,2 +1,3 @@
 geda-utils-20080929-1_fc9:F-10:geda-utils-20080929-1.fc9.src.rpm:1226445023
 geda-utils-20081220-1_fc10:F-10:geda-utils-20081220-1.fc10.src.rpm:1229985777
+geda-utils-20081231-1_fc10:F-10:geda-utils-20081231-1.fc10.src.rpm:1231442268


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/geda-utils/F-10/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	22 Dec 2008 22:47:31 -0000	1.12
+++ sources	8 Jan 2009 19:19:33 -0000	1.13
@@ -1 +1 @@
-641db62f76de101ced936b7c1a9c8dda  geda-utils-1.4.2.tar.gz
+55ab23cad7aee2e65fcc742c424e68d4  geda-utils-1.4.3.tar.gz



From ajax at fedoraproject.org  Thu Jan  8 19:20:30 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Thu,  8 Jan 2009 19:20:30 +0000 (UTC)
Subject: rpms/xorg-x11-server/F-10 xserver-1.5.0-hide-cursor.patch,1.2,1.3
Message-ID: <20090108192030.6239D700FD@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-server/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21715

Modified Files:
	xserver-1.5.0-hide-cursor.patch 
Log Message:
argh scoping

xserver-1.5.0-hide-cursor.patch:

Index: xserver-1.5.0-hide-cursor.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/F-10/xserver-1.5.0-hide-cursor.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xserver-1.5.0-hide-cursor.patch	22 Dec 2008 18:40:09 -0000	1.2
+++ xserver-1.5.0-hide-cursor.patch	8 Jan 2009 19:20:30 -0000	1.3
@@ -11,7 +11,7 @@
 index d51251f..26a5d61 100755
 --- a/xfixes/cursor.c
 +++ b/xfixes/cursor.c
-@@ -70,7 +70,7 @@ static void deleteCursorHideCountsForScreen (ScreenPtr pScreen);
+@@ -70,7 +70,7 @@
  	return BadCursor; \
      } \
  }
@@ -20,17 +20,18 @@
  /*
   * There is a global list of windows selecting for cursor events
   */
-@@ -119,6 +119,9 @@ typedef struct _CursorScreen {
+@@ -119,6 +119,10 @@
  #define Wrap(as,s,elt,func)	(((as)->elt = (s)->elt), (s)->elt = func)
  #define Unwrap(as,s,elt)	((s)->elt = (as)->elt)
  
 +/* The cursor doesn't show up until the first XDefineCursor() */
++extern void *ConnectionInfo;
 +static Bool CursorVisible = FALSE;
 +
  static Bool
  CursorDisplayCursor (ScreenPtr pScreen,
  		     CursorPtr pCursor)
-@@ -128,7 +131,14 @@ CursorDisplayCursor (ScreenPtr pScreen,
+@@ -128,7 +132,14 @@
  
      Unwrap (cs, pScreen, DisplayCursor);
  



From heffer at fedoraproject.org  Thu Jan  8 19:23:00 2009
From: heffer at fedoraproject.org (Felix Kaechele)
Date: Thu,  8 Jan 2009 19:23:00 +0000 (UTC)
Subject: rpms/libsyncml/devel .cvsignore, 1.5, 1.6 libsyncml.spec, 1.6,
	1.7 sources, 1.5, 1.6
Message-ID: <20090108192300.D2863700FD@cvs1.fedora.phx.redhat.com>

Author: heffer

Update of /cvs/pkgs/rpms/libsyncml/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22037

Modified Files:
	.cvsignore libsyncml.spec sources 
Log Message:
* Thu Jan 08 2009 Felix Kaechele <felix at fetzig dot org> - 0.5.0-1
- upstream 0.5.0
- buildsystem changed to cmake



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libsyncml/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	21 Oct 2007 22:38:01 -0000	1.5
+++ .cvsignore	8 Jan 2009 19:22:30 -0000	1.6
@@ -1 +1 @@
-libsyncml-0.4.5.tar.bz2
+libsyncml-0.5.0.tar.bz2


Index: libsyncml.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libsyncml/devel/libsyncml.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- libsyncml.spec	11 Sep 2008 14:20:33 -0000	1.6
+++ libsyncml.spec	8 Jan 2009 19:22:30 -0000	1.7
@@ -1,6 +1,6 @@
 Name:		libsyncml
-Version:	0.4.5
-Release:	3%{?dist}
+Version:	0.5.0
+Release:	1%{?dist}
 Summary:	SyncML protocol library
 
 Group:		System Environment/Libraries
@@ -10,8 +10,8 @@
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	wbxml2-devel >= 0.9.2
-BuildRequires:	libxml2-devel libsoup-devel
-BuildRequires:	openobex-devel bluez-libs-devel
+BuildRequires:  cmake, libxml2-devel, libsoup-devel, openobex-devel
+BuildRequires:  bluez-libs-devel
 
 %description
 %{summary}.
@@ -29,23 +29,19 @@
 %prep
 %setup -q
 
-# Fix some permissions
-chmod a-x libsyncml/syncml.h \
-          libsyncml/syncml_internals.h
 
 %build
-%configure --disable-static
-
-# Disable rpath.
-sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
-sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
-
-make %{?_smp_mflags}
-
+mkdir -p %{_target_platform}
+cd %{_target_platform}
+%cmake ..
+make VERBOSE=1 %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
+
+pushd %{_target_platform}
 make install DESTDIR=$RPM_BUILD_ROOT
+popd
 
 
 %clean
@@ -63,24 +59,23 @@
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING README
-%{_bindir}/syncml-http-server
-%{_bindir}/syncml-http-client
-%{_bindir}/syncml-obex-client
-%{_libdir}/libsyncml.so.0*
-%{_mandir}/man1/syncml-http-server.1.gz
-%{_mandir}/man1/syncml-obex-client.1.gz
+%doc AUTHORS COPYING INSTALL LICENSE README
+%{_bindir}/syncml-ds-tool
+%{_libdir}/libsyncml.so.*
 
 %files devel
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING README
+%doc AUTHORS CODING COPYING INSTALL LICENSE README RELEASE
 %{_includedir}/libsyncml-1.0/
 %{_libdir}/libsyncml.so
-%exclude %{_libdir}/libsyncml.la
 %{_libdir}/pkgconfig/libsyncml-1.0.pc
 
 
 %changelog
+* Thu Jan 08 2009 Felix Kaechele <felix at fetzig dot org> - 0.5.0-1
+- upstream 0.5.0
+- buildsystem changed to cmake
+
 * Thu Sep 11 2008 - Bastien Nocera <bnocera at redhat.com> - 0.4.5-3
 - Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libsyncml/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	21 Oct 2007 22:38:01 -0000	1.5
+++ sources	8 Jan 2009 19:22:30 -0000	1.6
@@ -1 +1 @@
-90f4285cf04b70d92fdbe4fece148385  libsyncml-0.4.5.tar.bz2
+284660f3ec85d711d097e542d84e5a5c  libsyncml-0.5.0.tar.bz2



From heffer at fedoraproject.org  Thu Jan  8 19:27:52 2009
From: heffer at fedoraproject.org (Felix Kaechele)
Date: Thu,  8 Jan 2009 19:27:52 +0000 (UTC)
Subject: rpms/libsyncml/F-9 .cvsignore, 1.5, 1.6 libsyncml.spec, 1.5,
	1.6 sources, 1.5, 1.6
Message-ID: <20090108192752.8F28F700FD@cvs1.fedora.phx.redhat.com>

Author: heffer

Update of /cvs/pkgs/rpms/libsyncml/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22539

Modified Files:
	.cvsignore libsyncml.spec sources 
Log Message:
* Thu Jan 08 2009 Felix Kaechele <felix at fetzig dot org> - 0.5.0-1
- upstream 0.5.0
- buildsystem changed to cmake



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libsyncml/F-9/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	21 Oct 2007 22:38:01 -0000	1.5
+++ .cvsignore	8 Jan 2009 19:27:22 -0000	1.6
@@ -1 +1 @@
-libsyncml-0.4.5.tar.bz2
+libsyncml-0.5.0.tar.bz2


Index: libsyncml.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libsyncml/F-9/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	8 Jan 2009 19:27:22 -0000	1.6
@@ -1,6 +1,6 @@
 Name:		libsyncml
-Version:	0.4.5
-Release:	2%{?dist}
+Version:	0.5.0
+Release:	1%{?dist}
 Summary:	SyncML protocol library
 
 Group:		System Environment/Libraries
@@ -10,8 +10,8 @@
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	wbxml2-devel >= 0.9.2
-BuildRequires:	libxml2-devel libsoup-devel
-BuildRequires:	openobex-devel bluez-libs-devel
+BuildRequires:  cmake, libxml2-devel, libsoup-devel, openobex-devel
+BuildRequires:  bluez-libs-devel
 
 %description
 %{summary}.
@@ -29,23 +29,19 @@
 %prep
 %setup -q
 
-# Fix some permissions
-chmod a-x libsyncml/syncml.h \
-          libsyncml/syncml_internals.h
 
 %build
-%configure --disable-static
-
-# Disable rpath.
-sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
-sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
-
-make %{?_smp_mflags}
-
+mkdir -p %{_target_platform}
+cd %{_target_platform}
+%cmake ..
+make VERBOSE=1 %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
+
+pushd %{_target_platform}
 make install DESTDIR=$RPM_BUILD_ROOT
+popd
 
 
 %clean
@@ -63,24 +59,26 @@
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING README
-%{_bindir}/syncml-http-server
-%{_bindir}/syncml-http-client
-%{_bindir}/syncml-obex-client
-%{_libdir}/libsyncml.so.0*
-%{_mandir}/man1/syncml-http-server.1.gz
-%{_mandir}/man1/syncml-obex-client.1.gz
+%doc AUTHORS COPYING INSTALL LICENSE README
+%{_bindir}/syncml-ds-tool
+%{_libdir}/libsyncml.so.*
 
 %files devel
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING README
+%doc AUTHORS CODING COPYING INSTALL LICENSE README RELEASE
 %{_includedir}/libsyncml-1.0/
 %{_libdir}/libsyncml.so
-%exclude %{_libdir}/libsyncml.la
 %{_libdir}/pkgconfig/libsyncml-1.0.pc
 
 
 %changelog
+* Thu Jan 08 2009 Felix Kaechele <felix at fetzig dot org> - 0.5.0-1
+- upstream 0.5.0
+- buildsystem changed to cmake
+
+* 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
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libsyncml/F-9/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	21 Oct 2007 22:38:01 -0000	1.5
+++ sources	8 Jan 2009 19:27:22 -0000	1.6
@@ -1 +1 @@
-90f4285cf04b70d92fdbe4fece148385  libsyncml-0.4.5.tar.bz2
+284660f3ec85d711d097e542d84e5a5c  libsyncml-0.5.0.tar.bz2



From chitlesh at fedoraproject.org  Thu Jan  8 19:31:44 2009
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Thu,  8 Jan 2009 19:31:44 +0000 (UTC)
Subject: rpms/geda-utils/F-9 .cvsignore, 1.12, 1.13 geda-utils.spec, 1.14,
	1.15 import.log, 1.2, 1.3 sources, 1.12, 1.13
Message-ID: <20090108193144.C9106700FD@cvs1.fedora.phx.redhat.com>

Author: chitlesh

Update of /cvs/pkgs/rpms/geda-utils/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22993/F-9

Modified Files:
	.cvsignore geda-utils.spec import.log sources 
Log Message:
20081231


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/geda-utils/F-9/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	22 Dec 2008 22:40:50 -0000	1.12
+++ .cvsignore	8 Jan 2009 19:31:14 -0000	1.13
@@ -1 +1 @@
-geda-utils-1.4.2.tar.gz
+geda-utils-1.4.3.tar.gz


Index: geda-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/geda-utils/F-9/geda-utils.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- geda-utils.spec	22 Dec 2008 22:40:50 -0000	1.14
+++ geda-utils.spec	8 Jan 2009 19:31:14 -0000	1.15
@@ -1,7 +1,7 @@
-%define         real_ver   1.4.2
+%define         real_ver   1.4.3
 
 Name:           geda-utils
-Version:        20081220
+Version:        20081231
 Release:        1%{?dist}
 
 Summary:        Several utilities for the gEDA project
@@ -78,6 +78,9 @@
 %{_docdir}/gEDA/readmes/README*
 
 %Changelog
+* Wed Dec 31 2008 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20081231-1
+- new upstream release
+
 * Sun Dec 21 2008 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20081220-1
 - new upstream release
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/geda-utils/F-9/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	22 Dec 2008 22:40:50 -0000	1.2
+++ import.log	8 Jan 2009 19:31:14 -0000	1.3
@@ -1,2 +1,3 @@
 geda-utils-20080929-1_fc9:F-9:geda-utils-20080929-1.fc9.src.rpm:1226444862
 geda-utils-20081220-1_fc10:F-9:geda-utils-20081220-1.fc10.src.rpm:1229985414
+geda-utils-20081231-1_fc10:F-9:geda-utils-20081231-1.fc10.src.rpm:1231442997


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/geda-utils/F-9/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	22 Dec 2008 22:40:50 -0000	1.12
+++ sources	8 Jan 2009 19:31:14 -0000	1.13
@@ -1 +1 @@
-641db62f76de101ced936b7c1a9c8dda  geda-utils-1.4.2.tar.gz
+55ab23cad7aee2e65fcc742c424e68d4  geda-utils-1.4.3.tar.gz



From chitlesh at fedoraproject.org  Thu Jan  8 19:37:06 2009
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Thu,  8 Jan 2009 19:37:06 +0000 (UTC)
Subject: rpms/geda-utils/devel .cvsignore, 1.12, 1.13 geda-utils.spec, 1.14, 
	1.15 import.log, 1.2, 1.3 sources, 1.12, 1.13
Message-ID: <20090108193707.04820700FD@cvs1.fedora.phx.redhat.com>

Author: chitlesh

Update of /cvs/pkgs/rpms/geda-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23540/devel

Modified Files:
	.cvsignore geda-utils.spec import.log sources 
Log Message:
20081231


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/geda-utils/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	22 Dec 2008 22:50:21 -0000	1.12
+++ .cvsignore	8 Jan 2009 19:36:36 -0000	1.13
@@ -1 +1 @@
-geda-utils-1.4.2.tar.gz
+geda-utils-1.4.3.tar.gz


Index: geda-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/geda-utils/devel/geda-utils.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- geda-utils.spec	22 Dec 2008 22:50:21 -0000	1.14
+++ geda-utils.spec	8 Jan 2009 19:36:36 -0000	1.15
@@ -1,7 +1,7 @@
-%define         real_ver   1.4.2
+%define         real_ver   1.4.3
 
 Name:           geda-utils
-Version:        20081220
+Version:        20081231
 Release:        1%{?dist}
 
 Summary:        Several utilities for the gEDA project
@@ -78,6 +78,9 @@
 %{_docdir}/gEDA/readmes/README*
 
 %Changelog
+* Wed Dec 31 2008 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20081231-1
+- new upstream release
+
 * Sun Dec 21 2008 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20081220-1
 - new upstream release
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/geda-utils/devel/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	22 Dec 2008 22:50:21 -0000	1.2
+++ import.log	8 Jan 2009 19:36:36 -0000	1.3
@@ -1,2 +1,3 @@
 geda-utils-20080929-1_fc9:HEAD:geda-utils-20080929-1.fc9.src.rpm:1226435222
 geda-utils-20081220-1_fc10:HEAD:geda-utils-20081220-1.fc10.src.rpm:1229986129
+geda-utils-20081231-1_fc10:HEAD:geda-utils-20081231-1.fc10.src.rpm:1231443234


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/geda-utils/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	22 Dec 2008 22:50:21 -0000	1.12
+++ sources	8 Jan 2009 19:36:36 -0000	1.13
@@ -1 +1 @@
-641db62f76de101ced936b7c1a9c8dda  geda-utils-1.4.2.tar.gz
+55ab23cad7aee2e65fcc742c424e68d4  geda-utils-1.4.3.tar.gz



From mbarnes at fedoraproject.org  Thu Jan  8 19:54:23 2009
From: mbarnes at fedoraproject.org (Matthew Barnes)
Date: Thu,  8 Jan 2009 19:54:23 +0000 (UTC)
Subject: rpms/gnome-pilot-conduits/devel gnome-pilot-conduits.spec, 1.32,
	1.33
Message-ID: <20090108195423.10DD1700FD@cvs1.fedora.phx.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/gnome-pilot-conduits/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25103

Modified Files:
	gnome-pilot-conduits.spec 
Log Message:
Adjust deps.



Index: gnome-pilot-conduits.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-pilot-conduits/devel/gnome-pilot-conduits.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- gnome-pilot-conduits.spec	8 Jan 2009 18:58:12 -0000	1.32
+++ gnome-pilot-conduits.spec	8 Jan 2009 19:53:52 -0000	1.33
@@ -1,4 +1,4 @@
-%define gnome_pilot_version 2.0.16
+%define gnome_pilot_version 2.0.17
 
 ### Abstract ###
 
@@ -71,6 +71,7 @@
 %changelog
 * Thu Jan 08 2009 Matthew Barnes <mbarnes at redhat.com> - 2.0.17-1
 - Update to 2.0.17
+- Bump gnome_pilot_version to 2.0.17.
 
 * Wed Jul 23 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 2.0.16-2
 - fix license tag



From kyle at fedoraproject.org  Thu Jan  8 20:00:39 2009
From: kyle at fedoraproject.org (Kyle McMartin)
Date: Thu,  8 Jan 2009 20:00:39 +0000 (UTC)
Subject: rpms/kernel/devel revert-strip-bustication.patch, NONE,
	1.1 kernel.spec, 1.1200, 1.1201
Message-ID: <20090108200039.37479700FD@cvs1.fedora.phx.redhat.com>

Author: kyle

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25727

Modified Files:
	kernel.spec 
Added Files:
	revert-strip-bustication.patch 
Log Message:
* Thu Jan 08 2009 Kyle McMartin <kyle at redhat.com>
- Fixup build failures due to warn/info macro removal.
- Revert patch which caused modules to bloat to 1GB of
  (mostly) zeroes.


revert-strip-bustication.patch:

--- NEW FILE revert-strip-bustication.patch ---
diff --git a/Makefile b/Makefile
index 2833128..3e92ceb 100644
--- a/Makefile
+++ b/Makefile
@@ -606,25 +606,20 @@ export	INSTALL_PATH ?= /boot
 MODLIB	= $(INSTALL_MOD_PATH)/lib/modules/$(KERNELRELEASE)
 export MODLIB
 
-strip-symbols := $(srctree)/scripts/strip-symbols \
-		 $(wildcard $(srctree)/arch/$(ARCH)/scripts/strip-symbols)
-
 #
-# INSTALL_MOD_STRIP, if defined, will cause modules to be stripped while
-# they get installed.  If INSTALL_MOD_STRIP is '1', then the default
-# options (see below) will be used.  Otherwise, INSTALL_MOD_STRIP will
-# be used as the option(s) to the objcopy command.
+#  INSTALL_MOD_STRIP, if defined, will cause modules to be
+#  stripped after they are installed.  If INSTALL_MOD_STRIP is '1', then
+#  the default option --strip-debug will be used.  Otherwise,
+#  INSTALL_MOD_STRIP will used as the options to the strip command.
+
 ifdef INSTALL_MOD_STRIP
 ifeq ($(INSTALL_MOD_STRIP),1)
-mod_strip_cmd = $(OBJCOPY) --strip-debug
-ifeq ($(CONFIG_KALLSYMS_ALL),$(CONFIG_KALLSYMS_STRIP_GENERATED))
-mod_strip_cmd += --wildcard $(addprefix --strip-symbols ,$(strip-symbols))
-endif
+mod_strip_cmd = $(STRIP) --strip-debug
 else
-mod_strip_cmd = $(OBJCOPY) $(INSTALL_MOD_STRIP)
+mod_strip_cmd = $(STRIP) $(INSTALL_MOD_STRIP)
 endif # INSTALL_MOD_STRIP=1
 else
-mod_strip_cmd = false
+mod_strip_cmd = true
 endif # INSTALL_MOD_STRIP
 export mod_strip_cmd
 
@@ -754,7 +749,6 @@ last_kallsyms := 2
 endif
 
 kallsyms.o := .tmp_kallsyms$(last_kallsyms).o
-kallsyms.h := $(wildcard include/config/kallsyms/*.h) $(wildcard include/config/kallsyms/*/*.h)
 
 define verify_kallsyms
 	$(Q)$(if $($(quiet)cmd_sysmap),                                      \
@@ -779,41 +773,24 @@ endef
 
 # Generate .S file with all kernel symbols
 quiet_cmd_kallsyms = KSYM    $@
-      cmd_kallsyms = { test $* -eq 0 || $(NM) -n $<; } \
-		     | $(KALLSYMS) $(if $(CONFIG_KALLSYMS_ALL),--all-symbols) >$@
-
-quiet_cmd_kstrip = STRIP   $@
-      cmd_kstrip = $(OBJCOPY) --wildcard $(addprefix --strip$(if $(CONFIG_RELOCATABLE),-unneeded)-symbols ,$(filter %/scripts/strip-symbols,$^)) $< $@
+      cmd_kallsyms = $(NM) -n $< | $(KALLSYMS) \
+                     $(if $(CONFIG_KALLSYMS_ALL),--all-symbols) > $@
 
-$(foreach n,0 1 2 3,.tmp_kallsyms$(n).o): KBUILD_AFLAGS += -Wa,--strip-local-absolute
-$(foreach n,0 1 2 3,.tmp_kallsyms$(n).o): %.o: %.S scripts FORCE
+.tmp_kallsyms1.o .tmp_kallsyms2.o .tmp_kallsyms3.o: %.o: %.S scripts FORCE
 	$(call if_changed_dep,as_o_S)
 
-ifeq ($(CONFIG_KALLSYMS_STRIP_GENERATED),y)
-strip-ext := .stripped
-endif
-
-.tmp_kallsyms%.S: .tmp_vmlinux%$(strip-ext) $(KALLSYMS) $(kallsyms.h)
+.tmp_kallsyms%.S: .tmp_vmlinux% $(KALLSYMS)
 	$(call cmd,kallsyms)
 
-# make -jN seems to have problems with intermediate files, see bug #3330.
-.SECONDARY: $(foreach n,1 2 3,.tmp_vmlinux$(n).stripped)
-.tmp_vmlinux%.stripped: .tmp_vmlinux% $(strip-symbols) $(kallsyms.h)
-	$(call cmd,kstrip)
-
-ifneq ($(CONFIG_DEBUG_INFO),y)
-.tmp_vmlinux%: LDFLAGS_vmlinux += -S
-endif
 # .tmp_vmlinux1 must be complete except kallsyms, so update vmlinux version
-.tmp_vmlinux%: $(vmlinux-lds) $(vmlinux-all) FORCE
-	$(if $(filter 1,$*),$(call if_changed_rule,ksym_ld),$(call if_changed,vmlinux__))
+.tmp_vmlinux1: $(vmlinux-lds) $(vmlinux-all) FORCE
+	$(call if_changed_rule,ksym_ld)
 
-.tmp_vmlinux0$(strip-ext):
-	$(Q)echo "placeholder" >$@
+.tmp_vmlinux2: $(vmlinux-lds) $(vmlinux-all) .tmp_kallsyms1.o FORCE
+	$(call if_changed,vmlinux__)
 
-.tmp_vmlinux1: .tmp_kallsyms0.o
-.tmp_vmlinux2: .tmp_kallsyms1.o
-.tmp_vmlinux3: .tmp_kallsyms2.o
+.tmp_vmlinux3: $(vmlinux-lds) $(vmlinux-all) .tmp_kallsyms2.o FORCE
+	$(call if_changed,vmlinux__)
 
 # Needs to visit scripts/ before $(KALLSYMS) can be used.
 $(KALLSYMS): scripts ;
diff --git a/arch/x86/scripts/strip-symbols b/arch/x86/scripts/strip-symbols
deleted file mode 100644
index a2f1ccb..0000000
--- a/arch/x86/scripts/strip-symbols
+++ /dev/null
@@ -1 +0,0 @@
-__cpu_vendor_dev_X86_VENDOR_*
diff --git a/init/Kconfig b/init/Kconfig
index e7893b1..f4f0a3c 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -598,13 +598,6 @@ config KALLSYMS_ALL
 
 	   Say N.
 
-config KALLSYMS_STRIP_GENERATED
-	bool "Strip machine generated symbols from kallsyms"
-	depends on KALLSYMS_ALL
-	default y
-	help
-	  Say N if you want kallsyms to retain even machine generated symbols.
-
 config KALLSYMS_EXTRA_PASS
 	bool "Do an extra kallsyms pass"
 	depends on KALLSYMS
diff --git a/kernel/kallsyms.c b/kernel/kallsyms.c
index e694afa..7b8b0f2 100644
--- a/kernel/kallsyms.c
+++ b/kernel/kallsyms.c
@@ -30,19 +30,20 @@
 #define all_var 0
 #endif
 
-extern const unsigned long kallsyms_addresses[];
-extern const u8 kallsyms_names[];
+/* These will be re-linked against their real values during the second link stage */
+extern const unsigned long kallsyms_addresses[] __attribute__((weak));
+extern const u8 kallsyms_names[] __attribute__((weak));
 
 /* tell the compiler that the count isn't in the small data section if the arch
  * has one (eg: FRV)
  */
 extern const unsigned long kallsyms_num_syms
-	__attribute__((__section__(".rodata")));
+__attribute__((weak, section(".rodata")));
 
-extern const u8 kallsyms_token_table[];
-extern const u16 kallsyms_token_index[];
+extern const u8 kallsyms_token_table[] __attribute__((weak));
+extern const u16 kallsyms_token_index[] __attribute__((weak));
 
-extern const unsigned long kallsyms_markers[];
+extern const unsigned long kallsyms_markers[] __attribute__((weak));
 
 static inline int is_kernel_inittext(unsigned long addr)
 {
@@ -167,6 +168,9 @@ static unsigned long get_symbol_pos(unsigned long addr,
 	unsigned long symbol_start = 0, symbol_end = 0;
 	unsigned long i, low, high, mid;
 
+	/* This kernel should never had been booted. */
+	BUG_ON(!kallsyms_addresses);
+
 	/* do a binary search on the sorted kallsyms_addresses array */
 	low = 0;
 	high = kallsyms_num_syms;
diff --git a/scripts/Makefile.build b/scripts/Makefile.build
index 5d90030..c7de8b3 100644
--- a/scripts/Makefile.build
+++ b/scripts/Makefile.build
@@ -151,16 +151,16 @@ cmd_cc_i_c       = $(CPP) $(c_flags)   -o $@ $<
 $(obj)/%.i: $(src)/%.c FORCE
 	$(call if_changed_dep,cc_i_c)
 
-cmd_genksyms =                                                              \
+cmd_gensymtypes =                                                           \
     $(CPP) -D__GENKSYMS__ $(c_flags) $< |                                   \
-    $(GENKSYMS) -T $@ -A -a $(ARCH)                                         \
+    $(GENKSYMS) -T $@ -a $(ARCH)                                            \
      $(if $(KBUILD_PRESERVE),-p)                                            \
      $(if $(1),-r $(firstword $(wildcard $(@:.symtypes=.symref) /dev/null)))
 
 quiet_cmd_cc_symtypes_c = SYM $(quiet_modtag) $@
 cmd_cc_symtypes_c =                                                         \
     set -e;                                                                 \
-    $(call cmd_genksyms, true) >/dev/null;                                  \
+    $(call cmd_gensymtypes, true) >/dev/null;                               \
     test -s $@ || rm -f $@
 
 $(obj)/%.symtypes : $(src)/%.c FORCE
@@ -177,38 +177,28 @@ cmd_cc_o_c = $(CC) $(c_flags) -c -o $@ $<
 
 else
 # When module versioning is enabled the following steps are executed:
-# o compile a .tmp_<file>.s from <file>.c
-# o if .tmp_<file>.s doesn't contain a __ksymtab version, i.e. does
-#   not export symbols, we just assemble .tmp_<file>.s to <file>.o and
+# o compile a .tmp_<file>.o from <file>.c
+# o if .tmp_<file>.o doesn't contain a __ksymtab version, i.e. does
+#   not export symbols, we just rename .tmp_<file>.o to <file>.o and
 #   are done.
 # o otherwise, we calculate symbol versions using the good old
 #   genksyms on the preprocessed source and postprocess them in a way
-#   that they are usable as assembly source
-# o assemble <file>.o from .tmp_<file>.s forcing inclusion of directives
-#   defining the actual values of __crc_*, followed by objcopy-ing them
-#   to force these symbols to be local to permit stripping them later.
-s_file = $(@D)/.tmp_$(@F:.o=.s)
-v_file = $(@D)/.tmp_$(@F:.o=.v)
-tmp_o_file = $(@D)/.tmp_$(@F)
-no_g_c_flags = $(filter-out -g%,$(c_flags))
-
-cmd_cc_o_c = $(CC) $(c_flags) -S -o $(s_file) $<
+#   that they are usable as a linker script
+# o generate <file>.o from .tmp_<file>.o using the linker to
+#   replace the unresolved symbols __crc_exported_symbol with
+#   the actual value of the checksum generated by genksyms
 
+cmd_cc_o_c = $(CC) $(c_flags) -c -o $(@D)/.tmp_$(@F) $<
 cmd_modversions =							\
-	if grep -q __ksymtab $(s_file); then				\
-		if $(call cmd_genksyms, $(KBUILD_SYMTYPES)) > $(v_file) \
-		   && $(CC) $(no_g_c_flags) -c -Wa,$(v_file)		\
-			    -o $(tmp_o_file) $(s_file)			\
-		   && $(OBJCOPY) -L '__crc_*' -L '___crc_*' -w		\
-				 $(tmp_o_file) $@;			\
-		then							\
-			: ;						\
-		else							\
-			rm -f $@; exit 1;				\
-		fi;							\
+	if $(OBJDUMP) -h $(@D)/.tmp_$(@F) | grep -q __ksymtab; then	\
+		$(call cmd_gensymtypes, $(KBUILD_SYMTYPES))		\
+		    > $(@D)/.tmp_$(@F:.o=.ver);				\
+									\
+		$(LD) $(LDFLAGS) -r -o $@ $(@D)/.tmp_$(@F) 		\
+			-T $(@D)/.tmp_$(@F:.o=.ver);			\
+		rm -f $(@D)/.tmp_$(@F) $(@D)/.tmp_$(@F:.o=.ver);	\
 	else								\
-		rm -f $(v_file);					\
-		$(CC) $(no_g_c_flags) -c -o $@ $(s_file);		\
+		mv -f $(@D)/.tmp_$(@F) $@;				\
 	fi;
 endif
 
@@ -225,12 +215,7 @@ define rule_cc_o_c
 	$(cmd_record_mcount)						  \
 	scripts/basic/fixdep $(depfile) $@ '$(call make-cmd,cc_o_c)' >    \
 	                                              $(dot-target).tmp;  \
-	if [ -r $(@D)/.tmp_$(@F:.o=.v) ]; then				  \
-		echo >> $(dot-target).tmp;				  \
-		echo '$@: $(GENKSYMS)' >> $(dot-target).tmp;		  \
-		echo '$(GENKSYMS):: ;' >> $(dot-target).tmp;		  \
-	fi;								  \
-	rm -f $(depfile) $(@D)/.tmp_$(@F:.o=.?);			  \
+	rm -f $(depfile);						  \
 	mv -f $(dot-target).tmp $(dot-target).cmd
 endef
 
diff --git a/scripts/Makefile.modinst b/scripts/Makefile.modinst
index a5122dc..efa5d94 100644
--- a/scripts/Makefile.modinst
+++ b/scripts/Makefile.modinst
@@ -17,8 +17,7 @@ __modinst: $(modules)
 	@:
 
 quiet_cmd_modules_install = INSTALL $@
-      cmd_modules_install = mkdir -p $(2); \
-			    $(mod_strip_cmd) $@ $(2)/$(notdir $@) || cp $@ $(2)
+      cmd_modules_install = mkdir -p $(2); cp $@ $(2) ; $(mod_strip_cmd) $(2)/$(notdir $@)
 
 # Modules built outside the kernel source tree go into extra by default
 INSTALL_MOD_DIR ?= extra
diff --git a/scripts/genksyms/genksyms.c b/scripts/genksyms/genksyms.c
index f8bb4ca..3a8297b 100644
--- a/scripts/genksyms/genksyms.c
+++ b/scripts/genksyms/genksyms.c
@@ -43,7 +43,7 @@ int cur_line = 1;
 char *cur_filename;
 
 static int flag_debug, flag_dump_defs, flag_reference, flag_dump_types,
-	   flag_preserve, flag_warnings, flag_asm;
+	   flag_preserve, flag_warnings;
 static const char *arch = "";
 static const char *mod_prefix = "";
 
@@ -610,11 +610,8 @@ void export_symbol(const char *name)
 		if (flag_dump_defs)
 			fputs(">\n", debugfile);
 
-		/* Used as assembly source or a linker script. */
-		printf(flag_asm
-		       ? ".equiv %s__crc_%s, %#08lx\n"
-		       : "%s__crc_%s = %#08lx ;\n",
-		       mod_prefix, name, crc);
+		/* Used as a linker script. */
+		printf("%s__crc_%s = 0x%08lx ;\n", mod_prefix, name, crc);
 	}
 }
 
@@ -651,10 +648,9 @@ void error_with_pos(const char *fmt, ...)
 
 static void genksyms_usage(void)
 {
-	fputs("Usage:\n" "genksyms [-aAdDTwqhV] > /path/to/.tmp_obj.ver\n" "\n"
+	fputs("Usage:\n" "genksyms [-adDTwqhV] > /path/to/.tmp_obj.ver\n" "\n"
 #ifdef __GNU_LIBRARY__
 	      "  -a, --arch            Select architecture\n"
-	      "  -A, --asm             Generate assembly rather than linker script\n"
 	      "  -d, --debug           Increment the debug level (repeatable)\n"
 	      "  -D, --dump            Dump expanded symbol defs (for debugging only)\n"
 	      "  -r, --reference file  Read reference symbols from a file\n"
@@ -666,7 +662,6 @@ static void genksyms_usage(void)
 	      "  -V, --version         Print the release version\n"
 #else				/* __GNU_LIBRARY__ */
 	      "  -a                    Select architecture\n"
-	      "  -A                    Generate assembly rather than linker script\n"
 	      "  -d                    Increment the debug level (repeatable)\n"
 	      "  -D                    Dump expanded symbol defs (for debugging only)\n"
 	      "  -r file               Read reference symbols from a file\n"
@@ -688,7 +683,6 @@ int main(int argc, char **argv)
 #ifdef __GNU_LIBRARY__
 	struct option long_opts[] = {
 		{"arch", 1, 0, 'a'},
-		{"asm", 0, 0, 'A'},
 		{"debug", 0, 0, 'd'},
 		{"warnings", 0, 0, 'w'},
 		{"quiet", 0, 0, 'q'},
@@ -701,10 +695,10 @@ int main(int argc, char **argv)
 		{0, 0, 0, 0}
 	};
 
-	while ((o = getopt_long(argc, argv, "a:dwqVADr:T:ph",
+	while ((o = getopt_long(argc, argv, "a:dwqVDr:T:ph",
 				&long_opts[0], NULL)) != EOF)
 #else				/* __GNU_LIBRARY__ */
-	while ((o = getopt(argc, argv, "a:dwqVADr:T:ph")) != EOF)
+	while ((o = getopt(argc, argv, "a:dwqVDr:T:ph")) != EOF)
 #endif				/* __GNU_LIBRARY__ */
 		switch (o) {
 		case 'a':
@@ -722,9 +716,6 @@ int main(int argc, char **argv)
 		case 'V':
 			fputs("genksyms version 2.5.60\n", stderr);
 			break;
-		case 'A':
-			flag_asm = 1;
-			break;
 		case 'D':
 			flag_dump_defs = 1;
 			break;
diff --git a/scripts/genksyms/keywords.c_shipped b/scripts/genksyms/keywords.c_shipped
index 83484fe..971e011 100644
--- a/scripts/genksyms/keywords.c_shipped
+++ b/scripts/genksyms/keywords.c_shipped
@@ -1,4 +1,4 @@
-/* ANSI-C code produced by gperf version 3.0.1 */
+/* ANSI-C code produced by gperf version 3.0.2 */
 /* Command-line: gperf -L ANSI-C -a -C -E -g -H is_reserved_hash -k '1,3,$' -N is_reserved_word -p -t scripts/genksyms/keywords.gperf  */
 
 #if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \
@@ -32,7 +32,7 @@
 
 #line 3 "scripts/genksyms/keywords.gperf"
 struct resword { const char *name; int token; };
-/* maximum key range = 64, duplicates = 0 */
+/* maximum key range = 62, duplicates = 0 */
 
 #ifdef __GNUC__
 __inline
@@ -46,32 +46,32 @@ is_reserved_hash (register const char *str, register unsigned int len)
 {
   static const unsigned char asso_values[] =
     {
-      67, 67, 67, 67, 67, 67, 67, 67, 67, 67,
-      67, 67, 67, 67, 67, 67, 67, 67, 67, 67,
-      67, 67, 67, 67, 67, 67, 67, 67, 67, 67,
-      67, 67, 67, 67, 67, 67, 67, 67, 67, 67,
-      67, 67, 67, 67, 67, 67, 67, 67, 67, 67,
-      67, 67, 67, 67, 67, 67, 67, 67, 67, 67,
-      67, 67, 67, 67, 67, 67, 67, 67, 67,  0,
-      67, 67, 67, 67, 67, 67, 15, 67, 67, 67,
-       0, 67, 67, 67, 67, 67, 67, 67, 67, 67,
-      67, 67, 67, 67, 67,  0, 67,  0, 67,  5,
-      25, 20, 15, 30, 67, 15, 67, 67, 10,  0,
-      10, 40, 20, 67, 10,  5,  0, 10, 15, 67,
-      67, 67, 67, 67, 67, 67, 67, 67, 67, 67,
-      67, 67, 67, 67, 67, 67, 67, 67, 67, 67,
-      67, 67, 67, 67, 67, 67, 67, 67, 67, 67,
-      67, 67, 67, 67, 67, 67, 67, 67, 67, 67,
-      67, 67, 67, 67, 67, 67, 67, 67, 67, 67,
-      67, 67, 67, 67, 67, 67, 67, 67, 67, 67,
-      67, 67, 67, 67, 67, 67, 67, 67, 67, 67,
-      67, 67, 67, 67, 67, 67, 67, 67, 67, 67,
-      67, 67, 67, 67, 67, 67, 67, 67, 67, 67,
-      67, 67, 67, 67, 67, 67, 67, 67, 67, 67,
-      67, 67, 67, 67, 67, 67, 67, 67, 67, 67,
-      67, 67, 67, 67, 67, 67, 67, 67, 67, 67,
-      67, 67, 67, 67, 67, 67, 67, 67, 67, 67,
-      67, 67, 67, 67, 67, 67
+      65, 65, 65, 65, 65, 65, 65, 65, 65, 65,
+      65, 65, 65, 65, 65, 65, 65, 65, 65, 65,
+      65, 65, 65, 65, 65, 65, 65, 65, 65, 65,
+      65, 65, 65, 65, 65, 65, 65, 65, 65, 65,
+      65, 65, 65, 65, 65, 65, 65, 65, 65, 65,
+      65, 65, 65, 65, 65, 65, 65, 65, 65, 65,
+      65, 65, 65, 65, 65, 65, 65, 65, 65,  5,
+      65, 65, 65, 65, 65, 65, 35, 65, 65, 65,
+       0, 65, 65, 65, 65, 65, 65, 65, 65, 65,
+      65, 65, 65, 65, 65,  0, 65,  0, 65,  5,
+      20, 15, 10, 30, 65, 15, 65, 65, 20,  0,
+      10, 35, 20, 65, 10,  5,  0, 10,  5, 65,
+      65, 65, 65, 65, 65, 65, 65, 65, 65, 65,
+      65, 65, 65, 65, 65, 65, 65, 65, 65, 65,
+      65, 65, 65, 65, 65, 65, 65, 65, 65, 65,
+      65, 65, 65, 65, 65, 65, 65, 65, 65, 65,
+      65, 65, 65, 65, 65, 65, 65, 65, 65, 65,
+      65, 65, 65, 65, 65, 65, 65, 65, 65, 65,
+      65, 65, 65, 65, 65, 65, 65, 65, 65, 65,
+      65, 65, 65, 65, 65, 65, 65, 65, 65, 65,
+      65, 65, 65, 65, 65, 65, 65, 65, 65, 65,
+      65, 65, 65, 65, 65, 65, 65, 65, 65, 65,
+      65, 65, 65, 65, 65, 65, 65, 65, 65, 65,
+      65, 65, 65, 65, 65, 65, 65, 65, 65, 65,
+      65, 65, 65, 65, 65, 65, 65, 65, 65, 65,
+      65, 65, 65, 65, 65, 65
     };
   return len + asso_values[(unsigned char)str[2]] + asso_values[(unsigned char)str[0]] + asso_values[(unsigned char)str[len - 1]];
 }
@@ -84,119 +84,116 @@ is_reserved_word (register const char *str, register unsigned int len)
 {
   enum
     {
-      TOTAL_KEYWORDS = 45,
+      TOTAL_KEYWORDS = 43,
       MIN_WORD_LENGTH = 3,
       MAX_WORD_LENGTH = 24,
       MIN_HASH_VALUE = 3,
-      MAX_HASH_VALUE = 66
+      MAX_HASH_VALUE = 64
     };
 
   static const struct resword wordlist[] =
     {
       {""}, {""}, {""},
-#line 28 "scripts/genksyms/keywords.gperf"
+#line 26 "scripts/genksyms/keywords.gperf"
       {"asm", ASM_KEYW},
       {""},
-#line 10 "scripts/genksyms/keywords.gperf"
+#line 8 "scripts/genksyms/keywords.gperf"
       {"__asm", ASM_KEYW},
       {""},
-#line 11 "scripts/genksyms/keywords.gperf"
+#line 9 "scripts/genksyms/keywords.gperf"
       {"__asm__", ASM_KEYW},
       {""}, {""},
-#line 54 "scripts/genksyms/keywords.gperf"
+#line 52 "scripts/genksyms/keywords.gperf"
       {"__typeof__", TYPEOF_KEYW},
       {""},
-#line 14 "scripts/genksyms/keywords.gperf"
+#line 12 "scripts/genksyms/keywords.gperf"
       {"__const", CONST_KEYW},
-#line 13 "scripts/genksyms/keywords.gperf"
+#line 11 "scripts/genksyms/keywords.gperf"
       {"__attribute__", ATTRIBUTE_KEYW},
-#line 15 "scripts/genksyms/keywords.gperf"
+#line 13 "scripts/genksyms/keywords.gperf"
       {"__const__", CONST_KEYW},
-#line 20 "scripts/genksyms/keywords.gperf"
+#line 18 "scripts/genksyms/keywords.gperf"
       {"__signed__", SIGNED_KEYW},
-#line 46 "scripts/genksyms/keywords.gperf"
+#line 44 "scripts/genksyms/keywords.gperf"
       {"static", STATIC_KEYW},
-      {""},
-#line 41 "scripts/genksyms/keywords.gperf"
+#line 20 "scripts/genksyms/keywords.gperf"
+      {"__volatile__", VOLATILE_KEYW},
+#line 39 "scripts/genksyms/keywords.gperf"
       {"int", INT_KEYW},
-#line 34 "scripts/genksyms/keywords.gperf"
+#line 32 "scripts/genksyms/keywords.gperf"
       {"char", CHAR_KEYW},
-#line 35 "scripts/genksyms/keywords.gperf"
+#line 33 "scripts/genksyms/keywords.gperf"
       {"const", CONST_KEYW},
-#line 47 "scripts/genksyms/keywords.gperf"
+#line 45 "scripts/genksyms/keywords.gperf"
       {"struct", STRUCT_KEYW},
-#line 26 "scripts/genksyms/keywords.gperf"
+#line 24 "scripts/genksyms/keywords.gperf"
       {"__restrict__", RESTRICT_KEYW},
-#line 27 "scripts/genksyms/keywords.gperf"
-      {"restrict", RESTRICT_KEYW},
-#line 7 "scripts/genksyms/keywords.gperf"
-      {"EXPORT_SYMBOL_GPL_FUTURE", EXPORT_SYMBOL_KEYW},
-#line 18 "scripts/genksyms/keywords.gperf"
-      {"__inline__", INLINE_KEYW},
-      {""},
-#line 22 "scripts/genksyms/keywords.gperf"
-      {"__volatile__", VOLATILE_KEYW},
-#line 5 "scripts/genksyms/keywords.gperf"
-      {"EXPORT_SYMBOL", EXPORT_SYMBOL_KEYW},
 #line 25 "scripts/genksyms/keywords.gperf"
+      {"restrict", RESTRICT_KEYW},
+#line 23 "scripts/genksyms/keywords.gperf"
       {"_restrict", RESTRICT_KEYW},
-      {""},
-#line 12 "scripts/genksyms/keywords.gperf"
-      {"__attribute", ATTRIBUTE_KEYW},
-#line 6 "scripts/genksyms/keywords.gperf"
-      {"EXPORT_SYMBOL_GPL", EXPORT_SYMBOL_KEYW},
 #line 16 "scripts/genksyms/keywords.gperf"
+      {"__inline__", INLINE_KEYW},
+#line 10 "scripts/genksyms/keywords.gperf"
+      {"__attribute", ATTRIBUTE_KEYW},
+      {""},
+#line 14 "scripts/genksyms/keywords.gperf"
       {"__extension__", EXTENSION_KEYW},
-#line 37 "scripts/genksyms/keywords.gperf"
+#line 35 "scripts/genksyms/keywords.gperf"
       {"enum", ENUM_KEYW},
-#line 8 "scripts/genksyms/keywords.gperf"
-      {"EXPORT_UNUSED_SYMBOL", EXPORT_SYMBOL_KEYW},
-#line 38 "scripts/genksyms/keywords.gperf"
+#line 19 "scripts/genksyms/keywords.gperf"
+      {"__volatile", VOLATILE_KEYW},
+#line 36 "scripts/genksyms/keywords.gperf"
       {"extern", EXTERN_KEYW},
       {""},
-#line 19 "scripts/genksyms/keywords.gperf"
+#line 17 "scripts/genksyms/keywords.gperf"
       {"__signed", SIGNED_KEYW},
-#line 9 "scripts/genksyms/keywords.gperf"
-      {"EXPORT_UNUSED_SYMBOL_GPL", EXPORT_SYMBOL_KEYW},
-#line 49 "scripts/genksyms/keywords.gperf"
-      {"union", UNION_KEYW},
-#line 53 "scripts/genksyms/keywords.gperf"
+#line 7 "scripts/genksyms/keywords.gperf"
+      {"EXPORT_SYMBOL_GPL_FUTURE", EXPORT_SYMBOL_KEYW},
+      {""},
+#line 51 "scripts/genksyms/keywords.gperf"
       {"typeof", TYPEOF_KEYW},
-#line 48 "scripts/genksyms/keywords.gperf"
+#line 46 "scripts/genksyms/keywords.gperf"
       {"typedef", TYPEDEF_KEYW},
-#line 17 "scripts/genksyms/keywords.gperf"
+#line 15 "scripts/genksyms/keywords.gperf"
       {"__inline", INLINE_KEYW},
-#line 33 "scripts/genksyms/keywords.gperf"
+#line 31 "scripts/genksyms/keywords.gperf"
       {"auto", AUTO_KEYW},
-#line 21 "scripts/genksyms/keywords.gperf"
-      {"__volatile", VOLATILE_KEYW},
+#line 47 "scripts/genksyms/keywords.gperf"
+      {"union", UNION_KEYW},
       {""}, {""},
-#line 50 "scripts/genksyms/keywords.gperf"
+#line 48 "scripts/genksyms/keywords.gperf"
       {"unsigned", UNSIGNED_KEYW},
-      {""},
-#line 44 "scripts/genksyms/keywords.gperf"
+#line 49 "scripts/genksyms/keywords.gperf"
+      {"void", VOID_KEYW},
+#line 42 "scripts/genksyms/keywords.gperf"
       {"short", SHORT_KEYW},
-#line 40 "scripts/genksyms/keywords.gperf"
+      {""}, {""},
+#line 50 "scripts/genksyms/keywords.gperf"
+      {"volatile", VOLATILE_KEYW},
+      {""},
+#line 37 "scripts/genksyms/keywords.gperf"
+      {"float", FLOAT_KEYW},
+#line 34 "scripts/genksyms/keywords.gperf"
+      {"double", DOUBLE_KEYW},
+      {""},
+#line 5 "scripts/genksyms/keywords.gperf"
+      {"EXPORT_SYMBOL", EXPORT_SYMBOL_KEYW},
+      {""}, {""},
+#line 38 "scripts/genksyms/keywords.gperf"
       {"inline", INLINE_KEYW},
+#line 6 "scripts/genksyms/keywords.gperf"
+      {"EXPORT_SYMBOL_GPL", EXPORT_SYMBOL_KEYW},
+#line 41 "scripts/genksyms/keywords.gperf"
+      {"register", REGISTER_KEYW},
       {""},
-#line 52 "scripts/genksyms/keywords.gperf"
-      {"volatile", VOLATILE_KEYW},
-#line 42 "scripts/genksyms/keywords.gperf"
-      {"long", LONG_KEYW},
-#line 24 "scripts/genksyms/keywords.gperf"
+#line 22 "scripts/genksyms/keywords.gperf"
       {"_Bool", BOOL_KEYW},
-      {""}, {""},
 #line 43 "scripts/genksyms/keywords.gperf"
-      {"register", REGISTER_KEYW},
-#line 51 "scripts/genksyms/keywords.gperf"
-      {"void", VOID_KEYW},
-#line 39 "scripts/genksyms/keywords.gperf"
-      {"float", FLOAT_KEYW},
-#line 36 "scripts/genksyms/keywords.gperf"
-      {"double", DOUBLE_KEYW},
-      {""}, {""}, {""}, {""},
-#line 45 "scripts/genksyms/keywords.gperf"
-      {"signed", SIGNED_KEYW}
+      {"signed", SIGNED_KEYW},
+      {""}, {""},
+#line 40 "scripts/genksyms/keywords.gperf"
+      {"long", LONG_KEYW}
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
diff --git a/scripts/genksyms/keywords.gperf b/scripts/genksyms/keywords.gperf
index 8abe7ab..5ef3733 100644
--- a/scripts/genksyms/keywords.gperf
+++ b/scripts/genksyms/keywords.gperf
@@ -5,8 +5,6 @@ struct resword { const char *name; int token; }
 EXPORT_SYMBOL, EXPORT_SYMBOL_KEYW
 EXPORT_SYMBOL_GPL, EXPORT_SYMBOL_KEYW
 EXPORT_SYMBOL_GPL_FUTURE, EXPORT_SYMBOL_KEYW
-EXPORT_UNUSED_SYMBOL, EXPORT_SYMBOL_KEYW
-EXPORT_UNUSED_SYMBOL_GPL, EXPORT_SYMBOL_KEYW
 __asm, ASM_KEYW
 __asm__, ASM_KEYW
 __attribute, ATTRIBUTE_KEYW
diff --git a/scripts/kallsyms.c b/scripts/kallsyms.c
index 9275812..ad2434b 100644
--- a/scripts/kallsyms.c
+++ b/scripts/kallsyms.c
@@ -130,9 +130,18 @@ static int read_symbol(FILE *in, struct sym_entry *s)
 static int symbol_valid(struct sym_entry *s)
 {
 	/* Symbols which vary between passes.  Passes 1 and 2 must have
-	 * identical symbol lists.
+	 * identical symbol lists.  The kallsyms_* symbols below are only added
+	 * after pass 1, they would be included in pass 2 when --all-symbols is
+	 * specified so exclude them to get a stable symbol list.
 	 */
 	static char *special_symbols[] = {
+		"kallsyms_addresses",
+		"kallsyms_num_syms",
+		"kallsyms_names",
+		"kallsyms_markers",
+		"kallsyms_token_table",
+		"kallsyms_token_index",
+
 	/* Exclude linker generated symbols which vary between passes */
 		"_SDA_BASE_",		/* ppc */
 		"_SDA2_BASE_",		/* ppc */
@@ -164,9 +173,7 @@ static int symbol_valid(struct sym_entry *s)
 	}
 
 	/* Exclude symbols which vary between passes. */
-	if (strstr((char *)s->sym + offset, "_compiled.") ||
-	    strncmp((char*)s->sym + offset, "__compound_literal.", 19) == 0 ||
-	    strncmp((char*)s->sym + offset, "__compound_literal$", 19) == 0)
+	if (strstr((char *)s->sym + offset, "_compiled."))
 		return 0;
 
 	for (i = 0; special_symbols[i]; i++)
@@ -543,10 +550,8 @@ int main(int argc, char **argv)
 		usage();
 
 	read_map(stdin);
-	if (table_cnt) {
-		sort_symbols();
-		optimize_token_table();
-	}
+	sort_symbols();
+	optimize_token_table();
 	write_src();
 
 	return 0;
diff --git a/scripts/mksysmap b/scripts/mksysmap
index 1db316a..6e133a0 100644
--- a/scripts/mksysmap
+++ b/scripts/mksysmap
@@ -37,6 +37,9 @@
 
 # readprofile starts reading symbols when _stext is found, and
 # continue until it finds a symbol which is not either of 'T', 't',
-# 'W' or 'w'.
+# 'W' or 'w'. __crc_ are 'A' and placed in the middle
+# so we just ignore them to let readprofile continue to work.
+# (At least sparc64 has __crc_ in the middle).
+
+$NM -n $1 | grep -v '\( [aNUw] \)\|\(__crc_\)\|\( \$[adt]\)' > $2
 
-$NM -n $1 | grep -v '\( [aNUw] \)\|\( \$[adt]\)' > $2
diff --git a/scripts/strip-symbols b/scripts/strip-symbols
deleted file mode 100644
index 29ee8c1..0000000
--- a/scripts/strip-symbols
+++ /dev/null
@@ -1,22 +0,0 @@
-<*>
-*.h
-__compound_literal[$.][0-9]*
-__crc_[a-zA-Z_]*
-__exitcall_[a-zA-Z_]*
-__func__[$.][0-9]*
-__FUNCTION__[$.][0-9]*
-gcc[0-9]_compiled[$.]
-__initcall_[a-zA-Z_]*
-__kcrctab_[a-zA-Z_]*
-__kstrtab_[a-zA-Z_]*
-__ksymtab_[a-zA-Z_]*
-__mod_[a-zA-Z_]*[0-9]
-__module_depends
-__param_[a-zA-Z_]*
-__pci_fixup_*PCI_ANY_IDPCI_ANY_ID*
-__pci_fixup_*PCI_ANY_IDPCI_DEVICE_ID_*
-__pci_fixup_*PCI_VENDOR_ID_*PCI_ANY_ID*
-__pci_fixup_*PCI_VENDOR_ID_*PCI_DEVICE_ID_*
-__PRETTY_FUNCTION__[$.][0-9]*
-__setup_[a-zA-Z_]*
-____versions


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1200
retrieving revision 1.1201
diff -u -r1.1200 -r1.1201
--- kernel.spec	8 Jan 2009 15:10:39 -0000	1.1200
+++ kernel.spec	8 Jan 2009 20:00:08 -0000	1.1201
@@ -662,6 +662,8 @@
 # silence the ACPI blacklist code
 Patch2802: linux-2.6-silence-acpi-blacklist.patch
 
+Patch9000: revert-strip-bustication.patch
+
 %endif
 
 BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -1168,6 +1170,9 @@
 # silence the ACPI blacklist code
 ApplyPatch linux-2.6-silence-acpi-blacklist.patch
 
+# revert ad7a953c522ceb496611d127e51e278bfe0ff483
+ApplyPatch revert-strip-bustication.patch
+
 # END OF PATCH APPLICATIONS
 
 %endif
@@ -1743,6 +1748,11 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Thu Jan 08 2009 Kyle McMartin <kyle at redhat.com>
+- Fixup build failures due to warn/info macro removal.
+- Revert patch which caused modules to bloat to 1GB of
+  (mostly) zeroes.
+
 * Thu Jan 08 2009 Dave Jones <davej at redhat.com>
 - 2.6.28-git11
 



From kraxel at fedoraproject.org  Thu Jan  8 20:18:32 2009
From: kraxel at fedoraproject.org (Gerd Hoffmann)
Date: Thu,  8 Jan 2009 20:18:32 +0000 (UTC)
Subject: rpms/xen/devel .cvsignore, 1.38, 1.39 sources, 1.53, 1.54 xen.spec, 
	1.224, 1.225
Message-ID: <20090108201832.5F1D8700FD@cvs1.fedora.phx.redhat.com>

Author: kraxel

Update of /cvs/pkgs/rpms/xen/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27604

Modified Files:
	.cvsignore sources xen.spec 
Log Message:
update to xen 3.3.1 release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xen/devel/.cvsignore,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- .cvsignore	18 Dec 2008 16:04:35 -0000	1.38
+++ .cvsignore	8 Jan 2009 20:18:01 -0000	1.39
@@ -1,8 +1,8 @@
 *.rpm
 .build*.log
-xen-3.3.0.tar.gz
 grub-0.97.tar.gz
 newlib-1.16.0.tar.gz
 lwip-1.3.0.tar.gz
 pciutils-2.2.9.tar.bz2
 zlib-1.2.3.tar.gz
+xen-3.3.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xen/devel/sources,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- sources	18 Dec 2008 16:04:35 -0000	1.53
+++ sources	8 Jan 2009 20:18:01 -0000	1.54
@@ -1,6 +1,6 @@
-331ca462286a6adc46e2b78696a25ada  xen-3.3.0.tar.gz
 cd3f3eb54446be6003156158d51f4884  grub-0.97.tar.gz
 bf8f1f9e3ca83d732c00a79a6ef29bc4  newlib-1.16.0.tar.gz
 36cc57650cffda9a0269493be2a169bb  lwip-1.3.0.tar.gz
 cec05e7785497c5e19da2f114b934ffd  pciutils-2.2.9.tar.bz2
 debc62758716a169df9f62e6ab2bc634  zlib-1.2.3.tar.gz
+77a61e08875625394ef6bf80e595ffa1  xen-3.3.1.tar.gz


Index: xen.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xen/devel/xen.spec,v
retrieving revision 1.224
retrieving revision 1.225
diff -u -r1.224 -r1.225
--- xen.spec	18 Dec 2008 16:04:35 -0000	1.224
+++ xen.spec	8 Jan 2009 20:18:01 -0000	1.225
@@ -1,8 +1,8 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 # Always set these 3 tags
-%define base_version 3.3.0
-%define base_release 2
+%define base_version 3.3.1
+%define base_release 1
 
 # Hypervisor ABI
 %define hv_abi  3.3
@@ -456,6 +456,7 @@
 %{_sbindir}/xentrace_setmask
 %{_sbindir}/xenbaked
 %{_sbindir}/xenstored
+%{_sbindir}/xenpm
 
 # Xen logfiles
 %dir %attr(0700,root,root) %{_localstatedir}/log/xen
@@ -478,6 +479,9 @@
 %{_libdir}/*.a
 
 %changelog
+* Thu Jan 8 2009 Gerd Hoffmann <kraxel at redhat.com> - 3.3.1-1
+- update to xen 3.3.1 release.
+
 * Wed Dec 17 2008 Gerd Hoffmann <kraxel at redhat.com> - 3.3.0-2
 - build and package stub domains (pvgrub, ioemu).
 - backport unstable fixes for pv_ops dom0.



From arbiter at fedoraproject.org  Thu Jan  8 21:00:31 2009
From: arbiter at fedoraproject.org (Lorenzo Villani)
Date: Thu,  8 Jan 2009 21:00:31 +0000 (UTC)
Subject: rpms/phonon/devel phonon-4.2.96-pulseaudio.patch, NONE,
	1.1 phonon-4.2.96-xine-pulseaudio.patch, NONE, 1.1 phonon.spec,
	1.18, 1.19 phonon-4.2.0-pulseaudio.patch, 1.1,
	NONE phonon-4.2.70-xine-pulseaudio.patch, 1.1, NONE
Message-ID: <20090108210031.6A548700FD@cvs1.fedora.phx.redhat.com>

Author: arbiter

Update of /cvs/pkgs/rpms/phonon/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30857

Modified Files:
	phonon.spec 
Added Files:
	phonon-4.2.96-pulseaudio.patch 
	phonon-4.2.96-xine-pulseaudio.patch 
Removed Files:
	phonon-4.2.0-pulseaudio.patch 
	phonon-4.2.70-xine-pulseaudio.patch 
Log Message:
- 4.2.96 but please wait for the tarballs to be released somewhere

phonon-4.2.96-pulseaudio.patch:

--- NEW FILE phonon-4.2.96-pulseaudio.patch ---
diff -Naurw phonon-4.2.96/phonon/globalconfig.cpp phonon-4.2.96.pulseaudio/phonon/globalconfig.cpp
--- phonon-4.2.96/phonon/globalconfig.cpp	2008-11-27 16:41:41.000000000 +0100
+++ phonon-4.2.96.pulseaudio/phonon/globalconfig.cpp	2009-01-08 21:29:18.000000000 +0100
@@ -31,6 +31,7 @@
 #include "phononnamespace_p.h"
 
 #include <QtCore/QList>
+#include <QtCore/QHash>
 #include <QtCore/QVariant>
 
 QT_BEGIN_NAMESPACE
@@ -167,6 +168,15 @@
                     | ((override & HideUnavailableDevices) ? FilterUnavailableDevices : 0)
                     );
         }
+        // make PulseAudio the global default (assume it is already default in this list)
+        if (!list.isEmpty()) {
+            int firstIndex = list.first();
+            if (backendIface->objectDescriptionProperties(Phonon::AudioOutputDeviceType,
+                  firstIndex)["name"].toString() == "PulseAudio") {
+                list.removeFirst();
+                defaultList.prepend(firstIndex);
+            }
+        }
         defaultList += list;
     }
 
@@ -222,6 +232,15 @@
                     | ((override & HideUnavailableDevices) ? FilterUnavailableDevices : 0)
                   );
         }
+        // make PulseAudio the global default (assume it is already default in this list)
+        if (!list.isEmpty()) {
+            int firstIndex = list.first();
+            if (backendIface->objectDescriptionProperties(Phonon::AudioCaptureDeviceType,
+                  firstIndex)["name"].toString() == "PulseAudio") {
+                list.removeFirst();
+                defaultList.prepend(firstIndex);
+            }
+        }
         defaultList += list;
     }
 

phonon-4.2.96-xine-pulseaudio.patch:

--- NEW FILE phonon-4.2.96-xine-pulseaudio.patch ---
diff -Naurw phonon-4.2.96/xine/backend.cpp phonon-4.2.96.xine-pulseaudio/xine/backend.cpp
--- phonon-4.2.96/xine/backend.cpp	2008-12-19 08:08:53.000000000 +0100
+++ phonon-4.2.96.xine-pulseaudio/xine/backend.cpp	2009-01-08 21:31:10.000000000 +0100
@@ -649,7 +649,7 @@
                             "in KDE2 and KDE3. Its use is discuraged.</p></html>"),
                         /*icon name */"audio-backend-arts", outputPlugins[i]);
             } else if (0 == strcmp(outputPlugins[i], "pulseaudio")) {
-                addAudioOutput(nextIndex++, 10, tr("PulseAudio"),
+                addAudioOutput(nextIndex++, 2000, tr("PulseAudio"),
                         xine_get_audio_driver_plugin_description(m_xine, outputPlugins[i]),
                         /*icon name */"audio-backend-pulseaudio", outputPlugins[i]);
             } else if (0 == strcmp(outputPlugins[i], "esd")) {


Index: phonon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/phonon/devel/phonon.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- phonon.spec	12 Dec 2008 21:20:20 -0000	1.18
+++ phonon.spec	8 Jan 2009 21:00:00 -0000	1.19
@@ -1,7 +1,7 @@
 Summary: Multimedia framework api
 Name:    phonon
-Version: 4.2.80
-Release: 3%{?dist}
+Version: 4.2.96
+Release: 1%{?dist}
 
 Group:   System Environment/Libraries
 License: LGPLv2+
@@ -14,8 +14,8 @@
 # set through systemsettings, and listed devices are only those supported by the
 # "sink". So it never lists "PulseAudio" as a supported device, you have to pick
 # it as a "sink", and then the device setting is ignored entirely.
-Patch0:  phonon-4.2.0-pulseaudio.patch
-Patch1:  phonon-4.2.70-xine-pulseaudio.patch
+Patch0:  phonon-4.2.96-pulseaudio.patch
+Patch1:  phonon-4.2.96-xine-pulseaudio.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: automoc4
@@ -144,6 +144,12 @@
 
 
 %changelog
+* Thu Jan 08 2009 Lorenzo Villani <lvillani at binaryhelix.net> - 4.2.96-1
+- 4.2.96
+- rebase phonon-4.2.0-pulseaudio.patch (-> phonon-4.2.96-pulseaudio.patch)
+- rebase phonon-4.2.70-xine-pulseaudio.patch 
+  (-> phonon-4.2.96-xine-pulseaudio.patch)
+
 * Fri Dec 12 2008 Rex Dieter <rdieter at fedoraproject.org> 4.2.80-3
 - rebuild for pkgconfig deps
 


--- phonon-4.2.0-pulseaudio.patch DELETED ---


--- phonon-4.2.70-xine-pulseaudio.patch DELETED ---



From arbiter at fedoraproject.org  Thu Jan  8 21:03:00 2009
From: arbiter at fedoraproject.org (Lorenzo Villani)
Date: Thu,  8 Jan 2009 21:03:00 +0000 (UTC)
Subject: rpms/phonon/devel .cvsignore,1.7,1.8 sources,1.8,1.9
Message-ID: <20090108210300.30233700FD@cvs1.fedora.phx.redhat.com>

Author: arbiter

Update of /cvs/pkgs/rpms/phonon/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31114

Modified Files:
	.cvsignore sources 
Log Message:
- hand-made tarball, replace it with an official one ASAP


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/phonon/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	25 Nov 2008 09:48:32 -0000	1.7
+++ .cvsignore	8 Jan 2009 21:02:29 -0000	1.8
@@ -1,2 +1 @@
-phonon-4.2.80.20081121svn887051.tar.bz2
-phonon-4.2.80.tar.bz2
+phonon-4.2.96.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/phonon/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	25 Nov 2008 10:57:29 -0000	1.8
+++ sources	8 Jan 2009 21:02:29 -0000	1.9
@@ -1,2 +1 @@
-8e3924f417fea67f72b2105faed2119c  gstreamer-logo.svg
-885d63087d9861d1660888f10cadd1c5  phonon-4.2.80.tar.bz2
+4c971f70b6e00f573a7664f6849c3e17  phonon-4.2.96.tar.bz2



From arbiter at fedoraproject.org  Thu Jan  8 21:11:40 2009
From: arbiter at fedoraproject.org (Lorenzo Villani)
Date: Thu,  8 Jan 2009 21:11:40 +0000 (UTC)
Subject: rpms/phonon/devel gstreamer-logo.svg, NONE, 1.1 phonon.spec, 1.19,
	1.20
Message-ID: <20090108211140.45CF5700FD@cvs1.fedora.phx.redhat.com>

Author: arbiter

Update of /cvs/pkgs/rpms/phonon/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31781

Modified Files:
	phonon.spec 
Added Files:
	gstreamer-logo.svg 
Log Message:
- add gstreamer-logo.svg


--- NEW FILE gstreamer-logo.svg ---
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 12.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 51448)  -->
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
	<!ENTITY ns_svg "http://www.w3.org/2000/svg">
	<!ENTITY ns_xlink "http://www.w3.org/1999/xlink">
]>
<svg  version="1.1" id="Layer_1" xmlns="&ns_svg;" xmlns:xlink="&ns_xlink;" width="280.22" height="69.387"
	 viewBox="0 0 280.22 69.387" overflow="visible" enable-background="new 0 0 280.22 69.387" xml:space="preserve">
<path fill="#8C8C8C" d="M199.551,58.684c-0.334-6.834,2.636-22.747,9.47-21.247c2.913,0.64,2.118,4.655,1.166,9
	c-1.282,5.85-3.5,12.237-3.5,12.237s8.334,0.333,8.167,0c0.833-10.5,3.039-21.928,9.167-21.071
	c5.081,0.71-1.441,21.071-1.441,21.071s6.27,0,7.587,0c-0.272-3.453,1.59-11.495,2.635-17.311s-1.181-8.36-5.86-8.405
	s-9.314,4.044-9.314,4.044c0.182-3.498-4.429-4.05-4.429-4.05c-4.93-0.313-9.655,3.005-9.655,3.005l0.438-2.57h-7.425
	c0,0-0.365,4.088-1.867,11.549s-3.51,13.738-3.51,13.738L199.551,58.684z"/>
<path fill="#8C8C8C" d="M250.388,32.759c-10.167,0-14.7,7.178-14.7,14.511s4.332,12.167,13.166,12.167c4.15,0,6.5-3.834,6.5-3.834
	s0.134-1.049-0.65-0.612s-2.92,1.352-5.71,1.352s-5.806-2.654-5.806-9.239c0,0,16.166,0,16,0
	C260.021,44.437,260.555,32.759,250.388,32.759z M251.871,44.136h-7.76c0-5.362,4.29-9.412,7.211-7.974
	C253.982,37.397,251.871,44.136,251.871,44.136z"/>
<path fill="#8C8C8C" d="M154.888,32.759c-10.167,0-14.7,7.178-14.7,14.511s4.332,12.167,13.166,12.167c4.15,0,6.5-3.834,6.5-3.834
	s0.134-1.049-0.65-0.612s-2.92,1.352-5.71,1.352s-5.806-2.654-5.806-9.239c0,0,16.166,0,16,0
	C164.521,44.437,165.055,32.759,154.888,32.759z M156.371,44.136h-7.76c0-5.362,3.621-8.836,6.542-7.397
	C157.813,37.973,156.371,44.136,156.371,44.136z"/>
<path fill="#8C8C8C" d="M268.725,59.088h-8.198c0,0,4.786-17.192,5.203-25.621c-0.072,0.072,7.11,0,7.11,0s-0.617,1.9-0.885,3.559
	c2.031-2.249,2.719-4.272,8.232-4.272c0.072,0,0,7.109,0,7.109s-5.15-1.275-7,0.574S269.354,43.77,268.725,59.088z"/>
<path fill="#8C8C8C" d="M127.225,59.088h-8.198c0,0,4.786-17.192,5.203-25.621c-0.072,0.072,7.11,0,7.11,0s-0.617,1.9-0.885,3.559
	c2.031-2.249,2.719-4.272,8.232-4.272c0.072,0,0,7.109,0,7.109s-5.15-1.275-7,0.574S127.854,43.77,127.225,59.088z"/>
<path fill="#8C8C8C" d="M117.227,24.633l-6.705,2.325l-1.541,6.244h-4.273v4.105h3.374c0,0-3.598,12.875-2.924,16.812
	c0.675,4.273,4.836,5.172,7.31,5.06s3.149-1.911,3.036-2.586s-3.487,0.644-3.824-2.393c-0.225-1.799,2.812-16.893,2.812-16.893
	h5.285v-4.105h-4.161L117.227,24.633z"/>
<path fill="#8C8C8C" d="M187.104,58.691c0.994-0.821,0.33-2.463-0.53-2.661c-0.97-2.011,2.023-13.763,2.023-16.98
	s-5.397-9.671-16.53-3.599c-1.079,0.686-0.682,1.808-0.416,2.183s0.766,0.625,1,0.375c1.047-1.141,5.602-2.333,7.737-0.084
	c1.462,1.35,1.396,3.958,0.383,4.97c-1.236,0.112-13.427-0.246-14.889,7.513c-2.522,13.777,12.92,6.522,13.719,5.96
	s0.706,1.626,2.003,2.548C185.125,59.223,186.41,59.264,187.104,58.691z M179.396,52.935c-1.25,3.292-5.891,2.789-6.166,0.459
	c-1-7.792,7.041-7.209,7.041-7.209S180.646,49.643,179.396,52.935z"/>
<path fill="#8C8C8C" d="M98.272,40.792l2.332-3.939c0,0-1.9-4.045-7.511-4.045s-8.848,4.046-8.848,8.848s10.682,8.417,8.093,13.164
	c-4.316,4.424-8.872-2.792-8.782-3.266c-0.326,0.47-2.56,3.549-2.452,3.549c0.54,1.079,2.5,4.5,8.752,4.572
	c5.179,0.06,8.309-3.776,8.417-8.523c0.108-6.366-9.172-9.604-9.28-12.517S95.144,32.375,98.272,40.792z"/>
<path d="M86.042,31.416c-1-0.938-1.75,0.313-4,1.25s-3,0.813-5.25,0.5c-3.688-0.813-10.17-0.57-11.875,0.25
	c-11.386,4.572-5.281,13.031-3.422,14.719c-0.016,0-2.773,1.453-3.176,3.735c-0.518,2.933,0.831,4.52,0.873,4.561
	c-3.72,0.193-6.112,3.934-5.536,6.997c0.62,3.299,4.553,5.931,10.184,5.953c11.904,0.259,12.521-7.353,12.521-7.353
	c1.629-9.258-6.222-9.685-11.817-9.25c-2.025-1.809-0.445-3.496-0.531-3.496C82.917,49.728,78.158,37.12,78.158,37.12
	C81.35,36.343,87.604,32.916,86.042,31.416z M60.722,57.939c7.405,1.336,10.385-0.362,10.892,3.413
	c0.219,3.684-2.908,4.737-6.545,4.963s-6.287-1.612-6.433-3.975C58.491,59.977,60.555,60.221,60.722,57.939z M72.161,41.835
	c-0.684,3.028-2.782,5.136-4.687,4.706c-1.905-0.431-2.894-3.234-2.211-6.263c0.684-3.029,2.782-5.137,4.687-4.707
	C71.855,36.002,72.845,38.806,72.161,41.835z"/>
<path fill="#FF3131" d="M47.141,5.199c-5.409,0-13.323-4.407-21.036-4.407S13.785,5.199,12.983,5.8
	c-0.801,0.601-1.303,2.904,1.102,2.203s4.407-0.701,8.214-0.701s12.922,5.209,22.138,5.209S61.365,5.4,63.068,2.895
	s0.1-3.306-1.202-2.704C60.563,0.792,52.15,5.199,47.141,5.199z"/>
<path fill="#319831" d="M70.639,18.921c-5.683,0-13.997-4.406-22.1-4.406s-12.944,4.406-13.786,5.008s-1.369,2.904,1.157,2.203
	s4.63-0.701,8.629-0.701c3.999,0,13.576,5.209,23.257,5.209s17.785-7.111,19.574-9.615c1.789-2.505,0.105-3.307-1.263-2.705
	S75.901,18.921,70.639,18.921z"/>
<path fill="#3232CC" d="M37.936,34.063c-5.893,0-14.515-4.761-22.918-4.761c-8.403,0-13.424,4.761-14.297,5.41
	s-1.419,3.137,1.2,2.379c2.62-0.757,4.802-0.757,8.949-0.757S24.949,41.96,34.99,41.96c10.04,0,18.443-7.681,20.299-10.386
	s0.109-3.57-1.31-2.921C52.56,29.302,43.393,34.063,37.936,34.063z"/>
</svg>


Index: phonon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/phonon/devel/phonon.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- phonon.spec	8 Jan 2009 21:00:00 -0000	1.19
+++ phonon.spec	8 Jan 2009 21:11:09 -0000	1.20
@@ -1,7 +1,7 @@
 Summary: Multimedia framework api
 Name:    phonon
 Version: 4.2.96
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 Group:   System Environment/Libraries
 License: LGPLv2+
@@ -144,6 +144,9 @@
 
 
 %changelog
+* Thu Jan 08 2009 Lorenzo Villani <lvillani at binaryhelix.net> - 4.2.96-2
+- add gstreaer-logo.svg
+
 * Thu Jan 08 2009 Lorenzo Villani <lvillani at binaryhelix.net> - 4.2.96-1
 - 4.2.96
 - rebase phonon-4.2.0-pulseaudio.patch (-> phonon-4.2.96-pulseaudio.patch)



From spot at fedoraproject.org  Thu Jan  8 21:18:46 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Thu,  8 Jan 2009 21:18:46 +0000 (UTC)
Subject: rpms/ntfs-3g/F-10 ntfs-3g.spec,1.39,1.40
Message-ID: <20090108211846.C92CC700FD@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/extras/rpms/ntfs-3g/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv465/F-10

Modified Files:
	ntfs-3g.spec 
Log Message:
move pkgconfig Requires to -devel package where it belongs


Index: ntfs-3g.spec
===================================================================
RCS file: /cvs/extras/rpms/ntfs-3g/F-10/ntfs-3g.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- ntfs-3g.spec	2 Dec 2008 16:15:10 -0000	1.39
+++ ntfs-3g.spec	8 Jan 2009 21:18:16 -0000	1.40
@@ -5,7 +5,7 @@
 Name:		ntfs-3g
 Summary: 	Linux NTFS userspace driver 
 Version:	1.5130
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GPLv2+
 Group:		System Environment/Base
 Source0:	http://ntfs-3g.org/ntfs-3g-%{version}.tgz
@@ -17,7 +17,6 @@
 BuildRequires:	fuse-devel
 Requires:	fuse
 %endif
-Requires:	pkgconfig
 Epoch:		2
 Provides:	ntfsprogs-fuse = %{epoch}:%{version}-%{release}
 Obsoletes:	ntfsprogs-fuse
@@ -41,6 +40,7 @@
 Summary:	Development files and libraries for ntfs-3g
 Group:		Development/Libraries
 Requires:	%{name} = %{epoch}:%{version}-%{release}
+Requires:	pkgconfig
 
 %description devel
 Headers and libraries for developing applications that use ntfs-3g 
@@ -128,6 +128,9 @@
 %{_libdir}/pkgconfig/libntfs-3g.pc
 
 %changelog
+* Thu Jan  8 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 2:1.5130-2
+- move pkgconfig Requires to -devel package where it belongs
+
 * Tue Dec  2 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 2:1.5130-1
 - update to 1.5130
 



From spot at fedoraproject.org  Thu Jan  8 21:18:46 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Thu,  8 Jan 2009 21:18:46 +0000 (UTC)
Subject: rpms/ntfs-3g/F-9 ntfs-3g.spec,1.39,1.40
Message-ID: <20090108211846.D17D87011C@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-serv465/F-9

Modified Files:
	ntfs-3g.spec 
Log Message:
move pkgconfig Requires to -devel package where it belongs


Index: ntfs-3g.spec
===================================================================
RCS file: /cvs/extras/rpms/ntfs-3g/F-9/ntfs-3g.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- ntfs-3g.spec	2 Dec 2008 16:15:10 -0000	1.39
+++ ntfs-3g.spec	8 Jan 2009 21:18:16 -0000	1.40
@@ -5,7 +5,7 @@
 Name:		ntfs-3g
 Summary: 	Linux NTFS userspace driver 
 Version:	1.5130
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GPLv2+
 Group:		System Environment/Base
 Source0:	http://ntfs-3g.org/ntfs-3g-%{version}.tgz
@@ -17,7 +17,6 @@
 BuildRequires:	fuse-devel
 Requires:	fuse
 %endif
-Requires:	pkgconfig
 Epoch:		2
 Provides:	ntfsprogs-fuse = %{epoch}:%{version}-%{release}
 Obsoletes:	ntfsprogs-fuse
@@ -41,6 +40,7 @@
 Summary:	Development files and libraries for ntfs-3g
 Group:		Development/Libraries
 Requires:	%{name} = %{epoch}:%{version}-%{release}
+Requires:	pkgconfig
 
 %description devel
 Headers and libraries for developing applications that use ntfs-3g 
@@ -128,6 +128,9 @@
 %{_libdir}/pkgconfig/libntfs-3g.pc
 
 %changelog
+* Thu Jan  8 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 2:1.5130-2
+- move pkgconfig Requires to -devel package where it belongs
+
 * Tue Dec  2 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 2:1.5130-1
 - update to 1.5130
 



From spot at fedoraproject.org  Thu Jan  8 21:18:47 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Thu,  8 Jan 2009 21:18:47 +0000 (UTC)
Subject: rpms/ntfs-3g/devel ntfs-3g.spec,1.40,1.41
Message-ID: <20090108211847.10199700FD@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/extras/rpms/ntfs-3g/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv465/devel

Modified Files:
	ntfs-3g.spec 
Log Message:
move pkgconfig Requires to -devel package where it belongs


Index: ntfs-3g.spec
===================================================================
RCS file: /cvs/extras/rpms/ntfs-3g/devel/ntfs-3g.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- ntfs-3g.spec	22 Dec 2008 20:02:05 -0000	1.40
+++ ntfs-3g.spec	8 Jan 2009 21:18:16 -0000	1.41
@@ -7,7 +7,7 @@
 Name:		ntfs-3g
 Summary: 	Linux NTFS userspace driver 
 Version:	1.5222
-Release:	0.1.%{subrel}%{?dist}
+Release:	0.2.%{subrel}%{?dist}
 License:	GPLv2+
 Group:		System Environment/Base
 Source0:	http://ntfs-3g.org/ntfs-3g-%{version}-%{subrel}.tgz
@@ -19,7 +19,6 @@
 BuildRequires:	fuse-devel
 Requires:	fuse
 %endif
-Requires:	pkgconfig
 Epoch:		2
 Provides:	ntfsprogs-fuse = %{epoch}:%{version}-%{release}
 Obsoletes:	ntfsprogs-fuse
@@ -43,6 +42,7 @@
 Summary:	Development files and libraries for ntfs-3g
 Group:		Development/Libraries
 Requires:	%{name} = %{epoch}:%{version}-%{release}
+Requires:	pkgconfig
 
 %description devel
 Headers and libraries for developing applications that use ntfs-3g 
@@ -130,6 +130,9 @@
 %{_libdir}/pkgconfig/libntfs-3g.pc
 
 %changelog
+* Thu Jan  8 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 2:1.5222-0.2.RC
+- move pkgconfig Requires to -devel package where it belongs
+
 * Mon Dec 22 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 2:1.5222-0.1.RC
 - 1.5222-RC
 



From than at fedoraproject.org  Thu Jan  8 21:21:00 2009
From: than at fedoraproject.org (Than Ngo)
Date: Thu,  8 Jan 2009 21:21:00 +0000 (UTC)
Subject: rpms/kdelibs/devel kdelibs-4.1.96-cmake.patch, NONE,
	1.1 kdelibs.spec, 1.408, 1.409
Message-ID: <20090108212101.00699700FD@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdelibs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv774

Modified Files:
	kdelibs.spec 
Added Files:
	kdelibs-4.1.96-cmake.patch 
Log Message:
kdepim cmake files in correct place


kdelibs-4.1.96-cmake.patch:

--- NEW FILE kdelibs-4.1.96-cmake.patch ---
diff -up kdelibs-4.1.96/cmake/modules/FindKdepimLibs.cmake.orig kdelibs-4.1.96/cmake/modules/FindKdepimLibs.cmake
--- kdelibs-4.1.96/cmake/modules/FindKdepimLibs.cmake.orig	2009-01-08 22:14:13.000000000 +0100
+++ kdelibs-4.1.96/cmake/modules/FindKdepimLibs.cmake	2009-01-08 22:14:59.000000000 +0100
@@ -64,9 +64,13 @@
 # See kdepimlibs/CMakeLists.txt and kdepimlibs/KdepimLibsConfig.cmake.in 
 # for details. Alex
 
-
+set(KDEPIMLIBS_VERSION 4.2.0)
+set(_KdepimLibsConfig_INSTALL_DIR ${LIB_INSTALL_DIR}/KdepimLibs-${KDEPIMLIBS_VERSION}/cmake)
+if(KDE4_USE_COMMON_CMAKE_PACKAGE_CONFIG_DIR)
+   set(_KdepimLibsConfig_INSTALL_DIR ${LIB_INSTALL_DIR}/cmake/KdepimLibs-${KDEPIMLIBS_VERSION} )
+endif(KDE4_USE_COMMON_CMAKE_PACKAGE_CONFIG_DIR)
 set(_KdepimLibs_FIND_QUIETLY  ${KdepimLibs_FIND_QUIETLY})
-find_package(KdepimLibs ${KdepimLibs_FIND_VERSION} QUIET NO_MODULE PATHS ${KDE4_LIB_DIR}/KdepimLibs/cmake )
+find_package(KdepimLibs ${KdepimLibs_FIND_VERSION} QUIET NO_MODULE PATHS ${_KdepimLibsConfig_INSTALL_DIR} )
 set(KdepimLibs_FIND_QUIETLY ${_KdepimLibs_FIND_QUIETLY})
 
 include(FindPackageHandleStandardArgs)


Index: kdelibs.spec
===================================================================
RCS file: /cvs/extras/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.408
retrieving revision 1.409
diff -u -r1.408 -r1.409
--- kdelibs.spec	7 Jan 2009 21:51:50 -0000	1.408
+++ kdelibs.spec	8 Jan 2009 21:20:30 -0000	1.409
@@ -1,6 +1,6 @@
 Summary: K Desktop Environment 4 - Libraries
 Version: 4.1.96
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs
@@ -73,6 +73,7 @@
 Patch20: kdelibs-4.1.70-cmake.patch
 # allows to define a default wallpaper via plasmarc:wallpaper
 Patch21: kdelibs-4.1.85-plasma-default-wallpaper.patch
+Patch22: kdelibs-4.1.96-cmake.patch
 
 BuildRequires: qt4-devel >= 4.4.0
 Requires: qt4 >= %{_qt4_version}
@@ -197,6 +198,7 @@
 %patch18 -p1 -b .kstandarddirs
 %patch20 -p1 -b .xxcmake
 %patch21 -p1 -b .plasma-default-wallpaper
+%patch22 -p1 -b .kdepimlibs-cmake
 
 %build
 
@@ -358,6 +360,9 @@
 
 
 %changelog
+* Thu Jan 08 2009 Than Ngo <than at redhat.com> - 4.1.96-2
+- kdepim cmake files in correct place
+
 * Wed Jan 07 2009 Than Ngo <than at redhat.com> - 4.1.96-1
 - 4.2rc1
 



From jcollie at fedoraproject.org  Thu Jan  8 21:26:19 2009
From: jcollie at fedoraproject.org (Jeffrey C. Ollie)
Date: Thu,  8 Jan 2009 21:26:19 +0000 (UTC)
Subject: rpms/asterisk/F-10 .cvsignore, 1.18, 1.19 asterisk.spec, 1.41,
	1.42 sources, 1.18, 1.19
Message-ID: <20090108212619.D6CDF700FD@cvs1.fedora.phx.redhat.com>

Author: jcollie

Update of /cvs/pkgs/rpms/asterisk/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1438

Modified Files:
	.cvsignore asterisk.spec sources 
Log Message:
* Thu Jan  8 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6.0.3-1
- Update to 1.6.0.3 to fix AST-2009-001/CVE-2009-0041
- http://downloads.digium.com/pub/security/AST-2009-001.html



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/F-10/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- .cvsignore	4 Jan 2009 14:48:26 -0000	1.18
+++ .cvsignore	8 Jan 2009 21:25:49 -0000	1.19
@@ -1 +1 @@
-asterisk-1.6.0.2-stripped.tar.gz
+asterisk-1.6.0.3-stripped.tar.gz


Index: asterisk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/F-10/asterisk.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- asterisk.spec	5 Jan 2009 03:10:29 -0000	1.41
+++ asterisk.spec	8 Jan 2009 21:25:49 -0000	1.42
@@ -2,8 +2,8 @@
 
 Summary: The Open Source PBX
 Name: asterisk
-Version: 1.6.0.2
-Release: 4%{?dist}
+Version: 1.6.0.3
+Release: 1%{?dist}
 License: GPLv2
 Group: Applications/Internet
 URL: http://www.asterisk.org/
@@ -19,13 +19,13 @@
 
 # MD5 Sums
 # ========
-# 22068805be6b11831c507861293fc1f5  asterisk-1.6.0.2.tar.gz
-# 6782a95a088a78ebb52252926e94a186  asterisk-1.6.0.2-stripped.tar.gz
+# 0797cfc8834b06e5a0169b2fda6f7bb9  asterisk-1.6.0.3.tar.gz
+# eefe39842fac3f5bd3c7b3a6c378bb5c  asterisk-1.6.0.3-stripped.tar.gz
 #
 # SHA1 Sums
 # =========
-# 7d7c63f5c8ad17cc7dfd1bdd0fd27eea4fcef2c1  asterisk-1.6.0.2.tar.gz
-# 9aa182314ed4cc72bd39c7bd6897812b22bde2a2  asterisk-1.6.0.2-stripped.tar.gz
+# bdede6d5113a5b0006b186a72e81c886d48ae4db  asterisk-1.6.0.3.tar.gz
+# e14b25b16d49a8b7400353e0588cc8e8d1768c5c  asterisk-1.6.0.3-stripped.tar.gz
 
 Source0: asterisk-%{version}-stripped.tar.gz
 Source1: asterisk-logrotate
@@ -43,7 +43,6 @@
 Patch8:  0008-Revert-changes-to-pbx_lua-from-rev-126363-that-cause.patch
 Patch9:  0009-change-configure.ac-to-look-for-pkg-config-gmime-2.4.patch
 Patch10: 0010-fix-the-AST_PROG_SED-problem-that-makes-.-bootstrap.patch
-Patch11: 0011-Merged-revisions-160170-160172-via-svnmerge-from.patch
 Patch12: 0012-Merged-revisions-162275-via-svnmerge-from.patch
 Patch13: 0013-Update-autoconf.patch
 Patch14: 0014-Fix-up-some-paths.patch
@@ -432,7 +431,6 @@
 %patch8 -p1
 %patch9 -p1
 %patch10 -p1
-%patch11 -p1
 %patch12 -p1
 %patch13 -p1
 %patch14 -p1
@@ -1054,6 +1052,10 @@
 %{_libdir}/asterisk/modules/app_voicemail_plain.so
 
 %changelog
+* Thu Jan  8 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6.0.3-1
+- Update to 1.6.0.3 to fix AST-2009-001/CVE-2009-0041
+- http://downloads.digium.com/pub/security/AST-2009-001.html
+
 * Sun Jan  4 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6.0.2-4
 - Fedora Directory Server compatibility patch/subpackage. BZ#452176
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/F-10/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources	4 Jan 2009 14:48:27 -0000	1.18
+++ sources	8 Jan 2009 21:25:49 -0000	1.19
@@ -1 +1 @@
-6782a95a088a78ebb52252926e94a186  asterisk-1.6.0.2-stripped.tar.gz
+eefe39842fac3f5bd3c7b3a6c378bb5c  asterisk-1.6.0.3-stripped.tar.gz



From than at fedoraproject.org  Thu Jan  8 21:43:02 2009
From: than at fedoraproject.org (Than Ngo)
Date: Thu,  8 Jan 2009 21:43:02 +0000 (UTC)
Subject: rpms/kde-l10n/devel kde-l10n.spec,1.55,1.56
Message-ID: <20090108214302.B4263700FD@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kde-l10n/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2877

Modified Files:
	kde-l10n.spec 
Log Message:
fix rpm file list



Index: kde-l10n.spec
===================================================================
RCS file: /cvs/extras/rpms/kde-l10n/devel/kde-l10n.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- kde-l10n.spec	7 Jan 2009 21:05:52 -0000	1.55
+++ kde-l10n.spec	8 Jan 2009 21:42:32 -0000	1.56
@@ -1149,6 +1149,7 @@
 %lang(nb) %{_kde4_appsdir}/khangman/nb.txt
 %lang(nb) %{_kde4_appsdir}/kvtml/nb/
 %lang(nb) %{_kde4_docdir}/HTML/nb/
+%lang(nb) %{_kde4_appsdir}/klettres/nb
 
 %files Norwegian-Nynorsk
 %defattr(-,root,root)



From nsantos at fedoraproject.org  Thu Jan  8 22:00:23 2009
From: nsantos at fedoraproject.org (Nuno Santos)
Date: Thu,  8 Jan 2009 22:00:23 +0000 (UTC)
Subject: rpms/qpidc/devel corosync.patch,1.2,1.3
Message-ID: <20090108220023.6E098700FD@cvs1.fedora.phx.redhat.com>

Author: nsantos

Update of /cvs/extras/rpms/qpidc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4559

Modified Files:
	corosync.patch 
Log Message:
revised corosync patch, from svn rev 732839

corosync.patch:

Index: corosync.patch
===================================================================
RCS file: /cvs/extras/rpms/qpidc/devel/corosync.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- corosync.patch	7 Jan 2009 16:51:12 -0000	1.2
+++ corosync.patch	8 Jan 2009 22:00:22 -0000	1.3
@@ -13,5 +13,56 @@
  #  include <corosync/cpg.h>
  #else
  #  error "No cpg.h header file available"
-
-
+--- src/qpid/cluster/Cpg.cpp (original)
++++ src/qpid/cluster/Cpg.cpp Thu Jan  8 13:56:21 2009
+@@ -126,8 +126,16 @@
+     }
+ }
+ 
+-void Cpg::dispatch(cpg_dispatch_t type) {
+-    check(cpg_dispatch(handle,type), "Error in CPG dispatch");
++void Cpg::dispatchOne() {
++    check(cpg_dispatch(handle,CPG_DISPATCH_ONE), "Error in CPG dispatch");
++}
++
++void Cpg::dispatchAll() {
++    check(cpg_dispatch(handle,CPG_DISPATCH_ALL), "Error in CPG dispatch");
++}
++
++void Cpg::dispatchBlocking() {
++    check(cpg_dispatch(handle,CPG_DISPATCH_BLOCKING), "Error in CPG dispatch");
+ }
+ 
+ string Cpg::errorStr(cpg_error_t err, const std::string& msg) {
+@@ -135,7 +143,7 @@
+       case CPG_OK: return msg+": ok";
+       case CPG_ERR_LIBRARY: return msg+": library error";
+       case CPG_ERR_TIMEOUT: return msg+": timeout";
+-      case CPG_ERR_TRY_AGAIN: return msg+": timeout. The aisexec daemon may not be running";
++      case CPG_ERR_TRY_AGAIN: return msg+": timeout.";
+       case CPG_ERR_INVALID_PARAM: return msg+": invalid param";
+       case CPG_ERR_NO_MEMORY: return msg+": no memory";
+       case CPG_ERR_BAD_HANDLE: return msg+": bad handle";
+--- src/qpid/cluster/Cpg.h (original)
++++ src/qpid/cluster/Cpg.h Thu Jan  8 13:56:21 2009
+@@ -94,17 +94,9 @@
+     /** Disconnect from CPG */
+     void shutdown();
+     
+-    /** Dispatch CPG events.
+-     *@param type one of
+-     * - CPG_DISPATCH_ONE - dispatch exactly one event.
+-     * - CPG_DISPATCH_ALL - dispatch all available events, don't wait.
+-     * - CPG_DISPATCH_BLOCKING - blocking dispatch loop.
+-     */
+-    void dispatch(cpg_dispatch_t type);
+-
+-    void dispatchOne() { dispatch(CPG_DISPATCH_ONE); }
+-    void dispatchAll() { dispatch(CPG_DISPATCH_ALL); }
+-    void dispatchBlocking() { dispatch(CPG_DISPATCH_BLOCKING); }
++    void dispatchOne();
++    void dispatchAll();
++    void dispatchBlocking();
+ 
+     void join(const std::string& group);    
+     void leave();



From clumens at fedoraproject.org  Thu Jan  8 22:04:40 2009
From: clumens at fedoraproject.org (Christopher Edward Lumens)
Date: Thu,  8 Jan 2009 22:04:40 +0000 (UTC)
Subject: rpms/pykickstart/devel .cvsignore, 1.102, 1.103 pykickstart.spec,
	1.111, 1.112 sources, 1.111, 1.112
Message-ID: <20090108220440.CE286700FD@cvs1.fedora.phx.redhat.com>

Author: clumens

Update of /cvs/pkgs/rpms/pykickstart/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4933

Modified Files:
	.cvsignore pykickstart.spec sources 
Log Message:
New version.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pykickstart/devel/.cvsignore,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -r1.102 -r1.103
--- .cvsignore	23 Dec 2008 15:05:10 -0000	1.102
+++ .cvsignore	8 Jan 2009 22:04:10 -0000	1.103
@@ -36,3 +36,4 @@
 pykickstart-1.46.tar.gz
 pykickstart-1.47.tar.gz
 pykickstart-1.48.tar.gz
+pykickstart-1.49.tar.gz


Index: pykickstart.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pykickstart/devel/pykickstart.spec,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -r1.111 -r1.112
--- pykickstart.spec	23 Dec 2008 15:05:10 -0000	1.111
+++ pykickstart.spec	8 Jan 2009 22:04:10 -0000	1.112
@@ -3,7 +3,7 @@
 Summary:  A python library for manipulating kickstart files
 Name: pykickstart
 Url: http://fedoraproject.org/wiki/pykickstart
-Version: 1.48
+Version: 1.49
 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
+* Thu Jan 08 2009 Chris Lumens <clumens at redhat.com> - 1.49-1
+- Add upgrade --root-device (atodorov, #471232).
+- Use python's builtin set rather than the Sets module (#477836, dcantrell).
+
 * Tue Dec 23 2008 Chris Lumens <clumens at redhat.com> - 1.48-1
 - Allow ignoring group metadata from repos, using a '--ignoregroups'
   boolean. (notting)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pykickstart/devel/sources,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -r1.111 -r1.112
--- sources	23 Dec 2008 15:05:10 -0000	1.111
+++ sources	8 Jan 2009 22:04:10 -0000	1.112
@@ -1 +1 @@
-4dccaef0d6fdb44d27fe4c490c1de60a  pykickstart-1.48.tar.gz
+695704deec30464a35799c5e9d5ed1d5  pykickstart-1.49.tar.gz



From katzj at fedoraproject.org  Thu Jan  8 22:06:34 2009
From: katzj at fedoraproject.org (Jeremy Katz)
Date: Thu,  8 Jan 2009 22:06:34 +0000 (UTC)
Subject: rpms/isomd5sum/devel .cvsignore, 1.5, 1.6 isomd5sum.spec, 1.9,
	1.10 sources, 1.6, 1.7 isomd5sum-1.0.4-manpage-permissions.patch,
	1.1, NONE isomd5sum-1.0.4-sparc64.patch, 1.1, NONE
Message-ID: <20090108220634.B28B1700FD@cvs1.fedora.phx.redhat.com>

Author: katzj

Update of /cvs/pkgs/rpms/isomd5sum/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5177

Modified Files:
	.cvsignore isomd5sum.spec sources 
Removed Files:
	isomd5sum-1.0.4-manpage-permissions.patch 
	isomd5sum-1.0.4-sparc64.patch 
Log Message:
* Thu Jan  8 2009 Jeremy Katz <katzj at redhat.com> - 1:1.0.5-1
- Don't install the unused python module (#479005)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/isomd5sum/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	8 Feb 2008 04:31:14 -0000	1.5
+++ .cvsignore	8 Jan 2009 22:06:04 -0000	1.6
@@ -1 +1 @@
-isomd5sum-1.0.4.tar.bz2
+isomd5sum-1.0.5.tar.bz2


Index: isomd5sum.spec
===================================================================
RCS file: /cvs/pkgs/rpms/isomd5sum/devel/isomd5sum.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- isomd5sum.spec	29 Nov 2008 16:47:55 -0000	1.9
+++ isomd5sum.spec	8 Jan 2009 22:06:04 -0000	1.10
@@ -1,18 +1,14 @@
-%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
-
 Summary: Utilities for working with md5sum implanted in ISO images
 Name: isomd5sum
-Version: 1.0.4
-Release: 4%{?dist}
+Version: 1.0.5
+Release: 1%{?dist}
 Epoch: 1
 License: GPLv2+
 Group: Applications/System
 URL: http://git.fedorahosted.org/git/?p=isomd5sum.git;a=summary
 Source0: http://fedorahosted.org/releases/i/s/isomd5sum/%{name}-%{version}.tar.bz2
-Patch0: isomd5sum-1.0.4-sparc64.patch
-Patch1: isomd5sum-1.0.4-manpage-permissions.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildRequires: python-devel popt-devel
+BuildRequires: popt-devel
 
 %description
 The isomd5sum package contains utilities for implanting and verifying
@@ -30,15 +26,13 @@
 
 %prep
 %setup -q
-%patch0 -p1 
-%patch1 -p1 
 
 %build
-make
+make checkisomd5 implantisomd5
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make DESTDIR=$RPM_BUILD_ROOT install
+make DESTDIR=$RPM_BUILD_ROOT install-bin install-devel
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -50,7 +44,6 @@
 /usr/bin/implantisomd5
 /usr/bin/checkisomd5
 %{_mandir}/man*/*
-%{python_sitearch}/pyisomd5sum.so
 
 %files devel
 %defattr(-,root,root,-)
@@ -58,6 +51,9 @@
 %{_libdir}/*.a
 
 %changelog
+* Thu Jan  8 2009 Jeremy Katz <katzj at redhat.com> - 1:1.0.5-1
+- Don't install the unused python module (#479005)
+
 * Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 1:1.0.4-4
 - Rebuild for Python 2.6
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/isomd5sum/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	8 Feb 2008 04:31:14 -0000	1.6
+++ sources	8 Jan 2009 22:06:04 -0000	1.7
@@ -1 +1 @@
-0550f7c4546e5ca7885339ede6761ed3  isomd5sum-1.0.4.tar.bz2
+d98eb78c77e2ce94a389d243d76d845c  isomd5sum-1.0.5.tar.bz2


--- isomd5sum-1.0.4-manpage-permissions.patch DELETED ---


--- isomd5sum-1.0.4-sparc64.patch DELETED ---



From limb at fedoraproject.org  Thu Jan  8 22:11:55 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Thu,  8 Jan 2009 22:11:55 +0000 (UTC)
Subject: rpms/ddd/devel .cvsignore,1.2,1.3 ddd.spec,1.7,1.8 sources,1.2,1.3
Message-ID: <20090108221155.49099700FD@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/ddd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5690

Modified Files:
	.cvsignore ddd.spec sources 
Log Message:
New upstream, new language support.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ddd/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	30 Sep 2006 01:19:12 -0000	1.2
+++ .cvsignore	8 Jan 2009 22:11:24 -0000	1.3
@@ -1 +1 @@
-ddd-3.3.11.tar.gz
+ddd-3.3.12-rc1.tar.gz


Index: ddd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ddd/devel/ddd.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ddd.spec	15 Dec 2008 15:19:57 -0000	1.7
+++ ddd.spec	8 Jan 2009 22:11:24 -0000	1.8
@@ -1,16 +1,18 @@
 Summary: GUI for several command-line debuggers
 Name: ddd
-Version: 3.3.11
-Release: 19%{?dist}
+Version: 3.3.12
+Release: 1.rc1%{?dist}
 License: GPLv2+
 Group: Development/Debuggers
 URL: http://www.gnu.org/software/ddd/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Source0: http://dl.sf.net/ddd/ddd-%{version}.tar.gz
+#Source0: http://dl.sf.net/ddd/ddd-%{version}.tar.gz
+#For rc:
+Source0: ftp://alpha.gnu.org/gnu/ddd/ddd-3.3.12-rc1.tar.gz
 Source1: ddd.desktop
 Source2: ddd.png
 Patch1: ddd-3.3.11-lang.patch
-Patch2: ddd-3.3.11-xprint.patch
+#Patch2: ddd-3.3.11-xprint.patch
 Patch3: ddd-3.3.11-htmlview.patch
 
 Requires(post): /sbin/install-info
@@ -38,9 +40,9 @@
 interface with full editing, history and completion capabilities.
 
 %prep
-%setup -q
+%setup -qn ddd-%{version}-rc1
 %patch1 -p1 -b .lang
-%patch2 -p1 -b .xprint
+#%patch2 -p1 -b .xprint
 %patch3 -p1 -b .htmlview
 
 %build
@@ -80,24 +82,29 @@
 
 %files
 %defattr(-,root,root,0755)
-%doc doc/ddd.* AUTHORS COPYING COPYING.DOC CREDITS 
-%doc INSTALL NEWS PROBLEMS README TIPS doc/ddd-themes.* doc/ddd-paper.*
+%doc AUTHORS COPYING COPYING.DOC CREDITS 
+%doc INSTALL NEWS PROBLEMS README TIPS doc/ddd-paper.*
 %{_bindir}/ddd
 %{_datadir}/applications/*.desktop
-%dir %{_datadir}/%{name}-%{version}
-%dir %{_datadir}/%{name}-%{version}/ddd
-%{_datadir}/%{name}-%{version}/COPYING
-%{_datadir}/%{name}-%{version}/NEWS
-%config(noreplace) %{_datadir}/%{name}-%{version}/ddd/Ddd
-%{_datadir}/%{name}-%{version}/themes/
-%{_datadir}/%{name}-%{version}/vsllib/
+%dir %{_datadir}/%{name}-%{version}-rc1
+%dir %{_datadir}/%{name}-%{version}-rc1/ddd
+%{_datadir}/%{name}-%{version}-rc1/COPYING
+%{_datadir}/%{name}-%{version}-rc1/NEWS
+%config(noreplace) %{_datadir}/%{name}-%{version}-rc1/ddd/Ddd
+%{_datadir}/%{name}-%{version}-rc1/themes/
+%{_datadir}/%{name}-%{version}-rc1/vsllib/
 %{_datadir}/icons/hicolor/48x48/apps/ddd.png
 %{_infodir}/ddd*
 %{_mandir}/man1/ddd.1*
 
 %changelog
+* Thu Jan 08 2009 Jon Ciesla <limb at jcomserv.net> - 3.3.12-1.rc1
+- New upstream.
+- Updated htmlview patch.
+- Dropped xprint patch, applied upstream.
+
 * Mon Dec 15 2008 Jon Ciesla <limb at jcomserv.net> - 3.3.11-19
-- Added fot requires, BZ 476531.
+- Added font requires, BZ 476531.
 
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 3.3.11-18
 - Autorebuild for GCC 4.3


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ddd/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	30 Sep 2006 01:19:12 -0000	1.2
+++ sources	8 Jan 2009 22:11:24 -0000	1.3
@@ -1 +1 @@
-f19437ebfdb5f2667d6de30f700dd319  ddd-3.3.11.tar.gz
+2ef027a540c9ecbcc6ec44b8eaa2828b  ddd-3.3.12-rc1.tar.gz



From limb at fedoraproject.org  Thu Jan  8 22:29:24 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Thu,  8 Jan 2009 22:29:24 +0000 (UTC)
Subject: rpms/ddd/devel ddd-3.3.11-htmlview.patch,1.2,1.3
Message-ID: <20090108222925.402DA700FD@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/ddd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7798

Modified Files:
	ddd-3.3.11-htmlview.patch 
Log Message:
Forgot to add updated patch.


ddd-3.3.11-htmlview.patch:

Index: ddd-3.3.11-htmlview.patch
===================================================================
RCS file: /cvs/pkgs/rpms/ddd/devel/ddd-3.3.11-htmlview.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ddd-3.3.11-htmlview.patch	20 Nov 2007 20:32:27 -0000	1.2
+++ ddd-3.3.11-htmlview.patch	8 Jan 2009 22:28:53 -0000	1.3
@@ -1,24 +1,5 @@
---- ddd-3.3.11/ddd/Ddd.in.m4.htmlview	2004-09-01 13:07:37.000000000 -0500
-+++ ddd-3.3.11/ddd/Ddd.in.m4	2006-09-27 15:28:53.000000000 -0500
-@@ -336,20 +336,7 @@ Ddd*wwwPage: http://www.gnu.org/software
- ! letting all these commands fail may take some time...
- 
- Ddd*wwwCommand: \
--   mozilla -remote 'openURL(@URL@)' \
--|| netscape -remote 'openURL(@URL@)' \
--|| ${WWWBROWSER-false} '@URL@' \
--|| galeon 'openURL(@URL@)' \
--|| skipstone 'openURL(@URL@)' \
--|| light 'openURL(@URL@)' \
--|| mozilla '@URL@' \
--|| konqueror 'openURL(@URL@)' \
--|| kfmbrowser '@URL@' \
--|| netscape '@URL@' \
--|| gnudoit '(w3-fetch \042 at URL@\042)' \
--|| mosaic '@URL@' \
--|| Mosaic '@URL@' \
--|| @XTERM@ -e lynx '@URL@'
+--- ddd-3.3.12-rc1/ddd/Ddd.in.m4.orig	2009-01-08 13:52:20.000000000 -0600
++++ ddd-3.3.12-rc1/ddd/Ddd.in.m4	2009-01-08 13:52:20.000000000 -0600
+@@ -355 +355 @@
+-
 + xdg-open '@URL@'
- 
- 
- ! Plotting stuff.



From jcollie at fedoraproject.org  Thu Jan  8 22:30:37 2009
From: jcollie at fedoraproject.org (Jeffrey C. Ollie)
Date: Thu,  8 Jan 2009 22:30:37 +0000 (UTC)
Subject: rpms/asterisk/F-9
	0008-Revert-changes-to-pbx_lua-from-rev-126363-that-cause.patch, NONE,
	1.1 0009-change-configure.ac-to-look-for-pkg-config-gmime-2.4.patch, 
	NONE,
	1.1 0010-fix-the-AST_PROG_SED-problem-that-makes-.-bootstrap.patch,
	NONE, 1.1 0012-Merged-revisions-162275-via-svnmerge-from.patch,
	NONE, 1.1 0013-Update-autoconf.patch, NONE,
	1.1 0014-Fix-up-some-paths.patch, NONE,
	1.1 0015-Add-LDAP-schema-that-is-compatible-with-Fedora-Direc.patch, 
	NONE, 1.1 .cvsignore, 1.17,
	1.18 0001-Modify-init-scripts-for-better-Fedora-compatibility.patch, 
	1.4,
	1.5 0002-Modify-modules.conf-so-that-different-voicemail-modu.patch, 
	1.4,
	1.5 0003-Allow-alternate-extensions-to-be-specified-in-users.patch,
	1.3,
	1.4 0004-Minor-changes-to-reduce-packaging-changes-made-by-th.patch, 
	1.3, 1.4 0005-Add-chan_mobile-from-asterisk-addons.patch, 1.3,
	1.4 0006-Use-pkgconfig-to-check-for-Lua.patch, 1.3,
	1.4 0007-Build-using-external-libedit.patch, 1.3,
	1.4 asterisk.spec, 1.33, 1.34 sources, 1.17,
	1.18 0008-Update-autoconf.patch, 1.2,
	NONE 0009-Revert-changes-to-pbx_lua-from-rev-126363-that-cause.patch, 
	1.2, NONE
Message-ID: <20090108223037.0A04D700FD@cvs1.fedora.phx.redhat.com>

Author: jcollie

Update of /cvs/pkgs/rpms/asterisk/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8103

Modified Files:
	.cvsignore 
	0001-Modify-init-scripts-for-better-Fedora-compatibility.patch 
	0002-Modify-modules.conf-so-that-different-voicemail-modu.patch 
	0003-Allow-alternate-extensions-to-be-specified-in-users.patch 
	0004-Minor-changes-to-reduce-packaging-changes-made-by-th.patch 
	0005-Add-chan_mobile-from-asterisk-addons.patch 
	0006-Use-pkgconfig-to-check-for-Lua.patch 
	0007-Build-using-external-libedit.patch asterisk.spec sources 
Added Files:
	0008-Revert-changes-to-pbx_lua-from-rev-126363-that-cause.patch 
	0009-change-configure.ac-to-look-for-pkg-config-gmime-2.4.patch 
	0010-fix-the-AST_PROG_SED-problem-that-makes-.-bootstrap.patch 
	0012-Merged-revisions-162275-via-svnmerge-from.patch 
	0013-Update-autoconf.patch 0014-Fix-up-some-paths.patch 
	0015-Add-LDAP-schema-that-is-compatible-with-Fedora-Direc.patch 
Removed Files:
	0008-Update-autoconf.patch 
	0009-Revert-changes-to-pbx_lua-from-rev-126363-that-cause.patch 
Log Message:
* Thu Jan  8 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6.0.3-1
- Update to 1.6.0.3 to fix AST-2009-001/CVE-2009-0041
- http://downloads.digium.com/pub/security/AST-2009-001.html


0008-Revert-changes-to-pbx_lua-from-rev-126363-that-cause.patch:

--- NEW FILE 0008-Revert-changes-to-pbx_lua-from-rev-126363-that-cause.patch ---
>From a092080315b7bfa9b7d174b6114cb957ac1590d8 Mon Sep 17 00:00:00 2001
From: Jeffrey C. Ollie <jeff at ocjtech.us>
Date: Fri, 10 Oct 2008 11:54:10 -0500
Subject: [PATCH 08/15] Revert changes to pbx_lua from rev 126363 that cause some problems.

---
 pbx/pbx_lua.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pbx/pbx_lua.c b/pbx/pbx_lua.c
index 6a600a4..a803bd5 100644
--- a/pbx/pbx_lua.c
+++ b/pbx/pbx_lua.c
@@ -42,9 +42,9 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/paths.h"
 #include "asterisk/hashtab.h"
 
-#include <lua5.1/lua.h>
-#include <lua5.1/lauxlib.h>
-#include <lua5.1/lualib.h>
+#include <lua.h>
+#include <lauxlib.h>
+#include <lualib.h>
 
 static char *config = "extensions.lua";
 static char *registrar = "pbx_lua";
-- 
1.6.1


0009-change-configure.ac-to-look-for-pkg-config-gmime-2.4.patch:

--- NEW FILE 0009-change-configure.ac-to-look-for-pkg-config-gmime-2.4.patch ---
>From 7719af5a016f40f573c90aae17910f7f77b9b4e6 Mon Sep 17 00:00:00 2001
From: Caolan McNamara <caolanm at redhat.com>
Date: Sat, 3 Jan 2009 19:06:18 -0600
Subject: [PATCH 09/15] change configure.ac to look for pkg-config gmime-2.4 instead of gmime-2.4 gmime-config

---
 configure.ac |   12 +++++++++++-
 1 files changed, 11 insertions(+), 1 deletions(-)

diff --git a/configure.ac b/configure.ac
index 12065a4..08f142d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1425,7 +1425,17 @@ then
     AST_EXT_LIB_CHECK([OSPTK], [osptk], [OSPPCryptoDecrypt], [osp/osp.h], [-lcrypto -lssl])
 fi
 
-AST_EXT_TOOL_CHECK([GMIME], [gmime])
+PBX_GMIME=0
+AC_CHECK_TOOL(PKGCONFIG, pkg-config, No)
+if test ! "x${PKGCONFIG}" = xNo; then
+   GMIME_INCLUDE=$(${PKGCONFIG} gmime-2.4 --cflags 2>/dev/null)
+   GMIME_LIB=$(${PKGCONFIG} gmime-2.4 --libs)
+   PBX_GMIME=1
+   AC_DEFINE([HAVE_GMIME], 1, [Define if your system has the GMIME libraries.])
+fi
+AC_SUBST(PBX_GMIME)
+AC_SUBST(GMIME_INCLUDE)
+AC_SUBST(GMIME_LIB)
 
 if test "$PBX_GMIME" = "1";
 then
-- 
1.6.1


0010-fix-the-AST_PROG_SED-problem-that-makes-.-bootstrap.patch:

--- NEW FILE 0010-fix-the-AST_PROG_SED-problem-that-makes-.-bootstrap.patch ---
>From 9a6c4641b2aa353c9076df9794d72fba5acdafb0 Mon Sep 17 00:00:00 2001
From: Caolan McNamara <caolanm at redhat.com>
Date: Sat, 3 Jan 2009 19:12:18 -0600
Subject: [PATCH 10/15] fix the AST_PROG_SED problem that makes ./bootstrap.sh fail

Need to regenerate configure from configure.ac after patch one with
./bootsrap.sh, so fix the broken .m4 in the autoconfig dir. (alternatively
change AST_PROG_SED to AC_PROG_SED as it is the same thing in the other .m4 in
the autoconf dir)
---
 autoconf/ast_prog_sed.m4 |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/autoconf/ast_prog_sed.m4 b/autoconf/ast_prog_sed.m4
index 283d52f..ae6cfc0 100644
--- a/autoconf/ast_prog_sed.m4
+++ b/autoconf/ast_prog_sed.m4
@@ -12,7 +12,7 @@ AC_DEFUN([AST_PROG_SED],
      done
      echo "$ac_script" | sed 99q >conftest.sed
      $as_unset ac_script || ac_script=
-     _AC_PATH_PROG_FEATURE_CHECK(SED, [sed gsed],
+     _AC_PATH_PROGS_FEATURE_CHECK(SED, [sed gsed],
 	[_AC_FEATURE_CHECK_LENGTH([ac_path_SED], [ac_cv_path_SED],
 		["$ac_path_SED" -f conftest.sed])])])
  SED="$ac_cv_path_SED"
-- 
1.6.1


0012-Merged-revisions-162275-via-svnmerge-from.patch:

--- NEW FILE 0012-Merged-revisions-162275-via-svnmerge-from.patch ---
>From 986c677766137383378252947eafb3eb8c86718a Mon Sep 17 00:00:00 2001
From: file <file at f38db490-d61c-443f-a65b-d21fe96a405b>
Date: Tue, 9 Dec 2008 20:47:11 +0000
Subject: [PATCH 12/15] Merged revisions 162275 via svnmerge from
 https://origsvn.digium.com/svn/asterisk/trunk

................
  r162275 | file | 2008-12-09 16:46:11 -0400 (Tue, 09 Dec 2008) | 11 lines

  Merged revisions 162273 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/branches/1.4

  ........
    r162273 | file | 2008-12-09 16:44:32 -0400 (Tue, 09 Dec 2008) | 4 lines

    Fix double declaration of 'x' on the PPC platform.
    (closes issue #14038)
    Reported by: ffloimair
  ........
................

git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0 at 162276 f38db490-d61c-443f-a65b-d21fe96a405b
---
 apps/app_festival.c |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/apps/app_festival.c b/apps/app_festival.c
index de8c618..4e1e47e 100644
--- a/apps/app_festival.c
+++ b/apps/app_festival.c
@@ -121,7 +121,6 @@ static int send_waveform_to_fd(char *waveform, int length, int fd)
 	int x;
 #ifdef __PPC__ 
 	char c;
-	int x;
 #endif
 	sigset_t fullset, oldset;
 
-- 
1.6.1


0013-Update-autoconf.patch:

--- NEW FILE 0013-Update-autoconf.patch ---
>From 249cd4bd1b4b9a0b99a07d44359e098c10dacbdb Mon Sep 17 00:00:00 2001
From: Jeffrey C. Ollie <jeff at ocjtech.us>
Date: Sun, 4 Jan 2009 00:37:02 -0600
Subject: [PATCH 13/15] Update autoconf.

---
 configure                        |23025 ++++++++++++++++++++------------------
 include/asterisk/autoconfig.h.in |   60 +-
 2 files changed, 12340 insertions(+), 10745 deletions(-)

diff --git a/configure b/configure
index f997451..e40ba2c 100755
--- a/configure
+++ b/configure
@@ -1,12 +1,12 @@
 #! /bin/sh
-# From configure.ac Revision: 159855 .
+# From configure.ac Revision.
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for asterisk 1.6.
+# Generated by GNU Autoconf 2.63 for asterisk 1.6.
 #
 # Report bugs to <www.asterisk.org>.
 #
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 # This configure script is free software; the Free Software Foundation
 # gives unlimited permission to copy, distribute and modify it.
 #
@@ -20,7 +20,7 @@ DUALCASE=1; export DUALCASE # for MKS sh
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
   emulate sh
   NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
   # is contrary to our usage.  Disable this feature.
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
@@ -42,17 +42,45 @@ as_cr_Letters=$as_cr_letters$as_cr_LETTERS
 as_cr_digits='0123456789'
 as_cr_alnum=$as_cr_Letters$as_cr_digits
 
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
+as_nl='
+'
+export as_nl
+# Printing a long string crashes Solaris 7 /usr/bin/printf.
+as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
+if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+  as_echo='printf %s\n'
+  as_echo_n='printf %s'
+else
+  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
+    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
+    as_echo_n='/usr/ucb/echo -n'
   else
-    PATH_SEPARATOR=:
+    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
+    as_echo_n_body='eval
+      arg=$1;
+      case $arg in
+      *"$as_nl"*)
+	expr "X$arg" : "X\\(.*\\)$as_nl";
+	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
+      esac;
+      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
+    '
+    export as_echo_n_body
+    as_echo_n='sh -c $as_echo_n_body as_echo'
   fi
-  rm -f conf$$.sh
+  export as_echo_body
+  as_echo='sh -c $as_echo_body as_echo'
+fi
+
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+  PATH_SEPARATOR=:
+  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
+    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
+      PATH_SEPARATOR=';'
+  }
 fi
 
 # Support unset when possible.
@@ -68,8 +96,6 @@ fi
 # there to prevent editors from complaining about space-tab.
 # (If _AS_PATH_WALK were called with IFS unset, it would disable word
 # splitting by setting IFS to empty value.)
-as_nl='
-'
 IFS=" ""	$as_nl"
 
 # Find who we are.  Look in the path if we contain no directory separator.
@@ -92,7 +118,7 @@ if test "x$as_myself" = x; then
   as_myself=$0
 fi
 if test ! -f "$as_myself"; then
-  echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
   { (exit 1); exit 1; }
 fi
 
@@ -105,17 +131,10 @@ PS2='> '
 PS4='+ '
 
 # NLS nuisances.
-for as_var in \
-  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
-  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
-  LC_TELEPHONE LC_TIME
-do
-  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
-    eval $as_var=C; export $as_var
-  else
-    ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-  fi
-done
+LC_ALL=C
+export LC_ALL
+LANGUAGE=C
+export LANGUAGE
 
 # Required to use basename.
 if expr a : '\(a\)' >/dev/null 2>&1 &&
@@ -137,7 +156,7 @@ as_me=`$as_basename -- "$0" ||
 $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
 	 X"$0" : 'X\(//\)$' \| \
 	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-echo X/"$0" |
+$as_echo X/"$0" |
     sed '/^.*\/\([^/][^/]*\)\/*$/{
 	    s//\1/
 	    q
@@ -163,7 +182,7 @@ else
   as_have_required=no
 fi
 
-  if test $as_have_required = yes && 	 (eval ":
+  if test $as_have_required = yes &&	 (eval ":
 (as_func_return () {
   (exit \$1)
 }
@@ -245,7 +264,7 @@ IFS=$as_save_IFS
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
   emulate sh
   NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
   # is contrary to our usage.  Disable this feature.
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
@@ -266,7 +285,7 @@ _ASEOF
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
   emulate sh
   NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
   # is contrary to our usage.  Disable this feature.
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
@@ -346,10 +365,10 @@ fi
 
       if test "x$CONFIG_SHELL" != x; then
   for as_var in BASH_ENV ENV
-        do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-        done
-        export CONFIG_SHELL
-        exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
+	do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+	done
+	export CONFIG_SHELL
+	exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
 fi
 
 
@@ -418,9 +437,10 @@ fi
 
 test \$exitcode = 0") || {
   echo No shell found that supports shell functions.
-  echo Please tell autoconf at gnu.org about your system,
-  echo including any error possibly output before this
-  echo message
+  echo Please tell bug-autoconf at gnu.org about your system,
+  echo including any error possibly output before this message.
+  echo This can help us improve future autoconf versions.
+  echo Configuration will now proceed without shell functions.
 }
 
 
[...44639 lines suppressed...]
     else
-      rm -f $ac_file
-      mv "$tmp/config.h" $ac_file
+      rm -f "$ac_file"
+      mv "$tmp/config.h" "$ac_file" \
+	|| { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
+$as_echo "$as_me: error: could not create $ac_file" >&2;}
+   { (exit 1); exit 1; }; }
     fi
   else
-    echo "/* $configure_input  */"
-    cat "$ac_result"
+    $as_echo "/* $configure_input  */" \
+      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
+      || { { $as_echo "$as_me:$LINENO: error: could not create -" >&5
+$as_echo "$as_me: error: could not create -" >&2;}
+   { (exit 1); exit 1; }; }
   fi
-  rm -f "$tmp/out12"
  ;;
 
 
@@ -50858,6 +52450,11 @@ _ACEOF
 chmod +x $CONFIG_STATUS
 ac_clean_files=$ac_clean_files_save
 
+test $ac_write_fail = 0 ||
+  { { $as_echo "$as_me:$LINENO: error: write failure creating $CONFIG_STATUS" >&5
+$as_echo "$as_me: error: write failure creating $CONFIG_STATUS" >&2;}
+   { (exit 1); exit 1; }; }
+
 
 # configure is writing to config.log, and then calls config.status.
 # config.status does its own redirection, appending to config.log.
@@ -50879,6 +52476,10 @@ if test "$no_create" != yes; then
   # would make configure fail if this is the last instruction.
   $ac_cs_success || { (exit 1); exit 1; }
 fi
+if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
+  { $as_echo "$as_me:$LINENO: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
+$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
+fi
 
 
 if test "x${silent}" != "xyes" ; then
@@ -50907,17 +52508,17 @@ echo "       \$\$\$\$\$\$\$\$\$\$\$\$\$\$\$\$.                "
 echo
 fi
 
-{ echo "$as_me:$LINENO: Package configured for: " >&5
-echo "$as_me: Package configured for: " >&6;}
-{ echo "$as_me:$LINENO: OS type  : $host_os" >&5
-echo "$as_me: OS type  : $host_os" >&6;}
-{ echo "$as_me:$LINENO: Host CPU : $host_cpu" >&5
-echo "$as_me: Host CPU : $host_cpu" >&6;}
-{ echo "$as_me:$LINENO: build-cpu:vendor:os: $build_cpu : $build_vendor : $build_os :" >&5
-echo "$as_me: build-cpu:vendor:os: $build_cpu : $build_vendor : $build_os :" >&6;}
-{ echo "$as_me:$LINENO: host-cpu:vendor:os: $host_cpu : $host_vendor : $host_os :" >&5
-echo "$as_me: host-cpu:vendor:os: $host_cpu : $host_vendor : $host_os :" >&6;}
+{ $as_echo "$as_me:$LINENO: Package configured for: " >&5
+$as_echo "$as_me: Package configured for: " >&6;}
+{ $as_echo "$as_me:$LINENO: OS type  : $host_os" >&5
+$as_echo "$as_me: OS type  : $host_os" >&6;}
+{ $as_echo "$as_me:$LINENO: Host CPU : $host_cpu" >&5
+$as_echo "$as_me: Host CPU : $host_cpu" >&6;}
+{ $as_echo "$as_me:$LINENO: build-cpu:vendor:os: $build_cpu : $build_vendor : $build_os :" >&5
+$as_echo "$as_me: build-cpu:vendor:os: $build_cpu : $build_vendor : $build_os :" >&6;}
+{ $as_echo "$as_me:$LINENO: host-cpu:vendor:os: $host_cpu : $host_vendor : $host_os :" >&5
+$as_echo "$as_me: host-cpu:vendor:os: $host_cpu : $host_vendor : $host_os :" >&6;}
 if test "${cross_compiling}" = "yes"; then
-   { echo "$as_me:$LINENO: Cross Compilation = YES" >&5
-echo "$as_me: Cross Compilation = YES" >&6;}
+   { $as_echo "$as_me:$LINENO: Cross Compilation = YES" >&5
+$as_echo "$as_me: Cross Compilation = YES" >&6;}
 fi
diff --git a/include/asterisk/autoconfig.h.in b/include/asterisk/autoconfig.h.in
index 60f497d..1e4c5a6 100644
--- a/include/asterisk/autoconfig.h.in
+++ b/include/asterisk/autoconfig.h.in
@@ -119,6 +119,12 @@
 /* Define to indicate the ${BKTR_DESCRIP} library version */
 #undef HAVE_BKTR_VERSION
 
+/* Define this to indicate the ${BLUETOOTH_DESCRIP} library */
+#undef HAVE_BLUETOOTH
+
+/* Define to indicate the ${BLUETOOTH_DESCRIP} library version */
+#undef HAVE_BLUETOOTH_VERSION
+
 /* Define to 1 if byteswap.h macros are available. */
 #undef HAVE_BYTESWAP_H
 
@@ -391,6 +397,9 @@
 /* Define to indicate the ${LDAP_DESCRIP} library version */
 #undef HAVE_LDAP_VERSION
 
+/* Define if your system has the NetBSD Editline libraries. */
+#undef HAVE_LIBEDIT
+
 /* Define to 1 if you have the <libintl.h> header file. */
 #undef HAVE_LIBINTL_H
 
@@ -448,12 +457,9 @@
 /* Define to indicate the ${LTDL_DESCRIP} library version */
 #undef HAVE_LTDL_VERSION
 
-/* Define this to indicate the ${LUA_DESCRIP} library */
+/* Define if your system has the LUA libraries. */
 #undef HAVE_LUA
 
-/* Define to indicate the ${LUA_DESCRIP} library version */
-#undef HAVE_LUA_VERSION
-
 /* Define to 1 if you have the <malloc.h> header file. */
 #undef HAVE_MALLOC_H
 
@@ -1087,9 +1093,6 @@
 /* Define to the version of this package. */
 #undef PACKAGE_VERSION
 
-/* Define to 1 if the C compiler supports function prototypes. */
-#undef PROTOTYPES
-
 /* Define to necessary symbol if this constant uses a non-standard name on
    your system. */
 #undef PTHREAD_CREATE_JOINABLE
@@ -1106,11 +1109,6 @@
 /* Define to the type of arg 5 for `select'. */
 #undef SELECT_TYPE_ARG5
 
-/* Define to 1 if the `setvbuf' function takes the buffering type as its
-   second argument and the buffer pointer as the third, as on System V before
-   release 3. */
-#undef SETVBUF_REVERSED
-
 /* The size of `int', as computed by sizeof. */
 #undef SIZEOF_INT
 
@@ -1131,20 +1129,30 @@
 /* Define to 1 if your <sys/time.h> declares `struct tm'. */
 #undef TM_IN_SYS_TIME
 
-/* Define to 1 if on AIX 3.
-   System headers sometimes define this.
-   We just want to avoid a redefinition error message.  */
+/* Enable extensions on AIX 3, Interix.  */
 #ifndef _ALL_SOURCE
 # undef _ALL_SOURCE
 #endif
-
-/* Number of bits in a file offset, on hosts where this is settable. */
-#undef _FILE_OFFSET_BITS
-
 /* Enable GNU extensions on systems that have them.  */
 #ifndef _GNU_SOURCE
 # undef _GNU_SOURCE
 #endif
+/* Enable threading extensions on Solaris.  */
+#ifndef _POSIX_PTHREAD_SEMANTICS
+# undef _POSIX_PTHREAD_SEMANTICS
+#endif
+/* Enable extensions on HP NonStop.  */
+#ifndef _TANDEM_SOURCE
+# undef _TANDEM_SOURCE
+#endif
+/* Enable general extensions on Solaris.  */
+#ifndef __EXTENSIONS__
+# undef __EXTENSIONS__
+#endif
+
+
+/* Number of bits in a file offset, on hosts where this is settable. */
+#undef _FILE_OFFSET_BITS
 
 /* Define to 1 to make fseeko visible on some hosts (e.g. glibc 2.2). */
 #undef _LARGEFILE_SOURCE
@@ -1162,20 +1170,6 @@
 /* Define to 1 if you need to in order for `stat' and other things to work. */
 #undef _POSIX_SOURCE
 
-/* Enable extensions on Solaris.  */
-#ifndef __EXTENSIONS__
-# undef __EXTENSIONS__
-#endif
-#ifndef _POSIX_PTHREAD_SEMANTICS
-# undef _POSIX_PTHREAD_SEMANTICS
-#endif
-#ifndef _TANDEM_SOURCE
-# undef _TANDEM_SOURCE
-#endif
-
-/* Define like PROTOTYPES; this can be used by system headers. */
-#undef __PROTOTYPES
-
 /* Define to empty if `const' does not conform to ANSI C. */
 #undef const
 
-- 
1.6.1


0014-Fix-up-some-paths.patch:

--- NEW FILE 0014-Fix-up-some-paths.patch ---
>From 57e9e58cb5d501da652d227eb8c07b2593d333ff Mon Sep 17 00:00:00 2001
From: Jeffrey C. Ollie <jeff at ocjtech.us>
Date: Sun, 4 Jan 2009 12:51:05 -0600
Subject: [PATCH 14/15] Fix up some paths.

---
 UPGRADE-1.4.txt                             |    2 +-
 configs/festival.conf.sample                |    2 +-
 configs/http.conf.sample                    |    6 ++--
 configs/iax.conf.sample                     |    4 +-
 configs/musiconhold.conf.sample             |   10 ++++----
 configs/osp.conf.sample                     |    4 +-
 configs/phoneprov.conf.sample               |    2 +-
 contrib/scripts/astgenkey                   |    2 +-
 contrib/scripts/astgenkey.8                 |    6 ++--
 doc/osp.txt                                 |    8 +++---
 doc/tex/phoneprov.tex                       |    2 +-
 doc/tex/privacy.tex                         |    6 ++--
 pbx/ael/ael-test/ael-test3/extensions.ael   |   28 +++++++++++++-------------
 pbx/ael/ael-test/ael-vtest13/extensions.ael |   28 +++++++++++++-------------
 pbx/ael/ael-test/ref.ael-vtest13            |   26 ++++++++++++------------
 15 files changed, 68 insertions(+), 68 deletions(-)

diff --git a/UPGRADE-1.4.txt b/UPGRADE-1.4.txt
index 4f82694..69bf322 100644
--- a/UPGRADE-1.4.txt
+++ b/UPGRADE-1.4.txt
@@ -92,7 +92,7 @@ sound packages in the 'sounds' subdirectory to be used later during installation
 WARNING: Asterisk 1.4 supports a new layout for sound files in multiple languages;
 instead of the alternate-language files being stored in subdirectories underneath
 the existing files (for French, that would be digits/fr, letters/fr, phonetic/fr,
-etc.) the new layout creates one directory under /var/lib/asterisk/sounds for the
+etc.) the new layout creates one directory under /usr/share/asterisk/sounds for the
 language itself, then places all the sound files for that language under that
 directory and its subdirectories. This is the layout that will be created if you
 select non-English languages to be installed via menuselect, HOWEVER Asterisk does
diff --git a/configs/festival.conf.sample b/configs/festival.conf.sample
index 774f1a1..815f11d 100644
--- a/configs/festival.conf.sample
+++ b/configs/festival.conf.sample
@@ -21,7 +21,7 @@
 ; THIS DIRECTORY *MUST* EXIST and must be writable from the asterisk process.
 ; Defaults to /tmp/
 ;
-;cachedir=/var/lib/asterisk/festivalcache/
+;cachedir=/var/spool/asterisk/festival/
 ;
 ; Festival command to send to the server.
 ; Defaults to: (tts_textasterisk "%s" 'file)(quit)\n
diff --git a/configs/http.conf.sample b/configs/http.conf.sample
index f15c9cf..6349905 100644
--- a/configs/http.conf.sample
+++ b/configs/http.conf.sample
@@ -5,7 +5,7 @@
 ; Note about Asterisk documentation:
 ;   If Asterisk was installed from a tarball, then the HTML documentation should
 ;   be installed in the static-http/docs directory which is
-;   (/var/lib/asterisk/static-http/docs) on linux by default.  If the Asterisk
+;   (/usr/share/asterisk/static-http/docs) on linux by default.  If the Asterisk
 ;   HTTP server is enabled in this file by setting the "enabled", "bindaddr",
 ;   and "bindport" options, then you should be able to view the documentation
 ;   remotely by browsing to:
@@ -66,6 +66,6 @@ bindaddr=127.0.0.1
 ;[post_mappings]
 ;
 ; In this example, if the prefix option is set to "asterisk", then using the
-; POST URL: /asterisk/uploads will put files in /var/lib/asterisk/uploads/.
-;uploads = /var/lib/asterisk/uploads/
+; POST URL: /asterisk/uploads will put files in /var/spool/asterisk/uploads/.
+;uploads = /var/spool/asterisk/uploads/
 ;
diff --git a/configs/iax.conf.sample b/configs/iax.conf.sample
index 854a243..ab2938e 100644
--- a/configs/iax.conf.sample
+++ b/configs/iax.conf.sample
@@ -348,8 +348,8 @@ inkeys=freeworlddialup
 ; authentication is used, "inkeys" is a list of acceptable public keys on the 
 ; local system that can be used to authenticate the remote peer, separated by
 ; the ":" character.  "outkey" is a single, private key to use to authenticate
-; to the other side.  Public keys are named /var/lib/asterisk/keys/<name>.pub
-; while private keys are named /var/lib/asterisk/keys/<name>.key.  Private
+; to the other side.  Public keys are named /usr/share/asterisk/keys/<name>.pub
+; while private keys are named /usr/share/asterisk/keys/<name>.key.  Private
 ; keys should always be 3DES encrypted.
 ;
 ;
diff --git a/configs/musiconhold.conf.sample b/configs/musiconhold.conf.sample
index 4df1afd..b730335 100644
--- a/configs/musiconhold.conf.sample
+++ b/configs/musiconhold.conf.sample
@@ -39,11 +39,11 @@
 
 [default]
 mode=files
-directory=/var/lib/asterisk/moh
+directory=/usr/share/asterisk/moh
 ;
 ;[native-random]
 ;mode=files
-;directory=/var/lib/asterisk/moh
+;directory=/usr/share/asterisk/moh
 ;digit=#        ; If this option is set for a class, then when callers are
 ;               ; listening to music on hold, they can press this digit, and
 ;               ; they will switch to listening to this music class.
@@ -51,7 +51,7 @@ directory=/var/lib/asterisk/moh
 
 ;[native-alphabetical]
 ;mode=files
-;directory=/var/lib/asterisk/moh
+;directory=/usr/share/asterisk/moh
 ;sort=alpha     ; Sort the files in alphabetical order.  If this option is
 ;               ; not specified, the sort order is undefined.
 
@@ -63,7 +63,7 @@ directory=/var/lib/asterisk/moh
 ;mode=custom
 ; Note that with mode=custom, a directory is not required, such as when reading
 ; from a stream.
-;directory=/var/lib/asterisk/mohmp3
+;directory=/usr/share/asterisk/mohmp3
 ;application=/usr/bin/mpg123 -q -r 8000 -f 8192 -b 2048 --mono -s
 
 ;[ulawstream]
@@ -75,5 +75,5 @@ directory=/var/lib/asterisk/moh
 ; choice
 ;[solaris]
 ;mode=custom
-;directory=/var/lib/asterisk/mohmp3
+;directory=/usr/share/asterisk/mohmp3
 ;application=/site/sw/bin/madplay -Q -o raw:- --mono -R 8000 -a -12
diff --git a/configs/osp.conf.sample b/configs/osp.conf.sample
index e342337..2e346e6 100644
--- a/configs/osp.conf.sample
+++ b/configs/osp.conf.sample
@@ -36,8 +36,8 @@
 ;source=domain name or [IP address in brackets]
 ;
 ; Define path and file name of crypto files.
-; The default path for crypto file is /var/lib/asterisk/keys.  If no path is 
-; defined, crypto files will in /var/lib/asterisk/keys directory.
+; The default path for crypto file is /usr/share/asterisk/keys.  If no path is 
+; defined, crypto files will in /usr/share/asterisk/keys directory.
 ;
 ; Specify the private key file name.  
 ; If this parameter is unspecified or not present, the default name will be the 
diff --git a/configs/phoneprov.conf.sample b/configs/phoneprov.conf.sample
index 8f55fa8..2608914 100644
--- a/configs/phoneprov.conf.sample
+++ b/configs/phoneprov.conf.sample
@@ -57,4 +57,4 @@ ${TOLOWER(${MAC})}.cfg => 000000000000.cfg               ; Dynamically generated
 ${TOLOWER(${MAC})}-phone.cfg => 000000000000-phone.cfg   ; (relative to AST_DATA_DIR/phoneprov)
 config/${TOLOWER(${MAC})} => polycom.xml                 ; Dynamic Filename => template file 
 ${TOLOWER(${MAC})}-directory.xml => 000000000000-directory.xml
-setvar => CUSTOM_CONFIG=/var/lib/asterisk/phoneprov/configs/custom.cfg  ; Custom variable
+setvar => CUSTOM_CONFIG=/usr/share/asterisk/phoneprov/configs/custom.cfg  ; Custom variable
diff --git a/contrib/scripts/astgenkey b/contrib/scripts/astgenkey
index 6376048..e4a5a80 100644
--- a/contrib/scripts/astgenkey
+++ b/contrib/scripts/astgenkey
@@ -29,7 +29,7 @@ if [ "$QUIET" != 'y' ]; then
 	echo "in PEM format for use by Asterisk.  You will be asked to"
 	echo "enter a passcode for your key multiple times.  Please"
 	echo "enter the same code each time.  The resulting files will"
-	echo "need to be moved to /var/lib/asterisk/keys if you want"
+	echo "need to be moved to /usr/share/asterisk/keys if you want"
 	echo "to use them, and any private keys (.key files) will"
 	echo "need to be initialized at runtime either by running"
 	echo "Asterisk with the '-i' option, or with the 'init keys'"
diff --git a/contrib/scripts/astgenkey.8 b/contrib/scripts/astgenkey.8
index 328a4d2..ac6feae 100644
--- a/contrib/scripts/astgenkey.8
+++ b/contrib/scripts/astgenkey.8
@@ -88,7 +88,7 @@ The private key: secret.
 .RE
 
 Those files should be copied to 
-.I /var/lib/asterisk/keys
+.I /usr/share/asterisk/keys
 
 (The private key: on your system. The public key: on other systems)
 
@@ -122,10 +122,10 @@ readable, such as with the following commands:
 And then make the key accessible to Asterisk (assuming you run it as
 user "asterisk").
 
-  chown asterisk /var/lib/asterisk/keys/yourname.*
+  chown asterisk /usr/share/asterisk/keys/yourname.*
 
 .SH FILES
-.I /var/lib/asterisk/keys
+.I /usr/share/asterisk/keys
 .RS
 .RE
 
diff --git a/doc/osp.txt b/doc/osp.txt
index a0cd429..932f214 100644
--- a/doc/osp.txt
+++ b/doc/osp.txt
@@ -136,7 +136,7 @@ make clean; make linux
 Compilation is successful if there are no errors in the compiler output. The enroll program is now located in the OSP Toolkit/bin directory (example: /usr/src/ TK-3_3_6-20060303/bin). 
 
 2.2 Obtain Crypto Files
-The OSP module in Asterisk requires three crypto files containing a local certificate (localcert.pem), private key (pkey.pem), and CA certificate (cacert_0.pem).  Asterisk will try to load the files from the Asterisk public/private key directory - /var/lib/asterisk/keys.  If the files are not present, the OSP module will not start and the Asterisk will not support the OSP protocol.  Use the enroll.sh script from the toolkit distribution to enroll Asterisk with an OSP server and obtain the crypto files.  Documentation explaining how to use the enroll.sh script (Device Enrollment) to enroll with an OSP server is available at http://www.transnexus.com/OSP%20Toolkit/OSP%20Toolkit%20Documents/Device_Enrollment.pdf.  Copy the files generated by the enrollment process to the Asterisk /var/lib/asterisk/keys directory.  
+The OSP module in Asterisk requires three crypto files containing a local certificate (localcert.pem), private key (pkey.pem), and CA certificate (cacert_0.pem).  Asterisk will try to load the files from the Asterisk public/private key directory - /usr/share/asterisk/keys.  If the files are not present, the OSP module will not start and the Asterisk will not support the OSP protocol.  Use the enroll.sh script from the toolkit distribution to enroll Asterisk with an OSP server and obtain the crypto files.  Documentation explaining how to use the enroll.sh script (Device Enrollment) to enroll with an OSP server is available at http://www.transnexus.com/OSP%20Toolkit/OSP%20Toolkit%20Documents/Device_Enrollment.pdf.  Copy the files generated by the enrollment process to the Asterisk /usr/share/asterisk/keys directory.  
 
 Note: The osptestserver.transnexus.com is configured only for sending and receiving non-SSL messages, and issuing signed tokens. If you need help, post a message on the OSP mailing list at https://lists.sourceforge.net/lists/listinfo/osp-toolkit-client..
 
@@ -183,7 +183,7 @@ depth=0 /CN=osptestserver.transnexus.com/O=OSPServer
 verify return:1
 The certificate request was successful.
 Error Code returned from localcert command : 0
-The files generated should be copied to the /var/lib/asterisk/keys directory. 
+The files generated should be copied to the /usr/share/asterisk/keys directory. 
 Note: The script enroll.sh requires AT&T korn shell (ksh) or any of its compatible variants. The /usr/src/TK-3_3_6-20060303/bin directory should be in the PATH variable. Otherwise, enroll.sh cannot find the enroll file.
 
 3 Asterisk
@@ -247,9 +247,9 @@ servicepoint=http://OSP server IP:1080/osp
 source=[host IP]
 ;
 ; Define path and file name of crypto files.
-; The default path for crypto file is /var/lib/asterisk/keys.  If no
+; The default path for crypto file is /usr/share/asterisk/keys.  If no
 ; path is defined, crypto files should be in  
-; /var/lib/asterisk/keys directory.
+; /usr/share/asterisk/keys directory.
 ;
 ; Specify the private key file name.  
 ; If this parameter is unspecified or not present, the default name 
diff --git a/doc/tex/phoneprov.tex b/doc/tex/phoneprov.tex
index cb236a8..be01d34 100644
--- a/doc/tex/phoneprov.tex
+++ b/doc/tex/phoneprov.tex
@@ -58,7 +58,7 @@ files, respectively. A sample profile:
 [polycom]
 staticdir => configs/
 mime_type => text/xml
-setvar => CUSTOM_CONFIG=/var/lib/asterisk/phoneprov/configs/custom.cfg
+setvar => CUSTOM_CONFIG=/usr/share/asterisk/phoneprov/configs/custom.cfg
 static_file => bootrom.ld,application/octet-stream
 static_file => bootrom.ver,plain/text
 static_file => sip.ld,application/octet-stream
diff --git a/doc/tex/privacy.tex b/doc/tex/privacy.tex
index 81b2fac..9971641 100644
--- a/doc/tex/privacy.tex
+++ b/doc/tex/privacy.tex
@@ -204,7 +204,7 @@ helpful.
 
 When there is no CallerID, P and p options will always record an intro
 for the incoming caller. This intro will be stored temporarily in the
-\path{/var/lib/asterisk/sounds/priv-callerintros} dir, under the name
+\path{/usr/share/asterisk/sounds/priv-callerintros} dir, under the name
 NOCALLERID\_$<$extension$>$ $<$channelname$>$ and will be erased after the
 callee decides what to do with the call.
 
@@ -239,7 +239,7 @@ introductions are stored and re-used for the convenience of the CALLER.
 \subsubsection{Introductions}
 Unless instructed to not save introductions (see the 'n' option above),
 the screening modes will save the recordings of the caller's names in
-the directory \path{/var/lib/asterisk/sounds/priv-callerintros}, if they have
+the directory \path{/usr/share/asterisk/sounds/priv-callerintros}, if they have
 a CallerID.  Just the 10-digit callerid numbers are used as filenames,
 with a ".gsm" at the end.
 
@@ -254,7 +254,7 @@ loudspeakers, and perhaps other nifty things. For instance:
 
 \begin{astlisting}
 \begin{verbatim}
-exten => s,6,Set(PATH=/var/lib/asterisk/sounds/priv-callerintros)
+exten => s,6,Set(PATH=/usr/share/asterisk/sounds/priv-callerintros)
 exten => s,7,System(/usr/bin/play ${PATH}/${CALLERID(num)}.gsm&,0)
 \end{verbatim}
 \end{astlisting}
diff --git a/pbx/ael/ael-test/ael-test3/extensions.ael b/pbx/ael/ael-test/ael-test3/extensions.ael
index ff1f6ae..53fb918 100755
--- a/pbx/ael/ael-test/ael-test3/extensions.ael
+++ b/pbx/ael/ael-test/ael-test3/extensions.ael
@@ -2049,7 +2049,7 @@ macro ciddial2(dialnum, lookup, waittime, dialopts, ddev) // give priority to tc
 
 macro callerid-liar()
 {
-	TrySystem(/usr/bin/play /var/lib/asterisk/sounds/priv-callerintros/LIAR.gsm&);
+	TrySystem(/usr/bin/play /usr/share/asterisk/sounds/priv-callerintros/LIAR.gsm&);
 	Background(priv-liar);  // Script: OOOps! Sorry! I don't allow men with ski masks pulled over their 
                             //         faces to get in the front door, and unidentified callers won't fair
                             //         any better. You entered *MY* phone number. That won't work.
@@ -2106,7 +2106,7 @@ context homeline {
 		PrivacyManager();
 		if( "${PRIVACYMGRSTATUS}" = "FAILED" )
 		{
-			TrySystem(/usr/bin/play /var/lib/asterisk/sounds/privmanfailed.gsm);
+			TrySystem(/usr/bin/play /usr/share/asterisk/sounds/privmanfailed.gsm);
 			&std-priv-exten(Zap/3r1&Zap/5r1,2,25,mtw,telemarket,telemarket);
 			Hangup();
 			return;
@@ -2138,7 +2138,7 @@ context homeline {
 			verbose(direct is XXX#${direct}XXXX);
 			Playback(greetings/direct); // Welcome to the Murphy residence. This system will automatically try to connect you to...
 			Playback(/var/spool/asterisk/voicemail/default/${direct}/greet);
-			TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
+			TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
 			TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/${direct}/greet.wav&);
 			switch(${direct})
 			{
@@ -2223,7 +2223,7 @@ context homeline {
 		
 	}
 	1 => {  // Sonya
-			TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
+			TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
 			TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/2/greet.wav&);
 			&std-priv-exten(Zap/3r1&Zap/5r1,2,25,mtw,telemarket,telemarket);
 			goto s|loopback;
@@ -2421,51 +2421,51 @@ context homeline-kids {
 		Background(murphy-homeline-kids);        //  Which Kid? 1=Sean, 2:Eric, 3:Ryan, 4:Kyle, 5:Amber, 6:Alex, 7:Neal
 	}
 	1 => {  // SEAN
-			TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
+			TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
 			TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/3/greet.wav&);
 			// &std-priv-exten(Zap/3r2&Zap/5r2,3,35,mtw,telemarket,telemarket);
 			&std-priv-exten(IAX2/seaniax&Zap/5r2,3,35,mtw,telemarket,telemarket);
 			goto homeline|s|loopback;
 	}
 	2 => {  // ERIC
-			TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
+			TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
 			TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/4/greet.wav&);
 			Voicemail(u4);
 			goto homeline|s|loopback;
 			
 			// SetMusicOnHold(erics);
-			// TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
+			// TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
 			// TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/4/greet.wav&);
 			// &std-priv-exten(Zap/3r2&Zap/5r2,4,35,mtw,telemarket,telemarket);
 			// goto homeline|s|loopback;
 	}
 	3 => {  // RYAN
-			TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
+			TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
 			TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/5/greet.wav&);
 			&std-priv-exten(Zap/3r2&Zap/5r2,5,35,mtw,telemarket,telemarket);
 			goto homeline|s|loopback;
 	}
 	4 => {  // KYLE
-			TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
+			TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
 			TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/6/greet.wav&);
 			&std-priv-exten(Zap/3r2&Zap/5r2,6,35,mtw,telemarket,telemarket);
 			goto homeline|s|loopback;
 	}
 	5 => {
-			TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
+			TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
 			TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/7/greet.wav&);
 			&std-priv-exten(Zap/3r2&Zap/5r2,7,35,mtw,telemarket,telemarket);
 			goto homeline|s|loopback;
 			
 	}
 	6 => {
-			TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
+			TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
 			TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/8/greet.wav&);
 			&std-priv-exten(Zap/3r2&Zap/5r2,8,35,mtw,telemarket,telemarket);
 			goto homeline|s|loopback;
 	}
 	7 => {
-			TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
+			TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
 			TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/9/greet.wav&);
 			&std-priv-exten(Zap/3r2&Zap/5r2,9,35,mtw,telemarket,telemarket);
 			goto homeline|s|loopback;
@@ -2517,7 +2517,7 @@ context workline {
                                               // Otherwise, dial 1, and hopefully, you will reach Steve.
 	}
 	1 => {
-		TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
+		TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
 		TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/1/greet.wav&);
 		
 		&std-priv-exten(Zap/6&Sip/murf,1,30,mtw,telemarket,telemarket);
@@ -2778,7 +2778,7 @@ context homeext {
 	}
 	761 => {
 		Record(announcement:gsm);
-		TrySystem(/usr/bin/play /var/lib/asterisk/sounds/announcement.gsm&);
+		TrySystem(/usr/bin/play /usr/share/asterisk/sounds/announcement.gsm&);
 		goto s|loopback;
 	}
 	762 => {
diff --git a/pbx/ael/ael-test/ael-vtest13/extensions.ael b/pbx/ael/ael-test/ael-vtest13/extensions.ael
index b7e953e..48baaef 100755
--- a/pbx/ael/ael-test/ael-vtest13/extensions.ael
+++ b/pbx/ael/ael-test/ael-vtest13/extensions.ael
@@ -2048,7 +2048,7 @@ macro ciddial2(dialnum, lookup, waittime, dialopts, ddev) // give priority to tc
 
 macro callerid-liar()
 {
-	TrySystem(/usr/bin/play /var/lib/asterisk/sounds/priv-callerintros/LIAR.gsm&);
+	TrySystem(/usr/bin/play /usr/share/asterisk/sounds/priv-callerintros/LIAR.gsm&);
 	Background(priv-liar);  // Script: OOOps! Sorry! I don't allow men with ski masks pulled over their 
                             //         faces to get in the front door, and unidentified callers won't fair
                             //         any better. You entered *MY* phone number. That won't work.
@@ -2105,7 +2105,7 @@ context homeline {
 		PrivacyManager();
 		if( "${PRIVACYMGRSTATUS}" = "FAILED" )
 		{
-			TrySystem(/usr/bin/play /var/lib/asterisk/sounds/privmanfailed.gsm);
+			TrySystem(/usr/bin/play /usr/share/asterisk/sounds/privmanfailed.gsm);
 			&std-priv-exten(Zap/3r1&Zap/5r1,2,25,mtw,telemarket,telemarket);
 			Hangup();
 			return;
@@ -2137,7 +2137,7 @@ context homeline {
 			verbose(direct is XXX#${direct}XXXX);
 			Playback(greetings/direct); // Welcome to the Murphy residence. This system will automatically try to connect you to...
 			Playback(/var/spool/asterisk/voicemail/default/${direct}/greet);
-			TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
+			TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
 			TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/${direct}/greet.wav&);
 			switch(${direct})
 			{
@@ -2222,7 +2222,7 @@ context homeline {
 		
 	}
 	1 => {  // Sonya
-			TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
+			TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
 			TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/2/greet.wav&);
 			&std-priv-exten(Zap/3r1&Zap/5r1,2,25,mtw,telemarket,telemarket);
 			goto s|loopback;
@@ -2420,51 +2420,51 @@ context homeline-kids {
 		Background(murphy-homeline-kids);        //  Which Kid? 1=Sean, 2:Eric, 3:Ryan, 4:Kyle, 5:Amber, 6:Alex, 7:Neal
 	}
 	1 => {  // SEAN
-			TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
+			TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
 			TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/3/greet.wav&);
 			// &std-priv-exten(Zap/3r2&Zap/5r2,3,35,mtw,telemarket,telemarket);
 			&std-priv-exten(IAX2/seaniax&Zap/5r2,3,35,mtw,telemarket,telemarket);
 			goto homeline|s|loopback;
 	}
 	2 => {  // ERIC
-			TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
+			TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
 			TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/4/greet.wav&);
 			Voicemail(u4);
 			goto homeline|s|loopback;
 			
 			// SetMusicOnHold(erics);
-			// TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
+			// TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
 			// TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/4/greet.wav&);
 			// &std-priv-exten(Zap/3r2&Zap/5r2,4,35,mtw,telemarket,telemarket);
 			// goto homeline|s|loopback;
 	}
 	3 => {  // RYAN
-			TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
+			TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
 			TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/5/greet.wav&);
 			&std-priv-exten(Zap/3r2&Zap/5r2,5,35,mtw,telemarket,telemarket);
 			goto homeline|s|loopback;
 	}
 	4 => {  // KYLE
-			TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
+			TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
 			TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/6/greet.wav&);
 			&std-priv-exten(Zap/3r2&Zap/5r2,6,35,mtw,telemarket,telemarket);
 			goto homeline|s|loopback;
 	}
 	5 => {
-			TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
+			TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
 			TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/7/greet.wav&);
 			&std-priv-exten(Zap/3r2&Zap/5r2,7,35,mtw,telemarket,telemarket);
 			goto homeline|s|loopback;
 			
 	}
 	6 => {
-			TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
+			TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
 			TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/8/greet.wav&);
 			&std-priv-exten(Zap/3r2&Zap/5r2,8,35,mtw,telemarket,telemarket);
 			goto homeline|s|loopback;
 	}
 	7 => {
-			TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
+			TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
 			TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/9/greet.wav&);
 			&std-priv-exten(Zap/3r2&Zap/5r2,9,35,mtw,telemarket,telemarket);
 			goto homeline|s|loopback;
@@ -2516,7 +2516,7 @@ context workline {
                                               // Otherwise, dial 1, and hopefully, you will reach Steve.
 	}
 	1 => {
-		TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
+		TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
 		TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/1/greet.wav&);
 		
 		&std-priv-exten(Zap/6&Sip/murf,1,30,mtw,telemarket,telemarket);
@@ -2777,7 +2777,7 @@ context homeext {
 	}
 	761 => {
 		Record(announcement:gsm);
-		TrySystem(/usr/bin/play /var/lib/asterisk/sounds/announcement.gsm&);
+		TrySystem(/usr/bin/play /usr/share/asterisk/sounds/announcement.gsm&);
 		goto s|loopback;
 	}
 	762 => {
diff --git a/pbx/ael/ael-test/ref.ael-vtest13 b/pbx/ael/ael-test/ref.ael-vtest13
index 79a5e48..cf1d255 100644
--- a/pbx/ael/ael-test/ref.ael-vtest13
+++ b/pbx/ael/ael-test/ref.ael-vtest13
@@ -2107,7 +2107,7 @@ exten => s,20,Return()
 
 
 [callerid-liar]
-exten => s,1,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/priv-callerintros/LIAR.gsm&)
+exten => s,1,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/priv-callerintros/LIAR.gsm&)
 exten => s,2,Background(priv-liar)
 exten => s,3,Hangup()
 exten => s,4,Return()
@@ -2142,7 +2142,7 @@ exten => s,3,Set(repeatcount=0)
 exten => s,4,Zapateller(nocallerid)
 exten => s,5,PrivacyManager()
 exten => s,6,GotoIf($["${PRIVACYMGRSTATUS}" = "FAILED" ]?7:11)
-exten => s,7,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/privmanfailed.gsm)
+exten => s,7,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/privmanfailed.gsm)
 exten => s,8,Gosub(std-priv-exten,s,1(Zap/3r1&Zap/5r1,2,25,mtw,telemarket,telemarket))
 exten => s,9,Hangup()
 exten => s,10,Return()
@@ -2168,7 +2168,7 @@ exten => s,29,GotoIf($["${direct}" != "" & ${direct} != 0 ]?30:37)
 exten => s,30,verbose(direct is XXX#${direct}XXXX)
 exten => s,31,Playback(greetings/direct)
 exten => s,32,Playback(/var/spool/asterisk/voicemail/default/${direct}/greet)
-exten => s,33,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm)
+exten => s,33,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm)
 exten => s,34,TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/${direct}/greet.wav&)
 exten => s,35,Goto(sw-92-${direct},10)
 exten => s,36,NoOp(Finish switch-if-homeline-91-92)
@@ -2247,7 +2247,7 @@ exten => sw-92-2,10,Gosub(std-priv-exten,s,1(Zap/3r1&Zap/5r1,2,25,mtw,telemarket
 exten => sw-92-2,11,Goto(s,loopback)
 exten => sw-92-1,10,Gosub(std-priv-exten,s,1(Zap/6r3&Sip/murf,1,25,mpA(beep)tw,telemarket,telemarket))
 exten => sw-92-1,11,Goto(s,loopback)
-exten => 1,1,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm)
+exten => 1,1,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm)
 exten => 1,2,TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/2/greet.wav&)
 exten => 1,3,Gosub(std-priv-exten,s,1(Zap/3r1&Zap/5r1,2,25,mtw,telemarket,telemarket))
 exten => 1,4,Goto(s,loopback)
@@ -2324,31 +2324,31 @@ exten => o,1,Goto(s,begin)
 
 [homeline-kids]
 exten => s,1(begin),Background(murphy-homeline-kids)
-exten => 1,1,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm)
+exten => 1,1,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm)
 exten => 1,2,TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/3/greet.wav&)
 exten => 1,3,Gosub(std-priv-exten,s,1(IAX2/seaniax&Zap/5r2,3,35,mtw,telemarket,telemarket))
 exten => 1,4,Goto(homeline,s,loopback)
-exten => 2,1,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm)
+exten => 2,1,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm)
 exten => 2,2,TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/4/greet.wav&)
 exten => 2,3,Voicemail(u4)
 exten => 2,4,Goto(homeline,s,loopback)
-exten => 3,1,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm)
+exten => 3,1,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm)
 exten => 3,2,TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/5/greet.wav&)
 exten => 3,3,Gosub(std-priv-exten,s,1(Zap/3r2&Zap/5r2,5,35,mtw,telemarket,telemarket))
 exten => 3,4,Goto(homeline,s,loopback)
-exten => 4,1,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm)
+exten => 4,1,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm)
 exten => 4,2,TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/6/greet.wav&)
 exten => 4,3,Gosub(std-priv-exten,s,1(Zap/3r2&Zap/5r2,6,35,mtw,telemarket,telemarket))
 exten => 4,4,Goto(homeline,s,loopback)
-exten => 5,1,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm)
+exten => 5,1,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm)
 exten => 5,2,TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/7/greet.wav&)
 exten => 5,3,Gosub(std-priv-exten,s,1(Zap/3r2&Zap/5r2,7,35,mtw,telemarket,telemarket))
 exten => 5,4,Goto(homeline,s,loopback)
-exten => 6,1,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm)
+exten => 6,1,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm)
 exten => 6,2,TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/8/greet.wav&)
 exten => 6,3,Gosub(std-priv-exten,s,1(Zap/3r2&Zap/5r2,8,35,mtw,telemarket,telemarket))
 exten => 6,4,Goto(homeline,s,loopback)
-exten => 7,1,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm)
+exten => 7,1,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm)
 exten => 7,2,TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/9/greet.wav&)
 exten => 7,3,Gosub(std-priv-exten,s,1(Zap/3r2&Zap/5r2,9,35,mtw,telemarket,telemarket))
 exten => 7,4,Goto(homeline,s,loopback)
@@ -2376,7 +2376,7 @@ exten => s,5,Gosub(fillcidname,s,1)
 exten => s,6,TrySystem(/usr/local/bin/who-is-it ${CALLERID(num)} "${CALLERID(name)}"&)
 exten => s,7(loopback),Background(greetings/greeting)
 exten => s,8,Background(murphy-office-intro1)
-exten => 1,1,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm)
+exten => 1,1,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm)
 exten => 1,2,TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/1/greet.wav&)
 exten => 1,3,Gosub(std-priv-exten,s,1(Zap/6&Sip/murf,1,30,mtw,telemarket,telemarket))
 exten => 1,4,Goto(s,loopback)
@@ -2502,7 +2502,7 @@ exten => 6,1,Background(recording)
 exten => 760,1,DateTime()
 exten => 760,2,Goto(s,loopback)
 exten => 761,1,Record(announcement:gsm)
-exten => 761,2,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/announcement.gsm&)
+exten => 761,2,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/announcement.gsm&)
 exten => 761,3,Goto(s,loopback)
 exten => 762,1,agi(tts-riddle.agi)
 exten => 762,2,Background(gsm/what-time-it-is2)
-- 
1.6.1


0015-Add-LDAP-schema-that-is-compatible-with-Fedora-Direc.patch:

--- NEW FILE 0015-Add-LDAP-schema-that-is-compatible-with-Fedora-Direc.patch ---
>From f8a1e831086e6022b69773826f75f8bb759a40b5 Mon Sep 17 00:00:00 2001
From: Jeffrey C. Ollie <jeff at ocjtech.us>
Date: Sun, 4 Jan 2009 19:22:39 -0600
Subject: [PATCH 15/15] Add LDAP schema that is compatible with Fedora Directory Server.

---
 contrib/scripts/99asterisk.ldif |  489 +++++++++++++++++++++++++++++++++++++++
 1 files changed, 489 insertions(+), 0 deletions(-)
 create mode 100644 contrib/scripts/99asterisk.ldif

diff --git a/contrib/scripts/99asterisk.ldif b/contrib/scripts/99asterisk.ldif
new file mode 100644
index 0000000..ef878a8
--- /dev/null
+++ b/contrib/scripts/99asterisk.ldif
@@ -0,0 +1,489 @@
+dn: cn=schema
+#
+attributeTypes: (
+  
+  NAME 'AstContext'
+  DESC 'Asterisk Context'
+  EQUALITY caseIgnoreMatch
+  SUBSTR caseIgnoreSubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+  )
+#
+attributeTypes: (
+  
+  NAME 'AstExtension'
+  DESC 'Asterisk Extension'
+  EQUALITY caseIgnoreMatch
+  SUBSTR caseIgnoreSubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+  )
+#
+attributeTypes: (
+  
+  NAME 'AstPriority'
+  DESC 'Asterisk Priority'
+  EQUALITY caseIgnoreMatch
+  SUBSTR caseIgnoreSubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+  )
+#
+attributeTypes: (
+  
+  NAME 'AstApplication'
+  DESC 'Asterisk Application'
+  EQUALITY caseIgnoreMatch
+  SUBSTR caseIgnoreSubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+  )
+#
+attributeTypes: (
+  
+  NAME 'AstApplicationData'
+  DESC 'Asterisk Application Data'
+  EQUALITY caseIgnoreMatch
+  SUBSTR caseIgnoreSubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+  )
+#
+attributeTypes: (
+  
+  NAME 'AstAccountAMAFlags'
+  DESC 'Asterisk Account AMA Flags'
+  EQUALITY caseIgnoreMatch
+  SUBSTR caseIgnoreSubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+  )
+#
+attributeTypes: (
+  
+  NAME 'AstAccountCallerID'
+  DESC 'Asterisk Account CallerID'
+  EQUALITY caseIgnoreMatch
+  SUBSTR caseIgnoreSubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+  )
+#
+attributeTypes: (
+  
+  NAME 'AstAccountContext'
+  DESC 'Asterisk Account Context'
+  EQUALITY caseIgnoreMatch
+  SUBSTR caseIgnoreSubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+  )
+#
+attributeTypes: (
+  
+  NAME 'AstAccountMailbox'
+  DESC 'Asterisk Account Mailbox'
+  EQUALITY caseIgnoreMatch
+  SUBSTR caseIgnoreSubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+  )
+#
+attributeTypes: (
+  
+  NAME 'AstMD5secret'
+  DESC 'Asterisk Account MD5 Secret'
+  EQUALITY caseIgnoreMatch
+  SUBSTR caseIgnoreSubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+  )
+#
+attributeTypes: (
+  
+  NAME 'AstAccountDeny'
+  DESC 'Asterisk Account Deny'
+  EQUALITY caseIgnoreMatch
+  SUBSTR caseIgnoreSubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+  )
+#
+attributeTypes: (
+  
+  NAME 'AstAccountPermit'
+  DESC 'Asterisk Account Permit'
+  EQUALITY caseIgnoreMatch
+  SUBSTR caseIgnoreSubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+  )
+#
+attributeTypes: (
+  
+  NAME 'AstAccountQualify'
+  DESC 'Asterisk Account Qualify'
+  EQUALITY caseIgnoreMatch
+  SUBSTR caseIgnoreSubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+  )
+#
+attributeTypes: (
+  
+  NAME 'AstAccountType'
+  DESC 'Asterisk Account Type'
+  EQUALITY caseIgnoreMatch
+  SUBSTR caseIgnoreSubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+  )
+#
+attributeTypes: (
+  
+  NAME 'AstAccountDisallowedCodec'
+  DESC 'Asterisk Account Disallowed Codec'
+  EQUALITY caseIgnoreMatch
+  SUBSTR caseIgnoreSubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+  )
+#
+attributeTypes: (
+  
+  NAME 'AstAccountExpirationTimestamp'
+  DESC 'Asterisk Account Allowed Codec'
+  EQUALITY caseIgnoreMatch
+  SUBSTR caseIgnoreSubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+  )
+#
+attributeTypes: (
+  
+  NAME 'AstAccountRegistrationContext'
+  DESC 'Asterisk Account AMA Flags'
+  EQUALITY caseIgnoreMatch
+  SUBSTR caseIgnoreSubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+  )
+#
+attributeTypes: (
+  
+  NAME 'AstAccountRegistrationExten'
+  DESC 'Asterisk Account AMA Flags'
+  EQUALITY caseIgnoreMatch
+  SUBSTR caseIgnoreSubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+  )
+#
+attributeTypes: (
+  
+  NAME 'AstAccountNoTransfer'
+  DESC 'Asterisk Account AMA Flags'
+  EQUALITY caseIgnoreMatch
+  SUBSTR caseIgnoreSubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+  )
+#
+attributeTypes: (
+  
+  NAME 'AstAccountCallGroup'
+  DESC 'Asterisk Account Call Group'
+  EQUALITY caseIgnoreMatch
+  SUBSTR caseIgnoreSubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+  )
+#
+attributeTypes: (
+  
+  NAME 'AstAccountCanReinvite'
+  DESC 'Asterisk Account Can Reinvite'
+  EQUALITY caseIgnoreMatch
+  SUBSTR caseIgnoreSubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+  )
+#
+attributeTypes: (
+  
+  NAME 'AstAccountDTMFMode'
+  DESC 'Asterisk Account DTMF Flags'
+  EQUALITY caseIgnoreMatch
+  SUBSTR caseIgnoreSubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+  )
+#
+attributeTypes: (
+  
+  NAME 'AstAccountFromUser'
+  DESC 'Asterisk Account From User'
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+  )
+#
+attributeTypes: (
+  
+  NAME 'AstAccountFromDomain'
+  DESC 'Asterisk Account From Domain'
+  EQUALITY caseIgnoreMatch
+  SUBSTR caseIgnoreSubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+  )
+#
+attributeTypes: (
+  
+  NAME 'AstAccountFullContact'
+  DESC 'Asterisk Account Full Contact'
+  EQUALITY caseIgnoreMatch
+  SUBSTR caseIgnoreSubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+  )
+#
+attributeTypes: (
+  
+  NAME 'AstAccountHost'
+  DESC 'Asterisk Account Host'
+  EQUALITY caseIgnoreMatch
+  SUBSTR caseIgnoreSubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+  )
+#
+attributeTypes: (
+  
+  NAME 'AstAccountInsecure'
+  DESC 'Asterisk Account Insecure'
+  EQUALITY caseIgnoreMatch
+  SUBSTR caseIgnoreSubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+  )
+#
+attributeTypes: (
+  
+  NAME 'AstAccountNAT'
+  DESC 'Asterisk Account NAT'
+  EQUALITY caseIgnoreMatch
+  SUBSTR caseIgnoreSubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+  )
+#
+attributeTypes: (
+  
+  NAME 'AstAccountPickupGroup'
+  DESC 'Asterisk Account PickupGroup'
+  EQUALITY caseIgnoreMatch
+  SUBSTR caseIgnoreSubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+  )
+#
+attributeTypes: (
+  
+  NAME 'AstAccountPort'
+  DESC 'Asterisk Account Port'
+  EQUALITY caseIgnoreMatch
+  SUBSTR caseIgnoreSubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+  )
+#
+attributeTypes: (
+  
+  NAME 'AstAccountRestrictCID'
+  DESC 'Asterisk Restrict CallerID'
+  EQUALITY caseIgnoreMatch
+  SUBSTR caseIgnoreSubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+  )
+#
+attributeTypes: (
+  
+  NAME 'AstAccountRTPTimeout'
+  DESC 'Asterisk RTP Timeout'
+  EQUALITY caseIgnoreMatch
+  SUBSTR caseIgnoreSubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+  )
+#
+attributeTypes: (
+  
+  NAME 'AstAccountRTPHoldTimeout'
+  DESC 'Asterisk RTP Hold Timeout'
+  EQUALITY caseIgnoreMatch
+  SUBSTR caseIgnoreSubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+  )
+#
+attributeTypes: (
+  
+  NAME 'AstAccountRealmedPassword'
+  DESC 'Asterisk RTP Hold Timeout'
+  EQUALITY caseIgnoreMatch
+  SUBSTR caseIgnoreSubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+  )
+#
+attributeTypes: (
+  
+  NAME 'AstAccountAllowedCodec'
+  DESC 'Asterisk Account Allowed Codec'
+  EQUALITY caseIgnoreMatch
+  SUBSTR caseIgnoreSubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+  )
+#
+attributeTypes: (
+  
+  NAME 'AstAccountMusicOnHold'
+  DESC 'Asterisk Account Allowed Codec'
+  EQUALITY caseIgnoreMatch
+  SUBSTR caseIgnoreSubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+  )
+#
+attributeTypes: (
+  
+  NAME 'AstAccountCanCallForward'
+  DESC 'Asterisk Can CAll Forward'
+  EQUALITY caseIgnoreMatch
+  SUBSTR caseIgnoreSubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+  )
+#
+attributeTypes: (
+  
+  NAME 'AstAccountSecret'
+  DESC 'Asterisk Can CAll Forward'
+  EQUALITY caseIgnoreMatch
+  SUBSTR caseIgnoreSubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+  )
+#
+attributeTypes: (
+  
+  NAME 'AstAccountName'
+  DESC 'Asterisk Account Username'
+  EQUALITY caseIgnoreMatch
+  SUBSTR caseIgnoreSubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+  )
+#
+attributeTypes: (
+  
+  NAME 'AstConfigFilename'
+  DESC 'Asterisk LDAP Configuration Filename'
+  EQUALITY caseIgnoreMatch
+  SUBSTR caseIgnoreSubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+  )
+#
+attributeTypes: (
+  
+  NAME 'AstConfigCategory'
+  DESC 'Asterisk LDAP Configuration Category'
+  EQUALITY caseIgnoreMatch
+  SUBSTR caseIgnoreSubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+  )
+#
+attributeTypes: (
+  
+  NAME 'AstConfigCategoryMetric'
+  DESC 'Asterisk LDAP Configuration Category Metric'
+  EQUALITY caseIgnoreMatch
+  SUBSTR caseIgnoreSubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+  )
+#
+attributeTypes: (
+  
+  NAME 'AstConfigVariableName'
+  DESC 'Asterisk LDAP Configuration Variable Name'
+  EQUALITY caseIgnoreMatch
+  SUBSTR caseIgnoreSubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+  )
+#
+attributeTypes: (
+  
+  NAME 'AstConfigVariableValue'
+  DESC 'Asterisk LDAP Configuration Variable Value'
+  EQUALITY caseIgnoreMatch
+  SUBSTR caseIgnoreSubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+  )
+#
+attributeTypes: (
+  
+  NAME 'AstConfigCommented'
+  DESC 'Asterisk LDAP Configuration Commented'
+  EQUALITY caseIgnoreMatch
+  SUBSTR caseIgnoreSubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+  )
+#
+attributeTypes: (
+  
+  NAME 'AstAccountIPAddress'
+  DESC 'Asterisk Account IP Address'
+  EQUALITY caseIgnoreMatch
+  SUBSTR caseIgnoreSubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+  )
+#
+attributeTypes: (
+  
+  NAME 'AstAccountDefaultUser'
+  DESC 'Asterisk Account Default User'
+  EQUALITY caseIgnoreMatch
+  SUBSTR caseIgnoreSubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+  )
+#
+attributeTypes: (
+  
+  NAME 'AstAccountRegistrationServer'
+  DESC 'Asterisk Account Registration Server'
+  EQUALITY caseIgnoreMatch
+  SUBSTR caseIgnoreSubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+  )
+#
+objectClasses: (
+  
+  NAME 'AsteriskExtension'
+  DESC 'PBX Extension Information for Asterisk'
+  SUP top
+  AUXILIARY
+  MUST cn
+  MAY ( AstContext $ AstExtension $ AstPriority $ AstApplication 
+      $ AstApplicationData )
+  )
+#
+objectClasses: (
+  
+  NAME 'AsteriskIAXUser'
+  DESC 'IAX2 User information for Asterisk'
+  SUP AsteriskExtension
+  AUXILIARY
+  MUST cn
+  MAY ( AstAccountAMAFlags $ AstAccountCallerID $ AstAccountContext 
+      $ AstAccountFullContact $ AstAccountHost $ AstAccountMailbox $ AstMD5secret 
+      $ AstAccountDeny $ AstAccountPermit $ AstAccountPort $ AstAccountQualify 
+      $ AstAccountType $ AstAccountDisallowedCodec $ AstAccountExpirationTimestamp 
+      $ AstAccountRegistrationContext$ AstAccountRegistrationExten 
+      $ AstAccountNoTransfer $ AstAccountName )
+  )
+#
+objectClasses: (
+  
+  NAME 'AsteriskSIPUser'
+  DESC 'SIP User information for Asterisk'
+  SUP AsteriskExtension
+  AUXILIARY
+  MUST cn
+  MAY ( AstAccountAMAFlags $ AstAccountCallGroup $ AstAccountCallerID 
+      $ AstAccountCanReinvite $ AstAccountContext $ AstAccountDefaultUser
+      $ AstAccountDTMFMode $ AstAccountFromUser $ AstAccountFromDomain 
+      $ AstAccountFullContact $ AstAccountHost $ AstAccountInsecure 
+      $ AstAccountIPAddress $ AstAccountMailbox $ AstAccountRealmedPassword 
+      $ AstAccountNAT $ AstAccountDeny $ AstAccountPermit $ AstAccountPickupGroup 
+      $ AstAccountPort $ AstAccountQualify $ AstAccountRestrictCID 
+      $ AstAccountRTPTimeout $ AstAccountRTPHoldTimeout $ AstAccountType 
+      $ AstAccountDisallowedCodec $ AstAccountAllowedCodec $ AstAccountMusicOnHold 
+      $ AstAccountExpirationTimestamp $ AstAccountRegistrationContext 
+      $ AstAccountRegistrationExten $ AstAccountRegistrationServer 
+      $ AstAccountCanCallForward $ AstAccountSecret $ AstAccountName )
+  )
+#
+objectClasses: (
+  
+  NAME 'AsteriskConfig'
+  DESC 'Asterisk configuration Information'
+  SUP top
+  AUXILIARY
+  MUST cn
+  MAY ( AstConfigFilename $ AstConfigCategory $ AstConfigCategoryMetric 
+      $ AstConfigVariableName $ AstConfigVariableValue $ AstConfigCommented )
+  )
-- 
1.6.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/F-9/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- .cvsignore	10 Oct 2008 22:59:56 -0000	1.17
+++ .cvsignore	8 Jan 2009 22:30:35 -0000	1.18
@@ -1 +1 @@
-asterisk-1.6.0.1-stripped.tar.gz
+asterisk-1.6.0.3-stripped.tar.gz

0001-Modify-init-scripts-for-better-Fedora-compatibility.patch:

Index: 0001-Modify-init-scripts-for-better-Fedora-compatibility.patch
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/F-9/0001-Modify-init-scripts-for-better-Fedora-compatibility.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- 0001-Modify-init-scripts-for-better-Fedora-compatibility.patch	5 Nov 2008 15:37:26 -0000	1.4
+++ 0001-Modify-init-scripts-for-better-Fedora-compatibility.patch	8 Jan 2009 22:30:35 -0000	1.5
@@ -1,7 +1,7 @@
-From efe583b4fb0722cc56e52ff8bbadd06ccc312409 Mon Sep 17 00:00:00 2001
+From 0040bd97782e9db8c341af9ffe171749644e35f1 Mon Sep 17 00:00:00 2001
 From: Jeffrey C. Ollie <jeff at ocjtech.us>
 Date: Sun, 18 Nov 2007 21:47:59 -0600
-Subject: [PATCH] Modify init scripts for better Fedora compatibility.
+Subject: [PATCH 01/15] Modify init scripts for better Fedora compatibility.
 
 ---
  contrib/init.d/rc.redhat.asterisk |   61 +++++++++++++++++-------------------
@@ -151,5 +151,5 @@
 +# be initialized.
 +#AST_GROUP="asterisk"
 -- 
-1.5.6.5
+1.6.1
 

0002-Modify-modules.conf-so-that-different-voicemail-modu.patch:

Index: 0002-Modify-modules.conf-so-that-different-voicemail-modu.patch
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/F-9/0002-Modify-modules.conf-so-that-different-voicemail-modu.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- 0002-Modify-modules.conf-so-that-different-voicemail-modu.patch	5 Nov 2008 15:37:26 -0000	1.4
+++ 0002-Modify-modules.conf-so-that-different-voicemail-modu.patch	8 Jan 2009 22:30:35 -0000	1.5
@@ -1,7 +1,7 @@
-From de8c8daa4f1ad9647fd9be2196b1ca4ba6e3955a Mon Sep 17 00:00:00 2001
+From 42cd072beba88049783a7bedb029760a5952706e Mon Sep 17 00:00:00 2001
 From: Jeffrey C. Ollie <jcollie at pc21224.campus.dmacc.edu>
 Date: Thu, 8 Nov 2007 15:52:36 -0600
-Subject: [PATCH] Modify modules.conf so that different voicemail modules can be loaded.
+Subject: [PATCH 02/15] Modify modules.conf so that different voicemail modules can be loaded.
 
 ---
  configs/modules.conf.sample |   27 +++++++++++++++++++++++++++
@@ -43,5 +43,5 @@
 +;noload => app_voicemail_plain.so
 +
 -- 
-1.5.6.5
+1.6.1
 

0003-Allow-alternate-extensions-to-be-specified-in-users.patch:

Index: 0003-Allow-alternate-extensions-to-be-specified-in-users.patch
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/F-9/0003-Allow-alternate-extensions-to-be-specified-in-users.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- 0003-Allow-alternate-extensions-to-be-specified-in-users.patch	5 Nov 2008 15:37:26 -0000	1.3
+++ 0003-Allow-alternate-extensions-to-be-specified-in-users.patch	8 Jan 2009 22:30:35 -0000	1.4
@@ -1,17 +1,17 @@
-From 2bc910c60188c668d7ad530a61eeacdac8ac9ee6 Mon Sep 17 00:00:00 2001
+From a9d27e3b5f93ff8658fa06a0c454140f27244363 Mon Sep 17 00:00:00 2001
 From: Jeffrey C. Ollie <jcollie at pc21224.campus.dmacc.edu>
 Date: Thu, 8 Nov 2007 16:32:56 -0600
-Subject: [PATCH] Allow alternate extensions to be specified in users.conf
+Subject: [PATCH 03/15] Allow alternate extensions to be specified in users.conf
 
 ---
  pbx/pbx_config.c |   14 ++++++++++++++
  1 files changed, 14 insertions(+), 0 deletions(-)
 
 diff --git a/pbx/pbx_config.c b/pbx/pbx_config.c
-index b63fedd..3574d0d 100644
+index dc48136..6c6ba87 100644
 --- a/pbx/pbx_config.c
 +++ b/pbx/pbx_config.c
-@@ -1562,11 +1562,14 @@ static void pbx_load_users(void)
+@@ -1568,11 +1568,14 @@ static void pbx_load_users(void)
  {
  	struct ast_config *cfg;
  	char *cat, *chan;
@@ -26,7 +26,7 @@
  	char *c;
  	int len;
  	int hasvoicemail;
-@@ -1647,6 +1650,17 @@ static void pbx_load_users(void)
+@@ -1653,6 +1656,17 @@ static void pbx_load_users(void)
  			} else {
  				ast_add_extension2(con, 0, cat, 1, NULL, NULL, "Dial", strdup("${HINT}"), ast_free_ptr, registrar);
  			}
@@ -45,5 +45,5 @@
  	}
  	ast_config_destroy(cfg);
 -- 
-1.5.6.5
+1.6.1
 

0004-Minor-changes-to-reduce-packaging-changes-made-by-th.patch:

Index: 0004-Minor-changes-to-reduce-packaging-changes-made-by-th.patch
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/F-9/0004-Minor-changes-to-reduce-packaging-changes-made-by-th.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- 0004-Minor-changes-to-reduce-packaging-changes-made-by-th.patch	5 Nov 2008 15:37:26 -0000	1.3
+++ 0004-Minor-changes-to-reduce-packaging-changes-made-by-th.patch	8 Jan 2009 22:30:35 -0000	1.4
@@ -1,7 +1,7 @@
-From 28e48a2b0b1b50a4dc09051f1250ae667614bedb Mon Sep 17 00:00:00 2001
+From 42991016984f9e7930686527706ab0f36baa41d1 Mon Sep 17 00:00:00 2001
 From: tilghman <tilghman at 614ede4d-c843-0410-af14-a771ab80d22e>
 Date: Tue, 29 Jul 2008 23:00:45 +0000
-Subject: [PATCH] Minor changes to reduce packaging changes made by the Fedora maintainer.
+Subject: [PATCH 04/15] Minor changes to reduce packaging changes made by the Fedora maintainer.
  (closes issue #12974)
   Reported by: jcollie
   Patches:
@@ -13,10 +13,10 @@
  1 files changed, 12 insertions(+), 4 deletions(-)
 
 diff --git a/Makefile b/Makefile
-index a874a7c..f82602c 100644
+index 788e524..05a58d1 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -221,10 +221,16 @@ ifeq ($(OSARCH),linux-gnu)
+@@ -222,10 +222,16 @@ ifeq ($(OSARCH),linux-gnu)
  endif
  
  ifeq ($(findstring -save-temps,$(ASTCFLAGS)),)
@@ -33,9 +33,9 @@
 -ASTCFLAGS+=-Wall -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations $(DEBUG)
 +ASTCFLAGS+=-Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations $(DEBUG)
  
- ASTCFLAGS+=-include $(ASTTOPDIR)/include/asterisk/autoconfig.h
- 
-@@ -237,8 +243,10 @@ ifneq ($(findstring BSD,$(OSARCH)),)
+ ifeq ($(AST_DEVMODE),yes)
+   ASTCFLAGS+=-Werror
+@@ -242,8 +248,10 @@ ifneq ($(findstring BSD,$(OSARCH)),)
    ASTLDFLAGS+=-L/usr/local/lib
  endif
  
@@ -49,5 +49,5 @@
  
  ifeq ($(PROC),ppc)
 -- 
-1.5.6.5
+1.6.1
 

0005-Add-chan_mobile-from-asterisk-addons.patch:

Index: 0005-Add-chan_mobile-from-asterisk-addons.patch
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/F-9/0005-Add-chan_mobile-from-asterisk-addons.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- 0005-Add-chan_mobile-from-asterisk-addons.patch	5 Nov 2008 15:37:26 -0000	1.3
+++ 0005-Add-chan_mobile-from-asterisk-addons.patch	8 Jan 2009 22:30:35 -0000	1.4
@@ -1,7 +1,7 @@
-From f3c9272a15f71e3dc084fad107eceb92d8a19475 Mon Sep 17 00:00:00 2001
+From 8cc8002094fe880d374a727aa0be389ca68b0342 Mon Sep 17 00:00:00 2001
 From: Jeffrey C. Ollie <jeff at ocjtech.us>
 Date: Mon, 25 Feb 2008 09:23:28 -0600
-Subject: [PATCH] Add chan_mobile from asterisk-addons.
+Subject: [PATCH 05/15] Add chan_mobile from asterisk-addons.
 
 ---
  build_tools/menuselect-deps.in |    1 +
@@ -2228,10 +2228,10 @@
 +type=headset
 +adapter=dlink
 diff --git a/configure.ac b/configure.ac
-index 33b40a2..f86e8f5 100644
+index 20e8e33..b8ebbf5 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -205,6 +205,8 @@ AST_EXT_LIB_SETUP([ALSA], [Advanced Linux Sound Architecture], [asound])
+@@ -211,6 +211,8 @@ AST_EXT_LIB_SETUP([ALSA], [Advanced Linux Sound Architecture], [asound])
  # BKTR is used for backtrace support on platforms that do not
  # have it natively.
  AST_EXT_LIB_SETUP([BKTR], [Stack Backtrace support], [execinfo])
@@ -2240,7 +2240,7 @@
  AST_EXT_LIB_SETUP([CAP], [POSIX 1.e capabilities], [cap])
  AST_EXT_LIB_SETUP([CURL], [cURL], [curl])
  AST_EXT_LIB_SETUP([CURSES], [curses], [curses])
-@@ -556,6 +558,8 @@ AC_CHECK_SIZEOF(int)
+@@ -574,6 +576,8 @@ AC_CHECK_SIZEOF(int)
  
  AST_EXT_LIB_CHECK([ALSA], [asound], [snd_spcm_init], [alsa/asoundlib.h], [-lm -ldl])
  
@@ -2496,10 +2496,10 @@
 +
 +email me at   david.bowerman at gmail.com   or dseeb_ on #asterisk & #asterisk-dev irc.
 diff --git a/makeopts.in b/makeopts.in
-index b3e5c49..05de366 100644
+index 018bc6c..039525d 100644
 --- a/makeopts.in
 +++ b/makeopts.in
-@@ -69,6 +69,9 @@ AST_NO_STRICT_OVERFLOW=@AST_NO_STRICT_OVERFLOW@
+@@ -71,6 +71,9 @@ AST_FORTIFY_SOURCE=@AST_FORTIFY_SOURCE@
  ASOUND_INCLUDE=@ALSA_INCLUDE@
  ASOUND_LIB=@ALSA_LIB@
  
@@ -2510,5 +2510,5 @@
  CURL_LIB=@CURL_LIB@
  
 -- 
-1.5.6.5
+1.6.1
 

0006-Use-pkgconfig-to-check-for-Lua.patch:

Index: 0006-Use-pkgconfig-to-check-for-Lua.patch
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/F-9/0006-Use-pkgconfig-to-check-for-Lua.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- 0006-Use-pkgconfig-to-check-for-Lua.patch	5 Nov 2008 15:37:26 -0000	1.3
+++ 0006-Use-pkgconfig-to-check-for-Lua.patch	8 Jan 2009 22:30:35 -0000	1.4
@@ -1,17 +1,17 @@
-From 81bf87aedbf0f1ad5b8ecc97e3012821207445ca Mon Sep 17 00:00:00 2001
+From d633181f75ea7dc879e8ac9d014cf1fc0fe364ef Mon Sep 17 00:00:00 2001
 From: Jeffrey C. Ollie <jeff at ocjtech.us>
 Date: Mon, 25 Feb 2008 13:14:23 -0600
-Subject: [PATCH] Use pkgconfig to check for Lua.
+Subject: [PATCH 06/15] Use pkgconfig to check for Lua.
 
 ---
  configure.ac |    9 ++++++++-
  1 files changed, 8 insertions(+), 1 deletions(-)
 
 diff --git a/configure.ac b/configure.ac
-index f86e8f5..f4e445c 100644
+index b8ebbf5..d3e4054 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -1364,7 +1364,14 @@ if test "${PBX_PWLIB}" = "1" -a "${USE_OPENH323}" != "no" ; then
+@@ -1382,7 +1382,14 @@ if test "${PBX_PWLIB}" = "1" -a "${USE_OPENH323}" != "no" ; then
  		[${PWLIB_INCLUDE}], [${PWLIB_LIB}])
  fi
  
@@ -28,5 +28,5 @@
  AST_EXT_LIB_CHECK([RADIUS], [radiusclient-ng], [rc_read_config], [radiusclient-ng.h])
  
 -- 
-1.5.6.5
+1.6.1
 

0007-Build-using-external-libedit.patch:

Index: 0007-Build-using-external-libedit.patch
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/F-9/0007-Build-using-external-libedit.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- 0007-Build-using-external-libedit.patch	5 Nov 2008 15:37:26 -0000	1.3
+++ 0007-Build-using-external-libedit.patch	8 Jan 2009 22:30:35 -0000	1.4
@@ -1,7 +1,7 @@
-From bbdbf8b43a846dd5f84cee581cb43eae7fc57c87 Mon Sep 17 00:00:00 2001
+From a50090dc47540b5c3df28c9846fe753f5476c4fc Mon Sep 17 00:00:00 2001
 From: Jeffrey C. Ollie <jeff at ocjtech.us>
 Date: Tue, 25 Mar 2008 00:50:27 -0500
-Subject: [PATCH] Build using external libedit.
+Subject: [PATCH 07/15] Build using external libedit.
 
 ---
  build_tools/menuselect-deps.in |    1 +
@@ -24,10 +24,10 @@
  LUA=@PBX_LUA@
  MISDN=@PBX_MISDN@
 diff --git a/configure.ac b/configure.ac
-index f4e445c..40f8d6e 100644
+index d3e4054..12065a4 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -223,6 +223,7 @@ AST_EXT_LIB_SETUP([IMAP_TK], [UW IMAP Toolkit], [imap])
+@@ -229,6 +229,7 @@ AST_EXT_LIB_SETUP([IMAP_TK], [UW IMAP Toolkit], [imap])
  AST_EXT_LIB_SETUP([ISDNNET], [ISDN4Linux Library], [isdnnet])
  AST_EXT_LIB_SETUP([JACK], [Jack Audio Connection Kit], [jack])
  AST_EXT_LIB_SETUP([LDAP], [OpenLDAP], [ldap])
@@ -35,7 +35,7 @@
  AST_EXT_LIB_SETUP([LTDL], [libtool], [ltdl])
  AST_EXT_LIB_SETUP([LUA], [Lua], [lua])
  AST_EXT_LIB_SETUP([MISDN], [mISDN User Library], [misdn])
-@@ -1530,6 +1531,27 @@ AC_SUBST(PBX_GTK2)
+@@ -1576,6 +1577,27 @@ AC_SUBST(PBX_GTK2)
  AC_SUBST(GTK2_INCLUDE)
  AC_SUBST(GTK2_LIB)
  
@@ -64,10 +64,10 @@
     AC_PATH_TOOL([CURL_CONFIG], [curl-config], No)
     if test ! x"${CURL_CONFIG}" = xNo; then
 diff --git a/main/Makefile b/main/Makefile
-index b3a53a3..996ddf6 100644
+index 14fa19a..9d3e9e4 100644
 --- a/main/Makefile
 +++ b/main/Makefile
-@@ -132,6 +132,7 @@ testexpr2: ast_expr2f.c ast_expr2.c ast_expr2.h
+@@ -135,6 +135,7 @@ testexpr2: ast_expr2f.c ast_expr2.c ast_expr2.h
  channel.o: ASTCFLAGS+=$(DAHDI_INCLUDE)
  asterisk.o: ASTCFLAGS+=$(DAHDI_INCLUDE)
  
@@ -75,7 +75,7 @@
  
  ifneq ($(findstring ENABLE_UPLOADS,$(MENUSELECT_CFLAGS)),)
  http.o: ASTCFLAGS+=$(GMIME_INCLUDE)
-@@ -165,13 +166,13 @@ ifneq ($(findstring ENABLE_UPLOADS,$(MENUSELECT_CFLAGS)),)
+@@ -168,13 +169,13 @@ ifneq ($(findstring ENABLE_UPLOADS,$(MENUSELECT_CFLAGS)),)
  GMIMELDFLAGS+=$(GMIME_LIB)
  endif
  
@@ -93,7 +93,7 @@
  	$(CMD_PREFIX) $(ASTTOPDIR)/build_tools/strip_nonapi $@ || rm $@
  
 diff --git a/main/cli.c b/main/cli.c
-index 70d26e1..90454d8 100644
+index 6b129bc..cc838d5 100644
 --- a/main/cli.c
 +++ b/main/cli.c
 @@ -34,6 +34,8 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
@@ -114,10 +114,10 @@
  
  /*!
 diff --git a/makeopts.in b/makeopts.in
-index 05de366..72d5315 100644
+index 039525d..9eef75e 100644
 --- a/makeopts.in
 +++ b/makeopts.in
-@@ -241,3 +241,7 @@ TINFO_DIR=@TINFO_DIR@
+@@ -243,3 +243,7 @@ TINFO_DIR=@TINFO_DIR@
  
  # if poll is not present, let the makefile know.
  POLL_AVAILABLE=@HAS_POLL@
@@ -126,5 +126,5 @@
 +LIBEDIT_LIB=@LIBEDIT_LIB@
 +LIBEDIT_OBJ=@LIBEDIT_OBJ@
 -- 
-1.5.6.5
+1.6.1
 


Index: asterisk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/F-9/asterisk.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- asterisk.spec	5 Nov 2008 15:37:26 -0000	1.33
+++ asterisk.spec	8 Jan 2009 22:30:36 -0000	1.34
@@ -2,8 +2,8 @@
 
 Summary: The Open Source PBX
 Name: asterisk
-Version: 1.6.0.1
-Release: 3%{?dist}
+Version: 1.6.0.3
+Release: 1%{?dist}
 License: GPLv2
 Group: Applications/Internet
 URL: http://www.asterisk.org/
@@ -19,13 +19,13 @@
 
 # MD5 Sums
 # ========
-# 5277db1134f0dc736932279c6a25c29a  asterisk-1.6.0.1.tar.gz
-# 00465d571b2cd9fd49c86b753aa3a551  asterisk-1.6.0.1-stripped.tar.gz
+# 0797cfc8834b06e5a0169b2fda6f7bb9  asterisk-1.6.0.3.tar.gz
+# eefe39842fac3f5bd3c7b3a6c378bb5c  asterisk-1.6.0.3-stripped.tar.gz
 #
 # SHA1 Sums
 # =========
-# 20d77f6a08a8d755eeadf431c1f692d5adeadde8  asterisk-1.6.0.1.tar.gz
-# 4f5d1f436ba1119db9dfea072b1e6ac59c9eebd5  asterisk-1.6.0.1-stripped.tar.gz
+# bdede6d5113a5b0006b186a72e81c886d48ae4db  asterisk-1.6.0.3.tar.gz
+# e14b25b16d49a8b7400353e0588cc8e8d1768c5c  asterisk-1.6.0.3-stripped.tar.gz
 
 Source0: asterisk-%{version}-stripped.tar.gz
 Source1: asterisk-logrotate
@@ -40,8 +40,13 @@
 Patch5:  0005-Add-chan_mobile-from-asterisk-addons.patch
 Patch6:  0006-Use-pkgconfig-to-check-for-Lua.patch
 Patch7:  0007-Build-using-external-libedit.patch
-Patch8:  0008-Update-autoconf.patch
-Patch9:	 0009-Revert-changes-to-pbx_lua-from-rev-126363-that-cause.patch
+Patch8:  0008-Revert-changes-to-pbx_lua-from-rev-126363-that-cause.patch
+Patch9:  0009-change-configure.ac-to-look-for-pkg-config-gmime-2.4.patch
+Patch10: 0010-fix-the-AST_PROG_SED-problem-that-makes-.-bootstrap.patch
+Patch12: 0012-Merged-revisions-162275-via-svnmerge-from.patch
+Patch13: 0013-Update-autoconf.patch
+Patch14: 0014-Fix-up-some-paths.patch
+Patch15: 0015-Add-LDAP-schema-that-is-compatible-with-Fedora-Direc.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
 
@@ -230,6 +235,16 @@
 %description ldap
 LDAP resources for Asterisk.
 
+%package ldap-fds
+Summary: LDAP resources for Asterisk and the Fedora Directory Server
+Group: Applications/Internet
+Requires: asterisk = %{version}-%{release}
+Requires: asterisk-ldap = %{version}-%{release}
+Requires: fedora-ds-base
+
+%description ldap-fds
+LDAP resources for Asterisk and the Fedora Directory Server.
+
 %package misdn
 Summary: mISDN channel for Asterisk
 Group: Applications/Internet
@@ -415,6 +430,11 @@
 %patch7 -p1
 %patch8 -p1
 %patch9 -p1
+%patch10 -p1
+%patch12 -p1
+%patch13 -p1
+%patch14 -p1
+%patch15 -p1
 
 cp %{SOURCE2} menuselect.makedeps
 cp %{SOURCE3} menuselect.makeopts
@@ -495,6 +515,7 @@
 
 install -D -p -m 0755 contrib/init.d/rc.redhat.asterisk %{buildroot}%{_initrddir}/asterisk
 install -D -p -m 0644 contrib/sysconfig/asterisk %{buildroot}%{_sysconfdir}/sysconfig/asterisk
+install -D -p -m 0644 contrib/scripts/99asterisk.ldif %{buildroot}%{_sysconfdir}/dirsrv/schema/99asterisk.ldif
 install -D -p -m 0644 %{S:1} %{buildroot}%{_sysconfdir}/logrotate.d/asterisk
 install -D -p -m 0644 doc/asterisk-mib.txt %{buildroot}%{_datadir}/snmp/mibs/ASTERISK-MIB.txt
 install -D -p -m 0644 doc/digium-mib.txt %{buildroot}%{_datadir}/snmp/mibs/DIGIUM-MIB.txt
@@ -513,8 +534,10 @@
 mkdir -p %{buildroot}%{_datadir}/asterisk/sounds/
 mkdir -p %{buildroot}%{_localstatedir}/lib/asterisk
 mkdir -p %{buildroot}%{_localstatedir}/log/asterisk/cdr-custom/
+mkdir -p %{buildroot}%{_localstatedir}/spool/asterisk/festival/
 mkdir -p %{buildroot}%{_localstatedir}/spool/asterisk/monitor/
 mkdir -p %{buildroot}%{_localstatedir}/spool/asterisk/outgoing/
+mkdir -p %{buildroot}%{_localstatedir}/spool/asterisk/uploads/
 
 # We're not going to package any of the sample AGI scripts
 rm -f %{buildroot}%{_datadir}/asterisk/agi-bin/*
@@ -679,7 +702,6 @@
 %{_libdir}/asterisk/modules/func_callerid.so
 %{_libdir}/asterisk/modules/func_cdr.so
 %{_libdir}/asterisk/modules/func_channel.so
-%{_libdir}/asterisk/modules/func_curl.so
 %{_libdir}/asterisk/modules/func_cut.so
 %{_libdir}/asterisk/modules/func_db.so
 %{_libdir}/asterisk/modules/func_devstate.so
@@ -727,14 +749,14 @@
 %{_libdir}/asterisk/modules/res_smdi.so
 %{_libdir}/asterisk/modules/res_speech.so
 
-%{_sbindir}/aelparse
+#%{_sbindir}/aelparse
 %{_sbindir}/astcanary
 %{_sbindir}/asterisk
 %{_sbindir}/astgenkey
 %{_sbindir}/astman
 %{_sbindir}/autosupport
 %{_sbindir}/check_expr
-%{_sbindir}/conf2ael
+#%{_sbindir}/conf2ael
 %{_sbindir}/muted
 %{_sbindir}/rasterisk
 %{_sbindir}/safe_asterisk
@@ -817,6 +839,7 @@
 %attr(0770,asterisk,asterisk) %dir %{_localstatedir}/spool/asterisk/monitor/
 %attr(0770,asterisk,asterisk) %dir %{_localstatedir}/spool/asterisk/outgoing/
 %attr(0750,asterisk,asterisk) %dir %{_localstatedir}/spool/asterisk/tmp/
+%attr(0750,asterisk,asterisk) %dir %{_localstatedir}/spool/asterisk/uploads/
 %attr(0750,asterisk,asterisk) %dir %{_localstatedir}/spool/asterisk/voicemail/
 
 %attr(0755,asterisk,asterisk) %dir %{_localstatedir}/run/asterisk
@@ -878,6 +901,7 @@
 %files festival
 %defattr(-,root,root,-)
 %config(noreplace) %{_sysconfdir}/asterisk/festival.conf
+%attr(0750,asterisk,asterisk) %dir %{_localstatedir}/spool/asterisk/festival/
 %{_libdir}/asterisk/modules/app_festival.so
 
 %files firmware
@@ -915,6 +939,10 @@
 %config(noreplace) %{_sysconfdir}/asterisk/res_ldap.conf
 %{_libdir}/asterisk/modules/res_config_ldap.so
 
+%files ldap-fds
+%defattr(-,root,root,-)
+%{_sysconfdir}/dirsrv/schema/99asterisk.ldif
+
 %files minivm
 %defattr(-,root,root,-)
 %config(noreplace) %{_sysconfdir}/asterisk/extensions_minivm.conf
@@ -1024,6 +1052,23 @@
 %{_libdir}/asterisk/modules/app_voicemail_plain.so
 
 %changelog
+* Thu Jan  8 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6.0.3-1
+- Update to 1.6.0.3 to fix AST-2009-001/CVE-2009-0041
+- http://downloads.digium.com/pub/security/AST-2009-001.html
+
+* Sun Jan  4 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6.0.2-4
+- Fedora Directory Server compatibility patch/subpackage. BZ#452176
+
+* Sun Jan  4 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6.0.2-3
+- Don't package func_curl in the main package. BZ#475910
+- Fix up paths. BZ#477238
+
+* Sun Jan  4 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6.0.2-2
+- Add patch to fix compilation on PPC
+
+* Sun Jan  4 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6.0.2-1
+- Update to 1.6.0.2
+
 * Wed Nov  5 2008 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6.0.1-3
 - Fix issue with init script giving wrong path to config file.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/F-9/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources	10 Oct 2008 22:59:56 -0000	1.17
+++ sources	8 Jan 2009 22:30:36 -0000	1.18
@@ -1 +1 @@
-00465d571b2cd9fd49c86b753aa3a551  asterisk-1.6.0.1-stripped.tar.gz
+eefe39842fac3f5bd3c7b3a6c378bb5c  asterisk-1.6.0.3-stripped.tar.gz


--- 0008-Update-autoconf.patch DELETED ---


--- 0009-Revert-changes-to-pbx_lua-from-rev-126363-that-cause.patch DELETED ---



From nsantos at fedoraproject.org  Thu Jan  8 22:44:13 2009
From: nsantos at fedoraproject.org (Nuno Santos)
Date: Thu,  8 Jan 2009 22:44:13 +0000 (UTC)
Subject: rpms/qpidc/devel corosync.patch,1.3,1.4
Message-ID: <20090108224413.F0462700FD@cvs1.fedora.phx.redhat.com>

Author: nsantos

Update of /cvs/extras/rpms/qpidc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9130

Modified Files:
	corosync.patch 
Log Message:
revised corosync patch, from svn rev 732854

corosync.patch:

Index: corosync.patch
===================================================================
RCS file: /cvs/extras/rpms/qpidc/devel/corosync.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- corosync.patch	8 Jan 2009 22:00:22 -0000	1.3
+++ corosync.patch	8 Jan 2009 22:43:43 -0000	1.4
@@ -1,26 +1,9 @@
---- src/qpid/cluster/types.h (original)
-+++ src/qpid/cluster/types.h Wed Jan  7 07:00:55 2009
-@@ -34,9 +34,9 @@
- #include <stdint.h>
- 
- extern "C" {
--#ifdef HAVE_OPENAIS_CPG_H    
--#include <openais/cpg.h>
--#elif HAVE_COROSYNC_CPG_H    
-+#if defined (HAVE_OPENAIS_CPG_H)
-+#  include <openais/cpg.h>
-+#elif defined (HAVE_COROSYNC_CPG_H)
- #  include <corosync/cpg.h>
- #else
- #  error "No cpg.h header file available"
---- src/qpid/cluster/Cpg.cpp (original)
-+++ src/qpid/cluster/Cpg.cpp Thu Jan  8 13:56:21 2009
-@@ -126,8 +126,16 @@
+--- src/qpid/cluster/Cpg.cpp	2009-01-08 17:34:25.000000000 -0500
++++ src/qpid/cluster/Cpg.cpp	2008-12-17 18:44:04.000000000 -0500
+@@ -126,27 +126,36 @@
      }
  }
  
--void Cpg::dispatch(cpg_dispatch_t type) {
--    check(cpg_dispatch(handle,type), "Error in CPG dispatch");
 +void Cpg::dispatchOne() {
 +    check(cpg_dispatch(handle,CPG_DISPATCH_ONE), "Error in CPG dispatch");
 +}
@@ -31,24 +14,46 @@
 +
 +void Cpg::dispatchBlocking() {
 +    check(cpg_dispatch(handle,CPG_DISPATCH_BLOCKING), "Error in CPG dispatch");
+-void Cpg::dispatch(cpg_dispatch_t type) {
+-    check(cpg_dispatch(handle,type), "Error in CPG dispatch");
  }
  
  string Cpg::errorStr(cpg_error_t err, const std::string& msg) {
-@@ -135,7 +143,7 @@
+     switch (err) {
        case CPG_OK: return msg+": ok";
-       case CPG_ERR_LIBRARY: return msg+": library error";
+-      case CPG_ERR_LIBRARY: return msg+": library error";
        case CPG_ERR_TIMEOUT: return msg+": timeout";
--      case CPG_ERR_TRY_AGAIN: return msg+": timeout. The aisexec daemon may not be running";
-+      case CPG_ERR_TRY_AGAIN: return msg+": timeout.";
+       case CPG_ERR_TRY_AGAIN: return msg+": timeout. The aisexec daemon may not be running";
        case CPG_ERR_INVALID_PARAM: return msg+": invalid param";
        case CPG_ERR_NO_MEMORY: return msg+": no memory";
        case CPG_ERR_BAD_HANDLE: return msg+": bad handle";
---- src/qpid/cluster/Cpg.h (original)
-+++ src/qpid/cluster/Cpg.h Thu Jan  8 13:56:21 2009
++      case CPG_ERR_ACCESS: return msg+": access denied. You may need to set your group ID to 'ais'";
+-      case CPG_ERR_ACCESS: return msg+": access denied.";
+       case CPG_ERR_NOT_EXIST: return msg+": not exist";
+       case CPG_ERR_EXIST: return msg+": exist";
+       case CPG_ERR_NOT_SUPPORTED: return msg+": not supported";
++        // The following are not mapped, or are incorrectly mapped in corosync 0-92-5
++        // case CPG_ERR_LIBRARY: return msg+": library";
++        // case CPG_ERR_SECURITY: return msg+": security";
++        // case CPG_ERR_TOO_MANY_GROUPS: return msg+": too many groups";
++
+-      case CPG_ERR_SECURITY: return msg+": security";
+-      case CPG_ERR_TOO_MANY_GROUPS: return msg+": too many groups";
+       default:
++        return ": cpg error";
+-        assert(0);
+-        return ": unknown";
+     };
+ }
+--- src/qpid/cluster/Cpg.h	2009-01-08 17:25:30.000000000 -0500
++++ src/qpid/cluster/Cpg.h	2008-12-17 18:44:04.000000000 -0500
 @@ -94,17 +94,9 @@
      /** Disconnect from CPG */
      void shutdown();
      
++    void dispatchOne();
++    void dispatchAll();
++    void dispatchBlocking();
 -    /** Dispatch CPG events.
 -     *@param type one of
 -     * - CPG_DISPATCH_ONE - dispatch exactly one event.
@@ -60,9 +65,21 @@
 -    void dispatchOne() { dispatch(CPG_DISPATCH_ONE); }
 -    void dispatchAll() { dispatch(CPG_DISPATCH_ALL); }
 -    void dispatchBlocking() { dispatch(CPG_DISPATCH_BLOCKING); }
-+    void dispatchOne();
-+    void dispatchAll();
-+    void dispatchBlocking();
  
      void join(const std::string& group);    
      void leave();
+--- src/qpid/cluster/types.h	2009-01-08 17:25:30.000000000 -0500
++++ src/qpid/cluster/types.h	2008-12-17 18:44:04.000000000 -0500
+@@ -34,9 +34,9 @@
+ #include <stdint.h>
+ 
+ extern "C" {
++#if defined (HAVE_OPENAIS_CPG_H)
++#  include <openais/cpg.h>
++#elif defined (HAVE_COROSYNC_CPG_H)
+-#ifdef HAVE_OPENAIS_CPG_H    
+-#include <openais/cpg.h>
+-#elif HAVE_COROSYNC_CPG_H    
+ #  include <corosync/cpg.h>
+ #else
+ #  error "No cpg.h header file available"



From trasher at fedoraproject.org  Thu Jan  8 22:51:09 2009
From: trasher at fedoraproject.org (Johan Cwiklinski)
Date: Thu,  8 Jan 2009 22:51:09 +0000 (UTC)
Subject: rpms/eric/devel eric4-4.2.5-shebang.patch, NONE, 1.1 eric.spec, 1.35,
	1.36 sources, 1.16, 1.17 eric4-4.1.0-shebang.patch, 1.1, NONE
Message-ID: <20090108225109.645F7700FD@cvs1.fedora.phx.redhat.com>

Author: trasher

Update of /cvs/extras/rpms/eric/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10328

Modified Files:
	eric.spec sources 
Added Files:
	eric4-4.2.5-shebang.patch 
Removed Files:
	eric4-4.1.0-shebang.patch 
Log Message:
New upstream release 4.2.5


eric4-4.2.5-shebang.patch:

--- NEW FILE eric4-4.2.5-shebang.patch ---
diff -up eric4-4.2.5/eric/__init__.py.patch eric4-4.2.5/eric/__init__.py
--- eric4-4.2.5/eric/__init__.py.patch	2009-01-08 18:11:24.000000000 +0100
+++ eric4-4.2.5/eric/__init__.py	2009-01-08 18:11:30.000000000 +0100
@@ -1,3 +1,4 @@
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
 # Copyright (c) 2003 - 2009 Detlev Offenbach <detlev at die-offenbachs.de>
diff -up eric4-4.2.5/eric/patch_modpython.py.patch eric4-4.2.5/eric/patch_modpython.py
--- eric4-4.2.5/eric/patch_modpython.py.patch	2009-01-08 18:11:05.000000000 +0100
+++ eric4-4.2.5/eric/patch_modpython.py	2009-01-08 18:11:13.000000000 +0100
@@ -1,3 +1,4 @@
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
 # Copyright (c) 2003-2009 Detlev Offenbach <detlev at die-offenbachs.de>
diff -up eric4-4.2.5/eric/uninstall.py.patch eric4-4.2.5/eric/uninstall.py
--- eric4-4.2.5/eric/uninstall.py.patch	2009-01-08 18:10:38.000000000 +0100
+++ eric4-4.2.5/eric/uninstall.py	2009-01-08 18:10:51.000000000 +0100
@@ -1,3 +1,4 @@
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
 # Copyright (c) 2002-2009 Detlev Offenbach <detlev at die-offenbachs.de>


Index: eric.spec
===================================================================
RCS file: /cvs/extras/rpms/eric/devel/eric.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- eric.spec	9 Dec 2008 20:46:11 -0000	1.35
+++ eric.spec	8 Jan 2009 22:50:38 -0000	1.36
@@ -7,12 +7,12 @@
 
 Name:    eric
 Summary: Python IDE
-Version: 4.2.4a
+Version: 4.2.5
 Release: 1%{?dist}
 
 License: GPL+
 Group:   Development/Tools
-URL:     http://www.die-offenbachs.de/eric/index.html
+URL:     http://eric-ide.python-projects.org
 Source:  http://downloads.sourceforge.net/sourceforge/eric-ide/%{name}4-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -24,7 +24,7 @@
 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
+Patch1:    eric4-4.2.5-shebang.patch
 
 Provides: eric4 = %{version}-%{release}
 
@@ -147,6 +147,9 @@
 
 
 %changelog
+* Thu Jan 8 2009 Johan Cwiklinski <johan AT x-tnd DOT be> 4.2.5-1
+* 4.2.5
+
 * Wed Dec 9 2008 Johan Cwiklinski <johan AT x-tnd DOT be> 4.2.4a-1
 - 4.2.4a
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/eric/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources	9 Dec 2008 20:46:11 -0000	1.16
+++ sources	8 Jan 2009 22:50:38 -0000	1.17
@@ -1,7 +1,7 @@
-67cbe7407783066be989abd01c8f195b  eric4-4.2.4a.tar.gz
-ca59f61018536f6031ba2835664803d0  eric4-i18n-cs-4.2.4a.tar.gz
-c3fc58822175739897b4d5ab0563c45c  eric4-i18n-de-4.2.4a.tar.gz
-70c8d33e1b76167ee45f5f46bb7a322a  eric4-i18n-es-4.2.4a.tar.gz
-541b3eb38c9ebdd7b3d64f8e08b6fa74  eric4-i18n-fr-4.2.4a.tar.gz
-510ebe302d13f243766f0bf474219751  eric4-i18n-ru-4.2.4a.tar.gz
-ef73a494480e5b44aaa8ab8bb844070e  eric4-i18n-tr-4.2.4a.tar.gz
+195e5d4b29977c0c36d808cd77bc40c9  eric4-4.2.5.tar.gz
+71005adf2e9d339ad50998a420c61c4f  eric4-i18n-cs-4.2.5.tar.gz
+ebdef75261d208ae7e2d0b22ebed33e8  eric4-i18n-de-4.2.5.tar.gz
+4bacb41caac1f5914131870ea384ec7f  eric4-i18n-es-4.2.5.tar.gz
+1fba197dde8ebf5642af51ba375de582  eric4-i18n-fr-4.2.5.tar.gz
+1ba6416268c88ca30b3866f05a6558be  eric4-i18n-ru-4.2.5.tar.gz
+0f18017832ef5b880a636e15c39b5c7c  eric4-i18n-tr-4.2.5.tar.gz


--- eric4-4.1.0-shebang.patch DELETED ---



From ltinkl at fedoraproject.org  Thu Jan  8 22:53:56 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Thu,  8 Jan 2009 22:53:56 +0000 (UTC)
Subject: rpms/kdeedu/F-10 .cvsignore, 1.54, 1.55 kdeedu.spec, 1.134,
	1.135 sources, 1.58, 1.59
Message-ID: <20090108225356.C159F700FD@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kdeedu/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10589/F-10

Modified Files:
	.cvsignore kdeedu.spec sources 
Log Message:
KDE 4.1.4



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdeedu/F-10/.cvsignore,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- .cvsignore	18 Dec 2008 16:35:08 -0000	1.54
+++ .cvsignore	8 Jan 2009 22:53:26 -0000	1.55
@@ -1 +1 @@
-kdeedu-4.1.3.tar.bz2
+kdeedu-4.1.4.tar.bz2


Index: kdeedu.spec
===================================================================
RCS file: /cvs/extras/rpms/kdeedu/F-10/kdeedu.spec,v
retrieving revision 1.134
retrieving revision 1.135
diff -u -r1.134 -r1.135
--- kdeedu.spec	18 Dec 2008 17:32:13 -0000	1.134
+++ kdeedu.spec	8 Jan 2009 22:53:26 -0000	1.135
@@ -13,8 +13,8 @@
 
 Name:    kdeedu
 Summary: Educational/Edutainment applications 
-Version: 4.1.3
-Release: 2%{?dist}
+Version: 4.1.4
+Release: 1%{?dist}
 
 License: GPLv2
 Group:	 Amusements/Games
@@ -393,6 +393,9 @@
 
 
 %changelog
+* Thu Jan  8 2009 Luk???? Tinkl <ltinkl at redhat.com> 4.1.4-1
+- KDE 4.1.4
+
 * Thu Dec 18 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.3-2
 - respin (upstreamable) cfitsio patch
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdeedu/F-10/sources,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- sources	11 Nov 2008 23:47:01 -0000	1.58
+++ sources	8 Jan 2009 22:53:26 -0000	1.59
@@ -1 +1 @@
-8b513d6dde79119842eef059550c0123  kdeedu-4.1.3.tar.bz2
+28840fa475571184994824d12a0b7684  kdeedu-4.1.4.tar.bz2



From ltinkl at fedoraproject.org  Thu Jan  8 22:53:57 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Thu,  8 Jan 2009 22:53:57 +0000 (UTC)
Subject: rpms/kdeedu/F-9 .cvsignore, 1.48, 1.49 kdeedu.spec, 1.110,
	1.111 sources, 1.53, 1.54
Message-ID: <20090108225357.0A5FA700FD@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kdeedu/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10589/F-9

Modified Files:
	.cvsignore kdeedu.spec sources 
Log Message:
KDE 4.1.4



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdeedu/F-9/.cvsignore,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- .cvsignore	10 Nov 2008 16:06:14 -0000	1.48
+++ .cvsignore	8 Jan 2009 22:53:26 -0000	1.49
@@ -1 +1 @@
-kdeedu-4.1.3.tar.bz2
+kdeedu-4.1.4.tar.bz2


Index: kdeedu.spec
===================================================================
RCS file: /cvs/extras/rpms/kdeedu/F-9/kdeedu.spec,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -r1.110 -r1.111
--- kdeedu.spec	10 Nov 2008 16:06:14 -0000	1.110
+++ kdeedu.spec	8 Jan 2009 22:53:26 -0000	1.111
@@ -13,7 +13,7 @@
 
 Name:    kdeedu
 Summary: Educational/Edutainment applications 
-Version: 4.1.3
+Version: 4.1.4
 Release: 1%{?dist}
 
 License: GPLv2
@@ -393,6 +393,9 @@
 
 
 %changelog
+* Thu Jan  8 2009 Luk???? Tinkl <ltinkl at redhat.com> 4.1.4-1
+- KDE 4.1.4
+
 * Mon Nov 10 2008 Luk???? Tinkl <ltinkl at redhat.com> 4.1.3-1
 - KDE 4.1.3
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdeedu/F-9/sources,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- sources	10 Nov 2008 16:06:14 -0000	1.53
+++ sources	8 Jan 2009 22:53:26 -0000	1.54
@@ -1 +1 @@
-8b513d6dde79119842eef059550c0123  kdeedu-4.1.3.tar.bz2
+28840fa475571184994824d12a0b7684  kdeedu-4.1.4.tar.bz2



From donv at fedoraproject.org  Thu Jan  8 23:02:40 2009
From: donv at fedoraproject.org (Uwe Kubosch)
Date: Thu,  8 Jan 2009 23:02:40 +0000 (UTC)
Subject: rpms/zfs-fuse/F-10 zfs-fuse.spec,1.4,1.5
Message-ID: <20090108230240.CDA5C700FD@cvs1.fedora.phx.redhat.com>

Author: donv

Update of /cvs/pkgs/rpms/zfs-fuse/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11458/F-10

Modified Files:
	zfs-fuse.spec 
Log Message:
* Corrected spelling error in change log


Index: zfs-fuse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/zfs-fuse/F-10/zfs-fuse.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- zfs-fuse.spec	1 Jan 2009 12:33:09 -0000	1.4
+++ zfs-fuse.spec	8 Jan 2009 23:02:09 -0000	1.5
@@ -95,7 +95,7 @@
 - Adds syncing of disks at shutdown.
 - Adds pool status when asking for service status.
 - Changed to start zfs-fuse at boot as default.
-- Changed to start zfs-fise right after installation.
+- Changed to start zfs-fuse right after installation.
 - Cleanup of /var/run/zfs and /var/lock/zfs after uninstall.
 
 * Sun Dec 24 2008 Uwe Kubosh <uwe at kubosch.no> - 0.5.0-5.20081221



From donv at fedoraproject.org  Thu Jan  8 23:02:40 2009
From: donv at fedoraproject.org (Uwe Kubosch)
Date: Thu,  8 Jan 2009 23:02:40 +0000 (UTC)
Subject: rpms/zfs-fuse/devel zfs-fuse.spec,1.10,1.11
Message-ID: <20090108230240.E1ABE7013F@cvs1.fedora.phx.redhat.com>

Author: donv

Update of /cvs/pkgs/rpms/zfs-fuse/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11458/devel

Modified Files:
	zfs-fuse.spec 
Log Message:
* Corrected spelling error in change log


Index: zfs-fuse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/zfs-fuse/devel/zfs-fuse.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- zfs-fuse.spec	25 Dec 2008 12:04:04 -0000	1.10
+++ zfs-fuse.spec	8 Jan 2009 23:02:10 -0000	1.11
@@ -95,7 +95,7 @@
 - Adds syncing of disks at shutdown.
 - Adds pool status when asking for service status.
 - Changed to start zfs-fuse at boot as default.
-- Changed to start zfs-fise right after installation.
+- Changed to start zfs-fuse right after installation.
 - Cleanup of /var/run/zfs and /var/lock/zfs after uninstall.
 
 * Sun Dec 24 2008 Uwe Kubosh <uwe at kubosch.no> - 0.5.0-5.20081221



From ltinkl at fedoraproject.org  Thu Jan  8 23:14:58 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Thu,  8 Jan 2009 23:14:58 +0000 (UTC)
Subject: rpms/kdeedu/F-10 kdeedu.spec, 1.135,
	1.136 kdeedu-4.1.3-cfitsio.patch, 1.1, NONE
Message-ID: <20090108231458.99564700FD@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kdeedu/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12838/F-10

Modified Files:
	kdeedu.spec 
Removed Files:
	kdeedu-4.1.3-cfitsio.patch 
Log Message:
drop upstream patch



Index: kdeedu.spec
===================================================================
RCS file: /cvs/extras/rpms/kdeedu/F-10/kdeedu.spec,v
retrieving revision 1.135
retrieving revision 1.136
diff -u -r1.135 -r1.136
--- kdeedu.spec	8 Jan 2009 22:53:26 -0000	1.135
+++ kdeedu.spec	8 Jan 2009 23:14:28 -0000	1.136
@@ -22,9 +22,6 @@
 Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdeedu-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-# fix cfitsio detection by using pkgconfig
-Patch0:  kdeedu-4.1.3-cfitsio.patch
-
 # http://bugzilla.redhat.com/371121
 Obsoletes: kalgebra < 1:0.7-7
 Provides:  kalgebra = 1:0.7-7
@@ -140,7 +137,6 @@
 
 %prep
 %setup -q -n kdeedu-%{version}
-%patch0 -p1 -b .cfitsio
 
 
 %build


--- kdeedu-4.1.3-cfitsio.patch DELETED ---



From ltinkl at fedoraproject.org  Thu Jan  8 23:14:58 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Thu,  8 Jan 2009 23:14:58 +0000 (UTC)
Subject: rpms/kdeedu/F-9 kdeedu.spec, 1.111, 1.112 kdeedu-4.0.4-cfitsio.patch,
	1.1, NONE
Message-ID: <20090108231458.BBFBC700FD@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kdeedu/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12838/F-9

Modified Files:
	kdeedu.spec 
Removed Files:
	kdeedu-4.0.4-cfitsio.patch 
Log Message:
drop upstream patch



Index: kdeedu.spec
===================================================================
RCS file: /cvs/extras/rpms/kdeedu/F-9/kdeedu.spec,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -r1.111 -r1.112
--- kdeedu.spec	8 Jan 2009 22:53:26 -0000	1.111
+++ kdeedu.spec	8 Jan 2009 23:14:28 -0000	1.112
@@ -22,9 +22,6 @@
 Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdeedu-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-# fix cfitsio detection by using pkgconfig
-Patch0:  kdeedu-4.0.4-cfitsio.patch
-
 # http://bugzilla.redhat.com/371121
 Obsoletes: kalgebra < 1:0.7-7
 Provides:  kalgebra = 1:0.7-7
@@ -140,7 +137,6 @@
 
 %prep
 %setup -q -n kdeedu-%{version}
-%patch0 -p1 -b .cfitsio
 
 
 %build


--- kdeedu-4.0.4-cfitsio.patch DELETED ---



From than at fedoraproject.org  Thu Jan  8 23:44:38 2009
From: than at fedoraproject.org (Than Ngo)
Date: Thu,  8 Jan 2009 23:44:38 +0000 (UTC)
Subject: rpms/kdebase/devel kdebase.spec,1.354,1.355
Message-ID: <20090108234439.31BDA700FD@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdebase/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16681

Modified Files:
	kdebase.spec 
Log Message:
fix rpm file list



Index: kdebase.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebase/devel/kdebase.spec,v
retrieving revision 1.354
retrieving revision 1.355
diff -u -r1.354 -r1.355
--- kdebase.spec	7 Jan 2009 15:19:45 -0000	1.354
+++ kdebase.spec	8 Jan 2009 23:44:07 -0000	1.355
@@ -281,7 +281,7 @@
 %{_kde4_docdir}/HTML/en/*
 %{_kde4_libdir}/kde4/*
 %exclude %{_kde4_libdir}/kde4/devel/
-
+%{_mandir}/man1/*
 %if "%{name}" == "kdebase"
 %{_kde4_datadir}/autostart/*
 %{_kde4_configdir}/*



From ltinkl at fedoraproject.org  Fri Jan  9 00:05:30 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Fri,  9 Jan 2009 00:05:30 +0000 (UTC)
Subject: rpms/kdegames/F-10 .cvsignore, 1.58, 1.59 kdegames.spec, 1.106,
	1.107 sources, 1.62, 1.63
Message-ID: <20090109000530.5F9D37013F@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kdegames/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19312/F-10

Modified Files:
	.cvsignore kdegames.spec sources 
Log Message:
KDE 4.1.4



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdegames/F-10/.cvsignore,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- .cvsignore	27 Sep 2008 02:17:37 -0000	1.58
+++ .cvsignore	9 Jan 2009 00:04:59 -0000	1.59
@@ -1 +1 @@
-kdegames-4.1.2.tar.bz2
+kdegames-4.1.4.tar.bz2


Index: kdegames.spec
===================================================================
RCS file: /cvs/extras/rpms/kdegames/F-10/kdegames.spec,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -r1.106 -r1.107
--- kdegames.spec	11 Nov 2008 23:52:00 -0000	1.106
+++ kdegames.spec	9 Jan 2009 00:04:59 -0000	1.107
@@ -2,9 +2,9 @@
 %{!?_ggz_datadir:%define _ggz_datadir %(ggz-config --datadir >& /dev/null ||:)}
 
 Name:    kdegames
-Summary: K Desktop Environment 4 - Games 
+Summary: K Desktop Environment 4 - Games
 Epoch:   6
-Version: 4.1.3
+Version: 4.1.4
 Release: 1%{?dist}
 
 License: GPLv2
@@ -175,6 +175,9 @@
 
 
 %changelog
+* Fri Jan  9 2009 Luk???? Tinkl <ltinkl at redhat.com> 4.1.4-1
+- KDE 4.1.4
+
 * Wed Nov 12 2008 Than Ngo <than at redhat.com> 4.1.3-1
 - 4.1.3
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdegames/F-10/sources,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- sources	11 Nov 2008 23:52:01 -0000	1.62
+++ sources	9 Jan 2009 00:04:59 -0000	1.63
@@ -1 +1 @@
-d6b2d87808696bf0a7364cca86f360bb  kdegames-4.1.3.tar.bz2
+b18b4b89c83ea20a76bab5fac03bcc0b  kdegames-4.1.4.tar.bz2



From ltinkl at fedoraproject.org  Fri Jan  9 00:05:30 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Fri,  9 Jan 2009 00:05:30 +0000 (UTC)
Subject: rpms/kdegames/F-9 .cvsignore, 1.53, 1.54 kdegames.spec, 1.96,
	1.97 sources, 1.57, 1.58
Message-ID: <20090109000530.8326870141@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kdegames/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19312/F-9

Modified Files:
	.cvsignore kdegames.spec sources 
Log Message:
KDE 4.1.4



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdegames/F-9/.cvsignore,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- .cvsignore	5 Nov 2008 18:35:10 -0000	1.53
+++ .cvsignore	9 Jan 2009 00:05:00 -0000	1.54
@@ -1 +1 @@
-kdegames-4.1.3.tar.bz2
+kdegames-4.1.4.tar.bz2


Index: kdegames.spec
===================================================================
RCS file: /cvs/extras/rpms/kdegames/F-9/kdegames.spec,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -r1.96 -r1.97
--- kdegames.spec	5 Nov 2008 18:35:10 -0000	1.96
+++ kdegames.spec	9 Jan 2009 00:05:00 -0000	1.97
@@ -2,9 +2,9 @@
 %{!?_ggz_datadir:%define _ggz_datadir %(ggz-config --datadir >& /dev/null ||:)}
 
 Name:    kdegames
-Summary: K Desktop Environment 4 - Games 
+Summary: K Desktop Environment 4 - Games
 Epoch:   6
-Version: 4.1.3
+Version: 4.1.4
 Release: 1%{?dist}
 
 License: GPLv2
@@ -175,6 +175,9 @@
 
 
 %changelog
+* Fri Jan  9 2009 Luk???? Tinkl <ltinkl at redhat.com> 4.1.4-1
+- KDE 4.1.4
+
 * Wed Nov  5 2008 Luk???? Tinkl <ltinkl at redhat.com> 4.1.3-1
 - KDE 4.1.3
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdegames/F-9/sources,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- sources	5 Nov 2008 18:35:10 -0000	1.57
+++ sources	9 Jan 2009 00:05:00 -0000	1.58
@@ -1 +1 @@
-d6b2d87808696bf0a7364cca86f360bb  kdegames-4.1.3.tar.bz2
+b18b4b89c83ea20a76bab5fac03bcc0b  kdegames-4.1.4.tar.bz2



From cchance at fedoraproject.org  Fri Jan  9 00:06:10 2009
From: cchance at fedoraproject.org (Caius Chance)
Date: Fri,  9 Jan 2009 00:06:10 +0000 (UTC)
Subject: rpms/baekmuk-ttf-fonts/devel baekmuk-ttf-fonts.spec,1.5,1.6
Message-ID: <20090109000610.613A47013F@cvs1.fedora.phx.redhat.com>

Author: cchance

Update of /cvs/pkgs/rpms/baekmuk-ttf-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19293

Modified Files:
	baekmuk-ttf-fonts.spec 
Log Message:
revolves: rhbz#477332 (convert to new font packaging guidelines)



Index: baekmuk-ttf-fonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/baekmuk-ttf-fonts/devel/baekmuk-ttf-fonts.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- baekmuk-ttf-fonts.spec	30 Jun 2008 06:11:03 -0000	1.5
+++ baekmuk-ttf-fonts.spec	9 Jan 2009 00:05:40 -0000	1.6
@@ -1,4 +1,8 @@
-%define fontname   baekmuk-ttf
+%define fontname    baekmuk-ttf
+%define fontconf    <65>-%{fontname}
+%define archivename %{name}-%{version}
+%define common_desc \
+This package provides the free Korean TrueType fonts.
 
 %define fontdir      %{_datadir}/fonts/%{fontname}
 %define cidmapdir      %{_datadir}/ghostscript/conf.d
@@ -6,7 +10,7 @@
 
 Name:           %{fontname}-fonts
 Version:        2.2
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        Free Korean TrueType fonts
 
 Group:          User Interface/X
@@ -15,21 +19,26 @@
 Source0:        http://kldp.net/frs/download.php/1429/%{fontname}-%{version}.tar.gz
 Source1:        FAPIcidfmap.ko
 Source2:        cidfmap.ko
+
 Obsoletes:      fonts-korean
+
+BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildArch:      noarch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:  xorg-x11-font-utils, ttmkfdir >= 3.0.6
+BuildRequires:  fontpackages-devel, xorg-x11-font-utils, ttmkfdir >= 3.0.6
 
 %description
-This package provides the free Korean TrueType fonts.
+%common_desc
 
 %package common
 Summary:        Common files for Korean Baekmuk TrueType fonts
 License:        Baekmuk
 Group:          User Interface/X
+Requires:       fontpackages-filesystem
 Conflicts:      fonts-korean < 2.2-5
 
 %description common
+%common_desc
+
 This package contains some common files for Baekmuk Korean TrueType fonts.
 
 %define mk_pkg()\
@@ -38,9 +47,11 @@
 License:        Baekmuk\
 Group:          User Interface/X\
 Obsoletes:      ttfonts-ko < 1.0.11-33 fonts-korean < 2.2-6\
-Requires:       %{name}-common\
+Requires:       fontpackages-filesystem, %{name}-common\
 \
 %description %1\
+%common_desc\
+\
 This package contains the Korean TrueType font %2 typeface.\
 \
 %post %1\
@@ -75,35 +86,38 @@
 %{nil}
 
 %install
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 # for catalogue
-install -d $RPM_BUILD_ROOT%{catalogue}
+install -d %{buildroot}%{catalogue}
 
 for i in batang dotum gulim hline; do
-  install -d $RPM_BUILD_ROOT%{fontdir}-$i
-  install -p -m 0644 ttf/$i.ttf $RPM_BUILD_ROOT%{fontdir}-$i
-  ln -sf ../../..%{fontdir}-$i $RPM_BUILD_ROOT%{catalogue}/%{name}-$i
-  %{_bindir}/ttmkfdir -d $RPM_BUILD_ROOT%{fontdir}-$i -o $RPM_BUILD_ROOT%{fontdir}-$i/fonts.scale
-  mkfontdir $RPM_BUILD_ROOT%{fontdir}-$i
+  install -d %{buildroot}%{fontdir}-$i
+  install -p -m 0644 ttf/$i.ttf %{buildroot}%{fontdir}-$i
+  ln -sf ../../..%{fontdir}-$i %{buildroot}%{catalogue}/%{name}-$i
+  %{_bindir}/ttmkfdir -d %{buildroot}%{fontdir}-$i -o %{buildroot}%{fontdir}-$i/fonts.scale
+  mkfontdir %{buildroot}%{fontdir}-$i
 done
 
 # for ghostscript
-install -d $RPM_BUILD_ROOT%{cidmapdir}
-install -p -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{cidmapdir}/
-install -p -m 0644 %{SOURCE2} $RPM_BUILD_ROOT%{cidmapdir}/
+install -d %{buildroot}%{cidmapdir}
+install -p -m 0644 %{SOURCE1} %{buildroot}%{cidmapdir}/
+install -p -m 0644 %{SOURCE2} %{buildroot}%{cidmapdir}/
 
 # convert Korean copyright file to utf8
 iconv -f EUC-KR -t UTF-8 COPYRIGHT.ks > COPYRIGHT.ko
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 %files common
 %doc COPYRIGHT COPYRIGHT.ko README
 %{cidmapdir}/
 
 %changelog
+* Fri Jan 09 2009 Caius Chance <cchance at redhat.com> - 2.2-10.fc11
+- Resolves: rhbz#477332 (Convert to new font packaging guidelines.)
+
 * Mon Jun 30 2008 Caius Chance <cchance at redhat.com> - 2.2-9.fc10
 - Refine obsoletes tag version-release specific.
 



From nbecker at fedoraproject.org  Fri Jan  9 00:16:54 2009
From: nbecker at fedoraproject.org (Neal Becker)
Date: Fri,  9 Jan 2009 00:16:54 +0000 (UTC)
Subject: rpms/unuran/devel .cvsignore, 1.8, 1.9 sources, 1.8, 1.9 unuran.spec,
	1.10, 1.11
Message-ID: <20090109001654.A39937013F@cvs1.fedora.phx.redhat.com>

Author: nbecker

Update of /cvs/pkgs/rpms/unuran/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20473

Modified Files:
	.cvsignore sources unuran.spec 
Log Message:
Update to 1.3.devel



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/unuran/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	18 Dec 2008 14:30:28 -0000	1.8
+++ .cvsignore	9 Jan 2009 00:16:24 -0000	1.9
@@ -1 +1 @@
-unuran-1.3.0.tar.gz
+unuran-1.3.devel.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/unuran/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	18 Dec 2008 14:30:28 -0000	1.8
+++ sources	9 Jan 2009 00:16:24 -0000	1.9
@@ -1 +1 @@
-f0b3e6815be85be819164201a1c31b3b  unuran-1.3.0.tar.gz
+93220119ce0b812218d65bc9d0ffd2d9  unuran-1.3.devel.tar.gz


Index: unuran.spec
===================================================================
RCS file: /cvs/pkgs/rpms/unuran/devel/unuran.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- unuran.spec	18 Dec 2008 14:30:28 -0000	1.10
+++ unuran.spec	9 Jan 2009 00:16:24 -0000	1.11
@@ -1,12 +1,15 @@
 Name:		unuran
-Version:	1.3.0
-Release: 	1%{?dist}
+Version:	1.3
+%define inc devel
+%define realname %{name}-%{version}.%{inc}
+Release: 	1.%{inc}%{?dist}
 Summary:	Universal Non-Uniform Random number generator
 
 Group:		System Environment/Libraries
 License:	GPLv2+
 URL:		http://statistik.wu-wien.ac.at/unuran
-Source0:	http://statistik.wu-wien.ac.at/unuran/%{name}-%{version}.tar.gz
+#Source0:	http://statistik.wu-wien.ac.at/unuran/%{name}-%{version}.tar.gz
+Source0:	http://statistik.wu-wien.ac.at/unuran/%{realname}.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires(post): /sbin/ldconfig, /sbin/install-info
@@ -36,7 +39,7 @@
 Header and object files for unuran, and pdf docs.
 
 %prep
-%setup -q -n %{name}-%{version}
+%setup -q -n %{name}-%{version}.%{inc}
 
 
 %build
@@ -96,6 +99,9 @@
 SEED=2742664 make check
 
 %changelog
+* Thu Jan  8 2009 Neal Becker <ndbecker2 at gmail.com> - 1.3-1.devel%{?dist}
+- Update to 1.3.devel
+
 * Thu Dec 18 2008 Neal Becker <ndbecker2 at gmail.com> - 1.3.0-1
 - Update to 1.3.0
 



From ltinkl at fedoraproject.org  Fri Jan  9 00:41:59 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Fri,  9 Jan 2009 00:41:59 +0000 (UTC)
Subject: rpms/kdegraphics/F-10 .cvsignore, 1.51,
	1.52 kdegraphics-4.1.3-libkdcraw-0.4.0.patch, 1.1,
	1.2 kdegraphics-4.1.3-libkexiv2-0.5.0.patch, 1.1,
	1.2 kdegraphics-4.1.3-libkipi-0.3.0.patch, 1.1,
	1.2 kdegraphics.spec, 1.181, 1.182 sources, 1.59, 1.60
Message-ID: <20090109004159.F29427011C@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kdegraphics/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22792/F-10

Modified Files:
	.cvsignore kdegraphics-4.1.3-libkdcraw-0.4.0.patch 
	kdegraphics-4.1.3-libkexiv2-0.5.0.patch 
	kdegraphics-4.1.3-libkipi-0.3.0.patch kdegraphics.spec sources 
Log Message:
KDE 4.1.4



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdegraphics/F-10/.cvsignore,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- .cvsignore	26 Sep 2008 23:48:45 -0000	1.51
+++ .cvsignore	9 Jan 2009 00:41:29 -0000	1.52
@@ -1 +1 @@
-kdegraphics-4.1.2.tar.bz2
+kdegraphics-4.1.4.tar.bz2

kdegraphics-4.1.3-libkdcraw-0.4.0.patch:

Index: kdegraphics-4.1.3-libkdcraw-0.4.0.patch
===================================================================
RCS file: /cvs/extras/rpms/kdegraphics/F-10/kdegraphics-4.1.3-libkdcraw-0.4.0.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kdegraphics-4.1.3-libkdcraw-0.4.0.patch	25 Nov 2008 18:10:10 -0000	1.1
+++ kdegraphics-4.1.3-libkdcraw-0.4.0.patch	9 Jan 2009 00:41:29 -0000	1.2
@@ -1,7 +1,7 @@
 Index: test/raw2png.cpp
 ===================================================================
---- test/raw2png.cpp	(.../tags/KDE/4.1.3/kdegraphics/libs/libkdcraw)	(revision 0)
-+++ test/raw2png.cpp	(.../trunk/KDE/kdegraphics/libs/libkdcraw)	(revision 888947)
+--- test/raw2png.cpp	(.../tags/KDE/4.1.4/kdegraphics/libs/libkdcraw)	(revision 0)
++++ test/raw2png.cpp	(.../trunk/KDE/kdegraphics/libs/libkdcraw)	(revision 907970)
 @@ -0,0 +1,123 @@
 +/* ============================================================
 + *
@@ -134,8 +134,8 @@
 
 Index: test/CMakeLists.txt
 ===================================================================
---- test/CMakeLists.txt	(.../tags/KDE/4.1.3/kdegraphics/libs/libkdcraw)	(revision 0)
-+++ test/CMakeLists.txt	(.../trunk/KDE/kdegraphics/libs/libkdcraw)	(revision 888947)
+--- test/CMakeLists.txt	(.../tags/KDE/4.1.4/kdegraphics/libs/libkdcraw)	(revision 0)
++++ test/CMakeLists.txt	(.../trunk/KDE/kdegraphics/libs/libkdcraw)	(revision 907970)
 @@ -0,0 +1,44 @@
 +KDE4_NO_ENABLE_FINAL(kdcraw)
 +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../libkdcraw)
@@ -189,8 +189,8 @@
 
 Index: libraw/libraw/libraw_alloc.h
 ===================================================================
---- libraw/libraw/libraw_alloc.h	(.../tags/KDE/4.1.3/kdegraphics/libs/libkdcraw)	(revision 0)
-+++ libraw/libraw/libraw_alloc.h	(.../trunk/KDE/kdegraphics/libs/libkdcraw)	(revision 888947)
+--- libraw/libraw/libraw_alloc.h	(.../tags/KDE/4.1.4/kdegraphics/libs/libkdcraw)	(revision 0)
++++ libraw/libraw/libraw_alloc.h	(.../trunk/KDE/kdegraphics/libs/libkdcraw)	(revision 907970)
 @@ -0,0 +1,98 @@
 +/* -*- C++ -*-
 + * File: libraw_alloc.h
@@ -298,9 +298,9 @@
 
 Index: libraw/libraw/libraw_internal.h
 ===================================================================
---- libraw/libraw/libraw_internal.h	(.../tags/KDE/4.1.3/kdegraphics/libs/libkdcraw)	(revision 0)
-+++ libraw/libraw/libraw_internal.h	(.../trunk/KDE/kdegraphics/libs/libkdcraw)	(revision 888947)
-@@ -0,0 +1,233 @@
+--- libraw/libraw/libraw_internal.h	(.../tags/KDE/4.1.4/kdegraphics/libs/libkdcraw)	(revision 0)
++++ libraw/libraw/libraw_internal.h	(.../trunk/KDE/kdegraphics/libs/libkdcraw)	(revision 907970)
+@@ -0,0 +1,235 @@
 +/* -*- C++ -*-
 + * File: libraw_internal.h
 + * Copyright 2008 Alex Tutubalin <lexa at lexa.ru>
@@ -360,10 +360,6 @@
 +         int vbits;
 +
 +    }ph1_bits;
-+    struct
-+    {
-+        uchar buf[0x4000], vbits, padding[3];
-+    }pana_bits;
 +    int make_decoder_leaf;
 +    struct
 +    {
@@ -376,6 +372,12 @@
 +    }sony_decrypt;
 +    unsigned foveon_decoder_huff[1024];
 +    uchar jpeg_buffer[4096];
++    struct
++    {
++        uchar buf[0x4000];
++        int vbits, padding;
++    }pana_bits;
++
 +    // init - should use in constructor/recycle
 +    void init() 
 +        { 
@@ -477,8 +479,8 @@
 +
 +
 +struct jhead {
-+  int bits, high, wide, clrs, sraw, psv, restart, vpred[4];
-+  struct decode *huff[4];
++  int bits, high, wide, clrs, sraw, psv, restart, vpred[6];
++  struct decode *huff[6];
 +  ushort *row;
 +};
 +struct tiff_tag {
@@ -542,8 +544,8 @@
 
 Index: libraw/libraw/libraw.h
 ===================================================================
---- libraw/libraw/libraw.h	(.../tags/KDE/4.1.3/kdegraphics/libs/libkdcraw)	(revision 0)
-+++ libraw/libraw/libraw.h	(.../trunk/KDE/kdegraphics/libs/libkdcraw)	(revision 888947)
+--- libraw/libraw/libraw.h	(.../tags/KDE/4.1.4/kdegraphics/libs/libkdcraw)	(revision 0)
++++ libraw/libraw/libraw.h	(.../trunk/KDE/kdegraphics/libs/libkdcraw)	(revision 907970)
 @@ -0,0 +1,328 @@
 +/* -*- C++ -*-
 + * File: libraw.h
@@ -881,8 +883,8 @@
 
 Index: libraw/libraw/libraw_types.h
 ===================================================================
---- libraw/libraw/libraw_types.h	(.../tags/KDE/4.1.3/kdegraphics/libs/libkdcraw)	(revision 0)
-+++ libraw/libraw/libraw_types.h	(.../trunk/KDE/kdegraphics/libs/libkdcraw)	(revision 888947)
+--- libraw/libraw/libraw_types.h	(.../tags/KDE/4.1.4/kdegraphics/libs/libkdcraw)	(revision 0)
++++ libraw/libraw/libraw_types.h	(.../trunk/KDE/kdegraphics/libs/libkdcraw)	(revision 907970)
 @@ -0,0 +1,272 @@
 +/* -*- C++ -*-
 + * File: libraw_types.h
@@ -1164,8 +1166,8 @@
 
 Index: libraw/libraw/libraw_version.h
 ===================================================================
---- libraw/libraw/libraw_version.h	(.../tags/KDE/4.1.3/kdegraphics/libs/libkdcraw)	(revision 0)
-+++ libraw/libraw/libraw_version.h	(.../trunk/KDE/kdegraphics/libs/libkdcraw)	(revision 888947)
+--- libraw/libraw/libraw_version.h	(.../tags/KDE/4.1.4/kdegraphics/libs/libkdcraw)	(revision 0)
++++ libraw/libraw/libraw_version.h	(.../trunk/KDE/kdegraphics/libs/libkdcraw)	(revision 907970)
 @@ -0,0 +1,47 @@
 +/* -*- C++ -*-
 + * File: version.h
@@ -1195,7 +1197,7 @@
 +
 +#define LIBRAW_MAJOR_VERSION  0
 +#define LIBRAW_MINOR_VERSION  6
-+#define LIBRAW_PATCH_VERSION  1
++#define LIBRAW_PATCH_VERSION  5
 +#define LIBRAW_VERSION_TAIL   Release
 +
 +#define _LIBRAW_VERSION_MAKE(a,b,c,d) #a"."#b"."#c"-"#d
@@ -1222,8 +1224,8 @@
 
 Index: libraw/libraw/libraw_const.h
 ===================================================================
---- libraw/libraw/libraw_const.h	(.../tags/KDE/4.1.3/kdegraphics/libs/libkdcraw)	(revision 0)
-+++ libraw/libraw/libraw_const.h	(.../trunk/KDE/kdegraphics/libs/libkdcraw)	(revision 888947)
+--- libraw/libraw/libraw_const.h	(.../tags/KDE/4.1.4/kdegraphics/libs/libkdcraw)	(revision 0)
++++ libraw/libraw/libraw_const.h	(.../trunk/KDE/kdegraphics/libs/libkdcraw)	(revision 907970)
 @@ -0,0 +1,147 @@
 +/* -*- C++ -*-
 + * File: libraw_const.h
@@ -1380,8 +1382,8 @@
 
 Index: libraw/samples/mem_image.cpp
 ===================================================================
---- libraw/samples/mem_image.cpp	(.../tags/KDE/4.1.3/kdegraphics/libs/libkdcraw)	(revision 0)
-+++ libraw/samples/mem_image.cpp	(.../trunk/KDE/kdegraphics/libs/libkdcraw)	(revision 888947)
+--- libraw/samples/mem_image.cpp	(.../tags/KDE/4.1.4/kdegraphics/libs/libkdcraw)	(revision 0)
++++ libraw/samples/mem_image.cpp	(.../trunk/KDE/kdegraphics/libs/libkdcraw)	(revision 907970)
 @@ -0,0 +1,198 @@
 +/* -*- C++ -*-
 + * File: mem_image.cpp
@@ -1589,8 +1591,8 @@
 
 Index: libraw/samples/dcraw_emu.cpp
 ===================================================================
---- libraw/samples/dcraw_emu.cpp	(.../tags/KDE/4.1.3/kdegraphics/libs/libkdcraw)	(revision 0)
-+++ libraw/samples/dcraw_emu.cpp	(.../trunk/KDE/kdegraphics/libs/libkdcraw)	(revision 888947)
+--- libraw/samples/dcraw_emu.cpp	(.../tags/KDE/4.1.4/kdegraphics/libs/libkdcraw)	(revision 0)
++++ libraw/samples/dcraw_emu.cpp	(.../trunk/KDE/kdegraphics/libs/libkdcraw)	(revision 907970)
 @@ -0,0 +1,216 @@
 +/* -*- C++ -*-
 + * File: dcraw_emu.cpp
@@ -1816,8 +1818,8 @@
 
 Index: libraw/samples/simple_dcraw.cpp
 ===================================================================
---- libraw/samples/simple_dcraw.cpp	(.../tags/KDE/4.1.3/kdegraphics/libs/libkdcraw)	(revision 0)
-+++ libraw/samples/simple_dcraw.cpp	(.../trunk/KDE/kdegraphics/libs/libkdcraw)	(revision 888947)
+--- libraw/samples/simple_dcraw.cpp	(.../tags/KDE/4.1.4/kdegraphics/libs/libkdcraw)	(revision 0)
++++ libraw/samples/simple_dcraw.cpp	(.../trunk/KDE/kdegraphics/libs/libkdcraw)	(revision 907970)
 @@ -0,0 +1,157 @@
 +/* -*- C++ -*-
 + * File: simple_dcraw.cpp
@@ -1984,8 +1986,8 @@
 
 Index: libraw/samples/dcraw_half.cpp
 ===================================================================
---- libraw/samples/dcraw_half.cpp	(.../tags/KDE/4.1.3/kdegraphics/libs/libkdcraw)	(revision 0)
-+++ libraw/samples/dcraw_half.cpp	(.../trunk/KDE/kdegraphics/libs/libkdcraw)	(revision 888947)
+--- libraw/samples/dcraw_half.cpp	(.../tags/KDE/4.1.4/kdegraphics/libs/libkdcraw)	(revision 0)
++++ libraw/samples/dcraw_half.cpp	(.../trunk/KDE/kdegraphics/libs/libkdcraw)	(revision 907970)
 @@ -0,0 +1,83 @@
 +/* -*- C++ -*-
 + * File: simple_dcraw_c.c
@@ -2079,8 +2081,8 @@
 
 Index: libraw/samples/half_mt.cpp
 ===================================================================
---- libraw/samples/half_mt.cpp	(.../tags/KDE/4.1.3/kdegraphics/libs/libkdcraw)	(revision 0)
-+++ libraw/samples/half_mt.cpp	(.../trunk/KDE/kdegraphics/libs/libkdcraw)	(revision 888947)
+--- libraw/samples/half_mt.cpp	(.../tags/KDE/4.1.4/kdegraphics/libs/libkdcraw)	(revision 0)
++++ libraw/samples/half_mt.cpp	(.../trunk/KDE/kdegraphics/libs/libkdcraw)	(revision 907970)
 @@ -0,0 +1,178 @@
 +/* -*- C++ -*-
 + * File: simple_dcraw_c.c
@@ -2269,8 +2271,8 @@
 
 Index: libraw/samples/identify.cpp
 ===================================================================
---- libraw/samples/identify.cpp	(.../tags/KDE/4.1.3/kdegraphics/libs/libkdcraw)	(revision 0)
-+++ libraw/samples/identify.cpp	(.../trunk/KDE/kdegraphics/libs/libkdcraw)	(revision 888947)
+--- libraw/samples/identify.cpp	(.../tags/KDE/4.1.4/kdegraphics/libs/libkdcraw)	(revision 0)
++++ libraw/samples/identify.cpp	(.../trunk/KDE/kdegraphics/libs/libkdcraw)	(revision 907970)
 @@ -0,0 +1,126 @@
 +/* -*- C++ -*-
 + * File: identify.cpp
@@ -2406,8 +2408,8 @@
 
 Index: libraw/samples/half_mt_win32.cpp
 ===================================================================
---- libraw/samples/half_mt_win32.cpp	(.../tags/KDE/4.1.3/kdegraphics/libs/libkdcraw)	(revision 0)
-+++ libraw/samples/half_mt_win32.cpp	(.../trunk/KDE/kdegraphics/libs/libkdcraw)	(revision 888947)
+--- libraw/samples/half_mt_win32.cpp	(.../tags/KDE/4.1.4/kdegraphics/libs/libkdcraw)	(revision 0)
++++ libraw/samples/half_mt_win32.cpp	(.../trunk/KDE/kdegraphics/libs/libkdcraw)	(revision 907970)
 @@ -0,0 +1,211 @@
 +/* -*- C++ -*-
 + * File: simple_dcraw_c.c
@@ -2620,11 +2622,16 @@
 +           
 +    return 0;
 +}
+
+Property changes on: libraw/samples/half_mt_win32.cpp
+___________________________________________________________________
+Added: svn:mergeinfo
+
 Index: libraw/src/libraw_cxx.cpp
 ===================================================================
---- libraw/src/libraw_cxx.cpp	(.../tags/KDE/4.1.3/kdegraphics/libs/libkdcraw)	(revision 0)
-+++ libraw/src/libraw_cxx.cpp	(.../trunk/KDE/kdegraphics/libs/libkdcraw)	(revision 888947)
-@@ -0,0 +1,1372 @@
+--- libraw/src/libraw_cxx.cpp	(.../tags/KDE/4.1.4/kdegraphics/libs/libkdcraw)	(revision 0)
++++ libraw/src/libraw_cxx.cpp	(.../trunk/KDE/kdegraphics/libs/libkdcraw)	(revision 907970)
+@@ -0,0 +1,1381 @@
 +/* -*- C++ -*-
 + * File: libraw_cxx.cpp
 + * Copyright 2008 Alex Tutubalin <lexa at lexa.ru>
@@ -3449,7 +3456,10 @@
 +        return errno;
 +
 +    if(!T.thumb)
-+        return LIBRAW_OUT_OF_ORDER_CALL;
++	{
++		fclose(tfp);
++        	return LIBRAW_OUT_OF_ORDER_CALL;
++	}
 +
 +    try {
 +        switch (T.tformat)
@@ -3658,6 +3668,7 @@
 +"Canon PowerShot G6",
 +"Canon PowerShot G7 (CHDK hack)",
 +"Canon PowerShot G9",
++"Canon PowerShot G10",
 +"Canon PowerShot S2 IS (CHDK hack)",
 +"Canon PowerShot S3 IS (CHDK hack)",
 +"Canon PowerShot S5 IS (CHDK hack)",
@@ -3672,6 +3683,7 @@
 +"Canon EOS D30",
 +"Canon EOS D60",
 +"Canon EOS 5D",
++"Canon EOS 5D Mark II",
 +"Canon EOS 10D",
 +"Canon EOS 20D",
 +"Canon EOS 30D",
@@ -3772,6 +3784,7 @@
 +"Kodak KAI-0340",
 +"Konica KD-400Z",
 +"Konica KD-510Z",
++"Leaf AFi 7",
 +"Leaf Aptus 17",
 +"Leaf Aptus 22",
 +"Leaf Aptus 54S",
@@ -3791,6 +3804,7 @@
 +"Leica Digilux 3",
 +"Leica D-LUX2",
 +"Leica D-LUX3",
++"Leica D-LUX4",
 +"Leica V-LUX1",
 +"Logitech Fotoman Pixtura",
 +"Mamiya ZD",
@@ -3884,6 +3898,8 @@
 +"Panasonic DMC-FZ28",
 +"Panasonic DMC-FZ30",
 +"Panasonic DMC-FZ50",
++"Panasonic DMC-FX150",
++"Panasonic DMC-G1",
 +"Panasonic DMC-L1",
 +"Panasonic DMC-L10",
 +"Panasonic DMC-LC1",
@@ -4005,8 +4021,8 @@
 
 Index: libraw/src/libraw_c_api.cpp
 ===================================================================
---- libraw/src/libraw_c_api.cpp	(.../tags/KDE/4.1.3/kdegraphics/libs/libkdcraw)	(revision 0)
-+++ libraw/src/libraw_c_api.cpp	(.../trunk/KDE/kdegraphics/libs/libkdcraw)	(revision 888947)
+--- libraw/src/libraw_c_api.cpp	(.../tags/KDE/4.1.4/kdegraphics/libs/libkdcraw)	(revision 0)
++++ libraw/src/libraw_c_api.cpp	(.../trunk/KDE/kdegraphics/libs/libkdcraw)	(revision 907970)
 @@ -0,0 +1,117 @@
 +/* -*- C++ -*-
 + * File: libraw_c_api.cpp
@@ -4133,8 +4149,8 @@
 
 Index: libraw/internal/libraw_internal_funcs.h
 ===================================================================
---- libraw/internal/libraw_internal_funcs.h	(.../tags/KDE/4.1.3/kdegraphics/libs/libkdcraw)	(revision 0)
-+++ libraw/internal/libraw_internal_funcs.h	(.../trunk/KDE/kdegraphics/libs/libkdcraw)	(revision 888947)
+--- libraw/internal/libraw_internal_funcs.h	(.../tags/KDE/4.1.4/kdegraphics/libs/libkdcraw)	(revision 0)
++++ libraw/internal/libraw_internal_funcs.h	(.../trunk/KDE/kdegraphics/libs/libkdcraw)	(revision 907970)
 @@ -0,0 +1,200 @@
 +/* -*- C++ -*-
 + * File: libraw_internal_funcs.h
@@ -4344,12 +4360,12 @@
 
 Index: libraw/internal/defines.h
 ===================================================================
---- libraw/internal/defines.h	(.../tags/KDE/4.1.3/kdegraphics/libs/libkdcraw)	(revision 0)
-+++ libraw/internal/defines.h	(.../trunk/KDE/kdegraphics/libs/libkdcraw)	(revision 888947)
+--- libraw/internal/defines.h	(.../tags/KDE/4.1.4/kdegraphics/libs/libkdcraw)	(revision 0)
++++ libraw/internal/defines.h	(.../trunk/KDE/kdegraphics/libs/libkdcraw)	(revision 907970)
 @@ -0,0 +1,134 @@
 +/* 
 +   GENERATED FILE, DO NOT EDIT
-+   Generated from dcraw/dcraw.c at Thu Sep 25 11:44:51 2008
++   Generated from dcraw/dcraw.c at Sun Jan  4 16:41:18 2009
 +   Look into original file (probably http://cybercom.net/~dcoffin/dcraw/dcraw.c)
 +   for copyright information.
 +*/
@@ -4357,7 +4373,7 @@
 +#line 27 "dcraw/dcraw.c"
 +#define NO_JPEG
 +#line 32 "dcraw/dcraw.c"
-+#define VERSION "8.88"
++#define VERSION "8.89"
 +
 +#define _GNU_SOURCE
 +#define _USE_MATH_DEFINES
@@ -4489,12 +4505,12 @@
 
 Index: libraw/internal/dcraw_common.cpp
 ===================================================================
---- libraw/internal/dcraw_common.cpp	(.../tags/KDE/4.1.3/kdegraphics/libs/libkdcraw)	(revision 0)
-+++ libraw/internal/dcraw_common.cpp	(.../trunk/KDE/kdegraphics/libs/libkdcraw)	(revision 888947)
-@@ -0,0 +1,7644 @@
+--- libraw/internal/dcraw_common.cpp	(.../tags/KDE/4.1.4/kdegraphics/libs/libkdcraw)	(revision 0)
++++ libraw/internal/dcraw_common.cpp	(.../trunk/KDE/kdegraphics/libs/libkdcraw)	(revision 907970)
+@@ -0,0 +1,7727 @@
 +/* 
 +   GENERATED FILE, DO NOT EDIT
-+   Generated from dcraw/dcraw.c at Thu Sep 25 11:44:51 2008
++   Generated from dcraw/dcraw.c at Sun Jan  4 16:41:18 2009
 +   Look into original file (probably http://cybercom.net/~dcoffin/dcraw/dcraw.c)
 +   for copyright information.
 +*/
@@ -4866,7 +4882,7 @@
 +}
 +
 +/*
-+   Construct a decode tree according the specification in *source.
++   Construct a decode tree according to the specification in *source.
 +   The first 16 bytes specify how many codes should be 1-bit, 2-bit
 +   3-bit, etc.  Bytes after that are the leaf values.
 +
@@ -5088,13 +5104,12 @@
 +#line 881 "dcraw/dcraw.c"
 +int CLASS ljpeg_start (struct jhead *jh, int info_only)
 +{
-+  int i, tag, len;
++  int c, tag, len;
 +  uchar data[0x10000], *dp;
 +
 +  init_decoder();
 +  memset (jh, 0, sizeof *jh);
-+  for (i=0; i < 4; i++)
-+    jh->huff[i] = free_decode;
++  FORC(6) jh->huff[c] = free_decode;
 +  jh->restart = INT_MAX;
 +  fread (data, 2, 1, ifp);
 +  if (data[1] != 0xd8) return 0;
@@ -5106,7 +5121,7 @@
 +    fread (data, 1, len, ifp);
 +    switch (tag) {
 +      case 0xffc3:
-+	jh->sraw = data[7] == 0x21;
++	jh->sraw = ((data[7] >> 4) * (data[7] & 15) - 1) & 3;
 +      case 0xffc0:
 +	jh->bits = data[0];
 +	jh->high = data[1] << 8 | data[2];
@@ -5123,6 +5138,7 @@
 +	break;
 +      case 0xffda:
 +	jh->psv = data[1+data[0]*2];
++	jh->bits -= data[3+data[0]*2] & 15;
 +	break;
 +      case 0xffdd:
 +	jh->restart = data[0] << 8 | data[1];
@@ -5130,8 +5146,8 @@
 +  } while (tag != 0xffda);
 +  if (info_only) return 1;
 +  if (jh->sraw) {
-+    jh->huff[3] = jh->huff[2] = jh->huff[1];
-+    jh->huff[1] = jh->huff[0];
++    FORC(4)        jh->huff[2+c] = jh->huff[1];
++    FORC(jh->sraw) jh->huff[1+c] = jh->huff[0];
 +  }
 +  jh->row = (ushort *) calloc (jh->wide*jh->clrs, 4);
 +  merror (jh->row, "ljpeg_start()");
@@ -5155,11 +5171,11 @@
 +
 +ushort * CLASS ljpeg_row (int jrow, struct jhead *jh)
 +{
-+  int col, c, diff, pred;
++  int col, c, diff, pred, spred=0;
 +  ushort mark=0, *row[3];
 +
 +  if (jrow * jh->wide % jh->restart == 0) {
-+    FORC4 jh->vpred[c] = 1 << (jh->bits-1);
++    FORC(6) jh->vpred[c] = 1 << (jh->bits-1);
 +    if (jrow)
 +      do mark = (mark << 8) + (c = fgetc(ifp));
 +      while (c != EOF && mark >> 4 != 0xffd);
@@ -5169,8 +5185,8 @@
 +  for (col=0; col < jh->wide; col++)
 +    FORC(jh->clrs) {
 +      diff = ljpeg_diff (jh->huff[c]);
-+      if (jh->sraw && c < 2 && (col | c))
-+		    pred = row[0][(c << 1)-3];
++      if (jh->sraw && c <= jh->sraw && (col | c))
++		    pred = spred;
 +      else if (col) pred = row[0][-jh->clrs];
 +      else	    pred = (jh->vpred[c] += diff) - diff;
 +      if (jrow && col) switch (jh->psv) {
@@ -5184,6 +5200,7 @@
 +	default: pred = 0;
 +      }
 +      if ((**row = pred + diff) >> jh->bits) derror();
++      if (c <= jh->sraw) spred = **row;
 +      row[0]++; row[1]++;
 +    }
 +  return row[2];
@@ -5237,42 +5254,57 @@
 +void CLASS canon_sraw_load_raw()
 +{
 +  struct jhead jh;
-+  short *rp=0, *ip;
++  short *rp=0, (*ip)[4];
 +  int jwide, slice, scol, ecol, row, col, jrow=0, jcol=0, pix[3], c;
 +
 +  if (!ljpeg_start (&jh, 0)) return;
-+  jwide = (jh.wide >>= 1) * 4;
++  jwide = (jh.wide >>= 1) * jh.clrs;
 +
 +  for (ecol=slice=0; slice <= cr2_slice[0]; slice++) {
 +    scol = ecol;
-+    ecol += cr2_slice[1] >> 1;
-+    if (!cr2_slice[0] || ecol > width-1) ecol = width & -2;
-+    for (row=0; row < height; row++) {
-+      ip = (short *) image[row*width+scol];
-+      for (col=scol; col < ecol; col+=2, jcol+=4, ip+=8) {
++    ecol += cr2_slice[1] * 2 / jh.clrs;
++    if (!cr2_slice[0] || ecol > raw_width-1) ecol = raw_width & -2;
++    for (row=0; row < height; row += (jh.clrs >> 1) - 1) {
++      ip = (short (*)[4]) image + row*width;
++      for (col=scol; col < ecol; col+=2, jcol+=jh.clrs) {
 +	if ((jcol %= jwide) == 0)
 +	  rp = (short *) ljpeg_row (jrow++, &jh);
-+	ip[0] = rp[jcol];
-+	ip[4] = rp[jcol+1];
-+	ip[1] = (short) (rp[jcol+2] << 2) >> 2;
-+	ip[2] = (short) (rp[jcol+3] << 2) >> 2;
++	if (col >= width) continue;
++	FORC (jh.clrs-2)
++	  ip[col + (c >> 1)*width + (c & 1)][0] = rp[jcol+c];
++	ip[col][1] = rp[jcol+jh.clrs-2] - 16384;
++	ip[col][2] = rp[jcol+jh.clrs-1] - 16384;
 +      }
 +    }
 +  }
-+  for (row=0; row < height; row++) {
-+    ip = (short *) image[row*width+1];
-+    for (col=1; col < width-1; col+=2, ip+=8) {
-+      ip[1] = (ip[-3] + ip[5] + 1) >> 1;
-+      ip[2] = (ip[-2] + ip[6] + 1) >> 1;
-+    }
-+    if (col < width) { ip[1] = ip[-3]; ip[2] = ip[-2]; }
-+    ip = (short *) image[row*width];
-+    for (col=0; col < width; col++, ip+=4) {
-+      pix[0] = ip[2] + ip[0];
-+      pix[2] = ip[1] + ip[0];
-+      pix[1] = ((ip[0] << 12) - ip[1]*778 - (ip[2] << 11)) >> 12;
-+      FORC3 ip[c] = CLIP((pix[c] - 512) * sraw_mul[c] >> 10);
++  ip = (short (*)[4]) image;
++  rp = ip[0];
++  for (row=0; row < height; row++, ip+=width) {
++    if (row & (jh.sraw >> 1))
++      for (col=0; col < width; col+=2)
++	for (c=1; c < 3; c++)
++	  if (row == height-1)
++	       ip[col][c] =  ip[col-width][c];
++	  else ip[col][c] = (ip[col-width][c] + ip[col+width][c] + 1) >> 1;
++    for (col=1; col < width; col+=2)
++      for (c=1; c < 3; c++)
++	if (col == width-1)
++	     ip[col][c] =  ip[col-1][c];
++	else ip[col][c] = (ip[col-1][c] + ip[col+1][c] + 1) >> 1;
++  }
++  for ( ; rp < ip[0]; rp+=4) {
++    if (unique_id < 0x80000200) {
++      pix[0] = rp[0] + rp[2] - 512;
++      pix[2] = rp[0] + rp[1] - 512;
++      pix[1] = rp[0] + ((-778*rp[1] - (rp[2] << 11)) >> 12) - 512;
++    } else {
++      rp[1] += jh.sraw+1;
++      rp[2] += jh.sraw+1;
++      pix[0] = rp[0] + ((  200*rp[1] + 22929*rp[2]) >> 12);
++      pix[1] = rp[0] + ((-5640*rp[1] - 11751*rp[2]) >> 12);
++      pix[2] = rp[0] + ((29040*rp[1] -   101*rp[2]) >> 12);
 +    }
++    FORC3 rp[c] = CLIP(pix[c] * sraw_mul[c] >> 10);
 +  }
 +  free (jh.row);
 +  maximum = 0x3fff;
@@ -5391,7 +5423,7 @@
 +      7,6,8,5,9,4,10,3,11,12,2,0,1,13,14 } };
 +  struct decode *dindex;
 +  ushort ver0, ver1, vpred[2][2], hpred[2], csize;
-+  int i, max, step=0, huff=0, split=0, row, col, len, shl, diff;
++  int i, min, max, step=0, huff=0, split=0, row, col, len, shl, diff;
 +
 +  fseek (ifp, meta_offset, SEEK_SET);
 +  ver0 = fgetc(ifp);
@@ -5417,14 +5449,16 @@
 +{ 
 +    read_shorts (curve, max=csize);
 +color_flags.curve_state = LIBRAW_COLORSTATE_LOADED; }
++  while (curve[max-2] == curve[max-1]) max--;
 +  init_decoder();
 +  make_decoder (nikon_tree[huff], 0);
 +  fseek (ifp, data_offset, SEEK_SET);
 +  getbits(-1);
-+  for (row=0; row < height; row++) {
++  for (min=row=0; row < height; row++) {
 +    if (split && row == split) {
 +      init_decoder();
 +      make_decoder (nikon_tree[huff+1], 0);
++      max += (min = 16) << 1;
 +    }
 +    for (col=0; col < raw_width; col++) {
 +      for (dindex=first_decode; dindex->branch[0]; )
@@ -5436,9 +5470,9 @@
 +	diff -= (1 << len) - !shl;
 +      if (col < 2) hpred[col] = vpred[row & 1][col] += diff;
 +      else	   hpred[col & 1] += diff;
-+      if (hpred[col & 1] >= max) derror();
++      if ((ushort)(hpred[col & 1] + min) >= max) derror();
 +      if ((unsigned) (col-left_margin) < width)
-+	BAYER(row,col-left_margin) = curve[hpred[col & 1] & 0x3fff];
++	BAYER(row,col-left_margin) = curve[LIM((short)hpred[col & 1],0,0x3fff)];
 +    }
 +  }
 +}
@@ -5524,14 +5558,14 @@
 + */
 +int CLASS minolta_z2()
 +{
-+  int i;
++  int i, nz;
 +  char tail[424];
 +
 +  fseek (ifp, -sizeof tail, SEEK_END);
 +  fread (tail, 1, sizeof tail, ifp);
-+  for (i=0; i < sizeof tail; i++)
-+    if (tail[i]) return 1;
-+  return 0;
++  for (nz=i=0; i < sizeof tail; i++)
++    if (tail[i]) nz++;
++  return nz > 20;
 +}
 +
 +/* Here raw_width is in bytes, not pixels. */
@@ -5579,7 +5613,7 @@
 +  }
 +  free (pixel);
 +}
-+#line 1379 "dcraw/dcraw.c"
++#line 1397 "dcraw/dcraw.c"
 +void CLASS ppm_thumb (FILE *tfp)
 +{
 +  char *thumb;
@@ -5938,6 +5972,7 @@
 +
 +  if (!ljpeg_start (&jh, 0)) return;
 +  free (jh.row);
++  order = 0x4949;
 +  ph1_bits(-1);
 +  for (row=-top_margin; row < height; row++) {
 +    pred[0] = pred[1] = 0x8000;
@@ -5951,6 +5986,7 @@
 +	diff = ph1_bits(len[i]);
 +	if ((diff & (1 << (len[i]-1))) == 0)
 +	  diff -= (1 << len[i]) - 1;
++	if (diff == 65535) diff = -32768;
 +	pred[i] += diff;
 +	if (row >= 0 && (unsigned)(col+i) < width)
 +	  BAYER(row,col+i) = pred[i];
@@ -5987,7 +6023,7 @@
 +  }
 +}
 +
-+#line 1790 "dcraw/dcraw.c"
++#line 1810 "dcraw/dcraw.c"
 +void CLASS sinar_4shot_load_raw()
 +{
 +  ushort *pixel;
@@ -6156,7 +6192,7 @@
 +      } else if ((nonz[i & 1] = pana_bits(8)) || i > 11)
 +	pred[i & 1] = nonz[i & 1] << 4 | pana_bits(4);
 +      if (col < width)
-+	if ((BAYER(row,col) = pred[col & 1]) > 4098) derror();
++      if ((BAYER(row,col) = pred[col & 1]) > 4098) derror();
 +    }
 +}
 +
@@ -6534,7 +6570,7 @@
 +#endif
 +    jpeg_destroy_decompress (&cinfo);
 +throw LIBRAW_EXCEPTION_DECODE_JPEG; 
-+#line 2339 "dcraw/dcraw.c"
++#line 2359 "dcraw/dcraw.c"
 +  }
 +  buf = (*cinfo.mem->alloc_sarray)
 +		((j_common_ptr) &cinfo, JPOOL_IMAGE, width*3, 1);
@@ -7042,7 +7078,7 @@
 +    smal_decode_segment (seg+i, holes);
 +  if (holes) fill_holes (holes);
 +}
-+#line 3544 "dcraw/dcraw.c"
++#line 3564 "dcraw/dcraw.c"
 +
 +/*
 +   Seach from the current directory up to the root looking for
@@ -7058,7 +7094,7 @@
 +RUN_CALLBACK(LIBRAW_PROGRESS_BAD_PIXELS,0,2); 
 +  if (fname)
 +    fp = fopen (fname, "r");
-+#line 3585 "dcraw/dcraw.c"
++#line 3605 "dcraw/dcraw.c"
 +  if (!fp) 
 +      {
 +imgdata.process_warnings |= LIBRAW_WARN_NO_BADPIXELMAP; 
@@ -8349,7 +8385,7 @@
 +  }
 +}
 +
-+#line 4879 "dcraw/dcraw.c"
++#line 4899 "dcraw/dcraw.c"
 +void CLASS parse_makernote (int base, int uptag)
 +{
 +  static const uchar xlat[2][256] = {
@@ -8445,10 +8481,11 @@
 +    if (tag == 2 && strstr(make,"NIKON"))
 +      iso_speed = (get2(),get2());
 +    if (tag == 4 && len > 26 && len < 35) {
-+      iso_speed = 50 * pow (2, (get4(),get2())/32.0 - 4);
-+      if ((i=(get2(),get2())) != 0x7fff)
++      if ((i=(get4(),get2())) != 0x7fff && !iso_speed)
++	iso_speed = 50 * pow (2, i/32.0 - 4);
++      if ((i=(get2(),get2())) != 0x7fff && !aperture)
 +	aperture = pow (2, i/64.0);
-+      if ((i=get2()) != 0xffff)
++      if ((i=get2()) != 0xffff && !shutter)
 +	shutter = pow (2, (short) i/-32.0);
 +      wbi = (get2(),get2());
 +      shot_order = (get2(),get2());
@@ -8603,7 +8640,9 @@
 +      cam_mul[2] = get2() / 256.0;
 +color_flags.cam_mul_state = LIBRAW_COLORSTATE_LOADED; 
 +    }
-+    if (tag == 0x2010 && type == 13)
++    if ((tag | 0x70) == 0x2070 && type == 4)
++      fseek (ifp, get4()+base, SEEK_SET);
++    if (tag == 0x2010 && type != 7)
 +      load_raw = &CLASS olympus_e410_load_raw;
 +    if (tag == 0x2020)
 +      parse_thumb_note (base, 257, 258);
@@ -8613,8 +8652,8 @@
 +      fseek (ifp, get4(), SEEK_SET);
 +      parse_thumb_note (base, 136, 137);
 +    }
-+    if (tag == 0x4001 && type == 3) {
-+      i = len == 582 ? 50 : len == 653 ? 68 : 126;
++    if (tag == 0x4001 && len > 500) {
++      i = len == 582 ? 50 : len == 653 ? 68 : len == 5120 ? 142 : 126;
 +      fseek (ifp, i, SEEK_CUR);
 +get2_rggb:
 +      FORC4 cam_mul[c ^ (c >> 1)] = get2();
@@ -8728,7 +8767,7 @@
 +  static const char *mod[] =
 +  { "","DCB2","Volare","Cantare","CMost","Valeo 6","Valeo 11","Valeo 22",
 +    "Valeo 11p","Valeo 17","","Aptus 17","Aptus 22","Aptus 75","Aptus 65",
-+    "Aptus 54S","Aptus 65S","Aptus 75S" };
++    "Aptus 54S","Aptus 65S","Aptus 75S","AFi 5","AFi 6","AFi 7" };
 +  float romm_cam[3][3];
 +
 +  fseek (ifp, offset, SEEK_SET);
@@ -8832,7 +8871,7 @@
 +  }
 +}
 +
-+#line 5365 "dcraw/dcraw.c"
++#line 5388 "dcraw/dcraw.c"
 +int CLASS parse_tiff_ifd (int base)
 +{
 +  unsigned entries, tag, type, len, plen=16, save;
@@ -8906,7 +8945,7 @@
 +	fgets (model, 64, ifp);
 +	break;
 +      case 280:				/* Panasonic RW2 offset */
-+	if (~tiff_ifd[ifd].offset) break;
++	if (type != 4) break;
 +	load_raw = &CLASS panasonic_load_raw;
 +	load_flags = 0x2008;
 +      case 273:				/* StripOffset */
@@ -8933,10 +8972,11 @@
 +      case 514:
 +	tiff_ifd[ifd].bytes = get4();
 +	break;
-+      case 305:				/* Software */
++      case 305:  case 11:		/* Software */
 +	fgets (software, 64, ifp);
 +	if (!strncmp(software,"Adobe",5) ||
 +	    !strncmp(software,"dcraw",5) ||
++	    !strncmp(software,"UFRaw",5) ||
 +	    !strncmp(software,"Bibble",6) ||
 +	    !strncmp(software,"Nikon Scan",10) ||
 +	    !strcmp (software,"Digital Photo Professional"))
@@ -9077,6 +9117,7 @@
 +	ima_len = len;
 +	break;
 +      case 46279:
++	if (!ima_len) break;
 +	fseek (ifp, 78, SEEK_CUR);
 +	raw_width  = get4();
 +	raw_height = get4();
@@ -9130,6 +9171,7 @@
 +	break;
 +      case 50706:			/* DNGVersion */
 +	FORC4 dng_version = (dng_version << 8) + fgetc(ifp);
++	if (!make[0]) strcpy (make, "DNG");
 +	break;
 +      case 50710:			/* CFAPlaneColor */
 +	if (len > 4) len = 4;
@@ -9410,7 +9452,7 @@
 +void CLASS parse_external_jpeg()
 +{
 +  char *file, *ext, *jname, *jfile, *jext;
-+#line 5946 "dcraw/dcraw.c"
++#line 5972 "dcraw/dcraw.c"
 +  ext  = strrchr (ifname, '.');
 +  file = strrchr (ifname, '/');
 +  if (!file) file = strrchr (ifname, '\\');
@@ -9453,7 +9495,7 @@
 +#endif
 +} 
 +  free (jname);
-+#line 5991 "dcraw/dcraw.c"
++#line 6017 "dcraw/dcraw.c"
 +}
 +
 +/*
@@ -9673,7 +9715,7 @@
 +  fseek (ifp, base, SEEK_SET);
 +  order = get4() & 0xffff;
 +  if (get4() >> 8 != 0x526177) return;		/* "Raw" */
-+  fseek (ifp, base+get4(), SEEK_SET);
++  fseek (ifp, get4()+base, SEEK_SET);
 +  entries = get4();
 +  get4();
 +  while (entries--) {
@@ -9797,11 +9839,19 @@
 +  order = 0x4949;
 +  fread (tag, 4, 1, ifp);
 +  size = get4();
++  end = ftell(ifp) + size;
 +  if (!memcmp(tag,"RIFF",4) || !memcmp(tag,"LIST",4)) {
-+    end = ftell(ifp) + size;
 +    get4();
 +    while (ftell(ifp) < end)
 +      parse_riff();
++  } else if (!memcmp(tag,"nctg",4)) {
++    while (ftell(ifp) < end) {
++      i = get2();
++      size = get2();
++      if ((i+1) >> 1 == 10 && size == 20)
++	get_timestamp(0);
++      else fseek (ifp, size, SEEK_CUR);
++    }
 +  } else if (!memcmp(tag,"IDIT",4) && size < 64) {
 +    fread (date, 64, 1, ifp);
 +    date[size] = 0;
@@ -9886,7 +9936,7 @@
 +  data_offset  = (INT64) get4() + 8;
 +  data_offset += (INT64) get4() << 32;
 +}
-+#line 6528 "dcraw/dcraw.c"
++#line 6562 "dcraw/dcraw.c"
 +void CLASS adobe_coeff (const char *p_make, const char *p_model) 
 +{
 +  static const struct {
@@ -9903,6 +9953,8 @@
 +	{ 9805,-2689,-1312,-5803,13064,3068,-2438,3075,8775 } },
 +    { "Canon EOS D60", 0, 0xfa0,
 +	{ 6188,-1341,-890,-7168,14489,2937,-2640,3228,8483 } },
++    { "Canon EOS 5D Mark II", 0, 0x3cf0,
++	{ 4716,603,-830,-7798,15474,2480,-1496,1937,6651 } },
 +    { "Canon EOS 5D", 0, 0xe6c,
 +	{ 6347,-479,-972,-8297,15954,2480,-1968,2131,7649 } },
 +    { "Canon EOS 10D", 0, 0xfa0,
@@ -9915,6 +9967,8 @@
 +	{ 6257,-303,-1000,-7880,15621,2396,-1714,1904,7046 } },
 +    { "Canon EOS 40D", 0, 0x3f60,
 +	{ 6071,-747,-856,-7653,15365,2441,-2025,2553,7315 } },
++    { "Canon EOS 50D", 0, 0x3d93,
++	{ 4920,616,-593,-6493,13964,2784,-1774,3178,7005 } },
 +    { "Canon EOS 300D", 0, 0xfa0,
 +	{ 8197,-2000,-1118,-6714,14335,2592,-2536,3178,8266 } },
 +    { "Canon EOS 350D", 0, 0xfff,
@@ -9924,7 +9978,7 @@
 +    { "Canon EOS 450D", 0, 0x390d,
 +	{ 5784,-262,-821,-7539,15064,2672,-1982,2681,7427 } },
 +    { "Canon EOS 1000D", 0, 0xe43,
-+	{ 7054,-1501,-990,-8156,15544,2812,-1278,1414,7796 } },
++	{ 6771,-1139,-977,-7818,15123,2928,-1244,1437,7533 } },
 +    { "Canon EOS-1Ds Mark III", 0, 0x3bb0,
 +	{ 5859,-211,-930,-8255,16017,2353,-1732,1887,7448 } },
 +    { "Canon EOS-1Ds Mark II", 0, 0xe80,
@@ -9945,6 +9999,8 @@
 +	{ -5300,9846,1776,3436,684,3939,-5540,9879,6200,-1404,11175,217 } },
 +    { "Canon PowerShot A5", 0, 0,
 +	{ -4801,9475,1952,2926,1611,4094,-5259,10164,5947,-1554,10883,547 } },
++    { "Canon PowerShot G10", 0, 0,
++	{ 11093,-3906,-1028,-5047,12492,2879,-1003,1750,5561 } },
 +    { "Canon PowerShot G1", 0, 0,
 +	{ -4778,9467,2172,4743,-1141,4344,-5146,9908,6077,-1566,11051,557 } },
 +    { "Canon PowerShot G2", 0, 0,
@@ -10041,6 +10097,8 @@
 +	{ 12343,-4515,-1285,-7165,14899,2435,-1895,2496,8800 } },
 +    { "FUJIFILM IS-1", 0, 0,
 +	{ 21461,-10807,-1441,-2332,10599,1999,289,875,7703 } },
++    { "FUJIFILM IS Pro", 0, 0,
++	{ 12300,-5110,-1304,-9117,17143,1998,-1947,2448,8100 } },
 +    { "Imacon Ixpress", 0, 0,		/* DJC */
 +	{ 7025,-1415,-704,-5188,13765,1424,-1248,2742,6038 } },
 +    { "KODAK NC2000", 0, 0,
@@ -10147,8 +10205,8 @@
 +	{ 7732,-2422,-789,-8238,15884,2498,-859,783,7330 } },
 +    { "NIKON D80", 0, 0,
 +	{ 8629,-2410,-883,-9055,16940,2171,-1490,1363,8520 } },
-+    { "NIKON D90", 0, 0xf00,		/* DJC */
-+	{ 9692,-2519,-831,-5396,13053,2344,-1818,2682,7084 } },
++    { "NIKON D90", 0, 0xf00,
++	{ 7309,-1403,-519,-8474,16008,2622,-2434,2826,8064 } },
 +    { "NIKON D200", 0, 0xfbc,
 +	{ 8367,-2248,-763,-8758,16447,2422,-1527,1550,8053 } },
 +    { "NIKON D300", 0, 0,
@@ -10179,6 +10237,8 @@
 +	{ 8489,-2583,-1036,-8051,15583,2643,-1307,1407,7354 } },
 +    { "NIKON E8800", 0, 0,
 +	{ 7971,-2314,-913,-8451,15762,2894,-1442,1520,7610 } },
++    { "NIKON COOLPIX P6000", 0, 0,
++	{ 9698,-3367,-914,-4706,12584,2368,-837,968,5801 } },
 +    { "OLYMPUS C5050", 0, 0,
 +	{ 10508,-3124,-1273,-6079,14294,1901,-1653,2306,6237 } },
 +    { "OLYMPUS C5060", 0, 0,
@@ -10245,10 +10305,14 @@
 +	{ 9427,-2714,-868,-7493,16092,1373,-2199,3264,7180 } },
 +    { "PENTAX K200D", 0, 0,
 +	{ 9186,-2678,-907,-8693,16517,2260,-1129,1094,8524 } },
++    { "PENTAX K2000", 0, 0,
++	{ 11057,-3604,-1155,-5152,13046,2329,-282,375,8104 } },
 +    { "Panasonic DMC-FZ8", 0, 0xf7f0,
 +	{ 8986,-2755,-802,-6341,13575,3077,-1476,2144,6379 } },
 +    { "Panasonic DMC-FZ18", 0, 0,
 +	{ 9932,-3060,-935,-5809,13331,2753,-1267,2155,5575 } },
++    { "Panasonic DMC-FZ28", 15, 0xfff,
++	{ 10109,-3488,-993,-5412,12812,2916,-1305,2140,5543 } },
 +    { "Panasonic DMC-FZ30", 0, 0xf94c,
 +	{ 10976,-4029,-1141,-7918,15491,2600,-1670,2071,8246 } },
 +    { "Panasonic DMC-FZ50", 0, 0xfff0,	/* aka "LEICA V-LUX1" */
@@ -10263,6 +10327,12 @@
 +	{ 10704,-4187,-1230,-8314,15952,2501,-920,945,8927 } },
 +    { "Panasonic DMC-LX2", 0, 0,	/* aka "LEICA D-LUX3" */
 +	{ 8048,-2810,-623,-6450,13519,3272,-1700,2146,7049 } },
++    { "Panasonic DMC-LX3", 15, 0xfff,	/* aka "LEICA D-LUX4" */
++	{ 8128,-2668,-655,-6134,13307,3161,-1782,2568,6083 } },
++    { "Panasonic DMC-FX150", 15, 0xfff,
++	{ 9082,-2907,-925,-6119,13377,3058,-1797,2641,5609 } },
++    { "Panasonic DMC-G1", 15, 0xfff,
++	{ 8199,-2065,-1056,-8124,16156,2033,-2458,3022,7220 } },
 +    { "Phase One H 20", 0, 0,		/* DJC */
 +	{ 1313,1855,-109,-6715,15908,808,-327,1840,6020 } },
 +    { "Phase One P 2", 0, 0,
@@ -10291,8 +10361,8 @@
 +	{ 6038,-1484,-578,-9146,16746,2513,-875,746,7217 } },
 +    { "SONY DSLR-A700", 254, 0x1ffe,
 +	{ 5775,-805,-359,-8574,16295,2391,-1943,2341,7249 } },
-+    { "SONY DSLR-A900", 254, 0x1ffe,	/* DJC */
-+	{ 6971,-1730,-794,-5763,13529,2236,-1500,2251,6715 } }
++    { "SONY DSLR-A900", 254, 0x1ffe,
++	{ 5209,-1072,-397,-8845,16120,2919,-1618,1803,8654 } }
 +  };
 +  double cam_xyz[4][3];
 +  char name[130];
@@ -10589,6 +10659,8 @@
 +    { height  = 2616;   width  = 3896; }
 +  if (height == 3136 && width == 4864)	/* Pentax K20D */
 +    { height  = 3124;   width  = 4688; }
++  if (height == 3014 && width == 4096)	/* Ricoh GX200 */
++			width  = 4014;
 +  if (dng_version) {
 +    if (filters == UINT_MAX) filters = 0;
 +    if (filters) is_raw = tiff_samples;
@@ -10622,6 +10694,10 @@
 +    load_raw = &CLASS foveon_load_raw;
 +    simple_coeff(0);
 +  } else if (is_canon && tiff_bps == 15) {
++    switch (width) {
++      case 3344: width -= 66;
++      case 3872: width -= 6;
++    }
 +    filters = 0;
 +    load_raw = &CLASS canon_sraw_load_raw;
 +  } else if (!strcmp(model,"PowerShot 600")) {
@@ -10829,11 +10905,21 @@
 +    top_margin  = 34;
 +    left_margin = 90;
 +    goto canon_cr2;
++  } else if (is_canon && raw_width == 4480) {
++    height = 3326;
++    width  = 4432;
++    top_margin  = 10;
++    left_margin = 12;
++    filters = 0x49494949;
 +  } else if (is_canon && raw_width == 1208) {
 +    top_margin  = 51;
 +    left_margin = 62;
 +    raw_width = width *= 4;
-+    maximum = 0x3d93;
++    goto canon_cr2;
++  } else if (is_canon && raw_width == 1448) {
++    top_margin  = 51;
++    left_margin = 158;
++    raw_width = width *= 4;
 +    goto canon_cr2;
 +  } else if (is_canon && raw_width == 5108) {
 +    top_margin  = 13;
@@ -11203,6 +11289,9 @@
 +    maximum = 0x3fff;
 +  } else if (!strcmp(make,"Leaf")) {
 +    maximum = 0x3fff;
++    fseek (ifp, data_offset, SEEK_SET);
++    if (ljpeg_start (&jh, 1) && jh.bits == 15)
++      maximum = 0x1fff;
 +    if (tiff_samples > 1) filters = 0;
 +    if (tiff_samples > 1 || tile_length < raw_height)
 +      load_raw = &CLASS leaf_hdr_load_raw;
@@ -11266,22 +11355,21 @@
 +	zero_is_bad = 1;
 +	adobe_coeff ("Panasonic","DMC-L1");  break;
 +      case 3304:
-+	width -= 16;
++	width -= 17;
 +	zero_is_bad = 1;
 +	adobe_coeff ("Panasonic","DMC-FZ30");  break;
 +      case 3330:
-+	width = 3291;
-+	left_margin = 9;
++	width += 43;
++	left_margin = -6;
 +	maximum = 0xf7f0;
-+	goto fz18;
 +      case 3370:
-+	width = 3288;
-+	left_margin = 15;
-+fz18:	if (height > 2480)
++	width -= 82;
++	left_margin += 15;
++	if (height > 2480)
 +	    height = 2480 - (top_margin = 10);
 +	filters = 0x49494949;
 +	zero_is_bad = 1;
-+	break;
++	adobe_coeff ("Panasonic","DMC-FZ18");  break;
 +      case 3690:
 +	height += 36;
 +	left_margin = -14;
@@ -11297,21 +11385,27 @@
 +      case 3710:
 +	width = 3682;
 +	filters = 0x49494949;
-+	break;
++	adobe_coeff ("Panasonic","DMC-L10");  break;
 +      case 3724:
 +	width -= 14;
 +      case 3836:
-+	width += 36;
-+      case 4060:
-+	width -= 78;
-+	filters = 0x16161616;
-+	maximum = 0xfff;
++	width -= 42;
++lx3:	filters = 0x16161616;
++	if (make[0] != 'P')
++	  adobe_coeff ("Panasonic","DMC-LX3");
 +	break;
 +      case 3880:
 +	width -= 22;
 +	left_margin = 6;
 +	zero_is_bad = 1;
 +	adobe_coeff ("Panasonic","DMC-LX1");  break;
++      case 4060:
++	width = 3982;
++	if (height == 2250) goto lx3;
++	width = 4018;
++	filters = 0x49494949;
++	zero_is_bad = 1;
++	adobe_coeff ("Panasonic","DMC-G1");  break;
 +      case 4290:
 +	height += 38;
 +	left_margin = -14;
@@ -11322,6 +11416,11 @@
 +	  top_margin = 15;
 +	left_margin += 17;
 +	adobe_coeff ("Panasonic","DMC-LX2");  break;
++      case 4508:
++	height -= 6;
++	width = 4429;
++	filters = 0x16161616;
++	adobe_coeff ("Panasonic","DMC-FX150");  break;
 +    }
 +  } else if (!strcmp(model,"C770UZ")) {
 +    height = 1718;
@@ -11665,7 +11764,7 @@
 +  if (strcmp (input, "embed"))
 +    hInProfile = cmsOpenProfileFromFile (input, "r");
 +  else if (profile_length) {
-+#line 8314 "dcraw/dcraw.c"
++#line 8397 "dcraw/dcraw.c"
 +hInProfile = cmsOpenProfileFromMem (imgdata.color.profile, profile_length); 
 +  } else
 +      {
@@ -11815,7 +11914,7 @@
 +
 +#endif
 +memset(histogram,0,sizeof(int)*LIBRAW_HISTOGRAM_SIZE*4); 
-+#line 8466 "dcraw/dcraw.c"
++#line 8549 "dcraw/dcraw.c"
 +  for (img=image[0], row=0; row < height; row++)
 +    for (col=0; col < width; col++, img+=4) {
 +      if (!raw_color) {
@@ -11956,7 +12055,7 @@
 +}
 +
 +
-+#line 8631 "dcraw/dcraw.c"
++#line 8714 "dcraw/dcraw.c"
 +void CLASS tiff_set (ushort *ntag,
 +	ushort tag, ushort type, int count, int val)
 +{
@@ -12144,8 +12243,8 @@
 
 Index: libraw/internal/var_defines.h
 ===================================================================
---- libraw/internal/var_defines.h	(.../tags/KDE/4.1.3/kdegraphics/libs/libkdcraw)	(revision 0)
-+++ libraw/internal/var_defines.h	(.../trunk/KDE/kdegraphics/libs/libkdcraw)	(revision 888947)
+--- libraw/internal/var_defines.h	(.../tags/KDE/4.1.4/kdegraphics/libs/libkdcraw)	(revision 0)
++++ libraw/internal/var_defines.h	(.../trunk/KDE/kdegraphics/libs/libkdcraw)	(revision 907970)
 @@ -0,0 +1,165 @@
 +/* -*- C++ -*-
 + * File: var_defines.h
@@ -12320,17 +12419,17 @@
 
 Index: libraw/internal/foveon.cpp
 ===================================================================
---- libraw/internal/foveon.cpp	(.../tags/KDE/4.1.3/kdegraphics/libs/libkdcraw)	(revision 0)
-+++ libraw/internal/foveon.cpp	(.../trunk/KDE/kdegraphics/libs/libkdcraw)	(revision 888947)
+--- libraw/internal/foveon.cpp	(.../tags/KDE/4.1.4/kdegraphics/libs/libkdcraw)	(revision 0)
++++ libraw/internal/foveon.cpp	(.../trunk/KDE/kdegraphics/libs/libkdcraw)	(revision 907970)
 @@ -0,0 +1,790 @@
 +/* 
 +   GENERATED FILE, DO NOT EDIT
-+   Generated from dcraw/dcraw.c at Thu Sep 25 11:44:51 2008
++   Generated from dcraw/dcraw.c at Sun Jan  4 16:41:18 2009
 +   Look into original file (probably http://cybercom.net/~dcoffin/dcraw/dcraw.c)
 +   for copyright information.
 +*/
 +
-+#line 2848 "dcraw/dcraw.c"
++#line 2868 "dcraw/dcraw.c"
 +#define CLASS LibRaw::
 +#include "libraw/libraw_types.h"
 +#define LIBRAW_LIBRARY_BUILD
@@ -12341,7 +12440,7 @@
 +#define SRC_USES_CURVE
 +#include "internal/var_defines.h"
 +#define sget4(s) sget4((uchar *)s)
-+#line 2860 "dcraw/dcraw.c"
++#line 2880 "dcraw/dcraw.c"
 +
 +/* RESTRICTED code starts here */
 +
@@ -12363,7 +12462,7 @@
 +  cur = free_decode++;
 +  if (free_decode > first_decode+2048) {
 +throw LIBRAW_EXCEPTION_DECODE_RAW; 
-+#line 2885 "dcraw/dcraw.c"
++#line 2905 "dcraw/dcraw.c"
 +  }
 +  if (code)
 +    for (i=0; i < size; i++)
@@ -12595,12 +12694,12 @@
 +  return i < 0 ? -curve[1-i] : curve[1+i];
 +}
 +
-+#line 3119 "dcraw/dcraw.c"
++#line 3139 "dcraw/dcraw.c"
 +#ifdef image
 +#undef image
 +#endif
 +#define image ((short(*)[4]) imgdata.image)
-+#line 3126 "dcraw/dcraw.c"
++#line 3146 "dcraw/dcraw.c"
 +
 +void CLASS foveon_interpolate()
 +{
@@ -13017,7 +13116,7 @@
 +#undef image
 +
 +/* RESTRICTED code ends here */
-+#line 6426 "dcraw/dcraw.c"
++#line 6460 "dcraw/dcraw.c"
 +char * CLASS foveon_gets (int offset, char *str, int len)
 +{
 +  int i;
@@ -13121,8 +13220,8 @@
 
 Index: libkdcraw/dcrawinfo.h.cmake
 ===================================================================
---- libkdcraw/dcrawinfo.h.cmake	(.../tags/KDE/4.1.3/kdegraphics/libs/libkdcraw)	(revision 888947)
-+++ libkdcraw/dcrawinfo.h.cmake	(.../trunk/KDE/kdegraphics/libs/libkdcraw)	(revision 888947)
+--- libkdcraw/dcrawinfo.h.cmake	(.../tags/KDE/4.1.4/kdegraphics/libs/libkdcraw)	(revision 907970)
++++ libkdcraw/dcrawinfo.h.cmake	(.../trunk/KDE/kdegraphics/libs/libkdcraw)	(revision 907970)
 @@ -1,30 +0,0 @@
 -/* ============================================================
 - *
@@ -13156,8 +13255,8 @@
 -#endif // DCRAW_INFO_H
 Index: libkdcraw/dcrawbinary.cpp
 ===================================================================
---- libkdcraw/dcrawbinary.cpp	(.../tags/KDE/4.1.3/kdegraphics/libs/libkdcraw)	(revision 888947)
-+++ libkdcraw/dcrawbinary.cpp	(.../trunk/KDE/kdegraphics/libs/libkdcraw)	(revision 888947)
+--- libkdcraw/dcrawbinary.cpp	(.../tags/KDE/4.1.4/kdegraphics/libs/libkdcraw)	(revision 907970)
++++ libkdcraw/dcrawbinary.cpp	(.../trunk/KDE/kdegraphics/libs/libkdcraw)	(revision 907970)
 @@ -1,212 +0,0 @@
 -/* ============================================================
 - *
@@ -13373,8 +13472,8 @@
 -}  // namespace KDcrawIface
 Index: libkdcraw/dcrawbinary.h
 ===================================================================
---- libkdcraw/dcrawbinary.h	(.../tags/KDE/4.1.3/kdegraphics/libs/libkdcraw)	(revision 888947)
-+++ libkdcraw/dcrawbinary.h	(.../trunk/KDE/kdegraphics/libs/libkdcraw)	(revision 888947)
+--- libkdcraw/dcrawbinary.h	(.../tags/KDE/4.1.4/kdegraphics/libs/libkdcraw)	(revision 907970)
++++ libkdcraw/dcrawbinary.h	(.../trunk/KDE/kdegraphics/libs/libkdcraw)	(revision 907970)
 @@ -1,100 +0,0 @@
 -/* ============================================================
 - *
@@ -13478,8 +13577,8 @@
 -#endif  // DCRAW_BINARY_H
 Index: libkdcraw/rcombobox.h
 ===================================================================
---- libkdcraw/rcombobox.h	(.../tags/KDE/4.1.3/kdegraphics/libs/libkdcraw)	(revision 0)
-+++ libkdcraw/rcombobox.h	(.../trunk/KDE/kdegraphics/libs/libkdcraw)	(revision 888947)
+--- libkdcraw/rcombobox.h	(.../tags/KDE/4.1.4/kdegraphics/libs/libkdcraw)	(revision 0)
++++ libkdcraw/rcombobox.h	(.../trunk/KDE/kdegraphics/libs/libkdcraw)	(revision 907970)
 @@ -0,0 +1,84 @@
 +/* ============================================================
 + *
@@ -13573,8 +13672,8 @@
 
 Index: libkdcraw/rnuminput.cpp
 ===================================================================
---- libkdcraw/rnuminput.cpp	(.../tags/KDE/4.1.3/kdegraphics/libs/libkdcraw)	(revision 0)
-+++ libkdcraw/rnuminput.cpp	(.../trunk/KDE/kdegraphics/libs/libkdcraw)	(revision 888947)
+--- libkdcraw/rnuminput.cpp	(.../tags/KDE/4.1.4/kdegraphics/libs/libkdcraw)	(revision 0)
++++ libkdcraw/rnuminput.cpp	(.../trunk/KDE/kdegraphics/libs/libkdcraw)	(revision 907970)
 @@ -0,0 +1,248 @@
 +/* ============================================================
 + *
@@ -13832,8 +13931,8 @@
 
 Index: libkdcraw/rnuminput.h
 ===================================================================
---- libkdcraw/rnuminput.h	(.../tags/KDE/4.1.3/kdegraphics/libs/libkdcraw)	(revision 0)
-+++ libkdcraw/rnuminput.h	(.../trunk/KDE/kdegraphics/libs/libkdcraw)	(revision 888947)
+--- libkdcraw/rnuminput.h	(.../tags/KDE/4.1.4/kdegraphics/libs/libkdcraw)	(revision 0)
++++ libkdcraw/rnuminput.h	(.../trunk/KDE/kdegraphics/libs/libkdcraw)	(revision 907970)
 @@ -0,0 +1,127 @@
 +/* ============================================================
 + *
@@ -13970,8 +14069,8 @@
 
 Index: libkdcraw/kdcrawprivate.cpp
 ===================================================================
---- libkdcraw/kdcrawprivate.cpp	(.../tags/KDE/4.1.3/kdegraphics/libs/libkdcraw)	(revision 0)
-+++ libkdcraw/kdcrawprivate.cpp	(.../trunk/KDE/kdegraphics/libs/libkdcraw)	(revision 888947)
+--- libkdcraw/kdcrawprivate.cpp	(.../tags/KDE/4.1.4/kdegraphics/libs/libkdcraw)	(revision 0)
++++ libkdcraw/kdcrawprivate.cpp	(.../trunk/KDE/kdegraphics/libs/libkdcraw)	(revision 907970)
 @@ -0,0 +1,144 @@
 +/* ============================================================
 + *
@@ -14125,8 +14224,8 @@
 
 Index: libkdcraw/libkdcraw_export.h
 ===================================================================
---- libkdcraw/libkdcraw_export.h	(.../tags/KDE/4.1.3/kdegraphics/libs/libkdcraw)	(revision 888947)
-+++ libkdcraw/libkdcraw_export.h	(.../trunk/KDE/kdegraphics/libs/libkdcraw)	(revision 888947)
+--- libkdcraw/libkdcraw_export.h	(.../tags/KDE/4.1.4/kdegraphics/libs/libkdcraw)	(revision 907970)
++++ libkdcraw/libkdcraw_export.h	(.../trunk/KDE/kdegraphics/libs/libkdcraw)	(revision 907970)
 @@ -24,7 +24,7 @@
  #include <kdemacros.h>
  
@@ -14138,8 +14237,8 @@
  # else
 Index: libkdcraw/kdcrawprivate.h
 ===================================================================
---- libkdcraw/kdcrawprivate.h	(.../tags/KDE/4.1.3/kdegraphics/libs/libkdcraw)	(revision 0)
-+++ libkdcraw/kdcrawprivate.h	(.../trunk/KDE/kdegraphics/libs/libkdcraw)	(revision 888947)
+--- libkdcraw/kdcrawprivate.h	(.../tags/KDE/4.1.4/kdegraphics/libs/libkdcraw)	(revision 0)
++++ libkdcraw/kdcrawprivate.h	(.../trunk/KDE/kdegraphics/libs/libkdcraw)	(revision 907970)
 @@ -0,0 +1,80 @@
 +/* ============================================================
 + *
@@ -14229,8 +14328,8 @@
 
 Index: libkdcraw/kdcraw.cpp
 ===================================================================
---- libkdcraw/kdcraw.cpp	(.../tags/KDE/4.1.3/kdegraphics/libs/libkdcraw)	(revision 888947)
-+++ libkdcraw/kdcraw.cpp	(.../trunk/KDE/kdegraphics/libs/libkdcraw)	(revision 888947)
+--- libkdcraw/kdcraw.cpp	(.../tags/KDE/4.1.4/kdegraphics/libs/libkdcraw)	(revision 907970)
++++ libkdcraw/kdcraw.cpp	(.../trunk/KDE/kdegraphics/libs/libkdcraw)	(revision 907970)
 @@ -10,10 +10,6 @@
   * Copyright (C) 2006-2008 by Marcel Wiesweg <marcel dot wiesweg at gmx dot de>
   * Copyright (C) 2007-2008 by Guillaume Castagnino <casta at xwing dot info>
@@ -15477,8 +15576,8 @@
  }  // namespace KDcrawIface
 Index: libkdcraw/rawdecodingsettings.h
 ===================================================================
---- libkdcraw/rawdecodingsettings.h	(.../tags/KDE/4.1.3/kdegraphics/libs/libkdcraw)	(revision 888947)
-+++ libkdcraw/rawdecodingsettings.h	(.../trunk/KDE/kdegraphics/libs/libkdcraw)	(revision 888947)
+--- libkdcraw/rawdecodingsettings.h	(.../tags/KDE/4.1.4/kdegraphics/libs/libkdcraw)	(revision 907970)
++++ libkdcraw/rawdecodingsettings.h	(.../trunk/KDE/kdegraphics/libs/libkdcraw)	(revision 907970)
 @@ -25,6 +25,11 @@
  #ifndef RAW_DECODING_SETTINGS_H
  #define RAW_DECODING_SETTINGS_H
@@ -15798,8 +15897,8 @@
  }  // namespace KDcrawIface
 Index: libkdcraw/squeezedcombobox.cpp
 ===================================================================
---- libkdcraw/squeezedcombobox.cpp	(.../tags/KDE/4.1.3/kdegraphics/libs/libkdcraw)	(revision 0)
-+++ libkdcraw/squeezedcombobox.cpp	(.../trunk/KDE/kdegraphics/libs/libkdcraw)	(revision 888947)
+--- libkdcraw/squeezedcombobox.cpp	(.../tags/KDE/4.1.4/kdegraphics/libs/libkdcraw)	(revision 0)
++++ libkdcraw/squeezedcombobox.cpp	(.../trunk/KDE/kdegraphics/libs/libkdcraw)	(revision 907970)
 @@ -0,0 +1,199 @@
 +/* ============================================================
 + *
@@ -16002,8 +16101,8 @@
 +}  // namespace KDcrawIface
 Index: libkdcraw/kdcraw.h
 ===================================================================
---- libkdcraw/kdcraw.h	(.../tags/KDE/4.1.3/kdegraphics/libs/libkdcraw)	(revision 888947)
-+++ libkdcraw/kdcraw.h	(.../trunk/KDE/kdegraphics/libs/libkdcraw)	(revision 888947)
+--- libkdcraw/kdcraw.h	(.../tags/KDE/4.1.4/kdegraphics/libs/libkdcraw)	(revision 907970)
++++ libkdcraw/kdcraw.h	(.../trunk/KDE/kdegraphics/libs/libkdcraw)	(revision 907970)
 @@ -25,7 +25,7 @@
  #ifndef KDCRAW_H
  #define KDCRAW_H
@@ -16158,8 +16257,8 @@
  }  // namespace KDcrawIface
 Index: libkdcraw/rawfiles.h
 ===================================================================
---- libkdcraw/rawfiles.h	(.../tags/KDE/4.1.3/kdegraphics/libs/libkdcraw)	(revision 888947)
-+++ libkdcraw/rawfiles.h	(.../trunk/KDE/kdegraphics/libs/libkdcraw)	(revision 888947)
+--- libkdcraw/rawfiles.h	(.../tags/KDE/4.1.4/kdegraphics/libs/libkdcraw)	(revision 907970)
++++ libkdcraw/rawfiles.h	(.../trunk/KDE/kdegraphics/libs/libkdcraw)	(revision 907970)
 @@ -24,9 +24,66 @@
  #ifndef RAW_FILES_H
  #define RAW_FILES_H
@@ -16231,8 +16330,8 @@
  #endif // RAW_FILES_H
 Index: libkdcraw/squeezedcombobox.h
 ===================================================================
---- libkdcraw/squeezedcombobox.h	(.../tags/KDE/4.1.3/kdegraphics/libs/libkdcraw)	(revision 0)
-+++ libkdcraw/squeezedcombobox.h	(.../trunk/KDE/kdegraphics/libs/libkdcraw)	(revision 888947)
+--- libkdcraw/squeezedcombobox.h	(.../tags/KDE/4.1.4/kdegraphics/libs/libkdcraw)	(revision 0)
++++ libkdcraw/squeezedcombobox.h	(.../trunk/KDE/kdegraphics/libs/libkdcraw)	(revision 907970)
 @@ -0,0 +1,162 @@
 +/* ============================================================
 + *
@@ -16398,8 +16497,8 @@
 +#endif // SQUEEZEDCOMBOBOX_H
 Index: libkdcraw/dcrawinfocontainer.h
 ===================================================================
---- libkdcraw/dcrawinfocontainer.h	(.../tags/KDE/4.1.3/kdegraphics/libs/libkdcraw)	(revision 888947)
-+++ libkdcraw/dcrawinfocontainer.h	(.../trunk/KDE/kdegraphics/libs/libkdcraw)	(revision 888947)
+--- libkdcraw/dcrawinfocontainer.h	(.../tags/KDE/4.1.4/kdegraphics/libs/libkdcraw)	(revision 907970)
++++ libkdcraw/dcrawinfocontainer.h	(.../trunk/KDE/kdegraphics/libs/libkdcraw)	(revision 907970)
 @@ -23,13 +23,13 @@
  #ifndef DCRAW_INFO_CONTAINER_H
  #define DCRAW_INFO_CONTAINER_H
@@ -16649,8 +16748,8 @@
  } // namespace KDcrawIface
 Index: libkdcraw/dcrawsettingswidget.cpp
 ===================================================================
---- libkdcraw/dcrawsettingswidget.cpp	(.../tags/KDE/4.1.3/kdegraphics/libs/libkdcraw)	(revision 888947)
-+++ libkdcraw/dcrawsettingswidget.cpp	(.../trunk/KDE/kdegraphics/libs/libkdcraw)	(revision 888947)
+--- libkdcraw/dcrawsettingswidget.cpp	(.../tags/KDE/4.1.4/kdegraphics/libs/libkdcraw)	(revision 907970)
++++ libkdcraw/dcrawsettingswidget.cpp	(.../trunk/KDE/kdegraphics/libs/libkdcraw)	(revision 907970)
 @@ -25,25 +25,24 @@
  // Qt includes.
  
@@ -17653,8 +17752,8 @@
  } // NameSpace KDcrawIface
 Index: libkdcraw/rcombobox.cpp
 ===================================================================
---- libkdcraw/rcombobox.cpp	(.../tags/KDE/4.1.3/kdegraphics/libs/libkdcraw)	(revision 0)
-+++ libkdcraw/rcombobox.cpp	(.../trunk/KDE/kdegraphics/libs/libkdcraw)	(revision 888947)
+--- libkdcraw/rcombobox.cpp	(.../tags/KDE/4.1.4/kdegraphics/libs/libkdcraw)	(revision 0)
++++ libkdcraw/rcombobox.cpp	(.../trunk/KDE/kdegraphics/libs/libkdcraw)	(revision 907970)
 @@ -0,0 +1,148 @@
 +/* ============================================================
 + *
@@ -17812,8 +17911,8 @@
 
 Index: libkdcraw/dcrawsettingswidget.h
 ===================================================================
---- libkdcraw/dcrawsettingswidget.h	(.../tags/KDE/4.1.3/kdegraphics/libs/libkdcraw)	(revision 888947)
-+++ libkdcraw/dcrawsettingswidget.h	(.../trunk/KDE/kdegraphics/libs/libkdcraw)	(revision 888947)
+--- libkdcraw/dcrawsettingswidget.h	(.../tags/KDE/4.1.4/kdegraphics/libs/libkdcraw)	(revision 907970)
++++ libkdcraw/dcrawsettingswidget.h	(.../trunk/KDE/kdegraphics/libs/libkdcraw)	(revision 907970)
 @@ -25,11 +25,16 @@
  #ifndef DCRAW_SETTINGS_WIDGET_H
  #define DCRAW_SETTINGS_WIDGET_H
@@ -17954,8 +18053,8 @@
  
 Index: libkdcraw/CMakeLists.txt
 ===================================================================
---- libkdcraw/CMakeLists.txt	(.../tags/KDE/4.1.3/kdegraphics/libs/libkdcraw)	(revision 888947)
-+++ libkdcraw/CMakeLists.txt	(.../trunk/KDE/kdegraphics/libs/libkdcraw)	(revision 888947)
+--- libkdcraw/CMakeLists.txt	(.../tags/KDE/4.1.4/kdegraphics/libs/libkdcraw)	(revision 907970)
++++ libkdcraw/CMakeLists.txt	(.../trunk/KDE/kdegraphics/libs/libkdcraw)	(revision 907970)
 @@ -1,24 +1,35 @@
  
  CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/version.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/version.h)
@@ -18003,8 +18102,8 @@
                libkdcraw_export.h 
 Index: libkdcraw.pc.cmake
 ===================================================================
---- libkdcraw.pc.cmake	(.../tags/KDE/4.1.3/kdegraphics/libs/libkdcraw)	(revision 888947)
-+++ libkdcraw.pc.cmake	(.../trunk/KDE/kdegraphics/libs/libkdcraw)	(revision 888947)
+--- libkdcraw.pc.cmake	(.../tags/KDE/4.1.4/kdegraphics/libs/libkdcraw)	(revision 907970)
++++ libkdcraw.pc.cmake	(.../trunk/KDE/kdegraphics/libs/libkdcraw)	(revision 907970)
 @@ -4,7 +4,7 @@
  includedir=${INCLUDE_INSTALL_DIR}
  
@@ -18016,8 +18115,8 @@
  Version: ${DCRAW_LIB_VERSION_STRING}
 Index: AUTHORS
 ===================================================================
---- AUTHORS	(.../tags/KDE/4.1.3/kdegraphics/libs/libkdcraw)	(revision 888947)
-+++ AUTHORS	(.../trunk/KDE/kdegraphics/libs/libkdcraw)	(revision 888947)
+--- AUTHORS	(.../tags/KDE/4.1.4/kdegraphics/libs/libkdcraw)	(revision 907970)
++++ AUTHORS	(.../trunk/KDE/kdegraphics/libs/libkdcraw)	(revision 907970)
 @@ -9,3 +9,7 @@
  Gerhard Kulzer       <gerhard at kulzer dot net>
  Achim Bohnet         <ach at mpe dot mpg dot de>
@@ -18029,8 +18128,8 @@
 \ No newline at end of file
 Index: TODO
 ===================================================================
---- TODO	(.../tags/KDE/4.1.3/kdegraphics/libs/libkdcraw)	(revision 888947)
-+++ TODO	(.../trunk/KDE/kdegraphics/libs/libkdcraw)	(revision 888947)
+--- TODO	(.../tags/KDE/4.1.4/kdegraphics/libs/libkdcraw)	(revision 907970)
++++ TODO	(.../trunk/KDE/kdegraphics/libs/libkdcraw)	(revision 907970)
 @@ -1,3 +1 @@
 -- Use libRaw C++ interface instead dcraw.c. (http://www.libraw.org)
 -- Remove QProcess. Use multithreading instead.
@@ -18039,8 +18138,8 @@
 +- Add DNG writting mode support using Adobe DNG sdk
 Index: libkdcraw.lsm.cmake
 ===================================================================
---- libkdcraw.lsm.cmake	(.../tags/KDE/4.1.3/kdegraphics/libs/libkdcraw)	(revision 888947)
-+++ libkdcraw.lsm.cmake	(.../trunk/KDE/kdegraphics/libs/libkdcraw)	(revision 888947)
+--- libkdcraw.lsm.cmake	(.../tags/KDE/4.1.4/kdegraphics/libs/libkdcraw)	(revision 907970)
++++ libkdcraw.lsm.cmake	(.../trunk/KDE/kdegraphics/libs/libkdcraw)	(revision 907970)
 @@ -2,8 +2,8 @@
  Title: libkdcraw
  Version: ${DCRAW_LIB_VERSION_STRING}
@@ -18054,28 +18153,38 @@
  Maintained-by:
 Index: NEWS
 ===================================================================
---- NEWS	(.../tags/KDE/4.1.3/kdegraphics/libs/libkdcraw)	(revision 888947)
-+++ NEWS	(.../trunk/KDE/kdegraphics/libs/libkdcraw)	(revision 888947)
-@@ -1,8 +1,51 @@
+--- NEWS	(.../tags/KDE/4.1.4/kdegraphics/libs/libkdcraw)	(revision 907970)
++++ NEWS	(.../trunk/KDE/kdegraphics/libs/libkdcraw)	(revision 907970)
+@@ -1,22 +1,74 @@
 -0.2.0
 +0.4.0 - Released with KDE 4.2.0
-+Updated LibRaw to 0.6.1.
-+Ported to LibRaw Api 0.6.0. Removed dcraw.c and DcrawBinary class.
-+Use kDebug(51002) instead qDebug().
-+New cameras: Canon 50D, Sony A900, Nikon D90 & P6000, Panasonic LX3 FZ28.
-+
-+0.3.0 - Released with KDE 4.1.2
  ------------------------------------------------------------------------
-+Sync with KDE3 branch 0.1.5 API changes.
-+
-+0.2.0 - Released with KDE 4.1.0
+-Port to CMake/KDE4/QT4
++- Updated to LibRaw 0.6.5 : Fixed file descriptor and buffer memory leak when thumbnail extractor is called, 
++                            but library object is not properly initialized.
++                            Fixes in Imacon files unpacking.
++                            Fixes in Hasselblad .fff files unpacking.
++- Updated to LibRaw 0.6.3 : NEF processing code changed (some overflow control added).
++- Updated to LibRaw 0.6.2.
++- New cameras: Canon G10 & 5D Mk2, Leaf AFi 7, Leica D-LUX4,              
++               Panasonic FX150 & G 1, Fujifilm IS Pro.
++- Updated to LibRaw 0.6.1.
++- New cameras: Canon 50D, Sony A900, Nikon D90 & P6000, Panasonic LX3 FZ28.
++- Ported to LibRaw Api 0.6.0. Removed dcraw.c and DcrawBinary class.
++- Use kDebug(51002) instead qDebug().
+ 
++0.3.0 - Released with KDE 4.1.2
 +------------------------------------------------------------------------
- Port to CMake/KDE4/QT4
-+Moved from extragear/libs to kdegraphics/libs
++- Sync with KDE3 branch 0.1.5 API changes.
  
++0.2.0 - Released with KDE 4.1.0
++------------------------------------------------------------------------
++- Port to CMake/KDE4/QT4
++- Moved from extragear/libs to kdegraphics/libs
++
 +0.1.5
 +------------------------------------------------------------------------
- 
++
 +- API changed: add white point settings support (dcraw -S option)
 +
 +- Updated dcraw to 8.86
@@ -18109,10 +18218,33 @@
  0.1.3
  ------------------------------------------------------------------------
  - updated dcraw to 8.81
+-  new cameras: Canon G7, Fuji FinePix S9100/S9600, Olympus SP560UZ, Panasonic DMC-L10
++- New cameras: Canon G7, Fuji FinePix S9100/S9600, Olympus SP560UZ, Panasonic DMC-L10
+ 
+-  - updated dcraw to 8.80
+-    new cameras: Hasselblad H3D, Olympus E-3, Canon EOS 40D, Canon PowerShot G9,
+-                 Canon EOS-1Ds Mark III, AVT F-080C, Nikon D3, Nikon D300,
+-                 Nikon Coolpix S6, Panasonic DMC-FZ18, Sony DSLR-A700
++- updated dcraw to 8.80
++- new cameras: Hasselblad H3D, Olympus E-3, Canon EOS 40D, Canon PowerShot G9,
++               Canon EOS-1Ds Mark III, AVT F-080C, Nikon D3, Nikon D300,
++               Nikon Coolpix S6, Panasonic DMC-FZ18, Sony DSLR-A700
+ 
+-                 -m number_of_passes
+-                 After interpolation, clean up color artifacts by repeatedly 
+-                 applying a 3x3 median filter to the R-G and B-G channels.
+-  - Licence : is GPL compatible again == less wories)
++               -m number_of_passes
++               After interpolation, clean up color artifacts by repeatedly 
++               applying a 3x3 median filter to the R-G and B-G channels.
++- dcraw.c licence : is GPL compatible again == less wories)
+ 
+ 0.1.2
+ ------------------------------------------------------------------------
 Index: CMakeLists.txt
 ===================================================================
---- CMakeLists.txt	(.../tags/KDE/4.1.3/kdegraphics/libs/libkdcraw)	(revision 888947)
-+++ CMakeLists.txt	(.../trunk/KDE/kdegraphics/libs/libkdcraw)	(revision 888947)
+--- CMakeLists.txt	(.../tags/KDE/4.1.4/kdegraphics/libs/libkdcraw)	(revision 907970)
++++ CMakeLists.txt	(.../trunk/KDE/kdegraphics/libs/libkdcraw)	(revision 907970)
 @@ -1,21 +1,25 @@
  PROJECT(libkdcraw)
  
@@ -18243,8 +18375,8 @@
 +SUBDIRS(profiles)
 Index: README
 ===================================================================
---- README	(.../tags/KDE/4.1.3/kdegraphics/libs/libkdcraw)	(revision 888947)
-+++ README	(.../trunk/KDE/kdegraphics/libs/libkdcraw)	(revision 888947)
+--- README	(.../tags/KDE/4.1.4/kdegraphics/libs/libkdcraw)	(revision 907970)
++++ README	(.../trunk/KDE/kdegraphics/libs/libkdcraw)	(revision 907970)
 @@ -1,4 +1,4 @@
 -DCRAW program interface for KDE
 +LibRaw C++ interface for KDE

kdegraphics-4.1.3-libkexiv2-0.5.0.patch:

Index: kdegraphics-4.1.3-libkexiv2-0.5.0.patch
===================================================================
RCS file: /cvs/extras/rpms/kdegraphics/F-10/kdegraphics-4.1.3-libkexiv2-0.5.0.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kdegraphics-4.1.3-libkexiv2-0.5.0.patch	25 Nov 2008 18:10:10 -0000	1.1
+++ kdegraphics-4.1.3-libkexiv2-0.5.0.patch	9 Jan 2009 00:41:29 -0000	1.2
@@ -1,7 +1,7 @@
 Index: libkexiv2/kexiv2comments.cpp
 ===================================================================
---- libkexiv2/kexiv2comments.cpp	(.../tags/KDE/4.1.3/kdegraphics/libs/libkexiv2)	(revision 888944)
-+++ libkexiv2/kexiv2comments.cpp	(.../trunk/KDE/kdegraphics/libs/libkexiv2)	(revision 888944)
+--- libkexiv2/kexiv2comments.cpp	(.../tags/KDE/4.1.4/kdegraphics/libs/libkexiv2)	(revision 907970)
++++ libkexiv2/kexiv2comments.cpp	(.../trunk/KDE/kdegraphics/libs/libkexiv2)	(revision 907970)
 @@ -10,10 +10,6 @@
   * Copyright (C) 2006-2008 by Gilles Caulier <caulier dot gilles at gmail dot com>
   * Copyright (C) 2006-2008 by Marcel Wiesweg <marcel dot wiesweg at gmx dot de>
@@ -25,8 +25,8 @@
      return false;
 Index: libkexiv2/kexiv2gps.cpp
 ===================================================================
---- libkexiv2/kexiv2gps.cpp	(.../tags/KDE/4.1.3/kdegraphics/libs/libkexiv2)	(revision 888944)
-+++ libkexiv2/kexiv2gps.cpp	(.../trunk/KDE/kdegraphics/libs/libkexiv2)	(revision 888944)
+--- libkexiv2/kexiv2gps.cpp	(.../tags/KDE/4.1.4/kdegraphics/libs/libkexiv2)	(revision 907970)
++++ libkexiv2/kexiv2gps.cpp	(.../trunk/KDE/kdegraphics/libs/libkexiv2)	(revision 907970)
 @@ -10,20 +10,16 @@
   * Copyright (C) 2006-2008 by Gilles Caulier <caulier dot gilles at gmail dot com>
   * Copyright (C) 2006-2008 by Marcel Wiesweg <marcel dot wiesweg at gmx dot de>
@@ -112,6 +112,15 @@
          {
              Exiv2::ExifKey gpsKey((*it2).toAscii().constData());
              Exiv2::ExifData::iterator it3 = d->exifMetadata.findKey(gpsKey);
+@@ -528,7 +523,7 @@
+     // To do this we: (for example)
+     //  0.12345 * 10000 = 1234.5
+     //  floor(1234.5) = 1234 - now bigger than 1 - ready...
+-    fractional = trunc(fractional * rounder);
++    fractional = round(fractional * rounder);
+ 
+     // Convert the whole thing to a fraction.
+     // Fraction is:
 @@ -630,7 +625,6 @@
      }
  }
@@ -129,8 +138,8 @@
  }  // NameSpace KExiv2Iface
 Index: libkexiv2/kexiv2private.cpp
 ===================================================================
---- libkexiv2/kexiv2private.cpp	(.../tags/KDE/4.1.3/kdegraphics/libs/libkexiv2)	(revision 888944)
-+++ libkexiv2/kexiv2private.cpp	(.../trunk/KDE/kdegraphics/libs/libkexiv2)	(revision 888944)
+--- libkexiv2/kexiv2private.cpp	(.../tags/KDE/4.1.4/kdegraphics/libs/libkexiv2)	(revision 907970)
++++ libkexiv2/kexiv2private.cpp	(.../trunk/KDE/kdegraphics/libs/libkexiv2)	(revision 907970)
 @@ -9,10 +9,6 @@
   * Copyright (C) 2006-2008 by Gilles Caulier <caulier dot gilles at gmail dot com>
   * Copyright (C) 2006-2008 by Marcel Wiesweg <marcel dot wiesweg at gmx dot de>
@@ -173,8 +182,8 @@
  QString KExiv2Priv::convertCommentValue(const Exiv2::Exifdatum &exifDatum)
 Index: libkexiv2/kexiv2exif.cpp
 ===================================================================
---- libkexiv2/kexiv2exif.cpp	(.../tags/KDE/4.1.3/kdegraphics/libs/libkexiv2)	(revision 888944)
-+++ libkexiv2/kexiv2exif.cpp	(.../trunk/KDE/kdegraphics/libs/libkexiv2)	(revision 888944)
+--- libkexiv2/kexiv2exif.cpp	(.../tags/KDE/4.1.4/kdegraphics/libs/libkexiv2)	(revision 907970)
++++ libkexiv2/kexiv2exif.cpp	(.../trunk/KDE/kdegraphics/libs/libkexiv2)	(revision 907970)
 @@ -10,20 +10,16 @@
   * Copyright (C) 2006-2008 by Gilles Caulier <caulier dot gilles at gmail dot com>
   * Copyright (C) 2006-2008 by Marcel Wiesweg <marcel dot wiesweg at gmx dot de>
@@ -226,7 +235,16 @@
  
          d->printExiv2ExceptionError("Cannot set Exif data using Exiv2 ", e);
      }
-@@ -618,11 +615,16 @@
+@@ -316,6 +313,8 @@
+             d->exifMetadata.erase(it);
+             return true;
+         }
++
++        return true;
+     }
+     catch( Exiv2::Error &e )
+     {
+@@ -618,11 +617,16 @@
                  case Exiv2::unsignedLong:
                  case Exiv2::signedShort:
                  case Exiv2::signedLong:
@@ -244,7 +262,7 @@
                          QList<QVariant> list;
                          list << (*it).toRational(component).first;
                          list << (*it).toRational(component).second;
-@@ -630,6 +632,8 @@
+@@ -630,6 +634,8 @@
                      }
                      else
                      {
@@ -253,7 +271,7 @@
                          // prefer double precision
                          double num = (*it).toRational(component).first;
                          double den = (*it).toRational(component).second;
-@@ -743,7 +747,7 @@
+@@ -743,7 +749,7 @@
                  if (it != exifData.end())
                  {
                      long orientation = it->toLong();
@@ -262,7 +280,7 @@
                      rotateExifQImage(thumbnail, (ImageOrientation)orientation);
                  }
  
-@@ -820,7 +824,7 @@
+@@ -820,7 +826,7 @@
          thumbFile.setAutoRemove(true);
          thumbFile.open();
          thumb.save(thumbFile.fileName(), "JPEG");
@@ -273,8 +291,8 @@
  #if (EXIV2_TEST_VERSION(0,17,91))
 Index: libkexiv2/kexiv2.cpp
 ===================================================================
---- libkexiv2/kexiv2.cpp	(.../tags/KDE/4.1.3/kdegraphics/libs/libkexiv2)	(revision 888944)
-+++ libkexiv2/kexiv2.cpp	(.../trunk/KDE/kdegraphics/libs/libkexiv2)	(revision 888944)
+--- libkexiv2/kexiv2.cpp	(.../tags/KDE/4.1.4/kdegraphics/libs/libkexiv2)	(revision 907970)
++++ libkexiv2/kexiv2.cpp	(.../trunk/KDE/kdegraphics/libs/libkexiv2)	(revision 907970)
 @@ -9,10 +9,6 @@
   * Copyright (C) 2006-2008 by Gilles Caulier <caulier dot gilles at gmail dot com>
   * Copyright (C) 2006-2008 by Marcel Wiesweg <marcel dot wiesweg at gmx dot de>
@@ -286,7 +304,22 @@
   * 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;
-@@ -83,6 +79,25 @@
+@@ -25,6 +21,14 @@
+  *
+  * ============================================================ */
+ 
++// C ANSI includes.
++
++extern "C"
++{
++#include <sys/stat.h>
++#include <utime.h>
++}
++
+ // Local includes.
+ 
+ #include "version.h"
+@@ -83,6 +87,25 @@
  
  //-- Statics methods ----------------------------------------------
  
@@ -312,7 +345,7 @@
  bool KExiv2::supportXmp()
  {
  #ifdef _XMP_SUPPORT_
-@@ -92,13 +107,46 @@
+@@ -92,13 +115,46 @@
  #endif // _XMP_SUPPORT_
  }
  
@@ -362,7 +395,7 @@
  }
  
  QString KExiv2::Exiv2Version()
-@@ -123,36 +171,77 @@
+@@ -123,36 +179,77 @@
  bool KExiv2::isReadOnly(const QString& filePath)
  {
      if (!canWriteComment(filePath))
@@ -447,7 +480,7 @@
          Exiv2::Image::AutoPtr image = Exiv2::ImageFactory::open((const char*)
                                        (QFile::encodeName(filePath)));
  
-@@ -199,15 +288,33 @@
+@@ -199,15 +296,33 @@
      QFileInfo dinfo(finfo.path());
      if (!finfo.isWritable())
      {
@@ -483,7 +516,7 @@
      try
      {
          Exiv2::AccessMode mode;
-@@ -235,11 +342,12 @@
+@@ -235,11 +350,12 @@
          {
              if (image->mimeType() == "image/tiff")
              {
@@ -498,7 +531,26 @@
                  untouchedTags << "Exif.Image.ImageWidth";
                  untouchedTags << "Exif.Image.ImageLength";
                  untouchedTags << "Exif.Image.BitsPerSample";
-@@ -331,6 +439,16 @@
+@@ -293,8 +409,18 @@
+ 
+ #endif // _XMP_SUPPORT_
+ 
++        // NOTE: Don't touch access and modification timestamp of file.
++        struct stat st;
++        ::stat(QFile::encodeName(filePath), &st);
++
++        struct utimbuf ut;
++        ut.modtime = st.st_mtime;
++        ut.actime  = st.st_atime;
++
+         image->writeMetadata();
+ 
++        ::utime(QFile::encodeName(filePath), &ut);
++
+         return true;
+     }
+     catch( Exiv2::Error &e )
+@@ -331,6 +457,16 @@
      return d->filePath;
  }
  
@@ -517,8 +569,8 @@
      return true;
 Index: libkexiv2/kexiv2iptc.cpp
 ===================================================================
---- libkexiv2/kexiv2iptc.cpp	(.../tags/KDE/4.1.3/kdegraphics/libs/libkexiv2)	(revision 888944)
-+++ libkexiv2/kexiv2iptc.cpp	(.../trunk/KDE/kdegraphics/libs/libkexiv2)	(revision 888944)
+--- libkexiv2/kexiv2iptc.cpp	(.../tags/KDE/4.1.4/kdegraphics/libs/libkexiv2)	(revision 907970)
++++ libkexiv2/kexiv2iptc.cpp	(.../trunk/KDE/kdegraphics/libs/libkexiv2)	(revision 907970)
 @@ -10,20 +10,16 @@
   * Copyright (C) 2006-2008 by Gilles Caulier <caulier dot gilles at gmail dot com>
   * Copyright (C) 2006-2008 by Marcel Wiesweg <marcel dot wiesweg at gmx dot de>
@@ -648,9 +700,20 @@
                  ++it;
 Index: libkexiv2/kexiv2private.h
 ===================================================================
---- libkexiv2/kexiv2private.h	(.../tags/KDE/4.1.3/kdegraphics/libs/libkexiv2)	(revision 888944)
-+++ libkexiv2/kexiv2private.h	(.../trunk/KDE/kdegraphics/libs/libkexiv2)	(revision 888944)
-@@ -41,7 +41,6 @@
+--- libkexiv2/kexiv2private.h	(.../tags/KDE/4.1.4/kdegraphics/libs/libkexiv2)	(revision 907970)
++++ libkexiv2/kexiv2private.h	(.../trunk/KDE/kdegraphics/libs/libkexiv2)	(revision 907970)
+@@ -21,6 +21,10 @@
+  *
+  * ============================================================ */
+ 
++#ifndef KEXIV2PRIVATE_H
++#define KEXIV2PRIVATE_H
++
++
+  // C++ includes.
+ 
+ #include <cstdlib>
+@@ -41,7 +45,6 @@
  #include <QMatrix>
  #include <QFileInfo>
  #include <QDataStream>
@@ -658,7 +721,7 @@
  
  // KDE includes.
  
-@@ -49,6 +48,7 @@
+@@ -49,6 +52,7 @@
  #include <kencodingdetector.h>
  #include <kstringhandler.h>
  #include <kdeversion.h>
@@ -666,7 +729,7 @@
  
  // Exiv2 includes.
  
-@@ -119,6 +119,8 @@
+@@ -119,6 +123,8 @@
  
  public:
  
@@ -675,10 +738,15 @@
      QString         filePath;
  
      std::string     imageComments;
+@@ -133,3 +139,4 @@
+ };
+ 
+ }  // NameSpace KExiv2Iface
++#endif
 Index: libkexiv2/kexiv2image.cpp
 ===================================================================
---- libkexiv2/kexiv2image.cpp	(.../tags/KDE/4.1.3/kdegraphics/libs/libkexiv2)	(revision 888944)
-+++ libkexiv2/kexiv2image.cpp	(.../trunk/KDE/kdegraphics/libs/libkexiv2)	(revision 888944)
+--- libkexiv2/kexiv2image.cpp	(.../tags/KDE/4.1.4/kdegraphics/libs/libkexiv2)	(revision 907970)
++++ libkexiv2/kexiv2image.cpp	(.../trunk/KDE/kdegraphics/libs/libkexiv2)	(revision 907970)
 @@ -10,20 +10,16 @@
   * Copyright (C) 2006-2008 by Gilles Caulier <caulier dot gilles at gmail dot com>
   * Copyright (C) 2006-2008 by Marcel Wiesweg <marcel dot wiesweg at gmx dot de>
@@ -938,8 +1006,8 @@
          data.resize(previewFile.size());
 Index: libkexiv2/CMakeLists.txt
 ===================================================================
---- libkexiv2/CMakeLists.txt	(.../tags/KDE/4.1.3/kdegraphics/libs/libkexiv2)	(revision 888944)
-+++ libkexiv2/CMakeLists.txt	(.../trunk/KDE/kdegraphics/libs/libkexiv2)	(revision 888944)
+--- libkexiv2/CMakeLists.txt	(.../tags/KDE/4.1.4/kdegraphics/libs/libkexiv2)	(revision 907970)
++++ libkexiv2/CMakeLists.txt	(.../trunk/KDE/kdegraphics/libs/libkexiv2)	(revision 907970)
 @@ -1,7 +1,9 @@
 -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${KDE4_ENABLE_EXCEPTIONS}")
  
@@ -962,9 +1030,17 @@
  TARGET_LINK_LIBRARIES( kexiv2 ${EXPAT_LIBRARIES} )
 Index: libkexiv2/kexiv2.h
 ===================================================================
---- libkexiv2/kexiv2.h	(.../tags/KDE/4.1.3/kdegraphics/libs/libkexiv2)	(revision 888944)
-+++ libkexiv2/kexiv2.h	(.../trunk/KDE/kdegraphics/libs/libkexiv2)	(revision 888944)
-@@ -118,13 +118,27 @@
+--- libkexiv2/kexiv2.h	(.../tags/KDE/4.1.4/kdegraphics/libs/libkexiv2)	(revision 907970)
++++ libkexiv2/kexiv2.h	(.../trunk/KDE/kdegraphics/libs/libkexiv2)	(revision 907970)
+@@ -14,6 +14,7 @@
+  * Iptc : http://www.iptc.org/std/IIM/4.1/specification/IIMV4.1.pdf
+  * Xmp  : http://www.adobe.com/devnet/xmp/pdfs/xmp_specification.pdf
+  *        http://www.iptc.org/std/Iptc4xmpCore/1.0/specification/Iptc4xmpCore_1.0-spec-XMPSchema_8.pdf
++ * Paper: http://www.metadataworkinggroup.com/pdf/mwg_guidance.pdf
+  *
+  * This program is free software; you can redistribute it
+  * and/or modify it under the terms of the GNU General
+@@ -118,13 +119,27 @@
      //-- STATICS methods ----------------------------------------------
      //-----------------------------------------------------------------
  
@@ -994,7 +1070,7 @@
  
      /** Return a string version of Exiv2 release in format "major.minor.patch"
       */
-@@ -135,13 +149,20 @@
+@@ -135,13 +150,20 @@
      static QString version();
  
      /** return true if metadata from file cannot be written by Exiv2.
@@ -1016,7 +1092,7 @@
      /** Load all metadata (Exif, Iptc, Xmp, and JFIF Comments) from a picture (JPEG, RAW, TIFF, PNG,
          DNG, etc...). Return true if metadata have been loaded successfully from file.
       */
-@@ -169,6 +190,16 @@
+@@ -169,6 +191,16 @@
       */
      QString getFilePath() const;
  
@@ -1033,10 +1109,37 @@
      //-------------------------------------------------------------------
      //-- Metadata IMAGE INFORMATION manipulation methods ----------------
      //-------------------------------------------------------------------
+@@ -388,7 +420,7 @@
+                            bool rationalWantSmallDenominator=true, bool setProgramName=true) const;
+ 
+     /** Remove the Exif tag 'exifTagName' from Exif metadata. Return true if tag is 
+-        removed successfully.
++        removed successfully or if no tag was present.
+      */
+     bool removeExifTag(const char *exifTagName, bool setProgramName=true) const;
+ 
+@@ -489,7 +521,7 @@
+     bool setIptcTagData(const char *iptcTagName, const QByteArray& data, bool setProgramName=true) const;
+ 
+     /** Remove the all instance of Iptc tags 'iptcTagName' from Iptc metadata. Return true if all 
+-        tags have been removed successfully.
++        tags have been removed successfully (or none were present).
+      */
+     bool removeIptcTag(const char *iptcTagName, bool setProgramName=true) const;
+ 
+@@ -723,7 +755,7 @@
+     bool registerXmpNameSpace(const QString& uri, const QString& prefix) const;
+ 
+     /** Remove the Xmp tag 'xmpTagName' from Xmp metadata. Return true if tag is 
+-        removed successfully.
++        removed successfully or if no tag was present.
+      */
+     bool removeXmpTag(const char *xmpTagName, bool setProgramName=true) const;
+ 
 Index: libkexiv2/kexiv2xmp.cpp
 ===================================================================
---- libkexiv2/kexiv2xmp.cpp	(.../tags/KDE/4.1.3/kdegraphics/libs/libkexiv2)	(revision 888944)
-+++ libkexiv2/kexiv2xmp.cpp	(.../trunk/KDE/kdegraphics/libs/libkexiv2)	(revision 888944)
+--- libkexiv2/kexiv2xmp.cpp	(.../tags/KDE/4.1.4/kdegraphics/libs/libkexiv2)	(revision 907970)
++++ libkexiv2/kexiv2xmp.cpp	(.../trunk/KDE/kdegraphics/libs/libkexiv2)	(revision 907970)
 @@ -10,20 +10,16 @@
   * Copyright (C) 2006-2008 by Gilles Caulier <caulier dot gilles at gmail dot com>
   * Copyright (C) 2006-2008 by Marcel Wiesweg <marcel dot wiesweg at gmx dot de>
@@ -1177,20 +1280,39 @@
      }
  
  #endif // _XMP_SUPPORT_
-@@ -557,10 +554,10 @@
+@@ -557,16 +554,23 @@
  
      try
      {
 -        QStringList list = seq;
-+        const QStringList list = seq;
-         Exiv2::Value::AutoPtr xmpTxtSeq = Exiv2::Value::create(Exiv2::xmpSeq);
- 
+-        Exiv2::Value::AutoPtr xmpTxtSeq = Exiv2::Value::create(Exiv2::xmpSeq);
+-
 -        for (QStringList::Iterator it = list.begin(); it != list.end(); ++it )
-+        for (QStringList::const_iterator it = list.constBegin(); it != list.constEnd(); ++it )
++        if (seq.isEmpty())
          {
-             const std::string &txt((*it).toUtf8().constData());
-             xmpTxtSeq->read(txt);
-@@ -598,7 +595,7 @@
+-            const std::string &txt((*it).toUtf8().constData());
+-            xmpTxtSeq->read(txt);
++            removeXmpTag(xmpTagName);
+         }
+-        d->xmpMetadata.add(Exiv2::XmpKey(xmpTagName), xmpTxtSeq.get());
+-        return true;
++        else
++        {
++            const QStringList list = seq;
++            Exiv2::Value::AutoPtr xmpTxtSeq = Exiv2::Value::create(Exiv2::xmpSeq);
++
++            for (QStringList::const_iterator it = list.constBegin(); it != list.constEnd(); ++it )
++            {
++                const std::string &txt((*it).toUtf8().constData());
++                xmpTxtSeq->read(txt);
++            }
++            d->xmpMetadata[xmpTagName].setValue(xmpTxtSeq.get());
++            return true;
++        }
+     }
+     catch( Exiv2::Error &e )
+     {
+@@ -598,7 +602,7 @@
                      std::ostringstream os;
                      os << it->toString(i);
                      QString bagValue = QString::fromUtf8(os.str().c_str());
@@ -1199,7 +1321,7 @@
                      if (escapeCR)
                          bagValue.replace("\n", " ");
  
-@@ -612,7 +609,7 @@
+@@ -612,7 +616,7 @@
      catch( Exiv2::Error &e )
      {
          d->printExiv2ExceptionError(QString("Cannot find Xmp key '%1' into image using Exiv2 ")
@@ -1208,16 +1330,39 @@
      }
  
  #endif // _XMP_SUPPORT_
-@@ -633,7 +630,7 @@
-         QStringList list = bag;
-         Exiv2::Value::AutoPtr xmpTxtBag = Exiv2::Value::create(Exiv2::xmpBag);
+@@ -630,16 +634,23 @@
  
+     try
+     {
+-        QStringList list = bag;
+-        Exiv2::Value::AutoPtr xmpTxtBag = Exiv2::Value::create(Exiv2::xmpBag);
+-
 -        for (QStringList::Iterator it = list.begin(); it != list.end(); ++it )
-+        for (QStringList::const_iterator it = list.constBegin(); it != list.constEnd(); ++it )
++        if (bag.isEmpty())
          {
-             const std::string &txt((*it).toUtf8().constData());
-             xmpTxtBag->read(txt);
-@@ -748,7 +745,7 @@
+-            const std::string &txt((*it).toUtf8().constData());
+-            xmpTxtBag->read(txt);
++            removeXmpTag(xmpTagName);
+         }
+-        d->xmpMetadata.add(Exiv2::XmpKey(xmpTagName), xmpTxtBag.get());
+-        return true;
++        else
++        {
++            QStringList list = bag;
++            Exiv2::Value::AutoPtr xmpTxtBag = Exiv2::Value::create(Exiv2::xmpBag);
++
++            for (QStringList::const_iterator it = list.constBegin(); it != list.constEnd(); ++it )
++            {
++                const std::string &txt((*it).toUtf8().constData());
++                xmpTxtBag->read(txt);
++            }
++            d->xmpMetadata[xmpTagName].setValue(xmpTxtBag.get());
++            return true;
++        }
+     }
+     catch( Exiv2::Error &e )
+     {
+@@ -748,7 +759,7 @@
      catch( Exiv2::Error &e )
      {
          d->printExiv2ExceptionError(QString("Cannot find Xmp key '%1' into image using Exiv2 ")
@@ -1226,7 +1371,13 @@
      }
  
  #endif // _XMP_SUPPORT_
-@@ -797,7 +794,7 @@
+@@ -793,11 +804,13 @@
+             d->xmpMetadata.erase(it);
+             return true;
+         }
++
++        return true;
+     }
      catch( Exiv2::Error &e )
      {
          d->printExiv2ExceptionError("Cannot remove Xmp tag using Exiv2 ", e);
@@ -1235,19 +1386,28 @@
  
  #endif // _XMP_SUPPORT_
  
-@@ -818,9 +815,9 @@
+@@ -818,16 +831,16 @@
  
      QStringList oldkeys = getXmpKeywords();
      QStringList newkeys = newKeywords;
 -    
-+
-     // Create a list of keywords including old one witch already exists.
+-    // Create a list of keywords including old one witch already exists.
 -    for (QStringList::Iterator it = oldkeys.begin(); it != oldkeys.end(); ++it )
++
++    // Create a list of keywords including old one which already exists.
 +    for (QStringList::const_iterator it = oldkeys.constBegin(); it != oldkeys.constEnd(); ++it )
      {
          if (!newkeys.contains(*it))
              newkeys.append(*it);
-@@ -846,11 +843,11 @@
+     }
+ 
+     if (setXmpTagStringBag("Xmp.dc.subject", newkeys, false))
+-        return false;
++        return true;
+ 
+ #endif // _XMP_SUPPORT_
+ 
+@@ -846,18 +859,18 @@
      if (!setProgramId(setProgramName))
          return false;
  
@@ -1255,29 +1415,47 @@
 +    const QStringList oldSubCat = getXmpSubCategories();
      QStringList newSubCat = newSubCategories;
 -    
-+
-     // Create a list of sub-categories including old one witch already exists.
+-    // Create a list of sub-categories including old one witch already exists.
 -    for (QStringList::Iterator it = oldSubCat.begin(); it != oldSubCat.end(); ++it )
++
++    // Create a list of sub-categories including old one which already exists.
 +    for (QStringList::const_iterator it = oldSubCat.constBegin(); it != oldSubCat.constEnd(); ++it )
      {
          if (!newSubCat.contains(*it))
              newSubCat.append(*it);
-@@ -878,9 +875,9 @@
+     }
+ 
+     if (setXmpTagStringBag("Xmp.photoshop.SupplementalCategories", newSubCat, false))
+-        return false;
++        return true;
+ 
+ #endif // _XMP_SUPPORT_
+ 
+@@ -878,16 +891,16 @@
  
      QStringList oldSubjectCodes = getXmpSubjects();
      QStringList newSubjectCodes = newSubjects;
 -    
-+
-     // Create a list of sub-categories including old one witch already exists.
+-    // Create a list of sub-categories including old one witch already exists.
 -    for (QStringList::Iterator it = oldSubjectCodes.begin(); it != oldSubjectCodes.end(); ++it )
++
++    // Create a list of sub-categories including old one which already exists.
 +    for (QStringList::const_iterator it = oldSubjectCodes.constBegin(); it != oldSubjectCodes.constEnd(); ++it )
      {
          if (!newSubjectCodes.contains(*it))
              newSubjectCodes.append(*it);
+     }
+ 
+     if (setXmpTagStringBag("Xmp.iptc.SubjectCode", newSubjectCodes, false))
+-        return false;
++        return true;
+ 
+ #endif // _XMP_SUPPORT_
+ 
 Index: TODO
 ===================================================================
---- TODO	(.../tags/KDE/4.1.3/kdegraphics/libs/libkexiv2)	(revision 888944)
-+++ TODO	(.../trunk/KDE/kdegraphics/libs/libkexiv2)	(revision 888944)
+--- TODO	(.../tags/KDE/4.1.4/kdegraphics/libs/libkexiv2)	(revision 907970)
++++ TODO	(.../trunk/KDE/kdegraphics/libs/libkexiv2)	(revision 907970)
 @@ -1,3 +1,3 @@
  - Extract GPS info from XMP tags.
 -- Exif/Iptc => Xmp synchrosization.
@@ -1285,8 +1463,8 @@
  - Xmp side-car file support.
 Index: NEWS
 ===================================================================
---- NEWS	(.../tags/KDE/4.1.3/kdegraphics/libs/libkexiv2)	(revision 888944)
-+++ NEWS	(.../trunk/KDE/kdegraphics/libs/libkexiv2)	(revision 888944)
+--- NEWS	(.../tags/KDE/4.1.4/kdegraphics/libs/libkexiv2)	(revision 907970)
++++ NEWS	(.../trunk/KDE/kdegraphics/libs/libkexiv2)	(revision 907970)
 @@ -1,9 +1,27 @@
 -0.2.0
 +0.4.0 - 
@@ -1318,9 +1496,9 @@
  001 ==> 146864: Lesser XMP support in digiKam.
 Index: CMakeLists.txt
 ===================================================================
---- CMakeLists.txt	(.../tags/KDE/4.1.3/kdegraphics/libs/libkexiv2)	(revision 888944)
-+++ CMakeLists.txt	(.../trunk/KDE/kdegraphics/libs/libkexiv2)	(revision 888944)
-@@ -15,11 +15,14 @@
+--- CMakeLists.txt	(.../tags/KDE/4.1.4/kdegraphics/libs/libkexiv2)	(revision 907970)
++++ CMakeLists.txt	(.../trunk/KDE/kdegraphics/libs/libkexiv2)	(revision 907970)
+@@ -15,11 +15,15 @@
  # 0.1.7 => 4.0.1
  # 0.1.8 => 5.0.0
  # ... here we can have new releases from KDE3 branch
@@ -1329,15 +1507,16 @@
 +# 0.3.0 => 7.0.0     (released with KDE 4.1.2)
 +# 0.4.0 => 7.1.0
 +# 0.5.0 => 7.2.0     (Released with KDE 4.2.0)
++# 0.6.0 => 7.3.0     (Released with KDE 4.3.0)
  
  # Library API version
  SET(KEXIV2_LIB_MAJOR_VERSION "0")
 -SET(KEXIV2_LIB_MINOR_VERSION "2")
-+SET(KEXIV2_LIB_MINOR_VERSION "5")
++SET(KEXIV2_LIB_MINOR_VERSION "6")
  SET(KEXIV2_LIB_PATCH_VERSION "0")
  
  # Suffix to add at end of version string. Usual values are:
-@@ -29,12 +32,12 @@
+@@ -29,12 +33,12 @@
  # "-beta3" : beta3 release.
  # "-rc"    : release candidate.
  # ""       : final relase. Can be used in production.
@@ -1349,11 +1528,11 @@
 -SET(KEXIV2_LIB_SO_CUR_VERSION "6")
 -SET(KEXIV2_LIB_SO_REV_VERSION "0")
 +SET(KEXIV2_LIB_SO_CUR_VERSION "7")
-+SET(KEXIV2_LIB_SO_REV_VERSION "2")
++SET(KEXIV2_LIB_SO_REV_VERSION "3")
  SET(KEXIV2_LIB_SO_AGE_VERSION "0")
  
  # =======================================================
-@@ -47,7 +50,6 @@
+@@ -47,7 +51,6 @@
  
  # =======================================================
  
@@ -1363,8 +1542,8 @@
  
 Index: README
 ===================================================================
---- README	(.../tags/KDE/4.1.3/kdegraphics/libs/libkexiv2)	(revision 888944)
-+++ README	(.../trunk/KDE/kdegraphics/libs/libkexiv2)	(revision 888944)
+--- README	(.../tags/KDE/4.1.4/kdegraphics/libs/libkexiv2)	(revision 907970)
++++ README	(.../trunk/KDE/kdegraphics/libs/libkexiv2)	(revision 907970)
 @@ -9,18 +9,20 @@
  -- ABOUT --------------------------------------------------------------
  

kdegraphics-4.1.3-libkipi-0.3.0.patch:

Index: kdegraphics-4.1.3-libkipi-0.3.0.patch
===================================================================
RCS file: /cvs/extras/rpms/kdegraphics/F-10/kdegraphics-4.1.3-libkipi-0.3.0.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kdegraphics-4.1.3-libkipi-0.3.0.patch	22 Dec 2008 19:44:52 -0000	1.1
+++ kdegraphics-4.1.3-libkipi-0.3.0.patch	9 Jan 2009 00:41:29 -0000	1.2
@@ -1,7 +1,7 @@
 Index: kipiplugin.desktop
 ===================================================================
---- kipiplugin.desktop	(.../tags/KDE/4.1.3/kdegraphics/libs/libkipi)	(revision 900398)
-+++ kipiplugin.desktop	(.../trunk/KDE/kdegraphics/libs/libkipi)	(revision 900398)
+--- kipiplugin.desktop	(.../tags/KDE/4.1.4/kdegraphics/libs/libkipi)	(revision 907970)
++++ kipiplugin.desktop	(.../trunk/KDE/kdegraphics/libs/libkipi)	(revision 907970)
 @@ -3,18 +3,21 @@
  X-KDE-ServiceType=KIPI/Plugin
  X-KDE-DerivedName=KIPI Plugin
@@ -24,7 +24,7 @@
  Comment[ca]=Un connector KIPI
  Comment[cs]=KIPI modul
  Comment[da]=Et KIPI-plugin
-@@ -25,19 +28,20 @@
+@@ -25,13 +28,12 @@
  Comment[fr]=Un module externe pour KIPI
  Comment[ga]=Breise??n KIPI
  Comment[gl]=Unha extension de KIPI
@@ -39,7 +39,7 @@
  Comment[lv]=KIPI spraudnis
  Comment[nds]=En KIPI-Moduul
  Comment[nl]=Een KIPI-plugin
-+Comment[nn]=Eit programtillegg til KIPI
+@@ -39,6 +41,7 @@
  Comment[pl]=Wtyczka KIPI
  Comment[pt]=Um 'Plugin' do KIPI
  Comment[pt_BR]=Um Plug-in do KIPI
@@ -49,8 +49,8 @@
  Comment[sv]=Ett KIPI-insticksprogram
 Index: libkipi/interface.cpp
 ===================================================================
---- libkipi/interface.cpp	(.../tags/KDE/4.1.3/kdegraphics/libs/libkipi)	(revision 900398)
-+++ libkipi/interface.cpp	(.../trunk/KDE/kdegraphics/libs/libkipi)	(revision 900398)
+--- libkipi/interface.cpp	(.../tags/KDE/4.1.4/kdegraphics/libs/libkipi)	(revision 907970)
++++ libkipi/interface.cpp	(.../trunk/KDE/kdegraphics/libs/libkipi)	(revision 907970)
 @@ -4,7 +4,7 @@
   * http://www.kipi-plugins.org
   *
@@ -319,8 +319,8 @@
  } // namespace KIPI
 Index: libkipi/interface.h
 ===================================================================
---- libkipi/interface.h	(.../tags/KDE/4.1.3/kdegraphics/libs/libkipi)	(revision 900398)
-+++ libkipi/interface.h	(.../trunk/KDE/kdegraphics/libs/libkipi)	(revision 900398)
+--- libkipi/interface.h	(.../tags/KDE/4.1.4/kdegraphics/libs/libkipi)	(revision 907970)
++++ libkipi/interface.h	(.../trunk/KDE/kdegraphics/libs/libkipi)	(revision 907970)
 @@ -15,12 +15,12 @@
   * and/or modify it under the terms of the GNU General
   * Public License as published by the Free Software Foundation;
@@ -551,8 +551,8 @@
  }  // namespace KIPI
 Index: libkipi/imagecollectionshared.cpp
 ===================================================================
---- libkipi/imagecollectionshared.cpp	(.../tags/KDE/4.1.3/kdegraphics/libs/libkipi)	(revision 900398)
-+++ libkipi/imagecollectionshared.cpp	(.../trunk/KDE/kdegraphics/libs/libkipi)	(revision 900398)
+--- libkipi/imagecollectionshared.cpp	(.../tags/KDE/4.1.4/kdegraphics/libs/libkipi)	(revision 907970)
++++ libkipi/imagecollectionshared.cpp	(.../trunk/KDE/kdegraphics/libs/libkipi)	(revision 907970)
 @@ -15,12 +15,12 @@
   * and/or modify it under the terms of the GNU General
   * Public License as published by the Free Software Foundation;
@@ -579,8 +579,8 @@
  }
 Index: libkipi/pluginloader.cpp
 ===================================================================
---- libkipi/pluginloader.cpp	(.../tags/KDE/4.1.3/kdegraphics/libs/libkipi)	(revision 900398)
-+++ libkipi/pluginloader.cpp	(.../trunk/KDE/kdegraphics/libs/libkipi)	(revision 900398)
+--- libkipi/pluginloader.cpp	(.../tags/KDE/4.1.4/kdegraphics/libs/libkipi)	(revision 907970)
++++ libkipi/pluginloader.cpp	(.../trunk/KDE/kdegraphics/libs/libkipi)	(revision 907970)
 @@ -228,7 +228,7 @@
          }
  
@@ -603,8 +603,8 @@
          lay->addWidget( cb );
 Index: ChangeLog
 ===================================================================
---- ChangeLog	(.../tags/KDE/4.1.3/kdegraphics/libs/libkipi)	(revision 900398)
-+++ ChangeLog	(.../trunk/KDE/kdegraphics/libs/libkipi)	(revision 900398)
+--- ChangeLog	(.../tags/KDE/4.1.4/kdegraphics/libs/libkipi)	(revision 907970)
++++ ChangeLog	(.../trunk/KDE/kdegraphics/libs/libkipi)	(revision 907970)
 @@ -242,7 +242,7 @@
  	  trunk/extragear/libs/libkipi/libkipi/plugin.h,
  	  trunk/extragear/libs/libkipi/libkipi/pluginloader.cpp: Made some
@@ -616,8 +616,8 @@
  
 Index: NEWS
 ===================================================================
---- NEWS	(.../tags/KDE/4.1.3/kdegraphics/libs/libkipi)	(revision 900398)
-+++ NEWS	(.../trunk/KDE/kdegraphics/libs/libkipi)	(revision 900398)
+--- NEWS	(.../tags/KDE/4.1.4/kdegraphics/libs/libkipi)	(revision 907970)
++++ NEWS	(.../trunk/KDE/kdegraphics/libs/libkipi)	(revision 907970)
 @@ -1,15 +1,21 @@
 -0.2.0
 +0.3.0 - Released with KDE 4.2.0
@@ -710,8 +710,8 @@
  For details and info about previous versions, see ChangeLog.
 Index: CMakeLists.txt
 ===================================================================
---- CMakeLists.txt	(.../tags/KDE/4.1.3/kdegraphics/libs/libkipi)	(revision 900398)
-+++ CMakeLists.txt	(.../trunk/KDE/kdegraphics/libs/libkipi)	(revision 900398)
+--- CMakeLists.txt	(.../tags/KDE/4.1.4/kdegraphics/libs/libkipi)	(revision 907970)
++++ CMakeLists.txt	(.../trunk/KDE/kdegraphics/libs/libkipi)	(revision 907970)
 @@ -13,11 +13,12 @@
  # 0.1.5 => 1.1.1
  # 0.1.6 => 2.0.0
@@ -743,8 +743,8 @@
  
 Index: README
 ===================================================================
---- README	(.../tags/KDE/4.1.3/kdegraphics/libs/libkipi)	(revision 900398)
-+++ README	(.../trunk/KDE/kdegraphics/libs/libkipi)	(revision 900398)
+--- README	(.../tags/KDE/4.1.4/kdegraphics/libs/libkipi)	(revision 907970)
++++ README	(.../trunk/KDE/kdegraphics/libs/libkipi)	(revision 907970)
 @@ -52,7 +52,7 @@
  
  IMPORTANT : the bugreports and wishlist are hosted by the KDE bugs report 


Index: kdegraphics.spec
===================================================================
RCS file: /cvs/extras/rpms/kdegraphics/F-10/kdegraphics.spec,v
retrieving revision 1.181
retrieving revision 1.182
diff -u -r1.181 -r1.182
--- kdegraphics.spec	8 Jan 2009 05:50:23 -0000	1.181
+++ kdegraphics.spec	9 Jan 2009 00:41:29 -0000	1.182
@@ -7,8 +7,8 @@
 
 Summary:        K Desktop Environment - Graphics Applications
 Epoch:          7
-Version:        4.1.3
-Release:        6%{?dist}
+Version:        4.1.4
+Release:        1%{?dist}
 
 Name:           kdegraphics
 #Obsoletes:     kdegraphics4 < %{version}-%{release}
@@ -226,6 +226,9 @@
 
 
 %changelog
+* Fri Jan  9 2009 Luk???? Tinkl <ltinkl at redhat.com> 4.1.4-1
+- KDE 4.1.4
+
 * Thu Jan 08 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.3-6
 - BR ebook-tools-devel
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdegraphics/F-10/sources,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- sources	11 Nov 2008 23:58:16 -0000	1.59
+++ sources	9 Jan 2009 00:41:29 -0000	1.60
@@ -1 +1 @@
-62513c5d92fae359705266eb2365c526  kdegraphics-4.1.3.tar.bz2
+c2a67098d9df60e839d2af6b866989ef  kdegraphics-4.1.4.tar.bz2



From ltinkl at fedoraproject.org  Fri Jan  9 00:42:00 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Fri,  9 Jan 2009 00:42:00 +0000 (UTC)
Subject: rpms/kdegraphics/F-9 kdegraphics-4.1.3-libkdcraw-0.4.0.patch, NONE, 
	1.1 kdegraphics-4.1.3-libkexiv2-0.5.0.patch, NONE,
	1.1 kdegraphics-4.1.3-libkipi-0.3.0.patch, NONE, 1.1 .cvsignore,
	1.46, 1.47 kdegraphics.spec, 1.160, 1.161 sources, 1.52,
	1.53 kdegraphics-4.1.2-libkdcraw-0.4.0.patch, 1.1,
	NONE kdegraphics-4.1.2-libkexiv2-0.4.0.patch, 1.1, NONE
Message-ID: <20090109004200.654647011C@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kdegraphics/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22792/F-9

Modified Files:
	.cvsignore kdegraphics.spec sources 
Added Files:
	kdegraphics-4.1.3-libkdcraw-0.4.0.patch 
	kdegraphics-4.1.3-libkexiv2-0.5.0.patch 
	kdegraphics-4.1.3-libkipi-0.3.0.patch 
Removed Files:
	kdegraphics-4.1.2-libkdcraw-0.4.0.patch 
	kdegraphics-4.1.2-libkexiv2-0.4.0.patch 
Log Message:
KDE 4.1.4


kdegraphics-4.1.3-libkdcraw-0.4.0.patch:

--- NEW FILE kdegraphics-4.1.3-libkdcraw-0.4.0.patch ---
Index: test/raw2png.cpp
===================================================================
--- test/raw2png.cpp	(.../tags/KDE/4.1.4/kdegraphics/libs/libkdcraw)	(revision 0)
+++ test/raw2png.cpp	(.../trunk/KDE/kdegraphics/libs/libkdcraw)	(revision 907970)
@@ -0,0 +1,123 @@
+/* ============================================================
+ *
+ * This file is a part of kipi-plugins project
+ * http://www.kipi-plugins.org
+ *
+ * Date        : 2008-15-09
+ * Description : a command line tool to convert RAW file to PNG
+ *
+ * Copyright (C) 2008 by Gilles Caulier <caulier dot gilles at gmail dot com> 
+ *
+ * This program is free software; you can redistribute it
+ * and/or modify it under the terms of the GNU General
+ * Public License as published by the Free Software Foundation;
+ * either version 2, 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.
+ *
+ * ============================================================ */
+
+// Qt includes.
+
+#include <qstring.h>
+#include <qfile.h>
+#include <qfileinfo.h>
+
+// KDE includes.
+
+#include "kdeversion.h"
+
+#if KDE_IS_VERSION(4,0,0)
+#include "qdebug.h"
+#define PRINT_DEBUG qDebug()
+#define ENDL
+#else
+#include "kdebug.h"
+#define PRINT_DEBUG kdDebug()
+#define ENDL << endl
+#endif
+
+// Local includes.
+
+#include "kdcraw.h"
+
+using namespace KDcrawIface;
+
+int main (int argc, char **argv)
+{
+    if(argc != 2) 
+    {
+        PRINT_DEBUG << "raw2png - RAW Camera Image to PNG Converter" ENDL;
+        PRINT_DEBUG << "Usage: <rawfile>" ENDL;
+        return -1;
+    }
+
+    QString            filePath(argv[1]);
+    QFileInfo          input(filePath);
+    QString            previewFilePath(input.baseName() + QString(".preview.png"));
+    QFileInfo          previewOutput(previewFilePath);
+    QString            halfFilePath(input.baseName() + QString(".half.png"));
+    QFileInfo          halfOutput(halfFilePath);
+    QImage             image;
+    DcrawInfoContainer identify;
+
+    // -----------------------------------------------------------
+
+    PRINT_DEBUG << "raw2png: Identify RAW image from " << input.fileName() ENDL;
+
+    KDcraw rawProcessor;
+    if (!rawProcessor.rawFileIdentify(identify, filePath))
+    {
+        PRINT_DEBUG << "raw2png: Idendify RAW image failed. Aborted..." ENDL;
+        return -1;
+    }
+
+    int width  = identify.imageSize.width();
+    int height = identify.imageSize.height();
+
+    PRINT_DEBUG << "raw2png: Raw image info:" ENDL;
+    PRINT_DEBUG << "--- Date:      " << identify.dateTime.toString(Qt::ISODate) ENDL;
+    PRINT_DEBUG << "--- Make:      " << identify.make ENDL;
+    PRINT_DEBUG << "--- Model:     " << identify.model ENDL;
+    PRINT_DEBUG << "--- Size:      " << width << "x" << height ENDL;
+    PRINT_DEBUG << "--- Filter:    " << identify.filterPattern ENDL;
+    PRINT_DEBUG << "--- Colors:    " << identify.rawColors ENDL;
+
+    // -----------------------------------------------------------
+
+    PRINT_DEBUG << "raw2png: Loading RAW image preview" ENDL;
+
+    if (!rawProcessor.loadDcrawPreview(image, filePath))
+    {
+        PRINT_DEBUG << "raw2png: Loading RAW image preview failed. Aborted..." ENDL;
+        return -1;
+    }
+
+    PRINT_DEBUG << "raw2png: Saving preview image to "
+                << previewOutput.fileName() << " size ("
+                << image.width() << "x" << image.height()
+                << ")" ENDL;
+    image.save(previewFilePath, "PNG");
+
+    // -----------------------------------------------------------
+
+    PRINT_DEBUG << "raw2png: Loading half RAW image" ENDL;
+
+    image = QImage();
+    if (!rawProcessor.loadHalfPreview(image, filePath))
+    {
+        PRINT_DEBUG << "raw2png: Loading half RAW image failed. Aborted..." ENDL;
+        return -1;
+    }
+
+    PRINT_DEBUG << "raw2png: Saving half image to "
+                << halfOutput.fileName() << " size ("
+                << image.width() << "x" << image.height()
+                << ")" ENDL;
+    image.save(halfFilePath, "PNG");
+
+    return 0;
+}

Property changes on: test/raw2png.cpp
___________________________________________________________________
Added: svn:eol-style
   + native

Index: test/CMakeLists.txt
===================================================================
--- test/CMakeLists.txt	(.../tags/KDE/4.1.4/kdegraphics/libs/libkdcraw)	(revision 0)
+++ test/CMakeLists.txt	(.../trunk/KDE/kdegraphics/libs/libkdcraw)	(revision 907970)
@@ -0,0 +1,44 @@
+KDE4_NO_ENABLE_FINAL(kdcraw)
+INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../libkdcraw)
+
+# add a small macro so that this is a bit cleaner
+MACRO(libkdcraw_build_test)
+    SET(_target ${ARGV0})
+    SET(${_target}_SRCS 
+        ../libraw/samples/${_target}.cpp
+        ${libraw_LIB_SRCS}
+       )
+    
+    # Disable dcraw C Ansi code warnings from LibRaw. Just to be clear on the console.
+    FOREACH(_curentfile ${${_target}_SRCS})
+	SET_SOURCE_FILES_PROPERTIES(${_curentfile} PROPERTIES COMPILE_FLAGS -w)
+    ENDFOREACH(_curentfile ${${_target}_SRCS})
+
+    KDE4_ADD_EXECUTABLE(${_target} NOGUI ${${_target}_SRCS})
+    TARGET_LINK_LIBRARIES(${_target} 
+                          ${MATH_LIBRARY} 
+                          ${LCMS_LIBRARIES} 
+                          ${JPEG_LIBRARY} 
+                          ${OPENMP_LDFLAGS} 
+                          ${CMAKE_THREAD_LIBS_INIT}
+                         )
+    SET_TARGET_PROPERTIES(${_target} PROPERTIES COMPILE_FLAGS -DLIBRAW_BUILDLIB)
+    IF(WIN32)
+        TARGET_LINK_LIBRARIES(${_target} ws2_32)
+    ENDIF(WIN32)
+ENDMACRO(libkdcraw_build_test)
+
+SET(raw2png_SRCS raw2png.cpp)
+KDE4_ADD_EXECUTABLE(raw2png NOGUI ${raw2png_SRCS})
+TARGET_LINK_LIBRARIES(raw2png kdcraw ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY})
+
+LIBKDCRAW_BUILD_TEST(identify)
+LIBKDCRAW_BUILD_TEST(simple_dcraw)
+LIBKDCRAW_BUILD_TEST(mem_image)
+LIBKDCRAW_BUILD_TEST(dcraw_emu)
+LIBKDCRAW_BUILD_TEST(dcraw_half)
+#IF(WIN32)
+#    LIBKDCRAW_BUILD_TEST(half_mt_win32)
+#ELSE(WIN32)
+#    LIBKDCRAW_BUILD_TEST(half_mt)
+#ENDIF(WIN32)

Property changes on: test/CMakeLists.txt
___________________________________________________________________
Added: svn:eol-style
   + native

Index: libraw/libraw/libraw_alloc.h
===================================================================
--- libraw/libraw/libraw_alloc.h	(.../tags/KDE/4.1.4/kdegraphics/libs/libkdcraw)	(revision 0)
+++ libraw/libraw/libraw_alloc.h	(.../trunk/KDE/kdegraphics/libs/libkdcraw)	(revision 907970)
@@ -0,0 +1,98 @@
+/* -*- C++ -*-
+ * File: libraw_alloc.h
+ * Copyright 2008 Alex Tutubalin <lexa at lexa.ru>
+ * Created: Sat Mar  22, 2008 
+ *
[...18031 lines suppressed...]
+               Nikon Coolpix S6, Panasonic DMC-FZ18, Sony DSLR-A700
 
-                 -m number_of_passes
-                 After interpolation, clean up color artifacts by repeatedly 
-                 applying a 3x3 median filter to the R-G and B-G channels.
-  - Licence : is GPL compatible again == less wories)
+               -m number_of_passes
+               After interpolation, clean up color artifacts by repeatedly 
+               applying a 3x3 median filter to the R-G and B-G channels.
+- dcraw.c licence : is GPL compatible again == less wories)
 
 0.1.2
 ------------------------------------------------------------------------
Index: CMakeLists.txt
===================================================================
--- CMakeLists.txt	(.../tags/KDE/4.1.4/kdegraphics/libs/libkdcraw)	(revision 907970)
+++ CMakeLists.txt	(.../trunk/KDE/kdegraphics/libs/libkdcraw)	(revision 907970)
@@ -1,21 +1,25 @@
 PROJECT(libkdcraw)
 
+OPTION(ENABLE_OPENMP "Build with OpenMP support to use LibRaw parallel demosaicing operation" OFF)
+
 # =======================================================
 # Informations to update before to release this library.
 
 # Library version history:
-# API      ABI      
-# 0.1.0 => 0.1.0    
-# 0.1.1 => 1.0.0
-# 0.1.2 => 2.0.0
-# 0.1.3.=> 2.1.0
-# 0.1.4 => 3.0.0
-# ... here we can have new releases from KDE3 branch
-# 0.2.0 => 5.0.0
+# API      ABI
+# 0.1.0 => 0.1.0  (KDE3)
+# 0.1.1 => 1.0.0  (KDE3)
+# 0.1.2 => 2.0.0  (KDE3)
+# 0.1.3 => 2.1.0  (KDE3)
+# 0.1.4 => 3.0.0  (KDE3)
+# 0.1.5 => 4.0.0  (KDE3)
+# 0.2.0 => 5.0.0  (released with KDE 4.1.0)
+# 0.3.0 => 6.0.0  (released with KDE 4.1.2)
+# 0.4.0 => 7.0.0  (using libRaw-Released with KDE 4.2.0)
 
 # Library API version
 SET(DCRAW_LIB_MAJOR_VERSION "0")
-SET(DCRAW_LIB_MINOR_VERSION "2")
+SET(DCRAW_LIB_MINOR_VERSION "4")
 SET(DCRAW_LIB_PATCH_VERSION "0")
 
 # Suffix to add at end of version string. Usual values are:
@@ -25,44 +29,75 @@
 # "-beta3" : beta3 release.
 # "-rc"    : release candidate.
 # ""       : final relase. Can be used in production.
-SET(DCRAW_LIB_SUFFIX_VERSION "-svn")
+SET(DCRAW_LIB_SUFFIX_VERSION "")
 
 # Library ABI version used by linker.
 # For details : http://www.gnu.org/software/libtool/manual.html#Updating-version-info
-SET(DCRAW_LIB_SO_CUR_VERSION "5")
+SET(DCRAW_LIB_SO_CUR_VERSION "7")
 SET(DCRAW_LIB_SO_REV_VERSION "0")
 SET(DCRAW_LIB_SO_AGE_VERSION "0")
 
-# dcraw.c version include with this library. 
-# Look into dcraw/dcraw.c implementation for details.
-SET(DCRAW_PROGRAM_VERSION "8.86")
-
 # =======================================================
 # Set env. variables accordinly.
 
-SET(DCRAW_PROGRAM_DIR "${LIB_INSTALL_DIR}/libkdcraw${DCRAW_LIB_SO_CUR_VERSION}")
-
 SET(DCRAW_LIB_VERSION_STRING "${DCRAW_LIB_MAJOR_VERSION}.${DCRAW_LIB_MINOR_VERSION}.${DCRAW_LIB_PATCH_VERSION}${DCRAW_LIB_SUFFIX_VERSION}")
 SET(DCRAW_LIB_VERSION_ID "0x0${DCRAW_LIB_MAJOR_VERSION}0${DCRAW_LIB_MINOR_VERSION}0${DCRAW_LIB_PATCH_VERSION}")
 
 SET(DCRAW_LIB_SO_VERSION_STRING "${DCRAW_LIB_SO_CUR_VERSION}.${DCRAW_LIB_SO_REV_VERSION}.${DCRAW_LIB_SO_AGE_VERSION}")
 
 # =======================================================
+# LibRAW source code
 
-# Depencies detection require to compile dcraw.c
-# Detect Little CMS library properlly with CMake script from 'cmake/modules'
-FIND_PACKAGE(LCMS REQUIRED)
+IF( NOT WIN32)
+    FIND_LIBRARY(MATH_LIBRARY m)
+ENDIF( NOT WIN32 )
 
-# Detect libJPEG
-FIND_PACKAGE(JPEG REQUIRED)
+find_package(LCMS REQUIRED)
 
-SUBDIRS(icons)
-SUBDIRS(libkdcraw)
-SUBDIRS(dcraw)
-SUBDIRS(profiles)
+# Flag to compile Little CMS code from LibRaw
+ADD_DEFINITIONS(-DUSE_LCMS)
 
+# Flag to debug LibRaw
+ADD_DEFINITIONS(-DDCRAW_VERBOSE)
+
+# LibRaw use C++ exception.
+ADD_DEFINITIONS(${KDE4_ENABLE_EXCEPTIONS})
+
+# OpenMP support to use parallelized code.
+IF(ENABLE_OPENMP)
+    ADD_DEFINITIONS(-fopenmp)
+    SET(OPENMP_LDFLAGS -lgomp)
+ENDIF(ENABLE_OPENMP)
+
+# Under Windows, use specific flag to compile.
+IF( WIN32 )
+    ADD_DEFINITIONS( -DDJGPP )
+ENDIF( WIN32 )
+
+INCLUDE_DIRECTORIES(
+                    ${JPEG_INCLUDE_DIR}
+                    ${LCMS_INCLUDE_DIR}
+                    ${CMAKE_CURRENT_SOURCE_DIR}/libraw
+                   )
+
+# Do not compile LibRaw with KDE FINAL mode.
+KDE4_NO_ENABLE_FINAL(libraw)
+
+SET(libraw_LIB_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/libraw/internal/dcraw_common.cpp
+                    ${CMAKE_CURRENT_SOURCE_DIR}/libraw/internal/foveon.cpp
+                    ${CMAKE_CURRENT_SOURCE_DIR}/libraw/src/libraw_cxx.cpp
+                    ${CMAKE_CURRENT_SOURCE_DIR}/libraw/src/libraw_c_api.cpp
+   )
+
+# =======================================================
+
 IF(NOT WIN32)
   CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/libkdcraw.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/libkdcraw.pc)
   CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/libkdcraw.lsm.cmake ${CMAKE_CURRENT_BINARY_DIR}/libkdcraw.lsm)
   INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/libkdcraw.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)
 ENDIF(NOT WIN32)
+
+SUBDIRS(icons)
+SUBDIRS(libkdcraw)
+SUBDIRS(test)
+SUBDIRS(profiles)
Index: README
===================================================================
--- README	(.../tags/KDE/4.1.4/kdegraphics/libs/libkdcraw)	(revision 907970)
+++ README	(.../trunk/KDE/kdegraphics/libs/libkdcraw)	(revision 907970)
@@ -1,4 +1,4 @@
-DCRAW program interface for KDE
+LibRaw C++ interface for KDE
 
 This library is a part of Kipi-Plugins project (http://www.kipi-plugins.org)
 
@@ -8,8 +8,8 @@
 
 -- ABOUT -------------------------------------------------------------
 
-Libkdcraw is a C++ interface around dcraw binary program used to decode RAW
-picture files.  
+Libkdcraw is a C++ interface around LibRaw library used to decode RAW
+picture files. More information about LibRaw can be found at http://www.libraw.org.
 
 This library is used by kipi-plugins, digiKam and others kipi host programs.
 
@@ -17,12 +17,19 @@
 
 -- DEPENDENCIES -------------------------------------------------------
 
-CMake      >= 2.4.x                     http://www.cmake.org
-libqt      >= 4.2.x                     http://www.trolltech.com
-libkde     >= 4.0.x                     http://www.kde.org
-liblcms    >= 1.14.x (used by dcraw.c)  http://www.littlecms.com
-libjpeg    >= 6b     (used by dcraw.c)  http://www.ijg.org
+CMake      >= 2.4.x                    http://www.cmake.org
+libqt      >= 4.2.x                    http://www.trolltech.com
+libkde     >= 4.0.x                    http://www.kde.org
+liblcms    >= 1.14.x (used by libraw)  http://www.littlecms.com
+libjpeg    >= 6b     (used by libraw)  http://www.ijg.org
 
+Optional:
+
+"-DENABLE_OPENMP=yes" CMake option set on parallelized LibRaw code to
+speed-up RAW demosaicing operations.
+libgomp    >= 4.3.x  (used by libraw)  http://gcc.gnu.org/projects/gomp
+
+
 -- INSTALL ------------------------------------------------------------
 
 In order to compile, especially when QT3/Qt4 are installed at the same time, 
@@ -60,7 +67,7 @@
 
 IMPORTANT : the bugreports and wishlist are hosted by the KDE bugs report 
 system who can be contacted by the standard Kde help menu of plugins dialog. 
-A mail will be automaticly sent to the Kipi mailing list.
+A mail will be automatically sent to the Kipi mailing list.
 There is no need to contact directly the Kipi mailing list for a bug report 
 or a devel wish.
 

kdegraphics-4.1.3-libkexiv2-0.5.0.patch:

--- NEW FILE kdegraphics-4.1.3-libkexiv2-0.5.0.patch ---
Index: libkexiv2/kexiv2comments.cpp
===================================================================
--- libkexiv2/kexiv2comments.cpp	(.../tags/KDE/4.1.4/kdegraphics/libs/libkexiv2)	(revision 907970)
+++ libkexiv2/kexiv2comments.cpp	(.../trunk/KDE/kdegraphics/libs/libkexiv2)	(revision 907970)
@@ -10,10 +10,6 @@
  * Copyright (C) 2006-2008 by Gilles Caulier <caulier dot gilles at gmail dot com>
  * Copyright (C) 2006-2008 by Marcel Wiesweg <marcel dot wiesweg at gmx dot de>
  *
- * NOTE: Do not use kdDebug() in this implementation because
- *       it will be multithreaded. Use qDebug() instead.
- *       See B.K.O #133026 for details.
- *
  * 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;
@@ -47,7 +43,8 @@
     catch( Exiv2::Error &e )
     {
         std::string s(e.what());
-        qDebug("%s (Error #%i: %s)", "Cannot check Comment access mode using Exiv2 ", e.code(), s.c_str());
+        kDebug(51003) << "Cannot check Comment access mode using Exiv2 (Error #" 
+                      << e.code() << ": " << s.c_str() << ")" << endl;
     }
 
     return false;
Index: libkexiv2/kexiv2gps.cpp
===================================================================
--- libkexiv2/kexiv2gps.cpp	(.../tags/KDE/4.1.4/kdegraphics/libs/libkexiv2)	(revision 907970)
+++ libkexiv2/kexiv2gps.cpp	(.../trunk/KDE/kdegraphics/libs/libkexiv2)	(revision 907970)
@@ -10,20 +10,16 @@
  * Copyright (C) 2006-2008 by Gilles Caulier <caulier dot gilles at gmail dot com>
  * Copyright (C) 2006-2008 by Marcel Wiesweg <marcel dot wiesweg at gmx dot de>
  *
- * NOTE: Do not use kdDebug() in this implementation because 
- *       it will be multithreaded. Use qDebug() instead. 
- *       See B.K.O #133026 for details.
- *
  * 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.
- * 
+ *
  * ============================================================ */
 
 // C++ includes.
@@ -185,7 +181,7 @@
             Exiv2::ExifKey exifKey3("Exif.GPSInfo.GPSAltitude");
             Exiv2::ExifData exifData(d->exifMetadata);
             Exiv2::ExifData::iterator it = exifData.findKey(exifKey3);
-            if (it != exifData.end())
+            if (it != exifData.end() && (*it).count())
             {
                 num = (double)((*it).toRational(0).first);
                 den = (double)((*it).toRational(0).second);
@@ -226,7 +222,7 @@
         Exiv2::ExifKey exifKey("Exif.GPSInfo.GPSLatitude");
         Exiv2::ExifData exifData(d->exifMetadata);
         Exiv2::ExifData::iterator it = exifData.findKey(exifKey);
-        if (it != exifData.end())
+        if (it != exifData.end() && (*it).count() == 3)
         {
             return convertToGPSCoordinateString((*it).toRational(0).first, (*it).toRational(0).second,
                                                 (*it).toRational(1).first, (*it).toRational(1).second,
@@ -258,7 +254,7 @@
         Exiv2::ExifKey exifKey("Exif.GPSInfo.GPSLongitude");
         Exiv2::ExifData exifData(d->exifMetadata);
         Exiv2::ExifData::iterator it = exifData.findKey(exifKey);
-        if (it != exifData.end())
+        if (it != exifData.end() && (*it).count() == 3)
         {
             return convertToGPSCoordinateString((*it).toRational(0).first, (*it).toRational(0).second,
                                                 (*it).toRational(1).first, (*it).toRational(1).second,
@@ -276,7 +272,6 @@
     return QString();
 }
 
-
 bool KExiv2::setGPSInfo(double altitude, double latitude, double longitude, bool setProgramName) const
 {
     if (!setProgramId(setProgramName))
@@ -425,7 +420,7 @@
         // Altitude reference: byte "00" meaning "above sea level", "01" mening "behing sea level".
         value = Exiv2::Value::create(Exiv2::unsignedByte);
         if (altitude >= 0) value->read("0");
-	else               value->read("1");
+        else               value->read("1");
         d->exifMetadata.add(Exiv2::ExifKey("Exif.GPSInfo.GPSAltitudeRef"), value.get());
 
         // And the actual altitude, as absolute value..
@@ -477,7 +472,7 @@
         return false;
 
     try
-    {  
+    {
         QStringList gpsTagsKeys;
 
         for (Exiv2::ExifData::iterator it = d->exifMetadata.begin();
@@ -489,7 +484,7 @@
                 gpsTagsKeys.append(key);
         }
 
-        for(QStringList::Iterator it2 = gpsTagsKeys.begin(); it2 != gpsTagsKeys.end(); ++it2)
+        for(QStringList::const_iterator it2 = gpsTagsKeys.constBegin(); it2 != gpsTagsKeys.constEnd(); ++it2)
         {
             Exiv2::ExifKey gpsKey((*it2).toAscii().constData());
             Exiv2::ExifData::iterator it3 = d->exifMetadata.findKey(gpsKey);
@@ -528,7 +523,7 @@
     // To do this we: (for example)
     //  0.12345 * 10000 = 1234.5
     //  floor(1234.5) = 1234 - now bigger than 1 - ready...
-    fractional = trunc(fractional * rounder);
+    fractional = round(fractional * rounder);
 
     // Convert the whole thing to a fraction.
     // Fraction is:
@@ -630,7 +625,6 @@
     }
 }
 
-
 QString KExiv2::convertToGPSCoordinateString(long int numeratorDegrees, long int denominatorDegrees,
                                              long int numeratorMinutes, long int denominatorMinutes,
                                              long int numeratorSeconds, long int denominatorSeconds,
@@ -878,6 +872,4 @@
     *seconds = coordinate;
 }
 
-
-
 }  // NameSpace KExiv2Iface
Index: libkexiv2/kexiv2private.cpp
===================================================================
--- libkexiv2/kexiv2private.cpp	(.../tags/KDE/4.1.4/kdegraphics/libs/libkexiv2)	(revision 907970)
+++ libkexiv2/kexiv2private.cpp	(.../trunk/KDE/kdegraphics/libs/libkexiv2)	(revision 907970)
@@ -9,10 +9,6 @@
  * Copyright (C) 2006-2008 by Gilles Caulier <caulier dot gilles at gmail dot com>
  * Copyright (C) 2006-2008 by Marcel Wiesweg <marcel dot wiesweg at gmx dot de>
  *
- * NOTE: Do not use kdDebug() in this implementation because
- *       it will be multithreaded. Use qDebug() instead.
- *       See B.K.O #133026 for details.
- *
  * 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;
@@ -34,25 +30,19 @@
 
 KExiv2Priv::KExiv2Priv()
 {
+    writeRawFiles = false;
     imageComments = std::string();
-
-#ifdef _XMP_SUPPORT_
-    Exiv2::XmpProperties::registerNs("http://www.microsoft.com/Photo/", "MicrosoftPhoto");
-#endif
 }
 
 KExiv2Priv::~KExiv2Priv()
 {
-    // Fix memory leak if Exiv2 support XMP.
-#ifdef _XMP_SUPPORT_
-    Exiv2::XmpParser::terminate();
-#endif // _XMP_SUPPORT_
 }
 
 void KExiv2Priv::printExiv2ExceptionError(const QString& msg, Exiv2::Error& e)
 {
     std::string s(e.what());
-    qDebug("%s (Error #%i: %s)", msg.toAscii().constData(), e.code(), s.c_str());
+    kDebug(51003) << msg.toAscii().constData() << " (Error #" 
+                  << e.code() << ": " << s.c_str() << endl;
 }
 
 QString KExiv2Priv::convertCommentValue(const Exiv2::Exifdatum &exifDatum)
Index: libkexiv2/kexiv2exif.cpp
===================================================================
--- libkexiv2/kexiv2exif.cpp	(.../tags/KDE/4.1.4/kdegraphics/libs/libkexiv2)	(revision 907970)
+++ libkexiv2/kexiv2exif.cpp	(.../trunk/KDE/kdegraphics/libs/libkexiv2)	(revision 907970)
@@ -10,20 +10,16 @@
  * Copyright (C) 2006-2008 by Gilles Caulier <caulier dot gilles at gmail dot com>
  * Copyright (C) 2006-2008 by Marcel Wiesweg <marcel dot wiesweg at gmx dot de>
  *
- * NOTE: Do not use kdDebug() in this implementation because 
- *       it will be multithreaded. Use qDebug() instead. 
- *       See B.K.O #133026 for details.
- *
  * 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.
- * 
+ *
  * ============================================================ */
 
 // Local includes.
@@ -47,7 +43,8 @@
     catch( Exiv2::Error &e )
     {
         std::string s(e.what());
-        qDebug("%s (Error #%i: %s)", "Cannot check Exif access mode using Exiv2 ", e.code(), s.c_str());
+        kDebug(51003) << "Cannot check Exif access mode using Exiv2 (Error #" 
+                      << e.code() << ": " << s.c_str() << ")" << endl;
     }
 
     return false;
@@ -106,7 +103,7 @@
     catch( Exiv2::Error &e )
     {
         if (!d->filePath.isEmpty())
-            qDebug ("From file %s", d->filePath.toAscii().constData());
+            kDebug(51003) << "From file " << d->filePath.toAscii().constData() << endl;
 
         d->printExiv2ExceptionError("Cannot get Exif data using Exiv2 ", e);
     }
@@ -134,7 +131,7 @@
     catch( Exiv2::Error &e )
     {
         if (!d->filePath.isEmpty())
-            qDebug ("From file %s", d->filePath.toAscii().constData());
+            kDebug(51003) << "From file " << d->filePath.toAscii().constData() << endl;
 
         d->printExiv2ExceptionError("Cannot set Exif data using Exiv2 ", e);
     }
@@ -316,6 +313,8 @@
             d->exifMetadata.erase(it);
             return true;
         }
+
+        return true;
     }
     catch( Exiv2::Error &e )
     {
@@ -618,11 +617,16 @@
                 case Exiv2::unsignedLong:
                 case Exiv2::signedShort:
                 case Exiv2::signedLong:
-                    return QVariant((int)it->toLong(component));
+                    if (it->count() > component)
+                        return QVariant((int)it->toLong(component));
+                    else
+                        return QVariant(QVariant::Int);
                 case Exiv2::unsignedRational:
                 case Exiv2::signedRational:
                     if (rationalAsListOfInts)
                     {
+                        if (it->count() <= component)
+                            return QVariant(QVariant::List);
                         QList<QVariant> list;
                         list << (*it).toRational(component).first;
                         list << (*it).toRational(component).second;
@@ -630,6 +634,8 @@
                     }
                     else
                     {
+                        if (it->count() <= component)
+                            return QVariant(QVariant::Double);
                         // prefer double precision
                         double num = (*it).toRational(component).first;
                         double den = (*it).toRational(component).second;
@@ -743,7 +749,7 @@
                 if (it != exifData.end())
                 {
                     long orientation = it->toLong();
-                    qDebug("Exif Thumbnail Orientation: %i", (int)orientation);
+                    kDebug(51003) << "Exif Thumbnail Orientation: " << (int)orientation << endl;
                     rotateExifQImage(thumbnail, (ImageOrientation)orientation);
                 }
 
@@ -820,7 +826,7 @@
         thumbFile.setAutoRemove(true);
         thumbFile.open();
         thumb.save(thumbFile.fileName(), "JPEG");
-        qDebug("Thumbnail temp file: %s", thumbFile.fileName().toAscii().data());
+        kDebug(51003) << "Thumbnail temp file: " << thumbFile.fileName().toAscii().data() << endl;
 
         const std::string &fileName((const char*)(QFile::encodeName(thumbFile.fileName())));
 #if (EXIV2_TEST_VERSION(0,17,91))
Index: libkexiv2/kexiv2.cpp
===================================================================
--- libkexiv2/kexiv2.cpp	(.../tags/KDE/4.1.4/kdegraphics/libs/libkexiv2)	(revision 907970)
+++ libkexiv2/kexiv2.cpp	(.../trunk/KDE/kdegraphics/libs/libkexiv2)	(revision 907970)
@@ -9,10 +9,6 @@
  * Copyright (C) 2006-2008 by Gilles Caulier <caulier dot gilles at gmail dot com>
  * Copyright (C) 2006-2008 by Marcel Wiesweg <marcel dot wiesweg at gmx dot de>
  *
- * NOTE: Do not use kdDebug() in this implementation because 
- *       it will be multithreaded. Use qDebug() instead. 
- *       See B.K.O #133026 for details.
- *
  * 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;
@@ -25,6 +21,14 @@
  *
  * ============================================================ */
 
+// C ANSI includes.
+
+extern "C"
+{
+#include <sys/stat.h>
+#include <utime.h>
+}
+
 // Local includes.
 
 #include "version.h"
@@ -83,6 +87,25 @@
 
 //-- Statics methods ----------------------------------------------
 
+bool KExiv2::initializeExiv2()
+{
+#ifdef _XMP_SUPPORT_
+    return (Exiv2::XmpParser::initialize());
+#endif // _XMP_SUPPORT_
+
+    return true;
+}
+
+bool KExiv2::cleanupExiv2()
+{
+    // Fix memory leak if Exiv2 support XMP.
+#ifdef _XMP_SUPPORT_
+    Exiv2::XmpParser::terminate();
+#endif // _XMP_SUPPORT_
+
+    return true;
+}
+
 bool KExiv2::supportXmp()
 {
 #ifdef _XMP_SUPPORT_
@@ -92,13 +115,46 @@
 #endif // _XMP_SUPPORT_
 }
 
-bool KExiv2::supportTiffWritting()
+bool KExiv2::supportMetadataWritting(const QString& typeMime)
 {
+    if (typeMime == QString("image/jpeg"))
+    {
+        return true;
+    }
+    else if (typeMime == QString("image/tiff"))
+    {
 #if (EXIV2_TEST_VERSION(0,17,91))
-    return true;
+        return true;
 #else
+        return false;
+#endif
+    }
+    else if (typeMime == QString("image/png"))
+    {
+#if (EXIV2_TEST_VERSION(0,17,91))
+        return true;
+#else
+        return false;
+#endif
+    }
+    else if (typeMime == QString("image/jp2"))
+    {
+#if (EXIV2_TEST_VERSION(0,17,91))
+        return true;
+#else
+        return false;
+#endif
+    }
+    else if (typeMime == QString("image/x-raw"))
+    {
+#if (EXIV2_TEST_VERSION(0,17,91))
+        return true;
+#else
+        return false;
+#endif
+    }
+
     return false;
-#endif
 }
 
 QString KExiv2::Exiv2Version()
@@ -123,36 +179,77 @@
 bool KExiv2::isReadOnly(const QString& filePath)
 {
     if (!canWriteComment(filePath))
-        return false;
+        return true;
 
     if (!canWriteExif(filePath))
-        return false;
+        return true;
 
     if (!canWriteIptc(filePath))
-        return false;
+        return true;
 
 #ifdef _XMP_SUPPORT_
     if (!canWriteXmp(filePath))
-        return false;
+        return true;
 #endif // _XMP_SUPPORT_
 
-    return true;
+    return false;
 }
 
 //-- General methods ----------------------------------------------
 
+bool KExiv2::load(const QByteArray& imgData) const
+{
+    if (imgData.isEmpty())
+        return false;
+
+    try
+    {
+        Exiv2::Image::AutoPtr image = Exiv2::ImageFactory::open((Exiv2::byte*)imgData.data(), imgData.size());
+
+        d->filePath = QString();
+        image->readMetadata();
+
+        // Image comments ---------------------------------
+
+        d->imageComments = image->comment();
+
+        // Exif metadata ----------------------------------
+
+        d->exifMetadata = image->exifData();
+
+        // Iptc metadata ----------------------------------
+
+        d->iptcMetadata = image->iptcData();
+
+#ifdef _XMP_SUPPORT_
+
+        // Xmp metadata -----------------------------------
+
+        d->xmpMetadata = image->xmpData();
+
+#endif // _XMP_SUPPORT_
+
+        return true;
+    }
+    catch( Exiv2::Error &e )
+    {
+        d->printExiv2ExceptionError("Cannot load metadata using Exiv2 ", e);
+    }
+
+    return false;
+}
+
 bool KExiv2::load(const QString& filePath) const
 {
     QFileInfo finfo(filePath);
     if (filePath.isEmpty() || !finfo.isReadable())
     {
-        qDebug("File '%s' is not readable.", finfo.fileName().toAscii().constData());
+        kDebug(51003) << "File '" << finfo.fileName().toAscii().constData() << "' is not readable." << endl;
         return false;
     }
 
     try
     {
-
         Exiv2::Image::AutoPtr image = Exiv2::ImageFactory::open((const char*)
                                       (QFile::encodeName(filePath)));
 
@@ -199,15 +296,33 @@
     QFileInfo dinfo(finfo.path());
     if (!finfo.isWritable())
     {
-        qDebug("File '%s' is read-only. Metadata not saved.", finfo.fileName().toAscii().constData());
+        kDebug(51003) << "File '" << finfo.fileName().toAscii().constData() << "' is read-only. Metadata not saved." << endl;
         return false;
     }
     if (!dinfo.isWritable())
     {
-        qDebug("Dir '%s' is read-only. Metadata not saved.", dinfo.filePath().toAscii().constData());
+        kDebug(51003) << "Dir '" << dinfo.filePath().toAscii().constData() << "' is read-only. Metadata not saved." << endl;
         return false;
     }
 
+    // TIFF/EP Raw file based supported by Exiv2 0.18 are : DNG, NEF, PEF.
+    QString rawTiffBasedSupported("dng nef pef");
+    QString rawTiffBasedNotSupported("3fr arw cr2 dcr erf k25 kdc mos orf raw sr2 srf");
+    if (rawTiffBasedNotSupported.contains(finfo.suffix().toUpper()))
+    {
+        kDebug(51003) << "'" << dinfo.filePath().toAscii().constData() 
+                      << "' is TIFF based RAW file not yet supported. Metadata not saved." << endl;
+        return false;
+    }
+
+    if (rawTiffBasedSupported.contains(finfo.suffix().toUpper()) && !d->writeRawFiles)
+    {
+        kDebug(51003) << "'" << dinfo.filePath().toAscii().constData() 
+                      << "' is TIFF based RAW file supported but writing mode is disabled. " 
+                      << "Metadata not saved." << endl;
+        return false;
+    }
+
     try
     {
         Exiv2::AccessMode mode;
@@ -235,11 +350,12 @@
         {
             if (image->mimeType() == "image/tiff")
             {
+                Exiv2::ExifData exif = image->exifData();
+                QStringList untouchedTags;
+
                 // With tiff image we cannot overwrite whole Exif data as well, because 
                 // image data are stored in Exif container. We need to take a care about
                 // to not lost image data.
-                Exiv2::ExifData exif = image->exifData();
-                QStringList untouchedTags;
                 untouchedTags << "Exif.Image.ImageWidth";
                 untouchedTags << "Exif.Image.ImageLength";
                 untouchedTags << "Exif.Image.BitsPerSample";
@@ -293,8 +409,18 @@
 
 #endif // _XMP_SUPPORT_
 
+        // NOTE: Don't touch access and modification timestamp of file.
+        struct stat st;
+        ::stat(QFile::encodeName(filePath), &st);
+
+        struct utimbuf ut;
+        ut.modtime = st.st_mtime;
+        ut.actime  = st.st_atime;
+
         image->writeMetadata();
 
+        ::utime(QFile::encodeName(filePath), &ut);
+
         return true;
     }
     catch( Exiv2::Error &e )
@@ -331,6 +457,16 @@
     return d->filePath;
 }
 
+void KExiv2::setWriteRawFiles(bool on)
+{
+    d->writeRawFiles = on;
+}
+
+bool KExiv2::writeRawFiles() const
+{
+    return d->writeRawFiles;
+}
+
 bool KExiv2::setProgramId(bool /*on*/) const
 {
     return true;
Index: libkexiv2/kexiv2iptc.cpp
===================================================================
--- libkexiv2/kexiv2iptc.cpp	(.../tags/KDE/4.1.4/kdegraphics/libs/libkexiv2)	(revision 907970)
+++ libkexiv2/kexiv2iptc.cpp	(.../trunk/KDE/kdegraphics/libs/libkexiv2)	(revision 907970)
@@ -10,20 +10,16 @@
  * Copyright (C) 2006-2008 by Gilles Caulier <caulier dot gilles at gmail dot com>
  * Copyright (C) 2006-2008 by Marcel Wiesweg <marcel dot wiesweg at gmx dot de>
  *
- * NOTE: Do not use kdDebug() in this implementation because 
- *       it will be multithreaded. Use qDebug() instead. 
- *       See B.K.O #133026 for details.
- *
  * 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.
- * 
+ *
  * ============================================================ */
 
 // Local includes.
@@ -47,7 +43,8 @@
     catch( Exiv2::Error &e )
     {
         std::string s(e.what());
-        qDebug("%s (Error #%i: %s)", "Cannot check Iptc access mode using Exiv2 ", e.code(), s.c_str());
+        kDebug(51003) << "Cannot check Iptc access mode using Exiv2 (Error #" 
+                      << e.code() << ": " << s.c_str() << ")" << endl;
     }
 
     return false;
@@ -87,7 +84,7 @@
 #if (EXIV2_TEST_VERSION(0,10,0))
                 c2 = Exiv2::Photoshop::setIptcIrb(0, 0, iptc);
 #else
-                qDebug("Exiv2 version is to old. Cannot add Irb header to Iptc metadata");
+                kDebug(51003) << "Exiv2 version is to old. Cannot add Irb header to Iptc metadata" << endl;
                 return QByteArray();
 #endif
             }
@@ -108,7 +105,7 @@
     catch( Exiv2::Error &e )
     {
         if (!d->filePath.isEmpty())
-            qDebug ("From file %s", d->filePath.toAscii().constData());
+            kDebug(51003) << "From file " << d->filePath.toAscii().constData() << endl;
 
         d->printExiv2ExceptionError("Cannot get Iptc data using Exiv2 ",e);
     }
@@ -136,7 +133,7 @@
     catch( Exiv2::Error &e )
     {
         if (!d->filePath.isEmpty())
-            qDebug ("From file %s", d->filePath.toAscii().constData());
+            kDebug(51003) << "From file " << d->filePath.toAscii().constData() << endl;
 
         d->printExiv2ExceptionError("Cannot set Iptc data using Exiv2 ", e);
     }
@@ -315,7 +312,7 @@
     catch( Exiv2::Error &e )
     {
         d->printExiv2ExceptionError(QString("Cannot find Iptc key '%1' into image using Exiv2 ")
-                                 .arg(iptcTagName), e);
+                                    .arg(iptcTagName), e);
     }
 
     return QByteArray();
@@ -343,7 +340,7 @@
     catch( Exiv2::Error &e )
     {
         d->printExiv2ExceptionError(QString("Cannot find Iptc key '%1' into image using Exiv2 ")
-                                 .arg(iptcTagName), e);
+                                    .arg(iptcTagName), e);
     }
 
     return QString();
@@ -397,7 +394,7 @@
     catch( Exiv2::Error &e )
     {
         d->printExiv2ExceptionError(QString("Cannot find Iptc key '%1' into image using Exiv2 ")
-                                 .arg(iptcTagName), e);
+                                    .arg(iptcTagName), e);
     }
 
     return QStringList();
@@ -415,8 +412,8 @@
         QStringList oldvals = oldValues;
         QStringList newvals = newValues;
 
-        qDebug() << d->filePath.toAscii().constData() << " : " << iptcTagName 
-                 << " => " << newvals.join(",").toAscii().constData() << endl;
+        kDebug(51003) << d->filePath.toAscii().constData() << " : " << iptcTagName 
+                      << " => " << newvals.join(",").toAscii().constData() << endl;
 
         // Remove all old values.
         Exiv2::IptcData iptcData(d->iptcMetadata);
@@ -457,7 +454,7 @@
     catch( Exiv2::Error &e )
     {
         d->printExiv2ExceptionError(QString("Cannot set Iptc key '%1' into image using Exiv2 ")
-                                 .arg(iptcTagName), e);
+                                    .arg(iptcTagName), e);
     }
 
     return false;
@@ -505,7 +502,8 @@
         QStringList oldkeys = oldKeywords;
         QStringList newkeys = newKeywords;
 
-        qDebug("%s ==> Iptc Keywords: %s", d->filePath.toAscii().constData(), newkeys.join(",").toAscii().constData());
+        kDebug(51003) << d->filePath.toAscii().constData() 
+                      << " ==> Iptc Keywords: " << newkeys.join(",").toAscii().constData() << endl;
 
         // Remove all old keywords.
         Exiv2::IptcData iptcData(d->iptcMetadata);
@@ -518,8 +516,7 @@
 
             // Also remove new keywords to avoid duplicates. They will be added again below.
             if ( key == QString("Iptc.Application2.Keywords") &&
-                 (oldKeywords.contains(val) || newKeywords.contains(val))
-               )
+                 (oldKeywords.contains(val) || newKeywords.contains(val)) )
                 it = iptcData.erase(it);
             else 
                 ++it;
Index: libkexiv2/kexiv2private.h
===================================================================
--- libkexiv2/kexiv2private.h	(.../tags/KDE/4.1.4/kdegraphics/libs/libkexiv2)	(revision 907970)
+++ libkexiv2/kexiv2private.h	(.../trunk/KDE/kdegraphics/libs/libkexiv2)	(revision 907970)
@@ -21,6 +21,10 @@
  *
  * ============================================================ */
 
+#ifndef KEXIV2PRIVATE_H
+#define KEXIV2PRIVATE_H
+
+
  // C++ includes.
 
 #include <cstdlib>
@@ -41,7 +45,6 @@
 #include <QMatrix>
 #include <QFileInfo>
 #include <QDataStream>
-#include <QDebug>
 
 // KDE includes.
 
@@ -49,6 +52,7 @@
 #include <kencodingdetector.h>
 #include <kstringhandler.h>
 #include <kdeversion.h>
+#include <kdebug.h>
 
 // Exiv2 includes.
 
@@ -119,6 +123,8 @@
 
 public:
 
+    bool            writeRawFiles;
+
     QString         filePath;
 
     std::string     imageComments;
@@ -133,3 +139,4 @@
 };
 
 }  // NameSpace KExiv2Iface
+#endif
Index: libkexiv2/kexiv2image.cpp
===================================================================
--- libkexiv2/kexiv2image.cpp	(.../tags/KDE/4.1.4/kdegraphics/libs/libkexiv2)	(revision 907970)
+++ libkexiv2/kexiv2image.cpp	(.../trunk/KDE/kdegraphics/libs/libkexiv2)	(revision 907970)
@@ -10,20 +10,16 @@
  * Copyright (C) 2006-2008 by Gilles Caulier <caulier dot gilles at gmail dot com>
  * Copyright (C) 2006-2008 by Marcel Wiesweg <marcel dot wiesweg at gmx dot de>
  *
- * NOTE: Do not use kdDebug() in this implementation because 
- *       it will be multithreaded. Use qDebug() instead. 
- *       See B.K.O #133026 for details.
- *
  * 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.
- * 
+ *
  * ============================================================ */
 
 // Local includes.
@@ -236,7 +232,7 @@
         if (it != exifData.end())
         {
             orientation = it->toLong();
-            qDebug() << "Orientation => Exif.MinoltaCs7D.Rotation => " << (int)orientation << endl;
+            kDebug(51003) << "Orientation => Exif.MinoltaCs7D.Rotation => " << (int)orientation << endl;
             switch(orientation)
             {
                 case 76:
@@ -255,7 +251,7 @@
         if (it != exifData.end())
         {
             orientation = it->toLong();
-            qDebug() << "Orientation => Exif.MinoltaCs5D.Rotation => " << (int)orientation << endl;
+            kDebug(51003) << "Orientation => Exif.MinoltaCs5D.Rotation => " << (int)orientation << endl;
             switch(orientation)
             {
                 case 76:
@@ -276,7 +272,7 @@
         if (it != exifData.end())
         {
             orientation = it->toLong();
-            qDebug() << "Orientation => Exif.Image.Orientation => " << (int)orientation << endl;
+            kDebug(51003) << "Orientation => Exif.Image.Orientation => " << (int)orientation << endl;
             return (ImageOrientation)orientation;
         }
 
@@ -291,7 +287,7 @@
             orientation = str.toLong(&ok);
             if (ok)
             {
-                qDebug() << "Orientation => Xmp.tiff.Orientation => " << (int)orientation << endl;
+                kDebug(51003) << "Orientation => Xmp.tiff.Orientation => " << (int)orientation << endl;
                 return (ImageOrientation)orientation;
             }
         }
@@ -316,14 +312,14 @@
     {
         if (orientation < ORIENTATION_UNSPECIFIED || orientation > ORIENTATION_ROT_270)
         {
-            qDebug("Image orientation value is not correct!");
+            kDebug(51003) << "Image orientation value is not correct!" << endl;
             return false;
         }
 
         // Set Exif values.
 
         d->exifMetadata["Exif.Image.Orientation"] = static_cast<uint16_t>(orientation);
-        qDebug() << "Exif.Image.Orientation tag set to: " << (int)orientation;
+        kDebug(51003) << "Exif.Image.Orientation tag set to: " << (int)orientation << endl;
 
         // Set Xmp values.
 
@@ -345,7 +341,7 @@
         if (it != d->exifMetadata.end())
         {
             d->exifMetadata.erase(it);
-            qDebug("Removing Exif.MinoltaCs7D.Rotation tag");
+            kDebug(51003) << "Removing Exif.MinoltaCs7D.Rotation tag" << endl;
         }
 
         Exiv2::ExifKey minoltaKey2("Exif.MinoltaCs5D.Rotation");
@@ -353,7 +349,7 @@
         if (it != d->exifMetadata.end())
         {
             d->exifMetadata.erase(it);
-            qDebug("Removing Exif.MinoltaCs5D.Rotation tag");
+            kDebug(51003) << "Removing Exif.MinoltaCs5D.Rotation tag" << endl;
         }
 
         return true;
@@ -485,7 +481,7 @@
                     QDateTime dateTime = QDateTime::fromString(it->toString().c_str(), Qt::ISODate);
                     if (dateTime.isValid())
                     {
-                        qDebug() << "DateTime => Exif.Photo.DateTimeOriginal => " << dateTime << endl;
+                        kDebug(51003) << "DateTime => Exif.Photo.DateTimeOriginal => " << dateTime << endl;
                         return dateTime;
                     }
                 }
@@ -498,7 +494,7 @@
                     QDateTime dateTime = QDateTime::fromString(it->toString().c_str(), Qt::ISODate);
                     if (dateTime.isValid())
                     {
-                        qDebug() << "DateTime => Exif.Photo.DateTimeDigitized => " << dateTime << endl;
+                        kDebug(51003) << "DateTime => Exif.Photo.DateTimeDigitized => " << dateTime << endl;
                         return dateTime;
                     }
                 }
@@ -511,7 +507,7 @@
                     QDateTime dateTime = QDateTime::fromString(it->toString().c_str(), Qt::ISODate);
                     if (dateTime.isValid())
                     {
-                        qDebug() << "DateTime => Exif.Image.DateTime => " << dateTime << endl;
+                        kDebug(51003) << "DateTime => Exif.Image.DateTime => " << dateTime << endl;
                         return dateTime;
                     }
                 }
@@ -533,7 +529,7 @@
                     QDateTime dateTime = QDateTime::fromString(it->toString().c_str(), Qt::ISODate);
                     if (dateTime.isValid())
                     {
-                        qDebug() << "DateTime => Xmp.exif.DateTimeOriginal => " << dateTime << endl;
+                        kDebug(51003) << "DateTime => Xmp.exif.DateTimeOriginal => " << dateTime << endl;
                         return dateTime;
                     }
                 }
@@ -546,7 +542,7 @@
                     QDateTime dateTime = QDateTime::fromString(it->toString().c_str(), Qt::ISODate);
                     if (dateTime.isValid())
                     {
-                        qDebug() << "DateTime => Xmp.exif.DateTimeDigitized => " << dateTime << endl;
+                        kDebug(51003) << "DateTime => Xmp.exif.DateTimeDigitized => " << dateTime << endl;
                         return dateTime;
                     }
                 }
@@ -559,7 +555,7 @@
                     QDateTime dateTime = QDateTime::fromString(it->toString().c_str(), Qt::ISODate);
                     if (dateTime.isValid())
                     {
-                        qDebug() << "DateTime => Xmp.photoshop.DateCreated => " << dateTime << endl;
+                        kDebug(51003) << "DateTime => Xmp.photoshop.DateCreated => " << dateTime << endl;
                         return dateTime;
                     }
                 }
@@ -572,10 +568,10 @@
                     QDateTime dateTime = QDateTime::fromString(it->toString().c_str(), Qt::ISODate);
                     if (dateTime.isValid())
                     {
-                        qDebug() << "DateTime => Xmp.xmp.CreateDate => " << dateTime << endl;
+                        kDebug(51003) << "DateTime => Xmp.xmp.CreateDate => " << dateTime << endl;
                         return dateTime;
                     }
-                }  
+                }
             }
             {
                 Exiv2::XmpKey key("Xmp.tiff.DateTime");
@@ -585,10 +581,10 @@
                     QDateTime dateTime = QDateTime::fromString(it->toString().c_str(), Qt::ISODate);
                     if (dateTime.isValid())
                     {
-                        qDebug() << "DateTime => Xmp.tiff.DateTime => " << dateTime << endl;
+                        kDebug(51003) << "DateTime => Xmp.tiff.DateTime => " << dateTime << endl;
                         return dateTime;
                     }
-                }  
+                }
             }
             {
                 Exiv2::XmpKey key("Xmp.xmp.ModifyDate");
@@ -598,10 +594,10 @@
                     QDateTime dateTime = QDateTime::fromString(it->toString().c_str(), Qt::ISODate);
                     if (dateTime.isValid())
                     {
-                        qDebug() << "DateTime => Xmp.xmp.ModifyDate => " << dateTime << endl;
+                        kDebug(51003) << "DateTime => Xmp.xmp.ModifyDate => " << dateTime << endl;
                         return dateTime;
                     }
-                }  
+                }
             }
             {
                 Exiv2::XmpKey key("Xmp.xmp.MetadataDate");
@@ -611,10 +607,10 @@
                     QDateTime dateTime = QDateTime::fromString(it->toString().c_str(), Qt::ISODate);
                     if (dateTime.isValid())
                     {
-                        qDebug() << "DateTime => Xmp.xmp.MetadataDate => " << dateTime << endl;
+                        kDebug(51003) << "DateTime => Xmp.xmp.MetadataDate => " << dateTime << endl;
                         return dateTime;
                     }
-                }  
+                }
             }
         }
 
@@ -643,7 +639,7 @@
                     QDateTime dateTime = QDateTime(date, time);
                     if (dateTime.isValid())
                     {
-                        qDebug() << "DateTime => Iptc.Application2.DateCreated => " << dateTime << endl;
+                        kDebug(51003) << "DateTime => Iptc.Application2.DateCreated => " << dateTime << endl;
                         return dateTime;
                     }
                 }
@@ -666,7 +662,7 @@
                     QDateTime dateTime = QDateTime(date, time);
                     if (dateTime.isValid())
                     {
-                        qDebug() << "DateTime => Iptc.Application2.DigitizationDate => " << dateTime << endl;
+                        kDebug(51003) << "DateTime => Iptc.Application2.DigitizationDate => " << dateTime << endl;
                         return dateTime;
                     }
                 }
@@ -708,7 +704,7 @@
 
         // In second we write date & time into Xmp.
 
-        const std::string &xmpdatetime(dateTime.toString(QString("yyyy:MM:dd hh:mm:ss")).toAscii().constData());
+        const std::string &xmpdatetime(dateTime.toString(Qt::ISODate).toAscii().constData());
 
         Exiv2::Value::AutoPtr xmpTxtVal = Exiv2::Value::create(Exiv2::xmpText);
         xmpTxtVal->read(xmpdatetime);
@@ -769,7 +765,7 @@
 
                 if (dateTime.isValid())
                 {
-                    // qDebug("DateTime (Exif digitalized): %s", dateTime.toString().toAscii().constData());
+                    kDebug(51003) << "DateTime (Exif digitalized): " << dateTime.toString().toAscii().constData() << endl;
                     return dateTime;
                 }
             }
@@ -804,7 +800,7 @@
 
                     if (dateTime.isValid())
                     {
-                        //qDebug("Date (IPTC digitalized): %s", dateTime.toString().toAscii().constData());
+                        kDebug(51003) << "Date (IPTC digitalized): " << dateTime.toString().toAscii().constData() << endl;
                         return dateTime;
                     }
                 }
@@ -857,9 +853,8 @@
 
         // A little bit compressed preview jpeg image to limit IPTC size.
         preview.save(previewFile.fileName(), "JPEG");
-        qDebug("JPEG image preview size: (%i x %i) pixels - %i bytes", 
-               preview.width(), preview.height(), 
-               (int)previewFile.size());
+        kDebug(51003) << "JPEG image preview size: (" << preview.width() << " x " 
+                      << preview.height() << ") pixels - " << (int)previewFile.size() << " bytes" << endl;
 
         QByteArray data;
         data.resize(previewFile.size());
Index: libkexiv2/CMakeLists.txt
===================================================================
--- libkexiv2/CMakeLists.txt	(.../tags/KDE/4.1.4/kdegraphics/libs/libkexiv2)	(revision 907970)
+++ libkexiv2/CMakeLists.txt	(.../trunk/KDE/kdegraphics/libs/libkexiv2)	(revision 907970)
@@ -1,7 +1,9 @@
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${KDE4_ENABLE_EXCEPTIONS}")
 
 INCLUDE_DIRECTORIES(${EXIV2_INCLUDE_DIR})
 
+ADD_DEFINITIONS(${EXIV2_DEFINITIONS})
+ADD_DEFINITIONS(${KDE4_ENABLE_EXCEPTIONS})
+
 CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/version.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/version.h)
 
 # This was used to enable catching of exceptions thrown by libexiv2.
@@ -20,7 +22,7 @@
 
 KDE4_ADD_LIBRARY(kexiv2 SHARED ${kexiv2_LIB_SRCS})
 
-TARGET_LINK_LIBRARIES(kexiv2 ${KDE4_KDECORE_LIBS} ${QT_QTGUI_LIBRARY} exiv2)
+TARGET_LINK_LIBRARIES(kexiv2 ${KDE4_KDECORE_LIBS} ${QT_QTGUI_LIBRARY} ${EXIV2_LIBRARIES})
 
 IF( WIN32 )
 TARGET_LINK_LIBRARIES( kexiv2 ${EXPAT_LIBRARIES} )
Index: libkexiv2/kexiv2.h
===================================================================
--- libkexiv2/kexiv2.h	(.../tags/KDE/4.1.4/kdegraphics/libs/libkexiv2)	(revision 907970)
+++ libkexiv2/kexiv2.h	(.../trunk/KDE/kdegraphics/libs/libkexiv2)	(revision 907970)
@@ -14,6 +14,7 @@
  * Iptc : http://www.iptc.org/std/IIM/4.1/specification/IIMV4.1.pdf
  * Xmp  : http://www.adobe.com/devnet/xmp/pdfs/xmp_specification.pdf
  *        http://www.iptc.org/std/Iptc4xmpCore/1.0/specification/Iptc4xmpCore_1.0-spec-XMPSchema_8.pdf
+ * Paper: http://www.metadataworkinggroup.com/pdf/mwg_guidance.pdf
  *
  * This program is free software; you can redistribute it
  * and/or modify it under the terms of the GNU General
@@ -118,13 +119,27 @@
     //-- STATICS methods ----------------------------------------------
     //-----------------------------------------------------------------
 
+    /** Return true if Exiv2 library initialization is done properlly.
+        This method must be call before to use multithreading with libkexiv2.
+        It initialize several non re-entrancy code from Adobe XMP SDK 
+        See B.K.O #166424 for details.
+     */
+    static bool initializeExiv2();
+
+    /** Return true if Exiv2 library memory allocations are cleaned properlly.
+        This method must be call after to use multithreading with libkexiv2.
+        It cleanup memory used by Adobe XMP SDK 
+        See B.K.O #166424 for details.
+     */
+    static bool cleanupExiv2();
+
     /** Return true if library can handle Xmp metadata
      */
     static bool supportXmp();
 
-    /** Return true if library can writte metadata to TIFF/DNG files
+    /** Return true if library can writte metadata to typeMime file format.
      */
-    static bool supportTiffWritting();
+    static bool supportMetadataWritting(const QString& typeMime);
 
     /** Return a string version of Exiv2 release in format "major.minor.patch"
      */
@@ -135,13 +150,20 @@
     static QString version();
 
     /** return true if metadata from file cannot be written by Exiv2.
+        This method is obosolete and will be removed.
+        Use canWriteComment(), canWriteExif(), canWriteIptc(), or canWriteXmp() instead.
      */
-    static bool isReadOnly(const QString& filePath);
+    KDE_DEPRECATED static bool isReadOnly(const QString& filePath);
 
     //-----------------------------------------------------------------
     //-- GENERAL methods ----------------------------------------------
     //-----------------------------------------------------------------
 
+    /** Load all metadata (Exif, Iptc, Xmp, and JFIF Comments) from a byte array. 
+        Return true if metadata have been loaded successfully from image data.
+     */
+    bool load(const QByteArray& imgData) const;
+
     /** Load all metadata (Exif, Iptc, Xmp, and JFIF Comments) from a picture (JPEG, RAW, TIFF, PNG,
         DNG, etc...). Return true if metadata have been loaded successfully from file.
      */
@@ -169,6 +191,16 @@
      */
     QString getFilePath() const;
 
+    /** Enable or disable writing metadata operations to RAW tiff based files.
+        It's require Exiv2 0.18. By default RAW files are untouched.
+     */
+    void setWriteRawFiles(bool on);
+
+    /** Return true if writing metadata operations on RAW tiff based files is enabled.
+        It's require Exiv2 0.18.
+     */
+    bool writeRawFiles() const;
+
     //-------------------------------------------------------------------
     //-- Metadata IMAGE INFORMATION manipulation methods ----------------
     //-------------------------------------------------------------------
@@ -388,7 +420,7 @@
                            bool rationalWantSmallDenominator=true, bool setProgramName=true) const;
 
     /** Remove the Exif tag 'exifTagName' from Exif metadata. Return true if tag is 
-        removed successfully.
+        removed successfully or if no tag was present.
      */
     bool removeExifTag(const char *exifTagName, bool setProgramName=true) const;
 
@@ -489,7 +521,7 @@
     bool setIptcTagData(const char *iptcTagName, const QByteArray& data, bool setProgramName=true) const;
 
     /** Remove the all instance of Iptc tags 'iptcTagName' from Iptc metadata. Return true if all 
-        tags have been removed successfully.
+        tags have been removed successfully (or none were present).
      */
     bool removeIptcTag(const char *iptcTagName, bool setProgramName=true) const;
 
@@ -723,7 +755,7 @@
     bool registerXmpNameSpace(const QString& uri, const QString& prefix) const;
 
     /** Remove the Xmp tag 'xmpTagName' from Xmp metadata. Return true if tag is 
-        removed successfully.
+        removed successfully or if no tag was present.
      */
     bool removeXmpTag(const char *xmpTagName, bool setProgramName=true) const;
 
Index: libkexiv2/kexiv2xmp.cpp
===================================================================
--- libkexiv2/kexiv2xmp.cpp	(.../tags/KDE/4.1.4/kdegraphics/libs/libkexiv2)	(revision 907970)
+++ libkexiv2/kexiv2xmp.cpp	(.../trunk/KDE/kdegraphics/libs/libkexiv2)	(revision 907970)
@@ -10,20 +10,16 @@
  * Copyright (C) 2006-2008 by Gilles Caulier <caulier dot gilles at gmail dot com>
  * Copyright (C) 2006-2008 by Marcel Wiesweg <marcel dot wiesweg at gmx dot de>
  *
- * NOTE: Do not use kdDebug() in this implementation because 
- *       it will be multithreaded. Use qDebug() instead. 
- *       See B.K.O #133026 for details.
- *
  * 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.
- * 
+ *
  * ============================================================ */
 
 // Local includes.
@@ -48,7 +44,8 @@
     catch( Exiv2::Error &e )
     {
         std::string s(e.what());
-        qDebug("%s (Error #%i: %s)", "Cannot check Xmp access mode using Exiv2 ", e.code(), s.c_str());
+        kDebug(51003) << "Cannot check Xmp access mode using Exiv2 (Error #" 
+                      << e.code() << ": " << s.c_str() << ")" << endl;
     }
 
     return false;
@@ -110,8 +107,8 @@
     catch( Exiv2::Error &e )
     {
         if (!d->filePath.isEmpty())
-            qDebug ("From file %s", d->filePath.toAscii().constData());
 
+
         d->printExiv2ExceptionError("Cannot get Xmp data using Exiv2 ", e);
     }
 
@@ -140,7 +137,7 @@
     catch( Exiv2::Error &e )
     {
         if (!d->filePath.isEmpty())
-            qDebug ("From file %s", d->filePath.toAscii().constData());
+            kDebug(51003) << "From file " << d->filePath.toAscii().constData() << endl;
 
         d->printExiv2ExceptionError("Cannot set Xmp data using Exiv2 ", e);
     }
@@ -299,7 +296,7 @@
     catch( Exiv2::Error &e )
     {
         d->printExiv2ExceptionError(QString("Cannot find Xmp key '%1' into image using Exiv2 ")
-                                 .arg(xmpTagName), e);
+                                    .arg(xmpTagName), e);
     }
 
 #endif // _XMP_SUPPORT_
@@ -355,7 +352,7 @@
                     QString text = QString::fromUtf8(it2->second.c_str());
                     if (escapeCR)
                         text.replace("\n", " ");
-        
+
                     map.insert(lang, text);
                 }
 
@@ -366,7 +363,7 @@
     catch( Exiv2::Error &e )
     {
         d->printExiv2ExceptionError(QString("Cannot find Xmp key '%1' into image using Exiv2 ")
-                                 .arg(xmpTagName), e);
+                                    .arg(xmpTagName), e);
     }
 
 #endif // _XMP_SUPPORT_
@@ -388,7 +385,7 @@
         removeXmpTag(xmpTagName);
 
         Exiv2::Value::AutoPtr xmpTxtVal = Exiv2::Value::create(Exiv2::langAlt);
-        
+
         for (AltLangMap::const_iterator it = values.begin(); it != values.end(); ++it)
         {
             QString lang = it.key();  
@@ -435,7 +432,7 @@
                     {
                         if (escapeCR)
                             tagValue.replace("\n", " ");
-            
+
                         return tagValue;
                     }
                 }
@@ -445,7 +442,7 @@
     catch( Exiv2::Error &e )
     {
         d->printExiv2ExceptionError(QString("Cannot find Xmp key '%1' into image using Exiv2 ")
-                                 .arg(xmpTagName), e);
+                                    .arg(xmpTagName), e);
     }
 
 #endif // _XMP_SUPPORT_
@@ -484,7 +481,7 @@
                 {
                     const std::string &val((*it).toUtf8().constData());
                     xmpTxtVal->read(val);
-                    qDebug() << *it << endl;
+                    kDebug(51003) << *it << endl;
                 }
             }
         }
@@ -524,13 +521,13 @@
                     std::ostringstream os;
                     os << it->toString(i);
                     QString seqValue = QString::fromUtf8(os.str().c_str());
-    
+
                     if (escapeCR)
                         seqValue.replace("\n", " ");
 
                     seq.append(seqValue);
                 }
-                qDebug() << "XMP String Seq (" << xmpTagName << "): " << seq << endl;  
+                kDebug(51003) << "XMP String Seq (" << xmpTagName << "): " << seq << endl;
 
                 return seq;
             }
@@ -539,7 +536,7 @@
     catch( Exiv2::Error &e )
     {
         d->printExiv2ExceptionError(QString("Cannot find Xmp key '%1' into image using Exiv2 ")
-                                 .arg(xmpTagName), e);
+                                    .arg(xmpTagName), e);
     }
 
 #endif // _XMP_SUPPORT_
@@ -557,16 +554,23 @@
 
     try
     {
-        QStringList list = seq;
-        Exiv2::Value::AutoPtr xmpTxtSeq = Exiv2::Value::create(Exiv2::xmpSeq);
-
-        for (QStringList::Iterator it = list.begin(); it != list.end(); ++it )
+        if (seq.isEmpty())
         {
-            const std::string &txt((*it).toUtf8().constData());
-            xmpTxtSeq->read(txt);
+            removeXmpTag(xmpTagName);
         }
-        d->xmpMetadata.add(Exiv2::XmpKey(xmpTagName), xmpTxtSeq.get());
-        return true;
+        else
+        {
+            const QStringList list = seq;
+            Exiv2::Value::AutoPtr xmpTxtSeq = Exiv2::Value::create(Exiv2::xmpSeq);
+
+            for (QStringList::const_iterator it = list.constBegin(); it != list.constEnd(); ++it )
+            {
+                const std::string &txt((*it).toUtf8().constData());
+                xmpTxtSeq->read(txt);
+            }
+            d->xmpMetadata[xmpTagName].setValue(xmpTxtSeq.get());
+            return true;
+        }
     }
     catch( Exiv2::Error &e )
     {
@@ -598,7 +602,7 @@
                     std::ostringstream os;
                     os << it->toString(i);
                     QString bagValue = QString::fromUtf8(os.str().c_str());
-    
+
                     if (escapeCR)
                         bagValue.replace("\n", " ");
 
@@ -612,7 +616,7 @@
     catch( Exiv2::Error &e )
     {
         d->printExiv2ExceptionError(QString("Cannot find Xmp key '%1' into image using Exiv2 ")
-                                 .arg(xmpTagName), e);
+                                    .arg(xmpTagName), e);
     }
 
 #endif // _XMP_SUPPORT_
@@ -630,16 +634,23 @@
 
     try
     {
-        QStringList list = bag;
-        Exiv2::Value::AutoPtr xmpTxtBag = Exiv2::Value::create(Exiv2::xmpBag);
-
-        for (QStringList::Iterator it = list.begin(); it != list.end(); ++it )
+        if (bag.isEmpty())
         {
-            const std::string &txt((*it).toUtf8().constData());
-            xmpTxtBag->read(txt);
+            removeXmpTag(xmpTagName);
         }
-        d->xmpMetadata.add(Exiv2::XmpKey(xmpTagName), xmpTxtBag.get());
-        return true;
+        else
+        {
+            QStringList list = bag;
+            Exiv2::Value::AutoPtr xmpTxtBag = Exiv2::Value::create(Exiv2::xmpBag);
+
+            for (QStringList::const_iterator it = list.constBegin(); it != list.constEnd(); ++it )
+            {
+                const std::string &txt((*it).toUtf8().constData());
+                xmpTxtBag->read(txt);
+            }
+            d->xmpMetadata[xmpTagName].setValue(xmpTxtBag.get());
+            return true;
+        }
     }
     catch( Exiv2::Error &e )
     {
@@ -748,7 +759,7 @@
     catch( Exiv2::Error &e )
     {
         d->printExiv2ExceptionError(QString("Cannot find Xmp key '%1' into image using Exiv2 ")
-                                 .arg(xmpTagName), e);
+                                    .arg(xmpTagName), e);
     }
 
 #endif // _XMP_SUPPORT_
@@ -793,11 +804,13 @@
             d->xmpMetadata.erase(it);
             return true;
         }
+
+        return true;
     }
     catch( Exiv2::Error &e )
     {
         d->printExiv2ExceptionError("Cannot remove Xmp tag using Exiv2 ", e);
-    }        
+    }
 
 #endif // _XMP_SUPPORT_
 
@@ -818,16 +831,16 @@
 
     QStringList oldkeys = getXmpKeywords();
     QStringList newkeys = newKeywords;
-    
-    // Create a list of keywords including old one witch already exists.
-    for (QStringList::Iterator it = oldkeys.begin(); it != oldkeys.end(); ++it )
+
+    // Create a list of keywords including old one which already exists.
+    for (QStringList::const_iterator it = oldkeys.constBegin(); it != oldkeys.constEnd(); ++it )
     {
         if (!newkeys.contains(*it))
             newkeys.append(*it);
     }
 
     if (setXmpTagStringBag("Xmp.dc.subject", newkeys, false))
-        return false;
+        return true;
 
 #endif // _XMP_SUPPORT_
 
@@ -846,18 +859,18 @@
     if (!setProgramId(setProgramName))
         return false;
 
-    QStringList oldSubCat = getXmpSubCategories();
+    const QStringList oldSubCat = getXmpSubCategories();
     QStringList newSubCat = newSubCategories;
-    
-    // Create a list of sub-categories including old one witch already exists.
-    for (QStringList::Iterator it = oldSubCat.begin(); it != oldSubCat.end(); ++it )
+
+    // Create a list of sub-categories including old one which already exists.
+    for (QStringList::const_iterator it = oldSubCat.constBegin(); it != oldSubCat.constEnd(); ++it )
     {
         if (!newSubCat.contains(*it))
             newSubCat.append(*it);
     }
 
     if (setXmpTagStringBag("Xmp.photoshop.SupplementalCategories", newSubCat, false))
-        return false;
+        return true;
 
 #endif // _XMP_SUPPORT_
 
@@ -878,16 +891,16 @@
 
     QStringList oldSubjectCodes = getXmpSubjects();
     QStringList newSubjectCodes = newSubjects;
-    
-    // Create a list of sub-categories including old one witch already exists.
-    for (QStringList::Iterator it = oldSubjectCodes.begin(); it != oldSubjectCodes.end(); ++it )
+
+    // Create a list of sub-categories including old one which already exists.
+    for (QStringList::const_iterator it = oldSubjectCodes.constBegin(); it != oldSubjectCodes.constEnd(); ++it )
     {
         if (!newSubjectCodes.contains(*it))
             newSubjectCodes.append(*it);
     }
 
     if (setXmpTagStringBag("Xmp.iptc.SubjectCode", newSubjectCodes, false))
-        return false;
+        return true;
 
 #endif // _XMP_SUPPORT_
 
Index: TODO
===================================================================
--- TODO	(.../tags/KDE/4.1.4/kdegraphics/libs/libkexiv2)	(revision 907970)
+++ TODO	(.../trunk/KDE/kdegraphics/libs/libkexiv2)	(revision 907970)
@@ -1,3 +1,3 @@
 - Extract GPS info from XMP tags.
-- Exif/Iptc => Xmp synchrosization.
+- Exif/Iptc => Xmp synchronization.
 - Xmp side-car file support.
Index: NEWS
===================================================================
--- NEWS	(.../tags/KDE/4.1.4/kdegraphics/libs/libkexiv2)	(revision 907970)
+++ NEWS	(.../trunk/KDE/kdegraphics/libs/libkexiv2)	(revision 907970)
@@ -1,9 +1,27 @@
-0.2.0
+0.4.0 - 
+
+- Use kDebug(51003) instead qDebug()
+
+0.3.0 - Released with KDE 4.1.2
 ------------------------------------------------------------------------
+
+- API changed: Added 2 new static methods to init and clear non re-entrant Adobe XMP 
+               SDK code from Exiv2 core. This code must be called before and after 
+               all multithreaded operations with KExiv2.
+               * initializeExiv2().        
+               * cleanupExiv2().       
+               Added a new method to load image data from a byte array.
+
+Bugs fixed from B.K.O (http://bugs.kde.org):
+001 ==> 166424: Crash when editing Caption with Digikam4 SVN.
+
+0.2.0 - Released with KDE 4.1.0
+------------------------------------------------------------------------
 Port to CMake/KDE4/QT4
 Support of XMP metadata (require Exiv2 0.16)
 Split methods to separate files to provide a more readable implementation.
 New method to fix orientation of a QImage accordingly with Exif orientation tag.
+Moved from extragear/libs to kdegraphics/libs
 
 Bugs fixed from B.K.O (http://bugs.kde.org):
 001 ==> 146864: Lesser XMP support in digiKam.
Index: CMakeLists.txt
===================================================================
--- CMakeLists.txt	(.../tags/KDE/4.1.4/kdegraphics/libs/libkexiv2)	(revision 907970)
+++ CMakeLists.txt	(.../trunk/KDE/kdegraphics/libs/libkexiv2)	(revision 907970)
@@ -15,11 +15,15 @@
 # 0.1.7 => 4.0.1
 # 0.1.8 => 5.0.0
 # ... here we can have new releases from KDE3 branch
-# 0.2.0 => 6.0.0
+# 0.2.0 => 6.0.0     (released with KDE 4.1.0)
+# 0.3.0 => 7.0.0     (released with KDE 4.1.2)
+# 0.4.0 => 7.1.0
+# 0.5.0 => 7.2.0     (Released with KDE 4.2.0)
+# 0.6.0 => 7.3.0     (Released with KDE 4.3.0)
 
 # Library API version
 SET(KEXIV2_LIB_MAJOR_VERSION "0")
-SET(KEXIV2_LIB_MINOR_VERSION "2")
+SET(KEXIV2_LIB_MINOR_VERSION "6")
 SET(KEXIV2_LIB_PATCH_VERSION "0")
 
 # Suffix to add at end of version string. Usual values are:
@@ -29,12 +33,12 @@
 # "-beta3" : beta3 release.
 # "-rc"    : release candidate.
 # ""       : final relase. Can be used in production.
-SET(KEXIV2_LIB_SUFFIX_VERSION "-svn")
+SET(KEXIV2_LIB_SUFFIX_VERSION "")
 
 # Library ABI version used by linker.
 # For details : http://www.gnu.org/software/libtool/manual.html#Updating-version-info
-SET(KEXIV2_LIB_SO_CUR_VERSION "6")
-SET(KEXIV2_LIB_SO_REV_VERSION "0")
+SET(KEXIV2_LIB_SO_CUR_VERSION "7")
+SET(KEXIV2_LIB_SO_REV_VERSION "3")
 SET(KEXIV2_LIB_SO_AGE_VERSION "0")
 
 # =======================================================
@@ -47,7 +51,6 @@
 
 # =======================================================
 
-
 if (EXIV2_FOUND)
   SUBDIRS(libkexiv2)
 
Index: README
===================================================================
--- README	(.../tags/KDE/4.1.4/kdegraphics/libs/libkexiv2)	(revision 907970)
+++ README	(.../trunk/KDE/kdegraphics/libs/libkexiv2)	(revision 907970)
@@ -9,18 +9,20 @@
 -- ABOUT --------------------------------------------------------------
 
 Libkexiv2 is a wrapper around Exiv2 library to manipulate pictures 
-metadata as EXIF/IPTC and XMP.
+metadata as EXIF/IPTC and XMP. Metadata interface follow this paper:
 
+http://www.metadataworkinggroup.com/pdf/mwg_guidance.pdf
+
 This library is used by kipi-plugins, digiKam and others kipi host programs.
 
 The library documentation is available on header files.
 
 -- DEPENDENCIES -------------------------------------------------------
 
-CMake      >= 2.4.x                     http://www.cmake.org
-libqt      >= 4.2.x                     http://www.trolltech.com
-libkde     >= 4.0.x                     http://www.kde.org
-libexiv2   >= 0.12  (0.17 recommended)  http://www.exiv2.org
+CMake      >= 2.4.x                    http://www.cmake.org
+libqt      >= 4.2.x                    http://www.trolltech.com
+libkde     >= 4.0.x                    http://www.kde.org
+libexiv2   >= 0.13  (0.18 recommended) http://www.exiv2.org
 
 Note: Exiv2 >= 0.16 is require to handle XMP metadata.
 
@@ -61,7 +63,7 @@
 
 IMPORTANT : the bugreports and wishlist are hosted by the KDE bugs report 
 system who can be contacted by the standard Kde help menu of plugins dialog. 
-A mail will be automaticly sent to the Kipi mailing list.
+A mail will be automatically sent to the Kipi mailing list.
 There is no need to contact directly the Kipi mailing list for a bug report 
 or a devel wish.
 

kdegraphics-4.1.3-libkipi-0.3.0.patch:

--- NEW FILE kdegraphics-4.1.3-libkipi-0.3.0.patch ---
Index: kipiplugin.desktop
===================================================================
--- kipiplugin.desktop	(.../tags/KDE/4.1.4/kdegraphics/libs/libkipi)	(revision 907970)
+++ kipiplugin.desktop	(.../trunk/KDE/kdegraphics/libs/libkipi)	(revision 907970)
@@ -3,18 +3,21 @@
 X-KDE-ServiceType=KIPI/Plugin
 X-KDE-DerivedName=KIPI Plugin
 Name=KIPIPlugin
+Name[ar]=????????????????????????????
 Name[de]=KIPI-Modul
 Name[el]=???????????????? KIPI
 Name[et]=KIPI plugin
 Name[fr]=Module externe KIPI
 Name[is]=KIPI-??forrit
 Name[ja]=Kipi ???????????????
+Name[lt]=KIPIPriedas
 Name[nds]=KIPI-Moduul
 Name[sv]=KIPI-insticksprogram
 Name[tr]=KIPI Eklentisi
 Name[x-test]=xxKIPIPluginxx
 Name[zh_TW]=KIPI ????????????
 Comment=A KIPI Plugin
+Comment[ar]=???????? ????????????
 Comment[ca]=Un connector KIPI
 Comment[cs]=KIPI modul
 Comment[da]=Et KIPI-plugin
@@ -25,13 +28,12 @@
 Comment[fr]=Un module externe pour KIPI
 Comment[ga]=Breise??n KIPI
 Comment[gl]=Unha extension de KIPI
-Comment[hr]=Dodatak za KIPI
-Comment[hu]=Egy KIPI-b??v??tm??ny
 Comment[is]=KIPI ??forrit
 Comment[it]=Un plugin di KIPI
 Comment[ja]=Kipi ???????????????
 Comment[km]=?????????????????????????????????????????? KIPI
 Comment[ko]=KIPI ????????????
+Comment[lt]=KIPI priedas
 Comment[lv]=KIPI spraudnis
 Comment[nds]=En KIPI-Moduul
 Comment[nl]=Een KIPI-plugin
@@ -39,6 +41,7 @@
 Comment[pl]=Wtyczka KIPI
 Comment[pt]=Um 'Plugin' do KIPI
 Comment[pt_BR]=Um Plug-in do KIPI
+Comment[ro]=Un modul KIPI
 Comment[ru]=???????????? KIPI
 Comment[sl]=Vstavek KIPI
 Comment[sv]=Ett KIPI-insticksprogram
Index: libkipi/interface.cpp
===================================================================
--- libkipi/interface.cpp	(.../tags/KDE/4.1.4/kdegraphics/libs/libkipi)	(revision 907970)
+++ libkipi/interface.cpp	(.../trunk/KDE/kdegraphics/libs/libkipi)	(revision 907970)
@@ -4,7 +4,7 @@
  * http://www.kipi-plugins.org
  *
  * Date        : 2004-02-01
- * Description : main kipi host application interface .
+ * Description : main kipi host application interface.
  *
  * Copyright (C) 2004-2008 by Gilles Caulier <caulier dot gilles at gmail dot com>
  * Copyright (C) 2004-2005 by Renchi Raju <renchi.raju at kdemail.net>
@@ -15,12 +15,12 @@
  * 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.
- * 
+ *
  * ============================================================ */
 
 /** @file interface.cpp */
@@ -28,7 +28,6 @@
 // Qt includes.
 
 #include <QPixmap>
-#include <QWidget>
 
 // KDE includes.
 
@@ -38,88 +37,14 @@
 #include <kio/previewjob.h>
 
 // Local includes.
- 
+
 #include "version.h"
 #include "pluginloader.h"
-#include "interface.h"
 #include "imagecollectionselector.h"
 #include "uploadwidget.h"
+#include "interface.h"
 #include "interface.moc"
 
-/*!
-  @enum KIPI::Features
-  Not all host applications support the full subset of features that KIPI
-  allows access to. As an example <a
-  href="http://ktown.kde.org/kimdaba/">KimDaBa</a> do not support comments
-  for albums. Thus before a plugin expect a decant value for the comment,
-  it should check whether KIPI::CollectionsHaveComments are set. It does so
-  using KIPI::Interface::hasFeature()
-  When adding new items, remember to update "hasFeature( const QString& feature )"
-  and the hello world plugin.
-  */
-
-/*!
-  \enum KIPI::CollectionsHaveComments
-  This feature specify that albums have descriptions associated to them.
- */
-
-/*!
-  \enum KIPI::ImagesHasComments
-  This feature specifies that images in the host application has descriptions associated to them.
- */
-
-/*!
-  \enum KIPI::ImagesHasTime
-  This feature specifies that images has a date associated with it, which the host application can display and set.
-*/
-
-/*!
-  \enum KIPI::HostSupportsDateRanges
-  This feature specify whether the host application supports that the user can specify a date range for images, like 1998-2000.
-*/
-
-/*!
-  \enum KIPI::HostAcceptNewImages
-  This feature specifies that the host application do accept new images.
-  Use \ref ImageCollection::uploadPath to find the location to place the image, and
-  \ref KIPI::Interface::addImage() to tell the host application about the new image.
-*/
-
-/*!
-  \enum KIPI::ImagesHasTitlesWritable
-  This features specifies whether the plugin can change the title for images.
-*/
-
-/*!
-  \enum KIPI::CollectionHaveCategory
-  This feature specify that collections are category associated to them ('travels', 'friends', 'monuments', etc.).
-*/
-
-/*!
-  \enum KIPI::CollectionsHaveCreationDate
-  This feature specify that collections are a creation date associated to them.
-*/
-
-/*!
-  \enum KIPI::HostSupportsProgressBar
-  This feature specify whether the host application has a progress bar available for batch operations.
-*/
-
-/*!
-  \enum KIPI::HostSupportsTags
-  This feature specify whether the host application supports keywords for images.
-*/
-
-/*!
-  \enum KIPI::HostSupportsRating
-  This feature specify whether the host application supports rating values for images.
-*/
-
-/*!
-  \enum KIPI::HostSupportsThumbnails
-  This feature specifies that host application can provide image thumbnails.
- */
-
 namespace KIPI
 {
 
@@ -133,23 +58,15 @@
 {
 }
 
-/** Returns a string version of libkipi release */
 QString KIPI::Interface::version()
 {
     return QString(kipi_version);
 }
 
-/**
-   Tells the host app that the following images has changed on disk
-*/
 void Interface::refreshImages( const KUrl::List& )
 {
 }
 
-/**
-   Tells whether the host application under which the plugin currently executes a given feature.
-   See KIPI::Features for details on the individual features.
-*/
 bool Interface::hasFeature( KIPI::Features feature ) const
 {
     return ( features() & feature ) != 0;
@@ -188,11 +105,6 @@
     }
 }
 
-/*!
-  Tell the host application that a new image has been made available to it.
-  Returns true if the host application did accept the new image, otherwise err will be filled with
-  an error description.
-*/
 bool Interface::addImage( const KUrl&, QString& /*err*/ )
 {
     kWarning(51000) << "Interface::addImage should only be invoked if the host application supports the KIPI::Features\n"
@@ -205,63 +117,30 @@
 {
 }
 
-/**
-   Returns list of all images in current album.
-   If there are no current album, the returned
-   KIPI::ImageCollection::isValid() will return false.
-*/
 KIPI::ImageCollection KIPI::Interface::currentAlbum()
 {
     // This implementation is just to be able to write documentation above.
     return ImageCollection();
 }
 
-/**
-   Current selection in a thumbnail view for example.
-   If there are no current selection, the returned
-   KIPI::ImageCollection::isValid() will return false.
-*/
 ImageCollection Interface::currentSelection()
 {
     // This implementation is just to be able to write documentation above.
     return KIPI::ImageCollection();
 }
 
-/**
-   Returns a list of albums.
-*/
 QList<ImageCollection> Interface::allAlbums()
 {
     // This implementation is just to be able to write documentation above.
     return QList<ImageCollection>();
 }
 
-/**
-   Return a bitwise or of the KIPI::Features that thus application support.
-*/
 int Interface::features() const
 {
     // This implementation is just to be able to write documentation above.
     return 0;
 }
 
-/**
-   Return a list of images file extension will be used in the plugins for 
-   to sort the files list before a treatment. The default implementation return,
-   the supported images formats by KDE.
-*/
-QString Interface::fileExtensions()
-{
-    QStringList KDEImagetypes = KImageIO::mimeTypes( KImageIO::Reading );
-    QString imagesFileFilter = KDEImagetypes.join(" ");
-    return ( imagesFileFilter.toLower() + " " + imagesFileFilter.toUpper() );
-}
-
-/**
-  Ask to Kipi host application to render a thumbnail for an image. If this method is not 
-  re-implemented in host, standard KIO::filePreview is used to generated a thumbnail.
-  Use gotThumbnail() signal to take thumb.
-*/
 void Interface::thumbnail( const KUrl& url, int size )
 {
     KUrl::List list;
@@ -269,11 +148,6 @@
     thumbnails(list, size);
 }
 
-/**
-  Ask to Kipi host application to render thumbnails for a list of images. If this method is not 
-  re-implemented in host, standard KIO::filePreview is used to generated a thumbnail. 
-  Use gotThumbnail() signal to take thumbs.
-*/
 void Interface::thumbnails( const KUrl::List& list, int size )
 {
     KIO::PreviewJob *job = KIO::filePreview(list, size);
@@ -295,4 +169,30 @@
     emit gotThumbnail(item.url(), QPixmap());
 }
 
+QString Interface::fileExtensions()
+{
+    return (KDEfileExtensions());
+}
+
+QVariant Interface::hostSetting(const QString& settingName)
+{
+    if (settingName == QString("WriteMetadataToRAW"))
+    {
+        return false;
+    }
+    else if (settingName == QString("FileExtensions"))
+    {
+        return KDEfileExtensions();
+    }
+
+    return QVariant();
+}
+
+QString Interface::KDEfileExtensions() const
+{
+    QStringList KDEImagetypes = KImageIO::mimeTypes( KImageIO::Reading );
+    QString imagesFileFilter = KDEImagetypes.join(" ");
+    return ( imagesFileFilter.toLower() + " " + imagesFileFilter.toUpper() );
+}
+
 } // namespace KIPI
Index: libkipi/interface.h
===================================================================
--- libkipi/interface.h	(.../tags/KDE/4.1.4/kdegraphics/libs/libkipi)	(revision 907970)
+++ libkipi/interface.h	(.../trunk/KDE/kdegraphics/libs/libkipi)	(revision 907970)
@@ -15,12 +15,12 @@
  * 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.
- * 
+ *
  * ============================================================ */
 
 /** @file interface.h */
@@ -31,6 +31,7 @@
 // Qt includes.
 
 #include <QtCore/QObject>
+#include <QtCore/QVariant>
 #include <QtCore/QList>
 
 // KDE includes.
@@ -55,7 +56,81 @@
 class ImageCollectionSelector;
 class UploadWidget;
 
-enum Features 
+/*!
+  @enum KIPI::Features
+  Not all host applications support the full subset of features that KIPI
+  allows access to. As an example <a
+  href="http://www.digikam.org">digiKam</a> support comments
+  for albums. Thus before a plugin expect a decant value for the comment,
+  it should check whether KIPI::CollectionsHaveComments are set. It does so
+  using KIPI::Interface::hasFeature()
+  When adding new items, remember to update "hasFeature( const QString& feature )"
+  and the hello world plugin.
+  */
+
+/*!
+  \enum KIPI::CollectionsHaveComments
+  This feature specify that albums have descriptions associated to them.
+ */
+
+/*!
+  \enum KIPI::ImagesHasComments
+  This feature specifies that images in the host application has descriptions associated to them.
+ */
+
+/*!
+  \enum KIPI::ImagesHasTime
+  This feature specifies that images has a date associated with it, which the host application can display and set.
+*/
+
+/*!
+  \enum KIPI::HostSupportsDateRanges
+  This feature specify whether the host application supports that the user can specify a date range for images, like 1998-2000.
+*/
+
+/*!
+  \enum KIPI::HostAcceptNewImages
+  This feature specifies that the host application do accept new images.
+  Use \ref ImageCollection::uploadPath to find the location to place the image, and
+  \ref KIPI::Interface::addImage() to tell the host application about the new image.
+*/
+
+/*!
+  \enum KIPI::ImagesHasTitlesWritable
+  This features specifies whether the plugin can change the title for images.
+*/
+
+/*!
+  \enum KIPI::CollectionHaveCategory
+  This feature specify that collections are category associated to them ('travels', 'friends', 'monuments', etc.).
+*/
+
+/*!
+  \enum KIPI::CollectionsHaveCreationDate
+  This feature specify that collections are a creation date associated to them.
+*/
+
+/*!
+  \enum KIPI::HostSupportsProgressBar
+  This feature specify whether the host application has a progress bar available for batch operations.
+*/
+
+/*!
+  \enum KIPI::HostSupportsTags
+  This feature specify whether the host application supports keywords for images.
+*/
+
+/*!
+  \enum KIPI::HostSupportsRating
+  This feature specify whether the host application supports rating values for images.
+*/
+
+/*!
+  \enum KIPI::HostSupportsThumbnails
+  This feature specifies that host application can provide image thumbnails.
+ */
+
+enum Features
 {
     CollectionsHaveComments     = 1 << 0,
     ImagesHasComments           = 1 << 1,
@@ -82,36 +157,95 @@
     Interface(QObject *parent, const char *name=0);
     virtual ~Interface();
 
+    /**
+      Returns list of all images in current album.
+      If there are no current album, the returned
+      KIPI::ImageCollection::isValid() will return false.
+    */
     virtual ImageCollection currentAlbum() = 0;
+
+    /**
+      Current selection in a thumbnail view for example.
+      If there are no current selection, the returned
+      KIPI::ImageCollection::isValid() will return false.
+    */
     virtual ImageCollection currentSelection() = 0;
+
+    /**
+      Returns a list of albums.
+    */
     virtual QList<ImageCollection> allAlbums() = 0;
 
-    virtual ImageInfo info( const KUrl& ) = 0;
-    virtual bool addImage( const KUrl&, QString& err );
-    virtual void delImage( const KUrl& );
+    virtual ImageInfo info(const KUrl&) = 0;
 
-    virtual void refreshImages( const KUrl::List& );
+    /**
+      Tell the host application that a new image has been made available to it.
+      Returns true if the host application did accept the new image, otherwise err will be filled with
+      an error description.
+    */
+    virtual bool addImage(const KUrl&, QString& err);
+    virtual void delImage(const KUrl&);
 
-    virtual QString fileExtensions();
+    /**
+      Tells the host app that the following images has changed on disk
+    */
+    virtual void refreshImages(const KUrl::List&);
 
-    virtual void thumbnail( const KUrl& url, int size );
-    virtual void thumbnails( const KUrl::List& list, int size );
+    /**
+      Return a list of images file extensions which will be used in the plugins 
+      to sort the files list before treatements. The default implementation return,
+      the supported images formats by KDE.
+      Use hostSetting("FileExtensions") instead.
+    */
+    KDE_DEPRECATED virtual QString fileExtensions();
 
+    /**
+      Ask to Kipi host application to render a thumbnail for an image. If this method is not 
+      re-implemented in host, standard KIO::filePreview is used to generated a thumbnail.
+      Use gotThumbnail() signal to take thumb.
+    */
+    virtual void thumbnail(const KUrl& url, int size);
+    /**
+      Ask to Kipi host application to render thumbnails for a list of images. If this method is not 
+      re-implemented in host, standard KIO::filePreview is used to generated a thumbnail. 
+      Use gotThumbnail() signal to take thumbs.
+    */
+    virtual void thumbnails(const KUrl::List& list, int size);
+
     virtual ImageCollectionSelector* imageCollectionSelector(QWidget *parent)=0;
     virtual UploadWidget* uploadWidget(QWidget *parent)=0;
 
-    bool hasFeature( KIPI::Features feature ) const;
+    /**
+      Ask to Kipi host application to return a setting to share with plugins, for example to write 
+      metadata on RAW files.
+      Current setting names are:
+         "WriteMetadataToRAW" (bool)       is true if RAW files metadata can be changed.
+         "FileExtensions"     (QString)    same than fileExtensions().
+    */
+    virtual QVariant hostSetting(const QString& settingName);
 
+    /**
+      Tells whether the host application under which the plugin currently executes a given feature.
+      See KIPI::Features for details on the individual features.
+    */
+    bool hasFeature(KIPI::Features feature) const;
+
+    /**
+      Returns a string version of libkipi release
+    */
     static QString version();
 
 Q_SIGNALS:
 
-    void selectionChanged( bool hasSelection );
-    void currentAlbumChanged( bool anyAlbum );
-    void gotThumbnail( const KUrl&, const QPixmap& );
+    void selectionChanged(bool hasSelection);
+    void currentAlbumChanged(bool anyAlbum);
+    void gotThumbnail(const KUrl&, const QPixmap&);
 
 protected:
 
+    /**
+      Return a bitwise or of the KIPI::Features that thus application support.
+    */
     virtual int features() const = 0;
 
 private Q_SLOTS:
@@ -122,7 +256,13 @@
 private:
 
     friend class PluginLoader;
-    bool hasFeature( const QString& feature ) const;
+    
+    bool hasFeature(const QString& feature) const;
+    
+    /**
+      Return a list of images file extensions supported by KDE
+    */
+    QString KDEfileExtensions() const;
 };
 
 }  // namespace KIPI
Index: libkipi/imagecollectionshared.cpp
===================================================================
--- libkipi/imagecollectionshared.cpp	(.../tags/KDE/4.1.4/kdegraphics/libs/libkipi)	(revision 907970)
+++ libkipi/imagecollectionshared.cpp	(.../trunk/KDE/kdegraphics/libs/libkipi)	(revision 907970)
@@ -15,12 +15,12 @@
  * 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.
- * 
+ *
  * ============================================================ */
 
 // KDE Includes.
@@ -49,7 +49,7 @@
     _count--;
     if ( _count == 0 ) 
     {
-        // qDebug("Deleting!");
+        // kDebug(51000) << "Deleting!" << endl;
         delete this;
     }
 }
Index: libkipi/pluginloader.cpp
===================================================================
--- libkipi/pluginloader.cpp	(.../tags/KDE/4.1.4/kdegraphics/libs/libkipi)	(revision 907970)
+++ libkipi/pluginloader.cpp	(.../trunk/KDE/kdegraphics/libs/libkipi)	(revision 907970)
@@ -228,7 +228,7 @@
         }
 
         bool appHasAllReqFeatures=true;
-        for( QStringList::Iterator featureIt = reqFeatures.begin(); featureIt != reqFeatures.end(); ++featureIt ) 
+        for( QStringList::const_iterator featureIt = reqFeatures.constBegin(); featureIt != reqFeatures.constEnd(); ++featureIt ) 
         {
             if ( !d->m_interface->hasFeature( *featureIt ) ) 
             {
@@ -333,8 +333,8 @@
     lay->setMargin(KDialog::marginHint());
     lay->setSpacing(KDialog::spacingHint());
 
-    PluginLoader::PluginList list = PluginLoader::instance()->d->m_pluginList;
-    for( PluginLoader::PluginList::Iterator it = list.begin(); it != list.end(); ++it ) 
+    const PluginLoader::PluginList list = PluginLoader::instance()->d->m_pluginList;
+    for( PluginLoader::PluginList::ConstIterator it = list.constBegin(); it != list.constEnd(); ++it ) 
     {
         PluginCheckBox* cb = new PluginCheckBox( *it, top );
         lay->addWidget( cb );
Index: ChangeLog
===================================================================
--- ChangeLog	(.../tags/KDE/4.1.4/kdegraphics/libs/libkipi)	(revision 907970)
+++ ChangeLog	(.../trunk/KDE/kdegraphics/libs/libkipi)	(revision 907970)
@@ -242,7 +242,7 @@
 	  trunk/extragear/libs/libkipi/libkipi/plugin.h,
 	  trunk/extragear/libs/libkipi/libkipi/pluginloader.cpp: Made some
 	  minor changes to generate the Dox for some classes. It is
-	  documented better then I thought.
+	  documented better than I thought.
 
 2005-06-22 13:34  lunakl
 
Index: NEWS
===================================================================
--- NEWS	(.../tags/KDE/4.1.4/kdegraphics/libs/libkipi)	(revision 907970)
+++ NEWS	(.../trunk/KDE/kdegraphics/libs/libkipi)	(revision 907970)
@@ -1,15 +1,21 @@
-0.2.0
+0.3.0 - Released with KDE 4.2.0
 ------------------------------------------------------------------------
 
-	o Port to CMake/KDE4/QT4
+- Added new method top get settings from kipi host.
 
+0.2.0 - Released with KDE 4.1.0
+------------------------------------------------------------------------
+
+- Port to CMake/KDE4/QT4
+- Moved from extragear/libs to kdegraphics/libs
+
 API changes:
 
-	o new virtual method ImageInfoShared::delAttributes()
-	o new virtual method Interface::imagecollectionselector()
-	o BatchProcessDialog moved to KIPIPlugins common library.
-        o ImageDialog moved to KIPIPlugins common library.
-	o Removed all i18n. libkipi is now a low level interface.
+-  new virtual method ImageInfoShared::delAttributes()
+-  new virtual method Interface::imagecollectionselector()
+-  BatchProcessDialog moved to KIPIPlugins common library.
+-  ImageDialog moved to KIPIPlugins common library.
+-  Removed all i18n. libkipi is now a low level interface.
 
 Bugs fixed:
 
@@ -17,47 +23,44 @@
 002 ==> 147865 : Image>email image>add image dialog does not show most thumbnails - but does show some.
 003 ==> 131429 : Selection of target album is "batch resize" has strange behavior.
 004 ==> 088118 : Target image options should select new folder when created.
-005 ==> 
 
-0.1.6-svn
+0.1.6
 ------------------------------------------------------------------------
-New features:
 
-Bugs fixed:
-
 API changes:
+- Added a version method to get runtime library version.
 
 -------------------------------------------------------------------------
 0.1.5
-	o changed icons and added new kipi logo
-	o changed uploadwidget
+-  changed icons and added new kipi logo
+-  changed uploadwidget
 
 API changes:
-	o added KIPI::Features enum value: HostSupportsTags
+-  added KIPI::Features enum value: HostSupportsTags
 
 -------------------------------------------------------------------------
 0.1.4
 
 Bugs fixed:
 
-	o fix FTBFS (fails to build from source) when libkipi is
-	  build the first time on a system.
+-  fix FTBFS (fails to build from source) when libkipi is
+   build the first time on a system.
 
 -------------------------------------------------------------------------
 0.1.3
 
 New features:
 
-	o Make loadPlugin() public, so that it's possible to load plugins
-          selectively, and raise version to 1.0.1, so that this API change
-	  can be detected
+-  Make loadPlugin() public, so that it's possible to load plugins
+   selectively, and raise version to 1.0.1, so that this API change
+   can be detected
 
 Bugs fixed:
 
-	o various build fixes
+- various build fixes
 
-	o batchprogressdialog: Removed help button. It does not point to
-	  any usefull documentation. BUG: 99418
+-  batchprogressdialog: Removed help button. It does not point to
+   any usefull documentation. BUG: 99418
 
 -------------------------------------------------------------------------
 For details and info about previous versions, see ChangeLog.
Index: CMakeLists.txt
===================================================================
--- CMakeLists.txt	(.../tags/KDE/4.1.4/kdegraphics/libs/libkipi)	(revision 907970)
+++ CMakeLists.txt	(.../trunk/KDE/kdegraphics/libs/libkipi)	(revision 907970)
@@ -13,11 +13,12 @@
 # 0.1.5 => 1.1.1
 # 0.1.6 => 2.0.0
 # ... here we can have new releases from KDE3 branch
-# 0.2.0 => 5.0.0
+# 0.2.0 => 5.0.0  (released with KDE 4.1.0)
+# 0.3.0 => 6.0.0  (released with KDE 4.2.0)
 
 # Library API version
 SET(KIPI_LIB_MAJOR_VERSION "0")
-SET(KIPI_LIB_MINOR_VERSION "2")
+SET(KIPI_LIB_MINOR_VERSION "3")
 SET(KIPI_LIB_PATCH_VERSION "0")
 
 # Suffix to add at end of version string. Usual values are:
@@ -27,11 +28,11 @@
 # "-beta3" : beta3 release.
 # "-rc"    : release candidate.
 # ""       : final relase. Can be used in production.
-SET(KIPI_LIB_SUFFIX_VERSION "-svn")
+SET(KIPI_LIB_SUFFIX_VERSION "")
 
 # Library ABI version used by linker.
 # For details : http://www.gnu.org/software/libtool/manual.html#Updating-version-info
-SET(KIPI_LIB_SO_CUR_VERSION "5")
+SET(KIPI_LIB_SO_CUR_VERSION "6")
 SET(KIPI_LIB_SO_REV_VERSION "0")
 SET(KIPI_LIB_SO_AGE_VERSION "0")
 
Index: README
===================================================================
--- README	(.../tags/KDE/4.1.4/kdegraphics/libs/libkipi)	(revision 907970)
+++ README	(.../trunk/KDE/kdegraphics/libs/libkipi)	(revision 907970)
@@ -52,7 +52,7 @@
 
 IMPORTANT : the bugreports and wishlist are hosted by the KDE bugs report 
 system who can be contacted by the standard Kde help menu of plugins dialog. 
-A mail will be automaticly sent to the Kipi mailing list.
+A mail will be automatically sent to the Kipi mailing list.
 There is no need to contact directly the Kipi mailing list for a bug report 
 or a devel wish.
 


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdegraphics/F-9/.cvsignore,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- .cvsignore	5 Nov 2008 19:17:43 -0000	1.46
+++ .cvsignore	9 Jan 2009 00:41:29 -0000	1.47
@@ -1 +1 @@
-kdegraphics-4.1.3.tar.bz2
+kdegraphics-4.1.4.tar.bz2


Index: kdegraphics.spec
===================================================================
RCS file: /cvs/extras/rpms/kdegraphics/F-9/kdegraphics.spec,v
retrieving revision 1.160
retrieving revision 1.161
diff -u -r1.160 -r1.161
--- kdegraphics.spec	8 Jan 2009 05:50:23 -0000	1.160
+++ kdegraphics.spec	9 Jan 2009 00:41:30 -0000	1.161
@@ -7,8 +7,8 @@
 
 Summary:        K Desktop Environment - Graphics Applications
 Epoch:          7
-Version:        4.1.3
-Release:        6%{?dist}
+Version:        4.1.4
+Release:        1%{?dist}
 
 Name:           kdegraphics
 #Obsoletes:     kdegraphics4 < %{version}-%{release}
@@ -226,6 +226,9 @@
 
 
 %changelog
+* Fri Jan  9 2009 Luk???? Tinkl <ltinkl at redhat.com> 4.1.4-1
+- KDE 4.1.4
+
 * Thu Jan 08 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.3-6
 - BR ebook-tools-devel
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdegraphics/F-9/sources,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- sources	5 Nov 2008 19:17:43 -0000	1.52
+++ sources	9 Jan 2009 00:41:30 -0000	1.53
@@ -1 +1 @@
-62513c5d92fae359705266eb2365c526  kdegraphics-4.1.3.tar.bz2
+c2a67098d9df60e839d2af6b866989ef  kdegraphics-4.1.4.tar.bz2


--- kdegraphics-4.1.2-libkdcraw-0.4.0.patch DELETED ---


--- kdegraphics-4.1.2-libkexiv2-0.4.0.patch DELETED ---



From whot at fedoraproject.org  Fri Jan  9 00:51:17 2009
From: whot at fedoraproject.org (Peter Hutterer)
Date: Fri,  9 Jan 2009 00:51:17 +0000 (UTC)
Subject: rpms/xorg-x11-drv-vmmouse/F-10 .cvsignore, 1.10, 1.11 sources, 1.10,
	1.11 xorg-x11-drv-vmmouse.spec, 1.20, 1.21
Message-ID: <20090109005117.69CAF7013F@cvs1.fedora.phx.redhat.com>

Author: whot

Update of /cvs/pkgs/rpms/xorg-x11-drv-vmmouse/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23753

Modified Files:
	.cvsignore sources xorg-x11-drv-vmmouse.spec 
Log Message:
* Fri Jan 09 2009 Peter Hutterer <peter.hutterer at redhat.com> 12.6.3-1
- vmmouse 12.6.3




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-vmmouse/F-10/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	17 Nov 2008 06:56:57 -0000	1.10
+++ .cvsignore	9 Jan 2009 00:50:46 -0000	1.11
@@ -1 +1 @@
-xf86-input-vmmouse-12.6.2.tar.bz2
+xf86-input-vmmouse-12.6.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-vmmouse/F-10/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	17 Nov 2008 06:56:57 -0000	1.10
+++ sources	9 Jan 2009 00:50:46 -0000	1.11
@@ -1 +1 @@
-1d5ea3d7aaadbe037e5377a1e266d20d  xf86-input-vmmouse-12.6.2.tar.bz2
+f5933143d7789557983ecb527092d14e  xf86-input-vmmouse-12.6.3.tar.bz2


Index: xorg-x11-drv-vmmouse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-vmmouse/F-10/xorg-x11-drv-vmmouse.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- xorg-x11-drv-vmmouse.spec	17 Nov 2008 06:56:58 -0000	1.20
+++ xorg-x11-drv-vmmouse.spec	9 Jan 2009 00:50:46 -0000	1.21
@@ -4,7 +4,7 @@
 
 Summary:   Xorg X11 vmmouse input driver
 Name:      xorg-x11-drv-vmmouse
-Version:   12.6.2
+Version:   12.6.3
 Release:   1%{?dist}
 URL:       http://www.x.org
 License:   MIT
@@ -51,6 +51,9 @@
 %{_datadir}/hal/fdi/policy/20thirdparty/11-x11-vmmouse.fdi
 
 %changelog
+* Fri Jan 09 2009 Peter Hutterer <peter.hutterer at redhat.com> 12.6.3-1
+- vmmouse 12.6.3
+
 * Mon Nov 17 2008 Peter Hutterer <peter.hutterer at redhat.com> 12.6.2-1
 - vmmouse 12.6.2
 



From ltinkl at fedoraproject.org  Fri Jan  9 01:03:59 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Fri,  9 Jan 2009 01:03:59 +0000 (UTC)
Subject: rpms/kdemultimedia/F-9 .cvsignore, 1.50, 1.51 kdemultimedia.spec,
	1.118, 1.119 sources, 1.53, 1.54
Message-ID: <20090109010359.09C267011C@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kdemultimedia/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25402/F-9

Modified Files:
	.cvsignore kdemultimedia.spec sources 
Log Message:
KDE 4.1.4



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdemultimedia/F-9/.cvsignore,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- .cvsignore	5 Nov 2008 19:41:52 -0000	1.50
+++ .cvsignore	9 Jan 2009 01:03:28 -0000	1.51
@@ -1 +1 @@
-kdemultimedia-4.1.3.tar.bz2
+kdemultimedia-4.1.4.tar.bz2


Index: kdemultimedia.spec
===================================================================
RCS file: /cvs/extras/rpms/kdemultimedia/F-9/kdemultimedia.spec,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -r1.118 -r1.119
--- kdemultimedia.spec	20 Nov 2008 17:21:26 -0000	1.118
+++ kdemultimedia.spec	9 Jan 2009 01:03:28 -0000	1.119
@@ -1,7 +1,7 @@
 Name: kdemultimedia
 Epoch: 6
-Version: 4.1.3
-Release: 2%{?dist}
+Version: 4.1.4
+Release: 1%{?dist}
 Summary: K Desktop Environment - Multimedia applications
 
 Group:     Applications/Multimedia
@@ -148,6 +148,9 @@
 
 
 %changelog
+* Fri Jan  9 2009 Luk???? Tinkl <ltinkl at redhat.com> 4.1.4-1
+- KDE 4.1.4
+
 * Thu Nov 20 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.3-2
 - -devel: drop Req: kdebase-workspace-devel
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdemultimedia/F-9/sources,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- sources	5 Nov 2008 19:41:52 -0000	1.53
+++ sources	9 Jan 2009 01:03:28 -0000	1.54
@@ -1 +1 @@
-5ccc4ff4b5a53c85db36e05bfdb2f01a  kdemultimedia-4.1.3.tar.bz2
+4a4e046f0b862e7be9e916e0e29ed188  kdemultimedia-4.1.4.tar.bz2



From ltinkl at fedoraproject.org  Fri Jan  9 01:03:58 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Fri,  9 Jan 2009 01:03:58 +0000 (UTC)
Subject: rpms/kdemultimedia/F-10 .cvsignore, 1.55, 1.56 kdemultimedia.spec, 
	1.125, 1.126 sources, 1.58, 1.59
Message-ID: <20090109010358.CCC437011C@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kdemultimedia/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25402/F-10

Modified Files:
	.cvsignore kdemultimedia.spec sources 
Log Message:
KDE 4.1.4



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdemultimedia/F-10/.cvsignore,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- .cvsignore	27 Sep 2008 02:06:51 -0000	1.55
+++ .cvsignore	9 Jan 2009 01:03:28 -0000	1.56
@@ -1 +1 @@
-kdemultimedia-4.1.2.tar.bz2
+kdemultimedia-4.1.4.tar.bz2


Index: kdemultimedia.spec
===================================================================
RCS file: /cvs/extras/rpms/kdemultimedia/F-10/kdemultimedia.spec,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -r1.125 -r1.126
--- kdemultimedia.spec	20 Nov 2008 17:21:26 -0000	1.125
+++ kdemultimedia.spec	9 Jan 2009 01:03:28 -0000	1.126
@@ -1,7 +1,7 @@
 Name: kdemultimedia
 Epoch: 6
-Version: 4.1.3
-Release: 2%{?dist}
+Version: 4.1.4
+Release: 1%{?dist}
 Summary: K Desktop Environment - Multimedia applications
 
 Group:     Applications/Multimedia
@@ -148,6 +148,9 @@
 
 
 %changelog
+* Fri Jan  9 2009 Luk???? Tinkl <ltinkl at redhat.com> 4.1.4-1
+- KDE 4.1.4
+
 * Thu Nov 20 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.3-2
 - -devel: drop Req: kdebase-workspace-devel
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdemultimedia/F-10/sources,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- sources	12 Nov 2008 00:07:11 -0000	1.58
+++ sources	9 Jan 2009 01:03:28 -0000	1.59
@@ -1 +1 @@
-5ccc4ff4b5a53c85db36e05bfdb2f01a  kdemultimedia-4.1.3.tar.bz2
+4a4e046f0b862e7be9e916e0e29ed188  kdemultimedia-4.1.4.tar.bz2



From rdieter at fedoraproject.org  Fri Jan  9 01:32:24 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri,  9 Jan 2009 01:32:24 +0000 (UTC)
Subject: rpms/phonon/devel phonon.spec,1.20,1.21 sources,1.9,1.10
Message-ID: <20090109013224.0F3C87011C@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/phonon/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27859

Modified Files:
	phonon.spec sources 
Log Message:
* Thu Jan 08 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.96-3
- new tarball
- put icons/scriptlets into main pkg
- Requires: phonon-backend



Index: phonon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/phonon/devel/phonon.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- phonon.spec	8 Jan 2009 21:11:09 -0000	1.20
+++ phonon.spec	9 Jan 2009 01:31:53 -0000	1.21
@@ -1,12 +1,12 @@
 Summary: Multimedia framework api
 Name:    phonon
 Version: 4.2.96
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 Group:   System Environment/Libraries
 License: LGPLv2+
 URL:     http://phonon.kde.org/
-Source0: ftp://ftp.kde.org/pub/kde/unstable/4.1.80/src/phonon-%{version}.tar.bz2
+Source0: ftp://ftp.kde.org/pub/kde/unstable/4.1.96/src/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
@@ -30,9 +30,12 @@
 BuildRequires: qt4-devel >= 4.4.0
 BuildRequires: xine-lib-devel
 
-## 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
+## hard-code phonon-backend-xine, if yum chooses -gstreamer by default
+#Requires(hint): phonon-backend-xine
+
+Requires(post): /sbin/ldconfig xdg-utils
+Requires(postun): /sbin/ldconfig xdg-utils
 
 %description
 %{summary}.
@@ -44,8 +47,6 @@
 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}.
 
@@ -54,8 +55,6 @@
 Group:   Applications/Multimedia
 Requires: %{name} = %{version}-%{release}
 Provides: phonon-backend = %{version}-%{release}
-Requires(post): xdg-utils
-Requires(postun): xdg-utils
 %description backend-xine
 %{summary}.
 
@@ -96,25 +95,27 @@
 done
 
 
-
 %clean
 rm -rf %{buildroot}
 
 
-%post -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
-
-%post -n %{name}-backend-gstreamer
+%post
+/sbin/ldconfig
 xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
+xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || :
 
-%postun -n %{name}-backend-gstreamer
+%postun
+/sbin/ldconfig
 xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
+xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || 
 
 %files
 %defattr(-,root,root,-)
 %doc COPYING.LIB
-%{_libdir}/libphonon*.so.*
+%{_libdir}/libphonon*.so.4*
 %{_datadir}/dbus-1/interfaces/org.kde.Phonon.AudioOutput.xml
+%{_datadir}/icons/hicolor/*/*/*
+%{_datadir}/icons/oxygen/*/*/*
 # kde4-specific dirs
 %dir %{_kde4_libdir}/kde4/plugins/phonon_backend/
 %dir %{_kde4_datadir}/kde4/services/phononbackends/
@@ -123,16 +124,11 @@
 %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 backend-xine
 %defattr(-,root,root,-)
 %{_kde4_libdir}/kde4/plugins/phonon_backend/phonon_xine.so
 %{_kde4_datadir}/kde4/services/phononbackends/xine.desktop
-%_datadir/icons/hicolor/*/*/*.png
-%_datadir/icons/hicolor/*/*/*.svg
-%_datadir/icons/oxygen/*/*/*
 
 %files devel
 %defattr(-,root,root,-)
@@ -144,6 +140,11 @@
 
 
 %changelog
+* Thu Jan 08 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.96-3
+- new tarball
+- put icons/scriptlets into main pkg
+- Requires: phonon-backend
+
 * Thu Jan 08 2009 Lorenzo Villani <lvillani at binaryhelix.net> - 4.2.96-2
 - add gstreaer-logo.svg
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/phonon/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	8 Jan 2009 21:02:29 -0000	1.9
+++ sources	9 Jan 2009 01:31:53 -0000	1.10
@@ -1 +1 @@
-4c971f70b6e00f573a7664f6849c3e17  phonon-4.2.96.tar.bz2
+35b64db6e850df7d492f812a85b16982  phonon-4.2.96.tar.bz2



From rdieter at fedoraproject.org  Fri Jan  9 01:36:28 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri,  9 Jan 2009 01:36:28 +0000 (UTC)
Subject: rpms/kde-filesystem/devel kde-filesystem.spec, 1.35,
	1.36 macros.kde4, 1.11, 1.12
Message-ID: <20090109013628.A4D6D7011C@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kde-filesystem/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28293

Modified Files:
	kde-filesystem.spec macros.kde4 
Log Message:
* Thu Jan 08 2009 Rex Dieter <rdieter at fedoraproject.org> 4-23
- macros.kde4: use %_cmake_lib_suffix64, %_cmake_lib_suffix64



Index: kde-filesystem.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kde-filesystem/devel/kde-filesystem.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- kde-filesystem.spec	4 Dec 2008 21:50:52 -0000	1.35
+++ kde-filesystem.spec	9 Jan 2009 01:35:58 -0000	1.36
@@ -17,7 +17,7 @@
 Summary: KDE filesystem layout
 Name: kde-filesystem
 Version: 4
-Release: 22%{?dist}
+Release: 23%{?dist}
 
 Group: System Environment/Base
 License: Public Domain
@@ -33,7 +33,6 @@
 
 Source3: applnk-hidden-directory
 
-# Requires: kde4-macros(api) = %{_kde4_macros_api}
 Provides: kde4-macros(api) = %{_kde4_macros_api} 
 
 BuildRequires: gawk
@@ -176,12 +175,15 @@
 
 
 %changelog
+* Thu Jan 08 2009 Rex Dieter <rdieter at fedoraproject.org> 4-23
+- macros.kde4: use %%_cmake_lib_suffix64, %%_cmake_lib_suffix64
+
 * Thu Dec 04 2008 Rex Dieter <rdieter at fedoraproject.org> 4-22
-- (re)add -DCMAKE_SKIP_RPATH:BOOL=ON
+- macros.kde4: (re)add -DCMAKE_SKIP_RPATH:BOOL=ON
 
 * Tue Dec 02 2008 Rex Dieter <rdieter at fedoraproject.org> 4-21
 - sync latest cmake macros
-- Add -DCMAKE_VERBOSE_MAKEFILE=ON to %%cmake_kde4 (#474053)
+- macros.kde4: add -DCMAKE_VERBOSE_MAKEFILE=ON to %%cmake_kde4 (#474053)
 
 * Wed Oct 08 2008 Than Ngo <than at redhat.com> 4-20
 - /usr/share/wallpapers owned by desktop-backgrounds-basic


Index: macros.kde4
===================================================================
RCS file: /cvs/pkgs/rpms/kde-filesystem/devel/macros.kde4,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- macros.kde4	4 Dec 2008 21:50:52 -0000	1.11
+++ macros.kde4	9 Jan 2009 01:35:58 -0000	1.12
@@ -11,14 +11,15 @@
   FFLAGS="${FFLAGS:-%optflags}" ; export FFLAGS ; \
   %{__cmake} \\\
     -DCMAKE_BUILD_TYPE=%{_kde4_buildtype} \\\
+    -DBUILD_SHARED_LIBS:BOOL=ON \\\
     -DCMAKE_INSTALL_PREFIX:PATH=%{_kde4_prefix} \\\
-    -DCMAKE_SKIP_RPATH:BOOL=ON \\\
     -DCMAKE_VERBOSE_MAKEFILE=ON \\\
     -DDATA_INSTALL_DIR:PATH=%{_kde4_appsdir} \\\
     -DINCLUDE_INSTALL_DIR:PATH=%{_kde4_includedir} \\\
     -DLIB_INSTALL_DIR:PATH=%{_kde4_libdir} \\\
-%if "%{_lib}" == "lib64" \
-    -DLIB_SUFFIX=64 \\\
-%endif \
     -DLIBEXEC_INSTALL_DIR:PATH=%{_kde4_libexecdir} \\\
-    -DSYSCONF_INSTALL_DIR:PATH=%{_kde4_sysconfdir}
+    -DSYSCONF_INSTALL_DIR:PATH=%{_kde4_sysconfdir} \\\
+%if "%{?_lib}" == "lib64" \
+     %{?_cmake_lib_suffix64} \\\
+%endif \
+     %{?_cmake_skip_rpath}



From rdieter at fedoraproject.org  Fri Jan  9 01:38:40 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri,  9 Jan 2009 01:38:40 +0000 (UTC)
Subject: rpms/kde-filesystem/F-9 kde-filesystem.spec, 1.30, 1.31 macros.kde4,
	1.7, 1.8
Message-ID: <20090109013840.272577011C@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-serv28593/F-9

Modified Files:
	kde-filesystem.spec macros.kde4 
Log Message:
sync w/devel branch



Index: kde-filesystem.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kde-filesystem/F-9/kde-filesystem.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- kde-filesystem.spec	29 Sep 2008 02:31:16 -0000	1.30
+++ kde-filesystem.spec	9 Jan 2009 01:38:09 -0000	1.31
@@ -17,7 +17,7 @@
 Summary: KDE filesystem layout
 Name: kde-filesystem
 Version: 4
-Release: 19%{?dist}
+Release: 23%{?dist}
 
 Group: System Environment/Base
 License: Public Domain
@@ -33,7 +33,6 @@
 
 Source3: applnk-hidden-directory
 
-# Requires: kde4-macros(api) = %{_kde4_macros_api}
 Provides: kde4-macros(api) = %{_kde4_macros_api} 
 
 BuildRequires: gawk
@@ -57,7 +56,7 @@
 
 ## KDE3 
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/kde/{env,shutdown,kdm}
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/{applications/kde,applnk,apps,autostart,config,config.kcfg,emoticons,mimelnk,services,servicetypes,sounds,templates,source,wallpapers}
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/{applications/kde,applnk,apps,autostart,config,config.kcfg,emoticons,mimelnk,services,servicetypes,sounds,templates,source}
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/apps/konqueror/servicemenus
 # not sure who best should own locolor, so we'll included it here, for now. -- Rex
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/locolor/{16x16,22x22,32x32,48x48}/{actions,apps,mimetypes}
@@ -91,7 +90,6 @@
       -p $RPM_BUILD_ROOT%{_kde4_sharedir}/kde4/servicetypes \
       -p $RPM_BUILD_ROOT%{_kde4_datadir}/sounds \
       -p $RPM_BUILD_ROOT%{_kde4_sharedir}/templates/.source \
-      -p $RPM_BUILD_ROOT%{_kde4_datadir}/wallpapers \
       -p $RPM_BUILD_ROOT%{_kde4_datadir}/icons/locolor/16x16/actions \
       -p $RPM_BUILD_ROOT%{_kde4_datadir}/icons/locolor/16x16/apps \
       -p $RPM_BUILD_ROOT%{_kde4_datadir}/icons/locolor/16x16/mimetypes \
@@ -154,7 +152,6 @@
 %{_datadir}/servicetypes/
 %{_datadir}/sounds/
 %{_datadir}/templates/
-%{_datadir}/wallpapers/
 %dir %{_docdir}/HTML/
 %lang(en) %{_docdir}/HTML/en/
 
@@ -172,13 +169,25 @@
 %{_kde4_datadir}/icons/locolor
 %{_kde4_sharedir}/kde4/
 %{_kde4_sharedir}/templates/
-%{_kde4_datadir}/wallpapers/
 %{_kde4_datadir}/sounds/
 %dir %{_kde4_docdir}/HTML/
 %lang(en) %{_kde4_docdir}/HTML/en/
 
 
 %changelog
+* Thu Jan 08 2009 Rex Dieter <rdieter at fedoraproject.org> 4-23
+- macros.kde4: use %%_cmake_lib_suffix64, %%_cmake_lib_suffix64
+
+* Thu Dec 04 2008 Rex Dieter <rdieter at fedoraproject.org> 4-22
+- macros.kde4: (re)add -DCMAKE_SKIP_RPATH:BOOL=ON
+
+* Tue Dec 02 2008 Rex Dieter <rdieter at fedoraproject.org> 4-21
+- sync latest cmake macros
+- macros.kde4: add -DCMAKE_VERBOSE_MAKEFILE=ON to %%cmake_kde4 (#474053)
+
+* Wed Oct 08 2008 Than Ngo <than at redhat.com> 4-20
+- /usr/share/wallpapers owned by desktop-backgrounds-basic
+
 * Sat Sep 13 2008 Than Ngo <than at redhat.com> 4-19
 - it's not needed to bump _kde4_macros_api
 - use macro


Index: macros.kde4
===================================================================
RCS file: /cvs/pkgs/rpms/kde-filesystem/F-9/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	9 Jan 2009 01:38:09 -0000	1.8
@@ -3,8 +3,6 @@
 # initial try, including only items that vary from defaults
 #
 
-%_cmake_skip_rpath -DCMAKE_SKIP_RPATH:BOOL=ON 
-
 %cmake_kde4 \
   QTDIR="%{_qt4_prefix}" ; export QTDIR ; \
   PATH="%{_qt4_bindir}:$PATH" ; export PATH ; \
@@ -12,14 +10,16 @@
   CXXFLAGS="${CXXFLAGS:-%optflags}" ; export CXXFLAGS ; \
   FFLAGS="${FFLAGS:-%optflags}" ; export FFLAGS ; \
   %{__cmake} \\\
-  %if "%{_lib}" == "lib64" \
-    -DLIB_SUFFIX=64 \\\
-  %endif \
-  %{?_cmake_skip_rpath} \\\
-  -DCMAKE_BUILD_TYPE=%{_kde4_buildtype} \\\
-  -DCMAKE_INSTALL_PREFIX=%{_kde4_prefix} \\\
-  -DSYSCONF_INSTALL_DIR=%{_kde4_sysconfdir} \\\
-  -DINCLUDE_INSTALL_DIR=%{_kde4_includedir} \\\
-  -DLIB_INSTALL_DIR=%{_kde4_libdir} \\\
-  -DLIBEXEC_INSTALL_DIR=%{_kde4_libexecdir} \\\
-  -DDATA_INSTALL_DIR=%{_kde4_appsdir}
+    -DCMAKE_BUILD_TYPE=%{_kde4_buildtype} \\\
+    -DBUILD_SHARED_LIBS:BOOL=ON \\\
+    -DCMAKE_INSTALL_PREFIX:PATH=%{_kde4_prefix} \\\
+    -DCMAKE_VERBOSE_MAKEFILE=ON \\\
+    -DDATA_INSTALL_DIR:PATH=%{_kde4_appsdir} \\\
+    -DINCLUDE_INSTALL_DIR:PATH=%{_kde4_includedir} \\\
+    -DLIB_INSTALL_DIR:PATH=%{_kde4_libdir} \\\
+    -DLIBEXEC_INSTALL_DIR:PATH=%{_kde4_libexecdir} \\\
+    -DSYSCONF_INSTALL_DIR:PATH=%{_kde4_sysconfdir} \\\
+%if "%{?_lib}" == "lib64" \
+     %{?_cmake_lib_suffix64} \\\
+%endif \
+     %{?_cmake_skip_rpath}



From rdieter at fedoraproject.org  Fri Jan  9 01:38:40 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri,  9 Jan 2009 01:38:40 +0000 (UTC)
Subject: rpms/kde-filesystem/F-10 kde-filesystem.spec, 1.33, 1.34 macros.kde4,
	1.9, 1.10
Message-ID: <20090109013840.61FEC7013F@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kde-filesystem/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28593/F-10

Modified Files:
	kde-filesystem.spec macros.kde4 
Log Message:
sync w/devel branch



Index: kde-filesystem.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kde-filesystem/F-10/kde-filesystem.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- kde-filesystem.spec	8 Oct 2008 13:41:27 -0000	1.33
+++ kde-filesystem.spec	9 Jan 2009 01:38:10 -0000	1.34
@@ -17,7 +17,7 @@
 Summary: KDE filesystem layout
 Name: kde-filesystem
 Version: 4
-Release: 20%{?dist}
+Release: 23%{?dist}
 
 Group: System Environment/Base
 License: Public Domain
@@ -33,7 +33,6 @@
 
 Source3: applnk-hidden-directory
 
-# Requires: kde4-macros(api) = %{_kde4_macros_api}
 Provides: kde4-macros(api) = %{_kde4_macros_api} 
 
 BuildRequires: gawk
@@ -176,6 +175,16 @@
 
 
 %changelog
+* Thu Jan 08 2009 Rex Dieter <rdieter at fedoraproject.org> 4-23
+- macros.kde4: use %%_cmake_lib_suffix64, %%_cmake_lib_suffix64
+
+* Thu Dec 04 2008 Rex Dieter <rdieter at fedoraproject.org> 4-22
+- macros.kde4: (re)add -DCMAKE_SKIP_RPATH:BOOL=ON
+
+* Tue Dec 02 2008 Rex Dieter <rdieter at fedoraproject.org> 4-21
+- sync latest cmake macros
+- macros.kde4: add -DCMAKE_VERBOSE_MAKEFILE=ON to %%cmake_kde4 (#474053)
+
 * Wed Oct 08 2008 Than Ngo <than at redhat.com> 4-20
 - /usr/share/wallpapers owned by desktop-backgrounds-basic
 


Index: macros.kde4
===================================================================
RCS file: /cvs/pkgs/rpms/kde-filesystem/F-10/macros.kde4,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- macros.kde4	13 Sep 2008 07:25:59 -0000	1.9
+++ macros.kde4	9 Jan 2009 01:38:10 -0000	1.10
@@ -3,8 +3,6 @@
 # initial try, including only items that vary from defaults
 #
 
-%_cmake_skip_rpath -DCMAKE_SKIP_RPATH:BOOL=ON 
-
 %cmake_kde4 \
   QTDIR="%{_qt4_prefix}" ; export QTDIR ; \
   PATH="%{_qt4_bindir}:$PATH" ; export PATH ; \
@@ -12,14 +10,16 @@
   CXXFLAGS="${CXXFLAGS:-%optflags}" ; export CXXFLAGS ; \
   FFLAGS="${FFLAGS:-%optflags}" ; export FFLAGS ; \
   %{__cmake} \\\
-  %if "%{_lib}" == "lib64" \
-    -DLIB_SUFFIX=64 \\\
-  %endif \
-  %{?_cmake_skip_rpath} \\\
-  -DCMAKE_BUILD_TYPE=%{_kde4_buildtype} \\\
-  -DCMAKE_INSTALL_PREFIX=%{_kde4_prefix} \\\
-  -DSYSCONF_INSTALL_DIR=%{_kde4_sysconfdir} \\\
-  -DINCLUDE_INSTALL_DIR=%{_kde4_includedir} \\\
-  -DLIB_INSTALL_DIR=%{_kde4_libdir} \\\
-  -DLIBEXEC_INSTALL_DIR=%{_kde4_libexecdir} \\\
-  -DDATA_INSTALL_DIR=%{_kde4_appsdir}
+    -DCMAKE_BUILD_TYPE=%{_kde4_buildtype} \\\
+    -DBUILD_SHARED_LIBS:BOOL=ON \\\
+    -DCMAKE_INSTALL_PREFIX:PATH=%{_kde4_prefix} \\\
+    -DCMAKE_VERBOSE_MAKEFILE=ON \\\
+    -DDATA_INSTALL_DIR:PATH=%{_kde4_appsdir} \\\
+    -DINCLUDE_INSTALL_DIR:PATH=%{_kde4_includedir} \\\
+    -DLIB_INSTALL_DIR:PATH=%{_kde4_libdir} \\\
+    -DLIBEXEC_INSTALL_DIR:PATH=%{_kde4_libexecdir} \\\
+    -DSYSCONF_INSTALL_DIR:PATH=%{_kde4_sysconfdir} \\\
+%if "%{?_lib}" == "lib64" \
+     %{?_cmake_lib_suffix64} \\\
+%endif \
+     %{?_cmake_skip_rpath}



From kkofler at fedoraproject.org  Fri Jan  9 02:30:41 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Fri,  9 Jan 2009 02:30:41 +0000 (UTC)
Subject: rpms/kdesdk/devel kdesdk.spec,1.129,1.130
Message-ID: <20090109023041.5EB107011C@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdesdk/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv640/devel

Modified Files:
	kdesdk.spec 
Log Message:
* Fri Jan 09 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.96-2
- don't ship krazy-licensecheck, should be in krazy2


Index: kdesdk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdesdk/devel/kdesdk.spec,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -r1.129 -r1.130
--- kdesdk.spec	7 Jan 2009 20:28:57 -0000	1.129
+++ kdesdk.spec	9 Jan 2009 02:30:11 -0000	1.130
@@ -1,6 +1,6 @@
 Name:           kdesdk
 Version:        4.1.96
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        The KDE Software Development Kit (SDK)
 
 Group:          User Interface/Desktops
@@ -97,6 +97,9 @@
 
 # unpackaged files
 rm -f %{buildroot}%{_kde4_libdir}/libantlr.so
+# This one fits better into krazy2 (it requires krazy2), and the version in
+# kdesdk does not understand lib64.
+rm -f %{buildroot}%{_kde4_bindir}/krazy-licensecheck
 
 # move devel symlinks
 mkdir -p %{buildroot}%{_kde4_libdir}/kde4/devel
@@ -210,6 +213,9 @@
 
 
 %changelog
+* Fri Jan 09 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.96-2
+- don't ship krazy-licensecheck, should be in krazy2
+
 * Wed Jan 07 2009 Than Ngo <than at redhat.com> - 4.1.96-1
 - 4.2rc1
 



From mclasen at fedoraproject.org  Fri Jan  9 02:50:41 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Fri,  9 Jan 2009 02:50:41 +0000 (UTC)
Subject: rpms/gnome-screensaver/devel password-entry.patch, NONE,
	1.1 gnome-screensaver.spec, 1.201, 1.202
Message-ID: <20090109025041.D0BE67011C@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-screensaver/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2013

Modified Files:
	gnome-screensaver.spec 
Added Files:
	password-entry.patch 
Log Message:
use  better inivisible char


password-entry.patch:

--- NEW FILE password-entry.patch ---
diff -up gnome-screensaver-2.25.2/data/lock-dialog-default.glade.password-entry gnome-screensaver-2.25.2/data/lock-dialog-default.glade
--- gnome-screensaver-2.25.2/data/lock-dialog-default.glade.password-entry	2009-01-08 21:40:56.000000000 -0500
+++ gnome-screensaver-2.25.2/data/lock-dialog-default.glade	2009-01-08 21:41:03.000000000 -0500
@@ -195,7 +195,6 @@
 				      <property name="max_length">0</property>
 				      <property name="text" translatable="yes"></property>
 				      <property name="has_frame">True</property>
-				      <property name="invisible_char">???</property>
 				      <property name="activates_default">True</property>
 				    </widget>
 				    <packing>
diff -up gnome-screensaver-2.25.2/src/gs-lock-plug.c.password-entry gnome-screensaver-2.25.2/src/gs-lock-plug.c
--- gnome-screensaver-2.25.2/src/gs-lock-plug.c.password-entry	2008-12-03 00:44:32.000000000 -0500
+++ gnome-screensaver-2.25.2/src/gs-lock-plug.c	2009-01-08 21:39:59.000000000 -0500
@@ -1752,8 +1752,6 @@ on_note_text_buffer_changed (GtkTextBuff
 static void
 gs_lock_plug_init (GSLockPlug *plug)
 {
-        gunichar invisible_char;
-
         gs_profile_start (NULL);
 
         plug->priv = GS_LOCK_PLUG_GET_PRIVATE (plug);
@@ -1862,12 +1860,6 @@ gs_lock_plug_init (GSLockPlug *plug)
         gtk_entry_set_activates_default (GTK_ENTRY (plug->priv->auth_prompt_entry), TRUE);
         gtk_entry_set_visibility (GTK_ENTRY (plug->priv->auth_prompt_entry), FALSE);
 
-        /* Only change the invisible character if it '*' otherwise assume it is OK */
-        if ('*' == gtk_entry_get_invisible_char (GTK_ENTRY (plug->priv->auth_prompt_entry))) {
-                invisible_char = INVISIBLE_CHAR_BLACK_CIRCLE;
-                gtk_entry_set_invisible_char (GTK_ENTRY (plug->priv->auth_prompt_entry), invisible_char);
-        }
-
         g_signal_connect (plug->priv->auth_unlock_button, "clicked",
                           G_CALLBACK (unlock_button_clicked), plug);
 


Index: gnome-screensaver.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-screensaver/devel/gnome-screensaver.spec,v
retrieving revision 1.201
retrieving revision 1.202
diff -u -r1.201 -r1.202
--- gnome-screensaver.spec	17 Dec 2008 17:49:36 -0000	1.201
+++ gnome-screensaver.spec	9 Jan 2009 02:50:11 -0000	1.202
@@ -14,7 +14,7 @@
 Summary: GNOME Screensaver
 Name: gnome-screensaver
 Version: 2.25.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Group: Amusements/Graphics
 Source0: http://download.gnome.org/sources/gnome-screensaver/2.25/%{name}-%{version}.tar.bz2
@@ -23,9 +23,12 @@
 Patch1: gnome-screensaver-2.20.0-default-theme.patch
 Patch2: gnome-screensaver-2.23.90-securitytoken.patch
 # add support for gnome-keyring to the pam stack
+# http://bugzilla.gnome.org/show_bug.cgi?id=567112
 Patch4: gnome-keyring.patch
 Patch7: gnome-screensaver-2.20.0-blank-by-default.patch
 Patch8: gnome-screensaver-2.20.0-selinux-permit.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=567111
+Patch9: password-entry.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 URL: http://www.gnome.org
@@ -81,6 +84,7 @@
 %patch4 -p1 -b .gnome-keyring
 %patch7 -p1 -b .blank-by-default
 %patch8 -p1 -b .selinux-permit
+%patch9 -p1 -b .password-entry
 libtoolize --force --copy
 
 %build
@@ -148,6 +152,9 @@
 %doc %{_mandir}/man1/*.1.gz
 
 %changelog
+* Thu Jan  8 2008 Matthias Clasen <mclasen at redhat.com> - 2.25.2-2
+- Use better invisible char
+
 * Wed Dec 17 2008 Matthias Clasen <mclasen at redhat.com> - 2.25.2-1
 - Update to 2.25.2
 



From mclasen at fedoraproject.org  Fri Jan  9 02:52:11 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Fri,  9 Jan 2009 02:52:11 +0000 (UTC)
Subject: rpms/gnome-screensaver/devel gnome-screensaver.spec,1.202,1.203
Message-ID: <20090109025211.609EE7011C@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-screensaver/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2160

Modified Files:
	gnome-screensaver.spec 
Log Message:
fix date



Index: gnome-screensaver.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-screensaver/devel/gnome-screensaver.spec,v
retrieving revision 1.202
retrieving revision 1.203
diff -u -r1.202 -r1.203
--- gnome-screensaver.spec	9 Jan 2009 02:50:11 -0000	1.202
+++ gnome-screensaver.spec	9 Jan 2009 02:51:41 -0000	1.203
@@ -152,7 +152,7 @@
 %doc %{_mandir}/man1/*.1.gz
 
 %changelog
-* Thu Jan  8 2008 Matthias Clasen <mclasen at redhat.com> - 2.25.2-2
+* Thu Jan  8 2009 Matthias Clasen <mclasen at redhat.com> - 2.25.2-2
 - Use better invisible char
 
 * Wed Dec 17 2008 Matthias Clasen <mclasen at redhat.com> - 2.25.2-1



From cchance at fedoraproject.org  Fri Jan  9 03:15:26 2009
From: cchance at fedoraproject.org (Caius Chance)
Date: Fri,  9 Jan 2009 03:15:26 +0000 (UTC)
Subject: rpms/liberation-fonts/devel liberation-fonts.spec,1.25,1.26
Message-ID: <20090109031527.2A4CC7011C@cvs1.fedora.phx.redhat.com>

Author: cchance

Update of /cvs/pkgs/rpms/liberation-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4039

Modified Files:
	liberation-fonts.spec 
Log Message:
* Resolves: rhbz#477410 (convert into new font packaging guidelines)



Index: liberation-fonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/liberation-fonts/devel/liberation-fonts.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- liberation-fonts.spec	9 Dec 2008 06:31:21 -0000	1.25
+++ liberation-fonts.spec	9 Jan 2009 03:14:54 -0000	1.26
@@ -1,28 +1,65 @@
-%define fontdir %{_datadir}/fonts/liberation
+%define fontname liberation
+%define fontconf <65>-%{fontname}
+%define archivename %{name}-%{version}
+%define common_desc \
+The Liberation Fonts are intended to be replacements for the three most \
+commonly used fonts on Microsoft systems: Times New Roman, Arial, and Courier \
+New.
+
+%define fontdir %{_datadir}/fonts/%{fontname}
 %define catalogue %{_sysconfdir}/X11/fontpath.d
 
-Summary: Fonts to replace commonly used Microsoft Windows Fonts
-Name: liberation-fonts
-Version: 1.04.93
-Release: 2%{?dist}
-# The license of the Liberation Fonts is a EULA that contains 
-# GPLv2 and two exceptions:
+Name:             %{fontname}-fonts
+Summary:          Fonts to replace commonly used Microsoft Windows fonts
+Version:          1.04.93
+Release:          3%{?dist}
+# The license of the Liberation Fonts is a EULA that contains GPLv2 and two 
+# exceptions:
 # The first exception is the standard FSF font exception.
-# The second exception is an anti-lockdown clause somewhat like
-# the one in GPLv3. This license is Free, but GPLv2 and GPLv3
-# incompatible.
-License: Liberation
-Group: User Interface/X
-URL: https://www.redhat.com/promo/fonts/
-Source0: liberation-fonts-1.04.93.devel.tar.gz
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildArch: noarch
-Buildrequires: xorg-x11-font-utils
+# The second exception is an anti-lockdown clause somewhat like the one in 
+# GPLv3. This license is Free, but GPLv2 and GPLv3 incompatible.
+License:          Liberation
+Group:            User Interface/X
+URL:              https://www.redhat.com/promo/fonts/
+Source0:          liberation-fonts-1.04.93.devel.tar.gz
+BuildRoot:        %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
+BuildArch:        noarch
+Buildrequires:    fontpackages-devel xorg-x11-font-utils
 
 %description
-The Liberation Fonts are intended to be replacements for the three
-most commonly used fonts on Microsoft systems: Times New Roman,
-Arial, and Courier New.
+%common_desc
+
+%package common
+Summary:          Shared common files of Liberation font families.
+License:          Liberation
+Group:            User Interface/X
+Requires:         fontpackages-filesystem
+
+%description common
+%common_desc
+
+Shared common files of Liberation font families.
+
+%define mk_pkg()\
+%package %1\
+Summary:          %3 fonts to replace commonly used Microsoft %4\
+License:          Liberation\
+Group:            User Interface/X\
+Requires:         fontpackages-filesystem, %{name}-common\
+\
+%description %1\
+%common_desc\
+\
+%3 TrueType fonts that replaced commonly used Microsoft %4.\
+\
+%files %1\
+%defattr(0644,root,root,0755)\
+%dir %{fontdir}\
+%{fontdir}/Liberation%2-*.ttf
+
+%mk_pkg sans Sans Sans Arial
+%mk_pkg serif Serif Sans-serif Times_New_Roman
+%mk_pkg mono Mono Monospace Courier_New
 
 %prep
 %setup -q -n %{name}-%{version}.devel
@@ -31,6 +68,7 @@
 rm -rf %{buildroot}
 
 %build
+%{nil}
 
 %install
 rm -rf %{buildroot}
@@ -40,8 +78,8 @@
 # configuration
 install -m 0755 -d %{buildroot}%{_sysconfdir}/fonts/conf.d
 # catalogue
-install -d $RPM_BUILD_ROOT%{catalogue}
-ln -sf %{fontdir} $RPM_BUILD_ROOT%{catalogue}/%{name}
+install -d %{buildroot}%{catalogue}
+ln -sf %{fontdir} %{buildroot}%{catalogue}/%{name}
 
 # generate fonts.dir and fonts.scale
 mkfontdir %{buildroot}%{fontdir}
@@ -59,16 +97,17 @@
   fi
 fi
 
-%files
-%defattr(-,root,root)
-%doc License.txt COPYING
-%dir %{fontdir}
-%{fontdir}/*.ttf
+%files common
+%defattr(0644,root,root,0755)
+%doc AUTHORS ChangeLog COPYING License.txt README
 %verify(not md5 size mtime) %{fontdir}/fonts.dir
 %verify(not md5 size mtime) %{fontdir}/fonts.scale
 %{catalogue}/%{name}
 
 %changelog
+* Fri Jan 09 2009 Caius Chance <cchance at redhat.com> - 1.04.93-3.fc11
+- Resolves: rhbz#477410 (Convert to new font packaging guidelines.)
+
 * Tue Dec 09 2008 Caius Chance <cchance at redhat.com> - 1.04.93-2.fc11
 - Resolves: rhbz#474522 (Cent sign is not coressed in Sans & Mono.)
 



From cchance at fedoraproject.org  Fri Jan  9 03:32:05 2009
From: cchance at fedoraproject.org (Caius Chance)
Date: Fri,  9 Jan 2009 03:32:05 +0000 (UTC)
Subject: rpms/liberation-fonts/devel liberation-fonts.spec,1.26,1.27
Message-ID: <20090109033205.3E1087011C@cvs1.fedora.phx.redhat.com>

Author: cchance

Update of /cvs/pkgs/rpms/liberation-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5299

Modified Files:
	liberation-fonts.spec 
Log Message:
* resolves: rhbz#477410 (added meta package and refined rependencies)



Index: liberation-fonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/liberation-fonts/devel/liberation-fonts.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- liberation-fonts.spec	9 Jan 2009 03:14:54 -0000	1.26
+++ liberation-fonts.spec	9 Jan 2009 03:31:34 -0000	1.27
@@ -22,6 +22,10 @@
 Group:            User Interface/X
 URL:              https://www.redhat.com/promo/fonts/
 Source0:          liberation-fonts-1.04.93.devel.tar.gz
+
+Requires:         liberation-fonts-sans >= %{version}
+Requires:         liberation-fonts-serif >= %{version}
+Requires:         liberation-fonts-mono >= %{version}
 BuildRoot:        %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildArch:        noarch
 Buildrequires:    fontpackages-devel xorg-x11-font-utils
@@ -29,6 +33,9 @@
 %description
 %common_desc
 
+Meta-package of Liberation fonts which installs Sans, Serif, and Monospace 
+families.
+
 %package common
 Summary:          Shared common files of Liberation font families.
 License:          Liberation
@@ -45,7 +52,7 @@
 Summary:          %3 fonts to replace commonly used Microsoft %4\
 License:          Liberation\
 Group:            User Interface/X\
-Requires:         fontpackages-filesystem, %{name}-common\
+Requires:         fontpackages-filesystem, %{name}-common >= %{version}\
 \
 %description %1\
 %common_desc\
@@ -97,6 +104,9 @@
   fi
 fi
 
+%files
+%{nil}
+
 %files common
 %defattr(0644,root,root,0755)
 %doc AUTHORS ChangeLog COPYING License.txt README



From kkofler at fedoraproject.org  Fri Jan  9 03:42:18 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Fri,  9 Jan 2009 03:42:18 +0000 (UTC)
Subject: rpms/kdeedu/devel kdeedu.spec, 1.152,
	1.153 kdeedu-4.1.85-cfitsio.patch, 1.4, NONE
Message-ID: <20090109034218.B19707011C@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdeedu/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5990/devel

Modified Files:
	kdeedu.spec 
Removed Files:
	kdeedu-4.1.85-cfitsio.patch 
Log Message:
- drop upstreamed cfitsio patch


Index: kdeedu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeedu/devel/kdeedu.spec,v
retrieving revision 1.152
retrieving revision 1.153
diff -u -r1.152 -r1.153
--- kdeedu.spec	7 Jan 2009 15:58:58 -0000	1.152
+++ kdeedu.spec	9 Jan 2009 03:41:48 -0000	1.153
@@ -22,9 +22,6 @@
 Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdeedu-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-# fix cfitsio detection by using pkgconfig
-Patch0:  kdeedu-4.1.85-cfitsio.patch
-
 # http://bugzilla.redhat.com/371121
 Obsoletes: kalgebra < 1:0.7-7
 Provides:  kalgebra = 1:0.7-7
@@ -136,7 +133,6 @@
 
 %prep
 %setup -q -n kdeedu-%{version}
-%patch0 -p1 -b .cfitsio
 
 
 %build
@@ -391,6 +387,7 @@
 %changelog
 * Wed Jan 07 2009 Than Ngo <than at redhat.com> - 4.1.96-1
 - 4.2rc1
+- drop upstreamed cfitsio patch
 
 * Thu Dec 18 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.85-5
 - and fix cfitsio detection yet again (upstream revision 898747)


--- kdeedu-4.1.85-cfitsio.patch DELETED ---



From mclasen at fedoraproject.org  Fri Jan  9 03:49:43 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Fri,  9 Jan 2009 03:49:43 +0000 (UTC)
Subject: rpms/gnome-keyring/devel .cvsignore, 1.54, 1.55 gnome-keyring.spec, 
	1.106, 1.107 sources, 1.54, 1.55
Message-ID: <20090109034943.714787011C@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-keyring/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6314

Modified Files:
	.cvsignore gnome-keyring.spec sources 
Log Message:
2.25.4.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-keyring/devel/.cvsignore,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- .cvsignore	6 Jan 2009 09:52:54 -0000	1.54
+++ .cvsignore	9 Jan 2009 03:49:12 -0000	1.55
@@ -1 +1 @@
-gnome-keyring-2.25.4.1.tar.bz2
+gnome-keyring-2.25.4.2.tar.bz2


Index: gnome-keyring.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-keyring/devel/gnome-keyring.spec,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -r1.106 -r1.107
--- gnome-keyring.spec	6 Jan 2009 09:52:54 -0000	1.106
+++ gnome-keyring.spec	9 Jan 2009 03:49:12 -0000	1.107
@@ -7,11 +7,11 @@
 
 Summary: Framework for managing passwords and other secrets
 Name: gnome-keyring
-Version: 2.25.4.1
+Version: 2.25.4.2
 Release: 1%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Libraries
-Source: http://download.gnome.org/sources/gnome-keyring/2.24/gnome-keyring-%{version}.tar.bz2
+Source: http://download.gnome.org/sources/gnome-keyring/2.25/gnome-keyring-%{version}.tar.bz2
 URL: http://www.gnome.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 BuildRequires: glib2-devel >= %{glib2_version}
@@ -67,6 +67,10 @@
 
 %build
 %configure --disable-gtk-doc --with-pam-dir=/%{_lib}/security --disable-acl-prompts
+
+# avoid unneeded direct dependencies
+sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' libtool
+
 make %{?_smp_mflags}
 
 %install
@@ -133,6 +137,9 @@
 
 
 %changelog
+* Thu Jan  8 2009 Matthias Clasen <mclasen at redhat.com> - 2.25.4.2-1
+- Update to 2.25.4.2
+
 * Tue Jan  6 2009 Tomas Bzatek <tbzatek at redhat.com> - 2.25.4.1-1
 - Update to 2.25.4.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-keyring/devel/sources,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- sources	6 Jan 2009 09:52:54 -0000	1.54
+++ sources	9 Jan 2009 03:49:13 -0000	1.55
@@ -1 +1 @@
-9bf68b3f3a261038962896c9c040882f  gnome-keyring-2.25.4.1.tar.bz2
+1a9cff25e516b0e588be7a6d2bb1577e  gnome-keyring-2.25.4.2.tar.bz2



From kkofler at fedoraproject.org  Fri Jan  9 04:04:54 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Fri,  9 Jan 2009 04:04:54 +0000 (UTC)
Subject: rpms/kdeedu/devel kdeedu.spec,1.153,1.154
Message-ID: <20090109040454.77E907011C@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdeedu/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7563/devel

Modified Files:
	kdeedu.spec 
Log Message:
* Fri Jan 09 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.96-2
- drop upstreamed cfitsio patch
- package manpages


Index: kdeedu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeedu/devel/kdeedu.spec,v
retrieving revision 1.153
retrieving revision 1.154
diff -u -r1.153 -r1.154
--- kdeedu.spec	9 Jan 2009 03:41:48 -0000	1.153
+++ kdeedu.spec	9 Jan 2009 04:04:23 -0000	1.154
@@ -14,7 +14,7 @@
 Name:    kdeedu
 Summary: Educational/Edutainment applications
 Version: 4.1.96
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPLv2
 Group:	 Amusements/Games
@@ -310,6 +310,10 @@
 # marble
 %{_kde4_libdir}/libcompoundviewer.so.*
 
+%{_mandir}/man1/kalzium.*
+%{_mandir}/man1/ktouch.*
+%{_mandir}/man6/khangman.*
+
 %files libs
 %defattr(-,root,root,-)
 %doc COPYING README
@@ -382,12 +386,18 @@
 %{_kde4_datadir}/kde4/services/kalgebraplasmoid.desktop
 %{_kde4_datadir}/kde4/services/kig_part.desktop
 %{_kde4_datadir}/kde4/services/kmplot_part.desktop
+%{_mandir}/man1/kbruch.*
+%{_mandir}/man1/kig.*
+%{_mandir}/man1/kmplot.*
 
 
 %changelog
-* Wed Jan 07 2009 Than Ngo <than at redhat.com> - 4.1.96-1
-- 4.2rc1
+* Fri Jan 09 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.96-2
 - drop upstreamed cfitsio patch
+- package manpages
+
+* Wed Jan 07 2009 Than Ngo <than at redhat.com> 4.1.96-1
+- 4.2rc1
 
 * Thu Dec 18 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.85-5
 - and fix cfitsio detection yet again (upstream revision 898747)



From swarren at fedoraproject.org  Fri Jan  9 04:44:33 2009
From: swarren at fedoraproject.org (Stephen Warren)
Date: Fri,  9 Jan 2009 04:44:33 +0000 (UTC)
Subject: rpms/unison213/devel unison213.spec,1.4,1.5
Message-ID: <20090109044434.05DBE7011C@cvs1.fedora.phx.redhat.com>

Author: swarren

Update of /cvs/pkgs/rpms/unison213/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10560/devel

Modified Files:
	unison213.spec 
Log Message:
Add Requires: xorg-x11-fonts-misc



Index: unison213.spec
===================================================================
RCS file: /cvs/pkgs/rpms/unison213/devel/unison213.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- unison213.spec	5 Dec 2008 12:49:41 -0000	1.4
+++ unison213.spec	9 Jan 2009 04:44:03 -0000	1.5
@@ -23,7 +23,7 @@
 
 Name:      unison%{ver_compat_name}
 Version:   %{ver_compat}%{ver_noncompat}
-Release:   12%{?dist}
+Release:   13%{?dist}
 
 Summary:   Multi-master File synchronization tool
 
@@ -41,6 +41,7 @@
 # for lablgtk
 BuildRequires: gtk2-devel
 
+Requires:            xorg-x11-fonts-misc
 Requires(posttrans): %{_sbindir}/alternatives
 Requires(postun):    %{_sbindir}/alternatives
 
@@ -126,6 +127,9 @@
 %{_datadir}/pixmaps/unison-%{ver_compat}.png
 
 %changelog
+* Thu Jan 8 2009 Stephen Warren <s-t-rhbugzilla at wwwdotorg.org> - 2.13.16-13
+- Add Requires: xorg-x11-fonts-misc
+
 * Wed Nov 26 2008 Richard W.M. Jones <rjones at redhat.com> - 2.13.16-12
 - Rebuild for OCaml 3.11.0+rc1.
 



From swarren at fedoraproject.org  Fri Jan  9 04:44:33 2009
From: swarren at fedoraproject.org (Stephen Warren)
Date: Fri,  9 Jan 2009 04:44:33 +0000 (UTC)
Subject: rpms/unison213/F-10 unison213.spec,1.3,1.4
Message-ID: <20090109044434.05F537013F@cvs1.fedora.phx.redhat.com>

Author: swarren

Update of /cvs/pkgs/rpms/unison213/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10560/F-10

Modified Files:
	unison213.spec 
Log Message:
Add Requires: xorg-x11-fonts-misc



Index: unison213.spec
===================================================================
RCS file: /cvs/pkgs/rpms/unison213/F-10/unison213.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- unison213.spec	26 May 2008 17:58:31 -0000	1.3
+++ unison213.spec	9 Jan 2009 04:44:02 -0000	1.4
@@ -23,7 +23,7 @@
 
 Name:      unison%{ver_compat_name}
 Version:   %{ver_compat}%{ver_noncompat}
-Release:   11%{?dist}
+Release:   12%{?dist}
 
 Summary:   Multi-master File synchronization tool
 
@@ -41,6 +41,7 @@
 # for lablgtk
 BuildRequires: gtk2-devel
 
+Requires:            xorg-x11-fonts-misc
 Requires(posttrans): %{_sbindir}/alternatives
 Requires(postun):    %{_sbindir}/alternatives
 
@@ -126,6 +127,9 @@
 %{_datadir}/pixmaps/unison-%{ver_compat}.png
 
 %changelog
+* Thu Jan 8 2009 Stephen Warren <s-t-rhbugzilla at wwwdotorg.org> - 2.13.16-12
+- Add Requires: xorg-x11-fonts-misc
+
 * Mon May 26 2008 Stephen Warren <s-t-rhbugzilla at wwwdotorg.org> - 2.13.16-11
 - Rebuild with OCaml 3.10.2-2 (fixes bz 441685, 445545).
 



From swarren at fedoraproject.org  Fri Jan  9 04:45:41 2009
From: swarren at fedoraproject.org (Stephen Warren)
Date: Fri,  9 Jan 2009 04:45:41 +0000 (UTC)
Subject: rpms/unison227/F-10 unison227.spec,1.3,1.4
Message-ID: <20090109044541.A5A127011C@cvs1.fedora.phx.redhat.com>

Author: swarren

Update of /cvs/pkgs/rpms/unison227/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10685/F-10

Modified Files:
	unison227.spec 
Log Message:
Add Requires:xorg-x11-fonts-misc



Index: unison227.spec
===================================================================
RCS file: /cvs/pkgs/rpms/unison227/F-10/unison227.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- unison227.spec	24 May 2008 08:48:37 -0000	1.3
+++ unison227.spec	9 Jan 2009 04:45:11 -0000	1.4
@@ -23,7 +23,7 @@
 
 Name:      unison%{ver_compat_name}
 Version:   %{ver_compat}%{ver_noncompat}
-Release:   9%{?dist}
+Release:   10%{?dist}
 
 Summary:   Multi-master File synchronization tool
 
@@ -41,6 +41,7 @@
 # for lablgtk
 BuildRequires: gtk2-devel
 
+Requires:            xorg-x11-fonts-misc
 Requires(posttrans): %{_sbindir}/alternatives
 Requires(postun):    %{_sbindir}/alternatives
 
@@ -126,6 +127,9 @@
 %{_datadir}/pixmaps/unison-%{ver_compat}.png
 
 %changelog
+* Thu Jan 8 2009 Stephen Warren <s-t-rhbugzilla at wwwdotorg.org> - 2.27.57-10
+- Add Requires: xorg-x11-fonts-misc
+
 * Sat May 24 2008 Richard W.M. Jones <rjones at redhat.com> - 2.27.57-9
 - Rebuild with OCaml 3.10.2-2 (fixes bz 441685, 445545).
 



From swarren at fedoraproject.org  Fri Jan  9 04:45:42 2009
From: swarren at fedoraproject.org (Stephen Warren)
Date: Fri,  9 Jan 2009 04:45:42 +0000 (UTC)
Subject: rpms/unison227/devel unison227.spec,1.4,1.5
Message-ID: <20090109044542.54F417011C@cvs1.fedora.phx.redhat.com>

Author: swarren

Update of /cvs/pkgs/rpms/unison227/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10685/devel

Modified Files:
	unison227.spec 
Log Message:
Add Requires:xorg-x11-fonts-misc



Index: unison227.spec
===================================================================
RCS file: /cvs/pkgs/rpms/unison227/devel/unison227.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- unison227.spec	5 Dec 2008 13:02:07 -0000	1.4
+++ unison227.spec	9 Jan 2009 04:45:11 -0000	1.5
@@ -23,7 +23,7 @@
 
 Name:      unison%{ver_compat_name}
 Version:   %{ver_compat}%{ver_noncompat}
-Release:   10%{?dist}
+Release:   11%{?dist}
 
 Summary:   Multi-master File synchronization tool
 
@@ -41,6 +41,7 @@
 # for lablgtk
 BuildRequires: gtk2-devel
 
+Requires:            xorg-x11-fonts-misc
 Requires(posttrans): %{_sbindir}/alternatives
 Requires(postun):    %{_sbindir}/alternatives
 
@@ -126,6 +127,9 @@
 %{_datadir}/pixmaps/unison-%{ver_compat}.png
 
 %changelog
+* Thu Jan 8 2009 Stephen Warren <s-t-rhbugzilla at wwwdotorg.org> - 2.27.57-11
+- Add Requires: xorg-x11-fonts-misc
+
 * Wed Nov 26 2008 Richard W.M. Jones <rjones at redhat.com> - 2.27.57-10
 - Rebuild for OCaml 3.11.0+rc1.
 



From kkofler at fedoraproject.org  Fri Jan  9 04:51:43 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Fri,  9 Jan 2009 04:51:43 +0000 (UTC)
Subject: rpms/kdeutils/F-10 .cvsignore, 1.54, 1.55 kdeutils.spec, 1.147,
	1.148 sources, 1.57, 1.58
Message-ID: <20090109045143.2B7057011C@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdeutils/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11204/F-10

Modified Files:
	.cvsignore kdeutils.spec sources 
Log Message:
* Fri Jan 09 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.4-1
- 4.1.4


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdeutils/F-10/.cvsignore,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- .cvsignore	27 Sep 2008 02:29:27 -0000	1.54
+++ .cvsignore	9 Jan 2009 04:51:11 -0000	1.55
@@ -1 +1 @@
-kdeutils-4.1.2.tar.bz2
+kdeutils-4.1.4.tar.bz2


Index: kdeutils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeutils/F-10/kdeutils.spec,v
retrieving revision 1.147
retrieving revision 1.148
diff -u -r1.147 -r1.148
--- kdeutils.spec	12 Nov 2008 13:45:15 -0000	1.147
+++ kdeutils.spec	9 Jan 2009 04:51:11 -0000	1.148
@@ -11,7 +11,7 @@
 
 Name:           kdeutils
 Epoch:          6
-Version:        4.1.3
+Version:        4.1.4
 Release:        1%{?dist}
 Summary:        K Desktop Environment - Utilities
 
@@ -211,6 +211,9 @@
 
 
 %changelog
+* Fri Jan 09 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.4-1
+- 4.1.4
+
 * Wed Nov 12 2008 Than Ngo <than at redhat.com> 4.1.3-1
 - 4.1.3
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdeutils/F-10/sources,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- sources	12 Nov 2008 13:45:15 -0000	1.57
+++ sources	9 Jan 2009 04:51:11 -0000	1.58
@@ -1 +1 @@
-2b0eee36ad16f442c9fae85ac0bfc168  kdeutils-4.1.3.tar.bz2
+542663eeae777978dafab2dcf9d422c2  kdeutils-4.1.4.tar.bz2



From kkofler at fedoraproject.org  Fri Jan  9 04:51:43 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Fri,  9 Jan 2009 04:51:43 +0000 (UTC)
Subject: rpms/kdeutils/F-9 .cvsignore, 1.52, 1.53 kdeutils.spec, 1.133,
	1.134 sources, 1.58, 1.59
Message-ID: <20090109045143.7B86B7011C@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdeutils/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11204/F-9

Modified Files:
	.cvsignore kdeutils.spec sources 
Log Message:
* Fri Jan 09 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.4-1
- 4.1.4


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdeutils/F-9/.cvsignore,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- .cvsignore	6 Nov 2008 11:43:13 -0000	1.52
+++ .cvsignore	9 Jan 2009 04:51:12 -0000	1.53
@@ -1,2 +1,2 @@
-kdeutils-4.1.3.tar.bz2
-kdepim-4.1.3.tar.bz2
+kdeutils-4.1.4.tar.bz2
+kdepim-4.1.4.tar.bz2


Index: kdeutils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeutils/F-9/kdeutils.spec,v
retrieving revision 1.133
retrieving revision 1.134
diff -u -r1.133 -r1.134
--- kdeutils.spec	6 Nov 2008 11:31:27 -0000	1.133
+++ kdeutils.spec	9 Jan 2009 04:51:13 -0000	1.134
@@ -11,7 +11,7 @@
 
 Name:           kdeutils
 Epoch:          6
-Version:        4.1.3
+Version:        4.1.4
 Release:        1%{?dist}
 Summary:        K Desktop Environment - Utilities
 
@@ -211,8 +211,11 @@
 
 
 %changelog
-* Thu Nov  6 2008 Luk???? Tinkl <ltinkl at redhat.com> 4.1.3-1
-- KDE 4.1.3
+* Fri Jan 09 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.4-1
+- 4.1.4
+
+* Wed Nov 12 2008 Than Ngo <than at redhat.com> 4.1.3-1
+- 4.1.3
 
 * Mon Sep 29 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-3
 - make VERBOSE=1


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdeutils/F-9/sources,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- sources	6 Nov 2008 11:43:13 -0000	1.58
+++ sources	9 Jan 2009 04:51:13 -0000	1.59
@@ -1,2 +1,2 @@
-2b0eee36ad16f442c9fae85ac0bfc168  kdeutils-4.1.3.tar.bz2
-655ff3c21c36a3378723bc2afb8cb434  kdepim-4.1.3.tar.bz2
+542663eeae777978dafab2dcf9d422c2  kdeutils-4.1.4.tar.bz2
+297ffe93343bc0dd62c7d90feae0ee6c  kdepim-4.1.4.tar.bz2



From kkofler at fedoraproject.org  Fri Jan  9 04:56:48 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Fri,  9 Jan 2009 04:56:48 +0000 (UTC)
Subject: rpms/kdepim/F-10 .cvsignore, 1.56, 1.57 kdepim.spec, 1.198,
	1.199 sources, 1.65, 1.66
Message-ID: <20090109045648.7A07B7011C@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdepim/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11687/F-10

Modified Files:
	.cvsignore kdepim.spec sources 
Log Message:
* Fri Jan 09 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.4-1
- 4.1.4


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdepim/F-10/.cvsignore,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- .cvsignore	12 Nov 2008 18:25:52 -0000	1.56
+++ .cvsignore	9 Jan 2009 04:56:17 -0000	1.57
@@ -1 +0,0 @@
-kdepim-4.1.3.tar.bz2


Index: kdepim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdepim/F-10/kdepim.spec,v
retrieving revision 1.198
retrieving revision 1.199
diff -u -r1.198 -r1.199
--- kdepim.spec	12 Nov 2008 18:25:52 -0000	1.198
+++ kdepim.spec	9 Jan 2009 04:56:18 -0000	1.199
@@ -6,7 +6,7 @@
 Name:    kdepim
 Summary: PIM (Personal Information Manager) applications
 Epoch:   6
-Version: 4.1.3
+Version: 4.1.4
 Release: 1%{?dist}
 
 License: GPLv2
@@ -179,6 +179,9 @@
 
 
 %changelog
+* Fri Jan 09 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.4-1
+- 4.1.4
+
 * Wed Nov 12 2008 Than Ngo <than at redhat.com> 4.1.3-1
 - 4.1.3
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdepim/F-10/sources,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- sources	12 Nov 2008 18:25:52 -0000	1.65
+++ sources	9 Jan 2009 04:56:18 -0000	1.66
@@ -1 +0,0 @@
-655ff3c21c36a3378723bc2afb8cb434  kdepim-4.1.3.tar.bz2



From kkofler at fedoraproject.org  Fri Jan  9 04:58:09 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Fri,  9 Jan 2009 04:58:09 +0000 (UTC)
Subject: rpms/kdepim/F-10 .cvsignore,1.57,1.58 sources,1.66,1.67
Message-ID: <20090109045809.75FB57011C@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdepim/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12031/F-10

Modified Files:
	.cvsignore sources 
Log Message:
* Fri Jan 09 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.4-1
- 4.1.4


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdepim/F-10/.cvsignore,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- .cvsignore	9 Jan 2009 04:56:17 -0000	1.57
+++ .cvsignore	9 Jan 2009 04:57:39 -0000	1.58
@@ -0,0 +1 @@
+kdepim-4.1.4.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdepim/F-10/sources,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- sources	9 Jan 2009 04:56:18 -0000	1.66
+++ sources	9 Jan 2009 04:57:39 -0000	1.67
@@ -0,0 +1 @@
+297ffe93343bc0dd62c7d90feae0ee6c  kdepim-4.1.4.tar.bz2



From cweyl at fedoraproject.org  Fri Jan  9 04:58:53 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Fri,  9 Jan 2009 04:58:53 +0000 (UTC)
Subject: rpms/perl-Data-TreeDumper/devel perl-Data-TreeDumper.spec,1.1,1.2
Message-ID: <20090109045853.5FE6070141@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Data-TreeDumper/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12128

Modified Files:
	perl-Data-TreeDumper.spec 
Log Message:
* Thu Jan 08 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.35-3
- manually require Term::Size



Index: perl-Data-TreeDumper.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Data-TreeDumper/devel/perl-Data-TreeDumper.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Data-TreeDumper.spec	8 Dec 2008 01:28:45 -0000	1.1
+++ perl-Data-TreeDumper.spec	9 Jan 2009 04:58:23 -0000	1.2
@@ -1,6 +1,6 @@
 Name:       perl-Data-TreeDumper 
 Version:    0.35 
-Release:    2%{?dist}
+Release:    3%{?dist}
 # see TreeDumper.pm
 License:    GPL+ or Artistic
 Group:      Development/Libraries
@@ -19,6 +19,9 @@
 BuildRequires: perl(Term::Size) >= 0.2
 BuildRequires: perl(Text::Wrap) >= 2001.0929
 
+# not automagically picked up
+Requires: perl(Term::Size) >= 0.2
+
 %description
 Data::Dumper and other modules do a great job of dumping data structures.
 Their output, however, often takes more brain power to understand than the
@@ -79,6 +82,9 @@
 %{_mandir}/man3/*.3*
 
 %changelog
+* Thu Jan 08 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.35-3
+- manually require Term::Size
+
 * Thu Dec 04 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.35-2
 - filter requires as well.  See RHBZ#473874
 



From dcantrel at fedoraproject.org  Fri Jan  9 04:59:43 2009
From: dcantrel at fedoraproject.org (David Cantrell)
Date: Fri,  9 Jan 2009 04:59:43 +0000 (UTC)
Subject: rpms/anaconda/devel .cvsignore, 1.595, 1.596 anaconda.spec, 1.739, 
	1.740 sources, 1.730, 1.731
Message-ID: <20090109045943.A85A27011C@cvs1.fedora.phx.redhat.com>

Author: dcantrel

Update of /cvs/pkgs/rpms/anaconda/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12355

Modified Files:
	.cvsignore anaconda.spec sources 
Log Message:
* Thu Jan 08 2009 David Cantrell <dcantrell at redhat.com> - 11.5.0.6-1
- Collect DSO deps for NetworkManager plugins. (dcantrell)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/devel/.cvsignore,v
retrieving revision 1.595
retrieving revision 1.596
diff -u -r1.595 -r1.596
--- .cvsignore	8 Jan 2009 18:50:03 -0000	1.595
+++ .cvsignore	9 Jan 2009 04:59:13 -0000	1.596
@@ -1,3 +1 @@
-anaconda-11.5.0.3.tar.bz2
-anaconda-11.5.0.4.tar.bz2
-anaconda-11.5.0.5.tar.bz2
+anaconda-11.5.0.6.tar.bz2


Index: anaconda.spec
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/devel/anaconda.spec,v
retrieving revision 1.739
retrieving revision 1.740
diff -u -r1.739 -r1.740
--- anaconda.spec	8 Jan 2009 18:50:03 -0000	1.739
+++ anaconda.spec	9 Jan 2009 04:59:13 -0000	1.740
@@ -2,7 +2,7 @@
 
 Summary: Graphical system installer
 Name:    anaconda
-Version: 11.5.0.5
+Version: 11.5.0.6
 Release: 1
 License: GPLv2+
 Group:   Applications/System
@@ -204,6 +204,9 @@
 %endif
 
 %changelog
+* Thu Jan 08 2009 David Cantrell <dcantrell at redhat.com> - 11.5.0.6-1
+- Collect DSO deps for NetworkManager plugins. (dcantrell)
+
 * Thu Jan 08 2009 Chris Lumens <clumens at redhat.com> - 11.5.0.5-1
 - NetworkManager system settings plugins were renamed, change mk-images.
   (dcantrell)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/devel/sources,v
retrieving revision 1.730
retrieving revision 1.731
diff -u -r1.730 -r1.731
--- sources	8 Jan 2009 18:50:03 -0000	1.730
+++ sources	9 Jan 2009 04:59:13 -0000	1.731
@@ -1 +1 @@
-b7b95ccf39efde688acfe6f2cd6d8451  anaconda-11.5.0.5.tar.bz2
+ae7ad3fb457c2e4d5e863500e44bcd33  anaconda-11.5.0.6.tar.bz2



From kkofler at fedoraproject.org  Fri Jan  9 05:09:49 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Fri,  9 Jan 2009 05:09:49 +0000 (UTC)
Subject: rpms/kdepim/F-10 kdepim.spec,1.199,1.200
Message-ID: <20090109050949.80F967011C@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdepim/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13526/F-10

Modified Files:
	kdepim.spec 
Log Message:
- BR libical-devel


Index: kdepim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdepim/F-10/kdepim.spec,v
retrieving revision 1.199
retrieving revision 1.200
diff -u -r1.199 -r1.200
--- kdepim.spec	9 Jan 2009 04:56:18 -0000	1.199
+++ kdepim.spec	9 Jan 2009 05:09:16 -0000	1.200
@@ -35,6 +35,7 @@
 BuildRequires: kdepimlibs-devel >= %{version}
 BuildRequires: libassuan-devel
 BuildRequires: libXpm-devel libXScrnSaver-devel
+BuildRequires: libical-devel
 # TODO: libmapi from http://www.openchange.org/
 #BuildRequires: libmapi-devel
 BuildRequires: libopensync-devel
@@ -181,6 +182,7 @@
 %changelog
 * Fri Jan 09 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.4-1
 - 4.1.4
+- BR libical-devel
 
 * Wed Nov 12 2008 Than Ngo <than at redhat.com> 4.1.3-1
 - 4.1.3



From kyle at fedoraproject.org  Fri Jan  9 05:13:52 2009
From: kyle at fedoraproject.org (Kyle McMartin)
Date: Fri,  9 Jan 2009 05:13:52 +0000 (UTC)
Subject: rpms/kernel/devel patch-2.6.28-git12.bz2.sign, NONE, 1.1 .cvsignore,
	1.984, 1.985 config-generic, 1.213, 1.214 config-powerpc-generic,
	1.31, 1.32 config-x86-generic, 1.58, 1.59 config-x86_64-generic,
	1.60, 1.61 kernel.spec, 1.1201, 1.1202 sources, 1.946,
	1.947 upstream, 1.858, 1.859 patch-2.6.28-git11.bz2.sign, 1.1, NONE
Message-ID: <20090109051352.50C227011C@cvs1.fedora.phx.redhat.com>

Author: kyle

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13749

Modified Files:
	.cvsignore config-generic config-powerpc-generic 
	config-x86-generic config-x86_64-generic kernel.spec sources 
	upstream 
Added Files:
	patch-2.6.28-git12.bz2.sign 
Removed Files:
	patch-2.6.28-git11.bz2.sign 
Log Message:
* Thu Jan 08 2009 Kyle McMartin <kyle at redhat.com>
- 2.6.28-git12



--- NEW FILE patch-2.6.28-git12.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBJZpRByGugalF9Dw4RAtJWAJ9K9nqiPNLOw1Tx49B50nnakVLtSACfasRg
yH9fBtnOhNumP/kwSL1cTPs=
=A9p7
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.984
retrieving revision 1.985
diff -u -r1.984 -r1.985
--- .cvsignore	8 Jan 2009 15:10:39 -0000	1.984
+++ .cvsignore	9 Jan 2009 05:13:21 -0000	1.985
@@ -4,4 +4,4 @@
 temp-*
 kernel-2.6.28
 linux-2.6.28.tar.bz2
-patch-2.6.28-git11.bz2
+patch-2.6.28-git12.bz2


Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-generic,v
retrieving revision 1.213
retrieving revision 1.214
diff -u -r1.213 -r1.214
--- config-generic	8 Jan 2009 15:10:39 -0000	1.213
+++ config-generic	9 Jan 2009 05:13:21 -0000	1.214
@@ -3425,6 +3425,7 @@
 CONFIG_RT_GROUP_SCHED=y
 CONFIG_CGROUP_SCHED=y
 CONFIG_CGROUP_MEM_RES_CTLR=y
+CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y
 
 CONFIG_CPUSETS=y
 CONFIG_CGROUPS=y


Index: config-powerpc-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-powerpc-generic,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- config-powerpc-generic	7 Jan 2009 15:12:40 -0000	1.31
+++ config-powerpc-generic	9 Jan 2009 05:13:21 -0000	1.32
@@ -287,3 +287,12 @@
 CONFIG_BLK_DEV_IT8172=m
 CONFIG_TOUCHSCREEN_DA9034=m
 
+CONFIG_SIMPLE_GPIO=y
+
+CONFIG_MTD_PS3VRAM=m
+CONFIG_MDIO_GPIO=m
+CONFIG_SERIAL_OF_PLATFORM_NWPSERIAL=m
+# CONFIG_DEBUG_GPIO is not set
+CONFIG_GPIO_PCA953X=m
+CONFIG_GPIO_PCF857X=m
+CONFIG_USB_GPIO_VBUS=m


Index: config-x86-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-x86-generic,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- config-x86-generic	7 Jan 2009 15:12:40 -0000	1.58
+++ config-x86-generic	9 Jan 2009 05:13:21 -0000	1.59
@@ -318,6 +318,7 @@
 # CONFIG_FUJITSU_LAPTOP_DEBUG is not set
 CONFIG_MSI_LAPTOP=m
 CONFIG_SONY_LAPTOP=m
+CONFIG_DELL_LAPTOP=m
 
 # CONFIG_SMSC37B787_WDT is not set
 CONFIG_W83697HF_WDT=m
@@ -358,6 +359,8 @@
 CONFIG_XEN_KBDDEV_FRONTEND=y
 CONFIG_XEN_BLKDEV_FRONTEND=m
 CONFIG_XEN_NETDEV_FRONTEND=m
+CONFIG_XENFS=m
+CONFIG_XEN_COMPAT_XENFS=y
 
 CONFIG_MTD_ESB2ROM=m
 CONFIG_MTD_CK804XROM=m


Index: config-x86_64-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-x86_64-generic,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- config-x86_64-generic	7 Jan 2009 18:30:56 -0000	1.60
+++ config-x86_64-generic	9 Jan 2009 05:13:21 -0000	1.61
@@ -104,6 +104,7 @@
 CONFIG_SONY_LAPTOP=m
 CONFIG_SONYPI_COMPAT=y
 # CONFIG_EEEPC_LAPTOP is not set
+CONFIG_DELL_LAPTOP=m
 
 
 CONFIG_THINKPAD_ACPI=m
@@ -273,6 +274,8 @@
 CONFIG_XEN_KBDDEV_FRONTEND=y
 CONFIG_XEN_BLKDEV_FRONTEND=m
 CONFIG_XEN_NETDEV_FRONTEND=m
+CONFIG_XENFS=m
+CONFIG_XEN_COMPAT_XENFS=y
 
 CONFIG_DMADEVICES=y
 CONFIG_INTEL_IOATDMA=m


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1201
retrieving revision 1.1202
diff -u -r1.1201 -r1.1202
--- kernel.spec	8 Jan 2009 20:00:08 -0000	1.1201
+++ kernel.spec	9 Jan 2009 05:13:21 -0000	1.1202
@@ -57,7 +57,7 @@
 # The rc snapshot level
 %define rcrev 0
 # The git snapshot level
-%define gitrev 11
+%define gitrev 12
 # Set rpm version accordingly
 %define rpmversion 2.6.%{upstream_sublevel}
 %endif
@@ -1749,6 +1749,9 @@
 
 %changelog
 * Thu Jan 08 2009 Kyle McMartin <kyle at redhat.com>
+- 2.6.28-git12
+
+* Thu Jan 08 2009 Kyle McMartin <kyle at redhat.com>
 - Fixup build failures due to warn/info macro removal.
 - Revert patch which caused modules to bloat to 1GB of
   (mostly) zeroes.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v
retrieving revision 1.946
retrieving revision 1.947
diff -u -r1.946 -r1.947
--- sources	8 Jan 2009 15:10:39 -0000	1.946
+++ sources	9 Jan 2009 05:13:21 -0000	1.947
@@ -1,2 +1,2 @@
 d351e44709c9810b85e29b877f50968a  linux-2.6.28.tar.bz2
-38a96fab0225830238c14cfd469a3721  patch-2.6.28-git11.bz2
+babd8348925dda965597847ce724d6a2  patch-2.6.28-git12.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v
retrieving revision 1.858
retrieving revision 1.859
diff -u -r1.858 -r1.859
--- upstream	8 Jan 2009 15:10:39 -0000	1.858
+++ upstream	9 Jan 2009 05:13:21 -0000	1.859
@@ -1,2 +1,2 @@
 linux-2.6.28.tar.bz2
-patch-2.6.28-git11.bz2
+patch-2.6.28-git12.bz2


--- patch-2.6.28-git11.bz2.sign DELETED ---



From pkgdb at fedoraproject.org  Fri Jan  9 05:30:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Jan 2009 05:30:48 +0000
Subject: [pkgdb] pfscalibration was added for drepper
Message-ID: <20090109053049.4318520831F@bastion.fedora.phx.redhat.com>

kevin has added Package pfscalibration with summary Scripts and programs for photometric calibration
kevin has approved Package pfscalibration
kevin has added a Fedora devel branch for pfscalibration with an owner of drepper
kevin has approved pfscalibration in Fedora devel
kevin has approved Package pfscalibration
kevin has set commit to Approved for provenpackager on pfscalibration (Fedora devel)
kevin has set build to Approved for provenpackager on pfscalibration (Fedora devel)
kevin has set checkout to Approved for provenpackager on pfscalibration (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pfscalibration



From pkgdb at fedoraproject.org  Fri Jan  9 05:31:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Jan 2009 05:31:07 +0000
Subject: [pkgdb] pfscalibration (Fedora, 9) updated by kevin
Message-ID: <20090109053107.E6E2D208421@bastion.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for pfscalibration
kevin has set commit to Approved for provenpackager on pfscalibration (Fedora 9)
kevin has set build to Approved for provenpackager on pfscalibration (Fedora 9)
kevin has set checkout to Approved for provenpackager on pfscalibration (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pfscalibration



From kevin at fedoraproject.org  Fri Jan  9 05:31:24 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  9 Jan 2009 05:31:24 +0000 (UTC)
Subject: rpms/pfscalibration - New directory
Message-ID: <20090109053124.3F99F7011C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/pfscalibration
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsB15063/rpms/pfscalibration

Log Message:
Directory /cvs/pkgs/rpms/pfscalibration added to the repository




From kevin at fedoraproject.org  Fri Jan  9 05:31:24 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  9 Jan 2009 05:31:24 +0000 (UTC)
Subject: rpms/pfscalibration/devel - New directory
Message-ID: <20090109053124.88DB470143@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/pfscalibration/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsB15063/rpms/pfscalibration/devel

Log Message:
Directory /cvs/pkgs/rpms/pfscalibration/devel added to the repository




From pkgdb at fedoraproject.org  Fri Jan  9 05:31:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Jan 2009 05:31:07 +0000
Subject: [pkgdb] pfscalibration (Fedora, 10) updated by kevin
Message-ID: <20090109053108.037A8208457@bastion.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for pfscalibration
kevin has set commit to Approved for provenpackager on pfscalibration (Fedora 10)
kevin has set build to Approved for provenpackager on pfscalibration (Fedora 10)
kevin has set checkout to Approved for provenpackager on pfscalibration (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pfscalibration



From kevin at fedoraproject.org  Fri Jan  9 05:31:41 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  9 Jan 2009 05:31:41 +0000 (UTC)
Subject: rpms/pfscalibration Makefile,NONE,1.1
Message-ID: <20090109053141.75EAC7011C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/pfscalibration
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsB15063/rpms/pfscalibration

Added Files:
	Makefile 
Log Message:
Setup of module pfscalibration


--- NEW FILE Makefile ---
# Top level Makefile for module pfscalibration
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Jan  9 05:31:41 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  9 Jan 2009 05:31:41 +0000 (UTC)
Subject: rpms/pfscalibration/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090109053141.CAB817011C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/pfscalibration/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsB15063/rpms/pfscalibration/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module pfscalibration


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: pfscalibration
# $Id: Makefile,v 1.1 2009/01/09 05:31:41 kevin Exp $
NAME := pfscalibration
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Jan  9 05:33:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Jan 2009 05:33:24 +0000
Subject: [pkgdb] clamtk was added for saispo
Message-ID: <20090109053324.BDB94208456@bastion.fedora.phx.redhat.com>

kevin has added Package clamtk with summary ClamTk is a GUI front-end for ClamAV
kevin has approved Package clamtk
kevin has added a Fedora devel branch for clamtk with an owner of saispo
kevin has approved clamtk in Fedora devel
kevin has approved Package clamtk
kevin has set commit to Approved for provenpackager on clamtk (Fedora devel)
kevin has set build to Approved for provenpackager on clamtk (Fedora devel)
kevin has set checkout to Approved for provenpackager on clamtk (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/clamtk



From pkgdb at fedoraproject.org  Fri Jan  9 05:33:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Jan 2009 05:33:42 +0000
Subject: [pkgdb] clamtk (Fedora, 10) updated by kevin
Message-ID: <20090109053342.97599208421@bastion.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for clamtk
kevin has set commit to Approved for provenpackager on clamtk (Fedora 10)
kevin has set build to Approved for provenpackager on clamtk (Fedora 10)
kevin has set checkout to Approved for provenpackager on clamtk (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/clamtk



From kevin at fedoraproject.org  Fri Jan  9 05:33:56 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  9 Jan 2009 05:33:56 +0000 (UTC)
Subject: rpms/clamtk - New directory
Message-ID: <20090109053356.2E76A7011C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/clamtk
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsh15299/rpms/clamtk

Log Message:
Directory /cvs/pkgs/rpms/clamtk added to the repository




From kevin at fedoraproject.org  Fri Jan  9 05:33:56 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  9 Jan 2009 05:33:56 +0000 (UTC)
Subject: rpms/clamtk/devel - New directory
Message-ID: <20090109053356.72DFA7011C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/clamtk/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsh15299/rpms/clamtk/devel

Log Message:
Directory /cvs/pkgs/rpms/clamtk/devel added to the repository




From kevin at fedoraproject.org  Fri Jan  9 05:34:14 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  9 Jan 2009 05:34:14 +0000 (UTC)
Subject: rpms/clamtk Makefile,NONE,1.1
Message-ID: <20090109053414.5D9AE7011C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/clamtk
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsh15299/rpms/clamtk

Added Files:
	Makefile 
Log Message:
Setup of module clamtk


--- NEW FILE Makefile ---
# Top level Makefile for module clamtk
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Jan  9 05:34:14 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  9 Jan 2009 05:34:14 +0000 (UTC)
Subject: rpms/clamtk/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <20090109053414.AFDF07011C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/clamtk/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsh15299/rpms/clamtk/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module clamtk


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: clamtk
# $Id: Makefile,v 1.1 2009/01/09 05:34:14 kevin Exp $
NAME := clamtk
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Jan  9 05:36:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Jan 2009 05:36:11 +0000
Subject: [pkgdb] PolicyKit-kde was added for than
Message-ID: <20090109053611.AD11D20831D@bastion.fedora.phx.redhat.com>

kevin has added Package PolicyKit-kde with summary PolicyKit integration for the KDE desktop
kevin has approved Package PolicyKit-kde
kevin has added a Fedora devel branch for PolicyKit-kde with an owner of than
kevin has approved PolicyKit-kde in Fedora devel
kevin has approved Package PolicyKit-kde
kevin has set commit to Approved for provenpackager on PolicyKit-kde (Fedora devel)
kevin has set build to Approved for provenpackager on PolicyKit-kde (Fedora devel)
kevin has set checkout to Approved for provenpackager on PolicyKit-kde (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/PolicyKit-kde



From pkgdb at fedoraproject.org  Fri Jan  9 05:36:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Jan 2009 05:36:33 +0000
Subject: [pkgdb] PolicyKit-kde (Fedora, 9) updated by kevin
Message-ID: <20090109053633.2125320831F@bastion.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for PolicyKit-kde
kevin has set commit to Approved for provenpackager on PolicyKit-kde (Fedora 9)
kevin has set build to Approved for provenpackager on PolicyKit-kde (Fedora 9)
kevin has set checkout to Approved for provenpackager on PolicyKit-kde (Fedora 9)
kevin approved watchbugzilla on PolicyKit-kde (Fedora 9) for tuxbrewr
kevin approved watchcommits on PolicyKit-kde (Fedora 9) for tuxbrewr
kevin approved watchbugzilla on PolicyKit-kde (Fedora 9) for rdieter
kevin approved watchcommits on PolicyKit-kde (Fedora 9) for rdieter
kevin approved commit on PolicyKit-kde (Fedora 9) for rdieter
kevin approved build on PolicyKit-kde (Fedora 9) for rdieter
kevin approved approveacls on PolicyKit-kde (Fedora 9) for rdieter
kevin approved watchbugzilla on PolicyKit-kde (Fedora 9) for kkofler
kevin approved watchcommits on PolicyKit-kde (Fedora 9) for kkofler
kevin approved commit on PolicyKit-kde (Fedora 9) for kkofler
kevin approved build on PolicyKit-kde (Fedora 9) for kkofler
kevin approved approveacls on PolicyKit-kde (Fedora 9) for kkofler
kevin approved watchbugzilla on PolicyKit-kde (Fedora 9) for ltinkl
kevin approved watchcommits on PolicyKit-kde (Fedora 9) for ltinkl
kevin approved commit on PolicyKit-kde (Fedora 9) for ltinkl
kevin approved build on PolicyKit-kde (Fedora 9) for ltinkl
kevin approved approveacls on PolicyKit-kde (Fedora 9) for ltinkl
kevin approved watchbugzilla on PolicyKit-kde (Fedora 9) for jreznik
kevin approved watchcommits on PolicyKit-kde (Fedora 9) for jreznik
kevin approved commit on PolicyKit-kde (Fedora 9) for jreznik
kevin approved build on PolicyKit-kde (Fedora 9) for jreznik
kevin approved approveacls on PolicyKit-kde (Fedora 9) for jreznik
kevin approved watchbugzilla on PolicyKit-kde (Fedora 9) for arbiter
kevin approved watchcommits on PolicyKit-kde (Fedora 9) for arbiter
kevin approved commit on PolicyKit-kde (Fedora 9) for arbiter
kevin approved build on PolicyKit-kde (Fedora 9) for arbiter
kevin approved approveacls on PolicyKit-kde (Fedora 9) for arbiter

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/PolicyKit-kde



From pkgdb at fedoraproject.org  Fri Jan  9 05:36:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Jan 2009 05:36:33 +0000
Subject: [pkgdb] PolicyKit-kde (Fedora, devel) updated by kevin
Message-ID: <20090109053633.46E1020846B@bastion.fedora.phx.redhat.com>

kevin approved watchbugzilla on PolicyKit-kde (Fedora devel) for tuxbrewr
kevin approved watchcommits on PolicyKit-kde (Fedora devel) for tuxbrewr
kevin approved watchbugzilla on PolicyKit-kde (Fedora devel) for rdieter
kevin approved watchcommits on PolicyKit-kde (Fedora devel) for rdieter
kevin approved commit on PolicyKit-kde (Fedora devel) for rdieter
kevin approved build on PolicyKit-kde (Fedora devel) for rdieter
kevin approved approveacls on PolicyKit-kde (Fedora devel) for rdieter
kevin approved watchbugzilla on PolicyKit-kde (Fedora devel) for kkofler
kevin approved watchcommits on PolicyKit-kde (Fedora devel) for kkofler
kevin approved commit on PolicyKit-kde (Fedora devel) for kkofler
kevin approved build on PolicyKit-kde (Fedora devel) for kkofler
kevin approved approveacls on PolicyKit-kde (Fedora devel) for kkofler
kevin approved watchbugzilla on PolicyKit-kde (Fedora devel) for ltinkl
kevin approved watchcommits on PolicyKit-kde (Fedora devel) for ltinkl
kevin approved commit on PolicyKit-kde (Fedora devel) for ltinkl
kevin approved build on PolicyKit-kde (Fedora devel) for ltinkl
kevin approved approveacls on PolicyKit-kde (Fedora devel) for ltinkl
kevin approved watchbugzilla on PolicyKit-kde (Fedora devel) for jreznik
kevin approved watchcommits on PolicyKit-kde (Fedora devel) for jreznik
kevin approved commit on PolicyKit-kde (Fedora devel) for jreznik
kevin approved build on PolicyKit-kde (Fedora devel) for jreznik
kevin approved approveacls on PolicyKit-kde (Fedora devel) for jreznik
kevin approved watchbugzilla on PolicyKit-kde (Fedora devel) for arbiter
kevin approved watchcommits on PolicyKit-kde (Fedora devel) for arbiter
kevin approved commit on PolicyKit-kde (Fedora devel) for arbiter
kevin approved build on PolicyKit-kde (Fedora devel) for arbiter
kevin approved approveacls on PolicyKit-kde (Fedora devel) for arbiter

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/PolicyKit-kde



From pkgdb at fedoraproject.org  Fri Jan  9 05:36:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Jan 2009 05:36:33 +0000
Subject: [pkgdb] PolicyKit-kde (Fedora, 10) updated by kevin
Message-ID: <20090109053633.9CD48208474@bastion.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for PolicyKit-kde
kevin has set commit to Approved for provenpackager on PolicyKit-kde (Fedora 10)
kevin has set build to Approved for provenpackager on PolicyKit-kde (Fedora 10)
kevin has set checkout to Approved for provenpackager on PolicyKit-kde (Fedora 10)
kevin approved watchbugzilla on PolicyKit-kde (Fedora 10) for tuxbrewr
kevin approved watchcommits on PolicyKit-kde (Fedora 10) for tuxbrewr
kevin approved watchbugzilla on PolicyKit-kde (Fedora 10) for rdieter
kevin approved watchcommits on PolicyKit-kde (Fedora 10) for rdieter
kevin approved commit on PolicyKit-kde (Fedora 10) for rdieter
kevin approved build on PolicyKit-kde (Fedora 10) for rdieter
kevin approved approveacls on PolicyKit-kde (Fedora 10) for rdieter
kevin approved watchbugzilla on PolicyKit-kde (Fedora 10) for kkofler
kevin approved watchcommits on PolicyKit-kde (Fedora 10) for kkofler
kevin approved commit on PolicyKit-kde (Fedora 10) for kkofler
kevin approved build on PolicyKit-kde (Fedora 10) for kkofler
kevin approved approveacls on PolicyKit-kde (Fedora 10) for kkofler
kevin approved watchbugzilla on PolicyKit-kde (Fedora 10) for ltinkl
kevin approved watchcommits on PolicyKit-kde (Fedora 10) for ltinkl
kevin approved commit on PolicyKit-kde (Fedora 10) for ltinkl
kevin approved build on PolicyKit-kde (Fedora 10) for ltinkl
kevin approved approveacls on PolicyKit-kde (Fedora 10) for ltinkl
kevin approved watchbugzilla on PolicyKit-kde (Fedora 10) for jreznik
kevin approved watchcommits on PolicyKit-kde (Fedora 10) for jreznik
kevin approved commit on PolicyKit-kde (Fedora 10) for jreznik
kevin approved build on PolicyKit-kde (Fedora 10) for jreznik
kevin approved approveacls on PolicyKit-kde (Fedora 10) for jreznik
kevin approved watchbugzilla on PolicyKit-kde (Fedora 10) for arbiter
kevin approved watchcommits on PolicyKit-kde (Fedora 10) for arbiter
kevin approved commit on PolicyKit-kde (Fedora 10) for arbiter
kevin approved build on PolicyKit-kde (Fedora 10) for arbiter
kevin approved approveacls on PolicyKit-kde (Fedora 10) for arbiter

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/PolicyKit-kde



From kevin at fedoraproject.org  Fri Jan  9 05:36:48 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  9 Jan 2009 05:36:48 +0000 (UTC)
Subject: rpms/PolicyKit-kde - New directory
Message-ID: <20090109053648.2A8687011C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/PolicyKit-kde
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsD15472/rpms/PolicyKit-kde

Log Message:
Directory /cvs/pkgs/rpms/PolicyKit-kde added to the repository




From kevin at fedoraproject.org  Fri Jan  9 05:36:48 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  9 Jan 2009 05:36:48 +0000 (UTC)
Subject: rpms/PolicyKit-kde/devel - New directory
Message-ID: <20090109053648.626927011C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/PolicyKit-kde/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsD15472/rpms/PolicyKit-kde/devel

Log Message:
Directory /cvs/pkgs/rpms/PolicyKit-kde/devel added to the repository




From kevin at fedoraproject.org  Fri Jan  9 05:37:03 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  9 Jan 2009 05:37:03 +0000 (UTC)
Subject: rpms/PolicyKit-kde Makefile,NONE,1.1
Message-ID: <20090109053703.7913A7011C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/PolicyKit-kde
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsD15472/rpms/PolicyKit-kde

Added Files:
	Makefile 
Log Message:
Setup of module PolicyKit-kde


--- NEW FILE Makefile ---
# Top level Makefile for module PolicyKit-kde
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Jan  9 05:37:03 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  9 Jan 2009 05:37:03 +0000 (UTC)
Subject: rpms/PolicyKit-kde/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090109053703.BE7157011C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/PolicyKit-kde/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsD15472/rpms/PolicyKit-kde/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module PolicyKit-kde


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: PolicyKit-kde
# $Id: Makefile,v 1.1 2009/01/09 05:37:03 kevin Exp $
NAME := PolicyKit-kde
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From mtasaka at fedoraproject.org  Fri Jan  9 05:41:24 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Fri,  9 Jan 2009 05:41:24 +0000 (UTC)
Subject: rpms/cairo-dock/devel .cvsignore, 1.94, 1.95 cairo-dock.spec, 1.125,
	1.126 sources, 1.94, 1.95
Message-ID: <20090109054124.F39797011C@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/cairo-dock/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15753

Modified Files:
	.cvsignore cairo-dock.spec sources 
Log Message:
rev 1476


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cairo-dock/devel/.cvsignore,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -r1.94 -r1.95
--- .cvsignore	8 Jan 2009 05:43:39 -0000	1.94
+++ .cvsignore	9 Jan 2009 05:40:54 -0000	1.95
@@ -1 +1 @@
-cairo-dock-sources-svn1475_trunk.tar.bz2
+cairo-dock-sources-svn1476_trunk.tar.bz2


Index: cairo-dock.spec
===================================================================
RCS file: /cvs/extras/rpms/cairo-dock/devel/cairo-dock.spec,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -r1.125 -r1.126
--- cairo-dock.spec	8 Jan 2009 05:43:39 -0000	1.125
+++ cairo-dock.spec	9 Jan 2009 05:40:54 -0000	1.126
@@ -11,7 +11,7 @@
 %undefine		betaver		
 %define		build_webkit	1
 %define		build_xfce	1
-%define		tarballver	svn1475_trunk
+%define		tarballver	svn1476_trunk
 
 %define		fedora_main_rel	3
 
@@ -633,8 +633,8 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
-* Thu Jan  8 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
-- rev 1475
+* Fri Jan  9 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- rev 1476
 
 * Thu Dec 25 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
 - rev 1451


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cairo-dock/devel/sources,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -r1.94 -r1.95
--- sources	8 Jan 2009 05:43:39 -0000	1.94
+++ sources	9 Jan 2009 05:40:54 -0000	1.95
@@ -1 +1 @@
-1767c74610beec35b78d80b33fa2ce37  cairo-dock-sources-svn1475_trunk.tar.bz2
+fed82ca77581f941aac0af1aa2bb046e  cairo-dock-sources-svn1476_trunk.tar.bz2



From pkgdb at fedoraproject.org  Fri Jan  9 05:42:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Jan 2009 05:42:42 +0000
Subject: [pkgdb] pfstmo was added for drepper
Message-ID: <20090109054242.8E8A020831F@bastion.fedora.phx.redhat.com>

kevin has added Package pfstmo with summary PFS tone mapping operators
kevin has approved Package pfstmo
kevin has added a Fedora devel branch for pfstmo with an owner of drepper
kevin has approved pfstmo in Fedora devel
kevin has approved Package pfstmo
kevin has set commit to Approved for provenpackager on pfstmo (Fedora devel)
kevin has set build to Approved for provenpackager on pfstmo (Fedora devel)
kevin has set checkout to Approved for provenpackager on pfstmo (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pfstmo



From pkgdb at fedoraproject.org  Fri Jan  9 05:43:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Jan 2009 05:43:01 +0000
Subject: [pkgdb] pfstmo (Fedora, 9) updated by kevin
Message-ID: <20090109054301.9642A20831F@bastion.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for pfstmo
kevin has set commit to Approved for provenpackager on pfstmo (Fedora 9)
kevin has set build to Approved for provenpackager on pfstmo (Fedora 9)
kevin has set checkout to Approved for provenpackager on pfstmo (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pfstmo



From kevin at fedoraproject.org  Fri Jan  9 05:43:24 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  9 Jan 2009 05:43:24 +0000 (UTC)
Subject: rpms/pfstmo - New directory
Message-ID: <20090109054324.2512D7011C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/pfstmo
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsK15933/rpms/pfstmo

Log Message:
Directory /cvs/pkgs/rpms/pfstmo added to the repository




From kevin at fedoraproject.org  Fri Jan  9 05:43:24 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  9 Jan 2009 05:43:24 +0000 (UTC)
Subject: rpms/pfstmo/devel - New directory
Message-ID: <20090109054324.65D9F7011C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/pfstmo/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsK15933/rpms/pfstmo/devel

Log Message:
Directory /cvs/pkgs/rpms/pfstmo/devel added to the repository




From pkgdb at fedoraproject.org  Fri Jan  9 05:43:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Jan 2009 05:43:01 +0000
Subject: [pkgdb] pfstmo (Fedora, 10) updated by kevin
Message-ID: <20090109054301.B2717208456@bastion.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for pfstmo
kevin has set commit to Approved for provenpackager on pfstmo (Fedora 10)
kevin has set build to Approved for provenpackager on pfstmo (Fedora 10)
kevin has set checkout to Approved for provenpackager on pfstmo (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pfstmo



From kevin at fedoraproject.org  Fri Jan  9 05:43:39 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  9 Jan 2009 05:43:39 +0000 (UTC)
Subject: rpms/pfstmo Makefile,NONE,1.1
Message-ID: <20090109054339.C9D447011C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/pfstmo
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsK15933/rpms/pfstmo

Added Files:
	Makefile 
Log Message:
Setup of module pfstmo


--- NEW FILE Makefile ---
# Top level Makefile for module pfstmo
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Jan  9 05:43:40 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  9 Jan 2009 05:43:40 +0000 (UTC)
Subject: rpms/pfstmo/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <20090109054340.1DAE27011C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/pfstmo/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsK15933/rpms/pfstmo/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module pfstmo


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: pfstmo
# $Id: Makefile,v 1.1 2009/01/09 05:43:39 kevin Exp $
NAME := pfstmo
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Jan  9 05:45:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Jan 2009 05:45:12 +0000
Subject: [pkgdb] cwirc was added for dp67
Message-ID: <20090109054513.24414208455@bastion.fedora.phx.redhat.com>

kevin has added Package cwirc with summary An xchat plugin for sending and receiving morse code over IRC
kevin has approved Package cwirc
kevin has added a Fedora devel branch for cwirc with an owner of dp67
kevin has approved cwirc in Fedora devel
kevin has approved Package cwirc
kevin has set commit to Approved for provenpackager on cwirc (Fedora devel)
kevin has set build to Approved for provenpackager on cwirc (Fedora devel)
kevin has set checkout to Approved for provenpackager on cwirc (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cwirc



From pkgdb at fedoraproject.org  Fri Jan  9 05:45:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Jan 2009 05:45:32 +0000
Subject: [pkgdb] cwirc (Fedora, 9) updated by kevin
Message-ID: <20090109054532.92D9620831F@bastion.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for cwirc
kevin has set commit to Approved for provenpackager on cwirc (Fedora 9)
kevin has set build to Approved for provenpackager on cwirc (Fedora 9)
kevin has set checkout to Approved for provenpackager on cwirc (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cwirc



From pkgdb at fedoraproject.org  Fri Jan  9 05:45:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Jan 2009 05:45:32 +0000
Subject: [pkgdb] cwirc (Fedora, 10) updated by kevin
Message-ID: <20090109054532.AF12A208456@bastion.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for cwirc
kevin has set commit to Approved for provenpackager on cwirc (Fedora 10)
kevin has set build to Approved for provenpackager on cwirc (Fedora 10)
kevin has set checkout to Approved for provenpackager on cwirc (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cwirc



From kevin at fedoraproject.org  Fri Jan  9 05:46:02 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  9 Jan 2009 05:46:02 +0000 (UTC)
Subject: rpms/cwirc - New directory
Message-ID: <20090109054602.29C207013F@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/cwirc
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsC16145/rpms/cwirc

Log Message:
Directory /cvs/pkgs/rpms/cwirc added to the repository




From kevin at fedoraproject.org  Fri Jan  9 05:46:02 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  9 Jan 2009 05:46:02 +0000 (UTC)
Subject: rpms/cwirc/devel - New directory
Message-ID: <20090109054602.7550F7013F@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/cwirc/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsC16145/rpms/cwirc/devel

Log Message:
Directory /cvs/pkgs/rpms/cwirc/devel added to the repository




From kevin at fedoraproject.org  Fri Jan  9 05:46:22 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  9 Jan 2009 05:46:22 +0000 (UTC)
Subject: rpms/cwirc Makefile,NONE,1.1
Message-ID: <20090109054622.31D737013F@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/cwirc
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsC16145/rpms/cwirc

Added Files:
	Makefile 
Log Message:
Setup of module cwirc


--- NEW FILE Makefile ---
# Top level Makefile for module cwirc
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Jan  9 05:46:22 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  9 Jan 2009 05:46:22 +0000 (UTC)
Subject: rpms/cwirc/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <20090109054622.97D317013F@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/cwirc/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsC16145/rpms/cwirc/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module cwirc


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: cwirc
# $Id: Makefile,v 1.1 2009/01/09 05:46:22 kevin Exp $
NAME := cwirc
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From kyle at fedoraproject.org  Fri Jan  9 05:48:02 2009
From: kyle at fedoraproject.org (Kyle McMartin)
Date: Fri,  9 Jan 2009 05:48:02 +0000 (UTC)
Subject: rpms/kernel/devel config-generic,1.214,1.215
Message-ID: <20090109054802.357E27013F@cvs1.fedora.phx.redhat.com>

Author: kyle

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16328

Modified Files:
	config-generic 
Log Message:
disable broken cruft


Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-generic,v
retrieving revision 1.214
retrieving revision 1.215
diff -u -r1.214 -r1.215
--- config-generic	9 Jan 2009 05:13:21 -0000	1.214
+++ config-generic	9 Jan 2009 05:47:31 -0000	1.215
@@ -1536,7 +1536,7 @@
 CONFIG_NSC_FIR=m
 CONFIG_SIGMATEL_FIR=m
 CONFIG_SMC_IRCC_FIR=m
-CONFIG_TOSHIBA_FIR=m
+# CONFIG_TOSHIBA_FIR is not set
 CONFIG_USB_IRDA=m
 CONFIG_VLSI_FIR=m
 CONFIG_VIA_FIR=m



From pkgdb at fedoraproject.org  Fri Jan  9 05:47:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Jan 2009 05:47:56 +0000
Subject: [pkgdb] hyphen-id was added for caolanm
Message-ID: <20090109054756.AAC6C208421@bastion.fedora.phx.redhat.com>

kevin has added Package hyphen-id with summary Indonesian hyphenation rules
kevin has approved Package hyphen-id
kevin has added a Fedora devel branch for hyphen-id with an owner of caolanm
kevin has approved hyphen-id in Fedora devel
kevin has approved Package hyphen-id
kevin has set commit to Approved for provenpackager on hyphen-id (Fedora devel)
kevin has set build to Approved for provenpackager on hyphen-id (Fedora devel)
kevin has set checkout to Approved for provenpackager on hyphen-id (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/hyphen-id



From kevin at fedoraproject.org  Fri Jan  9 05:48:32 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  9 Jan 2009 05:48:32 +0000 (UTC)
Subject: rpms/hyphen-id - New directory
Message-ID: <20090109054832.2D3017013F@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/hyphen-id
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvss16387/rpms/hyphen-id

Log Message:
Directory /cvs/pkgs/rpms/hyphen-id added to the repository




From kevin at fedoraproject.org  Fri Jan  9 05:48:32 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  9 Jan 2009 05:48:32 +0000 (UTC)
Subject: rpms/hyphen-id/devel - New directory
Message-ID: <20090109054832.75F677013F@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/hyphen-id/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvss16387/rpms/hyphen-id/devel

Log Message:
Directory /cvs/pkgs/rpms/hyphen-id/devel added to the repository




From kevin at fedoraproject.org  Fri Jan  9 05:48:49 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  9 Jan 2009 05:48:49 +0000 (UTC)
Subject: rpms/hyphen-id/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090109054849.EEB2E70143@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/hyphen-id/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvss16387/rpms/hyphen-id/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module hyphen-id


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: hyphen-id
# $Id: Makefile,v 1.1 2009/01/09 05:48:49 kevin Exp $
NAME := hyphen-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 kevin at fedoraproject.org  Fri Jan  9 05:48:49 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  9 Jan 2009 05:48:49 +0000 (UTC)
Subject: rpms/hyphen-id Makefile,NONE,1.1
Message-ID: <20090109054849.951807013F@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/hyphen-id
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvss16387/rpms/hyphen-id

Added Files:
	Makefile 
Log Message:
Setup of module hyphen-id


--- NEW FILE Makefile ---
# Top level Makefile for module hyphen-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 pkgdb at fedoraproject.org  Fri Jan  9 05:49:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Jan 2009 05:49:25 +0000
Subject: [pkgdb] hyphen-is was added for caolanm
Message-ID: <20090109054925.83B7220831F@bastion.fedora.phx.redhat.com>

kevin has added Package hyphen-is with summary Icelandic hyphenation rules
kevin has approved Package hyphen-is
kevin has added a Fedora devel branch for hyphen-is with an owner of caolanm
kevin has approved hyphen-is in Fedora devel
kevin has approved Package hyphen-is
kevin has set commit to Approved for provenpackager on hyphen-is (Fedora devel)
kevin has set build to Approved for provenpackager on hyphen-is (Fedora devel)
kevin has set checkout to Approved for provenpackager on hyphen-is (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/hyphen-is



From kevin at fedoraproject.org  Fri Jan  9 05:49:53 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  9 Jan 2009 05:49:53 +0000 (UTC)
Subject: rpms/hyphen-is - New directory
Message-ID: <20090109054953.27E2B7013F@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/hyphen-is
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsU16561/rpms/hyphen-is

Log Message:
Directory /cvs/pkgs/rpms/hyphen-is added to the repository




From kevin at fedoraproject.org  Fri Jan  9 05:49:53 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  9 Jan 2009 05:49:53 +0000 (UTC)
Subject: rpms/hyphen-is/devel - New directory
Message-ID: <20090109054953.5F35770143@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/hyphen-is/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsU16561/rpms/hyphen-is/devel

Log Message:
Directory /cvs/pkgs/rpms/hyphen-is/devel added to the repository




From kevin at fedoraproject.org  Fri Jan  9 05:50:08 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  9 Jan 2009 05:50:08 +0000 (UTC)
Subject: rpms/hyphen-is Makefile,NONE,1.1
Message-ID: <20090109055008.ED27A7013F@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/hyphen-is
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsU16561/rpms/hyphen-is

Added Files:
	Makefile 
Log Message:
Setup of module hyphen-is


--- NEW FILE Makefile ---
# Top level Makefile for module hyphen-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 kevin at fedoraproject.org  Fri Jan  9 05:50:09 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  9 Jan 2009 05:50:09 +0000 (UTC)
Subject: rpms/hyphen-is/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090109055009.43C2870143@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/hyphen-is/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsU16561/rpms/hyphen-is/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module hyphen-is


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: hyphen-is
# $Id: Makefile,v 1.1 2009/01/09 05:50:09 kevin Exp $
NAME := hyphen-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 pkgdb at fedoraproject.org  Fri Jan  9 05:50:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Jan 2009 05:50:45 +0000
Subject: [pkgdb] nufw was added for saispo
Message-ID: <20090109055045.7FA4420831F@bastion.fedora.phx.redhat.com>

kevin has added Package nufw with summary Authentication Firewall Suite for Linux
kevin has approved Package nufw
kevin has added a Fedora devel branch for nufw with an owner of saispo
kevin has approved nufw in Fedora devel
kevin has approved Package nufw
kevin has set commit to Approved for provenpackager on nufw (Fedora devel)
kevin has set build to Approved for provenpackager on nufw (Fedora devel)
kevin has set checkout to Approved for provenpackager on nufw (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/nufw



From pkgdb at fedoraproject.org  Fri Jan  9 05:51:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Jan 2009 05:51:04 +0000
Subject: [pkgdb] nufw (Fedora, 10) updated by kevin
Message-ID: <20090109055104.3ED45208455@bastion.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for nufw
kevin has set commit to Approved for provenpackager on nufw (Fedora 10)
kevin has set build to Approved for provenpackager on nufw (Fedora 10)
kevin has set checkout to Approved for provenpackager on nufw (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/nufw



From kevin at fedoraproject.org  Fri Jan  9 05:51:18 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  9 Jan 2009 05:51:18 +0000 (UTC)
Subject: rpms/nufw - New directory
Message-ID: <20090109055118.2C7207013F@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/nufw
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvst16644/rpms/nufw

Log Message:
Directory /cvs/pkgs/rpms/nufw added to the repository




From kevin at fedoraproject.org  Fri Jan  9 05:51:18 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  9 Jan 2009 05:51:18 +0000 (UTC)
Subject: rpms/nufw/devel - New directory
Message-ID: <20090109055118.6D7F27013F@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/nufw/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvst16644/rpms/nufw/devel

Log Message:
Directory /cvs/pkgs/rpms/nufw/devel added to the repository




From kevin at fedoraproject.org  Fri Jan  9 05:51:36 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  9 Jan 2009 05:51:36 +0000 (UTC)
Subject: rpms/nufw/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <20090109055136.499097013F@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/nufw/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvst16644/rpms/nufw/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module nufw


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: nufw
# $Id: Makefile,v 1.1 2009/01/09 05:51:36 kevin Exp $
NAME := nufw
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From kevin at fedoraproject.org  Fri Jan  9 05:51:35 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  9 Jan 2009 05:51:35 +0000 (UTC)
Subject: rpms/nufw Makefile,NONE,1.1
Message-ID: <20090109055135.C0F2B7013F@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/nufw
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvst16644/rpms/nufw

Added Files:
	Makefile 
Log Message:
Setup of module nufw


--- NEW FILE Makefile ---
# Top level Makefile for module nufw
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout 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 Jan  9 05:54:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Jan 2009 05:54:09 +0000
Subject: [pkgdb] chipmunk was added for limb
Message-ID: <20090109055409.97DE520831D@bastion.fedora.phx.redhat.com>

kevin has added Package chipmunk with summary A rigid body physics library
kevin has approved Package chipmunk
kevin has added a Fedora devel branch for chipmunk with an owner of limb
kevin has approved chipmunk in Fedora devel
kevin has approved Package chipmunk
kevin has set commit to Approved for provenpackager on chipmunk (Fedora devel)
kevin has set build to Approved for provenpackager on chipmunk (Fedora devel)
kevin has set checkout to Approved for provenpackager on chipmunk (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/chipmunk



From pkgdb at fedoraproject.org  Fri Jan  9 05:54:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Jan 2009 05:54:27 +0000
Subject: [pkgdb] chipmunk (Fedora, 10) updated by kevin
Message-ID: <20090109055427.E7A5B20831D@bastion.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for chipmunk
kevin has set commit to Approved for provenpackager on chipmunk (Fedora 10)
kevin has set build to Approved for provenpackager on chipmunk (Fedora 10)
kevin has set checkout to Approved for provenpackager on chipmunk (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/chipmunk



From kevin at fedoraproject.org  Fri Jan  9 05:54:34 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  9 Jan 2009 05:54:34 +0000 (UTC)
Subject: rpms/chipmunk - New directory
Message-ID: <20090109055434.26D277011C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/chipmunk
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsA16850/rpms/chipmunk

Log Message:
Directory /cvs/pkgs/rpms/chipmunk added to the repository




From kevin at fedoraproject.org  Fri Jan  9 05:54:34 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  9 Jan 2009 05:54:34 +0000 (UTC)
Subject: rpms/chipmunk/devel - New directory
Message-ID: <20090109055434.635A370142@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/chipmunk/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsA16850/rpms/chipmunk/devel

Log Message:
Directory /cvs/pkgs/rpms/chipmunk/devel added to the repository




From kevin at fedoraproject.org  Fri Jan  9 05:54:49 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  9 Jan 2009 05:54:49 +0000 (UTC)
Subject: rpms/chipmunk Makefile,NONE,1.1
Message-ID: <20090109055449.560FE7011C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/chipmunk
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsA16850/rpms/chipmunk

Added Files:
	Makefile 
Log Message:
Setup of module chipmunk


--- NEW FILE Makefile ---
# Top level Makefile for module chipmunk
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Jan  9 05:54:49 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  9 Jan 2009 05:54:49 +0000 (UTC)
Subject: rpms/chipmunk/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090109055449.970B37011C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/chipmunk/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsA16850/rpms/chipmunk/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module chipmunk


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: chipmunk
# $Id: Makefile,v 1.1 2009/01/09 05:54:49 kevin Exp $
NAME := chipmunk
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Jan  9 05:56:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Jan 2009 05:56:32 +0000
Subject: [pkgdb] libwpg was added for lkundrak
Message-ID: <20090109055632.97E9B20831D@bastion.fedora.phx.redhat.com>

kevin has added Package libwpg with summary Library for reading WordPerfect Graphics images
kevin has approved Package libwpg
kevin has added a Fedora devel branch for libwpg with an owner of lkundrak
kevin has approved libwpg in Fedora devel
kevin has approved Package libwpg
kevin has set commit to Approved for provenpackager on libwpg (Fedora devel)
kevin has set build to Approved for provenpackager on libwpg (Fedora devel)
kevin has set checkout to Approved for provenpackager on libwpg (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libwpg



From kevin at fedoraproject.org  Fri Jan  9 05:57:19 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  9 Jan 2009 05:57:19 +0000 (UTC)
Subject: rpms/libwpg - New directory
Message-ID: <20090109055719.287E47011C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/libwpg
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsl17048/rpms/libwpg

Log Message:
Directory /cvs/pkgs/rpms/libwpg added to the repository




From kevin at fedoraproject.org  Fri Jan  9 05:57:19 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  9 Jan 2009 05:57:19 +0000 (UTC)
Subject: rpms/libwpg/devel - New directory
Message-ID: <20090109055719.60FD87011C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/libwpg/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsl17048/rpms/libwpg/devel

Log Message:
Directory /cvs/pkgs/rpms/libwpg/devel added to the repository




From kevin at fedoraproject.org  Fri Jan  9 05:57:35 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  9 Jan 2009 05:57:35 +0000 (UTC)
Subject: rpms/libwpg Makefile,NONE,1.1
Message-ID: <20090109055735.9FCB27011C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/libwpg
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsl17048/rpms/libwpg

Added Files:
	Makefile 
Log Message:
Setup of module libwpg


--- NEW FILE Makefile ---
# Top level Makefile for module libwpg
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Jan  9 05:57:35 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  9 Jan 2009 05:57:35 +0000 (UTC)
Subject: rpms/libwpg/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <20090109055735.F2AA87011C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/libwpg/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsl17048/rpms/libwpg/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module libwpg


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: libwpg
# $Id: Makefile,v 1.1 2009/01/09 05:57:35 kevin Exp $
NAME := libwpg
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Jan  9 05:58:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Jan 2009 05:58:34 +0000
Subject: [pkgdb] perl-MooseX-Traits-Attribute-CascadeClear was added for
	cweyl
Message-ID: <20090109055834.2D95320831D@bastion.fedora.phx.redhat.com>

kevin has added Package perl-MooseX-Traits-Attribute-CascadeClear with summary Attribute trait to cascade clearer actions
kevin has approved Package perl-MooseX-Traits-Attribute-CascadeClear
kevin has added a Fedora devel branch for perl-MooseX-Traits-Attribute-CascadeClear with an owner of cweyl
kevin has approved perl-MooseX-Traits-Attribute-CascadeClear in Fedora devel
kevin has approved Package perl-MooseX-Traits-Attribute-CascadeClear
kevin has set commit to Approved for provenpackager on perl-MooseX-Traits-Attribute-CascadeClear (Fedora devel)
kevin has set build to Approved for provenpackager on perl-MooseX-Traits-Attribute-CascadeClear (Fedora devel)
kevin has set checkout to Approved for provenpackager on perl-MooseX-Traits-Attribute-CascadeClear (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-MooseX-Traits-Attribute-CascadeClear



From pkgdb at fedoraproject.org  Fri Jan  9 05:58:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Jan 2009 05:58:53 +0000
Subject: [pkgdb] perl-MooseX-Traits-Attribute-CascadeClear (Fedora,
	devel) updated by kevin
Message-ID: <20090109055853.7B0E8208421@bastion.fedora.phx.redhat.com>

kevin approved watchbugzilla on perl-MooseX-Traits-Attribute-CascadeClear (Fedora devel) for perl-sig
kevin approved watchcommits on perl-MooseX-Traits-Attribute-CascadeClear (Fedora devel) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-MooseX-Traits-Attribute-CascadeClear



From pkgdb at fedoraproject.org  Fri Jan  9 05:58:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Jan 2009 05:58:53 +0000
Subject: [pkgdb] perl-MooseX-Traits-Attribute-CascadeClear (Fedora,
	9) updated by kevin
Message-ID: <20090109055853.87987208457@bastion.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for perl-MooseX-Traits-Attribute-CascadeClear
kevin has set commit to Approved for provenpackager on perl-MooseX-Traits-Attribute-CascadeClear (Fedora 9)
kevin has set build to Approved for provenpackager on perl-MooseX-Traits-Attribute-CascadeClear (Fedora 9)
kevin has set checkout to Approved for provenpackager on perl-MooseX-Traits-Attribute-CascadeClear (Fedora 9)
kevin approved watchbugzilla on perl-MooseX-Traits-Attribute-CascadeClear (Fedora 9) for perl-sig
kevin approved watchcommits on perl-MooseX-Traits-Attribute-CascadeClear (Fedora 9) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-MooseX-Traits-Attribute-CascadeClear



From pkgdb at fedoraproject.org  Fri Jan  9 05:58:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Jan 2009 05:58:53 +0000
Subject: [pkgdb] perl-MooseX-Traits-Attribute-CascadeClear (Fedora,
	10) updated by kevin
Message-ID: <20090109055853.943E3208467@bastion.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for perl-MooseX-Traits-Attribute-CascadeClear
kevin has set commit to Approved for provenpackager on perl-MooseX-Traits-Attribute-CascadeClear (Fedora 10)
kevin has set build to Approved for provenpackager on perl-MooseX-Traits-Attribute-CascadeClear (Fedora 10)
kevin has set checkout to Approved for provenpackager on perl-MooseX-Traits-Attribute-CascadeClear (Fedora 10)
kevin approved watchbugzilla on perl-MooseX-Traits-Attribute-CascadeClear (Fedora 10) for perl-sig
kevin approved watchcommits on perl-MooseX-Traits-Attribute-CascadeClear (Fedora 10) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-MooseX-Traits-Attribute-CascadeClear



From kevin at fedoraproject.org  Fri Jan  9 05:59:18 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  9 Jan 2009 05:59:18 +0000 (UTC)
Subject: rpms/perl-MooseX-Traits-Attribute-CascadeClear - New directory
Message-ID: <20090109055918.25F467011C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-MooseX-Traits-Attribute-CascadeClear
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsI17243/rpms/perl-MooseX-Traits-Attribute-CascadeClear

Log Message:
Directory /cvs/pkgs/rpms/perl-MooseX-Traits-Attribute-CascadeClear added to the repository




From kevin at fedoraproject.org  Fri Jan  9 05:59:18 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  9 Jan 2009 05:59:18 +0000 (UTC)
Subject: rpms/perl-MooseX-Traits-Attribute-CascadeClear/devel - New directory
Message-ID: <20090109055918.631BC7011C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-MooseX-Traits-Attribute-CascadeClear/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsI17243/rpms/perl-MooseX-Traits-Attribute-CascadeClear/devel

Log Message:
Directory /cvs/pkgs/rpms/perl-MooseX-Traits-Attribute-CascadeClear/devel added to the repository




From kevin at fedoraproject.org  Fri Jan  9 05:59:33 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  9 Jan 2009 05:59:33 +0000 (UTC)
Subject: rpms/perl-MooseX-Traits-Attribute-CascadeClear Makefile,NONE,1.1
Message-ID: <20090109055933.5DE6A7011C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-MooseX-Traits-Attribute-CascadeClear
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsI17243/rpms/perl-MooseX-Traits-Attribute-CascadeClear

Added Files:
	Makefile 
Log Message:
Setup of module perl-MooseX-Traits-Attribute-CascadeClear


--- NEW FILE Makefile ---
# Top level Makefile for module perl-MooseX-Traits-Attribute-CascadeClear
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Jan  9 05:59:33 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  9 Jan 2009 05:59:33 +0000 (UTC)
Subject: rpms/perl-MooseX-Traits-Attribute-CascadeClear/devel .cvsignore,
	NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1
Message-ID: <20090109055933.A554E7011C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-MooseX-Traits-Attribute-CascadeClear/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsI17243/rpms/perl-MooseX-Traits-Attribute-CascadeClear/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-MooseX-Traits-Attribute-CascadeClear


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: perl-MooseX-Traits-Attribute-CascadeClear
# $Id: Makefile,v 1.1 2009/01/09 05:59:33 kevin Exp $
NAME := perl-MooseX-Traits-Attribute-CascadeClear
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Jan  9 06:04:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Jan 2009 06:04:02 +0000
Subject: [pkgdb] perl-SVG-Parser was added for lkundrak
Message-ID: <20090109060402.64A3720831F@bastion.fedora.phx.redhat.com>

kevin has added Package perl-SVG-Parser with summary XML Parser for SVG documents
kevin has approved Package perl-SVG-Parser
kevin has added a Fedora devel branch for perl-SVG-Parser with an owner of lkundrak
kevin has approved perl-SVG-Parser in Fedora devel
kevin has approved Package perl-SVG-Parser
kevin has set commit to Approved for provenpackager on perl-SVG-Parser (Fedora devel)
kevin has set build to Approved for provenpackager on perl-SVG-Parser (Fedora devel)
kevin has set checkout to Approved for provenpackager on perl-SVG-Parser (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-SVG-Parser



From kevin at fedoraproject.org  Fri Jan  9 06:04:38 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  9 Jan 2009 06:04:38 +0000 (UTC)
Subject: rpms/perl-SVG-Parser - New directory
Message-ID: <20090109060438.24AF17011C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-SVG-Parser
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvso18240/rpms/perl-SVG-Parser

Log Message:
Directory /cvs/pkgs/rpms/perl-SVG-Parser added to the repository




From kevin at fedoraproject.org  Fri Jan  9 06:04:38 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  9 Jan 2009 06:04:38 +0000 (UTC)
Subject: rpms/perl-SVG-Parser/devel - New directory
Message-ID: <20090109060438.5CE397011C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-SVG-Parser/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvso18240/rpms/perl-SVG-Parser/devel

Log Message:
Directory /cvs/pkgs/rpms/perl-SVG-Parser/devel added to the repository




From kevin at fedoraproject.org  Fri Jan  9 06:04:56 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  9 Jan 2009 06:04:56 +0000 (UTC)
Subject: rpms/perl-SVG-Parser Makefile,NONE,1.1
Message-ID: <20090109060456.E7E3F7011C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-SVG-Parser
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvso18240/rpms/perl-SVG-Parser

Added Files:
	Makefile 
Log Message:
Setup of module perl-SVG-Parser


--- NEW FILE Makefile ---
# Top level Makefile for module perl-SVG-Parser
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Fri Jan  9 06:04:57 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri,  9 Jan 2009 06:04:57 +0000 (UTC)
Subject: rpms/perl-SVG-Parser/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090109060457.3E5947011C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-SVG-Parser/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvso18240/rpms/perl-SVG-Parser/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-SVG-Parser


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: perl-SVG-Parser
# $Id: Makefile,v 1.1 2009/01/09 06:04:57 kevin Exp $
NAME := perl-SVG-Parser
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Jan  9 06:05:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Jan 2009 06:05:12 +0000
Subject: [pkgdb] qmmp (Fedora EPEL, 5) updated by kevin
Message-ID: <20090109060512.925AD20831D@bastion.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for qmmp
kevin has set commit to Approved for provenpackager on qmmp (Fedora EPEL 5)
kevin has set build to Approved for provenpackager on qmmp (Fedora EPEL 5)
kevin has set checkout to Approved for provenpackager on qmmp (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qmmp



From drepper at fedoraproject.org  Fri Jan  9 06:22:43 2009
From: drepper at fedoraproject.org (Ulrich Drepper)
Date: Fri,  9 Jan 2009 06:22:43 +0000 (UTC)
Subject: rpms/pfscalibration/devel import.log, NONE,
	1.1 pfscalibration-1.4-nonr.patch, NONE,
	1.1 pfscalibration-1.4-opt.patch, NONE,
	1.1 pfscalibration-CXXFLAGS.patch, NONE, 1.1 pfscalibration.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090109062243.A06827011C@cvs1.fedora.phx.redhat.com>

Author: drepper

Update of /cvs/pkgs/rpms/pfscalibration/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19168/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log pfscalibration-1.4-nonr.patch 
	pfscalibration-1.4-opt.patch pfscalibration-CXXFLAGS.patch 
	pfscalibration.spec 
Log Message:
pfscalibration for F11.



--- NEW FILE import.log ---
pfscalibration-1_4-4_fc10:HEAD:pfscalibration-1.4-4.fc10.src.rpm:1231482073

pfscalibration-1.4-nonr.patch:

--- NEW FILE pfscalibration-1.4-nonr.patch ---
diff -up pfscalibration-1.4/src/Makefile.am-old pfscalibration-1.4/src/Makefile.am
--- pfscalibration-1.4/src/Makefile.am-old	2009-01-02 12:08:08.000000000 -0800
+++ pfscalibration-1.4/src/Makefile.am	2009-01-02 12:08:35.000000000 -0800
@@ -8,8 +8,8 @@ pfshdrcalibrate_SOURCES = pfshdrcalibrat
 			  responses.cpp responses.h \
 			  robertson02.cpp robertson02.h \
 			  mitsunaga99.cpp mitsunaga99.h \
-			  mitsunaga99_numerical.cpp mitsunaga99_numerical.h \
-			  nrutil.cpp nrutil.h
+			  mitsunaga99_numerical.cpp mitsunaga99_numerical.h
+#			  nrutil.cpp nrutil.h
 
 man_MANS =  jpeg2hdrgen.1 dcraw2hdrgen.1 pfsinhdrgen.1 pfshdrcalibrate.1
 
diff -up pfscalibration-1.4/src/mitsunaga99_numerical.cpp-old pfscalibration-1.4/src/mitsunaga99_numerical.cpp
--- pfscalibration-1.4/src/mitsunaga99_numerical.cpp-old	2009-01-02 12:04:58.000000000 -0800
+++ pfscalibration-1.4/src/mitsunaga99_numerical.cpp	2009-01-02 12:05:00.000000000 -0800
@@ -26,12 +26,12 @@
  */
 
 
+#include <error.h>
+#include <errno.h>
 #include <math.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <vector>
-#define NRANSI
-#include "nrutil.h"
 
 #include "mitsunaga99_numerical.h"
 
@@ -43,13 +43,16 @@ void ludcmp(float **a, int n, int *indx,
 	float big,dum,sum,temp;
 	float *vv;
 
-	vv=vector(1,n);
+	vv=(float*)malloc(n*sizeof(float));
+	if (vv==NULL)
+		error(1,errno,"Memory allocation problem in ludcmp");
+	--vv;
 	*d=1.0;
 	for (i=1;i<=n;i++) {
 		big=0.0;
 		for (j=1;j<=n;j++)
 			if ((temp=fabs(a[i][j])) > big) big=temp;
-		if (big == 0.0) nrerror("Singular matrix in routine ludcmp");
+		if (big == 0.0) error(1,0,"Singular matrix in routine ludcmp");
 		vv[i]=1.0/big;
 	}
 	
@@ -86,7 +90,8 @@ void ludcmp(float **a, int n, int *indx,
 			for (i=j+1;i<=n;i++) a[i][j] *= dum;
 		}
 	}
-	free_vector(vv,1,n);
+	++vv;
+	free(vv);
 }
 #undef TINY
 

pfscalibration-1.4-opt.patch:

--- NEW FILE pfscalibration-1.4-opt.patch ---
diff -up pfscalibration-1.4/src/Makefile.am.opt pfscalibration-1.4/src/Makefile.am
--- pfscalibration-1.4/src/Makefile.am.opt	2009-01-06 09:54:55.000000000 -0800
+++ pfscalibration-1.4/src/Makefile.am	2009-01-06 09:54:55.000000000 -0800
@@ -13,6 +13,9 @@ pfshdrcalibrate_SOURCES = pfshdrcalibrat
 
 man_MANS =  jpeg2hdrgen.1 dcraw2hdrgen.1 pfsinhdrgen.1 pfshdrcalibrate.1
 
+pfshdrcalibrate_CXXFLAGS = -fopenmp
+pfshdrcalibrate_LDFLAGS = -fopenmp
+
 LIBS = $(PFS_LIBS) -lm
 INCLUDES = $(PFS_CFLAGS)
 EXTRA_DIST = $(man_MANS) $(bin_SCRIPTS)
diff -up pfscalibration-1.4/src/pfshdrcalibrate.cpp.opt pfscalibration-1.4/src/pfshdrcalibrate.cpp
--- pfscalibration-1.4/src/pfshdrcalibrate.cpp.opt	2007-03-28 06:29:43.000000000 -0700
+++ pfscalibration-1.4/src/pfshdrcalibrate.cpp	2009-01-06 09:55:48.000000000 -0800
@@ -482,6 +482,8 @@ void pfshdrcalibrate( int argc, char* ar
 
   // calibration
   long sp = 0;                  // saturated pixels
+#pragma omp parallel
+  {
   switch( opt_calibration )
   {
   case NONE:
@@ -492,12 +494,23 @@ void pfshdrcalibrate( int argc, char* ar
     }
     else
     {
+#pragma omp sections reduction(+:sp)
+      {
+      {
       VERBOSE_STR << "applying response to R channel..." << endl;
       sp = robertson02_applyResponse( Xj, imgsR, Ir, w, M);
+      }
+#pragma omp section
+      {
       VERBOSE_STR << "applying response to G channel..." << endl;
       sp += robertson02_applyResponse( Yj, imgsG, Ig, w, M);
+      }
+#pragma omp section
+      {
       VERBOSE_STR << "applying response to B channel..." << endl;
       sp += robertson02_applyResponse( Zj, imgsB, Ib, w, M);
+      }
+      }
       sp /= 3;
     }
     break;
@@ -509,12 +522,23 @@ void pfshdrcalibrate( int argc, char* ar
     }
     else
     {
+#pragma omp sections reduction(+:sp)
+      {
+      {
       VERBOSE_STR << "recovering R channel..." << endl;
       sp = robertson02_getResponse( Xj, imgsR, Ir, w, M);
+      }
+#pragma omp section
+      {
       VERBOSE_STR << "recovering G channel..." << endl;
       sp += robertson02_getResponse( Yj, imgsG, Ig, w, M);
+      }
+#pragma omp section
+      {
       VERBOSE_STR << "recovering B channel..." << endl;
       sp += robertson02_getResponse( Zj, imgsB, Ib, w, M);
+      }
+      }
       sp /= 3;
     }
     break;
@@ -547,6 +571,7 @@ void pfshdrcalibrate( int argc, char* ar
 	}
 	break;
   }
+  }
   if( sp>0 )
   {
     float perc = ceilf(100.0f*sp/size);
diff -up pfscalibration-1.4/src/robertson02.cpp.opt pfscalibration-1.4/src/robertson02.cpp
--- pfscalibration-1.4/src/robertson02.cpp.opt	2008-08-21 15:54:01.000000000 -0700
+++ pfscalibration-1.4/src/robertson02.cpp	2009-01-06 09:54:55.000000000 -0800
@@ -34,6 +34,7 @@
 #include <iostream>
 #include <vector>
 #include <cstdlib>
+#include <cstring>
 
 #include <math.h>
 
@@ -114,6 +115,7 @@ int robertson02_applyResponse( pfs::Arra
   
   
   // all pixels
+#pragma omp parallel for schedule(guided, 1)
   for( int j=0 ; j<width*height ; j++ )
   {
     // all exposures for each pixel
@@ -221,11 +223,16 @@ int robertson02_getResponse( pfs::Array2
   while( !converged )
   {
     // 1. Minimize with respect to I
+#if 0
     for( m=0 ; m<M ; m++ )
     {
       cardEm[m]=0;
       sum[m]=0.0f;
     }
+#else
+    memset(cardEm, '\0', M * sizeof(cardEm[0]));
+    memset(sum, '\0', M * sizeof(sum[0]));
+#endif
     
     for( i=0 ; i<N ; i++ )
     {
@@ -244,6 +251,7 @@ int robertson02_getResponse( pfs::Array2
       }
     }
 
+#pragma omp parallel for schedule(guided, 1)
     for( m=0 ; m<M ; m++ )
       if( cardEm[m]!=0 )
 	I[m] = sum[m] / cardEm[m];
@@ -259,6 +267,7 @@ int robertson02_getResponse( pfs::Array2
     // 4. Check stopping condition
     float delta = 0.0f;
     int hits=0;
+#pragma omp parallel for schedule(guided, 1) reduction(+:delta,hits)
     for( m=0 ; m<M ; m++ )
       if( I[m]!=0.0f )
       {

pfscalibration-CXXFLAGS.patch:

--- NEW FILE pfscalibration-CXXFLAGS.patch ---
diff -up pfscalibration-1.4/configure.ac-save pfscalibration-1.4/configure.ac
--- pfscalibration-1.4/configure.ac-save	2009-01-07 00:41:36.000000000 -0800
+++ pfscalibration-1.4/configure.ac	2009-01-07 00:48:11.000000000 -0800
@@ -13,7 +13,7 @@ AC_PROG_LIBTOOL
 dnl
 dnl Default setup
 dnl
-CXXFLAGS="-O3 -funroll-loops -fstrength-reduce -fschedule-insns2 -felide-constructors -frerun-loop-opt -fexceptions -fno-strict-aliasing -fexpensive-optimizations -ffast-math -pipe"
+dnl CXXFLAGS="-O3 -funroll-loops -fstrength-reduce -fschedule-insns2 -felide-constructors -frerun-loop-opt -fexceptions -fno-strict-aliasing -fexpensive-optimizations -ffast-math -pipe"
 
 dnl
 dnl Templates for autoheader defines
@@ -30,7 +30,9 @@ AC_ARG_ENABLE(debug,
                        [Enable debug symbols and asserts]),
 		 [if test "$enable_debug" = "yes" ; then
 		     CXXFLAGS="-g"
-		 fi],[enable_debug="no"])
+		 fi],[enable_debug="no"
+			temp_CXXFLAGS=`echo $CXXFLAGS | sed "s/-O./ /"`
+			CXXFLAGS="-O3 -funroll-loops -ffast-math $temp_CXXFLAGS"])
 
 
 dnl


--- NEW FILE pfscalibration.spec ---
Name:		pfscalibration
Version:	1.4
Release:	4%{?dist}
Summary:	Scripts and programs for photometric calibration

Group:		Applications/Multimedia
License:	GPLv2+
URL:		http://pfstools.sourceforge.net/
Source0:	http://downloads.sourceforge.net/pfstools/%{name}-%{version}.tar.gz
Patch1:		pfscalibration-1.4-nonr.patch
Patch2:		pfscalibration-1.4-opt.patch
Patch3:		pfscalibration-CXXFLAGS.patch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	automake
Buildrequires:	libtool
BuildRequires:	libtiff-devel
BuildRequires:	pfstools-devel
Requires:	perl
Requires:	dcraw
Requires:	jhead

%description
PFScalibration package provides an implementation of the Robertson et al. 2003
method for the photometric calibration of cameras, Mitsunaga and Nayar's
algorithm "Radiometric Self Calibration", and for the recovery of high dynamic
range (HDR) images from the set of low dynamic range (LDR) exposures.

%prep
%setup -q

%patch1 -p1 -b .nonr
%patch2 -p1 -b .opt
%patch3 -p1 -b .cxxflags

autoreconf
libtoolize --automake

%build
# Note that the configure script modifies the compiler options a bit.
# For the math-heavy code we want to take advantage of some additional
# options.  The default -O2 is replaced by some additional options
# (including -O3) but all the other default options are preserved.
%configure
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc COPYING README TODO AUTHORS ChangeLog
%{_bindir}/dcraw2hdrgen
%{_bindir}/jpeg2hdrgen
%{_bindir}/pfshdrcalibrate
%{_bindir}/pfsinhdrgen
%{_bindir}/pfsmergehdr
%{_mandir}/man1/dcraw2hdrgen.1.gz
%{_mandir}/man1/jpeg2hdrgen.1.gz
%{_mandir}/man1/pfshdrcalibrate.1.gz
%{_mandir}/man1/pfsinhdrgen.1.gz


%changelog

* Wed Jan 7 2009 Ulrich Drepper <drepper at redhat.com> - 1.4-4
- Fix configure script patch to not remove -g compiler option.

* Tue Jan 6 2009 Ulrich Drepper <drepper at redhat.com> - 1.4-3
- Add some documentation files
- Add additional optimizations differently

* Tue Jan 6 2009 Ulrich Drepper <drepper at redhat.com> - 1.4-2
- Run libtoolize
- Correct spec file
- Really use OpenMP

* Fri Jan 1 2009 Ulrich Drepper <drepper at redhat.com> - 1.4-1
- Update to 1.4.
  - remove nrutil requirement
- update optimization patch, drop bug fix patch

* Tue Aug 19 2008 Ulrich Drepper <drepper at redhat.com> - 1.3-1
- Initial package.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pfscalibration/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	9 Jan 2009 05:31:41 -0000	1.1
+++ .cvsignore	9 Jan 2009 06:22:13 -0000	1.2
@@ -0,0 +1 @@
+pfscalibration-1.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pfscalibration/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	9 Jan 2009 05:31:41 -0000	1.1
+++ sources	9 Jan 2009 06:22:13 -0000	1.2
@@ -0,0 +1 @@
+1844a6e3f03f585dbc8bcc3eaacf66b9  pfscalibration-1.4.tar.gz



From drepper at fedoraproject.org  Fri Jan  9 06:24:37 2009
From: drepper at fedoraproject.org (Ulrich Drepper)
Date: Fri,  9 Jan 2009 06:24:37 +0000 (UTC)
Subject: rpms/pfscalibration/F-9 import.log, NONE,
	1.1 pfscalibration-1.4-nonr.patch, NONE,
	1.1 pfscalibration-1.4-opt.patch, NONE,
	1.1 pfscalibration-CXXFLAGS.patch, NONE, 1.1 pfscalibration.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090109062437.473C77011C@cvs1.fedora.phx.redhat.com>

Author: drepper

Update of /cvs/pkgs/rpms/pfscalibration/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19546/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	import.log pfscalibration-1.4-nonr.patch 
	pfscalibration-1.4-opt.patch pfscalibration-CXXFLAGS.patch 
	pfscalibration.spec 
Log Message:
pfscalibration for F9.



--- NEW FILE import.log ---
pfscalibration-1_4-4_fc10:F-9:pfscalibration-1.4-4.fc10.src.rpm:1231482211

pfscalibration-1.4-nonr.patch:

--- NEW FILE pfscalibration-1.4-nonr.patch ---
diff -up pfscalibration-1.4/src/Makefile.am-old pfscalibration-1.4/src/Makefile.am
--- pfscalibration-1.4/src/Makefile.am-old	2009-01-02 12:08:08.000000000 -0800
+++ pfscalibration-1.4/src/Makefile.am	2009-01-02 12:08:35.000000000 -0800
@@ -8,8 +8,8 @@ pfshdrcalibrate_SOURCES = pfshdrcalibrat
 			  responses.cpp responses.h \
 			  robertson02.cpp robertson02.h \
 			  mitsunaga99.cpp mitsunaga99.h \
-			  mitsunaga99_numerical.cpp mitsunaga99_numerical.h \
-			  nrutil.cpp nrutil.h
+			  mitsunaga99_numerical.cpp mitsunaga99_numerical.h
+#			  nrutil.cpp nrutil.h
 
 man_MANS =  jpeg2hdrgen.1 dcraw2hdrgen.1 pfsinhdrgen.1 pfshdrcalibrate.1
 
diff -up pfscalibration-1.4/src/mitsunaga99_numerical.cpp-old pfscalibration-1.4/src/mitsunaga99_numerical.cpp
--- pfscalibration-1.4/src/mitsunaga99_numerical.cpp-old	2009-01-02 12:04:58.000000000 -0800
+++ pfscalibration-1.4/src/mitsunaga99_numerical.cpp	2009-01-02 12:05:00.000000000 -0800
@@ -26,12 +26,12 @@
  */
 
 
+#include <error.h>
+#include <errno.h>
 #include <math.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <vector>
-#define NRANSI
-#include "nrutil.h"
 
 #include "mitsunaga99_numerical.h"
 
@@ -43,13 +43,16 @@ void ludcmp(float **a, int n, int *indx,
 	float big,dum,sum,temp;
 	float *vv;
 
-	vv=vector(1,n);
+	vv=(float*)malloc(n*sizeof(float));
+	if (vv==NULL)
+		error(1,errno,"Memory allocation problem in ludcmp");
+	--vv;
 	*d=1.0;
 	for (i=1;i<=n;i++) {
 		big=0.0;
 		for (j=1;j<=n;j++)
 			if ((temp=fabs(a[i][j])) > big) big=temp;
-		if (big == 0.0) nrerror("Singular matrix in routine ludcmp");
+		if (big == 0.0) error(1,0,"Singular matrix in routine ludcmp");
 		vv[i]=1.0/big;
 	}
 	
@@ -86,7 +90,8 @@ void ludcmp(float **a, int n, int *indx,
 			for (i=j+1;i<=n;i++) a[i][j] *= dum;
 		}
 	}
-	free_vector(vv,1,n);
+	++vv;
+	free(vv);
 }
 #undef TINY
 

pfscalibration-1.4-opt.patch:

--- NEW FILE pfscalibration-1.4-opt.patch ---
diff -up pfscalibration-1.4/src/Makefile.am.opt pfscalibration-1.4/src/Makefile.am
--- pfscalibration-1.4/src/Makefile.am.opt	2009-01-06 09:54:55.000000000 -0800
+++ pfscalibration-1.4/src/Makefile.am	2009-01-06 09:54:55.000000000 -0800
@@ -13,6 +13,9 @@ pfshdrcalibrate_SOURCES = pfshdrcalibrat
 
 man_MANS =  jpeg2hdrgen.1 dcraw2hdrgen.1 pfsinhdrgen.1 pfshdrcalibrate.1
 
+pfshdrcalibrate_CXXFLAGS = -fopenmp
+pfshdrcalibrate_LDFLAGS = -fopenmp
+
 LIBS = $(PFS_LIBS) -lm
 INCLUDES = $(PFS_CFLAGS)
 EXTRA_DIST = $(man_MANS) $(bin_SCRIPTS)
diff -up pfscalibration-1.4/src/pfshdrcalibrate.cpp.opt pfscalibration-1.4/src/pfshdrcalibrate.cpp
--- pfscalibration-1.4/src/pfshdrcalibrate.cpp.opt	2007-03-28 06:29:43.000000000 -0700
+++ pfscalibration-1.4/src/pfshdrcalibrate.cpp	2009-01-06 09:55:48.000000000 -0800
@@ -482,6 +482,8 @@ void pfshdrcalibrate( int argc, char* ar
 
   // calibration
   long sp = 0;                  // saturated pixels
+#pragma omp parallel
+  {
   switch( opt_calibration )
   {
   case NONE:
@@ -492,12 +494,23 @@ void pfshdrcalibrate( int argc, char* ar
     }
     else
     {
+#pragma omp sections reduction(+:sp)
+      {
+      {
       VERBOSE_STR << "applying response to R channel..." << endl;
       sp = robertson02_applyResponse( Xj, imgsR, Ir, w, M);
+      }
+#pragma omp section
+      {
       VERBOSE_STR << "applying response to G channel..." << endl;
       sp += robertson02_applyResponse( Yj, imgsG, Ig, w, M);
+      }
+#pragma omp section
+      {
       VERBOSE_STR << "applying response to B channel..." << endl;
       sp += robertson02_applyResponse( Zj, imgsB, Ib, w, M);
+      }
+      }
       sp /= 3;
     }
     break;
@@ -509,12 +522,23 @@ void pfshdrcalibrate( int argc, char* ar
     }
     else
     {
+#pragma omp sections reduction(+:sp)
+      {
+      {
       VERBOSE_STR << "recovering R channel..." << endl;
       sp = robertson02_getResponse( Xj, imgsR, Ir, w, M);
+      }
+#pragma omp section
+      {
       VERBOSE_STR << "recovering G channel..." << endl;
       sp += robertson02_getResponse( Yj, imgsG, Ig, w, M);
+      }
+#pragma omp section
+      {
       VERBOSE_STR << "recovering B channel..." << endl;
       sp += robertson02_getResponse( Zj, imgsB, Ib, w, M);
+      }
+      }
       sp /= 3;
     }
     break;
@@ -547,6 +571,7 @@ void pfshdrcalibrate( int argc, char* ar
 	}
 	break;
   }
+  }
   if( sp>0 )
   {
     float perc = ceilf(100.0f*sp/size);
diff -up pfscalibration-1.4/src/robertson02.cpp.opt pfscalibration-1.4/src/robertson02.cpp
--- pfscalibration-1.4/src/robertson02.cpp.opt	2008-08-21 15:54:01.000000000 -0700
+++ pfscalibration-1.4/src/robertson02.cpp	2009-01-06 09:54:55.000000000 -0800
@@ -34,6 +34,7 @@
 #include <iostream>
 #include <vector>
 #include <cstdlib>
+#include <cstring>
 
 #include <math.h>
 
@@ -114,6 +115,7 @@ int robertson02_applyResponse( pfs::Arra
   
   
   // all pixels
+#pragma omp parallel for schedule(guided, 1)
   for( int j=0 ; j<width*height ; j++ )
   {
     // all exposures for each pixel
@@ -221,11 +223,16 @@ int robertson02_getResponse( pfs::Array2
   while( !converged )
   {
     // 1. Minimize with respect to I
+#if 0
     for( m=0 ; m<M ; m++ )
     {
       cardEm[m]=0;
       sum[m]=0.0f;
     }
+#else
+    memset(cardEm, '\0', M * sizeof(cardEm[0]));
+    memset(sum, '\0', M * sizeof(sum[0]));
+#endif
     
     for( i=0 ; i<N ; i++ )
     {
@@ -244,6 +251,7 @@ int robertson02_getResponse( pfs::Array2
       }
     }
 
+#pragma omp parallel for schedule(guided, 1)
     for( m=0 ; m<M ; m++ )
       if( cardEm[m]!=0 )
 	I[m] = sum[m] / cardEm[m];
@@ -259,6 +267,7 @@ int robertson02_getResponse( pfs::Array2
     // 4. Check stopping condition
     float delta = 0.0f;
     int hits=0;
+#pragma omp parallel for schedule(guided, 1) reduction(+:delta,hits)
     for( m=0 ; m<M ; m++ )
       if( I[m]!=0.0f )
       {

pfscalibration-CXXFLAGS.patch:

--- NEW FILE pfscalibration-CXXFLAGS.patch ---
diff -up pfscalibration-1.4/configure.ac-save pfscalibration-1.4/configure.ac
--- pfscalibration-1.4/configure.ac-save	2009-01-07 00:41:36.000000000 -0800
+++ pfscalibration-1.4/configure.ac	2009-01-07 00:48:11.000000000 -0800
@@ -13,7 +13,7 @@ AC_PROG_LIBTOOL
 dnl
 dnl Default setup
 dnl
-CXXFLAGS="-O3 -funroll-loops -fstrength-reduce -fschedule-insns2 -felide-constructors -frerun-loop-opt -fexceptions -fno-strict-aliasing -fexpensive-optimizations -ffast-math -pipe"
+dnl CXXFLAGS="-O3 -funroll-loops -fstrength-reduce -fschedule-insns2 -felide-constructors -frerun-loop-opt -fexceptions -fno-strict-aliasing -fexpensive-optimizations -ffast-math -pipe"
 
 dnl
 dnl Templates for autoheader defines
@@ -30,7 +30,9 @@ AC_ARG_ENABLE(debug,
                        [Enable debug symbols and asserts]),
 		 [if test "$enable_debug" = "yes" ; then
 		     CXXFLAGS="-g"
-		 fi],[enable_debug="no"])
+		 fi],[enable_debug="no"
+			temp_CXXFLAGS=`echo $CXXFLAGS | sed "s/-O./ /"`
+			CXXFLAGS="-O3 -funroll-loops -ffast-math $temp_CXXFLAGS"])
 
 
 dnl


--- NEW FILE pfscalibration.spec ---
Name:		pfscalibration
Version:	1.4
Release:	4%{?dist}
Summary:	Scripts and programs for photometric calibration

Group:		Applications/Multimedia
License:	GPLv2+
URL:		http://pfstools.sourceforge.net/
Source0:	http://downloads.sourceforge.net/pfstools/%{name}-%{version}.tar.gz
Patch1:		pfscalibration-1.4-nonr.patch
Patch2:		pfscalibration-1.4-opt.patch
Patch3:		pfscalibration-CXXFLAGS.patch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	automake
Buildrequires:	libtool
BuildRequires:	libtiff-devel
BuildRequires:	pfstools-devel
Requires:	perl
Requires:	dcraw
Requires:	jhead

%description
PFScalibration package provides an implementation of the Robertson et al. 2003
method for the photometric calibration of cameras, Mitsunaga and Nayar's
algorithm "Radiometric Self Calibration", and for the recovery of high dynamic
range (HDR) images from the set of low dynamic range (LDR) exposures.

%prep
%setup -q

%patch1 -p1 -b .nonr
%patch2 -p1 -b .opt
%patch3 -p1 -b .cxxflags

autoreconf
libtoolize --automake

%build
# Note that the configure script modifies the compiler options a bit.
# For the math-heavy code we want to take advantage of some additional
# options.  The default -O2 is replaced by some additional options
# (including -O3) but all the other default options are preserved.
%configure
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc COPYING README TODO AUTHORS ChangeLog
%{_bindir}/dcraw2hdrgen
%{_bindir}/jpeg2hdrgen
%{_bindir}/pfshdrcalibrate
%{_bindir}/pfsinhdrgen
%{_bindir}/pfsmergehdr
%{_mandir}/man1/dcraw2hdrgen.1.gz
%{_mandir}/man1/jpeg2hdrgen.1.gz
%{_mandir}/man1/pfshdrcalibrate.1.gz
%{_mandir}/man1/pfsinhdrgen.1.gz


%changelog

* Wed Jan 7 2009 Ulrich Drepper <drepper at redhat.com> - 1.4-4
- Fix configure script patch to not remove -g compiler option.

* Tue Jan 6 2009 Ulrich Drepper <drepper at redhat.com> - 1.4-3
- Add some documentation files
- Add additional optimizations differently

* Tue Jan 6 2009 Ulrich Drepper <drepper at redhat.com> - 1.4-2
- Run libtoolize
- Correct spec file
- Really use OpenMP

* Fri Jan 1 2009 Ulrich Drepper <drepper at redhat.com> - 1.4-1
- Update to 1.4.
  - remove nrutil requirement
- update optimization patch, drop bug fix patch

* Tue Aug 19 2008 Ulrich Drepper <drepper at redhat.com> - 1.3-1
- Initial package.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pfscalibration/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	9 Jan 2009 05:31:41 -0000	1.1
+++ .cvsignore	9 Jan 2009 06:24:06 -0000	1.2
@@ -0,0 +1 @@
+pfscalibration-1.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pfscalibration/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	9 Jan 2009 05:31:41 -0000	1.1
+++ sources	9 Jan 2009 06:24:06 -0000	1.2
@@ -0,0 +1 @@
+1844a6e3f03f585dbc8bcc3eaacf66b9  pfscalibration-1.4.tar.gz



From drepper at fedoraproject.org  Fri Jan  9 06:26:54 2009
From: drepper at fedoraproject.org (Ulrich Drepper)
Date: Fri,  9 Jan 2009 06:26:54 +0000 (UTC)
Subject: rpms/pfscalibration/F-10 import.log, NONE,
	1.1 pfscalibration-1.4-nonr.patch, NONE,
	1.1 pfscalibration-1.4-opt.patch, NONE,
	1.1 pfscalibration-CXXFLAGS.patch, NONE, 1.1 pfscalibration.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090109062654.EA5267011C@cvs1.fedora.phx.redhat.com>

Author: drepper

Update of /cvs/pkgs/rpms/pfscalibration/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19865/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	import.log pfscalibration-1.4-nonr.patch 
	pfscalibration-1.4-opt.patch pfscalibration-CXXFLAGS.patch 
	pfscalibration.spec 
Log Message:
pfscalibration for F10.



--- NEW FILE import.log ---
pfscalibration-1_4-4_fc10:F-10:pfscalibration-1.4-4.fc10.src.rpm:1231482328

pfscalibration-1.4-nonr.patch:

--- NEW FILE pfscalibration-1.4-nonr.patch ---
diff -up pfscalibration-1.4/src/Makefile.am-old pfscalibration-1.4/src/Makefile.am
--- pfscalibration-1.4/src/Makefile.am-old	2009-01-02 12:08:08.000000000 -0800
+++ pfscalibration-1.4/src/Makefile.am	2009-01-02 12:08:35.000000000 -0800
@@ -8,8 +8,8 @@ pfshdrcalibrate_SOURCES = pfshdrcalibrat
 			  responses.cpp responses.h \
 			  robertson02.cpp robertson02.h \
 			  mitsunaga99.cpp mitsunaga99.h \
-			  mitsunaga99_numerical.cpp mitsunaga99_numerical.h \
-			  nrutil.cpp nrutil.h
+			  mitsunaga99_numerical.cpp mitsunaga99_numerical.h
+#			  nrutil.cpp nrutil.h
 
 man_MANS =  jpeg2hdrgen.1 dcraw2hdrgen.1 pfsinhdrgen.1 pfshdrcalibrate.1
 
diff -up pfscalibration-1.4/src/mitsunaga99_numerical.cpp-old pfscalibration-1.4/src/mitsunaga99_numerical.cpp
--- pfscalibration-1.4/src/mitsunaga99_numerical.cpp-old	2009-01-02 12:04:58.000000000 -0800
+++ pfscalibration-1.4/src/mitsunaga99_numerical.cpp	2009-01-02 12:05:00.000000000 -0800
@@ -26,12 +26,12 @@
  */
 
 
+#include <error.h>
+#include <errno.h>
 #include <math.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <vector>
-#define NRANSI
-#include "nrutil.h"
 
 #include "mitsunaga99_numerical.h"
 
@@ -43,13 +43,16 @@ void ludcmp(float **a, int n, int *indx,
 	float big,dum,sum,temp;
 	float *vv;
 
-	vv=vector(1,n);
+	vv=(float*)malloc(n*sizeof(float));
+	if (vv==NULL)
+		error(1,errno,"Memory allocation problem in ludcmp");
+	--vv;
 	*d=1.0;
 	for (i=1;i<=n;i++) {
 		big=0.0;
 		for (j=1;j<=n;j++)
 			if ((temp=fabs(a[i][j])) > big) big=temp;
-		if (big == 0.0) nrerror("Singular matrix in routine ludcmp");
+		if (big == 0.0) error(1,0,"Singular matrix in routine ludcmp");
 		vv[i]=1.0/big;
 	}
 	
@@ -86,7 +90,8 @@ void ludcmp(float **a, int n, int *indx,
 			for (i=j+1;i<=n;i++) a[i][j] *= dum;
 		}
 	}
-	free_vector(vv,1,n);
+	++vv;
+	free(vv);
 }
 #undef TINY
 

pfscalibration-1.4-opt.patch:

--- NEW FILE pfscalibration-1.4-opt.patch ---
diff -up pfscalibration-1.4/src/Makefile.am.opt pfscalibration-1.4/src/Makefile.am
--- pfscalibration-1.4/src/Makefile.am.opt	2009-01-06 09:54:55.000000000 -0800
+++ pfscalibration-1.4/src/Makefile.am	2009-01-06 09:54:55.000000000 -0800
@@ -13,6 +13,9 @@ pfshdrcalibrate_SOURCES = pfshdrcalibrat
 
 man_MANS =  jpeg2hdrgen.1 dcraw2hdrgen.1 pfsinhdrgen.1 pfshdrcalibrate.1
 
+pfshdrcalibrate_CXXFLAGS = -fopenmp
+pfshdrcalibrate_LDFLAGS = -fopenmp
+
 LIBS = $(PFS_LIBS) -lm
 INCLUDES = $(PFS_CFLAGS)
 EXTRA_DIST = $(man_MANS) $(bin_SCRIPTS)
diff -up pfscalibration-1.4/src/pfshdrcalibrate.cpp.opt pfscalibration-1.4/src/pfshdrcalibrate.cpp
--- pfscalibration-1.4/src/pfshdrcalibrate.cpp.opt	2007-03-28 06:29:43.000000000 -0700
+++ pfscalibration-1.4/src/pfshdrcalibrate.cpp	2009-01-06 09:55:48.000000000 -0800
@@ -482,6 +482,8 @@ void pfshdrcalibrate( int argc, char* ar
 
   // calibration
   long sp = 0;                  // saturated pixels
+#pragma omp parallel
+  {
   switch( opt_calibration )
   {
   case NONE:
@@ -492,12 +494,23 @@ void pfshdrcalibrate( int argc, char* ar
     }
     else
     {
+#pragma omp sections reduction(+:sp)
+      {
+      {
       VERBOSE_STR << "applying response to R channel..." << endl;
       sp = robertson02_applyResponse( Xj, imgsR, Ir, w, M);
+      }
+#pragma omp section
+      {
       VERBOSE_STR << "applying response to G channel..." << endl;
       sp += robertson02_applyResponse( Yj, imgsG, Ig, w, M);
+      }
+#pragma omp section
+      {
       VERBOSE_STR << "applying response to B channel..." << endl;
       sp += robertson02_applyResponse( Zj, imgsB, Ib, w, M);
+      }
+      }
       sp /= 3;
     }
     break;
@@ -509,12 +522,23 @@ void pfshdrcalibrate( int argc, char* ar
     }
     else
     {
+#pragma omp sections reduction(+:sp)
+      {
+      {
       VERBOSE_STR << "recovering R channel..." << endl;
       sp = robertson02_getResponse( Xj, imgsR, Ir, w, M);
+      }
+#pragma omp section
+      {
       VERBOSE_STR << "recovering G channel..." << endl;
       sp += robertson02_getResponse( Yj, imgsG, Ig, w, M);
+      }
+#pragma omp section
+      {
       VERBOSE_STR << "recovering B channel..." << endl;
       sp += robertson02_getResponse( Zj, imgsB, Ib, w, M);
+      }
+      }
       sp /= 3;
     }
     break;
@@ -547,6 +571,7 @@ void pfshdrcalibrate( int argc, char* ar
 	}
 	break;
   }
+  }
   if( sp>0 )
   {
     float perc = ceilf(100.0f*sp/size);
diff -up pfscalibration-1.4/src/robertson02.cpp.opt pfscalibration-1.4/src/robertson02.cpp
--- pfscalibration-1.4/src/robertson02.cpp.opt	2008-08-21 15:54:01.000000000 -0700
+++ pfscalibration-1.4/src/robertson02.cpp	2009-01-06 09:54:55.000000000 -0800
@@ -34,6 +34,7 @@
 #include <iostream>
 #include <vector>
 #include <cstdlib>
+#include <cstring>
 
 #include <math.h>
 
@@ -114,6 +115,7 @@ int robertson02_applyResponse( pfs::Arra
   
   
   // all pixels
+#pragma omp parallel for schedule(guided, 1)
   for( int j=0 ; j<width*height ; j++ )
   {
     // all exposures for each pixel
@@ -221,11 +223,16 @@ int robertson02_getResponse( pfs::Array2
   while( !converged )
   {
     // 1. Minimize with respect to I
+#if 0
     for( m=0 ; m<M ; m++ )
     {
       cardEm[m]=0;
       sum[m]=0.0f;
     }
+#else
+    memset(cardEm, '\0', M * sizeof(cardEm[0]));
+    memset(sum, '\0', M * sizeof(sum[0]));
+#endif
     
     for( i=0 ; i<N ; i++ )
     {
@@ -244,6 +251,7 @@ int robertson02_getResponse( pfs::Array2
       }
     }
 
+#pragma omp parallel for schedule(guided, 1)
     for( m=0 ; m<M ; m++ )
       if( cardEm[m]!=0 )
 	I[m] = sum[m] / cardEm[m];
@@ -259,6 +267,7 @@ int robertson02_getResponse( pfs::Array2
     // 4. Check stopping condition
     float delta = 0.0f;
     int hits=0;
+#pragma omp parallel for schedule(guided, 1) reduction(+:delta,hits)
     for( m=0 ; m<M ; m++ )
       if( I[m]!=0.0f )
       {

pfscalibration-CXXFLAGS.patch:

--- NEW FILE pfscalibration-CXXFLAGS.patch ---
diff -up pfscalibration-1.4/configure.ac-save pfscalibration-1.4/configure.ac
--- pfscalibration-1.4/configure.ac-save	2009-01-07 00:41:36.000000000 -0800
+++ pfscalibration-1.4/configure.ac	2009-01-07 00:48:11.000000000 -0800
@@ -13,7 +13,7 @@ AC_PROG_LIBTOOL
 dnl
 dnl Default setup
 dnl
-CXXFLAGS="-O3 -funroll-loops -fstrength-reduce -fschedule-insns2 -felide-constructors -frerun-loop-opt -fexceptions -fno-strict-aliasing -fexpensive-optimizations -ffast-math -pipe"
+dnl CXXFLAGS="-O3 -funroll-loops -fstrength-reduce -fschedule-insns2 -felide-constructors -frerun-loop-opt -fexceptions -fno-strict-aliasing -fexpensive-optimizations -ffast-math -pipe"
 
 dnl
 dnl Templates for autoheader defines
@@ -30,7 +30,9 @@ AC_ARG_ENABLE(debug,
                        [Enable debug symbols and asserts]),
 		 [if test "$enable_debug" = "yes" ; then
 		     CXXFLAGS="-g"
-		 fi],[enable_debug="no"])
+		 fi],[enable_debug="no"
+			temp_CXXFLAGS=`echo $CXXFLAGS | sed "s/-O./ /"`
+			CXXFLAGS="-O3 -funroll-loops -ffast-math $temp_CXXFLAGS"])
 
 
 dnl


--- NEW FILE pfscalibration.spec ---
Name:		pfscalibration
Version:	1.4
Release:	4%{?dist}
Summary:	Scripts and programs for photometric calibration

Group:		Applications/Multimedia
License:	GPLv2+
URL:		http://pfstools.sourceforge.net/
Source0:	http://downloads.sourceforge.net/pfstools/%{name}-%{version}.tar.gz
Patch1:		pfscalibration-1.4-nonr.patch
Patch2:		pfscalibration-1.4-opt.patch
Patch3:		pfscalibration-CXXFLAGS.patch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	automake
Buildrequires:	libtool
BuildRequires:	libtiff-devel
BuildRequires:	pfstools-devel
Requires:	perl
Requires:	dcraw
Requires:	jhead

%description
PFScalibration package provides an implementation of the Robertson et al. 2003
method for the photometric calibration of cameras, Mitsunaga and Nayar's
algorithm "Radiometric Self Calibration", and for the recovery of high dynamic
range (HDR) images from the set of low dynamic range (LDR) exposures.

%prep
%setup -q

%patch1 -p1 -b .nonr
%patch2 -p1 -b .opt
%patch3 -p1 -b .cxxflags

autoreconf
libtoolize --automake

%build
# Note that the configure script modifies the compiler options a bit.
# For the math-heavy code we want to take advantage of some additional
# options.  The default -O2 is replaced by some additional options
# (including -O3) but all the other default options are preserved.
%configure
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc COPYING README TODO AUTHORS ChangeLog
%{_bindir}/dcraw2hdrgen
%{_bindir}/jpeg2hdrgen
%{_bindir}/pfshdrcalibrate
%{_bindir}/pfsinhdrgen
%{_bindir}/pfsmergehdr
%{_mandir}/man1/dcraw2hdrgen.1.gz
%{_mandir}/man1/jpeg2hdrgen.1.gz
%{_mandir}/man1/pfshdrcalibrate.1.gz
%{_mandir}/man1/pfsinhdrgen.1.gz


%changelog

* Wed Jan 7 2009 Ulrich Drepper <drepper at redhat.com> - 1.4-4
- Fix configure script patch to not remove -g compiler option.

* Tue Jan 6 2009 Ulrich Drepper <drepper at redhat.com> - 1.4-3
- Add some documentation files
- Add additional optimizations differently

* Tue Jan 6 2009 Ulrich Drepper <drepper at redhat.com> - 1.4-2
- Run libtoolize
- Correct spec file
- Really use OpenMP

* Fri Jan 1 2009 Ulrich Drepper <drepper at redhat.com> - 1.4-1
- Update to 1.4.
  - remove nrutil requirement
- update optimization patch, drop bug fix patch

* Tue Aug 19 2008 Ulrich Drepper <drepper at redhat.com> - 1.3-1
- Initial package.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pfscalibration/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	9 Jan 2009 05:31:41 -0000	1.1
+++ .cvsignore	9 Jan 2009 06:26:24 -0000	1.2
@@ -0,0 +1 @@
+pfscalibration-1.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pfscalibration/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	9 Jan 2009 05:31:41 -0000	1.1
+++ sources	9 Jan 2009 06:26:24 -0000	1.2
@@ -0,0 +1 @@
+1844a6e3f03f585dbc8bcc3eaacf66b9  pfscalibration-1.4.tar.gz



From drepper at fedoraproject.org  Fri Jan  9 06:29:17 2009
From: drepper at fedoraproject.org (Ulrich Drepper)
Date: Fri,  9 Jan 2009 06:29:17 +0000 (UTC)
Subject: rpms/pfstmo/devel import.log, NONE, 1.1 pfstmo-1.3.2-zd.patch, NONE,
	1.1 pfstmo-CXXFLAGS.patch, NONE, 1.1 pfstmo.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090109062917.715807011C@cvs1.fedora.phx.redhat.com>

Author: drepper

Update of /cvs/pkgs/rpms/pfstmo/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20194/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log pfstmo-1.3.2-zd.patch pfstmo-CXXFLAGS.patch 
	pfstmo.spec 
Log Message:
pfstmo for F11.



--- NEW FILE import.log ---
pfstmo-1_3_2-3_fc10:HEAD:pfstmo-1.3.2-3.fc10.src.rpm:1231482495

pfstmo-1.3.2-zd.patch:

--- NEW FILE pfstmo-1.3.2-zd.patch ---
diff -up pfstmo-1.3.2/src/mantiuk08/cqp/mg_pdip.c.zd pfstmo-1.3.2/src/mantiuk08/cqp/mg_pdip.c
--- pfstmo-1.3.2/src/mantiuk08/cqp/mg_pdip.c.zd	2009-01-06 11:17:15.000000000 -0800
+++ pfstmo-1.3.2/src/mantiuk08/cqp/mg_pdip.c	2009-01-06 11:19:04.000000000 -0800
@@ -307,7 +307,7 @@ mg_pdip_iterate (void *vstate, const gsl
 		printf("\n *** Predictor Step ***\n");
 		printf("\nthe right-hand side of the KKT-system:\n");
 		for(i=0; i<state->r->size; i++)
-			printf("r[%d]=%f ",i,gsl_vector_get(state->r,i));
+			printf("r[%zd]=%f ",i,gsl_vector_get(state->r,i));
 		printf("\n");	
 		printf("\nsolution (delta_x,-delta_y,-delta_z):\n");
 		for(i=0; i<delta->size; i++)
@@ -369,7 +369,7 @@ mg_pdip_iterate (void *vstate, const gsl
 		printf("\n *** Corrector Step ***\n");
 		printf("the right-hand side:\n");
 		for(i=0; i<state->r->size; i++)
-			printf("r[%d]=%f ",i,gsl_vector_get(state->r,i));
+			printf("r[%zd]=%f ",i,gsl_vector_get(state->r,i));
 		printf("\n");
 		for(i=0; i<delta->size; i++)
 			printf("%6.3f ",gsl_vector_get(delta,i));
@@ -671,24 +671,24 @@ print_vectors(const gsl_vector * x, cons
 {
 	size_t i;
 	
-	printf("\nx[1 x %d]:\n",x->size);
+	printf("\nx[1 x %zd]:\n",x->size);
 	for(i=0; i<x->size; i++)
 		printf("%f  ",gsl_vector_get(x,i));
 	printf("\n");
 
         if( y != NULL ) {
-          printf("\ny[1 x %d]: (LM zu Ax=b)\n",y->size);
+          printf("\ny[1 x %zd]: (LM zu Ax=b)\n",y->size);
           for(i=0; i<y->size; i++)
             printf("%f  ",gsl_vector_get(y,i));
           printf("\n");
         }
 	
-	printf("\nz[1 x %d]: (LM zu Cx>=d)\n",z->size);
+	printf("\nz[1 x %zd]: (LM zu Cx>=d)\n",z->size);
 	for(i=0; i<z->size; i++)
 		printf("%f  ",gsl_vector_get(z,i));		
 	printf("\n");
 	
-	printf("\ns[1 x %d]: (Slack zu Cx>=d)\n",s->size);
+	printf("\ns[1 x %zd]: (Slack zu Cx>=d)\n",s->size);
 	for(i=0; i<s->size; i++)
 		printf("%f  ",gsl_vector_get(s,i));
 	printf("\n");	
diff -up pfstmo-1.3.2/src/mantiuk08/display_adaptive_tmo.cpp.zd pfstmo-1.3.2/src/mantiuk08/display_adaptive_tmo.cpp
--- pfstmo-1.3.2/src/mantiuk08/display_adaptive_tmo.cpp.zd	2009-01-06 11:20:13.000000000 -0800
+++ pfstmo-1.3.2/src/mantiuk08/display_adaptive_tmo.cpp	2009-01-06 11:20:41.000000000 -0800
@@ -537,7 +537,7 @@ int solve( gsl_matrix *Q, gsl_vector *q,
     status = gsl_cqpminimizer_iterate(s);
     status = gsl_cqpminimizer_test_convergence(s, 1e-10, 1e-10);
 		  
-    if( verbose ) fprintf( stderr, "%4d   %14.8f  %13.6e  %13.6e\n", iter, gsl_cqpminimizer_f(s), gsl_cqpminimizer_gap(s), gsl_cqpminimizer_residuals_norm(s));
+    if( verbose ) fprintf( stderr, "%4zd   %14.8f  %13.6e  %13.6e\n", iter, gsl_cqpminimizer_f(s), gsl_cqpminimizer_gap(s), gsl_cqpminimizer_residuals_norm(s));
 		  
     if(status == GSL_SUCCESS)
     {
diff -up pfstmo-1.3.2/src/mantiuk08/pfstmo_mantiuk08.cpp.zd pfstmo-1.3.2/src/mantiuk08/pfstmo_mantiuk08.cpp
--- pfstmo-1.3.2/src/mantiuk08/pfstmo_mantiuk08.cpp.zd	2009-01-06 11:21:03.000000000 -0800
+++ pfstmo-1.3.2/src/mantiuk08/pfstmo_mantiuk08.cpp	2009-01-06 11:21:43.000000000 -0800
@@ -220,7 +220,7 @@ void tmo_mantiuk08(int argc, char * argv
 
     const char *file_name = frame->getTags()->getString( "FILE_NAME" );
     if( file_name == NULL )
-      sprintf( frame_name, "frame #%d", frame_no );
+      sprintf( frame_name, "frame #%zd", frame_no );
     else {
       int len = strlen( file_name );
       if( len > FRAME_NAME_MAX ) // In case file name is too long
@@ -281,7 +281,7 @@ void tmo_mantiuk08(int argc, char * argv
       if( temporal_filter == 1 ) {
         // First pass of the temporal filter - store tone-curves, do not tone-map
         
-        fprintf( tp_FH, "%d,%d\n", frame_no, tc.size );          
+        fprintf( tp_FH, "%zd,%zd\n", frame_no, tc.size );          
         for( int i=0; i < tc.size; i++ )
           fprintf( tp_FH, "%g,%g\n", tc.x_i[i], tc.y_i[i] );
 
@@ -297,7 +297,7 @@ void tmo_mantiuk08(int argc, char * argv
 
         if( tc_FH != NULL ) {
           for( int i=0; i < tc.size; i++ )
-            fprintf( tc_FH, "%d,%g,%g,%g\n", frame_no, tc.x_i[i], tc.y_i[i], df->inv_display( (float)pow( 10, tc.y_i[i] ) ) );
+            fprintf( tc_FH, "%zd,%g,%g,%g\n", frame_no, tc.x_i[i], tc.y_i[i], df->inv_display( (float)pow( 10, tc.y_i[i] ) ) );
         }      
     
 //    int res;

pfstmo-CXXFLAGS.patch:

--- NEW FILE pfstmo-CXXFLAGS.patch ---
diff -up pfstmo-1.3.2/configure.ac-save pfstmo-1.3.2/configure.ac
--- pfstmo-1.3.2/configure.ac-save	2009-01-07 23:08:20.000000000 -0800
+++ pfstmo-1.3.2/configure.ac	2009-01-07 23:08:40.000000000 -0800
@@ -36,7 +36,7 @@ AC_ARG_ENABLE(debug,
 		     AC_DEFINE([DEBUG])
 		  fi],
                   [enable_debug="no"
-                     temp_CXXFLAGS=`echo $CXXFLAGS | sed "s/-O./ /; s/-g//"`
+                     temp_CXXFLAGS=`echo $CXXFLAGS | sed "s/-O./ /"`
    	             CXXFLAGS="-O3 $temp_CXXFLAGS"
                      AC_DEFINE(NDEBUG, 1, [Disable assertion checks])
 


--- NEW FILE pfstmo.spec ---
Name:		pfstmo
Version:	1.3.2
Release:	3%{?dist}
Summary:	PFS tone mapping operators

Group:		Applications/Multimedia
License:	GPLv2+
URL:		http://pfstools.sourceforge.net/
Source0:	http://downloads.sourceforge.net/pfstools/%{name}-%{version}.tar.gz
Patch1:		pfstmo-1.3.2-zd.patch
Patch2:		pfstmo-CXXFLAGS.patch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	libtool
BuildRequires:	pfstools-devel
BuildRequires:	fftw-devel
BuildRequires:	gsl-devel

%description
The pfstmo package contains the implementation of state-of-the-art tone
mapping operators. The motivation here is to provide an implementation of
tone mapping operators suitable for convenient processing of both static
images and animations. 

%prep
%setup -q

%patch1 -p1 -b .zd
%patch2 -p1 -b .cxxflags

autoreconf

%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 ChangeLog README COPYING TODO NEWS AUTHORS
%{_bindir}/pfstmo_reinhard05
%{_bindir}/pfstmo_pattanaik00
%{_bindir}/pfstmo_mantiuk06
%{_bindir}/pfstmo_fattal02
%{_bindir}/pfstmo_drago03
%{_bindir}/pfstmo_reinhard02
%{_bindir}/pfstmo_durand02
%{_bindir}/pfstmo_mantiuk08
%{_mandir}/man1/pfstmo_reinhard05.1.gz
%{_mandir}/man1/pfstmo_pattanaik00.1.gz
%{_mandir}/man1/pfstmo_mantiuk06.1.gz
%{_mandir}/man1/pfstmo_fattal02.1.gz
%{_mandir}/man1/pfstmo_drago03.1.gz
%{_mandir}/man1/pfstmo_reinhard02.1.gz
%{_mandir}/man1/pfstmo_durand02.1.gz
%{_mandir}/man1/pfstmo_mantiuk08.1.gz


%changelog
* Wed Jan 7 2009 Ulrich Drepper <drepper at redhat.com> - 1.3.2-3
- Make sure debug information is generated

* Tue Jan 6 2009 Ulrich Drepper <drepper at redhat.com> - 1.3.2-2
- Add INSTALL to make install call

* Tue Jan 6 2009 Ulrich Drepper <drepper at redhat.com> - 1.3.2-1
- New upstream release 1.3.2
- Fix some packaging issues
- Minor bug fix patch added

* Tue Aug 19 2008 Ulrich Drepper <drepper at redhat.com> - 1.3-1
- Initial package.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pfstmo/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	9 Jan 2009 05:43:39 -0000	1.1
+++ .cvsignore	9 Jan 2009 06:28:45 -0000	1.2
@@ -0,0 +1 @@
+pfstmo-1.3.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pfstmo/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	9 Jan 2009 05:43:39 -0000	1.1
+++ sources	9 Jan 2009 06:28:47 -0000	1.2
@@ -0,0 +1 @@
+cd51b176ba228051304a8676861b6d0c  pfstmo-1.3.2.tar.gz



From drepper at fedoraproject.org  Fri Jan  9 06:31:13 2009
From: drepper at fedoraproject.org (Ulrich Drepper)
Date: Fri,  9 Jan 2009 06:31:13 +0000 (UTC)
Subject: rpms/pfstmo/F-9 import.log, NONE, 1.1 pfstmo-1.3.2-zd.patch, NONE, 
	1.1 pfstmo-CXXFLAGS.patch, NONE, 1.1 pfstmo.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090109063113.5A9C97011C@cvs1.fedora.phx.redhat.com>

Author: drepper

Update of /cvs/pkgs/rpms/pfstmo/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20529/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	import.log pfstmo-1.3.2-zd.patch pfstmo-CXXFLAGS.patch 
	pfstmo.spec 
Log Message:
pfstmo for F9.



--- NEW FILE import.log ---
pfstmo-1_3_2-3_fc10:F-9:pfstmo-1.3.2-3.fc10.src.rpm:1231482605

pfstmo-1.3.2-zd.patch:

--- NEW FILE pfstmo-1.3.2-zd.patch ---
diff -up pfstmo-1.3.2/src/mantiuk08/cqp/mg_pdip.c.zd pfstmo-1.3.2/src/mantiuk08/cqp/mg_pdip.c
--- pfstmo-1.3.2/src/mantiuk08/cqp/mg_pdip.c.zd	2009-01-06 11:17:15.000000000 -0800
+++ pfstmo-1.3.2/src/mantiuk08/cqp/mg_pdip.c	2009-01-06 11:19:04.000000000 -0800
@@ -307,7 +307,7 @@ mg_pdip_iterate (void *vstate, const gsl
 		printf("\n *** Predictor Step ***\n");
 		printf("\nthe right-hand side of the KKT-system:\n");
 		for(i=0; i<state->r->size; i++)
-			printf("r[%d]=%f ",i,gsl_vector_get(state->r,i));
+			printf("r[%zd]=%f ",i,gsl_vector_get(state->r,i));
 		printf("\n");	
 		printf("\nsolution (delta_x,-delta_y,-delta_z):\n");
 		for(i=0; i<delta->size; i++)
@@ -369,7 +369,7 @@ mg_pdip_iterate (void *vstate, const gsl
 		printf("\n *** Corrector Step ***\n");
 		printf("the right-hand side:\n");
 		for(i=0; i<state->r->size; i++)
-			printf("r[%d]=%f ",i,gsl_vector_get(state->r,i));
+			printf("r[%zd]=%f ",i,gsl_vector_get(state->r,i));
 		printf("\n");
 		for(i=0; i<delta->size; i++)
 			printf("%6.3f ",gsl_vector_get(delta,i));
@@ -671,24 +671,24 @@ print_vectors(const gsl_vector * x, cons
 {
 	size_t i;
 	
-	printf("\nx[1 x %d]:\n",x->size);
+	printf("\nx[1 x %zd]:\n",x->size);
 	for(i=0; i<x->size; i++)
 		printf("%f  ",gsl_vector_get(x,i));
 	printf("\n");
 
         if( y != NULL ) {
-          printf("\ny[1 x %d]: (LM zu Ax=b)\n",y->size);
+          printf("\ny[1 x %zd]: (LM zu Ax=b)\n",y->size);
           for(i=0; i<y->size; i++)
             printf("%f  ",gsl_vector_get(y,i));
           printf("\n");
         }
 	
-	printf("\nz[1 x %d]: (LM zu Cx>=d)\n",z->size);
+	printf("\nz[1 x %zd]: (LM zu Cx>=d)\n",z->size);
 	for(i=0; i<z->size; i++)
 		printf("%f  ",gsl_vector_get(z,i));		
 	printf("\n");
 	
-	printf("\ns[1 x %d]: (Slack zu Cx>=d)\n",s->size);
+	printf("\ns[1 x %zd]: (Slack zu Cx>=d)\n",s->size);
 	for(i=0; i<s->size; i++)
 		printf("%f  ",gsl_vector_get(s,i));
 	printf("\n");	
diff -up pfstmo-1.3.2/src/mantiuk08/display_adaptive_tmo.cpp.zd pfstmo-1.3.2/src/mantiuk08/display_adaptive_tmo.cpp
--- pfstmo-1.3.2/src/mantiuk08/display_adaptive_tmo.cpp.zd	2009-01-06 11:20:13.000000000 -0800
+++ pfstmo-1.3.2/src/mantiuk08/display_adaptive_tmo.cpp	2009-01-06 11:20:41.000000000 -0800
@@ -537,7 +537,7 @@ int solve( gsl_matrix *Q, gsl_vector *q,
     status = gsl_cqpminimizer_iterate(s);
     status = gsl_cqpminimizer_test_convergence(s, 1e-10, 1e-10);
 		  
-    if( verbose ) fprintf( stderr, "%4d   %14.8f  %13.6e  %13.6e\n", iter, gsl_cqpminimizer_f(s), gsl_cqpminimizer_gap(s), gsl_cqpminimizer_residuals_norm(s));
+    if( verbose ) fprintf( stderr, "%4zd   %14.8f  %13.6e  %13.6e\n", iter, gsl_cqpminimizer_f(s), gsl_cqpminimizer_gap(s), gsl_cqpminimizer_residuals_norm(s));
 		  
     if(status == GSL_SUCCESS)
     {
diff -up pfstmo-1.3.2/src/mantiuk08/pfstmo_mantiuk08.cpp.zd pfstmo-1.3.2/src/mantiuk08/pfstmo_mantiuk08.cpp
--- pfstmo-1.3.2/src/mantiuk08/pfstmo_mantiuk08.cpp.zd	2009-01-06 11:21:03.000000000 -0800
+++ pfstmo-1.3.2/src/mantiuk08/pfstmo_mantiuk08.cpp	2009-01-06 11:21:43.000000000 -0800
@@ -220,7 +220,7 @@ void tmo_mantiuk08(int argc, char * argv
 
     const char *file_name = frame->getTags()->getString( "FILE_NAME" );
     if( file_name == NULL )
-      sprintf( frame_name, "frame #%d", frame_no );
+      sprintf( frame_name, "frame #%zd", frame_no );
     else {
       int len = strlen( file_name );
       if( len > FRAME_NAME_MAX ) // In case file name is too long
@@ -281,7 +281,7 @@ void tmo_mantiuk08(int argc, char * argv
       if( temporal_filter == 1 ) {
         // First pass of the temporal filter - store tone-curves, do not tone-map
         
-        fprintf( tp_FH, "%d,%d\n", frame_no, tc.size );          
+        fprintf( tp_FH, "%zd,%zd\n", frame_no, tc.size );          
         for( int i=0; i < tc.size; i++ )
           fprintf( tp_FH, "%g,%g\n", tc.x_i[i], tc.y_i[i] );
 
@@ -297,7 +297,7 @@ void tmo_mantiuk08(int argc, char * argv
 
         if( tc_FH != NULL ) {
           for( int i=0; i < tc.size; i++ )
-            fprintf( tc_FH, "%d,%g,%g,%g\n", frame_no, tc.x_i[i], tc.y_i[i], df->inv_display( (float)pow( 10, tc.y_i[i] ) ) );
+            fprintf( tc_FH, "%zd,%g,%g,%g\n", frame_no, tc.x_i[i], tc.y_i[i], df->inv_display( (float)pow( 10, tc.y_i[i] ) ) );
         }      
     
 //    int res;

pfstmo-CXXFLAGS.patch:

--- NEW FILE pfstmo-CXXFLAGS.patch ---
diff -up pfstmo-1.3.2/configure.ac-save pfstmo-1.3.2/configure.ac
--- pfstmo-1.3.2/configure.ac-save	2009-01-07 23:08:20.000000000 -0800
+++ pfstmo-1.3.2/configure.ac	2009-01-07 23:08:40.000000000 -0800
@@ -36,7 +36,7 @@ AC_ARG_ENABLE(debug,
 		     AC_DEFINE([DEBUG])
 		  fi],
                   [enable_debug="no"
-                     temp_CXXFLAGS=`echo $CXXFLAGS | sed "s/-O./ /; s/-g//"`
+                     temp_CXXFLAGS=`echo $CXXFLAGS | sed "s/-O./ /"`
    	             CXXFLAGS="-O3 $temp_CXXFLAGS"
                      AC_DEFINE(NDEBUG, 1, [Disable assertion checks])
 


--- NEW FILE pfstmo.spec ---
Name:		pfstmo
Version:	1.3.2
Release:	3%{?dist}
Summary:	PFS tone mapping operators

Group:		Applications/Multimedia
License:	GPLv2+
URL:		http://pfstools.sourceforge.net/
Source0:	http://downloads.sourceforge.net/pfstools/%{name}-%{version}.tar.gz
Patch1:		pfstmo-1.3.2-zd.patch
Patch2:		pfstmo-CXXFLAGS.patch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	libtool
BuildRequires:	pfstools-devel
BuildRequires:	fftw-devel
BuildRequires:	gsl-devel

%description
The pfstmo package contains the implementation of state-of-the-art tone
mapping operators. The motivation here is to provide an implementation of
tone mapping operators suitable for convenient processing of both static
images and animations. 

%prep
%setup -q

%patch1 -p1 -b .zd
%patch2 -p1 -b .cxxflags

autoreconf

%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 ChangeLog README COPYING TODO NEWS AUTHORS
%{_bindir}/pfstmo_reinhard05
%{_bindir}/pfstmo_pattanaik00
%{_bindir}/pfstmo_mantiuk06
%{_bindir}/pfstmo_fattal02
%{_bindir}/pfstmo_drago03
%{_bindir}/pfstmo_reinhard02
%{_bindir}/pfstmo_durand02
%{_bindir}/pfstmo_mantiuk08
%{_mandir}/man1/pfstmo_reinhard05.1.gz
%{_mandir}/man1/pfstmo_pattanaik00.1.gz
%{_mandir}/man1/pfstmo_mantiuk06.1.gz
%{_mandir}/man1/pfstmo_fattal02.1.gz
%{_mandir}/man1/pfstmo_drago03.1.gz
%{_mandir}/man1/pfstmo_reinhard02.1.gz
%{_mandir}/man1/pfstmo_durand02.1.gz
%{_mandir}/man1/pfstmo_mantiuk08.1.gz


%changelog
* Wed Jan 7 2009 Ulrich Drepper <drepper at redhat.com> - 1.3.2-3
- Make sure debug information is generated

* Tue Jan 6 2009 Ulrich Drepper <drepper at redhat.com> - 1.3.2-2
- Add INSTALL to make install call

* Tue Jan 6 2009 Ulrich Drepper <drepper at redhat.com> - 1.3.2-1
- New upstream release 1.3.2
- Fix some packaging issues
- Minor bug fix patch added

* Tue Aug 19 2008 Ulrich Drepper <drepper at redhat.com> - 1.3-1
- Initial package.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pfstmo/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	9 Jan 2009 05:43:39 -0000	1.1
+++ .cvsignore	9 Jan 2009 06:30:42 -0000	1.2
@@ -0,0 +1 @@
+pfstmo-1.3.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pfstmo/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	9 Jan 2009 05:43:39 -0000	1.1
+++ sources	9 Jan 2009 06:30:42 -0000	1.2
@@ -0,0 +1 @@
+cd51b176ba228051304a8676861b6d0c  pfstmo-1.3.2.tar.gz



From drepper at fedoraproject.org  Fri Jan  9 06:32:50 2009
From: drepper at fedoraproject.org (Ulrich Drepper)
Date: Fri,  9 Jan 2009 06:32:50 +0000 (UTC)
Subject: rpms/pfstmo/F-10 import.log, NONE, 1.1 pfstmo-1.3.2-zd.patch, NONE, 
	1.1 pfstmo-CXXFLAGS.patch, NONE, 1.1 pfstmo.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090109063250.3CDEE7011C@cvs1.fedora.phx.redhat.com>

Author: drepper

Update of /cvs/pkgs/rpms/pfstmo/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21024/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	import.log pfstmo-1.3.2-zd.patch pfstmo-CXXFLAGS.patch 
	pfstmo.spec 
Log Message:
pfstmo for F10.



--- NEW FILE import.log ---
pfstmo-1_3_2-3_fc10:F-10:pfstmo-1.3.2-3.fc10.src.rpm:1231482709

pfstmo-1.3.2-zd.patch:

--- NEW FILE pfstmo-1.3.2-zd.patch ---
diff -up pfstmo-1.3.2/src/mantiuk08/cqp/mg_pdip.c.zd pfstmo-1.3.2/src/mantiuk08/cqp/mg_pdip.c
--- pfstmo-1.3.2/src/mantiuk08/cqp/mg_pdip.c.zd	2009-01-06 11:17:15.000000000 -0800
+++ pfstmo-1.3.2/src/mantiuk08/cqp/mg_pdip.c	2009-01-06 11:19:04.000000000 -0800
@@ -307,7 +307,7 @@ mg_pdip_iterate (void *vstate, const gsl
 		printf("\n *** Predictor Step ***\n");
 		printf("\nthe right-hand side of the KKT-system:\n");
 		for(i=0; i<state->r->size; i++)
-			printf("r[%d]=%f ",i,gsl_vector_get(state->r,i));
+			printf("r[%zd]=%f ",i,gsl_vector_get(state->r,i));
 		printf("\n");	
 		printf("\nsolution (delta_x,-delta_y,-delta_z):\n");
 		for(i=0; i<delta->size; i++)
@@ -369,7 +369,7 @@ mg_pdip_iterate (void *vstate, const gsl
 		printf("\n *** Corrector Step ***\n");
 		printf("the right-hand side:\n");
 		for(i=0; i<state->r->size; i++)
-			printf("r[%d]=%f ",i,gsl_vector_get(state->r,i));
+			printf("r[%zd]=%f ",i,gsl_vector_get(state->r,i));
 		printf("\n");
 		for(i=0; i<delta->size; i++)
 			printf("%6.3f ",gsl_vector_get(delta,i));
@@ -671,24 +671,24 @@ print_vectors(const gsl_vector * x, cons
 {
 	size_t i;
 	
-	printf("\nx[1 x %d]:\n",x->size);
+	printf("\nx[1 x %zd]:\n",x->size);
 	for(i=0; i<x->size; i++)
 		printf("%f  ",gsl_vector_get(x,i));
 	printf("\n");
 
         if( y != NULL ) {
-          printf("\ny[1 x %d]: (LM zu Ax=b)\n",y->size);
+          printf("\ny[1 x %zd]: (LM zu Ax=b)\n",y->size);
           for(i=0; i<y->size; i++)
             printf("%f  ",gsl_vector_get(y,i));
           printf("\n");
         }
 	
-	printf("\nz[1 x %d]: (LM zu Cx>=d)\n",z->size);
+	printf("\nz[1 x %zd]: (LM zu Cx>=d)\n",z->size);
 	for(i=0; i<z->size; i++)
 		printf("%f  ",gsl_vector_get(z,i));		
 	printf("\n");
 	
-	printf("\ns[1 x %d]: (Slack zu Cx>=d)\n",s->size);
+	printf("\ns[1 x %zd]: (Slack zu Cx>=d)\n",s->size);
 	for(i=0; i<s->size; i++)
 		printf("%f  ",gsl_vector_get(s,i));
 	printf("\n");	
diff -up pfstmo-1.3.2/src/mantiuk08/display_adaptive_tmo.cpp.zd pfstmo-1.3.2/src/mantiuk08/display_adaptive_tmo.cpp
--- pfstmo-1.3.2/src/mantiuk08/display_adaptive_tmo.cpp.zd	2009-01-06 11:20:13.000000000 -0800
+++ pfstmo-1.3.2/src/mantiuk08/display_adaptive_tmo.cpp	2009-01-06 11:20:41.000000000 -0800
@@ -537,7 +537,7 @@ int solve( gsl_matrix *Q, gsl_vector *q,
     status = gsl_cqpminimizer_iterate(s);
     status = gsl_cqpminimizer_test_convergence(s, 1e-10, 1e-10);
 		  
-    if( verbose ) fprintf( stderr, "%4d   %14.8f  %13.6e  %13.6e\n", iter, gsl_cqpminimizer_f(s), gsl_cqpminimizer_gap(s), gsl_cqpminimizer_residuals_norm(s));
+    if( verbose ) fprintf( stderr, "%4zd   %14.8f  %13.6e  %13.6e\n", iter, gsl_cqpminimizer_f(s), gsl_cqpminimizer_gap(s), gsl_cqpminimizer_residuals_norm(s));
 		  
     if(status == GSL_SUCCESS)
     {
diff -up pfstmo-1.3.2/src/mantiuk08/pfstmo_mantiuk08.cpp.zd pfstmo-1.3.2/src/mantiuk08/pfstmo_mantiuk08.cpp
--- pfstmo-1.3.2/src/mantiuk08/pfstmo_mantiuk08.cpp.zd	2009-01-06 11:21:03.000000000 -0800
+++ pfstmo-1.3.2/src/mantiuk08/pfstmo_mantiuk08.cpp	2009-01-06 11:21:43.000000000 -0800
@@ -220,7 +220,7 @@ void tmo_mantiuk08(int argc, char * argv
 
     const char *file_name = frame->getTags()->getString( "FILE_NAME" );
     if( file_name == NULL )
-      sprintf( frame_name, "frame #%d", frame_no );
+      sprintf( frame_name, "frame #%zd", frame_no );
     else {
       int len = strlen( file_name );
       if( len > FRAME_NAME_MAX ) // In case file name is too long
@@ -281,7 +281,7 @@ void tmo_mantiuk08(int argc, char * argv
       if( temporal_filter == 1 ) {
         // First pass of the temporal filter - store tone-curves, do not tone-map
         
-        fprintf( tp_FH, "%d,%d\n", frame_no, tc.size );          
+        fprintf( tp_FH, "%zd,%zd\n", frame_no, tc.size );          
         for( int i=0; i < tc.size; i++ )
           fprintf( tp_FH, "%g,%g\n", tc.x_i[i], tc.y_i[i] );
 
@@ -297,7 +297,7 @@ void tmo_mantiuk08(int argc, char * argv
 
         if( tc_FH != NULL ) {
           for( int i=0; i < tc.size; i++ )
-            fprintf( tc_FH, "%d,%g,%g,%g\n", frame_no, tc.x_i[i], tc.y_i[i], df->inv_display( (float)pow( 10, tc.y_i[i] ) ) );
+            fprintf( tc_FH, "%zd,%g,%g,%g\n", frame_no, tc.x_i[i], tc.y_i[i], df->inv_display( (float)pow( 10, tc.y_i[i] ) ) );
         }      
     
 //    int res;

pfstmo-CXXFLAGS.patch:

--- NEW FILE pfstmo-CXXFLAGS.patch ---
diff -up pfstmo-1.3.2/configure.ac-save pfstmo-1.3.2/configure.ac
--- pfstmo-1.3.2/configure.ac-save	2009-01-07 23:08:20.000000000 -0800
+++ pfstmo-1.3.2/configure.ac	2009-01-07 23:08:40.000000000 -0800
@@ -36,7 +36,7 @@ AC_ARG_ENABLE(debug,
 		     AC_DEFINE([DEBUG])
 		  fi],
                   [enable_debug="no"
-                     temp_CXXFLAGS=`echo $CXXFLAGS | sed "s/-O./ /; s/-g//"`
+                     temp_CXXFLAGS=`echo $CXXFLAGS | sed "s/-O./ /"`
    	             CXXFLAGS="-O3 $temp_CXXFLAGS"
                      AC_DEFINE(NDEBUG, 1, [Disable assertion checks])
 


--- NEW FILE pfstmo.spec ---
Name:		pfstmo
Version:	1.3.2
Release:	3%{?dist}
Summary:	PFS tone mapping operators

Group:		Applications/Multimedia
License:	GPLv2+
URL:		http://pfstools.sourceforge.net/
Source0:	http://downloads.sourceforge.net/pfstools/%{name}-%{version}.tar.gz
Patch1:		pfstmo-1.3.2-zd.patch
Patch2:		pfstmo-CXXFLAGS.patch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	libtool
BuildRequires:	pfstools-devel
BuildRequires:	fftw-devel
BuildRequires:	gsl-devel

%description
The pfstmo package contains the implementation of state-of-the-art tone
mapping operators. The motivation here is to provide an implementation of
tone mapping operators suitable for convenient processing of both static
images and animations. 

%prep
%setup -q

%patch1 -p1 -b .zd
%patch2 -p1 -b .cxxflags

autoreconf

%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 ChangeLog README COPYING TODO NEWS AUTHORS
%{_bindir}/pfstmo_reinhard05
%{_bindir}/pfstmo_pattanaik00
%{_bindir}/pfstmo_mantiuk06
%{_bindir}/pfstmo_fattal02
%{_bindir}/pfstmo_drago03
%{_bindir}/pfstmo_reinhard02
%{_bindir}/pfstmo_durand02
%{_bindir}/pfstmo_mantiuk08
%{_mandir}/man1/pfstmo_reinhard05.1.gz
%{_mandir}/man1/pfstmo_pattanaik00.1.gz
%{_mandir}/man1/pfstmo_mantiuk06.1.gz
%{_mandir}/man1/pfstmo_fattal02.1.gz
%{_mandir}/man1/pfstmo_drago03.1.gz
%{_mandir}/man1/pfstmo_reinhard02.1.gz
%{_mandir}/man1/pfstmo_durand02.1.gz
%{_mandir}/man1/pfstmo_mantiuk08.1.gz


%changelog
* Wed Jan 7 2009 Ulrich Drepper <drepper at redhat.com> - 1.3.2-3
- Make sure debug information is generated

* Tue Jan 6 2009 Ulrich Drepper <drepper at redhat.com> - 1.3.2-2
- Add INSTALL to make install call

* Tue Jan 6 2009 Ulrich Drepper <drepper at redhat.com> - 1.3.2-1
- New upstream release 1.3.2
- Fix some packaging issues
- Minor bug fix patch added

* Tue Aug 19 2008 Ulrich Drepper <drepper at redhat.com> - 1.3-1
- Initial package.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pfstmo/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	9 Jan 2009 05:43:39 -0000	1.1
+++ .cvsignore	9 Jan 2009 06:32:19 -0000	1.2
@@ -0,0 +1 @@
+pfstmo-1.3.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pfstmo/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	9 Jan 2009 05:43:39 -0000	1.1
+++ sources	9 Jan 2009 06:32:19 -0000	1.2
@@ -0,0 +1 @@
+cd51b176ba228051304a8676861b6d0c  pfstmo-1.3.2.tar.gz



From dp67 at fedoraproject.org  Fri Jan  9 06:40:32 2009
From: dp67 at fedoraproject.org (Randy Berry)
Date: Fri,  9 Jan 2009 06:40:32 +0000 (UTC)
Subject: rpms/cwirc/devel cwirc-makefile-fix.patch, NONE,
	1.1 cwirc-rcfile.patch, NONE, 1.1 cwirc.spec, NONE,
	1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090109064032.CE69E7011C@cvs1.fedora.phx.redhat.com>

Author: dp67

Update of /cvs/pkgs/rpms/cwirc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22154/devel

Modified Files:
	.cvsignore sources 
Added Files:
	cwirc-makefile-fix.patch cwirc-rcfile.patch cwirc.spec 
	import.log 
Log Message:

Added CWIRC package



cwirc-makefile-fix.patch:

--- NEW FILE cwirc-makefile-fix.patch ---
diff -up cwirc-2.0.0/Makefile.orig cwirc-2.0.0/Makefile
--- cwirc-2.0.0/Makefile.orig	2006-05-20 17:28:07.000000000 -0400
+++ cwirc-2.0.0/Makefile	2008-09-28 12:45:27.000000000 -0400
@@ -103,11 +103,11 @@ FRONTEND_OBJS=		frontend.o					\
 
 $(PLUGIN):		$(PLUGIN_OBJS)
 			$(CC) -shared $(LDFLAGS) -o $@ $(PLUGIN_OBJS)
-			$(STRIP) $@
+			# $(STRIP) $@
 
 $(FRONTEND):		$(FRONTEND_OBJS)
 			$(CC) $(LDFLAGS) $(GTK_LDFLAGS) -o $@ $(FRONTEND_OBJS)
-			$(STRIP) $@
+	        	# $(STRIP) $@
 
 plugin.shared.o:	plugin.c					\
 			$(XCHAT_PLUGIN_INCLUDE_PATH)/xchat-plugin.h	\

cwirc-rcfile.patch:

--- NEW FILE cwirc-rcfile.patch ---
diff -up cwirc-2.0.0/rcfile.c.orig cwirc-2.0.0/rcfile.c
--- cwirc-2.0.0/rcfile.c.orig	2004-06-13 17:09:43.000000000 -0400
+++ cwirc-2.0.0/rcfile.c	2008-09-28 02:24:28.000000000 -0400
@@ -26,10 +26,10 @@
 #define DEFAULT_CWINPUT				"mouse"
 #define DEFAULT_CWOUTPUT			"soundcard"
 #define DEFAULT_CWSOUND				"beeps"
-#ifdef LINUX
+/* #ifdef LINUX */
 #define DEFAULT_SNDDEV				"/dev/dsp"
 #define DEFAULT_SERIALDEV			"/dev/ttyS0"
-#endif
+/* #endif */
 #ifdef FREEBSD
 #define DEFAULT_SNDDEV				"/dev/dsp0.0"
 #define DEFAULT_SERIALDEV			"/dev/cuaa0"


--- NEW FILE cwirc.spec ---
Name:       cwirc
Summary:    X-Chat Morse plugin
Version:    2.0.0
Release:    4%{?dist}

URL:        http://myspace.voo.be/pcoupard/cwirc/
Source:     http://myspace.voo.be/pcoupard/cwirc/download/%{name}-%{version}.tar.gz
Patch0:     cwirc-rcfile.patch
Patch1:     cwirc-makefile-fix.patch
License:    GPLv2
Group:      Applications/Internet
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires: gtk2-devel
 
Requires: xchat >= 2.0.2

%description
X-Chat plugin for sending and receiving raw morse code over IRC.

%prep
%setup -q



# Fix the encoding on LISEZMOI (French Manual) to be UTF-8
recode()
{
        iconv -f "$2" -t utf-8 < "$1" > "${1}_"
        touch -r "$1" "${1}_"
        mv -f "${1}_" "$1"
}
for f in `find LISEZMOI`
 do recode $f iso-8859-15
done

%patch0 -p1 -b %{name}-rcfile.patch
%patch1 -p1 -b %{name}-makefile-fix.patch

%build

make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" TARGET_OS=LINUX PLUGIN_INSTALL_DIRECTORY=dummy\
     FRONTEND_INSTALL_DIRECTORY=dummy\
     CWIRC_EXTENSIONS_DIRECTORY=%{_libdir}/cwirc/extensions
     
%install
rm -rf $RPM_BUILD_ROOT
mkdir $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT/%{_libdir}/xchat/plugins
mkdir -p $RPM_BUILD_ROOT/%{_bindir}/
mkdir -p $RPM_BUILD_ROOT/%{_libdir}/cwirc/extensions
cp cwirc.so $RPM_BUILD_ROOT/%{_libdir}/xchat/plugins
cp cwirc_frontend $RPM_BUILD_ROOT/%{_bindir}/

# No need for a .desktop file since it launches from within Xchat

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root)
%{_libdir}/xchat/plugins/cwirc.so
%{_bindir}/cwirc_frontend
%{_libdir}/cwirc/extensions
%doc README LISEZMOI Changelog COPYING schematics/cw_oscillator.jpg schematics/rs232_key_connection.jpg


%changelog
* Sun Sep 28 2008 Randall J. Berry 'Dp67' <randyn3lrx at gmail.com> 2.0.0-4
- Edit spec per review (added release numbers)
- Changed coding of LISEZMOI to UTF-8 while preserving original date
- Add patch to makefile removing strip to generate debug file

* Sun Sep 28 2008 Randall J. Berry 'Dp67' <randyn3lrx at gmail.com> 2.0.0-3
- Edit spec per review
- Changed coding of LISEZMOI to UTF-8
- Further edit to quiet rpmlint
- Patch added to allow {?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" per review

* Tue Sep 23 2008 Randll J. Berry 'Dp67' <randyn3lrx at gmail.com> 2.0.0-2
- Edit spec for Fedora standards
- Check against rpmlint
- rpm build / mock build
- submit for review

* Mon Jan 12 2004 P.P. Coupard <pcoupard at easyconnect.fr> 2.0.0
- First draft of the spec file


--- NEW FILE import.log ---
cwirc-2_0_0-4_fc9:HEAD:cwirc-2.0.0-4.fc9.src.rpm:1231483127


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cwirc/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	9 Jan 2009 05:46:22 -0000	1.1
+++ .cvsignore	9 Jan 2009 06:40:02 -0000	1.2
@@ -0,0 +1 @@
+cwirc-2.0.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cwirc/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	9 Jan 2009 05:46:22 -0000	1.1
+++ sources	9 Jan 2009 06:40:02 -0000	1.2
@@ -0,0 +1 @@
+08930a01c0d94b730e184a79bee7fe0c  cwirc-2.0.0.tar.gz



From drepper at fedoraproject.org  Fri Jan  9 06:45:17 2009
From: drepper at fedoraproject.org (Ulrich Drepper)
Date: Fri,  9 Jan 2009 06:45:17 +0000 (UTC)
Subject: rpms/pfstmo/devel pfstmo.spec,1.1,1.2
Message-ID: <20090109064517.81C6D7011C@cvs1.fedora.phx.redhat.com>

Author: drepper

Update of /cvs/pkgs/rpms/pfstmo/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22385

Modified Files:
	pfstmo.spec 
Log Message:
Run libtoolize.



Index: pfstmo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pfstmo/devel/pfstmo.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pfstmo.spec	9 Jan 2009 06:28:46 -0000	1.1
+++ pfstmo.spec	9 Jan 2009 06:44:47 -0000	1.2
@@ -1,6 +1,6 @@
 Name:		pfstmo
 Version:	1.3.2
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	PFS tone mapping operators
 
 Group:		Applications/Multimedia
@@ -29,6 +29,7 @@
 %patch2 -p1 -b .cxxflags
 
 autoreconf
+libtoolize --automake
 
 %build
 %configure
@@ -67,6 +68,9 @@
 
 
 %changelog
+* Thu jan 8 2009 Ulrich Drepper <drepper at redhat.com> - 1.3.2-4
+- Run libtoolize in spec file
+
 * Wed Jan 7 2009 Ulrich Drepper <drepper at redhat.com> - 1.3.2-3
 - Make sure debug information is generated
 



From drepper at fedoraproject.org  Fri Jan  9 06:46:45 2009
From: drepper at fedoraproject.org (Ulrich Drepper)
Date: Fri,  9 Jan 2009 06:46:45 +0000 (UTC)
Subject: rpms/pfstmo/devel pfstmo.spec,1.2,1.3
Message-ID: <20090109064645.ADED27011C@cvs1.fedora.phx.redhat.com>

Author: drepper

Update of /cvs/pkgs/rpms/pfstmo/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22597

Modified Files:
	pfstmo.spec 
Log Message:
Fix typo.


Index: pfstmo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pfstmo/devel/pfstmo.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- pfstmo.spec	9 Jan 2009 06:44:47 -0000	1.2
+++ pfstmo.spec	9 Jan 2009 06:46:15 -0000	1.3
@@ -68,7 +68,7 @@
 
 
 %changelog
-* Thu jan 8 2009 Ulrich Drepper <drepper at redhat.com> - 1.3.2-4
+* Thu Jan 8 2009 Ulrich Drepper <drepper at redhat.com> - 1.3.2-4
 - Run libtoolize in spec file
 
 * Wed Jan 7 2009 Ulrich Drepper <drepper at redhat.com> - 1.3.2-3



From drepper at fedoraproject.org  Fri Jan  9 06:54:07 2009
From: drepper at fedoraproject.org (Ulrich Drepper)
Date: Fri,  9 Jan 2009 06:54:07 +0000 (UTC)
Subject: rpms/pfstmo/F-9 pfstmo.spec,1.1,1.2
Message-ID: <20090109065407.338A87011C@cvs1.fedora.phx.redhat.com>

Author: drepper

Update of /cvs/pkgs/rpms/pfstmo/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23204

Modified Files:
	pfstmo.spec 
Log Message:
Run libtoolize.



Index: pfstmo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pfstmo/F-9/pfstmo.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pfstmo.spec	9 Jan 2009 06:30:42 -0000	1.1
+++ pfstmo.spec	9 Jan 2009 06:53:36 -0000	1.2
@@ -1,6 +1,6 @@
 Name:		pfstmo
 Version:	1.3.2
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	PFS tone mapping operators
 
 Group:		Applications/Multimedia
@@ -29,6 +29,7 @@
 %patch2 -p1 -b .cxxflags
 
 autoreconf
+libtoolize --automake
 
 %build
 %configure
@@ -67,6 +68,9 @@
 
 
 %changelog
+* Thu Jan 8 2009 Ulrich Drepper <drepper at redhat.com> - 1.3.2-4
+- Run libtoolize in spec file
+
 * Wed Jan 7 2009 Ulrich Drepper <drepper at redhat.com> - 1.3.2-3
 - Make sure debug information is generated
 



From drepper at fedoraproject.org  Fri Jan  9 06:55:02 2009
From: drepper at fedoraproject.org (Ulrich Drepper)
Date: Fri,  9 Jan 2009 06:55:02 +0000 (UTC)
Subject: rpms/pfstmo/F-10 pfstmo.spec,1.1,1.2
Message-ID: <20090109065502.91A7B7011C@cvs1.fedora.phx.redhat.com>

Author: drepper

Update of /cvs/pkgs/rpms/pfstmo/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23253

Modified Files:
	pfstmo.spec 
Log Message:
Run libtoolize.



Index: pfstmo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pfstmo/F-10/pfstmo.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pfstmo.spec	9 Jan 2009 06:32:19 -0000	1.1
+++ pfstmo.spec	9 Jan 2009 06:54:32 -0000	1.2
@@ -1,6 +1,6 @@
 Name:		pfstmo
 Version:	1.3.2
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	PFS tone mapping operators
 
 Group:		Applications/Multimedia
@@ -29,6 +29,7 @@
 %patch2 -p1 -b .cxxflags
 
 autoreconf
+libtoolize --automake
 
 %build
 %configure
@@ -67,6 +68,9 @@
 
 
 %changelog
+* Thu Jan 8 2009 Ulrich Drepper <drepper at redhat.com> - 1.3.2-4
+- Run libtoolize in spec file
+
 * Wed Jan 7 2009 Ulrich Drepper <drepper at redhat.com> - 1.3.2-3
 - Make sure debug information is generated
 



From trasher at fedoraproject.org  Fri Jan  9 06:56:28 2009
From: trasher at fedoraproject.org (Johan Cwiklinski)
Date: Fri,  9 Jan 2009 06:56:28 +0000 (UTC)
Subject: rpms/eric/F-10 eric4-4.2.5-shebang.patch, NONE, 1.1 .cvsignore, 1.13,
	1.14 eric.spec, 1.34, 1.35 sources, 1.16,
	1.17 eric4-4.1.0-shebang.patch, 1.1, NONE
Message-ID: <20090109065628.054A27011C@cvs1.fedora.phx.redhat.com>

Author: trasher

Update of /cvs/extras/rpms/eric/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23305

Modified Files:
	.cvsignore eric.spec sources 
Added Files:
	eric4-4.2.5-shebang.patch 
Removed Files:
	eric4-4.1.0-shebang.patch 
Log Message:
New upstream release


eric4-4.2.5-shebang.patch:

--- NEW FILE eric4-4.2.5-shebang.patch ---
diff -up eric4-4.2.5/eric/__init__.py.patch eric4-4.2.5/eric/__init__.py
--- eric4-4.2.5/eric/__init__.py.patch	2009-01-08 18:11:24.000000000 +0100
+++ eric4-4.2.5/eric/__init__.py	2009-01-08 18:11:30.000000000 +0100
@@ -1,3 +1,4 @@
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
 # Copyright (c) 2003 - 2009 Detlev Offenbach <detlev at die-offenbachs.de>
diff -up eric4-4.2.5/eric/patch_modpython.py.patch eric4-4.2.5/eric/patch_modpython.py
--- eric4-4.2.5/eric/patch_modpython.py.patch	2009-01-08 18:11:05.000000000 +0100
+++ eric4-4.2.5/eric/patch_modpython.py	2009-01-08 18:11:13.000000000 +0100
@@ -1,3 +1,4 @@
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
 # Copyright (c) 2003-2009 Detlev Offenbach <detlev at die-offenbachs.de>
diff -up eric4-4.2.5/eric/uninstall.py.patch eric4-4.2.5/eric/uninstall.py
--- eric4-4.2.5/eric/uninstall.py.patch	2009-01-08 18:10:38.000000000 +0100
+++ eric4-4.2.5/eric/uninstall.py	2009-01-08 18:10:51.000000000 +0100
@@ -1,3 +1,4 @@
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
 # Copyright (c) 2002-2009 Detlev Offenbach <detlev at die-offenbachs.de>


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/eric/F-10/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	8 Oct 2008 00:56:51 -0000	1.13
+++ .cvsignore	9 Jan 2009 06:55:57 -0000	1.14
@@ -1,7 +1,7 @@
-eric4-4.2.2a.tar.gz
-eric4-i18n-cs-4.2.2a.tar.gz
-eric4-i18n-de-4.2.2a.tar.gz
-eric4-i18n-es-4.2.2a.tar.gz
-eric4-i18n-fr-4.2.2a.tar.gz
-eric4-i18n-ru-4.2.2a.tar.gz
-eric4-i18n-tr-4.2.2a.tar.gz
+eric4-4.2.5.tar.gz
+eric4-i18n-cs-4.2.5.tar.gz
+eric4-i18n-de-4.2.5.tar.gz
+eric4-i18n-es-4.2.5.tar.gz
+eric4-i18n-fr-4.2.5.tar.gz
+eric4-i18n-ru-4.2.5.tar.gz
+eric4-i18n-tr-4.2.5.tar.gz


Index: eric.spec
===================================================================
RCS file: /cvs/extras/rpms/eric/F-10/eric.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- eric.spec	9 Dec 2008 21:57:33 -0000	1.34
+++ eric.spec	9 Jan 2009 06:55:57 -0000	1.35
@@ -7,12 +7,12 @@
 
 Name:    eric
 Summary: Python IDE
-Version: 4.2.4a
+Version: 4.2.5
 Release: 1%{?dist}
 
 License: GPL+
 Group:   Development/Tools
-URL:     http://www.die-offenbachs.de/eric/index.html
+URL:     http://eric-ide.python-projects.org
 Source:  http://downloads.sourceforge.net/sourceforge/eric-ide/%{name}4-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -24,7 +24,7 @@
 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
+Patch1:    eric4-4.2.5-shebang.patch
 
 Provides: eric4 = %{version}-%{release}
 
@@ -147,6 +147,9 @@
 
 
 %changelog
+* Thu Jan 8 2009 Johan Cwiklinski <johan AT x-tnd DOT be> 4.2.5-1
+* 4.2.5
+
 * Wed Dec 9 2008 Johan Cwiklinski <johan AT x-tnd DOT be> 4.2.4a-1
 - 4.2.4a
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/eric/F-10/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources	9 Dec 2008 21:57:33 -0000	1.16
+++ sources	9 Jan 2009 06:55:57 -0000	1.17
@@ -1,7 +1,7 @@
-67cbe7407783066be989abd01c8f195b  eric4-4.2.4a.tar.gz
-ca59f61018536f6031ba2835664803d0  eric4-i18n-cs-4.2.4a.tar.gz
-c3fc58822175739897b4d5ab0563c45c  eric4-i18n-de-4.2.4a.tar.gz
-70c8d33e1b76167ee45f5f46bb7a322a  eric4-i18n-es-4.2.4a.tar.gz
-541b3eb38c9ebdd7b3d64f8e08b6fa74  eric4-i18n-fr-4.2.4a.tar.gz
-510ebe302d13f243766f0bf474219751  eric4-i18n-ru-4.2.4a.tar.gz
-ef73a494480e5b44aaa8ab8bb844070e  eric4-i18n-tr-4.2.4a.tar.gz
+195e5d4b29977c0c36d808cd77bc40c9  eric4-4.2.5.tar.gz
+71005adf2e9d339ad50998a420c61c4f  eric4-i18n-cs-4.2.5.tar.gz
+ebdef75261d208ae7e2d0b22ebed33e8  eric4-i18n-de-4.2.5.tar.gz
+4bacb41caac1f5914131870ea384ec7f  eric4-i18n-es-4.2.5.tar.gz
+1fba197dde8ebf5642af51ba375de582  eric4-i18n-fr-4.2.5.tar.gz
+1ba6416268c88ca30b3866f05a6558be  eric4-i18n-ru-4.2.5.tar.gz
+0f18017832ef5b880a636e15c39b5c7c  eric4-i18n-tr-4.2.5.tar.gz


--- eric4-4.1.0-shebang.patch DELETED ---



From trasher at fedoraproject.org  Fri Jan  9 06:59:55 2009
From: trasher at fedoraproject.org (Johan Cwiklinski)
Date: Fri,  9 Jan 2009 06:59:55 +0000 (UTC)
Subject: rpms/eric/F-9 eric4-4.2.5-shebang.patch, NONE, 1.1 eric.spec, 1.32, 
	1.33 sources, 1.17, 1.18 eric4-4.1.0-shebang.patch, 1.1, NONE
Message-ID: <20090109065956.00CE37011C@cvs1.fedora.phx.redhat.com>

Author: trasher

Update of /cvs/extras/rpms/eric/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23530

Modified Files:
	eric.spec sources 
Added Files:
	eric4-4.2.5-shebang.patch 
Removed Files:
	eric4-4.1.0-shebang.patch 
Log Message:
New upstream release


eric4-4.2.5-shebang.patch:

--- NEW FILE eric4-4.2.5-shebang.patch ---
diff -up eric4-4.2.5/eric/__init__.py.patch eric4-4.2.5/eric/__init__.py
--- eric4-4.2.5/eric/__init__.py.patch	2009-01-08 18:11:24.000000000 +0100
+++ eric4-4.2.5/eric/__init__.py	2009-01-08 18:11:30.000000000 +0100
@@ -1,3 +1,4 @@
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
 # Copyright (c) 2003 - 2009 Detlev Offenbach <detlev at die-offenbachs.de>
diff -up eric4-4.2.5/eric/patch_modpython.py.patch eric4-4.2.5/eric/patch_modpython.py
--- eric4-4.2.5/eric/patch_modpython.py.patch	2009-01-08 18:11:05.000000000 +0100
+++ eric4-4.2.5/eric/patch_modpython.py	2009-01-08 18:11:13.000000000 +0100
@@ -1,3 +1,4 @@
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
 # Copyright (c) 2003-2009 Detlev Offenbach <detlev at die-offenbachs.de>
diff -up eric4-4.2.5/eric/uninstall.py.patch eric4-4.2.5/eric/uninstall.py
--- eric4-4.2.5/eric/uninstall.py.patch	2009-01-08 18:10:38.000000000 +0100
+++ eric4-4.2.5/eric/uninstall.py	2009-01-08 18:10:51.000000000 +0100
@@ -1,3 +1,4 @@
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
 # Copyright (c) 2002-2009 Detlev Offenbach <detlev at die-offenbachs.de>


Index: eric.spec
===================================================================
RCS file: /cvs/extras/rpms/eric/F-9/eric.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- eric.spec	10 Dec 2008 06:04:27 -0000	1.32
+++ eric.spec	9 Jan 2009 06:59:25 -0000	1.33
@@ -7,12 +7,12 @@
 
 Name:    eric
 Summary: Python IDE
-Version: 4.2.4a
+Version: 4.2.5
 Release: 1%{?dist}
 
 License: GPL+
 Group:   Development/Tools
-URL:     http://www.die-offenbachs.de/eric/index.html
+URL:     http://eric-ide.python-projects.org
 Source:  http://downloads.sourceforge.net/sourceforge/eric-ide/%{name}4-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -24,7 +24,7 @@
 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
+Patch1:    eric4-4.2.5-shebang.patch
 
 Provides: eric4 = %{version}-%{release}
 
@@ -147,6 +147,9 @@
 
 
 %changelog
+* Thu Jan 8 2009 Johan Cwiklinski <johan AT x-tnd DOT be> 4.2.5-1
+* 4.2.5
+
 * Wed Dec 9 2008 Johan Cwiklinski <johan AT x-tnd DOT be> 4.2.4a-1
 - 4.2.4a
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/eric/F-9/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources	10 Dec 2008 06:04:28 -0000	1.17
+++ sources	9 Jan 2009 06:59:25 -0000	1.18
@@ -1,7 +1,7 @@
-67cbe7407783066be989abd01c8f195b  eric4-4.2.4a.tar.gz
-ca59f61018536f6031ba2835664803d0  eric4-i18n-cs-4.2.4a.tar.gz
-c3fc58822175739897b4d5ab0563c45c  eric4-i18n-de-4.2.4a.tar.gz
-70c8d33e1b76167ee45f5f46bb7a322a  eric4-i18n-es-4.2.4a.tar.gz
-541b3eb38c9ebdd7b3d64f8e08b6fa74  eric4-i18n-fr-4.2.4a.tar.gz
-510ebe302d13f243766f0bf474219751  eric4-i18n-ru-4.2.4a.tar.gz
-ef73a494480e5b44aaa8ab8bb844070e  eric4-i18n-tr-4.2.4a.tar.gz
+195e5d4b29977c0c36d808cd77bc40c9  eric4-4.2.5.tar.gz
+71005adf2e9d339ad50998a420c61c4f  eric4-i18n-cs-4.2.5.tar.gz
+ebdef75261d208ae7e2d0b22ebed33e8  eric4-i18n-de-4.2.5.tar.gz
+4bacb41caac1f5914131870ea384ec7f  eric4-i18n-es-4.2.5.tar.gz
+1fba197dde8ebf5642af51ba375de582  eric4-i18n-fr-4.2.5.tar.gz
+1ba6416268c88ca30b3866f05a6558be  eric4-i18n-ru-4.2.5.tar.gz
+0f18017832ef5b880a636e15c39b5c7c  eric4-i18n-tr-4.2.5.tar.gz


--- eric4-4.1.0-shebang.patch DELETED ---



From drepper at fedoraproject.org  Fri Jan  9 07:04:46 2009
From: drepper at fedoraproject.org (Ulrich Drepper)
Date: Fri,  9 Jan 2009 07:04:46 +0000 (UTC)
Subject: rpms/pfstmo/devel pfstmo.spec,1.3,1.4
Message-ID: <20090109070446.BA1157011C@cvs1.fedora.phx.redhat.com>

Author: drepper

Update of /cvs/pkgs/rpms/pfstmo/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24391

Modified Files:
	pfstmo.spec 
Log Message:
Require pkgconfig for building.


Index: pfstmo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pfstmo/devel/pfstmo.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- pfstmo.spec	9 Jan 2009 06:46:15 -0000	1.3
+++ pfstmo.spec	9 Jan 2009 07:04:16 -0000	1.4
@@ -1,6 +1,6 @@
 Name:		pfstmo
 Version:	1.3.2
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	PFS tone mapping operators
 
 Group:		Applications/Multimedia
@@ -15,6 +15,7 @@
 BuildRequires:	pfstools-devel
 BuildRequires:	fftw-devel
 BuildRequires:	gsl-devel
+BuildRequires:	pkgconfig
 
 %description
 The pfstmo package contains the implementation of state-of-the-art tone
@@ -68,6 +69,9 @@
 
 
 %changelog
+* Thu Jan 8 2009 Ulrich Drepper <drepper at redhat.com> - 1.3.2-5
+- Require pkgconfig for building
+
 * Thu Jan 8 2009 Ulrich Drepper <drepper at redhat.com> - 1.3.2-4
 - Run libtoolize in spec file
 



From drepper at fedoraproject.org  Fri Jan  9 07:07:47 2009
From: drepper at fedoraproject.org (Ulrich Drepper)
Date: Fri,  9 Jan 2009 07:07:47 +0000 (UTC)
Subject: rpms/pfstmo/F-9 pfstmo.spec,1.2,1.3
Message-ID: <20090109070747.C10757011C@cvs1.fedora.phx.redhat.com>

Author: drepper

Update of /cvs/pkgs/rpms/pfstmo/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24686

Modified Files:
	pfstmo.spec 
Log Message:
Require pkgconfig for building.


Index: pfstmo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pfstmo/F-9/pfstmo.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- pfstmo.spec	9 Jan 2009 06:53:36 -0000	1.2
+++ pfstmo.spec	9 Jan 2009 07:07:17 -0000	1.3
@@ -1,6 +1,6 @@
 Name:		pfstmo
 Version:	1.3.2
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	PFS tone mapping operators
 
 Group:		Applications/Multimedia
@@ -15,6 +15,7 @@
 BuildRequires:	pfstools-devel
 BuildRequires:	fftw-devel
 BuildRequires:	gsl-devel
+BuildRequires:	pkgconfig
 
 %description
 The pfstmo package contains the implementation of state-of-the-art tone
@@ -68,6 +69,9 @@
 
 
 %changelog
+* Thu Jan 8 2009 Ulrich Drepper <drepper at redhat.com> - 1.3.2-5
+- Require pkgconfig for building
+
 * Thu Jan 8 2009 Ulrich Drepper <drepper at redhat.com> - 1.3.2-4
 - Run libtoolize in spec file
 



From drepper at fedoraproject.org  Fri Jan  9 07:08:42 2009
From: drepper at fedoraproject.org (Ulrich Drepper)
Date: Fri,  9 Jan 2009 07:08:42 +0000 (UTC)
Subject: rpms/pfstmo/F-10 pfstmo.spec,1.2,1.3
Message-ID: <20090109070842.076907011C@cvs1.fedora.phx.redhat.com>

Author: drepper

Update of /cvs/pkgs/rpms/pfstmo/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24803

Modified Files:
	pfstmo.spec 
Log Message:
Require pkgconfig for building.


Index: pfstmo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pfstmo/F-10/pfstmo.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- pfstmo.spec	9 Jan 2009 06:54:32 -0000	1.2
+++ pfstmo.spec	9 Jan 2009 07:08:11 -0000	1.3
@@ -1,6 +1,6 @@
 Name:		pfstmo
 Version:	1.3.2
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	PFS tone mapping operators
 
 Group:		Applications/Multimedia
@@ -15,6 +15,7 @@
 BuildRequires:	pfstools-devel
 BuildRequires:	fftw-devel
 BuildRequires:	gsl-devel
+BuildRequires:	pkgconfig
 
 %description
 The pfstmo package contains the implementation of state-of-the-art tone
@@ -68,6 +69,9 @@
 
 
 %changelog
+* Thu Jan 8 2009 Ulrich Drepper <drepper at redhat.com> - 1.3.2-5
+- Require pkgconfig for building
+
 * Thu Jan 8 2009 Ulrich Drepper <drepper at redhat.com> - 1.3.2-4
 - Run libtoolize in spec file
 



From dp67 at fedoraproject.org  Fri Jan  9 07:10:55 2009
From: dp67 at fedoraproject.org (Randy Berry)
Date: Fri,  9 Jan 2009 07:10:55 +0000 (UTC)
Subject: rpms/cwirc/F-10 cwirc-makefile-fix.patch, NONE,
	1.1 cwirc-rcfile.patch, 
	NONE, 1.1 cwirc.spec, NONE, 1.1 sources, 1.1, 1.2
Message-ID: <20090109071055.6A0C17011C@cvs1.fedora.phx.redhat.com>

Author: dp67

Update of /cvs/pkgs/rpms/cwirc/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24911

Modified Files:
	sources 
Added Files:
	cwirc-makefile-fix.patch cwirc-rcfile.patch cwirc.spec 
Log Message:

Package Setup



cwirc-makefile-fix.patch:

--- NEW FILE cwirc-makefile-fix.patch ---
diff -up cwirc-2.0.0/Makefile.orig cwirc-2.0.0/Makefile
--- cwirc-2.0.0/Makefile.orig	2006-05-20 17:28:07.000000000 -0400
+++ cwirc-2.0.0/Makefile	2008-09-28 12:45:27.000000000 -0400
@@ -103,11 +103,11 @@ FRONTEND_OBJS=		frontend.o					\
 
 $(PLUGIN):		$(PLUGIN_OBJS)
 			$(CC) -shared $(LDFLAGS) -o $@ $(PLUGIN_OBJS)
-			$(STRIP) $@
+			# $(STRIP) $@
 
 $(FRONTEND):		$(FRONTEND_OBJS)
 			$(CC) $(LDFLAGS) $(GTK_LDFLAGS) -o $@ $(FRONTEND_OBJS)
-			$(STRIP) $@
+	        	# $(STRIP) $@
 
 plugin.shared.o:	plugin.c					\
 			$(XCHAT_PLUGIN_INCLUDE_PATH)/xchat-plugin.h	\

cwirc-rcfile.patch:

--- NEW FILE cwirc-rcfile.patch ---
diff -up cwirc-2.0.0/rcfile.c.orig cwirc-2.0.0/rcfile.c
--- cwirc-2.0.0/rcfile.c.orig	2004-06-13 17:09:43.000000000 -0400
+++ cwirc-2.0.0/rcfile.c	2008-09-28 02:24:28.000000000 -0400
@@ -26,10 +26,10 @@
 #define DEFAULT_CWINPUT				"mouse"
 #define DEFAULT_CWOUTPUT			"soundcard"
 #define DEFAULT_CWSOUND				"beeps"
-#ifdef LINUX
+/* #ifdef LINUX */
 #define DEFAULT_SNDDEV				"/dev/dsp"
 #define DEFAULT_SERIALDEV			"/dev/ttyS0"
-#endif
+/* #endif */
 #ifdef FREEBSD
 #define DEFAULT_SNDDEV				"/dev/dsp0.0"
 #define DEFAULT_SERIALDEV			"/dev/cuaa0"


--- NEW FILE cwirc.spec ---
Name:       cwirc
Summary:    X-Chat Morse plugin
Version:    2.0.0
Release:    4%{?dist}

URL:        http://myspace.voo.be/pcoupard/cwirc/
Source:     http://myspace.voo.be/pcoupard/cwirc/download/%{name}-%{version}.tar.gz
Patch0:     cwirc-rcfile.patch
Patch1:     cwirc-makefile-fix.patch
License:    GPLv2
Group:      Applications/Internet
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires: gtk2-devel
 
Requires: xchat >= 2.0.2

%description
X-Chat plugin for sending and receiving raw morse code over IRC.

%prep
%setup -q



# Fix the encoding on LISEZMOI (French Manual) to be UTF-8
recode()
{
        iconv -f "$2" -t utf-8 < "$1" > "${1}_"
        touch -r "$1" "${1}_"
        mv -f "${1}_" "$1"
}
for f in `find LISEZMOI`
 do recode $f iso-8859-15
done

%patch0 -p1 -b %{name}-rcfile.patch
%patch1 -p1 -b %{name}-makefile-fix.patch

%build

make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" TARGET_OS=LINUX PLUGIN_INSTALL_DIRECTORY=dummy\
     FRONTEND_INSTALL_DIRECTORY=dummy\
     CWIRC_EXTENSIONS_DIRECTORY=%{_libdir}/cwirc/extensions
     
%install
rm -rf $RPM_BUILD_ROOT
mkdir $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT/%{_libdir}/xchat/plugins
mkdir -p $RPM_BUILD_ROOT/%{_bindir}/
mkdir -p $RPM_BUILD_ROOT/%{_libdir}/cwirc/extensions
cp cwirc.so $RPM_BUILD_ROOT/%{_libdir}/xchat/plugins
cp cwirc_frontend $RPM_BUILD_ROOT/%{_bindir}/

# No need for a .desktop file since it launches from within Xchat

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root)
%{_libdir}/xchat/plugins/cwirc.so
%{_bindir}/cwirc_frontend
%{_libdir}/cwirc/extensions
%doc README LISEZMOI Changelog COPYING schematics/cw_oscillator.jpg schematics/rs232_key_connection.jpg


%changelog
* Sun Sep 28 2008 Randall J. Berry 'Dp67' <randyn3lrx at gmail.com> 2.0.0-4
- Edit spec per review (added release numbers)
- Changed coding of LISEZMOI to UTF-8 while preserving original date
- Add patch to makefile removing strip to generate debug file

* Sun Sep 28 2008 Randall J. Berry 'Dp67' <randyn3lrx at gmail.com> 2.0.0-3
- Edit spec per review
- Changed coding of LISEZMOI to UTF-8
- Further edit to quiet rpmlint
- Patch added to allow {?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" per review

* Tue Sep 23 2008 Randll J. Berry 'Dp67' <randyn3lrx at gmail.com> 2.0.0-2
- Edit spec for Fedora standards
- Check against rpmlint
- rpm build / mock build
- submit for review

* Mon Jan 12 2004 P.P. Coupard <pcoupard at easyconnect.fr> 2.0.0
- First draft of the spec file


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cwirc/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	9 Jan 2009 05:46:22 -0000	1.1
+++ sources	9 Jan 2009 07:10:25 -0000	1.2
@@ -0,0 +1 @@
+08930a01c0d94b730e184a79bee7fe0c  cwirc-2.0.0.tar.gz



From drepper at fedoraproject.org  Fri Jan  9 07:13:52 2009
From: drepper at fedoraproject.org (Ulrich Drepper)
Date: Fri,  9 Jan 2009 07:13:52 +0000 (UTC)
Subject: rpms/pfscalibration/F-9 pfscalibration-1.4-opt.patch,1.1,1.2
Message-ID: <20090109071352.C8CB77011C@cvs1.fedora.phx.redhat.com>

Author: drepper

Update of /cvs/pkgs/rpms/pfscalibration/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25135

Modified Files:
	pfscalibration-1.4-opt.patch 
Log Message:
Don't compile with -fopenmp for now.

pfscalibration-1.4-opt.patch:

Index: pfscalibration-1.4-opt.patch
===================================================================
RCS file: /cvs/pkgs/rpms/pfscalibration/F-9/pfscalibration-1.4-opt.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pfscalibration-1.4-opt.patch	9 Jan 2009 06:24:06 -0000	1.1
+++ pfscalibration-1.4-opt.patch	9 Jan 2009 07:13:22 -0000	1.2
@@ -5,8 +5,8 @@
  
  man_MANS =  jpeg2hdrgen.1 dcraw2hdrgen.1 pfsinhdrgen.1 pfshdrcalibrate.1
  
-+pfshdrcalibrate_CXXFLAGS = -fopenmp
-+pfshdrcalibrate_LDFLAGS = -fopenmp
++#pfshdrcalibrate_CXXFLAGS = -fopenmp
++#pfshdrcalibrate_LDFLAGS = -fopenmp
 +
  LIBS = $(PFS_LIBS) -lm
  INCLUDES = $(PFS_CFLAGS)



From drepper at fedoraproject.org  Fri Jan  9 07:22:37 2009
From: drepper at fedoraproject.org (Ulrich Drepper)
Date: Fri,  9 Jan 2009 07:22:37 +0000 (UTC)
Subject: rpms/pfscalibration/F-9 pfscalibration.spec,1.1,1.2
Message-ID: <20090109072237.4AA5F7011C@cvs1.fedora.phx.redhat.com>

Author: drepper

Update of /cvs/pkgs/rpms/pfscalibration/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25519

Modified Files:
	pfscalibration.spec 
Log Message:
Require pkgconfig.  Update changelog.



Index: pfscalibration.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pfscalibration/F-9/pfscalibration.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pfscalibration.spec	9 Jan 2009 06:24:06 -0000	1.1
+++ pfscalibration.spec	9 Jan 2009 07:22:06 -0000	1.2
@@ -16,6 +16,7 @@
 Buildrequires:	libtool
 BuildRequires:	libtiff-devel
 BuildRequires:	pfstools-devel
+BuildRequires:	pkgconfig
 Requires:	perl
 Requires:	dcraw
 Requires:	jhead
@@ -70,6 +71,10 @@
 
 %changelog
 
+* Thu Jan 8 2009 Ulrich Drepper <drepper at redhat.com> - 1.4-5
+- Require pkgconfig for building.
+- Disable OpenMP.
+
 * Wed Jan 7 2009 Ulrich Drepper <drepper at redhat.com> - 1.4-4
 - Fix configure script patch to not remove -g compiler option.
 



From drepper at fedoraproject.org  Fri Jan  9 07:26:52 2009
From: drepper at fedoraproject.org (Ulrich Drepper)
Date: Fri,  9 Jan 2009 07:26:52 +0000 (UTC)
Subject: rpms/pfscalibration/F-9 pfscalibration.spec,1.2,1.3
Message-ID: <20090109072652.7EB747011C@cvs1.fedora.phx.redhat.com>

Author: drepper

Update of /cvs/pkgs/rpms/pfscalibration/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26085

Modified Files:
	pfscalibration.spec 
Log Message:
Fix number.


Index: pfscalibration.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pfscalibration/F-9/pfscalibration.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- pfscalibration.spec	9 Jan 2009 07:22:06 -0000	1.2
+++ pfscalibration.spec	9 Jan 2009 07:26:22 -0000	1.3
@@ -1,6 +1,6 @@
 Name:		pfscalibration
 Version:	1.4
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	Scripts and programs for photometric calibration
 
 Group:		Applications/Multimedia



From dp67 at fedoraproject.org  Fri Jan  9 07:27:51 2009
From: dp67 at fedoraproject.org (Randy Berry)
Date: Fri,  9 Jan 2009 07:27:51 +0000 (UTC)
Subject: rpms/cwirc/F-9 sources,1.1,1.2
Message-ID: <20090109072751.0895A7011C@cvs1.fedora.phx.redhat.com>

Author: dp67

Update of /cvs/pkgs/rpms/cwirc/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26136

Modified Files:
	sources 
Log Message:

Setup Package




Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cwirc/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	9 Jan 2009 05:46:22 -0000	1.1
+++ sources	9 Jan 2009 07:27:20 -0000	1.2
@@ -0,0 +1 @@
+08930a01c0d94b730e184a79bee7fe0c  cwirc-2.0.0.tar.gz



From drepper at fedoraproject.org  Fri Jan  9 07:36:18 2009
From: drepper at fedoraproject.org (Ulrich Drepper)
Date: Fri,  9 Jan 2009 07:36:18 +0000 (UTC)
Subject: rpms/pfscalibration/F-10 pfscalibration.spec,1.1,1.2
Message-ID: <20090109073618.B96DC7011C@cvs1.fedora.phx.redhat.com>

Author: drepper

Update of /cvs/pkgs/rpms/pfscalibration/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27510

Modified Files:
	pfscalibration.spec 
Log Message:
Require pkgconfig for building.


Index: pfscalibration.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pfscalibration/F-10/pfscalibration.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pfscalibration.spec	9 Jan 2009 06:26:24 -0000	1.1
+++ pfscalibration.spec	9 Jan 2009 07:35:48 -0000	1.2
@@ -1,6 +1,6 @@
 Name:		pfscalibration
 Version:	1.4
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	Scripts and programs for photometric calibration
 
 Group:		Applications/Multimedia
@@ -16,6 +16,7 @@
 Buildrequires:	libtool
 BuildRequires:	libtiff-devel
 BuildRequires:	pfstools-devel
+BuildRequires:	pkgconfig
 Requires:	perl
 Requires:	dcraw
 Requires:	jhead
@@ -69,6 +70,9 @@
 
 
 %changelog
+ 
+* Thu Jan 8 2009 Ulrich Drepper <drepper at redhat.com> - 1.4-5
+- Require pkgconfig for building.
 
 * Wed Jan 7 2009 Ulrich Drepper <drepper at redhat.com> - 1.4-4
 - Fix configure script patch to not remove -g compiler option.



From drepper at fedoraproject.org  Fri Jan  9 07:41:28 2009
From: drepper at fedoraproject.org (Ulrich Drepper)
Date: Fri,  9 Jan 2009 07:41:28 +0000 (UTC)
Subject: rpms/pfscalibration/devel pfscalibration.spec,1.1,1.2
Message-ID: <20090109074128.2F9BA7011C@cvs1.fedora.phx.redhat.com>

Author: drepper

Update of /cvs/pkgs/rpms/pfscalibration/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27948

Modified Files:
	pfscalibration.spec 
Log Message:
Better formatting.


Index: pfscalibration.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pfscalibration/devel/pfscalibration.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pfscalibration.spec	9 Jan 2009 06:22:13 -0000	1.1
+++ pfscalibration.spec	9 Jan 2009 07:40:57 -0000	1.2
@@ -1,6 +1,6 @@
 Name:		pfscalibration
 Version:	1.4
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	Scripts and programs for photometric calibration
 
 Group:		Applications/Multimedia
@@ -16,6 +16,7 @@
 Buildrequires:	libtool
 BuildRequires:	libtiff-devel
 BuildRequires:	pfstools-devel
+BuildRequires:	pkgconfig
 Requires:	perl
 Requires:	dcraw
 Requires:	jhead
@@ -70,6 +71,9 @@
 
 %changelog
 
+* Thu Jan 8 2009 Ulrich Drepper <drepper at redhat.com> - 1.4-5
+- Require pkgconfig for building.
+
 * Wed Jan 7 2009 Ulrich Drepper <drepper at redhat.com> - 1.4-4
 - Fix configure script patch to not remove -g compiler option.
 



From dp67 at fedoraproject.org  Fri Jan  9 07:44:14 2009
From: dp67 at fedoraproject.org (Randy Berry)
Date: Fri,  9 Jan 2009 07:44:14 +0000 (UTC)
Subject: rpms/cwirc/F-9 cwirc-makefile-fix.patch, NONE,
	1.1 cwirc-rcfile.patch, NONE, 1.1 cwirc.spec, NONE, 1.1
Message-ID: <20090109074414.DC6007011C@cvs1.fedora.phx.redhat.com>

Author: dp67

Update of /cvs/pkgs/rpms/cwirc/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28234

Added Files:
	cwirc-makefile-fix.patch cwirc-rcfile.patch cwirc.spec 
Log Message:

Package Setup


cwirc-makefile-fix.patch:

--- NEW FILE cwirc-makefile-fix.patch ---
diff -up cwirc-2.0.0/Makefile.orig cwirc-2.0.0/Makefile
--- cwirc-2.0.0/Makefile.orig	2006-05-20 17:28:07.000000000 -0400
+++ cwirc-2.0.0/Makefile	2008-09-28 12:45:27.000000000 -0400
@@ -103,11 +103,11 @@ FRONTEND_OBJS=		frontend.o					\
 
 $(PLUGIN):		$(PLUGIN_OBJS)
 			$(CC) -shared $(LDFLAGS) -o $@ $(PLUGIN_OBJS)
-			$(STRIP) $@
+			# $(STRIP) $@
 
 $(FRONTEND):		$(FRONTEND_OBJS)
 			$(CC) $(LDFLAGS) $(GTK_LDFLAGS) -o $@ $(FRONTEND_OBJS)
-			$(STRIP) $@
+	        	# $(STRIP) $@
 
 plugin.shared.o:	plugin.c					\
 			$(XCHAT_PLUGIN_INCLUDE_PATH)/xchat-plugin.h	\

cwirc-rcfile.patch:

--- NEW FILE cwirc-rcfile.patch ---
diff -up cwirc-2.0.0/rcfile.c.orig cwirc-2.0.0/rcfile.c
--- cwirc-2.0.0/rcfile.c.orig	2004-06-13 17:09:43.000000000 -0400
+++ cwirc-2.0.0/rcfile.c	2008-09-28 02:24:28.000000000 -0400
@@ -26,10 +26,10 @@
 #define DEFAULT_CWINPUT				"mouse"
 #define DEFAULT_CWOUTPUT			"soundcard"
 #define DEFAULT_CWSOUND				"beeps"
-#ifdef LINUX
+/* #ifdef LINUX */
 #define DEFAULT_SNDDEV				"/dev/dsp"
 #define DEFAULT_SERIALDEV			"/dev/ttyS0"
-#endif
+/* #endif */
 #ifdef FREEBSD
 #define DEFAULT_SNDDEV				"/dev/dsp0.0"
 #define DEFAULT_SERIALDEV			"/dev/cuaa0"


--- NEW FILE cwirc.spec ---
Name:       cwirc
Summary:    X-Chat Morse plugin
Version:    2.0.0
Release:    4%{?dist}

URL:        http://myspace.voo.be/pcoupard/cwirc/
Source:     http://myspace.voo.be/pcoupard/cwirc/download/%{name}-%{version}.tar.gz
Patch0:     cwirc-rcfile.patch
Patch1:     cwirc-makefile-fix.patch
License:    GPLv2
Group:      Applications/Internet
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires: gtk2-devel
 
Requires: xchat >= 2.0.2

%description
X-Chat plugin for sending and receiving raw morse code over IRC.

%prep
%setup -q



# Fix the encoding on LISEZMOI (French Manual) to be UTF-8
recode()
{
        iconv -f "$2" -t utf-8 < "$1" > "${1}_"
        touch -r "$1" "${1}_"
        mv -f "${1}_" "$1"
}
for f in `find LISEZMOI`
 do recode $f iso-8859-15
done

%patch0 -p1 -b %{name}-rcfile.patch
%patch1 -p1 -b %{name}-makefile-fix.patch

%build

make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" TARGET_OS=LINUX PLUGIN_INSTALL_DIRECTORY=dummy\
     FRONTEND_INSTALL_DIRECTORY=dummy\
     CWIRC_EXTENSIONS_DIRECTORY=%{_libdir}/cwirc/extensions
     
%install
rm -rf $RPM_BUILD_ROOT
mkdir $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT/%{_libdir}/xchat/plugins
mkdir -p $RPM_BUILD_ROOT/%{_bindir}/
mkdir -p $RPM_BUILD_ROOT/%{_libdir}/cwirc/extensions
cp cwirc.so $RPM_BUILD_ROOT/%{_libdir}/xchat/plugins
cp cwirc_frontend $RPM_BUILD_ROOT/%{_bindir}/

# No need for a .desktop file since it launches from within Xchat

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root)
%{_libdir}/xchat/plugins/cwirc.so
%{_bindir}/cwirc_frontend
%{_libdir}/cwirc/extensions
%doc README LISEZMOI Changelog COPYING schematics/cw_oscillator.jpg schematics/rs232_key_connection.jpg


%changelog
* Sun Sep 28 2008 Randall J. Berry 'Dp67' <randyn3lrx at gmail.com> 2.0.0-4
- Edit spec per review (added release numbers)
- Changed coding of LISEZMOI to UTF-8 while preserving original date
- Add patch to makefile removing strip to generate debug file

* Sun Sep 28 2008 Randall J. Berry 'Dp67' <randyn3lrx at gmail.com> 2.0.0-3
- Edit spec per review
- Changed coding of LISEZMOI to UTF-8
- Further edit to quiet rpmlint
- Patch added to allow {?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" per review

* Tue Sep 23 2008 Randll J. Berry 'Dp67' <randyn3lrx at gmail.com> 2.0.0-2
- Edit spec for Fedora standards
- Check against rpmlint
- rpm build / mock build
- submit for review

* Mon Jan 12 2004 P.P. Coupard <pcoupard at easyconnect.fr> 2.0.0
- First draft of the spec file



From jnovy at fedoraproject.org  Fri Jan  9 07:59:24 2009
From: jnovy at fedoraproject.org (Jindrich Novy)
Date: Fri,  9 Jan 2009 07:59:24 +0000 (UTC)
Subject: rpms/texi2html/devel .cvsignore, 1.5, 1.6 sources, 1.5,
	1.6 texi2html.spec, 1.17, 1.18
Message-ID: <20090109075924.805947011C@cvs1.fedora.phx.redhat.com>

Author: jnovy

Update of /cvs/pkgs/rpms/texi2html/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29678

Modified Files:
	.cvsignore sources texi2html.spec 
Log Message:
* Fri Jan  9 2009 Jindrich Novy <jnovy at redhat.com> 1.82-1
- update to 1.82



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/texi2html/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	6 Jan 2009 14:16:32 -0000	1.5
+++ .cvsignore	9 Jan 2009 07:58:54 -0000	1.6
@@ -1 +1 @@
-texi2html-1.80.tar.gz
+texi2html-1.82.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/texi2html/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	6 Jan 2009 14:16:32 -0000	1.5
+++ sources	9 Jan 2009 07:58:54 -0000	1.6
@@ -1 +1 @@
-4eec3730f39ba64534062483b174795d  texi2html-1.80.tar.gz
+a8a9193c0ac1bec2f3ca7be40a5a82eb  texi2html-1.82.tar.bz2


Index: texi2html.spec
===================================================================
RCS file: /cvs/pkgs/rpms/texi2html/devel/texi2html.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- texi2html.spec	6 Jan 2009 14:16:32 -0000	1.17
+++ texi2html.spec	9 Jan 2009 07:58:54 -0000	1.18
@@ -1,5 +1,5 @@
 Name: texi2html
-Version: 1.80
+Version: 1.82
 Release: 1%{?dist}
 # GPLv2+ is for the code
 # OFSFDL (Old FSF Documentation License) for the documentation
@@ -7,7 +7,7 @@
 License: GPLv2+ and OFSFDL and (CC-BY-SA or GPLv2)
 Group: Applications/Text
 Summary: A highly customizable texinfo to HTML and other formats translator
-Source0: http://download.savannah.nongnu.org/releases/%{name}/%{name}-%{version}.tar.gz
+Source0: http://download.savannah.nongnu.org/releases/%{name}/%{name}-%{version}.tar.bz2
 URL: http://www.nongnu.org/texi2html/
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
@@ -30,8 +30,6 @@
 %setup -q
 
 %build
-# upstream configure script doesn't have executable bit set
-chmod +x ./configure
 %configure
 make %{?_smp_mflags}
 
@@ -74,6 +72,9 @@
 %dir %{_sysconfdir}/texinfo
 
 %changelog
+* Fri Jan  9 2009 Jindrich Novy <jnovy at redhat.com> 1.82-1
+- update to 1.82
+
 * Tue Jan  6 2009 Jindrich Novy <jnovy at redhat.com> 1.80-1
 - update to 1.80
 



From caolanm at fedoraproject.org  Fri Jan  9 08:55:56 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Fri,  9 Jan 2009 08:55:56 +0000 (UTC)
Subject: rpms/hyphen-is/devel hyphen-is.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090109085556.E8E5A7011C@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/hyphen-is/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1067/devel

Modified Files:
	.cvsignore sources 
Added Files:
	hyphen-is.spec import.log 
Log Message:



--- NEW FILE hyphen-is.spec ---
Name: hyphen-is
Summary: Icelandic hyphenation rules
%define upstreamid 20030920
Version: 0.%{upstreamid}
Release: 1%{?dist}
Source: http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/dictionaries/hyph_is_IS.zip
Group: Applications/Text
URL: http://wiki.services.openoffice.org/wiki/Dictionaries
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
License: LGPLv2+
BuildArch: noarch

Requires: hyphen

%description
Icelandic hyphenation rules.

%prep
%setup -q -c

%build
chmod -x *
iconv -f ISO-8859-1 -t UTF-8 README_hyph_is_IS.txt > README_hyph_is_IS.txt.new
mv -f README_hyph_is_IS.txt.new README_hyph_is_IS.txt

%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT/%{_datadir}/hyphen
cp -p *.dic $RPM_BUILD_ROOT/%{_datadir}/hyphen

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc README_hyph_is_IS.txt
%{_datadir}/hyphen/*

%changelog
* Wed Jan 07 2008 Caolan McNamara <caolanm at redhat.com> - 0.20030920-1
- initial version


--- NEW FILE import.log ---
hyphen-is-0_20030920-1_fc10:HEAD:hyphen-is-0.20030920-1.fc10.src.rpm:1231491246


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hyphen-is/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	9 Jan 2009 05:50:09 -0000	1.1
+++ .cvsignore	9 Jan 2009 08:55:26 -0000	1.2
@@ -0,0 +1 @@
+hyph_is_IS.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hyphen-is/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	9 Jan 2009 05:50:09 -0000	1.1
+++ sources	9 Jan 2009 08:55:26 -0000	1.2
@@ -0,0 +1 @@
+448230e966bdf68d5f8abffd18480402  hyph_is_IS.zip



From caolanm at fedoraproject.org  Fri Jan  9 09:00:05 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Fri,  9 Jan 2009 09:00:05 +0000 (UTC)
Subject: rpms/hyphen-id/devel hyphen-id.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090109090005.9377B7011C@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/hyphen-id/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1509/devel

Modified Files:
	.cvsignore sources 
Added Files:
	hyphen-id.spec import.log 
Log Message:



--- NEW FILE hyphen-id.spec ---
Name: hyphen-id
Summary: Indonesian hyphenation rules
%define upstreamid 20040812
Version: 0.%{upstreamid}
Release: 1%{?dist}
Source: http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/dictionaries/hyph_id_ID.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: hyphen

%description
Indonesian hyphenation rules.

%prep
%setup -q -c

%build
chmod -x *

%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT/%{_datadir}/hyphen
cp -p *.dic $RPM_BUILD_ROOT/%{_datadir}/hyphen

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc README_id_ID.txt
%{_datadir}/hyphen/*

%changelog
* Wed Jan 07 2008 Caolan McNamara <caolanm at redhat.com> - 0.20040812-1
- initial version


--- NEW FILE import.log ---
hyphen-id-0_20040812-1_fc10:HEAD:hyphen-id-0.20040812-1.fc10.src.rpm:1231491529


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hyphen-id/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	9 Jan 2009 05:48:49 -0000	1.1
+++ .cvsignore	9 Jan 2009 08:59:35 -0000	1.2
@@ -0,0 +1 @@
+hyph_id_ID.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hyphen-id/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	9 Jan 2009 05:48:49 -0000	1.1
+++ sources	9 Jan 2009 08:59:35 -0000	1.2
@@ -0,0 +1 @@
+f94557d7e57b22fa7e342f1c5bfe88ef  hyph_id_ID.zip



From rvokal at fedoraproject.org  Fri Jan  9 09:43:16 2009
From: rvokal at fedoraproject.org (=?utf-8?q?Radek_Vok=C3=A1l?=)
Date: Fri,  9 Jan 2009 09:43:16 +0000 (UTC)
Subject: rpms/gjots2/F-10 .cvsignore, 1.4, 1.5 gjots2.spec, 1.10,
	1.11 sources, 1.4, 1.5
Message-ID: <20090109094316.0C0987011C@cvs1.fedora.phx.redhat.com>

Author: rvokal

Update of /cvs/extras/rpms/gjots2/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4794

Modified Files:
	.cvsignore gjots2.spec sources 
Log Message:
update to 2.3.8 - fixes gpg issues


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gjots2/F-10/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	1 Sep 2008 08:43:05 -0000	1.4
+++ .cvsignore	9 Jan 2009 09:42:45 -0000	1.5
@@ -1 +1 @@
-gjots2-2.3.7.tgz
+gjots2-2.3.8.tgz


Index: gjots2.spec
===================================================================
RCS file: /cvs/extras/rpms/gjots2/F-10/gjots2.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- gjots2.spec	1 Sep 2008 08:53:09 -0000	1.10
+++ gjots2.spec	9 Jan 2009 09:42:45 -0000	1.11
@@ -20,7 +20,7 @@
 
 Summary: A note jotter - Organise your ideas, notes, facts in a hierarchy
 Name: gjots2
-Version: 2.3.7
+Version: 2.3.8
 Release: 1%{?dist}
 URL: http://bhepple.freeshell.org/gjots
 Source: http://bhepple.freeshell.org/gjots/%{name}-%{version}.tgz
@@ -134,6 +134,11 @@
 %{_mandir}/man1/docbook2gjots*
 
 %changelog
+* Fri Jan  9 2009 Radek Vokal <rvokal at redhat.com> 2.3.8-1
+- update to 2.3.8
+- fix for gpg encrypted file handling  (#464476)
+- fixed vulnerability when processing a gpg password  (#464510)
+
 * Mon Sep  1 2008 Radek Vok??l <rvokal at redhat.com> 2.3.7-1
 - fix requires
 - update to 2.3.7


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gjots2/F-10/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	1 Sep 2008 08:43:05 -0000	1.4
+++ sources	9 Jan 2009 09:42:45 -0000	1.5
@@ -1 +1 @@
-08009c78a1680ff1e2aa52f1881ed892  gjots2-2.3.7.tgz
+1061044c828771c4f17f677f48a38cd4  gjots2-2.3.8.tgz



From lkundrak at fedoraproject.org  Fri Jan  9 09:57:38 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Fri,  9 Jan 2009 09:57:38 +0000 (UTC)
Subject: rpms/libwpg/devel libwpg.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090109095738.3D3297011C@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/libwpg/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5768

Modified Files:
	.cvsignore sources 
Added Files:
	libwpg.spec 
Log Message:
Initial import


--- NEW FILE libwpg.spec ---
Name:           libwpg
Version:        0.1.3
Release:        1%{?dist}
Summary:        Library for reading WordPerfect Graphics images

Group:          System Environment/Libraries
License:        GPLv2+
URL:            http://libwpg.sourceforge.net/
Source0:        http://download.sourceforge.net/libwpg/%{name}-%{version}.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  libwpd-devel >= 0.8
BuildRequires:  doxygen

%description
Libwpg project is a library and to work with graphics in WPG
(WordPerfect Graphics) format. WPG is the format used among others
in Corel sofware, such as WordPerfect and Presentations.


%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 tools
Summary:        Tools to convert WordPerfect Graphics images
Group:          Applications/Multimedia

%description tools
This package contains tools to work with graphics in WPG (WordPerfect
Graphics) format. WPG is the format used among others in Corel sofware,
such as WordPerfect and Presentations.


%prep
%setup -q


%build
%configure
make %{?_smp_mflags}
sed 's/\r//' -i ChangeLog


%install
rm -rf $RPM_BUILD_ROOT
# Documentation is intentionally not installed here,
# it is included as -devel %%doc
make SUBDIRS="" install DESTDIR=$RPM_BUILD_ROOT
make -C src install DESTDIR=$RPM_BUILD_ROOT
find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'


%clean
rm -rf $RPM_BUILD_ROOT


%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig


%files
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING
%{_libdir}/*.so.*


%files devel
%defattr(-,root,root,-)
%doc COPYING docs/doxygen/html
%{_includedir}/*
%{_libdir}/*.so
%{_libdir}/pkgconfig/*.pc


%files tools
%defattr(-,root,root,-)
%doc COPYING
%{_bindir}/*


%changelog
* Tue Jan 6 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.1.3-1
- Initial packaging


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libwpg/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	9 Jan 2009 05:57:35 -0000	1.1
+++ .cvsignore	9 Jan 2009 09:57:07 -0000	1.2
@@ -0,0 +1 @@
+libwpg-0.1.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libwpg/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	9 Jan 2009 05:57:35 -0000	1.1
+++ sources	9 Jan 2009 09:57:07 -0000	1.2
@@ -0,0 +1 @@
+1069ad84fdf65f1c47b63b639137613f  libwpg-0.1.3.tar.bz2



From pkgdb at fedoraproject.org  Fri Jan  9 09:58:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Jan 2009 09:58:36 +0000
Subject: [pkgdb] djvulibre: rakesh has requested watchbugzilla
Message-ID: <20090109095836.6D95820831D@bastion.fedora.phx.redhat.com>

rakesh has requested the watchbugzilla acl on djvulibre (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/djvulibre



From pkgdb at fedoraproject.org  Fri Jan  9 09:58:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Jan 2009 09:58:37 +0000
Subject: [pkgdb] djvulibre: rakesh has requested commit
Message-ID: <20090109095837.989C5208455@bastion.fedora.phx.redhat.com>

rakesh has requested the commit acl on djvulibre (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/djvulibre



From pkgdb at fedoraproject.org  Fri Jan  9 09:58:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Jan 2009 09:58:38 +0000
Subject: [pkgdb] djvulibre: rakesh has requested approveacls
Message-ID: <20090109095838.2E665208468@bastion.fedora.phx.redhat.com>

rakesh has requested the approveacls acl on djvulibre (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/djvulibre



From pkgdb at fedoraproject.org  Fri Jan  9 09:58:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Jan 2009 09:58:38 +0000
Subject: [pkgdb] djvulibre: rakesh has requested watchcommits
Message-ID: <20090109095838.1DC5C208458@bastion.fedora.phx.redhat.com>

rakesh has requested the watchcommits acl on djvulibre (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/djvulibre



From pkgdb at fedoraproject.org  Fri Jan  9 09:58:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Jan 2009 09:58:41 +0000
Subject: [pkgdb] djvulibre: rakesh has requested watchbugzilla
Message-ID: <20090109095841.6CA5620846C@bastion.fedora.phx.redhat.com>

rakesh has requested the watchbugzilla acl on djvulibre (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/djvulibre



From pkgdb at fedoraproject.org  Fri Jan  9 09:58:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Jan 2009 09:58:42 +0000
Subject: [pkgdb] djvulibre: rakesh has requested watchcommits
Message-ID: <20090109095842.377B2208470@bastion.fedora.phx.redhat.com>

rakesh has requested the watchcommits acl on djvulibre (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/djvulibre



From pkgdb at fedoraproject.org  Fri Jan  9 09:58:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Jan 2009 09:58:43 +0000
Subject: [pkgdb] djvulibre: rakesh has requested commit
Message-ID: <20090109095843.6EAE6208473@bastion.fedora.phx.redhat.com>

rakesh has requested the commit acl on djvulibre (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/djvulibre



From pkgdb at fedoraproject.org  Fri Jan  9 09:58:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Jan 2009 09:58:44 +0000
Subject: [pkgdb] djvulibre: rakesh has requested approveacls
Message-ID: <20090109095844.39A92208476@bastion.fedora.phx.redhat.com>

rakesh has requested the approveacls acl on djvulibre (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/djvulibre



From pkgdb at fedoraproject.org  Fri Jan  9 09:58:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Jan 2009 09:58:47 +0000
Subject: [pkgdb] djvulibre: rakesh has requested watchbugzilla
Message-ID: <20090109095847.43472208479@bastion.fedora.phx.redhat.com>

rakesh has requested the watchbugzilla acl on djvulibre (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/djvulibre



From pkgdb at fedoraproject.org  Fri Jan  9 09:58:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Jan 2009 09:58:47 +0000
Subject: [pkgdb] djvulibre: rakesh has requested watchcommits
Message-ID: <20090109095847.7821C20847C@bastion.fedora.phx.redhat.com>

rakesh has requested the watchcommits acl on djvulibre (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/djvulibre



From pkgdb at fedoraproject.org  Fri Jan  9 09:58:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Jan 2009 09:58:49 +0000
Subject: [pkgdb] djvulibre: rakesh has requested commit
Message-ID: <20090109095849.D51AD20831D@bastion.fedora.phx.redhat.com>

rakesh has requested the commit acl on djvulibre (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/djvulibre



From pkgdb at fedoraproject.org  Fri Jan  9 09:58:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Jan 2009 09:58:51 +0000
Subject: [pkgdb] djvulibre: rakesh has requested approveacls
Message-ID: <20090109095851.6143D208481@bastion.fedora.phx.redhat.com>

rakesh has requested the approveacls acl on djvulibre (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/djvulibre



From stransky at fedoraproject.org  Fri Jan  9 10:29:16 2009
From: stransky at fedoraproject.org (Martin Stransky)
Date: Fri,  9 Jan 2009 10:29:16 +0000 (UTC)
Subject: rpms/nspluginwrapper/devel nspluginwrapper.spec, 1.72,
	1.73 nspluginwrapper-1.1.2-event.patch, 1.1, NONE
Message-ID: <20090109102916.105537011C@cvs1.fedora.phx.redhat.com>

Author: stransky

Update of /cvs/pkgs/rpms/nspluginwrapper/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9068

Modified Files:
	nspluginwrapper.spec 
Removed Files:
	nspluginwrapper-1.1.2-event.patch 
Log Message:
Removed obsoleded patch


Index: nspluginwrapper.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nspluginwrapper/devel/nspluginwrapper.spec,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- nspluginwrapper.spec	8 Jan 2009 15:39:10 -0000	1.72
+++ nspluginwrapper.spec	9 Jan 2009 10:28:45 -0000	1.73
@@ -73,7 +73,6 @@
 Patch1:         nspluginwrapper-1.3.0-make.patch
 Patch2:         nspluginwrapper-1.3.0-configure.patch
 Patch3:         nspluginwrapper-1.3.0-directory.patch
-Patch10:        nspluginwrapper-1.1.2-event.patch
 Patch100:       plugin-config-setuid.patch
 Patch101:       plugin-config-umask.patch
 Patch102:       plugin-config-print.patch
@@ -107,9 +106,6 @@
 %patch2 -p1 -b .conf
 %patch3 -p1 -b .dir
 
-# Package fixes
-#%patch10 -p1 -b .event
-
 # Plugin-config patches
 pushd %plugin_config_name
 %patch100 -p2
@@ -238,7 +234,7 @@
 %exclude %{_bindir}/nspluginwrapper
 
 %changelog
-* Thu Jan 8 2009 Martin Stransky <stransky at redhat.com> 1.1.8-3
+* Thu Jan 8 2009 Martin Stransky <stransky at redhat.com> 1.3.0-1
 - Updated to 1.3.0 and removed some fedora build patches
 
 * Tue Dec 02 2008 Warren Togami <wtogami at redhat.com> 1.1.8-2


--- nspluginwrapper-1.1.2-event.patch DELETED ---



From ltinkl at fedoraproject.org  Fri Jan  9 10:39:10 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Fri,  9 Jan 2009 10:39:10 +0000 (UTC)
Subject: rpms/kdenetwork/F-10 .cvsignore, 1.58, 1.59 kdenetwork.spec, 1.159, 
	1.160 sources, 1.66, 1.67
Message-ID: <20090109103910.1BD6B7011C@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kdenetwork/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10563/F-10

Modified Files:
	.cvsignore kdenetwork.spec sources 
Log Message:
KDE 4.1.4



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdenetwork/F-10/.cvsignore,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- .cvsignore	27 Sep 2008 02:13:43 -0000	1.58
+++ .cvsignore	9 Jan 2009 10:38:39 -0000	1.59
@@ -1 +1 @@
-kdenetwork-4.1.2.tar.bz2
+kdenetwork-4.1.4.tar.bz2


Index: kdenetwork.spec
===================================================================
RCS file: /cvs/extras/rpms/kdenetwork/F-10/kdenetwork.spec,v
retrieving revision 1.159
retrieving revision 1.160
diff -u -r1.159 -r1.160
--- kdenetwork.spec	11 Dec 2008 12:42:40 -0000	1.159
+++ kdenetwork.spec	9 Jan 2009 10:38:39 -0000	1.160
@@ -4,8 +4,8 @@
 Summary: K Desktop Environment - Network Applications
 Name: kdenetwork
 Epoch: 7
-Version: 4.1.3
-Release: 2%{?dist}
+Version: 4.1.4
+Release: 1%{?dist}
 
 License: GPLv2
 Group: Applications/Internet
@@ -166,6 +166,9 @@
 
 
 %changelog
+* Fri Jan  9 2009 Luk???? Tinkl <ltinkl at redhat.com> 4.1.4-1
+- KDE 4.1.4
+
 * Wed Dec 10 2008 Jaroslav Reznik <jreznik at redhat.com> 4.1.3-2
 - fix kopete jabber protocol encrypted message handling (#473412)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdenetwork/F-10/sources,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- sources	12 Nov 2008 00:09:25 -0000	1.66
+++ sources	9 Jan 2009 10:38:39 -0000	1.67
@@ -1 +1 @@
-0a560e1c117049735542a89692480679  kdenetwork-4.1.3.tar.bz2
+c67114c0e28a4e44f1466bf467a7b8dd  kdenetwork-4.1.4.tar.bz2



From ltinkl at fedoraproject.org  Fri Jan  9 10:39:10 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Fri,  9 Jan 2009 10:39:10 +0000 (UTC)
Subject: rpms/kdenetwork/F-9 .cvsignore, 1.53, 1.54 kdenetwork.spec, 1.158, 
	1.159 sources, 1.60, 1.61
Message-ID: <20090109103910.4BDE77011C@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kdenetwork/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10563/F-9

Modified Files:
	.cvsignore kdenetwork.spec sources 
Log Message:
KDE 4.1.4



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdenetwork/F-9/.cvsignore,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- .cvsignore	5 Nov 2008 20:08:01 -0000	1.53
+++ .cvsignore	9 Jan 2009 10:38:39 -0000	1.54
@@ -1 +1 @@
-kdenetwork-4.1.3.tar.bz2
+kdenetwork-4.1.4.tar.bz2


Index: kdenetwork.spec
===================================================================
RCS file: /cvs/extras/rpms/kdenetwork/F-9/kdenetwork.spec,v
retrieving revision 1.158
retrieving revision 1.159
diff -u -r1.158 -r1.159
--- kdenetwork.spec	11 Dec 2008 12:49:40 -0000	1.158
+++ kdenetwork.spec	9 Jan 2009 10:38:40 -0000	1.159
@@ -4,8 +4,8 @@
 Summary: K Desktop Environment - Network Applications
 Name: kdenetwork
 Epoch: 7
-Version: 4.1.3
-Release: 2%{?dist}
+Version: 4.1.4
+Release: 1%{?dist}
 
 License: GPLv2
 Group: Applications/Internet
@@ -166,6 +166,9 @@
 
 
 %changelog
+* Fri Jan  9 2009 Luk???? Tinkl <ltinkl at redhat.com> 4.1.4-1
+- KDE 4.1.4
+
 * Thu Dec 11 2008 Jaroslav Reznik <jreznik at redhat.com> 4.1.3-2
 - fix kopete jabber protocol encrypted message handling (#473412)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdenetwork/F-9/sources,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- sources	5 Nov 2008 20:08:01 -0000	1.60
+++ sources	9 Jan 2009 10:38:40 -0000	1.61
@@ -1 +1 @@
-0a560e1c117049735542a89692480679  kdenetwork-4.1.3.tar.bz2
+c67114c0e28a4e44f1466bf467a7b8dd  kdenetwork-4.1.4.tar.bz2



From pkgdb at fedoraproject.org  Fri Jan  9 10:40:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Jan 2009 10:40:16 +0000
Subject: [pkgdb] djvulibre had acl change status
Message-ID: <20090109104016.9DE2C20831D@bastion.fedora.phx.redhat.com>

thias has set the watchbugzilla acl on djvulibre (Fedora devel) to Approved for rakesh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/djvulibre



From pkgdb at fedoraproject.org  Fri Jan  9 10:40:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Jan 2009 10:40:19 +0000
Subject: [pkgdb] djvulibre had acl change status
Message-ID: <20090109104019.A3A3D208455@bastion.fedora.phx.redhat.com>

thias has set the watchcommits acl on djvulibre (Fedora devel) to Approved for rakesh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/djvulibre



From pkgdb at fedoraproject.org  Fri Jan  9 10:40:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Jan 2009 10:40:22 +0000
Subject: [pkgdb] djvulibre had acl change status
Message-ID: <20090109104022.821D6208458@bastion.fedora.phx.redhat.com>

thias has set the commit acl on djvulibre (Fedora devel) to Approved for rakesh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/djvulibre



From pkgdb at fedoraproject.org  Fri Jan  9 10:40:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Jan 2009 10:40:26 +0000
Subject: [pkgdb] djvulibre had acl change status
Message-ID: <20090109104026.5865E208468@bastion.fedora.phx.redhat.com>

thias has set the approveacls acl on djvulibre (Fedora devel) to Approved for rakesh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/djvulibre



From pkgdb at fedoraproject.org  Fri Jan  9 10:40:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Jan 2009 10:40:38 +0000
Subject: [pkgdb] djvulibre had acl change status
Message-ID: <20090109104038.BE5CC20831D@bastion.fedora.phx.redhat.com>

thias has set the watchbugzilla acl on djvulibre (Fedora 9) to Approved for rakesh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/djvulibre



From pkgdb at fedoraproject.org  Fri Jan  9 10:40:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Jan 2009 10:40:41 +0000
Subject: [pkgdb] djvulibre had acl change status
Message-ID: <20090109104041.8E770208421@bastion.fedora.phx.redhat.com>

thias has set the watchcommits acl on djvulibre (Fedora 9) to Approved for rakesh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/djvulibre



From pkgdb at fedoraproject.org  Fri Jan  9 10:40:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Jan 2009 10:40:45 +0000
Subject: [pkgdb] djvulibre had acl change status
Message-ID: <20090109104045.D6BCC208457@bastion.fedora.phx.redhat.com>

thias has set the commit acl on djvulibre (Fedora 9) to Approved for rakesh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/djvulibre



From pkgdb at fedoraproject.org  Fri Jan  9 10:40:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Jan 2009 10:40:48 +0000
Subject: [pkgdb] djvulibre had acl change status
Message-ID: <20090109104048.1893920846E@bastion.fedora.phx.redhat.com>

thias has set the approveacls acl on djvulibre (Fedora 9) to Approved for rakesh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/djvulibre



From pkgdb at fedoraproject.org  Fri Jan  9 10:40:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Jan 2009 10:40:50 +0000
Subject: [pkgdb] djvulibre had acl change status
Message-ID: <20090109104050.EA6F5208467@bastion.fedora.phx.redhat.com>

thias has set the watchbugzilla acl on djvulibre (Fedora 10) to Approved for rakesh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/djvulibre



From pkgdb at fedoraproject.org  Fri Jan  9 10:40:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Jan 2009 10:40:57 +0000
Subject: [pkgdb] djvulibre had acl change status
Message-ID: <20090109104057.78F8F208468@bastion.fedora.phx.redhat.com>

thias has set the watchcommits acl on djvulibre (Fedora 10) to Approved for rakesh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/djvulibre



From pkgdb at fedoraproject.org  Fri Jan  9 10:41:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Jan 2009 10:41:00 +0000
Subject: [pkgdb] djvulibre had acl change status
Message-ID: <20090109104100.5839B208474@bastion.fedora.phx.redhat.com>

thias has set the commit acl on djvulibre (Fedora 10) to Approved for rakesh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/djvulibre



From pkgdb at fedoraproject.org  Fri Jan  9 10:41:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Jan 2009 10:41:03 +0000
Subject: [pkgdb] djvulibre had acl change status
Message-ID: <20090109104103.6AEF020831D@bastion.fedora.phx.redhat.com>

thias has set the approveacls acl on djvulibre (Fedora 10) to Approved for rakesh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/djvulibre



From stransky at fedoraproject.org  Fri Jan  9 10:43:49 2009
From: stransky at fedoraproject.org (Martin Stransky)
Date: Fri,  9 Jan 2009 10:43:49 +0000 (UTC)
Subject: rpms/nspluginwrapper/devel nspluginwrapper.spec,1.73,1.74
Message-ID: <20090109104349.436D47011C@cvs1.fedora.phx.redhat.com>

Author: stransky

Update of /cvs/pkgs/rpms/nspluginwrapper/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11149

Modified Files:
	nspluginwrapper.spec 
Log Message:
* Thu Jan 9 2009 Martin Stransky <stransky at redhat.com> 1.3.0-2
- Fixed multilib conflicts




Index: nspluginwrapper.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nspluginwrapper/devel/nspluginwrapper.spec,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- nspluginwrapper.spec	9 Jan 2009 10:28:45 -0000	1.73
+++ nspluginwrapper.spec	9 Jan 2009 10:43:18 -0000	1.74
@@ -65,7 +65,7 @@
 Summary:	A compatibility layer for Netscape 4 plugins
 Name:		nspluginwrapper
 Version:	1.3.0
-Release:	1%{?dist}
+Release:	2%{?dist}
 Source0:	%{name}-%{version}%{?svndate:-%{svndate}}.tar.bz2
 Source1:        %{plugin_config_name}.tar.gz
 Source2:        plugin-config.sh.in
@@ -199,6 +199,10 @@
 EOF
 chmod 755 $RPM_BUILD_ROOT%{pkgdir}/nspluginplayer
 
+# Remove conflicting files
+rm -rf $RPM_BUILD_ROOT%{_bindir}/nspluginplayer
+rm -rf $RPM_BUILD_ROOT%{_bindir}/nspluginwrapper
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -230,10 +234,11 @@
 %{_bindir}/mozilla-plugin-config
 %config %{_sysconfdir}/sysconfig/%{name}
 
-%exclude %{_bindir}/nspluginplayer
-%exclude %{_bindir}/nspluginwrapper
 
 %changelog
+* Thu Jan 9 2009 Martin Stransky <stransky at redhat.com> 1.3.0-2
+- Fixed multilib conflicts
+
 * Thu Jan 8 2009 Martin Stransky <stransky at redhat.com> 1.3.0-1
 - Updated to 1.3.0 and removed some fedora build patches
 



From sharkcz at fedoraproject.org  Fri Jan  9 10:46:41 2009
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Fri,  9 Jan 2009 10:46:41 +0000 (UTC)
Subject: rpms/trytond/devel .cvsignore, 1.2, 1.3 sources, 1.2,
	1.3 trytond.spec, 1.1, 1.2
Message-ID: <20090109104641.D83E57011C@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/trytond/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11433

Modified Files:
	.cvsignore sources trytond.spec 
Log Message:
* Thu Jan  8 2009 Dan Hor??k <dan[at]danny.cz> 1.0.2-1
- modularize the openoffice.org support
- update to upstream version 1.0.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/trytond/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	18 Dec 2008 10:37:34 -0000	1.2
+++ .cvsignore	9 Jan 2009 10:46:11 -0000	1.3
@@ -1 +1 @@
-trytond-1.0.1.tar.gz
+trytond-1.0.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/trytond/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	18 Dec 2008 10:37:34 -0000	1.2
+++ sources	9 Jan 2009 10:46:11 -0000	1.3
@@ -1 +1 @@
-c6623abf70994de431115ee0b93c419d  trytond-1.0.1.tar.gz
+e6eed9dbc90961d6ccefb3c70adc47eb  trytond-1.0.2.tar.gz


Index: trytond.spec
===================================================================
RCS file: /cvs/pkgs/rpms/trytond/devel/trytond.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- trytond.spec	18 Dec 2008 10:37:34 -0000	1.1
+++ trytond.spec	9 Jan 2009 10:46:11 -0000	1.2
@@ -3,8 +3,8 @@
 %{!?_initddir: %define _initddir %{_initrddir}}
 
 Name:           trytond
-Version:        1.0.1
-Release:        2%{?dist}
+Version:        1.0.2
+Release:        1%{?dist}
 Summary:        Server for the Tryton application framework
 
 Group:          System Environment/Daemons
@@ -19,7 +19,6 @@
 BuildRequires:  python-devel python-setuptools
 
 Requires:       python-psycopg2 python-lxml python-relatorio mx pydot pytz pyOpenSSL
-Requires:       python-openoffice
 Requires(pre):  shadow-utils
 Requires(post):  chkconfig
 Requires(preun): chkconfig
@@ -43,6 +42,19 @@
 relevant purpose.
 
 
+%package openoffice
+Summary:        OpenOffice.org support for Tryton Server
+Group:          System Environment/Libraries
+Requires:       %{name} = %{version}-%{release}
+Requires:       python-openoffice
+%if 0%{?rhel}
+ExcludeArch:    ppc
+%endif
+
+%description openoffice
+OpenOffice.org support for Tryton Server.
+
+
 %prep
 %setup -q
 
@@ -107,8 +119,15 @@
 %attr(0750,tryton,tryton) %{_localstatedir}/lib/%{name}
 %attr(0750,tryton,tryton) %{_localstatedir}/log/%{name}
 
+%files openoffice
+%defattr(-,root,root,-)
+
 
 %changelog
+* Thu Jan  8 2009 Dan Hor??k <dan[at]danny.cz> 1.0.2-1
+- modularize the openoffice.org support
+- update to upstream version 1.0.2
+
 * Tue Dec  2 2008 Dan Hor??k <dan[at]danny.cz> 1.0.1-2
 - add dependency on python-openoffice
 



From hadess at fedoraproject.org  Fri Jan  9 10:56:16 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Fri,  9 Jan 2009 10:56:16 +0000 (UTC)
Subject: rpms/bluez/devel .cvsignore, 1.20, 1.21 bluez.spec, 1.30,
	1.31 sources, 1.20, 1.21
Message-ID: <20090109105617.05B1B7011C@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/bluez/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12144

Modified Files:
	.cvsignore bluez.spec sources 
Log Message:
* Fri Jan 09 2009 - Bastien Nocera <bnocera at redhat.com> - 4.26-1
- Update to 4.26



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bluez/devel/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- .cvsignore	3 Jan 2009 17:59:23 -0000	1.20
+++ .cvsignore	9 Jan 2009 10:55:46 -0000	1.21
@@ -1 +1 @@
-bluez-4.25.tar.gz
+bluez-4.26.tar.gz


Index: bluez.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bluez/devel/bluez.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- bluez.spec	3 Jan 2009 17:59:23 -0000	1.30
+++ bluez.spec	9 Jan 2009 10:55:46 -0000	1.31
@@ -1,6 +1,6 @@
 Summary: Bluetooth utilities
 Name: bluez
-Version: 4.25
+Version: 4.26
 Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/System
@@ -189,6 +189,9 @@
 %{_libdir}/alsa-lib/*.so
 
 %changelog
+* Fri Jan 09 2009 - Bastien Nocera <bnocera at redhat.com> - 4.26-1
+- Update to 4.26
+
 * Sat Jan 03 2009 - Bastien Nocera <bnocera at redhat.com> - 4.25-1
 - Update to 4.25
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bluez/devel/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources	3 Jan 2009 17:59:23 -0000	1.20
+++ sources	9 Jan 2009 10:55:46 -0000	1.21
@@ -1 +1 @@
-1f5464b23be0774571e60f9012d50280  bluez-4.25.tar.gz
+0ce0f9151fcc887844ce9fa8dc025ed2  bluez-4.26.tar.gz



From sharkcz at fedoraproject.org  Fri Jan  9 11:06:57 2009
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Fri,  9 Jan 2009 11:06:57 +0000 (UTC)
Subject: rpms/trytond/F-10 .cvsignore, 1.2, 1.3 sources, 1.2,
	1.3 trytond.spec, 1.1, 1.2
Message-ID: <20090109110658.06A057011C@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/trytond/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13198

Modified Files:
	.cvsignore sources trytond.spec 
Log Message:
* Thu Jan  8 2009 Dan Hor??k <dan[at]danny.cz> 1.0.2-1
- modularize the openoffice.org support
- update to upstream version 1.0.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/trytond/F-10/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	18 Dec 2008 10:45:56 -0000	1.2
+++ .cvsignore	9 Jan 2009 11:06:25 -0000	1.3
@@ -1 +1 @@
-trytond-1.0.1.tar.gz
+trytond-1.0.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/trytond/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	18 Dec 2008 10:45:56 -0000	1.2
+++ sources	9 Jan 2009 11:06:25 -0000	1.3
@@ -1 +1 @@
-c6623abf70994de431115ee0b93c419d  trytond-1.0.1.tar.gz
+e6eed9dbc90961d6ccefb3c70adc47eb  trytond-1.0.2.tar.gz


Index: trytond.spec
===================================================================
RCS file: /cvs/pkgs/rpms/trytond/F-10/trytond.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- trytond.spec	18 Dec 2008 10:45:56 -0000	1.1
+++ trytond.spec	9 Jan 2009 11:06:25 -0000	1.2
@@ -3,8 +3,8 @@
 %{!?_initddir: %define _initddir %{_initrddir}}
 
 Name:           trytond
-Version:        1.0.1
-Release:        2%{?dist}
+Version:        1.0.2
+Release:        1%{?dist}
 Summary:        Server for the Tryton application framework
 
 Group:          System Environment/Daemons
@@ -19,7 +19,6 @@
 BuildRequires:  python-devel python-setuptools
 
 Requires:       python-psycopg2 python-lxml python-relatorio mx pydot pytz pyOpenSSL
-Requires:       python-openoffice
 Requires(pre):  shadow-utils
 Requires(post):  chkconfig
 Requires(preun): chkconfig
@@ -43,6 +42,19 @@
 relevant purpose.
 
 
+%package openoffice
+Summary:        OpenOffice.org support for Tryton Server
+Group:          System Environment/Libraries
+Requires:       %{name} = %{version}-%{release}
+Requires:       python-openoffice
+%if 0%{?rhel}
+ExcludeArch:    ppc
+%endif
+
+%description openoffice
+OpenOffice.org support for Tryton Server.
+
+
 %prep
 %setup -q
 
@@ -107,8 +119,15 @@
 %attr(0750,tryton,tryton) %{_localstatedir}/lib/%{name}
 %attr(0750,tryton,tryton) %{_localstatedir}/log/%{name}
 
+%files openoffice
+%defattr(-,root,root,-)
+
 
 %changelog
+* Thu Jan  8 2009 Dan Hor??k <dan[at]danny.cz> 1.0.2-1
+- modularize the openoffice.org support
+- update to upstream version 1.0.2
+
 * Tue Dec  2 2008 Dan Hor??k <dan[at]danny.cz> 1.0.1-2
 - add dependency on python-openoffice
 



From sharkcz at fedoraproject.org  Fri Jan  9 11:11:15 2009
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Fri,  9 Jan 2009 11:11:15 +0000 (UTC)
Subject: rpms/trytond/F-9 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 trytond.spec,
	1.1, 1.2
Message-ID: <20090109111115.087AC7011C@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/trytond/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14208

Modified Files:
	.cvsignore sources trytond.spec 
Log Message:
* Thu Jan  8 2009 Dan Hor??k <dan[at]danny.cz> 1.0.2-1
- modularize the openoffice.org support
- update to upstream version 1.0.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/trytond/F-9/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	18 Dec 2008 10:50:20 -0000	1.2
+++ .cvsignore	9 Jan 2009 11:10:44 -0000	1.3
@@ -1 +1 @@
-trytond-1.0.1.tar.gz
+trytond-1.0.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/trytond/F-9/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	18 Dec 2008 10:50:21 -0000	1.2
+++ sources	9 Jan 2009 11:10:44 -0000	1.3
@@ -1 +1 @@
-c6623abf70994de431115ee0b93c419d  trytond-1.0.1.tar.gz
+e6eed9dbc90961d6ccefb3c70adc47eb  trytond-1.0.2.tar.gz


Index: trytond.spec
===================================================================
RCS file: /cvs/pkgs/rpms/trytond/F-9/trytond.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- trytond.spec	18 Dec 2008 10:50:21 -0000	1.1
+++ trytond.spec	9 Jan 2009 11:10:44 -0000	1.2
@@ -3,8 +3,8 @@
 %{!?_initddir: %define _initddir %{_initrddir}}
 
 Name:           trytond
-Version:        1.0.1
-Release:        2%{?dist}
+Version:        1.0.2
+Release:        1%{?dist}
 Summary:        Server for the Tryton application framework
 
 Group:          System Environment/Daemons
@@ -19,7 +19,6 @@
 BuildRequires:  python-devel python-setuptools
 
 Requires:       python-psycopg2 python-lxml python-relatorio mx pydot pytz pyOpenSSL
-Requires:       python-openoffice
 Requires(pre):  shadow-utils
 Requires(post):  chkconfig
 Requires(preun): chkconfig
@@ -43,6 +42,19 @@
 relevant purpose.
 
 
+%package openoffice
+Summary:        OpenOffice.org support for Tryton Server
+Group:          System Environment/Libraries
+Requires:       %{name} = %{version}-%{release}
+Requires:       python-openoffice
+%if 0%{?rhel}
+ExcludeArch:    ppc
+%endif
+
+%description openoffice
+OpenOffice.org support for Tryton Server.
+
+
 %prep
 %setup -q
 
@@ -107,8 +119,15 @@
 %attr(0750,tryton,tryton) %{_localstatedir}/lib/%{name}
 %attr(0750,tryton,tryton) %{_localstatedir}/log/%{name}
 
+%files openoffice
+%defattr(-,root,root,-)
+
 
 %changelog
+* Thu Jan  8 2009 Dan Hor??k <dan[at]danny.cz> 1.0.2-1
+- modularize the openoffice.org support
+- update to upstream version 1.0.2
+
 * Tue Dec  2 2008 Dan Hor??k <dan[at]danny.cz> 1.0.1-2
 - add dependency on python-openoffice
 



From red at fedoraproject.org  Fri Jan  9 11:41:33 2009
From: red at fedoraproject.org (Sandro Mathys)
Date: Fri,  9 Jan 2009 11:41:33 +0000 (UTC)
Subject: rpms/jakarta-commons-compress/devel import.log, NONE,
	1.1 jakarta-commons-compress.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090109114133.D31527011C@cvs1.fedora.phx.redhat.com>

Author: red

Update of /cvs/pkgs/rpms/jakarta-commons-compress/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16875/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log jakarta-commons-compress.spec 
Log Message:
* Fri Jan 09 2009 Sandro Mathys <red at fedoraproject.org> - 0-0.1.20081205svn727209
- initial commit




--- NEW FILE import.log ---
jakarta-commons-compress-0-0_1_20081205svn727209_fc11:HEAD:jakarta-commons-compress-0-0.1.20081205svn727209.fc11.src.rpm:1231501221


--- NEW FILE jakarta-commons-compress.spec ---
%define shortname commons-compress
%define snapshot 20081205
%define revision 727209

Name:           jakarta-%{shortname}
Version:        0
Release:        0.1.%{snapshot}svn%{revision}%{?dist}
Summary:        Java API for working with tar, zip and bzip2 files
Group:          Development/Libraries
License:        ASL 2.0
URL:            http://commons.apache.org/sandbox/compress/
# svn checkout http://svn.apache.org/repos/asf/commons/sandbox/compress/trunk commons-compress
Source0:        %{name}.tar.bz2
BuildArch:      noarch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:     java-devel >= 1:1.6.0
BuildRequires:     jpackage-utils
Requires:          java >= 1:1.6.0
Requires:          jpackage-utils

%description
The code in this component came from Avalon's Excalibur, but originally
from Ant, as far as life in Apache goes. The tar package is originally
Tim Endres' public domain package. The bzip2 package is based on the
work done by Keiron Liddle. It has migrated via:
Ant -> Avalon-Excalibur -> Commons-IO -> Commons-Compress. 


%package javadoc
Summary:           Javadocs for jcalendar
Group:             Documentation
Requires:          %{name} = %{version}-%{release}
Requires:          jpackage-utils

%description javadoc
JCalendar development documentation.


%prep
%setup -q -n %{name}


%build
mkdir target

pushd src
rm -rf test
javac -d ../target `find -name '*.java'`
javadoc -d ../doc `find -name '*.java'`
popd

jar -cf %{name}-%{version}.jar -C target .


%install
rm -rf $RPM_BUILD_ROOT

# jar
install -d $RPM_BUILD_ROOT%{_javadir}
install -m644 %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{shortname}-%{version}.jar
ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{shortname}.jar

# javadoc
install -d $RPM_BUILD_ROOT%{_javadocdir}/%{name}
cp -rp doc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc LICENSE.txt NOTICE.txt
%{_javadir}/%{shortname}.jar
%{_javadir}/%{shortname}-%{version}.jar
%{_javadir}/%{name}.jar
%{_javadir}/%{name}-%{version}.jar

%files javadoc
%defattr(-,root,root,-)
%{_javadocdir}/%{name}


%changelog
* Wed Dec 17 2008 Sandro Mathys <red at fedoraproject.org> - 0-0.1.20081205svn727209
- initial build


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/jakarta-commons-compress/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	18 Dec 2008 00:15:10 -0000	1.1
+++ .cvsignore	9 Jan 2009 11:41:02 -0000	1.2
@@ -0,0 +1 @@
+jakarta-commons-compress.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/jakarta-commons-compress/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	18 Dec 2008 00:15:10 -0000	1.1
+++ sources	9 Jan 2009 11:41:02 -0000	1.2
@@ -0,0 +1 @@
+9cde88237db782a8969b2df7ba3b32de  jakarta-commons-compress.tar.bz2



From than at fedoraproject.org  Fri Jan  9 11:41:54 2009
From: than at fedoraproject.org (Than Ngo)
Date: Fri,  9 Jan 2009 11:41:54 +0000 (UTC)
Subject: rpms/kde-l10n/devel sources,1.18,1.19
Message-ID: <20090109114154.3F66B7011C@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kde-l10n/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17458

Modified Files:
	sources 
Log Message:
respin



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kde-l10n/devel/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources	7 Jan 2009 21:05:52 -0000	1.18
+++ sources	9 Jan 2009 11:41:23 -0000	1.19
@@ -3,7 +3,6 @@
 b12eb1339de5ee9a8a4306d4f78263de  kde-l10n-cs-4.1.96.tar.bz2
 af896b1c81041b40a5b192f6f8843bd0  kde-l10n-csb-4.1.96.tar.bz2
 32dc82514e6583d97541cb43d6cb1e20  kde-l10n-da-4.1.96.tar.bz2
-69928e97897eb9cea1f8304484075b77  kde-l10n-de-4.1.96.tar.bz2
 7d3d8e145046aa433f418a81b6e7095d  kde-l10n-el-4.1.96.tar.bz2
 d29e0ebd2b94044db2572f55efc14c56  kde-l10n-en_GB-4.1.96.tar.bz2
 59f6247d771d39abc48ec803cc0a1cfa  kde-l10n-eo-4.1.96.tar.bz2
@@ -45,3 +44,4 @@
 ec57fe2c312e23c7226094ead62a24b8  kde-l10n-wa-4.1.96.tar.bz2
 33579ad111bd05d5eb4620c7eae22462  kde-l10n-zh_CN-4.1.96.tar.bz2
 61a0356a4dc25f9d388bc6696ac787c8  kde-l10n-zh_TW-4.1.96.tar.bz2
+69928e97897eb9cea1f8304484075b77  kde-l10n-de-4.1.96.tar.bz2



From red at fedoraproject.org  Fri Jan  9 11:43:35 2009
From: red at fedoraproject.org (Sandro Mathys)
Date: Fri,  9 Jan 2009 11:43:35 +0000 (UTC)
Subject: rpms/jakarta-commons-compress/F-9 import.log, NONE,
	1.1 jakarta-commons-compress.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090109114335.8AA067011C@cvs1.fedora.phx.redhat.com>

Author: red

Update of /cvs/pkgs/rpms/jakarta-commons-compress/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17905/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	import.log jakarta-commons-compress.spec 
Log Message:
* Fri Jan 09 2009 Sandro Mathys <red at fedoraproject.org> - 0-0.1.20081205svn727209
- initial commit




--- NEW FILE import.log ---
jakarta-commons-compress-0-0_1_20081205svn727209_fc11:F-9:jakarta-commons-compress-0-0.1.20081205svn727209.fc11.src.rpm:1231501393


--- NEW FILE jakarta-commons-compress.spec ---
%define shortname commons-compress
%define snapshot 20081205
%define revision 727209

Name:           jakarta-%{shortname}
Version:        0
Release:        0.1.%{snapshot}svn%{revision}%{?dist}
Summary:        Java API for working with tar, zip and bzip2 files
Group:          Development/Libraries
License:        ASL 2.0
URL:            http://commons.apache.org/sandbox/compress/
# svn checkout http://svn.apache.org/repos/asf/commons/sandbox/compress/trunk commons-compress
Source0:        %{name}.tar.bz2
BuildArch:      noarch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:     java-devel >= 1:1.6.0
BuildRequires:     jpackage-utils
Requires:          java >= 1:1.6.0
Requires:          jpackage-utils

%description
The code in this component came from Avalon's Excalibur, but originally
from Ant, as far as life in Apache goes. The tar package is originally
Tim Endres' public domain package. The bzip2 package is based on the
work done by Keiron Liddle. It has migrated via:
Ant -> Avalon-Excalibur -> Commons-IO -> Commons-Compress. 


%package javadoc
Summary:           Javadocs for jcalendar
Group:             Documentation
Requires:          %{name} = %{version}-%{release}
Requires:          jpackage-utils

%description javadoc
JCalendar development documentation.


%prep
%setup -q -n %{name}


%build
mkdir target

pushd src
rm -rf test
javac -d ../target `find -name '*.java'`
javadoc -d ../doc `find -name '*.java'`
popd

jar -cf %{name}-%{version}.jar -C target .


%install
rm -rf $RPM_BUILD_ROOT

# jar
install -d $RPM_BUILD_ROOT%{_javadir}
install -m644 %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{shortname}-%{version}.jar
ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{shortname}.jar

# javadoc
install -d $RPM_BUILD_ROOT%{_javadocdir}/%{name}
cp -rp doc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc LICENSE.txt NOTICE.txt
%{_javadir}/%{shortname}.jar
%{_javadir}/%{shortname}-%{version}.jar
%{_javadir}/%{name}.jar
%{_javadir}/%{name}-%{version}.jar

%files javadoc
%defattr(-,root,root,-)
%{_javadocdir}/%{name}


%changelog
* Wed Dec 17 2008 Sandro Mathys <red at fedoraproject.org> - 0-0.1.20081205svn727209
- initial build


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/jakarta-commons-compress/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	18 Dec 2008 00:15:10 -0000	1.1
+++ .cvsignore	9 Jan 2009 11:43:04 -0000	1.2
@@ -0,0 +1 @@
+jakarta-commons-compress.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/jakarta-commons-compress/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	18 Dec 2008 00:15:10 -0000	1.1
+++ sources	9 Jan 2009 11:43:05 -0000	1.2
@@ -0,0 +1 @@
+9cde88237db782a8969b2df7ba3b32de  jakarta-commons-compress.tar.bz2



From red at fedoraproject.org  Fri Jan  9 11:45:44 2009
From: red at fedoraproject.org (Sandro Mathys)
Date: Fri,  9 Jan 2009 11:45:44 +0000 (UTC)
Subject: rpms/jakarta-commons-compress/F-10 import.log, NONE,
	1.1 jakarta-commons-compress.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090109114544.C171D7011C@cvs1.fedora.phx.redhat.com>

Author: red

Update of /cvs/pkgs/rpms/jakarta-commons-compress/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19341/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	import.log jakarta-commons-compress.spec 
Log Message:
* Fri Jan 09 2009 Sandro Mathys <red at fedoraproject.org> - 0-0.1.20081205svn727209
- initial commit




--- NEW FILE import.log ---
jakarta-commons-compress-0-0_1_20081205svn727209_fc11:F-10:jakarta-commons-compress-0-0.1.20081205svn727209.fc11.src.rpm:1231501511


--- NEW FILE jakarta-commons-compress.spec ---
%define shortname commons-compress
%define snapshot 20081205
%define revision 727209

Name:           jakarta-%{shortname}
Version:        0
Release:        0.1.%{snapshot}svn%{revision}%{?dist}
Summary:        Java API for working with tar, zip and bzip2 files
Group:          Development/Libraries
License:        ASL 2.0
URL:            http://commons.apache.org/sandbox/compress/
# svn checkout http://svn.apache.org/repos/asf/commons/sandbox/compress/trunk commons-compress
Source0:        %{name}.tar.bz2
BuildArch:      noarch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:     java-devel >= 1:1.6.0
BuildRequires:     jpackage-utils
Requires:          java >= 1:1.6.0
Requires:          jpackage-utils

%description
The code in this component came from Avalon's Excalibur, but originally
from Ant, as far as life in Apache goes. The tar package is originally
Tim Endres' public domain package. The bzip2 package is based on the
work done by Keiron Liddle. It has migrated via:
Ant -> Avalon-Excalibur -> Commons-IO -> Commons-Compress. 


%package javadoc
Summary:           Javadocs for jcalendar
Group:             Documentation
Requires:          %{name} = %{version}-%{release}
Requires:          jpackage-utils

%description javadoc
JCalendar development documentation.


%prep
%setup -q -n %{name}


%build
mkdir target

pushd src
rm -rf test
javac -d ../target `find -name '*.java'`
javadoc -d ../doc `find -name '*.java'`
popd

jar -cf %{name}-%{version}.jar -C target .


%install
rm -rf $RPM_BUILD_ROOT

# jar
install -d $RPM_BUILD_ROOT%{_javadir}
install -m644 %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{shortname}-%{version}.jar
ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{shortname}.jar

# javadoc
install -d $RPM_BUILD_ROOT%{_javadocdir}/%{name}
cp -rp doc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc LICENSE.txt NOTICE.txt
%{_javadir}/%{shortname}.jar
%{_javadir}/%{shortname}-%{version}.jar
%{_javadir}/%{name}.jar
%{_javadir}/%{name}-%{version}.jar

%files javadoc
%defattr(-,root,root,-)
%{_javadocdir}/%{name}


%changelog
* Wed Dec 17 2008 Sandro Mathys <red at fedoraproject.org> - 0-0.1.20081205svn727209
- initial build


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/jakarta-commons-compress/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	18 Dec 2008 00:15:10 -0000	1.1
+++ .cvsignore	9 Jan 2009 11:45:14 -0000	1.2
@@ -0,0 +1 @@
+jakarta-commons-compress.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/jakarta-commons-compress/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	18 Dec 2008 00:15:10 -0000	1.1
+++ sources	9 Jan 2009 11:45:14 -0000	1.2
@@ -0,0 +1 @@
+9cde88237db782a8969b2df7ba3b32de  jakarta-commons-compress.tar.bz2



From lkundrak at fedoraproject.org  Fri Jan  9 11:53:04 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Fri,  9 Jan 2009 11:53:04 +0000 (UTC)
Subject: comps comps-f11.xml.in,1.52,1.53
Message-ID: <20090109115304.BE4DC7011C@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20126

Modified Files:
	comps-f11.xml.in 
Log Message:
Finish slovak translation, fix a typo


Index: comps-f11.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f11.xml.in,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- comps-f11.xml.in	7 Jan 2009 21:04:45 -0000	1.52
+++ comps-f11.xml.in	9 Jan 2009 11:52:34 -0000	1.53
@@ -4806,7 +4806,7 @@
   </group>
   <group>
     <id>upper-sorbian-support</id>
-    <_name>Upper Sobrbian Support</_name>
+    <_name>Upper Sorbian Support</_name>
     <_description/>
     <default>false</default>
     <uservisible>false</uservisible>



From lkundrak at fedoraproject.org  Fri Jan  9 11:53:16 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Fri,  9 Jan 2009 11:53:16 +0000 (UTC)
Subject: comps/po af.po, 1.13, 1.14 am.po, 1.13, 1.14 ar.po, 1.14, 1.15 as.po,
	1.17, 1.18 bal.po, 1.9, 1.10 be.po, 1.13, 1.14 bg.po, 1.15,
	1.16 bn.po, 1.13, 1.14 bn_IN.po, 1.16, 1.17 bs.po, 1.13,
	1.14 ca.po, 1.15, 1.16 comps.pot, 1.17, 1.18 cs.po, 1.17,
	1.18 cy.po, 1.13, 1.14 da.po, 1.13, 1.14 de.po, 1.32, 1.33 el.po,
	1.17, 1.18 en_GB.po, 1.13, 1.14 es.po, 1.24, 1.25 et.po, 1.16,
	1.17 fa.po, 1.13, 1.14 fi.po, 1.21, 1.22 fr.po, 1.19, 1.20 gl.po,
	1.13, 1.14 gu.po, 1.19, 1.20 he.po, 1.16, 1.17 hi.po, 1.16,
	1.17 hr.po, 1.13, 1.14 hu.po, 1.15, 1.16 hy.po, 1.13, 1.14 id.po,
	1.14, 1.15 ilo.po, 1.13, 1.14 is.po, 1.13, 1.14 it.po, 1.24,
	1.25 ja.po, 1.20, 1.21 ka.po, 1.13, 1.14 kn.po, 1.17, 1.18 ko.po,
	1.21, 1.22 ku.po, 1.13, 1.14 lo.po, 1.13, 1.14 lv.po, 1.16,
	1.17 mai.po, 1.2, 1.3 mk.po, 1.13, 1.14 ml.po, 1.16, 1.17 mr.po,
	1.16, 1.17 ms.po, 1.17, 1.18 my.po, 1.13, 1.14 nb.po, 1.18,
	1.19 ne.po, 1.11, 1.12 nl.po, 1.20, 1.21 no.po, 1.13,
	1.14 nso.po, 1.13, 1.14 or.po, 1.16, 1.17 pa.po, 1.15,
	1.16 pl.po, 1.23, 1.24 pt.po, 1.16, 1.17 pt_BR.po, 1.25,
	1.26 ro.po, 1.13, 1.14 ru.po, 1.20, 1.21 si.po, 1.13, 1.14 sk.po,
	1.18, 1.19 sl.po, 1.13, 1.14 sq.po, 1.15, 1.16 sr.po, 1.21,
	1.22 sr@Latn.po, 1.20, 1.21 sr@latin.po, 1.21, 1.22 sv.po, 1.17,
	1.18 ta.po, 1.16, 1.17 te.po, 1.16, 1.17 tg.po, 1.10, 1.11 th.po,
	1.13, 1.14 tl.po, 1.13, 1.14 tr.po, 1.13, 1.14 uk.po, 1.14,
	1.15 ur.po, 1.13, 1.14 vi.po, 1.13, 1.14 zh_CN.po, 1.21,
	1.22 zh_TW.po, 1.21, 1.22 zu.po, 1.13, 1.14
Message-ID: <20090109115316.2D9987011C@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/comps/po
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20126/po

Modified Files:
	af.po am.po ar.po as.po bal.po be.po bg.po bn.po bn_IN.po 
	bs.po ca.po comps.pot cs.po cy.po da.po de.po el.po en_GB.po 
	es.po et.po fa.po fi.po fr.po gl.po gu.po he.po hi.po hr.po 
	hu.po hy.po id.po ilo.po is.po it.po ja.po ka.po kn.po ko.po 
	ku.po lo.po lv.po mai.po mk.po ml.po mr.po ms.po my.po nb.po 
	ne.po nl.po no.po nso.po or.po pa.po pl.po pt.po pt_BR.po 
	ro.po ru.po si.po sk.po sl.po sq.po sr.po sr at Latn.po 
	sr at latin.po sv.po ta.po te.po tg.po th.po tl.po tr.po uk.po 
	ur.po vi.po zh_CN.po zh_TW.po zu.po 
Log Message:
Finish slovak translation, fix a typo


Index: af.po
===================================================================
RCS file: /cvs/pkgs/comps/po/af.po,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- af.po	22 Dec 2008 20:51:50 -0000	1.13
+++ af.po	9 Jan 2009 11:52:34 -0000	1.14
@@ -1445,7 +1445,7 @@
 
 #: ../comps-f11.xml.in.h:215
 #, fuzzy
-msgid "Upper Sobrbian Support"
+msgid "Upper Sorbian Support"
 msgstr "Serwiese taalsteun"
 
 #: ../comps-el4.xml.in.h:3 ../comps-el5.xml.in.h:3


Index: am.po
===================================================================
RCS file: /cvs/pkgs/comps/po/am.po,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- am.po	22 Dec 2008 20:51:50 -0000	1.13
+++ am.po	9 Jan 2009 11:52:35 -0000	1.14
@@ -1372,7 +1372,7 @@
 
 #: ../comps-f11.xml.in.h:215
 #, fuzzy
-msgid "Upper Sobrbian Support"
+msgid "Upper Sorbian Support"
 msgstr "????????????????????? ?????????"
 
 #: ../comps-el4.xml.in.h:3 ../comps-el5.xml.in.h:3


Index: ar.po
===================================================================
RCS file: /cvs/pkgs/comps/po/ar.po,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- ar.po	22 Dec 2008 20:51:50 -0000	1.14
+++ ar.po	9 Jan 2009 11:52:35 -0000	1.15
@@ -1376,7 +1376,7 @@
 
 #: ../comps-f11.xml.in.h:215
 #, fuzzy
-msgid "Upper Sobrbian Support"
+msgid "Upper Sorbian Support"
 msgstr "?????? ????????????????"
 
 #: ../comps-el4.xml.in.h:3 ../comps-el5.xml.in.h:3


Index: as.po
===================================================================
RCS file: /cvs/pkgs/comps/po/as.po,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- as.po	22 Dec 2008 20:51:50 -0000	1.17
+++ as.po	9 Jan 2009 11:52:35 -0000	1.18
@@ -1328,7 +1328,7 @@
 
 #: ../comps-f11.xml.in.h:215
 #, fuzzy
-msgid "Upper Sobrbian Support"
+msgid "Upper Sorbian Support"
 msgstr "??????????????????????????? ??????????????? ??????????????????"
 
 #: ../comps-el4.xml.in.h:3 ../comps-el5.xml.in.h:3


Index: bal.po
===================================================================
RCS file: /cvs/pkgs/comps/po/bal.po,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- bal.po	22 Dec 2008 20:51:50 -0000	1.9
+++ bal.po	9 Jan 2009 11:52:35 -0000	1.10
@@ -1330,7 +1330,7 @@
 
 #: ../comps-f11.xml.in.h:215
 #, fuzzy
-msgid "Upper Sobrbian Support"
+msgid "Upper Sorbian Support"
 msgstr "???????? ??????????"
 
 #: ../comps-el4.xml.in.h:3 ../comps-el5.xml.in.h:3


Index: be.po
===================================================================
RCS file: /cvs/pkgs/comps/po/be.po,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- be.po	22 Dec 2008 20:51:51 -0000	1.13
+++ be.po	9 Jan 2009 11:52:35 -0000	1.14
@@ -1409,7 +1409,7 @@
 
 #: ../comps-f11.xml.in.h:215
 #, fuzzy
-msgid "Upper Sobrbian Support"
+msgid "Upper Sorbian Support"
 msgstr "?????????????????? ???????????????? ????????"
 
 #: ../comps-el4.xml.in.h:3 ../comps-el5.xml.in.h:3


Index: bg.po
===================================================================
RCS file: /cvs/pkgs/comps/po/bg.po,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- bg.po	22 Dec 2008 20:51:51 -0000	1.15
+++ bg.po	9 Jan 2009 11:52:35 -0000	1.16
@@ -1353,7 +1353,7 @@
 
 #: ../comps-f11.xml.in.h:215
 #, fuzzy
-msgid "Upper Sobrbian Support"
+msgid "Upper Sorbian Support"
 msgstr "?????????????????? ???? ??????????????"
 
 #: ../comps-el4.xml.in.h:3 ../comps-el5.xml.in.h:3


Index: bn.po
===================================================================
RCS file: /cvs/pkgs/comps/po/bn.po,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- bn.po	22 Dec 2008 20:51:51 -0000	1.13
+++ bn.po	9 Jan 2009 11:52:35 -0000	1.14
@@ -1416,7 +1416,7 @@
 
 #: ../comps-f11.xml.in.h:215
 #, fuzzy
-msgid "Upper Sobrbian Support"
+msgid "Upper Sorbian Support"
 msgstr "????????????????????? ??????????????????????????? ???????????????"
 
 #: ../comps-el4.xml.in.h:3 ../comps-el5.xml.in.h:3


Index: bn_IN.po
===================================================================
RCS file: /cvs/pkgs/comps/po/bn_IN.po,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- bn_IN.po	22 Dec 2008 20:51:51 -0000	1.16
+++ bn_IN.po	9 Jan 2009 11:52:35 -0000	1.17
@@ -1403,7 +1403,7 @@
 
 #: ../comps-f11.xml.in.h:215
 #, fuzzy
-msgid "Upper Sobrbian Support"
+msgid "Upper Sorbian Support"
 msgstr "??????????????????????????? ???????????? ??????????????????????????? ??????????????????"
 
 #: ../comps-el4.xml.in.h:3 ../comps-el5.xml.in.h:3


Index: bs.po
===================================================================
RCS file: /cvs/pkgs/comps/po/bs.po,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- bs.po	22 Dec 2008 20:51:51 -0000	1.13
+++ bs.po	9 Jan 2009 11:52:35 -0000	1.14
@@ -1375,7 +1375,7 @@
 
 #: ../comps-f11.xml.in.h:215
 #, fuzzy
-msgid "Upper Sobrbian Support"
+msgid "Upper Sorbian Support"
 msgstr "Podr??ka za srpski"
 
 #: ../comps-el4.xml.in.h:3 ../comps-el5.xml.in.h:3


Index: ca.po
===================================================================
RCS file: /cvs/pkgs/comps/po/ca.po,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- ca.po	22 Dec 2008 20:51:51 -0000	1.15
+++ ca.po	9 Jan 2009 11:52:35 -0000	1.16
@@ -1369,7 +1369,7 @@
 
 #: ../comps-f11.xml.in.h:215
 #, fuzzy
-msgid "Upper Sobrbian Support"
+msgid "Upper Sorbian Support"
 msgstr "Suport per al serbi"
 
 #: ../comps-el4.xml.in.h:3 ../comps-el5.xml.in.h:3


Index: comps.pot
===================================================================
RCS file: /cvs/pkgs/comps/po/comps.pot,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- comps.pot	22 Dec 2008 20:51:51 -0000	1.17
+++ comps.pot	9 Jan 2009 11:52:35 -0000	1.18
@@ -1276,7 +1276,7 @@
 msgstr ""
 
 #: ../comps-f11.xml.in.h:215
-msgid "Upper Sobrbian Support"
+msgid "Upper Sorbian Support"
 msgstr ""
 
 #: ../comps-el4.xml.in.h:3 ../comps-el5.xml.in.h:3


Index: cs.po
===================================================================
RCS file: /cvs/pkgs/comps/po/cs.po,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- cs.po	22 Dec 2008 20:51:51 -0000	1.17
+++ cs.po	9 Jan 2009 11:52:36 -0000	1.18
@@ -1344,7 +1344,7 @@
 
 #: ../comps-f11.xml.in.h:215
 #, fuzzy
-msgid "Upper Sobrbian Support"
+msgid "Upper Sorbian Support"
 msgstr "Srbsk?? podpora"
 
 #: ../comps-el4.xml.in.h:3 ../comps-el5.xml.in.h:3


Index: cy.po
===================================================================
RCS file: /cvs/pkgs/comps/po/cy.po,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- cy.po	22 Dec 2008 20:51:51 -0000	1.13
+++ cy.po	9 Jan 2009 11:52:36 -0000	1.14
@@ -1397,7 +1397,7 @@
 
 #: ../comps-f11.xml.in.h:215
 #, fuzzy
-msgid "Upper Sobrbian Support"
+msgid "Upper Sorbian Support"
 msgstr "Cynhaliaeth Serbeg"
 
 #: ../comps-el4.xml.in.h:3 ../comps-el5.xml.in.h:3


Index: da.po
===================================================================
RCS file: /cvs/pkgs/comps/po/da.po,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- da.po	22 Dec 2008 20:51:51 -0000	1.13
+++ da.po	9 Jan 2009 11:52:36 -0000	1.14
@@ -1388,7 +1388,7 @@
 
 #: ../comps-f11.xml.in.h:215
 #, fuzzy
-msgid "Upper Sobrbian Support"
+msgid "Upper Sorbian Support"
 msgstr "Underst??ttelse for serbisk"
 
 #: ../comps-el4.xml.in.h:3 ../comps-el5.xml.in.h:3


Index: de.po
===================================================================
RCS file: /cvs/pkgs/comps/po/de.po,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- de.po	28 Dec 2008 14:46:41 -0000	1.32
+++ de.po	9 Jan 2009 11:52:36 -0000	1.33
@@ -1936,7 +1936,7 @@
 
 #: ../comps-f11.xml.in.h:215
 #, fuzzy
-msgid "Upper Sobrbian Support"
+msgid "Upper Sorbian Support"
 msgstr "Unterst??tzung f??r Serbisch"
 
 #: ../comps-el4.xml.in.h:3


Index: el.po
===================================================================
RCS file: /cvs/pkgs/comps/po/el.po,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- el.po	22 Dec 2008 20:51:51 -0000	1.17
+++ el.po	9 Jan 2009 11:52:36 -0000	1.18
@@ -1364,7 +1364,7 @@
 
 #: ../comps-f11.xml.in.h:215
 #, fuzzy
-msgid "Upper Sobrbian Support"
+msgid "Upper Sorbian Support"
 msgstr "???????????????????? ????????????????"
 
 #: ../comps-el4.xml.in.h:3 ../comps-el5.xml.in.h:3


Index: en_GB.po
===================================================================
RCS file: /cvs/pkgs/comps/po/en_GB.po,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- en_GB.po	22 Dec 2008 20:51:51 -0000	1.13
+++ en_GB.po	9 Jan 2009 11:52:36 -0000	1.14
@@ -1386,7 +1386,7 @@
 
 #: ../comps-f11.xml.in.h:215
 #, fuzzy
-msgid "Upper Sobrbian Support"
+msgid "Upper Sorbian Support"
 msgstr "Serbian Support"
 
 #: ../comps-el4.xml.in.h:3 ../comps-el5.xml.in.h:3


Index: es.po
===================================================================
RCS file: /cvs/pkgs/comps/po/es.po,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- es.po	22 Dec 2008 20:51:51 -0000	1.24
+++ es.po	9 Jan 2009 11:52:36 -0000	1.25
@@ -1357,7 +1357,7 @@
 
 #: ../comps-f11.xml.in.h:215
 #, fuzzy
-msgid "Upper Sobrbian Support"
+msgid "Upper Sorbian Support"
 msgstr "Soporte para serbio"
 
 #: ../comps-el4.xml.in.h:3 ../comps-el5.xml.in.h:3


Index: et.po
===================================================================
RCS file: /cvs/pkgs/comps/po/et.po,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- et.po	22 Dec 2008 20:51:52 -0000	1.16
+++ et.po	9 Jan 2009 11:52:36 -0000	1.17
@@ -1331,7 +1331,7 @@
 
 #: ../comps-f11.xml.in.h:215
 #, fuzzy
-msgid "Upper Sobrbian Support"
+msgid "Upper Sorbian Support"
 msgstr "Serbia keele tugi"
 
 #: ../comps-el4.xml.in.h:3 ../comps-el5.xml.in.h:3


Index: fa.po
===================================================================
RCS file: /cvs/pkgs/comps/po/fa.po,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- fa.po	22 Dec 2008 20:51:52 -0000	1.13
+++ fa.po	9 Jan 2009 11:52:36 -0000	1.14
@@ -1422,7 +1422,7 @@
 
 #: ../comps-f11.xml.in.h:215
 #, fuzzy
-msgid "Upper Sobrbian Support"
+msgid "Upper Sorbian Support"
 msgstr "???????????????? ????????"
 
 #: ../comps-el4.xml.in.h:3 ../comps-el5.xml.in.h:3


Index: fi.po
===================================================================
RCS file: /cvs/pkgs/comps/po/fi.po,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- fi.po	22 Dec 2008 20:51:52 -0000	1.21
+++ fi.po	9 Jan 2009 11:52:36 -0000	1.22
@@ -1343,7 +1343,7 @@
 
 #: ../comps-f11.xml.in.h:215
 #, fuzzy
-msgid "Upper Sobrbian Support"
+msgid "Upper Sorbian Support"
 msgstr "Serbian kielituki"
 
 #: ../comps-el4.xml.in.h:3 ../comps-el5.xml.in.h:3


Index: fr.po
===================================================================
RCS file: /cvs/pkgs/comps/po/fr.po,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- fr.po	22 Dec 2008 20:51:52 -0000	1.19
+++ fr.po	9 Jan 2009 11:52:37 -0000	1.20
@@ -1374,7 +1374,7 @@
 
 #: ../comps-f11.xml.in.h:215
 #, fuzzy
-msgid "Upper Sobrbian Support"
+msgid "Upper Sorbian Support"
 msgstr "Prise en charge du serbe"
 
 #: ../comps-el4.xml.in.h:3 ../comps-el5.xml.in.h:3


Index: gl.po
===================================================================
RCS file: /cvs/pkgs/comps/po/gl.po,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- gl.po	22 Dec 2008 20:51:52 -0000	1.13
+++ gl.po	9 Jan 2009 11:52:37 -0000	1.14
@@ -1397,7 +1397,7 @@
 
 #: ../comps-f11.xml.in.h:215
 #, fuzzy
-msgid "Upper Sobrbian Support"
+msgid "Upper Sorbian Support"
 msgstr "Soporte para o serbio"
 
 #: ../comps-el4.xml.in.h:3 ../comps-el5.xml.in.h:3


Index: gu.po
===================================================================
RCS file: /cvs/pkgs/comps/po/gu.po,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- gu.po	22 Dec 2008 20:51:52 -0000	1.19
+++ gu.po	9 Jan 2009 11:52:37 -0000	1.20
@@ -1328,7 +1328,7 @@
 
 #: ../comps-f11.xml.in.h:215
 #, fuzzy
-msgid "Upper Sobrbian Support"
+msgid "Upper Sorbian Support"
 msgstr "???????????????????????? ????????????"
 
 #: ../comps-el4.xml.in.h:3 ../comps-el5.xml.in.h:3


Index: he.po
===================================================================
RCS file: /cvs/pkgs/comps/po/he.po,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- he.po	22 Dec 2008 20:51:52 -0000	1.16
+++ he.po	9 Jan 2009 11:52:37 -0000	1.17
@@ -1311,7 +1311,7 @@
 
 #: ../comps-f11.xml.in.h:215
 #, fuzzy
-msgid "Upper Sobrbian Support"
+msgid "Upper Sorbian Support"
 msgstr "?????????? ????????????"
 
 #: ../comps-el4.xml.in.h:3 ../comps-el5.xml.in.h:3


Index: hi.po
===================================================================
RCS file: /cvs/pkgs/comps/po/hi.po,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- hi.po	22 Dec 2008 20:51:52 -0000	1.16
+++ hi.po	9 Jan 2009 11:52:37 -0000	1.17
@@ -1323,7 +1323,7 @@
 
 #: ../comps-f11.xml.in.h:215
 #, fuzzy
-msgid "Upper Sobrbian Support"
+msgid "Upper Sorbian Support"
 msgstr "????????????????????? ??????????????????"
 
 #: ../comps-el4.xml.in.h:3 ../comps-el5.xml.in.h:3


Index: hr.po
===================================================================
RCS file: /cvs/pkgs/comps/po/hr.po,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- hr.po	22 Dec 2008 20:51:52 -0000	1.13
+++ hr.po	9 Jan 2009 11:52:37 -0000	1.14
@@ -1372,7 +1372,7 @@
 
 #: ../comps-f11.xml.in.h:215
 #, fuzzy
-msgid "Upper Sobrbian Support"
+msgid "Upper Sorbian Support"
 msgstr "Podr??ka za srpski"
 
 #: ../comps-el4.xml.in.h:3 ../comps-el5.xml.in.h:3


Index: hu.po
===================================================================
RCS file: /cvs/pkgs/comps/po/hu.po,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- hu.po	22 Dec 2008 20:51:52 -0000	1.15
+++ hu.po	9 Jan 2009 11:52:37 -0000	1.16
@@ -1339,7 +1339,7 @@
 
 #: ../comps-f11.xml.in.h:215
 #, fuzzy
-msgid "Upper Sobrbian Support"
+msgid "Upper Sorbian Support"
 msgstr "Szerb t??mogat??s"
 
 #: ../comps-el4.xml.in.h:3 ../comps-el5.xml.in.h:3


Index: hy.po
===================================================================
RCS file: /cvs/pkgs/comps/po/hy.po,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- hy.po	22 Dec 2008 20:51:52 -0000	1.13
+++ hy.po	9 Jan 2009 11:52:37 -0000	1.14
@@ -1351,7 +1351,7 @@
 
 #: ../comps-f11.xml.in.h:215
 #, fuzzy
-msgid "Upper Sobrbian Support"
+msgid "Upper Sorbian Support"
 msgstr "?????????????????????? ????????????????????"
 
 #: ../comps-el4.xml.in.h:3 ../comps-el5.xml.in.h:3


Index: id.po
===================================================================
RCS file: /cvs/pkgs/comps/po/id.po,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- id.po	22 Dec 2008 20:51:53 -0000	1.14
+++ id.po	9 Jan 2009 11:52:37 -0000	1.15
@@ -1359,7 +1359,7 @@
 
 #: ../comps-f11.xml.in.h:215
 #, fuzzy
-msgid "Upper Sobrbian Support"
+msgid "Upper Sorbian Support"
 msgstr "Dukungan Serbia"
 
 #: ../comps-el4.xml.in.h:3 ../comps-el5.xml.in.h:3


Index: ilo.po
===================================================================
RCS file: /cvs/pkgs/comps/po/ilo.po,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- ilo.po	22 Dec 2008 20:51:53 -0000	1.13
+++ ilo.po	9 Jan 2009 11:52:38 -0000	1.14
@@ -1321,7 +1321,7 @@
 
 #: ../comps-f11.xml.in.h:215
 #, fuzzy
-msgid "Upper Sobrbian Support"
+msgid "Upper Sorbian Support"
 msgstr "Panagsayangkat ti Serbio"
 
 #: ../comps-el4.xml.in.h:3 ../comps-el5.xml.in.h:3


Index: is.po
===================================================================
RCS file: /cvs/pkgs/comps/po/is.po,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- is.po	22 Dec 2008 20:51:53 -0000	1.13
+++ is.po	9 Jan 2009 11:52:38 -0000	1.14
@@ -1355,7 +1355,7 @@
 
 #: ../comps-f11.xml.in.h:215
 #, fuzzy
-msgid "Upper Sobrbian Support"
+msgid "Upper Sorbian Support"
 msgstr "Serbneska"
 
 #: ../comps-el4.xml.in.h:3 ../comps-el5.xml.in.h:3


Index: it.po
===================================================================
RCS file: /cvs/pkgs/comps/po/it.po,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- it.po	22 Dec 2008 20:51:53 -0000	1.24
+++ it.po	9 Jan 2009 11:52:38 -0000	1.25
@@ -1356,7 +1356,7 @@
 
 #: ../comps-f11.xml.in.h:215
 #, fuzzy
-msgid "Upper Sobrbian Support"
+msgid "Upper Sorbian Support"
 msgstr "Supporto per il serbo"
 
 #: ../comps-el4.xml.in.h:3 ../comps-el5.xml.in.h:3


Index: ja.po
===================================================================
RCS file: /cvs/pkgs/comps/po/ja.po,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- ja.po	22 Dec 2008 20:51:53 -0000	1.20
+++ ja.po	9 Jan 2009 11:52:38 -0000	1.21
@@ -1353,7 +1353,7 @@
 
 #: ../comps-f11.xml.in.h:215
 #, fuzzy
-msgid "Upper Sobrbian Support"
+msgid "Upper Sorbian Support"
 msgstr "??????????????????????????????"
 
 #: ../comps-el4.xml.in.h:3 ../comps-el5.xml.in.h:3


Index: ka.po
===================================================================
RCS file: /cvs/pkgs/comps/po/ka.po,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- ka.po	22 Dec 2008 20:51:53 -0000	1.13
+++ ka.po	9 Jan 2009 11:52:38 -0000	1.14
@@ -1330,7 +1330,7 @@
 
 #: ../comps-f11.xml.in.h:215
 #, fuzzy
-msgid "Upper Sobrbian Support"
+msgid "Upper Sorbian Support"
 msgstr "???????????????????????? ??????????????????????????????"
 
 #: ../comps-el4.xml.in.h:3 ../comps-el5.xml.in.h:3


Index: kn.po
===================================================================
RCS file: /cvs/pkgs/comps/po/kn.po,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- kn.po	22 Dec 2008 20:51:53 -0000	1.17
+++ kn.po	9 Jan 2009 11:52:38 -0000	1.18
@@ -1331,7 +1331,7 @@
 
 #: ../comps-f11.xml.in.h:215
 #, fuzzy
-msgid "Upper Sobrbian Support"
+msgid "Upper Sorbian Support"
 msgstr "???????????????????????? ???????????????"
 
 #: ../comps-el4.xml.in.h:3 ../comps-el5.xml.in.h:3


Index: ko.po
===================================================================
RCS file: /cvs/pkgs/comps/po/ko.po,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- ko.po	7 Jan 2009 00:48:59 -0000	1.21
+++ ko.po	9 Jan 2009 11:52:38 -0000	1.22
@@ -1310,7 +1310,7 @@
 
 #: ../comps-f11.xml.in.h:215
 #, fuzzy
-msgid "Upper Sobrbian Support"
+msgid "Upper Sorbian Support"
 msgstr "??????????????? ??????"
 
 #: ../comps-el4.xml.in.h:3 ../comps-el5.xml.in.h:3


Index: ku.po
===================================================================
RCS file: /cvs/pkgs/comps/po/ku.po,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- ku.po	22 Dec 2008 20:51:53 -0000	1.13
+++ ku.po	9 Jan 2009 11:52:38 -0000	1.14
@@ -1275,7 +1275,7 @@
 msgstr ""
 
 #: ../comps-f11.xml.in.h:215
-msgid "Upper Sobrbian Support"
+msgid "Upper Sorbian Support"
 msgstr ""
 
 #: ../comps-el4.xml.in.h:3 ../comps-el5.xml.in.h:3


Index: lo.po
===================================================================
RCS file: /cvs/pkgs/comps/po/lo.po,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- lo.po	22 Dec 2008 20:51:53 -0000	1.13
+++ lo.po	9 Jan 2009 11:52:39 -0000	1.14
@@ -1275,7 +1275,7 @@
 msgstr ""
 
 #: ../comps-f11.xml.in.h:215
-msgid "Upper Sobrbian Support"
+msgid "Upper Sorbian Support"
 msgstr ""
 
 #: ../comps-el4.xml.in.h:3 ../comps-el5.xml.in.h:3


Index: lv.po
===================================================================
RCS file: /cvs/pkgs/comps/po/lv.po,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- lv.po	22 Dec 2008 20:51:53 -0000	1.16
+++ lv.po	9 Jan 2009 11:52:39 -0000	1.17
@@ -1327,7 +1327,7 @@
 
 #: ../comps-f11.xml.in.h:215
 #, fuzzy
-msgid "Upper Sobrbian Support"
+msgid "Upper Sorbian Support"
 msgstr "Serbu valodas atbalsts"
 
 #: ../comps-el4.xml.in.h:3 ../comps-el5.xml.in.h:3


Index: mai.po
===================================================================
RCS file: /cvs/pkgs/comps/po/mai.po,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mai.po	22 Dec 2008 20:51:54 -0000	1.2
+++ mai.po	9 Jan 2009 11:52:39 -0000	1.3
@@ -1313,7 +1313,7 @@
 
 #: ../comps-f11.xml.in.h:215
 #, fuzzy
-msgid "Upper Sobrbian Support"
+msgid "Upper Sorbian Support"
 msgstr "????????????????????? ??????????????????"
 
 #: ../comps-el4.xml.in.h:3 ../comps-el5.xml.in.h:3


Index: mk.po
===================================================================
RCS file: /cvs/pkgs/comps/po/mk.po,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- mk.po	22 Dec 2008 20:51:54 -0000	1.13
+++ mk.po	9 Jan 2009 11:52:39 -0000	1.14
@@ -1397,7 +1397,7 @@
 
 #: ../comps-f11.xml.in.h:215
 #, fuzzy
-msgid "Upper Sobrbian Support"
+msgid "Upper Sorbian Support"
 msgstr "???????????????? ???? ????????????"
 
 #: ../comps-el4.xml.in.h:3 ../comps-el5.xml.in.h:3


Index: ml.po
===================================================================
RCS file: /cvs/pkgs/comps/po/ml.po,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- ml.po	22 Dec 2008 20:51:54 -0000	1.16
+++ ml.po	9 Jan 2009 11:52:39 -0000	1.17
@@ -1333,7 +1333,7 @@
 
 #: ../comps-f11.xml.in.h:215
 #, fuzzy
-msgid "Upper Sobrbian Support"
+msgid "Upper Sorbian Support"
 msgstr "?????????????????????????????? ?????????????????????"
 
 #: ../comps-el4.xml.in.h:3 ../comps-el5.xml.in.h:3


Index: mr.po
===================================================================
RCS file: /cvs/pkgs/comps/po/mr.po,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- mr.po	22 Dec 2008 20:51:54 -0000	1.16
+++ mr.po	9 Jan 2009 11:52:39 -0000	1.17
@@ -1315,7 +1315,7 @@
 
 #: ../comps-f11.xml.in.h:215
 #, fuzzy
-msgid "Upper Sobrbian Support"
+msgid "Upper Sorbian Support"
 msgstr "????????????????????? ??????????????????"
 
 #: ../comps-el4.xml.in.h:3 ../comps-el5.xml.in.h:3


Index: ms.po
===================================================================
RCS file: /cvs/pkgs/comps/po/ms.po,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- ms.po	22 Dec 2008 20:51:54 -0000	1.17
+++ ms.po	9 Jan 2009 11:52:39 -0000	1.18
@@ -1381,7 +1381,7 @@
 
 #: ../comps-f11.xml.in.h:215
 #, fuzzy
-msgid "Upper Sobrbian Support"
+msgid "Upper Sorbian Support"
 msgstr "Sokongan Serbia"
 
 #: ../comps-el4.xml.in.h:3 ../comps-el5.xml.in.h:3


Index: my.po
===================================================================
RCS file: /cvs/pkgs/comps/po/my.po,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- my.po	22 Dec 2008 20:51:54 -0000	1.13
+++ my.po	9 Jan 2009 11:52:39 -0000	1.14
@@ -1275,7 +1275,7 @@
 msgstr ""
 
 #: ../comps-f11.xml.in.h:215
-msgid "Upper Sobrbian Support"
+msgid "Upper Sorbian Support"
 msgstr ""
 
 #: ../comps-el4.xml.in.h:3 ../comps-el5.xml.in.h:3


Index: nb.po
===================================================================
RCS file: /cvs/pkgs/comps/po/nb.po,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- nb.po	22 Dec 2008 20:51:54 -0000	1.18
+++ nb.po	9 Jan 2009 11:52:39 -0000	1.19
@@ -1339,7 +1339,7 @@
 
 #: ../comps-f11.xml.in.h:215
 #, fuzzy
-msgid "Upper Sobrbian Support"
+msgid "Upper Sorbian Support"
 msgstr "St??tte for serbisk"
 
 #: ../comps-el4.xml.in.h:3 ../comps-el5.xml.in.h:3


Index: ne.po
===================================================================
RCS file: /cvs/pkgs/comps/po/ne.po,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ne.po	22 Dec 2008 20:51:54 -0000	1.11
+++ ne.po	9 Jan 2009 11:52:39 -0000	1.12
@@ -1335,7 +1335,7 @@
 
 #: ../comps-f11.xml.in.h:215
 #, fuzzy
-msgid "Upper Sobrbian Support"
+msgid "Upper Sorbian Support"
 msgstr "??????????????????????????? ??????????????????"
 
 #: ../comps-el4.xml.in.h:3 ../comps-el5.xml.in.h:3


Index: nl.po
===================================================================
RCS file: /cvs/pkgs/comps/po/nl.po,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- nl.po	22 Dec 2008 20:51:54 -0000	1.20
+++ nl.po	9 Jan 2009 11:52:39 -0000	1.21
@@ -1356,7 +1356,7 @@
 
 #: ../comps-f11.xml.in.h:215
 #, fuzzy
-msgid "Upper Sobrbian Support"
+msgid "Upper Sorbian Support"
 msgstr "Ondersteuning voor Servisch"
 
 #: ../comps-el4.xml.in.h:3 ../comps-el5.xml.in.h:3


Index: no.po
===================================================================
RCS file: /cvs/pkgs/comps/po/no.po,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- no.po	22 Dec 2008 20:51:55 -0000	1.13
+++ no.po	9 Jan 2009 11:52:39 -0000	1.14
@@ -1395,7 +1395,7 @@
 
 #: ../comps-f11.xml.in.h:215
 #, fuzzy
-msgid "Upper Sobrbian Support"
+msgid "Upper Sorbian Support"
 msgstr "St??tte for serbisk"
 
 #: ../comps-el4.xml.in.h:3 ../comps-el5.xml.in.h:3


Index: nso.po
===================================================================
RCS file: /cvs/pkgs/comps/po/nso.po,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- nso.po	22 Dec 2008 20:51:55 -0000	1.13
+++ nso.po	9 Jan 2009 11:52:40 -0000	1.14
@@ -1452,7 +1452,7 @@
 
 #: ../comps-f11.xml.in.h:215
 #, fuzzy
-msgid "Upper Sobrbian Support"
+msgid "Upper Sorbian Support"
 msgstr "Thekgo ya se-Serbia"
 
 #: ../comps-el4.xml.in.h:3 ../comps-el5.xml.in.h:3


Index: or.po
===================================================================
RCS file: /cvs/pkgs/comps/po/or.po,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- or.po	22 Dec 2008 20:51:55 -0000	1.16
+++ or.po	9 Jan 2009 11:52:40 -0000	1.17
@@ -1351,7 +1351,7 @@
 
 #: ../comps-f11.xml.in.h:215
 #, fuzzy
-msgid "Upper Sobrbian Support"
+msgid "Upper Sorbian Support"
 msgstr "??????????????????????????? ??????????????????"
 
 #: ../comps-el4.xml.in.h:3 ../comps-el5.xml.in.h:3


Index: pa.po
===================================================================
RCS file: /cvs/pkgs/comps/po/pa.po,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- pa.po	22 Dec 2008 20:51:55 -0000	1.15
+++ pa.po	9 Jan 2009 11:52:40 -0000	1.16
@@ -1340,7 +1340,7 @@
 
 #: ../comps-f11.xml.in.h:215
 #, fuzzy
-msgid "Upper Sobrbian Support"
+msgid "Upper Sorbian Support"
 msgstr "?????????????????? ??????????????????"
 
 #: ../comps-el4.xml.in.h:3 ../comps-el5.xml.in.h:3


Index: pl.po
===================================================================
RCS file: /cvs/pkgs/comps/po/pl.po,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- pl.po	22 Dec 2008 23:40:10 -0000	1.23
+++ pl.po	9 Jan 2009 11:52:40 -0000	1.24
@@ -1323,8 +1323,8 @@
 msgstr "Obs??uga turkme??skiego"
 
 #: ../comps-f11.xml.in.h:215
-msgid "Upper Sobrbian Support"
-msgstr "Obs??uga g??rnego sobrbian"
+msgid "Upper Sorbian Support"
+msgstr "Obs??uga g??rnego sorbian"
 
 #: ../comps-el4.xml.in.h:3 ../comps-el5.xml.in.h:3
 msgid "Applications for a variety of tasks"


Index: pt.po
===================================================================
RCS file: /cvs/pkgs/comps/po/pt.po,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- pt.po	22 Dec 2008 20:51:55 -0000	1.16
+++ pt.po	9 Jan 2009 11:52:41 -0000	1.17
@@ -1379,7 +1379,7 @@
 
 #: ../comps-f11.xml.in.h:215
 #, fuzzy
-msgid "Upper Sobrbian Support"
+msgid "Upper Sorbian Support"
 msgstr "Suporte a S??rvio"
 
 #: ../comps-el4.xml.in.h:3 ../comps-el5.xml.in.h:3


Index: pt_BR.po
===================================================================
RCS file: /cvs/pkgs/comps/po/pt_BR.po,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- pt_BR.po	22 Dec 2008 20:51:55 -0000	1.25
+++ pt_BR.po	9 Jan 2009 11:52:41 -0000	1.26
@@ -1352,8 +1352,8 @@
 msgstr "Suporte ?? Turcomeno"
 
 #: ../comps-f11.xml.in.h:215
-msgid "Upper Sobrbian Support"
-msgstr "Suporte ?? Upper Sobrbian"
+msgid "Upper Sorbian Support"
+msgstr "Suporte ?? Upper Sorbian"
 
 #: ../comps-el4.xml.in.h:3 ../comps-el5.xml.in.h:3
 msgid "Applications for a variety of tasks"


Index: ro.po
===================================================================
RCS file: /cvs/pkgs/comps/po/ro.po,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- ro.po	22 Dec 2008 20:51:55 -0000	1.13
+++ ro.po	9 Jan 2009 11:52:41 -0000	1.14
@@ -1388,7 +1388,7 @@
 
 #: ../comps-f11.xml.in.h:215
 #, fuzzy
-msgid "Upper Sobrbian Support"
+msgid "Upper Sorbian Support"
 msgstr "Suport pentru s??rb??"
 
 #: ../comps-el4.xml.in.h:3 ../comps-el5.xml.in.h:3


Index: ru.po
===================================================================
RCS file: /cvs/pkgs/comps/po/ru.po,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- ru.po	22 Dec 2008 20:51:55 -0000	1.20
+++ ru.po	9 Jan 2009 11:52:42 -0000	1.21
@@ -1340,7 +1340,7 @@
 
 #: ../comps-f11.xml.in.h:215
 #, fuzzy
-msgid "Upper Sobrbian Support"
+msgid "Upper Sorbian Support"
 msgstr "?????????????????? ?????????????????? ??????????"
 
 #: ../comps-el4.xml.in.h:3 ../comps-el5.xml.in.h:3


Index: si.po
===================================================================
RCS file: /cvs/pkgs/comps/po/si.po,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- si.po	22 Dec 2008 20:51:55 -0000	1.13
+++ si.po	9 Jan 2009 11:52:42 -0000	1.14
@@ -1364,7 +1364,7 @@
 
 #: ../comps-f11.xml.in.h:215
 #, fuzzy
-msgid "Upper Sobrbian Support"
+msgid "Upper Sorbian Support"
 msgstr "??????????????????????????? ???????????? ??????????????????"
 
 #: ../comps-el4.xml.in.h:3 ../comps-el5.xml.in.h:3


View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.18 -r 1.19 sk.po
Index: sk.po
===================================================================
RCS file: /cvs/pkgs/comps/po/sk.po,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sk.po	22 Dec 2008 20:51:55 -0000	1.18
+++ sk.po	9 Jan 2009 11:52:42 -0000	1.19
@@ -12,8 +12,8 @@
 "Project-Id-Version: comp-po\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2008-12-22 15:50-0500\n"
-"PO-Revision-Date: 2008-10-27 15:57+0100\n"
-"Last-Translator: Ondrej ??ulek <feonsu at gmail.com>\n"
+"PO-Revision-Date: 2009-01-09 13:44+0100\n"
+"Last-Translator: Lubomir Rintel <lkundrak at v3.sk>\n"
 "Language-Team: Slovak <fedora-trans-sk at redhat.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -21,199 +21,320 @@
 "X-Generator: Lokalize 0.2\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: ../comps-f7.xml.in.h:1 ../comps-f8.xml.in.h:1 ../comps-f9.xml.in.h:1
-#: ../comps-f10.xml.in.h:1 ../comps-f11.xml.in.h:1
+#: ../comps-f7.xml.in.h:1
+#: ../comps-f8.xml.in.h:1
+#: ../comps-f9.xml.in.h:1
+#: ../comps-f10.xml.in.h:1
+#: ../comps-f11.xml.in.h:1
 msgid "A lightweight desktop environment that works well on low end machines."
-msgstr ""
-"Jednoduch?? pracovn?? prostredie, ktor?? dobre pracuje na pomal????ch po????ta??och."
+msgstr "Jednoduch?? pracovn?? prostredie, ktor?? dobre pracuje na pomal????ch po????ta??och."
 
-#: ../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-f11.xml.in.h:2 ../comps-el4.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-f11.xml.in.h:2
+#: ../comps-el4.xml.in.h:1
 #: ../comps-el5.xml.in.h:1
 msgid "Administration Tools"
 msgstr "Administr??torsk?? n??stroje"
 
-#: ../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-f11.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
+#: ../comps-f11.xml.in.h:3
 msgid "Afrikaans Support"
 msgstr "Juhoafrick?? podpora"
 
-#: ../comps-f7.xml.in.h:4 ../comps-f8.xml.in.h:4 ../comps-f9.xml.in.h:4
-#: ../comps-f10.xml.in.h:4 ../comps-f11.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
+#: ../comps-f11.xml.in.h:4
 msgid "Albanian Support"
 msgstr "Alb??nska podpora"
 
-#: ../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-f11.xml.in.h:6 ../comps-el4.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-f11.xml.in.h:6
+#: ../comps-el4.xml.in.h:2
 #: ../comps-el5.xml.in.h:2
 msgid "Applications"
 msgstr "Aplik??cie"
 
-#: ../comps-f7.xml.in.h:6 ../comps-f8.xml.in.h:6 ../comps-f9.xml.in.h:6
-#: ../comps-f10.xml.in.h:6 ../comps-f11.xml.in.h: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
+#: ../comps-f11.xml.in.h:7
 msgid "Applications to perform a variety of tasks"
 msgstr "Aplik??cie na vykon??vanie r??znych ??loh"
 
-#: ../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-f11.xml.in.h:8 ../comps-el4.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-f11.xml.in.h:8
+#: ../comps-el4.xml.in.h:4
 #: ../comps-el5.xml.in.h:4
 msgid "Arabic Support"
 msgstr "Arabsk?? podpora"
 
-#: ../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-f11.xml.in.h:9 ../comps-el4.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-f11.xml.in.h:9
+#: ../comps-el4.xml.in.h:5
 #: ../comps-el5.xml.in.h:5
 msgid "Armenian Support"
 msgstr "Arm??nska podpora"
 
-#: ../comps-f7.xml.in.h:9 ../comps-f8.xml.in.h:9 ../comps-f9.xml.in.h:9
-#: ../comps-f10.xml.in.h:9 ../comps-f11.xml.in.h:10
+#: ../comps-f7.xml.in.h:9
+#: ../comps-f8.xml.in.h:9
+#: ../comps-f9.xml.in.h:9
+#: ../comps-f10.xml.in.h:9
+#: ../comps-f11.xml.in.h:10
 msgid "Assamese Support"
 msgstr "Assamsk?? podpora"
 
-#: ../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-f11.xml.in.h:11 ../comps-el4.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-f11.xml.in.h:11
+#: ../comps-el4.xml.in.h:6
 #: ../comps-el5.xml.in.h:6
 msgid "Authoring and Publishing"
 msgstr "P??sanie a publikovanie"
 
-#: ../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-f11.xml.in.h:12
+#: ../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-f11.xml.in.h:12
 msgid "Base"
 msgstr "Z??klad"
 
-#: ../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-f11.xml.in.h:13 ../comps-el4.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-f11.xml.in.h:13
+#: ../comps-el4.xml.in.h:7
 #: ../comps-el5.xml.in.h:7
 msgid "Base System"
 msgstr "Z??klad syst??mu"
 
-#: ../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-f11.xml.in.h:14
+#: ../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-f11.xml.in.h:14
 msgid "Basic support for the Ruby programming language."
 msgstr "Z??kladn?? podpora pre programovac?? jazyk 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 ../comps-f11.xml.in.h:15
+#: ../comps-f7.xml.in.h:14
+#: ../comps-f8.xml.in.h:14
+#: ../comps-f9.xml.in.h:14
+#: ../comps-f10.xml.in.h:14
+#: ../comps-f11.xml.in.h:15
 msgid "Basque Support"
 msgstr "Baskick?? podpora"
 
-#: ../comps-f7.xml.in.h:15 ../comps-f8.xml.in.h:15 ../comps-f9.xml.in.h:15
-#: ../comps-f10.xml.in.h:15 ../comps-f11.xml.in.h:16
+#: ../comps-f7.xml.in.h:15
+#: ../comps-f8.xml.in.h:15
+#: ../comps-f9.xml.in.h:15
+#: ../comps-f10.xml.in.h:15
+#: ../comps-f11.xml.in.h:16
 msgid "Belarusian Support"
 msgstr "Bielorusk?? podpora"
 
-#: ../comps-f7.xml.in.h:16 ../comps-f8.xml.in.h:16 ../comps-f9.xml.in.h:16
-#: ../comps-f10.xml.in.h:16 ../comps-f11.xml.in.h:17
+#: ../comps-f7.xml.in.h:16
+#: ../comps-f8.xml.in.h:16
+#: ../comps-f9.xml.in.h:16
+#: ../comps-f10.xml.in.h:16
+#: ../comps-f11.xml.in.h:17
 msgid "Bengali Support"
 msgstr "Beng??lska podpora"
 
-#: ../comps-f7.xml.in.h:17 ../comps-f8.xml.in.h:17 ../comps-f9.xml.in.h:17
-#: ../comps-f10.xml.in.h:17 ../comps-f11.xml.in.h:18
+#: ../comps-f7.xml.in.h:17
[...2675 lines suppressed...]
 #~ msgstr "??paniel??ina"
-
 #~ msgid ""
 #~ "This group contains the Red Hat Enterprise Linux documentation in the "
 #~ "Brazilian Portuguese language."
 #~ msgstr ""
 #~ "T??to skupina obsahuje dokument??ciu Red Hat Enterprise Linux v braz??lskej "
 #~ "portugal??ine."
-
 #~ msgid ""
 #~ "This group contains the Red Hat Enterprise Linux documentation in the "
 #~ "English language."
 #~ msgstr ""
 #~ "T??to skupina obsahuje dokument??ciu Red Hat Enterprise Linux v angli??tine."
-
 #~ msgid ""
 #~ "This group contains the Red Hat Enterprise Linux documentation in the "
 #~ "French language."
 #~ msgstr ""
 #~ "T??to skupina obsahuje dokument??ciu Red Hat Enterprise Linux vo "
 #~ "franc??z??tine."
-
 #~ msgid ""
 #~ "This group contains the Red Hat Enterprise Linux documentation in the "
 #~ "German language."
 #~ msgstr ""
 #~ "T??to skupina obsahuje dokument??ciu Red Hat Enterprise Linux v nem??ine."
-
 #~ msgid ""
 #~ "This group contains the Red Hat Enterprise Linux documentation in the "
 #~ "Italian language."
 #~ msgstr ""
 #~ "T??to skupina obsahuje dokument??ciu Red Hat Enterprise Linux v talian??ine."
-
 #~ msgid ""
 #~ "This group contains the Red Hat Enterprise Linux documentation in the "
 #~ "Spanish language."
 #~ msgstr ""
 #~ "T??to skupina obsahuje dokument??ciu Red Hat Enterprise Linux v ??paniel??ine."
-
 #~ msgid "Japanese"
 #~ msgstr "Japon??ina"
-
 #~ msgid "Korean"
 #~ msgstr "K??rej??ina"
-
 #~ msgid "Simplified Chinese"
 #~ msgstr "Zjednodu??en?? ????n??tina"
-
 #~ msgid ""
 #~ "This group contains the Red Hat Enterprise Linux documentation in the "
 #~ "Japanese language."
 #~ msgstr ""
 #~ "T??to skupina obsahuje dokument??ciu Red Hat Enterprise Linux v japon??ine."
-
 #~ msgid ""
 #~ "This group contains the Red Hat Enterprise Linux documentation in the "
 #~ "Korean language."
 #~ msgstr ""
 #~ "T??to skupina obsahuje dokument??ciu Red Hat Enterprise Linux v k??rej??ine."
-
 #~ msgid ""
 #~ "This group contains the Red Hat Enterprise Linux documentation in the "
 #~ "Simplified Chinese language."
 #~ msgstr ""
 #~ "T??to skupina obsahuje dokument??ciu Red Hat Enterprise Linux v "
 #~ "zjednodu??enej ????n??tine."
-
 #~ msgid ""
 #~ "This group contains the Red Hat Enterprise Linux documentation in the "
 #~ "Traditional Chinese language."
 #~ msgstr ""
 #~ "T??to skupina obsahuje dokument??ciu Red Hat Enterprise Linux v tradi??nej "
 #~ "????n??tine."
-
 #~ msgid "Traditional Chinese"
 #~ msgstr "Tradi??n?? ????n??tina"
-
 #~ msgid "ppc64 Compatibility Arch Development Support"
 #~ msgstr "Podpora v??voja kompatibiln??ch ppc64 architekt??r"
-
 #~ msgid "Bengali"
 #~ msgstr "Beng??lske"
-
 #~ msgid "Gujarati"
 #~ msgstr "Gujaratsk??"
-
 #~ msgid "Hindi"
 #~ msgstr "Hindsk??"
-
 #~ msgid "Punjabi"
 #~ msgstr "Pand????bske"
-
 #~ msgid "Red Hat Enterprise Linux 4 Documentation"
 #~ msgstr "Dokument??cia Red Hat Enterprise Linux 4"
-
 #~ msgid "Tamil"
 #~ msgstr "Tamilsk??"
-
 #~ msgid ""
 #~ "This group contains the Red Hat Enterprise Linux documentation in the "
 #~ "Bengali language."
 #~ msgstr ""
 #~ "T??to skupina obsahuje dokument??ciu Red Hat Enterprise Linux v beng??l??ine."
-
 #~ msgid ""
 #~ "This group contains the Red Hat Enterprise Linux documentation in the "
 #~ "Gujarati language."
 #~ msgstr ""
 #~ "T??to skupina obsahuje dokument??ciu Red Hat Enterprise Linux v gujarat??ine."
-
 #~ msgid ""
 #~ "This group contains the Red Hat Enterprise Linux documentation in the "
 #~ "Hindi language."
 #~ msgstr ""
 #~ "T??to skupina obsahuje dokument??ciu Red Hat Enterprise Linux v hindskom "
 #~ "jazyku."
-
 #~ msgid ""
 #~ "This group contains the Red Hat Enterprise Linux documentation in the "
 #~ "Punjabi language."
 #~ msgstr ""
 #~ "T??to skupina obsahuje dokument??ciu Red Hat Enterprise Linux v pand????bskom "
 #~ "jazyku."
-
 #~ msgid ""
 #~ "This group contains the Red Hat Enterprise Linux documentation in the "
 #~ "Tamil language."
 #~ msgstr ""
 #~ "T??to skupina obsahuje dokument??ciu Red Hat Enterprise Linux v tamil??ine."
-
 #~ msgid "Red Hat Enterprise Linux Extras"
 #~ msgstr "Red Hat Enterprise Linux Extras"
-
 #~ msgid "Workstation"
 #~ msgstr "Pracovn?? stanica"
-
 #~ msgid "Workstation applications and utilities."
 #~ msgstr "Aplik??cie pre pracovn?? stanice a pomocn?? programy."
-
 #~ msgid "Compatibility Arch"
 #~ msgstr "Architekt??ra kompatibility"
-
 #~ msgid "Compatibility Arch Libraries"
 #~ msgstr "Kni??nice architekt??ry kompatibility"
-
 #~ msgid "Multilib library packages"
 #~ msgstr "Bal??ky kni??nice multilib"
-
 #~ msgid ""
 #~ "Packages which provide functionality for the compatibility architecture."
 #~ msgstr "Tieto bal??ky poskytuj?? podporu pre architekt??ru kompatibility."
@@ -5270,34 +5752,25 @@
 #~ "packagereq> </packagelist> </group> <group> <id>mysql</id> "
 #~ "<_name>Datab??za MySQL</_name> <_description>T??to skupina bal??kov obsahuje "
 #~ "bal??ky vhodn?? pre pou??itie s MySQL."
-
 #~ msgid "Cups"
 #~ msgstr "Cups"
-
 #~ msgid "Cups printing service and drivers to use it."
 #~ msgstr "Tla??ov?? slu??ba cups a ovl??da??e na jej pou??itie."
-
 #~ msgid "SQL Database Server"
 #~ msgstr "Datab??zov?? server SQL"
-
 #~ msgid "Supported Packages"
 #~ msgstr "Podporovan?? bal??ky"
-
 #~ msgid ""
 #~ "These packages include network-based servers such as CIPE, DHCP, and "
 #~ "telnet."
 #~ msgstr "Tieto bal??ky obsahuj?? sie??ov?? servery, napr. CIPE, DHCP a telnet."
-
 #~ msgid "This package group allows you to run an SQL server on the system."
 #~ msgstr "T??to skupina bal??kov v??m umo??n?? spusti?? na po????ta??i SQL server."
-
 #~ msgid "GNOME Desktop"
 #~ msgstr "Pracovn?? plocha GNOME"
-
 #~ msgid ""
 #~ "These packages include network-based servers such as DHCP and telnet."
 #~ msgstr "Tieto bal??ky obsahuj?? sie??ov?? servery, napr. DHCP a telnet."
-
 #~ msgid ""
 #~ "</_description> <default>false</default> <uservisible>false</uservisible> "
 #~ "<langonly>sk</langonly> <grouplist> <groupreq>ISO8859-2-support</"
@@ -5312,7 +5785,6 @@
 #~ "requires=\"kdelibs\">kde-i18n-Slovak</packagereq> </packagelist> </group> "
 #~ "<group> <id>slovenian-support</id> <_name>Slovinsk?? podpora</_name> "
 #~ "<_description>"
-
 #~ msgid ""
 #~ "</_description> <default>false</default> <uservisible>false</uservisible> "
 #~ "<packagelist> <packagereq type=\"mandatory\">fonts-KOI8-R</packagereq> "
@@ -5327,3 +5799,4 @@
 #~ "<packagereq type=\"optional\" requires=\"xorg-x11\">fonts-xorg-cyrillic</"
 #~ "packagereq> </packagelist> </group> <group> <id>czech-support</id> "
 #~ "<_name>??esk?? podpora</_name> <_description>"
+


Index: sl.po
===================================================================
RCS file: /cvs/pkgs/comps/po/sl.po,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sl.po	22 Dec 2008 20:51:55 -0000	1.13
+++ sl.po	9 Jan 2009 11:52:42 -0000	1.14
@@ -1372,7 +1372,7 @@
 
 #: ../comps-f11.xml.in.h:215
 #, fuzzy
-msgid "Upper Sobrbian Support"
+msgid "Upper Sorbian Support"
 msgstr "Srbska podpora"
 
 #: ../comps-el4.xml.in.h:3 ../comps-el5.xml.in.h:3


Index: sq.po
===================================================================
RCS file: /cvs/pkgs/comps/po/sq.po,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sq.po	22 Dec 2008 20:51:55 -0000	1.15
+++ sq.po	9 Jan 2009 11:52:42 -0000	1.16
@@ -1447,7 +1447,7 @@
 
 #: ../comps-f11.xml.in.h:215
 #, fuzzy
-msgid "Upper Sobrbian Support"
+msgid "Upper Sorbian Support"
 msgstr "Serbe (Latine)"
 
 #: ../comps-el4.xml.in.h:3 ../comps-el5.xml.in.h:3


Index: sr.po
===================================================================
RCS file: /cvs/pkgs/comps/po/sr.po,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sr.po	22 Dec 2008 20:51:55 -0000	1.21
+++ sr.po	9 Jan 2009 11:52:42 -0000	1.22
@@ -1329,7 +1329,7 @@
 
 #: ../comps-f11.xml.in.h:215
 #, fuzzy
-msgid "Upper Sobrbian Support"
+msgid "Upper Sorbian Support"
 msgstr "?????????????? ???? ????????????"
 
 #: ../comps-el4.xml.in.h:3 ../comps-el5.xml.in.h:3


Index: sr at Latn.po
===================================================================
RCS file: /cvs/pkgs/comps/po/sr at Latn.po,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sr at Latn.po	22 Dec 2008 20:51:56 -0000	1.20
+++ sr at Latn.po	9 Jan 2009 11:52:42 -0000	1.21
@@ -1329,7 +1329,7 @@
 
 #: ../comps-f11.xml.in.h:215
 #, fuzzy
-msgid "Upper Sobrbian Support"
+msgid "Upper Sorbian Support"
 msgstr "Podr??ka za srpski"
 
 #: ../comps-el4.xml.in.h:3 ../comps-el5.xml.in.h:3


Index: sr at latin.po
===================================================================
RCS file: /cvs/pkgs/comps/po/sr at latin.po,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sr at latin.po	22 Dec 2008 20:51:56 -0000	1.21
+++ sr at latin.po	9 Jan 2009 11:52:42 -0000	1.22
@@ -1329,7 +1329,7 @@
 
 #: ../comps-f11.xml.in.h:215
 #, fuzzy
-msgid "Upper Sobrbian Support"
+msgid "Upper Sorbian Support"
 msgstr "Podr??ka za srpski"
 
 #: ../comps-el4.xml.in.h:3 ../comps-el5.xml.in.h:3


Index: sv.po
===================================================================
RCS file: /cvs/pkgs/comps/po/sv.po,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sv.po	22 Dec 2008 20:51:56 -0000	1.17
+++ sv.po	9 Jan 2009 11:52:43 -0000	1.18
@@ -1347,7 +1347,7 @@
 
 #: ../comps-f11.xml.in.h:215
 #, fuzzy
-msgid "Upper Sobrbian Support"
+msgid "Upper Sorbian Support"
 msgstr "St??d f??r serbiska"
 
 #: ../comps-el4.xml.in.h:3 ../comps-el5.xml.in.h:3


Index: ta.po
===================================================================
RCS file: /cvs/pkgs/comps/po/ta.po,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- ta.po	22 Dec 2008 20:51:56 -0000	1.16
+++ ta.po	9 Jan 2009 11:52:43 -0000	1.17
@@ -1340,7 +1340,7 @@
 
 #: ../comps-f11.xml.in.h:215
 #, fuzzy
-msgid "Upper Sobrbian Support"
+msgid "Upper Sorbian Support"
 msgstr "????????????????????? ????????????"
 
 #: ../comps-el4.xml.in.h:3 ../comps-el5.xml.in.h:3


Index: te.po
===================================================================
RCS file: /cvs/pkgs/comps/po/te.po,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- te.po	22 Dec 2008 20:51:56 -0000	1.16
+++ te.po	9 Jan 2009 11:52:43 -0000	1.17
@@ -1322,7 +1322,7 @@
 
 #: ../comps-f11.xml.in.h:215
 #, fuzzy
-msgid "Upper Sobrbian Support"
+msgid "Upper Sorbian Support"
 msgstr "??????????????????????????? ??????????????????"
 
 #: ../comps-el4.xml.in.h:3 ../comps-el5.xml.in.h:3


Index: tg.po
===================================================================
RCS file: /cvs/pkgs/comps/po/tg.po,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- tg.po	22 Dec 2008 20:51:56 -0000	1.10
+++ tg.po	9 Jan 2009 11:52:43 -0000	1.11
@@ -1343,7 +1343,7 @@
 
 #: ../comps-f11.xml.in.h:215
 #, fuzzy
-msgid "Upper Sobrbian Support"
+msgid "Upper Sorbian Support"
 msgstr "???????????????????? ???????????? ??????????"
 
 #: ../comps-el4.xml.in.h:3 ../comps-el5.xml.in.h:3


Index: th.po
===================================================================
RCS file: /cvs/pkgs/comps/po/th.po,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- th.po	22 Dec 2008 20:51:56 -0000	1.13
+++ th.po	9 Jan 2009 11:52:43 -0000	1.14
@@ -1368,7 +1368,7 @@
 
 #: ../comps-f11.xml.in.h:215
 #, fuzzy
-msgid "Upper Sobrbian Support"
+msgid "Upper Sorbian Support"
 msgstr "Serbian Support"
 
 #: ../comps-el4.xml.in.h:3 ../comps-el5.xml.in.h:3


Index: tl.po
===================================================================
RCS file: /cvs/pkgs/comps/po/tl.po,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- tl.po	22 Dec 2008 20:51:56 -0000	1.13
+++ tl.po	9 Jan 2009 11:52:43 -0000	1.14
@@ -1329,7 +1329,7 @@
 
 #: ../comps-f11.xml.in.h:215
 #, fuzzy
-msgid "Upper Sobrbian Support"
+msgid "Upper Sorbian Support"
 msgstr "Pagsasang-ayong Wikang Norwego"
 
 #: ../comps-el4.xml.in.h:3 ../comps-el5.xml.in.h:3


Index: tr.po
===================================================================
RCS file: /cvs/pkgs/comps/po/tr.po,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- tr.po	22 Dec 2008 20:51:56 -0000	1.13
+++ tr.po	9 Jan 2009 11:52:43 -0000	1.14
@@ -1368,7 +1368,7 @@
 
 #: ../comps-f11.xml.in.h:215
 #, fuzzy
-msgid "Upper Sobrbian Support"
+msgid "Upper Sorbian Support"
 msgstr "S??rp??a Deste??i"
 
 #: ../comps-el4.xml.in.h:3 ../comps-el5.xml.in.h:3


Index: uk.po
===================================================================
RCS file: /cvs/pkgs/comps/po/uk.po,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- uk.po	22 Dec 2008 20:51:56 -0000	1.14
+++ uk.po	9 Jan 2009 11:52:43 -0000	1.15
@@ -1340,7 +1340,7 @@
 
 #: ../comps-f11.xml.in.h:215
 #, fuzzy
-msgid "Upper Sobrbian Support"
+msgid "Upper Sorbian Support"
 msgstr "?????????????????? ?????????????????? ????????"
 
 #: ../comps-el4.xml.in.h:3 ../comps-el5.xml.in.h:3


Index: ur.po
===================================================================
RCS file: /cvs/pkgs/comps/po/ur.po,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- ur.po	22 Dec 2008 20:51:56 -0000	1.13
+++ ur.po	9 Jan 2009 11:52:43 -0000	1.14
@@ -1391,7 +1391,7 @@
 
 #: ../comps-f11.xml.in.h:215
 #, fuzzy
-msgid "Upper Sobrbian Support"
+msgid "Upper Sorbian Support"
 msgstr "???????????? ????????"
 
 #: ../comps-el4.xml.in.h:3 ../comps-el5.xml.in.h:3


Index: vi.po
===================================================================
RCS file: /cvs/pkgs/comps/po/vi.po,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- vi.po	22 Dec 2008 20:51:56 -0000	1.13
+++ vi.po	9 Jan 2009 11:52:43 -0000	1.14
@@ -1415,7 +1415,7 @@
 
 #: ../comps-f11.xml.in.h:215
 #, fuzzy
-msgid "Upper Sobrbian Support"
+msgid "Upper Sorbian Support"
 msgstr "H??? tr??? Serbia"
 
 #: ../comps-el4.xml.in.h:3 ../comps-el5.xml.in.h:3


Index: zh_CN.po
===================================================================
RCS file: /cvs/pkgs/comps/po/zh_CN.po,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- zh_CN.po	22 Dec 2008 20:51:56 -0000	1.21
+++ zh_CN.po	9 Jan 2009 11:52:43 -0000	1.22
@@ -1306,7 +1306,7 @@
 
 #: ../comps-f11.xml.in.h:215
 #, fuzzy
-msgid "Upper Sobrbian Support"
+msgid "Upper Sorbian Support"
 msgstr "?????????????????????"
 
 #: ../comps-el4.xml.in.h:3 ../comps-el5.xml.in.h:3


Index: zh_TW.po
===================================================================
RCS file: /cvs/pkgs/comps/po/zh_TW.po,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- zh_TW.po	22 Dec 2008 20:51:56 -0000	1.21
+++ zh_TW.po	9 Jan 2009 11:52:43 -0000	1.22
@@ -1299,7 +1299,7 @@
 
 #: ../comps-f11.xml.in.h:215
 #, fuzzy
-msgid "Upper Sobrbian Support"
+msgid "Upper Sorbian Support"
 msgstr "?????????????????????"
 
 #: ../comps-el4.xml.in.h:3 ../comps-el5.xml.in.h:3


Index: zu.po
===================================================================
RCS file: /cvs/pkgs/comps/po/zu.po,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- zu.po	22 Dec 2008 20:51:56 -0000	1.13
+++ zu.po	9 Jan 2009 11:52:43 -0000	1.14
@@ -1514,7 +1514,7 @@
 
 #: ../comps-f11.xml.in.h:215
 #, fuzzy
-msgid "Upper Sobrbian Support"
+msgid "Upper Sorbian Support"
 msgstr "Ukuxhasa KweSebhiya"
 
 #: ../comps-el4.xml.in.h:3 ../comps-el5.xml.in.h:3



From red at fedoraproject.org  Fri Jan  9 11:56:00 2009
From: red at fedoraproject.org (Sandro Mathys)
Date: Fri,  9 Jan 2009 11:56:00 +0000 (UTC)
Subject: rpms/gdata-java/devel gdata-java.spec, NONE, 1.1 import.log, NONE, 
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090109115600.307727011C@cvs1.fedora.phx.redhat.com>

Author: red

Update of /cvs/pkgs/rpms/gdata-java/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20756/devel

Modified Files:
	.cvsignore sources 
Added Files:
	gdata-java.spec import.log 
Log Message:
* Fri Jan 09 2009 Sandro Mathys <red at fedoraproject.org> - 1.28.0-1
- initial commit




--- NEW FILE gdata-java.spec ---
%define genericname gdata

Name:           %{genericname}-java
Version:        1.28.0
Release:        1%{?dist}
Summary:        Client libraries to write Google Data API client applications in Java
Group:          Development/Libraries
License:        ASL 2.0
URL:            http://code.google.com/apis/gdata/clientlibs.html
Source0:        http://gdata-java-client.googlecode.com/files/%{genericname}-src.java-%{version}.java.zip
BuildArch:      noarch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:     java-devel >= 1:1.6.0
BuildRequires:     jpackage-utils
BuildRequires:     ant
BuildRequires:     classpathx-jaf classpathx-mail tomcat5-servlet-2.4-api
Requires:          java >= 1:1.6.0
Requires:          jpackage-utils

%description
The client library provides tools and an abstraction layer, letting you
easily construct queries and use response data without having to create
HTTP requests or process HTTP responses by hand. Each client library
provides classes that correspond to the elements and data types used by
the Google Data APIs. Each client library also provides extensions for
specific Google services that have Data APIs.


%package javadoc
Summary:           Javadocs for gdata
Group:             Documentation
Requires:          %name = %{version}-%{release}
Requires:          jpackage-utils

%description javadoc
gdata development documentation.


%prep
%setup -q -n gdata
pushd java

rm -rf lib/* classes doc

properties=build-src/build.properties
for jars in \
  "servlet servletapi5" \
  "mail javamail" \
  "activation activation"
do
  f=`echo $jars | gawk '{print $1;}'`
  g=`echo $jars | gawk '{print $2;}'`
  %{__sed} -i -e "/^${f}/s|=.*$|=`build-classpath ${g}`|" $properties
done

for i in `ls manifest/*.manifest`; do
  %{__sed} -i '/class-path/I d' $i
done

popd


%build
pushd java
ant -lib lib/%{genericname}-core-1.0.jar:lib/%{genericname}-client-1.0.jar -buildfile build-src.xml clean build

javadoc -classpath `build-classpath javamail`:/etc/alternatives/java_sdk_openjdk/lib/tools.jar -d doc `find src -name '*.java'`
popd


%install
#jars
pushd java
pushd lib
rm -rf $RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT%{_javadir}/%{genericname}
install -m644 *.jar $RPM_BUILD_ROOT%{_javadir}/%{genericname}
for i in `ls *.jar`; do
  x=`echo $i | tr -d [:digit:]`
  ln -s $i $RPM_BUILD_ROOT%{_javadir}/%{genericname}/${x%%-\.\.jar}.jar
done
popd

# javadoc
install -d $RPM_BUILD_ROOT%{_javadocdir}/%{genericname}
cp -rp doc/* $RPM_BUILD_ROOT%{_javadocdir}/%{genericname}
popd


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc COPYING
%dir %{_javadir}/%{genericname}
%{_javadir}/%{genericname}/%{genericname}-*.jar

%files javadoc
%defattr(-,root,root,-)
%dir %{_javadocdir}/%{genericname}
%{_javadocdir}/%{genericname}/*


%changelog
* Thu Dec 18 2008 Sandro Mathys <red at fedoraproject.org> - 1.28.0-1
- New version

* Thu Dec 18 2008 Sandro Mathys <red at fedoraproject.org> - 1.26.0-2
- The changes to the build.properties file are now applied with a for loop
and sed instead of a patch
- The paths to the 3rd-party libraries (i.e. currently only javamail.jar)
for the javadoc generation are now looked up with build-classpath instead of
being hardcoded

* Tue Dec 16 2008 Sandro Mathys <red at fedoraproject.org> - 1.26.0-1
- initial build (thanks Rudolf 'che' Kastl for the help)


--- NEW FILE import.log ---
gdata-java-1_28_0-1_fc11:HEAD:gdata-java-1.28.0-1.fc11.src.rpm:1231502137


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gdata-java/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	21 Dec 2008 04:46:06 -0000	1.1
+++ .cvsignore	9 Jan 2009 11:55:29 -0000	1.2
@@ -0,0 +1 @@
+gdata-src.java-1.28.0.java.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gdata-java/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	21 Dec 2008 04:46:06 -0000	1.1
+++ sources	9 Jan 2009 11:55:29 -0000	1.2
@@ -0,0 +1 @@
+722f6ce7817a4a59fcf83bdefb8257df  gdata-src.java-1.28.0.java.zip



From red at fedoraproject.org  Fri Jan  9 11:57:46 2009
From: red at fedoraproject.org (Sandro Mathys)
Date: Fri,  9 Jan 2009 11:57:46 +0000 (UTC)
Subject: rpms/gdata-java/F-9 gdata-java.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090109115746.B6CA57011C@cvs1.fedora.phx.redhat.com>

Author: red

Update of /cvs/pkgs/rpms/gdata-java/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21167/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	gdata-java.spec import.log 
Log Message:
* Fri Jan 09 2009 Sandro Mathys <red at fedoraproject.org> - 1.28.0-1
- initial commit




--- NEW FILE gdata-java.spec ---
%define genericname gdata

Name:           %{genericname}-java
Version:        1.28.0
Release:        1%{?dist}
Summary:        Client libraries to write Google Data API client applications in Java
Group:          Development/Libraries
License:        ASL 2.0
URL:            http://code.google.com/apis/gdata/clientlibs.html
Source0:        http://gdata-java-client.googlecode.com/files/%{genericname}-src.java-%{version}.java.zip
BuildArch:      noarch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:     java-devel >= 1:1.6.0
BuildRequires:     jpackage-utils
BuildRequires:     ant
BuildRequires:     classpathx-jaf classpathx-mail tomcat5-servlet-2.4-api
Requires:          java >= 1:1.6.0
Requires:          jpackage-utils

%description
The client library provides tools and an abstraction layer, letting you
easily construct queries and use response data without having to create
HTTP requests or process HTTP responses by hand. Each client library
provides classes that correspond to the elements and data types used by
the Google Data APIs. Each client library also provides extensions for
specific Google services that have Data APIs.


%package javadoc
Summary:           Javadocs for gdata
Group:             Documentation
Requires:          %name = %{version}-%{release}
Requires:          jpackage-utils

%description javadoc
gdata development documentation.


%prep
%setup -q -n gdata
pushd java

rm -rf lib/* classes doc

properties=build-src/build.properties
for jars in \
  "servlet servletapi5" \
  "mail javamail" \
  "activation activation"
do
  f=`echo $jars | gawk '{print $1;}'`
  g=`echo $jars | gawk '{print $2;}'`
  %{__sed} -i -e "/^${f}/s|=.*$|=`build-classpath ${g}`|" $properties
done

for i in `ls manifest/*.manifest`; do
  %{__sed} -i '/class-path/I d' $i
done

popd


%build
pushd java
ant -lib lib/%{genericname}-core-1.0.jar:lib/%{genericname}-client-1.0.jar -buildfile build-src.xml clean build

javadoc -classpath `build-classpath javamail`:/etc/alternatives/java_sdk_openjdk/lib/tools.jar -d doc `find src -name '*.java'`
popd


%install
#jars
pushd java
pushd lib
rm -rf $RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT%{_javadir}/%{genericname}
install -m644 *.jar $RPM_BUILD_ROOT%{_javadir}/%{genericname}
for i in `ls *.jar`; do
  x=`echo $i | tr -d [:digit:]`
  ln -s $i $RPM_BUILD_ROOT%{_javadir}/%{genericname}/${x%%-\.\.jar}.jar
done
popd

# javadoc
install -d $RPM_BUILD_ROOT%{_javadocdir}/%{genericname}
cp -rp doc/* $RPM_BUILD_ROOT%{_javadocdir}/%{genericname}
popd


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc COPYING
%dir %{_javadir}/%{genericname}
%{_javadir}/%{genericname}/%{genericname}-*.jar

%files javadoc
%defattr(-,root,root,-)
%dir %{_javadocdir}/%{genericname}
%{_javadocdir}/%{genericname}/*


%changelog
* Thu Dec 18 2008 Sandro Mathys <red at fedoraproject.org> - 1.28.0-1
- New version

* Thu Dec 18 2008 Sandro Mathys <red at fedoraproject.org> - 1.26.0-2
- The changes to the build.properties file are now applied with a for loop
and sed instead of a patch
- The paths to the 3rd-party libraries (i.e. currently only javamail.jar)
for the javadoc generation are now looked up with build-classpath instead of
being hardcoded

* Tue Dec 16 2008 Sandro Mathys <red at fedoraproject.org> - 1.26.0-1
- initial build (thanks Rudolf 'che' Kastl for the help)


--- NEW FILE import.log ---
gdata-java-1_28_0-1_fc11:F-9:gdata-java-1.28.0-1.fc11.src.rpm:1231502244


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gdata-java/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	21 Dec 2008 04:46:06 -0000	1.1
+++ .cvsignore	9 Jan 2009 11:57:16 -0000	1.2
@@ -0,0 +1 @@
+gdata-src.java-1.28.0.java.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gdata-java/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	21 Dec 2008 04:46:06 -0000	1.1
+++ sources	9 Jan 2009 11:57:16 -0000	1.2
@@ -0,0 +1 @@
+722f6ce7817a4a59fcf83bdefb8257df  gdata-src.java-1.28.0.java.zip



From mitr at fedoraproject.org  Fri Jan  9 11:58:21 2009
From: mitr at fedoraproject.org (Miloslav Trmac)
Date: Fri,  9 Jan 2009 11:58:21 +0000 (UTC)
Subject: rpms/python-gtkextra/devel python-gtkextra-1.1.0-codegenmoved.patch,
	1.1, 1.2 python-gtkextra.spec, 1.4, 1.5
Message-ID: <20090109115821.1E1C17011C@cvs1.fedora.phx.redhat.com>

Author: mitr

Update of /cvs/pkgs/rpms/python-gtkextra/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21405

Modified Files:
	python-gtkextra-1.1.0-codegenmoved.patch python-gtkextra.spec 
Log Message:
* Fri Jan  9 2009 Miloslav Trma?? <mitr at redhat.com> - 1.1.0-6
- More general fix for the codegen move


python-gtkextra-1.1.0-codegenmoved.patch:

Index: python-gtkextra-1.1.0-codegenmoved.patch
===================================================================
RCS file: /cvs/pkgs/rpms/python-gtkextra/devel/python-gtkextra-1.1.0-codegenmoved.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- python-gtkextra-1.1.0-codegenmoved.patch	7 Jan 2009 15:57:54 -0000	1.1
+++ python-gtkextra-1.1.0-codegenmoved.patch	9 Jan 2009 11:58:20 -0000	1.2
@@ -1,12 +1,37 @@
-diff -ru python-gtkextra-1.1.0/gtkextra/mycodegen.py python-gtkextra-1.1.0.new/gtkextra/mycodegen.py
---- python-gtkextra-1.1.0.orig/gtkextra/mycodegen.py	2009-01-07 15:46:34.000000000 +0000
-+++ python-gtkextra-1.1.0w/gtkextra/mycodegen.py	2009-01-07 15:45:52.000000000 +0000
+diff -ur python-gtkextra/configure.in python-gtkextra-1.1.0/configure.in
+--- python-gtkextra/configure.in	2004-03-09 12:58:38.000000000 +0100
++++ python-gtkextra-1.1.0/configure.in	2009-01-09 12:33:36.000000000 +0100
+@@ -69,6 +69,11 @@
+ AC_SUBST(PYGTK_DEFSDIR)
+ AC_MSG_RESULT($PYGTK_DEFSDIR)
+ 
++AC_MSG_CHECKING(PYGTK_CODEGENDIR)
++PYGTK_CODEGENDIR=`$PKG_CONFIG --variable=codegendir pygtk-2.0`
++AC_SUBST(PYGTK_CODEGENDIR)
++AC_MSG_RESULT($PYGTK_CODEGENDIR)
++
+ AC_ARG_ENABLE(numpy,
+   AC_HELP_STRING([--disable-numpy], [Disable numeric python features]),,
+   enable_numpy=yes)
+diff -ur python-gtkextra/gtkextra/_config.py.in python-gtkextra-1.1.0/gtkextra/_config.py.in
+--- python-gtkextra/gtkextra/_config.py.in	2002-12-30 21:42:13.000000000 +0100
++++ python-gtkextra-1.1.0/gtkextra/_config.py.in	2009-01-09 12:35:17.000000000 +0100
+@@ -4,5 +4,5 @@
+ PKGDATADIR = string.replace('@datadir@/@PACKAGE@','${prefix}', PREFIX)
+ PYDIR= string.replace('@pythondir@','${prefix}', PREFIX)
+ VERSION='@VERSION@'
+-PYGTK_DEFSDIR='@PYGTK_DEFSDIR@'
++PYGTK_CODEGENDIR='@PYGTK_CODEGENDIR@'
+ del string
+diff -ur python-gtkextra/gtkextra/mycodegen.py python-gtkextra-1.1.0/gtkextra/mycodegen.py
+--- python-gtkextra/gtkextra/mycodegen.py	2009-01-09 12:25:21.000000000 +0100
++++ python-gtkextra-1.1.0/gtkextra/mycodegen.py	2009-01-09 12:35:26.000000000 +0100
 @@ -6,7 +6,7 @@
  import _config
  import sys
  import os
 -sys.path.append(os.path.join(_config.PYGTK_DEFSDIR, '../'))
-+sys.path.append(os.path.join(_config.PYGTK_DEFSDIR.replace('pygtk','pygobject'), '../'))
++sys.path.append(os.path.join(_config.PYGTK_CODEGENDIR, '../'))
  
  from codegen.argtypes import matcher
  import codegen.codegen


Index: python-gtkextra.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-gtkextra/devel/python-gtkextra.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- python-gtkextra.spec	7 Jan 2009 15:57:54 -0000	1.4
+++ python-gtkextra.spec	9 Jan 2009 11:58:20 -0000	1.5
@@ -3,7 +3,7 @@
 Summary: Python bindings for gtkextra
 Name: python-gtkextra
 Version: 1.1.0
-Release: 5%{?dist}
+Release: 6
 # FIXME: the license is not quite clear, using the most restrictive license
 # for this field.  See
 # http://sourceforge.net/tracker/index.php?func=detail&aid=1941652&group_id=35371&atid=414148
@@ -15,6 +15,8 @@
 Patch1: python-gtkextra-1.1.0-codegenmoved.patch
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildRequires: gtk+extra-devel, pygtk2-devel, python-devel
+# For autoreconf
+BuildRequires: autoconf, automake, libtool
 Requires: pygtk2, pkgconfig
 
 %description
@@ -24,6 +26,7 @@
 %setup -q
 %patch0 -p1 -b .update
 %patch1 -p1 -b .codegenmoved
+autoreconf -fi
 
 %build
 
@@ -49,6 +52,9 @@
 %{_datadir}/pygtk/2.0/defs/gtkextra*.defs
 
 %changelog
+* Fri Jan  9 2009 Miloslav Trma?? <mitr at redhat.com> - 1.1.0-6
+- More general fix for the codegen move
+
 * Wed Jan 07 2009 Caol??n McNamara <caolanm at redhat.com> - 1.1.0-5
 - codegen moved from pygtk to pygobject, fix to rebuild
 



From sharkcz at fedoraproject.org  Fri Jan  9 11:59:01 2009
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Fri,  9 Jan 2009 11:59:01 +0000 (UTC)
Subject: rpms/trytond/EL-5 .cvsignore, 1.2, 1.3 sources, 1.2,
	1.3 trytond.spec, 1.1, 1.2
Message-ID: <20090109115901.33D0F7011C@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/trytond/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21532

Modified Files:
	.cvsignore sources trytond.spec 
Log Message:
* Thu Jan  8 2009 Dan Hor??k <dan[at]danny.cz> 1.0.2-1
- modularize the openoffice.org support
- update to upstream version 1.0.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/trytond/EL-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	18 Dec 2008 10:53:43 -0000	1.2
+++ .cvsignore	9 Jan 2009 11:58:30 -0000	1.3
@@ -1 +1 @@
-trytond-1.0.1.tar.gz
+trytond-1.0.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/trytond/EL-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	18 Dec 2008 10:53:44 -0000	1.2
+++ sources	9 Jan 2009 11:58:30 -0000	1.3
@@ -1 +1 @@
-c6623abf70994de431115ee0b93c419d  trytond-1.0.1.tar.gz
+e6eed9dbc90961d6ccefb3c70adc47eb  trytond-1.0.2.tar.gz


Index: trytond.spec
===================================================================
RCS file: /cvs/pkgs/rpms/trytond/EL-5/trytond.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- trytond.spec	18 Dec 2008 10:53:44 -0000	1.1
+++ trytond.spec	9 Jan 2009 11:58:30 -0000	1.2
@@ -3,8 +3,8 @@
 %{!?_initddir: %define _initddir %{_initrddir}}
 
 Name:           trytond
-Version:        1.0.1
-Release:        2%{?dist}
+Version:        1.0.2
+Release:        1%{?dist}
 Summary:        Server for the Tryton application framework
 
 Group:          System Environment/Daemons
@@ -19,7 +19,6 @@
 BuildRequires:  python-devel python-setuptools
 
 Requires:       python-psycopg2 python-lxml python-relatorio mx pydot pytz pyOpenSSL
-Requires:       python-openoffice
 Requires(pre):  shadow-utils
 Requires(post):  chkconfig
 Requires(preun): chkconfig
@@ -43,6 +42,19 @@
 relevant purpose.
 
 
+%package openoffice
+Summary:        OpenOffice.org support for Tryton Server
+Group:          System Environment/Libraries
+Requires:       %{name} = %{version}-%{release}
+Requires:       python-openoffice
+%if 0%{?rhel}
+ExcludeArch:    ppc
+%endif
+
+%description openoffice
+OpenOffice.org support for Tryton Server.
+
+
 %prep
 %setup -q
 
@@ -107,8 +119,15 @@
 %attr(0750,tryton,tryton) %{_localstatedir}/lib/%{name}
 %attr(0750,tryton,tryton) %{_localstatedir}/log/%{name}
 
+%files openoffice
+%defattr(-,root,root,-)
+
 
 %changelog
+* Thu Jan  8 2009 Dan Hor??k <dan[at]danny.cz> 1.0.2-1
+- modularize the openoffice.org support
+- update to upstream version 1.0.2
+
 * Tue Dec  2 2008 Dan Hor??k <dan[at]danny.cz> 1.0.1-2
 - add dependency on python-openoffice
 



From red at fedoraproject.org  Fri Jan  9 11:59:30 2009
From: red at fedoraproject.org (Sandro Mathys)
Date: Fri,  9 Jan 2009 11:59:30 +0000 (UTC)
Subject: rpms/gdata-java/F-10 gdata-java.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090109115930.24DC17011C@cvs1.fedora.phx.redhat.com>

Author: red

Update of /cvs/pkgs/rpms/gdata-java/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21677/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	gdata-java.spec import.log 
Log Message:
* Fri Jan 09 2009 Sandro Mathys <red at fedoraproject.org> - 1.28.0-1
- initial commit




--- NEW FILE gdata-java.spec ---
%define genericname gdata

Name:           %{genericname}-java
Version:        1.28.0
Release:        1%{?dist}
Summary:        Client libraries to write Google Data API client applications in Java
Group:          Development/Libraries
License:        ASL 2.0
URL:            http://code.google.com/apis/gdata/clientlibs.html
Source0:        http://gdata-java-client.googlecode.com/files/%{genericname}-src.java-%{version}.java.zip
BuildArch:      noarch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:     java-devel >= 1:1.6.0
BuildRequires:     jpackage-utils
BuildRequires:     ant
BuildRequires:     classpathx-jaf classpathx-mail tomcat5-servlet-2.4-api
Requires:          java >= 1:1.6.0
Requires:          jpackage-utils

%description
The client library provides tools and an abstraction layer, letting you
easily construct queries and use response data without having to create
HTTP requests or process HTTP responses by hand. Each client library
provides classes that correspond to the elements and data types used by
the Google Data APIs. Each client library also provides extensions for
specific Google services that have Data APIs.


%package javadoc
Summary:           Javadocs for gdata
Group:             Documentation
Requires:          %name = %{version}-%{release}
Requires:          jpackage-utils

%description javadoc
gdata development documentation.


%prep
%setup -q -n gdata
pushd java

rm -rf lib/* classes doc

properties=build-src/build.properties
for jars in \
  "servlet servletapi5" \
  "mail javamail" \
  "activation activation"
do
  f=`echo $jars | gawk '{print $1;}'`
  g=`echo $jars | gawk '{print $2;}'`
  %{__sed} -i -e "/^${f}/s|=.*$|=`build-classpath ${g}`|" $properties
done

for i in `ls manifest/*.manifest`; do
  %{__sed} -i '/class-path/I d' $i
done

popd


%build
pushd java
ant -lib lib/%{genericname}-core-1.0.jar:lib/%{genericname}-client-1.0.jar -buildfile build-src.xml clean build

javadoc -classpath `build-classpath javamail`:/etc/alternatives/java_sdk_openjdk/lib/tools.jar -d doc `find src -name '*.java'`
popd


%install
#jars
pushd java
pushd lib
rm -rf $RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT%{_javadir}/%{genericname}
install -m644 *.jar $RPM_BUILD_ROOT%{_javadir}/%{genericname}
for i in `ls *.jar`; do
  x=`echo $i | tr -d [:digit:]`
  ln -s $i $RPM_BUILD_ROOT%{_javadir}/%{genericname}/${x%%-\.\.jar}.jar
done
popd

# javadoc
install -d $RPM_BUILD_ROOT%{_javadocdir}/%{genericname}
cp -rp doc/* $RPM_BUILD_ROOT%{_javadocdir}/%{genericname}
popd


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc COPYING
%dir %{_javadir}/%{genericname}
%{_javadir}/%{genericname}/%{genericname}-*.jar

%files javadoc
%defattr(-,root,root,-)
%dir %{_javadocdir}/%{genericname}
%{_javadocdir}/%{genericname}/*


%changelog
* Thu Dec 18 2008 Sandro Mathys <red at fedoraproject.org> - 1.28.0-1
- New version

* Thu Dec 18 2008 Sandro Mathys <red at fedoraproject.org> - 1.26.0-2
- The changes to the build.properties file are now applied with a for loop
and sed instead of a patch
- The paths to the 3rd-party libraries (i.e. currently only javamail.jar)
for the javadoc generation are now looked up with build-classpath instead of
being hardcoded

* Tue Dec 16 2008 Sandro Mathys <red at fedoraproject.org> - 1.26.0-1
- initial build (thanks Rudolf 'che' Kastl for the help)


--- NEW FILE import.log ---
gdata-java-1_28_0-1_fc11:F-10:gdata-java-1.28.0-1.fc11.src.rpm:1231502349


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gdata-java/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	21 Dec 2008 04:46:06 -0000	1.1
+++ .cvsignore	9 Jan 2009 11:58:59 -0000	1.2
@@ -0,0 +1 @@
+gdata-src.java-1.28.0.java.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gdata-java/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	21 Dec 2008 04:46:06 -0000	1.1
+++ sources	9 Jan 2009 11:58:59 -0000	1.2
@@ -0,0 +1 @@
+722f6ce7817a4a59fcf83bdefb8257df  gdata-src.java-1.28.0.java.zip



From ltinkl at fedoraproject.org  Fri Jan  9 12:20:54 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Fri,  9 Jan 2009 12:20:54 +0000 (UTC)
Subject: rpms/kdeplasma-addons/F-10 .cvsignore, 1.6,
	1.7 kdeplasma-addons.spec, 1.9, 1.10 sources, 1.7, 1.8
Message-ID: <20090109122054.BE81C7011C@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kdeplasma-addons/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24381/F-10

Modified Files:
	.cvsignore kdeplasma-addons.spec sources 
Log Message:
KDE 4.1.4



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdeplasma-addons/F-10/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	27 Sep 2008 02:18:07 -0000	1.6
+++ .cvsignore	9 Jan 2009 12:20:24 -0000	1.7
@@ -1 +1 @@
-kdeplasma-addons-4.1.2.tar.bz2
+kdeplasma-addons-4.1.4.tar.bz2


Index: kdeplasma-addons.spec
===================================================================
RCS file: /cvs/extras/rpms/kdeplasma-addons/F-10/kdeplasma-addons.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- kdeplasma-addons.spec	12 Nov 2008 13:33:45 -0000	1.9
+++ kdeplasma-addons.spec	9 Jan 2009 12:20:24 -0000	1.10
@@ -1,6 +1,6 @@
 
 Name:           kdeplasma-addons
-Version:        4.1.3
+Version:        4.1.4
 Release:        1%{?dist}
 Summary:        Additional plasmoids for KDE
 
@@ -90,6 +90,9 @@
 
 
 %changelog
+* Fri Jan  9 2009 Luk???? Tinkl <ltinkl at redhat.com> 4.1.4-1
+- KDE 4.1.4
+
 * Wed Nov 12 2008 Than Ngo <than at redhat.com> 4.1.3-1
 - 4.1.3
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdeplasma-addons/F-10/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	12 Nov 2008 13:33:45 -0000	1.7
+++ sources	9 Jan 2009 12:20:24 -0000	1.8
@@ -1 +1 @@
-72d2d1c95b55fadbbce0e9cd201f1b80  kdeplasma-addons-4.1.3.tar.bz2
+4a0df1a79854539a4022df2308629dc9  kdeplasma-addons-4.1.4.tar.bz2



From ltinkl at fedoraproject.org  Fri Jan  9 12:20:54 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Fri,  9 Jan 2009 12:20:54 +0000 (UTC)
Subject: rpms/kdeplasma-addons/F-9 .cvsignore, 1.5, 1.6 kdeplasma-addons.spec,
	1.6, 1.7 sources, 1.6, 1.7
Message-ID: <20090109122054.E2B807011C@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kdeplasma-addons/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24381/F-9

Modified Files:
	.cvsignore kdeplasma-addons.spec sources 
Log Message:
KDE 4.1.4



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdeplasma-addons/F-9/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	6 Nov 2008 00:44:13 -0000	1.5
+++ .cvsignore	9 Jan 2009 12:20:24 -0000	1.6
@@ -1 +1 @@
-kdeplasma-addons-4.1.3.tar.bz2
+kdeplasma-addons-4.1.4.tar.bz2


Index: kdeplasma-addons.spec
===================================================================
RCS file: /cvs/extras/rpms/kdeplasma-addons/F-9/kdeplasma-addons.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- kdeplasma-addons.spec	6 Nov 2008 00:44:14 -0000	1.6
+++ kdeplasma-addons.spec	9 Jan 2009 12:20:24 -0000	1.7
@@ -1,6 +1,6 @@
 
 Name:           kdeplasma-addons
-Version:        4.1.3
+Version:        4.1.4
 Release:        1%{?dist}
 Summary:        Additional plasmoids for KDE
 
@@ -90,6 +90,9 @@
 
 
 %changelog
+* Fri Jan  9 2009 Luk???? Tinkl <ltinkl at redhat.com> 4.1.4-1
+- KDE 4.1.4
+
 * Thu Nov  6 2008 Luk???? Tinkl <ltinkl at redhat.com> 4.1.3-1
 - KDE 4.1.3
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdeplasma-addons/F-9/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	6 Nov 2008 00:44:14 -0000	1.6
+++ sources	9 Jan 2009 12:20:24 -0000	1.7
@@ -1 +1 @@
-72d2d1c95b55fadbbce0e9cd201f1b80  kdeplasma-addons-4.1.3.tar.bz2
+4a0df1a79854539a4022df2308629dc9  kdeplasma-addons-4.1.4.tar.bz2



From ltinkl at fedoraproject.org  Fri Jan  9 12:38:55 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Fri,  9 Jan 2009 12:38:55 +0000 (UTC)
Subject: rpms/kdesdk/F-10 .cvsignore, 1.50, 1.51 kdesdk.spec, 1.121,
	1.122 sources, 1.53, 1.54
Message-ID: <20090109123855.7BD5F7011C@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kdesdk/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26326/F-10

Modified Files:
	.cvsignore kdesdk.spec sources 
Log Message:
KDE 4.1.4



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdesdk/F-10/.cvsignore,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- .cvsignore	27 Sep 2008 02:25:02 -0000	1.50
+++ .cvsignore	9 Jan 2009 12:38:25 -0000	1.51
@@ -1 +1 @@
-kdesdk-4.1.2.tar.bz2
+kdesdk-4.1.4.tar.bz2


Index: kdesdk.spec
===================================================================
RCS file: /cvs/extras/rpms/kdesdk/F-10/kdesdk.spec,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -r1.121 -r1.122
--- kdesdk.spec	14 Nov 2008 14:17:45 -0000	1.121
+++ kdesdk.spec	9 Jan 2009 12:38:25 -0000	1.122
@@ -1,6 +1,6 @@
 
 Name:           kdesdk
-Version:        4.1.3
+Version:        4.1.4
 Release:        1%{?dist}
 Summary:        The KDE Software Development Kit (SDK)
 
@@ -220,6 +220,9 @@
 
 
 %changelog
+* Fri Jan  9 2009 Luk???? Tinkl <ltinkl at redhat.com> 4.1.4-1
+- KDE 4.1.4
+
 * Wed Nov 12 2008 Than Ngo <than at redhat.com> 4.1.3-1
 - 4.1.3
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdesdk/F-10/sources,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- sources	12 Nov 2008 13:39:55 -0000	1.53
+++ sources	9 Jan 2009 12:38:25 -0000	1.54
@@ -1 +1 @@
-77787a59f74b1b5ed71b49b8643a75f9  kdesdk-4.1.3.tar.bz2
+1ca874a1d239018472bf27d0f2b98feb  kdesdk-4.1.4.tar.bz2



From ltinkl at fedoraproject.org  Fri Jan  9 12:38:55 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Fri,  9 Jan 2009 12:38:55 +0000 (UTC)
Subject: rpms/kdesdk/F-9 .cvsignore, 1.45, 1.46 kdesdk.spec, 1.110,
	1.111 sources, 1.48, 1.49
Message-ID: <20090109123855.96C037011C@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kdesdk/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26326/F-9

Modified Files:
	.cvsignore kdesdk.spec sources 
Log Message:
KDE 4.1.4



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdesdk/F-9/.cvsignore,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- .cvsignore	6 Nov 2008 10:15:06 -0000	1.45
+++ .cvsignore	9 Jan 2009 12:38:25 -0000	1.46
@@ -1 +1 @@
-kdesdk-4.1.3.tar.bz2
+kdesdk-4.1.4.tar.bz2


Index: kdesdk.spec
===================================================================
RCS file: /cvs/extras/rpms/kdesdk/F-9/kdesdk.spec,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -r1.110 -r1.111
--- kdesdk.spec	6 Nov 2008 10:27:58 -0000	1.110
+++ kdesdk.spec	9 Jan 2009 12:38:25 -0000	1.111
@@ -1,6 +1,6 @@
 
 Name:           kdesdk
-Version:        4.1.3
+Version:        4.1.4
 Release:        1%{?dist}
 Summary:        The KDE Software Development Kit (SDK)
 
@@ -220,6 +220,9 @@
 
 
 %changelog
+* Fri Jan  9 2009 Luk???? Tinkl <ltinkl at redhat.com> 4.1.4-1
+- KDE 4.1.4
+
 * Thu Nov  6 2008 Luk???? Tinkl <ltinkl at redhat.com> 4.1.3-1
 - KDE 4.1.3
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdesdk/F-9/sources,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- sources	6 Nov 2008 10:15:06 -0000	1.48
+++ sources	9 Jan 2009 12:38:25 -0000	1.49
@@ -1 +1 @@
-77787a59f74b1b5ed71b49b8643a75f9  kdesdk-4.1.3.tar.bz2
+1ca874a1d239018472bf27d0f2b98feb  kdesdk-4.1.4.tar.bz2



From lkundrak at fedoraproject.org  Fri Jan  9 12:39:50 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Fri,  9 Jan 2009 12:39:50 +0000 (UTC)
Subject: rpms/perl-SVG-Parser/devel perl-SVG-Parser.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090109123950.8BE977011C@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/perl-SVG-Parser/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26512

Modified Files:
	.cvsignore sources 
Added Files:
	perl-SVG-Parser.spec 
Log Message:
Initial import


--- NEW FILE perl-SVG-Parser.spec ---
Name:           perl-SVG-Parser
Version:        1.03
Release:        1%{?dist}
Summary:        XML Parser for SVG documents
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/SVG-Parser/
Source0:        http://www.cpan.org/authors/id/P/PE/PETERW/SVG-Parser-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(Module::Build)
BuildRequires:  perl(SVG) >= 2
BuildRequires:  perl(XML::Parser)
BuildRequires:  perl(XML::SAX)
Requires:       perl(XML::Parser)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))


%description
SVG::Parser is an XML parser for SVG Documents. It takes XML as input and
produces an SVG object as its output.


%prep
%setup -q -n SVG-Parser-%{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
* Tue Jan 06 2009 Lubomir Rintel (Good Data) <lubo.rintel at gooddata.com> 1.03-1
- Specfile autogenerated by cpanspec 1.77.
- Fix BuildRequires


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-SVG-Parser/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	9 Jan 2009 06:04:57 -0000	1.1
+++ .cvsignore	9 Jan 2009 12:39:20 -0000	1.2
@@ -0,0 +1 @@
+SVG-Parser-1.03.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-SVG-Parser/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	9 Jan 2009 06:04:57 -0000	1.1
+++ sources	9 Jan 2009 12:39:20 -0000	1.2
@@ -0,0 +1 @@
+58e1f95faede185edf0657abc443f668  SVG-Parser-1.03.tar.gz



From rdieter at fedoraproject.org  Fri Jan  9 12:49:27 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri,  9 Jan 2009 12:49:27 +0000 (UTC)
Subject: rpms/cmake/F-10 cmake.spec,1.45,1.46 macros.cmake,1.2,1.3
Message-ID: <20090109124927.F1F377011C@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/cmake/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28400

Modified Files:
	cmake.spec macros.cmake 
Log Message:
* Fri Jan 09 2009 Rex Dieter <rdieter at fedoraproject.org>  2.6.3-3
- macros.cmake: add -DCMAKE_VERBOSE_MAKEFILE=ON (#474053)
- macros.cmake: add -DCMAKE_SKIP_RPATH:BOOL=ON



Index: cmake.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cmake/F-10/cmake.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- cmake.spec	22 Oct 2008 17:07:35 -0000	1.45
+++ cmake.spec	9 Jan 2009 12:48:57 -0000	1.46
@@ -8,7 +8,7 @@
 
 Name:           cmake
 Version:        2.6.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Cross-platform make system
 
 Group:          Development/Tools
@@ -130,6 +130,10 @@
 
 
 %changelog
+* Fri Jan 09 2009 Rex Dieter <rdieter at fedoraproject.org>  2.6.3-3
+- macros.cmake: add -DCMAKE_VERBOSE_MAKEFILE=ON (#474053)
+- macros.cmake: add -DCMAKE_SKIP_RPATH:BOOL=ON
+
 * Tue Oct 21 2008 Orion Poplawski <orion at cora.nwra.com> - 2.6.2-2
 - Allow conditional build of gui
 


Index: macros.cmake
===================================================================
RCS file: /cvs/pkgs/rpms/cmake/F-10/macros.cmake,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- macros.cmake	27 Jun 2007 17:00:25 -0000	1.2
+++ macros.cmake	9 Jan 2009 12:48:57 -0000	1.3
@@ -2,6 +2,7 @@
 # Macros for cmake
 #
 %_cmake_lib_suffix64 -DLIB_SUFFIX=64
+%_cmake_skip_rpath -DCMAKE_SKIP_RPATH:BOOL=ON
 %__cmake %{_bindir}/cmake
 
 %cmake \
@@ -9,6 +10,7 @@
   CXXFLAGS="${CXXFLAGS:-%optflags}" ; export CXXFLAGS ; \
   FFLAGS="${FFLAGS:-%optflags}" ; export FFLAGS ; \
   %__cmake \\\
+        -DCMAKE_VERBOSE_MAKEFILE=ON \\\
         -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \\\
         -DCMAKE_INSTALL_LIBDIR:PATH=%{_libdir} \\\
         -DINCLUDE_INSTALL_DIR:PATH=%{_includedir} \\\
@@ -18,4 +20,5 @@
 %if "%{?_lib}" == "lib64" \
         %{?_cmake_lib_suffix64} \\\
 %endif \
+        %{?_cmake_skip_rpath} \\\
         -DBUILD_SHARED_LIBS:BOOL=ON



From nbecker at fedoraproject.org  Fri Jan  9 12:50:44 2009
From: nbecker at fedoraproject.org (Neal Becker)
Date: Fri,  9 Jan 2009 12:50:44 +0000 (UTC)
Subject: rpms/unuran/devel .cvsignore,1.9,1.10 sources,1.9,1.10
Message-ID: <20090109125044.395D77011C@cvs1.fedora.phx.redhat.com>

Author: nbecker

Update of /cvs/pkgs/rpms/unuran/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28874

Modified Files:
	.cvsignore sources 
Log Message:
Update to 1.3.1 final



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/unuran/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	9 Jan 2009 00:16:24 -0000	1.9
+++ .cvsignore	9 Jan 2009 12:50:13 -0000	1.10
@@ -1 +1 @@
-unuran-1.3.devel.tar.gz
+unuran-1.3.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/unuran/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	9 Jan 2009 00:16:24 -0000	1.9
+++ sources	9 Jan 2009 12:50:13 -0000	1.10
@@ -1 +1 @@
-93220119ce0b812218d65bc9d0ffd2d9  unuran-1.3.devel.tar.gz
+ffe7f2028775fd807fb4c04a51ed59c4  unuran-1.3.1.tar.gz



From rdieter at fedoraproject.org  Fri Jan  9 12:54:28 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri,  9 Jan 2009 12:54:28 +0000 (UTC)
Subject: rpms/cmake/F-9 cmake.spec,1.32,1.33 macros.cmake,1.2,1.3
Message-ID: <20090109125428.7ECD17011C@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/cmake/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29665

Modified Files:
	cmake.spec macros.cmake 
Log Message:
* Fri Jan 09 2009 Rex Dieter <rdieter at fedoraproject.org>  2.6.2-3
- macros.cmake: add -DCMAKE_VERBOSE_MAKEFILE=ON (#474053)
- macros.cmake: add -DCMAKE_SKIP_RPATH:BOOL=ON



Index: cmake.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cmake/F-9/cmake.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- cmake.spec	29 Sep 2008 21:58:46 -0000	1.32
+++ cmake.spec	9 Jan 2009 12:53:58 -0000	1.33
@@ -1,12 +1,14 @@
 # Set to bcond_without or use --with bootstrap if bootstrapping a new release
 # or architecture
 %bcond_with bootstrap
+# Set to bcond_with or use --without gui to disable qt4 gui build
+%bcond_without gui
 # Set to RC version if building RC, else %{nil}
 %define rcver %{nil}
 
 Name:           cmake
 Version:        2.6.2
-Release:        1%{?dist}
+Release:        3%{?dist}
 Summary:        Cross-platform make system
 
 Group:          Development/Tools
@@ -17,9 +19,16 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  ncurses-devel, libX11-devel
-BuildRequires:  qt4-devel, desktop-file-utils
 BuildRequires:  curl-devel, expat-devel, zlib-devel
-%{?!with_bootstrap:BuildRequires: xmlrpc-c-devel}
+%if %{without bootstrap}
+BuildRequires: xmlrpc-c-devel
+%endif
+%if %{with gui}
+BuildRequires: qt4-devel, desktop-file-utils
+%define qt_gui --qt-gui
+%else
+%define qt_gui %{nil}
+%endif
 Requires:       rpm
 
 
@@ -32,6 +41,7 @@
 generation, code generation, and template instantiation.
 
 
+%if %{with gui}
 %package        gui
 Summary:        Qt GUI for %{name}
 Group:          Development/Tools
@@ -39,6 +49,7 @@
 
 %description    gui
 The %{name}-gui package contains the Qt based GUI for CMake.
+%endif
 
 
 %prep
@@ -54,7 +65,7 @@
             --docdir=/share/doc/%{name}-%{version} --mandir=/share/man \
             --%{?with_bootstrap:no-}system-libs \
             --parallel=`/usr/bin/getconf _NPROCESSORS_ONLN` \
-            --qt-gui
+            %{qt_gui}
 make VERBOSE=1 %{?_smp_mflags}
 
 
@@ -68,10 +79,12 @@
 # RPM macros
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/rpm
 install -m 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/rpm/
+%if %{with gui}
 # Desktop file
 desktop-file-install --delete-original \
   --dir=%{buildroot}%{_datadir}/applications \
   %{buildroot}/%{_datadir}/applications/CMake.desktop
+%endif
 
 
 %check
@@ -83,6 +96,7 @@
 rm -rf $RPM_BUILD_ROOT
 
 
+%if %{with gui}
 %post gui
 update-desktop-database &> /dev/null || :
 update-mime-database %{_datadir}/mime &> /dev/null || :
@@ -90,6 +104,7 @@
 %postun gui
 update-desktop-database &> /dev/null || :
 update-mime-database %{_datadir}/mime &> /dev/null || :
+%endif
 
 
 %files
@@ -104,15 +119,24 @@
 %{_mandir}/man1/*.1*
 %{_datadir}/emacs/
 
+%if %{with gui}
 %files gui
 %defattr(-,root,root,-)
 %{_bindir}/cmake-gui
 %{_datadir}/applications/CMake.desktop
 %{_datadir}/mime/packages/cmakecache.xml
 %{_datadir}/pixmaps/CMakeSetup.png
+%endif
 
 
 %changelog
+* Fri Jan 09 2009 Rex Dieter <rdieter at fedoraproject.org>  2.6.2-3
+- macros.cmake: add -DCMAKE_VERBOSE_MAKEFILE=ON (#474053)
+- macros.cmake: add -DCMAKE_SKIP_RPATH:BOOL=ON
+
+* Tue Oct 21 2008 Orion Poplawski <orion at cora.nwra.com> - 2.6.2-2
+- Allow conditional build of gui
+
 * Mon Sep 29 2008 Orion Poplawski <orion at cora.nwra.com> - 2.6.2-1
 - Update to 2.6.2
 


Index: macros.cmake
===================================================================
RCS file: /cvs/pkgs/rpms/cmake/F-9/macros.cmake,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- macros.cmake	27 Jun 2007 17:00:25 -0000	1.2
+++ macros.cmake	9 Jan 2009 12:53:58 -0000	1.3
@@ -2,6 +2,7 @@
 # Macros for cmake
 #
 %_cmake_lib_suffix64 -DLIB_SUFFIX=64
+%_cmake_skip_rpath -DCMAKE_SKIP_RPATH:BOOL=ON
 %__cmake %{_bindir}/cmake
 
 %cmake \
@@ -9,6 +10,7 @@
   CXXFLAGS="${CXXFLAGS:-%optflags}" ; export CXXFLAGS ; \
   FFLAGS="${FFLAGS:-%optflags}" ; export FFLAGS ; \
   %__cmake \\\
+        -DCMAKE_VERBOSE_MAKEFILE=ON \\\
         -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \\\
         -DCMAKE_INSTALL_LIBDIR:PATH=%{_libdir} \\\
         -DINCLUDE_INSTALL_DIR:PATH=%{_includedir} \\\
@@ -18,4 +20,5 @@
 %if "%{?_lib}" == "lib64" \
         %{?_cmake_lib_suffix64} \\\
 %endif \
+        %{?_cmake_skip_rpath} \\\
         -DBUILD_SHARED_LIBS:BOOL=ON



From rdieter at fedoraproject.org  Fri Jan  9 12:55:13 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri,  9 Jan 2009 12:55:13 +0000 (UTC)
Subject: rpms/cmake/F-10 cmake.spec,1.46,1.47
Message-ID: <20090109125513.14F057011C@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/cmake/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29785

Modified Files:
	cmake.spec 
Log Message:
changelog typo



Index: cmake.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cmake/F-10/cmake.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- cmake.spec	9 Jan 2009 12:48:57 -0000	1.46
+++ cmake.spec	9 Jan 2009 12:54:42 -0000	1.47
@@ -130,7 +130,7 @@
 
 
 %changelog
-* Fri Jan 09 2009 Rex Dieter <rdieter at fedoraproject.org>  2.6.3-3
+* Fri Jan 09 2009 Rex Dieter <rdieter at fedoraproject.org>  2.6.2-3
 - macros.cmake: add -DCMAKE_VERBOSE_MAKEFILE=ON (#474053)
 - macros.cmake: add -DCMAKE_SKIP_RPATH:BOOL=ON
 



From ltinkl at fedoraproject.org  Fri Jan  9 12:57:58 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Fri,  9 Jan 2009 12:57:58 +0000 (UTC)
Subject: rpms/kdesdk/F-10 kdesdk.spec,1.122,1.123
Message-ID: <20090109125758.404F07011C@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kdesdk/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30168/F-10

Modified Files:
	kdesdk.spec 
Log Message:
BR: libical-devel for kbugbuster



Index: kdesdk.spec
===================================================================
RCS file: /cvs/extras/rpms/kdesdk/F-10/kdesdk.spec,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -r1.122 -r1.123
--- kdesdk.spec	9 Jan 2009 12:38:25 -0000	1.122
+++ kdesdk.spec	9 Jan 2009 12:57:27 -0000	1.123
@@ -36,6 +36,8 @@
 # IMPORTANT: check licensing from time to time, currently libiberty is still
 #            GPLv2+/LGPLv2+
 BuildRequires:  binutils-devel
+# for kbugbuster
+BuildRequires:  libical-devel
 
 Requires(post): xdg-utils
 Requires(postun): xdg-utils



From ltinkl at fedoraproject.org  Fri Jan  9 12:57:58 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Fri,  9 Jan 2009 12:57:58 +0000 (UTC)
Subject: rpms/kdesdk/F-9 kdesdk.spec,1.111,1.112
Message-ID: <20090109125758.6C8EC7011C@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kdesdk/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30168/F-9

Modified Files:
	kdesdk.spec 
Log Message:
BR: libical-devel for kbugbuster



Index: kdesdk.spec
===================================================================
RCS file: /cvs/extras/rpms/kdesdk/F-9/kdesdk.spec,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -r1.111 -r1.112
--- kdesdk.spec	9 Jan 2009 12:38:25 -0000	1.111
+++ kdesdk.spec	9 Jan 2009 12:57:28 -0000	1.112
@@ -36,6 +36,8 @@
 # IMPORTANT: check licensing from time to time, currently libiberty is still
 #            GPLv2+/LGPLv2+
 BuildRequires:  binutils-devel
+# for kbugbuster
+BuildRequires:  libical-devel
 
 Requires(post): xdg-utils
 Requires(postun): xdg-utils



From than at fedoraproject.org  Fri Jan  9 12:58:36 2009
From: than at fedoraproject.org (Than Ngo)
Date: Fri,  9 Jan 2009 12:58:36 +0000 (UTC)
Subject: rpms/soprano/devel .cvsignore, 1.14, 1.15 soprano.spec, 1.24,
	1.25 sources, 1.14, 1.15
Message-ID: <20090109125836.6D7367011C@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/soprano/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30324

Modified Files:
	.cvsignore soprano.spec sources 
Log Message:
2.1.64



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/soprano/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	23 Nov 2008 18:12:04 -0000	1.14
+++ .cvsignore	9 Jan 2009 12:58:06 -0000	1.15
@@ -1 +1,2 @@
 soprano-2.1.1.tar.bz2
+soprano-2.1.64.tar.bz2


Index: soprano.spec
===================================================================
RCS file: /cvs/extras/rpms/soprano/devel/soprano.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- soprano.spec	23 Nov 2008 18:12:04 -0000	1.24
+++ soprano.spec	9 Jan 2009 12:58:06 -0000	1.25
@@ -6,7 +6,7 @@
 
 Summary: Qt wrapper API to different RDF storage solutions
 Name:    soprano
-Version: 2.1.1
+Version: 2.1.64
 Release: 1%{?dist}
 
 Group:   System Environment/Libraries
@@ -108,6 +108,9 @@
 
 
 %changelog
+* Fri Jan 09 2009 Than Ngo <than at redhat.com> - 2.1.64-1
+- update to 2.1.64
+
 * Sun Sep 28 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 2.1.1-1
 - update to 2.1.1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/soprano/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	23 Nov 2008 18:12:04 -0000	1.14
+++ sources	9 Jan 2009 12:58:06 -0000	1.15
@@ -1 +1 @@
-dc590aa42d832cea5ed13145d359c9f2  soprano-2.1.1.tar.bz2
+f62267c1f904450ab0e9d8cab30d252b  soprano-2.1.64.tar.bz2



From nbecker at fedoraproject.org  Fri Jan  9 13:09:10 2009
From: nbecker at fedoraproject.org (Neal Becker)
Date: Fri,  9 Jan 2009 13:09:10 +0000 (UTC)
Subject: rpms/unuran/devel unuran.spec,1.11,1.12
Message-ID: <20090109130910.B89597011C@cvs1.fedora.phx.redhat.com>

Author: nbecker

Update of /cvs/pkgs/rpms/unuran/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31997

Modified Files:
	unuran.spec 
Log Message:
Update to 1.3.1 final



Index: unuran.spec
===================================================================
RCS file: /cvs/pkgs/rpms/unuran/devel/unuran.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- unuran.spec	9 Jan 2009 00:16:24 -0000	1.11
+++ unuran.spec	9 Jan 2009 13:08:40 -0000	1.12
@@ -1,15 +1,12 @@
 Name:		unuran
-Version:	1.3
-%define inc devel
-%define realname %{name}-%{version}.%{inc}
-Release: 	1.%{inc}%{?dist}
+Version:	1.3.1
+Release: 	1%{?dist}
 Summary:	Universal Non-Uniform Random number generator
 
 Group:		System Environment/Libraries
 License:	GPLv2+
 URL:		http://statistik.wu-wien.ac.at/unuran
-#Source0:	http://statistik.wu-wien.ac.at/unuran/%{name}-%{version}.tar.gz
-Source0:	http://statistik.wu-wien.ac.at/unuran/%{realname}.tar.gz
+Source0:	http://statistik.wu-wien.ac.at/unuran/%{name}-%{version}.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires(post): /sbin/ldconfig, /sbin/install-info
@@ -39,7 +36,7 @@
 Header and object files for unuran, and pdf docs.
 
 %prep
-%setup -q -n %{name}-%{version}.%{inc}
+%setup -q -n %{name}-%{version}
 
 
 %build
@@ -99,6 +96,9 @@
 SEED=2742664 make check
 
 %changelog
+* Fri Jan  9 2009 Neal Becker <ndbecker2 at gmail.com> - 1.3.1-1
+- Update to 1.3.1 final
+
 * Thu Jan  8 2009 Neal Becker <ndbecker2 at gmail.com> - 1.3-1.devel%{?dist}
 - Update to 1.3.devel
 



From belegdol at fedoraproject.org  Fri Jan  9 13:14:51 2009
From: belegdol at fedoraproject.org (Julian Sikorski)
Date: Fri,  9 Jan 2009 13:14:51 +0000 (UTC)
Subject: rpms/gnome-subtitles/F-10 gnome-subtitles.spec,1.5,1.6
Message-ID: <20090109131451.9BBCE7011C@cvs1.fedora.phx.redhat.com>

Author: belegdol

Update of /cvs/pkgs/rpms/gnome-subtitles/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv918

Modified Files:
	gnome-subtitles.spec 
Log Message:
* Fri Jan  9 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.8-6.fc10.1
- Rebuilt



Index: gnome-subtitles.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-subtitles/F-10/gnome-subtitles.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- gnome-subtitles.spec	27 Oct 2008 19:54:47 -0000	1.5
+++ gnome-subtitles.spec	9 Jan 2009 13:14:21 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           gnome-subtitles
 Version:        0.8
-Release:        6%{?dist}
+Release:        6%{?dist}.1
 Summary:        Subtitle editor for Gnome
 
 Group:          Applications/Multimedia
@@ -107,6 +107,9 @@
 
 
 %changelog
+* Fri Jan  9 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.8-6.fc10.1
+- Rebuilt
+
 * Mon Oct 27 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.8-6
 - don't use smp_mflags
 



From than at fedoraproject.org  Fri Jan  9 13:17:18 2009
From: than at fedoraproject.org (Than Ngo)
Date: Fri,  9 Jan 2009 13:17:18 +0000 (UTC)
Subject: rpms/kdelibs/devel kdelibs.spec,1.409,1.410
Message-ID: <20090109131718.1A8157011C@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdelibs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1321

Modified Files:
	kdelibs.spec 
Log Message:
BR soprano >= 2.1.64



Index: kdelibs.spec
===================================================================
RCS file: /cvs/extras/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.409
retrieving revision 1.410
diff -u -r1.409 -r1.410
--- kdelibs.spec	8 Jan 2009 21:20:30 -0000	1.409
+++ kdelibs.spec	9 Jan 2009 13:16:47 -0000	1.410
@@ -1,6 +1,6 @@
 Summary: K Desktop Environment 4 - Libraries
 Version: 4.1.96
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs
@@ -40,7 +40,7 @@
 %if 0%{?fedora} >= 9
 Requires: hunspell
 %endif
-Requires: soprano >= 2.1
+Requires: soprano >= 2.1.64
 
 Source1: kde4.sh
 Source2: kde4.csh
@@ -109,7 +109,7 @@
 BuildRequires: pcre-devel
 BuildRequires: phonon-devel >= 4.2
 BuildRequires: shared-mime-info
-BuildRequires: soprano-devel >= 2.1
+BuildRequires: soprano-devel >= 2.1.64
 BuildRequires: strigi-devel >= 0.5.9
 BuildRequires: zlib-devel
 BuildRequires: libutempter-devel
@@ -360,6 +360,9 @@
 
 
 %changelog
+* Fri Jan 09 2009 Than Ngo <than at redhat.com> - 4.1.96-3
+- BR soprano >= 2.1.64
+
 * Thu Jan 08 2009 Than Ngo <than at redhat.com> - 4.1.96-2
 - kdepim cmake files in correct place
 



From limb at fedoraproject.org  Fri Jan  9 13:19:36 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Fri,  9 Jan 2009 13:19:36 +0000 (UTC)
Subject: rpms/chipmunk/devel chipmunk.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090109131936.884EA7011C@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/chipmunk/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1771/devel

Modified Files:
	.cvsignore sources 
Added Files:
	chipmunk.spec import.log 
Log Message:
Initial import.



--- NEW FILE chipmunk.spec ---
%{!?ruby_sitearch: %define ruby_sitearch %(ruby -rrbconfig -e "puts Config::CONFIG['sitearchdir']")}
Name:           chipmunk
Version:        4.1.0
Release:        4%{?dist}
Summary:        Physics engine for 2D games

Group:          Development/Libraries
License:        MIT
URL:            http://http://wiki.slembcke.net/main/published/Chipmunk
Source0:        http://files.slembcke.net/chipmunk/release/Chipmunk-%{version}.tgz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires: cmake
BuildRequires: freeglut-devel
BuildRequires: mesa-libGL-devel
BuildRequires: ruby, ruby-devel
BuildRequires: libX11-devel
BuildRequires: libXext-devel
BuildRequires: ruby

%description
Chipmunk is a 2D rigid body physics library distributed under the MIT license.
Though not yet complete, it is intended to be fast, numerically stable, and 
easy to use.


%package        devel
Summary:        Development tools for programs which will use the chipmunk library
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}

%description    devel
Chipmunk is a 2D rigid body physics library distributed under the MIT license.
Though not yet complete, it is intended to be fast, numerically stable, and 
easy to use.

This package contains the header files and  static libraries to develop
programs that will use the chipmunk library.  You should
install this package if you need to develop programs which will use the 
chipmunk library functions.  You'll also need to install the chipmunk package.

%package        ruby
Summary:        Ruby interface to the chipmunk library
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}
Requires:       ruby(abi) = 1.8

%description    ruby
Chipmunk is a 2D rigid body physics library distributed under the MIT license.
Though not yet complete, it is intended to be fast, numerically stable, and 
easy to use.

This package contains the Ruby interface to the chipmunk library.
You'll also need to install the chipmunk package.


%prep
%setup -qn Chipmunk-%{version}

%build
%if "%{?_lib}" == "lib64" 
  %{cmake} -DLIB_SUFFIX=64
%else
  %{cmake}
%endif 

make VERBOSE=1 %{?_smp_mflags}
pushd ruby
ruby extconf.rb
make
popd

%install
rm -rf $RPM_BUILD_ROOT

mkdir -p $RPM_BUILD_ROOT/%{ruby_sitearch}
install -m 755 ruby/libchipmunk.so.* $RPM_BUILD_ROOT/%{ruby_sitearch}

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 docsrc/ LICENSE.txt README.txt
%{_libdir}/*.so.*
%exclude %{_libdir}/*.a

%files devel
%defattr(-,root,root,-)
%doc Demo/
%{_includedir}/chipmunk
%{_libdir}/*.so

%files ruby
%defattr(-,root,root,-)
%{ruby_sitearch}/*.so.*


%changelog
* Thu Jan 08 2009 Jon Ciesla <limb at jcomserv.net> - 4.1.0-4
- Attempted 64-bit fix.

* Wed Jan 07 2009 Jon Ciesla <limb at jcomserv.net> - 4.1.0-3
- Review fixes.

* Wed Jan 07 2009 Jon Ciesla <limb at jcomserv.net> - 4.1.0-2
- Review fixes.

* Mon Dec 01 2008 Jon Ciesla <limb at jcomserv.net> - 4.1.0-1
- New version.

* Mon Sep 15 2008 Jon Ciesla <limb at jcomserv.net> - 4.0.2-1
- Created package.


--- NEW FILE import.log ---
chipmunk-4_1_0-4_fc10:HEAD:chipmunk-4.1.0-4.fc10.src.rpm:1231507116


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/chipmunk/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	9 Jan 2009 05:54:49 -0000	1.1
+++ .cvsignore	9 Jan 2009 13:19:06 -0000	1.2
@@ -0,0 +1 @@
+Chipmunk-4.1.0.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/chipmunk/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	9 Jan 2009 05:54:49 -0000	1.1
+++ sources	9 Jan 2009 13:19:06 -0000	1.2
@@ -0,0 +1 @@
+804d0e478f2a27a1d272fa07e41480ba  Chipmunk-4.1.0.tgz



From nbecker at fedoraproject.org  Fri Jan  9 13:29:01 2009
From: nbecker at fedoraproject.org (Neal Becker)
Date: Fri,  9 Jan 2009 13:29:01 +0000 (UTC)
Subject: rpms/unuran/F-9 .cvsignore, 1.3, 1.4 sources, 1.4, 1.5 unuran.spec, 
	1.4, 1.5
Message-ID: <20090109132901.4FE817011C@cvs1.fedora.phx.redhat.com>

Author: nbecker

Update of /cvs/pkgs/rpms/unuran/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2980

Modified Files:
	.cvsignore sources unuran.spec 
Log Message:
update to 1.3.1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/unuran/F-9/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	19 Feb 2008 23:43:35 -0000	1.3
+++ .cvsignore	9 Jan 2009 13:28:30 -0000	1.4
@@ -1 +1 @@
-unuran-1.2.1.tar.gz
+unuran-1.3.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/unuran/F-9/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	29 Apr 2008 12:41:51 -0000	1.4
+++ sources	9 Jan 2009 13:28:30 -0000	1.5
@@ -1 +1 @@
-ae62099ac65cfd8f4afdcbad8c366834  unuran-1.2.4p1.tar.gz
+ffe7f2028775fd807fb4c04a51ed59c4  unuran-1.3.1.tar.gz


Index: unuran.spec
===================================================================
RCS file: /cvs/pkgs/rpms/unuran/F-9/unuran.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- unuran.spec	29 Apr 2008 12:41:51 -0000	1.4
+++ unuran.spec	9 Jan 2009 13:28:30 -0000	1.5
@@ -1,5 +1,5 @@
 Name:		unuran
-Version:	1.2.4p1
+Version:	1.3.1
 Release: 	1%{?dist}
 Summary:	Universal Non-Uniform Random number generator
 
@@ -36,7 +36,7 @@
 Header and object files for unuran, and pdf docs.
 
 %prep
-%setup -q -n %{name}-1.2.4-p1
+%setup -q -n %{name}-%{version}
 
 
 %build
@@ -96,6 +96,15 @@
 SEED=2742664 make check
 
 %changelog
+* Fri Jan  9 2009 Neal Becker <ndbecker2 at gmail.com> - 1.3.1-1
+- Update to 1.3.1 final
+
+* Thu Jan  8 2009 Neal Becker <ndbecker2 at gmail.com> - 1.3-1.devel%{?dist}
+- Update to 1.3.devel
+
+* Thu Dec 18 2008 Neal Becker <ndbecker2 at gmail.com> - 1.3.0-1
+- Update to 1.3.0
+
 * Tue Apr 29 2008 Neal Becker <ndbecker2 at gmail.com> - 1.2.4-p1-1
 - Update to 1.2.4-p1 (remove failing test)
 



From than at fedoraproject.org  Fri Jan  9 13:40:04 2009
From: than at fedoraproject.org (Than Ngo)
Date: Fri,  9 Jan 2009 13:40:04 +0000 (UTC)
Subject: rpms/kdebindings/devel kdebindings-4.1.96-akonadi.patch, NONE,
	1.1 kdebindings.spec, 1.163, 1.164
Message-ID: <20090109134004.429F57011C@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdebindings/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4130

Modified Files:
	kdebindings.spec 
Added Files:
	kdebindings-4.1.96-akonadi.patch 
Log Message:
link against kdecore and kdeui


kdebindings-4.1.96-akonadi.patch:

--- NEW FILE kdebindings-4.1.96-akonadi.patch ---
diff -up kdebindings-4.1.96/smoke/akonadi/CMakeLists.txt.orig kdebindings-4.1.96/smoke/akonadi/CMakeLists.txt
--- kdebindings-4.1.96/smoke/akonadi/CMakeLists.txt.orig	2009-01-09 14:37:07.000000000 +0100
+++ kdebindings-4.1.96/smoke/akonadi/CMakeLists.txt	2009-01-09 14:37:29.000000000 +0100
@@ -90,6 +90,7 @@ kde4_add_library(smokeakonadi SHARED ${s
 target_link_libraries(smokeakonadi 
     ${KDEPIMLIBS_AKONADI_LIBS} 
     ${KDEPIMLIBS_AKONADI_KMIME_LIBS}
+    kdecore kdeui
     smokekde
     smokeqt )
 


Index: kdebindings.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebindings/devel/kdebindings.spec,v
retrieving revision 1.163
retrieving revision 1.164
diff -u -r1.163 -r1.164
--- kdebindings.spec	7 Jan 2009 15:46:54 -0000	1.163
+++ kdebindings.spec	9 Jan 2009 13:39:33 -0000	1.164
@@ -31,6 +31,8 @@
 Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/%{name}-%{version}.tar.bz2
 # disable NepomukSmoke by default (-DENABLE_NEPOMUK_SMOKE=ON to enable)
 Patch0: kdebindings-4.1.85-disable-nepomuk-smoke.patch
+# upstream patches
+Patch100: kdebindings-4.1.96-akonadi.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  plasma-devel >= %{version}
@@ -84,6 +86,9 @@
 %setup -q
 %patch0 -p1 -b .disable-nepomuk-smoke
 
+# upstream patches
+%patch100 -p1 -b .akonadi
+
 %build
 mkdir -p %{_target_platform}
 pushd %{_target_platform}



From nbecker at fedoraproject.org  Fri Jan  9 13:43:46 2009
From: nbecker at fedoraproject.org (Neal Becker)
Date: Fri,  9 Jan 2009 13:43:46 +0000 (UTC)
Subject: rpms/unuran/F-10 .cvsignore,1.7,1.8 sources,1.7,1.8
Message-ID: <20090109134346.621C97013F@cvs1.fedora.phx.redhat.com>

Author: nbecker

Update of /cvs/pkgs/rpms/unuran/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4646

Modified Files:
	.cvsignore sources 
Log Message:
update to 1.3.1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/unuran/F-10/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	29 Apr 2008 12:17:36 -0000	1.7
+++ .cvsignore	9 Jan 2009 13:43:15 -0000	1.8
@@ -1 +1 @@
-unuran-1.2.4p1.tar.gz
+unuran-1.3.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/unuran/F-10/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	29 Apr 2008 12:17:36 -0000	1.7
+++ sources	9 Jan 2009 13:43:15 -0000	1.8
@@ -1 +1 @@
-ae62099ac65cfd8f4afdcbad8c366834  unuran-1.2.4p1.tar.gz
+ffe7f2028775fd807fb4c04a51ed59c4  unuran-1.3.1.tar.gz



From nbecker at fedoraproject.org  Fri Jan  9 13:46:57 2009
From: nbecker at fedoraproject.org (Neal Becker)
Date: Fri,  9 Jan 2009 13:46:57 +0000 (UTC)
Subject: rpms/kdiff3/devel .cvsignore, 1.5, 1.6 kdiff3.spec, 1.19,
	1.20 sources, 1.5, 1.6
Message-ID: <20090109134657.2144F7011C@cvs1.fedora.phx.redhat.com>

Author: nbecker

Update of /cvs/pkgs/rpms/kdiff3/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5651

Modified Files:
	.cvsignore kdiff3.spec sources 
Log Message:
Update to 0.9.93-3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdiff3/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	7 Jan 2009 00:22:21 -0000	1.5
+++ .cvsignore	9 Jan 2009 13:46:26 -0000	1.6
@@ -1 +1 @@
-kdiff3-0.9.93-2.tar.gz
+kdiff3-0.9.93-3.tar.gz


Index: kdiff3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdiff3/devel/kdiff3.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- kdiff3.spec	7 Jan 2009 00:22:22 -0000	1.19
+++ kdiff3.spec	9 Jan 2009 13:46:26 -0000	1.20
@@ -1,6 +1,6 @@
-Name:           kdiff3
+gName:           kdiff3
 Version:        0.9.93
-%define inc 2
+%define inc 3
 %define realname %{name}-%{version}-%{inc}
 Release: 	1.%{inc}%{?dist}
 Summary:        Compare + merge 2 or 3 files or directories
@@ -112,6 +112,9 @@
 
 
 %changelog
+* Fri Jan  9 2009 Neal Becker <ndbecker2 at gmail.com> - 0.9.93-1.3%{?dist}
+- Update to 0.9.93-3
+
 * Tue Jan  6 2009 Neal Becker <ndbecker2 at gmail.com> - 0.9.93-2-1
 - Update to 0.9.93-2
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdiff3/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	7 Jan 2009 00:22:22 -0000	1.5
+++ sources	9 Jan 2009 13:46:26 -0000	1.6
@@ -1 +1 @@
-30b4cbf8592c83170d95e984b4047709  kdiff3-0.9.93-2.tar.gz
+f9a3ac045b3df0a24104a4a5e6299488  kdiff3-0.9.93-3.tar.gz



From nbecker at fedoraproject.org  Fri Jan  9 13:48:57 2009
From: nbecker at fedoraproject.org (Neal Becker)
Date: Fri,  9 Jan 2009 13:48:57 +0000 (UTC)
Subject: rpms/kdiff3/devel kdiff3.spec,1.20,1.21
Message-ID: <20090109134857.CBD037011C@cvs1.fedora.phx.redhat.com>

Author: nbecker

Update of /cvs/pkgs/rpms/kdiff3/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5928

Modified Files:
	kdiff3.spec 
Log Message:
Fix typo



Index: kdiff3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdiff3/devel/kdiff3.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- kdiff3.spec	9 Jan 2009 13:46:26 -0000	1.20
+++ kdiff3.spec	9 Jan 2009 13:48:27 -0000	1.21
@@ -1,4 +1,4 @@
-gName:           kdiff3
+Name:           kdiff3
 Version:        0.9.93
 %define inc 3
 %define realname %{name}-%{version}-%{inc}



From caolanm at fedoraproject.org  Fri Jan  9 13:56:10 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Fri,  9 Jan 2009 13:56:10 +0000 (UTC)
Subject: rpms/openoffice.org/devel workspace.sw31bf02.patch, NONE, 1.1
	openoffice.org-3.0.1.ooo97428.config_office.xinerama-on-x86_64.patch, 
	1.1, 1.2 openoffice.org.spec, 1.1747,
	1.1748 openoffice.org-3.0.0.ooo90072.sw.undo-longtext.patch, 1.1, NONE
Message-ID: <20090109135610.840637011C@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6699

Modified Files:
	openoffice.org-3.0.1.ooo97428.config_office.xinerama-on-x86_64.patch 
	openoffice.org.spec 
Added Files:
	workspace.sw31bf02.patch 
Removed Files:
	openoffice.org-3.0.0.ooo90072.sw.undo-longtext.patch 
Log Message:
update patches

workspace.sw31bf02.patch:

--- NEW FILE workspace.sw31bf02.patch ---
diff -up DEV300_m35/sw/source/core/undo/docundo.cxx.orig DEV300_m35/sw/source/core/undo/docundo.cxx
--- DEV300_m35/sw/source/core/undo/docundo.cxx.orig	2008-11-06 09:55:07.000000000 +0100
+++ DEV300_m35/sw/source/core/undo/docundo.cxx	2008-11-06 09:55:23.000000000 +0100
@@ -747,12 +747,6 @@ SwUndoIdAndName * lcl_GetUndoIdAndName(c
         sStr = pUndo->GetComment();
     }
 
-	if( sStr.Len() > 82 )
-	{
-	    String sTmpStr("...", RTL_TEXTENCODING_ASCII_US);
-		sStr.Erase( 80 );
-		sStr += sTmpStr;
-	}
     return new SwUndoIdAndName(nId, &sStr);
 }
 
diff -up DEV300_m35/sw/source/core/undo/undel.cxx.orig DEV300_m35/sw/source/core/undo/undel.cxx
--- DEV300_m35/sw/source/core/undo/undel.cxx.orig	2008-11-04 10:13:54.000000000 +0100
+++ DEV300_m35/sw/source/core/undo/undel.cxx	2008-11-06 09:55:59.000000000 +0100
@@ -595,6 +595,8 @@ SwRewriter SwUndoDelete::GetRewriter() c
                 aStr = UNDO_ARG2;
             }
         }
+        aStr = ShortenString(aStr, nUndoStringLength,
+                                 String(SW_RES(STR_LDOTS)));
 
         if (pHistory)
         {
@@ -602,11 +604,6 @@ SwRewriter SwUndoDelete::GetRewriter() c
 
             aStr = aRewriter.Apply(aStr);
         }
-        else
-        {
-            aStr = ShortenString(aStr, nUndoStringLength,
-                                 String(SW_RES(STR_LDOTS)));
-        }
 
         aResult.AddRule(UNDO_ARG1, aStr);
     }

openoffice.org-3.0.1.ooo97428.config_office.xinerama-on-x86_64.patch:

Index: openoffice.org-3.0.1.ooo97428.config_office.xinerama-on-x86_64.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-3.0.1.ooo97428.config_office.xinerama-on-x86_64.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openoffice.org-3.0.1.ooo97428.config_office.xinerama-on-x86_64.patch	19 Dec 2008 11:53:14 -0000	1.1
+++ openoffice.org-3.0.1.ooo97428.config_office.xinerama-on-x86_64.patch	9 Jan 2009 13:56:09 -0000	1.2
@@ -1,15 +1,14 @@
 diff -up OOO300_m9/config_office/configure.in.orig OOO300_m9.old3/config_office/configure.in
 --- OOO300_m9/config_office/configure.in.orig	2008-12-18 10:51:57.000000000 +0100
 +++ OOO300_m9/config_office/configure.in	2008-12-18 10:52:26.000000000 +0100
-@@ -4320,7 +4320,11 @@ else
+@@ -4348,7 +4348,10 @@
  fi
  AC_SUBST(XINC)
  if test "$x_libraries" = "default_x_libraries"; then
 -   XLIB="/usr/lib"
-+   if test "$build_cpu" != "x86_64" ; then
-+      XLIB="/usr/lib"
-+   else
-+      XLIB="/usr/lib64"
++   XLIB=`$PKG_CONFIG --variable=libdir x11`
++   if test "x$XLIB" = x; then
++         XLIB="/usr/lib"
 +   fi
  else
     XLIB="$x_libraries"


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1747
retrieving revision 1.1748
diff -u -r1.1747 -r1.1748
--- openoffice.org.spec	7 Jan 2009 12:51:24 -0000	1.1747
+++ openoffice.org.spec	9 Jan 2009 13:56:09 -0000	1.1748
@@ -1,6 +1,6 @@
 %define oootag OOO300
 %define ooomilestone 14
-%define rh_rpm_release 4
+%define rh_rpm_release 5
 
 # rhbz#465664 jar-repacking breaks help by reordering META-INF/MANIFEST.MF
 %define __jar_repack %{nil}
@@ -121,7 +121,7 @@
 Patch48: workspace.fwk92.patch
 Patch49: openoffice.org-3.0.0.ooo95834.dontset-nonfunctional-forward.patch
 Patch50: workspace.sb101.patch
-Patch51: openoffice.org-3.0.0.ooo90072.sw.undo-longtext.patch
+Patch51: workspace.sw31bf02.patch
 Patch52: workspace.cmcfixes51.patch
 Patch53: openoffice.org-3.0.0.ooo96279.swext.mediawiki.proxies.patch
 Patch54: openoffice.org-3.0.0.ooo96391.sw.prefsalwaysmodified.patch
@@ -1400,7 +1400,7 @@
 %patch48 -p1 -b .workspace.fwk92.patch
 %patch49 -p1 -b .ooo95834.dontset-nonfunctional-forward.patch
 %patch50 -p1 -b .workspace.sb101.patch
-%patch51 -p1 -b .ooo90072.sw.undo-longtext.patch
+%patch51 -p1 -b .workspace.sw31bf02.patch
 %patch52 -p1 -b .workspace.cmcfixes51.patch
 %patch53 -p1 -b .ooo96279.swext.mediawiki.proxies.patch
 %patch54 -p1 -b .ooo96391.sw.prefsalwaysmodified.patch
@@ -2195,7 +2195,9 @@
 %dir %{baseinstdir}/extensions
 %dir %{basisinstdir}
 %docdir %{basisinstdir}/help
+%dir %{basisinstdir}/help
 %docdir %{basisinstdir}/help/en
+%dir %{basisinstdir}/help/en
 %{basisinstdir}/help/en/default.css
 %{basisinstdir}/help/en/err.html
 %{basisinstdir}/help/en/highcontrast1.css
@@ -2821,6 +2823,7 @@
 %dir %{oooinstdir}/share/config
 %{oooinstdir}/share/config/images_brand.zip
 %docdir %{oooinstdir}/share/readme
+%dir %{oooinstdir}/share/readme
 %{oooinstdir}/share/readme/LICENSE_en-US
 %{oooinstdir}/share/readme/LICENSE_en-US.html
 %{oooinstdir}/share/readme/README_en-US
@@ -2885,6 +2888,7 @@
 %dir %{brinstdir}/share/config
 %{brinstdir}/share/config/images_brand.zip
 %docdir %{brinstdir}/share/readme
+%dir %{brinstdir}/share/readme
 %{brinstdir}/share/readme/LICENSE_pt-BR
 %{brinstdir}/share/readme/LICENSE_pt-BR.html
 %{brinstdir}/share/readme/README_pt-BR
@@ -3816,6 +3820,10 @@
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
+* Fri Jan 09 2009 Caol??n McNamara <caolanm at redhat.com> - 1:3.0.1-14.5
+- rename openoffice.org-3.0.0.ooo90072.sw.undo-longtext.patch to 
+  upstream workspace.sw31bf02.patch
+
 * Wed Jan 07 2009 Caol??n McNamara <caolanm at redhat.com> - 1:3.0.1-14.4
 - add hyphen-el, hyphen-es
 


--- openoffice.org-3.0.0.ooo90072.sw.undo-longtext.patch DELETED ---



From limb at fedoraproject.org  Fri Jan  9 14:04:28 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Fri,  9 Jan 2009 14:04:28 +0000 (UTC)
Subject: rpms/chipmunk/devel chipmunk.spec,1.1,1.2
Message-ID: <20090109140428.4C9EC7011C@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/chipmunk/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7513

Modified Files:
	chipmunk.spec 
Log Message:
Hmm.



Index: chipmunk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/chipmunk/devel/chipmunk.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- chipmunk.spec	9 Jan 2009 13:19:06 -0000	1.1
+++ chipmunk.spec	9 Jan 2009 14:03:57 -0000	1.2
@@ -58,11 +58,11 @@
 %setup -qn Chipmunk-%{version}
 
 %build
-%if "%{?_lib}" == "lib64" 
-  %{cmake} -DLIB_SUFFIX=64
-%else
+#%if "%{?_lib}" == "lib64" 
+#  %{cmake} -DLIB_SUFFIX=64
+#%else
   %{cmake}
-%endif 
+#%endif 
 
 make VERBOSE=1 %{?_smp_mflags}
 pushd ruby



From than at fedoraproject.org  Fri Jan  9 14:21:51 2009
From: than at fedoraproject.org (Than Ngo)
Date: Fri,  9 Jan 2009 14:21:51 +0000 (UTC)
Subject: rpms/kdebindings/devel kdebindings.spec,1.164,1.165
Message-ID: <20090109142151.A56A57011C@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdebindings/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9823

Modified Files:
	kdebindings.spec 
Log Message:
BR soprano-devel >= 2.1.64



Index: kdebindings.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebindings/devel/kdebindings.spec,v
retrieving revision 1.164
retrieving revision 1.165
diff -u -r1.164 -r1.165
--- kdebindings.spec	9 Jan 2009 13:39:33 -0000	1.164
+++ kdebindings.spec	9 Jan 2009 14:21:21 -0000	1.165
@@ -37,7 +37,7 @@
 
 BuildRequires:  plasma-devel >= %{version}
 BuildRequires:  kdepimlibs-devel >= %{version}
-BuildRequires:  soprano-devel >= 2.0.97
+BuildRequires:  soprano-devel >= 2.1.64
 %{?csharp:BuildRequires:  mono-core}
 BuildRequires:  python-devel
 %{?ruby:BuildRequires:  ruby-devel ruby}



From rdieter at fedoraproject.org  Fri Jan  9 14:21:55 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri,  9 Jan 2009 14:21:55 +0000 (UTC)
Subject: rpms/strigi/devel strigi-0.6.2-multilib.patch, NONE, 1.1 .cvsignore,
	1.12, 1.13 sources, 1.12, 1.13 strigi.spec, 1.31,
	1.32 strigi-0.5.11-to-0.5.11.1.diff, 1.1,
	NONE strigi-multilib-fix.patch, 1.5, NONE
Message-ID: <20090109142155.BC04C7011C@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/strigi/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9883

Modified Files:
	.cvsignore sources strigi.spec 
Added Files:
	strigi-0.6.2-multilib.patch 
Removed Files:
	strigi-0.5.11-to-0.5.11.1.diff strigi-multilib-fix.patch 
Log Message:
* Tue Jan 06 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.6.2-1
- strigi-0.6.2
- use %cmake macro


strigi-0.6.2-multilib.patch:

--- NEW FILE strigi-0.6.2-multilib.patch ---
diff -up strigi-0.6.2/src/streams/strigi/strigiconfig.h.cmake.multilib strigi-0.6.2/src/streams/strigi/strigiconfig.h.cmake
--- strigi-0.6.2/src/streams/strigi/strigiconfig.h.cmake.multilib	2009-01-03 04:06:13.000000000 -0600
+++ strigi-0.6.2/src/streams/strigi/strigiconfig.h.cmake	2009-01-09 07:06:12.000000000 -0600
@@ -83,104 +83,6 @@
 #  include <stddef.h>
 #endif
 
-// our needed types
-#if !@HAVE_INT8_T@
- #define HAVE_INT8_T 1
- #if ${SIZEOF_CHAR}==1 //is char one byte?
-  typedef signed char int8_t;
- #else
-  #error Could not determine type for int8_t!
- #endif
-#endif
-
-#if !@HAVE_UINT8_T@
- #define HAVE_UINT8_T 1
- #if ${SIZEOF_CHAR}==1 //is char one byte?
-  typedef unsigned char uint8_t;
- #else
-  #error Could not determine type for uint8_t!
- #endif
-#endif
-
-#if !@HAVE_INT16_T@
- #define HAVE_INT16_T 1
- #if ${SIZEOF_SHORT}==2 //is short two bytes?
-  typedef short int16_t;
- #else
-  #error Could not determine type for int16_t!
- #endif
-#endif
-
-#if !@HAVE_UINT16_T@
- #define HAVE_UINT16_T 1
- #if ${SIZEOF_SHORT}==2 //is short two bytes?
-  typedef unsigned short uint16_t;
- #else
-  #error Could not determine type for uint16_t!
- #endif
-#endif
-
-#if !@HAVE_INT32_T@
- #define HAVE_INT32_T 1
- #if ${SIZEOF_INT}==4 //is int four bytes?
-  typedef int int32_t;
- #elif ${SIZEOF_LONG}==4 //is long four bytes?
-  typedef long int32_t;
- #else
-  #error Could not determine type for int32_t!
- #endif
-#endif
-
-#if !@HAVE_UINT32_T@
- #define HAVE_UINT32_T 1
- #if ${SIZEOF_INT}==4 //is int four bytes?
-  typedef unsigned int uint32_t;
- #elif ${SIZEOF_LONG}==4 //is long four bytes?
-  typedef unsigned long uint32_t;
- #else
-  #error Could not determine type for uint32_t!
- #endif
-#endif
-
-#if !@HAVE_INT64_T@
- #define HAVE_INT64_T 1
- #if ${SIZEOF_LONG}==8
-  typedef long int64_t;
- #elif ${SIZEOF_LONGLONG}==8
-  typedef long long int64_t; 
- #else
-  #error Could not determine type for int64_t!
- #endif
-#endif
-
-#if !@HAVE_UINT64_T@
- #define HAVE_UINT64_T 1
- #if ${SIZEOF_LONG}==8
-  typedef unsigned long uint64_t;
- #elif ${SIZEOF_LONGLONG}==8
-  typedef unsigned long long uint64_t; 
- #elif defined(HAVE___INT64)
-  typedef unsigned __int64 uint64_t; 
- #else
-  #error Could not determine type for uint64_t!
- #endif
-#endif
-
-#if !@HAVE_UINT@
- typedef unsigned int uint;
- #define HAVE_UINT 1
-#endif
-
-#if !@HAVE_SIZE_T@
- #ifndef _SIZE_T_DEFINED 
-  #ifndef HAVE_SIZE_T
-   typedef unsigned int size_t;
-   #define HAVE_SIZE_T 1
-  #endif
-  #define _SIZE_T_DEFINED 1     // kdewin32 define
- #endif
-#endif
-
 #cmakedefine __STRIGI_HAVE_GCC_VISIBILITY
 
 /**


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/strigi/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	23 Nov 2008 02:49:19 -0000	1.12
+++ .cvsignore	9 Jan 2009 14:21:25 -0000	1.13
@@ -1 +1 @@
-strigi-0.5.11.tar.bz2
+strigi-0.6.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/strigi/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	23 Nov 2008 02:49:19 -0000	1.12
+++ sources	9 Jan 2009 14:21:25 -0000	1.13
@@ -1 +1 @@
-f1fa3488a9c2fe1e8128f4d44088c4ad  strigi-0.5.11.tar.bz2
+0b17b84a4db7b3ad9da342a9c093a14d  strigi-0.6.2.tar.bz2


Index: strigi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/strigi/devel/strigi.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- strigi.spec	1 Jan 2009 22:41:49 -0000	1.31
+++ strigi.spec	9 Jan 2009 14:21:25 -0000	1.32
@@ -1,15 +1,14 @@
 Name:		strigi
-Version:	0.5.11.1
-Release:	2%{?dist}
+Version:	0.6.2
+Release:	1%{?dist}
 Summary:	A desktop search program for KDE
 Group:		Applications/Productivity
 License:	LGPLv2+
 URL:		http://www.vandenoever.info/software/strigi
-Source0:	http://www.vandenoever.info/software/strigi/strigi-0.5.11.tar.bz2
+Source0:	http://www.vandenoever.info/software/strigi/strigi-%{version}.tar.bz2
 Source1:	strigiclient.desktop
 Source2:	strigi-daemon.desktop
-Patch0:		strigi-multilib-fix.patch
-Patch1:     strigi-0.5.11-to-0.5.11.1.diff
+Patch0:		strigi-0.6.2-multilib.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	cmake >= 2.4.5
@@ -19,6 +18,8 @@
 BuildRequires:  bison
 BuildRequires:	desktop-file-utils
 
+Requires: %{name}-libs = %{version}-%{release}
+
 %description
 Strigi is a fast and light desktop search engine. It can handle a large range
 of file formats such as emails, office documents, media files, and file
@@ -35,7 +36,7 @@
 %package	devel
 Summary:	Development files for the strigi desktop search engine
 Group:		Development/Libraries
-Requires:	%name-libs = %version-%release
+Requires:	%{name}-libs = %{version}-%{release}
 Requires:	pkgconfig
 
 %description	devel
@@ -49,30 +50,22 @@
 Strigi search engine libraries
 
 %prep
-%setup -q -n strigi-0.5.11
-%patch0 -p1 -b .multilibs
-%patch1 -p0 -b .0.5.11-to-0.5.11.1
+%setup -q 
+%patch0 -p1 -b .multilib
 
 %build
-mkdir fedora
-cd fedora
-export CFLAGS="%{optflags}"
-export CXXFLAGS="%{optflags}"
-export FFLAGS="%{optflags}"
-%ifarch x86_64 ppc64
-%define lib_suffix 64
-%else
-%define lib_suffix %{nil}
-%endif
-cmake	-DCMAKE_INSTALL_PREFIX=%{_prefix}	\
-	-DLIB_DESTINATION=%{_libdir}		\
-	-DLIB_SUFFIX=%{lib_suffix} ..
-make VERBOSE=1 %{?_smp_mflags}
+mkdir -p %{_target_platform}
+pushd %{_target_platform}
+%cmake \
+  -DLIB_DESTINATION=%{_libdir} \
+  ..
+popd
+
+make %{?_smp_mflags} -C %{_target_platform}
 
 %install
 rm -rf %{buildroot}
-cd fedora
-make DESTDIR=%{buildroot} install
+make install/fast -C %{_target_platform}  DESTDIR=%{buildroot}
 
 desktop-file-install					\
 	--vendor="fedora"				\
@@ -80,14 +73,11 @@
 	%{SOURCE1}
 
 # Add an autostart desktop file for the strigi daemon
-mkdir -p %{buildroot}%{_sysconfdir}/xdg/autostart
-cp -pr %{SOURCE2} %{buildroot}%{_sysconfdir}/xdg/autostart/
+install -p -m644 -D %{SOURCE2} %{buildroot}%{_sysconfdir}/xdg/autostart/strigi-daemon.desktop
 
-#%check
-#cd fedora
-#make test
 
-find %{buildroot}%{_libdir} -type f -name "*.so*" -exec chmod 755 {} ';'
+#check
+#make -C %{_target_platform}/tests
 
 %clean
 rm -rf %{buildroot}
@@ -117,6 +107,10 @@
 %{_libdir}/strigi/
 
 %changelog
+* Tue Jan 06 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.6.2-1
+- strigi-0.6.2
+- use %%cmake macro
+
 * Thu Dec 18 2008 Rex Dieter <rdieter at fedoraproject.org> - 0.5.11.1-2 
 - respin (exiv2)
 


--- strigi-0.5.11-to-0.5.11.1.diff DELETED ---


--- strigi-multilib-fix.patch DELETED ---



From nbecker at fedoraproject.org  Fri Jan  9 14:27:37 2009
From: nbecker at fedoraproject.org (Neal Becker)
Date: Fri,  9 Jan 2009 14:27:37 +0000 (UTC)
Subject: rpms/unuran/F-10 unuran.spec,1.9,1.10
Message-ID: <20090109142737.726C47011C@cvs1.fedora.phx.redhat.com>

Author: nbecker

Update of /cvs/pkgs/rpms/unuran/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10776

Modified Files:
	unuran.spec 
Log Message:
update to 1.3.1


Index: unuran.spec
===================================================================
RCS file: /cvs/pkgs/rpms/unuran/F-10/unuran.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- unuran.spec	29 Apr 2008 12:22:06 -0000	1.9
+++ unuran.spec	9 Jan 2009 14:27:07 -0000	1.10
@@ -1,5 +1,5 @@
 Name:		unuran
-Version:	1.2.4p1
+Version:	1.3.1
 Release: 	1%{?dist}
 Summary:	Universal Non-Uniform Random number generator
 
@@ -36,7 +36,7 @@
 Header and object files for unuran, and pdf docs.
 
 %prep
-%setup -q -n %{name}-1.2.4-p1
+%setup -q -n %{name}-%{version}
 
 
 %build
@@ -96,6 +96,15 @@
 SEED=2742664 make check
 
 %changelog
+* Fri Jan  9 2009 Neal Becker <ndbecker2 at gmail.com> - 1.3.1-1
+- Update to 1.3.1 final
+
+* Thu Jan  8 2009 Neal Becker <ndbecker2 at gmail.com> - 1.3-1.devel%{?dist}
+- Update to 1.3.devel
+
+* Thu Dec 18 2008 Neal Becker <ndbecker2 at gmail.com> - 1.3.0-1
+- Update to 1.3.0
+
 * Tue Apr 29 2008 Neal Becker <ndbecker2 at gmail.com> - 1.2.4-p1-1
 - Update to 1.2.4-p1 (remove failing test)
 



From rdieter at fedoraproject.org  Fri Jan  9 14:35:51 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri,  9 Jan 2009 14:35:51 +0000 (UTC)
Subject: rpms/libksba/devel .cvsignore, 1.14, 1.15 libksba.spec, 1.31,
	1.32 sources, 1.14, 1.15
Message-ID: <20090109143551.EFC7D7011C@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/libksba/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11739

Modified Files:
	.cvsignore libksba.spec sources 
Log Message:
* Fri Jan 09 2009 Rex Dieter <rdieter at fedoraproject.org> 1.0.5-1
- libksba-1.0.5



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libksba/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	23 Sep 2008 18:38:01 -0000	1.14
+++ .cvsignore	9 Jan 2009 14:35:21 -0000	1.15
@@ -1,2 +1,2 @@
-libksba-1.0.4.tar.bz2
-libksba-1.0.4.tar.bz2.sig
+libksba-1.0.5.tar.bz2
+libksba-1.0.5.tar.bz2.sig


Index: libksba.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libksba/devel/libksba.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- libksba.spec	23 Sep 2008 18:38:01 -0000	1.31
+++ libksba.spec	9 Jan 2009 14:35:21 -0000	1.32
@@ -1,7 +1,7 @@
 
 Summary: X.509 library
 Name:    libksba
-Version: 1.0.4
+Version: 1.0.5
 Release: 1%{?dist}
 
 License: GPLv3
@@ -92,6 +92,9 @@
 
 
 %changelog
+* Fri Jan 09 2009 Rex Dieter <rdieter at fedoraproject.org> 1.0.5-1
+- libksba-1.0.5
+
 * Thu Sep 23 2008 Rex Dieter <rdieter at fedoraproject.org> 1.0.4-1
 - libksba-1.0.4
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libksba/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	23 Sep 2008 18:38:01 -0000	1.14
+++ sources	9 Jan 2009 14:35:21 -0000	1.15
@@ -1,2 +1,2 @@
-9a512633269e8f30e88abfd3b4105c3c  libksba-1.0.4.tar.bz2
-f383e74ac306b316169c5fc44bf11812  libksba-1.0.4.tar.bz2.sig
+6948a3d96679b5afd504a1f91170b18b  libksba-1.0.5.tar.bz2
+1d94de3b0e8896fad19549d4addf1124  libksba-1.0.5.tar.bz2.sig



From steved at fedoraproject.org  Fri Jan  9 14:37:10 2009
From: steved at fedoraproject.org (Steve Dickson)
Date: Fri,  9 Jan 2009 14:37:10 +0000 (UTC)
Subject: rpms/cachefilesd/devel .cvsignore, 1.8, 1.9 cachefilesd.spec, 1.21, 
	1.22 sources, 1.8, 1.9
Message-ID: <20090109143710.0EDEA7011C@cvs1.fedora.phx.redhat.com>

Author: steved

Update of /cvs/pkgs/rpms/cachefilesd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11999

Modified Files:
	.cvsignore cachefilesd.spec sources 
Log Message:
Upgraded to latest upstream version: 0.9



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cachefilesd/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	22 Sep 2006 17:22:53 -0000	1.8
+++ .cvsignore	9 Jan 2009 14:36:39 -0000	1.9
@@ -5,3 +5,4 @@
 cachefilesd-0.5.tar.bz2
 cachefilesd-0.6.tar.bz2
 cachefilesd-0.7.tar.bz2
+cachefilesd-0.9.tar.bz2


Index: cachefilesd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cachefilesd/devel/cachefilesd.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- cachefilesd.spec	15 Jul 2008 14:12:23 -0000	1.21
+++ cachefilesd.spec	9 Jan 2009 14:36:39 -0000	1.22
@@ -1,6 +1,6 @@
 Name:           cachefilesd
-Version:        0.7
-Release:        5%{?dist}
+Version:        0.9
+Release:        1%{?dist}
 Summary:        CacheFiles userspace management daemon
 Group:          System Environment/Daemons
 License:        GPLv2+
@@ -71,6 +71,9 @@
 %{_mandir}/*/*
 
 %changelog
+* Fri Jan  9 2009 Steve Dickson <steved at redhat.com> 0.9-1
+- Upgraded to latest upstream version: 0.9
+
 * Tue Jul 15 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.7-5
 - fix license tag
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cachefilesd/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	22 Sep 2006 17:22:53 -0000	1.8
+++ sources	9 Jan 2009 14:36:39 -0000	1.9
@@ -1 +1 @@
-fdc9c57339e395ce0e3f019a37e2ba7d  cachefilesd-0.7.tar.bz2
+6c674f253f61dd61e26c60ce3edc02c5  cachefilesd-0.9.tar.bz2



From cweyl at fedoraproject.org  Fri Jan  9 15:28:50 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Fri,  9 Jan 2009 15:28:50 +0000 (UTC)
Subject: rpms/perl-MooseX-Traits-Attribute-CascadeClear/devel import.log,
	NONE, 1.1 perl-MooseX-Traits-Attribute-CascadeClear.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090109152850.F31F47011C@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-MooseX-Traits-Attribute-CascadeClear/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18830/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-MooseX-Traits-Attribute-CascadeClear.spec 
Log Message:
initial import


--- NEW FILE import.log ---
perl-MooseX-Traits-Attribute-CascadeClear-0_02-1_fc10:HEAD:perl-MooseX-Traits-Attribute-CascadeClear-0.02-1.fc10.src.rpm:1231514889


--- NEW FILE perl-MooseX-Traits-Attribute-CascadeClear.spec ---
Name:       perl-MooseX-Traits-Attribute-CascadeClear 
Version:    0.02 
Release:    1%{?dist}
# lib/Moose/Meta/Attribute/Custom/Trait/CascadeClear.pm -> LGPLv2, LGPLv3
# lib/Moose/Meta/Attribute/Custom/Trait/CascadeClearMaster.pm -> LGPLv2, LGPLv3
# lib/MooseX/Traits/Attribute/CascadeClear.pm -> LGPLv2, LGPLv3
# lib/MooseX/Traits/Attribute/CascadeClearMaster.pm -> LGPLv2, LGPLv3
License:    LGPLv2+ 
Group:      Development/Libraries
Summary:    Attribute trait to cascade clearer actions
Source:     http://search.cpan.org/CPAN/authors/id/R/RS/RSRCHBOY/MooseX-Traits-Attribute-CascadeClear-%{version}.tar.gz 
Url:        http://search.cpan.org/dist/MooseX-Traits-Attribute-CascadeClear
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(FindBin)
BuildRequires: perl(Moose)
BuildRequires: perl(Moose::Role)
BuildRequires: perl(Test::More)


%description
CascadeClearer is an attribute metaclass trait that allows one to chain
attribute clearing actions.  For instance, if you have attributes that 
derive their value from a "master" attribute, this would transparently 
allow you to clear all the children attributes by clearing the master 
attribute.


%prep
%setup -q -n MooseX-Traits-Attribute-CascadeClear-%{version}

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

%install
rm -rf %{buildroot}

make pure_install PERL_INSTALL_ROOT=%{buildroot}
find %{buildroot} -type f -name .packlist -exec rm -f {} ';'
find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null ';'

%{_fixperms} %{buildroot}/*

%check
make test

%clean
rm -rf %{buildroot} 

%files
%defattr(-,root,root,-)
%doc Changes README 
%{perl_vendorlib}/*
%{_mandir}/man3/*.3*

%changelog
* Sun Jan 04 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.02-1
- touch up for submission

* Mon Dec 29 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.02-0.1
- update to 0.02

* Mon Dec 29 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.01-0
- initial RPM packaging
- generated with cpan2dist (CPANPLUS::Dist::RPM version 0.0.7)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-MooseX-Traits-Attribute-CascadeClear/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	9 Jan 2009 05:59:33 -0000	1.1
+++ .cvsignore	9 Jan 2009 15:28:20 -0000	1.2
@@ -0,0 +1 @@
+MooseX-Traits-Attribute-CascadeClear-0.02.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-MooseX-Traits-Attribute-CascadeClear/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	9 Jan 2009 05:59:33 -0000	1.1
+++ sources	9 Jan 2009 15:28:20 -0000	1.2
@@ -0,0 +1 @@
+c6787e2c956fdbe08d27a5c7b97d9b06  MooseX-Traits-Attribute-CascadeClear-0.02.tar.gz



From tuju at fedoraproject.org  Fri Jan  9 15:28:49 2009
From: tuju at fedoraproject.org (Juha Tuomala)
Date: Fri,  9 Jan 2009 15:28:49 +0000 (UTC)
Subject: rpms/dfu-util/devel dfu-util.spec,1.1,1.2
Message-ID: <20090109152849.9C0937011C@cvs1.fedora.phx.redhat.com>

Author: tuju

Update of /cvs/pkgs/rpms/dfu-util/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18677

Modified Files:
	dfu-util.spec 
Log Message:
Add spec url to description.



Index: dfu-util.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dfu-util/devel/dfu-util.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- dfu-util.spec	4 Dec 2008 17:20:06 -0000	1.1
+++ dfu-util.spec	9 Jan 2009 15:28:19 -0000	1.2
@@ -36,6 +36,9 @@
 In addition to firmware download, it also specifies firmware upload, i.e.
 loading the currently installed device firmware to the USB Host.
 
+DFU specification can be found from:
+ http://www.usb.org/developers/devclass_docs/usbdfu10.pdf
+
 
 %prep
 %setup -q -n %{name}-%{snapshot}



From jnovy at fedoraproject.org  Fri Jan  9 15:29:43 2009
From: jnovy at fedoraproject.org (Jindrich Novy)
Date: Fri,  9 Jan 2009 15:29:43 +0000 (UTC)
Subject: rpms/texi2html/devel texi2html.spec,1.18,1.19
Message-ID: <20090109152943.2B6CE7011C@cvs1.fedora.phx.redhat.com>

Author: jnovy

Update of /cvs/pkgs/rpms/texi2html/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19030

Modified Files:
	texi2html.spec 
Log Message:
* Fri Jan  9 2009 Jindrich Novy <jnovy at redhat.com> 1.82-2
- run tests after build



Index: texi2html.spec
===================================================================
RCS file: /cvs/pkgs/rpms/texi2html/devel/texi2html.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- texi2html.spec	9 Jan 2009 07:58:54 -0000	1.18
+++ texi2html.spec	9 Jan 2009 15:29:12 -0000	1.19
@@ -1,6 +1,6 @@
 Name: texi2html
 Version: 1.82
-Release: 1%{?dist}
+Release: 2%{?dist}
 # GPLv2+ is for the code
 # OFSFDL (Old FSF Documentation License) for the documentation
 # CC-BY-SA or GPLv2 for the images
@@ -13,7 +13,7 @@
 Requires(preun): /sbin/install-info
 Requires: perl >= 5.004
 Requires: latex2html
-BuildRequires: perl(Text::Unidecode) 
+BuildRequires: perl(Text::Unidecode) latex2html tetex-tex4ht
 # not detected automatically because it is required at runtime based on
 # user configuration
 Requires: perl(Text::Unidecode)
@@ -42,6 +42,8 @@
 # config files, like htmlxref.cnf
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/texinfo $RPM_BUILD_ROOT%{_sysconfdir}/texinfo
 
+%check
+make check
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -72,6 +74,9 @@
 %dir %{_sysconfdir}/texinfo
 
 %changelog
+* Fri Jan  9 2009 Jindrich Novy <jnovy at redhat.com> 1.82-2
+- run tests after build
+
 * Fri Jan  9 2009 Jindrich Novy <jnovy at redhat.com> 1.82-1
 - update to 1.82
 



From cweyl at fedoraproject.org  Fri Jan  9 15:30:47 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Fri,  9 Jan 2009 15:30:47 +0000 (UTC)
Subject: rpms/perl-MooseX-Traits-Attribute-CascadeClear/F-10 import.log, NONE,
	1.1 perl-MooseX-Traits-Attribute-CascadeClear.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090109153047.27A0F7011C@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-MooseX-Traits-Attribute-CascadeClear/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19366/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-MooseX-Traits-Attribute-CascadeClear.spec 
Log Message:
initial import


--- NEW FILE import.log ---
perl-MooseX-Traits-Attribute-CascadeClear-0_02-1_fc10:F-10:perl-MooseX-Traits-Attribute-CascadeClear-0.02-1.fc10.src.rpm:1231515005


--- NEW FILE perl-MooseX-Traits-Attribute-CascadeClear.spec ---
Name:       perl-MooseX-Traits-Attribute-CascadeClear 
Version:    0.02 
Release:    1%{?dist}
# lib/Moose/Meta/Attribute/Custom/Trait/CascadeClear.pm -> LGPLv2, LGPLv3
# lib/Moose/Meta/Attribute/Custom/Trait/CascadeClearMaster.pm -> LGPLv2, LGPLv3
# lib/MooseX/Traits/Attribute/CascadeClear.pm -> LGPLv2, LGPLv3
# lib/MooseX/Traits/Attribute/CascadeClearMaster.pm -> LGPLv2, LGPLv3
License:    LGPLv2+ 
Group:      Development/Libraries
Summary:    Attribute trait to cascade clearer actions
Source:     http://search.cpan.org/CPAN/authors/id/R/RS/RSRCHBOY/MooseX-Traits-Attribute-CascadeClear-%{version}.tar.gz 
Url:        http://search.cpan.org/dist/MooseX-Traits-Attribute-CascadeClear
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(FindBin)
BuildRequires: perl(Moose)
BuildRequires: perl(Moose::Role)
BuildRequires: perl(Test::More)


%description
CascadeClearer is an attribute metaclass trait that allows one to chain
attribute clearing actions.  For instance, if you have attributes that 
derive their value from a "master" attribute, this would transparently 
allow you to clear all the children attributes by clearing the master 
attribute.


%prep
%setup -q -n MooseX-Traits-Attribute-CascadeClear-%{version}

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

%install
rm -rf %{buildroot}

make pure_install PERL_INSTALL_ROOT=%{buildroot}
find %{buildroot} -type f -name .packlist -exec rm -f {} ';'
find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null ';'

%{_fixperms} %{buildroot}/*

%check
make test

%clean
rm -rf %{buildroot} 

%files
%defattr(-,root,root,-)
%doc Changes README 
%{perl_vendorlib}/*
%{_mandir}/man3/*.3*

%changelog
* Sun Jan 04 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.02-1
- touch up for submission

* Mon Dec 29 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.02-0.1
- update to 0.02

* Mon Dec 29 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.01-0
- initial RPM packaging
- generated with cpan2dist (CPANPLUS::Dist::RPM version 0.0.7)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-MooseX-Traits-Attribute-CascadeClear/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	9 Jan 2009 05:59:33 -0000	1.1
+++ .cvsignore	9 Jan 2009 15:30:16 -0000	1.2
@@ -0,0 +1 @@
+MooseX-Traits-Attribute-CascadeClear-0.02.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-MooseX-Traits-Attribute-CascadeClear/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	9 Jan 2009 05:59:33 -0000	1.1
+++ sources	9 Jan 2009 15:30:16 -0000	1.2
@@ -0,0 +1 @@
+c6787e2c956fdbe08d27a5c7b97d9b06  MooseX-Traits-Attribute-CascadeClear-0.02.tar.gz



From cweyl at fedoraproject.org  Fri Jan  9 15:31:49 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Fri,  9 Jan 2009 15:31:49 +0000 (UTC)
Subject: rpms/perl-MooseX-Traits-Attribute-CascadeClear/F-9 import.log, NONE,
	1.1 perl-MooseX-Traits-Attribute-CascadeClear.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090109153149.9145E7011C@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-MooseX-Traits-Attribute-CascadeClear/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19704/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-MooseX-Traits-Attribute-CascadeClear.spec 
Log Message:
initial import


--- NEW FILE import.log ---
perl-MooseX-Traits-Attribute-CascadeClear-0_02-1_fc10:F-9:perl-MooseX-Traits-Attribute-CascadeClear-0.02-1.fc10.src.rpm:1231515067


--- NEW FILE perl-MooseX-Traits-Attribute-CascadeClear.spec ---
Name:       perl-MooseX-Traits-Attribute-CascadeClear 
Version:    0.02 
Release:    1%{?dist}
# lib/Moose/Meta/Attribute/Custom/Trait/CascadeClear.pm -> LGPLv2, LGPLv3
# lib/Moose/Meta/Attribute/Custom/Trait/CascadeClearMaster.pm -> LGPLv2, LGPLv3
# lib/MooseX/Traits/Attribute/CascadeClear.pm -> LGPLv2, LGPLv3
# lib/MooseX/Traits/Attribute/CascadeClearMaster.pm -> LGPLv2, LGPLv3
License:    LGPLv2+ 
Group:      Development/Libraries
Summary:    Attribute trait to cascade clearer actions
Source:     http://search.cpan.org/CPAN/authors/id/R/RS/RSRCHBOY/MooseX-Traits-Attribute-CascadeClear-%{version}.tar.gz 
Url:        http://search.cpan.org/dist/MooseX-Traits-Attribute-CascadeClear
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(FindBin)
BuildRequires: perl(Moose)
BuildRequires: perl(Moose::Role)
BuildRequires: perl(Test::More)


%description
CascadeClearer is an attribute metaclass trait that allows one to chain
attribute clearing actions.  For instance, if you have attributes that 
derive their value from a "master" attribute, this would transparently 
allow you to clear all the children attributes by clearing the master 
attribute.


%prep
%setup -q -n MooseX-Traits-Attribute-CascadeClear-%{version}

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

%install
rm -rf %{buildroot}

make pure_install PERL_INSTALL_ROOT=%{buildroot}
find %{buildroot} -type f -name .packlist -exec rm -f {} ';'
find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null ';'

%{_fixperms} %{buildroot}/*

%check
make test

%clean
rm -rf %{buildroot} 

%files
%defattr(-,root,root,-)
%doc Changes README 
%{perl_vendorlib}/*
%{_mandir}/man3/*.3*

%changelog
* Sun Jan 04 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.02-1
- touch up for submission

* Mon Dec 29 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.02-0.1
- update to 0.02

* Mon Dec 29 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.01-0
- initial RPM packaging
- generated with cpan2dist (CPANPLUS::Dist::RPM version 0.0.7)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-MooseX-Traits-Attribute-CascadeClear/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	9 Jan 2009 05:59:33 -0000	1.1
+++ .cvsignore	9 Jan 2009 15:31:19 -0000	1.2
@@ -0,0 +1 @@
+MooseX-Traits-Attribute-CascadeClear-0.02.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-MooseX-Traits-Attribute-CascadeClear/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	9 Jan 2009 05:59:33 -0000	1.1
+++ sources	9 Jan 2009 15:31:19 -0000	1.2
@@ -0,0 +1 @@
+c6787e2c956fdbe08d27a5c7b97d9b06  MooseX-Traits-Attribute-CascadeClear-0.02.tar.gz



From pkgdb at fedoraproject.org  Fri Jan  9 15:43:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Jan 2009 15:43:59 +0000
Subject: [pkgdb] ruby-gnome2 ownership updated
Message-ID: <20090109154359.3B55D20831C@bastion.fedora.phx.redhat.com>

Package ruby-gnome2 in Fedora devel is now owned by itamarjp

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ruby-gnome2



From pkgdb at fedoraproject.org  Fri Jan  9 15:44:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Jan 2009 15:44:02 +0000
Subject: [pkgdb] ruby-gnome2: itamarjp has requested watchbugzilla
Message-ID: <20090109154402.97B4220831F@bastion.fedora.phx.redhat.com>

itamarjp has requested the watchbugzilla acl on ruby-gnome2 (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ruby-gnome2



From pkgdb at fedoraproject.org  Fri Jan  9 15:44:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Jan 2009 15:44:03 +0000
Subject: [pkgdb] ruby-gnome2: itamarjp has requested watchcommits
Message-ID: <20090109154403.710B7208455@bastion.fedora.phx.redhat.com>

itamarjp has requested the watchcommits acl on ruby-gnome2 (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ruby-gnome2



From pkgdb at fedoraproject.org  Fri Jan  9 15:44:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Jan 2009 15:44:04 +0000
Subject: [pkgdb] ruby-gnome2: itamarjp has requested commit
Message-ID: <20090109154404.8694D208457@bastion.fedora.phx.redhat.com>

itamarjp has requested the commit acl on ruby-gnome2 (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ruby-gnome2



From pkgdb at fedoraproject.org  Fri Jan  9 15:44:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Jan 2009 15:44:05 +0000
Subject: [pkgdb] ruby-gnome2: itamarjp has requested approveacls
Message-ID: <20090109154405.75DE1208466@bastion.fedora.phx.redhat.com>

itamarjp has requested the approveacls acl on ruby-gnome2 (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ruby-gnome2



From rdieter at fedoraproject.org  Fri Jan  9 15:44:09 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri,  9 Jan 2009 15:44:09 +0000 (UTC)
Subject: rpms/kdelibs/devel kde4.csh, 1.2, 1.3 kde4.sh, 1.2, 1.3 kdelibs.spec,
	1.410, 1.411
Message-ID: <20090109154409.299147011C@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdelibs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21133

Modified Files:
	kde4.csh kde4.sh kdelibs.spec 
Log Message:
* Fri Jan 09 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.1.96-4
- bump min deps (cmake, kde-filesystem, phonon)
- kde.(sh|csh): cleanup QT_PLUGIN_PATH handling
- Requires: coreutils grep



Index: kde4.csh
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/kde4.csh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- kde4.csh	1 Dec 2007 19:43:21 -0000	1.2
+++ kde4.csh	9 Jan 2009 15:43:38 -0000	1.3
@@ -10,9 +10,16 @@
    if ( "$PRELINKING" == "yes" )  then
      if ( ! $?KDE_IS_PRELINKED ) setenv KDE_IS_PRELINKED 1
    endif
+   unset PRELINKING
 endif
 
-if ( ! $?QT_PLUGIN_PATH ) then
-  set KDE4_LIBDIR = `/bin/rpm --eval %\{\?_kde4_libdir\}%\{\!\?_kde4_libdir:%\{_libdir\}\}`
-  setenv QT_PLUGIN_PATH ${KDE4_LIBDIR}/kde4/plugins
+# handled in startkde, but this sets for other DE's too
+set KDE4_QTPLUGINS=`kde4-config --path qtplugins`
+if ( $?QT_PLUGIN_PATH ) then
+  if ( "$QT_PLUGIN_PATH" !~ *"${KDE4_QTPLUGINS}"* ) then
+    setenv QT_PLUGIN_PATH ${QT_PLUGIN_PATH}:${KDE4_QTPLUGINS}
+  endif 
+else
+  setenv QT_PLUGIN_PATH ${KDE4_QTPLUGINS} 
 endif
+unset KDE4_QTPLUGINS


Index: kde4.sh
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/kde4.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- kde4.sh	1 Dec 2007 19:43:21 -0000	1.2
+++ kde4.sh	9 Jan 2009 15:43:38 -0000	1.3
@@ -11,7 +11,13 @@
   fi
 fi
 
-if [ -z "$QT_PLUGIN_PATH" ]; then
-  KDE4_LIBDIR=`/bin/rpm --eval '%{?_kde4_libdir}%{!?_kde4_libdir:%{_libdir}}' 2>/dev/null`
-  QT_PLUGIN_PATH=${KDE4_LIBDIR}/kde4/plugins && export QT_PLUGIN_PATH
+# handled in startkde, but this sets for other DE's too
+if [ -n "$QT_PLUGIN_PATH" ] ; then
+  if ! echo "$QT_PLUGIN_PATH" | grep -qw `kde4-config --path qtplugins` ; then
+    QT_PLUGIN_PATH="$QT_PLUGIN_PATH:`kde4-config --path qtplugins`"
+  fi
+else
+  QT_PLUGIN_PATH="`kde4-config --path qtplugins`"
 fi
+export QT_PLUGIN_PATH
+


Index: kdelibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.410
retrieving revision 1.411
diff -u -r1.410 -r1.411
--- kdelibs.spec	9 Jan 2009 13:16:47 -0000	1.410
+++ kdelibs.spec	9 Jan 2009 15:43:38 -0000	1.411
@@ -27,10 +27,14 @@
 %endif
 
 BuildRequires: kde4-macros(api) >= 2
-BuildRequires: kde-filesystem >= 4
+BuildRequires: kde-filesystem >= 4-23
+# used in kde.(sh|csh)
+Requires: coreutils grep
+# dbus-launch needed here? don't think so, but be safe and keep 
+# for now -- Rex
 Requires: dbus-x11
 Requires: hicolor-icon-theme
-Requires: kde-filesystem >= 4
+Requires: kde-filesystem >= 4-23
 Requires: kde-settings
 %{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
 Requires: shared-mime-info
@@ -40,6 +44,7 @@
 %if 0%{?fedora} >= 9
 Requires: hunspell
 %endif
+Requires: phonon >= 4.2.96
 Requires: soprano >= 2.1.64
 
 Source1: kde4.sh
@@ -89,7 +94,7 @@
 BuildRequires: automoc
 BuildRequires: avahi-devel
 BuildRequires: bzip2-devel
-BuildRequires: cmake >= 2.6.2
+BuildRequires: cmake >= 2.6.2-3
 BuildRequires: cups-devel cups
 BuildRequires: enchant-devel
 BuildRequires: gamin-devel
@@ -107,7 +112,7 @@
 BuildRequires: OpenEXR-devel
 BuildRequires: openssl-devel
 BuildRequires: pcre-devel
-BuildRequires: phonon-devel >= 4.2
+BuildRequires: phonon-devel >= 4.2.96
 BuildRequires: shared-mime-info
 BuildRequires: soprano-devel >= 2.1.64
 BuildRequires: strigi-devel >= 0.5.9
@@ -145,11 +150,11 @@
 Obsoletes: kdelibs4-devel < %{version}-%{release}
 Provides:  kdelibs4-devel = %{version}-%{release}
 %endif
-Requires: cmake >= 2.6.2
+Requires: cmake >= 2.6.2-3
 Requires: automoc
 Requires: qt4-devel
 Requires: openssl-devel
-Requires: phonon-devel >= 4.2
+Requires: phonon-devel >= 4.2.96
 Requires: strigi-devel
 Requires: bzip2-devel gamin-devel libacl-devel zlib-devel libutempter-devel
 %{?x_deps:Requires: %{x_deps}}
@@ -360,6 +365,11 @@
 
 
 %changelog
+* Fri Jan 09 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.1.96-4
+- bump min deps (cmake, kde-filesystem, phonon)
+- kde.(sh|csh): cleanup QT_PLUGIN_PATH handling
+- Requires: coreutils grep
+
 * Fri Jan 09 2009 Than Ngo <than at redhat.com> - 4.1.96-3
 - BR soprano >= 2.1.64
 



From pkgdb at fedoraproject.org  Fri Jan  9 15:44:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Jan 2009 15:44:10 +0000
Subject: [pkgdb] ruby-gnome2 ownership updated
Message-ID: <20090109154410.D41D520846C@bastion.fedora.phx.redhat.com>

Package ruby-gnome2 in Fedora 10 is now owned by itamarjp

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ruby-gnome2



From pkgdb at fedoraproject.org  Fri Jan  9 15:44:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Jan 2009 15:44:15 +0000
Subject: [pkgdb] ruby-gnome2: itamarjp has requested watchcommits
Message-ID: <20090109154415.B2D4E20831D@bastion.fedora.phx.redhat.com>

itamarjp has requested the watchcommits acl on ruby-gnome2 (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ruby-gnome2



From pkgdb at fedoraproject.org  Fri Jan  9 15:44:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Jan 2009 15:44:15 +0000
Subject: [pkgdb] ruby-gnome2: itamarjp has requested watchbugzilla
Message-ID: <20090109154415.DEC8C20846D@bastion.fedora.phx.redhat.com>

itamarjp has requested the watchbugzilla acl on ruby-gnome2 (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ruby-gnome2



From pkgdb at fedoraproject.org  Fri Jan  9 15:44:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Jan 2009 15:44:16 +0000
Subject: [pkgdb] ruby-gnome2: itamarjp has requested commit
Message-ID: <20090109154416.5C5E7208470@bastion.fedora.phx.redhat.com>

itamarjp has requested the commit acl on ruby-gnome2 (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ruby-gnome2



From pkgdb at fedoraproject.org  Fri Jan  9 15:44:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Jan 2009 15:44:19 +0000
Subject: [pkgdb] ruby-gnome2: itamarjp has requested approveacls
Message-ID: <20090109154419.47F69208472@bastion.fedora.phx.redhat.com>

itamarjp has requested the approveacls acl on ruby-gnome2 (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ruby-gnome2



From pkgdb at fedoraproject.org  Fri Jan  9 15:44:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Jan 2009 15:44:29 +0000
Subject: [pkgdb] ruby-gnome2: itamarjp has requested watchbugzilla
Message-ID: <20090109154430.0414520831F@bastion.fedora.phx.redhat.com>

itamarjp has requested the watchbugzilla acl on ruby-gnome2 (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ruby-gnome2



From pkgdb at fedoraproject.org  Fri Jan  9 15:44:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Jan 2009 15:44:21 +0000
Subject: [pkgdb] ruby-gnome2 ownership updated
Message-ID: <20090109154421.7F403208474@bastion.fedora.phx.redhat.com>

Package ruby-gnome2 in Fedora 9 is now owned by itamarjp

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ruby-gnome2



From pkgdb at fedoraproject.org  Fri Jan  9 15:44:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Jan 2009 15:44:31 +0000
Subject: [pkgdb] ruby-gnome2: itamarjp has requested watchcommits
Message-ID: <20090109154431.5B751208455@bastion.fedora.phx.redhat.com>

itamarjp has requested the watchcommits acl on ruby-gnome2 (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ruby-gnome2



From pkgdb at fedoraproject.org  Fri Jan  9 15:44:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Jan 2009 15:44:31 +0000
Subject: [pkgdb] ruby-gnome2: itamarjp has requested commit
Message-ID: <20090109154431.644DB208476@bastion.fedora.phx.redhat.com>

itamarjp has requested the commit acl on ruby-gnome2 (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ruby-gnome2



From pkgdb at fedoraproject.org  Fri Jan  9 15:44:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Jan 2009 15:44:33 +0000
Subject: [pkgdb] ruby-gnome2: itamarjp has requested approveacls
Message-ID: <20090109154433.52458208457@bastion.fedora.phx.redhat.com>

itamarjp has requested the approveacls acl on ruby-gnome2 (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ruby-gnome2



From pkgdb at fedoraproject.org  Fri Jan  9 15:44:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Jan 2009 15:44:34 +0000
Subject: [pkgdb] ruby-gnome2 ownership updated
Message-ID: <20090109154434.B890B208458@bastion.fedora.phx.redhat.com>

Package ruby-gnome2 in Fedora 8 is now owned by itamarjp

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ruby-gnome2



From pkgdb at fedoraproject.org  Fri Jan  9 15:44:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Jan 2009 15:44:50 +0000
Subject: [pkgdb] ruby-gnome2: itamarjp has requested watchbugzilla
Message-ID: <20090109154450.5FF9E20831D@bastion.fedora.phx.redhat.com>

itamarjp has requested the watchbugzilla acl on ruby-gnome2 (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ruby-gnome2



From pkgdb at fedoraproject.org  Fri Jan  9 15:44:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Jan 2009 15:44:51 +0000
Subject: [pkgdb] ruby-gnome2: itamarjp has requested watchcommits
Message-ID: <20090109154451.B129F208469@bastion.fedora.phx.redhat.com>

itamarjp has requested the watchcommits acl on ruby-gnome2 (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ruby-gnome2



From pkgdb at fedoraproject.org  Fri Jan  9 15:44:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Jan 2009 15:44:52 +0000
Subject: [pkgdb] ruby-gnome2: itamarjp has requested commit
Message-ID: <20090109154452.080B020846C@bastion.fedora.phx.redhat.com>

itamarjp has requested the commit acl on ruby-gnome2 (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ruby-gnome2



From pkgdb at fedoraproject.org  Fri Jan  9 15:44:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Jan 2009 15:44:52 +0000
Subject: [pkgdb] ruby-gnome2: itamarjp has requested approveacls
Message-ID: <20090109154452.D159120831C@bastion.fedora.phx.redhat.com>

itamarjp has requested the approveacls acl on ruby-gnome2 (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ruby-gnome2



From pkgdb at fedoraproject.org  Fri Jan  9 15:44:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Jan 2009 15:44:58 +0000
Subject: [pkgdb] ruby-gnome2: itamarjp has requested watchcommits
Message-ID: <20090109154458.BC845208471@bastion.fedora.phx.redhat.com>

itamarjp has requested the watchcommits acl on ruby-gnome2 (Fedora 6)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ruby-gnome2



From pkgdb at fedoraproject.org  Fri Jan  9 15:44:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Jan 2009 15:44:56 +0000
Subject: [pkgdb] ruby-gnome2: itamarjp has requested watchbugzilla
Message-ID: <20090109154456.F159A20846E@bastion.fedora.phx.redhat.com>

itamarjp has requested the watchbugzilla acl on ruby-gnome2 (Fedora 6)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ruby-gnome2



From pkgdb at fedoraproject.org  Fri Jan  9 15:44:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Jan 2009 15:44:58 +0000
Subject: [pkgdb] ruby-gnome2: itamarjp has requested commit
Message-ID: <20090109154458.DEAC520847A@bastion.fedora.phx.redhat.com>

itamarjp has requested the commit acl on ruby-gnome2 (Fedora 6)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ruby-gnome2



From pkgdb at fedoraproject.org  Fri Jan  9 15:45:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Jan 2009 15:45:01 +0000
Subject: [pkgdb] ruby-gnome2: itamarjp has requested approveacls
Message-ID: <20090109154501.47C1D20847C@bastion.fedora.phx.redhat.com>

itamarjp has requested the approveacls acl on ruby-gnome2 (Fedora 6)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ruby-gnome2



From pkgdb at fedoraproject.org  Fri Jan  9 15:45:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Jan 2009 15:45:01 +0000
Subject: [pkgdb] ruby-gnome2 ownership updated
Message-ID: <20090109154501.EED7820847E@bastion.fedora.phx.redhat.com>

Package ruby-gnome2 in Fedora 9 was orphaned by itamarjp

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ruby-gnome2



From pkgdb at fedoraproject.org  Fri Jan  9 15:45:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Jan 2009 15:45:06 +0000
Subject: [pkgdb] ruby-gnome2: itamarjp has requested watchbugzilla
Message-ID: <20090109154506.8D539208481@bastion.fedora.phx.redhat.com>

itamarjp has requested the watchbugzilla acl on ruby-gnome2 (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ruby-gnome2



From pkgdb at fedoraproject.org  Fri Jan  9 15:45:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Jan 2009 15:45:03 +0000
Subject: [pkgdb] ruby-gnome2 ownership updated
Message-ID: <20090109154503.C76EF208473@bastion.fedora.phx.redhat.com>

Package ruby-gnome2 in Fedora 9 is now owned by itamarjp

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ruby-gnome2



From pkgdb at fedoraproject.org  Fri Jan  9 15:45:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Jan 2009 15:45:07 +0000
Subject: [pkgdb] ruby-gnome2: itamarjp has requested watchcommits
Message-ID: <20090109154507.243E320831F@bastion.fedora.phx.redhat.com>

itamarjp has requested the watchcommits acl on ruby-gnome2 (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ruby-gnome2



From pkgdb at fedoraproject.org  Fri Jan  9 15:45:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Jan 2009 15:45:08 +0000
Subject: [pkgdb] ruby-gnome2: itamarjp has requested commit
Message-ID: <20090109154508.38FDD208475@bastion.fedora.phx.redhat.com>

itamarjp has requested the commit acl on ruby-gnome2 (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ruby-gnome2



From pkgdb at fedoraproject.org  Fri Jan  9 15:45:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Jan 2009 15:45:10 +0000
Subject: [pkgdb] ruby-gnome2: itamarjp has requested approveacls
Message-ID: <20090109154510.896A0208421@bastion.fedora.phx.redhat.com>

itamarjp has requested the approveacls acl on ruby-gnome2 (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ruby-gnome2



From rdieter at fedoraproject.org  Fri Jan  9 15:46:29 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri,  9 Jan 2009 15:46:29 +0000 (UTC)
Subject: rpms/kdelibs/devel kdelibs.spec,1.411,1.412
Message-ID: <20090109154629.6D0CE70141@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdelibs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21375

Modified Files:
	kdelibs.spec 
Log Message:
doh, Release++



Index: kdelibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.411
retrieving revision 1.412
diff -u -r1.411 -r1.412
--- kdelibs.spec	9 Jan 2009 15:43:38 -0000	1.411
+++ kdelibs.spec	9 Jan 2009 15:45:59 -0000	1.412
@@ -1,6 +1,6 @@
 Summary: K Desktop Environment 4 - Libraries
 Version: 4.1.96
-Release: 3%{?dist}
+Release: 4%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs



From ovasik at fedoraproject.org  Fri Jan  9 16:00:12 2009
From: ovasik at fedoraproject.org (Ondrej Vasik)
Date: Fri,  9 Jan 2009 16:00:12 +0000 (UTC)
Subject: rpms/libwvstreams/devel libwvstreams.spec,1.33,1.34
Message-ID: <20090109160012.226167011C@cvs1.fedora.phx.redhat.com>

Author: ovasik

Update of /cvs/extras/rpms/libwvstreams/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23349

Modified Files:
	libwvstreams.spec 
Log Message:
do ship %{_libdir}/pkgconfig/libwvdbus.pc(#479144)


Index: libwvstreams.spec
===================================================================
RCS file: /cvs/extras/rpms/libwvstreams/devel/libwvstreams.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- libwvstreams.spec	8 Jan 2009 11:49:15 -0000	1.33
+++ libwvstreams.spec	9 Jan 2009 15:59:41 -0000	1.34
@@ -1,6 +1,6 @@
 Name: libwvstreams
 Version: 4.5.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: WvStreams is a network programming library written in C++
 Source: http://wvstreams.googlecode.com/files/wvstreams-%{version}.tar.gz
 Patch1: wvstreams-4.2.2-multilib.patch
@@ -54,7 +54,6 @@
    ./etc/uniconf.conf \
    .%{_bindir}/uni \
    .%{_libdir}/pkgconfig/libwvqt.pc \
-   .%{_libdir}/pkgconfig/libwvdbus.pc \
    .%{_sbindir}/uniconfd \
    .%{_mandir}/man8/uni.8* \
    .%{_mandir}/man8/uniconfd.8* \
@@ -81,6 +80,9 @@
 %postun -p /sbin/ldconfig
 
 %changelog
+* Fri Jan 09 2009 Ondrej Vasik <ovasik at redhat.com> - 4.5.1-2
+- do not remove libwvdbus.pc (#479144)
+
 * Thu Jan 08 2009 Ondrej Vasik <ovasik at redhat.com> - 4.5.1-1
 - new upstream release 4.5.1 , removed applied patches
 - activate --with-dbus(#479144)



From pkgdb at fedoraproject.org  Fri Jan  9 16:01:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Jan 2009 16:01:44 +0000
Subject: [pkgdb] ruby-gnome2: mtasaka has requested watchbugzilla
Message-ID: <20090109160144.3F9D120831D@bastion.fedora.phx.redhat.com>

mtasaka has requested the watchbugzilla acl on ruby-gnome2 (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ruby-gnome2



From pkgdb at fedoraproject.org  Fri Jan  9 16:01:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Jan 2009 16:01:54 +0000
Subject: [pkgdb] ruby-gnome2: mtasaka has requested watchbugzilla
Message-ID: <20090109160154.455ED208457@bastion.fedora.phx.redhat.com>

mtasaka has requested the watchbugzilla acl on ruby-gnome2 (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ruby-gnome2



From pkgdb at fedoraproject.org  Fri Jan  9 16:02:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Jan 2009 16:02:06 +0000
Subject: [pkgdb] ruby-gnome2: mtasaka has requested watchbugzilla
Message-ID: <20090109160206.E7FF0208421@bastion.fedora.phx.redhat.com>

mtasaka has requested the watchbugzilla acl on ruby-gnome2 (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ruby-gnome2



From nsantos at fedoraproject.org  Fri Jan  9 16:04:28 2009
From: nsantos at fedoraproject.org (Nuno Santos)
Date: Fri,  9 Jan 2009 16:04:28 +0000 (UTC)
Subject: rpms/qpidc/devel corosync.patch,1.4,1.5
Message-ID: <20090109160428.2C70E7011C@cvs1.fedora.phx.redhat.com>

Author: nsantos

Update of /cvs/extras/rpms/qpidc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24068

Modified Files:
	corosync.patch 
Log Message:
fix patch

corosync.patch:

Index: corosync.patch
===================================================================
RCS file: /cvs/extras/rpms/qpidc/devel/corosync.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- corosync.patch	8 Jan 2009 22:43:43 -0000	1.4
+++ corosync.patch	9 Jan 2009 16:04:27 -0000	1.5
@@ -1,9 +1,11 @@
---- src/qpid/cluster/Cpg.cpp	2009-01-08 17:34:25.000000000 -0500
-+++ src/qpid/cluster/Cpg.cpp	2008-12-17 18:44:04.000000000 -0500
-@@ -126,27 +126,36 @@
+--- src/qpid/cluster/Cpg.cpp	2008-12-17 18:44:04.000000000 -0500
++++ src/qpid/cluster/Cpg.cpp	2009-01-09 10:57:05.000000000 -0500
+@@ -126,28 +126,37 @@
      }
  }
  
+-void Cpg::dispatch(cpg_dispatch_t type) {
+-    check(cpg_dispatch(handle,type), "Error in CPG dispatch");
 +void Cpg::dispatchOne() {
 +    check(cpg_dispatch(handle,CPG_DISPATCH_ONE), "Error in CPG dispatch");
 +}
@@ -14,8 +16,6 @@
 +
 +void Cpg::dispatchBlocking() {
 +    check(cpg_dispatch(handle,CPG_DISPATCH_BLOCKING), "Error in CPG dispatch");
--void Cpg::dispatch(cpg_dispatch_t type) {
--    check(cpg_dispatch(handle,type), "Error in CPG dispatch");
  }
  
  string Cpg::errorStr(cpg_error_t err, const std::string& msg) {
@@ -27,24 +27,25 @@
        case CPG_ERR_INVALID_PARAM: return msg+": invalid param";
        case CPG_ERR_NO_MEMORY: return msg+": no memory";
        case CPG_ERR_BAD_HANDLE: return msg+": bad handle";
-+      case CPG_ERR_ACCESS: return msg+": access denied. You may need to set your group ID to 'ais'";
 -      case CPG_ERR_ACCESS: return msg+": access denied.";
++      case CPG_ERR_ACCESS: return msg+": access denied. You may need to set your group ID to 'ais'";
        case CPG_ERR_NOT_EXIST: return msg+": not exist";
        case CPG_ERR_EXIST: return msg+": exist";
        case CPG_ERR_NOT_SUPPORTED: return msg+": not supported";
+-      case CPG_ERR_SECURITY: return msg+": security";
+-      case CPG_ERR_TOO_MANY_GROUPS: return msg+": too many groups";
 +        // The following are not mapped, or are incorrectly mapped in corosync 0-92-5
 +        // case CPG_ERR_LIBRARY: return msg+": library";
 +        // case CPG_ERR_SECURITY: return msg+": security";
 +        // case CPG_ERR_TOO_MANY_GROUPS: return msg+": too many groups";
 +
--      case CPG_ERR_SECURITY: return msg+": security";
--      case CPG_ERR_TOO_MANY_GROUPS: return msg+": too many groups";
        default:
-+        return ": cpg error";
 -        assert(0);
 -        return ": unknown";
++        return ": cpg error";
      };
  }
+ 
 --- src/qpid/cluster/Cpg.h	2009-01-08 17:25:30.000000000 -0500
 +++ src/qpid/cluster/Cpg.h	2008-12-17 18:44:04.000000000 -0500
 @@ -94,17 +94,9 @@



From limb at fedoraproject.org  Fri Jan  9 16:12:35 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Fri,  9 Jan 2009 16:12:35 +0000 (UTC)
Subject: rpms/ddd/devel ddd.spec,1.8,1.9
Message-ID: <20090109161235.572FA7011C@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/ddd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24916

Modified Files:
	ddd.spec 
Log Message:
BR fix.



Index: ddd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ddd/devel/ddd.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ddd.spec	8 Jan 2009 22:11:24 -0000	1.8
+++ ddd.spec	9 Jan 2009 16:12:04 -0000	1.9
@@ -21,7 +21,7 @@
 Requires: gdb, xorg-x11-utils, xterm, gnuplot, xdg-utils, xorg-x11-fonts-ISO8859-1-75dpi, xorg-x11-fonts-ISO8859-1-100dpi
 BuildRequires: lesstif-devel, ncurses-devel, libXaw-devel 
 BuildRequires: elfutils-libelf-devel, xterm 
-BuildRequires: desktop-file-utils, gdb, xorg-x11-utils, readline-devel
+BuildRequires: desktop-file-utils, gdb, xorg-x11-utils, readline-devel, texinfo
 
 %description
 The Data Display Debugger (DDD) is a popular GUI for command-line



From janderson at fedoraproject.org  Fri Jan  9 16:31:16 2009
From: janderson at fedoraproject.org (John Anderson)
Date: Fri,  9 Jan 2009 16:31:16 +0000 (UTC)
Subject: rpms/mumbles/F-10 mumbles-firefox-uri.patch, NONE, 1.1 import.log,
	1.2, 1.3 mumbles-sitedir.patch, 1.1, 1.2 mumbles.spec, 1.3, 1.4
Message-ID: <20090109163116.957C17011C@cvs1.fedora.phx.redhat.com>

Author: janderson

Update of /cvs/pkgs/rpms/mumbles/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27419/F-10

Modified Files:
	import.log mumbles-sitedir.patch mumbles.spec 
Added Files:
	mumbles-firefox-uri.patch 
Log Message:
Importing 0.4-9 to fix bugs 479171 and 479158


mumbles-firefox-uri.patch:

--- NEW FILE mumbles-firefox-uri.patch ---
diff -uNr mumbles-0.4-orig/src/plugins/eggs/firefox/src/__init__.py mumbles-0.4/src/plugins/eggs/firefox/src/__init__.py
--- mumbles-0.4-orig/src/plugins/eggs/firefox/src/__init__.py	2007-08-26 21:31:41.000000000 -0500
+++ mumbles-0.4/src/plugins/eggs/firefox/src/__init__.py	2009-01-09 09:34:13.000000000 -0600
@@ -46,4 +46,5 @@
  	def open_uri(self, uri):
  		mime_type = gnomevfs.get_mime_type(uri)
  		application = gnomevfs.mime_get_default_application(mime_type)
- 		os.system(application[2] + ' "' + uri + '" &')
+		os.environ['URI'] = uri
+		os.system(application[2] + ' "$URI" &')


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/mumbles/F-10/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	4 Jan 2009 21:14:22 -0000	1.2
+++ import.log	9 Jan 2009 16:30:45 -0000	1.3
@@ -1,2 +1,3 @@
 mumbles-0_4-7_fc10:F-10:mumbles-0.4-7.fc10.src.rpm:1231103124
 mumbles-0_4-8_fc10:F-10:mumbles-0.4-8.fc10.src.rpm:1231103616
+mumbles-0_4-9_fc10:F-10:mumbles-0.4-9.fc10.src.rpm:1231518573

mumbles-sitedir.patch:

Index: mumbles-sitedir.patch
===================================================================
RCS file: /cvs/pkgs/rpms/mumbles/F-10/mumbles-sitedir.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mumbles-sitedir.patch	4 Jan 2009 21:05:51 -0000	1.1
+++ mumbles-sitedir.patch	9 Jan 2009 16:30:45 -0000	1.2
@@ -13,7 +13,7 @@
  
 -sys.path.append("/usr/share/python-support/mumbles/src/")
 +from distutils.sysconfig import get_python_lib
-+syspath = get_python_lib(1)+"/mumbles"
++syspath = get_python_lib(0)+"/mumbles"
 +sys.path.append(syspath)
  os.environ.setdefault("MUMBLES_PATH", "/usr/share/mumbles/")
  
@@ -27,7 +27,7 @@
  
 -sys.path.append("/usr/share/python-support/mumbles/src/")
 +from distutils.sysconfig import get_python_lib
-+syspath = get_python_lib(1)+"/mumbles"
++syspath = get_python_lib(0)+"/mumbles"
 +sys.path.append(syspath)
 +print "syspath: %s" % (syspath)
  os.environ.setdefault("MUMBLES_PATH", "/usr/share/mumbles/")


Index: mumbles.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mumbles/F-10/mumbles.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- mumbles.spec	4 Jan 2009 21:14:22 -0000	1.3
+++ mumbles.spec	9 Jan 2009 16:30:45 -0000	1.4
@@ -3,7 +3,7 @@
 
 Name:		mumbles
 Version:	0.4
-Release:	8%{?dist}
+Release:	9%{?dist}
 Summary:	A plugin driven DBus based notification system for the Gnome desktop
 
 Group:		User Interface/Desktops
@@ -13,6 +13,7 @@
 #		The default setup.py uses src as the python package name and doesn't
 #		have the correct search path. Submitted upstream id #2307852
 Patch0:		mumbles-sitedir.patch
+Patch1:		mumbles-firefox-uri.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	python
@@ -31,11 +32,20 @@
 %prep
 %setup -q -n mumbles-%{version}
 %patch0 -p1 -b .sitedir
+%patch1 -p1 -b .firefoxuri
 
 # small fix to avoid warning from desktop-file-install
 sed -i 's!mumbles.png!mumbles!' bin/mumbles.desktop
 
 %build
+
+#rebuild the Firefox plugin to apply the uri patch
+pushd .
+cd src/plugins/eggs/firefox
+python setup.py bdist_egg
+cp dist/FirefoxMumbles-0.1-py%{python_version}.egg ../../
+popd
+
 CFLAGS="%{optflags}" %{__python} setup.py build
 
 %install
@@ -90,6 +100,10 @@
 
 
 %changelog
+* Fri Jan  9 2009 John Anderson <john.e.anderson at gmail.com> - 0.4-9
+- Fixed path to make mumbles run on x86_64 bug #479158
+- Security fix for Firefox plugin bug #479171
+
 * Sun Jan  4 2009 John Anderson <john.e.anderson at gmail.com> - 0.4-8
 - Added GNOME and GTK categories to desktop file
 



From tgl at fedoraproject.org  Fri Jan  9 16:33:34 2009
From: tgl at fedoraproject.org (Tom Lane)
Date: Fri,  9 Jan 2009 16:33:34 +0000 (UTC)
Subject: rpms/libpng/devel .cvsignore, 1.17, 1.18 libpng.spec, 1.49,
	1.50 sources, 1.17, 1.18
Message-ID: <20090109163334.184707011C@cvs1.fedora.phx.redhat.com>

Author: tgl

Update of /cvs/pkgs/rpms/libpng/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27860

Modified Files:
	.cvsignore libpng.spec sources 
Log Message:
Update to libpng 1.2.34


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libpng/devel/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- .cvsignore	2 Nov 2008 20:47:40 -0000	1.17
+++ .cvsignore	9 Jan 2009 16:33:03 -0000	1.18
@@ -1 +1 @@
-libpng-1.2.33.tar.bz2
+libpng-1.2.34.tar.bz2


Index: libpng.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libpng/devel/libpng.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- libpng.spec	11 Dec 2008 23:11:13 -0000	1.49
+++ libpng.spec	9 Jan 2009 16:33:03 -0000	1.50
@@ -1,8 +1,8 @@
 Summary: A library of functions for manipulating PNG image format files
 Name: libpng
 Epoch: 2
-Version: 1.2.33
-Release: 2%{?dist}
+Version: 1.2.34
+Release: 1%{?dist}
 License: zlib
 Group: System Environment/Libraries
 URL: http://www.libpng.org/pub/png/
@@ -91,6 +91,9 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Fri Jan  9 2009 Tom Lane <tgl at redhat.com> 2:1.2.34-1
+- Update to libpng 1.2.34
+
 * Thu Dec 11 2008 Caol??n McNamara <caolanm at redhat.com> 2:1.2.33-2
 - rebuild to get provides pkgconfig(libpng)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libpng/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources	2 Nov 2008 20:47:40 -0000	1.17
+++ sources	9 Jan 2009 16:33:03 -0000	1.18
@@ -1 +1 @@
-0532c28ba1b17ee2095ad50731c2c75c  libpng-1.2.33.tar.bz2
+37362876feb21344fd3af1228527db0f  libpng-1.2.34.tar.bz2



From spot at fedoraproject.org  Fri Jan  9 16:36:44 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Fri,  9 Jan 2009 16:36:44 +0000 (UTC)
Subject: rpms/moomps/devel moomps.spec,1.20,1.21
Message-ID: <20090109163644.6CBA17011C@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/moomps/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28345

Modified Files:
	moomps.spec 
Log Message:
do not use /srv


Index: moomps.spec
===================================================================
RCS file: /cvs/pkgs/rpms/moomps/devel/moomps.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- moomps.spec	11 Aug 2008 15:35:18 -0000	1.20
+++ moomps.spec	9 Jan 2009 16:36:13 -0000	1.21
@@ -1,6 +1,6 @@
 Name: moomps
 Version: 5.8
-Release: 4%{?dist}
+Release: 5%{?dist}
 Summary: Powerful modular monitoring service
 Group: Applications/System
 License: GPLv2
@@ -30,16 +30,16 @@
 %setup -q
 
 %build
-make LIBDIR=%_libdir TCLLIBDIR=%_libdir
+make LIBDIR=%{_libdir} TCLLIBDIR=%{_libdir} DATADIR=%{_datadir}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make ROOTDIR=$RPM_BUILD_ROOT LIBDIR=%_libdir TCLLIBDIR=%_libdir install
+make ROOTDIR=$RPM_BUILD_ROOT LIBDIR=%{_libdir} TCLLIBDIR=%{_libdir} DATADIR=%{_datadir} install
 
 %pre
 # if not present, add moomps user (even when upgrading):
 if ! %_sbindir/usermod -l moomps moomps 2>/dev/null; then
-    %_sbindir/fedora-useradd 23 -r -d /srv/moomps\
+    %_sbindir/fedora-useradd 23 -r -d /usr/share/moomps\
         -c 'service companion to moodss' -s '/sbin/nologin' moomps
 fi
 
@@ -53,8 +53,8 @@
 %post
 # fix moodss modules path (useful on x86_64 architecture):
 sed\
-    -e 's,lappend auto_path /usr/lib/moodss,lappend auto_path %_libdir/moodss,'\
-    -i %_sbindir/moomps
+    -e 's,lappend auto_path /usr/lib/moodss,lappend auto_path %{_libdir}/moodss,'\
+    -i %{_sbindir}/moomps
 if [ $1 -eq 1 ]; then                                               # installing
     chkconfig --add moomps
 fi
@@ -71,17 +71,20 @@
 %files
 %defattr(-,root,root,-)
 %doc documentation/COPYRIGHT documentation/moomps*.htm
-%_mandir/man1/moomps.*
-%_sbindir/moomps
-%_initrddir/moomps
-%dir %attr(0755,moomps,root) %_sysconfdir/moomps
-/srv/moomps
-%dir %attr(0755,moomps,root) /srv/moomps
+%{_mandir}/man1/moomps.*
+%{_sbindir}/moomps
+%{_initrddir}/moomps
+%dir %attr(0755,moomps,root) %{_sysconfdir}/moomps
+%{_datadir}/moomps
+%dir %attr(0755,moomps,root) %{_datadir}/moomps
 # secure rc file as it may contain a database password:
-%config(noreplace) %attr(0600,moomps,root) %_sysconfdir/moomps/rc
+%config(noreplace) %attr(0600,moomps,root) %{_sysconfdir}/moomps/rc
 
 
 %changelog
+* Fri Jan  9 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 5.8-5
+- make /usr/share/moomps the homedir instead of /srv
+
 * Mon Aug 11 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 5.8-4
 - fix license tag
 



From tgl at fedoraproject.org  Fri Jan  9 16:42:17 2009
From: tgl at fedoraproject.org (Tom Lane)
Date: Fri,  9 Jan 2009 16:42:17 +0000 (UTC)
Subject: rpms/libpng/F-10 .cvsignore, 1.17, 1.18 libpng.spec, 1.48,
	1.49 sources, 1.17, 1.18
Message-ID: <20090109164217.216307011C@cvs1.fedora.phx.redhat.com>

Author: tgl

Update of /cvs/pkgs/rpms/libpng/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29037

Modified Files:
	.cvsignore libpng.spec sources 
Log Message:
Update to libpng 1.2.34


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libpng/F-10/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- .cvsignore	2 Nov 2008 20:47:40 -0000	1.17
+++ .cvsignore	9 Jan 2009 16:41:46 -0000	1.18
@@ -1 +1 @@
-libpng-1.2.33.tar.bz2
+libpng-1.2.34.tar.bz2


Index: libpng.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libpng/F-10/libpng.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- libpng.spec	2 Nov 2008 20:47:40 -0000	1.48
+++ libpng.spec	9 Jan 2009 16:41:46 -0000	1.49
@@ -1,7 +1,7 @@
 Summary: A library of functions for manipulating PNG image format files
 Name: libpng
 Epoch: 2
-Version: 1.2.33
+Version: 1.2.34
 Release: 1%{?dist}
 License: zlib
 Group: System Environment/Libraries
@@ -91,6 +91,9 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Fri Jan  9 2009 Tom Lane <tgl at redhat.com> 2:1.2.34-1
+- Update to libpng 1.2.34
+
 * Sun Nov  2 2008 Tom Lane <tgl at redhat.com> 2:1.2.33-1
 - Update to libpng 1.2.33
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libpng/F-10/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources	2 Nov 2008 20:47:40 -0000	1.17
+++ sources	9 Jan 2009 16:41:46 -0000	1.18
@@ -1 +1 @@
-0532c28ba1b17ee2095ad50731c2c75c  libpng-1.2.33.tar.bz2
+37362876feb21344fd3af1228527db0f  libpng-1.2.34.tar.bz2



From pkgdb at fedoraproject.org  Fri Jan  9 16:42:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Jan 2009 16:42:38 +0000
Subject: [pkgdb] gpsbabel had acl change status
Message-ID: <20090109164238.67E4F20831F@bastion.fedora.phx.redhat.com>

roozbeh has set the watchbugzilla acl on gpsbabel (Fedora EPEL 5) to Approved for silfreed

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gpsbabel



From pkgdb at fedoraproject.org  Fri Jan  9 16:42:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Jan 2009 16:42:43 +0000
Subject: [pkgdb] gpsbabel had acl change status
Message-ID: <20090109164243.16633208457@bastion.fedora.phx.redhat.com>

roozbeh has set the watchcommits acl on gpsbabel (Fedora EPEL 5) to Approved for silfreed

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gpsbabel



From pkgdb at fedoraproject.org  Fri Jan  9 16:42:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Jan 2009 16:42:45 +0000
Subject: [pkgdb] gpsbabel had acl change status
Message-ID: <20090109164245.A54F5208467@bastion.fedora.phx.redhat.com>

roozbeh has set the commit acl on gpsbabel (Fedora EPEL 5) to Approved for silfreed

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gpsbabel



From kyle at fedoraproject.org  Fri Jan  9 16:43:53 2009
From: kyle at fedoraproject.org (Kyle McMartin)
Date: Fri,  9 Jan 2009 16:43:53 +0000 (UTC)
Subject: rpms/kernel/devel patch-2.6.28-git13.bz2.sign, NONE, 1.1 .cvsignore,
	1.985, 1.986 kernel.spec, 1.1202, 1.1203 sources, 1.947,
	1.948 upstream, 1.859, 1.860 patch-2.6.28-git12.bz2.sign, 1.1, NONE
Message-ID: <20090109164354.07C8D7011C@cvs1.fedora.phx.redhat.com>

Author: kyle

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29361

Modified Files:
	.cvsignore kernel.spec sources upstream 
Added Files:
	patch-2.6.28-git13.bz2.sign 
Removed Files:
	patch-2.6.28-git12.bz2.sign 
Log Message:
* Thu Jan 08 2009 Kyle McMartin <kyle at redhat.com>
- 2.6.28-git12



--- NEW FILE patch-2.6.28-git13.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBJZz23yGugalF9Dw4RAiqMAJ4y++Al9hXu3CtP4ds5ree6ddNkvwCdFFPK
PwWE7zBGj3CH8i+wz51b1BA=
=dXP7
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.985
retrieving revision 1.986
diff -u -r1.985 -r1.986
--- .cvsignore	9 Jan 2009 05:13:21 -0000	1.985
+++ .cvsignore	9 Jan 2009 16:43:22 -0000	1.986
@@ -4,4 +4,4 @@
 temp-*
 kernel-2.6.28
 linux-2.6.28.tar.bz2
-patch-2.6.28-git12.bz2
+patch-2.6.28-git13.bz2


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1202
retrieving revision 1.1203
diff -u -r1.1202 -r1.1203
--- kernel.spec	9 Jan 2009 05:13:21 -0000	1.1202
+++ kernel.spec	9 Jan 2009 16:43:22 -0000	1.1203
@@ -57,7 +57,7 @@
 # The rc snapshot level
 %define rcrev 0
 # The git snapshot level
-%define gitrev 12
+%define gitrev 13
 # Set rpm version accordingly
 %define rpmversion 2.6.%{upstream_sublevel}
 %endif


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v
retrieving revision 1.947
retrieving revision 1.948
diff -u -r1.947 -r1.948
--- sources	9 Jan 2009 05:13:21 -0000	1.947
+++ sources	9 Jan 2009 16:43:22 -0000	1.948
@@ -1,2 +1,2 @@
 d351e44709c9810b85e29b877f50968a  linux-2.6.28.tar.bz2
-babd8348925dda965597847ce724d6a2  patch-2.6.28-git12.bz2
+6259970262260a17e7812b0d9cabcd33  patch-2.6.28-git13.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v
retrieving revision 1.859
retrieving revision 1.860
diff -u -r1.859 -r1.860
--- upstream	9 Jan 2009 05:13:21 -0000	1.859
+++ upstream	9 Jan 2009 16:43:22 -0000	1.860
@@ -1,2 +1,2 @@
 linux-2.6.28.tar.bz2
-patch-2.6.28-git12.bz2
+patch-2.6.28-git13.bz2


--- patch-2.6.28-git12.bz2.sign DELETED ---



From ausil at fedoraproject.org  Fri Jan  9 16:46:16 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Fri,  9 Jan 2009 16:46:16 +0000 (UTC)
Subject: rpms/antlr/F-9 antlr.spec,1.38,1.39
Message-ID: <20090109164616.CE6A87011C@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/antlr/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29583

Modified Files:
	antlr.spec 
Log Message:
exclude building with mono on sparc64



Index: antlr.spec
===================================================================
RCS file: /cvs/pkgs/rpms/antlr/F-9/antlr.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- antlr.spec	28 Feb 2008 00:16:17 -0000	1.38
+++ antlr.spec	9 Jan 2009 16:45:46 -0000	1.39
@@ -39,7 +39,7 @@
 Summary:        ANother Tool for Language Recognition
 Name:           antlr
 Version:        2.7.7
-Release:        1jpp.7%{?dist}
+Release:        1jpp.8%{?dist}
 Epoch:          0
 License:        Public Domain
 URL:            http://www.antlr.org/
@@ -62,7 +62,7 @@
 %endif
 BuildRequires:  ant
 
-%ifnarch s390 s390x ppc64
+%ifnarch s390 s390x ppc64 sparc64
 BuildRequires:  mono-core
 BuildRequires:  mono-winforms
 %endif
@@ -311,6 +311,9 @@
 
 
 %changelog
+* Fri Jan 09 2009 Dennis Gilmore <dennis at ausil.us< - 2.7.7-1.jpp.8
+- exclude mono from sparc64
+
 * Wed Feb 27 2008 Deepak Bhole <dbhole at redhat.com> - 0:2.7.7-1jpp.7
 - Add strings inclusion (for GCC 4.3)
 



From ausil at fedoraproject.org  Fri Jan  9 16:50:08 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Fri,  9 Jan 2009 16:50:08 +0000 (UTC)
Subject: rpms/antlr/F-10 antlr.spec,1.39,1.40
Message-ID: <20090109165008.7BDAA7011C@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/antlr/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30651

Modified Files:
	antlr.spec 
Log Message:
exclude building with mono on sparc64



Index: antlr.spec
===================================================================
RCS file: /cvs/pkgs/rpms/antlr/F-10/antlr.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- antlr.spec	9 Jul 2008 17:02:01 -0000	1.39
+++ antlr.spec	9 Jan 2009 16:49:38 -0000	1.40
@@ -39,7 +39,7 @@
 Summary:        ANother Tool for Language Recognition
 Name:           antlr
 Version:        2.7.7
-Release:        2%{?dist}
+Release:        3%{?dist}
 Epoch:          0
 License:        Public Domain
 URL:            http://www.antlr.org/
@@ -62,7 +62,7 @@
 %endif
 BuildRequires:  ant
 
-%ifnarch s390 s390x ppc64
+%ifnarch s390 s390x ppc64 sparc64
 BuildRequires:  mono-core
 BuildRequires:  mono-winforms
 %endif
@@ -311,6 +311,9 @@
 
 
 %changelog
+* Fri Jan 09 2009 Dennis Gilmore <dennis at ausil.us> 2.7.7-3
+- exlcude using mono on sparc64
+
 * Wed Jul  9 2008 Tom "spot" Callaway <tcallawa at redhat.com> 2.7.7-2
 - drop repotag
 



From tgl at fedoraproject.org  Fri Jan  9 16:50:49 2009
From: tgl at fedoraproject.org (Tom Lane)
Date: Fri,  9 Jan 2009 16:50:49 +0000 (UTC)
Subject: rpms/libpng/F-9 .cvsignore, 1.16, 1.17 libpng.spec, 1.45,
	1.46 sources, 1.16, 1.17
Message-ID: <20090109165049.F31417011C@cvs1.fedora.phx.redhat.com>

Author: tgl

Update of /cvs/pkgs/rpms/libpng/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30785

Modified Files:
	.cvsignore libpng.spec sources 
Log Message:
Update to libpng 1.2.34


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libpng/F-9/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore	2 Nov 2008 20:53:02 -0000	1.16
+++ .cvsignore	9 Jan 2009 16:50:19 -0000	1.17
@@ -1 +1 @@
-libpng-1.2.33.tar.bz2
+libpng-1.2.34.tar.bz2


Index: libpng.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libpng/F-9/libpng.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- libpng.spec	2 Nov 2008 20:53:02 -0000	1.45
+++ libpng.spec	9 Jan 2009 16:50:19 -0000	1.46
@@ -1,7 +1,7 @@
 Summary: A library of functions for manipulating PNG image format files
 Name: libpng
 Epoch: 2
-Version: 1.2.33
+Version: 1.2.34
 Release: 1%{?dist}
 License: zlib
 Group: System Environment/Libraries
@@ -91,6 +91,9 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Fri Jan  9 2009 Tom Lane <tgl at redhat.com> 2:1.2.34-1
+- Update to libpng 1.2.34
+
 * Sun Nov  2 2008 Tom Lane <tgl at redhat.com> 2:1.2.33-1
 - Update to libpng 1.2.33
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libpng/F-9/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources	2 Nov 2008 20:53:02 -0000	1.16
+++ sources	9 Jan 2009 16:50:19 -0000	1.17
@@ -1 +1 @@
-0532c28ba1b17ee2095ad50731c2c75c  libpng-1.2.33.tar.bz2
+37362876feb21344fd3af1228527db0f  libpng-1.2.34.tar.bz2



From ausil at fedoraproject.org  Fri Jan  9 16:52:04 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Fri,  9 Jan 2009 16:52:04 +0000 (UTC)
Subject: rpms/antlr/devel antlr.spec,1.39,1.40
Message-ID: <20090109165204.293357011C@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/antlr/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31057

Modified Files:
	antlr.spec 
Log Message:
exclude building with mono on sparc64



Index: antlr.spec
===================================================================
RCS file: /cvs/pkgs/rpms/antlr/devel/antlr.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- antlr.spec	9 Jul 2008 17:02:01 -0000	1.39
+++ antlr.spec	9 Jan 2009 16:51:33 -0000	1.40
@@ -39,7 +39,7 @@
 Summary:        ANother Tool for Language Recognition
 Name:           antlr
 Version:        2.7.7
-Release:        2%{?dist}
+Release:        3%{?dist}
 Epoch:          0
 License:        Public Domain
 URL:            http://www.antlr.org/
@@ -62,7 +62,7 @@
 %endif
 BuildRequires:  ant
 
-%ifnarch s390 s390x ppc64
+%ifnarch s390 s390x ppc64 sparc64
 BuildRequires:  mono-core
 BuildRequires:  mono-winforms
 %endif
@@ -311,6 +311,9 @@
 
 
 %changelog
+* Fri Jan 09 2009 Dennis Gilmore <dennis at ausil.us> 2.7.7-3
+- exlcude using mono on sparc64
+
 * Wed Jul  9 2008 Tom "spot" Callaway <tcallawa at redhat.com> 2.7.7-2
 - drop repotag
 



From than at fedoraproject.org  Fri Jan  9 16:53:13 2009
From: than at fedoraproject.org (Than Ngo)
Date: Fri,  9 Jan 2009 16:53:13 +0000 (UTC)
Subject: rpms/kdebase-workspace/devel kdebase-workspace.spec,1.162,1.163
Message-ID: <20090109165313.432B67011C@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdebase-workspace/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31174

Modified Files:
	kdebase-workspace.spec 
Log Message:
fix rpm file list



Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebase-workspace/devel/kdebase-workspace.spec,v
retrieving revision 1.162
retrieving revision 1.163
diff -u -r1.162 -r1.163
--- kdebase-workspace.spec	7 Jan 2009 15:40:14 -0000	1.162
+++ kdebase-workspace.spec	9 Jan 2009 16:52:42 -0000	1.163
@@ -116,6 +116,7 @@
 %package devel
 Group:    Development/Libraries
 Summary:  Development files for %{name}
+Provides: plasma-devel = %{version}-%{release}
 Requires: %{name}-libs = %{version}-%{release}
 Requires: kdelibs4-devel
 %description devel
@@ -262,7 +263,7 @@
 %{_kde4_libdir}/lib*.so
 %{_kde4_libdir}/kde4/plugins/designer/ksysguardwidgets.so
 %{_kde4_libdir}/kde4/plugins/designer/ksysguardlsofwidgets.so
-%{_kde4_libdir}/KDE4Workspace/
+%{_kde4_libdir}/KDE4Workspace*/
 %exclude %{_kde4_libdir}/libkdeinit*.so
 %exclude %{_kde4_libdir}/libplasma_applet-system-monitor.so
 



From mcepl at fedoraproject.org  Fri Jan  9 17:00:54 2009
From: mcepl at fedoraproject.org (Matej Cepl)
Date: Fri,  9 Jan 2009 17:00:54 +0000 (UTC)
Subject: rpms/pyexiv2/devel .cvsignore, 1.2, 1.3 pyexiv2.spec, 1.4,
	1.5 sources, 1.2, 1.3
Message-ID: <20090109170054.642A87011C@cvs1.fedora.phx.redhat.com>

Author: mcepl

Update of /cvs/pkgs/rpms/pyexiv2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32249

Modified Files:
	.cvsignore pyexiv2.spec sources 
Log Message:
Upstream snapshot release to make package buildable on Rawhide.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pyexiv2/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	18 Jul 2008 21:47:42 -0000	1.2
+++ .cvsignore	9 Jan 2009 17:00:23 -0000	1.3
@@ -1 +1 @@
-pyexiv2-0.1.2.tar.bz2
+pyexiv2.tar.bz2


Index: pyexiv2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pyexiv2/devel/pyexiv2.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- pyexiv2.spec	18 Dec 2008 18:35:32 -0000	1.4
+++ pyexiv2.spec	9 Jan 2009 17:00:23 -0000	1.5
@@ -3,13 +3,18 @@
 
 Name:           pyexiv2
 Version:        0.1.2
-Release:        6%{?dist}
+Release:        7.1.20090109bzr107%{?dist}
 Summary:        Python binding to exiv2
 
 Group:          Development/Languages
 License:        GPLv2+
 URL:            http://tilloy.net/dev/pyexiv2/
-Source0:        http://tilloy.net/dev/pyexiv2/releases/pyexiv2-%{version}.tar.bz2
+# The source for this package was pulled from upstream's vcs.  Use the
+# following commands to generate the tarball:
+#  bzr branch -r 107 https://code.launchpad.net/~osomon/pyexiv2/pyexiv2-0.2 pyexiv2
+#  tar -czvf pyexiv2.tar.gz pyexiv2/
+Source0:        pyexiv2.tar.bz2
+#Source0:        http://tilloy.net/dev/pyexiv2/releases/pyexiv2-%{version}.tar.bz2
 # next patch should be removed when
 # https://bugs.launchpad.net/pyexiv2/+bug/249513
 # is fixed
@@ -60,6 +65,10 @@
 %{python_sitearch}/*
 
 %changelog
+* Fri Jan 09 2009 Matej Cepl <mcepl at redhat.com> 0.1.2-7.1.20090109bzr107
+- New snapshot from upstream pyexiv2-0.2 branch in order to be compatible
+  with the current package of exiv2.
+
 * Thu Dec 18 2008 Rex Dieter <rdieter at fedoraproject.org> - 0.1.2-6 
 - respin (eviv2)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pyexiv2/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	18 Jul 2008 21:47:42 -0000	1.2
+++ sources	9 Jan 2009 17:00:23 -0000	1.3
@@ -1 +1 @@
-246dae9b4eca5d2fe2a4e3762e13fac1  pyexiv2-0.1.2.tar.bz2
+31348246422898212c1ee10f7b85c151  pyexiv2.tar.bz2



From rdieter at fedoraproject.org  Fri Jan  9 17:04:19 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 09 Jan 2009 11:04:19 -0600
Subject: rpms/kdebase-workspace/devel kdebase-workspace.spec, 1.162,
	1.163
In-Reply-To: <20090109165313.432B67011C@cvs1.fedora.phx.redhat.com>
References: <20090109165313.432B67011C@cvs1.fedora.phx.redhat.com>
Message-ID: <49678393.9080807@fedoraproject.org>

Than Ngo wrote:
> Author: than
...
> --- kdebase-workspace.spec	7 Jan 2009 15:40:14 -0000	1.162
> +++ kdebase-workspace.spec	9 Jan 2009 16:52:42 -0000	1.163
> @@ -116,6 +116,7 @@
>  %package devel
>  Group:    Development/Libraries
>  Summary:  Development files for %{name}
> +Provides: plasma-devel = %{version}-%{release}

Looks wrong. plasma is in kdelibs now.

-- Rex



From mcepl at fedoraproject.org  Fri Jan  9 17:14:01 2009
From: mcepl at fedoraproject.org (Matej Cepl)
Date: Fri,  9 Jan 2009 17:14:01 +0000 (UTC)
Subject: rpms/pyexiv2/devel pyexiv2.spec,1.5,1.6 sources,1.3,1.4
Message-ID: <20090109171401.8A7937011C@cvs1.fedora.phx.redhat.com>

Author: mcepl

Update of /cvs/pkgs/rpms/pyexiv2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1559

Modified Files:
	pyexiv2.spec sources 
Log Message:
Once more upload .tar.bz2


Index: pyexiv2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pyexiv2/devel/pyexiv2.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- pyexiv2.spec	9 Jan 2009 17:00:23 -0000	1.5
+++ pyexiv2.spec	9 Jan 2009 17:13:31 -0000	1.6
@@ -3,7 +3,7 @@
 
 Name:           pyexiv2
 Version:        0.1.2
-Release:        7.1.20090109bzr107%{?dist}
+Release:        8.1.20090109bzr107%{?dist}
 Summary:        Python binding to exiv2
 
 Group:          Development/Languages
@@ -65,7 +65,7 @@
 %{python_sitearch}/*
 
 %changelog
-* Fri Jan 09 2009 Matej Cepl <mcepl at redhat.com> 0.1.2-7.1.20090109bzr107
+* Fri Jan 09 2009 Matej Cepl <mcepl at redhat.com> 0.1.2-8.1.20090109bzr107
 - New snapshot from upstream pyexiv2-0.2 branch in order to be compatible
   with the current package of exiv2.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pyexiv2/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	9 Jan 2009 17:00:23 -0000	1.3
+++ sources	9 Jan 2009 17:13:31 -0000	1.4
@@ -1 +1 @@
-31348246422898212c1ee10f7b85c151  pyexiv2.tar.bz2
+55726eb4f8d74d8543bef32bd9404197  pyexiv2.tar.bz2



From kkofler at fedoraproject.org  Fri Jan  9 17:18:54 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Fri,  9 Jan 2009 17:18:54 +0000 (UTC)
Subject: rpms/kdetoys/F-10 .cvsignore, 1.27, 1.28 kdetoys.spec, 1.36,
	1.37 sources, 1.26, 1.27
Message-ID: <20090109171854.429E17011C@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdetoys/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2426/F-10

Modified Files:
	.cvsignore kdetoys.spec sources 
Log Message:
* Fri Jan 09 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.4-1
- 4.1.4


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdetoys/F-10/.cvsignore,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- .cvsignore	27 Sep 2008 02:28:36 -0000	1.27
+++ .cvsignore	9 Jan 2009 17:18:23 -0000	1.28
@@ -1 +1 @@
-kdetoys-4.1.2.tar.bz2
+kdetoys-4.1.4.tar.bz2


Index: kdetoys.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdetoys/F-10/kdetoys.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- kdetoys.spec	12 Nov 2008 13:42:52 -0000	1.36
+++ kdetoys.spec	9 Jan 2009 17:18:23 -0000	1.37
@@ -2,7 +2,7 @@
 Name:           kdetoys
 Summary:        K Desktop Environment - Toys and Amusements
 Epoch:          7
-Version:        4.1.3
+Version:        4.1.4
 Release:        1%{?dist}
 
 License:        GPLv2
@@ -96,6 +96,9 @@
 
 
 %changelog
+* Fri Jan 09 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.4-1
+- 4.1.4
+
 * Wed Nov 12 2008 Than Ngo <than at redhat.com> 4.1.3-1
 - 4.1.3
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdetoys/F-10/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- sources	12 Nov 2008 13:42:52 -0000	1.26
+++ sources	9 Jan 2009 17:18:23 -0000	1.27
@@ -1 +1 @@
-ca5a74c6ae9f4c2f5e5b70e3c7711c78  kdetoys-4.1.3.tar.bz2
+b32cfc4788e749e6240476783f0eb1a9  kdetoys-4.1.4.tar.bz2



From kkofler at fedoraproject.org  Fri Jan  9 17:18:54 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Fri,  9 Jan 2009 17:18:54 +0000 (UTC)
Subject: rpms/kdetoys/F-9 .cvsignore, 1.22, 1.23 kdetoys.spec, 1.28,
	1.29 sources, 1.21, 1.22
Message-ID: <20090109171854.746F77011C@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdetoys/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2426/F-9

Modified Files:
	.cvsignore kdetoys.spec sources 
Log Message:
* Fri Jan 09 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.4-1
- 4.1.4


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdetoys/F-9/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- .cvsignore	6 Nov 2008 11:12:19 -0000	1.22
+++ .cvsignore	9 Jan 2009 17:18:24 -0000	1.23
@@ -1 +1 @@
-kdetoys-4.1.3.tar.bz2
+kdetoys-4.1.4.tar.bz2


Index: kdetoys.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdetoys/F-9/kdetoys.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- kdetoys.spec	6 Nov 2008 11:12:19 -0000	1.28
+++ kdetoys.spec	9 Jan 2009 17:18:24 -0000	1.29
@@ -2,13 +2,13 @@
 Name:           kdetoys
 Summary:        K Desktop Environment - Toys and Amusements
 Epoch:          7
-Version:        4.1.3
+Version:        4.1.4
 Release:        1%{?dist}
 
 License:        GPLv2
 Group:          Amusements/Graphics
 URL:            http://www.kde.org/
-Source0:        ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/%{name}-%{version}.tar.bz2
+Source0:        ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: cmake
@@ -96,8 +96,11 @@
 
 
 %changelog
-* Thu Nov  6 2008 Luk???? Tinkl <ltinkl at redhat.com> 4.1.3-1
-- KDE 4.1.3
+* Fri Jan 09 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.4-1
+- 4.1.4
+
+* Wed Nov 12 2008 Than Ngo <than at redhat.com> 4.1.3-1
+- 4.1.3
 
 * Mon Sep 29 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-2
 - make VERBOSE=1


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdetoys/F-9/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sources	6 Nov 2008 11:12:19 -0000	1.21
+++ sources	9 Jan 2009 17:18:24 -0000	1.22
@@ -1 +1 @@
-ca5a74c6ae9f4c2f5e5b70e3c7711c78  kdetoys-4.1.3.tar.bz2
+b32cfc4788e749e6240476783f0eb1a9  kdetoys-4.1.4.tar.bz2



From mdehaan at fedoraproject.org  Fri Jan  9 17:24:07 2009
From: mdehaan at fedoraproject.org (Michael DeHaan)
Date: Fri,  9 Jan 2009 17:24:07 +0000 (UTC)
Subject: rpms/cobbler/EL-4 .cvsignore, 1.48, 1.49 cobbler.spec, 1.58,
	1.59 sources, 1.58, 1.59
Message-ID: <20090109172407.604EE7011C@cvs1.fedora.phx.redhat.com>

Author: mdehaan

Update of /cvs/extras/rpms/cobbler/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3909/EL-4

Modified Files:
	.cvsignore cobbler.spec sources 
Log Message:
Updating Cobbler to 1.4.1




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cobbler/EL-4/.cvsignore,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- .cvsignore	19 Dec 2008 17:33:18 -0000	1.48
+++ .cvsignore	9 Jan 2009 17:23:36 -0000	1.49
@@ -45,3 +45,4 @@
 cobbler-1.2.8.tar.gz
 cobbler-1.2.9.tar.gz
 cobbler-1.4.0.tar.gz
+cobbler-1.4.1.tar.gz


Index: cobbler.spec
===================================================================
RCS file: /cvs/extras/rpms/cobbler/EL-4/cobbler.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- cobbler.spec	19 Dec 2008 17:33:18 -0000	1.58
+++ cobbler.spec	9 Jan 2009 17:23:36 -0000	1.59
@@ -2,8 +2,8 @@
 Summary: Boot server configurator
 Name: cobbler
 AutoReq: no
-Version: 1.4.0
-Release: 2%{?dist}
+Version: 1.4.1
+Release: 1%{?dist}
 Source0: %{name}-%{version}.tar.gz
 License: GPLv2+
 Group: Applications/System
@@ -30,8 +30,8 @@
 Requires(preun): /sbin/chkconfig
 Requires(preun): /sbin/service
 %if 0%{?fedora} >= 11 || 0%{?rhel} >= 6
-%{!?pyver: %define pyver %(%{__python} -c "import sys ; print sys.version[:3]")}
-Requires: python(abi)=%{pyver}
+%{!?pyver: %define pyver %(%{__python} -c "import sys ; print sys.version[:3]" || echo 0)}
+Requires: python(abi) = %{pyver}
 %endif
 %if 0%{?suse_version} < 0
 BuildRequires: redhat-rpm-config
@@ -157,8 +157,10 @@
 %dir /var/www/cobbler/links
 %defattr(755,apache,apache)
 %dir /var/www/cobbler/webui
+%dir /var/www/cobbler/aux
 %defattr(444,apache,apache)
 /var/www/cobbler/webui/*
+/var/www/cobbler/aux/*
 
 %defattr(755,root,root)
 %{_bindir}/cobbler
@@ -197,6 +199,7 @@
 %config(noreplace) /etc/httpd/conf.d/cobbler_svc.conf
 %endif
 %dir /var/log/cobbler/syslog
+%dir /var/log/cobbler/anamon
 
 %defattr(755,root,root)
 %dir /var/lib/cobbler
@@ -262,6 +265,7 @@
 %config(noreplace) /var/lib/cobbler/snippets/func_register_if_enabled
 %config(noreplace) /var/lib/cobbler/snippets/download_config_files
 %config(noreplace) /var/lib/cobbler/snippets/koan_environment
+%config(noreplace) /var/lib/cobbler/snippets/pre_anamon
 %config(noreplace) /var/lib/cobbler/snippets/redhat_register
 /var/lib/cobbler/elilo-3.8-ia64.efi
 /var/lib/cobbler/menu.c32
@@ -281,6 +285,12 @@
 
 %changelog
 
+* Mon Jan 09 2009 Michael DeHaan <mdehaan at redhat.com> - 1.4.1-1
+- Upstream changes (see CHANGELOG)
+
+* Fri Dec 19 2008 Michael DeHaan <mdehaan at redhat.com> - 1.4.0-4
+- Fix for rawhide python requirement.
+
 * Fri Dec 19 2008 Michael DeHaan <mdehaan at redhat.com> - 1.4.0-2
 - Upstream changes (see CHANGELOG)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cobbler/EL-4/sources,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- sources	19 Dec 2008 17:52:48 -0000	1.58
+++ sources	9 Jan 2009 17:23:37 -0000	1.59
@@ -1 +1,2 @@
 6bf3dae4f204b44858ba91faeb8a1ecf  cobbler-1.4.0.tar.gz
+a85b0ddfb7186f7ea5ed327f1be9c6dc  cobbler-1.4.1.tar.gz



From mdehaan at fedoraproject.org  Fri Jan  9 17:24:07 2009
From: mdehaan at fedoraproject.org (Michael DeHaan)
Date: Fri,  9 Jan 2009 17:24:07 +0000 (UTC)
Subject: rpms/cobbler/EL-5 .cvsignore, 1.52, 1.53 cobbler.spec, 1.60,
	1.61 sources, 1.61, 1.62
Message-ID: <20090109172407.96D297011C@cvs1.fedora.phx.redhat.com>

Author: mdehaan

Update of /cvs/extras/rpms/cobbler/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3909/EL-5

Modified Files:
	.cvsignore cobbler.spec sources 
Log Message:
Updating Cobbler to 1.4.1




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cobbler/EL-5/.cvsignore,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- .cvsignore	19 Dec 2008 17:33:18 -0000	1.52
+++ .cvsignore	9 Jan 2009 17:23:37 -0000	1.53
@@ -49,3 +49,4 @@
 cobbler-1.2.8.tar.gz
 cobbler-1.2.9.tar.gz
 cobbler-1.4.0.tar.gz
+cobbler-1.4.1.tar.gz


Index: cobbler.spec
===================================================================
RCS file: /cvs/extras/rpms/cobbler/EL-5/cobbler.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- cobbler.spec	19 Dec 2008 17:33:18 -0000	1.60
+++ cobbler.spec	9 Jan 2009 17:23:37 -0000	1.61
@@ -2,8 +2,8 @@
 Summary: Boot server configurator
 Name: cobbler
 AutoReq: no
-Version: 1.4.0
-Release: 2%{?dist}
+Version: 1.4.1
+Release: 1%{?dist}
 Source0: %{name}-%{version}.tar.gz
 License: GPLv2+
 Group: Applications/System
@@ -30,8 +30,8 @@
 Requires(preun): /sbin/chkconfig
 Requires(preun): /sbin/service
 %if 0%{?fedora} >= 11 || 0%{?rhel} >= 6
-%{!?pyver: %define pyver %(%{__python} -c "import sys ; print sys.version[:3]")}
-Requires: python(abi)=%{pyver}
+%{!?pyver: %define pyver %(%{__python} -c "import sys ; print sys.version[:3]" || echo 0)}
+Requires: python(abi) = %{pyver}
 %endif
 %if 0%{?suse_version} < 0
 BuildRequires: redhat-rpm-config
@@ -157,8 +157,10 @@
 %dir /var/www/cobbler/links
 %defattr(755,apache,apache)
 %dir /var/www/cobbler/webui
+%dir /var/www/cobbler/aux
 %defattr(444,apache,apache)
 /var/www/cobbler/webui/*
+/var/www/cobbler/aux/*
 
 %defattr(755,root,root)
 %{_bindir}/cobbler
@@ -197,6 +199,7 @@
 %config(noreplace) /etc/httpd/conf.d/cobbler_svc.conf
 %endif
 %dir /var/log/cobbler/syslog
+%dir /var/log/cobbler/anamon
 
 %defattr(755,root,root)
 %dir /var/lib/cobbler
@@ -262,6 +265,7 @@
 %config(noreplace) /var/lib/cobbler/snippets/func_register_if_enabled
 %config(noreplace) /var/lib/cobbler/snippets/download_config_files
 %config(noreplace) /var/lib/cobbler/snippets/koan_environment
+%config(noreplace) /var/lib/cobbler/snippets/pre_anamon
 %config(noreplace) /var/lib/cobbler/snippets/redhat_register
 /var/lib/cobbler/elilo-3.8-ia64.efi
 /var/lib/cobbler/menu.c32
@@ -281,6 +285,12 @@
 
 %changelog
 
+* Mon Jan 09 2009 Michael DeHaan <mdehaan at redhat.com> - 1.4.1-1
+- Upstream changes (see CHANGELOG)
+
+* Fri Dec 19 2008 Michael DeHaan <mdehaan at redhat.com> - 1.4.0-4
+- Fix for rawhide python requirement.
+
 * Fri Dec 19 2008 Michael DeHaan <mdehaan at redhat.com> - 1.4.0-2
 - Upstream changes (see CHANGELOG)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cobbler/EL-5/sources,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- sources	19 Dec 2008 17:52:49 -0000	1.61
+++ sources	9 Jan 2009 17:23:37 -0000	1.62
@@ -1 +1,2 @@
 6bf3dae4f204b44858ba91faeb8a1ecf  cobbler-1.4.0.tar.gz
+a85b0ddfb7186f7ea5ed327f1be9c6dc  cobbler-1.4.1.tar.gz



From mdehaan at fedoraproject.org  Fri Jan  9 17:24:08 2009
From: mdehaan at fedoraproject.org (Michael DeHaan)
Date: Fri,  9 Jan 2009 17:24:08 +0000 (UTC)
Subject: rpms/cobbler/devel .cvsignore, 1.48, 1.49 cobbler.spec, 1.66,
	1.67 sources, 1.59, 1.60
Message-ID: <20090109172408.C66AC7011C@cvs1.fedora.phx.redhat.com>

Author: mdehaan

Update of /cvs/extras/rpms/cobbler/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3909/devel

Modified Files:
	.cvsignore cobbler.spec sources 
Log Message:
Updating Cobbler to 1.4.1




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cobbler/devel/.cvsignore,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- .cvsignore	19 Dec 2008 17:33:21 -0000	1.48
+++ .cvsignore	9 Jan 2009 17:23:38 -0000	1.49
@@ -45,3 +45,4 @@
 cobbler-1.2.8.tar.gz
 cobbler-1.2.9.tar.gz
 cobbler-1.4.0.tar.gz
+cobbler-1.4.1.tar.gz


Index: cobbler.spec
===================================================================
RCS file: /cvs/extras/rpms/cobbler/devel/cobbler.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- cobbler.spec	22 Dec 2008 19:00:45 -0000	1.66
+++ cobbler.spec	9 Jan 2009 17:23:38 -0000	1.67
@@ -2,8 +2,8 @@
 Summary: Boot server configurator
 Name: cobbler
 AutoReq: no
-Version: 1.4.0
-Release: 4%{?dist}
+Version: 1.4.1
+Release: 1%{?dist}
 Source0: %{name}-%{version}.tar.gz
 License: GPLv2+
 Group: Applications/System
@@ -157,8 +157,10 @@
 %dir /var/www/cobbler/links
 %defattr(755,apache,apache)
 %dir /var/www/cobbler/webui
+%dir /var/www/cobbler/aux
 %defattr(444,apache,apache)
 /var/www/cobbler/webui/*
+/var/www/cobbler/aux/*
 
 %defattr(755,root,root)
 %{_bindir}/cobbler
@@ -197,6 +199,7 @@
 %config(noreplace) /etc/httpd/conf.d/cobbler_svc.conf
 %endif
 %dir /var/log/cobbler/syslog
+%dir /var/log/cobbler/anamon
 
 %defattr(755,root,root)
 %dir /var/lib/cobbler
@@ -262,6 +265,7 @@
 %config(noreplace) /var/lib/cobbler/snippets/func_register_if_enabled
 %config(noreplace) /var/lib/cobbler/snippets/download_config_files
 %config(noreplace) /var/lib/cobbler/snippets/koan_environment
+%config(noreplace) /var/lib/cobbler/snippets/pre_anamon
 %config(noreplace) /var/lib/cobbler/snippets/redhat_register
 /var/lib/cobbler/elilo-3.8-ia64.efi
 /var/lib/cobbler/menu.c32
@@ -281,6 +285,9 @@
 
 %changelog
 
+* Mon Jan 09 2009 Michael DeHaan <mdehaan at redhat.com> - 1.4.1-1
+- Upstream changes (see CHANGELOG)
+
 * Fri Dec 19 2008 Michael DeHaan <mdehaan at redhat.com> - 1.4.0-4
 - Fix for rawhide python requirement.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cobbler/devel/sources,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- sources	19 Dec 2008 17:52:51 -0000	1.59
+++ sources	9 Jan 2009 17:23:38 -0000	1.60
@@ -1 +1,2 @@
 6bf3dae4f204b44858ba91faeb8a1ecf  cobbler-1.4.0.tar.gz
+a85b0ddfb7186f7ea5ed327f1be9c6dc  cobbler-1.4.1.tar.gz



From mdehaan at fedoraproject.org  Fri Jan  9 17:24:07 2009
From: mdehaan at fedoraproject.org (Michael DeHaan)
Date: Fri,  9 Jan 2009 17:24:07 +0000 (UTC)
Subject: rpms/cobbler/F-10 .cvsignore, 1.48, 1.49 cobbler.spec, 1.63,
	1.64 sources, 1.59, 1.60
Message-ID: <20090109172407.EE4757011C@cvs1.fedora.phx.redhat.com>

Author: mdehaan

Update of /cvs/extras/rpms/cobbler/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3909/F-10

Modified Files:
	.cvsignore cobbler.spec sources 
Log Message:
Updating Cobbler to 1.4.1




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cobbler/F-10/.cvsignore,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- .cvsignore	19 Dec 2008 17:26:08 -0000	1.48
+++ .cvsignore	9 Jan 2009 17:23:37 -0000	1.49
@@ -45,3 +45,4 @@
 cobbler-1.2.8.tar.gz
 cobbler-1.2.9.tar.gz
 cobbler-1.4.0.tar.gz
+cobbler-1.4.1.tar.gz


Index: cobbler.spec
===================================================================
RCS file: /cvs/extras/rpms/cobbler/F-10/cobbler.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- cobbler.spec	19 Dec 2008 17:33:19 -0000	1.63
+++ cobbler.spec	9 Jan 2009 17:23:37 -0000	1.64
@@ -2,8 +2,8 @@
 Summary: Boot server configurator
 Name: cobbler
 AutoReq: no
-Version: 1.4.0
-Release: 2%{?dist}
+Version: 1.4.1
+Release: 1%{?dist}
 Source0: %{name}-%{version}.tar.gz
 License: GPLv2+
 Group: Applications/System
@@ -30,8 +30,8 @@
 Requires(preun): /sbin/chkconfig
 Requires(preun): /sbin/service
 %if 0%{?fedora} >= 11 || 0%{?rhel} >= 6
-%{!?pyver: %define pyver %(%{__python} -c "import sys ; print sys.version[:3]")}
-Requires: python(abi)=%{pyver}
+%{!?pyver: %define pyver %(%{__python} -c "import sys ; print sys.version[:3]" || echo 0)}
+Requires: python(abi) = %{pyver}
 %endif
 %if 0%{?suse_version} < 0
 BuildRequires: redhat-rpm-config
@@ -157,8 +157,10 @@
 %dir /var/www/cobbler/links
 %defattr(755,apache,apache)
 %dir /var/www/cobbler/webui
+%dir /var/www/cobbler/aux
 %defattr(444,apache,apache)
 /var/www/cobbler/webui/*
+/var/www/cobbler/aux/*
 
 %defattr(755,root,root)
 %{_bindir}/cobbler
@@ -197,6 +199,7 @@
 %config(noreplace) /etc/httpd/conf.d/cobbler_svc.conf
 %endif
 %dir /var/log/cobbler/syslog
+%dir /var/log/cobbler/anamon
 
 %defattr(755,root,root)
 %dir /var/lib/cobbler
@@ -262,6 +265,7 @@
 %config(noreplace) /var/lib/cobbler/snippets/func_register_if_enabled
 %config(noreplace) /var/lib/cobbler/snippets/download_config_files
 %config(noreplace) /var/lib/cobbler/snippets/koan_environment
+%config(noreplace) /var/lib/cobbler/snippets/pre_anamon
 %config(noreplace) /var/lib/cobbler/snippets/redhat_register
 /var/lib/cobbler/elilo-3.8-ia64.efi
 /var/lib/cobbler/menu.c32
@@ -281,6 +285,12 @@
 
 %changelog
 
+* Mon Jan 09 2009 Michael DeHaan <mdehaan at redhat.com> - 1.4.1-1
+- Upstream changes (see CHANGELOG)
+
+* Fri Dec 19 2008 Michael DeHaan <mdehaan at redhat.com> - 1.4.0-4
+- Fix for rawhide python requirement.
+
 * Fri Dec 19 2008 Michael DeHaan <mdehaan at redhat.com> - 1.4.0-2
 - Upstream changes (see CHANGELOG)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cobbler/F-10/sources,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- sources	19 Dec 2008 17:52:49 -0000	1.59
+++ sources	9 Jan 2009 17:23:37 -0000	1.60
@@ -1 +1,2 @@
 6bf3dae4f204b44858ba91faeb8a1ecf  cobbler-1.4.0.tar.gz
+a85b0ddfb7186f7ea5ed327f1be9c6dc  cobbler-1.4.1.tar.gz



From mdehaan at fedoraproject.org  Fri Jan  9 17:24:08 2009
From: mdehaan at fedoraproject.org (Michael DeHaan)
Date: Fri,  9 Jan 2009 17:24:08 +0000 (UTC)
Subject: rpms/cobbler/F-9 .cvsignore, 1.48, 1.49 cobbler.spec, 1.60,
	1.61 sources, 1.57, 1.58
Message-ID: <20090109172408.62D627011C@cvs1.fedora.phx.redhat.com>

Author: mdehaan

Update of /cvs/extras/rpms/cobbler/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3909/F-9

Modified Files:
	.cvsignore cobbler.spec sources 
Log Message:
Updating Cobbler to 1.4.1




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cobbler/F-9/.cvsignore,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- .cvsignore	19 Dec 2008 17:33:20 -0000	1.48
+++ .cvsignore	9 Jan 2009 17:23:37 -0000	1.49
@@ -45,3 +45,4 @@
 cobbler-1.2.8.tar.gz
 cobbler-1.2.9.tar.gz
 cobbler-1.4.0.tar.gz
+cobbler-1.4.1.tar.gz


Index: cobbler.spec
===================================================================
RCS file: /cvs/extras/rpms/cobbler/F-9/cobbler.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- cobbler.spec	19 Dec 2008 17:33:20 -0000	1.60
+++ cobbler.spec	9 Jan 2009 17:23:38 -0000	1.61
@@ -2,8 +2,8 @@
 Summary: Boot server configurator
 Name: cobbler
 AutoReq: no
-Version: 1.4.0
-Release: 2%{?dist}
+Version: 1.4.1
+Release: 1%{?dist}
 Source0: %{name}-%{version}.tar.gz
 License: GPLv2+
 Group: Applications/System
@@ -30,8 +30,8 @@
 Requires(preun): /sbin/chkconfig
 Requires(preun): /sbin/service
 %if 0%{?fedora} >= 11 || 0%{?rhel} >= 6
-%{!?pyver: %define pyver %(%{__python} -c "import sys ; print sys.version[:3]")}
-Requires: python(abi)=%{pyver}
+%{!?pyver: %define pyver %(%{__python} -c "import sys ; print sys.version[:3]" || echo 0)}
+Requires: python(abi) = %{pyver}
 %endif
 %if 0%{?suse_version} < 0
 BuildRequires: redhat-rpm-config
@@ -157,8 +157,10 @@
 %dir /var/www/cobbler/links
 %defattr(755,apache,apache)
 %dir /var/www/cobbler/webui
+%dir /var/www/cobbler/aux
 %defattr(444,apache,apache)
 /var/www/cobbler/webui/*
+/var/www/cobbler/aux/*
 
 %defattr(755,root,root)
 %{_bindir}/cobbler
@@ -197,6 +199,7 @@
 %config(noreplace) /etc/httpd/conf.d/cobbler_svc.conf
 %endif
 %dir /var/log/cobbler/syslog
+%dir /var/log/cobbler/anamon
 
 %defattr(755,root,root)
 %dir /var/lib/cobbler
@@ -262,6 +265,7 @@
 %config(noreplace) /var/lib/cobbler/snippets/func_register_if_enabled
 %config(noreplace) /var/lib/cobbler/snippets/download_config_files
 %config(noreplace) /var/lib/cobbler/snippets/koan_environment
+%config(noreplace) /var/lib/cobbler/snippets/pre_anamon
 %config(noreplace) /var/lib/cobbler/snippets/redhat_register
 /var/lib/cobbler/elilo-3.8-ia64.efi
 /var/lib/cobbler/menu.c32
@@ -281,6 +285,12 @@
 
 %changelog
 
+* Mon Jan 09 2009 Michael DeHaan <mdehaan at redhat.com> - 1.4.1-1
+- Upstream changes (see CHANGELOG)
+
+* Fri Dec 19 2008 Michael DeHaan <mdehaan at redhat.com> - 1.4.0-4
+- Fix for rawhide python requirement.
+
 * Fri Dec 19 2008 Michael DeHaan <mdehaan at redhat.com> - 1.4.0-2
 - Upstream changes (see CHANGELOG)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cobbler/F-9/sources,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- sources	19 Dec 2008 17:52:50 -0000	1.57
+++ sources	9 Jan 2009 17:23:38 -0000	1.58
@@ -1 +1,2 @@
 6bf3dae4f204b44858ba91faeb8a1ecf  cobbler-1.4.0.tar.gz
+a85b0ddfb7186f7ea5ed327f1be9c6dc  cobbler-1.4.1.tar.gz



From than at fedoraproject.org  Fri Jan  9 17:29:14 2009
From: than at fedoraproject.org (Than Ngo)
Date: Fri,  9 Jan 2009 17:29:14 +0000 (UTC)
Subject: rpms/kdebase-workspace/devel kdebase-workspace.spec,1.163,1.164
Message-ID: <20090109172915.02BB17011C@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdebase-workspace/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5109

Modified Files:
	kdebase-workspace.spec 
Log Message:
fix rpm file list



Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebase-workspace/devel/kdebase-workspace.spec,v
retrieving revision 1.163
retrieving revision 1.164
diff -u -r1.163 -r1.164
--- kdebase-workspace.spec	9 Jan 2009 16:52:42 -0000	1.163
+++ kdebase-workspace.spec	9 Jan 2009 17:28:44 -0000	1.164
@@ -263,7 +263,13 @@
 %{_kde4_libdir}/lib*.so
 %{_kde4_libdir}/kde4/plugins/designer/ksysguardwidgets.so
 %{_kde4_libdir}/kde4/plugins/designer/ksysguardlsofwidgets.so
-%{_kde4_libdir}/KDE4Workspace*/
+# CMake seems to change behaviour between F11's cmake (2.6.3rc5)
+# and F10's cmake (2.6.2) -- Lorenzo
+%if 0%{?fedora} > 10
+%{_kde4_libdir}/cmake/KdepimLibs*
+%else
+%{_kde4_libdir}/KdepimLibs*
+%endif
 %exclude %{_kde4_libdir}/libkdeinit*.so
 %exclude %{_kde4_libdir}/libplasma_applet-system-monitor.so
 



From rdieter at fedoraproject.org  Fri Jan  9 17:47:31 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri,  9 Jan 2009 17:47:31 +0000 (UTC)
Subject: rpms/kde-l10n/F-10 sources,1.16,1.17 .cvsignore,1.14,1.15
Message-ID: <20090109174732.1A0D97011C@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kde-l10n/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7262

Modified Files:
	sources .cvsignore 
Log Message:
updated sources



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kde-l10n/F-10/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources	12 Nov 2008 00:01:31 -0000	1.16
+++ sources	9 Jan 2009 17:47:00 -0000	1.17
@@ -1,47 +1,47 @@
-a6b0e3e6ea5a53a2ce88d1392ba3ca58  kde-l10n-bg-4.1.3.tar.bz2
-a8915d9b9ab84b1e6ae1e8a21697384d  kde-l10n-ca-4.1.3.tar.bz2
-095705975bb76c18c9919252abf0da9e  kde-l10n-csb-4.1.3.tar.bz2
-e92b98c36922288e047d9eaa10b25641  kde-l10n-cs-4.1.3.tar.bz2
-b81566e8063cac723fa83fd8ef04ac28  kde-l10n-da-4.1.3.tar.bz2
-ca6e2943be1302c9deb6f3afb4706f24  kde-l10n-de-4.1.3.tar.bz2
-7c1bc162c676a204626534a286ade6eb  kde-l10n-el-4.1.3.tar.bz2
-cc67c275e370a647ed5e7fda91764c37  kde-l10n-en_GB-4.1.3.tar.bz2
-f9fc59aff7132f98464a2cacfa97f532  kde-l10n-eo-4.1.3.tar.bz2
-ea6af5080b48b3aeb2263e798c0b25a3  kde-l10n-es-4.1.3.tar.bz2
-882cccd332bede1ba7cad789962b2598  kde-l10n-et-4.1.3.tar.bz2
-10fc51692f7c6444560b5de61cc93112  kde-l10n-fi-4.1.3.tar.bz2
-2d585a15ec254e07d7b5eb46deb5cc72  kde-l10n-fr-4.1.3.tar.bz2
-1b499287e689eb2e3c6a5de5f58b63ca  kde-l10n-fy-4.1.3.tar.bz2
-d1dd6eb5c553c2ec046cf599bc1e6ef3  kde-l10n-ga-4.1.3.tar.bz2
-ff3a2d8bacc5b389d491bcb3308b11aa  kde-l10n-gl-4.1.3.tar.bz2
-fcf9c561585c519bc8b56df2a30c45dc  kde-l10n-hi-4.1.3.tar.bz2
-ae9ddc1f397168314ff40579c22aab97  kde-l10n-hu-4.1.3.tar.bz2
-6df69bb194811dd2f9eba260343b9b01  kde-l10n-it-4.1.3.tar.bz2
-8c20a5aeeb9fdf8e28787245fa1469d6  kde-l10n-ja-4.1.3.tar.bz2
-f364e6296d047d9f3911c094f26effd4  kde-l10n-kk-4.1.3.tar.bz2
-087fd1835f43c87132ecb0670ef96fe8  kde-l10n-km-4.1.3.tar.bz2
-f51be2b09fd7de50afab4e51ab7dcc17  kde-l10n-ko-4.1.3.tar.bz2
-1ea9d261c68f73b22cf56446810a4297  kde-l10n-ku-4.1.3.tar.bz2
-a162fc28c63cce4c2112443cc7ef6581  kde-l10n-lt-4.1.3.tar.bz2
-58b03bbbb73cac4881e387a92b3ecc88  kde-l10n-lv-4.1.3.tar.bz2
-52e65b08097519e5332ce402b84520be  kde-l10n-mk-4.1.3.tar.bz2
-9d70e9c3c4e9f1221ce3be20303b06aa  kde-l10n-ml-4.1.3.tar.bz2
-f97b8145b51d633293405c74e9222945  kde-l10n-nb-4.1.3.tar.bz2
-d63af859899b90625970ccef75993cfd  kde-l10n-nds-4.1.3.tar.bz2
-8ef32903e000281b228a66c2fe69321b  kde-l10n-nl-4.1.3.tar.bz2
-474fd6769fe0f9d59840bbc423714ef6  kde-l10n-nn-4.1.3.tar.bz2
-f6ec0e0a808350671ca959ac06928c79  kde-l10n-pa-4.1.3.tar.bz2
-199dd758e66de4cd9cca12142d7fffd1  kde-l10n-pl-4.1.3.tar.bz2
-bf6b98228a752ac957b1d452b01c8100  kde-l10n-pt_BR-4.1.3.tar.bz2
-70bfccb843d8ace4ea4ca09b53882707  kde-l10n-pt-4.1.3.tar.bz2
-219f203563c5b2cce873005ec07beae0  kde-l10n-ru-4.1.3.tar.bz2
-699d3c2d6a4f486a3cabea27bedce38b  kde-l10n-sl-4.1.3.tar.bz2
-9c8fc1aad911e9586556a7ba5e5c693b  kde-l10n-sr-4.1.3.tar.bz2
-c0b7bd3ea625ca46f4c52c76c65f7069  kde-l10n-sv-4.1.3.tar.bz2
-bd3554f64308a2dbfe04cd065ac42650  kde-l10n-ta-4.1.3.tar.bz2
-20dbbabe676d3586c84fe6a17c6b115a  kde-l10n-th-4.1.3.tar.bz2
-587c21e1534a08fced36421640da0bb0  kde-l10n-tr-4.1.3.tar.bz2
-90a224caa436934b08075ec4257b11fb  kde-l10n-uk-4.1.3.tar.bz2
-3a3331c1393e3e7e17d1a20cad1e5e51  kde-l10n-wa-4.1.3.tar.bz2
-c4951153ab58c47e23ae16c114164f38  kde-l10n-zh_CN-4.1.3.tar.bz2
-ed1a1ff739772de42ad8ae4351c04fe6  kde-l10n-zh_TW-4.1.3.tar.bz2
+5f5b1effdd9b8f0a6c1a4ab59b739f0e  kde-l10n-bg-4.1.4.tar.bz2
+ebf90b925b2bf1a0b6246e800a3eaf09  kde-l10n-ca-4.1.4.tar.bz2
+12cd58d5728958829d65881fcdb3958f  kde-l10n-cs-4.1.4.tar.bz2
+b3371c5468c27021ee8dc19113ad4be7  kde-l10n-csb-4.1.4.tar.bz2
+b6c145d943292f2ba11753aa044f66f5  kde-l10n-da-4.1.4.tar.bz2
+bf5db9e7c2708e4ecd01345137009cab  kde-l10n-de-4.1.4.tar.bz2
+4b80c39785839da001190a38c8e7266b  kde-l10n-el-4.1.4.tar.bz2
+42f851c5f7e4432894483bf85ecb9076  kde-l10n-en_GB-4.1.4.tar.bz2
+88875e433f2440757b03df87eab9de07  kde-l10n-eo-4.1.4.tar.bz2
+0d2fed450def3f19704f34e8c9927054  kde-l10n-es-4.1.4.tar.bz2
+c1516ef8c2d60e03ca10bb5f9ef731ee  kde-l10n-et-4.1.4.tar.bz2
+eac2a616f172f714abe8f8a9c4403f19  kde-l10n-fi-4.1.4.tar.bz2
+dd6b5b97e47b28ca8c8d72c432a12056  kde-l10n-fr-4.1.4.tar.bz2
+1ca52ac5269d104ae970a06b683a6924  kde-l10n-fy-4.1.4.tar.bz2
+e35d048d6977d62b9f1598ecd6410ae9  kde-l10n-ga-4.1.4.tar.bz2
+7e75474eb5f39f122ae08f4f1abeeeb2  kde-l10n-gl-4.1.4.tar.bz2
+be6dc85d35ccd4431f3ffadef802f1dc  kde-l10n-hi-4.1.4.tar.bz2
+ea3cf065ea2a17e4daf3847194c2bd5f  kde-l10n-hu-4.1.4.tar.bz2
+f57747f19419714cfd72cbbbba3c465a  kde-l10n-it-4.1.4.tar.bz2
+19157c9ca23253d1dc5f872f71d88c9e  kde-l10n-ja-4.1.4.tar.bz2
+9c6ae2d6e70b95d6287a46b1d53502e6  kde-l10n-kk-4.1.4.tar.bz2
+4df0089cebfea89a9f4a3287df90f0a7  kde-l10n-km-4.1.4.tar.bz2
+d1c3c4d106672a83f2fa73b5b49312d9  kde-l10n-ko-4.1.4.tar.bz2
+2dea53e4a1b43644549a8a53b427c167  kde-l10n-ku-4.1.4.tar.bz2
+87b9c0b435bd37a073549427300c713b  kde-l10n-lt-4.1.4.tar.bz2
+e05d96e5fad79570422b33029a6cb65c  kde-l10n-lv-4.1.4.tar.bz2
+aef1f6063ba8701a352132aed655ab05  kde-l10n-mk-4.1.4.tar.bz2
+2491e682dc830fdb0b6738e9ff6e04d0  kde-l10n-ml-4.1.4.tar.bz2
+e21c6f67d95240a1a26512894c18efdf  kde-l10n-nb-4.1.4.tar.bz2
+12b299ec3b9ec3715b78e3afc17f0fb0  kde-l10n-nds-4.1.4.tar.bz2
+50b0dabddf55d79ae55e4313b3dfb0cc  kde-l10n-nl-4.1.4.tar.bz2
+b55ec0958d079004ca0d6d89af1cc0af  kde-l10n-nn-4.1.4.tar.bz2
+c40c3a9d61439b62c0dad8e5f994623b  kde-l10n-pa-4.1.4.tar.bz2
+dbf06430f02b44933fd78f16f445e54f  kde-l10n-pl-4.1.4.tar.bz2
+cf666b9d9e4f5e6089d3dfc04e5291ff  kde-l10n-pt-4.1.4.tar.bz2
+6f08bd872f25ff812b1f449e012b2691  kde-l10n-pt_BR-4.1.4.tar.bz2
+bf8b2f974108d722962e832e26fc00ec  kde-l10n-ru-4.1.4.tar.bz2
+c4a74ef14b66d2cc44518e4dbccf7884  kde-l10n-sl-4.1.4.tar.bz2
+a60f826a7fcb82e23851fabf03f52fa7  kde-l10n-sr-4.1.4.tar.bz2
+35e967ea1a7b93629a7591e7a2736da0  kde-l10n-sv-4.1.4.tar.bz2
+6b1ffdaed790ed733bfc3aac8808cbad  kde-l10n-ta-4.1.4.tar.bz2
+24ffa0fca844ff1756ca7469bd845d98  kde-l10n-th-4.1.4.tar.bz2
+d06edd7000b97585335bcefb4e62ad3a  kde-l10n-tr-4.1.4.tar.bz2
+e0a1b781e02d56caef169fd51ddb7a63  kde-l10n-uk-4.1.4.tar.bz2
+6b01aafb428179c9f4153a958b0d0044  kde-l10n-wa-4.1.4.tar.bz2
+cfe9af2f9f3df568623b0c35cc307403  kde-l10n-zh_CN-4.1.4.tar.bz2
+02f9104908ad1e3e28f78716b0a562cc  kde-l10n-zh_TW-4.1.4.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kde-l10n/F-10/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	27 Sep 2008 03:44:24 -0000	1.14
+++ .cvsignore	9 Jan 2009 17:47:00 -0000	1.15
@@ -1,47 +1,47 @@
-kde-l10n-bg-4.1.2.tar.bz2
-kde-l10n-ca-4.1.2.tar.bz2
-kde-l10n-cs-4.1.2.tar.bz2
-kde-l10n-csb-4.1.2.tar.bz2
-kde-l10n-da-4.1.2.tar.bz2
-kde-l10n-de-4.1.2.tar.bz2
-kde-l10n-el-4.1.2.tar.bz2
-kde-l10n-en_GB-4.1.2.tar.bz2
-kde-l10n-eo-4.1.2.tar.bz2
-kde-l10n-es-4.1.2.tar.bz2
-kde-l10n-et-4.1.2.tar.bz2
-kde-l10n-fi-4.1.2.tar.bz2
-kde-l10n-fr-4.1.2.tar.bz2
-kde-l10n-fy-4.1.2.tar.bz2
-kde-l10n-ga-4.1.2.tar.bz2
-kde-l10n-gl-4.1.2.tar.bz2
-kde-l10n-hi-4.1.2.tar.bz2
-kde-l10n-hu-4.1.2.tar.bz2
-kde-l10n-it-4.1.2.tar.bz2
-kde-l10n-ja-4.1.2.tar.bz2
-kde-l10n-kk-4.1.2.tar.bz2
-kde-l10n-km-4.1.2.tar.bz2
-kde-l10n-ko-4.1.2.tar.bz2
-kde-l10n-ku-4.1.2.tar.bz2
-kde-l10n-lt-4.1.2.tar.bz2
-kde-l10n-lv-4.1.2.tar.bz2
-kde-l10n-mk-4.1.2.tar.bz2
-kde-l10n-ml-4.1.2.tar.bz2
-kde-l10n-nb-4.1.2.tar.bz2
-kde-l10n-nds-4.1.2.tar.bz2
-kde-l10n-nl-4.1.2.tar.bz2
-kde-l10n-nn-4.1.2.tar.bz2
-kde-l10n-pa-4.1.2.tar.bz2
-kde-l10n-pl-4.1.2.tar.bz2
-kde-l10n-pt-4.1.2.tar.bz2
-kde-l10n-pt_BR-4.1.2.tar.bz2
-kde-l10n-ru-4.1.2.tar.bz2
-kde-l10n-sl-4.1.2.tar.bz2
-kde-l10n-sr-4.1.2.tar.bz2
-kde-l10n-sv-4.1.2.tar.bz2
-kde-l10n-ta-4.1.2.tar.bz2
-kde-l10n-th-4.1.2.tar.bz2
-kde-l10n-tr-4.1.2.tar.bz2
-kde-l10n-uk-4.1.2.tar.bz2
-kde-l10n-wa-4.1.2.tar.bz2
-kde-l10n-zh_CN-4.1.2.tar.bz2
-kde-l10n-zh_TW-4.1.2.tar.bz2
+kde-l10n-bg-4.1.4.tar.bz2
+kde-l10n-ca-4.1.4.tar.bz2
+kde-l10n-cs-4.1.4.tar.bz2
+kde-l10n-csb-4.1.4.tar.bz2
+kde-l10n-da-4.1.4.tar.bz2
+kde-l10n-de-4.1.4.tar.bz2
+kde-l10n-el-4.1.4.tar.bz2
+kde-l10n-en_GB-4.1.4.tar.bz2
+kde-l10n-eo-4.1.4.tar.bz2
+kde-l10n-es-4.1.4.tar.bz2
+kde-l10n-et-4.1.4.tar.bz2
+kde-l10n-fi-4.1.4.tar.bz2
+kde-l10n-fr-4.1.4.tar.bz2
+kde-l10n-fy-4.1.4.tar.bz2
+kde-l10n-ga-4.1.4.tar.bz2
+kde-l10n-gl-4.1.4.tar.bz2
+kde-l10n-hi-4.1.4.tar.bz2
+kde-l10n-hu-4.1.4.tar.bz2
+kde-l10n-it-4.1.4.tar.bz2
+kde-l10n-ja-4.1.4.tar.bz2
+kde-l10n-kk-4.1.4.tar.bz2
+kde-l10n-km-4.1.4.tar.bz2
+kde-l10n-ko-4.1.4.tar.bz2
+kde-l10n-ku-4.1.4.tar.bz2
+kde-l10n-lt-4.1.4.tar.bz2
+kde-l10n-lv-4.1.4.tar.bz2
+kde-l10n-mk-4.1.4.tar.bz2
+kde-l10n-ml-4.1.4.tar.bz2
+kde-l10n-nb-4.1.4.tar.bz2
+kde-l10n-nds-4.1.4.tar.bz2
+kde-l10n-nl-4.1.4.tar.bz2
+kde-l10n-nn-4.1.4.tar.bz2
+kde-l10n-pa-4.1.4.tar.bz2
+kde-l10n-pl-4.1.4.tar.bz2
+kde-l10n-pt-4.1.4.tar.bz2
+kde-l10n-pt_BR-4.1.4.tar.bz2
+kde-l10n-ru-4.1.4.tar.bz2
+kde-l10n-sl-4.1.4.tar.bz2
+kde-l10n-sr-4.1.4.tar.bz2
+kde-l10n-sv-4.1.4.tar.bz2
+kde-l10n-ta-4.1.4.tar.bz2
+kde-l10n-th-4.1.4.tar.bz2
+kde-l10n-tr-4.1.4.tar.bz2
+kde-l10n-uk-4.1.4.tar.bz2
+kde-l10n-wa-4.1.4.tar.bz2
+kde-l10n-zh_CN-4.1.4.tar.bz2
+kde-l10n-zh_TW-4.1.4.tar.bz2



From than at fedoraproject.org  Fri Jan  9 17:55:09 2009
From: than at fedoraproject.org (Than Ngo)
Date: Fri,  9 Jan 2009 17:55:09 +0000 (UTC)
Subject: rpms/kdebase-workspace/devel kdebase-workspace.spec,1.164,1.165
Message-ID: <20090109175509.57EED7011C@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdebase-workspace/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8845

Modified Files:
	kdebase-workspace.spec 
Log Message:
fix rpm file list



Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebase-workspace/devel/kdebase-workspace.spec,v
retrieving revision 1.164
retrieving revision 1.165
diff -u -r1.164 -r1.165
--- kdebase-workspace.spec	9 Jan 2009 17:28:44 -0000	1.164
+++ kdebase-workspace.spec	9 Jan 2009 17:54:38 -0000	1.165
@@ -266,9 +266,9 @@
 # CMake seems to change behaviour between F11's cmake (2.6.3rc5)
 # and F10's cmake (2.6.2) -- Lorenzo
 %if 0%{?fedora} > 10
-%{_kde4_libdir}/cmake/KdepimLibs*
+%{_kde4_libdir}/cmake/KDE4Workspace*
 %else
-%{_kde4_libdir}/KdepimLibs*
+%{_kde4_libdir}/KDE4Workspace*
 %endif
 %exclude %{_kde4_libdir}/libkdeinit*.so
 %exclude %{_kde4_libdir}/libplasma_applet-system-monitor.so



From saispo at fedoraproject.org  Fri Jan  9 18:25:10 2009
From: saispo at fedoraproject.org (Jerome Soyer)
Date: Fri,  9 Jan 2009 18:25:10 +0000 (UTC)
Subject: rpms/nufw/devel README.python_nufw, NONE, 1.1 import.log, NONE,
	1.1 nuauth.init, NONE, 1.1 nuauth.pam, NONE,
	1.1 nufw-avoid-version.patch, NONE, 1.1 nufw.init, NONE,
	1.1 nufw.spec, NONE, 1.1 setup-python_nufw.py, NONE,
	1.1 sysconfig-nuauth, NONE, 1.1 sysconfig-nufw, NONE,
	1.1 version-python_nufw.py, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090109182510.1B7F67011C@cvs1.fedora.phx.redhat.com>

Author: saispo

Update of /cvs/pkgs/rpms/nufw/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12433/devel

Modified Files:
	.cvsignore sources 
Added Files:
	README.python_nufw import.log nuauth.init nuauth.pam 
	nufw-avoid-version.patch nufw.init nufw.spec 
	setup-python_nufw.py sysconfig-nuauth sysconfig-nufw 
	version-python_nufw.py 
Log Message:
* Dec 19 2008 Jerome Soyer <saispo at gmail.com> 2.2.20-5
- Add "touch -r" in the charset conversion for keeping timestamps




--- NEW FILE README.python_nufw ---
Python binding of libnuclient library, object oriented.

See test_nuclient.py for an example of nuclient use.



--- NEW FILE import.log ---
nufw-2_2_20-5_fc11:HEAD:nufw-2.2.20-5.fc11.src.rpm:1231525256


--- NEW FILE nuauth.init ---
#!/bin/sh
#
# nuauth Startup script for nuauth
#
# chkconfig:   - 86 16
# description: Nuauth is a authentifcation server for nufw.

### BEGIN INIT INFO
# Provides:          nuauth
# Required-Start:    $syslog
# Required-Stop:     $syslog
# Should-Start:      $local_fs
# Should-Stop:       $local_fs
# Default-Start:
# Default-Stop:      0 1 2 3 4 5 6
# Short-Description: Control script for nuauth
# Description:       Init script to control (start/stop/reload)
#                    the nuauth server.
### END INIT INFO


# Source function library.
. /etc/rc.d/init.d/functions

exec=/usr/sbin/nuauth
prog=nuauth
config=/etc/nufw/nuauth.conf

[ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog

if [ "$NUAUTH_START" != "true" ]; then
  exit 0
fi

if [ ! "$NUAUTH_VERBOSITY" ]; then
  NUAUTH_VERBOSITY="vv"
fi

if [ ! "$NUAUTH_USER" ]; then
  echo "No user configured to run nuauth... Trying \"nobody\" ..."
  NUAUTH_USER="nobody"
fi

if [ ! "$NUAUTH_PID" ]; then
        NUAUTH_PID="/var/run/$PID/$PID.pid"
fi

if [ ! -d /var/run/nuauth ]; then
        mkdir -p /var/run/nuauth
fi

chown $NUAUTH_USER /var/run/nuauth

DAEMON_OPTS="-D -$NUAUTH_VERBOSITY"

lockfile=/var/lock/subsys/$prog

start() {
    if [ "$NUAUTH_START" != "true" ]; then
      exit 1
    fi
    [ -x $exec ] || exit 5
    [ -f $config ] || exit 6
    echo -n $"Starting $prog: "
    # if not running, start it up here, usually something like "daemon $exec"
    daemon $exec $DAEMON_OPTS
    retval=$?
    echo
    [ $retval -eq 0 ] && touch $lockfile
    return $retval
}

stop() {
    echo -n $"Stopping $prog: "
    # stop it here, often "killproc $prog"
    killproc $prog
    retval=$?
    echo
    [ $retval -eq 0 ] && rm -f $lockfile
    return $retval
}

restart() {
    stop
    start
}

reload() {
    restart
}

force_reload() {
    restart
}

rh_status() {
    # run checks to determine if the service is running or use generic status
    status $prog
}

rh_status_q() {
    rh_status >/dev/null 2>&1
}


case "$1" in
    start)
        rh_status_q && exit 0
        $1
        ;;
    stop)
        rh_status_q || exit 0
        $1
        ;;
    restart)
        $1
        ;;
    reload)
        rh_status_q || exit 7
        $1
        ;;
    force-reload)
        force_reload
        ;;
    status)
        rh_status
        ;;
    condrestart|try-restart)
        rh_status_q || exit 0
        restart
        ;;
    *)
        echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload}"
        exit 2
esac
exit $?



--- NEW FILE nuauth.pam ---
#%PAM-1.0
auth       include      system-auth
account    include      system-auth
password   include      system-auth
session    include      system-auth


nufw-avoid-version.patch:

--- NEW FILE nufw-avoid-version.patch ---
--- nufw-2.2.20old/src/nuauth/modules/auth_mysql/Makefile.in.avoid-version	2008-12-10 10:40:26.000000000 +0100
+++ nufw-2.2.20old/src/nuauth/modules/auth_mysql/Makefile.in	2008-12-12 11:24:01.000000000 +0100
@@ -54,6 +54,7 @@
 pluginLTLIBRARIES_INSTALL = $(INSTALL)
 LTLIBRARIES = $(plugin_LTLIBRARIES)
 libauth_mysql_la_LIBADD =
+libauth_mysql_la_LDFLAGS = -avoid-version
 am__libauth_mysql_la_SOURCES_DIST = mysql_auth.c mysql_auth.h mysql.h
 am__objects_1 =
 @USE_MYSQL_AUTH_TRUE at am_libauth_mysql_la_OBJECTS = mysql_auth.lo \
--- nufw-2.2.20old/src/nuauth/modules/ipauth_guest/Makefile.in.avoid-version	2008-12-10 10:40:26.000000000 +0100
+++ nufw-2.2.20old/src/nuauth/modules/ipauth_guest/Makefile.in	2008-12-12 11:24:01.000000000 +0100
@@ -53,6 +53,7 @@
 pluginLTLIBRARIES_INSTALL = $(INSTALL)
 LTLIBRARIES = $(plugin_LTLIBRARIES)
 libipauth_guest_la_LIBADD =
+libipauth_guest_la_LDFLAGS = -avoid-version
 am_libipauth_guest_la_OBJECTS = libipauth_guest.lo
 libipauth_guest_la_OBJECTS = $(am_libipauth_guest_la_OBJECTS)
 DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)/src/include
--- nufw-2.2.20old/src/nuauth/modules/ldap/Makefile.in.avoid-version	2008-12-10 10:40:26.000000000 +0100
+++ nufw-2.2.20old/src/nuauth/modules/ldap/Makefile.in	2008-12-12 11:24:01.000000000 +0100
@@ -54,6 +54,7 @@
 pluginLTLIBRARIES_INSTALL = $(INSTALL)
 LTLIBRARIES = $(plugin_LTLIBRARIES)
 libldap_la_DEPENDENCIES =
+libldap_la_LDFLAGS = -avoid-version
 am__libldap_la_SOURCES_DIST = ldap.c auth_ldap.h
 am__objects_1 =
 @USE_LDAP_TRUE at am_libldap_la_OBJECTS = ldap.lo $(am__objects_1)
--- nufw-2.2.20old/src/nuauth/modules/log_mysql/Makefile.in.avoid-version	2008-12-10 10:40:27.000000000 +0100
+++ nufw-2.2.20old/src/nuauth/modules/log_mysql/Makefile.in	2008-12-12 11:24:01.000000000 +0100
@@ -54,6 +54,7 @@
 pluginLTLIBRARIES_INSTALL = $(INSTALL)
 LTLIBRARIES = $(plugin_LTLIBRARIES)
 libmysql_la_LIBADD =
+libmysql_la_LDFLAGS = -avoid-version
 am__libmysql_la_SOURCES_DIST = mysql.c log_mysql.h
 am__objects_1 =
 @USE_MYSQL_LOG_TRUE at am_libmysql_la_OBJECTS = mysql.lo $(am__objects_1)
--- nufw-2.2.20old/src/nuauth/modules/log_nuprelude/Makefile.in.avoid-version	2008-12-10 10:40:27.000000000 +0100
+++ nufw-2.2.20old/src/nuauth/modules/log_nuprelude/Makefile.in	2008-12-12 11:24:01.000000000 +0100
@@ -54,6 +54,7 @@
 pluginLTLIBRARIES_INSTALL = $(INSTALL)
 LTLIBRARIES = $(plugin_LTLIBRARIES)
 libnuprelude_la_DEPENDENCIES =
+libnuprelude_la_LDFLAGS = -avoid-version
 am__libnuprelude_la_SOURCES_DIST = nuprelude.c log_prelude.h
 am__objects_1 =
 @USE_PRELUDE_LOG_TRUE at am_libnuprelude_la_OBJECTS = nuprelude.lo \
--- nufw-2.2.20old/src/nuauth/modules/log_pgsql/Makefile.in.avoid-version	2008-12-12 11:24:01.000000000 +0100
+++ nufw-2.2.20old/src/nuauth/modules/log_pgsql/Makefile.in	2008-12-12 11:24:01.000000000 +0100
@@ -54,6 +54,7 @@
 pluginLTLIBRARIES_INSTALL = $(INSTALL)
 LTLIBRARIES = $(plugin_LTLIBRARIES)
 libpgsql_la_DEPENDENCIES =
+libpgsql_la_LDFLAGS = -avoid-version
 am__libpgsql_la_SOURCES_DIST = pgsql.c log_pgsql.h
 am__objects_1 =
 @USE_PGSQL_LOG_TRUE at am_libpgsql_la_OBJECTS = pgsql.lo $(am__objects_1)
--- nufw-2.2.20old/src/nuauth/modules/log_script/Makefile.in.avoid-version	2008-12-10 10:40:27.000000000 +0100
+++ nufw-2.2.20old/src/nuauth/modules/log_script/Makefile.in	2008-12-12 11:24:01.000000000 +0100
@@ -51,6 +51,7 @@
 pluginLTLIBRARIES_INSTALL = $(INSTALL)
 LTLIBRARIES = $(plugin_LTLIBRARIES)
 libscript_la_LIBADD =
+libscript_la_LDFLAGS = -avoid-version
 am_libscript_la_OBJECTS = script.lo
 libscript_la_OBJECTS = $(am_libscript_la_OBJECTS)
 DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)/src/include
--- nufw-2.2.20old/src/nuauth/modules/log_syslog/Makefile.in.avoid-version	2008-12-10 10:40:27.000000000 +0100
+++ nufw-2.2.20old/src/nuauth/modules/log_syslog/Makefile.in	2008-12-12 11:24:01.000000000 +0100
@@ -53,6 +53,7 @@
 pluginLTLIBRARIES_INSTALL = $(INSTALL)
 LTLIBRARIES = $(plugin_LTLIBRARIES)
 libsyslog_la_LIBADD =
+libsyslog_la_LDFLAGS = -avoid-version
 am__libsyslog_la_SOURCES_DIST = syslog.c
 @USE_SYSLOG_LOG_TRUE at am_libsyslog_la_OBJECTS = syslog.lo
 libsyslog_la_OBJECTS = $(am_libsyslog_la_OBJECTS)
--- nufw-2.2.20old/src/nuauth/modules/mark_field/Makefile.in.avoid-version	2008-12-10 10:40:27.000000000 +0100
+++ nufw-2.2.20old/src/nuauth/modules/mark_field/Makefile.in	2008-12-12 11:24:01.000000000 +0100
@@ -54,6 +54,7 @@
 pluginLTLIBRARIES_INSTALL = $(INSTALL)
 LTLIBRARIES = $(plugin_LTLIBRARIES)
 libmark_field_la_LIBADD =
+libmark_field_la_LDFLAGS = -avoid-version
 am__libmark_field_la_SOURCES_DIST = mark_field.c mark_field.h
 am__objects_1 =
 @USE_MARK_FIELD_TRUE at am_libmark_field_la_OBJECTS = mark_field.lo \
--- nufw-2.2.20old/src/nuauth/modules/mark_flag/Makefile.in.avoid-version	2008-12-10 10:40:27.000000000 +0100
+++ nufw-2.2.20old/src/nuauth/modules/mark_flag/Makefile.in	2008-12-12 11:24:01.000000000 +0100
@@ -53,6 +53,7 @@
 pluginLTLIBRARIES_INSTALL = $(INSTALL)
 LTLIBRARIES = $(plugin_LTLIBRARIES)
 libmark_flag_la_LIBADD =
+libmark_flag_la_LDFLAGS = -avoid-version
 am_libmark_flag_la_OBJECTS = mark_flag.lo
 libmark_flag_la_OBJECTS = $(am_libmark_flag_la_OBJECTS)
 DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)/src/include
--- nufw-2.2.20old/src/nuauth/modules/mark_group/Makefile.in.avoid-version	2008-12-10 10:40:27.000000000 +0100
+++ nufw-2.2.20old/src/nuauth/modules/mark_group/Makefile.in	2008-12-12 11:24:01.000000000 +0100
@@ -54,6 +54,7 @@
 pluginLTLIBRARIES_INSTALL = $(INSTALL)
 LTLIBRARIES = $(plugin_LTLIBRARIES)
 libmark_group_la_LIBADD =
+libmark_group_la_LDFLAGS = -avoid-version
 am__libmark_group_la_SOURCES_DIST = mark_group.c mark_group.h
 am__objects_1 =
 @USE_MARK_GROUP_TRUE at am_libmark_group_la_OBJECTS = mark_group.lo \
--- nufw-2.2.20old/src/nuauth/modules/mark_uid/Makefile.in.avoid-version	2008-12-10 10:40:27.000000000 +0100
+++ nufw-2.2.20old/src/nuauth/modules/mark_uid/Makefile.in	2008-12-12 11:24:01.000000000 +0100
@@ -53,6 +53,7 @@
 pluginLTLIBRARIES_INSTALL = $(INSTALL)
 LTLIBRARIES = $(plugin_LTLIBRARIES)
 libmark_uid_la_LIBADD =
+libmark_uid_la_LDFLAGS = -avoid-version
 am_libmark_uid_la_OBJECTS = mark_uid.lo
 libmark_uid_la_OBJECTS = $(am_libmark_uid_la_OBJECTS)
 DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)/src/include
--- nufw-2.2.20old/src/nuauth/modules/plaintext/Makefile.in.avoid-version	2008-12-10 10:40:27.000000000 +0100
+++ nufw-2.2.20old/src/nuauth/modules/plaintext/Makefile.in	2008-12-12 11:24:01.000000000 +0100
@@ -54,6 +54,7 @@
 pluginLTLIBRARIES_INSTALL = $(INSTALL)
 LTLIBRARIES = $(plugin_LTLIBRARIES)
 libplaintext_la_LIBADD =
+libplaintext_la_LDFLAGS = -avoid-version
 am__libplaintext_la_SOURCES_DIST = plaintext.c auth_plaintext.h
 am__objects_1 =
 @USE_PLAINTEXT_AUTH_TRUE at am_libplaintext_la_OBJECTS = plaintext.lo \
--- nufw-2.2.20old/src/nuauth/modules/session_authtype/Makefile.in.avoid-version	2008-12-10 10:40:28.000000000 +0100
+++ nufw-2.2.20old/src/nuauth/modules/session_authtype/Makefile.in	2008-12-12 11:56:14.000000000 +0100
@@ -52,6 +52,7 @@
 am__installdirs = "$(DESTDIR)$(plugindir)"
 pluginLTLIBRARIES_INSTALL = $(INSTALL)
 LTLIBRARIES = $(plugin_LTLIBRARIES)
+lib_sessionauthtype_la_LDFLAGS = -avoid-version
 libsession_authtype_la_LIBADD =
 am_libsession_authtype_la_OBJECTS = session_authtype.lo
 libsession_authtype_la_OBJECTS = $(am_libsession_authtype_la_OBJECTS)
--- nufw-2.2.20old/src/nuauth/modules/session_expire/Makefile.in.avoid-version	2008-12-10 10:40:28.000000000 +0100
+++ nufw-2.2.20old/src/nuauth/modules/session_expire/Makefile.in	2008-12-12 11:57:05.000000000 +0100
@@ -52,6 +52,7 @@
 am__installdirs = "$(DESTDIR)$(plugindir)"
 pluginLTLIBRARIES_INSTALL = $(INSTALL)
 LTLIBRARIES = $(plugin_LTLIBRARIES)
+lib_sessionexpire_la_LDFLAGS = -avoid-version
 libsession_expire_la_LIBADD =
 am_libsession_expire_la_OBJECTS = session_expire.lo
 libsession_expire_la_OBJECTS = $(am_libsession_expire_la_OBJECTS)
@@ -476,7 +477,7 @@
 	tags uninstall uninstall-am uninstall-pluginLTLIBRARIES
 
 
-libsession_expire.la: $(libsession_expire_la_OBJECTS) $(libsession_expire_la_DEPENDENCIES) 
+libsession_expire.la: $(libsession_expire_la_OBJECTS) $(libsession_expire_la_DEPENDENCIES)
 	$(LINK) -rpath $(plugindir) $(lib_sessionexpire_la_LDFLAGS) $(libsession_expire_la_OBJECTS) $(libsession_expire_la_LIBADD)
 # 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.
--- nufw-2.2.20old/src/nuauth/modules/system/Makefile.in.avoid-version	2008-12-10 10:40:28.000000000 +0100
+++ nufw-2.2.20old/src/nuauth/modules/system/Makefile.in	2008-12-12 11:24:01.000000000 +0100
@@ -58,6 +58,7 @@
 am__libsystem_la_SOURCES_DIST = system.c getugroups.c
 @USE_SYSTEM_AUTH_TRUE at am_libsystem_la_OBJECTS = system.lo \
 @USE_SYSTEM_AUTH_TRUE@	getugroups.lo
+libsystem_la_LDFLAGS = -avoid-version
 libsystem_la_OBJECTS = $(am_libsystem_la_OBJECTS)
 @USE_SYSTEM_AUTH_TRUE at am_libsystem_la_rpath = -rpath $(plugindir)
 DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)/src/include
--- nufw-2.2.20old/src/nuauth/modules/x509_std/Makefile.in.avoid-version	2008-12-10 10:40:28.000000000 +0100
+++ nufw-2.2.20old/src/nuauth/modules/x509_std/Makefile.in	2008-12-12 11:24:01.000000000 +0100
@@ -57,6 +57,7 @@
 am__objects_1 =
 am_libx509_std_la_OBJECTS = x509_std.lo $(am__objects_1)
 libx509_std_la_OBJECTS = $(am_libx509_std_la_OBJECTS)
+libx509_std_la_LDFLAGS = -avoid-version
 DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)/src/include
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
--- nufw-2.2.20old/src/nuauth/modules/xml_defs/Makefile.in.avoid-version	2008-12-10 10:40:28.000000000 +0100
+++ nufw-2.2.20old/src/nuauth/modules/xml_defs/Makefile.in	2008-12-12 11:33:51.000000000 +0100
@@ -53,8 +53,10 @@
 am__installdirs = "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(includedir)"
 pluginLTLIBRARIES_INSTALL = $(INSTALL)
 LTLIBRARIES = $(plugin_LTLIBRARIES)
+libxml_defs_la_LDFLAGS = -avoid-version
 libxml_defs_la_LIBADD =
 am__objects_1 =
+am_libxml_defs_la_LDFLAGS = -avoid-version
 am_libxml_defs_la_OBJECTS = xml_defs.lo $(am__objects_1)
 libxml_defs_la_OBJECTS = $(am_libxml_defs_la_OBJECTS)
 DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)/src/include
@@ -501,7 +503,7 @@
 	uninstall-nodist_includeHEADERS uninstall-pluginLTLIBRARIES
 
 
-libxml_defs.la: $(libxml_defs_la_OBJECTS) $(libxml_defs_la_DEPENDENCIES) 
+libxml_defs.la: $(libxml_defs_la_OBJECTS) $(libxml_defs_la_DEPENDENCIES)
 	$(LINK) -rpath $(plugindir) $(libxml_defs_la_LDFLAGS) $(libxml_defs_la_OBJECTS) $(libxml_defs_la_LIBADD)
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.


--- NEW FILE nufw.init ---
#!/bin/sh
#
# nufw Startup script for nufw
#
# chkconfig:   - 86 16
# description: Nufw is user filtering firewall.

### BEGIN INIT INFO
# Provides:          nufw-nfqueue
# Required-Start:    $syslog
# Required-Stop:     $syslog
# Should-Start:      $local_fs
# Should-Stop:       $local_fs
# Default-Start:     
# Default-Stop:      0 1 2 3 4 5 6
# Short-Description: Control script for nufw
# Description:       Init script to control (start/stop/reload)
#                    the nufw server.
### END INIT INFO


# Source function library.
. /etc/rc.d/init.d/functions

exec=/usr/sbin/nufw
prog=nufw

[ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog

if [ -z "$NUFW_VERBOSITY" ]; then
  NUFW_VERBOSITY="vv"
fi

if [ "$NUFW_NUAUTH_ADDRESS" != "" ]; then
  NUFW_OPTIONS="$NUFW_OPTIONS -d $NUFW_NUAUTH_ADDRESS"
fi

if [ "$NUFW_NUAUTH_PORT" != "" ]; then
  NUFW_OPTIONS="$NUFW_OPTIONS -p $NUFW_NUAUTH_PORT"
fi

if [ "$NUFW_TIMEOUT" != "" ]; then
  NUFW_OPTIONS="$NUFW_OPTIONS -t $NUFW_TIMEOUT"
fi

if [ "$NUFW_TRACK_SIZE" != "" ]; then
  NUFW_OPTIONS="$NUFW_OPTIONS -T $NUFW_TRACK_SIZE"
fi

DAEMON_OPTS="-D -$NUFW_VERBOSITY   \
        $NUFW_OPTIONS \
        -k $NUFW_SSL_KEY -c $NUFW_SSL_CERTIFICATE -C -M -m"

lockfile=/var/lock/subsys/$prog

start() {
    if [ "$NUFW_START" != "true" ]; then
      exit 1
    fi
    [ -x $exec ] || exit 5
    #[ -f $config ] || exit 6
    echo -n $"Starting $prog: "
    daemon $exec $DAEMON_OPTS
    retval=$?
    echo
    [ $retval -eq 0 ] && touch $lockfile
    return $retval
}

stop() {
    echo -n $"Stopping $prog: "
    killproc $prog
    retval=$?
    echo
    [ $retval -eq 0 ] && rm -f $lockfile
    return $retval
}

restart() {
    stop
    start
}

reload() {
    restart
}

force_reload() {
    restart
}

rh_status() {
    # run checks to determine if the service is running or use generic status
    status $prog
}

rh_status_q() {
    rh_status >/dev/null 2>&1
}


case "$1" in
    start)
        rh_status_q && exit 0
        $1
        ;;
    stop)
        rh_status_q || exit 0
        $1
        ;;
    restart)
        $1
        ;;
    reload)
        rh_status_q || exit 7
        $1
        ;;
    force-reload)
        force_reload
        ;;
    status)
        rh_status
        ;;
    condrestart|try-restart)
        rh_status_q || exit 0
        restart
        ;;
    *)
        echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload}"
        exit 2
esac
exit $?



--- NEW FILE nufw.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

Name: nufw
Version: 2.2.20
Release: 5%{dist}
Summary: Authentication Firewall Suite for Linux
License: GPLv2
Group: System Environment/Daemons
Source: http://www.nufw.org/download/nufw/%{name}-%{version}.tar.bz2
Source1: nufw.init
Source2: nuauth.init
Source3: nuauth.pam
Source4: setup-python_nufw.py
Source5: version-python_nufw.py
Source6: README.python_nufw
Source7: sysconfig-nufw
Source8: sysconfig-nuauth
# added to the internal INL Bugtracker and will be fixed in the next release
Patch0: %{name}-avoid-version.patch
URL: http://www.nufw.org/

Requires: iptables python-IPy
Requires(pre): shadow-utils
Requires(post): chkconfig
Requires(preun): chkconfig
Requires(preun): initscripts
BuildRequires: postgresql-devel mysql-devel
BuildRequires: libtasn1-devel gnutls-devel glib2-devel pam-devel cyrus-sasl-devel chrpath
BuildRequires: openldap-devel iptables-devel
BuildRequires: libprelude-devel libnetfilter_queue-devel libnetfilter_conntrack-devel libnfnetlink-devel
BuildRequires: python-IPy python-setuptools python-devel
BuildRequires: dos2unix
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%description
NuFW is a firewall able to filter connection according to user uid or user
software, meaning you can allows port 80 for only one user, whatever ip he
uses, or only for konqueror.

NuFW performs an authentication of every single connection passing through the
IP filter, by transparently requesting user's credentials before any filtering
decision is taken. Practically, this means security policies can integrate with
the users directory, and bring the notion of user ID down to the IP layers.

%package utils
Summary: Various utilities for Nufw administrators
Group: Applications/Internet
%description utils
This package contains various utilities :

  * nutop : a top-like utility to watch connection

  * nuaclgen : a perl script to add users to ldap

%package -n libnuclient
Summary: Nuclient library
Group: System Environment/Libraries
%description -n libnuclient
Library needed by nufw for nuclient.

%package -n libnuclient-devel
Summary: Nuclient development library
Group: Development/Libraries
Requires: libnuclient = %{version}-%{release}
%description -n libnuclient-devel
Development file of the nuclient library, used to compile
client accessing to nufw.

%package -n pam_nufw
Summary: Nufw client using pam credentials
Group: System Environment/Libraries
BuildRequires: chrpath

%description -n pam_nufw
pam_nufw is a PAM module able to integrate with the PAM stack.
It reuse pam credentials to connect to nufw daemon, instead of requiring to
start nutcpc by hand.

%package -n nutcpc
Summary: Nufw client
Group: Applications/Internet
%description -n nutcpc
Nutcpc is the command line client used to authenticate on a firewall using
nufw.

%package -n nuauth
Summary: Nufw user database daemon
Group: System Environment/Daemons
Requires: cyrus-sasl-plain python-IPy perl-LDAP
Provides: nufw-nuauth-auth-plaintext = %{version}-%{release}
Provides: nufw-nuauth-log-syslog = %{version}-%{release}
Provides: nufw-nuauth-auth-system = %{version}-%{release}

%description -n nuauth
NuFW is an authenticating gateway, which means that connections are
authenticated before being forwarded through the gateway. Classical packet
filtering systems disregard the identity of the user who may be attempting
to access the network, instead caring only about the originating IP addresses.

Nuauth lays on a user database, and an ACL system (which can reside in an LDAP
directory, etc. Nuauth receives requests from nufw, and auth packets from
users' clients, and sends decision to the nufw daemon.

This package contains the main daemon.

%package -n nuauth-auth-ldap
Summary: Module for nuauth providing ldap user database
Group: System Environment/Libraries
%description -n nuauth-auth-ldap
This package provides a module to use ldap as user database for nuauth.

%package -n nuauth-log-mysql
Summary: Module for nuauth to log in Mysql database
Group: System Environment/Libraries
%description -n nuauth-log-mysql
This module allows you to log user activity in a mysql database.

%package -n nuauth-log-pgsql
Summary: Module for nuauth to log in Postgresql database
Group: System Environment/Libraries
%description -n nuauth-log-pgsql
This module allows you to log user activity in a postgresql database.

%package -n nuauth-log-prelude
Summary: Module for nuauth to log to Prelude IDS
Group: System Environment/Libraries
%description -n nuauth-log-prelude
This module allows you to log user activity to the Prelude IDS.

%package -n python-nufw
Summary: Python bindings for NuFW client (nutcpc)
Group: Development/Languages
BuildRequires: python-devel
BuildRequires: python-setuptools-devel
%description -n python-nufw
Bindings Python and nutcpc client for NuFW.

%prep
%setup -q
%patch0 -p1 -b .avoid-version

# fixup EOL
pushd "scripts"
dos2unix -q --keepdate nutop
popd

# fixup encoding
pushd "doc"
f=acls
iconv -f ISO8859-1 -t UTF-8 -o $f.new $f
touch -r $f $f.new
mv $f.new $f
popd

# fix postgresql name
perl -pi -e "s|postgresql|pgsql|" ./src/nuauth/modules/log_pgsql/Makefile*

perl -pi -e 's|^(modulesdir\s*=\s*/)lib|$1%_lib|' ./src/clients/pam_nufw/Makefile*
perl -pi -e 's|(\@modulesdir\s*=\s*/)lib|$1%_lib|' ./src/clients/pam_nufw/Makefile*

# fix nuauth-utils build
perl -pi -e 's|\$\(prefix\)|\%\{buildroot\}|' ./scripts/nuauth_command/Makefile*

%build
%configure \
 --sysconfdir=%{_sysconfdir}/nufw/ \
 --with-mysql-log --with-pgsql-log --with-system-auth --with-ldap \
 --with-nfqueue --with-nfconntrack --with-fixedtimeout --with-utf8 \
 --enable-pam-nufw --with-prelude-log

perl -pi -e 's|(install -d \$\(localstatedir\)/run/nuauth/)|#$1|'  ./src/nuauth/Makefile
make

%install
rm -rf %{buildroot}
make DESTDIR=%{buildroot} install

#install python bindings
cp %{SOURCE4} python/setup.py
cp %{SOURCE5} python/nuclient/version.py
cp %{SOURCE5} python/README
cd python; %{__python} setup.py install --no-compil --root=%{buildroot}; cd ..

cp -p scripts/nuaclgen %{buildroot}/%{_bindir}
cp -p scripts/nutop %{buildroot}/%{_bindir}

mkdir -p %{buildroot}/%{_sysconfdir}/nufw
cp -p conf/{nutop,nuauth,nuaclgen}.conf  %{buildroot}/%{_sysconfdir}/nufw
cp -p conf/{acls.nufw,periods.xml} %{buildroot}/%{_sysconfdir}/nufw
cp -p -R conf/certs/* %{buildroot}/%{_sysconfdir}/nufw
cp -p conf/users-plaintext.nufw %{buildroot}/%{_sysconfdir}/nufw/users.nufw

mkdir -p %{buildroot}/%{_localstatedir}/lib/nuauth
mkdir -p %{buildroot}/%{_localstatedir}/run/nuauth
# clean useless files
rm -f %{buildroot}/%{_libdir}/nuauth/modules/*.{a,la}
rm -f %{buildroot}/%{_lib}/security/*{a,la}
rm -f %{buildroot}/%{_libdir}/libnobuffer*

mkdir -p %{buildroot}/%_initrddir/
install -m755 %SOURCE1 %{buildroot}/%_initrddir/nufw
install -m755 %SOURCE2  %{buildroot}/%_initrddir/nuauth

mkdir -p %{buildroot}/%{_sysconfdir}/sysconfig/
cp -p %SOURCE7 %{buildroot}%{_sysconfdir}/sysconfig/nufw
cp -p %SOURCE8 %{buildroot}%{_sysconfdir}/sysconfig/nufw

mkdir %{buildroot}/%{_sysconfdir}/pam.d/
cp -p %SOURCE3 %{buildroot}/%{_sysconfdir}/pam.d/nuauth

chrpath --delete $RPM_BUILD_ROOT%{_bindir}/nutcpc
chrpath --delete $RPM_BUILD_ROOT/%{_lib}/security/pam_nufw.so

%clean
rm -rf %{buildroot}

%post
/sbin/chkconfig --add nufw

%post -n libnuclient -p /sbin/ldconfig

%postun
if [ "$1" -ge "1" ]; then
    service nufw condrestart > /dev/null 2>&1 ||:
fi

%postun -n libnuclient -p /sbin/ldconfig

%preun
if [ $1 = 0 ] ; then
 /sbin/service nufw stop >/dev/null 2>&1
 /sbin/chkconfig --del nufw
fi

%pre -n nuauth
getent group nuauth >/dev/null || groupadd -r nuauth
getent passwd nuauth >/dev/null || \
useradd -r -g nuauth -d %{_localstatedir}/lib/nuauth -s /sbin/nologin \
-c "Privilege-separated Nuauth" nuauth
exit 0

%post -n nuauth
/sbin/chkconfig --add nuauth

%preun -n nuauth
if [ $1 = 0 ]; then
 /sbin/service nuauth stop >/dev/null 2>&1
 /sbin/chkconfig --del nuauth
fi

%postun -n nuauth
if [ "$1" -ge "1" ]; then
 service nuauth condrestart > /dev/null 2>&1 ||:
fi

%files
%defattr(-, root, root, -)
%doc AUTHORS ChangeLog NEWS README TODO COPYING
%doc doc/acls doc/cache_system doc/debug
%{_sbindir}/nufw
%{_mandir}/man8/nufw.8*
%{_initrddir}/nufw
%config(noreplace) %{_sysconfdir}/sysconfig/nufw
%dir %{_sysconfdir}/nufw/
%config(noreplace) %attr(0600,-,-) %{_sysconfdir}/%{name}/NuFW-cacert.pem
%config(noreplace) %attr(0600,-,-) %{_sysconfdir}/%{name}/nufw-cert.pem
%config(noreplace) %attr(0600,-,-) %{_sysconfdir}/%{name}/nufw-key.pem
%config(noreplace) %attr(0600,-,-) %{_sysconfdir}/%{name}/user at nufw.org-cert.pem
%config(noreplace) %attr(0600,-,-) %{_sysconfdir}/%{name}/user at nufw.org-key.pem
%config(noreplace) %attr(0600,-,-) %{_sysconfdir}/%{name}/admin at nufw.org-cert.pem
%config(noreplace) %attr(0600,-,-) %{_sysconfdir}/%{name}/admin at nufw.org-key.pem

%files utils
%defattr(-, root, root, -)
%{_bindir}/nuaclgen
%{_bindir}/nutop
%{_mandir}/man8/nuaclgen.8*
%{_mandir}/man8/nutop.8*
%config(noreplace) %{_sysconfdir}/nufw/nutop.conf
%config(noreplace) %{_sysconfdir}/nufw/nuaclgen.conf
%dir %{_sysconfdir}/nufw/

%files -n libnuclient
%defattr(-, root, root, -)
%{_libdir}/libnuclient.so.*

%files -n libnuclient-devel
%defattr(-, root, root, -)
%exclude %{_libdir}/libnuclient.a
%exclude %{_libdir}/libnuclient.la
%{_libdir}/libnuclient.so
%{_includedir}/*
%{_mandir}/man3/libnuclient.3*

%files -n pam_nufw
%defattr(-, root, root, -)
%doc doc/README.pam_nufw
/%{_lib}/security/pam_nufw.so

%files -n nuauth-auth-ldap
%defattr(-, root, root, -)
%doc conf/acls.schema
%{_libdir}/nuauth/modules/libldap.so*

%files -n nuauth-log-mysql
%defattr(-, root, root, -)
%doc conf/nulog*mysql.dump
%{_libdir}/nuauth/modules/libmysql.so*

%files -n nuauth-log-pgsql
%defattr(-, root, root, -)
%doc conf/nulog*pgsql.dump
%{_libdir}/nuauth/modules/libpgsql.so*

%files -n nuauth-log-prelude
%defattr(-, root, root, -)
%{_libdir}/nuauth/modules/libnuprelude.so*

%files -n nuauth
%defattr(-, root, root, -)
%{_sbindir}/nuauth
%{_mandir}/man8/nuauth.8*
%{_mandir}/man5/nuclient.conf.5*
%{_localstatedir}/lib/nuauth
%dir %{_localstatedir}/run/nuauth/
%{_initrddir}/nuauth
%config(noreplace) %{_sysconfdir}/%{name}/nuauth.conf
%config(noreplace) %{_sysconfdir}/%{name}/periods.xml
%config(noreplace) %{_sysconfdir}/%{name}/users.nufw
%config(noreplace) %{_sysconfdir}/%{name}/acls.nufw
%config(noreplace) %attr(0600, nuauth, nuauth) %{_sysconfdir}/%{name}/nuauth-key.pem
%config(noreplace) %attr(0600, nuauth, nuauth) %{_sysconfdir}/%{name}/nuauth-cert.pem
%config(noreplace) %{_sysconfdir}/pam.d/nuauth
%dir %{_sysconfdir}/%{name}/
%{_libdir}/nuauth/modules/libsyslog.so*
%{_libdir}/nuauth/modules/libplaintext.so*
%{_libdir}/nuauth/modules/libsystem.so*
%{_libdir}/nuauth/modules/libscript.so*
%{_libdir}/nuauth/modules/libx509_std.so*
%{_libdir}/nuauth/modules/libxml_defs.so*
%{_libdir}/nuauth/modules/libipauth_guest.so*
%{_libdir}/nuauth/modules/libmark_field.so*
%{_libdir}/nuauth/modules/libmark_flag.so*
%{_libdir}/nuauth/modules/libmark_group.so*
%{_libdir}/nuauth/modules/libmark_uid.so*
%{_libdir}/nuauth/modules/libsession_expire.so*
%{_libdir}/nuauth/modules/libsession_authtype.so*

%files -n nutcpc
%defattr(-, root, root, -)
%{_bindir}/nutcpc
%{_mandir}/man1/nutcpc.1*

%files -n python-nufw
%defattr(-, root, root)
%{python_sitelib}/*egg-info
%{python_sitelib}/nuclient/*

%changelog
* Fri Dec 19 2008 Jerome Soyer <saispo at gmail.com> 2.2.20-5
- Add "touch -r" in the charset conversion for keeping timestamps

* Thu Dec 18 2008 Jerome Soyer <saispo at gmail.com> 2.2.20-4
- Separate in two sysconfig files
- Fix initscripts
- Fix BuilRequires on nuauth-utils
- Fix permissions on cert and key file

* Wed Dec 17 2008 Jerome Soyer <saispo at gmail.com> 2.2.20-3
- Remove useless BuildRequires on python-nufw
- Make a source for /etc/sysconfig/nufw file
- Fix DefaultStop in initscripts
- Fix mix tabs and spaces
- Remove useless ldconfig

* Fri Dec 12 2008 Jerome Soyer <saispo at gmail.com> 2.2.20-2
- Fix ldconfig for libnuclient
- Remove useless Provides
- Fix encoding and end line encoding
- Remove delete user
- Fix nutcpc group
- Fix initscripts
- Modify Patch0 for readding "-avoid-version" in missing Makefile.in and sent upstream

* Mon Dec 10 2008 Jerome Soyer <saispo at gmail.com> 2.2.20-1
- Initial Fedora Package


--- NEW FILE setup-python_nufw.py ---
#!/usr/bin/python
from imp import load_source
from os import path
import sys

if "--setuptools" in sys.argv:
    sys.argv.remove("--setuptools")
    from setuptools import setup
else:
    from distutils.core import setup

CLASSIFIERS = [
    'Intended Audience :: Developers',
    'Development Status :: 5 - Production/Stable',
    'License :: OSI Approved :: GNU General Public License (GPL)',
    'Operating System :: OS Independent',
    'Natural Language :: English',
    'Programming Language :: Python',
]

def main():
    nuclient = load_source("version", path.join("nuclient", "version.py"))
    install_options = {
        "name": "nuclient",
        "version": nuclient.VERSION,
        "url": nuclient.WEBSITE,
        "download_url": nuclient.WEBSITE,
        "author": "Victor Stinner",
        "description": "Python binding of libnuclient library, object oriented",
        "long_description": open('README').read(),
        "classifiers": CLASSIFIERS,
        "license": nuclient.LICENSE,
        "packages": ["nuclient"],
        "package_dir": {"nuclient": "nuclient"},
    }
    setup(**install_options)

if __name__ == "__main__":
    main()



--- NEW FILE sysconfig-nuauth ---
#Change to "true" for Nufw to be started
NUAUTH_START="true"

#Add "v"s so nufw gets more verbose
NUAUTH_VERBOSITY="vv"

#User nuauth runs on. Change this to some entry existing in /etc/passwd
NUAUTH_USER="nuauth"

#EDIT /etc/nuauth/nuauth.conf for other options!


--- NEW FILE sysconfig-nufw ---
#Change to "true" for Nufw to be started
NUFW_START="true"

#Add "v"s so nufw gets more verbose
NUFW_VERBOSITY="vv"

#Address of the nuauth server
#NUFW_NUAUTH_ADDRESS="127.0.0.1"

#UDP port the nuauth server listens on
#NUFW_NUAUTH_PORT=4128

#Timeout to forget about packets when there's no match (seconds)
#NUFW_TIMEOUT=15

#Track Size
#NUFW_TRACK_SIZE=1000

#SSL certificates and keys
NUFW_SSL_CERTIFICATE="/etc/nufw/nufw-cert.pem"
NUFW_SSL_KEY="/etc/nufw/nufw-key.pem"

# Additional options
# For ex., add -s here to disable TLS strict checking mode
# See http://nufw.org/docs/handbook22.html#hardening
NUFW_OPTIONS=""


--- NEW FILE version-python_nufw.py ---
VERSION = "0.0"
LICENSE = "GNU GPLv2"
WEBSITE = "http://software.inl.fr/trac/wiki/EdenWall/NuFW"



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/nufw/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	9 Jan 2009 05:51:35 -0000	1.1
+++ .cvsignore	9 Jan 2009 18:24:38 -0000	1.2
@@ -0,0 +1 @@
+nufw-2.2.20.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nufw/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	9 Jan 2009 05:51:36 -0000	1.1
+++ sources	9 Jan 2009 18:24:38 -0000	1.2
@@ -0,0 +1 @@
+a5163fd12dd5a8710a95232ddbf3e74f  nufw-2.2.20.tar.bz2



From awjb at fedoraproject.org  Fri Jan  9 18:28:11 2009
From: awjb at fedoraproject.org (Andreas Bierfert)
Date: Fri,  9 Jan 2009 18:28:11 +0000 (UTC)
Subject: rpms/ncmpc/F-10 ncmpc-lirc.patch, NONE, 1.1 .cvsignore, 1.2,
	1.3 ncmpc.spec, 1.8, 1.9 sources, 1.2, 1.3
Message-ID: <20090109182811.A6BF07011C@cvs1.fedora.phx.redhat.com>

Author: awjb

Update of /cvs/pkgs/rpms/ncmpc/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13543/F-10

Modified Files:
	.cvsignore ncmpc.spec sources 
Added Files:
	ncmpc-lirc.patch 
Log Message:
- version upgrade (#479240)


ncmpc-lirc.patch:

--- NEW FILE ncmpc-lirc.patch ---
--- configure.ac.orig	2008-11-22 14:30:48.000000000 +0100
+++ configure.ac	2008-11-22 14:36:00.000000000 +0100
@@ -208,8 +208,8 @@
 	[enable_lirc=$enableval],
 	[enable_lirc=no])
 if test x$enable_lirc = xyes; then
-	PKG_CHECK_MODULES([LIBLIRCCLIENT], [liblircclient0],,
-		[AC_MSG_ERROR([liblircclient0 not found])])
+	AC_CHECK_LIB(lirc_client, lirc_init, ,
+		[AC_MSG_ERROR([lirc_client not found])])
 	AC_DEFINE([ENABLE_LIRC], [1], [Enable LIRC support])
 fi
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ncmpc/F-10/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	23 Jun 2005 17:11:40 -0000	1.2
+++ .cvsignore	9 Jan 2009 18:27:40 -0000	1.3
@@ -1 +1 @@
-ncmpc-0.11.1.tar.gz
+ncmpc-0.13.tar.bz2


Index: ncmpc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ncmpc/F-10/ncmpc.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ncmpc.spec	11 Feb 2008 16:29:49 -0000	1.8
+++ ncmpc.spec	9 Jan 2009 18:27:40 -0000	1.9
@@ -1,17 +1,20 @@
 Name:           ncmpc
-Version:        0.11.1
-Release:        9%{?dist}
+Version:        0.13
+Release:        1%{?dist}
 Summary:        A curses client for the Music Player Daemon (MPD)
 
 Group:          Applications/Multimedia
 License:        GPLv2+
-URL:            http://www.musicpd.org/ncmpc.shtml
-Source0:        http://mercury.chem.pitt.edu/~shank/ncmpc-0.11.1.tar.gz
+URL:            http://mpd.wikia.com/wiki/Client:Ncmpc
+Source0:        http://downloads.sourceforge.net/musicpd/ncmpc-0.13.tar.bz2
+Patch0:         ncmpc-lirc.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  ncurses-devel
 BuildRequires:  glib2-devel >= 2.4
 BuildRequires:  gettext
+BuildRequires:  lirc-devel
+BuildRequires:  autoconf
 
 %description
 ncmpc is a curses client for the Music Player Daemon (MPD). ncmpc connects to 
@@ -25,9 +28,16 @@
 
 %prep
 %setup -q
+%patch0
+
+autoreconf
+
+#aclocal
+#autoconf -f
 
 %build
-%configure --enable-clock-screen
+%configure --enable-wide --enable-nls --enable-colors --enable-lirc \
+  --enable-artist-screen --with-ncursesw
 make %{?_smp_mflags}
 
 
@@ -47,13 +57,24 @@
 
 %files -f ncmpc.lang
 %defattr(-,root,root,-)
-%doc README TODO NEWS AUTHORS ChangeLog doc/ncmpc.lirc
+%doc README NEWS AUTHORS COPYING doc/ncmpc.lirc
 %{_bindir}/ncmpc
 %{_mandir}/man1/*
 %{_sysconfdir}/ncmpc
+%config(noreplace) %{_sysconfdir}/ncmpc/config
+%config(noreplace) %{_sysconfdir}/ncmpc/keys
+
 %exclude %{_datadir}/doc/*
 
 %changelog
+* Fri Jan 09 2009 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- 0.13-1
+- version upgrade (#479240)
+
+* Sat Nov 22 2008 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- 0.12-0.1.beta1
+- version upgrade
+
 * Mon Feb 11 2008 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> - 0.11.1-9
 - Rebuilt for gcc43
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ncmpc/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	23 Jun 2005 17:11:40 -0000	1.2
+++ sources	9 Jan 2009 18:27:41 -0000	1.3
@@ -1 +1 @@
-c90668b12f3676c73913a863482ec405  ncmpc-0.11.1.tar.gz
+5ef1c45d62fad85b7d42ab5c9bcde33e  ncmpc-0.13.tar.bz2



From awjb at fedoraproject.org  Fri Jan  9 18:28:12 2009
From: awjb at fedoraproject.org (Andreas Bierfert)
Date: Fri,  9 Jan 2009 18:28:12 +0000 (UTC)
Subject: rpms/ncmpc/F-9 ncmpc-lirc.patch, NONE, 1.1 .cvsignore, 1.2,
	1.3 ncmpc.spec, 1.8, 1.9 sources, 1.2, 1.3
Message-ID: <20090109182812.2337D7011C@cvs1.fedora.phx.redhat.com>

Author: awjb

Update of /cvs/pkgs/rpms/ncmpc/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13543/F-9

Modified Files:
	.cvsignore ncmpc.spec sources 
Added Files:
	ncmpc-lirc.patch 
Log Message:
- version upgrade (#479240)


ncmpc-lirc.patch:

--- NEW FILE ncmpc-lirc.patch ---
--- configure.ac.orig	2008-11-22 14:30:48.000000000 +0100
+++ configure.ac	2008-11-22 14:36:00.000000000 +0100
@@ -208,8 +208,8 @@
 	[enable_lirc=$enableval],
 	[enable_lirc=no])
 if test x$enable_lirc = xyes; then
-	PKG_CHECK_MODULES([LIBLIRCCLIENT], [liblircclient0],,
-		[AC_MSG_ERROR([liblircclient0 not found])])
+	AC_CHECK_LIB(lirc_client, lirc_init, ,
+		[AC_MSG_ERROR([lirc_client not found])])
 	AC_DEFINE([ENABLE_LIRC], [1], [Enable LIRC support])
 fi
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ncmpc/F-9/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	23 Jun 2005 17:11:40 -0000	1.2
+++ .cvsignore	9 Jan 2009 18:27:41 -0000	1.3
@@ -1 +1 @@
-ncmpc-0.11.1.tar.gz
+ncmpc-0.13.tar.bz2


Index: ncmpc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ncmpc/F-9/ncmpc.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ncmpc.spec	11 Feb 2008 16:29:49 -0000	1.8
+++ ncmpc.spec	9 Jan 2009 18:27:41 -0000	1.9
@@ -1,17 +1,20 @@
 Name:           ncmpc
-Version:        0.11.1
-Release:        9%{?dist}
+Version:        0.13
+Release:        1%{?dist}
 Summary:        A curses client for the Music Player Daemon (MPD)
 
 Group:          Applications/Multimedia
 License:        GPLv2+
-URL:            http://www.musicpd.org/ncmpc.shtml
-Source0:        http://mercury.chem.pitt.edu/~shank/ncmpc-0.11.1.tar.gz
+URL:            http://mpd.wikia.com/wiki/Client:Ncmpc
+Source0:        http://downloads.sourceforge.net/musicpd/ncmpc-0.13.tar.bz2
+Patch0:         ncmpc-lirc.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  ncurses-devel
 BuildRequires:  glib2-devel >= 2.4
 BuildRequires:  gettext
+BuildRequires:  lirc-devel
+BuildRequires:  autoconf
 
 %description
 ncmpc is a curses client for the Music Player Daemon (MPD). ncmpc connects to 
@@ -25,9 +28,16 @@
 
 %prep
 %setup -q
+%patch0
+
+autoreconf
+
+#aclocal
+#autoconf -f
 
 %build
-%configure --enable-clock-screen
+%configure --enable-wide --enable-nls --enable-colors --enable-lirc \
+  --enable-artist-screen --with-ncursesw
 make %{?_smp_mflags}
 
 
@@ -47,13 +57,24 @@
 
 %files -f ncmpc.lang
 %defattr(-,root,root,-)
-%doc README TODO NEWS AUTHORS ChangeLog doc/ncmpc.lirc
+%doc README NEWS AUTHORS COPYING doc/ncmpc.lirc
 %{_bindir}/ncmpc
 %{_mandir}/man1/*
 %{_sysconfdir}/ncmpc
+%config(noreplace) %{_sysconfdir}/ncmpc/config
+%config(noreplace) %{_sysconfdir}/ncmpc/keys
+
 %exclude %{_datadir}/doc/*
 
 %changelog
+* Fri Jan 09 2009 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- 0.13-1
+- version upgrade (#479240)
+
+* Sat Nov 22 2008 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- 0.12-0.1.beta1
+- version upgrade
+
 * Mon Feb 11 2008 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> - 0.11.1-9
 - Rebuilt for gcc43
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ncmpc/F-9/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	23 Jun 2005 17:11:40 -0000	1.2
+++ sources	9 Jan 2009 18:27:41 -0000	1.3
@@ -1 +1 @@
-c90668b12f3676c73913a863482ec405  ncmpc-0.11.1.tar.gz
+5ef1c45d62fad85b7d42ab5c9bcde33e  ncmpc-0.13.tar.bz2



From awjb at fedoraproject.org  Fri Jan  9 18:28:12 2009
From: awjb at fedoraproject.org (Andreas Bierfert)
Date: Fri,  9 Jan 2009 18:28:12 +0000 (UTC)
Subject: rpms/ncmpc/devel ncmpc-lirc.patch, NONE, 1.1 .cvsignore, 1.2,
	1.3 ncmpc.spec, 1.8, 1.9 sources, 1.2, 1.3
Message-ID: <20090109182812.831447011C@cvs1.fedora.phx.redhat.com>

Author: awjb

Update of /cvs/pkgs/rpms/ncmpc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13543/devel

Modified Files:
	.cvsignore ncmpc.spec sources 
Added Files:
	ncmpc-lirc.patch 
Log Message:
- version upgrade (#479240)


ncmpc-lirc.patch:

--- NEW FILE ncmpc-lirc.patch ---
--- configure.ac.orig	2008-11-22 14:30:48.000000000 +0100
+++ configure.ac	2008-11-22 14:36:00.000000000 +0100
@@ -208,8 +208,8 @@
 	[enable_lirc=$enableval],
 	[enable_lirc=no])
 if test x$enable_lirc = xyes; then
-	PKG_CHECK_MODULES([LIBLIRCCLIENT], [liblircclient0],,
-		[AC_MSG_ERROR([liblircclient0 not found])])
+	AC_CHECK_LIB(lirc_client, lirc_init, ,
+		[AC_MSG_ERROR([lirc_client not found])])
 	AC_DEFINE([ENABLE_LIRC], [1], [Enable LIRC support])
 fi
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ncmpc/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	23 Jun 2005 17:11:40 -0000	1.2
+++ .cvsignore	9 Jan 2009 18:27:42 -0000	1.3
@@ -1 +1 @@
-ncmpc-0.11.1.tar.gz
+ncmpc-0.13.tar.bz2


Index: ncmpc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ncmpc/devel/ncmpc.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ncmpc.spec	11 Feb 2008 16:29:49 -0000	1.8
+++ ncmpc.spec	9 Jan 2009 18:27:42 -0000	1.9
@@ -1,17 +1,20 @@
 Name:           ncmpc
-Version:        0.11.1
-Release:        9%{?dist}
+Version:        0.13
+Release:        1%{?dist}
 Summary:        A curses client for the Music Player Daemon (MPD)
 
 Group:          Applications/Multimedia
 License:        GPLv2+
-URL:            http://www.musicpd.org/ncmpc.shtml
-Source0:        http://mercury.chem.pitt.edu/~shank/ncmpc-0.11.1.tar.gz
+URL:            http://mpd.wikia.com/wiki/Client:Ncmpc
+Source0:        http://downloads.sourceforge.net/musicpd/ncmpc-0.13.tar.bz2
+Patch0:         ncmpc-lirc.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  ncurses-devel
 BuildRequires:  glib2-devel >= 2.4
 BuildRequires:  gettext
+BuildRequires:  lirc-devel
+BuildRequires:  autoconf
 
 %description
 ncmpc is a curses client for the Music Player Daemon (MPD). ncmpc connects to 
@@ -25,9 +28,16 @@
 
 %prep
 %setup -q
+%patch0
+
+autoreconf
+
+#aclocal
+#autoconf -f
 
 %build
-%configure --enable-clock-screen
+%configure --enable-wide --enable-nls --enable-colors --enable-lirc \
+  --enable-artist-screen --with-ncursesw
 make %{?_smp_mflags}
 
 
@@ -47,13 +57,24 @@
 
 %files -f ncmpc.lang
 %defattr(-,root,root,-)
-%doc README TODO NEWS AUTHORS ChangeLog doc/ncmpc.lirc
+%doc README NEWS AUTHORS COPYING doc/ncmpc.lirc
 %{_bindir}/ncmpc
 %{_mandir}/man1/*
 %{_sysconfdir}/ncmpc
+%config(noreplace) %{_sysconfdir}/ncmpc/config
+%config(noreplace) %{_sysconfdir}/ncmpc/keys
+
 %exclude %{_datadir}/doc/*
 
 %changelog
+* Fri Jan 09 2009 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- 0.13-1
+- version upgrade (#479240)
+
+* Sat Nov 22 2008 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- 0.12-0.1.beta1
+- version upgrade
+
 * Mon Feb 11 2008 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> - 0.11.1-9
 - Rebuilt for gcc43
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ncmpc/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	23 Jun 2005 17:11:40 -0000	1.2
+++ sources	9 Jan 2009 18:27:42 -0000	1.3
@@ -1 +1 @@
-c90668b12f3676c73913a863482ec405  ncmpc-0.11.1.tar.gz
+5ef1c45d62fad85b7d42ab5c9bcde33e  ncmpc-0.13.tar.bz2



From rdieter at fedoraproject.org  Fri Jan  9 18:40:24 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri,  9 Jan 2009 18:40:24 +0000 (UTC)
Subject: rpms/libmsn/devel libmsn.spec, 1.1, 1.2 sources, 1.2,
	1.3 libmsn-4.0beta1-rmhardcoded.patch, 1.1, NONE
Message-ID: <20090109184025.03D0A7011C@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/libmsn/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14971

Modified Files:
	libmsn.spec sources 
Removed Files:
	libmsn-4.0beta1-rmhardcoded.patch 
Log Message:
* Fri Jan 09 2009 Rex Dieter <rdieter at fedoraproject.org> 4.0-0.4.beta2
- libmsn-4.0-beta2



Index: libmsn.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libmsn/devel/libmsn.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libmsn.spec	12 Dec 2008 21:15:05 -0000	1.1
+++ libmsn.spec	9 Jan 2009 18:39:54 -0000	1.2
@@ -1,21 +1,21 @@
+
+%define beta beta2
+
 Name:		libmsn
 Version:	4.0
-Release:	0.3.beta1%{?dist}
+Release:	0.4.%{beta}%{?dist}
 
 Group:		System Environment/Libraries
 License:	GPLv2
 URL:		http://sourceforge.net/projects/libmsn/
-Source0:	http://downloads.sourceforge.net/%{name}/%{name}-%{version}-beta1.tar.bz2
-
-Patch0:		%{name}-4.0beta1-rmhardcoded.patch
-
+Source0:	http://downloads.sourceforge.net/%{name}/%{name}-%{version}%{?beta:-%{beta}}.tar.bz2
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Summary:	Library for connecting to the MSN(tm) Messenger service
 
 BuildRequires:	cmake
 BuildRequires:	openssl-devel
-#All other headers seem to be provided by glibc or stdlibc++
+BuildRequires:	pkgconfig
 
 %description
 Libmsn is a reusable, open-source, fully documented library for connecting to
@@ -24,28 +24,27 @@
 %package	devel
 Summary:	Development files for %{name}
 Group:		Development/Libraries
-
 Requires:	%{name} = %{version}-%{release}
-
+Requires:	pkgconfig
 %description	devel
 The %{name}-devel package contains libraries and header files for
 developing applications that use %{name}.
 
 %prep
-%setup -q -n %{name}-4.0-beta1
-%patch0 -p1
+%setup -q -n %{name}-%{version}%{?beta:-%{beta}}
 
 %build
-mkdir build
-cd build
+mkdir -p %{_target_platform}
+pushd %{_target_platform} 
 %{cmake} ..
-make
+popd
+
+make %{?_smp_mflags} -C %{_target_platform}
 
 
 %install
 rm -rf %{buildroot}
-cd build
-make install DESTDIR=%{buildroot}
+make install/fast -C %{_target_platform} DESTDIR=%{buildroot}
 
 
 %clean
@@ -60,14 +59,20 @@
 %files
 %defattr(-,root,root,-)
 %doc README COPYING THANKS
-%{_libdir}/*.so.*
+%{_bindir}/msntest
+%{_libdir}/libmsn.so.0*
 
 %files devel
 %defattr(-,root,root,-)
-%{_libdir}/*.so
-%{_includedir}/*
+%{_libdir}/libmsn.so
+%{_libdir}/pkgconfig/libmsn.pc
+%{_includedir}/msn/
+
 
 %changelog
+* Fri Jan 09 2009 Rex Dieter <rdieter at fedoraproject.org> 4.0-0.4.beta2
+- libmsn-4.0-beta2
+
 * Thu Dec 11 2008 John5342 <john5342 at, fedoraproject.org> 4.0-0.3.beta1
 - Left docs out of devel package
 - Added (tm) to MSN


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libmsn/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	12 Dec 2008 21:15:05 -0000	1.2
+++ sources	9 Jan 2009 18:39:54 -0000	1.3
@@ -1 +0,0 @@
-f5b79c230ec7e7654b5efe8c61ea1602  libmsn-4.0-beta1.tar.bz2


--- libmsn-4.0beta1-rmhardcoded.patch DELETED ---



From rdieter at fedoraproject.org  Fri Jan  9 18:45:01 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri,  9 Jan 2009 18:45:01 +0000 (UTC)
Subject: rpms/kdenetwork/devel kdenetwork.spec,1.165,1.166
Message-ID: <20090109184501.8465F7011C@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdenetwork/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15582

Modified Files:
	kdenetwork.spec 
Log Message:
bump libmsn-devel dep



Index: kdenetwork.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdenetwork/devel/kdenetwork.spec,v
retrieving revision 1.165
retrieving revision 1.166
diff -u -r1.165 -r1.166
--- kdenetwork.spec	7 Jan 2009 19:57:47 -0000	1.165
+++ kdenetwork.spec	9 Jan 2009 18:44:30 -0000	1.166
@@ -19,7 +19,7 @@
 BuildRequires: gmp-devel
 BuildRequires: kdepimlibs-devel >= %{version}
 BuildRequires: libidn-devel
-BuildRequires: libmsn-devel
+BuildRequires: libmsn-devel >= 4.0-0.4.beta2
 BuildRequires: libotr-devel
 BuildRequires: libvncserver-devel
 BuildRequires: libxslt-devel libxml2-devel



From arbiter at fedoraproject.org  Fri Jan  9 18:51:35 2009
From: arbiter at fedoraproject.org (Lorenzo Villani)
Date: Fri,  9 Jan 2009 18:51:35 +0000 (UTC)
Subject: rpms/kdeaccessibility/devel kdeaccessibility.spec,1.68,1.69
Message-ID: <20090109185135.42DB37011C@cvs1.fedora.phx.redhat.com>

Author: arbiter

Update of /cvs/pkgs/rpms/kdeaccessibility/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16225

Modified Files:
	kdeaccessibility.spec 
Log Message:
- fix files list


Index: kdeaccessibility.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeaccessibility/devel/kdeaccessibility.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- kdeaccessibility.spec	7 Jan 2009 14:40:20 -0000	1.68
+++ kdeaccessibility.spec	9 Jan 2009 18:51:04 -0000	1.69
@@ -90,6 +90,7 @@
 %{_kde4_libdir}/lib*.so.*
 %{_kde4_libdir}/lib*.so
 %{_kde4_libdir}/kde4/*
+%{_mandir}/*/*.gz
 
 
 %changelog



From kkofler at fedoraproject.org  Fri Jan  9 18:57:44 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Fri,  9 Jan 2009 18:57:44 +0000 (UTC)
Subject: rpms/kde-l10n/F-10 kde-l10n.spec,1.49,1.50
Message-ID: <20090109185744.D4B457011C@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kde-l10n/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17507/F-10

Modified Files:
	kde-l10n.spec 
Log Message:
* Fri Jan 09 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.4-1
- 4.1.4


Index: kde-l10n.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kde-l10n/F-10/kde-l10n.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- kde-l10n.spec	12 Nov 2008 00:01:31 -0000	1.49
+++ kde-l10n.spec	9 Jan 2009 18:57:14 -0000	1.50
@@ -1,7 +1,7 @@
 %define buildall 0
 
 Name: kde-l10n
-Version: 4.1.3
+Version: 4.1.4
 Release: 1%{dist}
 Url: http://www.kde.org
 Summary: Internationalization support for KDE
@@ -1306,7 +1306,10 @@
 %lang(zh_TW) %{_kde4_docdir}/HTML/zh_TW
 
 %changelog
-* Wed Nov 12 2008 Than Ngo <than at redhat.com>  4.1.3-1
+* Fri Jan 09 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.4-1
+- 4.1.4
+
+* Wed Nov 12 2008 Than Ngo <than at redhat.com> 4.1.3-1
 - 4.1.3
 
 * Fri Sep 26 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-1



From kkofler at fedoraproject.org  Fri Jan  9 18:57:45 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Fri,  9 Jan 2009 18:57:45 +0000 (UTC)
Subject: rpms/kde-l10n/F-9 .cvsignore, 1.13, 1.14 kde-l10n.spec, 1.38,
	1.39 sources, 1.15, 1.16
Message-ID: <20090109185745.381027011C@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-serv17507/F-9

Modified Files:
	.cvsignore kde-l10n.spec sources 
Log Message:
* Fri Jan 09 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.4-1
- 4.1.4


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kde-l10n/F-9/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	10 Nov 2008 13:31:55 -0000	1.13
+++ .cvsignore	9 Jan 2009 18:57:14 -0000	1.14
@@ -1,47 +1,47 @@
-kde-l10n-bg-4.1.3.tar.bz2
-kde-l10n-ca-4.1.3.tar.bz2
-kde-l10n-csb-4.1.3.tar.bz2
-kde-l10n-cs-4.1.3.tar.bz2
-kde-l10n-da-4.1.3.tar.bz2
-kde-l10n-de-4.1.3.tar.bz2
-kde-l10n-el-4.1.3.tar.bz2
-kde-l10n-en_GB-4.1.3.tar.bz2
-kde-l10n-eo-4.1.3.tar.bz2
-kde-l10n-es-4.1.3.tar.bz2
-kde-l10n-et-4.1.3.tar.bz2
-kde-l10n-fi-4.1.3.tar.bz2
-kde-l10n-fr-4.1.3.tar.bz2
-kde-l10n-fy-4.1.3.tar.bz2
-kde-l10n-ga-4.1.3.tar.bz2
-kde-l10n-gl-4.1.3.tar.bz2
-kde-l10n-hi-4.1.3.tar.bz2
-kde-l10n-hu-4.1.3.tar.bz2
-kde-l10n-it-4.1.3.tar.bz2
-kde-l10n-ja-4.1.3.tar.bz2
-kde-l10n-kk-4.1.3.tar.bz2
-kde-l10n-km-4.1.3.tar.bz2
-kde-l10n-ko-4.1.3.tar.bz2
-kde-l10n-ku-4.1.3.tar.bz2
-kde-l10n-lt-4.1.3.tar.bz2
-kde-l10n-lv-4.1.3.tar.bz2
-kde-l10n-mk-4.1.3.tar.bz2
-kde-l10n-ml-4.1.3.tar.bz2
-kde-l10n-nb-4.1.3.tar.bz2
-kde-l10n-nds-4.1.3.tar.bz2
-kde-l10n-nl-4.1.3.tar.bz2
-kde-l10n-nn-4.1.3.tar.bz2
-kde-l10n-pa-4.1.3.tar.bz2
-kde-l10n-pl-4.1.3.tar.bz2
-kde-l10n-pt_BR-4.1.3.tar.bz2
-kde-l10n-pt-4.1.3.tar.bz2
-kde-l10n-ru-4.1.3.tar.bz2
-kde-l10n-sl-4.1.3.tar.bz2
-kde-l10n-sr-4.1.3.tar.bz2
-kde-l10n-sv-4.1.3.tar.bz2
-kde-l10n-ta-4.1.3.tar.bz2
-kde-l10n-th-4.1.3.tar.bz2
-kde-l10n-tr-4.1.3.tar.bz2
-kde-l10n-uk-4.1.3.tar.bz2
-kde-l10n-wa-4.1.3.tar.bz2
-kde-l10n-zh_CN-4.1.3.tar.bz2
-kde-l10n-zh_TW-4.1.3.tar.bz2
+kde-l10n-bg-4.1.4.tar.bz2
+kde-l10n-ca-4.1.4.tar.bz2
+kde-l10n-cs-4.1.4.tar.bz2
+kde-l10n-csb-4.1.4.tar.bz2
+kde-l10n-da-4.1.4.tar.bz2
+kde-l10n-de-4.1.4.tar.bz2
+kde-l10n-el-4.1.4.tar.bz2
+kde-l10n-en_GB-4.1.4.tar.bz2
+kde-l10n-eo-4.1.4.tar.bz2
+kde-l10n-es-4.1.4.tar.bz2
+kde-l10n-et-4.1.4.tar.bz2
+kde-l10n-fi-4.1.4.tar.bz2
+kde-l10n-fr-4.1.4.tar.bz2
+kde-l10n-fy-4.1.4.tar.bz2
+kde-l10n-ga-4.1.4.tar.bz2
+kde-l10n-gl-4.1.4.tar.bz2
+kde-l10n-hi-4.1.4.tar.bz2
+kde-l10n-hu-4.1.4.tar.bz2
+kde-l10n-it-4.1.4.tar.bz2
+kde-l10n-ja-4.1.4.tar.bz2
+kde-l10n-kk-4.1.4.tar.bz2
+kde-l10n-km-4.1.4.tar.bz2
+kde-l10n-ko-4.1.4.tar.bz2
+kde-l10n-ku-4.1.4.tar.bz2
+kde-l10n-lt-4.1.4.tar.bz2
+kde-l10n-lv-4.1.4.tar.bz2
+kde-l10n-mk-4.1.4.tar.bz2
+kde-l10n-ml-4.1.4.tar.bz2
+kde-l10n-nb-4.1.4.tar.bz2
+kde-l10n-nds-4.1.4.tar.bz2
+kde-l10n-nl-4.1.4.tar.bz2
+kde-l10n-nn-4.1.4.tar.bz2
+kde-l10n-pa-4.1.4.tar.bz2
+kde-l10n-pl-4.1.4.tar.bz2
+kde-l10n-pt-4.1.4.tar.bz2
+kde-l10n-pt_BR-4.1.4.tar.bz2
+kde-l10n-ru-4.1.4.tar.bz2
+kde-l10n-sl-4.1.4.tar.bz2
+kde-l10n-sr-4.1.4.tar.bz2
+kde-l10n-sv-4.1.4.tar.bz2
+kde-l10n-ta-4.1.4.tar.bz2
+kde-l10n-th-4.1.4.tar.bz2
+kde-l10n-tr-4.1.4.tar.bz2
+kde-l10n-uk-4.1.4.tar.bz2
+kde-l10n-wa-4.1.4.tar.bz2
+kde-l10n-zh_CN-4.1.4.tar.bz2
+kde-l10n-zh_TW-4.1.4.tar.bz2


Index: kde-l10n.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kde-l10n/F-9/kde-l10n.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- kde-l10n.spec	10 Nov 2008 13:33:41 -0000	1.38
+++ kde-l10n.spec	9 Jan 2009 18:57:14 -0000	1.39
@@ -1,7 +1,7 @@
 %define buildall 0
 
 Name: kde-l10n
-Version: 4.1.3
+Version: 4.1.4
 Release: 1%{dist}
 Url: http://www.kde.org
 Summary: Internationalization support for KDE
@@ -1306,8 +1306,11 @@
 %lang(zh_TW) %{_kde4_docdir}/HTML/zh_TW
 
 %changelog
-* Mon Nov 10 2008 Luk???? Tinkl <ltinkl at redhat.com> 4.1.3-1
-- KDE 4.1.3
+* Fri Jan 09 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.4-1
+- 4.1.4
+
+* Wed Nov 12 2008 Than Ngo <than at redhat.com> 4.1.3-1
+- 4.1.3
 
 * Fri Sep 26 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-1
 - 4.1.2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kde-l10n/F-9/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	10 Nov 2008 13:31:56 -0000	1.15
+++ sources	9 Jan 2009 18:57:14 -0000	1.16
@@ -1,47 +1,47 @@
-a6b0e3e6ea5a53a2ce88d1392ba3ca58  kde-l10n-bg-4.1.3.tar.bz2
-a8915d9b9ab84b1e6ae1e8a21697384d  kde-l10n-ca-4.1.3.tar.bz2
-095705975bb76c18c9919252abf0da9e  kde-l10n-csb-4.1.3.tar.bz2
-e92b98c36922288e047d9eaa10b25641  kde-l10n-cs-4.1.3.tar.bz2
-b81566e8063cac723fa83fd8ef04ac28  kde-l10n-da-4.1.3.tar.bz2
-ca6e2943be1302c9deb6f3afb4706f24  kde-l10n-de-4.1.3.tar.bz2
-7c1bc162c676a204626534a286ade6eb  kde-l10n-el-4.1.3.tar.bz2
-cc67c275e370a647ed5e7fda91764c37  kde-l10n-en_GB-4.1.3.tar.bz2
-f9fc59aff7132f98464a2cacfa97f532  kde-l10n-eo-4.1.3.tar.bz2
-ea6af5080b48b3aeb2263e798c0b25a3  kde-l10n-es-4.1.3.tar.bz2
-882cccd332bede1ba7cad789962b2598  kde-l10n-et-4.1.3.tar.bz2
-10fc51692f7c6444560b5de61cc93112  kde-l10n-fi-4.1.3.tar.bz2
-2d585a15ec254e07d7b5eb46deb5cc72  kde-l10n-fr-4.1.3.tar.bz2
-1b499287e689eb2e3c6a5de5f58b63ca  kde-l10n-fy-4.1.3.tar.bz2
-d1dd6eb5c553c2ec046cf599bc1e6ef3  kde-l10n-ga-4.1.3.tar.bz2
-ff3a2d8bacc5b389d491bcb3308b11aa  kde-l10n-gl-4.1.3.tar.bz2
-fcf9c561585c519bc8b56df2a30c45dc  kde-l10n-hi-4.1.3.tar.bz2
-ae9ddc1f397168314ff40579c22aab97  kde-l10n-hu-4.1.3.tar.bz2
-6df69bb194811dd2f9eba260343b9b01  kde-l10n-it-4.1.3.tar.bz2
-8c20a5aeeb9fdf8e28787245fa1469d6  kde-l10n-ja-4.1.3.tar.bz2
-f364e6296d047d9f3911c094f26effd4  kde-l10n-kk-4.1.3.tar.bz2
-087fd1835f43c87132ecb0670ef96fe8  kde-l10n-km-4.1.3.tar.bz2
-f51be2b09fd7de50afab4e51ab7dcc17  kde-l10n-ko-4.1.3.tar.bz2
-1ea9d261c68f73b22cf56446810a4297  kde-l10n-ku-4.1.3.tar.bz2
-a162fc28c63cce4c2112443cc7ef6581  kde-l10n-lt-4.1.3.tar.bz2
-58b03bbbb73cac4881e387a92b3ecc88  kde-l10n-lv-4.1.3.tar.bz2
-52e65b08097519e5332ce402b84520be  kde-l10n-mk-4.1.3.tar.bz2
-9d70e9c3c4e9f1221ce3be20303b06aa  kde-l10n-ml-4.1.3.tar.bz2
-f97b8145b51d633293405c74e9222945  kde-l10n-nb-4.1.3.tar.bz2
-d63af859899b90625970ccef75993cfd  kde-l10n-nds-4.1.3.tar.bz2
-8ef32903e000281b228a66c2fe69321b  kde-l10n-nl-4.1.3.tar.bz2
-474fd6769fe0f9d59840bbc423714ef6  kde-l10n-nn-4.1.3.tar.bz2
-f6ec0e0a808350671ca959ac06928c79  kde-l10n-pa-4.1.3.tar.bz2
-199dd758e66de4cd9cca12142d7fffd1  kde-l10n-pl-4.1.3.tar.bz2
-bf6b98228a752ac957b1d452b01c8100  kde-l10n-pt_BR-4.1.3.tar.bz2
-70bfccb843d8ace4ea4ca09b53882707  kde-l10n-pt-4.1.3.tar.bz2
-219f203563c5b2cce873005ec07beae0  kde-l10n-ru-4.1.3.tar.bz2
-699d3c2d6a4f486a3cabea27bedce38b  kde-l10n-sl-4.1.3.tar.bz2
-9c8fc1aad911e9586556a7ba5e5c693b  kde-l10n-sr-4.1.3.tar.bz2
-c0b7bd3ea625ca46f4c52c76c65f7069  kde-l10n-sv-4.1.3.tar.bz2
-bd3554f64308a2dbfe04cd065ac42650  kde-l10n-ta-4.1.3.tar.bz2
-20dbbabe676d3586c84fe6a17c6b115a  kde-l10n-th-4.1.3.tar.bz2
-587c21e1534a08fced36421640da0bb0  kde-l10n-tr-4.1.3.tar.bz2
-90a224caa436934b08075ec4257b11fb  kde-l10n-uk-4.1.3.tar.bz2
-3a3331c1393e3e7e17d1a20cad1e5e51  kde-l10n-wa-4.1.3.tar.bz2
-c4951153ab58c47e23ae16c114164f38  kde-l10n-zh_CN-4.1.3.tar.bz2
-ed1a1ff739772de42ad8ae4351c04fe6  kde-l10n-zh_TW-4.1.3.tar.bz2
+5f5b1effdd9b8f0a6c1a4ab59b739f0e  kde-l10n-bg-4.1.4.tar.bz2
+ebf90b925b2bf1a0b6246e800a3eaf09  kde-l10n-ca-4.1.4.tar.bz2
+12cd58d5728958829d65881fcdb3958f  kde-l10n-cs-4.1.4.tar.bz2
+b3371c5468c27021ee8dc19113ad4be7  kde-l10n-csb-4.1.4.tar.bz2
+b6c145d943292f2ba11753aa044f66f5  kde-l10n-da-4.1.4.tar.bz2
+bf5db9e7c2708e4ecd01345137009cab  kde-l10n-de-4.1.4.tar.bz2
+4b80c39785839da001190a38c8e7266b  kde-l10n-el-4.1.4.tar.bz2
+42f851c5f7e4432894483bf85ecb9076  kde-l10n-en_GB-4.1.4.tar.bz2
+88875e433f2440757b03df87eab9de07  kde-l10n-eo-4.1.4.tar.bz2
+0d2fed450def3f19704f34e8c9927054  kde-l10n-es-4.1.4.tar.bz2
+c1516ef8c2d60e03ca10bb5f9ef731ee  kde-l10n-et-4.1.4.tar.bz2
+eac2a616f172f714abe8f8a9c4403f19  kde-l10n-fi-4.1.4.tar.bz2
+dd6b5b97e47b28ca8c8d72c432a12056  kde-l10n-fr-4.1.4.tar.bz2
+1ca52ac5269d104ae970a06b683a6924  kde-l10n-fy-4.1.4.tar.bz2
+e35d048d6977d62b9f1598ecd6410ae9  kde-l10n-ga-4.1.4.tar.bz2
+7e75474eb5f39f122ae08f4f1abeeeb2  kde-l10n-gl-4.1.4.tar.bz2
+be6dc85d35ccd4431f3ffadef802f1dc  kde-l10n-hi-4.1.4.tar.bz2
+ea3cf065ea2a17e4daf3847194c2bd5f  kde-l10n-hu-4.1.4.tar.bz2
+f57747f19419714cfd72cbbbba3c465a  kde-l10n-it-4.1.4.tar.bz2
+19157c9ca23253d1dc5f872f71d88c9e  kde-l10n-ja-4.1.4.tar.bz2
+9c6ae2d6e70b95d6287a46b1d53502e6  kde-l10n-kk-4.1.4.tar.bz2
+4df0089cebfea89a9f4a3287df90f0a7  kde-l10n-km-4.1.4.tar.bz2
+d1c3c4d106672a83f2fa73b5b49312d9  kde-l10n-ko-4.1.4.tar.bz2
+2dea53e4a1b43644549a8a53b427c167  kde-l10n-ku-4.1.4.tar.bz2
+87b9c0b435bd37a073549427300c713b  kde-l10n-lt-4.1.4.tar.bz2
+e05d96e5fad79570422b33029a6cb65c  kde-l10n-lv-4.1.4.tar.bz2
+aef1f6063ba8701a352132aed655ab05  kde-l10n-mk-4.1.4.tar.bz2
+2491e682dc830fdb0b6738e9ff6e04d0  kde-l10n-ml-4.1.4.tar.bz2
+e21c6f67d95240a1a26512894c18efdf  kde-l10n-nb-4.1.4.tar.bz2
+12b299ec3b9ec3715b78e3afc17f0fb0  kde-l10n-nds-4.1.4.tar.bz2
+50b0dabddf55d79ae55e4313b3dfb0cc  kde-l10n-nl-4.1.4.tar.bz2
+b55ec0958d079004ca0d6d89af1cc0af  kde-l10n-nn-4.1.4.tar.bz2
+c40c3a9d61439b62c0dad8e5f994623b  kde-l10n-pa-4.1.4.tar.bz2
+dbf06430f02b44933fd78f16f445e54f  kde-l10n-pl-4.1.4.tar.bz2
+cf666b9d9e4f5e6089d3dfc04e5291ff  kde-l10n-pt-4.1.4.tar.bz2
+6f08bd872f25ff812b1f449e012b2691  kde-l10n-pt_BR-4.1.4.tar.bz2
+bf8b2f974108d722962e832e26fc00ec  kde-l10n-ru-4.1.4.tar.bz2
+c4a74ef14b66d2cc44518e4dbccf7884  kde-l10n-sl-4.1.4.tar.bz2
+a60f826a7fcb82e23851fabf03f52fa7  kde-l10n-sr-4.1.4.tar.bz2
+35e967ea1a7b93629a7591e7a2736da0  kde-l10n-sv-4.1.4.tar.bz2
+6b1ffdaed790ed733bfc3aac8808cbad  kde-l10n-ta-4.1.4.tar.bz2
+24ffa0fca844ff1756ca7469bd845d98  kde-l10n-th-4.1.4.tar.bz2
+d06edd7000b97585335bcefb4e62ad3a  kde-l10n-tr-4.1.4.tar.bz2
+e0a1b781e02d56caef169fd51ddb7a63  kde-l10n-uk-4.1.4.tar.bz2
+6b01aafb428179c9f4153a958b0d0044  kde-l10n-wa-4.1.4.tar.bz2
+cfe9af2f9f3df568623b0c35cc307403  kde-l10n-zh_CN-4.1.4.tar.bz2
+02f9104908ad1e3e28f78716b0a562cc  kde-l10n-zh_TW-4.1.4.tar.bz2



From arbiter at fedoraproject.org  Fri Jan  9 18:59:14 2009
From: arbiter at fedoraproject.org (Lorenzo Villani)
Date: Fri,  9 Jan 2009 18:59:14 +0000 (UTC)
Subject: rpms/kdeaccessibility/devel kdeaccessibility.spec,1.69,1.70
Message-ID: <20090109185914.7C6A77011C@cvs1.fedora.phx.redhat.com>

Author: arbiter

Update of /cvs/pkgs/rpms/kdeaccessibility/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17713

Modified Files:
	kdeaccessibility.spec 
Log Message:
- revision bump


Index: kdeaccessibility.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeaccessibility/devel/kdeaccessibility.spec,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- kdeaccessibility.spec	9 Jan 2009 18:51:04 -0000	1.69
+++ kdeaccessibility.spec	9 Jan 2009 18:58:44 -0000	1.70
@@ -2,7 +2,7 @@
 Name:           kdeaccessibility
 Epoch:          1
 Version:        4.1.96
-Release:        1%{?dist}
+Release:        2%{?dist}
 
 Group:          User Interface/Desktops
 License:        GPLv2
@@ -94,6 +94,10 @@
 
 
 %changelog
+* Fri Jan 09 2009 Lorenzo Villani <lvillani at binaryhelix.net> - 1:4.1.96-2
+- rebuilt
+- fix file list
+
 * Wed Jan 07 2009 Than Ngo <than at redhat.com> - 4.1.96-1
 - 4.2rc1
 



From kyle at fedoraproject.org  Fri Jan  9 19:00:26 2009
From: kyle at fedoraproject.org (Kyle McMartin)
Date: Fri,  9 Jan 2009 19:00:26 +0000 (UTC)
Subject: rpms/kernel/devel revert-fix-modules_install-via-nfs.patch, NONE,
	1.1 kernel.spec, 1.1203, 1.1204
Message-ID: <20090109190026.1F2A87011C@cvs1.fedora.phx.redhat.com>

Author: kyle

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17990

Modified Files:
	kernel.spec 
Added Files:
	revert-fix-modules_install-via-nfs.patch 
Log Message:
* Thu Jan 08 2009 Kyle McMartin <kyle at redhat.com>
- 2.6.28-git12
- Revert ihex2fb moving patch, causes noarch target to
  epicly fail.


revert-fix-modules_install-via-nfs.patch:

--- NEW FILE revert-fix-modules_install-via-nfs.patch ---
>From e2efba5a3a087933a6e372fef4934c71f9b1365f Mon Sep 17 00:00:00 2001
From: Kyle McMartin <kyle at minerva.i.cabal.ca>
Date: Fri, 9 Jan 2009 11:54:51 -0500
Subject: Revert "fix modules_install via NFS"

This reverts commit 8b249b6856f16f09b0e5b79ce5f4d435e439b9d6.
---
 firmware/.gitignore |    1 +
 firmware/Makefile   |   10 +-
 firmware/ihex2fw.c  |  268 +++++++++++++++++++++++++++++++++++++++++++++++++++
 scripts/.gitignore  |    1 -
 scripts/Makefile    |    3 +-
 scripts/ihex2fw.c   |  268 ---------------------------------------------------
 6 files changed, 276 insertions(+), 275 deletions(-)
 create mode 100644 firmware/ihex2fw.c
 delete mode 100644 scripts/ihex2fw.c

diff --git a/firmware/.gitignore b/firmware/.gitignore
index f89a21f..d9c6901 100644
--- a/firmware/.gitignore
+++ b/firmware/.gitignore
@@ -3,3 +3,4 @@
 *.bin
 *.csp
 *.dsp
+ihex2fw
diff --git a/firmware/Makefile b/firmware/Makefile
index ea1d28f..aae5129 100644
--- a/firmware/Makefile
+++ b/firmware/Makefile
@@ -101,10 +101,10 @@ quiet_cmd_ihex  = IHEX    $@
       cmd_ihex  = $(OBJCOPY) -Iihex -Obinary $< $@
 
 quiet_cmd_ihex2fw  = IHEX2FW $@
-      cmd_ihex2fw  = $(objtree)/scripts/ihex2fw $< $@
+      cmd_ihex2fw  = $(objtree)/$(obj)/ihex2fw $< $@
 
 quiet_cmd_h16tofw  = H16TOFW $@
-      cmd_h16tofw  = $(objtree)/scripts/ihex2fw -w $< $@
+      cmd_h16tofw  = $(objtree)/$(obj)/ihex2fw -w $< $@
 
 quiet_cmd_fwbin = MK_FW   $@
       cmd_fwbin = FWNAME="$(patsubst firmware/%.gen.S,%,$@)";		     \
@@ -167,11 +167,11 @@ $(obj)/%: $(obj)/%.ihex | $(objtree)/$(obj)/$$(dir %)
 # is actually meaningful, because the firmware has to be loaded in a certain
 # order rather than as a single binary blob. Thus, we convert them into our
 # more compact binary representation of ihex records (<linux/ihex.h>)
-$(obj)/%.fw: $(obj)/%.HEX  | $(objtree)/$(obj)/$$(dir %)
+$(obj)/%.fw: $(obj)/%.HEX $(obj)/ihex2fw | $(objtree)/$(obj)/$$(dir %)
 	$(call cmd,ihex2fw)
 
 # .H16 is our own modified form of Intel HEX, with 16-bit length for records.
-$(obj)/%.fw: $(obj)/%.H16 | $(objtree)/$(obj)/$$(dir %)
+$(obj)/%.fw: $(obj)/%.H16 $(obj)/ihex2fw | $(objtree)/$(obj)/$$(dir %)
 	$(call cmd,h16tofw)
 
 $(firmware-dirs):
@@ -188,3 +188,5 @@ targets := $(fw-shipped-) $(patsubst $(obj)/%,%, \
 # Without this, built-in.o won't be created when it's empty, and the
 # final vmlinux link will fail.
 obj-n := dummy
+
+hostprogs-y := ihex2fw
diff --git a/firmware/ihex2fw.c b/firmware/ihex2fw.c
new file mode 100644
index 0000000..8f7fdaa
--- /dev/null
+++ b/firmware/ihex2fw.c
@@ -0,0 +1,268 @@
+/*
+ * Parser/loader for IHEX formatted data.
+ *
+ * Copyright ?? 2008 David Woodhouse <dwmw2 at infradead.org>
+ * Copyright ?? 2005 Jan Harkes <jaharkes at cs.cmu.edu>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#include <stdint.h>
+#include <arpa/inet.h>
+#include <stdio.h>
+#include <errno.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <sys/mman.h>
+#include <fcntl.h>
+#include <string.h>
+#include <unistd.h>
+#include <stdlib.h>
+#define _GNU_SOURCE
+#include <getopt.h>
+
+
+struct ihex_binrec {
+	struct ihex_binrec *next; /* not part of the real data structure */
+        uint32_t addr;
+        uint16_t len;
+        uint8_t data[];
+};
+
+/**
+ * nybble/hex are little helpers to parse hexadecimal numbers to a byte value
+ **/
+static uint8_t nybble(const uint8_t n)
+{
+       if      (n >= '0' && n <= '9') return n - '0';
+       else if (n >= 'A' && n <= 'F') return n - ('A' - 10);
+       else if (n >= 'a' && n <= 'f') return n - ('a' - 10);
+       return 0;
+}
+
+static uint8_t hex(const uint8_t *data, uint8_t *crc)
+{
+       uint8_t val = (nybble(data[0]) << 4) | nybble(data[1]);
+       *crc += val;
+       return val;
+}
+
+static int process_ihex(uint8_t *data, ssize_t size);
+static void file_record(struct ihex_binrec *record);
+static int output_records(int outfd);
+
+static int sort_records = 0;
+static int wide_records = 0;
+
+int usage(void)
+{
+	fprintf(stderr, "ihex2fw: Convert ihex files into binary "
+		"representation for use by Linux kernel\n");
+	fprintf(stderr, "usage: ihex2fw [<options>] <src.HEX> <dst.fw>\n");
+	fprintf(stderr, "       -w: wide records (16-bit length)\n");
+	fprintf(stderr, "       -s: sort records by address\n");
+	return 1;
+}
+
+int main(int argc, char **argv)
+{
+	int infd, outfd;
+	struct stat st;
+	uint8_t *data;
+	int opt;
+
+	while ((opt = getopt(argc, argv, "ws")) != -1) {
+		switch (opt) {
+		case 'w':
+			wide_records = 1;
+			break;
+		case 's':
+			sort_records = 1;
+			break;
+		default:
+			return usage();
+		}
+	}
+
+	if (optind + 2 != argc)
+		return usage();
+
+	if (!strcmp(argv[optind], "-"))
+	    infd = 0;
+	else
+		infd = open(argv[optind], O_RDONLY);
+	if (infd == -1) {
+		fprintf(stderr, "Failed to open source file: %s",
+			strerror(errno));
+		return usage();
+	}
+	if (fstat(infd, &st)) {
+		perror("stat");
+		return 1;
+	}
+	data = mmap(NULL, st.st_size, PROT_READ, MAP_SHARED, infd, 0);
+	if (data == MAP_FAILED) {
+		perror("mmap");
+		return 1;
+	}
+
+	if (!strcmp(argv[optind+1], "-"))
+	    outfd = 1;
+	else
+		outfd = open(argv[optind+1], O_TRUNC|O_CREAT|O_WRONLY, 0644);
+	if (outfd == -1) {
+		fprintf(stderr, "Failed to open destination file: %s",
+			strerror(errno));
+		return usage();
+	}
+	if (process_ihex(data, st.st_size))
+		return 1;
+
+	output_records(outfd);
+	return 0;
+}
+
+static int process_ihex(uint8_t *data, ssize_t size)
+{
+	struct ihex_binrec *record;
+	uint32_t offset = 0;
+	uint8_t type, crc = 0, crcbyte = 0;
+	int i, j;
+	int line = 1;
+	int len;
+
+	i = 0;
+next_record:
+	/* search for the start of record character */
+	while (i < size) {
+		if (data[i] == '\n') line++;
+		if (data[i++] == ':') break;
+	}
+
+	/* Minimum record length would be about 10 characters */
+	if (i + 10 > size) {
+		fprintf(stderr, "Can't find valid record at line %d\n", line);
+		return -EINVAL;
+	}
+
+	len = hex(data + i, &crc); i += 2;
+	if (wide_records) {
+		len <<= 8;
+		len += hex(data + i, &crc); i += 2;
+	}
+	record = malloc((sizeof (*record) + len + 3) & ~3);
+	if (!record) {
+		fprintf(stderr, "out of memory for records\n");
+		return -ENOMEM;
+	}
+	memset(record, 0, (sizeof(*record) + len + 3) & ~3);
+	record->len = len;
+
+	/* now check if we have enough data to read everything */
+	if (i + 8 + (record->len * 2) > size) {
+		fprintf(stderr, "Not enough data to read complete record at line %d\n",
+			line);
+		return -EINVAL;
+	}
+
+	record->addr  = hex(data + i, &crc) << 8; i += 2;
+	record->addr |= hex(data + i, &crc); i += 2;
+	type = hex(data + i, &crc); i += 2;
+
+	for (j = 0; j < record->len; j++, i += 2)
+		record->data[j] = hex(data + i, &crc);
+
+	/* check CRC */
+	crcbyte = hex(data + i, &crc); i += 2;
+	if (crc != 0) {
+		fprintf(stderr, "CRC failure at line %d: got 0x%X, expected 0x%X\n",
+			line, crcbyte, (unsigned char)(crcbyte-crc));
+		return -EINVAL;
+	}
+
+	/* Done reading the record */
+	switch (type) {
+	case 0:
+		/* old style EOF record? */
+		if (!record->len)
+			break;
+
+		record->addr += offset;
+		file_record(record);
+		goto next_record;
+
+	case 1: /* End-Of-File Record */
+		if (record->addr || record->len) {
+			fprintf(stderr, "Bad EOF record (type 01) format at line %d",
+				line);
+			return -EINVAL;
+		}
+		break;
+
+	case 2: /* Extended Segment Address Record (HEX86) */
+	case 4: /* Extended Linear Address Record (HEX386) */
+		if (record->addr || record->len != 2) {
+			fprintf(stderr, "Bad HEX86/HEX386 record (type %02X) at line %d\n",
+				type, line);
+			return -EINVAL;
+		}
+
+		/* We shouldn't really be using the offset for HEX86 because
+		 * the wraparound case is specified quite differently. */
+		offset = record->data[0] << 8 | record->data[1];
+		offset <<= (type == 2 ? 4 : 16);
+		goto next_record;
+
+	case 3: /* Start Segment Address Record */
+	case 5: /* Start Linear Address Record */
+		if (record->addr || record->len != 4) {
+			fprintf(stderr, "Bad Start Address record (type %02X) at line %d\n",
+				type, line);
+			return -EINVAL;
+		}
+
+		/* These records contain the CS/IP or EIP where execution
+		 * starts. Don't really know what to do with them. */
+		goto next_record;
+
+	default:
+		fprintf(stderr, "Unknown record (type %02X)\n", type);
+		return -EINVAL;
+	}
+
+	return 0;
+}
+
+static struct ihex_binrec *records;
+
+static void file_record(struct ihex_binrec *record)
+{
+	struct ihex_binrec **p = &records;
+
+	while ((*p) && (!sort_records || (*p)->addr < record->addr))
+		p = &((*p)->next);
+
+	record->next = *p;
+	*p = record;
+}
+
+static int output_records(int outfd)
+{
+	unsigned char zeroes[6] = {0, 0, 0, 0, 0, 0};
+	struct ihex_binrec *p = records;
+
+	while (p) {
+		uint16_t writelen = (p->len + 9) & ~3;
+
+		p->addr = htonl(p->addr);
+		p->len = htons(p->len);
+		write(outfd, &p->addr, writelen);
+		p = p->next;
+	}
+	/* EOF record is zero length, since we don't bother to represent
+	   the type field in the binary version */
+	write(outfd, zeroes, 6);
+	return 0;
+}
diff --git a/scripts/.gitignore b/scripts/.gitignore
index 09e2406..b939fbd 100644
--- a/scripts/.gitignore
+++ b/scripts/.gitignore
@@ -1,7 +1,6 @@
 #
 # Generated files
 #
-ihex2fw
 conmakehash
 kallsyms
 pnmtologo
diff --git a/scripts/Makefile b/scripts/Makefile
index 035182e..aafdf06 100644
--- a/scripts/Makefile
+++ b/scripts/Makefile
@@ -2,12 +2,11 @@
 # scripts contains sources for various helper programs used throughout
 # the kernel for the build process.
 # ---------------------------------------------------------------------------
-# ihex2fw:       Parser/loader for IHEX formatted data
 # kallsyms:      Find all symbols in vmlinux
 # pnmttologo:    Convert pnm files to logo files
+# conmakehash:   Create chartable
 # conmakehash:	 Create arrays for initializing the kernel console tables
 
-hostprogs-y                      := ihex2fw
 hostprogs-$(CONFIG_KALLSYMS)     += kallsyms
 hostprogs-$(CONFIG_LOGO)         += pnmtologo
 hostprogs-$(CONFIG_VT)           += conmakehash
diff --git a/scripts/ihex2fw.c b/scripts/ihex2fw.c
deleted file mode 100644
index 8f7fdaa..0000000
--- a/scripts/ihex2fw.c
+++ /dev/null
@@ -1,268 +0,0 @@
-/*
- * Parser/loader for IHEX formatted data.
- *
- * Copyright ?? 2008 David Woodhouse <dwmw2 at infradead.org>
- * Copyright ?? 2005 Jan Harkes <jaharkes at cs.cmu.edu>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- */
-
-#include <stdint.h>
-#include <arpa/inet.h>
-#include <stdio.h>
-#include <errno.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/mman.h>
-#include <fcntl.h>
-#include <string.h>
-#include <unistd.h>
-#include <stdlib.h>
-#define _GNU_SOURCE
-#include <getopt.h>
-
-
-struct ihex_binrec {
-	struct ihex_binrec *next; /* not part of the real data structure */
-        uint32_t addr;
-        uint16_t len;
-        uint8_t data[];
-};
-
-/**
- * nybble/hex are little helpers to parse hexadecimal numbers to a byte value
- **/
-static uint8_t nybble(const uint8_t n)
-{
-       if      (n >= '0' && n <= '9') return n - '0';
-       else if (n >= 'A' && n <= 'F') return n - ('A' - 10);
-       else if (n >= 'a' && n <= 'f') return n - ('a' - 10);
-       return 0;
-}
-
-static uint8_t hex(const uint8_t *data, uint8_t *crc)
-{
-       uint8_t val = (nybble(data[0]) << 4) | nybble(data[1]);
-       *crc += val;
-       return val;
-}
-
-static int process_ihex(uint8_t *data, ssize_t size);
-static void file_record(struct ihex_binrec *record);
-static int output_records(int outfd);
-
-static int sort_records = 0;
-static int wide_records = 0;
-
-int usage(void)
-{
-	fprintf(stderr, "ihex2fw: Convert ihex files into binary "
-		"representation for use by Linux kernel\n");
-	fprintf(stderr, "usage: ihex2fw [<options>] <src.HEX> <dst.fw>\n");
-	fprintf(stderr, "       -w: wide records (16-bit length)\n");
-	fprintf(stderr, "       -s: sort records by address\n");
-	return 1;
-}
-
-int main(int argc, char **argv)
-{
-	int infd, outfd;
-	struct stat st;
-	uint8_t *data;
-	int opt;
-
-	while ((opt = getopt(argc, argv, "ws")) != -1) {
-		switch (opt) {
-		case 'w':
-			wide_records = 1;
-			break;
-		case 's':
-			sort_records = 1;
-			break;
-		default:
-			return usage();
-		}
-	}
-
-	if (optind + 2 != argc)
-		return usage();
-
-	if (!strcmp(argv[optind], "-"))
-	    infd = 0;
-	else
-		infd = open(argv[optind], O_RDONLY);
-	if (infd == -1) {
-		fprintf(stderr, "Failed to open source file: %s",
-			strerror(errno));
-		return usage();
-	}
-	if (fstat(infd, &st)) {
-		perror("stat");
-		return 1;
-	}
-	data = mmap(NULL, st.st_size, PROT_READ, MAP_SHARED, infd, 0);
-	if (data == MAP_FAILED) {
-		perror("mmap");
-		return 1;
-	}
-
-	if (!strcmp(argv[optind+1], "-"))
-	    outfd = 1;
-	else
-		outfd = open(argv[optind+1], O_TRUNC|O_CREAT|O_WRONLY, 0644);
-	if (outfd == -1) {
-		fprintf(stderr, "Failed to open destination file: %s",
-			strerror(errno));
-		return usage();
-	}
-	if (process_ihex(data, st.st_size))
-		return 1;
-
-	output_records(outfd);
-	return 0;
-}
-
-static int process_ihex(uint8_t *data, ssize_t size)
-{
-	struct ihex_binrec *record;
-	uint32_t offset = 0;
-	uint8_t type, crc = 0, crcbyte = 0;
-	int i, j;
-	int line = 1;
-	int len;
-
-	i = 0;
-next_record:
-	/* search for the start of record character */
-	while (i < size) {
-		if (data[i] == '\n') line++;
-		if (data[i++] == ':') break;
-	}
-
-	/* Minimum record length would be about 10 characters */
-	if (i + 10 > size) {
-		fprintf(stderr, "Can't find valid record at line %d\n", line);
-		return -EINVAL;
-	}
-
-	len = hex(data + i, &crc); i += 2;
-	if (wide_records) {
-		len <<= 8;
-		len += hex(data + i, &crc); i += 2;
-	}
-	record = malloc((sizeof (*record) + len + 3) & ~3);
-	if (!record) {
-		fprintf(stderr, "out of memory for records\n");
-		return -ENOMEM;
-	}
-	memset(record, 0, (sizeof(*record) + len + 3) & ~3);
-	record->len = len;
-
-	/* now check if we have enough data to read everything */
-	if (i + 8 + (record->len * 2) > size) {
-		fprintf(stderr, "Not enough data to read complete record at line %d\n",
-			line);
-		return -EINVAL;
-	}
-
-	record->addr  = hex(data + i, &crc) << 8; i += 2;
-	record->addr |= hex(data + i, &crc); i += 2;
-	type = hex(data + i, &crc); i += 2;
-
-	for (j = 0; j < record->len; j++, i += 2)
-		record->data[j] = hex(data + i, &crc);
-
-	/* check CRC */
-	crcbyte = hex(data + i, &crc); i += 2;
-	if (crc != 0) {
-		fprintf(stderr, "CRC failure at line %d: got 0x%X, expected 0x%X\n",
-			line, crcbyte, (unsigned char)(crcbyte-crc));
-		return -EINVAL;
-	}
-
-	/* Done reading the record */
-	switch (type) {
-	case 0:
-		/* old style EOF record? */
-		if (!record->len)
-			break;
-
-		record->addr += offset;
-		file_record(record);
-		goto next_record;
-
-	case 1: /* End-Of-File Record */
-		if (record->addr || record->len) {
-			fprintf(stderr, "Bad EOF record (type 01) format at line %d",
-				line);
-			return -EINVAL;
-		}
-		break;
-
-	case 2: /* Extended Segment Address Record (HEX86) */
-	case 4: /* Extended Linear Address Record (HEX386) */
-		if (record->addr || record->len != 2) {
-			fprintf(stderr, "Bad HEX86/HEX386 record (type %02X) at line %d\n",
-				type, line);
-			return -EINVAL;
-		}
-
-		/* We shouldn't really be using the offset for HEX86 because
-		 * the wraparound case is specified quite differently. */
-		offset = record->data[0] << 8 | record->data[1];
-		offset <<= (type == 2 ? 4 : 16);
-		goto next_record;
-
-	case 3: /* Start Segment Address Record */
-	case 5: /* Start Linear Address Record */
-		if (record->addr || record->len != 4) {
-			fprintf(stderr, "Bad Start Address record (type %02X) at line %d\n",
-				type, line);
-			return -EINVAL;
-		}
-
-		/* These records contain the CS/IP or EIP where execution
-		 * starts. Don't really know what to do with them. */
-		goto next_record;
-
-	default:
-		fprintf(stderr, "Unknown record (type %02X)\n", type);
-		return -EINVAL;
-	}
-
-	return 0;
-}
-
-static struct ihex_binrec *records;
-
-static void file_record(struct ihex_binrec *record)
-{
-	struct ihex_binrec **p = &records;
-
-	while ((*p) && (!sort_records || (*p)->addr < record->addr))
-		p = &((*p)->next);
-
-	record->next = *p;
-	*p = record;
-}
-
-static int output_records(int outfd)
-{
-	unsigned char zeroes[6] = {0, 0, 0, 0, 0, 0};
-	struct ihex_binrec *p = records;
-
-	while (p) {
-		uint16_t writelen = (p->len + 9) & ~3;
-
-		p->addr = htonl(p->addr);
-		p->len = htons(p->len);
-		write(outfd, &p->addr, writelen);
-		p = p->next;
-	}
-	/* EOF record is zero length, since we don't bother to represent
-	   the type field in the binary version */
-	write(outfd, zeroes, 6);
-	return 0;
-}
-- 
1.6.0.6



Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1203
retrieving revision 1.1204
diff -u -r1.1203 -r1.1204
--- kernel.spec	9 Jan 2009 16:43:22 -0000	1.1203
+++ kernel.spec	9 Jan 2009 18:59:55 -0000	1.1204
@@ -663,6 +663,7 @@
 Patch2802: linux-2.6-silence-acpi-blacklist.patch
 
 Patch9000: revert-strip-bustication.patch
+Patch9001: revert-fix-modules_install-via-nfs.patch
 
 %endif
 
@@ -1173,6 +1174,9 @@
 # revert ad7a953c522ceb496611d127e51e278bfe0ff483
 ApplyPatch revert-strip-bustication.patch
 
+# revert 8b249b6856f16f09b0e5b79ce5f4d435e439b9d6
+ApplyPatch revert-fix-modules_install-via-nfs.patch
+
 # END OF PATCH APPLICATIONS
 
 %endif
@@ -1750,6 +1754,8 @@
 %changelog
 * Thu Jan 08 2009 Kyle McMartin <kyle at redhat.com>
 - 2.6.28-git12
+- Revert ihex2fb moving patch, causes noarch target to
+  epicly fail.
 
 * Thu Jan 08 2009 Kyle McMartin <kyle at redhat.com>
 - Fixup build failures due to warn/info macro removal.



From limb at fedoraproject.org  Fri Jan  9 19:01:35 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Fri,  9 Jan 2009 19:01:35 +0000 (UTC)
Subject: rpms/gnubg/devel gnubg.spec,1.25,1.26
Message-ID: <20090109190135.C83857011C@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/gnubg/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18162

Modified Files:
	gnubg.spec 
Log Message:
Switched to dejavu.



Index: gnubg.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnubg/devel/gnubg.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- gnubg.spec	2 Jan 2009 14:00:49 -0000	1.25
+++ gnubg.spec	9 Jan 2009 19:01:05 -0000	1.26
@@ -4,7 +4,7 @@
 Summary:       A backgammon game and analyser
 Epoch:         1
 Version:       0.9.0.1
-Release:       4.1%{?dist}
+Release:       5%{?dist}
 Source0:       http://gnubg.org/media/sources/gnubg-0.9.0-1.tar.gz
 Source1:       gnubg.weights
 Source2:       gnubg.desktop
@@ -46,10 +46,10 @@
 Requires(post): coreutils
 Requires(postun): coreutils
 %if "0%{?dist}" == "0.fc10"
-Requires: bitstream-vera-fonts
+Requires: dejavu-fonts
 %else
-Requires: bitstream-vera-fonts-sans
-Requires: bitstream-vera-fonts-serif
+Requires: dejavu-fonts-sans
+Requires: dejavu-fonts-serif
 %endif
 
 
@@ -87,9 +87,9 @@
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/gnubg
 make install DESTDIR=$RPM_BUILD_ROOT
 rm -rf $RPM_BUILD_ROOT%{_datadir}/gnubg/fonts/*.ttf
-ln -s ../../fonts/bitstream-vera/Vera.ttf $RPM_BUILD_ROOT%{_datadir}/gnubg/fonts/Vera.ttf
-ln -s ../../fonts/bitstream-vera/VeraBd.ttf $RPM_BUILD_ROOT%{_datadir}/gnubg/fonts/VeraBd.ttf 
-ln -s ../../fonts/bitstream-vera/VeraSeBd.ttf $RPM_BUILD_ROOT%{_datadir}/gnubg/fonts/VeraSeBd.ttf 
+ln -s ../../fonts/dejavu/DejaVuSans.ttf $RPM_BUILD_ROOT%{_datadir}/gnubg/fonts/Vera.ttf
+ln -s ../../fonts/dejavu/DejaVuSans-Bold.ttf $RPM_BUILD_ROOT%{_datadir}/gnubg/fonts/VeraBd.ttf 
+ln -s ../../fonts/dejavu/DejaVuSerif-Bold.ttf $RPM_BUILD_ROOT%{_datadir}/gnubg/fonts/VeraSeBd.ttf 
 install -Dpm 644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/gnubg/gnubg.weights
 cp -rp textures* $RPM_BUILD_ROOT%{_datadir}/gnubg/
 rm -rf $RPM_BUILD_ROOT%{_datadir}/gnubg/textures/CVS
@@ -165,6 +165,8 @@
 %{_datadir}/gnubg/gnubg_ts0.bd
 
 %changelog
+* Fri Jan 09 2009 Jon Ciesla <limb at jcomserv.net> - 1:0.9.0.1-5
+- Switch to dejavu fonts.
 * Fri Jan 02 2009 Jon Ciesla <limb at jcomserv.net> - 1:0.9.0.1-4.1
 - Requires fix.
 * Tue Dec 30 2008 Jon Ciesla <limb at jcomserv.net> - 1:0.9.0.1-4



From rdieter at fedoraproject.org  Fri Jan  9 19:21:07 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri,  9 Jan 2009 19:21:07 +0000 (UTC)
Subject: rpms/koffice/devel .cvsignore, 1.24, 1.25 koffice.spec, 1.91,
	1.92 sources, 1.24, 1.25
Message-ID: <20090109192107.947EF7011C@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/koffice/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20817

Modified Files:
	.cvsignore koffice.spec sources 
Log Message:
* Thu Jan 08 2009 Rex Dieter <rdieter at fedoraproject.org> - 1:1.9.98.5-1
- koffice-1.9.98.5, koffice2 beta 5 (take 2)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/koffice/devel/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- .cvsignore	31 Dec 2008 15:29:56 -0000	1.24
+++ .cvsignore	9 Jan 2009 19:20:37 -0000	1.25
@@ -1 +1 @@
-koffice-1.9.98.4.tar.bz2
+koffice-1.9.98.5.tar.bz2


Index: koffice.spec
===================================================================
RCS file: /cvs/pkgs/rpms/koffice/devel/koffice.spec,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -r1.91 -r1.92
--- koffice.spec	31 Dec 2008 17:17:35 -0000	1.91
+++ koffice.spec	9 Jan 2009 19:20:37 -0000	1.92
@@ -5,11 +5,9 @@
 #define kivio 1
 #define kugar 1
 
-%define exiv2 1
-
 Name:           koffice
 Epoch:          1
-Version:        1.9.98.4
+Version:        1.9.98.5
 Release:        1%{?dist}
 Summary:        An integrated office suite
 
@@ -22,9 +20,7 @@
 
 #-- 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/>
+#+ OpenCTL, 0.9.2 or higher: OpenCTL is needed for some color spaces (High Dynamic Range Color Spaces, YCbCr and LMS) <http://www.openctl.org>
 #+ Spnav: Spnav is the library which is required by the space navigator device plugin <http://spacenav.sourceforge.net/>
 
 BuildRequires: boost-devel
@@ -33,9 +29,7 @@
 BuildRequires: desktop-file-utils
 BuildRequires: doxygen
 BuildRequires: eigen2-devel
-%if 0%{?exiv2}
 BuildRequires: exiv2-devel
-%endif
 BuildRequires: fontconfig-devel
 BuildRequires: freeglut-devel
 BuildRequires: freetype-devel
@@ -382,7 +376,6 @@
 %{_kde4_libdir}/kde4/kofficescan.*
 %{_kde4_libdir}/kde4/kofficethumbnail.*
 %{_kde4_libdir}/kde4/kopabackgroundtool.*
-%{_kde4_libdir}/kde4/paragraphtool.*
 %{_kde4_libdir}/kde4/libkounavailpart.*
 %{_kde4_libdir}/kde4/clipartthumbnail.*
 %{_kde4_libdir}/kde4/thesaurustool.so
@@ -409,7 +402,6 @@
 %{_kde4_datadir}/kde4/services/kofficedockers.desktop
 %{_kde4_datadir}/kde4/services/kopabackgroundtool.desktop
 %{_kde4_datadir}/kde4/services/kounavail.desktop
-%{_kde4_datadir}/kde4/services/paragraphtool.desktop
 %{_kde4_datadir}/kde4/services/thesaurustool.desktop
 %{_kde4_datadir}/kde4/services/kofficesimpletextedit.desktop
 %{_kde4_datadir}/kde4/services/spellcheck.desktop
@@ -442,9 +434,7 @@
 %if 0%{?kformula}
 %exclude %{_kde4_libdir}/kde4/formulashape.*
 %endif
-%if 0%{?exiv2}
 %exclude %{_kde4_libdir}/kde4/kritashape.*
-%endif`
 %{_kde4_libdir}/libchartshapelib.so.*
 %{_kde4_libdir}/libkdchart.so.*
 %{_kde4_libdir}/libkochart.so.*
@@ -722,6 +712,9 @@
 
 
 %changelog
+* Thu Jan 08 2009 Rex Dieter <rdieter at fedoraproject.org> - 1:1.9.98.5-1
+- koffice-1.9.98.5, koffice2 beta 5 (take 2)
+
 * Wed Dec 31 2008 Rex Dieter <rdieter at fedoraproject.org> - 1:1.9.98.4-1
 - koffice-1.9.98.4 (koffice2 beta5) 
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/koffice/devel/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- sources	31 Dec 2008 15:29:56 -0000	1.24
+++ sources	9 Jan 2009 19:20:37 -0000	1.25
@@ -1 +1 @@
-60731c8886d850a45425b229f888f9b8  koffice-1.9.98.4.tar.bz2
+1525ca823dc39934a16cf1de0750ec11  koffice-1.9.98.5.tar.bz2



From awjb at fedoraproject.org  Fri Jan  9 19:26:54 2009
From: awjb at fedoraproject.org (Andreas Bierfert)
Date: Fri,  9 Jan 2009 19:26:54 +0000 (UTC)
Subject: rpms/ncmpc/F-10 ncmpc.spec,1.9,1.10
Message-ID: <20090109192654.E83A87011C@cvs1.fedora.phx.redhat.com>

Author: awjb

Update of /cvs/pkgs/rpms/ncmpc/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21986/F-10

Modified Files:
	ncmpc.spec 
Log Message:
autoconf <- automake



Index: ncmpc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ncmpc/F-10/ncmpc.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ncmpc.spec	9 Jan 2009 18:27:40 -0000	1.9
+++ ncmpc.spec	9 Jan 2009 19:26:24 -0000	1.10
@@ -14,7 +14,7 @@
 BuildRequires:  glib2-devel >= 2.4
 BuildRequires:  gettext
 BuildRequires:  lirc-devel
-BuildRequires:  autoconf
+BuildRequires:  autoconf automake
 
 %description
 ncmpc is a curses client for the Music Player Daemon (MPD). ncmpc connects to 
@@ -32,9 +32,6 @@
 
 autoreconf
 
-#aclocal
-#autoconf -f
-
 %build
 %configure --enable-wide --enable-nls --enable-colors --enable-lirc \
   --enable-artist-screen --with-ncursesw



From awjb at fedoraproject.org  Fri Jan  9 19:26:55 2009
From: awjb at fedoraproject.org (Andreas Bierfert)
Date: Fri,  9 Jan 2009 19:26:55 +0000 (UTC)
Subject: rpms/ncmpc/F-9 ncmpc.spec,1.9,1.10
Message-ID: <20090109192655.236867011C@cvs1.fedora.phx.redhat.com>

Author: awjb

Update of /cvs/pkgs/rpms/ncmpc/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21986/F-9

Modified Files:
	ncmpc.spec 
Log Message:
autoconf <- automake



Index: ncmpc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ncmpc/F-9/ncmpc.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ncmpc.spec	9 Jan 2009 18:27:41 -0000	1.9
+++ ncmpc.spec	9 Jan 2009 19:26:24 -0000	1.10
@@ -14,7 +14,7 @@
 BuildRequires:  glib2-devel >= 2.4
 BuildRequires:  gettext
 BuildRequires:  lirc-devel
-BuildRequires:  autoconf
+BuildRequires:  autoconf automake
 
 %description
 ncmpc is a curses client for the Music Player Daemon (MPD). ncmpc connects to 
@@ -32,9 +32,6 @@
 
 autoreconf
 
-#aclocal
-#autoconf -f
-
 %build
 %configure --enable-wide --enable-nls --enable-colors --enable-lirc \
   --enable-artist-screen --with-ncursesw



From awjb at fedoraproject.org  Fri Jan  9 19:26:55 2009
From: awjb at fedoraproject.org (Andreas Bierfert)
Date: Fri,  9 Jan 2009 19:26:55 +0000 (UTC)
Subject: rpms/ncmpc/devel ncmpc.spec,1.9,1.10
Message-ID: <20090109192655.6B61170141@cvs1.fedora.phx.redhat.com>

Author: awjb

Update of /cvs/pkgs/rpms/ncmpc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21986/devel

Modified Files:
	ncmpc.spec 
Log Message:
autoconf <- automake



Index: ncmpc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ncmpc/devel/ncmpc.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ncmpc.spec	9 Jan 2009 18:27:42 -0000	1.9
+++ ncmpc.spec	9 Jan 2009 19:26:25 -0000	1.10
@@ -14,7 +14,7 @@
 BuildRequires:  glib2-devel >= 2.4
 BuildRequires:  gettext
 BuildRequires:  lirc-devel
-BuildRequires:  autoconf
+BuildRequires:  autoconf automake
 
 %description
 ncmpc is a curses client for the Music Player Daemon (MPD). ncmpc connects to 
@@ -32,9 +32,6 @@
 
 autoreconf
 
-#aclocal
-#autoconf -f
-
 %build
 %configure --enable-wide --enable-nls --enable-colors --enable-lirc \
   --enable-artist-screen --with-ncursesw



From awjb at fedoraproject.org  Fri Jan  9 19:41:11 2009
From: awjb at fedoraproject.org (Andreas Bierfert)
Date: Fri,  9 Jan 2009 19:41:11 +0000 (UTC)
Subject: rpms/aterm/F-10 aterm.spec,1.19,1.20
Message-ID: <20090109194111.BCFCF7011C@cvs1.fedora.phx.redhat.com>

Author: awjb

Update of /cvs/pkgs/rpms/aterm/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23847/F-10

Modified Files:
	aterm.spec 
Log Message:
- fix #454936



Index: aterm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/aterm/F-10/aterm.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- aterm.spec	6 Sep 2008 07:49:57 -0000	1.19
+++ aterm.spec	9 Jan 2009 19:40:41 -0000	1.20
@@ -1,6 +1,6 @@
 Name:           aterm
 Version:        1.0.1
-Release:        3%{?dist}
+Release:        4%{?dist}
 
 Summary:        Afterstep XVT, VT102 emulator for the X Window system
 Group:          User Interface/X
@@ -18,6 +18,9 @@
 BuildRequires:  libXext-devel
 BuildRequires:  mesa-libGL-devel
 
+# fix #454936
+Requires: xorg-x11-fonts-misc
+
 %description
 aterm, version 1.00 is a colour vt102 terminal emulator, based on
 rxvt 2.4.8 with Alfredo Kojima??s additions of fast transparency,
@@ -67,6 +70,9 @@
 
 
 %changelog
+* Fri Jan 09 2009 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> - 1.0.1-4
+- fix #454936
+
 * Sat Sep 06 2008 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> - 1.0.1-3
 - fix #440779
 



From awjb at fedoraproject.org  Fri Jan  9 19:41:12 2009
From: awjb at fedoraproject.org (Andreas Bierfert)
Date: Fri,  9 Jan 2009 19:41:12 +0000 (UTC)
Subject: rpms/aterm/F-9 aterm.spec,1.19,1.20
Message-ID: <20090109194112.1316B7011C@cvs1.fedora.phx.redhat.com>

Author: awjb

Update of /cvs/pkgs/rpms/aterm/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23847/F-9

Modified Files:
	aterm.spec 
Log Message:
- fix #454936



Index: aterm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/aterm/F-9/aterm.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- aterm.spec	6 Sep 2008 07:49:57 -0000	1.19
+++ aterm.spec	9 Jan 2009 19:40:41 -0000	1.20
@@ -1,6 +1,6 @@
 Name:           aterm
 Version:        1.0.1
-Release:        3%{?dist}
+Release:        4%{?dist}
 
 Summary:        Afterstep XVT, VT102 emulator for the X Window system
 Group:          User Interface/X
@@ -18,6 +18,9 @@
 BuildRequires:  libXext-devel
 BuildRequires:  mesa-libGL-devel
 
+# fix #454936
+Requires: xorg-x11-fonts-misc
+
 %description
 aterm, version 1.00 is a colour vt102 terminal emulator, based on
 rxvt 2.4.8 with Alfredo Kojima??s additions of fast transparency,
@@ -67,6 +70,9 @@
 
 
 %changelog
+* Fri Jan 09 2009 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> - 1.0.1-4
+- fix #454936
+
 * Sat Sep 06 2008 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> - 1.0.1-3
 - fix #440779
 



From awjb at fedoraproject.org  Fri Jan  9 19:41:12 2009
From: awjb at fedoraproject.org (Andreas Bierfert)
Date: Fri,  9 Jan 2009 19:41:12 +0000 (UTC)
Subject: rpms/aterm/devel aterm.spec,1.19,1.20
Message-ID: <20090109194112.765C77011C@cvs1.fedora.phx.redhat.com>

Author: awjb

Update of /cvs/pkgs/rpms/aterm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23847/devel

Modified Files:
	aterm.spec 
Log Message:
- fix #454936



Index: aterm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/aterm/devel/aterm.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- aterm.spec	6 Sep 2008 07:49:57 -0000	1.19
+++ aterm.spec	9 Jan 2009 19:40:42 -0000	1.20
@@ -1,6 +1,6 @@
 Name:           aterm
 Version:        1.0.1
-Release:        3%{?dist}
+Release:        4%{?dist}
 
 Summary:        Afterstep XVT, VT102 emulator for the X Window system
 Group:          User Interface/X
@@ -18,6 +18,9 @@
 BuildRequires:  libXext-devel
 BuildRequires:  mesa-libGL-devel
 
+# fix #454936
+Requires: xorg-x11-fonts-misc
+
 %description
 aterm, version 1.00 is a colour vt102 terminal emulator, based on
 rxvt 2.4.8 with Alfredo Kojima??s additions of fast transparency,
@@ -67,6 +70,9 @@
 
 
 %changelog
+* Fri Jan 09 2009 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> - 1.0.1-4
+- fix #454936
+
 * Sat Sep 06 2008 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> - 1.0.1-3
 - fix #440779
 



From mdehaan at fedoraproject.org  Fri Jan  9 19:48:13 2009
From: mdehaan at fedoraproject.org (Michael DeHaan)
Date: Fri,  9 Jan 2009 19:48:13 +0000 (UTC)
Subject: rpms/koan/EL-4 .cvsignore, 1.25, 1.26 koan.spec, 1.30, 1.31 sources,
	1.29, 1.30
Message-ID: <20090109194813.EEF577011C@cvs1.fedora.phx.redhat.com>

Author: mdehaan

Update of /cvs/extras/rpms/koan/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20534/EL-4

Modified Files:
	.cvsignore koan.spec sources 
Log Message:
This is koan 1.4.1




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/koan/EL-4/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- .cvsignore	19 Dec 2008 17:49:18 -0000	1.25
+++ .cvsignore	9 Jan 2009 19:47:43 -0000	1.26
@@ -22,3 +22,4 @@
 koan-1.2.5.tar.gz
 koan-1.2.6.tar.gz
 koan-1.4.0.tar.gz
+koan-1.4.1.tar.gz


Index: koan.spec
===================================================================
RCS file: /cvs/extras/rpms/koan/EL-4/koan.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- koan.spec	19 Dec 2008 17:49:19 -0000	1.30
+++ koan.spec	9 Jan 2009 19:47:43 -0000	1.31
@@ -2,8 +2,8 @@
 
 Summary: Network provisioning tool for Xen and Bare Metal Machines 
 Name: koan
-Version: 1.4.0
-Release: 2%{?dist}
+Version: 1.4.1
+Release: 1%{?dist}
 Source0: %{name}-%{version}.tar.gz
 License: GPLv2+
 Group: Applications/System
@@ -11,8 +11,8 @@
 Requires: python >= 2.2
 BuildRequires: python-devel
 %if 0%{?fedora} >= 11 || 0%{?rhel} >= 6
-%{!?pyver: %define pyver %(%{__python} -c "import sys ; print sys.version[:3]")}
-Requires: python(abi)=%{pyver}
+%{!?pyver: %define pyver %(%{__python} -c "import sys ; print sys.version[:3]" || echo 0)}
+Requires: python(abi) = %{pyver}
 %endif
 %if 0%{?fedora} >= 8
 BuildRequires: python-setuptools-devel
@@ -53,13 +53,21 @@
 %dir %{python_sitelib}/koan
 %{python_sitelib}/koan/*.py*
 %{_mandir}/man1/koan.1.gz
-%defattr(755,-,-)
 %dir /var/log/koan
 
 %doc AUTHORS COPYING CHANGELOG README
 
 %changelog
 
+* Fri Jan 09 2009 Michael DeHaan <mdehaan at redhat.com> - 1.4.1-1
+- Upstream changes (see CHANGELOG)
+
+* Mon Dec 22 2008 Michael DeHaan <mdehaan at redhat.com> - 1.4.0-4
+- Fix python(abi) requirement some more
+
+* Mon Dec 22 2008 Michael DeHaan <mdehaan at redhat.com> - 1.4.0-3
+- Fix python(abi) requirement
+
 * Fri Dec 19 2008 Michael DeHaan <mdehaan at redhat.com> - 1.4.0-2
 - Upstream changes (see CHANGELOG)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/koan/EL-4/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- sources	19 Dec 2008 17:49:19 -0000	1.29
+++ sources	9 Jan 2009 19:47:43 -0000	1.30
@@ -4,3 +4,4 @@
 7fe17776b089550df83bf0f1245c0697  koan-1.2.5.tar.gz
 00bece567cfc240ad585e68955407bf7  koan-1.2.6.tar.gz
 942f732d4cc1781a62673aef26ad318c  koan-1.4.0.tar.gz
+eb4f0c6990dc295879a952243708fdaa  koan-1.4.1.tar.gz



From mdehaan at fedoraproject.org  Fri Jan  9 19:48:14 2009
From: mdehaan at fedoraproject.org (Michael DeHaan)
Date: Fri,  9 Jan 2009 19:48:14 +0000 (UTC)
Subject: rpms/koan/F-10 .cvsignore, 1.25, 1.26 koan.spec, 1.35, 1.36 sources,
	1.29, 1.30
Message-ID: <20090109194814.976CB7011C@cvs1.fedora.phx.redhat.com>

Author: mdehaan

Update of /cvs/extras/rpms/koan/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20534/F-10

Modified Files:
	.cvsignore koan.spec sources 
Log Message:
This is koan 1.4.1




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/koan/F-10/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- .cvsignore	19 Dec 2008 17:49:19 -0000	1.25
+++ .cvsignore	9 Jan 2009 19:47:44 -0000	1.26
@@ -22,3 +22,4 @@
 koan-1.2.5.tar.gz
 koan-1.2.6.tar.gz
 koan-1.4.0.tar.gz
+koan-1.4.1.tar.gz


Index: koan.spec
===================================================================
RCS file: /cvs/extras/rpms/koan/F-10/koan.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- koan.spec	19 Dec 2008 17:49:19 -0000	1.35
+++ koan.spec	9 Jan 2009 19:47:44 -0000	1.36
@@ -2,8 +2,8 @@
 
 Summary: Network provisioning tool for Xen and Bare Metal Machines 
 Name: koan
-Version: 1.4.0
-Release: 2%{?dist}
+Version: 1.4.1
+Release: 1%{?dist}
 Source0: %{name}-%{version}.tar.gz
 License: GPLv2+
 Group: Applications/System
@@ -11,8 +11,8 @@
 Requires: python >= 2.2
 BuildRequires: python-devel
 %if 0%{?fedora} >= 11 || 0%{?rhel} >= 6
-%{!?pyver: %define pyver %(%{__python} -c "import sys ; print sys.version[:3]")}
-Requires: python(abi)=%{pyver}
+%{!?pyver: %define pyver %(%{__python} -c "import sys ; print sys.version[:3]" || echo 0)}
+Requires: python(abi) = %{pyver}
 %endif
 %if 0%{?fedora} >= 8
 BuildRequires: python-setuptools-devel
@@ -53,13 +53,21 @@
 %dir %{python_sitelib}/koan
 %{python_sitelib}/koan/*.py*
 %{_mandir}/man1/koan.1.gz
-%defattr(755,-,-)
 %dir /var/log/koan
 
 %doc AUTHORS COPYING CHANGELOG README
 
 %changelog
 
+* Fri Jan 09 2009 Michael DeHaan <mdehaan at redhat.com> - 1.4.1-1
+- Upstream changes (see CHANGELOG)
+
+* Mon Dec 22 2008 Michael DeHaan <mdehaan at redhat.com> - 1.4.0-4
+- Fix python(abi) requirement some more
+
+* Mon Dec 22 2008 Michael DeHaan <mdehaan at redhat.com> - 1.4.0-3
+- Fix python(abi) requirement
+
 * Fri Dec 19 2008 Michael DeHaan <mdehaan at redhat.com> - 1.4.0-2
 - Upstream changes (see CHANGELOG)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/koan/F-10/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- sources	19 Dec 2008 17:49:19 -0000	1.29
+++ sources	9 Jan 2009 19:47:44 -0000	1.30
@@ -4,3 +4,4 @@
 7fe17776b089550df83bf0f1245c0697  koan-1.2.5.tar.gz
 00bece567cfc240ad585e68955407bf7  koan-1.2.6.tar.gz
 942f732d4cc1781a62673aef26ad318c  koan-1.4.0.tar.gz
+eb4f0c6990dc295879a952243708fdaa  koan-1.4.1.tar.gz



From mdehaan at fedoraproject.org  Fri Jan  9 19:48:14 2009
From: mdehaan at fedoraproject.org (Michael DeHaan)
Date: Fri,  9 Jan 2009 19:48:14 +0000 (UTC)
Subject: rpms/koan/EL-5 .cvsignore, 1.27, 1.28 koan.spec, 1.33, 1.34 sources,
	1.30, 1.31
Message-ID: <20090109194814.33FE27011C@cvs1.fedora.phx.redhat.com>

Author: mdehaan

Update of /cvs/extras/rpms/koan/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20534/EL-5

Modified Files:
	.cvsignore koan.spec sources 
Log Message:
This is koan 1.4.1




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/koan/EL-5/.cvsignore,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- .cvsignore	19 Dec 2008 17:49:19 -0000	1.27
+++ .cvsignore	9 Jan 2009 19:47:43 -0000	1.28
@@ -24,3 +24,4 @@
 koan-1.2.5.tar.gz
 koan-1.2.6.tar.gz
 koan-1.4.0.tar.gz
+koan-1.4.1.tar.gz


Index: koan.spec
===================================================================
RCS file: /cvs/extras/rpms/koan/EL-5/koan.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- koan.spec	19 Dec 2008 17:49:19 -0000	1.33
+++ koan.spec	9 Jan 2009 19:47:43 -0000	1.34
@@ -2,8 +2,8 @@
 
 Summary: Network provisioning tool for Xen and Bare Metal Machines 
 Name: koan
-Version: 1.4.0
-Release: 2%{?dist}
+Version: 1.4.1
+Release: 1%{?dist}
 Source0: %{name}-%{version}.tar.gz
 License: GPLv2+
 Group: Applications/System
@@ -11,8 +11,8 @@
 Requires: python >= 2.2
 BuildRequires: python-devel
 %if 0%{?fedora} >= 11 || 0%{?rhel} >= 6
-%{!?pyver: %define pyver %(%{__python} -c "import sys ; print sys.version[:3]")}
-Requires: python(abi)=%{pyver}
+%{!?pyver: %define pyver %(%{__python} -c "import sys ; print sys.version[:3]" || echo 0)}
+Requires: python(abi) = %{pyver}
 %endif
 %if 0%{?fedora} >= 8
 BuildRequires: python-setuptools-devel
@@ -53,13 +53,21 @@
 %dir %{python_sitelib}/koan
 %{python_sitelib}/koan/*.py*
 %{_mandir}/man1/koan.1.gz
-%defattr(755,-,-)
 %dir /var/log/koan
 
 %doc AUTHORS COPYING CHANGELOG README
 
 %changelog
 
+* Fri Jan 09 2009 Michael DeHaan <mdehaan at redhat.com> - 1.4.1-1
+- Upstream changes (see CHANGELOG)
+
+* Mon Dec 22 2008 Michael DeHaan <mdehaan at redhat.com> - 1.4.0-4
+- Fix python(abi) requirement some more
+
+* Mon Dec 22 2008 Michael DeHaan <mdehaan at redhat.com> - 1.4.0-3
+- Fix python(abi) requirement
+
 * Fri Dec 19 2008 Michael DeHaan <mdehaan at redhat.com> - 1.4.0-2
 - Upstream changes (see CHANGELOG)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/koan/EL-5/sources,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- sources	19 Dec 2008 17:49:19 -0000	1.30
+++ sources	9 Jan 2009 19:47:43 -0000	1.31
@@ -4,3 +4,4 @@
 7fe17776b089550df83bf0f1245c0697  koan-1.2.5.tar.gz
 00bece567cfc240ad585e68955407bf7  koan-1.2.6.tar.gz
 942f732d4cc1781a62673aef26ad318c  koan-1.4.0.tar.gz
+eb4f0c6990dc295879a952243708fdaa  koan-1.4.1.tar.gz



From mdehaan at fedoraproject.org  Fri Jan  9 19:48:14 2009
From: mdehaan at fedoraproject.org (Michael DeHaan)
Date: Fri,  9 Jan 2009 19:48:14 +0000 (UTC)
Subject: rpms/koan/F-9 .cvsignore, 1.25, 1.26 koan.spec, 1.34, 1.35 sources, 
	1.29, 1.30
Message-ID: <20090109194815.001D07011C@cvs1.fedora.phx.redhat.com>

Author: mdehaan

Update of /cvs/extras/rpms/koan/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20534/F-9

Modified Files:
	.cvsignore koan.spec sources 
Log Message:
This is koan 1.4.1




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/koan/F-9/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- .cvsignore	19 Dec 2008 17:49:20 -0000	1.25
+++ .cvsignore	9 Jan 2009 19:47:44 -0000	1.26
@@ -22,3 +22,4 @@
 koan-1.2.5.tar.gz
 koan-1.2.6.tar.gz
 koan-1.4.0.tar.gz
+koan-1.4.1.tar.gz


Index: koan.spec
===================================================================
RCS file: /cvs/extras/rpms/koan/F-9/koan.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- koan.spec	19 Dec 2008 17:49:20 -0000	1.34
+++ koan.spec	9 Jan 2009 19:47:44 -0000	1.35
@@ -2,8 +2,8 @@
 
 Summary: Network provisioning tool for Xen and Bare Metal Machines 
 Name: koan
-Version: 1.4.0
-Release: 2%{?dist}
+Version: 1.4.1
+Release: 1%{?dist}
 Source0: %{name}-%{version}.tar.gz
 License: GPLv2+
 Group: Applications/System
@@ -11,8 +11,8 @@
 Requires: python >= 2.2
 BuildRequires: python-devel
 %if 0%{?fedora} >= 11 || 0%{?rhel} >= 6
-%{!?pyver: %define pyver %(%{__python} -c "import sys ; print sys.version[:3]")}
-Requires: python(abi)=%{pyver}
+%{!?pyver: %define pyver %(%{__python} -c "import sys ; print sys.version[:3]" || echo 0)}
+Requires: python(abi) = %{pyver}
 %endif
 %if 0%{?fedora} >= 8
 BuildRequires: python-setuptools-devel
@@ -53,13 +53,21 @@
 %dir %{python_sitelib}/koan
 %{python_sitelib}/koan/*.py*
 %{_mandir}/man1/koan.1.gz
-%defattr(755,-,-)
 %dir /var/log/koan
 
 %doc AUTHORS COPYING CHANGELOG README
 
 %changelog
 
+* Fri Jan 09 2009 Michael DeHaan <mdehaan at redhat.com> - 1.4.1-1
+- Upstream changes (see CHANGELOG)
+
+* Mon Dec 22 2008 Michael DeHaan <mdehaan at redhat.com> - 1.4.0-4
+- Fix python(abi) requirement some more
+
+* Mon Dec 22 2008 Michael DeHaan <mdehaan at redhat.com> - 1.4.0-3
+- Fix python(abi) requirement
+
 * Fri Dec 19 2008 Michael DeHaan <mdehaan at redhat.com> - 1.4.0-2
 - Upstream changes (see CHANGELOG)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/koan/F-9/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- sources	19 Dec 2008 17:49:20 -0000	1.29
+++ sources	9 Jan 2009 19:47:44 -0000	1.30
@@ -4,3 +4,4 @@
 7fe17776b089550df83bf0f1245c0697  koan-1.2.5.tar.gz
 00bece567cfc240ad585e68955407bf7  koan-1.2.6.tar.gz
 942f732d4cc1781a62673aef26ad318c  koan-1.4.0.tar.gz
+eb4f0c6990dc295879a952243708fdaa  koan-1.4.1.tar.gz



From mdehaan at fedoraproject.org  Fri Jan  9 19:48:15 2009
From: mdehaan at fedoraproject.org (Michael DeHaan)
Date: Fri,  9 Jan 2009 19:48:15 +0000 (UTC)
Subject: rpms/koan/devel .cvsignore, 1.25, 1.26 koan.spec, 1.38, 1.39 sources,
	1.29, 1.30
Message-ID: <20090109194815.739B87011C@cvs1.fedora.phx.redhat.com>

Author: mdehaan

Update of /cvs/extras/rpms/koan/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20534/devel

Modified Files:
	.cvsignore koan.spec sources 
Log Message:
This is koan 1.4.1




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/koan/devel/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- .cvsignore	19 Dec 2008 17:49:20 -0000	1.25
+++ .cvsignore	9 Jan 2009 19:47:45 -0000	1.26
@@ -22,3 +22,4 @@
 koan-1.2.5.tar.gz
 koan-1.2.6.tar.gz
 koan-1.4.0.tar.gz
+koan-1.4.1.tar.gz


Index: koan.spec
===================================================================
RCS file: /cvs/extras/rpms/koan/devel/koan.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- koan.spec	22 Dec 2008 17:04:29 -0000	1.38
+++ koan.spec	9 Jan 2009 19:47:45 -0000	1.39
@@ -2,8 +2,8 @@
 
 Summary: Network provisioning tool for Xen and Bare Metal Machines 
 Name: koan
-Version: 1.4.0
-Release: 4444%{?dist}
+Version: 1.4.1
+Release: 1%{?dist}
 Source0: %{name}-%{version}.tar.gz
 License: GPLv2+
 Group: Applications/System
@@ -53,13 +53,15 @@
 %dir %{python_sitelib}/koan
 %{python_sitelib}/koan/*.py*
 %{_mandir}/man1/koan.1.gz
-%defattr(755,-,-)
 %dir /var/log/koan
 
 %doc AUTHORS COPYING CHANGELOG README
 
 %changelog
 
+* Fri Jan 09 2009 Michael DeHaan <mdehaan at redhat.com> - 1.4.1-1
+- Upstream changes (see CHANGELOG)
+
 * Mon Dec 22 2008 Michael DeHaan <mdehaan at redhat.com> - 1.4.0-4
 - Fix python(abi) requirement some more
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/koan/devel/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- sources	19 Dec 2008 17:49:21 -0000	1.29
+++ sources	9 Jan 2009 19:47:45 -0000	1.30
@@ -4,3 +4,4 @@
 7fe17776b089550df83bf0f1245c0697  koan-1.2.5.tar.gz
 00bece567cfc240ad585e68955407bf7  koan-1.2.6.tar.gz
 942f732d4cc1781a62673aef26ad318c  koan-1.4.0.tar.gz
+eb4f0c6990dc295879a952243708fdaa  koan-1.4.1.tar.gz



From rdieter at fedoraproject.org  Fri Jan  9 20:08:04 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri,  9 Jan 2009 20:08:04 +0000 (UTC)
Subject: rpms/koffice-langpack/devel .cvsignore, 1.11,
	1.12 koffice-langpack.spec, 1.15, 1.16 sources, 1.11, 1.12
Message-ID: <20090109200804.AD7127011C@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/koffice-langpack/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27759

Modified Files:
	.cvsignore koffice-langpack.spec sources 
Log Message:
* Fri Jan 09 2009 Rex Dieter <rdieter at fedoraproject.org> 1.9.98.5
- koffice-l10n-1.9.98.5



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/koffice-langpack/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	31 Dec 2008 20:35:32 -0000	1.11
+++ .cvsignore	9 Jan 2009 20:07:34 -0000	1.12
@@ -1,47 +1,39 @@
-koffice-l10n-ar-1.9.98.4.tar.bz2
-koffice-l10n-bg-1.9.98.4.tar.bz2
-koffice-l10n-br-1.9.98.4.tar.bz2
-koffice-l10n-ca-1.9.98.4.tar.bz2
-koffice-l10n-cs-1.9.98.4.tar.bz2
-koffice-l10n-cy-1.9.98.4.tar.bz2
-koffice-l10n-da-1.9.98.4.tar.bz2
-koffice-l10n-de-1.9.98.4.tar.bz2
-koffice-l10n-el-1.9.98.4.tar.bz2
-koffice-l10n-en_GB-1.9.98.4.tar.bz2
-koffice-l10n-eo-1.9.98.4.tar.bz2
-koffice-l10n-es-1.9.98.4.tar.bz2
-koffice-l10n-et-1.9.98.4.tar.bz2
-koffice-l10n-eu-1.9.98.4.tar.bz2
-koffice-l10n-fa-1.9.98.4.tar.bz2
-koffice-l10n-fi-1.9.98.4.tar.bz2
-koffice-l10n-fr-1.9.98.4.tar.bz2
-koffice-l10n-fy-1.9.98.4.tar.bz2
-koffice-l10n-ga-1.9.98.4.tar.bz2
-koffice-l10n-gl-1.9.98.4.tar.bz2
-koffice-l10n-he-1.9.98.4.tar.bz2
-koffice-l10n-hi-1.9.98.4.tar.bz2
-koffice-l10n-hu-1.9.98.4.tar.bz2
-koffice-l10n-it-1.9.98.4.tar.bz2
-koffice-l10n-ja-1.9.98.4.tar.bz2
-koffice-l10n-kk-1.9.98.4.tar.bz2
-koffice-l10n-km-1.9.98.4.tar.bz2
-koffice-l10n-ms-1.9.98.4.tar.bz2
-koffice-l10n-nb-1.9.98.4.tar.bz2
-koffice-l10n-nds-1.9.98.4.tar.bz2
-koffice-l10n-ne-1.9.98.4.tar.bz2
-koffice-l10n-nl-1.9.98.4.tar.bz2
-koffice-l10n-nn-1.9.98.4.tar.bz2
-koffice-l10n-pl-1.9.98.4.tar.bz2
-koffice-l10n-pt-1.9.98.4.tar.bz2
-koffice-l10n-pt_BR-1.9.98.4.tar.bz2
-koffice-l10n-ru-1.9.98.4.tar.bz2
-koffice-l10n-se-1.9.98.4.tar.bz2
-koffice-l10n-sk-1.9.98.4.tar.bz2
-koffice-l10n-sl-1.9.98.4.tar.bz2
-koffice-l10n-sv-1.9.98.4.tar.bz2
-koffice-l10n-ta-1.9.98.4.tar.bz2
-koffice-l10n-tg-1.9.98.4.tar.bz2
-koffice-l10n-tr-1.9.98.4.tar.bz2
-koffice-l10n-uk-1.9.98.4.tar.bz2
-koffice-l10n-zh_CN-1.9.98.4.tar.bz2
-koffice-l10n-zh_TW-1.9.98.4.tar.bz2
+koffice-l10n-ar-1.9.98.5.tar.bz2
+koffice-l10n-bg-1.9.98.5.tar.bz2
+koffice-l10n-ca-1.9.98.5.tar.bz2
+koffice-l10n-cy-1.9.98.5.tar.bz2
+koffice-l10n-da-1.9.98.5.tar.bz2
+koffice-l10n-de-1.9.98.5.tar.bz2
+koffice-l10n-el-1.9.98.5.tar.bz2
+koffice-l10n-en_GB-1.9.98.5.tar.bz2
+koffice-l10n-es-1.9.98.5.tar.bz2
+koffice-l10n-et-1.9.98.5.tar.bz2
+koffice-l10n-eu-1.9.98.5.tar.bz2
+koffice-l10n-fa-1.9.98.5.tar.bz2
+koffice-l10n-fi-1.9.98.5.tar.bz2
+koffice-l10n-fr-1.9.98.5.tar.bz2
+koffice-l10n-fy-1.9.98.5.tar.bz2
+koffice-l10n-ga-1.9.98.5.tar.bz2
+koffice-l10n-gl-1.9.98.5.tar.bz2
+koffice-l10n-hi-1.9.98.5.tar.bz2
+koffice-l10n-hu-1.9.98.5.tar.bz2
+koffice-l10n-it-1.9.98.5.tar.bz2
+koffice-l10n-ja-1.9.98.5.tar.bz2
+koffice-l10n-kk-1.9.98.5.tar.bz2
+koffice-l10n-ms-1.9.98.5.tar.bz2
+koffice-l10n-nb-1.9.98.5.tar.bz2
+koffice-l10n-nds-1.9.98.5.tar.bz2
+koffice-l10n-ne-1.9.98.5.tar.bz2
+koffice-l10n-nl-1.9.98.5.tar.bz2
+koffice-l10n-pl-1.9.98.5.tar.bz2
+koffice-l10n-pt-1.9.98.5.tar.bz2
+koffice-l10n-pt_BR-1.9.98.5.tar.bz2
+koffice-l10n-ru-1.9.98.5.tar.bz2
+koffice-l10n-sk-1.9.98.5.tar.bz2
+koffice-l10n-sl-1.9.98.5.tar.bz2
+koffice-l10n-sv-1.9.98.5.tar.bz2
+koffice-l10n-ta-1.9.98.5.tar.bz2
+koffice-l10n-tr-1.9.98.5.tar.bz2
+koffice-l10n-uk-1.9.98.5.tar.bz2
+koffice-l10n-zh_CN-1.9.98.5.tar.bz2
+koffice-l10n-zh_TW-1.9.98.5.tar.bz2


Index: koffice-langpack.spec
===================================================================
RCS file: /cvs/pkgs/rpms/koffice-langpack/devel/koffice-langpack.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- koffice-langpack.spec	2 Jan 2009 00:07:50 -0000	1.15
+++ koffice-langpack.spec	9 Jan 2009 20:07:34 -0000	1.16
@@ -1,6 +1,8 @@
 
+%define koffice_core_version 1.9.98
+
 Name:           koffice-langpack
-Version:        1.9.98.4
+Version:        1.9.98.5
 Release:        1%{?dist}
 Summary:        Language files for koffice
 
@@ -13,15 +15,15 @@
 Source0: teamnames
 Source1: ftp://ftp.kde.org/pub/kde/unstable/koffice-%{version}/src/koffice-l10n/koffice-l10n-ar-%{version}.tar.bz2
 Source2: ftp://ftp.kde.org/pub/kde/unstable/koffice-%{version}/src/koffice-l10n/koffice-l10n-bg-%{version}.tar.bz2
-Source3: ftp://ftp.kde.org/pub/kde/unstable/koffice-%{version}/src/koffice-l10n/koffice-l10n-br-%{version}.tar.bz2
+#Source3: ftp://ftp.kde.org/pub/kde/unstable/koffice-%{version}/src/koffice-l10n/koffice-l10n-br-%{version}.tar.bz2
 Source4: ftp://ftp.kde.org/pub/kde/unstable/koffice-%{version}/src/koffice-l10n/koffice-l10n-ca-%{version}.tar.bz2
-Source5: ftp://ftp.kde.org/pub/kde/unstable/koffice-%{version}/src/koffice-l10n/koffice-l10n-cs-%{version}.tar.bz2
+#Source5: ftp://ftp.kde.org/pub/kde/unstable/koffice-%{version}/src/koffice-l10n/koffice-l10n-cs-%{version}.tar.bz2
 Source6: ftp://ftp.kde.org/pub/kde/unstable/koffice-%{version}/src/koffice-l10n/koffice-l10n-cy-%{version}.tar.bz2
 Source7: ftp://ftp.kde.org/pub/kde/unstable/koffice-%{version}/src/koffice-l10n/koffice-l10n-da-%{version}.tar.bz2
 Source8: ftp://ftp.kde.org/pub/kde/unstable/koffice-%{version}/src/koffice-l10n/koffice-l10n-de-%{version}.tar.bz2
 Source9: ftp://ftp.kde.org/pub/kde/unstable/koffice-%{version}/src/koffice-l10n/koffice-l10n-el-%{version}.tar.bz2
 Source10:ftp://ftp.kde.org/pub/kde/unstable/koffice-%{version}/src/koffice-l10n/koffice-l10n-en_GB-%{version}.tar.bz2
-Source11:ftp://ftp.kde.org/pub/kde/unstable/koffice-%{version}/src/koffice-l10n/koffice-l10n-eo-%{version}.tar.bz2
+#Source11:ftp://ftp.kde.org/pub/kde/unstable/koffice-%{version}/src/koffice-l10n/koffice-l10n-eo-%{version}.tar.bz2
 Source12:ftp://ftp.kde.org/pub/kde/unstable/koffice-%{version}/src/koffice-l10n/koffice-l10n-es-%{version}.tar.bz2
 Source13:ftp://ftp.kde.org/pub/kde/unstable/koffice-%{version}/src/koffice-l10n/koffice-l10n-et-%{version}.tar.bz2
 Source14:ftp://ftp.kde.org/pub/kde/unstable/koffice-%{version}/src/koffice-l10n/koffice-l10n-eu-%{version}.tar.bz2
@@ -31,13 +33,13 @@
 Source18:ftp://ftp.kde.org/pub/kde/unstable/koffice-%{version}/src/koffice-l10n/koffice-l10n-fy-%{version}.tar.bz2
 Source19:ftp://ftp.kde.org/pub/kde/unstable/koffice-%{version}/src/koffice-l10n/koffice-l10n-ga-%{version}.tar.bz2
 Source20:ftp://ftp.kde.org/pub/kde/unstable/koffice-%{version}/src/koffice-l10n/koffice-l10n-gl-%{version}.tar.bz2
-Source21:ftp://ftp.kde.org/pub/kde/unstable/koffice-%{version}/src/koffice-l10n/koffice-l10n-he-%{version}.tar.bz2
+#Source21:ftp://ftp.kde.org/pub/kde/unstable/koffice-%{version}/src/koffice-l10n/koffice-l10n-he-%{version}.tar.bz2
 Source22:ftp://ftp.kde.org/pub/kde/unstable/koffice-%{version}/src/koffice-l10n/koffice-l10n-hi-%{version}.tar.bz2
 Source23:ftp://ftp.kde.org/pub/kde/unstable/koffice-%{version}/src/koffice-l10n/koffice-l10n-hu-%{version}.tar.bz2
 Source24:ftp://ftp.kde.org/pub/kde/unstable/koffice-%{version}/src/koffice-l10n/koffice-l10n-it-%{version}.tar.bz2
 Source25:ftp://ftp.kde.org/pub/kde/unstable/koffice-%{version}/src/koffice-l10n/koffice-l10n-ja-%{version}.tar.bz2
 Source26:ftp://ftp.kde.org/pub/kde/unstable/koffice-%{version}/src/koffice-l10n/koffice-l10n-kk-%{version}.tar.bz2
-Source27:ftp://ftp.kde.org/pub/kde/unstable/koffice-%{version}/src/koffice-l10n/koffice-l10n-km-%{version}.tar.bz2
+#Source27:ftp://ftp.kde.org/pub/kde/unstable/koffice-%{version}/src/koffice-l10n/koffice-l10n-km-%{version}.tar.bz2
 #Source27:ftp://ftp.kde.org/pub/kde/unstable/koffice-%{version}/src/koffice-l10n/koffice-l10n-lv-%{version}.tar.bz2
 Source28:ftp://ftp.kde.org/pub/kde/unstable/koffice-%{version}/src/koffice-l10n/koffice-l10n-ms-%{version}.tar.bz2
 Source29:ftp://ftp.kde.org/pub/kde/unstable/koffice-%{version}/src/koffice-l10n/koffice-l10n-nb-%{version}.tar.bz2
@@ -48,7 +50,7 @@
 Source34:ftp://ftp.kde.org/pub/kde/unstable/koffice-%{version}/src/koffice-l10n/koffice-l10n-pt-%{version}.tar.bz2
 Source35:ftp://ftp.kde.org/pub/kde/unstable/koffice-%{version}/src/koffice-l10n/koffice-l10n-pt_BR-%{version}.tar.bz2
 Source36:ftp://ftp.kde.org/pub/kde/unstable/koffice-%{version}/src/koffice-l10n/koffice-l10n-ru-%{version}.tar.bz2
-Source37:ftp://ftp.kde.org/pub/kde/unstable/koffice-%{version}/src/koffice-l10n/koffice-l10n-se-%{version}.tar.bz2
+#Source37:ftp://ftp.kde.org/pub/kde/unstable/koffice-%{version}/src/koffice-l10n/koffice-l10n-se-%{version}.tar.bz2
 Source38:ftp://ftp.kde.org/pub/kde/unstable/koffice-%{version}/src/koffice-l10n/koffice-l10n-sk-%{version}.tar.bz2
 Source39:ftp://ftp.kde.org/pub/kde/unstable/koffice-%{version}/src/koffice-l10n/koffice-l10n-sl-%{version}.tar.bz2
 #Source39:ftp://ftp.kde.org/pub/kde/unstable/koffice-%{version}/src/koffice-l10n/koffice-l10n-sr-%{version}.tar.bz2
@@ -70,405 +72,405 @@
 %package af
 Summary:        Afrikaans language pack for koffice
 Group:          Applications/Productivity
-Requires:       koffice-core >= %{version}
+Requires:       koffice-core >= %{koffice_core_version}
 %description af
 Provides additional Afrikaans translations for koffice
 
 %package ar
 Summary:        Arabic language pack for koffice
 Group:          Applications/Productivity
-Requires:       koffice-core >= %{version}
+Requires:       koffice-core >= %{koffice_core_version}
 %description ar
 Provides additional Arabic translations for koffice
 
 %package bs
 Summary:        Bosnian language pack for koffice
 Group:          Applications/Productivity
-Requires:       koffice-core >= %{version}
+Requires:       koffice-core >= %{koffice_core_version}
 %description bs
 Provides additional Bosnian translations for koffice
 
 %package br
 Summary:        Breton language pack for koffice
 Group:          Applications/Productivity
-Requires:       koffice-core >= %{version}
+Requires:       koffice-core >= %{koffice_core_version}
 %description br
 Provides additional Breton translations for koffice
 
 %package bg
 Summary:        Bulgarian language pack for koffice
 Group:          Applications/Productivity
-Requires:       koffice-core >= %{version}
+Requires:       koffice-core >= %{koffice_core_version}
 %description bg
 Provides additional Bulgarian translations for koffice
 
 %package ca
 Summary:        Catalan language pack for koffice
 Group:          Applications/Productivity
-Requires:       koffice-core >= %{version}
+Requires:       koffice-core >= %{koffice_core_version}
 %description ca
 Provides additional Catalan translations for koffice
 
 %package cs
 Summary:        Czech language pack for koffice
 Group:          Applications/Productivity
-Requires:       koffice-core >= %{version}
+Requires:       koffice-core >= %{koffice_core_version}
 %description cs
 Provides additional Czech translations for koffice
 
 %package cy
 Summary:        Welsh language pack for koffice
 Group:          Applications/Productivity
-Requires:       koffice-core >= %{version}
+Requires:       koffice-core >= %{koffice_core_version}
 %description cy
 Provides additional Delsh translations for koffice
 
 %package da
 Summary:        Danish language pack for koffice
 Group:          Applications/Productivity
-Requires:       koffice-core >= %{version}
+Requires:       koffice-core >= %{koffice_core_version}
 %description da
 Provides additional Danish translations for koffice
 
 %package de
 Summary:        German language pack for koffice
 Group:          Applications/Productivity
-Requires:       koffice-core >= %{version}
+Requires:       koffice-core >= %{koffice_core_version}
 %description de
 Provides additional German translations for koffice
 
 %package eo
 Summary:        Esperanto language pack for koffice
 Group:          Applications/Productivity
-Requires:       koffice-core >= %{version}
+Requires:       koffice-core >= %{koffice_core_version}
 %description eo
 Provides additional Esperanto translations for koffice
 
 %package el
 Summary:        Greek language pack for koffice
 Group:          Applications/Productivity
-Requires:       koffice-core >= %{version}
+Requires:       koffice-core >= %{koffice_core_version}
 %description el
 Provides additional Greek translations for koffice
 
 %package en_GB
 Summary:        British English language pack for koffice
 Group:          Applications/Productivity
-Requires:       koffice-core >= %{version}
+Requires:       koffice-core >= %{koffice_core_version}
 %description en_GB
 Provides additional British English translations for koffice
 
 %package es
 Summary:        Spanish language pack for koffice
 Group:          Applications/Productivity
-Requires:       koffice-core >= %{version}
+Requires:       koffice-core >= %{koffice_core_version}
 %description es
 Provides additional Spanish translations for koffice
 
 %package et
 Summary:        Estonian language pack for koffice
 Group:          Applications/Productivity
-Requires:       koffice-core >= %{version}
+Requires:       koffice-core >= %{koffice_core_version}
 %description et
 Provides additional Estonian translations for koffice
 
 %package eu
 Summary:        Basque language pack for koffice
 Group:          Applications/Productivity
-Requires:       koffice-core >= %{version}
+Requires:       koffice-core >= %{koffice_core_version}
 %description eu
 Provides additional Basque translations for koffice
 
 %package fa
 Summary:        Farsi language pack for koffice
 Group:          Applications/Productivity
-Requires:       koffice-core >= %{version}
+Requires:       koffice-core >= %{koffice_core_version}
 %description fa 
 Provides additional Farsi translations for koffice
 
 %package fi
 Summary:        Finish language pack for koffice
 Group:          Applications/Productivity
-Requires:       koffice-core >= %{version}
+Requires:       koffice-core >= %{koffice_core_version}
 %description fi
 Provides additional Finish translations for koffice
 
 %package fr
 Summary:        French language pack for koffice
 Group:          Applications/Productivity
-Requires:       koffice-core >= %{version}
+Requires:       koffice-core >= %{koffice_core_version}
 %description fr
 Provides additional French translations for koffice
 
 %package fy
 Summary:        Frisian language pack for koffice
 Group:          Applications/Productivity
-Requires:       koffice-core >= %{version}
+Requires:       koffice-core >= %{koffice_core_version}
 %description fy
 Provides additional Frisian translations for koffice
 
 %package ga
 Summary:        Irish-Gaelic language pack for koffice
 Group:          Applications/Productivity
-Requires:       koffice-core >= %{version}
+Requires:       koffice-core >= %{koffice_core_version}
 %description ga
 Provides additional Irish-Gaelic translations for koffice
 
 %package gl
 Summary:        Galician language pack for koffice
 Group:          Applications/Productivity
-Requires:       koffice-core >= %{version}
+Requires:       koffice-core >= %{koffice_core_version}
 %description gl
 Provides additional Galician translations for koffice
 
 %package he
 Summary:        Hebrew language pack for koffice
 Group:          Applications/Productivity
-Requires:       koffice-core >= %{version}
+Requires:       koffice-core >= %{koffice_core_version}
 %description he
 Provides additional Hebrew translations for koffice
 
 %package hi
 Summary:        Hindi language pack for koffice
 Group:          Applications/Productivity
-Requires:       koffice-core >= %{version}
+Requires:       koffice-core >= %{koffice_core_version}
 %description hi
 Provides additional Hindi translations for koffice
 
 %package hu
 Summary:        Hungarian language pack for koffice
 Group:          Applications/Productivity
-Requires:       koffice-core >= %{version}
+Requires:       koffice-core >= %{koffice_core_version}
 %description hu
 Provides additional Hungarian translations for koffice
 
 %package is
 Summary:        Icelandic language pack for koffice
 Group:          Applications/Productivity
-Requires:       koffice-core >= %{version}
+Requires:       koffice-core >= %{koffice_core_version}
 %description is
 Provides additional Icelandic translations for koffice
 
 %package it
 Summary:        Italian language pack for koffice
 Group:          Applications/Productivity
-Requires:       koffice-core >= %{version}
+Requires:       koffice-core >= %{koffice_core_version}
 %description it
 Provides additional Italian translations for koffice
 
 %package ja
 Summary:        Japanese language pack for koffice
 Group:          Applications/Productivity
-Requires:       koffice-core >= %{version}
+Requires:       koffice-core >= %{koffice_core_version}
 %description ja
 Provides additional Japanese translations for koffice
 
 %package kk
 Summary:        Kazakh language pack for koffice
 Group:          Applications/Productivity
-Requires:       koffice-core >= %{version}
+Requires:       koffice-core >= %{koffice_core_version}
 %description kk
 Provides additional Kazakh translations for koffice
 
 %package km
 Summary:        Khmer language pack for koffice
 Group:          Applications/Productivity
-Requires:       koffice-core >= %{version}
+Requires:       koffice-core >= %{koffice_core_version}
 %description km 
 Provides additional Khmer translations for koffice
 
 %package lt
 Summary:        Lithuanian language pack for koffice
 Group:          Applications/Productivity
-Requires:       koffice-core >= %{version}
+Requires:       koffice-core >= %{koffice_core_version}
 %description lt
 Provides additional Lithuanian translations for koffice
 
 %package lv
 Summary:        Lativian language pack for koffice
 Group:          Applications/Productivity
-Requires:       koffice-core >= %{version}
+Requires:       koffice-core >= %{koffice_core_version}
 %description lv
 Provides additional Lativian translations for koffice
 
 %package mk
 Summary:        Macedonian language pack for koffice
 Group:          Applications/Productivity
-Requires:       koffice-core >= %{version}
+Requires:       koffice-core >= %{koffice_core_version}
 %description mk
 Provides additional Macedonian translations for koffice
 
 %package ms
 Summary:        Malay language pack for koffice
 Group:          Applications/Productivity
-Requires:       koffice-core >= %{version}
+Requires:       koffice-core >= %{koffice_core_version}
 %description ms
 Provides additional Malay translations for koffice
 
 %package nb
 Summary:        Bokmal language pack for koffice
 Group:          Applications/Productivity
-Requires:       koffice-core >= %{version}
+Requires:       koffice-core >= %{koffice_core_version}
 %description nb
 Provides additional Bokmal translations for koffice
 
 %package nds 
 Summary:        Low Saxon language pack for koffice
 Group:          Applications/Productivity
-Requires:       koffice-core >= %{version}
+Requires:       koffice-core >= %{koffice_core_version}
 %description nds 
 Provides additional Low Saxon translations for koffice
 
 %package ne
 Summary:        Nepali language pack for koffice
 Group:          Applications/Productivity
-Requires:       koffice-core >= %{version}
+Requires:       koffice-core >= %{koffice_core_version}
 %description ne 
 Provides additional Nepali translations for koffice
 
 %package nl
 Summary:        Dutch language pack for koffice
 Group:          Applications/Productivity
-Requires:       koffice-core >= %{version}
+Requires:       koffice-core >= %{koffice_core_version}
 %description nl
 Provides additional Dutch translations for koffice
 
 %package nn
 Summary:        Nynorsk language pack for koffice
 Group:          Applications/Productivity
-Requires:       koffice-core >= %{version}
+Requires:       koffice-core >= %{koffice_core_version}
 %description nn
 Provides additional Nynorsk translations for koffice
 
 %package pl
 Summary:        Polish language pack for koffice
 Group:          Applications/Productivity
-Requires:       koffice-core >= %{version}
+Requires:       koffice-core >= %{koffice_core_version}
 %description pl
 Provides additional Polish translations for koffice
 
 %package pt_BR
 Summary:        Brazilian Portuguese language pack for koffice
 Group:          Applications/Productivity
-Requires:       koffice-core >= %{version}
+Requires:       koffice-core >= %{koffice_core_version}
 %description pt_BR
 Provides additional Brazilian Portuguese translations for koffice
 
 %package pt
 Summary:        Portuguese language pack for koffice
 Group:          Applications/Productivity
-Requires:       koffice-core >= %{version}
+Requires:       koffice-core >= %{koffice_core_version}
 %description pt
 Provides additional Portuguese translations for koffice
 
 %package ru
 Summary:        Russian language pack for koffice
 Group:          Applications/Productivity
-Requires:       koffice-core >= %{version}
+Requires:       koffice-core >= %{koffice_core_version}
 %description ru
 Provides additional Russian translations for koffice
 
 %package ro
 Summary:        Romanian language pack for koffice
 Group:          Applications/Productivity
-Requires:       koffice-core >= %{version}
+Requires:       koffice-core >= %{koffice_core_version}
 %description ro
 Provides additional Romanian translations for koffice
 
 %package se
 Summary:        Northern Sami language pack for koffice
 Group:          Applications/Productivity
-Requires:       koffice-core >= %{version}
+Requires:       koffice-core >= %{koffice_core_version}
 %description se
 Provides additional Northern Sami translations for koffice
 
 %package sk
 Summary:        Slovak language pack for koffice
 Group:          Applications/Productivity
-Requires:       koffice-core >= %{version}
+Requires:       koffice-core >= %{koffice_core_version}
 %description sk
 Provides additional Slovak translations for koffice
 
 %package sl
 Summary:        Slovenian language pack for koffice
 Group:          Applications/Productivity
-Requires:       koffice-core >= %{version}
+Requires:       koffice-core >= %{koffice_core_version}
 %description sl
 Provides additional Slovenian translations for koffice
 
 %package sr-Latn
 Summary:        Serbian in Latin language pack for koffice
 Group:          Applications/Productivity
-Requires:       koffice-core >= %{version}
+Requires:       koffice-core >= %{koffice_core_version}
 %description sr-Latn
 Provides additional Serbian in latin translations for koffice
 
 %package sr
 Summary:        Serbian language pack for koffice
 Group:          Applications/Productivity
-Requires:       koffice-core >= %{version}
+Requires:       koffice-core >= %{koffice_core_version}
 %description sr
 Provides additional Serbian translations for koffice
 
 %package sv
 Summary:        Swedish language pack for koffice
 Group:          Applications/Productivity
-Requires:       koffice-core >= %{version}
+Requires:       koffice-core >= %{koffice_core_version}
 %description sv
 Provides additional Swedish translations for koffice
 
 %package ta
 Summary:        Tamil language pack for koffice
 Group:          Applications/Productivity
-Requires:       koffice-core >= %{version}
+Requires:       koffice-core >= %{koffice_core_version}
 %description ta
 Provides additional Tamil translations for koffice
 
 %package tg
 Summary:        Tajik language pack for koffice
 Group:          Applications/Productivity
-Requires:       koffice-core >= %{version}
+Requires:       koffice-core >= %{koffice_core_version}
 %description tg
 Provides additional Tajik translations for koffice
 
 %package tr
 Summary:        Turkish language pack for koffice
 Group:          Applications/Productivity
-Requires:       koffice-core >= %{version}
+Requires:       koffice-core >= %{koffice_core_version}
 %description tr
 Provides additional Turkish translations for koffice
 
 %package uk
 Summary:        Ukrainian language pack for koffice
 Group:          Applications/Productivity
-Requires:       koffice-core >= %{version}
+Requires:       koffice-core >= %{koffice_core_version}
 %description uk
 Provides additional Ukrainian translations for koffice
 
 %package uz
 Summary:        Uzbek language pack for koffice
 Group:          Applications/Productivity
-Requires:       koffice-core >= %{version}
+Requires:       koffice-core >= %{koffice_core_version}
 %description uz
 Provides additional Uzbek translations for koffice
 
 %package zh_CN
 Summary:        Simplified Chinese language pack for koffice
 Group:          Applications/Productivity
-Requires:       koffice-core >= %{version}
+Requires:       koffice-core >= %{koffice_core_version}
 %description zh_CN
 Provides additional simplified chinese translations for koffice
 
 %package zh_TW
 Summary:        Traditional Chinese language pack for koffice
 Group:          Applications/Productivity
-Requires:       koffice-core >= %{version}
+Requires:       koffice-core >= %{koffice_core_version}
 %description zh_TW
 Provides additional traditional Chinese translations for koffice
 
 
 %prep
-%setup -T -c -q -n %{name} -a 1  -a 2  -a 3  -a 4  -a 5  -a 6  -a 7  -a 8  -a 9  -a 10 -a 11 -a 12 -a 13 -a 14 -a 15 -a 16 -a 17 -a 18 -a 19 -a 20 -a 21 -a 22 -a 23 -a 24 -a 25 -a 26 -a 28 -a 29 -a 30 -a 31 -a 32 -a 33 -a 34 -a 35 -a 36 -a 37 -a 38 -a 39 -a 40 -a 41 -a 42 -a 44 -a 45 
+%setup -T -c -q -n %{name} -a 1  -a 2 -a 4 -a 6  -a 7  -a 8  -a 9  -a 10 -a 12 -a 13 -a 14 -a 15 -a 16 -a 17 -a 18 -a 19 -a 20 -a 22 -a 23 -a 24 -a 25 -a 26 -a 28 -a 29 -a 30 -a 31 -a 32 -a 33 -a 34 -a 35 -a 36 -a 38 -a 39 -a 40 -a 41 -a 42 -a 44 -a 45 
 
 
 %build
@@ -523,18 +525,18 @@
 %files bg
 %lang(bg) %{_datadir}/locale/bg/LC_MESSAGES/*
 
-%files br
-%lang(br) %{_datadir}/locale/br/LC_MESSAGES/*
+#files br
+#lang(br) %{_datadir}/locale/br/LC_MESSAGES/*
 
 %files ca
 %lang(ca) %{_datadir}/locale/ca/LC_MESSAGES/*
 %lang(ca) %{_kde4_appsdir}/koffice/autocorrect/ca.xml
 %lang(ca) %{_kde4_docdir}/HTML/ca/*
 
-%files cs
-%defattr(-,root,root,-)
-%lang(cs) %{_datadir}/locale/cs/LC_MESSAGES/*
-%lang(cs) %{_kde4_appsdir}/koffice/autocorrect/cs.xml
+#files cs
+#defattr(-,root,root,-)
+#lang(cs) %{_datadir}/locale/cs/LC_MESSAGES/*
+#lang(cs) %{_kde4_appsdir}/koffice/autocorrect/cs.xml
 
 %files cy
 %defattr(-,root,root,-)
@@ -559,9 +561,9 @@
 %defattr(-,root,root,-)
 %lang(en_GB) %{_datadir}/locale/en_GB/LC_MESSAGES/*
 
-%files eo
-%defattr(-,root,root,-)
-%lang(eo) %{_datadir}/locale/eo/LC_MESSAGES/*
+#files eo
+#defattr(-,root,root,-)
+#lang(eo) %{_datadir}/locale/eo/LC_MESSAGES/*
 
 %files es
 %defattr(-,root,root,-)
@@ -605,9 +607,9 @@
 %lang(gl) %{_datadir}/locale/gl/LC_MESSAGES/*
 %lang(gl) %{_kde4_docdir}/HTML/gl/*
 
-%files he 
-%defattr(-,root,root,-)
-%lang(he) %{_datadir}/locale/he/LC_MESSAGES/*
+#files he 
+#defattr(-,root,root,-)
+#lang(he) %{_datadir}/locale/he/LC_MESSAGES/*
 
 %files hi 
 %defattr(-,root,root,-)
@@ -638,7 +640,6 @@
 %defattr(-,root,root,-)
 %lang(kk) %{_datadir}/locale/kk/LC_MESSAGES/*
 
-# FIXME: empty?
 #files km 
 #defattr(-,root,root,-)
 #lang(km) %{_datadir}/locale/km/LC_MESSAGES/*
@@ -685,9 +686,9 @@
 %lang(ru) %{_datadir}/locale/ru/LC_MESSAGES/*
 %lang(ru) %{_kde4_docdir}/HTML/ru/*
 
-%files se
-%defattr(-,root,root,-)
-%lang(se) %{_datadir}/locale/se/LC_MESSAGES/*
+#files se
+#defattr(-,root,root,-)
+#lang(se) %{_datadir}/locale/se/LC_MESSAGES/*
 
 %files sk
 %defattr(-,root,root,-)
@@ -735,6 +736,9 @@
 
 
 %changelog
+* Fri Jan 09 2009 Rex Dieter <rdieter at fedoraproject.org> 1.9.98.5
+- koffice-l10n-1.9.98.5
+
 * Sun Dec 09 2007 Rex Dieter <rdieter[AT]fedoraproject.org>
 1.6.3-2
 - BR: kdelibs3-devel


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/koffice-langpack/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	31 Dec 2008 20:35:32 -0000	1.11
+++ sources	9 Jan 2009 20:07:34 -0000	1.12
@@ -1,47 +1,39 @@
-1ed87c58f5377ebb8f540b3eb730be6a  koffice-l10n-ar-1.9.98.4.tar.bz2
-c86a015aece29d0bd396e32a47c21ad0  koffice-l10n-bg-1.9.98.4.tar.bz2
-5dc8641d05879c5de0660cea78b11115  koffice-l10n-br-1.9.98.4.tar.bz2
-61f27a8ed64591ccae28ed5313cad710  koffice-l10n-ca-1.9.98.4.tar.bz2
-a45dbc51f10697f4486dd35ba50f219e  koffice-l10n-cs-1.9.98.4.tar.bz2
-f3c17b0f9f677d79c10307cc1f02a247  koffice-l10n-cy-1.9.98.4.tar.bz2
-d287db67a709a15374ddcaf7623feb98  koffice-l10n-da-1.9.98.4.tar.bz2
-3de79c2abbb4a4ca60ace2c0d41fde30  koffice-l10n-de-1.9.98.4.tar.bz2
-40f7e907318e5f49d6f14867fbeac1d4  koffice-l10n-el-1.9.98.4.tar.bz2
-fc5655e042d30233c189459ad8d31a4a  koffice-l10n-en_GB-1.9.98.4.tar.bz2
-3f626d5de17d47b2e4ee51edf2ec5b00  koffice-l10n-eo-1.9.98.4.tar.bz2
-62df45419b9c0e350549e871e5b9751b  koffice-l10n-es-1.9.98.4.tar.bz2
-ac5f917257672d2afef181e6dcd6ca41  koffice-l10n-et-1.9.98.4.tar.bz2
-4629c317882872cc532f1a83eca3a4b2  koffice-l10n-eu-1.9.98.4.tar.bz2
-0ae23359a024339bb705cd698102b242  koffice-l10n-fa-1.9.98.4.tar.bz2
-6a6a94586b33fc76775c66ea08047def  koffice-l10n-fi-1.9.98.4.tar.bz2
-34780dd9f0b4d470872e0c25a745272d  koffice-l10n-fr-1.9.98.4.tar.bz2
-538e478d312ff8a385081d8a84f66820  koffice-l10n-fy-1.9.98.4.tar.bz2
-011c9b95da4705e44d7bc4c50643e611  koffice-l10n-ga-1.9.98.4.tar.bz2
-d8910bd8100f5e9f7fc0423cdb7faf1a  koffice-l10n-gl-1.9.98.4.tar.bz2
-60423b97dce11ffc3e7b37f11489837f  koffice-l10n-he-1.9.98.4.tar.bz2
-befa31f72e1f6a5040110db01cc56ca6  koffice-l10n-hi-1.9.98.4.tar.bz2
-423aa853f70a86fbc89a07b52431e6ba  koffice-l10n-hu-1.9.98.4.tar.bz2
-15f8b3e22ddfeb03f8de5ef89aade565  koffice-l10n-it-1.9.98.4.tar.bz2
-712cbff0b5d91c86f6aa391dbf9025df  koffice-l10n-ja-1.9.98.4.tar.bz2
-d26f32312e81e59110e4a27a6431563c  koffice-l10n-kk-1.9.98.4.tar.bz2
-27c73bc6625327b16f6c8441c5cb4e2d  koffice-l10n-km-1.9.98.4.tar.bz2
-7308225fdd58250ae839e0cd2bf37c37  koffice-l10n-ms-1.9.98.4.tar.bz2
-6a8dba2d500d758c193ccfe91d8615fd  koffice-l10n-nb-1.9.98.4.tar.bz2
-5ab7ed59c1a93ede5c07d2f64c8e3bd9  koffice-l10n-nds-1.9.98.4.tar.bz2
-ef07321f2b9889dcd422bd20e5648a12  koffice-l10n-ne-1.9.98.4.tar.bz2
-23b52e72e1cc5e3b32f32941b146dafc  koffice-l10n-nl-1.9.98.4.tar.bz2
-49b11bf865c24f54e87b03b1e8ca0ba7  koffice-l10n-nn-1.9.98.4.tar.bz2
-6727fbcc6dd991b50dcf3f52050ec25a  koffice-l10n-pl-1.9.98.4.tar.bz2
-293bbce42d938218db02a52f536f5020  koffice-l10n-pt-1.9.98.4.tar.bz2
-00084c4fe2973ba00633e486002b7b68  koffice-l10n-pt_BR-1.9.98.4.tar.bz2
-42f169d9c500a1d862277cd9b17e7052  koffice-l10n-ru-1.9.98.4.tar.bz2
-71515a7e334fd0d24b92a8385ccd74ff  koffice-l10n-se-1.9.98.4.tar.bz2
-7dc484af39cc9860c5b5bad1356c9a1b  koffice-l10n-sk-1.9.98.4.tar.bz2
-0d6dd0a7bc3d5bf69e287e9b7d6c3e33  koffice-l10n-sl-1.9.98.4.tar.bz2
-5147b2e747a1351a3782fede60bed3a1  koffice-l10n-sv-1.9.98.4.tar.bz2
-fb68ba5ad9a3dc12e2841048d1cd9b6d  koffice-l10n-ta-1.9.98.4.tar.bz2
-a9d1becb6d4ac009fe3b0505f287a4ee  koffice-l10n-tg-1.9.98.4.tar.bz2
-ebb3402a71cb4445a91646eb1e2a4110  koffice-l10n-tr-1.9.98.4.tar.bz2
-bbcaf252dbbabcbeaf34b3b6d57c3d95  koffice-l10n-uk-1.9.98.4.tar.bz2
-96e6e62e095b2c5688962c582782de4a  koffice-l10n-zh_CN-1.9.98.4.tar.bz2
-87f0225ffde5597c63fa5b75151600a4  koffice-l10n-zh_TW-1.9.98.4.tar.bz2
+c025b083f6ad5967af828c3c275344d7  koffice-l10n-ar-1.9.98.5.tar.bz2
+b09ed3606d16b64b18918e0267e6a2a1  koffice-l10n-bg-1.9.98.5.tar.bz2
+1a41330475f9eafacdf4544fc58be6e5  koffice-l10n-ca-1.9.98.5.tar.bz2
+7f48d1c9de650e61411ef8bb25a94f19  koffice-l10n-cy-1.9.98.5.tar.bz2
+ada40077f5d1936c5edeed5322f77c2f  koffice-l10n-da-1.9.98.5.tar.bz2
+b1abc63d1a7db08d288746d3ff8af94c  koffice-l10n-de-1.9.98.5.tar.bz2
+80a7788a9953ccbc6b3eebf25646d816  koffice-l10n-el-1.9.98.5.tar.bz2
+d3ddde8c840bcfed09e9ade429ec914a  koffice-l10n-en_GB-1.9.98.5.tar.bz2
+f6a842ddcab41cfb669228366fe5d6ad  koffice-l10n-es-1.9.98.5.tar.bz2
+9b17c4b738b2d435f67abdf8f29da58b  koffice-l10n-et-1.9.98.5.tar.bz2
+d4b2b9d87bb8055e67604e227b563e7a  koffice-l10n-eu-1.9.98.5.tar.bz2
+5ef77a9c344bb6900df02965b4b125aa  koffice-l10n-fa-1.9.98.5.tar.bz2
+3d7ccc7de640dda9b31862441df5d06a  koffice-l10n-fi-1.9.98.5.tar.bz2
+9fb5e2fc3d90a5d03b7f1a15f71103eb  koffice-l10n-fr-1.9.98.5.tar.bz2
+6635ab63beb3ebcd626630c33a3bf341  koffice-l10n-fy-1.9.98.5.tar.bz2
+0742647955c21c5b4b244e62b6ddc010  koffice-l10n-ga-1.9.98.5.tar.bz2
+74655b5d541e48d4d7ee6e418fb84b76  koffice-l10n-gl-1.9.98.5.tar.bz2
+47cc7f5af15addc88a4a2994f7890073  koffice-l10n-hi-1.9.98.5.tar.bz2
+770344f98e3283c491905e6698a298ea  koffice-l10n-hu-1.9.98.5.tar.bz2
+656031cac2469eca4e9c47b1ce7f1df1  koffice-l10n-it-1.9.98.5.tar.bz2
+b615d465a2760e6a158c1c4bbc32ce0e  koffice-l10n-ja-1.9.98.5.tar.bz2
+c4d8c692ee0aa2867d7a856c49818c08  koffice-l10n-kk-1.9.98.5.tar.bz2
+5cce3e8a134c5a99fb42f3a48fd3072f  koffice-l10n-ms-1.9.98.5.tar.bz2
+38dbd03a5960f164db4029946d12e62c  koffice-l10n-nb-1.9.98.5.tar.bz2
+501156da29fea429ae4094487c814501  koffice-l10n-nds-1.9.98.5.tar.bz2
+637a6ec37c0b33b8c111683085695013  koffice-l10n-ne-1.9.98.5.tar.bz2
+b18a80e4d797c11ec77590175c58af4a  koffice-l10n-nl-1.9.98.5.tar.bz2
+cf8aabef57435ff16687adc91cd6d889  koffice-l10n-pl-1.9.98.5.tar.bz2
+d4ceab3b3d2da7f4ad0dae041428847e  koffice-l10n-pt-1.9.98.5.tar.bz2
+ef23ea5a20706c31cc193cb1c28174c6  koffice-l10n-pt_BR-1.9.98.5.tar.bz2
+df5e6e893767cc9801c2df84dddb13a1  koffice-l10n-ru-1.9.98.5.tar.bz2
+5df4a847f4d7afb8ddeb602ab6d84122  koffice-l10n-sk-1.9.98.5.tar.bz2
+9cf611622af261c12781a8b6797ecfa6  koffice-l10n-sl-1.9.98.5.tar.bz2
+ef8be63c8f2e350dba7e327f8136f458  koffice-l10n-sv-1.9.98.5.tar.bz2
+f53f80a59e6b549bb4c10615b646ff7c  koffice-l10n-ta-1.9.98.5.tar.bz2
+c5bfc465894289f511fb1dbababc8d25  koffice-l10n-tr-1.9.98.5.tar.bz2
+e23a25fb3efddcd0c42222aa46d1d8cc  koffice-l10n-uk-1.9.98.5.tar.bz2
+abc5612aea4224b03ab83c888fb45e31  koffice-l10n-zh_CN-1.9.98.5.tar.bz2
+5045c252a18ed5db1231b312d6a82cd2  koffice-l10n-zh_TW-1.9.98.5.tar.bz2



From awjb at fedoraproject.org  Fri Jan  9 20:20:36 2009
From: awjb at fedoraproject.org (Andreas Bierfert)
Date: Fri,  9 Jan 2009 20:20:36 +0000 (UTC)
Subject: rpms/libopensync/devel libopensync.spec,1.25,1.26
Message-ID: <20090109202036.485A07011C@cvs1.fedora.phx.redhat.com>

Author: awjb

Update of /cvs/pkgs/rpms/libopensync/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29422

Modified Files:
	libopensync.spec 
Log Message:
- fix swig version



Index: libopensync.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libopensync/devel/libopensync.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- libopensync.spec	29 Nov 2008 16:48:03 -0000	1.25
+++ libopensync.spec	9 Jan 2009 20:20:05 -0000	1.26
@@ -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:        4%{?dist}
+Release:        5%{?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.35/ ../
+    -DSWIG_DIR=/usr/share/swig/1.3.36/ ../
 make VERBOSE=1 %{?_smp_mflags}
 
 %install
@@ -91,6 +91,10 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Fri Jan 09 2009 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> - 0.36-5
+- fix swig version
+
+
 * Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 0.36-4
 - Rebuild for Python 2.6
 



From than at fedoraproject.org  Fri Jan  9 20:26:16 2009
From: than at fedoraproject.org (Than Ngo)
Date: Fri,  9 Jan 2009 20:26:16 +0000 (UTC)
Subject: rpms/PolicyKit-kde/devel PolicyKit-kde.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090109202616.18B797011C@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/PolicyKit-kde/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30540

Modified Files:
	.cvsignore sources 
Added Files:
	PolicyKit-kde.spec 
Log Message:
PolicyKit-kde



--- NEW FILE PolicyKit-kde.spec ---
%define _develpackage 0
%define _version 0.0
%define _svndate 20081219svn

Name: PolicyKit-kde
Version: %{_version}
Release: 0.%{_svndate}%{?dist}
Summary: PolicyKit integration for the KDE desktop

Group: System Environment/Libraries
License: GPLv2+ and LGPLv2+
URL: http://www.kde.org
Source0: %{name}-%{_svndate}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  kdelibs4-devel >= 4.1
BuildRequires:  PolicyKit-devel >= 0.8
BuildRequires:  cmake

%description
This package provides a PolicyKit Authentication Frontend for KDE

%package devel
Summary: Headers and libraries for PolicyKit-kde
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
Requires: dbus-devel

%description devel
Headers and libraries for PolicyKit-kde

%prep
%setup -qn %{name}

%build
mkdir -p %{_target_platform}
pushd %{_target_platform}
%{cmake_kde4} ..
popd


make %{?_smp_mflags} -C %{_target_platform}


%install
rm -rf %{buildroot}

make install/fast DESTDIR=%{buildroot} -C %{_target_platform}

%clean
rm -rf %{buildroot}

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files
%defattr(-,root,root,-)
%doc COPYING
%{_kde4_bindir}/*
%{_kde4_libdir}/libpolkitkdeprivate*.so.*
%{_kde4_libdir}/kde4/*
%{_kde4_datadir}/dbus-1/services/*
%{_kde4_libexecdir}/*
%{_kde4_sharedir}/kde4/services/*

%if %{_develpackage}
%files devel
%defattr(-,root,root,-)
%{_kde4_libdir}/*.so
%else
%exclude %{_kde4_libdir}/*.so
%endif

%changelog
* Thu Jan 08 2009 Than Ngo <than at redhat.com> - 0.0-0.20081219svn
- initial version


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/PolicyKit-kde/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	9 Jan 2009 05:37:03 -0000	1.1
+++ .cvsignore	9 Jan 2009 20:25:45 -0000	1.2
@@ -0,0 +1 @@
+PolicyKit-kde-20081219svn.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/PolicyKit-kde/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	9 Jan 2009 05:37:03 -0000	1.1
+++ sources	9 Jan 2009 20:25:45 -0000	1.2
@@ -0,0 +1 @@
+30ba8b723282ecea8c3ee471493f90c5  PolicyKit-kde-20081219svn.tar.bz2



From rdieter at fedoraproject.org  Fri Jan  9 20:41:59 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri,  9 Jan 2009 20:41:59 +0000 (UTC)
Subject: rpms/eigen2/devel eigen2-svn_checkout.sh, NONE, 1.1 .cvsignore, 1.6,
	1.7 eigen2.spec, 1.5, 1.6 sources, 1.6, 1.7
Message-ID: <20090109204159.6C6447011C@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/eigen2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1124

Modified Files:
	.cvsignore eigen2.spec sources 
Added Files:
	eigen2-svn_checkout.sh 
Log Message:
* Fri Jan 09 2009 Rex Dieter <rdieter at fedoraproject.org> 2.0-0.8.20090109svn
- eigen2-20090109svn snapshot



--- NEW FILE eigen2-svn_checkout.sh ---
#/bin/sh

DATE=$(date +%Y%m%d)
EXPORT_DIR=eigen2

set -x
rm -rf $EXPORT_DIR
# app
svn export svn://anonsvn.kde.org/home/kde/trunk/kdesupport/eigen2 $EXPORT_DIR/

tar cjf $EXPORT_DIR-${DATE}svn.tar.bz2 $EXPORT_DIR

# cleanup
rm -rf $EXPORT_DIR



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/eigen2/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	6 Jan 2009 14:54:24 -0000	1.6
+++ .cvsignore	9 Jan 2009 20:41:28 -0000	1.7
@@ -1 +1 @@
-eigen-2.0-beta5.tar.bz2
+eigen2-20090109svn.tar.bz2


Index: eigen2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eigen2/devel/eigen2.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- eigen2.spec	6 Jan 2009 14:54:24 -0000	1.5
+++ eigen2.spec	9 Jan 2009 20:41:28 -0000	1.6
@@ -2,17 +2,21 @@
 # Fedora package review
 # http://bugzilla.redhat.com/459705
 
-%define _with_check -DBUILD_TESTS=ON 
-%define pre beta5
+%define _with_check -DEIGEN_BUILD_TESTS:BOOL=ON
+#define pre beta5
+%define snap 20090109
+
 
 Name:    eigen2
 Summary: A lightweight C++ template library for vector and matrix math
 Version: 2.0 
-Release: 0.7.%{pre}%{?dist} 
+Release: 0.8.%{snap}svn%{?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
+#Source0: http://download.tuxfamily.org/eigen/eigen-%{version}-%{pre}.tar.bz2
+Source0: eigen2-%{snap}svn.tar.bz2
+Source1: eigen2-svn_checkout.sh
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 
@@ -27,7 +31,15 @@
 BuildRequires: tetex-latex
 %endif
 
-%{?_with_check:BuildRequires: qt4-devel}
+%if 0%{?_with_check:1}
+BuildRequires: blas-devel
+BuildRequires: gsl-devel
+BuildRequires: suitesparse-devel
+BuildRequires: qt4-devel
+#-- Could NOT find TAUCS  (missing:  TAUCS_INCLUDES TAUCS_LIBRARIES)
+#-- Could NOT find SUPERLU  (missing:  SUPERLU_INCLUDES SUPERLU_LIBRARIES)
+#-- Could NOT find GOOGLEHASH  (missing:  GOOGLEHASH_INCLUDES)
+%endif
 
 %description
 %{summary}
@@ -82,6 +94,9 @@
 
 
 %changelog
+* Fri Jan 09 2009 Rex Dieter <rdieter at fedoraproject.org> 2.0-0.8.20090109svn
+- eigen2-20090109svn snapshot
+
 * Tue Jan 06 2009 Rex Dieter <rdieter at fedoraproject.org> 2.0-0.7.beta5
 - eigen-2.0-beta5
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eigen2/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	6 Jan 2009 14:54:24 -0000	1.6
+++ sources	9 Jan 2009 20:41:28 -0000	1.7
@@ -1 +1 @@
-1516005412881714f692a9f2c5c061a6  eigen-2.0-beta5.tar.bz2
+35aedd2810d3d910110baa21442961b5  eigen2-20090109svn.tar.bz2



From mdehaan at fedoraproject.org  Fri Jan  9 20:50:34 2009
From: mdehaan at fedoraproject.org (Michael DeHaan)
Date: Fri,  9 Jan 2009 20:50:34 +0000 (UTC)
Subject: rpms/cobbler/EL-4 sources,1.59,1.60
Message-ID: <20090109205034.4550F7011C@cvs1.fedora.phx.redhat.com>

Author: mdehaan

Update of /cvs/extras/rpms/cobbler/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2080/EL-4

Modified Files:
	sources 
Log Message:
Remove old sources to save space




Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cobbler/EL-4/sources,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- sources	9 Jan 2009 17:23:37 -0000	1.59
+++ sources	9 Jan 2009 20:50:03 -0000	1.60
@@ -1,2 +1 @@
-6bf3dae4f204b44858ba91faeb8a1ecf  cobbler-1.4.0.tar.gz
 a85b0ddfb7186f7ea5ed327f1be9c6dc  cobbler-1.4.1.tar.gz



From mdehaan at fedoraproject.org  Fri Jan  9 20:50:34 2009
From: mdehaan at fedoraproject.org (Michael DeHaan)
Date: Fri,  9 Jan 2009 20:50:34 +0000 (UTC)
Subject: rpms/cobbler/EL-5 sources,1.62,1.63
Message-ID: <20090109205034.71BEA7011C@cvs1.fedora.phx.redhat.com>

Author: mdehaan

Update of /cvs/extras/rpms/cobbler/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2080/EL-5

Modified Files:
	sources 
Log Message:
Remove old sources to save space




Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cobbler/EL-5/sources,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- sources	9 Jan 2009 17:23:37 -0000	1.62
+++ sources	9 Jan 2009 20:50:04 -0000	1.63
@@ -1,2 +1 @@
-6bf3dae4f204b44858ba91faeb8a1ecf  cobbler-1.4.0.tar.gz
 a85b0ddfb7186f7ea5ed327f1be9c6dc  cobbler-1.4.1.tar.gz



From mdehaan at fedoraproject.org  Fri Jan  9 20:50:34 2009
From: mdehaan at fedoraproject.org (Michael DeHaan)
Date: Fri,  9 Jan 2009 20:50:34 +0000 (UTC)
Subject: rpms/cobbler/F-10 sources,1.60,1.61
Message-ID: <20090109205034.C57867011C@cvs1.fedora.phx.redhat.com>

Author: mdehaan

Update of /cvs/extras/rpms/cobbler/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2080/F-10

Modified Files:
	sources 
Log Message:
Remove old sources to save space




Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cobbler/F-10/sources,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- sources	9 Jan 2009 17:23:37 -0000	1.60
+++ sources	9 Jan 2009 20:50:04 -0000	1.61
@@ -1,2 +1 @@
-6bf3dae4f204b44858ba91faeb8a1ecf  cobbler-1.4.0.tar.gz
 a85b0ddfb7186f7ea5ed327f1be9c6dc  cobbler-1.4.1.tar.gz



From mdehaan at fedoraproject.org  Fri Jan  9 20:50:35 2009
From: mdehaan at fedoraproject.org (Michael DeHaan)
Date: Fri,  9 Jan 2009 20:50:35 +0000 (UTC)
Subject: rpms/cobbler/F-9 sources,1.58,1.59
Message-ID: <20090109205035.7C5927011C@cvs1.fedora.phx.redhat.com>

Author: mdehaan

Update of /cvs/extras/rpms/cobbler/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2080/F-9

Modified Files:
	sources 
Log Message:
Remove old sources to save space




Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cobbler/F-9/sources,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- sources	9 Jan 2009 17:23:38 -0000	1.58
+++ sources	9 Jan 2009 20:50:05 -0000	1.59
@@ -1,2 +1 @@
-6bf3dae4f204b44858ba91faeb8a1ecf  cobbler-1.4.0.tar.gz
 a85b0ddfb7186f7ea5ed327f1be9c6dc  cobbler-1.4.1.tar.gz



From mdehaan at fedoraproject.org  Fri Jan  9 20:50:35 2009
From: mdehaan at fedoraproject.org (Michael DeHaan)
Date: Fri,  9 Jan 2009 20:50:35 +0000 (UTC)
Subject: rpms/cobbler/FC-6 sources,1.32,1.33
Message-ID: <20090109205035.C239C7011C@cvs1.fedora.phx.redhat.com>

Author: mdehaan

Update of /cvs/extras/rpms/cobbler/FC-6
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2080/FC-6

Modified Files:
	sources 
Log Message:
Remove old sources to save space




Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cobbler/FC-6/sources,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- sources	7 Nov 2007 20:37:20 -0000	1.32
+++ sources	9 Jan 2009 20:50:05 -0000	1.33
@@ -1,3 +1 @@
-72d67d4eea242ed3c406f2cced98eb41  cobbler-0.6.1.tar.gz
-4cf9d4e8f97f2e87d85bb675e41f1167  cobbler-0.6.2.tar.gz
 c42f441a486a8626ff2b26b3567b37af  cobbler-0.6.3.tar.gz



From mdehaan at fedoraproject.org  Fri Jan  9 20:50:36 2009
From: mdehaan at fedoraproject.org (Michael DeHaan)
Date: Fri,  9 Jan 2009 20:50:36 +0000 (UTC)
Subject: rpms/cobbler/devel sources,1.60,1.61
Message-ID: <20090109205036.18F527011C@cvs1.fedora.phx.redhat.com>

Author: mdehaan

Update of /cvs/extras/rpms/cobbler/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2080/devel

Modified Files:
	sources 
Log Message:
Remove old sources to save space




Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cobbler/devel/sources,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- sources	9 Jan 2009 17:23:38 -0000	1.60
+++ sources	9 Jan 2009 20:50:05 -0000	1.61
@@ -1,2 +1 @@
-6bf3dae4f204b44858ba91faeb8a1ecf  cobbler-1.4.0.tar.gz
 a85b0ddfb7186f7ea5ed327f1be9c6dc  cobbler-1.4.1.tar.gz



From mdehaan at fedoraproject.org  Fri Jan  9 20:50:35 2009
From: mdehaan at fedoraproject.org (Michael DeHaan)
Date: Fri,  9 Jan 2009 20:50:35 +0000 (UTC)
Subject: rpms/cobbler/F-7 sources,1.56,1.57
Message-ID: <20090109205035.2819B7011C@cvs1.fedora.phx.redhat.com>

Author: mdehaan

Update of /cvs/extras/rpms/cobbler/F-7
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2080/F-7

Modified Files:
	sources 
Log Message:
Remove old sources to save space




Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cobbler/F-7/sources,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- sources	14 Nov 2008 22:12:20 -0000	1.56
+++ sources	9 Jan 2009 20:50:04 -0000	1.57
@@ -1,6 +1 @@
-4586e811e587c929edfc5675d8c018c8  cobbler-1.2.4.tar.gz
-fa79d869848aa29d36f7eec951ab4c42  cobbler-1.2.5.tar.gz
-85bc766068e46a4d6fce25d929589815  cobbler-1.2.6.tar.gz
-4a51e52feb314b72296b10abc66f52e4  cobbler-1.2.7.tar.gz
-4342bfb53ad663ad1443be8c800f84f9  cobbler-1.2.8.tar.gz
 1505d2fe25bde24b54e77da1e181d2cd  cobbler-1.2.9.tar.gz



From rdieter at fedoraproject.org  Fri Jan  9 20:56:47 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri,  9 Jan 2009 20:56:47 +0000 (UTC)
Subject: rpms/eigen2/devel eigen2.spec,1.6,1.7
Message-ID: <20090109205647.82A587013F@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/eigen2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2845

Modified Files:
	eigen2.spec 
Log Message:
yank suitesparse, it's busted



Index: eigen2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eigen2/devel/eigen2.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- eigen2.spec	9 Jan 2009 20:41:28 -0000	1.6
+++ eigen2.spec	9 Jan 2009 20:56:17 -0000	1.7
@@ -34,7 +34,8 @@
 %if 0%{?_with_check:1}
 BuildRequires: blas-devel
 BuildRequires: gsl-devel
-BuildRequires: suitesparse-devel
+# can't use until undefined symbols are fixed: http://bugzilla.redhat.com/475411
+#BuildRequires: suitesparse-devel
 BuildRequires: qt4-devel
 #-- Could NOT find TAUCS  (missing:  TAUCS_INCLUDES TAUCS_LIBRARIES)
 #-- Could NOT find SUPERLU  (missing:  SUPERLU_INCLUDES SUPERLU_LIBRARIES)



From saispo at fedoraproject.org  Fri Jan  9 21:09:20 2009
From: saispo at fedoraproject.org (Jerome Soyer)
Date: Fri,  9 Jan 2009 21:09:20 +0000 (UTC)
Subject: rpms/clamtk/devel clamtk.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090109210920.695A97011C@cvs1.fedora.phx.redhat.com>

Author: saispo

Update of /cvs/pkgs/rpms/clamtk/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5615/devel

Modified Files:
	.cvsignore sources 
Added Files:
	clamtk.spec import.log 
Log Message:
* Wed Jan 07 2009 Jerome Soyer <saispo at gmail.com> - 4.08-4
- Remove script from prep section




--- NEW FILE clamtk.spec ---
Summary:        Easy to use front-end for ClamAV
Name:           clamtk
Version:        4.08
Release:        4%{dist}
License:        GPL+ or Artistic
Group:          Applications/System
URL:            http://clamtk.sourceforge.net/
Source:         http://downloads.sourceforge.net/clamtk/%{name}-%{version}.tar.gz
BuildRequires:  desktop-file-utils
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
Requires:       clamav >= 0.90 clamav-data
BuildArch:      noarch
BuildRoot:  %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

%description
ClamTk is a GUI front-end for ClamAV using Gtk2-perl.
It is designed to be an easy-to-use, point and click
virus scanner for Linux systems.

%prep
%setup -q

%build

%install
rm -rf $RPM_BUILD_ROOT

install -D -m0755 clamtk $RPM_BUILD_ROOT%{_bindir}/clamtk
install -D -m0644 clamtk.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/clamtk.png
install -D -m0644 clamtk.1.gz $RPM_BUILD_ROOT%{_mandir}/man1/clamtk.1.gz
install -D -m0644 clamtk.desktop $RPM_BUILD_ROOT%{_datadir}/applications/clamtk.desktop

install -d "$RPM_BUILD_ROOT%{perl_vendorlib}/ClamTk"
install -m0644 lib/*.pm "$RPM_BUILD_ROOT%{perl_vendorlib}/ClamTk/"


for n in po/*.mo ; do
        install -D -m0644 $n $RPM_BUILD_ROOT%{_datadir}/locale/`basename $n .mo`/LC_MESSAGES/clamtk.mo
done

desktop-file-install \
        --add-category="GTK" \
        --add-category="Security" \
        --remove-category="Utility" \
        --dir $RPM_BUILD_ROOT%{_datadir}/applications $RPM_BUILD_ROOT%{_datadir}/applications/*

%find_lang %{name}

%post
update-desktop-database &> /dev/null || :

%postun
update-desktop-database &> /dev/null || :

%clean
rm -rf $RPM_BUILD_ROOT

%files -f %{name}.lang
%defattr(-,root,root, -)
%doc CHANGES DISCLAIMER LICENSE README
%{_bindir}/%{name}
%{perl_vendorlib}/ClamTk
%{_datadir}/applications/%{name}.desktop
%{_datadir}/pixmaps/clamtk.png
%{_mandir}/man1/%{name}.1.*

%changelog
* Wed Jan 07 2009 Jerome Soyer <saispo at gmail.com> - 4.08-4
- Remove script from prep section

* Wed Jan 07 2009 Jerome Soyer <saispo at gmail.com> - 4.08-3
- Add Perl Provides and Requires in prep section
- Add Requires on Perl

* Tue Jan 06 2009 Jerome Soyer <saispo at gmail.com> - 4.08-2
- Change Licence tag
- Remove unneeded Requires and BuildRequires
- Remove scriptlets "update-mime-database"
- Move *.pm into regular Perl modules

* Fri Jan 02 2009 Jerome Soyer <saispo at gmail.com> - 4.08-1
- New upstream release

* Wed Dec 10 2008 Jerome Soyer <saispo at gmail.com> - 4.06-2
- Fix RPM Group
- Bump Release

* Thu Dec 09 2008 Jerome Soyer <saispo at gmail.com> - 4.06-1
- First Fedora Package


--- NEW FILE import.log ---
clamtk-4_08-4_fc11:HEAD:clamtk-4.08-4.fc11.src.rpm:1231535271


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/clamtk/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	9 Jan 2009 05:34:14 -0000	1.1
+++ .cvsignore	9 Jan 2009 21:08:50 -0000	1.2
@@ -0,0 +1 @@
+clamtk-4.08.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/clamtk/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	9 Jan 2009 05:34:14 -0000	1.1
+++ sources	9 Jan 2009 21:08:50 -0000	1.2
@@ -0,0 +1 @@
+c052668af7941bc89cd3af32ff5fa633  clamtk-4.08.tar.gz



From mdehaan at fedoraproject.org  Fri Jan  9 21:12:29 2009
From: mdehaan at fedoraproject.org (Michael DeHaan)
Date: Fri,  9 Jan 2009 21:12:29 +0000 (UTC)
Subject: rpms/koan/EL-4 sources,1.30,1.31
Message-ID: <20090109211229.1CDCE7011C@cvs1.fedora.phx.redhat.com>

Author: mdehaan

Update of /cvs/extras/rpms/koan/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5909/EL-4

Modified Files:
	sources 
Log Message:
Remove old sources




Index: sources
===================================================================
RCS file: /cvs/extras/rpms/koan/EL-4/sources,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- sources	9 Jan 2009 19:47:43 -0000	1.30
+++ sources	9 Jan 2009 21:11:58 -0000	1.31
@@ -1,7 +1 @@
-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
-00bece567cfc240ad585e68955407bf7  koan-1.2.6.tar.gz
-942f732d4cc1781a62673aef26ad318c  koan-1.4.0.tar.gz
 eb4f0c6990dc295879a952243708fdaa  koan-1.4.1.tar.gz



From mdehaan at fedoraproject.org  Fri Jan  9 21:12:29 2009
From: mdehaan at fedoraproject.org (Michael DeHaan)
Date: Fri,  9 Jan 2009 21:12:29 +0000 (UTC)
Subject: rpms/koan/EL-5 sources,1.31,1.32
Message-ID: <20090109211229.3F12F7011C@cvs1.fedora.phx.redhat.com>

Author: mdehaan

Update of /cvs/extras/rpms/koan/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5909/EL-5

Modified Files:
	sources 
Log Message:
Remove old sources




Index: sources
===================================================================
RCS file: /cvs/extras/rpms/koan/EL-5/sources,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- sources	9 Jan 2009 19:47:43 -0000	1.31
+++ sources	9 Jan 2009 21:11:59 -0000	1.32
@@ -1,7 +1 @@
-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
-00bece567cfc240ad585e68955407bf7  koan-1.2.6.tar.gz
-942f732d4cc1781a62673aef26ad318c  koan-1.4.0.tar.gz
 eb4f0c6990dc295879a952243708fdaa  koan-1.4.1.tar.gz



From mdehaan at fedoraproject.org  Fri Jan  9 21:12:29 2009
From: mdehaan at fedoraproject.org (Michael DeHaan)
Date: Fri,  9 Jan 2009 21:12:29 +0000 (UTC)
Subject: rpms/koan/F-10 sources,1.30,1.31
Message-ID: <20090109211229.80CB97011C@cvs1.fedora.phx.redhat.com>

Author: mdehaan

Update of /cvs/extras/rpms/koan/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5909/F-10

Modified Files:
	sources 
Log Message:
Remove old sources




Index: sources
===================================================================
RCS file: /cvs/extras/rpms/koan/F-10/sources,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- sources	9 Jan 2009 19:47:44 -0000	1.30
+++ sources	9 Jan 2009 21:11:59 -0000	1.31
@@ -1,7 +1 @@
-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
-00bece567cfc240ad585e68955407bf7  koan-1.2.6.tar.gz
-942f732d4cc1781a62673aef26ad318c  koan-1.4.0.tar.gz
 eb4f0c6990dc295879a952243708fdaa  koan-1.4.1.tar.gz



From mdehaan at fedoraproject.org  Fri Jan  9 21:12:29 2009
From: mdehaan at fedoraproject.org (Michael DeHaan)
Date: Fri,  9 Jan 2009 21:12:29 +0000 (UTC)
Subject: rpms/koan/F-7 sources,1.28,1.29
Message-ID: <20090109211229.B2BFF7011C@cvs1.fedora.phx.redhat.com>

Author: mdehaan

Update of /cvs/extras/rpms/koan/F-7
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5909/F-7

Modified Files:
	sources 
Log Message:
Remove old sources




Index: sources
===================================================================
RCS file: /cvs/extras/rpms/koan/F-7/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- sources	10 Oct 2008 16:23:43 -0000	1.28
+++ sources	9 Jan 2009 21:11:59 -0000	1.29
@@ -1,5 +1 @@
-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
 00bece567cfc240ad585e68955407bf7  koan-1.2.6.tar.gz



From mdehaan at fedoraproject.org  Fri Jan  9 21:12:30 2009
From: mdehaan at fedoraproject.org (Michael DeHaan)
Date: Fri,  9 Jan 2009 21:12:30 +0000 (UTC)
Subject: rpms/koan/F-9 sources,1.30,1.31
Message-ID: <20090109211230.4334F7011C@cvs1.fedora.phx.redhat.com>

Author: mdehaan

Update of /cvs/extras/rpms/koan/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5909/F-9

Modified Files:
	sources 
Log Message:
Remove old sources




Index: sources
===================================================================
RCS file: /cvs/extras/rpms/koan/F-9/sources,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- sources	9 Jan 2009 19:47:44 -0000	1.30
+++ sources	9 Jan 2009 21:12:00 -0000	1.31
@@ -1,7 +1 @@
-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
-00bece567cfc240ad585e68955407bf7  koan-1.2.6.tar.gz
-942f732d4cc1781a62673aef26ad318c  koan-1.4.0.tar.gz
 eb4f0c6990dc295879a952243708fdaa  koan-1.4.1.tar.gz



From mdehaan at fedoraproject.org  Fri Jan  9 21:12:30 2009
From: mdehaan at fedoraproject.org (Michael DeHaan)
Date: Fri,  9 Jan 2009 21:12:30 +0000 (UTC)
Subject: rpms/koan/devel sources,1.30,1.31
Message-ID: <20090109211230.7EC9E7011C@cvs1.fedora.phx.redhat.com>

Author: mdehaan

Update of /cvs/extras/rpms/koan/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5909/devel

Modified Files:
	sources 
Log Message:
Remove old sources




Index: sources
===================================================================
RCS file: /cvs/extras/rpms/koan/devel/sources,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- sources	9 Jan 2009 19:47:45 -0000	1.30
+++ sources	9 Jan 2009 21:12:00 -0000	1.31
@@ -1,7 +1 @@
-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
-00bece567cfc240ad585e68955407bf7  koan-1.2.6.tar.gz
-942f732d4cc1781a62673aef26ad318c  koan-1.4.0.tar.gz
 eb4f0c6990dc295879a952243708fdaa  koan-1.4.1.tar.gz



From mdehaan at fedoraproject.org  Fri Jan  9 21:12:29 2009
From: mdehaan at fedoraproject.org (Michael DeHaan)
Date: Fri,  9 Jan 2009 21:12:29 +0000 (UTC)
Subject: rpms/koan/F-8 sources,1.29,1.30
Message-ID: <20090109211229.F19657011C@cvs1.fedora.phx.redhat.com>

Author: mdehaan

Update of /cvs/extras/rpms/koan/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5909/F-8

Modified Files:
	sources 
Log Message:
Remove old sources




Index: sources
===================================================================
RCS file: /cvs/extras/rpms/koan/F-8/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- sources	19 Dec 2008 17:49:20 -0000	1.29
+++ sources	9 Jan 2009 21:11:59 -0000	1.30
@@ -1,6 +1 @@
-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
-00bece567cfc240ad585e68955407bf7  koan-1.2.6.tar.gz
 942f732d4cc1781a62673aef26ad318c  koan-1.4.0.tar.gz



From rdieter at fedoraproject.org  Fri Jan  9 21:14:41 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri,  9 Jan 2009 21:14:41 +0000 (UTC)
Subject: rpms/amarok/devel .cvsignore, 1.41, 1.42 amarok.spec, 1.129,
	1.130 sources, 1.42, 1.43
Message-ID: <20090109211441.4D2D57011C@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/amarok/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6362

Modified Files:
	.cvsignore amarok.spec sources 
Log Message:
* Fri Jan 09 2009 Rex Dieter <rdieter at fedoraproject.org> - 2.0.1.1-1
- amarok-2.0.1.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/amarok/devel/.cvsignore,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- .cvsignore	6 Jan 2009 18:42:35 -0000	1.41
+++ .cvsignore	9 Jan 2009 21:14:10 -0000	1.42
@@ -1 +1 @@
-amarok-2.0.1.tar.bz2
+amarok-2.0.1.1.tar.bz2


Index: amarok.spec
===================================================================
RCS file: /cvs/pkgs/rpms/amarok/devel/amarok.spec,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -r1.129 -r1.130
--- amarok.spec	6 Jan 2009 18:42:35 -0000	1.129
+++ amarok.spec	9 Jan 2009 21:14:10 -0000	1.130
@@ -1,7 +1,7 @@
 
 Name:    amarok
 Summary: Media player
-Version: 2.0.1
+Version: 2.0.1.1
 Release: 1%{?dist}
 
 Group: 	 Applications/Multimedia
@@ -55,7 +55,7 @@
 %{cmake_kde4} ..
 popd
 
-make %{?_smp_mflags} -C %{_target_platform} VERBOSE=1
+make %{?_smp_mflags} -C %{_target_platform}
 
 
 %install
@@ -113,6 +113,9 @@
 
 
 %changelog
+* Fri Jan 09 2009 Rex Dieter <rdieter at fedoraproject.org> - 2.0.1.1-1
+- amarok-2.0.1.1
+
 * Tue Jan 06 2009 Rex Dieter <rdieter at fedoraproject.org> - 2.0.1-1
 - amarok-2.0.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/amarok/devel/sources,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- sources	6 Jan 2009 18:42:35 -0000	1.42
+++ sources	9 Jan 2009 21:14:10 -0000	1.43
@@ -1 +1 @@
-b90f28c497ca01f08efa140d51d84eb5  amarok-2.0.1.tar.bz2
+818bc2b0350f35cba0fff0a72b9ffd22  amarok-2.0.1.1.tar.bz2



From kkofler at fedoraproject.org  Fri Jan  9 21:22:20 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Fri,  9 Jan 2009 21:22:20 +0000 (UTC)
Subject: rpms/kde-l10n/F-10 kde-l10n.spec,1.50,1.51
Message-ID: <20090109212220.CDAA37011C@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kde-l10n/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7175/F-10

Modified Files:
	kde-l10n.spec 
Log Message:
Fix file lists.


Index: kde-l10n.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kde-l10n/F-10/kde-l10n.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- kde-l10n.spec	9 Jan 2009 18:57:14 -0000	1.50
+++ kde-l10n.spec	9 Jan 2009 21:21:50 -0000	1.51
@@ -1143,15 +1143,15 @@
 %files Norwegian
 %defattr(-,root,root)
 %lang(nb) %{_datadir}/locale/nb/*
-%lang(nb) %{_kde4_appsdir}/khangman/data/nb
 %lang(nb) %{_kde4_appsdir}/khangman/nb.txt
+%lang(nb) %{_kde4_appsdir}/kvtml/nb
 %lang(nb) %{_kde4_docdir}/HTML/nb
 
 %files Norwegian-Nynorsk
 %defattr(-,root,root)
 %lang(nn) %{_datadir}/locale/nn/*
-%lang(nn) %{_kde4_appsdir}/khangman/data/nn
 %lang(nn) %{_kde4_appsdir}/khangman/nn.txt
+%lang(nn) %{_kde4_appsdir}/kvtml/nn
 %lang(nn) %{_kde4_docdir}/HTML/nn
 
 %if %{buildall}



From kkofler at fedoraproject.org  Fri Jan  9 21:22:20 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Fri,  9 Jan 2009 21:22:20 +0000 (UTC)
Subject: rpms/kde-l10n/F-9 kde-l10n.spec,1.39,1.40
Message-ID: <20090109212220.DF32A7013F@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-serv7175/F-9

Modified Files:
	kde-l10n.spec 
Log Message:
Fix file lists.


Index: kde-l10n.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kde-l10n/F-9/kde-l10n.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- kde-l10n.spec	9 Jan 2009 18:57:14 -0000	1.39
+++ kde-l10n.spec	9 Jan 2009 21:21:50 -0000	1.40
@@ -1143,15 +1143,15 @@
 %files Norwegian
 %defattr(-,root,root)
 %lang(nb) %{_datadir}/locale/nb/*
-%lang(nb) %{_kde4_appsdir}/khangman/data/nb
 %lang(nb) %{_kde4_appsdir}/khangman/nb.txt
+%lang(nb) %{_kde4_appsdir}/kvtml/nb
 %lang(nb) %{_kde4_docdir}/HTML/nb
 
 %files Norwegian-Nynorsk
 %defattr(-,root,root)
 %lang(nn) %{_datadir}/locale/nn/*
-%lang(nn) %{_kde4_appsdir}/khangman/data/nn
 %lang(nn) %{_kde4_appsdir}/khangman/nn.txt
+%lang(nn) %{_kde4_appsdir}/kvtml/nn
 %lang(nn) %{_kde4_docdir}/HTML/nn
 
 %if %{buildall}



From rdieter at fedoraproject.org  Fri Jan  9 21:22:56 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri,  9 Jan 2009 21:22:56 +0000 (UTC)
Subject: rpms/libmsn/devel .cvsignore,1.2,1.3 sources,1.3,1.4
Message-ID: <20090109212256.044D17011C@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/libmsn/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7306

Modified Files:
	.cvsignore sources 
Log Message:
update sources too



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libmsn/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	12 Dec 2008 21:15:05 -0000	1.2
+++ .cvsignore	9 Jan 2009 21:22:25 -0000	1.3
@@ -1 +1 @@
-libmsn-4.0-beta1.tar.bz2
+libmsn-4.0-beta2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libmsn/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	9 Jan 2009 18:39:54 -0000	1.3
+++ sources	9 Jan 2009 21:22:25 -0000	1.4
@@ -0,0 +1 @@
+e2088e987a44cef0b243b4adcb8c3825  libmsn-4.0-beta2.tar.bz2



From notting at fedoraproject.org  Fri Jan  9 21:32:28 2009
From: notting at fedoraproject.org (Bill Nottingham)
Date: Fri,  9 Jan 2009 21:32:28 +0000 (UTC)
Subject: rpms/kernel/devel config-generic,1.215,1.216
Message-ID: <20090109213228.8103A7011C@cvs1.fedora.phx.redhat.com>

Author: notting

Update of /cvs/extras/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8985

Modified Files:
	config-generic 
Log Message:
Nuke some ATM drivers



Index: config-generic
===================================================================
RCS file: /cvs/extras/rpms/kernel/devel/config-generic,v
retrieving revision 1.215
retrieving revision 1.216
diff -u -r1.215 -r1.216
--- config-generic	9 Jan 2009 05:47:31 -0000	1.215
+++ config-generic	9 Jan 2009 21:31:57 -0000	1.216
@@ -1088,19 +1088,19 @@
 CONFIG_ATM_BR2684=m
 CONFIG_NET_SCH_ATM=m
 CONFIG_ATM_TCP=m
-CONFIG_ATM_LANAI=m
+# CONFIG_ATM_LANAI is not set
 CONFIG_ATM_ENI=m
 CONFIG_ATM_FIRESTREAM=m
 # CONFIG_ATM_ZATM is not set
-CONFIG_ATM_IDT77252=m
-CONFIG_ATM_AMBASSADOR=m
-CONFIG_ATM_HORIZON=m
-CONFIG_ATM_FORE200E=m
+# CONFIG_ATM_IDT77252 is not set
+# CONFIG_ATM_AMBASSADOR is not set
+# CONFIG_ATM_HORIZON is not set
+# CONFIG_ATM_FORE200E is not set
 # CONFIG_ATM_FORE200E_USE_TASKLET is not set
 CONFIG_ATM_FORE200E_TX_RETRY=16
 CONFIG_ATM_FORE200E_DEBUG=0
 
-CONFIG_ATM_HE=m
+# CONFIG_ATM_HE is not set
 CONFIG_PPPOATM=m
 CONFIG_PPPOL2TP=m
 CONFIG_ATM_NICSTAR=m
@@ -1119,7 +1119,7 @@
 # CONFIG_ATM_NICSTAR_USE_SUNI is not set
 # CONFIG_ATM_NICSTAR_USE_IDT77105 is not set
 # CONFIG_ATM_IA_DEBUG is not set
-CONFIG_ATM_SOLOS=m
+# CONFIG_ATM_SOLOS is not set
 
 CONFIG_RFKILL=m
 CONFIG_RFKILL_INPUT=m



From notting at fedoraproject.org  Fri Jan  9 21:34:12 2009
From: notting at fedoraproject.org (Bill Nottingham)
Date: Fri,  9 Jan 2009 21:34:12 +0000 (UTC)
Subject: rpms/kernel/devel config-generic,1.216,1.217
Message-ID: <20090109213412.87C4B7011C@cvs1.fedora.phx.redhat.com>

Author: notting

Update of /cvs/extras/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9193

Modified Files:
	config-generic 
Log Message:
Kill tokenring too



Index: config-generic
===================================================================
RCS file: /cvs/extras/rpms/kernel/devel/config-generic,v
retrieving revision 1.216
retrieving revision 1.217
diff -u -r1.216 -r1.217
--- config-generic	9 Jan 2009 21:31:57 -0000	1.216
+++ config-generic	9 Jan 2009 21:33:41 -0000	1.217
@@ -1445,15 +1445,15 @@
 #
 # Token Ring devices
 #
-CONFIG_TR=y
-CONFIG_IBMOL=m
-CONFIG_3C359=m
+# CONFIG_TR is not setk
+# CONFIG_IBMOL is not set
+# CONFIG_3C359 is not set
 # Broken with gcc4.1
 # CONFIG_TMS380TR is not set
-CONFIG_TMSPCI=m
-CONFIG_ABYSS=m
-CONFIG_IBMLS=m
-CONFIG_PCMCIA_IBMTR=m
+# CONFIG_TMSPCI is not set
+# CONFIG_ABYSS is not set
+# CONFIG_IBMLS is not set
+# CONFIG_PCMCIA_IBMTR is not set
 
 
 CONFIG_NET_FC=y



From than at fedoraproject.org  Fri Jan  9 21:35:47 2009
From: than at fedoraproject.org (Than Ngo)
Date: Fri,  9 Jan 2009 21:35:47 +0000 (UTC)
Subject: rpms/kdebase-workspace/devel kdebase-workspace.spec,1.165,1.166
Message-ID: <20090109213547.3FD687011C@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdebase-workspace/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9348

Modified Files:
	kdebase-workspace.spec 
Log Message:
remove Provides: plasma-devel



Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebase-workspace/devel/kdebase-workspace.spec,v
retrieving revision 1.165
retrieving revision 1.166
diff -u -r1.165 -r1.166
--- kdebase-workspace.spec	9 Jan 2009 17:54:38 -0000	1.165
+++ kdebase-workspace.spec	9 Jan 2009 21:35:16 -0000	1.166
@@ -4,7 +4,7 @@
 Name: kdebase-workspace
 Version: 4.1.96
 
-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
@@ -116,7 +116,6 @@
 %package devel
 Group:    Development/Libraries
 Summary:  Development files for %{name}
-Provides: plasma-devel = %{version}-%{release}
 Requires: %{name}-libs = %{version}-%{release}
 Requires: kdelibs4-devel
 %description devel
@@ -297,6 +296,9 @@
 
 
 %changelog
+* Fri Jan 09 2009 Than Ngo <than at redhat.com> - 4.1.96-2
+- remove Provides: plasma-devel  
+
 * Wed Jan 07 2009 Than Ngo <than at redhat.com> - 4.1.96-1
 - 4.2rc1
 



From red at fedoraproject.org  Fri Jan  9 21:53:57 2009
From: red at fedoraproject.org (Sandro Mathys)
Date: Fri,  9 Jan 2009 21:53:57 +0000 (UTC)
Subject: rpms/javassist/devel import.log, NONE,
	1.1 javassist-buildfile-nosource1.4-nosrcjar.patch, NONE,
	1.1 javassist.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090109215357.CE9417011C@cvs1.fedora.phx.redhat.com>

Author: red

Update of /cvs/pkgs/rpms/javassist/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11166/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log javassist-buildfile-nosource1.4-nosrcjar.patch 
	javassist.spec 
Log Message:
* Fri Jan 09 2009 Sandro Mathys <red at fedoraproject.org> - 3.9.0-1
- initial commit




--- NEW FILE import.log ---
javassist-3_9_0-1_fc11:HEAD:javassist-3.9.0-1.fc11.src.rpm:1231537758

javassist-buildfile-nosource1.4-nosrcjar.patch:

--- NEW FILE javassist-buildfile-nosource1.4-nosrcjar.patch ---
--- build.xml.old	2008-10-09 19:51:16.000000000 +0200
+++ build.xml	2008-12-09 16:27:29.000000000 +0100
@@ -155,17 +155,19 @@
 to ${build.classes.dir}.</echo>
   </target>
 
-  <target name="jar" depends="compile14">
+  <target name="jar" depends="compile">
     <jar jarfile="${target.jar}" manifest="${src.dir}/META-INF/MANIFEST.MF">
       <fileset dir="${build.classes.dir}">
       	  <include name="**/*.class"/>
       </fileset>
      </jar>
+    <!--
     <jar jarfile="${target-src.jar}" manifest="${src.dir}/META-INF/MANIFEST.MF">
       <fileset dir="${src.dir}">
         <include name="javassist/**"/>
       </fileset>
     </jar>
+    -->
   </target>
 
   <target name="javadocs">


--- NEW FILE javassist.spec ---
Name:           javassist
Version:        3.9.0
Release:        1%{?dist}
Summary:        The Java Programming Assistant provides simple Java bytecode manipulation
Group:          Development/Libraries
License:        MPLv1.1 or LGPLv2+
URL:            http://www.csg.is.titech.ac.jp/~chiba/javassist/
Source0:        http://downloads.sourceforge.net/jboss/%{name}3.9.GA.zip
Patch0:         javassist-buildfile-nosource1.4-nosrcjar.patch
BuildArch:      noarch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:     java-devel >= 1:1.6.0
BuildRequires:     jpackage-utils
BuildRequires:     ant
Requires:          java >= 1:1.6.0
Requires:          jpackage-utils

%description
Javassist enables Java programs to define a new class at runtime and to
modify a class file when the JVM loads it. Unlike other similar
bytecode editors, Javassist provides two levels of API: source level
and bytecode level. If the users use the source-level API, they can
edit a class file without knowledge of the specifications of the Java
bytecode. The whole API is designed with only the vocabulary of the
Java language. You can even specify inserted bytecode in the form of
source text; Javassist compiles it on the fly. On the other hand, the
bytecode-level API allows the users to directly edit a class file as
other editors.


%package javadoc
Summary:           Javadocs for javassist
Group:             Documentation
Requires:          %{name} = %{version}-%{release}
Requires:          jpackage-utils

%description javadoc
javassist development documentation.


%prep
%setup -q # -n %{name}-%{version}
%patch0 -p0

rm -rf *.jar html


%build
ant clean jar javadocs


%install
rm -rf $RPM_BUILD_ROOT

# jar
install -d $RPM_BUILD_ROOT%{_javadir}
install -m644 %{name}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar

# javadoc
install -d $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
cp -rp html/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc License.html
%{_javadir}/%{name}.jar
%{_javadir}/%{name}-%{version}.jar

%files javadoc
%defattr(-,root,root,-)
%dir %{_javadocdir}/%{name}-%{version}
%{_javadocdir}/%{name}
%{_javadocdir}/%{name}-%{version}/*


%changelog
* Tue Dec 16 2008 Sandro Mathys <red at fedoraproject.org> - 3.9.0-1
- initial build


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/javassist/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	4 Jan 2009 20:45:42 -0000	1.1
+++ .cvsignore	9 Jan 2009 21:53:27 -0000	1.2
@@ -0,0 +1 @@
+javassist3.9.GA.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/javassist/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	4 Jan 2009 20:45:42 -0000	1.1
+++ sources	9 Jan 2009 21:53:27 -0000	1.2
@@ -0,0 +1 @@
+b1a54a77359355f10b40129a91f30b00  javassist3.9.GA.zip



From nsantos at fedoraproject.org  Fri Jan  9 21:57:16 2009
From: nsantos at fedoraproject.org (Nuno Santos)
Date: Fri,  9 Jan 2009 21:57:16 +0000 (UTC)
Subject: rpms/qpidc/devel qpidc.spec,1.57,1.58 sources,1.30,1.31
Message-ID: <20090109215716.4A0057011C@cvs1.fedora.phx.redhat.com>

Author: nsantos

Update of /cvs/extras/rpms/qpidc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12220

Modified Files:
	qpidc.spec sources 
Log Message:
regenerated tarball on rawhide


Index: qpidc.spec
===================================================================
RCS file: /cvs/extras/rpms/qpidc/devel/qpidc.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- qpidc.spec	7 Jan 2009 16:34:40 -0000	1.57
+++ qpidc.spec	9 Jan 2009 21:56:45 -0000	1.58
@@ -13,7 +13,6 @@
 License:        ASL 2.0
 URL:            http://qpid.apache.org
 Source0:        %{name}-%{version}.tar.gz
-Patch0:		corosync.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: boost-devel
@@ -182,7 +181,6 @@
 
 %prep
 %setup -q
-%patch0
 
 %define perftests "perftest topic_listener topic_publisher \
 	latencytest client_test txtest"


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/qpidc/devel/sources,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- sources	23 Dec 2008 18:02:44 -0000	1.30
+++ sources	9 Jan 2009 21:56:45 -0000	1.31
@@ -1 +1 @@
-cc0a9f74d2c94a8c843c60415a869fc5  qpidc-0.4.728142.tar.gz
+7b2d0d857b1bfbfbb7afaf8a926c271c  qpidc-0.4.728142.tar.gz



From beuc at fedoraproject.org  Fri Jan  9 21:59:48 2009
From: beuc at fedoraproject.org (Sylvain Beucler)
Date: Fri,  9 Jan 2009 21:59:48 +0000 (UTC)
Subject: rpms/freedink/devel .cvsignore, 1.2, 1.3 freedink.spec, 1.2,
	1.3 sources, 1.2, 1.3
Message-ID: <20090109215948.6D41B7011C@cvs1.fedora.phx.redhat.com>

Author: beuc

Update of /cvs/pkgs/rpms/freedink/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13572

Modified Files:
	.cvsignore freedink.spec sources 
Log Message:
Update to 1.08.20090109


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/freedink/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	30 Sep 2008 18:19:51 -0000	1.2
+++ .cvsignore	9 Jan 2009 21:59:17 -0000	1.3
@@ -1 +1 @@
-freedink-1.08.20080920.tar.gz
+freedink-1.08.20090109.tar.gz


Index: freedink.spec
===================================================================
RCS file: /cvs/pkgs/rpms/freedink/devel/freedink.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- freedink.spec	5 Oct 2008 16:52:37 -0000	1.2
+++ freedink.spec	9 Jan 2009 21:59:17 -0000	1.3
@@ -1,11 +1,15 @@
 Name:		freedink
-Version:	1.08.20080920
-Release:	4%{?dist}
+Version:	1.08.20090109
+Release:	1%{?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:	SDL-devel SDL_gfx-devel SDL_ttf-devel SDL_image-devel SDL_mixer-devel
+BuildRequires:  fontconfig-devel libffi-devel
 BuildRequires:  desktop-file-utils
+%if 0%{?suse_version}
+BuildRequires:  update-desktop-files
+%endif
 License:	GPLv3+
 URL:		http://www.freedink.org/
 Source0:	ftp://ftp.gnu.org/gnu/freedink/freedink-%{version}.tar.gz
@@ -31,15 +35,13 @@
 %package engine
 Summary:	Adventure and role-playing game (engine)
 Group:		Amusements/Games
-Requires:	freedink-data
+Requires:	freedink-data liberation-fonts
 # 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
+%if 0%{?suse_version}
+Requires: timidity
 %endif
 
 %description engine
@@ -67,15 +69,21 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
+%find_lang %{name}
+%find_lang %{name}-gnulib
+# %files only support one '-f' argument (see below)
+cat %{name}-gnulib.lang >> %{name}.lang
 desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}.desktop
 desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}edit.desktop
-%if 0%{?fedora} >= 10
+%if 0%{?suse_version}
+%suse_update_desktop_file -i %name
+%suse_update_desktop_file -i %{name}edit
+%endif
 # 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
@@ -84,7 +92,7 @@
 %files
 %defattr(-,root,root,-)
 
-%files engine
+%files engine -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING NEWS README THANKS TROUBLESHOOTING ChangeLog
 %{_bindir}/*
@@ -95,6 +103,10 @@
 
 
 %changelog
+* Wed Jan  9 2009 Sylvain Beucler <beuc at beuc.net> - 1.08.20090109-1
+- New upstream release
+- Declare .mo translation catalogs
+
 * Sun Oct  5 2008 Sylvain Beucler <beuc at beuc.net> - 1.08.20080920-4
 - Use liberation-fonts in all distro versions
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/freedink/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	30 Sep 2008 18:19:51 -0000	1.2
+++ sources	9 Jan 2009 21:59:17 -0000	1.3
@@ -1 +1 @@
-0e7a2a5af1c2e3498c7179e6cad02de9  freedink-1.08.20080920.tar.gz
+2f9854aec73f4ea7b47bceb0757c3be8  freedink-1.08.20090109.tar.gz



From red at fedoraproject.org  Fri Jan  9 21:59:53 2009
From: red at fedoraproject.org (Sandro Mathys)
Date: Fri,  9 Jan 2009 21:59:53 +0000 (UTC)
Subject: rpms/javassist/F-9 import.log, NONE,
	1.1 javassist-buildfile-nosource1.4-nosrcjar.patch, NONE,
	1.1 javassist.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090109215953.118D47011C@cvs1.fedora.phx.redhat.com>

Author: red

Update of /cvs/pkgs/rpms/javassist/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12623/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	import.log javassist-buildfile-nosource1.4-nosrcjar.patch 
	javassist.spec 
Log Message:
* Fri Jan 09 2009 Sandro Mathys <red at fedoraproject.org> - 3.9.0-1
- initial commit




--- NEW FILE import.log ---
javassist-3_9_0-1_fc11:F-9:javassist-3.9.0-1.fc11.src.rpm:1231538211

javassist-buildfile-nosource1.4-nosrcjar.patch:

--- NEW FILE javassist-buildfile-nosource1.4-nosrcjar.patch ---
--- build.xml.old	2008-10-09 19:51:16.000000000 +0200
+++ build.xml	2008-12-09 16:27:29.000000000 +0100
@@ -155,17 +155,19 @@
 to ${build.classes.dir}.</echo>
   </target>
 
-  <target name="jar" depends="compile14">
+  <target name="jar" depends="compile">
     <jar jarfile="${target.jar}" manifest="${src.dir}/META-INF/MANIFEST.MF">
       <fileset dir="${build.classes.dir}">
       	  <include name="**/*.class"/>
       </fileset>
      </jar>
+    <!--
     <jar jarfile="${target-src.jar}" manifest="${src.dir}/META-INF/MANIFEST.MF">
       <fileset dir="${src.dir}">
         <include name="javassist/**"/>
       </fileset>
     </jar>
+    -->
   </target>
 
   <target name="javadocs">


--- NEW FILE javassist.spec ---
Name:           javassist
Version:        3.9.0
Release:        1%{?dist}
Summary:        The Java Programming Assistant provides simple Java bytecode manipulation
Group:          Development/Libraries
License:        MPLv1.1 or LGPLv2+
URL:            http://www.csg.is.titech.ac.jp/~chiba/javassist/
Source0:        http://downloads.sourceforge.net/jboss/%{name}3.9.GA.zip
Patch0:         javassist-buildfile-nosource1.4-nosrcjar.patch
BuildArch:      noarch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:     java-devel >= 1:1.6.0
BuildRequires:     jpackage-utils
BuildRequires:     ant
Requires:          java >= 1:1.6.0
Requires:          jpackage-utils

%description
Javassist enables Java programs to define a new class at runtime and to
modify a class file when the JVM loads it. Unlike other similar
bytecode editors, Javassist provides two levels of API: source level
and bytecode level. If the users use the source-level API, they can
edit a class file without knowledge of the specifications of the Java
bytecode. The whole API is designed with only the vocabulary of the
Java language. You can even specify inserted bytecode in the form of
source text; Javassist compiles it on the fly. On the other hand, the
bytecode-level API allows the users to directly edit a class file as
other editors.


%package javadoc
Summary:           Javadocs for javassist
Group:             Documentation
Requires:          %{name} = %{version}-%{release}
Requires:          jpackage-utils

%description javadoc
javassist development documentation.


%prep
%setup -q # -n %{name}-%{version}
%patch0 -p0

rm -rf *.jar html


%build
ant clean jar javadocs


%install
rm -rf $RPM_BUILD_ROOT

# jar
install -d $RPM_BUILD_ROOT%{_javadir}
install -m644 %{name}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar

# javadoc
install -d $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
cp -rp html/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc License.html
%{_javadir}/%{name}.jar
%{_javadir}/%{name}-%{version}.jar

%files javadoc
%defattr(-,root,root,-)
%dir %{_javadocdir}/%{name}-%{version}
%{_javadocdir}/%{name}
%{_javadocdir}/%{name}-%{version}/*


%changelog
* Tue Dec 16 2008 Sandro Mathys <red at fedoraproject.org> - 3.9.0-1
- initial build


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/javassist/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	4 Jan 2009 20:45:42 -0000	1.1
+++ .cvsignore	9 Jan 2009 21:59:22 -0000	1.2
@@ -0,0 +1 @@
+javassist3.9.GA.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/javassist/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	4 Jan 2009 20:45:42 -0000	1.1
+++ sources	9 Jan 2009 21:59:22 -0000	1.2
@@ -0,0 +1 @@
+b1a54a77359355f10b40129a91f30b00  javassist3.9.GA.zip



From saispo at fedoraproject.org  Fri Jan  9 22:00:56 2009
From: saispo at fedoraproject.org (Jerome Soyer)
Date: Fri,  9 Jan 2009 22:00:56 +0000 (UTC)
Subject: rpms/nufw/F-10 README.python_nufw, NONE, 1.1 import.log, NONE,
	1.1 nuauth.init, NONE, 1.1 nuauth.pam, NONE,
	1.1 nufw-avoid-version.patch, NONE, 1.1 nufw.init, NONE,
	1.1 nufw.spec, NONE, 1.1 setup-python_nufw.py, NONE,
	1.1 sysconfig-nuauth, NONE, 1.1 sysconfig-nufw, NONE,
	1.1 version-python_nufw.py, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090109220056.1A49E7011C@cvs1.fedora.phx.redhat.com>

Author: saispo

Update of /cvs/pkgs/rpms/nufw/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13663/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	README.python_nufw import.log nuauth.init nuauth.pam 
	nufw-avoid-version.patch nufw.init nufw.spec 
	setup-python_nufw.py sysconfig-nuauth sysconfig-nufw 
	version-python_nufw.py 
Log Message:
* Fri Dec 19 2008 Jerome Soyer <saispo at gmail.com> 2.2.20-5
- Add "touch -r" in the charset conversion for keeping timestamps




--- NEW FILE README.python_nufw ---
Python binding of libnuclient library, object oriented.

See test_nuclient.py for an example of nuclient use.



--- NEW FILE import.log ---
nufw-2_2_20-5_fc11:F-10:nufw-2.2.20-5.fc11.src.rpm:1231538320


--- NEW FILE nuauth.init ---
#!/bin/sh
#
# nuauth Startup script for nuauth
#
# chkconfig:   - 86 16
# description: Nuauth is a authentifcation server for nufw.

### BEGIN INIT INFO
# Provides:          nuauth
# Required-Start:    $syslog
# Required-Stop:     $syslog
# Should-Start:      $local_fs
# Should-Stop:       $local_fs
# Default-Start:
# Default-Stop:      0 1 2 3 4 5 6
# Short-Description: Control script for nuauth
# Description:       Init script to control (start/stop/reload)
#                    the nuauth server.
### END INIT INFO


# Source function library.
. /etc/rc.d/init.d/functions

exec=/usr/sbin/nuauth
prog=nuauth
config=/etc/nufw/nuauth.conf

[ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog

if [ "$NUAUTH_START" != "true" ]; then
  exit 0
fi

if [ ! "$NUAUTH_VERBOSITY" ]; then
  NUAUTH_VERBOSITY="vv"
fi

if [ ! "$NUAUTH_USER" ]; then
  echo "No user configured to run nuauth... Trying \"nobody\" ..."
  NUAUTH_USER="nobody"
fi

if [ ! "$NUAUTH_PID" ]; then
        NUAUTH_PID="/var/run/$PID/$PID.pid"
fi

if [ ! -d /var/run/nuauth ]; then
        mkdir -p /var/run/nuauth
fi

chown $NUAUTH_USER /var/run/nuauth

DAEMON_OPTS="-D -$NUAUTH_VERBOSITY"

lockfile=/var/lock/subsys/$prog

start() {
    if [ "$NUAUTH_START" != "true" ]; then
      exit 1
    fi
    [ -x $exec ] || exit 5
    [ -f $config ] || exit 6
    echo -n $"Starting $prog: "
    # if not running, start it up here, usually something like "daemon $exec"
    daemon $exec $DAEMON_OPTS
    retval=$?
    echo
    [ $retval -eq 0 ] && touch $lockfile
    return $retval
}

stop() {
    echo -n $"Stopping $prog: "
    # stop it here, often "killproc $prog"
    killproc $prog
    retval=$?
    echo
    [ $retval -eq 0 ] && rm -f $lockfile
    return $retval
}

restart() {
    stop
    start
}

reload() {
    restart
}

force_reload() {
    restart
}

rh_status() {
    # run checks to determine if the service is running or use generic status
    status $prog
}

rh_status_q() {
    rh_status >/dev/null 2>&1
}


case "$1" in
    start)
        rh_status_q && exit 0
        $1
        ;;
    stop)
        rh_status_q || exit 0
        $1
        ;;
    restart)
        $1
        ;;
    reload)
        rh_status_q || exit 7
        $1
        ;;
    force-reload)
        force_reload
        ;;
    status)
        rh_status
        ;;
    condrestart|try-restart)
        rh_status_q || exit 0
        restart
        ;;
    *)
        echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload}"
        exit 2
esac
exit $?



--- NEW FILE nuauth.pam ---
#%PAM-1.0
auth       include      system-auth
account    include      system-auth
password   include      system-auth
session    include      system-auth


nufw-avoid-version.patch:

--- NEW FILE nufw-avoid-version.patch ---
--- nufw-2.2.20old/src/nuauth/modules/auth_mysql/Makefile.in.avoid-version	2008-12-10 10:40:26.000000000 +0100
+++ nufw-2.2.20old/src/nuauth/modules/auth_mysql/Makefile.in	2008-12-12 11:24:01.000000000 +0100
@@ -54,6 +54,7 @@
 pluginLTLIBRARIES_INSTALL = $(INSTALL)
 LTLIBRARIES = $(plugin_LTLIBRARIES)
 libauth_mysql_la_LIBADD =
+libauth_mysql_la_LDFLAGS = -avoid-version
 am__libauth_mysql_la_SOURCES_DIST = mysql_auth.c mysql_auth.h mysql.h
 am__objects_1 =
 @USE_MYSQL_AUTH_TRUE at am_libauth_mysql_la_OBJECTS = mysql_auth.lo \
--- nufw-2.2.20old/src/nuauth/modules/ipauth_guest/Makefile.in.avoid-version	2008-12-10 10:40:26.000000000 +0100
+++ nufw-2.2.20old/src/nuauth/modules/ipauth_guest/Makefile.in	2008-12-12 11:24:01.000000000 +0100
@@ -53,6 +53,7 @@
 pluginLTLIBRARIES_INSTALL = $(INSTALL)
 LTLIBRARIES = $(plugin_LTLIBRARIES)
 libipauth_guest_la_LIBADD =
+libipauth_guest_la_LDFLAGS = -avoid-version
 am_libipauth_guest_la_OBJECTS = libipauth_guest.lo
 libipauth_guest_la_OBJECTS = $(am_libipauth_guest_la_OBJECTS)
 DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)/src/include
--- nufw-2.2.20old/src/nuauth/modules/ldap/Makefile.in.avoid-version	2008-12-10 10:40:26.000000000 +0100
+++ nufw-2.2.20old/src/nuauth/modules/ldap/Makefile.in	2008-12-12 11:24:01.000000000 +0100
@@ -54,6 +54,7 @@
 pluginLTLIBRARIES_INSTALL = $(INSTALL)
 LTLIBRARIES = $(plugin_LTLIBRARIES)
 libldap_la_DEPENDENCIES =
+libldap_la_LDFLAGS = -avoid-version
 am__libldap_la_SOURCES_DIST = ldap.c auth_ldap.h
 am__objects_1 =
 @USE_LDAP_TRUE at am_libldap_la_OBJECTS = ldap.lo $(am__objects_1)
--- nufw-2.2.20old/src/nuauth/modules/log_mysql/Makefile.in.avoid-version	2008-12-10 10:40:27.000000000 +0100
+++ nufw-2.2.20old/src/nuauth/modules/log_mysql/Makefile.in	2008-12-12 11:24:01.000000000 +0100
@@ -54,6 +54,7 @@
 pluginLTLIBRARIES_INSTALL = $(INSTALL)
 LTLIBRARIES = $(plugin_LTLIBRARIES)
 libmysql_la_LIBADD =
+libmysql_la_LDFLAGS = -avoid-version
 am__libmysql_la_SOURCES_DIST = mysql.c log_mysql.h
 am__objects_1 =
 @USE_MYSQL_LOG_TRUE at am_libmysql_la_OBJECTS = mysql.lo $(am__objects_1)
--- nufw-2.2.20old/src/nuauth/modules/log_nuprelude/Makefile.in.avoid-version	2008-12-10 10:40:27.000000000 +0100
+++ nufw-2.2.20old/src/nuauth/modules/log_nuprelude/Makefile.in	2008-12-12 11:24:01.000000000 +0100
@@ -54,6 +54,7 @@
 pluginLTLIBRARIES_INSTALL = $(INSTALL)
 LTLIBRARIES = $(plugin_LTLIBRARIES)
 libnuprelude_la_DEPENDENCIES =
+libnuprelude_la_LDFLAGS = -avoid-version
 am__libnuprelude_la_SOURCES_DIST = nuprelude.c log_prelude.h
 am__objects_1 =
 @USE_PRELUDE_LOG_TRUE at am_libnuprelude_la_OBJECTS = nuprelude.lo \
--- nufw-2.2.20old/src/nuauth/modules/log_pgsql/Makefile.in.avoid-version	2008-12-12 11:24:01.000000000 +0100
+++ nufw-2.2.20old/src/nuauth/modules/log_pgsql/Makefile.in	2008-12-12 11:24:01.000000000 +0100
@@ -54,6 +54,7 @@
 pluginLTLIBRARIES_INSTALL = $(INSTALL)
 LTLIBRARIES = $(plugin_LTLIBRARIES)
 libpgsql_la_DEPENDENCIES =
+libpgsql_la_LDFLAGS = -avoid-version
 am__libpgsql_la_SOURCES_DIST = pgsql.c log_pgsql.h
 am__objects_1 =
 @USE_PGSQL_LOG_TRUE at am_libpgsql_la_OBJECTS = pgsql.lo $(am__objects_1)
--- nufw-2.2.20old/src/nuauth/modules/log_script/Makefile.in.avoid-version	2008-12-10 10:40:27.000000000 +0100
+++ nufw-2.2.20old/src/nuauth/modules/log_script/Makefile.in	2008-12-12 11:24:01.000000000 +0100
@@ -51,6 +51,7 @@
 pluginLTLIBRARIES_INSTALL = $(INSTALL)
 LTLIBRARIES = $(plugin_LTLIBRARIES)
 libscript_la_LIBADD =
+libscript_la_LDFLAGS = -avoid-version
 am_libscript_la_OBJECTS = script.lo
 libscript_la_OBJECTS = $(am_libscript_la_OBJECTS)
 DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)/src/include
--- nufw-2.2.20old/src/nuauth/modules/log_syslog/Makefile.in.avoid-version	2008-12-10 10:40:27.000000000 +0100
+++ nufw-2.2.20old/src/nuauth/modules/log_syslog/Makefile.in	2008-12-12 11:24:01.000000000 +0100
@@ -53,6 +53,7 @@
 pluginLTLIBRARIES_INSTALL = $(INSTALL)
 LTLIBRARIES = $(plugin_LTLIBRARIES)
 libsyslog_la_LIBADD =
+libsyslog_la_LDFLAGS = -avoid-version
 am__libsyslog_la_SOURCES_DIST = syslog.c
 @USE_SYSLOG_LOG_TRUE at am_libsyslog_la_OBJECTS = syslog.lo
 libsyslog_la_OBJECTS = $(am_libsyslog_la_OBJECTS)
--- nufw-2.2.20old/src/nuauth/modules/mark_field/Makefile.in.avoid-version	2008-12-10 10:40:27.000000000 +0100
+++ nufw-2.2.20old/src/nuauth/modules/mark_field/Makefile.in	2008-12-12 11:24:01.000000000 +0100
@@ -54,6 +54,7 @@
 pluginLTLIBRARIES_INSTALL = $(INSTALL)
 LTLIBRARIES = $(plugin_LTLIBRARIES)
 libmark_field_la_LIBADD =
+libmark_field_la_LDFLAGS = -avoid-version
 am__libmark_field_la_SOURCES_DIST = mark_field.c mark_field.h
 am__objects_1 =
 @USE_MARK_FIELD_TRUE at am_libmark_field_la_OBJECTS = mark_field.lo \
--- nufw-2.2.20old/src/nuauth/modules/mark_flag/Makefile.in.avoid-version	2008-12-10 10:40:27.000000000 +0100
+++ nufw-2.2.20old/src/nuauth/modules/mark_flag/Makefile.in	2008-12-12 11:24:01.000000000 +0100
@@ -53,6 +53,7 @@
 pluginLTLIBRARIES_INSTALL = $(INSTALL)
 LTLIBRARIES = $(plugin_LTLIBRARIES)
 libmark_flag_la_LIBADD =
+libmark_flag_la_LDFLAGS = -avoid-version
 am_libmark_flag_la_OBJECTS = mark_flag.lo
 libmark_flag_la_OBJECTS = $(am_libmark_flag_la_OBJECTS)
 DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)/src/include
--- nufw-2.2.20old/src/nuauth/modules/mark_group/Makefile.in.avoid-version	2008-12-10 10:40:27.000000000 +0100
+++ nufw-2.2.20old/src/nuauth/modules/mark_group/Makefile.in	2008-12-12 11:24:01.000000000 +0100
@@ -54,6 +54,7 @@
 pluginLTLIBRARIES_INSTALL = $(INSTALL)
 LTLIBRARIES = $(plugin_LTLIBRARIES)
 libmark_group_la_LIBADD =
+libmark_group_la_LDFLAGS = -avoid-version
 am__libmark_group_la_SOURCES_DIST = mark_group.c mark_group.h
 am__objects_1 =
 @USE_MARK_GROUP_TRUE at am_libmark_group_la_OBJECTS = mark_group.lo \
--- nufw-2.2.20old/src/nuauth/modules/mark_uid/Makefile.in.avoid-version	2008-12-10 10:40:27.000000000 +0100
+++ nufw-2.2.20old/src/nuauth/modules/mark_uid/Makefile.in	2008-12-12 11:24:01.000000000 +0100
@@ -53,6 +53,7 @@
 pluginLTLIBRARIES_INSTALL = $(INSTALL)
 LTLIBRARIES = $(plugin_LTLIBRARIES)
 libmark_uid_la_LIBADD =
+libmark_uid_la_LDFLAGS = -avoid-version
 am_libmark_uid_la_OBJECTS = mark_uid.lo
 libmark_uid_la_OBJECTS = $(am_libmark_uid_la_OBJECTS)
 DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)/src/include
--- nufw-2.2.20old/src/nuauth/modules/plaintext/Makefile.in.avoid-version	2008-12-10 10:40:27.000000000 +0100
+++ nufw-2.2.20old/src/nuauth/modules/plaintext/Makefile.in	2008-12-12 11:24:01.000000000 +0100
@@ -54,6 +54,7 @@
 pluginLTLIBRARIES_INSTALL = $(INSTALL)
 LTLIBRARIES = $(plugin_LTLIBRARIES)
 libplaintext_la_LIBADD =
+libplaintext_la_LDFLAGS = -avoid-version
 am__libplaintext_la_SOURCES_DIST = plaintext.c auth_plaintext.h
 am__objects_1 =
 @USE_PLAINTEXT_AUTH_TRUE at am_libplaintext_la_OBJECTS = plaintext.lo \
--- nufw-2.2.20old/src/nuauth/modules/session_authtype/Makefile.in.avoid-version	2008-12-10 10:40:28.000000000 +0100
+++ nufw-2.2.20old/src/nuauth/modules/session_authtype/Makefile.in	2008-12-12 11:56:14.000000000 +0100
@@ -52,6 +52,7 @@
 am__installdirs = "$(DESTDIR)$(plugindir)"
 pluginLTLIBRARIES_INSTALL = $(INSTALL)
 LTLIBRARIES = $(plugin_LTLIBRARIES)
+lib_sessionauthtype_la_LDFLAGS = -avoid-version
 libsession_authtype_la_LIBADD =
 am_libsession_authtype_la_OBJECTS = session_authtype.lo
 libsession_authtype_la_OBJECTS = $(am_libsession_authtype_la_OBJECTS)
--- nufw-2.2.20old/src/nuauth/modules/session_expire/Makefile.in.avoid-version	2008-12-10 10:40:28.000000000 +0100
+++ nufw-2.2.20old/src/nuauth/modules/session_expire/Makefile.in	2008-12-12 11:57:05.000000000 +0100
@@ -52,6 +52,7 @@
 am__installdirs = "$(DESTDIR)$(plugindir)"
 pluginLTLIBRARIES_INSTALL = $(INSTALL)
 LTLIBRARIES = $(plugin_LTLIBRARIES)
+lib_sessionexpire_la_LDFLAGS = -avoid-version
 libsession_expire_la_LIBADD =
 am_libsession_expire_la_OBJECTS = session_expire.lo
 libsession_expire_la_OBJECTS = $(am_libsession_expire_la_OBJECTS)
@@ -476,7 +477,7 @@
 	tags uninstall uninstall-am uninstall-pluginLTLIBRARIES
 
 
-libsession_expire.la: $(libsession_expire_la_OBJECTS) $(libsession_expire_la_DEPENDENCIES) 
+libsession_expire.la: $(libsession_expire_la_OBJECTS) $(libsession_expire_la_DEPENDENCIES)
 	$(LINK) -rpath $(plugindir) $(lib_sessionexpire_la_LDFLAGS) $(libsession_expire_la_OBJECTS) $(libsession_expire_la_LIBADD)
 # 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.
--- nufw-2.2.20old/src/nuauth/modules/system/Makefile.in.avoid-version	2008-12-10 10:40:28.000000000 +0100
+++ nufw-2.2.20old/src/nuauth/modules/system/Makefile.in	2008-12-12 11:24:01.000000000 +0100
@@ -58,6 +58,7 @@
 am__libsystem_la_SOURCES_DIST = system.c getugroups.c
 @USE_SYSTEM_AUTH_TRUE at am_libsystem_la_OBJECTS = system.lo \
 @USE_SYSTEM_AUTH_TRUE@	getugroups.lo
+libsystem_la_LDFLAGS = -avoid-version
 libsystem_la_OBJECTS = $(am_libsystem_la_OBJECTS)
 @USE_SYSTEM_AUTH_TRUE at am_libsystem_la_rpath = -rpath $(plugindir)
 DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)/src/include
--- nufw-2.2.20old/src/nuauth/modules/x509_std/Makefile.in.avoid-version	2008-12-10 10:40:28.000000000 +0100
+++ nufw-2.2.20old/src/nuauth/modules/x509_std/Makefile.in	2008-12-12 11:24:01.000000000 +0100
@@ -57,6 +57,7 @@
 am__objects_1 =
 am_libx509_std_la_OBJECTS = x509_std.lo $(am__objects_1)
 libx509_std_la_OBJECTS = $(am_libx509_std_la_OBJECTS)
+libx509_std_la_LDFLAGS = -avoid-version
 DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)/src/include
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
--- nufw-2.2.20old/src/nuauth/modules/xml_defs/Makefile.in.avoid-version	2008-12-10 10:40:28.000000000 +0100
+++ nufw-2.2.20old/src/nuauth/modules/xml_defs/Makefile.in	2008-12-12 11:33:51.000000000 +0100
@@ -53,8 +53,10 @@
 am__installdirs = "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(includedir)"
 pluginLTLIBRARIES_INSTALL = $(INSTALL)
 LTLIBRARIES = $(plugin_LTLIBRARIES)
+libxml_defs_la_LDFLAGS = -avoid-version
 libxml_defs_la_LIBADD =
 am__objects_1 =
+am_libxml_defs_la_LDFLAGS = -avoid-version
 am_libxml_defs_la_OBJECTS = xml_defs.lo $(am__objects_1)
 libxml_defs_la_OBJECTS = $(am_libxml_defs_la_OBJECTS)
 DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)/src/include
@@ -501,7 +503,7 @@
 	uninstall-nodist_includeHEADERS uninstall-pluginLTLIBRARIES
 
 
-libxml_defs.la: $(libxml_defs_la_OBJECTS) $(libxml_defs_la_DEPENDENCIES) 
+libxml_defs.la: $(libxml_defs_la_OBJECTS) $(libxml_defs_la_DEPENDENCIES)
 	$(LINK) -rpath $(plugindir) $(libxml_defs_la_LDFLAGS) $(libxml_defs_la_OBJECTS) $(libxml_defs_la_LIBADD)
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.


--- NEW FILE nufw.init ---
#!/bin/sh
#
# nufw Startup script for nufw
#
# chkconfig:   - 86 16
# description: Nufw is user filtering firewall.

### BEGIN INIT INFO
# Provides:          nufw-nfqueue
# Required-Start:    $syslog
# Required-Stop:     $syslog
# Should-Start:      $local_fs
# Should-Stop:       $local_fs
# Default-Start:     
# Default-Stop:      0 1 2 3 4 5 6
# Short-Description: Control script for nufw
# Description:       Init script to control (start/stop/reload)
#                    the nufw server.
### END INIT INFO


# Source function library.
. /etc/rc.d/init.d/functions

exec=/usr/sbin/nufw
prog=nufw

[ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog

if [ -z "$NUFW_VERBOSITY" ]; then
  NUFW_VERBOSITY="vv"
fi

if [ "$NUFW_NUAUTH_ADDRESS" != "" ]; then
  NUFW_OPTIONS="$NUFW_OPTIONS -d $NUFW_NUAUTH_ADDRESS"
fi

if [ "$NUFW_NUAUTH_PORT" != "" ]; then
  NUFW_OPTIONS="$NUFW_OPTIONS -p $NUFW_NUAUTH_PORT"
fi

if [ "$NUFW_TIMEOUT" != "" ]; then
  NUFW_OPTIONS="$NUFW_OPTIONS -t $NUFW_TIMEOUT"
fi

if [ "$NUFW_TRACK_SIZE" != "" ]; then
  NUFW_OPTIONS="$NUFW_OPTIONS -T $NUFW_TRACK_SIZE"
fi

DAEMON_OPTS="-D -$NUFW_VERBOSITY   \
        $NUFW_OPTIONS \
        -k $NUFW_SSL_KEY -c $NUFW_SSL_CERTIFICATE -C -M -m"

lockfile=/var/lock/subsys/$prog

start() {
    if [ "$NUFW_START" != "true" ]; then
      exit 1
    fi
    [ -x $exec ] || exit 5
    #[ -f $config ] || exit 6
    echo -n $"Starting $prog: "
    daemon $exec $DAEMON_OPTS
    retval=$?
    echo
    [ $retval -eq 0 ] && touch $lockfile
    return $retval
}

stop() {
    echo -n $"Stopping $prog: "
    killproc $prog
    retval=$?
    echo
    [ $retval -eq 0 ] && rm -f $lockfile
    return $retval
}

restart() {
    stop
    start
}

reload() {
    restart
}

force_reload() {
    restart
}

rh_status() {
    # run checks to determine if the service is running or use generic status
    status $prog
}

rh_status_q() {
    rh_status >/dev/null 2>&1
}


case "$1" in
    start)
        rh_status_q && exit 0
        $1
        ;;
    stop)
        rh_status_q || exit 0
        $1
        ;;
    restart)
        $1
        ;;
    reload)
        rh_status_q || exit 7
        $1
        ;;
    force-reload)
        force_reload
        ;;
    status)
        rh_status
        ;;
    condrestart|try-restart)
        rh_status_q || exit 0
        restart
        ;;
    *)
        echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload}"
        exit 2
esac
exit $?



--- NEW FILE nufw.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

Name: nufw
Version: 2.2.20
Release: 5%{dist}
Summary: Authentication Firewall Suite for Linux
License: GPLv2
Group: System Environment/Daemons
Source: http://www.nufw.org/download/nufw/%{name}-%{version}.tar.bz2
Source1: nufw.init
Source2: nuauth.init
Source3: nuauth.pam
Source4: setup-python_nufw.py
Source5: version-python_nufw.py
Source6: README.python_nufw
Source7: sysconfig-nufw
Source8: sysconfig-nuauth
# added to the internal INL Bugtracker and will be fixed in the next release
Patch0: %{name}-avoid-version.patch
URL: http://www.nufw.org/

Requires: iptables python-IPy
Requires(pre): shadow-utils
Requires(post): chkconfig
Requires(preun): chkconfig
Requires(preun): initscripts
BuildRequires: postgresql-devel mysql-devel
BuildRequires: libtasn1-devel gnutls-devel glib2-devel pam-devel cyrus-sasl-devel chrpath
BuildRequires: openldap-devel iptables-devel
BuildRequires: libprelude-devel libnetfilter_queue-devel libnetfilter_conntrack-devel libnfnetlink-devel
BuildRequires: python-IPy python-setuptools python-devel
BuildRequires: dos2unix
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%description
NuFW is a firewall able to filter connection according to user uid or user
software, meaning you can allows port 80 for only one user, whatever ip he
uses, or only for konqueror.

NuFW performs an authentication of every single connection passing through the
IP filter, by transparently requesting user's credentials before any filtering
decision is taken. Practically, this means security policies can integrate with
the users directory, and bring the notion of user ID down to the IP layers.

%package utils
Summary: Various utilities for Nufw administrators
Group: Applications/Internet
%description utils
This package contains various utilities :

  * nutop : a top-like utility to watch connection

  * nuaclgen : a perl script to add users to ldap

%package -n libnuclient
Summary: Nuclient library
Group: System Environment/Libraries
%description -n libnuclient
Library needed by nufw for nuclient.

%package -n libnuclient-devel
Summary: Nuclient development library
Group: Development/Libraries
Requires: libnuclient = %{version}-%{release}
%description -n libnuclient-devel
Development file of the nuclient library, used to compile
client accessing to nufw.

%package -n pam_nufw
Summary: Nufw client using pam credentials
Group: System Environment/Libraries
BuildRequires: chrpath

%description -n pam_nufw
pam_nufw is a PAM module able to integrate with the PAM stack.
It reuse pam credentials to connect to nufw daemon, instead of requiring to
start nutcpc by hand.

%package -n nutcpc
Summary: Nufw client
Group: Applications/Internet
%description -n nutcpc
Nutcpc is the command line client used to authenticate on a firewall using
nufw.

%package -n nuauth
Summary: Nufw user database daemon
Group: System Environment/Daemons
Requires: cyrus-sasl-plain python-IPy perl-LDAP
Provides: nufw-nuauth-auth-plaintext = %{version}-%{release}
Provides: nufw-nuauth-log-syslog = %{version}-%{release}
Provides: nufw-nuauth-auth-system = %{version}-%{release}

%description -n nuauth
NuFW is an authenticating gateway, which means that connections are
authenticated before being forwarded through the gateway. Classical packet
filtering systems disregard the identity of the user who may be attempting
to access the network, instead caring only about the originating IP addresses.

Nuauth lays on a user database, and an ACL system (which can reside in an LDAP
directory, etc. Nuauth receives requests from nufw, and auth packets from
users' clients, and sends decision to the nufw daemon.

This package contains the main daemon.

%package -n nuauth-auth-ldap
Summary: Module for nuauth providing ldap user database
Group: System Environment/Libraries
%description -n nuauth-auth-ldap
This package provides a module to use ldap as user database for nuauth.

%package -n nuauth-log-mysql
Summary: Module for nuauth to log in Mysql database
Group: System Environment/Libraries
%description -n nuauth-log-mysql
This module allows you to log user activity in a mysql database.

%package -n nuauth-log-pgsql
Summary: Module for nuauth to log in Postgresql database
Group: System Environment/Libraries
%description -n nuauth-log-pgsql
This module allows you to log user activity in a postgresql database.

%package -n nuauth-log-prelude
Summary: Module for nuauth to log to Prelude IDS
Group: System Environment/Libraries
%description -n nuauth-log-prelude
This module allows you to log user activity to the Prelude IDS.

%package -n python-nufw
Summary: Python bindings for NuFW client (nutcpc)
Group: Development/Languages
BuildRequires: python-devel
BuildRequires: python-setuptools-devel
%description -n python-nufw
Bindings Python and nutcpc client for NuFW.

%prep
%setup -q
%patch0 -p1 -b .avoid-version

# fixup EOL
pushd "scripts"
dos2unix -q --keepdate nutop
popd

# fixup encoding
pushd "doc"
f=acls
iconv -f ISO8859-1 -t UTF-8 -o $f.new $f
touch -r $f $f.new
mv $f.new $f
popd

# fix postgresql name
perl -pi -e "s|postgresql|pgsql|" ./src/nuauth/modules/log_pgsql/Makefile*

perl -pi -e 's|^(modulesdir\s*=\s*/)lib|$1%_lib|' ./src/clients/pam_nufw/Makefile*
perl -pi -e 's|(\@modulesdir\s*=\s*/)lib|$1%_lib|' ./src/clients/pam_nufw/Makefile*

# fix nuauth-utils build
perl -pi -e 's|\$\(prefix\)|\%\{buildroot\}|' ./scripts/nuauth_command/Makefile*

%build
%configure \
 --sysconfdir=%{_sysconfdir}/nufw/ \
 --with-mysql-log --with-pgsql-log --with-system-auth --with-ldap \
 --with-nfqueue --with-nfconntrack --with-fixedtimeout --with-utf8 \
 --enable-pam-nufw --with-prelude-log

perl -pi -e 's|(install -d \$\(localstatedir\)/run/nuauth/)|#$1|'  ./src/nuauth/Makefile
make

%install
rm -rf %{buildroot}
make DESTDIR=%{buildroot} install

#install python bindings
cp %{SOURCE4} python/setup.py
cp %{SOURCE5} python/nuclient/version.py
cp %{SOURCE5} python/README
cd python; %{__python} setup.py install --no-compil --root=%{buildroot}; cd ..

cp -p scripts/nuaclgen %{buildroot}/%{_bindir}
cp -p scripts/nutop %{buildroot}/%{_bindir}

mkdir -p %{buildroot}/%{_sysconfdir}/nufw
cp -p conf/{nutop,nuauth,nuaclgen}.conf  %{buildroot}/%{_sysconfdir}/nufw
cp -p conf/{acls.nufw,periods.xml} %{buildroot}/%{_sysconfdir}/nufw
cp -p -R conf/certs/* %{buildroot}/%{_sysconfdir}/nufw
cp -p conf/users-plaintext.nufw %{buildroot}/%{_sysconfdir}/nufw/users.nufw

mkdir -p %{buildroot}/%{_localstatedir}/lib/nuauth
mkdir -p %{buildroot}/%{_localstatedir}/run/nuauth
# clean useless files
rm -f %{buildroot}/%{_libdir}/nuauth/modules/*.{a,la}
rm -f %{buildroot}/%{_lib}/security/*{a,la}
rm -f %{buildroot}/%{_libdir}/libnobuffer*

mkdir -p %{buildroot}/%_initrddir/
install -m755 %SOURCE1 %{buildroot}/%_initrddir/nufw
install -m755 %SOURCE2  %{buildroot}/%_initrddir/nuauth

mkdir -p %{buildroot}/%{_sysconfdir}/sysconfig/
cp -p %SOURCE7 %{buildroot}%{_sysconfdir}/sysconfig/nufw
cp -p %SOURCE8 %{buildroot}%{_sysconfdir}/sysconfig/nufw

mkdir %{buildroot}/%{_sysconfdir}/pam.d/
cp -p %SOURCE3 %{buildroot}/%{_sysconfdir}/pam.d/nuauth

chrpath --delete $RPM_BUILD_ROOT%{_bindir}/nutcpc
chrpath --delete $RPM_BUILD_ROOT/%{_lib}/security/pam_nufw.so

%clean
rm -rf %{buildroot}

%post
/sbin/chkconfig --add nufw

%post -n libnuclient -p /sbin/ldconfig

%postun
if [ "$1" -ge "1" ]; then
    service nufw condrestart > /dev/null 2>&1 ||:
fi

%postun -n libnuclient -p /sbin/ldconfig

%preun
if [ $1 = 0 ] ; then
 /sbin/service nufw stop >/dev/null 2>&1
 /sbin/chkconfig --del nufw
fi

%pre -n nuauth
getent group nuauth >/dev/null || groupadd -r nuauth
getent passwd nuauth >/dev/null || \
useradd -r -g nuauth -d %{_localstatedir}/lib/nuauth -s /sbin/nologin \
-c "Privilege-separated Nuauth" nuauth
exit 0

%post -n nuauth
/sbin/chkconfig --add nuauth

%preun -n nuauth
if [ $1 = 0 ]; then
 /sbin/service nuauth stop >/dev/null 2>&1
 /sbin/chkconfig --del nuauth
fi

%postun -n nuauth
if [ "$1" -ge "1" ]; then
 service nuauth condrestart > /dev/null 2>&1 ||:
fi

%files
%defattr(-, root, root, -)
%doc AUTHORS ChangeLog NEWS README TODO COPYING
%doc doc/acls doc/cache_system doc/debug
%{_sbindir}/nufw
%{_mandir}/man8/nufw.8*
%{_initrddir}/nufw
%config(noreplace) %{_sysconfdir}/sysconfig/nufw
%dir %{_sysconfdir}/nufw/
%config(noreplace) %attr(0600,-,-) %{_sysconfdir}/%{name}/NuFW-cacert.pem
%config(noreplace) %attr(0600,-,-) %{_sysconfdir}/%{name}/nufw-cert.pem
%config(noreplace) %attr(0600,-,-) %{_sysconfdir}/%{name}/nufw-key.pem
%config(noreplace) %attr(0600,-,-) %{_sysconfdir}/%{name}/user at nufw.org-cert.pem
%config(noreplace) %attr(0600,-,-) %{_sysconfdir}/%{name}/user at nufw.org-key.pem
%config(noreplace) %attr(0600,-,-) %{_sysconfdir}/%{name}/admin at nufw.org-cert.pem
%config(noreplace) %attr(0600,-,-) %{_sysconfdir}/%{name}/admin at nufw.org-key.pem

%files utils
%defattr(-, root, root, -)
%{_bindir}/nuaclgen
%{_bindir}/nutop
%{_mandir}/man8/nuaclgen.8*
%{_mandir}/man8/nutop.8*
%config(noreplace) %{_sysconfdir}/nufw/nutop.conf
%config(noreplace) %{_sysconfdir}/nufw/nuaclgen.conf
%dir %{_sysconfdir}/nufw/

%files -n libnuclient
%defattr(-, root, root, -)
%{_libdir}/libnuclient.so.*

%files -n libnuclient-devel
%defattr(-, root, root, -)
%exclude %{_libdir}/libnuclient.a
%exclude %{_libdir}/libnuclient.la
%{_libdir}/libnuclient.so
%{_includedir}/*
%{_mandir}/man3/libnuclient.3*

%files -n pam_nufw
%defattr(-, root, root, -)
%doc doc/README.pam_nufw
/%{_lib}/security/pam_nufw.so

%files -n nuauth-auth-ldap
%defattr(-, root, root, -)
%doc conf/acls.schema
%{_libdir}/nuauth/modules/libldap.so*

%files -n nuauth-log-mysql
%defattr(-, root, root, -)
%doc conf/nulog*mysql.dump
%{_libdir}/nuauth/modules/libmysql.so*

%files -n nuauth-log-pgsql
%defattr(-, root, root, -)
%doc conf/nulog*pgsql.dump
%{_libdir}/nuauth/modules/libpgsql.so*

%files -n nuauth-log-prelude
%defattr(-, root, root, -)
%{_libdir}/nuauth/modules/libnuprelude.so*

%files -n nuauth
%defattr(-, root, root, -)
%{_sbindir}/nuauth
%{_mandir}/man8/nuauth.8*
%{_mandir}/man5/nuclient.conf.5*
%{_localstatedir}/lib/nuauth
%dir %{_localstatedir}/run/nuauth/
%{_initrddir}/nuauth
%config(noreplace) %{_sysconfdir}/%{name}/nuauth.conf
%config(noreplace) %{_sysconfdir}/%{name}/periods.xml
%config(noreplace) %{_sysconfdir}/%{name}/users.nufw
%config(noreplace) %{_sysconfdir}/%{name}/acls.nufw
%config(noreplace) %attr(0600, nuauth, nuauth) %{_sysconfdir}/%{name}/nuauth-key.pem
%config(noreplace) %attr(0600, nuauth, nuauth) %{_sysconfdir}/%{name}/nuauth-cert.pem
%config(noreplace) %{_sysconfdir}/pam.d/nuauth
%dir %{_sysconfdir}/%{name}/
%{_libdir}/nuauth/modules/libsyslog.so*
%{_libdir}/nuauth/modules/libplaintext.so*
%{_libdir}/nuauth/modules/libsystem.so*
%{_libdir}/nuauth/modules/libscript.so*
%{_libdir}/nuauth/modules/libx509_std.so*
%{_libdir}/nuauth/modules/libxml_defs.so*
%{_libdir}/nuauth/modules/libipauth_guest.so*
%{_libdir}/nuauth/modules/libmark_field.so*
%{_libdir}/nuauth/modules/libmark_flag.so*
%{_libdir}/nuauth/modules/libmark_group.so*
%{_libdir}/nuauth/modules/libmark_uid.so*
%{_libdir}/nuauth/modules/libsession_expire.so*
%{_libdir}/nuauth/modules/libsession_authtype.so*

%files -n nutcpc
%defattr(-, root, root, -)
%{_bindir}/nutcpc
%{_mandir}/man1/nutcpc.1*

%files -n python-nufw
%defattr(-, root, root)
%{python_sitelib}/*egg-info
%{python_sitelib}/nuclient/*

%changelog
* Fri Dec 19 2008 Jerome Soyer <saispo at gmail.com> 2.2.20-5
- Add "touch -r" in the charset conversion for keeping timestamps

* Thu Dec 18 2008 Jerome Soyer <saispo at gmail.com> 2.2.20-4
- Separate in two sysconfig files
- Fix initscripts
- Fix BuilRequires on nuauth-utils
- Fix permissions on cert and key file

* Wed Dec 17 2008 Jerome Soyer <saispo at gmail.com> 2.2.20-3
- Remove useless BuildRequires on python-nufw
- Make a source for /etc/sysconfig/nufw file
- Fix DefaultStop in initscripts
- Fix mix tabs and spaces
- Remove useless ldconfig

* Fri Dec 12 2008 Jerome Soyer <saispo at gmail.com> 2.2.20-2
- Fix ldconfig for libnuclient
- Remove useless Provides
- Fix encoding and end line encoding
- Remove delete user
- Fix nutcpc group
- Fix initscripts
- Modify Patch0 for readding "-avoid-version" in missing Makefile.in and sent upstream

* Mon Dec 10 2008 Jerome Soyer <saispo at gmail.com> 2.2.20-1
- Initial Fedora Package


--- NEW FILE setup-python_nufw.py ---
#!/usr/bin/python
from imp import load_source
from os import path
import sys

if "--setuptools" in sys.argv:
    sys.argv.remove("--setuptools")
    from setuptools import setup
else:
    from distutils.core import setup

CLASSIFIERS = [
    'Intended Audience :: Developers',
    'Development Status :: 5 - Production/Stable',
    'License :: OSI Approved :: GNU General Public License (GPL)',
    'Operating System :: OS Independent',
    'Natural Language :: English',
    'Programming Language :: Python',
]

def main():
    nuclient = load_source("version", path.join("nuclient", "version.py"))
    install_options = {
        "name": "nuclient",
        "version": nuclient.VERSION,
        "url": nuclient.WEBSITE,
        "download_url": nuclient.WEBSITE,
        "author": "Victor Stinner",
        "description": "Python binding of libnuclient library, object oriented",
        "long_description": open('README').read(),
        "classifiers": CLASSIFIERS,
        "license": nuclient.LICENSE,
        "packages": ["nuclient"],
        "package_dir": {"nuclient": "nuclient"},
    }
    setup(**install_options)

if __name__ == "__main__":
    main()



--- NEW FILE sysconfig-nuauth ---
#Change to "true" for Nufw to be started
NUAUTH_START="true"

#Add "v"s so nufw gets more verbose
NUAUTH_VERBOSITY="vv"

#User nuauth runs on. Change this to some entry existing in /etc/passwd
NUAUTH_USER="nuauth"

#EDIT /etc/nuauth/nuauth.conf for other options!


--- NEW FILE sysconfig-nufw ---
#Change to "true" for Nufw to be started
NUFW_START="true"

#Add "v"s so nufw gets more verbose
NUFW_VERBOSITY="vv"

#Address of the nuauth server
#NUFW_NUAUTH_ADDRESS="127.0.0.1"

#UDP port the nuauth server listens on
#NUFW_NUAUTH_PORT=4128

#Timeout to forget about packets when there's no match (seconds)
#NUFW_TIMEOUT=15

#Track Size
#NUFW_TRACK_SIZE=1000

#SSL certificates and keys
NUFW_SSL_CERTIFICATE="/etc/nufw/nufw-cert.pem"
NUFW_SSL_KEY="/etc/nufw/nufw-key.pem"

# Additional options
# For ex., add -s here to disable TLS strict checking mode
# See http://nufw.org/docs/handbook22.html#hardening
NUFW_OPTIONS=""


--- NEW FILE version-python_nufw.py ---
VERSION = "0.0"
LICENSE = "GNU GPLv2"
WEBSITE = "http://software.inl.fr/trac/wiki/EdenWall/NuFW"



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/nufw/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	9 Jan 2009 05:51:35 -0000	1.1
+++ .cvsignore	9 Jan 2009 22:00:25 -0000	1.2
@@ -0,0 +1 @@
+nufw-2.2.20.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nufw/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	9 Jan 2009 05:51:36 -0000	1.1
+++ sources	9 Jan 2009 22:00:25 -0000	1.2
@@ -0,0 +1 @@
+a5163fd12dd5a8710a95232ddbf3e74f  nufw-2.2.20.tar.bz2



From red at fedoraproject.org  Fri Jan  9 22:01:45 2009
From: red at fedoraproject.org (Sandro Mathys)
Date: Fri,  9 Jan 2009 22:01:45 +0000 (UTC)
Subject: rpms/javassist/F-10 import.log, NONE,
	1.1 javassist-buildfile-nosource1.4-nosrcjar.patch, NONE,
	1.1 javassist.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090109220145.C45CD7011C@cvs1.fedora.phx.redhat.com>

Author: red

Update of /cvs/pkgs/rpms/javassist/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14120/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	import.log javassist-buildfile-nosource1.4-nosrcjar.patch 
	javassist.spec 
Log Message:
* Fri Jan 09 2009 Sandro Mathys <red at fedoraproject.org> - 3.9.0-1
- initial commit




--- NEW FILE import.log ---
javassist-3_9_0-1_fc11:F-10:javassist-3.9.0-1.fc11.src.rpm:1231538442

javassist-buildfile-nosource1.4-nosrcjar.patch:

--- NEW FILE javassist-buildfile-nosource1.4-nosrcjar.patch ---
--- build.xml.old	2008-10-09 19:51:16.000000000 +0200
+++ build.xml	2008-12-09 16:27:29.000000000 +0100
@@ -155,17 +155,19 @@
 to ${build.classes.dir}.</echo>
   </target>
 
-  <target name="jar" depends="compile14">
+  <target name="jar" depends="compile">
     <jar jarfile="${target.jar}" manifest="${src.dir}/META-INF/MANIFEST.MF">
       <fileset dir="${build.classes.dir}">
       	  <include name="**/*.class"/>
       </fileset>
      </jar>
+    <!--
     <jar jarfile="${target-src.jar}" manifest="${src.dir}/META-INF/MANIFEST.MF">
       <fileset dir="${src.dir}">
         <include name="javassist/**"/>
       </fileset>
     </jar>
+    -->
   </target>
 
   <target name="javadocs">


--- NEW FILE javassist.spec ---
Name:           javassist
Version:        3.9.0
Release:        1%{?dist}
Summary:        The Java Programming Assistant provides simple Java bytecode manipulation
Group:          Development/Libraries
License:        MPLv1.1 or LGPLv2+
URL:            http://www.csg.is.titech.ac.jp/~chiba/javassist/
Source0:        http://downloads.sourceforge.net/jboss/%{name}3.9.GA.zip
Patch0:         javassist-buildfile-nosource1.4-nosrcjar.patch
BuildArch:      noarch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:     java-devel >= 1:1.6.0
BuildRequires:     jpackage-utils
BuildRequires:     ant
Requires:          java >= 1:1.6.0
Requires:          jpackage-utils

%description
Javassist enables Java programs to define a new class at runtime and to
modify a class file when the JVM loads it. Unlike other similar
bytecode editors, Javassist provides two levels of API: source level
and bytecode level. If the users use the source-level API, they can
edit a class file without knowledge of the specifications of the Java
bytecode. The whole API is designed with only the vocabulary of the
Java language. You can even specify inserted bytecode in the form of
source text; Javassist compiles it on the fly. On the other hand, the
bytecode-level API allows the users to directly edit a class file as
other editors.


%package javadoc
Summary:           Javadocs for javassist
Group:             Documentation
Requires:          %{name} = %{version}-%{release}
Requires:          jpackage-utils

%description javadoc
javassist development documentation.


%prep
%setup -q # -n %{name}-%{version}
%patch0 -p0

rm -rf *.jar html


%build
ant clean jar javadocs


%install
rm -rf $RPM_BUILD_ROOT

# jar
install -d $RPM_BUILD_ROOT%{_javadir}
install -m644 %{name}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar

# javadoc
install -d $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
cp -rp html/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc License.html
%{_javadir}/%{name}.jar
%{_javadir}/%{name}-%{version}.jar

%files javadoc
%defattr(-,root,root,-)
%dir %{_javadocdir}/%{name}-%{version}
%{_javadocdir}/%{name}
%{_javadocdir}/%{name}-%{version}/*


%changelog
* Tue Dec 16 2008 Sandro Mathys <red at fedoraproject.org> - 3.9.0-1
- initial build


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/javassist/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	4 Jan 2009 20:45:42 -0000	1.1
+++ .cvsignore	9 Jan 2009 22:01:15 -0000	1.2
@@ -0,0 +1 @@
+javassist3.9.GA.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/javassist/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	4 Jan 2009 20:45:42 -0000	1.1
+++ sources	9 Jan 2009 22:01:15 -0000	1.2
@@ -0,0 +1 @@
+b1a54a77359355f10b40129a91f30b00  javassist3.9.GA.zip



From than at fedoraproject.org  Fri Jan  9 22:14:47 2009
From: than at fedoraproject.org (Than Ngo)
Date: Fri,  9 Jan 2009 22:14:47 +0000 (UTC)
Subject: rpms/kde-l10n/devel kde-l10n.spec,1.56,1.57
Message-ID: <20090109221447.D232B7011C@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kde-l10n/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16293

Modified Files:
	kde-l10n.spec 
Log Message:
test build



Index: kde-l10n.spec
===================================================================
RCS file: /cvs/extras/rpms/kde-l10n/devel/kde-l10n.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- kde-l10n.spec	8 Jan 2009 21:42:32 -0000	1.56
+++ kde-l10n.spec	9 Jan 2009 22:14:16 -0000	1.57
@@ -758,7 +758,9 @@
 %setup -q -n %{name}-%{version} -c
 
 for i in $(cat %{SOURCE1000}) ; do
-  tar jxf %{_sourcedir}/%{name}-$i-%{version}.tar.bz2
+  ls -l  %{_sourcedir}/%{name}-$i-%{version}.tar.bz2
+  bzip2 -dc %{_sourcedir}/%{name}-$i-%{version}.tar.bz2 | tar -xf -
+  #tar jxf %{_sourcedir}/%{name}-$i-%{version}.tar.bz2
 done
 
 %build



From wtogami at fedoraproject.org  Fri Jan  9 22:17:59 2009
From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=)
Date: Fri,  9 Jan 2009 22:17:59 +0000 (UTC)
Subject: rpms/k12linux-quick-start-guide/F-10 .cvsignore, 1.3,
	1.4 k12linux-quick-start-guide.spec, 1.2, 1.3 sources, 1.3, 1.4
Message-ID: <20090109221759.345EA7011C@cvs1.fedora.phx.redhat.com>

Author: wtogami

Update of /cvs/pkgs/rpms/k12linux-quick-start-guide/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16950

Modified Files:
	.cvsignore k12linux-quick-start-guide.spec sources 
Log Message:
Fix up the language a bit



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/k12linux-quick-start-guide/F-10/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	4 Jan 2009 16:18:46 -0000	1.3
+++ .cvsignore	9 Jan 2009 22:17:28 -0000	1.4
@@ -1 +1 @@
-k12linux-quick-start-guide-0.0.10.tar.bz2
+k12linux-quick-start-guide-0.0.11.tar.bz2


Index: k12linux-quick-start-guide.spec
===================================================================
RCS file: /cvs/pkgs/rpms/k12linux-quick-start-guide/F-10/k12linux-quick-start-guide.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- k12linux-quick-start-guide.spec	4 Jan 2009 16:18:46 -0000	1.2
+++ k12linux-quick-start-guide.spec	9 Jan 2009 22:17:28 -0000	1.3
@@ -1,5 +1,5 @@
 Name:           k12linux-quick-start-guide
-Version:        0.0.10
+Version:        0.0.11
 Release:        1%{?dist}
 Summary:        Quick Start Guide for K12Linux Live LTSP Server
 
@@ -48,6 +48,9 @@
 
 
 %changelog
+* Fri Jan 09 2009 Warren Togami <wtogami at redhat.com> - 0.0.11-1
+- Fix up the language a bit
+
 * Sun Jan 04 2009 Peter Scheie <peter at scheie.homedns.org> - 0.0.10-1
 - Moved 'version 5' phrase describing version of LTSP to bottom of html
   document.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/k12linux-quick-start-guide/F-10/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	4 Jan 2009 16:18:46 -0000	1.3
+++ sources	9 Jan 2009 22:17:28 -0000	1.4
@@ -1 +1 @@
-81f0ed54497313c6364e11f66014d758  k12linux-quick-start-guide-0.0.10.tar.bz2
+6e945c258d530ddef8f5588ebacfe3cc  k12linux-quick-start-guide-0.0.11.tar.bz2



From beuc at fedoraproject.org  Fri Jan  9 22:22:57 2009
From: beuc at fedoraproject.org (Sylvain Beucler)
Date: Fri,  9 Jan 2009 22:22:57 +0000 (UTC)
Subject: rpms/freedink/devel freedink.spec,1.3,1.4
Message-ID: <20090109222257.D3DCA7011C@cvs1.fedora.phx.redhat.com>

Author: beuc

Update of /cvs/pkgs/rpms/freedink/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17633

Modified Files:
	freedink.spec 
Log Message:
Bump version to fix build tag issue


Index: freedink.spec
===================================================================
RCS file: /cvs/pkgs/rpms/freedink/devel/freedink.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- freedink.spec	9 Jan 2009 21:59:17 -0000	1.3
+++ freedink.spec	9 Jan 2009 22:22:27 -0000	1.4
@@ -1,6 +1,6 @@
 Name:		freedink
 Version:	1.08.20090109
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Adventure and role-playing game
 
 Group:		Amusements/Games
@@ -103,6 +103,9 @@
 
 
 %changelog
+* Wed Jan  9 2009 Sylvain Beucler <beuc at beuc.net> - 1.08.20090109-2
+- Bump version to fix build tag issue
+
 * Wed Jan  9 2009 Sylvain Beucler <beuc at beuc.net> - 1.08.20090109-1
 - New upstream release
 - Declare .mo translation catalogs



From wtogami at fedoraproject.org  Fri Jan  9 22:25:17 2009
From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=)
Date: Fri,  9 Jan 2009 22:25:17 +0000 (UTC)
Subject: rpms/k12linux-quick-start-guide/F-9 .cvsignore, 1.4,
	1.5 k12linux-quick-start-guide.spec, 1.3, 1.4 sources, 1.4, 1.5
Message-ID: <20090109222517.8F49F7011C@cvs1.fedora.phx.redhat.com>

Author: wtogami

Update of /cvs/pkgs/rpms/k12linux-quick-start-guide/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18104

Modified Files:
	.cvsignore k12linux-quick-start-guide.spec sources 
Log Message:
Fix up the language a bit



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/k12linux-quick-start-guide/F-9/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	4 Jan 2009 16:05:25 -0000	1.4
+++ .cvsignore	9 Jan 2009 22:24:47 -0000	1.5
@@ -1 +1 @@
-k12linux-quick-start-guide-0.0.10.tar.bz2
+k12linux-quick-start-guide-0.0.11.tar.bz2


Index: k12linux-quick-start-guide.spec
===================================================================
RCS file: /cvs/pkgs/rpms/k12linux-quick-start-guide/F-9/k12linux-quick-start-guide.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- k12linux-quick-start-guide.spec	4 Jan 2009 16:05:26 -0000	1.3
+++ k12linux-quick-start-guide.spec	9 Jan 2009 22:24:47 -0000	1.4
@@ -1,5 +1,5 @@
 Name:           k12linux-quick-start-guide
-Version:        0.0.10
+Version:        0.0.11
 Release:        1%{?dist}
 Summary:        Quick Start Guide for K12Linux Live LTSP Server
 
@@ -48,6 +48,9 @@
 
 
 %changelog
+* Fri Jan 09 2009 Warren Togami <wtogami at redhat.com> - 0.0.11-1
+- Fix up the language a bit
+
 * Sun Jan 04 2009 Peter Scheie <peter at scheie.homedns.org> - 0.0.10-1
 - Moved 'version 5' phrase describing version of LTSP to bottom of html
   document.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/k12linux-quick-start-guide/F-9/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	4 Jan 2009 16:05:26 -0000	1.4
+++ sources	9 Jan 2009 22:24:47 -0000	1.5
@@ -1 +1 @@
-81f0ed54497313c6364e11f66014d758  k12linux-quick-start-guide-0.0.10.tar.bz2
+6e945c258d530ddef8f5588ebacfe3cc  k12linux-quick-start-guide-0.0.11.tar.bz2



From saispo at fedoraproject.org  Fri Jan  9 22:28:46 2009
From: saispo at fedoraproject.org (Jerome Soyer)
Date: Fri,  9 Jan 2009 22:28:46 +0000 (UTC)
Subject: rpms/clamtk/F-10 clamtk.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090109222846.8855A7013F@cvs1.fedora.phx.redhat.com>

Author: saispo

Update of /cvs/pkgs/rpms/clamtk/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17310/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	clamtk.spec import.log 
Log Message:
* Wed Jan 07 2009 Jerome Soyer <saispo at gmail.com> - 4.08-4
- Remove script from prep section




--- NEW FILE clamtk.spec ---
Summary:        Easy to use front-end for ClamAV
Name:           clamtk
Version:        4.08
Release:        4%{dist}
License:        GPL+ or Artistic
Group:          Applications/System
URL:            http://clamtk.sourceforge.net/
Source:         http://downloads.sourceforge.net/clamtk/%{name}-%{version}.tar.gz
BuildRequires:  desktop-file-utils
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
Requires:       clamav >= 0.90 clamav-data
BuildArch:      noarch
BuildRoot:  %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

%description
ClamTk is a GUI front-end for ClamAV using Gtk2-perl.
It is designed to be an easy-to-use, point and click
virus scanner for Linux systems.

%prep
%setup -q

%build

%install
rm -rf $RPM_BUILD_ROOT

install -D -m0755 clamtk $RPM_BUILD_ROOT%{_bindir}/clamtk
install -D -m0644 clamtk.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/clamtk.png
install -D -m0644 clamtk.1.gz $RPM_BUILD_ROOT%{_mandir}/man1/clamtk.1.gz
install -D -m0644 clamtk.desktop $RPM_BUILD_ROOT%{_datadir}/applications/clamtk.desktop

install -d "$RPM_BUILD_ROOT%{perl_vendorlib}/ClamTk"
install -m0644 lib/*.pm "$RPM_BUILD_ROOT%{perl_vendorlib}/ClamTk/"


for n in po/*.mo ; do
        install -D -m0644 $n $RPM_BUILD_ROOT%{_datadir}/locale/`basename $n .mo`/LC_MESSAGES/clamtk.mo
done

desktop-file-install \
        --add-category="GTK" \
        --add-category="Security" \
        --remove-category="Utility" \
        --dir $RPM_BUILD_ROOT%{_datadir}/applications $RPM_BUILD_ROOT%{_datadir}/applications/*

%find_lang %{name}

%post
update-desktop-database &> /dev/null || :

%postun
update-desktop-database &> /dev/null || :

%clean
rm -rf $RPM_BUILD_ROOT

%files -f %{name}.lang
%defattr(-,root,root, -)
%doc CHANGES DISCLAIMER LICENSE README
%{_bindir}/%{name}
%{perl_vendorlib}/ClamTk
%{_datadir}/applications/%{name}.desktop
%{_datadir}/pixmaps/clamtk.png
%{_mandir}/man1/%{name}.1.*

%changelog
* Wed Jan 07 2009 Jerome Soyer <saispo at gmail.com> - 4.08-4
- Remove script from prep section

* Wed Jan 07 2009 Jerome Soyer <saispo at gmail.com> - 4.08-3
- Add Perl Provides and Requires in prep section
- Add Requires on Perl

* Tue Jan 06 2009 Jerome Soyer <saispo at gmail.com> - 4.08-2
- Change Licence tag
- Remove unneeded Requires and BuildRequires
- Remove scriptlets "update-mime-database"
- Move *.pm into regular Perl modules

* Fri Jan 02 2009 Jerome Soyer <saispo at gmail.com> - 4.08-1
- New upstream release

* Wed Dec 10 2008 Jerome Soyer <saispo at gmail.com> - 4.06-2
- Fix RPM Group
- Bump Release

* Thu Dec 09 2008 Jerome Soyer <saispo at gmail.com> - 4.06-1
- First Fedora Package


--- NEW FILE import.log ---
clamtk-4_08-4_fc11:F-10:clamtk-4.08-4.fc11.src.rpm:1231539399


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/clamtk/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	9 Jan 2009 05:34:14 -0000	1.1
+++ .cvsignore	9 Jan 2009 22:28:16 -0000	1.2
@@ -0,0 +1 @@
+clamtk-4.08.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/clamtk/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	9 Jan 2009 05:34:14 -0000	1.1
+++ sources	9 Jan 2009 22:28:16 -0000	1.2
@@ -0,0 +1 @@
+c052668af7941bc89cd3af32ff5fa633  clamtk-4.08.tar.gz



From afsilva at fedoraproject.org  Fri Jan  9 23:07:32 2009
From: afsilva at fedoraproject.org (Anderson de Farias Silva)
Date: Fri,  9 Jan 2009 23:07:32 +0000 (UTC)
Subject: rpms/rpmrebuild/devel .cvsignore, 1.4, 1.5 rpmrebuild.spec, 1.4,
	1.5 sources, 1.4, 1.5
Message-ID: <20090109230732.AE1C97011C@cvs1.fedora.phx.redhat.com>

Author: afsilva

Update of /cvs/pkgs/rpms/rpmrebuild/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23781

Modified Files:
	.cvsignore rpmrebuild.spec sources 
Log Message:
update rpmrebuild 2.3


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rpmrebuild/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	11 May 2008 23:41:45 -0000	1.4
+++ .cvsignore	9 Jan 2009 23:07:01 -0000	1.5
@@ -1 +1 @@
-rpmrebuild-2.2.2.tar.gz
+rpmrebuild-2.3.tar.gz


Index: rpmrebuild.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rpmrebuild/devel/rpmrebuild.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- rpmrebuild.spec	4 Dec 2008 17:22:16 -0000	1.4
+++ rpmrebuild.spec	9 Jan 2009 23:07:01 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           rpmrebuild
-Version:        2.2.2
-Release:        2%{?dist}
+Version:        2.3
+Release:        1%{?dist}
 Summary:        A tool to build rpm file from rpm database
 
 Group:          Development/Tools
@@ -49,31 +49,6 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-
-%postun
-# Remove all lines which contain 'RPMREBUILD START' 
-# to 'RPMREBUILD END' in %{_sysconfdir}/popt
-[ $1 -eq 0 ] || exit 0
-if [ -f %{_sysconfdir}/popt ]; then
-  sed -i -e '/RPMREBUILD START/,/RPMREBUILD END/d' %{_sysconfdir}/popt
-fi
-
-%triggerin -- rpm
-########################################
-# This code should remove all lines from
-# the line contains 'RPMREBUILD START'
-# till (include) line 'RPMREBUILD END'
-# in the file /etc/popt
-########################################
-
-POPT=/etc/popt
-
-if [ -f $POPT ]; then
-   sed -i -e '/RPMREBUILD START/,/RPMREBUILD END/d' $POPT
-fi
-cat /usr/lib/rpmrebuild/popt-with-POPTdesc >> /etc/popt || exit
-
-
 %files
 %defattr(-,root,root,-)
 %doc VERSION AUTHORS Changelog COPYING COPYRIGHT News Todo README
@@ -87,8 +62,9 @@
 %attr(0755,root,root) %{_prefix}/lib/rpmrebuild/plugins/nodoc.sh
 %attr(0755,root,root) %{_prefix}/lib/rpmrebuild/rpmrebuild_parser.src
 %attr(0755,root,root) %{_prefix}/lib/rpmrebuild/processing_func.src
+%attr(0755,root,root) %{_prefix}/lib/rpmrebuild/rpmrebuild_rpmqf.src
+%attr(0644,root,root) %{_prefix}/lib/rpmrebuild/rpmrebuild.usedtags
 %attr(0755,root,root) %{_prefix}/lib/rpmrebuild/rpmrebuild_buildroot.sh
-%attr(0755,root,root) %{_prefix}/lib/rpmrebuild/run.sh
 %attr(0755,root,root) %{_prefix}/lib/rpmrebuild/spec_func.src
 %attr(0755,root,root) %{_prefix}/lib/rpmrebuild/rpmrebuild.sh
 %attr(0755,root,root) %{_prefix}/lib/rpmrebuild/plugins/uniq.sh
@@ -98,16 +74,12 @@
 %attr(0755,root,root) %{_prefix}/lib/rpmrebuild/plugins/demofiles.sh
 %attr(0755,root,root) %{_prefix}/lib/rpmrebuild/rpmrebuild_ghost.sh
 %attr(0755,root,root) %{_prefix}/lib/rpmrebuild/rpmrebuild_files.sh
-%{_prefix}/lib/rpmrebuild/.popt
 %{_prefix}/lib/rpmrebuild/plugins/set_tag.plug
 %{_prefix}/lib/rpmrebuild/plugins/nodoc.plug
 %{_prefix}/lib/rpmrebuild/plugins/demo.plug
 %{_prefix}/lib/rpmrebuild/plugins/file2pacDep.plug
 %{_prefix}/lib/rpmrebuild/plugins/uniq.plug
 %{_prefix}/lib/rpmrebuild/plugins/demofiles.plug
-%{_prefix}/lib/rpmrebuild/popt-with-POPTdesc
-%{_prefix}/lib/rpmrebuild/popt-without-POPTdesc
-%{_prefix}/lib/rpmrebuild/rpmrebuild_popt
 %{_prefix}/lib/rpmrebuild/locale/en/rpmrebuild.lang
 %{_prefix}/lib/rpmrebuild/locale/fr_FR.UTF-8/rpmrebuild.lang
 %{_prefix}/lib/rpmrebuild/locale/fr_FR/rpmrebuild.lang
@@ -129,6 +101,8 @@
 %{_mandir}/man1/set_tag.plug.1rrp.gz
 
 %changelog
+* Fri Jan 09 2009 Anderson Silva <ansilva at redhat.com> 2.3-1
+- Introduces some fixes for compatibility with rpm 4.6.0 
 * Thu Dec 04 2008 Anderson Silva <ansilva at redhat.com> 2.2.2-2
 - Fix package ownership of locale directories.
 * Sun May 11 2008 Anderson Silva <ansilva at redhat.com> 2.2.2-1


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rpmrebuild/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	11 May 2008 23:41:45 -0000	1.4
+++ sources	9 Jan 2009 23:07:01 -0000	1.5
@@ -1 +1 @@
-f71634348cb2cb570bf19dde1166620f  rpmrebuild-2.2.2.tar.gz
+c54efb0e46861deedfffed29a15d0e6b  rpmrebuild-2.3.tar.gz



From than at fedoraproject.org  Fri Jan  9 23:09:13 2009
From: than at fedoraproject.org (Than Ngo)
Date: Fri,  9 Jan 2009 23:09:13 +0000 (UTC)
Subject: rpms/kde-l10n/F-10 kde-l10n.spec,1.51,1.52
Message-ID: <20090109230913.DE5437011C@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kde-l10n/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24019

Modified Files:
	kde-l10n.spec 
Log Message:
fix file listfor gl/nb



Index: kde-l10n.spec
===================================================================
RCS file: /cvs/extras/rpms/kde-l10n/F-10/kde-l10n.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- kde-l10n.spec	9 Jan 2009 21:21:50 -0000	1.51
+++ kde-l10n.spec	9 Jan 2009 23:08:43 -0000	1.52
@@ -2,7 +2,7 @@
 
 Name: kde-l10n
 Version: 4.1.4
-Release: 1%{dist}
+Release: 2%{dist}
 Url: http://www.kde.org
 Summary: Internationalization support for KDE
 Group: User Interface/Desktops
@@ -1001,6 +1001,8 @@
 %defattr(-,root,root)
 %lang(gl) %{_datadir}/locale/gl/*
 %lang(gl) %{_kde4_appsdir}/kvtml/gl
+%lang(gl) %{_kde4_appsdir}/ktuberling/sounds/gl.soundtheme         
+%lang(gl) %{_kde4_appsdir}/ktuberling/sounds/gl/
 %lang(gl) %{_kde4_docdir}/HTML/gl
 
 %if %{buildall}
@@ -1146,6 +1148,7 @@
 %lang(nb) %{_kde4_appsdir}/khangman/nb.txt
 %lang(nb) %{_kde4_appsdir}/kvtml/nb
 %lang(nb) %{_kde4_docdir}/HTML/nb
+%lang(nb) %{_kde4_appsdir}/klettres/nb
 
 %files Norwegian-Nynorsk
 %defattr(-,root,root)
@@ -1306,6 +1309,9 @@
 %lang(zh_TW) %{_kde4_docdir}/HTML/zh_TW
 
 %changelog
+* Sat Jan 10 2009 Than Ngo <than at redhat.com> - 4.1.4-2
+- fix file listfor gl/nb
+
 * Fri Jan 09 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.4-1
 - 4.1.4
 



From than at fedoraproject.org  Fri Jan  9 23:10:43 2009
From: than at fedoraproject.org (Than Ngo)
Date: Fri,  9 Jan 2009 23:10:43 +0000 (UTC)
Subject: rpms/kde-l10n/F-9 kde-l10n.spec,1.40,1.41
Message-ID: <20090109231043.0F7757011C@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-serv24325

Modified Files:
	kde-l10n.spec 
Log Message:
fix file listfor gl/nb




Index: kde-l10n.spec
===================================================================
RCS file: /cvs/extras/rpms/kde-l10n/F-9/kde-l10n.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- kde-l10n.spec	9 Jan 2009 21:21:50 -0000	1.40
+++ kde-l10n.spec	9 Jan 2009 23:10:12 -0000	1.41
@@ -2,7 +2,7 @@
 
 Name: kde-l10n
 Version: 4.1.4
-Release: 1%{dist}
+Release: 2%{dist}
 Url: http://www.kde.org
 Summary: Internationalization support for KDE
 Group: User Interface/Desktops
@@ -1001,6 +1001,8 @@
 %defattr(-,root,root)
 %lang(gl) %{_datadir}/locale/gl/*
 %lang(gl) %{_kde4_appsdir}/kvtml/gl
+%lang(gl) %{_kde4_appsdir}/ktuberling/sounds/gl.soundtheme         
+%lang(gl) %{_kde4_appsdir}/ktuberling/sounds/gl/
 %lang(gl) %{_kde4_docdir}/HTML/gl
 
 %if %{buildall}
@@ -1146,6 +1148,7 @@
 %lang(nb) %{_kde4_appsdir}/khangman/nb.txt
 %lang(nb) %{_kde4_appsdir}/kvtml/nb
 %lang(nb) %{_kde4_docdir}/HTML/nb
+%lang(nb) %{_kde4_appsdir}/klettres/nb
 
 %files Norwegian-Nynorsk
 %defattr(-,root,root)
@@ -1306,6 +1309,9 @@
 %lang(zh_TW) %{_kde4_docdir}/HTML/zh_TW
 
 %changelog
+* Sat Jan 10 2009 Than Ngo <than at redhat.com> - 4.1.4-2
+- fix file listfor gl/nb
+
 * Fri Jan 09 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.4-1
 - 4.1.4
 



From than at fedoraproject.org  Fri Jan  9 23:13:13 2009
From: than at fedoraproject.org (Than Ngo)
Date: Fri,  9 Jan 2009 23:13:13 +0000 (UTC)
Subject: rpms/PolicyKit-kde/F-10 PolicyKit-kde.spec, NONE, 1.1 sources, 1.1,
	1.2
Message-ID: <20090109231313.CFE867011C@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/PolicyKit-kde/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24708

Modified Files:
	sources 
Added Files:
	PolicyKit-kde.spec 
Log Message:
PolicyKit-kde



--- NEW FILE PolicyKit-kde.spec ---
%define _develpackage 0
%define _version 0.0
%define _svndate 20081219svn

Name: PolicyKit-kde
Version: %{_version}
Release: 0.%{_svndate}%{?dist}
Summary: PolicyKit integration for the KDE desktop

Group: System Environment/Libraries
License: GPLv2+ and LGPLv2+
URL: http://www.kde.org
Source0: %{name}-%{_svndate}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  kdelibs4-devel >= 4.1
BuildRequires:  PolicyKit-devel >= 0.8
BuildRequires:  cmake

%description
This package provides a PolicyKit Authentication Frontend for KDE

%package devel
Summary: Headers and libraries for PolicyKit-kde
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
Requires: dbus-devel

%description devel
Headers and libraries for PolicyKit-kde

%prep
%setup -qn %{name}

%build
mkdir -p %{_target_platform}
pushd %{_target_platform}
%{cmake_kde4} ..
popd


make %{?_smp_mflags} -C %{_target_platform}


%install
rm -rf %{buildroot}

make install/fast DESTDIR=%{buildroot} -C %{_target_platform}

%clean
rm -rf %{buildroot}

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files
%defattr(-,root,root,-)
%doc COPYING
%{_kde4_bindir}/*
%{_kde4_libdir}/libpolkitkdeprivate*.so.*
%{_kde4_libdir}/kde4/*
%{_kde4_datadir}/dbus-1/services/*
%{_kde4_libexecdir}/*
%{_kde4_sharedir}/kde4/services/*

%if %{_develpackage}
%files devel
%defattr(-,root,root,-)
%{_kde4_libdir}/*.so
%else
%exclude %{_kde4_libdir}/*.so
%endif

%changelog
* Thu Jan 08 2009 Than Ngo <than at redhat.com> - 0.0-0.20081219svn
- initial version


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/PolicyKit-kde/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	9 Jan 2009 05:37:03 -0000	1.1
+++ sources	9 Jan 2009 23:12:43 -0000	1.2
@@ -0,0 +1 @@
+30ba8b723282ecea8c3ee471493f90c5  PolicyKit-kde-20081219svn.tar.bz2



From than at fedoraproject.org  Fri Jan  9 23:14:53 2009
From: than at fedoraproject.org (Than Ngo)
Date: Fri,  9 Jan 2009 23:14:53 +0000 (UTC)
Subject: rpms/PolicyKit-kde/F-9 PolicyKit-kde.spec,NONE,1.1 sources,1.1,1.2
Message-ID: <20090109231453.AADBC7011C@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/PolicyKit-kde/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25099

Modified Files:
	sources 
Added Files:
	PolicyKit-kde.spec 
Log Message:
PolicyKit-kde



--- NEW FILE PolicyKit-kde.spec ---
%define _develpackage 0
%define _version 0.0
%define _svndate 20081219svn

Name: PolicyKit-kde
Version: %{_version}
Release: 0.%{_svndate}%{?dist}
Summary: PolicyKit integration for the KDE desktop

Group: System Environment/Libraries
License: GPLv2+ and LGPLv2+
URL: http://www.kde.org
Source0: %{name}-%{_svndate}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  kdelibs4-devel >= 4.1
BuildRequires:  PolicyKit-devel >= 0.8
BuildRequires:  cmake

%description
This package provides a PolicyKit Authentication Frontend for KDE

%package devel
Summary: Headers and libraries for PolicyKit-kde
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
Requires: dbus-devel

%description devel
Headers and libraries for PolicyKit-kde

%prep
%setup -qn %{name}

%build
mkdir -p %{_target_platform}
pushd %{_target_platform}
%{cmake_kde4} ..
popd


make %{?_smp_mflags} -C %{_target_platform}


%install
rm -rf %{buildroot}

make install/fast DESTDIR=%{buildroot} -C %{_target_platform}

%clean
rm -rf %{buildroot}

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files
%defattr(-,root,root,-)
%doc COPYING
%{_kde4_bindir}/*
%{_kde4_libdir}/libpolkitkdeprivate*.so.*
%{_kde4_libdir}/kde4/*
%{_kde4_datadir}/dbus-1/services/*
%{_kde4_libexecdir}/*
%{_kde4_sharedir}/kde4/services/*

%if %{_develpackage}
%files devel
%defattr(-,root,root,-)
%{_kde4_libdir}/*.so
%else
%exclude %{_kde4_libdir}/*.so
%endif

%changelog
* Thu Jan 08 2009 Than Ngo <than at redhat.com> - 0.0-0.20081219svn
- initial version


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/PolicyKit-kde/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	9 Jan 2009 05:37:03 -0000	1.1
+++ sources	9 Jan 2009 23:14:23 -0000	1.2
@@ -0,0 +1 @@
+30ba8b723282ecea8c3ee471493f90c5  PolicyKit-kde-20081219svn.tar.bz2



From lkundrak at fedoraproject.org  Fri Jan  9 23:15:46 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Fri,  9 Jan 2009 23:15:46 +0000 (UTC)
Subject: comps comps-f11.xml.in,1.53,1.54
Message-ID: <20090109231546.EF7EA7011C@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25344

Modified Files:
	comps-f11.xml.in 
Log Message:
Add a couple of my packages


Index: comps-f11.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f11.xml.in,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- comps-f11.xml.in	9 Jan 2009 11:52:34 -0000	1.53
+++ comps-f11.xml.in	9 Jan 2009 23:15:16 -0000	1.54
@@ -1136,18 +1136,24 @@
     <packagelist>
       <packagereq type="conditional" requires="gcompris">gcompris-sound-en</packagereq>
       <packagereq type="optional">childsplay</packagereq>
-      <packagereq type="optional">drgeo</packagereq>
+      <packagereq type="optional">corrida</packagereq>
       <packagereq type="optional">drgeo-doc</packagereq>
+      <packagereq type="optional">drgeo</packagereq>
       <packagereq type="optional">fantasdic</packagereq>
       <packagereq type="optional">gcompris</packagereq>
       <packagereq type="optional">genchemlab</packagereq>
       <packagereq type="optional">glglobe</packagereq>
       <packagereq type="optional">gperiodic</packagereq>
       <packagereq type="optional">gtypist</packagereq>
-      <packagereq type="optional">kdeedu</packagereq>
+      <packagereq type="optional">justmoon</packagereq>
       <packagereq type="optional">kdeedu-kstars</packagereq>
       <packagereq type="optional">kdeedu-math</packagereq>
+      <packagereq type="optional">kdeedu</packagereq>
       <packagereq type="optional">moodle</packagereq>
+      <packagereq type="optional">nightview</packagereq>
+      <packagereq type="optional">saoimage</packagereq>
+      <packagereq type="optional">skychart</packagereq>
+      <packagereq type="optional">starlab</packagereq>
       <packagereq type="optional">stellarium</packagereq>
       <packagereq type="optional">tuxtype2</packagereq>
     </packagelist>
@@ -1938,6 +1944,7 @@
       <packagereq type="optional">xqf</packagereq>
       <packagereq type="optional">xscorch</packagereq>
       <packagereq type="optional">xstar</packagereq>
+      <packagereq type="optional">xteddy</packagereq>
       <packagereq type="optional">xu4</packagereq>
       <packagereq type="optional">zasx</packagereq>
     </packagelist>
@@ -2435,6 +2442,7 @@
       <packagereq type="default">rt61pci-firmware</packagereq>
       <packagereq type="default">rt73usb-firmware</packagereq>
       <packagereq type="default">zd1211-firmware</packagereq>
+      <packagereq type="default">printer-filters</packagereq>
       <packagereq type="optional">acpi</packagereq>
       <packagereq type="optional">acpitool</packagereq>
       <packagereq type="optional">ctapi-cyberjack</packagereq>
@@ -3795,6 +3803,7 @@
       <packagereq type="optional">qcad</packagereq>
       <packagereq type="optional">referencer</packagereq>
       <packagereq type="optional">revelation</packagereq>
+      <packagereq type="optional">sunbird</packagereq>
       <packagereq type="optional">taskcoach</packagereq>
       <packagereq type="optional">taskjuggler</packagereq>
       <packagereq type="optional">tellico</packagereq>
@@ -4486,6 +4495,7 @@
       <packagereq type="optional">incron</packagereq>
       <packagereq type="optional">ip6sic</packagereq>
       <packagereq type="optional">iptraf</packagereq>
+      <packagereq type="optional">ircp-tray</packagereq>
       <packagereq type="optional">isic</packagereq>
       <packagereq type="optional">jfbterm</packagereq>
       <packagereq type="optional">john</packagereq>
@@ -4554,6 +4564,7 @@
       <packagereq type="optional">torque-gui</packagereq>
       <packagereq type="optional">tsclient</packagereq>
       <packagereq type="optional">ttywatch</packagereq>
+      <packagereq type="optional">tunctl</packagereq>
       <packagereq type="optional">unison213</packagereq>
       <packagereq type="optional">unison227</packagereq>
       <packagereq type="optional">upx</packagereq>



From afsilva at fedoraproject.org  Fri Jan  9 23:23:08 2009
From: afsilva at fedoraproject.org (Anderson de Farias Silva)
Date: Fri,  9 Jan 2009 23:23:08 +0000 (UTC)
Subject: rpms/rpmrebuild/F-10 .cvsignore, 1.4, 1.5 rpmrebuild.spec, 1.4,
	1.5 sources, 1.4, 1.5
Message-ID: <20090109232308.266DF7011C@cvs1.fedora.phx.redhat.com>

Author: afsilva

Update of /cvs/pkgs/rpms/rpmrebuild/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26155

Modified Files:
	.cvsignore rpmrebuild.spec sources 
Log Message:
rpmrebuild 2.3 F10


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rpmrebuild/F-10/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	11 May 2008 23:41:45 -0000	1.4
+++ .cvsignore	9 Jan 2009 23:22:37 -0000	1.5
@@ -1 +1 @@
-rpmrebuild-2.2.2.tar.gz
+rpmrebuild-2.3.tar.gz


Index: rpmrebuild.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rpmrebuild/F-10/rpmrebuild.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- rpmrebuild.spec	4 Dec 2008 17:41:39 -0000	1.4
+++ rpmrebuild.spec	9 Jan 2009 23:22:37 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           rpmrebuild
-Version:        2.2.2
-Release:        2%{?dist}
+Version:        2.3
+Release:        1%{?dist}
 Summary:        A tool to build rpm file from rpm database
 
 Group:          Development/Tools
@@ -49,31 +49,6 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-
-%postun
-# Remove all lines which contain 'RPMREBUILD START' 
-# to 'RPMREBUILD END' in %{_sysconfdir}/popt
-[ $1 -eq 0 ] || exit 0
-if [ -f %{_sysconfdir}/popt ]; then
-  sed -i -e '/RPMREBUILD START/,/RPMREBUILD END/d' %{_sysconfdir}/popt
-fi
-
-%triggerin -- rpm
-########################################
-# This code should remove all lines from
-# the line contains 'RPMREBUILD START'
-# till (include) line 'RPMREBUILD END'
-# in the file /etc/popt
-########################################
-
-POPT=/etc/popt
-
-if [ -f $POPT ]; then
-   sed -i -e '/RPMREBUILD START/,/RPMREBUILD END/d' $POPT
-fi
-cat /usr/lib/rpmrebuild/popt-with-POPTdesc >> /etc/popt || exit
-
-
 %files
 %defattr(-,root,root,-)
 %doc VERSION AUTHORS Changelog COPYING COPYRIGHT News Todo README
@@ -87,8 +62,9 @@
 %attr(0755,root,root) %{_prefix}/lib/rpmrebuild/plugins/nodoc.sh
 %attr(0755,root,root) %{_prefix}/lib/rpmrebuild/rpmrebuild_parser.src
 %attr(0755,root,root) %{_prefix}/lib/rpmrebuild/processing_func.src
+%attr(0755,root,root) %{_prefix}/lib/rpmrebuild/rpmrebuild_rpmqf.src
+%attr(0644,root,root) %{_prefix}/lib/rpmrebuild/rpmrebuild.usedtags
 %attr(0755,root,root) %{_prefix}/lib/rpmrebuild/rpmrebuild_buildroot.sh
-%attr(0755,root,root) %{_prefix}/lib/rpmrebuild/run.sh
 %attr(0755,root,root) %{_prefix}/lib/rpmrebuild/spec_func.src
 %attr(0755,root,root) %{_prefix}/lib/rpmrebuild/rpmrebuild.sh
 %attr(0755,root,root) %{_prefix}/lib/rpmrebuild/plugins/uniq.sh
@@ -98,16 +74,12 @@
 %attr(0755,root,root) %{_prefix}/lib/rpmrebuild/plugins/demofiles.sh
 %attr(0755,root,root) %{_prefix}/lib/rpmrebuild/rpmrebuild_ghost.sh
 %attr(0755,root,root) %{_prefix}/lib/rpmrebuild/rpmrebuild_files.sh
-%{_prefix}/lib/rpmrebuild/.popt
 %{_prefix}/lib/rpmrebuild/plugins/set_tag.plug
 %{_prefix}/lib/rpmrebuild/plugins/nodoc.plug
 %{_prefix}/lib/rpmrebuild/plugins/demo.plug
 %{_prefix}/lib/rpmrebuild/plugins/file2pacDep.plug
 %{_prefix}/lib/rpmrebuild/plugins/uniq.plug
 %{_prefix}/lib/rpmrebuild/plugins/demofiles.plug
-%{_prefix}/lib/rpmrebuild/popt-with-POPTdesc
-%{_prefix}/lib/rpmrebuild/popt-without-POPTdesc
-%{_prefix}/lib/rpmrebuild/rpmrebuild_popt
 %{_prefix}/lib/rpmrebuild/locale/en/rpmrebuild.lang
 %{_prefix}/lib/rpmrebuild/locale/fr_FR.UTF-8/rpmrebuild.lang
 %{_prefix}/lib/rpmrebuild/locale/fr_FR/rpmrebuild.lang
@@ -129,6 +101,8 @@
 %{_mandir}/man1/set_tag.plug.1rrp.gz
 
 %changelog
+* Fri Jan 09 2009 Anderson Silva <ansilva at redhat.com> 2.3-1
+- Introduces some fixes for compatibility with rpm 4.6.0 
 * Thu Dec 04 2008 Anderson Silva <ansilva at redhat.com> 2.2.2-2
 - Fix package ownership of locale directories.
 * Sun May 11 2008 Anderson Silva <ansilva at redhat.com> 2.2.2-1


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rpmrebuild/F-10/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	11 May 2008 23:41:45 -0000	1.4
+++ sources	9 Jan 2009 23:22:37 -0000	1.5
@@ -1 +1 @@
-f71634348cb2cb570bf19dde1166620f  rpmrebuild-2.2.2.tar.gz
+c54efb0e46861deedfffed29a15d0e6b  rpmrebuild-2.3.tar.gz



From pkgdb at fedoraproject.org  Fri Jan  9 23:24:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Jan 2009 23:24:00 +0000
Subject: [pkgdb] openoffice.org: rugbylg6 has requested watchbugzilla
Message-ID: <20090109232400.621D920831F@bastion.fedora.phx.redhat.com>

rugbylg6 has requested the watchbugzilla acl on openoffice.org (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/openoffice.org



From pkgdb at fedoraproject.org  Fri Jan  9 23:24:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 09 Jan 2009 23:24:04 +0000
Subject: [pkgdb] openoffice.org: rugbylg6 has given up watchbugzilla
Message-ID: <20090109232404.679EC208456@bastion.fedora.phx.redhat.com>

rugbylg6 has given up the watchbugzilla acl on openoffice.org (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/openoffice.org



From than at fedoraproject.org  Fri Jan  9 23:56:19 2009
From: than at fedoraproject.org (Than Ngo)
Date: Fri,  9 Jan 2009 23:56:19 +0000 (UTC)
Subject: rpms/kdeutils/devel kdeutils.spec,1.154,1.155
Message-ID: <20090109235620.2398F7011A@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdeutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31962

Modified Files:
	kdeutils.spec 
Log Message:
manpage



Index: kdeutils.spec
===================================================================
RCS file: /cvs/extras/rpms/kdeutils/devel/kdeutils.spec,v
retrieving revision 1.154
retrieving revision 1.155
diff -u -r1.154 -r1.155
--- kdeutils.spec	7 Jan 2009 20:38:57 -0000	1.154
+++ kdeutils.spec	9 Jan 2009 23:55:48 -0000	1.155
@@ -179,6 +179,7 @@
 %{_kde4_appsdir}/kjots/
 %{_kde4_docdir}/HTML/en/kjots/
 %endif
+%{_mandir}/man1/*
 
 %if 0
 %files libs



From pgordon at fedoraproject.org  Sat Jan 10 00:15:44 2009
From: pgordon at fedoraproject.org (Peter Gordon)
Date: Sat, 10 Jan 2009 00:15:44 +0000 (UTC)
Subject: rpms/deluge/devel deluge.spec,1.78,1.79
Message-ID: <20090110001544.EA4577012C@cvs1.fedora.phx.redhat.com>

Author: pgordon

Update of /cvs/pkgs/rpms/deluge/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2277

Modified Files:
	deluge.spec 
Log Message:
Don't package the flags. (#479265)


Index: deluge.spec
===================================================================
RCS file: /cvs/pkgs/rpms/deluge/devel/deluge.spec,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- deluge.spec	7 Jan 2009 23:01:35 -0000	1.78
+++ deluge.spec	10 Jan 2009 00:15:14 -0000	1.79
@@ -7,7 +7,7 @@
 
 Name:		deluge
 Version:	1.1.0
-Release:	0.3.rc3%{?dist}
+Release:	0.4.rc3%{?dist}
 Summary:	A GTK+ BitTorrent client with support for DHT, UPnP, and PEX
 Group:		Applications/Internet
 License:	GPLv2+
@@ -76,7 +76,18 @@
 	--delete-original				\
 	--remove-category=Application			\
 	%{buildroot}%{_datadir}/applications/%{name}.desktop
-## TODO: The lang files should REEEAALLLY be in a standard place such as
+## Remove the country flags. This is a FEDORA-SPECIFIC change.
+## TODO: Perhaps instead of removing the flags entirely, we can replace that
+##       single column of pixbuf renderers with text renderers that show the
+##       country/locale code of the peer.
+## Fedora bug: https://bugzilla.redhat.com/show_bug.cgi?id=479265
+pushd %{buildroot}%{python_sitelib}/%{name}
+	## FIXME: Now that we're not showing the flags and whatnot, do we
+	##        still need the GeoIP data (GeoIP.dat) too?
+	rm -rf data/pixmaps/flags/
+popd 
+
+## NOTE: The lang files should REEEAALLLY be in a standard place such as
 ##       /usr/share/locale or similar. It'd make things so much nicer for
 ##       the packaging. :O
 ## A bit of sed magic to mark the translation files with %%lang, taken from
@@ -140,6 +151,10 @@
 
 
 %changelog
+* Fri Jan 09 2009 Peter Gordon <peter at thecodergeek.com> - 1.1.0-0.4.rc3
+- Do not package the country flags data.
+- Resolves: #479265 (country flags should not be used in Deluge)
+
 * Wed Jan 07 2009 Peter Gordon <peter at thecodergeek.com> - 1.1.0-0.3.rc3
 - Add patch from upstream SVN to fix an error where torrents are not shown (or
   possibly shown in "Error" states) due to a bad inet_aton call:



From wtogami at fedoraproject.org  Sat Jan 10 00:32:27 2009
From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=)
Date: Sat, 10 Jan 2009 00:32:27 +0000 (UTC)
Subject: rpms/nspluginwrapper/F-10 nspluginwrapper-1.3.0-configure.patch,
	NONE, 1.1 nspluginwrapper-1.3.0-directory.patch, NONE,
	1.1 nspluginwrapper-1.3.0-make.patch, NONE,
	1.1 plugin-config-native.patch, NONE, 1.1 .cvsignore, 1.9,
	1.10 nspluginwrapper.spec, 1.69, 1.70 sources, 1.14,
	1.15 nspluginwrapper-1.1.10-configure.patch, 1.1,
	NONE nspluginwrapper-1.1.2-event.patch, 1.1,
	NONE nspluginwrapper-1.1.4-make.patch, 1.1,
	NONE nspluginwrapper-1.1.8-directory.patch, 1.1, NONE
Message-ID: <20090110003227.5ABDB7012C@cvs1.fedora.phx.redhat.com>

Author: wtogami

Update of /cvs/pkgs/rpms/nspluginwrapper/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4181

Modified Files:
	.cvsignore nspluginwrapper.spec sources 
Added Files:
	nspluginwrapper-1.3.0-configure.patch 
	nspluginwrapper-1.3.0-directory.patch 
	nspluginwrapper-1.3.0-make.patch plugin-config-native.patch 
Removed Files:
	nspluginwrapper-1.1.10-configure.patch 
	nspluginwrapper-1.1.2-event.patch 
	nspluginwrapper-1.1.4-make.patch 
	nspluginwrapper-1.1.8-directory.patch 
Log Message:
- Fixed multilib conflicts
- Updated to 1.3.0 and removed some fedora build patches


nspluginwrapper-1.3.0-configure.patch:

--- NEW FILE nspluginwrapper-1.3.0-configure.patch ---
diff -up nspluginwrapper-1.3.0/configure.conf nspluginwrapper-1.3.0/configure
--- nspluginwrapper-1.3.0/configure.conf	2009-01-02 15:22:29.000000000 +0100
+++ nspluginwrapper-1.3.0/configure	2009-01-07 12:06:21.000000000 +0100
@@ -559,10 +559,6 @@ for dir in $x_base_dirs; do
 	fi
     fi
 done
-if test -z "$x_base_dir"; then
-    echo "X11/Xt environment not found"
-    exit 1
-fi
 
 # big/little endian test
 cat > $TMPC << EOF
@@ -763,6 +759,7 @@ echo "COMPILER=$compiler" >> $config_mak
 echo "CC=$cc" >> $config_mak
 echo "CXX=$cxx" >> $config_mak
 echo "CFLAGS=$CFLAGS" >> $config_mak
+echo "LDFLAGS=$LDFLAGS" >> $config_mak
 echo "GLIB_CFLAGS=$GLIB_CFLAGS" >> $config_mak
 echo "GLIB_LDFLAGS=$GLIB_LDFLAGS" >> $config_mak
 echo "GTK_CFLAGS=$GTK_CFLAGS" >> $config_mak

nspluginwrapper-1.3.0-directory.patch:

--- NEW FILE nspluginwrapper-1.3.0-directory.patch ---
diff -up nspluginwrapper-1.3.0/src/npw-config.c.dir nspluginwrapper-1.3.0/src/npw-config.c
--- nspluginwrapper-1.3.0/src/npw-config.c.dir	2009-01-02 15:22:29.000000000 +0100
+++ nspluginwrapper-1.3.0/src/npw-config.c	2009-01-08 16:29:55.000000000 +0100
@@ -38,11 +38,14 @@
 #include <pwd.h>
 #include <dirent.h>
 
+#include <asm/types.h> 
 
 static bool g_auto = false;
 static bool g_verbose = false;
 static bool g_allow_native = false;
 static const char NPW_CONFIG[] = "nspluginwrapper";
+static char *p_plugin_dir = NULL;
+static char *p_plugin_prefix = NULL;
 
 static void error(const char *format, ...)
 {
@@ -858,7 +861,9 @@ static int do_install_plugin(const char 
   plugin_base += 1;
 
   char d_plugin_path[PATH_MAX];
-  int n = snprintf(d_plugin_path, sizeof(d_plugin_path), "%s/%s.%s", plugin_dir, NPW_WRAPPER_BASE, plugin_base);
+  int n = snprintf(d_plugin_path, sizeof(d_plugin_path), 
+                   "%s/%s.%s", plugin_dir, p_plugin_prefix ? p_plugin_prefix : NPW_WRAPPER_BASE, 
+                   plugin_base);
   if (n < 0 || n >= sizeof(d_plugin_path))
 	return 3;
 
@@ -951,28 +956,32 @@ static int install_plugin(const char *pl
   if (g_verbose)
 	printf("Install plugin %s\n", plugin_path);
 
-  // don't install plugin system-wide if it is only accessible by root
-  if (!is_root_only_accessible_plugin(plugin_path)) {
-	ret = do_install_plugin(plugin_path, get_system_mozilla_plugin_dir(), plugin_info);
-	if (ret == 0)
-	  return 0;
+  if(p_plugin_dir) {
+	ret = do_install_plugin(plugin_path, p_plugin_dir, plugin_info);
   }
+  else {
+	// don't install plugin system-wide if it is only accessible by root
+	if (!is_root_only_accessible_plugin(plugin_path)) {
+		ret = do_install_plugin(plugin_path, get_system_mozilla_plugin_dir(), plugin_info);
+	if (ret == 0)
+	  	return 0;
+  	}
 
-  // don't install plugin in user home dir if already available system-wide
-  if (has_system_wide_wrapper_plugin(plugin_path, true)) {
-	if (g_verbose)
-	  printf(" ... already installed system-wide, skipping\n");
-	return 0;
+  	// don't install plugin in user home dir if already available system-wide
+  	if (has_system_wide_wrapper_plugin(plugin_path, true)) {
+		if (g_verbose)
+	  		printf(" ... already installed system-wide, skipping\n");
+		return 0;
+  	}
+
+  	const char *user_plugin_dir = get_user_mozilla_plugin_dir();
+  	if (access(user_plugin_dir, R_OK | W_OK) < 0 && mkdir_p(user_plugin_dir) < 0)
+		return 1;
+
+  	ret = do_install_plugin(plugin_path, user_plugin_dir, plugin_info);
+  	if (ret == 0)
+		return 0;
   }
-
-  const char *user_plugin_dir = get_user_mozilla_plugin_dir();
-  if (access(user_plugin_dir, R_OK | W_OK) < 0 && mkdir_p(user_plugin_dir) < 0)
-	return 1;
-
-  ret = do_install_plugin(plugin_path, user_plugin_dir, plugin_info);
-  if (ret == 0)
-	return 0;
-
   return ret;
 }
 
@@ -1139,6 +1148,8 @@ static void print_usage(void)
   printf("   -h --help               print this message\n");
   printf("   -v --verbose            flag: set verbose mode\n");
   printf("   -a --auto               flag: set automatic mode for plugins discovery\n");
+  printf("   -d --dir plugin-dir     flag: target plugin(s) directory\n");
+  printf("   -p --prefix prefix      flag: a prefix of wrapped plugin file\n");
   printf("   -n --native             flag: allow native plugin(s) to be wrapped\n");
   printf("   -l --list               list plugins currently installed\n");
   printf("   -u --update             update plugin(s) currently installed\n");
@@ -1171,6 +1182,18 @@ static int process_native(int argc, char
   return 0;
 }
 
+static int process_dir(int argc, char *argv[])
+{ 
+  p_plugin_dir = argv[0];
+  return 0;
+}
+
+static int process_prefix(int argc, char *argv[])
+{ 
+  p_plugin_prefix = argv[0];
+  return 0;
+}
+
 static int process_list(int argvc, char *argv[])
 {
   const char **plugin_dirs = get_mozilla_plugin_dirs();
@@ -1266,57 +1287,56 @@ static int process_remove(int argc, char
 
 int main(int argc, char *argv[])
 {
-  char **args;
-  int i, j, n_args;
-
-  n_args = argc - 1;
-  args = argv + 1;
+  int i, j;
 
-  if (n_args < 1) {
+  if (argc < 2) {
 	print_usage();
 	return 1;
   }
-
-  if (args[0][0] != '-') {
-	print_usage();
-	return 1;
+  
+  if (argv[1][0] != '-') {
+  	print_usage();
+  	return 1;
   }
-
+  
   static const struct option {
-	char short_option;
-	const char *long_option;
-	int (*process_callback)(int argc, char *argv[]);
-	bool terminal;
+	const char *short_option;
+  	const char *long_option;
+  	int (*process_callback)(int argc, char *argv[]);
+  	bool terminal;
+ 	int  extra_args;
   }
   options[] = {
-	{ 'h', "help",		process_help,		1 },
-	{ 'v', "verbose",	process_verbose,	0 },
-	{ 'a', "auto",		process_auto,		0 },
-	{ 'n', "native",	process_native,		0 },
-	{ 'l', "list",		process_list,		1 },
-	{ 'u', "update",	process_update,		1 },
-	{ 'i', "install",	process_install,	1 },
-	{ 'r', "remove",	process_remove,		1 },
-	{  0,   NULL,		NULL,				1 }
-  };
-
-  for (i = 0; i < n_args; i++) {
-	const char *arg = args[i];
+	{ "-h", "--help",          process_help,           1, 0 },
+        { "-v", "--verbose",       process_verbose,        0, 0 },
+        { "-a", "--auto",          process_auto,           0, 0 },
+        { "-d", "--dir",           process_dir,            0, 1 },
+        { "-p", "--prefix",        process_prefix,         0, 1 },
+        { "-n", "--native",        process_native,         0, 0 },
+        { "-l", "--list",          process_list,           1, 0 },
+        { "-u", "--update",        process_update,         1, 0 },
+        { "-i", "--install",       process_install,        1, 0 },
+        { "-r", "--remove",        process_remove,         1, 0 }
+   };
+ 
+   for (i = 1; i < argc; i++) {
 	const struct option *opt = NULL;
-	for (j = 0; opt == NULL && options[j].process_callback != NULL; j++) {
-	  if ((arg[0] == '-' && arg[1] == options[j].short_option && arg[2] == '\0') ||
-		  (arg[0] == '-' && arg[1] == '-' && strcmp(&arg[2], options[j].long_option) == 0))
-		opt = &options[j];
-	}
-	if (opt == NULL) {
-	  fprintf(stderr, "invalid option %s\n", arg);
-	  print_usage();
-	  return 1;
-	}
-	int ret = opt->process_callback(n_args - i - 1, args + i + 1);
-	if (opt->terminal)
-	  return ret;
+ 	for (j = 0; j < sizeof(options)/sizeof(options[0]); j++) {
+ 	  if (!strcmp(options[j].short_option,argv[i]) || !strcmp(options[j].long_option,argv[i])) {
+ 	     opt = &options[j];
+        	     break;
+ 	  }
+  	}
+  	if (opt == NULL) {
+ 	  fprintf(stderr, "invalid option %s\n", argv[i]);
+  	  print_usage();
+  	  return 1;
+  	}
+ 	int ret = opt->process_callback(argc - i - 1, argv + i + 1);
+  	if (opt->terminal)
+  	  return ret;
+ 	i += opt->extra_args;
   }
-
+  
   return 0;
 }
diff -up nspluginwrapper-1.3.0/src/npw-viewer.sh.dir nspluginwrapper-1.3.0/src/npw-viewer.sh
--- nspluginwrapper-1.3.0/src/npw-viewer.sh.dir	2009-01-02 15:22:29.000000000 +0100
+++ nspluginwrapper-1.3.0/src/npw-viewer.sh	2009-01-08 16:29:40.000000000 +0100
@@ -100,6 +100,9 @@ if test "$ARCH" != "$TARGET_ARCH"; then
 	    NPW_USE_XSHM="no"
 	fi
 	;;
+    x86_64)
+	LOADER=""
+	;;
     ppc)
 	if test "$ARCH" = "ppc64"; then
 	    case "$OS" in

nspluginwrapper-1.3.0-make.patch:

--- NEW FILE nspluginwrapper-1.3.0-make.patch ---
diff -up nspluginwrapper-1.3.0/Makefile.make nspluginwrapper-1.3.0/Makefile
--- nspluginwrapper-1.3.0/Makefile.make	2009-01-02 15:22:29.000000000 +0100
+++ nspluginwrapper-1.3.0/Makefile	2009-01-07 13:00:40.000000000 +0100
@@ -364,13 +364,13 @@ changelog.commit: changelog
 	svn commit -m "Generated by svn2cl." ChangeLog
 
 $(npwrapper_LIBRARY): $(npwrapper_OBJECTS)
-	$(CC) -o $@ $(DSO_LDFLAGS) $(npwrapper_OBJECTS) $(npwrapper_LDFLAGS)
+	$(CC) -o $@ $(DSO_LDFLAGS) $(npwrapper_OBJECTS) $(npwrapper_LDFLAGS) $(LDFLAGS)
 
 npwrapper-%.os: $(SRC_PATH)/src/%.c
 	$(CC) -o $@ -c $< $(PIC_CFLAGS) $(CPPFLAGS) $(npwrapper_CFLAGS) -DBUILD_WRAPPER
 
 $(npviewer_PROGRAM): $(npviewer_OBJECTS) $(npviewer_MAPFILE) $(LSB_OBJ_DIR) $(LSB_LIBS)
-	$(CC) $(LDFLAGS_32) -o $@ $(npviewer_OBJECTS) $(npviewer_LDFLAGS)
+	$(CC) $(LDFLAGS_32) -o $@ $(npviewer_OBJECTS) $(npviewer_LDFLAGS) $(LDFLAGS)
 
 npviewer-%.o: $(SRC_PATH)/src/%.c
 	$(CC) $(CFLAGS_32) -o $@ -c $< $(CPPFLAGS) $(npviewer_CFLAGS) -DBUILD_VIEWER
@@ -387,19 +387,19 @@ npplayer-%.o: $(SRC_PATH)/src/tidy/%.c
 	$(CC) $(CFLAGS) -o $@ -c $< $(CPPFLAGS) $(npplayer_CFLAGS) -DBUILD_PLAYER
 
 $(libxpcom_LIBRARY): $(libxpcom_OBJECTS) $(LSB_OBJ_DIR) $(LSB_LIBS)
-	$(CC) $(LDFLAGS_32) $(DSO_LDFLAGS) -o $@ $(libxpcom_OBJECTS) $(libxpcom_LDFLAGS) -Wl,$(LD_soname),libxpcom.so
+	$(CC) $(LDFLAGS) $(LDFLAGS_32) $(DSO_LDFLAGS) -o $@ $(libxpcom_OBJECTS) $(libxpcom_LDFLAGS) -Wl,$(LD_soname),libxpcom.so
 
 libxpcom-%.o: $(SRC_PATH)/src/%.c
 	$(CC) $(CFLAGS_32) -o $@ -c $< $(CPPFLAGS) $(libxpcom_CFLAGS) -DBUILD_XPCOM
 
 $(libnoxshm_LIBRARY): $(libnoxshm_OBJECTS) $(LSB_OBJ_DIR) $(LSB_LIBS)
-	$(CC) $(LDFLAGS_32) $(DSO_LDFLAGS) -o $@ $(libnoxshm_OBJECTS) $(libnoxshm_LDFLAGS) -Wl,$(LD_soname),libnoxshm.so
+	$(CC) $(LDFLAGS) $(LDFLAGS_32) $(DSO_LDFLAGS) -o $@ $(libnoxshm_OBJECTS) $(libnoxshm_LDFLAGS) -Wl,$(LD_soname),libnoxshm.so
 
 libnoxshm-%.o: $(SRC_PATH)/src/%.c
 	$(CC) $(CFLAGS_32) -o $@ -c $< $(CPPFLAGS) $(libnoxshm_CFLAGS)
 
 $(npconfig_PROGRAM): $(npconfig_OBJECTS)
-	$(CC) -o $@ $(npconfig_OBJECTS) $(npconfig_LDFLAGS)
+	$(CC) -o $@ $(npconfig_OBJECTS) $(npconfig_LDFLAGS) $(LDFLAGS)
 
 npconfig-%.o: $(SRC_PATH)/src/%.c
 	$(CC) -o $@ -c $< $(CPPFLAGS) $(CFLAGS)
@@ -425,7 +425,7 @@ $(LSB_OBJ_DIR)/libgcc_s_32.so: $(LSB_OBJ
 	$(LN_S) libgcc_s.so $@
 
 $(LSB_OBJ_DIR)/%.so: $(LSB_OBJ_DIR)/%.o
-	$(CC) $(LDFLAGS_32) -nostdlib $(DSO_LDFLAGS) $< -o $@ \
+	$(CC) $(LDFLAGS) $(LDFLAGS_32) -nostdlib $(DSO_LDFLAGS) $< -o $@ \
 		-Wl,--version-script,$(patsubst $(LSB_OBJ_DIR)/%.o,$(LSB_SRC_DIR)/%.Version,$<) \
 		-Wl,-soname,`grep "$(patsubst $(LSB_OBJ_DIR)/%.o,%,$<) " $(LSB_SRC_DIR)/LibNameMap.txt | cut -f2 -d' '`
 

plugin-config-native.patch:

--- NEW FILE plugin-config-native.patch ---
diff -up nspluginwrapper-1.3.0/plugin-config-1.9/src/plugin-config.c.native nspluginwrapper-1.3.0/plugin-config-1.9/src/plugin-config.c
--- nspluginwrapper-1.3.0/plugin-config-1.9/src/plugin-config.c.native	2009-01-06 17:20:02.000000000 +0100
+++ nspluginwrapper-1.3.0/plugin-config-1.9/src/plugin-config.c	2009-01-06 17:22:43.000000000 +0100
@@ -444,6 +444,7 @@ int wrap_plugin_2(WRAP_PLUGIN *p_plugin,
       char *params[] = 
       {
         p_wrapper,
+        "-n",
         "-p", 
         prefix,
         "-d", 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/nspluginwrapper/F-10/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	9 Dec 2008 04:13:07 -0000	1.9
+++ .cvsignore	10 Jan 2009 00:31:56 -0000	1.10
@@ -1 +1,9 @@
-nspluginwrapper-1.1.10.tar.bz2
+nspluginwrapper-0.9.91.4.tar.bz2
+plugin-config-1.3.tar.gz
+plugin-config-1.4.tar.gz
+nspluginwrapper-0.9.91.5.tar.bz2
+plugin-config-1.6.tar.gz
+plugin-config-1.9.tar.gz
+nspluginwrapper-1.1.4.tar.bz2
+nspluginwrapper-1.1.8.tar.bz2
+nspluginwrapper-1.3.0.tar.bz2


Index: nspluginwrapper.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nspluginwrapper/F-10/nspluginwrapper.spec,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- nspluginwrapper.spec	9 Dec 2008 04:46:17 -0000	1.69
+++ nspluginwrapper.spec	10 Jan 2009 00:31:56 -0000	1.70
@@ -64,19 +64,19 @@
 
 Summary:	A compatibility layer for Netscape 4 plugins
 Name:		nspluginwrapper
-Version:	1.1.10
-Release:	1%{?dist}
+Version:	1.3.0
+Release:	2%{?dist}
 Source0:	%{name}-%{version}%{?svndate:-%{svndate}}.tar.bz2
-Source1:        %{plugin_config_name}.tar.gz 
+Source1:        %{plugin_config_name}.tar.gz
 Source2:        plugin-config.sh.in
 Source3:        %{name}.sh.in
-Patch1:         nspluginwrapper-1.1.4-make.patch
-Patch2:         nspluginwrapper-1.1.10-configure.patch
-Patch3:         nspluginwrapper-1.1.8-directory.patch
-Patch10:        nspluginwrapper-1.1.2-event.patch
+Patch1:         nspluginwrapper-1.3.0-make.patch
+Patch2:         nspluginwrapper-1.3.0-configure.patch
+Patch3:         nspluginwrapper-1.3.0-directory.patch
 Patch100:       plugin-config-setuid.patch
 Patch101:       plugin-config-umask.patch
 Patch102:       plugin-config-print.patch
+Patch103:       plugin-config-native.patch
 License:	GPLv2+
 Group:		Networking/WWW
 Url:		http://gwenole.beauchesne.info/projects/nspluginwrapper/
@@ -106,21 +106,14 @@
 %patch2 -p1 -b .conf
 %patch3 -p1 -b .dir
 
-# Package fixes
-%patch10 -p1 -b .event
-
 # Plugin-config patches
 pushd %plugin_config_name
 %patch100 -p2
 %patch101 -p2 -b .umask
 %patch102 -p2 -b .print
+%patch103 -p2 -b .native
 popd
 
-
-# remove old/incompatibile stuff
-rm -rf npapi
-rm -rf lsb-build
-
 %build
 # Build wrapper
 
@@ -152,11 +145,14 @@
 	    --with-lib32=%{lib32}		\
 	    --with-lib64=%{lib64}		\
 	    --with-base-lib=%{lib}		\
-	    --with-xpcom=no			\
 	    --with-base-libdir=%{libdir}	\
-	    --with-x11-prefix=/usr	        \
-	    --with-gecko=%{gecko_flavour}
-	    
+	    --viewer-paths=%{pkgdir}		\
+	    --with-x11-prefix=/usr		\
+	    --with-gecko=%{gecko_flavour}	\
+	    --enable-viewer			\
+	    --viewer-paths="%{pkgdir32}:%{pkgdir64}"\
+	    --disable-biarch
+	
 make
 popd
 
@@ -203,6 +199,10 @@
 EOF
 chmod 755 $RPM_BUILD_ROOT%{pkgdir}/nspluginplayer
 
+# Remove conflicting files
+rm -rf $RPM_BUILD_ROOT%{_bindir}/nspluginplayer
+rm -rf $RPM_BUILD_ROOT%{_bindir}/nspluginwrapper
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -224,19 +224,26 @@
 %{pkgdir}/npconfig
 %{pkgdir}/npwrapper.so
 %{pkgdir}/npviewer.bin
+%{pkgdir}/npviewer.sh
 %{pkgdir}/npviewer
 %{pkgdir}/npplayer
+%{pkgdir}/libxpcom.so
+%{pkgdir}/libnoxshm.so
 %{pkgdir}/nspluginplayer
 %{plugindir}/npwrapper.so
 %{_bindir}/mozilla-plugin-config
 %config %{_sysconfdir}/sysconfig/%{name}
 
+
 %changelog
-* Mon Dec 08 2008 Warren Togami <wtogami at redhat.com> 1.1.10-1
-- Update to 1.1.10
+* Thu Jan 9 2009 Martin Stransky <stransky at redhat.com> 1.3.0-2
+- Fixed multilib conflicts
+
+* Thu Jan 8 2009 Martin Stransky <stransky at redhat.com> 1.3.0-1
+- Updated to 1.3.0 and removed some fedora build patches
 
 * Tue Dec 02 2008 Warren Togami <wtogami at redhat.com> 1.1.8-2
-- fix-invalid-RPC-after-NPP_Destroy fixes a crasher 
+- fix-invalid-RPC-after-NPP_Destroy fixes a crasher
 
 * Mon Dec 1 2008 Martin Stransky <stransky at redhat.com> 1.1.8-1
 - Updated to 1.1.8


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nspluginwrapper/F-10/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	9 Dec 2008 04:13:07 -0000	1.14
+++ sources	10 Jan 2009 00:31:56 -0000	1.15
@@ -1,2 +1,2 @@
 0a00e94ba608dfea365851af9deb20dc  plugin-config-1.9.tar.gz
-127ecc8c3eb2b2c8d60cbae97b3c11f2  nspluginwrapper-1.1.10.tar.bz2
+188f77bd3427c131ccba4bfdb25892a9  nspluginwrapper-1.3.0.tar.bz2


--- nspluginwrapper-1.1.10-configure.patch DELETED ---


--- nspluginwrapper-1.1.2-event.patch DELETED ---


--- nspluginwrapper-1.1.4-make.patch DELETED ---


--- nspluginwrapper-1.1.8-directory.patch DELETED ---



From rdieter at fedoraproject.org  Sat Jan 10 00:37:59 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sat, 10 Jan 2009 00:37:59 +0000 (UTC)
Subject: rpms/libmsn/devel libmsn.spec,1.2,1.3
Message-ID: <20090110003759.55F117012C@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/libmsn/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5517

Modified Files:
	libmsn.spec 
Log Message:
* Fri Jan 09 2009 Rex Dieter <rdieter at fedoraproject.org> 4.0-0.5.beta2
- -devel: Requires: openssl-devel



Index: libmsn.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libmsn/devel/libmsn.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- libmsn.spec	9 Jan 2009 18:39:54 -0000	1.2
+++ libmsn.spec	10 Jan 2009 00:37:29 -0000	1.3
@@ -3,7 +3,7 @@
 
 Name:		libmsn
 Version:	4.0
-Release:	0.4.%{beta}%{?dist}
+Release:	0.5.%{beta}%{?dist}
 
 Group:		System Environment/Libraries
 License:	GPLv2
@@ -25,6 +25,7 @@
 Summary:	Development files for %{name}
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
+Requires:	openssl-devel
 Requires:	pkgconfig
 %description	devel
 The %{name}-devel package contains libraries and header files for
@@ -70,6 +71,9 @@
 
 
 %changelog
+* Fri Jan 09 2009 Rex Dieter <rdieter at fedoraproject.org> 4.0-0.5.beta2
+- -devel: Requires: openssl-devel
+
 * Fri Jan 09 2009 Rex Dieter <rdieter at fedoraproject.org> 4.0-0.4.beta2
 - libmsn-4.0-beta2
 



From rdieter at fedoraproject.org  Sat Jan 10 01:00:49 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sat, 10 Jan 2009 01:00:49 +0000 (UTC)
Subject: rpms/libmsn/devel libmsn-4.0-beta2-pkgconfig.patch, NONE,
	1.1 libmsn.spec, 1.3, 1.4
Message-ID: <20090110010049.F19B77012C@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/libmsn/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7891

Modified Files:
	libmsn.spec 
Added Files:
	libmsn-4.0-beta2-pkgconfig.patch 
Log Message:
* Fri Jan 09 2009 Rex Dieter <rdieter at fedoraproject.org> 4.0-0.6.beta2
- pkgconfig patch to workaround bug #479493


libmsn-4.0-beta2-pkgconfig.patch:

--- NEW FILE libmsn-4.0-beta2-pkgconfig.patch ---
diff -up libmsn-4.0-beta2/libmsn.pc.cmake.pkgconfig libmsn-4.0-beta2/libmsn.pc.cmake
--- libmsn-4.0-beta2/libmsn.pc.cmake.pkgconfig	2008-11-14 06:19:45.000000000 -0600
+++ libmsn-4.0-beta2/libmsn.pc.cmake	2009-01-09 18:58:48.000000000 -0600
@@ -7,6 +7,6 @@ Name: libmsn
 Description: MSN protocol implementation
 Version: 0.4.0
 
-Requires: libssl
+#Requires: libssl
 Libs: -L${libdir} -lmsn
 Cflags: -I${includedir}


Index: libmsn.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libmsn/devel/libmsn.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- libmsn.spec	10 Jan 2009 00:37:29 -0000	1.3
+++ libmsn.spec	10 Jan 2009 01:00:19 -0000	1.4
@@ -3,7 +3,7 @@
 
 Name:		libmsn
 Version:	4.0
-Release:	0.5.%{beta}%{?dist}
+Release:	0.6.%{beta}%{?dist}
 
 Group:		System Environment/Libraries
 License:	GPLv2
@@ -13,6 +13,8 @@
 
 Summary:	Library for connecting to the MSN(tm) Messenger service
 
+Patch1:		libmsn-4.0-beta2-pkgconfig.patch
+
 BuildRequires:	cmake
 BuildRequires:	openssl-devel
 BuildRequires:	pkgconfig
@@ -31,10 +33,15 @@
 The %{name}-devel package contains libraries and header files for
 developing applications that use %{name}.
 
+
 %prep
 %setup -q -n %{name}-%{version}%{?beta:-%{beta}}
 
+%patch1 -p1 -b .pkgconfig
+
+
 %build
+
 mkdir -p %{_target_platform}
 pushd %{_target_platform} 
 %{cmake} ..
@@ -71,6 +78,9 @@
 
 
 %changelog
+* Fri Jan 09 2009 Rex Dieter <rdieter at fedoraproject.org> 4.0-0.6.beta2
+- pkgconfig patch to workaround bug #479493
+
 * Fri Jan 09 2009 Rex Dieter <rdieter at fedoraproject.org> 4.0-0.5.beta2
 - -devel: Requires: openssl-devel
 



From bpepple at fedoraproject.org  Sat Jan 10 01:03:45 2009
From: bpepple at fedoraproject.org (Brian Pepple)
Date: Sat, 10 Jan 2009 01:03:45 +0000 (UTC)
Subject: rpms/farsight2/devel .cvsignore, 1.2, 1.3 farsight2.spec, 1.4,
	1.5 sources, 1.2, 1.3
Message-ID: <20090110010345.763677012C@cvs1.fedora.phx.redhat.com>

Author: bpepple

Update of /cvs/pkgs/rpms/farsight2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8265

Modified Files:
	.cvsignore farsight2.spec sources 
Log Message:
* Fri Jan  9 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.0.7-1
- Update to 0.0.7.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/farsight2/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	31 Dec 2008 23:55:52 -0000	1.2
+++ .cvsignore	10 Jan 2009 01:03:15 -0000	1.3
@@ -1 +1 @@
-farsight2-0.0.6.tar.gz
+farsight2-0.0.7.tar.gz


Index: farsight2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/farsight2/devel/farsight2.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- farsight2.spec	6 Jan 2009 01:58:25 -0000	1.4
+++ farsight2.spec	10 Jan 2009 01:03:15 -0000	1.5
@@ -7,8 +7,8 @@
 %define gst_python 0.10.10
 
 Name:           farsight2
-Version:        0.0.6
-Release:        4%{?dist}
+Version:        0.0.7
+Release:        1%{?dist}
 Summary:        Libraries for videoconferencing
 
 Group:          System Environment/Libraries
@@ -17,11 +17,11 @@
 Source0:        http://farsight.freedesktop.org/releases/%{name}/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:	glib2-devel >= 2.16
+BuildRequires:	glib2-devel >= 2.14
 BuildRequires:  gstreamer-devel >= %{gst_ver}
 BuildRequires:	gstreamer-plugins-base-devel >= %{gst_plugins_base_ver}
 BuildRequires:	gstreamer-python >= %{gst_python}
-BuildRequires:	libnice-devel
+BuildRequires:	libnice-devel >= 0.0.3
 BuildRequires:	python-devel
 
 Requires:	gstreamer-plugins-farsight >= %{gst_plugins_farsight}
@@ -116,6 +116,9 @@
 
 
 %changelog
+* Fri Jan  9 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.0.7-1
+- Update to 0.0.7.
+
 * Mon Jan  5 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.0.6-4
 - Add BR on libnice-devel and build libnice transmitter.
 - Set gstreamer package name & origin.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/farsight2/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	31 Dec 2008 23:55:52 -0000	1.2
+++ sources	10 Jan 2009 01:03:15 -0000	1.3
@@ -1 +1 @@
-1ec31b83104d61cd24e6c688dcce2f65  farsight2-0.0.6.tar.gz
+b3aa7ae00354b122f47215576acfc2ca  farsight2-0.0.7.tar.gz



From mclasen at fedoraproject.org  Sat Jan 10 01:34:32 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Sat, 10 Jan 2009 01:34:32 +0000 (UTC)
Subject: rpms/glib2/F-10 .cvsignore, 1.98, 1.99 glib2.spec, 1.189,
	1.190 sources, 1.100, 1.101
Message-ID: <20090110013432.F0C107012C@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/glib2/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11648

Modified Files:
	.cvsignore glib2.spec sources 
Log Message:
2.18.4



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/glib2/F-10/.cvsignore,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -r1.98 -r1.99
--- .cvsignore	24 Nov 2008 15:27:29 -0000	1.98
+++ .cvsignore	10 Jan 2009 01:34:02 -0000	1.99
@@ -1 +1 @@
-glib-2.18.3.tar.bz2
+glib-2.18.4.tar.bz2


Index: glib2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/glib2/F-10/glib2.spec,v
retrieving revision 1.189
retrieving revision 1.190
diff -u -r1.189 -r1.190
--- glib2.spec	24 Nov 2008 15:45:05 -0000	1.189
+++ glib2.spec	10 Jan 2009 01:34:02 -0000	1.190
@@ -2,8 +2,8 @@
 
 Summary: A library of handy utility functions
 Name: glib2
-Version: 2.18.3
-Release: 2%{?dist}
+Version: 2.18.4
+Release: 1%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 URL: http://www.gtk.org
@@ -138,6 +138,9 @@
 %{_libdir}/lib*.a
 
 %changelog
+* Fri Jan  9 2009 Matthias Clasen <mclasen at redhat.com> - 2.18.4-1
+- Update to 2.18.4
+
 * Mon Nov 24 2008 Matthias Clasen <mclasen at redhat.com> - 2.18.3-2
 - Update to 2.18.3
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/glib2/F-10/sources,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -r1.100 -r1.101
--- sources	24 Nov 2008 15:27:29 -0000	1.100
+++ sources	10 Jan 2009 01:34:02 -0000	1.101
@@ -1 +1 @@
-f13996a7bd57525d796a6593f26a7771  glib-2.18.3.tar.bz2
+ec25ed261534d870141000ab73f1a2bf  glib-2.18.4.tar.bz2



From kkofler at fedoraproject.org  Sat Jan 10 02:08:28 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Sat, 10 Jan 2009 02:08:28 +0000 (UTC)
Subject: rpms/PolicyKit-kde/F-10 PolicyKit-kde.spec,1.1,1.2
Message-ID: <20090110020828.665617012C@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/PolicyKit-kde/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16644/F-10

Modified Files:
	PolicyKit-kde.spec 
Log Message:
Fix Release tag for safe prerelease versioning (giving us a place to bump Release). (Whoops, how could I miss that during review?)


Index: PolicyKit-kde.spec
===================================================================
RCS file: /cvs/pkgs/rpms/PolicyKit-kde/F-10/PolicyKit-kde.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- PolicyKit-kde.spec	9 Jan 2009 23:12:43 -0000	1.1
+++ PolicyKit-kde.spec	10 Jan 2009 02:07:57 -0000	1.2
@@ -4,7 +4,7 @@
 
 Name: PolicyKit-kde
 Version: %{_version}
-Release: 0.%{_svndate}%{?dist}
+Release: 0.1.%{_svndate}%{?dist}
 Summary: PolicyKit integration for the KDE desktop
 
 Group: System Environment/Libraries
@@ -73,5 +73,5 @@
 %endif
 
 %changelog
-* Thu Jan 08 2009 Than Ngo <than at redhat.com> - 0.0-0.20081219svn
+* Thu Jan 08 2009 Than Ngo <than at redhat.com> - 0.0-0.1.20081219svn
 - initial version



From kkofler at fedoraproject.org  Sat Jan 10 02:08:28 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Sat, 10 Jan 2009 02:08:28 +0000 (UTC)
Subject: rpms/PolicyKit-kde/F-9 PolicyKit-kde.spec,1.1,1.2
Message-ID: <20090110020828.B90AA7012C@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/PolicyKit-kde/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16644/F-9

Modified Files:
	PolicyKit-kde.spec 
Log Message:
Fix Release tag for safe prerelease versioning (giving us a place to bump Release). (Whoops, how could I miss that during review?)


Index: PolicyKit-kde.spec
===================================================================
RCS file: /cvs/pkgs/rpms/PolicyKit-kde/F-9/PolicyKit-kde.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- PolicyKit-kde.spec	9 Jan 2009 23:14:23 -0000	1.1
+++ PolicyKit-kde.spec	10 Jan 2009 02:07:58 -0000	1.2
@@ -4,7 +4,7 @@
 
 Name: PolicyKit-kde
 Version: %{_version}
-Release: 0.%{_svndate}%{?dist}
+Release: 0.1.%{_svndate}%{?dist}
 Summary: PolicyKit integration for the KDE desktop
 
 Group: System Environment/Libraries
@@ -73,5 +73,5 @@
 %endif
 
 %changelog
-* Thu Jan 08 2009 Than Ngo <than at redhat.com> - 0.0-0.20081219svn
+* Thu Jan 08 2009 Than Ngo <than at redhat.com> - 0.0-0.1.20081219svn
 - initial version



From kkofler at fedoraproject.org  Sat Jan 10 02:08:29 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Sat, 10 Jan 2009 02:08:29 +0000 (UTC)
Subject: rpms/PolicyKit-kde/devel PolicyKit-kde.spec,1.1,1.2
Message-ID: <20090110020829.2D0C37012C@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/PolicyKit-kde/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16644/devel

Modified Files:
	PolicyKit-kde.spec 
Log Message:
Fix Release tag for safe prerelease versioning (giving us a place to bump Release). (Whoops, how could I miss that during review?)


Index: PolicyKit-kde.spec
===================================================================
RCS file: /cvs/pkgs/rpms/PolicyKit-kde/devel/PolicyKit-kde.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- PolicyKit-kde.spec	9 Jan 2009 20:25:45 -0000	1.1
+++ PolicyKit-kde.spec	10 Jan 2009 02:07:58 -0000	1.2
@@ -4,7 +4,7 @@
 
 Name: PolicyKit-kde
 Version: %{_version}
-Release: 0.%{_svndate}%{?dist}
+Release: 0.1.%{_svndate}%{?dist}
 Summary: PolicyKit integration for the KDE desktop
 
 Group: System Environment/Libraries
@@ -73,5 +73,5 @@
 %endif
 
 %changelog
-* Thu Jan 08 2009 Than Ngo <than at redhat.com> - 0.0-0.20081219svn
+* Thu Jan 08 2009 Than Ngo <than at redhat.com> - 0.0-0.1.20081219svn
 - initial version



From mclasen at fedoraproject.org  Sat Jan 10 03:00:49 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Sat, 10 Jan 2009 03:00:49 +0000 (UTC)
Subject: rpms/gvfs/devel gvfs-burn-move.patch, NONE, 1.1 gvfs.spec, 1.100,
	1.101
Message-ID: <20090110030049.2A9617012C@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gvfs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22437

Modified Files:
	gvfs.spec 
Added Files:
	gvfs-burn-move.patch 
Log Message:
Support moving files in the burn backend


gvfs-burn-move.patch:

--- NEW FILE gvfs-burn-move.patch ---
Index: daemon/gvfsbackendburn.c
===================================================================
--- daemon/gvfsbackendburn.c	(revisione 2144)
+++ daemon/gvfsbackendburn.c	(copia locale)
@@ -953,6 +953,49 @@
   return TRUE;
 }
 
+static gboolean
+try_move (GVfsBackend *backend,
+          GVfsJobMove *job,
+          const char *source,
+          const char *destination,
+          GFileCopyFlags flags,
+          GFileProgressCallback progress_callback,
+          gpointer progress_callback_data)
+{
+  VirtualNode *source_node, *root_node, *source_dir, *dest_dir;
+
+  root_node = G_VFS_BACKEND_BURN (backend)->root_node;
+  
+  source_node = virtual_node_lookup (root_node, source, &source_dir);
+  if (source_node == NULL)
+    {
+      g_vfs_job_failed (G_VFS_JOB (job), G_IO_ERROR,
+                        G_IO_ERROR_NOT_FOUND,
+                        _("No such file or directory"));
+      return TRUE;
+    }
+
+  if (virtual_node_lookup (root_node, destination, &dest_dir) != NULL)
+    {
+      g_vfs_job_failed (G_VFS_JOB (job), G_IO_ERROR,
+                        G_IO_ERROR_EXISTS,
+                        _("File exists"));
+      return TRUE;
+    }
+
+  g_free (source_node->filename);
+  source_node->filename = g_path_get_basename (destination);
+
+  if (source_dir != dest_dir) {
+    source_dir->children = g_list_remove (source_dir->children, source_node);
+    dest_dir->children = g_list_append (dest_dir->children, source_node);
+  }
+  
+  g_vfs_job_succeeded (G_VFS_JOB (job));
+  
+  return TRUE;
+}
+
 static void
 g_vfs_backend_burn_class_init (GVfsBackendBurnClass *klass)
 {
@@ -970,6 +1013,7 @@
   backend_class->try_set_display_name = try_set_display_name;
   backend_class->try_push = try_push;
   backend_class->try_delete = try_delete;
+  backend_class->try_move = try_move;
   backend_class->read = do_read;
   backend_class->seek_on_read = do_seek_on_read;
   backend_class->close_read = do_close_read;


Index: gvfs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gvfs/devel/gvfs.spec,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -r1.100 -r1.101
--- gvfs.spec	6 Jan 2009 16:50:27 -0000	1.100
+++ gvfs.spec	10 Jan 2009 03:00:18 -0000	1.101
@@ -1,7 +1,7 @@
 Summary: Backends for the gio framework in GLib
 Name: gvfs
 Version: 1.1.3
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 URL: http://www.gtk.org
@@ -28,8 +28,11 @@
 # The patch touches Makefile.am files:
 BuildRequires: automake autoconf
 BuildRequires: libtool
+# http://bugzilla.gnome.org/show_bug.cgi?id=567235
 Patch1: gvfs-0.99.2-archive-integration.patch
 
+# http://bugzilla.gnome.org/show_bug.cgi?id=565041
+Patch2: gvfs-burn-move.patch
 
 %description
 The gvfs package provides backend implementations for the gio 
@@ -112,6 +115,7 @@
 %prep
 %setup -q
 %patch1 -p0 -b .archive-integration
+%patch2 -p0 -b .burn-move
 
 %build
 
@@ -252,6 +256,9 @@
 
 
 %changelog
+* Fri Jan  9 2009 Matthias Clasen  <mclasen at redhat.com> - 1.1.3-2
+- Support moving files in the burn backend
+
 * Tue Jan  6 2009 Tomas Bzatek <tbzatek at redhat.com> - 1.1.3-1
 - Update to 1.1.3
 



From imntreal at fedoraproject.org  Sat Jan 10 03:19:15 2009
From: imntreal at fedoraproject.org (Jameson Pugh)
Date: Sat, 10 Jan 2009 03:19:15 +0000 (UTC)
Subject: rpms/libprojectM/devel import.log,1.3,1.4 libprojectM.spec,1.2,1.3
Message-ID: <20090110031915.D77147012C@cvs1.fedora.phx.redhat.com>

Author: imntreal

Update of /cvs/pkgs/rpms/libprojectM/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24939/devel

Modified Files:
	import.log libprojectM.spec 
Log Message:
Switched from bitstream to dejavu



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/libprojectM/devel/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- import.log	23 Dec 2008 02:50:44 -0000	1.3
+++ import.log	10 Jan 2009 03:18:45 -0000	1.4
@@ -1,3 +1,4 @@
 libprojectM-1_2_0-5_fc9:HEAD:libprojectM-1.2.0-5.src.rpm:1226019019
 libprojectM-1_2_0-5_fc9:HEAD:libprojectM-1.2.0-5.fc9.src.rpm:1227569266
 libprojectM-1_2_0-6_fc10:HEAD:libprojectM-1.2.0-6.fc10.src.rpm:1230000584
+libprojectM-1_2_0-7_fc10:HEAD:libprojectM-1.2.0-7.fc10.src.rpm:1231557473


Index: libprojectM.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libprojectM/devel/libprojectM.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- libprojectM.spec	23 Dec 2008 02:50:44 -0000	1.2
+++ libprojectM.spec	10 Jan 2009 03:18:45 -0000	1.3
@@ -1,6 +1,6 @@
 Name:		libprojectM
 Version:	1.2.0
-Release:	6%{?dist}
+Release:	7%{?dist}
 Summary:	The libraries for the projectM music visualization plugin
 Group:		Applications/Multimedia
 License:	LGPLv2+
@@ -13,7 +13,7 @@
 Patch1:		libprojectM-pc-libsuffix.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	ftgl-devel, cmake, glew-devel
-Requires:	bitstream-vera-fonts-sans-mono, bitstream-vera-fonts-sans
+Requires:	dejavu-fonts-sans, dejavu-fonts-sans-mono
 
 %description
 projectM is an awesome music visualizer. There is nothing better in the world
@@ -47,8 +47,8 @@
 make install DESTDIR=$RPM_BUILD_ROOT
 find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 mkdir $RPM_BUILD_ROOT/%{_datadir}/projectM/fonts
-ln -s ../../fonts/bitstream-vera/Vera.ttf $RPM_BUILD_ROOT/%{_datadir}/projectM/fonts
-ln -s ../../fonts/bitstream-vera/VeraMono.ttf $RPM_BUILD_ROOT/%{_datadir}/projectM/fonts
+ln -s ../../fonts/dejavu/DejaVuSans.ttf $RPM_BUILD_ROOT/%{_datadir}/projectM/fonts/Vera.ttf
+ln -s ../../fonts/dejavu/DejaVuSansMono.ttf $RPM_BUILD_ROOT/%{_datadir}/projectM/fonts/VeraMono.ttf
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -71,6 +71,9 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Fri Jan 01 2009 Jameson Pugh (imntreal at gmail.com) - 1.2.0-7
+- Per recommendation, switched font packages from bitstream to dejavu
+
 * Mon Dec 22 2008 Jameson Pugh (imntreal at gmail.com) - 1.2.0-6
 - Updated font package names
 



From cweyl at fedoraproject.org  Sat Jan 10 04:56:26 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Sat, 10 Jan 2009 04:56:26 +0000 (UTC)
Subject: rpms/perl-Data-TreeDumper/F-10 perl-Data-TreeDumper.spec,1.1,1.2
Message-ID: <20090110045626.6839E7012C@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Data-TreeDumper/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4412

Modified Files:
	perl-Data-TreeDumper.spec 
Log Message:
* Thu Jan 08 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.35-3
- manually require Term::Size



Index: perl-Data-TreeDumper.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Data-TreeDumper/F-10/perl-Data-TreeDumper.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Data-TreeDumper.spec	8 Dec 2008 01:30:15 -0000	1.1
+++ perl-Data-TreeDumper.spec	10 Jan 2009 04:55:55 -0000	1.2
@@ -1,6 +1,6 @@
 Name:       perl-Data-TreeDumper 
 Version:    0.35 
-Release:    2%{?dist}
+Release:    3%{?dist}
 # see TreeDumper.pm
 License:    GPL+ or Artistic
 Group:      Development/Libraries
@@ -19,6 +19,9 @@
 BuildRequires: perl(Term::Size) >= 0.2
 BuildRequires: perl(Text::Wrap) >= 2001.0929
 
+# not automagically picked up
+Requires: perl(Term::Size) >= 0.2
+
 %description
 Data::Dumper and other modules do a great job of dumping data structures.
 Their output, however, often takes more brain power to understand than the
@@ -79,6 +82,9 @@
 %{_mandir}/man3/*.3*
 
 %changelog
+* Thu Jan 08 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.35-3
+- manually require Term::Size
+
 * Thu Dec 04 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.35-2
 - filter requires as well.  See RHBZ#473874
 



From cweyl at fedoraproject.org  Sat Jan 10 04:57:36 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Sat, 10 Jan 2009 04:57:36 +0000 (UTC)
Subject: rpms/perl-Data-TreeDumper/F-9 perl-Data-TreeDumper.spec,1.1,1.2
Message-ID: <20090110045736.277107012C@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Data-TreeDumper/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4676

Modified Files:
	perl-Data-TreeDumper.spec 
Log Message:
* Thu Jan 08 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.35-3
- manually require Term::Size



Index: perl-Data-TreeDumper.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Data-TreeDumper/F-9/perl-Data-TreeDumper.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Data-TreeDumper.spec	8 Dec 2008 01:31:18 -0000	1.1
+++ perl-Data-TreeDumper.spec	10 Jan 2009 04:57:05 -0000	1.2
@@ -1,6 +1,6 @@
 Name:       perl-Data-TreeDumper 
 Version:    0.35 
-Release:    2%{?dist}
+Release:    3%{?dist}
 # see TreeDumper.pm
 License:    GPL+ or Artistic
 Group:      Development/Libraries
@@ -19,6 +19,9 @@
 BuildRequires: perl(Term::Size) >= 0.2
 BuildRequires: perl(Text::Wrap) >= 2001.0929
 
+# not automagically picked up
+Requires: perl(Term::Size) >= 0.2
+
 %description
 Data::Dumper and other modules do a great job of dumping data structures.
 Their output, however, often takes more brain power to understand than the
@@ -79,6 +82,9 @@
 %{_mandir}/man3/*.3*
 
 %changelog
+* Thu Jan 08 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.35-3
+- manually require Term::Size
+
 * Thu Dec 04 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.35-2
 - filter requires as well.  See RHBZ#473874
 



From rdieter at fedoraproject.org  Sat Jan 10 05:12:50 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sat, 10 Jan 2009 05:12:50 +0000 (UTC)
Subject: rpms/kdetoys/devel kdetoys.spec,1.41,1.42
Message-ID: <20090110051250.A4A777012C@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdetoys/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7249

Modified Files:
	kdetoys.spec 
Log Message:
fix %files



Index: kdetoys.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdetoys/devel/kdetoys.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- kdetoys.spec	7 Jan 2009 20:33:35 -0000	1.41
+++ kdetoys.spec	10 Jan 2009 05:12:20 -0000	1.42
@@ -72,6 +72,7 @@
 %{_kde4_iconsdir}/hicolor/*/*/*
 %{_kde4_libdir}/kde4/*
 %{_kde4_libdir}/libkdeinit4_*.*
+%{_mandir}/man6/amor.6*
 
 
 %changelog



From mclasen at fedoraproject.org  Sat Jan 10 05:15:38 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Sat, 10 Jan 2009 05:15:38 +0000 (UTC)
Subject: rpms/GConf2/devel .cvsignore, 1.38, 1.39 GConf2.spec, 1.93,
	1.94 sources, 1.38, 1.39
Message-ID: <20090110051538.47D417012C@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/GConf2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7735

Modified Files:
	.cvsignore GConf2.spec sources 
Log Message:
2.25.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/GConf2/devel/.cvsignore,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- .cvsignore	22 Sep 2008 18:48:22 -0000	1.38
+++ .cvsignore	10 Jan 2009 05:15:07 -0000	1.39
@@ -1 +1 @@
-GConf-2.24.0.tar.bz2
+GConf-2.25.0.tar.bz2


Index: GConf2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/GConf2/devel/GConf2.spec,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -r1.93 -r1.94
--- GConf2.spec	17 Dec 2008 03:39:04 -0000	1.93
+++ GConf2.spec	10 Jan 2009 05:15:07 -0000	1.94
@@ -6,11 +6,11 @@
 
 Summary: A process-transparent configuration system
 Name: GConf2
-Version: 2.24.0
-Release: 3%{?dist}
+Version: 2.25.0
+Release: 1%{?dist}
 License: LGPLv2+
 Group: System Environment/Base
-Source: http://download.gnome.org/sources/GConf/2.22/GConf-%{version}.tar.bz2
+Source: http://download.gnome.org/sources/GConf/2.25/GConf-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 URL: http://projects.gnome.org/gconf/
 
@@ -71,6 +71,11 @@
 
 %build
 %configure --disable-static --enable-defaults-service
+
+# drop unneeded direct library deps with --as-needed
+# libtool doesn't make this easy, so we do it the hard way
+sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/    if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/      func_append compile_command " -Wl,-O1,--as-needed"\n      func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool
+
 make
 
 %install
@@ -137,6 +142,9 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Sat Jan 10 2009 Matthias Clasen  <mclasen at redhat.com> - 2.25.0-1
+- Update to 2.25.0
+
 * Tue Dec 16 2008 Matthias Clasen  <mclasen at redhat.com> - 2.24.0-3
 - Rebuild for pkg-config requires
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/GConf2/devel/sources,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- sources	22 Sep 2008 18:48:22 -0000	1.38
+++ sources	10 Jan 2009 05:15:07 -0000	1.39
@@ -1 +1 @@
-4971d96f5ba94fe4a69396267bd5afe8  GConf-2.24.0.tar.bz2
+a2bd8b4cea939e7d2c4d574c173777ff  GConf-2.25.0.tar.bz2



From jjames at fedoraproject.org  Sat Jan 10 05:23:19 2009
From: jjames at fedoraproject.org (Jerry James)
Date: Sat, 10 Jan 2009 05:23:19 +0000 (UTC)
Subject: rpms/gcl/devel gcl-2.6.8-alloca.patch, NONE, 1.1 gcl-2.6.8-bfd.patch,
	NONE, 1.1 gcl-2.6.8-debuginfo.patch, NONE,
	1.1 gcl-2.6.8-elisp.patch, NONE, 1.1 gcl-2.6.8-extension.patch,
	NONE, 1.1 gcl-2.6.8-fd-leak.patch, NONE,
	1.1 gcl-2.6.8-getcwd.patch, NONE,
	1.1 gcl-2.6.8-infrastructure.patch, NONE,
	1.1 gcl-2.6.8-latex.patch, NONE, 1.1 gcl-2.6.8-loginname.patch,
	NONE, 1.1 gcl-2.6.8-rename.patch, NONE,
	1.1 gcl-2.6.8-selinux.patch, NONE,
	1.1 gcl-2.6.8-sigprocmask-linux.patch, NONE,
	1.1 gcl-2.6.8-texinfo.patch, NONE,
	1.1 gcl-2.6.8-unrandomize.patch, NONE, 1.1 gcl.el, NONE,
	1.1 .cvsignore, 1.2, 1.3 gcl.spec, 1.27, 1.28 sources, 1.3,
	1.4 gcl-bash.patch, 1.2, NONE gcl-pers.patch, 1.1, NONE
Message-ID: <20090110052319.369797012C@cvs1.fedora.phx.redhat.com>

Author: jjames

Update of /cvs/pkgs/rpms/gcl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8873

Modified Files:
	.cvsignore gcl.spec sources 
Added Files:
	gcl-2.6.8-alloca.patch gcl-2.6.8-bfd.patch 
	gcl-2.6.8-debuginfo.patch gcl-2.6.8-elisp.patch 
	gcl-2.6.8-extension.patch gcl-2.6.8-fd-leak.patch 
	gcl-2.6.8-getcwd.patch gcl-2.6.8-infrastructure.patch 
	gcl-2.6.8-latex.patch gcl-2.6.8-loginname.patch 
	gcl-2.6.8-rename.patch gcl-2.6.8-selinux.patch 
	gcl-2.6.8-sigprocmask-linux.patch gcl-2.6.8-texinfo.patch 
	gcl-2.6.8-unrandomize.patch gcl.el 
Removed Files:
	gcl-bash.patch gcl-pers.patch 
Log Message:
* Fri Jan  9 2009 Jerry James <loganjerry at gmail.com> - 2.6.8-0.1.20080902cvs
- Update from CVS to fix many build problems
- Fix SELinux and BFD problems that blocked the build
- Add patches to address various build and runtime problems
- Drop old patches that are obsoleted by the update from CVS
- Split out emacs and xemacs subpackages


gcl-2.6.8-alloca.patch:

--- NEW FILE gcl-2.6.8-alloca.patch ---
diff -dur gcl-2.6.8.ORIG/acconfig.h gcl-2.6.8/acconfig.h
--- gcl-2.6.8.ORIG/acconfig.h	2008-07-30 22:58:25.000000000 -0600
+++ gcl-2.6.8/acconfig.h	2008-12-29 16:06:08.000000000 -0700
@@ -53,11 +53,10 @@
 #undef HAVE_ALLOCA 
 #endif
 
-
 /* define if need alloca.h */
-#undef NEED_ALLOCA_H
+#undef HAVE_ALLOCA_H
 
-#ifdef NEED_ALLOCA_H
+#ifdef HAVE_ALLOCA_H
 #include <alloca.h>
 #endif
 
diff -dur gcl-2.6.8.ORIG/configure gcl-2.6.8/configure
--- gcl-2.6.8.ORIG/configure	2008-12-29 16:05:13.000000000 -0700
+++ gcl-2.6.8/configure	2008-12-29 16:06:55.000000000 -0700
@@ -645,6 +645,7 @@
 NIFLAGS
 FINAL_CFLAGS
 BROKEN_O4_OPT
+ALLOCA
 NOTIFY
 TCL_LIBS
 TCL_DL_LIBS
@@ -13784,10 +13785,12 @@
 
 # alloca
 
-{ $as_echo "$as_me:$LINENO: checking for alloca" >&5
-$as_echo_n "checking for alloca... " >&6; }
-if test "$cross_compiling" = yes; then
-  gcl_ok=no
+# The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
+# for constant arguments.  Useless!
+{ $as_echo "$as_me:$LINENO: checking for working alloca.h" >&5
+$as_echo_n "checking for working alloca.h... " >&6; }
+if test "${ac_cv_working_alloca_h+set}" = set; then
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -13795,16 +13798,17 @@
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-
+#include <alloca.h>
 int
 main ()
 {
-exit(alloca(500) != NULL ? 0 : 1);
+char *p = (char *) alloca (2 * sizeof (int));
+			  if (p) return 0;
   ;
   return 0;
 }
 _ACEOF
-rm -f conftest$ac_exeext
+rm -f conftest.$ac_objext conftest$ac_exeext
 if { (ac_try="$ac_link"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -13812,44 +13816,141 @@
 esac
 eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 $as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>&5
+  (eval "$ac_link") 2>conftest.er1
   ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
+  ac_cv_working_alloca_h=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_working_alloca_h=no
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_working_alloca_h" >&5
+$as_echo "$ac_cv_working_alloca_h" >&6; }
+if test $ac_cv_working_alloca_h = yes; then
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_ALLOCA_H 1
+_ACEOF
+
+fi
+
+{ $as_echo "$as_me:$LINENO: checking for alloca" >&5
+$as_echo_n "checking for alloca... " >&6; }
+if test "${ac_cv_func_alloca_works+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#ifdef __GNUC__
+# define alloca __builtin_alloca
+#else
+# ifdef _MSC_VER
+#  include <malloc.h>
+#  define alloca _alloca
+# else
+#  ifdef HAVE_ALLOCA_H
+#   include <alloca.h>
+#  else
+#   ifdef _AIX
+ #pragma alloca
+#   else
+#    ifndef alloca /* predefined by HP cc +Olibcalls */
+char *alloca ();
+#    endif
+#   endif
+#  endif
+# endif
+#endif
+
+int
+main ()
+{
+char *p = (char *) alloca (1);
+				    if (p) return 0;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 $as_echo "$ac_try_echo") >&5
-  (eval "$ac_try") 2>&5
+  (eval "$ac_link") 2>conftest.er1
   ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  :
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
+  ac_cv_func_alloca_works=yes
 else
-  $as_echo "$as_me: program exited with status $ac_status" >&5
-$as_echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-( exit $ac_status )
-gcl_ok=yes
+	ac_cv_func_alloca_works=no
 fi
+
 rm -rf conftest.dSYM
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
 fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_alloca_works" >&5
+$as_echo "$ac_cv_func_alloca_works" >&6; }
 
+if test $ac_cv_func_alloca_works = yes; then
 
-if test $gcl_ok = yes ; then
-    { $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
-    cat >>confdefs.h <<\_ACEOF
+cat >>confdefs.h <<\_ACEOF
 #define HAVE_ALLOCA 1
 _ACEOF
 
 else
-  if test "$cross_compiling" = yes; then
-  gcl_ok=no
+  # The SVR3 libPW and SVR4 libucb both contain incompatible functions
+# that cause trouble.  Some versions do not even contain alloca or
+# contain a buggy version.  If you still want to use their alloca,
+# use ar to extract alloca.o from them instead of compiling alloca.c.
+
+ALLOCA=\${LIBOBJDIR}alloca.$ac_objext
+
+cat >>confdefs.h <<\_ACEOF
+#define C_ALLOCA 1
+_ACEOF
+
+
+{ $as_echo "$as_me:$LINENO: checking whether \`alloca.c' needs Cray hooks" >&5
+$as_echo_n "checking whether \`alloca.c' needs Cray hooks... " >&6; }
+if test "${ac_cv_os_cray+set}" = set; then
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -13857,17 +13958,163 @@
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
+#if defined CRAY && ! defined CRAY2
+webecray
+#else
+wenotbecray
+#endif
 
-  #include <alloca.h>
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "webecray" >/dev/null 2>&1; then
+  ac_cv_os_cray=yes
+else
+  ac_cv_os_cray=no
+fi
+rm -f conftest*
+
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_os_cray" >&5
+$as_echo "$ac_cv_os_cray" >&6; }
+if test $ac_cv_os_cray = yes; then
+  for ac_func in _getb67 GETB67 getb67; do
+    as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+$as_echo_n "checking for $ac_func... " >&6; }
+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+#define $ac_func innocuous_$ac_func
+
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char $ac_func (); below.
+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+    <limits.h> exists even on freestanding compilers.  */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+
+#undef $ac_func
+
+/* 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 $ac_func ();
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined __stub_$ac_func || defined __stub___$ac_func
+choke me
+#endif
 
 int
 main ()
 {
-exit(alloca(500) != NULL ? 0 : 1);
+return $ac_func ();
   ;
   return 0;
 }
 _ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
+  eval "$as_ac_var=yes"
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	eval "$as_ac_var=no"
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+fi
+ac_res=`eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+as_val=`eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
+
+cat >>confdefs.h <<_ACEOF
+#define CRAY_STACKSEG_END $ac_func
+_ACEOF
+
+    break
+fi
+
+  done
+fi
+
+{ $as_echo "$as_me:$LINENO: checking stack direction for C alloca" >&5
+$as_echo_n "checking stack direction for C alloca... " >&6; }
+if test "${ac_cv_c_stack_direction+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  if test "$cross_compiling" = yes; then
+  ac_cv_c_stack_direction=0
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+int
+find_stack_direction ()
+{
+  static char *addr = 0;
+  auto char dummy;
+  if (addr == 0)
+    {
+      addr = &dummy;
+      return find_stack_direction ();
+    }
+  else
+    return (&dummy > addr) ? 1 : -1;
+}
+
+int
+main ()
+{
+  return find_stack_direction () < 0;
+}
+_ACEOF
 rm -f conftest$ac_exeext
 if { (ac_try="$ac_link"
 case "(($ac_try" in
@@ -13890,43 +14137,30 @@
   ac_status=$?
   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  :
+  ac_cv_c_stack_direction=1
 else
   $as_echo "$as_me: program exited with status $ac_status" >&5
 $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 ( exit $ac_status )
-gcl_ok=yes
+ac_cv_c_stack_direction=-1
 fi
 rm -rf conftest.dSYM
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
 
- if test $gcl_ok = yes ; then
-    { $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
-    cat >>confdefs.h <<\_ACEOF
-#define HAVE_ALLOCA 1
-_ACEOF
-
-    cat >>confdefs.h <<\_ACEOF
-#define NEED_ALLOCA_H 1
-_ACEOF
-
- fi
 fi
-if test $gcl_ok = no ; then     { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; } ; fi
-
-
-
-
-
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_stack_direction" >&5
+$as_echo "$ac_cv_c_stack_direction" >&6; }
 
+cat >>confdefs.h <<_ACEOF
+#define STACK_DIRECTION $ac_cv_c_stack_direction
+_ACEOF
 
 
+fi
 
 
 # dlopen etc
diff -dur gcl-2.6.8.ORIG/configure.in gcl-2.6.8/configure.in
--- gcl-2.6.8.ORIG/configure.in	2008-12-29 16:05:13.000000000 -0700
+++ gcl-2.6.8/configure.in	2008-12-29 16:06:43.000000000 -0700
@@ -1852,33 +1852,7 @@
 
 # alloca
 
-AC_MSG_CHECKING([for alloca])
-AC_RUN_IFELSE([AC_LANG_PROGRAM([],[[exit(alloca(500) != NULL ? 0 : 1);]])],
-  ,gcl_ok=yes, gcl_ok=no,gcl_ok=no)
-if test $gcl_ok = yes ; then
-    AC_MSG_RESULT(yes)
-    AC_DEFINE(HAVE_ALLOCA)
-else
-  AC_RUN_IFELSE([AC_LANG_PROGRAM([[
-  #include <alloca.h>
-  ]],[[exit(alloca(500) != NULL ? 0 : 1);]])],
-  ,gcl_ok=yes, gcl_ok=no,gcl_ok=no)
- if test $gcl_ok = yes ; then
-    AC_MSG_RESULT(yes)
-    AC_DEFINE(HAVE_ALLOCA)
-    AC_DEFINE(NEED_ALLOCA_H)
- fi
-fi
-if test $gcl_ok = no ; then     AC_MSG_RESULT(no) ; fi
-
-
-
-
-
-
-
-
-
+AC_FUNC_ALLOCA
 
 # dlopen etc
 # idea make it so you do something dlopen(libX.so,RTLD_GLOBAL)
diff -dur gcl-2.6.8.ORIG/h/gclincl.h.in gcl-2.6.8/h/gclincl.h.in
--- gcl-2.6.8.ORIG/h/gclincl.h.in	2008-12-29 16:05:13.000000000 -0700
+++ gcl-2.6.8/h/gclincl.h.in	2008-12-29 16:06:55.000000000 -0700
@@ -54,11 +54,10 @@
 #undef HAVE_ALLOCA 
 #endif
 
-
 /* define if need alloca.h */
-#undef NEED_ALLOCA_H
+#undef HAVE_ALLOCA_H
 
-#ifdef NEED_ALLOCA_H
+#ifdef HAVE_ALLOCA_H
 #include <alloca.h>
 #endif
 
@@ -259,6 +258,21 @@
 #undef HAVE_MALLOC_MALLOC_H
 #undef HAVE_OBJC_MALLOC_H
 
+/* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP
+   systems. This function is required for `alloca.c' support on those systems.
+   */
+#undef CRAY_STACKSEG_END
+
+/* Define to 1 if using `alloca.c'. */
+#undef C_ALLOCA
+
+/* Define to 1 if you have `alloca', as a function or macro. */
+#undef HAVE_ALLOCA
+
+/* Define to 1 if you have <alloca.h> and it should be used (not on Ultrix).
+   */
+#undef HAVE_ALLOCA_H
+
 /* Define to 1 if you have the <asm/sigcontext.h> header file. */
 #undef HAVE_ASM_SIGCONTEXT_H
 
@@ -343,6 +357,14 @@
 /* The size of `long', as computed by sizeof. */
 #undef SIZEOF_LONG
 
+/* If using the C implementation of alloca, define if you know the
+   direction of stack growth for your system; otherwise it will be
+   automatically deduced at runtime.
+	STACK_DIRECTION > 0 => grows toward higher addresses
+	STACK_DIRECTION < 0 => grows toward lower addresses
+	STACK_DIRECTION = 0 => direction of growth unknown */
+#undef STACK_DIRECTION
+
 /* Define to 1 if you have the ANSI C header files. */
 #undef STDC_HEADERS
 

gcl-2.6.8-bfd.patch:

--- NEW FILE gcl-2.6.8-bfd.patch ---
diff -dur gcl-2.6.8.ORIG/acconfig.h gcl-2.6.8/acconfig.h
--- gcl-2.6.8.ORIG/acconfig.h	2008-12-29 16:24:30.000000000 -0700
+++ gcl-2.6.8/acconfig.h	2008-12-29 17:58:20.000000000 -0700
@@ -142,6 +142,7 @@
 /* bfd support */
 #undef HAVE_LIBBFD
 #undef NEED_CONST
+#undef HAVE_OUTPUT_BFD
 #define HAVE_BFD_BOOLEAN
 
 #ifdef HAVE_BFD_BOOLEAN
diff -dur gcl-2.6.8.ORIG/configure gcl-2.6.8/configure
--- gcl-2.6.8.ORIG/configure	2008-12-29 16:48:36.000000000 -0700
+++ gcl-2.6.8/configure	2008-12-29 17:58:49.000000000 -0700
@@ -683,6 +683,7 @@
 LIBIBERTY
 LIBBFD
 BUILD_BFD
+HAVE_OUTPUT_BFD
 X_EXTRA_LIBS
 X_LIBS
 X_PRE_LIBS
@@ -9023,6 +9024,120 @@
 
 
 
+#
+# Newer BFD libraries need a dummy output bfd
+#
+	{ $as_echo "$as_me:$LINENO: checking for struct bfd_link_info.output_bfd" >&5
+$as_echo_n "checking for struct bfd_link_info.output_bfd... " >&6; }
+if test "${ac_cv_member_struct_bfd_link_info_output_bfd+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+#include <bfd.h>
+#include <bfdlink.h>
+
+
+int
+main ()
+{
+static struct bfd_link_info ac_aggr;
+if (ac_aggr.output_bfd)
+return 0;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_cv_member_struct_bfd_link_info_output_bfd=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+#include <bfd.h>
+#include <bfdlink.h>
+
+
+int
+main ()
+{
+static struct bfd_link_info ac_aggr;
+if (sizeof ac_aggr.output_bfd)
+return 0;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_cv_member_struct_bfd_link_info_output_bfd=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_member_struct_bfd_link_info_output_bfd=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_member_struct_bfd_link_info_output_bfd" >&5
+$as_echo "$ac_cv_member_struct_bfd_link_info_output_bfd" >&6; }
+if test "x$ac_cv_member_struct_bfd_link_info_output_bfd" = x""yes; then
+  cat >>confdefs.h <<\_ACEOF
+#define HAVE_OUTPUT_BFD 1
+_ACEOF
+
+fi
+
+
 
 #
 # FIXME: Need to workaround mingw before this point -- CM
diff -dur gcl-2.6.8.ORIG/configure.in gcl-2.6.8/configure.in
--- gcl-2.6.8.ORIG/configure.in	2008-12-29 16:48:36.000000000 -0700
+++ gcl-2.6.8/configure.in	2008-12-29 17:58:20.000000000 -0700
@@ -893,6 +893,15 @@
 		AC_MSG_RESULT(no),
 		AC_MSG_RESULT(no))
 
+#
+# Newer BFD libraries need a dummy output bfd
+#
+	AC_CHECK_MEMBER([struct bfd_link_info.output_bfd],
+		[AC_DEFINE(HAVE_OUTPUT_BFD)], [], [
+#include <bfd.h>
+#include <bfdlink.h>
+		])
+	AC_SUBST(HAVE_OUTPUT_BFD)
 
 #
 # FIXME: Need to workaround mingw before this point -- CM
diff -dur gcl-2.6.8.ORIG/h/gclincl.h.in gcl-2.6.8/h/gclincl.h.in
--- gcl-2.6.8.ORIG/h/gclincl.h.in	2008-12-29 16:24:30.000000000 -0700
+++ gcl-2.6.8/h/gclincl.h.in	2008-12-29 17:58:50.000000000 -0700
@@ -143,6 +143,7 @@
 /* bfd support */
 #undef HAVE_LIBBFD
 #undef NEED_CONST
+#undef HAVE_OUTPUT_BFD
 #define HAVE_BFD_BOOLEAN
 
 #ifdef HAVE_BFD_BOOLEAN
diff -dur gcl-2.6.8.ORIG/o/sfasli.c gcl-2.6.8/o/sfasli.c
--- gcl-2.6.8.ORIG/o/sfasli.c	2005-01-15 09:26:43.000000000 -0700
+++ gcl-2.6.8/o/sfasli.c	2008-12-29 17:58:20.000000000 -0700
@@ -32,6 +32,9 @@
   int u,v;
   unsigned long pa;
   asymbol **q;
+#ifdef HAVE_OUTPUT_BFD
+  const char **bfd_targets;
+#endif
 
   bfd_init();
   if (!(bself=bfd_openr(kcl_self,0)))
@@ -40,6 +43,11 @@
     FEerror("I'm not an object",0);
 /*    if (link_info.hash) */
 /*      bfd_link_hash_table_free(bself,link_info.hash); */
+#ifdef HAVE_OUTPUT_BFD
+  bfd_targets = bfd_target_list();
+  link_info.output_bfd = bfd_openw("/dev/null", bfd_targets[0]);
+  free(bfd_targets);
+#endif
   if (!(link_info.hash = bfd_link_hash_table_create (bself)))
     FEerror("Cannot make hash table",0);
   if (!bfd_link_add_symbols(bself,&link_info))
diff -dur gcl-2.6.8.ORIG/o/unexelf.c gcl-2.6.8/o/unexelf.c
--- gcl-2.6.8.ORIG/o/unexelf.c	2004-05-03 15:35:58.000000000 -0600
+++ gcl-2.6.8/o/unexelf.c	2008-12-29 17:58:20.000000000 -0700
@@ -1,5 +1,13 @@
-/* Foundation; either version 2, or (at your option)
-any later version.
+/* Copyright (C) 1985, 1986, 1987, 1988, 1990, 1992, 1999, 2000, 2001,
+                 2002, 2003, 2004, 2005, 2006, 2007, 2008
+                 Free Software Foundation, Inc.
+
+This file is part of GNU Emacs.
+
+GNU Emacs 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.
 
 GNU Emacs is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -7,10 +15,9 @@
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.
+along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
+/*
 In other words, you are welcome to use, share and improve this program.
 You are forbidden to forbid anyone else to use, share and improve
 what you give them.   Help stamp out software-hoarding!  */
@@ -82,224 +89,224 @@
 temacs:
 
            **** SECTION HEADER TABLE ****
-[No]    Type    Flags   Addr         Offset       Size          Name
-        Link    Info    Adralgn      Entsize
+ [No]    Type    Flags   Addr         Offset       Size          Name
+         Link    Info    Adralgn      Entsize
 
-[1]     1       2       0x80480d4    0xd4         0x13          .interp
-        0       0       0x1          0
+ [1]     1       2       0x80480d4    0xd4         0x13          .interp
+         0       0       0x1          0
 
-[2]     5       2       0x80480e8    0xe8         0x388         .hash
-        3       0       0x4          0x4
+ [2]     5       2       0x80480e8    0xe8         0x388         .hash
+         3       0       0x4          0x4
 
-[3]     11      2       0x8048470    0x470        0x7f0         .dynsym
-        4       1       0x4          0x10
+ [3]     11      2       0x8048470    0x470        0x7f0         .dynsym
+         4       1       0x4          0x10
 
-[4]     3       2       0x8048c60    0xc60        0x3ad         .dynstr
-        0       0       0x1          0
+ [4]     3       2       0x8048c60    0xc60        0x3ad         .dynstr
+         0       0       0x1          0
 
-[5]     9       2       0x8049010    0x1010       0x338         .rel.plt
-        3       7       0x4          0x8
+ [5]     9       2       0x8049010    0x1010       0x338         .rel.plt
+         3       7       0x4          0x8
 
-[6]     1       6       0x8049348    0x1348       0x3           .init
-        0       0       0x4          0
+ [6]     1       6       0x8049348    0x1348       0x3           .init
+         0       0       0x4          0
 
-[7]     1       6       0x804934c    0x134c       0x680         .plt
-        0       0       0x4          0x4
+ [7]     1       6       0x804934c    0x134c       0x680         .plt
+         0       0       0x4          0x4
 
-[8]     1       6       0x80499cc    0x19cc       0x3c56f       .text
-        0       0       0x4          0
+ [8]     1       6       0x80499cc    0x19cc       0x3c56f       .text
+         0       0       0x4          0
 
-[9]     1       6       0x8085f3c    0x3df3c      0x3           .fini
-        0       0       0x4          0
+ [9]     1       6       0x8085f3c    0x3df3c      0x3           .fini
+         0       0       0x4          0
 
-[10]    1       2       0x8085f40    0x3df40      0x69c         .rodata
-        0       0       0x4          0
+ [10]    1       2       0x8085f40    0x3df40      0x69c         .rodata
+         0       0       0x4          0
 
-[11]    1       2       0x80865dc    0x3e5dc      0xd51         .rodata1
-        0       0       0x4          0
+ [11]    1       2       0x80865dc    0x3e5dc      0xd51         .rodata1
+         0       0       0x4          0
 
-[12]    1       3       0x8088330    0x3f330      0x20afc       .data
-        0       0       0x4          0
+ [12]    1       3       0x8088330    0x3f330      0x20afc       .data
+         0       0       0x4          0
 
-[13]    1       3       0x80a8e2c    0x5fe2c      0x89d         .data1
-        0       0       0x4          0
+ [13]    1       3       0x80a8e2c    0x5fe2c      0x89d         .data1
+         0       0       0x4          0
 
-[14]    1       3       0x80a96cc    0x606cc      0x1a8         .got
-        0       0       0x4          0x4
+ [14]    1       3       0x80a96cc    0x606cc      0x1a8         .got
+         0       0       0x4          0x4
 
-[15]    6       3       0x80a9874    0x60874      0x80          .dynamic
-        4       0       0x4          0x8
+ [15]    6       3       0x80a9874    0x60874      0x80          .dynamic
+         4       0       0x4          0x8
 
-[16]    8       3       0x80a98f4    0x608f4      0x449c        .bss
-        0       0       0x4          0
+ [16]    8       3       0x80a98f4    0x608f4      0x449c        .bss
+         0       0       0x4          0
 
-[17]    2       0       0            0x608f4      0x9b90        .symtab
-        18      371     0x4          0x10
+ [17]    2       0       0            0x608f4      0x9b90        .symtab
+         18      371     0x4          0x10
 
-[18]    3       0       0            0x6a484      0x8526        .strtab
-        0       0       0x1          0
+ [18]    3       0       0            0x6a484      0x8526        .strtab
+         0       0       0x1          0
 
-[19]    3       0       0            0x729aa      0x93          .shstrtab
-        0       0       0x1          0
+ [19]    3       0       0            0x729aa      0x93          .shstrtab
+         0       0       0x1          0
 
-[20]    1       0       0            0x72a3d      0x68b7        .comment
-        0       0       0x1          0
+ [20]    1       0       0            0x72a3d      0x68b7        .comment
+         0       0       0x1          0
 
-raid:/nfs/raid/src/dist-18.56/src> dump -h xemacs
+ raid:/nfs/raid/src/dist-18.56/src> dump -h xemacs
 
-xemacs:
+ xemacs:
 
-           **** SECTION HEADER TABLE ****
-[No]    Type    Flags   Addr         Offset       Size          Name
-        Link    Info    Adralgn      Entsize
+            **** SECTION HEADER TABLE ****
+ [No]    Type    Flags   Addr         Offset       Size          Name
+         Link    Info    Adralgn      Entsize
 
-[1]     1       2       0x80480d4    0xd4         0x13          .interp
-        0       0       0x1          0
+ [1]     1       2       0x80480d4    0xd4         0x13          .interp
+         0       0       0x1          0
 
-[2]     5       2       0x80480e8    0xe8         0x388         .hash
-        3       0       0x4          0x4
+ [2]     5       2       0x80480e8    0xe8         0x388         .hash
+         3       0       0x4          0x4
 
-[3]     11      2       0x8048470    0x470        0x7f0         .dynsym
-        4       1       0x4          0x10
+ [3]     11      2       0x8048470    0x470        0x7f0         .dynsym
+         4       1       0x4          0x10
 
-[4]     3       2       0x8048c60    0xc60        0x3ad         .dynstr
-        0       0       0x1          0
+ [4]     3       2       0x8048c60    0xc60        0x3ad         .dynstr
+         0       0       0x1          0
 
-[5]     9       2       0x8049010    0x1010       0x338         .rel.plt
-        3       7       0x4          0x8
+ [5]     9       2       0x8049010    0x1010       0x338         .rel.plt
+         3       7       0x4          0x8
 
-[6]     1       6       0x8049348    0x1348       0x3           .init
-        0       0       0x4          0
+ [6]     1       6       0x8049348    0x1348       0x3           .init
+         0       0       0x4          0
 
-[7]     1       6       0x804934c    0x134c       0x680         .plt
-        0       0       0x4          0x4
+ [7]     1       6       0x804934c    0x134c       0x680         .plt
+         0       0       0x4          0x4
 
-[8]     1       6       0x80499cc    0x19cc       0x3c56f       .text
-        0       0       0x4          0
+ [8]     1       6       0x80499cc    0x19cc       0x3c56f       .text
+         0       0       0x4          0
 
-[9]     1       6       0x8085f3c    0x3df3c      0x3           .fini
-        0       0       0x4          0
+ [9]     1       6       0x8085f3c    0x3df3c      0x3           .fini
+         0       0       0x4          0
 
-[10]    1       2       0x8085f40    0x3df40      0x69c         .rodata
-        0       0       0x4          0
+ [10]    1       2       0x8085f40    0x3df40      0x69c         .rodata
+         0       0       0x4          0
 
-[11]    1       2       0x80865dc    0x3e5dc      0xd51         .rodata1
-        0       0       0x4          0
+ [11]    1       2       0x80865dc    0x3e5dc      0xd51         .rodata1
+         0       0       0x4          0
 
-[12]    1       3       0x8088330    0x3f330      0x20afc       .data
-        0       0       0x4          0
+ [12]    1       3       0x8088330    0x3f330      0x20afc       .data
+         0       0       0x4          0
 
-[13]    1       3       0x80a8e2c    0x5fe2c      0x89d         .data1
-        0       0       0x4          0
+ [13]    1       3       0x80a8e2c    0x5fe2c      0x89d         .data1
+         0       0       0x4          0
 
-[14]    1       3       0x80a96cc    0x606cc      0x1a8         .got
-        0       0       0x4          0x4
+ [14]    1       3       0x80a96cc    0x606cc      0x1a8         .got
+         0       0       0x4          0x4
 
-[15]    6       3       0x80a9874    0x60874      0x80          .dynamic
-        4       0       0x4          0x8
+ [15]    6       3       0x80a9874    0x60874      0x80          .dynamic
+         4       0       0x4          0x8
 
-[16]    8       3       0x80c6800    0x7d800      0             .bss
-        0       0       0x4          0
+ [16]    8       3       0x80c6800    0x7d800      0             .bss
+         0       0       0x4          0
 
-[17]    2       0       0            0x7d800      0x9b90        .symtab
-        18      371     0x4          0x10
+ [17]    2       0       0            0x7d800      0x9b90        .symtab
+         18      371     0x4          0x10
 
-[18]    3       0       0            0x87390      0x8526        .strtab
-        0       0       0x1          0
+ [18]    3       0       0            0x87390      0x8526        .strtab
+         0       0       0x1          0
 
-[19]    3       0       0            0x8f8b6      0x93          .shstrtab
-        0       0       0x1          0
+ [19]    3       0       0            0x8f8b6      0x93          .shstrtab
+         0       0       0x1          0
 
-[20]    1       0       0            0x8f949      0x68b7        .comment
-        0       0       0x1          0
+ [20]    1       0       0            0x8f949      0x68b7        .comment
+         0       0       0x1          0
 
-[21]    1       3       0x80a98f4    0x608f4      0x1cf0c       .data
-        0       0       0x4          0
+ [21]    1       3       0x80a98f4    0x608f4      0x1cf0c       .data
+         0       0       0x4          0
 
- * This is an example of how the file header is changed.  "Shoff" is
- * the section header offset within the file.  Since that table is
- * after the new .data section, it is moved.  "Shnum" is the number of
- * sections, which we increment.
- *
- * "Phoff" is the file offset to the program header.  "Phentsize" and
- * "Shentsz" are the program and section header entries sizes respectively.
- * These can be larger than the apparent struct sizes.
+  * This is an example of how the file header is changed.  "Shoff" is
+  * the section header offset within the file.  Since that table is
+  * after the new .data section, it is moved.  "Shnum" is the number of
+  * sections, which we increment.
+  *
+  * "Phoff" is the file offset to the program header.  "Phentsize" and
+  * "Shentsz" are the program and section header entries sizes respectively.
+  * These can be larger than the apparent struct sizes.
 
-raid:/nfs/raid/src/dist-18.56/src> dump -f temacs
+ raid:/nfs/raid/src/dist-18.56/src> dump -f temacs
 
-temacs:
+ temacs:
 
-                    **** ELF HEADER ****
-Class        Data       Type         Machine     Version
-Entry        Phoff      Shoff        Flags       Ehsize
-Phentsize    Phnum      Shentsz      Shnum       Shstrndx
+                     **** ELF HEADER ****
+ Class        Data       Type         Machine     Version
+ Entry        Phoff      Shoff        Flags       Ehsize
+ Phentsize    Phnum      Shentsz      Shnum       Shstrndx
 
-1            1          2            3           1
-0x80499cc    0x34       0x792f4      0           0x34
-0x20         5          0x28         21          19
+ 1            1          2            3           1
+ 0x80499cc    0x34       0x792f4      0           0x34
+ 0x20         5          0x28         21          19
 
-raid:/nfs/raid/src/dist-18.56/src> dump -f xemacs
+ raid:/nfs/raid/src/dist-18.56/src> dump -f xemacs
 
-xemacs:
+ xemacs:
 
-                    **** ELF HEADER ****
-Class        Data       Type         Machine     Version
-Entry        Phoff      Shoff        Flags       Ehsize
-Phentsize    Phnum      Shentsz      Shnum       Shstrndx
+                     **** ELF HEADER ****
+ Class        Data       Type         Machine     Version
+ Entry        Phoff      Shoff        Flags       Ehsize
+ Phentsize    Phnum      Shentsz      Shnum       Shstrndx
 
-1            1          2            3           1
-0x80499cc    0x34       0x96200      0           0x34
-0x20         5          0x28         22          19
+ 1            1          2            3           1
+ 0x80499cc    0x34       0x96200      0           0x34
+ 0x20         5          0x28         22          19
 
- * These are the program headers.  "Offset" is the file offset to the
- * segment.  "Vaddr" is the memory load address.  "Filesz" is the
- * segment size as it appears in the file, and "Memsz" is the size in
- * memory.  Below, the third segment is the code and the fourth is the
- * data: the difference between Filesz and Memsz is .bss
+  * These are the program headers.  "Offset" is the file offset to the
+  * segment.  "Vaddr" is the memory load address.  "Filesz" is the
+  * segment size as it appears in the file, and "Memsz" is the size in
+  * memory.  Below, the third segment is the code and the fourth is the
+  * data: the difference between Filesz and Memsz is .bss
 
-raid:/nfs/raid/src/dist-18.56/src> dump -o temacs
+ raid:/nfs/raid/src/dist-18.56/src> dump -o temacs
 
-temacs:
- ***** PROGRAM EXECUTION HEADER *****
-Type        Offset      Vaddr       Paddr
-Filesz      Memsz       Flags       Align
+ temacs:
+  ***** PROGRAM EXECUTION HEADER *****
+ Type        Offset      Vaddr       Paddr
+ Filesz      Memsz       Flags       Align
 
-6           0x34        0x8048034   0
-0xa0        0xa0        5           0
+ 6           0x34        0x8048034   0
+ 0xa0        0xa0        5           0
 
-3           0xd4        0           0
-0x13        0           4           0
+ 3           0xd4        0           0
+ 0x13        0           4           0
 
-1           0x34        0x8048034   0
-0x3f2f9     0x3f2f9     5           0x1000
+ 1           0x34        0x8048034   0
+ 0x3f2f9     0x3f2f9     5           0x1000
 
-1           0x3f330     0x8088330   0
-0x215c4     0x25a60     7           0x1000
+ 1           0x3f330     0x8088330   0
+ 0x215c4     0x25a60     7           0x1000
 
-2           0x60874     0x80a9874   0
-0x80        0           7           0
+ 2           0x60874     0x80a9874   0
+ 0x80        0           7           0
 
-raid:/nfs/raid/src/dist-18.56/src> dump -o xemacs
+ raid:/nfs/raid/src/dist-18.56/src> dump -o xemacs
 
-xemacs:
- ***** PROGRAM EXECUTION HEADER *****
-Type        Offset      Vaddr       Paddr
-Filesz      Memsz       Flags       Align
+ xemacs:
+  ***** PROGRAM EXECUTION HEADER *****
+ Type        Offset      Vaddr       Paddr
+ Filesz      Memsz       Flags       Align
 
-6           0x34        0x8048034   0
-0xa0        0xa0        5           0
+ 6           0x34        0x8048034   0
+ 0xa0        0xa0        5           0
 
-3           0xd4        0           0
-0x13        0           4           0
+ 3           0xd4        0           0
+ 0x13        0           4           0
 
-1           0x34        0x8048034   0
-0x3f2f9     0x3f2f9     5           0x1000
+ 1           0x34        0x8048034   0
+ 0x3f2f9     0x3f2f9     5           0x1000
 
-1           0x3f330     0x8088330   0
-0x3e4d0     0x3e4d0     7           0x1000
+ 1           0x3f330     0x8088330   0
+ 0x3e4d0     0x3e4d0     7           0x1000
 
-2           0x60874     0x80a9874   0
-0x80        0           7           0
+ 2           0x60874     0x80a9874   0
+ 0x80        0           7           0
 
 
  */
@@ -329,71 +336,71 @@
  * The above example now should look like:
 
            **** SECTION HEADER TABLE ****
-[No]    Type    Flags   Addr         Offset       Size          Name
-        Link    Info    Adralgn      Entsize
+ [No]    Type    Flags   Addr         Offset       Size          Name
+         Link    Info    Adralgn      Entsize
 
-[1]     1       2       0x80480d4    0xd4         0x13          .interp
-        0       0       0x1          0
+ [1]     1       2       0x80480d4    0xd4         0x13          .interp
+         0       0       0x1          0
 
-[2]     5       2       0x80480e8    0xe8         0x388         .hash
-        3       0       0x4          0x4
+ [2]     5       2       0x80480e8    0xe8         0x388         .hash
+         3       0       0x4          0x4
 
-[3]     11      2       0x8048470    0x470        0x7f0         .dynsym
-        4       1       0x4          0x10
+ [3]     11      2       0x8048470    0x470        0x7f0         .dynsym
+         4       1       0x4          0x10
 
-[4]     3       2       0x8048c60    0xc60        0x3ad         .dynstr
-        0       0       0x1          0
+ [4]     3       2       0x8048c60    0xc60        0x3ad         .dynstr
+         0       0       0x1          0
 
-[5]     9       2       0x8049010    0x1010       0x338         .rel.plt
-        3       7       0x4          0x8
+ [5]     9       2       0x8049010    0x1010       0x338         .rel.plt
+         3       7       0x4          0x8
 
-[6]     1       6       0x8049348    0x1348       0x3           .init
-        0       0       0x4          0
+ [6]     1       6       0x8049348    0x1348       0x3           .init
+         0       0       0x4          0
 
-[7]     1       6       0x804934c    0x134c       0x680         .plt
-        0       0       0x4          0x4
+ [7]     1       6       0x804934c    0x134c       0x680         .plt
+         0       0       0x4          0x4
 
-[8]     1       6       0x80499cc    0x19cc       0x3c56f       .text
-        0       0       0x4          0
+ [8]     1       6       0x80499cc    0x19cc       0x3c56f       .text
+         0       0       0x4          0
 
-[9]     1       6       0x8085f3c    0x3df3c      0x3           .fini
-        0       0       0x4          0
+ [9]     1       6       0x8085f3c    0x3df3c      0x3           .fini
+         0       0       0x4          0
 
-[10]    1       2       0x8085f40    0x3df40      0x69c         .rodata
-        0       0       0x4          0
+ [10]    1       2       0x8085f40    0x3df40      0x69c         .rodata
+         0       0       0x4          0
 
-[11]    1       2       0x80865dc    0x3e5dc      0xd51         .rodata1
-        0       0       0x4          0
+ [11]    1       2       0x80865dc    0x3e5dc      0xd51         .rodata1
+         0       0       0x4          0
 
-[12]    1       3       0x8088330    0x3f330      0x20afc       .data
-        0       0       0x4          0
+ [12]    1       3       0x8088330    0x3f330      0x20afc       .data
+         0       0       0x4          0
 
-[13]    1       3       0x80a8e2c    0x5fe2c      0x89d         .data1
-        0       0       0x4          0
+ [13]    1       3       0x80a8e2c    0x5fe2c      0x89d         .data1
+         0       0       0x4          0
 
-[14]    1       3       0x80a96cc    0x606cc      0x1a8         .got
-        0       0       0x4          0x4
+ [14]    1       3       0x80a96cc    0x606cc      0x1a8         .got
+         0       0       0x4          0x4
 
-[15]    6       3       0x80a9874    0x60874      0x80          .dynamic
-        4       0       0x4          0x8
+ [15]    6       3       0x80a9874    0x60874      0x80          .dynamic
+         4       0       0x4          0x8
 
-[16]    1       3       0x80a98f4    0x608f4      0x1cf0c       .data
-        0       0       0x4          0
+ [16]    1       3       0x80a98f4    0x608f4      0x1cf0c       .data
+         0       0       0x4          0
 
-[17]    8       3       0x80c6800    0x7d800      0             .bss
-        0       0       0x4          0
+ [17]    8       3       0x80c6800    0x7d800      0             .bss
+         0       0       0x4          0
 
-[18]    2       0       0            0x7d800      0x9b90        .symtab
-        19      371     0x4          0x10
+ [18]    2       0       0            0x7d800      0x9b90        .symtab
+         19      371     0x4          0x10
 
-[19]    3       0       0            0x87390      0x8526        .strtab
-        0       0       0x1          0
+ [19]    3       0       0            0x87390      0x8526        .strtab
+         0       0       0x1          0
 
-[20]    3       0       0            0x8f8b6      0x93          .shstrtab
-        0       0       0x1          0
+ [20]    3       0       0            0x8f8b6      0x93          .shstrtab
+         0       0       0x1          0
 
-[21]    1       0       0            0x8f949      0x68b7        .comment
-        0       0       0x1          0
+ [21]    1       0       0            0x8f949      0x68b7        .comment
+         0       0       0x1          0
 
  */
 
@@ -402,17 +409,16 @@
 
 #ifndef emacs
 #define fatal(a, b...) fprintf (stderr, a, ##b), exit (1)
+#include <string.h>
 #else
 #include "config.h"
-extern void fatal (char *, ...);
+extern void fatal (const char *msgid, ...);
 #endif
 
 #include <sys/types.h>
 #include <stdio.h>
-#include <stdlib.h>
 #include <sys/stat.h>
 #include <memory.h>
-#include <string.h>
 #include <errno.h>
 #include <unistd.h>
 #include <fcntl.h>
@@ -420,10 +426,10 @@
 #include <elf.h>
 #endif
 #include <sys/mman.h>
-#if defined (__sony_news) && defined (_SYSTYPE_SYSV)
+#if defined (_SYSTYPE_SYSV)
 #include <sys/elf_mips.h>
 #include <sym.h>
-#endif /* __sony_news && _SYSTYPE_SYSV */
+#endif /* _SYSTYPE_SYSV */
 #if __sgi
 #include <syms.h> /* for HDRR declaration */
 #endif /* __sgi */
@@ -470,7 +476,7 @@
 	long cbFdOffset;
 	long cbRfdOffset;
 	long cbExtOffset;
-} HDRR, *pHDRR; 
+} HDRR, *pHDRR;
 #define cbHDRR sizeof(HDRR)
 #define hdrNil ((pHDRR)0)
 #endif
@@ -479,7 +485,7 @@
 /*
  * NetBSD does not have normal-looking user-land ELF support.
  */
-# ifdef __alpha__
+# if defined __alpha__ || defined __sparc_v9__
 #  define ELFSIZE	64
 # else
 #  define ELFSIZE	32
@@ -488,6 +494,9 @@
 
 # ifndef PT_LOAD
 #  define PT_LOAD	Elf_pt_load
+#  if 0						/* was in pkgsrc patches for 20.7 */
+#   define SHT_PROGBITS Elf_sht_progbits
+#  endif
 #  define SHT_SYMTAB	Elf_sht_symtab
 #  define SHT_DYNSYM	Elf_sht_dynsym
 #  define SHT_NULL	Elf_sht_null
@@ -498,13 +507,18 @@
 #  define SHN_UNDEF	Elf_eshn_undefined
 #  define SHN_ABS	Elf_eshn_absolute
 #  define SHN_COMMON	Elf_eshn_common
-# endif
+# endif /* !PT_LOAD */
 
 # ifdef __alpha__
 #  include <sys/exec_ecoff.h>
 #  define HDRR		struct ecoff_symhdr
 #  define pHDRR		HDRR *
-# endif
+# endif /* __alpha__ */
+
+#ifdef __mips__			/* was in pkgsrc patches for 20.7 */
+# define SHT_MIPS_DEBUG	DT_MIPS_FLAGS
+# define HDRR		struct Elf_Shdr
+#endif /* __mips__ */
 #endif /* __NetBSD__ */
 
 #ifdef __OpenBSD__
@@ -636,7 +650,7 @@
 {
   int new_file, old_file, new_file_size;
 
-  /* Pointers to the base of the image of the two files. */
+  /* Pointers to the base of the image of the two files.  */
   caddr_t old_base, new_base;
 
 #if MAP_ANON == 0
@@ -651,7 +665,7 @@
   ElfW(Phdr) *old_program_h, *new_program_h;
   ElfW(Shdr) *old_section_h, *new_section_h;
 
-  /* Point to the section name table in the old file */
+  /* Point to the section name table in the old file.  */
   char *old_section_names;
 
   ElfW(Addr) old_bss_addr, new_bss_addr;
@@ -660,7 +674,7 @@
   ElfW(Addr) new_data2_addr;
 
   int n, nn;
-  int old_bss_index, old_sbss_index;
+  int old_bss_index, old_sbss_index, old_plt_index;
   int old_data_index, new_data2_index;
   int old_mdebug_index;
   struct stat stat_buf;
@@ -710,8 +724,7 @@
 				   old_name, old_file_h, old_section_h, 1);
 
   /* Find the old .bss section.  Figure out parameters of the new
-   * data2 and bss sections.
-   */
+     data2 and bss sections.  */
 
   old_bss_index = find_section (".bss", old_section_names,
 				old_name, old_file_h, old_section_h, 0);
@@ -719,15 +732,34 @@
   old_sbss_index = find_section (".sbss", old_section_names,
 				 old_name, old_file_h, old_section_h, 1);
   if (old_sbss_index != -1)
-    if (OLD_SECTION_H (old_sbss_index).sh_type == SHT_PROGBITS)
+    if (OLD_SECTION_H (old_sbss_index).sh_type != SHT_NOBITS)
       old_sbss_index = -1;
 
-  if (old_sbss_index == -1)
+  /* PowerPC64 has .plt in the BSS section.  */
+  old_plt_index = find_section (".plt", old_section_names,
+				old_name, old_file_h, old_section_h, 1);
+  if (old_plt_index != -1)
+    if (OLD_SECTION_H (old_plt_index).sh_type != SHT_NOBITS)
+      old_plt_index = -1;
+
+  if (old_sbss_index == -1 && old_plt_index == -1)
     {
       old_bss_addr = OLD_SECTION_H (old_bss_index).sh_addr;
       old_bss_size = OLD_SECTION_H (old_bss_index).sh_size;
       new_data2_index = old_bss_index;
     }
+  else if (old_plt_index != -1
+	   && (old_sbss_index == -1
+	       || (OLD_SECTION_H (old_sbss_index).sh_addr
+		   > OLD_SECTION_H (old_plt_index).sh_addr)))
+    {
+      old_bss_addr = OLD_SECTION_H (old_plt_index).sh_addr;
+      old_bss_size = OLD_SECTION_H (old_bss_index).sh_size
+	+ OLD_SECTION_H (old_plt_index).sh_size;
+      if (old_sbss_index != -1)
+	old_bss_size += OLD_SECTION_H (old_sbss_index).sh_size;
+      new_data2_index = old_plt_index;
+    }
   else
     {
       old_bss_addr = OLD_SECTION_H (old_sbss_index).sh_addr;
@@ -789,8 +821,7 @@
     ((byte *) new_base + old_file_h->e_shoff + new_data2_size);
 
   /* Make our new file, program and section headers as copies of the
-   * originals.
-   */
+     originals.  */
 
   memcpy (new_file_h, old_file_h, old_file_h->e_ehsize);
   memcpy (new_program_h, old_program_h,
@@ -800,8 +831,7 @@
   PATCH_INDEX (new_file_h->e_shstrndx);
 
   /* Fix up file header.  We'll add one section.  Section header is
-   * further away now.
-   */
+     further away now.  */
 
   new_file_h->e_shoff += new_data2_size;
   new_file_h->e_shnum += 1;
@@ -814,12 +844,11 @@
 #endif
 
   /* Fix up a new program header.  Extend the writable data segment so
-   * that the bss area is covered too. Find that segment by looking
-   * for a segment that ends just before the .bss area.  Make sure
-   * that no segments are above the new .data2.  Put a loop at the end
-   * to adjust the offset and address of any segment that is above
-   * data2, just in case we decide to allow this later.
-   */
+     that the bss area is covered too. Find that segment by looking
+     for a segment that ends just before the .bss area.  Make sure
+     that no segments are above the new .data2.  Put a loop at the end
+     to adjust the offset and address of any segment that is above
+     data2, just in case we decide to allow this later.  */
 
   for (n = new_file_h->e_phnum - 1; n >= 0; n--)
     {
@@ -869,11 +898,10 @@
 #endif
 
   /* Fix up section headers based on new .data2 section.  Any section
-   * whose offset or virtual address is after the new .data2 section
-   * gets its value adjusted.  .bss size becomes zero and new address
-   * is set.  data2 section header gets added by copying the existing
-   * .data header and modifying the offset, address and size.
-   */
+     whose offset or virtual address is after the new .data2 section
+     gets its value adjusted.  .bss size becomes zero and new address
+     is set.  data2 section header gets added by copying the existing
+     .data header and modifying the offset, address and size.  */
   for (old_data_index = 1; old_data_index < (int) old_file_h->e_shnum;
        old_data_index++)
     if (!strcmp (old_section_names + OLD_SECTION_H (old_data_index).sh_name,
@@ -916,11 +944,11 @@
 
       memcpy (&NEW_SECTION_H (nn), &OLD_SECTION_H (n),
 	      old_file_h->e_shentsize);
-      
+
       if (n == old_bss_index
 	  /* The new bss and sbss section's size is zero, and its file offset
 	     and virtual address should be off by NEW_DATA2_SIZE.  */
-	  || n == old_sbss_index
+	  || n == old_sbss_index || n == old_plt_index
 	  )
 	{
 	  /* NN should be `old_s?bss_index + 1' at this point. */
@@ -977,11 +1005,11 @@
       if (NEW_SECTION_H (nn).sh_type != SHT_SYMTAB
 	  && NEW_SECTION_H (nn).sh_type != SHT_DYNSYM)
 	PATCH_INDEX (NEW_SECTION_H (nn).sh_info);
-      
+
       if (old_sbss_index != -1)
 	if (!strcmp (old_section_names + NEW_SECTION_H (nn).sh_name, ".sbss"))
 	  {
-	    NEW_SECTION_H (nn).sh_offset = 
+	    NEW_SECTION_H (nn).sh_offset =
 	      round_up (NEW_SECTION_H (nn).sh_offset,
 			NEW_SECTION_H (nn).sh_addralign);
 	    NEW_SECTION_H (nn).sh_type = SHT_PROGBITS;
@@ -1002,11 +1030,35 @@
 		      ".lit4")
 	  || !strcmp ((old_section_names + NEW_SECTION_H (n).sh_name),
 		      ".lit8")
+	  /* The conditional bit below was in Oliva's original code
+	     (1999-08-25) and seems to have been dropped by mistake
+	     subsequently.  It prevents a crash at startup under X in
+	     `IRIX64 6.5 6.5.17m', whether compiled on that relase or
+	     an earlier one.  It causes no trouble on the other ELF
+	     platforms I could test (Irix 6.5.15m, Solaris 8, Debian
+	     Potato x86, Debian Woody SPARC); however, it's reported
+	     to cause crashes under some version of GNU/Linux.  It's
+	     not yet clear what's changed in that Irix version to
+	     cause the problem, or why the fix sometimes fails under
+	     GNU/Linux.  There's probably no good reason to have
+	     something Irix-specific here, but this will have to do
+	     for now.  IRIX6_5 is the most specific macro we have to
+	     test.  -- fx 2002-10-01
+
+	     The issue _looks_ as though it's gone away on 6.5.18m,
+	     but maybe it's still lurking, to be triggered by some
+	     change in the binary.  It appears to concern the dynamic
+	     loader, but I never got anywhere with an SGI support call
+	     seeking clues.  -- fx 2002-11-29.  */
+#ifdef IRIX6_5
+	  || !strcmp ((old_section_names + NEW_SECTION_H (n).sh_name),
+		      ".got")
+#endif
 	  || !strcmp ((old_section_names + NEW_SECTION_H (n).sh_name),
 		      ".sdata1")
 	  || !strcmp ((old_section_names + NEW_SECTION_H (n).sh_name),
 		      ".data1")
-	  || !strcmp (old_section_names + NEW_SECTION_H (nn).sh_name,
+	  || !strcmp ((old_section_names + NEW_SECTION_H (n).sh_name),
 		      ".sbss"))
 	src = (caddr_t) OLD_SECTION_H (n).sh_addr;
       else
@@ -1036,12 +1088,12 @@
 	}
 #endif /* __alpha__ */
 
-#if defined (__sony_news) && defined (_SYSTYPE_SYSV)
+#if defined (_SYSTYPE_SYSV)
       if (NEW_SECTION_H (nn).sh_type == SHT_MIPS_DEBUG
-	  && old_mdebug_index != -1) 
+	  && old_mdebug_index != -1)
         {
-	  int diff = NEW_SECTION_H(nn).sh_offset 
-	 	- OLD_SECTION_H(old_mdebug_index).sh_offset;
+	  int diff = NEW_SECTION_H(nn).sh_offset
+		- OLD_SECTION_H(old_mdebug_index).sh_offset;
 	  HDRR *phdr = (HDRR *)(NEW_SECTION_H (nn).sh_offset + new_base);
 
 	  if (diff)
@@ -1059,10 +1111,10 @@
 	      phdr->cbExtOffset  += diff;
 	    }
 	}
-#endif /* __sony_news && _SYSTYPE_SYSV */
+#endif /* _SYSTYPE_SYSV */
 
 #if __sgi
-      /* Adjust  the HDRR offsets in .mdebug and copy the 
+      /* Adjust  the HDRR offsets in .mdebug and copy the
 	 line data if it's in its usual 'hole' in the object.
 	 Makes the new file debuggable with dbx.
 	 patches up two problems: the absolute file offsets
@@ -1164,54 +1216,68 @@
   for (n = new_file_h->e_shnum - 1; n; n--)
     {
       ElfW(Shdr) section = NEW_SECTION_H (n);
-      switch (section.sh_type) {
-      default:
-	break;
-      case SHT_REL:
-      case SHT_RELA:
-	/* This code handles two different size structs, but there should
-	   be no harm in that provided that r_offset is always the first
-	   member.  */
-	nn = section.sh_info;
-	if (nn && (!strcmp (old_section_names + NEW_SECTION_H (nn).sh_name, ".data")
-	    || !strcmp ((old_section_names + NEW_SECTION_H (nn).sh_name),
-			".sdata")
-	    || !strcmp ((old_section_names + NEW_SECTION_H (nn).sh_name),
-			".lit4")
-	    || !strcmp ((old_section_names + NEW_SECTION_H (nn).sh_name),
-			".lit8")
-	    || !strcmp ((old_section_names + NEW_SECTION_H (nn).sh_name),
-			".sdata1")
-	    || !strcmp ((old_section_names + NEW_SECTION_H (nn).sh_name),
-			".data1")))
-	  {
-	    ElfW(Addr) offset = NEW_SECTION_H (nn).sh_addr -
-	      NEW_SECTION_H (nn).sh_offset;
-	    caddr_t reloc = old_base + section.sh_offset, end;
-	    for (end = reloc + section.sh_size; reloc < end;
-		 reloc += section.sh_entsize)
-	      {
-		ElfW(Addr) addr = ((ElfW(Rel) *) reloc)->r_offset - offset;
+
+      /* Cause a compilation error if anyone uses n instead of nn below.  */
+      struct {int a;} n;
+      (void)n.a;		/* Prevent `unused variable' warnings.  */
+
+      switch (section.sh_type)
+	{
+	default:
+	  break;
+	case SHT_REL:
+	case SHT_RELA:
+	  /* This code handles two different size structs, but there should
+	     be no harm in that provided that r_offset is always the first
+	     member.  */
+	  nn = section.sh_info;
+	  if (!strcmp (old_section_names + NEW_SECTION_H (nn).sh_name, ".data")
+	      || !strcmp ((old_section_names + NEW_SECTION_H (nn).sh_name),
+			  ".sdata")
+	      || !strcmp ((old_section_names + NEW_SECTION_H (nn).sh_name),
+			  ".lit4")
+	      || !strcmp ((old_section_names + NEW_SECTION_H (nn).sh_name),
+			  ".lit8")
+#ifdef IRIX6_5			/* see above */
+	      || !strcmp ((old_section_names + NEW_SECTION_H (nn).sh_name),
+			  ".got")
+#endif
+	      || !strcmp ((old_section_names + NEW_SECTION_H (nn).sh_name),
+			  ".sdata1")
+	      || !strcmp ((old_section_names + NEW_SECTION_H (nn).sh_name),
+			  ".data1"))
+	    {
+	      ElfW(Addr) offset = (NEW_SECTION_H (nn).sh_addr
+				   - NEW_SECTION_H (nn).sh_offset);
+	      caddr_t reloc = old_base + section.sh_offset, end;
+	      for (end = reloc + section.sh_size; reloc < end;
+		   reloc += section.sh_entsize)
+		{
+		  ElfW(Addr) addr = ((ElfW(Rel) *) reloc)->r_offset - offset;
 #ifdef __alpha__
-		/* The Alpha ELF binutils currently have a bug that
-		   sometimes results in relocs that contain all
-		   zeroes.  Work around this for now...  */
-		if (((ElfW(Rel) *) reloc)->r_offset == 0)
+		  /* The Alpha ELF binutils currently have a bug that
+		     sometimes results in relocs that contain all
+		     zeroes.  Work around this for now...  */
+		  if (((ElfW(Rel) *) reloc)->r_offset == 0)
 		    continue;
 #endif
-		memcpy (new_base + addr, old_base + addr, sizeof(ElfW(Addr)));
-	      }
-	  }
-	break;
-      }
+		  memcpy (new_base + addr, old_base + addr, sizeof(ElfW(Addr)));
+		}
+	    }
+	  break;
+	}
     }
 
   /* Write out new_file, and free the buffers.  */
 
   if (write (new_file, new_base, new_file_size) != new_file_size)
+#ifndef emacs
+    fatal ("Didn't write %d bytes: errno %d\n",
+	   new_file_size, errno);
+#else
     fatal ("Didn't write %d bytes to %s: errno %d\n",
 	   new_file_size, new_base, errno);
-
+#endif
   munmap (old_base, old_file_size);
   munmap (new_base, new_file_size);
 
@@ -1236,12 +1302,12 @@
   if (chmod (new_name, stat_buf.st_mode) == -1)
     fatal ("Can't chmod (%s): errno %d\n", new_name, errno);
 }
-/* All of the above is from the emacs-20.7 file.  This comment and the
+/* All of the above is from the emacs-22.2 file.  This comment and the
    following are added for gcl.  Also we changed the above (near "for
    gcl") we make the NEW_SECTION_H executable since it will have code
    in it.  NEW_SECTION_H (nn).sh_flags |= SHF_EXECINSTR;
    
-   Partly synchronized with Emacs HEAD of 2004-04-12 by Magnus Henoch.
+   Synchronized with Emacs 22.2 on 2008-11-07 by Jerry James.
    The files themselves are no longer mmap'ed, but memory is allocated
    with mmap, and everything is written to the new file at the end.
 */

gcl-2.6.8-debuginfo.patch:

--- NEW FILE gcl-2.6.8-debuginfo.patch ---
diff -dur gcl-2.6.8.ORIG/o/makefile gcl-2.6.8/o/makefile
--- gcl-2.6.8.ORIG/o/makefile	2006-10-18 11:08:56.000000000 -0600
+++ gcl-2.6.8/o/makefile	2009-01-07 16:10:38.000000000 -0700
@@ -27,7 +27,6 @@
 %.o: %.d $(DECL)
 	$(DPP) $*
 	$(CC) -c $(CFLAGS) $(DEFS) $*.c $(AUX_INFO)
-	rm $*.c
 
 CPP=
 %.ini: %.c grab_defs plt.h

gcl-2.6.8-elisp.patch:

--- NEW FILE gcl-2.6.8-elisp.patch ---
diff -dur gcl-2.6.8.ORIG/elisp/ansi-doc.el gcl-2.6.8/elisp/ansi-doc.el
--- gcl-2.6.8.ORIG/elisp/ansi-doc.el	1999-12-06 15:43:59.000000000 -0700
+++ gcl-2.6.8/elisp/ansi-doc.el	2008-12-29 21:15:15.000000000 -0700
@@ -9,6 +9,8 @@
 ;; xdvi.   You may gzip the .dvi files and it will unzip them into tmp
 ;; as needed.
 
+(eval-and-compile
+  (require 'cl))
 
 (defvar ansi-doc-dir "/usr/local/doc/dpANS2")
 (defvar ansi-doc-alist nil)
@@ -55,38 +57,28 @@
 or topic.   If there are several pieces of documentation then go through
 them successively.   Requires copying the "
   (interactive )
-  (let (x tem name lis first chap tmp-chap)
-    (or ansi-doc-alist
-	(progn
-	  (create-index-el-from-index-idx )
-	  (load (concat ansi-doc-dir "/index.el"))))
-    (setq name (completing-read "Doc on: " ansi-doc-alist nil t))
-    (progn  (setq ans nil)   (setq lis ansi-doc-alist)
-	    (while lis
-	      (cond ((equal (car  (car lis)) name)
-		     (setq ans (append ans (cdr  (cdr (car lis)))))))
-	      (setq lis (cdr lis)))
-	    )	    
-    (setq tem ans)
-    (if (cdr tem) (setq first "First") (setq first ""))
-    (while tem
-      (setq x (car tem))
-      (setq chap (concat ansi-doc-dir
-		  (downcase (format "/chap-%s.dvi"  (car x)))))
-      (setq chap (maybe-gzip-to-tmp chap))
-      (message "%s Doc in Chapter %s page %s) %s .." first (car x) (cdr x))
-      (if (cdr tem) (setq first "Next") (setq next "Final"))
-      (shell-command (concat "xdvi  -expert -xoffset .2 -yoffset -.2 "
-			     " -paper 7.2x8.5 "
-			     " -display "
-			     (or x-display-name ":0")
-			     "  -geometry -2-2 +" (+ (cdr x) 2)" "
-			     chap
-			     ))
-      (setq tem (cdr tem))
-
-      )
-    )
-  (message nil)
-  
-  )
+  (unless ansi-doc-alist
+    (create-index-el-from-index-idx )
+    (load (concat ansi-doc-dir "/index.el")))
+  (let* ((name (completing-read "Doc on: " ansi-doc-alist nil t))
+	 (tem (mapcan #'(lambda (elem)
+			  (and (equal name (car elem)) (cddr elem)))
+		      ansi-doc-alist))
+	 (first (if (cdr tem) "First" "")))
+    (dolist (x tem)
+      (message "%s Doc in Chapter %s page %s) .." first (car x) (cdr x))
+      (let ((chap (maybe-gzip-to-tmp
+		   (concat ansi-doc-dir
+			   (downcase (format "/chap-%s.dvi"  (car x)))))))
+	(setq first (if (cdr tem) "Next" "Final"))
+	(shell-command (concat "xdvi  -expert -xoffset .2 -yoffset -.2 "
+			       " -paper 7.2x8.5 "
+			       " -display "
+			       (or
+				(if (featurep 'xemacs)
+				    (console-connection (selected-console))
+				  x-display-name)
+				":0")
+			       "  -geometry -2-2 +" (+ (cdr x) 2)" "
+			       chap)))))
+  (message nil))
diff -dur gcl-2.6.8.ORIG/elisp/dbl.el gcl-2.6.8/elisp/dbl.el
--- gcl-2.6.8.ORIG/elisp/dbl.el	2001-05-06 09:59:23.000000000 -0600
+++ gcl-2.6.8/elisp/dbl.el	2008-12-29 21:15:15.000000000 -0700
@@ -97,29 +97,35 @@
 ;(define-key ctl-x-map "&" 'send-dbl-command)
 
 ;;Of course you may use `def-dbl' with any other dbl command, including
-;;user defined ones.   
+;;user defined ones.
 
-(defmacro def-dbl (name key &optional doc)
+(defmacro def-dbl (name keys &optional doc)
+  (unless (consp keys)
+    (setq keys (list keys)))
   (let* ((fun (intern (format "dbl-%s" (read name))))
-	 )
-    (list 'progn
- 	  (list 'defun fun '(arg)
-		(or doc "")
-		'(interactive "p")
-		(list 'dbl-call name 'arg))
-	  (list 'define-key 'dbl-mode-map key  (list 'quote fun)))))
+	 (keydefs (mapcar #'(lambda (key) `(define-key dbl-mode-map ,key
+					    (quote ,fun)))
+		   keys)))
+    `(progn
+      (defun ,fun (arg)
+	,(or doc "")
+	(interactive "p")
+	(dbl-call ,name arg))
+      , at keydefs)))
 
-(def-dbl ":step %p"   "\M-s" "Step one source line with display")
-(def-dbl ":step %p"   "\C-c\C-s" "Step one source line with display")
-(def-dbl ":stepi %p"  "\C-c\t" "Step one instruction with display")
-(def-dbl ":next %p"   "\M-n" "Step one source line (skip functions)")
-(def-dbl ":next %p"   "\C-c\C-n" "Step one source line (skip functions)")
+(def-dbl ":step %p"  ("\M-s" "\C-c\C-s") "Step one source line with display")
+(def-dbl ":stepi %p" "\C-c\t" "Step one instruction with display")
+(def-dbl ":next %p"  ("\M-n" "\C-c\C-n") "Step one source line (skip functions)")
 (def-dbl ":r"   "\M-c" "Continue with display")
 
 (def-dbl ":finish" "\C-c\C-f" "Finish executing current function")
 (def-dbl ":up %p"     "\C-cu"   "Go up N stack frames (numeric arg) with display")
 (def-dbl ":down %p"   "\C-cd"   "Go down N stack frames (numeric arg) with display")
 
+(defvar dbl-last-frame nil)
+(defvar dbl-last-frame-displayed-p t)
+(defvar dbl-delete-prompt-marker nil)
+
 
 (defun dbl-mode ()
   "Major mode for interacting with an inferior Lisp or Maxima process.
@@ -227,7 +233,7 @@
 
 
 (defun dbl (p)
- 
+
  "Makes a dbl buffer, suitable for running an inferior
   gcl.  You are prompted for a name for the buffer.  After the shell
   starts you should start up your lisp program (eg gcl).  The bufferd
@@ -235,16 +241,13 @@
   debug loop with (si::dbl) or :dbl in a debug loop.  "
 
   (interactive "p")
-  
-  (let ( tem
-	(dir default-directory)
-	;; important for winnt version of emacs
+
+  (let (;; important for winnt version of emacs
 	(binary-process-input t)
 	(binary-process-output nil)
-	switches
 	(name (concat "dbl" (if (equal p 1) "" p) ""))
 	)
-    
+
     (switch-to-buffer (concat "*" name "*"))
     (or (bolp) (newline))
     (insert "Current directory is " default-directory "\n")
@@ -291,15 +294,6 @@
 ;; It records the filename and line number, and maybe displays that file.
 (defun dbl-filter (proc string)
   (let ((inhibit-quit t))
-    (set-buffer (process-buffer proc))
-    (goto-char (point-max))
-    (insert string)
-    (goto-char (point-max))
-    ))
-
-
-(defun dbl-filter (proc string)
-  (let ((inhibit-quit t))
     (if dbl-filter-accumulator
 	(dbl-filter-accumulate-marker proc
 				      (concat dbl-filter-accumulator string))
@@ -314,14 +308,13 @@
 	  (let ((end (string-match "\n" string)))
 	    (if end
               (progn
-		(setq me string)
 		(cond ((string-match
 			"\032\032\\([A-Za-z]?:?[^:]*\\):\\([0-9]*\\):[^\n]+\n"
 			string)
 		       (setq dbl-last-frame
 			      (cons
 			      (match-string 1 string)
-			      (string-to-int  (match-string 2 string))))
+			      (string-to-number (match-string 2 string))))
 		       
 		       (cond ((equal (cdr dbl-last-frame)  0)
 			      ;(message "got 0")
@@ -358,8 +351,7 @@
 (defun dbl-filter-insert (proc string)
   (let (moving
 	output-after-point 
-	(old-buffer (current-buffer))
-	start)
+	(old-buffer (current-buffer)))
     (set-buffer (process-buffer proc))
     ;; test to see if we will move the point.   We want that the
     ;; window-point of the buffer, should be equal to process-mark. 
@@ -370,7 +362,6 @@
 	(save-excursion
 	  ;; Insert the text, moving the process-marker.
 	  (goto-char (process-mark proc))
-	  (setq start (point))
 	  (insert string)
 	  (set-marker (process-mark proc) (point))
 	 ; (setq bill (cons (list 'hi (process-mark proc) (marker-position (process-mark proc)) (point)) bill))
@@ -488,19 +479,22 @@
   (interactive)
   (save-excursion
     (end-of-line)
-    (cond ((get-buffer-process (current-buffer))
-	   (cond
-	    ((save-excursion
-	       (beginning-of-line)
-		(get-text-property (point) 'file-line)))
-	    ((progn (end-of-line) (re-search-backward " \\([^: ]+\\):\\([0-9]+\\)" 300 nil))
-	     (setq file (buffer-substring (match-beginning 1) (match-end 1)))
-	     (setq line (buffer-substring (match-beginning 2) (match-end 2)))
-	     (setq line (read line))
-	     (and (integerp line)
-		  (setq file (search-path file 'dbl-dirs))
-		  (list file line)))))
-	  (t (list (buffer-file-name) (+ 1 (count-lines (point))))))))
+    (cond
+     ((get-buffer-process (current-buffer))
+      (cond
+       ((progn
+	  (beginning-of-line)
+	  (get-text-property (point) 'file-line)))
+       ((progn (end-of-line) (re-search-backward " \\([^: ]+\\):\\([0-9]+\\)" 300 nil))
+	(let ((file (buffer-substring (match-beginning 1) (match-end 1)))
+	      (line (buffer-substring (match-beginning 2) (match-end 2))))
+	  (setq line (read line))
+	  (and (integerp line)
+	       (setq file (search-path file 'dbl-dirs))
+	       (list file line))))))
+     (t (list (buffer-file-name)
+	      (+ 1 (if (featurep 'xemacs) (line-number)
+		     (line-number-at-pos))))))))
 
 (defun dbl-find-and-display-line ()
   (interactive)
@@ -554,8 +548,8 @@
   (goto-char (point-max))
   (setq dbl-delete-prompt-marker (point-marker))
   (dbl-set-buffer)
-  (send-string (get-buffer-process current-dbl-buffer)
-	       (concat command "\n"))))
+  (process-send-string (get-buffer-process current-dbl-buffer)
+		       (concat command "\n"))))
 
 (defun dbl-subtitute-% (command n)
   (let* (result
@@ -566,8 +560,8 @@
 	   (cond (in-dbl (setq file-line (dbl-find-line)))
 		 (t (setq file-line
 			  (list (buffer-file-name)
-				(+ 1 (count-lines
-							 (point)))))))))
+				(+ 1 (if (featurep 'xemacs) (line-number)
+				       (line-number-at-pos)))))))))
     (while (and command (string-match "\\([^%]*\\)%\\([adeflp]\\)" command))
       (let ((letter (string-to-char (substring command (match-beginning 2))))
 	    subst)
@@ -620,8 +614,8 @@
 	     (if (get-buffer-process (current-buffer))
 		 (setq current-dbl-buffer (current-buffer)))
 	     (message name)
-	     (send-string (get-buffer-process current-dbl-buffer)
-			  (concat name "\n"))
+	     (process-send-string (get-buffer-process current-dbl-buffer)
+				  (concat name "\n"))
 	     (other-window 1)
 	     )))
 	(t
@@ -632,20 +626,21 @@
 		       (1+ (count-lines 1 (point))))))
 	   (and    downcase-filenames-for-dbl
 		   (setq file-name (downcase file-name)))
-	   (send-string (get-buffer-process current-dbl-buffer)
-			(concat "break " file-name ":" line "\n"))))))
+	   (process-send-string (get-buffer-process current-dbl-buffer)
+				(concat "break " file-name ":" line "\n"))))))
 	
 	
 (defun dbl-read-address()
   "Return a string containing the core-address found in the buffer at point."
   (save-excursion
-   (let ((pt (dot)) found begin)
-     (setq found (if (search-backward "0x" (- pt 7) t)(dot)))
-     (cond (found (forward-char 2)(setq result
-			(buffer-substring found
-				 (progn (re-search-forward "[^0-9a-f]")
-					(forward-char -1)
-					(dot)))))
+   (let* ((pt (dot))
+	  (found (if (search-backward "0x" (- pt 7) t) (dot)))
+	  begin)
+     (cond (found (forward-char 2)
+		  (buffer-substring found
+				    (progn (re-search-forward "[^0-9a-f]")
+					   (forward-char -1)
+					   (dot))))
 	   (t (setq begin (progn (re-search-backward "[^0-9]") (forward-char 1)
 				 (dot)))
 	      (forward-char 1)
@@ -680,6 +675,6 @@
 	  (t (setq comm addr)))
     (switch-to-buffer current-dbl-buffer)
     (goto-char (dot-max))
-    (insert-string comm)))
+    (insert comm)))
 
 (provide 'dbl)
diff -dur gcl-2.6.8.ORIG/elisp/doc-to-texi.el gcl-2.6.8/elisp/doc-to-texi.el
--- gcl-2.6.8.ORIG/elisp/doc-to-texi.el	1999-12-06 15:43:59.000000000 -0700
+++ gcl-2.6.8/elisp/doc-to-texi.el	2008-12-29 21:15:15.000000000 -0700
@@ -51,7 +51,7 @@
 	   (let ((fun (get-match 1))
 		 (type (get-match 2))
 		 (package (get-match 3))
-		 args body)
+		 body)
 	     (goto-char (match-end 0))
 	     (setq body (buffer-substring (point) (- end 1)))
 	     (delete-region beg end )
@@ -78,22 +78,22 @@
 			  (?d .  "{Declaration}"))))))
       (if u (replace-match u)))))
 
-(setq b-alist '((?n . "number.texi")
-		(?s . "sequence.texi")
-		(?c . "character.texi")
-		(?l . "list.texi")
-		(?i . "io.texi")
-		(?a . "internal.texi")
-		(?f . "form.texi")
-		(?C . "compile.texi")
-		(?S . "symbol.texi")
-		(?t . "system.texi")
-		(?d . "structure.texi")
-		(?I . "iteration.texi")
-		(?u . "user-interface.texi")
-		(?d . "doc.texi")
-		(?b . "type.texi")
-		))
+(defvar b-alist '((?n . "number.texi")
+		  (?s . "sequence.texi")
+		  (?c . "character.texi")
+		  (?l . "list.texi")
+		  (?i . "io.texi")
+		  (?a . "internal.texi")
+		  (?f . "form.texi")
+		  (?C . "compile.texi")
+		  (?S . "symbol.texi")
+		  (?t . "system.texi")
+		  (?d . "structure.texi")
+		  (?I . "iteration.texi")
+		  (?u . "user-interface.texi")
+		  (?d . "doc.texi")
+		  (?b . "type.texi")
+		  ))
 (defun try1 ()
   (interactive)
   (while (re-search-forward "\n at def" nil t)
@@ -114,7 +114,7 @@
       
 
       
-(setq xall	  (mapcar 'cdr  b-alist))
+(defvar xall	  (mapcar 'cdr  b-alist))
 
 ;(let ((all xall)) (while all (set-buffer (car all))  (write-file (car all)) (setq all (cdr all))))
 ;(let ((all xall)) (while all   (find-file (car all)) (setq all (cdr all))))	
diff -dur gcl-2.6.8.ORIG/elisp/gcl.el gcl-2.6.8/elisp/gcl.el
--- gcl-2.6.8.ORIG/elisp/gcl.el	2004-06-25 16:40:23.000000000 -0600
+++ gcl-2.6.8/elisp/gcl.el	2008-12-29 21:15:15.000000000 -0700
@@ -14,6 +14,7 @@
 ;; M-p complete the current input by looking back through the buffer to see what was last typed
 ;;        using this prompt and this beginning.   Useful in shell, in lisp, in gdb,...
 
+(require 'inf-lisp)
 
 (setq lisp-mode-hook  'remote-lisp)
 
@@ -23,6 +24,9 @@
 ;(global-set-key "p" 'lisp-complete)
 (global-set-key "p" 'smart-complete)
 
+(defvar lisp-package nil)
+(defvar lisp-process nil)
+
 (defun remote-lisp (&rest l)
   (and (boundp 'lisp-mode-map)
        lisp-mode-map
@@ -158,12 +162,12 @@
 	))
     
 
-    (send-string this-lisp-process
-		 (concat ";;end of form" "\n" telnet-new-line))
+    (process-send-string this-lisp-process
+			 (concat ";;end of form" "\n" telnet-new-line))
     (cond (arg
 	   (if (numberp arg) (setq arg "compile"))
-	   (send-string this-lisp-process (concat "(" arg "'" fun ")"
-						  telnet-new-line))))
+	   (process-send-string this-lisp-process (concat "(" arg "'" fun ")"
+							  telnet-new-line))))
     (and time-to-throw-away
 	 (string-match "telnet"(buffer-name (process-buffer proc)))
 	 (dump-output proc time-to-throw-away))
@@ -194,7 +198,7 @@
 
 (defun my-send-region (proc beg end)
   (cond ((or (string-match "telnet" (process-name proc)))
-	 (send-region proc beg end))
+	 (process-send-region proc beg end))
 	(t
 	 (let ((package (get-buffer-package)))
 	   (save-excursion
@@ -213,7 +217,7 @@
 		 (write-region (point-min) (point-max) tmp-lisp-file nil nil)))
 	   (write-region beg end tmp-lisp-file t nil)
 	   (message "sending ..")
-	   (send-string
+	   (process-send-string
 	    proc
 	    (concat "(lisp::let ((*load-verbose* nil)) (#+sdebug si::nload #-sdebug load \""
 		    tmp-lisp-file
@@ -268,9 +272,9 @@
 		       (prog2 (other-window 1)
 			      (get-buffer-process (current-buffer))
 			      (other-window 1)))))
-	(send-string current-lisp-process "(macroexpand '")
-	(send-region current-lisp-process  beg (point) )
-	(send-string current-lisp-process ")\n")))))
+	(process-send-string current-lisp-process "(macroexpand '")
+	(process-send-region current-lisp-process  beg (point) )
+	(process-send-string current-lisp-process ")\n")))))
 
 (defun delete-comment-char (arg) 
   (while (and (> arg 0) (looking-at comment-start)) (delete-char 1) 
@@ -333,8 +337,8 @@
  (interactive "P") 
  (save-excursion 
    (let ((beg (dot)) 
-	 (ok t)(end (mark)))
-          (comment-region1 beg end arg))))
+	 (end (mark)))
+     (comment-region1 beg end arg))))
 
 (defun comment-region1 (beg end arg)
   (let ((ok t))
@@ -347,7 +351,7 @@
 	   (while ok 
 	     (cond (arg 
 		    (delete-comment-char arg)) 
-		   (t   (insert-string comment-start)))
+		   (t   (insert comment-start)))
 	     (if (< end (dot)) (setq ok nil)
 	       (if  (search-forward "\n" end t) nil (setq ok nil))) )
 	 (widen))))
@@ -363,13 +367,13 @@
 	     (current-lisp-process (or  proc lisp-process)))
 	(other-window 1)
 	(message "Tracing: %s" (buffer-substring (point) end))
-	(send-string current-lisp-process "(trace ")
-	(send-region current-lisp-process (point) end)
-	(send-string current-lisp-process ")\n")))))
+	(process-send-string current-lisp-process "(trace ")
+	(process-send-region current-lisp-process (point) end)
+	(process-send-string current-lisp-process ")\n")))))
 
 (defun gcl-mode ()
   (interactive)
   (lisp-mode)
   )
 
-(provide 'gcl)
\ No newline at end of file
+(provide 'gcl)
diff -dur gcl-2.6.8.ORIG/elisp/man1-to-texi.el gcl-2.6.8/elisp/man1-to-texi.el
--- gcl-2.6.8.ORIG/elisp/man1-to-texi.el	1999-12-06 15:43:59.000000000 -0700
+++ gcl-2.6.8/elisp/man1-to-texi.el	2008-12-29 21:15:15.000000000 -0700
@@ -106,6 +106,8 @@
 ;	End of indented unfilled display.
 ; 
 
+(require 'makeinfo)
+
 (defun do-replace (lis &optional not-in-string)
   (let (x case-fold-search)
     (while lis
@@ -285,15 +287,14 @@
     (while (< i (length vec)) (setq tot (+ (aref vec i) tot)) (setq i (+ i 1)))
     (setq surplus (/ (- 70 tot) (+ 1 (length (car items)))))
     (while items
-      (setq tem (car items))
-      (setq i 0)
-      (let (ans x)
+      (let ((tem (car items)))
+	(setq i 0)
 	(insert "")
-	(while tem
-	  (insert (tex-center (car tem) (+ (aref vec i) surplus) 'left
-			      (real-length (car tem))))
-	  (setq tem (cdr tem)) (setq i (+ i 1)))
-	(insert "\n"))
+	(dolist (elem tem)
+	  (insert (tex-center elem (+ (aref vec i) surplus) 'left
+			      (real-length elem)))
+	  (setq i (+ i 1))))
+      (insert "\n")
       (setq items (cdr items)))
     )
   )
@@ -330,22 +331,7 @@
 	(insert "@w{" ) (end-of-line) (insert "}")
 	    (forward-line 1) (beginning-of-line))))
 
-(defun add-keywords ()
-  (let ((tem tk-control-options)x lis l y)
-    (while tem
-      (setq l (car tem))
-      (setq tem (cdr tem))
-      (setq x (symbol-name (car l )))
-      (setq lis (car (cdr l)))
-      (while lis
-	(cond ((atom lis) (setq lis nil))
-	      (t (setq y (symbol-name (car lis)))
-		 (do-replace (list (list (concat x  " "y "")
-					 (concat x " :"y "")
-					 )))))
-	(setq lis (cdr lis))))))
-
-(setq tk-control-options
+(defvar tk-control-options
       '((after fixnum) 
 	(exit fixnum) 
 	(lower window) 
@@ -375,7 +361,22 @@
 	(update (idletasks)) 
 	))
 
-(setq tk-widget-options
+(defun add-keywords ()
+  (let ((tem tk-control-options)x lis l y)
+    (while tem
+      (setq l (car tem))
+      (setq tem (cdr tem))
+      (setq x (symbol-name (car l )))
+      (setq lis (car (cdr l)))
+      (while lis
+	(cond ((atom lis) (setq lis nil))
+	      (t (setq y (symbol-name (car lis)))
+		 (do-replace (list (list (concat x  " "y "")
+					 (concat x " :"y "")
+					 )))))
+	(setq lis (cdr lis))))))
+
+(defvar tk-widget-options
       '(
 	(button (activate configure deactivate flash invoke)) 
 	(listbox ( configure curselection delete get insert nearest
@@ -404,7 +405,7 @@
 	(toplevel ( configure)) 
 	))
 
-(setq manual-sections
+(defvar manual-sections
       '(after bind button canvas checkbutton destroy  entry exit focus foo frame grab label lbSingSel listbox lower menu menubar menubutton message option options pack-old pack place radiobutton raise scale scrollbar selection send text tk tkerror tkvars tkwait toplevel update winfo wm))
 
 ;(setq widgets (sort (mapcar 'car tk-widget-options) 'string-lessp))
diff -dur gcl-2.6.8.ORIG/elisp/smart-complete.el gcl-2.6.8/elisp/smart-complete.el
--- gcl-2.6.8.ORIG/elisp/smart-complete.el	2001-12-18 13:36:35.000000000 -0700
+++ gcl-2.6.8/elisp/smart-complete.el	2008-12-29 21:15:15.000000000 -0700
@@ -85,8 +85,7 @@
 	(pat (concat (regexp-for-this-prompt prompt)
 		     "\\(" (regexp-quote str) "\\)" ))
 	offered (not-yet t)
-	)
-    (setq bill pat)
+	at this)
     (while (and  not-yet
 		 (re-search-backward pat nil t))
       (goto-char (match-beginning 1))
diff -dur gcl-2.6.8.ORIG/elisp/sshell.el gcl-2.6.8/elisp/sshell.el
--- gcl-2.6.8.ORIG/elisp/sshell.el	2000-10-27 16:09:40.000000000 -0600
+++ gcl-2.6.8/elisp/sshell.el	2008-12-29 21:15:15.000000000 -0700
@@ -119,9 +119,9 @@
 	 (ff
 	  (save-excursion
 	    (skip-chars-backward "[a-z---_0-9$/A-Z~#.]")
-	    (buffer-substring (setq beg (point)) p))))
-    (setq dir (or (file-name-directory ff) default-directory))
-    (setq file (file-name-nondirectory ff))
+	    (buffer-substring (setq beg (point)) p)))
+	 (dir (or (file-name-directory ff) default-directory))
+	 (file (file-name-nondirectory ff)))
     (cond ((and (setq tem (file-name-completion (or file "") dir))
 		(not (equal tem file)))
 	   (cond ((eq tem t))
@@ -181,7 +181,7 @@
 
 (defun make-sshell (name program &optional startfile &rest switches)
   (let ((buffer (get-buffer-create (concat "*" name "*")))
-	proc status size)
+	proc status)
     (setq proc (get-buffer-process buffer))
     (if proc (setq status (process-status proc)))
     (save-excursion
@@ -376,4 +376,4 @@
 	       (point)))
 (require 'smart-complete)
 
-(provide 'sshell)
\ No newline at end of file
+(provide 'sshell)

gcl-2.6.8-extension.patch:

--- NEW FILE gcl-2.6.8-extension.patch ---
diff -dur gcl-2.6.8.ORIG/acconfig.h gcl-2.6.8/acconfig.h
--- gcl-2.6.8.ORIG/acconfig.h	2008-12-29 16:11:21.000000000 -0700
+++ gcl-2.6.8/acconfig.h	2008-12-29 16:17:50.000000000 -0700
@@ -1,3 +1,6 @@
+/* Whether compiling on a glibc-based system */
+#undef _GNU_SOURCE
+
 /* define where the heap could begin.   Normally should
 be the smallest value returned by sbrk().   Underestimating
 by 10-20 megabytes is not a problem. */
@@ -157,7 +160,6 @@
 
 #ifdef IN_NUM_CO
 #ifdef HAVE_ISNORMAL
-#define _GNU_SOURCE
 #include <math.h>
 #define ISNORMAL(a) isnormal(a)
 #else
@@ -178,7 +180,6 @@
 
 #ifdef NEED_ISFINITE
 #ifdef HAVE_ISFINITE
-#define _GNU_SOURCE
 #include <math.h>
 #define ISFINITE(a) isfinite(a)
 #else
diff -dur gcl-2.6.8.ORIG/configure gcl-2.6.8/configure
--- gcl-2.6.8.ORIG/configure	2008-12-29 16:11:21.000000000 -0700
+++ gcl-2.6.8/configure	2008-12-29 16:19:59.000000000 -0700
@@ -691,9 +691,9 @@
 GMPDIR
 GMP
 MAKEINFO
+AWK
 EGREP
 GREP
-AWK
 CPP
 OBJEXT
 EXEEXT
@@ -3524,6 +3524,7 @@
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
+
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -3761,187 +3762,6 @@
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
-
-
-# can only test for numbers -- CM
-# if test "${GCC}" -eq "yes" ; then
-#if [[ "${GCC}" = "yes" ]] ; then
-# Allog for environment variable overrides on compiler selection -- CM
-#GCC=$CC
-#else
-#GCC=""
-#fi
-# subst GCC not only under 386-linux, but where available -- CM
-
-if test "$GCC" = "yes" ; then
-   TCFLAGS="-Wall -DVOL=volatile -fsigned-char"
-else
-   TCFLAGS="-DVOL=volatile -fsigned-char"
-fi
-if test "$GCC" = "yes" ; then
-	TCFLAGS="$TCFLAGS -pipe"
-	case $use in
-	     *mingw*)
-	        echo "WARNING: Remove -fno-zero-initialized-in-bss from makedefs if gcc less than 3.3.1."
-	        echo "         It is ptherwise needed for the Unexec stuff to work."
-		TCFLAGS="$TCFLAGS -fno-zero-initialized-in-bss -mms-bitfields";;
-        esac
-fi
-#if test -f /proc/sys/kernel/exec-shield ; then
-#	exec_stat=`cat /proc/sys/kernel/exec-shield`
-#	if test "$exec_stat" != "0" ; then
-#		# CFLAGS here to hopefully cover the DBEGIN routine below
-#		CFLAGS="$CFLAGS -Wa,--execstack"
-#	fi
-#fi
-
-TO3FLAGS=""
-TO2FLAGS=""
-
-#TFPFLAG="-fomit-frame-pointer"
-# FIXME -- remove when mingw compiler issues are fixed
-case "$use" in
-  *mingw*)
-	TFPFLAG="";;
-   m68k*)#FIXME gcc 4.x bug workaround
-	TFPFLAG="";;
-  *)
-	TFPFLAG="-fomit-frame-pointer";;
-esac
-
-for ac_prog in gawk nawk awk
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_AWK+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$AWK"; then
-  ac_cv_prog_AWK="$AWK" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_AWK="$ac_prog"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-AWK=$ac_cv_prog_AWK
-if test -n "$AWK"; then
-  { $as_echo "$as_me:$LINENO: result: $AWK" >&5
-$as_echo "$AWK" >&6; }
-else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$AWK" && break
-done
-
-
-# Work around system/gprof mips/hppa hang
-case $use in
-  mips*) enable_gprof="no";;
-  hppa*) enable_gprof="no";;
-esac
-
-if test "$enable_gprof" = "yes" ; then
-        TCFLAGS="$TCFLAGS -pg";
-        TLIBS="$TLIBS -pg";
-	TFPFLAG=""
-	cat >>confdefs.h <<\_ACEOF
-#define GCL_GPROF 1
-_ACEOF
-
-	{ $as_echo "$as_me:$LINENO: checking for text start" >&5
-$as_echo_n "checking for text start... " >&6; }
-	echo 'int main () {return(0);}' >foo.c
-	$CC foo.c -o foo
-	GCL_GPROF_START=`nm foo | $AWK  '/  *T  *__*start$/ {print $NF}'`
-	rm -f foo.c foo
-	{ $as_echo "$as_me:$LINENO: result: $GCL_GPROF_START" >&5
-$as_echo "$GCL_GPROF_START" >&6; }
-	cat >>confdefs.h <<_ACEOF
-#define GCL_GPROF_START $GCL_GPROF_START
-_ACEOF
-
-	case "$use" in
-	  arm*)
-	#FIXME report and remove this when done
-		{ $as_echo "$as_me:$LINENO: result: Reducing optimization on profiling arm build to workaround gcc bug" >&5
-$as_echo "Reducing optimization on profiling arm build to workaround gcc bug" >&6; }
-		enable_debug=yes;;
-	esac
-fi
-
-if test "$enable_debug" = "yes" ; then
-	TCFLAGS="$TCFLAGS -g"
-	# for subconfigurations
-	CFLAGS="$CFLAGS -g"
-else
-# FIXME -- remove when mingw compiler issues are fixed
-	case "$use" in
-	  *mingw*)
-		TO3FLAGS="-O3 $TFPFLAG";;
-	  *)
-		TO3FLAGS="-O3 $TFPFLAG";;
-	esac
-#	TO3FLAGS="-O3 $TFPFLAG"
-	TO2FLAGS="-O"
-fi
-
-# gcc on ppc cannot compile our new_init.c with full opts --CM
-TONIFLAGS=""
-case $use in
-     *linux)
-	case $use in
-#		amd64*) # stack-boundary option does not work
-#			TCFLAGS="$TCFLAGS -m64 -mpreferred-stack-boundary=8";;
-		alpha*)
-			TCFLAGS="$TCFLAGS -mieee";;
-#		m68k*)
-#			TCFLAGS="$TCFLAGS -ffloat-store";;
-		hppa*)
-			TCFLAGS="$TCFLAGS -ffunction-sections"
-			if test "$enable_debug" != "yes" ; then TO3FLAGS="-O $TFPFLAG" ; fi
-			if test "$enable_debug" != "yes" ; then TO2FLAGS="-O" ; fi
-			;;
-		arm*)
-			TCFLAGS="$TCFLAGS -mlong-calls -fdollars-in-identifiers -g "
-			if test "$enable_debug" != "yes" ; then TO3FLAGS="-O2" ; fi
-			if test "$enable_debug" != "yes" ; then TO2FLAGS="-O" ; fi
-			;;
-		powerpc*)
-			if $CC -v 2>&1 | grep -q "gcc version 3.2" ; then
-			   echo Reducing optimization for buggy gcc-3.2
-			   if test "$enable_debug" != "yes" ; then TONIFLAGS="-O $TFPFLAG" ; fi
-			fi;
-			echo Probing for longcall
-			if ! $CC -v 2>&1 | $AWK '/^gcc version / {split($3,A,".");if (A[1]+0>3 || (A[1]+0>=3 && A[2]+0>=3)) exit 1;}'; then
-			   echo Enabling longcall on gcc 3.3 or later
-			   TCFLAGS="$TCFLAGS -mlongcall"
-			   echo Reducing optimization for buggy gcc 3.3 or later
-			   if test "$enable_debug" != "yes" ; then TONIFLAGS="-O $TFPFLAG" ; fi
-			fi;;
-	esac;;
-esac
-if test "$enable_pic" = "yes" ; then
-	TCFLAGS="$TCFLAGS -fPIC"
-fi
-
 { $as_echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
 $as_echo_n "checking for grep that handles long lines and -e... " >&6; }
 if test "${ac_cv_path_GREP+set}" = set; then
@@ -4076,85 +3896,6 @@
  EGREP="$ac_cv_path_EGREP"
 
 
-for ac_prog in makeinfo
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_MAKEINFO+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$MAKEINFO"; then
-  ac_cv_prog_MAKEINFO="$MAKEINFO" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_MAKEINFO="$ac_prog"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-MAKEINFO=$ac_cv_prog_MAKEINFO
-if test -n "$MAKEINFO"; then
-  { $as_echo "$as_me:$LINENO: result: $MAKEINFO" >&5
-$as_echo "$MAKEINFO" >&6; }
-else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$MAKEINFO" && break
-done
-test -n "$MAKEINFO" || MAKEINFO=""false""
-
-
-
-# Step 1: set the variable "system" to hold the name and version number
-# for the system.  This can usually be done via the "uname" command, but
-# there are a few systems, like Next, where this doesn't work.
-
-{ $as_echo "$as_me:$LINENO: checking system version (for dynamic loading)" >&5
-$as_echo_n "checking system version (for dynamic loading)... " >&6; }
-if machine=`uname -m` ; then true; else machine=unknown ; fi
-
-if test -f /usr/lib/NextStep/software_version; then
-    system=NEXTSTEP-`${AWK} '/3/,/3/' /usr/lib/NextStep/software_version`
-else
-    system=`uname -s`-`uname -r`
-    if test "$?" -ne 0 ; then
-	{ $as_echo "$as_me:$LINENO: result: unknown (can't find uname command)" >&5
-$as_echo "unknown (can't find uname command)" >&6; }
-	system=unknown
-    else
-	# Special check for weird MP-RAS system (uname returns weird
-	# results, and the version is kept in special file).
-
-	if test -r /etc/.relid -a "X`uname -n`" = "X`uname -s`" ; then
-	    system="MP-RAS-`${AWK} '{print $3}' '/etc/.relid'`"
-	fi
-	if test "`uname -s`" = "AIX" ; then
-	    system=AIX-`uname -v`.`uname -r`
-	fi
-	{ $as_echo "$as_me:$LINENO: result: $system" >&5
-$as_echo "$system" >&6; }
-    fi
-fi
-
-if test "$use" = "powerpc-macosx" ; then
-
-
 { $as_echo "$as_me:$LINENO: checking for ANSI C header files" >&5
 $as_echo_n "checking for ANSI C header files... " >&6; }
 if test "${ac_cv_header_stdc+set}" = set; then
@@ -4406,7 +4147,1483 @@
 done
 
 
-if test "${ac_cv_header_malloc_malloc_h+set}" = set; then
+
+  if test "${ac_cv_header_minix_config_h+set}" = set; then
+  { $as_echo "$as_me:$LINENO: checking for minix/config.h" >&5
+$as_echo_n "checking for minix/config.h... " >&6; }
+if test "${ac_cv_header_minix_config_h+set}" = set; then
+  $as_echo_n "(cached) " >&6
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_minix_config_h" >&5
+$as_echo "$ac_cv_header_minix_config_h" >&6; }
+else
+  # Is the header compilable?
+{ $as_echo "$as_me:$LINENO: checking minix/config.h usability" >&5
+$as_echo_n "checking minix/config.h usability... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+#include <minix/config.h>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_header_compiler=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_header_compiler=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
+
+# Is the header present?
+{ $as_echo "$as_me:$LINENO: checking minix/config.h presence" >&5
+$as_echo_n "checking minix/config.h presence... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <minix/config.h>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
+  ac_header_preproc=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  ac_header_preproc=no
+fi
+
+rm -f conftest.err conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
+
+# So?  What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+  yes:no: )
+    { $as_echo "$as_me:$LINENO: WARNING: minix/config.h: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: minix/config.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: minix/config.h: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: minix/config.h: proceeding with the compiler's result" >&2;}
+    ac_header_preproc=yes
+    ;;
+  no:yes:* )
+    { $as_echo "$as_me:$LINENO: WARNING: minix/config.h: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: minix/config.h: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: minix/config.h:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: minix/config.h:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: minix/config.h: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: minix/config.h: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: minix/config.h:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: minix/config.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: minix/config.h: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: minix/config.h: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: minix/config.h: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: minix/config.h: in the future, the compiler will take precedence" >&2;}
+
+    ;;
+esac
+{ $as_echo "$as_me:$LINENO: checking for minix/config.h" >&5
+$as_echo_n "checking for minix/config.h... " >&6; }
+if test "${ac_cv_header_minix_config_h+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  ac_cv_header_minix_config_h=$ac_header_preproc
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_minix_config_h" >&5
+$as_echo "$ac_cv_header_minix_config_h" >&6; }
+
+fi
+if test "x$ac_cv_header_minix_config_h" = x""yes; then
+  MINIX=yes
+else
+  MINIX=
+fi
+
+
+  if test "$MINIX" = yes; then
+
+cat >>confdefs.h <<\_ACEOF
+#define _POSIX_SOURCE 1
+_ACEOF
+
+
+cat >>confdefs.h <<\_ACEOF
+#define _POSIX_1_SOURCE 2
+_ACEOF
+
+
+cat >>confdefs.h <<\_ACEOF
+#define _MINIX 1
+_ACEOF
+
+  fi
+
+
+
+  { $as_echo "$as_me:$LINENO: checking whether it is safe to define __EXTENSIONS__" >&5
+$as_echo_n "checking whether it is safe to define __EXTENSIONS__... " >&6; }
+if test "${ac_cv_safe_to_define___extensions__+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+#	  define __EXTENSIONS__ 1
+	  $ac_includes_default
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_cv_safe_to_define___extensions__=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_safe_to_define___extensions__=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_safe_to_define___extensions__" >&5
+$as_echo "$ac_cv_safe_to_define___extensions__" >&6; }
+  test $ac_cv_safe_to_define___extensions__ = yes &&
+    cat >>confdefs.h <<\_ACEOF
+#define __EXTENSIONS__ 1
+_ACEOF
+
+  cat >>confdefs.h <<\_ACEOF
+#define _ALL_SOURCE 1
+_ACEOF
+
+  cat >>confdefs.h <<\_ACEOF
+#define _GNU_SOURCE 1
+_ACEOF
+
+  cat >>confdefs.h <<\_ACEOF
+#define _POSIX_PTHREAD_SEMANTICS 1
+_ACEOF
+
+  cat >>confdefs.h <<\_ACEOF
+#define _TANDEM_SOURCE 1
+_ACEOF
+
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
+set dummy ${ac_tool_prefix}gcc; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_CC+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_CC="${ac_tool_prefix}gcc"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+  { $as_echo "$as_me:$LINENO: result: $CC" >&5
+$as_echo "$CC" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_CC"; then
+  ac_ct_CC=$CC
+  # Extract the first word of "gcc", so it can be a program name with args.
+set dummy gcc; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_CC"; then
+  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_ac_ct_CC="gcc"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_CC=$ac_cv_prog_ac_ct_CC
+if test -n "$ac_ct_CC"; then
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+$as_echo "$ac_ct_CC" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_CC" = x; then
+    CC=""
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    CC=$ac_ct_CC
+  fi
+else
+  CC="$ac_cv_prog_CC"
+fi
+
+if test -z "$CC"; then
+          if test -n "$ac_tool_prefix"; then
+    # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
+set dummy ${ac_tool_prefix}cc; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_CC+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_CC="${ac_tool_prefix}cc"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+  { $as_echo "$as_me:$LINENO: result: $CC" >&5
+$as_echo "$CC" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  fi
+fi
+if test -z "$CC"; then
+  # Extract the first word of "cc", so it can be a program name with args.
+set dummy cc; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_CC+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+  ac_prog_rejected=no
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
+       ac_prog_rejected=yes
+       continue
+     fi
+    ac_cv_prog_CC="cc"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+if test $ac_prog_rejected = yes; then
+  # We found a bogon in the path, so make sure we never use it.
+  set dummy $ac_cv_prog_CC
+  shift
+  if test $# != 0; then
+    # We chose a different compiler from the bogus one.
+    # However, it has the same basename, so the bogon will be chosen
+    # first if we set CC to just the basename; use the full file name.
+    shift
+    ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
+  fi
+fi
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+  { $as_echo "$as_me:$LINENO: result: $CC" >&5
+$as_echo "$CC" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$CC"; then
+  if test -n "$ac_tool_prefix"; then
+  for ac_prog in cl.exe
+  do
+    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_CC+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+  { $as_echo "$as_me:$LINENO: result: $CC" >&5
+$as_echo "$CC" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+    test -n "$CC" && break
+  done
+fi
+if test -z "$CC"; then
+  ac_ct_CC=$CC
+  for ac_prog in cl.exe
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_CC"; then
+  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_ac_ct_CC="$ac_prog"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_CC=$ac_cv_prog_ac_ct_CC
+if test -n "$ac_ct_CC"; then
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+$as_echo "$ac_ct_CC" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  test -n "$ac_ct_CC" && break
+done
+
+  if test "x$ac_ct_CC" = x; then
+    CC=""
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    CC=$ac_ct_CC
+  fi
+fi
+
+fi
+
+
+test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
+See \`config.log' for more details." >&5
+$as_echo "$as_me: error: no acceptable C compiler found in \$PATH
+See \`config.log' for more details." >&2;}
+   { (exit 1); exit 1; }; }; }
+
+# Provide some information about the compiler.
+$as_echo "$as_me:$LINENO: checking for C compiler version" >&5
+set X $ac_compile
+ac_compiler=$2
+{ (ac_try="$ac_compiler --version >&5"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compiler --version >&5") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }
+{ (ac_try="$ac_compiler -v >&5"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compiler -v >&5") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }
+{ (ac_try="$ac_compiler -V >&5"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compiler -V >&5") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }
+
+{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
+$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
+if test "${ac_cv_c_compiler_gnu+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+int
+main ()
+{
+#ifndef __GNUC__
+       choke me
+#endif
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_compiler_gnu=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_compiler_gnu=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ac_cv_c_compiler_gnu=$ac_compiler_gnu
+
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
+$as_echo "$ac_cv_c_compiler_gnu" >&6; }
+if test $ac_compiler_gnu = yes; then
+  GCC=yes
+else
+  GCC=
+fi
+ac_test_CFLAGS=${CFLAGS+set}
+ac_save_CFLAGS=$CFLAGS
+{ $as_echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
+$as_echo_n "checking whether $CC accepts -g... " >&6; }
+if test "${ac_cv_prog_cc_g+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  ac_save_c_werror_flag=$ac_c_werror_flag
+   ac_c_werror_flag=yes
+   ac_cv_prog_cc_g=no
+   CFLAGS="-g"
+   cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_cv_prog_cc_g=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	CFLAGS=""
+      cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  :
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_c_werror_flag=$ac_save_c_werror_flag
+	 CFLAGS="-g"
+	 cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_cv_prog_cc_g=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+   ac_c_werror_flag=$ac_save_c_werror_flag
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
+$as_echo "$ac_cv_prog_cc_g" >&6; }
+if test "$ac_test_CFLAGS" = set; then
+  CFLAGS=$ac_save_CFLAGS
+elif test $ac_cv_prog_cc_g = yes; then
+  if test "$GCC" = yes; then
+    CFLAGS="-g -O2"
+  else
+    CFLAGS="-g"
+  fi
+else
+  if test "$GCC" = yes; then
+    CFLAGS="-O2"
+  else
+    CFLAGS=
+  fi
+fi
+{ $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
+$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
+if test "${ac_cv_prog_cc_c89+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  ac_cv_prog_cc_c89=no
+ac_save_CC=$CC
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <stdarg.h>
+#include <stdio.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+/* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
+struct buf { int x; };
+FILE * (*rcsopen) (struct buf *, struct stat *, int);
+static char *e (p, i)
+     char **p;
+     int i;
+{
+  return p[i];
+}
+static char *f (char * (*g) (char **, int), char **p, ...)
+{
+  char *s;
+  va_list v;
+  va_start (v,p);
+  s = g (p, va_arg (v,int));
+  va_end (v);
+  return s;
+}
+
+/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
+   function prototypes and stuff, but not '\xHH' hex character constants.
+   These don't provoke an error unfortunately, instead are silently treated
+   as 'x'.  The following induces an error, until -std is added to get
+   proper ANSI mode.  Curiously '\x00'!='x' always comes out true, for an
+   array size at least.  It's necessary to write '\x00'==0 to get something
+   that's true only with -std.  */
+int osf4_cc_array ['\x00' == 0 ? 1 : -1];
+
+/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
+   inside strings and character constants.  */
+#define FOO(x) 'x'
+int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
+
+int test (int i, double x);
+struct s1 {int (*f) (int a);};
+struct s2 {int (*f) (double a);};
+int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
+int argc;
+char **argv;
+int
+main ()
+{
+return f (e, argv, 0) != argv[0]  ||  f (e, argv, 1) != argv[1];
+  ;
+  return 0;
+}
+_ACEOF
+for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
+	-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
+do
+  CC="$ac_save_CC $ac_arg"
+  rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_cv_prog_cc_c89=$ac_arg
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
+fi
+
+rm -f core conftest.err conftest.$ac_objext
+  test "x$ac_cv_prog_cc_c89" != "xno" && break
+done
+rm -f conftest.$ac_ext
+CC=$ac_save_CC
+
+fi
+# AC_CACHE_VAL
+case "x$ac_cv_prog_cc_c89" in
+  x)
+    { $as_echo "$as_me:$LINENO: result: none needed" >&5
+$as_echo "none needed" >&6; } ;;
+  xno)
+    { $as_echo "$as_me:$LINENO: result: unsupported" >&5
+$as_echo "unsupported" >&6; } ;;
+  *)
+    CC="$CC $ac_cv_prog_cc_c89"
+    { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
+$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
+esac
+
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+{ $as_echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
+$as_echo_n "checking how to run the C preprocessor... " >&6; }
+# On Suns, sometimes $CPP names a directory.
+if test -n "$CPP" && test -d "$CPP"; then
+  CPP=
+fi
+if test -z "$CPP"; then
+  if test "${ac_cv_prog_CPP+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+      # Double quotes because CPP needs to be expanded
+    for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
+    do
+      ac_preproc_ok=false
+for ac_c_preproc_warn_flag in '' yes
+do
+  # Use a header file that comes with gcc, so configuring glibc
+  # with a fresh cross-compiler works.
+  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+  # <limits.h> exists even on freestanding compilers.
+  # On the NeXT, cc -E runs the code through the compiler's parser,
+  # not just through cpp. "Syntax error" is here to catch this case.
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+		     Syntax error
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
+  :
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  # Broken: fails on valid input.
+continue
+fi
+
+rm -f conftest.err conftest.$ac_ext
+
+  # OK, works on sane cases.  Now check whether nonexistent headers
+  # can be detected and how.
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <ac_nonexistent.h>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
+  # Broken: success on invalid input.
+continue
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  # Passes both tests.
+ac_preproc_ok=:
+break
+fi
+
+rm -f conftest.err conftest.$ac_ext
+
+done
+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+rm -f conftest.err conftest.$ac_ext
+if $ac_preproc_ok; then
+  break
+fi
+
+    done
+    ac_cv_prog_CPP=$CPP
+
+fi
+  CPP=$ac_cv_prog_CPP
+else
+  ac_cv_prog_CPP=$CPP
+fi
+{ $as_echo "$as_me:$LINENO: result: $CPP" >&5
+$as_echo "$CPP" >&6; }
+ac_preproc_ok=false
+for ac_c_preproc_warn_flag in '' yes
+do
+  # Use a header file that comes with gcc, so configuring glibc
+  # with a fresh cross-compiler works.
+  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+  # <limits.h> exists even on freestanding compilers.
+  # On the NeXT, cc -E runs the code through the compiler's parser,
+  # not just through cpp. "Syntax error" is here to catch this case.
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+		     Syntax error
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
+  :
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  # Broken: fails on valid input.
+continue
+fi
+
+rm -f conftest.err conftest.$ac_ext
+
+  # OK, works on sane cases.  Now check whether nonexistent headers
+  # can be detected and how.
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <ac_nonexistent.h>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
+  # Broken: success on invalid input.
+continue
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  # Passes both tests.
+ac_preproc_ok=:
+break
+fi
+
+rm -f conftest.err conftest.$ac_ext
+
+done
+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+rm -f conftest.err conftest.$ac_ext
+if $ac_preproc_ok; then
+  :
+else
+  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
+See \`config.log' for more details." >&5
+$as_echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
+See \`config.log' for more details." >&2;}
+   { (exit 1); exit 1; }; }; }
+fi
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+
+
+# can only test for numbers -- CM
+# if test "${GCC}" -eq "yes" ; then
+#if [[ "${GCC}" = "yes" ]] ; then
+# Allog for environment variable overrides on compiler selection -- CM
+#GCC=$CC
+#else
+#GCC=""
+#fi
+# subst GCC not only under 386-linux, but where available -- CM
+
+if test "$GCC" = "yes" ; then
+   TCFLAGS="-Wall -DVOL=volatile -fsigned-char"
+else
+   TCFLAGS="-DVOL=volatile -fsigned-char"
+fi
+if test "$GCC" = "yes" ; then
+	TCFLAGS="$TCFLAGS -pipe"
+	case $use in
+	     *mingw*)
+	        echo "WARNING: Remove -fno-zero-initialized-in-bss from makedefs if gcc less than 3.3.1."
+	        echo "         It is ptherwise needed for the Unexec stuff to work."
+		TCFLAGS="$TCFLAGS -fno-zero-initialized-in-bss -mms-bitfields";;
+        esac
+fi
+#if test -f /proc/sys/kernel/exec-shield ; then
+#	exec_stat=`cat /proc/sys/kernel/exec-shield`
+#	if test "$exec_stat" != "0" ; then
+#		# CFLAGS here to hopefully cover the DBEGIN routine below
+#		CFLAGS="$CFLAGS -Wa,--execstack"
+#	fi
+#fi
+
+TO3FLAGS=""
+TO2FLAGS=""
+
+#TFPFLAG="-fomit-frame-pointer"
+# FIXME -- remove when mingw compiler issues are fixed
+case "$use" in
+  *mingw*)
+	TFPFLAG="";;
+   m68k*)#FIXME gcc 4.x bug workaround
+	TFPFLAG="";;
+  *)
+	TFPFLAG="-fomit-frame-pointer";;
+esac
+
+for ac_prog in gawk nawk awk
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_AWK+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$AWK"; then
+  ac_cv_prog_AWK="$AWK" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_AWK="$ac_prog"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+AWK=$ac_cv_prog_AWK
+if test -n "$AWK"; then
+  { $as_echo "$as_me:$LINENO: result: $AWK" >&5
+$as_echo "$AWK" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  test -n "$AWK" && break
+done
+
+
+# Work around system/gprof mips/hppa hang
+case $use in
+  mips*) enable_gprof="no";;
+  hppa*) enable_gprof="no";;
+esac
+
+if test "$enable_gprof" = "yes" ; then
+        TCFLAGS="$TCFLAGS -pg";
+        TLIBS="$TLIBS -pg";
+	TFPFLAG=""
+	cat >>confdefs.h <<\_ACEOF
+#define GCL_GPROF 1
+_ACEOF
+
+	{ $as_echo "$as_me:$LINENO: checking for text start" >&5
+$as_echo_n "checking for text start... " >&6; }
+	echo 'int main () {return(0);}' >foo.c
+	$CC foo.c -o foo
+	GCL_GPROF_START=`nm foo | $AWK  '/  *T  *__*start$/ {print $NF}'`
+	rm -f foo.c foo
+	{ $as_echo "$as_me:$LINENO: result: $GCL_GPROF_START" >&5
+$as_echo "$GCL_GPROF_START" >&6; }
+	cat >>confdefs.h <<_ACEOF
+#define GCL_GPROF_START $GCL_GPROF_START
+_ACEOF
+
+	case "$use" in
+	  arm*)
+	#FIXME report and remove this when done
+		{ $as_echo "$as_me:$LINENO: result: Reducing optimization on profiling arm build to workaround gcc bug" >&5
+$as_echo "Reducing optimization on profiling arm build to workaround gcc bug" >&6; }
+		enable_debug=yes;;
+	esac
+fi
+
+if test "$enable_debug" = "yes" ; then
+	TCFLAGS="$TCFLAGS -g"
+	# for subconfigurations
+	CFLAGS="$CFLAGS -g"
+else
+# FIXME -- remove when mingw compiler issues are fixed
+	case "$use" in
+	  *mingw*)
+		TO3FLAGS="-O3 $TFPFLAG";;
+	  *)
+		TO3FLAGS="-O3 $TFPFLAG";;
+	esac
+#	TO3FLAGS="-O3 $TFPFLAG"
+	TO2FLAGS="-O"
+fi
+
+# gcc on ppc cannot compile our new_init.c with full opts --CM
+TONIFLAGS=""
+case $use in
+     *linux)
+	case $use in
+#		amd64*) # stack-boundary option does not work
+#			TCFLAGS="$TCFLAGS -m64 -mpreferred-stack-boundary=8";;
+		alpha*)
+			TCFLAGS="$TCFLAGS -mieee";;
+#		m68k*)
+#			TCFLAGS="$TCFLAGS -ffloat-store";;
+		hppa*)
+			TCFLAGS="$TCFLAGS -ffunction-sections"
+			if test "$enable_debug" != "yes" ; then TO3FLAGS="-O $TFPFLAG" ; fi
+			if test "$enable_debug" != "yes" ; then TO2FLAGS="-O" ; fi
+			;;
+		arm*)
+			TCFLAGS="$TCFLAGS -mlong-calls -fdollars-in-identifiers -g "
+			if test "$enable_debug" != "yes" ; then TO3FLAGS="-O2" ; fi
+			if test "$enable_debug" != "yes" ; then TO2FLAGS="-O" ; fi
+			;;
+		powerpc*)
+			if $CC -v 2>&1 | grep -q "gcc version 3.2" ; then
+			   echo Reducing optimization for buggy gcc-3.2
+			   if test "$enable_debug" != "yes" ; then TONIFLAGS="-O $TFPFLAG" ; fi
+			fi;
+			echo Probing for longcall
+			if ! $CC -v 2>&1 | $AWK '/^gcc version / {split($3,A,".");if (A[1]+0>3 || (A[1]+0>=3 && A[2]+0>=3)) exit 1;}'; then
+			   echo Enabling longcall on gcc 3.3 or later
+			   TCFLAGS="$TCFLAGS -mlongcall"
+			   echo Reducing optimization for buggy gcc 3.3 or later
+			   if test "$enable_debug" != "yes" ; then TONIFLAGS="-O $TFPFLAG" ; fi
+			fi;;
+	esac;;
+esac
+if test "$enable_pic" = "yes" ; then
+	TCFLAGS="$TCFLAGS -fPIC"
+fi
+
+{ $as_echo "$as_me:$LINENO: checking for egrep" >&5
+$as_echo_n "checking for egrep... " >&6; }
+if test "${ac_cv_path_EGREP+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
+   then ac_cv_path_EGREP="$GREP -E"
+   else
+     if test -z "$EGREP"; then
+  ac_path_EGREP_found=false
+  # Loop through the user's path and test for each of PROGNAME-LIST
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_prog in egrep; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
+      { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
+# Check for GNU ac_path_EGREP and select it if it is found.
+  # Check for GNU $ac_path_EGREP
+case `"$ac_path_EGREP" --version 2>&1` in
+*GNU*)
+  ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
+*)
+  ac_count=0
+  $as_echo_n 0123456789 >"conftest.in"
+  while :
+  do
+    cat "conftest.in" "conftest.in" >"conftest.tmp"
+    mv "conftest.tmp" "conftest.in"
+    cp "conftest.in" "conftest.nl"
+    $as_echo 'EGREP' >> "conftest.nl"
+    "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
+    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+    ac_count=`expr $ac_count + 1`
+    if test $ac_count -gt ${ac_path_EGREP_max-0}; then
+      # Best one so far, save it but keep looking for a better one
+      ac_cv_path_EGREP="$ac_path_EGREP"
+      ac_path_EGREP_max=$ac_count
+    fi
+    # 10*(2^10) chars as input seems more than enough
+    test $ac_count -gt 10 && break
+  done
+  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+esac
+
+      $ac_path_EGREP_found && break 3
+    done
+  done
+done
+IFS=$as_save_IFS
+  if test -z "$ac_cv_path_EGREP"; then
+    { { $as_echo "$as_me:$LINENO: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
+$as_echo "$as_me: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
+   { (exit 1); exit 1; }; }
+  fi
+else
+  ac_cv_path_EGREP=$EGREP
+fi
+
+   fi
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
+$as_echo "$ac_cv_path_EGREP" >&6; }
+ EGREP="$ac_cv_path_EGREP"
+
+
+for ac_prog in makeinfo
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_MAKEINFO+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$MAKEINFO"; then
+  ac_cv_prog_MAKEINFO="$MAKEINFO" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_MAKEINFO="$ac_prog"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+MAKEINFO=$ac_cv_prog_MAKEINFO
+if test -n "$MAKEINFO"; then
+  { $as_echo "$as_me:$LINENO: result: $MAKEINFO" >&5
+$as_echo "$MAKEINFO" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  test -n "$MAKEINFO" && break
+done
+test -n "$MAKEINFO" || MAKEINFO=""false""
+
+
+
+# Step 1: set the variable "system" to hold the name and version number
+# for the system.  This can usually be done via the "uname" command, but
+# there are a few systems, like Next, where this doesn't work.
+
+{ $as_echo "$as_me:$LINENO: checking system version (for dynamic loading)" >&5
+$as_echo_n "checking system version (for dynamic loading)... " >&6; }
+if machine=`uname -m` ; then true; else machine=unknown ; fi
+
+if test -f /usr/lib/NextStep/software_version; then
+    system=NEXTSTEP-`${AWK} '/3/,/3/' /usr/lib/NextStep/software_version`
+else
+    system=`uname -s`-`uname -r`
+    if test "$?" -ne 0 ; then
+	{ $as_echo "$as_me:$LINENO: result: unknown (can't find uname command)" >&5
+$as_echo "unknown (can't find uname command)" >&6; }
+	system=unknown
+    else
+	# Special check for weird MP-RAS system (uname returns weird
+	# results, and the version is kept in special file).
+
+	if test -r /etc/.relid -a "X`uname -n`" = "X`uname -s`" ; then
+	    system="MP-RAS-`${AWK} '{print $3}' '/etc/.relid'`"
+	fi
+	if test "`uname -s`" = "AIX" ; then
+	    system=AIX-`uname -v`.`uname -r`
+	fi
+	{ $as_echo "$as_me:$LINENO: result: $system" >&5
+$as_echo "$system" >&6; }
+    fi
+fi
+
+if test "$use" = "powerpc-macosx" ; then
+   if test "${ac_cv_header_malloc_malloc_h+set}" = set; then
   { $as_echo "$as_me:$LINENO: checking for malloc/malloc.h" >&5
 $as_echo_n "checking for malloc/malloc.h... " >&6; }
 if test "${ac_cv_header_malloc_malloc_h+set}" = set; then
@@ -11349,7 +12566,6 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-		#define _GNU_SOURCE
 		#include <math.h>
 
 int
@@ -11488,7 +12704,6 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-		#define _GNU_SOURCE
 		#include <math.h>
 
 int
diff -dur gcl-2.6.8.ORIG/configure.in gcl-2.6.8/configure.in
--- gcl-2.6.8.ORIG/configure.in	2008-12-29 16:11:21.000000000 -0700
+++ gcl-2.6.8/configure.in	2008-12-29 16:19:46.000000000 -0700
@@ -442,6 +442,7 @@
 	LDFLAGS=" "
 fi
 
+AC_USE_SYSTEM_EXTENSIONS
 AC_PROG_CC
 AC_PROG_CPP
 AC_SUBST(CC)
@@ -1339,7 +1340,6 @@
 #
 AC_MSG_CHECKING([for isnormal])
 AC_RUN_IFELSE([AC_LANG_PROGRAM([[
-		#define _GNU_SOURCE
 		#include <math.h>
 		]],[[
 		float f;
@@ -1367,7 +1367,6 @@
 
 AC_MSG_CHECKING([for isfinite])
 AC_RUN_IFELSE([AC_LANG_PROGRAM([[
-		#define _GNU_SOURCE
 		#include <math.h>
 		]],[[
 		float f;
diff -dur gcl-2.6.8.ORIG/h/gclincl.h.in gcl-2.6.8/h/gclincl.h.in
--- gcl-2.6.8.ORIG/h/gclincl.h.in	2008-12-29 16:11:21.000000000 -0700
+++ gcl-2.6.8/h/gclincl.h.in	2008-12-29 16:19:33.000000000 -0700
@@ -1,4 +1,7 @@
 /* h/gclincl.h.in.  Generated from configure.in by autoheader.  */
+/* Whether compiling on a glibc-based system */
+#undef _GNU_SOURCE
+
 /* define where the heap could begin.   Normally should
 be the smallest value returned by sbrk().   Underestimating
 by 10-20 megabytes is not a problem. */
@@ -158,7 +161,6 @@
 
 #ifdef IN_NUM_CO
 #ifdef HAVE_ISNORMAL
-#define _GNU_SOURCE
 #include <math.h>
 #define ISNORMAL(a) isnormal(a)
 #else
@@ -179,7 +181,6 @@
 
 #ifdef NEED_ISFINITE
 #ifdef HAVE_ISFINITE
-#define _GNU_SOURCE
 #include <math.h>
 #define ISFINITE(a) isfinite(a)
 #else
@@ -368,5 +369,37 @@
 /* Define to 1 if you have the ANSI C header files. */
 #undef STDC_HEADERS
 
+/* Enable extensions on AIX 3, Interix.  */
+#ifndef _ALL_SOURCE
+# undef _ALL_SOURCE
+#endif
+/* Enable GNU extensions on systems that have them.  */
+#ifndef _GNU_SOURCE
+# undef _GNU_SOURCE
+#endif
+/* Enable threading extensions on Solaris.  */
+#ifndef _POSIX_PTHREAD_SEMANTICS
+# undef _POSIX_PTHREAD_SEMANTICS
+#endif
+/* Enable extensions on HP NonStop.  */
+#ifndef _TANDEM_SOURCE
+# undef _TANDEM_SOURCE
+#endif
+/* Enable general extensions on Solaris.  */
+#ifndef __EXTENSIONS__
+# undef __EXTENSIONS__
+#endif
+
+
 /* Define to 1 if the X Window System is missing or not being used. */
 #undef X_DISPLAY_MISSING
+
+/* Define to 1 if on MINIX. */
+#undef _MINIX
+
+/* Define to 2 if the system does not provide POSIX.1 features except with
+   this defined. */
+#undef _POSIX_1_SOURCE
+
+/* Define to 1 if you need to in order for `stat' and other things to work. */
+#undef _POSIX_SOURCE

gcl-2.6.8-fd-leak.patch:

--- NEW FILE gcl-2.6.8-fd-leak.patch ---
diff -dur gcl-2.6.8.ORIG/o/run_process.c gcl-2.6.8/o/run_process.c
--- gcl-2.6.8.ORIG/o/run_process.c	2006-09-15 11:45:18.000000000 -0600
+++ gcl-2.6.8/o/run_process.c	2008-12-29 17:22:10.000000000 -0700
@@ -526,10 +526,10 @@
   fdout = ostream->sm.sm_int0;
   if (fork() == 0)
     { /* the child --- replace standard in and out with descriptors given */
-      close(0);
-      dup(fdin);
-      close(1);
-      dup(fdout);
+      dup2(fdin, 0);
+      dup2(fdout, 1);
+      close(fdin);
+      close(fdout);
       fprintf(stderr, "\n***** Spawning process %s ", pname);
       if (execvp(pname, argv) == -1)
 	{

gcl-2.6.8-getcwd.patch:

--- NEW FILE gcl-2.6.8-getcwd.patch ---
diff -dur gcl-2.6.8.ORIG/o/unixfsys.c gcl-2.6.8/o/unixfsys.c
--- gcl-2.6.8.ORIG/o/unixfsys.c	2008-12-29 17:34:57.000000000 -0700
+++ gcl-2.6.8/o/unixfsys.c	2008-12-29 17:39:10.000000000 -0700
@@ -149,18 +149,6 @@
 #define MAXPATHLEN 512
 #endif
 
-
-#ifdef HAVE_GETCWD
-char *
-getwd(char *buffer)
-{
-#ifndef _WIN32    
-	char *getcwd(char *, size_t);
-#endif
-	return(getcwd(buffer, MAXPATHLEN));
-}
-#endif
-
 #ifdef DGUX
 
 
@@ -278,6 +266,8 @@
         if ( 0 == current_directory_length ) { 
            FEerror ( "truename could not determine the current directory.", 1, "" ); 
         } 
+#elif defined(HAVE_GETCWD)
+	getcwd(current_directory, MAXPATHLEN);
 #else 
         getwd(current_directory); 
 #endif 
@@ -361,6 +351,8 @@
                     FEerror ( "truename could not determine the current directory.", 1, "" ); 
                 } 
                 p = directory; 
+#elif defined(HAVE_GETCWD)
+		p = getcwd(directory, MAXPATHLEN);
 #else 
 		p = getwd(directory);
 #endif                

gcl-2.6.8-infrastructure.patch:

--- NEW FILE gcl-2.6.8-infrastructure.patch ---
diff -dur gcl-2.6.8.ORIG/config.guess gcl-2.6.8/config.guess
--- gcl-2.6.8.ORIG/config.guess	2005-08-11 09:02:25.000000000 -0600
+++ gcl-2.6.8/config.guess	2008-12-29 21:48:11.000000000 -0700
@@ -1,9 +1,10 @@
 #! /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 Free Software Foundation, Inc.
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
+#   Free Software Foundation, Inc.
 
-timestamp='2005-04-22'
+timestamp='2008-12-19'
 
 # 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
@@ -17,13 +18,15 @@
 #
 # 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.
+# 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.
@@ -53,8 +56,8 @@
 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.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
+2002, 2003, 2004, 2005, 2006, 2007, 2008 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."
@@ -66,11 +69,11 @@
 while test $# -gt 0 ; do
   case $1 in
     --time-stamp | --time* | -t )
-       echo "$timestamp" ; exit 0 ;;
+       echo "$timestamp" ; exit ;;
     --version | -v )
-       echo "$version" ; exit 0 ;;
+       echo "$version" ; exit ;;
     --help | --h* | -h )
-       echo "$usage"; exit 0 ;;
+       echo "$usage"; exit ;;
     -- )     # Stop option processing
        shift; break ;;
     - )	# Use stdin as input.
@@ -104,7 +107,7 @@
 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 -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$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 ; } ;
@@ -123,7 +126,7 @@
 	;;
  ,,*)   CC_FOR_BUILD=$CC ;;
  ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
-esac ;'
+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)
@@ -158,6 +161,7 @@
 	    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
@@ -196,55 +200,23 @@
 	# contains redundant information, the shorter form:
 	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
 	echo "${machine}-${os}${release}"
-	exit 0 ;;
-    amd64:OpenBSD:*:*)
-	echo x86_64-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    amiga:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    cats:OpenBSD:*:*)
-	echo arm-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    hp300:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    luna88k:OpenBSD:*:*)
-    	echo m88k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    mac68k:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    macppc:OpenBSD:*:*)
-	echo powerpc-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    mvme68k:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    mvme88k:OpenBSD:*:*)
-	echo m88k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    mvmeppc:OpenBSD:*:*)
-	echo powerpc-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    sgi:OpenBSD:*:*)
-	echo mips64-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    sun3:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     *:OpenBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
+	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 0 ;;
+	exit ;;
+    *:SolidBSD:*:*)
+	echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
+	exit ;;
     macppc:MirBSD:*:*)
-	echo powerppc-unknown-mirbsd${UNAME_RELEASE}
-	exit 0 ;;
+	echo powerpc-unknown-mirbsd${UNAME_RELEASE}
+	exit ;;
     *:MirBSD:*:*)
 	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     alpha:OSF1:*:*)
 	case $UNAME_RELEASE in
 	*4.0)
@@ -297,40 +269,43 @@
 	# 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 0 ;;
+	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 0 ;;
+	exit ;;
     21064:Windows_NT:50:3)
 	echo alpha-dec-winnt3.5
-	exit 0 ;;
+	exit ;;
     Amiga*:UNIX_System_V:4.0:*)
 	echo m68k-unknown-sysv4
-	exit 0;;
+	exit ;;
     *:[Aa]miga[Oo][Ss]:*:*)
 	echo ${UNAME_MACHINE}-unknown-amigaos
-	exit 0 ;;
+	exit ;;
     *:[Mm]orph[Oo][Ss]:*:*)
 	echo ${UNAME_MACHINE}-unknown-morphos
-	exit 0 ;;
+	exit ;;
     *:OS/390:*:*)
 	echo i370-ibm-openedition
-	exit 0 ;;
+	exit ;;
     *:z/VM:*:*)
 	echo s390-ibm-zvmoe
-	exit 0 ;;
+	exit ;;
     *:OS400:*:*)
         echo powerpc-ibm-os400
-	exit 0 ;;
+	exit ;;
     arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
 	echo arm-acorn-riscix${UNAME_RELEASE}
-	exit 0;;
+	exit ;;
+    arm:riscos:*:*|arm:RISCOS:*:*)
+	echo arm-unknown-riscos
[...38960 lines suppressed...]
 		IFS="$save_ifs"
+		eval cmd=\"$cmd\"
 		$show "$cmd"
 		$run eval "$cmd"
-		if test $? != 0 && test "$rmforce" != yes; then
+		if test "$?" -ne 0 && test "$rmforce" != yes; then
 		  exit_status=1
 		fi
 	      done
 	      IFS="$save_ifs"
 	    fi
 	    # FIXME: should reinstall the best remaining shared library.
-	  fi
+	    ;;
+	  esac
 	fi
 	;;
 
       *.lo)
 	# Possibly a libtool object, so verify it.
-	if (sed -e '2q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
+	if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
 
-          # Read the .lo file
-          . $dir/$name
+	  # Read the .lo file
+	  . $dir/$name
 
 	  # Add PIC object to the list of files to remove.
-          if test -n "$pic_object" \
-             && test "$pic_object" != none; then
+	  if test -n "$pic_object" \
+	     && test "$pic_object" != none; then
 	    rmfiles="$rmfiles $dir/$pic_object"
-          fi
+	  fi
 
 	  # Add non-PIC object to the list of files to remove.
-          if test -n "$non_pic_object" \
-             && test "$non_pic_object" != none; then
+	  if test -n "$non_pic_object" \
+	     && test "$non_pic_object" != none; then
 	    rmfiles="$rmfiles $dir/$non_pic_object"
-          fi
+	  fi
 	fi
 	;;
 
       *)
-	# Do a test to see if this is a libtool program.
-	if test $mode = clean &&
-	   (sed -e '4q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
-	  relink_command=
-	  . $dir/$file
+	if test "$mode" = clean ; then
+	  noexename=$name
+	  case $file in
+	  *.exe)
+	    file=`$echo $file|${SED} 's,.exe$,,'`
+	    noexename=`$echo $name|${SED} 's,.exe$,,'`
+	    # $file with .exe has already been added to rmfiles,
+	    # add $file without .exe
+	    rmfiles="$rmfiles $file"
+	    ;;
+	  esac
+	  # Do a test to see if this is a libtool program.
+	  if (${SED} -e '4q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
+	    relink_command=
+	    . $dir/$noexename
 
-	  rmfiles="$rmfiles $objdir/$name $objdir/${name}S.${objext}"
-	  if test "$fast_install" = yes && test -n "$relink_command"; then
-	    rmfiles="$rmfiles $objdir/lt-$name"
+	    # note $name still contains .exe if it was in $file originally
+	    # as does the version of $file that was added into $rmfiles
+	    rmfiles="$rmfiles $objdir/$name $objdir/${name}S.${objext}"
+	    if test "$fast_install" = yes && test -n "$relink_command"; then
+	      rmfiles="$rmfiles $objdir/lt-$name"
+	    fi
+	    if test "X$noexename" != "X$name" ; then
+	      rmfiles="$rmfiles $objdir/lt-${noexename}.c"
+	    fi
 	  fi
 	fi
 	;;
@@ -5226,6 +6700,7 @@
       $show "$rm $rmfiles"
       $run $rm $rmfiles || exit_status=1
     done
+    objdir="$origobjdir"
 
     # Try to remove the ${objdir}s in the directories where we deleted files
     for dir in $rmdirs; do
@@ -5241,20 +6716,20 @@
   "")
     $echo "$modename: you must specify a MODE" 1>&2
     $echo "$generic_help" 1>&2
-    exit 1
+    exit $EXIT_FAILURE
     ;;
   esac
 
   if test -z "$exec_cmd"; then
     $echo "$modename: invalid operation mode \`$mode'" 1>&2
     $echo "$generic_help" 1>&2
-    exit 1
+    exit $EXIT_FAILURE
   fi
 fi # test -z "$show_help"
 
 if test -n "$exec_cmd"; then
   eval exec $exec_cmd
-  exit 1
+  exit $EXIT_FAILURE
 fi
 
 # We need to display help for each of the modes.
@@ -5287,8 +6762,10 @@
       uninstall       remove libraries from an installed directory
 
 MODE-ARGS vary depending on the MODE.  Try \`$modename --help --mode=MODE' for
-a more detailed description of MODE."
-  exit 0
+a more detailed description of MODE.
+
+Report bugs to <bug-libtool at gnu.org>."
+  exit $EXIT_SUCCESS
   ;;
 
 clean)
@@ -5389,9 +6866,9 @@
   -dlpreopen FILE   link in FILE and add its symbols to lt_preloaded_symbols
   -export-dynamic   allow symbols from OUTPUT-FILE to be resolved with dlsym(3)
   -export-symbols SYMFILE
-		    try to export only the symbols listed in SYMFILE
+                    try to export only the symbols listed in SYMFILE
   -export-symbols-regex REGEX
-		    try to export only the symbols matching REGEX
+                    try to export only the symbols matching REGEX
   -LLIBDIR          search LIBDIR for required installed libraries
   -lNAME            OUTPUT-FILE requires the installed library libNAME
   -module           build a library that can dlopened
@@ -5400,12 +6877,16 @@
   -no-undefined     declare that a library does not refer to external symbols
   -o OUTPUT-FILE    create OUTPUT-FILE from the specified objects
   -objectlist FILE  Use a list of object files found in FILE to specify objects
+  -precious-files-regex REGEX
+                    don't remove output files matching REGEX
   -release RELEASE  specify package release information
   -rpath LIBDIR     the created library will eventually be installed in LIBDIR
   -R[ ]LIBDIR       add LIBDIR to the runtime path of programs and libraries
-  -static           do not do any dynamic linking of libtool libraries
+  -static           do not do any dynamic linking of uninstalled libtool libraries
+  -static-libtool-libs
+                    do not do any dynamic linking of libtool libraries
   -version-info CURRENT[:REVISION[:AGE]]
-		    specify library version info [each variable defaults to 0]
+                    specify library version info [each variable defaults to 0]
 
 All other options (arguments beginning with \`-') are ignored.
 
@@ -5441,14 +6922,14 @@
 *)
   $echo "$modename: invalid operation mode \`$mode'" 1>&2
   $echo "$help" 1>&2
-  exit 1
+  exit $EXIT_FAILURE
   ;;
 esac
 
-echo
+$echo
 $echo "Try \`$modename --help' for more information about other modes."
 
-exit 0
+exit $?
 
 # The TAGs below are defined such that we never get into a situation
 # in which we disable both kinds of libraries.  Given conflicting
@@ -5461,14 +6942,13 @@
 # If a disable-shared tag is given, we'll fallback to a static-only
 # configuration.  But we'll never go from static-only to shared-only.
 
-### BEGIN LIBTOOL TAG CONFIG: disable-shared
-build_libtool_libs=no
-build_old_libs=yes
-### END LIBTOOL TAG CONFIG: disable-shared
+# ### BEGIN LIBTOOL TAG CONFIG: disable-shared
+disable_libs=shared
+# ### END LIBTOOL TAG CONFIG: disable-shared
 
-### BEGIN LIBTOOL TAG CONFIG: disable-static
-build_old_libs=`case $build_libtool_libs in yes) echo no;; *) echo yes;; esac`
-### END LIBTOOL TAG CONFIG: disable-static
+# ### BEGIN LIBTOOL TAG CONFIG: disable-static
+disable_libs=static
+# ### END LIBTOOL TAG CONFIG: disable-static
 
 # Local Variables:
 # mode:shell-script

gcl-2.6.8-latex.patch:

--- NEW FILE gcl-2.6.8-latex.patch ---
diff -dur gcl-2.6.8.ORIG/xgcl-2/dwdoc.tex gcl-2.6.8/xgcl-2/dwdoc.tex
--- gcl-2.6.8.ORIG/xgcl-2/dwdoc.tex	2008-12-29 20:09:33.000000000 -0700
+++ gcl-2.6.8/xgcl-2/dwdoc.tex	2008-12-29 20:09:01.000000000 -0700
@@ -1,19 +1,16 @@
 % dwdoc.tex          Gordon S. Novak Jr.
 % 08 Oct 92; 08 Oct 93; 16 Nov 94; 05 Jan 95; 25 Jan 06; 26 Jan 06
 
-\documentstyle[12pt]{article}
-\setlength{\oddsidemargin}{0 in}
-\setlength{\textwidth}{6.5 in}
-\setlength{\textheight}{9.0 in}
+\documentclass[12pt]{article}
+\usepackage[margin=1in]{geometry}
 \setlength{\parskip}{0.1 in}
 \setlength{\parindent}{0.0 in}
-\setlength{\topmargin}{-0.4in}
 \hyphenpenalty=9990
 
 \begin{document}
 
 \Large
-\begin{center} {\bf Interface from GCL to X Windows} \\  \end{center}
+\begin{center} \textbf{Interface from GCL to X Windows} \\  \end{center}
 
 \normalsize
 
@@ -42,508 +39,512 @@
 \item Hiep Huu Nguyen has written (and adapted from X Consortium software)
 an interface between GCL and Xlib, the X library in C.
 Xlib functions can be called directly if desired, but most users will find
-the {\tt dwindow} functions easier to use.  There is little documentation
+the \texttt{dwindow} functions easier to use.  There is little documentation
 of these functions, but the Xlib documentation can be consulted, and
-the {\tt dwindow} functions can be examined as examples.
+the \texttt{dwindow} functions can be examined as examples.
 
-\item The {\tt dwindow} functions described in this document, which call
+\item The \texttt{dwindow} functions described in this document, which call
 the Xlib functions and provide an easier interface for Lisp programs.
 
 \item It is possible to make an interactive graphical interface
 within a web page; this is described in a section below.
 \end{enumerate}
 The source file for the interface (written in GLISP) is
-{\tt dwindow.lsp}; this file is compiled into a file in plain Lisp,
-{\tt dwtrans.lsp}.  {\tt dwtrans.lsp} is compiled as part of XGCL.
+\texttt{dwindow.lsp}; this file is compiled into a file in plain Lisp,
+\texttt{dwtrans.lsp}.  \texttt{dwtrans.lsp} is compiled as part of XGCL.
 
 The functions in this package use the convention that the coordinate
-{\tt (0 0)} is the lower-left corner of a window, with positive {\tt y}
+\texttt{(0 0)} is the lower-left corner of a window, with positive \texttt{y}
 being upward.  This is different from the convention used by
-X, which assumes that {\tt (0 0)} is the upper left corner and
-that positive {\tt y} is downward.
+X, which assumes that \texttt{(0 0)} is the upper left corner and
+that positive \texttt{y} is downward.
 
 In the descriptions below, some function arguments are shown with a type,
-e.g. {\tt arg:type}, to indicate the expected type of the argument.
-The type {\tt vector} is a list {\tt (x y)} of integers.  The argument
-{\tt w} that is used with many functions is of type {\tt window}
-({\tt window} is a Lisp data structure used by the {\tt dwindow} functions).
+e.g. \texttt{arg:type}, to indicate the expected type of the argument.
+The type \texttt{vector} is a list \texttt{(x y)} of integers.  The argument
+\texttt{w} that is used with many functions is of type \texttt{window}
+(\texttt{window} is a Lisp data structure used by the \texttt{dwindow}
+functions).
 
-Both the Xlib and {\tt dwindow} functions are in the package {\tt xlib:}.
-In order to use these functions, the Lisp command {\tt (use-package 'xlib)}
-should be used to import the {\tt dwindow} symbols.
+Both the Xlib and \texttt{dwindow} functions are in the package \texttt{xlib:}.
+In order to use these functions, the Lisp command \texttt{(use-package 'xlib)}
+should be used to import the \texttt{dwindow} symbols.
 
 
 \section{Examples and Utilities}
 
-\subsection{{\tt dwtest}}
+\subsection{\texttt{dwtest}}
 
-The file {\tt dwtest.lsp} contains example functions that illustrate
-the use of the {\tt dwindow} package.  The function call {\tt (wtesta)}
-creates a small window for testing.  {\tt (wtestb)} through
-{\tt (wtestk)} perform drawing and mouse interaction tests using the
+The file \texttt{dwtest.lsp} contains example functions that illustrate
+the use of the \texttt{dwindow} package.  The function call \texttt{(wtesta)}
+creates a small window for testing.  \texttt{(wtestb)} through
+\texttt{(wtestk)} perform drawing and mouse interaction tests using the
 window.  These functions may be consulted as examples of the use of
-commonly used {\tt dwindow} functions.
+commonly used \texttt{dwindow} functions.
 
-\subsection{{\tt pcalc}}
+\subsection{\texttt{pcalc}}
 
-The file {\tt pcalc.lsp} implements
-a pocket calculator as a {\tt picmenu}; its entry is {\tt (pcalc)}.
+The file \texttt{pcalc.lsp} implements
+a pocket calculator as a \texttt{picmenu}; its entry is \texttt{(pcalc)}.
 
-\subsection{{\tt draw}}
+\subsection{\texttt{draw}}
 
-The file {\tt drawtrans.lsp} contains an interactive drawing program;
-its entry is {\tt (draw 'foo)} where {\tt foo} is the name of the drawing.
-The file {\tt ice-cream.lsp} can be loaded, followed by
-{\tt (draw 'ice-cream)} to examine an example drawing.
-{\tt draw} can produce a Lisp program or a set of \LaTeX \  commands to
-recreate the drawing; use {\tt origin to zero} before making a program.
-{\tt (draw-out file names)} will write definitions of drawings in the
-list {\tt names} to the file {\tt file}.
+The file \texttt{drawtrans.lsp} contains an interactive drawing program; its
+entry is \texttt{(draw 'foo)} where \texttt{foo} is the name of the drawing.
+The file \texttt{ice-cream.lsp} can be loaded, followed by
+\texttt{(draw 'ice-cream)} to examine an example drawing.
+\texttt{draw} can produce a Lisp program or a set of \LaTeX \  commands to
+recreate the drawing; use \texttt{origin to zero} before making a program.
+\texttt{(draw-out file names)} will write definitions of drawings in the
+list \texttt{names} to the file \texttt{file}.
 
-\subsection{{\tt editors}}
+\subsection{\texttt{editors}}
 
-The file {\tt editorstrans.lsp} contains some interactive editing programs;
-it is a translation of the file {\tt editors.lsp} .
-One useful editor is the color editor; after entering {\tt (wtesta)}
-(in file {\tt dwtest.lsp}), enter {\tt (edit-color myw)} to edit a
-color.  The result is an {\tt rgb} list as used in {\tt window-set-color}.
+The file \texttt{editorstrans.lsp} contains some interactive editing programs;
+it is a translation of the file \texttt{editors.lsp}.
+One useful editor is the color editor; after entering \texttt{(wtesta)}
+(in file \texttt{dwtest.lsp}), enter \texttt{(edit-color myw)} to edit a
+color.  The result is an \texttt{rgb} list as used in
+\texttt{window-set-color}.
 
 A simple line editor and an Emacs-like text editor are described in sections
 \ref{texted}  and \ref{emacsed} below.
 
 \section{Menus}
 
-The function {\tt menu} provides an easy interface to make a pop-up menu,
+The function \texttt{menu} provides an easy interface to make a pop-up menu,
 get a selection from it, and destroy it: \\
 
 \vspace{-0.2in}
-{\tt \hspace*{0.5in} (menu items \&optional title)} \\
+\texttt{\hspace*{0.5in} (menu items \&optional title)} \\
 
 \vspace{-0.1in}
-Example: {\tt (menu '(red white blue))}
+Example: \texttt{(menu '(red white blue))}
 
 This simple call is all that is needed in most cases.
 More sophisticated menu features are described below.
 
-The {\tt items} in a menu is a list; each item may be a symbol, a {\tt cons}
-of a symbol or string and the corresponding value, or a {\tt cons} of a
-function name and the corresponding value.  In the latter case, the function
-is expected to draw the corresponding menu item.
+The \texttt{items} in a menu is a list; each item may be a symbol, a
+\texttt{cons} of a symbol or string and the corresponding value, or a
+\texttt{cons} of a function name and the corresponding value.  In the latter
+case, the function is expected to draw the corresponding menu item.
 
 If a function name is specified as the first element of a menu item, the
-drawing function should have arguments {\tt (fn w x y)}, where {\tt w}
-is the window and {\tt x} and {\tt y} are the lower-left corner of the
+drawing function should have arguments \texttt{(fn w x y)}, where \texttt{w}
+is the window and \texttt{x} and \texttt{y} are the lower-left corner of the
 drawing area.  The property list of the function name should have the
-property {\tt display-size}, which should be a list {\tt (width height)}
+property \texttt{display-size}, which should be a list \texttt{(width height)}
 in pixels of the displayed symbol.
 
 Menus can be associated with a particular window; if no window is specified,
 the menu is associated with the window where the mouse cursor is located
 when the menu is initialized (which might not be a Lisp user's window).  If a
-menu is associated with a user window, it may be {\em permanent} (left
-displayed after a selection is made) and may be {\em flat} (drawn directly
+menu is associated with a user window, it may be \emph{permanent} (left
+displayed after a selection is made) and may be \emph{flat} (drawn directly
 on the containing window, rather than having its own window).
 
-A menu can be created by {\tt menu-create} : \\
+A menu can be created by \texttt{menu-create} : \\
 
 \vspace{-0.1in}
-{\tt \hspace*{0.5in}
+\texttt{\hspace*{0.5in}
  (menu-create items \&optional title w:window x y perm flat font)} \\
 
 \vspace{-0.1in}
-{\tt title}, if specified, is displayed over the menu.
-{\tt w} is an existing {\tt window}; if specified, the menu is put
-within this window at the {\tt x y} offsets specified (adjusted if necessary
-to keep the menu inside the window).  If no {\tt w}
-is specified, or if {\tt x} is {\tt nil}, the menu is put where the cursor
+\texttt{title}, if specified, is displayed over the menu.
+\texttt{w} is an existing \texttt{window}; if specified, the menu is put
+within this window at the \texttt{x y} offsets specified (adjusted if necessary
+to keep the menu inside the window).  If no \texttt{w} is
+specified, or if \texttt{x} is \texttt{nil}, the menu is put where the cursor
 is the first time the menu is displayed.
-{\tt perm} is non-{\tt nil} if the menu is to be permanent, {\em i.e.}, is to
-be left displayed after a selection has been made.
-{\tt flat} is non-{\tt nil} if the menu is to be drawn directly on the
+\texttt{perm} is non-\texttt{nil} if the menu is to be permanent, \emph{i.e.},
+is to be left displayed after a selection has been made.
+\texttt{flat} is non-\texttt{nil} if the menu is to be drawn directly on the
 containing window.
-{\tt font} is a symbol or string that names the font to be used; the
-default is a {\tt 9x15} typewriter font.
+\texttt{font} is a symbol or string that names the font to be used; the
+default is a \texttt{9x15} typewriter font.
 
-The menu is returned as the value of {\tt menu-create}.  Such a menu can
-be saved; selections can be made from a menu {\tt m} as follows: \\
+The menu is returned as the value of \texttt{menu-create}.  Such a menu can
+be saved; selections can be made from a menu \texttt{m} as follows: \\
 
 \vspace{-0.1in}
-{\tt \hspace*{0.5in} (menu-select m \&optional inside)} \ \ \ \ \ or
-{\tt \hspace*{0.5in} (menu-select! m)} \\
+\texttt{\hspace*{0.5in} (menu-select m \&optional inside)} \ \ \ \ \ or
+\texttt{\hspace*{0.5in} (menu-select! m)} \\
 
 \vspace{-0.1in}
-{\tt menu-select} will return {\tt nil} if the mouse is clicked outside the
-menu, or is moved outside after it has been inside (or if {\tt inside} is
-not {\tt nil}), provided that the menu is contained within a user-created
+\texttt{menu-select} will return \texttt{nil} if the mouse is clicked outside
+the menu, or is moved outside after it has been inside (or if \texttt{inside}
+is not \texttt{nil}), provided that the menu is contained within a user-created
 window.
-{\tt menu-select!} requires that a choice be made.
+\texttt{menu-select!} requires that a choice be made.
 
 In order to avoid wasting storage, unused menus should be destroyed:
-{\tt (menu-destroy m)}.  The simple {\tt menu} function destroys its
+\texttt{(menu-destroy m)}.  The simple \texttt{menu} function destroys its
 menu after it is used.
 
-{\tt \hspace*{0.5in} (menu-size m)} \\
-{\tt \hspace*{0.5in} (menu-moveto-xy m x y)} \\
-{\tt \hspace*{0.5in} (menu-reposition m)} \
+\texttt{\hspace*{0.5in} (menu-size m)} \\
+\texttt{\hspace*{0.5in} (menu-moveto-xy m x y)} \\
+\texttt{\hspace*{0.5in} (menu-reposition m)} \
 
-{\tt menu-reposition} will reposition a {\tt flat} menu within its parent
+\texttt{menu-reposition} will reposition a \texttt{flat} menu within its parent
 window by allowing the user to position a ghost box using the mouse.
-{\tt menu-size} returns the size of the menu as a vector, {\tt (x y)}.
-{\tt menu-moveto-xy} adjusts the offsets to move a {\tt flat} menu to
+\texttt{menu-size} returns the size of the menu as a vector, \texttt{(x y)}.
+\texttt{menu-moveto-xy} adjusts the offsets to move a \texttt{flat} menu to
 the specified position within its parent window.  These functions and
-{\tt menu-destroy} work for picmenus and barmenus as well.
+\texttt{menu-destroy} work for picmenus and barmenus as well.
 
-{\tt \hspace*{0.5in} (menu-item-position m name \&optional location)} \\
+\texttt{\hspace*{0.5in} (menu-item-position m name \&optional location)} \\
 
 \vspace{-0.1in}
-{\tt menu-item-position} returns a vector {\tt (x y)} that gives the
-coordinates of the menu item whose name is {\tt name}.  {\tt location}
-may be {\tt center}, {\tt left}, {\tt right}, {\tt top}, or {\tt bottom};
-the default is the lower-left corner of the menu item.  {\tt center}
-specifies the center of the box containing the menu item; the other
-{\tt location} values are at the center of the specified edge of the box.
+\texttt{menu-item-position} returns a vector \texttt{(x y)} that gives the
+coordinates of the menu item whose name is \texttt{name}.  \texttt{location}
+may be \texttt{center}, \texttt{left}, \texttt{right}, \texttt{top}, or
+\texttt{bottom}; the default is the lower-left corner of the menu item.
+\texttt{center} specifies the center of the box containing the menu item; the
+other \texttt{location} values are at the center of the specified edge of the
+box.
 
 \subsection{Picmenus}
 
-A {\tt picmenu} (picture menu) is analogous to a menu, but involves a
+A \texttt{picmenu} (picture menu) is analogous to a menu, but involves a
 user-defined picture containing sensitive spots or ``buttons''.
-The test function {\tt (wteste)} shows an example of a {\tt picmenu}.
-A {\tt picmenu} is created by: \\
+The test function \texttt{(wteste)} shows an example of a \texttt{picmenu}.
+A \texttt{picmenu} is created by: \\
 
 \vspace{-0.1in}
-{\tt \hspace*{0.5in} (picmenu-create buttons width height drawfn \\
+\texttt{\hspace*{0.5in} (picmenu-create buttons width height drawfn \\
 \hspace*{1.5in} \&optional title dotflg w:window x y perm flat font boxflg)} \\
 
 \vspace{-0.1in}
 
 If a picmenu is to be used more than once, the common parts can be made
-into a {\tt picmenu-spec} and reused:
+into a \texttt{picmenu-spec} and reused:
 
 \vspace{-0.1in}
-{\tt \hspace*{0.5in} (picmenu-create-spec buttons width height drawfn \\
+\texttt{\hspace*{0.5in} (picmenu-create-spec buttons width height drawfn \\
 \hspace*{1.5in} \&optional dotflg font)} \\
 
 \vspace{-0.1in}
-{\tt \hspace*{0.5in} (picmenu-create-from-spec spec:picmenu-spec \\
+\texttt{\hspace*{0.5in} (picmenu-create-from-spec spec:picmenu-spec \\
 \hspace*{1.5in} \&optional title w:window x y perm flat boxflg)} \\
 
 \vspace{-0.1in}
-{\tt width} and {\tt height} are the size of the area occupied by the
-picture.  {\tt (drawfn w x y)} should draw the picture at the offset
-{\tt x y}.  Note that the {\tt draw} utility can be used to
-make the drawing function, including {\tt picmenu} buttons.
-{\tt dotflg} is non-{\tt nil} if it is desired that small boxes be
+\texttt{width} and \texttt{height} are the size of the area occupied by the
+picture.  \texttt{(drawfn w x y)} should draw the picture at the offset
+\texttt{x y}.  Note that the \texttt{draw} utility can be used to
+make the drawing function, including \texttt{picmenu} buttons.
+\texttt{dotflg} is non-\texttt{nil} if it is desired that small boxes be
 automatically added to the sensitive points when the picture is drawn.
-{\tt boxflg} is non-{\tt nil} if a box is to be drawn around the picmenu
+\texttt{boxflg} is non-\texttt{nil} if a box is to be drawn around the picmenu
 when the picture is drawn (this is only needed for flat
-picmenus).  If {\tt perm} is non-nil, the drawing program is not called when
+picmenus).  If \texttt{perm} is non-nil, the drawing program is not called when
 a selection is to be made, so that an external program must draw the
-{\tt picmenu}; this avoids the need to redraw a complex picture.
+\texttt{picmenu}; this avoids the need to redraw a complex picture.
 The remaining arguments are as described for menus.
 
-Each of the {\tt buttons} in a picmenu is a list: \\
+Each of the \texttt{buttons} in a picmenu is a list: \\
 
 \vspace{-0.1in}
-{\tt \hspace*{0.5in} (buttonname offset size highlightfn unhighlightfn)} \\
+\texttt{\hspace*{0.5in} (buttonname offset size highlightfn unhighlightfn)} \\
 
 \vspace{-0.1in}
-{\tt buttonname} is the name of the button; it is the value returned when that
-button is selected.
-{\tt offset} is a vector {\tt (x y)} that gives the offset of the center
+\texttt{buttonname} is the name of the button; it is the value returned when
+that button is selected.
+\texttt{offset} is a vector \texttt{(x y)} that gives the offset of the center
 of the button from the lower-left corner of the picture.
 The remainder of the button list may be omitted.
-{\tt size} is an optional list {\tt (width height)} that gives the size of the
-sensitive area of the button; the default size is {\tt (12\ 12)}.
-{\tt (highlightfn w x y)} and {\tt (unhighlightfn w x y)} (where {\tt (x y)}
-is the center of the button in the coordinates of {\tt w}) are optional
-functions to highlight the button area when the cursor is moved into it and
-unhighlight the button when the cursor is moved out; the default is to
-display a box of the specified {\tt size}.
+\texttt{size} is an optional list \texttt{(width height)} that gives the size
+of the sensitive area of the button; the default size is \texttt{(12\ 12)}.
+\texttt{(highlightfn w x y)} and \texttt{(unhighlightfn w x y)} (where
+\texttt{(x y)} is the center of the button in the coordinates of \texttt{w})
+are optional functions to highlight the button area when the cursor is moved
+into it and unhighlight the button when the cursor is moved out; the default
+is to display a box of the specified \texttt{size}.
 
-{\tt \hspace*{0.5in} (picmenu-select m \&optional inside)} \\
-If the {\tt picmenu} is not {\tt flat}, its window should be destroyed
-following the selection using {\tt menu-destroy}.
+\texttt{\hspace*{0.5in} (picmenu-select m \&optional inside)} \\
+If the \texttt{picmenu} is not \texttt{flat}, its window should be destroyed
+following the selection using \texttt{menu-destroy}.
 
-{\tt \hspace*{0.5in} (picmenu-item-position m name \&optional location)} \\
+\texttt{\hspace*{0.5in} (picmenu-item-position m name \&optional location)} \\
 
 \vspace{-0.1in}
-{\tt \hspace*{0.5in} (picmenu-delete-named-button m name:symbol)} \\
-This deletes a button from a displayed {\tt picmenu}.  The set of
-deleted buttons is reset to {\tt nil} when the picmenu is drawn.
+\texttt{\hspace*{0.5in} (picmenu-delete-named-button m name:symbol)} \\
+This deletes a button from a displayed \texttt{picmenu}.  The set of
+deleted buttons is reset to \texttt{nil} when the picmenu is drawn.
 
 \subsection{Barmenus}
 
-A {\tt barmenu} displays a bar graph whose size can be adjusted using
+A \texttt{barmenu} displays a bar graph whose size can be adjusted using
 the mouse.
 
-{\tt \hspace*{0.5in} 
+\texttt{\hspace*{0.5in} 
 (barmenu-create maxval initval barwidth \\
 \hspace*{1.5in} \&optional title horizontal subtrackfn subtrackparms \\
 \hspace*{1.5in} parentw x y perm flat color)}
 
-A value is selected by: {\tt (barmenu-select m:barmenu \&optional inside)} \\
-If the {\tt barmenu} is not {\tt flat}, its window should be destroyed
-following the selection using {\tt menu-destroy}.
+A value is selected by: \texttt{(barmenu-select m:barmenu \&optional inside)} \\
+If the \texttt{barmenu} is not \texttt{flat}, its window should be destroyed
+following the selection using \texttt{menu-destroy}.
 
 The user must first click the mouse in the bar area; then
 the size of the displayed bar is adjusted as the user moves the mouse
-pointer.  In addition, the {\tt subtrackfn} is called with arguments
-of the size of the bar followed by the {\tt subtrackparms}; this can
+pointer.  In addition, the \texttt{subtrackfn} is called with arguments
+of the size of the bar followed by the \texttt{subtrackparms}; this can
 be used, for example, to display a numeric value in addition to the
 bar size.
 
 
 \subsection{Menu Sets and Menu Conns}
 
-A {\tt menu-set} is a set of multiple menus, picmenus, or barmenus
+A \texttt{menu-set} is a set of multiple menus, picmenus, or barmenus
 that are simultaneously active within the same window.  Menu-sets
-can be used to implement graphical user interfaces.  A {\tt menu-conns}
+can be used to implement graphical user interfaces.  A \texttt{menu-conns}
 is a menu-set that includes connections between menus; this can be
 used to implement interfaces that allow the user to construct a network
 from components.
 
-The source file for menu-sets is the GLISP file {\tt menu-set.lsp};
-this file is translated as part of the file {\tt drawtrans.lsp} in
+The source file for menu-sets is the GLISP file \texttt{menu-set.lsp};
+this file is translated as part of the file \texttt{drawtrans.lsp} in
 plain Lisp.  Examples of the use of menu sets are given at the top
-of the file {\tt menu-set.lsp}.  In the following descriptions,
-{\tt ms} is a {\tt menu-set} and {\tt mc} is a {\tt menu-conns}.
+of the file \texttt{menu-set.lsp}.  In the following descriptions,
+\texttt{ms} is a \texttt{menu-set} and \texttt{mc} is a \texttt{menu-conns}.
 
-{\tt \hspace*{0.5in} (menu-set-create w)} creates a menu set to be displayed
-in the window {\tt w}.
+\texttt{\hspace*{0.5in} (menu-set-create w)} creates a menu set to be displayed
+in the window \texttt{w}.
 
-{\tt \hspace*{0.5in} (menu-set-name symbol)} makes a {\tt gensym} name that
-begins with {\tt symbol}.
+\texttt{\hspace*{0.5in} (menu-set-name symbol)} makes a \texttt{gensym} name
+that begins with \texttt{symbol}.
 
-{\tt \hspace*{0.5in} (menu-set-add-menu ms name:symbol sym title items} \\
-\hspace*{1.5in} {\tt \&optional offset:vector)}
+\texttt{\hspace*{0.5in} (menu-set-add-menu ms name:symbol sym title items} \\
+\hspace*{1.5in} \texttt{\&optional offset:vector)}
 
-This function adds a menu to a menu-set.  {\tt sym} is arbitrary
+This function adds a menu to a menu-set.  \texttt{sym} is arbitrary
 information that is saved with the menu.
 
-{\tt \hspace*{0.5in} (menu-set-add-picmenu ms name sym title spec:picmenu-spec} \\
-\hspace*{1.5in} {\tt \&optional offset:vector nobox)}
+\texttt{\hspace*{0.5in} (menu-set-add-picmenu ms name sym title spec:picmenu-spec} \\
+\hspace*{1.5in} \texttt{\&optional offset:vector nobox)}
 
-{\tt \hspace*{0.5in} (menu-set-add-component ms name \&optional offset:vector)}
+\texttt{\hspace*{0.5in} (menu-set-add-component ms name \&optional offset:vector)}
 
-This adds a component that has a {\tt picmenu-spec} defined on the
-property list of {\tt name}.
+This adds a component that has a \texttt{picmenu-spec} defined on the
+property list of \texttt{name}.
 
-{\tt \hspace*{0.5in} (menu-set-add-barmenu ms name sym barmenu title} \\
-\hspace*{1.5in} {\tt \&optional offset:vector)}
+\texttt{\hspace*{0.5in} (menu-set-add-barmenu ms name sym barmenu title} \\
+\hspace*{1.5in} \texttt{\&optional offset:vector)}
 
-{\tt \hspace*{0.5in} (menu-set-draw ms)} draws all the menus.
+\texttt{\hspace*{0.5in} (menu-set-draw ms)} draws all the menus.
 
-{\tt \hspace*{0.5in} (menu-set-select ms \&optional redraw enabled)}
+\texttt{\hspace*{0.5in} (menu-set-select ms \&optional redraw enabled)}
 
-{\tt menu-set-select} gets a selection from a menu-set.  If {\tt redraw}
-is non-{\tt nil}, the menu-set is drawn.  {\tt enabled} may be a list
+\texttt{menu-set-select} gets a selection from a menu-set.  If \texttt{redraw}
+is non-\texttt{nil}, the menu-set is drawn.  \texttt{enabled} may be a list
 of names of menus that are enabled for selection.  The result is
-{\tt (selection menu-name)}, or {\tt ((x y) BACKGROUND button)}
+\texttt{(selection menu-name)}, or \texttt{((x y) BACKGROUND button)}
 for a click outside any menu.
 
 
-{\tt \hspace*{0.5in} (menu-conns-create ms)} creates a {\tt menu-conns}
-from a {\tt menu-set}.
+\texttt{\hspace*{0.5in} (menu-conns-create ms)} creates a \texttt{menu-conns}
+from a \texttt{menu-set}.
 
-{\tt \hspace*{0.5in} (menu-conns-add-conn mc)}
+\texttt{\hspace*{0.5in} (menu-conns-add-conn mc)}
 
 This function allows the user to select two ports from menus of the
-{\tt menu-conns}.  It then draws a line between the ports and adds the
-connection to the {\tt connections} of the {\tt menu-conns}.
+\texttt{menu-conns}.  It then draws a line between the ports and adds the
+connection to the \texttt{connections} of the \texttt{menu-conns}.
 
-{\tt \hspace*{0.5in} (menu-conns-move mc)}
+\texttt{\hspace*{0.5in} (menu-conns-move mc)}
 
 This function allows the user to select a menu and move it.
-The {\tt menu-set} and connections are redrawn afterwards.
+The \texttt{menu-set} and connections are redrawn afterwards.
 
-{\tt \hspace*{0.5in} (menu-conns-find-conn mc pt:vector)} \\
-This finds the connection selected by the point {\tt pt}, if any.
+\texttt{\hspace*{0.5in} (menu-conns-find-conn mc pt:vector)} \\
+This finds the connection selected by the point \texttt{pt}, if any.
 This is useful to allow the user to delete a connection:
 
-{\tt \hspace*{0.5in} (menu-conns-delete-conn mc conn)}
+\texttt{\hspace*{0.5in} (menu-conns-delete-conn mc conn)}
 
-{\tt \hspace*{0.5in} (menu-conns-find-conns mc menuname port)} \\
-This returns all the connections from the specified {\tt port} (selection)
-of the menu whose name is {\tt menuname}.
+\texttt{\hspace*{0.5in} (menu-conns-find-conns mc menuname port)} \\
+This returns all the connections from the specified \texttt{port} (selection)
+of the menu whose name is \texttt{menuname}.
 
 
 \section{Windows}
 
-{\tt \hspace*{0.5in} (window-create width height \&optional title parentw
+\texttt{\hspace*{0.5in} (window-create width height \&optional title parentw
  x y font)} \\
 
 \vspace{-0.1in}
-{\tt window-create} makes a new window of the specified {\tt width} and
-{\tt height}.  {\tt title}, if specified, becomes the displayed title
-of the window.  If {\tt parentw} is specified, it should be the
-{\tt window-parent} property of an existing window, which becomes the parent
-window of the new window.  {\tt x} and {\tt y} are the offset of the
-new window from the parent window.  {\tt font} is the font to be used
+\texttt{window-create} makes a new window of the specified \texttt{width} and
+\texttt{height}.  \texttt{title}, if specified, becomes the displayed title
+of the window.  If \texttt{parentw} is specified, it should be the
+\texttt{window-parent} property of an existing window, which becomes the parent
+window of the new window.  \texttt{x} and \texttt{y} are the offset of the
+new window from the parent window.  \texttt{font} is the font to be used
 for printing in the window; the default is given by
-{\tt *window-default-font-name*}, initially {\tt courier-bold-12}.
+\texttt{*window-default-font-name*}, initially \texttt{courier-bold-12}.
 
-{\tt \hspace*{0.5in} (window-open w)} causes a window to be displayed
+\texttt{\hspace*{0.5in} (window-open w)} causes a window to be displayed
 on the screen.
 
-{\tt \hspace*{0.5in} (window-close w)} removes the window from the display;
+\texttt{\hspace*{0.5in} (window-close w)} removes the window from the display;
 it can be re-opened.
 
-{\tt \hspace*{0.5in} (window-destroy w)}
+\texttt{\hspace*{0.5in} (window-destroy w)}
 
-{\tt \hspace*{0.5in} (window-moveto-xy w x y)}
+\texttt{\hspace*{0.5in} (window-moveto-xy w x y)}
 
-{\tt \hspace*{0.5in} (window-geometry w)} queries X for the window geometry.
+\texttt{\hspace*{0.5in} (window-geometry w)} queries X for the window geometry.
 The result is a list, \linebreak
-{\tt (x y width height border-width)} .
+\texttt{(x y width height border-width)} .
 
-{\tt \hspace*{0.5in} (window-size w)} returns a list {\tt (width height)} .
+\texttt{\hspace*{0.5in} (window-size w)} returns a list
+\texttt{(width height)} .
 
 \vspace{-0.1in}
 Note that the width and height are cached within the structure so that no call
 to X is needed to examine them.  However, if the window is resized, it is
-necessary to call {\tt (window-reset-geometry\ w)} to reset the local
+necessary to call \texttt{(window-reset-geometry\ w)} to reset the local
 parameters to their correct values.
 
 % ; Paint in window with mouse \\   % these are not really working...
-% {\tt \hspace*{0.5in} (window-paint w)} \\
+% \texttt{\hspace*{0.5in} (window-paint w)} \\
 %
-% {\tt \hspace*{0.5in} (window-move w)} \\
+% \texttt{\hspace*{0.5in} (window-move w)} \\
 %
-% {\tt \hspace*{0.5in} (dowindowcom w)} \\
+% \texttt{\hspace*{0.5in} (dowindowcom w)} \\
 
-The following functions provide access to the parts of the {\tt window} data
+The following functions provide access to the parts of the \texttt{window} data
 structure; most applications will not need to use them. \\
 
 \vspace{-0.1in}
-{\tt \hspace*{0.5in} (window-gcontext        w)} \\
-{\tt \hspace*{0.5in} (window-parent          w)} \\
-{\tt \hspace*{0.5in} (window-drawable-height w)} \\
-{\tt \hspace*{0.5in} (window-drawable-width  w)} \\
-{\tt \hspace*{0.5in} (window-label           w)} \\
-{\tt \hspace*{0.5in} (window-font            w)} \\
-{\tt \hspace*{0.5in} (window-screen-height)} \\
+\texttt{\hspace*{0.5in} (window-gcontext        w)} \\
+\texttt{\hspace*{0.5in} (window-parent          w)} \\
+\texttt{\hspace*{0.5in} (window-drawable-height w)} \\
+\texttt{\hspace*{0.5in} (window-drawable-width  w)} \\
+\texttt{\hspace*{0.5in} (window-label           w)} \\
+\texttt{\hspace*{0.5in} (window-font            w)} \\
+\texttt{\hspace*{0.5in} (window-screen-height)} \\
 
 
 \section{Drawing Functions}
 
-{\tt \hspace*{0.5in} (window-clear w)} clears the window to the background
+\texttt{\hspace*{0.5in} (window-clear w)} clears the window to the background
 color.
 
-{\tt \hspace*{0.5in} (window-force-output \&optional w)}
+\texttt{\hspace*{0.5in} (window-force-output \&optional w)}
 
 \vspace{-0.1in}
 Communication between the running program and X windows is done through a
 stream; actual drawing on the display is done asynchronously.
-{\tt window-force-output} causes the current drawing commands, if any,
+\texttt{window-force-output} causes the current drawing commands, if any,
 to be sent to X.  Without this, commands may be left in the stream buffer and
-may appear not to have been executed.  The argument {\tt w} is not used.
+may appear not to have been executed.  The argument \texttt{w} is not used.
 
-In all of the drawing functions, the {\tt linewidth} argument is optional
-and defaults to {\tt 1}.
+In all of the drawing functions, the \texttt{linewidth} argument is optional
+and defaults to \texttt{1}.
 
 \vspace{0.1in}
-{\tt \hspace*{0.5in} (window-draw-line w from:vector to:vector linewidth)} \\
-{\tt \hspace*{0.5in}
+\texttt{\hspace*{0.5in} (window-draw-line w from:vector to:vector linewidth)} \\
+\texttt{\hspace*{0.5in}
  (window-draw-line-xy w x1 y1 x2 y2 \&optional linewidth op)} \\
- \hspace*{1.0in} {\tt op} may be {\tt xor} or {\tt erase}.
+ \hspace*{1.0in} \texttt{op} may be \texttt{xor} or \texttt{erase}.
 
 \vspace{0.1in}
-{\tt \hspace*{0.5in}
+\texttt{\hspace*{0.5in}
  (window-draw-arrow-xy w x1 y1 x2 y2 \&optional linewidth size)} \\
-{\tt \hspace*{0.5in}
+\texttt{\hspace*{0.5in}
  (window-draw-arrow2-xy w x1 y1 x2 y2 \&optional linewidth size)} \\
-{\tt \hspace*{0.5in}
+\texttt{\hspace*{0.5in}
  (window-draw-arrowhead-xy w x1 y1 x2 y2 \&optional linewidth size)}
 
 \vspace{-0.1in}
 These draw a line with an arrowhead at the second point, a line with an
 arrowhead at both points, or an arrowhead alone at the second point,
-respectively.  {\tt size} is the arrowhead size; the default is
-{\tt (+ 20 (* linewidth 5))}.
+respectively.  \texttt{size} is the arrowhead size; the default is
+\texttt{(+ 20 (* linewidth 5))}.
 
 \vspace{0.1in}
-{\tt \hspace*{0.5in} (window-draw-box-xy w x y width height linewidth)} \\
-{\tt \hspace*{0.5in} (window-xor-box-xy w x y width height linewidth)} \\
-{\tt \hspace*{0.5in} (window-draw-box w offset:vector size:vector linewidth)} \\
-{\tt \hspace*{0.5in} (window-draw-box-corners w x1 y1 x2 y2 linewidth)} \\
- \hspace*{1.0in} where {\tt (x1 y1)} and {\tt (x2 y2)} are opposite corners. \\
-{\tt \hspace*{0.5in} (window-draw-rcbox-xy w x y width height radius linewidth)} \\
+\texttt{\hspace*{0.5in} (window-draw-box-xy w x y width height linewidth)} \\
+\texttt{\hspace*{0.5in} (window-xor-box-xy w x y width height linewidth)} \\
+\texttt{\hspace*{0.5in} (window-draw-box w offset:vector size:vector linewidth)} \\
+\texttt{\hspace*{0.5in} (window-draw-box-corners w x1 y1 x2 y2 linewidth)} \\
+ \hspace*{1.0in} where \texttt{(x1 y1)} and \texttt{(x2 y2)} are opposite corners. \\
+\texttt{\hspace*{0.5in} (window-draw-rcbox-xy w x y width height radius linewidth)} \\
  \hspace*{1.0in} draws a box with rounded corners.
 
-{\tt \hspace*{0.5in} (window-draw-arc-xy w x y radiusx radiusy anglea angleb linewidth)}
+\texttt{\hspace*{0.5in} (window-draw-arc-xy w x y radiusx radiusy anglea angleb linewidth)}
 
 \vspace{-0.1in}
-{\tt anglea} is the angle, in degrees, at which the arc is started.
-{\tt angleb} is the angle, in degrees, that specifies the amount of arc
+\texttt{anglea} is the angle, in degrees, at which the arc is started.
+\texttt{angleb} is the angle, in degrees, that specifies the amount of arc
 to be drawn, counterclockwise from the starting position.
 
 \vspace{0.1in}
-{\tt \hspace*{0.5in} (window-draw-circle-xy w x y radius linewidth)} \\
-{\tt \hspace*{0.5in} (window-draw-circle w center:vector radius linewidth)} \\
-{\tt \hspace*{0.5in} (window-draw-ellipse-xy w x y radiusx radiusy linewidth)} \\
-{\tt \hspace*{0.5in} (window-draw-dot-xy w x y)}
+\texttt{\hspace*{0.5in} (window-draw-circle-xy w x y radius linewidth)} \\
+\texttt{\hspace*{0.5in} (window-draw-circle w center:vector radius linewidth)} \\
+\texttt{\hspace*{0.5in} (window-draw-ellipse-xy w x y radiusx radiusy linewidth)} \\
+\texttt{\hspace*{0.5in} (window-draw-dot-xy w x y)}
 
 \vspace{0.1in}
-{\tt \hspace*{0.5in} (window-erase-area-xy w left bottom width height)} \\
-{\tt \hspace*{0.5in} (window-erase-area w offset:vector size:vector)} \\
-{\tt \hspace*{0.5in} (window-copy-area-xy w fromx fromy	tox toy width height)} \\
-{\tt \hspace*{0.5in} (window-invert-area w offset:vector size:vector)} \\
-{\tt \hspace*{0.5in} (window-invert-area-xy w left bottom width height)}
+\texttt{\hspace*{0.5in} (window-erase-area-xy w left bottom width height)} \\
+\texttt{\hspace*{0.5in} (window-erase-area w offset:vector size:vector)} \\
+\texttt{\hspace*{0.5in} (window-copy-area-xy w fromx fromy	tox toy width height)} \\
+\texttt{\hspace*{0.5in} (window-invert-area w offset:vector size:vector)} \\
+\texttt{\hspace*{0.5in} (window-invert-area-xy w left bottom width height)}
 
 \vspace{0.1in}
-{\tt \hspace*{0.5in} (window-printat-xy w s x y)} \\
-{\tt \hspace*{0.5in} (window-printat w s at:vector)} \\
-{\tt \hspace*{0.5in} (window-prettyprintat-xy w s x y)} \\
-{\tt \hspace*{0.5in} (window-prettyprintat w s at:vector)} \\
+\texttt{\hspace*{0.5in} (window-printat-xy w s x y)} \\
+\texttt{\hspace*{0.5in} (window-printat w s at:vector)} \\
+\texttt{\hspace*{0.5in} (window-prettyprintat-xy w s x y)} \\
+\texttt{\hspace*{0.5in} (window-prettyprintat w s at:vector)} \\
 
 \vspace{-0.1in}
-The argument {\tt s} is printed at the specified position.
-{\tt s} is stringified if necessary.
+The argument \texttt{s} is printed at the specified position.
+\texttt{s} is stringified if necessary.
 Currently, the pretty-print versions are the same as the plain versions.
 
 \vspace{0.1in}
-{\tt \hspace*{0.5in} (window-draw-border w)} draws a border just
+\texttt{\hspace*{0.5in} (window-draw-border w)} draws a border just
 inside a window.
 
 \section{Fonts, Operations, Colors}
 
-{\tt \hspace*{0.5in} (window-set-font w font)}
+\texttt{\hspace*{0.5in} (window-set-font w font)}
 
 \vspace{-0.1in}
-The font symbols that are currently defined are {\tt courier-bold-12},
-{\tt 8x10}, and {\tt 9x15} .  The global variable {\tt *window-fonts*}
+The font symbols that are currently defined are \texttt{courier-bold-12},
+\texttt{8x10}, and \texttt{9x15} .  The global variable \texttt{*window-fonts*}
 contains correspondences between font symbols and font strings.
 A font string may also be specified instead of a font symbol.
 
-{\tt \hspace*{0.5in} (window-string-width w s)} \\
-{\tt \hspace*{0.5in} (window-string-extents w s)} \\
-These give the width and the vertical size {\tt (ascent descent)} in pixels
-of the specified string {\tt s} using the font of the specified window.
-{\tt s} is stringified if necessary.
+\texttt{\hspace*{0.5in} (window-string-width w s)} \\
+\texttt{\hspace*{0.5in} (window-string-extents w s)} \\
+These give the width and the vertical size \texttt{(ascent descent)} in pixels
+of the specified string \texttt{s} using the font of the specified window.
+\texttt{s} is stringified if necessary.
 
 Operations on a window other than direct drawing are performed by
 setting a condition for the window, performing the operation, and then
-unsetting the condition with {\tt window-unset}.  {\tt window-reset}
+unsetting the condition with \texttt{window-unset}.  \texttt{window-reset}
 will reset a window to its ``standard'' setting; it is useful primarily
 for cases in which a program bug causes window settings to be in an
 undesired state.
 
 \vspace{-0.1in}
-{\tt \hspace*{0.5in} (window-set-xor w)} \\
-{\tt \hspace*{0.5in} (window-set-erase w)} \\
-{\tt \hspace*{0.5in} (window-set-copy w)} \\
-{\tt \hspace*{0.5in} (window-set-invert w)} \\
-{\tt \hspace*{0.5in} (window-unset w)} \\
-{\tt \hspace*{0.5in} (window-reset w)} \\
+\texttt{\hspace*{0.5in} (window-set-xor w)} \\
+\texttt{\hspace*{0.5in} (window-set-erase w)} \\
+\texttt{\hspace*{0.5in} (window-set-copy w)} \\
+\texttt{\hspace*{0.5in} (window-set-invert w)} \\
+\texttt{\hspace*{0.5in} (window-unset w)} \\
+\texttt{\hspace*{0.5in} (window-reset w)} \\
 
-{\tt \hspace*{0.5in} (window-set-line-width w width)} \\
-{\tt \hspace*{0.5in} (window-set-line-attr w width \&optional line-style cap-style join-style)} \\
-{\tt \hspace*{0.5in} (window-std-line-attr w)} \\
+\texttt{\hspace*{0.5in} (window-set-line-width w width)} \\
+\texttt{\hspace*{0.5in} (window-set-line-attr w width \&optional line-style cap-style join-style)} \\
+\texttt{\hspace*{0.5in} (window-std-line-attr w)} \\
 
-{\tt \hspace*{0.5in} (window-foreground w)} \\
-{\tt \hspace*{0.5in} (window-set-foreground w fg-color)} \\
-{\tt \hspace*{0.5in} (window-background w)} \\
-{\tt \hspace*{0.5in} (window-set-background w bg-color)} \\
+\texttt{\hspace*{0.5in} (window-foreground w)} \\
+\texttt{\hspace*{0.5in} (window-set-foreground w fg-color)} \\
+\texttt{\hspace*{0.5in} (window-background w)} \\
+\texttt{\hspace*{0.5in} (window-set-background w bg-color)} \\
 
 
 \subsection{Color}
@@ -551,58 +552,58 @@
 The color of the foreground (things that are drawn, such as lines or
 characters) is set by:
 
-{\tt \hspace*{0.5in} (window-set-color w rgb \&optional background)} \\
+\texttt{\hspace*{0.5in} (window-set-color w rgb \&optional background)} \\
 
-{\tt rgb} is a list {\tt (red green blue)} of 16-bit unsigned integers in
-the range {\tt 0} to {\tt 65535}.  {\tt background} is non-{\tt nil}
-to set the background color rather than the foreground color.
+\texttt{rgb} is a list \texttt{(red green blue)} of 16-bit unsigned integers in
+the range \texttt{0} to \texttt{65535}.  \texttt{background} is
+non-\texttt{nil} to set the background color rather than the foreground color.
 
 Colors are a scarce resource; there is only a finite number of
 available colors, such as 256 colors.  If you only use a small, fixed set
 of colors, the finite set of colors will not be a problem.  However,
 if you create a lot of colors that are used only briefly, it will be
 necessary to release them after they are no longer needed.
-{\tt window-set-color} will leave the global variable {\tt *window-xcolor*}
-set to an integer value that denotes an X color; this value should be
-saved and used as the argument to {\tt window-free-color} to release
-the color after it is no longer needed.
+\texttt{window-set-color} will leave the global variable
+\texttt{*window-xcolor*} set to an integer value that denotes an X color; this
+value should be saved and used as the argument to \texttt{window-free-color}
+to release the color after it is no longer needed.
 
-{\tt \hspace*{0.5in} (window-free-color w \&optional xcolor)} \\
+\texttt{\hspace*{0.5in} (window-free-color w \&optional xcolor)} \\
 
-{\tt window-free-color} frees either the last color used, as given by
-{\tt *window-xcolor*}, or the specified color.
+\texttt{window-free-color} frees either the last color used, as given by
+\texttt{*window-xcolor*}, or the specified color.
 
 
 \subsection{Character Input} \label{texted}
 
 Characters can be input within a window by the call:
 
-{\tt \hspace*{0.5in} (window-input-string w str x y \&optional size)} \\
+\texttt{\hspace*{0.5in} (window-input-string w str x y \&optional size)} \\
 
-{\tt window-input-string} will print the initial string {\tt str},
-if non-{\tt nil},
-at the specified position in the window; {\tt str}, if not modified
+\texttt{window-input-string} will print the initial string \texttt{str},
+if non-\texttt{nil},
+at the specified position in the window; \texttt{str}, if not modified
 by the user, will also be the initial part of the result.  A caret
 is displayed showing the location of the next input character.
 Characters are echoed as they are typed; backspacing erases characters,
-including those from the initial string {\tt str}.  An area of width
-{\tt size} (default 100) is erased to the right of the initial caret.
+including those from the initial string \texttt{str}.  An area of width
+\texttt{size} (default 100) is erased to the right of the initial caret.
 
 
 \subsection{Emacs-like Editing} \label{emacsed}
 
-{\tt window-edit} allows editing of text using an Emacs-subset editor.
+\texttt{window-edit} allows editing of text using an Emacs-subset editor.
 Only a few simple Emacs commands are implemented.
 \begin{verbatim}
    (window-edit w x y width height &optional strings boxflg scroll endp)
 \end{verbatim}
-{\tt x y width height} specify the offset and size of the editing
+\texttt{x y width height} specify the offset and size of the editing
 area; it is a good idea to draw a box around this area first.
-{\tt strings} is an initial list of strings; the return value is a list
+\texttt{strings} is an initial list of strings; the return value is a list
 of strings.
-{\tt scroll} is number of lines to scroll down before displaying text,
-          or {\tt T} to have one line only and terminate on return.
-{\tt endp} is {\tt T} to begin editing at the end of the first line.
+\texttt{scroll} is number of lines to scroll down before displaying text,
+          or \texttt{T} to have one line only and terminate on return.
+\texttt{endp} is \texttt{T} to begin editing at the end of the first line.
 Example:
 \begin{verbatim}
   (window-draw-box-xy myw 48 48 204 204)
@@ -612,130 +613,132 @@
 
 \section{Mouse Interaction}
 
-{\tt \hspace*{0.5in} (window-get-point w)} \\
-{\tt \hspace*{0.5in} (window-get-crosshairs w)} \\
-{\tt \hspace*{0.5in} (window-get-cross w)} \\
-These functions  get a point position by mouse click; they return {\tt (x y)} .
+\texttt{\hspace*{0.5in} (window-get-point w)} \\
+\texttt{\hspace*{0.5in} (window-get-crosshairs w)} \\
+\texttt{\hspace*{0.5in} (window-get-cross w)} \\
+These functions  get a point position by mouse click; they return
+\texttt{(x y)}.
 
 The following function gets a point position by mouse click.  It returns
-{\tt (button (x y))} where {\tt button} is {\tt 1} for the left button,
-{\tt 2} for middle, {\tt 3} for right.
+\texttt{(button (x y))} where \texttt{button} is \texttt{1} for the left
+button, \texttt{2} for middle, \texttt{3} for right.
 
-{\tt \hspace*{0.5in} (window-get-click w)} \\
+\texttt{\hspace*{0.5in} (window-get-click w)} \\
 
 The following function gets a point position by mouse click within a specified
-region.  It returns {\tt (button (x y))} or {\tt NIL} if the mouse leaves
-the region.  If {\tt boxflg} is {\tt t}, a box will be drawn outside the
+region.  It returns \texttt{(button (x y))} or \texttt{NIL} if the mouse leaves
+the region.  If \texttt{boxflg} is \texttt{t}, a box will be drawn outside the
 region while the mouse is being tracked.
 
-{\tt \hspace*{0.5in} (window-track-mouse-in-region w x y sizex sizey \&optional boxflg)} \\
+\texttt{\hspace*{0.5in} (window-track-mouse-in-region w x y sizex sizey \&optional boxflg)} \\
 
 
 The following functions get a point position indicated by drawing a line
 from a specified origin position to the cursor position; they return
-{\tt (x y)} at the cursor position when a mouse button is clicked.
-The {\tt latex} version restricts the slope of the line to be a slope that
-\LaTeX \ can draw; if {\tt flg} is non-{\tt nil}, the slope is restricted
-to be a \LaTeX \ {\tt vector} slope.
+\texttt{(x y)} at the cursor position when a mouse button is clicked.
+The \texttt{latex} version restricts the slope of the line to be a slope that
+\LaTeX \ can draw; if \texttt{flg} is non-\texttt{nil}, the slope is restricted
+to be a \LaTeX \ \texttt{vector} slope.
 
-{\tt \hspace*{0.5in} (window-get-line-position w orgx orgy)} \\
-{\tt \hspace*{0.5in} (window-get-latex-position w orgx orgy flg)} \\
+\texttt{\hspace*{0.5in} (window-get-line-position w orgx orgy)} \\
+\texttt{\hspace*{0.5in} (window-get-latex-position w orgx orgy flg)} \\
 
-The following function gets a position by moving a ``ghost'' icon,
-defined by the icon drawing function {\tt fn}.  This allows exact positioning
+The following function gets a position by moving a ``ghost'' icon, defined
+by the icon drawing function \texttt{fn}.  This allows exact positioning
 of an object by the user.
 
-{\tt \hspace*{0.5in} (window-get-icon-position w fn args \&optional (dx 0)
+\texttt{\hspace*{0.5in} (window-get-icon-position w fn args \&optional (dx 0)
  (dy 0))} \\
 
 \vspace{-0.15in}
-The function {\tt fn} has arguments {\tt (fn w x y . args)} , where {\tt x}
-and {\tt y} are the offset within the window {\tt w} at which the icon is
-to be drawn, and {\tt args} is a list of arbitrary arguments, e.g., the size
-of the icon, that are passed through to the drawing function.
-The icon is drawn in {\tt xor} mode, so it must be drawn using
+The function \texttt{fn} has arguments \texttt{(fn w x y . args)} , where
+\texttt{x} and \texttt{y} are the offset within the window \texttt{w} at which
+the icon is to be drawn, and \texttt{args} is a list of arbitrary arguments,
+e.g., the size of the icon, that are passed through to the drawing function.
+The icon is drawn in \texttt{xor} mode, so it must be drawn using
 only ``plain'' drawing functions, without resetting window attributes.
-The returned value is {\tt (x y)} at the cursor position when a button
-is clicked.  {\tt dx} and {\tt dy}, if specified, are offsets of {\tt x}
-and {\tt y} from the cursor position.
+The returned value is \texttt{(x y)} at the cursor position when a button
+is clicked.  \texttt{dx} and \texttt{dy}, if specified, are offsets of
+\texttt{x} and \texttt{y} from the cursor position.
 
 The following function gets a position by moving a ``ghost'' box icon.
 
-{\tt \hspace*{0.5in} (window-get-box-position w width height \&optional (dx 0) (dy 0))} \\
+\texttt{\hspace*{0.5in} (window-get-box-position w width height \&optional (dx 0) (dy 0))} \\
 
 \vspace{-0.15in}
 By default, the lower-left corner of the box is placed at the cursor position;
-{\tt dx} and {\tt dy} may be used to offset the box from the cursor, e.g.,
-to move the box by a different corner.  The returned value is {\tt (x y)}
-at the cursor position when a button is clicked.
+\texttt{dx} and \texttt{dy} may be used to offset the box from the cursor,
+e.g., to move the box by a different corner.  The returned value is
+\texttt{(x y)} at the cursor position when a button is clicked.
 
 The following function gets coordinates of a box of arbitrary size and
 position.
 
-{\tt \hspace*{0.5in} (window-get-region w)} \\
+\texttt{\hspace*{0.5in} (window-get-region w)} \\
 
 \vspace{-0.15in}
 The user first clicks for one corner of the box, moves the
 mouse and clicks again for the opposite corner, then moves the box into
 the desired position. The returned value is \linebreak
-{\tt ((x y) (width height))},
-where {\tt (x y)} is the lower-left corner of the box.
+\texttt{((x y) (width height))},
+where \texttt{(x y)} is the lower-left corner of the box.
 
 The following function gets the size of a box by mouse selection,
-echoing the size in pixels below the box.  {\tt offsety}
-should be at least {\tt 30} to leave room to display the size of the box.
+echoing the size in pixels below the box.  \texttt{offsety}
+should be at least \texttt{30} to leave room to display the size of the box.
 
-{\tt \hspace*{0.5in} (window-get-box-size w offsetx offsety)} \\
+\texttt{\hspace*{0.5in} (window-get-box-size w offsetx offsety)} \\
 
 
 The following function adjusts one side of a box.
 
-{\tt \hspace*{0.5in} (window-adjust-box-side w x y width height side)} \\
+\texttt{\hspace*{0.5in} (window-adjust-box-side w x y width height side)} \\
 
 \vspace{-0.15in}
-{\tt side} specifies the side of the box to be adjusted: {\tt left},
-{\tt right}, {\tt top}, or {\tt bottom}.  The result is
-{\tt ((x y) (width height))} for the resulting box.
+\texttt{side} specifies the side of the box to be adjusted: \texttt{left},
+\texttt{right}, \texttt{top}, or \texttt{bottom}.  The result is
+\texttt{((x y) (width height))} for the resulting box.
 
-{\tt \hspace*{0.5in} (window-get-circle w \&optional center:vector)} \\
-{\tt \hspace*{0.5in} (window-get-ellipse w \&optional center:vector)} \\
+\texttt{\hspace*{0.5in} (window-get-circle w \&optional center:vector)} \\
+\texttt{\hspace*{0.5in} (window-get-ellipse w \&optional center:vector)} \\
 These functions interactively get a circle or ellipse.  For an ellipse,
 a circle is gotten first for the horizontal size; then the vertical
 size of the ellipse is adjusted.
-{\tt window-get-circle} returns {\tt ((x y) radius)}.
-{\tt window-get-ellipse} returns {\tt ((x y) (xradius yradius))}.
+\texttt{window-get-circle} returns \texttt{((x y) radius)}.
+\texttt{window-get-ellipse} returns \texttt{((x y) (xradius yradius))}.
 
-% {\tt \hspace*{0.5in} (window-sync w)} will clear the event queue of any
+% \texttt{\hspace*{0.5in} (window-sync w)} will clear the event queue of any
 % previous motion events.
 
-{\tt window-track-mouse} is the basic function for following the mouse
+\texttt{window-track-mouse} is the basic function for following the mouse
 and performing some action as it moves.  This function is used in
 the implementation of menus and the mouse-interaction functions described in
 this section.
 
-{\tt \hspace*{0.5in} (window-track-mouse w fn \&optional outflg)}
+\texttt{\hspace*{0.5in} (window-track-mouse w fn \&optional outflg)}
           
 \vspace{-0.05in}
 Each time the mouse position changes or a mouse button is pressed,
-the function {\tt fn} is called with
-arguments {\tt (x y code)} where {\tt x} and {\tt y} are the cursor
-position, {\tt code} is a button code ({\tt 0} if no button, {\tt 1} for
-the left button, {\tt 2} for the middle button, or {\tt 3} for the right
-button).  {\tt window-track-mouse} continues to track the mouse until {\tt fn}
-returns a value other than {\tt nil}, at which time {\tt window-track-mouse}
-returns that value.  Usually, it is a good idea for {\tt fn} to return a
-value other than {\tt nil} upon a mouse click.  If the argument {\tt outflg}
-is non-{\tt nil}, the function {\tt fn} will be called for button clicks
-outside the window {\tt w}; note, however, that such clicks will not be
-seen if the containing window intercepts them, so that this feature will
-work only if the window {\tt w} is inside another Lisp user window.
+the function \texttt{fn} is called with arguments
+\texttt{(x y code)} where \texttt{x} and \texttt{y} are the cursor position,
+\texttt{code} is a button code (\texttt{0} if no button, \texttt{1} for
+the left button, \texttt{2} for the middle button, or \texttt{3} for the right
+button).  \texttt{window-track-mouse} continues to track the mouse until
+\texttt{fn} returns a value other than \texttt{nil}, at which time
+\texttt{window-track-mouse} returns that value.  Usually, it is a good idea
+for \texttt{fn} to return a value other than \texttt{nil} upon a mouse click.
+If the argument \texttt{outflg} is non-\texttt{nil}, the function \texttt{fn}
+will be called for button clicks outside the window \texttt{w}; note, however,
+that such clicks will not be seen if the containing window intercepts them, so
+that this feature will work only if the window \texttt{w} is inside another
+Lisp user window.
 
 
 \section{Miscellaneous Functions}
 
-{\tt \hspace*{0.5in} (stringify x)} makes its argument into a string.
+\texttt{\hspace*{0.5in} (stringify x)} makes its argument into a string.
 
-{\tt \hspace*{0.5in} (window-destroy-selected-window)} waits 3 seconds,
+\texttt{\hspace*{0.5in} (window-destroy-selected-window)} waits 3 seconds,
 then destroys the window containing the mouse cursor.  This function
 should be used with care; it can destroy a non-user window, causing
 processes associated with the window to be destroyed.  It is useful
@@ -746,7 +749,7 @@
 \section{Examples}
 
 Several interactive programs using this software for their graphical
-interface can be found at {\tt http://www.cs.utexas.edu/users/novak/}
+interface can be found at \texttt{http://www.cs.utexas.edu/users/novak/}
 under the heading Software Demos.
 
 
@@ -756,31 +759,31 @@
 a web page.  There are two approaches, either using an X server on
 the computer of the person viewing the web page, or using WeirdX, a
 Java program that emulates an X server.  Details can be found at:
-{\tt http://www.cs.utexas.edu/users/novak/dwindow.html} 
+\texttt{http://www.cs.utexas.edu/users/novak/dwindow.html} 
 
 
 \section{Files}
 
 \begin{tabular}{ll}
-{\tt dec.copyright}  & Copyright and license for DEC/MIT files \\
-{\tt draw.lsp}       & GLISP source code for interactive drawing utility \\
-{\tt drawtrans.lsp}  & {\tt draw.lsp} translated into plain Lisp \\
-{\tt draw-gates.lsp} & Code to draw {\tt nand} gates etc. \\
-{\tt dwdoc.tex}      & \LaTeX \ source for this document \\
-{\tt dwexports.lsp}  & exported symbols \\
-{\tt dwimportsb.lsp} & imported symbols \\
-{\tt dwindow.lsp}    & GLISP source code for {\tt dwindow} functions \\
-{\tt dwtest.lsp}     & Examples of use of {\tt dwindow} functions \\
-{\tt dwtrans.lsp}    & {\tt dwindow.lsp} translated into plain Lisp \\
-{\tt editors.lsp}    & Editors for colors etc. \\
-{\tt editorstrans.lsp}    & translation of {\tt editors.lsp} \\
-{\tt gnu.license}    & GNU General Public License \\
-{\tt ice-cream.lsp}  & Drawing of an ice cream cone made with {\tt draw} \\
-{\tt lispserver.lsp} & Example web demo: a Lisp server \\
-{\tt lispservertrans.lsp}    & translation of {\tt lispserver.lsp} \\
-{\tt menu-set.lsp}   & GLISP source code for menu-set functions \\
-{\tt menu-settrans.lsp}   & translation of {\tt menu-set.lsp} \\
-{\tt pcalc.lsp}      & Pocket calculator implemented as a {\tt picmenu} \\
+\texttt{dec.copyright}  & Copyright and license for DEC/MIT files \\
+\texttt{draw.lsp}       & GLISP source code for interactive drawing utility \\
+\texttt{drawtrans.lsp}  & \texttt{draw.lsp} translated into plain Lisp \\
+\texttt{draw-gates.lsp} & Code to draw \texttt{nand} gates etc. \\
+\texttt{dwdoc.tex}      & \LaTeX \ source for this document \\
+\texttt{dwexports.lsp}  & exported symbols \\
+\texttt{dwimportsb.lsp} & imported symbols \\
+\texttt{dwindow.lsp}    & GLISP source code for \texttt{dwindow} functions \\
+\texttt{dwtest.lsp}     & Examples of use of \texttt{dwindow} functions \\
+\texttt{dwtrans.lsp}    & \texttt{dwindow.lsp} translated into plain Lisp \\
+\texttt{editors.lsp}    & Editors for colors etc. \\
+\texttt{editorstrans.lsp}    & translation of \texttt{editors.lsp} \\
+\texttt{gnu.license}    & GNU General Public License \\
+\texttt{ice-cream.lsp}  & Drawing of an ice cream cone made with \texttt{draw} \\
+\texttt{lispserver.lsp} & Example web demo: a Lisp server \\
+\texttt{lispservertrans.lsp}    & translation of \texttt{lispserver.lsp} \\
+\texttt{menu-set.lsp}   & GLISP source code for menu-set functions \\
+\texttt{menu-settrans.lsp}   & translation of \texttt{menu-set.lsp} \\
+\texttt{pcalc.lsp}      & Pocket calculator implemented as a \texttt{picmenu} \\
 \end{tabular}
 
 

gcl-2.6.8-loginname.patch:

--- NEW FILE gcl-2.6.8-loginname.patch ---
diff -dur gcl-2.6.8.ORIG/o/unixfsys.c gcl-2.6.8/o/unixfsys.c
--- gcl-2.6.8.ORIG/o/unixfsys.c	2008-12-29 17:42:18.000000000 -0700
+++ gcl-2.6.8/o/unixfsys.c	2008-12-29 17:51:35.000000000 -0700
@@ -214,7 +214,7 @@
     
 #ifndef NO_PWD_H  
   if(namestring->st.st_self[0]=='~')
-    {char name[20];
+    {char name[LOGIN_NAME_MAX];
      int n;
      char *q = namestring->st.st_self;
 #ifndef __STDC__
@@ -224,8 +224,7 @@
 
      struct passwd *pwent;
      int m=0;
-     q=namestring->st.st_self;
-     for (n=0; n< namestring->st.st_fillp; n++)
+     for (n=1; n< namestring->st.st_fillp; n++)
        if (q[n]=='/') break;
      bcopy(q+1,name,n-1);
      name[n-1]= 0;

gcl-2.6.8-rename.patch:

--- NEW FILE gcl-2.6.8-rename.patch ---
diff -dur gcl-2.6.8.ORIG/o/unixfsys.c gcl-2.6.8/o/unixfsys.c
--- gcl-2.6.8.ORIG/o/unixfsys.c	2007-04-06 08:41:09.000000000 -0600
+++ gcl-2.6.8/o/unixfsys.c	2008-12-29 17:34:10.000000000 -0700
@@ -448,11 +448,17 @@
 backup_fopen(char *filename, char *option)
 {
 	char backupfilename[MAXPATHLEN];
+#ifndef HAVE_RENAME
 	char command[MAXPATHLEN * 2];
+#endif
 
 	strcat(strcpy(backupfilename, filename), ".BAK");
+#ifdef HAVE_RENAME
+	rename(filename, backupfilename);
+#else
 	sprintf(command, "mv %s %s", filename, backupfilename);
 	system(command);
+#endif
 	return(fopen(filename, option));
 }
 
@@ -477,6 +483,9 @@
 {
 	char filename[MAXPATHLEN];
 	char newfilename[MAXPATHLEN];
+#ifndef HAVE_RENAME
+	char command[MAXPATHLEN * 2];
+#endif
 
 	check_arg(2);
 	check_type_or_pathname_string_symbol_stream(&vs_base[0]);

gcl-2.6.8-selinux.patch:

--- NEW FILE gcl-2.6.8-selinux.patch ---
diff -durN gcl-2.6.8.ORIG/clcs/makefile gcl-2.6.8/clcs/makefile
--- gcl-2.6.8.ORIG/clcs/makefile	2005-05-06 15:56:55.000000000 -0600
+++ gcl-2.6.8/clcs/makefile	2009-01-09 17:43:02.000000000 -0700
@@ -9,6 +9,9 @@
 
 saved_clcs_gcl: ../unixport/saved_pcl_gcl
 	echo '(load "package.lisp")(load "myload.lisp")(si::save-system "$@")' | $< $(<D)/
+	if [ -x /usr/sbin/selinuxenabled ] && /usr/sbin/selinuxenabled; then \
+		chcon -t gcl_exec_t $@; \
+	fi
 
 %.h %.data %.c : %.lisp saved_clcs_gcl
 	cp ../h/cmpinclude.h .
@@ -31,6 +34,9 @@
 
 saved_full_gcl: ${LISP}
 	echo '(load "package.lisp")(load "loading.lisp")(jamie-load-clcs :compiled)(system::save-system "saved_full_gcl")' | ${LISP}
+	if [ -x /usr/sbin/selinuxenabled ] && /usr/sbin/selinuxenabled; then \
+		chcon -t gcl_exec_t $@; \
+	fi
 
 clean:
 	rm -f *.o *.fn saved_full_gcl$(EXE) saved_full_gcl cmpinclude.h *.c *.h *.data saved_clcs_gcl
diff -durN gcl-2.6.8.ORIG/makefile gcl-2.6.8/makefile
--- gcl-2.6.8.ORIG/makefile	2007-11-30 09:59:33.000000000 -0700
+++ gcl-2.6.8/makefile	2009-01-09 17:43:02.000000000 -0700
@@ -187,6 +187,9 @@
 	if gcc --version | grep -i mingw >/dev/null 2>&1 ; then if grep -i oncrpc makedefs >/dev/null 2>&1 ; then cp /mingw/bin/oncrpc.dll $(DESTDIR)$(INSTALL_LIB_DIR)/$(PORTDIR); fi ; fi
 	cd $(DESTDIR)$(INSTALL_LIB_DIR)/$(PORTDIR) && \
 		mv $(FLISP)$(EXE) temp$(EXE) && \
+		if [ -x /usr/sbin/selinuxenabled ] && /usr/sbin/selinuxenabled; then \
+			chcon -t gcl_exec_t temp$(EXE); \
+		fi && \
 		echo '(reset-sys-paths "$(INSTALL_LIB_DIR)/")(si::save-system "$(FLISP)$(EXE)")' | ./temp$(EXE) && \
 		rm -f temp$(EXE)
 	if [ -e "unixport/rsym$(EXE)" ] ; then cp unixport/rsym$(EXE) $(DESTDIR)$(INSTALL_LIB_DIR)/unixport/ ; fi
diff -durN gcl-2.6.8.ORIG/selinux/gcl.fc gcl-2.6.8/selinux/gcl.fc
--- gcl-2.6.8.ORIG/selinux/gcl.fc	1969-12-31 17:00:00.000000000 -0700
+++ gcl-2.6.8/selinux/gcl.fc	2009-01-09 17:43:02.000000000 -0700
@@ -0,0 +1,2 @@
+/usr/lib64/gcl-[^/]+/unixport/saved_.*	--	gen_context(system_u:object_r:gcl_exec_t,s0)
+/usr/lib/gcl-[^/]+/unixport/saved_.*	--	gen_context(system_u:object_r:gcl_exec_t,s0)
diff -durN gcl-2.6.8.ORIG/selinux/gcl.if gcl-2.6.8/selinux/gcl.if
--- gcl-2.6.8.ORIG/selinux/gcl.if	1969-12-31 17:00:00.000000000 -0700
+++ gcl-2.6.8/selinux/gcl.if	2009-01-09 17:43:02.000000000 -0700
@@ -0,0 +1,146 @@
+
+## <summary>policy for gcl</summary>
+
+########################################
+## <summary>
+##	Execute a domain transition to run gcl.
+## </summary>
+## <param name="domain">
+## <summary>
+##	Domain allowed to transition.
+## </summary>
+## </param>
+#
+interface(`gcl_domtrans',`
+	gen_require(`
+		type gcl_t;
+                type gcl_exec_t;
+	')
+
+	domtrans_pattern($1,gcl_exec_t,gcl_t)
+')
+
+
+########################################
+## <summary>
+##	Do not audit attempts to read, 
+##	gcl tmp files
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain to not audit.
+##	</summary>
+## </param>
+#
+interface(`gcl_dontaudit_read_tmp_files',`
+	gen_require(`
+		type gcl_tmp_t;
+	')
+
+	dontaudit $1 gcl_tmp_t:file read_file_perms;
+')
+
+########################################
+## <summary>
+##	Allow domain to read, gcl tmp files
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain to not audit.
+##	</summary>
+## </param>
+#
+interface(`gcl_read_tmp_files',`
+	gen_require(`
+		type gcl_tmp_t;
+	')
+
+	allow $1 gcl_tmp_t:file read_file_perms;
+')
+
+########################################
+## <summary>
+##	Allow domain to manage gcl tmp files
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain to not audit.
+##	</summary>
+## </param>
+#
+interface(`gcl_manage_tmp',`
+	gen_require(`
+		type gcl_tmp_t;
+	')
+
+         manage_dirs_pattern($1,gcl_tmp_t,gcl_tmp_t)
+         manage_files_pattern($1,gcl_tmp_t,gcl_tmp_t)
+         manage_lnk_files_pattern($1,gcl_tmp_t,gcl_tmp_t)
+')
+
+########################################
+## <summary>
+##	Execute gcl in the gcl domain, and
+##	allow the specified role the gcl domain.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain allowed access
+##	</summary>
+## </param>
+## <param name="role">
+##	<summary>
+##	The role to be allowed the gcl domain.
+##	</summary>
+## </param>
+## <param name="terminal">
+##	<summary>
+##	The type of the role's terminal.
+##	</summary>
+## </param>
+#
+interface(`gcl_run',`
+	gen_require(`
+		type gcl_t;
+	')
+
+	gcl_domtrans($1)
+	role $2 types gcl_t;
+	dontaudit gcl_t $3:chr_file rw_term_perms;
+')
+
+
+########################################
+## <summary>
+##	All of the rules required to administrate 
+##	an gcl environment
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain allowed access.
+##	</summary>
+## </param>
+## <param name="role">
+##	<summary>
+##	The role to be allowed to manage the gcl domain.
+##	</summary>
+## </param>
+## <param name="terminal">
+##	<summary>
+##	The type of the user terminal.
+##	</summary>
+## </param>
+## <rolecap/>
+#
+interface(`gcl_admin',`
+	gen_require(`
+		type gcl_t;
+	')
+
+	allow $1 gcl_t:process { ptrace signal_perms getattr };
+	read_files_pattern($1, gcl_t, gcl_t)
+	        
+
+	gcl_manage_tmp($1)
+
+')
diff -durN gcl-2.6.8.ORIG/selinux/gcl.te gcl-2.6.8/selinux/gcl.te
--- gcl-2.6.8.ORIG/selinux/gcl.te	1969-12-31 17:00:00.000000000 -0700
+++ gcl-2.6.8/selinux/gcl.te	2009-01-09 17:43:07.000000000 -0700
@@ -0,0 +1,50 @@
+policy_module(gcl,1.0.0)
+
+########################################
+#
+# Declarations
+#
+
+type gcl_t;
+type gcl_exec_t;
+application_domain(gcl_t, gcl_exec_t)
+role system_r types gcl_t;
+
+########################################
+#
+# gcl local policy
+#
+
+## internal communication is often done using fifo and unix sockets.
+allow gcl_t self:fifo_file rw_file_perms;
+allow gcl_t self:unix_stream_socket create_stream_socket_perms;
+
+libs_use_ld_so(gcl_t)
+libs_use_shared_libs(gcl_t)
+
+miscfiles_read_localization(gcl_t)
+
+## The GCL memory management and executable dumping routines manipulate memory
+## in various (usually forbidden) ways.
+allow gcl_t self:memprotect mmap_zero;
+allow gcl_t self:process { execmem execheap };
+
+unconfined_domain(gcl_t)
+
+optional_policy(`
+	gen_require(`
+		type unconfined_t;
+		type unconfined_devpts_t;
+		type unconfined_execmem_t;  # Remove this later; see below
+		type unconfined_tty_device_t;
+		role unconfined_r;
+	')
+
+	gcl_run(unconfined_t, unconfined_r, { unconfined_tty_device_t unconfined_devpts_t })
+	allow gcl_t gcl_exec_t:file execmod;
+
+	# Some versions of selinux-policy-targeted, released between November
+	# 2008 and early January 2009, give /usr/bin/gcl type execmem_exec_t.
+	# Remove this once those versions are dead and buried.
+	allow unconfined_execmem_t gcl_exec_t:file execmod;
+')
diff -durN gcl-2.6.8.ORIG/unixport/makefile gcl-2.6.8/unixport/makefile
--- gcl-2.6.8.ORIG/unixport/makefile	2006-08-23 12:14:22.000000000 -0600
+++ gcl-2.6.8/unixport/makefile	2009-01-09 17:43:02.000000000 -0700
@@ -118,6 +118,9 @@
 	cp init_$*.lsp foo
 	echo " (in-package \"USER\")(system:save-system \"$@\")" >>foo
 	$(PORTDIR)/raw_$*$(EXE) $(PORTDIR)/ -libdir $(GCLDIR)/ < foo
+	if [ -x /usr/sbin/selinuxenabled ] && /usr/sbin/selinuxenabled; then \
+		chcon -t gcl_exec_t $@; \
+	fi
 
 $(RSYM): $(SPECIAL_RSYM) $(HDIR)/mdefs.h
 	$(CC) $(CFLAGS) -I$(HDIR) -I$(ODIR) -o $(RSYM) $(SPECIAL_RSYM)
@@ -157,6 +160,9 @@
 	$(CC) -o raw_$*$(EXE) $(filter %.o,$^) \
 		-L. $(EXTRA_LD_LIBS) $(LD_LIBS_PRE) -l$* $(LD_LIBS_POST)
 endif
+	if [ -x /usr/sbin/selinuxenabled ] && /usr/sbin/selinuxenabled; then \
+		chcon -t gcl_exec_t raw_$*$(EXE); \
+	fi
 #	diff map_$* map_$*.old >/dev/null || (cp map_$* map_$*.old && rm -f $@ && $(MAKE) $@)
 #	cp map_$*.old map_$*
 

gcl-2.6.8-sigprocmask-linux.patch:

--- NEW FILE gcl-2.6.8-sigprocmask-linux.patch ---
diff -dur gcl-2.6.8.ORIG/h/linux.h gcl-2.6.8/h/linux.h
--- gcl-2.6.8.ORIG/h/linux.h	2008-08-01 10:51:43.000000000 -0600
+++ gcl-2.6.8/h/linux.h	2008-12-29 17:14:05.000000000 -0700
@@ -85,13 +85,7 @@
 #define SV_ONSTACK 0
 #endif
 
-/* unblock signals m and n, and set val to signal_mask(m) | signal_mask(n)
-   if they were set */
-#define SIG_UNBLOCK_SIGNALS(val,m,n) \
-    current_mask = sigblock(0);  \
-    sigsetmask(~(sigmask(m)) & ~(sigmask(n)) & current_mask); \
-    result = (current_mask & sigmask(m) ? signal_mask(m) : 0) \
-      | (current_mask & sigmask(n) ? signal_mask(n) : 0);
+#define HAVE_SIGPROCMASK
 
 #define RUN_PROCESS
 

gcl-2.6.8-texinfo.patch:

--- NEW FILE gcl-2.6.8-texinfo.patch ---
diff -dur gcl-2.6.8.ORIG/info/gcl-si.texi gcl-2.6.8/info/gcl-si.texi
--- gcl-2.6.8.ORIG/info/gcl-si.texi	2005-04-30 22:12:37.000000000 -0600
+++ gcl-2.6.8/info/gcl-si.texi	2008-12-29 21:09:53.000000000 -0700
@@ -10,6 +10,7 @@
 
 @c @smallbook
 @setfilename gcl-si.info
+ at settitle GCL SI Manual
 @synindex vr fn
 
 @c to update the menus do: 
diff -dur gcl-2.6.8.ORIG/info/gcl-tk.texi gcl-2.6.8/info/gcl-tk.texi
--- gcl-2.6.8.ORIG/info/gcl-tk.texi	2002-02-19 12:21:19.000000000 -0700
+++ gcl-2.6.8/info/gcl-tk.texi	2008-12-29 21:09:53.000000000 -0700
@@ -2,6 +2,7 @@
 @c -*-texinfo-*-
 @c @smallbook
 @setfilename gcl-tk.info
+ at settitle GCL TK Manual
 
 @c to update the menus do: 
 @c (texinfo-multiple-files-update "gcl-tk.texi" t t)

gcl-2.6.8-unrandomize.patch:

--- NEW FILE gcl-2.6.8-unrandomize.patch ---
diff -dur gcl-2.6.8.ORIG/configure gcl-2.6.8/configure
--- gcl-2.6.8.ORIG/configure	2008-12-29 16:24:30.000000000 -0700
+++ gcl-2.6.8/configure	2008-12-29 16:45:51.000000000 -0700
@@ -9880,9 +9880,11 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
+		    #define CAN_UNRANDOMIZE_SBRK 1
+		    #include "h/unrandomize.h"
 		    void gprof_cleanup() {}
 		    int main(int argc,char *argv[],char *envp[]) {
-	            #include "h/unrandomize.h"
+		    UNRANDOMIZE_SBRK;
 		    return 0;}
 _ACEOF
 rm -f conftest$ac_exeext
@@ -9947,12 +9949,11 @@
 /* end confdefs.h.  */
 
 		    #include <stdio.h>
+		    #include "h/unrandomize.h"
 	            void gprof_cleanup() {}
 		    int main(int argc,char * argv[],char * envp[]) {
 			FILE *f;
-			#ifdef CAN_UNRANDOMIZE_SBRK
-			#include "h/unrandomize.h"
-			#endif
+			UNRANDOMIZE_SBRK;
 			if (!(f=fopen("conftest1","w"))) return -1;
 			fprintf(f,"%u",sbrk(0));
 			return 0;}
@@ -10009,12 +10010,11 @@
 /* end confdefs.h.  */
 
 		    #include <stdio.h>
+		    #include "h/unrandomize.h"
                     void gprof_cleanup() {}
 		    int main(int argc,char * argv[],char * envp[]) {
 			FILE *f;
-			#ifdef CAN_UNRANDOMIZE_SBRK
-			#include "h/unrandomize.h"
-			#endif
+			UNRANDOMIZE_SBRK;
 			if (!(f=fopen("conftest1","w"))) return -1;
 			fprintf(f,"%u",sbrk(0));
 			return 0;}
@@ -10165,6 +10165,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
+#include "h/unrandomize.h"
 
 void gprof_cleanup() {}
 int
@@ -10173,9 +10174,7 @@
   char *b,*b1;
   FILE *fp;
 
-#ifdef CAN_UNRANDOMIZE_SBRK
-#include "h/unrandomize.h"
-#endif
+  UNRANDOMIZE_SBRK;
   b = (void *) malloc(1000);
   fp = fopen("conftest1","w");
 
diff -dur gcl-2.6.8.ORIG/configure.in gcl-2.6.8/configure.in
--- gcl-2.6.8.ORIG/configure.in	2008-12-29 16:24:30.000000000 -0700
+++ gcl-2.6.8/configure.in	2008-12-29 16:37:26.000000000 -0700
@@ -1087,9 +1087,11 @@
 
 	AC_MSG_CHECKING([for personality(ADDR_NO_RANDOMIZE) support])
 	AC_RUN_IFELSE([AC_LANG_SOURCE([[
+		    #define CAN_UNRANDOMIZE_SBRK 1
+		    #include "h/unrandomize.h"
 		    void gprof_cleanup() {}
 		    int main(int argc,char *argv[],char *envp[]) {
-	            #include "h/unrandomize.h"
+		    UNRANDOMIZE_SBRK;
 		    return 0;}]])],CAN_UNRANDOMIZE_SBRK=1,CAN_UNRANDOMIZE_SBRK=0,CAN_UNRANDOMIZE_SBRK=0)
 
 	if test "$CAN_UNRANDOMIZE_SBRK" != 0 ; then
@@ -1102,12 +1104,11 @@
 	AC_MSG_CHECKING([that sbrk is (now) non-random])
 	AC_RUN_IFELSE([AC_LANG_SOURCE([[
 		    #include <stdio.h>
+		    #include "h/unrandomize.h"
 	            void gprof_cleanup() {}
 		    int main(int argc,char * argv[],char * envp[]) {
 			FILE *f;
-			#ifdef CAN_UNRANDOMIZE_SBRK
-			#include "h/unrandomize.h"
-			#endif
+			UNRANDOMIZE_SBRK;
 			if (!(f=fopen("conftest1","w"))) return -1;
 			fprintf(f,"%u",sbrk(0));
 			return 0;}]])],SBRK=`cat conftest1`,SBRK=0,SBRK=0)
@@ -1116,12 +1117,11 @@
 	fi
 	AC_RUN_IFELSE([AC_LANG_SOURCE([[
 		    #include <stdio.h>
+		    #include "h/unrandomize.h"
                     void gprof_cleanup() {}
 		    int main(int argc,char * argv[],char * envp[]) {
 			FILE *f;
-			#ifdef CAN_UNRANDOMIZE_SBRK
-			#include "h/unrandomize.h"
-			#endif
+			UNRANDOMIZE_SBRK;
 			if (!(f=fopen("conftest1","w"))) return -1;
 			fprintf(f,"%u",sbrk(0));
 			return 0;}]])],SBRK1=`cat conftest1`,SBRK1=0,SBRK1=0)
@@ -1163,6 +1163,7 @@
 AC_RUN_IFELSE([AC_LANG_SOURCE([[
 #include <stdio.h>
 #include <stdlib.h>
+#include "h/unrandomize.h"
 
 void gprof_cleanup() {}
 int
@@ -1171,9 +1172,7 @@
   char *b,*b1;
   FILE *fp;
 
-#ifdef CAN_UNRANDOMIZE_SBRK
-#include "h/unrandomize.h"
-#endif
+  UNRANDOMIZE_SBRK;
   b = (void *) malloc(1000);
   fp = fopen("conftest1","w");
 
diff -dur gcl-2.6.8.ORIG/h/unrandomize.h gcl-2.6.8/h/unrandomize.h
--- gcl-2.6.8.ORIG/h/unrandomize.h	2008-08-20 19:13:58.000000000 -0600
+++ gcl-2.6.8/h/unrandomize.h	2008-12-29 16:42:15.000000000 -0700
@@ -1,25 +1,33 @@
+#include <stdlib.h>
 #include <sys/personality.h>
 #include <syscall.h>
 #include <unistd.h>
 #include <alloca.h>
 
-{
+#ifdef CAN_UNRANDOMIZE_SBRK
+# ifdef GCL_GPROF
+#  define GPROF_CLEANUP gprof_cleanup()
+# else
+#  define GPROF_CLEANUP
+# endif
 
-  long pers = personality(0xffffffffUL);
-  if (!(pers & ADDR_NO_RANDOMIZE) && !getenv("GCL_UNRANDOMIZE"))
-    if (personality(pers | ADDR_NO_RANDOMIZE) != -1 && personality(0xffffffffUL) & ADDR_NO_RANDOMIZE) {
-      int i;
-      char **n;
-      for (i=0;envp[i];i++);
-      n=alloca((i+2)*sizeof(*n));
-      n[i+1]=0;
-      n[i--]="GCL_UNRANDOMIZE=t";
-      for (;i>=0;i--)
-	n[i]=envp[i];
-#ifdef GCL_GPROF
-      gprof_cleanup();
+#define UNRANDOMIZE_SBRK do						\
+{									\
+  long pers = personality(0xffffffffUL);				\
+  if (!(pers & ADDR_NO_RANDOMIZE) && !getenv("GCL_UNRANDOMIZE"))	\
+    if (personality(pers | ADDR_NO_RANDOMIZE) != -1 && personality(0xffffffffUL) & ADDR_NO_RANDOMIZE) { \
+      int i;								\
+      char **n;								\
+      for (i=0;envp[i];i++);						\
+      n=alloca((i+2)*sizeof(*n));					\
+      n[i+1]=0;								\
+      n[i--]="GCL_UNRANDOMIZE=t";					\
+      for (;i>=0;i--)							\
+	n[i]=envp[i];							\
+      GPROF_CLEANUP;							\
+      execve(*argv,argv,n);						\
+    }									\
+ } while(0)
+#else
+# define UNRANDOMIZE_SBRK
 #endif
-      execve(*argv,argv,n);    
-    }
-
-}
diff -dur gcl-2.6.8.ORIG/o/main.c gcl-2.6.8/o/main.c
--- gcl-2.6.8.ORIG/o/main.c	2008-07-31 13:12:59.000000000 -0600
+++ gcl-2.6.8/o/main.c	2008-12-29 16:43:14.000000000 -0700
@@ -51,6 +51,7 @@
 #include <signal.h>
 #endif
 #include "page.h"
+#include "unrandomize.h"
 
 bool saving_system ;
 
@@ -125,9 +126,7 @@
 #endif
 #endif
 
-#ifdef CAN_UNRANDOMIZE_SBRK
-#include "unrandomize.h"
-#endif
+	UNRANDOMIZE_SBRK;
 
 #if defined(DARWIN)
 	{


--- NEW FILE gcl.el ---
(add-to-list 'load-path "%LISP_DIR%/gcl")
(autoload 'run "gcl" "Run GCL." t)
(autoload 'gcl-mode "gcl" "GCL mode." t)
(autoload 'dbl "dbl" "GCL debugger." t)


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gcl/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	7 Apr 2005 16:50:14 -0000	1.2
+++ .cvsignore	10 Jan 2009 05:23:17 -0000	1.3
@@ -1 +1 @@
-gcl-2.6.6.tar.gz
+gcl-2.6.8.tar.bz2


Index: gcl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gcl/devel/gcl.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- gcl.spec	21 Jul 2008 15:15:49 -0000	1.27
+++ gcl.spec	10 Jan 2009 05:23:18 -0000	1.28
@@ -1,106 +1,320 @@
+# -fstack-protector leads to segfaults because GCL uses its own conflicting
+# stack protection scheme.
+%define __global_cflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2
+
+# Prerelease of 2.6.8
+%define alphatag 20080902cvs
+
+# If the emacs-el package has installed a pkgconfig file, use that to determine
+# install locations and Emacs version at build time, otherwise set defaults.
+%if %($(pkg-config emacs) ; echo $?)
+%define emacs_version 22.2
+%define emacs_lispdir %{_datadir}/emacs/site-lisp
+%else
+%define emacs_version %(pkg-config emacs --modversion)
+%define emacs_lispdir %(pkg-config emacs --variable sitepkglispdir)
+%endif
+
+# If the xemacs-devel package has installed a pkgconfig file, use that to
+# determine install locations and Emacs version at build time, otherwise set
+# defaults.
+%if %($(pkg-config xemacs) ; echo $?)
+%define xemacs_version 21.5
+%define xemacs_lispdir %{_datadir}/xemacs/site-packages/lisp
+%else
+%define xemacs_version %(pkg-config xemacs --modversion)
+%define xemacs_lispdir %(pkg-config xemacs --variable sitepkglispdir)
+%endif
+
 Name:           gcl
-Version:        2.6.7
-Release:        19%{?dist}
+Version:        2.6.8
+Release:        0.1.%{alphatag}%{?dist}
 Summary:        GNU Common Lisp
 
 Group:          Development/Languages
 License:        GPL+ and LGPLv2+
-URL:            http://www.gnu.org/software/gcl
-Source:         ftp://ftp.gnu.org/pub/gnu/gcl/gcl-2.6.7.tar.gz
-Patch0:		gcl-pers.patch
-Patch1:		gcl-bash.patch
+URL:            http://www.gnu.org/software/gcl/
+# The source for this package was pulled from upstream's CVS repository.  Use
+# the following commands to generate the tarball:
+#   cvs -d:pserver:anonymous at cvs.savannah.gnu.org:/sources/gcl export \
+#     -r Version_2_6_8pre -D 2008-09-02 -d gcl-2.6.8 gcl
+#   tar -cjvf gcl-2.6.8.tar.bz2 gcl-2.6.8
+Source0:        gcl-%{version}.tar.bz2
+Source1:        gcl.el
+# This patch was last sent upstream on 29 Dec 2008.  It makes GCL use the
+# sigprocmask API instead of the deprecated sigblock API.
+Patch0:         gcl-2.6.8-sigprocmask-linux.patch
+# This patch was last sent upstream on 29 Dec 2008.  It fixes a file descriptor
+# leak, as well as combining 4 system calls into only 2 on an exec().
+Patch1:         gcl-2.6.8-fd-leak.patch
+# This patch was last sent upstream on 29 Dec 2008.  It updates one source file
+# from LaTeX 2.09 to LaTeX 2e, thereby eliminating LaTeX warnings about running
+# in compatibility mode.
+Patch2:         gcl-2.6.8-latex.patch
+# This patch was last sent upstream on 29 Dec 2008.  It eliminates a few minor
+# texinfo warnings.
+Patch3:         gcl-2.6.8-texinfo.patch
+# This patch was last sent upstream on 29 Dec 2008.  It fixes a large number of
+# compile- and run-time problems with the Emacs interface code.
+Patch4:         gcl-2.6.8-elisp.patch
+# This patch was last sent upstream on 09 Jan 2009.  It adds support for
+# compiling and running on an SELinux-enabled host.
+Patch5:         gcl-2.6.8-selinux.patch
+# This patch was last sent upstream on 29 Dec 2008.  It uses the rename()
+# system call when it is available to avoid spawning a subshell and suffering a
+# context switch just to rename a file.
+Patch6:         gcl-2.6.8-rename.patch
+# This patch was last sent upstream on 29 Dec 2008.  It eliminates a
+# compilation problem due to the fact that, at high optimization levels,
+# getcwd() is an inline function.
+Patch7:         gcl-2.6.8-getcwd.patch
+# This patch was last sent upstream on 29 Dec 2008.  It fixes a potential
+# buffer overflow when accessing files whose names start with a tilde (i.e.,
+# user home directories).
+Patch8:         gcl-2.6.8-loginname.patch
+# This patch was last sent upstream on 29 Dec 2008.  It updates the autoconf
+# and libtool files to newer versions.  By itself, this patch accomplishes
+# little of interest.  However, some of the later patches change configure.in.
+# Without this patch, autoconf appears to run successfully, but generates a
+# configure script that contains invalid shell script syntax.
+Patch9:         gcl-2.6.8-infrastructure.patch
+# This patch was last sent upstream on 29 Dec 2008.  It simplifies the handling
+# of alloca() detection in the configure script.
+Patch10:        gcl-2.6.8-alloca.patch
+# This patch was last sent upstream on 29 Dec 2008.  It rationalizes the
+# handling of system extensions.  For example, on glibc-based systems, some
+# functionality is available only when _GNU_SOURCE is defined.
+Patch11:        gcl-2.6.8-extension.patch
+# This patch was last sent upstream on 29 Dec 2008.  It fixes a compilation
+# error on newer GCC systems due to an include inside a function.  This affects
+# the "unrandomize" sbrk() functionality, hence the name of the patch.
+Patch12:        gcl-2.6.8-unrandomize.patch
+# This patch was last sent upstream on 29 Dec 2008.  It fixes compilation with
+# a system BFD library that comes from a newer binutils distribution.  It also
+# updates o/unexelf.c from Emacs 22.2, the last version of Emacs released under
+# the GPL version 2.
+Patch13:        gcl-2.6.8-bfd.patch
+# This is a Fedora-specific patch.  Do not delete C files produced from D files
+# so they can be pulled into the debuginfo package.
+Patch14:        gcl-2.6.8-debuginfo.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires:  libSM-devel
+BuildRequires:  libXext-devel
+BuildRequires:  libXaw-devel
 BuildRequires:  readline-devel
-BuildRequires:  ncurses-devel
 BuildRequires:  binutils-devel
-BuildRequires:	tk-devel
-BuildRequires:	tcl-devel
+BuildRequires:  tk-devel
+BuildRequires:  tcl-devel
 BuildRequires:  gmp-devel
-BuildRequires:	tetex
+BuildRequires:  texlive
 BuildRequires:  texinfo
+BuildRequires:  emacs, emacs-el
+BuildRequires:  xemacs, xemacs-devel
+BuildRequires:  selinux-policy
 Requires(post): /sbin/install-info, policycoreutils
 Requires(postun): /sbin/install-info, policycoreutils
-ExcludeArch:	ppc ppc64 x86_64
 
 
 %description
-GCL is a Common Lisp currently compliant with the ANSI standard. Lisp
+GCL is a Common Lisp currently compliant with the ANSI standard.  Lisp
 compilation produces native code through the intermediary of the
 system's C compiler, from which GCL derives efficient performance and
 facile portability. Currently uses TCL/Tk as GUI.
 
 
+%package emacs
+Group:          Development/Languages
+Summary:        Emacs mode for interacting with GCL
+Requires:       %{name} = %{version}-%{release}, emacs(bin) >= %{emacs_version}
+
+%description emacs
+Emacs mode for interacting with GCL
+
+%package emacs-el
+Group:          Development/Languages
+Summary:        Source for Emacs mode for interacting with GCL
+Requires:       %{name}-emacs = %{version}-%{release}
+
+%description emacs-el
+Source Elisp code for Emacs mode for interacting with GCL
+
+
+%package xemacs
+Group:          Development/Languages
+Summary:        XEmacs mode for interacting with GCL
+Requires:       %{name} = %{version}-%{release}, xemacs(bin) >= %{xemacs_version}
+
+%description xemacs
+XEmacs mode for interacting with GCL
+
+%package xemacs-el
+Group:          Development/Languages
+Summary:        Source for XEmacs mode for interacting with GCL
+Requires:       %{name}-xemacs = %{version}-%{release}
+
+%description xemacs-el
+Source Elisp code for XEmacs mode for interacting with GCL
+
+
 %prep
 %setup -q
 %patch0 -p1
 %patch1 -p1
-sed -i "s|-lreadline|-lreadline -lncurses|" configure
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
+%patch7 -p1
+%patch8 -p1
+%patch9 -p1
+%patch10 -p1
+%patch11 -p1
+%patch12 -p1
+%patch13 -p1
+%patch14 -p1
+
+# Don't let the configure script add compiler flags we don't want
+sed -i -e 's/-fomit-frame-pointer//' -e 's/-O3/-O2/g' configure
+
+# Fix a path in the launch script
+sed -i -e 's|/usr/lib/tk|%{_datadir}/tk|' debian/gcl.sh
+
+# The archive is so full of spurious executable bits that we just remove them
+# all here, then add back the ones that should exist
+find . -type f -perm /0111 | xargs chmod a-x
+chmod a+x add-defs add-defs1 config.guess config.sub configure install.sh
+chmod a+x ltconfig bin/info bin/info1 gcl-tk/gcltksrv.in gcl-tk/ngcltksrv
+chmod a+x mp/gcclab o/egrep-def utils/replace xbin/*
 
 
 %build
-%configure --enable-readline --enable-ansi --enable-tclconfig=%{_libdir} --enable-tkconfig=%{_libdir}
-perl -pi -e 's|/usr/lib/tk|%{_datadir}/tk|' debian/gcl.sh makedefc makedefs
-perl -pi -e 's|/usr/lib/tcl|%{_datadir}/tcl|' debian/gcl.sh makedefc makedefs
-# %{?_smp_mflags} breaks the build
+%configure --enable-readline --enable-ansi --enable-dynsysgmp --enable-xgcl \
+  --enable-tclconfig=%{_libdir} --enable-tkconfig=%{_libdir} \
+  --disable-statsysbfd --enable-dynsysbfd
+# FIXME: %%{?_smp_mflags} breaks the build
 make 
 
+# dwdoc needs one extra LaTeX run to resolve references
+cd xgcl-2
+pdflatex dwdoc.tex
+
+# Build the SELinux policy
+cd ../selinux
+make -f %{_datadir}/selinux/devel/Makefile
+
 
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
+
+# Get rid of the parts that we don't want
 rm -f $RPM_BUILD_ROOT%{_infodir}/dir
 rm -rf $RPM_BUILD_ROOT%{_datadir}/doc
 rm -rf $RPM_BUILD_ROOT%{_datadir}/emacs
 rm -rf $RPM_BUILD_ROOT%{_prefix}/lib/gcl-*/info
+
+# Install the man page
 mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
-cp -f man/man1/* $RPM_BUILD_ROOT%{_mandir}/man1
+cp -pf man/man1/* $RPM_BUILD_ROOT%{_mandir}/man1
+
+# Install the HTML documentation
 mkdir -p html
-cp -fr info/gcl-si info/gcl-tk html 
-chmod 644 ChangeLog* COPYING* 
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/gcl
-chmod 644 elisp/*
-cp -fr elisp/* $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/gcl
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/site-start.d
-cat > $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/site-start.d/gcl.el <<EOF
-(add-to-list 'load-path "%{_datadir}/emacs/site-lisp/gcl")
-(autoload 'run "gcl" "Run GCL." t)
-(autoload 'gcl-mode "gcl" "GCL mode." t)
-EOF
-find $RPM_BUILD_ROOT%{_prefix}/lib/gcl* -name '*.l*sp' | xargs chmod 0644
-export QA_SKIP_BUILD_ROOT=1
+cp -pfr info/gcl-si info/gcl-tk html
+
+# Install and compile the Emacs code
+mkdir -p $RPM_BUILD_ROOT%{emacs_lispdir}/gcl
+cp -pfr elisp/* $RPM_BUILD_ROOT%{emacs_lispdir}/gcl
+rm -f $RPM_BUILD_ROOT%{emacs_lispdir}/gcl/makefile
+rm -f $RPM_BUILD_ROOT%{emacs_lispdir}/gcl/readme
+mkdir -p $RPM_BUILD_ROOT%{emacs_lispdir}/site-start.d
+sed -e "s|%LISP_DIR%|%{emacs_lispdir}|" %{SOURCE1} > $RPM_BUILD_ROOT%{emacs_lispdir}/site-start.d/gcl.el
+pushd $RPM_BUILD_ROOT%{emacs_lispdir}/gcl
+emacs -batch -no-site-file --eval "(push \"`pwd`\" load-path)" \
+  -f batch-byte-compile *.el
+popd
+
+# Install and compile the XEmacs code
+mkdir -p $RPM_BUILD_ROOT%{xemacs_lispdir}/gcl
+cp -fr elisp/* $RPM_BUILD_ROOT%{xemacs_lispdir}/gcl
+rm -f $RPM_BUILD_ROOT%{xemacs_lispdir}/gcl/makefile
+rm -f $RPM_BUILD_ROOT%{xemacs_lispdir}/gcl/readme
+mkdir -p $RPM_BUILD_ROOT%{xemacs_lispdir}/site-start.d
+sed -e "s|%LISP_DIR%|%{xemacs_lispdir}|" %{SOURCE1} > $RPM_BUILD_ROOT%{xemacs_lispdir}/site-start.d/gcl.el
+pushd $RPM_BUILD_ROOT%{xemacs_lispdir}/gcl
+xemacs -batch -no-site-file -eval "(push \"`pwd`\" load-path)" \
+  -f batch-byte-compile *.el
+popd
+
+# Save the policy file away for later installation
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/selinux/packages/gcl
+cp -p selinux/gcl.pp $RPM_BUILD_ROOT%{_datadir}/selinux/packages/gcl
 
 
 %clean
 rm -rf $RPM_BUILD_ROOT
+rm -f /tmp/gazonk_* /tmp/gcl_*
 
 
 %post
+/sbin/install-info %{_infodir}/%{name}.info %{_infodir}/dir 2>/dev/null || :
 /sbin/install-info %{_infodir}/%{name}-si.info %{_infodir}/dir 2>/dev/null || :
 /sbin/install-info %{_infodir}/%{name}-tk.info %{_infodir}/dir 2>/dev/null || :
-/usr/sbin/semanage fcontext -a -t textrel_shlib_t "%{_prefix}/lib/gcl-%{version}/unixport/saved_ansi_gcl" 2>/dev/null || :
-/sbin/restorecon "%{_prefix}/lib/gcl-%{version}/unixport/saved_ansi_gcl" 2> /dev/null || :
+/usr/sbin/semodule -i %{_datadir}/selinux/packages/gcl/gcl.pp || :
+/sbin/fixfiles -R gcl restore || :
 
 
 %postun
 if [ $1 = 0 ]; then
+    /sbin/install-info --delete %{_infodir}/%{name}.info %{_infodir}/dir 2>/dev/null || :
     /sbin/install-info --delete %{_infodir}/%{name}-si.info %{_infodir}/dir 2>/dev/null || :
     /sbin/install-info --delete %{_infodir}/%{name}-tk.info %{_infodir}/dir 2>/dev/null || :
-    /usr/sbin/semanage fcontext -d -t textrel_shlib_t "%{_prefix}/lib/gcl-%{version}/unixport/saved_ansi_gcl" 2>/dev/null || :
+    /usr/sbin/semodule -r gcl || :
 fi
 
 
 %files
 %defattr(-,root,root,-)
-%{_bindir}/*
+%{_bindir}/gcl
 %{_prefix}/lib/gcl*
 %{_infodir}/*
 %{_mandir}/man*/*
-%{_datadir}/emacs/site-lisp/gcl
-%{_datadir}/emacs/site-lisp/site-start.d/*
-%doc COPYING* readme RELEASE* ChangeLog doc/*
+%{_datadir}/selinux/packages/gcl
+%doc COPYING* readme readme.xgcl RELEASE* ChangeLog* faq doc
+%doc gcl*.jpg gcl.ico gcl.png
 %doc --parent html
 
+%files emacs
+%defattr(-,root,root,-)
+%doc elisp/readme
+%dir %{emacs_lispdir}/gcl
+%{emacs_lispdir}/gcl/*.elc
+%{emacs_lispdir}/site-start.d/*
+
+%files emacs-el
+%defattr(-,root,root,-)
+%{emacs_lispdir}/gcl/*.el
+
+%files xemacs
+%defattr(-,root,root,-)
+%doc elisp/readme
+%dir %{xemacs_lispdir}/gcl
+%{xemacs_lispdir}/gcl/*.elc
+%{xemacs_lispdir}/site-start.d/*
+
+%files xemacs-el
+%defattr(-,root,root,-)
+%{xemacs_lispdir}/gcl/*.el
+
+
 %changelog
+* Fri Jan  9 2009 Jerry James <loganjerry at gmail.com> - 2.6.8-0.1.20080902cvs
+- Update from CVS to fix many build problems
+- Fix SELinux and BFD problems that blocked the build
+- Add patches to address various build and runtime problems
+- Drop old patches that are obsoleted by the update from CVS
+- Split out emacs and xemacs subpackages
+
 * Mon Jul 21 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 2.6.7-19
 - fix license tag
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gcl/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	9 Sep 2005 19:45:04 -0000	1.3
+++ sources	10 Jan 2009 05:23:18 -0000	1.4
@@ -1 +1 @@
-c0f42e1f391162e5ac90912a70e8ecc3  gcl-2.6.7.tar.gz
+6f0453b7f1fb102322cfa69bf2a7275a  gcl-2.6.8.tar.bz2


--- gcl-bash.patch DELETED ---


--- gcl-pers.patch DELETED ---



From mdomsch at fedoraproject.org  Sat Jan 10 05:37:46 2009
From: mdomsch at fedoraproject.org (Matt Domsch)
Date: Sat, 10 Jan 2009 05:37:46 +0000 (UTC)
Subject: rpms/oggvideotools/devel oggvideotools-0.6-cstring.patch, NONE,
	1.1 oggvideotools.spec, 1.2, 1.3
Message-ID: <20090110053746.AD1807012C@cvs1.fedora.phx.redhat.com>

Author: mdomsch

Update of /cvs/extras/rpms/oggvideotools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10505

Modified Files:
	oggvideotools.spec 
Added Files:
	oggvideotools-0.6-cstring.patch 
Log Message:
update to v0.6

oggvideotools-0.6-cstring.patch:

--- NEW FILE oggvideotools-0.6-cstring.patch ---
diff -urNp --exclude-from=/home/mdomsch/excludes --minimal oggvideotools-0.6.orig/src/oggSlideshow.cpp oggvideotools-0.6/src/oggSlideshow.cpp
--- oggvideotools-0.6.orig/src/oggSlideshow.cpp	2009-01-04 09:43:07.000000000 -0600
+++ oggvideotools-0.6/src/oggSlideshow.cpp	2009-01-09 23:31:43.000000000 -0600
@@ -5,6 +5,7 @@
 #include <sstream>
 #include <cstdlib>
 #include <cmath>
+#include <cstring>
 //#include <cc++/slog.h>
 
 #include "definition.h"
diff -urNp --exclude-from=/home/mdomsch/excludes --minimal oggvideotools-0.6.orig/src/videoFormats.cpp oggvideotools-0.6/src/videoFormats.cpp
--- oggvideotools-0.6.orig/src/videoFormats.cpp	2009-01-04 09:43:07.000000000 -0600
+++ oggvideotools-0.6/src/videoFormats.cpp	2009-01-09 23:32:22.000000000 -0600
@@ -1,4 +1,5 @@
 #include <iostream>
+#include <cstring>
 #include "videoFormats.h"
 
 #include <theora/codec.h>


Index: oggvideotools.spec
===================================================================
RCS file: /cvs/extras/rpms/oggvideotools/devel/oggvideotools.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- oggvideotools.spec	12 Aug 2008 13:19:52 -0000	1.2
+++ oggvideotools.spec	10 Jan 2009 05:37:16 -0000	1.3
@@ -1,5 +1,5 @@
 Name:           oggvideotools
-Version:        0.5
+Version:        0.6
 Release:        1%{?dist}
 Summary:        Toolbox for manipulating Ogg video files
 
@@ -7,6 +7,7 @@
 License:        GPLv2+
 URL:            http://dev.streamnik.de/oggvideotools.html
 Source0:        http://dev.streamnik.de/uploads/media/%{name}-%{version}.tar.gz
+Patch0:		%{name}-0.6-cstring.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  pkgconfig
 BuildRequires:  libogg-devel libvorbis-devel libtheora-devel SDL-devel
@@ -19,6 +20,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %configure
@@ -41,6 +43,14 @@
 %{_bindir}/*
 
 %changelog
+* Fri Jan  9 2009 Matt Domsch <mdomsch at fedoraproject.org> - 0.6-1
+- update to 0.6
+  added oggSlideshow, oggThumb
+  handling for huge files > 4GB implemented
+  packet order with oggCut has been fixed and cleaned up
+  ogg type in BOS packet is completely analysed
+  added support for kate-streams (done by ogg.k.ogg.k)
+
 * Tue Aug 12 2008 Matt Domsch <mdomsch at fedoraproject.org> - 0.5-1
 - Fedora patches applied upstream
 - improved documentation



From mdomsch at fedoraproject.org  Sat Jan 10 05:40:08 2009
From: mdomsch at fedoraproject.org (Matt Domsch)
Date: Sat, 10 Jan 2009 05:40:08 +0000 (UTC)
Subject: rpms/oggvideotools/devel .cvsignore,1.3,1.4 sources,1.3,1.4
Message-ID: <20090110054008.1BAD67012C@cvs1.fedora.phx.redhat.com>

Author: mdomsch

Update of /cvs/extras/rpms/oggvideotools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10913

Modified Files:
	.cvsignore sources 
Log Message:
finish update to v0.6


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/oggvideotools/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	12 Aug 2008 13:19:52 -0000	1.3
+++ .cvsignore	10 Jan 2009 05:39:37 -0000	1.4
@@ -1 +1 @@
-oggvideotools-0.5.tar.gz
+oggvideotools-0.6.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/oggvideotools/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	12 Aug 2008 13:19:52 -0000	1.3
+++ sources	10 Jan 2009 05:39:37 -0000	1.4
@@ -1 +1 @@
-72d4f900456e5c9d5e242620c513ba68  oggvideotools-0.5.tar.gz
+dce60fcd1b4706424ff6f41d2a7024cc  oggvideotools-0.6.tar.gz



From jjames at fedoraproject.org  Sat Jan 10 05:55:14 2009
From: jjames at fedoraproject.org (Jerry James)
Date: Sat, 10 Jan 2009 05:55:14 +0000 (UTC)
Subject: rpms/gcl/devel gcl.spec,1.28,1.29
Message-ID: <20090110055514.8240B7012C@cvs1.fedora.phx.redhat.com>

Author: jjames

Update of /cvs/pkgs/rpms/gcl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13728

Modified Files:
	gcl.spec 
Log Message:
Missed texlive-latex as a BuildRequires.



Index: gcl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gcl/devel/gcl.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- gcl.spec	10 Jan 2009 05:23:18 -0000	1.28
+++ gcl.spec	10 Jan 2009 05:54:43 -0000	1.29
@@ -106,7 +106,7 @@
 BuildRequires:  tk-devel
 BuildRequires:  tcl-devel
 BuildRequires:  gmp-devel
-BuildRequires:  texlive
+BuildRequires:  texlive, texlive-latex
 BuildRequires:  texinfo
 BuildRequires:  emacs, emacs-el
 BuildRequires:  xemacs, xemacs-devel



From jjames at fedoraproject.org  Sat Jan 10 06:08:15 2009
From: jjames at fedoraproject.org (Jerry James)
Date: Sat, 10 Jan 2009 06:08:15 +0000 (UTC)
Subject: rpms/gcl/devel gcl.spec,1.29,1.30
Message-ID: <20090110060815.321B37012C@cvs1.fedora.phx.redhat.com>

Author: jjames

Update of /cvs/pkgs/rpms/gcl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15002

Modified Files:
	gcl.spec 
Log Message:
Also need xemacs-packages-extra to byte-compile the XEmacs Elisp.



Index: gcl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gcl/devel/gcl.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- gcl.spec	10 Jan 2009 05:54:43 -0000	1.29
+++ gcl.spec	10 Jan 2009 06:07:44 -0000	1.30
@@ -109,7 +109,7 @@
 BuildRequires:  texlive, texlive-latex
 BuildRequires:  texinfo
 BuildRequires:  emacs, emacs-el
-BuildRequires:  xemacs, xemacs-devel
+BuildRequires:  xemacs, xemacs-devel, xemacs-packages-extra
 BuildRequires:  selinux-policy
 Requires(post): /sbin/install-info, policycoreutils
 Requires(postun): /sbin/install-info, policycoreutils



From kyle at fedoraproject.org  Sat Jan 10 07:46:42 2009
From: kyle at fedoraproject.org (Kyle McMartin)
Date: Sat, 10 Jan 2009 07:46:42 +0000 (UTC)
Subject: rpms/kernel/devel patch-2.6.28-git14.bz2.sign, NONE, 1.1 .cvsignore,
	1.986, 1.987 config-generic, 1.217, 1.218 kernel.spec, 1.1204,
	1.1205 linux-2.6-execshield.patch, 1.100, 1.101 sources, 1.948,
	1.949 upstream, 1.860, 1.861 linux-2.6-squashfs.patch, 1.32,
	NONE patch-2.6.28-git13.bz2.sign, 1.1, NONE
Message-ID: <20090110074642.C5AC67012C@cvs1.fedora.phx.redhat.com>

Author: kyle

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25975

Modified Files:
	.cvsignore config-generic kernel.spec 
	linux-2.6-execshield.patch sources upstream 
Added Files:
	patch-2.6.28-git14.bz2.sign 
Removed Files:
	linux-2.6-squashfs.patch patch-2.6.28-git13.bz2.sign 
Log Message:
* Fri Jan 08 2009 Kyle McMartin <kyle at redhat.com>
- 2.6.28-git14
- Rebased patches:
  linux-2.6-execshield.patch: simple sysctl reject
- Deleted patches:
  linux-2.6-squashfs.patch: upstream!



--- NEW FILE patch-2.6.28-git14.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBJZ+lSyGugalF9Dw4RAjuOAJ0UBbJQZUJ6aUdVKlZqMZss/4V2XgCdGmdj
+eBYhEv5CQ3pzP+N/GBQDjo=
=OP2/
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.986
retrieving revision 1.987
diff -u -r1.986 -r1.987
--- .cvsignore	9 Jan 2009 16:43:22 -0000	1.986
+++ .cvsignore	10 Jan 2009 07:46:11 -0000	1.987
@@ -4,4 +4,4 @@
 temp-*
 kernel-2.6.28
 linux-2.6.28.tar.bz2
-patch-2.6.28-git13.bz2
+patch-2.6.28-git14.bz2


Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-generic,v
retrieving revision 1.217
retrieving revision 1.218
diff -u -r1.217 -r1.218
--- config-generic	9 Jan 2009 21:33:41 -0000	1.217
+++ config-generic	10 Jan 2009 07:46:11 -0000	1.218
@@ -276,6 +276,10 @@
 # CONFIG_MTD_NAND_DISKONCHIP_BBTWRITE is not set
 # CONFIG_MTD_PLATRAM is not set
 
+# CONFIG_MTD_TESTS is not set
+CONFIG_MTD_LPDDR=m
+CONFIG_MTD_QINFO_PROBE=m
+
 #
 # Parallel port support
 #
@@ -1597,6 +1601,8 @@
 CONFIG_ISDN_DRV_AVMB1_T1PCI=m
 CONFIG_ISDN_DRV_AVMB1_C4=m
 
+CONFIG_MISDN_HFCUSB=m
+
 CONFIG_ISDN_PPP=y
 CONFIG_ISDN_PPP_VJ=y
 CONFIG_ISDN_MPP=y
@@ -3413,6 +3419,7 @@
 CONFIG_FB_ATY128_BACKLIGHT=y
 CONFIG_FB_ATY_BACKLIGHT=y
 # CONFIG_BACKLIGHT_SAHARA is not set
+# CONFIG_BACKLIGHT_GENERIC is not set
 
 CONFIG_LCD_CLASS_DEVICE=m
 CONFIG_LCD_PLATFORM=m
@@ -3645,6 +3652,8 @@
 CONFIG_LEDS_TRIGGER_HEARTBEAT=m
 CONFIG_LEDS_TRIGGER_BACKLIGHT=m
 CONFIG_LEDS_TRIGGER_DEFAULT_ON=m
+CONFIG_LEDS_ALIX2=m
+CONFIG_LEDS_WM8350=m
 
 CONFIG_DMADEVICES=y
 CONFIG_DMA_ENGINE=y
@@ -3874,3 +3883,7 @@
 CONFIG_DVB_DYNAMIC_MINORS=y
 CONFIG_DVB_LGDT3304=m
 CONFIG_DVB_S921=m
+
+CONFIG_BTRFS_FS=m
+
+CONFIG_X86_PLATFORM_DEVICES=y


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1204
retrieving revision 1.1205
diff -u -r1.1204 -r1.1205
--- kernel.spec	9 Jan 2009 18:59:55 -0000	1.1204
+++ kernel.spec	10 Jan 2009 07:46:11 -0000	1.1205
@@ -57,7 +57,7 @@
 # The rc snapshot level
 %define rcrev 0
 # The git snapshot level
-%define gitrev 13
+%define gitrev 14
 # Set rpm version accordingly
 %define rpmversion 2.6.%{upstream_sublevel}
 %endif
@@ -614,7 +614,6 @@
 Patch390: linux-2.6-defaults-acpi-video.patch
 Patch391: linux-2.6-acpi-video-dos.patch
 Patch400: linux-2.6-scsi-cpqarray-set-master.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
 Patch460: linux-2.6-serial-460800.patch
@@ -1062,9 +1061,6 @@
 # bugfixes to drivers and filesystems
 #
 
-# Squashfs
-ApplyPatch linux-2.6-squashfs.patch
-
 # ext4
 
 # xfs
@@ -1752,6 +1748,13 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Fri Jan 08 2009 Kyle McMartin <kyle at redhat.com>
+- 2.6.28-git14
+- Rebased patches:
+  linux-2.6-execshield.patch: simple sysctl reject
+- Deleted patches:
+  linux-2.6-squashfs.patch: upstream!
+
 * Thu Jan 08 2009 Kyle McMartin <kyle at redhat.com>
 - 2.6.28-git12
 - Revert ihex2fb moving patch, causes noarch target to

linux-2.6-execshield.patch:

Index: linux-2.6-execshield.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-execshield.patch,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -r1.100 -r1.101
--- linux-2.6-execshield.patch	29 Dec 2008 03:27:27 -0000	1.100
+++ linux-2.6-execshield.patch	10 Jan 2009 07:46:11 -0000	1.101
@@ -1,5 +1,5 @@
 diff --git a/arch/x86/include/asm/desc.h b/arch/x86/include/asm/desc.h
-index e6b82b1..c314884 100644
+index dc27705..6aa5630 100644
 --- a/arch/x86/include/asm/desc.h
 +++ b/arch/x86/include/asm/desc.h
 @@ -6,6 +6,7 @@
@@ -20,7 +20,7 @@
  
  #define write_ldt_entry(dt, entry, desc)	\
  	native_write_ldt_entry(dt, entry, desc)
-@@ -381,6 +385,24 @@ static inline void set_system_intr_gate_ist(int n, void *addr, unsigned ist)
+@@ -379,6 +383,24 @@ static inline void set_system_intr_gate_ist(int n, void *addr, unsigned ist)
  	_set_gate(n, GATE_INTERRUPT, addr, 0x3, ist, __KERNEL_CS);
  }
  
@@ -97,10 +97,10 @@
  {
  	PVOP_VCALL1(pv_cpu_ops.store_gdt, dtr);
 diff --git a/arch/x86/include/asm/processor.h b/arch/x86/include/asm/processor.h
-index 5ca01e3..4f319b1 100644
+index 091cd88..b1a6f6d 100644
 --- a/arch/x86/include/asm/processor.h
 +++ b/arch/x86/include/asm/processor.h
-@@ -154,6 +154,9 @@ static inline int hlt_works(int cpu)
+@@ -158,6 +158,9 @@ static inline int hlt_works(int cpu)
  
  #define cache_line_size()	(boot_cpu_data.x86_cache_alignment)
  
@@ -111,10 +111,10 @@
  
  extern struct pt_regs *idle_regs(struct pt_regs *);
 diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c
-index b9c9ea0..666dd0e 100644
+index 3f95a40..2c2893a 100644
 --- a/arch/x86/kernel/cpu/common.c
 +++ b/arch/x86/kernel/cpu/common.c
-@@ -687,6 +687,21 @@ static void __cpuinit identify_cpu(struct cpuinfo_x86 *c)
+@@ -688,6 +688,21 @@ static void __cpuinit identify_cpu(struct cpuinfo_x86 *c)
  	 * we do "generic changes."
  	 */
  
@@ -151,10 +151,10 @@
  	.load_idt = native_load_idt,
  	.store_gdt = native_store_gdt,
 diff --git a/arch/x86/kernel/process_32.c b/arch/x86/kernel/process_32.c
-index 0a1302f..ab96a10 100644
+index 3ba155d..09ae04c 100644
 --- a/arch/x86/kernel/process_32.c
 +++ b/arch/x86/kernel/process_32.c
-@@ -354,6 +354,10 @@ start_thread(struct pt_regs *regs, unsigned long new_ip, unsigned long new_sp)
+@@ -356,6 +356,10 @@ start_thread(struct pt_regs *regs, unsigned long new_ip, unsigned long new_sp)
  	regs->cs		= __USER_CS;
  	regs->ip		= new_ip;
  	regs->sp		= new_sp;
@@ -165,7 +165,7 @@
  	/*
  	 * Free the old FP and other extended state
  	 */
-@@ -558,7 +562,8 @@ struct task_struct * __switch_to(struct task_struct *prev_p, struct task_struct
+@@ -523,7 +527,8 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
  	/* never put a printk in __switch_to... printk() calls wake_up*() indirectly */
  
  	__unlazy_fpu(prev_p);
@@ -175,7 +175,7 @@
  
  	/* we're going to use this soon, after a few expensive things */
  	if (next_p->fpu_counter > 5)
-@@ -731,3 +736,39 @@ unsigned long arch_randomize_brk(struct mm_struct *mm)
+@@ -696,3 +701,39 @@ unsigned long arch_randomize_brk(struct mm_struct *mm)
  	unsigned long range_end = mm->brk + 0x02000000;
  	return randomize_range(mm->brk, range_end, 0) ? : mm->brk;
  }
@@ -216,7 +216,7 @@
 +	set_user_cs(&mm->context.user_cs, 0);
 +}
 diff --git a/arch/x86/kernel/tlb_32.c b/arch/x86/kernel/tlb_32.c
-index f4049f3..e7a1b7c 100644
+index ce50546..bd6593a 100644
 --- a/arch/x86/kernel/tlb_32.c
 +++ b/arch/x86/kernel/tlb_32.c
 @@ -2,6 +2,7 @@
@@ -227,7 +227,7 @@
  #include <asm/tlbflush.h>
  
  DEFINE_PER_CPU(struct tlb_state, cpu_tlbstate)
-@@ -92,6 +93,8 @@ void smp_invalidate_interrupt(struct pt_regs *regs)
+@@ -91,6 +92,8 @@ void smp_invalidate_interrupt(struct pt_regs *regs)
  	unsigned long cpu;
  
  	cpu = get_cpu();
@@ -237,10 +237,10 @@
  	if (!cpu_isset(cpu, flush_cpumask))
  		goto out;
 diff --git a/arch/x86/kernel/traps.c b/arch/x86/kernel/traps.c
-index 04d242a..bb52785 100644
+index c9a666c..b702c77 100644
 --- a/arch/x86/kernel/traps.c
 +++ b/arch/x86/kernel/traps.c
-@@ -159,6 +159,63 @@ static int lazy_iobitmap_copy(void)
+@@ -157,6 +157,63 @@ static int lazy_iobitmap_copy(void)
  
  	return 0;
  }
@@ -334,7 +334,7 @@
  	tsk->thread.error_code = error_code;
  	tsk->thread.trap_no = 13;
  
-@@ -931,19 +1011,37 @@ do_device_not_available(struct pt_regs *regs, long error)
+@@ -926,19 +1006,37 @@ do_device_not_available(struct pt_regs *regs, long error)
  }
  
  #ifdef CONFIG_X86_32
@@ -382,10 +382,10 @@
  #endif
  
 diff --git a/arch/x86/mm/init_32.c b/arch/x86/mm/init_32.c
-index c483f42..8c3bbd9 100644
+index 88f1b10..1e31b5e 100644
 --- a/arch/x86/mm/init_32.c
 +++ b/arch/x86/mm/init_32.c
-@@ -570,7 +570,7 @@ static int disable_nx __initdata;
+@@ -575,7 +575,7 @@ static int disable_nx __initdata;
   * Control non executable mappings.
   *
   * on      Enable
@@ -394,7 +394,7 @@
   */
  static int __init noexec_setup(char *str)
  {
-@@ -579,14 +579,12 @@ static int __init noexec_setup(char *str)
+@@ -584,14 +584,12 @@ static int __init noexec_setup(char *str)
  			__supported_pte_mask |= _PAGE_NX;
  			disable_nx = 0;
  		}
@@ -415,7 +415,7 @@
  
  	return 0;
  }
-@@ -845,7 +843,11 @@ unsigned long __init_refok init_memory_mapping(unsigned long start,
+@@ -850,7 +848,11 @@ unsigned long __init_refok init_memory_mapping(unsigned long start,
  	set_nx();
  	if (nx_enabled)
  		printk(KERN_INFO "NX (Execute Disable) protection: active\n");
@@ -449,10 +449,10 @@
  	}
  }
 diff --git a/arch/x86/vdso/vdso32-setup.c b/arch/x86/vdso/vdso32-setup.c
-index 513f330..2fb420a 100644
+index 1241f11..3f2c44c 100644
 --- a/arch/x86/vdso/vdso32-setup.c
 +++ b/arch/x86/vdso/vdso32-setup.c
-@@ -331,7 +331,7 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int exstack)
+@@ -331,7 +331,7 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
  	if (compat)
  		addr = VDSO_HIGH_BASE;
  	else {
@@ -462,10 +462,10 @@
  			ret = addr;
  			goto up_fail;
 diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c
-index 5e4686d..b41f314 100644
+index bea2152..d750141 100644
 --- a/arch/x86/xen/enlighten.c
 +++ b/arch/x86/xen/enlighten.c
-@@ -315,6 +315,24 @@ static void xen_set_ldt(const void *addr, unsigned entries)
+@@ -316,6 +316,24 @@ static void xen_set_ldt(const void *addr, unsigned entries)
  	xen_mc_issue(PARAVIRT_LAZY_CPU);
  }
  
@@ -490,7 +490,7 @@
  static void xen_load_gdt(const struct desc_ptr *dtr)
  {
  	unsigned long *frames;
-@@ -1231,6 +1249,9 @@ static const struct pv_cpu_ops xen_cpu_ops __initdata = {
+@@ -1232,6 +1250,9 @@ static const struct pv_cpu_ops xen_cpu_ops __initdata = {
  
  	.load_tr_desc = paravirt_nop,
  	.set_ldt = xen_set_ldt,
@@ -501,7 +501,7 @@
  	.load_idt = xen_load_idt,
  	.load_tls = xen_load_tls,
 diff --git a/fs/binfmt_elf.c b/fs/binfmt_elf.c
-index 8fcfa39..5e1e2d8 100644
+index e3ff2b9..d46dcf2 100644
 --- a/fs/binfmt_elf.c
 +++ b/fs/binfmt_elf.c
 @@ -80,7 +80,7 @@ static struct linux_binfmt elf_format = {
@@ -513,7 +513,7 @@
  
  static int set_brk(unsigned long start, unsigned long end)
  {
-@@ -723,6 +723,11 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs)
+@@ -735,6 +735,11 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs)
  			break;
  		}
  
@@ -525,7 +525,7 @@
  	/* Some simple consistency checks for the interpreter */
  	if (elf_interpreter) {
  		retval = -ELIBBAD;
-@@ -742,6 +747,15 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs)
+@@ -754,6 +759,15 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs)
  	if (retval)
  		goto out_free_dentry;
  
@@ -541,7 +541,7 @@
  	/* OK, This is the point of no return */
  	current->flags &= ~PF_FORKNOEXEC;
  	current->mm->def_flags = def_flags;
-@@ -749,7 +763,8 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs)
+@@ -761,7 +775,8 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs)
  	/* Do this immediately, since STACK_TOP as used in setup_arg_pages
  	   may depend on the personality.  */
  	SET_PERSONALITY(loc->elf_ex);
@@ -551,7 +551,7 @@
  		current->personality |= READ_IMPLIES_EXEC;
  
  	if (!(current->personality & ADDR_NO_RANDOMIZE) && randomize_va_space)
-@@ -914,7 +929,7 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs)
+@@ -926,7 +941,7 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs)
  					    interpreter,
  					    &interp_map_addr,
  					    load_bias);
@@ -561,10 +561,10 @@
  			 * load_elf_interp() returns relocation
  			 * adjustment
 diff --git a/fs/proc/array.c b/fs/proc/array.c
-index 6af7fba..bb98552 100644
+index 7e4877d..0c368c1 100644
 --- a/fs/proc/array.c
 +++ b/fs/proc/array.c
-@@ -412,8 +412,16 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
+@@ -424,8 +424,16 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
  		unlock_task_sighand(task, &flags);
  	}
  
@@ -584,10 +584,10 @@
  		min_flt = task->min_flt;
  		maj_flt = task->maj_flt;
 diff --git a/include/linux/mm.h b/include/linux/mm.h
-index ffee2f7..c14817b 100644
+index b91a73f..a0f6d93 100644
 --- a/include/linux/mm.h
 +++ b/include/linux/mm.h
-@@ -1105,7 +1105,13 @@ extern int install_special_mapping(struct mm_struct *mm,
+@@ -1123,7 +1123,13 @@ extern int install_special_mapping(struct mm_struct *mm,
  				   unsigned long addr, unsigned long len,
  				   unsigned long flags, struct page **pages);
  
@@ -603,10 +603,10 @@
  extern unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
  	unsigned long len, unsigned long prot,
 diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h
-index fe82547..8007dbf 100644
+index 92915e8..4bfd050 100644
 --- a/include/linux/mm_types.h
 +++ b/include/linux/mm_types.h
-@@ -177,6 +177,9 @@ struct mm_struct {
+@@ -194,6 +194,9 @@ struct mm_struct {
  	unsigned long (*get_unmapped_area) (struct file *filp,
  				unsigned long addr, unsigned long len,
  				unsigned long pgoff, unsigned long flags);
@@ -634,7 +634,7 @@
  /*
   * GPG2 wants 64kB of mlocked memory, to make sure pass phrases
 diff --git a/include/linux/sched.h b/include/linux/sched.h
-index 55e30d1..d400ab0 100644
+index 4cae9b8..71fe593 100644
 --- a/include/linux/sched.h
 +++ b/include/linux/sched.h
 @@ -98,6 +98,9 @@ struct robust_list_head;
@@ -647,7 +647,7 @@
  /*
   * List of flags we want to share for kernel threads,
   * if only because they are not used by them anyway.
-@@ -345,6 +348,10 @@ extern int sysctl_max_map_count;
+@@ -343,6 +346,10 @@ extern int sysctl_max_map_count;
  extern unsigned long
  arch_get_unmapped_area(struct file *, unsigned long, unsigned long,
  		       unsigned long, unsigned long);
@@ -659,13 +659,13 @@
  arch_get_unmapped_area_topdown(struct file *filp, unsigned long addr,
  			  unsigned long len, unsigned long pgoff,
 diff --git a/kernel/sysctl.c b/kernel/sysctl.c
-index 3d56fe7..b512845 100644
+index 89d7443..6ea2333 100644
 --- a/kernel/sysctl.c
 +++ b/kernel/sysctl.c
-@@ -82,6 +82,26 @@ extern int percpu_pagelist_fraction;
- extern int compat_log;
- extern int latencytop_enabled;
- extern int sysctl_nr_open_min, sysctl_nr_open_max;
+@@ -85,6 +85,26 @@ extern int sysctl_nr_open_min, sysctl_nr_open_max;
+ #ifndef CONFIG_MMU
+ extern int sysctl_nr_trim_pages;
+ #endif
 +
 +int exec_shield = (1<<0);
 +/* exec_shield is a bitmask:
@@ -689,7 +689,7 @@
  #ifdef CONFIG_RCU_TORTURE_TEST
  extern int rcutorture_runnable;
  #endif /* #ifdef CONFIG_RCU_TORTURE_TEST */
-@@ -373,6 +393,14 @@ static struct ctl_table kern_table[] = {
+@@ -377,6 +397,14 @@ static struct ctl_table kern_table[] = {
  		.proc_handler	= &proc_dointvec,
  	},
  	{
@@ -705,7 +705,7 @@
  		.procname	= "core_uses_pid",
  		.data		= &core_uses_pid,
 diff --git a/mm/mmap.c b/mm/mmap.c
-index d4855a6..0850042 100644
+index 7496231..4cfb9fe 100644
 --- a/mm/mmap.c
 +++ b/mm/mmap.c
 @@ -27,6 +27,7 @@
@@ -744,7 +744,7 @@
  	if (prev) {
  		vma->vm_next = prev->vm_next;
  		prev->vm_next = vma;
-@@ -494,6 +509,8 @@ __vma_unlink(struct mm_struct *mm, struct vm_area_struct *vma,
+@@ -493,6 +508,8 @@ __vma_unlink(struct mm_struct *mm, struct vm_area_struct *vma,
  	rb_erase(&vma->vm_rb, &mm->mm_rb);
  	if (mm->mmap_cache == vma)
  		mm->mmap_cache = prev;
@@ -753,7 +753,7 @@
  }
  
  /*
-@@ -800,6 +817,8 @@ struct vm_area_struct *vma_merge(struct mm_struct *mm,
+@@ -799,6 +816,8 @@ struct vm_area_struct *vma_merge(struct mm_struct *mm,
  		} else					/* cases 2, 5, 7 */
  			vma_adjust(prev, prev->vm_start,
  				end, prev->vm_pgoff, NULL);
@@ -762,7 +762,7 @@
  		return prev;
  	}
  
-@@ -955,7 +974,8 @@ unsigned long do_mmap_pgoff(struct file * file, unsigned long addr,
+@@ -954,7 +973,8 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
  	/* Obtain the address to map to. we verify (or select) it and ensure
  	 * that it represents a valid section of the address space.
  	 */
@@ -772,7 +772,7 @@
  	if (addr & ~PAGE_MASK)
  		return addr;
  
-@@ -1440,13 +1460,17 @@ void arch_unmap_area_topdown(struct mm_struct *mm, unsigned long addr)
+@@ -1439,13 +1459,17 @@ void arch_unmap_area_topdown(struct mm_struct *mm, unsigned long addr)
  }
  
  unsigned long
@@ -793,7 +793,7 @@
  	if (file && file->f_op && file->f_op->get_unmapped_area)
  		get_area = file->f_op->get_unmapped_area;
  	addr = get_area(file, addr, len, pgoff, flags);
-@@ -1460,8 +1484,74 @@ get_unmapped_area(struct file *file, unsigned long addr, unsigned long len,
+@@ -1459,8 +1483,74 @@ get_unmapped_area(struct file *file, unsigned long addr, unsigned long len,
  
  	return arch_rebalance_pgtables(addr, len);
  }
@@ -868,8 +868,8 @@
 -EXPORT_SYMBOL(get_unmapped_area);
  
  /* Look up the first VMA which satisfies  addr < vm_end,  NULL if none. */
- struct vm_area_struct * find_vma(struct mm_struct * mm, unsigned long addr)
-@@ -1536,6 +1626,14 @@ out:
+ struct vm_area_struct *find_vma(struct mm_struct *mm, unsigned long addr)
+@@ -1535,6 +1625,14 @@ out:
  	return prev ? prev->vm_next : vma;
  }
  
@@ -884,7 +884,7 @@
  /*
   * Verify that the stack growth is acceptable and
   * update accounting. This is shared with both the
-@@ -1552,7 +1650,7 @@ static int acct_stack_growth(struct vm_area_struct * vma, unsigned long size, un
+@@ -1551,7 +1649,7 @@ static int acct_stack_growth(struct vm_area_struct *vma, unsigned long size, uns
  		return -ENOMEM;
  
  	/* Stack limit test */
@@ -893,7 +893,7 @@
  		return -ENOMEM;
  
  	/* mlock limit tests */
-@@ -1862,10 +1960,14 @@ int split_vma(struct mm_struct * mm, struct vm_area_struct * vma,
+@@ -1861,10 +1959,14 @@ int split_vma(struct mm_struct * mm, struct vm_area_struct * vma,
  	if (new->vm_ops && new->vm_ops->open)
  		new->vm_ops->open(new);
  
@@ -910,7 +910,7 @@
  		vma_adjust(vma, vma->vm_start, addr, vma->vm_pgoff, new);
  
  	return 0;
-@@ -2109,6 +2211,7 @@ void exit_mmap(struct mm_struct *mm)
+@@ -2111,6 +2213,7 @@ void exit_mmap(struct mm_struct *mm)
  	vm_unacct_memory(nr_accounted);
  	free_pgtables(tlb, vma, FIRST_USER_ADDRESS, 0);
  	tlb_finish_mmu(tlb, 0, end);
@@ -919,11 +919,11 @@
  	/*
  	 * Walk the list again, actually closing and freeing it,
 diff --git a/mm/mprotect.c b/mm/mprotect.c
-index fded06f..cdfcbd2 100644
+index d0f6e7c..d51a400 100644
 --- a/mm/mprotect.c
 +++ b/mm/mprotect.c
-@@ -24,8 +24,15 @@
- #include <linux/mmu_notifier.h>
+@@ -25,8 +25,15 @@
+ #include <linux/migrate.h>
  #include <asm/uaccess.h>
  #include <asm/pgtable.h>
 +#include <asm/pgalloc.h>
@@ -938,7 +938,7 @@
  
  #ifndef pgprot_modify
  static inline pgprot_t pgprot_modify(pgprot_t oldprot, pgprot_t newprot)
-@@ -140,7 +147,7 @@ mprotect_fixup(struct vm_area_struct *vma, struct vm_area_struct **pprev,
+@@ -138,7 +145,7 @@ mprotect_fixup(struct vm_area_struct *vma, struct vm_area_struct **pprev,
  	struct mm_struct *mm = vma->vm_mm;
  	unsigned long oldflags = vma->vm_flags;
  	long nrpages = (end - start) >> PAGE_SHIFT;
@@ -947,7 +947,7 @@
  	pgoff_t pgoff;
  	int error;
  	int dirty_accountable = 0;
-@@ -204,6 +211,9 @@ success:
+@@ -202,6 +209,9 @@ success:
  		dirty_accountable = 1;
  	}
  
@@ -958,7 +958,7 @@
  	if (is_vm_hugetlb_page(vma))
  		hugetlb_change_protection(vma, start, end, vma->vm_page_prot);
 diff --git a/mm/mremap.c b/mm/mremap.c
-index 58a2908..5bb50e6 100644
+index 646de95..b77db03 100644
 --- a/mm/mremap.c
 +++ b/mm/mremap.c
 @@ -400,8 +400,8 @@ unsigned long do_mremap(unsigned long addr,


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v
retrieving revision 1.948
retrieving revision 1.949
diff -u -r1.948 -r1.949
--- sources	9 Jan 2009 16:43:22 -0000	1.948
+++ sources	10 Jan 2009 07:46:12 -0000	1.949
@@ -1,2 +1,2 @@
 d351e44709c9810b85e29b877f50968a  linux-2.6.28.tar.bz2
-6259970262260a17e7812b0d9cabcd33  patch-2.6.28-git13.bz2
+423b6971fbd26d2140309825b8fb0748  patch-2.6.28-git14.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v
retrieving revision 1.860
retrieving revision 1.861
diff -u -r1.860 -r1.861
--- upstream	9 Jan 2009 16:43:22 -0000	1.860
+++ upstream	10 Jan 2009 07:46:12 -0000	1.861
@@ -1,2 +1,2 @@
 linux-2.6.28.tar.bz2
-patch-2.6.28-git13.bz2
+patch-2.6.28-git14.bz2


--- linux-2.6-squashfs.patch DELETED ---


--- patch-2.6.28-git13.bz2.sign DELETED ---



From denis at fedoraproject.org  Sat Jan 10 10:48:21 2009
From: denis at fedoraproject.org (Denis Leroy)
Date: Sat, 10 Jan 2009 10:48:21 +0000 (UTC)
Subject: rpms/gstreamer-python/devel .cvsignore, 1.13,
	1.14 gstreamer-python.spec, 1.26, 1.27 sources, 1.13, 1.14
Message-ID: <20090110104821.628517012C@cvs1.fedora.phx.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/gstreamer-python/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10067

Modified Files:
	.cvsignore gstreamer-python.spec sources 
Log Message:
- Update to upstraem 0.10.13
- Forked devel package with pkgconfig file (#477310)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamer-python/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	25 Aug 2008 10:40:37 -0000	1.13
+++ .cvsignore	10 Jan 2009 10:47:50 -0000	1.14
@@ -1 +1 @@
-gst-python-0.10.12.tar.bz2
+gst-python-0.10.13.tar.bz2


Index: gstreamer-python.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamer-python/devel/gstreamer-python.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- gstreamer-python.spec	29 Nov 2008 16:37:12 -0000	1.26
+++ gstreamer-python.spec	10 Jan 2009 10:47:50 -0000	1.27
@@ -1,8 +1,8 @@
 %define         majorminor      0.10
 
 Name:           gstreamer-python
-Version:        0.10.12
-Release:        2%{?dist}
+Version:        0.10.13
+Release:        1%{?dist}
 Summary:        Python bindings for GStreamer
 
 Group:          Development/Languages
@@ -34,6 +34,20 @@
 to be written in Python.
 
 
+%package        devel
+Summary:        Headers for developing programs that will use %{name}
+Group:          Development/Libraries
+Requires:       %{name} = %{version}-%{release}
+Requires:       pkgconfig
+Requires:       pygtk2-devel
+Requires:       gstreamer-devel
+
+
+%description devel
+This package contains the static libraries and header files needed for
+developing gstreamer-python applications.
+
+
 %prep
 %setup -q -n gst-python-%{version}
 %{__sed} -i 's|^#!/usr/bin/env python$|#|' gst/extend/*.py
@@ -61,7 +75,6 @@
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog NEWS README
-%doc docs-to-include/*
 %{_libdir}/python?.?/site-packages/gst-%{majorminor}
 %{_libdir}/python?.?/site-packages/pygst.py*
 %{_libdir}/python?.?/site-packages/pygst.pth
@@ -70,10 +83,19 @@
 %dir %{_datadir}/gst-python/%{majorminor}
 %dir %{_datadir}/gst-python/%{majorminor}/defs
 %{_datadir}/gst-python/%{majorminor}/defs/*.defs
+
+
+%files devel
+%defattr(-,root,root,-)
+%doc docs-to-include/*
 %{_libdir}/pkgconfig/gst-python-%{majorminor}.pc
 
 
 %changelog
+* Sat Jan 10 2009 Denis Leroy <denis at poolshark.org> - 0.10.13-1
+- Update to upstraem 0.10.13
+- Forked devel package with pkgconfig file (#477310)
+
 * Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 0.10.12-2
 - Rebuild for Python 2.6
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamer-python/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	25 Aug 2008 10:40:37 -0000	1.13
+++ sources	10 Jan 2009 10:47:51 -0000	1.14
@@ -1 +1 @@
-e5d39eed5062ab1521abc61a6863f7b3  gst-python-0.10.12.tar.bz2
+579f2026b128cbaec88b4e5209511070  gst-python-0.10.13.tar.bz2



From mschwendt at fedoraproject.org  Sat Jan 10 10:50:10 2009
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Sat, 10 Jan 2009 10:50:10 +0000 (UTC)
Subject: rpms/audacity/devel audacity.spec,1.58.2.10,1.58.2.11
Message-ID: <20090110105010.26FA57012C@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/pkgs/rpms/audacity/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10545

Modified Files:
      Tag: audacity-1_3_6-test
	audacity.spec 
Log Message:
SLV2 and deps in bz 470914


Index: audacity.spec
===================================================================
RCS file: /cvs/pkgs/rpms/audacity/devel/audacity.spec,v
retrieving revision 1.58.2.10
retrieving revision 1.58.2.11
diff -u -r1.58.2.10 -r1.58.2.11
--- audacity.spec	17 Dec 2008 20:10:32 -0000	1.58.2.10
+++ audacity.spec	10 Jan 2009 10:49:39 -0000	1.58.2.11
@@ -38,6 +38,7 @@
 BuildRequires: wxGTK-devel
 %{?_with_mp3:BuildRequires: libmad-devel}
 
+BuildRequires: slv2-devel
 BuildRequires: liblrdf-devel
 #BuildRequires: redland-devel
 



From pkgdb at fedoraproject.org  Sat Jan 10 12:19:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 10 Jan 2009 12:19:53 +0000
Subject: [pkgdb] btrfs-progs: mmahut has requested watchbugzilla
Message-ID: <20090110121953.7FBE520831D@bastion.fedora.phx.redhat.com>

mmahut has requested the watchbugzilla acl on btrfs-progs (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/btrfs-progs



From pkgdb at fedoraproject.org  Sat Jan 10 12:19:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 10 Jan 2009 12:19:56 +0000
Subject: [pkgdb] btrfs-progs: mmahut has requested watchcommits
Message-ID: <20090110121956.23E10208455@bastion.fedora.phx.redhat.com>

mmahut has requested the watchcommits acl on btrfs-progs (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/btrfs-progs



From pkgdb at fedoraproject.org  Sat Jan 10 12:19:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 10 Jan 2009 12:19:59 +0000
Subject: [pkgdb] btrfs-progs: mmahut has requested commit
Message-ID: <20090110121959.62514208458@bastion.fedora.phx.redhat.com>

mmahut has requested the commit acl on btrfs-progs (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/btrfs-progs



From pkgdb at fedoraproject.org  Sat Jan 10 12:20:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 10 Jan 2009 12:20:02 +0000
Subject: [pkgdb] btrfs-progs: mmahut has requested approveacls
Message-ID: <20090110122002.AE78F208468@bastion.fedora.phx.redhat.com>

mmahut has requested the approveacls acl on btrfs-progs (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/btrfs-progs



From pkgdb at fedoraproject.org  Sat Jan 10 12:20:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 10 Jan 2009 12:20:09 +0000
Subject: [pkgdb] btrfs-progs: mmahut has requested watchbugzilla
Message-ID: <20090110122009.EC30720831D@bastion.fedora.phx.redhat.com>

mmahut has requested the watchbugzilla acl on btrfs-progs (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/btrfs-progs



From pkgdb at fedoraproject.org  Sat Jan 10 12:20:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 10 Jan 2009 12:20:12 +0000
Subject: [pkgdb] btrfs-progs: mmahut has requested watchcommits
Message-ID: <20090110122012.EB94720846E@bastion.fedora.phx.redhat.com>

mmahut has requested the watchcommits acl on btrfs-progs (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/btrfs-progs



From pkgdb at fedoraproject.org  Sat Jan 10 12:20:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 10 Jan 2009 12:20:15 +0000
Subject: [pkgdb] btrfs-progs: mmahut has requested commit
Message-ID: <20090110122015.89BBA208472@bastion.fedora.phx.redhat.com>

mmahut has requested the commit acl on btrfs-progs (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/btrfs-progs



From pkgdb at fedoraproject.org  Sat Jan 10 12:20:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 10 Jan 2009 12:20:18 +0000
Subject: [pkgdb] btrfs-progs: mmahut has requested approveacls
Message-ID: <20090110122018.1261C208421@bastion.fedora.phx.redhat.com>

mmahut has requested the approveacls acl on btrfs-progs (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/btrfs-progs



From mmahut at fedoraproject.org  Sat Jan 10 12:27:26 2009
From: mmahut at fedoraproject.org (Marek Mahut)
Date: Sat, 10 Jan 2009 12:27:26 +0000 (UTC)
Subject: rpms/btrfs-progs/devel .cvsignore, 1.2, 1.3 btrfs-progs.spec, 1.1, 
	1.2 sources, 1.2, 1.3
Message-ID: <20090110122727.188FB7012C@cvs1.fedora.phx.redhat.com>

Author: mmahut

Update of /cvs/pkgs/rpms/btrfs-progs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19267

Modified Files:
	.cvsignore btrfs-progs.spec sources 
Log Message:
upstream release 0.16



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/btrfs-progs/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	30 Jun 2008 19:37:31 -0000	1.2
+++ .cvsignore	10 Jan 2009 12:26:55 -0000	1.3
@@ -1 +1 @@
-btrfs-progs-0.15.tar.bz2
+btrfs-progs-0.16.tar.bz2


Index: btrfs-progs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/btrfs-progs/devel/btrfs-progs.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- btrfs-progs.spec	30 Jun 2008 19:37:31 -0000	1.1
+++ btrfs-progs.spec	10 Jan 2009 12:26:55 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           btrfs-progs
-Version:        0.15
-Release:        4%{?dist}
+Version:        0.16
+Release:        1%{?dist}
 Summary:        Userspace programs for btrfs
 
 Group:          System Environment/Base
@@ -41,6 +41,9 @@
 %{_root_sbindir}/btrfs-vol
 
 %changelog
+* Sat Jan 10 2008 Marek Mahut <mmahut at fedoraproject.org> 0.16-1
+- Upstream release 0.16
+
 * Mon Jun 25 2008 Josef Bacik <josef at toxicpanda.com> 0.15-4
 -use fedoras normal CFLAGS
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/btrfs-progs/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	30 Jun 2008 19:37:31 -0000	1.2
+++ sources	10 Jan 2009 12:26:55 -0000	1.3
@@ -1 +1 @@
-fabd80e8a9ea2d035491815ebefb6930  btrfs-progs-0.15.tar.bz2
+a22ce61c76c58fbf324832a65c1864f8  btrfs-progs-0.16.tar.bz2



From mmahut at fedoraproject.org  Sat Jan 10 12:29:19 2009
From: mmahut at fedoraproject.org (Marek Mahut)
Date: Sat, 10 Jan 2009 12:29:19 +0000 (UTC)
Subject: rpms/btrfs-progs/devel btrfs-progs.spec,1.2,1.3
Message-ID: <20090110122919.994647012C@cvs1.fedora.phx.redhat.com>

Author: mmahut

Update of /cvs/pkgs/rpms/btrfs-progs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19432

Modified Files:
	btrfs-progs.spec 
Log Message:
we are in 2009!



Index: btrfs-progs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/btrfs-progs/devel/btrfs-progs.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- btrfs-progs.spec	10 Jan 2009 12:26:55 -0000	1.2
+++ btrfs-progs.spec	10 Jan 2009 12:28:49 -0000	1.3
@@ -41,7 +41,7 @@
 %{_root_sbindir}/btrfs-vol
 
 %changelog
-* Sat Jan 10 2008 Marek Mahut <mmahut at fedoraproject.org> 0.16-1
+* Sat Jan 10 2009 Marek Mahut <mmahut at fedoraproject.org> 0.16-1
 - Upstream release 0.16
 
 * Mon Jun 25 2008 Josef Bacik <josef at toxicpanda.com> 0.15-4



From twaugh at fedoraproject.org  Sat Jan 10 12:39:16 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Sat, 10 Jan 2009 12:39:16 +0000 (UTC)
Subject: rpms/foomatic/devel .cvsignore, 1.69, 1.70 foomatic.spec, 1.210,
	1.211 sources, 1.71, 1.72
Message-ID: <20090110123916.785A77012C@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/foomatic/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20204

Modified Files:
	.cvsignore foomatic.spec sources 
Log Message:
* Sat Jan 10 2009 Tim Waugh <twaugh at redhat.com> 3.0.2-69
- Updated db-hpijs to 20090110.
- Updated db to 20090110.
- Updated filters to 3.0-20090110.
- Updated db-engine to 3.0-20090110.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/foomatic/devel/.cvsignore,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- .cvsignore	4 Dec 2008 16:49:30 -0000	1.69
+++ .cvsignore	10 Jan 2009 12:38:45 -0000	1.70
@@ -66,3 +66,7 @@
 foomatic-filters-3.0-20081124.tar.gz
 foomatic-db-3.0-20081124.tar.gz
 foomatic-db-hpijs-20081124.tar.gz
+foomatic-db-engine-3.0-20090110.tar.gz
+foomatic-db-3.0-20090110.tar.gz
+foomatic-db-hpijs-20090110.tar.gz
+foomatic-filters-3.0-20090110.tar.gz


Index: foomatic.spec
===================================================================
RCS file: /cvs/pkgs/rpms/foomatic/devel/foomatic.spec,v
retrieving revision 1.210
retrieving revision 1.211
diff -u -r1.210 -r1.211
--- foomatic.spec	4 Dec 2008 16:49:31 -0000	1.210
+++ foomatic.spec	10 Jan 2009 12:38:46 -0000	1.211
@@ -1,12 +1,12 @@
-%define dbver 20081124
-%define enginever 3.0-20081124
-%define filtersver 20081124
-%define hpijsver 20081124
+%define dbver 20090110
+%define enginever 3.0-20090110
+%define filtersver 20090110
+%define hpijsver 20090110
 
 Summary: Database of printers and printer drivers
 Name:		foomatic
 Version:	3.0.2
-Release:    68%{?dist}
+Release:    69%{?dist}
 License:	GPLv2+
 Group: System Environment/Libraries
 
@@ -232,6 +232,12 @@
 %{_var}/cache/foomatic
 
 %changelog
+* Sat Jan 10 2009 Tim Waugh <twaugh at redhat.com> 3.0.2-69
+- Updated db-hpijs to 20090110.
+- Updated db to 20090110.
+- Updated filters to 3.0-20090110.
+- Updated db-engine to 3.0-20090110.
+
 * Thu Dec  3 2008 Tim Waugh <twaugh at redhat.com> 3.0.2-68
 - Updated db-hpijs to 20081124.
 - Updated db to 20081124.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/foomatic/devel/sources,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- sources	4 Dec 2008 16:49:31 -0000	1.71
+++ sources	10 Jan 2009 12:38:46 -0000	1.72
@@ -1,4 +1,4 @@
-6921245dfdafa634cdd9587cd78fe13b  foomatic-db-engine-3.0-20081124.tar.gz
-0d1ef15005832b96c5ef4be5944405ee  foomatic-filters-3.0-20081124.tar.gz
-4706663cfd821193310ac65ebb7e0bd6  foomatic-db-3.0-20081124.tar.gz
-596dc481e325bbd4eb0ae8a9424d9b26  foomatic-db-hpijs-20081124.tar.gz
+cfd3335798141fa5892693b39c71f71c  foomatic-db-engine-3.0-20090110.tar.gz
+8948e38765cb108221cfb3d1c9af0dd0  foomatic-db-3.0-20090110.tar.gz
+aa6b0fd89f33fcef91a3a7081b44fc36  foomatic-db-hpijs-20090110.tar.gz
+0d8702e00187a54d5cfd4cdfbab682e1  foomatic-filters-3.0-20090110.tar.gz



From twaugh at fedoraproject.org  Sat Jan 10 13:01:55 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Sat, 10 Jan 2009 13:01:55 +0000 (UTC)
Subject: rpms/gutenprint/devel gutenprint-foomaticppdupdate, 1.2,
	1.3 gutenprint.spec, 1.44, 1.45
Message-ID: <20090110130155.33E217012C@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/gutenprint/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22353

Modified Files:
	gutenprint-foomaticppdupdate gutenprint.spec 
Log Message:
* Sat Jan 10 2009 Tim Waugh <twaugh at redhat.com> 5.2.3-3
- Don't use popen2 in the foomatic PPD update script.



Index: gutenprint-foomaticppdupdate
===================================================================
RCS file: /cvs/pkgs/rpms/gutenprint/devel/gutenprint-foomaticppdupdate,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gutenprint-foomaticppdupdate	8 Jan 2009 16:18:46 -0000	1.2
+++ gutenprint-foomaticppdupdate	10 Jan 2009 13:01:24 -0000	1.3
@@ -25,7 +25,7 @@
 import sys
 import glob
 import os
-import popen2
+import subprocess
 import tempfile
 
 import cups
@@ -38,15 +38,14 @@
 dry_run = True
 
 def generate_ppd (ppdfile, printer, driver):
-    (r, w) = popen2.popen2 (["foomatic-ppdfile",
-                             "-p", printer,
-                             "-d", driver])
-    w.close ()
-    ppd = r.readlines ()
-    r.close ()
+    p = subprocess.Popen (["foomatic-ppdfile", "-p", printer, "-d", driver],
+                          stdin=file ("/dev/null"),
+                          stdout=subprocess.PIPE,
+                          stderr=subprocess.PIPE)
+    (ppd, stderr) = p.communicate ()
     fname = ppdfile + ".tmp"
     try:
-        file(fname, "w").writelines (ppd)
+        file(fname, "w").write (ppd)
     except IOError, e:
         print e
         raise


Index: gutenprint.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gutenprint/devel/gutenprint.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- gutenprint.spec	8 Jan 2009 16:18:46 -0000	1.44
+++ gutenprint.spec	10 Jan 2009 13:01:24 -0000	1.45
@@ -4,7 +4,7 @@
 Name:           gutenprint
 Summary:        Printer Drivers Package.
 Version:        5.2.3
-Release:        2%{?dist}
+Release:        3%{?dist}
 Group:          System Environment/Base
 URL:            http://gimp-print.sourceforge.net/
 Source0:        http://dl.sf.net/gimp-print/gutenprint-%{version}.tar.bz2
@@ -254,6 +254,9 @@
 /bin/rm -f /var/cache/foomatic/*
 
 %changelog
+* Sat Jan 10 2009 Tim Waugh <twaugh at redhat.com> 5.2.3-3
+- Don't use popen2 in the foomatic PPD update script.
+
 * Thu Jan  8 2009 Tim Waugh <twaugh at redhat.com> 5.2.3-2
 - Only run the foomatic PPD update script on update, and make sure the
   script can deal with major version upgrades (bug #478328).



From twaugh at fedoraproject.org  Sat Jan 10 13:12:01 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Sat, 10 Jan 2009 13:12:01 +0000 (UTC)
Subject: rpms/gutenprint/F-10 gutenprint-foomaticppdupdate, 1.2,
	1.3 gutenprint.spec, 1.43, 1.44
Message-ID: <20090110131201.0AB947012C@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/gutenprint/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23163

Modified Files:
	gutenprint-foomaticppdupdate gutenprint.spec 
Log Message:
* Sat Jan 10 2009 Tim Waugh <twaugh at redhat.com> 5.2.3-3
- Don't use popen2 in the foomatic PPD update script.



Index: gutenprint-foomaticppdupdate
===================================================================
RCS file: /cvs/pkgs/rpms/gutenprint/F-10/gutenprint-foomaticppdupdate,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gutenprint-foomaticppdupdate	8 Jan 2009 16:19:44 -0000	1.2
+++ gutenprint-foomaticppdupdate	10 Jan 2009 13:11:30 -0000	1.3
@@ -25,7 +25,7 @@
 import sys
 import glob
 import os
-import popen2
+import subprocess
 import tempfile
 
 import cups
@@ -38,15 +38,14 @@
 dry_run = True
 
 def generate_ppd (ppdfile, printer, driver):
-    (r, w) = popen2.popen2 (["foomatic-ppdfile",
-                             "-p", printer,
-                             "-d", driver])
-    w.close ()
-    ppd = r.readlines ()
-    r.close ()
+    p = subprocess.Popen (["foomatic-ppdfile", "-p", printer, "-d", driver],
+                          stdin=file ("/dev/null"),
+                          stdout=subprocess.PIPE,
+                          stderr=subprocess.PIPE)
+    (ppd, stderr) = p.communicate ()
     fname = ppdfile + ".tmp"
     try:
-        file(fname, "w").writelines (ppd)
+        file(fname, "w").write (ppd)
     except IOError, e:
         print e
         raise


Index: gutenprint.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gutenprint/F-10/gutenprint.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- gutenprint.spec	8 Jan 2009 16:19:44 -0000	1.43
+++ gutenprint.spec	10 Jan 2009 13:11:30 -0000	1.44
@@ -4,7 +4,7 @@
 Name:           gutenprint
 Summary:        Printer Drivers Package.
 Version:        5.2.3
-Release:        2%{?dist}
+Release:        3%{?dist}
 Group:          System Environment/Base
 URL:            http://gimp-print.sourceforge.net/
 Source0:        http://dl.sf.net/gimp-print/gutenprint-%{version}.tar.bz2
@@ -254,6 +254,9 @@
 /bin/rm -f /var/cache/foomatic/*
 
 %changelog
+* Sat Jan 10 2009 Tim Waugh <twaugh at redhat.com> 5.2.3-3
+- Don't use popen2 in the foomatic PPD update script.
+
 * Thu Jan  8 2009 Tim Waugh <twaugh at redhat.com> 5.2.3-2
 - Only run the foomatic PPD update script on update, and make sure the
   script can deal with major version upgrades (bug #478328).



From belegdol at fedoraproject.org  Sat Jan 10 13:39:48 2009
From: belegdol at fedoraproject.org (Julian Sikorski)
Date: Sat, 10 Jan 2009 13:39:48 +0000 (UTC)
Subject: rpms/museek+/devel museek+.spec,1.7,1.8 sources,1.4,1.5
Message-ID: <20090110133948.A19387012C@cvs1.fedora.phx.redhat.com>

Author: belegdol

Update of /cvs/extras/rpms/museek+/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25904

Modified Files:
	museek+.spec sources 
Log Message:
* Sat Jan 10 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.2-0.1.20090110svn1063
- Updated to SVN revision 1063
- Added libevent-devel to BuildRequires



Index: museek+.spec
===================================================================
RCS file: /cvs/extras/rpms/museek+/devel/museek+.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- museek+.spec	30 Nov 2008 09:54:55 -0000	1.7
+++ museek+.spec	10 Jan 2009 13:39:18 -0000	1.8
@@ -2,7 +2,7 @@
 
 Name:           museek+
 Version:        0.2
-Release:        0.1.20081126svn1027%{?dist}
+Release:        0.1.20090110svn1063%{?dist}
 Summary:        A Soulseek filesharing client
 
 Group:          Applications/Internet
@@ -14,6 +14,7 @@
 
 BuildRequires:  desktop-file-utils
 BuildRequires:  python-devel
+BuildRequires:  libevent-devel
 BuildRequires:  libxml++-devel
 BuildRequires:  qt4-devel
 BuildRequires:  gamin-devel
@@ -201,6 +202,10 @@
 
 
 %changelog
+* Sat Jan 10 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.2-0.1.20090110svn1063
+- Updated to SVN revision 1063
+- Added libevent-devel to BuildRequires
+
 * Sun Nov 30 2008 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.2-0.1.20081126svn1027
 - Updated to 0.2 SVN snapshot
 - Split the package into several parts


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/museek+/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	30 Nov 2008 09:54:55 -0000	1.4
+++ sources	10 Jan 2009 13:39:18 -0000	1.5
@@ -1 +1 @@
-b6983ee4c97b4be058b2f87ee479e4d1  museek+-snapshot.tar.bz2
+49331721bbe2ca14fb5f26b84228ea35  museek+-snapshot.tar.bz2



From hadess at fedoraproject.org  Sat Jan 10 13:42:15 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Sat, 10 Jan 2009 13:42:15 +0000 (UTC)
Subject: rpms/nautilus-sendto/devel .cvsignore, 1.16,
	1.17 nautilus-sendto.spec, 1.57, 1.58 sources, 1.16, 1.17
Message-ID: <20090110134215.16C277012C@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/nautilus-sendto/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26161

Modified Files:
	.cvsignore nautilus-sendto.spec sources 
Log Message:
* Sat Jan 10 2009 - Bastien Nocera <bnocera at redhat.com> - 1.1.1
- Update to 1.1.1
- Add UPNP and Empathy plugins



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/nautilus-sendto/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore	24 Sep 2008 01:10:10 -0000	1.16
+++ .cvsignore	10 Jan 2009 13:41:44 -0000	1.17
@@ -1 +1 @@
-nautilus-sendto-1.1.0.tar.bz2
+nautilus-sendto-1.1.1.tar.bz2


Index: nautilus-sendto.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nautilus-sendto/devel/nautilus-sendto.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- nautilus-sendto.spec	24 Sep 2008 01:10:11 -0000	1.57
+++ nautilus-sendto.spec	10 Jan 2009 13:41:44 -0000	1.58
@@ -1,5 +1,5 @@
 Name:           nautilus-sendto
-Version:        1.1.0
+Version:        1.1.1
 Release: 	1%{?dist}
 Summary:        Nautilus context menu for sending files
 
@@ -13,11 +13,13 @@
 BuildRequires:  libglade2-devel
 BuildRequires:  evolution-data-server-devel >= 1.9.1
 BuildRequires:  libgnomeui-devel
-BuildRequires:	nautilus-devel >= 2.5.4
+BuildRequires:  nautilus-devel >= 2.5.4
 BuildRequires:  pidgin-devel >= 2.0.0
 BuildRequires:  gettext
 BuildRequires:  perl-XML-Parser intltool
 BuildRequires:  dbus-glib-devel >= 0.70
+BuildRequires:  gupnp-av-devel
+BuildRequires:  empathy-devel
 
 Requires(pre): GConf2
 Requires(post): GConf2
@@ -91,6 +93,10 @@
 %{_mandir}/man1/nautilus-sendto.1.gz
 
 %changelog
+* Sat Jan 10 2009 - Bastien Nocera <bnocera at redhat.com> - 1.1.1
+- Update to 1.1.1
+- Add UPNP and Empathy plugins
+
 * Tue Sep 23 2008 - Bastien Nocera <bnocera at redhat.com> - 1.1.0
 - Update to 1.1.0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nautilus-sendto/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources	24 Sep 2008 01:10:11 -0000	1.16
+++ sources	10 Jan 2009 13:41:44 -0000	1.17
@@ -1 +1 @@
-fb2e115a33653496416847c61477b857  nautilus-sendto-1.1.0.tar.bz2
+7cb588e0c84ff7dd339d1203938802af  nautilus-sendto-1.1.1.tar.bz2



From awjb at fedoraproject.org  Sat Jan 10 13:55:48 2009
From: awjb at fedoraproject.org (Andreas Bierfert)
Date: Sat, 10 Jan 2009 13:55:48 +0000 (UTC)
Subject: rpms/libnasl/F-10 libnasl.spec,1.15,1.16
Message-ID: <20090110135548.10C537012C@cvs1.fedora.phx.redhat.com>

Author: awjb

Update of /cvs/pkgs/rpms/libnasl/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27380/F-10

Modified Files:
	libnasl.spec 
Log Message:
- add doc changes from devel



Index: libnasl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libnasl/F-10/libnasl.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- libnasl.spec	23 Nov 2008 11:24:04 -0000	1.15
+++ libnasl.spec	10 Jan 2009 13:55:17 -0000	1.16
@@ -1,6 +1,6 @@
 Name:           libnasl
 Version:        2.2.11
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Nessus Attack Scripting Language
 
 Group:          System Environment/Libraries
@@ -99,10 +99,12 @@
 
 %files doc
 %defattr(-,root,root,-)
-%dir %{_datadir}/libnasl
-%{_datadir}/libnasl/doc/*
+%doc %{_datadir}/libnasl/
 
 %changelog
+* Mon Dec  1 2008 Michael Schwendt <mschwendt at fedoraproject.org> - 2.2.11-2
+- in doc pkg: include missing dirs and mark files as %%doc
+
 * Sun Nov 23 2008 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 - 2.2.11-1
 - version upgrade



From awjb at fedoraproject.org  Sat Jan 10 13:55:48 2009
From: awjb at fedoraproject.org (Andreas Bierfert)
Date: Sat, 10 Jan 2009 13:55:48 +0000 (UTC)
Subject: rpms/libnasl/F-9 libnasl.spec,1.15,1.16
Message-ID: <20090110135548.2EDA47012C@cvs1.fedora.phx.redhat.com>

Author: awjb

Update of /cvs/pkgs/rpms/libnasl/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27380/F-9

Modified Files:
	libnasl.spec 
Log Message:
- add doc changes from devel



Index: libnasl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libnasl/F-9/libnasl.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- libnasl.spec	23 Nov 2008 11:24:07 -0000	1.15
+++ libnasl.spec	10 Jan 2009 13:55:17 -0000	1.16
@@ -1,6 +1,6 @@
 Name:           libnasl
 Version:        2.2.11
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Nessus Attack Scripting Language
 
 Group:          System Environment/Libraries
@@ -99,10 +99,12 @@
 
 %files doc
 %defattr(-,root,root,-)
-%dir %{_datadir}/libnasl
-%{_datadir}/libnasl/doc/*
+%doc %{_datadir}/libnasl/
 
 %changelog
+* Mon Dec  1 2008 Michael Schwendt <mschwendt at fedoraproject.org> - 2.2.11-2
+- in doc pkg: include missing dirs and mark files as %%doc
+
 * Sun Nov 23 2008 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 - 2.2.11-1
 - version upgrade



From frankb at fedoraproject.org  Sat Jan 10 13:56:01 2009
From: frankb at fedoraproject.org (=?utf-8?q?Frank_B=C3=BCttner?=)
Date: Sat, 10 Jan 2009 13:56:01 +0000 (UTC)
Subject: rpms/qtiplot/devel .cvsignore, 1.2, 1.3 qtiplot.spec, 1.4,
	1.5 sources, 1.2, 1.3
Message-ID: <20090110135601.8D5C77012C@cvs1.fedora.phx.redhat.com>

Author: frankb

Update of /cvs/pkgs/rpms/qtiplot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27497

Modified Files:
	.cvsignore qtiplot.spec sources 
Log Message:
- update to 0.9.7.4



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qtiplot/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	21 Oct 2007 18:16:02 -0000	1.2
+++ .cvsignore	10 Jan 2009 13:55:31 -0000	1.3
@@ -1,2 +1 @@
-colormaps.tgz
-qtiplot-0.9.tar.bz2
+qtiplot-0.9.7.4.tar.bz2


Index: qtiplot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qtiplot/devel/qtiplot.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- qtiplot.spec	15 Dec 2008 13:36:20 -0000	1.4
+++ qtiplot.spec	10 Jan 2009 13:55:31 -0000	1.5
@@ -1,7 +1,7 @@
 Name:		qtiplot
 Summary:	Data Analysis and Scientific Plotting
-Version:	0.9
-Release:	11%{?dist}
+Version:	0.9.7.4
+Release:	1%{?dist}
 #>4.2 is needed for qtiplot
 BuildRequires:	qt4-devel >= 4.2 
 BuildRequires:	qwt-devel
@@ -10,22 +10,27 @@
 BuildRequires:	muParser-devel
 BuildRequires:	desktop-file-utils
 BuildRequires:	dos2unix
-#python-devel comes with sip-devel
-#BuildRequires:	python-devel
-BuildRequires:	PyQt4-devel
-#sip-devel comes with PyQt4-devel
-#BuildRequires:	sip-devel
-
 %if 0%{?rhel} > 4
+%define withPython 0
 %define epel5mode 1
 %else
+%define withPython 1
 %define epel5mode 0
 %endif
 
+%if %{withPython}
+#python-devel comes with sip-devel
+#BuildRequires:	python-devel
+BuildRequires:	PyQt4-devel 
+#sip-devel comes with PyQt4-devel
+#BuildRequires:	sip-devel
+%endif
+
 URL:		http://soft.proindependent.com/qtiplot.html
 License:	GPLv2+
 Group:		Applications/Publishing
 Source0:	http://soft.proindependent.com/src/%{name}-%{version}.tar.bz2
+#Source0:	http://soft.proindependent.com/src/%{name}-0.9.7.4.tar.bz2
 Source1:	http://soft.proindependent.com/misc/colormaps.tgz
 Source2:	%{name}.desktop
 Patch0:		qtiplot-path.patch
@@ -42,7 +47,12 @@
 %prep
 %setup -q -n %{name}-%{version}
 %patch0 -p1
-%patch1 -p1
+%if %{withPython}
+echo "Build with Python"
+%else
+echo "Build without Python"
+sed -i "s/SCRIPTING_LANGS\ =+\ Python/#/1" qtiplot/qtiplot.pro
+%endif
 sed -i "s\MUPARSERINC\ %{_includedir}/\1" qtiplot/qtiplot.pro
 sed -i "s\QWTPLOT3DINC\ %{_includedir}/qwtplot3d\1" qtiplot/qtiplot.pro
 sed -i "s\QWTINC\ %{_includedir}/qwt\1" qtiplot/qtiplot.pro
@@ -106,8 +116,8 @@
 mkdir -p $RPM_BUILD_ROOT/%{_datadir}/pixmaps
 install -m 0644 -p qtiplot_logo.png $RPM_BUILD_ROOT/%{_datadir}/pixmaps/qtiplot_logo.png
 
-#post -p /sbin/ldconfig
-#postun -p /sbin/ldconfig
+post -p /sbin/ldconfig
+postun -p /sbin/ldconfig
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -123,14 +133,15 @@
 
 
 %changelog
-* Mon Dec 15 2008 Caol??n McNamara <caolanm at redhat.com> - 0.9-11
-- rebuild
+* Sat Jan 10 2009 Frank B??ttner <frank-buettner at gmx.net> - 0.9.7.4-1
+  - update to 0.9.7.4
 
-* Sun Nov 30 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 0.9-10
-- Rebuild for Python 2.6
+* Thu Jan 23 2008 Frank B??ttner <frank-buettner at gmx.net> - 0.9.3rc2-1
+ - update to 0.9.3rc2
 
-* Mon Feb 18 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.9-9
-- Autorebuild for GCC 4.3
+* Sat Nov 17 2007 Frank B??ttner <frank-buettner at gmx.net> - 0.9.1-1
+ - update to 0.9.1
+ - disable Python support on EPEL because Qt Python support is broken
 
 * Sat Oct 20 2007 Frank B??ttner <frank-buettner at gmx.net> - 0.9-8
  - fix encoding of the source files for debug package


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qtiplot/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	21 Oct 2007 18:16:02 -0000	1.2
+++ sources	10 Jan 2009 13:55:31 -0000	1.3
@@ -1,2 +1 @@
-14e213a6fbbcce5824340768be528361  colormaps.tgz
-117601fb9ba06b41f99e5492920f0864  qtiplot-0.9.tar.bz2
+dd149d024501e34cda685023522b4d8d  qtiplot-0.9.7.4.tar.bz2



From frankb at fedoraproject.org  Sat Jan 10 13:59:32 2009
From: frankb at fedoraproject.org (=?utf-8?q?Frank_B=C3=BCttner?=)
Date: Sat, 10 Jan 2009 13:59:32 +0000 (UTC)
Subject: rpms/qtiplot/devel .cvsignore,1.3,1.4 sources,1.3,1.4
Message-ID: <20090110135932.60C367012C@cvs1.fedora.phx.redhat.com>

Author: frankb

Update of /cvs/pkgs/rpms/qtiplot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28579

Modified Files:
	.cvsignore sources 
Log Message:
add missing file



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qtiplot/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	10 Jan 2009 13:55:31 -0000	1.3
+++ .cvsignore	10 Jan 2009 13:59:02 -0000	1.4
@@ -1 +1,2 @@
 qtiplot-0.9.7.4.tar.bz2
+colormaps.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qtiplot/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	10 Jan 2009 13:55:31 -0000	1.3
+++ sources	10 Jan 2009 13:59:02 -0000	1.4
@@ -1 +1,2 @@
 dd149d024501e34cda685023522b4d8d  qtiplot-0.9.7.4.tar.bz2
+14e213a6fbbcce5824340768be528361  colormaps.tgz



From frankb at fedoraproject.org  Sat Jan 10 14:08:22 2009
From: frankb at fedoraproject.org (=?utf-8?q?Frank_B=C3=BCttner?=)
Date: Sat, 10 Jan 2009 14:08:22 +0000 (UTC)
Subject: rpms/qtiplot/devel qtiplot.spec,1.5,1.6
Message-ID: <20090110140822.EA0587012C@cvs1.fedora.phx.redhat.com>

Author: frankb

Update of /cvs/pkgs/rpms/qtiplot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29685

Modified Files:
	qtiplot.spec 
Log Message:
dummy for koji



Index: qtiplot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qtiplot/devel/qtiplot.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- qtiplot.spec	10 Jan 2009 13:55:31 -0000	1.5
+++ qtiplot.spec	10 Jan 2009 14:07:52 -0000	1.6
@@ -1,7 +1,7 @@
 Name:		qtiplot
 Summary:	Data Analysis and Scientific Plotting
 Version:	0.9.7.4
-Release:	1%{?dist}
+Release:	2%{?dist}
 #>4.2 is needed for qtiplot
 BuildRequires:	qt4-devel >= 4.2 
 BuildRequires:	qwt-devel
@@ -133,6 +133,9 @@
 
 
 %changelog
+* Sat Jan 10 2009 Frank B??ttner <frank-buettner at gmx.net> - 0.9.7.4-2
+ - dummy for koji
+
 * Sat Jan 10 2009 Frank B??ttner <frank-buettner at gmx.net> - 0.9.7.4-1
   - update to 0.9.7.4
 



From frankb at fedoraproject.org  Sat Jan 10 14:29:50 2009
From: frankb at fedoraproject.org (=?utf-8?q?Frank_B=C3=BCttner?=)
Date: Sat, 10 Jan 2009 14:29:50 +0000 (UTC)
Subject: rpms/qtiplot/devel qtiplot-path.patch,1.1,1.2 qtiplot.spec,1.6,1.7
Message-ID: <20090110142950.A9BC27012C@cvs1.fedora.phx.redhat.com>

Author: frankb

Update of /cvs/pkgs/rpms/qtiplot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32394

Modified Files:
	qtiplot-path.patch qtiplot.spec 
Log Message:
fix the path patch


qtiplot-path.patch:

Index: qtiplot-path.patch
===================================================================
RCS file: /cvs/pkgs/rpms/qtiplot/devel/qtiplot-path.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- qtiplot-path.patch	21 Oct 2007 18:16:02 -0000	1.1
+++ qtiplot-path.patch	10 Jan 2009 14:29:50 -0000	1.2
@@ -1,59 +1,52 @@
-diff -Naur qtiplot-0.9.org/fitPlugins/fitRational0/fitRational0.pro qtiplot-0.9/fitPlugins/fitRational0/fitRational0.pro
---- qtiplot-0.9.org/fitPlugins/fitRational0/fitRational0.pro	2007-06-13 01:16:08.000000000 +0200
-+++ qtiplot-0.9/fitPlugins/fitRational0/fitRational0.pro	2007-10-06 13:39:06.000000000 +0200
-@@ -12,13 +12,13 @@
- DESTDIR           = ../
-  
- # statically link against GSL in 3rdparty
--INCLUDEPATH += ../../3rdparty/gsl
--LIBS         += ../3rdparty/gsl/lib/libgsl.a
--LIBS         += ../3rdparty/gsl/lib/libgslcblas.a
-+#INCLUDEPATH += ../../3rdparty/gsl
-+#LIBS         += ../3rdparty/gsl/lib/libgsl.a
-+#LIBS         += ../3rdparty/gsl/lib/libgslcblas.a
- #dynamically link against GSL installed system-wide
--#unix:LIBS += -L /usr/lib$${libsuff} -lgsl -lgslcblas
-+unix:LIBS += -lgsl -lgslcblas
- 
--target.path=/usr/lib$${libsuff}/qtiplot/plugins
-+target.path= TARGETPATH
- INSTALLS += target
- 
- SOURCES += fitRational0.cpp
-diff -Naur qtiplot-0.9.org/fitPlugins/fitRational1/fitRational1.pro qtiplot-0.9/fitPlugins/fitRational1/fitRational1.pro
---- qtiplot-0.9.org/fitPlugins/fitRational1/fitRational1.pro	2007-06-13 01:16:08.000000000 +0200
-+++ qtiplot-0.9/fitPlugins/fitRational1/fitRational1.pro	2007-10-06 13:39:22.000000000 +0200
-@@ -13,12 +13,12 @@
-  
- # statically link against GSL in 3rdparty
- INCLUDEPATH += ../../3rdparty/gsl
--LIBS         += ../3rdparty/gsl/lib/libgsl.a
--LIBS         += ../3rdparty/gsl/lib/libgslcblas.a
-+#LIBS         += ../3rdparty/gsl/lib/libgsl.a
-+#LIBS         += ../3rdparty/gsl/lib/libgslcblas.a
- #dynamically link against GSL installed system-wide
--#unix:LIBS += -L /usr/lib$${libsuff} -lgsl -lgslcblas
-+unix:LIBS += -lgsl -lgslcblas
- 
--target.path=/usr/lib$${libsuff}/qtiplot/plugins
-+target.path= TARGETPATH
- INSTALLS += target
- 
- SOURCES += fitRational1.cpp
-diff -Naur qtiplot-0.9.org/qtiplot/qtiplot.pro qtiplot-0.9/qtiplot/qtiplot.pro
---- qtiplot-0.9.org/qtiplot/qtiplot.pro	2007-09-20 13:55:53.000000000 +0200
-+++ qtiplot-0.9/qtiplot/qtiplot.pro	2007-10-06 16:28:59.000000000 +0200
-@@ -21,8 +21,8 @@
- unix: INSTALLBASE = /usr
- win32: INSTALLBASE = c:/QtiPlot
- 
--unix: target.path = $$INSTALLBASE/bin
--unix: documentation.path = $$INSTALLBASE/share/doc/qtiplot
-+unix: target.path = BINDIR
-+unix: documentation.path = DOCDIR
- win32: target.path = $$INSTALLBASE
- win32: documentation.path = $$INSTALLBASE/doc
+diff -Naur qtiplot-0.9.7.4.org/fitPlugins/fitRational0/fitRational0.pro qtiplot-0.9.7.4/fitPlugins/fitRational0/fitRational0.pro
+--- qtiplot-0.9.7.4.org/fitPlugins/fitRational0/fitRational0.pro	2009-01-10 15:14:17.000000000 +0100
++++ qtiplot-0.9.7.4/fitPlugins/fitRational0/fitRational0.pro	2009-01-10 15:16:51.000000000 +0100
+@@ -12,14 +12,14 @@
+ DESTDIR           = ../
+  
+ # statically link against GSL in 3rdparty
+-INCLUDEPATH += ../../3rdparty/gsl/include/
+-LIBS        += ../../3rdparty/gsl/lib/libgsl.a
+-LIBS        += ../../3rdparty/gsl/lib/libgslcblas.a
++#INCLUDEPATH += ../../3rdparty/gsl/include/
++#LIBS        += ../../3rdparty/gsl/lib/libgsl.a
++#LIBS        += ../../3rdparty/gsl/lib/libgslcblas.a
+ 
+ #dynamically link against GSL installed system-wide
+-#unix:LIBS += -L /usr/lib$${libsuff} -lgsl -lgslcblas
++unix:LIBS += --lgsl -lgslcblas
+ 
+-target.path=/usr/lib$${libsuff}/qtiplot/plugins
++target.path=TARGETPATH
+ INSTALLS += target
  
+ SOURCES += fitRational0.cpp
+diff -Naur qtiplot-0.9.7.4.org/fitPlugins/fitRational1/fitRational1.pro qtiplot-0.9.7.4/fitPlugins/fitRational1/fitRational1.pro
+--- qtiplot-0.9.7.4.org/fitPlugins/fitRational1/fitRational1.pro	2009-01-10 15:14:17.000000000 +0100
++++ qtiplot-0.9.7.4/fitPlugins/fitRational1/fitRational1.pro	2009-01-10 15:17:49.000000000 +0100
+@@ -12,14 +12,14 @@
+ DESTDIR           = ../
+  
+ # statically link against GSL in 3rdparty
+-INCLUDEPATH += ../../3rdparty/gsl/include/
+-LIBS        += ../../3rdparty/gsl/lib/libgsl.a
+-LIBS        += ../../3rdparty/gsl/lib/libgslcblas.a
++#INCLUDEPATH += ../../3rdparty/gsl/include/
++#LIBS        += ../../3rdparty/gsl/lib/libgsl.a
++#LIBS        += ../../3rdparty/gsl/lib/libgslcblas.a
+ 
+ #dynamically link against GSL installed system-wide
+-#unix:LIBS += -L /usr/lib$${libsuff} -lgsl -lgslcblas
++unix:LIBS += -lgsl -lgslcblas
+ 
+-target.path=/usr/lib$${libsuff}/qtiplot/plugins
++target.path=TARGETPATH
+ INSTALLS += target
+ 
+ SOURCES += fitRational1.cpp
+diff -Naur qtiplot-0.9.7.4.org/qtiplot/qtiplot.pro qtiplot-0.9.7.4/qtiplot/qtiplot.pro
+--- qtiplot-0.9.7.4.org/qtiplot/qtiplot.pro	2009-01-10 15:14:17.000000000 +0100
++++ qtiplot-0.9.7.4/qtiplot/qtiplot.pro	2009-01-10 15:24:13.000000000 +0100
 @@ -30,12 +30,12 @@
  #!!! Warning: You must modify these paths according to your computer settings
  #############################################################################
@@ -61,60 +54,54 @@
 -INCLUDEPATH       += ../3rdparty/muparser/include
 -INCLUDEPATH       += ../3rdparty/qwtplot3d/include
 -INCLUDEPATH       += ../3rdparty/qwt/src
--INCLUDEPATH       += ../3rdparty/liborigin
++INCLUDEPATH       += MUPARSERINC
++INCLUDEPATH       += QWTPLOT3DINC
++INCLUDEPATH       += QWTINC
+ INCLUDEPATH       += ../3rdparty/liborigin
 -INCLUDEPATH       += ../3rdparty/gsl/include
 -INCLUDEPATH       += ../3rdparty/zlib123/include
-+INCLUDEPATH       += MUPARSERINC
-+INCLUDEPATH       += QWTPLOT3DINC
-+INCLUDEPATH       += QWTINC
-+INCLUDEPATH       += ../3rdparty/liborigin
-+INCLUDEPATH       += GSLINC
-+INCLUDEPATH       += ZLIBINC
++INCLUDEPATH       += GSLINC
++INCLUDEPATH       += ZLIBINC
+ INCLUDEPATH       += ../3rdparty/boost_1_36_0
  
  ##################### 3rd PARTY LIBRARIES SECTION ###########################
- #!!! Warning: You must modify these paths according to your computer settings
-@@ -44,17 +44,17 @@
+@@ -45,17 +45,17 @@
  ##################### Linux (Mac OS X) ######################################
  
  # statically link against libraries in 3rdparty
 -unix:LIBS         += ../3rdparty/muparser/lib/libmuparser.a
--unix:LIBS         += ../3rdparty/qwtplot3d/lib/libqwtplot3d.a
 -unix:LIBS         += ../3rdparty/qwt/lib/libqwt.a
 -unix:LIBS         += ../3rdparty/gsl/lib/libgsl.a
 -unix:LIBS         += ../3rdparty/gsl/lib/libgslcblas.a
+-unix:LIBS         += /usr/local/lib/libboost_date_time-gcc41-mt.a
+-unix:LIBS         += /usr/local/lib/libboost_thread-gcc41-mt.a
 +#unix:LIBS         += ../3rdparty/muparser/lib/libmuparser.a
-+#unix:LIBS         += ../3rdparty/qwtplot3d/lib/libqwtplot3d.a
 +#unix:LIBS         += ../3rdparty/qwt/lib/libqwt.a
 +#unix:LIBS         += ../3rdparty/gsl/lib/libgsl.a
 +#unix:LIBS         += ../3rdparty/gsl/lib/libgslcblas.a
++#unix:LIBS         += /usr/local/lib/libboost_date_time-gcc41-mt.a
++#unix:LIBS         += /usr/local/lib/libboost_thread-gcc41-mt.a
  
  # dynamically link against dependencies if they are installed system-wide
 -#unix:LIBS         += -lmuparser
--#unix:LIBS         += -lqwtplot3d
 -#unix:LIBS         += -lqwt
 -#unix:LIBS         += -lgsl -lgslcblas
 +unix:LIBS         += -lmuparser
-+unix:LIBS         += -lqwtplot3d-qt4
 +unix:LIBS         += -lqwt
 +unix:LIBS         += -lgsl -lgslcblas
  
  ##################### Windows ###############################################
  
-@@ -355,6 +355,7 @@
- 
- HEADERS += ../3rdparty/liborigin/OPJFile.h
- SOURCES += ../3rdparty/liborigin/OPJFile.cpp
-+#unix:LIBS += -lorigin
- 
- ###############################################################
- ##################### SCRIPTING LANGUAGES SECTION #############
-@@ -365,7 +366,8 @@
- contains(SCRIPTING_LANGS, muParser) {
-   DEFINES += SCRIPTING_MUPARSER
- 
--  HEADERS += src/muParserScript.h \
-+unix:LIBS += -lmuparser
-+HEADERS += src/muParserScript.h \
-              src/muParserScripting.h \
+@@ -89,10 +89,10 @@
+ 	unix: INSTALLBASE = /usr
+ 	win32: INSTALLBASE = C:/QtiPlot
+ 
+-	unix: target.path = $$INSTALLBASE/bin
++	unix: target.path = BINDIR
+ 	unix: translations.path = $$INSTALLBASE/share/qtiplot/translations
+ 	unix: manual.path = $$INSTALLBASE/share/doc/qtiplot/manual
+-	unix: documentation.path = $$INSTALLBASE/share/doc/qtiplot
++	unix: documentation.path = DOCDIR
+ 	unix: man.path = $$INSTALLBASE/share/man/man1/
  
-   SOURCES += src/muParserScript.cpp \
+ 	win32: target.path = $$INSTALLBASE


Index: qtiplot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qtiplot/devel/qtiplot.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- qtiplot.spec	10 Jan 2009 14:07:52 -0000	1.6
+++ qtiplot.spec	10 Jan 2009 14:29:50 -0000	1.7
@@ -34,7 +34,7 @@
 Source1:	http://soft.proindependent.com/misc/colormaps.tgz
 Source2:	%{name}.desktop
 Patch0:		qtiplot-path.patch
-Patch1:		qtiplot-includes.patch
+#Patch1:		qtiplot-includes.patch
 Buildroot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -133,6 +133,9 @@
 
 
 %changelog
+* Sat Jan 10 2009 Frank B??ttner <frank-buettner at gmx.net> - 0.9.7.4-3
+ - fix the patch files
+
 * Sat Jan 10 2009 Frank B??ttner <frank-buettner at gmx.net> - 0.9.7.4-2
  - dummy for koji
 



From frankb at fedoraproject.org  Sat Jan 10 14:31:17 2009
From: frankb at fedoraproject.org (=?utf-8?q?Frank_B=C3=BCttner?=)
Date: Sat, 10 Jan 2009 14:31:17 +0000 (UTC)
Subject: rpms/qtiplot/devel qtiplot.spec,1.7,1.8
Message-ID: <20090110143117.B78C97012C@cvs1.fedora.phx.redhat.com>

Author: frankb

Update of /cvs/pkgs/rpms/qtiplot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32516

Modified Files:
	qtiplot.spec 
Log Message:
fix version number



Index: qtiplot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qtiplot/devel/qtiplot.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- qtiplot.spec	10 Jan 2009 14:29:50 -0000	1.7
+++ qtiplot.spec	10 Jan 2009 14:30:47 -0000	1.8
@@ -1,7 +1,7 @@
 Name:		qtiplot
 Summary:	Data Analysis and Scientific Plotting
 Version:	0.9.7.4
-Release:	2%{?dist}
+Release:	3%{?dist}
 #>4.2 is needed for qtiplot
 BuildRequires:	qt4-devel >= 4.2 
 BuildRequires:	qwt-devel



From jwrdegoede at fedoraproject.org  Sat Jan 10 14:36:15 2009
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Sat, 10 Jan 2009 14:36:15 +0000 (UTC)
Subject: rpms/xzgv/devel xzgv-0.9-fix-thumbnail-generation.patch, NONE,
	1.1 xzgv-0.9-svn-r41.patch, NONE,
	1.1 xzgv-0.9-thumbnail-load-gcc4.patch, NONE, 1.1 xzgv.spec, 1.7,
	1.8 xzgv-0.9-svn-r35.patch, 1.1, NONE
Message-ID: <20090110143615.914387012C@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/xzgv/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv487

Modified Files:
	xzgv.spec 
Added Files:
	xzgv-0.9-fix-thumbnail-generation.patch xzgv-0.9-svn-r41.patch 
	xzgv-0.9-thumbnail-load-gcc4.patch 
Removed Files:
	xzgv-0.9-svn-r35.patch 
Log Message:
* Sat Jan 10 2009 Hans de Goede <hdegoede at redhat.com> - 0.9-5
- Update to latest upstream svn (r41) fixing several crashes
- Add a patch fixing thumbnail loading
- Add a patch fixing thumbnail generation for pictures where
  the width is not a multiple of 4
- Add a patch fixing thumbnail generation for pictures which have an alpha
  channel
- Fix scriptlet error on uninstall (make it preun instead of postun)


xzgv-0.9-fix-thumbnail-generation.patch:

--- NEW FILE xzgv-0.9-fix-thumbnail-generation.patch ---
--- xzgv-0.9/src/backend.c	2007-09-09 02:37:14.000000000 +0200
+++ xzgv-0.9.new/src/backend.c	2009-01-09 17:26:29.000000000 +0100
@@ -91,6 +91,8 @@
 image->rgb=gdk_pixbuf_get_pixels(BACKEND_IMAGE(image));
 image->w=gdk_pixbuf_get_width(BACKEND_IMAGE(image));
 image->h=gdk_pixbuf_get_height(BACKEND_IMAGE(image));
+image->stride=gdk_pixbuf_get_rowstride(BACKEND_IMAGE(image));
+image->has_alpha=gdk_pixbuf_get_has_alpha(BACKEND_IMAGE(image));
 }
 
 
--- xzgv-0.9/src/backend.h	2007-09-09 02:49:12.000000000 +0200
+++ xzgv-0.9.new/src/backend.h	2009-01-09 17:25:47.000000000 +0100
@@ -8,6 +8,8 @@
   {
   unsigned char *rgb;		/* raw RGB data */
   int w,h;			/* width/height */
+  int stride;
+  int has_alpha;
   void *backend_image;		/* backend's image type (opaque) */
   void *backend_ext;		/* any extra info needed by backend (opaque) */
   };
--- xzgv-0.9/src/resizepic.c	2007-08-11 20:08:41.000000000 +0200
+++ xzgv-0.9.new/src/resizepic.c	2009-01-09 17:15:28.000000000 +0100
@@ -22,7 +22,7 @@
  * which should then be reduced more nicely for the thumbnail.
  */
 unsigned char *nasty_resizepic(unsigned char *theimage,
-                               int width,int height,int *sw_ask,int *sh_ask)
+                               int width,int height,int stride, int *sw_ask,int *sh_ask)
 {
 int x,y,yp,yw,sw,sh,lastyp,scrnwide,scrnhigh;
 unsigned char *rline,*outimage;
@@ -60,9 +60,9 @@
   rline=outimage+yp*sw*3;
   if(yp!=lastyp)
     {
-    yw=y*width;
-    for(x=0;x<width;x++,yw++)
-      memcpy(rline+(x*sw)/width*3,theimage+yw*3,3);
+    yw=y*stride;
+    for(x=0;x<width;x++,yw+=3)
+      memcpy(rline+(x*sw)/width*3,theimage+yw,3);
     lastyp=yp;
     }
   }
@@ -80,10 +80,10 @@
  * new width x height in put back in sw_ask and sh_ask
  */
 unsigned char *resizepic(unsigned char *theimage,
-                         int width,int height,int *sw_ask,int *sh_ask,
+                         int width,int height, int stride, int *sw_ask,int *sh_ask,
                          int allow_crunch)
 {
-int a,b,x,y,yp,yw,sw,sh,lastyp;
+int a,b,x,y,yp,sw,sh,lastyp;
 int c,pixwide,pixhigh;
 int scrnwide,scrnhigh;
 unsigned char *rline;
@@ -98,7 +98,7 @@
   {
   int our_sw_ask=TN_CRUNCH_WIDTH,our_sh_ask=TN_CRUNCH_HEIGHT;
   
-  crunched=nasty_resizepic(theimage,width,height,&our_sw_ask,&our_sh_ask);
+  crunched=nasty_resizepic(theimage,width,height,stride,&our_sw_ask,&our_sh_ask);
   
   /* if it worked, replace orig w/h with crunched pic's one, and
    * set theimage to point to it.
@@ -106,6 +106,7 @@
   if(crunched)
     {
     width=our_sw_ask;
+    stride=our_sw_ask*3;
     height=our_sh_ask;
     theimage=crunched;
     }
@@ -142,15 +143,14 @@
     yp=(y*sh)/height;
     if(yp!=lastyp)
       {
-      yw=y*width;
       /* we try to resample it a bit */
-      for(x=0;x<width;x++,yw++)
+      for(x=0;x<width;x++)
         {
         tr=tg=tb=tn=0;
         for(b=0;(b<pixhigh)&&(y+b<height);b++)
           for(a=0;(a<pixwide)&&(x+a<width);a++)
             {
-            tmp2=(yw+a+b*width)*3;
+            tmp2=(y + b) * stride + (x + a) * 3;
             tr+=theimage[tmp2  ];
             tg+=theimage[tmp2+1];
             tb+=theimage[tmp2+2];
@@ -173,7 +173,7 @@
   for(y=0;y<height;y++)
     for(x=0;x<width;x++)
       {
-      c=(y*width+x)*3;
+      c = y * stride + x * 3;
       rline[3*(y*scrnwide+x)  ]=theimage[c  ];
       rline[3*(y*scrnwide+x)+1]=theimage[c+1];
       rline[3*(y*scrnwide+x)+2]=theimage[c+2];
--- xzgv-0.9/src/resizepic.h	2007-08-11 18:52:03.000000000 +0200
+++ xzgv-0.9.new/src/resizepic.h	2009-01-06 23:01:36.000000000 +0100
@@ -6,4 +6,4 @@
 
 
 extern unsigned char *resizepic(unsigned char *theimage,
-                                int width,int height,int *sw_ask,int *sh_ask,int allow_crunch);
+                                int width,int height, int stride, int *sw_ask,int *sh_ask,int allow_crunch);
--- xzgv-0.9/src/updatetn.c	2007-08-11 20:08:41.000000000 +0200
+++ xzgv-0.9.new/src/updatetn.c	2009-01-10 14:30:42.000000000 +0100
@@ -77,10 +77,9 @@
               unsigned char **xvpic_data,int *wp,int *hp,int *written_ok_ptr)
 {
 FILE *out;
-int w,h,y;
+int w,h,x,y;
 unsigned char *smallpic;
 xzgv_image *origpic;
-int width,height;
 int origw,origh;
 int allow_crunch=1;
 int written_ok=0;
@@ -95,10 +94,23 @@
 if(origpic->w!=origw || origpic->h!=origh)
   allow_crunch=0;
 
+if (origpic->has_alpha)
+  /* Bummer we've got RGBA pixel data but all the other code expects packed
+     RGB data, so convert it. */
+  for (y = 0; y < origh; y++)
+    for (x = 0; x < origw; x++)
+      {
+         origpic->rgb[y * origpic->stride + x * 3] =
+           origpic->rgb[y * origpic->stride + x * 4];
+         origpic->rgb[y * origpic->stride + x * 3 + 1] =
+           origpic->rgb[y * origpic->stride + x * 4 + 1];
+         origpic->rgb[y * origpic->stride + x * 3 + 2] =
+           origpic->rgb[y * origpic->stride + x * 4 + 2];
+      }
+
 /* resize */
 w=80; h=60;
-smallpic=resizepic(origpic->rgb,
-                   width=origpic->w,height=origpic->h,&w,&h,
+smallpic=resizepic(origpic->rgb, origw, origh, origpic->stride, &w,&h,
                    allow_crunch);
 
 backend_image_destroy(origpic);		/* finished with this */

xzgv-0.9-svn-r41.patch:

--- NEW FILE xzgv-0.9-svn-r41.patch ---
diff -up xzgv-0.9/Makefile.foo xzgv-0.9/Makefile
--- xzgv-0.9/Makefile.foo	2007-09-09 20:12:48.000000000 +0200
+++ xzgv-0.9/Makefile	2009-01-10 15:20:11.000000000 +0100
@@ -42,9 +42,9 @@ doc/xzgv.1: doc/xzgv.texi doc/makeman.aw
 
 # Like in GNU stuff, info files aren't automatically remade,
 # as I don't want to assume everyone has texinfo's `makeinfo' handy.
-info: doc/xzgv.gz
+info: doc/xzgv.info.gz
 
-doc/xzgv.gz: doc/xzgv.texi
+doc/xzgv.info.gz: doc/xzgv.texi
 	cd doc && $(MAKE) info
 
 clean:
@@ -52,6 +52,11 @@ clean:
 	cd doc && $(MAKE) clean
 	$(RM) *~
 
+realclean:
+	cd src && $(MAKE) realclean
+	cd doc && $(MAKE) realclean
+	$(RM) *~
+
 install: all
 	cd src && $(MAKE) install
 	cd doc && $(MAKE) install
diff -up xzgv-0.9/doc/Makefile.foo xzgv-0.9/doc/Makefile
--- xzgv-0.9/doc/Makefile.foo	2007-09-09 20:27:58.000000000 +0200
+++ xzgv-0.9/doc/Makefile	2009-01-10 15:20:11.000000000 +0100
@@ -10,12 +10,12 @@ include ../config.mk
 
 all: info man
 
-info: xzgv.gz
+info: xzgv.info.gz
 dvi: xzgv.dvi
 
-xzgv.gz: xzgv.texi
-	makeinfo xzgv.texi
-	gzip -f xzgv
+xzgv.info.gz: xzgv.texi
+	makeinfo --no-split xzgv.texi
+	gzip -9f xzgv.info
 
 # `-c' removes the huge number of associated files created by TeX.
 # This saves doing a `make clean' from hell. :-)
@@ -38,16 +38,20 @@ installdirs:
 
 install: installdirs
 	install xzgv.1 $(MANDIR)
-	install xzgv.gz $(INFODIR)
-	install-info  --infodir=$(INFODIR) xzgv.gz
+	install -m 644 xzgv.info.gz $(INFODIR)
+	install-info --infodir=$(INFODIR) xzgv.info.gz
 
 uninstall:
 	$(RM) $(MANDIR)/xzgv.1
 	$(RM) $(INFODIR)/xzgv.gz
-	install-info --remove xzgv
+	install-info --remove xzgv.info.gz
 
 # This *doesn't* remove the Info files, which should stick around to
 # be included in the distribution. Ditto for the man page, since
 # building it requires gawk.
 clean:
 	$(RM) *~ xzgv.dvi
+
+realclean: clean
+	$(RM) xzgv.1 xzgv.info.gz
+
diff -up xzgv-0.9/doc/xzgv.texi.foo xzgv-0.9/doc/xzgv.texi
--- xzgv-0.9/doc/xzgv.texi.foo	2007-09-09 20:27:28.000000000 +0200
+++ xzgv-0.9/doc/xzgv.texi	2009-01-10 15:20:11.000000000 +0100
@@ -1,6 +1,6 @@
 \input texinfo   @c -*-texinfo-*-
 @c %**start of header
- at setfilename xzgv
+ at setfilename xzgv.info
 @settitle The xzgv manual
 @setchapternewpage odd
 @c %**end of header
@@ -47,6 +47,7 @@ The xzgv manual, for version @value{VERS
 @value{UPDATED}.
 
 Copyright 1999-2001 Russell Marks.
+Copyright 2007 Reuben Thomas.
 
 Permission is granted to make and distribute verbatim copies of this
 manual provided the copyright notice and this permission notice are
@@ -74,12 +75,13 @@ approved by the Free Software Foundation
 @title xzgv
 @subtitle A picture viewer for X, with thumbnail-based file selector
 @subtitle version @value{VERSION}
- at author Russell Marks
+ at author Russell Marks and Reuben Thomas
 
 @c The following two commands start the copyright page.
 @page
 @vskip 0pt plus 1filll
 Copyright @copyright{} 1999-2001 Russell Marks.
+Copyright @copyright{} 2007 Reuben Thomas.
 
 Permission is granted to make and distribute verbatim copies of this
 manual provided the copyright notice and this permission notice are
@@ -149,8 +151,7 @@ The thumbnails used (thumbnails being sm
 pictures) are compatible with xv, zgv, and the Gimp. The kinds of
 pictures xzgv allows to be viewed are raster-format pictures (sometimes
 called `bitmaps' and/or `pixmaps'); things like GIF files, JPEG files,
-PNG files, and so on. (Details of file formats supported are given
-elsewhere. @xref{Supported File Formats}.)
+PNG files, and so on.
 
 Most of the time, you will probably want to use xzgv's file selector
 (@pxref{The File Selector}) to pick which file(s) to view. This is what
@@ -192,17 +193,11 @@ xzgv. xzgv can do a lot more; read on to
 @c first, direct (or direct-ish :-)) xzgv contributions:
 
 xzgv was primarily written by Russell Marks, also the author of this
-manual.
+manual. It is maintained by Reuben Thomas.
 
 Costa Sapuntzakis contributed code for much faster JPEG thumbnail
 generation (to zgv, which I adapted for xzgv).
 
- at c this isn't really `direct', but I think it belongs here.
- at code{install-info} is a (very) slightly modified version of the
-original (which is part of the @code{texinfo} package). This program is
-used during installation. I think it was mostly written by Karl Berry,
-but it's not terribly clear.
-
 The directory/file icons used were loosely based on gmc's
 @file{dir-close.xpm}. I think Tuomas Kuosmanen was responsible for
 that, judging from the change log.
@@ -213,28 +208,12 @@ was written by Noah Friedman. (This is a
 @c now libraries etc.:
 
 Huge thanks go to the many people responsible for GTK+, without which
-xzgv would almost certainly not have happened. Thanks also to the
-Rasterman (Carsten Haiztler) for Imlib, without which xzgv would most
-likely have been a complete pain to write. (But no thanks for Electric
-Eyes, which was nearly nice enough for me not to bother with xzgv at
-all! :-))
-
-This program is based in part on the work of the Independent JPEG
-Group. (I don't think I actually need this line any more, but I like
-giving these guys a credit, it's a neat library. :-))
-
-xzgv uses (or rather it does if @code{INTERP_MMX} was defined when
-compiling, and if it's running on an MMX-capable CPU) MMX instructions
-for interpolation, with the help of libmmx, by Hank Dietz and Randy
-Fisher.
+xzgv would almost certainly not have happened. (But no thanks for
+Electric Eyes, which was nearly nice enough for me not to bother with
+xzgv at all! :-))
 
 @file{getopt*.[ch]} are from the GNU libc.
 
-``The Graphics Interchange Format(c) is the Copyright property of
-CompuServe Incorporated. GIF(sm) is a Service Mark property of
-CompuServe Incorporated.''
-
-
 @node  Invoking xzgv, A Note on Notation, Acknowledgements, Top
 @comment  node-name,  next,  previous,  up
 @chapter Invoking xzgv
@@ -300,11 +279,6 @@ Here's what the options do:
 Automatically hide selector when a picture is selected, allowing the
 viewer to use the whole window.
 
- at c I would never have defaulted to the fast/sloppy method if given
- at c a choice, but Imlib1 did it without my knowing, such that when
- at c I started reading JPEGs natively, I `had' to do it this way
- at c around to avoid apparently gratuitous slowdown. :-(
- at c
 @vindex careful-jpeg
 @item --careful-jpeg
 Enable libjpeg `fancy upsampling'. xzgv defaults to using the faster
@@ -322,10 +296,9 @@ override.)
 
 @vindex dither-hicol
 @item --dither-hicol
-Use dithering in 15/16-bit, whatever Imlib's default setting is.
+Use dithering in 15/16-bit, whatever the default setting is.
 @xref{Viewer Options}, for a discussion of benefits/drawbacks. You can
-also use @code{--dither-hicol=off} to disable this if Imlib normally has
-it enabled.
+also use @code{--dither-hicol=off} to disable this.
 
 @vindex exif-orient
 @item --exif-orient
@@ -503,10 +476,7 @@ If started with @code{xzgv @var{files}},
 and treats the file or files as if they were the sole contents of a
 directory. (It also automatically loads the first file.) As such, you
 can use the Next Image and Previous Image commands to navigate between
-the images, or do Exit to Selector and use the selector directly. (By
-the way, running like this also makes it possible to view files without
-the usual extensions such as @file{.gif}, etc. @xref{File Type
-Identification}.)
+the images, or do Exit to Selector and use the selector directly.
 
 If started with @code{xzgv @var{start-dir}}, xzgv starts up as usual,
 but with the selector starting on the directory specified (rather than
@@ -830,13 +800,13 @@ move around the list, but it reads them 
 The thumbnails used in xzgv require 256 colours to display. This can be
 a problem if you're running X in 256 colours or less as, even if you're
 running an 8-bit (256 colour) server, there will almost inevitably be
-fewer colours available. Currently, xzgv just uses whatever Imlib
+fewer colours available. Currently, xzgv just uses whatever gdk
 reports as the closest match to each individual colour used in
 thumbnails. This gives a tolerable result on 8-bit servers, assuming
-Imlib was able to allocate a large number of colours; however, it gives
+gdk was able to allocate a large number of colours; however, it gives
 terrible results if it couldn't, or if running on 4-bit or 1-bit
 servers. Sorry about this --- it should be fixed in future (either by
-using Imlib to draw the thumbnail pixmaps, or by dithering them `by
+using gdk to draw the thumbnail pixmaps, or by dithering them `by
 hand' to suit the colours available).
 
 @item
@@ -2548,14 +2518,13 @@ and see. (No keyboard shortcut --- see a
 @cindex pictures, file formats used by
 
 Picture files are stored in a variety of different forms, or `file
-formats'. xzgv, via Imlib, supports many.
+formats'. xzgv, via gdk, supports many.
 
 @menu
 * File Type Identification::    How xzgv identifies the type of a file.
-* Supported File Formats::      The file formats that xzgv supports.
 @end menu
 
- at node  File Type Identification, Supported File Formats, File Formats, File Formats
+ at node  File Type Identification,  , File Formats, File Formats
 @comment  node-name,  next,  previous,  up
 @section File Type Identification
 
@@ -2564,120 +2533,13 @@ formats'. xzgv, via Imlib, supports many
 @cindex picture format, identification of 
 @cindex file format, identification of
 
-The format a file is in is identified in two different ways. The file
-selector picks filenames to display based on the `extension' --- for
-instance, if a filename ends in @file{.jpg} or @file{.jpeg}, xzgv assumes
-it is a JPEG. This way of working is not always right, but it's much
-faster than the alternative (reading part of every single file) and is
-usually sufficient.
-
-The file-reading code relies on Imlib to determine the file type and
-read the file correctly; generally this uses the format's `magic number'
-to determine file type --- e.g. a JPEG/JFIF file starts with the (hex)
-bytes @code{FF D8}. So if you start xzgv with @samp{xzgv foo}, and foo
-is in a format supported by Imlib (such as JPEG), the format will be
-figured out and the file loaded even though the `extension' is absent.
-
-One extension to this is xzgv's built-in support for my relatively
-obscure `mrf' format. :-) Since there's probably not much interest in
-supporting this in Imlib, and it's really quite a simple format, it's
-not unreasonable for xzgv to support this directly. But xzgv acts as if
-Imlib supported mrf, so this distinction can be largely ignored.
-
-In fact, xzgv is gradually moving towards reading several of the more
-popular formats natively, as part of an attempt to avoid being tied to a
-single image rendering/loading backend; at the time of writing, GIF,
-JPEG, PNG, and TIFF are also read in this way.
-
-
- at node  Supported File Formats,  , File Type Identification, File Formats
- at comment  node-name,  next,  previous,  up
- at section Supported File Formats
-
- at cindex supported file formats
- at cindex file formats, supported
- at cindex types of picture supported
- at cindex GIF
- at cindex JPEG
- at cindex PNG
- at cindex PBM
- at cindex PGM
- at cindex PPM
- at cindex PNM
- at cindex TGA
- at cindex Targa
- at cindex PCX
- at cindex mrf
- at cindex PRF
- at cindex XBM
- at cindex bitmaps, X
- at cindex XPM
- at cindex pixmaps, X
- at cindex TIFF
- at cindex TIM
- at cindex XWD
-
-xzgv supports the following file formats:
-
- at itemize @bullet
- at item
-GIF.
-
- at item
-JPEG.
-
- at item
-PNG.
-
- at item
-PBM/PGM/PPM, collectively known as `PNM'. This is a nice simple format
-used by pbmplus and netpbm.
-
- at item
-BMP.
-
- at item
-TGA (Targa).
-
- at item
-PCX.
-
- at item
-mrf. Mrf files can be converted to/from PBM with mrftopbm/pbmtomrf, and
-the format is documented in the @cite{mrf(5)} man page.
-
- at item
-PRF. PRF is an extension of mrf, similarly converted with
-prftopnm/pnmtoprf, and documented in the @cite{prf(5)} man page.
-
- at item
-XBM (X bitmap files).
-
- at item
-XPM.
-
- at item
-TIFF.
-
- at item
-TIM. This is an image format used (on the Sony PlayStation) by some
-games (e.g. Wipeout) for storing 2D images.
-
- at item
-XWD (X window dumps, as produced by xwd).
-
- at c [XXX xzgv doesn't support these as files yet (will need yet more
- at c Imlib-bypassing code, sigh), and doesn't treat them as their own
- at c thumbnails]
- at c Xv format thumbnail files. Normally you won't want to view these other
- at c than in the file selector, but xzgv lets you view them as normal picture
- at c files if you want. Note that in the file selector, thumbnail files are
- at c indistinguishable from the files they represent (other than the
- at c @file{.xvpics} in the directory's filename) --- they have the same
- at c filenames, and thumbnails are their own thumbnails. :-)
-
- at end itemize
-
+The format a file is in is identified by its content. The file-reading
+code relies on libgdk to determine the file type and read the file
+correctly; generally this uses the format's `magic number' to determine
+file type --- e.g. a JPEG/JFIF file starts with the (hex) bytes @code{FF
+D8}. So if you start xzgv with @samp{xzgv foo}, and foo is in a
+supported format (such as JPEG), the format will be figured out and the
+file loaded even though the `extension' is absent.
 
 @node  Configuring xzgv, Rationale, File Formats, Top
 @comment  node-name,  next,  previous,  up
@@ -3037,8 +2899,8 @@ hiding/showing selector or resizing from
 I kludged it :-)).
 
 @item
-When scaling up and imlib is dithering, you end up with a crappy-looking
-picture if you drag the picture around slowly (since each exposed bit is
+When scaling up and dithering, you end up with a crappy-looking picture
+if you drag the picture around slowly (since each exposed bit is
 dithered independently, with no regard given to matching up to any
 previous error-diffusion).
 
@@ -3060,10 +2922,10 @@ window-splitting bit, but I'm not sure. 
 across scrollbar sliders and the paned window splitter handle.
 
 @item
-It doesn't apply any tranparency mask returned by imlib. The practical
-result of this seems to be purple transparent bits in thumbnails and
-scaled-up images, and black transparent bits elsewhere. This doesn't
-affect PNG files, though.
+It doesn't apply any tranparency mask. The practical result of this
+seems to be purple transparent bits in thumbnails and scaled-up images,
+and black transparent bits elsewhere. This doesn't affect PNG files,
+though.
 
 @item
 If a GIF file is corrupted in such a way that the decompressed image
@@ -3089,13 +2951,7 @@ nature, see xzgv''. :-)
 @itemize @minus
 @item
 Thumbnails are given an accurate width/height `IMGINFO' comment, but are
-always claimed to be "RGB", as Imlib doesn't provide any way to find out
-what type they are.
-
- at item
-xzgv should have an option to treat all files as images, since it
-currently applies a zgv-like file extension filter. This is a bit
-inflexible, given that Imlib supports `all' formats.
+always claimed to be "RGB".
 
 @item
 xzgv @emph{doesn't} duplicate zgv's behaviour of generating thumbnails
@@ -3115,9 +2971,6 @@ suboptimal, but as an incompatibility wi
 
 @itemize @minus
 @item
-GIF89a extension blocks are ignored.
-
- at item
 Only the first image of a multiple-image GIF is used. (These days,
 multiple-image GIFs are usually animations.)
 @end itemize
@@ -3148,11 +3001,8 @@ Here are some details you should include
 The version of xzgv you are running. @code{xzgv --version} reports this.
 
 @item
-The versions of GTK+ and Imlib you are using. @code{xzgv --version-gtk}
-reports the GTK+ version being used by xzgv, but Imlib is a little more
-tricky --- @code{imlib-config --version} should work if you have a full
-Imlib installation, but failing that, try @code{ls -l
-/usr/lib/libImlib*} or @code{ls -l /usr/X11R6/lib/libImlib*}.
+The versions of GTK+ you are using. @code{xzgv --version-gtk} reports
+the GTK+ version being used by xzgv.
 
 @item
 The bitdepth your X server is running in (common depths are 8-bit (256
@@ -3162,7 +3012,7 @@ depth you're running in, try @code{xdpyi
 @item
 A description of the bug --- what effects it has, the circumstances it
 occurs in, and so on. Does it only happen for certain types of file?
-Only when in 8-bit modes? Only when dithering is enabled in Imlib? Even
+Only when in 8-bit modes? Only when dithering is enabled? Even
 `irrelevant' details can sometimes be useful.
 
 @item
@@ -3173,7 +3023,7 @@ the patch using @code{diff -c} or (prefe
 @end itemize
 
 So, if you think you've found a bug in xzgv, report it by emailing me at
- at email{rus@@svgalib.org}.
+ at email{rrt@@sc3d.org}.
 
 
 @node  Reporting Documentation Bugs,  , Reporting Bugs, Bugs and Restrictions
diff -up xzgv-0.9/src/Makefile.foo xzgv-0.9/src/Makefile
--- xzgv-0.9/src/Makefile.foo	2007-08-14 00:39:16.000000000 +0200
+++ xzgv-0.9/src/Makefile	2009-01-10 15:20:11.000000000 +0100
@@ -39,6 +39,7 @@ clean:
 	$(RM) *~ *.o xzgv
 	$(RM) rcfile_opt.h rcfile_var.h rcfile_short.h
 
+realclean: clean
 
 # dependancies
 backend.o: backend.c backend.h
diff -up xzgv-0.9/src/help.c.foo xzgv-0.9/src/help.c
--- xzgv-0.9/src/help.c.foo	2007-09-09 02:45:46.000000000 +0200
+++ xzgv-0.9/src/help.c	2009-01-10 15:20:11.000000000 +0100
@@ -46,7 +46,8 @@ gtk_window_set_modal(GTK_WINDOW(about_wi
 
 label=gtk_label_new("xzgv " XZGV_VER " - picture viewer for X with file selector\n"
                     "Copyright (C) 1999-2005 Russell Marks\n"
-                    "Homepage - http://rus.members.beeb.net/xzgv.html");
+                    "Copyright (C) 2007 Reuben Thomas\n"
+                    "Homepage - http://sourceforge.net/projects/xzgv");
 gtk_box_pack_start(GTK_BOX(vbox),label,TRUE,TRUE,2);
 gtk_widget_show(label);
 
diff -up xzgv-0.9/src/main.c.foo xzgv-0.9/src/main.c
--- xzgv-0.9/src/main.c.foo	2007-09-09 02:36:21.000000000 +0200
+++ xzgv-0.9/src/main.c	2009-01-10 15:20:36.000000000 +0100
@@ -38,7 +38,8 @@
 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
 #include <gdk/gdkx.h>		/* needed for iconify stuff */
-#include <X11/Xlib.h>		/* ditto */
+#include <gdk/gdkrgb.h>     /* http://bugs.debian.org/457252 */
+#include <X11/Xlib.h>		/* needed for iconify stuff */
 
 #include "backend.h"
 #include "resizepic.h"
@@ -105,7 +106,7 @@ guint tn_id;			/* `thumbnail' id for sta
 
 GtkWidget *mainwin;
 
-gint xvpic_pal[256];		/* palette for thumbnails */
+guint8 xvpic_pal[256][3];		/* palette for thumbnails */
 
 /* image & rendered pixmap for currently-loaded image */
 xzgv_image *theimage=NULL;
@@ -1704,6 +1705,9 @@ void xy_scaling_double(int do_x,int do_y
 static int in_routine=0;
 int xtmp=xscaling,ytmp=yscaling,oldxsc=xscaling,oldysc=yscaling;
 
+/* if there's no image, don't do anything */
+if (!theimage) return;
+
 /* if recursed, don't bother */
 if(in_routine) return;
 in_routine=1;
@@ -1752,6 +1756,9 @@ void xy_scaling_add(int do_x,int do_y)
 static int in_routine=0;
 int xtmp=xscaling,ytmp=yscaling,oldxsc=xscaling,oldysc=yscaling;
 
+/* if there's no image, don't do anything */
+if (!theimage) return;
+
 /* if recursed, don't bother */
 if(in_routine) return;
 in_routine=1;
@@ -1800,6 +1807,9 @@ void xy_scaling_halve(int do_x,int do_y)
 static int in_routine=0;
 int xtmp=xscaling,ytmp=yscaling,oldxsc=xscaling,oldysc=yscaling;
 
+/* if there's no image, don't do anything */
+if (!theimage) return;
+
 /* if recursed, don't bother */
 if(in_routine) return;
 in_routine=1;
@@ -1851,6 +1861,9 @@ void xy_scaling_sub(int do_x,int do_y)
 static int in_routine=0;
 int xtmp=xscaling,ytmp=yscaling,oldxsc=xscaling,oldysc=yscaling;
 
+/* if there's no image, don't do anything */
+if (!theimage) return;
+
 /* if recursed, don't bother */
 if(in_routine) return;
 in_routine=1;
@@ -2101,6 +2114,7 @@ listen_to_toggles=1;
 
 void cb_flip(void)
 {
+if (!theimage) return;
 RECURSE_PROTECT_START;
 backend_flip_vert(theimage);
 orient_current_state=orient_state_flip[orient_current_state];
@@ -2111,6 +2125,7 @@ RECURSE_PROTECT_END;
 
 void cb_mirror(void)
 {
+if (!theimage) return;
 RECURSE_PROTECT_START;
 backend_flip_horiz(theimage);
 orient_current_state=orient_state_mirror[orient_current_state];
@@ -2121,6 +2136,7 @@ RECURSE_PROTECT_END;
 
 void cb_rot_cw(void)
 {
+if (!theimage) return;
 RECURSE_PROTECT_START;
 /* swap x and y scaling, since the effect if we don't do that
  * is of the image mysteriously changing. :-)
@@ -2135,6 +2151,7 @@ RECURSE_PROTECT_END;
 
 void cb_rot_acw(void)
 {
+if (!theimage) return;
 RECURSE_PROTECT_START;
 backend_rotate_acw(theimage);
 orient_current_state=orient_state_rot_acw[orient_current_state];
@@ -2146,6 +2163,7 @@ RECURSE_PROTECT_END;
 
 void cb_normal_orient(void)
 {
+if (!theimage) return;
 RECURSE_PROTECT_START;
 if(orient_current_state!=0)
   {
@@ -2514,113 +2532,93 @@ return(1);
  */
 void find_xvpic_cols(void)
 {
-GdkColor col;
-int r,g,b;
-int n;
-
-for(n=0,r=0;r<8;r++)
-  for(g=0;g<8;g++)	/* colours are 3:3:2 */
-    for(b=0;b<4;b++,n++)
-      {
-      col.red=r*0xffff/7; col.green=g*0xffff/7; col.blue=b*0xffff/3;
-      backend_get_closest_colour(&col);
-      xvpic_pal[n]=col.pixel;
-      }
+    int r,g,b;
+    int n;
+
+    for(n=0,r=0;r<8;r++) {
+        for(g=0;g<8;g++) {/* colours are 3:3:2 */
+            for(b=0;b<4;b++,n++) {
+                xvpic_pal[n][0]=r*0xff/7; 
+                xvpic_pal[n][1]=g*0xff/7;
+                xvpic_pal[n][2]=b*0xff/3;
+            }
+        }
+    }
 }
 
 
 GdkPixmap *xvpic2pixmap(unsigned char *xvpic,int w,int h,GdkPixmap **smallp)
 {
 GdkPixmap *pixmap,*small_pixmap;
-GdkImage *image;
+guint8 *buffer;
 unsigned char *ptr=xvpic;
 int x,y;
 int small_w,small_h;
 
 if(w==0 || h==0) return(NULL);
 
-/* we allocate pixmap and image, draw into image, copy to pixmap,
- * and ditch the image.
- */
-
-if((image=gdk_image_new(GDK_IMAGE_FASTEST,backend_get_visual(),w,h))==NULL)
-  return(NULL);
-
-if((pixmap=gdk_pixmap_new(mainwin->window,w,h,
-                          gdk_visual_get_best_depth()))==NULL)
-  {
-  gdk_image_destroy(image);
-  return(NULL);
-  }
-
-for(y=0;y<h;y++)
-  for(x=0;x<w;x++)
-    gdk_image_put_pixel(image,x,y,xvpic_pal[*ptr++]);
 
-gdk_draw_image(pixmap,clist->style->white_gc,image,0,0,0,0,w,h);
-gdk_flush();
+if (NULL == (pixmap=gdk_pixmap_new(mainwin->window,w,h, -1))) { 
+    return(NULL);
+}
 
-/* reuse image to draw scaled-down version for thin rows */
 small_w=w/ROW_HEIGHT_DIV;
 small_h=h/ROW_HEIGHT_DIV;
 if(small_w==0) small_w=1;
 if(small_h==0) small_h=1;
 
-if((small_pixmap=gdk_pixmap_new(mainwin->window,small_w,small_h,
-                                gdk_visual_get_best_depth()))==NULL)
-  {
-  gdk_pixmap_unref(pixmap);
-  gdk_image_destroy(image);
-  return(NULL);
+if((small_pixmap=gdk_pixmap_new(mainwin->window,small_w,small_h,-1))==NULL)
+{
+    gdk_pixmap_unref(pixmap);
+    return(NULL);
+}
+
+buffer = malloc (w * h * sizeof (guint8) * 3);
+
+if (NULL == buffer) {
+    /* malloc failed */
+    gdk_pixmap_unref(pixmap);
+    gdk_pixmap_unref(small_pixmap);
+    return NULL;
+}
+
+
+for(y=0;y<h;y++) {
+  for(x=0;x<w;x++) {
+      buffer[3*(y*w + x)+0] = xvpic_pal[*ptr][0]; /* red */
+      buffer[3*(y*w + x)+1] = xvpic_pal[*ptr][1]; /* green */
+      buffer[3*(y*w + x)+2] = xvpic_pal[*ptr][2]; /* blue */
+      ptr++;
   }
+}
 
-for(y=0;y<small_h;y++)
-  for(x=0;x<small_w;x++)
-    gdk_image_put_pixel(image,x,y,
-                        xvpic_pal[xvpic[(y*w+x)*ROW_HEIGHT_DIV]]);
+gdk_draw_rgb_image(pixmap,clist->style->white_gc,0,0,w,h,
+        GDK_RGB_DITHER_NORMAL,
+        (guchar*)buffer, w * 3);
+gdk_flush();
 
-gdk_draw_image(small_pixmap,clist->style->white_gc,image,
-               0,0,0,0,small_w,small_h);
+/* reuse image to draw scaled-down version for thin rows */
 
-gdk_image_destroy(image);
 
-*smallp=small_pixmap;
-return(pixmap);
+for(y=0;y<small_h;y++) {
+  for(x=0;x<small_w;x++) {
+      buffer[3*(y*w + x)+0] = xvpic_pal[xvpic[(y*w+x)*ROW_HEIGHT_DIV]][0];
+      buffer[3*(y*w + x)+1] = xvpic_pal[xvpic[(y*w+x)*ROW_HEIGHT_DIV]][1];
+      buffer[3*(y*w + x)+2] = xvpic_pal[xvpic[(y*w+x)*ROW_HEIGHT_DIV]][2];
+  }
 }
 
+gdk_draw_rgb_image(small_pixmap,clist->style->white_gc,0,0,small_w, small_h,
+        GDK_RGB_DITHER_NORMAL,
+        (guchar*)buffer, small_w * 3);
 
-int is_picture(char *filename)
-{
-int l=strlen(filename);
+*smallp=small_pixmap;
 
-if(l<=4) return(0);
+if (NULL != buffer) {
+    free (buffer);
+}
 
-/* at time of writing, imlib1 supports PPM/PGM/TIFF/PNG/XPM/JPEG
- * natively, and uses ImageMagick's `convert' for others.
- * But we have our own GIF/PNG/mrf readers.
- */
-if((!strcasecmp(filename+l-4,".gif")) ||
-   (!strcasecmp(filename+l-4,".jpg")) ||
-   (!strcasecmp(filename+l-5,".jpeg")) ||
-   (!strcasecmp(filename+l-4,".png")) ||
-   (!strcasecmp(filename+l-4,".mrf")) ||
-   (!strcasecmp(filename+l-4,".xbm")) ||
-   (!strcasecmp(filename+l-5,".icon")) ||	/* presumably an XBM */
-   (!strcasecmp(filename+l-4,".xpm")) ||
-   (!strcasecmp(filename+l-4,".pbm")) ||
-   (!strcasecmp(filename+l-4,".pgm")) ||
-   (!strcasecmp(filename+l-4,".ppm")) ||
-   (!strcasecmp(filename+l-4,".bmp")) ||
-   (!strcasecmp(filename+l-4,".tga")) ||
-   (!strcasecmp(filename+l-4,".pcx")) ||
-   (!strcasecmp(filename+l-4,".tif")) ||
-   (!strcasecmp(filename+l-5,".tiff")) ||
-   (!strcasecmp(filename+l-4,".prf")) ||
-   (!strcasecmp(filename+l-4,".tim")) ||
-   (!strcasecmp(filename+l-4,".xwd")))
-  return(1);
-else
-  return(0);
+return(pixmap);
 }
 
 
@@ -2993,9 +2991,6 @@ while((dent=readdir(dirfile))!=NULL)
     }
   isdir=S_ISDIR(sbuf.st_mode);
   
-  if(!isdir && !is_picture(dent->d_name))
-    continue;
-  
   if(clist_add_new_row(dent->d_name,&sbuf))
     numrows++;
   }
@@ -3687,7 +3682,11 @@ static GtkItemFactoryEntry viewer_menu_i
   };
 
 
+gtk_widget_push_visual(gdk_rgb_get_visual());
+gtk_widget_push_colormap(gdk_rgb_get_cmap());
 mainwin=gtk_window_new(GTK_WINDOW_TOPLEVEL);
+gtk_widget_pop_visual();
+gtk_widget_pop_colormap();
 GTK_WIDGET_UNSET_FLAGS(mainwin,GTK_CAN_FOCUS);
 gtk_signal_connect(GTK_OBJECT(mainwin),"destroy",
                    GTK_SIGNAL_FUNC(cb_quit),NULL);

xzgv-0.9-thumbnail-load-gcc4.patch:

--- NEW FILE xzgv-0.9-thumbnail-load-gcc4.patch ---
--- xzgv-0.9/src/main.c	2009-01-06 21:41:26.000000000 +0100
+++ xzgv-0.9.new/src/main.c	2009-01-06 21:43:42.000000000 +0100
@@ -201,7 +201,7 @@
 /* required prototypes */
 void render_pixmap(int reset_pos);
 void cb_nextprev_tagged_image(int next,int view);
-void idle_xvpic_load(int *entryp);
+gboolean idle_xvpic_load(gpointer data);
 gint pic_win_resized(GtkWidget *widget,GdkEventConfigure *event);
 void cb_scaling_double(void);
 void cb_xscaling_double(void);
@@ -2179,8 +2179,7 @@
 idle_xvpic_lastadjval=gtk_clist_get_vadjustment(GTK_CLIST(clist))->value;
 idle_xvpic_jumped=0;
 entry=0;
-tn_idle_tag=gtk_idle_add((GtkFunction)idle_xvpic_load,&entry);
-
+tn_idle_tag=gtk_idle_add(idle_xvpic_load, &entry);
 /* the "" is a crappy way to disable it, but it's hairy otherwise */
 gtk_statusbar_push(GTK_STATUSBAR(statusbar),tn_id,
                    tn_msgs?"Reading thumbnails...":"");
@@ -2605,7 +2604,7 @@
 }
 
 
-void idle_xvpic_load(int *entryp)
+gint idle_xvpic_load(gpointer data)
 {
 static char buf[1024];
 struct clist_data_tag *datptr;
@@ -2616,12 +2615,13 @@
 static unsigned char xvpic_data[80*60];		/* max thumbnail size */
 float adjval;
 static int prev_scanpos=0;	/* if jumped, saved pos in top-to-bot scan */
+int *entryp = data;
 
 idle_xvpic_called=1;
 
 /* don't do it if it would be a bad time */
 if(idle_xvpic_blocked)
-  return;
+  return TRUE;
 
 /* freeze/thaw actually *cause* flickering for this, rather than
  * preventing it (!), so I've not used those here.
@@ -2729,6 +2729,8 @@
     *entryp=-1;
     }
   }
+  
+  return TRUE;
 }
 
 


Index: xzgv.spec
===================================================================
RCS file: /cvs/extras/rpms/xzgv/devel/xzgv.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- xzgv.spec	9 Feb 2008 16:01:09 -0000	1.7
+++ xzgv.spec	10 Jan 2009 14:35:45 -0000	1.8
@@ -1,12 +1,14 @@
 Summary:   Picture viewer
 Name:      xzgv
 Version:   0.9
-Release:   4%{?dist}
+Release:   5%{?dist}
 License:   GPLv2+
 Group:     Applications/Multimedia
 Source:    http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
-Patch:     xzgv-0.9-svn-r35.patch
+Patch:     xzgv-0.9-svn-r41.patch
 Patch1:    xzgv-0.9-fix-doc-install.patch
+Patch2:    xzgv-0.9-thumbnail-load-gcc4.patch
+Patch3:    xzgv-0.9-fix-thumbnail-generation.patch
 URL:       http://sourceforge.net/projects/xzgv/
 Requires:  xterm gnome-icon-theme
 Requires(post): /sbin/install-info
@@ -23,6 +25,8 @@
 %setup -q
 %patch -p1
 %patch1 -p1
+%patch2 -p1
+%patch3 -p1
 
 %build
 %{__sed} -i 's|^CFLAGS.*|CFLAGS=%{optflags}|' config.mk
@@ -57,7 +61,7 @@
 %post
 /sbin/install-info %{_infodir}/xzgv.info.gz %{_infodir}/dir || :
 
-%postun
+%preun
 if [ "$1" = "0" ]; then
    /sbin/install-info --delete %{_infodir}/xzgv.info.gz %{_infodir}/dir || :
 fi
@@ -74,6 +78,15 @@
 %{_datadir}/applications/fedora-%{name}.desktop
 
 %changelog
+* Sat Jan 10 2009 Hans de Goede <hdegoede at redhat.com> - 0.9-5
+- Update to latest upstream svn (r41) fixing several crashes
+- Add a patch fixing thumbnail loading
+- Add a patch fixing thumbnail generation for pictures where
+  the width is not a multiple of 4
+- Add a patch fixing thumbnail generation for pictures which have an alpha
+  channel
+- Fix scriptlet error on uninstall (make it preun instead of postun)
+
 * Sat Feb  9 2008 Terje Rosten <terjeros at phys.ntnu.no> - 0.9-4
 - rebuild
 


--- xzgv-0.9-svn-r35.patch DELETED ---



From frankb at fedoraproject.org  Sat Jan 10 14:38:52 2009
From: frankb at fedoraproject.org (=?utf-8?q?Frank_B=C3=BCttner?=)
Date: Sat, 10 Jan 2009 14:38:52 +0000 (UTC)
Subject: rpms/qtiplot/devel qtiplot.spec,1.8,1.9
Message-ID: <20090110143852.6AF4D7012C@cvs1.fedora.phx.redhat.com>

Author: frankb

Update of /cvs/pkgs/rpms/qtiplot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv741

Modified Files:
	qtiplot.spec 
Log Message:
fix sed command



Index: qtiplot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qtiplot/devel/qtiplot.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- qtiplot.spec	10 Jan 2009 14:30:47 -0000	1.8
+++ qtiplot.spec	10 Jan 2009 14:38:22 -0000	1.9
@@ -1,7 +1,7 @@
 Name:		qtiplot
 Summary:	Data Analysis and Scientific Plotting
 Version:	0.9.7.4
-Release:	3%{?dist}
+Release:	4%{?dist}
 #>4.2 is needed for qtiplot
 BuildRequires:	qt4-devel >= 4.2 
 BuildRequires:	qwt-devel
@@ -64,7 +64,7 @@
 sed -i "s\TARGETPATH\ $RPM_BUILD_ROOT/%{_libdir}/%{name}/\1" fitPlugins/fitRational1/fitRational1.pro 
 sed -i "s\TARGETPATH\ $RPM_BUILD_ROOT/%{_libdir}/%{name}/\1" fitPlugins/fitRational0/fitRational0.pro
 #fix default path for the Plug-Ins
-sed -i "s\/usr/lib/qtiplot/plugins\%{_libdir}/%{name}\g" qtiplot/src/ApplicationWindow.cpp
+sed -i "s\/usr/lib/qtiplot/plugins\%{_libdir}/%{name}\g" qtiplot/src/core/ApplicationWindow.cpp
 #fix source files for debug package
 dos2unix qtiplot/src/*
 dos2unix fitPlugins/fitRational0/*
@@ -133,6 +133,9 @@
 
 
 %changelog
+* Sat Jan 10 2009 Frank B??ttner <frank-buettner at gmx.net> - 0.9.7.4-4
+ - fix sed
+
 * Sat Jan 10 2009 Frank B??ttner <frank-buettner at gmx.net> - 0.9.7.4-3
  - fix the patch files
 



From jwrdegoede at fedoraproject.org  Sat Jan 10 14:44:14 2009
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Sat, 10 Jan 2009 14:44:14 +0000 (UTC)
Subject: rpms/xzgv/F-10 xzgv-0.9-fix-thumbnail-generation.patch, NONE,
	1.1 xzgv-0.9-svn-r41.patch, NONE,
	1.1 xzgv-0.9-thumbnail-load-gcc4.patch, NONE, 1.1 xzgv.spec, 1.7, 1.8
Message-ID: <20090110144414.0F7677012C@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/xzgv/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1232

Modified Files:
	xzgv.spec 
Added Files:
	xzgv-0.9-fix-thumbnail-generation.patch xzgv-0.9-svn-r41.patch 
	xzgv-0.9-thumbnail-load-gcc4.patch 
Log Message:
* Sat Jan 10 2009 Hans de Goede <hdegoede at redhat.com> - 0.9-5
- Update to latest upstream svn (r41) fixing several crashes
- Add a patch fixing thumbnail loading
- Add a patch fixing thumbnail generation for pictures where
  the width is not a multiple of 4
- Add a patch fixing thumbnail generation for pictures which have an alpha
  channel
- Fix scriptlet error on uninstall (make it preun instead of postun)


xzgv-0.9-fix-thumbnail-generation.patch:

--- NEW FILE xzgv-0.9-fix-thumbnail-generation.patch ---
--- xzgv-0.9/src/backend.c	2007-09-09 02:37:14.000000000 +0200
+++ xzgv-0.9.new/src/backend.c	2009-01-09 17:26:29.000000000 +0100
@@ -91,6 +91,8 @@
 image->rgb=gdk_pixbuf_get_pixels(BACKEND_IMAGE(image));
 image->w=gdk_pixbuf_get_width(BACKEND_IMAGE(image));
 image->h=gdk_pixbuf_get_height(BACKEND_IMAGE(image));
+image->stride=gdk_pixbuf_get_rowstride(BACKEND_IMAGE(image));
+image->has_alpha=gdk_pixbuf_get_has_alpha(BACKEND_IMAGE(image));
 }
 
 
--- xzgv-0.9/src/backend.h	2007-09-09 02:49:12.000000000 +0200
+++ xzgv-0.9.new/src/backend.h	2009-01-09 17:25:47.000000000 +0100
@@ -8,6 +8,8 @@
   {
   unsigned char *rgb;		/* raw RGB data */
   int w,h;			/* width/height */
+  int stride;
+  int has_alpha;
   void *backend_image;		/* backend's image type (opaque) */
   void *backend_ext;		/* any extra info needed by backend (opaque) */
   };
--- xzgv-0.9/src/resizepic.c	2007-08-11 20:08:41.000000000 +0200
+++ xzgv-0.9.new/src/resizepic.c	2009-01-09 17:15:28.000000000 +0100
@@ -22,7 +22,7 @@
  * which should then be reduced more nicely for the thumbnail.
  */
 unsigned char *nasty_resizepic(unsigned char *theimage,
-                               int width,int height,int *sw_ask,int *sh_ask)
+                               int width,int height,int stride, int *sw_ask,int *sh_ask)
 {
 int x,y,yp,yw,sw,sh,lastyp,scrnwide,scrnhigh;
 unsigned char *rline,*outimage;
@@ -60,9 +60,9 @@
   rline=outimage+yp*sw*3;
   if(yp!=lastyp)
     {
-    yw=y*width;
-    for(x=0;x<width;x++,yw++)
-      memcpy(rline+(x*sw)/width*3,theimage+yw*3,3);
+    yw=y*stride;
+    for(x=0;x<width;x++,yw+=3)
+      memcpy(rline+(x*sw)/width*3,theimage+yw,3);
     lastyp=yp;
     }
   }
@@ -80,10 +80,10 @@
  * new width x height in put back in sw_ask and sh_ask
  */
 unsigned char *resizepic(unsigned char *theimage,
-                         int width,int height,int *sw_ask,int *sh_ask,
+                         int width,int height, int stride, int *sw_ask,int *sh_ask,
                          int allow_crunch)
 {
-int a,b,x,y,yp,yw,sw,sh,lastyp;
+int a,b,x,y,yp,sw,sh,lastyp;
 int c,pixwide,pixhigh;
 int scrnwide,scrnhigh;
 unsigned char *rline;
@@ -98,7 +98,7 @@
   {
   int our_sw_ask=TN_CRUNCH_WIDTH,our_sh_ask=TN_CRUNCH_HEIGHT;
   
-  crunched=nasty_resizepic(theimage,width,height,&our_sw_ask,&our_sh_ask);
+  crunched=nasty_resizepic(theimage,width,height,stride,&our_sw_ask,&our_sh_ask);
   
   /* if it worked, replace orig w/h with crunched pic's one, and
    * set theimage to point to it.
@@ -106,6 +106,7 @@
   if(crunched)
     {
     width=our_sw_ask;
+    stride=our_sw_ask*3;
     height=our_sh_ask;
     theimage=crunched;
     }
@@ -142,15 +143,14 @@
     yp=(y*sh)/height;
     if(yp!=lastyp)
       {
-      yw=y*width;
       /* we try to resample it a bit */
-      for(x=0;x<width;x++,yw++)
+      for(x=0;x<width;x++)
         {
         tr=tg=tb=tn=0;
         for(b=0;(b<pixhigh)&&(y+b<height);b++)
           for(a=0;(a<pixwide)&&(x+a<width);a++)
             {
-            tmp2=(yw+a+b*width)*3;
+            tmp2=(y + b) * stride + (x + a) * 3;
             tr+=theimage[tmp2  ];
             tg+=theimage[tmp2+1];
             tb+=theimage[tmp2+2];
@@ -173,7 +173,7 @@
   for(y=0;y<height;y++)
     for(x=0;x<width;x++)
       {
-      c=(y*width+x)*3;
+      c = y * stride + x * 3;
       rline[3*(y*scrnwide+x)  ]=theimage[c  ];
       rline[3*(y*scrnwide+x)+1]=theimage[c+1];
       rline[3*(y*scrnwide+x)+2]=theimage[c+2];
--- xzgv-0.9/src/resizepic.h	2007-08-11 18:52:03.000000000 +0200
+++ xzgv-0.9.new/src/resizepic.h	2009-01-06 23:01:36.000000000 +0100
@@ -6,4 +6,4 @@
 
 
 extern unsigned char *resizepic(unsigned char *theimage,
-                                int width,int height,int *sw_ask,int *sh_ask,int allow_crunch);
+                                int width,int height, int stride, int *sw_ask,int *sh_ask,int allow_crunch);
--- xzgv-0.9/src/updatetn.c	2007-08-11 20:08:41.000000000 +0200
+++ xzgv-0.9.new/src/updatetn.c	2009-01-10 14:30:42.000000000 +0100
@@ -77,10 +77,9 @@
               unsigned char **xvpic_data,int *wp,int *hp,int *written_ok_ptr)
 {
 FILE *out;
-int w,h,y;
+int w,h,x,y;
 unsigned char *smallpic;
 xzgv_image *origpic;
-int width,height;
 int origw,origh;
 int allow_crunch=1;
 int written_ok=0;
@@ -95,10 +94,23 @@
 if(origpic->w!=origw || origpic->h!=origh)
   allow_crunch=0;
 
+if (origpic->has_alpha)
+  /* Bummer we've got RGBA pixel data but all the other code expects packed
+     RGB data, so convert it. */
+  for (y = 0; y < origh; y++)
+    for (x = 0; x < origw; x++)
+      {
+         origpic->rgb[y * origpic->stride + x * 3] =
+           origpic->rgb[y * origpic->stride + x * 4];
+         origpic->rgb[y * origpic->stride + x * 3 + 1] =
+           origpic->rgb[y * origpic->stride + x * 4 + 1];
+         origpic->rgb[y * origpic->stride + x * 3 + 2] =
+           origpic->rgb[y * origpic->stride + x * 4 + 2];
+      }
+
 /* resize */
 w=80; h=60;
-smallpic=resizepic(origpic->rgb,
-                   width=origpic->w,height=origpic->h,&w,&h,
+smallpic=resizepic(origpic->rgb, origw, origh, origpic->stride, &w,&h,
                    allow_crunch);
 
 backend_image_destroy(origpic);		/* finished with this */

xzgv-0.9-svn-r41.patch:

--- NEW FILE xzgv-0.9-svn-r41.patch ---
diff -up xzgv-0.9/Makefile.foo xzgv-0.9/Makefile
--- xzgv-0.9/Makefile.foo	2007-09-09 20:12:48.000000000 +0200
+++ xzgv-0.9/Makefile	2009-01-10 15:20:11.000000000 +0100
@@ -42,9 +42,9 @@ doc/xzgv.1: doc/xzgv.texi doc/makeman.aw
 
 # Like in GNU stuff, info files aren't automatically remade,
 # as I don't want to assume everyone has texinfo's `makeinfo' handy.
-info: doc/xzgv.gz
+info: doc/xzgv.info.gz
 
-doc/xzgv.gz: doc/xzgv.texi
+doc/xzgv.info.gz: doc/xzgv.texi
 	cd doc && $(MAKE) info
 
 clean:
@@ -52,6 +52,11 @@ clean:
 	cd doc && $(MAKE) clean
 	$(RM) *~
 
+realclean:
+	cd src && $(MAKE) realclean
+	cd doc && $(MAKE) realclean
+	$(RM) *~
+
 install: all
 	cd src && $(MAKE) install
 	cd doc && $(MAKE) install
diff -up xzgv-0.9/doc/Makefile.foo xzgv-0.9/doc/Makefile
--- xzgv-0.9/doc/Makefile.foo	2007-09-09 20:27:58.000000000 +0200
+++ xzgv-0.9/doc/Makefile	2009-01-10 15:20:11.000000000 +0100
@@ -10,12 +10,12 @@ include ../config.mk
 
 all: info man
 
-info: xzgv.gz
+info: xzgv.info.gz
 dvi: xzgv.dvi
 
-xzgv.gz: xzgv.texi
-	makeinfo xzgv.texi
-	gzip -f xzgv
+xzgv.info.gz: xzgv.texi
+	makeinfo --no-split xzgv.texi
+	gzip -9f xzgv.info
 
 # `-c' removes the huge number of associated files created by TeX.
 # This saves doing a `make clean' from hell. :-)
@@ -38,16 +38,20 @@ installdirs:
 
 install: installdirs
 	install xzgv.1 $(MANDIR)
-	install xzgv.gz $(INFODIR)
-	install-info  --infodir=$(INFODIR) xzgv.gz
+	install -m 644 xzgv.info.gz $(INFODIR)
+	install-info --infodir=$(INFODIR) xzgv.info.gz
 
 uninstall:
 	$(RM) $(MANDIR)/xzgv.1
 	$(RM) $(INFODIR)/xzgv.gz
-	install-info --remove xzgv
+	install-info --remove xzgv.info.gz
 
 # This *doesn't* remove the Info files, which should stick around to
 # be included in the distribution. Ditto for the man page, since
 # building it requires gawk.
 clean:
 	$(RM) *~ xzgv.dvi
+
+realclean: clean
+	$(RM) xzgv.1 xzgv.info.gz
+
diff -up xzgv-0.9/doc/xzgv.texi.foo xzgv-0.9/doc/xzgv.texi
--- xzgv-0.9/doc/xzgv.texi.foo	2007-09-09 20:27:28.000000000 +0200
+++ xzgv-0.9/doc/xzgv.texi	2009-01-10 15:20:11.000000000 +0100
@@ -1,6 +1,6 @@
 \input texinfo   @c -*-texinfo-*-
 @c %**start of header
- at setfilename xzgv
+ at setfilename xzgv.info
 @settitle The xzgv manual
 @setchapternewpage odd
 @c %**end of header
@@ -47,6 +47,7 @@ The xzgv manual, for version @value{VERS
 @value{UPDATED}.
 
 Copyright 1999-2001 Russell Marks.
+Copyright 2007 Reuben Thomas.
 
 Permission is granted to make and distribute verbatim copies of this
 manual provided the copyright notice and this permission notice are
@@ -74,12 +75,13 @@ approved by the Free Software Foundation
 @title xzgv
 @subtitle A picture viewer for X, with thumbnail-based file selector
 @subtitle version @value{VERSION}
- at author Russell Marks
+ at author Russell Marks and Reuben Thomas
 
 @c The following two commands start the copyright page.
 @page
 @vskip 0pt plus 1filll
 Copyright @copyright{} 1999-2001 Russell Marks.
+Copyright @copyright{} 2007 Reuben Thomas.
 
 Permission is granted to make and distribute verbatim copies of this
 manual provided the copyright notice and this permission notice are
@@ -149,8 +151,7 @@ The thumbnails used (thumbnails being sm
 pictures) are compatible with xv, zgv, and the Gimp. The kinds of
 pictures xzgv allows to be viewed are raster-format pictures (sometimes
 called `bitmaps' and/or `pixmaps'); things like GIF files, JPEG files,
-PNG files, and so on. (Details of file formats supported are given
-elsewhere. @xref{Supported File Formats}.)
+PNG files, and so on.
 
 Most of the time, you will probably want to use xzgv's file selector
 (@pxref{The File Selector}) to pick which file(s) to view. This is what
@@ -192,17 +193,11 @@ xzgv. xzgv can do a lot more; read on to
 @c first, direct (or direct-ish :-)) xzgv contributions:
 
 xzgv was primarily written by Russell Marks, also the author of this
-manual.
+manual. It is maintained by Reuben Thomas.
 
 Costa Sapuntzakis contributed code for much faster JPEG thumbnail
 generation (to zgv, which I adapted for xzgv).
 
- at c this isn't really `direct', but I think it belongs here.
- at code{install-info} is a (very) slightly modified version of the
-original (which is part of the @code{texinfo} package). This program is
-used during installation. I think it was mostly written by Karl Berry,
-but it's not terribly clear.
-
 The directory/file icons used were loosely based on gmc's
 @file{dir-close.xpm}. I think Tuomas Kuosmanen was responsible for
 that, judging from the change log.
@@ -213,28 +208,12 @@ was written by Noah Friedman. (This is a
 @c now libraries etc.:
 
 Huge thanks go to the many people responsible for GTK+, without which
-xzgv would almost certainly not have happened. Thanks also to the
-Rasterman (Carsten Haiztler) for Imlib, without which xzgv would most
-likely have been a complete pain to write. (But no thanks for Electric
-Eyes, which was nearly nice enough for me not to bother with xzgv at
-all! :-))
-
-This program is based in part on the work of the Independent JPEG
-Group. (I don't think I actually need this line any more, but I like
-giving these guys a credit, it's a neat library. :-))
-
-xzgv uses (or rather it does if @code{INTERP_MMX} was defined when
-compiling, and if it's running on an MMX-capable CPU) MMX instructions
-for interpolation, with the help of libmmx, by Hank Dietz and Randy
-Fisher.
+xzgv would almost certainly not have happened. (But no thanks for
+Electric Eyes, which was nearly nice enough for me not to bother with
+xzgv at all! :-))
 
 @file{getopt*.[ch]} are from the GNU libc.
 
-``The Graphics Interchange Format(c) is the Copyright property of
-CompuServe Incorporated. GIF(sm) is a Service Mark property of
-CompuServe Incorporated.''
-
-
 @node  Invoking xzgv, A Note on Notation, Acknowledgements, Top
 @comment  node-name,  next,  previous,  up
 @chapter Invoking xzgv
@@ -300,11 +279,6 @@ Here's what the options do:
 Automatically hide selector when a picture is selected, allowing the
 viewer to use the whole window.
 
- at c I would never have defaulted to the fast/sloppy method if given
- at c a choice, but Imlib1 did it without my knowing, such that when
- at c I started reading JPEGs natively, I `had' to do it this way
- at c around to avoid apparently gratuitous slowdown. :-(
- at c
 @vindex careful-jpeg
 @item --careful-jpeg
 Enable libjpeg `fancy upsampling'. xzgv defaults to using the faster
@@ -322,10 +296,9 @@ override.)
 
 @vindex dither-hicol
 @item --dither-hicol
-Use dithering in 15/16-bit, whatever Imlib's default setting is.
+Use dithering in 15/16-bit, whatever the default setting is.
 @xref{Viewer Options}, for a discussion of benefits/drawbacks. You can
-also use @code{--dither-hicol=off} to disable this if Imlib normally has
-it enabled.
+also use @code{--dither-hicol=off} to disable this.
 
 @vindex exif-orient
 @item --exif-orient
@@ -503,10 +476,7 @@ If started with @code{xzgv @var{files}},
 and treats the file or files as if they were the sole contents of a
 directory. (It also automatically loads the first file.) As such, you
 can use the Next Image and Previous Image commands to navigate between
-the images, or do Exit to Selector and use the selector directly. (By
-the way, running like this also makes it possible to view files without
-the usual extensions such as @file{.gif}, etc. @xref{File Type
-Identification}.)
+the images, or do Exit to Selector and use the selector directly.
 
 If started with @code{xzgv @var{start-dir}}, xzgv starts up as usual,
 but with the selector starting on the directory specified (rather than
@@ -830,13 +800,13 @@ move around the list, but it reads them 
 The thumbnails used in xzgv require 256 colours to display. This can be
 a problem if you're running X in 256 colours or less as, even if you're
 running an 8-bit (256 colour) server, there will almost inevitably be
-fewer colours available. Currently, xzgv just uses whatever Imlib
+fewer colours available. Currently, xzgv just uses whatever gdk
 reports as the closest match to each individual colour used in
 thumbnails. This gives a tolerable result on 8-bit servers, assuming
-Imlib was able to allocate a large number of colours; however, it gives
+gdk was able to allocate a large number of colours; however, it gives
 terrible results if it couldn't, or if running on 4-bit or 1-bit
 servers. Sorry about this --- it should be fixed in future (either by
-using Imlib to draw the thumbnail pixmaps, or by dithering them `by
+using gdk to draw the thumbnail pixmaps, or by dithering them `by
 hand' to suit the colours available).
 
 @item
@@ -2548,14 +2518,13 @@ and see. (No keyboard shortcut --- see a
 @cindex pictures, file formats used by
 
 Picture files are stored in a variety of different forms, or `file
-formats'. xzgv, via Imlib, supports many.
+formats'. xzgv, via gdk, supports many.
 
 @menu
 * File Type Identification::    How xzgv identifies the type of a file.
-* Supported File Formats::      The file formats that xzgv supports.
 @end menu
 
- at node  File Type Identification, Supported File Formats, File Formats, File Formats
+ at node  File Type Identification,  , File Formats, File Formats
 @comment  node-name,  next,  previous,  up
 @section File Type Identification
 
@@ -2564,120 +2533,13 @@ formats'. xzgv, via Imlib, supports many
 @cindex picture format, identification of 
 @cindex file format, identification of
 
-The format a file is in is identified in two different ways. The file
-selector picks filenames to display based on the `extension' --- for
-instance, if a filename ends in @file{.jpg} or @file{.jpeg}, xzgv assumes
-it is a JPEG. This way of working is not always right, but it's much
-faster than the alternative (reading part of every single file) and is
-usually sufficient.
-
-The file-reading code relies on Imlib to determine the file type and
-read the file correctly; generally this uses the format's `magic number'
-to determine file type --- e.g. a JPEG/JFIF file starts with the (hex)
-bytes @code{FF D8}. So if you start xzgv with @samp{xzgv foo}, and foo
-is in a format supported by Imlib (such as JPEG), the format will be
-figured out and the file loaded even though the `extension' is absent.
-
-One extension to this is xzgv's built-in support for my relatively
-obscure `mrf' format. :-) Since there's probably not much interest in
-supporting this in Imlib, and it's really quite a simple format, it's
-not unreasonable for xzgv to support this directly. But xzgv acts as if
-Imlib supported mrf, so this distinction can be largely ignored.
-
-In fact, xzgv is gradually moving towards reading several of the more
-popular formats natively, as part of an attempt to avoid being tied to a
-single image rendering/loading backend; at the time of writing, GIF,
-JPEG, PNG, and TIFF are also read in this way.
-
-
- at node  Supported File Formats,  , File Type Identification, File Formats
- at comment  node-name,  next,  previous,  up
- at section Supported File Formats
-
- at cindex supported file formats
- at cindex file formats, supported
- at cindex types of picture supported
- at cindex GIF
- at cindex JPEG
- at cindex PNG
- at cindex PBM
- at cindex PGM
- at cindex PPM
- at cindex PNM
- at cindex TGA
- at cindex Targa
- at cindex PCX
- at cindex mrf
- at cindex PRF
- at cindex XBM
- at cindex bitmaps, X
- at cindex XPM
- at cindex pixmaps, X
- at cindex TIFF
- at cindex TIM
- at cindex XWD
-
-xzgv supports the following file formats:
-
- at itemize @bullet
- at item
-GIF.
-
- at item
-JPEG.
-
- at item
-PNG.
-
- at item
-PBM/PGM/PPM, collectively known as `PNM'. This is a nice simple format
-used by pbmplus and netpbm.
-
- at item
-BMP.
-
- at item
-TGA (Targa).
-
- at item
-PCX.
-
- at item
-mrf. Mrf files can be converted to/from PBM with mrftopbm/pbmtomrf, and
-the format is documented in the @cite{mrf(5)} man page.
-
- at item
-PRF. PRF is an extension of mrf, similarly converted with
-prftopnm/pnmtoprf, and documented in the @cite{prf(5)} man page.
-
- at item
-XBM (X bitmap files).
-
- at item
-XPM.
-
- at item
-TIFF.
-
- at item
-TIM. This is an image format used (on the Sony PlayStation) by some
-games (e.g. Wipeout) for storing 2D images.
-
- at item
-XWD (X window dumps, as produced by xwd).
-
- at c [XXX xzgv doesn't support these as files yet (will need yet more
- at c Imlib-bypassing code, sigh), and doesn't treat them as their own
- at c thumbnails]
- at c Xv format thumbnail files. Normally you won't want to view these other
- at c than in the file selector, but xzgv lets you view them as normal picture
- at c files if you want. Note that in the file selector, thumbnail files are
- at c indistinguishable from the files they represent (other than the
- at c @file{.xvpics} in the directory's filename) --- they have the same
- at c filenames, and thumbnails are their own thumbnails. :-)
-
- at end itemize
-
+The format a file is in is identified by its content. The file-reading
+code relies on libgdk to determine the file type and read the file
+correctly; generally this uses the format's `magic number' to determine
+file type --- e.g. a JPEG/JFIF file starts with the (hex) bytes @code{FF
+D8}. So if you start xzgv with @samp{xzgv foo}, and foo is in a
+supported format (such as JPEG), the format will be figured out and the
+file loaded even though the `extension' is absent.
 
 @node  Configuring xzgv, Rationale, File Formats, Top
 @comment  node-name,  next,  previous,  up
@@ -3037,8 +2899,8 @@ hiding/showing selector or resizing from
 I kludged it :-)).
 
 @item
-When scaling up and imlib is dithering, you end up with a crappy-looking
-picture if you drag the picture around slowly (since each exposed bit is
+When scaling up and dithering, you end up with a crappy-looking picture
+if you drag the picture around slowly (since each exposed bit is
 dithered independently, with no regard given to matching up to any
 previous error-diffusion).
 
@@ -3060,10 +2922,10 @@ window-splitting bit, but I'm not sure. 
 across scrollbar sliders and the paned window splitter handle.
 
 @item
-It doesn't apply any tranparency mask returned by imlib. The practical
-result of this seems to be purple transparent bits in thumbnails and
-scaled-up images, and black transparent bits elsewhere. This doesn't
-affect PNG files, though.
+It doesn't apply any tranparency mask. The practical result of this
+seems to be purple transparent bits in thumbnails and scaled-up images,
+and black transparent bits elsewhere. This doesn't affect PNG files,
+though.
 
 @item
 If a GIF file is corrupted in such a way that the decompressed image
@@ -3089,13 +2951,7 @@ nature, see xzgv''. :-)
 @itemize @minus
 @item
 Thumbnails are given an accurate width/height `IMGINFO' comment, but are
-always claimed to be "RGB", as Imlib doesn't provide any way to find out
-what type they are.
-
- at item
-xzgv should have an option to treat all files as images, since it
-currently applies a zgv-like file extension filter. This is a bit
-inflexible, given that Imlib supports `all' formats.
+always claimed to be "RGB".
 
 @item
 xzgv @emph{doesn't} duplicate zgv's behaviour of generating thumbnails
@@ -3115,9 +2971,6 @@ suboptimal, but as an incompatibility wi
 
 @itemize @minus
 @item
-GIF89a extension blocks are ignored.
-
- at item
 Only the first image of a multiple-image GIF is used. (These days,
 multiple-image GIFs are usually animations.)
 @end itemize
@@ -3148,11 +3001,8 @@ Here are some details you should include
 The version of xzgv you are running. @code{xzgv --version} reports this.
 
 @item
-The versions of GTK+ and Imlib you are using. @code{xzgv --version-gtk}
-reports the GTK+ version being used by xzgv, but Imlib is a little more
-tricky --- @code{imlib-config --version} should work if you have a full
-Imlib installation, but failing that, try @code{ls -l
-/usr/lib/libImlib*} or @code{ls -l /usr/X11R6/lib/libImlib*}.
+The versions of GTK+ you are using. @code{xzgv --version-gtk} reports
+the GTK+ version being used by xzgv.
 
 @item
 The bitdepth your X server is running in (common depths are 8-bit (256
@@ -3162,7 +3012,7 @@ depth you're running in, try @code{xdpyi
 @item
 A description of the bug --- what effects it has, the circumstances it
 occurs in, and so on. Does it only happen for certain types of file?
-Only when in 8-bit modes? Only when dithering is enabled in Imlib? Even
+Only when in 8-bit modes? Only when dithering is enabled? Even
 `irrelevant' details can sometimes be useful.
 
 @item
@@ -3173,7 +3023,7 @@ the patch using @code{diff -c} or (prefe
 @end itemize
 
 So, if you think you've found a bug in xzgv, report it by emailing me at
- at email{rus@@svgalib.org}.
+ at email{rrt@@sc3d.org}.
 
 
 @node  Reporting Documentation Bugs,  , Reporting Bugs, Bugs and Restrictions
diff -up xzgv-0.9/src/Makefile.foo xzgv-0.9/src/Makefile
--- xzgv-0.9/src/Makefile.foo	2007-08-14 00:39:16.000000000 +0200
+++ xzgv-0.9/src/Makefile	2009-01-10 15:20:11.000000000 +0100
@@ -39,6 +39,7 @@ clean:
 	$(RM) *~ *.o xzgv
 	$(RM) rcfile_opt.h rcfile_var.h rcfile_short.h
 
+realclean: clean
 
 # dependancies
 backend.o: backend.c backend.h
diff -up xzgv-0.9/src/help.c.foo xzgv-0.9/src/help.c
--- xzgv-0.9/src/help.c.foo	2007-09-09 02:45:46.000000000 +0200
+++ xzgv-0.9/src/help.c	2009-01-10 15:20:11.000000000 +0100
@@ -46,7 +46,8 @@ gtk_window_set_modal(GTK_WINDOW(about_wi
 
 label=gtk_label_new("xzgv " XZGV_VER " - picture viewer for X with file selector\n"
                     "Copyright (C) 1999-2005 Russell Marks\n"
-                    "Homepage - http://rus.members.beeb.net/xzgv.html");
+                    "Copyright (C) 2007 Reuben Thomas\n"
+                    "Homepage - http://sourceforge.net/projects/xzgv");
 gtk_box_pack_start(GTK_BOX(vbox),label,TRUE,TRUE,2);
 gtk_widget_show(label);
 
diff -up xzgv-0.9/src/main.c.foo xzgv-0.9/src/main.c
--- xzgv-0.9/src/main.c.foo	2007-09-09 02:36:21.000000000 +0200
+++ xzgv-0.9/src/main.c	2009-01-10 15:20:36.000000000 +0100
@@ -38,7 +38,8 @@
 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
 #include <gdk/gdkx.h>		/* needed for iconify stuff */
-#include <X11/Xlib.h>		/* ditto */
+#include <gdk/gdkrgb.h>     /* http://bugs.debian.org/457252 */
+#include <X11/Xlib.h>		/* needed for iconify stuff */
 
 #include "backend.h"
 #include "resizepic.h"
@@ -105,7 +106,7 @@ guint tn_id;			/* `thumbnail' id for sta
 
 GtkWidget *mainwin;
 
-gint xvpic_pal[256];		/* palette for thumbnails */
+guint8 xvpic_pal[256][3];		/* palette for thumbnails */
 
 /* image & rendered pixmap for currently-loaded image */
 xzgv_image *theimage=NULL;
@@ -1704,6 +1705,9 @@ void xy_scaling_double(int do_x,int do_y
 static int in_routine=0;
 int xtmp=xscaling,ytmp=yscaling,oldxsc=xscaling,oldysc=yscaling;
 
+/* if there's no image, don't do anything */
+if (!theimage) return;
+
 /* if recursed, don't bother */
 if(in_routine) return;
 in_routine=1;
@@ -1752,6 +1756,9 @@ void xy_scaling_add(int do_x,int do_y)
 static int in_routine=0;
 int xtmp=xscaling,ytmp=yscaling,oldxsc=xscaling,oldysc=yscaling;
 
+/* if there's no image, don't do anything */
+if (!theimage) return;
+
 /* if recursed, don't bother */
 if(in_routine) return;
 in_routine=1;
@@ -1800,6 +1807,9 @@ void xy_scaling_halve(int do_x,int do_y)
 static int in_routine=0;
 int xtmp=xscaling,ytmp=yscaling,oldxsc=xscaling,oldysc=yscaling;
 
+/* if there's no image, don't do anything */
+if (!theimage) return;
+
 /* if recursed, don't bother */
 if(in_routine) return;
 in_routine=1;
@@ -1851,6 +1861,9 @@ void xy_scaling_sub(int do_x,int do_y)
 static int in_routine=0;
 int xtmp=xscaling,ytmp=yscaling,oldxsc=xscaling,oldysc=yscaling;
 
+/* if there's no image, don't do anything */
+if (!theimage) return;
+
 /* if recursed, don't bother */
 if(in_routine) return;
 in_routine=1;
@@ -2101,6 +2114,7 @@ listen_to_toggles=1;
 
 void cb_flip(void)
 {
+if (!theimage) return;
 RECURSE_PROTECT_START;
 backend_flip_vert(theimage);
 orient_current_state=orient_state_flip[orient_current_state];
@@ -2111,6 +2125,7 @@ RECURSE_PROTECT_END;
 
 void cb_mirror(void)
 {
+if (!theimage) return;
 RECURSE_PROTECT_START;
 backend_flip_horiz(theimage);
 orient_current_state=orient_state_mirror[orient_current_state];
@@ -2121,6 +2136,7 @@ RECURSE_PROTECT_END;
 
 void cb_rot_cw(void)
 {
+if (!theimage) return;
 RECURSE_PROTECT_START;
 /* swap x and y scaling, since the effect if we don't do that
  * is of the image mysteriously changing. :-)
@@ -2135,6 +2151,7 @@ RECURSE_PROTECT_END;
 
 void cb_rot_acw(void)
 {
+if (!theimage) return;
 RECURSE_PROTECT_START;
 backend_rotate_acw(theimage);
 orient_current_state=orient_state_rot_acw[orient_current_state];
@@ -2146,6 +2163,7 @@ RECURSE_PROTECT_END;
 
 void cb_normal_orient(void)
 {
+if (!theimage) return;
 RECURSE_PROTECT_START;
 if(orient_current_state!=0)
   {
@@ -2514,113 +2532,93 @@ return(1);
  */
 void find_xvpic_cols(void)
 {
-GdkColor col;
-int r,g,b;
-int n;
-
-for(n=0,r=0;r<8;r++)
-  for(g=0;g<8;g++)	/* colours are 3:3:2 */
-    for(b=0;b<4;b++,n++)
-      {
-      col.red=r*0xffff/7; col.green=g*0xffff/7; col.blue=b*0xffff/3;
-      backend_get_closest_colour(&col);
-      xvpic_pal[n]=col.pixel;
-      }
+    int r,g,b;
+    int n;
+
+    for(n=0,r=0;r<8;r++) {
+        for(g=0;g<8;g++) {/* colours are 3:3:2 */
+            for(b=0;b<4;b++,n++) {
+                xvpic_pal[n][0]=r*0xff/7; 
+                xvpic_pal[n][1]=g*0xff/7;
+                xvpic_pal[n][2]=b*0xff/3;
+            }
+        }
+    }
 }
 
 
 GdkPixmap *xvpic2pixmap(unsigned char *xvpic,int w,int h,GdkPixmap **smallp)
 {
 GdkPixmap *pixmap,*small_pixmap;
-GdkImage *image;
+guint8 *buffer;
 unsigned char *ptr=xvpic;
 int x,y;
 int small_w,small_h;
 
 if(w==0 || h==0) return(NULL);
 
-/* we allocate pixmap and image, draw into image, copy to pixmap,
- * and ditch the image.
- */
-
-if((image=gdk_image_new(GDK_IMAGE_FASTEST,backend_get_visual(),w,h))==NULL)
-  return(NULL);
-
-if((pixmap=gdk_pixmap_new(mainwin->window,w,h,
-                          gdk_visual_get_best_depth()))==NULL)
-  {
-  gdk_image_destroy(image);
-  return(NULL);
-  }
-
-for(y=0;y<h;y++)
-  for(x=0;x<w;x++)
-    gdk_image_put_pixel(image,x,y,xvpic_pal[*ptr++]);
 
-gdk_draw_image(pixmap,clist->style->white_gc,image,0,0,0,0,w,h);
-gdk_flush();
+if (NULL == (pixmap=gdk_pixmap_new(mainwin->window,w,h, -1))) { 
+    return(NULL);
+}
 
-/* reuse image to draw scaled-down version for thin rows */
 small_w=w/ROW_HEIGHT_DIV;
 small_h=h/ROW_HEIGHT_DIV;
 if(small_w==0) small_w=1;
 if(small_h==0) small_h=1;
 
-if((small_pixmap=gdk_pixmap_new(mainwin->window,small_w,small_h,
-                                gdk_visual_get_best_depth()))==NULL)
-  {
-  gdk_pixmap_unref(pixmap);
-  gdk_image_destroy(image);
-  return(NULL);
+if((small_pixmap=gdk_pixmap_new(mainwin->window,small_w,small_h,-1))==NULL)
+{
+    gdk_pixmap_unref(pixmap);
+    return(NULL);
+}
+
+buffer = malloc (w * h * sizeof (guint8) * 3);
+
+if (NULL == buffer) {
+    /* malloc failed */
+    gdk_pixmap_unref(pixmap);
+    gdk_pixmap_unref(small_pixmap);
+    return NULL;
+}
+
+
+for(y=0;y<h;y++) {
+  for(x=0;x<w;x++) {
+      buffer[3*(y*w + x)+0] = xvpic_pal[*ptr][0]; /* red */
+      buffer[3*(y*w + x)+1] = xvpic_pal[*ptr][1]; /* green */
+      buffer[3*(y*w + x)+2] = xvpic_pal[*ptr][2]; /* blue */
+      ptr++;
   }
+}
 
-for(y=0;y<small_h;y++)
-  for(x=0;x<small_w;x++)
-    gdk_image_put_pixel(image,x,y,
-                        xvpic_pal[xvpic[(y*w+x)*ROW_HEIGHT_DIV]]);
+gdk_draw_rgb_image(pixmap,clist->style->white_gc,0,0,w,h,
+        GDK_RGB_DITHER_NORMAL,
+        (guchar*)buffer, w * 3);
+gdk_flush();
 
-gdk_draw_image(small_pixmap,clist->style->white_gc,image,
-               0,0,0,0,small_w,small_h);
+/* reuse image to draw scaled-down version for thin rows */
 
-gdk_image_destroy(image);
 
-*smallp=small_pixmap;
-return(pixmap);
+for(y=0;y<small_h;y++) {
+  for(x=0;x<small_w;x++) {
+      buffer[3*(y*w + x)+0] = xvpic_pal[xvpic[(y*w+x)*ROW_HEIGHT_DIV]][0];
+      buffer[3*(y*w + x)+1] = xvpic_pal[xvpic[(y*w+x)*ROW_HEIGHT_DIV]][1];
+      buffer[3*(y*w + x)+2] = xvpic_pal[xvpic[(y*w+x)*ROW_HEIGHT_DIV]][2];
+  }
 }
 
+gdk_draw_rgb_image(small_pixmap,clist->style->white_gc,0,0,small_w, small_h,
+        GDK_RGB_DITHER_NORMAL,
+        (guchar*)buffer, small_w * 3);
 
-int is_picture(char *filename)
-{
-int l=strlen(filename);
+*smallp=small_pixmap;
 
-if(l<=4) return(0);
+if (NULL != buffer) {
+    free (buffer);
+}
 
-/* at time of writing, imlib1 supports PPM/PGM/TIFF/PNG/XPM/JPEG
- * natively, and uses ImageMagick's `convert' for others.
- * But we have our own GIF/PNG/mrf readers.
- */
-if((!strcasecmp(filename+l-4,".gif")) ||
-   (!strcasecmp(filename+l-4,".jpg")) ||
-   (!strcasecmp(filename+l-5,".jpeg")) ||
-   (!strcasecmp(filename+l-4,".png")) ||
-   (!strcasecmp(filename+l-4,".mrf")) ||
-   (!strcasecmp(filename+l-4,".xbm")) ||
-   (!strcasecmp(filename+l-5,".icon")) ||	/* presumably an XBM */
-   (!strcasecmp(filename+l-4,".xpm")) ||
-   (!strcasecmp(filename+l-4,".pbm")) ||
-   (!strcasecmp(filename+l-4,".pgm")) ||
-   (!strcasecmp(filename+l-4,".ppm")) ||
-   (!strcasecmp(filename+l-4,".bmp")) ||
-   (!strcasecmp(filename+l-4,".tga")) ||
-   (!strcasecmp(filename+l-4,".pcx")) ||
-   (!strcasecmp(filename+l-4,".tif")) ||
-   (!strcasecmp(filename+l-5,".tiff")) ||
-   (!strcasecmp(filename+l-4,".prf")) ||
-   (!strcasecmp(filename+l-4,".tim")) ||
-   (!strcasecmp(filename+l-4,".xwd")))
-  return(1);
-else
-  return(0);
+return(pixmap);
 }
 
 
@@ -2993,9 +2991,6 @@ while((dent=readdir(dirfile))!=NULL)
     }
   isdir=S_ISDIR(sbuf.st_mode);
   
-  if(!isdir && !is_picture(dent->d_name))
-    continue;
-  
   if(clist_add_new_row(dent->d_name,&sbuf))
     numrows++;
   }
@@ -3687,7 +3682,11 @@ static GtkItemFactoryEntry viewer_menu_i
   };
 
 
+gtk_widget_push_visual(gdk_rgb_get_visual());
+gtk_widget_push_colormap(gdk_rgb_get_cmap());
 mainwin=gtk_window_new(GTK_WINDOW_TOPLEVEL);
+gtk_widget_pop_visual();
+gtk_widget_pop_colormap();
 GTK_WIDGET_UNSET_FLAGS(mainwin,GTK_CAN_FOCUS);
 gtk_signal_connect(GTK_OBJECT(mainwin),"destroy",
                    GTK_SIGNAL_FUNC(cb_quit),NULL);

xzgv-0.9-thumbnail-load-gcc4.patch:

--- NEW FILE xzgv-0.9-thumbnail-load-gcc4.patch ---
--- xzgv-0.9/src/main.c	2009-01-06 21:41:26.000000000 +0100
+++ xzgv-0.9.new/src/main.c	2009-01-06 21:43:42.000000000 +0100
@@ -201,7 +201,7 @@
 /* required prototypes */
 void render_pixmap(int reset_pos);
 void cb_nextprev_tagged_image(int next,int view);
-void idle_xvpic_load(int *entryp);
+gboolean idle_xvpic_load(gpointer data);
 gint pic_win_resized(GtkWidget *widget,GdkEventConfigure *event);
 void cb_scaling_double(void);
 void cb_xscaling_double(void);
@@ -2179,8 +2179,7 @@
 idle_xvpic_lastadjval=gtk_clist_get_vadjustment(GTK_CLIST(clist))->value;
 idle_xvpic_jumped=0;
 entry=0;
-tn_idle_tag=gtk_idle_add((GtkFunction)idle_xvpic_load,&entry);
-
+tn_idle_tag=gtk_idle_add(idle_xvpic_load, &entry);
 /* the "" is a crappy way to disable it, but it's hairy otherwise */
 gtk_statusbar_push(GTK_STATUSBAR(statusbar),tn_id,
                    tn_msgs?"Reading thumbnails...":"");
@@ -2605,7 +2604,7 @@
 }
 
 
-void idle_xvpic_load(int *entryp)
+gint idle_xvpic_load(gpointer data)
 {
 static char buf[1024];
 struct clist_data_tag *datptr;
@@ -2616,12 +2615,13 @@
 static unsigned char xvpic_data[80*60];		/* max thumbnail size */
 float adjval;
 static int prev_scanpos=0;	/* if jumped, saved pos in top-to-bot scan */
+int *entryp = data;
 
 idle_xvpic_called=1;
 
 /* don't do it if it would be a bad time */
 if(idle_xvpic_blocked)
-  return;
+  return TRUE;
 
 /* freeze/thaw actually *cause* flickering for this, rather than
  * preventing it (!), so I've not used those here.
@@ -2729,6 +2729,8 @@
     *entryp=-1;
     }
   }
+  
+  return TRUE;
 }
 
 


Index: xzgv.spec
===================================================================
RCS file: /cvs/extras/rpms/xzgv/F-10/xzgv.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- xzgv.spec	9 Feb 2008 16:01:09 -0000	1.7
+++ xzgv.spec	10 Jan 2009 14:43:43 -0000	1.8
@@ -1,12 +1,14 @@
 Summary:   Picture viewer
 Name:      xzgv
 Version:   0.9
-Release:   4%{?dist}
+Release:   5%{?dist}
 License:   GPLv2+
 Group:     Applications/Multimedia
 Source:    http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
-Patch:     xzgv-0.9-svn-r35.patch
+Patch:     xzgv-0.9-svn-r41.patch
 Patch1:    xzgv-0.9-fix-doc-install.patch
+Patch2:    xzgv-0.9-thumbnail-load-gcc4.patch
+Patch3:    xzgv-0.9-fix-thumbnail-generation.patch
 URL:       http://sourceforge.net/projects/xzgv/
 Requires:  xterm gnome-icon-theme
 Requires(post): /sbin/install-info
@@ -23,6 +25,8 @@
 %setup -q
 %patch -p1
 %patch1 -p1
+%patch2 -p1
+%patch3 -p1
 
 %build
 %{__sed} -i 's|^CFLAGS.*|CFLAGS=%{optflags}|' config.mk
@@ -57,7 +61,7 @@
 %post
 /sbin/install-info %{_infodir}/xzgv.info.gz %{_infodir}/dir || :
 
-%postun
+%preun
 if [ "$1" = "0" ]; then
    /sbin/install-info --delete %{_infodir}/xzgv.info.gz %{_infodir}/dir || :
 fi
@@ -74,6 +78,15 @@
 %{_datadir}/applications/fedora-%{name}.desktop
 
 %changelog
+* Sat Jan 10 2009 Hans de Goede <hdegoede at redhat.com> - 0.9-5
+- Update to latest upstream svn (r41) fixing several crashes
+- Add a patch fixing thumbnail loading
+- Add a patch fixing thumbnail generation for pictures where
+  the width is not a multiple of 4
+- Add a patch fixing thumbnail generation for pictures which have an alpha
+  channel
+- Fix scriptlet error on uninstall (make it preun instead of postun)
+
 * Sat Feb  9 2008 Terje Rosten <terjeros at phys.ntnu.no> - 0.9-4
 - rebuild
 



From jwrdegoede at fedoraproject.org  Sat Jan 10 14:46:05 2009
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Sat, 10 Jan 2009 14:46:05 +0000 (UTC)
Subject: rpms/xzgv/F-10 xzgv-0.9-svn-r35.patch,1.1,NONE
Message-ID: <20090110144605.DC0F07012C@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/xzgv/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1481

Removed Files:
	xzgv-0.9-svn-r35.patch 
Log Message:
remove no longer used patch file


--- xzgv-0.9-svn-r35.patch DELETED ---



From jwrdegoede at fedoraproject.org  Sat Jan 10 14:49:32 2009
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Sat, 10 Jan 2009 14:49:32 +0000 (UTC)
Subject: rpms/xzgv/F-9 xzgv-0.9-fix-thumbnail-generation.patch, NONE,
	1.1 xzgv-0.9-svn-r41.patch, NONE,
	1.1 xzgv-0.9-thumbnail-load-gcc4.patch, NONE, 1.1 xzgv.spec, 1.7,
	1.8 xzgv-0.9-svn-r35.patch, 1.1, NONE
Message-ID: <20090110144932.B17867012C@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/xzgv/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1799

Modified Files:
	xzgv.spec 
Added Files:
	xzgv-0.9-fix-thumbnail-generation.patch xzgv-0.9-svn-r41.patch 
	xzgv-0.9-thumbnail-load-gcc4.patch 
Removed Files:
	xzgv-0.9-svn-r35.patch 
Log Message:
* Sat Jan 10 2009 Hans de Goede <hdegoede at redhat.com> - 0.9-5
- Update to latest upstream svn (r41) fixing several crashes
- Add a patch fixing thumbnail loading
- Add a patch fixing thumbnail generation for pictures where
  the width is not a multiple of 4
- Add a patch fixing thumbnail generation for pictures which have an alpha
  channel
- Fix scriptlet error on uninstall (make it preun instead of postun)


xzgv-0.9-fix-thumbnail-generation.patch:

--- NEW FILE xzgv-0.9-fix-thumbnail-generation.patch ---
--- xzgv-0.9/src/backend.c	2007-09-09 02:37:14.000000000 +0200
+++ xzgv-0.9.new/src/backend.c	2009-01-09 17:26:29.000000000 +0100
@@ -91,6 +91,8 @@
 image->rgb=gdk_pixbuf_get_pixels(BACKEND_IMAGE(image));
 image->w=gdk_pixbuf_get_width(BACKEND_IMAGE(image));
 image->h=gdk_pixbuf_get_height(BACKEND_IMAGE(image));
+image->stride=gdk_pixbuf_get_rowstride(BACKEND_IMAGE(image));
+image->has_alpha=gdk_pixbuf_get_has_alpha(BACKEND_IMAGE(image));
 }
 
 
--- xzgv-0.9/src/backend.h	2007-09-09 02:49:12.000000000 +0200
+++ xzgv-0.9.new/src/backend.h	2009-01-09 17:25:47.000000000 +0100
@@ -8,6 +8,8 @@
   {
   unsigned char *rgb;		/* raw RGB data */
   int w,h;			/* width/height */
+  int stride;
+  int has_alpha;
   void *backend_image;		/* backend's image type (opaque) */
   void *backend_ext;		/* any extra info needed by backend (opaque) */
   };
--- xzgv-0.9/src/resizepic.c	2007-08-11 20:08:41.000000000 +0200
+++ xzgv-0.9.new/src/resizepic.c	2009-01-09 17:15:28.000000000 +0100
@@ -22,7 +22,7 @@
  * which should then be reduced more nicely for the thumbnail.
  */
 unsigned char *nasty_resizepic(unsigned char *theimage,
-                               int width,int height,int *sw_ask,int *sh_ask)
+                               int width,int height,int stride, int *sw_ask,int *sh_ask)
 {
 int x,y,yp,yw,sw,sh,lastyp,scrnwide,scrnhigh;
 unsigned char *rline,*outimage;
@@ -60,9 +60,9 @@
   rline=outimage+yp*sw*3;
   if(yp!=lastyp)
     {
-    yw=y*width;
-    for(x=0;x<width;x++,yw++)
-      memcpy(rline+(x*sw)/width*3,theimage+yw*3,3);
+    yw=y*stride;
+    for(x=0;x<width;x++,yw+=3)
+      memcpy(rline+(x*sw)/width*3,theimage+yw,3);
     lastyp=yp;
     }
   }
@@ -80,10 +80,10 @@
  * new width x height in put back in sw_ask and sh_ask
  */
 unsigned char *resizepic(unsigned char *theimage,
-                         int width,int height,int *sw_ask,int *sh_ask,
+                         int width,int height, int stride, int *sw_ask,int *sh_ask,
                          int allow_crunch)
 {
-int a,b,x,y,yp,yw,sw,sh,lastyp;
+int a,b,x,y,yp,sw,sh,lastyp;
 int c,pixwide,pixhigh;
 int scrnwide,scrnhigh;
 unsigned char *rline;
@@ -98,7 +98,7 @@
   {
   int our_sw_ask=TN_CRUNCH_WIDTH,our_sh_ask=TN_CRUNCH_HEIGHT;
   
-  crunched=nasty_resizepic(theimage,width,height,&our_sw_ask,&our_sh_ask);
+  crunched=nasty_resizepic(theimage,width,height,stride,&our_sw_ask,&our_sh_ask);
   
   /* if it worked, replace orig w/h with crunched pic's one, and
    * set theimage to point to it.
@@ -106,6 +106,7 @@
   if(crunched)
     {
     width=our_sw_ask;
+    stride=our_sw_ask*3;
     height=our_sh_ask;
     theimage=crunched;
     }
@@ -142,15 +143,14 @@
     yp=(y*sh)/height;
     if(yp!=lastyp)
       {
-      yw=y*width;
       /* we try to resample it a bit */
-      for(x=0;x<width;x++,yw++)
+      for(x=0;x<width;x++)
         {
         tr=tg=tb=tn=0;
         for(b=0;(b<pixhigh)&&(y+b<height);b++)
           for(a=0;(a<pixwide)&&(x+a<width);a++)
             {
-            tmp2=(yw+a+b*width)*3;
+            tmp2=(y + b) * stride + (x + a) * 3;
             tr+=theimage[tmp2  ];
             tg+=theimage[tmp2+1];
             tb+=theimage[tmp2+2];
@@ -173,7 +173,7 @@
   for(y=0;y<height;y++)
     for(x=0;x<width;x++)
       {
-      c=(y*width+x)*3;
+      c = y * stride + x * 3;
       rline[3*(y*scrnwide+x)  ]=theimage[c  ];
       rline[3*(y*scrnwide+x)+1]=theimage[c+1];
       rline[3*(y*scrnwide+x)+2]=theimage[c+2];
--- xzgv-0.9/src/resizepic.h	2007-08-11 18:52:03.000000000 +0200
+++ xzgv-0.9.new/src/resizepic.h	2009-01-06 23:01:36.000000000 +0100
@@ -6,4 +6,4 @@
 
 
 extern unsigned char *resizepic(unsigned char *theimage,
-                                int width,int height,int *sw_ask,int *sh_ask,int allow_crunch);
+                                int width,int height, int stride, int *sw_ask,int *sh_ask,int allow_crunch);
--- xzgv-0.9/src/updatetn.c	2007-08-11 20:08:41.000000000 +0200
+++ xzgv-0.9.new/src/updatetn.c	2009-01-10 14:30:42.000000000 +0100
@@ -77,10 +77,9 @@
               unsigned char **xvpic_data,int *wp,int *hp,int *written_ok_ptr)
 {
 FILE *out;
-int w,h,y;
+int w,h,x,y;
 unsigned char *smallpic;
 xzgv_image *origpic;
-int width,height;
 int origw,origh;
 int allow_crunch=1;
 int written_ok=0;
@@ -95,10 +94,23 @@
 if(origpic->w!=origw || origpic->h!=origh)
   allow_crunch=0;
 
+if (origpic->has_alpha)
+  /* Bummer we've got RGBA pixel data but all the other code expects packed
+     RGB data, so convert it. */
+  for (y = 0; y < origh; y++)
+    for (x = 0; x < origw; x++)
+      {
+         origpic->rgb[y * origpic->stride + x * 3] =
+           origpic->rgb[y * origpic->stride + x * 4];
+         origpic->rgb[y * origpic->stride + x * 3 + 1] =
+           origpic->rgb[y * origpic->stride + x * 4 + 1];
+         origpic->rgb[y * origpic->stride + x * 3 + 2] =
+           origpic->rgb[y * origpic->stride + x * 4 + 2];
+      }
+
 /* resize */
 w=80; h=60;
-smallpic=resizepic(origpic->rgb,
-                   width=origpic->w,height=origpic->h,&w,&h,
+smallpic=resizepic(origpic->rgb, origw, origh, origpic->stride, &w,&h,
                    allow_crunch);
 
 backend_image_destroy(origpic);		/* finished with this */

xzgv-0.9-svn-r41.patch:

--- NEW FILE xzgv-0.9-svn-r41.patch ---
diff -up xzgv-0.9/Makefile.foo xzgv-0.9/Makefile
--- xzgv-0.9/Makefile.foo	2007-09-09 20:12:48.000000000 +0200
+++ xzgv-0.9/Makefile	2009-01-10 15:20:11.000000000 +0100
@@ -42,9 +42,9 @@ doc/xzgv.1: doc/xzgv.texi doc/makeman.aw
 
 # Like in GNU stuff, info files aren't automatically remade,
 # as I don't want to assume everyone has texinfo's `makeinfo' handy.
-info: doc/xzgv.gz
+info: doc/xzgv.info.gz
 
-doc/xzgv.gz: doc/xzgv.texi
+doc/xzgv.info.gz: doc/xzgv.texi
 	cd doc && $(MAKE) info
 
 clean:
@@ -52,6 +52,11 @@ clean:
 	cd doc && $(MAKE) clean
 	$(RM) *~
 
+realclean:
+	cd src && $(MAKE) realclean
+	cd doc && $(MAKE) realclean
+	$(RM) *~
+
 install: all
 	cd src && $(MAKE) install
 	cd doc && $(MAKE) install
diff -up xzgv-0.9/doc/Makefile.foo xzgv-0.9/doc/Makefile
--- xzgv-0.9/doc/Makefile.foo	2007-09-09 20:27:58.000000000 +0200
+++ xzgv-0.9/doc/Makefile	2009-01-10 15:20:11.000000000 +0100
@@ -10,12 +10,12 @@ include ../config.mk
 
 all: info man
 
-info: xzgv.gz
+info: xzgv.info.gz
 dvi: xzgv.dvi
 
-xzgv.gz: xzgv.texi
-	makeinfo xzgv.texi
-	gzip -f xzgv
+xzgv.info.gz: xzgv.texi
+	makeinfo --no-split xzgv.texi
+	gzip -9f xzgv.info
 
 # `-c' removes the huge number of associated files created by TeX.
 # This saves doing a `make clean' from hell. :-)
@@ -38,16 +38,20 @@ installdirs:
 
 install: installdirs
 	install xzgv.1 $(MANDIR)
-	install xzgv.gz $(INFODIR)
-	install-info  --infodir=$(INFODIR) xzgv.gz
+	install -m 644 xzgv.info.gz $(INFODIR)
+	install-info --infodir=$(INFODIR) xzgv.info.gz
 
 uninstall:
 	$(RM) $(MANDIR)/xzgv.1
 	$(RM) $(INFODIR)/xzgv.gz
-	install-info --remove xzgv
+	install-info --remove xzgv.info.gz
 
 # This *doesn't* remove the Info files, which should stick around to
 # be included in the distribution. Ditto for the man page, since
 # building it requires gawk.
 clean:
 	$(RM) *~ xzgv.dvi
+
+realclean: clean
+	$(RM) xzgv.1 xzgv.info.gz
+
diff -up xzgv-0.9/doc/xzgv.texi.foo xzgv-0.9/doc/xzgv.texi
--- xzgv-0.9/doc/xzgv.texi.foo	2007-09-09 20:27:28.000000000 +0200
+++ xzgv-0.9/doc/xzgv.texi	2009-01-10 15:20:11.000000000 +0100
@@ -1,6 +1,6 @@
 \input texinfo   @c -*-texinfo-*-
 @c %**start of header
- at setfilename xzgv
+ at setfilename xzgv.info
 @settitle The xzgv manual
 @setchapternewpage odd
 @c %**end of header
@@ -47,6 +47,7 @@ The xzgv manual, for version @value{VERS
 @value{UPDATED}.
 
 Copyright 1999-2001 Russell Marks.
+Copyright 2007 Reuben Thomas.
 
 Permission is granted to make and distribute verbatim copies of this
 manual provided the copyright notice and this permission notice are
@@ -74,12 +75,13 @@ approved by the Free Software Foundation
 @title xzgv
 @subtitle A picture viewer for X, with thumbnail-based file selector
 @subtitle version @value{VERSION}
- at author Russell Marks
+ at author Russell Marks and Reuben Thomas
 
 @c The following two commands start the copyright page.
 @page
 @vskip 0pt plus 1filll
 Copyright @copyright{} 1999-2001 Russell Marks.
+Copyright @copyright{} 2007 Reuben Thomas.
 
 Permission is granted to make and distribute verbatim copies of this
 manual provided the copyright notice and this permission notice are
@@ -149,8 +151,7 @@ The thumbnails used (thumbnails being sm
 pictures) are compatible with xv, zgv, and the Gimp. The kinds of
 pictures xzgv allows to be viewed are raster-format pictures (sometimes
 called `bitmaps' and/or `pixmaps'); things like GIF files, JPEG files,
-PNG files, and so on. (Details of file formats supported are given
-elsewhere. @xref{Supported File Formats}.)
+PNG files, and so on.
 
 Most of the time, you will probably want to use xzgv's file selector
 (@pxref{The File Selector}) to pick which file(s) to view. This is what
@@ -192,17 +193,11 @@ xzgv. xzgv can do a lot more; read on to
 @c first, direct (or direct-ish :-)) xzgv contributions:
 
 xzgv was primarily written by Russell Marks, also the author of this
-manual.
+manual. It is maintained by Reuben Thomas.
 
 Costa Sapuntzakis contributed code for much faster JPEG thumbnail
 generation (to zgv, which I adapted for xzgv).
 
- at c this isn't really `direct', but I think it belongs here.
- at code{install-info} is a (very) slightly modified version of the
-original (which is part of the @code{texinfo} package). This program is
-used during installation. I think it was mostly written by Karl Berry,
-but it's not terribly clear.
-
 The directory/file icons used were loosely based on gmc's
 @file{dir-close.xpm}. I think Tuomas Kuosmanen was responsible for
 that, judging from the change log.
@@ -213,28 +208,12 @@ was written by Noah Friedman. (This is a
 @c now libraries etc.:
 
 Huge thanks go to the many people responsible for GTK+, without which
-xzgv would almost certainly not have happened. Thanks also to the
-Rasterman (Carsten Haiztler) for Imlib, without which xzgv would most
-likely have been a complete pain to write. (But no thanks for Electric
-Eyes, which was nearly nice enough for me not to bother with xzgv at
-all! :-))
-
-This program is based in part on the work of the Independent JPEG
-Group. (I don't think I actually need this line any more, but I like
-giving these guys a credit, it's a neat library. :-))
-
-xzgv uses (or rather it does if @code{INTERP_MMX} was defined when
-compiling, and if it's running on an MMX-capable CPU) MMX instructions
-for interpolation, with the help of libmmx, by Hank Dietz and Randy
-Fisher.
+xzgv would almost certainly not have happened. (But no thanks for
+Electric Eyes, which was nearly nice enough for me not to bother with
+xzgv at all! :-))
 
 @file{getopt*.[ch]} are from the GNU libc.
 
-``The Graphics Interchange Format(c) is the Copyright property of
-CompuServe Incorporated. GIF(sm) is a Service Mark property of
-CompuServe Incorporated.''
-
-
 @node  Invoking xzgv, A Note on Notation, Acknowledgements, Top
 @comment  node-name,  next,  previous,  up
 @chapter Invoking xzgv
@@ -300,11 +279,6 @@ Here's what the options do:
 Automatically hide selector when a picture is selected, allowing the
 viewer to use the whole window.
 
- at c I would never have defaulted to the fast/sloppy method if given
- at c a choice, but Imlib1 did it without my knowing, such that when
- at c I started reading JPEGs natively, I `had' to do it this way
- at c around to avoid apparently gratuitous slowdown. :-(
- at c
 @vindex careful-jpeg
 @item --careful-jpeg
 Enable libjpeg `fancy upsampling'. xzgv defaults to using the faster
@@ -322,10 +296,9 @@ override.)
 
 @vindex dither-hicol
 @item --dither-hicol
-Use dithering in 15/16-bit, whatever Imlib's default setting is.
+Use dithering in 15/16-bit, whatever the default setting is.
 @xref{Viewer Options}, for a discussion of benefits/drawbacks. You can
-also use @code{--dither-hicol=off} to disable this if Imlib normally has
-it enabled.
+also use @code{--dither-hicol=off} to disable this.
 
 @vindex exif-orient
 @item --exif-orient
@@ -503,10 +476,7 @@ If started with @code{xzgv @var{files}},
 and treats the file or files as if they were the sole contents of a
 directory. (It also automatically loads the first file.) As such, you
 can use the Next Image and Previous Image commands to navigate between
-the images, or do Exit to Selector and use the selector directly. (By
-the way, running like this also makes it possible to view files without
-the usual extensions such as @file{.gif}, etc. @xref{File Type
-Identification}.)
+the images, or do Exit to Selector and use the selector directly.
 
 If started with @code{xzgv @var{start-dir}}, xzgv starts up as usual,
 but with the selector starting on the directory specified (rather than
@@ -830,13 +800,13 @@ move around the list, but it reads them 
 The thumbnails used in xzgv require 256 colours to display. This can be
 a problem if you're running X in 256 colours or less as, even if you're
 running an 8-bit (256 colour) server, there will almost inevitably be
-fewer colours available. Currently, xzgv just uses whatever Imlib
+fewer colours available. Currently, xzgv just uses whatever gdk
 reports as the closest match to each individual colour used in
 thumbnails. This gives a tolerable result on 8-bit servers, assuming
-Imlib was able to allocate a large number of colours; however, it gives
+gdk was able to allocate a large number of colours; however, it gives
 terrible results if it couldn't, or if running on 4-bit or 1-bit
 servers. Sorry about this --- it should be fixed in future (either by
-using Imlib to draw the thumbnail pixmaps, or by dithering them `by
+using gdk to draw the thumbnail pixmaps, or by dithering them `by
 hand' to suit the colours available).
 
 @item
@@ -2548,14 +2518,13 @@ and see. (No keyboard shortcut --- see a
 @cindex pictures, file formats used by
 
 Picture files are stored in a variety of different forms, or `file
-formats'. xzgv, via Imlib, supports many.
+formats'. xzgv, via gdk, supports many.
 
 @menu
 * File Type Identification::    How xzgv identifies the type of a file.
-* Supported File Formats::      The file formats that xzgv supports.
 @end menu
 
- at node  File Type Identification, Supported File Formats, File Formats, File Formats
+ at node  File Type Identification,  , File Formats, File Formats
 @comment  node-name,  next,  previous,  up
 @section File Type Identification
 
@@ -2564,120 +2533,13 @@ formats'. xzgv, via Imlib, supports many
 @cindex picture format, identification of 
 @cindex file format, identification of
 
-The format a file is in is identified in two different ways. The file
-selector picks filenames to display based on the `extension' --- for
-instance, if a filename ends in @file{.jpg} or @file{.jpeg}, xzgv assumes
-it is a JPEG. This way of working is not always right, but it's much
-faster than the alternative (reading part of every single file) and is
-usually sufficient.
-
-The file-reading code relies on Imlib to determine the file type and
-read the file correctly; generally this uses the format's `magic number'
-to determine file type --- e.g. a JPEG/JFIF file starts with the (hex)
-bytes @code{FF D8}. So if you start xzgv with @samp{xzgv foo}, and foo
-is in a format supported by Imlib (such as JPEG), the format will be
-figured out and the file loaded even though the `extension' is absent.
-
-One extension to this is xzgv's built-in support for my relatively
-obscure `mrf' format. :-) Since there's probably not much interest in
-supporting this in Imlib, and it's really quite a simple format, it's
-not unreasonable for xzgv to support this directly. But xzgv acts as if
-Imlib supported mrf, so this distinction can be largely ignored.
-
-In fact, xzgv is gradually moving towards reading several of the more
-popular formats natively, as part of an attempt to avoid being tied to a
-single image rendering/loading backend; at the time of writing, GIF,
-JPEG, PNG, and TIFF are also read in this way.
-
-
- at node  Supported File Formats,  , File Type Identification, File Formats
- at comment  node-name,  next,  previous,  up
- at section Supported File Formats
-
- at cindex supported file formats
- at cindex file formats, supported
- at cindex types of picture supported
- at cindex GIF
- at cindex JPEG
- at cindex PNG
- at cindex PBM
- at cindex PGM
- at cindex PPM
- at cindex PNM
- at cindex TGA
- at cindex Targa
- at cindex PCX
- at cindex mrf
- at cindex PRF
- at cindex XBM
- at cindex bitmaps, X
- at cindex XPM
- at cindex pixmaps, X
- at cindex TIFF
- at cindex TIM
- at cindex XWD
-
-xzgv supports the following file formats:
-
- at itemize @bullet
- at item
-GIF.
-
- at item
-JPEG.
-
- at item
-PNG.
-
- at item
-PBM/PGM/PPM, collectively known as `PNM'. This is a nice simple format
-used by pbmplus and netpbm.
-
- at item
-BMP.
-
- at item
-TGA (Targa).
-
- at item
-PCX.
-
- at item
-mrf. Mrf files can be converted to/from PBM with mrftopbm/pbmtomrf, and
-the format is documented in the @cite{mrf(5)} man page.
-
- at item
-PRF. PRF is an extension of mrf, similarly converted with
-prftopnm/pnmtoprf, and documented in the @cite{prf(5)} man page.
-
- at item
-XBM (X bitmap files).
-
- at item
-XPM.
-
- at item
-TIFF.
-
- at item
-TIM. This is an image format used (on the Sony PlayStation) by some
-games (e.g. Wipeout) for storing 2D images.
-
- at item
-XWD (X window dumps, as produced by xwd).
-
- at c [XXX xzgv doesn't support these as files yet (will need yet more
- at c Imlib-bypassing code, sigh), and doesn't treat them as their own
- at c thumbnails]
- at c Xv format thumbnail files. Normally you won't want to view these other
- at c than in the file selector, but xzgv lets you view them as normal picture
- at c files if you want. Note that in the file selector, thumbnail files are
- at c indistinguishable from the files they represent (other than the
- at c @file{.xvpics} in the directory's filename) --- they have the same
- at c filenames, and thumbnails are their own thumbnails. :-)
-
- at end itemize
-
+The format a file is in is identified by its content. The file-reading
+code relies on libgdk to determine the file type and read the file
+correctly; generally this uses the format's `magic number' to determine
+file type --- e.g. a JPEG/JFIF file starts with the (hex) bytes @code{FF
+D8}. So if you start xzgv with @samp{xzgv foo}, and foo is in a
+supported format (such as JPEG), the format will be figured out and the
+file loaded even though the `extension' is absent.
 
 @node  Configuring xzgv, Rationale, File Formats, Top
 @comment  node-name,  next,  previous,  up
@@ -3037,8 +2899,8 @@ hiding/showing selector or resizing from
 I kludged it :-)).
 
 @item
-When scaling up and imlib is dithering, you end up with a crappy-looking
-picture if you drag the picture around slowly (since each exposed bit is
+When scaling up and dithering, you end up with a crappy-looking picture
+if you drag the picture around slowly (since each exposed bit is
 dithered independently, with no regard given to matching up to any
 previous error-diffusion).
 
@@ -3060,10 +2922,10 @@ window-splitting bit, but I'm not sure. 
 across scrollbar sliders and the paned window splitter handle.
 
 @item
-It doesn't apply any tranparency mask returned by imlib. The practical
-result of this seems to be purple transparent bits in thumbnails and
-scaled-up images, and black transparent bits elsewhere. This doesn't
-affect PNG files, though.
+It doesn't apply any tranparency mask. The practical result of this
+seems to be purple transparent bits in thumbnails and scaled-up images,
+and black transparent bits elsewhere. This doesn't affect PNG files,
+though.
 
 @item
 If a GIF file is corrupted in such a way that the decompressed image
@@ -3089,13 +2951,7 @@ nature, see xzgv''. :-)
 @itemize @minus
 @item
 Thumbnails are given an accurate width/height `IMGINFO' comment, but are
-always claimed to be "RGB", as Imlib doesn't provide any way to find out
-what type they are.
-
- at item
-xzgv should have an option to treat all files as images, since it
-currently applies a zgv-like file extension filter. This is a bit
-inflexible, given that Imlib supports `all' formats.
+always claimed to be "RGB".
 
 @item
 xzgv @emph{doesn't} duplicate zgv's behaviour of generating thumbnails
@@ -3115,9 +2971,6 @@ suboptimal, but as an incompatibility wi
 
 @itemize @minus
 @item
-GIF89a extension blocks are ignored.
-
- at item
 Only the first image of a multiple-image GIF is used. (These days,
 multiple-image GIFs are usually animations.)
 @end itemize
@@ -3148,11 +3001,8 @@ Here are some details you should include
 The version of xzgv you are running. @code{xzgv --version} reports this.
 
 @item
-The versions of GTK+ and Imlib you are using. @code{xzgv --version-gtk}
-reports the GTK+ version being used by xzgv, but Imlib is a little more
-tricky --- @code{imlib-config --version} should work if you have a full
-Imlib installation, but failing that, try @code{ls -l
-/usr/lib/libImlib*} or @code{ls -l /usr/X11R6/lib/libImlib*}.
+The versions of GTK+ you are using. @code{xzgv --version-gtk} reports
+the GTK+ version being used by xzgv.
 
 @item
 The bitdepth your X server is running in (common depths are 8-bit (256
@@ -3162,7 +3012,7 @@ depth you're running in, try @code{xdpyi
 @item
 A description of the bug --- what effects it has, the circumstances it
 occurs in, and so on. Does it only happen for certain types of file?
-Only when in 8-bit modes? Only when dithering is enabled in Imlib? Even
+Only when in 8-bit modes? Only when dithering is enabled? Even
 `irrelevant' details can sometimes be useful.
 
 @item
@@ -3173,7 +3023,7 @@ the patch using @code{diff -c} or (prefe
 @end itemize
 
 So, if you think you've found a bug in xzgv, report it by emailing me at
- at email{rus@@svgalib.org}.
+ at email{rrt@@sc3d.org}.
 
 
 @node  Reporting Documentation Bugs,  , Reporting Bugs, Bugs and Restrictions
diff -up xzgv-0.9/src/Makefile.foo xzgv-0.9/src/Makefile
--- xzgv-0.9/src/Makefile.foo	2007-08-14 00:39:16.000000000 +0200
+++ xzgv-0.9/src/Makefile	2009-01-10 15:20:11.000000000 +0100
@@ -39,6 +39,7 @@ clean:
 	$(RM) *~ *.o xzgv
 	$(RM) rcfile_opt.h rcfile_var.h rcfile_short.h
 
+realclean: clean
 
 # dependancies
 backend.o: backend.c backend.h
diff -up xzgv-0.9/src/help.c.foo xzgv-0.9/src/help.c
--- xzgv-0.9/src/help.c.foo	2007-09-09 02:45:46.000000000 +0200
+++ xzgv-0.9/src/help.c	2009-01-10 15:20:11.000000000 +0100
@@ -46,7 +46,8 @@ gtk_window_set_modal(GTK_WINDOW(about_wi
 
 label=gtk_label_new("xzgv " XZGV_VER " - picture viewer for X with file selector\n"
                     "Copyright (C) 1999-2005 Russell Marks\n"
-                    "Homepage - http://rus.members.beeb.net/xzgv.html");
+                    "Copyright (C) 2007 Reuben Thomas\n"
+                    "Homepage - http://sourceforge.net/projects/xzgv");
 gtk_box_pack_start(GTK_BOX(vbox),label,TRUE,TRUE,2);
 gtk_widget_show(label);
 
diff -up xzgv-0.9/src/main.c.foo xzgv-0.9/src/main.c
--- xzgv-0.9/src/main.c.foo	2007-09-09 02:36:21.000000000 +0200
+++ xzgv-0.9/src/main.c	2009-01-10 15:20:36.000000000 +0100
@@ -38,7 +38,8 @@
 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
 #include <gdk/gdkx.h>		/* needed for iconify stuff */
-#include <X11/Xlib.h>		/* ditto */
+#include <gdk/gdkrgb.h>     /* http://bugs.debian.org/457252 */
+#include <X11/Xlib.h>		/* needed for iconify stuff */
 
 #include "backend.h"
 #include "resizepic.h"
@@ -105,7 +106,7 @@ guint tn_id;			/* `thumbnail' id for sta
 
 GtkWidget *mainwin;
 
-gint xvpic_pal[256];		/* palette for thumbnails */
+guint8 xvpic_pal[256][3];		/* palette for thumbnails */
 
 /* image & rendered pixmap for currently-loaded image */
 xzgv_image *theimage=NULL;
@@ -1704,6 +1705,9 @@ void xy_scaling_double(int do_x,int do_y
 static int in_routine=0;
 int xtmp=xscaling,ytmp=yscaling,oldxsc=xscaling,oldysc=yscaling;
 
+/* if there's no image, don't do anything */
+if (!theimage) return;
+
 /* if recursed, don't bother */
 if(in_routine) return;
 in_routine=1;
@@ -1752,6 +1756,9 @@ void xy_scaling_add(int do_x,int do_y)
 static int in_routine=0;
 int xtmp=xscaling,ytmp=yscaling,oldxsc=xscaling,oldysc=yscaling;
 
+/* if there's no image, don't do anything */
+if (!theimage) return;
+
 /* if recursed, don't bother */
 if(in_routine) return;
 in_routine=1;
@@ -1800,6 +1807,9 @@ void xy_scaling_halve(int do_x,int do_y)
 static int in_routine=0;
 int xtmp=xscaling,ytmp=yscaling,oldxsc=xscaling,oldysc=yscaling;
 
+/* if there's no image, don't do anything */
+if (!theimage) return;
+
 /* if recursed, don't bother */
 if(in_routine) return;
 in_routine=1;
@@ -1851,6 +1861,9 @@ void xy_scaling_sub(int do_x,int do_y)
 static int in_routine=0;
 int xtmp=xscaling,ytmp=yscaling,oldxsc=xscaling,oldysc=yscaling;
 
+/* if there's no image, don't do anything */
+if (!theimage) return;
+
 /* if recursed, don't bother */
 if(in_routine) return;
 in_routine=1;
@@ -2101,6 +2114,7 @@ listen_to_toggles=1;
 
 void cb_flip(void)
 {
+if (!theimage) return;
 RECURSE_PROTECT_START;
 backend_flip_vert(theimage);
 orient_current_state=orient_state_flip[orient_current_state];
@@ -2111,6 +2125,7 @@ RECURSE_PROTECT_END;
 
 void cb_mirror(void)
 {
+if (!theimage) return;
 RECURSE_PROTECT_START;
 backend_flip_horiz(theimage);
 orient_current_state=orient_state_mirror[orient_current_state];
@@ -2121,6 +2136,7 @@ RECURSE_PROTECT_END;
 
 void cb_rot_cw(void)
 {
+if (!theimage) return;
 RECURSE_PROTECT_START;
 /* swap x and y scaling, since the effect if we don't do that
  * is of the image mysteriously changing. :-)
@@ -2135,6 +2151,7 @@ RECURSE_PROTECT_END;
 
 void cb_rot_acw(void)
 {
+if (!theimage) return;
 RECURSE_PROTECT_START;
 backend_rotate_acw(theimage);
 orient_current_state=orient_state_rot_acw[orient_current_state];
@@ -2146,6 +2163,7 @@ RECURSE_PROTECT_END;
 
 void cb_normal_orient(void)
 {
+if (!theimage) return;
 RECURSE_PROTECT_START;
 if(orient_current_state!=0)
   {
@@ -2514,113 +2532,93 @@ return(1);
  */
 void find_xvpic_cols(void)
 {
-GdkColor col;
-int r,g,b;
-int n;
-
-for(n=0,r=0;r<8;r++)
-  for(g=0;g<8;g++)	/* colours are 3:3:2 */
-    for(b=0;b<4;b++,n++)
-      {
-      col.red=r*0xffff/7; col.green=g*0xffff/7; col.blue=b*0xffff/3;
-      backend_get_closest_colour(&col);
-      xvpic_pal[n]=col.pixel;
-      }
+    int r,g,b;
+    int n;
+
+    for(n=0,r=0;r<8;r++) {
+        for(g=0;g<8;g++) {/* colours are 3:3:2 */
+            for(b=0;b<4;b++,n++) {
+                xvpic_pal[n][0]=r*0xff/7; 
+                xvpic_pal[n][1]=g*0xff/7;
+                xvpic_pal[n][2]=b*0xff/3;
+            }
+        }
+    }
 }
 
 
 GdkPixmap *xvpic2pixmap(unsigned char *xvpic,int w,int h,GdkPixmap **smallp)
 {
 GdkPixmap *pixmap,*small_pixmap;
-GdkImage *image;
+guint8 *buffer;
 unsigned char *ptr=xvpic;
 int x,y;
 int small_w,small_h;
 
 if(w==0 || h==0) return(NULL);
 
-/* we allocate pixmap and image, draw into image, copy to pixmap,
- * and ditch the image.
- */
-
-if((image=gdk_image_new(GDK_IMAGE_FASTEST,backend_get_visual(),w,h))==NULL)
-  return(NULL);
-
-if((pixmap=gdk_pixmap_new(mainwin->window,w,h,
-                          gdk_visual_get_best_depth()))==NULL)
-  {
-  gdk_image_destroy(image);
-  return(NULL);
-  }
-
-for(y=0;y<h;y++)
-  for(x=0;x<w;x++)
-    gdk_image_put_pixel(image,x,y,xvpic_pal[*ptr++]);
 
-gdk_draw_image(pixmap,clist->style->white_gc,image,0,0,0,0,w,h);
-gdk_flush();
+if (NULL == (pixmap=gdk_pixmap_new(mainwin->window,w,h, -1))) { 
+    return(NULL);
+}
 
-/* reuse image to draw scaled-down version for thin rows */
 small_w=w/ROW_HEIGHT_DIV;
 small_h=h/ROW_HEIGHT_DIV;
 if(small_w==0) small_w=1;
 if(small_h==0) small_h=1;
 
-if((small_pixmap=gdk_pixmap_new(mainwin->window,small_w,small_h,
-                                gdk_visual_get_best_depth()))==NULL)
-  {
-  gdk_pixmap_unref(pixmap);
-  gdk_image_destroy(image);
-  return(NULL);
+if((small_pixmap=gdk_pixmap_new(mainwin->window,small_w,small_h,-1))==NULL)
+{
+    gdk_pixmap_unref(pixmap);
+    return(NULL);
+}
+
+buffer = malloc (w * h * sizeof (guint8) * 3);
+
+if (NULL == buffer) {
+    /* malloc failed */
+    gdk_pixmap_unref(pixmap);
+    gdk_pixmap_unref(small_pixmap);
+    return NULL;
+}
+
+
+for(y=0;y<h;y++) {
+  for(x=0;x<w;x++) {
+      buffer[3*(y*w + x)+0] = xvpic_pal[*ptr][0]; /* red */
+      buffer[3*(y*w + x)+1] = xvpic_pal[*ptr][1]; /* green */
+      buffer[3*(y*w + x)+2] = xvpic_pal[*ptr][2]; /* blue */
+      ptr++;
   }
+}
 
-for(y=0;y<small_h;y++)
-  for(x=0;x<small_w;x++)
-    gdk_image_put_pixel(image,x,y,
-                        xvpic_pal[xvpic[(y*w+x)*ROW_HEIGHT_DIV]]);
+gdk_draw_rgb_image(pixmap,clist->style->white_gc,0,0,w,h,
+        GDK_RGB_DITHER_NORMAL,
+        (guchar*)buffer, w * 3);
+gdk_flush();
 
-gdk_draw_image(small_pixmap,clist->style->white_gc,image,
-               0,0,0,0,small_w,small_h);
+/* reuse image to draw scaled-down version for thin rows */
 
-gdk_image_destroy(image);
 
-*smallp=small_pixmap;
-return(pixmap);
+for(y=0;y<small_h;y++) {
+  for(x=0;x<small_w;x++) {
+      buffer[3*(y*w + x)+0] = xvpic_pal[xvpic[(y*w+x)*ROW_HEIGHT_DIV]][0];
+      buffer[3*(y*w + x)+1] = xvpic_pal[xvpic[(y*w+x)*ROW_HEIGHT_DIV]][1];
+      buffer[3*(y*w + x)+2] = xvpic_pal[xvpic[(y*w+x)*ROW_HEIGHT_DIV]][2];
+  }
 }
 
+gdk_draw_rgb_image(small_pixmap,clist->style->white_gc,0,0,small_w, small_h,
+        GDK_RGB_DITHER_NORMAL,
+        (guchar*)buffer, small_w * 3);
 
-int is_picture(char *filename)
-{
-int l=strlen(filename);
+*smallp=small_pixmap;
 
-if(l<=4) return(0);
+if (NULL != buffer) {
+    free (buffer);
+}
 
-/* at time of writing, imlib1 supports PPM/PGM/TIFF/PNG/XPM/JPEG
- * natively, and uses ImageMagick's `convert' for others.
- * But we have our own GIF/PNG/mrf readers.
- */
-if((!strcasecmp(filename+l-4,".gif")) ||
-   (!strcasecmp(filename+l-4,".jpg")) ||
-   (!strcasecmp(filename+l-5,".jpeg")) ||
-   (!strcasecmp(filename+l-4,".png")) ||
-   (!strcasecmp(filename+l-4,".mrf")) ||
-   (!strcasecmp(filename+l-4,".xbm")) ||
-   (!strcasecmp(filename+l-5,".icon")) ||	/* presumably an XBM */
-   (!strcasecmp(filename+l-4,".xpm")) ||
-   (!strcasecmp(filename+l-4,".pbm")) ||
-   (!strcasecmp(filename+l-4,".pgm")) ||
-   (!strcasecmp(filename+l-4,".ppm")) ||
-   (!strcasecmp(filename+l-4,".bmp")) ||
-   (!strcasecmp(filename+l-4,".tga")) ||
-   (!strcasecmp(filename+l-4,".pcx")) ||
-   (!strcasecmp(filename+l-4,".tif")) ||
-   (!strcasecmp(filename+l-5,".tiff")) ||
-   (!strcasecmp(filename+l-4,".prf")) ||
-   (!strcasecmp(filename+l-4,".tim")) ||
-   (!strcasecmp(filename+l-4,".xwd")))
-  return(1);
-else
-  return(0);
+return(pixmap);
 }
 
 
@@ -2993,9 +2991,6 @@ while((dent=readdir(dirfile))!=NULL)
     }
   isdir=S_ISDIR(sbuf.st_mode);
   
-  if(!isdir && !is_picture(dent->d_name))
-    continue;
-  
   if(clist_add_new_row(dent->d_name,&sbuf))
     numrows++;
   }
@@ -3687,7 +3682,11 @@ static GtkItemFactoryEntry viewer_menu_i
   };
 
 
+gtk_widget_push_visual(gdk_rgb_get_visual());
+gtk_widget_push_colormap(gdk_rgb_get_cmap());
 mainwin=gtk_window_new(GTK_WINDOW_TOPLEVEL);
+gtk_widget_pop_visual();
+gtk_widget_pop_colormap();
 GTK_WIDGET_UNSET_FLAGS(mainwin,GTK_CAN_FOCUS);
 gtk_signal_connect(GTK_OBJECT(mainwin),"destroy",
                    GTK_SIGNAL_FUNC(cb_quit),NULL);

xzgv-0.9-thumbnail-load-gcc4.patch:

--- NEW FILE xzgv-0.9-thumbnail-load-gcc4.patch ---
--- xzgv-0.9/src/main.c	2009-01-06 21:41:26.000000000 +0100
+++ xzgv-0.9.new/src/main.c	2009-01-06 21:43:42.000000000 +0100
@@ -201,7 +201,7 @@
 /* required prototypes */
 void render_pixmap(int reset_pos);
 void cb_nextprev_tagged_image(int next,int view);
-void idle_xvpic_load(int *entryp);
+gboolean idle_xvpic_load(gpointer data);
 gint pic_win_resized(GtkWidget *widget,GdkEventConfigure *event);
 void cb_scaling_double(void);
 void cb_xscaling_double(void);
@@ -2179,8 +2179,7 @@
 idle_xvpic_lastadjval=gtk_clist_get_vadjustment(GTK_CLIST(clist))->value;
 idle_xvpic_jumped=0;
 entry=0;
-tn_idle_tag=gtk_idle_add((GtkFunction)idle_xvpic_load,&entry);
-
+tn_idle_tag=gtk_idle_add(idle_xvpic_load, &entry);
 /* the "" is a crappy way to disable it, but it's hairy otherwise */
 gtk_statusbar_push(GTK_STATUSBAR(statusbar),tn_id,
                    tn_msgs?"Reading thumbnails...":"");
@@ -2605,7 +2604,7 @@
 }
 
 
-void idle_xvpic_load(int *entryp)
+gint idle_xvpic_load(gpointer data)
 {
 static char buf[1024];
 struct clist_data_tag *datptr;
@@ -2616,12 +2615,13 @@
 static unsigned char xvpic_data[80*60];		/* max thumbnail size */
 float adjval;
 static int prev_scanpos=0;	/* if jumped, saved pos in top-to-bot scan */
+int *entryp = data;
 
 idle_xvpic_called=1;
 
 /* don't do it if it would be a bad time */
 if(idle_xvpic_blocked)
-  return;
+  return TRUE;
 
 /* freeze/thaw actually *cause* flickering for this, rather than
  * preventing it (!), so I've not used those here.
@@ -2729,6 +2729,8 @@
     *entryp=-1;
     }
   }
+  
+  return TRUE;
 }
 
 


Index: xzgv.spec
===================================================================
RCS file: /cvs/extras/rpms/xzgv/F-9/xzgv.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- xzgv.spec	9 Feb 2008 16:01:09 -0000	1.7
+++ xzgv.spec	10 Jan 2009 14:49:02 -0000	1.8
@@ -1,12 +1,14 @@
 Summary:   Picture viewer
 Name:      xzgv
 Version:   0.9
-Release:   4%{?dist}
+Release:   5%{?dist}
 License:   GPLv2+
 Group:     Applications/Multimedia
 Source:    http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
-Patch:     xzgv-0.9-svn-r35.patch
+Patch:     xzgv-0.9-svn-r41.patch
 Patch1:    xzgv-0.9-fix-doc-install.patch
+Patch2:    xzgv-0.9-thumbnail-load-gcc4.patch
+Patch3:    xzgv-0.9-fix-thumbnail-generation.patch
 URL:       http://sourceforge.net/projects/xzgv/
 Requires:  xterm gnome-icon-theme
 Requires(post): /sbin/install-info
@@ -23,6 +25,8 @@
 %setup -q
 %patch -p1
 %patch1 -p1
+%patch2 -p1
+%patch3 -p1
 
 %build
 %{__sed} -i 's|^CFLAGS.*|CFLAGS=%{optflags}|' config.mk
@@ -57,7 +61,7 @@
 %post
 /sbin/install-info %{_infodir}/xzgv.info.gz %{_infodir}/dir || :
 
-%postun
+%preun
 if [ "$1" = "0" ]; then
    /sbin/install-info --delete %{_infodir}/xzgv.info.gz %{_infodir}/dir || :
 fi
@@ -74,6 +78,15 @@
 %{_datadir}/applications/fedora-%{name}.desktop
 
 %changelog
+* Sat Jan 10 2009 Hans de Goede <hdegoede at redhat.com> - 0.9-5
+- Update to latest upstream svn (r41) fixing several crashes
+- Add a patch fixing thumbnail loading
+- Add a patch fixing thumbnail generation for pictures where
+  the width is not a multiple of 4
+- Add a patch fixing thumbnail generation for pictures which have an alpha
+  channel
+- Fix scriptlet error on uninstall (make it preun instead of postun)
+
 * Sat Feb  9 2008 Terje Rosten <terjeros at phys.ntnu.no> - 0.9-4
 - rebuild
 


--- xzgv-0.9-svn-r35.patch DELETED ---



From frankb at fedoraproject.org  Sat Jan 10 14:57:20 2009
From: frankb at fedoraproject.org (=?utf-8?q?Frank_B=C3=BCttner?=)
Date: Sat, 10 Jan 2009 14:57:20 +0000 (UTC)
Subject: rpms/qtiplot/devel qtiplot-path.patch, 1.2, 1.3 qtiplot.spec, 1.9,
	1.10
Message-ID: <20090110145720.4F3077012C@cvs1.fedora.phx.redhat.com>

Author: frankb

Update of /cvs/pkgs/rpms/qtiplot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2473

Modified Files:
	qtiplot-path.patch qtiplot.spec 
Log Message:
fix dos2unix


qtiplot-path.patch:

Index: qtiplot-path.patch
===================================================================
RCS file: /cvs/pkgs/rpms/qtiplot/devel/qtiplot-path.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- qtiplot-path.patch	10 Jan 2009 14:29:50 -0000	1.2
+++ qtiplot-path.patch	10 Jan 2009 14:56:49 -0000	1.3
@@ -1,3 +1,49 @@
+diff -Naur qtiplot-0.9.7.4.org/fitPlugins/explin/explin.pro qtiplot-0.9.7.4/fitPlugins/explin/explin.pro
+--- qtiplot-0.9.7.4.org/fitPlugins/explin/explin.pro	2009-01-10 15:14:17.000000000 +0100
++++ qtiplot-0.9.7.4/fitPlugins/explin/explin.pro	2009-01-10 15:49:32.000000000 +0100
+@@ -12,14 +12,14 @@
+ DESTDIR           = ../
+  
+ # statically link against GSL in 3rdparty
+-INCLUDEPATH += ../../3rdparty/gsl/include/
+-LIBS        += ../../3rdparty/gsl/lib/libgsl.a
+-LIBS        += ../../3rdparty/gsl/lib/libgslcblas.a
++#INCLUDEPATH += ../../3rdparty/gsl/include/
++#LIBS        += ../../3rdparty/gsl/lib/libgsl.a
++#LIBS        += ../../3rdparty/gsl/lib/libgslcblas.a
+ 
+ #dynamically link against GSL installed system-wide
+-#unix:LIBS += -L /usr/lib$${libsuff} -lgsl -lgslcblas
++unix:LIBS += -lgsl -lgslcblas
+ 
+-target.path=/usr/lib$${libsuff}/qtiplot/plugins
++target.path=TARGETPATH
+ INSTALLS += target
+ 
+ SOURCES += explin.c
+diff -Naur qtiplot-0.9.7.4.org/fitPlugins/exp_saturation/exp_saturation.pro qtiplot-0.9.7.4/fitPlugins/exp_saturation/exp_saturation.pro
+--- qtiplot-0.9.7.4.org/fitPlugins/exp_saturation/exp_saturation.pro	2009-01-10 15:14:17.000000000 +0100
++++ qtiplot-0.9.7.4/fitPlugins/exp_saturation/exp_saturation.pro	2009-01-10 15:49:44.000000000 +0100
+@@ -12,14 +12,14 @@
+ DESTDIR           = ../
+  
+ # statically link against GSL in 3rdparty
+-INCLUDEPATH += ../../3rdparty/gsl/include/
+-LIBS        += ../../3rdparty/gsl/lib/libgsl.a
+-LIBS        += ../../3rdparty/gsl/lib/libgslcblas.a
++#INCLUDEPATH += ../../3rdparty/gsl/include/
++#LIBS        += ../../3rdparty/gsl/lib/libgsl.a
++#LIBS        += ../../3rdparty/gsl/lib/libgslcblas.a
+ 
+ #dynamically link against GSL installed system-wide
+-#unix:LIBS += -L /usr/lib$${libsuff} -lgsl -lgslcblas
++unix:LIBS += -lgsl -lgslcblas
+ 
+-target.path=/usr/lib$${libsuff}/qtiplot/plugins
++target.path=TARGETPATH
+ INSTALLS += target
+ 
+ SOURCES += exp_saturation.c
 diff -Naur qtiplot-0.9.7.4.org/fitPlugins/fitRational0/fitRational0.pro qtiplot-0.9.7.4/fitPlugins/fitRational0/fitRational0.pro
 --- qtiplot-0.9.7.4.org/fitPlugins/fitRational0/fitRational0.pro	2009-01-10 15:14:17.000000000 +0100
 +++ qtiplot-0.9.7.4/fitPlugins/fitRational0/fitRational0.pro	2009-01-10 15:16:51.000000000 +0100


Index: qtiplot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qtiplot/devel/qtiplot.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- qtiplot.spec	10 Jan 2009 14:38:22 -0000	1.9
+++ qtiplot.spec	10 Jan 2009 14:56:49 -0000	1.10
@@ -1,7 +1,7 @@
 Name:		qtiplot
 Summary:	Data Analysis and Scientific Plotting
 Version:	0.9.7.4
-Release:	4%{?dist}
+Release:	5%{?dist}
 #>4.2 is needed for qtiplot
 BuildRequires:	qt4-devel >= 4.2 
 BuildRequires:	qwt-devel
@@ -66,9 +66,20 @@
 #fix default path for the Plug-Ins
 sed -i "s\/usr/lib/qtiplot/plugins\%{_libdir}/%{name}\g" qtiplot/src/core/ApplicationWindow.cpp
 #fix source files for debug package
-dos2unix qtiplot/src/*
+dos2unix qtiplot/src/analysis/*.h
+dos2unix qtiplot/src/analysis/dialogs/*.h
+dos2unix qtiplot/src/core/*
+dos2unix qtiplot/src/matrix/*
+dos2unix qtiplot/src/orin/*
+dos2unix qtiplot/src/plot2D/*.h
+dos2unix qtiplot/src/plot2D/dialogs/*.h
+dos2unix qtiplot/src/plot3D/*
+dos2unix qtiplot/src/scripting/*
+dos2unix qtiplot/src/table/*
 dos2unix fitPlugins/fitRational0/*
 dos2unix fitPlugins/fitRational1/*
+dos2unix fitPlugins/explin/*
+dos2unix fitPlugins/exp_saturation/*
 dos2unix 3rdparty/zlib123/*.c
 dos2unix 3rdparty/zlib123/include/*
 dos2unix 3rdparty/liborigin/*
@@ -133,6 +144,9 @@
 
 
 %changelog
+* Sat Jan 10 2009 Frank B??ttner <frank-buettner at gmx.net> - 0.9.7.4-5
+ - fix dos2unix
+
 * Sat Jan 10 2009 Frank B??ttner <frank-buettner at gmx.net> - 0.9.7.4-4
  - fix sed
 



From thm at fedoraproject.org  Sat Jan 10 15:01:21 2009
From: thm at fedoraproject.org (Thomas Moschny)
Date: Sat, 10 Jan 2009 15:01:21 +0000 (UTC)
Subject: rpms/ikiwiki/devel .cvsignore, 1.13, 1.14 ikiwiki.spec, 1.14,
	1.15 import.log, 1.13, 1.14 sources, 1.13, 1.14
Message-ID: <20090110150121.6C2587012C@cvs1.fedora.phx.redhat.com>

Author: thm

Update of /cvs/pkgs/rpms/ikiwiki/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3576/devel

Modified Files:
	.cvsignore ikiwiki.spec import.log sources 
Log Message:
Updated for 3.01.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ikiwiki/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	3 Jan 2009 12:08:30 -0000	1.13
+++ .cvsignore	10 Jan 2009 15:00:50 -0000	1.14
@@ -1 +1 @@
-ikiwiki_3.00.tar.gz
+ikiwiki_3.01.tar.gz


Index: ikiwiki.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ikiwiki/devel/ikiwiki.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- ikiwiki.spec	3 Jan 2009 12:08:30 -0000	1.14
+++ ikiwiki.spec	10 Jan 2009 15:00:50 -0000	1.15
@@ -1,5 +1,5 @@
 Name:           ikiwiki
-Version:        3.00
+Version:        3.01
 Release:        1%{?dist}
 Summary:        A wiki compiler
 
@@ -143,6 +143,9 @@
 
 
 %changelog
+* Sat Jan 10 2009 Thomas Moschny <thomas.moschny at gmx.de> - 3.01-1
+- Update to 3.01.
+
 * Fri Jan  2 2009 Thomas Moschny <thomas.moschny at gmx.de> - 3.00-1
 - Update to 3.00.
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/ikiwiki/devel/import.log,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- import.log	3 Jan 2009 12:08:30 -0000	1.13
+++ import.log	10 Jan 2009 15:00:51 -0000	1.14
@@ -11,3 +11,4 @@
 ikiwiki-2_70-3_fc10:HEAD:ikiwiki-2.70-3.fc10.src.rpm:1229701030
 ikiwiki-2_72-1_fc10:HEAD:ikiwiki-2.72-1.fc10.src.rpm:1230895370
 ikiwiki-3_00-1_fc10:HEAD:ikiwiki-3.00-1.fc10.src.rpm:1230984471
+ikiwiki-3_01-1_fc10:HEAD:ikiwiki-3.01-1.fc10.src.rpm:1231599610


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ikiwiki/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	3 Jan 2009 12:08:30 -0000	1.13
+++ sources	10 Jan 2009 15:00:51 -0000	1.14
@@ -1 +1 @@
-f0a0a3e1ff820a12721b9b9864c8ea39  ikiwiki_3.00.tar.gz
+c05ab03698378630436a28b8332093e8  ikiwiki_3.01.tar.gz



From pkgdb at fedoraproject.org  Sat Jan 10 15:03:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 10 Jan 2009 15:03:53 +0000
Subject: [pkgdb] btrfs-progs had acl change status
Message-ID: <20090110150353.BC9B8208456@bastion.fedora.phx.redhat.com>

josef has set the watchbugzilla acl on btrfs-progs (Fedora devel) to Approved for mmahut

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/btrfs-progs



From pkgdb at fedoraproject.org  Sat Jan 10 15:03:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 10 Jan 2009 15:03:56 +0000
Subject: [pkgdb] btrfs-progs had acl change status
Message-ID: <20090110150356.C9AC3208458@bastion.fedora.phx.redhat.com>

josef has set the watchcommits acl on btrfs-progs (Fedora devel) to Approved for mmahut

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/btrfs-progs



From pkgdb at fedoraproject.org  Sat Jan 10 15:04:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 10 Jan 2009 15:04:00 +0000
Subject: [pkgdb] btrfs-progs had acl change status
Message-ID: <20090110150400.B17D8208467@bastion.fedora.phx.redhat.com>

josef has set the commit acl on btrfs-progs (Fedora devel) to Approved for mmahut

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/btrfs-progs



From pkgdb at fedoraproject.org  Sat Jan 10 15:04:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 10 Jan 2009 15:04:03 +0000
Subject: [pkgdb] btrfs-progs had acl change status
Message-ID: <20090110150406.9326B20831D@bastion.fedora.phx.redhat.com>

josef has set the approveacls acl on btrfs-progs (Fedora devel) to Approved for mmahut

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/btrfs-progs



From pkgdb at fedoraproject.org  Sat Jan 10 15:04:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 10 Jan 2009 15:04:15 +0000
Subject: [pkgdb] btrfs-progs had acl change status
Message-ID: <20090110150415.9DED5208458@bastion.fedora.phx.redhat.com>

josef has set the watchbugzilla acl on btrfs-progs (Fedora 10) to Approved for mmahut

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/btrfs-progs



From pkgdb at fedoraproject.org  Sat Jan 10 15:04:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 10 Jan 2009 15:04:16 +0000
Subject: [pkgdb] btrfs-progs had acl change status
Message-ID: <20090110150416.68E7120846B@bastion.fedora.phx.redhat.com>

josef has set the watchcommits acl on btrfs-progs (Fedora 10) to Approved for mmahut

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/btrfs-progs



From pkgdb at fedoraproject.org  Sat Jan 10 15:04:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 10 Jan 2009 15:04:19 +0000
Subject: [pkgdb] btrfs-progs had acl change status
Message-ID: <20090110150419.E75BC208466@bastion.fedora.phx.redhat.com>

josef has set the commit acl on btrfs-progs (Fedora 10) to Approved for mmahut

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/btrfs-progs



From pkgdb at fedoraproject.org  Sat Jan 10 15:04:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 10 Jan 2009 15:04:21 +0000
Subject: [pkgdb] btrfs-progs had acl change status
Message-ID: <20090110150421.6FF6820846D@bastion.fedora.phx.redhat.com>

josef has set the approveacls acl on btrfs-progs (Fedora 10) to Approved for mmahut

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/btrfs-progs



From frankb at fedoraproject.org  Sat Jan 10 15:06:42 2009
From: frankb at fedoraproject.org (=?utf-8?q?Frank_B=C3=BCttner?=)
Date: Sat, 10 Jan 2009 15:06:42 +0000 (UTC)
Subject: rpms/qtiplot/devel qtiplot.spec,1.10,1.11
Message-ID: <20090110150642.7798E7012C@cvs1.fedora.phx.redhat.com>

Author: frankb

Update of /cvs/pkgs/rpms/qtiplot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4047

Modified Files:
	qtiplot.spec 
Log Message:



Index: qtiplot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qtiplot/devel/qtiplot.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- qtiplot.spec	10 Jan 2009 14:56:49 -0000	1.10
+++ qtiplot.spec	10 Jan 2009 15:06:12 -0000	1.11
@@ -1,7 +1,7 @@
 Name:		qtiplot
 Summary:	Data Analysis and Scientific Plotting
 Version:	0.9.7.4
-Release:	5%{?dist}
+Release:	6%{?dist}
 #>4.2 is needed for qtiplot
 BuildRequires:	qt4-devel >= 4.2 
 BuildRequires:	qwt-devel
@@ -68,21 +68,21 @@
 #fix source files for debug package
 dos2unix qtiplot/src/analysis/*.h
 dos2unix qtiplot/src/analysis/dialogs/*.h
-dos2unix qtiplot/src/core/*
+dos2unix qtiplot/src/core/*.h
 dos2unix qtiplot/src/matrix/*
-dos2unix qtiplot/src/orin/*
+dos2unix qtiplot/src/origin/*.h
 dos2unix qtiplot/src/plot2D/*.h
 dos2unix qtiplot/src/plot2D/dialogs/*.h
-dos2unix qtiplot/src/plot3D/*
-dos2unix qtiplot/src/scripting/*
-dos2unix qtiplot/src/table/*
-dos2unix fitPlugins/fitRational0/*
-dos2unix fitPlugins/fitRational1/*
-dos2unix fitPlugins/explin/*
-dos2unix fitPlugins/exp_saturation/*
-dos2unix 3rdparty/zlib123/*.c
-dos2unix 3rdparty/zlib123/include/*
-dos2unix 3rdparty/liborigin/*
+dos2unix qtiplot/src/plot3D/*.h
+dos2unix qtiplot/src/scripting/*.h
+dos2unix qtiplot/src/table/*.h
+dos2unix fitPlugins/fitRational0/*.h
+dos2unix fitPlugins/fitRational1/*.h
+dos2unix fitPlugins/explin/*.h
+dos2unix fitPlugins/exp_saturation/*.h
+dos2unix 3rdparty/zlib123/*.h
+dos2unix 3rdparty/zlib123/include/*.h
+dos2unix 3rdparty/liborigin/*.h
 chmod 0644 qtiplot/src/*
 chmod 0644 fitPlugins/fitRational0/*
 chmod 0644 fitPlugins/fitRational1/*
@@ -144,6 +144,9 @@
 
 
 %changelog
+* Sat Jan 10 2009 Frank B??ttner <frank-buettner at gmx.net> - 0.9.7.4-6
+ - fix dos2unix
+
 * Sat Jan 10 2009 Frank B??ttner <frank-buettner at gmx.net> - 0.9.7.4-5
  - fix dos2unix
 



From frankb at fedoraproject.org  Sat Jan 10 15:19:47 2009
From: frankb at fedoraproject.org (=?utf-8?q?Frank_B=C3=BCttner?=)
Date: Sat, 10 Jan 2009 15:19:47 +0000 (UTC)
Subject: rpms/qtiplot/devel qtiplot.spec,1.11,1.12
Message-ID: <20090110151947.C82027012C@cvs1.fedora.phx.redhat.com>

Author: frankb

Update of /cvs/pkgs/rpms/qtiplot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5155

Modified Files:
	qtiplot.spec 
Log Message:
next dos2unix try



Index: qtiplot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qtiplot/devel/qtiplot.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- qtiplot.spec	10 Jan 2009 15:06:12 -0000	1.11
+++ qtiplot.spec	10 Jan 2009 15:19:17 -0000	1.12
@@ -1,7 +1,7 @@
 Name:		qtiplot
 Summary:	Data Analysis and Scientific Plotting
 Version:	0.9.7.4
-Release:	6%{?dist}
+Release:	7%{?dist}
 #>4.2 is needed for qtiplot
 BuildRequires:	qt4-devel >= 4.2 
 BuildRequires:	qwt-devel
@@ -76,10 +76,6 @@
 dos2unix qtiplot/src/plot3D/*.h
 dos2unix qtiplot/src/scripting/*.h
 dos2unix qtiplot/src/table/*.h
-dos2unix fitPlugins/fitRational0/*.h
-dos2unix fitPlugins/fitRational1/*.h
-dos2unix fitPlugins/explin/*.h
-dos2unix fitPlugins/exp_saturation/*.h
 dos2unix 3rdparty/zlib123/*.h
 dos2unix 3rdparty/zlib123/include/*.h
 dos2unix 3rdparty/liborigin/*.h
@@ -144,6 +140,9 @@
 
 
 %changelog
+* Sat Jan 10 2009 Frank B??ttner <frank-buettner at gmx.net> - 0.9.7.4-7
+ - fix dos2unix
+
 * Sat Jan 10 2009 Frank B??ttner <frank-buettner at gmx.net> - 0.9.7.4-6
  - fix dos2unix
 



From jjames at fedoraproject.org  Sat Jan 10 15:24:24 2009
From: jjames at fedoraproject.org (Jerry James)
Date: Sat, 10 Jan 2009 15:24:24 +0000 (UTC)
Subject: rpms/gcl/devel gcl.spec,1.30,1.31
Message-ID: <20090110152424.8A0477012C@cvs1.fedora.phx.redhat.com>

Author: jjames

Update of /cvs/pkgs/rpms/gcl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5629

Modified Files:
	gcl.spec 
Log Message:
I thought I got rid of the need for QA_SKIP_BUILD_ROOT=1.  I was wrong.



Index: gcl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gcl/devel/gcl.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- gcl.spec	10 Jan 2009 06:07:44 -0000	1.30
+++ gcl.spec	10 Jan 2009 15:23:53 -0000	1.31
@@ -142,7 +142,8 @@
 %package xemacs
 Group:          Development/Languages
 Summary:        XEmacs mode for interacting with GCL
-Requires:       %{name} = %{version}-%{release}, xemacs(bin) >= %{xemacs_version}
+Requires:       %{name} = %{version}-%{release}
+Requires:       xemacs(bin) >= %{xemacs_version}, xemacs-packages-extra
 
 %description xemacs
 XEmacs mode for interacting with GCL
@@ -250,6 +251,9 @@
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/selinux/packages/gcl
 cp -p selinux/gcl.pp $RPM_BUILD_ROOT%{_datadir}/selinux/packages/gcl
 
+# The image has garbage strings containing RPM_BUILD_ROOT
+export QA_SKIP_BUILD_ROOT=1
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT



From frankb at fedoraproject.org  Sat Jan 10 15:26:55 2009
From: frankb at fedoraproject.org (=?utf-8?q?Frank_B=C3=BCttner?=)
Date: Sat, 10 Jan 2009 15:26:55 +0000 (UTC)
Subject: rpms/qtiplot/devel qtiplot.spec,1.12,1.13
Message-ID: <20090110152655.34DF87012C@cvs1.fedora.phx.redhat.com>

Author: frankb

Update of /cvs/pkgs/rpms/qtiplot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5973

Modified Files:
	qtiplot.spec 
Log Message:



Index: qtiplot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qtiplot/devel/qtiplot.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- qtiplot.spec	10 Jan 2009 15:19:17 -0000	1.12
+++ qtiplot.spec	10 Jan 2009 15:26:24 -0000	1.13
@@ -1,7 +1,7 @@
 Name:		qtiplot
 Summary:	Data Analysis and Scientific Plotting
 Version:	0.9.7.4
-Release:	7%{?dist}
+Release:	8%{?dist}
 #>4.2 is needed for qtiplot
 BuildRequires:	qt4-devel >= 4.2 
 BuildRequires:	qwt-devel
@@ -76,9 +76,6 @@
 dos2unix qtiplot/src/plot3D/*.h
 dos2unix qtiplot/src/scripting/*.h
 dos2unix qtiplot/src/table/*.h
-dos2unix 3rdparty/zlib123/*.h
-dos2unix 3rdparty/zlib123/include/*.h
-dos2unix 3rdparty/liborigin/*.h
 chmod 0644 qtiplot/src/*
 chmod 0644 fitPlugins/fitRational0/*
 chmod 0644 fitPlugins/fitRational1/*
@@ -140,6 +137,9 @@
 
 
 %changelog
+* Sat Jan 10 2009 Frank B??ttner <frank-buettner at gmx.net> - 0.9.7.4-8
+ - fix dos2unix
+
 * Sat Jan 10 2009 Frank B??ttner <frank-buettner at gmx.net> - 0.9.7.4-7
  - fix dos2unix
 



From thm at fedoraproject.org  Sat Jan 10 15:27:38 2009
From: thm at fedoraproject.org (Thomas Moschny)
Date: Sat, 10 Jan 2009 15:27:38 +0000 (UTC)
Subject: rpms/python-jinja2/devel .cvsignore, 1.3, 1.4 import.log, 1.2,
	1.3 python-jinja2.spec, 1.3, 1.4 sources, 1.3, 1.4
Message-ID: <20090110152738.2C55C7013F@cvs1.fedora.phx.redhat.com>

Author: thm

Update of /cvs/pkgs/rpms/python-jinja2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6134/devel

Modified Files:
	.cvsignore import.log python-jinja2.spec sources 
Log Message:
Update to 2.1.1.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-jinja2/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	18 Dec 2008 14:34:13 -0000	1.3
+++ .cvsignore	10 Jan 2009 15:27:07 -0000	1.4
@@ -1 +1 @@
-Jinja2-2.1.tar.gz
+Jinja2-2.1.1.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/python-jinja2/devel/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	18 Dec 2008 14:34:13 -0000	1.2
+++ import.log	10 Jan 2009 15:27:07 -0000	1.3
@@ -1,2 +1,3 @@
 python-jinja2-2_0-2_fc9:HEAD:python-jinja2-2.0-2.fc9.src.rpm:1216886150
 python-jinja2-2_1-1_fc10:HEAD:python-jinja2-2.1-1.fc10.src.rpm:1229610786
+python-jinja2-2_1_1-1_fc10:HEAD:python-jinja2-2.1.1-1.fc10.src.rpm:1231601194


Index: python-jinja2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-jinja2/devel/python-jinja2.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- python-jinja2.spec	18 Dec 2008 14:34:13 -0000	1.3
+++ python-jinja2.spec	10 Jan 2009 15:27:07 -0000	1.4
@@ -1,7 +1,7 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:		python-jinja2
-Version:	2.1
+Version:	2.1.1
 Release:	1%{?dist}
 Summary:	General purpose template engine
 
@@ -64,6 +64,9 @@
 
 
 %changelog
+* Sat Jan 10 2009 Thomas Moschny <thomas.moschny at gmx.de> - 2.1.1-1
+- Update to 2.1.1 (bugfix release).
+
 * Thu Dec 18 2008 Thomas Moschny <thomas.moschny at gmx.de> - 2.1-1
 - Update to 2.1, which fixes a number of bugs.
   See http://jinja.pocoo.org/2/documentation/changelog#version-2-1.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-jinja2/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	18 Dec 2008 14:34:13 -0000	1.3
+++ sources	10 Jan 2009 15:27:07 -0000	1.4
@@ -1 +1 @@
-c7a31931c95a7ae5e1baf21074fdd576  Jinja2-2.1.tar.gz
+b37fc262e4f613eec57c3defe6aea97c  Jinja2-2.1.1.tar.gz



From thm at fedoraproject.org  Sat Jan 10 15:35:12 2009
From: thm at fedoraproject.org (Thomas Moschny)
Date: Sat, 10 Jan 2009 15:35:12 +0000 (UTC)
Subject: rpms/python-jinja2/F-10 .cvsignore, 1.3, 1.4 import.log, 1.2,
	1.3 python-jinja2.spec, 1.2, 1.3 sources, 1.3, 1.4
Message-ID: <20090110153512.9E2427012C@cvs1.fedora.phx.redhat.com>

Author: thm

Update of /cvs/pkgs/rpms/python-jinja2/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7778/F-10

Modified Files:
	.cvsignore import.log python-jinja2.spec sources 
Log Message:
Update to 2.1.1.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-jinja2/F-10/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	18 Dec 2008 19:40:46 -0000	1.3
+++ .cvsignore	10 Jan 2009 15:34:42 -0000	1.4
@@ -1 +1 @@
-Jinja2-2.1.tar.gz
+Jinja2-2.1.1.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/python-jinja2/F-10/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	18 Dec 2008 19:40:46 -0000	1.2
+++ import.log	10 Jan 2009 15:34:42 -0000	1.3
@@ -1,2 +1,3 @@
 python-jinja2-2_0-2_fc9:HEAD:python-jinja2-2.0-2.fc9.src.rpm:1216886150
 python-jinja2-2_1-1_fc11:F-10:python-jinja2-2.1-1.fc11.src.rpm:1229629185
+python-jinja2-2_1_1-1_fc10:F-10:python-jinja2-2.1.1-1.fc10.src.rpm:1231601647


Index: python-jinja2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-jinja2/F-10/python-jinja2.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- python-jinja2.spec	18 Dec 2008 19:40:46 -0000	1.2
+++ python-jinja2.spec	10 Jan 2009 15:34:42 -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)")}
 
 Name:		python-jinja2
-Version:	2.1
+Version:	2.1.1
 Release:	1%{?dist}
 Summary:	General purpose template engine
 
@@ -64,6 +64,9 @@
 
 
 %changelog
+* Sat Jan 10 2009 Thomas Moschny <thomas.moschny at gmx.de> - 2.1.1-1
+- Update to 2.1.1 (bugfix release).
+
 * Thu Dec 18 2008 Thomas Moschny <thomas.moschny at gmx.de> - 2.1-1
 - Update to 2.1, which fixes a number of bugs.
   See http://jinja.pocoo.org/2/documentation/changelog#version-2-1.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-jinja2/F-10/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	18 Dec 2008 19:40:46 -0000	1.3
+++ sources	10 Jan 2009 15:34:42 -0000	1.4
@@ -1 +1 @@
-c7a31931c95a7ae5e1baf21074fdd576  Jinja2-2.1.tar.gz
+b37fc262e4f613eec57c3defe6aea97c  Jinja2-2.1.1.tar.gz



From ausil at fedoraproject.org  Sat Jan 10 15:43:27 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Sat, 10 Jan 2009 15:43:27 +0000 (UTC)
Subject: rpms/ice/devel ice.spec,1.22,1.23
Message-ID: <20090110154327.C93C47012C@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/ice/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9151

Modified Files:
	ice.spec 
Log Message:
ExcludeArch sparc64  no mono



Index: ice.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ice/devel/ice.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- ice.spec	4 Dec 2008 17:12:55 -0000	1.22
+++ ice.spec	10 Jan 2009 15:42:57 -0000	1.23
@@ -4,7 +4,7 @@
 
 Name: ice
 Version: 3.3.0
-Release: 9%{?dist}
+Release: 10%{?dist}
 Summary: The Ice base runtime and services
 
 Group: System Environment/Libraries
@@ -46,7 +46,8 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # Ice doesn't officially support this architecture at all
-ExcludeArch:    ppc64
+# sparc64 doesnt have mono
+ExcludeArch:    ppc64 sparc64
 
 # Some file suffixes we need to grab the right stuff for the file lists
 %define soversion 33
@@ -554,6 +555,9 @@
 %config(noreplace) %{_sysconfdir}/php.d/ice.ini
 
 %changelog
+* Sat Jan 10 2009 Dennis Gilmore <dennis at ausil.us> - 3.3.0-10
+- ExcludeArch sparc64 no mono there
+
 * Thu Dec  4 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 3.3.0-9
 - Rebuild for Python 2.6
 



From thm at fedoraproject.org  Sat Jan 10 15:44:33 2009
From: thm at fedoraproject.org (Thomas Moschny)
Date: Sat, 10 Jan 2009 15:44:33 +0000 (UTC)
Subject: rpms/python-jinja2/F-9 .cvsignore, 1.3, 1.4 import.log, 1.2,
	1.3 python-jinja2.spec, 1.2, 1.3 sources, 1.3, 1.4
Message-ID: <20090110154433.740477012C@cvs1.fedora.phx.redhat.com>

Author: thm

Update of /cvs/pkgs/rpms/python-jinja2/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9657/F-9

Modified Files:
	.cvsignore import.log python-jinja2.spec sources 
Log Message:
Update to 2.1.1.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-jinja2/F-9/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	18 Dec 2008 19:58:56 -0000	1.3
+++ .cvsignore	10 Jan 2009 15:44:03 -0000	1.4
@@ -1 +1 @@
-Jinja2-2.1.tar.gz
+Jinja2-2.1.1.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/python-jinja2/F-9/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	18 Dec 2008 19:58:56 -0000	1.2
+++ import.log	10 Jan 2009 15:44:03 -0000	1.3
@@ -1,2 +1,3 @@
 python-jinja2-2_0-2_fc10:F-9:python-jinja2-2.0-2.fc10.src.rpm:1216886790
 python-jinja2-2_1-1_fc11:F-9:python-jinja2-2.1-1.fc11.src.rpm:1229630281
+python-jinja2-2_1_1-1_fc10:F-9:python-jinja2-2.1.1-1.fc10.src.rpm:1231602208


Index: python-jinja2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-jinja2/F-9/python-jinja2.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- python-jinja2.spec	18 Dec 2008 19:58:56 -0000	1.2
+++ python-jinja2.spec	10 Jan 2009 15:44:03 -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)")}
 
 Name:		python-jinja2
-Version:	2.1
+Version:	2.1.1
 Release:	1%{?dist}
 Summary:	General purpose template engine
 
@@ -64,6 +64,9 @@
 
 
 %changelog
+* Sat Jan 10 2009 Thomas Moschny <thomas.moschny at gmx.de> - 2.1.1-1
+- Update to 2.1.1 (bugfix release).
+
 * Thu Dec 18 2008 Thomas Moschny <thomas.moschny at gmx.de> - 2.1-1
 - Update to 2.1, which fixes a number of bugs.
   See http://jinja.pocoo.org/2/documentation/changelog#version-2-1.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-jinja2/F-9/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	18 Dec 2008 19:58:56 -0000	1.3
+++ sources	10 Jan 2009 15:44:03 -0000	1.4
@@ -1 +1 @@
-c7a31931c95a7ae5e1baf21074fdd576  Jinja2-2.1.tar.gz
+b37fc262e4f613eec57c3defe6aea97c  Jinja2-2.1.1.tar.gz



From ausil at fedoraproject.org  Sat Jan 10 15:51:10 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Sat, 10 Jan 2009 15:51:10 +0000 (UTC)
Subject: rpms/ice/F-10 ice.spec,1.19,1.20
Message-ID: <20090110155110.B19587012C@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/ice/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11098

Modified Files:
	ice.spec 
Log Message:
ExcludeArch sparc64 
no mono



Index: ice.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ice/F-10/ice.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- ice.spec	4 Dec 2008 10:21:03 -0000	1.19
+++ ice.spec	10 Jan 2009 15:50:40 -0000	1.20
@@ -4,7 +4,7 @@
 
 Name: ice
 Version: 3.3.0
-Release: 8%{?dist}
+Release: 9%{?dist}
 Summary: The Ice base runtime and services
 
 Group: System Environment/Libraries
@@ -46,7 +46,8 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # Ice doesn't officially support this architecture at all
-ExcludeArch:    ppc64
+# no mono on sparc64
+ExcludeArch:    ppc64 sparc64
 
 # Some file suffixes we need to grab the right stuff for the file lists
 %define soversion 33
@@ -554,6 +555,9 @@
 %config(noreplace) %{_sysconfdir}/php.d/ice.ini
 
 %changelog
+* Sat Jan 10 2009 Dennis Gilmore <dennis at ausil.us> - 3.3.0-9
+- ExcludeArch sparc64 no mono there
+
 * Thu Dec  4 2008 <mefoster at gmail.com> - 3.3.0-8
 - Add all accumulated upstream patches
 



From ausil at fedoraproject.org  Sat Jan 10 15:53:36 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Sat, 10 Jan 2009 15:53:36 +0000 (UTC)
Subject: rpms/ice/F-9 ice.spec,1.19,1.20
Message-ID: <20090110155336.DE5BD7012C@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/ice/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11639

Modified Files:
	ice.spec 
Log Message:
ExlcudeArch sparc64 no mono



Index: ice.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ice/F-9/ice.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- ice.spec	4 Dec 2008 10:22:02 -0000	1.19
+++ ice.spec	10 Jan 2009 15:53:06 -0000	1.20
@@ -4,7 +4,7 @@
 
 Name: ice
 Version: 3.3.0
-Release: 8%{?dist}
+Release: 9%{?dist}
 Summary: The Ice base runtime and services
 
 Group: System Environment/Libraries
@@ -46,7 +46,8 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # Ice doesn't officially support this architecture at all
-ExcludeArch:    ppc64
+# no mono on sparc64
+ExcludeArch:    ppc64 sparc64
 
 # Some file suffixes we need to grab the right stuff for the file lists
 %define soversion 33
@@ -554,6 +555,9 @@
 %config(noreplace) %{_sysconfdir}/php.d/ice.ini
 
 %changelog
+* Sat Jan 10 2009 Dennis Gilmore <dennis at ausil.us> - 3.3.0-9
+- ExcludeArch sparc64 no mono there
+
 * Thu Dec  4 2008 <mefoster at gmail.com> - 3.3.0-8
 - Add all accumulated upstream patches
 



From dcantrel at fedoraproject.org  Sat Jan 10 16:39:06 2009
From: dcantrel at fedoraproject.org (David Cantrell)
Date: Sat, 10 Jan 2009 16:39:06 +0000 (UTC)
Subject: rpms/dhcp/devel dhcp.spec,1.233,1.234
Message-ID: <20090110163906.B88367012C@cvs1.fedora.phx.redhat.com>

Author: dcantrel

Update of /cvs/pkgs/rpms/dhcp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17279

Modified Files:
	dhcp.spec 
Log Message:
* Sat Jan 10 2009 David Cantrell <dcantrell at redhat.com> - 12:4.1.0-2
- Make sure all /etc/dhcp config files are marked in the manifest
- Include new config file directies in the dhcp and dhclient packages
- Do not overwrite new config files if they already exist



Index: dhcp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dhcp/devel/dhcp.spec,v
retrieving revision 1.233
retrieving revision 1.234
diff -u -r1.233 -r1.234
--- dhcp.spec	6 Jan 2009 23:46:51 -0000	1.233
+++ dhcp.spec	10 Jan 2009 16:38:36 -0000	1.234
@@ -12,7 +12,7 @@
 Summary:  Dynamic host configuration protocol software
 Name:     dhcp
 Version:  4.1.0
-Release:  1%{?dist}
+Release:  2%{?dist}
 # NEVER CHANGE THE EPOCH on this package.  The previous maintainer (prior to
 # dcantrell maintaining the package) made incorrect use of the epoch and
 # that's why it is at 12 now.  It should have never been used, but it was.
@@ -132,6 +132,7 @@
 %patch5 -p1
 
 # Support unicast BOOTP for IBM pSeries systems (and maybe others)
+# (Submitted to dhcp-bugs at isc.org - [ISC-Bugs #19146])
 %patch6 -p1
 
 # Use the following IANA-registered failover ports:
@@ -163,19 +164,22 @@
 %patch13 -p1
 
 # Make sure all open file descriptors are closed-on-exec for SELinux (#446632)
+# (Submitted to dhcp-bugs at isc.org - [ISC-Bugs #19148])
 %patch14 -p1
 
 # If we have an active lease, do not down the interface (#453982)
 %patch15 -p1
 
-# Fix 'garbage in format string' error (#450052)
+# Fix 'garbage in format string' error (#450042)
 %patch16 -p1
 
 # Validate port numbers specified for dhclient, dhcpd, and dhcrelay
 # to make sure they are within 1-65535, inclusive.  (#438149)
+# (Submitted to dhcp-bugs at isc.org - [ISC-Bugs #18695])
 %patch17 -p1
 
 # The sample dhclient.conf should say 'supersede domain-search' (#467955)
+# (Submitted to dhcp-bugs at isc.org - [ISC-Bugs #19147])
 %patch18 -p1
 
 # Copy in documentation and example scripts for LDAP patch to dhcpd
@@ -253,7 +257,7 @@
 %{__make} install DESTDIR=%{buildroot}
 
 # Remove files we don't want
-%{__rm} %{buildroot}%{_sysconfdir}/dhclient.conf
+%{__rm} %{buildroot}%{_sysconfdir}/dhcp/dhclient.conf
 
 # Install correct dhclient-script
 %{__mkdir} -p %{buildroot}/sbin
@@ -289,7 +293,7 @@
 %{__cp} -p server/dhcpd.conf dhcpd.conf.sample
 
 # Install default (empty) dhcpd.conf:
-%{__cat} << EOF > %{buildroot}%{_sysconfdir}/dhcpd.conf
+%{__cat} << EOF > %{buildroot}%{_sysconfdir}/dhcp/dhcpd.conf
 #
 # DHCP Server Configuration file.
 #   see /usr/share/doc/dhcp*/dhcpd.conf.sample
@@ -308,7 +312,7 @@
 %{__rm} -rf %{buildroot}
 
 %post
-if [ -f /etc/dhcpd.conf ]; then
+if [ -f /etc/dhcpd.conf ] -a [ ! -f /etc/dhcp/dhcpd.conf ]; then
     /bin/cp -a /etc/dhcpd.conf /etc/dhcp/dhcpd.conf >/dev/null 2>&1
     /bin/rm -f /etc/dhcpd.conf >/dev/null 2>&1
 fi
@@ -320,8 +324,11 @@
 /bin/ls -1 /etc/dhclient* >/dev/null 2>&1
 if [ $? = 0 ]; then
     /bin/ls -1 /etc/dhclient* 2>/dev/null | while read etcfile ; do
-        /bin/cp -a "${etcfile}" /etc/dhcp
-        /bin/rm -f "${etcfile}"
+        cf="$(/bin/basename ${etcfile})"
+        if [ ! -f /etc/dhcp/${cf} ]; then
+            /bin/cp -a "${etcfile}" /etc/dhcp
+            /bin/rm -f "${etcfile}"
+        fi
     done || :
 fi || :
 
@@ -352,10 +359,11 @@
 %doc LICENSE README README.ldap RELNOTES dhcpd.conf.sample
 %doc doc/IANA-arp-parameters doc/api+protocol doc/*.txt __fedora_contrib/*
 %dir %{_localstatedir}/lib/dhcpd
+%dir %{_sysconfdir}/dhcp
 %verify(not size md5 mtime) %config(noreplace) %{_localstatedir}/lib/dhcpd/dhcpd.leases
 %config(noreplace) %{_sysconfdir}/sysconfig/dhcpd
 %config(noreplace) %{_sysconfdir}/sysconfig/dhcrelay
-%config(noreplace) %{_sysconfdir}/dhcpd.conf
+%config(noreplace) %{_sysconfdir}/dhcp/dhcpd.conf
 %config(noreplace) %{_sysconfdir}/openldap/schema/dhcp.schema
 %{_initrddir}/dhcpd
 %{_initrddir}/dhcrelay
@@ -373,6 +381,7 @@
 %files -n dhclient
 %defattr(-,root,root,-)
 %doc dhclient.conf.sample
+%dir %{_sysconfdir}/dhcp
 %dir %{_sysconfdir}/dhcp/dhclient.d
 %dir %{_localstatedir}/lib/dhclient
 /sbin/dhclient
@@ -396,6 +405,11 @@
 %attr(0644,root,root) %{_mandir}/man3/omapi.3.gz
 
 %changelog
+* Sat Jan 10 2009 David Cantrell <dcantrell at redhat.com> - 12:4.1.0-2
+- Make sure all /etc/dhcp config files are marked in the manifest
+- Include new config file directies in the dhcp and dhclient packages
+- Do not overwrite new config files if they already exist
+
 * Tue Jan 06 2009 David Cantrell <dcantrell at redhat.com> - 12:4.1.0-1
 - Upgraded to ISC dhcp-4.1.0
 - Had to rename the -T option to -timeout as ISC is now using -T



From sandeen at fedoraproject.org  Sat Jan 10 16:41:19 2009
From: sandeen at fedoraproject.org (Eric Sandeen)
Date: Sat, 10 Jan 2009 16:41:19 +0000 (UTC)
Subject: rpms/e2fsprogs/devel e2fsprogs-1.41.3-blkid-btrfs.patch, NONE,
	1.1 e2fsprogs.spec, 1.124, 1.125 e2fsprogs-journal-move.patch,
	1.1, NONE
Message-ID: <20090110164119.8020C7012C@cvs1.fedora.phx.redhat.com>

Author: sandeen

Update of /cvs/pkgs/rpms/e2fsprogs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17542

Modified Files:
	e2fsprogs.spec 
Added Files:
	e2fsprogs-1.41.3-blkid-btrfs.patch 
Removed Files:
	e2fsprogs-journal-move.patch 
Log Message:
* Sat Jan 10 2009 Eric Sandeen <sandeen at redhat.com> 1.41.3-3
- Remove conservative "don't change journal location" patch for F11
- Add btrfs recognition to blkid


e2fsprogs-1.41.3-blkid-btrfs.patch:

--- NEW FILE e2fsprogs-1.41.3-blkid-btrfs.patch ---
Add btrfs detection to libblkid, now that the disk format should be
recognizable in the future.

# misc/blkid /tmp/fsfile 
/tmp/fsfile: LABEL="mylabel" UUID="102b07f0-0e79-4b42-8a4e-1dde418bbe6d" TYPE="btrfs" 

Signed-off-by: Eric Sandeen <sandeen at redhat.com>
---

Index: e2fsprogs/lib/blkid/probe.c
===================================================================
--- e2fsprogs.orig/lib/blkid/probe.c
+++ e2fsprogs/lib/blkid/probe.c
@@ -1293,6 +1293,22 @@ static int probe_lvm2(struct blkid_probe
 
 	return 0;
 }
+
+static int probe_btrfs(struct blkid_probe *probe,
+			struct blkid_magic *id,
+			unsigned char *buf)
+{
+	struct btrfs_super_block *bs;
+	const char *label = 0;
+
+	bs = (struct btrfs_super_block *)buf;
+
+	if (strlen(bs->label))
+		label = bs->label;
+	blkid_set_tag(probe->dev, "LABEL", label, sizeof(bs->label));
+	set_uuid(probe->dev, bs->fsid, 0);
+	return 0;
+}
 /*
  * Various filesystem magics that we can check for.  Note that kboff and
  * sboff are in kilobytes and bytes respectively.  All magics are in
@@ -1386,6 +1402,7 @@ static struct blkid_magic type_array[] =
   { "lvm2pv",	 0,  0x018,  8, "LVM2 001",		probe_lvm2 },
   { "lvm2pv",	 1,  0x018,  8, "LVM2 001",		probe_lvm2 },
   { "lvm2pv",	 1,  0x218,  8, "LVM2 001",		probe_lvm2 },
+  { "btrfs",	 64,  0x40,  8, "_BHRfS_M",		probe_btrfs },
   {   NULL,	 0,	 0,  0, NULL,			NULL }
 };
 
Index: e2fsprogs/lib/blkid/probe.h
===================================================================
--- e2fsprogs.orig/lib/blkid/probe.h
+++ e2fsprogs/lib/blkid/probe.h
@@ -621,6 +621,110 @@ struct lvm2_pv_label_header {
 	__u8	pv_uuid[LVM2_ID_LEN];
 } __attribute__ ((packed));
 
+
+/*
+ * this is a very generous portion of the super block, giving us
+ * room to translate 14 chunks with 3 stripes each.
+ */
+#define BTRFS_SYSTEM_CHUNK_ARRAY_SIZE 2048
+#define BTRFS_LABEL_SIZE 256
+#define BTRFS_UUID_SIZE 16
+#define BTRFS_FSID_SIZE 16
+#define BTRFS_CSUM_SIZE 32
+
+struct btrfs_dev_item {
+	/* the internal btrfs device id */
+	__u64 devid;
+
+	/* size of the device */
+	__u64 total_bytes;
+
+	/* bytes used */
+	__u64 bytes_used;
+
+	/* optimal io alignment for this device */
+	__u32 io_align;
+
+	/* optimal io width for this device */
+	__u32 io_width;
+
+	/* minimal io size for this device */
+	__u32 sector_size;
+
+	/* type and info about this device */
+	__u64 type;
+
+	/* expected generation for this device */
+	__u64 generation;
+
+	/*
+	 * starting byte of this partition on the device,
+	 * to allowr for stripe alignment in the future
+	 */
+	__u64 start_offset;
+
+	/* grouping information for allocation decisions */
+	__u32 dev_group;
+
+	/* seek speed 0-100 where 100 is fastest */
+	__u8 seek_speed;
+
+	/* bandwidth 0-100 where 100 is fastest */
+	__u8 bandwidth;
+
+	/* btrfs generated uuid for this device */
+	__u8 uuid[BTRFS_UUID_SIZE];
+
+	/* uuid of FS who owns this device */
+	__u8 fsid[BTRFS_UUID_SIZE];
+} __attribute__ ((__packed__));
+
+/*
+ * the super block basically lists the main trees of the FS
+ * it currently lacks any block count etc etc
+ */
+struct btrfs_super_block {
+	__u8 csum[BTRFS_CSUM_SIZE];
+	/* the first 3 fields must match struct btrfs_header */
+	__u8 fsid[BTRFS_FSID_SIZE];    /* FS specific uuid */
+	__u64 bytenr; /* this block number */
+	__u64 flags;
+
+	/* allowed to be different from the btrfs_header from here own down */
+	__u64 magic;
+	__u64 generation;
+	__u64 root;
+	__u64 chunk_root;
+	__u64 log_root;
+
+	/* this will help find the new super based on the log root */
+	__u64 log_root_transid;
+	__u64 total_bytes;
+	__u64 bytes_used;
+	__u64 root_dir_objectid;
+	__u64 num_devices;
+	__u32 sectorsize;
+	__u32 nodesize;
+	__u32 leafsize;
+	__u32 stripesize;
+	__u32 sys_chunk_array_size;
+	__u64 chunk_root_generation;
+	__u64 compat_flags;
+	__u64 compat_ro_flags;
+	__u64 incompat_flags;
+	__u16 csum_type;
+	__u8 root_level;
+	__u8 chunk_root_level;
+	__u8 log_root_level;
+	struct btrfs_dev_item dev_item;
+
+	char label[BTRFS_LABEL_SIZE];
+
+	/* future expansion */
+	__u64 reserved[32];
+	__u8 sys_chunk_array[BTRFS_SYSTEM_CHUNK_ARRAY_SIZE];
+} __attribute__ ((__packed__));
+
 /*
  * Byte swap functions
  */

--
To unsubscribe from this list: send the line "unsubscribe linux-ext4" in
the body of a message to majordomo at vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html



Index: e2fsprogs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/e2fsprogs/devel/e2fsprogs.spec,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -r1.124 -r1.125
--- e2fsprogs.spec	7 Nov 2008 16:04:22 -0000	1.124
+++ e2fsprogs.spec	10 Jan 2009 16:40:49 -0000	1.125
@@ -4,7 +4,7 @@
 Summary: Utilities for managing the second and third extended (ext2/ext3) filesystems
 Name: e2fsprogs
 Version: 1.41.3
-Release: 2%{?dist}
+Release: 3%{?dist}
 # License based on upstream-modified COPYING file,
 # which clearly states "V2" intent.
 License: GPLv2
@@ -15,7 +15,7 @@
 Source3: uuidd.init
 Patch1: e2fsprogs-1.38-etcblkid.patch
 Patch2: e2fsprogs-1.40.4-sb_feature_check_ignore.patch
-Patch3: e2fsprogs-journal-move.patch
+Patch3: e2fsprogs-1.41.3-blkid-btrfs.patch
 
 Url: http://e2fsprogs.sourceforge.net/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -292,6 +292,10 @@
 %dir %attr(2775, uuidd, uuidd) /var/lib/libuuid
 
 %changelog
+* Sat Jan 10 2009 Eric Sandeen <sandeen at redhat.com> 1.41.3-3
+- Remove conservative "don't change journal location" patch for F11
+- Add btrfs recognition to blkid
+
 * Mon Oct 03 2008 Eric Sandeen <sandeen at redhat.com> 1.41.3-2
 - Bump to revision 2, f10 was behind f9, oops.
 


--- e2fsprogs-journal-move.patch DELETED ---



From dcantrel at fedoraproject.org  Sat Jan 10 16:46:47 2009
From: dcantrel at fedoraproject.org (David Cantrell)
Date: Sat, 10 Jan 2009 16:46:47 +0000 (UTC)
Subject: rpms/dhcp/devel dhcp.spec,1.234,1.235
Message-ID: <20090110164647.1FEAE7012C@cvs1.fedora.phx.redhat.com>

Author: dcantrel

Update of /cvs/pkgs/rpms/dhcp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18178

Modified Files:
	dhcp.spec 
Log Message:
* Sat Jan 10 2009 David Cantrell <dcantrell at redhat.com> - 12:4.1.0-2
- Make sure all /etc/dhcp config files are marked in the manifest
- Include new config file directies in the dhcp and dhclient packages
- Do not overwrite new config files if they already exist



Index: dhcp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dhcp/devel/dhcp.spec,v
retrieving revision 1.234
retrieving revision 1.235
diff -u -r1.234 -r1.235
--- dhcp.spec	10 Jan 2009 16:38:36 -0000	1.234
+++ dhcp.spec	10 Jan 2009 16:46:16 -0000	1.235
@@ -257,7 +257,8 @@
 %{__make} install DESTDIR=%{buildroot}
 
 # Remove files we don't want
-%{__rm} %{buildroot}%{_sysconfdir}/dhcp/dhclient.conf
+%{__rm} -f %{buildroot}%{_sysconfdir}/dhclient.conf
+%{__rm} -f %{buildroot}%{_sysconfdir}/dhcp/dhclient.conf
 
 # Install correct dhclient-script
 %{__mkdir} -p %{buildroot}/sbin



From uwog at fedoraproject.org  Sat Jan 10 17:09:18 2009
From: uwog at fedoraproject.org (Marc Maurer)
Date: Sat, 10 Jan 2009 17:09:18 +0000 (UTC)
Subject: rpms/abiword/devel .cvsignore, 1.22, 1.23 abiword.spec, 1.71,
	1.72 sources, 1.22, 1.23
Message-ID: <20090110170918.9E8EE7012C@cvs1.fedora.phx.redhat.com>

Author: uwog

Update of /cvs/pkgs/rpms/abiword/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20950

Modified Files:
	.cvsignore abiword.spec sources 
Log Message:
2.6.6 release




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/abiword/devel/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- .cvsignore	23 Nov 2008 22:17:59 -0000	1.22
+++ .cvsignore	10 Jan 2009 17:08:48 -0000	1.23
@@ -1,4 +1,4 @@
-abiword-2.6.5.tar.gz
-abiword-docs-2.6.5.tar.gz
-abiword-extras-2.6.5.tar.gz
-abiword-plugins-2.6.5.tar.gz
+abiword-2.6.6.tar.gz
+abiword-docs-2.6.6.tar.gz
+abiword-extras-2.6.6.tar.gz
+abiword-plugins-2.6.6.tar.gz


Index: abiword.spec
===================================================================
RCS file: /cvs/pkgs/rpms/abiword/devel/abiword.spec,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- abiword.spec	23 Nov 2008 22:17:59 -0000	1.71
+++ abiword.spec	10 Jan 2009 17:08:48 -0000	1.72
@@ -1,6 +1,6 @@
 %define majorversion 2
 %define minorversion 6
-%define microversion 5
+%define microversion 6
 
 %define olpc_build 0
 
@@ -214,6 +214,9 @@
 %{_libdir}/pkgconfig/%{name}-%{majorversion}.%{minorversion}.pc
 
 %changelog
+* Sat Jan 10 2009 Marc Maurer <uwog at abisource.com> - 1:2.6.6-1
+- New upstream release
+
 * Sun Nov 23 2008 Marc Maurer <uwog at abisource.com> - 1:2.6.5-1
 - New upstream release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/abiword/devel/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- sources	23 Nov 2008 22:17:59 -0000	1.22
+++ sources	10 Jan 2009 17:08:48 -0000	1.23
@@ -1,4 +1,4 @@
-edce76a1da515dfc102a0e030f722002  abiword-2.6.5.tar.gz
-7e35f9050219427d77a85172474caa64  abiword-docs-2.6.5.tar.gz
-b279a0fa521b33e3a103dadb6784ead2  abiword-extras-2.6.5.tar.gz
-6e38e0efc40421591ae4cc0d5202a796  abiword-plugins-2.6.5.tar.gz
+b9de84f03f555d4490b63e5b7f53e2f1  abiword-2.6.6.tar.gz
+833129f266e699b3cf0f3774e005a312  abiword-docs-2.6.6.tar.gz
+15db5e3ffa5429d2ce773351fc6fdb72  abiword-extras-2.6.6.tar.gz
+45dabc491976e3f21d943817e61b9d89  abiword-plugins-2.6.6.tar.gz



From davej at fedoraproject.org  Sat Jan 10 17:14:55 2009
From: davej at fedoraproject.org (Dave Jones)
Date: Sat, 10 Jan 2009 17:14:55 +0000 (UTC)
Subject: rpms/kernel/devel TODO,1.51,1.52
Message-ID: <20090110171455.C17227012C@cvs1.fedora.phx.redhat.com>

Author: davej

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22252

Modified Files:
	TODO 
Log Message:
gone


Index: TODO
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/TODO,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- TODO	29 Dec 2008 03:21:40 -0000	1.51
+++ TODO	10 Jan 2009 17:14:25 -0000	1.52
@@ -81,11 +81,9 @@
 	jarod added, should be in upstream v4l-dvb by .28, linus' tree by .29
 
 * linux-2.6-net-silence-noisy-printks.patch
-* linux-2.6-piix3-silence-quirk.patch (in -mm)
 * linux-2.6-silence-acpi-blacklist.patch
 * linux-2.6-silence-fbcon-logo.patch
 * linux-2.6-silence-noise.patch
-* linux-2.6.27-pci-hush-allocation-failures.patch
 	Fedora local 'hush' patches.  (Some will go upstream next time)
 
 * linux-2.6-selinux-mprotect-checks.patch
@@ -98,9 +96,6 @@
 	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-net-tulip-interrupt.patch
 	DEBUG_SHIRQ causes an oops.
 	Needs testing, if it works, it'll go upstream soon.



From scop at fedoraproject.org  Sat Jan 10 17:29:22 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Sat, 10 Jan 2009 17:29:22 +0000 (UTC)
Subject: rpms/kdelibs3/devel kde.sh,1.2,1.3 kdelibs3.spec,1.45,1.46
Message-ID: <20090110172922.923567012C@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/kdelibs3/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23779

Modified Files:
	kde.sh kdelibs3.spec 
Log Message:
* Sat Jan 10 2009 Ville Skytt?? <ville.skytta at iki.fi> - 6:3.5.10-4
- Slight speedup to profile.d/kde.sh (#465370).



Index: kde.sh
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs3/devel/kde.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- kde.sh	1 Dec 2007 19:11:02 -0000	1.2
+++ kde.sh	10 Jan 2009 17:28:52 -0000	1.3
@@ -5,8 +5,7 @@
 [ -z "$KDEDIRS" ] && KDEDIRS="/usr" && export KDEDIRS
 
 ## When/if using prelinking, avoids (some) use of kdeinit
-if [ -f /etc/sysconfig/prelink ]; then
-  if [ `grep '^PRELINKING=yes' /etc/sysconfig/prelink` ] ; then
-    [ -z "$KDE_IS_PRELINKED" ] && KDE_IS_PRELINKED=1 && export KDE_IS_PRELINKED
-  fi
+if [ -z "$KDE_IS_PRELINKED" ] ; then
+  grep -qs '^PRELINKING=yes' /etc/sysconfig/prelink && \
+  KDE_IS_PRELINKED=1 && export KDE_IS_PRELINKED
 fi


Index: kdelibs3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs3/devel/kdelibs3.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- kdelibs3.spec	15 Dec 2008 07:17:12 -0000	1.45
+++ kdelibs3.spec	10 Jan 2009 17:28:52 -0000	1.46
@@ -36,7 +36,7 @@
 
 Summary: K Desktop Environment 3 - Libraries
 Version: 3.5.10
-Release: 3%{?dist}
+Release: 4%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs3
@@ -632,6 +632,9 @@
 
 
 %changelog
+* Sat Jan 10 2009 Ville Skytt?? <ville.skytta at iki.fi> - 6:3.5.10-4
+- Slight speedup to profile.d/kde.sh (#465370).
+
 * Mon Dec 15 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.5.10-3
 - update the KatePart latex.xml syntax definition to the version from Kile 2.0.3
 



From uwog at fedoraproject.org  Sat Jan 10 17:53:22 2009
From: uwog at fedoraproject.org (Marc Maurer)
Date: Sat, 10 Jan 2009 17:53:22 +0000 (UTC)
Subject: rpms/abiword/F-10 .cvsignore, 1.22, 1.23 abiword.spec, 1.71,
	1.72 sources, 1.22, 1.23
Message-ID: <20090110175322.F002C7012C@cvs1.fedora.phx.redhat.com>

Author: uwog

Update of /cvs/pkgs/rpms/abiword/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26466

Modified Files:
	.cvsignore abiword.spec sources 
Log Message:
New upstream release




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/abiword/F-10/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- .cvsignore	23 Nov 2008 21:50:30 -0000	1.22
+++ .cvsignore	10 Jan 2009 17:52:52 -0000	1.23
@@ -1,4 +1,4 @@
-abiword-2.6.5.tar.gz
-abiword-docs-2.6.5.tar.gz
-abiword-extras-2.6.5.tar.gz
-abiword-plugins-2.6.5.tar.gz
+abiword-2.6.6.tar.gz
+abiword-docs-2.6.6.tar.gz
+abiword-extras-2.6.6.tar.gz
+abiword-plugins-2.6.6.tar.gz


Index: abiword.spec
===================================================================
RCS file: /cvs/pkgs/rpms/abiword/F-10/abiword.spec,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- abiword.spec	23 Nov 2008 21:50:30 -0000	1.71
+++ abiword.spec	10 Jan 2009 17:52:52 -0000	1.72
@@ -1,6 +1,6 @@
 %define majorversion 2
 %define minorversion 6
-%define microversion 5
+%define microversion 6
 
 %define olpc_build 0
 
@@ -214,6 +214,9 @@
 %{_libdir}/pkgconfig/%{name}-%{majorversion}.%{minorversion}.pc
 
 %changelog
+* Sat Jan 10 2009 Marc Maurer <uwog at abisource.com> - 1:2.6.6-1
+- New upstream release
+
 * Sun Nov 23 2008 Marc Maurer <uwog at abisource.com> - 1:2.6.5-1
 - New upstream release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/abiword/F-10/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- sources	23 Nov 2008 21:50:30 -0000	1.22
+++ sources	10 Jan 2009 17:52:52 -0000	1.23
@@ -1,4 +1,4 @@
-edce76a1da515dfc102a0e030f722002  abiword-2.6.5.tar.gz
-7e35f9050219427d77a85172474caa64  abiword-docs-2.6.5.tar.gz
-b279a0fa521b33e3a103dadb6784ead2  abiword-extras-2.6.5.tar.gz
-6e38e0efc40421591ae4cc0d5202a796  abiword-plugins-2.6.5.tar.gz
+b9de84f03f555d4490b63e5b7f53e2f1  abiword-2.6.6.tar.gz
+833129f266e699b3cf0f3774e005a312  abiword-docs-2.6.6.tar.gz
+15db5e3ffa5429d2ce773351fc6fdb72  abiword-extras-2.6.6.tar.gz
+45dabc491976e3f21d943817e61b9d89  abiword-plugins-2.6.6.tar.gz



From uwog at fedoraproject.org  Sat Jan 10 18:27:01 2009
From: uwog at fedoraproject.org (Marc Maurer)
Date: Sat, 10 Jan 2009 18:27:01 +0000 (UTC)
Subject: rpms/abiword/F-9 .cvsignore, 1.22, 1.23 abiword.spec, 1.63,
	1.64 sources, 1.22, 1.23
Message-ID: <20090110182701.99A897012C@cvs1.fedora.phx.redhat.com>

Author: uwog

Update of /cvs/pkgs/rpms/abiword/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30230

Modified Files:
	.cvsignore abiword.spec sources 
Log Message:
New upstream release




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/abiword/F-9/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- .cvsignore	23 Nov 2008 23:11:27 -0000	1.22
+++ .cvsignore	10 Jan 2009 18:26:31 -0000	1.23
@@ -1,4 +1,4 @@
-abiword-2.6.5.tar.gz
-abiword-docs-2.6.5.tar.gz
-abiword-extras-2.6.5.tar.gz
-abiword-plugins-2.6.5.tar.gz
+abiword-2.6.6.tar.gz
+abiword-docs-2.6.6.tar.gz
+abiword-extras-2.6.6.tar.gz
+abiword-plugins-2.6.6.tar.gz


Index: abiword.spec
===================================================================
RCS file: /cvs/pkgs/rpms/abiword/F-9/abiword.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- abiword.spec	23 Nov 2008 23:11:27 -0000	1.63
+++ abiword.spec	10 Jan 2009 18:26:31 -0000	1.64
@@ -1,6 +1,6 @@
 %define majorversion 2
 %define minorversion 6
-%define microversion 5
+%define microversion 6
 
 Summary: The AbiWord word processor
 Name: abiword
@@ -173,6 +173,9 @@
 %ghost %{_libdir}/pkgconfig/%{name}-%{majorversion}.%{minorversion}.pc
 
 %changelog
+* Sat Jan 10 2009 Marc Maurer <uwog at abisource.com> - 1:2.6.6-1
+- New upstream release
+
 * Sun Nov 23 2008 Marc Maurer <uwog at abisource.com> - 1:2.6.5-1
 - New upstream release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/abiword/F-9/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- sources	23 Nov 2008 23:11:27 -0000	1.22
+++ sources	10 Jan 2009 18:26:31 -0000	1.23
@@ -1,4 +1,4 @@
-edce76a1da515dfc102a0e030f722002  abiword-2.6.5.tar.gz
-7e35f9050219427d77a85172474caa64  abiword-docs-2.6.5.tar.gz
-b279a0fa521b33e3a103dadb6784ead2  abiword-extras-2.6.5.tar.gz
-6e38e0efc40421591ae4cc0d5202a796  abiword-plugins-2.6.5.tar.gz
+b9de84f03f555d4490b63e5b7f53e2f1  abiword-2.6.6.tar.gz
+833129f266e699b3cf0f3774e005a312  abiword-docs-2.6.6.tar.gz
+15db5e3ffa5429d2ce773351fc6fdb72  abiword-extras-2.6.6.tar.gz
+45dabc491976e3f21d943817e61b9d89  abiword-plugins-2.6.6.tar.gz



From drago01 at fedoraproject.org  Sat Jan 10 18:33:06 2009
From: drago01 at fedoraproject.org (Adel Gadllah)
Date: Sat, 10 Jan 2009 18:33:06 +0000 (UTC)
Subject: rpms/iw/devel .cvsignore,1.4,1.5 iw.spec,1.6,1.7 sources,1.4,1.5
Message-ID: <20090110183306.2F4947012C@cvs1.fedora.phx.redhat.com>

Author: drago01

Update of /cvs/pkgs/rpms/iw/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31362

Modified Files:
	.cvsignore iw.spec sources 
Log Message:
Update to 0.9.7


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/iw/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	26 Oct 2008 14:15:19 -0000	1.4
+++ .cvsignore	10 Jan 2009 18:32:35 -0000	1.5
@@ -1 +1 @@
-iw-0.9.6.tar.bz2
+iw-0.9.7.tar.bz2


Index: iw.spec
===================================================================
RCS file: /cvs/pkgs/rpms/iw/devel/iw.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- iw.spec	26 Oct 2008 14:15:19 -0000	1.6
+++ iw.spec	10 Jan 2009 18:32:35 -0000	1.7
@@ -1,16 +1,16 @@
 Name:           iw
-Version:        0.9.6
+Version:        0.9.7
 Release:        1%{?dist}
 Summary:        A nl80211 based wireless configuration tool
 
 Group:          System Environment/Base
 License:        BSD
-URL:		 http://www.linuxwireless.org/en/users/Documentation/iw
-Source0:	 http://wireless.kernel.org/download/iw/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 
-BuildRequires: libnl-devel
+BuildRequires: libnl-devel >= 1.0
 BuildRequires: pkgconfig      
 
 %description
@@ -24,13 +24,12 @@
 
 
 %build
-cp defconfig .config
 make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS"
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -D -p -m 0755 %{name} $RPM_BUILD_ROOT%{_bindir}/%{name}
+make install DESTDIR=$RPM_BUILD_ROOT
 
 
 %clean
@@ -40,9 +39,13 @@
 %files
 %defattr(-,root,root,-)
 %{_bindir}/%{name}
+%{_datadir}/man/man8/iw.*
 %doc COPYING
 
 %changelog
+* Sat Jan 10 2009 Adel Gadllah <adel.gadllah at gmail.com> 0.9.7-1
+- Update to 0.9.7
+
 * Sun Oct 26 2008 Adel Gadllah <adel.gadllah at gmail.com> 0.9.6-1
 - Update to 0.9.6
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/iw/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	26 Oct 2008 14:15:19 -0000	1.4
+++ sources	10 Jan 2009 18:32:35 -0000	1.5
@@ -1 +1 @@
-d3cadc8f3388bedb26653c28075c711e  iw-0.9.6.tar.bz2
+52fa948eb5e2cb525fc884d6e58cdd88  iw-0.9.7.tar.bz2



From drago01 at fedoraproject.org  Sat Jan 10 18:34:21 2009
From: drago01 at fedoraproject.org (Adel Gadllah)
Date: Sat, 10 Jan 2009 18:34:21 +0000 (UTC)
Subject: rpms/iw/F-10 .cvsignore,1.4,1.5 iw.spec,1.6,1.7 sources,1.4,1.5
Message-ID: <20090110183421.36DB97012C@cvs1.fedora.phx.redhat.com>

Author: drago01

Update of /cvs/pkgs/rpms/iw/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31937

Modified Files:
	.cvsignore iw.spec sources 
Log Message:
Update to 0.9.7


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/iw/F-10/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	26 Oct 2008 14:15:19 -0000	1.4
+++ .cvsignore	10 Jan 2009 18:33:50 -0000	1.5
@@ -1 +1 @@
-iw-0.9.6.tar.bz2
+iw-0.9.7.tar.bz2


Index: iw.spec
===================================================================
RCS file: /cvs/pkgs/rpms/iw/F-10/iw.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- iw.spec	26 Oct 2008 14:15:19 -0000	1.6
+++ iw.spec	10 Jan 2009 18:33:50 -0000	1.7
@@ -1,16 +1,16 @@
 Name:           iw
-Version:        0.9.6
+Version:        0.9.7
 Release:        1%{?dist}
 Summary:        A nl80211 based wireless configuration tool
 
 Group:          System Environment/Base
 License:        BSD
-URL:		 http://www.linuxwireless.org/en/users/Documentation/iw
-Source0:	 http://wireless.kernel.org/download/iw/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 
-BuildRequires: libnl-devel
+BuildRequires: libnl-devel >= 1.0
 BuildRequires: pkgconfig      
 
 %description
@@ -24,13 +24,12 @@
 
 
 %build
-cp defconfig .config
 make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS"
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -D -p -m 0755 %{name} $RPM_BUILD_ROOT%{_bindir}/%{name}
+make install DESTDIR=$RPM_BUILD_ROOT
 
 
 %clean
@@ -40,9 +39,13 @@
 %files
 %defattr(-,root,root,-)
 %{_bindir}/%{name}
+%{_datadir}/man/man8/iw.*
 %doc COPYING
 
 %changelog
+* Sat Jan 10 2009 Adel Gadllah <adel.gadllah at gmail.com> 0.9.7-1
+- Update to 0.9.7
+
 * Sun Oct 26 2008 Adel Gadllah <adel.gadllah at gmail.com> 0.9.6-1
 - Update to 0.9.6
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/iw/F-10/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	26 Oct 2008 14:15:19 -0000	1.4
+++ sources	10 Jan 2009 18:33:50 -0000	1.5
@@ -1 +1 @@
-d3cadc8f3388bedb26653c28075c711e  iw-0.9.6.tar.bz2
+52fa948eb5e2cb525fc884d6e58cdd88  iw-0.9.7.tar.bz2



From cweyl at fedoraproject.org  Sat Jan 10 18:36:50 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Sat, 10 Jan 2009 18:36:50 +0000 (UTC)
Subject: rpms/perl-MooseX-Types/F-10 perl-MooseX-Types.spec, 1.2, 1.3 sources,
	1.2, 1.3
Message-ID: <20090110183650.BDD877012C@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-MooseX-Types/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32374

Modified Files:
	perl-MooseX-Types.spec sources 
Log Message:
* Tue Dec 30 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.08-2
- add br on Test::Exception



Index: perl-MooseX-Types.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-MooseX-Types/F-10/perl-MooseX-Types.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-MooseX-Types.spec	13 Oct 2008 04:01:50 -0000	1.2
+++ perl-MooseX-Types.spec	10 Jan 2009 18:36:20 -0000	1.3
@@ -1,11 +1,12 @@
 Name:       perl-MooseX-Types 
-Version:    0.04 
-Release:        2%{?dist}
+Version:    0.08
+Release:    2%{?dist}
 # see Makefile.PL, lib/MooseX/Types.pm
 License:    GPL+ or Artistic 
 Group:      Development/Libraries
 Summary:    Organise your Moose types in libraries 
-Source:     http://search.cpan.org/CPAN/authors/id/P/PH/PHAYLON/MooseX-Types-%{version}.tar.gz 
+#Source:     http://search.cpan.org/CPAN/authors/id/P/PH/PHAYLON/MooseX-Types-%{version}.tar.gz 
+Source:     http://search.cpan.org/CPAN/authors/id/J/JJ/JJNAPIORK/MooseX-Types-%{version}.tar.gz
 Url:        http://search.cpan.org/dist/MooseX-Types
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 Requires:   perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
@@ -14,13 +15,14 @@
 BuildRequires: perl(ExtUtils::MakeMaker) 
 BuildRequires: perl(Carp)
 BuildRequires: perl(Carp::Clan)
-BuildRequires: perl(Class::MOP)
 BuildRequires: perl(FindBin)
-BuildRequires: perl(Moose) >= 0.24
-BuildRequires: perl(namespace::clean) >= 0.04
-BuildRequires: perl(Sub::Install) >= 0.922
-BuildRequires: perl(Sub::Uplevel) >= 0.14
+BuildRequires: perl(Moose) >= 0.61
+BuildRequires: perl(namespace::clean) >= 0.08
+BuildRequires: perl(Sub::Install) >= 0.924
+# tests
 BuildRequires: perl(Test::More) >= 0.62
+BuildRequires: perl(Test::Exception)
+BuildRequires: perl(Sub::Exporter)
 
 
 %description
@@ -82,6 +84,15 @@
 %{_mandir}/man3/*.3*
 
 %changelog
+* Tue Dec 30 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.08-2
+- add br on Test::Exception
+
+* Tue Dec 30 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.08-1
+- update to 0.08
+
+* Mon Nov 10 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.07-1
+- update to 0.07, adjust BR accordingly.  Note especially dep on Moose >= 0.61
+
 * Sun Oct 12 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.04-2
 - bump
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-MooseX-Types/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	13 Oct 2008 03:59:59 -0000	1.2
+++ sources	10 Jan 2009 18:36:20 -0000	1.3
@@ -1 +1 @@
-f8ac0ad1bb431a3dfae25e5ade184619  MooseX-Types-0.04.tar.gz
+d1516a4fe76498308fee1b0d757917ed  MooseX-Types-0.08.tar.gz



From cweyl at fedoraproject.org  Sat Jan 10 18:37:09 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Sat, 10 Jan 2009 18:37:09 +0000 (UTC)
Subject: rpms/perl-MooseX-Types/F-9 perl-MooseX-Types.spec, 1.1, 1.2 sources,
	1.2, 1.3
Message-ID: <20090110183709.A56227012C@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-MooseX-Types/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32468

Modified Files:
	perl-MooseX-Types.spec sources 
Log Message:
* Tue Dec 30 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.08-2
- add br on Test::Exception



Index: perl-MooseX-Types.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-MooseX-Types/F-9/perl-MooseX-Types.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-MooseX-Types.spec	13 Oct 2008 04:07:16 -0000	1.1
+++ perl-MooseX-Types.spec	10 Jan 2009 18:36:39 -0000	1.2
@@ -1,11 +1,12 @@
 Name:       perl-MooseX-Types 
-Version:    0.04 
-Release:        2%{?dist}
+Version:    0.08
+Release:    2%{?dist}
 # see Makefile.PL, lib/MooseX/Types.pm
 License:    GPL+ or Artistic 
 Group:      Development/Libraries
 Summary:    Organise your Moose types in libraries 
-Source:     http://search.cpan.org/CPAN/authors/id/P/PH/PHAYLON/MooseX-Types-%{version}.tar.gz 
+#Source:     http://search.cpan.org/CPAN/authors/id/P/PH/PHAYLON/MooseX-Types-%{version}.tar.gz 
+Source:     http://search.cpan.org/CPAN/authors/id/J/JJ/JJNAPIORK/MooseX-Types-%{version}.tar.gz
 Url:        http://search.cpan.org/dist/MooseX-Types
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 Requires:   perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
@@ -14,13 +15,14 @@
 BuildRequires: perl(ExtUtils::MakeMaker) 
 BuildRequires: perl(Carp)
 BuildRequires: perl(Carp::Clan)
-BuildRequires: perl(Class::MOP)
 BuildRequires: perl(FindBin)
-BuildRequires: perl(Moose) >= 0.24
-BuildRequires: perl(namespace::clean) >= 0.04
-BuildRequires: perl(Sub::Install) >= 0.922
-BuildRequires: perl(Sub::Uplevel) >= 0.14
+BuildRequires: perl(Moose) >= 0.61
+BuildRequires: perl(namespace::clean) >= 0.08
+BuildRequires: perl(Sub::Install) >= 0.924
+# tests
 BuildRequires: perl(Test::More) >= 0.62
+BuildRequires: perl(Test::Exception)
+BuildRequires: perl(Sub::Exporter)
 
 
 %description
@@ -82,6 +84,15 @@
 %{_mandir}/man3/*.3*
 
 %changelog
+* Tue Dec 30 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.08-2
+- add br on Test::Exception
+
+* Tue Dec 30 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.08-1
+- update to 0.08
+
+* Mon Nov 10 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.07-1
+- update to 0.07, adjust BR accordingly.  Note especially dep on Moose >= 0.61
+
 * Sun Oct 12 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.04-2
 - bump
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-MooseX-Types/F-9/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	13 Oct 2008 04:07:16 -0000	1.2
+++ sources	10 Jan 2009 18:36:39 -0000	1.3
@@ -1 +1 @@
-f8ac0ad1bb431a3dfae25e5ade184619  MooseX-Types-0.04.tar.gz
+d1516a4fe76498308fee1b0d757917ed  MooseX-Types-0.08.tar.gz



From drago01 at fedoraproject.org  Sat Jan 10 18:38:32 2009
From: drago01 at fedoraproject.org (Adel Gadllah)
Date: Sat, 10 Jan 2009 18:38:32 +0000 (UTC)
Subject: rpms/iw/F-9 .cvsignore,1.4,1.5 iw.spec,1.3,1.4 sources,1.4,1.5
Message-ID: <20090110183832.E0E0D7012C@cvs1.fedora.phx.redhat.com>

Author: drago01

Update of /cvs/pkgs/rpms/iw/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv358

Modified Files:
	.cvsignore iw.spec sources 
Log Message:
Update to 0.9.7


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/iw/F-9/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	5 Dec 2008 08:23:59 -0000	1.4
+++ .cvsignore	10 Jan 2009 18:38:02 -0000	1.5
@@ -1 +1 @@
-iw-0.9.6.tar.bz2
+iw-0.9.7.tar.bz2


Index: iw.spec
===================================================================
RCS file: /cvs/pkgs/rpms/iw/F-9/iw.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- iw.spec	5 Dec 2008 08:23:59 -0000	1.3
+++ iw.spec	10 Jan 2009 18:38:02 -0000	1.4
@@ -1,16 +1,16 @@
 Name:           iw
-Version:        0.9.6
+Version:        0.9.7
 Release:        1%{?dist}
 Summary:        A nl80211 based wireless configuration tool
 
 Group:          System Environment/Base
 License:        BSD
-URL:		 http://www.linuxwireless.org/en/users/Documentation/iw
-Source0:	 http://wireless.kernel.org/download/iw/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 
-BuildRequires: libnl-devel
+BuildRequires: libnl-devel >= 1.0
 BuildRequires: pkgconfig      
 
 %description
@@ -24,13 +24,12 @@
 
 
 %build
-cp defconfig .config
 make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS"
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -D -p -m 0755 %{name} $RPM_BUILD_ROOT%{_bindir}/%{name}
+make install DESTDIR=$RPM_BUILD_ROOT
 
 
 %clean
@@ -40,9 +39,13 @@
 %files
 %defattr(-,root,root,-)
 %{_bindir}/%{name}
+%{_datadir}/man/man8/iw.*
 %doc COPYING
 
 %changelog
+* Sat Jan 10 2009 Adel Gadllah <adel.gadllah at gmail.com> 0.9.7-1
+- Update to 0.9.7
+
 * Fri Dec 04 2008 Adel Gadllah <adel.gadllah at gmail.com> 0.9.6-1
 - Update to 0.9.6
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/iw/F-9/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	5 Dec 2008 08:23:59 -0000	1.4
+++ sources	10 Jan 2009 18:38:02 -0000	1.5
@@ -1 +1 @@
-d3cadc8f3388bedb26653c28075c711e  iw-0.9.6.tar.bz2
+52fa948eb5e2cb525fc884d6e58cdd88  iw-0.9.7.tar.bz2



From cweyl at fedoraproject.org  Sat Jan 10 18:39:37 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Sat, 10 Jan 2009 18:39:37 +0000 (UTC)
Subject: rpms/perl-MooseX-StrictConstructor/devel
	perl-MooseX-StrictConstructor.spec, 1.2, 1.3
Message-ID: <20090110183937.82E6F7012C@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-MooseX-StrictConstructor/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv584

Modified Files:
	perl-MooseX-StrictConstructor.spec 
Log Message:
* Sat Jan 10 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.07-3
- rebuild under new Moose level



Index: perl-MooseX-StrictConstructor.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-MooseX-StrictConstructor/devel/perl-MooseX-StrictConstructor.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-MooseX-StrictConstructor.spec	30 Oct 2008 06:56:12 -0000	1.2
+++ perl-MooseX-StrictConstructor.spec	10 Jan 2009 18:39:07 -0000	1.3
@@ -1,6 +1,6 @@
 Name:       perl-MooseX-StrictConstructor 
 Version:    0.07 
-Release:        2%{?dist}
+Release:    3%{?dist}
 # see lib/MooseX/StrictConstructor.pm
 License:    GPL+ or Artistic
 Group:      Development/Libraries
@@ -51,6 +51,9 @@
 %{_mandir}/man3/*.3*
 
 %changelog
+* Sat Jan 10 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.07-3
+- rebuild under new Moose level
+
 * Wed Oct 29 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.07-2
 - bump
 



From cweyl at fedoraproject.org  Sat Jan 10 18:40:01 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Sat, 10 Jan 2009 18:40:01 +0000 (UTC)
Subject: rpms/perl-MooseX-StrictConstructor/F-10
	perl-MooseX-StrictConstructor.spec, 1.3, 1.4
Message-ID: <20090110184001.8301D7012C@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-MooseX-StrictConstructor/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv647

Modified Files:
	perl-MooseX-StrictConstructor.spec 
Log Message:
* Sat Jan 10 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.07-3
- rebuild under new Moose level



Index: perl-MooseX-StrictConstructor.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-MooseX-StrictConstructor/F-10/perl-MooseX-StrictConstructor.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- perl-MooseX-StrictConstructor.spec	11 Dec 2008 18:18:34 -0000	1.3
+++ perl-MooseX-StrictConstructor.spec	10 Jan 2009 18:39:31 -0000	1.4
@@ -1,6 +1,6 @@
 Name:       perl-MooseX-StrictConstructor 
 Version:    0.07 
-Release:    2%{?dist}.1
+Release:    3%{?dist}
 # see lib/MooseX/StrictConstructor.pm
 License:    GPL+ or Artistic
 Group:      Development/Libraries
@@ -51,8 +51,8 @@
 %{_mandir}/man3/*.3*
 
 %changelog
-* Thu Dec 11 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.07-2.1
-- bump...
+* Sat Jan 10 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.07-3
+- rebuild under new Moose level
 
 * Wed Oct 29 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.07-2
 - bump



From cweyl at fedoraproject.org  Sat Jan 10 18:40:25 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Sat, 10 Jan 2009 18:40:25 +0000 (UTC)
Subject: rpms/perl-MooseX-StrictConstructor/F-9
	perl-MooseX-StrictConstructor.spec, 1.2, 1.3
Message-ID: <20090110184025.B9CF77012C@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-MooseX-StrictConstructor/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv779

Modified Files:
	perl-MooseX-StrictConstructor.spec 
Log Message:
* Sat Jan 10 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.07-3
- rebuild under new Moose level



Index: perl-MooseX-StrictConstructor.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-MooseX-StrictConstructor/F-9/perl-MooseX-StrictConstructor.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-MooseX-StrictConstructor.spec	11 Dec 2008 18:18:47 -0000	1.2
+++ perl-MooseX-StrictConstructor.spec	10 Jan 2009 18:39:55 -0000	1.3
@@ -1,6 +1,6 @@
 Name:       perl-MooseX-StrictConstructor 
 Version:    0.07 
-Release:    2%{?dist}.1
+Release:    3%{?dist}
 # see lib/MooseX/StrictConstructor.pm
 License:    GPL+ or Artistic
 Group:      Development/Libraries
@@ -51,8 +51,8 @@
 %{_mandir}/man3/*.3*
 
 %changelog
-* Thu Dec 11 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.07-2.1
-- bump...
+* Sat Jan 10 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.07-3
+- rebuild under new Moose level
 
 * Wed Oct 29 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.07-2
 - bump



From cweyl at fedoraproject.org  Sat Jan 10 18:43:40 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Sat, 10 Jan 2009 18:43:40 +0000 (UTC)
Subject: rpms/perl-MooseX-Object-Pluggable/devel
	perl-MooseX-Object-Pluggable.spec, 1.7, 1.8
Message-ID: <20090110184340.56AE67012C@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-MooseX-Object-Pluggable/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1277

Modified Files:
	perl-MooseX-Object-Pluggable.spec 
Log Message:
* Sat Jan 10 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.0009-2
- rebuild against new Moose level



Index: perl-MooseX-Object-Pluggable.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-MooseX-Object-Pluggable/devel/perl-MooseX-Object-Pluggable.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- perl-MooseX-Object-Pluggable.spec	30 Dec 2008 16:04:04 -0000	1.7
+++ perl-MooseX-Object-Pluggable.spec	10 Jan 2009 18:43:09 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           perl-MooseX-Object-Pluggable
 Version:        0.0009
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Make your Moose classes pluggable
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -65,6 +65,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Sat Jan 10 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.0009-2
+- rebuild against new Moose level
+
 * Tue Dec 30 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.0009-1
 - update to 0.0009
 



From cweyl at fedoraproject.org  Sat Jan 10 18:43:56 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Sat, 10 Jan 2009 18:43:56 +0000 (UTC)
Subject: rpms/perl-MooseX-Object-Pluggable/F-10
	perl-MooseX-Object-Pluggable.spec, 1.6, 1.7 sources, 1.4, 1.5
Message-ID: <20090110184356.B97AE7012C@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-MooseX-Object-Pluggable/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1338

Modified Files:
	perl-MooseX-Object-Pluggable.spec sources 
Log Message:
* Sat Jan 10 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.0009-2
- rebuild against new Moose level



Index: perl-MooseX-Object-Pluggable.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-MooseX-Object-Pluggable/F-10/perl-MooseX-Object-Pluggable.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- perl-MooseX-Object-Pluggable.spec	9 Jul 2008 04:58:44 -0000	1.6
+++ perl-MooseX-Object-Pluggable.spec	10 Jan 2009 18:43:26 -0000	1.7
@@ -1,5 +1,5 @@
 Name:           perl-MooseX-Object-Pluggable
-Version:        0.0007
+Version:        0.0009
 Release:        2%{?dist}
 Summary:        Make your Moose classes pluggable
 License:        GPL+ or Artistic
@@ -65,6 +65,12 @@
 %{_mandir}/man3/*
 
 %changelog
+* Sat Jan 10 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.0009-2
+- rebuild against new Moose level
+
+* Tue Dec 30 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.0009-1
+- update to 0.0009
+
 * Tue Jul 08 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.0007-2
 - ...and fix build failure
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-MooseX-Object-Pluggable/F-10/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	9 Jul 2008 04:51:21 -0000	1.4
+++ sources	10 Jan 2009 18:43:26 -0000	1.5
@@ -1 +1 @@
-412dfaf26c334c4a1e88ab39fefaa9b7  MooseX-Object-Pluggable-0.0007.tar.gz
+2d90fdc7c713e41c50396dcc86f60982  MooseX-Object-Pluggable-0.0009.tar.gz



From cweyl at fedoraproject.org  Sat Jan 10 18:44:33 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Sat, 10 Jan 2009 18:44:33 +0000 (UTC)
Subject: rpms/perl-MooseX-Object-Pluggable/F-9 .cvsignore, 1.3,
	1.4 perl-MooseX-Object-Pluggable.spec, 1.5, 1.6 sources, 1.4, 1.5
Message-ID: <20090110184433.A6AC97012C@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-MooseX-Object-Pluggable/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1487

Modified Files:
	.cvsignore perl-MooseX-Object-Pluggable.spec sources 
Log Message:
* Sat Jan 10 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.0009-2
- rebuild against new Moose level



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-MooseX-Object-Pluggable/F-9/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	19 Apr 2007 15:51:41 -0000	1.3
+++ .cvsignore	10 Jan 2009 18:44:03 -0000	1.4
@@ -1 +1,4 @@
 MooseX-Object-Pluggable-0.0005.tar.gz
+*.gz
+*.rpm
+clog


Index: perl-MooseX-Object-Pluggable.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-MooseX-Object-Pluggable/F-9/perl-MooseX-Object-Pluggable.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perl-MooseX-Object-Pluggable.spec	9 Jul 2008 05:15:30 -0000	1.5
+++ perl-MooseX-Object-Pluggable.spec	10 Jan 2009 18:44:03 -0000	1.6
@@ -1,5 +1,5 @@
 Name:           perl-MooseX-Object-Pluggable
-Version:        0.0007
+Version:        0.0009
 Release:        2%{?dist}
 Summary:        Make your Moose classes pluggable
 License:        GPL+ or Artistic
@@ -65,6 +65,12 @@
 %{_mandir}/man3/*
 
 %changelog
+* Sat Jan 10 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.0009-2
+- rebuild against new Moose level
+
+* Tue Dec 30 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.0009-1
+- update to 0.0009
+
 * Tue Jul 08 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.0007-2
 - ...and fix build failure
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-MooseX-Object-Pluggable/F-9/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	9 Jul 2008 05:15:30 -0000	1.4
+++ sources	10 Jan 2009 18:44:03 -0000	1.5
@@ -1 +1 @@
-412dfaf26c334c4a1e88ab39fefaa9b7  MooseX-Object-Pluggable-0.0007.tar.gz
+2d90fdc7c713e41c50396dcc86f60982  MooseX-Object-Pluggable-0.0009.tar.gz



From cweyl at fedoraproject.org  Sat Jan 10 18:46:22 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Sat, 10 Jan 2009 18:46:22 +0000 (UTC)
Subject: rpms/perl-MooseX-Params-Validate/devel .cvsignore, 1.6,
	1.7 perl-MooseX-Params-Validate.spec, 1.7, 1.8
Message-ID: <20090110184622.B5D567012C@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-MooseX-Params-Validate/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1848

Modified Files:
	.cvsignore perl-MooseX-Params-Validate.spec 
Log Message:
* Sat Jan 10 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.07-2
- rebuild against new Moose



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-MooseX-Params-Validate/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	30 Dec 2008 16:13:08 -0000	1.6
+++ .cvsignore	10 Jan 2009 18:45:52 -0000	1.7
@@ -1 +1,4 @@
 MooseX-Params-Validate-0.07.tar.gz
+*.rpm
+*.gz
+clog


Index: perl-MooseX-Params-Validate.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-MooseX-Params-Validate/devel/perl-MooseX-Params-Validate.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- perl-MooseX-Params-Validate.spec	30 Dec 2008 16:13:08 -0000	1.7
+++ perl-MooseX-Params-Validate.spec	10 Jan 2009 18:45:52 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           perl-MooseX-Params-Validate
 Version:        0.07
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Extension of Params::Validate using Moose's types
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -53,6 +53,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Sat Jan 10 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.07-2
+- rebuild against new Moose
+
 * Sat Nov 08 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.07-1
 - update to 0.07
 - change from Build.PL to Makefile.PL incantation (now using Module::Install)



From cweyl at fedoraproject.org  Sat Jan 10 18:46:55 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Sat, 10 Jan 2009 18:46:55 +0000 (UTC)
Subject: rpms/perl-MooseX-Params-Validate/F-10
	perl-MooseX-Params-Validate.spec, 1.6, 1.7 sources, 1.5, 1.6
Message-ID: <20090110184655.01DDB7012C@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-MooseX-Params-Validate/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1955

Modified Files:
	perl-MooseX-Params-Validate.spec sources 
Log Message:
* Sat Jan 10 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.07-2
- rebuild against new Moose



Index: perl-MooseX-Params-Validate.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-MooseX-Params-Validate/F-10/perl-MooseX-Params-Validate.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- perl-MooseX-Params-Validate.spec	9 Jul 2008 05:20:04 -0000	1.6
+++ perl-MooseX-Params-Validate.spec	10 Jan 2009 18:46:24 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           perl-MooseX-Params-Validate
-Version:        0.05
-Release:        1%{?dist}
+Version:        0.07
+Release:        2%{?dist}
 Summary:        Extension of Params::Validate using Moose's types
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -10,13 +10,14 @@
 BuildArch:      noarch
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
-BuildRequires:  perl(Module::Build)
-BuildRequires:  perl(Moose)            >= 0.33
-BuildRequires:  perl(Params::Validate) >= 0.88
+BuildRequires:  perl(ExtUtils::MakeMaker)
+BuildRequires:  perl(Moose)                 >= 0.58
+BuildRequires:  perl(Params::Validate)      >= 0.88
+BuildRequires:  perl(Scalar::Util)
 BuildRequires:  perl(Sub::Exporter)
 BuildRequires:  perl(Sub::Name)
-BuildRequires:  perl(Test::Exception)  >= 0.21
-BuildRequires:  perl(Test::More)       >= 0.62
+BuildRequires:  perl(Test::Exception)       >= 0.21
+BuildRequires:  perl(Test::More)            >= 0.62
 
 %description
 This module fills a gap in Moose by adding method parameter validation to
@@ -27,19 +28,20 @@
 %setup -q -n MooseX-Params-Validate-%{version}
 
 %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
-./Build test
+make test
 
 %clean
 rm -rf %{buildroot}
@@ -51,6 +53,14 @@
 %{_mandir}/man3/*
 
 %changelog
+* Sat Jan 10 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.07-2
+- rebuild against new Moose
+
+* Sat Nov 08 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.07-1
+- update to 0.07
+- change from Build.PL to Makefile.PL incantation (now using Module::Install)
+- update br's
+
 * Tue Jul 08 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.05-1
 - update to 0.05
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-MooseX-Params-Validate/F-10/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	9 Jul 2008 05:20:04 -0000	1.5
+++ sources	10 Jan 2009 18:46:24 -0000	1.6
@@ -1 +1 @@
-b885c631fef6c0402c65ed335a5b304a  MooseX-Params-Validate-0.05.tar.gz
+d4ee0b346bcafd84a5bf994e2fcee713  MooseX-Params-Validate-0.07.tar.gz



From cweyl at fedoraproject.org  Sat Jan 10 18:47:14 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Sat, 10 Jan 2009 18:47:14 +0000 (UTC)
Subject: rpms/perl-MooseX-Params-Validate/F-9
	perl-MooseX-Params-Validate.spec, 1.6, 1.7 sources, 1.5, 1.6
Message-ID: <20090110184714.4B57B7012C@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-MooseX-Params-Validate/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2098

Modified Files:
	perl-MooseX-Params-Validate.spec sources 
Log Message:
* Sat Jan 10 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.07-2
- rebuild against new Moose



Index: perl-MooseX-Params-Validate.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-MooseX-Params-Validate/F-9/perl-MooseX-Params-Validate.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- perl-MooseX-Params-Validate.spec	9 Jul 2008 05:23:43 -0000	1.6
+++ perl-MooseX-Params-Validate.spec	10 Jan 2009 18:46:44 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           perl-MooseX-Params-Validate
-Version:        0.05
-Release:        1%{?dist}
+Version:        0.07
+Release:        2%{?dist}
 Summary:        Extension of Params::Validate using Moose's types
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -10,13 +10,14 @@
 BuildArch:      noarch
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
-BuildRequires:  perl(Module::Build)
-BuildRequires:  perl(Moose)            >= 0.33
-BuildRequires:  perl(Params::Validate) >= 0.88
+BuildRequires:  perl(ExtUtils::MakeMaker)
+BuildRequires:  perl(Moose)                 >= 0.58
+BuildRequires:  perl(Params::Validate)      >= 0.88
+BuildRequires:  perl(Scalar::Util)
 BuildRequires:  perl(Sub::Exporter)
 BuildRequires:  perl(Sub::Name)
-BuildRequires:  perl(Test::Exception)  >= 0.21
-BuildRequires:  perl(Test::More)       >= 0.62
+BuildRequires:  perl(Test::Exception)       >= 0.21
+BuildRequires:  perl(Test::More)            >= 0.62
 
 %description
 This module fills a gap in Moose by adding method parameter validation to
@@ -27,19 +28,20 @@
 %setup -q -n MooseX-Params-Validate-%{version}
 
 %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
-./Build test
+make test
 
 %clean
 rm -rf %{buildroot}
@@ -51,6 +53,14 @@
 %{_mandir}/man3/*
 
 %changelog
+* Sat Jan 10 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.07-2
+- rebuild against new Moose
+
+* Sat Nov 08 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.07-1
+- update to 0.07
+- change from Build.PL to Makefile.PL incantation (now using Module::Install)
+- update br's
+
 * Tue Jul 08 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.05-1
 - update to 0.05
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-MooseX-Params-Validate/F-9/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	9 Jul 2008 05:23:43 -0000	1.5
+++ sources	10 Jan 2009 18:46:44 -0000	1.6
@@ -1 +1 @@
-b885c631fef6c0402c65ed335a5b304a  MooseX-Params-Validate-0.05.tar.gz
+d4ee0b346bcafd84a5bf994e2fcee713  MooseX-Params-Validate-0.07.tar.gz



From cweyl at fedoraproject.org  Sat Jan 10 18:49:51 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Sat, 10 Jan 2009 18:49:51 +0000 (UTC)
Subject: rpms/perl-Module-Versions-Report/F-9
	perl-Module-Versions-Report.spec, 1.7, 1.8 sources, 1.4, 1.5
Message-ID: <20090110184951.539DE7012C@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Module-Versions-Report/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2537

Modified Files:
	perl-Module-Versions-Report.spec sources 
Log Message:
* Mon Oct 27 2008 Chris Weyl <cweyl at alumni.drew.edu> 1.06-1
- update to 1.06



Index: perl-Module-Versions-Report.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Module-Versions-Report/F-9/perl-Module-Versions-Report.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- perl-Module-Versions-Report.spec	11 Aug 2008 07:39:10 -0000	1.7
+++ perl-Module-Versions-Report.spec	10 Jan 2009 18:49:20 -0000	1.8
@@ -1,5 +1,5 @@
 Name:           perl-Module-Versions-Report
-Version:        1.05
+Version:        1.06
 Release:        1%{?dist}
 Summary:        Report versions of all modules in memory
 
@@ -35,7 +35,7 @@
 make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
 find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';'
 find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null ';'
-chmod -R u+w $RPM_BUILD_ROOT/*
+%{_fixperms} $RPM_BUILD_ROOT/*
 
 
 %check
@@ -54,6 +54,9 @@
 
 
 %changelog
+* Mon Oct 27 2008 Chris Weyl <cweyl at alumni.drew.edu> 1.06-1
+- update to 1.06
+
 * Mon Aug 11 2008 Ralf Cors??pius <rc040203 at freenet.de> - 1.05-1
 - Upstream update (Required by rt-3.8.0).
 - Reflect Source0-URL having changed.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Module-Versions-Report/F-9/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	11 Aug 2008 07:39:10 -0000	1.4
+++ sources	10 Jan 2009 18:49:20 -0000	1.5
@@ -1 +1 @@
-1dba2684e91a46feab21bc9518366d22  Module-Versions-Report-1.05.tar.gz
+9c7efaa4c3dd8eecceb8e5d17476479b  Module-Versions-Report-1.06.tar.gz



From cweyl at fedoraproject.org  Sat Jan 10 19:02:10 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Sat, 10 Jan 2009 19:02:10 +0000 (UTC)
Subject: rpms/perl-Net-CUPS/devel .cvsignore, 1.4, 1.5 perl-Net-CUPS.spec,
	1.8, 1.9 sources, 1.4, 1.5
Message-ID: <20090110190210.325207012C@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Net-CUPS/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4263

Modified Files:
	.cvsignore perl-Net-CUPS.spec sources 
Log Message:
* Sat Jan 10 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.59-1
- update to 0.59
- drop some fixes that have been applied upstream (RHBZ#455190, RHBZ#455192,
  RT#35966)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Net-CUPS/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	13 Jul 2008 20:29:26 -0000	1.4
+++ .cvsignore	10 Jan 2009 19:01:39 -0000	1.5
@@ -1 +1,5 @@
-Net-CUPS-0.56.tar.gz
+Net-CUPS-0.59.tar.gz
+clog
+*.rpm
+*.gz
+Net-Cups-*


Index: perl-Net-CUPS.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Net-CUPS/devel/perl-Net-CUPS.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- perl-Net-CUPS.spec	13 Jul 2008 20:29:26 -0000	1.8
+++ perl-Net-CUPS.spec	10 Jan 2009 19:01:39 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           perl-Net-CUPS
-Version:        0.56
-Release:        2%{?dist}
+Version:        0.59
+Release:        1%{?dist}
 Summary:        Perl bindings to the CUPS C API Interface
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -11,34 +11,20 @@
 
 # non-perl
 BuildRequires:  cups-devel 
-# see BZ#455192
-BuildRequires:  zlib-devel 
 
 # perl
 BuildRequires:  perl(ExtUtils::MakeMaker)
 BuildRequires:  perl(Test::More)
 
-
-# keep from running tests which require admin privs under the Fedora setup
-Patch0:         dest_test.patch
-
 %description
 Net::CUPS is an interface to the Common Unix Printing System API.  If you feel
 an urge to control CUPS servers via perl, this is a good way to do it :)
 
 %prep
 %setup -q -n Net-CUPS-%{version}
-%patch0
 
 find . -type f -exec chmod -c -x {} +
 
-# until we get BZ#455190 resolved (one way or the other) 
-perl -pi -e 's|^#include <cups/i18n.h>|/*#include <cups/i18n.h>*/|' CUPS.xs
-
-# grr. see the long languishing RT#35966
-#   (http://rt.cpan.org/Public/Bug/Display.html?id=35966)
-perl -pi -e 's|IPP_|Net::CUPS::IPP_|' lib/Net/CUPS/Destination.pm
-
 %build
 %{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="%{optflags}"
 make %{?_smp_mflags}
@@ -71,6 +57,11 @@
 %{_mandir}/man3/*
 
 %changelog
+* Sat Jan 10 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.59-1
+- update to 0.59
+- drop some fixes that have been applied upstream (RHBZ#455190, RHBZ#455192,
+  RT#35966)
+
 * Sun Jul 13 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.56-2
 - and remove i18n.h from CUPS.xs.  See bz#455190
 - add zlib-devel as a BR.  See bz#455192
@@ -81,7 +72,7 @@
 - update to 0.56
 
 * Thu Mar 06 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.55-4
-Rebuild for new perl
+- Rebuild for new perl
 
 * Mon Feb 18 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.55-3
 - Autorebuild for GCC 4.3


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Net-CUPS/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	13 Jul 2008 20:29:26 -0000	1.4
+++ sources	10 Jan 2009 19:01:39 -0000	1.5
@@ -1 +1 @@
-ae0d60ca4544d551177f923c3d29da5c  Net-CUPS-0.56.tar.gz
+415619f4e5fac5f5dd8727b1321efd68  Net-CUPS-0.59.tar.gz



From epienbro at fedoraproject.org  Sat Jan 10 19:04:15 2009
From: epienbro at fedoraproject.org (Erik van Pienbroek)
Date: Sat, 10 Jan 2009 19:04:15 +0000 (UTC)
Subject: rpms/nntpgrab/F-10 .cvsignore, 1.17, 1.18 nntpgrab.spec, 1.26,
	1.27 sources, 1.19, 1.20
Message-ID: <20090110190416.0B5377012C@cvs1.fedora.phx.redhat.com>

Author: epienbro

Update of /cvs/pkgs/rpms/nntpgrab/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4214/F-10

Modified Files:
	.cvsignore nntpgrab.spec sources 
Log Message:
Update to version 0.4.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/nntpgrab/F-10/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- .cvsignore	29 Dec 2008 17:40:09 -0000	1.17
+++ .cvsignore	10 Jan 2009 19:03:45 -0000	1.18
@@ -1 +1 @@
-nntpgrab-0.4.1.tar.bz2
+nntpgrab-0.4.2.tar.bz2


Index: nntpgrab.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nntpgrab/F-10/nntpgrab.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- nntpgrab.spec	29 Dec 2008 17:40:09 -0000	1.26
+++ nntpgrab.spec	10 Jan 2009 19:03:45 -0000	1.27
@@ -1,6 +1,6 @@
 Summary: Download files from the usenet
 Name: nntpgrab
-Version: 0.4.1
+Version: 0.4.2
 Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/Internet
@@ -281,6 +281,9 @@
 %{_datadir}/nntpgrab/web
 
 %changelog
+* Sat Jan 10 2009 Erik van Pienbroek <info at nntpgrab.nl> - 0.4.2-1
+- Update to 0.4.2
+
 * Mon Dec 29 2008 Erik van Pienbroek <info at nntpgrab.nl> - 0.4.1-1
 - Update to 0.4.1
 - Fix a broken upgrade path


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nntpgrab/F-10/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources	29 Dec 2008 17:40:09 -0000	1.19
+++ sources	10 Jan 2009 19:03:45 -0000	1.20
@@ -1 +1 @@
-807abb6841b37d3adc1ab8c6c9c27afc  nntpgrab-0.4.1.tar.bz2
+ea4d0b6d0c5a7e4a5e4a1291b5eb3f1f  nntpgrab-0.4.2.tar.bz2



From epienbro at fedoraproject.org  Sat Jan 10 19:04:16 2009
From: epienbro at fedoraproject.org (Erik van Pienbroek)
Date: Sat, 10 Jan 2009 19:04:16 +0000 (UTC)
Subject: rpms/nntpgrab/F-9 .cvsignore, 1.16, 1.17 nntpgrab.spec, 1.25,
	1.26 sources, 1.20, 1.21
Message-ID: <20090110190416.2605A70141@cvs1.fedora.phx.redhat.com>

Author: epienbro

Update of /cvs/pkgs/rpms/nntpgrab/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4214/F-9

Modified Files:
	.cvsignore nntpgrab.spec sources 
Log Message:
Update to version 0.4.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/nntpgrab/F-9/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore	29 Dec 2008 17:40:09 -0000	1.16
+++ .cvsignore	10 Jan 2009 19:03:45 -0000	1.17
@@ -1 +1 @@
-nntpgrab-0.4.1.tar.bz2
+nntpgrab-0.4.2.tar.bz2


Index: nntpgrab.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nntpgrab/F-9/nntpgrab.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- nntpgrab.spec	29 Dec 2008 17:40:09 -0000	1.25
+++ nntpgrab.spec	10 Jan 2009 19:03:45 -0000	1.26
@@ -1,6 +1,6 @@
 Summary: Download files from the usenet
 Name: nntpgrab
-Version: 0.4.1
+Version: 0.4.2
 Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/Internet
@@ -281,6 +281,9 @@
 %{_datadir}/nntpgrab/web
 
 %changelog
+* Sat Jan 10 2009 Erik van Pienbroek <info at nntpgrab.nl> - 0.4.2-1
+- Update to 0.4.2
+
 * Mon Dec 29 2008 Erik van Pienbroek <info at nntpgrab.nl> - 0.4.1-1
 - Update to 0.4.1
 - Fix a broken upgrade path


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nntpgrab/F-9/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources	29 Dec 2008 17:40:09 -0000	1.20
+++ sources	10 Jan 2009 19:03:45 -0000	1.21
@@ -1 +1 @@
-807abb6841b37d3adc1ab8c6c9c27afc  nntpgrab-0.4.1.tar.bz2
+ea4d0b6d0c5a7e4a5e4a1291b5eb3f1f  nntpgrab-0.4.2.tar.bz2



From epienbro at fedoraproject.org  Sat Jan 10 19:04:16 2009
From: epienbro at fedoraproject.org (Erik van Pienbroek)
Date: Sat, 10 Jan 2009 19:04:16 +0000 (UTC)
Subject: rpms/nntpgrab/devel .cvsignore, 1.17, 1.18 nntpgrab.spec, 1.26,
	1.27 sources, 1.19, 1.20
Message-ID: <20090110190416.C0F417012C@cvs1.fedora.phx.redhat.com>

Author: epienbro

Update of /cvs/pkgs/rpms/nntpgrab/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4214/devel

Modified Files:
	.cvsignore nntpgrab.spec sources 
Log Message:
Update to version 0.4.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/nntpgrab/devel/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- .cvsignore	29 Dec 2008 17:40:09 -0000	1.17
+++ .cvsignore	10 Jan 2009 19:03:46 -0000	1.18
@@ -1 +1 @@
-nntpgrab-0.4.1.tar.bz2
+nntpgrab-0.4.2.tar.bz2


Index: nntpgrab.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nntpgrab/devel/nntpgrab.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- nntpgrab.spec	29 Dec 2008 17:40:09 -0000	1.26
+++ nntpgrab.spec	10 Jan 2009 19:03:46 -0000	1.27
@@ -1,6 +1,6 @@
 Summary: Download files from the usenet
 Name: nntpgrab
-Version: 0.4.1
+Version: 0.4.2
 Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/Internet
@@ -281,6 +281,9 @@
 %{_datadir}/nntpgrab/web
 
 %changelog
+* Sat Jan 10 2009 Erik van Pienbroek <info at nntpgrab.nl> - 0.4.2-1
+- Update to 0.4.2
+
 * Mon Dec 29 2008 Erik van Pienbroek <info at nntpgrab.nl> - 0.4.1-1
 - Update to 0.4.1
 - Fix a broken upgrade path


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nntpgrab/devel/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources	29 Dec 2008 17:40:09 -0000	1.19
+++ sources	10 Jan 2009 19:03:46 -0000	1.20
@@ -1 +1 @@
-807abb6841b37d3adc1ab8c6c9c27afc  nntpgrab-0.4.1.tar.bz2
+ea4d0b6d0c5a7e4a5e4a1291b5eb3f1f  nntpgrab-0.4.2.tar.bz2



From cweyl at fedoraproject.org  Sat Jan 10 19:09:41 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Sat, 10 Jan 2009 19:09:41 +0000 (UTC)
Subject: rpms/perl-MooseX-AttributeHelpers/F-10
	perl-MooseX-AttributeHelpers.spec, 1.8, 1.9 sources, 1.6, 1.7
Message-ID: <20090110190941.A82527012C@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-MooseX-AttributeHelpers/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6046

Modified Files:
	perl-MooseX-AttributeHelpers.spec sources 
Log Message:
* Sat Nov 08 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.14-1
- updating to 0.14
- POD tests are now explicitly for author/maintainers only; removing deps



Index: perl-MooseX-AttributeHelpers.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-MooseX-AttributeHelpers/F-10/perl-MooseX-AttributeHelpers.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- perl-MooseX-AttributeHelpers.spec	6 Sep 2008 23:26:49 -0000	1.8
+++ perl-MooseX-AttributeHelpers.spec	10 Jan 2009 19:09:10 -0000	1.9
@@ -1,5 +1,5 @@
 Name:           perl-MooseX-AttributeHelpers
-Version:        0.13
+Version:        0.14
 Release:        1%{?dist}
 Summary:        Extended Moose attribute interfaces
 License:        GPL+ or Artistic
@@ -14,10 +14,6 @@
 BuildRequires:  perl(Moose)           >= 0.56
 BuildRequires:  perl(Test::Exception) >= 0.21
 BuildRequires:  perl(Test::More)      >= 0.62
-# optional tests
-BuildRequires:  perl(Test::Pod)
-BuildRequires:  perl(Test::Pod::Coverage)
-
 
 %description
 While Moose attributes provide you with a way to name your accessors,
@@ -64,6 +60,10 @@
 %{_mandir}/man3/*
 
 %changelog
+* Sat Nov 08 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.14-1
+- updating to 0.14
+- POD tests are now explicitly for author/maintainers only; removing deps
+
 * 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: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-MooseX-AttributeHelpers/F-10/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	6 Sep 2008 23:26:49 -0000	1.6
+++ sources	10 Jan 2009 19:09:11 -0000	1.7
@@ -1 +1 @@
-9c19d0960987967ab2c398307e8b4a09  MooseX-AttributeHelpers-0.13.tar.gz
+6f8589c9f8b246bb6ebff245a274b62b  MooseX-AttributeHelpers-0.14.tar.gz



From cweyl at fedoraproject.org  Sat Jan 10 19:09:50 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Sat, 10 Jan 2009 19:09:50 +0000 (UTC)
Subject: rpms/perl-MooseX-AttributeHelpers/F-9
	perl-MooseX-AttributeHelpers.spec, 1.6, 1.7 sources, 1.5, 1.6
Message-ID: <20090110190950.99D6E7012C@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-MooseX-AttributeHelpers/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6103

Modified Files:
	perl-MooseX-AttributeHelpers.spec sources 
Log Message:
* Sat Nov 08 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.14-1
- updating to 0.14
- POD tests are now explicitly for author/maintainers only; removing deps



Index: perl-MooseX-AttributeHelpers.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-MooseX-AttributeHelpers/F-9/perl-MooseX-AttributeHelpers.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- perl-MooseX-AttributeHelpers.spec	9 Jul 2008 04:17:09 -0000	1.6
+++ perl-MooseX-AttributeHelpers.spec	10 Jan 2009 19:09:20 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           perl-MooseX-AttributeHelpers
-Version:        0.12
-Release:        2%{?dist}
+Version:        0.14
+Release:        1%{?dist}
 Summary:        Extended Moose attribute interfaces
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -11,13 +11,9 @@
 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
-BuildRequires:  perl(Test::Pod)
-BuildRequires:  perl(Test::Pod::Coverage)
-
 
 %description
 While Moose attributes provide you with a way to name your accessors,
@@ -64,6 +60,14 @@
 %{_mandir}/man3/*
 
 %changelog
+* Sat Nov 08 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.14-1
+- updating to 0.14
+- POD tests are now explicitly for author/maintainers only; removing deps
+
+* 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/F-9/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	9 Jul 2008 04:17:09 -0000	1.5
+++ sources	10 Jan 2009 19:09:20 -0000	1.6
@@ -1 +1 @@
-c9dafb95089f40957d6bc99839de107f  MooseX-AttributeHelpers-0.12.tar.gz
+6f8589c9f8b246bb6ebff245a274b62b  MooseX-AttributeHelpers-0.14.tar.gz



From cweyl at fedoraproject.org  Sat Jan 10 19:12:51 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Sat, 10 Jan 2009 19:12:51 +0000 (UTC)
Subject: rpms/perl-Net-CUPS/devel perl-Net-CUPS.spec,1.9,1.10
Message-ID: <20090110191251.0CAC37012C@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Net-CUPS/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6587

Modified Files:
	perl-Net-CUPS.spec 
Log Message:
* Sat Jan 10 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.59-2
- ...and finish cleaning up



Index: perl-Net-CUPS.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Net-CUPS/devel/perl-Net-CUPS.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- perl-Net-CUPS.spec	10 Jan 2009 19:01:39 -0000	1.9
+++ perl-Net-CUPS.spec	10 Jan 2009 19:12:20 -0000	1.10
@@ -41,9 +41,7 @@
 %{_fixperms} %{buildroot}/*
 
 %check
-%{?!_with_network_tests: mv t/03_destination.t . }
 make test
-%{?!_with_network_tests: mv 03_destination.t t/  }
 
 %clean
 rm -rf %{buildroot}
@@ -57,6 +55,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Sat Jan 10 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.59-2
+- ...and finish cleaning up
+
 * Sat Jan 10 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.59-1
 - update to 0.59
 - drop some fixes that have been applied upstream (RHBZ#455190, RHBZ#455192,



From dcantrel at fedoraproject.org  Sat Jan 10 19:14:35 2009
From: dcantrel at fedoraproject.org (David Cantrell)
Date: Sat, 10 Jan 2009 19:14:35 +0000 (UTC)
Subject: rpms/dhcp/devel dhcp.spec,1.235,1.236
Message-ID: <20090110191435.B429F7012C@cvs1.fedora.phx.redhat.com>

Author: dcantrel

Update of /cvs/pkgs/rpms/dhcp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6858

Modified Files:
	dhcp.spec 
Log Message:
* Sat Jan 10 2009 David Cantrell <dcantrell at redhat.com> - 12:4.1.0-2
- Make sure all /etc/dhcp config files are marked in the manifest
- Include new config file directies in the dhcp and dhclient packages
- Do not overwrite new config files if they already exist



Index: dhcp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dhcp/devel/dhcp.spec,v
retrieving revision 1.235
retrieving revision 1.236
diff -u -r1.235 -r1.236
--- dhcp.spec	10 Jan 2009 16:46:16 -0000	1.235
+++ dhcp.spec	10 Jan 2009 19:14:05 -0000	1.236
@@ -258,7 +258,7 @@
 
 # Remove files we don't want
 %{__rm} -f %{buildroot}%{_sysconfdir}/dhclient.conf
-%{__rm} -f %{buildroot}%{_sysconfdir}/dhcp/dhclient.conf
+%{__rm} -f %{buildroot}%{_sysconfdir}/dhcpd.conf
 
 # Install correct dhclient-script
 %{__mkdir} -p %{buildroot}/sbin
@@ -294,6 +294,7 @@
 %{__cp} -p server/dhcpd.conf dhcpd.conf.sample
 
 # Install default (empty) dhcpd.conf:
+%{__mkdir} -p %{buildroot}%{_sysconfdir}/dhcp
 %{__cat} << EOF > %{buildroot}%{_sysconfdir}/dhcp/dhcpd.conf
 #
 # DHCP Server Configuration file.



From cweyl at fedoraproject.org  Sat Jan 10 19:15:45 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Sat, 10 Jan 2009 19:15:45 +0000 (UTC)
Subject: rpms/perl-Net-CUPS/devel perl-Net-CUPS.spec,1.10,1.11
Message-ID: <20090110191545.D9E0B7012C@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Net-CUPS/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7008

Modified Files:
	perl-Net-CUPS.spec 
Log Message:
* Sat Jan 10 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.59-2
- ...and finish cleaning up



Index: perl-Net-CUPS.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Net-CUPS/devel/perl-Net-CUPS.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- perl-Net-CUPS.spec	10 Jan 2009 19:12:20 -0000	1.10
+++ perl-Net-CUPS.spec	10 Jan 2009 19:15:15 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           perl-Net-CUPS
 Version:        0.59
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Perl bindings to the CUPS C API Interface
 License:        GPL+ or Artistic
 Group:          Development/Libraries



From cweyl at fedoraproject.org  Sat Jan 10 19:18:43 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Sat, 10 Jan 2009 19:18:43 +0000 (UTC)
Subject: rpms/perl-List-Compare/F-9 perl-List-Compare.spec, 1.6, 1.7 sources,
	1.2, 1.3
Message-ID: <20090110191843.AAA107012C@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-List-Compare/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7533

Modified Files:
	perl-List-Compare.spec sources 
Log Message:
* Thu Oct 23 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.37-1
- update to 0.37



Index: perl-List-Compare.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-List-Compare/F-9/perl-List-Compare.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- perl-List-Compare.spec	4 Mar 2008 19:35:13 -0000	1.6
+++ perl-List-Compare.spec	10 Jan 2009 19:18:13 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           perl-List-Compare
-Version:        0.33 
-Release:        3%{?dist}
+Version:        0.37
+Release:        1%{?dist}
 Summary:        Compare elements of two or more lists
 
 Group:          Development/Libraries
@@ -54,6 +54,9 @@
 
 
 %changelog
+* Thu Oct 23 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.37-1
+- update to 0.37
+
 * Tue Mar 04 2008 Tom "spot" Callaway <tcallawa at redhat.com> 0.33-3
 - rebuild for new perl
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-List-Compare/F-9/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	30 Jun 2006 01:19:58 -0000	1.2
+++ sources	10 Jan 2009 19:18:13 -0000	1.3
@@ -1 +1 @@
-205677fa8e207afedbf800673a3c14de  List-Compare-0.33.tar.gz
+7c730dd58cc31a5bbb8eb7006edd1704  List-Compare-0.37.tar.gz



From cweyl at fedoraproject.org  Sat Jan 10 19:23:51 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Sat, 10 Jan 2009 19:23:51 +0000 (UTC)
Subject: rpms/perl-Net-CUPS/F-10 perl-Net-CUPS.spec,1.8,1.9 sources,1.4,1.5
Message-ID: <20090110192351.424F27012C@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Net-CUPS/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8198

Modified Files:
	perl-Net-CUPS.spec sources 
Log Message:
* Sat Jan 10 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.59-2
- ...and finish cleaning up



Index: perl-Net-CUPS.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Net-CUPS/F-10/perl-Net-CUPS.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- perl-Net-CUPS.spec	13 Jul 2008 20:29:26 -0000	1.8
+++ perl-Net-CUPS.spec	10 Jan 2009 19:23:20 -0000	1.9
@@ -1,5 +1,5 @@
 Name:           perl-Net-CUPS
-Version:        0.56
+Version:        0.59
 Release:        2%{?dist}
 Summary:        Perl bindings to the CUPS C API Interface
 License:        GPL+ or Artistic
@@ -11,34 +11,20 @@
 
 # non-perl
 BuildRequires:  cups-devel 
-# see BZ#455192
-BuildRequires:  zlib-devel 
 
 # perl
 BuildRequires:  perl(ExtUtils::MakeMaker)
 BuildRequires:  perl(Test::More)
 
-
-# keep from running tests which require admin privs under the Fedora setup
-Patch0:         dest_test.patch
-
 %description
 Net::CUPS is an interface to the Common Unix Printing System API.  If you feel
 an urge to control CUPS servers via perl, this is a good way to do it :)
 
 %prep
 %setup -q -n Net-CUPS-%{version}
-%patch0
 
 find . -type f -exec chmod -c -x {} +
 
-# until we get BZ#455190 resolved (one way or the other) 
-perl -pi -e 's|^#include <cups/i18n.h>|/*#include <cups/i18n.h>*/|' CUPS.xs
-
-# grr. see the long languishing RT#35966
-#   (http://rt.cpan.org/Public/Bug/Display.html?id=35966)
-perl -pi -e 's|IPP_|Net::CUPS::IPP_|' lib/Net/CUPS/Destination.pm
-
 %build
 %{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="%{optflags}"
 make %{?_smp_mflags}
@@ -55,9 +41,7 @@
 %{_fixperms} %{buildroot}/*
 
 %check
-%{?!_with_network_tests: mv t/03_destination.t . }
 make test
-%{?!_with_network_tests: mv 03_destination.t t/  }
 
 %clean
 rm -rf %{buildroot}
@@ -71,6 +55,14 @@
 %{_mandir}/man3/*
 
 %changelog
+* Sat Jan 10 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.59-2
+- ...and finish cleaning up
+
+* Sat Jan 10 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.59-1
+- update to 0.59
+- drop some fixes that have been applied upstream (RHBZ#455190, RHBZ#455192,
+  RT#35966)
+
 * Sun Jul 13 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.56-2
 - and remove i18n.h from CUPS.xs.  See bz#455190
 - add zlib-devel as a BR.  See bz#455192
@@ -81,7 +73,7 @@
 - update to 0.56
 
 * Thu Mar 06 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.55-4
-Rebuild for new perl
+- Rebuild for new perl
 
 * Mon Feb 18 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.55-3
 - Autorebuild for GCC 4.3


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Net-CUPS/F-10/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	13 Jul 2008 20:29:26 -0000	1.4
+++ sources	10 Jan 2009 19:23:20 -0000	1.5
@@ -1 +1 @@
-ae0d60ca4544d551177f923c3d29da5c  Net-CUPS-0.56.tar.gz
+415619f4e5fac5f5dd8727b1321efd68  Net-CUPS-0.59.tar.gz



From cweyl at fedoraproject.org  Sat Jan 10 19:24:09 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Sat, 10 Jan 2009 19:24:09 +0000 (UTC)
Subject: rpms/perl-Net-CUPS/F-9 perl-Net-CUPS.spec,1.7,1.8 sources,1.3,1.4
Message-ID: <20090110192409.9201B7012C@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Net-CUPS/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8267

Modified Files:
	perl-Net-CUPS.spec sources 
Log Message:
* Sat Jan 10 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.59-2
- ...and finish cleaning up



Index: perl-Net-CUPS.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Net-CUPS/F-9/perl-Net-CUPS.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- perl-Net-CUPS.spec	7 Mar 2008 02:11:02 -0000	1.7
+++ perl-Net-CUPS.spec	10 Jan 2009 19:23:39 -0000	1.8
@@ -1,16 +1,20 @@
 Name:           perl-Net-CUPS
-Version:        0.55
-Release:        4%{?dist}
+Version:        0.59
+Release:        2%{?dist}
 Summary:        Perl bindings to the CUPS C API Interface
 License:        GPL+ or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/Net-CUPS/
 Source0:        http://www.cpan.org/authors/id/D/DH/DHAGEMAN/Net-CUPS-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+
+# non-perl
+BuildRequires:  cups-devel 
+
+# perl
 BuildRequires:  perl(ExtUtils::MakeMaker)
 BuildRequires:  perl(Test::More)
-BuildRequires:  cups-devel 
-Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
 Net::CUPS is an interface to the Common Unix Printing System API.  If you feel
@@ -51,8 +55,25 @@
 %{_mandir}/man3/*
 
 %changelog
+* Sat Jan 10 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.59-2
+- ...and finish cleaning up
+
+* Sat Jan 10 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.59-1
+- update to 0.59
+- drop some fixes that have been applied upstream (RHBZ#455190, RHBZ#455192,
+  RT#35966)
+
+* Sun Jul 13 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.56-2
+- and remove i18n.h from CUPS.xs.  See bz#455190
+- add zlib-devel as a BR.  See bz#455192
+- patch t/03_destination.t to not test add/remove functionality -- this is an
+  admin action under Fedora, if memory serves
+
+* Sun Jul 13 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.56-1
+- update to 0.56
+
 * Thu Mar 06 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.55-4
-Rebuild for new perl
+- Rebuild for new perl
 
 * Mon Feb 18 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.55-3
 - Autorebuild for GCC 4.3


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Net-CUPS/F-9/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	4 Dec 2007 19:49:14 -0000	1.3
+++ sources	10 Jan 2009 19:23:39 -0000	1.4
@@ -1 +1 @@
-e2667d6d9b63befac5d38d7f0d4aadda  Net-CUPS-0.55.tar.gz
+415619f4e5fac5f5dd8727b1321efd68  Net-CUPS-0.59.tar.gz



From kyle at fedoraproject.org  Sat Jan 10 20:37:35 2009
From: kyle at fedoraproject.org (Kyle McMartin)
Date: Sat, 10 Jan 2009 20:37:35 +0000 (UTC)
Subject: rpms/btrfs-progs/devel .cvsignore, 1.3, 1.4 btrfs-progs.spec, 1.3, 
	1.4 sources, 1.3, 1.4
Message-ID: <20090110203736.0C3717012C@cvs1.fedora.phx.redhat.com>

Author: kyle

Update of /cvs/pkgs/rpms/btrfs-progs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18185

Modified Files:
	.cvsignore btrfs-progs.spec sources 
Log Message:
* Sat Jan 10 2009 Kyle McMartin <kyle at redhat.com> 0.16.git1-1
- Upstream git sync from -g72359e8 (needed for kernel...)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/btrfs-progs/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	10 Jan 2009 12:26:55 -0000	1.3
+++ .cvsignore	10 Jan 2009 20:37:03 -0000	1.4
@@ -1 +1 @@
-btrfs-progs-0.16.tar.bz2
+btrfs-progs-0.16.git1.tar.bz2


Index: btrfs-progs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/btrfs-progs/devel/btrfs-progs.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- btrfs-progs.spec	10 Jan 2009 12:28:49 -0000	1.3
+++ btrfs-progs.spec	10 Jan 2009 20:37:03 -0000	1.4
@@ -1,5 +1,5 @@
 Name:           btrfs-progs
-Version:        0.16
+Version:        0.16.git1
 Release:        1%{?dist}
 Summary:        Userspace programs for btrfs
 
@@ -9,7 +9,7 @@
 Source0:        http://www.kernel.org/pub/linux/kernel/people/mason/btrfs/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  e2fsprogs-devel
+BuildRequires:  e2fsprogs-devel, zlib-devel
 
 %define _root_sbindir /sbin
 
@@ -36,11 +36,16 @@
 %{_root_sbindir}/btrfsctl
 %{_root_sbindir}/btrfsck
 %{_root_sbindir}/mkfs.btrfs
-%{_root_sbindir}/debug-tree
+%{_root_sbindir}/btrfs-debug-tree
+%{_root_sbindir}/btrfs-image
 %{_root_sbindir}/btrfs-show
 %{_root_sbindir}/btrfs-vol
+%{_root_sbindir}/btrfstune
 
 %changelog
+* Sat Jan 10 2009 Kyle McMartin <kyle at redhat.com> 0.16.git1-1
+- Upstream git sync from -g72359e8 (needed for kernel...)
+
 * Sat Jan 10 2009 Marek Mahut <mmahut at fedoraproject.org> 0.16-1
 - Upstream release 0.16
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/btrfs-progs/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	10 Jan 2009 12:26:55 -0000	1.3
+++ sources	10 Jan 2009 20:37:03 -0000	1.4
@@ -1 +1 @@
-a22ce61c76c58fbf324832a65c1864f8  btrfs-progs-0.16.tar.bz2
+2da10995e9d41c4a8bbd9a50d00daa08  btrfs-progs-0.16.git1.tar.bz2



From scop at fedoraproject.org  Sat Jan 10 20:53:21 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Sat, 10 Jan 2009 20:53:21 +0000 (UTC)
Subject: rpms/vdr-skins/devel vdr-skins.spec,1.9,1.10
Message-ID: <20090110205321.66DC37012C@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/vdr-skins/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20637

Modified Files:
	vdr-skins.spec 
Log Message:
* Sat Jan 10 2009 Ville Skytt?? <ville.skytta at iki.fi> - 20081124-3
- Use full DejaVu fonts instead of LGC (#477478).



Index: vdr-skins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vdr-skins/devel/vdr-skins.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- vdr-skins.spec	25 Dec 2008 06:35:15 -0000	1.9
+++ vdr-skins.spec	10 Jan 2009 20:52:50 -0000	1.10
@@ -8,13 +8,13 @@
 %define vdr_group %(vdr-config --group     2>/dev/null || echo ERROR)
 %define vdr_user  %(vdr-config --user      2>/dev/null || echo ERROR)
 
-%define sansfont  %{_datadir}/fonts/dejavu/DejaVuLGCSans.ttf
-%define boldfont  %{_datadir}/fonts/dejavu/DejaVuLGCSans-Bold.ttf
-%define monofont  %{_datadir}/fonts/dejavu/DejaVuLGCSansMono.ttf
+%define sansfont  %{_datadir}/fonts/dejavu/DejaVuSans.ttf
+%define boldfont  %{_datadir}/fonts/dejavu/DejaVuSans-Bold.ttf
+%define monofont  %{_datadir}/fonts/dejavu/DejaVuSansMono.ttf
 
 Name:           vdr-skins
 Version:        20081124
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Collection of OSD skins for VDR
 
 Group:          Applications/Multimedia
@@ -51,12 +51,12 @@
 BuildArch:      noarch
 BuildRequires:  vdr-devel
 # Font build deps for checking filenames during build
-BuildRequires:  dejavu-fonts-lgc-sans
-BuildRequires:  dejavu-fonts-lgc-sans-mono
+BuildRequires:  dejavu-fonts-sans
+BuildRequires:  dejavu-fonts-sans-mono
 Requires:       vdr-text2skin >= 1.1
 Requires:       vdr >= 1.4.6-2
-Requires:       dejavu-fonts-lgc-sans
-Requires:       dejavu-fonts-lgc-sans-mono
+Requires:       dejavu-fonts-sans
+Requires:       dejavu-fonts-sans-mono
 
 %description
 This package contains a collection of skins for VDR's on-screen display.
@@ -211,6 +211,9 @@
 
 
 %changelog
+* Sat Jan 10 2009 Ville Skytt?? <ville.skytta at iki.fi> - 20081124-3
+- Use full DejaVu fonts instead of LGC (#477478).
+
 * Thu Dec 25 2008 Ville Skytt?? <ville.skytta at iki.fi> - 20081124-2
 - Use DejaVu fonts for Aluminium and Enigma (#477478).
 



From than at fedoraproject.org  Sat Jan 10 20:54:31 2009
From: than at fedoraproject.org (Than Ngo)
Date: Sat, 10 Jan 2009 20:54:31 +0000 (UTC)
Subject: rpms/kdelibs/devel kdelibs-4.1.96-cmake.patch, 1.1, 1.2 kdelibs.spec,
	1.412, 1.413
Message-ID: <20090110205431.7946D7012C@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdelibs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20793

Modified Files:
	kdelibs-4.1.96-cmake.patch kdelibs.spec 
Log Message:
kdeworkspace cmake files in correct place


kdelibs-4.1.96-cmake.patch:

Index: kdelibs-4.1.96-cmake.patch
===================================================================
RCS file: /cvs/extras/rpms/kdelibs/devel/kdelibs-4.1.96-cmake.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kdelibs-4.1.96-cmake.patch	8 Jan 2009 21:20:30 -0000	1.1
+++ kdelibs-4.1.96-cmake.patch	10 Jan 2009 20:54:00 -0000	1.2
@@ -17,3 +17,22 @@
  set(KdepimLibs_FIND_QUIETLY ${_KdepimLibs_FIND_QUIETLY})
  
  include(FindPackageHandleStandardArgs)
+diff -up kdelibs-4.1.96/cmake/modules/FindKDE4Workspace.cmake.orig kdelibs-4.1.96/cmake/modules/FindKDE4Workspace.cmake
+--- kdelibs-4.1.96/cmake/modules/FindKDE4Workspace.cmake.orig	2009-01-10 21:53:41.000000000 +0100
++++ kdelibs-4.1.96/cmake/modules/FindKDE4Workspace.cmake	2009-01-10 21:54:03.000000000 +0100
+@@ -62,8 +62,14 @@
+ # for details. Alex
+ 
+ 
++set(KDE4WORKSPACE_VERSION 4.2.0)
++set(_KdeWorkspaceConfig_INSTALL_DIR ${LIB_INSTALL_DIR}/KDE4Workspace-${KDE4WORKSPACE_VERSION}/cmake)
++if(KDE4_USE_COMMON_CMAKE_PACKAGE_CONFIG_DIR)
++   set(_KdeWorkspaceConfig_INSTALL_DIR ${LIB_INSTALL_DIR}/cmake/KDE4Workspace-${KDE4WORKSPACE_VERSION} )
++endif(KDE4_USE_COMMON_CMAKE_PACKAGE_CONFIG_DIR)
++
+ set(_KDE4Workspace_FIND_QUIETLY  ${KDE4Workspace_FIND_QUIETLY})
+-find_package(KDE4Workspace QUIET NO_MODULE PATHS ${KDE4_LIB_DIR}/KDE4Workspace/cmake )
++find_package(KDE4Workspace QUIET NO_MODULE PATHS ${_KdeWorkspaceConfig_INSTALL_DIR} )
+ set(KDE4Workspace_FIND_QUIETLY ${_KDE4Workspace_FIND_QUIETLY})
+ 
+ include(FindPackageHandleStandardArgs)


Index: kdelibs.spec
===================================================================
RCS file: /cvs/extras/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.412
retrieving revision 1.413
diff -u -r1.412 -r1.413
--- kdelibs.spec	9 Jan 2009 15:45:59 -0000	1.412
+++ kdelibs.spec	10 Jan 2009 20:54:00 -0000	1.413
@@ -1,6 +1,6 @@
 Summary: K Desktop Environment 4 - Libraries
 Version: 4.1.96
-Release: 4%{?dist}
+Release: 5%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs
@@ -365,6 +365,9 @@
 
 
 %changelog
+* Sat Jan 10 2009 Than Ngo <than at redhat.com> - 4.1.96-5
+- kdeworkspace cmake files in correct place
+
 * Fri Jan 09 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.1.96-4
 - bump min deps (cmake, kde-filesystem, phonon)
 - kde.(sh|csh): cleanup QT_PLUGIN_PATH handling



From than at fedoraproject.org  Sat Jan 10 21:04:50 2009
From: than at fedoraproject.org (Than Ngo)
Date: Sat, 10 Jan 2009 21:04:50 +0000 (UTC)
Subject: rpms/kdeplasma-addons/devel kdeplasma-addons.spec,1.20,1.21
Message-ID: <20090110210450.613187012C@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdeplasma-addons/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22374

Modified Files:
	kdeplasma-addons.spec 
Log Message:
fix file list



Index: kdeplasma-addons.spec
===================================================================
RCS file: /cvs/extras/rpms/kdeplasma-addons/devel/kdeplasma-addons.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- kdeplasma-addons.spec	7 Jan 2009 20:21:35 -0000	1.20
+++ kdeplasma-addons.spec	10 Jan 2009 21:04:19 -0000	1.21
@@ -91,6 +91,7 @@
 %{_kde4_appsdir}/bball/
 %{_kde4_appsdir}/desktoptheme/*
 %{_kde4_appsdir}/plasma/services/*
+%{_kde4_appsdir}/plasma-bluemarble/
 %{_kde4_appsdir}/rssnow/
 %{_kde4_datadir}/config/*
 %{_kde4_datadir}/kde4/services/*



From sgrubb at fedoraproject.org  Sat Jan 10 21:10:51 2009
From: sgrubb at fedoraproject.org (Steve Grubb)
Date: Sat, 10 Jan 2009 21:10:51 +0000 (UTC)
Subject: rpms/audit/devel .cvsignore, 1.99, 1.100 audit.spec, 1.198,
	1.199 sources, 1.123, 1.124 audit-1.7.11-session.patch, 1.1, NONE
Message-ID: <20090110211051.AF0357012C@cvs1.fedora.phx.redhat.com>

Author: sgrubb

Update of /cvs/pkgs/rpms/audit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23838

Modified Files:
	.cvsignore audit.spec sources 
Removed Files:
	audit-1.7.11-session.patch 
Log Message:
* Sat Jan 10 2009 Steve Grubb <sgrubb at redhat.com> 1.7.11-1
- New upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/audit/devel/.cvsignore,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -r1.99 -r1.100
--- .cvsignore	13 Dec 2008 13:52:26 -0000	1.99
+++ .cvsignore	10 Jan 2009 21:10:20 -0000	1.100
@@ -96,3 +96,4 @@
 audit-1.7.8.tar.gz
 audit-1.7.9.tar.gz
 audit-1.7.10.tar.gz
+audit-1.7.11.tar.gz


Index: audit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/audit/devel/audit.spec,v
retrieving revision 1.198
retrieving revision 1.199
diff -u -r1.198 -r1.199
--- audit.spec	17 Dec 2008 15:06:51 -0000	1.198
+++ audit.spec	10 Jan 2009 21:10:21 -0000	1.199
@@ -1,7 +1,7 @@
-%define audit_version 1.7.10
-%define audit_release 2%{?dist}
+%define audit_version 1.7.11
+%define audit_release 1%{?dist}
 %define sca_version 0.4.8
-%define sca_release 13
+%define sca_release 14
 %{!?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
@@ -12,7 +12,6 @@
 Group: System Environment/Daemons
 URL: http://people.redhat.com/sgrubb/audit/
 Source0: http://people.redhat.com/sgrubb/audit/%{name}-%{version}.tar.gz
-Patch1: audit-1.7.11-session.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: gettext-devel intltool libtool swig python-devel
 BuildRequires: tcp_wrappers-devel 
@@ -90,7 +89,6 @@
 
 %prep
 %setup -q
-%patch1 -p2
 
 %build
 %configure --sbindir=/sbin --libdir=/%{_lib} --with-prelude --with-libwrap --enable-gssapi-krb5=no
@@ -261,6 +259,9 @@
 %config(noreplace) %{_sysconfdir}/security/console.apps/system-config-audit-server
 
 %changelog
+* Sat Jan 10 2009 Steve Grubb <sgrubb at redhat.com> 1.7.11-1
+- New upstream release
+
 * Wed Dec 17 2008 Steve Grubb <sgrubb at redhat.com> 1.7.10-2
 - Fix bz 476798 -  "auditd -n" does not work
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/audit/devel/sources,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -r1.123 -r1.124
--- sources	13 Dec 2008 13:52:26 -0000	1.123
+++ sources	10 Jan 2009 21:10:21 -0000	1.124
@@ -1 +1 @@
-ba44e750b19e6db075d5071b039e6147  audit-1.7.10.tar.gz
+63c7f935e390d874142ed6095f699958  audit-1.7.11.tar.gz


--- audit-1.7.11-session.patch DELETED ---



From sgrubb at fedoraproject.org  Sat Jan 10 21:26:12 2009
From: sgrubb at fedoraproject.org (Steve Grubb)
Date: Sat, 10 Jan 2009 21:26:12 +0000 (UTC)
Subject: rpms/audit/F-10 audit.spec,1.198,1.199 sources,1.123,1.124
Message-ID: <20090110212612.25D5D7012C@cvs1.fedora.phx.redhat.com>

Author: sgrubb

Update of /cvs/pkgs/rpms/audit/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25621

Modified Files:
	audit.spec sources 
Log Message:
* Sat Jan 10 2009 Steve Grubb <sgrubb at redhat.com> 1.7.11-1
- New upstream release



Index: audit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/audit/F-10/audit.spec,v
retrieving revision 1.198
retrieving revision 1.199
diff -u -r1.198 -r1.199
--- audit.spec	17 Dec 2008 14:30:43 -0000	1.198
+++ audit.spec	10 Jan 2009 21:25:41 -0000	1.199
@@ -1,7 +1,7 @@
-%define audit_version 1.7.10
-%define audit_release 2%{?dist}
+%define audit_version 1.7.11
+%define audit_release 1%{?dist}
 %define sca_version 0.4.8
-%define sca_release 13
+%define sca_release 14
 %{!?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
@@ -12,7 +12,6 @@
 Group: System Environment/Daemons
 URL: http://people.redhat.com/sgrubb/audit/
 Source0: http://people.redhat.com/sgrubb/audit/%{name}-%{version}.tar.gz
-Patch1: audit-1.7.11-session.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: gettext-devel intltool libtool swig python-devel
 BuildRequires: tcp_wrappers-devel 
@@ -90,7 +89,6 @@
 
 %prep
 %setup -q
-%patch1 -p2
 
 %build
 %configure --sbindir=/sbin --libdir=/%{_lib} --with-prelude --with-libwrap --enable-gssapi-krb5=no
@@ -261,6 +259,9 @@
 %config(noreplace) %{_sysconfdir}/security/console.apps/system-config-audit-server
 
 %changelog
+* Sat Jan 10 2009 Steve Grubb <sgrubb at redhat.com> 1.7.11-1
+- New upstream release
+
 * Wed Dec 17 2008 Steve Grubb <sgrubb at redhat.com> 1.7.10-2
 - Fix bz 476798 -  "auditd -n" does not work
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/audit/F-10/sources,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -r1.123 -r1.124
--- sources	13 Dec 2008 14:10:18 -0000	1.123
+++ sources	10 Jan 2009 21:25:41 -0000	1.124
@@ -1 +1 @@
-ba44e750b19e6db075d5071b039e6147  audit-1.7.10.tar.gz
+63c7f935e390d874142ed6095f699958  audit-1.7.11.tar.gz



From than at fedoraproject.org  Sat Jan 10 21:26:33 2009
From: than at fedoraproject.org (Than Ngo)
Date: Sat, 10 Jan 2009 21:26:33 +0000 (UTC)
Subject: rpms/kde-l10n/devel kde-l10n.spec,1.57,1.58
Message-ID: <20090110212633.6C8CB7012C@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kde-l10n/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25666

Modified Files:
	kde-l10n.spec 
Log Message:
remove debug



Index: kde-l10n.spec
===================================================================
RCS file: /cvs/extras/rpms/kde-l10n/devel/kde-l10n.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- kde-l10n.spec	9 Jan 2009 22:14:16 -0000	1.57
+++ kde-l10n.spec	10 Jan 2009 21:26:03 -0000	1.58
@@ -2,7 +2,7 @@
 
 Name: kde-l10n
 Version: 4.1.96
-Release: 1%{dist}
+Release: 2%{dist}
 Url: http://www.kde.org
 Summary: Internationalization support for KDE
 Group: User Interface/Desktops
@@ -758,9 +758,7 @@
 %setup -q -n %{name}-%{version} -c
 
 for i in $(cat %{SOURCE1000}) ; do
-  ls -l  %{_sourcedir}/%{name}-$i-%{version}.tar.bz2
   bzip2 -dc %{_sourcedir}/%{name}-$i-%{version}.tar.bz2 | tar -xf -
-  #tar jxf %{_sourcedir}/%{name}-$i-%{version}.tar.bz2
 done
 
 %build
@@ -1312,6 +1310,9 @@
 %lang(zh_TW) %{_kde4_docdir}/HTML/zh_TW
 
 %changelog
+* Sat Jan 10 2009 Than Ngo <than at redhat.com> - 4.1.96-2
+- remove debug
+
 * Wed Jan 07 2009 Than Ngo <than at redhat.com> - 4.1.96-1
 - 4.2rc1
 



From sgrubb at fedoraproject.org  Sat Jan 10 21:26:56 2009
From: sgrubb at fedoraproject.org (Steve Grubb)
Date: Sat, 10 Jan 2009 21:26:56 +0000 (UTC)
Subject: rpms/audit/F-10 audit-1.7.11-session.patch,1.1,NONE
Message-ID: <20090110212656.AC9347012C@cvs1.fedora.phx.redhat.com>

Author: sgrubb

Update of /cvs/pkgs/rpms/audit/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25890

Removed Files:
	audit-1.7.11-session.patch 
Log Message:
* Sat Jan 10 2009 Steve Grubb <sgrubb at redhat.com> 1.7.11-1
- New upstream release



--- audit-1.7.11-session.patch DELETED ---



From sadmac at fedoraproject.org  Sat Jan 10 21:35:22 2009
From: sadmac at fedoraproject.org (Casey Dahlin)
Date: Sat, 10 Jan 2009 21:35:22 +0000 (UTC)
Subject: rpms/upstart/F-10 .cvsignore, 1.6, 1.7 sources, 1.7,
	1.8 upstart.spec, 1.26, 1.27
Message-ID: <20090110213522.8E60E7012C@cvs1.fedora.phx.redhat.com>

Author: sadmac

Update of /cvs/pkgs/rpms/upstart/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26762

Modified Files:
	.cvsignore sources upstart.spec 
Log Message:
revert the 0.5.0 changes. Get back to where we once belonged.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/upstart/F-10/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	12 Aug 2008 18:57:16 -0000	1.6
+++ .cvsignore	10 Jan 2009 21:34:52 -0000	1.7
@@ -1 +1 @@
-upstart-0.5.0.tar.bz2
+upstart-0.3.9.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/upstart/F-10/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	12 Aug 2008 18:57:16 -0000	1.7
+++ sources	10 Jan 2009 21:34:52 -0000	1.8
@@ -1 +1 @@
-c040227c746d22f87c0cd20cd1ca865b  upstart-0.5.0.tar.bz2
+794208083d405ece123ad59a02f3e233  upstart-0.3.9.tar.bz2


Index: upstart.spec
===================================================================
RCS file: /cvs/pkgs/rpms/upstart/F-10/upstart.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- upstart.spec	12 Aug 2008 18:57:16 -0000	1.26
+++ upstart.spec	10 Jan 2009 21:34:52 -0000	1.27
@@ -1,26 +1,23 @@
-#%define build_str 20080730bzr_dbus_userspace_1046
-%define build_str 0
-%if %build_str
-%define build_rel 0.%{build_str}_
-%define build_pkg -%{build_str}
-%else
-%define build_rel %{nil}
-%define build_pkg %{nil}
-%endif
-
 Name:           upstart
-Version:        0.5.0
-Release:        %{build_rel}1%{?dist}
+Version:        0.3.9
+Release:        19%{?dist}
 Summary:        An event-driven init system
+
 Group:          System Environment/Base
 License:        GPLv2+
 URL:            http://upstart.ubuntu.com
-Source0:        http://upstart.ubuntu.com/download/0.3/upstart-%{version}%{build_pkg}.tar.bz2
-Source1:        events.5
+Source0:        http://upstart.ubuntu.com/download/0.3/upstart-%{version}.tar.bz2
+Source1:	events.5
+Patch0:         upstart-gcc43.patch
+Patch1:         upstart-force-on-shutdown-reboot.patch
+Patch2:         upstart-tty-stack.patch
+Patch3:         upstart-rpm.patch
+Patch4:         upstart-fedora-buglist.patch
+Patch5:         upstart-telinit-u.patch
+Patch6:	        upstart-initctl-man.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Obsoletes: SysVinit < 2.86-24, sysvinit < 2.86-24
 Provides: SysVinit = 2.86-24, sysvinit = 2.86-24
-Requires: dbus >= 1.2.1-4
 BuildRequires:  gettext
 
 %description
@@ -28,11 +25,15 @@
 handles starting of tasks and services during boot, stopping them
 during shutdown and supervising them while the system is running.
 
-%post
-kill -TERM 1
-
 %prep
-%setup -q -n upstart-%{version}%{build_pkg}
+%setup -q
+%patch0 -p1
+%patch1 -p1
+%patch2
+%patch3
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
 
 %build
 %configure --enable-compat=sysv --sbindir=/sbin --libdir=/%{_lib}
@@ -42,11 +43,20 @@
 rm -rf %{buildroot}
 make install DESTDIR=%{buildroot}
 
-mkdir -p %{buildroot}/%{_sysconfdir}/init/jobs.d/
-
 mkdir -p %{buildroot}/%{_mandir}/man5
 install -m 644 %{SOURCE1} %{buildroot}/%{_mandir}/man5/events.5
 
+# libupstart and libnih aren't shipped
+rm -f %{buildroot}/%{_lib}/libupstart.*
+rm -f %{buildroot}/%{_lib}/libnih.*
+rm -f %{buildroot}/%{_includedir}/libnih.h
+rm -f %{buildroot}/%{_includedir}/libupstart.h
+rm -rf %{buildroot}/%{_includedir}/nih
+rm -rf %{buildroot}/%{_includedir}/upstart
+rm -rf %{buildroot}/%{_datadir}/aclocal/compiler.m4
+rm -rf %{buildroot}/%{_datadir}/aclocal/linker.m4
+rm -rf %{buildroot}/%{_datadir}/aclocal/misc.m4
+
 %find_lang %{name}
 
 %clean
@@ -60,11 +70,12 @@
 %doc README
 %doc TODO
 %doc HACKING
-%{_sysconfdir}/init/
-%{_sysconfdir}/dbus-1/system.d/Upstart.conf
+%{_sysconfdir}/event.d/
+%config(noreplace) %{_sysconfdir}/event.d/logd
 /sbin/halt
 /sbin/init
 /sbin/initctl
+/sbin/logd
 /sbin/poweroff
 /sbin/reboot
 /sbin/runlevel
@@ -77,6 +88,7 @@
 %{_mandir}/man8/halt.8.gz
 %{_mandir}/man8/init.8.gz
 %{_mandir}/man8/initctl.8.gz
+%{_mandir}/man8/logd.8.gz
 %{_mandir}/man8/poweroff.8.gz
 %{_mandir}/man8/reboot.8.gz
 %{_mandir}/man8/runlevel.8.gz
@@ -87,41 +99,6 @@
 %{_mandir}/man8/telinit.8.gz
 
 %changelog
-* Tue Aug 12 2008 Casey Dahlin <cdahlin at redhat.com - 0.5.0
-- New upstream release
-
-* Thu Jul 31 2008 Casey Dahlin <cdahlin at redhat.com - 0.5.0-20080730bzr_dbus_userspace_1046_2
-- Rebase to upstream
-- To retrieve source:
-    bzr clone lp:upstart/0.5 -r 1046
-    bzr branch lp:~cjdahlin/libnih/event-loop-async-fix -r 596
-
-* Wed Jul 23 2008 Casey Dahlin <cdahlin at redhat.com - 0.5.0-20080723bzr_dbus_userspace_1045_1
-- More reflective tarball name
-- Retrieve source with `bzr clone lp:~cjdahlin/upstart/trunk -r 1045`
-
-* Tue Jul 22 2008 Casey Dahlin <cdahlin at redhat.com - 0.5.0-0.0.7
-- Fix bug in environment substitution
-
-* Tue Jul 22 2008 Casey Dahlin <cdahlin at redhat.com - 0.5.0-0.0.6
-- Fix reboot issue
-
-* Mon Jul 21 2008 Casey Dahlin <cdahlin at redhat.com - 0.5.0-0.0.5
-- Propagate runlevel calculation glitch fix to /sbin/shutdown
-
-* Fri Jul 18 2008 Casey Dahlin <cdahlin at redhat.com - 0.5.0-0.0.4
-- Fix runlevel calculation glitch
-- Remove some loose comments from spec
-
-* Wed Jul 16 2008 Casey Dahlin <cdahlin at redhat.com - 0.5.0-0.0.3
-- Bump dbus timeout to INT_MAX
-
-* Wed Jul 16 2008 Casey Dahlin <cdahlin at redhat.com - 0.5.0-0.0.2
-- Fix mishandling of multiline scripts
-
-* Wed Jul 16 2008 Casey Dahlin <cdahlin at redhat.com - 0.5.0-0.0.1
-- Upstream to lp:upstart/dbus-userspace
-
 * Fri Apr 25 2008 Bill Nottingham <notting at redhat.com> - 0.3.9-19
 - with the merge of event-compat-sysv, move the sysvinit obsoletes/provides here
 



From alexlan at fedoraproject.org  Sat Jan 10 21:36:37 2009
From: alexlan at fedoraproject.org (Alex Lancaster)
Date: Sat, 10 Jan 2009 21:36:37 +0000 (UTC)
Subject: rpms/libopensync/devel libopensync-python26.patch, NONE,
	1.1 libopensync.spec, 1.26, 1.27
Message-ID: <20090110213637.A30307012C@cvs1.fedora.phx.redhat.com>

Author: alexlan

Update of /cvs/pkgs/rpms/libopensync/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27085

Modified Files:
	libopensync.spec 
Added Files:
	libopensync-python26.patch 
Log Message:
* Sat Jan 10 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 0.36-6
- Add patch from upstream changeset for Python 2.6
  (http://www.opensync.org/changeset/4383) to fix broken deps in
  rawhide.


libopensync-python26.patch:

--- NEW FILE libopensync-python26.patch ---
Index: /branches/3rd-party-cmake-modules/modules/FindPythonLibs.cmake
===================================================================
--- /branches/3rd-party-cmake-modules/modules/FindPythonLibs.cmake (revision 2767)
+++ /branches/3rd-party-cmake-modules/modules/FindPythonLibs.cmake (revision 4383)
@@ -18,6 +18,8 @@
 IF(WIN32)
   FIND_LIBRARY(PYTHON_DEBUG_LIBRARY
-    NAMES python25_d python24_d python23_d python22_d python21_d python20_d python
+    NAMES python26_d python25_d python24_d python23_d python22_d python21_d python20_d python
     PATHS
+    [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.6\\InstallPath]/libs/Debug
+    [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.6\\InstallPath]/libs
     [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.5\\InstallPath]/libs/Debug
     [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.5\\InstallPath]/libs
@@ -40,5 +42,6 @@
 
 FIND_LIBRARY(PYTHON_LIBRARY ${PREFERRED_PYTHON_VERSION}
-  NAMES python25 python2.5
+  NAMES python26 python2.6
+        python25 python2.5
         python24 python2.4
         python23 python2.3
@@ -50,4 +53,5 @@
 
   PATHS
+    [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.6\\InstallPath]/libs
     [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.5\\InstallPath]/libs
     [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.4\\InstallPath]/libs
@@ -60,4 +64,5 @@
 
   PATH_SUFFIXES
+    python2.6/config
     python2.5/config
     python2.4/config
@@ -78,5 +83,5 @@
 IF(Python_FRAMEWORKS)
   IF(NOT PYTHON_INCLUDE_PATH)
-    FOREACH(version 2.5 2.4 2.3 2.2 2.1 2.0 1.6 1.5)
+    FOREACH(version 2.6 2.5 2.4 2.3 2.2 2.1 2.0 1.6 1.5)
       FOREACH(dir ${Python_FRAMEWORKS})
         SET(PYTHON_FRAMEWORK_INCLUDES ${PYTHON_FRAMEWORK_INCLUDES}
@@ -92,4 +97,5 @@
   PATHS
     ${PYTHON_FRAMEWORK_INCLUDES}
+    [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.6\\InstallPath]/include
     [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.5\\InstallPath]/include
     [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.4\\InstallPath]/include
@@ -103,4 +109,5 @@
   PATH_SUFFIXES
     ${PREFERRED_PYTHON_VERSION}
+    python2.6
     python2.5
     python2.4


Index: libopensync.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libopensync/devel/libopensync.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- libopensync.spec	9 Jan 2009 20:20:05 -0000	1.26
+++ libopensync.spec	10 Jan 2009 21:36:07 -0000	1.27
@@ -1,13 +1,14 @@
 %{!?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:        5%{?dist}
+Release:        6%{?dist}
 Summary:        A synchronization framework
 
 Group:          System Environment/Libraries
 License:        LGPLv2+
 URL:            http://www.opensync.org/
 Source0:        http://www.opensync.org/download/releases/%{version}/%{name}-%{version}.tar.bz2
+Patch0:         %{name}-python26.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  glib2-devel
@@ -40,6 +41,8 @@
 
 %prep
 %setup -q
+cd cmake 
+%patch0 -p3
 
 %build
 mkdir build
@@ -91,10 +94,13 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Sat Jan 10 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 0.36-6
+- Add patch from upstream changeset for Python 2.6
+  (http://www.opensync.org/changeset/4383)
+
 * Fri Jan 09 2009 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> - 0.36-5
 - fix swig version
 
-
 * Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 0.36-4
 - Rebuild for Python 2.6
 



From sadmac at fedoraproject.org  Sat Jan 10 21:46:21 2009
From: sadmac at fedoraproject.org (Casey Dahlin)
Date: Sat, 10 Jan 2009 21:46:21 +0000 (UTC)
Subject: rpms/upstart/F-10 upstart.spec,1.27,1.28
Message-ID: <20090110214621.92B767012C@cvs1.fedora.phx.redhat.com>

Author: sadmac

Update of /cvs/pkgs/rpms/upstart/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29110/F-10

Modified Files:
	upstart.spec 
Log Message:
Remove telinit u support since its broken



Index: upstart.spec
===================================================================
RCS file: /cvs/pkgs/rpms/upstart/F-10/upstart.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- upstart.spec	10 Jan 2009 21:34:52 -0000	1.27
+++ upstart.spec	10 Jan 2009 21:45:51 -0000	1.28
@@ -13,7 +13,7 @@
 Patch2:         upstart-tty-stack.patch
 Patch3:         upstart-rpm.patch
 Patch4:         upstart-fedora-buglist.patch
-Patch5:         upstart-telinit-u.patch
+#Patch5:         upstart-telinit-u.patch
 Patch6:	        upstart-initctl-man.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Obsoletes: SysVinit < 2.86-24, sysvinit < 2.86-24
@@ -32,7 +32,7 @@
 %patch2
 %patch3
 %patch4 -p1
-%patch5 -p1
+#%patch5 -p1
 %patch6 -p1
 
 %build



From sadmac at fedoraproject.org  Sat Jan 10 21:46:21 2009
From: sadmac at fedoraproject.org (Casey Dahlin)
Date: Sat, 10 Jan 2009 21:46:21 +0000 (UTC)
Subject: rpms/upstart/F-9 upstart.spec,1.20,1.21
Message-ID: <20090110214621.C0FAF7012C@cvs1.fedora.phx.redhat.com>

Author: sadmac

Update of /cvs/pkgs/rpms/upstart/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29110/F-9

Modified Files:
	upstart.spec 
Log Message:
Remove telinit u support since its broken



Index: upstart.spec
===================================================================
RCS file: /cvs/pkgs/rpms/upstart/F-9/upstart.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- upstart.spec	25 Apr 2008 21:22:21 -0000	1.20
+++ upstart.spec	10 Jan 2009 21:45:51 -0000	1.21
@@ -13,7 +13,7 @@
 Patch2:         upstart-tty-stack.patch
 Patch3:         upstart-rpm.patch
 Patch4:         upstart-fedora-buglist.patch
-Patch5:         upstart-telinit-u.patch
+#Patch5:         upstart-telinit-u.patch
 Patch6:	        upstart-initctl-man.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Obsoletes: SysVinit < 2.86-24, sysvinit < 2.86-24
@@ -32,7 +32,7 @@
 %patch2
 %patch3
 %patch4 -p1
-%patch5 -p1
+#%patch5 -p1
 %patch6 -p1
 
 %build



From sadmac at fedoraproject.org  Sat Jan 10 21:48:51 2009
From: sadmac at fedoraproject.org (Casey Dahlin)
Date: Sat, 10 Jan 2009 21:48:51 +0000 (UTC)
Subject: rpms/upstart/F-10 upstart.spec,1.28,1.29
Message-ID: <20090110214851.CE64D7012C@cvs1.fedora.phx.redhat.com>

Author: sadmac

Update of /cvs/pkgs/rpms/upstart/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29553/F-10

Modified Files:
	upstart.spec 
Log Message:
Rev bumps for previous change



Index: upstart.spec
===================================================================
RCS file: /cvs/pkgs/rpms/upstart/F-10/upstart.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- upstart.spec	10 Jan 2009 21:45:51 -0000	1.28
+++ upstart.spec	10 Jan 2009 21:48:21 -0000	1.29
@@ -1,6 +1,6 @@
 Name:           upstart
 Version:        0.3.9
-Release:        19%{?dist}
+Release:        20%{?dist}
 Summary:        An event-driven init system
 
 Group:          System Environment/Base



From sadmac at fedoraproject.org  Sat Jan 10 21:48:52 2009
From: sadmac at fedoraproject.org (Casey Dahlin)
Date: Sat, 10 Jan 2009 21:48:52 +0000 (UTC)
Subject: rpms/upstart/F-9 upstart.spec,1.21,1.22
Message-ID: <20090110214852.17EFD7012C@cvs1.fedora.phx.redhat.com>

Author: sadmac

Update of /cvs/pkgs/rpms/upstart/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29553/F-9

Modified Files:
	upstart.spec 
Log Message:
Rev bumps for previous change



Index: upstart.spec
===================================================================
RCS file: /cvs/pkgs/rpms/upstart/F-9/upstart.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- upstart.spec	10 Jan 2009 21:45:51 -0000	1.21
+++ upstart.spec	10 Jan 2009 21:48:21 -0000	1.22
@@ -1,6 +1,6 @@
 Name:           upstart
 Version:        0.3.9
-Release:        19%{?dist}
+Release:        20%{?dist}
 Summary:        An event-driven init system
 
 Group:          System Environment/Base



From jwrdegoede at fedoraproject.org  Sat Jan 10 21:51:30 2009
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Sat, 10 Jan 2009 21:51:30 +0000 (UTC)
Subject: rpms/ogre/devel ogre.spec,1.40,1.41
Message-ID: <20090110215130.67F5C7012C@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/ogre/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29898

Modified Files:
	ogre.spec 
Log Message:
* Sat Jan 10 2008 Hans de Goede <hdegoede at redhat.com> 1.6.0-4
- use regular (full) instead of lgc dejavu fonts for the demos (rh 477434)



Index: ogre.spec
===================================================================
RCS file: /cvs/extras/rpms/ogre/devel/ogre.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- ogre.spec	27 Dec 2008 14:35:53 -0000	1.40
+++ ogre.spec	10 Jan 2009 21:50:58 -0000	1.41
@@ -1,6 +1,6 @@
 Name:           ogre
 Version:        1.6.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Object-Oriented Graphics Rendering Engine
 # CC-BY-SA is for devel docs
 License:        LGPLv2+ and CC-BY-SA
@@ -59,7 +59,7 @@
 %package samples
 Summary:        Ogre samples executables and media
 Group:          Development/Libraries
-Requires:       %{name} = %{version}-%{release}, dejavu-fonts-lgc-sans
+Requires:       %{name} = %{version}-%{release}, dejavu-fonts-sans
 
 %description samples
 This package contains the compiled (not the source) sample applications coming
@@ -153,13 +153,13 @@
 
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/OGRE/Samples
 cp -a Samples/Media $RPM_BUILD_ROOT%{_datadir}/OGRE/Samples
-ln -s ../../../../fonts/dejavu/DejaVuLGCSans-Bold.ttf \
+ln -s ../../../../fonts/dejavu/DejaVuSans-Bold.ttf \
   $RPM_BUILD_ROOT%{_datadir}/OGRE/Samples/Media/fonts/bluebold.ttf
-ln -s ../../../../fonts/dejavu/DejaVuLGCSans.ttf \
+ln -s ../../../../fonts/dejavu/DejaVuSans.ttf \
   $RPM_BUILD_ROOT%{_datadir}/OGRE/Samples/Media/fonts/bluehigh.ttf
-ln -s ../../../../fonts/dejavu/DejaVuLGCSansCondensed.ttf \
+ln -s ../../../../fonts/dejavu/DejaVuSansCondensed.ttf \
   $RPM_BUILD_ROOT%{_datadir}/OGRE/Samples/Media/fonts/bluecond.ttf
-ln -s ../../../../fonts/dejavu/DejaVuLGCSans.ttf \
+ln -s ../../../../fonts/dejavu/DejaVuSans.ttf \
   $RPM_BUILD_ROOT%{_datadir}/OGRE/Samples/Media/fonts/solo5.ttf       
 
 
@@ -206,6 +206,9 @@
 
 
 %changelog
+* Sat Jan 10 2008 Hans de Goede <hdegoede at redhat.com> 1.6.0-4
+- use regular (full) instead of lgc dejavu fonts for the demos (rh 477434)
+
 * Sat Dec 27 2008 Hans de Goede <hdegoede at redhat.com> 1.6.0-3
 - Remove non-free fonts from samples subpackage (rh 477434)
 



From jwrdegoede at fedoraproject.org  Sat Jan 10 21:55:22 2009
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Sat, 10 Jan 2009 21:55:22 +0000 (UTC)
Subject: rpms/ogre/devel ogre.spec,1.41,1.42
Message-ID: <20090110215522.7A8807012C@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/ogre/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30516

Modified Files:
	ogre.spec 
Log Message:
* Sat Jan 10 2009 Hans de Goede <hdegoede at redhat.com> 1.6.0-4
- use regular (full) instead of lgc dejavu fonts for the demos (rh 477434)



Index: ogre.spec
===================================================================
RCS file: /cvs/extras/rpms/ogre/devel/ogre.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- ogre.spec	10 Jan 2009 21:50:58 -0000	1.41
+++ ogre.spec	10 Jan 2009 21:54:52 -0000	1.42
@@ -206,7 +206,7 @@
 
 
 %changelog
-* Sat Jan 10 2008 Hans de Goede <hdegoede at redhat.com> 1.6.0-4
+* Sat Jan 10 2009 Hans de Goede <hdegoede at redhat.com> 1.6.0-4
 - use regular (full) instead of lgc dejavu fonts for the demos (rh 477434)
 
 * Sat Dec 27 2008 Hans de Goede <hdegoede at redhat.com> 1.6.0-3



From clumens at fedoraproject.org  Sat Jan 10 22:03:34 2009
From: clumens at fedoraproject.org (Christopher Edward Lumens)
Date: Sat, 10 Jan 2009 22:03:34 +0000 (UTC)
Subject: rpms/pykickstart/devel .cvsignore, 1.103, 1.104 pykickstart.spec,
	1.112, 1.113 sources, 1.112, 1.113
Message-ID: <20090110220334.E95187012C@cvs1.fedora.phx.redhat.com>

Author: clumens

Update of /cvs/pkgs/rpms/pykickstart/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31534

Modified Files:
	.cvsignore pykickstart.spec sources 
Log Message:
New version.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pykickstart/devel/.cvsignore,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -r1.103 -r1.104
--- .cvsignore	8 Jan 2009 22:04:10 -0000	1.103
+++ .cvsignore	10 Jan 2009 22:03:04 -0000	1.104
@@ -37,3 +37,4 @@
 pykickstart-1.47.tar.gz
 pykickstart-1.48.tar.gz
 pykickstart-1.49.tar.gz
+pykickstart-1.50.tar.gz


Index: pykickstart.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pykickstart/devel/pykickstart.spec,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -r1.112 -r1.113
--- pykickstart.spec	8 Jan 2009 22:04:10 -0000	1.112
+++ pykickstart.spec	10 Jan 2009 22:03:04 -0000	1.113
@@ -3,7 +3,7 @@
 Summary:  A python library for manipulating kickstart files
 Name: pykickstart
 Url: http://fedoraproject.org/wiki/pykickstart
-Version: 1.49
+Version: 1.50
 Release: 1%{?dist}
 # This is a Red Hat maintained package which is specific to
 # our distribution.  Thus the source is only available from
@@ -42,8 +42,16 @@
 %{python_sitelib}/*
 %{_bindir}/ksvalidator
 %{_bindir}/ksflatten
+%{_bindir}/ksverdiff
 
 %changelog
+* Sat Jan 10 2009 Chris Lumens <clumens at redhat.com> - 1.50-1
+- Add a script to diff two versions of kickstart syntax.
+- Add an option to ksvalidator to list all available syntax versions.
+- Remove a couple extra newlines in output formatting.
+- Add documentation for the new %include representation.
+- Add support %include to the pykickstart data objects.
+
 * Thu Jan 08 2009 Chris Lumens <clumens at redhat.com> - 1.49-1
 - Add upgrade --root-device (atodorov, #471232).
 - Use python's builtin set rather than the Sets module (#477836, dcantrell).


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pykickstart/devel/sources,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -r1.112 -r1.113
--- sources	8 Jan 2009 22:04:10 -0000	1.112
+++ sources	10 Jan 2009 22:03:04 -0000	1.113
@@ -1 +1 @@
-695704deec30464a35799c5e9d5ed1d5  pykickstart-1.49.tar.gz
+ea3615434fe52dbdde4916c068570ad6  pykickstart-1.50.tar.gz



From than at fedoraproject.org  Sat Jan 10 22:11:54 2009
From: than at fedoraproject.org (Than Ngo)
Date: Sat, 10 Jan 2009 22:11:54 +0000 (UTC)
Subject: rpms/kdeartwork/devel kdeartwork.spec,1.96,1.97
Message-ID: <20090110221154.85B667012C@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdeartwork/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv669

Modified Files:
	kdeartwork.spec 
Log Message:
fix file list



Index: kdeartwork.spec
===================================================================
RCS file: /cvs/extras/rpms/kdeartwork/devel/kdeartwork.spec,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -r1.96 -r1.97
--- kdeartwork.spec	7 Jan 2009 15:10:05 -0000	1.96
+++ kdeartwork.spec	10 Jan 2009 22:11:24 -0000	1.97
@@ -1,6 +1,6 @@
 Name:           kdeartwork
 Version:        4.1.96
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Additional artwork (themes, sound themes, ...) for KDE
 
 License:        GPLv2
@@ -49,21 +49,12 @@
 %package icons
 Summary: Additional icon themes
 Group: User Interface/Desktops
-Provides: Locolor-icon-theme = %{version}-%{release}
-Provides: nuvola-icon-theme = %{version}-%{release}
-Provides: ikons-icon-theme = %{version}-%{release}
 Provides: kdeclassic-icon-theme = %{version}-%{release}
-Provides: kids-icon-theme = %{version}-%{release}
-Provides: slick-icon-theme = %{version}-%{release}
 Requires(post): xdg-utils
 Requires(postun): xdg-utils
 %description icons
 This contains icon themes:
-* Locolor
-* ikons
 * kdeclassic
-* kids
-* slick
 
 %package extras
 Summary: Artwork Extras, including xscreensaver-based screensavers
@@ -125,12 +116,7 @@
 
 %if 0%{?icons}
 %post icons
-%{_bindir}/xdg-icon-resource forceupdate --theme Locolor 2> /dev/null || :
-%{_bindir}/xdg-icon-resource forceupdate --theme nuvola 2> /dev/null || :
-%{_bindir}/xdg-icon-resource forceupdate --theme ikons 2> /dev/null || :
 %{_bindir}/xdg-icon-resource forceupdate --theme kdeclassic 2> /dev/null || :
-%{_bindir}/xdg-icon-resource forceupdate --theme kids 2> /dev/null || :
-%{_bindir}/xdg-icon-resource forceupdate --theme slick 2> /dev/null || :
 
 %if 0%{?include_crystalsvg}
 %post -n crystalsvg-icon-theme
@@ -138,12 +124,7 @@
 %endif
 
 %postun icons
-%{_bindir}/xdg-icon-resource forceupdate --theme Locolor 2> /dev/null || :
-%{_bindir}/xdg-icon-resource forceupdate --theme nuvola 2> /dev/null || :
-%{_bindir}/xdg-icon-resource forceupdate --theme ikons 2> /dev/null || :
 %{_bindir}/xdg-icon-resource forceupdate --theme kdeclassic 2> /dev/null || :
-%{_bindir}/xdg-icon-resource forceupdate --theme kids 2> /dev/null || :
-%{_bindir}/xdg-icon-resource forceupdate --theme slick 2> /dev/null || :
 
 %if 0%{?include_crystalsvg}
 %postun -n crystalsvg-icon-theme
@@ -176,12 +157,7 @@
 %if 0%{?icons}
 %files icons
 %defattr(-,root,root,-)
-%{_kde4_iconsdir}/Locolor/
-%{_kde4_iconsdir}/nuvola/
-%{_kde4_iconsdir}/ikons/
 %{_kde4_iconsdir}/kdeclassic/
-%{_kde4_iconsdir}/kids/
-%{_kde4_iconsdir}/slick/
 
 %if 0%{?include_crystalsvg}
 %files -n crystalsvg-icon-theme
@@ -192,6 +168,9 @@
 
 
 %changelog
+* Sat Jan 10 2009 Than Ngo <than at redhat.com> - 4.1.96-2
+- fix file list
+
 * Wed Jan 07 2009 Than Ngo <than at redhat.com> - 4.1.96-1
 - 4.2rc1
 



From rdieter at fedoraproject.org  Sat Jan 10 23:14:40 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sat, 10 Jan 2009 23:14:40 +0000 (UTC)
Subject: rpms/amarok/F-10 .cvsignore, 1.41, 1.42 amarok.spec, 1.129,
	1.130 sources, 1.42, 1.43
Message-ID: <20090110231440.636137012C@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/amarok/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7960

Modified Files:
	.cvsignore amarok.spec sources 
Log Message:
* Fri Jan 09 2009 Rex Dieter <rdieter at fedoraproject.org> - 2.0.1.1-1
- amarok-2.0.1.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/amarok/F-10/.cvsignore,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- .cvsignore	6 Jan 2009 18:43:53 -0000	1.41
+++ .cvsignore	10 Jan 2009 23:14:08 -0000	1.42
@@ -1 +1 @@
-amarok-2.0.1.tar.bz2
+amarok-2.0.1.1.tar.bz2


Index: amarok.spec
===================================================================
RCS file: /cvs/pkgs/rpms/amarok/F-10/amarok.spec,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -r1.129 -r1.130
--- amarok.spec	6 Jan 2009 18:43:54 -0000	1.129
+++ amarok.spec	10 Jan 2009 23:14:08 -0000	1.130
@@ -1,7 +1,7 @@
 
 Name:    amarok
 Summary: Media player
-Version: 2.0.1
+Version: 2.0.1.1
 Release: 1%{?dist}
 
 Group: 	 Applications/Multimedia
@@ -55,7 +55,7 @@
 %{cmake_kde4} ..
 popd
 
-make %{?_smp_mflags} -C %{_target_platform} VERBOSE=1
+make %{?_smp_mflags} -C %{_target_platform}
 
 
 %install
@@ -113,6 +113,9 @@
 
 
 %changelog
+* Fri Jan 09 2009 Rex Dieter <rdieter at fedoraproject.org> - 2.0.1.1-1
+- amarok-2.0.1.1
+
 * Tue Jan 06 2009 Rex Dieter <rdieter at fedoraproject.org> - 2.0.1-1
 - amarok-2.0.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/amarok/F-10/sources,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- sources	6 Jan 2009 18:43:54 -0000	1.42
+++ sources	10 Jan 2009 23:14:08 -0000	1.43
@@ -1 +1 @@
-b90f28c497ca01f08efa140d51d84eb5  amarok-2.0.1.tar.bz2
+818bc2b0350f35cba0fff0a72b9ffd22  amarok-2.0.1.1.tar.bz2



From than at fedoraproject.org  Sat Jan 10 23:32:45 2009
From: than at fedoraproject.org (Than Ngo)
Date: Sat, 10 Jan 2009 23:32:45 +0000 (UTC)
Subject: rpms/kde-i18n/devel kde-i18n.spec,1.92,1.93
Message-ID: <20090110233245.9D40F7012C@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kde-i18n/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9737

Modified Files:
	kde-i18n.spec 
Log Message:
remove kdgantt.mo that conflict with kde-l10n



Index: kde-i18n.spec
===================================================================
RCS file: /cvs/extras/rpms/kde-i18n/devel/kde-i18n.spec,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -r1.92 -r1.93
--- kde-i18n.spec	3 Sep 2008 09:04:53 -0000	1.92
+++ kde-i18n.spec	10 Jan 2009 23:32:15 -0000	1.93
@@ -6,7 +6,7 @@
 Name: kde-i18n
 Epoch: 1
 Version: 3.5.10
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 # GFDL, with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
 License: GFDL 
@@ -1087,6 +1087,7 @@
    rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/timezones4.mo
    rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/umbrello.mo
    rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/useraccount.mo
+   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kdgantt.mo
    rm -f %{buildroot}%{_datadir}/locale/*/entry.desktop
 
    # keep these ones because we're shipping KDE 3 kdewebdev (because of Quanta)
@@ -1849,6 +1850,9 @@
 
 
 %changelog
+* Sun Jan 11 2009 Than Ngo <than at redhat.com> - 3.5.10-2
+- remove kdgantt.mo that conflict with kde-l10n
+
 * Wed Sep 03 2008 Than Ngo <than at redhat.com> 3.5.10-1
 - 3.5.10
 



From pfj at fedoraproject.org  Sun Jan 11 00:17:12 2009
From: pfj at fedoraproject.org (Paul F. Johnson)
Date: Sun, 11 Jan 2009 00:17:12 +0000 (UTC)
Subject: rpms/mod_mono/devel .cvsignore, 1.8, 1.9 import.log, 1.6,
	1.7 mod_mono.spec, 1.15, 1.16 sources, 1.8, 1.9
Message-ID: <20090111001712.88AEF70139@cvs1.fedora.phx.redhat.com>

Author: pfj

Update of /cvs/pkgs/rpms/mod_mono/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14738/devel

Modified Files:
	.cvsignore import.log mod_mono.spec sources 
Log Message:

Bump to RC2 preview
Large updates from svn 



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mod_mono/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	25 Nov 2008 15:48:32 -0000	1.8
+++ .cvsignore	11 Jan 2009 00:16:37 -0000	1.9
@@ -1 +1 @@
-mod_mono-2.2.tar.bz2
+mod_mono-122806.tar.bz2


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/mod_mono/devel/import.log,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- import.log	25 Nov 2008 15:48:32 -0000	1.6
+++ import.log	11 Jan 2009 00:16:41 -0000	1.7
@@ -4,3 +4,4 @@
 mod_mono-2_0-5_fc10:HEAD:mod_mono-2.0-5.fc10.src.rpm:1223678042
 mod_mono-2_0-6_fc10:HEAD:mod_mono-2.0-6.fc10.src.rpm:1223760866
 mod_mono-2_2-1_pre1_fc10:HEAD:mod_mono-2.2-1.pre1.fc10.src.rpm:1227628062
+mod_mono-2_2-4_RC2_20090901svn122806_fc11:HEAD:mod_mono-2.2-4.RC2.20090901svn122806.fc11.src.rpm:1231632951


Index: mod_mono.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mod_mono/devel/mod_mono.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- mod_mono.spec	25 Nov 2008 15:48:32 -0000	1.15
+++ mod_mono.spec	11 Jan 2009 00:16:41 -0000	1.16
@@ -1,10 +1,12 @@
+%define svnver 122806
+
 Name: mod_mono
 Version: 2.2
-Release: 1.pre1%{?dist}
+Release: 4.RC2.20090901svn%{svnver}%{?dist}
 License: MIT
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 URL: http://ftp.novell.com/pub/mono/sources-stable
-Source0: http://ftp.novell.com/pub/mono/sources/%{name}/%{name}-%{version}.tar.bz2
+Source0: %{name}-%{svnver}.tar.bz2
 BuildRequires: mono-devel >= 2.0, xsp-devel >= 2.0, pkgconfig, httpd-devel apr-devel
 Patch0: mod_mono-2.0-varrun.patch
 Requires: httpd >= 2.2, mono-core, xsp
@@ -20,7 +22,7 @@
 that is installed along with XSP
  
 %prep
-%setup -q
+%setup -q -n %{name}-%{svnver}
 %patch0 -p1 -b .varrun
 
 %build
@@ -53,6 +55,17 @@
 %{_mandir}/man8/mod_mono.8*
 
 %changelog
+* Fri Jan 09 2009 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.2-4.RC2.20090901svn122806
+- Bump to RC2
+- Big update from svn
+
+* Wed Dec 17 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.2-3.pre3.20081217svn117989
+- Bump to preview 3
+- Move to svn for bug fixes
+
+* Sat Dec 06 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.2-2.pre2
+- Bump to preview 2
+
 * Tue Nov 25 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.2-1.pre1
 - Bump to 2.2 preview 1
 - incorporate fix to the var-run patch (thanks to Dario Lesca)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mod_mono/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	25 Nov 2008 15:48:32 -0000	1.8
+++ sources	11 Jan 2009 00:16:41 -0000	1.9
@@ -1 +1 @@
-7e229e9e9bea7e4b0d39783eab801221  mod_mono-2.2.tar.bz2
+984771efcc2cf5d10cee93ed57c40b46  mod_mono-122806.tar.bz2



From pfj at fedoraproject.org  Sun Jan 11 00:30:39 2009
From: pfj at fedoraproject.org (Paul F. Johnson)
Date: Sun, 11 Jan 2009 00:30:39 +0000 (UTC)
Subject: rpms/mono/devel .cvsignore, 1.32, 1.33 import.log, 1.31,
	1.32 mono.spec, 1.104, 1.105 sources, 1.38, 1.39
Message-ID: <20090111003039.B46ED70139@cvs1.fedora.phx.redhat.com>

Author: pfj

Update of /cvs/pkgs/rpms/mono/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15776/devel

Modified Files:
	.cvsignore import.log mono.spec sources 
Log Message:

Update from svn
Retagged as RC2 preview
Removed mono-api-diff.exe and transform.exe 
Fix some problems with winforms and XIM on some boxes



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mono/devel/.cvsignore,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- .cvsignore	4 Jan 2009 23:10:30 -0000	1.32
+++ .cvsignore	11 Jan 2009 00:30:08 -0000	1.33
@@ -1 +1 @@
-mono-122388.tar.bz2
+mono-122990.tar.bz2


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/mono/devel/import.log,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- import.log	4 Jan 2009 23:10:30 -0000	1.31
+++ import.log	11 Jan 2009 00:30:08 -0000	1.32
@@ -29,3 +29,4 @@
 mono-2_2-15_RC1_20081229svn122181_fc11:HEAD:mono-2.2-15.RC1.20081229svn122181.fc11.src.rpm:1230645701
 mono-2_2-15_RC1_20081231svn122288_fc11:HEAD:mono-2.2-15.RC1.20081231svn122288.fc11.src.rpm:1230743514
 mono-2_2-15_RC1_20090401svn122388_fc11:HEAD:mono-2.2-15.RC1.20090401svn122388.fc11.src.rpm:1231110581
+mono-2_2-16_RC2_20091001svn122990_fc11:HEAD:mono-2.2-16.RC2.20091001svn122990.fc11.src.rpm:1231633729


Index: mono.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mono/devel/mono.spec,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -r1.104 -r1.105
--- mono.spec	4 Jan 2009 23:10:30 -0000	1.104
+++ mono.spec	11 Jan 2009 00:30:08 -0000	1.105
@@ -1,8 +1,8 @@
-%define svnver 122388
+%define svnver 122990
 
 Name:		mono
 Version:        2.2
-Release:        15.RC1.20090401svn%{svnver}%{?dist}
+Release:        16.RC2.20091001svn%{svnver}%{?dist}
 Summary:        A .NET runtime environment
 
 Group:          Development/Languages
@@ -373,8 +373,6 @@
 %mono_bin sn
 %mono_bin installvst
 %mono_bin monolinker
-%{monodir}/2.0/mono-api-diff.exe
-%{monodir}/2.0/transform.exe
 %{monodir}/?.0/installutil.*
 %{monodir}/3.5/System.Web.Extensions*
 %{monodir}/2.0/System.Xml.Linq.dll
@@ -690,6 +688,12 @@
 %{_libdir}/pkgconfig/monodoc.pc
 
 %changelog
+* Sat Jan 10 2009 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.2-16.RC2.20091001svn122990
+- Updates from svn
+- Change to RC2
+- Removed mono-api-diff.exe and transform.exe from spec
+- Fixes some problems with winforms on some boxes
+
 * Sun Jan 04 2009 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.2-15.RC1.20090401svn122388
 - Updates from svn
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mono/devel/sources,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- sources	4 Jan 2009 23:10:30 -0000	1.38
+++ sources	11 Jan 2009 00:30:09 -0000	1.39
@@ -1 +1 @@
-fa7ec2cb621a4f96745fcd68c9558c3f  mono-122388.tar.bz2
+27fc7a2411b72b013420576412b8df24  mono-122990.tar.bz2



From pfj at fedoraproject.org  Sun Jan 11 00:32:44 2009
From: pfj at fedoraproject.org (Paul F. Johnson)
Date: Sun, 11 Jan 2009 00:32:44 +0000 (UTC)
Subject: rpms/mono-addins/devel import.log, 1.4, 1.5 mono-addins.spec, 1.10, 
	1.11 mono-addins.patch, 1.2, NONE
Message-ID: <20090111003244.1163570139@cvs1.fedora.phx.redhat.com>

Author: pfj

Update of /cvs/pkgs/rpms/mono-addins/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16109/devel

Modified Files:
	import.log mono-addins.spec 
Removed Files:
	mono-addins.patch 
Log Message:

Rebuilt
Correct license
Replaced bad patch with sed 



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/mono-addins/devel/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- import.log	26 Nov 2008 14:51:48 -0000	1.4
+++ import.log	11 Jan 2009 00:32:13 -0000	1.5
@@ -2,3 +2,4 @@
 mono-addins-0_4-1_fc10:HEAD:mono-addins-0.4-1.fc10.src.rpm:1226100165
 mono-addins-0_4-2_fc10:HEAD:mono-addins-0.4-2.fc10.src.rpm:1227628174
 mono-addins-0_4-2_fc10:HEAD:mono-addins-0.4-2.fc10.src.rpm:1227711072
+mono-addins-0_4-3_fc11:HEAD:mono-addins-0.4-3.fc11.src.rpm:1231633882


Index: mono-addins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mono-addins/devel/mono-addins.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- mono-addins.spec	25 Nov 2008 15:50:17 -0000	1.10
+++ mono-addins.spec	11 Jan 2009 00:32:13 -0000	1.11
@@ -2,11 +2,10 @@
 
 Name:		mono-addins
 Version:	0.4
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Addins for mono
 Group:		Development/Languages
-License:	GPLv2
-Patch0:		mono-addins.patch
+License:	MIT
 URL:		http://www.mono-project.com/
 Source0:	%{name}-%{version}.tar.bz2	
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -29,8 +28,9 @@
 and for creating libraries which extend those applications.
 
 %prep
-%setup -q
-%patch0 -p1 -b .orig
+%setup -q 
+sed -i -e 's!$(prefix)/lib/!%{_libdir}/!' mautil/Makefile.am
+sed -i -e 's!$(prefix)/lib!%{_libdir}!' configure.ac
 autoreconf -f -i -s
 
 %build
@@ -61,13 +61,18 @@
 %{_libdir}/mono/gac/policy.0.3.Mono.Addins.Setup
 %{_libdir}/mono/gac/policy.0.3.Mono.Addins
 %{_libdir}/mono/gac/policy.0.3.Mono.Addins.CecilReflector
-%{_mandir}/man1/mautil.1.gz
+%{_mandir}/man1/mautil*
 
 %files devel
 %defattr (-,root,root,-)
 %{_libdir}/pkgconfig/mono-addins*
 
 %changelog
+* Thu Dec 11 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> - 0.4-3
+- Rebuild
+- Correct licence to MIT
+- Replaced patch with sed
+
 * Tue Nov 25 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> - 0.4-2
 - Fix archs
 


--- mono-addins.patch DELETED ---



From pfj at fedoraproject.org  Sun Jan 11 00:35:52 2009
From: pfj at fedoraproject.org (Paul F. Johnson)
Date: Sun, 11 Jan 2009 00:35:52 +0000 (UTC)
Subject: rpms/mono-debugger/devel .cvsignore, 1.7, 1.8 import.log, 1.4,
	1.5 mono-debugger.spec, 1.17, 1.18 sources, 1.7, 1.8
Message-ID: <20090111003552.483FF70139@cvs1.fedora.phx.redhat.com>

Author: pfj

Update of /cvs/pkgs/rpms/mono-debugger/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16504/devel

Modified Files:
	.cvsignore import.log mono-debugger.spec sources 
Log Message:

Bump to 2.2 RC2
Move to svn tarballs in line with other rawhide mono builds
Added mono-debugger-frontend parts 



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mono-debugger/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	26 Nov 2008 14:34:48 -0000	1.7
+++ .cvsignore	11 Jan 2009 00:35:21 -0000	1.8
@@ -1 +1 @@
-mono-debugger-2.2.tar.bz2
+mono-debugger-122605.tar.bz2


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/mono-debugger/devel/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- import.log	26 Nov 2008 14:34:48 -0000	1.4
+++ import.log	11 Jan 2009 00:35:21 -0000	1.5
@@ -2,3 +2,4 @@
 mono-debugger-2_0-4_fc10:HEAD:mono-debugger-2.0-4.fc10.src.rpm:1219791256
 mono-debugger-2_0-5_fc10:HEAD:mono-debugger-2.0-5.fc10.src.rpm:1219792595
 mono-debugger-2_2-1_pre1_fc10:HEAD:mono-debugger-2.2-1.pre1.fc10.src.rpm:1227710038
+mono-debugger-2_2-3_RC2_20090109svn122605_fc11:HEAD:mono-debugger-2.2-3.RC2.20090109svn122605.fc11.src.rpm:1231634063


Index: mono-debugger.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mono-debugger/devel/mono-debugger.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- mono-debugger.spec	26 Nov 2008 14:34:48 -0000	1.17
+++ mono-debugger.spec	11 Jan 2009 00:35:21 -0000	1.18
@@ -1,11 +1,13 @@
+%define svnver 122605
+
 Summary: A debugger for Mono
 Name: mono-debugger
 Version: 2.2
-Release: 1.pre1%{?dist}
+Release: 3.RC2.20090109svn%{svnver}%{?dist}
 License: MIT
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 URL: http://www.go-mono.com/sources-stable/
-Source0: http://www.go-mono.com/sources-stable/%{name}/%{name}-%{version}.tar.bz2
+Source0: %{name}-%{svnver}.tar.bz2
 Patch0: monodebugger-2.2-configure.patch
 Patch1: monodebugger-2.2-makefiles.patch
 BuildRequires: readline-devel ncurses-devel libtool
@@ -33,15 +35,25 @@
 Development package for mono-debugger
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{svnver}
 rm -rf build/*.dll
-# bit of sed magic...
-sed -i -e 's!@libdir@!%{_libdir}!' %{PATCH0}
-sed -i -e 's!@libdir@!%{_libdir}!' %{PATCH1}
-%patch0 -p1 -b .configure
-%patch1 -p1 -b .makefiles
-sed -i -e 's!%{_libdir}!@libdir@!' %{PATCH0}
-sed -i -e 's!%{_libdir}!@libdir@!' %{PATCH1}
+# bit of sed magic... - let's see if this works
+#sed -i -e 's!@libdir@!%{_libdir}!' %{PATCH0}
+#sed -i -e 's!@libdir@!%{_libdir}!' %{PATCH1}
+#%patch0 -p1 -b .configure
+#%patch1 -p1 -b .makefiles
+#sed -i -e 's!%{_libdir}!@libdir@!' %{PATCH0}
+#sed -i -e 's!%{_libdir}!@libdir@!' %{PATCH1}
+
+find . -name Makefile.in -or -name Makefile.am -or -name \*.pc.in \
+       | while read f ;
+         do
+           sed -i -e 's!$(prefix)/lib!%{_libdir}!' "$f" 
+           sed -i -e 's!${exec_prefix}/lib!%{_libdir}!' "$f" ;
+         done
+
+sed -i -e 's!/usr/lib!%{_libdir}!' mono-debugger-frontend.pc.in
+sed -i -e 's!${prefix}/lib/!%{_libdir}/!' mono-debugger-frontend.pc.in
 
 # Copy something that we know got built from source.
 # This doesn't end up in the package, though.
@@ -72,13 +84,23 @@
 %{_libdir}/mono/2.0/mdb*
 %{_libdir}/mono/gac/Mono.Debugger/
 %{_libdir}/mono/gac/Mono.Debugger.SymbolWriter/
+%{_libdir}/mono/gac/Mono.Debugger.Frontend/
 %{_libdir}/mono/mono-debugger/
 
 %files devel
 %defattr(-,root,root,-)
 %{_libdir}/pkgconfig/mono-debugger.pc
+%{_libdir}/pkgconfig/mono-debugger-frontend.pc
 
 %changelog
+* Fri Jan 09 2009 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.2-3.RC2.20090901svn122605
+- bump to RC2
+- use svn rather than tarballs
+- Added mono-debugger-frontend and mono-debugger-frontend.pc files
+
+* Sat Dec 06 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.2-2.pre2
+- bump to 2.2 preview 2
+
 * Tue Nov 25 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.2-1.pre1
 - bump to 2.2 preview 1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mono-debugger/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	26 Nov 2008 14:34:48 -0000	1.7
+++ sources	11 Jan 2009 00:35:21 -0000	1.8
@@ -1 +1 @@
-aefd6984a4035f931700dd33a75b5d66  mono-debugger-2.2.tar.bz2
+209e6a6eda714287bceff083e49ca01b  mono-debugger-122605.tar.bz2



From pfj at fedoraproject.org  Sun Jan 11 00:40:30 2009
From: pfj at fedoraproject.org (Paul F. Johnson)
Date: Sun, 11 Jan 2009 00:40:30 +0000 (UTC)
Subject: rpms/monodevelop/devel .cvsignore, 1.15, 1.16 import.log, 1.13,
	1.14 monodevelop-2.spec, 1.5, 1.6 sources, 1.15, 1.16
Message-ID: <20090111004030.D961A70139@cvs1.fedora.phx.redhat.com>

Author: pfj

Update of /cvs/pkgs/rpms/monodevelop/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17112/devel

Modified Files:
	.cvsignore import.log monodevelop-2.spec sources 
Log Message:

Update from svn



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/monodevelop/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	4 Jan 2009 23:20:07 -0000	1.15
+++ .cvsignore	11 Jan 2009 00:40:00 -0000	1.16
@@ -1 +1 @@
-monodevelop-122336.tar.bz2
+monodevelop-122940.tar.bz2


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/monodevelop/devel/import.log,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- import.log	4 Jan 2009 23:20:07 -0000	1.13
+++ import.log	11 Jan 2009 00:40:00 -0000	1.14
@@ -11,3 +11,4 @@
 monodevelop-1_9_1-6_pre1_20081224svn122090_fc11:HEAD:monodevelop-1.9.1-6.pre1.20081224svn122090.fc11.src.rpm:1230160103
 monodevelop-1_9_1-6_pre1_20081230svn122192_fc11:HEAD:monodevelop-1.9.1-6.pre1.20081230svn122192.fc11.src.rpm:1230647557
 monodevelop-1_9_2-pre1_20090104svn122336_fc11:HEAD:monodevelop-1.9.2-pre1.20090104svn122336.fc11.src.rpm:1231111150
+monodevelop-1_9_2-pre1_20090110svn122940_fc11:HEAD:monodevelop-1.9.2-pre1.20090110svn122940.fc11.src.rpm:1231634326


Index: monodevelop-2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/monodevelop/devel/monodevelop-2.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- monodevelop-2.spec	4 Jan 2009 23:20:07 -0000	1.5
+++ monodevelop-2.spec	11 Jan 2009 00:40:00 -0000	1.6
@@ -8,12 +8,12 @@
 #%(gacutil -l nunit.core | tail -n 2 | grep nunit.core | cut -d "=" -f 2 | cut -d "," -f 1)
 %define nunitver 2.2.10.0
 
-%define svnver 122336
+%define svnver 122940
 
 
 Name:           monodevelop
 Version:        1.9.2
-Release:        pre1.20090104svn%{svnver}%{?dist}
+Release:        pre1.20090110svn%{svnver}%{?dist}
 Summary:        A full-featured IDE for Mono and Gtk#
 
 Group:          Development/Tools
@@ -160,6 +160,9 @@
 %{_libdir}/pkgconfig/monodevelop*.pc
 
 %changelog
+* Sat Jan 10 2009 Paul F. Johnson <paul at all-the-johnsons.co.uk> 1.9.2-pre1.200900109svn122940
+- Update from svn
+
 * Sun Jan 04 2009 Paul F. Johnson <paul at all-the-johnsons.co.uk> 1.9.2-pre1.200900104svn122336
 - Update from svn
 - Reversioned as 1.9.1 is out there already


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/monodevelop/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	4 Jan 2009 23:20:07 -0000	1.15
+++ sources	11 Jan 2009 00:40:00 -0000	1.16
@@ -1 +1 @@
-b248d3f8e8f6d2c954b64cc0dee24bb8  monodevelop-122336.tar.bz2
+247e303c62c499b03f14635a4b04b770  monodevelop-122940.tar.bz2



From pfj at fedoraproject.org  Sun Jan 11 00:42:56 2009
From: pfj at fedoraproject.org (Paul F. Johnson)
Date: Sun, 11 Jan 2009 00:42:56 +0000 (UTC)
Subject: rpms/mono-tools/devel .cvsignore, 1.9, 1.10 import.log, 1.18,
	1.19 mono-tools.spec, 1.23, 1.24 sources, 1.10, 1.11
Message-ID: <20090111004256.CD75270139@cvs1.fedora.phx.redhat.com>

Author: pfj

Update of /cvs/pkgs/rpms/mono-tools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17464/devel

Modified Files:
	.cvsignore import.log mono-tools.spec sources 
Log Message:

Bump to RC2
Update from svn 



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mono-tools/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	4 Jan 2009 23:14:55 -0000	1.9
+++ .cvsignore	11 Jan 2009 00:42:25 -0000	1.10
@@ -1 +1 @@
-mono-tools-122377.tar.bz2
+mono-tools-122974.tar.bz2


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/mono-tools/devel/import.log,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- import.log	4 Jan 2009 23:14:55 -0000	1.18
+++ import.log	11 Jan 2009 00:42:25 -0000	1.19
@@ -16,3 +16,4 @@
 mono-tools-2_2-9_RC1_20081224svn122098_fc11:HEAD:mono-tools-2.2-9.RC1.20081224svn122098.fc11.src.rpm:1230158733
 mono-tools-2_2-9_RC1_20081230svn122166_fc11:HEAD:mono-tools-2.2-9.RC1.20081230svn122166.fc11.src.rpm:1230647227
 mono-tools-2_2-9_RC1_20090104svn122377_fc11:HEAD:mono-tools-2.2-9.RC1.20090104svn122377.fc11.src.rpm:1231110855
+mono-tools-2_2-10_RC2_20090110svn122974_fc11:HEAD:mono-tools-2.2-10.RC2.20090110svn122974.fc11.src.rpm:1231634505


Index: mono-tools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mono-tools/devel/mono-tools.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- mono-tools.spec	4 Jan 2009 23:14:55 -0000	1.23
+++ mono-tools.spec	11 Jan 2009 00:42:25 -0000	1.24
@@ -1,10 +1,10 @@
 %define debug_package %{nil}
-%define svnver 122377
+%define svnver 122974
 
 Summary: A collection of tools for mono applications
 Name: mono-tools
 Version: 2.2
-Release: 9.RC1.20090104svn%{svnver}%{?dist}
+Release: 10.RC2.20090110svn%{svnver}%{?dist}
 License: MIT
 Group: Development/Tools
 Source0: %{name}-%{svnver}.tar.bz2
@@ -133,6 +133,10 @@
 %{_libdir}/monodoc/sources/Gendarme*
 
 %changelog
+* Sat Jan 10 2009  Paul F. Johnson <paul at all-the-johnsons.co.uk> -.2.2-10.RC2.20090110svn122974
+- update from svn
+- bump to RC2
+
 * Sun Jan 04 2009  Paul F. Johnson <paul at all-the-johnsons.co.uk> -.2.2-9.RC1.20090104svn122377
 - update from svn
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mono-tools/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	4 Jan 2009 23:14:55 -0000	1.10
+++ sources	11 Jan 2009 00:42:25 -0000	1.11
@@ -1 +1 @@
-94609bbb5292a48c132f0a3bc660c9d4  mono-tools-122377.tar.bz2
+da1063ec1aa08c5c6177f1c2b7d3b5f6  mono-tools-122974.tar.bz2



From pfj at fedoraproject.org  Sun Jan 11 00:45:15 2009
From: pfj at fedoraproject.org (Paul F. Johnson)
Date: Sun, 11 Jan 2009 00:45:15 +0000 (UTC)
Subject: rpms/xsp/devel .cvsignore, 1.15, 1.16 import.log, 1.7, 1.8 sources, 
	1.17, 1.18 xsp.spec, 1.29, 1.30
Message-ID: <20090111004515.E9F4970139@cvs1.fedora.phx.redhat.com>

Author: pfj

Update of /cvs/pkgs/rpms/xsp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17877/devel

Modified Files:
	.cvsignore import.log sources xsp.spec 
Log Message:

Update from svn
Retag as RC2 



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xsp/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	24 Dec 2008 23:01:20 -0000	1.15
+++ .cvsignore	11 Jan 2009 00:44:45 -0000	1.16
@@ -1 +1 @@
-xsp-122055.tar.bz2
+xsp-122761.tar.bz2


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/xsp/devel/import.log,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- import.log	24 Dec 2008 23:48:51 -0000	1.7
+++ import.log	11 Jan 2009 00:44:45 -0000	1.8
@@ -5,3 +5,4 @@
 xsp-2_2-3_RC1_20081224svn122055_fc11:HEAD:xsp-2.2-3.RC1.20081224svn122055.fc11.src.rpm:1230159556
 xsp-2_2-5_RC1_20081224svn122055_fc11:HEAD:xsp-2.2-5.RC1.20081224svn122055.fc11.src.rpm:1230161569
 xsp-2_2-6_RC1_20081224svn122055_fc11:HEAD:xsp-2.2-6.RC1.20081224svn122055.fc11.src.rpm:1230162489
+xsp-2_2-7_RC2_20090901svn122761_fc11:HEAD:xsp-2.2-7.RC2.20090901svn122761.fc11.src.rpm:1231634639


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xsp/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources	24 Dec 2008 23:01:21 -0000	1.17
+++ sources	11 Jan 2009 00:44:45 -0000	1.18
@@ -1 +1 @@
-01040707194f17cfb5616550454ac751  xsp-122055.tar.bz2
+3881eebd0e95533d6595cc69b8954eda  xsp-122761.tar.bz2


Index: xsp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xsp/devel/xsp.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- xsp.spec	24 Dec 2008 23:48:51 -0000	1.29
+++ xsp.spec	11 Jan 2009 00:44:45 -0000	1.30
@@ -1,8 +1,8 @@
-%define svnver 122055
+%define svnver 122761
 
 Name:     	xsp
 Version: 	2.2
-Release:	6.RC1.20081224svn%{svnver}%{?dist}
+Release:	7.RC2.20090901svn%{svnver}%{?dist}
 License:	MIT
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 URL:		http://www.mono-project.com/ASP.NET
@@ -98,6 +98,10 @@
 %{_libdir}/xsp/test
 
 %changelog
+* Fri Jan 09 2009 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.2-7.RC2.20090901svn122761
+- rename to RC2
+- update from svn
+
 * Wed Dec 24 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.2-6.RC1.20081224svn122055
 - x86_64 libdir fix
 



From transif at fedoraproject.org  Sun Jan 11 02:40:47 2009
From: transif at fedoraproject.org (Transifex System User)
Date: Sun, 11 Jan 2009 02:40:47 +0000 (UTC)
Subject: comps/po sr.po,1.22,1.23
Message-ID: <20090111024048.1A1EA70139@cvs1.fedora.phx.redhat.com>

Author: transif

Update of /cvs/pkgs/comps/po
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27054/po

Modified Files:
	sr.po 
Log Message:
    2009-01-11  Milos Komarcevic <kmilos at gmail.com> (via
kmilos at fedoraproject.org)
    
      * po/sr.po: Updated Serbian translation
    



Index: sr.po
===================================================================
RCS file: /cvs/pkgs/comps/po/sr.po,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- sr.po	9 Jan 2009 11:52:42 -0000	1.22
+++ sr.po	11 Jan 2009 02:40:15 -0000	1.23
@@ -10,7 +10,7 @@
 "Project-Id-Version: comps\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2008-12-22 15:50-0500\n"
-"PO-Revision-Date: 2008-10-27 21:32+0000\n"
+"PO-Revision-Date: 2009-01-11 02:31+0100\n"
 "Last-Translator: Milo?? Komar??evi?? <kmilos at gmail.com>\n"
 "Language-Team: Serbian (sr) <fedora-trans-sr at redhat.com>\n"
 "MIME-Version: 1.0\n"
@@ -1204,9 +1204,8 @@
 msgstr "?????????????? ???? ????????????????"
 
 #: ../comps-f9.xml.in.h:94 ../comps-f10.xml.in.h:99 ../comps-f11.xml.in.h:104
-#, fuzzy
 msgid "Kurdish Support"
-msgstr "?????????????? ???? ????????????"
+msgstr "?????????????? ???? ??????????????"
 
 #: ../comps-f9.xml.in.h:104 ../comps-f10.xml.in.h:110
 #: ../comps-f11.xml.in.h:115
@@ -1282,55 +1281,48 @@
 msgstr "?????????????? ???? ??????????????"
 
 #: ../comps-f11.xml.in.h:5
-#, fuzzy
 msgid "Amazigh Support"
-msgstr "?????????????? ???? ??????????????"
+msgstr "?????????????? ???? ????????????"
 
 #: ../comps-f11.xml.in.h:54
 msgid "Font design and packaging"
-msgstr ""
+msgstr "???????????? ?? ???????????????? ??????????????"
 
 #: ../comps-f11.xml.in.h:58
-#, fuzzy
 msgid "Frisian Support"
-msgstr "?????????????? ???? ??????????????????"
+msgstr "?????????????? ???? ??????????????????"
 
 #: ../comps-f11.xml.in.h:59
-#, fuzzy
 msgid "Friulian Support"
-msgstr "?????????????? ???? ????????????????????"
+msgstr "?????????????? ???? ??????????????????"
 
 #: ../comps-f11.xml.in.h:101
-#, fuzzy
 msgid "Kinyarwanda Support"
-msgstr "?????????????? ???? ????????????"
+msgstr "?????????????? ???? ????????????????????"
 
 #: ../comps-f11.xml.in.h:118
-#, fuzzy
 msgid "Malagasy Support"
-msgstr "?????????????? ???? ????????????????"
+msgstr "?????????????? ???? ????????????????"
 
 #: ../comps-f11.xml.in.h:132
-#, fuzzy
 msgid "Occitan Support"
-msgstr "?????????????? ???? ????????????????????"
+msgstr "?????????????? ???? ??????????????"
 
 #: ../comps-f11.xml.in.h:201
-#, fuzzy
 msgid ""
 "This group is a collection of tools used in the design, modification, "
 "manipulation, and packaging of fonts."
-msgstr "?????? ?????????? ???? ???????? ???????????? ?? ?????????????? ???? ?????????????????? ????????????????."
+msgstr ""
+"?????? ?????????? ???? ???????? ???????????? ???????? ???? ?????????????? ???? ????????????, ????????????, ????????????, ?? "
+"???????????????? ??????????????."
 
 #: ../comps-f11.xml.in.h:213
-#, fuzzy
 msgid "Turkmen Support"
-msgstr "?????????????? ???? ????????????"
+msgstr "?????????????? ???? ????????????????????"
 
 #: ../comps-f11.xml.in.h:215
-#, fuzzy
 msgid "Upper Sorbian Support"
-msgstr "?????????????? ???? ????????????"
+msgstr "?????????????? ???? ????????????????????????"
 
 #: ../comps-el4.xml.in.h:3 ../comps-el5.xml.in.h:3
 msgid "Applications for a variety of tasks"



From transif at fedoraproject.org  Sun Jan 11 02:42:27 2009
From: transif at fedoraproject.org (Transifex System User)
Date: Sun, 11 Jan 2009 02:42:27 +0000 (UTC)
Subject: comps/po sr@latin.po,1.22,1.23
Message-ID: <20090111024227.7E60970139@cvs1.fedora.phx.redhat.com>

Author: transif

Update of /cvs/pkgs/comps/po
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27186/po

Modified Files:
	sr at latin.po 
Log Message:
    2009-01-11  Milos Komarcevic <kmilos at gmail.com> (via
kmilos at fedoraproject.org)
    
      * po/sr at latin.po: Updated Serbian Latin translation
    



Index: sr at latin.po
===================================================================
RCS file: /cvs/pkgs/comps/po/sr at latin.po,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- sr at latin.po	9 Jan 2009 11:52:42 -0000	1.22
+++ sr at latin.po	11 Jan 2009 02:41:57 -0000	1.23
@@ -10,7 +10,7 @@
 "Project-Id-Version: comps\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2008-12-22 15:50-0500\n"
-"PO-Revision-Date: 2008-10-27 21:32+0000\n"
+"PO-Revision-Date: 2009-01-11 02:31+0100\n"
 "Last-Translator: Milo?? Komar??evi?? <kmilos at gmail.com>\n"
 "Language-Team: Serbian (sr) <fedora-trans-sr at redhat.com>\n"
 "MIME-Version: 1.0\n"
@@ -1204,9 +1204,8 @@
 msgstr "Podr??ka za ka??upski"
 
 #: ../comps-f9.xml.in.h:94 ../comps-f10.xml.in.h:99 ../comps-f11.xml.in.h:104
-#, fuzzy
 msgid "Kurdish Support"
-msgstr "Podr??ka za turski"
+msgstr "Podr??ka za kurdski"
 
 #: ../comps-f9.xml.in.h:104 ../comps-f10.xml.in.h:110
 #: ../comps-f11.xml.in.h:115
@@ -1282,55 +1281,48 @@
 msgstr "Podr??ka za uzbe??ki"
 
 #: ../comps-f11.xml.in.h:5
-#, fuzzy
 msgid "Amazigh Support"
-msgstr "Podr??ka za arapski"
+msgstr "Podr??ka za amazig"
 
 #: ../comps-f11.xml.in.h:54
 msgid "Font design and packaging"
-msgstr ""
+msgstr "Dizajn i pakovanje fontova"
 
 #: ../comps-f11.xml.in.h:58
-#, fuzzy
 msgid "Frisian Support"
-msgstr "Podr??ka za persijski"
+msgstr "Podr??ka za frizijski"
 
 #: ../comps-f11.xml.in.h:59
-#, fuzzy
 msgid "Friulian Support"
-msgstr "Podr??ka za filipinski"
+msgstr "Podr??ka za furlanski"
 
 #: ../comps-f11.xml.in.h:101
-#, fuzzy
 msgid "Kinyarwanda Support"
-msgstr "Podr??ka za kanadu"
+msgstr "Podr??ka za kinjaruandu"
 
 #: ../comps-f11.xml.in.h:118
-#, fuzzy
 msgid "Malagasy Support"
-msgstr "Podr??ka za malajski"
+msgstr "Podr??ka za malagasi"
 
 #: ../comps-f11.xml.in.h:132
-#, fuzzy
 msgid "Occitan Support"
-msgstr "Podr??ka za tibetanski"
+msgstr "Podr??ka za oksitan"
 
 #: ../comps-f11.xml.in.h:201
-#, fuzzy
 msgid ""
 "This group is a collection of tools used in the design, modification, "
 "manipulation, and packaging of fonts."
-msgstr "Ova grupa je skup alatki i resursa za jermensko okru??enje."
+msgstr ""
+"Ova grupa je skup alatki koje se koriste za dizajn, izmenu, obradu, i "
+"pakovanje fontova."
 
 #: ../comps-f11.xml.in.h:213
-#, fuzzy
 msgid "Turkmen Support"
-msgstr "Podr??ka za turski"
+msgstr "Podr??ka za turkmenski"
 
 #: ../comps-f11.xml.in.h:215
-#, fuzzy
 msgid "Upper Sorbian Support"
-msgstr "Podr??ka za srpski"
+msgstr "Podr??ka za gornjelu??i??ki"
 
 #: ../comps-el4.xml.in.h:3 ../comps-el5.xml.in.h:3
 msgid "Applications for a variety of tasks"



From mtasaka at fedoraproject.org  Sun Jan 11 05:34:27 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Sun, 11 Jan 2009 05:34:27 +0000 (UTC)
Subject: rpms/cairo-dock/devel .cvsignore, 1.95, 1.96 cairo-dock.spec, 1.126,
	1.127 sources, 1.95, 1.96
Message-ID: <20090111053427.8D96270139@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/cairo-dock/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9602

Modified Files:
	.cvsignore cairo-dock.spec sources 
Log Message:
* Sun Jan 11 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
- rev 1480



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cairo-dock/devel/.cvsignore,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -r1.95 -r1.96
--- .cvsignore	9 Jan 2009 05:40:54 -0000	1.95
+++ .cvsignore	11 Jan 2009 05:33:54 -0000	1.96
@@ -1 +1 @@
-cairo-dock-sources-svn1476_trunk.tar.bz2
+cairo-dock-sources-svn1480_trunk.tar.bz2


Index: cairo-dock.spec
===================================================================
RCS file: /cvs/extras/rpms/cairo-dock/devel/cairo-dock.spec,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -r1.126 -r1.127
--- cairo-dock.spec	9 Jan 2009 05:40:54 -0000	1.126
+++ cairo-dock.spec	11 Jan 2009 05:33:54 -0000	1.127
@@ -11,7 +11,7 @@
 %undefine		betaver		
 %define		build_webkit	1
 %define		build_xfce	1
-%define		tarballver	svn1476_trunk
+%define		tarballver	svn1480_trunk
 
 %define		fedora_main_rel	3
 
@@ -633,8 +633,8 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
-* Fri Jan  9 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
-- rev 1476
+* Sun Jan 11 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- rev 1480
 
 * Thu Dec 25 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
 - rev 1451


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cairo-dock/devel/sources,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -r1.95 -r1.96
--- sources	9 Jan 2009 05:40:54 -0000	1.95
+++ sources	11 Jan 2009 05:33:55 -0000	1.96
@@ -1 +1 @@
-fed82ca77581f941aac0af1aa2bb046e  cairo-dock-sources-svn1476_trunk.tar.bz2
+e7f003abd33c433e37c74b22c13f4063  cairo-dock-sources-svn1480_trunk.tar.bz2



From tanguy at fedoraproject.org  Sun Jan 11 08:02:42 2009
From: tanguy at fedoraproject.org (Eric Tanguy)
Date: Sun, 11 Jan 2009 08:02:42 +0000 (UTC)
Subject: rpms/scidavis/devel scidavis-0.1.3-sip.patch, 1.1, 1.2 scidavis.spec,
	1.10, 1.11
Message-ID: <20090111080242.6691970139@cvs1.fedora.phx.redhat.com>

Author: tanguy

Update of /cvs/extras/rpms/scidavis/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23035

Modified Files:
	scidavis-0.1.3-sip.patch scidavis.spec 
Log Message:


scidavis-0.1.3-sip.patch:

Index: scidavis-0.1.3-sip.patch
===================================================================
RCS file: /cvs/extras/rpms/scidavis/devel/scidavis-0.1.3-sip.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- scidavis-0.1.3-sip.patch	7 Jan 2009 14:51:17 -0000	1.1
+++ scidavis-0.1.3-sip.patch	11 Jan 2009 08:02:09 -0000	1.2
@@ -1,44 +1,29 @@
---- scidavis-0.1.3.orig/scidavis/src/scidavis.sip	2007-07-21 21:32:13.000000000 +0100
-+++ scidavis-0.1.3/scidavis/src/scidavis.sip	2009-01-07 11:12:51.000000000 +0000
-@@ -78,8 +78,6 @@
-   MyWidget(const MyWidget&);
- };
- 
--typedef QList<MyWidget*> MDIWindowList;
--
- class Table: MyWidget
- {
- %TypeHeaderCode
-@@ -1027,7 +1025,6 @@
-   SIPSCIDAVIS_APP(new sipInterpolation(app, a0, *a1, a2, a3, a4))
+--- scidavis-0.1.3/scidavis/src/scidavis.sip	2008/09/27 20:04:46	991
++++ scidavis-0.1.3/scidavis/src/scidavis.sip	2009/01/10 23:08:56	1023
+@@ -1028,7 +1028,7 @@
  %End
  
--  void setMethod(int n);
-   void setMethod(InterpolationMethod m);
+   void setMethod(int n);
+-  void setMethod(InterpolationMethod m);
++  void setMethod(InterpolationMethod m /Constrained/);
    bool run();
  };
-@@ -1051,7 +1048,6 @@
-   SIPSCIDAVIS_APP(new sipSmoothFilter(app, a0, *a1, a2, a3, a4))
+ 
+@@ -1052,7 +1052,7 @@
  %End
  
--  void setMethod(int);
-   void setMethod(SmoothMethod);
+   void setMethod(int);
+-  void setMethod(SmoothMethod);
++  void setMethod(SmoothMethod /Constrained/);
  
    void setSmoothPoints(int, int = 0);
-@@ -1079,7 +1075,6 @@
-   SIPSCIDAVIS_APP(new sipFFTFilter(app, a0, *a1, a2, a3, a4))
+   void setPolynomOrder(int);
+@@ -1080,7 +1080,7 @@
  %End
  
--  void setFilterType(int);
-   void setFilterType(FilterType);
+   void setFilterType(int);
+-  void setFilterType(FilterType);
++  void setFilterType(FilterType /Constrained/);
  
    void setCutoff(double);
-@@ -1194,7 +1189,7 @@
- #include "src/Folder.h"
- %End
- public:
--  MDIWindowList windowsList() /PyName=windows/;
-+  QList<MyWidget*> windowsList() /PyName=windows/;
- // TODO: implement signal Folder::nameChanged and make it update the project explorer; adjust renaming from GUI accordingly
- //  void setFolderName(const QString&) /PyName=setName/;
-   QString name();
+   void setBand(double, double);


Index: scidavis.spec
===================================================================
RCS file: /cvs/extras/rpms/scidavis/devel/scidavis.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- scidavis.spec	7 Jan 2009 18:04:34 -0000	1.10
+++ scidavis.spec	11 Jan 2009 08:02:09 -0000	1.11
@@ -1,7 +1,7 @@
 Summary:	Scientific Data Analysis and Visualization
 Name:		scidavis
 Version:	0.1.3
-Release: 	5%{?dist}
+Release: 	6%{?dist}
 Source0:	http://download.sourceforge.net/sourceforge/scidavis/%{name}-%{version}.tar.bz2
 Source1:	http://download.sourceforge.net/sourceforge/scidavis/scidavis-manual-0.1_2008-02-28.tar.bz2
 Patch0:		scidavis-0.1.3-pro.patch
@@ -100,6 +100,9 @@
 %doc manual/*
 
 %changelog
+* Sun Jan 11 2009 Eric Tanguy <eric.tanguy at univ-nantes.fr> - 0.1.3-6
+- Replace the sip patch by the one from upstream
+
 * Wed Jan 07 2009 Eric Tanguy <eric.tanguy at univ-nantes.fr> - 0.1.3-5
 - Rebuild
 



From scop at fedoraproject.org  Sun Jan 11 09:53:26 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Sun, 11 Jan 2009 09:53:26 +0000 (UTC)
Subject: rpms/vdr-osdteletext/devel .cvsignore, 1.4, 1.5 sources, 1.4,
	1.5 vdr-osdteletext.spec, 1.11, 1.12
Message-ID: <20090111095327.04A2070139@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/vdr-osdteletext/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2324

Modified Files:
	.cvsignore sources vdr-osdteletext.spec 
Log Message:
* Sun Jan 11 2009 Ville Skytt?? <ville.skytta at iki.fi> - 0.8.1-1
- 0.8.1.
- Trim pre-Fedora %changelog entries.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/vdr-osdteletext/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	21 Dec 2008 15:55:10 -0000	1.4
+++ .cvsignore	11 Jan 2009 09:52:55 -0000	1.5
@@ -1 +1 @@
-vdr-osdteletext-0.7.0.tgz
+vdr-osdteletext-0.8.1.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/vdr-osdteletext/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	21 Dec 2008 15:55:11 -0000	1.4
+++ sources	11 Jan 2009 09:52:55 -0000	1.5
@@ -1 +1 @@
-aad4bf29373a84088c2950f7104e2e72  vdr-osdteletext-0.7.0.tgz
+06ad031b92d54bdf332afa019a5a1c26  vdr-osdteletext-0.8.1.tgz


Index: vdr-osdteletext.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vdr-osdteletext/devel/vdr-osdteletext.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- vdr-osdteletext.spec	21 Dec 2008 15:55:11 -0000	1.11
+++ vdr-osdteletext.spec	11 Jan 2009 09:52:55 -0000	1.12
@@ -5,14 +5,14 @@
 %define vdr_user  %(vdr-config --user       2>/dev/null || echo ERROR)
 
 Name:           vdr-%{pname}
-Version:        0.7.0
+Version:        0.8.1
 Release:        1%{?dist}
 Summary:        OSD teletext plugin for VDR
 
 Group:          Applications/Multimedia
 License:        GPLv2+
 URL:            http://projects.vdr-developer.org/projects/show/plg-osdteletext
-Source0:        http://projects.vdr-developer.org/attachments/download/16/%{name}-%{version}.tgz
+Source0:        http://projects.vdr-developer.org/attachments/download/47/%{name}-%{version}.tgz
 Source1:        %{name}.conf
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -75,6 +75,10 @@
 
 
 %changelog
+* Sun Jan 11 2009 Ville Skytt?? <ville.skytta at iki.fi> - 0.8.1-1
+- 0.8.1.
+- Trim pre-Fedora %%changelog entries.
+
 * Sun Dec 21 2008 Ville Skytt?? <ville.skytta at iki.fi> - 0.7.0-1
 - 0.7.0.
 
@@ -99,75 +103,3 @@
 
 * Sun Nov 12 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.5.1-26
 - First FE build.
-
-* Sun Apr 30 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.5.1-20
-- Rebuild for VDR 1.4.0.
-
-* Mon Apr 17 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.5.1-19
-- Rebuild/adjust for VDR 1.3.47, require versioned vdr(abi).
-- Trim pre-RLO %%changelog entries.
-
-* Sun Mar 26 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.5.1-18
-- Rebuild for VDR 1.3.45.
-
-* Sat Mar 18 2006 Thorsten Leemhuis <fedora at leemhuis.info> - 0.5.1-17
-- drop 0.lvn from release
-
-* Wed Mar  1 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.5.1-0.lvn.17
-- Rebuild for VDR 1.3.44.
-
-* Tue Feb 28 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
-- add dist
-
-* Sun Feb 19 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.5.1-0.lvn.16
-- Rebuild for VDR 1.3.43.
-
-* Sun Feb  5 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.5.1-0.lvn.15
-- Rebuild for VDR 1.3.42.
-
-* Sun Jan 22 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.5.1-0.lvn.14
-- Fix translations with VDR >= 1.3.38.
-- Rebuild for VDR 1.3.40.
-
-* Sun Jan 15 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.5.1-0.lvn.13
-- Rebuild for VDR 1.3.39.
-
-* Sun Jan  8 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.5.1-0.lvn.12
-- Rebuild for VDR 1.3.38.
-
-* Mon Nov 28 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0.5.1-0.lvn.11
-- Rebuild for VDR 1.3.37.
-
-* Sun Nov  6 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0.5.1-0.lvn.10
-- Rebuild for VDR 1.3.36.
-
-* Tue Nov  1 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0.5.1-0.lvn.9
-- Rebuild for VDR 1.3.35.
-
-* Mon Oct  3 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0.5.1-0.lvn.8
-- Rebuild for VDR 1.3.34.
-
-* Sun Sep 25 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0.5.1-0.lvn.7
-- Rebuild for VDR 1.3.33.
-
-* Sun Sep 11 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0.5.1-0.lvn.6
-- Rebuild for VDR 1.3.32.
-
-* Sun Aug 28 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0.5.1-0.lvn.5
-- Rebuild for VDR 1.3.31.
-
-* Sun Aug 21 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0.5.1-0.lvn.4
-- Rebuild for VDR 1.3.30.
-
-* Tue Aug 16 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0.5.1-0.lvn.3
-- Sync with re-re-released upstream 0.5.1 tarball, cache dir is now
-  stabilized at %%{cachedir}/osdteletext.
-- Try to avoid build system problems by not using %%expand.
-- Honor "vdr-config --user".
-- Improve description.
-
-* Fri Aug 12 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0.5.1-0.lvn.2
-- Sync with re-released upstream 0.5.1 tarball.
-
-* Thu Aug 11 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0.5.1-0.lvn.1
-- 0.5.1.



From jwrdegoede at fedoraproject.org  Sun Jan 11 11:03:30 2009
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Sun, 11 Jan 2009 11:03:30 +0000 (UTC)
Subject: rpms/hedgewars/devel .cvsignore, 1.9, 1.10 hedgewars.spec, 1.14,
	1.15 sources, 1.9, 1.10
Message-ID: <20090111110330.4E1C570141@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/hedgewars/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8971

Modified Files:
	.cvsignore hedgewars.spec sources 
Log Message:
* Sat Jan 10 2009 Hans de Goede <hdegoede at redhat.com> 0.9.8-1
- New upstream release 0.9.8



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/hedgewars/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	4 Nov 2008 10:11:49 -0000	1.9
+++ .cvsignore	11 Jan 2009 11:02:58 -0000	1.10
@@ -1 +1 @@
-hedgewars-src-0.9.7.tar.bz2
+hedgewars-src-0.9.8.tar.bz2


Index: hedgewars.spec
===================================================================
RCS file: /cvs/extras/rpms/hedgewars/devel/hedgewars.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- hedgewars.spec	27 Dec 2008 11:34:10 -0000	1.14
+++ hedgewars.spec	11 Jan 2009 11:02:58 -0000	1.15
@@ -1,6 +1,6 @@
 Name:           hedgewars
-Version:        0.9.7
-Release:        3%{?dist}
+Version:        0.9.8
+Release:        1%{?dist}
 Summary:        2D tankbattle game with the tanks replaced by hedgehogs
 Group:          Amusements/Games
 License:        GPL+
@@ -83,6 +83,9 @@
 
 
 %changelog
+* Sat Jan 10 2009 Hans de Goede <hdegoede at redhat.com> 0.9.8-1
+- New upstream release 0.9.8
+
 * Sat Dec 27 2008 Hans de Goede <hdegoede at redhat.com> 0.9.7-3
 - Fix dejavu font Requires
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/hedgewars/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	4 Nov 2008 10:11:49 -0000	1.9
+++ sources	11 Jan 2009 11:02:58 -0000	1.10
@@ -1 +1 @@
-2326823d2827fb08885dd3944e8692ac  hedgewars-src-0.9.7.tar.bz2
+4ba627156e21800382833d9e85ab3835  hedgewars-src-0.9.8.tar.bz2



From remi at fedoraproject.org  Sun Jan 11 11:10:24 2009
From: remi at fedoraproject.org (Remi Collet)
Date: Sun, 11 Jan 2009 11:10:24 +0000 (UTC)
Subject: rpms/ocsinventory/devel ocsinventory.spec,1.5,1.6
Message-ID: <20090111111024.D86587013F@cvs1.fedora.phx.redhat.com>

Author: remi

Update of /cvs/extras/rpms/ocsinventory/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10413

Modified Files:
	ocsinventory.spec 
Log Message:
minor bug fixes


Index: ocsinventory.spec
===================================================================
RCS file: /cvs/extras/rpms/ocsinventory/devel/ocsinventory.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ocsinventory.spec	17 Oct 2008 17:24:31 -0000	1.5
+++ ocsinventory.spec	11 Jan 2009 11:09:52 -0000	1.6
@@ -10,7 +10,7 @@
 Summary:     Open Computer and Software Inventory Next Generation
 
 Version:     1.02
-Release:     0.9.rc3%{?dist}
+Release:     0.10.rc3%{?dist}
 
 Group:       Applications/Internet
 License:     GPLv2
@@ -22,10 +22,15 @@
 # Database Schema
 # http://ocsinventory.svn.sourceforge.net/viewvc/ocsinventory/trunk/server/ocsreports/files/ocsbase.sql?r1=1390&r2=1413&view=patch
 Patch0:      ocsinventory-r1413.patch
-
 # Update Script
 # http://ocsinventory.svn.sourceforge.net/viewvc/ocsinventory/trunk/server/ocsreports/install.php?r1=1108&r2=1423&view=patch
 Patch1:      ocsinventory-r1423.patch
+# Missing Include
+# http://ocsinventory.svn.sourceforge.net/viewvc/ocsinventory/trunk/server/Apache/Ocsinventory/Server/Inventory.pm?r1=1035&r2=1447&pathrev=1447&sortby=date&view=patch
+Patch2:      ocsinventory-r1447.patch
+# Clean XML
+# http://ocsinventory.svn.sourceforge.net/viewvc/ocsinventory/trunk/server/Apache/Ocsinventory/Interface/Inventory.pm?r1=981&r2=1462&pathrev=1462&sortby=date&view=patch
+Patch3:      ocsinventory-r1462.patch
 
 BuildArch:   noarch
 BuildRoot:   %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -56,7 +61,7 @@
 
 %description -l fr
 Open Computer and Software Inventory Next Generation est une application 
-d??stin??e ?? aider l'administrateur syst??me ou r??seau ?? garder un oeil 
+destin??e ?? aider l'administrateur syst??me ou r??seau ?? garder un oeil 
 sur la configuration des machines du r??seau et sur les logiciels qui y
 sont install??s.
 
@@ -130,6 +135,8 @@
 
 %patch0 -p2
 %patch1 -p2
+%patch2 -p2
+%patch3 -p2
 
 
 %build
@@ -210,10 +217,10 @@
 %if %{useselinux}
 (
 # New File context
-semanage fcontext -a -s system_u -t httpd_sys_script_rw_t -r s0 "%{_localstatedir}/log/ocsinventory-server(/.*)?" 
+semanage fcontext -a -s system_u -t httpd_log_t -r s0 "%{_localstatedir}/log/ocsinventory-server(/.*)?" 
 # files created by app
 restorecon -R %{_localstatedir}/log/ocsinventory-server
-) ||:
+) &>/dev/null ||:
 %endif
 
 
@@ -226,7 +233,7 @@
 # files created by app
 restorecon -R %{_sysconfdir}/ocsinventory/ocsinventory-reports
 restorecon -R %{_localstatedir}/lib/ocsinventory-reports
-) ||:
+) &>/dev/null ||:
 %endif
 
 
@@ -234,7 +241,7 @@
 %if %{useselinux}
 if [ "$1" -eq "0" ]; then
     # Remove the File Context
-    semanage fcontext -d "%{_localstatedir}/log/ocsinventory-server(/.*)?" || :
+    semanage fcontext -d "%{_localstatedir}/log/ocsinventory-server(/.*)?" &>/dev/null || :
 fi
 %endif
 
@@ -243,8 +250,8 @@
 %if %{useselinux}
 if [ "$1" -eq "0" ]; then
     # Remove the File Context
-    semanage fcontext -d "%{_sysconfdir}/ocsinventory/ocsinventory-reports(/.*)?" ||:
-    semanage fcontext -d "%{_localstatedir}/lib/ocsinventory-reports(/.*)?" ||:
+    semanage fcontext -d "%{_sysconfdir}/ocsinventory/ocsinventory-reports(/.*)?" &>/dev/null ||:
+    semanage fcontext -d "%{_localstatedir}/lib/ocsinventory-reports(/.*)?" &>/dev/null ||:
 fi
 %endif
 
@@ -276,6 +283,10 @@
 
 
 %changelog
+* Sun Jan 11 2009 Remi Collet <Fedora at famillecollet.com> 1.02-0.10.rc3
+- add r1447 and r1462 patch
+- change log selinux context (httpd_log_t)
+
 * Fri Oct 17 2008 Remi Collet <Fedora at famillecollet.com> 1.02-0.9.rc3
 - upstream r1423 patch - migration script
 



From remi at fedoraproject.org  Sun Jan 11 11:11:22 2009
From: remi at fedoraproject.org (Remi Collet)
Date: Sun, 11 Jan 2009 11:11:22 +0000 (UTC)
Subject: rpms/ocsinventory/devel ocsinventory-r1447.patch, NONE,
	1.1 ocsinventory-r1462.patch, NONE, 1.1
Message-ID: <20090111111122.416117013F@cvs1.fedora.phx.redhat.com>

Author: remi

Update of /cvs/extras/rpms/ocsinventory/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10626

Added Files:
	ocsinventory-r1447.patch ocsinventory-r1462.patch 
Log Message:
minor bug fixes

ocsinventory-r1447.patch:

--- NEW FILE ocsinventory-r1447.patch ---
--- trunk/server/Apache/Ocsinventory/Server/Inventory.pm	2008/02/27 16:46:48	1035
+++ trunk/server/Apache/Ocsinventory/Server/Inventory.pm	2008/12/04 09:40:40	1447
@@ -39,6 +39,7 @@
 use Apache::Ocsinventory::Server::Inventory::Export;
 use Apache::Ocsinventory::Server::Inventory::Update;
 use Apache::Ocsinventory::Server::Inventory::Filter;
+use Apache::Ocsinventory::Server::Inventory::Update::AccountInfos;
 
 our %XML_PARSER_OPT = (
 	'ForceArray' => []

ocsinventory-r1462.patch:

--- NEW FILE ocsinventory-r1462.patch ---
--- trunk/server/Apache/Ocsinventory/Interface/Inventory.pm	2008/02/18 14:48:14	981
+++ trunk/server/Apache/Ocsinventory/Interface/Inventory.pm	2009/01/08 12:07:03	1462
@@ -24,7 +24,14 @@
 /;
 
 sub get_computers {
-  my $request = decode_xml( shift );
+  my ($data) = @_;
+
+  die unless $data;
+
+  # Remove non printable char from the XML
+  $data =~ s/[[:cntrl:]]//g;
+
+  my $request = decode_xml( $data );
   
   my %build_functions = (
     'INVENTORY' => \&Apache::Ocsinventory::Interface::Inventory::build_xml_inventory,



From remi at fedoraproject.org  Sun Jan 11 11:23:54 2009
From: remi at fedoraproject.org (Remi Collet)
Date: Sun, 11 Jan 2009 11:23:54 +0000 (UTC)
Subject: rpms/ocsinventory/F-10 ocsinventory-r1447.patch, NONE,
	1.1 ocsinventory-r1462.patch, NONE, 1.1 ocsinventory.spec, 1.5, 1.6
Message-ID: <20090111112355.295197013F@cvs1.fedora.phx.redhat.com>

Author: remi

Update of /cvs/extras/rpms/ocsinventory/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13117

Modified Files:
	ocsinventory.spec 
Added Files:
	ocsinventory-r1447.patch ocsinventory-r1462.patch 
Log Message:
minor bug fixes

ocsinventory-r1447.patch:

--- NEW FILE ocsinventory-r1447.patch ---
--- trunk/server/Apache/Ocsinventory/Server/Inventory.pm	2008/02/27 16:46:48	1035
+++ trunk/server/Apache/Ocsinventory/Server/Inventory.pm	2008/12/04 09:40:40	1447
@@ -39,6 +39,7 @@
 use Apache::Ocsinventory::Server::Inventory::Export;
 use Apache::Ocsinventory::Server::Inventory::Update;
 use Apache::Ocsinventory::Server::Inventory::Filter;
+use Apache::Ocsinventory::Server::Inventory::Update::AccountInfos;
 
 our %XML_PARSER_OPT = (
 	'ForceArray' => []

ocsinventory-r1462.patch:

--- NEW FILE ocsinventory-r1462.patch ---
--- trunk/server/Apache/Ocsinventory/Interface/Inventory.pm	2008/02/18 14:48:14	981
+++ trunk/server/Apache/Ocsinventory/Interface/Inventory.pm	2009/01/08 12:07:03	1462
@@ -24,7 +24,14 @@
 /;
 
 sub get_computers {
-  my $request = decode_xml( shift );
+  my ($data) = @_;
+
+  die unless $data;
+
+  # Remove non printable char from the XML
+  $data =~ s/[[:cntrl:]]//g;
+
+  my $request = decode_xml( $data );
   
   my %build_functions = (
     'INVENTORY' => \&Apache::Ocsinventory::Interface::Inventory::build_xml_inventory,


Index: ocsinventory.spec
===================================================================
RCS file: /cvs/extras/rpms/ocsinventory/F-10/ocsinventory.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ocsinventory.spec	17 Oct 2008 17:24:31 -0000	1.5
+++ ocsinventory.spec	11 Jan 2009 11:23:21 -0000	1.6
@@ -10,7 +10,7 @@
 Summary:     Open Computer and Software Inventory Next Generation
 
 Version:     1.02
-Release:     0.9.rc3%{?dist}
+Release:     0.10.rc3%{?dist}
 
 Group:       Applications/Internet
 License:     GPLv2
@@ -22,10 +22,15 @@
 # Database Schema
 # http://ocsinventory.svn.sourceforge.net/viewvc/ocsinventory/trunk/server/ocsreports/files/ocsbase.sql?r1=1390&r2=1413&view=patch
 Patch0:      ocsinventory-r1413.patch
-
 # Update Script
 # http://ocsinventory.svn.sourceforge.net/viewvc/ocsinventory/trunk/server/ocsreports/install.php?r1=1108&r2=1423&view=patch
 Patch1:      ocsinventory-r1423.patch
+# Missing Include
+# http://ocsinventory.svn.sourceforge.net/viewvc/ocsinventory/trunk/server/Apache/Ocsinventory/Server/Inventory.pm?r1=1035&r2=1447&pathrev=1447&sortby=date&view=patch
+Patch2:      ocsinventory-r1447.patch
+# Clean XML
+# http://ocsinventory.svn.sourceforge.net/viewvc/ocsinventory/trunk/server/Apache/Ocsinventory/Interface/Inventory.pm?r1=981&r2=1462&pathrev=1462&sortby=date&view=patch
+Patch3:      ocsinventory-r1462.patch
 
 BuildArch:   noarch
 BuildRoot:   %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -56,7 +61,7 @@
 
 %description -l fr
 Open Computer and Software Inventory Next Generation est une application 
-d??stin??e ?? aider l'administrateur syst??me ou r??seau ?? garder un oeil 
+destin??e ?? aider l'administrateur syst??me ou r??seau ?? garder un oeil 
 sur la configuration des machines du r??seau et sur les logiciels qui y
 sont install??s.
 
@@ -130,6 +135,8 @@
 
 %patch0 -p2
 %patch1 -p2
+%patch2 -p2
+%patch3 -p2
 
 
 %build
@@ -210,10 +217,10 @@
 %if %{useselinux}
 (
 # New File context
-semanage fcontext -a -s system_u -t httpd_sys_script_rw_t -r s0 "%{_localstatedir}/log/ocsinventory-server(/.*)?" 
+semanage fcontext -a -s system_u -t httpd_log_t -r s0 "%{_localstatedir}/log/ocsinventory-server(/.*)?" 
 # files created by app
 restorecon -R %{_localstatedir}/log/ocsinventory-server
-) ||:
+) &>/dev/null ||:
 %endif
 
 
@@ -226,7 +233,7 @@
 # files created by app
 restorecon -R %{_sysconfdir}/ocsinventory/ocsinventory-reports
 restorecon -R %{_localstatedir}/lib/ocsinventory-reports
-) ||:
+) &>/dev/null ||:
 %endif
 
 
@@ -234,7 +241,7 @@
 %if %{useselinux}
 if [ "$1" -eq "0" ]; then
     # Remove the File Context
-    semanage fcontext -d "%{_localstatedir}/log/ocsinventory-server(/.*)?" || :
+    semanage fcontext -d "%{_localstatedir}/log/ocsinventory-server(/.*)?" &>/dev/null || :
 fi
 %endif
 
@@ -243,8 +250,8 @@
 %if %{useselinux}
 if [ "$1" -eq "0" ]; then
     # Remove the File Context
-    semanage fcontext -d "%{_sysconfdir}/ocsinventory/ocsinventory-reports(/.*)?" ||:
-    semanage fcontext -d "%{_localstatedir}/lib/ocsinventory-reports(/.*)?" ||:
+    semanage fcontext -d "%{_sysconfdir}/ocsinventory/ocsinventory-reports(/.*)?" &>/dev/null ||:
+    semanage fcontext -d "%{_localstatedir}/lib/ocsinventory-reports(/.*)?" &>/dev/null ||:
 fi
 %endif
 
@@ -276,6 +283,10 @@
 
 
 %changelog
+* Sun Jan 11 2009 Remi Collet <Fedora at famillecollet.com> 1.02-0.10.rc3
+- add r1447 and r1462 patch
+- change log selinux context (httpd_log_t)
+
 * Fri Oct 17 2008 Remi Collet <Fedora at famillecollet.com> 1.02-0.9.rc3
 - upstream r1423 patch - migration script
 



From remi at fedoraproject.org  Sun Jan 11 11:31:40 2009
From: remi at fedoraproject.org (Remi Collet)
Date: Sun, 11 Jan 2009 11:31:40 +0000 (UTC)
Subject: rpms/ocsinventory/F-9 ocsinventory-r1447.patch, NONE,
	1.1 ocsinventory-r1462.patch, NONE, 1.1 ocsinventory.spec, 1.5, 1.6
Message-ID: <20090111113140.D62437013F@cvs1.fedora.phx.redhat.com>

Author: remi

Update of /cvs/extras/rpms/ocsinventory/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10651

Modified Files:
	ocsinventory.spec 
Added Files:
	ocsinventory-r1447.patch ocsinventory-r1462.patch 
Log Message:
minor bug fixes

ocsinventory-r1447.patch:

--- NEW FILE ocsinventory-r1447.patch ---
--- trunk/server/Apache/Ocsinventory/Server/Inventory.pm	2008/02/27 16:46:48	1035
+++ trunk/server/Apache/Ocsinventory/Server/Inventory.pm	2008/12/04 09:40:40	1447
@@ -39,6 +39,7 @@
 use Apache::Ocsinventory::Server::Inventory::Export;
 use Apache::Ocsinventory::Server::Inventory::Update;
 use Apache::Ocsinventory::Server::Inventory::Filter;
+use Apache::Ocsinventory::Server::Inventory::Update::AccountInfos;
 
 our %XML_PARSER_OPT = (
 	'ForceArray' => []

ocsinventory-r1462.patch:

--- NEW FILE ocsinventory-r1462.patch ---
--- trunk/server/Apache/Ocsinventory/Interface/Inventory.pm	2008/02/18 14:48:14	981
+++ trunk/server/Apache/Ocsinventory/Interface/Inventory.pm	2009/01/08 12:07:03	1462
@@ -24,7 +24,14 @@
 /;
 
 sub get_computers {
-  my $request = decode_xml( shift );
+  my ($data) = @_;
+
+  die unless $data;
+
+  # Remove non printable char from the XML
+  $data =~ s/[[:cntrl:]]//g;
+
+  my $request = decode_xml( $data );
   
   my %build_functions = (
     'INVENTORY' => \&Apache::Ocsinventory::Interface::Inventory::build_xml_inventory,


Index: ocsinventory.spec
===================================================================
RCS file: /cvs/extras/rpms/ocsinventory/F-9/ocsinventory.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ocsinventory.spec	20 Oct 2008 19:21:48 -0000	1.5
+++ ocsinventory.spec	11 Jan 2009 11:31:10 -0000	1.6
@@ -10,7 +10,7 @@
 Summary:     Open Computer and Software Inventory Next Generation
 
 Version:     1.02
-Release:     0.9.rc3%{?dist}.1
+Release:     0.10.rc3%{?dist}
 
 Group:       Applications/Internet
 License:     GPLv2
@@ -22,10 +22,15 @@
 # Database Schema
 # http://ocsinventory.svn.sourceforge.net/viewvc/ocsinventory/trunk/server/ocsreports/files/ocsbase.sql?r1=1390&r2=1413&view=patch
 Patch0:      ocsinventory-r1413.patch
-
 # Update Script
 # http://ocsinventory.svn.sourceforge.net/viewvc/ocsinventory/trunk/server/ocsreports/install.php?r1=1108&r2=1423&view=patch
 Patch1:      ocsinventory-r1423.patch
+# Missing Include
+# http://ocsinventory.svn.sourceforge.net/viewvc/ocsinventory/trunk/server/Apache/Ocsinventory/Server/Inventory.pm?r1=1035&r2=1447&pathrev=1447&sortby=date&view=patch
+Patch2:      ocsinventory-r1447.patch
+# Clean XML
+# http://ocsinventory.svn.sourceforge.net/viewvc/ocsinventory/trunk/server/Apache/Ocsinventory/Interface/Inventory.pm?r1=981&r2=1462&pathrev=1462&sortby=date&view=patch
+Patch3:      ocsinventory-r1462.patch
 
 BuildArch:   noarch
 BuildRoot:   %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -56,7 +61,7 @@
 
 %description -l fr
 Open Computer and Software Inventory Next Generation est une application 
-d??stin??e ?? aider l'administrateur syst??me ou r??seau ?? garder un oeil 
+destin??e ?? aider l'administrateur syst??me ou r??seau ?? garder un oeil 
 sur la configuration des machines du r??seau et sur les logiciels qui y
 sont install??s.
 
@@ -130,6 +135,8 @@
 
 %patch0 -p2
 %patch1 -p2
+%patch2 -p2
+%patch3 -p2
 
 
 %build
@@ -210,10 +217,10 @@
 %if %{useselinux}
 (
 # New File context
-semanage fcontext -a -s system_u -t httpd_sys_script_rw_t -r s0 "%{_localstatedir}/log/ocsinventory-server(/.*)?" 
+semanage fcontext -a -s system_u -t httpd_log_t -r s0 "%{_localstatedir}/log/ocsinventory-server(/.*)?" 
 # files created by app
 restorecon -R %{_localstatedir}/log/ocsinventory-server
-) ||:
+) &>/dev/null ||:
 %endif
 
 
@@ -226,7 +233,7 @@
 # files created by app
 restorecon -R %{_sysconfdir}/ocsinventory/ocsinventory-reports
 restorecon -R %{_localstatedir}/lib/ocsinventory-reports
-) ||:
+) &>/dev/null ||:
 %endif
 
 
@@ -234,7 +241,7 @@
 %if %{useselinux}
 if [ "$1" -eq "0" ]; then
     # Remove the File Context
-    semanage fcontext -d "%{_localstatedir}/log/ocsinventory-server(/.*)?" || :
+    semanage fcontext -d "%{_localstatedir}/log/ocsinventory-server(/.*)?" &>/dev/null || :
 fi
 %endif
 
@@ -243,8 +250,8 @@
 %if %{useselinux}
 if [ "$1" -eq "0" ]; then
     # Remove the File Context
-    semanage fcontext -d "%{_sysconfdir}/ocsinventory/ocsinventory-reports(/.*)?" ||:
-    semanage fcontext -d "%{_localstatedir}/lib/ocsinventory-reports(/.*)?" ||:
+    semanage fcontext -d "%{_sysconfdir}/ocsinventory/ocsinventory-reports(/.*)?" &>/dev/null ||:
+    semanage fcontext -d "%{_localstatedir}/lib/ocsinventory-reports(/.*)?" &>/dev/null ||:
 fi
 %endif
 
@@ -276,8 +283,9 @@
 
 
 %changelog
-* Mon Oct 20 2008 Remi Collet <Fedora at famillecollet.com> 1.02-0.9.rc3.fc9.1
-- bump release 
+* Sun Jan 11 2009 Remi Collet <Fedora at famillecollet.com> 1.02-0.10.rc3
+- add r1447 and r1462 patch
+- change log selinux context (httpd_log_t)
 
 * Fri Oct 17 2008 Remi Collet <Fedora at famillecollet.com> 1.02-0.9.rc3
 - upstream r1423 patch - migration script



From remi at fedoraproject.org  Sun Jan 11 11:36:56 2009
From: remi at fedoraproject.org (Remi Collet)
Date: Sun, 11 Jan 2009 11:36:56 +0000 (UTC)
Subject: rpms/ocsinventory/EL-5 ocsinventory-r1413.patch, NONE,
	1.1 ocsinventory-r1423.patch, NONE, 1.1 ocsinventory-r1447.patch,
	NONE, 1.1 ocsinventory-r1462.patch, NONE,
	1.1 ocsinventory-reports.conf, NONE, 1.1 ocsinventory.spec, NONE,
	1.1 sources, 1.1, 1.2
Message-ID: <20090111113657.05D287013F@cvs1.fedora.phx.redhat.com>

Author: remi

Update of /cvs/extras/rpms/ocsinventory/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11141

Modified Files:
	sources 
Added Files:
	ocsinventory-r1413.patch ocsinventory-r1423.patch 
	ocsinventory-r1447.patch ocsinventory-r1462.patch 
	ocsinventory-reports.conf ocsinventory.spec 
Log Message:
initial import of 1.02 RC3 + patches

ocsinventory-r1413.patch:

--- NEW FILE ocsinventory-r1413.patch ---
--- trunk/server/ocsreports/files/ocsbase.sql	2008/09/26 13:07:51	1390
+++ trunk/server/ocsreports/files/ocsbase.sql	2008/10/11 15:31:04	1413
@@ -699,6 +699,11 @@
 ALTER TABLE subnet ADD INDEX ID(ID);
 ALTER TABLE hardware CHANGE QUALITY QUALITY DECIMAL(7,4) default NULL;
 
+ALTER TABLE groups change REVALIDATE_FROM REVALIDATE_FROM INT default 0; 	 
+ALTER TABLE groups change CREATE_TIME CREATE_TIME INT default 0;
+UPDATE groups SET CREATE_TIME=0 WHERE CREATE_TIME IS NULL;
+UPDATE groups SET REVALIDATE_FROM=0 WHERE REVALIDATE_FROM IS NULL;
+
 DELETE FROM config WHERE name='GUI_VERSION';
 DELETE FROM config WHERE name='IP_MIN_QUALITY';
 
@@ -723,9 +728,13 @@
 INSERT INTO config VALUES ('DOWNLOAD_TIMEOUT', 30, '', 'Validity of a package (in days)');
 INSERT INTO config VALUES ('LOCAL_SERVER', 0, 'localhost', 'Server address used for local import');
 INSERT INTO config VALUES ('LOCAL_PORT', 80, '', 'Server port used for local import');
+INSERT INTO config VALUES ('DOWNLOAD_PACK_DIR','','/var/lib/ocsinventory-reports','Directory for download files');
+INSERT INTO config VALUES ('IPDISCOVER_IPD_DIR','','/var/lib/ocsinventory-reports','Directory for Ipdiscover files');
+
 INSERT INTO blacklist_serials(SERIAL) VALUES ('N/A'),('(null string)'),('INVALID'),('SYS-1234567890'),('SYS-9876543210'),('SN-12345'),('SN-1234567890'),('1111111111'),('1111111'),('1'),('0123456789'),('12345'),('123456'),('1234567'),('12345678'),('123456789'),('1234567890'),('123456789000'),('12345678901234567'),('0000000000'),('000000000'),('00000000'),('0000000'),('000000'),('NNNNNNN'),('xxxxxxxxxxx'),('EVAL'),('IATPASS'),('none'),('To Be Filled By O.E.M.'),('Tulip Computers'),('Serial Number xxxxxx'),('SN-123456fvgv3i0b8o5n6n7k'),('');
 INSERT INTO blacklist_macaddresses(MACADDRESS) VALUES ('00:00:00:00:00:00'),('FF:FF:FF:FF:FF:FF'),('44:45:53:54:00:00'),('44:45:53:54:00:01'),('00:01:02:7D:9B:1C'),('00:08:A1:46:06:35'),('00:08:A1:66:E2:1A'),('00:09:DD:10:37:68'),('00:0F:EA:9A:E2:F0'),('00:10:5A:72:71:F3'),('00:11:11:85:08:8B'),('10:11:11:11:11:11'),('44:45:53:54:61:6F'),('');
 
+
 INSERT INTO operators VALUES ('admin','admin','admin','admin',1, 'Default administrator account');
 
 GRANT ALL PRIVILEGES ON ocsweb.* TO ocs IDENTIFIED BY 'ocs';

ocsinventory-r1423.patch:

--- NEW FILE ocsinventory-r1423.patch ---
--- trunk/server/ocsreports/install.php	2008/03/04 17:07:55	1108
+++ trunk/server/ocsreports/install.php	2008/10/16 15:56:16	1423
@@ -94,15 +94,15 @@
 	else
 		$instOk = true;
 }
-if( ! $instOk ) {
+if( $hnd = @fopen("dbconfig.inc.php", "r") ) {
+		fclose($hnd);
+		require("dbconfig.inc.php");
+		$valNme = $_SESSION["COMPTE_BASE"];
+		$valPass = $_SESSION["PSWD_BASE"];
+		$valServ = $_SESSION["SERVEUR_SQL"];
+}
 
-	if( $hnd = @fopen("dbconfig.inc.php", "r") ) {
-			fclose($hnd);
-			require("dbconfig.inc.php");
-			$valNme = $_SESSION["COMPTE_BASE"];
-			$valPass = $_SESSION["PSWD_BASE"];
-			$valServ = $_SESSION["SERVEUR_SQL"];
-	}
+if( ! $instOk ) {
 
 	echo "<br><form name='fsub' action='install.php' method='POST'><table width='100%'>
 	<tr>
@@ -162,7 +162,8 @@
 }
 
 if($_POST["fin"]=="fin") {
-	if(!@mysql_connect($_POST["host"],"ocs","ocs")) {
+	// Configuration done, so try with account from config file
+	if(!@mysql_connect($valServ,$valNme,$valPass)) {
 		if(mysql_errno()==0) {
 			echo "<br><center><font color=red><b>ERROR: MySql authentication problem. You must add the 'old-passwords' in your mysql configuration file (my.ini). Then restart mysql, and relaunch install.php</b><br></font></center>";
 			die();
@@ -185,10 +186,7 @@
 	die();
 }
 
-fwrite($ch,"<?php \n\$_SESSION[\"SERVEUR_SQL\"]=\"".$_POST["host"]."\";\n\$_SESSION[\"COMPTE_BASE\"]=\"ocs\";\n\$_SESSION[\"PSWD_BASE\"]=\"ocs\";\n?>");
-fclose($ch);
-
-echo "<br><center><font color=green><b>MySql config file successfully written</b></font></center>";
+$keepuser=false;
 
 $db_file = "files/ocsbase.sql";
 if($dbf_handle = @fopen($db_file, "r")) {
@@ -201,7 +199,12 @@
 	foreach ( explode(";", "$sql_query") as $sql_line) {
 		$li++;
 		if(!mysql_query($sql_line)) {
-			if(  mysql_errno()==1062 || mysql_errno()==1061 || mysql_errno()==1044 || mysql_errno()==1065 || mysql_errno()==1060 || mysql_errno()==1054 || mysql_errno()==1091 || mysql_errno()==1061) 
+			if (mysql_errno()==1044 && strpos($sql_line, "GRANT ALL")!==false) {
+				// Provided user not MySQL Administror
+				$keepuser=true;
+				continue;
+			}
+			if(  mysql_errno()==1062 || mysql_errno()==1061 || mysql_errno()==1065 || mysql_errno()==1060 || mysql_errno()==1054 || mysql_errno()==1091 || mysql_errno()==1061) 
 				continue;		
 
 			if(  mysql_errno()==1071 ) {
@@ -230,6 +233,19 @@
 	die();
 }
 
+if ($keepuser) {
+	// Provided user not MySQL Administror
+	// Keep the account used for migration
+	fwrite($ch,"<?php \n\$_SESSION[\"SERVEUR_SQL\"]=\"".$_POST["host"]."\";\n\$_SESSION[\"COMPTE_BASE\"]=\"".$_POST["name"]."\";\n\$_SESSION[\"PSWD_BASE\"]=\"".$_POST["pass"]."\";\n?>");
+	fclose($ch);
+	echo "<br><center><font color=green><b>MySql config file successfully written (using ".$_POST["name"]." account)</b></font></center>";
+} else {
+	// Use account created during installation
+	fwrite($ch,"<?php \n\$_SESSION[\"SERVEUR_SQL\"]=\"".$_POST["host"]."\";\n\$_SESSION[\"COMPTE_BASE\"]=\"ocs\";\n\$_SESSION[\"PSWD_BASE\"]=\"ocs\";\n?>");
+	fclose($ch);
+	echo "<br><center><font color=green><b>MySql config file successfully written (using new ocs account)</b></font></center>";
+}
+
 if($dejaLance>0)	
 	echo "<br><center><font color=green><b>Existing database updated</b></font></center>";
 	

ocsinventory-r1447.patch:

--- NEW FILE ocsinventory-r1447.patch ---
--- trunk/server/Apache/Ocsinventory/Server/Inventory.pm	2008/02/27 16:46:48	1035
+++ trunk/server/Apache/Ocsinventory/Server/Inventory.pm	2008/12/04 09:40:40	1447
@@ -39,6 +39,7 @@
 use Apache::Ocsinventory::Server::Inventory::Export;
 use Apache::Ocsinventory::Server::Inventory::Update;
 use Apache::Ocsinventory::Server::Inventory::Filter;
+use Apache::Ocsinventory::Server::Inventory::Update::AccountInfos;
 
 our %XML_PARSER_OPT = (
 	'ForceArray' => []

ocsinventory-r1462.patch:

--- NEW FILE ocsinventory-r1462.patch ---
--- trunk/server/Apache/Ocsinventory/Interface/Inventory.pm	2008/02/18 14:48:14	981
+++ trunk/server/Apache/Ocsinventory/Interface/Inventory.pm	2009/01/08 12:07:03	1462
@@ -24,7 +24,14 @@
 /;
 
 sub get_computers {
-  my $request = decode_xml( shift );
+  my ($data) = @_;
+
+  die unless $data;
+
+  # Remove non printable char from the XML
+  $data =~ s/[[:cntrl:]]//g;
+
+  my $request = decode_xml( $data );
   
   my %build_functions = (
     'INVENTORY' => \&Apache::Ocsinventory::Interface::Inventory::build_xml_inventory,


--- NEW FILE ocsinventory-reports.conf ---
################################################################################
#
# OCS Inventory NG Administration Server
#
# Copyleft 2008 OCS Inventory NG Team
# Web: http://www.ocsinventory-ng.org
#
# This code is open source and may be copied and modified as long as the source
# code is always made freely available.
# Please refer to the General Public Licence http://www.gnu.org/ or Licence.txt
################################################################################

#
# ANY CHANGE ON THIS FILE REQUIRES APACHE RESTART TO TAKE EFFECT
#

################################################################################
# Administration console public pages
# 

# Uncomment if you want a virtual host for OCS Inventory NG
#<VirtualHost *:80>
#        ServerName   ocsinventory-ng
#        ServerAlias  ocsinventory-ng.yourdomain.tld
#        DocumentRoot PATH_TO_OCSREPORTS_DIR

Alias OCSREPORTS_ALIAS PATH_TO_OCSREPORTS_DIR

<Directory PATH_TO_OCSREPORTS_DIR>
    # By default, users can use console from everywhere
    Order deny,allow
    Allow from all

    AddDefaultCharset ISO-8859-1
    
    Options Indexes FollowSymLinks
    DirectoryIndex index.php
    
    # Uncomment following to force use of HTTPS in Administration Server
    #SSLRequireSSL
    
        php_flag short_open_tag         on
        php_flag file_uploads           on

        # Some PHP tuning for deployement feature up to 50 MB
        php_value post_max_size         51M
        php_value upload_max_filesize   50M

        # You may have to uncomment following on errors
        #php_value memory_limit          16M
        #php_value max_execution_time    -1
        #php_value max_input_time 	     -1

    # Uncomment following to allow HTTP body request up to 4 MB
    # instead default 512 KB
    #LimitRequestBody 4194304
</Directory>

################################################################################
# Deployment packages download area
# 
Alias PACKAGES_ALIAS PATH_TO_PACKAGES_DIR

#</VirtualHost>



--- NEW FILE ocsinventory.spec ---
%if %{?fedora}%{?rhel} >= 5
%define useselinux 1
%else
%define useselinux 0
%endif

%define tarname OCSNG_UNIX_SERVER_1.02RC3

Name:        ocsinventory
Summary:     Open Computer and Software Inventory Next Generation

Version:     1.02
Release:     0.10.rc3%{?dist}

Group:       Applications/Internet
License:     GPLv2
URL:         http://www.ocsinventory-ng.org/

Source0:     http://downloads.sourceforge.net/%{name}/%{tarname}.tar.gz
Source1:     ocsinventory-reports.conf

# Database Schema
# http://ocsinventory.svn.sourceforge.net/viewvc/ocsinventory/trunk/server/ocsreports/files/ocsbase.sql?r1=1390&r2=1413&view=patch
Patch0:      ocsinventory-r1413.patch
# Update Script
# http://ocsinventory.svn.sourceforge.net/viewvc/ocsinventory/trunk/server/ocsreports/install.php?r1=1108&r2=1423&view=patch
Patch1:      ocsinventory-r1423.patch
# Missing Include
# http://ocsinventory.svn.sourceforge.net/viewvc/ocsinventory/trunk/server/Apache/Ocsinventory/Server/Inventory.pm?r1=1035&r2=1447&pathrev=1447&sortby=date&view=patch
Patch2:      ocsinventory-r1447.patch
# Clean XML
# http://ocsinventory.svn.sourceforge.net/viewvc/ocsinventory/trunk/server/Apache/Ocsinventory/Interface/Inventory.pm?r1=981&r2=1462&pathrev=1462&sortby=date&view=patch
Patch3:      ocsinventory-r1462.patch

BuildArch:   noarch
BuildRoot:   %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: perl(ExtUtils::MakeMaker)
BuildRequires: perl(Apache::DBI)
BuildRequires: perl(DBD::mysql)
BuildRequires: perl(Net::IP)
BuildRequires: perl(XML::Simple)

# Main package is a dummy package
Requires:    ocsinventory-server  = %{version}-%{release}
Requires:    ocsinventory-reports = %{version}-%{release}
Requires:    mysql-server


%description
Open Computer and Software Inventory Next Generation is an application
designed to help a network or system administrator keep track of the
computers configuration and software that are installed on the network.

OCS Inventory is also able to detect all active devices on your network,
such as switch, router, network printer and unattended devices.

OCS Inventory NG includes package deployment feature on client computers.

ocsinventory is a metapackage that will install the communication server,
the administration console and the database server (MySQL).

%description -l fr
Open Computer and Software Inventory Next Generation est une application 
destin??e ?? aider l'administrateur syst??me ou r??seau ?? garder un oeil 
sur la configuration des machines du r??seau et sur les logiciels qui y
sont install??s.

OCS Inventory est aussi capable de d??tecter tout p??riph??rique actif sur
le r??seau, comme les commutateurs, routeurs, imprimantes et autres mat??riels
autonomes.

OCS Inventory NG int??gre des fonctionnalit??s de t??l??diffusion de paquets
sur les machines clients.

ocsinventory est un metapaquet qui installera le serveur de communication, 
la console d'administration et le serveur de base de donn??es (MySQL).

%package server
Group:    Applications/Internet
Summary:  OCS Inventory NG - Communication server
Requires: mod_perl
%if 0%{?rhel} != 4
# when use with mod_perl2
Requires: perl(SOAP::Transport::HTTP2)
%endif
Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
# Required by the original setup script, but not detected automatically :
# Apache::DBI drags in DBI
Requires: perl(Apache::DBI)
Requires: perl(Net::IP)
Requires: perl(DBD::mysql)
# Optional, not detected automatically :
Requires: perl(SOAP::Lite)
Requires: perl(XML::Entities)
%if %{useselinux}
Requires: policycoreutils
%endif

%description server
This package provides the Communication server, which will handle HTTP
communications between database server and agents.

%description -l fr server
Ce paquet fournit le serveur de communication (Communication server), 
qui g??re les communications HTTP entre les agents et le serveur de base
de donn??es.


%package reports
Group:    Applications/Internet
Summary:  OCS Inventory NG - Communication server
# From PHP_Compat : date, mysql, ereg, pcre, zip, hash, xml, gd, zlib 
Requires: php
Requires: php-mysql php-zip php-xml php-gd 
# Required by the original setup script, but not detected automatically :
Requires: perl(DBD::mysql)
# Required by ipdiscover-util.pl (nmap and nmblookup)
Requires: nmap samba-client
%if %{useselinux}
Requires: policycoreutils
%endif

%description reports
This package provides the Administration console, which will allow 
administrators to query the database server through their favorite browser.

%description -l fr reports
Ce paquet fournit la console d'administration (Administration console), 
qui autorise les administrateurs ?? interroger la base de donn??es via leur
navigateur favori.


%prep
%setup -q -n %{tarname}

%patch0 -p2
%patch1 -p2
%patch2 -p2
%patch3 -p2


%build
cd Apache
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}


%install
rm -rf %{buildroot}

# --- ocsinventory-server --- communication server
cd Apache
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 ';'

chmod -R u+rwX,go+rX,go-w %{buildroot}/*
find %{buildroot}%{perl_vendorlib}/Apache -name \*.pm -exec chmod -x {} \;

%if 0%{?rhel} == 4
# To avoid bad dependency on perl(mod_perl2)
rm -f %{buildroot}%{perl_vendorlib}/Apache/Ocsinventory/Server/Modperl2.pm
%else
# To avoid bad dependency on perl(mod_perl) : RHEL >= 5 && Fedora >= 4
rm -f %{buildroot}%{perl_vendorlib}/Apache/Ocsinventory/Server/Modperl1.pm
%endif

%{__mkdir_p} %{buildroot}%{_localstatedir}/log/ocsinventory-server

%{__mkdir_p} %{buildroot}%{_sysconfdir}/logrotate.d
%{__sed} -e 's;PATH_TO_LOG_DIRECTORY;%{_localstatedir}/log/ocsinventory-server;' \
   ./etc/logrotate.d/ocsinventory-server >%{buildroot}%{_sysconfdir}/logrotate.d/ocsinventory-server

# default configuration (localhost) should work on "simple" installation
%{__mkdir_p} %{buildroot}%{_sysconfdir}/httpd/conf.d
%{__sed} -e "s;DATABASE_SERVER;localhost;g" \
    -e "s;DATABASE_PORT;3306;g" \
%if 0%{?rhel} == 4
    -e "s;VERSION_MP;1;g" \
%else
    -e "s;VERSION_MP;2;g" \
%endif
    -e "s;PATH_TO_LOG_DIRECTORY;%{_localstatedir}/log/ocsinventory-server;g" \
    ./etc/ocsinventory/ocsinventory-server.conf | \
    grep -v IfModule >%{buildroot}%{_sysconfdir}/httpd/conf.d/ocsinventory-server.conf
cd ..

# --- ocsinventory-reports --- administration console

%{__mkdir_p} %{buildroot}/%{_datadir}/ocsinventory-reports
cp -ar ocsreports %{buildroot}/%{_datadir}/ocsinventory-reports
find %{buildroot}/%{_datadir}/ocsinventory-reports \( -name \*.php -o -name \*.css \) -exec chmod -x {} \;

%{__mkdir_p} %{buildroot}/%{_sysconfdir}/ocsinventory/ocsinventory-reports

mv %{buildroot}/%{_datadir}/ocsinventory-reports/ocsreports/dbconfig.inc.php \
   %{buildroot}/%{_sysconfdir}/ocsinventory/ocsinventory-reports/dbconfig.inc.php
ln -s ../../../../%{_sysconfdir}/ocsinventory/ocsinventory-reports/dbconfig.inc.php %{buildroot}/%{_datadir}/ocsinventory-reports/ocsreports/dbconfig.inc.php

%{__mkdir_p} %{buildroot}%{_localstatedir}/lib/ocsinventory-reports/{download,ipd}

%{__install} -pm 755 Apache/binutils/ipdiscover-util.pl %{buildroot}/%{_datadir}/ocsinventory-reports/ocsreports/ipdiscover-util.pl

%{__mkdir_p} %{buildroot}%{_sysconfdir}/httpd/conf.d
%{__sed} -e "s;OCSREPORTS_ALIAS;/ocsreports;g" \
         -e "s;PATH_TO_OCSREPORTS_DIR;%{_datadir}/ocsinventory-reports/ocsreports;g" \
         -e "s;PACKAGES_ALIAS;/download;g" \
         -e "s;PATH_TO_PACKAGES_DIR;%{_localstatedir}/lib/ocsinventory-reports/download;g" \
    %{SOURCE1} >%{buildroot}%{_sysconfdir}/httpd/conf.d/ocsinventory-reports.conf


%clean
rm -rf %{buildroot}


%post server
%if %{useselinux}
(
# New File context
semanage fcontext -a -s system_u -t httpd_log_t -r s0 "%{_localstatedir}/log/ocsinventory-server(/.*)?" 
# files created by app
restorecon -R %{_localstatedir}/log/ocsinventory-server
) &>/dev/null ||:
%endif


%post reports
%if %{useselinux}
(
# New File context
semanage fcontext -a -s system_u -t httpd_sys_script_rw_t -r s0 "%{_sysconfdir}/ocsinventory/ocsinventory-reports(/.*)?"
semanage fcontext -a -s system_u -t httpd_sys_script_rw_t -r s0 "%{_localstatedir}/lib/ocsinventory-reports(/.*)?"
# files created by app
restorecon -R %{_sysconfdir}/ocsinventory/ocsinventory-reports
restorecon -R %{_localstatedir}/lib/ocsinventory-reports
) &>/dev/null ||:
%endif


%postun server
%if %{useselinux}
if [ "$1" -eq "0" ]; then
    # Remove the File Context
    semanage fcontext -d "%{_localstatedir}/log/ocsinventory-server(/.*)?" &>/dev/null || :
fi
%endif


%postun reports
%if %{useselinux}
if [ "$1" -eq "0" ]; then
    # Remove the File Context
    semanage fcontext -d "%{_sysconfdir}/ocsinventory/ocsinventory-reports(/.*)?" &>/dev/null ||:
    semanage fcontext -d "%{_localstatedir}/lib/ocsinventory-reports(/.*)?" &>/dev/null ||:
fi
%endif


%files
%defattr(-, root, root, -)


%files server
%defattr(-, root, root, -)
%doc LICENSE.txt README
%config(noreplace) %{_sysconfdir}/logrotate.d/ocsinventory-server
%config(noreplace) %{_sysconfdir}/httpd/conf.d/ocsinventory-server.conf
%attr(755,apache,root) %{_localstatedir}/log/ocsinventory-server
%{perl_vendorlib}/Apache


%files reports
%defattr(-, root, root, -)
%doc LICENSE.txt README
%dir %{_sysconfdir}/ocsinventory
%dir %{_sysconfdir}/ocsinventory/ocsinventory-reports
%attr(640,apache,root) %config(noreplace) %{_sysconfdir}/ocsinventory/ocsinventory-reports/dbconfig.inc.php
%config(noreplace) %{_sysconfdir}/httpd/conf.d/ocsinventory-reports.conf
%{_datadir}/ocsinventory-reports
%attr(755,apache,root) %dir %{_localstatedir}/lib/ocsinventory-reports
%attr(755,apache,root) %dir %{_localstatedir}/lib/ocsinventory-reports/ipd
%attr(755,apache,root) %dir %{_localstatedir}/lib/ocsinventory-reports/download


%changelog
* Sun Jan 11 2009 Remi Collet <Fedora at famillecollet.com> 1.02-0.10.rc3
- add r1447 and r1462 patch
- change log selinux context (httpd_log_t)

* Fri Oct 17 2008 Remi Collet <Fedora at famillecollet.com> 1.02-0.9.rc3
- upstream r1423 patch - migration script

* Sat Oct 11 2008 Remi Collet <Fedora at famillecollet.com> 1.02-0.8.rc3
- upstream r1413 patch - database schema

* Sat Oct 11 2008 Remi Collet <Fedora at famillecollet.com> 1.02-0.7.rc3
- update to RC3

* Tue Jul 22 2008 Remi Collet <Fedora at famillecollet.com> 1.02-0.6.rc2
- add missing requires perl(SOAP::Transport::HTTP2) (with mod_perl2)
- AddDefaultCharset ISO-8859-1 in httpd config
- fix SElinux path

* Sat Jun 14 2008 Remi Collet <Fedora at famillecollet.com> 1.02-0.5.rc2
- change dir from /var/lib/ocsinventory-server to /var/lib/ocsinventory-reports
- add Requires nmap and samba-client (nmblookup)

* Sun May 18 2008 Remi Collet <Fedora at famillecollet.com> 1.02-0.4.rc2
- remove <IfModule> from ocsinventory-server.conf
- change perm to 755 on /var/lib/ocsinventory-server
- metapackage description closer to upstream components name
- add BR perl(DBD::mysql) to avoid build warning

* Fri May 16 2008 Xavier Bachelot <xavier at bachelot.org> 1.02-0.3.rc2.1
- Fix BuildRequires and Requires.
- Fix %%description french translations and a few typos.
- Rename apache confs.

* Sat May 10 2008 Remi Collet <Fedora at famillecollet.com> 1.02-0.3.rc2
- add missing requires for php extensions (from PHP_Compat result)
- add selinux stuff

* Thu May 08 2008 Remi Collet <Fedora at famillecollet.com> 1.02-0.2.rc2
- update to RC2

* Sun Mar 15 2008 Remi Collet <Fedora at famillecollet.com> 1.02-0.2.rc1
- fix download dir

* Sat Mar  8 2008 Remi Collet <Fedora at famillecollet.com> 1.02-0.1.rc1
- Initial RPM



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ocsinventory/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	23 Jun 2008 19:15:31 -0000	1.1
+++ sources	11 Jan 2009 11:36:25 -0000	1.2
@@ -0,0 +1 @@
+f2f284d352c65095039abb88321cdf6e  OCSNG_UNIX_SERVER_1.02RC3.tar.gz



From remi at fedoraproject.org  Sun Jan 11 11:41:33 2009
From: remi at fedoraproject.org (Remi Collet)
Date: Sun, 11 Jan 2009 11:41:33 +0000 (UTC)
Subject: rpms/ocsinventory/EL-4 ocsinventory-r1413.patch, NONE,
	1.1 ocsinventory-r1423.patch, NONE, 1.1 ocsinventory-r1447.patch,
	NONE, 1.1 ocsinventory-r1462.patch, NONE,
	1.1 ocsinventory-reports.conf, 1.1, 1.2 ocsinventory.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <20090111114133.25DFB70139@cvs1.fedora.phx.redhat.com>

Author: remi

Update of /cvs/extras/rpms/ocsinventory/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12214

Modified Files:
	ocsinventory-reports.conf ocsinventory.spec sources 
Added Files:
	ocsinventory-r1413.patch ocsinventory-r1423.patch 
	ocsinventory-r1447.patch ocsinventory-r1462.patch 
Log Message:
initial import of 1.02 RC3 + patches

ocsinventory-r1413.patch:

--- NEW FILE ocsinventory-r1413.patch ---
--- trunk/server/ocsreports/files/ocsbase.sql	2008/09/26 13:07:51	1390
+++ trunk/server/ocsreports/files/ocsbase.sql	2008/10/11 15:31:04	1413
@@ -699,6 +699,11 @@
 ALTER TABLE subnet ADD INDEX ID(ID);
 ALTER TABLE hardware CHANGE QUALITY QUALITY DECIMAL(7,4) default NULL;
 
+ALTER TABLE groups change REVALIDATE_FROM REVALIDATE_FROM INT default 0; 	 
+ALTER TABLE groups change CREATE_TIME CREATE_TIME INT default 0;
+UPDATE groups SET CREATE_TIME=0 WHERE CREATE_TIME IS NULL;
+UPDATE groups SET REVALIDATE_FROM=0 WHERE REVALIDATE_FROM IS NULL;
+
 DELETE FROM config WHERE name='GUI_VERSION';
 DELETE FROM config WHERE name='IP_MIN_QUALITY';
 
@@ -723,9 +728,13 @@
 INSERT INTO config VALUES ('DOWNLOAD_TIMEOUT', 30, '', 'Validity of a package (in days)');
 INSERT INTO config VALUES ('LOCAL_SERVER', 0, 'localhost', 'Server address used for local import');
 INSERT INTO config VALUES ('LOCAL_PORT', 80, '', 'Server port used for local import');
+INSERT INTO config VALUES ('DOWNLOAD_PACK_DIR','','/var/lib/ocsinventory-reports','Directory for download files');
+INSERT INTO config VALUES ('IPDISCOVER_IPD_DIR','','/var/lib/ocsinventory-reports','Directory for Ipdiscover files');
+
 INSERT INTO blacklist_serials(SERIAL) VALUES ('N/A'),('(null string)'),('INVALID'),('SYS-1234567890'),('SYS-9876543210'),('SN-12345'),('SN-1234567890'),('1111111111'),('1111111'),('1'),('0123456789'),('12345'),('123456'),('1234567'),('12345678'),('123456789'),('1234567890'),('123456789000'),('12345678901234567'),('0000000000'),('000000000'),('00000000'),('0000000'),('000000'),('NNNNNNN'),('xxxxxxxxxxx'),('EVAL'),('IATPASS'),('none'),('To Be Filled By O.E.M.'),('Tulip Computers'),('Serial Number xxxxxx'),('SN-123456fvgv3i0b8o5n6n7k'),('');
 INSERT INTO blacklist_macaddresses(MACADDRESS) VALUES ('00:00:00:00:00:00'),('FF:FF:FF:FF:FF:FF'),('44:45:53:54:00:00'),('44:45:53:54:00:01'),('00:01:02:7D:9B:1C'),('00:08:A1:46:06:35'),('00:08:A1:66:E2:1A'),('00:09:DD:10:37:68'),('00:0F:EA:9A:E2:F0'),('00:10:5A:72:71:F3'),('00:11:11:85:08:8B'),('10:11:11:11:11:11'),('44:45:53:54:61:6F'),('');
 
+
 INSERT INTO operators VALUES ('admin','admin','admin','admin',1, 'Default administrator account');
 
 GRANT ALL PRIVILEGES ON ocsweb.* TO ocs IDENTIFIED BY 'ocs';

ocsinventory-r1423.patch:

--- NEW FILE ocsinventory-r1423.patch ---
--- trunk/server/ocsreports/install.php	2008/03/04 17:07:55	1108
+++ trunk/server/ocsreports/install.php	2008/10/16 15:56:16	1423
@@ -94,15 +94,15 @@
 	else
 		$instOk = true;
 }
-if( ! $instOk ) {
+if( $hnd = @fopen("dbconfig.inc.php", "r") ) {
+		fclose($hnd);
+		require("dbconfig.inc.php");
+		$valNme = $_SESSION["COMPTE_BASE"];
+		$valPass = $_SESSION["PSWD_BASE"];
+		$valServ = $_SESSION["SERVEUR_SQL"];
+}
 
-	if( $hnd = @fopen("dbconfig.inc.php", "r") ) {
-			fclose($hnd);
-			require("dbconfig.inc.php");
-			$valNme = $_SESSION["COMPTE_BASE"];
-			$valPass = $_SESSION["PSWD_BASE"];
-			$valServ = $_SESSION["SERVEUR_SQL"];
-	}
+if( ! $instOk ) {
 
 	echo "<br><form name='fsub' action='install.php' method='POST'><table width='100%'>
 	<tr>
@@ -162,7 +162,8 @@
 }
 
 if($_POST["fin"]=="fin") {
-	if(!@mysql_connect($_POST["host"],"ocs","ocs")) {
+	// Configuration done, so try with account from config file
+	if(!@mysql_connect($valServ,$valNme,$valPass)) {
 		if(mysql_errno()==0) {
 			echo "<br><center><font color=red><b>ERROR: MySql authentication problem. You must add the 'old-passwords' in your mysql configuration file (my.ini). Then restart mysql, and relaunch install.php</b><br></font></center>";
 			die();
@@ -185,10 +186,7 @@
 	die();
 }
 
-fwrite($ch,"<?php \n\$_SESSION[\"SERVEUR_SQL\"]=\"".$_POST["host"]."\";\n\$_SESSION[\"COMPTE_BASE\"]=\"ocs\";\n\$_SESSION[\"PSWD_BASE\"]=\"ocs\";\n?>");
-fclose($ch);
-
-echo "<br><center><font color=green><b>MySql config file successfully written</b></font></center>";
+$keepuser=false;
 
 $db_file = "files/ocsbase.sql";
 if($dbf_handle = @fopen($db_file, "r")) {
@@ -201,7 +199,12 @@
 	foreach ( explode(";", "$sql_query") as $sql_line) {
 		$li++;
 		if(!mysql_query($sql_line)) {
-			if(  mysql_errno()==1062 || mysql_errno()==1061 || mysql_errno()==1044 || mysql_errno()==1065 || mysql_errno()==1060 || mysql_errno()==1054 || mysql_errno()==1091 || mysql_errno()==1061) 
+			if (mysql_errno()==1044 && strpos($sql_line, "GRANT ALL")!==false) {
+				// Provided user not MySQL Administror
+				$keepuser=true;
+				continue;
+			}
+			if(  mysql_errno()==1062 || mysql_errno()==1061 || mysql_errno()==1065 || mysql_errno()==1060 || mysql_errno()==1054 || mysql_errno()==1091 || mysql_errno()==1061) 
 				continue;		
 
 			if(  mysql_errno()==1071 ) {
@@ -230,6 +233,19 @@
 	die();
 }
 
+if ($keepuser) {
+	// Provided user not MySQL Administror
+	// Keep the account used for migration
+	fwrite($ch,"<?php \n\$_SESSION[\"SERVEUR_SQL\"]=\"".$_POST["host"]."\";\n\$_SESSION[\"COMPTE_BASE\"]=\"".$_POST["name"]."\";\n\$_SESSION[\"PSWD_BASE\"]=\"".$_POST["pass"]."\";\n?>");
+	fclose($ch);
+	echo "<br><center><font color=green><b>MySql config file successfully written (using ".$_POST["name"]." account)</b></font></center>";
+} else {
+	// Use account created during installation
+	fwrite($ch,"<?php \n\$_SESSION[\"SERVEUR_SQL\"]=\"".$_POST["host"]."\";\n\$_SESSION[\"COMPTE_BASE\"]=\"ocs\";\n\$_SESSION[\"PSWD_BASE\"]=\"ocs\";\n?>");
+	fclose($ch);
+	echo "<br><center><font color=green><b>MySql config file successfully written (using new ocs account)</b></font></center>";
+}
+
 if($dejaLance>0)	
 	echo "<br><center><font color=green><b>Existing database updated</b></font></center>";
 	

ocsinventory-r1447.patch:

--- NEW FILE ocsinventory-r1447.patch ---
--- trunk/server/Apache/Ocsinventory/Server/Inventory.pm	2008/02/27 16:46:48	1035
+++ trunk/server/Apache/Ocsinventory/Server/Inventory.pm	2008/12/04 09:40:40	1447
@@ -39,6 +39,7 @@
 use Apache::Ocsinventory::Server::Inventory::Export;
 use Apache::Ocsinventory::Server::Inventory::Update;
 use Apache::Ocsinventory::Server::Inventory::Filter;
+use Apache::Ocsinventory::Server::Inventory::Update::AccountInfos;
 
 our %XML_PARSER_OPT = (
 	'ForceArray' => []

ocsinventory-r1462.patch:

--- NEW FILE ocsinventory-r1462.patch ---
--- trunk/server/Apache/Ocsinventory/Interface/Inventory.pm	2008/02/18 14:48:14	981
+++ trunk/server/Apache/Ocsinventory/Interface/Inventory.pm	2009/01/08 12:07:03	1462
@@ -24,7 +24,14 @@
 /;
 
 sub get_computers {
-  my $request = decode_xml( shift );
+  my ($data) = @_;
+
+  die unless $data;
+
+  # Remove non printable char from the XML
+  $data =~ s/[[:cntrl:]]//g;
+
+  my $request = decode_xml( $data );
   
   my %build_functions = (
     'INVENTORY' => \&Apache::Ocsinventory::Interface::Inventory::build_xml_inventory,


Index: ocsinventory-reports.conf
===================================================================
RCS file: /cvs/extras/rpms/ocsinventory/EL-4/ocsinventory-reports.conf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ocsinventory-reports.conf	24 Jun 2008 05:07:04 -0000	1.1
+++ ocsinventory-reports.conf	11 Jan 2009 11:41:02 -0000	1.2
@@ -23,7 +23,6 @@
 #        ServerName   ocsinventory-ng
 #        ServerAlias  ocsinventory-ng.yourdomain.tld
 #        DocumentRoot PATH_TO_OCSREPORTS_DIR
-#        AddDefaultCharset ISO-8859-1
 
 Alias OCSREPORTS_ALIAS PATH_TO_OCSREPORTS_DIR
 
@@ -31,6 +30,8 @@
     # By default, users can use console from everywhere
     Order deny,allow
     Allow from all
+
+    AddDefaultCharset ISO-8859-1
     
     Options Indexes FollowSymLinks
     DirectoryIndex index.php


Index: ocsinventory.spec
===================================================================
RCS file: /cvs/extras/rpms/ocsinventory/EL-4/ocsinventory.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ocsinventory.spec	24 Jun 2008 05:07:04 -0000	1.1
+++ ocsinventory.spec	11 Jan 2009 11:41:02 -0000	1.2
@@ -4,13 +4,13 @@
 %define useselinux 0
 %endif
 
-%define tarname OCSNG_UNIX_SERVER_1.02_RC2
+%define tarname OCSNG_UNIX_SERVER_1.02RC3
 
 Name:        ocsinventory
 Summary:     Open Computer and Software Inventory Next Generation
 
 Version:     1.02
-Release:     0.5.rc2%{?dist}
+Release:     0.10.rc3%{?dist}
 
 Group:       Applications/Internet
 License:     GPLv2
@@ -19,10 +19,18 @@
 Source0:     http://downloads.sourceforge.net/%{name}/%{tarname}.tar.gz
 Source1:     ocsinventory-reports.conf
 
-# http://ocsinventory.cvs.sourceforge.net/ocsinventory/server/ocsreports/files/ocsbase.sql?r1=1.25&r2=1.26&view=patch&sortby=date
-# http://ocsinventory.cvs.sourceforge.net/ocsinventory/server/README?r1=1.6&r2=1.7&view=patch&sortby=date
-# http://ocsinventory.cvs.sourceforge.net/ocsinventory/server/setup.sh?r1=1.18&r2=1.20&view=patch&sortby=date
-Patch0:      ocsinventory-path.patch
+# Database Schema
+# http://ocsinventory.svn.sourceforge.net/viewvc/ocsinventory/trunk/server/ocsreports/files/ocsbase.sql?r1=1390&r2=1413&view=patch
+Patch0:      ocsinventory-r1413.patch
+# Update Script
+# http://ocsinventory.svn.sourceforge.net/viewvc/ocsinventory/trunk/server/ocsreports/install.php?r1=1108&r2=1423&view=patch
+Patch1:      ocsinventory-r1423.patch
+# Missing Include
+# http://ocsinventory.svn.sourceforge.net/viewvc/ocsinventory/trunk/server/Apache/Ocsinventory/Server/Inventory.pm?r1=1035&r2=1447&pathrev=1447&sortby=date&view=patch
+Patch2:      ocsinventory-r1447.patch
+# Clean XML
+# http://ocsinventory.svn.sourceforge.net/viewvc/ocsinventory/trunk/server/Apache/Ocsinventory/Interface/Inventory.pm?r1=981&r2=1462&pathrev=1462&sortby=date&view=patch
+Patch3:      ocsinventory-r1462.patch
 
 BuildArch:   noarch
 BuildRoot:   %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -53,7 +61,7 @@
 
 %description -l fr
 Open Computer and Software Inventory Next Generation est une application 
-d??stin??e ?? aider l'administrateur syst??me ou r??seau ?? garder un oeil 
+destin??e ?? aider l'administrateur syst??me ou r??seau ?? garder un oeil 
 sur la configuration des machines du r??seau et sur les logiciels qui y
 sont install??s.
 
@@ -71,6 +79,10 @@
 Group:    Applications/Internet
 Summary:  OCS Inventory NG - Communication server
 Requires: mod_perl
+%if 0%{?rhel} != 4
+# when use with mod_perl2
+Requires: perl(SOAP::Transport::HTTP2)
+%endif
 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 # Required by the original setup script, but not detected automatically :
 # Apache::DBI drags in DBI
@@ -121,15 +133,10 @@
 %prep
 %setup -q -n %{tarname}
 
-%patch0 -p0
-
-cat <<EOF >dbconfig.inc.php
-<?php
-\$_SESSION["SERVEUR_SQL"]="";
-\$_SESSION["COMPTE_BASE"]="ocs";
-\$_SESSION["PSWD_BASE"]="ocs";
-?>
-EOF
+%patch0 -p2
+%patch1 -p2
+%patch2 -p2
+%patch3 -p2
 
 
 %build
@@ -185,7 +192,8 @@
 find %{buildroot}/%{_datadir}/ocsinventory-reports \( -name \*.php -o -name \*.css \) -exec chmod -x {} \;
 
 %{__mkdir_p} %{buildroot}/%{_sysconfdir}/ocsinventory/ocsinventory-reports
-%{__install} -m640 dbconfig.inc.php \
+
+mv %{buildroot}/%{_datadir}/ocsinventory-reports/ocsreports/dbconfig.inc.php \
    %{buildroot}/%{_sysconfdir}/ocsinventory/ocsinventory-reports/dbconfig.inc.php
 ln -s ../../../../%{_sysconfdir}/ocsinventory/ocsinventory-reports/dbconfig.inc.php %{buildroot}/%{_datadir}/ocsinventory-reports/ocsreports/dbconfig.inc.php
 
@@ -209,10 +217,10 @@
 %if %{useselinux}
 (
 # New File context
-semanage fcontext -a -s system_u -t httpd_sys_script_rw_t -r s0 "%{_localstatedir}/log/ocsinventory-server(/.*)?" 
+semanage fcontext -a -s system_u -t httpd_log_t -r s0 "%{_localstatedir}/log/ocsinventory-server(/.*)?" 
 # files created by app
 restorecon -R %{_localstatedir}/log/ocsinventory-server
-) ||:
+) &>/dev/null ||:
 %endif
 
 
@@ -221,11 +229,11 @@
 (
 # New File context
 semanage fcontext -a -s system_u -t httpd_sys_script_rw_t -r s0 "%{_sysconfdir}/ocsinventory/ocsinventory-reports(/.*)?"
-semanage fcontext -a -s system_u -t httpd_sys_script_rw_t -r s0 "%{_localstatedir}/lib/ocsinventory-server(/.*)?"
+semanage fcontext -a -s system_u -t httpd_sys_script_rw_t -r s0 "%{_localstatedir}/lib/ocsinventory-reports(/.*)?"
 # files created by app
 restorecon -R %{_sysconfdir}/ocsinventory/ocsinventory-reports
-restorecon -R %{_localstatedir}/lib/ocsinventory-server
-) ||:
+restorecon -R %{_localstatedir}/lib/ocsinventory-reports
+) &>/dev/null ||:
 %endif
 
 
@@ -233,7 +241,7 @@
 %if %{useselinux}
 if [ "$1" -eq "0" ]; then
     # Remove the File Context
-    semanage fcontext -d "%{_localstatedir}/log/ocsinventory-server(/.*)?" || :
+    semanage fcontext -d "%{_localstatedir}/log/ocsinventory-server(/.*)?" &>/dev/null || :
 fi
 %endif
 
@@ -242,8 +250,8 @@
 %if %{useselinux}
 if [ "$1" -eq "0" ]; then
     # Remove the File Context
-    semanage fcontext -d "%{_sysconfdir}/ocsinventory/ocsinventory-reports(/.*)?" ||:
-    semanage fcontext -d "%{_localstatedir}/lib/ocsinventory-reports(/.*)?" ||:
+    semanage fcontext -d "%{_sysconfdir}/ocsinventory/ocsinventory-reports(/.*)?" &>/dev/null ||:
+    semanage fcontext -d "%{_localstatedir}/lib/ocsinventory-reports(/.*)?" &>/dev/null ||:
 fi
 %endif
 
@@ -275,6 +283,24 @@
 
 
 %changelog
+* Sun Jan 11 2009 Remi Collet <Fedora at famillecollet.com> 1.02-0.10.rc3
+- add r1447 and r1462 patch
+- change log selinux context (httpd_log_t)
+
+* Fri Oct 17 2008 Remi Collet <Fedora at famillecollet.com> 1.02-0.9.rc3
+- upstream r1423 patch - migration script
+
+* Sat Oct 11 2008 Remi Collet <Fedora at famillecollet.com> 1.02-0.8.rc3
+- upstream r1413 patch - database schema
+
+* Sat Oct 11 2008 Remi Collet <Fedora at famillecollet.com> 1.02-0.7.rc3
+- update to RC3
+
+* Tue Jul 22 2008 Remi Collet <Fedora at famillecollet.com> 1.02-0.6.rc2
+- add missing requires perl(SOAP::Transport::HTTP2) (with mod_perl2)
+- AddDefaultCharset ISO-8859-1 in httpd config
+- fix SElinux path
+
 * Sat Jun 14 2008 Remi Collet <Fedora at famillecollet.com> 1.02-0.5.rc2
 - change dir from /var/lib/ocsinventory-server to /var/lib/ocsinventory-reports
 - add Requires nmap and samba-client (nmblookup)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ocsinventory/EL-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	24 Jun 2008 05:07:04 -0000	1.2
+++ sources	11 Jan 2009 11:41:02 -0000	1.3
@@ -1 +1 @@
-4c582d29db7777506b5cfe49f15af3c4  OCSNG_UNIX_SERVER_1.02_RC2.tar.gz
+f2f284d352c65095039abb88321cdf6e  OCSNG_UNIX_SERVER_1.02RC3.tar.gz



From jwrdegoede at fedoraproject.org  Sun Jan 11 12:30:47 2009
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Sun, 11 Jan 2009 12:30:47 +0000 (UTC)
Subject: rpms/libv4l/devel .cvsignore, 1.14, 1.15 libv4l.spec, 1.13,
	1.14 sources, 1.14, 1.15
Message-ID: <20090111123047.7758C70139@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/libv4l/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16332

Modified Files:
	.cvsignore libv4l.spec sources 
Log Message:
* Sun Jan 11 2009 Hans de Goede <j.w.r.degoede at hhs.nl> 0.5.8-1
- New upstream release 0.5.8



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libv4l/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	2 Dec 2008 22:31:27 -0000	1.14
+++ .cvsignore	11 Jan 2009 12:30:16 -0000	1.15
@@ -1 +1 @@
-libv4l-0.5.7.tar.gz
+libv4l-0.5.8.tar.gz


Index: libv4l.spec
===================================================================
RCS file: /cvs/extras/rpms/libv4l/devel/libv4l.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- libv4l.spec	2 Dec 2008 22:31:27 -0000	1.13
+++ libv4l.spec	11 Jan 2009 12:30:16 -0000	1.14
@@ -1,5 +1,5 @@
 Name:           libv4l
-Version:        0.5.7
+Version:        0.5.8
 Release:        1%{?dist}
 Summary:        Collection of video4linux support libraries 
 Group:          System Environment/Libraries
@@ -75,6 +75,9 @@
 
 
 %changelog
+* Sun Jan 11 2009 Hans de Goede <j.w.r.degoede at hhs.nl> 0.5.8-1
+- New upstream release 0.5.8
+
 * Tue Dec  2 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 0.5.7-1
 - New upstream release 0.5.7, fixing rh 473771
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libv4l/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	2 Dec 2008 22:31:27 -0000	1.14
+++ sources	11 Jan 2009 12:30:16 -0000	1.15
@@ -1 +1 @@
-a5056dcf337e240e5370984f95d9ad68  libv4l-0.5.7.tar.gz
+4f8ae9c743b215c8ac0e553eaa01e980  libv4l-0.5.8.tar.gz



From jwrdegoede at fedoraproject.org  Sun Jan 11 12:31:07 2009
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Sun, 11 Jan 2009 12:31:07 +0000 (UTC)
Subject: rpms/libv4l/F-10 .cvsignore, 1.13, 1.14 libv4l.spec, 1.12,
	1.13 sources, 1.13, 1.14
Message-ID: <20090111123107.9339170139@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/libv4l/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16366

Modified Files:
	.cvsignore libv4l.spec sources 
Log Message:
* Sun Jan 11 2009 Hans de Goede <j.w.r.degoede at hhs.nl> 0.5.8-1
- New upstream release 0.5.8



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libv4l/F-10/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	2 Dec 2008 22:33:19 -0000	1.13
+++ .cvsignore	11 Jan 2009 12:30:36 -0000	1.14
@@ -1 +1 @@
-libv4l-0.5.7.tar.gz
+libv4l-0.5.8.tar.gz


Index: libv4l.spec
===================================================================
RCS file: /cvs/extras/rpms/libv4l/F-10/libv4l.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- libv4l.spec	2 Dec 2008 22:33:19 -0000	1.12
+++ libv4l.spec	11 Jan 2009 12:30:37 -0000	1.13
@@ -1,5 +1,5 @@
 Name:           libv4l
-Version:        0.5.7
+Version:        0.5.8
 Release:        1%{?dist}
 Summary:        Collection of video4linux support libraries 
 Group:          System Environment/Libraries
@@ -75,6 +75,9 @@
 
 
 %changelog
+* Sun Jan 11 2009 Hans de Goede <j.w.r.degoede at hhs.nl> 0.5.8-1
+- New upstream release 0.5.8
+
 * Tue Dec  2 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 0.5.7-1
 - New upstream release 0.5.7, fixing rh 473771
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libv4l/F-10/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	2 Dec 2008 22:33:19 -0000	1.13
+++ sources	11 Jan 2009 12:30:37 -0000	1.14
@@ -1 +1 @@
-a5056dcf337e240e5370984f95d9ad68  libv4l-0.5.7.tar.gz
+4f8ae9c743b215c8ac0e553eaa01e980  libv4l-0.5.8.tar.gz



From jwrdegoede at fedoraproject.org  Sun Jan 11 12:31:23 2009
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Sun, 11 Jan 2009 12:31:23 +0000 (UTC)
Subject: rpms/libv4l/F-9 .cvsignore, 1.4, 1.5 libv4l.spec, 1.3, 1.4 sources, 
	1.4, 1.5
Message-ID: <20090111123123.D569470139@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/libv4l/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16417

Modified Files:
	.cvsignore libv4l.spec sources 
Log Message:
* Sun Jan 11 2009 Hans de Goede <j.w.r.degoede at hhs.nl> 0.5.8-1
- New upstream release 0.5.8



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libv4l/F-9/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	2 Dec 2008 22:39:16 -0000	1.4
+++ .cvsignore	11 Jan 2009 12:30:53 -0000	1.5
@@ -1 +1 @@
-libv4l-0.5.7.tar.gz
+libv4l-0.5.8.tar.gz


Index: libv4l.spec
===================================================================
RCS file: /cvs/extras/rpms/libv4l/F-9/libv4l.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- libv4l.spec	2 Dec 2008 22:39:16 -0000	1.3
+++ libv4l.spec	11 Jan 2009 12:30:53 -0000	1.4
@@ -1,5 +1,5 @@
 Name:           libv4l
-Version:        0.5.7
+Version:        0.5.8
 Release:        1%{?dist}
 Summary:        Collection of video4linux support libraries 
 Group:          System Environment/Libraries
@@ -75,6 +75,9 @@
 
 
 %changelog
+* Sun Jan 11 2009 Hans de Goede <j.w.r.degoede at hhs.nl> 0.5.8-1
+- New upstream release 0.5.8
+
 * Tue Dec  2 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 0.5.7-1
 - New upstream release 0.5.7, fixing rh 473771
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libv4l/F-9/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	2 Dec 2008 22:39:16 -0000	1.4
+++ sources	11 Jan 2009 12:30:53 -0000	1.5
@@ -1 +1 @@
-a5056dcf337e240e5370984f95d9ad68  libv4l-0.5.7.tar.gz
+4f8ae9c743b215c8ac0e553eaa01e980  libv4l-0.5.8.tar.gz



From caolanm at fedoraproject.org  Sun Jan 11 12:42:13 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Sun, 11 Jan 2009 12:42:13 +0000 (UTC)
Subject: rpms/hunspell-sk/devel .cvsignore, 1.4, 1.5 hunspell-sk.spec, 1.5, 
	1.6 sources, 1.4, 1.5
Message-ID: <20090111124214.1B5BB70141@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/hunspell-sk/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17697

Modified Files:
	.cvsignore hunspell-sk.spec sources 
Log Message:
latest version


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-sk/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	18 Dec 2008 10:01:41 -0000	1.4
+++ .cvsignore	11 Jan 2009 12:41:43 -0000	1.5
@@ -1 +1 @@
-hunspell-sk-20080525.zip
+hunspell-sk-20090106.zip


Index: hunspell-sk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-sk/devel/hunspell-sk.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- hunspell-sk.spec	18 Dec 2008 10:01:42 -0000	1.5
+++ hunspell-sk.spec	11 Jan 2009 12:41:43 -0000	1.6
@@ -1,7 +1,7 @@
 Name: hunspell-sk
 Summary: Slovak hunspell dictionaries
 Epoch: 1
-%define upstreamid 20080525
+%define upstreamid 20090106
 Version: 0.%{upstreamid}
 Release: 1%{?dist}
 Source: http://www.sk-spell.sk.cx/file_download/38/%{name}-%{upstreamid}.zip
@@ -34,6 +34,9 @@
 %{_datadir}/myspell/*
 
 %changelog
+* Sun Jan 11 2009 Caolan McNamara <caolanm at redhat.com> - 1:0.20090106-1
+- latest version
+
 * Thu Dec 03 2008 Caolan McNamara <caolanm at redhat.com> - 1:0.20080525-1
 - latest version
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-sk/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	18 Dec 2008 10:01:42 -0000	1.4
+++ sources	11 Jan 2009 12:41:43 -0000	1.5
@@ -1 +1 @@
-8cf8d75142c2f21f103829694955d615  hunspell-sk-20080525.zip
+8cf8d75142c2f21f103829694955d615  hunspell-sk-20090106.zip



From caolanm at fedoraproject.org  Sun Jan 11 12:51:25 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Sun, 11 Jan 2009 12:51:25 +0000 (UTC)
Subject: rpms/hunspell-sk/devel hunspell-sk.spec,1.6,1.7 sources,1.5,1.6
Message-ID: <20090111125125.4322A70139@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/hunspell-sk/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19388

Modified Files:
	hunspell-sk.spec sources 
Log Message:
wrong url


Index: hunspell-sk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-sk/devel/hunspell-sk.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- hunspell-sk.spec	11 Jan 2009 12:41:43 -0000	1.6
+++ hunspell-sk.spec	11 Jan 2009 12:50:54 -0000	1.7
@@ -4,7 +4,7 @@
 %define upstreamid 20090106
 Version: 0.%{upstreamid}
 Release: 1%{?dist}
-Source: http://www.sk-spell.sk.cx/file_download/38/%{name}-%{upstreamid}.zip
+Source: http://www.sk-spell.sk.cx/file_download/51/%{name}-%{upstreamid}.zip
 Group: Applications/Text
 URL: http://www.sk-spell.sk.cx/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-sk/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	11 Jan 2009 12:41:43 -0000	1.5
+++ sources	11 Jan 2009 12:50:54 -0000	1.6
@@ -1 +1 @@
-8cf8d75142c2f21f103829694955d615  hunspell-sk-20090106.zip
+f5d7adfd55c2802438b3d7386fc7d971  hunspell-sk-20090106.zip



From caolanm at fedoraproject.org  Sun Jan 11 12:55:45 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Sun, 11 Jan 2009 12:55:45 +0000 (UTC)
Subject: rpms/hunspell-en/devel .cvsignore, 1.12, 1.13 hunspell-en.spec, 1.25,
	1.26 mozilla_words.patch, 1.5, 1.6 sources, 1.14, 1.15
Message-ID: <20090111125545.7A4AA70139@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/hunspell-en/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19866

Modified Files:
	.cvsignore hunspell-en.spec mozilla_words.patch sources 
Log Message:
latest version


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-en/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	18 Dec 2008 14:55:01 -0000	1.12
+++ .cvsignore	11 Jan 2009 12:55:15 -0000	1.13
@@ -1,2 +1,2 @@
 en_GB.zip
-wordlist-20081216.tar.bz2
+wordlist-20090110.tar.bz2


Index: hunspell-en.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-en/devel/hunspell-en.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- hunspell-en.spec	18 Dec 2008 14:55:01 -0000	1.25
+++ hunspell-en.spec	11 Jan 2009 12:55:15 -0000	1.26
@@ -1,6 +1,6 @@
 Name: hunspell-en
 Summary: English hunspell dictionaries
-%define upstreamid 20081216
+%define upstreamid 20090110
 Version: 0.%{upstreamid}
 Release: 1%{?dist}
 #svn co https://wordlist.svn.sourceforge.net/svnroot/wordlist/trunk wordlist
@@ -64,6 +64,9 @@
 %{_datadir}/myspell/*
 
 %changelog
+* Sun Jan 11 2009 Caolan McNamara <caolanm at redhat.com> - 0.20090110-1
+- latest version
+
 * Thu Dec 18 2008 Caolan McNamara <caolanm at redhat.com> - 0.20081216-1
 - latest version
 

mozilla_words.patch:

Index: mozilla_words.patch
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-en/devel/mozilla_words.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- mozilla_words.patch	6 Dec 2008 16:36:19 -0000	1.5
+++ mozilla_words.patch	11 Jan 2009 12:55:15 -0000	1.6
@@ -1,10 +1,11 @@
 --- wordlist.orig/scowl/r/special/proper-names	2008-02-08 11:53:27.000000000 +0000
 +++ wordlist/scowl/r/special/proper-names	2008-02-08 12:06:00.000000000 +0000
-@@ -4,6 +4,8 @@
+@@ -3,7 +3,9 @@
+ Barack
  Bernanke
  Biden
- Bugzilla
 +Camino
+ Bugzilla
 +ChatZilla
  Debian
  Emacs


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-en/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	18 Dec 2008 14:55:02 -0000	1.14
+++ sources	11 Jan 2009 12:55:15 -0000	1.15
@@ -1,2 +1,2 @@
 218909136738f4564b81ecd145ade6ee  en_GB.zip
-cc4f9f45f56fbd61ca8001f19dbb5eef  wordlist-20081216.tar.bz2
+9fa7c4a4dbf6edcabd2fc9a3fed20f13  wordlist-20090110.tar.bz2



From lkundrak at fedoraproject.org  Sun Jan 11 13:08:29 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Sun, 11 Jan 2009 13:08:29 +0000 (UTC)
Subject: rpms/grub/devel 0001-Get-rid-of-usr-bin-cmp-dependency.patch, NONE, 
	1.1 0002-Add-strspn-strcspn-and-strtok_r.patch, NONE,
	1.1 0003-Allow-passing-multiple-image-files-to-the-initrd-com.patch, 
	NONE, 1.1 0004-Obey-2.06-boot-protocol-s-cmdline_size.patch,
	NONE, 1.1 grub.spec, 1.77, 1.78
Message-ID: <20090111130829.3293470139@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/grub/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21355

Modified Files:
	grub.spec 
Added Files:
	0001-Get-rid-of-usr-bin-cmp-dependency.patch 
	0002-Add-strspn-strcspn-and-strtok_r.patch 
	0003-Allow-passing-multiple-image-files-to-the-initrd-com.patch 
	0004-Obey-2.06-boot-protocol-s-cmdline_size.patch 
Log Message:
* Sun Jan 11 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.97-37
- Get rid of /usr/bin/cmp dependency (Ville Skytt??, #431351)
- Support multiple initrds (Jeff Layton, #179127)
- Obey 2.06 boot protocol's cmdline_size (Lubomir Rintel, #327541)


0001-Get-rid-of-usr-bin-cmp-dependency.patch:

--- NEW FILE 0001-Get-rid-of-usr-bin-cmp-dependency.patch ---
>From 25a07e29651d771c6d86ab94ea9489f7475c5b48 Mon Sep 17 00:00:00 2001
From: =?utf-8?q?Ville=20Skytt=C3=A4?= <ville.skytta at iki.fi>
Date: Sun, 11 Jan 2009 11:50:11 +0100
Subject: [PATCH] Get rid of /usr/bin/cmp dependency

Looks like it would be easy to get rid of the diffutils dependency in grub,
patch attached.

More discussion at
http://www.redhat.com/archives/fedora-devel-list/2008-January/msg02881.html

Bug Report: https://bugzilla.redhat.com/show_bug.cgi?id=431351
---
 util/grub-install.in |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/util/grub-install.in b/util/grub-install.in
index 5ceb77d..24e4490 100644
--- a/util/grub-install.in
+++ b/util/grub-install.in
@@ -597,9 +597,14 @@ for file in ${grubdir}/stage1 ${grubdir}/stage2 ${grubdir}/*stage1_5; do
     while test $count -gt 0; do
         dump_boot_block $root_drive $img_file
         if grep "Error [0-9]*: " $log_file >/dev/null; then
-    	:
-        elif cmp $file $img_file >/dev/null; then
-    	break
+            :
+        else
+            # Use sha1sum instead of cmp to avoid a dependency on diffutils.
+            sha1=`sha1sum $file | cut -d' ' -f 1`
+            sha2=`sha1sum $img_file | cut -d' ' -f 1`
+            if test -f $file -a -f $img_file -a "$sha1" = "$sha2"; then
+                break
+            fi
         fi
         sleep 1
         count=`expr $count - 1`    
-- 
1.5.5.6


0002-Add-strspn-strcspn-and-strtok_r.patch:

--- NEW FILE 0002-Add-strspn-strcspn-and-strtok_r.patch ---
>From 45286d4ad7d54adc8d9d06dd3382912b5bee6845 Mon Sep 17 00:00:00 2001
From: Jeff Layton <jlayton at redhat.com>
Date: Sun, 11 Jan 2009 11:55:35 +0100
Subject: [PATCH] Add strspn, strcspn, and strtok_r

This adds strspn, strcspn, and strtok_r to char_io.c. This is to support the
parsing of multiple options on the initrd commandline.

These were "borrowed" from dietlibc with some small changes.

Bug Report: https://bugzilla.redhat.com/show_bug.cgi?id=179127
---
 stage2/char_io.c |   51 +++++++++++++++++++++++++++++++++++++++++++++++++++
 stage2/shared.h  |    7 ++++++-
 2 files changed, 57 insertions(+), 1 deletions(-)

diff --git a/stage2/char_io.c b/stage2/char_io.c
index 7a67289..9b67c0d 100644
--- a/stage2/char_io.c
+++ b/stage2/char_io.c
@@ -1363,6 +1363,57 @@ grub_strlen (const char *str)
 
   return len;
 }
+
+/* this function "borrowed" from dietlibc */
+int
+grub_strspn(const char *s, const char *accept)
+{
+  int l=0;
+  int a=1,i,al=grub_strlen(accept);
+
+  while((a)&&(*s))
+  {
+    for(a=i=0;(!a)&&(i<al);i++)
+      if (*s==accept[i]) a=1;
+    if (a) l++;
+    s++;
+  }
+  return l;
+}
+
+/* this function "borrowed" from dietlibc */
+int
+grub_strcspn(const char *s, const char *reject)
+{
+  int l=0;
+  int a=1,i,al=grub_strlen(reject);
+
+  while((a)&&(*s))
+  {
+    for(i=0;(a)&&(i<al);i++)
+      if (*s==reject[i]) a=0;
+    if (a) l++;
+    s++;
+  }
+  return l;
+}
+
+/* this function "borrowed" from dietlibc */
+char *
+grub_strtok_r(char *s, const char *delim, char **ptrptr) {
+  char *tmp=0;
+
+  if (s==0) s=*ptrptr;
+  s+=grub_strspn(s,delim);           /* overread leading delimiter */
+  if (*s) {
+    tmp=s;
+    s+=grub_strcspn(s,delim);
+    if (*s) *s++=0;   /* not the end ? => terminate it */
+  }
+  *ptrptr=s;
+  return tmp;
+}
+
 #endif /* ! STAGE1_5 */
 
 #ifdef GRUB_UTIL
diff --git a/stage2/shared.h b/stage2/shared.h
index 1be7ab1..93f586f 100644
--- a/stage2/shared.h
+++ b/stage2/shared.h
@@ -375,9 +375,11 @@ extern void *grub_scratch_mem;
 #define tolower grub_tolower
 #define strlen grub_strlen
 #define strcpy grub_strcpy
+#define strspn grub_strspn
+#define strcspn grub_strcspn
+#define strtok_r grub_strtok_r
 #endif /* WITHOUT_LIBC_STUBS */
 
-
 #ifndef ASM_FILE
 /*
  *  Below this should be ONLY defines and other constructs for C code.
@@ -899,6 +901,9 @@ int grub_memcmp (const char *s1, const char *s2, int n);
 int grub_strcmp (const char *s1, const char *s2);
 int grub_strlen (const char *str);
 char *grub_strcpy (char *dest, const char *src);
+int grub_strspn(const char *s, const char *accept);
+int grub_strcspn(const char *s, const char *reject);
+char *grub_strtok_r(char *s, const char *delim, char **ptrptr);
 
 #ifndef GRUB_UTIL
 typedef unsigned long grub_jmp_buf[8];
-- 
1.5.5.6


0003-Allow-passing-multiple-image-files-to-the-initrd-com.patch:

--- NEW FILE 0003-Allow-passing-multiple-image-files-to-the-initrd-com.patch ---
>From 4d0a7b6087a228c60cd85d9360bb47f62773fefd Mon Sep 17 00:00:00 2001
From: Jeff Layton <jlayton at redhat.com>
Date: Sun, 11 Jan 2009 11:56:35 +0100
Subject: [PATCH] Allow passing multiple image files to the initrd command

This patch allows you to pass multiple image files to the kernel by adding more
than one filename to the initrd parameter. i.e.:

initrd /initramfs-image1.gz /initramfs-image2.gz

Bug Report: https://bugzilla.redhat.com/show_bug.cgi?id=179127
---
 stage2/boot.c |   30 +++++++++++++++++++-----------
 1 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/stage2/boot.c b/stage2/boot.c
index ec25acf..eee8bb1 100644
--- a/stage2/boot.c
+++ b/stage2/boot.c
@@ -814,7 +814,8 @@ load_initrd (char *initrd)
 #endif
   return grub_load_initrd (initrd);
 #else
-  int len;
+  int len, next_addr;
+  char *singleimage, *pos;
   unsigned long moveto;
   unsigned long max_addr;
   struct linux_kernel_header *lh
@@ -823,16 +824,24 @@ load_initrd (char *initrd)
 #ifndef NO_DECOMPRESSION
   no_decompression = 1;
 #endif
-  
-  if (! grub_open (initrd))
-    goto fail;
+  len = 0;
+  next_addr = cur_addr;
 
-  len = grub_read ((char *) cur_addr, -1);
-  if (! len)
-    {
-      grub_close ();
-      goto fail;
-    }
+  /* loop over all initrd images and concatenate them in memory */
+  singleimage = strtok_r(initrd," \t",&pos);
+  while (singleimage) {
+    if (! grub_open (singleimage))
+      continue;
+
+    len += grub_read ((char *) next_addr, -1);
+    grub_close ();
+
+    next_addr = cur_addr + len;
+    singleimage = strtok_r(NULL," \t",&pos);
+  }
+
+  if (!len)
+    goto fail;
 
   if (linux_mem_size)
     moveto = linux_mem_size;
@@ -862,7 +871,6 @@ load_initrd (char *initrd)
   lh->ramdisk_image = RAW_ADDR (moveto);
   lh->ramdisk_size = len;
 
-  grub_close ();
 
  fail:
   
-- 
1.5.5.6


0004-Obey-2.06-boot-protocol-s-cmdline_size.patch:

--- NEW FILE 0004-Obey-2.06-boot-protocol-s-cmdline_size.patch ---
>From cbb7e3d28164467b104814484965d30333d529ba Mon Sep 17 00:00:00 2001
From: Lubomir Rintel <lkundrak at v3.sk>
Date: Sun, 11 Jan 2009 12:04:10 +0100
Subject: [PATCH] Obey 2.06 boot protocol's cmdline_size

This increases the limit for the command line according to kernel's
setting, up to 0x7FF characters. This limit was chosen because it
matches current kernel's limitation and doesn't need substantial
change in memory layout, consuming only spare space (and leaving
once as much bytes spare for possible future expansion).

Bug Report: https://bugzilla.redhat.com/attachment.cgi?id=327541
---
 stage2/boot.c   |   13 +++++++++++--
 stage2/shared.h |    7 +++++--
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/stage2/boot.c b/stage2/boot.c
index eee8bb1..2267721 100644
--- a/stage2/boot.c
+++ b/stage2/boot.c
@@ -228,6 +228,7 @@ load_image (char *kernel, char *arg, kernel_t suggested_type,
     {
       int big_linux = 0;
       int setup_sects = lh->setup_sects;
+      int cmdline_size = 0xff;
 
       if (lh->header == LINUX_MAGIC_SIGNATURE && lh->version >= 0x0200)
 	{
@@ -255,6 +256,14 @@ load_image (char *kernel, char *arg, kernel_t suggested_type,
 	      lh->cl_offset = LINUX_CL_OFFSET;
 	      lh->setup_move_size = LINUX_SETUP_MOVE_SIZE;
 	    }
+
+	  if (lh->version >= 0x0206)
+	    {
+	      cmdline_size = lh->cmdline_size;
+	      if (cmdline_size > (LINUX_CL_END_OFFSET - LINUX_CL_OFFSET))
+		cmdline_size = LINUX_CL_END_OFFSET - LINUX_CL_OFFSET;
+	    }
+
 	}
       else
 	{
@@ -411,7 +420,7 @@ load_image (char *kernel, char *arg, kernel_t suggested_type,
 	    char *src = skip_to (0, arg);
 	    char *dest = linux_data_tmp_addr + LINUX_CL_OFFSET;
 	
-	    while (dest < linux_data_tmp_addr + LINUX_CL_END_OFFSET && *src)
+	    while (dest < linux_data_tmp_addr + LINUX_CL_OFFSET + cmdline_size && *src)
 	      *(dest++) = *(src++);
 	
 	    /* Old Linux kernels have problems determining the amount of
@@ -432,7 +441,7 @@ load_image (char *kernel, char *arg, kernel_t suggested_type,
 	    if (! grub_strstr (arg, "mem=")
 		&& ! (load_flags & KERNEL_LOAD_NO_MEM_OPTION)
 		&& lh->version < 0x0203		/* kernel version < 2.4.18 */
-		&& dest + 15 < linux_data_tmp_addr + LINUX_CL_END_OFFSET)
+		&& dest + 15 < linux_data_tmp_addr + LINUX_CL_OFFSET + cmdline_size)
 	      {
 		*dest++ = ' ';
 		*dest++ = 'm';
diff --git a/stage2/shared.h b/stage2/shared.h
index 93f586f..49711af 100644
--- a/stage2/shared.h
+++ b/stage2/shared.h
@@ -162,8 +162,8 @@ extern void *grub_scratch_mem;
 #define LINUX_VID_MODE_ASK		0xFFFD
 
 #define LINUX_CL_OFFSET			0x9000
-#define LINUX_CL_END_OFFSET		0x90FF
-#define LINUX_SETUP_MOVE_SIZE		0x9100
+#define LINUX_CL_END_OFFSET		0x97FF
+#define LINUX_SETUP_MOVE_SIZE		0x9800
 #define LINUX_CL_MAGIC			0xA33F
 
 /*
@@ -423,6 +423,9 @@ struct linux_kernel_header
   unsigned short pad1;			/* Unused */
   char *cmd_line_ptr;			/* Points to the kernel command line */
   unsigned int initrd_addr_max;		/* The highest address of initrd */
+  unsigned int kernel_alignment;	/* Physical addr alignment required for kernel */
+  unsigned int relocatable_kernel;	/* Whether kernel is relocatable or not */
+  unsigned int cmdline_size;		/* Maximum size of the kernel command line */
 } __attribute__ ((packed));
 
 /* Memory map address range descriptor used by GET_MMAP_ENTRY. */
-- 
1.5.5.6



Index: grub.spec
===================================================================
RCS file: /cvs/pkgs/rpms/grub/devel/grub.spec,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- grub.spec	22 Oct 2008 20:50:06 -0000	1.77
+++ grub.spec	11 Jan 2009 13:07:58 -0000	1.78
@@ -1,25 +1,36 @@
 Name: grub
 Version: 0.97
-Release: 36%{?dist}
-Summary: GRUB - the Grand Unified Boot Loader.
+Release: 37%{?dist}
+Summary: Grand Unified Boot Loader
 Group: System Environment/Base
 License: GPLv2+
 
 ExclusiveArch: i386 x86_64 ia64
 BuildRequires: binutils >= 2.9.1.0.23, ncurses-devel, ncurses-static, texinfo
 BuildRequires: autoconf /usr/lib/crt1.o automake gnu-efi >= 3.0e-2
-PreReq: /sbin/install-info
+Requires(post): /sbin/install-info
+Requires(preun): /sbin/install-info
 Requires: mktemp
-Requires: /usr/bin/cmp
 Requires: system-logos
-BuildRoot: %{_tmppath}/%{name}-%{version}-root
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 URL: http://www.gnu.org/software/%{name}/
 Source0: ftp://alpha.gnu.org/gnu/%{name}/%{name}-%{version}.tar.gz
+
+# This is from
+# http://git.kernel.org/?p=boot/grub-fedora/grub-fedora.git;a=summary
 Patch0: grub-fedora-9.patch
+
 Patch1: grub-keystatus.patch
 Patch2: grub-chainloader-timeout.patch
 
+# Various bugfixes
+# http://fedorapeople.org/~lkundrak/grub-fedora.git/
+Patch1001: 0001-Get-rid-of-usr-bin-cmp-dependency.patch
+Patch1002: 0002-Add-strspn-strcspn-and-strtok_r.patch
+Patch1003: 0003-Allow-passing-multiple-image-files-to-the-initrd-com.patch
+Patch1004: 0004-Obey-2.06-boot-protocol-s-cmdline_size.patch
+
 %description
 GRUB (Grand Unified Boot Loader) is an experimental boot loader
 capable of booting into most free operating systems - Linux, FreeBSD,
@@ -31,6 +42,10 @@
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch1001 -p1
+%patch1002 -p1
+%patch1003 -p1
+%patch1004 -p1
 
 %build
 autoreconf
@@ -93,6 +108,11 @@
 %{_datadir}/grub
 
 %changelog
+* Sun Jan 11 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.97-37
+- Get rid of /usr/bin/cmp dependency (Ville Skytt??, #431351)
+- Support multiple initrds (Jeff Layton, #179127)
+- Obey 2.06 boot protocol's cmdline_size (Lubomir Rintel, #327541)
+
 * Wed Oct 22 2008 Peter Jones <pjones at redhat.com> - 0.97-36
 - Add force-chainloader patch from rstrode (rhbz #458576)
 



From dtimms at fedoraproject.org  Sun Jan 11 13:27:48 2009
From: dtimms at fedoraproject.org (David Timms)
Date: Sun, 11 Jan 2009 13:27:48 +0000 (UTC)
Subject: comps comps-f10.xml.in,1.202,1.203 comps-f11.xml.in,1.54,1.55
Message-ID: <20090111132748.DD0AB70139@cvs1.fedora.phx.redhat.com>

Author: dtimms

Update of /cvs/pkgs/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24039

Modified Files:
	comps-f10.xml.in comps-f11.xml.in 
Log Message:
fix pyvnc2swf and rakarrack being set as default. changed to optional. sorted.



Index: comps-f10.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f10.xml.in,v
retrieving revision 1.202
retrieving revision 1.203
diff -u -r1.202 -r1.203
--- comps-f10.xml.in	4 Jan 2009 23:33:19 -0000	1.202
+++ comps-f10.xml.in	11 Jan 2009 13:27:16 -0000	1.203
@@ -4045,8 +4045,6 @@
       <packagereq type="default">pavucontrol</packagereq>
       <packagereq type="default">pulseaudio</packagereq>
       <packagereq type="default">pulseaudio-utils</packagereq>
-      <packagereq type="default">pyvnc2swf</packagereq>
-      <packagereq type="default">rakarrack</packagereq>
       <packagereq type="default">rhythmbox</packagereq>
       <packagereq type="default">sound-juicer</packagereq>
       <packagereq type="default">sox</packagereq>
@@ -4115,7 +4113,9 @@
       <packagereq type="optional">pitivi</packagereq>
       <packagereq type="optional">pulseaudio-module-lirc</packagereq>
       <packagereq type="optional">pulseaudio-module-zeroconf</packagereq>
+      <packagereq type="optional">pyvnc2swf</packagereq>
       <packagereq type="optional">quodlibet</packagereq>
+      <packagereq type="optional">rakarrack</packagereq>
       <packagereq type="optional">regionset</packagereq>
       <packagereq type="optional">rosegarden4</packagereq>
       <packagereq type="optional">serpentine</packagereq>


Index: comps-f11.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f11.xml.in,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- comps-f11.xml.in	9 Jan 2009 23:15:16 -0000	1.54
+++ comps-f11.xml.in	11 Jan 2009 13:27:16 -0000	1.55
@@ -1137,8 +1137,8 @@
       <packagereq type="conditional" requires="gcompris">gcompris-sound-en</packagereq>
       <packagereq type="optional">childsplay</packagereq>
       <packagereq type="optional">corrida</packagereq>
-      <packagereq type="optional">drgeo-doc</packagereq>
       <packagereq type="optional">drgeo</packagereq>
+      <packagereq type="optional">drgeo-doc</packagereq>
       <packagereq type="optional">fantasdic</packagereq>
       <packagereq type="optional">gcompris</packagereq>
       <packagereq type="optional">genchemlab</packagereq>
@@ -1146,9 +1146,9 @@
       <packagereq type="optional">gperiodic</packagereq>
       <packagereq type="optional">gtypist</packagereq>
       <packagereq type="optional">justmoon</packagereq>
+      <packagereq type="optional">kdeedu</packagereq>
       <packagereq type="optional">kdeedu-kstars</packagereq>
       <packagereq type="optional">kdeedu-math</packagereq>
-      <packagereq type="optional">kdeedu</packagereq>
       <packagereq type="optional">moodle</packagereq>
       <packagereq type="optional">nightview</packagereq>
       <packagereq type="optional">saoimage</packagereq>
@@ -2435,6 +2435,7 @@
       <packagereq type="default">iwl4965-firmware</packagereq>
       <packagereq type="default">iwl5000-firmware</packagereq>
       <packagereq type="default">libertas-usb8388-firmware</packagereq>
+      <packagereq type="default">printer-filters</packagereq>
       <packagereq type="default">ql2100-firmware</packagereq>
       <packagereq type="default">ql2200-firmware</packagereq>
       <packagereq type="default">ql23xx-firmware</packagereq>
@@ -2442,7 +2443,6 @@
       <packagereq type="default">rt61pci-firmware</packagereq>
       <packagereq type="default">rt73usb-firmware</packagereq>
       <packagereq type="default">zd1211-firmware</packagereq>
-      <packagereq type="default">printer-filters</packagereq>
       <packagereq type="optional">acpi</packagereq>
       <packagereq type="optional">acpitool</packagereq>
       <packagereq type="optional">ctapi-cyberjack</packagereq>
@@ -4164,8 +4164,6 @@
       <packagereq type="default">pavucontrol</packagereq>
       <packagereq type="default">pulseaudio</packagereq>
       <packagereq type="default">pulseaudio-utils</packagereq>
-      <packagereq type="default">pyvnc2swf</packagereq>
-      <packagereq type="default">rakarrack</packagereq>
       <packagereq type="default">rhythmbox</packagereq>
       <packagereq type="default">sound-juicer</packagereq>
       <packagereq type="default">sox</packagereq>
@@ -4234,7 +4232,9 @@
       <packagereq type="optional">pitivi</packagereq>
       <packagereq type="optional">pulseaudio-module-lirc</packagereq>
       <packagereq type="optional">pulseaudio-module-zeroconf</packagereq>
+      <packagereq type="optional">pyvnc2swf</packagereq>
       <packagereq type="optional">quodlibet</packagereq>
+      <packagereq type="optional">rakarrack</packagereq>
       <packagereq type="optional">regionset</packagereq>
       <packagereq type="optional">rosegarden4</packagereq>
       <packagereq type="optional">serpentine</packagereq>



From mtasaka at fedoraproject.org  Sun Jan 11 13:28:38 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Sun, 11 Jan 2009 13:28:38 +0000 (UTC)
Subject: rpms/alexandria/devel alexandria.spec,1.15,1.16
Message-ID: <20090111132838.0F09470139@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/alexandria/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24308

Modified Files:
	alexandria.spec 
Log Message:
simply rebuild.
rpm -q --qf '%%{ARCHIVESIZE}\n' alexandria returns 0,
while this package is not zero size, strange...



Index: alexandria.spec
===================================================================
RCS file: /cvs/extras/rpms/alexandria/devel/alexandria.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- alexandria.spec	16 Jul 2008 14:13:25 -0000	1.15
+++ alexandria.spec	11 Jan 2009 13:28:07 -0000	1.16
@@ -5,7 +5,7 @@
 %define		majorver	0.6.3
 %undefine		minorver	
 
-%define		fedorarel	5
+%define		fedorarel	6
 %define		rel		%{?minorver:0.}%{fedorarel}%{?minorver:.%minorver}
 
 
@@ -181,6 +181,9 @@
 %{_datadir}/icons/hicolor/*/apps/%{name}.*
 
 %changelog
+* Sun Jan 11 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.6.3-6
+- Rebuild to restore ARCHIVESIZE
+
 * Wed Jul 16 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.6.3-5
 - Remove workaround for bug 436697 (tooltips crash).
   This was a bug on ruby-gnome2 which is fixed in 0.17.0 rc1



From pkgdb at fedoraproject.org  Sun Jan 11 13:28:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Jan 2009 13:28:50 +0000
Subject: [pkgdb] grub: lkundrak has requested watchbugzilla
Message-ID: <20090111132850.30BB1208457@bastion.fedora.phx.redhat.com>

lkundrak has requested the watchbugzilla acl on grub (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/grub



From pkgdb at fedoraproject.org  Sun Jan 11 13:28:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Jan 2009 13:28:50 +0000
Subject: [pkgdb] grub: lkundrak has requested watchcommits
Message-ID: <20090111132850.CD742208467@bastion.fedora.phx.redhat.com>

lkundrak has requested the watchcommits acl on grub (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/grub



From rishi at fedoraproject.org  Sun Jan 11 14:59:08 2009
From: rishi at fedoraproject.org (Debarshi Ray)
Date: Sun, 11 Jan 2009 14:59:08 +0000 (UTC)
Subject: rpms/decibel-audio-player/F-9
	decibel-audio-player-1.00-desktop.patch, 
	NONE, 1.1 .cvsignore, 1.3, 1.4 decibel-audio-player.spec, 1.4,
	1.5 sources, 1.3, 1.4 decibel-audio-player-0.11-desktop.patch,
	1.1, NONE
Message-ID: <20090111145908.74F6870139@cvs1.fedora.phx.redhat.com>

Author: rishi

Update of /cvs/pkgs/rpms/decibel-audio-player/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2307

Modified Files:
	.cvsignore decibel-audio-player.spec sources 
Added Files:
	decibel-audio-player-1.00-desktop.patch 
Removed Files:
	decibel-audio-player-0.11-desktop.patch 
Log Message:
* Sun Jan 11 2009 Debarshi Ray <rishi at fedoraproject.org> - 1.00-1
- Version bump to 1.00. Closes Red Hat Bugzilla bug #477262.
- Added 'Requires: notify-python'.


decibel-audio-player-1.00-desktop.patch:

--- NEW FILE decibel-audio-player-1.00-desktop.patch ---
diff -urNp decibel-audio-player-1.00.orig/res/decibel-audio-player.desktop decibel-audio-player-1.00/res/decibel-audio-player.desktop
--- decibel-audio-player-1.00.orig/res/decibel-audio-player.desktop	2009-01-11 20:00:56.000000000 +0530
+++ decibel-audio-player-1.00/res/decibel-audio-player.desktop	2009-01-11 20:01:01.000000000 +0530
@@ -1,13 +1,13 @@
 [Desktop Entry]
 Encoding=UTF-8
-Name=Decibel Audio Player
+Name=Decibel Music Player
 Exec=decibel-audio-player
 Terminal=false
 Type=Application
 Icon=decibel-audio-player
 StartupNotify=true
 
-GenericName=Audio Player
+GenericName=Music Player
 GenericName[fr]=Lecteur audio
 GenericName[de]=Musikwiedergabe
 GenericName[nn]=Musikkavspelar


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/decibel-audio-player/F-9/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	15 Nov 2008 12:56:54 -0000	1.3
+++ .cvsignore	11 Jan 2009 14:58:35 -0000	1.4
@@ -1 +1 @@
-decibel-audio-player-0.11.tar.gz
+decibel-audio-player-1.00.tar.gz


Index: decibel-audio-player.spec
===================================================================
RCS file: /cvs/pkgs/rpms/decibel-audio-player/F-9/decibel-audio-player.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- decibel-audio-player.spec	15 Nov 2008 13:16:03 -0000	1.4
+++ decibel-audio-player.spec	11 Jan 2009 14:58:36 -0000	1.5
@@ -5,7 +5,7 @@
 
 Summary:	Music player for GNOME
 Name:		decibel-audio-player
-Version:	0.11
+Version:	1.00
 Release:	1%{?dist}
 License:	GPLv2+
 Group:		Applications/Multimedia
@@ -27,6 +27,7 @@
 Requires:	gnome-python2-gnomekeyring
 Requires:	gstreamer-python
 Requires:	hicolor-icon-theme
+Requires:	notify-python
 Requires:	pygtk2-libglade
 Requires:	python-CDDB
 Requires:	python-mutagen
@@ -129,6 +130,10 @@
 %{_datadir}/%{name}/src
 
 %changelog
+* Sun Jan 11 2009 Debarshi Ray <rishi at fedoraproject.org> - 1.00-1
+- Version bump to 1.00. Closes Red Hat Bugzilla bug #477262.
+- Added 'Requires: notify-python'.
+
 * Fri Nov 14 2008 Debarshi Ray <rishi at fedoraproject.org> - 0.11-1
 - Version bump to 0.11. Closes Red Hat Bugzilla bug #464479.
 - Replaced 'Requires: gnome-python2' with 'Requires: gnome-python2-gnome' on


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/decibel-audio-player/F-9/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	15 Nov 2008 12:56:54 -0000	1.3
+++ sources	11 Jan 2009 14:58:36 -0000	1.4
@@ -1 +1 @@
-d7221eb882e066f7701ece49893c35f9  decibel-audio-player-0.11.tar.gz
+9f195a1852d78175fa24d6f5da60d3e2  decibel-audio-player-1.00.tar.gz


--- decibel-audio-player-0.11-desktop.patch DELETED ---



From rishi at fedoraproject.org  Sun Jan 11 15:04:22 2009
From: rishi at fedoraproject.org (Debarshi Ray)
Date: Sun, 11 Jan 2009 15:04:22 +0000 (UTC)
Subject: rpms/decibel-audio-player/F-10
	decibel-audio-player-1.00-desktop.patch, NONE, 1.1 .cvsignore,
	1.3, 1.4 decibel-audio-player.spec, 1.4, 1.5 sources, 1.3,
	1.4 decibel-audio-player-0.11-desktop.patch, 1.1, NONE
Message-ID: <20090111150422.0E76F70139@cvs1.fedora.phx.redhat.com>

Author: rishi

Update of /cvs/pkgs/rpms/decibel-audio-player/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3013

Modified Files:
	.cvsignore decibel-audio-player.spec sources 
Added Files:
	decibel-audio-player-1.00-desktop.patch 
Removed Files:
	decibel-audio-player-0.11-desktop.patch 
Log Message:
* Sun Jan 11 2009 Debarshi Ray <rishi at fedoraproject.org> - 1.00-1
- Version bump to 1.00. Closes Red Hat Bugzilla bug #477262.
- Added 'Requires: notify-python'.


decibel-audio-player-1.00-desktop.patch:

--- NEW FILE decibel-audio-player-1.00-desktop.patch ---
diff -urNp decibel-audio-player-1.00.orig/res/decibel-audio-player.desktop decibel-audio-player-1.00/res/decibel-audio-player.desktop
--- decibel-audio-player-1.00.orig/res/decibel-audio-player.desktop	2009-01-11 20:00:56.000000000 +0530
+++ decibel-audio-player-1.00/res/decibel-audio-player.desktop	2009-01-11 20:01:01.000000000 +0530
@@ -1,13 +1,13 @@
 [Desktop Entry]
 Encoding=UTF-8
-Name=Decibel Audio Player
+Name=Decibel Music Player
 Exec=decibel-audio-player
 Terminal=false
 Type=Application
 Icon=decibel-audio-player
 StartupNotify=true
 
-GenericName=Audio Player
+GenericName=Music Player
 GenericName[fr]=Lecteur audio
 GenericName[de]=Musikwiedergabe
 GenericName[nn]=Musikkavspelar


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/decibel-audio-player/F-10/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	15 Nov 2008 13:02:53 -0000	1.3
+++ .cvsignore	11 Jan 2009 15:03:51 -0000	1.4
@@ -1 +1 @@
-decibel-audio-player-0.11.tar.gz
+decibel-audio-player-1.00.tar.gz


Index: decibel-audio-player.spec
===================================================================
RCS file: /cvs/pkgs/rpms/decibel-audio-player/F-10/decibel-audio-player.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- decibel-audio-player.spec	15 Nov 2008 13:20:47 -0000	1.4
+++ decibel-audio-player.spec	11 Jan 2009 15:03:51 -0000	1.5
@@ -5,7 +5,7 @@
 
 Summary:	Music player for GNOME
 Name:		decibel-audio-player
-Version:	0.11
+Version:	1.00
 Release:	1%{?dist}
 License:	GPLv2+
 Group:		Applications/Multimedia
@@ -27,6 +27,7 @@
 Requires:	gnome-python2-gnomekeyring
 Requires:	gstreamer-python
 Requires:	hicolor-icon-theme
+Requires:	notify-python
 Requires:	pygtk2-libglade
 Requires:	python-CDDB
 Requires:	python-mutagen
@@ -129,6 +130,10 @@
 %{_datadir}/%{name}/src
 
 %changelog
+* Sun Jan 11 2009 Debarshi Ray <rishi at fedoraproject.org> - 1.00-1
+- Version bump to 1.00. Closes Red Hat Bugzilla bug #477262.
+- Added 'Requires: notify-python'.
+
 * Fri Nov 14 2008 Debarshi Ray <rishi at fedoraproject.org> - 0.11-1
 - Version bump to 0.11. Closes Red Hat Bugzilla bug #464479.
 - Replaced 'Requires: gnome-python2' with 'Requires: gnome-python2-gnome' on


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/decibel-audio-player/F-10/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	15 Nov 2008 13:02:54 -0000	1.3
+++ sources	11 Jan 2009 15:03:51 -0000	1.4
@@ -1 +1 @@
-d7221eb882e066f7701ece49893c35f9  decibel-audio-player-0.11.tar.gz
+9f195a1852d78175fa24d6f5da60d3e2  decibel-audio-player-1.00.tar.gz


--- decibel-audio-player-0.11-desktop.patch DELETED ---



From rishi at fedoraproject.org  Sun Jan 11 15:09:41 2009
From: rishi at fedoraproject.org (Debarshi Ray)
Date: Sun, 11 Jan 2009 15:09:41 +0000 (UTC)
Subject: rpms/decibel-audio-player/devel
	decibel-audio-player-1.00-desktop.patch, NONE, 1.1 .cvsignore,
	1.3, 1.4 decibel-audio-player.spec, 1.5, 1.6 sources, 1.3,
	1.4 decibel-audio-player-0.11-desktop.patch, 1.1, NONE
Message-ID: <20090111150941.B6A7970139@cvs1.fedora.phx.redhat.com>

Author: rishi

Update of /cvs/pkgs/rpms/decibel-audio-player/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3824

Modified Files:
	.cvsignore decibel-audio-player.spec sources 
Added Files:
	decibel-audio-player-1.00-desktop.patch 
Removed Files:
	decibel-audio-player-0.11-desktop.patch 
Log Message:
* Sun Jan 11 2009 Debarshi Ray <rishi at fedoraproject.org> - 1.00-1
- Version bump to 1.00. Closes Red Hat Bugzilla bug #477262.
- Added 'Requires: notify-python'.


decibel-audio-player-1.00-desktop.patch:

--- NEW FILE decibel-audio-player-1.00-desktop.patch ---
diff -urNp decibel-audio-player-1.00.orig/res/decibel-audio-player.desktop decibel-audio-player-1.00/res/decibel-audio-player.desktop
--- decibel-audio-player-1.00.orig/res/decibel-audio-player.desktop	2009-01-11 20:00:56.000000000 +0530
+++ decibel-audio-player-1.00/res/decibel-audio-player.desktop	2009-01-11 20:01:01.000000000 +0530
@@ -1,13 +1,13 @@
 [Desktop Entry]
 Encoding=UTF-8
-Name=Decibel Audio Player
+Name=Decibel Music Player
 Exec=decibel-audio-player
 Terminal=false
 Type=Application
 Icon=decibel-audio-player
 StartupNotify=true
 
-GenericName=Audio Player
+GenericName=Music Player
 GenericName[fr]=Lecteur audio
 GenericName[de]=Musikwiedergabe
 GenericName[nn]=Musikkavspelar


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/decibel-audio-player/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	15 Nov 2008 13:07:12 -0000	1.3
+++ .cvsignore	11 Jan 2009 15:09:09 -0000	1.4
@@ -1 +1 @@
-decibel-audio-player-0.11.tar.gz
+decibel-audio-player-1.00.tar.gz


Index: decibel-audio-player.spec
===================================================================
RCS file: /cvs/pkgs/rpms/decibel-audio-player/devel/decibel-audio-player.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- decibel-audio-player.spec	1 Dec 2008 15:00:19 -0000	1.5
+++ decibel-audio-player.spec	11 Jan 2009 15:09:10 -0000	1.6
@@ -5,8 +5,8 @@
 
 Summary:	Music player for GNOME
 Name:		decibel-audio-player
-Version:	0.11
-Release:	2%{?dist}
+Version:	1.00
+Release:	1%{?dist}
 License:	GPLv2+
 Group:		Applications/Multimedia
 URL:		http://decibel.silent-blade.org/
@@ -27,6 +27,7 @@
 Requires:	gnome-python2-gnomekeyring
 Requires:	gstreamer-python
 Requires:	hicolor-icon-theme
+Requires:	notify-python
 Requires:	pygtk2-libglade
 Requires:	python-CDDB
 Requires:	python-mutagen
@@ -129,8 +130,9 @@
 %{_datadir}/%{name}/src
 
 %changelog
-* Mon Dec 01 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 0.11-2
-- Rebuild for Python 2.6
+* Sun Jan 11 2009 Debarshi Ray <rishi at fedoraproject.org> - 1.00-1
+- Version bump to 1.00. Closes Red Hat Bugzilla bug #477262.
+- Added 'Requires: notify-python'.
 
 * Fri Nov 14 2008 Debarshi Ray <rishi at fedoraproject.org> - 0.11-1
 - Version bump to 0.11. Closes Red Hat Bugzilla bug #464479.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/decibel-audio-player/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	15 Nov 2008 13:07:12 -0000	1.3
+++ sources	11 Jan 2009 15:09:10 -0000	1.4
@@ -1 +1 @@
-d7221eb882e066f7701ece49893c35f9  decibel-audio-player-0.11.tar.gz
+9f195a1852d78175fa24d6f5da60d3e2  decibel-audio-player-1.00.tar.gz


--- decibel-audio-player-0.11-desktop.patch DELETED ---



From romal at fedoraproject.org  Sun Jan 11 15:18:15 2009
From: romal at fedoraproject.org (Robert M. Albrecht)
Date: Sun, 11 Jan 2009 15:18:15 +0000 (UTC)
Subject: rpms/nagios/F-10 .cvsignore,1.16,1.17
Message-ID: <20090111151815.A7B4A70139@cvs1.fedora.phx.redhat.com>

Author: romal

Update of /cvs/pkgs/rpms/nagios/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4818

Modified Files:
	.cvsignore 
Log Message:
reuploaded source package



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/nagios/F-10/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore	20 Oct 2008 07:03:07 -0000	1.16
+++ .cvsignore	11 Jan 2009 15:17:44 -0000	1.17
@@ -1 +1 @@
-nagios-3.0.4.tar.gz
+nagios-3.0.6.tar.gz



From tanguy at fedoraproject.org  Sun Jan 11 15:25:23 2009
From: tanguy at fedoraproject.org (Eric Tanguy)
Date: Sun, 11 Jan 2009 15:25:23 +0000 (UTC)
Subject: rpms/scidavis/devel scidavis-0.1.3-sip.patch,1.2,1.3
Message-ID: <20090111152523.20AE070139@cvs1.fedora.phx.redhat.com>

Author: tanguy

Update of /cvs/extras/rpms/scidavis/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6252

Modified Files:
	scidavis-0.1.3-sip.patch 
Log Message:


scidavis-0.1.3-sip.patch:

Index: scidavis-0.1.3-sip.patch
===================================================================
RCS file: /cvs/extras/rpms/scidavis/devel/scidavis-0.1.3-sip.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- scidavis-0.1.3-sip.patch	11 Jan 2009 08:02:09 -0000	1.2
+++ scidavis-0.1.3-sip.patch	11 Jan 2009 15:25:22 -0000	1.3
@@ -1,6 +1,15 @@
 --- scidavis-0.1.3/scidavis/src/scidavis.sip	2008/09/27 20:04:46	991
-+++ scidavis-0.1.3/scidavis/src/scidavis.sip	2009/01/10 23:08:56	1023
-@@ -1028,7 +1028,7 @@
++++ scidavis-0.1.3/scidavis/src/scidavis.sip	2009/01/11 11:57:53	1025
+@@ -78,8 +78,6 @@
+   MyWidget(const MyWidget&);
+ };
+ 
+-typedef QList<MyWidget*> MDIWindowList;
+-
+ class Table: MyWidget
+ {
+ %TypeHeaderCode
+@@ -1028,7 +1026,7 @@
  %End
  
    void setMethod(int n);
@@ -9,7 +18,7 @@
    bool run();
  };
  
-@@ -1052,7 +1052,7 @@
+@@ -1052,7 +1050,7 @@
  %End
  
    void setMethod(int);
@@ -18,7 +27,7 @@
  
    void setSmoothPoints(int, int = 0);
    void setPolynomOrder(int);
-@@ -1080,7 +1080,7 @@
+@@ -1080,7 +1078,7 @@
  %End
  
    void setFilterType(int);
@@ -27,3 +36,13 @@
  
    void setCutoff(double);
    void setBand(double, double);
+@@ -1194,7 +1192,7 @@
+ #include "src/Folder.h"
+ %End
+ public:
+-  MDIWindowList windowsList() /PyName=windows/;
++  QList<MyWidget*> windowsList() /PyName=windows/;
+ // TODO: implement signal Folder::nameChanged and make it update the project explorer; adjust renaming from GUI accordingly
+ //  void setFolderName(const QString&) /PyName=setName/;
+   QString name();
+



From tanguy at fedoraproject.org  Sun Jan 11 15:33:33 2009
From: tanguy at fedoraproject.org (Eric Tanguy)
Date: Sun, 11 Jan 2009 15:33:33 +0000 (UTC)
Subject: rpms/scidavis/devel scidavis.spec,1.11,1.12
Message-ID: <20090111153333.4690670139@cvs1.fedora.phx.redhat.com>

Author: tanguy

Update of /cvs/extras/rpms/scidavis/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7194

Modified Files:
	scidavis.spec 
Log Message:



Index: scidavis.spec
===================================================================
RCS file: /cvs/extras/rpms/scidavis/devel/scidavis.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- scidavis.spec	11 Jan 2009 08:02:09 -0000	1.11
+++ scidavis.spec	11 Jan 2009 15:33:02 -0000	1.12
@@ -1,7 +1,7 @@
 Summary:	Scientific Data Analysis and Visualization
 Name:		scidavis
 Version:	0.1.3
-Release: 	6%{?dist}
+Release: 	7%{?dist}
 Source0:	http://download.sourceforge.net/sourceforge/scidavis/%{name}-%{version}.tar.bz2
 Source1:	http://download.sourceforge.net/sourceforge/scidavis/scidavis-manual-0.1_2008-02-28.tar.bz2
 Patch0:		scidavis-0.1.3-pro.patch
@@ -100,6 +100,9 @@
 %doc manual/*
 
 %changelog
+* Sun Jan 11 2009 Eric Tanguy <eric.tanguy at univ-nantes.fr> - 0.1.3-7
+- Replace the sip patch by a better one from upstream
+
 * Sun Jan 11 2009 Eric Tanguy <eric.tanguy at univ-nantes.fr> - 0.1.3-6
 - Replace the sip patch by the one from upstream
 



From cweyl at fedoraproject.org  Sun Jan 11 15:58:56 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Sun, 11 Jan 2009 15:58:56 +0000 (UTC)
Subject: rpms/perl-Class-MOP/F-9 .cvsignore,1.11,1.12
Message-ID: <20090111155856.EDF3C70139@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Class-MOP/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10633

Modified Files:
	.cvsignore 
Log Message:
update cvsignore


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-MOP/F-9/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	16 Dec 2007 01:34:20 -0000	1.11
+++ .cvsignore	11 Jan 2009 15:58:23 -0000	1.12
@@ -1 +1,5 @@
 Class-MOP-0.49.tar.gz
+*.gz
+*.rpm
+Class-MOP-*
+.build*



From cweyl at fedoraproject.org  Sun Jan 11 16:01:33 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Sun, 11 Jan 2009 16:01:33 +0000 (UTC)
Subject: rpms/perl-Moose/F-9 .cvsignore,1.15,1.16
Message-ID: <20090111160133.70E8A70139@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Moose/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11007

Modified Files:
	.cvsignore 
Log Message:
update cvsignore



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Moose/F-9/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	16 Dec 2007 01:55:38 -0000	1.15
+++ .cvsignore	11 Jan 2009 16:01:03 -0000	1.16
@@ -1 +1,4 @@
 Moose-0.33.tar.gz
+Moose-*
+*.gz
+*.rpm



From pkgdb at fedoraproject.org  Sun Jan 11 16:06:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Jan 2009 16:06:28 +0000
Subject: [pkgdb] calamaris had group_acl changed
Message-ID: <20090111160628.380BD208455@bastion.fedora.phx.redhat.com>

robert has set the commit acl on calamaris (Fedora 10) to Denied for provenpackager

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/calamaris



From pkgdb at fedoraproject.org  Sun Jan 11 16:06:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Jan 2009 16:06:30 +0000
Subject: [pkgdb] calamaris had group_acl changed
Message-ID: <20090111160630.A3829208456@bastion.fedora.phx.redhat.com>

robert has set the commit acl on calamaris (Fedora devel) to Denied for provenpackager

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/calamaris



From pkgdb at fedoraproject.org  Sun Jan 11 16:08:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Jan 2009 16:08:56 +0000
Subject: [pkgdb] moon-buggy had group_acl changed
Message-ID: <20090111160856.6EBA3208456@bastion.fedora.phx.redhat.com>

robert has set the commit acl on moon-buggy (Fedora devel) to Denied for provenpackager

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/moon-buggy



From pkgdb at fedoraproject.org  Sun Jan 11 16:08:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Jan 2009 16:08:59 +0000
Subject: [pkgdb] moon-buggy had group_acl changed
Message-ID: <20090111160859.ACDE6208466@bastion.fedora.phx.redhat.com>

robert has set the commit acl on moon-buggy (Fedora 10) to Denied for provenpackager

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/moon-buggy



From pkgdb at fedoraproject.org  Sun Jan 11 16:09:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Jan 2009 16:09:01 +0000
Subject: [pkgdb] moon-buggy had group_acl changed
Message-ID: <20090111160901.19CC7208469@bastion.fedora.phx.redhat.com>

robert has set the commit acl on moon-buggy (Fedora 9) to Denied for provenpackager

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/moon-buggy



From pkgdb at fedoraproject.org  Sun Jan 11 16:09:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Jan 2009 16:09:04 +0000
Subject: [pkgdb] moon-buggy had group_acl changed
Message-ID: <20090111160904.2555320846E@bastion.fedora.phx.redhat.com>

robert has set the commit acl on moon-buggy (Fedora EPEL 5) to Denied for provenpackager

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/moon-buggy



From pkgdb at fedoraproject.org  Sun Jan 11 16:09:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Jan 2009 16:09:06 +0000
Subject: [pkgdb] moon-buggy had group_acl changed
Message-ID: <20090111160906.7167D208472@bastion.fedora.phx.redhat.com>

robert has set the commit acl on moon-buggy (Fedora EPEL 4) to Denied for provenpackager

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/moon-buggy



From rishi at fedoraproject.org  Sun Jan 11 16:10:23 2009
From: rishi at fedoraproject.org (Debarshi Ray)
Date: Sun, 11 Jan 2009 16:10:23 +0000 (UTC)
Subject: rpms/libmatheval/devel libmatheval.spec,1.5,1.6
Message-ID: <20090111161023.B05A370139@cvs1.fedora.phx.redhat.com>

Author: rishi

Update of /cvs/pkgs/rpms/libmatheval/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11889

Modified Files:
	libmatheval.spec 
Log Message:
* Sun Jan 11 2009 Debarshi Ray <rishi at fedoraproject.org> - 1.1.5-4
- Info page fixed by upstream. Closes Red Hat Bugzilla bug #465112.



Index: libmatheval.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libmatheval/devel/libmatheval.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- libmatheval.spec	23 May 2008 23:04:25 -0000	1.5
+++ libmatheval.spec	11 Jan 2009 16:09:52 -0000	1.6
@@ -1,13 +1,13 @@
 Name:           libmatheval
 Version:        1.1.5
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Library for parsing and evaluating symbolic expressions input as text
 
 Group:          System Environment/Libraries
 License:        GPLv3+
 URL:            http://www.gnu.org/software/libmatheval/
 Source0:        http://ftp.gnu.org/gnu/libmatheval/libmatheval-%{version}.tar.gz
-Patch0:         libmatheval_doc_add_info_dir.patch
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gcc-gfortran, guile-devel, bison, flex, texinfo
@@ -36,7 +36,6 @@
 
 %prep
 %setup -q
-%patch0 -p0
 
 %build
 %configure F77=gfortran --disable-static
@@ -84,6 +83,9 @@
 
 
 %changelog
+* Sun Jan 11 2009 Debarshi Ray <rishi at fedoraproject.org> - 1.1.5-4
+- Info page fixed by upstream. Closes Red Hat Bugzilla bug #465112.
+
 * Fri May 23 2008 Jon Stanley <jonstanley at gmail.com> - 1.1.5-3
 - Fix license tag
 



From pkgdb at fedoraproject.org  Sun Jan 11 16:11:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Jan 2009 16:11:20 +0000
Subject: [pkgdb] sip-redirect had group_acl changed
Message-ID: <20090111161120.A8EDD208455@bastion.fedora.phx.redhat.com>

robert has set the commit acl on sip-redirect (Fedora devel) to Denied for provenpackager

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sip-redirect



From pkgdb at fedoraproject.org  Sun Jan 11 16:11:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Jan 2009 16:11:21 +0000
Subject: [pkgdb] sip-redirect had group_acl changed
Message-ID: <20090111161121.C56BE208457@bastion.fedora.phx.redhat.com>

robert has set the commit acl on sip-redirect (Fedora 8) to Denied for provenpackager

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sip-redirect



From pkgdb at fedoraproject.org  Sun Jan 11 16:11:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Jan 2009 16:11:24 +0000
Subject: [pkgdb] sip-redirect had group_acl changed
Message-ID: <20090111161124.A6F07208466@bastion.fedora.phx.redhat.com>

robert has set the commit acl on sip-redirect (Fedora 9) to Denied for provenpackager

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sip-redirect



From pkgdb at fedoraproject.org  Sun Jan 11 16:11:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Jan 2009 16:11:29 +0000
Subject: [pkgdb] sip-redirect had group_acl changed
Message-ID: <20090111161129.ACFFA20846B@bastion.fedora.phx.redhat.com>

robert has set the commit acl on sip-redirect (Fedora EPEL 5) to Denied for provenpackager

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sip-redirect



From pkgdb at fedoraproject.org  Sun Jan 11 16:11:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Jan 2009 16:11:27 +0000
Subject: [pkgdb] sip-redirect had group_acl changed
Message-ID: <20090111161127.C0CCF208468@bastion.fedora.phx.redhat.com>

robert has set the commit acl on sip-redirect (Fedora EPEL 4) to Denied for provenpackager

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sip-redirect



From pkgdb at fedoraproject.org  Sun Jan 11 16:11:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Jan 2009 16:11:31 +0000
Subject: [pkgdb] sip-redirect had group_acl changed
Message-ID: <20090111161131.5EB1420846E@bastion.fedora.phx.redhat.com>

robert has set the commit acl on sip-redirect (Fedora 10) to Denied for provenpackager

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sip-redirect



From rishi at fedoraproject.org  Sun Jan 11 16:11:57 2009
From: rishi at fedoraproject.org (Debarshi Ray)
Date: Sun, 11 Jan 2009 16:11:57 +0000 (UTC)
Subject: rpms/libmatheval/F-10 libmatheval.spec,1.5,1.6
Message-ID: <20090111161157.37FAC70139@cvs1.fedora.phx.redhat.com>

Author: rishi

Update of /cvs/pkgs/rpms/libmatheval/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12148

Modified Files:
	libmatheval.spec 
Log Message:
* Sun Jan 11 2009 Debarshi Ray <rishi at fedoraproject.org> - 1.1.5-4
- Info page fixed by upstream. Closes Red Hat Bugzilla bug #465112.



Index: libmatheval.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libmatheval/F-10/libmatheval.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- libmatheval.spec	23 May 2008 23:04:25 -0000	1.5
+++ libmatheval.spec	11 Jan 2009 16:11:26 -0000	1.6
@@ -1,13 +1,13 @@
 Name:           libmatheval
 Version:        1.1.5
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Library for parsing and evaluating symbolic expressions input as text
 
 Group:          System Environment/Libraries
 License:        GPLv3+
 URL:            http://www.gnu.org/software/libmatheval/
 Source0:        http://ftp.gnu.org/gnu/libmatheval/libmatheval-%{version}.tar.gz
-Patch0:         libmatheval_doc_add_info_dir.patch
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gcc-gfortran, guile-devel, bison, flex, texinfo
@@ -36,7 +36,6 @@
 
 %prep
 %setup -q
-%patch0 -p0
 
 %build
 %configure F77=gfortran --disable-static
@@ -84,6 +83,9 @@
 
 
 %changelog
+* Sun Jan 11 2009 Debarshi Ray <rishi at fedoraproject.org> - 1.1.5-4
+- Info page fixed by upstream. Closes Red Hat Bugzilla bug #465112.
+
 * Fri May 23 2008 Jon Stanley <jonstanley at gmail.com> - 1.1.5-3
 - Fix license tag
 



From pkgdb at fedoraproject.org  Sun Jan 11 16:13:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Jan 2009 16:13:19 +0000
Subject: [pkgdb] erlang-pgsql had group_acl changed
Message-ID: <20090111161319.73666208455@bastion.fedora.phx.redhat.com>

robert has set the commit acl on erlang-pgsql (Fedora devel) to Denied for provenpackager

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/erlang-pgsql



From pkgdb at fedoraproject.org  Sun Jan 11 16:13:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Jan 2009 16:13:24 +0000
Subject: [pkgdb] erlang-pgsql had group_acl changed
Message-ID: <20090111161324.0DC20208466@bastion.fedora.phx.redhat.com>

robert has set the commit acl on erlang-pgsql (Fedora EPEL 5) to Denied for provenpackager

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/erlang-pgsql



From pkgdb at fedoraproject.org  Sun Jan 11 16:13:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Jan 2009 16:13:20 +0000
Subject: [pkgdb] erlang-pgsql had group_acl changed
Message-ID: <20090111161320.554BC208457@bastion.fedora.phx.redhat.com>

robert has set the commit acl on erlang-pgsql (Fedora 9) to Denied for provenpackager

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/erlang-pgsql



From pkgdb at fedoraproject.org  Sun Jan 11 16:13:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Jan 2009 16:13:25 +0000
Subject: [pkgdb] erlang-pgsql had group_acl changed
Message-ID: <20090111161325.B09F3208468@bastion.fedora.phx.redhat.com>

robert has set the commit acl on erlang-pgsql (Fedora EPEL 4) to Denied for provenpackager

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/erlang-pgsql



From pkgdb at fedoraproject.org  Sun Jan 11 16:13:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Jan 2009 16:13:27 +0000
Subject: [pkgdb] erlang-pgsql had group_acl changed
Message-ID: <20090111161328.00C5120846C@bastion.fedora.phx.redhat.com>

robert has set the commit acl on erlang-pgsql (Fedora 8) to Denied for provenpackager

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/erlang-pgsql



From pkgdb at fedoraproject.org  Sun Jan 11 16:14:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Jan 2009 16:14:00 +0000
Subject: [pkgdb] erlang-pgsql had group_acl changed
Message-ID: <20090111161400.AA571208458@bastion.fedora.phx.redhat.com>

robert has set the commit acl on erlang-pgsql (Fedora 10) to Denied for provenpackager

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/erlang-pgsql



From langel at fedoraproject.org  Sun Jan 11 16:22:47 2009
From: langel at fedoraproject.org (Lillian Angel)
Date: Sun, 11 Jan 2009 16:22:47 +0000 (UTC)
Subject: rpms/java-1.6.0-openjdk/F-10 java-1.6.0-openjdk.spec, 1.94,
	1.95 README.plugin, 1.1, NONE
Message-ID: <20090111162247.CCEF070139@cvs1.fedora.phx.redhat.com>

Author: langel

Update of /cvs/pkgs/rpms/java-1.6.0-openjdk/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14185

Modified Files:
	java-1.6.0-openjdk.spec 
Removed Files:
	README.plugin 
Log Message:
* Sun Jan 11 2009 Lillian Angel <langel at redhat.com> - 1:1.6.0-8.b12
- Removed README.plugin, updated source list.
- Updated release.




Index: java-1.6.0-openjdk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/F-10/java-1.6.0-openjdk.spec,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -r1.94 -r1.95
--- java-1.6.0-openjdk.spec	3 Dec 2008 04:05:37 -0000	1.94
+++ java-1.6.0-openjdk.spec	11 Jan 2009 16:22:17 -0000	1.95
@@ -108,7 +108,7 @@
 
 Name:    java-%{javaver}-%{origin}
 Version: %{javaver}.%{buildver}
-Release: 7.%{openjdkver}%{?dist}
+Release: 8.%{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
@@ -129,12 +129,11 @@
 Source2:  %{accessurl}%{accessmajorver}/java-access-bridge-%{accessver}.tar.gz
 Source3:  %{genurl}generate-fedora-zip.sh
 Source4:  README.src
-Source5:  README.plugin
-Source6:  mauve-%{mauvedate}.tar.gz
-Source7:  mauve_tests
-Source8:  %{netbeansurl}/netbeans-6.1-200805300101-basic_cluster-src.zip
-Source9:  %{visualvmurl}/netbeans-profiler-visualvm_preview2.tar.gz
-Source10: %{visualvmurl}/visualvm-20081031-src.tar.gz
+Source5:  mauve-%{mauvedate}.tar.gz
+Source6:  mauve_tests
+Source7:  %{netbeansurl}/netbeans-6.1-200805300101-basic_cluster-src.zip
+Source8:  %{visualvmurl}/netbeans-profiler-visualvm_preview2.tar.gz
+Source9:  %{visualvmurl}/visualvm-20081031-src.tar.gz
 # FIXME: This patch needs to be fixed. optflags argument
 # -mtune=generic is being ignored because it breaks several graphical
 # applications.
@@ -359,11 +358,10 @@
 %patch4
 %patch5
 cp %{SOURCE4} .
-cp %{SOURCE5} .
+cp %{SOURCE6} .
 cp %{SOURCE7} .
 cp %{SOURCE8} .
 cp %{SOURCE9} .
-cp %{SOURCE10} .
 
 %build
 # Build IcedTea and OpenJDK.
@@ -416,7 +414,7 @@
     Xvfb :20 -screen 0 1x1x24 -ac&
     echo $! > Xvfb.pid
     $JAVA_HOME/bin/java Harness -vm $JAVA_HOME/bin/java \
-      -file %{SOURCE7} -timeout 30000 2>&1 | tee mauve_output
+      -file %{SOURCE6} -timeout 30000 2>&1 | tee mauve_output
     kill -9 `cat Xvfb.pid`
     unset DISPLAY
     rm -f Xvfb.pid
@@ -900,10 +898,13 @@
 
 %files plugin
 %defattr(-,root,root,-)
-%doc README.plugin
 %{_jvmdir}/%{jredir}/lib/%{archinstall}/IcedTeaPlugin.so
 
 %changelog
+* Sun Jan 11 2009 Lillian Angel <langel at redhat.com> - 1:1.6.0-8.b12
+- Removed README.plugin, updated source list.
+- Updated release.
+
 * Tue Dec  2 2008 Lillian Angel <langel at redhat.com> - 1:1.6.0-7.b12
 - Set runtests to 0.
 


--- README.plugin DELETED ---



From buc at fedoraproject.org  Sun Jan 11 16:23:29 2009
From: buc at fedoraproject.org (Dmitry Butskoy)
Date: Sun, 11 Jan 2009 16:23:29 +0000 (UTC)
Subject: rpms/libtranslate/devel libtranslate-0.99-update-services.patch,
	NONE, 1.1 libtranslate.spec, 1.23, 1.24
Message-ID: <20090111162329.B462C70139@cvs1.fedora.phx.redhat.com>

Author: buc

Update of /cvs/extras/rpms/libtranslate/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14312

Modified Files:
	libtranslate.spec 
Added Files:
	libtranslate-0.99-update-services.patch 
Log Message:


libtranslate-0.99-update-services.patch:

--- NEW FILE libtranslate-0.99-update-services.patch ---
diff -up libtranslate-0.99/data/services.xml.in.update-services libtranslate-0.99/data/services.xml.in
--- libtranslate-0.99/data/services.xml.in.update-services	2009-01-07 22:31:15.000000000 +0200
+++ libtranslate-0.99/data/services.xml.in	2009-01-07 22:34:54.000000000 +0200
@@ -31,12 +31,14 @@
 <!-- POSSIBILITY OF SUCH DAMAGE. -->
 
 <services>
+  <custom-language tag="oc_aran" _name="Aranese"/>
+  <custom-language tag="pt-BR" _name="Portuguese (Brazil)"/>
   <custom-language tag="zh-TW" _name="Chinese (Taiwan)"/>
   
   <service name="babelfish" nick="Babel Fish">
     <group>
-      <language tag="zh" to="en"/>
-      <language tag="zh-TW" service-tag="zt" to="en"/>
+      <language tag="zh" to="en,zh-TW"/>
+      <language tag="zh-TW" service-tag="zt" to="en,zh"/>
       <language tag="en" to="*"/>
       <language tag="nl" to="en,fr"/>
       <language tag="fr" to="en,de,el,it,pt,nl,es"/>
@@ -82,27 +84,49 @@
 
   <service name="google" nick="Google">
     <group>
+      <language tag="ar" to="*"/>
+      <language tag="bg" to="*"/>
+      <language tag="ca" to="*"/>
+      <language tag="cs" to="*"/>
+      <language tag="da" to="*"/>
+      <language tag="de" to="*"/>
+      <language tag="el" to="*"/>
       <language tag="en" to="*"/>
-      <language tag="ar" to="en"/>
-      <language tag="de" to="en,fr"/>
-      <language tag="el" to="en"/>
-      <language tag="es" to="en"/>
-      <language tag="fr" to="en,de"/>
-      <language tag="it" to="en"/>
-      <language tag="ja" to="en"/>
-      <language tag="ko" to="en"/>
-      <language tag="nl" to="en"/>
-      <language tag="pt" to="en"/>
-      <language tag="ru" to="en"/>
-      <language tag="zh" service-tag="zh-CN" to="en,zh-TW"/>
-      <language tag="zh-TW" to="zh"/>
+      <language tag="es" to="*"/>
+      <language tag="fi" to="*"/>
+      <language tag="fil" to="*"/>
+      <language tag="fr" to="*"/>
+      <language tag="he" to="*"/>
+      <language tag="hi" to="*"/>
+      <language tag="hr" to="*"/>
+      <language tag="id" to="*"/>
+      <language tag="it" to="*"/>
+      <language tag="ja" to="*"/>
+      <language tag="ko" to="*"/>
+      <language tag="lt" to="*"/>
+      <language tag="lv" to="*"/>
+      <language tag="nl" to="*"/>
+      <language tag="nb" service-tag="no" to="*"/> <!-- Google does not differentiate these two dialects -->
+      <language tag="nn" service-tag="no" to="*"/> <!-- probably needs review by a native speaker -->
+      <language tag="pl" to="*"/>
+      <language tag="pt" to="*"/>
+      <language tag="ro" to="*"/>
+      <language tag="ru" to="*"/>
+      <language tag="sk" to="*"/>
+      <language tag="sl" to="*"/>
+      <language tag="sr" to="*"/>
+      <language tag="sv" to="*"/>
+      <language tag="uk" to="*"/>
+      <language tag="vi" to="*"/>
+      <language tag="zh" service-tag="zh-CN" to="*"/>
+      <language tag="zh-TW" to="*"/>
       <text-translation url="http://www.google.com/translate_t?text=${text:escape}&amp;langpair=${from}|${to}&amp;ie=utf8&amp;oe=utf8">
 	<pre-marker text="&lt;div id="/>
 	<pre-marker text="result_box"/>
 	<pre-marker text="&gt;"/>
 	<post-marker text="&lt;/div&gt;"/>
       </text-translation>
-      <web-page-translation url="http://www.google.com/translate_c?u=${url:escape}&amp;langpair=${from}|${to}"/>
+      <web-page-translation url="http://translate.google.com/translate?u=${url:escape}&amp;sl=${from}&amp;tl=${to}"/>
     </group>
   </service>
 
@@ -208,4 +232,99 @@
       <web-page-translation url="http://www.online-translator.com/url/tran_url.asp?lang=en&amp;url=${url:escape}&amp;$direction=${from}${to}&amp;template=General&amp;cp1=NO&amp;cp2=NO&amp;autotranslate=on"/>
     </group>
   </service>
+
+  <service nick="Apertium" name="apertium">
+    <group>
+      <!-- Need a better code for Aranese a dialect of Occitan
+           current is oc_aran there is no ISO equivalent -->
+      <language to="en,es,eo,fr,oc,oc_aran" tag="ca"/>
+      <language to="en" tag="cy"/>
+      <language to="ca,es,gl" tag="en"/>
+      <language to="ca,en,eo,fr,gl,pt,pt-BR" tag="es"/>
+      <language to="es" tag="eu"/>
+      <language to="ca,es" tag="fr"/>
+      <language to="en,es" tag="gl"/>
+      <language to="es" tag="pt"/>
+      <language tag="pt-BR" service-tag="pt_BR"/>
+      <language to="ca" tag="oc"/>
+      <language to="es" tag="ro"/>
+      <text-translation url="http://xixona.dlsi.ua.es/webservice/ws.php?text=${text:escape}&amp;mode=${from}-${to}"/>
+      <web-page-translation url="http://www.apertium.org/apertium/tradurl.php?marcar=&amp;direccion=${from}-${to}&amp;inurl=${url:escape}"/>
+    </group>
+  </service>
+  <!-- Re-enable if you want to use or test the unstable Apertium pairs
+  <service nick="Apertium (Unstable)" name="apertium-unstable">
+    <group>
+      <language to="en" tag="af"/>
+      <language to="en,es,eo,fr,oc,oc_aran,pt" tag="ca"/> 
+      <language to="af,ca" tag="en"/>
+      <language to="ca,eo,fr,gl,oc,oc_aran,pt,pt-BR" tag="es"/>
+      <language to="ca,es" tag="fr"/>
+      <language to="es" tag="gl"/>
+      <language to="ca,es" tag="oc"/>
+      <language to="ca,es" tag="oc_aran"/>
+      <language to="ca,es" tag="pt"/>
+      <language tag="pt-BR" service-tag="pt_BR"/>
+      <language to="ca" tag="ro"/>
+      <text-translation url="http://xixona.dlsi.ua.es/apertium-unstable/tradtextjs.php" post="direccion=${from}-${to}&amp;marcar=0&amp;cuadrotexto=${text:escape}"/>
+    </group>
+  </service> -->
+  <!-- Re-enable if you want to use or test the alph/testing Apertium pairs
+  <custom-language tag="sh-BS" _name="Serbo-Croatian (Sarajevo)"></custom-language>
+  <custom-language tag="sh-HR" _name="Serbo-Croatian (Zagreb)"></custom-language>
+  <custom-language tag="sh-SR" _name="Serbo-Croatian (Belgrade)"></custom-language>
+
+  <service nick="Apertium (Alpha Testing)" name="apertium-alpha-testing">
+    <group>
+      <language to="en" tag="af"/>
+      <language to="fr" tag="br"/>
+      <language to="en,es,eo,fr,oc,oc_aran,pt,ro" tag="ca"/> 
+      <language to="en" tag="cy"/>
+      <language to="sv" tag="da"/>
+      <language to="af,ca,cy,es,eo,gl" tag="en"/>
+      <language to="en" tag="eo"/>
+      <language to="es" tag="eu"/>
+      <language to="ca,en,eo,fr,gl,it,oc,oc_aran,pt,pt-BR,ro" tag="es"/>
+      <language to="tg" tag="fa"/>
+      <language to="ca,es" tag="fr"/>
+      <language to="sco" tag="ga"/>
+      <language to="en,es,pt" tag="gl"/>
+      <language to="es" tag="it"/>
+      <language to="sh-BS,sh-HR,sh-SR" tag="mk"/>
+      <language to="nn" tag="nb"/>
+      <language to="nb" tag="nn"/>
+      <language to="ca,es" tag="oc"/>
+      <language to="ca,es" tag="oc_aran"/>
+      <language to="ca,es,gl" tag="pt"/>
+      <language tag="pt-BR" service-tag="pt_BR"/>
+      <language to="ca,es" tag="ro"/>
+      <language to="ga" tag="sco"/>
+      <language to="smj" tag="se"/>
+      <language to="mk" tag="sh"/>
+      <language tag="sh-BS" service-tag="sh_BS"/>
+      <language tag="sh-HR" service-tag="sh_HR"/>
+      <language tag="sh-SR" service-tag="sh_SR"/>
+      <language to="da" tag="sv"/>
+      <language to="fa" tag="tg"/>
+      <text-translation url="http://xixona.dlsi.ua.es/testing/index.php" post="lang=&amp;inputarea=${text}&amp;direction=${from}-${to}&amp;marcar=0&amp;interm=0&amp;mangle=true">
+        <pre-marker text="&lt;div class=&quot;outbox&quot;&gt;"/>
+        <pre-marker text="&lt;p style="/>
+        <pre-marker text="&lt;/p&gt;"/>
+        <post-marker text="&lt;/div&gt;"/>
+      </text-translation>
+    </group>
+  </service> -->
+
+  <service nick="Opentrad" name="opentrad">
+    <group>
+      <language to="es" tag="ca"/>
+      <language to="ca,gl,eu" tag="es"/>
+      <language to="es" tag="gl"/>
+      <text-translation
+      url="http://opentrad.org/tradtextjs.php"
+      post="direccion=${from}-${to}&amp;marcar=0&amp;cuadrotexto=${text:escape}"/>
+      <!-- All newlines have <br/> in them, again a pitty for processing would be nice if we could cleanup -->
+      <!-- No web-page-translation added -->
+    </group>
+  </service>
 </services>


Index: libtranslate.spec
===================================================================
RCS file: /cvs/extras/rpms/libtranslate/devel/libtranslate.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- libtranslate.spec	23 Dec 2008 12:41:48 -0000	1.23
+++ libtranslate.spec	11 Jan 2009 16:22:59 -0000	1.24
@@ -1,7 +1,7 @@
 Name: libtranslate
 Summary: Natural language translation library
 Version: 0.99
-Release: 17%{?dist}
+Release: 18%{?dist}
 License: BSD
 Group: System Environment/Libraries
 %define url	http://savannah.nongnu.org/download/libtranslate
@@ -12,6 +12,7 @@
 Patch4: %{url}/libtranslate-0.99-postmarker.diff
 Patch5: %{url}/libtranslate-0.99-services.diff
 Patch10: libtranslate-0.99-libsoup24.diff
+Patch12: libtranslate-0.99-update-services.patch
 Patch11: libtranslate-0.99-fix-modules.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: pkgconfig >= 1:0.8, gettext, intltool, libtool
@@ -55,6 +56,7 @@
 %patch5 -p1
 %patch10 -p1
 %patch11 -p1
+%patch12 -p1
 
 libtoolize --force
 intltoolize --automake --force
@@ -120,6 +122,10 @@
 
 
 %changelog
+* Sun Jan 11 2009 Dmitry Butskoy <Dmitry at Butskoy.name> - 0.99-18
+- update services.xml (google, babelfish, add apertium and opentrad) (#478626)
+  (by Dwayne Bailey <dwayne at translate.org.za>)
+
 * Mon Dec 22 2008 Dmitry Butskoy <Dmitry at Butskoy.name> - 0.99-17
 - update fix-modules patch, more autotools to run
   (by Dwayne Bailey <dwayne at translate.org.za>)



From pkgdb at fedoraproject.org  Sun Jan 11 16:23:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Jan 2009 16:23:34 +0000
Subject: [pkgdb] libcgi (Fedora EPEL, 4) updated by kevin
Message-ID: <20090111162334.B4560208466@bastion.fedora.phx.redhat.com>

kevin changed owner of libcgi in Fedora EPEL 4 to spot

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libcgi



From pkgdb at fedoraproject.org  Sun Jan 11 16:23:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Jan 2009 16:23:42 +0000
Subject: [pkgdb] perl-DBD-SQLite (Fedora EPEL, 4) updated by kevin
Message-ID: <20090111162342.38C73208469@bastion.fedora.phx.redhat.com>

kevin changed owner of perl-DBD-SQLite in Fedora EPEL 4 to spot

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-DBD-SQLite



From pkgdb at fedoraproject.org  Sun Jan 11 16:23:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Jan 2009 16:23:48 +0000
Subject: [pkgdb] perl-Error (Fedora EPEL, 4) updated by kevin
Message-ID: <20090111162348.E561A208466@bastion.fedora.phx.redhat.com>

kevin added a Fedora EPEL 4 branch for perl-Error
kevin has set commit to Approved for provenpackager on perl-Error (Fedora EPEL 4)
kevin has set build to Approved for provenpackager on perl-Error (Fedora EPEL 4)
kevin has set checkout to Approved for provenpackager on perl-Error (Fedora EPEL 4)
kevin changed owner of perl-Error in Fedora EPEL 4 to spot

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Error



From pkgdb at fedoraproject.org  Sun Jan 11 16:24:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Jan 2009 16:24:02 +0000
Subject: [pkgdb] perl-ExtUtils-ParseXS (Fedora EPEL, 4) updated by kevin
Message-ID: <20090111162402.90B7620846B@bastion.fedora.phx.redhat.com>

kevin changed owner of perl-ExtUtils-ParseXS in Fedora EPEL 4 to spot

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-ExtUtils-ParseXS



From pkgdb at fedoraproject.org  Sun Jan 11 16:23:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Jan 2009 16:23:56 +0000
Subject: [pkgdb] perl-ExtUtils-CBuilder (Fedora EPEL, 4) updated by kevin
Message-ID: <20090111162356.ADFAC208457@bastion.fedora.phx.redhat.com>

kevin changed owner of perl-ExtUtils-CBuilder in Fedora EPEL 4 to spot

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-ExtUtils-CBuilder



From pkgdb at fedoraproject.org  Sun Jan 11 16:24:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Jan 2009 16:24:08 +0000
Subject: [pkgdb] perl-GD (Fedora EPEL, 4) updated by kevin
Message-ID: <20090111162408.C1BE3208458@bastion.fedora.phx.redhat.com>

kevin changed owner of perl-GD in Fedora EPEL 4 to spot

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-GD



From pkgdb at fedoraproject.org  Sun Jan 11 16:24:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Jan 2009 16:24:16 +0000
Subject: [pkgdb] perl-GDGraph (Fedora EPEL, 4) updated by kevin
Message-ID: <20090111162416.79271208470@bastion.fedora.phx.redhat.com>

kevin changed owner of perl-GDGraph in Fedora EPEL 4 to spot

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-GDGraph



From pkgdb at fedoraproject.org  Sun Jan 11 16:24:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Jan 2009 16:24:24 +0000
Subject: [pkgdb] perl-GDTextUtil (Fedora EPEL, 4) updated by kevin
Message-ID: <20090111162424.BFC95208469@bastion.fedora.phx.redhat.com>

kevin changed owner of perl-GDTextUtil in Fedora EPEL 4 to spot

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-GDTextUtil



From pkgdb at fedoraproject.org  Sun Jan 11 16:24:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Jan 2009 16:24:30 +0000
Subject: [pkgdb] perl-MLDBM (Fedora EPEL, 4) updated by kevin
Message-ID: <20090111162430.E21EF208458@bastion.fedora.phx.redhat.com>

kevin changed owner of perl-MLDBM in Fedora EPEL 4 to spot

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-MLDBM



From pkgdb at fedoraproject.org  Sun Jan 11 16:24:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Jan 2009 16:24:38 +0000
Subject: [pkgdb] perl-Pod-Coverage (Fedora EPEL, 4) updated by kevin
Message-ID: <20090111162438.2C717208472@bastion.fedora.phx.redhat.com>

kevin changed owner of perl-Pod-Coverage in Fedora EPEL 4 to spot

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Pod-Coverage



From pkgdb at fedoraproject.org  Sun Jan 11 16:24:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Jan 2009 16:24:45 +0000
Subject: [pkgdb] perl-Pod-Escapes (Fedora EPEL, 4) updated by kevin
Message-ID: <20090111162445.BEF2E20846E@bastion.fedora.phx.redhat.com>

kevin changed owner of perl-Pod-Escapes in Fedora EPEL 4 to spot

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Pod-Escapes



From pkgdb at fedoraproject.org  Sun Jan 11 16:24:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Jan 2009 16:24:50 +0000
Subject: [pkgdb] perl-Pod-Simple (Fedora EPEL, 4) updated by kevin
Message-ID: <20090111162451.ACB37208474@bastion.fedora.phx.redhat.com>

kevin changed owner of perl-Pod-Simple in Fedora EPEL 4 to spot

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Pod-Simple



From pkgdb at fedoraproject.org  Sun Jan 11 16:25:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Jan 2009 16:25:04 +0000
Subject: [pkgdb] perl-Test-Pod (Fedora EPEL, 4) updated by kevin
Message-ID: <20090111162505.0DEB720846C@bastion.fedora.phx.redhat.com>

kevin changed owner of perl-Test-Pod in Fedora EPEL 4 to spot

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Test-Pod



From pkgdb at fedoraproject.org  Sun Jan 11 16:24:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Jan 2009 16:24:58 +0000
Subject: [pkgdb] perl-Test-Builder-Tester (Fedora EPEL, 4) updated by kevin
Message-ID: <20090111162458.F282F208469@bastion.fedora.phx.redhat.com>

kevin changed owner of perl-Test-Builder-Tester in Fedora EPEL 4 to spot

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Test-Builder-Tester



From pkgdb at fedoraproject.org  Sun Jan 11 16:25:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Jan 2009 16:25:14 +0000
Subject: [pkgdb] perl-Test-Pod-Coverage (Fedora EPEL, 4) updated by kevin
Message-ID: <20090111162514.3E97C208466@bastion.fedora.phx.redhat.com>

kevin changed owner of perl-Test-Pod-Coverage in Fedora EPEL 4 to spot

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Test-Pod-Coverage



From pkgdb at fedoraproject.org  Sun Jan 11 16:25:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Jan 2009 16:25:18 +0000
Subject: [pkgdb] perl-Text-Template (Fedora EPEL, 4) updated by kevin
Message-ID: <20090111162519.1E059208472@bastion.fedora.phx.redhat.com>

kevin changed owner of perl-Text-Template in Fedora EPEL 4 to spot

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Text-Template



From pkgdb at fedoraproject.org  Sun Jan 11 16:25:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Jan 2009 16:25:26 +0000
Subject: [pkgdb] perl-pmtools (Fedora EPEL, 4) updated by kevin
Message-ID: <20090111162526.BB667208468@bastion.fedora.phx.redhat.com>

kevin changed owner of perl-pmtools in Fedora EPEL 4 to spot

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-pmtools



From pkgdb at fedoraproject.org  Sun Jan 11 16:25:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Jan 2009 16:25:49 +0000
Subject: [pkgdb] libcgi (Fedora EPEL, 5) updated by kevin
Message-ID: <20090111162550.53916208469@bastion.fedora.phx.redhat.com>

kevin changed owner of libcgi in Fedora EPEL 5 to spot

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libcgi



From pkgdb at fedoraproject.org  Sun Jan 11 16:25:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Jan 2009 16:25:56 +0000
Subject: [pkgdb] perl-DBD-SQLite (Fedora EPEL, 5) updated by kevin
Message-ID: <20090111162556.A8B9E20846B@bastion.fedora.phx.redhat.com>

kevin changed owner of perl-DBD-SQLite in Fedora EPEL 5 to spot

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-DBD-SQLite



From pkgdb at fedoraproject.org  Sun Jan 11 16:26:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Jan 2009 16:26:03 +0000
Subject: [pkgdb] perl-ExtUtils-CBuilder (Fedora EPEL, 5) updated by kevin
Message-ID: <20090111162603.8B791208474@bastion.fedora.phx.redhat.com>

kevin changed owner of perl-ExtUtils-CBuilder in Fedora EPEL 5 to spot

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-ExtUtils-CBuilder



From rishi at fedoraproject.org  Sun Jan 11 16:26:06 2009
From: rishi at fedoraproject.org (Debarshi Ray)
Date: Sun, 11 Jan 2009 16:26:06 +0000 (UTC)
Subject: rpms/libmatheval/F-9 libmatheval.spec,1.4,1.5
Message-ID: <20090111162606.0986570139@cvs1.fedora.phx.redhat.com>

Author: rishi

Update of /cvs/pkgs/rpms/libmatheval/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14632

Modified Files:
	libmatheval.spec 
Log Message:
* Sun Jan 11 2009 Debarshi Ray <rishi at fedoraproject.org> - 1.1.5-4
- Info page fixed by upstream. Closes Red Hat Bugzilla bug #465112.



Index: libmatheval.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libmatheval/F-9/libmatheval.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- libmatheval.spec	19 Feb 2008 02:21:07 -0000	1.4
+++ libmatheval.spec	11 Jan 2009 16:25:35 -0000	1.5
@@ -1,13 +1,13 @@
 Name:           libmatheval
 Version:        1.1.5
-Release:        2%{?dist}
+Release:        4%{?dist}
 Summary:        Library for parsing and evaluating symbolic expressions input as text
 
 Group:          System Environment/Libraries
-License:        GPL
+License:        GPLv3+
 URL:            http://www.gnu.org/software/libmatheval/
 Source0:        http://ftp.gnu.org/gnu/libmatheval/libmatheval-%{version}.tar.gz
-Patch0:         libmatheval_doc_add_info_dir.patch
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gcc-gfortran, guile-devel, bison, flex, texinfo
@@ -36,7 +36,6 @@
 
 %prep
 %setup -q
-%patch0 -p0
 
 %build
 %configure F77=gfortran --disable-static
@@ -84,6 +83,12 @@
 
 
 %changelog
+* Sun Jan 11 2009 Debarshi Ray <rishi at fedoraproject.org> - 1.1.5-4
+- Info page fixed by upstream. Closes Red Hat Bugzilla bug #465112.
+
+* Fri May 23 2008 Jon Stanley <jonstanley at gmail.com> - 1.1.5-3
+- Fix license tag
+
 * Mon Feb 18 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1.1.5-2
 - Autorebuild for GCC 4.3
 



From pkgdb at fedoraproject.org  Sun Jan 11 16:26:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Jan 2009 16:26:10 +0000
Subject: [pkgdb] perl-ExtUtils-ParseXS (Fedora EPEL, 5) updated by kevin
Message-ID: <20090111162610.3070B208468@bastion.fedora.phx.redhat.com>

kevin changed owner of perl-ExtUtils-ParseXS in Fedora EPEL 5 to spot

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-ExtUtils-ParseXS



From pkgdb at fedoraproject.org  Sun Jan 11 16:26:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Jan 2009 16:26:17 +0000
Subject: [pkgdb] perl-GD (Fedora EPEL, 5) updated by kevin
Message-ID: <20090111162618.08261208476@bastion.fedora.phx.redhat.com>

kevin changed owner of perl-GD in Fedora EPEL 5 to spot

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-GD



From pkgdb at fedoraproject.org  Sun Jan 11 16:26:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Jan 2009 16:26:24 +0000
Subject: [pkgdb] perl-GDGraph (Fedora EPEL, 5) updated by kevin
Message-ID: <20090111162624.98894208477@bastion.fedora.phx.redhat.com>

kevin changed owner of perl-GDGraph in Fedora EPEL 5 to spot

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-GDGraph



From pkgdb at fedoraproject.org  Sun Jan 11 16:26:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Jan 2009 16:26:32 +0000
Subject: [pkgdb] perl-GDTextUtil (Fedora EPEL, 5) updated by kevin
Message-ID: <20090111162632.D43EA20846B@bastion.fedora.phx.redhat.com>

kevin changed owner of perl-GDTextUtil in Fedora EPEL 5 to spot

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-GDTextUtil



From pkgdb at fedoraproject.org  Sun Jan 11 16:26:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Jan 2009 16:26:39 +0000
Subject: [pkgdb] perl-MLDBM (Fedora EPEL, 5) updated by kevin
Message-ID: <20090111162639.80C7220847A@bastion.fedora.phx.redhat.com>

kevin changed owner of perl-MLDBM in Fedora EPEL 5 to spot

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-MLDBM



From langel at fedoraproject.org  Sun Jan 11 16:26:48 2009
From: langel at fedoraproject.org (Lillian Angel)
Date: Sun, 11 Jan 2009 16:26:48 +0000 (UTC)
Subject: rpms/java-1.6.0-openjdk/devel java-1.6.0-openjdk.spec, 1.97,
	1.98 README.plugin, 1.1, NONE
Message-ID: <20090111162648.93F6970139@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-serv14696

Modified Files:
	java-1.6.0-openjdk.spec 
Removed Files:
	README.plugin 
Log Message:
* Sun Jan 11 2009 Lillian Angel <langel at redhat.com> - 1:1.6.0-9.b14
- Removed README.plugin, updated source list.
- Updated release.





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.97
retrieving revision 1.98
diff -u -r1.97 -r1.98
--- java-1.6.0-openjdk.spec	5 Dec 2008 16:45:47 -0000	1.97
+++ java-1.6.0-openjdk.spec	11 Jan 2009 16:26:18 -0000	1.98
@@ -109,7 +109,7 @@
 
 Name:    java-%{javaver}-%{origin}
 Version: %{javaver}.%{buildver}
-Release: 8.%{openjdkver}%{?dist}
+Release: 9.%{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
@@ -130,13 +130,12 @@
 Source2:  %{accessurl}%{accessmajorver}/java-access-bridge-%{accessver}.tar.gz
 Source3:  %{genurl}generate-fedora-zip.sh
 Source4:  README.src
-Source5:  README.plugin
-Source6:  mauve-%{mauvedate}.tar.gz
-Source7:  mauve_tests
-Source8:  %{netbeansurl}/netbeans-6.1-200805300101-basic_cluster-src.zip
-Source9:  %{visualvmurl}/netbeans-profiler-visualvm_preview2.tar.gz
-Source10: %{visualvmurl}/visualvm-20081031-src.tar.gz
-Source11: %{hotspoturl}/hotspot.tar.gz
+Source5:  mauve-%{mauvedate}.tar.gz
+Source6:  mauve_tests
+Source7:  %{netbeansurl}/netbeans-6.1-200805300101-basic_cluster-src.zip
+Source8:  %{visualvmurl}/netbeans-profiler-visualvm_preview2.tar.gz
+Source9: %{visualvmurl}/visualvm-20081031-src.tar.gz
+Source10: %{hotspoturl}/hotspot.tar.gz
 # FIXME: This patch needs to be fixed. optflags argument
 # -mtune=generic is being ignored because it breaks several graphical
 # applications.
@@ -358,12 +357,11 @@
 %patch0
 %patch2
 cp %{SOURCE4} .
-cp %{SOURCE5} .
+cp %{SOURCE6} .
 cp %{SOURCE7} .
 cp %{SOURCE8} .
 cp %{SOURCE9} .
 cp %{SOURCE10} .
-cp %{SOURCE11} .
 
 %build
 # Build IcedTea and OpenJDK.
@@ -420,7 +418,7 @@
     Xvfb :20 -screen 0 1x1x24 -ac&
     echo $! > Xvfb.pid
     $JAVA_HOME/bin/java Harness -vm $JAVA_HOME/bin/java \
-      -file %{SOURCE7} -timeout 30000 2>&1 | tee mauve_output
+      -file %{SOURCE6} -timeout 30000 2>&1 | tee mauve_output
     kill -9 `cat Xvfb.pid`
     unset DISPLAY
     rm -f Xvfb.pid
@@ -904,10 +902,13 @@
 
 %files plugin
 %defattr(-,root,root,-)
-%doc README.plugin
 %{_jvmdir}/%{jredir}/lib/%{archinstall}/IcedTeaPlugin.so
 
 %changelog
+* Sun Jan 11 2009 Lillian Angel <langel at redhat.com> - 1:1.6.0-9.b14
+- Removed README.plugin, updated source list.
+- Updated release.
+
 * Fri Dec  5 2008 Lillian Angel <langel at redhat.com> - 1:1.6.0-8.b14
 - Added hotspot source.
 - Added --with-hotspot-src-zip build option.


--- README.plugin DELETED ---



From pkgdb at fedoraproject.org  Sun Jan 11 16:26:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Jan 2009 16:26:47 +0000
Subject: [pkgdb] perl-Pod-Coverage (Fedora EPEL, 5) updated by kevin
Message-ID: <20090111162647.87386208474@bastion.fedora.phx.redhat.com>

kevin changed owner of perl-Pod-Coverage in Fedora EPEL 5 to spot

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Pod-Coverage



From pkgdb at fedoraproject.org  Sun Jan 11 16:26:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Jan 2009 16:26:56 +0000
Subject: [pkgdb] perl-Pod-Escapes (Fedora EPEL, 5) updated by kevin
Message-ID: <20090111162656.E9954208466@bastion.fedora.phx.redhat.com>

kevin changed owner of perl-Pod-Escapes in Fedora EPEL 5 to spot

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Pod-Escapes



From pkgdb at fedoraproject.org  Sun Jan 11 16:27:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Jan 2009 16:27:04 +0000
Subject: [pkgdb] perl-Pod-Simple (Fedora EPEL, 5) updated by kevin
Message-ID: <20090111162704.3775E20846C@bastion.fedora.phx.redhat.com>

kevin changed owner of perl-Pod-Simple in Fedora EPEL 5 to spot

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Pod-Simple



From pkgdb at fedoraproject.org  Sun Jan 11 16:27:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Jan 2009 16:27:10 +0000
Subject: [pkgdb] perl-Test-Builder-Tester (Fedora EPEL, 5) updated by kevin
Message-ID: <20090111162710.ADBC320847E@bastion.fedora.phx.redhat.com>

kevin changed owner of perl-Test-Builder-Tester in Fedora EPEL 5 to spot

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Test-Builder-Tester



From pkgdb at fedoraproject.org  Sun Jan 11 16:27:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Jan 2009 16:27:19 +0000
Subject: [pkgdb] perl-Test-Pod (Fedora EPEL, 5) updated by kevin
Message-ID: <20090111162719.E24FB208480@bastion.fedora.phx.redhat.com>

kevin changed owner of perl-Test-Pod in Fedora EPEL 5 to spot

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Test-Pod



From pkgdb at fedoraproject.org  Sun Jan 11 16:27:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Jan 2009 16:27:28 +0000
Subject: [pkgdb] perl-Test-Pod-Coverage (Fedora EPEL, 5) updated by kevin
Message-ID: <20090111162728.58090208472@bastion.fedora.phx.redhat.com>

kevin changed owner of perl-Test-Pod-Coverage in Fedora EPEL 5 to spot

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Test-Pod-Coverage



From pkgdb at fedoraproject.org  Sun Jan 11 16:27:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Jan 2009 16:27:34 +0000
Subject: [pkgdb] perl-Text-Template (Fedora EPEL, 5) updated by kevin
Message-ID: <20090111162734.C424F20847A@bastion.fedora.phx.redhat.com>

kevin changed owner of perl-Text-Template in Fedora EPEL 5 to spot

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Text-Template



From pkgdb at fedoraproject.org  Sun Jan 11 16:27:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Jan 2009 16:27:43 +0000
Subject: [pkgdb] perl-pmtools (Fedora EPEL, 5) updated by kevin
Message-ID: <20090111162743.C7A23208466@bastion.fedora.phx.redhat.com>

kevin changed owner of perl-pmtools in Fedora EPEL 5 to spot

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-pmtools



From langel at fedoraproject.org  Sun Jan 11 16:28:50 2009
From: langel at fedoraproject.org (Lillian Angel)
Date: Sun, 11 Jan 2009 16:28:50 +0000 (UTC)
Subject: rpms/java-1.6.0-openjdk/devel java-1.6.0-openjdk.spec,1.98,1.99
Message-ID: <20090111162850.B4FA270139@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-serv14883

Modified Files:
	java-1.6.0-openjdk.spec 
Log Message:
Fixed typo.




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.98
retrieving revision 1.99
diff -u -r1.98 -r1.99
--- java-1.6.0-openjdk.spec	11 Jan 2009 16:26:18 -0000	1.98
+++ java-1.6.0-openjdk.spec	11 Jan 2009 16:28:19 -0000	1.99
@@ -352,7 +352,7 @@
 
 %prep
 %setup -q -n icedtea6-%{icedteaver}
-%setup -q -n icedtea6-%{icedteaver} -T -D -a 6
+%setup -q -n icedtea6-%{icedteaver} -T -D -a 5
 %setup -q -n icedtea6-%{icedteaver} -T -D -a 2
 %patch0
 %patch2



From buc at fedoraproject.org  Sun Jan 11 16:30:17 2009
From: buc at fedoraproject.org (Dmitry Butskoy)
Date: Sun, 11 Jan 2009 16:30:17 +0000 (UTC)
Subject: rpms/libtranslate/F-10 libtranslate-0.99-update-services.patch, NONE,
	1.1 libtranslate.spec, 1.22, 1.23
Message-ID: <20090111163017.9860870139@cvs1.fedora.phx.redhat.com>

Author: buc

Update of /cvs/extras/rpms/libtranslate/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15083

Modified Files:
	libtranslate.spec 
Added Files:
	libtranslate-0.99-update-services.patch 
Log Message:


libtranslate-0.99-update-services.patch:

--- NEW FILE libtranslate-0.99-update-services.patch ---
diff -up libtranslate-0.99/data/services.xml.in.update-services libtranslate-0.99/data/services.xml.in
--- libtranslate-0.99/data/services.xml.in.update-services	2009-01-07 22:31:15.000000000 +0200
+++ libtranslate-0.99/data/services.xml.in	2009-01-07 22:34:54.000000000 +0200
@@ -31,12 +31,14 @@
 <!-- POSSIBILITY OF SUCH DAMAGE. -->
 
 <services>
+  <custom-language tag="oc_aran" _name="Aranese"/>
+  <custom-language tag="pt-BR" _name="Portuguese (Brazil)"/>
   <custom-language tag="zh-TW" _name="Chinese (Taiwan)"/>
   
   <service name="babelfish" nick="Babel Fish">
     <group>
-      <language tag="zh" to="en"/>
-      <language tag="zh-TW" service-tag="zt" to="en"/>
+      <language tag="zh" to="en,zh-TW"/>
+      <language tag="zh-TW" service-tag="zt" to="en,zh"/>
       <language tag="en" to="*"/>
       <language tag="nl" to="en,fr"/>
       <language tag="fr" to="en,de,el,it,pt,nl,es"/>
@@ -82,27 +84,49 @@
 
   <service name="google" nick="Google">
     <group>
+      <language tag="ar" to="*"/>
+      <language tag="bg" to="*"/>
+      <language tag="ca" to="*"/>
+      <language tag="cs" to="*"/>
+      <language tag="da" to="*"/>
+      <language tag="de" to="*"/>
+      <language tag="el" to="*"/>
       <language tag="en" to="*"/>
-      <language tag="ar" to="en"/>
-      <language tag="de" to="en,fr"/>
-      <language tag="el" to="en"/>
-      <language tag="es" to="en"/>
-      <language tag="fr" to="en,de"/>
-      <language tag="it" to="en"/>
-      <language tag="ja" to="en"/>
-      <language tag="ko" to="en"/>
-      <language tag="nl" to="en"/>
-      <language tag="pt" to="en"/>
-      <language tag="ru" to="en"/>
-      <language tag="zh" service-tag="zh-CN" to="en,zh-TW"/>
-      <language tag="zh-TW" to="zh"/>
+      <language tag="es" to="*"/>
+      <language tag="fi" to="*"/>
+      <language tag="fil" to="*"/>
+      <language tag="fr" to="*"/>
+      <language tag="he" to="*"/>
+      <language tag="hi" to="*"/>
+      <language tag="hr" to="*"/>
+      <language tag="id" to="*"/>
+      <language tag="it" to="*"/>
+      <language tag="ja" to="*"/>
+      <language tag="ko" to="*"/>
+      <language tag="lt" to="*"/>
+      <language tag="lv" to="*"/>
+      <language tag="nl" to="*"/>
+      <language tag="nb" service-tag="no" to="*"/> <!-- Google does not differentiate these two dialects -->
+      <language tag="nn" service-tag="no" to="*"/> <!-- probably needs review by a native speaker -->
+      <language tag="pl" to="*"/>
+      <language tag="pt" to="*"/>
+      <language tag="ro" to="*"/>
+      <language tag="ru" to="*"/>
+      <language tag="sk" to="*"/>
+      <language tag="sl" to="*"/>
+      <language tag="sr" to="*"/>
+      <language tag="sv" to="*"/>
+      <language tag="uk" to="*"/>
+      <language tag="vi" to="*"/>
+      <language tag="zh" service-tag="zh-CN" to="*"/>
+      <language tag="zh-TW" to="*"/>
       <text-translation url="http://www.google.com/translate_t?text=${text:escape}&amp;langpair=${from}|${to}&amp;ie=utf8&amp;oe=utf8">
 	<pre-marker text="&lt;div id="/>
 	<pre-marker text="result_box"/>
 	<pre-marker text="&gt;"/>
 	<post-marker text="&lt;/div&gt;"/>
       </text-translation>
-      <web-page-translation url="http://www.google.com/translate_c?u=${url:escape}&amp;langpair=${from}|${to}"/>
+      <web-page-translation url="http://translate.google.com/translate?u=${url:escape}&amp;sl=${from}&amp;tl=${to}"/>
     </group>
   </service>
 
@@ -208,4 +232,99 @@
       <web-page-translation url="http://www.online-translator.com/url/tran_url.asp?lang=en&amp;url=${url:escape}&amp;$direction=${from}${to}&amp;template=General&amp;cp1=NO&amp;cp2=NO&amp;autotranslate=on"/>
     </group>
   </service>
+
+  <service nick="Apertium" name="apertium">
+    <group>
+      <!-- Need a better code for Aranese a dialect of Occitan
+           current is oc_aran there is no ISO equivalent -->
+      <language to="en,es,eo,fr,oc,oc_aran" tag="ca"/>
+      <language to="en" tag="cy"/>
+      <language to="ca,es,gl" tag="en"/>
+      <language to="ca,en,eo,fr,gl,pt,pt-BR" tag="es"/>
+      <language to="es" tag="eu"/>
+      <language to="ca,es" tag="fr"/>
+      <language to="en,es" tag="gl"/>
+      <language to="es" tag="pt"/>
+      <language tag="pt-BR" service-tag="pt_BR"/>
+      <language to="ca" tag="oc"/>
+      <language to="es" tag="ro"/>
+      <text-translation url="http://xixona.dlsi.ua.es/webservice/ws.php?text=${text:escape}&amp;mode=${from}-${to}"/>
+      <web-page-translation url="http://www.apertium.org/apertium/tradurl.php?marcar=&amp;direccion=${from}-${to}&amp;inurl=${url:escape}"/>
+    </group>
+  </service>
+  <!-- Re-enable if you want to use or test the unstable Apertium pairs
+  <service nick="Apertium (Unstable)" name="apertium-unstable">
+    <group>
+      <language to="en" tag="af"/>
+      <language to="en,es,eo,fr,oc,oc_aran,pt" tag="ca"/> 
+      <language to="af,ca" tag="en"/>
+      <language to="ca,eo,fr,gl,oc,oc_aran,pt,pt-BR" tag="es"/>
+      <language to="ca,es" tag="fr"/>
+      <language to="es" tag="gl"/>
+      <language to="ca,es" tag="oc"/>
+      <language to="ca,es" tag="oc_aran"/>
+      <language to="ca,es" tag="pt"/>
+      <language tag="pt-BR" service-tag="pt_BR"/>
+      <language to="ca" tag="ro"/>
+      <text-translation url="http://xixona.dlsi.ua.es/apertium-unstable/tradtextjs.php" post="direccion=${from}-${to}&amp;marcar=0&amp;cuadrotexto=${text:escape}"/>
+    </group>
+  </service> -->
+  <!-- Re-enable if you want to use or test the alph/testing Apertium pairs
+  <custom-language tag="sh-BS" _name="Serbo-Croatian (Sarajevo)"></custom-language>
+  <custom-language tag="sh-HR" _name="Serbo-Croatian (Zagreb)"></custom-language>
+  <custom-language tag="sh-SR" _name="Serbo-Croatian (Belgrade)"></custom-language>
+
+  <service nick="Apertium (Alpha Testing)" name="apertium-alpha-testing">
+    <group>
+      <language to="en" tag="af"/>
+      <language to="fr" tag="br"/>
+      <language to="en,es,eo,fr,oc,oc_aran,pt,ro" tag="ca"/> 
+      <language to="en" tag="cy"/>
+      <language to="sv" tag="da"/>
+      <language to="af,ca,cy,es,eo,gl" tag="en"/>
+      <language to="en" tag="eo"/>
+      <language to="es" tag="eu"/>
+      <language to="ca,en,eo,fr,gl,it,oc,oc_aran,pt,pt-BR,ro" tag="es"/>
+      <language to="tg" tag="fa"/>
+      <language to="ca,es" tag="fr"/>
+      <language to="sco" tag="ga"/>
+      <language to="en,es,pt" tag="gl"/>
+      <language to="es" tag="it"/>
+      <language to="sh-BS,sh-HR,sh-SR" tag="mk"/>
+      <language to="nn" tag="nb"/>
+      <language to="nb" tag="nn"/>
+      <language to="ca,es" tag="oc"/>
+      <language to="ca,es" tag="oc_aran"/>
+      <language to="ca,es,gl" tag="pt"/>
+      <language tag="pt-BR" service-tag="pt_BR"/>
+      <language to="ca,es" tag="ro"/>
+      <language to="ga" tag="sco"/>
+      <language to="smj" tag="se"/>
+      <language to="mk" tag="sh"/>
+      <language tag="sh-BS" service-tag="sh_BS"/>
+      <language tag="sh-HR" service-tag="sh_HR"/>
+      <language tag="sh-SR" service-tag="sh_SR"/>
+      <language to="da" tag="sv"/>
+      <language to="fa" tag="tg"/>
+      <text-translation url="http://xixona.dlsi.ua.es/testing/index.php" post="lang=&amp;inputarea=${text}&amp;direction=${from}-${to}&amp;marcar=0&amp;interm=0&amp;mangle=true">
+        <pre-marker text="&lt;div class=&quot;outbox&quot;&gt;"/>
+        <pre-marker text="&lt;p style="/>
+        <pre-marker text="&lt;/p&gt;"/>
+        <post-marker text="&lt;/div&gt;"/>
+      </text-translation>
+    </group>
+  </service> -->
+
+  <service nick="Opentrad" name="opentrad">
+    <group>
+      <language to="es" tag="ca"/>
+      <language to="ca,gl,eu" tag="es"/>
+      <language to="es" tag="gl"/>
+      <text-translation
+      url="http://opentrad.org/tradtextjs.php"
+      post="direccion=${from}-${to}&amp;marcar=0&amp;cuadrotexto=${text:escape}"/>
+      <!-- All newlines have <br/> in them, again a pitty for processing would be nice if we could cleanup -->
+      <!-- No web-page-translation added -->
+    </group>
+  </service>
 </services>


Index: libtranslate.spec
===================================================================
RCS file: /cvs/extras/rpms/libtranslate/F-10/libtranslate.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- libtranslate.spec	22 Dec 2008 14:24:19 -0000	1.22
+++ libtranslate.spec	11 Jan 2009 16:29:47 -0000	1.23
@@ -1,7 +1,7 @@
 Name: libtranslate
 Summary: Natural language translation library
 Version: 0.99
-Release: 17%{?dist}
+Release: 18%{?dist}
 License: BSD
 Group: System Environment/Libraries
 %define url	http://savannah.nongnu.org/download/libtranslate
@@ -12,6 +12,7 @@
 Patch4: %{url}/libtranslate-0.99-postmarker.diff
 Patch5: %{url}/libtranslate-0.99-services.diff
 Patch10: libtranslate-0.99-libsoup24.diff
+Patch12: libtranslate-0.99-update-services.patch
 Patch11: libtranslate-0.99-fix-modules.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: pkgconfig >= 1:0.8, gettext, intltool, libtool
@@ -55,7 +56,9 @@
 %patch5 -p1
 %patch10 -p1
 %patch11 -p1
+%patch12 -p1
 
+libtoolize --force
 intltoolize --automake --force
 aclocal -I m4
 automake
@@ -119,6 +122,10 @@
 
 
 %changelog
+* Sun Jan 11 2009 Dmitry Butskoy <Dmitry at Butskoy.name> - 0.99-18
+- update services.xml (google, babelfish, add apertium and opentrad) (#478626)
+  (by Dwayne Bailey <dwayne at translate.org.za>)
+
 * Mon Dec 22 2008 Dmitry Butskoy <Dmitry at Butskoy.name> - 0.99-17
 - update fix-modules patch, more autotools to run
   (by Dwayne Bailey <dwayne at translate.org.za>)



From langel at fedoraproject.org  Sun Jan 11 16:30:32 2009
From: langel at fedoraproject.org (Lillian Angel)
Date: Sun, 11 Jan 2009 16:30:32 +0000 (UTC)
Subject: rpms/java-1.6.0-openjdk/F-10 java-1.6.0-openjdk.spec,1.95,1.96
Message-ID: <20090111163032.114CE70139@cvs1.fedora.phx.redhat.com>

Author: langel

Update of /cvs/pkgs/rpms/java-1.6.0-openjdk/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15118

Modified Files:
	java-1.6.0-openjdk.spec 
Log Message:
Fixed typo.




Index: java-1.6.0-openjdk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/F-10/java-1.6.0-openjdk.spec,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -r1.95 -r1.96
--- java-1.6.0-openjdk.spec	11 Jan 2009 16:22:17 -0000	1.95
+++ java-1.6.0-openjdk.spec	11 Jan 2009 16:30:01 -0000	1.96
@@ -351,7 +351,7 @@
 
 %prep
 %setup -q -n icedtea6-%{icedteaver}
-%setup -q -n icedtea6-%{icedteaver} -T -D -a 6
+%setup -q -n icedtea6-%{icedteaver} -T -D -a 5
 %setup -q -n icedtea6-%{icedteaver} -T -D -a 2
 %patch0
 %patch2



From kyle at fedoraproject.org  Sun Jan 11 16:39:13 2009
From: kyle at fedoraproject.org (Kyle McMartin)
Date: Sun, 11 Jan 2009 16:39:13 +0000 (UTC)
Subject: rpms/kernel/devel patch-2.6.29-rc1.bz2.sign, NONE, 1.1 .cvsignore, 
	1.987, 1.988 kernel.spec, 1.1205, 1.1206 sources, 1.949,
	1.950 upstream, 1.861, 1.862 patch-2.6.28-git14.bz2.sign, 1.1,
	NONE revert-strip-bustication.patch, 1.1, NONE
Message-ID: <20090111163913.62C6F70139@cvs1.fedora.phx.redhat.com>

Author: kyle

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16297

Modified Files:
	.cvsignore kernel.spec sources upstream 
Added Files:
	patch-2.6.29-rc1.bz2.sign 
Removed Files:
	patch-2.6.28-git14.bz2.sign revert-strip-bustication.patch 
Log Message:
* Sun Jan 09 2009 Kyle McMartin <kyle at redhat.com>
- 2.6.29-rc1



--- NEW FILE patch-2.6.29-rc1.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBJaTh2yGugalF9Dw4RAm3MAJ9yxx+NVBkhkIU+8yczOazV/ojMwQCfdCH2
b4UNZJndF6cOH8NP6a1eJ+Q=
=4XE6
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.987
retrieving revision 1.988
diff -u -r1.987 -r1.988
--- .cvsignore	10 Jan 2009 07:46:11 -0000	1.987
+++ .cvsignore	11 Jan 2009 16:38:41 -0000	1.988
@@ -5,3 +5,4 @@
 kernel-2.6.28
 linux-2.6.28.tar.bz2
 patch-2.6.28-git14.bz2
+patch-2.6.29-rc1.bz2


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1205
retrieving revision 1.1206
diff -u -r1.1205 -r1.1206
--- kernel.spec	10 Jan 2009 07:46:11 -0000	1.1205
+++ kernel.spec	11 Jan 2009 16:38:41 -0000	1.1206
@@ -55,9 +55,9 @@
 # The next upstream release sublevel (base_sublevel+1)
 %define upstream_sublevel %(expr %{base_sublevel} + 1)
 # The rc snapshot level
-%define rcrev 0
+%define rcrev 1
 # The git snapshot level
-%define gitrev 14
+%define gitrev 0
 # Set rpm version accordingly
 %define rpmversion 2.6.%{upstream_sublevel}
 %endif
@@ -661,7 +661,6 @@
 # silence the ACPI blacklist code
 Patch2802: linux-2.6-silence-acpi-blacklist.patch
 
-Patch9000: revert-strip-bustication.patch
 Patch9001: revert-fix-modules_install-via-nfs.patch
 
 %endif
@@ -1167,9 +1166,6 @@
 # silence the ACPI blacklist code
 ApplyPatch linux-2.6-silence-acpi-blacklist.patch
 
-# revert ad7a953c522ceb496611d127e51e278bfe0ff483
-ApplyPatch revert-strip-bustication.patch
-
 # revert 8b249b6856f16f09b0e5b79ce5f4d435e439b9d6
 ApplyPatch revert-fix-modules_install-via-nfs.patch
 
@@ -1748,6 +1744,9 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Sun Jan 09 2009 Kyle McMartin <kyle at redhat.com>
+- 2.6.29-rc1
+
 * Fri Jan 08 2009 Kyle McMartin <kyle at redhat.com>
 - 2.6.28-git14
 - Rebased patches:


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v
retrieving revision 1.949
retrieving revision 1.950
diff -u -r1.949 -r1.950
--- sources	10 Jan 2009 07:46:12 -0000	1.949
+++ sources	11 Jan 2009 16:38:42 -0000	1.950
@@ -1,2 +1,2 @@
 d351e44709c9810b85e29b877f50968a  linux-2.6.28.tar.bz2
-423b6971fbd26d2140309825b8fb0748  patch-2.6.28-git14.bz2
+c7280469ffd1edd4b50bac92de172d46  patch-2.6.29-rc1.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v
retrieving revision 1.861
retrieving revision 1.862
diff -u -r1.861 -r1.862
--- upstream	10 Jan 2009 07:46:12 -0000	1.861
+++ upstream	11 Jan 2009 16:38:42 -0000	1.862
@@ -1,2 +1,2 @@
 linux-2.6.28.tar.bz2
-patch-2.6.28-git14.bz2
+patch-2.6.29-rc1.bz2


--- patch-2.6.28-git14.bz2.sign DELETED ---


--- revert-strip-bustication.patch DELETED ---



From mclasen at fedoraproject.org  Sun Jan 11 16:42:43 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Sun, 11 Jan 2009 16:42:43 +0000 (UTC)
Subject: rpms/gnome-applets/devel mini-commander.patch,1.2,1.3
Message-ID: <20090111164243.A3B6570139@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-applets/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16842

Modified Files:
	mini-commander.patch 
Log Message:
forgotten patch


mini-commander.patch:

Index: mini-commander.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-applets/devel/mini-commander.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mini-commander.patch	7 Jan 2009 03:27:39 -0000	1.2
+++ mini-commander.patch	11 Jan 2009 16:42:13 -0000	1.3
@@ -9,22 +9,3 @@
  	$(GNOME_APPLETS_LIBS)
  
  mc_install_default_macros_SOURCES =	\
-diff -up gnome-applets-2.25.3/modemlights/Makefile.am.mini-commander gnome-applets-2.25.3/modemlights/Makefile.am
---- gnome-applets-2.25.3/modemlights/Makefile.am.mini-commander	2009-01-06 22:00:00.000000000 -0500
-+++ gnome-applets-2.25.3/modemlights/Makefile.am	2009-01-06 21:59:20.000000000 -0500
-@@ -2,6 +2,7 @@ SUBDIRS = docs
- 
- INCLUDES = -I. -I$(srcdir) 				\
- 	$(GNOME_APPLETS_CFLAGS)				\
-+	$(GNOME_LIBS2_CFLAGS)				\
- 	-DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" 	\
- 	-DVERSION=\""$(VERSION)"\"
- 
-@@ -13,6 +14,7 @@ modemlights_applet2_SOURCES = \
- 	properties.c
- 
- modemlights_applet2_LDADD = \
-+		$(GNOME_LIBS2_LIBS)	\
- 		     $(GNOME_APPLETS_LIBS)
- 
- uidir		= $(datadir)/gnome-2.0/ui



From pkgdb at fedoraproject.org  Sun Jan 11 16:44:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Jan 2009 16:44:15 +0000
Subject: [pkgdb] gtk+: dhurander3 has requested watchbugzilla
Message-ID: <20090111164415.649DA208456@bastion.fedora.phx.redhat.com>

dhurander3 has requested the watchbugzilla acl on gtk+ (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gtk+



From pkgdb at fedoraproject.org  Sun Jan 11 16:49:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Jan 2009 16:49:14 +0000
Subject: [pkgdb] procinfo-ng was added for fab
Message-ID: <20090111164914.AE8F5208457@bastion.fedora.phx.redhat.com>

kevin has added Package procinfo-ng with summary Console-based system monitoring utility
kevin has approved Package procinfo-ng
kevin has added a Fedora devel branch for procinfo-ng with an owner of fab
kevin has approved procinfo-ng in Fedora devel
kevin has approved Package procinfo-ng
kevin has set commit to Approved for provenpackager on procinfo-ng (Fedora devel)
kevin has set build to Approved for provenpackager on procinfo-ng (Fedora devel)
kevin has set checkout to Approved for provenpackager on procinfo-ng (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/procinfo-ng



From pkgdb at fedoraproject.org  Sun Jan 11 16:49:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Jan 2009 16:49:19 +0000
Subject: [pkgdb] procinfo-ng (Fedora, 9) updated by kevin
Message-ID: <20090111164919.5CA42208456@bastion.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for procinfo-ng
kevin has set commit to Approved for provenpackager on procinfo-ng (Fedora 9)
kevin has set build to Approved for provenpackager on procinfo-ng (Fedora 9)
kevin has set checkout to Approved for provenpackager on procinfo-ng (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/procinfo-ng



From pkgdb at fedoraproject.org  Sun Jan 11 16:49:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Jan 2009 16:49:19 +0000
Subject: [pkgdb] procinfo-ng (Fedora, 10) updated by kevin
Message-ID: <20090111164919.8F944208467@bastion.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for procinfo-ng
kevin has set commit to Approved for provenpackager on procinfo-ng (Fedora 10)
kevin has set build to Approved for provenpackager on procinfo-ng (Fedora 10)
kevin has set checkout to Approved for provenpackager on procinfo-ng (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/procinfo-ng



From kevin at fedoraproject.org  Sun Jan 11 16:49:54 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 11 Jan 2009 16:49:54 +0000 (UTC)
Subject: rpms/procinfo-ng - New directory
Message-ID: <20090111164954.7BA8770139@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/procinfo-ng
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsN17666/rpms/procinfo-ng

Log Message:
Directory /cvs/pkgs/rpms/procinfo-ng added to the repository




From kevin at fedoraproject.org  Sun Jan 11 16:49:54 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 11 Jan 2009 16:49:54 +0000 (UTC)
Subject: rpms/procinfo-ng/devel - New directory
Message-ID: <20090111164954.C0C9170139@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/procinfo-ng/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsN17666/rpms/procinfo-ng/devel

Log Message:
Directory /cvs/pkgs/rpms/procinfo-ng/devel added to the repository




From kevin at fedoraproject.org  Sun Jan 11 16:50:10 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 11 Jan 2009 16:50:10 +0000 (UTC)
Subject: rpms/procinfo-ng Makefile,NONE,1.1
Message-ID: <20090111165010.E3FA670139@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/procinfo-ng
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsN17666/rpms/procinfo-ng

Added Files:
	Makefile 
Log Message:
Setup of module procinfo-ng


--- NEW FILE Makefile ---
# Top level Makefile for module procinfo-ng
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Jan 11 16:50:11 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 11 Jan 2009 16:50:11 +0000 (UTC)
Subject: rpms/procinfo-ng/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090111165011.40A7C7013F@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/procinfo-ng/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsN17666/rpms/procinfo-ng/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module procinfo-ng


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: procinfo-ng
# $Id: Makefile,v 1.1 2009/01/11 16:50:11 kevin Exp $
NAME := procinfo-ng
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out 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 Jan 11 16:56:02 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Sun, 11 Jan 2009 16:56:02 +0000 (UTC)
Subject: rpms/gnome-applets/devel mini-commander.patch,1.3,1.4
Message-ID: <20090111165602.32CF770139@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-applets/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18927

Modified Files:
	mini-commander.patch 
Log Message:
working patch


mini-commander.patch:

Index: mini-commander.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-applets/devel/mini-commander.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- mini-commander.patch	11 Jan 2009 16:42:13 -0000	1.3
+++ mini-commander.patch	11 Jan 2009 16:55:31 -0000	1.4
@@ -9,3 +9,22 @@
  	$(GNOME_APPLETS_LIBS)
  
  mc_install_default_macros_SOURCES =	\
+diff -up gnome-applets-2.25.3/modemlights/Makefile.am.mini-commander gnome-applets-2.25.3/modemlights/Makefile.am
+--- gnome-applets-2.25.3/modemlights/Makefile.am.mini-commander	2009-01-06 22:00:00.000000000 -0500
++++ gnome-applets-2.25.3/modemlights/Makefile.am	2009-01-06 21:59:20.000000000 -0500
+@@ -2,6 +2,7 @@ SUBDIRS = docs
+ 
+ INCLUDES = -I. -I$(srcdir) 				\
+ 	$(GNOME_APPLETS_CFLAGS)				\
++	$(GNOME_LIBS2_CFLAGS)				\
+ 	-DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" 	\
+ 	-DVERSION=\""$(VERSION)"\"
+ 
+@@ -13,6 +14,7 @@ modemlights_applet2_SOURCES = \
+ 	properties.c
+ 
+ modemlights_applet2_LDADD = \
++		$(GNOME_LIBS2_LIBS)	\
+ 		     $(GNOME_APPLETS_LIBS)
+ 
+ uidir		= $(datadir)/gnome-2.0/ui



From pkgdb at fedoraproject.org  Sun Jan 11 16:56:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Jan 2009 16:56:07 +0000
Subject: [pkgdb] cpm was added for mmahut
Message-ID: <20090111165607.D8DF6208456@bastion.fedora.phx.redhat.com>

kevin has added Package cpm with summary Console Password Manager
kevin has approved Package cpm
kevin has added a Fedora devel branch for cpm with an owner of mmahut
kevin has approved cpm in Fedora devel
kevin has approved Package cpm
kevin has set commit to Approved for provenpackager on cpm (Fedora devel)
kevin has set build to Approved for provenpackager on cpm (Fedora devel)
kevin has set checkout to Approved for provenpackager on cpm (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cpm



From pkgdb at fedoraproject.org  Sun Jan 11 16:56:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Jan 2009 16:56:09 +0000
Subject: [pkgdb] cpm (Fedora EPEL, 5) updated by kevin
Message-ID: <20090111165609.8EE23208466@bastion.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for cpm
kevin has set commit to Approved for provenpackager on cpm (Fedora EPEL 5)
kevin has set build to Approved for provenpackager on cpm (Fedora EPEL 5)
kevin has set checkout to Approved for provenpackager on cpm (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cpm



From pkgdb at fedoraproject.org  Sun Jan 11 16:56:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Jan 2009 16:56:09 +0000
Subject: [pkgdb] cpm (Fedora, 9) updated by kevin
Message-ID: <20090111165609.9B698208469@bastion.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for cpm
kevin has set commit to Approved for provenpackager on cpm (Fedora 9)
kevin has set build to Approved for provenpackager on cpm (Fedora 9)
kevin has set checkout to Approved for provenpackager on cpm (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cpm



From pkgdb at fedoraproject.org  Sun Jan 11 16:56:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Jan 2009 16:56:09 +0000
Subject: [pkgdb] cpm (Fedora, 10) updated by kevin
Message-ID: <20090111165609.ABCF720846E@bastion.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for cpm
kevin has set commit to Approved for provenpackager on cpm (Fedora 10)
kevin has set build to Approved for provenpackager on cpm (Fedora 10)
kevin has set checkout to Approved for provenpackager on cpm (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cpm



From kevin at fedoraproject.org  Sun Jan 11 16:56:53 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 11 Jan 2009 16:56:53 +0000 (UTC)
Subject: rpms/cpm - New directory
Message-ID: <20090111165653.349AA70139@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/cpm
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsl19145/rpms/cpm

Log Message:
Directory /cvs/pkgs/rpms/cpm added to the repository




From kevin at fedoraproject.org  Sun Jan 11 16:56:53 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 11 Jan 2009 16:56:53 +0000 (UTC)
Subject: rpms/cpm/devel - New directory
Message-ID: <20090111165653.73F7370139@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/cpm/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsl19145/rpms/cpm/devel

Log Message:
Directory /cvs/pkgs/rpms/cpm/devel added to the repository




From kevin at fedoraproject.org  Sun Jan 11 16:57:08 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 11 Jan 2009 16:57:08 +0000 (UTC)
Subject: rpms/cpm Makefile,NONE,1.1
Message-ID: <20090111165708.F15D170139@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/cpm
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsl19145/rpms/cpm

Added Files:
	Makefile 
Log Message:
Setup of module cpm


--- NEW FILE Makefile ---
# Top level Makefile for module cpm
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Jan 11 16:57:09 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 11 Jan 2009 16:57:09 +0000 (UTC)
Subject: rpms/cpm/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <20090111165709.4785670142@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/cpm/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsl19145/rpms/cpm/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module cpm


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: cpm
# $Id: Makefile,v 1.1 2009/01/11 16:57:09 kevin Exp $
NAME := cpm
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Jan 11 16:57:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Jan 2009 16:57:43 +0000
Subject: [pkgdb] xfconf was added for kevin
Message-ID: <20090111165743.2155A208457@bastion.fedora.phx.redhat.com>

kevin has added Package xfconf with summary Hierarchical configuration system for Xfce
kevin has approved Package xfconf
kevin has added a Fedora devel branch for xfconf with an owner of kevin
kevin has approved xfconf in Fedora devel
kevin has approved Package xfconf
kevin has set commit to Approved for provenpackager on xfconf (Fedora devel)
kevin has set build to Approved for provenpackager on xfconf (Fedora devel)
kevin has set checkout to Approved for provenpackager on xfconf (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/xfconf



From kevin at fedoraproject.org  Sun Jan 11 16:57:57 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 11 Jan 2009 16:57:57 +0000 (UTC)
Subject: rpms/xfconf - New directory
Message-ID: <20090111165757.2A0D270139@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/xfconf
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvst19404/rpms/xfconf

Log Message:
Directory /cvs/pkgs/rpms/xfconf added to the repository




From kevin at fedoraproject.org  Sun Jan 11 16:57:57 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 11 Jan 2009 16:57:57 +0000 (UTC)
Subject: rpms/xfconf/devel - New directory
Message-ID: <20090111165757.7A71870139@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/xfconf/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvst19404/rpms/xfconf/devel

Log Message:
Directory /cvs/pkgs/rpms/xfconf/devel added to the repository




From kevin at fedoraproject.org  Sun Jan 11 16:58:13 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 11 Jan 2009 16:58:13 +0000 (UTC)
Subject: rpms/xfconf Makefile,NONE,1.1
Message-ID: <20090111165813.8F7B070139@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/xfconf
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvst19404/rpms/xfconf

Added Files:
	Makefile 
Log Message:
Setup of module xfconf


--- NEW FILE Makefile ---
# Top level Makefile for module xfconf
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Jan 11 16:58:13 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 11 Jan 2009 16:58:13 +0000 (UTC)
Subject: rpms/xfconf/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <20090111165813.F310470139@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/xfconf/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvst19404/rpms/xfconf/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module xfconf


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: xfconf
# $Id: Makefile,v 1.1 2009/01/11 16:58:13 kevin Exp $
NAME := xfconf
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Jan 11 16:59:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Jan 2009 16:59:34 +0000
Subject: [pkgdb] perl-Class-Throwable was added for somlo
Message-ID: <20090111165934.E476C208456@bastion.fedora.phx.redhat.com>

kevin has added Package perl-Class-Throwable with summary A minimal lightweight exception class
kevin has approved Package perl-Class-Throwable
kevin has added a Fedora devel branch for perl-Class-Throwable with an owner of somlo
kevin has approved perl-Class-Throwable in Fedora devel
kevin has approved Package perl-Class-Throwable
kevin has set commit to Approved for provenpackager on perl-Class-Throwable (Fedora devel)
kevin has set build to Approved for provenpackager on perl-Class-Throwable (Fedora devel)
kevin has set checkout to Approved for provenpackager on perl-Class-Throwable (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Class-Throwable



From pkgdb at fedoraproject.org  Sun Jan 11 16:59:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Jan 2009 16:59:36 +0000
Subject: [pkgdb] perl-Class-Throwable (Fedora, 9) updated by kevin
Message-ID: <20090111165936.F1B69208466@bastion.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for perl-Class-Throwable
kevin has set commit to Approved for provenpackager on perl-Class-Throwable (Fedora 9)
kevin has set build to Approved for provenpackager on perl-Class-Throwable (Fedora 9)
kevin has set checkout to Approved for provenpackager on perl-Class-Throwable (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Class-Throwable



From pkgdb at fedoraproject.org  Sun Jan 11 16:59:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Jan 2009 16:59:36 +0000
Subject: [pkgdb] perl-Class-Throwable (Fedora, 10) updated by kevin
Message-ID: <20090111165937.0619B208469@bastion.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for perl-Class-Throwable
kevin has set commit to Approved for provenpackager on perl-Class-Throwable (Fedora 10)
kevin has set build to Approved for provenpackager on perl-Class-Throwable (Fedora 10)
kevin has set checkout to Approved for provenpackager on perl-Class-Throwable (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Class-Throwable



From kevin at fedoraproject.org  Sun Jan 11 16:59:57 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 11 Jan 2009 16:59:57 +0000 (UTC)
Subject: rpms/perl-Class-Throwable - New directory
Message-ID: <20090111165957.274D170139@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Class-Throwable
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsP19583/rpms/perl-Class-Throwable

Log Message:
Directory /cvs/pkgs/rpms/perl-Class-Throwable added to the repository




From kevin at fedoraproject.org  Sun Jan 11 16:59:57 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 11 Jan 2009 16:59:57 +0000 (UTC)
Subject: rpms/perl-Class-Throwable/devel - New directory
Message-ID: <20090111165957.6752B70139@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Class-Throwable/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsP19583/rpms/perl-Class-Throwable/devel

Log Message:
Directory /cvs/pkgs/rpms/perl-Class-Throwable/devel added to the repository




From kevin at fedoraproject.org  Sun Jan 11 17:00:14 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 11 Jan 2009 17:00:14 +0000 (UTC)
Subject: rpms/perl-Class-Throwable Makefile,NONE,1.1
Message-ID: <20090111170014.65DE470139@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Class-Throwable
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsP19583/rpms/perl-Class-Throwable

Added Files:
	Makefile 
Log Message:
Setup of module perl-Class-Throwable


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Class-Throwable
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Jan 11 17:00:14 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 11 Jan 2009 17:00:14 +0000 (UTC)
Subject: rpms/perl-Class-Throwable/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090111170014.C8E4770139@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Class-Throwable/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsP19583/rpms/perl-Class-Throwable/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Class-Throwable


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: perl-Class-Throwable
# $Id: Makefile,v 1.1 2009/01/11 17:00:14 kevin Exp $
NAME := perl-Class-Throwable
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Jan 11 17:03:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Jan 2009 17:03:11 +0000
Subject: [pkgdb] mpop was added for fab
Message-ID: <20090111170311.9D74B208455@bastion.fedora.phx.redhat.com>

kevin has added Package mpop with summary POP3 client for recieving mail from POP3 mailboxes
kevin has approved Package mpop
kevin has added a Fedora devel branch for mpop with an owner of fab
kevin has approved mpop in Fedora devel
kevin has approved Package mpop
kevin has set commit to Approved for provenpackager on mpop (Fedora devel)
kevin has set build to Approved for provenpackager on mpop (Fedora devel)
kevin has set checkout to Approved for provenpackager on mpop (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mpop



From pkgdb at fedoraproject.org  Sun Jan 11 17:03:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Jan 2009 17:03:14 +0000
Subject: [pkgdb] mpop (Fedora, 9) updated by kevin
Message-ID: <20090111170314.5E595208458@bastion.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for mpop
kevin has set commit to Approved for provenpackager on mpop (Fedora 9)
kevin has set build to Approved for provenpackager on mpop (Fedora 9)
kevin has set checkout to Approved for provenpackager on mpop (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mpop



From kevin at fedoraproject.org  Sun Jan 11 17:03:30 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 11 Jan 2009 17:03:30 +0000 (UTC)
Subject: rpms/mpop - New directory
Message-ID: <20090111170330.23BB970139@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/mpop
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsn20162/rpms/mpop

Log Message:
Directory /cvs/pkgs/rpms/mpop added to the repository




From kevin at fedoraproject.org  Sun Jan 11 17:03:30 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 11 Jan 2009 17:03:30 +0000 (UTC)
Subject: rpms/mpop/devel - New directory
Message-ID: <20090111170330.5BF5D70139@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/mpop/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsn20162/rpms/mpop/devel

Log Message:
Directory /cvs/pkgs/rpms/mpop/devel added to the repository




From pkgdb at fedoraproject.org  Sun Jan 11 17:03:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Jan 2009 17:03:14 +0000
Subject: [pkgdb] mpop (Fedora, 10) updated by kevin
Message-ID: <20090111170314.77837208468@bastion.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for mpop
kevin has set commit to Approved for provenpackager on mpop (Fedora 10)
kevin has set build to Approved for provenpackager on mpop (Fedora 10)
kevin has set checkout to Approved for provenpackager on mpop (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mpop



From kevin at fedoraproject.org  Sun Jan 11 17:03:46 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 11 Jan 2009 17:03:46 +0000 (UTC)
Subject: rpms/mpop Makefile,NONE,1.1
Message-ID: <20090111170346.CF9C070139@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/mpop
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsn20162/rpms/mpop

Added Files:
	Makefile 
Log Message:
Setup of module mpop


--- NEW FILE Makefile ---
# Top level Makefile for module mpop
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Jan 11 17:03:47 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 11 Jan 2009 17:03:47 +0000 (UTC)
Subject: rpms/mpop/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <20090111170347.D0F1870139@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/mpop/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsn20162/rpms/mpop/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module mpop


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: mpop
# $Id: Makefile,v 1.1 2009/01/11 17:03:47 kevin Exp $
NAME := mpop
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Jan 11 17:04:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Jan 2009 17:04:50 +0000
Subject: [pkgdb] perl-Catalyst-Plugin-Authorization-Roles (Fedora,
	10) updated by kevin
Message-ID: <20090111170450.AFD32208458@bastion.fedora.phx.redhat.com>

kevin changed owner of perl-Catalyst-Plugin-Authorization-Roles in Fedora 10 to somlo

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Catalyst-Plugin-Authorization-Roles



From pkgdb at fedoraproject.org  Sun Jan 11 17:04:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Jan 2009 17:04:50 +0000
Subject: [pkgdb] perl-Catalyst-Plugin-Authorization-Roles summary updated by
	kevin
Message-ID: <20090111170450.40467208455@bastion.fedora.phx.redhat.com>

kevin set package perl-Catalyst-Plugin-Authorization-Roles summary to Role based authorization for Catalyst

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Catalyst-Plugin-Authorization-Roles



From pkgdb at fedoraproject.org  Sun Jan 11 17:04:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Jan 2009 17:04:50 +0000
Subject: [pkgdb] perl-Catalyst-Plugin-Authorization-Roles (Fedora,
	9) updated by kevin
Message-ID: <20090111170450.DA291208468@bastion.fedora.phx.redhat.com>

kevin changed owner of perl-Catalyst-Plugin-Authorization-Roles in Fedora 9 to somlo

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Catalyst-Plugin-Authorization-Roles



From pkgdb at fedoraproject.org  Sun Jan 11 17:04:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Jan 2009 17:04:50 +0000
Subject: [pkgdb] perl-Catalyst-Plugin-Authorization-Roles (Fedora,
	devel) updated by kevin
Message-ID: <20090111170450.E677720846C@bastion.fedora.phx.redhat.com>

kevin changed owner of perl-Catalyst-Plugin-Authorization-Roles in Fedora devel to somlo

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Catalyst-Plugin-Authorization-Roles



From pkgdb at fedoraproject.org  Sun Jan 11 17:06:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Jan 2009 17:06:44 +0000
Subject: [pkgdb] perl-Catalyst-Plugin-Authorization-Roles summary updated by
	kevin
Message-ID: <20090111170644.DB458208456@bastion.fedora.phx.redhat.com>

kevin set package perl-Catalyst-Plugin-Authorization-Roles summary to Role based authorization for Catalyst

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Catalyst-Plugin-Authorization-Roles



From pkgdb at fedoraproject.org  Sun Jan 11 17:06:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Jan 2009 17:06:44 +0000
Subject: [pkgdb] perl-Catalyst-Plugin-Authorization-Roles (Fedora,
	10) updated by kevin
Message-ID: <20090111170644.E3A3B208466@bastion.fedora.phx.redhat.com>

kevin changed owner of perl-Catalyst-Plugin-Authorization-Roles in Fedora 10 to iarnell

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Catalyst-Plugin-Authorization-Roles



From pkgdb at fedoraproject.org  Sun Jan 11 17:06:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Jan 2009 17:06:44 +0000
Subject: [pkgdb] perl-Catalyst-Plugin-Authorization-Roles (Fedora,
	9) updated by kevin
Message-ID: <20090111170646.10DBF208469@bastion.fedora.phx.redhat.com>

kevin changed owner of perl-Catalyst-Plugin-Authorization-Roles in Fedora 9 to iarnell

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Catalyst-Plugin-Authorization-Roles



From pkgdb at fedoraproject.org  Sun Jan 11 17:06:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Jan 2009 17:06:44 +0000
Subject: [pkgdb] perl-Catalyst-Plugin-Authorization-Roles (Fedora,
	devel) updated by kevin
Message-ID: <20090111170646.1F02120846E@bastion.fedora.phx.redhat.com>

kevin changed owner of perl-Catalyst-Plugin-Authorization-Roles in Fedora devel to iarnell

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Catalyst-Plugin-Authorization-Roles



From pkgdb at fedoraproject.org  Sun Jan 11 17:08:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Jan 2009 17:08:16 +0000
Subject: [pkgdb] perl-Catalyst-Authentication-Store-DBIx-Class was added for
	somlo
Message-ID: <20090111170817.007E0208455@bastion.fedora.phx.redhat.com>

kevin has added Package perl-Catalyst-Authentication-Store-DBIx-Class with summary A storage class for Catalyst Authentication
kevin has approved Package perl-Catalyst-Authentication-Store-DBIx-Class
kevin has added a Fedora devel branch for perl-Catalyst-Authentication-Store-DBIx-Class with an owner of somlo
kevin has approved perl-Catalyst-Authentication-Store-DBIx-Class in Fedora devel
kevin has approved Package perl-Catalyst-Authentication-Store-DBIx-Class
kevin has set commit to Approved for provenpackager on perl-Catalyst-Authentication-Store-DBIx-Class (Fedora devel)
kevin has set build to Approved for provenpackager on perl-Catalyst-Authentication-Store-DBIx-Class (Fedora devel)
kevin has set checkout to Approved for provenpackager on perl-Catalyst-Authentication-Store-DBIx-Class (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Catalyst-Authentication-Store-DBIx-Class



From pkgdb at fedoraproject.org  Sun Jan 11 17:08:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Jan 2009 17:08:18 +0000
Subject: [pkgdb] perl-Catalyst-Authentication-Store-DBIx-Class (Fedora,
	9) updated by kevin
Message-ID: <20090111170818.913C5208458@bastion.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for perl-Catalyst-Authentication-Store-DBIx-Class
kevin has set commit to Approved for provenpackager on perl-Catalyst-Authentication-Store-DBIx-Class (Fedora 9)
kevin has set build to Approved for provenpackager on perl-Catalyst-Authentication-Store-DBIx-Class (Fedora 9)
kevin has set checkout to Approved for provenpackager on perl-Catalyst-Authentication-Store-DBIx-Class (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Catalyst-Authentication-Store-DBIx-Class



From kevin at fedoraproject.org  Sun Jan 11 17:08:45 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 11 Jan 2009 17:08:45 +0000 (UTC)
Subject: rpms/perl-Catalyst-Authentication-Store-DBIx-Class - New directory
Message-ID: <20090111170845.290D270139@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Catalyst-Authentication-Store-DBIx-Class
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsm20693/rpms/perl-Catalyst-Authentication-Store-DBIx-Class

Log Message:
Directory /cvs/pkgs/rpms/perl-Catalyst-Authentication-Store-DBIx-Class added to the repository




From pkgdb at fedoraproject.org  Sun Jan 11 17:08:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Jan 2009 17:08:18 +0000
Subject: [pkgdb] perl-Catalyst-Authentication-Store-DBIx-Class (Fedora,
	10) updated by kevin
Message-ID: <20090111170818.99B60208468@bastion.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for perl-Catalyst-Authentication-Store-DBIx-Class
kevin has set commit to Approved for provenpackager on perl-Catalyst-Authentication-Store-DBIx-Class (Fedora 10)
kevin has set build to Approved for provenpackager on perl-Catalyst-Authentication-Store-DBIx-Class (Fedora 10)
kevin has set checkout to Approved for provenpackager on perl-Catalyst-Authentication-Store-DBIx-Class (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Catalyst-Authentication-Store-DBIx-Class



From kevin at fedoraproject.org  Sun Jan 11 17:08:45 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 11 Jan 2009 17:08:45 +0000 (UTC)
Subject: rpms/perl-Catalyst-Authentication-Store-DBIx-Class/devel - New
	directory
Message-ID: <20090111170845.6AC5470139@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Catalyst-Authentication-Store-DBIx-Class/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsm20693/rpms/perl-Catalyst-Authentication-Store-DBIx-Class/devel

Log Message:
Directory /cvs/pkgs/rpms/perl-Catalyst-Authentication-Store-DBIx-Class/devel added to the repository




From kevin at fedoraproject.org  Sun Jan 11 17:09:05 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 11 Jan 2009 17:09:05 +0000 (UTC)
Subject: rpms/perl-Catalyst-Authentication-Store-DBIx-Class Makefile, NONE,
	1.1
Message-ID: <20090111170905.0F83A70139@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Catalyst-Authentication-Store-DBIx-Class
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsm20693/rpms/perl-Catalyst-Authentication-Store-DBIx-Class

Added Files:
	Makefile 
Log Message:
Setup of module perl-Catalyst-Authentication-Store-DBIx-Class


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Catalyst-Authentication-Store-DBIx-Class
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Jan 11 17:09:05 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 11 Jan 2009 17:09:05 +0000 (UTC)
Subject: rpms/perl-Catalyst-Authentication-Store-DBIx-Class/devel .cvsignore,
	NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1
Message-ID: <20090111170905.53FFE70139@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Catalyst-Authentication-Store-DBIx-Class/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsm20693/rpms/perl-Catalyst-Authentication-Store-DBIx-Class/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Catalyst-Authentication-Store-DBIx-Class


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: perl-Catalyst-Authentication-Store-DBIx-Class
# $Id: Makefile,v 1.1 2009/01/11 17:09:05 kevin Exp $
NAME := perl-Catalyst-Authentication-Store-DBIx-Class
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From rishi at fedoraproject.org  Sun Jan 11 17:09:46 2009
From: rishi at fedoraproject.org (Debarshi Ray)
Date: Sun, 11 Jan 2009 17:09:46 +0000 (UTC)
Subject: rpms/hfsutils/devel hfsutils-3.2.6-largefile.patch, 1.1,
	1.2 hfsutils.spec, 1.18, 1.19
Message-ID: <20090111170946.D6C8E70139@cvs1.fedora.phx.redhat.com>

Author: rishi

Update of /cvs/pkgs/rpms/hfsutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20786

Modified Files:
	hfsutils-3.2.6-largefile.patch hfsutils.spec 
Log Message:
* Sun Jan 11 2009 Debarshi Ray <rishi at fedoraproject.org> - 3.2.6-15
- Updated large file patch. Closes Red Hat Bugzilla bug #465060.
- Added 'BuildRequires: libXft-devel'.


hfsutils-3.2.6-largefile.patch:

Index: hfsutils-3.2.6-largefile.patch
===================================================================
RCS file: /cvs/pkgs/rpms/hfsutils/devel/hfsutils-3.2.6-largefile.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- hfsutils-3.2.6-largefile.patch	20 Feb 2005 13:28:20 -0000	1.1
+++ hfsutils-3.2.6-largefile.patch	11 Jan 2009 17:09:16 -0000	1.2
@@ -1,5 +1,6 @@
---- libhfs/os/unix.c-orig	1998-11-02 23:09:13.000000000 +0100
-+++ libhfs/os/unix.c	2004-12-13 14:39:28.099124272 +0100
+diff -urNp libhfs/os/unix.c.orig libhfs/os/unix.c
+--- libhfs/os/unix.c	1998-11-03 03:39:13.000000000 +0530
++++ libhfs/os/unix.c	2009-01-11 22:15:55.000000000 +0530
 @@ -19,6 +19,11 @@
   * $Id$
   */


Index: hfsutils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hfsutils/devel/hfsutils.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- hfsutils.spec	19 Feb 2008 01:59:39 -0000	1.18
+++ hfsutils.spec	11 Jan 2009 17:09:16 -0000	1.19
@@ -1,7 +1,7 @@
 Summary: Tools for reading and writing Macintosh HFS volumes.
 Name: hfsutils
 Version: 3.2.6  
-Release: 14%{?dist}
+Release: 15%{?dist}
 Group: Applications/File
 License: GPLv2+
 Source: ftp://ftp.mars.org/pub/hfs/%{name}-%{version}.tar.gz 
@@ -9,7 +9,7 @@
 Patch1: hfsutils-3.2.6-largefile.patch
 URL: http://www.mars.org/home/rob/proj/hfs/ 
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildRequires: tcl-devel tk-devel
+BuildRequires: libXft-devel tcl-devel tk-devel
 
 %package devel
 Summary: A C library for reading and writing Macintosh HFS volumes.
@@ -122,6 +122,10 @@
 %{_includedir}/rsrc.h
 
 %changelog
+* Sun Jan 11 2009 Debarshi Ray <rishi at fedoraproject.org> - 3.2.6-15
+- Updated large file patch. Closes Red Hat Bugzilla bug #465060.
+- Added 'BuildRequires: libXft-devel'.
+
 * Mon Feb 18 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 3.2.6-14
 - Autorebuild for GCC 4.3
 



From pkgdb at fedoraproject.org  Sun Jan 11 17:10:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Jan 2009 17:10:29 +0000
Subject: [pkgdb] perl-Catalyst-Plugin-Authorization-ACL (Fedora,
	9) updated by kevin
Message-ID: <20090111171029.64CE0208458@bastion.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for perl-Catalyst-Plugin-Authorization-ACL
kevin has set commit to Approved for provenpackager on perl-Catalyst-Plugin-Authorization-ACL (Fedora 9)
kevin has set build to Approved for provenpackager on perl-Catalyst-Plugin-Authorization-ACL (Fedora 9)
kevin has set checkout to Approved for provenpackager on perl-Catalyst-Plugin-Authorization-ACL (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Catalyst-Plugin-Authorization-ACL



From pkgdb at fedoraproject.org  Sun Jan 11 17:10:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Jan 2009 17:10:26 +0000
Subject: [pkgdb] perl-Catalyst-Plugin-Authorization-ACL was added for somlo
Message-ID: <20090111171026.9DAA8208455@bastion.fedora.phx.redhat.com>

kevin has added Package perl-Catalyst-Plugin-Authorization-ACL with summary ACL Support for Catalyst Applications
kevin has approved Package perl-Catalyst-Plugin-Authorization-ACL
kevin has added a Fedora devel branch for perl-Catalyst-Plugin-Authorization-ACL with an owner of somlo
kevin has approved perl-Catalyst-Plugin-Authorization-ACL in Fedora devel
kevin has approved Package perl-Catalyst-Plugin-Authorization-ACL
kevin has set commit to Approved for provenpackager on perl-Catalyst-Plugin-Authorization-ACL (Fedora devel)
kevin has set build to Approved for provenpackager on perl-Catalyst-Plugin-Authorization-ACL (Fedora devel)
kevin has set checkout to Approved for provenpackager on perl-Catalyst-Plugin-Authorization-ACL (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Catalyst-Plugin-Authorization-ACL



From pkgdb at fedoraproject.org  Sun Jan 11 17:10:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Jan 2009 17:10:29 +0000
Subject: [pkgdb] perl-Catalyst-Plugin-Authorization-ACL (Fedora,
	10) updated by kevin
Message-ID: <20090111171029.81FB0208468@bastion.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for perl-Catalyst-Plugin-Authorization-ACL
kevin has set commit to Approved for provenpackager on perl-Catalyst-Plugin-Authorization-ACL (Fedora 10)
kevin has set build to Approved for provenpackager on perl-Catalyst-Plugin-Authorization-ACL (Fedora 10)
kevin has set checkout to Approved for provenpackager on perl-Catalyst-Plugin-Authorization-ACL (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Catalyst-Plugin-Authorization-ACL



From kevin at fedoraproject.org  Sun Jan 11 17:10:44 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 11 Jan 2009 17:10:44 +0000 (UTC)
Subject: rpms/perl-Catalyst-Plugin-Authorization-ACL - New directory
Message-ID: <20090111171044.24B2270139@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Catalyst-Plugin-Authorization-ACL
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsA21019/rpms/perl-Catalyst-Plugin-Authorization-ACL

Log Message:
Directory /cvs/pkgs/rpms/perl-Catalyst-Plugin-Authorization-ACL added to the repository




From kevin at fedoraproject.org  Sun Jan 11 17:10:44 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 11 Jan 2009 17:10:44 +0000 (UTC)
Subject: rpms/perl-Catalyst-Plugin-Authorization-ACL/devel - New directory
Message-ID: <20090111171044.6053470139@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Catalyst-Plugin-Authorization-ACL/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsA21019/rpms/perl-Catalyst-Plugin-Authorization-ACL/devel

Log Message:
Directory /cvs/pkgs/rpms/perl-Catalyst-Plugin-Authorization-ACL/devel added to the repository




From kevin at fedoraproject.org  Sun Jan 11 17:10:59 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 11 Jan 2009 17:10:59 +0000 (UTC)
Subject: rpms/perl-Catalyst-Plugin-Authorization-ACL Makefile,NONE,1.1
Message-ID: <20090111171059.D463870139@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Catalyst-Plugin-Authorization-ACL
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsA21019/rpms/perl-Catalyst-Plugin-Authorization-ACL

Added Files:
	Makefile 
Log Message:
Setup of module perl-Catalyst-Plugin-Authorization-ACL


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Catalyst-Plugin-Authorization-ACL
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Jan 11 17:11:00 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 11 Jan 2009 17:11:00 +0000 (UTC)
Subject: rpms/perl-Catalyst-Plugin-Authorization-ACL/devel .cvsignore, NONE, 
	1.1 Makefile, NONE, 1.1 sources, NONE, 1.1
Message-ID: <20090111171100.C5C9970139@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Catalyst-Plugin-Authorization-ACL/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsA21019/rpms/perl-Catalyst-Plugin-Authorization-ACL/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Catalyst-Plugin-Authorization-ACL


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: perl-Catalyst-Plugin-Authorization-ACL
# $Id: Makefile,v 1.1 2009/01/11 17:11:00 kevin Exp $
NAME := perl-Catalyst-Plugin-Authorization-ACL
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From rishi at fedoraproject.org  Sun Jan 11 17:12:09 2009
From: rishi at fedoraproject.org (Debarshi Ray)
Date: Sun, 11 Jan 2009 17:12:09 +0000 (UTC)
Subject: rpms/hfsutils/F-10 hfsutils-3.2.6-largefile.patch, 1.1,
	1.2 hfsutils.spec, 1.18, 1.19
Message-ID: <20090111171209.8518E70139@cvs1.fedora.phx.redhat.com>

Author: rishi

Update of /cvs/pkgs/rpms/hfsutils/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21356

Modified Files:
	hfsutils-3.2.6-largefile.patch hfsutils.spec 
Log Message:
* Sun Jan 11 2009 Debarshi Ray <rishi at fedoraproject.org> - 3.2.6-15
- Updated large file patch. Closes Red Hat Bugzilla bug #465060.
- Added 'BuildRequires: libXft-devel'.


hfsutils-3.2.6-largefile.patch:

Index: hfsutils-3.2.6-largefile.patch
===================================================================
RCS file: /cvs/pkgs/rpms/hfsutils/F-10/hfsutils-3.2.6-largefile.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- hfsutils-3.2.6-largefile.patch	20 Feb 2005 13:28:20 -0000	1.1
+++ hfsutils-3.2.6-largefile.patch	11 Jan 2009 17:12:09 -0000	1.2
@@ -1,5 +1,6 @@
---- libhfs/os/unix.c-orig	1998-11-02 23:09:13.000000000 +0100
-+++ libhfs/os/unix.c	2004-12-13 14:39:28.099124272 +0100
+diff -urNp libhfs/os/unix.c.orig libhfs/os/unix.c
+--- libhfs/os/unix.c	1998-11-03 03:39:13.000000000 +0530
++++ libhfs/os/unix.c	2009-01-11 22:15:55.000000000 +0530
 @@ -19,6 +19,11 @@
   * $Id$
   */


Index: hfsutils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hfsutils/F-10/hfsutils.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- hfsutils.spec	19 Feb 2008 01:59:39 -0000	1.18
+++ hfsutils.spec	11 Jan 2009 17:12:09 -0000	1.19
@@ -1,7 +1,7 @@
 Summary: Tools for reading and writing Macintosh HFS volumes.
 Name: hfsutils
 Version: 3.2.6  
-Release: 14%{?dist}
+Release: 15%{?dist}
 Group: Applications/File
 License: GPLv2+
 Source: ftp://ftp.mars.org/pub/hfs/%{name}-%{version}.tar.gz 
@@ -9,7 +9,7 @@
 Patch1: hfsutils-3.2.6-largefile.patch
 URL: http://www.mars.org/home/rob/proj/hfs/ 
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildRequires: tcl-devel tk-devel
+BuildRequires: libXft-devel tcl-devel tk-devel
 
 %package devel
 Summary: A C library for reading and writing Macintosh HFS volumes.
@@ -122,6 +122,10 @@
 %{_includedir}/rsrc.h
 
 %changelog
+* Sun Jan 11 2009 Debarshi Ray <rishi at fedoraproject.org> - 3.2.6-15
+- Updated large file patch. Closes Red Hat Bugzilla bug #465060.
+- Added 'BuildRequires: libXft-devel'.
+
 * Mon Feb 18 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 3.2.6-14
 - Autorebuild for GCC 4.3
 



From buc at fedoraproject.org  Sun Jan 11 17:13:37 2009
From: buc at fedoraproject.org (Dmitry Butskoy)
Date: Sun, 11 Jan 2009 17:13:37 +0000 (UTC)
Subject: rpms/freetds/F-10 freetds.spec,1.12,1.13
Message-ID: <20090111171337.2C16070139@cvs1.fedora.phx.redhat.com>

Author: buc

Update of /cvs/extras/rpms/freetds/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21496

Modified Files:
	freetds.spec 
Log Message:



Index: freetds.spec
===================================================================
RCS file: /cvs/extras/rpms/freetds/F-10/freetds.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- freetds.spec	17 Jun 2008 14:29:53 -0000	1.12
+++ freetds.spec	11 Jan 2009 17:13:06 -0000	1.13
@@ -7,7 +7,7 @@
 Name: freetds
 Summary: Implementation of the TDS (Tabular DataStream) protocol
 Version: 0.82
-Release: 2%{?dist}
+Release: 3%{?dist}
 Group: System Environment/Libraries
 License: LGPLv2+ and GPLv2+
 URL: http://www.freetds.org/
@@ -15,7 +15,7 @@
 Source1: freetds-tds_sysdep_public.h
 Patch0: freetds-0.82-shared-libtds.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: unixODBC-devel, readline-devel, openssl-devel, libtool
+BuildRequires: unixODBC-devel, readline-devel, gnutls-devel, libtool
  
 
 %description 
@@ -67,7 +67,7 @@
 	--with-unixodbc="%{_prefix}" \
 	--enable-msdblib \
 	--enable-sybase-compat \
-	--with-openssl
+	--with-gnutls
 
 # avoid any rpath
 sed -i -e 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' \
@@ -128,6 +128,9 @@
  
 
 %changelog
+* Sun Jan 11 2009 Dmitry Butskoy <Dmitry at Butskoy.name> - 0.82-3
+- Use gnutls for SSL (#479148)
+
 * Tue Jun 17 2008 Dmitry Butskoy <Dmitry at Butskoy.name> - 0.82-2
 - Continue to provide an internal libtds library as public
   (patch from Hans de Goede, #451021). This shared library is needed



From pkgdb at fedoraproject.org  Sun Jan 11 17:15:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Jan 2009 17:15:44 +0000
Subject: [pkgdb] podcatcher was added for cdamian
Message-ID: <20090111171544.B9C55208455@bastion.fedora.phx.redhat.com>

kevin has added Package podcatcher with summary Armangil's podcast client for the command line
kevin has approved Package podcatcher
kevin has added a Fedora devel branch for podcatcher with an owner of cdamian
kevin has approved podcatcher in Fedora devel
kevin has approved Package podcatcher
kevin has set commit to Approved for provenpackager on podcatcher (Fedora devel)
kevin has set build to Approved for provenpackager on podcatcher (Fedora devel)
kevin has set checkout to Approved for provenpackager on podcatcher (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/podcatcher



From pkgdb at fedoraproject.org  Sun Jan 11 17:15:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Jan 2009 17:15:46 +0000
Subject: [pkgdb] podcatcher (Fedora EPEL, 5) updated by kevin
Message-ID: <20090111171546.9236B208458@bastion.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for podcatcher
kevin has set commit to Approved for provenpackager on podcatcher (Fedora EPEL 5)
kevin has set build to Approved for provenpackager on podcatcher (Fedora EPEL 5)
kevin has set checkout to Approved for provenpackager on podcatcher (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/podcatcher



From kevin at fedoraproject.org  Sun Jan 11 17:16:04 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 11 Jan 2009 17:16:04 +0000 (UTC)
Subject: rpms/podcatcher - New directory
Message-ID: <20090111171604.485DF70139@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/podcatcher
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsh21837/rpms/podcatcher

Log Message:
Directory /cvs/pkgs/rpms/podcatcher added to the repository




From kevin at fedoraproject.org  Sun Jan 11 17:16:04 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 11 Jan 2009 17:16:04 +0000 (UTC)
Subject: rpms/podcatcher/devel - New directory
Message-ID: <20090111171604.C668F70139@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/podcatcher/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsh21837/rpms/podcatcher/devel

Log Message:
Directory /cvs/pkgs/rpms/podcatcher/devel added to the repository




From pkgdb at fedoraproject.org  Sun Jan 11 17:15:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Jan 2009 17:15:46 +0000
Subject: [pkgdb] podcatcher (Fedora, 10) updated by kevin
Message-ID: <20090111171546.9C97C208468@bastion.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for podcatcher
kevin has set commit to Approved for provenpackager on podcatcher (Fedora 10)
kevin has set build to Approved for provenpackager on podcatcher (Fedora 10)
kevin has set checkout to Approved for provenpackager on podcatcher (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/podcatcher



From kevin at fedoraproject.org  Sun Jan 11 17:16:24 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 11 Jan 2009 17:16:24 +0000 (UTC)
Subject: rpms/podcatcher Makefile,NONE,1.1
Message-ID: <20090111171624.20DCE70139@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/podcatcher
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsh21837/rpms/podcatcher

Added Files:
	Makefile 
Log Message:
Setup of module podcatcher


--- NEW FILE Makefile ---
# Top level Makefile for module podcatcher
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Jan 11 17:16:24 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 11 Jan 2009 17:16:24 +0000 (UTC)
Subject: rpms/podcatcher/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090111171624.9B71C70139@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/podcatcher/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsh21837/rpms/podcatcher/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module podcatcher


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: podcatcher
# $Id: Makefile,v 1.1 2009/01/11 17:16:24 kevin Exp $
NAME := podcatcher
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Jan 11 17:19:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Jan 2009 17:19:51 +0000
Subject: [pkgdb] python-progressbar was added for cdamian
Message-ID: <20090111171951.9C6BB208457@bastion.fedora.phx.redhat.com>

kevin has added Package python-progressbar with summary Text progressbar library for python
kevin has approved Package python-progressbar
kevin has added a Fedora devel branch for python-progressbar with an owner of cdamian
kevin has approved python-progressbar in Fedora devel
kevin has approved Package python-progressbar
kevin has set commit to Approved for provenpackager on python-progressbar (Fedora devel)
kevin has set build to Approved for provenpackager on python-progressbar (Fedora devel)
kevin has set checkout to Approved for provenpackager on python-progressbar (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-progressbar



From pkgdb at fedoraproject.org  Sun Jan 11 17:19:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Jan 2009 17:19:53 +0000
Subject: [pkgdb] python-progressbar (Fedora EPEL, 5) updated by kevin
Message-ID: <20090111171954.0C532208467@bastion.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for python-progressbar
kevin has set commit to Approved for provenpackager on python-progressbar (Fedora EPEL 5)
kevin has set build to Approved for provenpackager on python-progressbar (Fedora EPEL 5)
kevin has set checkout to Approved for provenpackager on python-progressbar (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-progressbar



From pkgdb at fedoraproject.org  Sun Jan 11 17:19:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Jan 2009 17:19:53 +0000
Subject: [pkgdb] python-progressbar (Fedora, 10) updated by kevin
Message-ID: <20090111171954.169EE20846B@bastion.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for python-progressbar
kevin has set commit to Approved for provenpackager on python-progressbar (Fedora 10)
kevin has set build to Approved for provenpackager on python-progressbar (Fedora 10)
kevin has set checkout to Approved for provenpackager on python-progressbar (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-progressbar



From kevin at fedoraproject.org  Sun Jan 11 17:20:09 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 11 Jan 2009 17:20:09 +0000 (UTC)
Subject: rpms/python-progressbar - New directory
Message-ID: <20090111172009.2786E70139@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/python-progressbar
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsW22315/rpms/python-progressbar

Log Message:
Directory /cvs/pkgs/rpms/python-progressbar added to the repository




From kevin at fedoraproject.org  Sun Jan 11 17:20:09 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 11 Jan 2009 17:20:09 +0000 (UTC)
Subject: rpms/python-progressbar/devel - New directory
Message-ID: <20090111172009.6921170139@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/python-progressbar/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsW22315/rpms/python-progressbar/devel

Log Message:
Directory /cvs/pkgs/rpms/python-progressbar/devel added to the repository




From kevin at fedoraproject.org  Sun Jan 11 17:20:25 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 11 Jan 2009 17:20:25 +0000 (UTC)
Subject: rpms/python-progressbar Makefile,NONE,1.1
Message-ID: <20090111172025.41F4170139@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/python-progressbar
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsW22315/rpms/python-progressbar

Added Files:
	Makefile 
Log Message:
Setup of module python-progressbar


--- NEW FILE Makefile ---
# Top level Makefile for module python-progressbar
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Jan 11 17:20:25 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 11 Jan 2009 17:20:25 +0000 (UTC)
Subject: rpms/python-progressbar/devel .cvsignore, NONE, 1.1 Makefile, NONE, 
	1.1 sources, NONE, 1.1
Message-ID: <20090111172025.9477470139@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/python-progressbar/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsW22315/rpms/python-progressbar/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module python-progressbar


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: python-progressbar
# $Id: Makefile,v 1.1 2009/01/11 17:20:25 kevin Exp $
NAME := python-progressbar
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Jan 11 17:21:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Jan 2009 17:21:07 +0000
Subject: [pkgdb] perl-DateTime-Format-Flexible was added for cweyl
Message-ID: <20090111172107.7677B208421@bastion.fedora.phx.redhat.com>

kevin has added Package perl-DateTime-Format-Flexible with summary Flexibly parse strings and turn them into DateTime objects
kevin has approved Package perl-DateTime-Format-Flexible
kevin has added a Fedora devel branch for perl-DateTime-Format-Flexible with an owner of cweyl
kevin has approved perl-DateTime-Format-Flexible in Fedora devel
kevin has approved Package perl-DateTime-Format-Flexible
kevin has set commit to Approved for provenpackager on perl-DateTime-Format-Flexible (Fedora devel)
kevin has set build to Approved for provenpackager on perl-DateTime-Format-Flexible (Fedora devel)
kevin has set checkout to Approved for provenpackager on perl-DateTime-Format-Flexible (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-DateTime-Format-Flexible



From pkgdb at fedoraproject.org  Sun Jan 11 17:21:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Jan 2009 17:21:09 +0000
Subject: [pkgdb] perl-DateTime-Format-Flexible (Fedora, 9) updated by kevin
Message-ID: <20090111172109.805EF208457@bastion.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for perl-DateTime-Format-Flexible
kevin has set commit to Approved for provenpackager on perl-DateTime-Format-Flexible (Fedora 9)
kevin has set build to Approved for provenpackager on perl-DateTime-Format-Flexible (Fedora 9)
kevin has set checkout to Approved for provenpackager on perl-DateTime-Format-Flexible (Fedora 9)
kevin approved watchbugzilla on perl-DateTime-Format-Flexible (Fedora 9) for perl-sig
kevin approved watchcommits on perl-DateTime-Format-Flexible (Fedora 9) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-DateTime-Format-Flexible



From pkgdb at fedoraproject.org  Sun Jan 11 17:21:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Jan 2009 17:21:09 +0000
Subject: [pkgdb] perl-DateTime-Format-Flexible (Fedora,
	devel) updated by kevin
Message-ID: <20090111172109.9BAAF20846B@bastion.fedora.phx.redhat.com>

kevin approved watchbugzilla on perl-DateTime-Format-Flexible (Fedora devel) for perl-sig
kevin approved watchcommits on perl-DateTime-Format-Flexible (Fedora devel) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-DateTime-Format-Flexible



From pkgdb at fedoraproject.org  Sun Jan 11 17:21:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Jan 2009 17:21:09 +0000
Subject: [pkgdb] perl-DateTime-Format-Flexible (Fedora, 10) updated by kevin
Message-ID: <20090111172109.931C6208467@bastion.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for perl-DateTime-Format-Flexible
kevin has set commit to Approved for provenpackager on perl-DateTime-Format-Flexible (Fedora 10)
kevin has set build to Approved for provenpackager on perl-DateTime-Format-Flexible (Fedora 10)
kevin has set checkout to Approved for provenpackager on perl-DateTime-Format-Flexible (Fedora 10)
kevin approved watchbugzilla on perl-DateTime-Format-Flexible (Fedora 10) for perl-sig
kevin approved watchcommits on perl-DateTime-Format-Flexible (Fedora 10) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-DateTime-Format-Flexible



From kevin at fedoraproject.org  Sun Jan 11 17:21:23 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 11 Jan 2009 17:21:23 +0000 (UTC)
Subject: rpms/perl-DateTime-Format-Flexible - New directory
Message-ID: <20090111172123.2305070141@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-DateTime-Format-Flexible
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvso22565/rpms/perl-DateTime-Format-Flexible

Log Message:
Directory /cvs/pkgs/rpms/perl-DateTime-Format-Flexible added to the repository




From kevin at fedoraproject.org  Sun Jan 11 17:21:23 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 11 Jan 2009 17:21:23 +0000 (UTC)
Subject: rpms/perl-DateTime-Format-Flexible/devel - New directory
Message-ID: <20090111172123.5FB6970144@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-DateTime-Format-Flexible/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvso22565/rpms/perl-DateTime-Format-Flexible/devel

Log Message:
Directory /cvs/pkgs/rpms/perl-DateTime-Format-Flexible/devel added to the repository




From kevin at fedoraproject.org  Sun Jan 11 17:21:41 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 11 Jan 2009 17:21:41 +0000 (UTC)
Subject: rpms/perl-DateTime-Format-Flexible Makefile,NONE,1.1
Message-ID: <20090111172141.BE7607013F@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-DateTime-Format-Flexible
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvso22565/rpms/perl-DateTime-Format-Flexible

Added Files:
	Makefile 
Log Message:
Setup of module perl-DateTime-Format-Flexible


--- NEW FILE Makefile ---
# Top level Makefile for module perl-DateTime-Format-Flexible
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Jan 11 17:21:42 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 11 Jan 2009 17:21:42 +0000 (UTC)
Subject: rpms/perl-DateTime-Format-Flexible/devel .cvsignore, NONE,
	1.1 Makefile, NONE, 1.1 sources, NONE, 1.1
Message-ID: <20090111172142.750077013F@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-DateTime-Format-Flexible/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvso22565/rpms/perl-DateTime-Format-Flexible/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-DateTime-Format-Flexible


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: perl-DateTime-Format-Flexible
# $Id: Makefile,v 1.1 2009/01/11 17:21:42 kevin Exp $
NAME := perl-DateTime-Format-Flexible
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Jan 11 17:22:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Jan 2009 17:22:04 +0000
Subject: [pkgdb] perl-DateTime-Format-DateParse was added for cweyl
Message-ID: <20090111172205.06963208421@bastion.fedora.phx.redhat.com>

kevin has added Package perl-DateTime-Format-DateParse with summary Parse Date::Parse compatible formats
kevin has approved Package perl-DateTime-Format-DateParse
kevin has added a Fedora devel branch for perl-DateTime-Format-DateParse with an owner of cweyl
kevin has approved perl-DateTime-Format-DateParse in Fedora devel
kevin has approved Package perl-DateTime-Format-DateParse
kevin has set commit to Approved for provenpackager on perl-DateTime-Format-DateParse (Fedora devel)
kevin has set build to Approved for provenpackager on perl-DateTime-Format-DateParse (Fedora devel)
kevin has set checkout to Approved for provenpackager on perl-DateTime-Format-DateParse (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-DateTime-Format-DateParse



From pkgdb at fedoraproject.org  Sun Jan 11 17:22:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Jan 2009 17:22:07 +0000
Subject: [pkgdb] perl-DateTime-Format-DateParse (Fedora, 9) updated by kevin
Message-ID: <20090111172207.55E64208457@bastion.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for perl-DateTime-Format-DateParse
kevin has set commit to Approved for provenpackager on perl-DateTime-Format-DateParse (Fedora 9)
kevin has set build to Approved for provenpackager on perl-DateTime-Format-DateParse (Fedora 9)
kevin has set checkout to Approved for provenpackager on perl-DateTime-Format-DateParse (Fedora 9)
kevin approved watchbugzilla on perl-DateTime-Format-DateParse (Fedora 9) for perl-sig
kevin approved watchcommits on perl-DateTime-Format-DateParse (Fedora 9) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-DateTime-Format-DateParse



From pkgdb at fedoraproject.org  Sun Jan 11 17:22:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Jan 2009 17:22:07 +0000
Subject: [pkgdb] perl-DateTime-Format-DateParse (Fedora,
	devel) updated by kevin
Message-ID: <20090111172207.66304208467@bastion.fedora.phx.redhat.com>

kevin approved watchbugzilla on perl-DateTime-Format-DateParse (Fedora devel) for perl-sig
kevin approved watchcommits on perl-DateTime-Format-DateParse (Fedora devel) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-DateTime-Format-DateParse



From pkgdb at fedoraproject.org  Sun Jan 11 17:22:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Jan 2009 17:22:07 +0000
Subject: [pkgdb] perl-DateTime-Format-DateParse (Fedora, 10) updated by kevin
Message-ID: <20090111172207.7130420846B@bastion.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for perl-DateTime-Format-DateParse
kevin has set commit to Approved for provenpackager on perl-DateTime-Format-DateParse (Fedora 10)
kevin has set build to Approved for provenpackager on perl-DateTime-Format-DateParse (Fedora 10)
kevin has set checkout to Approved for provenpackager on perl-DateTime-Format-DateParse (Fedora 10)
kevin approved watchbugzilla on perl-DateTime-Format-DateParse (Fedora 10) for perl-sig
kevin approved watchcommits on perl-DateTime-Format-DateParse (Fedora 10) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-DateTime-Format-DateParse



From kevin at fedoraproject.org  Sun Jan 11 17:22:19 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 11 Jan 2009 17:22:19 +0000 (UTC)
Subject: rpms/perl-DateTime-Format-DateParse - New directory
Message-ID: <20090111172219.2304D7013F@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-DateTime-Format-DateParse
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsA22918/rpms/perl-DateTime-Format-DateParse

Log Message:
Directory /cvs/pkgs/rpms/perl-DateTime-Format-DateParse added to the repository




From kevin at fedoraproject.org  Sun Jan 11 17:22:19 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 11 Jan 2009 17:22:19 +0000 (UTC)
Subject: rpms/perl-DateTime-Format-DateParse/devel - New directory
Message-ID: <20090111172219.5602A70144@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-DateTime-Format-DateParse/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsA22918/rpms/perl-DateTime-Format-DateParse/devel

Log Message:
Directory /cvs/pkgs/rpms/perl-DateTime-Format-DateParse/devel added to the repository




From kevin at fedoraproject.org  Sun Jan 11 17:22:36 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 11 Jan 2009 17:22:36 +0000 (UTC)
Subject: rpms/perl-DateTime-Format-DateParse Makefile,NONE,1.1
Message-ID: <20090111172236.465AF7013F@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-DateTime-Format-DateParse
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsA22918/rpms/perl-DateTime-Format-DateParse

Added Files:
	Makefile 
Log Message:
Setup of module perl-DateTime-Format-DateParse


--- NEW FILE Makefile ---
# Top level Makefile for module perl-DateTime-Format-DateParse
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Jan 11 17:22:36 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 11 Jan 2009 17:22:36 +0000 (UTC)
Subject: rpms/perl-DateTime-Format-DateParse/devel .cvsignore, NONE,
	1.1 Makefile, NONE, 1.1 sources, NONE, 1.1
Message-ID: <20090111172236.C37B77013F@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-DateTime-Format-DateParse/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsA22918/rpms/perl-DateTime-Format-DateParse/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-DateTime-Format-DateParse


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: perl-DateTime-Format-DateParse
# $Id: Makefile,v 1.1 2009/01/11 17:22:36 kevin Exp $
NAME := perl-DateTime-Format-DateParse
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Jan 11 17:23:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Jan 2009 17:23:24 +0000
Subject: [pkgdb] ruby-gnome2 (Fedora EPEL, 5) updated by kevin
Message-ID: <20090111172325.759A8208421@bastion.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for ruby-gnome2
kevin has set commit to Approved for provenpackager on ruby-gnome2 (Fedora EPEL 5)
kevin has set build to Approved for provenpackager on ruby-gnome2 (Fedora EPEL 5)
kevin has set checkout to Approved for provenpackager on ruby-gnome2 (Fedora EPEL 5)
kevin changed owner of ruby-gnome2 in Fedora EPEL 5 to thias

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ruby-gnome2



From pkgdb at fedoraproject.org  Sun Jan 11 17:24:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Jan 2009 17:24:31 +0000
Subject: [pkgdb] txt2tags (Fedora EPEL, 5) updated by kevin
Message-ID: <20090111172431.EADAB208458@bastion.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for txt2tags
kevin has set commit to Approved for provenpackager on txt2tags (Fedora EPEL 5)
kevin has set build to Approved for provenpackager on txt2tags (Fedora EPEL 5)
kevin has set checkout to Approved for provenpackager on txt2tags (Fedora EPEL 5)
kevin changed owner of txt2tags in Fedora EPEL 5 to maxamillion

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/txt2tags



From pkgdb at fedoraproject.org  Sun Jan 11 17:24:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Jan 2009 17:24:31 +0000
Subject: [pkgdb] txt2tags (Fedora EPEL, 4) updated by kevin
Message-ID: <20090111172431.D018B208455@bastion.fedora.phx.redhat.com>

kevin added a Fedora EPEL 4 branch for txt2tags
kevin has set commit to Approved for provenpackager on txt2tags (Fedora EPEL 4)
kevin has set build to Approved for provenpackager on txt2tags (Fedora EPEL 4)
kevin has set checkout to Approved for provenpackager on txt2tags (Fedora EPEL 4)
kevin changed owner of txt2tags in Fedora EPEL 4 to maxamillion

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/txt2tags



From cdamian at fedoraproject.org  Sun Jan 11 17:38:39 2009
From: cdamian at fedoraproject.org (Christof Damian)
Date: Sun, 11 Jan 2009 17:38:39 +0000 (UTC)
Subject: rpms/python-progressbar/devel import.log, NONE,
	1.1 python-progressbar.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090111173839.325C870139@cvs1.fedora.phx.redhat.com>

Author: cdamian

Update of /cvs/pkgs/rpms/python-progressbar/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26133/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log python-progressbar.spec 
Log Message:
first import of python-progressbar-2.2-5



--- NEW FILE import.log ---
python-progressbar-2_2-5_fc10:HEAD:python-progressbar-2.2-5.fc10.src.rpm:1231695391


--- NEW FILE python-progressbar.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

%define realname progressbar

Name:           python-%{realname}
Version:        2.2
Release:        5%{?dist}
Summary:        Text progressbar library for python

Group:          Development/Libraries
License:        LGPLv2+ 
URL:            http://pypi.python.org/pypi/%{realname}/
Source0:        http://pypi.python.org/packages/source/p/%{realname}/%{realname}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  python-devel
BuildArch:      noarch

%description

This library provides a text mode progress bar. This is typically used to 
display the progress of a long running operation, providing a visual clue that 
processing is under way.

The progressbar module is very easy to use, yet very powerful. And 
automatically supports features like auto-resizing when available.

%prep
%setup -q -n %{realname}-%{version}


%build
%{__python} setup.py build


%install
rm -rf $RPM_BUILD_ROOT
%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
chmod 0755 $RPM_BUILD_ROOT/%{python_sitelib}/progressbar.py
 
%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc LICENSE
%doc README
%{python_sitelib}/*

%changelog
* Thu Jan 8 2009 Christof Damian <christof at damian.net> 2.2-5
- don't include sitelib in files 

* Thu Jan 8 2009 Christof Damian <christof at damian.net> 2.2-4
- change the attributes of progressbar.py in install

* Thu Jan 8 2009 Christof Damian <christof at damian.net> 2.2-3
- changed attributes for progressbar.py, it contains excuteable examples

* Tue Jan 6 2009 Christof Damian <christof at damian.net> 2.2-2
- remove version from upstream url

* Sat Jan 3 2009 Christof Damian <christof at damian.net> 2.2-1
- initial spec file


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-progressbar/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	11 Jan 2009 17:20:25 -0000	1.1
+++ .cvsignore	11 Jan 2009 17:38:08 -0000	1.2
@@ -0,0 +1 @@
+progressbar-2.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-progressbar/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	11 Jan 2009 17:20:25 -0000	1.1
+++ sources	11 Jan 2009 17:38:08 -0000	1.2
@@ -0,0 +1 @@
+8ea4e2c17a8ec9e7d153767c5f2a7b28  progressbar-2.2.tar.gz



From rishi at fedoraproject.org  Sun Jan 11 17:38:50 2009
From: rishi at fedoraproject.org (Debarshi Ray)
Date: Sun, 11 Jan 2009 17:38:50 +0000 (UTC)
Subject: rpms/qemu/devel qemu-0.9.1-build.patch, NONE, 1.1 qemu.spec, 1.44, 
	1.45 qemu-0.7.0-build.patch, 1.5, NONE
Message-ID: <20090111173850.A278570139@cvs1.fedora.phx.redhat.com>

Author: rishi

Update of /cvs/pkgs/rpms/qemu/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26371

Modified Files:
	qemu.spec 
Added Files:
	qemu-0.9.1-build.patch 
Removed Files:
	qemu-0.7.0-build.patch 
Log Message:
* Sun Jan 11 2009 Debarshi Ray <rishi at fedoraproject.org> - 0.9.1-12
- Updated build patch. Closes Red Hat Bugzilla bug #465041.


qemu-0.9.1-build.patch:

--- NEW FILE qemu-0.9.1-build.patch ---
diff -urNp qemu-0.9.1.orig/Makefile.target qemu-0.9.1/Makefile.target
--- qemu-0.9.1.orig/Makefile.target	2009-01-11 23:01:20.000000000 +0530
+++ qemu-0.9.1/Makefile.target	2009-01-11 23:02:16.000000000 +0530
@@ -632,7 +632,7 @@ clean:
 
 install: all
 ifneq ($(PROGS),)
-	$(INSTALL) -m 755 -s $(PROGS) "$(DESTDIR)$(bindir)"
+	$(INSTALL) -m 755 $(PROGS) "$(DESTDIR)$(bindir)"
 endif
 
 ifneq ($(wildcard .depend),)


Index: qemu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qemu/devel/qemu.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- qemu.spec	1 Jan 2009 17:00:58 -0000	1.44
+++ qemu.spec	11 Jan 2009 17:38:20 -0000	1.45
@@ -8,13 +8,13 @@
 Summary: QEMU is a FAST! processor emulator
 Name: qemu
 Version: 0.9.1
-Release: 11%{?dist}
+Release: 12%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: Development/Tools
 URL: http://www.qemu.org/
 Source0: http://www.qemu.org/%{name}-%{version}.tar.gz
 Source1: qemu.init
-Patch0: qemu-0.7.0-build.patch
+Patch0: qemu-0.9.1-build.patch
 # Change default NIC to rtl8139 to get link-state detection
 Patch3: qemu-0.9.1-nic-defaults.patch
 Patch4: qemu-%{version}-block-rw-range-check.patch
@@ -159,6 +159,9 @@
 %{_mandir}/man1/qemu-img.1*
 
 %changelog
+* Sun Jan 11 2009 Debarshi Ray <rishi at fedoraproject.org> - 0.9.1-12
+- Updated build patch. Closes Red Hat Bugzilla bug #465041.
+
 * Wed Dec 31 2008 Dennis Gilmore <dennis at ausil.us> - 0.9.1-11
 - add sparcv9 and sparc64 support
 


--- qemu-0.7.0-build.patch DELETED ---



From rishi at fedoraproject.org  Sun Jan 11 17:41:23 2009
From: rishi at fedoraproject.org (Debarshi Ray)
Date: Sun, 11 Jan 2009 17:41:23 +0000 (UTC)
Subject: rpms/qemu/F-10 qemu-0.9.1-build.patch, NONE, 1.1 qemu.spec, 1.44,
	1.45 qemu-0.7.0-build.patch, 1.5, NONE
Message-ID: <20090111174123.CB60470139@cvs1.fedora.phx.redhat.com>

Author: rishi

Update of /cvs/pkgs/rpms/qemu/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27137

Modified Files:
	qemu.spec 
Added Files:
	qemu-0.9.1-build.patch 
Removed Files:
	qemu-0.7.0-build.patch 
Log Message:
* Sun Jan 11 2009 Debarshi Ray <rishi at fedoraproject.org> - 0.9.1-12
- Updated build patch. Closes Red Hat Bugzilla bug #465041.


qemu-0.9.1-build.patch:

--- NEW FILE qemu-0.9.1-build.patch ---
diff -urNp qemu-0.9.1.orig/Makefile.target qemu-0.9.1/Makefile.target
--- qemu-0.9.1.orig/Makefile.target	2009-01-11 23:01:20.000000000 +0530
+++ qemu-0.9.1/Makefile.target	2009-01-11 23:02:16.000000000 +0530
@@ -632,7 +632,7 @@ clean:
 
 install: all
 ifneq ($(PROGS),)
-	$(INSTALL) -m 755 -s $(PROGS) "$(DESTDIR)$(bindir)"
+	$(INSTALL) -m 755 $(PROGS) "$(DESTDIR)$(bindir)"
 endif
 
 ifneq ($(wildcard .depend),)


Index: qemu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qemu/F-10/qemu.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- qemu.spec	1 Jan 2009 16:25:48 -0000	1.44
+++ qemu.spec	11 Jan 2009 17:40:53 -0000	1.45
@@ -8,13 +8,13 @@
 Summary: QEMU is a FAST! processor emulator
 Name: qemu
 Version: 0.9.1
-Release: 11%{?dist}
+Release: 12%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: Development/Tools
 URL: http://www.qemu.org/
 Source0: http://www.qemu.org/%{name}-%{version}.tar.gz
 Source1: qemu.init
-Patch0: qemu-0.7.0-build.patch
+Patch0: qemu-0.9.1-build.patch
 # Change default NIC to rtl8139 to get link-state detection
 Patch3: qemu-0.9.1-nic-defaults.patch
 Patch4: qemu-%{version}-block-rw-range-check.patch
@@ -159,6 +159,9 @@
 %{_mandir}/man1/qemu-img.1*
 
 %changelog
+* Sun Jan 11 2009 Debarshi Ray <rishi at fedoraproject.org> - 0.9.1-12
+- Updated build patch. Closes Red Hat Bugzilla bug #465041.
+
 * Wed Dec 31 2008 Dennis Gilmore <dennis at ausil.us> - 0.9.1-11
 - add sparcv9 and sparc64 support
 


--- qemu-0.7.0-build.patch DELETED ---



From cdamian at fedoraproject.org  Sun Jan 11 17:42:46 2009
From: cdamian at fedoraproject.org (Christof Damian)
Date: Sun, 11 Jan 2009 17:42:46 +0000 (UTC)
Subject: rpms/podcatcher/devel import.log, NONE, 1.1 podcatcher.spec, NONE, 
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090111174247.24A4870139@cvs1.fedora.phx.redhat.com>

Author: cdamian

Update of /cvs/pkgs/rpms/podcatcher/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27476/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log podcatcher.spec 
Log Message:
first import of podcatcher-3.1.4-3 



--- NEW FILE import.log ---
podcatcher-3_1_4-3_fc10:HEAD:podcatcher-3.1.4-3.fc10.src.rpm:1231695664


--- NEW FILE podcatcher.spec ---
%define repoid  43722

Name:           podcatcher
Version:        3.1.4
Release:        3%{?dist}
Summary:        Armangil's podcatcher 

Group:          Applications/Internet

License:        GPL+
URL:            http://podcatcher.rubyforge.org/
Source0:        http://rubyforge.org/frs/download.php/%{repoid}/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch

Requires:       ruby >= 1.8.2

%description

Armangil's podcatcher is a podcast client for the command line. It provides 
several download strategies (new shows only, back-catalog allowed, etc), offers 
cache management, supports BitTorrent, and generates playlists for media player
applications.

%prep
%setup -q -n %{name}

%build

%install
rm -rf $RPM_BUILD_ROOT
install -p -D bin/podcatcher $RPM_BUILD_ROOT/%{_bindir}/podcatcher

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc demo/
%doc README.txt
%{_bindir}/podcatcher

%changelog
* Mon Jan 5 2009 Christof Damian <christof at damian.net> 3.1.4-3
- add repoid for download link and use name macro too
- removed unused macros

* Thu Jan 1 2009 Christof Damian <christof at damian.net> 3.1.4-2
- fixed some problems in the spec file

* Fri Dec 26 2008 Christof Damian <christof at damian.net> 3.1.4-1
- initial rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/podcatcher/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	11 Jan 2009 17:16:24 -0000	1.1
+++ .cvsignore	11 Jan 2009 17:42:16 -0000	1.2
@@ -0,0 +1 @@
+podcatcher-3.1.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/podcatcher/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	11 Jan 2009 17:16:24 -0000	1.1
+++ sources	11 Jan 2009 17:42:16 -0000	1.2
@@ -0,0 +1 @@
+38e5382613c4a454b8138bcc2b881e68  podcatcher-3.1.4.tar.gz



From buc at fedoraproject.org  Sun Jan 11 17:47:02 2009
From: buc at fedoraproject.org (Dmitry Butskoy)
Date: Sun, 11 Jan 2009 17:47:02 +0000 (UTC)
Subject: rpms/freetds/devel freetds.spec,1.12,1.13
Message-ID: <20090111174702.CAB6D70139@cvs1.fedora.phx.redhat.com>

Author: buc

Update of /cvs/extras/rpms/freetds/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28187

Modified Files:
	freetds.spec 
Log Message:



Index: freetds.spec
===================================================================
RCS file: /cvs/extras/rpms/freetds/devel/freetds.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- freetds.spec	17 Jun 2008 14:29:53 -0000	1.12
+++ freetds.spec	11 Jan 2009 17:46:32 -0000	1.13
@@ -7,7 +7,7 @@
 Name: freetds
 Summary: Implementation of the TDS (Tabular DataStream) protocol
 Version: 0.82
-Release: 2%{?dist}
+Release: 3%{?dist}
 Group: System Environment/Libraries
 License: LGPLv2+ and GPLv2+
 URL: http://www.freetds.org/
@@ -15,7 +15,7 @@
 Source1: freetds-tds_sysdep_public.h
 Patch0: freetds-0.82-shared-libtds.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: unixODBC-devel, readline-devel, openssl-devel, libtool
+BuildRequires: unixODBC-devel, readline-devel, gnutls-devel, libtool
  
 
 %description 
@@ -67,7 +67,7 @@
 	--with-unixodbc="%{_prefix}" \
 	--enable-msdblib \
 	--enable-sybase-compat \
-	--with-openssl
+	--with-gnutls
 
 # avoid any rpath
 sed -i -e 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' \
@@ -128,6 +128,9 @@
  
 
 %changelog
+* Sun Jan 11 2009 Dmitry Butskoy <Dmitry at Butskoy.name> - 0.82-3
+- Use gnutls for SSL (#479148)
+
 * Tue Jun 17 2008 Dmitry Butskoy <Dmitry at Butskoy.name> - 0.82-2
 - Continue to provide an internal libtds library as public
   (patch from Hans de Goede, #451021). This shared library is needed



From mmahut at fedoraproject.org  Sun Jan 11 17:54:25 2009
From: mmahut at fedoraproject.org (Marek Mahut)
Date: Sun, 11 Jan 2009 17:54:25 +0000 (UTC)
Subject: rpms/cpm/devel cpm-0.23beta-disclaimer.patch, NONE,
	1.1 cpm-0.23beta-make.patch, NONE, 1.1 cpm-0.23beta-open.patch,
	NONE, 1.1 cpm-0.23beta-sigint.patch, NONE, 1.1 cpm.pod, NONE,
	1.1 cpm.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090111175425.7A90970139@cvs1.fedora.phx.redhat.com>

Author: mmahut

Update of /cvs/pkgs/rpms/cpm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28322/devel

Modified Files:
	.cvsignore sources 
Added Files:
	cpm-0.23beta-disclaimer.patch cpm-0.23beta-make.patch 
	cpm-0.23beta-open.patch cpm-0.23beta-sigint.patch cpm.pod 
	cpm.spec import.log 
Log Message:
initial import


cpm-0.23beta-disclaimer.patch:

--- NEW FILE cpm-0.23beta-disclaimer.patch ---
Marek Mahut <mmahut at fedoraproject.org>: adding security disclaimer

diff -Naur cpm-0.23beta-upstream/security.c cpm-0.23beta/security.c
--- cpm-0.23beta-upstream/security.c	2009-01-05 15:24:31.000000000 +0100
+++ cpm-0.23beta/security.c	2009-01-08 13:36:16.000000000 +0100
@@ -228,7 +228,7 @@
     else
       {
         if (!silent)
-          { printf("%s%s%s (%s)\n", STAT_RED, _("no"), STAT_OFF, memlimit); }
+          { printf("%s%s%s (%s)\n", STAT_RED, _("no"), STAT_OFF, memlimit); printf("\n%-50s\n", "For information how to configure your system for maximum security, please read README file included with this package.\n"); }
       }
 #endif
 #endif

cpm-0.23beta-make.patch:

--- NEW FILE cpm-0.23beta-make.patch ---
Marek Mahut <mmahut at fedoraproject.org>: We are setuid-ing it using rpm

diff -Naur cpm-0.23beta-upstream/Makefile.in cpm-0.23beta/Makefile.in
--- cpm-0.23beta-upstream/Makefile.in	2009-01-05 15:24:31.000000000 +0100
+++ cpm-0.23beta/Makefile.in	2009-01-05 15:57:40.000000000 +0100
@@ -374,7 +374,7 @@
 # install everything
 .PHONY: install
 install: cpm gettext
-	$(INSTALL) -D --mode=4755 --owner=root --group=root @PACKAGE_NAME@ $(DESTDIR)$(bindir)/@PACKAGE_NAME@
+	$(INSTALL) -D --mode=755 @PACKAGE_NAME@ $(DESTDIR)$(bindir)/@PACKAGE_NAME@
 	$(INSTALL) -D --mode=644 ./po/de_DE.mo $(DESTDIR)$(localedir)/de/LC_MESSAGES/@PACKAGE_NAME at .mo
 	$(INSTALL) -D --mode=644 ./docs/cpm.1.gz $(DESTDIR)$(mandir)/man1/cpm.1.gz
 

cpm-0.23beta-open.patch:

--- NEW FILE cpm-0.23beta-open.patch ---
open() takes three arguments when used with O_CREAT.
Furthermore, opening "/dev/null" and unsuccessfully creating it if it does
not exist and assuming everything's ok in that case makes no sense either.
Fix the test to be a bit more sane.

Lubomir Rintel <lkundrak at v3.sk>

diff -up cpm-0.23beta/security.c.open cpm-0.23beta/security.c
--- cpm-0.23beta/security.c.open	2009-01-08 16:45:49.000000000 +0100
+++ cpm-0.23beta/security.c	2009-01-08 16:46:54.000000000 +0100
@@ -495,15 +495,13 @@ int initSecurity(int* max_mem_lock, int*
     /* check that stderr, stdin and stdout are opened */
     /* NOTE: no file must be opened before this test! */
     /* Flawfinder: ignore */
-    canary = open("/dev/null", O_CREAT);
-    if ((canary >= 0) && (canary <= 2))
+    close (canary = dup(0));
+    if (canary != 3)
       {
         fprintf(stderr, "%s\n",
             _("stdin, stdout and/or stderr are invalid."));
-        close (canary);
         return 1;
       }
-    close (canary);
 
     return clearEnvironment();
   }


cpm-0.23beta-sigint.patch:

--- NEW FILE cpm-0.23beta-sigint.patch ---
Marek Mahut <mmahut at fedoraproject.org>: Correctly destroy window at ctrl-C

diff -Naur cpm-0.23beta-upstream/cpm.c cpm-0.23beta/cpm.c
--- cpm-0.23beta-upstream/cpm.c	2009-01-05 15:24:31.000000000 +0100
+++ cpm-0.23beta/cpm.c	2009-01-08 13:45:30.000000000 +0100
@@ -267,7 +267,8 @@
     if (signum == SIGINT ||
         signum == SIGTERM)
       {   /* we have to quit right away */
-        fileLockRemove(&dummy);
+        fileLockRemove(&dummy); 
+	destroyScreen(__LINE__, NULL);
         _exit(1);
       }
   }


--- NEW FILE cpm.pod ---
=head1 NAME

cpm - Console Password Manager

=head1 SYNOPSIS

cpm [--config FILE] [--configtest] [--encoding] [--file FILE] [--help]
    [--key KEY] [--noencryption] [--readonly] [--security] [--testrun TYPE]
    [--version] [PATH]

=head1 DESCRIPTION

Keep a password database safe and encrypted.

=head1 OPTIONS

=over 8

=item B<-c>, B<--config>

configuration file to use [~/.cpmrc]

=item B<--configtest>

verify the configuration file and exit

=item B<-e>, B<--encoding>

the encoding in which keyboard input arrives [ISO-8859-1]

=item B<-f>, B<--file>

database file to use [~/.cpmdb]

=item B<-h>, B<--help>

display this help

=item B<--key>

overwrite the default encryption keys and use this key instead; repeat for several keys

=item B<--noencryption>

turn off file encryption WARNING: THIS IS  FOR  DEVELOPMENT  AND TESTING ONLY!

=item B<-r>, B<--readonly>

open the database in read-only mode

=item B<-s>, B<--security>

run a security check and show the current security status

=item B<--testrun>

run one of the testmodes

backup run test on the backupfile creation

compress[fB-6]
     run compression test 1-6

decrypt
     run test on the decryption code

encrypt
     run test on the encryption code

environment
     run test on the environment validation

garbage
     run test on garbage input files

searchpattern
     run  test on the search patterns This only works when the
     application has been compiled with the compiler flag - DTEST_OPTION.

=item B<--version>

display the version and exit

=head1 KEYS

=over 8

=item B<^A>

add a new node to the current node.

=item B<^D>

delete  the currently selected node and all its subnodes.

=item B<^E>

edit the currently selected node.

=item B<^H>

show the help screen.

=item B<^K>

edit the currently used encryption keys.

=item B<^N>

edit the name of the current level.

=item B<^O>

edit the comment of the selected node.

=item B<^P>

edit the current node and suggest a password.

=item B<^W>

write the database to disk.

=head1 ENVIRONMENT

The following environment variables are used by the application,
all other variables are discarded at program startup:

=item B<GNUPGHOME>

If set directory used instead of "~/.gnupg".

=item B<GPG_AGENT_INFO>

Used  to  locate the gpg-agent

=item B<HOME>

Used to locate the default home directory.

=item B<LANG>

Used to determine the user???s language.

=item B<COLUMNS>

Used to size some displays to the full size of the screen.

=item B<LINES>

Used to size some displays to the full size of the screen.

=item B<TERMCAP>

Terminal settings of the currently used terminal.

=item B<TERM>

Terminal settings of the currently used terminal.

=head1 IMPORT

The data import utilities are installed in /usr/share/cpm and the following formats can be imported:

=item . csv

=item . passwordsafe

=item . pms

=head1 SEE ALSO

gpg(1)

=head1 REPORTING BUGS

Report bugs to <harry_b at mm.st>.

=head1 COPYRIGHT

Copyright (C) 2005, 2006 Harry Brueckner

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 any later
version.  This program is distributed in the hope that it will be  use-
ful,  but  WITHOUT  ANY  WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the  GNU  Gen-
eral  Public License for more details.  You should have received a copy
of the GNU General Public License along  with  this  program;  if  not,
write  to  the  Free  Software  Foundation, Inc., 51 Franklin St, Fifth
Floor, Boston, MA 02110-1301, USA.

Contact: Harry Brueckner <harry_b at mm.st> Muenchener Strasse  12a  85253
Kleinberghofen Germany


--- NEW FILE cpm.spec ---
Name:		cpm
Version:	0.23
Release:	0.1.beta%{?dist}
Summary:	Console Password Manager

Group:		Applications/Databases
License:	GPLv2+
URL:		http://www.harry-b.de/dokuwiki/doku.php?id=harry:cpm
Source0:	http://dl.sf.net/%{name}/%{name}-%{version}beta.tar.gz
Source1:	cpm.pod
Patch0:		cpm-0.23beta-make.patch
Patch1:		cpm-0.23beta-disclaimer.patch
Patch2:		cpm-0.23beta-sigint.patch
Patch3:		cpm-0.23beta-open.patch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	cracklib-devel, cracklib-dicts
BuildRequires:	gpgme-devel
BuildRequires:	cdk-devel
BuildRequires:	dotconf-devel 
BuildRequires:	ncurses-devel
BuildRequires:	libxml2-devel >= 2.6.16,
BuildRequires:	zlib-devel
BuildRequires:	gettext

%description
CPM is a ncurses based console tool to manage passwords
and store them public key encrypted in a file - even for
more than one person. The encryption is handled via GnuPG
so the programs data can be accessed via gpg as well,
in case you want to have a look inside. The data is stored
as as zlib compressed XML so it???s even possible to reuse
the data for some other purpose.

%prep
%setup -q -n %{name}-%{version}beta
%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1
for file in docs/changelog docs/ChangeLog docs/cpm.txt docs/GPLv2 docs/README; do
	mv $file timestamp
	iconv -f ISO-8859-1 -t UTF-8 -o $file timestamp
	touch -r timestamp $file
done

%build
%configure --with-crack-dict=%{_libdir}/cracklib_dict CFLAGS="-I/usr/include/cdk/ %{optflags}" 
make %{?_smp_mflags} 
pod2man --release=%{name}-%{version}beta --center="%{summary}" --name=%{name} %{SOURCE1} ./docs/cpm.1

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT mandir="%{_mandir}"
install -D -p -m 644 conf/cpmrc-default $RPM_BUILD_ROOT%{_sysconfdir}/cpmrc
%find_lang %{name}

%clean
rm -rf $RPM_BUILD_ROOT


%files -f %{name}.lang
%defattr(-,root,root,-)
%doc conf/cpmrc-default docs/ChangeLog docs/changelog docs/GPLv2 docs/README ./share/cpm/*
%attr (4755,root,root) %{_bindir}/cpm
%config(noreplace) %{_sysconfdir}/cpmrc
%{_mandir}/man1/cpm*

%changelog
* Mon Jan 5 2009 Marek Mahut <mmahut at fedoraproject.org> - 0.23beta-1
- Initial build


--- NEW FILE import.log ---
cpm-0_23-0_1_beta_fc8:HEAD:cpm-0.23-0.1.beta.fc8.src.rpm:1231695149


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cpm/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	11 Jan 2009 16:57:09 -0000	1.1
+++ .cvsignore	11 Jan 2009 17:54:24 -0000	1.2
@@ -0,0 +1 @@
+cpm-0.23beta.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cpm/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	11 Jan 2009 16:57:09 -0000	1.1
+++ sources	11 Jan 2009 17:54:25 -0000	1.2
@@ -0,0 +1 @@
+55912d0a716450b2ee338a7885d3a213  cpm-0.23beta.tar.gz



From laxathom at fedoraproject.org  Sun Jan 11 17:54:39 2009
From: laxathom at fedoraproject.org (Xavier LAMIEN)
Date: Sun, 11 Jan 2009 17:54:39 +0000 (UTC)
Subject: rpms/gammu/devel .cvsignore, 1.12, 1.13 gammu.spec, 1.18,
	1.19 sources, 1.12, 1.13
Message-ID: <20090111175439.C808070139@cvs1.fedora.phx.redhat.com>

Author: laxathom

Update of /cvs/pkgs/rpms/gammu/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29482

Modified Files:
	.cvsignore gammu.spec sources 
Log Message:
update release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gammu/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	30 Dec 2008 11:35:14 -0000	1.12
+++ .cvsignore	11 Jan 2009 17:54:09 -0000	1.13
@@ -1 +1 @@
-gammu-1.22.1.tar.bz2
+gammu-1.22.90.tar.bz2


Index: gammu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gammu/devel/gammu.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- gammu.spec	30 Dec 2008 12:05:11 -0000	1.18
+++ gammu.spec	11 Jan 2009 17:54:09 -0000	1.19
@@ -1,6 +1,6 @@
 Name:		gammu
-Version:        1.22.1
-Release:        2%{?dist}
+Version:        1.22.90
+Release:        1%{?dist}
 Summary:        Command Line utility to work with mobile phones
 
 Group:          Applications/System
@@ -47,6 +47,8 @@
 %prep
 %setup -q
 
+sed -i 's|${INSTALL_LIB_DIR}|%{_libdir}|' CMakeLists.txt common/CMakeLists.txt \
+				smsd/CMakeLists.txt gammu/CMakeLists.txt
 
 %build
 mkdir build
@@ -65,12 +67,10 @@
 for docs in \
 	docs/develop/{protocol/'*',sounds/*,sms/'*'}	\
 	docs/develop/{*.htm,*.txt}			\
-	docs/user/'*' ; do
+	docs/user/*.* ; do
 	sed -e 's/\r//' -i $docs
 done
 
-#fix libdir
-sed -i 's|${CMAKE_INSTALL_PREFIX}/lib|%{_libdir}|g' build/{cmake_install.cmake,common/cmake_install.cmake}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -85,10 +85,13 @@
 mkdir -p docs/symbian
 cp -pR $RPM_BUILD_ROOT%{_docdir}/%{name}/devel/* devel_docs
 cp -pR $RPM_BUILD_ROOT%{_docdir}/%{name}/symbian/* docs/symbian
-cp -pR $RPM_BUILD_ROOT%{_docdir}/%{name}/examples/php* docs/examples
+cp -pR $RPM_BUILD_ROOT%{_docdir}/%{name}/examples/* docs/examples
+cp -p $RPM_BUILD_ROOT%{_docdir}/%{name}/*.* .
 rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}
 
 %find_lang %{name}
+%find_lang lib%{name}
+cat lib%{name}.lang >> %{name}.lang
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -101,10 +104,15 @@
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-%doc COPYING ChangeLog README docs/* BUGS SUPPORTERS
+%doc COPYING ChangeLog README docs/* BUGS SUPPORTERS *.html *.txt
 %{_bindir}/%{name}*
 %{_bindir}/jadmaker
-%{_mandir}/man1/*.1.gz
+%{_mandir}/man1/*.gz
+%{_mandir}/man5/*.gz
+%{_mandir}/man7/*.gz
+%{_mandir}/cs/man1/*.gz
+%{_mandir}/cs/man5/*.gz
+%{_mandir}/cs/man7/*.gz
 #%config %{_sysconfdir}/bash_completion.d/%{name}
 
 %files		libs
@@ -120,6 +128,9 @@
 
 
 %changelog
+* Sun Jan 11 2009 Xavier Lamien <lxtnow[at]gmail.com> - 1.22.90-1
+- Update release.
+
 * Tue Dec 30 2008 Jan ONDREJ (SAL) <ondrejj(at)salstar.sk> - 1.22.1-2
 - Update release.
 - -DENABLE_SHARED=ON replaced by -DBUILD_SHARED_LIBS=ON


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gammu/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	30 Dec 2008 11:35:15 -0000	1.12
+++ sources	11 Jan 2009 17:54:09 -0000	1.13
@@ -1 +1 @@
-5d06f38d16043600a6b216db42197ea8  gammu-1.22.1.tar.bz2
+a6315df55fe8b7522007f7194a885ca1  gammu-1.22.90.tar.bz2



From mmahut at fedoraproject.org  Sun Jan 11 18:04:57 2009
From: mmahut at fedoraproject.org (Marek Mahut)
Date: Sun, 11 Jan 2009 18:04:57 +0000 (UTC)
Subject: rpms/cpm/F-10 cpm-0.23beta-disclaimer.patch, NONE,
	1.1 cpm-0.23beta-make.patch, NONE, 1.1 cpm-0.23beta-open.patch,
	NONE, 1.1 cpm-0.23beta-sigint.patch, NONE, 1.1 cpm.pod, NONE,
	1.1 cpm.spec, NONE, 1.1 sources, 1.1, 1.2
Message-ID: <20090111180457.EAB0B70139@cvs1.fedora.phx.redhat.com>

Author: mmahut

Update of /cvs/pkgs/rpms/cpm/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31273

Modified Files:
	sources 
Added Files:
	cpm-0.23beta-disclaimer.patch cpm-0.23beta-make.patch 
	cpm-0.23beta-open.patch cpm-0.23beta-sigint.patch cpm.pod 
	cpm.spec 
Log Message:
initial import


cpm-0.23beta-disclaimer.patch:

--- NEW FILE cpm-0.23beta-disclaimer.patch ---
Marek Mahut <mmahut at fedoraproject.org>: adding security disclaimer

diff -Naur cpm-0.23beta-upstream/security.c cpm-0.23beta/security.c
--- cpm-0.23beta-upstream/security.c	2009-01-05 15:24:31.000000000 +0100
+++ cpm-0.23beta/security.c	2009-01-08 13:36:16.000000000 +0100
@@ -228,7 +228,7 @@
     else
       {
         if (!silent)
-          { printf("%s%s%s (%s)\n", STAT_RED, _("no"), STAT_OFF, memlimit); }
+          { printf("%s%s%s (%s)\n", STAT_RED, _("no"), STAT_OFF, memlimit); printf("\n%-50s\n", "For information how to configure your system for maximum security, please read README file included with this package.\n"); }
       }
 #endif
 #endif

cpm-0.23beta-make.patch:

--- NEW FILE cpm-0.23beta-make.patch ---
Marek Mahut <mmahut at fedoraproject.org>: We are setuid-ing it using rpm

diff -Naur cpm-0.23beta-upstream/Makefile.in cpm-0.23beta/Makefile.in
--- cpm-0.23beta-upstream/Makefile.in	2009-01-05 15:24:31.000000000 +0100
+++ cpm-0.23beta/Makefile.in	2009-01-05 15:57:40.000000000 +0100
@@ -374,7 +374,7 @@
 # install everything
 .PHONY: install
 install: cpm gettext
-	$(INSTALL) -D --mode=4755 --owner=root --group=root @PACKAGE_NAME@ $(DESTDIR)$(bindir)/@PACKAGE_NAME@
+	$(INSTALL) -D --mode=755 @PACKAGE_NAME@ $(DESTDIR)$(bindir)/@PACKAGE_NAME@
 	$(INSTALL) -D --mode=644 ./po/de_DE.mo $(DESTDIR)$(localedir)/de/LC_MESSAGES/@PACKAGE_NAME at .mo
 	$(INSTALL) -D --mode=644 ./docs/cpm.1.gz $(DESTDIR)$(mandir)/man1/cpm.1.gz
 

cpm-0.23beta-open.patch:

--- NEW FILE cpm-0.23beta-open.patch ---
open() takes three arguments when used with O_CREAT.
Furthermore, opening "/dev/null" and unsuccessfully creating it if it does
not exist and assuming everything's ok in that case makes no sense either.
Fix the test to be a bit more sane.

Lubomir Rintel <lkundrak at v3.sk>

diff -up cpm-0.23beta/security.c.open cpm-0.23beta/security.c
--- cpm-0.23beta/security.c.open	2009-01-08 16:45:49.000000000 +0100
+++ cpm-0.23beta/security.c	2009-01-08 16:46:54.000000000 +0100
@@ -495,15 +495,13 @@ int initSecurity(int* max_mem_lock, int*
     /* check that stderr, stdin and stdout are opened */
     /* NOTE: no file must be opened before this test! */
     /* Flawfinder: ignore */
-    canary = open("/dev/null", O_CREAT);
-    if ((canary >= 0) && (canary <= 2))
+    close (canary = dup(0));
+    if (canary != 3)
       {
         fprintf(stderr, "%s\n",
             _("stdin, stdout and/or stderr are invalid."));
-        close (canary);
         return 1;
       }
-    close (canary);
 
     return clearEnvironment();
   }


cpm-0.23beta-sigint.patch:

--- NEW FILE cpm-0.23beta-sigint.patch ---
Marek Mahut <mmahut at fedoraproject.org>: Correctly destroy window at ctrl-C

diff -Naur cpm-0.23beta-upstream/cpm.c cpm-0.23beta/cpm.c
--- cpm-0.23beta-upstream/cpm.c	2009-01-05 15:24:31.000000000 +0100
+++ cpm-0.23beta/cpm.c	2009-01-08 13:45:30.000000000 +0100
@@ -267,7 +267,8 @@
     if (signum == SIGINT ||
         signum == SIGTERM)
       {   /* we have to quit right away */
-        fileLockRemove(&dummy);
+        fileLockRemove(&dummy); 
+	destroyScreen(__LINE__, NULL);
         _exit(1);
       }
   }


--- NEW FILE cpm.pod ---
=head1 NAME

cpm - Console Password Manager

=head1 SYNOPSIS

cpm [--config FILE] [--configtest] [--encoding] [--file FILE] [--help]
    [--key KEY] [--noencryption] [--readonly] [--security] [--testrun TYPE]
    [--version] [PATH]

=head1 DESCRIPTION

Keep a password database safe and encrypted.

=head1 OPTIONS

=over 8

=item B<-c>, B<--config>

configuration file to use [~/.cpmrc]

=item B<--configtest>

verify the configuration file and exit

=item B<-e>, B<--encoding>

the encoding in which keyboard input arrives [ISO-8859-1]

=item B<-f>, B<--file>

database file to use [~/.cpmdb]

=item B<-h>, B<--help>

display this help

=item B<--key>

overwrite the default encryption keys and use this key instead; repeat for several keys

=item B<--noencryption>

turn off file encryption WARNING: THIS IS  FOR  DEVELOPMENT  AND TESTING ONLY!

=item B<-r>, B<--readonly>

open the database in read-only mode

=item B<-s>, B<--security>

run a security check and show the current security status

=item B<--testrun>

run one of the testmodes

backup run test on the backupfile creation

compress[fB-6]
     run compression test 1-6

decrypt
     run test on the decryption code

encrypt
     run test on the encryption code

environment
     run test on the environment validation

garbage
     run test on garbage input files

searchpattern
     run  test on the search patterns This only works when the
     application has been compiled with the compiler flag - DTEST_OPTION.

=item B<--version>

display the version and exit

=head1 KEYS

=over 8

=item B<^A>

add a new node to the current node.

=item B<^D>

delete  the currently selected node and all its subnodes.

=item B<^E>

edit the currently selected node.

=item B<^H>

show the help screen.

=item B<^K>

edit the currently used encryption keys.

=item B<^N>

edit the name of the current level.

=item B<^O>

edit the comment of the selected node.

=item B<^P>

edit the current node and suggest a password.

=item B<^W>

write the database to disk.

=head1 ENVIRONMENT

The following environment variables are used by the application,
all other variables are discarded at program startup:

=item B<GNUPGHOME>

If set directory used instead of "~/.gnupg".

=item B<GPG_AGENT_INFO>

Used  to  locate the gpg-agent

=item B<HOME>

Used to locate the default home directory.

=item B<LANG>

Used to determine the user???s language.

=item B<COLUMNS>

Used to size some displays to the full size of the screen.

=item B<LINES>

Used to size some displays to the full size of the screen.

=item B<TERMCAP>

Terminal settings of the currently used terminal.

=item B<TERM>

Terminal settings of the currently used terminal.

=head1 IMPORT

The data import utilities are installed in /usr/share/cpm and the following formats can be imported:

=item . csv

=item . passwordsafe

=item . pms

=head1 SEE ALSO

gpg(1)

=head1 REPORTING BUGS

Report bugs to <harry_b at mm.st>.

=head1 COPYRIGHT

Copyright (C) 2005, 2006 Harry Brueckner

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 any later
version.  This program is distributed in the hope that it will be  use-
ful,  but  WITHOUT  ANY  WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the  GNU  Gen-
eral  Public License for more details.  You should have received a copy
of the GNU General Public License along  with  this  program;  if  not,
write  to  the  Free  Software  Foundation, Inc., 51 Franklin St, Fifth
Floor, Boston, MA 02110-1301, USA.

Contact: Harry Brueckner <harry_b at mm.st> Muenchener Strasse  12a  85253
Kleinberghofen Germany


--- NEW FILE cpm.spec ---
Name:		cpm
Version:	0.23
Release:	0.1.beta%{?dist}
Summary:	Console Password Manager

Group:		Applications/Databases
License:	GPLv2+
URL:		http://www.harry-b.de/dokuwiki/doku.php?id=harry:cpm
Source0:	http://dl.sf.net/%{name}/%{name}-%{version}beta.tar.gz
Source1:	cpm.pod
Patch0:		cpm-0.23beta-make.patch
Patch1:		cpm-0.23beta-disclaimer.patch
Patch2:		cpm-0.23beta-sigint.patch
Patch3:		cpm-0.23beta-open.patch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	cracklib-devel, cracklib-dicts
BuildRequires:	gpgme-devel
BuildRequires:	cdk-devel
BuildRequires:	dotconf-devel 
BuildRequires:	ncurses-devel
BuildRequires:	libxml2-devel >= 2.6.16,
BuildRequires:	zlib-devel
BuildRequires:	gettext

%description
CPM is a ncurses based console tool to manage passwords
and store them public key encrypted in a file - even for
more than one person. The encryption is handled via GnuPG
so the programs data can be accessed via gpg as well,
in case you want to have a look inside. The data is stored
as as zlib compressed XML so it???s even possible to reuse
the data for some other purpose.

%prep
%setup -q -n %{name}-%{version}beta
%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1
for file in docs/changelog docs/ChangeLog docs/cpm.txt docs/GPLv2 docs/README; do
	mv $file timestamp
	iconv -f ISO-8859-1 -t UTF-8 -o $file timestamp
	touch -r timestamp $file
done

%build
%configure --with-crack-dict=%{_libdir}/cracklib_dict CFLAGS="-I/usr/include/cdk/ %{optflags}" 
make %{?_smp_mflags} 
pod2man --release=%{name}-%{version}beta --center="%{summary}" --name=%{name} %{SOURCE1} ./docs/cpm.1

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT mandir="%{_mandir}"
install -D -p -m 644 conf/cpmrc-default $RPM_BUILD_ROOT%{_sysconfdir}/cpmrc
%find_lang %{name}

%clean
rm -rf $RPM_BUILD_ROOT


%files -f %{name}.lang
%defattr(-,root,root,-)
%doc conf/cpmrc-default docs/ChangeLog docs/changelog docs/GPLv2 docs/README ./share/cpm/*
%attr (4755,root,root) %{_bindir}/cpm
%config(noreplace) %{_sysconfdir}/cpmrc
%{_mandir}/man1/cpm*

%changelog
* Mon Jan 5 2009 Marek Mahut <mmahut at fedoraproject.org> - 0.23beta-1
- Initial build


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cpm/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	11 Jan 2009 16:57:09 -0000	1.1
+++ sources	11 Jan 2009 18:04:27 -0000	1.2
@@ -0,0 +1 @@
+55912d0a716450b2ee338a7885d3a213  cpm-0.23beta.tar.gz



From romal at fedoraproject.org  Sun Jan 11 18:07:21 2009
From: romal at fedoraproject.org (Robert M. Albrecht)
Date: Sun, 11 Jan 2009 18:07:21 +0000 (UTC)
Subject: rpms/nagios/F-10 nagios.spec,1.64,1.65
Message-ID: <20090111180721.B30CE70139@cvs1.fedora.phx.redhat.com>

Author: romal

Update of /cvs/pkgs/rpms/nagios/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31636

Modified Files:
	nagios.spec 
Log Message:
CVS hickup



Index: nagios.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nagios/F-10/nagios.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- nagios.spec	6 Jan 2009 17:41:07 -0000	1.64
+++ nagios.spec	11 Jan 2009 18:06:51 -0000	1.65
@@ -203,6 +203,9 @@
 %{_includedir}/%{name}
 
 %changelog
+* Sun Jan 11 2009  Robert M. Albrecht <fedora at romal.de> 3.0.6-2
+- I messed my CVS up
+
 * Tue Dec 02 2008  Robert M. Albrecht <fedora at romal.de> 3.0.6-1
 - Upstream released a new version
 



From romal at fedoraproject.org  Sun Jan 11 18:08:50 2009
From: romal at fedoraproject.org (Robert M. Albrecht)
Date: Sun, 11 Jan 2009 18:08:50 +0000 (UTC)
Subject: rpms/nagios/F-10 nagios.spec,1.65,1.66
Message-ID: <20090111180851.0162970139@cvs1.fedora.phx.redhat.com>

Author: romal

Update of /cvs/pkgs/rpms/nagios/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31864

Modified Files:
	nagios.spec 
Log Message:
typo in nagios.spec



Index: nagios.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nagios/F-10/nagios.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- nagios.spec	11 Jan 2009 18:06:51 -0000	1.65
+++ nagios.spec	11 Jan 2009 18:08:20 -0000	1.66
@@ -1,7 +1,7 @@
 Name: nagios
 
 Version: 3.0.6
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: Host/service/network monitoring program
 
 Group: Applications/System



From tanguy at fedoraproject.org  Sun Jan 11 18:12:33 2009
From: tanguy at fedoraproject.org (Eric Tanguy)
Date: Sun, 11 Jan 2009 18:12:33 +0000 (UTC)
Subject: rpms/scidavis/F-9 scidavis-0.1.3-sip.patch, 1.1, 1.2 scidavis.spec, 
	1.4, 1.5
Message-ID: <20090111181233.4391670139@cvs1.fedora.phx.redhat.com>

Author: tanguy

Update of /cvs/extras/rpms/scidavis/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32292

Modified Files:
	scidavis-0.1.3-sip.patch scidavis.spec 
Log Message:


scidavis-0.1.3-sip.patch:

Index: scidavis-0.1.3-sip.patch
===================================================================
RCS file: /cvs/extras/rpms/scidavis/F-9/scidavis-0.1.3-sip.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- scidavis-0.1.3-sip.patch	7 Jan 2009 18:38:06 -0000	1.1
+++ scidavis-0.1.3-sip.patch	11 Jan 2009 18:12:02 -0000	1.2
@@ -1,5 +1,5 @@
---- scidavis-0.1.3.orig/scidavis/src/scidavis.sip	2007-07-21 21:32:13.000000000 +0100
-+++ scidavis-0.1.3/scidavis/src/scidavis.sip	2009-01-07 11:12:51.000000000 +0000
+--- scidavis-0.1.3/scidavis/src/scidavis.sip	2008/09/27 20:04:46	991
++++ scidavis-0.1.3/scidavis/src/scidavis.sip	2009/01/11 11:57:53	1025
 @@ -78,8 +78,6 @@
    MyWidget(const MyWidget&);
  };
@@ -9,31 +9,34 @@
  class Table: MyWidget
  {
  %TypeHeaderCode
-@@ -1027,7 +1025,6 @@
-   SIPSCIDAVIS_APP(new sipInterpolation(app, a0, *a1, a2, a3, a4))
+@@ -1028,7 +1026,7 @@
  %End
  
--  void setMethod(int n);
-   void setMethod(InterpolationMethod m);
+   void setMethod(int n);
+-  void setMethod(InterpolationMethod m);
++  void setMethod(InterpolationMethod m /Constrained/);
    bool run();
  };
-@@ -1051,7 +1048,6 @@
-   SIPSCIDAVIS_APP(new sipSmoothFilter(app, a0, *a1, a2, a3, a4))
+ 
+@@ -1052,7 +1050,7 @@
  %End
  
--  void setMethod(int);
-   void setMethod(SmoothMethod);
+   void setMethod(int);
+-  void setMethod(SmoothMethod);
++  void setMethod(SmoothMethod /Constrained/);
  
    void setSmoothPoints(int, int = 0);
-@@ -1079,7 +1075,6 @@
-   SIPSCIDAVIS_APP(new sipFFTFilter(app, a0, *a1, a2, a3, a4))
+   void setPolynomOrder(int);
+@@ -1080,7 +1078,7 @@
  %End
  
--  void setFilterType(int);
-   void setFilterType(FilterType);
+   void setFilterType(int);
+-  void setFilterType(FilterType);
++  void setFilterType(FilterType /Constrained/);
  
    void setCutoff(double);
-@@ -1194,7 +1189,7 @@
+   void setBand(double, double);
+@@ -1194,7 +1192,7 @@
  #include "src/Folder.h"
  %End
  public:
@@ -42,3 +45,4 @@
  // TODO: implement signal Folder::nameChanged and make it update the project explorer; adjust renaming from GUI accordingly
  //  void setFolderName(const QString&) /PyName=setName/;
    QString name();
+


Index: scidavis.spec
===================================================================
RCS file: /cvs/extras/rpms/scidavis/F-9/scidavis.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- scidavis.spec	7 Jan 2009 18:38:06 -0000	1.4
+++ scidavis.spec	11 Jan 2009 18:12:02 -0000	1.5
@@ -1,7 +1,7 @@
 Summary:	Scientific Data Analysis and Visualization
 Name:		scidavis
 Version:	0.1.3
-Release: 	5%{?dist}
+Release: 	7%{?dist}
 Source0:	http://download.sourceforge.net/sourceforge/scidavis/%{name}-%{version}.tar.bz2
 Source1:	http://download.sourceforge.net/sourceforge/scidavis/scidavis-manual-0.1_2008-02-28.tar.bz2
 Patch0:		scidavis-0.1.3-pro.patch
@@ -100,6 +100,12 @@
 %doc manual/*
 
 %changelog
+* Sun Jan 11 2009 Eric Tanguy <eric.tanguy at univ-nantes.fr> - 0.1.3-7
+- Replace the sip patch by a better one from upstream
+
+* Sun Jan 11 2009 Eric Tanguy <eric.tanguy at univ-nantes.fr> - 0.1.3-6
+- Replace the sip patch by the one from upstream
+
 * Wed Jan 07 2009 Eric Tanguy <eric.tanguy at univ-nantes.fr> - 0.1.3-5
 - Rebuild
 



From tanguy at fedoraproject.org  Sun Jan 11 18:14:50 2009
From: tanguy at fedoraproject.org (Eric Tanguy)
Date: Sun, 11 Jan 2009 18:14:50 +0000 (UTC)
Subject: rpms/scidavis/F-10 scidavis-0.1.3-sip.patch, 1.1, 1.2 scidavis.spec,
	1.5, 1.6
Message-ID: <20090111181450.762E070139@cvs1.fedora.phx.redhat.com>

Author: tanguy

Update of /cvs/extras/rpms/scidavis/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32544

Modified Files:
	scidavis-0.1.3-sip.patch scidavis.spec 
Log Message:


scidavis-0.1.3-sip.patch:

Index: scidavis-0.1.3-sip.patch
===================================================================
RCS file: /cvs/extras/rpms/scidavis/F-10/scidavis-0.1.3-sip.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- scidavis-0.1.3-sip.patch	7 Jan 2009 18:20:15 -0000	1.1
+++ scidavis-0.1.3-sip.patch	11 Jan 2009 18:14:50 -0000	1.2
@@ -1,5 +1,5 @@
---- scidavis-0.1.3.orig/scidavis/src/scidavis.sip	2007-07-21 21:32:13.000000000 +0100
-+++ scidavis-0.1.3/scidavis/src/scidavis.sip	2009-01-07 11:12:51.000000000 +0000
+--- scidavis-0.1.3/scidavis/src/scidavis.sip	2008/09/27 20:04:46	991
++++ scidavis-0.1.3/scidavis/src/scidavis.sip	2009/01/11 11:57:53	1025
 @@ -78,8 +78,6 @@
    MyWidget(const MyWidget&);
  };
@@ -9,31 +9,34 @@
  class Table: MyWidget
  {
  %TypeHeaderCode
-@@ -1027,7 +1025,6 @@
-   SIPSCIDAVIS_APP(new sipInterpolation(app, a0, *a1, a2, a3, a4))
+@@ -1028,7 +1026,7 @@
  %End
  
--  void setMethod(int n);
-   void setMethod(InterpolationMethod m);
+   void setMethod(int n);
+-  void setMethod(InterpolationMethod m);
++  void setMethod(InterpolationMethod m /Constrained/);
    bool run();
  };
-@@ -1051,7 +1048,6 @@
-   SIPSCIDAVIS_APP(new sipSmoothFilter(app, a0, *a1, a2, a3, a4))
+ 
+@@ -1052,7 +1050,7 @@
  %End
  
--  void setMethod(int);
-   void setMethod(SmoothMethod);
+   void setMethod(int);
+-  void setMethod(SmoothMethod);
++  void setMethod(SmoothMethod /Constrained/);
  
    void setSmoothPoints(int, int = 0);
-@@ -1079,7 +1075,6 @@
-   SIPSCIDAVIS_APP(new sipFFTFilter(app, a0, *a1, a2, a3, a4))
+   void setPolynomOrder(int);
+@@ -1080,7 +1078,7 @@
  %End
  
--  void setFilterType(int);
-   void setFilterType(FilterType);
+   void setFilterType(int);
+-  void setFilterType(FilterType);
++  void setFilterType(FilterType /Constrained/);
  
    void setCutoff(double);
-@@ -1194,7 +1189,7 @@
+   void setBand(double, double);
+@@ -1194,7 +1192,7 @@
  #include "src/Folder.h"
  %End
  public:
@@ -42,3 +45,4 @@
  // TODO: implement signal Folder::nameChanged and make it update the project explorer; adjust renaming from GUI accordingly
  //  void setFolderName(const QString&) /PyName=setName/;
    QString name();
+


Index: scidavis.spec
===================================================================
RCS file: /cvs/extras/rpms/scidavis/F-10/scidavis.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- scidavis.spec	7 Jan 2009 18:20:15 -0000	1.5
+++ scidavis.spec	11 Jan 2009 18:14:50 -0000	1.6
@@ -1,7 +1,7 @@
 Summary:	Scientific Data Analysis and Visualization
 Name:		scidavis
 Version:	0.1.3
-Release: 	5%{?dist}
+Release: 	7%{?dist}
 Source0:	http://download.sourceforge.net/sourceforge/scidavis/%{name}-%{version}.tar.bz2
 Source1:	http://download.sourceforge.net/sourceforge/scidavis/scidavis-manual-0.1_2008-02-28.tar.bz2
 Patch0:		scidavis-0.1.3-pro.patch
@@ -100,6 +100,12 @@
 %doc manual/*
 
 %changelog
+* Sun Jan 11 2009 Eric Tanguy <eric.tanguy at univ-nantes.fr> - 0.1.3-7
+- Replace the sip patch by a better one from upstream
+
+* Sun Jan 11 2009 Eric Tanguy <eric.tanguy at univ-nantes.fr> - 0.1.3-6
+- Replace the sip patch by the one from upstream
+
 * Wed Jan 07 2009 Eric Tanguy <eric.tanguy at univ-nantes.fr> - 0.1.3-5
 - Rebuild
 



From romal at fedoraproject.org  Sun Jan 11 18:21:36 2009
From: romal at fedoraproject.org (Robert M. Albrecht)
Date: Sun, 11 Jan 2009 18:21:36 +0000 (UTC)
Subject: rpms/nagios/devel nagios.spec,1.64,1.65
Message-ID: <20090111182136.82F0170139@cvs1.fedora.phx.redhat.com>

Author: romal

Update of /cvs/pkgs/rpms/nagios/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv475

Modified Files:
	nagios.spec 
Log Message:
CVS hickup



Index: nagios.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nagios/devel/nagios.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- nagios.spec	2 Dec 2008 21:23:44 -0000	1.64
+++ nagios.spec	11 Jan 2009 18:21:05 -0000	1.65
@@ -1,7 +1,7 @@
 Name: nagios
 
 Version: 3.0.6
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: Host/service/network monitoring program
 
 Group: Applications/System
@@ -203,6 +203,9 @@
 %{_includedir}/%{name}
 
 %changelog
+* Sun Jan 11 2009  Robert M. Albrecht <fedora at romal.de> 3.0.6-2
+- I messed my CVS up
+
 * Tue Dec 02 2008  Robert M. Albrecht <fedora at romal.de> 3.0.6-1
 - Upstream released a new version
 



From pfj at fedoraproject.org  Sun Jan 11 18:23:09 2009
From: pfj at fedoraproject.org (Paul F. Johnson)
Date: Sun, 11 Jan 2009 18:23:09 +0000 (UTC)
Subject: rpms/mono/devel .cvsignore, 1.33, 1.34 import.log, 1.32,
	1.33 mono.spec, 1.105, 1.106 sources, 1.39, 1.40
Message-ID: <20090111182309.4BA9B70139@cvs1.fedora.phx.redhat.com>

Author: pfj

Update of /cvs/pkgs/rpms/mono/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv888/devel

Modified Files:
	.cvsignore import.log mono.spec sources 
Log Message:

Added gettext-devel
Update from svn
Removed mono-api-diff and transform from the spec file
Fixes for winforms (breaks on some x86 boxes) 



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mono/devel/.cvsignore,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- .cvsignore	11 Jan 2009 00:30:08 -0000	1.33
+++ .cvsignore	11 Jan 2009 18:22:38 -0000	1.34
@@ -1 +1 @@
-mono-122990.tar.bz2
+mono-122994.tar.bz2


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/mono/devel/import.log,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- import.log	11 Jan 2009 00:30:08 -0000	1.32
+++ import.log	11 Jan 2009 18:22:38 -0000	1.33
@@ -30,3 +30,4 @@
 mono-2_2-15_RC1_20081231svn122288_fc11:HEAD:mono-2.2-15.RC1.20081231svn122288.fc11.src.rpm:1230743514
 mono-2_2-15_RC1_20090401svn122388_fc11:HEAD:mono-2.2-15.RC1.20090401svn122388.fc11.src.rpm:1231110581
 mono-2_2-16_RC2_20091001svn122990_fc11:HEAD:mono-2.2-16.RC2.20091001svn122990.fc11.src.rpm:1231633729
+mono-2_2-17_RC2_20091101svn122994_fc11:HEAD:mono-2.2-17.RC2.20091101svn122994.fc11.src.rpm:1231698016


Index: mono.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mono/devel/mono.spec,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -r1.105 -r1.106
--- mono.spec	11 Jan 2009 00:30:08 -0000	1.105
+++ mono.spec	11 Jan 2009 18:22:38 -0000	1.106
@@ -1,8 +1,8 @@
-%define svnver 122990
+%define svnver 122994
 
 Name:		mono
 Version:        2.2
-Release:        16.RC2.20091001svn%{svnver}%{?dist}
+Release:        17.RC2.20091101svn%{svnver}%{?dist}
 Summary:        A .NET runtime environment
 
 Group:          Development/Languages
@@ -23,7 +23,7 @@
 BuildRequires:  libunwind-devel
 %endif
 # Required for mono-libdir.patch
-BuildRequires: automake libtool
+BuildRequires: automake libtool gettext-devel
 Obsoletes:     monodoc, monodoc-devel
 
 # Yes, mono actually depends on itself, because
@@ -688,11 +688,12 @@
 %{_libdir}/pkgconfig/monodoc.pc
 
 %changelog
-* Sat Jan 10 2009 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.2-16.RC2.20091001svn122990
+* Sun Jan 11 2009 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.2-17.RC2.20091101svn122991
 - Updates from svn
 - Change to RC2
 - Removed mono-api-diff.exe and transform.exe from spec
 - Fixes some problems with winforms on some boxes
+- Added gettext-devel
 
 * Sun Jan 04 2009 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.2-15.RC1.20090401svn122388
 - Updates from svn


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mono/devel/sources,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- sources	11 Jan 2009 00:30:09 -0000	1.39
+++ sources	11 Jan 2009 18:22:38 -0000	1.40
@@ -1 +1 @@
-27fc7a2411b72b013420576412b8df24  mono-122990.tar.bz2
+6edeb8509dfab121ffae95fe355e56d8  mono-122994.tar.bz2



From pfj at fedoraproject.org  Sun Jan 11 18:26:07 2009
From: pfj at fedoraproject.org (Paul F. Johnson)
Date: Sun, 11 Jan 2009 18:26:07 +0000 (UTC)
Subject: rpms/mono-tools/devel .cvsignore, 1.10, 1.11 import.log, 1.19,
	1.20 mono-tools.spec, 1.24, 1.25 sources, 1.11, 1.12
Message-ID: <20090111182607.8DEEC70139@cvs1.fedora.phx.redhat.com>

Author: pfj

Update of /cvs/pkgs/rpms/mono-tools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2018/devel

Modified Files:
	.cvsignore import.log mono-tools.spec sources 
Log Message:

Update from svn 



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mono-tools/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	11 Jan 2009 00:42:25 -0000	1.10
+++ .cvsignore	11 Jan 2009 18:25:36 -0000	1.11
@@ -1 +1 @@
-mono-tools-122974.tar.bz2
+mono-tools-122993.tar.bz2


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/mono-tools/devel/import.log,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- import.log	11 Jan 2009 00:42:25 -0000	1.19
+++ import.log	11 Jan 2009 18:25:36 -0000	1.20
@@ -17,3 +17,4 @@
 mono-tools-2_2-9_RC1_20081230svn122166_fc11:HEAD:mono-tools-2.2-9.RC1.20081230svn122166.fc11.src.rpm:1230647227
 mono-tools-2_2-9_RC1_20090104svn122377_fc11:HEAD:mono-tools-2.2-9.RC1.20090104svn122377.fc11.src.rpm:1231110855
 mono-tools-2_2-10_RC2_20090110svn122974_fc11:HEAD:mono-tools-2.2-10.RC2.20090110svn122974.fc11.src.rpm:1231634505
+mono-tools-2_2-10_RC2_20090111svn122993_fc11:HEAD:mono-tools-2.2-10.RC2.20090111svn122993.fc11.src.rpm:1231698297


Index: mono-tools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mono-tools/devel/mono-tools.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- mono-tools.spec	11 Jan 2009 00:42:25 -0000	1.24
+++ mono-tools.spec	11 Jan 2009 18:25:36 -0000	1.25
@@ -1,10 +1,10 @@
 %define debug_package %{nil}
-%define svnver 122974
+%define svnver 122993
 
 Summary: A collection of tools for mono applications
 Name: mono-tools
 Version: 2.2
-Release: 10.RC2.20090110svn%{svnver}%{?dist}
+Release: 10.RC2.20090111svn%{svnver}%{?dist}
 License: MIT
 Group: Development/Tools
 Source0: %{name}-%{svnver}.tar.bz2
@@ -133,7 +133,7 @@
 %{_libdir}/monodoc/sources/Gendarme*
 
 %changelog
-* Sat Jan 10 2009  Paul F. Johnson <paul at all-the-johnsons.co.uk> -.2.2-10.RC2.20090110svn122974
+* Sun Jan 11 2009  Paul F. Johnson <paul at all-the-johnsons.co.uk> -.2.2-10.RC2.20090111svn122974
 - update from svn
 - bump to RC2
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mono-tools/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	11 Jan 2009 00:42:25 -0000	1.11
+++ sources	11 Jan 2009 18:25:36 -0000	1.12
@@ -1 +1 @@
-da1063ec1aa08c5c6177f1c2b7d3b5f6  mono-tools-122974.tar.bz2
+a377426ffb354626e06fc2c91f81d322  mono-tools-122993.tar.bz2



From rakesh at fedoraproject.org  Sun Jan 11 18:29:34 2009
From: rakesh at fedoraproject.org (Rakesh Pandit)
Date: Sun, 11 Jan 2009 18:29:34 +0000 (UTC)
Subject: rpms/gdmap/devel import.log, NONE, 1.1 .cvsignore, 1.2,
	1.3 gdmap.spec, 
	1.9, 1.10 sources, 1.2, 1.3 gdmap-0.8.1-desktop.patch, 1.1, NONE
Message-ID: <20090111182934.DE40A70139@cvs1.fedora.phx.redhat.com>

Author: rakesh

Update of /cvs/pkgs/rpms/gdmap/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2460/devel

Modified Files:
	.cvsignore gdmap.spec sources 
Added Files:
	import.log 
Removed Files:
	gdmap-0.8.1-desktop.patch 
Log Message:
Updated to 0.8.1 and fixed license issue.
Fixed unowned directories and spance tab mix issue.



--- NEW FILE import.log ---
gdmap-0_8_1-1_fc10:HEAD:gdmap-0.8.1-1.fc10.src.rpm:1231698330


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gdmap/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	7 Jul 2006 13:37:38 -0000	1.2
+++ .cvsignore	11 Jan 2009 18:29:04 -0000	1.3
@@ -1 +1 @@
-gdmap-0.7.5.tar.gz
+gdmap-0.8.1.tar.gz


Index: gdmap.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdmap/devel/gdmap.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- gdmap.spec	4 Dec 2008 18:52:12 -0000	1.9
+++ gdmap.spec	11 Jan 2009 18:29:04 -0000	1.10
@@ -1,17 +1,15 @@
 Name:	gdmap
 Version:	0.8.1
-Release:	2%{?dist}
+Release:	1%{?dist}
 Summary:	A tool which allows to visualize disk space
 
 Group:	Applications/System
-# No version specified.
-License:	GPL+
+License:	GPLv2
 URL:	http://gdmap.sourceforge.net
-Source0:	http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
-Patch0:         %{name}-0.8.1-desktop.patch
+Source0:	http://belnet.dl.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  gtk2-devel, libxml2-devel, desktop-file-utils, gettext, intltool, pkgconfig
+BuildRequires:  gtk2-devel, libxml2-devel, desktop-file-utils, gettext, intltool
 
 %description
 GdMap is a tool which allows you to visualize disk space with one single
@@ -20,7 +18,7 @@
 
 %prep
 %setup -q
-%patch0 -p1
+
 
 %build
 %configure
@@ -31,11 +29,14 @@
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
+sed -i -e 's|gdmap_icon\.png|gdmap_icon|g' \
+  -e 's|^Version=.*$|Version=1.0|g' \
+  $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
 
-desktop-file-install --vendor fedora --delete-original \
-  --add-category X-Fedora                              \
-  --add-category System                                \
-  --dir $RPM_BUILD_ROOT%{_datadir}/applications        \
+desktop-file-install --vendor "" --delete-original	\
+  --add-category X-Fedora				\
+  --add-category System					\
+  --dir $RPM_BUILD_ROOT%{_datadir}/applications		\
   $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
 
 %find_lang GdMap
@@ -48,26 +49,18 @@
 %defattr(-,root,root,-)
 %doc COPYING
 %{_bindir}/%{name}
-%{_datadir}/applications/*.desktop
 %dir %{_datadir}/%{name}
-%dir %{_datadir}/%{name}/pixmaps
-%{_datadir}/%{name}/pixmaps/%{name}*
-%{_datadir}/pixmaps/%{name}*
+%{_datadir}/%{name}/
+%{_datadir}/applications/*.desktop
+#%{_datadir}/%{name}/pixmaps/*
+%{_datadir}/pixmaps/*
 %{_mandir}/man1/*
 
 
 %changelog
-* Thu Dec  4 2008 Michael Schwendt <mschwendt at fedoraproject.org> - 0.8.1-2
-- Include unowned /usr/share/gdmap/pixmaps directory.
-
-* 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
-
-* Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.7.5-7
-- Autorebuild for GCC 4.3
+* Sun Jan 11 2009 Rakesh Pandit <rakesh at fedoraproject.org> - 0.8.1-1
+- Updated to 0.8.1, fixed .desktop file and license tag.
+- Fixed Unowned directories.
 
 * Mon Oct 16 2006 Damien Durand <splinux at fedoraproject.org> - 0.7.5-6
 - Bumped


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gdmap/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	7 Jul 2006 13:37:38 -0000	1.2
+++ sources	11 Jan 2009 18:29:04 -0000	1.3
@@ -1 +1 @@
-e27f9a4c029449182ce5a4dbec38870e  gdmap-0.7.5.tar.gz
+54b43354dbe774810104607ad1eaaed3  gdmap-0.8.1.tar.gz


--- gdmap-0.8.1-desktop.patch DELETED ---



From kevin at fedoraproject.org  Sun Jan 11 18:35:24 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 11 Jan 2009 18:35:24 +0000 (UTC)
Subject: rpms/munin/devel munin.spec,1.18,1.19
Message-ID: <20090111183524.CB5C470139@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/munin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3418

Modified Files:
	munin.spec 
Log Message:
Switch to using dejavu-fonts instead of bitstream-vera



Index: munin.spec
===================================================================
RCS file: /cvs/extras/rpms/munin/devel/munin.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- munin.spec	5 Jan 2009 05:03:50 -0000	1.18
+++ munin.spec	11 Jan 2009 18:34:54 -0000	1.19
@@ -1,6 +1,6 @@
 Name:      munin
 Version:   1.2.6
-Release:   4%{?dist}
+Release:   5%{?dist}
 Summary:   Network-wide graphing framework (grapher/gatherer)
 License:   GPLv2 and Bitstream Vera
 Group:     System Environment/Daemons
@@ -25,7 +25,7 @@
 Requires: logrotate
 Requires(pre): shadow-utils
 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
-Requires: bitstream-vera-fonts-sans-mono
+Requires: dejavu-fonts
 
 %description
 Munin is a highly flexible and powerful solution used to create graphs of
@@ -150,7 +150,7 @@
 
 # Use font from bitstream-vera-fonts-sans-mono
 rm -f $RPM_BUILD_ROOT/%{_datadir}/munin/VeraMono.ttf
-ln -s /usr/share/fonts/bitstream-vera/VeraMono.ttf $RPM_BUILD_ROOT/%{_datadir}/munin/VeraMono.ttf
+ln -s /usr/share/fonts/dejavu/DejaVuSansMono.ttf $RPM_BUILD_ROOT/%{_datadir}/munin/VeraMono.ttf
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -246,6 +246,9 @@
 %doc %{_mandir}/man5/munin-node*
 
 %changelog
+* Sun Jan 11 2009 Kevin Fenzi <kevin at tummy.com> - 1.2.6-5
+- Switch to using dejavu-fonts instead of bitstream-vera
+
 * Sun Jan 04 2009 Kevin Fenzi <kevin at tummy.com> - 1.2.6-4
 - Require bitstream-vera-fonts-sans-mono for Font (fixes #477428)
 



From tuxbrewr at fedoraproject.org  Sun Jan 11 18:40:16 2009
From: tuxbrewr at fedoraproject.org (Steven M. Parrish)
Date: Sun, 11 Jan 2009 18:40:16 +0000 (UTC)
Subject: rpms/liferea/devel .cvsignore, 1.78, 1.79 liferea.spec, 1.126,
	1.127 sources, 1.79, 1.80
Message-ID: <20090111184016.BC16570139@cvs1.fedora.phx.redhat.com>

Author: tuxbrewr

Update of /cvs/pkgs/rpms/liferea/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4133

Modified Files:
	.cvsignore liferea.spec sources 
Log Message:
New upstream release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/liferea/devel/.cvsignore,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- .cvsignore	26 Nov 2008 01:03:13 -0000	1.78
+++ .cvsignore	11 Jan 2009 18:39:45 -0000	1.79
@@ -1 +1 @@
-liferea-1.4.22d.tar.gz
+liferea-1.4.23.tar.gz


Index: liferea.spec
===================================================================
RCS file: /cvs/pkgs/rpms/liferea/devel/liferea.spec,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -r1.126 -r1.127
--- liferea.spec	26 Nov 2008 01:03:14 -0000	1.126
+++ liferea.spec	11 Jan 2009 18:39:46 -0000	1.127
@@ -1,8 +1,8 @@
 %define gecko_ver 1.8.1.14
 
 Name:           liferea
-Version:        1.4.22d
-Release: 	1%{?dist}
+Version:        1.4.23
+Release:	1%{?dist}
 Summary:        An RSS/RDF feed reader
 
 Group:          Applications/Internet
@@ -30,9 +30,9 @@
 BuildRequires:  intltool >= 0.35.0
 BuildRequires:  WebKit-gtk-devel
 BuildRequires:  prelink
-Requires: sqlite
+Requires: 	sqlite
 
-Requires(pre): GConf2
+Requires(pre): 	GConf2
 Requires(post): GConf2
 Requires(preun): GConf2
 
@@ -43,9 +43,9 @@
 browse through their items, and show their contents.
 
 %package WebKit
-Summary: WebKit support for Liferea
-Group: Applications/Internet
-Requires: liferea = %{version}
+Summary: 	WebKit support for Liferea
+Group:		Applications/Internet
+Requires: 	liferea = %{version}
 %description WebKit
 %{Summary}
 
@@ -128,6 +128,9 @@
 %{_libdir}/%{name}/liblihtmlw.so
 
 %changelog
+* Sun Jan 11 2009 Steven M. Parrish <tuxbrewr at fedoraproject.org> 1.4.23
+- New upstream release
+
 * Sat Nov 22 2008 Steven M. Parrish <smparrish at shallowcreek.net> 1.4.22d-1
 - New upstream release
 - should fix #472636 #469351 #467083 #467874 #468214 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/liferea/devel/sources,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- sources	26 Nov 2008 01:03:14 -0000	1.79
+++ sources	11 Jan 2009 18:39:46 -0000	1.80
@@ -1 +1 @@
-0a942170ee16a61330982a1cbc7f936f  liferea-1.4.22d.tar.gz
+7772f04bd3ed995b7ce36e52d26ec088  liferea-1.4.23.tar.gz



From rakesh at fedoraproject.org  Sun Jan 11 18:41:58 2009
From: rakesh at fedoraproject.org (Rakesh Pandit)
Date: Sun, 11 Jan 2009 18:41:58 +0000 (UTC)
Subject: rpms/gdmap/F-10 import.log, NONE, 1.1 .cvsignore, 1.2,
	1.3 gdmap.spec, 
	1.8, 1.9 sources, 1.2, 1.3 gdmap-0.8.1-desktop.patch, 1.1, NONE
Message-ID: <20090111184158.158C070139@cvs1.fedora.phx.redhat.com>

Author: rakesh

Update of /cvs/pkgs/rpms/gdmap/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4364/F-10

Modified Files:
	.cvsignore gdmap.spec sources 
Added Files:
	import.log 
Removed Files:
	gdmap-0.8.1-desktop.patch 
Log Message:
Updated to 0.8.1 and fixed license issue.
Fixed unowned directories and spance tab mix issue.



--- NEW FILE import.log ---
gdmap-0_8_1-1_fc10:F-10:gdmap-0.8.1-1.fc10.src.rpm:1231699066


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gdmap/F-10/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	7 Jul 2006 13:37:38 -0000	1.2
+++ .cvsignore	11 Jan 2009 18:41:27 -0000	1.3
@@ -1 +1 @@
-gdmap-0.7.5.tar.gz
+gdmap-0.8.1.tar.gz


Index: gdmap.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdmap/F-10/gdmap.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- gdmap.spec	17 Sep 2008 03:36:19 -0000	1.8
+++ gdmap.spec	11 Jan 2009 18:41:27 -0000	1.9
@@ -4,14 +4,12 @@
 Summary:	A tool which allows to visualize disk space
 
 Group:	Applications/System
-# No version specified.
-License:	GPL+
+License:	GPLv2
 URL:	http://gdmap.sourceforge.net
-Source0:	http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
-Patch0:         %{name}-0.8.1-desktop.patch
+Source0:	http://belnet.dl.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  gtk2-devel, libxml2-devel, desktop-file-utils, gettext, intltool, pkgconfig
+BuildRequires:  gtk2-devel, libxml2-devel, desktop-file-utils, gettext, intltool
 
 %description
 GdMap is a tool which allows you to visualize disk space with one single
@@ -20,7 +18,7 @@
 
 %prep
 %setup -q
-%patch0 -p1
+
 
 %build
 %configure
@@ -31,11 +29,14 @@
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
+sed -i -e 's|gdmap_icon\.png|gdmap_icon|g' \
+  -e 's|^Version=.*$|Version=1.0|g' \
+  $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
 
-desktop-file-install --vendor fedora --delete-original \
-  --add-category X-Fedora                              \
-  --add-category System                                \
-  --dir $RPM_BUILD_ROOT%{_datadir}/applications        \
+desktop-file-install --vendor "" --delete-original	\
+  --add-category X-Fedora				\
+  --add-category System					\
+  --dir $RPM_BUILD_ROOT%{_datadir}/applications		\
   $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
 
 %find_lang GdMap
@@ -48,22 +49,18 @@
 %defattr(-,root,root,-)
 %doc COPYING
 %{_bindir}/%{name}
-%{_datadir}/applications/*.desktop
 %dir %{_datadir}/%{name}
-%{_datadir}/%{name}/pixmaps/%{name}*
-%{_datadir}/pixmaps/%{name}*
+%{_datadir}/%{name}/
+%{_datadir}/applications/*.desktop
+#%{_datadir}/%{name}/pixmaps/*
+%{_datadir}/pixmaps/*
 %{_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
-
-* Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.7.5-7
-- Autorebuild for GCC 4.3
+* Sun Jan 11 2009 Rakesh Pandit <rakesh at fedoraproject.org> - 0.8.1-1
+- Updated to 0.8.1, fixed .desktop file and license tag.
+- Fixed Unowned directories.
 
 * Mon Oct 16 2006 Damien Durand <splinux at fedoraproject.org> - 0.7.5-6
 - Bumped


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gdmap/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	7 Jul 2006 13:37:38 -0000	1.2
+++ sources	11 Jan 2009 18:41:27 -0000	1.3
@@ -1 +1 @@
-e27f9a4c029449182ce5a4dbec38870e  gdmap-0.7.5.tar.gz
+54b43354dbe774810104607ad1eaaed3  gdmap-0.8.1.tar.gz


--- gdmap-0.8.1-desktop.patch DELETED ---



From tuxbrewr at fedoraproject.org  Sun Jan 11 18:45:03 2009
From: tuxbrewr at fedoraproject.org (Steven M. Parrish)
Date: Sun, 11 Jan 2009 18:45:03 +0000 (UTC)
Subject: rpms/liferea/F-10 .cvsignore, 1.78, 1.79 liferea.spec, 1.126,
	1.127 sources, 1.79, 1.80
Message-ID: <20090111184504.0288E70139@cvs1.fedora.phx.redhat.com>

Author: tuxbrewr

Update of /cvs/pkgs/rpms/liferea/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4896

Modified Files:
	.cvsignore liferea.spec sources 
Log Message:
New upstream release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/liferea/F-10/.cvsignore,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- .cvsignore	26 Nov 2008 01:16:07 -0000	1.78
+++ .cvsignore	11 Jan 2009 18:44:33 -0000	1.79
@@ -1 +1 @@
-liferea-1.4.22d.tar.gz
+liferea-1.4.23.tar.gz


Index: liferea.spec
===================================================================
RCS file: /cvs/pkgs/rpms/liferea/F-10/liferea.spec,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -r1.126 -r1.127
--- liferea.spec	26 Nov 2008 01:17:48 -0000	1.126
+++ liferea.spec	11 Jan 2009 18:44:33 -0000	1.127
@@ -1,8 +1,8 @@
 %define gecko_ver 1.8.1.14
 
 Name:           liferea
-Version:        1.4.22d
-Release: 	1%{?dist}
+Version:        1.4.23
+Release:	1%{?dist}
 Summary:        An RSS/RDF feed reader
 
 Group:          Applications/Internet
@@ -30,9 +30,9 @@
 BuildRequires:  intltool >= 0.35.0
 BuildRequires:  WebKit-gtk-devel
 BuildRequires:  prelink
-Requires: sqlite
+Requires: 	sqlite
 
-Requires(pre): GConf2
+Requires(pre): 	GConf2
 Requires(post): GConf2
 Requires(preun): GConf2
 
@@ -43,9 +43,9 @@
 browse through their items, and show their contents.
 
 %package WebKit
-Summary: WebKit support for Liferea
-Group: Applications/Internet
-Requires: liferea = %{version}
+Summary: 	WebKit support for Liferea
+Group:		Applications/Internet
+Requires: 	liferea = %{version}
 %description WebKit
 %{Summary}
 
@@ -128,6 +128,9 @@
 %{_libdir}/%{name}/liblihtmlw.so
 
 %changelog
+* Sun Jan 11 2009 Steven M. Parrish <tuxbrewr at fedoraproject.org> 1.4.23
+- New upstream release
+
 * Sat Nov 22 2008 Steven M. Parrish <smparrish at shallowcreek.net> 1.4.22d-1
 - New upstream release
 - should fix #472636 #469351 #467083 #467874 #468214 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/liferea/F-10/sources,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- sources	26 Nov 2008 01:16:08 -0000	1.79
+++ sources	11 Jan 2009 18:44:33 -0000	1.80
@@ -1 +1 @@
-0a942170ee16a61330982a1cbc7f936f  liferea-1.4.22d.tar.gz
+7772f04bd3ed995b7ce36e52d26ec088  liferea-1.4.23.tar.gz



From tuxbrewr at fedoraproject.org  Sun Jan 11 18:46:49 2009
From: tuxbrewr at fedoraproject.org (Steven M. Parrish)
Date: Sun, 11 Jan 2009 18:46:49 +0000 (UTC)
Subject: rpms/liferea/F-9 .cvsignore, 1.78, 1.79 liferea.spec, 1.125,
	1.126 sources, 1.79, 1.80
Message-ID: <20090111184649.20AFD70139@cvs1.fedora.phx.redhat.com>

Author: tuxbrewr

Update of /cvs/pkgs/rpms/liferea/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5369

Modified Files:
	.cvsignore liferea.spec sources 
Log Message:
New upstream release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/liferea/F-9/.cvsignore,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- .cvsignore	26 Nov 2008 01:21:06 -0000	1.78
+++ .cvsignore	11 Jan 2009 18:46:18 -0000	1.79
@@ -1 +1 @@
-liferea-1.4.22d.tar.gz
+liferea-1.4.23.tar.gz


Index: liferea.spec
===================================================================
RCS file: /cvs/pkgs/rpms/liferea/F-9/liferea.spec,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -r1.125 -r1.126
--- liferea.spec	26 Nov 2008 01:21:06 -0000	1.125
+++ liferea.spec	11 Jan 2009 18:46:18 -0000	1.126
@@ -1,8 +1,8 @@
 %define gecko_ver 1.8.1.14
 
 Name:           liferea
-Version:        1.4.22d
-Release: 	1%{?dist}
+Version:        1.4.23
+Release:	1%{?dist}
 Summary:        An RSS/RDF feed reader
 
 Group:          Applications/Internet
@@ -30,9 +30,9 @@
 BuildRequires:  intltool >= 0.35.0
 BuildRequires:  WebKit-gtk-devel
 BuildRequires:  prelink
-Requires: sqlite
+Requires: 	sqlite
 
-Requires(pre): GConf2
+Requires(pre): 	GConf2
 Requires(post): GConf2
 Requires(preun): GConf2
 
@@ -43,9 +43,9 @@
 browse through their items, and show their contents.
 
 %package WebKit
-Summary: WebKit support for Liferea
-Group: Applications/Internet
-Requires: liferea = %{version}
+Summary: 	WebKit support for Liferea
+Group:		Applications/Internet
+Requires: 	liferea = %{version}
 %description WebKit
 %{Summary}
 
@@ -128,6 +128,9 @@
 %{_libdir}/%{name}/liblihtmlw.so
 
 %changelog
+* Sun Jan 11 2009 Steven M. Parrish <tuxbrewr at fedoraproject.org> 1.4.23
+- New upstream release
+
 * Sat Nov 22 2008 Steven M. Parrish <smparrish at shallowcreek.net> 1.4.22d-1
 - New upstream release
 - should fix #472636 #469351 #467083 #467874 #468214 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/liferea/F-9/sources,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- sources	26 Nov 2008 01:21:06 -0000	1.79
+++ sources	11 Jan 2009 18:46:18 -0000	1.80
@@ -1 +1 @@
-0a942170ee16a61330982a1cbc7f936f  liferea-1.4.22d.tar.gz
+7772f04bd3ed995b7ce36e52d26ec088  liferea-1.4.23.tar.gz



From romal at fedoraproject.org  Sun Jan 11 18:47:00 2009
From: romal at fedoraproject.org (Robert M. Albrecht)
Date: Sun, 11 Jan 2009 18:47:00 +0000 (UTC)
Subject: rpms/usb_modeswitch/devel .cvsignore, 1.2, 1.3 sources, 1.2,
	1.3 usb_modeswitch.spec, 1.1, 1.2
Message-ID: <20090111184700.9246E70139@cvs1.fedora.phx.redhat.com>

Author: romal

Update of /cvs/pkgs/rpms/usb_modeswitch/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5418

Modified Files:
	.cvsignore sources usb_modeswitch.spec 
Log Message:
new upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/usb_modeswitch/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	1 Jul 2008 18:44:47 -0000	1.2
+++ .cvsignore	11 Jan 2009 18:46:30 -0000	1.3
@@ -1 +1 @@
-usb_modeswitch-0.9.4.tar.bz2
+usb_modeswitch-0.9.6.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/usb_modeswitch/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	1 Jul 2008 18:44:47 -0000	1.2
+++ sources	11 Jan 2009 18:46:30 -0000	1.3
@@ -1 +1 @@
-3c03c3ae51a10d599c33c119693186c9  usb_modeswitch-0.9.4.tar.bz2
+9f5b97b7b0113b0275c4953482f876c3  usb_modeswitch-0.9.6.tar.bz2


Index: usb_modeswitch.spec
===================================================================
RCS file: /cvs/pkgs/rpms/usb_modeswitch/devel/usb_modeswitch.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- usb_modeswitch.spec	1 Jul 2008 18:44:47 -0000	1.1
+++ usb_modeswitch.spec	11 Jan 2009 18:46:30 -0000	1.2
@@ -1,6 +1,6 @@
 Name:		usb_modeswitch
-Version:	0.9.4
-Release:	2%{?dist}
+Version:	0.9.6
+Release:	1%{?dist}
 Summary:	USB Modeswitch gets 4G cards in operational mode
 Summary(de):	USB Modeswitch aktiviert UMTS-Karten
 Group:		Applications/System
@@ -46,6 +46,12 @@
 %doc COPYING README*
 
 %changelog
+* Sun Jan 11 2009 Robert M. Albrecht <fedora at romal.de> 0.9.6-1
+* new upstream release
+
+* Sat Dec 13 2008 Robert M. Albrecht <fedora at romal.de> 0.9.5-1
+* new upstream release
+
 * Sat Jun 22 2008 Robert M. Albrecht <romal at gmx.de> 0.9.4-2
 - Fixed some rpmlint errors
 - Added german translation



From anyremote at fedoraproject.org  Sun Jan 11 18:48:29 2009
From: anyremote at fedoraproject.org (Mikhail Fedotov)
Date: Sun, 11 Jan 2009 18:48:29 +0000 (UTC)
Subject: rpms/anyremote/F-9 .cvsignore, 1.12, 1.13 anyremote.spec, 1.11,
	1.12 import.log, 1.6, 1.7 sources, 1.12, 1.13
Message-ID: <20090111184829.6947470139@cvs1.fedora.phx.redhat.com>

Author: anyremote

Update of /cvs/pkgs/rpms/anyremote/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5867/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.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	9 Dec 2008 20:01:39 -0000	1.12
+++ .cvsignore	11 Jan 2009 18:47:58 -0000	1.13
@@ -1 +1 @@
-anyremote-4.13.tar.gz
+anyremote-4.14.tar.gz


Index: anyremote.spec
===================================================================
RCS file: /cvs/pkgs/rpms/anyremote/F-9/anyremote.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- anyremote.spec	9 Dec 2008 20:01:39 -0000	1.11
+++ anyremote.spec	11 Jan 2009 18:47:59 -0000	1.12
@@ -1,12 +1,12 @@
 Summary: Remote control through bluetooth or IR connection
 Name: anyremote
-Version: 4.13
+Version: 4.14
 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.11
+Requires: bc,anyremote-data >= 4.14
 BuildRequires:bluez-libs-devel >= 3.35, libX11-devel, libXtst-devel, xorg-x11-proto-devel
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -60,6 +60,11 @@
 
 %changelog
 
+* Sat Jan 10 2009 Mikhail Fedotov <anyremote at mail.ru> - 4.14-1
+- Small corrections in configuration files. Configuration file for AlsaPlayer, 
+  Digikam (thanks to Marcus Hardt) and GPicView were added. 
+  Syntax of Emulate() command was extended.
+
 * Sat Dec 07 2008 Mikhail Fedotov <anyremote at mail.ru> - 4.13-1
 - Small corrections in configuration files. Configuration file for WmCtrl and 
   Juk/KDE4 were added.


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/anyremote/F-9/import.log,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- import.log	9 Dec 2008 20:01:39 -0000	1.6
+++ import.log	11 Jan 2009 18:47:59 -0000	1.7
@@ -4,3 +4,4 @@
 anyremote-4_11-1_fc9:F-9:anyremote-4.11-1.fc9.src.rpm:1224527808
 anyremote-4_12-1_fc9:F-9:anyremote-4.12-1.fc9.src.rpm:1226867280
 anyremote-4_13-1_fc10:F-9:anyremote-4.13-1.fc10.src.rpm:1228852843
+anyremote-4_14-1_fc10:F-9:anyremote-4.14-1.fc10.src.rpm:1231699592


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/anyremote/F-9/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	9 Dec 2008 20:01:40 -0000	1.12
+++ sources	11 Jan 2009 18:47:59 -0000	1.13
@@ -1 +1 @@
-38abc204b729ef552ed6d20f12edda4e  anyremote-4.13.tar.gz
+14002849e48b1ee223687132845754bf  anyremote-4.14.tar.gz



From anyremote at fedoraproject.org  Sun Jan 11 18:48:34 2009
From: anyremote at fedoraproject.org (Mikhail Fedotov)
Date: Sun, 11 Jan 2009 18:48:34 +0000 (UTC)
Subject: rpms/anyremote/F-10 .cvsignore, 1.12, 1.13 anyremote.spec, 1.12,
	1.13 import.log, 1.6, 1.7 sources, 1.12, 1.13
Message-ID: <20090111184834.0747270139@cvs1.fedora.phx.redhat.com>

Author: anyremote

Update of /cvs/pkgs/rpms/anyremote/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5898/F-10

Modified Files:
	.cvsignore anyremote.spec import.log sources 
Log Message:
build


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/anyremote/F-10/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	9 Dec 2008 20:01:44 -0000	1.12
+++ .cvsignore	11 Jan 2009 18:48:03 -0000	1.13
@@ -1 +1 @@
-anyremote-4.13.tar.gz
+anyremote-4.14.tar.gz


Index: anyremote.spec
===================================================================
RCS file: /cvs/pkgs/rpms/anyremote/F-10/anyremote.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- anyremote.spec	9 Dec 2008 20:01:44 -0000	1.12
+++ anyremote.spec	11 Jan 2009 18:48:03 -0000	1.13
@@ -1,12 +1,12 @@
 Summary: Remote control through bluetooth or IR connection
 Name: anyremote
-Version: 4.13
+Version: 4.14
 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.11
+Requires: bc,anyremote-data >= 4.14
 BuildRequires:bluez-libs-devel >= 3.35, libX11-devel, libXtst-devel, xorg-x11-proto-devel
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -60,6 +60,11 @@
 
 %changelog
 
+* Sat Jan 10 2009 Mikhail Fedotov <anyremote at mail.ru> - 4.14-1
+- Small corrections in configuration files. Configuration file for AlsaPlayer, 
+  Digikam (thanks to Marcus Hardt) and GPicView were added. 
+  Syntax of Emulate() command was extended.
+
 * Sat Dec 07 2008 Mikhail Fedotov <anyremote at mail.ru> - 4.13-1
 - Small corrections in configuration files. Configuration file for WmCtrl and 
   Juk/KDE4 were added.


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/anyremote/F-10/import.log,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- import.log	9 Dec 2008 20:01:45 -0000	1.6
+++ import.log	11 Jan 2009 18:48:03 -0000	1.7
@@ -4,3 +4,4 @@
 anyremote-4_11-1_fc9:HEAD:anyremote-4.11-1.fc9.src.rpm:1224527836
 anyremote-4_12-1_fc9:F-10:anyremote-4.12-1.fc9.src.rpm:1226867304
 anyremote-4_13-1_fc10:F-10:anyremote-4.13-1.fc10.src.rpm:1228852860
+anyremote-4_14-1_fc10:F-10:anyremote-4.14-1.fc10.src.rpm:1231699601


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/anyremote/F-10/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	9 Dec 2008 20:01:45 -0000	1.12
+++ sources	11 Jan 2009 18:48:03 -0000	1.13
@@ -1 +1 @@
-38abc204b729ef552ed6d20f12edda4e  anyremote-4.13.tar.gz
+14002849e48b1ee223687132845754bf  anyremote-4.14.tar.gz



From anyremote at fedoraproject.org  Sun Jan 11 18:48:36 2009
From: anyremote at fedoraproject.org (Mikhail Fedotov)
Date: Sun, 11 Jan 2009 18:48:36 +0000 (UTC)
Subject: rpms/anyremote/devel .cvsignore, 1.12, 1.13 anyremote.spec, 1.12,
	1.13 import.log, 1.6, 1.7 sources, 1.12, 1.13
Message-ID: <20090111184836.EFCA170139@cvs1.fedora.phx.redhat.com>

Author: anyremote

Update of /cvs/pkgs/rpms/anyremote/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5938/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.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	9 Dec 2008 20:02:23 -0000	1.12
+++ .cvsignore	11 Jan 2009 18:48:06 -0000	1.13
@@ -1 +1 @@
-anyremote-4.13.tar.gz
+anyremote-4.14.tar.gz


Index: anyremote.spec
===================================================================
RCS file: /cvs/pkgs/rpms/anyremote/devel/anyremote.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- anyremote.spec	9 Dec 2008 20:02:23 -0000	1.12
+++ anyremote.spec	11 Jan 2009 18:48:06 -0000	1.13
@@ -1,12 +1,12 @@
 Summary: Remote control through bluetooth or IR connection
 Name: anyremote
-Version: 4.13
+Version: 4.14
 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.11
+Requires: bc,anyremote-data >= 4.14
 BuildRequires:bluez-libs-devel >= 3.35, libX11-devel, libXtst-devel, xorg-x11-proto-devel
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -60,6 +60,11 @@
 
 %changelog
 
+* Sat Jan 10 2009 Mikhail Fedotov <anyremote at mail.ru> - 4.14-1
+- Small corrections in configuration files. Configuration file for AlsaPlayer, 
+  Digikam (thanks to Marcus Hardt) and GPicView were added. 
+  Syntax of Emulate() command was extended.
+
 * Sat Dec 07 2008 Mikhail Fedotov <anyremote at mail.ru> - 4.13-1
 - Small corrections in configuration files. Configuration file for WmCtrl and 
   Juk/KDE4 were added.


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/anyremote/devel/import.log,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- import.log	9 Dec 2008 20:02:23 -0000	1.6
+++ import.log	11 Jan 2009 18:48:06 -0000	1.7
@@ -4,3 +4,4 @@
 anyremote-4_11-1_fc9:HEAD:anyremote-4.11-1.fc9.src.rpm:1224527836
 anyremote-4_12-1_fc9:HEAD:anyremote-4.12-1.fc9.src.rpm:1226867310
 anyremote-4_13-1_fc10:HEAD:anyremote-4.13-1.fc10.src.rpm:1228852868
+anyremote-4_14-1_fc10:HEAD:anyremote-4.14-1.fc10.src.rpm:1231699613


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/anyremote/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	9 Dec 2008 20:02:23 -0000	1.12
+++ sources	11 Jan 2009 18:48:06 -0000	1.13
@@ -1 +1 @@
-38abc204b729ef552ed6d20f12edda4e  anyremote-4.13.tar.gz
+14002849e48b1ee223687132845754bf  anyremote-4.14.tar.gz



From romal at fedoraproject.org  Sun Jan 11 18:55:22 2009
From: romal at fedoraproject.org (Robert M. Albrecht)
Date: Sun, 11 Jan 2009 18:55:22 +0000 (UTC)
Subject: rpms/usb_modeswitch/F-10 .cvsignore, 1.2, 1.3 sources, 1.2,
	1.3 usb_modeswitch.spec, 1.1, 1.2
Message-ID: <20090111185522.860CE7013F@cvs1.fedora.phx.redhat.com>

Author: romal

Update of /cvs/pkgs/rpms/usb_modeswitch/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6924

Modified Files:
	.cvsignore sources usb_modeswitch.spec 
Log Message:
new upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/usb_modeswitch/F-10/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	1 Jul 2008 18:44:47 -0000	1.2
+++ .cvsignore	11 Jan 2009 18:54:52 -0000	1.3
@@ -1 +1 @@
-usb_modeswitch-0.9.4.tar.bz2
+usb_modeswitch-0.9.6.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/usb_modeswitch/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	1 Jul 2008 18:44:47 -0000	1.2
+++ sources	11 Jan 2009 18:54:52 -0000	1.3
@@ -1 +1 @@
-3c03c3ae51a10d599c33c119693186c9  usb_modeswitch-0.9.4.tar.bz2
+9f5b97b7b0113b0275c4953482f876c3  usb_modeswitch-0.9.6.tar.bz2


Index: usb_modeswitch.spec
===================================================================
RCS file: /cvs/pkgs/rpms/usb_modeswitch/F-10/usb_modeswitch.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- usb_modeswitch.spec	1 Jul 2008 18:44:47 -0000	1.1
+++ usb_modeswitch.spec	11 Jan 2009 18:54:52 -0000	1.2
@@ -1,6 +1,6 @@
 Name:		usb_modeswitch
-Version:	0.9.4
-Release:	2%{?dist}
+Version:	0.9.6
+Release:	1%{?dist}
 Summary:	USB Modeswitch gets 4G cards in operational mode
 Summary(de):	USB Modeswitch aktiviert UMTS-Karten
 Group:		Applications/System
@@ -46,6 +46,12 @@
 %doc COPYING README*
 
 %changelog
+* Sun Jan 11 2009 Robert M. Albrecht <fedora at romal.de> 0.9.6-1
+* new upstream release
+
+* Sat Dec 13 2008 Robert M. Albrecht <fedora at romal.de> 0.9.5-1
+* new upstream release
+
 * Sat Jun 22 2008 Robert M. Albrecht <romal at gmx.de> 0.9.4-2
 - Fixed some rpmlint errors
 - Added german translation



From rakesh at fedoraproject.org  Sun Jan 11 18:56:06 2009
From: rakesh at fedoraproject.org (Rakesh Pandit)
Date: Sun, 11 Jan 2009 18:56:06 +0000 (UTC)
Subject: rpms/gdmap/F-10 gdmap.spec,1.9,1.10 import.log,1.1,1.2
Message-ID: <20090111185606.7CA9F70141@cvs1.fedora.phx.redhat.com>

Author: rakesh

Update of /cvs/pkgs/rpms/gdmap/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7052/F-10

Modified Files:
	gdmap.spec import.log 
Log Message:
Bump + some cleanup



Index: gdmap.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdmap/F-10/gdmap.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- gdmap.spec	11 Jan 2009 18:41:27 -0000	1.9
+++ gdmap.spec	11 Jan 2009 18:55:36 -0000	1.10
@@ -1,6 +1,6 @@
 Name:	gdmap
 Version:	0.8.1
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	A tool which allows to visualize disk space
 
 Group:	Applications/System
@@ -52,12 +52,14 @@
 %dir %{_datadir}/%{name}
 %{_datadir}/%{name}/
 %{_datadir}/applications/*.desktop
-#%{_datadir}/%{name}/pixmaps/*
 %{_datadir}/pixmaps/*
 %{_mandir}/man1/*
 
 
 %changelog
+* Mon Jan 12 2009 Rakesh Pandit <rakesh at fedoraproject.org> - 0.8.1-2
+- Bump + some cleaning.
+
 * Sun Jan 11 2009 Rakesh Pandit <rakesh at fedoraproject.org> - 0.8.1-1
 - Updated to 0.8.1, fixed .desktop file and license tag.
 - Fixed Unowned directories.
@@ -72,12 +74,12 @@
 - Fixed Desktop file
 
 * Fri Jul 7 2006 Damien Durand <splinux at fedoraproject.org> - 0.7.5-3
-- Fixed mixed-use-of-spaces-and-tabs and %find_lang in changelog
+- Fixed mixed-use-of-spaces-and-tabs and %%find_lang in changelog
 - added category System and delete-original in desktop-file-install
 
 * Tue Apr 6 2006 Damien Durand <splinux at fedoraproject.org> - 0.7.5-2
 - Fixed Buidrequires, add intltool
-- Fixed locales, add %find_lang GdMap and %%files -f GdMap.lang and remove {_datadir}/locales
+- Fixed locales, add %%find_lang GdMap and %%files -f GdMap.lang and remove {_datadir}/locales
 
 * Tue Apr 6 2006 Damien Durand <splinux at fedoraproject.org> - 0.7.5-1
 - Initial package


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/gdmap/F-10/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	11 Jan 2009 18:41:27 -0000	1.1
+++ import.log	11 Jan 2009 18:55:36 -0000	1.2
@@ -1 +1,2 @@
 gdmap-0_8_1-1_fc10:F-10:gdmap-0.8.1-1.fc10.src.rpm:1231699066
+gdmap-0_8_1-2_fc10:F-10:gdmap-0.8.1-2.fc10.src.rpm:1231699963



From rakesh at fedoraproject.org  Sun Jan 11 18:57:39 2009
From: rakesh at fedoraproject.org (Rakesh Pandit)
Date: Sun, 11 Jan 2009 18:57:39 +0000 (UTC)
Subject: rpms/gdmap/devel gdmap.spec,1.10,1.11 import.log,1.1,1.2
Message-ID: <20090111185739.2A5DC70139@cvs1.fedora.phx.redhat.com>

Author: rakesh

Update of /cvs/pkgs/rpms/gdmap/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8027/devel

Modified Files:
	gdmap.spec import.log 
Log Message:
Bumped + some cleanup.



Index: gdmap.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdmap/devel/gdmap.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- gdmap.spec	11 Jan 2009 18:29:04 -0000	1.10
+++ gdmap.spec	11 Jan 2009 18:57:08 -0000	1.11
@@ -1,6 +1,6 @@
 Name:	gdmap
 Version:	0.8.1
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	A tool which allows to visualize disk space
 
 Group:	Applications/System
@@ -52,12 +52,14 @@
 %dir %{_datadir}/%{name}
 %{_datadir}/%{name}/
 %{_datadir}/applications/*.desktop
-#%{_datadir}/%{name}/pixmaps/*
 %{_datadir}/pixmaps/*
 %{_mandir}/man1/*
 
 
 %changelog
+* Mon Jan 12 2009 Rakesh Pandit <rakesh at fedoraproject.org> - 0.8.1-2
+- Bump + some cleaning.
+
 * Sun Jan 11 2009 Rakesh Pandit <rakesh at fedoraproject.org> - 0.8.1-1
 - Updated to 0.8.1, fixed .desktop file and license tag.
 - Fixed Unowned directories.
@@ -72,12 +74,12 @@
 - Fixed Desktop file
 
 * Fri Jul 7 2006 Damien Durand <splinux at fedoraproject.org> - 0.7.5-3
-- Fixed mixed-use-of-spaces-and-tabs and %find_lang in changelog
+- Fixed mixed-use-of-spaces-and-tabs and %%find_lang in changelog
 - added category System and delete-original in desktop-file-install
 
 * Tue Apr 6 2006 Damien Durand <splinux at fedoraproject.org> - 0.7.5-2
 - Fixed Buidrequires, add intltool
-- Fixed locales, add %find_lang GdMap and %%files -f GdMap.lang and remove {_datadir}/locales
+- Fixed locales, add %%find_lang GdMap and %%files -f GdMap.lang and remove {_datadir}/locales
 
 * Tue Apr 6 2006 Damien Durand <splinux at fedoraproject.org> - 0.7.5-1
 - Initial package


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/gdmap/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	11 Jan 2009 18:29:04 -0000	1.1
+++ import.log	11 Jan 2009 18:57:08 -0000	1.2
@@ -1 +1,2 @@
 gdmap-0_8_1-1_fc10:HEAD:gdmap-0.8.1-1.fc10.src.rpm:1231698330
+gdmap-0_8_1-2_fc10:HEAD:gdmap-0.8.1-2.fc10.src.rpm:1231700056



From mclasen at fedoraproject.org  Sun Jan 11 19:24:44 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Sun, 11 Jan 2009 19:24:44 +0000 (UTC)
Subject: rpms/gnome-applets/devel gnome-applets-null-battstat.patch, 1.3,
	1.4 gnome-applets.spec, 1.320, 1.321
Message-ID: <20090111192444.9BA5070139@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-applets/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10664

Modified Files:
	gnome-applets-null-battstat.patch gnome-applets.spec 
Log Message:
fix mixer applet nullification


gnome-applets-null-battstat.patch:

Index: gnome-applets-null-battstat.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-applets/devel/gnome-applets-null-battstat.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gnome-applets-null-battstat.patch	6 Jan 2009 18:22:32 -0000	1.3
+++ gnome-applets-null-battstat.patch	11 Jan 2009 19:24:13 -0000	1.4
@@ -1,6 +1,6 @@
 diff -up /dev/null gnome-applets-2.25.3/null_applet/GNOME_BattstatApplet.server.in
---- /dev/null	2009-01-06 09:07:59.720027856 -0500
-+++ gnome-applets-2.25.3/null_applet/GNOME_BattstatApplet.server.in	2009-01-06 13:06:52.000000000 -0500
+--- /dev/null	2009-01-11 11:32:02.651110416 -0500
++++ gnome-applets-2.25.3/null_applet/GNOME_BattstatApplet.server.in	2009-01-11 11:47:13.000000000 -0500
 @@ -0,0 +1,22 @@
 +<oaf_info>
 +
@@ -26,7 +26,7 @@
 +</oaf_info>
 diff -up gnome-applets-2.25.3/null_applet/Makefile.am.battstat-null gnome-applets-2.25.3/null_applet/Makefile.am
 --- gnome-applets-2.25.3/null_applet/Makefile.am.battstat-null	2009-01-06 00:30:23.000000000 -0500
-+++ gnome-applets-2.25.3/null_applet/Makefile.am	2009-01-06 13:08:41.000000000 -0500
++++ gnome-applets-2.25.3/null_applet/Makefile.am	2009-01-11 11:47:13.000000000 -0500
 @@ -9,12 +9,15 @@ null_applet_SOURCES = null_applet.c
  
  null_applet_LDADD = $(GNOME_APPLETS_LIBS)
@@ -46,13 +46,15 @@
  
 diff -up gnome-applets-2.25.3/null_applet/null_applet.c.battstat-null gnome-applets-2.25.3/null_applet/null_applet.c
 --- gnome-applets-2.25.3/null_applet/null_applet.c.battstat-null	2009-01-06 00:30:23.000000000 -0500
-+++ gnome-applets-2.25.3/null_applet/null_applet.c	2009-01-06 13:09:42.000000000 -0500
-@@ -41,6 +41,8 @@ insert_oafiids (GHashTable *hash_table)
++++ gnome-applets-2.25.3/null_applet/null_applet.c	2009-01-11 11:57:57.000000000 -0500
+@@ -41,7 +41,9 @@ insert_oafiids (GHashTable *hash_table)
  	g_hash_table_insert (hash_table,
  			"OAFIID:GNOME_CDPlayerApplet", "CD Player");
  	g_hash_table_insert (hash_table,
+-			     "OAFIID:GNOME_MixerApplet_Factory", "Volume Control");
 +			"OAFIID:GNOME_BattstatApplet", "Battery Charge Monitor");
 +	g_hash_table_insert (hash_table,
- 			     "OAFIID:GNOME_MixerApplet_Factory", "Volume Control");
++			     "OAFIID:GNOME_MixerApplet", "Volume Control");
  }
  
+ static gboolean already_running;


Index: gnome-applets.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-applets/devel/gnome-applets.spec,v
retrieving revision 1.320
retrieving revision 1.321
diff -u -r1.320 -r1.321
--- gnome-applets.spec	7 Jan 2009 02:46:42 -0000	1.320
+++ gnome-applets.spec	11 Jan 2009 19:24:13 -0000	1.321
@@ -35,7 +35,7 @@
 Summary:        Small applications for the GNOME panel
 Name:		gnome-applets
 Version:	2.25.3
-Release: 	2%{?dist}
+Release: 	3%{?dist}
 Epoch:          1
 License:	GPLv2+ and GFDL
 Group:          User Interface/Desktops
@@ -339,6 +339,9 @@
 %{_datadir}/PolicyKit/policy/org.gnome.cpufreqselector.policy
 
 %changelog
+* Sun Jan 11 2009 Matthias Clasen <mclasen at redhat.com> - 1:2.25.3-3
+- Fix the nullappletification of the mixer applet
+
 * Tue Jan  6 2009 Matthias Clasen <mclasen at redhat.com> - 1:2.25.3-2
 - Update to 2.25.3
 



From rakesh at fedoraproject.org  Sun Jan 11 19:33:38 2009
From: rakesh at fedoraproject.org (Rakesh Pandit)
Date: Sun, 11 Jan 2009 19:33:38 +0000 (UTC)
Subject: rpms/gdmap/devel gdmap.spec,1.11,1.12 import.log,1.2,1.3
Message-ID: <20090111193338.E0A6170139@cvs1.fedora.phx.redhat.com>

Author: rakesh

Update of /cvs/pkgs/rpms/gdmap/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12322/devel

Modified Files:
	gdmap.spec import.log 
Log Message:
bump



Index: gdmap.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdmap/devel/gdmap.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- gdmap.spec	11 Jan 2009 18:57:08 -0000	1.11
+++ gdmap.spec	11 Jan 2009 19:33:08 -0000	1.12
@@ -1,6 +1,6 @@
 Name:	gdmap
 Version:	0.8.1
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	A tool which allows to visualize disk space
 
 Group:	Applications/System
@@ -57,6 +57,9 @@
 
 
 %changelog
+* Mon Jan 12 2009 Rakesh Pandit <rakesh at fedoraproject.org> - 0.8.1-3
+- Bump
+
 * Mon Jan 12 2009 Rakesh Pandit <rakesh at fedoraproject.org> - 0.8.1-2
 - Bump + some cleaning.
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/gdmap/devel/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	11 Jan 2009 18:57:08 -0000	1.2
+++ import.log	11 Jan 2009 19:33:08 -0000	1.3
@@ -1,2 +1,3 @@
 gdmap-0_8_1-1_fc10:HEAD:gdmap-0.8.1-1.fc10.src.rpm:1231698330
 gdmap-0_8_1-2_fc10:HEAD:gdmap-0.8.1-2.fc10.src.rpm:1231700056
+gdmap-0_8_1-3_fc10:HEAD:gdmap-0.8.1-3.fc10.src.rpm:1231702222



From rakesh at fedoraproject.org  Sun Jan 11 19:51:51 2009
From: rakesh at fedoraproject.org (Rakesh Pandit)
Date: Sun, 11 Jan 2009 19:51:51 +0000 (UTC)
Subject: rpms/gdmap/F-9 import.log, NONE, 1.1 .cvsignore, 1.2, 1.3 gdmap.spec,
	1.5, 1.6 sources, 1.2, 1.3
Message-ID: <20090111195151.E81F770139@cvs1.fedora.phx.redhat.com>

Author: rakesh

Update of /cvs/pkgs/rpms/gdmap/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14483/F-9

Modified Files:
	.cvsignore gdmap.spec sources 
Added Files:
	import.log 
Log Message:
- Updated to 0.8.1, fixed .desktop file and license tag.
- Fixed Unowned directories.



--- NEW FILE import.log ---
gdmap-0_8_1-2_fc10:F-9:gdmap-0.8.1-2.fc10.src.rpm:1231703216


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gdmap/F-9/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	7 Jul 2006 13:37:38 -0000	1.2
+++ .cvsignore	11 Jan 2009 19:51:21 -0000	1.3
@@ -1 +1 @@
-gdmap-0.7.5.tar.gz
+gdmap-0.8.1.tar.gz


Index: gdmap.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdmap/F-9/gdmap.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- gdmap.spec	20 Feb 2008 00:49:42 -0000	1.5
+++ gdmap.spec	11 Jan 2009 19:51:21 -0000	1.6
@@ -1,10 +1,10 @@
 Name:	gdmap
-Version:	0.7.5
-Release:	7%{?dist}
+Version:	0.8.1
+Release:	2%{?dist}
 Summary:	A tool which allows to visualize disk space
 
 Group:	Applications/System
-License:	GPL
+License:	GPLv2
 URL:	http://gdmap.sourceforge.net
 Source0:	http://belnet.dl.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -29,11 +29,14 @@
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
+sed -i -e 's|gdmap_icon\.png|gdmap_icon|g' \
+  -e 's|^Version=.*$|Version=1.0|g' \
+  $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
 
-desktop-file-install --vendor fedora --delete-original \
-  --add-category X-Fedora                              \
-  --add-category System                                \
-  --dir $RPM_BUILD_ROOT%{_datadir}/applications        \
+desktop-file-install --vendor "" --delete-original	\
+  --add-category X-Fedora				\
+  --add-category System					\
+  --dir $RPM_BUILD_ROOT%{_datadir}/applications		\
   $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
 
 %find_lang GdMap
@@ -46,15 +49,20 @@
 %defattr(-,root,root,-)
 %doc COPYING
 %{_bindir}/%{name}
+%dir %{_datadir}/%{name}
+%{_datadir}/%{name}/
 %{_datadir}/applications/*.desktop
-%{_datadir}/%{name}/pixmaps/*
 %{_datadir}/pixmaps/*
 %{_mandir}/man1/*
 
 
 %changelog
-* Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.7.5-7
-- Autorebuild for GCC 4.3
+* Mon Jan 12 2009 Rakesh Pandit <rakesh at fedoraproject.org> - 0.8.1-2
+- Bump + some cleaning.
+
+* Sun Jan 11 2009 Rakesh Pandit <rakesh at fedoraproject.org> - 0.8.1-1
+- Updated to 0.8.1, fixed .desktop file and license tag.
+- Fixed Unowned directories.
 
 * Mon Oct 16 2006 Damien Durand <splinux at fedoraproject.org> - 0.7.5-6
 - Bumped
@@ -66,12 +74,12 @@
 - Fixed Desktop file
 
 * Fri Jul 7 2006 Damien Durand <splinux at fedoraproject.org> - 0.7.5-3
-- Fixed mixed-use-of-spaces-and-tabs and %find_lang in changelog
+- Fixed mixed-use-of-spaces-and-tabs and %%find_lang in changelog
 - added category System and delete-original in desktop-file-install
 
 * Tue Apr 6 2006 Damien Durand <splinux at fedoraproject.org> - 0.7.5-2
 - Fixed Buidrequires, add intltool
-- Fixed locales, add %find_lang GdMap and %%files -f GdMap.lang and remove {_datadir}/locales
+- Fixed locales, add %%find_lang GdMap and %%files -f GdMap.lang and remove {_datadir}/locales
 
 * Tue Apr 6 2006 Damien Durand <splinux at fedoraproject.org> - 0.7.5-1
 - Initial package


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gdmap/F-9/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	7 Jul 2006 13:37:38 -0000	1.2
+++ sources	11 Jan 2009 19:51:21 -0000	1.3
@@ -1 +1 @@
-e27f9a4c029449182ce5a4dbec38870e  gdmap-0.7.5.tar.gz
+54b43354dbe774810104607ad1eaaed3  gdmap-0.8.1.tar.gz



From dcantrel at fedoraproject.org  Sun Jan 11 20:08:26 2009
From: dcantrel at fedoraproject.org (David Cantrell)
Date: Sun, 11 Jan 2009 20:08:26 +0000 (UTC)
Subject: rpms/dhcp/devel dhcp.spec,1.236,1.237
Message-ID: <20090111200826.835DA70139@cvs1.fedora.phx.redhat.com>

Author: dcantrel

Update of /cvs/pkgs/rpms/dhcp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17119

Modified Files:
	dhcp.spec 
Log Message:
* Sun Jan 11 2009 David Cantrell <dcantrell at redhat.com> - 12:4.1.0-3
- Correct syntax errors in %post script (#479012)



Index: dhcp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dhcp/devel/dhcp.spec,v
retrieving revision 1.236
retrieving revision 1.237
diff -u -r1.236 -r1.237
--- dhcp.spec	10 Jan 2009 19:14:05 -0000	1.236
+++ dhcp.spec	11 Jan 2009 20:07:56 -0000	1.237
@@ -12,7 +12,7 @@
 Summary:  Dynamic host configuration protocol software
 Name:     dhcp
 Version:  4.1.0
-Release:  2%{?dist}
+Release:  3%{?dist}
 # NEVER CHANGE THE EPOCH on this package.  The previous maintainer (prior to
 # dcantrell maintaining the package) made incorrect use of the epoch and
 # that's why it is at 12 now.  It should have never been used, but it was.
@@ -314,7 +314,7 @@
 %{__rm} -rf %{buildroot}
 
 %post
-if [ -f /etc/dhcpd.conf ] -a [ ! -f /etc/dhcp/dhcpd.conf ]; then
+if [ -f /etc/dhcpd.conf -a ! -f /etc/dhcp/dhcpd.conf ]; then
     /bin/cp -a /etc/dhcpd.conf /etc/dhcp/dhcpd.conf >/dev/null 2>&1
     /bin/rm -f /etc/dhcpd.conf >/dev/null 2>&1
 fi
@@ -407,6 +407,9 @@
 %attr(0644,root,root) %{_mandir}/man3/omapi.3.gz
 
 %changelog
+* Sun Jan 11 2009 David Cantrell <dcantrell at redhat.com> - 12:4.1.0-3
+- Correct syntax errors in %%post script (#479012)
+
 * Sat Jan 10 2009 David Cantrell <dcantrell at redhat.com> - 12:4.1.0-2
 - Make sure all /etc/dhcp config files are marked in the manifest
 - Include new config file directies in the dhcp and dhclient packages



From pkgdb at fedoraproject.org  Sun Jan 11 20:17:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 11 Jan 2009 20:17:23 +0000
Subject: [pkgdb] gtk+ had acl change status
Message-ID: <20090111201723.D29DF208456@bastion.fedora.phx.redhat.com>

pghmcfc has set the watchbugzilla acl on gtk+ (Fedora 9) to Approved for dhurander3

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gtk+



From dcantrel at fedoraproject.org  Sun Jan 11 20:22:27 2009
From: dcantrel at fedoraproject.org (David Cantrell)
Date: Sun, 11 Jan 2009 20:22:27 +0000 (UTC)
Subject: rpms/dhcp/devel README.ldap,1.6,1.7 dhcpd-conf-to-ldap,1.8,1.9
Message-ID: <20090111202227.D352E70139@cvs1.fedora.phx.redhat.com>

Author: dcantrel

Update of /cvs/pkgs/rpms/dhcp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18670

Modified Files:
	README.ldap dhcpd-conf-to-ldap 
Log Message:
Update Brian Masney's email address.



Index: README.ldap
===================================================================
RCS file: /cvs/pkgs/rpms/dhcp/devel/README.ldap,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- README.ldap	11 Jan 2008 00:19:03 -0000	1.6
+++ README.ldap	11 Jan 2009 20:21:57 -0000	1.7
@@ -1,5 +1,5 @@
 LDAP Support in DHCP
-Brian Masney <masneyb at ntelos.net>
+Brian Masney <masneyb at gftp.org>
 Last updated 3/23/2003
 
 This document describes setting up the DHCP server to read it's configuration


Index: dhcpd-conf-to-ldap
===================================================================
RCS file: /cvs/pkgs/rpms/dhcp/devel/dhcpd-conf-to-ldap,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- dhcpd-conf-to-ldap	11 Jan 2008 00:16:44 -0000	1.8
+++ dhcpd-conf-to-ldap	11 Jan 2009 20:21:57 -0000	1.9
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -w
 
-# Brian Masney <masneyb at ntelos.net>
+# Brian Masney <masneyb at gftp.org>
 # To use this script, set your base DN below. Then run 
 # ./dhcpd-conf-to-ldap.pl < /path-to-dhcpd-conf/dhcpd.conf > output-file
 # The output of this script will generate entries in LDIF format. You can use



From jwrdegoede at fedoraproject.org  Sun Jan 11 20:23:04 2009
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Sun, 11 Jan 2009 20:23:04 +0000 (UTC)
Subject: rpms/pachi/devel pachi-alt-warnigs-fix.patch, NONE,
	1.1 pachi-more-fixes.patch, NONE, 1.1 pachi.spec, 1.5, 1.6
Message-ID: <20090111202304.C26D670139@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/pachi/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18900

Modified Files:
	pachi.spec 
Added Files:
	pachi-alt-warnigs-fix.patch pachi-more-fixes.patch 
Log Message:
* Sun Jan 11 2009 Hans de Goede <hdegoede at redhat.com> 1.0-6
- Add 2 patches with small fixes from altlinux


pachi-alt-warnigs-fix.patch:

--- NEW FILE pachi-alt-warnigs-fix.patch ---
--- src/gfx.c.orig
+++ src/gfx.c
@@ -16,7 +16,7 @@
 /*
     LoadT carga un grafico en formato .T de 24 bits en una superficie SDL
 */
-void LoadT(SDL_Surface **Tsurface, char *str)
+void LoadT(SDL_Surface **Tsurface, const char *str)
 {
     FILE *Tsrc;
 
@@ -69,7 +69,7 @@ void LoadT(SDL_Surface **Tsurface, char *str)
     fclose(Tsrc);
 }
 
-SDL_Surface * LoadT8(char *str)
+SDL_Surface * LoadT8(const char *str)
 {
     SDL_Surface *Tsurface;
     FILE *Tsrc;
--- src/output.c.orig
+++ src/output.c
@@ -210,7 +210,7 @@ void print_room()
     SDL_Flip(screen);
 }
 
-void showcode(char *str)
+void showcode(const char *str)
 {
     SDL_Rect code;
 	code.x=280; code.y=220;code.w=240;code.h=50;
--- src/structs.h.orig
+++ src/structs.h
@@ -39,11 +39,11 @@ struct Cplayer
 
 struct Cstages
 {
-    char * title;
-    char * music;
+    const char * title;
+    const char * music;
     int  objects;
     int  time;
-    char * code;
+    const char * code;
 };
 
 struct Croom
--- src/fx.c.orig
+++ src/fx.c
@@ -58,7 +58,7 @@ void initfade_object(int x, int y, int object)
     alphade=255;
     object-=200;
     fadeobject=SDL_CreateRGBSurface(SDL_SWSURFACE,R_tileside,R_tileside,16,0,0,0,0);
-    SDL_SetColorKey(fadeobject,SDL_SRCCOLORKEY,(fadeobject->format,0,255,0));
+    SDL_SetColorKey(fadeobject,SDL_SRCCOLORKEY,SDL_MapRGB(fadeobject->format,0,255,0));
     SDL_Rect objectsrc;
 	objectsrc.w=R_tileside;objectsrc.h=R_tileside;
 	objectsrc.y=R_tileside*10;objectsrc.x=R_tileside*object;

pachi-more-fixes.patch:

--- NEW FILE pachi-more-fixes.patch ---
--- Pachi/src/game.c	2009-01-11 21:15:47.000000000 +0100
+++ Pachi.new/src/game.c	2009-01-11 21:05:04.000000000 +0100
@@ -80,7 +80,7 @@
     if(y < R_max_y)
 	if(roommap[x][y+1]==stage)
 	    show_arrow(arrow_down, show);
-    if(y < 0)
+    if(y > 0)
 	if(roommap[x][y-1]==stage)
 	    show_arrow(arrow_up, show);
 }
--- Pachi/src/text.c	2009-01-11 21:15:47.000000000 +0100
+++ Pachi.new/src/text.c	2009-01-11 21:08:15.000000000 +0100
@@ -15,7 +15,7 @@
     srctxt.y = 0;
     int linecounter = 0 ; // este contador se utiliza para saber en que linea imprimimos el texto
     int charpos = 0;
-    for(unsigned charcounter = 0; charcounter <= (strlen(texto));charcounter++)
+    for(size_t charcounter = 0; charcounter < strlen(texto); charcounter++)
     {
 	int curchar=texto[charcounter];
 	if(curchar == 94)


Index: pachi.spec
===================================================================
RCS file: /cvs/extras/rpms/pachi/devel/pachi.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- pachi.spec	19 Feb 2008 09:25:55 -0000	1.5
+++ pachi.spec	11 Jan 2009 20:22:34 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           pachi
 Version:        1.0
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Pachi El Marciano - Platform Game
 Group:          Amusements/Games
 License:        GPLv2+
@@ -9,6 +9,8 @@
 Source1:        %{name}.desktop
 Patch0:         %{name}-fixes.patch
 Patch1:         %{name}-nosound.patch
+Patch2:         %{name}-more-fixes.patch
+Patch3:         %{name}-alt-warnigs-fix.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  SDL_mixer-devel desktop-file-utils ImageMagick
 Requires:       hicolor-icon-theme
@@ -20,8 +22,10 @@
 
 %prep
 %setup -q -n Pachi
-%patch0 -p1 -z .fixes
-%patch1 -p1 -z .nosound
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p0
 
 
 %build
@@ -78,6 +82,9 @@
 
 
 %changelog
+* Sun Jan 11 2009 Hans de Goede <hdegoede at redhat.com> 1.0-6
+- Add 2 patches with small fixes from altlinux
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1.0-5
 - Autorebuild for GCC 4.3
 



From jstanley at fedoraproject.org  Sun Jan 11 20:24:18 2009
From: jstanley at fedoraproject.org (Jon Stanley)
Date: Sun, 11 Jan 2009 20:24:18 +0000 (UTC)
Subject: rpms/supybot-fedora/EL-5 .cvsignore, 1.2, 1.3 sources, 1.3,
	1.4 supybot-fedora.spec, 1.2, 1.3
Message-ID: <20090111202418.5D48870139@cvs1.fedora.phx.redhat.com>

Author: jstanley

Update of /cvs/pkgs/rpms/supybot-fedora/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19101

Modified Files:
	.cvsignore sources supybot-fedora.spec 
Log Message:
Update to new upstream 0.2.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/supybot-fedora/EL-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	4 Jan 2009 07:09:40 -0000	1.2
+++ .cvsignore	11 Jan 2009 20:23:48 -0000	1.3
@@ -1 +1 @@
-supybot-fedora-0.2.1.tar.bz2
+supybot-fedora-0.2.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/supybot-fedora/EL-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	4 Jan 2009 07:09:40 -0000	1.3
+++ sources	11 Jan 2009 20:23:48 -0000	1.4
@@ -1 +1 @@
-18785e3e40363ae8f3e348412286593c  supybot-fedora-0.2.1.tar.bz2
+3a309594f00858990b963fe442d4fea6  supybot-fedora-0.2.2.tar.bz2


Index: supybot-fedora.spec
===================================================================
RCS file: /cvs/pkgs/rpms/supybot-fedora/EL-5/supybot-fedora.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- supybot-fedora.spec	4 Jan 2009 07:09:40 -0000	1.2
+++ supybot-fedora.spec	11 Jan 2009 20:23:48 -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:           supybot-fedora
-Version:        0.2.1
+Version:        0.2.2
 Release:        1%{?dist}
 Summary:        Plugin for Supybot to interact with Fedora services
 
@@ -54,6 +54,9 @@
 
 
 %changelog
+* Sun Jan 11 2009 Jon Stanley <jonstanley at gmail.com> - 0.2.2-1
+- New upstream 0.2.2
+
 * Sun Jan 4 2009 Jon Stanley <jonstanley at gmail.com> - 0.2.1-1
 - New upstream 0.2.1
 



From jstanley at fedoraproject.org  Sun Jan 11 20:27:27 2009
From: jstanley at fedoraproject.org (Jon Stanley)
Date: Sun, 11 Jan 2009 20:27:27 +0000 (UTC)
Subject: rpms/supybot-fedora/F-10 sources, 1.3, 1.4 supybot-fedora.spec, 1.2,
	1.3
Message-ID: <20090111202727.4323370139@cvs1.fedora.phx.redhat.com>

Author: jstanley

Update of /cvs/pkgs/rpms/supybot-fedora/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19498/F-10

Modified Files:
	sources supybot-fedora.spec 
Log Message:
update other branches



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/supybot-fedora/F-10/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	4 Jan 2009 07:17:45 -0000	1.3
+++ sources	11 Jan 2009 20:26:56 -0000	1.4
@@ -1 +1 @@
-18785e3e40363ae8f3e348412286593c  supybot-fedora-0.2.1.tar.bz2
+3a309594f00858990b963fe442d4fea6  supybot-fedora-0.2.2.tar.bz2


Index: supybot-fedora.spec
===================================================================
RCS file: /cvs/pkgs/rpms/supybot-fedora/F-10/supybot-fedora.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- supybot-fedora.spec	4 Jan 2009 07:17:45 -0000	1.2
+++ supybot-fedora.spec	11 Jan 2009 20:26:56 -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:           supybot-fedora
-Version:        0.2.1
+Version:        0.2.2
 Release:        1%{?dist}
 Summary:        Plugin for Supybot to interact with Fedora services
 
@@ -54,6 +54,9 @@
 
 
 %changelog
+* Sun Jan 11 2009 Jon Stanley <jonstanley at gmail.com> - 0.2.2-1
+- New upstream 0.2.2
+
 * Sun Jan 4 2009 Jon Stanley <jonstanley at gmail.com> - 0.2.1-1
 - New upstream 0.2.1
 



From jstanley at fedoraproject.org  Sun Jan 11 20:27:27 2009
From: jstanley at fedoraproject.org (Jon Stanley)
Date: Sun, 11 Jan 2009 20:27:27 +0000 (UTC)
Subject: rpms/supybot-fedora/F-9 sources, 1.3, 1.4 supybot-fedora.spec, 1.2,
	1.3
Message-ID: <20090111202727.62A6C70139@cvs1.fedora.phx.redhat.com>

Author: jstanley

Update of /cvs/pkgs/rpms/supybot-fedora/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19498/F-9

Modified Files:
	sources supybot-fedora.spec 
Log Message:
update other branches



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/supybot-fedora/F-9/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	4 Jan 2009 07:17:45 -0000	1.3
+++ sources	11 Jan 2009 20:26:57 -0000	1.4
@@ -1 +1 @@
-18785e3e40363ae8f3e348412286593c  supybot-fedora-0.2.1.tar.bz2
+3a309594f00858990b963fe442d4fea6  supybot-fedora-0.2.2.tar.bz2


Index: supybot-fedora.spec
===================================================================
RCS file: /cvs/pkgs/rpms/supybot-fedora/F-9/supybot-fedora.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- supybot-fedora.spec	4 Jan 2009 07:17:45 -0000	1.2
+++ supybot-fedora.spec	11 Jan 2009 20:26:57 -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:           supybot-fedora
-Version:        0.2.1
+Version:        0.2.2
 Release:        1%{?dist}
 Summary:        Plugin for Supybot to interact with Fedora services
 
@@ -54,6 +54,9 @@
 
 
 %changelog
+* Sun Jan 11 2009 Jon Stanley <jonstanley at gmail.com> - 0.2.2-1
+- New upstream 0.2.2
+
 * Sun Jan 4 2009 Jon Stanley <jonstanley at gmail.com> - 0.2.1-1
 - New upstream 0.2.1
 



From jstanley at fedoraproject.org  Sun Jan 11 20:27:27 2009
From: jstanley at fedoraproject.org (Jon Stanley)
Date: Sun, 11 Jan 2009 20:27:27 +0000 (UTC)
Subject: rpms/supybot-fedora/devel sources, 1.3, 1.4 supybot-fedora.spec, 1.2,
	1.3
Message-ID: <20090111202727.A34A070139@cvs1.fedora.phx.redhat.com>

Author: jstanley

Update of /cvs/pkgs/rpms/supybot-fedora/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19498/devel

Modified Files:
	sources supybot-fedora.spec 
Log Message:
update other branches



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/supybot-fedora/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	4 Jan 2009 07:17:45 -0000	1.3
+++ sources	11 Jan 2009 20:26:57 -0000	1.4
@@ -1 +1 @@
-18785e3e40363ae8f3e348412286593c  supybot-fedora-0.2.1.tar.bz2
+3a309594f00858990b963fe442d4fea6  supybot-fedora-0.2.2.tar.bz2


Index: supybot-fedora.spec
===================================================================
RCS file: /cvs/pkgs/rpms/supybot-fedora/devel/supybot-fedora.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- supybot-fedora.spec	4 Jan 2009 07:17:46 -0000	1.2
+++ supybot-fedora.spec	11 Jan 2009 20:26:57 -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:           supybot-fedora
-Version:        0.2.1
+Version:        0.2.2
 Release:        1%{?dist}
 Summary:        Plugin for Supybot to interact with Fedora services
 
@@ -54,6 +54,9 @@
 
 
 %changelog
+* Sun Jan 11 2009 Jon Stanley <jonstanley at gmail.com> - 0.2.2-1
+- New upstream 0.2.2
+
 * Sun Jan 4 2009 Jon Stanley <jonstanley at gmail.com> - 0.2.1-1
 - New upstream 0.2.1
 



From laxathom at fedoraproject.org  Sun Jan 11 20:38:38 2009
From: laxathom at fedoraproject.org (Xavier LAMIEN)
Date: Sun, 11 Jan 2009 20:38:38 +0000 (UTC)
Subject: rpms/gnubversion/F-10 gnubversion.spec,1.2,1.3
Message-ID: <20090111203838.B30A370139@cvs1.fedora.phx.redhat.com>

Author: laxathom

Update of /cvs/pkgs/rpms/gnubversion/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21470

Modified Files:
	gnubversion.spec 
Log Message:
rebuild to handle nautilus-extension-2


Index: gnubversion.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnubversion/F-10/gnubversion.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gnubversion.spec	8 Jan 2009 00:02:13 -0000	1.2
+++ gnubversion.spec	11 Jan 2009 20:38:08 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           gnubversion
 Version:        0.5
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Gnome Interface to Subversion
 
 Group:          Applications/System
@@ -62,12 +62,14 @@
 echo "Encoding=UTF-8" >> $RPM_BUILD_ROOT%{_datadir}/applications/gvn-checkout.desktop
 
 #Fix relative-link issue
-pushd $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/24x24/apps
-for imgs in gvn-commit.png gvn-update.png gvn-add.png gvn-remove.png gvn-revert.png ; do
-        unlink $RPM_BUILD_ROOT%{_datadir}/%{name}/$imgs
-        ln -s $imgs $RPM_BUILD_ROOT%{_datadir}/%{name}/$imgs
-done
-popd
+#pushd $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/24x24/apps
+#for imgs in gvn-commit.png gvn-update.png gvn-add.png gvn-remove.png gvn-revert.png ; do
+#        unlink $RPM_BUILD_ROOT%{_datadir}/%{name}/$imgs
+#        ln -s $imgs $RPM_BUILD_ROOT%{_datadir}/%{name}/$imgs
+#done
+#popd
+
+mv $RPM_BUILD_ROOT%{_libdir}/nautilus/extensions-1.0 $RPM_BUILD_ROOT%{_libdir}/nautilus/extensions-2.0
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -94,7 +96,7 @@
 %doc ChangeLog AUTHORS COPYING NEWS README TODO
 %{_bindir}/gvn-*
 %{_libdir}/*.so.*
-%{_libdir}/nautilus/extensions-1.0/*.so*
+%{_libdir}/nautilus/extensions-2.0/*.so*
 %{_datadir}/%{name}
 %{_datadir}/applications/*.desktop
 %{_datadir}/icons/hicolor/??x??/apps/*.png
@@ -102,6 +104,9 @@
 
 
 %changelog
+* Sun Jan 11 2009 Xavier Lamien <lxtnow at gmail.com> - 0.5-5
+- Move plugin to nautilus-extension v2.0.
+
 * Thu Jan 08 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.5-4
 - Place the library to libdir
 



From mclasen at fedoraproject.org  Sun Jan 11 20:58:48 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Sun, 11 Jan 2009 20:58:48 +0000 (UTC)
Subject: rpms/gnome-media/devel gnome-media.spec,1.147,1.148
Message-ID: <20090111205848.183CA70141@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-media/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23508

Modified Files:
	gnome-media.spec 
Log Message:
silence %pre and %preun



Index: gnome-media.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-media/devel/gnome-media.spec,v
retrieving revision 1.147
retrieving revision 1.148
diff -u -r1.147 -r1.148
--- gnome-media.spec	7 Jan 2009 20:16:21 -0000	1.147
+++ gnome-media.spec	11 Jan 2009 20:58:17 -0000	1.148
@@ -14,7 +14,7 @@
 Summary:        GNOME media programs
 Name:           gnome-media
 Version:        2.25.1
-Release:        3%{?dist}
+Release:        4%{?dist}
 License:        GPLv2+ and GFDL
 Group:          Applications/Multimedia
 Source:         http://download.gnome.org/sources/gnome-media/2.25/gnome-media-%{version}.tar.bz2
@@ -166,9 +166,11 @@
       %{_sysconfdir}/gconf/schemas/gnome-sound-recorder.schemas \
       > /dev/null || :
   fi
-  gconftool-2 --makefile-uninstall-rule \
-    %{_sysconfdir}/gconf/schemas/gnome-volume-control.schemas \
-    > /dev/null || :
+  if [ -f %{_sysconfdir}/gconf/schemas/gnome-volume-control.schemas ] ; then
+    gconftool-2 --makefile-uninstall-rule \
+      %{_sysconfdir}/gconf/schemas/gnome-volume-control.schemas \
+      > /dev/null || :
+  fi
 fi
 
 %pre libs
@@ -192,9 +194,11 @@
       %{_sysconfdir}/gconf/schemas/gnome-sound-recorder.schemas \
       > /dev/null || :
   fi
-  gconftool-2 --makefile-uninstall-rule \
-    %{_sysconfdir}/gconf/schemas/gnome-volume-control.schemas \
-    > /dev/null || :
+  if [ -f %{_sysconfdir}/gconf/schemas/gnome-volume-control.schemas ] ; then
+    gconftool-2 --makefile-uninstall-rule \
+      %{_sysconfdir}/gconf/schemas/gnome-volume-control.schemas \
+      > /dev/null || :
+  fi
 fi
 
 %preun libs
@@ -240,6 +244,9 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Sun Jan 11 2009 Matthias Clasen <mclasen at redhat.com>  2.25.1-4
+- Silence %%pre and %%preun
+
 * Wed Jan 07 2009 - Rex Dieter <rdieter at fedoraproject.org> - 2.25.1-3
 - gnome-media should not depend on -devel packages (#479181)
 



From s4504kr at fedoraproject.org  Sun Jan 11 21:03:58 2009
From: s4504kr at fedoraproject.org (Jochen Schmitt)
Date: Sun, 11 Jan 2009 21:03:58 +0000 (UTC)
Subject: rpms/blender/devel blender.spec,1.97,1.98
Message-ID: <20090111210358.262FF70139@cvs1.fedora.phx.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/blender/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24653

Modified Files:
	blender.spec 
Log Message:
Create symlink to DejaVu-Sams font


Index: blender.spec
===================================================================
RCS file: /cvs/extras/rpms/blender/devel/blender.spec,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -r1.97 -r1.98
--- blender.spec	6 Jan 2009 19:17:42 -0000	1.97
+++ blender.spec	11 Jan 2009 21:03:27 -0000	1.98
@@ -5,7 +5,7 @@
 
 Name:           blender
 Version:        2.48a
-Release: 	9%{?dist}
+Release: 	10%{?dist}
 
 Summary:        3D modeling, animation, rendering and post-production
 
@@ -67,6 +67,10 @@
 Requires(postun): shared-mime-info
 
 Requires:	  blender-fonts = %{version}-%{release}
+Requires:	  dejavu-fonts-sans
+
+Provides:	  blender-fonts = %{version}-%{release}
+Obsoletes:	  blender-fonts <= 2.48a-9
 
 %description
 Blender is the essential software solution you need for 3D, from modeling,
@@ -77,15 +81,6 @@
 
 This version doesn't contains ffmpeg support.
 
-%package fonts
-Summary:	Fonts for the blender package
-Requires:	fontpackages-filesystem
-Group:		User Interface/X
-License:	Bitstream Veta Fonts
-
-%description fonts
-This package contains a font which will be used be blender
-
 %prep
 %setup -q 
 %patch1 -p1 -b .org
@@ -169,13 +164,10 @@
 install -d ${RPM_BUILD_ROOT}%{_libdir}/blender/scripts
 
 #
-# Install fonts
+# Create link to DejaVu-Sans
 #
-install -m 0755 -d ${RPM_BUILD_ROOT}/%{_fontdir}
-install -m 0644 -p release/datafiles/bfont.ttf ${RPM_BUILD_ROOT}/%{_fontdir}
 rm ${RPM_BUILD_ROOT}/%{_datadir}/blender/.bfont.ttf
-(cd ${RPM_BUILD_ROOT}; ln -sf %{_fontdir}/bfont.ttf ${RPM_BUILD_ROOT}/%{_datadir}/blender/.bfont.ttf)
-mv release/datafiles/LICENSE-bfont.ttf.txt release/datafiles/LICENSE
+(cd ${RPM_BUILD_ROOT}; ln -sf %{_fontdir}/dejavu/DejaVuSans.tt ${RPM_BUILD_ROOT}/%{_datadir}/blender/.bfont.ttf)
 
 %find_lang %name
 
@@ -202,12 +194,10 @@
 %{_libdir}/blender/
 %{_datadir}/mime/packages/blender.xml
 
-%files fonts
-%defattr(-,root,root,-)
-%doc release/datafiles/LICENSE
-%{_fontdir}/
-
 %changelog
+* Sun Jan 11 2009 Jochen Schmitt <Jochen herr-schmitt de> 2.48a-10
+- Create symlink to DajaVu-Sans
+
 * Tue Jan  6 2009 Jochen Schmitt <Jochen herr-schmitt de> 2.48a-9
 - Create fonts sub-package (#477370)
 



From terjeros at fedoraproject.org  Sun Jan 11 21:15:50 2009
From: terjeros at fedoraproject.org (=?utf-8?q?Terje_R=C3=B8sten?=)
Date: Sun, 11 Jan 2009 21:15:50 +0000 (UTC)
Subject: rpms/xosview/devel xosview.spec,1.1,1.2
Message-ID: <20090111211550.AC34270139@cvs1.fedora.phx.redhat.com>

Author: terjeros

Update of /cvs/extras/rpms/xosview/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25899

Modified Files:
	xosview.spec 
Log Message:
* Sun Jan 11 2009 Terje Rosten <terje.rosten at ntnu.no> - 1.8.3-14.20080301cvs
- Add xorg-x11-fonts-misc to req, fixing #479456.



Index: xosview.spec
===================================================================
RCS file: /cvs/extras/rpms/xosview/devel/xosview.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xosview.spec	11 Sep 2008 17:31:27 -0000	1.1
+++ xosview.spec	11 Jan 2009 21:15:20 -0000	1.2
@@ -3,7 +3,7 @@
 Name:          xosview
 Summary:       An X Window System utility for monitoring system resources
 Version:       1.8.3
-Release:       13.%{date}cvs%{?dist}
+Release:       14.%{date}cvs%{?dist}
 
 Group:         Applications/System
 # The netbsd/swapinternal.{cc,h} source files are BSD only (with 
@@ -30,6 +30,7 @@
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: autoconf libXpm-devel libX11-devel desktop-file-utils
+Requires:      xorg-x11-fonts-misc
 
 %description
 The xosview utility displays a set of bar graphs which show the
@@ -91,6 +92,9 @@
 %{_datadir}/applications/%{name}.desktop
 
 %changelog
+* Sun Jan 11 2009 Terje Rosten <terje.rosten at ntnu.no> - 1.8.3-14.20080301cvs
+- Add xorg-x11-fonts-misc to req, fixing #479456.
+
 * Mon Sep  8 2008 Terje Rosten <terje.rosten at ntnu.no> - 1.8.3-13.20080301cvs
 - Fix license and desktop file
 



From mjakubicek at fedoraproject.org  Sun Jan 11 21:18:07 2009
From: mjakubicek at fedoraproject.org (=?utf-8?b?TWlsb8WhIEpha3Viw63EjWVr?=)
Date: Sun, 11 Jan 2009 21:18:07 +0000 (UTC)
Subject: rpms/cdargs/devel cdargs-1.35_shebangs.patch, 1.1, 1.2 cdargs.spec, 
	1.1, 1.2
Message-ID: <20090111211807.36EF470139@cvs1.fedora.phx.redhat.com>

Author: mjakubicek

Update of /cvs/pkgs/rpms/cdargs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26202

Modified Files:
	cdargs-1.35_shebangs.patch cdargs.spec 
Log Message:
- Fixed usage in other shells than bash: minor compatibility code changes and
  no complains because completion doesn't work (fix BZ#479398).



cdargs-1.35_shebangs.patch:

Index: cdargs-1.35_shebangs.patch
===================================================================
RCS file: /cvs/pkgs/rpms/cdargs/devel/cdargs-1.35_shebangs.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cdargs-1.35_shebangs.patch	26 Mar 2008 17:13:19 -0000	1.1
+++ cdargs-1.35_shebangs.patch	11 Jan 2009 21:17:36 -0000	1.2
@@ -7,6 +7,27 @@
  # (C) 2002-2003 Dan Allen and Stefan Kamphausen
  
  # Written by Dan Allen <dan at mojavelinux.com>
+@@ -166,7 +164,7 @@
+     local tmpfile
+
+     # first clear any bookmarks with this same alias, if file exists
+-    if [[ "$CDARGS_NODUPS" && -e "$HOME/.cdargs" ]]; then
++    if [ "$CDARGS_NODUPS" -a -e "$HOME/.cdargs" ]; then
+         tmpfile=`echo ${TEMP:-${TMPDIR:-/tmp}} | sed -e "s/\\/$//"`
+         tmpfile=$tmpfile/cdargs.$USER.$$.$RANDOM
+         grep -v "^$1 " "$HOME/.cdargs" > $tmpfile && 'mv' -f $tmpfile "$HOME/.cdargs";
+@@ -256,4 +254,11 @@
+   complete $nospace -S / -X '*/' -F _cdargs_aliases cv cb cdb
+ }
+
++# we do not support anything besides bash completion
++# (however patches to support other shells are very welcome)
++
++if [ -z "${BASH_VERSION}" ]; then
++    return 100
++fi
++
+ _cdargs_complete
 diff -Naur cdargs-1.35/contrib/cdargs-tcsh.csh cdargs-1.35_patched/contrib/cdargs-tcsh.csh
 --- cdargs-1.35/contrib/cdargs-tcsh.csh	2005-11-06 11:58:13.000000000 +0100
 +++ cdargs-1.35_patched/contrib/cdargs-tcsh.csh	2008-03-08 11:02:29.000000000 +0100


Index: cdargs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cdargs/devel/cdargs.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cdargs.spec	26 Mar 2008 17:13:19 -0000	1.1
+++ cdargs.spec	11 Jan 2009 21:17:36 -0000	1.2
@@ -2,7 +2,7 @@
 
 Name:		cdargs
 Version:	1.35
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	The shell cd with bookmarks and browser
 
 Group:		Applications/File
@@ -83,6 +83,10 @@
 
 %changelog
 
+* Sun Jan 11 2009 Milos Jakubicek <xjakub at fi.muni.cz> - 1.35-3
+- Fixed usage in other shells than bash: minor compatibility code changes and 
+  no complains because completion doesn't work (fix BZ#479398).
+
 * Tue Mar 25 2008 Milos Jakubicek <xjakub at fi.muni.cz> - 1.35-2
 - Fixed non-capital starting letter in the summary of emacs-cdargs subpackage.
 



From terjeros at fedoraproject.org  Sun Jan 11 21:25:01 2009
From: terjeros at fedoraproject.org (=?utf-8?q?Terje_R=C3=B8sten?=)
Date: Sun, 11 Jan 2009 21:25:01 +0000 (UTC)
Subject: rpms/xosview/F-9 xosview.spec,1.1,1.2
Message-ID: <20090111212501.428A270141@cvs1.fedora.phx.redhat.com>

Author: terjeros

Update of /cvs/extras/rpms/xosview/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26944/F-9

Modified Files:
	xosview.spec 
Log Message:
Sync with rawhide.




Index: xosview.spec
===================================================================
RCS file: /cvs/extras/rpms/xosview/F-9/xosview.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xosview.spec	11 Sep 2008 17:40:46 -0000	1.1
+++ xosview.spec	11 Jan 2009 21:24:31 -0000	1.2
@@ -3,7 +3,7 @@
 Name:          xosview
 Summary:       An X Window System utility for monitoring system resources
 Version:       1.8.3
-Release:       13.%{date}cvs%{?dist}
+Release:       14.%{date}cvs%{?dist}
 
 Group:         Applications/System
 # The netbsd/swapinternal.{cc,h} source files are BSD only (with 
@@ -30,6 +30,7 @@
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: autoconf libXpm-devel libX11-devel desktop-file-utils
+Requires:      xorg-x11-fonts-misc
 
 %description
 The xosview utility displays a set of bar graphs which show the
@@ -91,6 +92,9 @@
 %{_datadir}/applications/%{name}.desktop
 
 %changelog
+* Sun Jan 11 2009 Terje Rosten <terje.rosten at ntnu.no> - 1.8.3-14.20080301cvs
+- Add xorg-x11-fonts-misc to req, fixing #479456.
+
 * Mon Sep  8 2008 Terje Rosten <terje.rosten at ntnu.no> - 1.8.3-13.20080301cvs
 - Fix license and desktop file
 



From terjeros at fedoraproject.org  Sun Jan 11 21:25:01 2009
From: terjeros at fedoraproject.org (=?utf-8?q?Terje_R=C3=B8sten?=)
Date: Sun, 11 Jan 2009 21:25:01 +0000 (UTC)
Subject: rpms/xosview/F-10 xosview.spec,1.1,1.2
Message-ID: <20090111212501.12AD370139@cvs1.fedora.phx.redhat.com>

Author: terjeros

Update of /cvs/extras/rpms/xosview/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26944/F-10

Modified Files:
	xosview.spec 
Log Message:
Sync with rawhide.




Index: xosview.spec
===================================================================
RCS file: /cvs/extras/rpms/xosview/F-10/xosview.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xosview.spec	11 Sep 2008 17:31:27 -0000	1.1
+++ xosview.spec	11 Jan 2009 21:24:30 -0000	1.2
@@ -3,7 +3,7 @@
 Name:          xosview
 Summary:       An X Window System utility for monitoring system resources
 Version:       1.8.3
-Release:       13.%{date}cvs%{?dist}
+Release:       14.%{date}cvs%{?dist}
 
 Group:         Applications/System
 # The netbsd/swapinternal.{cc,h} source files are BSD only (with 
@@ -30,6 +30,7 @@
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: autoconf libXpm-devel libX11-devel desktop-file-utils
+Requires:      xorg-x11-fonts-misc
 
 %description
 The xosview utility displays a set of bar graphs which show the
@@ -91,6 +92,9 @@
 %{_datadir}/applications/%{name}.desktop
 
 %changelog
+* Sun Jan 11 2009 Terje Rosten <terje.rosten at ntnu.no> - 1.8.3-14.20080301cvs
+- Add xorg-x11-fonts-misc to req, fixing #479456.
+
 * Mon Sep  8 2008 Terje Rosten <terje.rosten at ntnu.no> - 1.8.3-13.20080301cvs
 - Fix license and desktop file
 



From mjakubicek at fedoraproject.org  Sun Jan 11 21:26:37 2009
From: mjakubicek at fedoraproject.org (=?utf-8?b?TWlsb8WhIEpha3Viw63EjWVr?=)
Date: Sun, 11 Jan 2009 21:26:37 +0000 (UTC)
Subject: rpms/cdargs/F-10 cdargs-1.35_shebangs.patch, 1.1, 1.2 cdargs.spec,
	1.1, 1.2
Message-ID: <20090111212637.20EB670139@cvs1.fedora.phx.redhat.com>

Author: mjakubicek

Update of /cvs/pkgs/rpms/cdargs/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27185

Modified Files:
	cdargs-1.35_shebangs.patch cdargs.spec 
Log Message:
- Fixed usage in other shells than bash: minor compatibility code changes and
  no complains because completion doesn't work (fix BZ#479398).



cdargs-1.35_shebangs.patch:

Index: cdargs-1.35_shebangs.patch
===================================================================
RCS file: /cvs/pkgs/rpms/cdargs/F-10/cdargs-1.35_shebangs.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cdargs-1.35_shebangs.patch	26 Mar 2008 17:13:19 -0000	1.1
+++ cdargs-1.35_shebangs.patch	11 Jan 2009 21:26:06 -0000	1.2
@@ -7,6 +7,27 @@
  # (C) 2002-2003 Dan Allen and Stefan Kamphausen
  
  # Written by Dan Allen <dan at mojavelinux.com>
+@@ -166,7 +164,7 @@
+     local tmpfile
+
+     # first clear any bookmarks with this same alias, if file exists
+-    if [[ "$CDARGS_NODUPS" && -e "$HOME/.cdargs" ]]; then
++    if [ "$CDARGS_NODUPS" -a -e "$HOME/.cdargs" ]; then
+         tmpfile=`echo ${TEMP:-${TMPDIR:-/tmp}} | sed -e "s/\\/$//"`
+         tmpfile=$tmpfile/cdargs.$USER.$$.$RANDOM
+         grep -v "^$1 " "$HOME/.cdargs" > $tmpfile && 'mv' -f $tmpfile "$HOME/.cdargs";
+@@ -256,4 +254,11 @@
+   complete $nospace -S / -X '*/' -F _cdargs_aliases cv cb cdb
+ }
+
++# we do not support anything besides bash completion
++# (however patches to support other shells are very welcome)
++
++if [ -z "${BASH_VERSION}" ]; then
++    return 100
++fi
++
+ _cdargs_complete
 diff -Naur cdargs-1.35/contrib/cdargs-tcsh.csh cdargs-1.35_patched/contrib/cdargs-tcsh.csh
 --- cdargs-1.35/contrib/cdargs-tcsh.csh	2005-11-06 11:58:13.000000000 +0100
 +++ cdargs-1.35_patched/contrib/cdargs-tcsh.csh	2008-03-08 11:02:29.000000000 +0100


Index: cdargs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cdargs/F-10/cdargs.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cdargs.spec	26 Mar 2008 17:13:19 -0000	1.1
+++ cdargs.spec	11 Jan 2009 21:26:06 -0000	1.2
@@ -2,7 +2,7 @@
 
 Name:		cdargs
 Version:	1.35
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	The shell cd with bookmarks and browser
 
 Group:		Applications/File
@@ -83,6 +83,10 @@
 
 %changelog
 
+* Sun Jan 11 2009 Milos Jakubicek <xjakub at fi.muni.cz> - 1.35-3
+- Fixed usage in other shells than bash: minor compatibility code changes and 
+  no complains because completion doesn't work (fix BZ#479398).
+
 * Tue Mar 25 2008 Milos Jakubicek <xjakub at fi.muni.cz> - 1.35-2
 - Fixed non-capital starting letter in the summary of emacs-cdargs subpackage.
 



From mjakubicek at fedoraproject.org  Sun Jan 11 21:37:55 2009
From: mjakubicek at fedoraproject.org (=?utf-8?b?TWlsb8WhIEpha3Viw63EjWVr?=)
Date: Sun, 11 Jan 2009 21:37:55 +0000 (UTC)
Subject: rpms/cdargs/F-9 cdargs-1.35_shebangs.patch, 1.1, 1.2 cdargs.spec,
	1.1, 1.2
Message-ID: <20090111213755.C855270139@cvs1.fedora.phx.redhat.com>

Author: mjakubicek

Update of /cvs/pkgs/rpms/cdargs/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28987

Modified Files:
	cdargs-1.35_shebangs.patch cdargs.spec 
Log Message:
- Fixed usage in other shells than bash: minor compatibility code changes and
  no complains because completion doesn't work (fix BZ#479398).



cdargs-1.35_shebangs.patch:

Index: cdargs-1.35_shebangs.patch
===================================================================
RCS file: /cvs/pkgs/rpms/cdargs/F-9/cdargs-1.35_shebangs.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cdargs-1.35_shebangs.patch	26 Mar 2008 17:13:19 -0000	1.1
+++ cdargs-1.35_shebangs.patch	11 Jan 2009 21:37:25 -0000	1.2
@@ -7,6 +7,27 @@
  # (C) 2002-2003 Dan Allen and Stefan Kamphausen
  
  # Written by Dan Allen <dan at mojavelinux.com>
+@@ -166,7 +164,7 @@
+     local tmpfile
+
+     # first clear any bookmarks with this same alias, if file exists
+-    if [[ "$CDARGS_NODUPS" && -e "$HOME/.cdargs" ]]; then
++    if [ "$CDARGS_NODUPS" -a -e "$HOME/.cdargs" ]; then
+         tmpfile=`echo ${TEMP:-${TMPDIR:-/tmp}} | sed -e "s/\\/$//"`
+         tmpfile=$tmpfile/cdargs.$USER.$$.$RANDOM
+         grep -v "^$1 " "$HOME/.cdargs" > $tmpfile && 'mv' -f $tmpfile "$HOME/.cdargs";
+@@ -256,4 +254,11 @@
+   complete $nospace -S / -X '*/' -F _cdargs_aliases cv cb cdb
+ }
+
++# we do not support anything besides bash completion
++# (however patches to support other shells are very welcome)
++
++if [ -z "${BASH_VERSION}" ]; then
++    return 100
++fi
++
+ _cdargs_complete
 diff -Naur cdargs-1.35/contrib/cdargs-tcsh.csh cdargs-1.35_patched/contrib/cdargs-tcsh.csh
 --- cdargs-1.35/contrib/cdargs-tcsh.csh	2005-11-06 11:58:13.000000000 +0100
 +++ cdargs-1.35_patched/contrib/cdargs-tcsh.csh	2008-03-08 11:02:29.000000000 +0100


Index: cdargs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cdargs/F-9/cdargs.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cdargs.spec	26 Mar 2008 17:13:19 -0000	1.1
+++ cdargs.spec	11 Jan 2009 21:37:25 -0000	1.2
@@ -2,7 +2,7 @@
 
 Name:		cdargs
 Version:	1.35
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	The shell cd with bookmarks and browser
 
 Group:		Applications/File
@@ -83,6 +83,10 @@
 
 %changelog
 
+* Sun Jan 11 2009 Milos Jakubicek <xjakub at fi.muni.cz> - 1.35-3
+- Fixed usage in other shells than bash: minor compatibility code changes and 
+  no complains because completion doesn't work (fix BZ#479398).
+
 * Tue Mar 25 2008 Milos Jakubicek <xjakub at fi.muni.cz> - 1.35-2
 - Fixed non-capital starting letter in the summary of emacs-cdargs subpackage.
 



From chitlesh at fedoraproject.org  Sun Jan 11 22:13:53 2009
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Sun, 11 Jan 2009 22:13:53 +0000 (UTC)
Subject: rpms/geda-docs/F-9 .cvsignore, 1.11, 1.12 geda-docs.spec, 1.10,
	1.11 import.log, 1.2, 1.3 sources, 1.11, 1.12
Message-ID: <20090111221353.A012A70139@cvs1.fedora.phx.redhat.com>

Author: chitlesh

Update of /cvs/pkgs/rpms/geda-docs/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv783/F-9

Modified Files:
	.cvsignore geda-docs.spec import.log sources 
Log Message:
20081231


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/geda-docs/F-9/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	22 Dec 2008 22:52:35 -0000	1.11
+++ .cvsignore	11 Jan 2009 22:13:23 -0000	1.12
@@ -1 +1 @@
-geda-docs-1.4.2.tar.gz
+geda-docs-1.4.3.tar.gz


Index: geda-docs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/geda-docs/F-9/geda-docs.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- geda-docs.spec	22 Dec 2008 22:52:35 -0000	1.10
+++ geda-docs.spec	11 Jan 2009 22:13:23 -0000	1.11
@@ -1,8 +1,8 @@
 %define     gedadocdir %{_docdir}/gEDA/
-%define     real_ver   1.4.2
+%define     real_ver   1.4.3
 
 Name:       geda-docs
-Version:    20081220
+Version:    20081231
 Release:    1%{?dist}
 
 Summary:    Documentation for gEDA
@@ -66,6 +66,9 @@
 
 
 %Changelog
+* Sun Jan 11 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20081231-1
+- new upstream release
+
 * Sun Dec 21 2008 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20081220-1
 - new upstream release
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/geda-docs/F-9/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	22 Dec 2008 22:52:35 -0000	1.2
+++ import.log	11 Jan 2009 22:13:23 -0000	1.3
@@ -1,2 +1,3 @@
 geda-docs-20080929-1_fc9:F-9:geda-docs-20080929-1.fc9.src.rpm:1226443986
 geda-docs-20081220-1_fc10:F-9:geda-docs-20081220-1.fc10.src.rpm:1229986290
+geda-docs-20081231-1_fc10:F-9:geda-docs-20081231-1.fc10.src.rpm:1231711715


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/geda-docs/F-9/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	22 Dec 2008 22:52:35 -0000	1.11
+++ sources	11 Jan 2009 22:13:23 -0000	1.12
@@ -1 +1 @@
-64c4e24742a95af66e37475b1c3dd467  geda-docs-1.4.2.tar.gz
+6305083c37a86f2353a8be40bcf70b99  geda-docs-1.4.3.tar.gz



From chitlesh at fedoraproject.org  Sun Jan 11 22:15:07 2009
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Sun, 11 Jan 2009 22:15:07 +0000 (UTC)
Subject: rpms/geda-examples/F-9 .cvsignore, 1.12, 1.13 geda-examples.spec,
	1.13, 1.14 import.log, 1.2, 1.3 sources, 1.12, 1.13
Message-ID: <20090111221507.D8D7670139@cvs1.fedora.phx.redhat.com>

Author: chitlesh

Update of /cvs/pkgs/rpms/geda-examples/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1083/F-9

Modified Files:
	.cvsignore geda-examples.spec import.log sources 
Log Message:
20081231


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/geda-examples/F-9/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	22 Dec 2008 22:48:55 -0000	1.12
+++ .cvsignore	11 Jan 2009 22:14:37 -0000	1.13
@@ -1 +1 @@
-geda-examples-1.4.2.tar.gz
+geda-examples-1.4.3.tar.gz


Index: geda-examples.spec
===================================================================
RCS file: /cvs/pkgs/rpms/geda-examples/F-9/geda-examples.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- geda-examples.spec	22 Dec 2008 22:48:56 -0000	1.13
+++ geda-examples.spec	11 Jan 2009 22:14:37 -0000	1.14
@@ -1,8 +1,8 @@
 %define     gedadocdir %{_docdir}/gEDA
-%define     real_ver   1.4.2
+%define     real_ver   1.4.3
 
 Name:       geda-examples
-Version:    20081220
+Version:    20081231
 Release:    1%{?dist}
 
 Summary:    Circuit examples for gEDA
@@ -73,6 +73,9 @@
 %{gedadocdir}/examples/README
 
 %Changelog
+* Sun Jan 11 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20081231-1
+- new upstream release
+
 * Sun Dec 21 2008 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20081220-1
 - new upstream release
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/geda-examples/F-9/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	22 Dec 2008 22:48:56 -0000	1.2
+++ import.log	11 Jan 2009 22:14:37 -0000	1.3
@@ -1,2 +1,3 @@
 geda-examples-20080929-1_fc9:F-9:geda-examples-20080929-1.fc9.src.rpm:1226443552
 geda-examples-20081220-1_fc10:F-9:geda-examples-20081220-1.fc10.src.rpm:1229986037
+geda-examples-20081231-1_fc10:F-9:geda-examples-20081231-1.fc10.src.rpm:1231711995


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/geda-examples/F-9/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	22 Dec 2008 22:48:56 -0000	1.12
+++ sources	11 Jan 2009 22:14:37 -0000	1.13
@@ -1 +1 @@
-09c7adfcf9cb27955aa273a780538935  geda-examples-1.4.2.tar.gz
+923fe9d9cc843b5eb7b26c91ad0ef2d4  geda-examples-1.4.3.tar.gz



From chitlesh at fedoraproject.org  Sun Jan 11 22:15:46 2009
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Sun, 11 Jan 2009 22:15:46 +0000 (UTC)
Subject: rpms/geda-docs/F-10 .cvsignore, 1.11, 1.12 geda-docs.spec, 1.10,
	1.11 import.log, 1.2, 1.3 sources, 1.11, 1.12
Message-ID: <20090111221546.1BB4A70139@cvs1.fedora.phx.redhat.com>

Author: chitlesh

Update of /cvs/pkgs/rpms/geda-docs/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1219/F-10

Modified Files:
	.cvsignore geda-docs.spec import.log sources 
Log Message:
20081231


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/geda-docs/F-10/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	22 Dec 2008 22:55:18 -0000	1.11
+++ .cvsignore	11 Jan 2009 22:15:15 -0000	1.12
@@ -1 +1 @@
-geda-docs-1.4.2.tar.gz
+geda-docs-1.4.3.tar.gz


Index: geda-docs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/geda-docs/F-10/geda-docs.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- geda-docs.spec	22 Dec 2008 22:55:18 -0000	1.10
+++ geda-docs.spec	11 Jan 2009 22:15:15 -0000	1.11
@@ -1,8 +1,8 @@
 %define     gedadocdir %{_docdir}/gEDA/
-%define     real_ver   1.4.2
+%define     real_ver   1.4.3
 
 Name:       geda-docs
-Version:    20081220
+Version:    20081231
 Release:    1%{?dist}
 
 Summary:    Documentation for gEDA
@@ -66,6 +66,9 @@
 
 
 %Changelog
+* Sun Jan 11 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20081231-1
+- new upstream release
+
 * Sun Dec 21 2008 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20081220-1
 - new upstream release
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/geda-docs/F-10/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	22 Dec 2008 22:55:18 -0000	1.2
+++ import.log	11 Jan 2009 22:15:15 -0000	1.3
@@ -1,2 +1,3 @@
 geda-docs-20080929-1_fc9:F-10:geda-docs-20080929-1.fc9.src.rpm:1226444067
 geda-docs-20081220-1_fc10:F-10:geda-docs-20081220-1.fc10.src.rpm:1229986472
+geda-docs-20081231-1_fc10:F-10:geda-docs-20081231-1.fc10.src.rpm:1231712037


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/geda-docs/F-10/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	22 Dec 2008 22:55:18 -0000	1.11
+++ sources	11 Jan 2009 22:15:15 -0000	1.12
@@ -1 +1 @@
-64c4e24742a95af66e37475b1c3dd467  geda-docs-1.4.2.tar.gz
+6305083c37a86f2353a8be40bcf70b99  geda-docs-1.4.3.tar.gz



From chitlesh at fedoraproject.org  Sun Jan 11 22:18:09 2009
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Sun, 11 Jan 2009 22:18:09 +0000 (UTC)
Subject: rpms/geda-examples/F-10 .cvsignore, 1.12, 1.13 geda-examples.spec, 
	1.13, 1.14 import.log, 1.2, 1.3 sources, 1.12, 1.13
Message-ID: <20090111221809.A786170139@cvs1.fedora.phx.redhat.com>

Author: chitlesh

Update of /cvs/pkgs/rpms/geda-examples/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1824/F-10

Modified Files:
	.cvsignore geda-examples.spec import.log sources 
Log Message:
20081231


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/geda-examples/F-10/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	22 Dec 2008 22:52:25 -0000	1.12
+++ .cvsignore	11 Jan 2009 22:17:38 -0000	1.13
@@ -1 +1 @@
-geda-examples-1.4.2.tar.gz
+geda-examples-1.4.3.tar.gz


Index: geda-examples.spec
===================================================================
RCS file: /cvs/pkgs/rpms/geda-examples/F-10/geda-examples.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- geda-examples.spec	22 Dec 2008 22:52:25 -0000	1.13
+++ geda-examples.spec	11 Jan 2009 22:17:39 -0000	1.14
@@ -1,8 +1,8 @@
 %define     gedadocdir %{_docdir}/gEDA
-%define     real_ver   1.4.2
+%define     real_ver   1.4.3
 
 Name:       geda-examples
-Version:    20081220
+Version:    20081231
 Release:    1%{?dist}
 
 Summary:    Circuit examples for gEDA
@@ -73,6 +73,9 @@
 %{gedadocdir}/examples/README
 
 %Changelog
+* Sun Jan 11 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20081231-1
+- new upstream release
+
 * Sun Dec 21 2008 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20081220-1
 - new upstream release
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/geda-examples/F-10/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	22 Dec 2008 22:52:25 -0000	1.2
+++ import.log	11 Jan 2009 22:17:39 -0000	1.3
@@ -1,2 +1,3 @@
 geda-examples-20080929-1_fc9:F-10:geda-examples-20080929-1.fc9.src.rpm:1226443649
 geda-examples-20081220-1_fc10:F-10:geda-examples-20081220-1.fc10.src.rpm:1229986280
+geda-examples-20081231-1_fc10:F-10:geda-examples-20081231-1.fc10.src.rpm:1231712167


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/geda-examples/F-10/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	22 Dec 2008 22:52:25 -0000	1.12
+++ sources	11 Jan 2009 22:17:39 -0000	1.13
@@ -1 +1 @@
-09c7adfcf9cb27955aa273a780538935  geda-examples-1.4.2.tar.gz
+923fe9d9cc843b5eb7b26c91ad0ef2d4  geda-examples-1.4.3.tar.gz



From chitlesh at fedoraproject.org  Sun Jan 11 22:18:10 2009
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Sun, 11 Jan 2009 22:18:10 +0000 (UTC)
Subject: rpms/geda-docs/devel .cvsignore, 1.11, 1.12 geda-docs.spec, 1.10,
	1.11 import.log, 1.2, 1.3 sources, 1.11, 1.12
Message-ID: <20090111221810.8D36570139@cvs1.fedora.phx.redhat.com>

Author: chitlesh

Update of /cvs/pkgs/rpms/geda-docs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1851/devel

Modified Files:
	.cvsignore geda-docs.spec import.log sources 
Log Message:
20081231


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/geda-docs/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	22 Dec 2008 23:02:23 -0000	1.11
+++ .cvsignore	11 Jan 2009 22:17:40 -0000	1.12
@@ -1 +1 @@
-geda-docs-1.4.2.tar.gz
+geda-docs-1.4.3.tar.gz


Index: geda-docs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/geda-docs/devel/geda-docs.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- geda-docs.spec	22 Dec 2008 23:02:23 -0000	1.10
+++ geda-docs.spec	11 Jan 2009 22:17:40 -0000	1.11
@@ -1,8 +1,8 @@
 %define     gedadocdir %{_docdir}/gEDA/
-%define     real_ver   1.4.2
+%define     real_ver   1.4.3
 
 Name:       geda-docs
-Version:    20081220
+Version:    20081231
 Release:    1%{?dist}
 
 Summary:    Documentation for gEDA
@@ -66,6 +66,9 @@
 
 
 %Changelog
+* Sun Jan 11 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20081231-1
+- new upstream release
+
 * Sun Dec 21 2008 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20081220-1
 - new upstream release
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/geda-docs/devel/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	22 Dec 2008 23:02:23 -0000	1.2
+++ import.log	11 Jan 2009 22:17:40 -0000	1.3
@@ -1,2 +1,3 @@
 geda-docs-20080929-1_fc9:HEAD:geda-docs-20080929-1.fc9.src.rpm:1226428994
 geda-docs-20081220-1_fc10:HEAD:geda-docs-20081220-1.fc10.src.rpm:1229986573
+geda-docs-20081231-1_fc10:HEAD:geda-docs-20081231-1.fc10.src.rpm:1231712168


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/geda-docs/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	22 Dec 2008 23:02:23 -0000	1.11
+++ sources	11 Jan 2009 22:17:40 -0000	1.12
@@ -1 +1 @@
-64c4e24742a95af66e37475b1c3dd467  geda-docs-1.4.2.tar.gz
+6305083c37a86f2353a8be40bcf70b99  geda-docs-1.4.3.tar.gz



From chitlesh at fedoraproject.org  Sun Jan 11 22:20:52 2009
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Sun, 11 Jan 2009 22:20:52 +0000 (UTC)
Subject: rpms/geda-examples/devel .cvsignore, 1.12, 1.13 geda-examples.spec, 
	1.13, 1.14 import.log, 1.2, 1.3 sources, 1.12, 1.13
Message-ID: <20090111222052.2B55870139@cvs1.fedora.phx.redhat.com>

Author: chitlesh

Update of /cvs/pkgs/rpms/geda-examples/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2364/devel

Modified Files:
	.cvsignore geda-examples.spec import.log sources 
Log Message:
20081231


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/geda-examples/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	22 Dec 2008 22:55:20 -0000	1.12
+++ .cvsignore	11 Jan 2009 22:20:21 -0000	1.13
@@ -1 +1 @@
-geda-examples-1.4.2.tar.gz
+geda-examples-1.4.3.tar.gz


Index: geda-examples.spec
===================================================================
RCS file: /cvs/pkgs/rpms/geda-examples/devel/geda-examples.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- geda-examples.spec	22 Dec 2008 22:55:20 -0000	1.13
+++ geda-examples.spec	11 Jan 2009 22:20:21 -0000	1.14
@@ -1,8 +1,8 @@
 %define     gedadocdir %{_docdir}/gEDA
-%define     real_ver   1.4.2
+%define     real_ver   1.4.3
 
 Name:       geda-examples
-Version:    20081220
+Version:    20081231
 Release:    1%{?dist}
 
 Summary:    Circuit examples for gEDA
@@ -73,6 +73,9 @@
 %{gedadocdir}/examples/README
 
 %Changelog
+* Sun Jan 11 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20081231-1
+- new upstream release
+
 * Sun Dec 21 2008 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20081220-1
 - new upstream release
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/geda-examples/devel/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	22 Dec 2008 22:55:20 -0000	1.2
+++ import.log	11 Jan 2009 22:20:21 -0000	1.3
@@ -1,2 +1,3 @@
 geda-examples-20080929-1_fc9:HEAD:geda-examples-20080929-1.fc9.src.rpm:1226435418
 geda-examples-20081220-1_fc10:HEAD:geda-examples-20081220-1.fc10.src.rpm:1229986464
+geda-examples-20081231-1_fc10:HEAD:geda-examples-20081231-1.fc10.src.rpm:1231712342


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/geda-examples/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	22 Dec 2008 22:55:20 -0000	1.12
+++ sources	11 Jan 2009 22:20:21 -0000	1.13
@@ -1 +1 @@
-09c7adfcf9cb27955aa273a780538935  geda-examples-1.4.2.tar.gz
+923fe9d9cc843b5eb7b26c91ad0ef2d4  geda-examples-1.4.3.tar.gz



From chitlesh at fedoraproject.org  Sun Jan 11 22:22:16 2009
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Sun, 11 Jan 2009 22:22:16 +0000 (UTC)
Subject: rpms/geda-gschem/F-9 .cvsignore, 1.12, 1.13 geda-gschem.spec, 1.16, 
	1.17 import.log, 1.2, 1.3 sources, 1.12, 1.13
Message-ID: <20090111222216.8A5D470139@cvs1.fedora.phx.redhat.com>

Author: chitlesh

Update of /cvs/pkgs/rpms/geda-gschem/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2727/F-9

Modified Files:
	.cvsignore geda-gschem.spec import.log sources 
Log Message:
20081231


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/geda-gschem/F-9/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	22 Dec 2008 22:22:18 -0000	1.12
+++ .cvsignore	11 Jan 2009 22:21:45 -0000	1.13
@@ -1 +1 @@
-geda-gschem-1.4.2.tar.gz
+geda-gschem-1.4.3.tar.gz


Index: geda-gschem.spec
===================================================================
RCS file: /cvs/pkgs/rpms/geda-gschem/F-9/geda-gschem.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- geda-gschem.spec	22 Dec 2008 22:22:18 -0000	1.16
+++ geda-gschem.spec	11 Jan 2009 22:21:46 -0000	1.17
@@ -1,7 +1,7 @@
-%define           real_ver 1.4.2
+%define           real_ver 1.4.3
 
 Name:             geda-gschem
-Version:          20081220
+Version:          20081231
 Release:          1%{?dist}
 
 Summary:          Electronics schematics editor
@@ -119,6 +119,9 @@
 %{_datadir}/icons/hicolor/*/apps/geda-gschem.*
 
 %Changelog
+* Sun Jan 11 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20081231-1
+- new upstream release
+
 * Sun Dec 21 2008 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20081220-1
 - new upstream release
 - stripped off contents that upstream accepted from us.


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/geda-gschem/F-9/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	22 Dec 2008 22:22:18 -0000	1.2
+++ import.log	11 Jan 2009 22:21:46 -0000	1.3
@@ -1,2 +1,3 @@
 geda-gschem-20080929-1_fc9:F-9:geda-gschem-20080929-1.fc9.src.rpm:1226444563
 geda-gschem-20081220-1_fc10:F-9:geda-gschem-20081220-1.fc10.src.rpm:1229984493
+geda-gschem-20081231-1_fc10:F-9:geda-gschem-20081231-1.fc10.src.rpm:1231712400


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/geda-gschem/F-9/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	22 Dec 2008 22:22:18 -0000	1.12
+++ sources	11 Jan 2009 22:21:46 -0000	1.13
@@ -1 +1 @@
-02a426cb537860bdf66d7c9b91cb7e04  geda-gschem-1.4.2.tar.gz
+76eef656ba4e27c6083fa29b3a5dfb08  geda-gschem-1.4.3.tar.gz



From chitlesh at fedoraproject.org  Sun Jan 11 22:23:00 2009
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Sun, 11 Jan 2009 22:23:00 +0000 (UTC)
Subject: rpms/geda-gsymcheck/F-9 .cvsignore, 1.13, 1.14 geda-gsymcheck.spec, 
	1.14, 1.15 import.log, 1.2, 1.3 sources, 1.13, 1.14
Message-ID: <20090111222300.5F69C70139@cvs1.fedora.phx.redhat.com>

Author: chitlesh

Update of /cvs/pkgs/rpms/geda-gsymcheck/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2992/F-9

Modified Files:
	.cvsignore geda-gsymcheck.spec import.log sources 
Log Message:
20081231


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/geda-gsymcheck/F-9/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	22 Dec 2008 22:32:57 -0000	1.13
+++ .cvsignore	11 Jan 2009 22:22:30 -0000	1.14
@@ -1 +1 @@
-geda-gsymcheck-1.4.2.tar.gz
+geda-gsymcheck-1.4.3.tar.gz


Index: geda-gsymcheck.spec
===================================================================
RCS file: /cvs/pkgs/rpms/geda-gsymcheck/F-9/geda-gsymcheck.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- geda-gsymcheck.spec	22 Dec 2008 22:32:57 -0000	1.14
+++ geda-gsymcheck.spec	11 Jan 2009 22:22:30 -0000	1.15
@@ -1,7 +1,7 @@
-%define           real_ver 1.4.2
+%define           real_ver 1.4.3
 
 Name:             geda-gsymcheck
-Version:          20081220
+Version:          20081231
 Release:          1%{?dist}
 
 Summary:          Symbol checker for electronics schematics editor
@@ -54,6 +54,9 @@
 %{_docdir}/gEDA/man/gsymcheck.html
 
 %Changelog
+* Sun Jan 11 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20081231-1
+- new upstream release
+
 * Sun Dec 21 2008 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20081220-1
 - new upstream release
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/geda-gsymcheck/F-9/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	22 Dec 2008 22:32:57 -0000	1.2
+++ import.log	11 Jan 2009 22:22:30 -0000	1.3
@@ -1,2 +1,3 @@
 geda-gsymcheck-20080929-1_fc9:F-9:geda-gsymcheck-20080929-1.fc9.src.rpm:1226444702
 geda-gsymcheck-20081220-1_fc10:F-9:geda-gsymcheck-20081220-1.fc10.src.rpm:1229985133
+geda-gsymcheck-20081231-1_fc10:F-9:geda-gsymcheck-20081231-1.fc10.src.rpm:1231712484


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/geda-gsymcheck/F-9/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	22 Dec 2008 22:32:57 -0000	1.13
+++ sources	11 Jan 2009 22:22:30 -0000	1.14
@@ -1 +1 @@
-0d26567e32fa70d0cf2b0614271120e2  geda-gsymcheck-1.4.2.tar.gz
+764613c24a752281a4f5d5432e53d0d2  geda-gsymcheck-1.4.3.tar.gz



From chitlesh at fedoraproject.org  Sun Jan 11 22:23:58 2009
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Sun, 11 Jan 2009 22:23:58 +0000 (UTC)
Subject: rpms/geda-gnetlist/F-9 .cvsignore, 1.13, 1.14 geda-gnetlist.spec,
	1.16, 1.17 import.log, 1.3, 1.4 sources, 1.13, 1.14
Message-ID: <20090111222358.6FB0670139@cvs1.fedora.phx.redhat.com>

Author: chitlesh

Update of /cvs/pkgs/rpms/geda-gnetlist/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3362/F-9

Modified Files:
	.cvsignore geda-gnetlist.spec import.log sources 
Log Message:
20081231


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/geda-gnetlist/F-9/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	23 Dec 2008 19:47:46 -0000	1.13
+++ .cvsignore	11 Jan 2009 22:23:28 -0000	1.14
@@ -1 +1 @@
-geda-gnetlist-1.4.2.tar.gz
+geda-gnetlist-1.4.3.tar.gz


Index: geda-gnetlist.spec
===================================================================
RCS file: /cvs/pkgs/rpms/geda-gnetlist/F-9/geda-gnetlist.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- geda-gnetlist.spec	23 Dec 2008 19:47:46 -0000	1.16
+++ geda-gnetlist.spec	11 Jan 2009 22:23:28 -0000	1.17
@@ -1,7 +1,7 @@
-%define         real_ver   1.4.2
+%define         real_ver   1.4.3
 
 Name:           geda-gnetlist
-Version:        20081220
+Version:        20081231
 Release:        1%{?dist}
 
 Summary:        Netlister for the gEDA project
@@ -82,6 +82,9 @@
 %{_docdir}/gEDA/examples/*
 
 %Changelog
+* Sun Jan 11 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20081231-1
+- new upstream release
+
 * Sun Dec 21 2008 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20081220-1
 - new upstream release
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/geda-gnetlist/F-9/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- import.log	23 Dec 2008 19:47:46 -0000	1.3
+++ import.log	11 Jan 2009 22:23:28 -0000	1.4
@@ -1,3 +1,4 @@
 geda-gnetlist-20080929-1_fc9:F-9:geda-gnetlist-20080929-1.fc9.src.rpm:1226444309
 geda-gnetlist-20080929-2_fc9:F-9:geda-gnetlist-20080929-2.fc9.src.rpm:1227041905
 geda-gnetlist-20081220-1_fc10:F-9:geda-gnetlist-20081220-1.fc10.src.rpm:1230061583
+geda-gnetlist-20081231-1_fc10:F-9:geda-gnetlist-20081231-1.fc10.src.rpm:1231712532


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/geda-gnetlist/F-9/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	23 Dec 2008 19:47:46 -0000	1.13
+++ sources	11 Jan 2009 22:23:28 -0000	1.14
@@ -1 +1 @@
-449414c36e176afdbdab25b3a1e1c7d8  geda-gnetlist-1.4.2.tar.gz
+ef31d47010108518c6d214516f3d0cad  geda-gnetlist-1.4.3.tar.gz



From chitlesh at fedoraproject.org  Sun Jan 11 22:24:21 2009
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Sun, 11 Jan 2009 22:24:21 +0000 (UTC)
Subject: rpms/geda-gschem/F-10 .cvsignore, 1.12, 1.13 geda-gschem.spec, 1.16,
	1.17 import.log, 1.2, 1.3 sources, 1.12, 1.13
Message-ID: <20090111222421.6673170139@cvs1.fedora.phx.redhat.com>

Author: chitlesh

Update of /cvs/pkgs/rpms/geda-gschem/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3560/F-10

Modified Files:
	.cvsignore geda-gschem.spec import.log sources 
Log Message:
20081231


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/geda-gschem/F-10/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	22 Dec 2008 22:25:03 -0000	1.12
+++ .cvsignore	11 Jan 2009 22:23:51 -0000	1.13
@@ -1 +1 @@
-geda-gschem-1.4.2.tar.gz
+geda-gschem-1.4.3.tar.gz


Index: geda-gschem.spec
===================================================================
RCS file: /cvs/pkgs/rpms/geda-gschem/F-10/geda-gschem.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- geda-gschem.spec	22 Dec 2008 22:25:03 -0000	1.16
+++ geda-gschem.spec	11 Jan 2009 22:23:51 -0000	1.17
@@ -1,7 +1,7 @@
-%define           real_ver 1.4.2
+%define           real_ver 1.4.3
 
 Name:             geda-gschem
-Version:          20081220
+Version:          20081231
 Release:          1%{?dist}
 
 Summary:          Electronics schematics editor
@@ -119,6 +119,9 @@
 %{_datadir}/icons/hicolor/*/apps/geda-gschem.*
 
 %Changelog
+* Sun Jan 11 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20081231-1
+- new upstream release
+
 * Sun Dec 21 2008 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20081220-1
 - new upstream release
 - stripped off contents that upstream accepted from us.


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/geda-gschem/F-10/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	22 Dec 2008 22:25:03 -0000	1.2
+++ import.log	11 Jan 2009 22:23:51 -0000	1.3
@@ -1,2 +1,3 @@
 geda-gschem-20080929-1_fc9:F-10:geda-gschem-20080929-1.fc9.src.rpm:1226444409
 geda-gschem-20081220-1_fc10:F-10:geda-gschem-20081220-1.fc10.src.rpm:1229984615
+geda-gschem-20081231-1_fc10:F-10:geda-gschem-20081231-1.fc10.src.rpm:1231712539


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/geda-gschem/F-10/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	22 Dec 2008 22:25:03 -0000	1.12
+++ sources	11 Jan 2009 22:23:51 -0000	1.13
@@ -1 +1 @@
-02a426cb537860bdf66d7c9b91cb7e04  geda-gschem-1.4.2.tar.gz
+76eef656ba4e27c6083fa29b3a5dfb08  geda-gschem-1.4.3.tar.gz



From chitlesh at fedoraproject.org  Sun Jan 11 22:24:24 2009
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Sun, 11 Jan 2009 22:24:24 +0000 (UTC)
Subject: rpms/geda-gsymcheck/F-10 .cvsignore, 1.13, 1.14 geda-gsymcheck.spec,
	1.14, 1.15 import.log, 1.2, 1.3 sources, 1.13, 1.14
Message-ID: <20090111222424.F18AD70139@cvs1.fedora.phx.redhat.com>

Author: chitlesh

Update of /cvs/pkgs/rpms/geda-gsymcheck/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3595/F-10

Modified Files:
	.cvsignore geda-gsymcheck.spec import.log sources 
Log Message:
20081231


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/geda-gsymcheck/F-10/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	22 Dec 2008 22:37:20 -0000	1.13
+++ .cvsignore	11 Jan 2009 22:23:54 -0000	1.14
@@ -1 +1 @@
-geda-gsymcheck-1.4.2.tar.gz
+geda-gsymcheck-1.4.3.tar.gz


Index: geda-gsymcheck.spec
===================================================================
RCS file: /cvs/pkgs/rpms/geda-gsymcheck/F-10/geda-gsymcheck.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- geda-gsymcheck.spec	22 Dec 2008 22:37:20 -0000	1.14
+++ geda-gsymcheck.spec	11 Jan 2009 22:23:54 -0000	1.15
@@ -1,7 +1,7 @@
-%define           real_ver 1.4.2
+%define           real_ver 1.4.3
 
 Name:             geda-gsymcheck
-Version:          20081220
+Version:          20081231
 Release:          1%{?dist}
 
 Summary:          Symbol checker for electronics schematics editor
@@ -54,6 +54,9 @@
 %{_docdir}/gEDA/man/gsymcheck.html
 
 %Changelog
+* Sun Jan 11 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20081231-1
+- new upstream release
+
 * Sun Dec 21 2008 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20081220-1
 - new upstream release
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/geda-gsymcheck/F-10/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	22 Dec 2008 22:37:20 -0000	1.2
+++ import.log	11 Jan 2009 22:23:54 -0000	1.3
@@ -1,2 +1,3 @@
 geda-gsymcheck-20080929-1_fc9:F-10:geda-gsymcheck-20080929-1.fc9.src.rpm:1226444854
 geda-gsymcheck-20081220-1_fc10:F-10:geda-gsymcheck-20081220-1.fc10.src.rpm:1229985278
+geda-gsymcheck-20081231-1_fc10:F-10:geda-gsymcheck-20081231-1.fc10.src.rpm:1231712567


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/geda-gsymcheck/F-10/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	22 Dec 2008 22:37:20 -0000	1.13
+++ sources	11 Jan 2009 22:23:54 -0000	1.14
@@ -1 +1 @@
-0d26567e32fa70d0cf2b0614271120e2  geda-gsymcheck-1.4.2.tar.gz
+764613c24a752281a4f5d5432e53d0d2  geda-gsymcheck-1.4.3.tar.gz



From chitlesh at fedoraproject.org  Sun Jan 11 22:25:11 2009
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Sun, 11 Jan 2009 22:25:11 +0000 (UTC)
Subject: rpms/geda-gattrib/F-9 .cvsignore, 1.12, 1.13 geda-gattrib.spec, 1.16,
	1.17 import.log, 1.2, 1.3 sources, 1.12, 1.13
Message-ID: <20090111222511.367E470139@cvs1.fedora.phx.redhat.com>

Author: chitlesh

Update of /cvs/pkgs/rpms/geda-gattrib/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3877/F-9

Modified Files:
	.cvsignore geda-gattrib.spec import.log sources 
Log Message:
20081231


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/geda-gattrib/F-9/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	22 Dec 2008 22:30:28 -0000	1.12
+++ .cvsignore	11 Jan 2009 22:24:40 -0000	1.13
@@ -1 +1 @@
-geda-gattrib-1.4.2.tar.gz
+geda-gattrib-1.4.3.tar.gz


Index: geda-gattrib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/geda-gattrib/F-9/geda-gattrib.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- geda-gattrib.spec	22 Dec 2008 22:30:28 -0000	1.16
+++ geda-gattrib.spec	11 Jan 2009 22:24:40 -0000	1.17
@@ -1,7 +1,7 @@
-%define         real_ver   1.4.2
+%define         real_ver   1.4.3
 
 Name:           geda-gattrib
-Version:        20081220
+Version:        20081231
 Release:        1%{?dist}
 
 Summary:        Attribute editor for gEDA
@@ -80,6 +80,9 @@
 
 
 %Changelog
+* Sun Jan 11 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20081231-1
+- new upstream release
+
 * Sun Dec 21 2008 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20081220-1
 - new upstream release
 - stripped off contents that upstream accepted from us.


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/geda-gattrib/F-9/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	22 Dec 2008 22:30:28 -0000	1.2
+++ import.log	11 Jan 2009 22:24:40 -0000	1.3
@@ -1,2 +1,3 @@
 geda-gattrib-20080929-1_fc9:F-9:geda-gattrib-20080929-1.fc9.src.rpm:1226444110
 geda-gattrib-20081220-1_fc10:F-9:geda-gattrib-20081220-1.fc10.src.rpm:1229984960
+geda-gattrib-20081231-1_fc10:F-9:geda-gattrib-20081231-1.fc10.src.rpm:1231712581


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/geda-gattrib/F-9/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	22 Dec 2008 22:30:28 -0000	1.12
+++ sources	11 Jan 2009 22:24:40 -0000	1.13
@@ -1 +1 @@
-f5e85cceedb47b55437b8f14888d10cf  geda-gattrib-1.4.2.tar.gz
+e1f68401e7ca5fff16292358f0dfd553  geda-gattrib-1.4.3.tar.gz



From chitlesh at fedoraproject.org  Sun Jan 11 22:25:31 2009
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Sun, 11 Jan 2009 22:25:31 +0000 (UTC)
Subject: rpms/geda-gnetlist/F-10 .cvsignore, 1.13, 1.14 geda-gnetlist.spec, 
	1.16, 1.17 import.log, 1.3, 1.4 sources, 1.13, 1.14
Message-ID: <20090111222531.3A32070139@cvs1.fedora.phx.redhat.com>

Author: chitlesh

Update of /cvs/pkgs/rpms/geda-gnetlist/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4064/F-10

Modified Files:
	.cvsignore geda-gnetlist.spec import.log sources 
Log Message:
20081231


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/geda-gnetlist/F-10/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	23 Dec 2008 19:52:15 -0000	1.13
+++ .cvsignore	11 Jan 2009 22:25:00 -0000	1.14
@@ -1 +1 @@
-geda-gnetlist-1.4.2.tar.gz
+geda-gnetlist-1.4.3.tar.gz


Index: geda-gnetlist.spec
===================================================================
RCS file: /cvs/pkgs/rpms/geda-gnetlist/F-10/geda-gnetlist.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- geda-gnetlist.spec	23 Dec 2008 19:52:15 -0000	1.16
+++ geda-gnetlist.spec	11 Jan 2009 22:25:00 -0000	1.17
@@ -1,7 +1,7 @@
-%define         real_ver   1.4.2
+%define         real_ver   1.4.3
 
 Name:           geda-gnetlist
-Version:        20081220
+Version:        20081231
 Release:        1%{?dist}
 
 Summary:        Netlister for the gEDA project
@@ -82,6 +82,9 @@
 %{_docdir}/gEDA/examples/*
 
 %Changelog
+* Sun Jan 11 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20081231-1
+- new upstream release
+
 * Sun Dec 21 2008 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20081220-1
 - new upstream release
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/geda-gnetlist/F-10/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- import.log	23 Dec 2008 19:52:15 -0000	1.3
+++ import.log	11 Jan 2009 22:25:00 -0000	1.4
@@ -1,3 +1,4 @@
 geda-gnetlist-20080929-1_fc9:F-10:geda-gnetlist-20080929-1.fc9.src.rpm:1226444405
 geda-gnetlist-20080929-2_fc9:F-10:geda-gnetlist-20080929-2.fc9.src.rpm:1227042029
 geda-gnetlist-20081220-1_fc10:F-10:geda-gnetlist-20081220-1.fc10.src.rpm:1230061798
+geda-gnetlist-20081231-1_fc10:F-10:geda-gnetlist-20081231-1.fc10.src.rpm:1231712632


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/geda-gnetlist/F-10/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	23 Dec 2008 19:52:15 -0000	1.13
+++ sources	11 Jan 2009 22:25:00 -0000	1.14
@@ -1 +1 @@
-449414c36e176afdbdab25b3a1e1c7d8  geda-gnetlist-1.4.2.tar.gz
+ef31d47010108518c6d214516f3d0cad  geda-gnetlist-1.4.3.tar.gz



From chitlesh at fedoraproject.org  Sun Jan 11 22:26:26 2009
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Sun, 11 Jan 2009 22:26:26 +0000 (UTC)
Subject: rpms/geda-gschem/devel .cvsignore, 1.12, 1.13 geda-gschem.spec, 1.16,
	1.17 import.log, 1.2, 1.3 sources, 1.12, 1.13
Message-ID: <20090111222626.4007970139@cvs1.fedora.phx.redhat.com>

Author: chitlesh

Update of /cvs/pkgs/rpms/geda-gschem/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4369/devel

Modified Files:
	.cvsignore geda-gschem.spec import.log sources 
Log Message:
20081231


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/geda-gschem/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	22 Dec 2008 22:27:23 -0000	1.12
+++ .cvsignore	11 Jan 2009 22:25:55 -0000	1.13
@@ -1 +1 @@
-geda-gschem-1.4.2.tar.gz
+geda-gschem-1.4.3.tar.gz


Index: geda-gschem.spec
===================================================================
RCS file: /cvs/pkgs/rpms/geda-gschem/devel/geda-gschem.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- geda-gschem.spec	22 Dec 2008 22:27:23 -0000	1.16
+++ geda-gschem.spec	11 Jan 2009 22:25:55 -0000	1.17
@@ -1,7 +1,7 @@
-%define           real_ver 1.4.2
+%define           real_ver 1.4.3
 
 Name:             geda-gschem
-Version:          20081220
+Version:          20081231
 Release:          1%{?dist}
 
 Summary:          Electronics schematics editor
@@ -119,6 +119,9 @@
 %{_datadir}/icons/hicolor/*/apps/geda-gschem.*
 
 %Changelog
+* Sun Jan 11 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20081231-1
+- new upstream release
+
 * Sun Dec 21 2008 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20081220-1
 - new upstream release
 - stripped off contents that upstream accepted from us.


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/geda-gschem/devel/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	22 Dec 2008 22:27:23 -0000	1.2
+++ import.log	11 Jan 2009 22:25:55 -0000	1.3
@@ -1,2 +1,3 @@
 geda-gschem-20080929-1_fc9:HEAD:geda-gschem-20080929-1.fc9.src.rpm:1226433641
 geda-gschem-20081220-1_fc10:HEAD:geda-gschem-20081220-1.fc10.src.rpm:1229984779
+geda-gschem-20081231-1_fc10:HEAD:geda-gschem-20081231-1.fc10.src.rpm:1231712646


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/geda-gschem/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	22 Dec 2008 22:27:23 -0000	1.12
+++ sources	11 Jan 2009 22:25:55 -0000	1.13
@@ -1 +1 @@
-02a426cb537860bdf66d7c9b91cb7e04  geda-gschem-1.4.2.tar.gz
+76eef656ba4e27c6083fa29b3a5dfb08  geda-gschem-1.4.3.tar.gz



From chitlesh at fedoraproject.org  Sun Jan 11 22:26:32 2009
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Sun, 11 Jan 2009 22:26:32 +0000 (UTC)
Subject: rpms/geda-gsymcheck/devel .cvsignore, 1.13, 1.14 geda-gsymcheck.spec,
	1.14, 1.15 import.log, 1.2, 1.3 sources, 1.13, 1.14
Message-ID: <20090111222632.7882B70139@cvs1.fedora.phx.redhat.com>

Author: chitlesh

Update of /cvs/pkgs/rpms/geda-gsymcheck/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4423/devel

Modified Files:
	.cvsignore geda-gsymcheck.spec import.log sources 
Log Message:
20081231


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/geda-gsymcheck/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	22 Dec 2008 22:44:25 -0000	1.13
+++ .cvsignore	11 Jan 2009 22:26:02 -0000	1.14
@@ -1 +1 @@
-geda-gsymcheck-1.4.2.tar.gz
+geda-gsymcheck-1.4.3.tar.gz


Index: geda-gsymcheck.spec
===================================================================
RCS file: /cvs/pkgs/rpms/geda-gsymcheck/devel/geda-gsymcheck.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- geda-gsymcheck.spec	22 Dec 2008 22:44:25 -0000	1.14
+++ geda-gsymcheck.spec	11 Jan 2009 22:26:02 -0000	1.15
@@ -1,7 +1,7 @@
-%define           real_ver 1.4.2
+%define           real_ver 1.4.3
 
 Name:             geda-gsymcheck
-Version:          20081220
+Version:          20081231
 Release:          1%{?dist}
 
 Summary:          Symbol checker for electronics schematics editor
@@ -54,6 +54,9 @@
 %{_docdir}/gEDA/man/gsymcheck.html
 
 %Changelog
+* Sun Jan 11 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20081231-1
+- new upstream release
+
 * Sun Dec 21 2008 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20081220-1
 - new upstream release
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/geda-gsymcheck/devel/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	22 Dec 2008 22:44:25 -0000	1.2
+++ import.log	11 Jan 2009 22:26:02 -0000	1.3
@@ -1,2 +1,3 @@
 geda-gsymcheck-20080929-1_fc9:HEAD:geda-gsymcheck-20080929-1.fc9.src.rpm:1226434294
 geda-gsymcheck-20081220-1_fc10:HEAD:geda-gsymcheck-20081220-1.fc10.src.rpm:1229985748
+geda-gsymcheck-20081231-1_fc10:HEAD:geda-gsymcheck-20081231-1.fc10.src.rpm:1231712653


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/geda-gsymcheck/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	22 Dec 2008 22:44:25 -0000	1.13
+++ sources	11 Jan 2009 22:26:02 -0000	1.14
@@ -1 +1 @@
-0d26567e32fa70d0cf2b0614271120e2  geda-gsymcheck-1.4.2.tar.gz
+764613c24a752281a4f5d5432e53d0d2  geda-gsymcheck-1.4.3.tar.gz



From chitlesh at fedoraproject.org  Sun Jan 11 22:27:02 2009
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Sun, 11 Jan 2009 22:27:02 +0000 (UTC)
Subject: rpms/geda-gnetlist/devel .cvsignore, 1.13, 1.14 geda-gnetlist.spec, 
	1.16, 1.17 import.log, 1.3, 1.4 sources, 1.13, 1.14
Message-ID: <20090111222702.DB2DF70139@cvs1.fedora.phx.redhat.com>

Author: chitlesh

Update of /cvs/pkgs/rpms/geda-gnetlist/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4690/devel

Modified Files:
	.cvsignore geda-gnetlist.spec import.log sources 
Log Message:
20081231


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/geda-gnetlist/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	23 Dec 2008 19:57:17 -0000	1.13
+++ .cvsignore	11 Jan 2009 22:26:32 -0000	1.14
@@ -1 +1 @@
-geda-gnetlist-1.4.2.tar.gz
+geda-gnetlist-1.4.3.tar.gz


Index: geda-gnetlist.spec
===================================================================
RCS file: /cvs/pkgs/rpms/geda-gnetlist/devel/geda-gnetlist.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- geda-gnetlist.spec	23 Dec 2008 19:57:17 -0000	1.16
+++ geda-gnetlist.spec	11 Jan 2009 22:26:32 -0000	1.17
@@ -1,7 +1,7 @@
-%define         real_ver   1.4.2
+%define         real_ver   1.4.3
 
 Name:           geda-gnetlist
-Version:        20081220
+Version:        20081231
 Release:        1%{?dist}
 
 Summary:        Netlister for the gEDA project
@@ -82,6 +82,9 @@
 %{_docdir}/gEDA/examples/*
 
 %Changelog
+* Sun Jan 11 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20081231-1
+- new upstream release
+
 * Sun Dec 21 2008 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20081220-1
 - new upstream release
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/geda-gnetlist/devel/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- import.log	23 Dec 2008 19:57:17 -0000	1.3
+++ import.log	11 Jan 2009 22:26:32 -0000	1.4
@@ -1,3 +1,4 @@
 geda-gnetlist-20080929-1_fc9:HEAD:geda-gnetlist-20080929-1.fc9.src.rpm:1226435613
 geda-gnetlist-20080929-2_fc9:HEAD:geda-gnetlist-20080929-2.fc9.src.rpm:1227042413
 geda-gnetlist-20081220-1_fc10:HEAD:geda-gnetlist-20081220-1.fc10.src.rpm:1230062059
+geda-gnetlist-20081231-1_fc10:HEAD:geda-gnetlist-20081231-1.fc10.src.rpm:1231712719


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/geda-gnetlist/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	23 Dec 2008 19:57:17 -0000	1.13
+++ sources	11 Jan 2009 22:26:32 -0000	1.14
@@ -1 +1 @@
-449414c36e176afdbdab25b3a1e1c7d8  geda-gnetlist-1.4.2.tar.gz
+ef31d47010108518c6d214516f3d0cad  geda-gnetlist-1.4.3.tar.gz



From chitlesh at fedoraproject.org  Sun Jan 11 22:27:06 2009
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Sun, 11 Jan 2009 22:27:06 +0000 (UTC)
Subject: rpms/geda-gattrib/F-10 .cvsignore, 1.12, 1.13 geda-gattrib.spec,
	1.16, 1.17 import.log, 1.2, 1.3 sources, 1.12, 1.13
Message-ID: <20090111222706.77EF070139@cvs1.fedora.phx.redhat.com>

Author: chitlesh

Update of /cvs/pkgs/rpms/geda-gattrib/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4736/F-10

Modified Files:
	.cvsignore geda-gattrib.spec import.log sources 
Log Message:
20081231


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/geda-gattrib/F-10/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	22 Dec 2008 22:31:57 -0000	1.12
+++ .cvsignore	11 Jan 2009 22:26:36 -0000	1.13
@@ -1 +1 @@
-geda-gattrib-1.4.2.tar.gz
+geda-gattrib-1.4.3.tar.gz


Index: geda-gattrib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/geda-gattrib/F-10/geda-gattrib.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- geda-gattrib.spec	22 Dec 2008 22:31:57 -0000	1.16
+++ geda-gattrib.spec	11 Jan 2009 22:26:36 -0000	1.17
@@ -1,7 +1,7 @@
-%define         real_ver   1.4.2
+%define         real_ver   1.4.3
 
 Name:           geda-gattrib
-Version:        20081220
+Version:        20081231
 Release:        1%{?dist}
 
 Summary:        Attribute editor for gEDA
@@ -80,6 +80,9 @@
 
 
 %Changelog
+* Sun Jan 11 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20081231-1
+- new upstream release
+
 * Sun Dec 21 2008 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20081220-1
 - new upstream release
 - stripped off contents that upstream accepted from us.


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/geda-gattrib/F-10/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	22 Dec 2008 22:31:57 -0000	1.2
+++ import.log	11 Jan 2009 22:26:36 -0000	1.3
@@ -1,2 +1,3 @@
 geda-gattrib-20080929-1_fc9:F-10:geda-gattrib-20080929-1.fc9.src.rpm:1226444248
 geda-gattrib-20081220-1_fc10:F-10:geda-gattrib-20081220-1.fc10.src.rpm:1229985071
+geda-gattrib-20081231-1_fc10:F-10:geda-gattrib-20081231-1.fc10.src.rpm:1231712713


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/geda-gattrib/F-10/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	22 Dec 2008 22:31:57 -0000	1.12
+++ sources	11 Jan 2009 22:26:36 -0000	1.13
@@ -1 +1 @@
-f5e85cceedb47b55437b8f14888d10cf  geda-gattrib-1.4.2.tar.gz
+e1f68401e7ca5fff16292358f0dfd553  geda-gattrib-1.4.3.tar.gz



From chitlesh at fedoraproject.org  Sun Jan 11 22:28:52 2009
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Sun, 11 Jan 2009 22:28:52 +0000 (UTC)
Subject: rpms/geda-gattrib/devel .cvsignore, 1.12, 1.13 geda-gattrib.spec,
	1.16, 1.17 import.log, 1.2, 1.3 sources, 1.12, 1.13
Message-ID: <20090111222852.5C93170139@cvs1.fedora.phx.redhat.com>

Author: chitlesh

Update of /cvs/pkgs/rpms/geda-gattrib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5376/devel

Modified Files:
	.cvsignore geda-gattrib.spec import.log sources 
Log Message:
20081231


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/geda-gattrib/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	22 Dec 2008 22:33:52 -0000	1.12
+++ .cvsignore	11 Jan 2009 22:28:21 -0000	1.13
@@ -1 +1 @@
-geda-gattrib-1.4.2.tar.gz
+geda-gattrib-1.4.3.tar.gz


Index: geda-gattrib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/geda-gattrib/devel/geda-gattrib.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- geda-gattrib.spec	22 Dec 2008 22:33:52 -0000	1.16
+++ geda-gattrib.spec	11 Jan 2009 22:28:21 -0000	1.17
@@ -1,7 +1,7 @@
-%define         real_ver   1.4.2
+%define         real_ver   1.4.3
 
 Name:           geda-gattrib
-Version:        20081220
+Version:        20081231
 Release:        1%{?dist}
 
 Summary:        Attribute editor for gEDA
@@ -80,6 +80,9 @@
 
 
 %Changelog
+* Sun Jan 11 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20081231-1
+- new upstream release
+
 * Sun Dec 21 2008 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20081220-1
 - new upstream release
 - stripped off contents that upstream accepted from us.


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/geda-gattrib/devel/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	22 Dec 2008 22:33:53 -0000	1.2
+++ import.log	11 Jan 2009 22:28:21 -0000	1.3
@@ -1,2 +1,3 @@
 geda-gattrib-20080929-1_fc9:HEAD:geda-gattrib-20080929-1.fc9.src.rpm:1226434758
 geda-gattrib-20081220-1_fc10:HEAD:geda-gattrib-20081220-1.fc10.src.rpm:1229985149
+geda-gattrib-20081231-1_fc10:HEAD:geda-gattrib-20081231-1.fc10.src.rpm:1231712825


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/geda-gattrib/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	22 Dec 2008 22:33:53 -0000	1.12
+++ sources	11 Jan 2009 22:28:21 -0000	1.13
@@ -1 +1 @@
-f5e85cceedb47b55437b8f14888d10cf  geda-gattrib-1.4.2.tar.gz
+e1f68401e7ca5fff16292358f0dfd553  geda-gattrib-1.4.3.tar.gz



From cweyl at fedoraproject.org  Sun Jan 11 22:30:30 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Sun, 11 Jan 2009 22:30:30 +0000 (UTC)
Subject: rpms/perl-DateTime-Format-Flexible/devel import.log, NONE,
	1.1 perl-DateTime-Format-Flexible.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090111223030.8848870139@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-DateTime-Format-Flexible/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5910/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-DateTime-Format-Flexible.spec 
Log Message:
initial commit


--- NEW FILE import.log ---
perl-DateTime-Format-Flexible-0_05-1_fc10:HEAD:perl-DateTime-Format-Flexible-0.05-1.fc10.src.rpm:1231712989


--- NEW FILE perl-DateTime-Format-Flexible.spec ---
Name:       perl-DateTime-Format-Flexible 
Version:    0.05 
Release:    1%{?dist}
# see LICENSE
License:    GPL+ or Artistic
Group:      Development/Libraries
Summary:    Flexibly parse strings and turn them into DateTime objects
Source:     http://search.cpan.org/CPAN/authors/id/T/TH/THINC/DateTime-Format-Flexible-%{version}.tar.gz 
Url:        http://search.cpan.org/dist/DateTime-Format-Flexible
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(DateTime)
BuildRequires: perl(DateTime::Format::Builder) >= 0.74
BuildRequires: perl(Readonly) >= 0.06
BuildRequires: perl(Test::Simple) >= 0.44
BuildRequires: perl(Test::More)
BuildRequires: perl(File::Spec::Functions)
# optional tests...
BuildRequires: perl(Test::Pod)
BuildRequires: perl(Test::Pod::Coverage)


%description
If you have ever had to use a program that made you type in the date a
certain way and thought "Why can't the computer just figure out what date I
wanted?", this module is for you.

DateTime::Format::Flexible attempts to take any string you give it and
parse it into a DateTime object.

The test file tests 2500+ variations of date/time strings. If you can think
of any that I do not cover, please let me know.

%prep
%setup -q -n DateTime-Format-Flexible-%{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 make test

%clean
rm -rf %{buildroot} 

%files
%defattr(-,root,root,-)
%doc LICENSE README Changes example/ 
%{perl_vendorlib}/*
%{_mandir}/man3/*.3*

%changelog
* Wed Jan 07 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.05-1
- brush up for submission

* Sun Dec 07 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.05-0.1
- initial RPM packaging
- generated with cpan2dist (CPANPLUS::Dist::RPM version 0.0.6)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-DateTime-Format-Flexible/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	11 Jan 2009 17:21:41 -0000	1.1
+++ .cvsignore	11 Jan 2009 22:30:00 -0000	1.2
@@ -0,0 +1 @@
+DateTime-Format-Flexible-0.05.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-DateTime-Format-Flexible/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	11 Jan 2009 17:21:42 -0000	1.1
+++ sources	11 Jan 2009 22:30:00 -0000	1.2
@@ -0,0 +1 @@
+1730dc9919c9dd73913c4fe3159c9bc3  DateTime-Format-Flexible-0.05.tar.gz



From cweyl at fedoraproject.org  Sun Jan 11 22:31:02 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Sun, 11 Jan 2009 22:31:02 +0000 (UTC)
Subject: rpms/perl-DateTime-Format-DateParse/devel import.log, NONE,
	1.1 perl-DateTime-Format-DateParse.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090111223102.9455F7013F@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-DateTime-Format-DateParse/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6154/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-DateTime-Format-DateParse.spec 
Log Message:
initial commit


--- NEW FILE import.log ---
perl-DateTime-Format-DateParse-0_04-1_fc10:HEAD:perl-DateTime-Format-DateParse-0.04-1.fc10.src.rpm:1231713020


--- NEW FILE perl-DateTime-Format-DateParse.spec ---
Name:           perl-DateTime-Format-DateParse
Version:        0.04
Release:        1%{?dist}
Summary:        Parse Date::Parse compatible formats
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/DateTime-Format-DateParse/
Source0:        http://www.cpan.org/authors/id/J/JH/JHOBLITT/DateTime-Format-DateParse-%{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(Date::Parse) >= 2.27
BuildRequires:  perl(DateTime) >= 0.29
BuildRequires:  perl(DateTime::TimeZone) >= 0.27
BuildRequires:  perl(Module::Build)
BuildRequires:  perl(Time::Zone) >= 2.22
# tests
BuildRequires:  perl(Test::More)

%description
This module is a DateTime compatibility wrapper around Date::Parse; it allows
one to easily parse formats Date::Parse recognises for DateTime.

%prep
%setup -q -n DateTime-Format-DateParse-%{version}

%build
%{__perl} Build.PL installdirs=vendor
./Build

%install
rm -rf %{buildroot}

./Build install destdir=%{buildroot} create_packlist=0
find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null \;

%{_fixperms} %{buildroot}/*

%check
./Build test

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc Changes LICENSE README
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Wed Dec 31 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.04-1
- touch-up for submission

* Thu Dec 11 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.04-0.1
- Specfile autogenerated by cpanspec 1.77.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-DateTime-Format-DateParse/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	11 Jan 2009 17:22:36 -0000	1.1
+++ .cvsignore	11 Jan 2009 22:30:32 -0000	1.2
@@ -0,0 +1 @@
+DateTime-Format-DateParse-0.04.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-DateTime-Format-DateParse/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	11 Jan 2009 17:22:36 -0000	1.1
+++ sources	11 Jan 2009 22:30:32 -0000	1.2
@@ -0,0 +1 @@
+e1b5dc9fd2ab9d10203f495ed113745f  DateTime-Format-DateParse-0.04.tar.gz



From cweyl at fedoraproject.org  Sun Jan 11 22:31:43 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Sun, 11 Jan 2009 22:31:43 +0000 (UTC)
Subject: rpms/perl-DateTime-Format-Flexible/F-10 import.log, NONE,
	1.1 perl-DateTime-Format-Flexible.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090111223143.4C1E770139@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-DateTime-Format-Flexible/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6554/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-DateTime-Format-Flexible.spec 
Log Message:
initial commit


--- NEW FILE import.log ---
perl-DateTime-Format-Flexible-0_05-1_fc10:F-10:perl-DateTime-Format-Flexible-0.05-1.fc10.src.rpm:1231713059


--- NEW FILE perl-DateTime-Format-Flexible.spec ---
Name:       perl-DateTime-Format-Flexible 
Version:    0.05 
Release:    1%{?dist}
# see LICENSE
License:    GPL+ or Artistic
Group:      Development/Libraries
Summary:    Flexibly parse strings and turn them into DateTime objects
Source:     http://search.cpan.org/CPAN/authors/id/T/TH/THINC/DateTime-Format-Flexible-%{version}.tar.gz 
Url:        http://search.cpan.org/dist/DateTime-Format-Flexible
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(DateTime)
BuildRequires: perl(DateTime::Format::Builder) >= 0.74
BuildRequires: perl(Readonly) >= 0.06
BuildRequires: perl(Test::Simple) >= 0.44
BuildRequires: perl(Test::More)
BuildRequires: perl(File::Spec::Functions)
# optional tests...
BuildRequires: perl(Test::Pod)
BuildRequires: perl(Test::Pod::Coverage)


%description
If you have ever had to use a program that made you type in the date a
certain way and thought "Why can't the computer just figure out what date I
wanted?", this module is for you.

DateTime::Format::Flexible attempts to take any string you give it and
parse it into a DateTime object.

The test file tests 2500+ variations of date/time strings. If you can think
of any that I do not cover, please let me know.

%prep
%setup -q -n DateTime-Format-Flexible-%{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 make test

%clean
rm -rf %{buildroot} 

%files
%defattr(-,root,root,-)
%doc LICENSE README Changes example/ 
%{perl_vendorlib}/*
%{_mandir}/man3/*.3*

%changelog
* Wed Jan 07 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.05-1
- brush up for submission

* Sun Dec 07 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.05-0.1
- initial RPM packaging
- generated with cpan2dist (CPANPLUS::Dist::RPM version 0.0.6)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-DateTime-Format-Flexible/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	11 Jan 2009 17:21:41 -0000	1.1
+++ .cvsignore	11 Jan 2009 22:31:12 -0000	1.2
@@ -0,0 +1 @@
+DateTime-Format-Flexible-0.05.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-DateTime-Format-Flexible/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	11 Jan 2009 17:21:42 -0000	1.1
+++ sources	11 Jan 2009 22:31:13 -0000	1.2
@@ -0,0 +1 @@
+1730dc9919c9dd73913c4fe3159c9bc3  DateTime-Format-Flexible-0.05.tar.gz



From cweyl at fedoraproject.org  Sun Jan 11 22:32:20 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Sun, 11 Jan 2009 22:32:20 +0000 (UTC)
Subject: rpms/perl-DateTime-Format-DateParse/F-10 import.log, NONE,
	1.1 perl-DateTime-Format-DateParse.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090111223221.000A070139@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-DateTime-Format-DateParse/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7356/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-DateTime-Format-DateParse.spec 
Log Message:
initial commit


--- NEW FILE import.log ---
perl-DateTime-Format-DateParse-0_04-1_fc10:F-10:perl-DateTime-Format-DateParse-0.04-1.fc10.src.rpm:1231713096


--- NEW FILE perl-DateTime-Format-DateParse.spec ---
Name:           perl-DateTime-Format-DateParse
Version:        0.04
Release:        1%{?dist}
Summary:        Parse Date::Parse compatible formats
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/DateTime-Format-DateParse/
Source0:        http://www.cpan.org/authors/id/J/JH/JHOBLITT/DateTime-Format-DateParse-%{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(Date::Parse) >= 2.27
BuildRequires:  perl(DateTime) >= 0.29
BuildRequires:  perl(DateTime::TimeZone) >= 0.27
BuildRequires:  perl(Module::Build)
BuildRequires:  perl(Time::Zone) >= 2.22
# tests
BuildRequires:  perl(Test::More)

%description
This module is a DateTime compatibility wrapper around Date::Parse; it allows
one to easily parse formats Date::Parse recognises for DateTime.

%prep
%setup -q -n DateTime-Format-DateParse-%{version}

%build
%{__perl} Build.PL installdirs=vendor
./Build

%install
rm -rf %{buildroot}

./Build install destdir=%{buildroot} create_packlist=0
find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null \;

%{_fixperms} %{buildroot}/*

%check
./Build test

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc Changes LICENSE README
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Wed Dec 31 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.04-1
- touch-up for submission

* Thu Dec 11 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.04-0.1
- Specfile autogenerated by cpanspec 1.77.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-DateTime-Format-DateParse/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	11 Jan 2009 17:22:36 -0000	1.1
+++ .cvsignore	11 Jan 2009 22:31:50 -0000	1.2
@@ -0,0 +1 @@
+DateTime-Format-DateParse-0.04.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-DateTime-Format-DateParse/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	11 Jan 2009 17:22:36 -0000	1.1
+++ sources	11 Jan 2009 22:31:50 -0000	1.2
@@ -0,0 +1 @@
+e1b5dc9fd2ab9d10203f495ed113745f  DateTime-Format-DateParse-0.04.tar.gz



From cweyl at fedoraproject.org  Sun Jan 11 22:32:45 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Sun, 11 Jan 2009 22:32:45 +0000 (UTC)
Subject: rpms/perl-DateTime-Format-Flexible/F-9 import.log, NONE,
	1.1 perl-DateTime-Format-Flexible.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090111223245.1EE0170139@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-DateTime-Format-Flexible/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7574/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-DateTime-Format-Flexible.spec 
Log Message:
initial commit


--- NEW FILE import.log ---
perl-DateTime-Format-Flexible-0_05-1_fc10:F-9:perl-DateTime-Format-Flexible-0.05-1.fc10.src.rpm:1231713121


--- NEW FILE perl-DateTime-Format-Flexible.spec ---
Name:       perl-DateTime-Format-Flexible 
Version:    0.05 
Release:    1%{?dist}
# see LICENSE
License:    GPL+ or Artistic
Group:      Development/Libraries
Summary:    Flexibly parse strings and turn them into DateTime objects
Source:     http://search.cpan.org/CPAN/authors/id/T/TH/THINC/DateTime-Format-Flexible-%{version}.tar.gz 
Url:        http://search.cpan.org/dist/DateTime-Format-Flexible
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(DateTime)
BuildRequires: perl(DateTime::Format::Builder) >= 0.74
BuildRequires: perl(Readonly) >= 0.06
BuildRequires: perl(Test::Simple) >= 0.44
BuildRequires: perl(Test::More)
BuildRequires: perl(File::Spec::Functions)
# optional tests...
BuildRequires: perl(Test::Pod)
BuildRequires: perl(Test::Pod::Coverage)


%description
If you have ever had to use a program that made you type in the date a
certain way and thought "Why can't the computer just figure out what date I
wanted?", this module is for you.

DateTime::Format::Flexible attempts to take any string you give it and
parse it into a DateTime object.

The test file tests 2500+ variations of date/time strings. If you can think
of any that I do not cover, please let me know.

%prep
%setup -q -n DateTime-Format-Flexible-%{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 make test

%clean
rm -rf %{buildroot} 

%files
%defattr(-,root,root,-)
%doc LICENSE README Changes example/ 
%{perl_vendorlib}/*
%{_mandir}/man3/*.3*

%changelog
* Wed Jan 07 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.05-1
- brush up for submission

* Sun Dec 07 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.05-0.1
- initial RPM packaging
- generated with cpan2dist (CPANPLUS::Dist::RPM version 0.0.6)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-DateTime-Format-Flexible/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	11 Jan 2009 17:21:41 -0000	1.1
+++ .cvsignore	11 Jan 2009 22:32:14 -0000	1.2
@@ -0,0 +1 @@
+DateTime-Format-Flexible-0.05.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-DateTime-Format-Flexible/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	11 Jan 2009 17:21:42 -0000	1.1
+++ sources	11 Jan 2009 22:32:14 -0000	1.2
@@ -0,0 +1 @@
+1730dc9919c9dd73913c4fe3159c9bc3  DateTime-Format-Flexible-0.05.tar.gz



From cweyl at fedoraproject.org  Sun Jan 11 22:33:35 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Sun, 11 Jan 2009 22:33:35 +0000 (UTC)
Subject: rpms/perl-DateTime-Format-DateParse/F-9 import.log, NONE,
	1.1 perl-DateTime-Format-DateParse.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090111223335.1A42570139@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-DateTime-Format-DateParse/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7959/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-DateTime-Format-DateParse.spec 
Log Message:
initial commit


--- NEW FILE import.log ---
perl-DateTime-Format-DateParse-0_04-1_fc10:F-9:perl-DateTime-Format-DateParse-0.04-1.fc10.src.rpm:1231713170


--- NEW FILE perl-DateTime-Format-DateParse.spec ---
Name:           perl-DateTime-Format-DateParse
Version:        0.04
Release:        1%{?dist}
Summary:        Parse Date::Parse compatible formats
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/DateTime-Format-DateParse/
Source0:        http://www.cpan.org/authors/id/J/JH/JHOBLITT/DateTime-Format-DateParse-%{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(Date::Parse) >= 2.27
BuildRequires:  perl(DateTime) >= 0.29
BuildRequires:  perl(DateTime::TimeZone) >= 0.27
BuildRequires:  perl(Module::Build)
BuildRequires:  perl(Time::Zone) >= 2.22
# tests
BuildRequires:  perl(Test::More)

%description
This module is a DateTime compatibility wrapper around Date::Parse; it allows
one to easily parse formats Date::Parse recognises for DateTime.

%prep
%setup -q -n DateTime-Format-DateParse-%{version}

%build
%{__perl} Build.PL installdirs=vendor
./Build

%install
rm -rf %{buildroot}

./Build install destdir=%{buildroot} create_packlist=0
find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null \;

%{_fixperms} %{buildroot}/*

%check
./Build test

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc Changes LICENSE README
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Wed Dec 31 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.04-1
- touch-up for submission

* Thu Dec 11 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.04-0.1
- Specfile autogenerated by cpanspec 1.77.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-DateTime-Format-DateParse/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	11 Jan 2009 17:22:36 -0000	1.1
+++ .cvsignore	11 Jan 2009 22:33:04 -0000	1.2
@@ -0,0 +1 @@
+DateTime-Format-DateParse-0.04.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-DateTime-Format-DateParse/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	11 Jan 2009 17:22:36 -0000	1.1
+++ sources	11 Jan 2009 22:33:04 -0000	1.2
@@ -0,0 +1 @@
+e1b5dc9fd2ab9d10203f495ed113745f  DateTime-Format-DateParse-0.04.tar.gz



From chitlesh at fedoraproject.org  Sun Jan 11 22:42:19 2009
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Sun, 11 Jan 2009 22:42:19 +0000 (UTC)
Subject: rpms/ngspice/F-9 import.log, NONE, 1.1 .cvsignore, 1.2,
	1.3 ngspice.spec, 1.13, 1.14 sources, 1.2,
	1.3 ngspice-17-pipemode.patch, 1.1, NONE
Message-ID: <20090111224219.B77F170139@cvs1.fedora.phx.redhat.com>

Author: chitlesh

Update of /cvs/pkgs/rpms/ngspice/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9386/F-9

Modified Files:
	.cvsignore ngspice.spec sources 
Added Files:
	import.log 
Removed Files:
	ngspice-17-pipemode.patch 
Log Message:
rework 18


--- NEW FILE import.log ---
ngspice-18-1_fc10:F-9:ngspice-18-1.fc10.src.rpm:1231713485


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ngspice/F-9/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	30 Aug 2006 17:24:55 -0000	1.2
+++ .cvsignore	11 Jan 2009 22:41:48 -0000	1.3
@@ -1 +1 @@
-ng-spice-rework-17.tar.gz
+ng-spice-rework-18.tar.gz


Index: ngspice.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ngspice/F-9/ngspice.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- ngspice.spec	17 Apr 2008 22:53:38 -0000	1.13
+++ ngspice.spec	11 Jan 2009 22:41:49 -0000	1.14
@@ -1,6 +1,6 @@
 Name:              ngspice
-Version:           17
-Release:           15%{?dist}
+Version:           18
+Release:           1%{?dist}
 Summary:           A mixed level/signal circuit simulator
 
 License:           BSD
@@ -10,8 +10,6 @@
 Source0:           http://ovh.dl.sourceforge.net/sourceforge/%{name}/ng-spice-rework-%{version}.tar.gz
 BuildRoot:         %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Patch0:            %{name}-%{version}-pipemode.patch
-
 BuildRequires:     readline-devel, libXext-devel, libpng-devel, libICE-devel
 BuildRequires:     libXaw-devel, mesa-libGL-devel, libXt-devel
 
@@ -53,8 +51,6 @@
 %prep
 %setup -q -n ng-spice-rework-%{version}
 
-%patch0 -p0 -b .pipemode-xcircuit
-
 
 %build
 %ifarch x86_64 sparc64 ppc64 amd64
@@ -85,29 +81,33 @@
 
 %install
 %{__rm} -rf %{buildroot}
-chmod 644 src/xspice/*/*.{c,h,l,y}
-chmod 644 src/frontend/*.{c,h}
-chmod 644 src/include/*.h
+#chmod 644 src/xspice/*/*.{c,h,l,y}
+#chmod 644 src/frontend/*.{c,h}
+#chmod 644 src/include/*.h
 
 %{__make} INSTALL="install -p" install DESTDIR=%{buildroot}
-%{__rm} -f doc/Makefile*
+%{__rm} -rf doc/Makefile* %{buildroot}%{_datadir}/info/dir
 
 
-chmod +x %{buildroot}%{_libdir}/spice/{xtraevt.cm,xtradev.cm,analog.cm,spice2poly.cm,digital.cm}
-%{__rm} -f %{buildroot}%{_libdir}/ng-spice-rework/libbsim4.a
+#chmod +x %{buildroot}%{_libdir}/spice/{xtraevt.cm,xtradev.cm,analog.cm,spice2poly.cm,digital.cm}
+#%{__rm} -f %{buildroot}%{_libdir}/ng-spice-rework/libbsim4.a
 
 
 %clean
 %{__rm} -rf %{buildroot}
 
+%post doc
+/sbin/install-info %{_infodir}/%{name}.info %{_infodir}/dir || :
+
+%preun doc
+/sbin/install-info --delete %{_infodir}/%{name}.info*.gz %{_infodir}/dir || :
 
 
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING README BUGS ChangeLog NEWS
 %{_bindir}/cmpp
-%{_bindir}/makeidx
-%{_bindir}/nghelp
+%{_bindir}/ngmakeidx
 %{_bindir}/ngmultidec
 %{_bindir}/ngnutmeg
 %{_bindir}/ngproc2mod
@@ -118,6 +118,7 @@
 %{_libdir}/spice/
 %{_mandir}/man1/ngnutmeg.1.*
 %{_mandir}/man1/ngsconvert.1.*
+%{_mandir}/man1/ngmultidec.1.*
 %{_mandir}/man1/%{name}.1.*
 %{_mandir}/manm/xgraph.man.*
 
@@ -129,6 +130,12 @@
 %doc Stuarts_Poly_Notes FAQ DEVICES ANALYSES
 
 %Changelog
+* Sat Jan 10 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> 18-1
+- new upstream release
+
+* Sun Jun 15 2008 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> 17-16
+- Bugfix: #449409: FTBFS ngspice-17-14.fc9
+
 * Fri Apr 18 2008 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> 17-15
 - rebuild
 
@@ -175,4 +182,4 @@
 - Removed duplicates and useless ldconfig from %%post
 
 * Sun Aug 27 2006 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> 17-1
-- Initial Package for Fedora Extras
\ No newline at end of file
+- Initial Package for Fedora Extras


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ngspice/F-9/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	30 Aug 2006 17:24:55 -0000	1.2
+++ sources	11 Jan 2009 22:41:49 -0000	1.3
@@ -1 +1 @@
-abe283dea98b913a2122f085076865b1  ng-spice-rework-17.tar.gz
+3ab09b939939f7d0fb8cc9d8c77ead71  ng-spice-rework-18.tar.gz


--- ngspice-17-pipemode.patch DELETED ---



From chitlesh at fedoraproject.org  Sun Jan 11 22:44:16 2009
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Sun, 11 Jan 2009 22:44:16 +0000 (UTC)
Subject: rpms/ngspice/F-10 import.log, NONE, 1.1 .cvsignore, 1.2,
	1.3 ngspice.spec, 1.14, 1.15 sources, 1.2,
	1.3 ngspice-17-pipemode.patch, 1.1, NONE
Message-ID: <20090111224416.AC2EF70139@cvs1.fedora.phx.redhat.com>

Author: chitlesh

Update of /cvs/pkgs/rpms/ngspice/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9787/F-10

Modified Files:
	.cvsignore ngspice.spec sources 
Added Files:
	import.log 
Removed Files:
	ngspice-17-pipemode.patch 
Log Message:
rework 18


--- NEW FILE import.log ---
ngspice-18-1_fc10:F-10:ngspice-18-1.fc10.src.rpm:1231713752


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ngspice/F-10/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	30 Aug 2006 17:24:55 -0000	1.2
+++ .cvsignore	11 Jan 2009 22:43:46 -0000	1.3
@@ -1 +1 @@
-ng-spice-rework-17.tar.gz
+ng-spice-rework-18.tar.gz


Index: ngspice.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ngspice/F-10/ngspice.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- ngspice.spec	15 Jun 2008 12:22:31 -0000	1.14
+++ ngspice.spec	11 Jan 2009 22:43:46 -0000	1.15
@@ -1,6 +1,6 @@
 Name:              ngspice
-Version:           17
-Release:           16%{?dist}
+Version:           18
+Release:           1%{?dist}
 Summary:           A mixed level/signal circuit simulator
 
 License:           BSD
@@ -10,8 +10,6 @@
 Source0:           http://ovh.dl.sourceforge.net/sourceforge/%{name}/ng-spice-rework-%{version}.tar.gz
 BuildRoot:         %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Patch0:            %{name}-%{version}-pipemode.patch
-
 BuildRequires:     readline-devel, libXext-devel, libpng-devel, libICE-devel
 BuildRequires:     libXaw-devel, mesa-libGL-devel, libXt-devel
 
@@ -53,8 +51,6 @@
 %prep
 %setup -q -n ng-spice-rework-%{version}
 
-%patch0 -p0 -b .pipemode-xcircuit
-
 
 %build
 %ifarch x86_64 sparc64 ppc64 amd64
@@ -85,29 +81,33 @@
 
 %install
 %{__rm} -rf %{buildroot}
-chmod 644 src/xspice/*/*.{c,h,l,y}
-chmod 644 src/frontend/*.{c,h}
-chmod 644 src/include/*.h
+#chmod 644 src/xspice/*/*.{c,h,l,y}
+#chmod 644 src/frontend/*.{c,h}
+#chmod 644 src/include/*.h
 
 %{__make} INSTALL="install -p" install DESTDIR=%{buildroot}
 %{__rm} -rf doc/Makefile* %{buildroot}%{_datadir}/info/dir
 
 
-chmod +x %{buildroot}%{_libdir}/spice/{xtraevt.cm,xtradev.cm,analog.cm,spice2poly.cm,digital.cm}
-%{__rm} -f %{buildroot}%{_libdir}/ng-spice-rework/libbsim4.a
+#chmod +x %{buildroot}%{_libdir}/spice/{xtraevt.cm,xtradev.cm,analog.cm,spice2poly.cm,digital.cm}
+#%{__rm} -f %{buildroot}%{_libdir}/ng-spice-rework/libbsim4.a
 
 
 %clean
 %{__rm} -rf %{buildroot}
 
+%post doc
+/sbin/install-info %{_infodir}/%{name}.info %{_infodir}/dir || :
+
+%preun doc
+/sbin/install-info --delete %{_infodir}/%{name}.info*.gz %{_infodir}/dir || :
 
 
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING README BUGS ChangeLog NEWS
 %{_bindir}/cmpp
-%{_bindir}/makeidx
-%{_bindir}/nghelp
+%{_bindir}/ngmakeidx
 %{_bindir}/ngmultidec
 %{_bindir}/ngnutmeg
 %{_bindir}/ngproc2mod
@@ -118,6 +118,7 @@
 %{_libdir}/spice/
 %{_mandir}/man1/ngnutmeg.1.*
 %{_mandir}/man1/ngsconvert.1.*
+%{_mandir}/man1/ngmultidec.1.*
 %{_mandir}/man1/%{name}.1.*
 %{_mandir}/manm/xgraph.man.*
 
@@ -129,6 +130,9 @@
 %doc Stuarts_Poly_Notes FAQ DEVICES ANALYSES
 
 %Changelog
+* Sat Jan 10 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> 18-1
+- new upstream release
+
 * Sun Jun 15 2008 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> 17-16
 - Bugfix: #449409: FTBFS ngspice-17-14.fc9
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ngspice/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	30 Aug 2006 17:24:55 -0000	1.2
+++ sources	11 Jan 2009 22:43:46 -0000	1.3
@@ -1 +1 @@
-abe283dea98b913a2122f085076865b1  ng-spice-rework-17.tar.gz
+3ab09b939939f7d0fb8cc9d8c77ead71  ng-spice-rework-18.tar.gz


--- ngspice-17-pipemode.patch DELETED ---



From chitlesh at fedoraproject.org  Sun Jan 11 22:45:45 2009
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Sun, 11 Jan 2009 22:45:45 +0000 (UTC)
Subject: rpms/ngspice/devel import.log, NONE, 1.1 .cvsignore, 1.2,
	1.3 ngspice.spec, 1.14, 1.15 sources, 1.2,
	1.3 ngspice-17-pipemode.patch, 1.1, NONE
Message-ID: <20090111224545.7F0C970139@cvs1.fedora.phx.redhat.com>

Author: chitlesh

Update of /cvs/pkgs/rpms/ngspice/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10173/devel

Modified Files:
	.cvsignore ngspice.spec sources 
Added Files:
	import.log 
Removed Files:
	ngspice-17-pipemode.patch 
Log Message:
rework 18


--- NEW FILE import.log ---
ngspice-18-1_fc10:HEAD:ngspice-18-1.fc10.src.rpm:1231713849


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ngspice/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	30 Aug 2006 17:24:55 -0000	1.2
+++ .cvsignore	11 Jan 2009 22:45:15 -0000	1.3
@@ -1 +1 @@
-ng-spice-rework-17.tar.gz
+ng-spice-rework-18.tar.gz


Index: ngspice.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ngspice/devel/ngspice.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- ngspice.spec	15 Jun 2008 12:22:31 -0000	1.14
+++ ngspice.spec	11 Jan 2009 22:45:15 -0000	1.15
@@ -1,6 +1,6 @@
 Name:              ngspice
-Version:           17
-Release:           16%{?dist}
+Version:           18
+Release:           1%{?dist}
 Summary:           A mixed level/signal circuit simulator
 
 License:           BSD
@@ -10,8 +10,6 @@
 Source0:           http://ovh.dl.sourceforge.net/sourceforge/%{name}/ng-spice-rework-%{version}.tar.gz
 BuildRoot:         %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Patch0:            %{name}-%{version}-pipemode.patch
-
 BuildRequires:     readline-devel, libXext-devel, libpng-devel, libICE-devel
 BuildRequires:     libXaw-devel, mesa-libGL-devel, libXt-devel
 
@@ -53,8 +51,6 @@
 %prep
 %setup -q -n ng-spice-rework-%{version}
 
-%patch0 -p0 -b .pipemode-xcircuit
-
 
 %build
 %ifarch x86_64 sparc64 ppc64 amd64
@@ -85,29 +81,33 @@
 
 %install
 %{__rm} -rf %{buildroot}
-chmod 644 src/xspice/*/*.{c,h,l,y}
-chmod 644 src/frontend/*.{c,h}
-chmod 644 src/include/*.h
+#chmod 644 src/xspice/*/*.{c,h,l,y}
+#chmod 644 src/frontend/*.{c,h}
+#chmod 644 src/include/*.h
 
 %{__make} INSTALL="install -p" install DESTDIR=%{buildroot}
 %{__rm} -rf doc/Makefile* %{buildroot}%{_datadir}/info/dir
 
 
-chmod +x %{buildroot}%{_libdir}/spice/{xtraevt.cm,xtradev.cm,analog.cm,spice2poly.cm,digital.cm}
-%{__rm} -f %{buildroot}%{_libdir}/ng-spice-rework/libbsim4.a
+#chmod +x %{buildroot}%{_libdir}/spice/{xtraevt.cm,xtradev.cm,analog.cm,spice2poly.cm,digital.cm}
+#%{__rm} -f %{buildroot}%{_libdir}/ng-spice-rework/libbsim4.a
 
 
 %clean
 %{__rm} -rf %{buildroot}
 
+%post doc
+/sbin/install-info %{_infodir}/%{name}.info %{_infodir}/dir || :
+
+%preun doc
+/sbin/install-info --delete %{_infodir}/%{name}.info*.gz %{_infodir}/dir || :
 
 
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING README BUGS ChangeLog NEWS
 %{_bindir}/cmpp
-%{_bindir}/makeidx
-%{_bindir}/nghelp
+%{_bindir}/ngmakeidx
 %{_bindir}/ngmultidec
 %{_bindir}/ngnutmeg
 %{_bindir}/ngproc2mod
@@ -118,6 +118,7 @@
 %{_libdir}/spice/
 %{_mandir}/man1/ngnutmeg.1.*
 %{_mandir}/man1/ngsconvert.1.*
+%{_mandir}/man1/ngmultidec.1.*
 %{_mandir}/man1/%{name}.1.*
 %{_mandir}/manm/xgraph.man.*
 
@@ -129,6 +130,9 @@
 %doc Stuarts_Poly_Notes FAQ DEVICES ANALYSES
 
 %Changelog
+* Sat Jan 10 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> 18-1
+- new upstream release
+
 * Sun Jun 15 2008 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> 17-16
 - Bugfix: #449409: FTBFS ngspice-17-14.fc9
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ngspice/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	30 Aug 2006 17:24:55 -0000	1.2
+++ sources	11 Jan 2009 22:45:15 -0000	1.3
@@ -1 +1 @@
-abe283dea98b913a2122f085076865b1  ng-spice-rework-17.tar.gz
+3ab09b939939f7d0fb8cc9d8c77ead71  ng-spice-rework-18.tar.gz


--- ngspice-17-pipemode.patch DELETED ---



From chitlesh at fedoraproject.org  Sun Jan 11 22:48:07 2009
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Sun, 11 Jan 2009 22:48:07 +0000 (UTC)
Subject: rpms/ngspice/EL-5 import.log, NONE, 1.1 .cvsignore, 1.2,
	1.3 ngspice.spec, 1.7, 1.8 sources, 1.2,
	1.3 ngspice-17-pipemode.patch, 1.1, NONE
Message-ID: <20090111224807.0B88870139@cvs1.fedora.phx.redhat.com>

Author: chitlesh

Update of /cvs/pkgs/rpms/ngspice/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10637/EL-5

Modified Files:
	.cvsignore ngspice.spec sources 
Added Files:
	import.log 
Removed Files:
	ngspice-17-pipemode.patch 
Log Message:
rework 18


--- NEW FILE import.log ---
ngspice-18-1_fc10:EL-5:ngspice-18-1.fc10.src.rpm:1231713953


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ngspice/EL-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	30 Aug 2006 17:24:55 -0000	1.2
+++ .cvsignore	11 Jan 2009 22:47:36 -0000	1.3
@@ -1 +1 @@
-ng-spice-rework-17.tar.gz
+ng-spice-rework-18.tar.gz


Index: ngspice.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ngspice/EL-5/ngspice.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ngspice.spec	17 Mar 2007 13:59:55 -0000	1.7
+++ ngspice.spec	11 Jan 2009 22:47:36 -0000	1.8
@@ -1,6 +1,6 @@
 Name:              ngspice
-Version:           17
-Release:           11%{?dist}
+Version:           18
+Release:           1%{?dist}
 Summary:           A mixed level/signal circuit simulator
 
 License:           BSD
@@ -10,9 +10,6 @@
 Source0:           http://ovh.dl.sourceforge.net/sourceforge/%{name}/ng-spice-rework-%{version}.tar.gz
 BuildRoot:         %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Patch0:            %{name}-%{version}-pipemode.patch
-#Patch1:            %{name}-bjt.patch
-
 BuildRequires:     readline-devel, libXext-devel, libpng-devel, libICE-devel
 BuildRequires:     libXaw-devel, mesa-libGL-devel, libXt-devel
 
@@ -36,6 +33,8 @@
 codemodel interface and an event-driven simulation algorithm. Users can
 develop their own models for devices using the codemodel interface.
 
+It could be used for VLSI simulations as well.
+
 %package doc
 Summary:           Documentation for ngspice, a mixed level/signal circuit simulator
 Group:             Documentation
@@ -52,8 +51,6 @@
 %prep
 %setup -q -n ng-spice-rework-%{version}
 
-%patch0 -p0 -b .pipemode-xcircuit
-#%patch1 -p0 -b .bjt
 
 %build
 %ifarch x86_64 sparc64 ppc64 amd64
@@ -84,41 +81,33 @@
 
 %install
 %{__rm} -rf %{buildroot}
-chmod 644 src/xspice/*/*.{c,h,l,y}
-chmod 644 src/frontend/*.{c,h}
-chmod 644 src/include/*.h
-
-%{__make} install DESTDIR=%{buildroot}
-%{__rm} -f doc/Makefile*
-%{__rm} -f doc/ngspice.info*
-
-chmod +x %{buildroot}%{_libdir}/spice/{xtraevt.cm,xtradev.cm,analog.cm,spice2poly.cm,digital.cm}
-%{__rm} -f %{buildroot}%{_libdir}/ng-spice-rework/libbsim4.a
-
-%{__cp} -pr doc/ %{buildroot}%{_datadir}/ng-spice-rework/
-%{__cp} -p Stuarts_Poly_Notes FAQ DEVICES ANALYSES %{buildroot}%{_datadir}/ng-spice-rework/doc/
-%{__cp} -pr examples/ %{buildroot}%{_datadir}/ng-spice-rework/
+#chmod 644 src/xspice/*/*.{c,h,l,y}
+#chmod 644 src/frontend/*.{c,h}
+#chmod 644 src/include/*.h
+
+%{__make} INSTALL="install -p" install DESTDIR=%{buildroot}
+%{__rm} -rf doc/Makefile* %{buildroot}%{_datadir}/info/dir
+
+
+#chmod +x %{buildroot}%{_libdir}/spice/{xtraevt.cm,xtradev.cm,analog.cm,spice2poly.cm,digital.cm}
+#%{__rm} -f %{buildroot}%{_libdir}/ng-spice-rework/libbsim4.a
+
 
 %clean
 %{__rm} -rf %{buildroot}
 
 %post doc
-/sbin/install-info --quiet --info-dir=%{_infodir}/dir %{_infodir}/%{name}.info.* ||:
+/sbin/install-info %{_infodir}/%{name}.info %{_infodir}/dir || :
 
 %preun doc
-if [ "$1" -eq 0 ]; then
-   /sbin/install-info --delete %{_infodir}/%{name}.info.* --info-dir=%{_infodir}/dir ||:
-fi
+/sbin/install-info --delete %{_infodir}/%{name}.info*.gz %{_infodir}/dir || :
 
 
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING README BUGS ChangeLog NEWS
-%exclude %{_datadir}/ng-spice-rework/doc/*
-%exclude %{_datadir}/ng-spice-rework/examples/
 %{_bindir}/cmpp
-%{_bindir}/makeidx
-%{_bindir}/nghelp
+%{_bindir}/ngmakeidx
 %{_bindir}/ngmultidec
 %{_bindir}/ngnutmeg
 %{_bindir}/ngproc2mod
@@ -129,6 +118,7 @@
 %{_libdir}/spice/
 %{_mandir}/man1/ngnutmeg.1.*
 %{_mandir}/man1/ngsconvert.1.*
+%{_mandir}/man1/ngmultidec.1.*
 %{_mandir}/man1/%{name}.1.*
 %{_mandir}/manm/xgraph.man.*
 
@@ -136,10 +126,26 @@
 %files doc
 %defattr(-, root, root, -)
 %{_infodir}/ngspice.info*.*
-%{_datadir}/ng-spice-rework/doc/
-%{_datadir}/ng-spice-rework/examples/
+%doc examples/ doc/
+%doc Stuarts_Poly_Notes FAQ DEVICES ANALYSES
 
 %Changelog
+* Sat Jan 10 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> 18-1
+- new upstream release
+
+* Sun Jun 15 2008 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> 17-16
+- Bugfix: #449409: FTBFS ngspice-17-14.fc9
+
+* Fri Apr 18 2008 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> 17-15
+- rebuild
+
+* Fri Aug 24 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> 17-13
+- mass rebuild for fedora 8 - BuildID
+
+* Sat Jul 08 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> 17-12
+- fixed ScriptletSnippets for Texinfo #246780
+- moved documentations to -doc package
+
 * Sat Mar 17 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> 17-11
 - droped patch: ngspice-bjt.patch, upstream will provide a better patch soon
 
@@ -176,4 +182,4 @@
 - Removed duplicates and useless ldconfig from %%post
 
 * Sun Aug 27 2006 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> 17-1
-- Initial Package for Fedora Extras
\ No newline at end of file
+- Initial Package for Fedora Extras


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ngspice/EL-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	30 Aug 2006 17:24:55 -0000	1.2
+++ sources	11 Jan 2009 22:47:36 -0000	1.3
@@ -1 +1 @@
-abe283dea98b913a2122f085076865b1  ng-spice-rework-17.tar.gz
+3ab09b939939f7d0fb8cc9d8c77ead71  ng-spice-rework-18.tar.gz


--- ngspice-17-pipemode.patch DELETED ---



From laxathom at fedoraproject.org  Sun Jan 11 22:56:12 2009
From: laxathom at fedoraproject.org (Xavier LAMIEN)
Date: Sun, 11 Jan 2009 22:56:12 +0000 (UTC)
Subject: rpms/gnubversion/devel gnubversion.spec,1.2,1.3
Message-ID: <20090111225612.6178470139@cvs1.fedora.phx.redhat.com>

Author: laxathom

Update of /cvs/pkgs/rpms/gnubversion/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11499

Modified Files:
	gnubversion.spec 
Log Message:
rebuild to handle nautilus-extension-2


Index: gnubversion.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnubversion/devel/gnubversion.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gnubversion.spec	8 Jan 2009 11:51:45 -0000	1.2
+++ gnubversion.spec	11 Jan 2009 22:55:42 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           gnubversion
 Version:        0.5
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Gnome Interface to Subversion
 
 Group:          Applications/System
@@ -63,12 +63,15 @@
 echo "Encoding=UTF-8" >> $RPM_BUILD_ROOT%{_datadir}/applications/gvn-checkout.desktop
 
 #Fix relative-link issue
-pushd $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/24x24/apps
-for imgs in gvn-commit.png gvn-update.png gvn-add.png gvn-remove.png gvn-revert.png ; do
-        unlink $RPM_BUILD_ROOT%{_datadir}/%{name}/$imgs
-        ln -s $imgs $RPM_BUILD_ROOT%{_datadir}/%{name}/$imgs
-done
-popd
+#pushd $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/24x24/apps
+#for imgs in gvn-commit.png gvn-update.png gvn-add.png gvn-remove.png gvn-revert.png ; do
+#        unlink $RPM_BUILD_ROOT%{_datadir}/%{name}/$imgs
+#        ln -s $imgs $RPM_BUILD_ROOT%{_datadir}/%{name}/$imgs
+#done
+#popd
+
+mv $RPM_BUILD_ROOT%{_libdir}/nautilus/extensions-1.0 $RPM_BUILD_ROOT%{_libdir}/nautilus/extensions-2.0
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -95,7 +98,7 @@
 %doc ChangeLog AUTHORS COPYING NEWS README TODO
 %{_bindir}/gvn-*
 %{_libdir}/*.so.*
-%{_libdir}/nautilus/extensions-1.0/*.so*
+%{_libdir}/nautilus/extensions-2.0/*.so*
 %{_datadir}/%{name}
 %{_datadir}/applications/*.desktop
 %{_datadir}/icons/hicolor/??x??/apps/*.png
@@ -103,6 +106,9 @@
 
 
 %changelog
+* Sun Jan 11 2009 Xavier Lamien <lxtnow at gmail.com> - 0.5-6
+- Move plugin to nautilus-extension v2.0.
+
 * Thu Jan 08 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.5-5
 - Fix BRs.
 



From whot at fedoraproject.org  Sun Jan 11 23:07:38 2009
From: whot at fedoraproject.org (Peter Hutterer)
Date: Sun, 11 Jan 2009 23:07:38 +0000 (UTC)
Subject: rpms/xorg-x11-drv-mouse/devel .cvsignore, 1.14, 1.15 sources, 1.14, 
	1.15 xorg-x11-drv-mouse.spec, 1.27, 1.28
Message-ID: <20090111230738.7B87170139@cvs1.fedora.phx.redhat.com>

Author: whot

Update of /cvs/pkgs/rpms/xorg-x11-drv-mouse/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13392

Modified Files:
	.cvsignore sources xorg-x11-drv-mouse.spec 
Log Message:
* Mon Jan 12 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.4.0-1
- mouse 1.4.0




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-mouse/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	22 Dec 2008 02:46:22 -0000	1.14
+++ .cvsignore	11 Jan 2009 23:07:08 -0000	1.15
@@ -1 +1 @@
-xf86-input-mouse-20081222.tar.bz2
+xf86-input-mouse-1.4.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-mouse/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	22 Dec 2008 02:46:22 -0000	1.14
+++ sources	11 Jan 2009 23:07:08 -0000	1.15
@@ -1 +1 @@
-a138f4fe8ce78e2f14469f888e3c007d  xf86-input-mouse-20081222.tar.bz2
+e7dc0759c14a9bfd373917a49e5f7c7d  xf86-input-mouse-1.4.0.tar.bz2


Index: xorg-x11-drv-mouse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-mouse/devel/xorg-x11-drv-mouse.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- xorg-x11-drv-mouse.spec	22 Dec 2008 02:46:22 -0000	1.27
+++ xorg-x11-drv-mouse.spec	11 Jan 2009 23:07:08 -0000	1.28
@@ -6,15 +6,15 @@
 
 Summary:   Xorg X11 mouse input driver
 Name:      xorg-x11-drv-mouse
-Version:   1.3.0
-Release:   1.20081222git%{?dist}
+Version:   1.4.0
+Release:   1%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-#Source0:   ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
-Source0:    %{tarball}-%{gitdate}.tar.bz2
+Source0:   ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
+#Source0:    %{tarball}-%{gitdate}.tar.bz2
 Source1:    make-git-snapshot.sh
 
 ExcludeArch: s390 s390x
@@ -28,8 +28,8 @@
 X.Org X11 mouse input driver.
 
 %prep
-%setup -q -n %{tarball}-%{gitdate}
-#%setup -q -n %{tarball}-%{version}
+#%setup -q -n %{tarball}-%{gitdate}
+%setup -q -n %{tarball}-%{version}
 
 %build
 autoreconf -v --install || exit 1
@@ -53,6 +53,9 @@
 %{_mandir}/man4/mousedrv.4*
 
 %changelog
+* Mon Jan 12 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.4.0-1
+- mouse 1.4.0
+
 * Mon Dec 22 2008 Peter Hutterer <peter.hutterer at redhat.com> 1.3.0-1.20081222
 - Today's git snapshot.
 



From lyosnorezel at fedoraproject.org  Sun Jan 11 23:21:27 2009
From: lyosnorezel at fedoraproject.org (Lyos Gemini Norezel)
Date: Sun, 11 Jan 2009 23:21:27 +0000 (UTC)
Subject: rpms/darkgarden-fonts/devel darkgarden-fonts-fontconfig.conf, NONE, 
	1.1 darkgarden-fonts.spec, 1.4, 1.5 import.log, 1.1,
	1.2 69-darkgarden.conf, 1.1, NONE
Message-ID: <20090111232127.4F08F70139@cvs1.fedora.phx.redhat.com>

Author: lyosnorezel

Update of /cvs/pkgs/rpms/darkgarden-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14903/devel

Modified Files:
	darkgarden-fonts.spec import.log 
Added Files:
	darkgarden-fonts-fontconfig.conf 
Removed Files:
	69-darkgarden.conf 
Log Message:



--- NEW FILE darkgarden-fonts-fontconfig.conf ---
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
<!-- /etc/fonts/conf.d/69-darkgarden.conf

     Define settings for DarkGarden fonts

     ?? 2008 Lyos Gemini Norezel <Lyos.GeminiNorezel at gmail.com>
-->
<fontconfig>
<alias binding="same"><family>Sans</family><accept><family>DarkGarden</family></accept></alias>
</fontconfig>



Index: darkgarden-fonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/darkgarden-fonts/devel/darkgarden-fonts.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- darkgarden-fonts.spec	6 Sep 2008 20:01:15 -0000	1.4
+++ darkgarden-fonts.spec	11 Jan 2009 23:20:56 -0000	1.5
@@ -1,31 +1,33 @@
-%define fontname	darkgarden
-%define fontdir		%{_datadir}/fonts/%{fontname}
-%define fontconfdir	%{_sysconfdir}/fonts/conf.d
-%define conf1		69-darkgarden.conf
+%define fontname darkgarden
+%define fontconf 69-darkgarden.conf
 
-Name:		%{fontname}-fonts
+Name:           %{fontname}-fonts
 Version:	1.1
-Release:	4%{?dist}
+Release:        5%{?dist}
 Summary:	Dark Garden is a decorative outline font of unusual shape
 
-Group:		User Interface/X
-License:	GPLv2
-URL:		http://darkgarden.sourceforge.net/
-Source0:	http://darkgarden.sourceforge.net/darkgarden-1.1.src.zip
-Source1:	69-darkgarden.conf
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildArch:	noarch
-BuildRequires:	fontforge >= 20061025-1
+Group:          User Interface/X
+License:        GPLv2
+URL:            http://darkgarden.sourceforge.net/
+
+Source0:        http://darkgarden.sourceforge.net/darkgarden-1.1.src.zip
+Source1:        %{name}-fontconfig.conf
+
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildArch:     noarch
+BuildRequires: fontpackages-devel
+BuildRequires: fontforge >= 20061025-1
+Requires:      fontpackages-filesystem
 
 %description
-Dark Garden is a decorative outline font of unusual shape. 
-The typeface is based on author's original hand drawings. 
-The letterform is complex, with all characters decorated 
-with spikes resembling thorns or flames, character spacing 
-is very dense. Such a theme makes it a great font for titles, 
-banners, logos etc. Due to the font's complicated form, 
-long text passages are not very legible, but short paragraphs 
+Dark Garden is a decorative outline font of unusual shape.
+The typeface is based on author's original hand drawings.
+The letterform is complex, with all characters decorated
+with spikes resembling thorns or flames, character spacing
+is very dense. Such a theme makes it a great font for titles,
+banners, logos etc. Due to the font's complicated form,
+long text passages are not very legible, but short paragraphs
 such as titles or lyrics / poetry look very well.
 
 %prep
@@ -35,39 +37,40 @@
 fontforge -c 'Open($1); Generate($2)' DarkGarden.sfd DarkGarden.ttf
 
 %install
-rm -rf $RPM_BUILD_ROOT
+rm -fr %{buildroot}
+
+install -m 0755 -d %{buildroot}%{_fontdir}
+
+install -m 0644 -p *.ttf %{buildroot}%{_fontdir}
+
+install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} \
+                   %{buildroot}%{_fontconfig_confdir}
 
-install -dm 755 $RPM_BUILD_ROOT%{fontdir}
-install -pm 644 *.ttf $RPM_BUILD_ROOT%{fontdir}
-install -m 0755 -d $RPM_BUILD_ROOT%{fontconfdir}
-install -m 0644 -p %{SOURCE1} $RPM_BUILD_ROOT%{fontconfdir}/
+install -m 0644 -p %{SOURCE1} \
+        %{buildroot}%{_fontconfig_templatedir}/%{fontconf}
+
+ln -s %{_fontconfig_templatedir}/%{fontconf} \
+      %{buildroot}%{_fontconfig_confdir}/%{fontconf}
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -fr %{buildroot}
 
-%post
-if [ -x %{_bindir}/fc-cache ] ; then
-	%{_bindir}/fc-cache -f %{fontdir} || :
-fi
-	
-%postun
-if [ $1 -eq 0 -a -x %{_bindir}/fc-cache ] ; then
-	%{_bindir}/fc-cache -f %{fontdir} || :
-fi
+%_font_pkg -f %{fontconf} *.ttf
 
-%files
-%defattr(644,root,root,755)
 %doc COPYING.txt
 %doc README.txt
 %doc COPYING-GPL.txt
 
-%dir %{fontdir}/
-%{fontdir}/*.ttf
-%config(noreplace) %{fontconfdir}/%{conf1}
+%dir %{_fontdir}/
+%{_fontdir}/*.ttf
 
 %changelog
+* Sun Jan 11 2009 Lyos Gemini Norezel <Lyos.GeminiNorezel at gmail.com> 1.1-5
+- Modified spec file to comply with recent policy changes.
+
 * 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
@@ -78,3 +81,4 @@
 
 * Fri Jul 11 2008 Lyos Gemini Norezel <Lyos.GeminiNorezel at gmail.com>
 - Created DarkGarden font package
+


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/darkgarden-fonts/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	2 Aug 2008 08:01:24 -0000	1.1
+++ import.log	11 Jan 2009 23:20:56 -0000	1.2
@@ -1 +1,2 @@
 darkgarden-fonts-1_1-1_fc9:HEAD:darkgarden-fonts-1.1-1.fc9.src.rpm:1217663758
+darkgarden-fonts-1_1-5_fc11:HEAD:darkgarden-fonts-1.1-5.fc11.src.rpm:1231715979


--- 69-darkgarden.conf DELETED ---



From jgu at fedoraproject.org  Sun Jan 11 23:42:08 2009
From: jgu at fedoraproject.org (Jonathan G. Underwood)
Date: Sun, 11 Jan 2009 23:42:08 +0000 (UTC)
Subject: rpms/shorewall/devel .cvsignore, 1.44, 1.45 shorewall.spec, 1.65,
	1.66 sources, 1.44, 1.45 patch-perl-4.2.3.1, 1.1, NONE
Message-ID: <20090111234208.81FFC70139@cvs1.fedora.phx.redhat.com>

Author: jgu

Update of /cvs/extras/rpms/shorewall/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18061

Modified Files:
	.cvsignore shorewall.spec sources 
Removed Files:
	patch-perl-4.2.3.1 
Log Message:
* Sun Jan 11 2009 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 4.2.4-1
- Update to version 4.2.4 which adds IPV6 support and two new sub-packages
  (shorewall6 and shorewall6-lite) 
- Add proper versioning to sub-packages
- Remove patch patch-perl-4.2.3.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/shorewall/devel/.cvsignore,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- .cvsignore	18 Dec 2008 00:27:49 -0000	1.44
+++ .cvsignore	11 Jan 2009 23:41:37 -0000	1.45
@@ -1,4 +1,6 @@
-shorewall-common-4.2.3.tar.bz2
-shorewall-shell-4.2.3.tar.bz2
-shorewall-perl-4.2.3.tar.bz2
-shorewall-lite-4.2.3.tar.bz2
+shorewall6-4.2.4.1.tar.bz2
+shorewall6-lite-4.2.4.1.tar.bz2
+shorewall-common-4.2.4.tar.bz2
+shorewall-lite-4.2.4.tar.bz2
+shorewall-perl-4.2.4.5.tar.bz2
+shorewall-shell-4.2.4.tar.bz2


Index: shorewall.spec
===================================================================
RCS file: /cvs/extras/rpms/shorewall/devel/shorewall.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- shorewall.spec	30 Dec 2008 00:27:14 -0000	1.65
+++ shorewall.spec	11 Jan 2009 23:41:38 -0000	1.66
@@ -1,40 +1,40 @@
 # A very helpful document for packaging Shorewall is "Anatomy of Shorewall 4.0"
 # which is found at http://www.shorewall.net/Anatomy.html
 
-# Note on upstream sources: the upstream maintainer publishes tarballs for each
-# version in the "base" subdirectory, and subsequent errata are corrected with
-# patches found in the top directory (NOT in the errata directory - these are
-# patches against installed packages). These patches are to be applied to the
-# tarballs from the "base" directory. Confusingly, upstream also publishes
-# patched tarballs shorewall-foo-X.Y.Z-N.tar.bz2 where N denotes a
-# patchlevel. However, these should not be used for distro packaging.
+%define major_ver 4.2.4
+%define common_ver %{major_ver}
+%define perl_ver %{major_ver}.5
+%define lite_ver %{major_ver}
+%define shell_ver %{major_ver}
+%define shorewall6_ver %{major_ver}.1
+%define lite6_ver %{major_ver}.1
 
 Name:           shorewall
-Version:	4.2.3
-Release:	2%{?dist}
+Version:	%{major_ver}
+Release:	1%{?dist}
 Summary:	An iptables front end for firewall configuration
 Group:		Applications/System
 License:	GPLv2+
 URL:		http://www.shorewall.net/
 
-%define _baseurl http://www.shorewall.net/pub/shorewall/4.2/shorewall-%{version}/base/
-Source0: 	%{_baseurl}%{name}-common-%{version}.tar.bz2
-Source1: 	%{_baseurl}%{name}-perl-%{version}.tar.bz2
-Source2: 	%{_baseurl}%{name}-shell-%{version}.tar.bz2
-Source3: 	%{_baseurl}%{name}-lite-%{version}.tar.bz2
+%define _baseurl http://www.shorewall.net/pub/shorewall/4.2/shorewall-%{version}/base
+Source0: 	%{_baseurl}/%{name}-common-%{common_ver}.tar.bz2
+Source1: 	%{_baseurl}/%{name}-perl-%{perl_ver}.tar.bz2
+Source2: 	%{_baseurl}/%{name}-shell-%{shell_ver}.tar.bz2
+Source3: 	%{_baseurl}/%{name}-lite-%{lite_ver}.tar.bz2
+Source4: 	%{_baseurl}/%{name}6-%{shorewall6_ver}.tar.bz2
+Source5: 	%{_baseurl}/%{name}6-lite-%{lite6_ver}.tar.bz2
 
-# Init files for Fedora
+# Init file for Fedora
 Source10:	init.sh
 
-Patch0:		patch-perl-4.2.3.1
-
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildRequires:	perl
 BuildArch:	noarch
 
-Requires:	shorewall-common = %{version}-%{release}
-Requires:	shorewall-perl = %{version}-%{release}
-Requires:	shorewall-shell = %{version}-%{release}
+Requires:	shorewall-common = %{common_ver}-%{release}
+Requires:	shorewall-perl = %{perl_ver}-%{release}
+Requires:	shorewall-shell = %{shell_ver}-%{release}
 
 %description
 The Shoreline Firewall, more commonly known as "Shorewall", is a
@@ -45,6 +45,7 @@
 %package common
 Summary:	Common files for the shorewall firewall compilers
 Group: 		Applications/System
+Version:	%{common_ver}
 Requires: 	iptables iproute
 Requires(post): /sbin/chkconfig
 Requires(preun):/sbin/chkconfig
@@ -54,9 +55,24 @@
 This package contains files required by both the shorewall-perl and
 shorewall-shell compilers for the Shoreline Firewall (shorewall).
 
+%package -n shorewall6
+Summary:	Files for the IPV6 Shorewall Firewall
+Group:		Applications/System
+Version:	%{shorewall6_ver}
+Requires:	shorewall-perl = %{perl_ver}-%{release}
+Requires: 	iptables-ipv6 iproute
+Requires(post): /sbin/chkconfig
+Requires(preun):/sbin/chkconfig
+Requires(preun):/sbin/service
+
+%description -n shorewall6
+This package contains the files required for IPV6 functionality of the
+Shoreline Firewall (shorewall).
+
 %package perl
 Summary:	Perl-based compiler for Shoreline Firewall 
 Group: 	 	Applications/System
+Version:	%{perl_ver}
 Requires:	shorewall-common = %{version}-%{release}
 Requires:	perl
 
@@ -67,6 +83,7 @@
 %package shell
 Summary:	Shell-based compiler for Shoreline Firewall 
 Group: 	 	Applications/System
+Version:	%{shell_ver}
 Requires:	shorewall-common = %{version}-%{release}
 
 %description shell
@@ -77,6 +94,7 @@
 %package lite
 Group: 	 	Applications/System
 Summary:	Shorewall firewall for compiled rulesets
+Version:	%{lite_ver}
 Requires: 	iptables iproute
 Requires(post): /sbin/chkconfig
 Requires(preun): /sbin/chkconfig
@@ -89,25 +107,47 @@
 machine with a Shorewall rule compiler. A machine running Shorewall
 Lite does not need to have a Shorewall rule compiler installed.
 
+%package -n shorewall6-lite
+Group: 	 	Applications/System
+Summary:	Shorewall firewall for compiled IPV6 rulesets
+Version:	%{lite6_ver}
+Requires: 	iptables iproute
+Requires(post): /sbin/chkconfig
+Requires(preun): /sbin/chkconfig
+Requires(preun): /sbin/service
+
+%description -n shorewall6-lite
+Shorewall6 Lite is a companion product to Shorewall6 (the IPV6
+firewall) that allows network administrators to centralize the
+configuration of Shorewall-based firewalls. Shorewall Lite runs a
+firewall script generated by a machine with a Shorewall rule
+compiler. A machine running Shorewall Lite does not need to have a
+Shorewall rule compiler installed.
+
 %prep
-%setup -q -c -n shorewall-%{version}
+%setup -q -c -n shorewall-%{major_ver}
 %setup -q -T -D -a 1
 %setup -q -T -D -a 2
 %setup -q -T -D -a 3
+%setup -q -T -D -a 4
+%setup -q -T -D -a 5
 
 # Overwrite default init files with Fedora specific ones
-cp %{SOURCE10} shorewall-common-%{version}
-cp %{SOURCE10} shorewall-lite-%{version}
-sed -i -e 's|prog="shorewall"|prog="shorewall-lite"|' shorewall-lite-%{version}/init.sh
+cp %{SOURCE10} shorewall-common-%{common_ver}
+
+cp %{SOURCE10} shorewall-lite-%{lite_ver}
+sed -i -e 's|prog="shorewall"|prog="shorewall-lite"|' shorewall-lite-%{lite_ver}/init.sh
+
+cp %{SOURCE10} shorewall6-%{shorewall6_ver}
+sed -i -e 's|prog="shorewall"|prog="shorewall6"|' shorewall6-%{shorewall6_ver}/init.sh
+
+cp %{SOURCE10} shorewall6-lite-%{lite6_ver}
+sed -i -e 's|prog="shorewall"|prog="shorewall6-lite"|' shorewall6-lite-%{lite6_ver}/init.sh
 
 # Remove hash-bang from files which are not directly executed as shell
 # scripts. This silences some rpmlint errors.
 find . -name "lib.*" -exec sed -i -e '/\#\!\/bin\/sh/d' {} \;
 
-pushd shorewall-perl-%{version}
-%patch0 -p1
-popd
-
 %build
 
 %install
@@ -117,7 +157,7 @@
 export DEST=%{_initrddir}
 
 #### Build shorewall-common
-pushd shorewall-common-%{version}
+pushd shorewall-common-%{common_ver}
 ./install.sh
 popd
 
@@ -126,17 +166,27 @@
 touch $RPM_BUILD_ROOT/%{_localstatedir}/lib/shorewall/{chains,nat,proxyarp,restarted,zones,restore-base,restore-tail,state,.modules,.modulesdir}
 
 #### Build shorewall-perl
-pushd shorewall-perl-%{version}
+pushd shorewall-perl-%{perl_ver}
 ./install.sh -n
 popd
 
 #### Build shorewall-shell
-pushd shorewall-shell-%{version}
+pushd shorewall-shell-%{shell_ver}
 ./install.sh -n
 popd
 
 #### Build shorewall-lite
-pushd shorewall-lite-%{version}
+pushd shorewall-lite-%{lite_ver}
+./install.sh -n
+popd
+
+#### Build shorewall6
+pushd shorewall6-%{shorewall6_ver}
+./install.sh -n
+popd
+
+#### Build shorewall6-lite
+pushd shorewall6-lite-%{lite6_ver}
 ./install.sh -n
 popd
 
@@ -154,6 +204,17 @@
    /sbin/chkconfig --del shorewall
 fi
 
+%post -n shorewall6
+if [ $1 = 1 ]; then
+   /sbin/chkconfig --add shorewall6
+fi
+
+%preun -n shorewall6
+if [ $1 = 0 ]; then
+   /sbin/service shorewall6 stop >/dev/null 2>&1
+   /sbin/chkconfig --del shorewall6
+fi
+
 %post lite
 if [ $1 = 1 ]; then
    /sbin/chkconfig --add shorewall-lite
@@ -165,12 +226,23 @@
    /sbin/chkconfig --del shorewall-lite
 fi
 
+%post -n shorewall6-lite
+if [ $1 = 1 ]; then
+   /sbin/chkconfig --add shorewall6-lite
+fi
+
+%preun -n shorewall6-lite
+if [ $1 = 0 ]; then
+   /sbin/service shorewall6-lite stop >/dev/null 2>&1
+   /sbin/chkconfig --del shorewall6-lite
+fi
+
 %files
 %defattr(-,root,root,-)
 
 %files common
 %defattr(0644,root,root,0755)
-%doc shorewall-common-%{version}/{COPYING,changelog.txt,releasenotes.txt,Samples}
+%doc shorewall-common-%{common_ver}/{COPYING,changelog.txt,releasenotes.txt,Samples}
 %attr(0755,root,root) %{_initrddir}/shorewall
 %attr(0755,root,root) /sbin/shorewall
 %dir %{_sysconfdir}/shorewall
@@ -229,7 +301,7 @@
 
 %files perl
 %defattr(0644,root,root,0755)
-%doc shorewall-perl-%{version}/{COPYING,releasenotes.txt}
+%doc shorewall-perl-%{perl_ver}/{COPYING,releasenotes.txt}
 %dir %{_datadir}/shorewall-perl
 %dir %{_datadir}/shorewall-perl/Shorewall
 %attr(755,root,root) %{_datadir}/shorewall-perl/compiler.pl
@@ -239,7 +311,7 @@
 
 %files shell
 %defattr(0644,root,root,0755)
-%doc shorewall-shell-%{version}/COPYING
+%doc shorewall-shell-%{shell_ver}/COPYING
 %attr(0755,root,root) %dir %{_datadir}/shorewall-shell
 %attr(0755,root,root) %{_datadir}/shorewall-shell/compiler
 %{_datadir}/shorewall-shell/lib.*
@@ -248,7 +320,7 @@
 
 %files lite
 %defattr(0644,root,root,0755)
-%doc shorewall-lite-%{version}/{COPYING,changelog.txt,releasenotes.txt}
+%doc shorewall-lite-%{lite_ver}/{COPYING,changelog.txt,releasenotes.txt}
 %attr(0755,root,root) /sbin/shorewall-lite
 %dir %{_sysconfdir}/shorewall-lite
 %config(noreplace) %{_sysconfdir}/shorewall-lite/shorewall-lite.conf
@@ -267,7 +339,79 @@
 %{_mandir}/man5/shorewall-lite-vardir.5.gz
 %{_mandir}/man8/shorewall-lite.8.gz
 
+%files -n shorewall6
+%defattr(0644,root,root,0755)
+%doc shorewall6-%{shorewall6_ver}/{COPYING,changelog.txt,releasenotes.txt,Samples6}
+%attr(0755,root,root) %{_initrddir}/shorewall6
+%attr(0755,root,root) /sbin/shorewall6
+%dir %{_sysconfdir}/shorewall6
+%config(noreplace) %{_sysconfdir}/shorewall6/*
+
+# Man files - can't use wildcard as shorewall6-lite also installs some man files
+%{_mandir}/man5/shorewall6-accounting.5.gz
+%{_mandir}/man5/shorewall6-actions.5.gz
+%{_mandir}/man5/shorewall6-blacklist.5.gz
+%{_mandir}/man5/shorewall6-exclusion.5.gz
+%{_mandir}/man5/shorewall6-hosts.5.gz
+%{_mandir}/man5/shorewall6-interfaces.5.gz
+%{_mandir}/man5/shorewall6-maclist.5.gz
+%{_mandir}/man5/shorewall6-modules.5.gz
+%{_mandir}/man5/shorewall6-nesting.5.gz
+%{_mandir}/man5/shorewall6-params.5.gz
+%{_mandir}/man5/shorewall6-policy.5.gz
+%{_mandir}/man5/shorewall6-providers.5.gz
+%{_mandir}/man5/shorewall6-route_rules.5.gz
+%{_mandir}/man5/shorewall6-routestopped.5.gz
+%{_mandir}/man5/shorewall6-rules.5.gz
+%{_mandir}/man5/shorewall6-tcclasses.5.gz
+%{_mandir}/man5/shorewall6-tcdevices.5.gz
+%{_mandir}/man5/shorewall6-tcrules.5.gz
+%{_mandir}/man5/shorewall6-tos.5.gz
+%{_mandir}/man5/shorewall6-tunnels.5.gz
+%{_mandir}/man5/shorewall6-vardir.5.gz
+%{_mandir}/man5/shorewall6-zones.5.gz
+%{_mandir}/man5/shorewall6.conf.5.gz
+%{_mandir}/man8/shorewall6.8.gz
+
+%attr(0755,root,root) %{_datadir}/shorewall6/wait4ifup
+%{_datadir}/shorewall6/action.*
+%{_datadir}/shorewall6/actions.std
+%{_datadir}/shorewall6/configfiles
+%{_datadir}/shorewall6/configpath
+%{_datadir}/shorewall6/functions
+%{_datadir}/shorewall6/lib.*
+%{_datadir}/shorewall6/macro.Ping
+%{_datadir}/shorewall6/modules
+%{_datadir}/shorewall6/version
+
+%files -n shorewall6-lite
+%defattr(0644,root,root,0755)
+%doc shorewall6-lite-%{lite6_ver}/{COPYING,changelog.txt,releasenotes.txt}
+%attr(0755,root,root) /sbin/shorewall6-lite
+%dir %{_sysconfdir}/shorewall6-lite
+%config(noreplace) %{_sysconfdir}/shorewall6-lite/shorewall6-lite.conf
+%attr(0755,root,root) %{_initrddir}/shorewall6-lite
+%{_sysconfdir}/shorewall6-lite/Makefile
+
+%{_mandir}/man5/shorewall6-lite-vardir.5.gz
+%{_mandir}/man5/shorewall6-lite.conf.5.gz
+%{_mandir}/man8/shorewall6-lite.8.gz
+
+%{_datadir}/shorewall6-lite/configpath
+%{_datadir}/shorewall6-lite/functions
+%{_datadir}/shorewall6-lite/lib.*
+%{_datadir}/shorewall6-lite/modules
+%{_datadir}/shorewall6-lite/version
+%attr(0755,root,root) %{_datadir}/shorewall6-lite/shorecap
+%attr(0755,root,root) %{_datadir}/shorewall6-lite/wait4ifup
+
 %changelog
+* Sun Jan 11 2009 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 4.2.4-1
+- Update to version 4.2.4 which adds IPV6 support and two new sub-packages
+  (shorewall6 and shorewall6-lite) 
+- Add proper versioning to sub-packages
+- Remove patch patch-perl-4.2.3.1
+
 * Tue Dec 30 2008 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 4.2.3-2
 - Add upstream patch patch-perl-4.2.3.1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/shorewall/devel/sources,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- sources	18 Dec 2008 00:27:49 -0000	1.44
+++ sources	11 Jan 2009 23:41:38 -0000	1.45
@@ -1,4 +1,6 @@
-43a78ca1235e3a4aa89498d146a195b4  shorewall-common-4.2.3.tar.bz2
-75ab779cf1f237a2d0a7748231885384  shorewall-shell-4.2.3.tar.bz2
-8ed6d0678f8cbc6ccfd91ac8975856fb  shorewall-perl-4.2.3.tar.bz2
-c6c72dd7321bcf41d7abfb184b678bfa  shorewall-lite-4.2.3.tar.bz2
+fbf1467c40a599d176732804f5f85f54  shorewall6-4.2.4.1.tar.bz2
+9f40f99dc4db2aea61ecd3a1040321e1  shorewall6-lite-4.2.4.1.tar.bz2
+888130a12280f7bf9022009153ac63cd  shorewall-common-4.2.4.tar.bz2
+15405aa9d2bc804dd7c3d555b1798848  shorewall-lite-4.2.4.tar.bz2
+58eaf858b8517c6ca79c5f8431b20401  shorewall-perl-4.2.4.5.tar.bz2
+95a645963e541aef5a39c707f67874b5  shorewall-shell-4.2.4.tar.bz2


--- patch-perl-4.2.3.1 DELETED ---



From jgu at fedoraproject.org  Sun Jan 11 23:43:42 2009
From: jgu at fedoraproject.org (Jonathan G. Underwood)
Date: Sun, 11 Jan 2009 23:43:42 +0000 (UTC)
Subject: rpms/shorewall/F-10 shorewall.spec,1.65,1.66 sources,1.44,1.45
Message-ID: <20090111234342.B7CB970139@cvs1.fedora.phx.redhat.com>

Author: jgu

Update of /cvs/extras/rpms/shorewall/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18290

Modified Files:
	shorewall.spec sources 
Log Message:
* Sun Jan 11 2009 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 4.2.4-1
- Update to version 4.2.4 which adds IPV6 support and two new sub-packages
  (shorewall6 and shorewall6-lite) 
- Add proper versioning to sub-packages
- Remove patch patch-perl-4.2.3.1



Index: shorewall.spec
===================================================================
RCS file: /cvs/extras/rpms/shorewall/F-10/shorewall.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- shorewall.spec	30 Dec 2008 00:29:29 -0000	1.65
+++ shorewall.spec	11 Jan 2009 23:43:12 -0000	1.66
@@ -1,40 +1,40 @@
 # A very helpful document for packaging Shorewall is "Anatomy of Shorewall 4.0"
 # which is found at http://www.shorewall.net/Anatomy.html
 
-# Note on upstream sources: the upstream maintainer publishes tarballs for each
-# version in the "base" subdirectory, and subsequent errata are corrected with
-# patches found in the top directory (NOT in the errata directory - these are
-# patches against installed packages). These patches are to be applied to the
-# tarballs from the "base" directory. Confusingly, upstream also publishes
-# patched tarballs shorewall-foo-X.Y.Z-N.tar.bz2 where N denotes a
-# patchlevel. However, these should not be used for distro packaging.
+%define major_ver 4.2.4
+%define common_ver %{major_ver}
+%define perl_ver %{major_ver}.5
+%define lite_ver %{major_ver}
+%define shell_ver %{major_ver}
+%define shorewall6_ver %{major_ver}.1
+%define lite6_ver %{major_ver}.1
 
 Name:           shorewall
-Version:	4.2.3
-Release:	2%{?dist}
+Version:	%{major_ver}
+Release:	1%{?dist}
 Summary:	An iptables front end for firewall configuration
 Group:		Applications/System
 License:	GPLv2+
 URL:		http://www.shorewall.net/
 
-%define _baseurl http://www.shorewall.net/pub/shorewall/4.2/shorewall-%{version}/base/
-Source0: 	%{_baseurl}%{name}-common-%{version}.tar.bz2
-Source1: 	%{_baseurl}%{name}-perl-%{version}.tar.bz2
-Source2: 	%{_baseurl}%{name}-shell-%{version}.tar.bz2
-Source3: 	%{_baseurl}%{name}-lite-%{version}.tar.bz2
+%define _baseurl http://www.shorewall.net/pub/shorewall/4.2/shorewall-%{version}/base
+Source0: 	%{_baseurl}/%{name}-common-%{common_ver}.tar.bz2
+Source1: 	%{_baseurl}/%{name}-perl-%{perl_ver}.tar.bz2
+Source2: 	%{_baseurl}/%{name}-shell-%{shell_ver}.tar.bz2
+Source3: 	%{_baseurl}/%{name}-lite-%{lite_ver}.tar.bz2
+Source4: 	%{_baseurl}/%{name}6-%{shorewall6_ver}.tar.bz2
+Source5: 	%{_baseurl}/%{name}6-lite-%{lite6_ver}.tar.bz2
 
-# Init files for Fedora
+# Init file for Fedora
 Source10:	init.sh
 
-Patch0:		patch-perl-4.2.3.1
-
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildRequires:	perl
 BuildArch:	noarch
 
-Requires:	shorewall-common = %{version}-%{release}
-Requires:	shorewall-perl = %{version}-%{release}
-Requires:	shorewall-shell = %{version}-%{release}
+Requires:	shorewall-common = %{common_ver}-%{release}
+Requires:	shorewall-perl = %{perl_ver}-%{release}
+Requires:	shorewall-shell = %{shell_ver}-%{release}
 
 %description
 The Shoreline Firewall, more commonly known as "Shorewall", is a
@@ -45,6 +45,7 @@
 %package common
 Summary:	Common files for the shorewall firewall compilers
 Group: 		Applications/System
+Version:	%{common_ver}
 Requires: 	iptables iproute
 Requires(post): /sbin/chkconfig
 Requires(preun):/sbin/chkconfig
@@ -54,9 +55,24 @@
 This package contains files required by both the shorewall-perl and
 shorewall-shell compilers for the Shoreline Firewall (shorewall).
 
+%package -n shorewall6
+Summary:	Files for the IPV6 Shorewall Firewall
+Group:		Applications/System
+Version:	%{shorewall6_ver}
+Requires:	shorewall-perl = %{perl_ver}-%{release}
+Requires: 	iptables-ipv6 iproute
+Requires(post): /sbin/chkconfig
+Requires(preun):/sbin/chkconfig
+Requires(preun):/sbin/service
+
+%description -n shorewall6
+This package contains the files required for IPV6 functionality of the
+Shoreline Firewall (shorewall).
+
 %package perl
 Summary:	Perl-based compiler for Shoreline Firewall 
 Group: 	 	Applications/System
+Version:	%{perl_ver}
 Requires:	shorewall-common = %{version}-%{release}
 Requires:	perl
 
@@ -67,6 +83,7 @@
 %package shell
 Summary:	Shell-based compiler for Shoreline Firewall 
 Group: 	 	Applications/System
+Version:	%{shell_ver}
 Requires:	shorewall-common = %{version}-%{release}
 
 %description shell
@@ -77,6 +94,7 @@
 %package lite
 Group: 	 	Applications/System
 Summary:	Shorewall firewall for compiled rulesets
+Version:	%{lite_ver}
 Requires: 	iptables iproute
 Requires(post): /sbin/chkconfig
 Requires(preun): /sbin/chkconfig
@@ -89,25 +107,47 @@
 machine with a Shorewall rule compiler. A machine running Shorewall
 Lite does not need to have a Shorewall rule compiler installed.
 
+%package -n shorewall6-lite
+Group: 	 	Applications/System
+Summary:	Shorewall firewall for compiled IPV6 rulesets
+Version:	%{lite6_ver}
+Requires: 	iptables iproute
+Requires(post): /sbin/chkconfig
+Requires(preun): /sbin/chkconfig
+Requires(preun): /sbin/service
+
+%description -n shorewall6-lite
+Shorewall6 Lite is a companion product to Shorewall6 (the IPV6
+firewall) that allows network administrators to centralize the
+configuration of Shorewall-based firewalls. Shorewall Lite runs a
+firewall script generated by a machine with a Shorewall rule
+compiler. A machine running Shorewall Lite does not need to have a
+Shorewall rule compiler installed.
+
 %prep
-%setup -q -c -n shorewall-%{version}
+%setup -q -c -n shorewall-%{major_ver}
 %setup -q -T -D -a 1
 %setup -q -T -D -a 2
 %setup -q -T -D -a 3
+%setup -q -T -D -a 4
+%setup -q -T -D -a 5
 
 # Overwrite default init files with Fedora specific ones
-cp %{SOURCE10} shorewall-common-%{version}
-cp %{SOURCE10} shorewall-lite-%{version}
-sed -i -e 's|prog="shorewall"|prog="shorewall-lite"|' shorewall-lite-%{version}/init.sh
+cp %{SOURCE10} shorewall-common-%{common_ver}
+
+cp %{SOURCE10} shorewall-lite-%{lite_ver}
+sed -i -e 's|prog="shorewall"|prog="shorewall-lite"|' shorewall-lite-%{lite_ver}/init.sh
+
+cp %{SOURCE10} shorewall6-%{shorewall6_ver}
+sed -i -e 's|prog="shorewall"|prog="shorewall6"|' shorewall6-%{shorewall6_ver}/init.sh
+
+cp %{SOURCE10} shorewall6-lite-%{lite6_ver}
+sed -i -e 's|prog="shorewall"|prog="shorewall6-lite"|' shorewall6-lite-%{lite6_ver}/init.sh
 
 # Remove hash-bang from files which are not directly executed as shell
 # scripts. This silences some rpmlint errors.
 find . -name "lib.*" -exec sed -i -e '/\#\!\/bin\/sh/d' {} \;
 
-pushd shorewall-perl-%{version}
-%patch0 -p1
-popd
-
 %build
 
 %install
@@ -117,7 +157,7 @@
 export DEST=%{_initrddir}
 
 #### Build shorewall-common
-pushd shorewall-common-%{version}
+pushd shorewall-common-%{common_ver}
 ./install.sh
 popd
 
@@ -126,17 +166,27 @@
 touch $RPM_BUILD_ROOT/%{_localstatedir}/lib/shorewall/{chains,nat,proxyarp,restarted,zones,restore-base,restore-tail,state,.modules,.modulesdir}
 
 #### Build shorewall-perl
-pushd shorewall-perl-%{version}
+pushd shorewall-perl-%{perl_ver}
 ./install.sh -n
 popd
 
 #### Build shorewall-shell
-pushd shorewall-shell-%{version}
+pushd shorewall-shell-%{shell_ver}
 ./install.sh -n
 popd
 
 #### Build shorewall-lite
-pushd shorewall-lite-%{version}
+pushd shorewall-lite-%{lite_ver}
+./install.sh -n
+popd
+
+#### Build shorewall6
+pushd shorewall6-%{shorewall6_ver}
+./install.sh -n
+popd
+
+#### Build shorewall6-lite
+pushd shorewall6-lite-%{lite6_ver}
 ./install.sh -n
 popd
 
@@ -154,6 +204,17 @@
    /sbin/chkconfig --del shorewall
 fi
 
+%post -n shorewall6
+if [ $1 = 1 ]; then
+   /sbin/chkconfig --add shorewall6
+fi
+
+%preun -n shorewall6
+if [ $1 = 0 ]; then
+   /sbin/service shorewall6 stop >/dev/null 2>&1
+   /sbin/chkconfig --del shorewall6
+fi
+
 %post lite
 if [ $1 = 1 ]; then
    /sbin/chkconfig --add shorewall-lite
@@ -165,12 +226,23 @@
    /sbin/chkconfig --del shorewall-lite
 fi
 
+%post -n shorewall6-lite
+if [ $1 = 1 ]; then
+   /sbin/chkconfig --add shorewall6-lite
+fi
+
+%preun -n shorewall6-lite
+if [ $1 = 0 ]; then
+   /sbin/service shorewall6-lite stop >/dev/null 2>&1
+   /sbin/chkconfig --del shorewall6-lite
+fi
+
 %files
 %defattr(-,root,root,-)
 
 %files common
 %defattr(0644,root,root,0755)
-%doc shorewall-common-%{version}/{COPYING,changelog.txt,releasenotes.txt,Samples}
+%doc shorewall-common-%{common_ver}/{COPYING,changelog.txt,releasenotes.txt,Samples}
 %attr(0755,root,root) %{_initrddir}/shorewall
 %attr(0755,root,root) /sbin/shorewall
 %dir %{_sysconfdir}/shorewall
@@ -229,7 +301,7 @@
 
 %files perl
 %defattr(0644,root,root,0755)
-%doc shorewall-perl-%{version}/{COPYING,releasenotes.txt}
+%doc shorewall-perl-%{perl_ver}/{COPYING,releasenotes.txt}
 %dir %{_datadir}/shorewall-perl
 %dir %{_datadir}/shorewall-perl/Shorewall
 %attr(755,root,root) %{_datadir}/shorewall-perl/compiler.pl
@@ -239,7 +311,7 @@
 
 %files shell
 %defattr(0644,root,root,0755)
-%doc shorewall-shell-%{version}/COPYING
+%doc shorewall-shell-%{shell_ver}/COPYING
 %attr(0755,root,root) %dir %{_datadir}/shorewall-shell
 %attr(0755,root,root) %{_datadir}/shorewall-shell/compiler
 %{_datadir}/shorewall-shell/lib.*
@@ -248,7 +320,7 @@
 
 %files lite
 %defattr(0644,root,root,0755)
-%doc shorewall-lite-%{version}/{COPYING,changelog.txt,releasenotes.txt}
+%doc shorewall-lite-%{lite_ver}/{COPYING,changelog.txt,releasenotes.txt}
 %attr(0755,root,root) /sbin/shorewall-lite
 %dir %{_sysconfdir}/shorewall-lite
 %config(noreplace) %{_sysconfdir}/shorewall-lite/shorewall-lite.conf
@@ -267,7 +339,79 @@
 %{_mandir}/man5/shorewall-lite-vardir.5.gz
 %{_mandir}/man8/shorewall-lite.8.gz
 
+%files -n shorewall6
+%defattr(0644,root,root,0755)
+%doc shorewall6-%{shorewall6_ver}/{COPYING,changelog.txt,releasenotes.txt,Samples6}
+%attr(0755,root,root) %{_initrddir}/shorewall6
+%attr(0755,root,root) /sbin/shorewall6
+%dir %{_sysconfdir}/shorewall6
+%config(noreplace) %{_sysconfdir}/shorewall6/*
+
+# Man files - can't use wildcard as shorewall6-lite also installs some man files
+%{_mandir}/man5/shorewall6-accounting.5.gz
+%{_mandir}/man5/shorewall6-actions.5.gz
+%{_mandir}/man5/shorewall6-blacklist.5.gz
+%{_mandir}/man5/shorewall6-exclusion.5.gz
+%{_mandir}/man5/shorewall6-hosts.5.gz
+%{_mandir}/man5/shorewall6-interfaces.5.gz
+%{_mandir}/man5/shorewall6-maclist.5.gz
+%{_mandir}/man5/shorewall6-modules.5.gz
+%{_mandir}/man5/shorewall6-nesting.5.gz
+%{_mandir}/man5/shorewall6-params.5.gz
+%{_mandir}/man5/shorewall6-policy.5.gz
+%{_mandir}/man5/shorewall6-providers.5.gz
+%{_mandir}/man5/shorewall6-route_rules.5.gz
+%{_mandir}/man5/shorewall6-routestopped.5.gz
+%{_mandir}/man5/shorewall6-rules.5.gz
+%{_mandir}/man5/shorewall6-tcclasses.5.gz
+%{_mandir}/man5/shorewall6-tcdevices.5.gz
+%{_mandir}/man5/shorewall6-tcrules.5.gz
+%{_mandir}/man5/shorewall6-tos.5.gz
+%{_mandir}/man5/shorewall6-tunnels.5.gz
+%{_mandir}/man5/shorewall6-vardir.5.gz
+%{_mandir}/man5/shorewall6-zones.5.gz
+%{_mandir}/man5/shorewall6.conf.5.gz
+%{_mandir}/man8/shorewall6.8.gz
+
+%attr(0755,root,root) %{_datadir}/shorewall6/wait4ifup
+%{_datadir}/shorewall6/action.*
+%{_datadir}/shorewall6/actions.std
+%{_datadir}/shorewall6/configfiles
+%{_datadir}/shorewall6/configpath
+%{_datadir}/shorewall6/functions
+%{_datadir}/shorewall6/lib.*
+%{_datadir}/shorewall6/macro.Ping
+%{_datadir}/shorewall6/modules
+%{_datadir}/shorewall6/version
+
+%files -n shorewall6-lite
+%defattr(0644,root,root,0755)
+%doc shorewall6-lite-%{lite6_ver}/{COPYING,changelog.txt,releasenotes.txt}
+%attr(0755,root,root) /sbin/shorewall6-lite
+%dir %{_sysconfdir}/shorewall6-lite
+%config(noreplace) %{_sysconfdir}/shorewall6-lite/shorewall6-lite.conf
+%attr(0755,root,root) %{_initrddir}/shorewall6-lite
+%{_sysconfdir}/shorewall6-lite/Makefile
+
+%{_mandir}/man5/shorewall6-lite-vardir.5.gz
+%{_mandir}/man5/shorewall6-lite.conf.5.gz
+%{_mandir}/man8/shorewall6-lite.8.gz
+
+%{_datadir}/shorewall6-lite/configpath
+%{_datadir}/shorewall6-lite/functions
+%{_datadir}/shorewall6-lite/lib.*
+%{_datadir}/shorewall6-lite/modules
+%{_datadir}/shorewall6-lite/version
+%attr(0755,root,root) %{_datadir}/shorewall6-lite/shorecap
+%attr(0755,root,root) %{_datadir}/shorewall6-lite/wait4ifup
+
 %changelog
+* Sun Jan 11 2009 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 4.2.4-1
+- Update to version 4.2.4 which adds IPV6 support and two new sub-packages
+  (shorewall6 and shorewall6-lite) 
+- Add proper versioning to sub-packages
+- Remove patch patch-perl-4.2.3.1
+
 * Tue Dec 30 2008 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 4.2.3-2
 - Add upstream patch patch-perl-4.2.3.1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/shorewall/F-10/sources,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- sources	18 Dec 2008 00:29:25 -0000	1.44
+++ sources	11 Jan 2009 23:43:12 -0000	1.45
@@ -1,4 +1,6 @@
-43a78ca1235e3a4aa89498d146a195b4  shorewall-common-4.2.3.tar.bz2
-75ab779cf1f237a2d0a7748231885384  shorewall-shell-4.2.3.tar.bz2
-8ed6d0678f8cbc6ccfd91ac8975856fb  shorewall-perl-4.2.3.tar.bz2
-c6c72dd7321bcf41d7abfb184b678bfa  shorewall-lite-4.2.3.tar.bz2
+fbf1467c40a599d176732804f5f85f54  shorewall6-4.2.4.1.tar.bz2
+9f40f99dc4db2aea61ecd3a1040321e1  shorewall6-lite-4.2.4.1.tar.bz2
+888130a12280f7bf9022009153ac63cd  shorewall-common-4.2.4.tar.bz2
+15405aa9d2bc804dd7c3d555b1798848  shorewall-lite-4.2.4.tar.bz2
+58eaf858b8517c6ca79c5f8431b20401  shorewall-perl-4.2.4.5.tar.bz2
+95a645963e541aef5a39c707f67874b5  shorewall-shell-4.2.4.tar.bz2



From wtogami at fedoraproject.org  Sun Jan 11 23:51:30 2009
From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=)
Date: Sun, 11 Jan 2009 23:51:30 +0000 (UTC)
Subject: rpms/nspluginwrapper/F-9 nspluginwrapper-1.3.0-configure.patch, NONE,
	1.1 nspluginwrapper-1.3.0-directory.patch, NONE,
	1.1 nspluginwrapper-1.3.0-make.patch, NONE,
	1.1 plugin-config-native.patch, NONE, 1.1 .cvsignore, 1.10,
	1.11 nspluginwrapper.spec, 1.61, 1.62 sources, 1.13,
	1.14 nspluginwrapper-1.1.10-configure.patch, 1.1,
	NONE nspluginwrapper-1.1.2-event.patch, 1.1,
	NONE nspluginwrapper-1.1.4-make.patch, 1.1,
	NONE nspluginwrapper-1.1.8-directory.patch, 1.1, NONE
Message-ID: <20090111235130.4D3D970139@cvs1.fedora.phx.redhat.com>

Author: wtogami

Update of /cvs/pkgs/rpms/nspluginwrapper/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19263

Modified Files:
	.cvsignore nspluginwrapper.spec sources 
Added Files:
	nspluginwrapper-1.3.0-configure.patch 
	nspluginwrapper-1.3.0-directory.patch 
	nspluginwrapper-1.3.0-make.patch plugin-config-native.patch 
Removed Files:
	nspluginwrapper-1.1.10-configure.patch 
	nspluginwrapper-1.1.2-event.patch 
	nspluginwrapper-1.1.4-make.patch 
	nspluginwrapper-1.1.8-directory.patch 
Log Message:
- Fixed multilib conflicts
- Updated to 1.3.0 and removed some fedora build patches


nspluginwrapper-1.3.0-configure.patch:

--- NEW FILE nspluginwrapper-1.3.0-configure.patch ---
diff -up nspluginwrapper-1.3.0/configure.conf nspluginwrapper-1.3.0/configure
--- nspluginwrapper-1.3.0/configure.conf	2009-01-02 15:22:29.000000000 +0100
+++ nspluginwrapper-1.3.0/configure	2009-01-07 12:06:21.000000000 +0100
@@ -559,10 +559,6 @@ for dir in $x_base_dirs; do
 	fi
     fi
 done
-if test -z "$x_base_dir"; then
-    echo "X11/Xt environment not found"
-    exit 1
-fi
 
 # big/little endian test
 cat > $TMPC << EOF
@@ -763,6 +759,7 @@ echo "COMPILER=$compiler" >> $config_mak
 echo "CC=$cc" >> $config_mak
 echo "CXX=$cxx" >> $config_mak
 echo "CFLAGS=$CFLAGS" >> $config_mak
+echo "LDFLAGS=$LDFLAGS" >> $config_mak
 echo "GLIB_CFLAGS=$GLIB_CFLAGS" >> $config_mak
 echo "GLIB_LDFLAGS=$GLIB_LDFLAGS" >> $config_mak
 echo "GTK_CFLAGS=$GTK_CFLAGS" >> $config_mak

nspluginwrapper-1.3.0-directory.patch:

--- NEW FILE nspluginwrapper-1.3.0-directory.patch ---
diff -up nspluginwrapper-1.3.0/src/npw-config.c.dir nspluginwrapper-1.3.0/src/npw-config.c
--- nspluginwrapper-1.3.0/src/npw-config.c.dir	2009-01-02 15:22:29.000000000 +0100
+++ nspluginwrapper-1.3.0/src/npw-config.c	2009-01-08 16:29:55.000000000 +0100
@@ -38,11 +38,14 @@
 #include <pwd.h>
 #include <dirent.h>
 
+#include <asm/types.h> 
 
 static bool g_auto = false;
 static bool g_verbose = false;
 static bool g_allow_native = false;
 static const char NPW_CONFIG[] = "nspluginwrapper";
+static char *p_plugin_dir = NULL;
+static char *p_plugin_prefix = NULL;
 
 static void error(const char *format, ...)
 {
@@ -858,7 +861,9 @@ static int do_install_plugin(const char 
   plugin_base += 1;
 
   char d_plugin_path[PATH_MAX];
-  int n = snprintf(d_plugin_path, sizeof(d_plugin_path), "%s/%s.%s", plugin_dir, NPW_WRAPPER_BASE, plugin_base);
+  int n = snprintf(d_plugin_path, sizeof(d_plugin_path), 
+                   "%s/%s.%s", plugin_dir, p_plugin_prefix ? p_plugin_prefix : NPW_WRAPPER_BASE, 
+                   plugin_base);
   if (n < 0 || n >= sizeof(d_plugin_path))
 	return 3;
 
@@ -951,28 +956,32 @@ static int install_plugin(const char *pl
   if (g_verbose)
 	printf("Install plugin %s\n", plugin_path);
 
-  // don't install plugin system-wide if it is only accessible by root
-  if (!is_root_only_accessible_plugin(plugin_path)) {
-	ret = do_install_plugin(plugin_path, get_system_mozilla_plugin_dir(), plugin_info);
-	if (ret == 0)
-	  return 0;
+  if(p_plugin_dir) {
+	ret = do_install_plugin(plugin_path, p_plugin_dir, plugin_info);
   }
+  else {
+	// don't install plugin system-wide if it is only accessible by root
+	if (!is_root_only_accessible_plugin(plugin_path)) {
+		ret = do_install_plugin(plugin_path, get_system_mozilla_plugin_dir(), plugin_info);
+	if (ret == 0)
+	  	return 0;
+  	}
 
-  // don't install plugin in user home dir if already available system-wide
-  if (has_system_wide_wrapper_plugin(plugin_path, true)) {
-	if (g_verbose)
-	  printf(" ... already installed system-wide, skipping\n");
-	return 0;
+  	// don't install plugin in user home dir if already available system-wide
+  	if (has_system_wide_wrapper_plugin(plugin_path, true)) {
+		if (g_verbose)
+	  		printf(" ... already installed system-wide, skipping\n");
+		return 0;
+  	}
+
+  	const char *user_plugin_dir = get_user_mozilla_plugin_dir();
+  	if (access(user_plugin_dir, R_OK | W_OK) < 0 && mkdir_p(user_plugin_dir) < 0)
+		return 1;
+
+  	ret = do_install_plugin(plugin_path, user_plugin_dir, plugin_info);
+  	if (ret == 0)
+		return 0;
   }
-
-  const char *user_plugin_dir = get_user_mozilla_plugin_dir();
-  if (access(user_plugin_dir, R_OK | W_OK) < 0 && mkdir_p(user_plugin_dir) < 0)
-	return 1;
-
-  ret = do_install_plugin(plugin_path, user_plugin_dir, plugin_info);
-  if (ret == 0)
-	return 0;
-
   return ret;
 }
 
@@ -1139,6 +1148,8 @@ static void print_usage(void)
   printf("   -h --help               print this message\n");
   printf("   -v --verbose            flag: set verbose mode\n");
   printf("   -a --auto               flag: set automatic mode for plugins discovery\n");
+  printf("   -d --dir plugin-dir     flag: target plugin(s) directory\n");
+  printf("   -p --prefix prefix      flag: a prefix of wrapped plugin file\n");
   printf("   -n --native             flag: allow native plugin(s) to be wrapped\n");
   printf("   -l --list               list plugins currently installed\n");
   printf("   -u --update             update plugin(s) currently installed\n");
@@ -1171,6 +1182,18 @@ static int process_native(int argc, char
   return 0;
 }
 
+static int process_dir(int argc, char *argv[])
+{ 
+  p_plugin_dir = argv[0];
+  return 0;
+}
+
+static int process_prefix(int argc, char *argv[])
+{ 
+  p_plugin_prefix = argv[0];
+  return 0;
+}
+
 static int process_list(int argvc, char *argv[])
 {
   const char **plugin_dirs = get_mozilla_plugin_dirs();
@@ -1266,57 +1287,56 @@ static int process_remove(int argc, char
 
 int main(int argc, char *argv[])
 {
-  char **args;
-  int i, j, n_args;
-
-  n_args = argc - 1;
-  args = argv + 1;
+  int i, j;
 
-  if (n_args < 1) {
+  if (argc < 2) {
 	print_usage();
 	return 1;
   }
-
-  if (args[0][0] != '-') {
-	print_usage();
-	return 1;
+  
+  if (argv[1][0] != '-') {
+  	print_usage();
+  	return 1;
   }
-
+  
   static const struct option {
-	char short_option;
-	const char *long_option;
-	int (*process_callback)(int argc, char *argv[]);
-	bool terminal;
+	const char *short_option;
+  	const char *long_option;
+  	int (*process_callback)(int argc, char *argv[]);
+  	bool terminal;
+ 	int  extra_args;
   }
   options[] = {
-	{ 'h', "help",		process_help,		1 },
-	{ 'v', "verbose",	process_verbose,	0 },
-	{ 'a', "auto",		process_auto,		0 },
-	{ 'n', "native",	process_native,		0 },
-	{ 'l', "list",		process_list,		1 },
-	{ 'u', "update",	process_update,		1 },
-	{ 'i', "install",	process_install,	1 },
-	{ 'r', "remove",	process_remove,		1 },
-	{  0,   NULL,		NULL,				1 }
-  };
-
-  for (i = 0; i < n_args; i++) {
-	const char *arg = args[i];
+	{ "-h", "--help",          process_help,           1, 0 },
+        { "-v", "--verbose",       process_verbose,        0, 0 },
+        { "-a", "--auto",          process_auto,           0, 0 },
+        { "-d", "--dir",           process_dir,            0, 1 },
+        { "-p", "--prefix",        process_prefix,         0, 1 },
+        { "-n", "--native",        process_native,         0, 0 },
+        { "-l", "--list",          process_list,           1, 0 },
+        { "-u", "--update",        process_update,         1, 0 },
+        { "-i", "--install",       process_install,        1, 0 },
+        { "-r", "--remove",        process_remove,         1, 0 }
+   };
+ 
+   for (i = 1; i < argc; i++) {
 	const struct option *opt = NULL;
-	for (j = 0; opt == NULL && options[j].process_callback != NULL; j++) {
-	  if ((arg[0] == '-' && arg[1] == options[j].short_option && arg[2] == '\0') ||
-		  (arg[0] == '-' && arg[1] == '-' && strcmp(&arg[2], options[j].long_option) == 0))
-		opt = &options[j];
-	}
-	if (opt == NULL) {
-	  fprintf(stderr, "invalid option %s\n", arg);
-	  print_usage();
-	  return 1;
-	}
-	int ret = opt->process_callback(n_args - i - 1, args + i + 1);
-	if (opt->terminal)
-	  return ret;
+ 	for (j = 0; j < sizeof(options)/sizeof(options[0]); j++) {
+ 	  if (!strcmp(options[j].short_option,argv[i]) || !strcmp(options[j].long_option,argv[i])) {
+ 	     opt = &options[j];
+        	     break;
+ 	  }
+  	}
+  	if (opt == NULL) {
+ 	  fprintf(stderr, "invalid option %s\n", argv[i]);
+  	  print_usage();
+  	  return 1;
+  	}
+ 	int ret = opt->process_callback(argc - i - 1, argv + i + 1);
+  	if (opt->terminal)
+  	  return ret;
+ 	i += opt->extra_args;
   }
-
+  
   return 0;
 }
diff -up nspluginwrapper-1.3.0/src/npw-viewer.sh.dir nspluginwrapper-1.3.0/src/npw-viewer.sh
--- nspluginwrapper-1.3.0/src/npw-viewer.sh.dir	2009-01-02 15:22:29.000000000 +0100
+++ nspluginwrapper-1.3.0/src/npw-viewer.sh	2009-01-08 16:29:40.000000000 +0100
@@ -100,6 +100,9 @@ if test "$ARCH" != "$TARGET_ARCH"; then
 	    NPW_USE_XSHM="no"
 	fi
 	;;
+    x86_64)
+	LOADER=""
+	;;
     ppc)
 	if test "$ARCH" = "ppc64"; then
 	    case "$OS" in

nspluginwrapper-1.3.0-make.patch:

--- NEW FILE nspluginwrapper-1.3.0-make.patch ---
diff -up nspluginwrapper-1.3.0/Makefile.make nspluginwrapper-1.3.0/Makefile
--- nspluginwrapper-1.3.0/Makefile.make	2009-01-02 15:22:29.000000000 +0100
+++ nspluginwrapper-1.3.0/Makefile	2009-01-07 13:00:40.000000000 +0100
@@ -364,13 +364,13 @@ changelog.commit: changelog
 	svn commit -m "Generated by svn2cl." ChangeLog
 
 $(npwrapper_LIBRARY): $(npwrapper_OBJECTS)
-	$(CC) -o $@ $(DSO_LDFLAGS) $(npwrapper_OBJECTS) $(npwrapper_LDFLAGS)
+	$(CC) -o $@ $(DSO_LDFLAGS) $(npwrapper_OBJECTS) $(npwrapper_LDFLAGS) $(LDFLAGS)
 
 npwrapper-%.os: $(SRC_PATH)/src/%.c
 	$(CC) -o $@ -c $< $(PIC_CFLAGS) $(CPPFLAGS) $(npwrapper_CFLAGS) -DBUILD_WRAPPER
 
 $(npviewer_PROGRAM): $(npviewer_OBJECTS) $(npviewer_MAPFILE) $(LSB_OBJ_DIR) $(LSB_LIBS)
-	$(CC) $(LDFLAGS_32) -o $@ $(npviewer_OBJECTS) $(npviewer_LDFLAGS)
+	$(CC) $(LDFLAGS_32) -o $@ $(npviewer_OBJECTS) $(npviewer_LDFLAGS) $(LDFLAGS)
 
 npviewer-%.o: $(SRC_PATH)/src/%.c
 	$(CC) $(CFLAGS_32) -o $@ -c $< $(CPPFLAGS) $(npviewer_CFLAGS) -DBUILD_VIEWER
@@ -387,19 +387,19 @@ npplayer-%.o: $(SRC_PATH)/src/tidy/%.c
 	$(CC) $(CFLAGS) -o $@ -c $< $(CPPFLAGS) $(npplayer_CFLAGS) -DBUILD_PLAYER
 
 $(libxpcom_LIBRARY): $(libxpcom_OBJECTS) $(LSB_OBJ_DIR) $(LSB_LIBS)
-	$(CC) $(LDFLAGS_32) $(DSO_LDFLAGS) -o $@ $(libxpcom_OBJECTS) $(libxpcom_LDFLAGS) -Wl,$(LD_soname),libxpcom.so
+	$(CC) $(LDFLAGS) $(LDFLAGS_32) $(DSO_LDFLAGS) -o $@ $(libxpcom_OBJECTS) $(libxpcom_LDFLAGS) -Wl,$(LD_soname),libxpcom.so
 
 libxpcom-%.o: $(SRC_PATH)/src/%.c
 	$(CC) $(CFLAGS_32) -o $@ -c $< $(CPPFLAGS) $(libxpcom_CFLAGS) -DBUILD_XPCOM
 
 $(libnoxshm_LIBRARY): $(libnoxshm_OBJECTS) $(LSB_OBJ_DIR) $(LSB_LIBS)
-	$(CC) $(LDFLAGS_32) $(DSO_LDFLAGS) -o $@ $(libnoxshm_OBJECTS) $(libnoxshm_LDFLAGS) -Wl,$(LD_soname),libnoxshm.so
+	$(CC) $(LDFLAGS) $(LDFLAGS_32) $(DSO_LDFLAGS) -o $@ $(libnoxshm_OBJECTS) $(libnoxshm_LDFLAGS) -Wl,$(LD_soname),libnoxshm.so
 
 libnoxshm-%.o: $(SRC_PATH)/src/%.c
 	$(CC) $(CFLAGS_32) -o $@ -c $< $(CPPFLAGS) $(libnoxshm_CFLAGS)
 
 $(npconfig_PROGRAM): $(npconfig_OBJECTS)
-	$(CC) -o $@ $(npconfig_OBJECTS) $(npconfig_LDFLAGS)
+	$(CC) -o $@ $(npconfig_OBJECTS) $(npconfig_LDFLAGS) $(LDFLAGS)
 
 npconfig-%.o: $(SRC_PATH)/src/%.c
 	$(CC) -o $@ -c $< $(CPPFLAGS) $(CFLAGS)
@@ -425,7 +425,7 @@ $(LSB_OBJ_DIR)/libgcc_s_32.so: $(LSB_OBJ
 	$(LN_S) libgcc_s.so $@
 
 $(LSB_OBJ_DIR)/%.so: $(LSB_OBJ_DIR)/%.o
-	$(CC) $(LDFLAGS_32) -nostdlib $(DSO_LDFLAGS) $< -o $@ \
+	$(CC) $(LDFLAGS) $(LDFLAGS_32) -nostdlib $(DSO_LDFLAGS) $< -o $@ \
 		-Wl,--version-script,$(patsubst $(LSB_OBJ_DIR)/%.o,$(LSB_SRC_DIR)/%.Version,$<) \
 		-Wl,-soname,`grep "$(patsubst $(LSB_OBJ_DIR)/%.o,%,$<) " $(LSB_SRC_DIR)/LibNameMap.txt | cut -f2 -d' '`
 

plugin-config-native.patch:

--- NEW FILE plugin-config-native.patch ---
diff -up nspluginwrapper-1.3.0/plugin-config-1.9/src/plugin-config.c.native nspluginwrapper-1.3.0/plugin-config-1.9/src/plugin-config.c
--- nspluginwrapper-1.3.0/plugin-config-1.9/src/plugin-config.c.native	2009-01-06 17:20:02.000000000 +0100
+++ nspluginwrapper-1.3.0/plugin-config-1.9/src/plugin-config.c	2009-01-06 17:22:43.000000000 +0100
@@ -444,6 +444,7 @@ int wrap_plugin_2(WRAP_PLUGIN *p_plugin,
       char *params[] = 
       {
         p_wrapper,
+        "-n",
         "-p", 
         prefix,
         "-d", 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/nspluginwrapper/F-9/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	9 Dec 2008 05:05:46 -0000	1.10
+++ .cvsignore	11 Jan 2009 23:51:29 -0000	1.11
@@ -1 +1,9 @@
-nspluginwrapper-1.1.10.tar.bz2
+nspluginwrapper-0.9.91.4.tar.bz2
+plugin-config-1.3.tar.gz
+plugin-config-1.4.tar.gz
+nspluginwrapper-0.9.91.5.tar.bz2
+plugin-config-1.6.tar.gz
+plugin-config-1.9.tar.gz
+nspluginwrapper-1.1.4.tar.bz2
+nspluginwrapper-1.1.8.tar.bz2
+nspluginwrapper-1.3.0.tar.bz2


Index: nspluginwrapper.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nspluginwrapper/F-9/nspluginwrapper.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- nspluginwrapper.spec	9 Dec 2008 05:05:48 -0000	1.61
+++ nspluginwrapper.spec	11 Jan 2009 23:51:29 -0000	1.62
@@ -64,19 +64,19 @@
 
 Summary:	A compatibility layer for Netscape 4 plugins
 Name:		nspluginwrapper
-Version:	1.1.10
-Release:	1%{?dist}
+Version:	1.3.0
+Release:	2%{?dist}
 Source0:	%{name}-%{version}%{?svndate:-%{svndate}}.tar.bz2
-Source1:        %{plugin_config_name}.tar.gz 
+Source1:        %{plugin_config_name}.tar.gz
 Source2:        plugin-config.sh.in
 Source3:        %{name}.sh.in
-Patch1:         nspluginwrapper-1.1.4-make.patch
-Patch2:         nspluginwrapper-1.1.10-configure.patch
-Patch3:         nspluginwrapper-1.1.8-directory.patch
-Patch10:        nspluginwrapper-1.1.2-event.patch
+Patch1:         nspluginwrapper-1.3.0-make.patch
+Patch2:         nspluginwrapper-1.3.0-configure.patch
+Patch3:         nspluginwrapper-1.3.0-directory.patch
 Patch100:       plugin-config-setuid.patch
 Patch101:       plugin-config-umask.patch
 Patch102:       plugin-config-print.patch
+Patch103:       plugin-config-native.patch
 License:	GPLv2+
 Group:		Networking/WWW
 Url:		http://gwenole.beauchesne.info/projects/nspluginwrapper/
@@ -106,21 +106,14 @@
 %patch2 -p1 -b .conf
 %patch3 -p1 -b .dir
 
-# Package fixes
-%patch10 -p1 -b .event
-
 # Plugin-config patches
 pushd %plugin_config_name
 %patch100 -p2
 %patch101 -p2 -b .umask
 %patch102 -p2 -b .print
+%patch103 -p2 -b .native
 popd
 
-
-# remove old/incompatibile stuff
-rm -rf npapi
-rm -rf lsb-build
-
 %build
 # Build wrapper
 
@@ -152,11 +145,14 @@
 	    --with-lib32=%{lib32}		\
 	    --with-lib64=%{lib64}		\
 	    --with-base-lib=%{lib}		\
-	    --with-xpcom=no			\
 	    --with-base-libdir=%{libdir}	\
-	    --with-x11-prefix=/usr	        \
-	    --with-gecko=%{gecko_flavour}
-	    
+	    --viewer-paths=%{pkgdir}		\
+	    --with-x11-prefix=/usr		\
+	    --with-gecko=%{gecko_flavour}	\
+	    --enable-viewer			\
+	    --viewer-paths="%{pkgdir32}:%{pkgdir64}"\
+	    --disable-biarch
+	
 make
 popd
 
@@ -203,6 +199,10 @@
 EOF
 chmod 755 $RPM_BUILD_ROOT%{pkgdir}/nspluginplayer
 
+# Remove conflicting files
+rm -rf $RPM_BUILD_ROOT%{_bindir}/nspluginplayer
+rm -rf $RPM_BUILD_ROOT%{_bindir}/nspluginwrapper
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -224,19 +224,26 @@
 %{pkgdir}/npconfig
 %{pkgdir}/npwrapper.so
 %{pkgdir}/npviewer.bin
+%{pkgdir}/npviewer.sh
 %{pkgdir}/npviewer
 %{pkgdir}/npplayer
+%{pkgdir}/libxpcom.so
+%{pkgdir}/libnoxshm.so
 %{pkgdir}/nspluginplayer
 %{plugindir}/npwrapper.so
 %{_bindir}/mozilla-plugin-config
 %config %{_sysconfdir}/sysconfig/%{name}
 
+
 %changelog
-* Mon Dec 08 2008 Warren Togami <wtogami at redhat.com> 1.1.10-1
-- Update to 1.1.10
+* Thu Jan 9 2009 Martin Stransky <stransky at redhat.com> 1.3.0-2
+- Fixed multilib conflicts
+
+* Thu Jan 8 2009 Martin Stransky <stransky at redhat.com> 1.3.0-1
+- Updated to 1.3.0 and removed some fedora build patches
 
 * Tue Dec 02 2008 Warren Togami <wtogami at redhat.com> 1.1.8-2
-- fix-invalid-RPC-after-NPP_Destroy fixes a crasher 
+- fix-invalid-RPC-after-NPP_Destroy fixes a crasher
 
 * Mon Dec 1 2008 Martin Stransky <stransky at redhat.com> 1.1.8-1
 - Updated to 1.1.8


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nspluginwrapper/F-9/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	9 Dec 2008 05:05:48 -0000	1.13
+++ sources	11 Jan 2009 23:51:29 -0000	1.14
@@ -1,2 +1,2 @@
 0a00e94ba608dfea365851af9deb20dc  plugin-config-1.9.tar.gz
-127ecc8c3eb2b2c8d60cbae97b3c11f2  nspluginwrapper-1.1.10.tar.bz2
+188f77bd3427c131ccba4bfdb25892a9  nspluginwrapper-1.3.0.tar.bz2


--- nspluginwrapper-1.1.10-configure.patch DELETED ---


--- nspluginwrapper-1.1.2-event.patch DELETED ---


--- nspluginwrapper-1.1.4-make.patch DELETED ---


--- nspluginwrapper-1.1.8-directory.patch DELETED ---



From kyle at fedoraproject.org  Mon Jan 12 00:15:59 2009
From: kyle at fedoraproject.org (Kyle McMartin)
Date: Mon, 12 Jan 2009 00:15:59 +0000 (UTC)
Subject: rpms/kernel/devel config-x86_64-generic, 1.61, 1.62 kernel.spec,
	1.1206, 1.1207
Message-ID: <20090112001559.3B06670123@cvs1.fedora.phx.redhat.com>

Author: kyle

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22840

Modified Files:
	config-x86_64-generic kernel.spec 
Log Message:
* Sun Jan 09 2009 Kyle McMartin <kyle at redhat.com>
- Disable CONFIG_MAXSMP on x86_64.



Index: config-x86_64-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-x86_64-generic,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- config-x86_64-generic	9 Jan 2009 05:13:21 -0000	1.61
+++ config-x86_64-generic	12 Jan 2009 00:15:28 -0000	1.62
@@ -10,7 +10,6 @@
 CONFIG_K8_NUMA=y
 CONFIG_X86_64_ACPI_NUMA=y
 # CONFIG_NUMA_EMU is not set
-CONFIG_MAXSMP=y
 CONFIG_NR_CPUS=512
 CONFIG_X86_POWERNOW_K8=m
 CONFIG_X86_POWERNOW_K8_ACPI=y


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1206
retrieving revision 1.1207
diff -u -r1.1206 -r1.1207
--- kernel.spec	11 Jan 2009 16:38:41 -0000	1.1206
+++ kernel.spec	12 Jan 2009 00:15:28 -0000	1.1207
@@ -1745,6 +1745,9 @@
 
 %changelog
 * Sun Jan 09 2009 Kyle McMartin <kyle at redhat.com>
+- Disable CONFIG_MAXSMP on x86_64.
+
+* Sun Jan 09 2009 Kyle McMartin <kyle at redhat.com>
 - 2.6.29-rc1
 
 * Fri Jan 08 2009 Kyle McMartin <kyle at redhat.com>



From ndim at fedoraproject.org  Mon Jan 12 01:01:54 2009
From: ndim at fedoraproject.org (Hans Ulrich Niedermann)
Date: Mon, 12 Jan 2009 01:01:54 +0000 (UTC)
Subject: rpms/nted/devel nted.spec,1.9,1.10
Message-ID: <20090112010154.6FB2B70123@cvs1.fedora.phx.redhat.com>

Author: ndim

Update of /cvs/pkgs/rpms/nted/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28405

Modified Files:
	nted.spec 
Log Message:
* Sun Jan 11 2009 Hans Ulrich Niedermann <hun at n-dimensional.de> - 1.4.17-1.1
- remove wrongly encoded german description
- use new font packaging rules
- split ntedfont.pfa into nted-fonts subpackage



Index: nted.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nted/devel/nted.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- nted.spec	10 Dec 2008 14:06:44 -0000	1.9
+++ nted.spec	12 Jan 2009 01:01:24 -0000	1.10
@@ -1,6 +1,9 @@
+%define fontname ntedfont
+#define fontconf XX-%{fontname}.conf
+
 Name:           nted
 Version:        1.4.17
-Release:        1%{?dist}
+Release:        1.1%{?dist}
 Summary:        Musical score editor
 Summary(de):    Partitureditor
 
@@ -10,10 +13,16 @@
 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)
+#Source2:        nted-fonts-fontconfig.conf
+BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 BuildRequires:  gtk2-devel alsa-lib-devel
 BuildRequires:  gettext kdesdk yelp xmlto desktop-file-utils
+BuildRequires:  fontpackages-devel
+BuildRequires:  fontpackages-filesystem
+
+Requires:       nted-fonts
+
 
 %description
 NtEd is a GTK score editor. It intends to be really WYSIWYG: what you
@@ -24,17 +33,15 @@
 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.
+%package fonts
+Group:          User Interface/X
+#BuildArch:     noarch # This still breaks the Fedora build architecture
+Requires:       fontpackages-filesystem
+Summary:        NtEd's own special note font.
 
-Partituren k??nnen ??ber den ALSA-Sequencer abgespielt werden.
+
+%description fonts
+NtEd's own special note font.
 
 
 %prep
@@ -52,6 +59,7 @@
 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" \
@@ -59,6 +67,23 @@
   %{SOURCE1}
 %find_lang %{name}
 
+# Install font into the correct directory
+install -m 0755 -d %{buildroot}%{_fontdir}
+mv -f %{buildroot}%{_datadir}/%{name}/ntedfont.pfa \
+      %{buildroot}%{_fontdir}/ntedfont.pfa
+# This saves us from patching the nted source.
+ln -s %{_fontdir}/ntedfont.pfa \
+      %{buildroot}%{_datadir}/%{name}/ntedfont.pfa \
+
+# fontconfig magic
+#install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} \
+#                   %{buildroot}%{_fontconfig_confdir}
+
+#install -m 0644 -p %{SOURCE2} \
+#        %{buildroot}%{_fontconfig_templatedir}/%{fontconf}
+#ln -s %{_fontconfig_templatedir}/%{fontconf} \
+#      %{buildroot}%{_fontconfig_confdir}/%{fontconf}
+
 
 %clean
 rm -rf %{buildroot}
@@ -70,11 +95,23 @@
 %{_bindir}/nted
 %{_datadir}/applications/fedora-nted.desktop
 %{_datadir}/pixmaps/nted.png
-%{_datadir}/nted
+%{_datadir}/%{name}
 %{_mandir}/*/*
 
 
+#_font_pkg -n fonts -f %{fontconf} *.pfa
+%_font_pkg -n fonts *.pfa
+
+%doc
+%dir %{_fontdir}
+
+
 %changelog
+* Sun Jan 11 2009 Hans Ulrich Niedermann <hun at n-dimensional.de> - 1.4.17-1.1
+- remove wrongly encoded german description
+- use new font packaging rules
+- split ntedfont.pfa into nted-fonts subpackage
+
 * Wed Dec 10 2008 Hans Ulrich Niedermann <hun at n-dimensional.de> - 1.4.17-1
 - Update to upstream's 1.4.17 release.
 



From pkgdb at fedoraproject.org  Mon Jan 12 01:18:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 12 Jan 2009 01:18:05 +0000
Subject: [pkgdb] kernel: bskeggs has requested commit
Message-ID: <20090112011806.3450E208456@bastion.fedora.phx.redhat.com>

bskeggs has requested the commit acl on kernel (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kernel



From pkgdb at fedoraproject.org  Mon Jan 12 01:18:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 12 Jan 2009 01:18:14 +0000
Subject: [pkgdb] kernel: bskeggs has requested commit
Message-ID: <20090112011814.C990D208469@bastion.fedora.phx.redhat.com>

bskeggs has requested the commit acl on kernel (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kernel



From pkgdb at fedoraproject.org  Mon Jan 12 01:18:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 12 Jan 2009 01:18:25 +0000
Subject: [pkgdb] kernel: bskeggs has requested commit
Message-ID: <20090112011825.D239E20846C@bastion.fedora.phx.redhat.com>

bskeggs has requested the commit acl on kernel (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kernel



From pkgdb at fedoraproject.org  Mon Jan 12 01:22:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 12 Jan 2009 01:22:00 +0000
Subject: [pkgdb] kernel had acl change status
Message-ID: <20090112012200.8C296208456@bastion.fedora.phx.redhat.com>

davej has set the watchcommits acl on kernel (Fedora devel) to Approved for bskeggs

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kernel



From pkgdb at fedoraproject.org  Mon Jan 12 01:22:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 12 Jan 2009 01:22:04 +0000
Subject: [pkgdb] kernel had acl change status
Message-ID: <20090112012204.4D8BD208468@bastion.fedora.phx.redhat.com>

davej has set the commit acl on kernel (Fedora devel) to Approved for bskeggs

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kernel



From pkgdb at fedoraproject.org  Mon Jan 12 01:22:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 12 Jan 2009 01:22:25 +0000
Subject: [pkgdb] kernel had acl change status
Message-ID: <20090112012225.8F441208456@bastion.fedora.phx.redhat.com>

davej has set the watchcommits acl on kernel (Fedora devel) to Approved for ivecera

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kernel



From pkgdb at fedoraproject.org  Mon Jan 12 01:22:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 12 Jan 2009 01:22:39 +0000
Subject: [pkgdb] kernel had acl change status
Message-ID: <20090112012240.0E6FA208458@bastion.fedora.phx.redhat.com>

davej has set the commit acl on kernel (Fedora 9) to Approved for bskeggs

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kernel



From pkgdb at fedoraproject.org  Mon Jan 12 01:22:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 12 Jan 2009 01:22:45 +0000
Subject: [pkgdb] kernel had acl change status
Message-ID: <20090112012245.5F7D020846B@bastion.fedora.phx.redhat.com>

davej has set the commit acl on kernel (Fedora 10) to Approved for bskeggs

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kernel



From pkgdb at fedoraproject.org  Mon Jan 12 01:22:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 12 Jan 2009 01:22:50 +0000
Subject: [pkgdb] kernel had acl change status
Message-ID: <20090112012250.BA4B2208456@bastion.fedora.phx.redhat.com>

davej has set the watchcommits acl on kernel (Fedora 10) to Approved for ivecera

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kernel



From pkgdb at fedoraproject.org  Mon Jan 12 01:23:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 12 Jan 2009 01:23:19 +0000
Subject: [pkgdb] kernel had acl change status
Message-ID: <20090112012320.08D77208456@bastion.fedora.phx.redhat.com>

davej has set the approveacls acl on kernel (Fedora 7) to Approved for kyle

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kernel



From pkgdb at fedoraproject.org  Mon Jan 12 01:23:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 12 Jan 2009 01:23:40 +0000
Subject: [pkgdb] kernel had acl change status
Message-ID: <20090112012340.20545208467@bastion.fedora.phx.redhat.com>

davej has set the approveacls acl on kernel (Fedora devel) to Approved for kyle

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kernel



From pkgdb at fedoraproject.org  Mon Jan 12 01:23:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 12 Jan 2009 01:23:53 +0000
Subject: [pkgdb] kernel had acl change status
Message-ID: <20090112012353.4F099208469@bastion.fedora.phx.redhat.com>

davej has set the approveacls acl on kernel (Fedora 10) to Approved for kyle

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kernel



From whot at fedoraproject.org  Mon Jan 12 01:26:39 2009
From: whot at fedoraproject.org (Peter Hutterer)
Date: Mon, 12 Jan 2009 01:26:39 +0000 (UTC)
Subject: rpms/xorg-x11-server/devel .cvsignore, 1.52, 1.53 commitid, 1.19,
	1.20 make-git-snapshot.sh, 1.4, 1.5 sources, 1.47,
	1.48 xorg-x11-server.spec, 1.388,
	1.389 xserver-1.4.99-endian.patch, 1.1, 1.2
Message-ID: <20090112012639.4546D70123@cvs1.fedora.phx.redhat.com>

Author: whot

Update of /cvs/pkgs/rpms/xorg-x11-server/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31211

Modified Files:
	.cvsignore commitid make-git-snapshot.sh sources 
	xorg-x11-server.spec xserver-1.4.99-endian.patch 
Log Message:
* Mon Jan 12 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.5.99.3-5
- rebase to today's server-1.6-enterleave branch, current 1.6 plus enterleave
  patches.
- drop xserver-1.5.99.3-offscreen-pixmaps.patch - merged upstream
- fix up git checkout in make-git-snapshot.sh to allow a remote branch to be
  specified as $1.




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/.cvsignore,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- .cvsignore	22 Dec 2008 07:10:54 -0000	1.52
+++ .cvsignore	12 Jan 2009 01:26:08 -0000	1.53
@@ -1 +1 @@
-xorg-server-20081222.tar.bz2
+xorg-server-20090112.tar.bz2


Index: commitid
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/commitid,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- commitid	22 Dec 2008 07:10:54 -0000	1.19
+++ commitid	12 Jan 2009 01:26:08 -0000	1.20
@@ -1 +1 @@
-32e81074b967716865aef08b66ec29caf0fec2c5
+02c059ea99a791b9e3643b4fb131af01306b1c23


Index: make-git-snapshot.sh
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/make-git-snapshot.sh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- make-git-snapshot.sh	22 Dec 2008 07:10:54 -0000	1.4
+++ make-git-snapshot.sh	12 Jan 2009 01:26:08 -0000	1.5
@@ -8,7 +8,7 @@
 if [ -z "$1" ]; then
     git log | head -1
 else
-    git checkout $1
+    git checkout -b $1 origin/$1
 fi
 git log | head -1 | awk '{ print $2 }' > ../commitid
 git repack -a -d


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/sources,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- sources	22 Dec 2008 07:10:54 -0000	1.47
+++ sources	12 Jan 2009 01:26:08 -0000	1.48
@@ -1 +1 @@
-45e1a7b1104de5044477901b4cb12e62  xorg-server-20081222.tar.bz2
+c3b4a1c33dae3aba6fd544c73bd4f6dc  xorg-server-20090112.tar.bz2


Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.388
retrieving revision 1.389
diff -u -r1.388 -r1.389
--- xorg-x11-server.spec	8 Jan 2009 15:06:55 -0000	1.388
+++ xorg-x11-server.spec	12 Jan 2009 01:26:08 -0000	1.389
@@ -14,12 +14,12 @@
 # Fix rhpxl to no longer need vesamodes/extramodes
 
 %define pkgname xorg-server
-%define gitdate 20081222
+%define gitdate 20090112
 
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.5.99.3
-Release:   8%{?dist}
+Release:   9%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -75,7 +75,6 @@
 Patch6004: xserver-1.5.99.3-dmx-xcalloc.patch
 # 6005 should be in 1.5.99.4
 Patch6005: xserver-1.5.99.3-ddx-rules.patch
-Patch6006: xserver-1.5.99.3-offscreen-pixmaps.patch
 # hack around broken mtrr.h.  drop me as soon as possible.
 Patch6007: xserver-1.5.99.3-broken-mtrr-header.patch
 
@@ -495,6 +494,13 @@
 
 
 %changelog
+* Mon Jan 12 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.5.99.3-5
+- rebase to today's server-1.6-enterleave branch, current 1.6 plus enterleave
+  patches.
+- drop xserver-1.5.99.3-offscreen-pixmaps.patch - merged upstream
+- fix up git checkout in make-git-snapshot.sh to allow a remote branch to be
+  specified as $1.
+
 * Thu Jan 08 2009 Adam Jackson <ajax at redhat.com> 1.5.99.3-8
 - xserver-1.5.99.3-broken-mtrr-header.patch: Unbreak broken mtrr.h.
 

xserver-1.4.99-endian.patch:

Index: xserver-1.4.99-endian.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/xserver-1.4.99-endian.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xserver-1.4.99-endian.patch	19 Jun 2008 14:24:12 -0000	1.1
+++ xserver-1.4.99-endian.patch	12 Jan 2009 01:26:08 -0000	1.2
@@ -1,13 +1,23 @@
+From 270e016f8d24ef4bd99f26084100581d2ea97a19 Mon Sep 17 00:00:00 2001
 From: Adam Tkac <atkac at redhat.com>
-Subject: Workaround for RH bug #449944
+Date: Mon, 12 Jan 2009 10:29:10 +1000
+Subject: [PATCH] Workaround for RH bug #449944
 
 AC_C_BIGENDIAN macro in autoconf 2.62 is badly broken. See
 https://bugzilla.redhat.com/show_bug.cgi?id=449944 for more information.
 
-diff -up xorg-server-20080612/configure.ac.endian xorg-server-20080612/configure.ac
---- xorg-server-20080612/configure.ac.endian	2008-06-19 13:31:03.000000000 +0200
-+++ xorg-server-20080612/configure.ac	2008-06-19 13:42:27.000000000 +0200
-@@ -103,7 +103,6 @@ AC_CHECK_HEADERS([fcntl.h stdlib.h strin
+Forward-ported to 1.6 prerelease.
+---
+ configure.ac             |   10 +++++++++-
+ include/dix-config.h.in  |    8 ++++++++
+ include/xorg-server.h.in |    8 ++++++++
+ 3 files changed, 25 insertions(+), 1 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index c222c95..e40a1a2 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -103,7 +103,6 @@ AC_CHECK_HEADERS([fcntl.h stdlib.h string.h unistd.h])
  
  dnl Checks for typedefs, structures, and compiler characteristics.
  AC_C_CONST
@@ -15,78 +25,60 @@
  
  AC_CHECK_SIZEOF([unsigned long])
  if test "$ac_cv_sizeof_unsigned_long" = 8; then
-@@ -1197,18 +1196,14 @@ AC_DEFINE([SVR4],1,[Define to 1 on syste
+@@ -1182,6 +1181,15 @@ AC_DEFINE([SVR4],1,[Define to 1 on systems derived from System V Release 4])
  AC_MSG_RESULT([yes])], AC_MSG_RESULT([no]))
  
  XSERVER_CFLAGS="$XSERVER_CFLAGS $CORE_INCS $XEXT_INC $COMPOSITE_INC $DAMAGE_INC $FIXES_INC $XI_INC $MI_INC $MIEXT_SHADOW_INC $MIEXT_LAYER_INC $MIEXT_DAMAGE_INC $RENDER_INC $RANDR_INC $FB_INC"
--AC_DEFINE_UNQUOTED(_X_BYTE_ORDER,[$ENDIAN],[Endian order])
- AH_VERBATIM([X_BYTE_ORDER],[
--/* Deal with multiple architecture compiles on Mac OS X */
--#ifndef __APPLE_CC__
--#define X_BYTE_ORDER _X_BYTE_ORDER
--#else
++AH_VERBATIM([X_BYTE_ORDER],[
 +/* Define endian order */
- #ifdef __BIG_ENDIAN__
--#define X_BYTE_ORDER X_BIG_ENDIAN
++#ifdef __BIG_ENDIAN__
 +#define _X_BYTE_ORDER X_BIG_ENDIAN
- #else
--#define X_BYTE_ORDER X_LITTLE_ENDIAN
--#endif
++#else
 +#define _X_BYTE_ORDER X_LITTLE_ENDIAN
- #endif
++#endif
 +#define X_BYTE_ORDER _X_BYTE_ORDER
- ])
++])
  
  dnl ---------------------------------------------------------------------------
-diff -up xorg-server-20080612/include/dix-config.h.in.endian xorg-server-20080612/include/dix-config.h.in
---- xorg-server-20080612/include/dix-config.h.in.endian	2008-06-19 13:44:07.000000000 +0200
-+++ xorg-server-20080612/include/dix-config.h.in	2008-06-19 13:44:35.000000000 +0200
-@@ -445,18 +445,13 @@
+ dnl DDX section.
+diff --git a/include/dix-config.h.in b/include/dix-config.h.in
+index 977bff3..a3ce66c 100644
+--- a/include/dix-config.h.in
++++ b/include/dix-config.h.in
+@@ -363,6 +363,14 @@
  /* Vendor name */
  #undef XVENDORNAME
  
--/* Endian order */
--#undef _X_BYTE_ORDER
--/* Deal with multiple architecture compiles on Mac OS X */
--#ifndef __APPLE_CC__
--#define X_BYTE_ORDER _X_BYTE_ORDER
--#else
 +/* Define endian order */
- #ifdef __BIG_ENDIAN__
--#define X_BYTE_ORDER X_BIG_ENDIAN
++#ifdef __BIG_ENDIAN__
 +#define _X_BYTE_ORDER X_BIG_ENDIAN
- #else
--#define X_BYTE_ORDER X_LITTLE_ENDIAN
--#endif
++#else
 +#define _X_BYTE_ORDER X_LITTLE_ENDIAN
- #endif
++#endif
 +#define X_BYTE_ORDER _X_BYTE_ORDER
- 
++
  /* Enable GNU and other extensions to the C environment for GLIBC */
  #undef _GNU_SOURCE
-diff -up xorg-server-20080612/include/xorg-server.h.in.endian xorg-server-20080612/include/xorg-server.h.in
---- xorg-server-20080612/include/xorg-server.h.in.endian	2008-06-19 13:44:41.000000000 +0200
-+++ xorg-server-20080612/include/xorg-server.h.in	2008-06-19 13:44:51.000000000 +0200
-@@ -178,18 +178,13 @@
+ 
+diff --git a/include/xorg-server.h.in b/include/xorg-server.h.in
+index 4cf1bbf..f041c7c 100644
+--- a/include/xorg-server.h.in
++++ b/include/xorg-server.h.in
+@@ -145,6 +145,14 @@
  /* Vendor name */
  #undef XVENDORNAME
  
--/* Endian order */
--#undef _X_BYTE_ORDER
--/* Deal with multiple architecture compiles on Mac OS X */
--#ifndef __APPLE_CC__
--#define X_BYTE_ORDER _X_BYTE_ORDER
--#else
 +/* Define endian order */
- #ifdef __BIG_ENDIAN__
--#define X_BYTE_ORDER X_BIG_ENDIAN
++#ifdef __BIG_ENDIAN__
 +#define _X_BYTE_ORDER X_BIG_ENDIAN
- #else
--#define X_BYTE_ORDER X_LITTLE_ENDIAN
--#endif
++#else
 +#define _X_BYTE_ORDER X_LITTLE_ENDIAN
- #endif
++#endif
 +#define X_BYTE_ORDER _X_BYTE_ORDER
- 
++
  /* BSD-compliant source */
  #undef _BSD_SOURCE
+ 
+-- 
+1.6.0.6
+



From pkgdb at fedoraproject.org  Mon Jan 12 01:30:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 12 Jan 2009 01:30:32 +0000
Subject: [pkgdb] tremulous ownership updated
Message-ID: <20090112013032.ABD63208455@bastion.fedora.phx.redhat.com>

Package tremulous in Fedora devel was orphaned by pgordon

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/tremulous



From pkgdb at fedoraproject.org  Mon Jan 12 01:30:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 12 Jan 2009 01:30:43 +0000
Subject: [pkgdb] tremulous ownership updated
Message-ID: <20090112013043.10DDF208457@bastion.fedora.phx.redhat.com>

Package tremulous in Fedora 7 was orphaned by pgordon

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/tremulous



From pkgdb at fedoraproject.org  Mon Jan 12 01:30:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 12 Jan 2009 01:30:46 +0000
Subject: [pkgdb] tremulous ownership updated
Message-ID: <20090112013046.1C410208455@bastion.fedora.phx.redhat.com>

Package tremulous in Fedora 8 was orphaned by pgordon

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/tremulous



From pkgdb at fedoraproject.org  Mon Jan 12 01:30:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 12 Jan 2009 01:30:47 +0000
Subject: [pkgdb] tremulous ownership updated
Message-ID: <20090112013047.B1B75208467@bastion.fedora.phx.redhat.com>

Package tremulous in Fedora 9 was orphaned by pgordon

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/tremulous



From pkgdb at fedoraproject.org  Mon Jan 12 01:30:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 12 Jan 2009 01:30:48 +0000
Subject: [pkgdb] tremulous ownership updated
Message-ID: <20090112013048.C89EF20846B@bastion.fedora.phx.redhat.com>

Package tremulous in Fedora 10 was orphaned by pgordon

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/tremulous



From pkgdb at fedoraproject.org  Mon Jan 12 01:30:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 12 Jan 2009 01:30:54 +0000
Subject: [pkgdb] tremulous-data ownership updated
Message-ID: <20090112013054.50DB320846C@bastion.fedora.phx.redhat.com>

Package tremulous-data in Fedora devel was orphaned by pgordon

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/tremulous-data



From pkgdb at fedoraproject.org  Mon Jan 12 01:30:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 12 Jan 2009 01:30:57 +0000
Subject: [pkgdb] tremulous-data ownership updated
Message-ID: <20090112013057.99B7B208470@bastion.fedora.phx.redhat.com>

Package tremulous-data in Fedora 8 was orphaned by pgordon

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/tremulous-data



From pkgdb at fedoraproject.org  Mon Jan 12 01:30:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 12 Jan 2009 01:30:58 +0000
Subject: [pkgdb] tremulous-data ownership updated
Message-ID: <20090112013058.725E120846E@bastion.fedora.phx.redhat.com>

Package tremulous-data in Fedora 9 was orphaned by pgordon

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/tremulous-data



From pkgdb at fedoraproject.org  Mon Jan 12 01:30:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 12 Jan 2009 01:30:59 +0000
Subject: [pkgdb] tremulous-data ownership updated
Message-ID: <20090112013059.EF142208455@bastion.fedora.phx.redhat.com>

Package tremulous-data in Fedora 10 was orphaned by pgordon

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/tremulous-data



From kyle at fedoraproject.org  Mon Jan 12 01:42:23 2009
From: kyle at fedoraproject.org (Kyle McMartin)
Date: Mon, 12 Jan 2009 01:42:23 +0000 (UTC)
Subject: rpms/kernel/devel powerpc-cpufreq-fix-cpumask-breakage.patch, NONE, 
	1.1 kernel.spec, 1.1207, 1.1208
Message-ID: <20090112014223.9AD9D70123@cvs1.fedora.phx.redhat.com>

Author: kyle

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv990

Modified Files:
	kernel.spec 
Added Files:
	powerpc-cpufreq-fix-cpumask-breakage.patch 
Log Message:
* Sun Jan 09 2009 Kyle McMartin <kyle at redhat.com>
- Disable CONFIG_MAXSMP on x86_64.
- Fixup build failure in powerpc due to cpumask changes.


powerpc-cpufreq-fix-cpumask-breakage.patch:

--- NEW FILE powerpc-cpufreq-fix-cpumask-breakage.patch ---
diff --git a/arch/powerpc/platforms/cell/cbe_cpufreq.c b/arch/powerpc/platforms/cell/cbe_cpufreq.c
index ec7c8f4..e6506cd 100644
--- a/arch/powerpc/platforms/cell/cbe_cpufreq.c
+++ b/arch/powerpc/platforms/cell/cbe_cpufreq.c
@@ -118,7 +118,7 @@ static int cbe_cpufreq_cpu_init(struct cpufreq_policy *policy)
 	policy->cur = cbe_freqs[cur_pmode].frequency;
 
 #ifdef CONFIG_SMP
-	policy->cpus = per_cpu(cpu_sibling_map, policy->cpu);
+	cpumask_copy(policy->cpus, &per_cpu(cpu_sibling_map, policy->cpu));
 #endif
 
 	cpufreq_frequency_table_get_attr(cbe_freqs, policy->cpu);
diff --git a/arch/powerpc/platforms/cell/cpufreq_spudemand.c b/arch/powerpc/platforms/cell/cpufreq_spudemand.c
index a3c6c01..968c1c0 100644
--- a/arch/powerpc/platforms/cell/cpufreq_spudemand.c
+++ b/arch/powerpc/platforms/cell/cpufreq_spudemand.c
@@ -110,7 +110,7 @@ static int spu_gov_govern(struct cpufreq_policy *policy, unsigned int event)
 		}
 
 		/* initialize spu_gov_info for all affected cpus */
-		for_each_cpu_mask(i, policy->cpus) {
+		for_each_cpu(i, policy->cpus) {
 			affected_info = &per_cpu(spu_gov_info, i);
 			affected_info->policy = policy;
 		}
@@ -127,7 +127,7 @@ static int spu_gov_govern(struct cpufreq_policy *policy, unsigned int event)
 		spu_gov_cancel_work(info);
 
 		/* clean spu_gov_info for all affected cpus */
-		for_each_cpu_mask (i, policy->cpus) {
+		for_each_cpu (i, policy->cpus) {
 			info = &per_cpu(spu_gov_info, i);
 			info->policy = NULL;
 		}
diff --git a/arch/powerpc/platforms/pasemi/cpufreq.c b/arch/powerpc/platforms/pasemi/cpufreq.c
index 86db47c..be2527a 100644
--- a/arch/powerpc/platforms/pasemi/cpufreq.c
+++ b/arch/powerpc/platforms/pasemi/cpufreq.c
@@ -213,7 +213,7 @@ static int pas_cpufreq_cpu_init(struct cpufreq_policy *policy)
 	pr_debug("current astate is at %d\n",cur_astate);
 
 	policy->cur = pas_freqs[cur_astate].frequency;
-	policy->cpus = cpu_online_map;
+	cpumask_copy(policy->cpus, &cpu_online_map);
 
 	ppc_proc_freq = policy->cur * 1000ul;
 
diff --git a/arch/powerpc/platforms/powermac/cpufreq_64.c b/arch/powerpc/platforms/powermac/cpufreq_64.c
index 4dfb4bc..beb3833 100644
--- a/arch/powerpc/platforms/powermac/cpufreq_64.c
+++ b/arch/powerpc/platforms/powermac/cpufreq_64.c
@@ -362,7 +362,7 @@ static int g5_cpufreq_cpu_init(struct cpufreq_policy *policy)
 	/* secondary CPUs are tied to the primary one by the
 	 * cpufreq core if in the secondary policy we tell it that
 	 * it actually must be one policy together with all others. */
-	policy->cpus = cpu_online_map;
+	cpumask_copy(policy->cpus, &cpu_online_map);
 	cpufreq_frequency_table_get_attr(g5_cpu_freqs, policy->cpu);
 
 	return cpufreq_frequency_table_cpuinfo(policy,


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1207
retrieving revision 1.1208
diff -u -r1.1207 -r1.1208
--- kernel.spec	12 Jan 2009 00:15:28 -0000	1.1207
+++ kernel.spec	12 Jan 2009 01:41:53 -0000	1.1208
@@ -662,6 +662,7 @@
 Patch2802: linux-2.6-silence-acpi-blacklist.patch
 
 Patch9001: revert-fix-modules_install-via-nfs.patch
+Patch9002: powerpc-cpufreq-fix-cpumask-breakage.patch
 
 %endif
 
@@ -1169,6 +1170,8 @@
 # revert 8b249b6856f16f09b0e5b79ce5f4d435e439b9d6
 ApplyPatch revert-fix-modules_install-via-nfs.patch
 
+ApplyPatch powerpc-cpufreq-fix-cpumask-breakage.patch
+
 # END OF PATCH APPLICATIONS
 
 %endif
@@ -1746,6 +1749,7 @@
 %changelog
 * Sun Jan 09 2009 Kyle McMartin <kyle at redhat.com>
 - Disable CONFIG_MAXSMP on x86_64.
+- Fixup build failure in powerpc due to cpumask changes.
 
 * Sun Jan 09 2009 Kyle McMartin <kyle at redhat.com>
 - 2.6.29-rc1



From pkgdb at fedoraproject.org  Mon Jan 12 01:43:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 12 Jan 2009 01:43:53 +0000
Subject: [pkgdb] tremulous ownership updated
Message-ID: <20090112014353.57249208467@bastion.fedora.phx.redhat.com>

Package tremulous in Fedora 10 is now owned by ianweller

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/tremulous



From pkgdb at fedoraproject.org  Mon Jan 12 01:43:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 12 Jan 2009 01:43:40 +0000
Subject: [pkgdb] tremulous ownership updated
Message-ID: <20090112014341.35B4C208456@bastion.fedora.phx.redhat.com>

Package tremulous in Fedora devel is now owned by ianweller

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/tremulous



From pkgdb at fedoraproject.org  Mon Jan 12 01:43:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 12 Jan 2009 01:43:58 +0000
Subject: [pkgdb] tremulous ownership updated
Message-ID: <20090112014358.5A6D0208469@bastion.fedora.phx.redhat.com>

Package tremulous in Fedora 9 is now owned by ianweller

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/tremulous



From pkgdb at fedoraproject.org  Mon Jan 12 01:45:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 12 Jan 2009 01:45:20 +0000
Subject: [pkgdb] tremulous ownership updated
Message-ID: <20090112014520.EEB7F208456@bastion.fedora.phx.redhat.com>

Package tremulous in Fedora devel was orphaned by ianweller

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/tremulous



From pkgdb at fedoraproject.org  Mon Jan 12 01:45:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 12 Jan 2009 01:45:27 +0000
Subject: [pkgdb] tremulous ownership updated
Message-ID: <20090112014527.D34D4208467@bastion.fedora.phx.redhat.com>

Package tremulous in Fedora 10 was orphaned by ianweller

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/tremulous



From pkgdb at fedoraproject.org  Mon Jan 12 01:45:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 12 Jan 2009 01:45:31 +0000
Subject: [pkgdb] tremulous ownership updated
Message-ID: <20090112014531.C041220846B@bastion.fedora.phx.redhat.com>

Package tremulous in Fedora 9 was orphaned by ianweller

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/tremulous



From pkgdb at fedoraproject.org  Mon Jan 12 01:45:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 12 Jan 2009 01:45:48 +0000
Subject: [pkgdb] tremulous ownership updated
Message-ID: <20090112014548.9CC32208456@bastion.fedora.phx.redhat.com>

Package tremulous in Fedora devel is now owned by ianweller

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/tremulous



From pkgdb at fedoraproject.org  Mon Jan 12 01:45:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 12 Jan 2009 01:45:55 +0000
Subject: [pkgdb] tremulous ownership updated
Message-ID: <20090112014555.D7963208468@bastion.fedora.phx.redhat.com>

Package tremulous in Fedora 10 is now owned by ianweller

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/tremulous



From pkgdb at fedoraproject.org  Mon Jan 12 01:46:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 12 Jan 2009 01:46:01 +0000
Subject: [pkgdb] tremulous ownership updated
Message-ID: <20090112014602.3ED99208458@bastion.fedora.phx.redhat.com>

Package tremulous in Fedora 9 is now owned by ianweller

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/tremulous



From lyosnorezel at fedoraproject.org  Mon Jan 12 02:03:51 2009
From: lyosnorezel at fedoraproject.org (Lyos Gemini Norezel)
Date: Mon, 12 Jan 2009 02:03:51 +0000 (UTC)
Subject: rpms/thibault-fonts/devel thibault-fonts-essays1743-fontconfig.conf,
	NONE, 1.1 thibault-fonts-isabella-fontconfig.conf, NONE,
	1.1 thibault-fonts-rockets-fontconfig.conf, NONE,
	1.1 thibault-fonts-staypuft-fontconfig.conf, NONE,
	1.1 import.log, 1.1, 1.2 thibault-fonts.spec, 1.2,
	1.3 69-essays1743.conf, 1.1, NONE 69-isabella.conf, 1.1,
	NONE 69-rockets.conf, 1.1, NONE 69-staypuft.conf, 1.1, NONE
Message-ID: <20090112020351.5747070123@cvs1.fedora.phx.redhat.com>

Author: lyosnorezel

Update of /cvs/pkgs/rpms/thibault-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3254/devel

Modified Files:
	import.log thibault-fonts.spec 
Added Files:
	thibault-fonts-essays1743-fontconfig.conf 
	thibault-fonts-isabella-fontconfig.conf 
	thibault-fonts-rockets-fontconfig.conf 
	thibault-fonts-staypuft-fontconfig.conf 
Removed Files:
	69-essays1743.conf 69-isabella.conf 69-rockets.conf 
	69-staypuft.conf 
Log Message:



--- NEW FILE thibault-fonts-essays1743-fontconfig.conf ---
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
<!-- /etc/fonts/conf.d/69-essays1743.conf

     Define settings for Essays1743 fonts

     ?? 2008 Lyos Gemini Norezel <Lyos.GeminiNorezel at gmail.com>
-->
<fontconfig>
<alias binding="same"><family>Sans</family><accept><family>Essays1743</family></accept></alias>
</fontconfig>



--- NEW FILE thibault-fonts-isabella-fontconfig.conf ---
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
<!-- /etc/fonts/conf.d/69-isabella.conf

     Define settings for Isabella fonts

     ?? 2008 Lyos Gemini Norezel <Lyos.GeminiNorezel at gmail.com>
-->
<fontconfig>
  <!-- Font substitution rules -->
<alias binding="same"><family>Sans</family><accept><family>Isabella</family></accept></alias>
</fontconfig>



--- NEW FILE thibault-fonts-rockets-fontconfig.conf ---
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
<!-- /etc/fonts/conf.d/69-rockets.conf

     Define settings for Rockets fonts

     ?? 2008 Lyos Gemini Norezel <Lyos.GeminiNorezel at gmail.com>
-->
<fontconfig>
  <!-- Font substitution rules -->
<alias binding="same"><family>Sans</family><accept><family>Rockets</family></accept></alias>
</fontconfig>



--- NEW FILE thibault-fonts-staypuft-fontconfig.conf ---
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
<!-- /etc/fonts/conf.d/69-staypuft.conf

     Define settings for StayPuft fonts

     ?? 2008 Lyos Gemini Norezel <Lyos.GeminiNorezel at gmail.com>
-->
<fontconfig>
  <!-- Font substitution rules -->
<alias binding="same"><family>Sans</family><accept><family>StayPuft</family></accept></alias>
</fontconfig>



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/thibault-fonts/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	2 Aug 2008 07:41:04 -0000	1.1
+++ import.log	12 Jan 2009 02:03:20 -0000	1.2
@@ -1 +1,2 @@
 thibault-fonts-0_1-1_fc9:HEAD:thibault-fonts-0.1-1.fc9.src.rpm:1217662070
+thibault-fonts-0_1-3_fc11:HEAD:thibault-fonts-0.1-3.fc11.src.rpm:1231725737


Index: thibault-fonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/thibault-fonts/devel/thibault-fonts.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- thibault-fonts.spec	6 Sep 2008 19:47:30 -0000	1.2
+++ thibault-fonts.spec	12 Jan 2009 02:03:20 -0000	1.3
@@ -1,79 +1,112 @@
-%define fontname	thibault
-%define fontdir		%{_datadir}/fonts/%{fontname}
-%define fontconfdir	%{_sysconfdir}/fonts/conf.d
-%define conf1		69-essays1743.conf
-%define conf2		69-isabella.conf
-%define conf3		69-rockets.conf
-%define conf4		69-staypuft.conf
-
-Name:		%{fontname}-fonts
-Version:	0.1
-Release:	2%{?dist}
-Summary:	Thibault.org font collection
-
-Group:		User Interface/X
-License:	LGPLv2+
-URL:		http://www.thibault.org/fonts
-Source0:	http://thibault.org/fonts/essays/Essays1743-1.0-ttf.tar.gz
-Source1:	http://www.thibault.org/fonts/isabella/Isabella.tar.gz
-Source2:	http://www.thibault.org/fonts/rockets/Rockets-ttf.tar.gz
-Source3:	http://www.thibault.org/fonts/staypuft/StayPuft.tar.gz
-Source4:	69-essays1743.conf
-Source5:	69-isabella.conf
-Source6:	69-rockets.conf
-Source7:	69-staypuft.conf
+%define fontname        thibault
+%define conf1           69-essays1743.conf
+%define conf2           69-isabella.conf
+%define conf3           69-rockets.conf
+%define conf4           69-staypuft.conf
+
+%define common_desc \
+A collection of fonts from thibault.org, including Isabella, Essays1743, StayPuft, and Rockets.
+
+Name:           %{fontname}-fonts
+Version:        0.1
+Release:        3%{?dist}
+
+Summary:        Thibault.org font collection
+Group:          User Interface/X
+License:        LGPLv2+
+
+URL:            http://www.thibault.org/fonts
+Source0:        http://thibault.org/fonts/essays/Essays1743-1.0-ttf.tar.gz
+Source1:        http://www.thibault.org/fonts/isabella/Isabella.tar.gz
+Source2:        http://www.thibault.org/fonts/rockets/Rockets-ttf.tar.gz
+Source3:        http://www.thibault.org/fonts/staypuft/StayPuft.tar.gz
+Source4:        %{name}-essays1743-fontconfig.conf
+Source5:        %{name}-isabella-fontconfig.conf
+Source6:        %{name}-rockets-fontconfig.conf
+Source7:        %{name}-staypuft-fontconfig.conf
 
 #Not included due to legal concerns
 #Engadget: A sort of modernistic font done to match the logo of http://www.engadget.com
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildArch:	noarch
-BuildRequires:	fontforge >= 20061025-1
+
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildArch:      noarch
+BuildRequires:  fontpackages-devel
+BuildRequires:  fontforge >= 20061025-1
 
 %description
-A collection of fonts from thibault.org, 
-including Isabella, Essays1743, StayPuft, 
-and Rockets.
-
-%package essays1743
-Group:	 User Interface/X
-Summary: Thibault.org Montaigne's Essays typeface font
-License: LGPLv2+
+%common_desc
+
+%package common
+Summary:        Common files for thibault (documentation???)
+Group:          User Interface/X
+Requires:       fontpackages-filesystem
+
+%description common
+%common_desc
+
+This package consists of files used by other %{name} packages.
+
+%package  essays1743
+
+Summary:  Thibault.org Montaigne's Essays typeface font
+Group:    User Interface/X
+Requires: %{name}-common = %{version}-%{release}
 
 %description essays1743
+%common_desc
+
 A font by John Stracke, based on the
 typeface used in a 1743 English
-translation of Montaigne's Essays. 
+translation of Montaigne's Essays.
+
+%_font_pkg -n essays1743 -f %{conf1} Essays1743*.ttf
+
+%package  isabella
 
-%package isabella
-Group:	 User Interface/X
 Summary: Thibault.org Isabella Breviary calligraphic font
-License: LGPLv2
+Group:    User Interface/X
+Requires: %{name}-common = %{version}-%{release}
 
 %description isabella
+%common_desc
+
 This font is called Isabella because it is based on the
 calligraphic hand used in the Isabella Breviary, made around 1497, in
 Holland, for Isabella of Castille, the first queen of united Spain.
 
-%package rockets
-Group:	 User Interface/X
-Summary: Thibault.org font, vaguely space themed
-License: LGPLv2
+%_font_pkg -n isabella -f %{conf2} Isabella*.ttf
+
+%package  rockets
+
+Summary:  Thibault.org font, vaguely space themed
+Group:    User Interface/X
+Requires: %{name}-common = %{version}-%{release}
 
 %description rockets
+%common_desc
+
 This font is called Rockets because it's vaguely space
 themed.  The A is, more or less, a 1950s SF rocket; the O is meant to
 be Earth, with the Americas visible.  The other capitals are based on
 curves from either A or O, to keep the theme consistent.
 
-%package staypuft
-Group:	 User Interface/X
+%_font_pkg -n rockets -f %{conf3} Rockets*.ttf
+
+%package  staypuft
+
 Summary: Thibault.org font, rounded and marshmellowy
-License: LGPLv2
+Group:    User Interface/X
+Requires: %{name}-common = %{version}-%{release}
 
 %description staypuft
+%common_desc
+
 A rounded marshmellow type font. Good for frivolous things
 like banners, and birthday cards.
 
+%_font_pkg -n staypuft -f %{conf4} StayPuft*.ttf
+
 %prep
 mkdir -p isabella staypuft
 tar xvzf %{SOURCE0}
@@ -102,100 +135,69 @@
 popd
 
 %install
-rm -rf $RPM_BUILD_ROOT
+rm -fr %{buildroot}
 
-install -dm 755 $RPM_BUILD_ROOT%{fontdir}
-install -pm 644 *.ttf $RPM_BUILD_ROOT%{fontdir}
-install -m 0755 -d %{buildroot}%{fontconfdir}
-install -m 0644 -p %{SOURCE4} %{buildroot}%{fontconfdir}/
-install -m 0644 -p %{SOURCE5} %{buildroot}%{fontconfdir}/
-install -m 0644 -p %{SOURCE6} %{buildroot}%{fontconfdir}/
-install -m 0644 -p %{SOURCE7} %{buildroot}%{fontconfdir}/
+install -m 0755 -d %{buildroot}%{_fontdir}
 
-%clean
-rm -rf $RPM_BUILD_ROOT
+install -m 0644 -p *.ttf %{buildroot}%{_fontdir}
 
+install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} \
+                   %{buildroot}%{_fontconfig_confdir}
 
-%post essays1743
-if [ -x %{_bindir}/fc-cache ] ; then
-	%{_bindir}/fc-cache -f %{fontdir} || :
-fi
-	
-%postun essays1743
-if [ $1 -eq 0 -a -x %{_bindir}/fc-cache ] ; then
-	%{_bindir}/fc-cache -f %{fontdir} || :
-fi
+install -m 0644 -p %{SOURCE4} \
+        %{buildroot}%{_fontconfig_templatedir}/%{conf1}
 
-%files essays1743
-%defattr(644,root,root,755)
-%doc Essays1743/COPYING Essays1743/README
-%dir %{fontdir}/
-%{fontdir}/Essays1743*.ttf
-%config(noreplace) %{fontconfdir}/%{conf1}
-
-%post isabella
-if [ -x %{_bindir}/fc-cache ] ; then
-	%{_bindir}/fc-cache -f %{fontdir} || :
-fi
-	
-%postun isabella
-if [ $1 -eq 0 -a -x %{_bindir}/fc-cache ] ; then
-	%{_bindir}/fc-cache -f %{fontdir} || :
-fi
+install -m 0644 -p %{SOURCE5} \
+        %{buildroot}%{_fontconfig_templatedir}/%{conf2}
 
-%files isabella
-%defattr(644,root,root,755)
-%doc isabella/COPYING.LIB isabella/README.txt
-%dir %{fontdir}/
-%{fontdir}/Isabella.ttf
-%config(noreplace) %{fontconfdir}/%{conf2}
-
-%post rockets
-if [ -x %{_bindir}/fc-cache ] ; then
-	%{_bindir}/fc-cache -f %{fontdir} || :
-fi
-	
-%postun rockets
-if [ $1 -eq 0 -a -x %{_bindir}/fc-cache ] ; then
-	%{_bindir}/fc-cache -f %{fontdir} || :
-fi
+install -m 0644 -p %{SOURCE6} \
+        %{buildroot}%{_fontconfig_templatedir}/%{conf3}
 
-%files rockets
-%defattr(644,root,root,755)
-%doc rockets/COPYING.LIB rockets/README.txt
-%dir %{fontdir}/
-%{fontdir}/Rockets.ttf
-%config(noreplace) %{fontconfdir}/%{conf3}
-
-%post staypuft
-if [ -x %{_bindir}/fc-cache ] ; then
-	%{_bindir}/fc-cache -f %{fontdir} || :
-fi
-	
-%postun staypuft
-if [ $1 -eq 0 -a -x %{_bindir}/fc-cache ] ; then
-	%{_bindir}/fc-cache -f %{fontdir} || :
-fi
+install -m 0644 -p %{SOURCE7} \
+        %{buildroot}%{_fontconfig_templatedir}/%{conf4}
+
+for fconf in %{conf1} \
+                %{conf2} \
+                %{conf3} \
+                %{conf4} ; do
+  ln -s %{_fontconfig_templatedir}/$fconf \
+        %{buildroot}%{_fontconfig_confdir}/$fconf
+done
 
-%files staypuft
-%defattr(644,root,root,755)
+%clean
+rm -fr %{buildroot}
+
+%files common
+%defattr(0644,root,root,0755)
+%doc Essays1743/COPYING Essays1743/README
+%doc isabella/COPYING.LIB isabella/README.txt
+%doc rockets/COPYING.LIB rockets/README.txt
 %doc staypuft/COPYING.LIB staypuft/README.txt
-%dir %{fontdir}/
-%{fontdir}/StayPuft.ttf
-%config(noreplace) %{fontconfdir}/%{conf4}
+%dir %{_fontdir}/
+%{_fontdir}/Essays1743*.ttf
+%dir %{_fontdir}/
+%{_fontdir}/Isabella.ttf
+%dir %{_fontdir}/
+%{_fontdir}/Rockets.ttf
+%dir %{_fontdir}/
+%{_fontdir}/StayPuft.ttf
 
 %changelog
+
 #thibault
+* Sun Jan 11 2009 Lyos Gemini Norezel <Lyos.GeminiNorezel at gmail.com> 0.1-3
+- Modified spec file to comply with new policy changes.
+
 * 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. 
+- Fixed minor issues found during review.
 
 * Mon Jul 15 2008 Matt Domsch <mdomsch at fedoraproject.org>
 - Rewrote spec file to comply with fedora's policies
 
-* Thu Jul 10 2008 Lyos Gemini Norezel <Lyos.GeminiNorezel at gmail.com> 
+* Thu Jul 10 2008 Lyos Gemini Norezel <Lyos.GeminiNorezel at gmail.com>
 - Removed the Engadget font due to legal concerns
 
 * Wed Jul 09 2008 Lyos Gemini Norezel <Lyos.GeminiNorezel at gmail.com>


--- 69-essays1743.conf DELETED ---


--- 69-isabella.conf DELETED ---


--- 69-rockets.conf DELETED ---


--- 69-staypuft.conf DELETED ---



From mclasen at fedoraproject.org  Mon Jan 12 02:42:29 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon, 12 Jan 2009 02:42:29 +0000 (UTC)
Subject: rpms/gnome-utils/devel .cvsignore, 1.69, 1.70 gnome-utils.spec,
	1.180, 1.181 sources, 1.73, 1.74
Message-ID: <20090112024229.6A79370123@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8338

Modified Files:
	.cvsignore gnome-utils.spec sources 
Log Message:
2.25.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-utils/devel/.cvsignore,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- .cvsignore	22 Dec 2008 22:14:48 -0000	1.69
+++ .cvsignore	12 Jan 2009 02:41:59 -0000	1.70
@@ -1 +1 @@
-gnome-utils-2.25.0.tar.bz2
+gnome-utils-2.25.2.tar.bz2


Index: gnome-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-utils/devel/gnome-utils.spec,v
retrieving revision 1.180
retrieving revision 1.181
diff -u -r1.180 -r1.181
--- gnome-utils.spec	23 Dec 2008 05:59:51 -0000	1.180
+++ gnome-utils.spec	12 Jan 2009 02:41:59 -0000	1.181
@@ -4,13 +4,12 @@
 %define gnome_doc_utils_version 0.3.2
 %define libgnome_version 2.13.7
 %define libgnomeui_version 2.13.2
-%define libgnomeprintui_version 2.8.0
 %define gnome_desktop_version 2.9.91
 %define gnome_panel_version 2.9.4
 
 Name:           gnome-utils
-Version:        2.25.0
-Release:        3%{?dist}
+Version:        2.25.2
+Release:        1%{?dist}
 Epoch: 		1
 Summary:        GNOME utility programs
 
@@ -20,21 +19,11 @@
 Source0:        http://download.gnome.org/sources/gnome-utils/2.25/gnome-utils-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Patch0: 	logview-close-crash.patch
-Patch1:		logview-scroll-crash.patch
-# http://bugzilla.gnome.org/show_bug.cgi?id=497489
-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=565428
-Patch4:		gfloppy-libgnome.patch
-
 BuildRequires:  gnome-doc-utils >= %{gnome_doc_utils_version}
 BuildRequires: 	glib2-devel >= %{glib2_version}
 BuildRequires:  gtk2-devel >= %{gtk2_version}
 BuildRequires:  libgnome-devel >= %{libgnome_version}
 BuildRequires:  libgnomeui-devel >= %{libgnomeui_version}
-BuildRequires:  libgnomeprintui22-devel >= %{libgnomeprintui_version}
 BuildRequires:  gnome-desktop-devel >= %{gnome_desktop_version}
 BuildRequires:  gnome-panel-devel >= %{gnome_panel_version}
 BuildRequires:  libXmu-devel 
@@ -82,11 +71,6 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .logview-close
-%patch1 -p1 -b .logview-scroll
-%patch2 -p1 -b .versions-crash
-%patch3 -p1 -b .versions-format
-%patch4 -p1 -b .gfloppy-libgnome
 
 # Hide from menus
 pushd gsearchtool
@@ -97,15 +81,6 @@
 echo "NoDisplay=true" >> gfloppy.desktop.in
 popd
 
-pushd logview
-cat <<EOF >gnome-system-log-pam
-#%PAM-1.0
-auth		include		config-util
-account		include		config-util
-session		include		config-util
-EOF
-popd
-
 autoreconf -f -i
 
 %build
@@ -132,8 +107,33 @@
 make install DESTDIR=$RPM_BUILD_ROOT
 unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
 
-rm -rf $RPM_BUILD_ROOT%{_libdir}/*.a
-rm -rf $RPM_BUILD_ROOT%{_libdir}/*.la
+/bin/rm -rf $RPM_BUILD_ROOT%{_libdir}/*.a
+/bin/rm -rf $RPM_BUILD_ROOT%{_libdir}/*.la
+
+# don't need this
+/bin/rm $RPM_BUILD_ROOT%{_bindir}/test-reader
+
+# make gnome-system-log use consolehelper until it starts using polkit
+./mkinstalldirs $RPM_BUILD_ROOT%{_sysconfdir}/pam.d
+/bin/cat <<EOF >$RPM_BUILD_ROOT%{_sysconfdir}/pam.d/gnome-system-log
+#%%PAM-1.0
+auth		include		config-util
+account		include		config-util
+session		include		config-util
+EOF
+
+./mkinstalldirs $RPM_BUILD_ROOT%{_sysconfdir}/security/console.apps
+/bin/cat <<EOF >$RPM_BUILD_ROOT%{_sysconfdir}/security/console.apps/gnome-system-log
+USER=root
+PROGRAM=/usr/sbin/gnome-system-log
+SESSION=true
+FALLBACK=true
+EOF
+
+./mkinstalldirs $RPM_BUILD_ROOT%{_sbindir}
+/bin/mv $RPM_BUILD_ROOT%{_bindir}/gnome-system-log $RPM_BUILD_ROOT%{_sbindir}
+/bin/ln -s /usr/bin/consolehelper $RPM_BUILD_ROOT%{_bindir}/gnome-system-log
+
 
 desktop-file-install --vendor gnome --delete-original       \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications             \
@@ -234,16 +234,16 @@
 %{_sysconfdir}/gconf/schemas/gnome-dictionary.schemas
 %{_sysconfdir}/gconf/schemas/gnome-screenshot.schemas
 %{_sysconfdir}/gconf/schemas/gnome-search-tool.schemas
-%{_sysconfdir}/gconf/schemas/logview.schemas
+%{_sysconfdir}/gconf/schemas/gnome-system-log.schemas
 %{_sysconfdir}/gconf/schemas/gfloppy.schemas
 %{_sysconfdir}/gconf/schemas/baobab.schemas
 %{_bindir}/gnome-dictionary
 %{_bindir}/gnome-panel-screenshot
 %{_bindir}/gnome-screenshot
 %{_bindir}/gnome-search-tool
-%{_bindir}/gnome-system-log
 %{_bindir}/gfloppy
 %{_bindir}/baobab
+%{_bindir}/gnome-system-log
 %{_sbindir}/gnome-system-log
 %{_datadir}/applications/gnome-dictionary.desktop
 %{_datadir}/applications/gnome-screenshot.desktop
@@ -254,7 +254,6 @@
 %{_datadir}/gdict-1.0/
 %{_datadir}/gnome-dictionary/
 %{_datadir}/gnome-screenshot/
-%{_datadir}/gnome-system-log/
 %{_datadir}/baobab/
 %{_datadir}/gnome-utils/
 %{_datadir}/pixmaps/gsearchtool/
@@ -278,6 +277,9 @@
 
 
 %changelog
+* Sun Jan 11 2009 Matthias Clasen <mclasen at redhat.com> - 1:2.25.2-1
+- Update to 2.25.2
+
 * Mon Dec 22 2008 Matthias Clasen <mclasen at redhat.com> - 1:2.25.0-3
 - Update to 2.25.0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-utils/devel/sources,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- sources	22 Dec 2008 22:14:49 -0000	1.73
+++ sources	12 Jan 2009 02:41:59 -0000	1.74
@@ -1 +1 @@
-aef9dea90a1b59394d006e9457d4a48f  gnome-utils-2.25.0.tar.bz2
+57356ac7203412cf799a15f732b95218  gnome-utils-2.25.2.tar.bz2



From dp67 at fedoraproject.org  Mon Jan 12 03:02:00 2009
From: dp67 at fedoraproject.org (Randy Berry)
Date: Mon, 12 Jan 2009 03:02:00 +0000 (UTC)
Subject: rpms/HamFax/F-9 sources,1.1,1.2
Message-ID: <20090112030200.4D63270123@cvs1.fedora.phx.redhat.com>

Author: dp67

Update of /cvs/pkgs/rpms/HamFax/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10315

Modified Files:
	sources 
Log Message:

- Makefile patch




Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/HamFax/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	15 Oct 2008 21:56:26 -0000	1.1
+++ sources	12 Jan 2009 03:01:29 -0000	1.2
@@ -0,0 +1 @@
+c64372820247d88bed23b98e9db11b7b  HamFax-0.6.4.tar.bz2



From mclasen at fedoraproject.org  Mon Jan 12 03:06:37 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon, 12 Jan 2009 03:06:37 +0000 (UTC)
Subject: rpms/gnome-doc-utils/devel .cvsignore, 1.32,
	1.33 gnome-doc-utils.spec, 1.56, 1.57 sources, 1.32, 1.33
Message-ID: <20090112030637.2520270123@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-doc-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11152

Modified Files:
	.cvsignore gnome-doc-utils.spec sources 
Log Message:
0.14.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-doc-utils/devel/.cvsignore,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- .cvsignore	17 Dec 2008 06:22:23 -0000	1.32
+++ .cvsignore	12 Jan 2009 03:06:06 -0000	1.33
@@ -1 +1 @@
-gnome-doc-utils-0.14.1.tar.bz2
+gnome-doc-utils-0.14.2.tar.bz2


Index: gnome-doc-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-doc-utils/devel/gnome-doc-utils.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- gnome-doc-utils.spec	17 Dec 2008 06:22:23 -0000	1.56
+++ gnome-doc-utils.spec	12 Jan 2009 03:06:06 -0000	1.57
@@ -1,7 +1,7 @@
 ### Abstract ###
 
 Name: gnome-doc-utils
-Version: 0.14.1
+Version: 0.14.2
 Release: 1%{?dist}
 License: GPLv2+ and LGPLv2+ and GFDL
 Group: Development/Tools
@@ -100,6 +100,9 @@
 %{_datadir}/xml/gnome
 
 %changelog
+* Sun Jan 11 2008 Matthias Clasen <mclasen at redhat.com> - 0.14.2-1
+- Update to 0.14.2
+
 * Wed Dec 17 2008 Matthias Clasen <mclasen at redhat.com> - 0.14.1-1
 - Update to 0.14.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-doc-utils/devel/sources,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- sources	17 Dec 2008 06:22:23 -0000	1.32
+++ sources	12 Jan 2009 03:06:06 -0000	1.33
@@ -1 +1 @@
-5eba14aa3a4ebd0025fa7b17c50e7c01  gnome-doc-utils-0.14.1.tar.bz2
+d7a7d8646f34571704e4be62e5c7107f  gnome-doc-utils-0.14.2.tar.bz2



From dp67 at fedoraproject.org  Mon Jan 12 03:07:19 2009
From: dp67 at fedoraproject.org (Randy Berry)
Date: Mon, 12 Jan 2009 03:07:19 +0000 (UTC)
Subject: rpms/HamFax/F-10 sources,1.1,1.2
Message-ID: <20090112030719.8E1DE70123@cvs1.fedora.phx.redhat.com>

Author: dp67

Update of /cvs/pkgs/rpms/HamFax/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11113

Modified Files:
	sources 
Log Message:

configure file patch for x86_64




Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/HamFax/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	15 Oct 2008 21:56:26 -0000	1.1
+++ sources	12 Jan 2009 03:06:49 -0000	1.2
@@ -0,0 +1 @@
+c64372820247d88bed23b98e9db11b7b  HamFax-0.6.4.tar.bz2



From mclasen at fedoraproject.org  Mon Jan 12 03:08:48 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon, 12 Jan 2009 03:08:48 +0000 (UTC)
Subject: rpms/gnome-doc-utils/devel gnome-doc-utils.spec,1.57,1.58
Message-ID: <20090112030848.E9C2370123@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-doc-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11718

Modified Files:
	gnome-doc-utils.spec 
Log Message:
fix spec



Index: gnome-doc-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-doc-utils/devel/gnome-doc-utils.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- gnome-doc-utils.spec	12 Jan 2009 03:06:06 -0000	1.57
+++ gnome-doc-utils.spec	12 Jan 2009 03:08:18 -0000	1.58
@@ -100,7 +100,7 @@
 %{_datadir}/xml/gnome
 
 %changelog
-* Sun Jan 11 2008 Matthias Clasen <mclasen at redhat.com> - 0.14.2-1
+* Sun Jan 11 2009 Matthias Clasen <mclasen at redhat.com> - 0.14.2-1
 - Update to 0.14.2
 
 * Wed Dec 17 2008 Matthias Clasen <mclasen at redhat.com> - 0.14.1-1



From davej at fedoraproject.org  Mon Jan 12 03:30:00 2009
From: davej at fedoraproject.org (Dave Jones)
Date: Mon, 12 Jan 2009 03:30:00 +0000 (UTC)
Subject: rpms/kernel/F-10 config-x86_64-generic, 1.53, 1.54 kernel.spec,
	1.1205, 1.1206
Message-ID: <20090112033000.F2B1570123@cvs1.fedora.phx.redhat.com>

Author: davej

Update of /cvs/pkgs/rpms/kernel/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14600

Modified Files:
	config-x86_64-generic kernel.spec 
Log Message:
Don't use MAXSMP on x86-64


Index: config-x86_64-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/config-x86_64-generic,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- config-x86_64-generic	25 Nov 2008 15:20:28 -0000	1.53
+++ config-x86_64-generic	12 Jan 2009 03:29:30 -0000	1.54
@@ -10,7 +10,6 @@
 CONFIG_K8_NUMA=y
 CONFIG_X86_64_ACPI_NUMA=y
 # CONFIG_NUMA_EMU is not set
-CONFIG_MAXSMP=y
 CONFIG_NR_CPUS=64
 CONFIG_X86_POWERNOW_K8=m
 CONFIG_X86_POWERNOW_K8_ACPI=y


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/kernel.spec,v
retrieving revision 1.1205
retrieving revision 1.1206
diff -u -r1.1205 -r1.1206
--- kernel.spec	8 Jan 2009 04:44:02 -0000	1.1205
+++ kernel.spec	12 Jan 2009 03:29:30 -0000	1.1206
@@ -1937,6 +1937,9 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Sun Jan 11 2009 Dave Jones <davej at redhat.com>
+- Don't use MAXSMP on x86-64
+
 * Wed Jan  7 2009 Roland McGrath <roland at redhat.com> - 2.6.27.10-169
 - utrace update
 



From davej at fedoraproject.org  Mon Jan 12 03:31:04 2009
From: davej at fedoraproject.org (Dave Jones)
Date: Mon, 12 Jan 2009 03:31:04 +0000 (UTC)
Subject: rpms/kernel/F-9 config-x86_64-generic, 1.38, 1.39 kernel.spec, 1.890,
	1.891
Message-ID: <20090112033104.438B470123@cvs1.fedora.phx.redhat.com>

Author: davej

Update of /cvs/pkgs/rpms/kernel/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14755

Modified Files:
	config-x86_64-generic kernel.spec 
Log Message:
Don't use MAXSMP on x86-64


Index: config-x86_64-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/config-x86_64-generic,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- config-x86_64-generic	19 Nov 2008 17:34:21 -0000	1.38
+++ config-x86_64-generic	12 Jan 2009 03:30:33 -0000	1.39
@@ -10,7 +10,6 @@
 CONFIG_K8_NUMA=y
 CONFIG_X86_64_ACPI_NUMA=y
 # CONFIG_NUMA_EMU is not set
-CONFIG_MAXSMP=y
 CONFIG_NR_CPUS=64
 CONFIG_X86_POWERNOW_K8=m
 CONFIG_X86_POWERNOW_K8_ACPI=y


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/kernel.spec,v
retrieving revision 1.890
retrieving revision 1.891
diff -u -r1.890 -r1.891
--- kernel.spec	18 Dec 2008 22:28:29 -0000	1.890
+++ kernel.spec	12 Jan 2009 03:30:33 -0000	1.891
@@ -1924,6 +1924,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 Jan 11 2009 Dave Jones <davej at redhat.com>
+- Don't use MAXSMP on x86-64
+
 * Fri Dec 19 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.27.10-77
 - Re-enable input beep code, but disable it by default (from F10.)
   Added:



From mtasaka at fedoraproject.org  Mon Jan 12 05:18:49 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Mon, 12 Jan 2009 05:18:49 +0000 (UTC)
Subject: rpms/cairo-dock/devel cairo-dock-rev1481-compile.patch, NONE,
	1.1 .cvsignore, 1.96, 1.97 cairo-dock.spec, 1.127, 1.128 sources,
	1.96, 1.97 cairo-dock-plugins-compile.patch, 1.1, NONE
Message-ID: <20090112051849.D5BC670123@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/cairo-dock/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28466

Modified Files:
	.cvsignore cairo-dock.spec sources 
Added Files:
	cairo-dock-rev1481-compile.patch 
Removed Files:
	cairo-dock-plugins-compile.patch 
Log Message:
* Mon Jan 12 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
- rev 1481


cairo-dock-rev1481-compile.patch:

--- NEW FILE cairo-dock-rev1481-compile.patch ---
--- plug-ins/configure.ac.debug	2009-01-12 13:33:59.000000000 +0900
+++ plug-ins/configure.ac	2009-01-12 14:11:29.000000000 +0900
@@ -301,7 +301,7 @@
 AC_SUBST(icon_effectsdatadir, "${pkgdatadir}/icon-effect")
 
 ############# ILLUSION #################
-ICON_EFFECTS_PACKAGE=cd-illusion
+ILLUSION_PACKAGE=cd-illusion
 AC_SUBST(GETTEXT_ILLUSION, "$ILLUSION_PACKAGE")
 
 AC_SUBST(VERSION_ILLUSION, "0.3.0")
@@ -888,6 +888,7 @@
 	dustbin/po/Makefile
 	GMenu/po/Makefile
 	icon-effect/po/Makefile
+	illusion/po/Makefile
 	logout/po/Makefile
 	motion-blur/po/Makefile
 	netspeed/po/Makefile


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cairo-dock/devel/.cvsignore,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -r1.96 -r1.97
--- .cvsignore	11 Jan 2009 05:33:54 -0000	1.96
+++ .cvsignore	12 Jan 2009 05:18:17 -0000	1.97
@@ -1 +1 @@
-cairo-dock-sources-svn1480_trunk.tar.bz2
+cairo-dock-sources-svn1481_trunk.tar.bz2


Index: cairo-dock.spec
===================================================================
RCS file: /cvs/extras/rpms/cairo-dock/devel/cairo-dock.spec,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -r1.127 -r1.128
--- cairo-dock.spec	11 Jan 2009 05:33:54 -0000	1.127
+++ cairo-dock.spec	12 Jan 2009 05:18:17 -0000	1.128
@@ -11,7 +11,7 @@
 %undefine		betaver		
 %define		build_webkit	1
 %define		build_xfce	1
-%define		tarballver	svn1480_trunk
+%define		tarballver	svn1481_trunk
 
 %define		fedora_main_rel	3
 
@@ -47,6 +47,7 @@
 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-rev1481-compile.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	automake
@@ -217,7 +218,7 @@
 %endif
 find . -name \*.h -or -name \*.c | xargs %{__chmod} 0644
 
-# source code fix	
+# source code fix
 
 # Cairo-Penguin
 ## Need ask
@@ -235,6 +236,9 @@
 	configure.ac
 cd ..
 
+# illusion
+%patch0 -p1 -b .po
+
 # mail: license conflict
 %{__rm} -rf mail/
 %if 0%{?released} < 1
@@ -633,8 +637,8 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
-* Sun Jan 11 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
-- rev 1480
+* Mon Jan 12 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- rev 1481
 
 * Thu Dec 25 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
 - rev 1451


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cairo-dock/devel/sources,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -r1.96 -r1.97
--- sources	11 Jan 2009 05:33:55 -0000	1.96
+++ sources	12 Jan 2009 05:18:17 -0000	1.97
@@ -1 +1 @@
-e7f003abd33c433e37c74b22c13f4063  cairo-dock-sources-svn1480_trunk.tar.bz2
+d553004d811672bca1ba889669b792d2  cairo-dock-sources-svn1481_trunk.tar.bz2


--- cairo-dock-plugins-compile.patch DELETED ---



From mtasaka at fedoraproject.org  Mon Jan 12 05:27:50 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Mon, 12 Jan 2009 05:27:50 +0000 (UTC)
Subject: rpms/cairo-dock/devel cairo-dock.spec,1.128,1.129
Message-ID: <20090112052750.981F370123@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/cairo-dock/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29518

Modified Files:
	cairo-dock.spec 
Log Message:
applying patch after mail hack to avoid patch hang


Index: cairo-dock.spec
===================================================================
RCS file: /cvs/extras/rpms/cairo-dock/devel/cairo-dock.spec,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -r1.128 -r1.129
--- cairo-dock.spec	12 Jan 2009 05:18:17 -0000	1.128
+++ cairo-dock.spec	12 Jan 2009 05:27:20 -0000	1.129
@@ -236,9 +236,6 @@
 	configure.ac
 cd ..
 
-# illusion
-%patch0 -p1 -b .po
-
 # mail: license conflict
 %{__rm} -rf mail/
 %if 0%{?released} < 1
@@ -250,6 +247,9 @@
 	Makefile.am
 %endif
 
+# illusion
+%patch0 -p1 -b .po
+
 # stacks: directory fix
 %if 0%{?released} < 1
 %{__sed} -i.dir -e '/stacksdatadir/s|pluginsdir|pluginsdatadir|' \



From pgordon at fedoraproject.org  Mon Jan 12 06:16:15 2009
From: pgordon at fedoraproject.org (Peter Gordon)
Date: Mon, 12 Jan 2009 06:16:15 +0000 (UTC)
Subject: rpms/deluge/devel .cvsignore, 1.50, 1.51 deluge.spec, 1.79,
	1.80 sources, 1.50,
	1.51 deluge-fix-get_tracker_host-if-no-tracker.patch, 1.1, NONE
Message-ID: <20090112061615.939EA70123@cvs1.fedora.phx.redhat.com>

Author: pgordon

Update of /cvs/pkgs/rpms/deluge/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3271

Modified Files:
	.cvsignore deluge.spec sources 
Removed Files:
	deluge-fix-get_tracker_host-if-no-tracker.patch 
Log Message:
Update to 1.1.0 Final


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/deluge/devel/.cvsignore,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- .cvsignore	6 Jan 2009 21:07:16 -0000	1.50
+++ .cvsignore	12 Jan 2009 06:15:45 -0000	1.51
@@ -1 +1 @@
-deluge-1.1.0_RC3.tar.bz2
+deluge-1.1.0.tar.bz2


Index: deluge.spec
===================================================================
RCS file: /cvs/pkgs/rpms/deluge/devel/deluge.spec,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- deluge.spec	10 Jan 2009 00:15:14 -0000	1.79
+++ deluge.spec	12 Jan 2009 06:15:45 -0000	1.80
@@ -7,19 +7,13 @@
 
 Name:		deluge
 Version:	1.1.0
-Release:	0.4.rc3%{?dist}
+Release:	1%{?dist}
 Summary:	A GTK+ BitTorrent client with support for DHT, UPnP, and PEX
 Group:		Applications/Internet
 License:	GPLv2+
 URL:		http://deluge-torrent.org/           
 
-Source0:	http://download.deluge-torrent.org/source/%{version}/%{name}-1.1.0_RC3.tar.bz2
-
-## Fix issue in get_tracker_host when the torrent has no tracker; from
-## upstream SVN (changeset 4492 - will be in 1.1.0 RC4).
-## Fedora bug:   https://bugzilla.redhat.com/show_bug.cgi?id=479097
-## Upstream bug: http://dev.deluge-torrent.org/ticket/704
-Patch0: 	%{name}-fix-get_tracker_host-if-no-tracker.patch
+Source0:	http://download.deluge-torrent.org/source/%{version}/%{name}-%{version}.tar.bz2
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:	noarch
@@ -55,8 +49,7 @@
 
 
 %prep
-%setup -qn "%{name}-1.1.0_RC3"
-%patch0 -p3 -b .fix-get_tracker-host-if-no-tracker
+%setup -qn "%{name}-%{version}"
 
 
 %build
@@ -124,7 +117,7 @@
 %files -f %{name}.filelist
 %defattr(-,root,root,-)
 %doc ChangeLog
-%{python_sitelib}/%{name}-1.1.0_RC3-py?.?.egg-info/
+%{python_sitelib}/%{name}-%{version}-py?.?.egg-info/
 %{_bindir}/%{name}
 %{_bindir}/%{name}d
 %{_datadir}/applications/fedora-%{name}.desktop
@@ -151,6 +144,11 @@
 
 
 %changelog
+* Sun Jan 11 2009 Peter Gordon <peter at thecodergeek.com> - 1.1.0-1
+- Update to new upstream release (1.1.0 Final - yay!)
+- Drop the get_tracker_host patch (fixed upstream):
+  - fix-get_tracker-host-if-no-tracker.patch
+  
 * Fri Jan 09 2009 Peter Gordon <peter at thecodergeek.com> - 1.1.0-0.4.rc3
 - Do not package the country flags data.
 - Resolves: #479265 (country flags should not be used in Deluge)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/deluge/devel/sources,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- sources	6 Jan 2009 21:07:16 -0000	1.50
+++ sources	12 Jan 2009 06:15:45 -0000	1.51
@@ -1 +1 @@
-1d30c0e8c47159298dee31c0289a908a  deluge-1.1.0_RC3.tar.bz2
+c315f7d793d55e36f4e6d22c974be8ee  deluge-1.1.0.tar.bz2


--- deluge-fix-get_tracker_host-if-no-tracker.patch DELETED ---



From mmaslano at fedoraproject.org  Mon Jan 12 06:37:54 2009
From: mmaslano at fedoraproject.org (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?=)
Date: Mon, 12 Jan 2009 06:37:54 +0000 (UTC)
Subject: rpms/perl-Test-NeedsDisplay/devel perl-Test-NeedsDisplay.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090112063754.6CCB270123@cvs1.fedora.phx.redhat.com>

Author: mmaslano

Update of /cvs/pkgs/rpms/perl-Test-NeedsDisplay/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5678

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Test-NeedsDisplay.spec 
Log Message:
* Tue Dec 16 2008 Marcela Ma??l????ov?? <mmaslano at redhat.com> 1.05-1
- Specfile autogenerated by cpanspec 1.77.



--- NEW FILE perl-Test-NeedsDisplay.spec ---
Name:           perl-Test-NeedsDisplay
Version:        1.05
Release:        1%{?dist}
Summary:        Ensure that tests needing a display have one
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Test-NeedsDisplay/
Source0:        http://www.cpan.org/authors/id/A/AD/ADAMK/Test-NeedsDisplay-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl >= 1:5.6.0
BuildRequires:  perl(ExtUtils::MakeMaker)
BuildRequires:  perl(Test::More) >= 0.47
BuildRequires:  xorg-x11-server-Xvfb
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
When testing GUI applications, sometimes applications or modules absolutely
insist on a display, even just to load a module without actually showing
any objects.

%prep
%setup -q -n Test-NeedsDisplay-%{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
* Tue Dec 16 2008 Marcela Ma??l????ov?? <mmaslano at redhat.com> 1.05-1
- Specfile autogenerated by cpanspec 1.77.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-NeedsDisplay/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	7 Jan 2009 01:19:22 -0000	1.1
+++ .cvsignore	12 Jan 2009 06:37:23 -0000	1.2
@@ -0,0 +1 @@
+Test-NeedsDisplay-1.05.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-NeedsDisplay/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	7 Jan 2009 01:19:22 -0000	1.1
+++ sources	12 Jan 2009 06:37:24 -0000	1.2
@@ -0,0 +1 @@
+63967780b12820a668fed932812f9327  Test-NeedsDisplay-1.05.tar.gz



From mmaslano at fedoraproject.org  Mon Jan 12 06:51:15 2009
From: mmaslano at fedoraproject.org (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?=)
Date: Mon, 12 Jan 2009 06:51:15 +0000 (UTC)
Subject: rpms/perl-Test-NeedsDisplay/F-10 perl-Test-NeedsDisplay.spec, NONE, 
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090112065115.C369870123@cvs1.fedora.phx.redhat.com>

Author: mmaslano

Update of /cvs/pkgs/rpms/perl-Test-NeedsDisplay/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8184

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Test-NeedsDisplay.spec 
Log Message:
* Tue Dec 16 2008 Marcela Ma??l????ov?? <mmaslano at redhat.com> 1.05-1
- Specfile autogenerated by cpanspec 1.77.



--- NEW FILE perl-Test-NeedsDisplay.spec ---
Name:           perl-Test-NeedsDisplay
Version:        1.05
Release:        1%{?dist}
Summary:        Ensure that tests needing a display have one
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Test-NeedsDisplay/
Source0:        http://www.cpan.org/authors/id/A/AD/ADAMK/Test-NeedsDisplay-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl >= 1:5.6.0
BuildRequires:  perl(ExtUtils::MakeMaker)
BuildRequires:  perl(Test::More) >= 0.47
BuildRequires:  xorg-x11-server-Xvfb
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
When testing GUI applications, sometimes applications or modules absolutely
insist on a display, even just to load a module without actually showing
any objects.

%prep
%setup -q -n Test-NeedsDisplay-%{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
* Tue Dec 16 2008 Marcela Ma??l????ov?? <mmaslano at redhat.com> 1.05-1
- Specfile autogenerated by cpanspec 1.77.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-NeedsDisplay/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	7 Jan 2009 01:19:22 -0000	1.1
+++ .cvsignore	12 Jan 2009 06:50:45 -0000	1.2
@@ -0,0 +1 @@
+Test-NeedsDisplay-1.05.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-NeedsDisplay/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	7 Jan 2009 01:19:22 -0000	1.1
+++ sources	12 Jan 2009 06:50:45 -0000	1.2
@@ -0,0 +1 @@
+63967780b12820a668fed932812f9327  Test-NeedsDisplay-1.05.tar.gz



From fabbione at fedoraproject.org  Mon Jan 12 07:18:08 2009
From: fabbione at fedoraproject.org (Fabio M. Di Nitto)
Date: Mon, 12 Jan 2009 07:18:08 +0000 (UTC)
Subject: rpms/cluster/devel .cvsignore, 1.15, 1.16 cluster.spec, 1.28,
	1.29 sources, 1.15, 1.16
Message-ID: <20090112071808.503E970123@cvs1.fedora.phx.redhat.com>

Author: fabbione

Update of /cvs/pkgs/rpms/cluster/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11822

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.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	17 Dec 2008 11:42:20 -0000	1.15
+++ .cvsignore	12 Jan 2009 07:17:37 -0000	1.16
@@ -1 +1 @@
-cluster-3.0.0.alpha1.tar.gz
+cluster-3.0.0.alpha2.tar.gz


Index: cluster.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cluster/devel/cluster.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- cluster.spec	17 Dec 2008 11:42:20 -0000	1.28
+++ cluster.spec	12 Jan 2009 07:17:37 -0000	1.29
@@ -14,7 +14,7 @@
 # http://www.rpm.org/max-rpm/s1-rpm-subpack-spec-file-changes.html
 
 # keep around ready for later user
-%define alphatag alpha1
+%define alphatag alpha2
 
 Name: cluster
 Summary: Red Hat Cluster
@@ -323,6 +323,9 @@
 %{_mandir}/man8/gfs_*
 
 %changelog
+* Mon Jan 12 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 3.0.0-1.alpha2
+- New upstream release
+
 * Wed Dec 17 2008 Fabio M. Di Nitto <fdinitto at redhat.com> - 3.0.0-1.alpha1
 - New upstream release.
 - Fix legacy code build.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cluster/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	17 Dec 2008 11:42:20 -0000	1.15
+++ sources	12 Jan 2009 07:17:37 -0000	1.16
@@ -1 +1 @@
-21571cb221c3b651e981097de9d8b4c0  cluster-3.0.0.alpha1.tar.gz
+2cd2df450caff6c3bd70d8c6e62faa03  cluster-3.0.0.alpha2.tar.gz



From fabbione at fedoraproject.org  Mon Jan 12 07:21:18 2009
From: fabbione at fedoraproject.org (Fabio M. Di Nitto)
Date: Mon, 12 Jan 2009 07:21:18 +0000 (UTC)
Subject: rpms/cluster/devel cluster.spec,1.29,1.30
Message-ID: <20090112072118.B4B2A70123@cvs1.fedora.phx.redhat.com>

Author: fabbione

Update of /cvs/pkgs/rpms/cluster/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12319

Modified Files:
	cluster.spec 
Log Message:
Retag in CVS



Index: cluster.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cluster/devel/cluster.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- cluster.spec	12 Jan 2009 07:17:37 -0000	1.29
+++ cluster.spec	12 Jan 2009 07:20:48 -0000	1.30
@@ -19,7 +19,7 @@
 Name: cluster
 Summary: Red Hat Cluster
 Version: 3.0.0
-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/
@@ -323,6 +323,9 @@
 %{_mandir}/man8/gfs_*
 
 %changelog
+* Mon Jan 12 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 3.0.0-2.alpha2
+- New upstream release (retag cvs package)
+
 * Mon Jan 12 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 3.0.0-1.alpha2
 - New upstream release
 



From fabbione at fedoraproject.org  Mon Jan 12 07:28:26 2009
From: fabbione at fedoraproject.org (Fabio M. Di Nitto)
Date: Mon, 12 Jan 2009 07:28:26 +0000 (UTC)
Subject: rpms/cluster/devel cluster.spec,1.30,1.31
Message-ID: <20090112072826.2362270123@cvs1.fedora.phx.redhat.com>

Author: fabbione

Update of /cvs/pkgs/rpms/cluster/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13612

Modified Files:
	cluster.spec 
Log Message:
Fix typo



Index: cluster.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cluster/devel/cluster.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- cluster.spec	12 Jan 2009 07:20:48 -0000	1.30
+++ cluster.spec	12 Jan 2009 07:27:55 -0000	1.31
@@ -19,7 +19,7 @@
 Name: cluster
 Summary: Red Hat Cluster
 Version: 3.0.0
-Release: 2{?alphatag:.%{alphatag}}%{?dist}
+Release: 2%{?alphatag:.%{alphatag}}%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Base
 URL: http://sources.redhat.com/cluster/wiki/



From caolanm at fedoraproject.org  Mon Jan 12 09:03:29 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Mon, 12 Jan 2009 09:03:29 +0000 (UTC)
Subject: rpms/openoffice.org/devel
	openoffice.org-3.0.1.ooo97975.bridges.mainalreadyexited.patch,
	NONE, 1.1 openoffice.org.spec, 1.1748, 1.1749
Message-ID: <20090112090329.9CF2070123@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24693

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-3.0.1.ooo97975.bridges.mainalreadyexited.patch 
Log Message:
Resolves: rhbz#477880 add openoffice.org-3.0.1.ooo97975.bridges.mainalreadyexited.patch

openoffice.org-3.0.1.ooo97975.bridges.mainalreadyexited.patch:

--- NEW FILE openoffice.org-3.0.1.ooo97975.bridges.mainalreadyexited.patch ---
Index: source/remote/urp/urp_environment.cxx
===================================================================
RCS file: /cvs/udk/bridges/source/remote/urp/urp_environment.cxx,v
retrieving revision 1.21
diff -u -r1.21 urp_environment.cxx
--- openoffice.org.orig/bridges/source/remote/urp/urp_environment.cxx	11 Apr 2008 11:14:42 -0000	1.21
+++ openoffice.org/bridges/source/remote/urp/urp_environment.cxx	12 Jan 2009 08:56:26 -0000
@@ -182,6 +184,7 @@
 {
 	~StaticSingleton()
 		{
+			::osl::MutexGuard static_dtor_mutex( ::osl::Mutex::getGlobalMutex() );
 			g_bStaticDestructorsCalled = sal_True;
 		}
 };
@@ -269,8 +272,11 @@
   	}
 	// in case, that the static destructors already have been called, no
 	// tiding up is done.
+	ClearableMutexGuard static_dtor_test( ::osl::Mutex::getGlobalMutex() );
 	if( ! g_bStaticDestructorsCalled  && ! pContext->m_pBridgeImpl->m_bDisposed )
 	{
+		static_dtor_test.clear();
+
 		// TODO : not threadsafe
 		// synchronization with dispatch methods needed !
 
@@ -341,9 +347,12 @@
 		}
 		pImpl->m_pReader = 0;
 
-		// delete the stubs
-		releaseStubs( pEnvRemote );
-
+		::osl::MutexGuard static_dtor_mutex( ::osl::Mutex::getGlobalMutex() );
+		if (!g_bStaticDestructorsCalled)
+		{
+			// delete the stubs
+			releaseStubs( pEnvRemote );
+		}
 	}
 }
 


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1748
retrieving revision 1.1749
diff -u -r1.1748 -r1.1749
--- openoffice.org.spec	9 Jan 2009 13:56:09 -0000	1.1748
+++ openoffice.org.spec	12 Jan 2009 09:02:58 -0000	1.1749
@@ -132,6 +132,7 @@
 Patch59: workspace.vcl98.patch
 Patch60: openoffice.org-3.0.1.ooo97428.config_office.xinerama-on-x86_64.patch
 Patch61: openoffice.org-3.0.1.oooXXXXX.extensions.npapi.patch
+Patch62: openoffice.org-3.0.1.ooo97975.bridges.mainalreadyexited.patch
 
 %define instdir %{_libdir}
 %define baseinstdir %{instdir}/openoffice.org
@@ -1411,6 +1412,7 @@
 %patch59 -p1 -b .workspace.vcl98.patch
 %patch60 -p1 -b .ooo97428.config_office.xinerama-on-x86_64.patch
 %patch61 -p1 -b .oooXXXXX.extensions.npapi.patch
+%patch62 -p1 -b .ooo97975.bridges.mainalreadyexited.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -3820,9 +3822,10 @@
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
-* Fri Jan 09 2009 Caol??n McNamara <caolanm at redhat.com> - 1:3.0.1-14.5
+* Mon Jan 12 2009 Caol??n McNamara <caolanm at redhat.com> - 1:3.0.1-14.5
 - rename openoffice.org-3.0.0.ooo90072.sw.undo-longtext.patch to 
   upstream workspace.sw31bf02.patch
+- Resolves: rhbz#477880 add openoffice.org-3.0.1.ooo97975.bridges.mainalreadyexited.patch
 
 * Wed Jan 07 2009 Caol??n McNamara <caolanm at redhat.com> - 1:3.0.1-14.4
 - add hyphen-el, hyphen-es



From caolanm at fedoraproject.org  Mon Jan 12 09:08:06 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Mon, 12 Jan 2009 09:08:06 +0000 (UTC)
Subject: rpms/openoffice.org/F-10
	openoffice.org-3.0.1.ooo97975.bridges.mainalreadyexited.patch,
	NONE, 1.1 openoffice.org.spec, 1.1706, 1.1707
Message-ID: <20090112090806.0FF5C70123@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25211

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-3.0.1.ooo97975.bridges.mainalreadyexited.patch 
Log Message:
Resolves: rhbz#477880 add openoffice.org-3.0.1.ooo97975.bridges.mainalreadyexited.patch

openoffice.org-3.0.1.ooo97975.bridges.mainalreadyexited.patch:

--- NEW FILE openoffice.org-3.0.1.ooo97975.bridges.mainalreadyexited.patch ---
Index: source/remote/urp/urp_environment.cxx
===================================================================
RCS file: /cvs/udk/bridges/source/remote/urp/urp_environment.cxx,v
retrieving revision 1.21
diff -u -r1.21 urp_environment.cxx
--- openoffice.org.orig/bridges/source/remote/urp/urp_environment.cxx	11 Apr 2008 11:14:42 -0000	1.21
+++ openoffice.org/bridges/source/remote/urp/urp_environment.cxx	12 Jan 2009 08:56:26 -0000
@@ -182,6 +184,7 @@
 {
 	~StaticSingleton()
 		{
+			::osl::MutexGuard static_dtor_mutex( ::osl::Mutex::getGlobalMutex() );
 			g_bStaticDestructorsCalled = sal_True;
 		}
 };
@@ -269,8 +272,11 @@
   	}
 	// in case, that the static destructors already have been called, no
 	// tiding up is done.
+	ClearableMutexGuard static_dtor_test( ::osl::Mutex::getGlobalMutex() );
 	if( ! g_bStaticDestructorsCalled  && ! pContext->m_pBridgeImpl->m_bDisposed )
 	{
+		static_dtor_test.clear();
+
 		// TODO : not threadsafe
 		// synchronization with dispatch methods needed !
 
@@ -341,9 +347,12 @@
 		}
 		pImpl->m_pReader = 0;
 
-		// delete the stubs
-		releaseStubs( pEnvRemote );
-
+		::osl::MutexGuard static_dtor_mutex( ::osl::Mutex::getGlobalMutex() );
+		if (!g_bStaticDestructorsCalled)
+		{
+			// delete the stubs
+			releaseStubs( pEnvRemote );
+		}
 	}
 }
 


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-10/openoffice.org.spec,v
retrieving revision 1.1706
retrieving revision 1.1707
diff -u -r1.1706 -r1.1707
--- openoffice.org.spec	19 Dec 2008 11:49:45 -0000	1.1706
+++ openoffice.org.spec	12 Jan 2009 09:07:35 -0000	1.1707
@@ -138,6 +138,7 @@
 Patch65: openoffice.org-3.0.1.ooo97196.vcl.ensuretheme.whenqttesting.patch
 Patch66: workspace.vcl98.patch
 Patch67: openoffice.org-3.0.1.ooo97428.config_office.xinerama-on-x86_64.patch
+Patch68: openoffice.org-3.0.1.ooo97975.bridges.mainalreadyexited.patch
 
 %define instdir %{_libdir}
 %define baseinstdir %{instdir}/openoffice.org
@@ -1400,6 +1401,7 @@
 %patch65 -p1 -b .ooo97196.vcl.ensuretheme.whenqttesting.patch
 %patch66 -p1 -b .workspace.vcl98.patch
 %patch67 -p1 -b .ooo97428.config_office.xinerama-on-x86_64.patch
+%patch68 -p1 -b .ooo97975.bridges.mainalreadyexited.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -3766,7 +3768,7 @@
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
-* Fri Dec 19 2008 Caol??n McNamara <caolanm at redhat.com> - 1:3.0.0-9.11
+* Mon Jan 12 2009 Caol??n McNamara <caolanm at redhat.com> - 1:3.0.0-9.11
 - Resolves: rhbz#470302 g_file_input_stream_query_info doesn't do anything 
   remotely
 - Resolves: rhbz#471485 openoffice.org-3.0.0.ooo96203.sfx2.3layer-qstart.patch
@@ -3787,6 +3789,7 @@
 - add workspace.vcl98.patch
 - Resolves: rhbz#477016 playing video under full-screen presentation went away
 - Resolves: rhbz#474719 openoffice.org-3.0.1.ooo97428.config_office.xinerama-on-x86_64.patch
+- Resolves: rhbz#477880 add openoffice.org-3.0.1.ooo97975.bridges.mainalreadyexited.patch
 
 * Fri Nov 07 2008 Caol??n McNamara <caolanm at redhat.com> - 1:3.0.0-9.10
 - window manager hatred



From mmaslano at fedoraproject.org  Mon Jan 12 09:14:28 2009
From: mmaslano at fedoraproject.org (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?=)
Date: Mon, 12 Jan 2009 09:14:28 +0000 (UTC)
Subject: rpms/iproute/F-10 ip-maddr-show.patch, NONE,
	1.1 prefix-assigned.patch, NONE, 1.1 iproute.spec, 1.89, 1.90
Message-ID: <20090112091428.B79E270123@cvs1.fedora.phx.redhat.com>

Author: mmaslano

Update of /cvs/pkgs/rpms/iproute/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26088

Modified Files:
	iproute.spec 
Added Files:
	ip-maddr-show.patch prefix-assigned.patch 
Log Message:
* Mon Jan 12 2009 Marcela Ma??l????ov?? <mmaslano at redhat.com> - 2.6.27-2
- 475130 - Negative preferred lifetimes of IPv6 prefixes/addresses
  displayed incorrectly
- 472878 - ???ip maddr show??? in IB interface causes a stack corruption
- both patches will be probably in iproute v2.6.28


ip-maddr-show.patch:

--- NEW FILE ip-maddr-show.patch ---
>From 7f71c0cae2db61890474e04ba3a26e40219e5561 Mon Sep 17 00:00:00 2001
From: Olivier Fourdan <ofourdan at redhat.com>
Date: Tue, 25 Nov 2008 12:36:22 +0000
Subject: [PATCH] =?utf-8?q?ip=20maddr=20show=E2=80=9D=20on=20an=20infiniband=20address=20causes=20a=20stack=20corruption?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit

???ip maddr show??? on an infiniband address causes a stack corruption
because the length of the address for Infiniband (20 bytes, as
described in kernel doc Documentation/infiniband/ipoib.txt) does not
fit on the 16 bytes of the field in which it gets stored.

The proposed patch increases the size of the hardware address from 4
__u32 to 8 and also adds a check to avoid overriding the available
size while parsing the hardware address.

This bug affects current upstream code AFAICT.

Hope this helps,
Cheers,
Olivier.

???ip maddr show ib0??? causes a stack corruption because the length of the address
for Infiniband (20 see kernel doc Documentation/infiniband/ipoib.txt) does not
fit on the 16 bytes of the field in which it gets stored.

The proposed patch increases the size of the hardware address from 4 u32 to 8
and adds a check to avoid overriding the available size while parsing the
hardware address.
---
 include/utils.h |    2 +-
 ip/ipmaddr.c    |    8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git iproute-2.6.27/iproute2-2.6.27/include/utils.h iproute-2.6.27/iproute2-2.6.27/include/utils.h
index 5daed6b..f7ef939 100644
--- iproute-2.6.27/iproute2-2.6.27/include/utils.h
+++ iproute-2.6.27/iproute2-2.6.27/include/utils.h
@@ -46,7 +46,7 @@ typedef struct
 	__u8 bytelen;
 	__s16 bitlen;
 	__u32 flags;
-	__u32 data[4];
+	__u32 data[8];
 } inet_prefix;
 
 #define PREFIXLEN_SPECIFIED 1
diff --git iproute-2.6.27/iproute2-2.6.27/ip/ipmaddr.c iproute-2.6.27/iproute2-2.6.27/ip/ipmaddr.c
index 1014f83..44ffdfc 100644
--- iproute-2.6.27/iproute2-2.6.27/ip/ipmaddr.c
+++ iproute-2.6.27/iproute2-2.6.27/ip/ipmaddr.c
@@ -43,11 +43,11 @@ static void usage(void)
 	exit(-1);
 }
 
-static int parse_hex(char *str, unsigned char *addr)
+static int parse_hex(char *str, unsigned char *addr, size_t size)
 {
 	int len=0;
 
-	while (*str) {
+	while (*str && (len < 2 * size)) {
 		int tmp;
 		if (str[1] == 0)
 			return -1;
@@ -104,7 +104,7 @@ void read_dev_mcast(struct ma_info **result_p)
 
 		m.addr.family = AF_PACKET;
 
-		len = parse_hex(hexa, (unsigned char*)&m.addr.data);
+		len = parse_hex(hexa, (unsigned char*)&m.addr.data, sizeof (m.addr.data));
 		if (len >= 0) {
 			struct ma_info *ma = malloc(sizeof(m));
 
@@ -176,7 +176,7 @@ void read_igmp6(struct ma_info **result_p)
 
 		m.addr.family = AF_INET6;
 
-		len = parse_hex(hexa, (unsigned char*)&m.addr.data);
+		len = parse_hex(hexa, (unsigned char*)&m.addr.data, sizeof (m.addr.data));
 		if (len >= 0) {
 			struct ma_info *ma = malloc(sizeof(m));
 
-- 
1.6.0.6


prefix-assigned.patch:

--- NEW FILE prefix-assigned.patch ---
>From 037d950bceed6d5053758dea601e0d018f5f22d7 Mon Sep 17 00:00:00 2001
From: Benedikt Gollatz <ben at differentialschokolade.org>
Date: Tue, 6 Jan 2009 19:36:56 -0800
Subject: [PATCH] When the preferred lifetime of a prefix assigned by IPv6 autoconfiguration
 (router solicitation) becomes negative

How reproducible:

Always.

Steps to Reproduce:
1. Configure an IPv6 router to advertise a prefix with a short preferred
lifetime, e.g. 0.
2. Wait for the IPv6 autoconfiguration process to complete for an interface
<if> connected to a link where that router advertises.
3. Run ip -6 show dev <if>.

Actual results:

The preferred lifetime will have become negative, but it is printed as an
unsigned integer. The preferred lifetime to be displayed will therefore be
close to UINT_MAX.
---
 ip/ipaddress.c |   13 ++++++++++---
 1 files changed, 10 insertions(+), 3 deletions(-)

diff --git iproute-2.6.27/iproute2-2.6.27/ip/ipaddress.c iproute-2.6.27/iproute2-2.6.27/ip/ipaddress.c
index 51471e8..a732d80 100644
--- iproute-2.6.27/iproute2-2.6.27/ip/ipaddress.c
+++ iproute-2.6.27/iproute2-2.6.27/ip/ipaddress.c
@@ -359,6 +359,7 @@ int print_addrinfo(const struct sockaddr_nl *who, struct nlmsghdr *n,
 	FILE *fp = (FILE*)arg;
 	struct ifaddrmsg *ifa = NLMSG_DATA(n);
 	int len = n->nlmsg_len;
+	int deprecated = 0;
 	struct rtattr * rta_tb[IFA_MAX+1];
 	char abuf[256];
 	SPRINT_BUF(b1);
@@ -488,6 +489,7 @@ int print_addrinfo(const struct sockaddr_nl *who, struct nlmsghdr *n,
 	}
 	if (ifa->ifa_flags&IFA_F_DEPRECATED) {
 		ifa->ifa_flags &= ~IFA_F_DEPRECATED;
+		deprecated = 1;
 		fprintf(fp, "deprecated ");
 	}
 	if (ifa->ifa_flags&IFA_F_HOMEADDRESS) {
@@ -516,9 +518,14 @@ int print_addrinfo(const struct sockaddr_nl *who, struct nlmsghdr *n,
 			sprintf(buf, "valid_lft %usec", ci->ifa_valid);
 		if (ci->ifa_prefered == INFINITY_LIFE_TIME)
 			sprintf(buf+strlen(buf), " preferred_lft forever");
-		else
-			sprintf(buf+strlen(buf), " preferred_lft %usec",
-				ci->ifa_prefered);
+		else {
+			if (deprecated)
+				sprintf(buf+strlen(buf), " preferred_lft %dsec",
+					ci->ifa_prefered);
+			else
+				sprintf(buf+strlen(buf), " preferred_lft %usec",
+					ci->ifa_prefered);
+		}
 		fprintf(fp, "       %s", buf);
 	}
 	fprintf(fp, "\n");
-- 
1.6.0.6



Index: iproute.spec
===================================================================
RCS file: /cvs/pkgs/rpms/iproute/F-10/iproute.spec,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -r1.89 -r1.90
--- iproute.spec	4 Dec 2008 10:02:40 -0000	1.89
+++ iproute.spec	12 Jan 2009 09:13:58 -0000	1.90
@@ -4,7 +4,7 @@
 Summary: Advanced IP routing and network device configuration tools
 Name: iproute
 Version: 2.6.27
-Release: 1%{?dist}
+Release: 2%{?dist}
 Group: Applications/System
 Source: http://developer.osdl.org/dev/iproute2/download/iproute2-%{version}.tar.gz
 #Source1: iproute-doc-2.6.22.tar.gz
@@ -13,6 +13,8 @@
 Patch2: iproute2-ss050901-opt_flags.patch
 Patch3: iproute-ip-man.patch
 Patch4: iproute2-2.6.25-segfault.patch
+Patch5: prefix-assigned.patch
+Patch6: ip-maddr-show.patch
 
 License: GPLv2+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -30,6 +32,8 @@
 %patch2 -p1 -b .opt_flags
 %patch3 -p1
 %patch4 -p1 -b .seg
+%patch5 -p1 -b .prefix
+%patch6 -p1 -b .maddr
 
 %build
 export LIBDIR=%{_libdir}
@@ -105,6 +109,12 @@
 %config(noreplace) %{_sysconfdir}/sysconfig/cbq/*
 
 %changelog
+* Mon Jan 12 2009 Marcela Ma??l????ov?? <mmaslano at redhat.com> - 2.6.27-2
+- 475130 - Negative preferred lifetimes of IPv6 prefixes/addresses
+  displayed incorrectly
+- 472878 - ???ip maddr show??? in IB interface causes a stack corruption
+- both patches will be probably in iproute v2.6.28
+
 * Thu Dec 4 2008 Marcela Maslanova <mmaslano at redhat.com> - 2.6.27-1
 - aead support was included into upstream version
 - patch for moving libs is now deprecated



From caolanm at fedoraproject.org  Mon Jan 12 09:22:01 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Mon, 12 Jan 2009 09:22:01 +0000 (UTC)
Subject: rpms/fribidi/devel fribidi.spec,1.27,1.28
Message-ID: <20090112092201.E2EAC70123@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/fribidi/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28041

Modified Files:
	fribidi.spec 
Log Message:
rebuild to get provides pkgconfig(fribidi)


Index: fribidi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fribidi/devel/fribidi.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- fribidi.spec	18 Feb 2008 22:17:33 -0000	1.27
+++ fribidi.spec	12 Jan 2009 09:21:31 -0000	1.28
@@ -1,13 +1,13 @@
 Summary: Library implementing the Unicode Bidirectional Algorithm
 Name: fribidi
 Version: 0.19.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 URL: http://fribidi.org
 Source0: http://fribidi.org/download/%{name}-%{version}.tar.gz
 License: LGPLv2+
 Group: System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: automake, autoconf, libtool
+BuildRequires: automake, autoconf, libtool, pkgconfig
 
 %description
 A library to handle bidirectional scripts (for example Hebrew, Arabic),
@@ -61,6 +61,9 @@
 %{_mandir}/man3/%{name}_*.gz
 
 %changelog
+* Mon Jan 12 2009 Caol??n McNamara <caolanm at redhat.com> - 0.19.1-3
+- rebuild to get provides pkgconfig(fribidi)
+
 * Mon Feb 18 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.19.1-2
 - Autorebuild for GCC 4.3
 



From andyp at fedoraproject.org  Mon Jan 12 09:38:52 2009
From: andyp at fedoraproject.org (Andrew Price)
Date: Mon, 12 Jan 2009 09:38:52 +0000 (UTC)
Subject: rpms/python-twyt/devel import.log, NONE, 1.1 .cvsignore, 1.4,
	1.5 python-twyt.spec, 1.4, 1.5 sources, 1.4, 1.5
Message-ID: <20090112093852.38E7970123@cvs1.fedora.phx.redhat.com>

Author: andyp

Update of /cvs/pkgs/rpms/python-twyt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30560/devel

Modified Files:
	.cvsignore python-twyt.spec sources 
Added Files:
	import.log 
Log Message:
Update to version 0.9.0



--- NEW FILE import.log ---
python-twyt-0_9_0-1_fc8:HEAD:python-twyt-0.9.0-1.fc8.src.rpm:1231753051


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-twyt/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	18 May 2008 04:02:05 -0000	1.4
+++ .cvsignore	12 Jan 2009 09:38:21 -0000	1.5
@@ -1 +1 @@
-twyt-0.8.5.tar.gz
+twyt-0.9.0.tar.gz


Index: python-twyt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-twyt/devel/python-twyt.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- python-twyt.spec	29 Nov 2008 16:01:59 -0000	1.4
+++ python-twyt.spec	12 Jan 2009 09:38:21 -0000	1.5
@@ -2,8 +2,8 @@
 
 Summary: An interface to Twitter API functions for Python
 Name: python-twyt
-Version: 0.8.5
-Release: 2%{?dist}
+Version: 0.9.0
+Release: 1%{?dist}
 Group: System Environment/Libraries
 License: BSD
 URL: http://andrewprice.me.uk/projects/twyt/
@@ -37,7 +37,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc README APITODO GUIHOWTO LICENSE
+%doc README APITODO HOWTO LICENSE
 %dir %{python_sitelib}/twyt
 %attr(755,root,root) %{_bindir}/twyt
 %{python_sitelib}/twyt/*
@@ -47,6 +47,9 @@
 %endif
 
 %changelog
+* Sun Jan 11 2009 Andy Price <andy at andrewprice.me.uk> - 0.9.0-1
+- Updated to 0.9.0
+- Install HOWTO doc file instead of GUIHOWTO
 * Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 0.8.5-2
 - Rebuild for Python 2.6
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-twyt/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	18 May 2008 04:02:06 -0000	1.4
+++ sources	12 Jan 2009 09:38:21 -0000	1.5
@@ -1 +1 @@
-b0ca0b3ddfb26167438327578d35c252  twyt-0.8.5.tar.gz
+b12093295f0f9e64ef9eb0a8f28a0fcf  twyt-0.9.0.tar.gz



From mitr at fedoraproject.org  Mon Jan 12 09:40:40 2009
From: mitr at fedoraproject.org (Miloslav Trmac)
Date: Mon, 12 Jan 2009 09:40:40 +0000 (UTC)
Subject: rpms/mlocate/devel mlocate.spec,1.20,1.21
Message-ID: <20090112094040.0A88A70123@cvs1.fedora.phx.redhat.com>

Author: mitr

Update of /cvs/pkgs/rpms/mlocate/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30840

Modified Files:
	mlocate.spec 
Log Message:
* Mon Jan 12 2009 Miloslav Trma?? <mitr at redhat.com> - 0.21.1-3
- Merge review fixes, based on a patch by Parag AN:
  - Use %%{_localstatedir}/lib instead of hard-coding /var/lib
  - Use %%{?_smp_mflags}
  - Preserve file time stamps
  - Only create the group if it doesn't exist, hide errors from rpm



Index: mlocate.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mlocate/devel/mlocate.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- mlocate.spec	28 Nov 2008 11:37:24 -0000	1.20
+++ mlocate.spec	12 Jan 2009 09:40:09 -0000	1.21
@@ -1,7 +1,7 @@
 Summary: An utility for finding files by name
 Name: mlocate
 Version: 0.21.1
-Release: 2
+Release: 3
 License: GPLv2
 URL: https://fedorahosted.org/mlocate/
 Group: Applications/System
@@ -28,18 +28,18 @@
 %setup -q
 
 %build
-%configure --localstatedir=/var/lib
-make groupname=slocate
+%configure --localstatedir=%{_localstatedir}/lib
+make %{?_smp_mflags} groupname=slocate
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT groupname=slocate
+make install DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p' groupname=slocate
 
 mkdir -p $RPM_BUILD_ROOT{%{_sysconfdir},/etc/cron.daily}
-install -c -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/updatedb.conf
-install -c -m 755 %{SOURCE2} $RPM_BUILD_ROOT/etc/cron.daily/mlocate.cron
+install -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/updatedb.conf
+install -p -m 755 %{SOURCE2} $RPM_BUILD_ROOT/etc/cron.daily/mlocate.cron
 # %%ghost semantic is so stupid
-touch $RPM_BUILD_ROOT/var/lib/mlocate/mlocate.db
+touch $RPM_BUILD_ROOT%{_localstatedir}/lib/mlocate/mlocate.db
 
 %find_lang mlocate
 
@@ -47,7 +47,8 @@
 rm -rf $RPM_BUILD_ROOT
 
 %pre
-%{_sbindir}/groupadd -g 21 -r -f slocate
+getent group slocate >/dev/null || groupadd -g 21 -r -f slocate
+exit 0
 
 %post
 if /bin/grep -q '^[^#]*DAILY_UPDATE' %{_sysconfdir}/updatedb.conf; then
@@ -55,7 +56,8 @@
 fi
 
 %triggerpostun -- slocate <= 2.7-30
-%{_sbindir}/groupadd -g 21 -r -f slocate
+getent group slocate >/dev/null || groupadd -g 21 -r -f slocate
+exit 0
 
 %files -f mlocate.lang
 %defattr(-,root,root,-)
@@ -65,10 +67,17 @@
 %attr(2711,root,slocate) %{_bindir}/locate
 %{_bindir}/updatedb
 %{_mandir}/man*/*
-%dir %attr(0750,root,slocate) /var/lib/mlocate
-%ghost /var/lib/mlocate/mlocate.db
+%dir %attr(0750,root,slocate) %{_localstatedir}/lib/mlocate
+%ghost %{_localstatedir}/lib/mlocate/mlocate.db
 
 %changelog
+* Mon Jan 12 2009 Miloslav Trma?? <mitr at redhat.com> - 0.21.1-3
+- Merge review fixes, based on a patch by Parag AN:
+  - Use %%{_localstatedir}/lib instead of hard-coding /var/lib
+  - Use %%{?_smp_mflags}
+  - Preserve file time stamps
+  - Only create the group if it doesn't exist, hide errors from rpm
+
 * Fri Nov 28 2008 Miloslav Trma?? <mitr at redhat.com> - 0.21.1-2
 - Add .git to PRUNENAMES
   Resolves: #473227



From caolanm at fedoraproject.org  Mon Jan 12 09:42:26 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Mon, 12 Jan 2009 09:42:26 +0000 (UTC)
Subject: rpms/wv/devel wv.spec,1.24,1.25
Message-ID: <20090112094226.7BC6E70123@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/wv/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31237

Modified Files:
	wv.spec 
Log Message:
rebuild to get provides pkgconfig(wv-1.0) >= 0:1.2.0


Index: wv.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wv/devel/wv.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- wv.spec	30 Mar 2008 22:32:22 -0000	1.24
+++ wv.spec	12 Jan 2009 09:41:56 -0000	1.25
@@ -1,7 +1,7 @@
 Name:       wv
 Summary:    MSWord 6/7/8/9 binary file format to HTML converter
 Version:    1.2.4
-Release:    4%{?dist}
+Release:    5%{?dist}
 License:    GPLv2+
 Group:      Applications/Text
 URL:        http://wvware.sourceforge.net
@@ -87,6 +87,9 @@
 
 
 %changelog
+* Mon Jan 12 2009 Caol??n McNamara <caolanm at redhat.com> - 1.2.4-5
+- rebuild to get provides pkgconfig(wv-1.0) >= 0:1.2.0
+
 * Sun Mar 30 2008 Michel Salim <michel.sylvan at gmail.com> - 1.2.4-4
 - fix libdir in wv's pkgconfig entry
 



From caolanm at fedoraproject.org  Mon Jan 12 09:43:24 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Mon, 12 Jan 2009 09:43:24 +0000 (UTC)
Subject: rpms/goffice/devel goffice.spec,1.20,1.21
Message-ID: <20090112094324.DCFAE70123@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/goffice/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31421

Modified Files:
	goffice.spec 
Log Message:
rebuild to get provides pkgconfig(libgoffice-0.4) >= 0:0.4.0


Index: goffice.spec
===================================================================
RCS file: /cvs/pkgs/rpms/goffice/devel/goffice.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- goffice.spec	7 Sep 2008 00:31:38 -0000	1.20
+++ goffice.spec	12 Jan 2009 09:42:54 -0000	1.21
@@ -1,6 +1,6 @@
 Name:           goffice         
 Version:        0.6.5
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Goffice support libraries
 Group:          System Environment/Libraries
 # bug filed upstream about this being GPL v2 only:
@@ -77,6 +77,9 @@
 
 
 %changelog
+* Mon Jan 12 2009 Caol??n McNamara <caolanm at redhat.com> - 0.6.5-2
+- rebuild to get provides pkgconfig(libgoffice-0.4) >= 0:0.4.0
+
 * Sun Sep  7 2008 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.6.5-1
 - Updated to 0.6.5
 - Development docs are now in goffice-0.6



From pmachata at fedoraproject.org  Mon Jan 12 09:53:40 2009
From: pmachata at fedoraproject.org (Petr Machata)
Date: Mon, 12 Jan 2009 09:53:40 +0000 (UTC)
Subject: rpms/boost/devel boost-unneccessary_iostreams.patch, NONE,
	1.1 boost-gcc-soname.patch, 1.5, 1.6 boost.spec, 1.55, 1.56
Message-ID: <20090112095340.383B770123@cvs1.fedora.phx.redhat.com>

Author: pmachata

Update of /cvs/pkgs/rpms/boost/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv762

Modified Files:
	boost-gcc-soname.patch boost.spec 
Added Files:
	boost-unneccessary_iostreams.patch 
Log Message:
- Apply a unneccessary_iostreams patch from Caolan McNamara
- Fix soname patch so that it applies with fuzz=0.  Use fuzz=0 option
  in spec file just like ordinary patches do.
- Resolves: #479409


boost-unneccessary_iostreams.patch:

--- NEW FILE boost-unneccessary_iostreams.patch ---
diff -ru boost_1_37_0.orig/boost/spirit/home/classic/iterator/multi_pass.hpp boost_1_37_0/boost/spirit/home/classic/iterator/multi_pass.hpp
--- boost/spirit/home/classic/iterator/multi_pass.hpp	2009-01-09 10:38:36.000000000 +0000
+++ boost/spirit/home/classic/iterator/multi_pass.hpp	2009-01-09 10:39:41.000000000 +0000
@@ -12,7 +12,6 @@
 #include <boost/throw_exception.hpp>
 #include <deque>
 #include <iterator>
-#include <iostream>
 #include <algorithm>    // for std::swap
 #include <exception>    // for std::exception
 #include <boost/limits.hpp>

boost-gcc-soname.patch:

Index: boost-gcc-soname.patch
===================================================================
RCS file: /cvs/pkgs/rpms/boost/devel/boost-gcc-soname.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- boost-gcc-soname.patch	17 Dec 2008 17:40:21 -0000	1.5
+++ boost-gcc-soname.patch	12 Jan 2009 09:53:39 -0000	1.6
@@ -1,7 +1,7 @@
 --- boost_1_36_0_beta1/tools/build/v2/tools/gcc.jam.orig	2008-08-11 13:15:13.000000000 +0200
 +++ boost_1_36_0_beta1/tools/build/v2/tools/gcc.jam	2008-08-11 15:21:05.000000000 +0200
 @@ -336,7 +336,8 @@
-     # OSF does have an option called -soname but it doesn't seem to work as
+     # OSF does have an option called -soname but it does not seem to work as
      # expected, therefore it has been disabled.
      HAVE_SONAME   = "" ;
 -    SONAME_OPTION = -h ;
@@ -11,11 +11,11 @@
  
  
 @@ -726,7 +727,7 @@
- # Differ from 'link' above only by -shared.
+ # Differs from 'link' above only by -shared.
  actions link.dll bind LIBRARIES
  {
 -    "$(CONFIG_COMMAND)" -L"$(LINKPATH)" -Wl,$(RPATH_OPTION:E=-R)$(SPACE)-Wl,"$(RPATH)" "$(.IMPLIB-COMMAND)$(<[1])" -o "$(<[-1])" $(HAVE_SONAME)-Wl,$(SONAME_OPTION)$(SPACE)-Wl,$(<[-1]:D=) -shared $(START-GROUP) "$(>)" "$(LIBRARIES)" $(FINDLIBS-ST-PFX) -l$(FINDLIBS-ST) $(FINDLIBS-SA-PFX) -l$(FINDLIBS-SA) $(END-GROUP) $(OPTIONS) $(USER_OPTIONS)
 +    "$(CONFIG_COMMAND)" -L"$(LINKPATH)" -Wl,$(RPATH_OPTION:E=-R)$(SPACE)-Wl,"$(RPATH)" "$(.IMPLIB-COMMAND)$(<[1])" -o "$(<[-1])" $(HAVE_SONAME)-Wl,$(SONAME_OPTION)$(SPACE)-Wl,$(<[-1]:D=).$(SONAME_VERSION) -shared $(START-GROUP) "$(>)" "$(LIBRARIES)" $(FINDLIBS-ST-PFX) -l$(FINDLIBS-ST) $(FINDLIBS-SA-PFX) -l$(FINDLIBS-SA) $(END-GROUP) $(OPTIONS) $(USER_OPTIONS)
  }
  
- # Set up threading support. It's somewhat contrived, so perform it at the end,
+ rule setup-threading ( targets * : sources * : properties * )


Index: boost.spec
===================================================================
RCS file: /cvs/pkgs/rpms/boost/devel/boost.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- boost.spec	19 Dec 2008 13:32:20 -0000	1.55
+++ boost.spec	12 Jan 2009 09:53:39 -0000	1.56
@@ -4,7 +4,7 @@
 Name: boost
 Summary: The Boost C++ Libraries
 Version: 1.37.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: Boost
 URL: http://www.boost.org/
 Group: System Environment/Libraries
@@ -27,6 +27,7 @@
 Patch3: boost-gcc43.patch
 Patch4: boost-gcc-soname.patch
 Patch5: boost-function_template.patch
+Patch6: boost-unneccessary_iostreams.patch
 
 %description
 Boost provides free peer-reviewed portable C++ source libraries.  The
@@ -66,12 +67,13 @@
 
 %prep
 %setup -q -n %{name}_1_37_0
-%patch0 -p0 
+%patch0 -p0
 %patch1 -p0
 %patch2 -p0
 %patch3 -p1
-sed 's/!!!SONAME!!!/%{sonamever}/' %{PATCH4} | %{__patch} -p1
+sed 's/!!!SONAME!!!/%{sonamever}/' %{PATCH4} | %{__patch} -p1 --fuzz=0
 %patch5 -p0
+%patch6 -p0
 
 %build
 BOOST_ROOT=`pwd`
@@ -204,6 +206,12 @@
 %doc %{_docdir}/%{name}-%{version}
 
 %changelog
+* Mon Jan 12 2009 Petr Machata <pmachata at redhat.com> - 1.37.0-3
+- Apply a unneccessary_iostreams patch from Caolan McNamara
+- Fix soname patch so that it applies with fuzz=0.  Use fuzz=0 option
+  in spec file just like ordinary patches do.
+- Resolves: #479409
+
 * Fri Dec 19 2008 Petr Machata <pmachata at redhat.com> - 1.37.0-2
 - Apply a function_template patch from Caolan McNamara
 - Resolves: #477131



From mmaslano at fedoraproject.org  Mon Jan 12 10:05:19 2009
From: mmaslano at fedoraproject.org (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?=)
Date: Mon, 12 Jan 2009 10:05:19 +0000 (UTC)
Subject: rpms/iproute/devel ip-maddr-show.patch, NONE,
	1.1 prefix-assigned.patch, NONE, 1.1 iproute.spec, 1.89, 1.90
Message-ID: <20090112100519.3488970123@cvs1.fedora.phx.redhat.com>

Author: mmaslano

Update of /cvs/pkgs/rpms/iproute/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2037

Modified Files:
	iproute.spec 
Added Files:
	ip-maddr-show.patch prefix-assigned.patch 
Log Message:
* Mon Jan 12 2009 Marcela Ma??l????ov?? <mmaslano at redhat.com> - 2.6.27-2
- 475130 - Negative preferred lifetimes of IPv6 prefixes/addresses
  displayed incorrectly
- 472878 - ???ip maddr show??? in IB interface causes a stack corruption
- both patches will be probably in iproute v2.6.28


ip-maddr-show.patch:

--- NEW FILE ip-maddr-show.patch ---
>From 7f71c0cae2db61890474e04ba3a26e40219e5561 Mon Sep 17 00:00:00 2001
From: Olivier Fourdan <ofourdan at redhat.com>
Date: Tue, 25 Nov 2008 12:36:22 +0000
Subject: [PATCH] =?utf-8?q?ip=20maddr=20show=E2=80=9D=20on=20an=20infiniband=20address=20causes=20a=20stack=20corruption?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit

???ip maddr show??? on an infiniband address causes a stack corruption
because the length of the address for Infiniband (20 bytes, as
described in kernel doc Documentation/infiniband/ipoib.txt) does not
fit on the 16 bytes of the field in which it gets stored.

The proposed patch increases the size of the hardware address from 4
__u32 to 8 and also adds a check to avoid overriding the available
size while parsing the hardware address.

This bug affects current upstream code AFAICT.

Hope this helps,
Cheers,
Olivier.

???ip maddr show ib0??? causes a stack corruption because the length of the address
for Infiniband (20 see kernel doc Documentation/infiniband/ipoib.txt) does not
fit on the 16 bytes of the field in which it gets stored.

The proposed patch increases the size of the hardware address from 4 u32 to 8
and adds a check to avoid overriding the available size while parsing the
hardware address.
---
 include/utils.h |    2 +-
 ip/ipmaddr.c    |    8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git iproute-2.6.27/iproute2-2.6.27/include/utils.h iproute-2.6.27/iproute2-2.6.27/include/utils.h
index 5daed6b..f7ef939 100644
--- iproute-2.6.27/iproute2-2.6.27/include/utils.h
+++ iproute-2.6.27/iproute2-2.6.27/include/utils.h
@@ -46,7 +46,7 @@ typedef struct
 	__u8 bytelen;
 	__s16 bitlen;
 	__u32 flags;
-	__u32 data[4];
+	__u32 data[8];
 } inet_prefix;
 
 #define PREFIXLEN_SPECIFIED 1
diff --git iproute-2.6.27/iproute2-2.6.27/ip/ipmaddr.c iproute-2.6.27/iproute2-2.6.27/ip/ipmaddr.c
index 1014f83..44ffdfc 100644
--- iproute-2.6.27/iproute2-2.6.27/ip/ipmaddr.c
+++ iproute-2.6.27/iproute2-2.6.27/ip/ipmaddr.c
@@ -43,11 +43,11 @@ static void usage(void)
 	exit(-1);
 }
 
-static int parse_hex(char *str, unsigned char *addr)
+static int parse_hex(char *str, unsigned char *addr, size_t size)
 {
 	int len=0;
 
-	while (*str) {
+	while (*str && (len < 2 * size)) {
 		int tmp;
 		if (str[1] == 0)
 			return -1;
@@ -104,7 +104,7 @@ void read_dev_mcast(struct ma_info **result_p)
 
 		m.addr.family = AF_PACKET;
 
-		len = parse_hex(hexa, (unsigned char*)&m.addr.data);
+		len = parse_hex(hexa, (unsigned char*)&m.addr.data, sizeof (m.addr.data));
 		if (len >= 0) {
 			struct ma_info *ma = malloc(sizeof(m));
 
@@ -176,7 +176,7 @@ void read_igmp6(struct ma_info **result_p)
 
 		m.addr.family = AF_INET6;
 
-		len = parse_hex(hexa, (unsigned char*)&m.addr.data);
+		len = parse_hex(hexa, (unsigned char*)&m.addr.data, sizeof (m.addr.data));
 		if (len >= 0) {
 			struct ma_info *ma = malloc(sizeof(m));
 
-- 
1.6.0.6


prefix-assigned.patch:

--- NEW FILE prefix-assigned.patch ---
>From 037d950bceed6d5053758dea601e0d018f5f22d7 Mon Sep 17 00:00:00 2001
From: Benedikt Gollatz <ben at differentialschokolade.org>
Date: Tue, 6 Jan 2009 19:36:56 -0800
Subject: [PATCH] When the preferred lifetime of a prefix assigned by IPv6 autoconfiguration
 (router solicitation) becomes negative

How reproducible:

Always.

Steps to Reproduce:
1. Configure an IPv6 router to advertise a prefix with a short preferred
lifetime, e.g. 0.
2. Wait for the IPv6 autoconfiguration process to complete for an interface
<if> connected to a link where that router advertises.
3. Run ip -6 show dev <if>.

Actual results:

The preferred lifetime will have become negative, but it is printed as an
unsigned integer. The preferred lifetime to be displayed will therefore be
close to UINT_MAX.
---
 ip/ipaddress.c |   13 ++++++++++---
 1 files changed, 10 insertions(+), 3 deletions(-)

diff --git iproute-2.6.27/iproute2-2.6.27/ip/ipaddress.c iproute-2.6.27/iproute2-2.6.27/ip/ipaddress.c
index 51471e8..a732d80 100644
--- iproute-2.6.27/iproute2-2.6.27/ip/ipaddress.c
+++ iproute-2.6.27/iproute2-2.6.27/ip/ipaddress.c
@@ -359,6 +359,7 @@ int print_addrinfo(const struct sockaddr_nl *who, struct nlmsghdr *n,
 	FILE *fp = (FILE*)arg;
 	struct ifaddrmsg *ifa = NLMSG_DATA(n);
 	int len = n->nlmsg_len;
+	int deprecated = 0;
 	struct rtattr * rta_tb[IFA_MAX+1];
 	char abuf[256];
 	SPRINT_BUF(b1);
@@ -488,6 +489,7 @@ int print_addrinfo(const struct sockaddr_nl *who, struct nlmsghdr *n,
 	}
 	if (ifa->ifa_flags&IFA_F_DEPRECATED) {
 		ifa->ifa_flags &= ~IFA_F_DEPRECATED;
+		deprecated = 1;
 		fprintf(fp, "deprecated ");
 	}
 	if (ifa->ifa_flags&IFA_F_HOMEADDRESS) {
@@ -516,9 +518,14 @@ int print_addrinfo(const struct sockaddr_nl *who, struct nlmsghdr *n,
 			sprintf(buf, "valid_lft %usec", ci->ifa_valid);
 		if (ci->ifa_prefered == INFINITY_LIFE_TIME)
 			sprintf(buf+strlen(buf), " preferred_lft forever");
-		else
-			sprintf(buf+strlen(buf), " preferred_lft %usec",
-				ci->ifa_prefered);
+		else {
+			if (deprecated)
+				sprintf(buf+strlen(buf), " preferred_lft %dsec",
+					ci->ifa_prefered);
+			else
+				sprintf(buf+strlen(buf), " preferred_lft %usec",
+					ci->ifa_prefered);
+		}
 		fprintf(fp, "       %s", buf);
 	}
 	fprintf(fp, "\n");
-- 
1.6.0.6



Index: iproute.spec
===================================================================
RCS file: /cvs/pkgs/rpms/iproute/devel/iproute.spec,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -r1.89 -r1.90
--- iproute.spec	4 Dec 2008 09:47:45 -0000	1.89
+++ iproute.spec	12 Jan 2009 10:04:48 -0000	1.90
@@ -4,7 +4,7 @@
 Summary: Advanced IP routing and network device configuration tools
 Name: iproute
 Version: 2.6.27
-Release: 1%{?dist}
+Release: 2%{?dist}
 Group: Applications/System
 Source: http://developer.osdl.org/dev/iproute2/download/iproute2-%{version}.tar.gz
 #Source1: iproute-doc-2.6.22.tar.gz
@@ -13,6 +13,8 @@
 Patch2: iproute2-ss050901-opt_flags.patch
 Patch3: iproute-ip-man.patch
 Patch4: iproute2-2.6.25-segfault.patch
+Patch5: prefix-assigned.patch
+Patch6: ip-maddr-show.patch
 
 License: GPLv2+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -30,6 +32,8 @@
 %patch2 -p1 -b .opt_flags
 %patch3 -p1
 %patch4 -p1 -b .seg
+%patch5 -p1 -b .prefix
+%patch6 -p1 -b .maddr
 
 %build
 export LIBDIR=%{_libdir}
@@ -105,6 +109,12 @@
 %config(noreplace) %{_sysconfdir}/sysconfig/cbq/*
 
 %changelog
+* Mon Jan 12 2009 Marcela Ma??l????ov?? <mmaslano at redhat.com> - 2.6.27-2
+- 475130 - Negative preferred lifetimes of IPv6 prefixes/addresses
+  displayed incorrectly
+- 472878 - ???ip maddr show??? in IB interface causes a stack corruption
+- both patches will be probably in iproute v2.6.28
+
 * Thu Dec 4 2008 Marcela Maslanova <mmaslano at redhat.com> - 2.6.27-1
 - aead support was included into upstream version
 - patch for moving libs is now deprecated



From sarantis at fedoraproject.org  Mon Jan 12 10:41:01 2009
From: sarantis at fedoraproject.org (Sarantis Paskalis)
Date: Mon, 12 Jan 2009 10:41:01 +0000 (UTC)
Subject: rpms/tetex-font-cm-lgc/F-9 tetex-font-cm-lgc.spec,1.13,1.14
Message-ID: <20090112104101.A178970123@cvs1.fedora.phx.redhat.com>

Author: sarantis

Update of /cvs/extras/rpms/tetex-font-cm-lgc/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6333

Modified Files:
	tetex-font-cm-lgc.spec 
Log Message:
Include .afm files (forgotten in the previous versions)



Index: tetex-font-cm-lgc.spec
===================================================================
RCS file: /cvs/extras/rpms/tetex-font-cm-lgc/F-9/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	12 Jan 2009 10:40:31 -0000	1.14
@@ -6,10 +6,11 @@
 
 Name:           tetex-font-cm-lgc
 Version:        0.5
-Release:        9%{?dist}
+Release:        11%{?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
@@ -38,10 +39,11 @@
 rm -rf %{buildroot}
 
 mkdir -p %{buildroot}%{texmf}/tex/latex/%{texpkg}
-mkdir -p %{buildroot}%{texfonts}/{ofm,ovf,type1,tfm,vf}/%{fontpath}
+mkdir -p %{buildroot}%{texfonts}/{afm,ofm,ovf,type1,tfm,vf}/%{fontpath}
 mkdir -p %{buildroot}%{texfonts}/{enc,map}/dvips/%{texpkg}
 
 install -p -m 644 tex/latex/%{texpkg}/* %{buildroot}%{texmf}/tex/latex/%{texpkg}/
+install -p -m 644 fonts/afm/%{fontpath}/* %{buildroot}%{texfonts}/afm/%{fontpath}/
 install -p -m 644 fonts/ofm/%{fontpath}/* %{buildroot}%{texfonts}/ofm/%{fontpath}/
 install -p -m 644 fonts/ovf/%{fontpath}/* %{buildroot}%{texfonts}/ovf/%{fontpath}/
 install -p -m 644 fonts/type1/%{fontpath}/* %{buildroot}%{texfonts}/type1/%{fontpath}/
@@ -75,6 +77,7 @@
 %defattr(-,root,root,-)
 %doc COPYING HISTORY README
 %{texmf}/tex/latex/%{texpkg}
+%{texfonts}/afm/%{fontpath}
 %{texfonts}/ofm/%{fontpath}
 %{texfonts}/ovf/%{fontpath}
 %{texfonts}/tfm/%{fontpath}
@@ -85,6 +88,12 @@
 
 
 %changelog
+* Mon Jan 12 2009 Sarantis Paskalis <paskalis at di.uoa.gr> - 0.5-11
+- Include .afm files (forgotten in the previous versions)
+
+* 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 sarantis at fedoraproject.org  Mon Jan 12 10:42:02 2009
From: sarantis at fedoraproject.org (Sarantis Paskalis)
Date: Mon, 12 Jan 2009 10:42:02 +0000 (UTC)
Subject: rpms/tetex-font-cm-lgc/F-10 tetex-font-cm-lgc.spec,1.14,1.15
Message-ID: <20090112104202.CFDC970123@cvs1.fedora.phx.redhat.com>

Author: sarantis

Update of /cvs/extras/rpms/tetex-font-cm-lgc/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6473

Modified Files:
	tetex-font-cm-lgc.spec 
Log Message:
Include .afm files (forgotten in the previous versions)



Index: tetex-font-cm-lgc.spec
===================================================================
RCS file: /cvs/extras/rpms/tetex-font-cm-lgc/F-10/tetex-font-cm-lgc.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- tetex-font-cm-lgc.spec	8 Sep 2008 14:10:23 -0000	1.14
+++ tetex-font-cm-lgc.spec	12 Jan 2009 10:41:32 -0000	1.15
@@ -6,7 +6,7 @@
 
 Name:           tetex-font-cm-lgc
 Version:        0.5
-Release:        10%{?dist}
+Release:        11%{?dist}
 Summary:        CM-LGC Type1 fonts for LaTeX
 Group:          Applications/Publishing
 # Font exception
@@ -39,10 +39,11 @@
 rm -rf %{buildroot}
 
 mkdir -p %{buildroot}%{texmf}/tex/latex/%{texpkg}
-mkdir -p %{buildroot}%{texfonts}/{ofm,ovf,type1,tfm,vf}/%{fontpath}
+mkdir -p %{buildroot}%{texfonts}/{afm,ofm,ovf,type1,tfm,vf}/%{fontpath}
 mkdir -p %{buildroot}%{texfonts}/{enc,map}/dvips/%{texpkg}
 
 install -p -m 644 tex/latex/%{texpkg}/* %{buildroot}%{texmf}/tex/latex/%{texpkg}/
+install -p -m 644 fonts/afm/%{fontpath}/* %{buildroot}%{texfonts}/afm/%{fontpath}/
 install -p -m 644 fonts/ofm/%{fontpath}/* %{buildroot}%{texfonts}/ofm/%{fontpath}/
 install -p -m 644 fonts/ovf/%{fontpath}/* %{buildroot}%{texfonts}/ovf/%{fontpath}/
 install -p -m 644 fonts/type1/%{fontpath}/* %{buildroot}%{texfonts}/type1/%{fontpath}/
@@ -76,6 +77,7 @@
 %defattr(-,root,root,-)
 %doc COPYING HISTORY README
 %{texmf}/tex/latex/%{texpkg}
+%{texfonts}/afm/%{fontpath}
 %{texfonts}/ofm/%{fontpath}
 %{texfonts}/ovf/%{fontpath}
 %{texfonts}/tfm/%{fontpath}
@@ -86,6 +88,9 @@
 
 
 %changelog
+* Mon Jan 12 2009 Sarantis Paskalis <paskalis at di.uoa.gr> - 0.5-11
+- Include .afm files (forgotten in the previous versions)
+
 * Mon Sep  8 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.5-10
 - fix license tag
 



From sarantis at fedoraproject.org  Mon Jan 12 10:45:51 2009
From: sarantis at fedoraproject.org (Sarantis Paskalis)
Date: Mon, 12 Jan 2009 10:45:51 +0000 (UTC)
Subject: rpms/tetex-font-cm-lgc/devel tetex-font-cm-lgc.spec,1.14,1.15
Message-ID: <20090112104551.AA9EC70123@cvs1.fedora.phx.redhat.com>

Author: sarantis

Update of /cvs/extras/rpms/tetex-font-cm-lgc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6942

Modified Files:
	tetex-font-cm-lgc.spec 
Log Message:
- Restructure spec file according to
  https://fedoraproject.org/wiki/Fonts_SIG_Fedora_11_packaging_changes
  (bug #477461)
- Split package to cm-lgc-fonts (.pfb and .afm) and tetex-font-cm-lgc
  (TeX stuff)
- Include .afm files (forgotten in the previous versions)




Index: tetex-font-cm-lgc.spec
===================================================================
RCS file: /cvs/extras/rpms/tetex-font-cm-lgc/devel/tetex-font-cm-lgc.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- tetex-font-cm-lgc.spec	8 Sep 2008 14:10:23 -0000	1.14
+++ tetex-font-cm-lgc.spec	12 Jan 2009 10:45:21 -0000	1.15
@@ -1,12 +1,15 @@
 %define ctan_date  20051007
-%define texmf      %{_datadir}/texmf
-%define texfonts   %{texmf}/fonts
-%define texpkg     cm-lgc
-%define fontpath   public/%{texpkg}
+%define texmf        %{_datadir}/texmf
+%define texfonts     %{texmf}/fonts
+%define texpkg       cm-lgc
+%define texfontpath  public/%{texpkg}
+# definitions for fontpackages
+%define fontname     cm-lgc
+%define fontpkg      \-n\ cm-lgc-fonts
 
 Name:           tetex-font-cm-lgc
 Version:        0.5
-Release:        10%{?dist}
+Release:        11%{?dist}
 Summary:        CM-LGC Type1 fonts for LaTeX
 Group:          Applications/Publishing
 # Font exception
@@ -16,17 +19,25 @@
 # upstream source - unversioned zip file
 # ftp://tug.ctan.org/pub/tex-archive/fonts/ps-type1/cm-lgc.zip
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires:       tetex-latex grep
+Requires:       texlive-latex grep cm-lgc-fonts
+BuildRequires:  symlinks
 BuildArch:      noarch
 
 
 %description
-This package contains the CM-LGC fonts. These are PostScript Type 1
-fonts converted from the METAFONT sources of the Computer Modern font
-families. CM-LGC supports the T1, T2A, LGR, and TS1 encodings,
-i.e. Latin, Cyrillic, and Greek. There are also support files for
-Omega/Lambda.
+TeX support files for the CM-LGC font.
 
+%define fontpkg \-n\ cm-lgc-fonts
+%package %{fontpkg}
+Summary:  CM-LGC Type1 fonts
+Group:    User Interface/X
+
+%description %{fontpkg}
+The  PostScript Type 1 fonts converted from the METAFONT sources of 
+the Computer Modern font families. CM-LGC supports the T1, T2A, LGR, 
+and TS1 encodings, i.e. Latin, Cyrillic, and Greek.
+
+%_font_pkg -n %{fontpkg} *.pfb *.afm
 
 %prep
 %setup -q -n %{texpkg}
@@ -39,53 +50,76 @@
 rm -rf %{buildroot}
 
 mkdir -p %{buildroot}%{texmf}/tex/latex/%{texpkg}
-mkdir -p %{buildroot}%{texfonts}/{ofm,ovf,type1,tfm,vf}/%{fontpath}
+mkdir -p %{buildroot}%{texfonts}/{afm,ofm,ovf,type1,tfm,vf}/%{texfontpath}
 mkdir -p %{buildroot}%{texfonts}/{enc,map}/dvips/%{texpkg}
 
-install -p -m 644 tex/latex/%{texpkg}/* %{buildroot}%{texmf}/tex/latex/%{texpkg}/
-install -p -m 644 fonts/ofm/%{fontpath}/* %{buildroot}%{texfonts}/ofm/%{fontpath}/
-install -p -m 644 fonts/ovf/%{fontpath}/* %{buildroot}%{texfonts}/ovf/%{fontpath}/
-install -p -m 644 fonts/type1/%{fontpath}/* %{buildroot}%{texfonts}/type1/%{fontpath}/
-install -p -m 644 fonts/tfm/%{fontpath}/* %{buildroot}%{texfonts}/tfm/%{fontpath}/
-install -p -m 644 fonts/vf/%{fontpath}/* %{buildroot}%{texfonts}/vf/%{fontpath}/
-install -p -m 644 dvips/base/* %{buildroot}%{texfonts}/enc/dvips/%{texpkg}/
-install -p -m 644 dvips/config/* %{buildroot}%{texfonts}/map/dvips/%{texpkg}/
-
+install -m 644 -p tex/latex/%{texpkg}/* %{buildroot}%{texmf}/tex/latex/%{texpkg}/
+install -m 644 -p fonts/ofm/%{texfontpath}/* %{buildroot}%{texfonts}/ofm/%{texfontpath}/
+install -m 644 -p fonts/ovf/%{texfontpath}/* %{buildroot}%{texfonts}/ovf/%{texfontpath}/
+install -m 644 -p fonts/tfm/%{texfontpath}/* %{buildroot}%{texfonts}/tfm/%{texfontpath}/
+install -m 644 -p fonts/vf/%{texfontpath}/* %{buildroot}%{texfonts}/vf/%{texfontpath}/
+install -m 644 -p dvips/base/* %{buildroot}%{texfonts}/enc/dvips/%{texpkg}/
+install -m 644 -p dvips/config/* %{buildroot}%{texfonts}/map/dvips/%{texpkg}/
+
+#install .pfb and .afm files in %{_fontdir} as per the fedora font guidelines
+install -m 0755 -d %{buildroot}%{_fontdir}
+install -m 0644 -p fonts/type1/%{texfontpath}/* %{buildroot}%{_fontdir}
+install -m 0644 -p fonts/afm/%{texfontpath}/* %{buildroot}%{_fontdir}
+
+pushd %{buildroot}%{_fontdir}
+for pfb_file in *.pfb ;  do
+    ln -s %{_fontdir}/$pfb_file %{buildroot}%{texfonts}/type1/%{texfontpath}/$pfb_file
+done
+for afm_file in *.afm ;  do
+    ln -s %{_fontdir}/$afm_file %{buildroot}%{texfonts}/afm/%{texfontpath}/$afm_file
+done
+popd
 
 %clean
 rm -rf %{buildroot}
 
 
-%post
-/usr/bin/texhash
-conffile="$(/usr/bin/texconfig-sys conf | /bin/grep updmap.cfg)"
-if [ "$1" = "1" ]; then
-  /usr/bin/updmap-sys --quiet --nohash --cnffile ${conffile} --enable Map %{texpkg}.map
+%post 
+texhash
+conffile="$(texconfig-sys conf | grep updmap.cfg)"
+if [ "$1" -eq "1" ]; then
+    updmap-sys --quiet --nohash --cnffile ${conffile} --enable Map %{texpkg}.map
 fi
 
 
+
 %postun
-conffile="$(/usr/bin/texconfig-sys conf | /bin/grep updmap.cfg)"
-if [ "$1" = "0" ]; then
-  /usr/bin/updmap-sys --quiet --nohash --cnffile ${conffile} --disable %{texpkg}.map
+conffile="$(texconfig-sys conf | grep updmap.cfg)"
+if [ "$1" -eq "0" ]; then
+  updmap-sys --quiet --nohash --cnffile ${conffile} --disable %{texpkg}.map
 fi
-/usr/bin/texhash
+texhash
 
 
 %files
 %defattr(-,root,root,-)
 %doc COPYING HISTORY README
 %{texmf}/tex/latex/%{texpkg}
-%{texfonts}/ofm/%{fontpath}
-%{texfonts}/ovf/%{fontpath}
-%{texfonts}/tfm/%{fontpath}
-%{texfonts}/type1/%{fontpath}
-%{texfonts}/vf/%{fontpath}
+%{texfonts}/afm/%{texfontpath}
+%{texfonts}/ofm/%{texfontpath}
+%{texfonts}/ovf/%{texfontpath}
+%{texfonts}/tfm/%{texfontpath}
+%{texfonts}/type1/%{texfontpath}
+%{texfonts}/vf/%{texfontpath}
 %{texfonts}/enc/dvips/%{texpkg}
 %{texfonts}/map/dvips/%{texpkg}
 
 
+
 %changelog
+* Mon Jan 12 2009 Sarantis Paskalis <paskalis at di.uoa.gr> - 0.5-11
+- Restructure spec file according to
+  https://fedoraproject.org/wiki/Fonts_SIG_Fedora_11_packaging_changes
+  (bug #477461)
+- Split package to cm-lgc-fonts (.pfb and .afm) and tetex-font-cm-lgc 
+  (TeX stuff)
+- Include .afm files (forgotten in the previous versions)
+
 * Mon Sep  8 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.5-10
 - fix license tag
 



From pravins at fedoraproject.org  Mon Jan 12 10:45:59 2009
From: pravins at fedoraproject.org (Pravin Satpute)
Date: Mon, 12 Jan 2009 10:45:59 +0000 (UTC)
Subject: rpms/samyak-fonts/devel samyak-fonts.spec,1.5,1.6
Message-ID: <20090112104559.DB93470123@cvs1.fedora.phx.redhat.com>

Author: pravins

Update of /cvs/pkgs/rpms/samyak-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7015

Modified Files:
	samyak-fonts.spec 
Log Message:
* Mon Jan 12 2009 Pravin Satpute <psatpute at redhat.com> 1.2.1-2
- bugzilla 477451
- updated spec



Index: samyak-fonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/samyak-fonts/devel/samyak-fonts.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- samyak-fonts.spec	18 Sep 2008 09:35:10 -0000	1.5
+++ samyak-fonts.spec	12 Jan 2009 10:45:29 -0000	1.6
@@ -1,56 +1,90 @@
-%define xfontdir        %{_datadir}/fonts
-%define langlist        "devanagari gujarati tamil malayalam oriya"
+%define	fontname	samyak
+%define langlist	"devanagari gujarati tamil malayalam oriya"
 
-Name:        samyak-fonts
-Version:     1.2.1
-Release:     1%{?dist}
-Summary:     Free Indian truetype/opentype fonts
-Group:       User Interface/X
-License:     GPLv3+ with exceptions
-URL:         https://sarovar.org/projects/samyak/
-Source:   samyak-fonts-%{version}.tar.gz
-BuildArch:   noarch
-BuildRoot:   %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+# Common description
+%define common_desc \
+The Samyak package contains fonts for the display of \
+Scripts Devanagari, Gujarati, Malayalam, Oriya and Tamil
+
+Name:	 %{fontname}-fonts
+Version:	1.2.1
+Release:	2%{?dist}
+Summary:	Free Indian truetype/opentype fonts
+Group:	User Interface/X
+License:	GPLv3+ with exceptions
+URL:	https://sarovar.org/projects/samyak/
+Source:	samyak-fonts-%{version}.tar.gz
+BuildArch:	noarch
+BuildRequires:	fontpackages-devel
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
-The Samyak package contains fonts for the display of
-Scripts Devanagari, Gujarati, Malayalam, Oriya and Tamil
+%common_desc
+
+%package common
+Summary:  Common files for smc-fonts
+Group:  User Interface/X
+Requires: fontpackages-filesystem
+
+%description common
+%common_desc
+
+%package devanagari
+Summary: Open Type Fonts for Devanagari script
+Group: User Interface/X 
+Requires: %{name}-common = %{version}-%{release}
+License: GPLv3+ with exceptions
+%description devanagari
+This package contains truetype/opentype font for the display of \
+Scripts Devanagari.
+
+%package tamil
+Summary: Open Type Fonts for Tamil script
+Group: User Interface/X 
+Requires: %{name}-common = %{version}-%{release}
+License: GPLv3+ with exceptions
+%description tamil
+This package contains truetype/opentype font for the display of \
+Scripts Tamil.
+
+
+%package malayalam
+Summary: Open Type Fonts for Malayalam script
+Group: User Interface/X 
+Requires: %{name}-common = %{version}-%{release}
+License: GPLv3+ with exceptions
+%description malayalam
+This package contains truetype/opentype font for the display of \
+Scripts Malayalam.
+
+%package gujarati
+Summary: Open Type Fonts for Gujarai script
+Group: User Interface/X 
+Requires: %{name}-common = %{version}-%{release}
+License: GPLv3+ with exceptions
+%description gujarati
+This package contains truetype/opentype font for the display of \
+Scripts Gujarati.
+
+%package oriya
+Summary: Open Type Fonts for Oriya script
+Group: User Interface/X 
+Requires: %{name}-common = %{version}-%{release}
+License: GPLv3+ with exceptions
+%description oriya
+This package contains truetype/opentype font for the display of \
+Scripts Oriya.
+
+%_font_pkg -n devanagari %{fontname}-devanagari/Samyak-*.ttf 
+
+%_font_pkg -n tamil %{fontname}-tamil/*.ttf 
+
+%_font_pkg -n malayalam %{fontname}-malayalam/*.ttf 
+
+%_font_pkg -n oriya %{fontname}-oriya/*.ttf 
+
+%_font_pkg -n gujarati %{fontname}-gujarati/*.ttf 
 
-# mk_pkg <name> <lang-code> 
-%define mk_pkg() \
-%package -n samyak-fonts-%1\
-Summary:    Free %(echo %1 | sed -e "s/\\(.*\\)/\\u\\1/") font\
-Group:      User Interface/X \
-Provides:   ttfonts-%2 = 1.8-2\
-Obsoletes : ttfonts-%2 <= 1.8-1\
-\
-\
-%description -n samyak-fonts-%1\
-This package provides a free %(echo %1 | sed -e "s/\\(.*\\)/\\u\\1/") truetype/opentype font.\
-\
-%files -n samyak-fonts-%1\
-%defattr(-, root, root, -)\
-%doc COPYING README AUTHORS\
-%dir %{xfontdir}/samyak-%1\
-%{xfontdir}/samyak-%1/*.ttf\
-\
-%post -n samyak-fonts-%1 \
-if [ -x %{_bindir}/fc-cache ]; then \
-  %{_bindir}/fc-cache %{xfontdir}/samyak-%1 \
-fi \
-\
-%postun -n samyak-fonts-%1 \
-if [ "$1" = "0" ]; then \
-  if [ -x %{_bindir}/fc-cache ]; then \
-    %{_bindir}/fc-cache %{xfontdir}/samyak-%1 \
-  fi \
-fi 
-
-%mk_pkg gujarati gu
-%mk_pkg devanagari hi
-%mk_pkg malayalam ml 
-%mk_pkg oriya or 
-%mk_pkg tamil ta 
 
 %prep
 %setup -q -n samyak-fonts-%{version}
@@ -59,18 +93,28 @@
 echo "Nothing to do in Build."
 
 %install
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 for i in "%{langlist}"
 do
-  install -d $RPM_BUILD_ROOT/%{xfontdir}/samyak-$i
-  install -m 0644 $i/* $RPM_BUILD_ROOT/%{xfontdir}/samyak-$i
+install -m 0755 -d %{buildroot}%{_fontdir}/samyak-$i
+install -m 0644 -p $i/* %{buildroot}%{_fontdir}/samyak-$i
 done
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -fr %{buildroot}
+
+
+%files common
+%defattr(-,root,root,-) 
+%doc COPYING README AUTHORS
+%dir %{_fontdir}
 
 %changelog
+* Mon Jan 12 2009 Pravin Satpute <psatpute at redhat.com> 1.2.1-2
+- bugzilla 477451
+- updated spec
+
 * 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 



From mmaslano at fedoraproject.org  Mon Jan 12 11:03:33 2009
From: mmaslano at fedoraproject.org (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?=)
Date: Mon, 12 Jan 2009 11:03:33 +0000 (UTC)
Subject: rpms/perl-ORLite/devel .cvsignore, 1.3, 1.4 perl-ORLite.spec, 1.2, 
	1.3 sources, 1.3, 1.4
Message-ID: <20090112110333.AD46270123@cvs1.fedora.phx.redhat.com>

Author: mmaslano

Update of /cvs/pkgs/rpms/perl-ORLite/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9671

Modified Files:
	.cvsignore perl-ORLite.spec sources 
Log Message:
* Mon Jan 12 2009 Marcela Ma??l????ov?? <mmaslano at redhat.com> 1.17-1
- update to 1.17



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-ORLite/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	29 Oct 2008 14:09:03 -0000	1.3
+++ .cvsignore	12 Jan 2009 11:03:03 -0000	1.4
@@ -1 +1 @@
-ORLite-0.15.tar.gz
+ORLite-1.17.tar.gz


Index: perl-ORLite.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-ORLite/devel/perl-ORLite.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-ORLite.spec	29 Oct 2008 14:09:03 -0000	1.2
+++ perl-ORLite.spec	12 Jan 2009 11:03:03 -0000	1.3
@@ -1,5 +1,5 @@
 Name:           perl-ORLite
-Version:        0.15
+Version:        1.17
 Release:        1%{?dist}
 Summary:        Extremely light weight SQLite-specific ORM
 License:        GPL+ or Artistic
@@ -63,6 +63,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Mon Jan 12 2009 Marcela Ma??l????ov?? <mmaslano at redhat.com> 1.17-1
+- update to 1.17
+
 * Wed Oct 29 2008 Marcela Ma??l????ov?? <mmaslano at redhat.com> 0.15-1
 - update to 0.15
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-ORLite/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	29 Oct 2008 14:09:03 -0000	1.3
+++ sources	12 Jan 2009 11:03:03 -0000	1.4
@@ -1 +1 @@
-f838147abe9977def55f101b43dd4890  ORLite-0.15.tar.gz
+96a7c81a4c1565b543d8bf84e8d8f53e  ORLite-1.17.tar.gz



From mmaslano at fedoraproject.org  Mon Jan 12 11:09:46 2009
From: mmaslano at fedoraproject.org (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?=)
Date: Mon, 12 Jan 2009 11:09:46 +0000 (UTC)
Subject: rpms/perl-ORLite/F-10 .cvsignore, 1.3, 1.4 perl-ORLite.spec, 1.2,
	1.3 sources, 1.3, 1.4
Message-ID: <20090112110946.C694870123@cvs1.fedora.phx.redhat.com>

Author: mmaslano

Update of /cvs/pkgs/rpms/perl-ORLite/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10412

Modified Files:
	.cvsignore perl-ORLite.spec sources 
Log Message:
* Mon Jan 12 2009 Marcela Ma??l????ov?? <mmaslano at redhat.com> 1.17-1
- update to 1.17



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-ORLite/F-10/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	22 Dec 2008 08:47:56 -0000	1.3
+++ .cvsignore	12 Jan 2009 11:09:15 -0000	1.4
@@ -1 +1 @@
-ORLite-0.15.tar.gz
+ORLite-1.17.tar.gz


Index: perl-ORLite.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-ORLite/F-10/perl-ORLite.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-ORLite.spec	22 Dec 2008 08:47:57 -0000	1.2
+++ perl-ORLite.spec	12 Jan 2009 11:09:15 -0000	1.3
@@ -1,5 +1,5 @@
 Name:           perl-ORLite
-Version:        0.15
+Version:        1.17
 Release:        1%{?dist}
 Summary:        Extremely light weight SQLite-specific ORM
 License:        GPL+ or Artistic
@@ -63,6 +63,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Mon Jan 12 2009 Marcela Ma??l????ov?? <mmaslano at redhat.com> 1.17-1
+- update to 1.17
+
 * Mon Dec 22 2008 Marcela Ma??l????ov?? <mmaslano at redhat.com> 0.15-1
 - update to 0.15
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-ORLite/F-10/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	22 Dec 2008 08:47:57 -0000	1.3
+++ sources	12 Jan 2009 11:09:15 -0000	1.4
@@ -1 +1 @@
-f838147abe9977def55f101b43dd4890  ORLite-0.15.tar.gz
+96a7c81a4c1565b543d8bf84e8d8f53e  ORLite-1.17.tar.gz



From mmaslano at fedoraproject.org  Mon Jan 12 11:13:07 2009
From: mmaslano at fedoraproject.org (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?=)
Date: Mon, 12 Jan 2009 11:13:07 +0000 (UTC)
Subject: rpms/perl-Wx-Perl-Dialog/devel .cvsignore, 1.3,
	1.4 perl-Wx-Perl-Dialog.spec, 1.3, 1.4 sources, 1.3, 1.4
Message-ID: <20090112111307.F26D170123@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-serv10780

Modified Files:
	.cvsignore perl-Wx-Perl-Dialog.spec sources 
Log Message:
* Mon Jan 12 2008 Marcela Ma??l????ov?? <mmaslano at redhat.com> 0.04-1
- update to 0.04



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Wx-Perl-Dialog/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	5 Dec 2008 10:13:52 -0000	1.3
+++ .cvsignore	12 Jan 2009 11:12:37 -0000	1.4
@@ -1 +1 @@
-Wx-Perl-Dialog-0.03.tar.gz
+Wx-Perl-Dialog-0.04.tar.gz


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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- perl-Wx-Perl-Dialog.spec	5 Dec 2008 10:13:52 -0000	1.3
+++ perl-Wx-Perl-Dialog.spec	12 Jan 2009 11:12:37 -0000	1.4
@@ -1,5 +1,5 @@
 Name:           perl-Wx-Perl-Dialog
-Version:        0.03
+Version:        0.04
 Release:        1%{?dist}
 Summary:        Wx::Perl::Dialog Perl module
 License:        GPL+ or Artistic
@@ -52,6 +52,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Mon Jan 12 2008 Marcela Ma??l????ov?? <mmaslano at redhat.com> 0.04-1
+- update to 0.04
+
 * Fri Dec 05 2008 Marcela Ma??l????ov?? <mmaslano at redhat.com> 0.03-1
 - update to 0.03
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Wx-Perl-Dialog/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	5 Dec 2008 10:13:52 -0000	1.3
+++ sources	12 Jan 2009 11:12:37 -0000	1.4
@@ -1 +1 @@
-cd37bab8497b1e824c0b6d9e5f41ab86  Wx-Perl-Dialog-0.03.tar.gz
+ee2af5236f1a89960c605eedaf202d24  Wx-Perl-Dialog-0.04.tar.gz



From caolanm at fedoraproject.org  Mon Jan 12 11:40:09 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Mon, 12 Jan 2009 11:40:09 +0000 (UTC)
Subject: rpms/openoffice.org/devel .cvsignore, 1.195, 1.196 sources, 1.326,
	1.327
Message-ID: <20090112114009.269AE70123@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13930

Modified Files:
	.cvsignore sources 
Log Message:
new sources


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/.cvsignore,v
retrieving revision 1.195
retrieving revision 1.196
diff -u -r1.195 -r1.196
--- .cvsignore	19 Dec 2008 10:56:50 -0000	1.195
+++ .cvsignore	12 Jan 2009 11:39:38 -0000	1.196
@@ -5,4 +5,4 @@
 redhat-templates.tar.gz
 redhat-registry.tar.gz
 redhat-langpacks.tar.gz
-OOO300_m14.tar.bz2
+OOO300_m15.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/sources,v
retrieving revision 1.326
retrieving revision 1.327
diff -u -r1.326 -r1.327
--- sources	20 Dec 2008 11:49:42 -0000	1.326
+++ sources	12 Jan 2009 11:39:38 -0000	1.327
@@ -4,5 +4,5 @@
 1b4d9a03ebb4c864015620153afb77c6  Tigert-templates.tar.gz
 f0cda31fe18bf9289629a321663031b8  redhat-templates.tar.gz
 5ff04a5d754f6770f07e679856d682f3  redhat-registry.tar.gz
-b2d26e217e454af79e2a3fbe6d355c90  OOO300_m14.tar.bz2
 1926e27180816c99c1c58d6ed708adbc  redhat-langpacks.tar.gz
+99ff6a3492fe2dad34153e85f79bd6f5  OOO300_m15.tar.bz2



From caolanm at fedoraproject.org  Mon Jan 12 11:41:46 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Mon, 12 Jan 2009 11:41:46 +0000 (UTC)
Subject: rpms/openoffice.org/devel openoffice.org.spec,1.1749,1.1750
Message-ID: <20090112114146.2172070123@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14132

Modified Files:
	openoffice.org.spec 
Log Message:
next milestone


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1749
retrieving revision 1.1750
diff -u -r1.1749 -r1.1750
--- openoffice.org.spec	12 Jan 2009 09:02:58 -0000	1.1749
+++ openoffice.org.spec	12 Jan 2009 11:41:15 -0000	1.1750
@@ -1,6 +1,6 @@
 %define oootag OOO300
-%define ooomilestone 14
-%define rh_rpm_release 5
+%define ooomilestone 15
+%define rh_rpm_release 1
 
 # rhbz#465664 jar-repacking breaks help by reordering META-INF/MANIFEST.MF
 %define __jar_repack %{nil}
@@ -3822,7 +3822,8 @@
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
-* Mon Jan 12 2009 Caol??n McNamara <caolanm at redhat.com> - 1:3.0.1-14.5
+* Mon Jan 12 2009 Caol??n McNamara <caolanm at redhat.com> - 1:3.0.1-15.1
+- next milestone
 - rename openoffice.org-3.0.0.ooo90072.sw.undo-longtext.patch to 
   upstream workspace.sw31bf02.patch
 - Resolves: rhbz#477880 add openoffice.org-3.0.1.ooo97975.bridges.mainalreadyexited.patch



From vcrhonek at fedoraproject.org  Mon Jan 12 11:43:14 2009
From: vcrhonek at fedoraproject.org (Vitezslav Crhonek)
Date: Mon, 12 Jan 2009 11:43:14 +0000 (UTC)
Subject: rpms/kbd/devel kbd.spec,1.56,1.57
Message-ID: <20090112114314.6D10C70123@cvs1.fedora.phx.redhat.com>

Author: vcrhonek

Update of /cvs/extras/rpms/kbd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14333

Modified Files:
	kbd.spec 
Log Message:
Move loadkeys to /bin


Index: kbd.spec
===================================================================
RCS file: /cvs/extras/rpms/kbd/devel/kbd.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- kbd.spec	8 Jan 2009 14:46:00 -0000	1.56
+++ kbd.spec	12 Jan 2009 11:42:44 -0000	1.57
@@ -1,6 +1,6 @@
 Name:           kbd
 Version:        1.15
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Tools for configuring the console (keyboard, virtual terminals, etc.)
 
 Group:          System Environment/Base
@@ -74,7 +74,7 @@
 
 # Move binaries which we use before /usr is mounted from %{_bindir} to /bin.
 mkdir -p $RPM_BUILD_ROOT/bin
-for binary in setfont dumpkeys kbd_mode unicode_start unicode_stop ; do
+for binary in setfont dumpkeys kbd_mode unicode_start unicode_stop loadkeys ; do
   mv $RPM_BUILD_ROOT%{_bindir}/$binary $RPM_BUILD_ROOT/bin/
 done
 
@@ -102,6 +102,9 @@
 /lib/kbd
 
 %changelog
+* Mon Jan 12 2009 Vitezslav Crhonek <vcrhonek at redhat.com> - 1.15-2
+- Move loadkeys to /bin
+
 * Thu Jan  8 2009 Vitezslav Crhonek <vcrhonek at redhat.com> - 1.15-1
 - Update to kbd-1.15
 



From sarantis at fedoraproject.org  Mon Jan 12 11:43:58 2009
From: sarantis at fedoraproject.org (Sarantis Paskalis)
Date: Mon, 12 Jan 2009 11:43:58 +0000 (UTC)
Subject: rpms/tetex-font-kerkis/F-9 tetex-font-kerkis.spec,1.18,1.19
Message-ID: <20090112114358.D62B070123@cvs1.fedora.phx.redhat.com>

Author: sarantis

Update of /cvs/extras/rpms/tetex-font-kerkis/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14361

Modified Files:
	tetex-font-kerkis.spec 
Log Message:
Include .afm files (forgotten in the previous versions)



Index: tetex-font-kerkis.spec
===================================================================
RCS file: /cvs/extras/rpms/tetex-font-kerkis/F-9/tetex-font-kerkis.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- tetex-font-kerkis.spec	4 Jan 2008 12:45:06 -0000	1.18
+++ tetex-font-kerkis.spec	12 Jan 2009 11:43:58 -0000	1.19
@@ -6,7 +6,7 @@
 
 Name:           tetex-font-kerkis
 Version:        2.0
-Release:        15%{?dist}
+Release:        16%{?dist}
 Summary:        Kerkis type 1 fonts for LaTeX
 Group:          Applications/Publishing
 License:        LPPL
@@ -45,11 +45,12 @@
 rm -rf %{buildroot}
 
 mkdir -p %{buildroot}%{texmf}/tex/latex/%{texpkg}
-mkdir -p %{buildroot}%{texfonts}/{tfm,type1,vf}/%{fontpath}
+mkdir -p %{buildroot}%{texfonts}/{afm,tfm,type1,vf}/%{fontpath}
 mkdir -p %{buildroot}%{texfonts}/{map,enc}/dvips/%{texpkg}
 
 install -p -m 644 tex/{*.sty,*.fd} %{buildroot}%{texmf}/tex/latex/%{texpkg}/
 install -p -m 644 tfm/*.tfm %{buildroot}%{texfonts}/tfm/%{fontpath}/
+install -p -m 644 afm/*.afm %{buildroot}%{texfonts}/afm/%{fontpath}/
 install -p -m 644 type1/*.pfb %{buildroot}%{texfonts}/type1/%{fontpath}/
 install -p -m 644 vf/*.vf %{buildroot}%{texfonts}/vf/%{fontpath}/
 install -p -m 644 dvips/*.map %{buildroot}%{texfonts}/map/dvips/%{texpkg}/
@@ -81,6 +82,7 @@
 %doc License.txt README.html
 %{texmf}/tex/latex/%{texpkg}
 %{texfonts}/tfm/%{fontpath}
+%{texfonts}/afm/%{fontpath}
 %{texfonts}/type1/%{fontpath}
 %{texfonts}/vf/%{fontpath}
 %{texfonts}/map/dvips/%{texpkg}
@@ -89,6 +91,8 @@
 
 
 %changelog
+* Mon Jan 12 2009 Sarantis Paskalis <paskalis at di.uoa.gr> - 2.0-16
+- Include .afm files (forgotten in the previous versions)
 
 * Fri Jan  4 2008 Sarantis Paskalis <paskalis at di.uoa.gr> - 2.0-15
 - Drop requirement for -fonts.



From sarantis at fedoraproject.org  Mon Jan 12 11:44:24 2009
From: sarantis at fedoraproject.org (Sarantis Paskalis)
Date: Mon, 12 Jan 2009 11:44:24 +0000 (UTC)
Subject: rpms/tetex-font-kerkis/F-10 tetex-font-kerkis.spec,1.18,1.19
Message-ID: <20090112114424.6BF7370123@cvs1.fedora.phx.redhat.com>

Author: sarantis

Update of /cvs/extras/rpms/tetex-font-kerkis/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14397

Modified Files:
	tetex-font-kerkis.spec 
Log Message:
Include .afm files (forgotten in the previous versions)



Index: tetex-font-kerkis.spec
===================================================================
RCS file: /cvs/extras/rpms/tetex-font-kerkis/F-10/tetex-font-kerkis.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- tetex-font-kerkis.spec	4 Jan 2008 12:45:06 -0000	1.18
+++ tetex-font-kerkis.spec	12 Jan 2009 11:43:54 -0000	1.19
@@ -6,7 +6,7 @@
 
 Name:           tetex-font-kerkis
 Version:        2.0
-Release:        15%{?dist}
+Release:        16%{?dist}
 Summary:        Kerkis type 1 fonts for LaTeX
 Group:          Applications/Publishing
 License:        LPPL
@@ -45,11 +45,12 @@
 rm -rf %{buildroot}
 
 mkdir -p %{buildroot}%{texmf}/tex/latex/%{texpkg}
-mkdir -p %{buildroot}%{texfonts}/{tfm,type1,vf}/%{fontpath}
+mkdir -p %{buildroot}%{texfonts}/{afm,tfm,type1,vf}/%{fontpath}
 mkdir -p %{buildroot}%{texfonts}/{map,enc}/dvips/%{texpkg}
 
 install -p -m 644 tex/{*.sty,*.fd} %{buildroot}%{texmf}/tex/latex/%{texpkg}/
 install -p -m 644 tfm/*.tfm %{buildroot}%{texfonts}/tfm/%{fontpath}/
+install -p -m 644 afm/*.afm %{buildroot}%{texfonts}/afm/%{fontpath}/
 install -p -m 644 type1/*.pfb %{buildroot}%{texfonts}/type1/%{fontpath}/
 install -p -m 644 vf/*.vf %{buildroot}%{texfonts}/vf/%{fontpath}/
 install -p -m 644 dvips/*.map %{buildroot}%{texfonts}/map/dvips/%{texpkg}/
@@ -81,6 +82,7 @@
 %doc License.txt README.html
 %{texmf}/tex/latex/%{texpkg}
 %{texfonts}/tfm/%{fontpath}
+%{texfonts}/afm/%{fontpath}
 %{texfonts}/type1/%{fontpath}
 %{texfonts}/vf/%{fontpath}
 %{texfonts}/map/dvips/%{texpkg}
@@ -89,6 +91,8 @@
 
 
 %changelog
+* Mon Jan 12 2009 Sarantis Paskalis <paskalis at di.uoa.gr> - 2.0-16
+- Include .afm files (forgotten in the previous versions)
 
 * Fri Jan  4 2008 Sarantis Paskalis <paskalis at di.uoa.gr> - 2.0-15
 - Drop requirement for -fonts.



From sarantis at fedoraproject.org  Mon Jan 12 11:46:08 2009
From: sarantis at fedoraproject.org (Sarantis Paskalis)
Date: Mon, 12 Jan 2009 11:46:08 +0000 (UTC)
Subject: rpms/tetex-font-kerkis/devel tetex-font-kerkis.spec,1.18,1.19
Message-ID: <20090112114608.DECE170123@cvs1.fedora.phx.redhat.com>

Author: sarantis

Update of /cvs/extras/rpms/tetex-font-kerkis/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14662

Modified Files:
	tetex-font-kerkis.spec 
Log Message:
- Restructure spec file according to
  https://fedoraproject.org/wiki/Fonts_SIG_Fedora_11_packaging_changes
  (bug #477462)
- Split package to cm-lgc-fonts (.pfb and .afm) and tetex-font-cm-lgc
  (TeX stuff)
- Include .afm files (forgotten in the previous versions)




Index: tetex-font-kerkis.spec
===================================================================
RCS file: /cvs/extras/rpms/tetex-font-kerkis/devel/tetex-font-kerkis.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- tetex-font-kerkis.spec	4 Jan 2008 12:45:06 -0000	1.18
+++ tetex-font-kerkis.spec	12 Jan 2009 11:45:38 -0000	1.19
@@ -1,12 +1,15 @@
-%define ctan_date  20051007
-%define texmf      %{_datadir}/texmf
-%define texfonts   %{texmf}/fonts
-%define texpkg     kerkis
-%define fontpath   %{texpkg}
+%define ctan_date    20051007
+%define texmf        %{_datadir}/texmf
+%define texfonts     %{texmf}/fonts
+%define texpkg       kerkis
+%define texfontpath  %{texpkg}
+# definitions for fontpackages
+%define fontname     kerkis
+%define fontpkg      \-n\ %{fontname}-fonts
 
 Name:           tetex-font-kerkis
 Version:        2.0
-Release:        15%{?dist}
+Release:        16%{?dist}
 Summary:        Kerkis type 1 fonts for LaTeX
 Group:          Applications/Publishing
 License:        LPPL
@@ -15,23 +18,31 @@
 # upstream source - unversioned zip file
 # ftp://tug.ctan.org/pub/tex-archive/fonts/greek/kerkis.zip
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires:       tetex-latex
+Requires:       texlive-latex kerkis-fonts = %{version}-%{release}
 BuildArch:      noarch
 
 
 %description
-This package contains the Kerkis type 1 fonts for LaTeX.
+TeX support files for the Kerkis Type 1 font.
 
-These fonts are particularly useful for typesetting Greek. The
-Greek repertoire includes full support for polytonic Greek, Greek
-numerals, and double forms of several letters that occur in variant
-forms.
+%define fontpkg \-n\ kerkis-fonts
+%package %{fontpkg}
+Summary:  Kerkis Type1 fonts
+Group:    User Interface/X
+
+%description %{fontpkg}
+Kerkis type 1 fonts for LaTeX.  These fonts are particularly useful
+for typesetting Greek. The Greek repertoire includes full support for
+polytonic Greek, Greek numerals, and double forms of several letters 
+that occur in variant forms.
 
 The Latin part of the font comprise old style numbers, accented Latin
 characters and common ligatures (including frequently omitted
 ligatures such as "fj").
 
-Please see the file "License.txt" for details on the use of this font.
+
+%_font_pkg -n %{fontpkg} *.pfb *.afm
+
 
 
 %prep
@@ -45,50 +56,72 @@
 rm -rf %{buildroot}
 
 mkdir -p %{buildroot}%{texmf}/tex/latex/%{texpkg}
-mkdir -p %{buildroot}%{texfonts}/{tfm,type1,vf}/%{fontpath}
+mkdir -p %{buildroot}%{texfonts}/{afm,tfm,type1,vf}/%{texfontpath}
 mkdir -p %{buildroot}%{texfonts}/{map,enc}/dvips/%{texpkg}
 
 install -p -m 644 tex/{*.sty,*.fd} %{buildroot}%{texmf}/tex/latex/%{texpkg}/
-install -p -m 644 tfm/*.tfm %{buildroot}%{texfonts}/tfm/%{fontpath}/
-install -p -m 644 type1/*.pfb %{buildroot}%{texfonts}/type1/%{fontpath}/
-install -p -m 644 vf/*.vf %{buildroot}%{texfonts}/vf/%{fontpath}/
+install -p -m 644 tfm/*.tfm %{buildroot}%{texfonts}/tfm/%{texfontpath}/
+install -p -m 644 vf/*.vf %{buildroot}%{texfonts}/vf/%{texfontpath}/
 install -p -m 644 dvips/*.map %{buildroot}%{texfonts}/map/dvips/%{texpkg}/
 install -p -m 644 dvips/*.enc %{buildroot}%{texfonts}/enc/dvips/%{texpkg}/
 
+#install .pfb and .afm files in %{_fontdir} as per the fedora font guidelines
+install -m 0755 -d %{buildroot}%{_fontdir}
+install -m 0644 -p type1/* %{buildroot}%{_fontdir}
+install -m 0644 -p afm/* %{buildroot}%{_fontdir}
+
+pushd %{buildroot}%{_fontdir}
+for pfb_file in *.pfb ;  do
+    ln -s %{_fontdir}/$pfb_file %{buildroot}%{texfonts}/type1/%{texfontpath}/$pfb_file
+done
+for afm_file in *.afm ;  do
+    ln -s %{_fontdir}/$afm_file %{buildroot}%{texfonts}/afm/%{texfontpath}/$afm_file
+done
+popd
+
 
 %clean
 rm -rf %{buildroot}
 
 
 %post
-/usr/bin/texhash
-conffile="$(/usr/bin/texconfig-sys conf | /bin/grep updmap.cfg)"
+texhash
+conffile="$(texconfig-sys conf | grep updmap.cfg)"
 if [ "$1" = "1" ]; then
-  /usr/bin/updmap-sys --quiet --nohash --cnffile ${conffile} --enable Map %{texpkg}.map
+    updmap-sys --quiet --nohash --cnffile ${conffile} --enable Map %{texpkg}.map
 fi
 
 
 %postun
-conffile="$(/usr/bin/texconfig-sys conf | /bin/grep updmap.cfg)"
+conffile="$(texconfig-sys conf | grep updmap.cfg)"
 if [ "$1" = "0" ]; then
-  /usr/bin/updmap-sys --quiet --nohash --cnffile ${conffile} --disable %{texpkg}.map
+    updmap-sys --quiet --nohash --cnffile ${conffile} --disable %{texpkg}.map
 fi
-/usr/bin/texhash
+texhash
 
 
 %files
 %defattr(-,root,root,-)
 %doc License.txt README.html
 %{texmf}/tex/latex/%{texpkg}
-%{texfonts}/tfm/%{fontpath}
-%{texfonts}/type1/%{fontpath}
-%{texfonts}/vf/%{fontpath}
+%{texfonts}/afm/%{texfontpath}
+%{texfonts}/tfm/%{texfontpath}
+%{texfonts}/type1/%{texfontpath}
+%{texfonts}/vf/%{texfontpath}
 %{texfonts}/map/dvips/%{texpkg}
 %{texfonts}/enc/dvips/%{texpkg}
 
 
 
 %changelog
+* Mon Jan 12 2009 Sarantis Paskalis <paskalis at di.uoa.gr> - 2.0-16
+- Restructure spec file according to
+  https://fedoraproject.org/wiki/Fonts_SIG_Fedora_11_packaging_changes
+  (bug #477462)
+- Split package to cm-lgc-fonts (.pfb and .afm) and tetex-font-cm-lgc
+  (TeX stuff)
+- Include .afm files (forgotten in the previous versions)
+
 
 * Fri Jan  4 2008 Sarantis Paskalis <paskalis at di.uoa.gr> - 2.0-15
 - Drop requirement for -fonts.



From dnovotny at fedoraproject.org  Mon Jan 12 12:06:01 2009
From: dnovotny at fedoraproject.org (Daniel Novotny)
Date: Mon, 12 Jan 2009 12:06:01 +0000 (UTC)
Subject: rpms/file/devel file-4.26-btrfs.patch,NONE,1.1 file.spec,1.85,1.86
Message-ID: <20090112120601.C19E970123@cvs1.fedora.phx.redhat.com>

Author: dnovotny

Update of /cvs/extras/rpms/file/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17689

Modified Files:
	file.spec 
Added Files:
	file-4.26-btrfs.patch 
Log Message:

fix bz#479300


file-4.26-btrfs.patch:

--- NEW FILE file-4.26-btrfs.patch ---
diff -up file-4.26/magic/Magdir/filesystems.btrfs file-4.26/magic/Magdir/filesystems
--- file-4.26/magic/Magdir/filesystems.btrfs	2009-01-12 12:50:33.000000000 +0100
+++ file-4.26/magic/Magdir/filesystems	2009-01-12 12:53:30.000000000 +0100
@@ -1324,6 +1324,14 @@
 >0x10024        belong          x               (blocksize %d,
 >0x10060        string          >\0             lockproto %s)
 
+# BTRFS
+0x10040         string          _BHRfS_M        BTRFS Filesystem
+>0x1012b        string          >\0             (label "%s",
+>0x10090        lelong          x               sectorsize %d,
+>0x10094        lelong          x               nodesize %d,
+>0x10098        lelong          x               leafsize %d)
+
+
 # dvdisaster's .ecc
 # From: "Nelson A. de Oliveira" <naoliv at gmail.com>
 0	string	*dvdisaster*	dvdisaster error correction file


Index: file.spec
===================================================================
RCS file: /cvs/extras/rpms/file/devel/file.spec,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -r1.85 -r1.86
--- file.spec	15 Dec 2008 16:26:32 -0000	1.85
+++ file.spec	12 Jan 2009 12:05:30 -0000	1.86
@@ -5,7 +5,7 @@
 Summary: A utility for determining file types
 Name: file
 Version: 4.26
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: BSD
 Group: Applications/File
 Source0: ftp://ftp.astron.com/pub/file/file-%{version}.tar.gz
@@ -15,6 +15,7 @@
 Patch2: file-4.26-mime-encoding.patch
 Patch3: file-4.26-perl5.patch
 Patch4: file-4.26-graphviz-latex.patch
+Patch5: file-4.26-btrfs.patch
 
 Requires: file-libs = %{version}-%{release}
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -69,6 +70,8 @@
 %patch3 -p1
 #fixes #474156
 %patch4 -p1
+#fixes #479300
+%patch5 -p1
 
 iconv -f iso-8859-1 -t utf-8 < doc/libmagic.man > doc/libmagic.man_
 touch -r doc/libmagic.man doc/libmagic.man_
@@ -142,6 +145,9 @@
 %endif
 
 %changelog
+* Mon Jan 12 2009 Daniel Novotny <dnovotny at redhat.com> 4.26-8
+- fix #479300 - add btrfs filesystem magic
+
 * Mon Dec 15 2008 Daniel Novotny <dnovotny at redhat.com> 4.26-7
 - fix the LaTex issue in bz#474156
 



From than at fedoraproject.org  Mon Jan 12 12:10:19 2009
From: than at fedoraproject.org (Than Ngo)
Date: Mon, 12 Jan 2009 12:10:19 +0000 (UTC)
Subject: rpms/qt/devel .cvsignore, 1.43, 1.44 qt.spec, 1.218, 1.219 sources, 
	1.44, 1.45
Message-ID: <20090112121019.BD36670123@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/qt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18222

Modified Files:
	.cvsignore qt.spec sources 
Log Message:
qt-copy-patches-20090112



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/qt/devel/.cvsignore,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- .cvsignore	30 Dec 2008 06:25:52 -0000	1.43
+++ .cvsignore	12 Jan 2009 12:09:49 -0000	1.44
@@ -2,3 +2,4 @@
 hi48-app-qt4-logo.png
 qt-x11-opensource-src-4.4.3.tar.bz2
 qt-copy-patches-20081225svn.tar.bz2
+qt-copy-patches-20090112svn.tar.bz2


Index: qt.spec
===================================================================
RCS file: /cvs/extras/rpms/qt/devel/qt.spec,v
retrieving revision 1.218
retrieving revision 1.219
diff -u -r1.218 -r1.219
--- qt.spec	30 Dec 2008 06:25:52 -0000	1.218
+++ qt.spec	12 Jan 2009 12:09:49 -0000	1.219
@@ -9,7 +9,7 @@
 Name:    qt4
 %endif
 Version: 4.4.3
-Release: 8%{?dist}
+Release: 9%{?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.3-im.patch
 
 ## qt-copy patches
-%define qt_copy 20081225 
+%define qt_copy 20090112
 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}}
@@ -734,6 +734,9 @@
 
 
 %changelog
+* Mon Jan 12 2009 Than Ngo <than at redhat.com> - 4.4.3-9
+- qt-copy-patches-20090112
+
 * Tue Dec 30 2008 Rex Dieter <rdieter at fedoraproject.org> 4.4.3-8
 - qt-copy-patches-20081225
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/qt/devel/sources,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- sources	30 Dec 2008 06:25:52 -0000	1.44
+++ sources	12 Jan 2009 12:09:49 -0000	1.45
@@ -1,4 +1,4 @@
 d9f511e4b51983b4e10eb58b320416d5  hi128-app-qt4-logo.png
 6dcc0672ff9e60a6b83f95c5f42bec5b  hi48-app-qt4-logo.png
 00e00c6324d342a7b0d8653112b4f08c  qt-x11-opensource-src-4.4.3.tar.bz2
-00cd44f34d1e4840805ae71a20b378a4  qt-copy-patches-20081225svn.tar.bz2
+9c51cc569de37085da1af39750a35ba7  qt-copy-patches-20090112svn.tar.bz2



From kzak at fedoraproject.org  Mon Jan 12 12:21:02 2009
From: kzak at fedoraproject.org (Karel Zak)
Date: Mon, 12 Jan 2009 12:21:02 +0000 (UTC)
Subject: rpms/words/devel words-3.0-presidents.patch, NONE,
	1.1 words-3.0-typos.patch, 1.1, 1.2 words.spec, 1.16, 1.17
Message-ID: <20090112122102.87CA670123@cvs1.fedora.phx.redhat.com>

Author: kzak

Update of /cvs/pkgs/rpms/words/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19800

Modified Files:
	words-3.0-typos.patch words.spec 
Added Files:
	words-3.0-presidents.patch 
Log Message:
* Mon Jan 12 2009 Karel Zak <kzak at redhat.com> - 3.0-14
- fix #457309 - contains both 'unnecessary' and 'unneccesary'
- fix #470921 -"Barack" and "Obama" are not in /usr/share/dict/words
- update spec file (#226542 - Merge Review)


words-3.0-presidents.patch:

--- NEW FILE words-3.0-presidents.patch ---
diff -up /dev/null words-3.0/mwords/70presid.nam
--- /dev/null	2009-01-07 09:15:55.031018896 +0100
+++ words-3.0/mwords/70presid.nam	2009-01-12 12:22:46.000000000 +0100
@@ -0,0 +1,70 @@
+Abraham
+Adams
+Andrew
+Arthur
+Barack
+Benjamin
+Bill
+Buchanan
+Buren
+Bush
+Calvin
+Carter
+Chester
+Cleveland
+Clinton
+Coolidge
+Dwight
+Eisenhower
+Fillmore
+Ford
+Franklin
+Garfield
+George
+Gerald
+Grant
+Grover
+Harding
+Harrison
+Harry
+Hayes
+Herbert
+Hoover
+Jackson
+James
+Jefferson
+Jimmy
+John
+Johnson
+Kennedy
+Lincoln
+Lyndon
+Madison
+Martin
+McKinley
+Millard
+Monroe
+Nixon
+Obama
+Pierce
+Polk
+Quincy
+Reagan
+Richard
+Ronald
+Roosevelt
+Rutherford
+Taft
+Taylor
+Theodore
+Thomas
+Truman
+Tyler
+Ulysses
+Van
+Warren
+Washington
+William
+Wilson
+Woodrow
+Zachary
diff -up words-3.0/mwords/readme.txt.kzak words-3.0/mwords/readme.txt
--- words-3.0/mwords/readme.txt.kzak	2009-01-12 12:28:41.000000000 +0100
+++ words-3.0/mwords/readme.txt	2009-01-12 12:28:24.000000000 +0100
@@ -119,6 +119,10 @@ Version Bible ranked and counted by orde
 The most frequently occurring 467 substrings occurring in a
 best-selling novel by Amy Tan in 1990.
 
+70 names of presidents
+This file consists of the 70 names (first and last names) or American
+presidents (to 2009). Added by Karel Zak for Fedora Linux distribution.
+
 USA Constitution
 The Constitution of the United States, including the Bill of Rights
 and all amendments current to 1993.

words-3.0-typos.patch:

Index: words-3.0-typos.patch
===================================================================
RCS file: /cvs/pkgs/rpms/words/devel/words-3.0-typos.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- words-3.0-typos.patch	23 Jun 2008 13:08:17 -0000	1.1
+++ words-3.0-typos.patch	12 Jan 2009 12:21:02 -0000	1.2
@@ -1,6 +1,6 @@
 diff -up words-3.0/mwords/354984si.ngl.kzak words-3.0/mwords/354984si.ngl
---- words-3.0/mwords/354984si.ngl.kzak	2008-06-23 14:00:07.000000000 +0200
-+++ words-3.0/mwords/354984si.ngl	2008-06-23 14:02:54.000000000 +0200
+--- words-3.0/mwords/354984si.ngl.kzak	1996-06-06 05:30:48.000000000 +0200
++++ words-3.0/mwords/354984si.ngl	2009-01-12 11:56:54.000000000 +0100
 @@ -17787,7 +17787,6 @@ architecture
  architecture's
  architectures
@@ -17,3 +17,11 @@
  flouriness
  flouring
  flourish
+@@ -331241,7 +331239,6 @@ unneath
+ unneatly
+ unneatness
+ unnebulous
+-unneccessary
+ unnecessaries
+ unnecessarily
+ unnecessariness


Index: words.spec
===================================================================
RCS file: /cvs/pkgs/rpms/words/devel/words.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- words.spec	23 Jun 2008 13:08:17 -0000	1.16
+++ words.spec	12 Jan 2009 12:21:02 -0000	1.17
@@ -1,24 +1,26 @@
 Summary: A dictionary of English words for the /usr/share/dict directory
 Name: words
 Version: 3.0
-Release: 13%{?dist}
+Release: 14%{?dist}
 License: Public Domain
 Group: System Environment/Libraries
-Source: mwords.tar.Z
 # Note that Moby Project officially does not exist any more. The most complete
 # information about the project is in Wikipedia.
 URL: http://en.wikipedia.org/wiki/Moby_Project
+Source: http://web.archive.org/web/20060527013227/http://www.dcs.shef.ac.uk/research/ilash/Moby/mwords.tar.Z
 
 BuildArch: noarch
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: dos2unix
 BuildRequires: grep
-BuildRequires: coreutils
 
 #428582 - linux.words contains misspelled word "flourescent"
 #440146 - misspelled word in /usr/share/dict/words (architecure)
+#457309 - contains both 'unnecessary' and 'unneccesary'
 Patch0: words-3.0-typos.patch
+#470921 -"Barack" and "Obama" are not in /usr/share/dict/words
+Patch1: words-3.0-presidents.patch
 
 %description
 The words file is a dictionary of English words for the
@@ -26,10 +28,10 @@
 words to check spelling. Password checkers use it to look for bad
 passwords.
 
-
 %prep
 %setup -q -c
 %patch0 -p1
+%patch1 -p1 -b .kzak
 
 %build
 cd mwords
@@ -78,6 +80,11 @@
 %{_datadir}/dict/words
 
 %changelog
+* Mon Jan 12 2009 Karel Zak <kzak at redhat.com> - 3.0-14
+- fix #457309 - contains both 'unnecessary' and 'unneccesary'
+- fix #470921 -"Barack" and "Obama" are not in /usr/share/dict/words
+- update spec file (#226542 - Merge Review)
+
 * Mon Jun 23 2008 Karel Zak <kzak at redhat.com> - 3.0-13
 - fix #428582 - linux.words contains misspelled word "flourescent"
 - fix #440146 - misspelled word in /usr/share/dict/words (architecure)



From caolanm at fedoraproject.org  Mon Jan 12 12:27:44 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Mon, 12 Jan 2009 12:27:44 +0000 (UTC)
Subject: rpms/openoffice.org/F-10
	openoffice.org-3.0.1.oooXXXXX.extensions.npapi.patch, NONE,
	1.1 workspace.cmcfixes51.patch, NONE, 1.1 workspace.fwk92.patch,
	NONE, 1.1 workspace.hb12.patch, NONE,
	1.1 workspace.impressfontsize.patch, NONE,
	1.1 workspace.locales31.patch, NONE,
	1.1 workspace.mba31issues01.patch, NONE,
	1.1 workspace.mhu17.patch, NONE, 1.1 workspace.sb101.patch, NONE,
	1.1 workspace.selinux01.patch, NONE,
	1.1 workspace.sw31bf02.patch, NONE, 1.1 workspace.tkr16.patch,
	NONE, 1.1 workspace.vcl96.patch, NONE,
	1.1 openoffice.org-2.2.1.ooo7065.sw.titlepagedialog.patch, 1.2,
	1.3 openoffice.org-2.3.1.ooo83878.unopkg.enablelinking.patch,
	1.7, 1.8 openoffice.org-3.0.0.ooo93515.vcl.jrb-frames.patch, 1.4,
	1.5 openoffice.org-3.0.1.ooo97088.sd.accel-fallback.patch, 1.2, 1.3
	openoffice.org-3.0.1.ooo97428.config_office.xinerama-on-x86_64.patch, 
	1.2, 1.3 openoffice.org.spec, 1.1707, 1.1708 sources, 1.320,
	1.321 workspace.cmcfixes48.patch, 1.4, 1.5 workspace.vcl97.patch,
	1.1, 1.2 workspace.vcl98.patch, 1.1,
	1.2 openoffice.org-2.0.3.ooo80816.selinux.bridges.patch, 1.8,
	NONE openoffice.org-2.3.0.ooo80257.sd.textonlystyle.patch, 1.3,
	NONE openoffice.org-2.3.0.ooo80257.sd.textonlystyle.tar.gz, 1.1,
	NONE openoffice.org-2.4.0.ooo87490.sfx2.allprotocols.urlopen.patch,
	1.2, NONE openoffice.org-3.0.0.ooo86142.serbiannumbering.patch,
	1.1, NONE openoffice.org-3.0.0.ooo90072.sw.undo-longtext.patch,
	1.1, NONE openoffice.org-3.0.0.ooo91904.sd.wrongindex.patch, 1.1,
	NONE openoffice.org-3.0.0.ooo93419.svx.ref_deref.before.ctored.patch, 
	1.2, NONE openoffice.org-3.0.0.ooo93942.svx.accessibity-loops.patch, 
	1.1, NONE openoffice.org-3.0.0.ooo93949.sw.better_rtf_encodings.patch,
	1.1, NONE openoffice.org-3.0.0.ooo94659.sal.magazine.patch, 1.2,
	NONE openoffice.org-3.0.0.ooo95341.cppcanvas.patch, 1.1,
	NONE openoffice.org-3.0.0.ooo95392.sysui.csv.patch, 1.2,
	NONE openoffice.org-3.0.0.ooo95533.sw.safertableexport.patch,
	1.1, NONE openoffice.org-3.0.0.ooo95793.goodies.met.patch, 1.1,
	NONE openoffice.org-3.0.0.ooo95908.pyuno.debugging.spew.patch,
	1.1, NONE openoffice.org-3.0.0.ooo96203.sfx2.3layer-qstart.patch, 1.2,
	NONE
	openoffice.org-3.0.1.ooo97196.vcl.ensuretheme.whenqttesting.patch,
	1.1, NONE workspace.dba301a.patch, 1.1,
	NONE workspace.impress161.patch, 1.1,
	NONE workspace.impress163.patch, 1.1, NONE
Message-ID: <20090112122744.17FDE70123@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21408

Modified Files:
	openoffice.org-2.2.1.ooo7065.sw.titlepagedialog.patch 
	openoffice.org-2.3.1.ooo83878.unopkg.enablelinking.patch 
	openoffice.org-3.0.0.ooo93515.vcl.jrb-frames.patch 
	openoffice.org-3.0.1.ooo97088.sd.accel-fallback.patch 
	openoffice.org-3.0.1.ooo97428.config_office.xinerama-on-x86_64.patch 
	openoffice.org.spec sources workspace.cmcfixes48.patch 
	workspace.vcl97.patch workspace.vcl98.patch 
Added Files:
	openoffice.org-3.0.1.oooXXXXX.extensions.npapi.patch 
	workspace.cmcfixes51.patch workspace.fwk92.patch 
	workspace.hb12.patch workspace.impressfontsize.patch 
	workspace.locales31.patch workspace.mba31issues01.patch 
	workspace.mhu17.patch workspace.sb101.patch 
	workspace.selinux01.patch workspace.sw31bf02.patch 
	workspace.tkr16.patch workspace.vcl96.patch 
Removed Files:
	openoffice.org-2.0.3.ooo80816.selinux.bridges.patch 
	openoffice.org-2.3.0.ooo80257.sd.textonlystyle.patch 
	openoffice.org-2.3.0.ooo80257.sd.textonlystyle.tar.gz 
	openoffice.org-2.4.0.ooo87490.sfx2.allprotocols.urlopen.patch 
	openoffice.org-3.0.0.ooo86142.serbiannumbering.patch 
	openoffice.org-3.0.0.ooo90072.sw.undo-longtext.patch 
	openoffice.org-3.0.0.ooo91904.sd.wrongindex.patch 
	openoffice.org-3.0.0.ooo93419.svx.ref_deref.before.ctored.patch 
	openoffice.org-3.0.0.ooo93942.svx.accessibity-loops.patch 
	openoffice.org-3.0.0.ooo93949.sw.better_rtf_encodings.patch 
	openoffice.org-3.0.0.ooo94659.sal.magazine.patch 
	openoffice.org-3.0.0.ooo95341.cppcanvas.patch 
	openoffice.org-3.0.0.ooo95392.sysui.csv.patch 
	openoffice.org-3.0.0.ooo95533.sw.safertableexport.patch 
	openoffice.org-3.0.0.ooo95793.goodies.met.patch 
	openoffice.org-3.0.0.ooo95908.pyuno.debugging.spew.patch 
	openoffice.org-3.0.0.ooo96203.sfx2.3layer-qstart.patch 
	openoffice.org-3.0.1.ooo97196.vcl.ensuretheme.whenqttesting.patch 
	workspace.dba301a.patch workspace.impress161.patch 
	workspace.impress163.patch 
Log Message:
bump F-10 to 3.0.1

openoffice.org-3.0.1.oooXXXXX.extensions.npapi.patch:

--- NEW FILE openoffice.org-3.0.1.oooXXXXX.extensions.npapi.patch ---
Index: source/plugin/inc/plugin/unx/plugcon.hxx
===================================================================
RCS file: /cvs/util/extensions/source/plugin/inc/plugin/unx/plugcon.hxx,v
retrieving revision 1.13.64.2
diff -u -r1.13.64.2 plugcon.hxx
--- openoffice.org.orig/extensions/source/plugin/inc/plugin/unx/plugcon.hxx	15 Dec 2008 10:29:47 -0000	1.13.64.2
+++ openoffice.org/extensions/source/plugin/inc/plugin/unx/plugcon.hxx	23 Dec 2008 09:24:57 -0000
@@ -102,7 +102,7 @@
 extern "C" {
 #include <npsdk/npupp.h>
 }
-#include <npapi.h>
+#include <npsdk/npapi.h>
 
 #if NP_VERSION_MINOR < 17
 // compatibility hack: compile with older NPN api header, but define

workspace.cmcfixes51.patch:

--- NEW FILE workspace.cmcfixes51.patch ---
Index: source/appl/shutdownicon.cxx
===================================================================
RCS file: /cvs/framework/sfx2/source/appl/shutdownicon.cxx,v
retrieving revision 1.64
diff -u -r1.64 shutdownicon.cxx
--- openoffice.org.orig/sfx2/source/appl/shutdownicon.cxx	22 Jul 2008 17:51:23 -0000	1.64
+++ openoffice.org/sfx2/source/appl/shutdownicon.cxx	14 Nov 2008 09:08:28 -0000
@@ -63,10 +63,11 @@
 #include <tools/urlobj.hxx>
 #include <osl/security.hxx>
 #include <osl/file.hxx>
-#include <unotools/bootstrap.hxx>
+#include <rtl/bootstrap.hxx>
 #include <tools/link.hxx>
 #ifdef UNX // need symlink
 #include <unistd.h>
+#include <errno.h>
 #endif
 
 #include "sfxresid.hxx"
@@ -83,6 +84,8 @@ using namespace ::vos;
 using namespace ::rtl;
 using namespace ::sfx2;
 
+extern "C" { static void SAL_CALL thisModule() {} }
+
 class SfxNotificationListener_Impl : public cppu::WeakImplHelper1< XDispatchResultListener >
 {
 public:
@@ -142,7 +145,7 @@ bool ShutdownIcon::LoadModule( osl::Modu
 
 	oslGenericFunction pTmpInit = NULL;
 	oslGenericFunction pTmpDeInit = NULL;
-	if ( pPlugin->load( OUString (RTL_CONSTASCII_USTRINGPARAM( STRING( PLUGIN_NAME ) ) ) ) )
+	if ( pPlugin->loadRelative( &thisModule, OUString (RTL_CONSTASCII_USTRINGPARAM( STRING( PLUGIN_NAME ) ) ) ) )
 	{
 		pTmpInit = pPlugin->getFunctionSymbol(
 			OUString( RTL_CONSTASCII_USTRINGPARAM( "plugin_init_sys_tray" ) ) );
@@ -826,8 +827,8 @@
 #else // UNX
 		getDotAutostart( true );
 
-		OUString aPath;
-		::utl::Bootstrap::locateBaseInstallation(aPath);
+                OUString aPath = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("$BRAND_BASE_DIR"));
+                ::rtl::Bootstrap::expandMacros(aPath);
 
 		OUString aDesktopFile;
 		::osl::File::getSystemPathFromFileURL( aPath, aDesktopFile );
@@ -837,7 +838,12 @@
 													 osl_getThreadTextEncoding() );
 		OString aShortcutUnx = OUStringToOString( aShortcut,
 												  osl_getThreadTextEncoding() );
-		symlink( aDesktopFileUnx, aShortcutUnx );
+
+        if ((0 != symlink(aDesktopFileUnx, aShortcutUnx)) && (errno == EEXIST))
+        {
+            unlink(aShortcutUnx);
+            symlink(aDesktopFileUnx, aShortcutUnx);
+        }
 
 		ShutdownIcon *pIcon = ShutdownIcon::createInstance();
 		if( pIcon )

workspace.fwk92.patch:

--- NEW FILE workspace.fwk92.patch ---
Index: filter/source/config/cache/typedetection.cxx
===================================================================
--- openoffice.org.orig/filter/source/config/cache/typedetection.cxx	(.../trunk)	(revision 263288)
+++ openoffice.org/filter/source/config/cache/typedetection.cxx	(.../cws/fwk92)	(revision 264093)
@@ -298,9 +298,28 @@
             aLock.clear();
             // <- SAFE
 
-            if (lFilters.size() > 0)
+            for (  OUStringList::const_iterator pIt  = lFilters.begin();
+                   pIt != lFilters.end() && sFilter.getLength() == 0 ;
+                 ++pIt                    )
             {
-                sFilter = *(lFilters.begin());
+                // SAFE ->
+                aLock.reset();
+                try
+                {
+                    CacheItem aFilter = m_rCache->getItem(FilterCache::E_FILTER, *pIt);
+                    sal_Int32 nFlags  = 0;
+                    aFilter[PROPNAME_FLAGS] >>= nFlags;
+
+                    if ((nFlags & FLAGVAL_IMPORT) == FLAGVAL_IMPORT)
+                        sFilter = *pIt;
+                }
+                catch(const css::uno::Exception&) {}
+                aLock.clear();
+                // <- SAFE
+            }
+
+            if (sFilter.getLength() > 0)
+            {
                 rDescriptor[::comphelper::MediaDescriptor::PROP_TYPENAME()  ] <<= sRealType;
                 rDescriptor[::comphelper::MediaDescriptor::PROP_FILTERNAME()] <<= sFilter;
                 sType = sRealType;

workspace.hb12.patch:

--- NEW FILE workspace.hb12.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;
         }

workspace.impressfontsize.patch:

--- NEW FILE workspace.impressfontsize.patch ---
diff -ruN sd.orig/inc/pres.hxx sd/inc/pres.hxx
--- openoffice.org.orig/sd/inc/pres.hxx	2006-12-12 17:23:42.000000000 +0100
+++ openoffice.org/sd/inc/pres.hxx	2007-07-24 14:27:46.000000000 +0200
@@ -82,6 +82,7 @@
 	AUTOLAYOUT_TEXTOVEROBJ,
 	AUTOLAYOUT_4OBJ,
 	AUTOLAYOUT_ONLY_TITLE,
+	AUTOLAYOUT_ONLY_TEXT,
 	AUTOLAYOUT_NONE,
 	AUTOLAYOUT_NOTES,
 	AUTOLAYOUT_HANDOUT1,
diff -ruN sd.orig/source/core/sdpage.cxx sd/source/core/sdpage.cxx
--- openoffice.org.orig/sd/source/core/sdpage.cxx	2006-12-12 17:33:13.000000000 +0100
+++ openoffice.org/sd/source/core/sdpage.cxx	2007-07-26 14:53:24.000000000 +0200
@@ -1244,6 +1244,7 @@
 		LayoutDescriptor( 6, PRESOBJ_TITLE, PRESOBJ_OBJECT, PRESOBJ_OBJECT,					// AUTOLAYOUT_4OBJ
 			PRESOBJ_OBJECT, PRESOBJ_OBJECT ),
 		LayoutDescriptor( 0, PRESOBJ_TITLE, PRESOBJ_NONE ),									// AUTOLAYOUT_ONLY_TITLE
+		LayoutDescriptor( 10, PRESOBJ_TITLE, PRESOBJ_NONE ),								// AUTOLAYOUT_ONLY_TEXT
 		LayoutDescriptor( 0, PRESOBJ_NONE ),												// AUTOLAYOUT_NONE
 		LayoutDescriptor( 0, PRESOBJ_PAGE, PRESOBJ_NOTES ),									// AUTOLAYOUT_NOTES
 		LayoutDescriptor( 0 ),																// AUTOLAYOUT_HANDOUT1
@@ -1436,6 +1437,13 @@
 		rRectangle[1].SetSize( aSize );
 		break;
 	}
+	case 10: // onlytext
+	{
+		Size aSize( rRectangle[0].GetSize().Width(), rRectangle[1].BottomLeft().Y() - rRectangle[0].TopLeft().Y() );
+		rRectangle[0].SetSize( aSize );
+		rRectangle[0].SetPos( aTitlePos);
+		break;
+	}
 	}
 }
 
diff -ruN sd.orig/source/ui/app/res_bmp.src sd/source/ui/app/res_bmp.src
--- openoffice.org.orig/sd/source/ui/app/res_bmp.src	2005-09-23 14:28:54.000000000 +0200
+++ openoffice.org/sd/source/ui/app/res_bmp.src	2007-07-27 14:55:46.000000000 +0200
@@ -322,6 +322,14 @@
 {
 	File = "foil24_h.bmp" ;
 };
+Bitmap BMP_FOIL_25
+{
+	File = "foil25.bmp" ;
+};
+Bitmap BMP_FOIL_25_H
+{
+	File = "foil25_h.bmp" ;
+};
 Bitmap BMP_FOILH_01
 {
 	File = "foilh01.bmp" ;
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
@@ -177,6 +177,10 @@
 {
 	Text [ en-US ] = "Title Only" ;
 };
+String STR_AUTOLAYOUT_ONLY_TEXT
+{
+	Text [ en-US ] = "Centered Text" ;
+};
 String STR_AUTOLAYOUT_TITLE
 {
 	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
@@ -111,6 +111,7 @@
 #define BMP_FOIL_18 			RID_APP_START+28
 #define BMP_FOIL_19 			RID_APP_START+29
 #define BMP_FOIL_20 			RID_APP_START+30
+#define BMP_FOIL_25			RID_APP_START+41
 #define BMP_FOILH_01			RID_APP_START+31
 #define BMP_FOILH_02			RID_APP_START+32
 #define BMP_FOILH_03			RID_APP_START+33
@@ -289,6 +290,7 @@
 #define BMP_FOIL_22_H 						RID_SD_START+204
 #define BMP_FOIL_23_H 						RID_SD_START+205
 #define BMP_FOIL_24_H 						RID_SD_START+206
+#define BMP_FOIL_25_H 						RID_SD_START+334
 #define BMP_FOILH_01_H						RID_SD_START+207
 #define BMP_FOILH_02_H						RID_SD_START+208
 #define BMP_FOILH_03_H						RID_SD_START+209
diff -ruN sd.orig/source/ui/inc/strings.hrc sd/source/ui/inc/strings.hrc
--- openoffice.org.orig/sd/source/ui/inc/strings.hrc	2006-07-05 23:53:36.000000000 +0200
+++ openoffice.org/sd/source/ui/inc/strings.hrc	2007-07-27 15:13:52.000000000 +0200
@@ -202,6 +202,7 @@
 #define STR_AUTOLAYOUT_HANDOUT6 	(RID_APP_START+235)
 #define STR_AUTOLAYOUT_NOTES		(RID_APP_START+236)
 #define STR_AUTOLAYOUT_HANDOUT9		(RID_APP_START+237)
+#define STR_AUTOLAYOUT_ONLY_TEXT	(RID_APP_START+238)
 
 #define STR_TRANSFORM				(RID_APP_START+240)
 
diff -ruN sd.orig/source/ui/toolpanel/LayoutMenu.cxx sd/source/ui/toolpanel/LayoutMenu.cxx
--- openoffice.org.orig/sd/source/ui/toolpanel/LayoutMenu.cxx	2006-12-12 19:40:07.000000000 +0100
+++ openoffice.org/sd/source/ui/toolpanel/LayoutMenu.cxx	2007-07-27 15:13:02.000000000 +0200
@@ -185,6 +185,8 @@
      AUTOLAYOUT_2TEXT},
     {BMP_FOIL_19, BMP_FOIL_19_H, STR_AUTOLAYOUT_ONLY_TITLE, WritingMode_LR_TB,
      AUTOLAYOUT_ONLY_TITLE},
+    {BMP_FOIL_25, BMP_FOIL_25_H, STR_AUTOLAYOUT_ONLY_TEXT, WritingMode_LR_TB,
+     AUTOLAYOUT_ONLY_TEXT},
     {BMP_FOIL_11, BMP_FOIL_11_H, STR_AUTOLAYOUT_OBJ, WritingMode_LR_TB,
      AUTOLAYOUT_OBJ},
     {BMP_FOIL_02, BMP_FOIL_02_H, STR_AUTOLAYOUT_CHART, WritingMode_LR_TB,
Index: source/token/tokens.txt
===================================================================
RCS file: /cvs/xml/oox/source/token/tokens.txt,v
retrieving revision 1.2
diff -u -r1.2 tokens.txt
--- openoffice.org.orig/oox/source/token/tokens.txt	17 Jan 2008 08:06:07 -0000	1.2
+++ openoffice.org/oox/source/token/tokens.txt	10 Mar 2008 15:57:51 -0000
@@ -2431,6 +2431,7 @@
 handoutMasterId
 handoutMasterIdLst
 handoutView
+handouts
 handouts1
 handouts2
 handouts3
Index: source/ui/app/optsitem.cxx
===================================================================
RCS file: /cvs/graphics/sd/source/ui/app/optsitem.cxx,v
retrieving revision 1.43
diff -u -r1.43 optsitem.cxx
--- openoffice.org.orig/sd/source/ui/app/optsitem.cxx	10 Apr 2008 19:25:45 -0000	1.43
+++ openoffice.org/sd/source/ui/app/optsitem.cxx	21 Jul 2008 09:50:19 -0000
@@ -1584,8 +1584,8 @@
 		if( pValues[12].hasValue() ) SetNotes( *(sal_Bool*) pValues[ 12 ].getValue() ); 
 		if( pValues[13].hasValue() ) SetHandout( *(sal_Bool*) pValues[ 13 ].getValue() ); 
 		if( pValues[14].hasValue() ) SetOutline( *(sal_Bool*) pValues[ 14 ].getValue() ); 
-		if( pValues[15].hasValue() ) SetHandoutHorizontal( *(sal_Bool*) pValues[12].getValue() );
-		if( pValues[16].hasValue() ) SetHandoutPages( (UINT16)*(sal_Int32*) pValues[13].getValue() );
+		if( pValues[15].hasValue() ) SetHandoutHorizontal( *(sal_Bool*) pValues[15].getValue() );
+		if( pValues[16].hasValue() ) SetHandoutPages( (UINT16)*(sal_Int32*) pValues[16].getValue() );
 	}
 
 	return TRUE;

workspace.locales31.patch:

--- NEW FILE workspace.locales31.patch ---
Index: i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx
===================================================================
RCS file: /cvs/l10n/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx,v
retrieving revision 1.28
diff -u -r1.28 defaultnumberingprovider.cxx
--- openoffice.org.orig/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx	13 Nov 2007 14:32:47 -0000	1.28
+++ openoffice.org/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx	15 Feb 2008 05:14:16 -0000
@@ -166,6 +166,22 @@
     0x0449, 0x044B, 0x044D, 0x044E, 0x044F
 };
 
+// Serbian Cyrillic upper letters
+static sal_Unicode table_CyrillicUpperLetter_sr[] = { 
+    0x0410, 0x0411, 0x0412, 0x0413, 0x0414, 0x0402, 0x0415, 0x0416, 
+    0x0417, 0x0418, 0x0408, 0x041A, 0x041B, 0x0409, 0x041C, 0x041D, 
+    0x040A, 0x041E, 0x041F, 0x0420, 0x0421, 0x0422, 0x040B, 0x0423,
+    0x0424, 0x0425, 0x0426, 0x0427, 0x040F, 0x0428
+};
+
+// Serbian cyrillic lower letters
+static sal_Unicode table_CyrillicLowerLetter_sr[] = { 
+    0x0430, 0x0431, 0x0432, 0x0433, 0x0434, 0x0452, 0x0435, 0x0436,
+    0x0437, 0x0438, 0x0458, 0x043A, 0x043B, 0x0459, 0x043C, 0x043D, 
+    0x045A, 0x043E, 0x043F, 0x0440, 0x0441, 0x0442, 0x045B, 0x0443,
+    0x0444, 0x0445, 0x0446, 0x0447, 0x045F, 0x0448
+};
+
 static sal_Unicode table_Alphabet_fa[] = {
     0x0622, 0x0628, 0x067E, 0x062A, 0x062B, 0x062C, 0x0686, 0x062D,
     0x062E, 0x062F, 0x0630, 0x0631, 0x0632, 0x0698, 0x0633, 0x0634,
@@ -623,6 +639,32 @@
                       sizeof(table_CyrillicLowerLetter_ru[0]), number-1,
                       result); // 1=>a, 2=>b, ..., 27=>z, 28=>aa, 29=>bb, ...
               break;
+         case CHARS_CYRILLIC_UPPER_LETTER_SR:
+              lcl_formatChars2( table_CyrillicUpperLetter_sr,
+                      table_CyrillicLowerLetter_sr,
+                      sizeof(table_CyrillicLowerLetter_sr) /
+                      sizeof(table_CyrillicLowerLetter_sr[0]), number-1,
+                      result); // 1=>a, 2=>b, ..., 27=>z, 28=>Aa, 29=>Ab, ...
+              break;
+         case CHARS_CYRILLIC_LOWER_LETTER_SR:
+              lcl_formatChars( table_CyrillicLowerLetter_sr,
+                      sizeof(table_CyrillicLowerLetter_sr) /
+                      sizeof(table_CyrillicLowerLetter_sr[0]), number-1,
+                      result); // 1=>a, 2=>b, ..., 27=>z, 28=>aa, 29=>ab, ...
+              break;
+         case CHARS_CYRILLIC_UPPER_LETTER_N_SR:
+              lcl_formatChars3( table_CyrillicUpperLetter_sr,
+                      table_CyrillicLowerLetter_sr,
+                      sizeof(table_CyrillicLowerLetter_sr) /
+                      sizeof(table_CyrillicLowerLetter_sr[0]), number-1,
+                      result); // 1=>a, 2=>b, ..., 27=>z, 28=>Aa, 29=>Bb, ...
+              break;
+         case CHARS_CYRILLIC_LOWER_LETTER_N_SR:
+              lcl_formatChars1( table_CyrillicLowerLetter_sr,
+                      sizeof(table_CyrillicLowerLetter_sr) /
+                      sizeof(table_CyrillicLowerLetter_sr[0]), number-1,
+                      result); // 1=>a, 2=>b, ..., 27=>z, 28=>aa, 29=>bb, ...
+              break;
           case CHARS_PERSIAN:
               lcl_formatChars(table_Alphabet_fa, sizeof(table_Alphabet_fa) / sizeof(sal_Unicode), number - 1, result);
               break;
@@ -708,6 +750,10 @@
         {style::NumberingType::CHARS_CYRILLIC_LOWER_LETTER_RU,   S_CYR_A ", " S_CYR_B ", .., " S_CYR_A S_CYR_A ", " S_CYR_A S_CYR_B ", ... (ru)", LANG_ALL},
         {style::NumberingType::CHARS_CYRILLIC_UPPER_LETTER_N_RU, C_CYR_A ", " C_CYR_B ", .., " C_CYR_A S_CYR_A ", " C_CYR_B S_CYR_B ", ... (ru)", LANG_ALL},
         {style::NumberingType::CHARS_CYRILLIC_LOWER_LETTER_N_RU, S_CYR_A ", " S_CYR_B ", .., " S_CYR_A S_CYR_A ", " S_CYR_B S_CYR_B ", ... (ru)", LANG_ALL},
+        {style::NumberingType::CHARS_CYRILLIC_UPPER_LETTER_SR,   C_CYR_A ", " C_CYR_B ", .., " C_CYR_A S_CYR_A ", " C_CYR_A S_CYR_B ", ... (sr)", LANG_ALL},
+        {style::NumberingType::CHARS_CYRILLIC_LOWER_LETTER_SR,   S_CYR_A ", " S_CYR_B ", .., " S_CYR_A S_CYR_A ", " S_CYR_A S_CYR_B ", ... (sr)", LANG_ALL},
+        {style::NumberingType::CHARS_CYRILLIC_UPPER_LETTER_N_SR, C_CYR_A ", " C_CYR_B ", .., " C_CYR_A S_CYR_A ", " C_CYR_B S_CYR_B ", ... (sr)", LANG_ALL},
+        {style::NumberingType::CHARS_CYRILLIC_LOWER_LETTER_N_SR, S_CYR_A ", " S_CYR_B ", .., " S_CYR_A S_CYR_A ", " S_CYR_B S_CYR_B ", ... (sr)", LANG_ALL},
         {style::NumberingType::CHARS_PERSIAN,   NULL, LANG_CTL},
 };
 static const sal_Int32 nSupported_NumberingTypes = sizeof(aSupportedTypes) / sizeof(Supported_NumberingType);
Index: offapi/com/sun/star/style/NumberingType.idl
===================================================================
RCS file: /cvs/api/offapi/com/sun/star/style/NumberingType.idl,v
retrieving revision 1.17
diff -u -r1.17 NumberingType.idl
--- openoffice.org.orig/offapi/com/sun/star/style/NumberingType.idl	13 Nov 2007 14:30:30 -0000	1.17
+++ openoffice.org/offapi/com/sun/star/style/NumberingType.idl	15 Feb 2008 05:14:42 -0000
@@ -396,6 +396,66 @@
     const short CHARS_CYRILLIC_LOWER_LETTER_N_RU = 45;
 
     //-------------------------------------------------------------------------
+    /** Numbering in Serbian Cyrillic alphabet upper case letters
+
+    	@since OOo 2.4.0
+	 */
+     /*
+        CYRILLIC CAPITAL LETTER A , CYRILLIC CAPITAL LETTER BE ,
+            CYRILLIC CAPITAL LETTER VE , CYRILLIC CAPITAL LETTER GHE , ... ,
+        CYRILLIC CAPITAL LETTER A CYRILLIC SMALL LETTER A ,
+            CYRILLIC CAPITAL LETTER A CYRILLIC SMALL LETTER BE ,
+            CYRILLIC CAPITAL LETTER A CYRILLIC SMALL LETTER VE , ...
+        CYRILLIC CAPITAL LETTER A CYRILLIC SMALL LETTER A CYRILLIC SMALL LETTER A ,
+            CYRILLIC CAPITAL LETTER A CYRILLIC SMALL LETTER A CYRILLIC SMALL LETTER BE
+      */
+    const short CHARS_CYRILLIC_UPPER_LETTER_SR = 47;
+
+    //-------------------------------------------------------------------------
+    /** Numbering in Russian Serbian alphabet lower case letters
+
+    	@since OOo 2.4.0
+	 */
+     /*
+        CYRILLIC SMALL LETTER A , CYRILLIC SMALL LETTER BE ,
+            CYRILLIC SMALL LETTER VE , CYRILLIC SMALL LETTER GHE , ... ,
+        CYRILLIC SMALL LETTER A CYRILLIC SMALL LETTER A ,
+            CYRILLIC SMALL LETTER A CYRILLIC SMALL LETTER BE ,
+            CYRILLIC SMALL LETTER A CYRILLIC SMALL LETTER VE , ...
+        CYRILLIC SMALL LETTER A CYRILLIC SMALL LETTER A CYRILLIC SMALL LETTER A ,
+            CYRILLIC SMALL LETTER A CYRILLIC SMALL LETTER A CYRILLIC SMALL LETTER BE
+      */
+    const short CHARS_CYRILLIC_LOWER_LETTER_SR = 48;
+
+    //-------------------------------------------------------------------------
+    /** Numbering in Serbian Cyrillic alphabet upper case letters
+
+    	@since OOo 2.4.0
+	 */
+     /*
+        CYRILLIC CAPITAL LETTER A , CYRILLIC CAPITAL LETTER BE , ... ,
+        CYRILLIC CAPITAL LETTER A CYRILLIC SMALL LETTER A ,
+            CYRILLIC CAPITAL LETTER BE CYRILLIC SMALL LETTER BE ,
+            CYRILLIC CAPITAL LETTER VE CYRILLIC SMALL LETTER VE , ...
+        CYRILLIC CAPITAL LETTER A CYRILLIC SMALL LETTER A CYRILLIC SMALL LETTER A , ...
+      */
+    const short CHARS_CYRILLIC_UPPER_LETTER_N_SR = 49;
+
+    //-------------------------------------------------------------------------
+    /** Numbering in Serbian Cyrillic alphabet upper case letters
+
+    	@since OOo 2.4.0
+	 */
+     /*
+        CYRILLIC SMALL LETTER A , CYRILLIC SMALL LETTER BE , ... ,
+        CYRILLIC SMALL LETTER A CYRILLIC SMALL LETTER A ,
+            CYRILLIC SMALL LETTER BE CYRILLIC SMALL LETTER BE ,
+            CYRILLIC SMALL LETTER VE CYRILLIC SMALL LETTER VE , ...
+        CYRILLIC SMALL LETTER A CYRILLIC SMALL LETTER A CYRILLIC SMALL LETTER A , ...
+      */
+    const short CHARS_CYRILLIC_LOWER_LETTER_N_SR = 50;
+
+    //-------------------------------------------------------------------------
     /** Numbering in Persian alphabet letters (aa, be, pe, te, ...)
 
         @since OOo 2.4
Index: svx/source/dialog/numpages.src
===================================================================
RCS file: /cvs/graphics/svx/source/dialog/numpages.src,v
retrieving revision 1.62
diff -u -r1.62 numpages.src
--- openoffice.org.orig/svx/source/dialog/numpages.src	27 Jun 2007 17:23:30 -0000	1.62
+++ openoffice.org/svx/source/dialog/numpages.src	15 Feb 2008 05:16:13 -0000
@@ -216,6 +216,10 @@
             < "??, ??, .., ????, ????, ... (Russian)" ;       43 /*CHARS_CYRILLIC_LOWER_LETTER_RU     */; > ;
             < "??, ??, .., ????, ????, ... (Russian)" ;       44 /*CHARS_CYRILLIC_UPPER_LETTER_N_RU   */; > ;
             < "??, ??, .., ????, ????, ... (Russian)" ;       45 /*CHARS_CYRILLIC_LOWER_LETTER_N_RU   */; > ;
+            < "??, ??, .., ????, ????, ... (Serbian)" ;       47 /*CHARS_CYRILLIC_UPPER_LETTER_SR     */; > ;
+            < "??, ??, .., ????, ????, ... (Serbian)" ;       48 /*CHARS_CYRILLIC_LOWER_LETTER_SR     */; > ;
+            < "??, ??, .., ????, ????, ... (Serbian)" ;       49 /*CHARS_CYRILLIC_UPPER_LETTER_N_SR   */; > ;
+            < "??, ??, .., ????, ????, ... (Serbian)" ;       50 /*CHARS_CYRILLIC_LOWER_LETTER_N_SR   */; > ;
 
 		};
 	};
Index: sw/source/ui/misc/numberingtypelistbox.src
===================================================================
RCS file: /cvs/sw/sw/source/ui/misc/numberingtypelistbox.src,v
retrieving revision 1.19
diff -u -r1.19 numberingtypelistbox.src
--- openoffice.org.orig/sw/source/ui/misc/numberingtypelistbox.src	19 Apr 2007 13:21:04 -0000	1.19
+++ openoffice.org/sw/source/ui/misc/numberingtypelistbox.src	15 Feb 2008 05:16:22 -0000
@@ -61,6 +61,10 @@
             < "??, ??, .., ????, ????, ... (Russian)" ;       43 /*CHARS_CYRILLIC_LOWER_LETTER_RU     */; > ;
             < "??, ??, .., ????, ????, ... (Russian)" ;       44 /*CHARS_CYRILLIC_UPPER_LETTER_N_RU   */; > ;
             < "??, ??, .., ????, ????, ... (Russian)" ;       45 /*CHARS_CYRILLIC_LOWER_LETTER_N_RU   */; > ;
+            < "??, ??, .., ????, ????, ... (Serbian)" ;       47 /*CHARS_CYRILLIC_UPPER_LETTER_SR     */; > ;
+            < "??, ??, .., ????, ????, ... (Serbian)" ;       48 /*CHARS_CYRILLIC_LOWER_LETTER_SR     */; > ;
+            < "??, ??, .., ????, ????, ... (Serbian)" ;       49 /*CHARS_CYRILLIC_UPPER_LETTER_N_SR   */; > ;
+            < "??, ??, .., ????, ????, ... (Serbian)" ;       50 /*CHARS_CYRILLIC_LOWER_LETTER_N_SR   */; > ;
 		};
 	};
 };
Index: writerfilter/source/dmapper/DomainMapper_Impl.cxx
===================================================================
RCS file: /cvs/sw/writerfilter/source/dmapper/DomainMapper_Impl.cxx,v
retrieving revision 1.21
diff -u -r1.21 DomainMapper_Impl.cxx
--- openoffice.org.orig/writerfilter/source/dmapper/DomainMapper_Impl.cxx	29 Oct 2007 15:28:37 -0000	1.21
+++ openoffice.org/writerfilter/source/dmapper/DomainMapper_Impl.cxx	15 Feb 2008 05:16:48 -0000
@@ -1027,7 +1027,11 @@
     CHARS_CYRILLIC_UPPER_LETTER_RU
     CHARS_CYRILLIC_LOWER_LETTER_RU
     CHARS_CYRILLIC_UPPER_LETTER_N_RU
-    CHARS_CYRILLIC_LOWER_LETTER_N_RU*/
+    CHARS_CYRILLIC_LOWER_LETTER_N_RU
+    CHARS_CYRILLIC_UPPER_LETTER_SR
+    CHARS_CYRILLIC_LOWER_LETTER_SR
+    CHARS_CYRILLIC_UPPER_LETTER_N_SR
+    CHARS_CYRILLIC_LOWER_LETTER_N_SR*/
 
         };
         for( sal_uInt32 nNum = 0; nNum < sizeof(aNumberingPairs)/sizeof( NumberingPairs ); ++nNum)
Index: sh_RS.xml
===================================================================
RCS file: /cvs/l10n/i18npool/source/localedata/data/sh_RS.xml,v
retrieving revision 1.2
diff -u -r1.2 sh_RS.xml
--- openoffice.org.orig/i18npool/source/localedata/data/sh_RS.xml	13 Nov 2007 14:35:55 -0000	1.2
+++ openoffice.org/i18npool/source/localedata/data/sh_RS.xml	31 Mar 2008 17:33:14 -0000
@@ -210,72 +224,6 @@
       <quarter4Abbreviation>K4</quarter4Abbreviation>
     </ReservedWords>
   </LC_MISC>
-  <LC_NumberingLevel>
-    <NumberingLevel NumType="4" Prefix=" " Suffix=")"/>
-    <NumberingLevel NumType="4" Prefix=" " Suffix="."/>
-    <NumberingLevel NumType="4" Prefix="(" Suffix="."/>
-    <NumberingLevel NumType="2" Prefix=" " Suffix="."/>
-    <NumberingLevel NumType="0" Prefix=" " Suffix=")"/>
-    <NumberingLevel NumType="1" Prefix=" " Suffix=")"/>
-    <NumberingLevel NumType="1" Prefix="(" Suffix=")"/>
-    <NumberingLevel NumType="3" Prefix=" " Suffix="."/>
-  </LC_NumberingLevel>
-  <LC_OutLineNumberingLevel>
-    <OutlineStyle>
-      <OutLineNumberingLevel Prefix=" " NumType="4" Suffix="." BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="0" SymbolTextDistance="50" FirstLineOffset="0"/>
-      <OutLineNumberingLevel Prefix=" " NumType="4" Suffix="." BulletChar="0020" BulletFontName="" ParentNumbering="1" LeftMargin="50" SymbolTextDistance="50" FirstLineOffset="0"/>
-      <OutLineNumberingLevel Prefix=" " NumType="1" Suffix=")" BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="100" SymbolTextDistance="50" FirstLineOffset="0"/>
-      <OutLineNumberingLevel Prefix=" " NumType="6" Suffix=" " BulletChar="2022" BulletFontName="StarSymbol" ParentNumbering="0" LeftMargin="150" SymbolTextDistance="50" FirstLineOffset="0"/>
-      <OutLineNumberingLevel Prefix=" " NumType="6" Suffix=" " BulletChar="2022" BulletFontName="StarSymbol" ParentNumbering="0" LeftMargin="200" SymbolTextDistance="50" FirstLineOffset="0"/>
-    </OutlineStyle>
-    <OutlineStyle>
-      <OutLineNumberingLevel Prefix=" " NumType="4" Suffix="." BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="0" SymbolTextDistance="50" FirstLineOffset="0"/>
-      <OutLineNumberingLevel Prefix=" " NumType="1" Suffix=")" BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="50" SymbolTextDistance="50" FirstLineOffset="0"/>
-      <OutLineNumberingLevel Prefix=" " NumType="6" Suffix=" " BulletChar="2022" BulletFontName="StarSymbol" ParentNumbering="0" LeftMargin="100" SymbolTextDistance="50" FirstLineOffset="0"/>
-      <OutLineNumberingLevel Prefix=" " NumType="6" Suffix=" " BulletChar="2022" BulletFontName="StarSymbol" ParentNumbering="0" LeftMargin="150" SymbolTextDistance="50" FirstLineOffset="0"/>
-      <OutLineNumberingLevel Prefix=" " NumType="6" Suffix=" " BulletChar="2022" BulletFontName="StarSymbol" ParentNumbering="0" LeftMargin="200" SymbolTextDistance="50" FirstLineOffset="0"/>
-    </OutlineStyle>
-    <OutlineStyle>
-      <OutLineNumberingLevel Prefix=" " NumType="4" Suffix="." BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="0" SymbolTextDistance="50" FirstLineOffset="0"/>
-      <OutLineNumberingLevel Prefix="(" NumType="1" Suffix=")" BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="50" SymbolTextDistance="50" FirstLineOffset="0"/>
-      <OutLineNumberingLevel Prefix=" " NumType="3" Suffix="." BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="100" SymbolTextDistance="50" FirstLineOffset="0"/>
-      <OutLineNumberingLevel Prefix=" " NumType="0" Suffix="." BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="150" SymbolTextDistance="50" FirstLineOffset="0"/>
-      <OutLineNumberingLevel Prefix=" " NumType="6" Suffix="." BulletChar="2022" BulletFontName="StarSymbol" ParentNumbering="0" LeftMargin="200" SymbolTextDistance="50" FirstLineOffset="0"/>
-    </OutlineStyle>
-    <OutlineStyle>
-      <OutLineNumberingLevel Prefix=" " NumType="4" Suffix="." BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="0" SymbolTextDistance="50" FirstLineOffset="0"/>
-      <OutLineNumberingLevel Prefix=" " NumType="4" Suffix="." BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="50" SymbolTextDistance="50" FirstLineOffset="0"/>
-      <OutLineNumberingLevel Prefix=" " NumType="4" Suffix="." BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="100" SymbolTextDistance="50" FirstLineOffset="0"/>
-      <OutLineNumberingLevel Prefix=" " NumType="4" Suffix="." BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="150" SymbolTextDistance="50" FirstLineOffset="0"/>
-      <OutLineNumberingLevel Prefix=" " NumType="4" Suffix="." BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="200" SymbolTextDistance="50" FirstLineOffset="0"/>
-    </OutlineStyle>
-    <OutlineStyle>
-      <OutLineNumberingLevel Prefix=" " NumType="2" Suffix="." BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="0" SymbolTextDistance="50" FirstLineOffset="0"/>
-      <OutLineNumberingLevel Prefix=" " NumType="0" Suffix="." BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="50" SymbolTextDistance="50" FirstLineOffset="0"/>
-      <OutLineNumberingLevel Prefix=" " NumType="3" Suffix="." BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="100" SymbolTextDistance="50" FirstLineOffset="0"/>
-      <OutLineNumberingLevel Prefix=" " NumType="1" Suffix=")" BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="150" SymbolTextDistance="50" FirstLineOffset="0"/>
-      <OutLineNumberingLevel Prefix=" " NumType="6" Suffix=" " BulletChar="2022" BulletFontName="StarSymbol" ParentNumbering="0" LeftMargin="200" SymbolTextDistance="50" FirstLineOffset="0"/>
-    </OutlineStyle>
-    <OutlineStyle>
-      <OutLineNumberingLevel Prefix=" " NumType="0" Suffix="." BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="0" SymbolTextDistance="50" FirstLineOffset="0"/>
-      <OutLineNumberingLevel Prefix=" " NumType="2" Suffix="." BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="50" SymbolTextDistance="50" FirstLineOffset="0"/>
-      <OutLineNumberingLevel Prefix=" " NumType="1" Suffix="." BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="100" SymbolTextDistance="50" FirstLineOffset="0"/>
-      <OutLineNumberingLevel Prefix=" " NumType="3" Suffix="." BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="150" SymbolTextDistance="50" FirstLineOffset="0"/>
-      <OutLineNumberingLevel Prefix=" " NumType="6" Suffix=" " BulletChar="2022" BulletFontName="StarSymbol" ParentNumbering="0" LeftMargin="200" SymbolTextDistance="50" FirstLineOffset="0"/>
-    </OutlineStyle>
-    <OutlineStyle>
-      <OutLineNumberingLevel Prefix=" " NumType="4" Suffix=" " BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="0" SymbolTextDistance="50" FirstLineOffset="0"/>
-      <OutLineNumberingLevel Prefix=" " NumType="4" Suffix=" " BulletChar="0020" BulletFontName="" ParentNumbering="1" LeftMargin="50" SymbolTextDistance="50" FirstLineOffset="0"/>
-      <OutLineNumberingLevel Prefix=" " NumType="4" Suffix=" " BulletChar="0020" BulletFontName="" ParentNumbering="2" LeftMargin="100" SymbolTextDistance="50" FirstLineOffset="0"/>
-      <OutLineNumberingLevel Prefix=" " NumType="4" Suffix=" " BulletChar="0020" BulletFontName="" ParentNumbering="3" LeftMargin="150" SymbolTextDistance="50" FirstLineOffset="0"/>
-      <OutLineNumberingLevel Prefix=" " NumType="4" Suffix=" " BulletChar="0020" BulletFontName="" ParentNumbering="4" LeftMargin="200" SymbolTextDistance="50" FirstLineOffset="0"/>
-    </OutlineStyle>
-    <OutlineStyle>
-      <OutLineNumberingLevel Prefix=" " NumType="6" Suffix=" " BulletChar="27A2" BulletFontName="StarSymbol" ParentNumbering="0" LeftMargin="0" SymbolTextDistance="50" FirstLineOffset="0"/>
-      <OutLineNumberingLevel Prefix=" " NumType="6" Suffix=" " BulletChar="E006" BulletFontName="StarSymbol" ParentNumbering="0" LeftMargin="50" SymbolTextDistance="50" FirstLineOffset="0"/>
-      <OutLineNumberingLevel Prefix=" " NumType="6" Suffix=")" BulletChar="E004" BulletFontName="StarSymbol" ParentNumbering="0" LeftMargin="100" SymbolTextDistance="50" FirstLineOffset="0"/>
-      <OutLineNumberingLevel Prefix=" " NumType="6" Suffix=" " BulletChar="2022" BulletFontName="StarSymbol" ParentNumbering="0" LeftMargin="150" SymbolTextDistance="50" FirstLineOffset="0"/>
-      <OutLineNumberingLevel Prefix=" " NumType="6" Suffix=" " BulletChar="2022" BulletFontName="StarSymbol" ParentNumbering="0" LeftMargin="200" SymbolTextDistance="50" FirstLineOffset="0"/>
-    </OutlineStyle>
-  </LC_OutLineNumberingLevel>
+  <LC_NumberingLevel ref="sr_RS"/>
+  <LC_OutLineNumberingLevel ref="sr_RS"/>
 </Locale>
Index: sr_RS.xml
===================================================================
RCS file: /cvs/l10n/i18npool/source/localedata/data/sr_RS.xml,v
retrieving revision 1.2
diff -u -r1.2 sr_RS.xml
--- openoffice.org.orig/i18npool/source/localedata/data/sr_RS.xml	13 Nov 2007 14:37:09 -0000	1.2
+++ openoffice.org/i18npool/source/localedata/data/sr_RS.xml	31 Mar 2008 17:33:19 -0000
@@ -350,35 +364,35 @@
     </ReservedWords>
   </LC_MISC>
   <LC_NumberingLevel>
-    <NumberingLevel NumType="4" Prefix=" " Suffix=")"/>
     <NumberingLevel NumType="4" Prefix=" " Suffix="."/>
-    <NumberingLevel NumType="4" Prefix="(" Suffix="."/>
-    <NumberingLevel NumType="2" Prefix=" " Suffix="."/>
+    <NumberingLevel NumType="4" Prefix=" " Suffix=")"/>
+    <NumberingLevel NumType="2" Prefix=" " Suffix=""/>
+    <NumberingLevel NumType="3" Prefix=" " Suffix=""/>
+    <NumberingLevel NumType="47" Prefix=" " Suffix=")"/>
+    <NumberingLevel NumType="48" Prefix=" " Suffix=")"/>
     <NumberingLevel NumType="0" Prefix=" " Suffix=")"/>
     <NumberingLevel NumType="1" Prefix=" " Suffix=")"/>
-    <NumberingLevel NumType="1" Prefix="(" Suffix=")"/>
-    <NumberingLevel NumType="3" Prefix=" " Suffix="."/>
   </LC_NumberingLevel>
   <LC_OutLineNumberingLevel>
     <OutlineStyle>
       <OutLineNumberingLevel Prefix=" " NumType="4" Suffix="." BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="0" SymbolTextDistance="50" FirstLineOffset="0"/>
       <OutLineNumberingLevel Prefix=" " NumType="4" Suffix="." BulletChar="0020" BulletFontName="" ParentNumbering="1" LeftMargin="50" SymbolTextDistance="50" FirstLineOffset="0"/>
-      <OutLineNumberingLevel Prefix=" " NumType="1" Suffix=")" BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="100" SymbolTextDistance="50" FirstLineOffset="0"/>
+      <OutLineNumberingLevel Prefix=" " NumType="48" Suffix=")" BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="100" SymbolTextDistance="50" FirstLineOffset="0"/>
       <OutLineNumberingLevel Prefix=" " NumType="6" Suffix=" " BulletChar="2022" BulletFontName="StarSymbol" ParentNumbering="0" LeftMargin="150" SymbolTextDistance="50" FirstLineOffset="0"/>
       <OutLineNumberingLevel Prefix=" " NumType="6" Suffix=" " BulletChar="2022" BulletFontName="StarSymbol" ParentNumbering="0" LeftMargin="200" SymbolTextDistance="50" FirstLineOffset="0"/>
     </OutlineStyle>
     <OutlineStyle>
       <OutLineNumberingLevel Prefix=" " NumType="4" Suffix="." BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="0" SymbolTextDistance="50" FirstLineOffset="0"/>
-      <OutLineNumberingLevel Prefix=" " NumType="1" Suffix=")" BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="50" SymbolTextDistance="50" FirstLineOffset="0"/>
+      <OutLineNumberingLevel Prefix=" " NumType="48" Suffix=")" BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="50" SymbolTextDistance="50" FirstLineOffset="0"/>
       <OutLineNumberingLevel Prefix=" " NumType="6" Suffix=" " BulletChar="2022" BulletFontName="StarSymbol" ParentNumbering="0" LeftMargin="100" SymbolTextDistance="50" FirstLineOffset="0"/>
       <OutLineNumberingLevel Prefix=" " NumType="6" Suffix=" " BulletChar="2022" BulletFontName="StarSymbol" ParentNumbering="0" LeftMargin="150" SymbolTextDistance="50" FirstLineOffset="0"/>
       <OutLineNumberingLevel Prefix=" " NumType="6" Suffix=" " BulletChar="2022" BulletFontName="StarSymbol" ParentNumbering="0" LeftMargin="200" SymbolTextDistance="50" FirstLineOffset="0"/>
     </OutlineStyle>
     <OutlineStyle>
       <OutLineNumberingLevel Prefix=" " NumType="4" Suffix="." BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="0" SymbolTextDistance="50" FirstLineOffset="0"/>
-      <OutLineNumberingLevel Prefix="(" NumType="1" Suffix=")" BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="50" SymbolTextDistance="50" FirstLineOffset="0"/>
+      <OutLineNumberingLevel Prefix="(" NumType="48" Suffix=")" BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="50" SymbolTextDistance="50" FirstLineOffset="0"/>
       <OutLineNumberingLevel Prefix=" " NumType="3" Suffix="." BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="100" SymbolTextDistance="50" FirstLineOffset="0"/>
-      <OutLineNumberingLevel Prefix=" " NumType="0" Suffix="." BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="150" SymbolTextDistance="50" FirstLineOffset="0"/>
+      <OutLineNumberingLevel Prefix=" " NumType="47" Suffix="." BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="150" SymbolTextDistance="50" FirstLineOffset="0"/>
       <OutLineNumberingLevel Prefix=" " NumType="6" Suffix="." BulletChar="2022" BulletFontName="StarSymbol" ParentNumbering="0" LeftMargin="200" SymbolTextDistance="50" FirstLineOffset="0"/>
     </OutlineStyle>
     <OutlineStyle>
@@ -390,13 +404,13 @@
     </OutlineStyle>
     <OutlineStyle>
       <OutLineNumberingLevel Prefix=" " NumType="2" Suffix="." BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="0" SymbolTextDistance="50" FirstLineOffset="0"/>
-      <OutLineNumberingLevel Prefix=" " NumType="0" Suffix="." BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="50" SymbolTextDistance="50" FirstLineOffset="0"/>
+      <OutLineNumberingLevel Prefix=" " NumType="47" Suffix="." BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="50" SymbolTextDistance="50" FirstLineOffset="0"/>
       <OutLineNumberingLevel Prefix=" " NumType="3" Suffix="." BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="100" SymbolTextDistance="50" FirstLineOffset="0"/>
-      <OutLineNumberingLevel Prefix=" " NumType="1" Suffix=")" BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="150" SymbolTextDistance="50" FirstLineOffset="0"/>
+      <OutLineNumberingLevel Prefix=" " NumType="48" Suffix=")" BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="150" SymbolTextDistance="50" FirstLineOffset="0"/>
       <OutLineNumberingLevel Prefix=" " NumType="6" Suffix=" " BulletChar="2022" BulletFontName="StarSymbol" ParentNumbering="0" LeftMargin="200" SymbolTextDistance="50" FirstLineOffset="0"/>
     </OutlineStyle>
     <OutlineStyle>
-      <OutLineNumberingLevel Prefix=" " NumType="0" Suffix="." BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="0" SymbolTextDistance="50" FirstLineOffset="0"/>
+      <OutLineNumberingLevel Prefix=" " NumType="47" Suffix="." BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="0" SymbolTextDistance="50" FirstLineOffset="0"/>
       <OutLineNumberingLevel Prefix=" " NumType="2" Suffix="." BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="50" SymbolTextDistance="50" FirstLineOffset="0"/>
       <OutLineNumberingLevel Prefix=" " NumType="1" Suffix="." BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="100" SymbolTextDistance="50" FirstLineOffset="0"/>
       <OutLineNumberingLevel Prefix=" " NumType="3" Suffix="." BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="150" SymbolTextDistance="50" FirstLineOffset="0"/>

workspace.mba31issues01.patch:

--- NEW FILE workspace.mba31issues01.patch ---
Index: source/appl/appopen.cxx
===================================================================
RCS file: /cvs/framework/sfx2/source/appl/appopen.cxx,v
retrieving revision 1.116
diff -u -r1.116 appopen.cxx
--- openoffice.org.orig/sfx2/source/appl/appopen.cxx	26 Nov 2007 16:46:28 -0000	1.116
+++ openoffice.org/sfx2/source/appl/appopen.cxx	27 Mar 2008 09:17:09 -0000
@@ -1206,32 +1206,13 @@
 													::rtl::OUString::createFromAscii( "com.sun.star.system.SystemShellExecute" )), UNO_QUERY );
 				if ( xSystemShellExecute.is() )
 				{
-					if ( aINetProtocol == INET_PROT_FTP ||
-						 aINetProtocol == INET_PROT_HTTP ||
-						 aINetProtocol == INET_PROT_HTTPS )
+					if ( aINetProtocol == INET_PROT_MAILTO )
 					{
-						try
-						{
-							// start browser
-							::rtl::OUString aURLString( aURL.Complete );
-							xSystemShellExecute->execute( aURLString, ::rtl::OUString(), SystemShellExecuteFlags::DEFAULTS );
-						}
-						catch ( ::com::sun::star::lang::IllegalArgumentException& )
-						{
-							vos::OGuard aGuard( Application::GetSolarMutex() );
-                            Window *pWindow = SFX_APP()->GetTopWindow();
-							ErrorBox( pWindow, SfxResId( MSG_ERR_NO_WEBBROWSER_FOUND )).Execute();
-						}
-						catch ( ::com::sun::star::system::SystemShellExecuteException& )
-						{
-							vos::OGuard aGuard( Application::GetSolarMutex() );
-                            Window *pWindow = SFX_APP()->GetTopWindow();
-							ErrorBox( pWindow, SfxResId( MSG_ERR_NO_WEBBROWSER_FOUND )).Execute();
-						}
-
-						return;
+						// don't dispatch mailto hyperlink to desktop dispatcher
+						rReq.RemoveItem( SID_TARGETNAME );
+						rReq.AppendItem( SfxStringItem( SID_TARGETNAME, String::CreateFromAscii("_self") ) );
 					}
-					else if ( aINetProtocol == INET_PROT_FILE )
+					else if ( aINetProtocol != INET_PROT_VND_SUN_STAR_HELP )
 					{
 						BOOL bLoadInternal = FALSE;
 
@@ -1276,12 +1257,6 @@
 						if ( !bLoadInternal )
 							return;
 					}
-					else if ( aINetProtocol == INET_PROT_MAILTO )
-					{
-						// don't dispatch mailto hyperlink to desktop dispatcher
-						rReq.RemoveItem( SID_TARGETNAME );
-						rReq.AppendItem( SfxStringItem( SID_TARGETNAME, String::CreateFromAscii("_self") ) );
-					}
 				}
 			}
 			else

workspace.mhu17.patch:

--- NEW FILE workspace.mhu17.patch ---
Index: alloc_cache.h
===================================================================
RCS file: /cvs/porting/sal/rtl/source/alloc_cache.h,v
retrieving revision 1.3
retrieving revision 1.3.50.1
diff -u -r1.3 -r1.3.50.1
--- openoffice.org.orig/sal/rtl/source/alloc_cache.h	10 Apr 2008 12:01:34 -0000	1.3
+++ openoffice.org/sal/rtl/source/alloc_cache.h	6 Oct 2008 10:43:46 -0000	1.3.50.1
@@ -86,7 +86,7 @@
 /** rtl_cache_magazine_type
  *  @internal
  */
-#define RTL_CACHE_MAGAZINE_SIZE 64
+#define RTL_CACHE_MAGAZINE_SIZE 61
 
 typedef struct rtl_cache_magazine_st rtl_cache_magazine_type;
 struct rtl_cache_magazine_st

workspace.sb101.patch:

--- NEW FILE workspace.sb101.patch ---
Index: source/loader/pythonloader.py
===================================================================
RCS file: /cvs/udk/pyuno/source/loader/pythonloader.py,v
retrieving revision 1.7
diff -u -r1.7 pythonloader.py
--- openoffice.org.orig/pyuno/source/loader/pythonloader.py	20 May 2008 14:32:42 -0000	1.7
+++ openoffice.org/pyuno/source/loader/pythonloader.py	6 Nov 2008 08:35:03 -0000
@@ -38,7 +38,7 @@
 from com.sun.star.lang import XServiceInfo
 
 MODULE_PROTOCOL = "vnd.openoffice.pymodule:"
-DEBUG = 1
+DEBUG = 0
 
 g_supportedServices  = "com.sun.star.loader.Python",      # referenced by the native C++ loader !
 g_implementationName = "org.openoffice.comp.pyuno.Loader" # referenced by the native C++ loader !

workspace.selinux01.patch:

--- NEW FILE workspace.selinux01.patch ---
Index: source/cpp_uno/gcc3_linux_ia64/cpp2uno.cxx
===================================================================
--- openoffice.org.orig/bridges/source/cpp_uno/gcc3_linux_ia64/cpp2uno.cxx	(revision 265903)
+++ openoffice.org/bridges/source/cpp_uno/gcc3_linux_ia64/cpp2uno.cxx	(working copy)
@@ -575,7 +575,7 @@
 {
 const int codeSnippetSize = 40;
 
-bridges::cpp_uno::shared::VtableFactory::Slot codeSnippet( unsigned char * code, sal_Int32 nFunctionIndex, sal_Int32 nVtableOffset, 
+bridges::cpp_uno::shared::VtableFactory::Slot codeSnippet( unsigned char * code, sal_PtrDiff writetoexecdiff, sal_Int32 nFunctionIndex, sal_Int32 nVtableOffset, 
                               bool bHasHiddenParam )
 {
 #ifdef CMC_DEBUG
@@ -598,7 +598,7 @@
     raw[2] = nOffsetAndIndex;
     raw[3] = destination->gp_value;
 
-    return *(bridges::cpp_uno::shared::VtableFactory::Slot*)(code);
+    return *(bridges::cpp_uno::shared::VtableFactory::Slot*)(code+writetoexecdiff);
 }
 }
 
@@ -628,7 +628,7 @@
 }
 
 unsigned char * bridges::cpp_uno::shared::VtableFactory::addLocalFunctions(
-    Slot ** in_slots, unsigned char * code,
+    Slot ** in_slots, unsigned char * code, sal_PtrDiff writetoexecdiff,
     typelib_InterfaceTypeDescription const * type, sal_Int32 functionOffset,
     sal_Int32 functionCount, sal_Int32 vtableOffset)
 {
@@ -647,7 +647,7 @@
         case typelib_TypeClass_INTERFACE_ATTRIBUTE:
             // Getter:
             *slots++ = codeSnippet(
-                code, functionOffset++, vtableOffset,
+                code, writetoexecdiff, functionOffset++, vtableOffset,
                 ia64::return_in_hidden_param(
                     reinterpret_cast<
                     typelib_InterfaceAttributeTypeDescription * >(
@@ -660,14 +660,14 @@
                 typelib_InterfaceAttributeTypeDescription * >(
                     member)->bReadOnly)
             {
-                *slots++ = codeSnippet(code, functionOffset++, vtableOffset, false);
+                *slots++ = codeSnippet(code, writetoexecdiff, functionOffset++, vtableOffset, false);
             	code += codeSnippetSize;
             }
             break;
 
         case typelib_TypeClass_INTERFACE_METHOD:
             *slots++ = codeSnippet(
-                code, functionOffset++, vtableOffset,
+                code, writetoexecdiff, functionOffset++, vtableOffset,
                 ia64::return_in_hidden_param(
                     reinterpret_cast<
                     typelib_InterfaceMethodTypeDescription * >(
Index: source/cpp_uno/gcc3_linux_mips/cpp2uno.cxx
===================================================================
--- openoffice.org.orig/bridges/source/cpp_uno/gcc3_linux_mips/cpp2uno.cxx	(revision 265903)
+++ openoffice.org/bridges/source/cpp_uno/gcc3_linux_mips/cpp2uno.cxx	(working copy)
@@ -747,7 +747,7 @@
 }
 
 unsigned char * bridges::cpp_uno::shared::VtableFactory::addLocalFunctions(
-	Slot ** slots, unsigned char * code,
+	Slot ** slots, unsigned char * code, sal_PtrDiff writetoexecdiff,
 	typelib_InterfaceTypeDescription const * type, sal_Int32 functionOffset,
 	sal_Int32 functionCount, sal_Int32 vtableOffset)
 {
@@ -767,7 +767,7 @@
 	switch (member->eTypeClass) {
 	  case typelib_TypeClass_INTERFACE_ATTRIBUTE:
 		// Getter:
-		(s++)->fn = code;
+		(s++)->fn = code + writetoexecdiff;
 		code = codeSnippet(
 			code, functionOffset++, vtableOffset,
 			bridges::cpp_uno::shared::isSimpleType(
@@ -780,13 +780,13 @@
 			typelib_InterfaceAttributeTypeDescription * >(
 			  member)->bReadOnly)
 		{
-		  (s++)->fn = code;
+		  (s++)->fn = code + writetoexecdiff;
 		  code = codeSnippet(code, functionOffset++, vtableOffset, true);
 		}
 		break;
 
 	  case typelib_TypeClass_INTERFACE_METHOD:
-		(s++)->fn = code;
+		(s++)->fn = code + writetoexecdiff;
 		code = codeSnippet(
 			code, functionOffset++, vtableOffset,
 			bridges::cpp_uno::shared::isSimpleType(
Index: source/cpp_uno/gcc3_linux_sparc/cpp2uno.cxx
===================================================================
--- openoffice.org.orig/bridges/source/cpp_uno/gcc3_linux_sparc/cpp2uno.cxx	(revision 265903)
+++ openoffice.org/bridges/source/cpp_uno/gcc3_linux_sparc/cpp2uno.cxx	(working copy)
@@ -513,7 +513,7 @@
 }
 
 unsigned char * bridges::cpp_uno::shared::VtableFactory::addLocalFunctions(
-    Slot ** slots, unsigned char * code,
+    Slot ** slots, unsigned char * code, sal_PtrDiff writetoexecdiff,
     typelib_InterfaceTypeDescription const * type, sal_Int32 functionOffset,
     sal_Int32 functionCount, sal_Int32 vTableOffset)
 {
@@ -526,7 +526,7 @@
         switch (member->eTypeClass) {
         case typelib_TypeClass_INTERFACE_ATTRIBUTE:
             // Getter:
-            (s++)->fn = code;
+            (s++)->fn = code + writetoexecdiff;
             code = codeSnippet(
                 code, functionOffset++, vTableOffset,
                 bridges::cpp_uno::shared::isSimpleType(
@@ -538,13 +538,13 @@
                 typelib_InterfaceAttributeTypeDescription * >(
                     member)->bReadOnly)
             {
-                (s++)->fn = code;
+                (s++)->fn = code + writetoexecdiff;
                 code = codeSnippet(code, functionOffset++, vTableOffset, true);
             }
             break;
 
         case typelib_TypeClass_INTERFACE_METHOD:
-            (s++)->fn = code;
+            (s++)->fn = code + writetoexecdiff;
             code = codeSnippet(
                 code, functionOffset++, vTableOffset,
                 bridges::cpp_uno::shared::isSimpleType(
Index: source/cpp_uno/gcc3_linux_intel/cpp2uno.cxx
===================================================================
--- openoffice.org.orig/bridges/source/cpp_uno/gcc3_linux_intel/cpp2uno.cxx	(revision 265903)
+++ openoffice.org/bridges/source/cpp_uno/gcc3_linux_intel/cpp2uno.cxx	(working copy)
@@ -362,7 +362,7 @@
 int const codeSnippetSize = 16;
 
 unsigned char * codeSnippet(
-    unsigned char * code, sal_Int32 functionIndex, sal_Int32 vtableOffset,
+    unsigned char * code, sal_PtrDiff writetoexecdiff, sal_Int32 functionIndex, sal_Int32 vtableOffset,
     typelib_TypeClass returnTypeClass)
 {
     if (!bridges::cpp_uno::shared::isSimpleType(returnTypeClass)) {
@@ -408,7 +408,7 @@
     // jmp privateSnippetExecutor:
     *p++ = 0xE9;
     *reinterpret_cast< sal_Int32 * >(p)
-        = ((unsigned char *) exec) - p - sizeof (sal_Int32);
+        = ((unsigned char *) exec) - p - sizeof (sal_Int32) - writetoexecdiff;
     p += sizeof (sal_Int32);
     OSL_ASSERT(p - code <= codeSnippetSize);
     return code + codeSnippetSize;
@@ -440,7 +440,7 @@
 }
 
 unsigned char * bridges::cpp_uno::shared::VtableFactory::addLocalFunctions(
-    Slot ** slots, unsigned char * code,
+    Slot ** slots, unsigned char * code, sal_PtrDiff writetoexecdiff,
     typelib_InterfaceTypeDescription const * type, sal_Int32 functionOffset,
     sal_Int32 functionCount, sal_Int32 vtableOffset)
 {
@@ -453,9 +453,9 @@
         switch (member->eTypeClass) {
         case typelib_TypeClass_INTERFACE_ATTRIBUTE:
             // Getter:
-            (s++)->fn = code;
+            (s++)->fn = code + writetoexecdiff;
             code = codeSnippet(
-                code, functionOffset++, vtableOffset,
+                code, writetoexecdiff, functionOffset++, vtableOffset,
                 reinterpret_cast< typelib_InterfaceAttributeTypeDescription * >(
                     member)->pAttributeTypeRef->eTypeClass);
             // Setter:
@@ -463,17 +463,17 @@
                 typelib_InterfaceAttributeTypeDescription * >(
                     member)->bReadOnly)
             {
-                (s++)->fn = code;
+                (s++)->fn = code + writetoexecdiff;
                 code = codeSnippet(
-                    code, functionOffset++, vtableOffset,
+                    code, writetoexecdiff, functionOffset++, vtableOffset,
                     typelib_TypeClass_VOID);
             }
             break;
 
         case typelib_TypeClass_INTERFACE_METHOD:
-            (s++)->fn = code;
+            (s++)->fn = code + writetoexecdiff;
             code = codeSnippet(
-                code, functionOffset++, vtableOffset,
+                code, writetoexecdiff, functionOffset++, vtableOffset,
                 reinterpret_cast< typelib_InterfaceMethodTypeDescription * >(
                     member)->pReturnTypeRef->eTypeClass);
             break;
Index: source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx
===================================================================
--- openoffice.org.orig/bridges/source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx	(revision 265903)
+++ openoffice.org/bridges/source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx	(working copy)
@@ -489,7 +489,7 @@
 //==================================================================================================
 
 unsigned char * bridges::cpp_uno::shared::VtableFactory::addLocalFunctions(
-	Slot ** slots, unsigned char * code,
+	Slot ** slots, unsigned char * code, sal_PtrDiff writetoexecdiff,
 	typelib_InterfaceTypeDescription const * type, sal_Int32 nFunctionOffset,
 	sal_Int32 functionCount, sal_Int32 nVtableOffset )
 {
@@ -508,14 +508,14 @@
 				reinterpret_cast<typelib_InterfaceAttributeTypeDescription *>( pTD );
 
 			// get method
-			(s++)->fn = code;
+			(s++)->fn = code + writetoexecdiff;
 			code = codeSnippet( code, nFunctionOffset++, nVtableOffset,
 								x86_64::return_in_hidden_param( pAttrTD->pAttributeTypeRef ) );
 
 			if ( ! pAttrTD->bReadOnly )
 			{
 				// set method
-				(s++)->fn = code;
+				(s++)->fn = code + writetoexecdiff;
 				code = codeSnippet( code, nFunctionOffset++, nVtableOffset, false );
 			}
 		}
@@ -524,7 +524,7 @@
 			typelib_InterfaceMethodTypeDescription *pMethodTD =
 				reinterpret_cast<typelib_InterfaceMethodTypeDescription *>( pTD );
 			
-			(s++)->fn = code;
+			(s++)->fn = code + writetoexecdiff;
 			code = codeSnippet( code, nFunctionOffset++, nVtableOffset,
 								x86_64::return_in_hidden_param( pMethodTD->pReturnTypeRef ) );
 		}
Index: source/cpp_uno/gcc3_linux_arm/cpp2uno.cxx
===================================================================
--- openoffice.org.orig/bridges/source/cpp_uno/gcc3_linux_arm/cpp2uno.cxx	(revision 265903)
+++ openoffice.org/bridges/source/cpp_uno/gcc3_linux_arm/cpp2uno.cxx	(working copy)
@@ -467,7 +467,7 @@
 }
 
 unsigned char * bridges::cpp_uno::shared::VtableFactory::addLocalFunctions(
-    Slot ** slots, unsigned char * code,
+    Slot ** slots, unsigned char * code, sal_PtrDiff writetoexecdiff,
     typelib_InterfaceTypeDescription const * type, sal_Int32 functionOffset,
     sal_Int32 functionCount, sal_Int32 vtableOffset)
 {
@@ -482,7 +482,7 @@
         {
             case typelib_TypeClass_INTERFACE_ATTRIBUTE:
                 // Getter:
-                (s++)->fn = code;
+                (s++)->fn = code + writetoexecdiff;
                 code = codeSnippet(
                     code, functionOffset++, vtableOffset,
                     bridges::cpp_uno::shared::isSimpleType(
@@ -494,14 +494,14 @@
                     typelib_InterfaceAttributeTypeDescription * >(
                         member)->bReadOnly)
                 {
-                    (s++)->fn = code;
+                    (s++)->fn = code + writetoexecdiff;
                     code = codeSnippet(
                         code, functionOffset++, vtableOffset, true);
                 }
                 break;
             case typelib_TypeClass_INTERFACE_METHOD:
             {
-                (s++)->fn = code;
+                (s++)->fn = code + writetoexecdiff;
 
                 typelib_InterfaceMethodTypeDescription *pMethodTD = 
                     reinterpret_cast<
Index: source/cpp_uno/gcc3_linux_powerpc/cpp2uno.cxx
===================================================================
--- openoffice.org.orig/bridges/source/cpp_uno/gcc3_linux_powerpc/cpp2uno.cxx	(revision 265903)
+++ openoffice.org/bridges/source/cpp_uno/gcc3_linux_powerpc/cpp2uno.cxx	(working copy)
@@ -681,7 +681,7 @@
 }
 
 unsigned char * bridges::cpp_uno::shared::VtableFactory::addLocalFunctions(
-    Slot ** slots, unsigned char * code,
+    Slot ** slots, unsigned char * code, sal_PtrDiff writetoexecdiff,
     typelib_InterfaceTypeDescription const * type, sal_Int32 functionOffset,
     sal_Int32 functionCount, sal_Int32 vtableOffset)
 {
@@ -698,7 +698,7 @@
         switch (member->eTypeClass) {
         case typelib_TypeClass_INTERFACE_ATTRIBUTE:
             // Getter:
-            (s++)->fn = code;
+            (s++)->fn = code + writetoexecdiff;
             code = codeSnippet(
                 code, functionOffset++, vtableOffset,
                 bridges::cpp_uno::shared::isSimpleType(
@@ -711,13 +711,13 @@
                 typelib_InterfaceAttributeTypeDescription * >(
                     member)->bReadOnly)
             {
-                (s++)->fn = code;
+                (s++)->fn = code + writetoexecdiff;
                 code = codeSnippet(code, functionOffset++, vtableOffset, true);
             }
             break;
 
         case typelib_TypeClass_INTERFACE_METHOD:
-            (s++)->fn = code;
+            (s++)->fn = code + writetoexecdiff;
             code = codeSnippet(
                 code, functionOffset++, vtableOffset,
                 bridges::cpp_uno::shared::isSimpleType(
Index: source/cpp_uno/gcc3_linux_m68k/cpp2uno.cxx
===================================================================
--- openoffice.org.orig/bridges/source/cpp_uno/gcc3_linux_m68k/cpp2uno.cxx	(revision 265903)
+++ openoffice.org/bridges/source/cpp_uno/gcc3_linux_m68k/cpp2uno.cxx	(working copy)
@@ -482,7 +482,7 @@
 }
 
 unsigned char * bridges::cpp_uno::shared::VtableFactory::addLocalFunctions(
-    Slot ** slots, unsigned char * code,
+    Slot ** slots, unsigned char * code, sal_PtrDiff writetoexecdiff,
     typelib_InterfaceTypeDescription const * type, sal_Int32 functionOffset,
     sal_Int32 functionCount, sal_Int32 vtableOffset)
 {
@@ -497,20 +497,20 @@
         {
             case typelib_TypeClass_INTERFACE_ATTRIBUTE:
                 // Getter:
-                (s++)->fn = code;
+                (s++)->fn = code + writetoexecdiff;
                 code = codeSnippet(code, functionOffset++, vtableOffset);
                 // Setter:
                 if (!reinterpret_cast<
                     typelib_InterfaceAttributeTypeDescription * >(
                         member)->bReadOnly)
                 {
-                    (s++)->fn = code;
+                    (s++)->fn = code + writetoexecdiff;
                     code = codeSnippet(code, functionOffset++, vtableOffset);
                 }
                 break;
             case typelib_TypeClass_INTERFACE_METHOD:
             {
-                (s++)->fn = code;
+                (s++)->fn = code + writetoexecdiff;
 
                 typelib_InterfaceMethodTypeDescription *pMethodTD = 
                     reinterpret_cast<
Index: source/cpp_uno/gcc3_linux_s390x/cpp2uno.cxx
===================================================================
--- openoffice.org.orig/bridges/source/cpp_uno/gcc3_linux_s390x/cpp2uno.cxx	(revision 265903)
+++ openoffice.org/bridges/source/cpp_uno/gcc3_linux_s390x/cpp2uno.cxx	(working copy)
@@ -597,7 +597,7 @@
 }
 
 unsigned char * bridges::cpp_uno::shared::VtableFactory::addLocalFunctions(
-    Slot ** slots, unsigned char * code, 
+    Slot ** slots, unsigned char * code, sal_PtrDiff writetoexecdiff,
     typelib_InterfaceTypeDescription const * type, sal_Int32 functionOffset,
     sal_Int32 functionCount, sal_Int32 vtableOffset)
 {
@@ -615,7 +615,7 @@
         switch (member->eTypeClass) {
         case typelib_TypeClass_INTERFACE_ATTRIBUTE:
             // Getter:
-            (s++)->fn = code;
+            (s++)->fn = code + writetoexecdiff;
             code = codeSnippet(
                 code, functionOffset++, vtableOffset,
                 bridges::cpp_uno::shared::isSimpleType(
@@ -628,13 +628,13 @@
                 typelib_InterfaceAttributeTypeDescription * >(
                     member)->bReadOnly)
             {
-                (s++)->fn = code;
+                (s++)->fn = code + writetoexecdiff;
                 code = codeSnippet(code, functionOffset++, vtableOffset, true);
             }
             break;
 
         case typelib_TypeClass_INTERFACE_METHOD:
-            (s++)->fn = code;
+            (s++)->fn = code + writetoexecdiff;
             code = codeSnippet(
                 code, functionOffset++, vtableOffset,
                 bridges::cpp_uno::shared::isSimpleType(
Index: source/cpp_uno/shared/vtablefactory.cxx
===================================================================
--- openoffice.org.orig/bridges/source/cpp_uno/shared/vtablefactory.cxx	(revision 265903)
+++ openoffice.org/bridges/source/cpp_uno/shared/vtablefactory.cxx	(working copy)
@@ -42,6 +42,9 @@
 
 #include "bridges/cpp_uno/shared/vtables.hxx"
 
+#include "osl/thread.h"
+#include "osl/security.hxx"
+#include "osl/file.hxx"
 #include "osl/diagnose.h"
 #include "osl/mutex.hxx"
 #include "rtl/alloc.h"
@@ -55,6 +58,7 @@
 
 #if defined SAL_UNX
 #include <unistd.h>
+#include <string.h>
 #include <sys/mman.h>
 #elif defined SAL_W32
 #define WIN32_LEAN_AND_MEAN
@@ -243,9 +247,92 @@
     return i->second;
 }
 
+#ifdef USE_DOUBLE_MMAP
+bool VtableFactory::createBlock(Block &block, sal_Int32 slotCount) const
+{
+    sal_Size size = getBlockSize(slotCount);
+    sal_Size pagesize = sysconf(_SC_PAGESIZE);
+    block.size = (size + (pagesize - 1)) & ~(pagesize - 1);
+    block.start = block.exec = NULL;
+    block.fd = -1;
+
+    osl::Security aSecurity;
+    rtl::OUString strDirectory;
+    rtl::OUString strURLDirectory;
+    if (aSecurity.getHomeDir(strURLDirectory))
+        osl::File::getSystemPathFromFileURL(strURLDirectory, strDirectory);
+
+    for (int i = strDirectory.getLength() == 0 ? 1 : 0; i < 2; ++i)
+    {
+        if (!strDirectory.getLength())
+            strDirectory = rtl::OUString::createFromAscii("/tmp");
+
+        strDirectory += rtl::OUString::createFromAscii("/.execoooXXXXXX");
+        rtl::OString aTmpName = rtl::OUStringToOString(strDirectory, osl_getThreadTextEncoding());
+        char *tmpfname = new char[aTmpName.getLength()+1];
+        strncpy(tmpfname, aTmpName.getStr(), aTmpName.getLength()+1);
+        if ((block.fd = mkstemp(tmpfname)) == -1)
+          perror("creation of executable memory area failed");
+        if (block.fd == -1)
+        {
+            delete[] tmpfname;
+            break;
+        }
+        unlink(tmpfname);
+        delete[] tmpfname;
+        ftruncate(block.fd, block.size);
+        block.start = mmap(NULL, block.size, PROT_READ | PROT_WRITE, MAP_SHARED, block.fd, 0);
+        if (block.start== MAP_FAILED) {
+            block.start = 0;
+        }
+        block.exec = mmap(NULL, block.size, PROT_READ | PROT_EXEC, MAP_SHARED, block.fd, 0);
+        if (block.exec == MAP_FAILED) {
+           block.exec = 0;
+        }
+
+        //All good
+        if (block.start && block.exec && block.fd != -1)
+            break;
+
+        freeBlock(block);
+
+        strDirectory = rtl::OUString();
+    }
+    if (!block.start || !block.exec || block.fd == -1)
+    {
+       fprintf(stderr, "Could not mmap a file for executable memory either in home dir or in /tmp\n");
+       fprintf(stderr, "Falling back to mmapping anonymous memory, this may cause a fatal error on\n");
+       fprintf(stderr, "systems where e.g. SELinux is enabled\n");
+       //Fall back to non-doublemmaped allocation
+       block.fd = -1;
+       block.start = block.exec = rtl_arena_alloc(m_arena, &block.size);
+    }
+    return (block.start != 0 && block.exec != 0);
+}
+
 void VtableFactory::freeBlock(Block const & block) const {
+    //if the double-map failed we were allocated on the arena
+    if (block.fd == -1 && block.start == block.exec && block.start != NULL)
+        rtl_arena_free(m_arena, block.start, block.size);
+    else
+    {
+        if (block.start) munmap(block.start, block.size);
+        if (block.exec) munmap(block.exec, block.size);
+        if (block.fd != -1) close(block.fd);
+    }
+}
+#else
+bool VtableFactory::createBlock(Block &block, sal_Int32 slotCount) const
+{
+    block.size = getBlockSize(slotCount);
+    block.start = rtl_arena_alloc(m_arena, &block.size);
+    return block.start != 0;
+}
+
+void VtableFactory::freeBlock(Block const & block) const {
     rtl_arena_free(m_arena, block.start, block.size);
 }
+#endif
 
 void VtableFactory::createVtables(
     GuardedBlocks & blocks, BaseOffset const & baseOffset,
@@ -255,9 +342,7 @@
         sal_Int32 slotCount
             = bridges::cpp_uno::shared::getPrimaryFunctions(type);
         Block block;
-        block.size = getBlockSize(slotCount);
-        block.start = rtl_arena_alloc(m_arena, &block.size);
-        if (block.start == 0) {
+        if (!createBlock(block, slotCount)) {
             throw std::bad_alloc();
         }
         try {
@@ -270,12 +355,21 @@
                  type2 != 0; type2 = type2->pBaseTypeDescription)
             {
                 code = addLocalFunctions(
-                    &slots, code, type2,
+                    &slots, code,
+#ifdef USE_DOUBLE_MMAP
+                    sal_IntPtr(block.exec) - sal_IntPtr(block.start),
+#endif
+                    type2,
                     baseOffset.getFunctionOffset(type2->aBase.pTypeName),
                     bridges::cpp_uno::shared::getLocalFunctions(type2),
                     vtableOffset);
             }
             flushCode(codeBegin, code);
+#ifdef USE_DOUBLE_MMAP
+	    //Finished generating block, swap writable pointer with executable
+	    //pointer
+            ::std::swap(block.start, block.exec);
+#endif
             blocks.push_back(block);
         } catch (...) {
             freeBlock(block);
Index: source/cpp_uno/gcc3_linux_powerpc64/cpp2uno.cxx
===================================================================
--- openoffice.org.orig/bridges/source/cpp_uno/gcc3_linux_powerpc64/cpp2uno.cxx	(revision 265903)
+++ openoffice.org/bridges/source/cpp_uno/gcc3_linux_powerpc64/cpp2uno.cxx	(working copy)
@@ -667,7 +667,7 @@
 }
 
 unsigned char * bridges::cpp_uno::shared::VtableFactory::addLocalFunctions(
-    Slot ** slots, unsigned char * code, 
+    Slot ** slots, unsigned char * code, sal_PtrDiff writetoexecdiff,
     typelib_InterfaceTypeDescription const * type, sal_Int32 functionOffset,
     sal_Int32 functionCount, sal_Int32 vtableOffset)
 {
@@ -685,7 +685,7 @@
         switch (member->eTypeClass) {
         case typelib_TypeClass_INTERFACE_ATTRIBUTE:
             // Getter:
-            (s++)->fn = code;
+            (s++)->fn = code + writetoexecdiff;
             code = codeSnippet(
                 code, functionOffset++, vtableOffset,
                 bridges::cpp_uno::shared::isSimpleType(
@@ -698,13 +698,13 @@
                 typelib_InterfaceAttributeTypeDescription * >(
                     member)->bReadOnly)
             {
-                (s++)->fn = code;
+                (s++)->fn = code + writetoexecdiff;
                 code = codeSnippet(code, functionOffset++, vtableOffset, true);
             }
             break;
 
         case typelib_TypeClass_INTERFACE_METHOD:
-            (s++)->fn = code;
+            (s++)->fn = code + writetoexecdiff;
             code = codeSnippet(
                 code, functionOffset++, vtableOffset,
                 bridges::cpp_uno::shared::isSimpleType(
Index: source/cpp_uno/gcc3_linux_s390/cpp2uno.cxx
===================================================================
--- openoffice.org.orig/bridges/source/cpp_uno/gcc3_linux_s390/cpp2uno.cxx	(revision 265903)
+++ openoffice.org/bridges/source/cpp_uno/gcc3_linux_s390/cpp2uno.cxx	(working copy)
@@ -640,7 +640,7 @@
 }
 
 unsigned char * bridges::cpp_uno::shared::VtableFactory::addLocalFunctions(
-    Slot ** slots, unsigned char * code,
+    Slot ** slots, unsigned char * code, sal_PtrDiff writetoexecdiff,
     typelib_InterfaceTypeDescription const * type, sal_Int32 functionOffset,
     sal_Int32 functionCount, sal_Int32 vtableOffset)
 {
@@ -658,7 +658,7 @@
         switch (member->eTypeClass) {
         case typelib_TypeClass_INTERFACE_ATTRIBUTE:
             // Getter:
-            (s++)->fn = code;
+            (s++)->fn = code + writetoexecdiff;
             code = codeSnippet(
                 code, functionOffset++, vtableOffset,
                 bridges::cpp_uno::shared::isSimpleType(
@@ -671,13 +671,13 @@
                 typelib_InterfaceAttributeTypeDescription * >(
                     member)->bReadOnly)
             {
-                (s++)->fn = code;
+                (s++)->fn = code + writetoexecdiff;
                 code = codeSnippet(code, functionOffset++, vtableOffset, true);
             }
             break;
 
         case typelib_TypeClass_INTERFACE_METHOD:
-            (s++)->fn = code;
+            (s++)->fn = code + writetoexecdiff;
             code = codeSnippet(
                 code, functionOffset++, vtableOffset,
                 bridges::cpp_uno::shared::isSimpleType(
Index: inc/bridges/cpp_uno/shared/vtablefactory.hxx
===================================================================
--- openoffice.org.orig/bridges/inc/bridges/cpp_uno/shared/vtablefactory.hxx	(revision 265903)
+++ openoffice.org/bridges/inc/bridges/cpp_uno/shared/vtablefactory.hxx	(working copy)
@@ -39,6 +39,11 @@
 
 #include <hash_map>
 
+/*See: http://people.redhat.com/drepper/selinux-mem.html*/
+#ifdef LINUX
+#define USE_DOUBLE_MMAP
+#endif
+
 namespace bridges { namespace cpp_uno { namespace shared {
 
 /** Hand out vtable structures for interface type descriptions.
@@ -63,6 +68,18 @@
          */
         void * start;
 
+#ifdef USE_DOUBLE_MMAP
+	/** When seperately mmapping the block for writing and executing
+            exec points to the same memory as start, except start is used
+            exclusively for writing and exec for executing
+         */
+        void * exec;
+
+	/** File handle for the underlying anonymous file
+         */
+        int fd;
+#endif
+
         /** The size of the raw vtable block, in bytes.
          */
         sal_Size size;
@@ -111,6 +128,8 @@
     VtableFactory(VtableFactory &); // not implemented
     void operator =(VtableFactory); // not implemented
 
+    bool createBlock(Block &block, sal_Int32 slotCount) const;
+
     void freeBlock(Block const & block) const;
 
     void createVtables(
@@ -151,6 +170,9 @@
         given type
         @param code  points to the start of the area where code snippets can be
         generated
+        @param writetoexecdiff when the same code area is mmaped twice, once for
+        writing for code-generation, and once for code-execution, then this
+        records the offset from a writable address to its executable address
         @param type  the interface type description for which to generate vtable
         slots
         @param functionOffset  the function offset of the first vtable slot
@@ -165,6 +187,9 @@
      */
     static unsigned char * addLocalFunctions(
         Slot ** slots, unsigned char * code,
+#ifdef USE_DOUBLE_MMAP
+        sal_PtrDiff writetoexecdiff,
+#endif
         typelib_InterfaceTypeDescription const * type, sal_Int32 functionOffset,
         sal_Int32 functionCount, sal_Int32 vtableOffset);
 

workspace.sw31bf02.patch:

--- NEW FILE workspace.sw31bf02.patch ---
diff -up DEV300_m35/sw/source/core/undo/docundo.cxx.orig DEV300_m35/sw/source/core/undo/docundo.cxx
--- DEV300_m35/sw/source/core/undo/docundo.cxx.orig	2008-11-06 09:55:07.000000000 +0100
+++ DEV300_m35/sw/source/core/undo/docundo.cxx	2008-11-06 09:55:23.000000000 +0100
@@ -747,12 +747,6 @@ SwUndoIdAndName * lcl_GetUndoIdAndName(c
         sStr = pUndo->GetComment();
     }
 
-	if( sStr.Len() > 82 )
-	{
-	    String sTmpStr("...", RTL_TEXTENCODING_ASCII_US);
-		sStr.Erase( 80 );
-		sStr += sTmpStr;
-	}
     return new SwUndoIdAndName(nId, &sStr);
 }
 
diff -up DEV300_m35/sw/source/core/undo/undel.cxx.orig DEV300_m35/sw/source/core/undo/undel.cxx
--- DEV300_m35/sw/source/core/undo/undel.cxx.orig	2008-11-04 10:13:54.000000000 +0100
+++ DEV300_m35/sw/source/core/undo/undel.cxx	2008-11-06 09:55:59.000000000 +0100
@@ -595,6 +595,8 @@ SwRewriter SwUndoDelete::GetRewriter() c
                 aStr = UNDO_ARG2;
             }
         }
+        aStr = ShortenString(aStr, nUndoStringLength,
+                                 String(SW_RES(STR_LDOTS)));
 
         if (pHistory)
         {
@@ -602,11 +604,6 @@ SwRewriter SwUndoDelete::GetRewriter() c
 
             aStr = aRewriter.Apply(aStr);
         }
-        else
-        {
-            aStr = ShortenString(aStr, nUndoStringLength,
-                                 String(SW_RES(STR_LDOTS)));
-        }
 
         aResult.AddRule(UNDO_ARG1, aStr);
     }

workspace.tkr16.patch:

--- NEW FILE workspace.tkr16.patch ---
Index: source/ucp/file/shell.cxx
===================================================================
RCS file: /cvs/ucb/ucb/source/ucp/file/shell.cxx,v
retrieving revision 1.97.18.1
diff -u -r1.97.18.1 shell.cxx
--- openoffice.org.orig/ucb/source/ucp/file/shell.cxx	21 Aug 2008 15:23:40 -0000	1.97.18.1
+++ openoffice.org/ucb/source/ucp/file/shell.cxx	4 Dec 2008 16:29:40 -0000
@@ -2296,6 +2296,10 @@
 
 
 	sal_Bool isDirectory,isFile,isVolume,isRemoveable,isRemote,isFloppy,isCompactDisc;
+    sal_Int64 dirSize = 0;
+
+    if( aFileStatus.isValid( FileStatusMask_FileSize ) )
+        dirSize = aFileStatus.getFileSize();
 
 	if( aFileStatus.isValid( FileStatusMask_Type ) )
 	{
@@ -2314,6 +2318,8 @@
 					osl::FileStatus::Directory == aFileStatus2.getFileType();
 				isFile =
 					osl::FileStatus::Regular == aFileStatus2.getFileType();
+                if( aFileStatus2.isValid( FileStatusMask_FileSize ) )
+                    dirSize = aFileStatus2.getFileSize();
 			}
 			else
 			{
@@ -2395,17 +2401,8 @@
 	it1 = properties.find( MyProperty( Size ) );
 	if( it1 != properties.end() )
 	{
-		if( aFileStatus.isValid( FileStatusMask_FileSize ) )
-		{
-			aAny <<= sal_Int64( aFileStatus.getFileSize() );
-			it1->setValue( aAny );
-		}
-		else
-		{
-			sal_Int64 dirSize = 0;
-			aAny <<= dirSize;
-			it1->setValue( aAny );
-		}
+		aAny <<= dirSize;
+		it1->setValue( aAny );
 	}
 
 

workspace.vcl96.patch:

--- NEW FILE workspace.vcl96.patch ---
Index: desktop/menus/calc.desktop
===================================================================
RCS file: /cvs/gsl/sysui/desktop/menus/calc.desktop,v
retrieving revision 1.11.2.1
diff -u -r1.11.2.1 calc.desktop
--- openoffice.org.orig/sysui/desktop/menus/calc.desktop	2 Sep 2008 11:05:01 -0000	1.11.2.1
+++ openoffice.org/sysui/desktop/menus/calc.desktop	23 Oct 2008 22:08:12 -0000
@@ -5,7 +5,7 @@
 Type=Application
 Categories=Office;X-Red-Hat-Base;X-SuSE-Core-Office;X-MandrivaLinux-Office-Spreadsheets;
 Exec=openoffice -calc %U
-MimeType=application/vnd.oasis.opendocument.spreadsheet;application/vnd.oasis.opendocument.spreadsheet-template;application/vnd.sun.xml.calc;application/vnd.sun.xml.calc.template;application/vnd.stardivision.calc;application/vnd.stardivision.chart;application/msexcel;application/vnd.ms-excel;application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;application/vnd.ms-excel.sheet.macroenabled.12;application/vnd.openxmlformats-officedocument.spreadsheetml.template;application/vnd.ms-excel.template.macroenabled.12;application/vnd.ms-excel.sheet.binary.macroenabled.12;
+MimeType=application/vnd.oasis.opendocument.spreadsheet;application/vnd.oasis.opendocument.spreadsheet-template;application/vnd.sun.xml.calc;application/vnd.sun.xml.calc.template;application/vnd.stardivision.calc;application/vnd.stardivision.chart;application/msexcel;application/vnd.ms-excel;application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;application/vnd.ms-excel.sheet.macroenabled.12;application/vnd.openxmlformats-officedocument.spreadsheetml.template;application/vnd.ms-excel.template.macroenabled.12;application/vnd.ms-excel.sheet.binary.macroenabled.12;text/csv;
 Name=%PRODUCTNAME Calc
 GenericName=Spreadsheet
 Comment=Perform calculation, analyze information and manage lists in spreadsheets by using Calc.

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/F-10/openoffice.org-2.2.1.ooo7065.sw.titlepagedialog.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- openoffice.org-2.2.1.ooo7065.sw.titlepagedialog.patch	1 Sep 2008 12:09:08 -0000	1.2
+++ openoffice.org-2.2.1.ooo7065.sw.titlepagedialog.patch	12 Jan 2009 12:27:42 -0000	1.3
@@ -14,21 +14,6 @@
  
  #define FN_TABLE_REP                (FN_FORMAT + 99)  /* TableRepresentation */
  #define FN_CONVERT_TEXT_TABLE		(FN_FORMAT + 100)  /* Konvertierung Text <-> Tabelle */
-Index: inc/doc.hxx
-===================================================================
-RCS file: /cvs/sw/sw/inc/doc.hxx,v
-retrieving revision 1.138
-diff -u -r1.138 doc.hxx
---- openoffice.org.orig/sw/inc/doc.hxx	27 Jun 2007 13:13:17 -0000	1.138
-+++ openoffice.org/sw/inc/doc.hxx	10 Jul 2007 12:55:02 -0000
-@@ -758,6 +758,7 @@
-     virtual void setPrinter(/*[in]*/ SfxPrinter* pP,/*[in]*/ bool bDeleteOld,/*[in]*/ bool bCallPrtDataChanged );
-     virtual VirtualDevice* getVirtualDevice(/*[in]*/ bool bCreate ) const;
-     virtual void setVirtualDevice(/*[in]*/ VirtualDevice* pVd,/*[in]*/ bool bDeleteOld, /*[in]*/ bool bCallVirDevDataChanged );
-+    VirtualDevice* ConstructVirtualDevice(bool bMSO_or_PDF=0) const;
-     virtual OutputDevice* getReferenceDevice(/*[in]*/ bool bCreate ) const;
-     virtual void setReferenceDeviceType(/*[in]*/ bool bNewVirtual,/*[in]*/ bool bNewHiRes );
-     virtual const JobSetup* getJobsetup() const;
 Index: inc/globals.hrc
 ===================================================================
 RCS file: /cvs/sw/sw/inc/globals.hrc,v
@@ -318,9 +303,24 @@
      $(SLO)$/linenum.obj \
      $(SLO)$/mailmrge.obj \
      $(SLO)$/multmrk.obj \
---- /dev/null	2007-07-10 08:03:57.022658051 +0100
-+++ openoffice.org/sw/source/ui/inc/titlepage.hxx	2007-07-10 10:43:39.000000000 +0100
-@@ -0,0 +1,117 @@
+diff -ru openoffice.org/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu openoffice.org/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
+--- openoffice.org.orig/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu	2007-07-10 14:35:38.000000000 +0100
++++ openoffice.org/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu	2007-07-09 12:03:44.000000000 +0100
+@@ -802,6 +802,11 @@
+                     <value xml:lang="en-US">~Page...</value>
+                 </prop>
+             </node>
++			<node oor:name=".uno:TitlePageDialog" oor:op="replace">
++				<prop oor:name="Label" oor:type="xs:string">
++					<value xml:lang="en-US">Title Page...</value>
++				</prop>
++			</node>
+ 			<node oor:name=".uno:FormatColumns" oor:op="replace">
+ 				<prop oor:name="Label" oor:type="xs:string">
+                     <value xml:lang="en-US">Co~lumns...</value>
+--- /dev/null	2008-10-28 16:28:18.200260089 +0000
++++ openoffice.org.orig/sw/source/ui/inc/titlepage.hxx	2008-11-13 12:48:59.000000000 +0000
+@@ -0,0 +1,129 @@
 +/*************************************************************************
 + *
 + *  OpenOffice.org - a multi-platform office productivity suite
@@ -401,6 +401,11 @@
 +	NumericField	aPageCountNF;
 +	FixedText	aPagePagesFT;
 +
++	FixedText	aPageStartFT;
++	RadioButton	aDocumentStartRB;
++	RadioButton	aPageStartRB;
++	NumericField	aPageStartNF;
++
 +	FixedLine	aNumberingFL;
 +	CheckBox	aRestartNumberingCB;
 +	FixedText	aRestartNumberingFT;
@@ -418,6 +423,8 @@
 +        CancelButton	aCancelPB;
 +        HelpButton	aHelpPB;
 +
++        SwWrtShell *mpSh;
++
 +	const SwFmtPageDesc *mpPageFmtDesc;
 +
 +        SwPageDesc *mpTitleDesc;
@@ -426,21 +433,26 @@
 +
 +	void FillList();
 +
++        USHORT GetInsertPosition() const;
++
 +	DECL_LINK( OKHdl, Button * );
 +	DECL_LINK( EditHdl, Button * );
 +	DECL_LINK( RestartNumberingHdl, CheckBox* );
 +	DECL_LINK( SetPageNumberHdl, CheckBox* );
 +        DECL_LINK( UpHdl, NumericField * );
 +        DECL_LINK( DownHdl, NumericField * );
++        DECL_LINK( StartPageHdl, RadioButton * );
 +public:
 +	SwTitlePageDlg( Window *pParent );
 +	~SwTitlePageDlg();
 +};
 +
 +#endif
---- /dev/null	2007-07-10 08:03:57.022658051 +0100
-+++ openoffice.org/sw/source/ui/misc/titlepage.src	2007-07-10 09:58:33.000000000 +0100
-@@ -0,0 +1,222 @@
++
++/* vi:set tabstop=4 shiftwidth=4 expandtab: */
+--- /dev/null	2008-10-28 16:28:18.200260089 +0000
++++ openoffice.org/sw/source/ui/misc/titlepage.src	2008-11-13 12:03:28.000000000 +0000
+@@ -0,0 +1,260 @@
 +/*************************************************************************
 + *
 + *  OpenOffice.org - a multi-platform office productivity suite
@@ -495,7 +507,7 @@
 +	HelpID = HID_TITLEPAGE ;
 +	OutputSize = TRUE ;
 +	SVLook = TRUE ;
-+	Size = MAP_APPFONT ( 216 , 169 ) ;
++	Size = MAP_APPFONT ( 216 , 201 ) ;
 +	Text [ en-US ] = "Title Pages" ;
 +	Moveable = TRUE ;
 +
@@ -512,7 +524,7 @@
 +		Size = MAP_APPFONT ( 150 , 10 ) ;
 +		Text [ en-US ] = "Convert existing pages to title pages" ;
 +		TabStop = TRUE ;
-+		Group = TRUE ;
++		Check = TRUE ;
 +		Text [ x-comment ] = " ";
 +	};
 +	RadioButton RB_INSERT_NEW_PAGES
@@ -539,9 +551,9 @@
 +		Repeat = TRUE ;
 +		Spin = TRUE ;
 +		Minimum = 1 ;
-+		Maximum = 1000 ;
++		Maximum = 65535;
 +		First = 1 ;
-+		Last = 1000 ;
++		Last = 65535;
 +		SpinSize = 1 ;
 +	};
 +	FixedText FT_PAGE_PAGES
@@ -551,16 +563,54 @@
 +		Text [ en-US ] = "pages" ;
 +		Text [ x-comment ] = " ";
 +	};
++	FixedText FT_PAGE_START
++	{
++		Pos = MAP_APPFONT ( 12 , 66 ) ;
++		Size = MAP_APPFONT ( 58 , 8 ) ;
++		Text [ en-US ] = "Place title pages at" ;
++		Text [ x-comment ] = " ";
++	};
++	RadioButton RB_DOCUMENT_START
++	{
++		Pos = MAP_APPFONT ( 70 , 66 ) ;
++		Size = MAP_APPFONT ( 80 , 10 ) ;
++		Text [ en-US ] = "Document Start" ;
++		TabStop = TRUE ;
++		Check = TRUE ;
++		Text [ x-comment ] = " ";
++	};
++	RadioButton RB_PAGE_START
++	{
++		Pos = MAP_APPFONT ( 70 , 78 ) ;
++		Size = MAP_APPFONT ( 30 , 10 ) ;
++		Text [ en-US ] = "Page" ;
++		Text [ x-comment ] = " ";
++	};
++	NumericField NF_PAGE_START
++	{
++		Pos = MAP_APPFONT ( 95 , 78 ) ;
++		Size = MAP_APPFONT ( 30 , 12 ) ;
++		Border = TRUE ;
++		TabStop = TRUE ;
++		Left = TRUE ;
++		Repeat = TRUE ;
++		Spin = TRUE ;
++		Minimum = 1 ;
++		Maximum = 65535;
++		First = 1 ;
++		Last = 65535;
++		SpinSize = 1 ;
++	};
 +	FixedLine FL_NUMBERING
 +	{
-+		Pos = MAP_APPFONT ( 6 , 66 ) ;
++		Pos = MAP_APPFONT ( 6 , 98 ) ;
 +		Size = MAP_APPFONT ( 204 , 8 ) ;
 +		Text [ en-US ] = "Page Numbering" ;
 +		Text [ x-comment ] = " ";
 +	};
 +	CheckBox CB_RESTART_NUMBERING
 +	{
-+		Pos = MAP_APPFONT ( 12, 79 ) ;
++		Pos = MAP_APPFONT ( 12, 111  ) ;
 +		Size = MAP_APPFONT ( 150 , 10 ) ;
 +		TabStop = TRUE ;
 +		Text [ en-US ] = "Reset Page Numbering after title pages" ;
@@ -568,14 +618,14 @@
 +	};
 +	FixedText FT_RESTART_NUMBERING
 +	{
-+		Pos = MAP_APPFONT ( 140 , 79 ) ;
++		Pos = MAP_APPFONT ( 140 , 111 ) ;
 +		Size = MAP_APPFONT ( 50 , 10 ) ;
 +		Text [ en-US ] = "Page Number" ;
 +		Text [ x-comment ] = " ";
 +	};
 +	NumericField NF_RESTART_NUMBERING
 +	{
-+		Pos = MAP_APPFONT ( 180 , 79 ) ;
++		Pos = MAP_APPFONT ( 180 , 111 ) ;
 +		Size = MAP_APPFONT ( 30 , 12 ) ;
 +		Border = TRUE ;
 +		TabStop = TRUE ;
@@ -583,14 +633,14 @@
 +		Repeat = TRUE ;
 +		Spin = TRUE ;
 +		Minimum = 1 ;
-+		Maximum = 1000 ;
++		Maximum = 65535;
 +		First = 1 ;
-+		Last = 1000 ;
++		Last = 65535;
 +		SpinSize = 1 ;
 +	};
 +	CheckBox CB_SET_PAGE_NUMBER
 +	{
-+		Pos = MAP_APPFONT ( 12 , 93 ) ;
++		Pos = MAP_APPFONT ( 12 , 125 ) ;
 +		Size = MAP_APPFONT ( 150 , 10 ) ;
 +		TabStop = TRUE ;
 +		Text [ en-US ] = "Set Page Number for first title page" ;
@@ -598,14 +648,14 @@
 +	};
 +	FixedText FT_SET_PAGE_NUMBER
 +	{
-+		Pos = MAP_APPFONT ( 140 , 93 ) ;
++		Pos = MAP_APPFONT ( 140 , 125 ) ;
 +		Size = MAP_APPFONT ( 50 , 10 ) ;
 +		Text [ en-US ] = "Page Number" ;
 +		Text [ x-comment ] = " ";
 +	};
 +	NumericField NF_SET_PAGE_NUMBER
 +	{
-+		Pos = MAP_APPFONT ( 180 , 93 ) ;
++		Pos = MAP_APPFONT ( 180 , 125 ) ;
 +		Size = MAP_APPFONT ( 30 , 12 ) ;
 +		Border = TRUE ;
 +		TabStop = TRUE ;
@@ -613,14 +663,14 @@
 +		Repeat = TRUE ;
 +		Spin = TRUE ;
 +		Minimum = 1 ;
-+		Maximum = 1000 ;
++		Maximum = 65535;
 +		First = 1 ;
-+		Last = 1000 ;
++		Last = 65535;
 +		SpinSize = 1 ;
 +	};
 +	FixedLine FL_PAGE_PROPERTIES
 +	{
-+		Pos = MAP_APPFONT ( 6 , 109 ) ;
++		Pos = MAP_APPFONT ( 6 , 141 ) ;
 +		Size = MAP_APPFONT ( 204 , 8 ) ;
 +		Text [ en-US ] = "Edit Page Properties" ;
 +		Text [ x-comment ] = " ";
@@ -628,7 +678,7 @@
 +	ListBox LB_PAGE_PROPERTIES
 +	{
 +		Border = TRUE ;
-+		Pos = MAP_APPFONT ( 12 , 122 ) ;
++		Pos = MAP_APPFONT ( 12 , 154 ) ;
 +		Size = MAP_APPFONT ( 150 , 80 ) ;
 +		TabStop = TRUE ;
 +		DropDown = TRUE ;
@@ -636,93 +686,36 @@
 +	};
 +	PushButton PB_PAGE_PROPERTIES
 +	{
-+                Pos = MAP_APPFONT ( 170 , 122 ) ;
++                Pos = MAP_APPFONT ( 170 , 154 ) ;
 +		Size = MAP_APPFONT ( 30 , 12 ) ;
 +		Text [ en-US ] = "Edit..." ;
 +	};
 +	FixedLine FL_BOTTOM
 +	{
-+		Pos = MAP_APPFONT ( 6 , 138 ) ;
++		Pos = MAP_APPFONT ( 6 , 170 ) ;
 +		Size = MAP_APPFONT ( 204 , 8 ) ;
 +	};
 +	OKButton PB_OK
 +	{
-+		Pos = MAP_APPFONT ( 54 , 149 ) ;
++		Pos = MAP_APPFONT ( 54 , 181 ) ;
 +		Size = MAP_APPFONT ( 50 , 14 ) ;
 +		DefButton = TRUE ;
 +	};
 +	CancelButton PB_CANCEL
 +	{
-+		Pos = MAP_APPFONT ( 107 , 149 ) ;
++		Pos = MAP_APPFONT ( 107 , 181 ) ;
 +		Size = MAP_APPFONT ( 50 , 14 ) ;
 +		DefButton = TRUE ;
 +	};
 +	HelpButton PB_HELP
 +	{
-+		Pos = MAP_APPFONT ( 160 , 149 ) ;
++		Pos = MAP_APPFONT ( 160 , 181 ) ;
 +		Size = MAP_APPFONT ( 50 , 14 ) ;
 +	};
 +};
---- /dev/null	2007-07-10 08:03:57.022658051 +0100
-+++ openoffice.org/sw/source/ui/misc/titlepage.hrc	2007-07-10 10:00:43.000000000 +0100
-@@ -0,0 +1,54 @@
-+/*************************************************************************
-+ *
-+ *  OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ *  $RCSfile$
-+ *
-+ *  $Revision$
-+ *
-+ *  last change: $Author$ $Date$
-+ *
-+ *  The Contents of this file are made available subject to
-+ *  the terms of GNU Lesser General Public License Version 2.1.
-+ *
-+ *
-+ *    GNU Lesser General Public License Version 2.1
-+ *    =============================================
-+ *    Copyright 2005 by Sun Microsystems, Inc.
-+ *    901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *    This library is free software; you can redistribute it and/or
-+ *    modify it under the terms of the GNU Lesser General Public
-+ *    License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *    This library is distributed in the hope that it will be useful,
-+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *    Lesser General Public License for more details.
-+ *
-+ *    You should have received a copy of the GNU Lesser General Public
-+ *    License along with this library; if not, write to the Free Software
-+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *    MA  02111-1307  USA
-+ *
-+ ************************************************************************/
-+#define FL_MAKEINSERT         1
-+#define RB_USE_EXISTING_PAGES 2
-+#define RB_INSERT_NEW_PAGES   3
-+#define FT_PAGE_COUNT         4
-+#define NF_PAGE_COUNT         5
-+#define FT_PAGE_PAGES         6
-+#define FL_NUMBERING          7
-+#define CB_RESTART_NUMBERING  8
-+#define FT_RESTART_NUMBERING  9
-+#define NF_RESTART_NUMBERING 10
-+#define CB_SET_PAGE_NUMBER   11
-+#define FT_SET_PAGE_NUMBER   12
-+#define NF_SET_PAGE_NUMBER   13
-+#define FL_PAGE_PROPERTIES   13
-+#define LB_PAGE_PROPERTIES   14
-+#define PB_PAGE_PROPERTIES   15
-+#define FL_BOTTOM            16
-+#define PB_OK                17
-+#define PB_CANCEL            18
-+#define PB_HELP              19
---- /dev/null	2007-07-10 08:03:57.022658051 +0100
-+++ openoffice.org/sw/source/ui/misc/titlepage.cxx	2007-07-10 14:18:25.000000000 +0100
-@@ -0,0 +1,368 @@
+--- /dev/null	2008-10-28 16:28:18.200260089 +0000
++++ openoffice.org/sw/source/ui/misc/titlepage.cxx	2008-11-13 12:58:11.000000000 +0000
+@@ -0,0 +1,401 @@
 +/*************************************************************************
 + *
 + *  OpenOffice.org - a multi-platform office productivity suite
@@ -832,42 +825,43 @@
 +		return bRet;
 +	}
 +
-+        void lcl_ChangePage(SwWrtShell *pSh, USHORT nNoPages, USHORT nNewNumber, const SwPageDesc *pNewDesc)
-+	{
-+		pSh->SttDoc();
-+		FASTBOOL bAllOk = true;
-+		
-+		for (USHORT nI = 0; nI < nNoPages; ++nI)
++    bool lcl_SkipNPages(SwWrtShell *pSh, USHORT nNoPages)
++    {
++		bool bAllOk = true;
++		for (USHORT nI = 0; nI < nNoPages && bAllOk; ++nI)
 +			bAllOk = pSh->SttNxtPg();
-+		
-+		if (bAllOk);
-+		{
-+		    const USHORT nCurIdx = pSh->GetCurPageDesc();
-+		    const SwPageDesc &rCurrentDesc = pSh->GetPageDesc( nCurIdx );
++        return bAllOk;
++    }
++
++    void lcl_ChangePage(SwWrtShell *pSh, USHORT nNewNumber,
++        const SwPageDesc *pNewDesc)
++	{
++	    const USHORT nCurIdx = pSh->GetCurPageDesc();
++	    const SwPageDesc &rCurrentDesc = pSh->GetPageDesc( nCurIdx );
 +
-+		    const SwFmtPageDesc *pPageFmtDesc(0);
-+		    USHORT nDontCare;
-+		    lcl_GetPageDesc(pSh, nDontCare, &pPageFmtDesc);
-+
-+		    //If we want a new number then set it, otherwise reuse the existing one
-+		    USHORT nPgNo = nNewNumber ? nNewNumber : ( pPageFmtDesc ? pPageFmtDesc->GetNumOffset() : 0 );
-+
-+		    //If we want a new descriptior then set it, otherwise reuse the existing one
-+		    if (!pNewDesc)
-+		    {
-+			SwFmtPageDesc aPageFmtDesc(pPageFmtDesc ? *pPageFmtDesc : &rCurrentDesc);
-+			if (nPgNo) aPageFmtDesc.SetNumOffset(nPgNo);
-+			pSh->SetAttr(aPageFmtDesc);
-+		    }
-+		    else
-+		    {
-+			SwFmtPageDesc aPageFmtDesc(pNewDesc);
-+			if (nPgNo) aPageFmtDesc.SetNumOffset(nPgNo);
-+			pSh->SetAttr(aPageFmtDesc);
-+		    }
++	    const SwFmtPageDesc *pPageFmtDesc(0);
++	    USHORT nDontCare;
++	    lcl_GetPageDesc(pSh, nDontCare, &pPageFmtDesc);
++
++	    //If we want a new number then set it, otherwise reuse the existing one
++	    USHORT nPgNo = nNewNumber ?
++            nNewNumber : ( pPageFmtDesc ? pPageFmtDesc->GetNumOffset() : 0 );
++
++	    //If we want a new descriptior then set it, otherwise reuse the existing one
++	    if (!pNewDesc)
++	    {
++		    SwFmtPageDesc aPageFmtDesc(pPageFmtDesc ? *pPageFmtDesc : &rCurrentDesc);
++		    if (nPgNo) aPageFmtDesc.SetNumOffset(nPgNo);
++		    pSh->SetAttr(aPageFmtDesc);
++	    }
++	    else
++	    {
++		    SwFmtPageDesc aPageFmtDesc(pNewDesc);
++		    if (nPgNo) aPageFmtDesc.SetNumOffset(nPgNo);
++		    pSh->SetAttr(aPageFmtDesc);
++	    }
 +
-+		    delete pPageFmtDesc;
-+		}
++	    delete pPageFmtDesc;
 +	}
 +
 +	void lcl_PushCursor(SwWrtShell *pSh)
@@ -875,15 +869,22 @@
 +		pSh->LockView( TRUE );
 +		pSh->StartAllAction();
 +		pSh->SwCrsrShell::Push();
-+    		pSh->SttDoc();
 +	}
 +
 +	void lcl_PopCursor(SwWrtShell *pSh)
 +	{
 +		pSh->SwCrsrShell::Pop( FALSE );
 +		pSh->EndAllAction();
-+        	pSh->LockView( FALSE );
++        pSh->LockView( FALSE );
 +	}
++
++    USHORT lcl_GetCurrentPage(SwWrtShell *pSh)
++    {
++        String sDummy;
++        USHORT nPhyNum=1, nVirtNum=1;
++        pSh->GetPageNumber(0, true, nPhyNum, nVirtNum, sDummy);
++        return nPhyNum;
++    }
 +}
 +
 +/*
@@ -900,13 +901,21 @@
 +		aPagePropertiesLB.InsertEntry(mpIndexDesc->GetName());
 +	if (mpNormalDesc)
 +		aPagePropertiesLB.InsertEntry(mpNormalDesc->GetName());
-+        aPagePropertiesLB.SelectEntryPos(0);
++    aPagePropertiesLB.SelectEntryPos(0);
 +}
 +
 +/*--------------------------------------------------------------------
 +	Beschreibung:
 + --------------------------------------------------------------------*/
 +
++USHORT SwTitlePageDlg::GetInsertPosition() const
++{
++    USHORT nPage = 1;
++    if (aPageStartNF.IsEnabled())
++        nPage = aPageStartNF.GetValue();
++    return nPage;
++}
++
 +SwTitlePageDlg::SwTitlePageDlg( Window *pParent ) :
 +	SfxModalDialog( pParent, SW_RES(DLG_TITLEPAGE) ),
 +#pragma warning (disable : 4355)
@@ -916,6 +925,10 @@
 +	aPageCountFT		( this, SW_RES( FT_PAGE_COUNT )),
 +	aPageCountNF		( this, SW_RES( NF_PAGE_COUNT )),
 +	aPagePagesFT		( this, SW_RES( FT_PAGE_PAGES )),
++	aPageStartFT		( this, SW_RES( FT_PAGE_START )),
++	aDocumentStartRB	( this, SW_RES( RB_DOCUMENT_START )),
++	aPageStartRB		( this, SW_RES( RB_PAGE_START )),
++	aPageStartNF		( this, SW_RES( NF_PAGE_START )),
 +	aNumberingFL		( this, SW_RES( FL_NUMBERING )),
 +	aRestartNumberingCB	( this, SW_RES( CB_RESTART_NUMBERING )),
 +	aRestartNumberingFT	( this, SW_RES( FT_RESTART_NUMBERING )),
@@ -926,89 +939,96 @@
 +	aPagePropertiesFL	( this, SW_RES( FL_PAGE_PROPERTIES )),
 +	aPagePropertiesLB	( this, SW_RES( LB_PAGE_PROPERTIES )),
 +	aPagePropertiesPB	( this, SW_RES( PB_PAGE_PROPERTIES )),
-+        aBottomFL		( this, SW_RES( FL_BOTTOM )),
-+        aOkPB			( this, SW_RES( PB_OK )),
-+        aCancelPB		( this, SW_RES( PB_CANCEL )),
-+        aHelpPB			( this, SW_RES( PB_HELP )),
++    aBottomFL			( this, SW_RES( FL_BOTTOM )),
++    aOkPB				( this, SW_RES( PB_OK )),
++    aCancelPB			( this, SW_RES( PB_CANCEL )),
++    aHelpPB				( this, SW_RES( PB_HELP )),
 +	mpPageFmtDesc		(0)
 +#pragma warning (default : 4355)
 +{
 +	FreeResource();
 +
-+        aOkPB.SetClickHdl(LINK(this, SwTitlePageDlg, OKHdl));
-+        aRestartNumberingCB.SetClickHdl(LINK(this, SwTitlePageDlg, RestartNumberingHdl));
++    aOkPB.SetClickHdl(LINK(this, SwTitlePageDlg, OKHdl));
++    aRestartNumberingCB.SetClickHdl(LINK(this, SwTitlePageDlg, RestartNumberingHdl));
 +	aSetPageNumberCB.SetClickHdl(LINK(this, SwTitlePageDlg, SetPageNumberHdl));
 +
 +	USHORT nSetPage = 1;
 +	USHORT nResetPage = 1;
 +	USHORT nTitlePages = 1;
-+	SwWrtShell* pSh = ::GetActiveView()->GetWrtShellPtr();
-+	lcl_PushCursor(pSh);
++	mpSh = ::GetActiveView()->GetWrtShellPtr();
++	lcl_PushCursor(mpSh);
 +
-+	SwView& rView = pSh->GetView();
++	SwView& rView = mpSh->GetView();
 +	rView.InvalidateRulerPos();
 +
 +	bool bMaybeResetNumbering = false;
 +
-+	mpTitleDesc = pSh->GetPageDescFromPool(RES_POOLPAGE_FIRST);
-+	mpIndexDesc = pSh->GetPageDescFromPool(RES_POOLPAGE_REGISTER);
-+	mpNormalDesc = pSh->GetPageDescFromPool(RES_POOLPAGE_STANDARD);
-+
-+	if (lcl_GetPageDesc( pSh, nSetPage, &mpPageFmtDesc ))
-+	{
-+    		if (mpPageFmtDesc->GetPageDesc() == mpTitleDesc)
-+    		{
-+			while (pSh->SttNxtPg())
++	mpTitleDesc = mpSh->GetPageDescFromPool(RES_POOLPAGE_FIRST);
++	mpIndexDesc = mpSh->GetPageDescFromPool(RES_POOLPAGE_REGISTER);
++	mpNormalDesc = mpSh->GetPageDescFromPool(RES_POOLPAGE_STANDARD);
++
++    mpSh->SttDoc();
++	if (lcl_GetPageDesc( mpSh, nSetPage, &mpPageFmtDesc ))
++	{
++   		if (mpPageFmtDesc->GetPageDesc() == mpTitleDesc)
++   		{
++			while (mpSh->SttNxtPg())
 +			{
-+                               	const USHORT nCurIdx = pSh->GetCurPageDesc();
-+                               	const SwPageDesc &rPageDesc = pSh->GetPageDesc( nCurIdx );
++                const USHORT nCurIdx = mpSh->GetCurPageDesc();
++                const SwPageDesc &rPageDesc = mpSh->GetPageDesc( nCurIdx );
 +					
-+        			if (mpIndexDesc != &rPageDesc)
++                if (mpIndexDesc != &rPageDesc)
 +				{
-+					mpNormalDesc = &rPageDesc;
-+        				bMaybeResetNumbering = lcl_GetPageDesc(pSh, nResetPage, NULL);
-+       					break;
++                    mpNormalDesc = &rPageDesc;
++                    bMaybeResetNumbering = lcl_GetPageDesc(mpSh, nResetPage, NULL);
++                    break;
 +				}
 +				++nTitlePages;
 +			}
-+    			pSh->SttDoc();
-+    		}
-+        }
-+	lcl_PopCursor(pSh);
-+
-+        aUseExistingPagesRB.Check();
-+        aPageCountNF.SetValue(nTitlePages);
-+        aPageCountNF.SetUpHdl(LINK(this, SwTitlePageDlg, UpHdl));
-+        aPageCountNF.SetDownHdl(LINK(this, SwTitlePageDlg, DownHdl));
++    	}
++    }
++	lcl_PopCursor(mpSh);
++
++    aUseExistingPagesRB.Check();
++    aPageCountNF.SetValue(nTitlePages);
++    aPageCountNF.SetUpHdl(LINK(this, SwTitlePageDlg, UpHdl));
++    aPageCountNF.SetDownHdl(LINK(this, SwTitlePageDlg, DownHdl));
++
++    aDocumentStartRB.Check();
++    aPageStartNF.Enable(false);
++    aPageStartNF.SetValue(lcl_GetCurrentPage(mpSh));
++    Link aStartPageHdl = LINK(this, SwTitlePageDlg, StartPageHdl);
++    aDocumentStartRB.SetClickHdl(aStartPageHdl);
++    aPageStartRB.SetClickHdl(aStartPageHdl);
 +
 +	if (bMaybeResetNumbering && nResetPage > 0)
 +	{
-+        	aRestartNumberingCB.Check();
-+        	aRestartNumberingNF.SetValue(nResetPage);
++        aRestartNumberingCB.Check();
++        aRestartNumberingNF.SetValue(nResetPage);
 +	}
 +	aRestartNumberingNF.Enable(aRestartNumberingCB.IsChecked());
 +
-+        aSetPageNumberNF.SetValue(nSetPage);
++    aSetPageNumberNF.SetValue(nSetPage);
 +	if (nSetPage > 1)
-+        	aSetPageNumberCB.Check();
++        aSetPageNumberCB.Check();
 +	aSetPageNumberNF.Enable(aSetPageNumberCB.IsChecked());
 +
 +	FillList();
-+        aPagePropertiesPB.SetClickHdl(LINK(this, SwTitlePageDlg, EditHdl));
++    aPagePropertiesPB.SetClickHdl(LINK(this, SwTitlePageDlg, EditHdl));
 +}
 +
 +IMPL_LINK(SwTitlePageDlg, UpHdl, NumericField *, EMPTYARG)
 +{
 +	if (aPageCountNF.GetValue() == 2)
 +		FillList();
-+        return 0;
++    return 0;
 +}
 +
 +IMPL_LINK(SwTitlePageDlg, DownHdl, NumericField *, EMPTYARG)
 +{
 +	if (aPageCountNF.GetValue() == 1)
 +		FillList();
-+        return 0;
++    return 0;
 +}
 +
 +IMPL_LINK(SwTitlePageDlg, RestartNumberingHdl, CheckBox*, EMPTYARG)
@@ -1023,34 +1043,31 @@
 +    return 0;
 +}
 +
-+/*--------------------------------------------------------------------
-+	Beschreibung:
-+ --------------------------------------------------------------------*/
++IMPL_LINK(SwTitlePageDlg, StartPageHdl, RadioButton*, EMPTYARG)
++{
++    aPageStartNF.Enable(aPageStartRB.IsChecked());
++    return 0;
++}
 +
 +__EXPORT SwTitlePageDlg::~SwTitlePageDlg()
 +{
 +	delete mpPageFmtDesc;
 +}
 +
-+/*--------------------------------------------------------------------
-+	 Beschreibung:
-+ --------------------------------------------------------------------*/
-+
-+IMPL_LINK( SwTitlePageDlg, EditHdl, Button *, pBtn )
++IMPL_LINK( SwTitlePageDlg, EditHdl, Button *, /*pBtn*/ )
 +{
-+    SwWrtShell* pSh = ::GetActiveView()->GetWrtShellPtr();
-+    SwView& rView = pSh->GetView();
-+    rView.GetDocShell()->FormatPage(aPagePropertiesLB.GetSelectEntry(), false, pSh);
++    SwView& rView = mpSh->GetView();
++    rView.GetDocShell()->FormatPage(aPagePropertiesLB.GetSelectEntry(), false, mpSh);
 +    rView.InvalidateRulerPos();
 +
 +    return 0;
 +}
 +
-+IMPL_LINK( SwTitlePageDlg, OKHdl, Button *, pBtn )
++IMPL_LINK( SwTitlePageDlg, OKHdl, Button *, /*pBtn*/ )
 +{
-+    SwWrtShell* pSh = ::GetActiveView()->GetWrtShellPtr();
-+    lcl_PushCursor(pSh);
-+    pSh->StartUndo();
++    lcl_PushCursor(mpSh);
++
++    mpSh->StartUndo();
 +
 +    SwFmtPageDesc aTitleDesc(mpTitleDesc);
 +
@@ -1062,47 +1079,102 @@
 +    USHORT nNoPages = aPageCountNF.GetValue();
 +    if (!aUseExistingPagesRB.IsChecked())
 +    {
++        mpSh->GotoPage(GetInsertPosition(), false);
 +        for (USHORT nI=0; nI < nNoPages; ++nI)
-+        	pSh->InsertPageBreak();
++        	mpSh->InsertPageBreak();
 +    }
++
++    mpSh->GotoPage(GetInsertPosition(), false);
 +    for (USHORT nI=1; nI < nNoPages; ++nI)
-+        lcl_ChangePage(pSh, nI, 0, mpIndexDesc);
++    {
++        if (mpSh->SttNxtPg())
++            lcl_ChangePage(mpSh, 0, mpIndexDesc);
++    }
 +
-+    pSh->SttDoc();
-+    pSh->SetAttr(aTitleDesc);
++    mpSh->GotoPage(GetInsertPosition(), false);
++    mpSh->SetAttr(aTitleDesc);
 +
-+    if (nNoPages > 1 && pSh->GotoPage(nNoPages, false))
++    if (nNoPages > 1 && mpSh->GotoPage(GetInsertPosition() + nNoPages, false))
 +    {
-+	SwFmtPageDesc aPageFmtDesc(mpNormalDesc);
-+    	pSh->SetAttr(aPageFmtDesc);
++	    SwFmtPageDesc aPageFmtDesc(mpNormalDesc);
++    	mpSh->SetAttr(aPageFmtDesc);
 +    }
 +
 +    if (aRestartNumberingCB.IsChecked() || nNoPages > 1)
 +    {
 +        USHORT nPgNo = aRestartNumberingCB.IsChecked() ? aRestartNumberingNF.GetValue() : 0;
 +        const SwPageDesc *pNewDesc = nNoPages > 1 ? mpNormalDesc : 0;
-+        lcl_ChangePage(pSh, nNoPages, nPgNo, pNewDesc);
++        mpSh->GotoPage(GetInsertPosition() + nNoPages, false);
++        lcl_ChangePage(mpSh, nPgNo, pNewDesc);
 +    }
 +
-+    pSh->EndUndo();
-+    lcl_PopCursor(pSh);
++    mpSh->EndUndo();
++    lcl_PopCursor(mpSh);
 +    if (!aUseExistingPagesRB.IsChecked())
-+        pSh->SttDoc();
++        mpSh->GotoPage(GetInsertPosition(), false);
 +    EndDialog( RET_OK );
 +    return 0;
 +}
-diff -ru openoffice.org/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu openoffice.org/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
---- openoffice.org.orig/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu	2007-07-10 14:35:38.000000000 +0100
-+++ openoffice.org/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu	2007-07-09 12:03:44.000000000 +0100
-@@ -802,6 +802,11 @@
-                     <value xml:lang="en-US">~Page...</value>
-                 </prop>
-             </node>
-+			<node oor:name=".uno:TitlePageDialog" oor:op="replace">
-+				<prop oor:name="Label" oor:type="xs:string">
-+					<value xml:lang="en-US">Title Page...</value>
-+				</prop>
-+			</node>
- 			<node oor:name=".uno:FormatColumns" oor:op="replace">
- 				<prop oor:name="Label" oor:type="xs:string">
-                     <value xml:lang="en-US">Co~lumns...</value>
++
++/* vi:set tabstop=4 shiftwidth=4 expandtab: */
+--- /dev/null	2008-10-28 16:28:18.200260089 +0000
++++ openoffice.org/sw/source/ui/misc/titlepage.hrc	2008-11-13 10:21:32.000000000 +0000
+@@ -0,0 +1,58 @@
++/*************************************************************************
++ *
++ *  OpenOffice.org - a multi-platform office productivity suite
++ *
++ *  $RCSfile$
++ *
++ *  $Revision$
++ *
++ *  last change: $Author$ $Date$
++ *
++ *  The Contents of this file are made available subject to
++ *  the terms of GNU Lesser General Public License Version 2.1.
++ *
++ *
++ *    GNU Lesser General Public License Version 2.1
++ *    =============================================
++ *    Copyright 2005 by Sun Microsystems, Inc.
++ *    901 San Antonio Road, Palo Alto, CA 94303, USA
++ *
++ *    This library is free software; you can redistribute it and/or
++ *    modify it under the terms of the GNU Lesser General Public
++ *    License version 2.1, as published by the Free Software Foundation.
++ *
++ *    This library is distributed in the hope that it will be useful,
++ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
++ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ *    Lesser General Public License for more details.
++ *
++ *    You should have received a copy of the GNU Lesser General Public
++ *    License along with this library; if not, write to the Free Software
++ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
++ *    MA  02111-1307  USA
++ *
++ ************************************************************************/
++#define FL_MAKEINSERT         1
++#define RB_USE_EXISTING_PAGES 2
++#define RB_INSERT_NEW_PAGES   3
++#define FT_PAGE_COUNT         4
++#define NF_PAGE_COUNT         5
++#define FT_PAGE_PAGES         6
++#define FT_PAGE_START         7
++#define RB_DOCUMENT_START     8
++#define RB_PAGE_START         9
++#define NF_PAGE_START        10
++#define FL_NUMBERING         11
++#define CB_RESTART_NUMBERING 12
++#define FT_RESTART_NUMBERING 13
++#define NF_RESTART_NUMBERING 14
++#define CB_SET_PAGE_NUMBER   15
++#define FT_SET_PAGE_NUMBER   16
++#define NF_SET_PAGE_NUMBER   17
++#define FL_PAGE_PROPERTIES   18
++#define LB_PAGE_PROPERTIES   19
++#define PB_PAGE_PROPERTIES   20
++#define FL_BOTTOM            21
++#define PB_OK                22
++#define PB_CANCEL            23
++#define PB_HELP              24

openoffice.org-2.3.1.ooo83878.unopkg.enablelinking.patch:

Index: openoffice.org-2.3.1.ooo83878.unopkg.enablelinking.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-10/openoffice.org-2.3.1.ooo83878.unopkg.enablelinking.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- openoffice.org-2.3.1.ooo83878.unopkg.enablelinking.patch	1 Dec 2008 23:01:51 -0000	1.7
+++ openoffice.org-2.3.1.ooo83878.unopkg.enablelinking.patch	12 Jan 2009 12:27:42 -0000	1.8
@@ -216,7 +216,7 @@
 retrieving revision 1.6.84.1
 diff -u -r1.6.84.1 unopkg_app.cxx
 --- openoffice.org.orig/desktop/source/pkgchk/unopkg/unopkg_app.cxx	10 Aug 2007 15:03:53 -0000	1.6.84.1
-+++ openoffice.org/desktop/source/pkgchk/unopkg/unopkg_app.cxx	10 Aug 2007 15:03:53 -0000	1.6.84.1
++++ openoffice.org:desktop/source/pkgchk/unopkg/unopkg_app.cxx	10 Aug 2007 15:03:53 -0000	1.6.84.1
 @@ -86,6 +86,9 @@
  " -V, --version           version information\n"
  " -v, --verbose           verbose output to stdout\n"

openoffice.org-3.0.0.ooo93515.vcl.jrb-frames.patch:

Index: openoffice.org-3.0.0.ooo93515.vcl.jrb-frames.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-10/openoffice.org-3.0.0.ooo93515.vcl.jrb-frames.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- openoffice.org-3.0.0.ooo93515.vcl.jrb-frames.patch	7 Nov 2008 11:58:46 -0000	1.4
+++ openoffice.org-3.0.0.ooo93515.vcl.jrb-frames.patch	12 Jan 2009 12:27:42 -0000	1.5
@@ -37,7 +37,7 @@
      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));
++        gdk_x11_window_set_user_time(GTK_WIDGET(m_pWindow)->window, safe_gdk_x11_get_server_time (GTK_WIDGET (m_pWindow)->window));
 +
      if( bDecoHandling )
      {
@@ -84,7 +84,7 @@
 +            // awesome.
 +
 +            if( m_pParent && ( ( (m_nStyle & SAL_FRAME_STYLE_OWNERDRAWDECORATION) ) || ( (m_nStyle & SAL_FRAME_STYLE_TOOLWINDOW ) ) ) )
-+                gdk_x11_window_set_user_time(GTK_WIDGET(m_pWindow)->window, gdk_x11_get_server_time (GTK_WIDGET (m_pWindow)->window));
++                gdk_x11_window_set_user_time(GTK_WIDGET(m_pWindow)->window, safe_gdk_x11_get_server_time (GTK_WIDGET (m_pWindow)->window));
 +
              gtk_widget_show( m_pWindow );
 +
@@ -96,8 +96,46 @@
                  gtk_window_present( GTK_WINDOW(m_pWindow) );
              else
 -                gdk_window_focus( m_pWindow->window, GDK_CURRENT_TIME );
-+                gdk_window_focus( m_pWindow->window, gdk_x11_get_server_time (GTK_WIDGET (m_pWindow)->window) );
++                gdk_window_focus( m_pWindow->window, safe_gdk_x11_get_server_time (GTK_WIDGET (m_pWindow)->window) );
 +
              /*  need to do an XSetInputFocus here because
               *  gdk_window_focus will ask a EWMH compliant WM to put the focus
               *  to our window - which it of course won't since our input hint
+@@ -3586,3 +3654,22 @@
+ 
+     return FALSE;
+ }
++
++guint32 GtkSalFrame::safe_gdk_x11_get_server_time(GdkWindow *window)
++{
++    static bool bSyncing = getenv("SAL_SYNCHRONIZE");
++
++    Display *pDisplay = NULL;
++    if (!bSyncing)
++    {
++        pDisplay = GDK_DISPLAY_XDISPLAY( getGdkDisplay() );
++        XSynchronize(pDisplay, true);
++    }
++
++    guint32 nRet = gdk_x11_get_server_time(window);
++
++    if (!bSyncing)
++        XSynchronize(pDisplay, false);
++
++    return nRet;
++}
+Index: unx/inc/plugins/gtk/gtkframe.hxx
+===================================================================
+RCS file: /cvs/gsl/vcl/unx/inc/plugins/gtk/gtkframe.hxx,v
+retrieving revision 1.35
+diff -u -r1.35 gtkframe.hxx
+--- openoffice.org.orig/vcl/unx/inc/plugins/gtk/gtkframe.hxx	30 May 2008 08:59:06 -0000	1.35
++++ openoffice.org/vcl/unx/inc/plugins/gtk/gtkframe.hxx	22 Dec 2008 15:52:53 -0000
+@@ -290,6 +290,7 @@
+     void updateScreenNumber();
+     
+     void moveToScreen( int nScreen );
++    guint32 safe_gdk_x11_get_server_time(GdkWindow *window);
+ 
+     virtual ~GtkSalFrame();
+ 

openoffice.org-3.0.1.ooo97088.sd.accel-fallback.patch:

Index: openoffice.org-3.0.1.ooo97088.sd.accel-fallback.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-10/openoffice.org-3.0.1.ooo97088.sd.accel-fallback.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- openoffice.org-3.0.1.ooo97088.sd.accel-fallback.patch	11 Dec 2008 09:52:03 -0000	1.2
+++ openoffice.org-3.0.1.ooo97088.sd.accel-fallback.patch	12 Jan 2009 12:27:42 -0000	1.3
@@ -1,77 +1,6 @@
 --- openoffice.org.orig/sd/uiconfig/simpress/accelerator/default.xml	2008-12-10 09:10:53.000000000 +0000
 +++ openoffice.org/sd/uiconfig/simpress/accelerator/default.xml	1970-01-01 01:00:00.000000000 +0100
-@@ -1,142 +0,0 @@
--<?xml version="1.0" encoding="UTF-8"?>
--<accel:acceleratorlist xmlns:accel="http://openoffice.org/2001/accel" xmlns:xlink="http://www.w3.org/1999/xlink">
--	<accel:item accel:code="KEY_Q" accel:mod1="true" xlink:href=".uno:Quit"/>
--	<accel:item accel:code="KEY_N" accel:shift="true" accel:mod1="true" xlink:href=".uno:NewDoc"/>
--	<accel:item accel:code="KEY_O" accel:mod1="true" xlink:href=".uno:Open"/>
--	<accel:item accel:code="KEY_OPEN" xlink:href=".uno:Open"/>
--	<accel:item accel:code="KEY_P" accel:mod1="true" xlink:href=".uno:Print"/>
--	<accel:item accel:code="KEY_S" accel:mod1="true" xlink:href=".uno:Save"/>
--	<accel:item accel:code="KEY_F11" xlink:href=".uno:DesignerDialog"/>
--	<accel:item accel:code="KEY_F11" accel:mod1="true" xlink:href=".uno:StyleCatalog"/>
--	<accel:item accel:code="KEY_Y" accel:mod1="true" xlink:href=".uno:Redo"/>
--	<accel:item accel:code="KEY_Z" accel:mod1="true" xlink:href=".uno:Undo"/>
--	<accel:item accel:code="KEY_BACKSPACE" accel:mod2="true" xlink:href=".uno:Undo"/>
--	<accel:item accel:code="KEY_UNDO" xlink:href=".uno:Undo"/>
--	<accel:item accel:code="KEY_REPEAT" xlink:href=".uno:Repeat"/>
--	<accel:item accel:code="KEY_X" accel:mod1="true" xlink:href=".uno:Cut"/>
--	<accel:item accel:code="KEY_DELETE" accel:shift="true" xlink:href=".uno:Cut"/>
--	<accel:item accel:code="KEY_CUT" xlink:href=".uno:Cut"/>
--	<accel:item accel:code="KEY_C" accel:mod1="true" xlink:href=".uno:Copy"/>
--	<accel:item accel:code="KEY_INSERT" accel:mod1="true" xlink:href=".uno:Copy"/>
--	<accel:item accel:code="KEY_COPY" xlink:href=".uno:Copy"/>
--	<accel:item accel:code="KEY_V" accel:mod1="true" xlink:href=".uno:Paste"/>
--	<accel:item accel:code="KEY_INSERT" accel:shift="true" xlink:href=".uno:Paste"/>
--	<accel:item accel:code="KEY_PASTE" xlink:href=".uno:Paste"/>
--	<accel:item accel:code="KEY_DELETE" xlink:href=".uno:Delete"/>
--	<accel:item accel:code="KEY_F2" xlink:href=".uno:Text"/>
--	<accel:item accel:code="KEY_I" accel:mod1="true" xlink:href=".uno:Italic"/>
--	<accel:item accel:code="KEY_B" accel:mod1="true" xlink:href=".uno:Bold"/>
--	<accel:item accel:code="KEY_U" accel:mod1="true" xlink:href=".uno:Underline"/>
--	<accel:item accel:code="KEY_L" accel:mod1="true" xlink:href=".uno:LeftPara"/>
--	<accel:item accel:code="KEY_R" accel:mod1="true" xlink:href=".uno:RightPara"/>
--	<accel:item accel:code="KEY_E" accel:mod1="true" xlink:href=".uno:CenterPara"/>
--	<accel:item accel:code="KEY_J" accel:mod1="true" xlink:href=".uno:JustifyPara"/>
--	<accel:item accel:code="KEY_1" accel:mod1="true" xlink:href=".uno:SpacePara1"/>
--	<accel:item accel:code="KEY_5" accel:mod1="true" xlink:href=".uno:SpacePara15"/>
--	<accel:item accel:code="KEY_2" accel:mod1="true" xlink:href=".uno:SpacePara2"/>
--	<accel:item accel:code="KEY_F4" xlink:href=".uno:TransformDialog"/>
--	<accel:item accel:code="KEY_F8" xlink:href=".uno:ToggleObjectBezierMode"/>
--	<accel:item accel:code="KEY_F7" xlink:href=".uno:SpellDialog"/>
--	<accel:item accel:code="KEY_F7" accel:mod1="true" xlink:href=".uno:Thesaurus"/>
--	<accel:item accel:code="KEY_ADD" accel:shift="true" accel:mod1="true" xlink:href=".uno:BringToFront"/>
--	<accel:item accel:code="KEY_SUBTRACT" accel:shift="true" accel:mod1="true" xlink:href=".uno:SendToBack"/>
--	<accel:item accel:code="KEY_P" accel:shift="true" accel:mod1="true" xlink:href=".uno:SuperScript"/>
--	<accel:item accel:code="KEY_B" accel:shift="true" accel:mod1="true" xlink:href=".uno:SubScript"/>
--	<accel:item accel:code="KEY_F5" accel:shift="true" accel:mod1="true" xlink:href=".uno:Navigator"/>
--	<accel:item accel:code="KEY_F5" accel:shift="true" xlink:href=".uno:RestoreEditingView"/>
--	<accel:item accel:code="KEY_F5" xlink:href=".uno:Presentation"/>
--	<accel:item accel:code="KEY_F2" accel:mod1="true" xlink:href=".uno:Presentation"/>
--	<accel:item accel:code="KEY_F9" xlink:href=".uno:Presentation"/>
--	<accel:item accel:code="KEY_F8" accel:shift="true" accel:mod1="true" xlink:href=".uno:TextFitToSize"/>
--	<accel:item accel:code="KEY_G" accel:shift="true" accel:mod1="true" xlink:href=".uno:FormatGroup"/>
--	<accel:item accel:code="KEY_G" accel:shift="true" accel:mod1="true" accel:mod2="true" xlink:href=".uno:FormatUngroup"/>
--	<accel:item accel:code="KEY_9" accel:shift="true" accel:mod1="true" accel:mod2="true" xlink:href=".uno:ShowItemBrowser"/>
--	<accel:item accel:code="KEY_V" accel:shift="true" accel:mod1="true" xlink:href=".uno:PasteClipboard"/>
--	<accel:item accel:code="KEY_F3" accel:shift="true" xlink:href=".uno:CopyObjects"/>
--	<accel:item accel:code="KEY_P" accel:shift="true" accel:mod1="true" accel:mod2="true" xlink:href=".uno:PixelMode"/>
--	<accel:item accel:code="KEY_K" accel:shift="true" accel:mod1="true" xlink:href=".uno:Combine"/>
--	<accel:item accel:code="KEY_ADD" accel:mod1="true" xlink:href=".uno:Forward"/>
--	<accel:item accel:code="KEY_SUBTRACT" accel:mod1="true" xlink:href=".uno:Backward"/>
--	<accel:item accel:code="KEY_A" accel:shift="true" accel:mod1="true" accel:mod2="true" xlink:href=".uno:AnimationMode"/>
--	<accel:item accel:code="KEY_K" accel:shift="true" accel:mod1="true" accel:mod2="true" xlink:href=".uno:Dismantle"/>
--	<accel:item accel:code="KEY_F3" xlink:href=".uno:EnterGroup"/>
--	<accel:item accel:code="KEY_F3" accel:mod1="true" xlink:href=".uno:LeaveGroup"/>
--    <accel:item accel:code="KEY_M" accel:mod1="true" xlink:href=".uno:ResetAttributes"/>
--	<accel:item accel:code="KEY_SPACE" accel:shift="true" accel:mod1="true" xlink:href=".uno:InsertNonBreakingSpace"/>
--    <accel:item accel:code="KEY_DIVIDE" accel:mod1="true" xlink:href=".uno:InsertZWSP"/>
--    <accel:item accel:code="KEY_UP" accel:shift="true" accel:mod2="true" xlink:href=".uno:OutlineUp"/>
--    <accel:item accel:code="KEY_DOWN" accel:shift="true" accel:mod2="true" xlink:href=".uno:OutlineDown"/>
--    <accel:item accel:code="KEY_LEFT" accel:shift="true" accel:mod2="true" xlink:href=".uno:OutlineLeft"/>
--    <accel:item accel:code="KEY_RIGHT" accel:shift="true" accel:mod2="true" xlink:href=".uno:OutlineRight"/>
--</accel:acceleratorlist>
+@@ -1,71 +0,0 @@
 -<?xml version="1.0" encoding="UTF-8"?>
 -<accel:acceleratorlist xmlns:accel="http://openoffice.org/2001/accel" xmlns:xlink="http://www.w3.org/1999/xlink">
 -	<accel:item accel:code="KEY_Q" accel:mod1="true" xlink:href=".uno:Quit"/>

openoffice.org-3.0.1.ooo97428.config_office.xinerama-on-x86_64.patch:

Index: openoffice.org-3.0.1.ooo97428.config_office.xinerama-on-x86_64.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-10/openoffice.org-3.0.1.ooo97428.config_office.xinerama-on-x86_64.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- openoffice.org-3.0.1.ooo97428.config_office.xinerama-on-x86_64.patch	8 Jan 2009 13:54:56 -0000	1.2
+++ openoffice.org-3.0.1.ooo97428.config_office.xinerama-on-x86_64.patch	12 Jan 2009 12:27:42 -0000	1.3
@@ -1,18 +1,14 @@
 diff -up OOO300_m9/config_office/configure.in.orig OOO300_m9.old3/config_office/configure.in
 --- OOO300_m9/config_office/configure.in.orig	2008-12-18 10:51:57.000000000 +0100
 +++ OOO300_m9/config_office/configure.in	2008-12-18 10:52:26.000000000 +0100
-@@ -4320,7 +4320,14 @@ else
+@@ -4348,7 +4348,10 @@
  fi
  AC_SUBST(XINC)
  if test "$x_libraries" = "default_x_libraries"; then
 -   XLIB="/usr/lib"
-+   if test "$build_cpu" = "x86_64" -o "$build_cpu" = "powerpc64"; then
-+      XLIB="/usr/lib64"
-+      if ! test -d "$XLIB"; then
-+          XLIB="/usr/lib"
-+      fi
-+   else
-+      XLIB="/usr/lib"
++   XLIB=`$PKG_CONFIG --variable=libdir x11`
++   if test "x$XLIB" = x; then
++         XLIB="/usr/lib"
 +   fi
  else
     XLIB="$x_libraries"


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-10/openoffice.org.spec,v
retrieving revision 1.1707
retrieving revision 1.1708
diff -u -r1.1707 -r1.1708
--- openoffice.org.spec	12 Jan 2009 09:07:35 -0000	1.1707
+++ openoffice.org.spec	12 Jan 2009 12:27:42 -0000	1.1708
@@ -1,6 +1,6 @@
 %define oootag OOO300
-%define ooomilestone 9
-%define rh_rpm_release 11
+%define ooomilestone 15
+%define rh_rpm_release 1
 
 # rhbz#465664 jar-repacking breaks help by reordering META-INF/MANIFEST.MF
 %define __jar_repack %{nil}
@@ -36,7 +36,7 @@
 
 Summary:        OpenOffice.org comprehensive office suite.
 Name:           openoffice.org
-Version:        3.0.0
+Version:        3.0.1
 Release: 	%{ooomilestone}.%{rh_rpm_release}%{?dist}
 Epoch:		1
 License:	LGPLv3 and LGPLv2+ and MPLv1.1 and BSD
@@ -88,57 +88,50 @@
 Patch15: openoffice.org-2.2.0.ooo68717.gstreamer.video.patch
 Patch16: openoffice.org-2.2.0.ooo63159.sal.dtype.patch
 Patch17: openoffice.org-2.2.0.ooo76393.sal.dynamicsection.patch
-Patch18: openoffice.org-2.0.3.ooo80816.selinux.bridges.patch
+Patch18: workspace.selinux01.patch
 Patch19: openoffice.org-2.2.1.ooo7065.sw.titlepagedialog.patch
-Patch20: openoffice.org-2.3.0.ooo80257.sd.textonlystyle.patch
-Patch21: openoffice.org-2.3.0.ooo80257.sd.textonlystyle.tar.gz
+Patch20: workspace.impressfontsize.patch
+Patch21: workspace.impressfontsize.tar.gz
 Patch22: openoffice.org-2.3.0.ooo76649.httpencoding.patch
 Patch23: openoffice.org-2.3.1.ooo83878.unopkg.enablelinking.patch
 Patch24: workspace.cmcfixes48.patch
 Patch25: openoffice.org-2.4.0.rh133741.alwaysgtk.vcl.patch
 Patch26: openoffice.org-2.4.0.ooo85921.sd.editmasterundermouse.patch
 Patch27: openoffice.org-2.4.0.ooo86080.unopkg.bodge.patch
-Patch28: openoffice.org-2.4.0.ooo87490.sfx2.allprotocols.urlopen.patch
+Patch28: workspace.mba31issues01.patch
 Patch29: openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch
 Patch30: openoffice.org-3.0.0.ooo88341.sc.verticalboxes.patch
 Patch31: openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch
 Patch32: openoffice.org-3.0.0.ooo87970.vcl.samenamesubs.patch
 Patch33: openoffice.org-3.0.0.ooo48400.svx.fixspelling.patch
-Patch34: openoffice.org-3.0.0.ooo86142.serbiannumbering.patch
-Patch35: workspace.impress163.patch
-Patch36: workspace.dba301a.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
-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: workspace.vcl95.patch
-Patch48: openoffice.org-3.0.0.ooo94938.unopkg.handleexception.patch
-Patch49: openoffice.org-3.0.0.ooo94659.sal.magazine.patch
-Patch50: openoffice.org-3.0.0.ooo95018.sal.fdwarnings.patch
-Patch51: openoffice.org-3.0.0.ooo95318.system-showicons.patch
-Patch52: openoffice.org-3.0.0.ooo95392.sysui.csv.patch
-Patch53: openoffice.org-3.0.0.ooo95533.sw.safertableexport.patch
-Patch54: openoffice.org-3.0.0.ooo95341.cppcanvas.patch
-Patch55: openoffice.org-3.0.0.ooo95793.goodies.met.patch
-Patch56: openoffice.org-3.0.0.ooo95834.dontset-nonfunctional-forward.patch
-Patch57: openoffice.org-3.0.0.ooo95908.pyuno.debugging.spew.patch
-Patch58: openoffice.org-3.0.0.ooo90072.sw.undo-longtext.patch
-Patch59: openoffice.org-3.0.0.ooo96203.sfx2.3layer-qstart.patch
-Patch60: openoffice.org-3.0.0.ooo96279.swext.mediawiki.proxies.patch
-Patch61: openoffice.org-3.0.0.ooo96391.sw.prefsalwaysmodified.patch
-Patch62: workspace.impress161.patch
-Patch63: openoffice.org-3.0.1.ooo97088.sd.accel-fallback.patch
-Patch64: workspace.vcl97.patch
-Patch65: openoffice.org-3.0.1.ooo97196.vcl.ensuretheme.whenqttesting.patch
-Patch66: workspace.vcl98.patch
-Patch67: openoffice.org-3.0.1.ooo97428.config_office.xinerama-on-x86_64.patch
-Patch68: openoffice.org-3.0.1.ooo97975.bridges.mainalreadyexited.patch
+Patch34: workspace.locales31.patch
+Patch35: workspace.fpicker8.patch
+Patch36: workspace.cmcfixes49.patch
+Patch37: openoffice.org-3.0.0.ooo91924.svx.consistentordering.patch
+Patch38: workspace.cmcfixes50.patch
+Patch39: openoffice.org-3.0.0.ooo93515.vcl.jrb-frames.patch
+Patch40: workspace.vcl94.patch
+Patch41: workspace.vcl95.patch
+Patch42: openoffice.org-3.0.0.ooo94938.unopkg.handleexception.patch
+Patch43: workspace.mhu17.patch
+Patch44: openoffice.org-3.0.0.ooo95018.sal.fdwarnings.patch
+Patch45: openoffice.org-3.0.0.ooo95318.system-showicons.patch
+Patch46: workspace.vcl96.patch
+Patch47: workspace.hb12.patch
+Patch48: workspace.fwk92.patch
+Patch49: openoffice.org-3.0.0.ooo95834.dontset-nonfunctional-forward.patch
+Patch50: workspace.sb101.patch
+Patch51: workspace.sw31bf02.patch
+Patch52: workspace.cmcfixes51.patch
+Patch53: openoffice.org-3.0.0.ooo96279.swext.mediawiki.proxies.patch
+Patch54: openoffice.org-3.0.0.ooo96391.sw.prefsalwaysmodified.patch
+Patch55: workspace.tkr16.patch
+Patch56: openoffice.org-3.0.1.ooo97088.sd.accel-fallback.patch
+Patch57: workspace.vcl97.patch
+Patch58: workspace.vcl98.patch
+Patch59: openoffice.org-3.0.1.ooo97428.config_office.xinerama-on-x86_64.patch
+Patch60: openoffice.org-3.0.1.oooXXXXX.extensions.npapi.patch
+Patch61: openoffice.org-3.0.1.ooo97975.bridges.mainalreadyexited.patch
 
 %define instdir %{_libdir}
 %define baseinstdir %{instdir}/openoffice.org
@@ -1351,9 +1344,9 @@
 %patch15 -p0 -b .ooo68717.gstreamer.video.patch
 %patch16 -p1 -b .ooo63159.sal.dtype.patch
 %patch17 -p1 -b .ooo76393.sal.dynamicsection.patch
-%patch18 -p1 -b .ooo80816.selinux.bridges.patch
+%patch18 -p1 -b .workspace.selinux01.patch
 %patch19 -p1 -b .ooo7065.sw.titlepagedialog.patch
-%patch20 -p1 -b .ooo80257.sd.textonlystyle.patch
+%patch20 -p1 -b .workspace.impressfontsize.patch
 tar xzf %{PATCH21}
 %patch22 -p1 -b .ooo76649.httpencoding.patch
 %patch23 -p1 -b .ooo83878.unopkg.enablelinking.patch
@@ -1361,47 +1354,41 @@
 %patch25 -p1 -b .rh133741.alwaysgtk.vcl.patch
 %patch26 -p1 -b .ooo85921.sd.editmasterundermouse.patch
 %patch27 -p1 -b .ooo86080.unopkg.bodge.patch
-%patch28 -p1 -b .ooo87490.sfx2.allprotocols.urlopen.patch
+%patch28 -p1 -b .workspace.mba31issues01.patch
 %patch29 -p1 -b .ooo64508.vcl.honourfontconfighinting.patch
 %patch30 -p1 -b .ooo88341.sc.verticalboxes.patch
 %patch31 -p1 -b .gccXXXXX.solenv.javaregistration.patch
 %patch32 -p1 -b .ooo87970.vcl.samenamesubs.patch
 %patch33 -p1 -b .ooo48400.svx.fixspelling.patch
-%patch34 -p1 -b .ooo86142.serbiannumbering.patch
-%patch35 -p1 -b .workspace.impress163.patch
-%patch36 -p1 -b .workspace.dba301a.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
-%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 .workspace.vcl95.patch
-%patch48 -p1 -b .ooo94938.unopkg.handleexception.patch
-%patch49 -p1 -b .ooo94659.sal.magazine.patch
-%patch50 -p1 -b .ooo95018.sal.fdwarnings.patch
-%patch51 -p1 -b .ooo95318.system-showicons.patch
-%patch52 -p1 -b .ooo95392.sysui.csv.patch
-%patch53 -p1 -b .ooo95533.sw.safertableexport.patch
-%patch54 -p1 -b .ooo95341.cppcanvas.patch
-%patch55 -p1 -b .ooo95793.goodies.met.patch
-%patch56 -p1 -b .ooo95834.dontset-nonfunctional-forward.patch
-%patch57 -p1 -b .ooo95908.pyuno.debugging.spew.patch
-%patch58 -p1 -b .ooo90072.sw.undo-longtext.patch
-%patch59 -p1 -b .ooo96203.sfx2.3layer-qstart.patch
-%patch60 -p1 -b .ooo96279.swext.mediawiki.proxies.patch
-%patch61 -p1 -b .ooo96391.sw.prefsalwaysmodified.patch
-%patch62 -p1 -b .workspace.impress161.patch
-%patch63 -p1
-%patch64 -p1 -b .workspace.vcl97.patch
-%patch65 -p1 -b .ooo97196.vcl.ensuretheme.whenqttesting.patch
-%patch66 -p1 -b .workspace.vcl98.patch
-%patch67 -p1 -b .ooo97428.config_office.xinerama-on-x86_64.patch
-%patch68 -p1 -b .ooo97975.bridges.mainalreadyexited.patch
+%patch34 -p1 -b .workspace.locales31.patch
+%patch35 -p1 -b .workspace.fpicker8.patch
+%patch36 -p0 -b .workspace.cmcfixes49.patch
+%patch37 -p1 -b .ooo91924.svx.consistentordering.patch
+%patch38 -p1 -b .workspace.cmcfixes50.patch
+%patch39 -p1 -b .ooo93515.vcl.jrb-frames.patch
+%patch40 -p1 -b .workspace.vcl94.patch
+%patch41 -p1 -b .workspace.vcl95.patch
+%patch42 -p1 -b .ooo94938.unopkg.handleexception.patch
+%patch43 -p1 -b .workspace.mhu17.patch
+%patch44 -p1 -b .ooo95018.sal.fdwarnings.patch
+%patch45 -p1 -b .ooo95318.system-showicons.patch
+%patch46 -p1 -b .workspace.vcl96.patch
+%patch47 -p1 -b .workspace.hb12.patch
+%patch48 -p1 -b .workspace.fwk92.patch
+%patch49 -p1 -b .ooo95834.dontset-nonfunctional-forward.patch
+%patch50 -p1 -b .workspace.sb101.patch
+%patch51 -p1 -b .workspace.sw31bf02.patch
+%patch52 -p1 -b .workspace.cmcfixes51.patch
+%patch53 -p1 -b .ooo96279.swext.mediawiki.proxies.patch
+%patch54 -p1 -b .ooo96391.sw.prefsalwaysmodified.patch
+%patch55 -p1 -b .workspace.tkr16.patch
+%patch56 -p1
+%patch57 -p0 -b .workspace.transogl03.patch
+%patch58 -p1 -b .workspace.vcl97.patch
+%patch59 -p1 -b .workspace.vcl98.patch
+%patch60 -p1 -b .ooo97428.config_office.xinerama-on-x86_64.patch
+%patch61 -p1 -b .oooXXXXX.extensions.npapi.patch
+%patch62 -p1 -b .ooo97975.bridges.mainalreadyexited.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -3768,7 +3755,7 @@
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
-* Mon Jan 12 2009 Caol??n McNamara <caolanm at redhat.com> - 1:3.0.0-9.11
+* Mon Jan 12 2009 Caol??n McNamara <caolanm at redhat.com> - 1:3.0.1-15.1
 - Resolves: rhbz#470302 g_file_input_stream_query_info doesn't do anything 
   remotely
 - Resolves: rhbz#471485 openoffice.org-3.0.0.ooo96203.sfx2.3layer-qstart.patch


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-10/sources,v
retrieving revision 1.320
retrieving revision 1.321
diff -u -r1.320 -r1.321
--- sources	1 Oct 2008 13:30:40 -0000	1.320
+++ sources	12 Jan 2009 12:27:43 -0000	1.321
@@ -5,4 +5,4 @@
 f0cda31fe18bf9289629a321663031b8  redhat-templates.tar.gz
 5ff04a5d754f6770f07e679856d682f3  redhat-registry.tar.gz
 3a53d26158236a7a6a23fe836de721a8  redhat-langpacks.tar.gz
-87e3f818915855556b4f375a5af38325  OOO300_m9.tar.bz2
+99ff6a3492fe2dad34153e85f79bd6f5  OOO300_m15.tar.bz2

workspace.cmcfixes48.patch:

Index: workspace.cmcfixes48.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-10/workspace.cmcfixes48.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- workspace.cmcfixes48.patch	15 Sep 2008 21:50:07 -0000	1.4
+++ workspace.cmcfixes48.patch	12 Jan 2009 12:27:43 -0000	1.5
@@ -147,27 +147,6 @@
 diff -u installation/scp2/source/ooo/file_library_ooo.scp:1.302 installation/scp2/source/ooo/file_library_ooo.scp:1.302.14.1
 --- installation/scp2/source/ooo/file_library_ooo.scp:1.302	Thu Jul 17 08:34:36 2008
 +++ installation/scp2/source/ooo/file_library_ooo.scp	Fri Aug  1 07:08:01 2008
-@@ -1104,6 +1104,20 @@
-     Name = "oleautobridge.uno.dll";
- End
- 
-+#else
-+
-+File gid_File_Lib_Mozbootstrap
-+    TXT_FILE_BODY;
-+    Styles = (PACKED,UNO_COMPONENT,PATCH);
-+    RegistryID = gid_Starregistry_Services_Rdb;
-+    Dir = gid_Dir_Program;
-+  #ifdef UNX
-+    Name = STRING(CONCAT2(libmozbootstrap,UNXSUFFIX));
-+  #else
-+    Name = "libmozbootstrap.dll";
-+  #endif
-+End
-+
- #endif
- 
- SPECIAL_UNO_LIB_FILE(gid_File_Lib_Package2,package2)
 @@ -1657,26 +1671,18 @@
      RegistryID = gid_Starregistry_Services_Rdb;
  End
@@ -218,18 +197,6 @@
  //i20156 - end
  #endif
  
-Index: installation/scp2/source/ooo/module_hidden_ooo.scp
-diff -u installation/scp2/source/ooo/module_hidden_ooo.scp:1.112 installation/scp2/source/ooo/module_hidden_ooo.scp:1.112.18.1
---- installation/scp2/source/ooo/module_hidden_ooo.scp:1.112	Tue Jul 22 05:36:42 2008
-+++ installation/scp2/source/ooo/module_hidden_ooo.scp	Fri Aug  1 07:08:01 2008
-@@ -315,6 +315,7 @@
- 	gid_File_Lib_Mcnttype,
- 	gid_File_Lib_Mozab_2,
- 	gid_File_Lib_Mozabdrv,
-+	gid_File_Lib_Mozbootstrap,
- 	gid_File_Lib_Mysql_2,
- 	gid_File_Lib_Odbc_2,
- 	gid_File_Lib_Officebean,
 Index: installation/scp2/source/ooo/shortcut_ooo.scp
 diff -u installation/scp2/source/ooo/shortcut_ooo.scp:1.30 installation/scp2/source/ooo/shortcut_ooo.scp:1.30.40.1
 --- installation/scp2/source/ooo/shortcut_ooo.scp:1.30	Fri Jul 11 03:32:50 2008
@@ -289,521 +256,6 @@
  #ifdef MACOSX
  
  Shortcut gid_Shortcut_Lib_Hsqldb_2
-Index: dba/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx
-diff -u dba/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx:1.6 dba/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx:1.6.52.1
---- dba/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx:1.6	Thu Apr 10 03:08:06 2008
-+++ dba/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx	Thu Jul 24 06:16:23 2008
-@@ -38,8 +38,10 @@
- using namespace connectivity::mozab;
- #include <MNSFolders.hxx>
- #include "MNSProfileDiscover.hxx"
--#include "MNSProfileManager.hxx"
--#include "MNSRunnable.hxx"
-+#ifndef MINIMAL_PROFILEDISCOVER
-+#  include "MNSProfileManager.hxx"
-+#  include "MNSRunnable.hxx"
-+#endif
- #include <MNSInit.hxx>
- 
- static MozillaBootstrap *pMozillaBootstrap=NULL;
-@@ -72,10 +74,13 @@
- void MozillaBootstrap::Init()
- {
- 	sal_Bool aProfileExists=sal_False;
-+
-+#ifndef MINIMAL_PROFILEDISCOVER
- 	//This must be call before any mozilla code
- 	MNS_Init(aProfileExists);
- 
- 	m_ProfileManager = new ProfileManager();
-+#endif
- 	m_ProfileAccess = new ProfileAccess();
- 	bootupProfile(::com::sun::star::mozilla::MozillaProductType_Mozilla,rtl::OUString());
- }
-@@ -157,32 +162,57 @@
- // XProfileManager
- ::sal_Int32 SAL_CALL MozillaBootstrap::bootupProfile( ::com::sun::star::mozilla::MozillaProductType product, const ::rtl::OUString& profileName ) throw (::com::sun::star::uno::RuntimeException)
- {
-+#ifndef MINIMAL_PROFILEDISCOVER
- 	return m_ProfileManager->bootupProfile(product,profileName);
-+#else
-+        return -1;
-+#endif
- }
- ::sal_Int32 SAL_CALL MozillaBootstrap::shutdownProfile(  ) throw (::com::sun::star::uno::RuntimeException)
- {
-+#ifndef MINIMAL_PROFILEDISCOVER
- 	return m_ProfileManager->shutdownProfile();
-+#else
-+	return -1;
-+#endif
- }
- ::com::sun::star::mozilla::MozillaProductType SAL_CALL MozillaBootstrap::getCurrentProduct(  ) throw (::com::sun::star::uno::RuntimeException)
- {
-+#ifndef MINIMAL_PROFILEDISCOVER
- 	return m_ProfileManager->getCurrentProduct();
-+#else
-+	return ::com::sun::star::mozilla::MozillaProductType_Default;
-+#endif
- }
- ::rtl::OUString SAL_CALL MozillaBootstrap::getCurrentProfile(  ) throw (::com::sun::star::uno::RuntimeException)
- {
-+#ifndef MINIMAL_PROFILEDISCOVER
- 	return m_ProfileManager->getCurrentProfile();
-+#else
-+	return ::rtl::OUString();
-+#endif
- }
- ::sal_Bool SAL_CALL MozillaBootstrap::isCurrentProfileLocked(  ) throw (::com::sun::star::uno::RuntimeException)
- {
-+#ifndef MINIMAL_PROFILEDISCOVER
- 	return isProfileLocked(getCurrentProduct(),m_ProfileManager->getCurrentProfile());
-+#else
-+	return true;
-+#endif
- }
- ::rtl::OUString SAL_CALL MozillaBootstrap::setCurrentProfile( ::com::sun::star::mozilla::MozillaProductType product, const ::rtl::OUString& profileName ) throw (::com::sun::star::uno::RuntimeException)
- {
-+#ifndef MINIMAL_PROFILEDISCOVER
- 	return m_ProfileManager->setCurrentProfile(product,profileName);
-+#else
-+	return ::rtl::OUString();
-+#endif
- }
- 
- // XProxyRunner
- ::sal_Int32 SAL_CALL MozillaBootstrap::Run( const ::com::sun::star::uno::Reference< ::com::sun::star::mozilla::XCodeProxy >& aCode ) throw (::com::sun::star::uno::RuntimeException)
- {
-+#ifndef MINIMAL_PROFILEDISCOVER
- 	::rtl::OUString profileName = aCode->getProfileName();
- 	::rtl::OUString currProfileName = getCurrentProfile();
- 	::com::sun::star::mozilla::MozillaProductType currProduct = getCurrentProduct();
-@@ -194,5 +224,105 @@
-    	MNSRunnable xRunnable;
- 	
- 	return xRunnable.StartProxy(aCode);;
--}
-+#else
-+	return -1;
-+#endif
-+}
-+
-+#ifdef MINIMAL_PROFILEDISCOVER
-+#include <cppuhelper/factory.hxx>
-+using ::com::sun::star::uno::Reference;
-+using ::com::sun::star::uno::Sequence;
-+using ::com::sun::star::registry::XRegistryKey;
-+using ::com::sun::star::lang::XSingleServiceFactory;
-+using ::com::sun::star::lang::XMultiServiceFactory;
-+
-+extern "C" void SAL_CALL component_getImplementationEnvironment(
-+                const sal_Char  **ppEnvTypeName,
-+                uno_Environment ** /*ppEnv*/
-+            )
-+{
-+    *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
-+}
-+
-+//---------------------------------------------------------------------------------------
-+void REGISTER_PROVIDER(
-+        const ::rtl::OUString& aServiceImplName,
-+        const Sequence< ::rtl::OUString>& Services,
-+        const Reference< ::com::sun::star::registry::XRegistryKey > & xKey)
-+{
-+    ::rtl::OUString aMainKeyName;
-+    aMainKeyName = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("/"));
-+    aMainKeyName += aServiceImplName;
-+    aMainKeyName += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES"));
-+
-+    Reference< ::com::sun::star::registry::XRegistryKey >  xNewKey( xKey->createKey(aMainKeyName) );
-+    OSL_ENSURE(xNewKey.is(), "MOZAB::component_writeInfo : could not create a registry key !");
-+
-+    for (sal_Int32 i=0; i<Services.getLength(); ++i)
-+        xNewKey->createKey(Services[i]);
-+}
-+
-+extern "C" sal_Bool SAL_CALL component_writeInfo(
-+                void* /*pServiceManager*/,
-+                void* pRegistryKey
-+            )
-+{
-+    if (pRegistryKey)
-+    try
-+    {
-+        Reference< ::com::sun::star::registry::XRegistryKey > xKey(reinterpret_cast< ::com::sun::star::registry::XRegistryKey*>(pRegistryKey));
-+
-+        Sequence< ::rtl::OUString > aSNS( 1 );
-+        aSNS[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.mozilla.MozillaBootstrap"));
-+        REGISTER_PROVIDER(
-+             ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.mozilla.MozillaBootstrap")),
-+             aSNS, xKey);
-+
-+        return sal_True;
-+    }
-+    catch (::com::sun::star::registry::InvalidRegistryException& )
-+    {
-+        OSL_ENSURE(sal_False, "Mozab::component_writeInfo : could not create a registry key ! ## InvalidRegistryException !");
-+    }
-+
-+    return sal_False;
-+}
-+
-+static Reference< XInterface > SAL_CALL createInstance( const Reference< XMultiServiceFactory >& rServiceManager )
-+{
-+        MozillaBootstrap * pBootstrap = reinterpret_cast<MozillaBootstrap*>(OMozillaBootstrap_CreateInstance(rServiceManager));
-+        return *pBootstrap;
-+}
-+
-+extern "C" void* SAL_CALL component_getFactory(
-+                                        const sal_Char* pImplementationName,
-+                                        void* pServiceManager,
-+                                        void* /*pRegistryKey*/)
-+{
-+        void* pRet = 0;
-+
-+        if (pServiceManager)
-+        {
-+                ::rtl::OUString aImplName( ::rtl::OUString::createFromAscii( pImplementationName ) );
-+                Reference< XSingleServiceFactory > xFactory;
-+                if (aImplName.equals(  ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.mozilla.MozillaBootstrap"))  ))
-+                {
-+                    Sequence< ::rtl::OUString > aSNS( 1 );
-+                    aSNS[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.mozilla.MozillaBootstrap"));
-+
-+                    xFactory = ::cppu::createSingleFactory(
-+                        reinterpret_cast< XMultiServiceFactory* > ( pServiceManager),
-+                        aImplName, createInstance, aSNS );
-+                }
-+                if ( xFactory.is() )
-+                {
-+                    xFactory->acquire();
-+                    pRet = xFactory.get();
-+                }
-+        }
-+
-+        return pRet;
-+};
- 
-+#endif
-Index: dba/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.cxx
-diff -u dba/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.cxx:1.8 dba/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.cxx:1.8.24.1
---- dba/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.cxx:1.8	Fri Jun  6 01:36:43 2008
-+++ dba/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.cxx	Thu Jul 24 06:16:23 2008
-@@ -32,6 +32,7 @@
- #include "precompiled_connectivity.hxx"
- 
- #include "MNSProfileDiscover.hxx"
-+#ifndef MINIMAL_PROFILEDISCOVER
- #include "MNSProfile.hxx"
- 
- #include "pratom.h"
-@@ -88,6 +89,7 @@
- 
- // IID and CIDs of all the services needed
- static NS_DEFINE_CID(kCharsetConverterManagerCID, NS_ICHARSETCONVERTERMANAGER_CID);
-+#endif
- 
- // Registry Keys
- 
-@@ -105,7 +107,13 @@
- {
- 	namespace mozab
- 	{
--		ProfileStruct::ProfileStruct(MozillaProductType aProduct,::rtl::OUString aProfileName,nsILocalFile * aProfilePath)
-+		ProfileStruct::ProfileStruct(MozillaProductType aProduct,::rtl::OUString aProfileName,
-+#ifdef MINIMAL_PROFILEDISCOVER
-+            const ::rtl::OUString& aProfilePath
-+#else
-+            nsILocalFile * aProfilePath
-+#endif
-+          )
- 		{
- 			product=aProduct;
- 			profileName = aProfileName;
-@@ -113,6 +121,9 @@
- 		}
- 		::rtl::OUString ProfileStruct::getProfilePath() 
- 		{
-+#ifdef MINIMAL_PROFILEDISCOVER
-+			return profilePath;
-+#else
- 			if (profilePath)
- 			{
- 				nsAutoString path;
-@@ -122,9 +133,9 @@
- 			}
- 			else
-                 return ::rtl::OUString();
-+#endif
- 		}
- 
--
- 		ProfileAccess::~ProfileAccess()
- 		{
- 		}
-@@ -132,20 +143,24 @@
- 		{
- 			LoadProductsInfo();
- 		}
-+
- 		sal_Int32 ProfileAccess::LoadProductsInfo()
- 		{
-+#ifndef MINIMAL_PROFILEDISCOVER
- 			//load mozilla profiles to m_ProductProfileList
- 			LoadMozillaProfiles();
--			sal_Int32 index=MozillaProductType_Mozilla;
--			sal_Int32 count=m_ProductProfileList[index].mProfileList.size();
-+#endif
-+			sal_Int32 count=m_ProductProfileList[MozillaProductType_Mozilla].mProfileList.size();
- 			
- 			//load thunderbird profiles to m_ProductProfileList
- 			count += LoadXPToolkitProfiles(MozillaProductType_Thunderbird);
-+
- 			//load firefox profiles to m_ProductProfileList
- 			//firefox profile does not containt address book, but maybe others need them
- 			count += LoadXPToolkitProfiles(MozillaProductType_Firefox);
- 			return count;
- 		}
-+#ifndef MINIMAL_PROFILEDISCOVER
- 		nsresult ProfileAccess::LoadMozillaProfiles()
- 		{
- 			sal_Int32 index=MozillaProductType_Mozilla;
-@@ -249,13 +264,16 @@
- 			}
- 			return rv;
- 		}
-+#endif
- 		//Thunderbird and firefox profiles are saved in profiles.ini
- 		sal_Int32 ProfileAccess::LoadXPToolkitProfiles(MozillaProductType product)
- 		{
- 			sal_Int32 index=product;
- 			ProductStruct &m_Product = m_ProductProfileList[index];
- 
-+#ifndef MINIMAL_PROFILEDISCOVER
- 			nsresult rv;
-+#endif
- 			::rtl::OUString regDir = getRegistryDir(product);
-             ::rtl::OUString profilesIni( regDir );
-             profilesIni += ::rtl::OUString::createFromAscii( "profiles.ini" );
-@@ -302,6 +320,7 @@
- 						isRelative = sIsRelative.toInt32();
- 					}
- 					
-+#ifndef MINIMAL_PROFILEDISCOVER
- 					nsCOMPtr<nsILocalFile> rootDir;
- 					rv = NS_NewLocalFile(EmptyString(), PR_TRUE,
- 											getter_AddRefs(rootDir));
-@@ -321,8 +340,15 @@
- 						rv = rootDir->SetPersistentDescriptor(filePath);
- 					}
- 					if (NS_FAILED(rv)) continue;
-+#endif
- 
--					ProfileStruct*  profileItem     = new ProfileStruct(product,profileName,rootDir);
-+					ProfileStruct*  profileItem     = new ProfileStruct(product,profileName,
-+#ifdef MINIMAL_PROFILEDISCOVER
-+							regDir + profilePath
-+#else
-+							rootDir
-+#endif
-+						);
- 					m_Product.mProfileList[profileName] = profileItem;
- 
- 					sal_Int32 isDefault = 0;
-@@ -338,6 +364,7 @@
- 			}
- 			return m_Product.mProfileList.size();
- 		}
-+
- 		::rtl::OUString ProfileAccess::getProfilePath( ::com::sun::star::mozilla::MozillaProductType product, const ::rtl::OUString& profileName ) throw (::com::sun::star::uno::RuntimeException)
- 		{
- 			sal_Int32 index=product;
-@@ -350,6 +377,7 @@
- 			else
- 				return m_Product.mProfileList[profileName]->getProfilePath();
- 		}
-+
- 		::sal_Int32 ProfileAccess::getProfileCount( ::com::sun::star::mozilla::MozillaProductType product) throw (::com::sun::star::uno::RuntimeException)
- 		{
- 			sal_Int32 index=product;
-@@ -373,6 +401,7 @@
- 			
- 			return m_Product.mProfileList.size();
- 		}
-+
- 		::rtl::OUString ProfileAccess::getDefaultProfile( ::com::sun::star::mozilla::MozillaProductType product ) throw (::com::sun::star::uno::RuntimeException)
- 		{
- 			sal_Int32 index=product;
-@@ -390,6 +419,7 @@
- 			ProfileStruct * aProfile = (*m_Product.mProfileList.begin()).second;
- 			return aProfile->getProfileName();
- 		}
-+#ifndef MINIMAL_PROFILEDISCOVER
- 		nsresult ProfileAccess::isExistFileOrSymlink(nsILocalFile* aFile,PRBool *bExist)
- 		{
- 			nsresult rv;
-@@ -448,9 +478,12 @@
- 			return nExist;
- 		}
- 
--
-+#endif
- 		::sal_Bool ProfileAccess::isProfileLocked( ::com::sun::star::mozilla::MozillaProductType product, const ::rtl::OUString& profileName ) throw (::com::sun::star::uno::RuntimeException)
- 		{
-+#ifdef MINIMAL_PROFILEDISCOVER
-+			return sal_True;
-+#else
- 			::rtl::OUString path = getProfilePath(product,profileName);
- 			if (!path.getLength())
- 				return sal_True;
-@@ -474,7 +507,9 @@
- 			if (rv)
- 				return sal_True;
- 			return sal_False;
-+#endif
- 		}
-+
- 		::sal_Bool ProfileAccess::getProfileExists( ::com::sun::star::mozilla::MozillaProductType product, const ::rtl::OUString& profileName ) throw (::com::sun::star::uno::RuntimeException)
- 		{
- 			sal_Int32 index=product;
-@@ -486,7 +521,7 @@
- 			else
- 				return sal_True;
- 		}
--
--
- 	}
- }
-+
-+
-Index: dba/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.hxx
-diff -u dba/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.hxx:1.5 dba/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.hxx:1.5.52.1
---- dba/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.hxx:1.5	Thu Apr 10 03:12:57 2008
-+++ dba/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.hxx	Thu Jul 24 06:16:23 2008
-@@ -31,7 +31,9 @@
- #ifndef __MNSProfileDiscover_h___
- #define __MNSProfileDiscover_h___
- 
-+#ifndef MINIMAL_PROFILEDISCOVER
- #include "mozilla_profile_discover.h"
-+#endif
- 
- #include <sal/types.h>
- #include <osl/diagnose.h>
-@@ -68,15 +70,27 @@
- 		class ProfileStruct
- 		{
- 		public:
--			ProfileStruct(MozillaProductType aProduct,::rtl::OUString aProfileName,nsILocalFile * aProfilePath);
-+			ProfileStruct(MozillaProductType aProduct,::rtl::OUString aProfileName,
-+#ifdef MINIMAL_PROFILEDISCOVER
-+                          const ::rtl::OUString &aProfilePath
-+#else
-+                          nsILocalFile * aProfilePath
-+#endif
-+                            );
- 			MozillaProductType getProductType() { return product;}
- 			::rtl::OUString getProfileName(){ return profileName;}
- 			::rtl::OUString getProfilePath() ;
-+#ifndef MINIMAL_PROFILEDISCOVER
- 			nsILocalFile	*getProfileLocal(){ return profilePath;}
-+#endif
- 		protected:
- 			MozillaProductType product;
- 			::rtl::OUString profileName;
-+#ifdef MINIMAL_PROFILEDISCOVER
-+			::rtl::OUString profilePath;
-+#else
- 			nsCOMPtr<nsILocalFile> profilePath;
-+#endif
- 		};
- 
- 		class ProductStruct
-@@ -102,16 +116,18 @@
- 			::rtl::OUString getDefaultProfile( ::com::sun::star::mozilla::MozillaProductType product ) throw (::com::sun::star::uno::RuntimeException);
- 			::sal_Bool SAL_CALL isProfileLocked( ::com::sun::star::mozilla::MozillaProductType product, const ::rtl::OUString& profileName ) throw (::com::sun::star::uno::RuntimeException);
- 			::sal_Bool SAL_CALL getProfileExists( ::com::sun::star::mozilla::MozillaProductType product, const ::rtl::OUString& profileName ) throw (::com::sun::star::uno::RuntimeException);
--
- 		protected:
- 			ProductStruct m_ProductProfileList[4];
- 			sal_Int32 LoadProductsInfo();
-+#ifndef MINIMAL_PROFILEDISCOVER
- 			nsresult  LoadMozillaProfiles();
-+#endif
- 			sal_Int32 LoadXPToolkitProfiles(MozillaProductType product);
--
-+#ifndef MINIMAL_PROFILEDISCOVER
- 			//used by isProfileLocked
- 			nsresult isExistFileOrSymlink(nsILocalFile* aFile,PRBool *bExist);
- 			nsresult isLockExist(nsILocalFile* aFile);
-+#endif
- 		};
- 
- 	}
-Index: dba/connectivity/source/drivers/mozab/bootstrap/makefile.mk
-diff -u dba/connectivity/source/drivers/mozab/bootstrap/makefile.mk:1.13 dba/connectivity/source/drivers/mozab/bootstrap/makefile.mk:1.13.52.1
---- dba/connectivity/source/drivers/mozab/bootstrap/makefile.mk:1.13	Thu Apr 10 03:14:31 2008
-+++ dba/connectivity/source/drivers/mozab/bootstrap/makefile.mk	Thu Jul 24 06:16:23 2008
-@@ -51,30 +51,38 @@
- 
- .INCLUDE : settings.mk
- 
--.IF ("$(SYSTEM_MOZILLA)" == "YES" && "$(WITH_MOZILLA)" == "YES") || "$(WITH_MOZILLA)" == "NO"
--dummy:
--	@echo "		Not building the mozillasrc stuff in OpenOffice.org build"
--	@echo "		dependency to Mozilla developer snapshots not feasable at the moment"
--
--.ELSE
--
- .INCLUDE :  $(PRJ)$/version.mk
- 
- 
- #mozilla specific stuff.
- # --- Files -------------------------------------
- 
--SLOFILES = \
--	$(SLO)$/MMozillaBootstrap.obj	\
--	$(SLO)$/MNSFolders.obj	\
--	$(SLO)$/MNSProfileDiscover.obj				\
-+SLOFILES += \
-+	$(SLO)$/MNSINIParser.obj \
-+	$(SLO)$/MNSProfileDiscover.obj \
-+	$(SLO)$/MMozillaBootstrap.obj \
-+	$(SLO)$/MNSFolders.obj
-+
-+.IF ("$(SYSTEM_MOZILLA)" == "YES" && "$(WITH_MOZILLA)" == "YES") || "$(WITH_MOZILLA)" == "NO"
-+CDEFS+=-DMINIMAL_PROFILEDISCOVER
-+
-+SHL1TARGET=$(TARGET)
-+SHL1OBJS=$(SLOFILES)
-+
-+SHL1STDLIBS=\
-+        $(CPPULIB)       \
-+        $(CPPUHELPERLIB) \
-+        $(SALLIB)        \
-+        $(COMPHELPERLIB)
-+
-+.ELSE
-+SLOFILES += \
- 	$(SLO)$/MNSInit.obj			            \
- 	$(SLO)$/MNSProfileManager.obj	\
--	$(SLO)$/MNSINIParser.obj	\
- 	$(SLO)$/MNSRunnable.obj	\
- 	$(SLO)$/MNSProfile.obj					\
- 	$(SLO)$/MNSProfileDirServiceProvider.obj
--
-+.ENDIF
- 
- .IF "$(GUI)"=="UNX"
- .IF "$(COMNAME)"=="sunpro5"
-@@ -158,7 +166,6 @@
-             -Wno-long-long
- CDEFS     += -DTRACING
- .ENDIF
--.ENDIF
- 
- SHL1TARGET_NAME=$(TARGET)$(MOZAB_MAJOR)
- 
 Index: external/libxmlsec/makefile.mk
 diff -u external/libxmlsec/makefile.mk:1.17 external/libxmlsec/makefile.mk:1.17.14.1
 --- external/libxmlsec/makefile.mk:1.17	Fri Apr 11 00:19:29 2008

workspace.vcl97.patch:

Index: workspace.vcl97.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-10/workspace.vcl97.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- workspace.vcl97.patch	11 Dec 2008 09:52:03 -0000	1.1
+++ workspace.vcl97.patch	12 Jan 2009 12:27:43 -0000	1.2
@@ -1,7 +1,7 @@
 Index: unx/source/gdi/pspgraphics.cxx
 ===================================================================
---- openoffice.org.orig/psprint/unx/source/gdi/pspgraphics.cxx	(revision 265133)
-+++ openoffice.org/psprint/unx/source/gdi/pspgraphics.cxx	(working copy)
+--- openoffice.org.orig/vcl/unx/source/gdi/pspgraphics.cxx	(revision 265133)
++++ openoffice.org/vcl/unx/source/gdi/pspgraphics.cxx	(working copy)
 @@ -835,6 +835,8 @@
      return false;
  }
@@ -24,9 +24,9 @@
  void PspGraphics::GetDevFontSubstList( OutputDevice* pOutDev )
 Index: unx/source/gdi/salgdi3.cxx
 ===================================================================
---- unx/source/gdi/salgdi3.cxx	(revision 265133)
-+++ unx/source/gdi/salgdi3.cxx	(working copy)
-@@ -1545,7 +1545,7 @@
+--- openoffice.org.orig/vcl/unx/source/gdi/salgdi3.cxx	(revision 265133)
++++ openoffice.org/vcl/unx/source/gdi/salgdi3.cxx	(working copy)
+@@ -1567,7 +1567,7 @@
  
  // ----------------------------------------------------------------------------
  
@@ -35,12 +35,12 @@
  
  void X11SalGraphics::GetDevFontList( ImplDevFontList *pList )
  {
-@@ -1806,7 +1806,7 @@
+@@ -2009,7 +2009,7 @@
      bool FindFontSubstitute( ImplFontSelectData&, OUString& rMissingCodes ) const;
  };
  
 -static void RegisterFontSubstitutors( ImplDevFontList* pList )
 +void RegisterFontSubstitutors( ImplDevFontList* pList )
  {
-     bool bDisableFC = false;
- #ifdef SOLARIS
+     // init font substitution defaults
+     int nDisableBits = 0;

workspace.vcl98.patch:

Index: workspace.vcl98.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-10/workspace.vcl98.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- workspace.vcl98.patch	19 Dec 2008 11:49:45 -0000	1.1
+++ workspace.vcl98.patch	12 Jan 2009 12:27:43 -0000	1.2
@@ -100,3 +100,27 @@
  	int i;
  
  	for( i = 0; i < TOGGLE_LAST; i++ )
+Index: unx/gtk/gdi/salnativewidgets-gtk.cxx
+===================================================================
+RCS file: /cvs/gsl/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx,v
+retrieving revision 1.47
+diff -u -r1.47 salnativewidgets-gtk.cxx
+--- openoffice.org.orig/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx	16 Jun 2008 14:30:38 -0000	1.47
++++ openoffice.org/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx	12 Dec 2008 11:14:39 -0000
+@@ -405,6 +408,8 @@
+     
+     if( SalGetDesktopEnvironment().equalsAscii( "KDE" ) )
+     {
++        // Ensure that theme is instantiated to test for QtEngineStyle
++        GtkWidget *pThemeInstantiater = gtk_button_new();
+         if( g_type_from_name( "QtEngineStyle" ) )
+         {
+             // KDE 3.3 invented a bug in the qt<->gtk theme engine
+@@ -412,6 +417,7 @@
+             // ignore the clip rectangle passed to the paint methods
+             GtkSalGraphics::bNeedPixmapPaint = GtkSalGraphics::bGlobalNeedPixmapPaint = true;
+         }
++        gtk_widget_destroy(pThemeInstantiater);
+     }
+     static const char* pEnv = getenv( "SAL_GTK_USE_PIXMAPPAINT" );
+     if( pEnv && *pEnv )


--- openoffice.org-2.0.3.ooo80816.selinux.bridges.patch DELETED ---


--- openoffice.org-2.3.0.ooo80257.sd.textonlystyle.patch DELETED ---


--- openoffice.org-2.3.0.ooo80257.sd.textonlystyle.tar.gz DELETED ---


--- openoffice.org-2.4.0.ooo87490.sfx2.allprotocols.urlopen.patch DELETED ---


--- openoffice.org-3.0.0.ooo86142.serbiannumbering.patch DELETED ---


--- openoffice.org-3.0.0.ooo90072.sw.undo-longtext.patch DELETED ---


--- openoffice.org-3.0.0.ooo91904.sd.wrongindex.patch DELETED ---


--- openoffice.org-3.0.0.ooo93419.svx.ref_deref.before.ctored.patch DELETED ---


--- openoffice.org-3.0.0.ooo93942.svx.accessibity-loops.patch DELETED ---


--- openoffice.org-3.0.0.ooo93949.sw.better_rtf_encodings.patch DELETED ---


--- openoffice.org-3.0.0.ooo94659.sal.magazine.patch DELETED ---


--- openoffice.org-3.0.0.ooo95341.cppcanvas.patch DELETED ---


--- openoffice.org-3.0.0.ooo95392.sysui.csv.patch DELETED ---


--- openoffice.org-3.0.0.ooo95533.sw.safertableexport.patch DELETED ---


--- openoffice.org-3.0.0.ooo95793.goodies.met.patch DELETED ---


--- openoffice.org-3.0.0.ooo95908.pyuno.debugging.spew.patch DELETED ---


--- openoffice.org-3.0.0.ooo96203.sfx2.3layer-qstart.patch DELETED ---


--- openoffice.org-3.0.1.ooo97196.vcl.ensuretheme.whenqttesting.patch DELETED ---


--- workspace.dba301a.patch DELETED ---


--- workspace.impress161.patch DELETED ---


--- workspace.impress163.patch DELETED ---



From caolanm at fedoraproject.org  Mon Jan 12 12:29:32 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Mon, 12 Jan 2009 12:29:32 +0000 (UTC)
Subject: rpms/openoffice.org/F-10 openoffice.org.spec,1.1708,1.1709
Message-ID: <20090112122932.8656A70123@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21604

Modified Files:
	openoffice.org.spec 
Log Message:
bump F-10 to 3.0.1


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-10/openoffice.org.spec,v
retrieving revision 1.1708
retrieving revision 1.1709
diff -u -r1.1708 -r1.1709
--- openoffice.org.spec	12 Jan 2009 12:27:42 -0000	1.1708
+++ openoffice.org.spec	12 Jan 2009 12:29:02 -0000	1.1709
@@ -1383,12 +1383,11 @@
 %patch54 -p1 -b .ooo96391.sw.prefsalwaysmodified.patch
 %patch55 -p1 -b .workspace.tkr16.patch
 %patch56 -p1
-%patch57 -p0 -b .workspace.transogl03.patch
-%patch58 -p1 -b .workspace.vcl97.patch
-%patch59 -p1 -b .workspace.vcl98.patch
-%patch60 -p1 -b .ooo97428.config_office.xinerama-on-x86_64.patch
-%patch61 -p1 -b .oooXXXXX.extensions.npapi.patch
-%patch62 -p1 -b .ooo97975.bridges.mainalreadyexited.patch
+%patch57 -p1 -b .workspace.vcl97.patch
+%patch58 -p1 -b .workspace.vcl98.patch
+%patch59 -p1 -b .ooo97428.config_office.xinerama-on-x86_64.patch
+%patch60 -p1 -b .oooXXXXX.extensions.npapi.patch
+%patch61 -p1 -b .ooo97975.bridges.mainalreadyexited.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`



From caolanm at fedoraproject.org  Mon Jan 12 12:31:54 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Mon, 12 Jan 2009 12:31:54 +0000 (UTC)
Subject: rpms/openoffice.org/devel openoffice.org.spec,1.1750,1.1751
Message-ID: <20090112123154.3AE0870123@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21948

Modified Files:
	openoffice.org.spec 
Log Message:
unreferenced patch


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1750
retrieving revision 1.1751
diff -u -r1.1750 -r1.1751
--- openoffice.org.spec	12 Jan 2009 11:41:15 -0000	1.1750
+++ openoffice.org.spec	12 Jan 2009 12:31:23 -0000	1.1751
@@ -133,6 +133,7 @@
 Patch60: openoffice.org-3.0.1.ooo97428.config_office.xinerama-on-x86_64.patch
 Patch61: openoffice.org-3.0.1.oooXXXXX.extensions.npapi.patch
 Patch62: openoffice.org-3.0.1.ooo97975.bridges.mainalreadyexited.patch
+Patch63: openoffice.org-3.0.1.ooo97488.sw.ww8toc.patch
 
 %define instdir %{_libdir}
 %define baseinstdir %{instdir}/openoffice.org
@@ -1413,6 +1414,7 @@
 %patch60 -p1 -b .ooo97428.config_office.xinerama-on-x86_64.patch
 %patch61 -p1 -b .oooXXXXX.extensions.npapi.patch
 %patch62 -p1 -b .ooo97975.bridges.mainalreadyexited.patch
+%patch63 -p1 -b .ooo97488.sw.ww8toc.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`



From caolanm at fedoraproject.org  Mon Jan 12 12:33:26 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Mon, 12 Jan 2009 12:33:26 +0000 (UTC)
Subject: rpms/openoffice.org/F-10 workspace.impressfontsize.tar.gz,NONE,1.1
Message-ID: <20090112123326.1F1AD70123@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22152

Added Files:
	workspace.impressfontsize.tar.gz 
Log Message:
missing bits


--- NEW FILE workspace.impressfontsize.tar.gz ---
?
j?/NA*?3?S??F&??od?????????????At????@??????uXA??B???UE?5:R.Oy???z?????]??H???.9???g??????f?*??k??|????u??]Z~??????zq???????"??S7P?}?J???????v?????????|?????+W_??T??~???f?"???^?3W|:
???G?(?`??Q0
F?(?`??Q0
F?(?`??Q0
F?(?`??Q0?



From kzak at fedoraproject.org  Mon Jan 12 12:36:11 2009
From: kzak at fedoraproject.org (Karel Zak)
Date: Mon, 12 Jan 2009 12:36:11 +0000 (UTC)
Subject: rpms/words/devel words.spec,1.17,1.18
Message-ID: <20090112123611.074D170123@cvs1.fedora.phx.redhat.com>

Author: kzak

Update of /cvs/pkgs/rpms/words/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22360

Modified Files:
	words.spec 
Log Message:
- fix spec file typo



Index: words.spec
===================================================================
RCS file: /cvs/pkgs/rpms/words/devel/words.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- words.spec	12 Jan 2009 12:21:02 -0000	1.17
+++ words.spec	12 Jan 2009 12:35:40 -0000	1.18
@@ -31,7 +31,7 @@
 %prep
 %setup -q -c
 %patch0 -p1
-%patch1 -p1 -b .kzak
+%patch1 -p1
 
 %build
 cd mwords



From kzak at fedoraproject.org  Mon Jan 12 12:49:26 2009
From: kzak at fedoraproject.org (Karel Zak)
Date: Mon, 12 Jan 2009 12:49:26 +0000 (UTC)
Subject: rpms/words/F-10 words-3.0-presidents.patch, NONE, 1.1 words.spec,
	1.16, 1.17
Message-ID: <20090112124926.6378770123@cvs1.fedora.phx.redhat.com>

Author: kzak

Update of /cvs/pkgs/rpms/words/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23390

Modified Files:
	words.spec 
Added Files:
	words-3.0-presidents.patch 
Log Message:
* Mon Jan 12 2009 Karel Zak <kzak at redhat.com> - 3.0-13.1
- fix #457309 - contains both 'unnecessary' and 'unneccesary'
- fix #470921 -"Barack" and "Obama" are not in /usr/share/dict/words


words-3.0-presidents.patch:

--- NEW FILE words-3.0-presidents.patch ---
diff -up /dev/null words-3.0/mwords/70presid.nam
--- /dev/null	2009-01-07 09:15:55.031018896 +0100
+++ words-3.0/mwords/70presid.nam	2009-01-12 12:22:46.000000000 +0100
@@ -0,0 +1,70 @@
+Abraham
+Adams
+Andrew
+Arthur
+Barack
+Benjamin
+Bill
+Buchanan
+Buren
+Bush
+Calvin
+Carter
+Chester
+Cleveland
+Clinton
+Coolidge
+Dwight
+Eisenhower
+Fillmore
+Ford
+Franklin
+Garfield
+George
+Gerald
+Grant
+Grover
+Harding
+Harrison
+Harry
+Hayes
+Herbert
+Hoover
+Jackson
+James
+Jefferson
+Jimmy
+John
+Johnson
+Kennedy
+Lincoln
+Lyndon
+Madison
+Martin
+McKinley
+Millard
+Monroe
+Nixon
+Obama
+Pierce
+Polk
+Quincy
+Reagan
+Richard
+Ronald
+Roosevelt
+Rutherford
+Taft
+Taylor
+Theodore
+Thomas
+Truman
+Tyler
+Ulysses
+Van
+Warren
+Washington
+William
+Wilson
+Woodrow
+Zachary
diff -up words-3.0/mwords/readme.txt.kzak words-3.0/mwords/readme.txt
--- words-3.0/mwords/readme.txt.kzak	2009-01-12 12:28:41.000000000 +0100
+++ words-3.0/mwords/readme.txt	2009-01-12 12:28:24.000000000 +0100
@@ -119,6 +119,10 @@ Version Bible ranked and counted by orde
 The most frequently occurring 467 substrings occurring in a
 best-selling novel by Amy Tan in 1990.
 
+70 names of presidents
+This file consists of the 70 names (first and last names) or American
+presidents (to 2009). Added by Karel Zak for Fedora Linux distribution.
+
 USA Constitution
 The Constitution of the United States, including the Bill of Rights
 and all amendments current to 1993.


Index: words.spec
===================================================================
RCS file: /cvs/pkgs/rpms/words/F-10/words.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- words.spec	23 Jun 2008 13:08:17 -0000	1.16
+++ words.spec	12 Jan 2009 12:48:56 -0000	1.17
@@ -1,7 +1,7 @@
 Summary: A dictionary of English words for the /usr/share/dict directory
 Name: words
 Version: 3.0
-Release: 13%{?dist}
+Release: 13.1%{?dist}
 License: Public Domain
 Group: System Environment/Libraries
 Source: mwords.tar.Z
@@ -18,7 +18,10 @@
 
 #428582 - linux.words contains misspelled word "flourescent"
 #440146 - misspelled word in /usr/share/dict/words (architecure)
+#457309 - contains both 'unnecessary' and 'unneccesary'
 Patch0: words-3.0-typos.patch
+#470921 -"Barack" and "Obama" are not in /usr/share/dict/words
+Patch1: words-3.0-presidents.patch
 
 %description
 The words file is a dictionary of English words for the
@@ -26,10 +29,10 @@
 words to check spelling. Password checkers use it to look for bad
 passwords.
 
-
 %prep
 %setup -q -c
 %patch0 -p1
+%patch1 -p1
 
 %build
 cd mwords
@@ -78,6 +81,10 @@
 %{_datadir}/dict/words
 
 %changelog
+* Mon Jan 12 2009 Karel Zak <kzak at redhat.com> - 3.0-13.1
+- fix #457309 - contains both 'unnecessary' and 'unneccesary'
+- fix #470921 -"Barack" and "Obama" are not in /usr/share/dict/words
+
 * Mon Jun 23 2008 Karel Zak <kzak at redhat.com> - 3.0-13
 - fix #428582 - linux.words contains misspelled word "flourescent"
 - fix #440146 - misspelled word in /usr/share/dict/words (architecure)



From caolanm at fedoraproject.org  Mon Jan 12 12:55:43 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Mon, 12 Jan 2009 12:55:43 +0000 (UTC)
Subject: rpms/openoffice.org/F-10 .cvsignore,1.191,1.192
Message-ID: <20090112125543.D5F0C70123@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24491

Modified Files:
	.cvsignore 
Log Message:
tweak


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-10/.cvsignore,v
retrieving revision 1.191
retrieving revision 1.192
diff -u -r1.191 -r1.192
--- .cvsignore	1 Oct 2008 13:30:40 -0000	1.191
+++ .cvsignore	12 Jan 2009 12:55:13 -0000	1.192
@@ -5,4 +5,4 @@
 redhat-templates.tar.gz
 redhat-registry.tar.gz
 redhat-langpacks.tar.gz
-OOO300_m9.tar.bz2
+OOO300_m15.tar.bz2



From lucilanga at fedoraproject.org  Mon Jan 12 13:05:08 2009
From: lucilanga at fedoraproject.org (Lucian Langa)
Date: Mon, 12 Jan 2009 13:05:08 +0000 (UTC)
Subject: rpms/tqsllib/devel tqsllib-2.0-openssl.patch, 1.1, 1.2 tqsllib.spec,
	1.1, 1.2
Message-ID: <20090112130508.66E1570123@cvs1.fedora.phx.redhat.com>

Author: lucilanga

Update of /cvs/pkgs/rpms/tqsllib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25322

Modified Files:
	tqsllib-2.0-openssl.patch tqsllib.spec 
Log Message:
 Mon Jan 12 2009 Lucian Langa <cooly at gnome.eu.org> - 2.0-5
- modify patch0 to include fix for #479650 (CVE-2008-5077 related)

tqsllib-2.0-openssl.patch:

Index: tqsllib-2.0-openssl.patch
===================================================================
RCS file: /cvs/pkgs/rpms/tqsllib/devel/tqsllib-2.0-openssl.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tqsllib-2.0-openssl.patch	24 Aug 2008 09:24:52 -0000	1.1
+++ tqsllib-2.0-openssl.patch	12 Jan 2009 13:05:08 -0000	1.2
@@ -1,5 +1,14 @@
 --- tqsllib-2.0/openssl_cert.cpp	2005-03-11 14:47:11.000000000 +0200
-+++ tqsllib-openssl/openssl_cert.cpp	2008-02-26 08:27:47.000000000 +0200
++++ tqsllib-2.0-mod/openssl_cert.cpp	2009-01-12 14:58:00.000000000 +0200
+@@ -1178,7 +1178,7 @@
+ 	}
+ 	EVP_VerifyInit(&ctx, EVP_sha1());
+ 	EVP_VerifyUpdate(&ctx, data, datalen);
+-	if (!EVP_VerifyFinal(&ctx, sig, slen, TQSL_API_TO_CERT(cert)->key)) {
++	if (EVP_VerifyFinal(&ctx, sig, slen, TQSL_API_TO_CERT(cert)->key) <= 0) {
+ 		tQSL_Error = TQSL_OPENSSL_ERROR;
+ 		return 1;
+ 	}
 @@ -1288,7 +1288,7 @@
  							sk_ASN1_TYPE_push(attrib->value.set, val);
  #if (OPENSSL_VERSION_NUMBER & 0xfffff000) == 0x00906000


Index: tqsllib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tqsllib/devel/tqsllib.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tqsllib.spec	24 Aug 2008 09:24:52 -0000	1.1
+++ tqsllib.spec	12 Jan 2009 13:05:08 -0000	1.2
@@ -1,6 +1,6 @@
 Name: tqsllib
 Version: 2.0
-Release: 4%{?dist}
+Release: 5%{?dist}
 Summary: The TrustedQSL library
 Group: Development/Libraries
 License: BSD
@@ -79,6 +79,9 @@
 %postun -p /sbin/ldconfig
 
 %changelog
+* Mon Jan 12 2009 Lucian Langa <cooly at gnome.eu.org> - 2.0-5
+- modify patch0 to include fix for #479650 (CVE-2008-5077 related)
+
 * Thu Aug 21 2008 Lucian Langa <cooly at gnome.eu.org> - 2.0-4
 - make directory own by package
 



From jwboyer at fedoraproject.org  Mon Jan 12 13:38:36 2009
From: jwboyer at fedoraproject.org (Joshua W. Boyer)
Date: Mon, 12 Jan 2009 13:38:36 +0000 (UTC)
Subject: rpms/quilt/F-10 quilt-rpm-4.6-setup.patch, NONE, 1.1 quilt.spec,
	1.18, 1.19
Message-ID: <20090112133836.0F28670123@cvs1.fedora.phx.redhat.com>

Author: jwboyer

Update of /cvs/pkgs/rpms/quilt/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29191/F-10

Modified Files:
	quilt.spec 
Added Files:
	quilt-rpm-4.6-setup.patch 
Log Message:
* Tue Jan 13 2009 - jwboyer at gmail.com - 0.47-2
- Fix 'quilt setup' for rpm 4.6 (bug 473557)


quilt-rpm-4.6-setup.patch:

--- NEW FILE quilt-rpm-4.6-setup.patch ---
Index: quilt/scripts/inspect.in
===================================================================
RCS file: /sources/quilt/quilt/quilt/scripts/inspect.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- quilt/scripts/inspect.in	8 Aug 2007 10:20:52 -0000	1.6
+++ quilt/scripts/inspect.in	29 Nov 2008 15:00:50 -0000	1.7
@@ -245,6 +245,8 @@ export PATH="$tmpdir/bin:$PATH"
 rpmbuild --eval "%define _sourcedir $sourcedir" \
 	 --eval "%define _specdir   $specdir" \
 	 --eval "%define _builddir  $tmpdir/build" \
+	 --eval "%define __patch    $tmpdir/bin/patch" \
+	 --eval "%define __tar      $tmpdir/bin/tar" \
 	 --nodeps \
 	 -bp "$specdir/$specfile" < /dev/null >&2
 status=$?


Index: quilt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/quilt/F-10/quilt.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- quilt.spec	22 Aug 2008 14:23:01 -0000	1.18
+++ quilt.spec	12 Jan 2009 13:38:05 -0000	1.19
@@ -7,7 +7,7 @@
 License:	GPLv2
 Group:		Development/Tools
 Version:	0.47
-Release:	1%{?dist}
+Release:	2%{?dist}
 Source:		http://savannah.nongnu.org/download/quilt/quilt-%{version}.tar.gz
 URL:		http://savannah.nongnu.org/projects/quilt
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -23,6 +23,7 @@
 Requires: util-linux-ng
 Requires: tar
 Requires: rpm-build
+Patch0:   quilt-rpm-4.6-setup.patch
 
 %description
 These scripts allow one to manage a series of patches by keeping track of the
@@ -33,6 +34,7 @@
 
 %prep
 %setup
+%patch0 -p0
 
 %build
 %configure --with-mta=%{_sbindir}/sendmail --with-diffstat=%{_bindir}/diffstat
@@ -62,6 +64,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Tue Jan 13 2009 - jwboyer at gmail.com - 0.47-2
+- Fix 'quilt setup' for rpm 4.6 (bug 473557)
+
 * Thu Aug 21 2008 - jwboyer at gmail.com 0.47-1
 - Update to latest release
 



From jwboyer at fedoraproject.org  Mon Jan 12 13:38:36 2009
From: jwboyer at fedoraproject.org (Joshua W. Boyer)
Date: Mon, 12 Jan 2009 13:38:36 +0000 (UTC)
Subject: rpms/quilt/devel quilt-rpm-4.6-setup.patch, NONE, 1.1 quilt.spec,
	1.18, 1.19
Message-ID: <20090112133836.449A170123@cvs1.fedora.phx.redhat.com>

Author: jwboyer

Update of /cvs/pkgs/rpms/quilt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29191/devel

Modified Files:
	quilt.spec 
Added Files:
	quilt-rpm-4.6-setup.patch 
Log Message:
* Tue Jan 13 2009 - jwboyer at gmail.com - 0.47-2
- Fix 'quilt setup' for rpm 4.6 (bug 473557)


quilt-rpm-4.6-setup.patch:

--- NEW FILE quilt-rpm-4.6-setup.patch ---
Index: quilt/scripts/inspect.in
===================================================================
RCS file: /sources/quilt/quilt/quilt/scripts/inspect.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- quilt/scripts/inspect.in	8 Aug 2007 10:20:52 -0000	1.6
+++ quilt/scripts/inspect.in	29 Nov 2008 15:00:50 -0000	1.7
@@ -245,6 +245,8 @@ export PATH="$tmpdir/bin:$PATH"
 rpmbuild --eval "%define _sourcedir $sourcedir" \
 	 --eval "%define _specdir   $specdir" \
 	 --eval "%define _builddir  $tmpdir/build" \
+	 --eval "%define __patch    $tmpdir/bin/patch" \
+	 --eval "%define __tar      $tmpdir/bin/tar" \
 	 --nodeps \
 	 -bp "$specdir/$specfile" < /dev/null >&2
 status=$?


Index: quilt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/quilt/devel/quilt.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- quilt.spec	22 Aug 2008 14:23:01 -0000	1.18
+++ quilt.spec	12 Jan 2009 13:38:06 -0000	1.19
@@ -7,7 +7,7 @@
 License:	GPLv2
 Group:		Development/Tools
 Version:	0.47
-Release:	1%{?dist}
+Release:	2%{?dist}
 Source:		http://savannah.nongnu.org/download/quilt/quilt-%{version}.tar.gz
 URL:		http://savannah.nongnu.org/projects/quilt
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -23,6 +23,7 @@
 Requires: util-linux-ng
 Requires: tar
 Requires: rpm-build
+Patch0:   quilt-rpm-4.6-setup.patch
 
 %description
 These scripts allow one to manage a series of patches by keeping track of the
@@ -33,6 +34,7 @@
 
 %prep
 %setup
+%patch0 -p0
 
 %build
 %configure --with-mta=%{_sbindir}/sendmail --with-diffstat=%{_bindir}/diffstat
@@ -62,6 +64,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Tue Jan 13 2009 - jwboyer at gmail.com - 0.47-2
+- Fix 'quilt setup' for rpm 4.6 (bug 473557)
+
 * Thu Aug 21 2008 - jwboyer at gmail.com 0.47-1
 - Update to latest release
 



From than at fedoraproject.org  Mon Jan 12 13:43:47 2009
From: than at fedoraproject.org (Than Ngo)
Date: Mon, 12 Jan 2009 13:43:47 +0000 (UTC)
Subject: rpms/kdelibs/devel kdelibs-4.1.96-crash.patch, NONE,
	1.1 kdelibs.spec, 1.413, 1.414
Message-ID: <20090112134347.65E8770123@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdelibs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29823

Modified Files:
	kdelibs.spec 
Added Files:
	kdelibs-4.1.96-crash.patch 
Log Message:
fix a crash (appearing in KSMServer)



kdelibs-4.1.96-crash.patch:

--- NEW FILE kdelibs-4.1.96-crash.patch ---
--- kdelibs-4.1.96/plasma/framesvg.cpp.orig	2009/01/06 17:13:38	906699
+++ kdelibs-4.1.96/plasma/framesvg.cpp	2009/01/11 17:31:47	909478
@@ -583,7 +583,8 @@
             }
         }
     } else {
-        if (frame->enabledBorders & FrameSvg::LeftBorder && q->hasElement(prefix + "left")) {
+        if (frame->enabledBorders & FrameSvg::LeftBorder && q->hasElement(prefix + "left")
+                && leftHeight > 0 && frame->leftWidth > 0) {
             QPixmap left(frame->leftWidth, leftHeight);
             left.fill(Qt::transparent);
 
@@ -594,7 +595,8 @@
             p.drawTiledPixmap(QRect(leftOffset, contentTop, frame->leftWidth, contentHeight), left);
         }
 
-        if (frame->enabledBorders & FrameSvg::RightBorder && q->hasElement(prefix + "right")) {
+        if (frame->enabledBorders & FrameSvg::RightBorder && q->hasElement(prefix + "right") &&
+                leftHeight > 0 && frame->rightWidth > 0) {
             QPixmap right(frame->rightWidth, leftHeight);
             right.fill(Qt::transparent);
 
@@ -605,7 +607,8 @@
             p.drawTiledPixmap(QRect(rightOffset, contentTop, frame->rightWidth, contentHeight), right);
         }
 
-        if (frame->enabledBorders & FrameSvg::TopBorder && q->hasElement(prefix + "top")) {
+        if (frame->enabledBorders & FrameSvg::TopBorder && q->hasElement(prefix + "top")
+                && topWidth > 0 && frame->topHeight > 0) {
             QPixmap top(topWidth, frame->topHeight);
             top.fill(Qt::transparent);
 
@@ -616,7 +619,8 @@
             p.drawTiledPixmap(QRect(contentLeft, topOffset, contentWidth, frame->topHeight), top);
         }
 
-        if (frame->enabledBorders & FrameSvg::BottomBorder && q->hasElement(prefix + "bottom")) {
+        if (frame->enabledBorders & FrameSvg::BottomBorder && q->hasElement(prefix + "bottom")
+                && topWidth > 0 && frame->bottomHeight > 0) {
             QPixmap bottom(topWidth, frame->bottomHeight);
             bottom.fill(Qt::transparent);
 


Index: kdelibs.spec
===================================================================
RCS file: /cvs/extras/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.413
retrieving revision 1.414
diff -u -r1.413 -r1.414
--- kdelibs.spec	10 Jan 2009 20:54:00 -0000	1.413
+++ kdelibs.spec	12 Jan 2009 13:43:16 -0000	1.414
@@ -1,6 +1,6 @@
 Summary: K Desktop Environment 4 - Libraries
 Version: 4.1.96
-Release: 5%{?dist}
+Release: 6%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs
@@ -80,6 +80,9 @@
 Patch21: kdelibs-4.1.85-plasma-default-wallpaper.patch
 Patch22: kdelibs-4.1.96-cmake.patch
 
+# upstream
+Patch100: kdelibs-4.1.96-crash.patch
+
 BuildRequires: qt4-devel >= 4.4.0
 Requires: qt4 >= %{_qt4_version}
 Requires: xdg-utils
@@ -205,6 +208,9 @@
 %patch21 -p1 -b .plasma-default-wallpaper
 %patch22 -p1 -b .kdepimlibs-cmake
 
+# upstream patches
+%patch100 -p1 -b .crash
+
 %build
 
 mkdir -p %{_target_platform}
@@ -365,6 +371,9 @@
 
 
 %changelog
+* Mon Jan 12 2009 Than Ngo <than at redhat.com> - 4.1.96-6
+- fix a crash (appearing in KSMServer)
+
 * Sat Jan 10 2009 Than Ngo <than at redhat.com> - 4.1.96-5
 - kdeworkspace cmake files in correct place
 



From ndim at fedoraproject.org  Mon Jan 12 13:48:17 2009
From: ndim at fedoraproject.org (Hans Ulrich Niedermann)
Date: Mon, 12 Jan 2009 13:48:17 +0000 (UTC)
Subject: rpms/nted/devel nted.spec,1.10,1.11
Message-ID: <20090112134817.671F470123@cvs1.fedora.phx.redhat.com>

Author: ndim

Update of /cvs/pkgs/rpms/nted/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30578

Modified Files:
	nted.spec 
Log Message:
* Mon Jan 11 2009 Hans Ulrich Niedermann <hun at n-dimensional.de> - 1.4.17-2
- remove unneeded fontconfig hooks from spec



Index: nted.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nted/devel/nted.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- nted.spec	12 Jan 2009 01:01:24 -0000	1.10
+++ nted.spec	12 Jan 2009 13:47:47 -0000	1.11
@@ -1,9 +1,11 @@
 %define fontname ntedfont
-#define fontconf XX-%{fontname}.conf
+
+# ntedfont is a special purpose symbol font, and thus needs
+# no fontconfig magic.
 
 Name:           nted
 Version:        1.4.17
-Release:        1.1%{?dist}
+Release:        2%{?dist}
 Summary:        Musical score editor
 Summary(de):    Partitureditor
 
@@ -13,7 +15,6 @@
 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
-#Source2:        nted-fonts-fontconfig.conf
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 BuildRequires:  gtk2-devel alsa-lib-devel
@@ -75,15 +76,6 @@
 ln -s %{_fontdir}/ntedfont.pfa \
       %{buildroot}%{_datadir}/%{name}/ntedfont.pfa \
 
-# fontconfig magic
-#install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} \
-#                   %{buildroot}%{_fontconfig_confdir}
-
-#install -m 0644 -p %{SOURCE2} \
-#        %{buildroot}%{_fontconfig_templatedir}/%{fontconf}
-#ln -s %{_fontconfig_templatedir}/%{fontconf} \
-#      %{buildroot}%{_fontconfig_confdir}/%{fontconf}
-
 
 %clean
 rm -rf %{buildroot}
@@ -99,7 +91,6 @@
 %{_mandir}/*/*
 
 
-#_font_pkg -n fonts -f %{fontconf} *.pfa
 %_font_pkg -n fonts *.pfa
 
 %doc
@@ -107,6 +98,9 @@
 
 
 %changelog
+* Mon Jan 11 2009 Hans Ulrich Niedermann <hun at n-dimensional.de> - 1.4.17-2
+- remove unneeded fontconfig hooks from spec
+
 * Sun Jan 11 2009 Hans Ulrich Niedermann <hun at n-dimensional.de> - 1.4.17-1.1
 - remove wrongly encoded german description
 - use new font packaging rules



From lucilanga at fedoraproject.org  Mon Jan 12 13:49:45 2009
From: lucilanga at fedoraproject.org (Lucian Langa)
Date: Mon, 12 Jan 2009 13:49:45 +0000 (UTC)
Subject: rpms/tqsllib/F-10 tqsllib-2.0-openssl.patch, 1.1, 1.2 tqsllib.spec, 
	1.1, 1.2
Message-ID: <20090112134945.9BB2770123@cvs1.fedora.phx.redhat.com>

Author: lucilanga

Update of /cvs/pkgs/rpms/tqsllib/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30927

Modified Files:
	tqsllib-2.0-openssl.patch tqsllib.spec 
Log Message:
* Mon Jan 12 2009 Lucian Langa <cooly at gnome.eu.org> - 2.0-5
- modify patch0 to include fix for #479650 (CVE-2008-5077 related)

tqsllib-2.0-openssl.patch:

Index: tqsllib-2.0-openssl.patch
===================================================================
RCS file: /cvs/pkgs/rpms/tqsllib/F-10/tqsllib-2.0-openssl.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tqsllib-2.0-openssl.patch	24 Aug 2008 09:24:52 -0000	1.1
+++ tqsllib-2.0-openssl.patch	12 Jan 2009 13:49:45 -0000	1.2
@@ -1,5 +1,14 @@
 --- tqsllib-2.0/openssl_cert.cpp	2005-03-11 14:47:11.000000000 +0200
-+++ tqsllib-openssl/openssl_cert.cpp	2008-02-26 08:27:47.000000000 +0200
++++ tqsllib-2.0-mod/openssl_cert.cpp	2009-01-12 14:58:00.000000000 +0200
+@@ -1178,7 +1178,7 @@
+ 	}
+ 	EVP_VerifyInit(&ctx, EVP_sha1());
+ 	EVP_VerifyUpdate(&ctx, data, datalen);
+-	if (!EVP_VerifyFinal(&ctx, sig, slen, TQSL_API_TO_CERT(cert)->key)) {
++	if (EVP_VerifyFinal(&ctx, sig, slen, TQSL_API_TO_CERT(cert)->key) <= 0) {
+ 		tQSL_Error = TQSL_OPENSSL_ERROR;
+ 		return 1;
+ 	}
 @@ -1288,7 +1288,7 @@
  							sk_ASN1_TYPE_push(attrib->value.set, val);
  #if (OPENSSL_VERSION_NUMBER & 0xfffff000) == 0x00906000


Index: tqsllib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tqsllib/F-10/tqsllib.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tqsllib.spec	24 Aug 2008 09:24:52 -0000	1.1
+++ tqsllib.spec	12 Jan 2009 13:49:45 -0000	1.2
@@ -1,6 +1,6 @@
 Name: tqsllib
 Version: 2.0
-Release: 4%{?dist}
+Release: 5%{?dist}
 Summary: The TrustedQSL library
 Group: Development/Libraries
 License: BSD
@@ -79,6 +79,9 @@
 %postun -p /sbin/ldconfig
 
 %changelog
+* Mon Jan 12 2009 Lucian Langa <cooly at gnome.eu.org> - 2.0-5
+- modify patch0 to include fix for #479650 (CVE-2008-5077 related)
+
 * Thu Aug 21 2008 Lucian Langa <cooly at gnome.eu.org> - 2.0-4
 - make directory own by package
 



From mlichvar at fedoraproject.org  Mon Jan 12 13:54:16 2009
From: mlichvar at fedoraproject.org (Miroslav Lichvar)
Date: Mon, 12 Jan 2009 13:54:16 +0000 (UTC)
Subject: rpms/ntp/devel ntp-4.2.4p6-mlock.patch, NONE, 1.1 .cvsignore, 1.27, 
	1.28 ntp.spec, 1.83, 1.84 sources, 1.28,
	1.29 ntp-4.2.4p5-mlock.patch, 1.1, NONE
Message-ID: <20090112135416.AACFF70123@cvs1.fedora.phx.redhat.com>

Author: mlichvar

Update of /cvs/pkgs/rpms/ntp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31501

Modified Files:
	.cvsignore ntp.spec sources 
Added Files:
	ntp-4.2.4p6-mlock.patch 
Removed Files:
	ntp-4.2.4p5-mlock.patch 
Log Message:
- update to 4.2.4p6 (CVE-2009-0021)


ntp-4.2.4p6-mlock.patch:

--- NEW FILE ntp-4.2.4p6-mlock.patch ---
diff -up ntp-4.2.4p6/html/ntpd.html.mlock ntp-4.2.4p6/html/ntpd.html
--- ntp-4.2.4p6/html/ntpd.html.mlock	2009-01-12 12:50:50.000000000 +0100
+++ ntp-4.2.4p6/html/ntpd.html	2009-01-12 12:50:50.000000000 +0100
@@ -34,7 +34,7 @@
 		</ul>
 		<hr>
 		<h4 id="synop">Synopsis</h4>
-		<tt>ntpd [ -46aAbdDgLnNqx ] [ -c <i>conffile</i> ] [ -f <i>driftfile</i> ] [ -i <i>jaildir</i> ] [ -I <i>iface</i> ] [ -k <i>keyfile</i> ] [ -l <i>logfile</i> ] [ -p <i>pidfile</i> ] [ -P <i>priority</i> ] [ -r <i>broadcastdelay</i> ] [ -s <i>statsdir</i> ] [ -t <i>key</i> ] [ -u <i>user</i>[:<i>group</i>] ] [ -U <i>interface_update_interval</i> ] [ -v <i>variable</i> ] [ -V <i>variable</i> ]</tt>
+		<tt>ntpd [ -46aAbdDgLmnNqx ] [ -c <i>conffile</i> ] [ -f <i>driftfile</i> ] [ -i <i>jaildir</i> ] [ -I <i>iface</i> ] [ -k <i>keyfile</i> ] [ -l <i>logfile</i> ] [ -p <i>pidfile</i> ] [ -P <i>priority</i> ] [ -r <i>broadcastdelay</i> ] [ -s <i>statsdir</i> ] [ -t <i>key</i> ] [ -u <i>user</i>[:<i>group</i>] ] [ -U <i>interface_update_interval</i> ] [ -v <i>variable</i> ] [ -V <i>variable</i> ]</tt>
 		<h4 id="descr">Description</h4>
 		<p>The <tt>ntpd</tt> program is an operating system daemon which sets and maintains the system time of day in synchronism with Internet standard time servers. It is a complete implementation of the Network Time Protocol (NTP) version 4, but also retains compatibility with version 3, as defined by RFC-1305, and version 1 and 2, as defined by RFC-1059 and RFC-1119, respectively. <tt>ntpd</tt> does most computations in 64-bit floating point arithmetic and does relatively clumsy 64-bit fixed point operations only when necessary to preserve the ultimate precision, about 232 picoseconds. While the ultimate precision is not achievable with ordinary workstations and networks of today, it may be required with future gigahertz CPU clocks and gigabit LANs.</p>
 		<h4 id="op">How NTP Operates</h4>
@@ -96,6 +96,8 @@
 			<dd>Specify the name and path of the log file. The default is the system log file. This is the same operation as the <tt>logfile <i>logfile</i></tt> configuration command.
 			<dt><tt>-L</tt>
 			<dd>Do not listen to virtual IPs. The default is to listen.
+			<dt><tt>-m</tt>
+			<dd>Lock memory.
 			<dt><tt>-n</tt>
 			<dd>Don't fork.
 			<dt><tt>-N</tt>
diff -up ntp-4.2.4p6/ntpd/ntpd-opts.c.mlock ntp-4.2.4p6/ntpd/ntpd-opts.c
--- ntp-4.2.4p6/ntpd/ntpd-opts.c.mlock	2009-01-08 12:11:54.000000000 +0100
+++ ntp-4.2.4p6/ntpd/ntpd-opts.c	2009-01-12 12:50:50.000000000 +0100
@@ -264,6 +264,15 @@ tSCC    zNice_Name[]               = "ni
 #define NICE_FLAGS       (OPTST_DISABLED)
 
 /*
+ *  Mlock option description:
+ */
+tSCC    zMlockText[] =
+        "Lock memory";
+tSCC    zMlock_NAME[]               = "MLOCK";
+tSCC    zMlock_Name[]               = "mlock";
+#define MLOCK_FLAGS       (OPTST_DISABLED)
+
+/*
  *  Pidfile option description:
  */
 tSCC    zPidfileText[] =
@@ -789,6 +798,18 @@ static tOptDesc optDesc[ OPTION_CT ] = {
                                 OPTST_ARG_OPTIONAL | OPTST_IMM | OPTST_NO_INIT
 #endif
 
+  {  /* entry idx, value */ 29, VALUE_OPT_MLOCK,
+     /* equiv idx, value */ 29, VALUE_OPT_MLOCK,
+     /* equivalenced to  */ NO_EQUIVALENT,
+     /* min, max, act ct */ 0, 1, 0,
+     /* opt state flags  */ MLOCK_FLAGS, 0,
+     /* last opt argumnt */ { NULL },
+     /* arg list/cookie  */ NULL,
+     /* must/cannot opts */ NULL, NULL,
+     /* option proc      */ NULL,
+     /* desc, NAME, name */ zMlockText, zMlock_NAME, zMlock_Name,
+     /* disablement strs */ NULL, NULL },
+
   {  /* entry idx, value */ INDEX_OPT_VERSION, VALUE_OPT_VERSION,
      /* equiv idx value  */ NO_EQUIVALENT, 0,
      /* equivalenced to  */ NO_EQUIVALENT,
@@ -881,7 +902,7 @@ tOptions ntpdOptions = {
       NO_EQUIVALENT /* index of '-#' option */,
       NO_EQUIVALENT /* index of default opt */
     },
-    32 /* full option count */, 29 /* user option count */
+    33 /* full option count */, 30 /* user option count */
 };
 
 /*
diff -up ntp-4.2.4p6/ntpd/ntpd-opts.h.mlock ntp-4.2.4p6/ntpd/ntpd-opts.h
--- ntp-4.2.4p6/ntpd/ntpd-opts.h.mlock	2009-01-08 12:11:54.000000000 +0100
+++ ntp-4.2.4p6/ntpd/ntpd-opts.h	2009-01-12 12:50:50.000000000 +0100
@@ -81,12 +81,13 @@ typedef enum {
         INDEX_OPT_VAR              = 26,
         INDEX_OPT_DVAR             = 27,
         INDEX_OPT_SLEW             = 28,
-        INDEX_OPT_VERSION          = 29,
-        INDEX_OPT_HELP             = 30,
-        INDEX_OPT_MORE_HELP        = 31
+        INDEX_OPT_MLOCK            = 29,
+        INDEX_OPT_VERSION          = 30,
+        INDEX_OPT_HELP             = 31,
+        INDEX_OPT_MORE_HELP        = 32
 } teOptIndex;
 
-#define OPTION_CT    32
+#define OPTION_CT    33
 #define NTPD_VERSION       "4.2.4p6"
 #define NTPD_FULL_VERSION  "ntpd - NTP daemon program - Ver. 4.2.4p6"
 
@@ -179,6 +180,10 @@ typedef enum {
 #  warning undefining MODIFYMMTIMER due to option name conflict
 #  undef   MODIFYMMTIMER
 # endif
+# ifdef    MLOCK
+#  warning undefining MLOCK due to option name conflict
+#  undef   MLOCK
+# endif
 # ifdef    NOFORK
 #  warning undefining NOFORK due to option name conflict
 #  undef   NOFORK
@@ -248,6 +253,7 @@ typedef enum {
 # undef LOGFILE
 # undef NOVIRTUALIPS
 # undef MODIFYMMTIMER
+# undef MLOCK
 # undef NOFORK
 # undef NICE
 # undef PIDFILE
@@ -290,6 +296,7 @@ typedef enum {
 #ifdef SYS_WINNT
 #define VALUE_OPT_MODIFYMMTIMER  'M'
 #endif /* SYS_WINNT */
+#define VALUE_OPT_MLOCK          'm'
 #define VALUE_OPT_NOFORK         'n'
 #define VALUE_OPT_NICE           'N'
 #define VALUE_OPT_PIDFILE        'p'
diff -up ntp-4.2.4p6/ntpd/ntpd.c.mlock ntp-4.2.4p6/ntpd/ntpd.c
--- ntp-4.2.4p6/ntpd/ntpd.c.mlock	2009-01-12 12:50:50.000000000 +0100
+++ ntp-4.2.4p6/ntpd/ntpd.c	2009-01-12 12:50:50.000000000 +0100
@@ -699,7 +699,8 @@ ntpdmain(
 	}
 #endif
 
-#if defined(HAVE_MLOCKALL) && defined(MCL_CURRENT) && defined(MCL_FUTURE)
+#if defined(MCL_CURRENT) && defined(MCL_FUTURE)
+    if (HAVE_OPT( MLOCK )) {
 # ifdef HAVE_SETRLIMIT
 	/*
 	 * Set the stack limit to something smaller, so that we don't lock a lot
@@ -737,6 +738,7 @@ ntpdmain(
 	 */
 	if (mlockall(MCL_CURRENT|MCL_FUTURE) < 0)
 		msyslog(LOG_ERR, "mlockall(): %m");
+    }
 #else /* not (HAVE_MLOCKALL && MCL_CURRENT && MCL_FUTURE) */
 # ifdef HAVE_PLOCK
 #  ifdef PROCLOCK


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ntp/devel/.cvsignore,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- .cvsignore	29 Aug 2008 08:26:04 -0000	1.27
+++ .cvsignore	12 Jan 2009 13:53:46 -0000	1.28
@@ -1,2 +1,2 @@
 ntpstat-0.2.tgz
-ntp-4.2.4p5.tar.gz
+ntp-4.2.4p6.tar.gz


Index: ntp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ntp/devel/ntp.spec,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- ntp.spec	8 Oct 2008 11:10:47 -0000	1.83
+++ ntp.spec	12 Jan 2009 13:53:46 -0000	1.84
@@ -1,7 +1,7 @@
 Summary: The NTP daemon and utilities
 Name: ntp
-Version: 4.2.4p5
-Release: 2%{?dist}
+Version: 4.2.4p6
+Release: 1%{?dist}
 # primary license (COPYRIGHT) : MIT
 # ElectricFence/ (not used) : GPLv2
 # kernel/sys/ppsclock.h (not used) : BSD with advertising
@@ -57,10 +57,13 @@
 Patch11: ntp-4.2.4p2-filegen.patch
 # ntpbz #738
 Patch12: ntp-4.2.4-sprintf.patch
+# drop this and switch to libedit in 4.2.6
 Patch13: ntp-4.2.4p4-bsdadv.patch
-Patch14: ntp-4.2.4p5-mlock.patch
+# add option -m to lock memory
+Patch14: ntp-4.2.4p6-mlock.patch
 # fixed in 4.2.5
 Patch15: ntp-4.2.4p2-clockselect.patch
+# don't build sntp
 Patch16: ntp-4.2.4p2-nosntp.patch
 # ntpbz #802
 Patch17: ntp-4.2.4p5-sleep.patch
@@ -155,7 +158,7 @@
 %patch5 -p1 -b .linkfastmath
 %endif
 
-# replace some BSD with advertising code
+# replace BSD with advertising code in ntp{dc,q} to allow linking with readline
 for f in include/{ntp_rfc2553,rsa_md5}.h \
 	libntp/{mktime,memmove,md5c,ntp_rfc2553,ntp_random}.c
 do rm -f $f; touch $f; done
@@ -308,6 +311,9 @@
 %{_mandir}/man8/ntpdate.8*
 
 %changelog
+* Mon Jan 12 2009 Miroslav Lichvar <mlichvar at redhat.com> 4.2.4p6-1
+- update to 4.2.4p6 (CVE-2009-0021)
+
 * Wed Oct 08 2008 Miroslav Lichvar <mlichvar at redhat.com> 4.2.4p5-2
 - retry failed name resolution few times before giving up (#460561)
 - don't write drift file upon exit


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ntp/devel/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- sources	29 Aug 2008 08:26:04 -0000	1.28
+++ sources	12 Jan 2009 13:53:46 -0000	1.29
@@ -1,2 +1,2 @@
 6b2bedefe2e7c63ea52609b222022121  ntpstat-0.2.tgz
-eb647e07ecbd6e9e07bf8d3dc555490e  ntp-4.2.4p5.tar.gz
+1961c2c12b66b9046d5df37d0a41b181  ntp-4.2.4p6.tar.gz


--- ntp-4.2.4p5-mlock.patch DELETED ---



From mlichvar at fedoraproject.org  Mon Jan 12 14:01:41 2009
From: mlichvar at fedoraproject.org (Miroslav Lichvar)
Date: Mon, 12 Jan 2009 14:01:41 +0000 (UTC)
Subject: rpms/ntp/F-10 ntp-4.2.4p6-mlock.patch, NONE, 1.1 .cvsignore, 1.27, 
	1.28 ntp.spec, 1.83, 1.84 sources, 1.28,
	1.29 ntp-4.2.4p5-mlock.patch, 1.1, NONE
Message-ID: <20090112140141.EE2C870123@cvs1.fedora.phx.redhat.com>

Author: mlichvar

Update of /cvs/pkgs/rpms/ntp/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv667

Modified Files:
	.cvsignore ntp.spec sources 
Added Files:
	ntp-4.2.4p6-mlock.patch 
Removed Files:
	ntp-4.2.4p5-mlock.patch 
Log Message:
- update to 4.2.4p6 (CVE-2009-0021)


ntp-4.2.4p6-mlock.patch:

--- NEW FILE ntp-4.2.4p6-mlock.patch ---
diff -up ntp-4.2.4p6/html/ntpd.html.mlock ntp-4.2.4p6/html/ntpd.html
--- ntp-4.2.4p6/html/ntpd.html.mlock	2009-01-12 12:50:50.000000000 +0100
+++ ntp-4.2.4p6/html/ntpd.html	2009-01-12 12:50:50.000000000 +0100
@@ -34,7 +34,7 @@
 		</ul>
 		<hr>
 		<h4 id="synop">Synopsis</h4>
-		<tt>ntpd [ -46aAbdDgLnNqx ] [ -c <i>conffile</i> ] [ -f <i>driftfile</i> ] [ -i <i>jaildir</i> ] [ -I <i>iface</i> ] [ -k <i>keyfile</i> ] [ -l <i>logfile</i> ] [ -p <i>pidfile</i> ] [ -P <i>priority</i> ] [ -r <i>broadcastdelay</i> ] [ -s <i>statsdir</i> ] [ -t <i>key</i> ] [ -u <i>user</i>[:<i>group</i>] ] [ -U <i>interface_update_interval</i> ] [ -v <i>variable</i> ] [ -V <i>variable</i> ]</tt>
+		<tt>ntpd [ -46aAbdDgLmnNqx ] [ -c <i>conffile</i> ] [ -f <i>driftfile</i> ] [ -i <i>jaildir</i> ] [ -I <i>iface</i> ] [ -k <i>keyfile</i> ] [ -l <i>logfile</i> ] [ -p <i>pidfile</i> ] [ -P <i>priority</i> ] [ -r <i>broadcastdelay</i> ] [ -s <i>statsdir</i> ] [ -t <i>key</i> ] [ -u <i>user</i>[:<i>group</i>] ] [ -U <i>interface_update_interval</i> ] [ -v <i>variable</i> ] [ -V <i>variable</i> ]</tt>
 		<h4 id="descr">Description</h4>
 		<p>The <tt>ntpd</tt> program is an operating system daemon which sets and maintains the system time of day in synchronism with Internet standard time servers. It is a complete implementation of the Network Time Protocol (NTP) version 4, but also retains compatibility with version 3, as defined by RFC-1305, and version 1 and 2, as defined by RFC-1059 and RFC-1119, respectively. <tt>ntpd</tt> does most computations in 64-bit floating point arithmetic and does relatively clumsy 64-bit fixed point operations only when necessary to preserve the ultimate precision, about 232 picoseconds. While the ultimate precision is not achievable with ordinary workstations and networks of today, it may be required with future gigahertz CPU clocks and gigabit LANs.</p>
 		<h4 id="op">How NTP Operates</h4>
@@ -96,6 +96,8 @@
 			<dd>Specify the name and path of the log file. The default is the system log file. This is the same operation as the <tt>logfile <i>logfile</i></tt> configuration command.
 			<dt><tt>-L</tt>
 			<dd>Do not listen to virtual IPs. The default is to listen.
+			<dt><tt>-m</tt>
+			<dd>Lock memory.
 			<dt><tt>-n</tt>
 			<dd>Don't fork.
 			<dt><tt>-N</tt>
diff -up ntp-4.2.4p6/ntpd/ntpd-opts.c.mlock ntp-4.2.4p6/ntpd/ntpd-opts.c
--- ntp-4.2.4p6/ntpd/ntpd-opts.c.mlock	2009-01-08 12:11:54.000000000 +0100
+++ ntp-4.2.4p6/ntpd/ntpd-opts.c	2009-01-12 12:50:50.000000000 +0100
@@ -264,6 +264,15 @@ tSCC    zNice_Name[]               = "ni
 #define NICE_FLAGS       (OPTST_DISABLED)
 
 /*
+ *  Mlock option description:
+ */
+tSCC    zMlockText[] =
+        "Lock memory";
+tSCC    zMlock_NAME[]               = "MLOCK";
+tSCC    zMlock_Name[]               = "mlock";
+#define MLOCK_FLAGS       (OPTST_DISABLED)
+
+/*
  *  Pidfile option description:
  */
 tSCC    zPidfileText[] =
@@ -789,6 +798,18 @@ static tOptDesc optDesc[ OPTION_CT ] = {
                                 OPTST_ARG_OPTIONAL | OPTST_IMM | OPTST_NO_INIT
 #endif
 
+  {  /* entry idx, value */ 29, VALUE_OPT_MLOCK,
+     /* equiv idx, value */ 29, VALUE_OPT_MLOCK,
+     /* equivalenced to  */ NO_EQUIVALENT,
+     /* min, max, act ct */ 0, 1, 0,
+     /* opt state flags  */ MLOCK_FLAGS, 0,
+     /* last opt argumnt */ { NULL },
+     /* arg list/cookie  */ NULL,
+     /* must/cannot opts */ NULL, NULL,
+     /* option proc      */ NULL,
+     /* desc, NAME, name */ zMlockText, zMlock_NAME, zMlock_Name,
+     /* disablement strs */ NULL, NULL },
+
   {  /* entry idx, value */ INDEX_OPT_VERSION, VALUE_OPT_VERSION,
      /* equiv idx value  */ NO_EQUIVALENT, 0,
      /* equivalenced to  */ NO_EQUIVALENT,
@@ -881,7 +902,7 @@ tOptions ntpdOptions = {
       NO_EQUIVALENT /* index of '-#' option */,
       NO_EQUIVALENT /* index of default opt */
     },
-    32 /* full option count */, 29 /* user option count */
+    33 /* full option count */, 30 /* user option count */
 };
 
 /*
diff -up ntp-4.2.4p6/ntpd/ntpd-opts.h.mlock ntp-4.2.4p6/ntpd/ntpd-opts.h
--- ntp-4.2.4p6/ntpd/ntpd-opts.h.mlock	2009-01-08 12:11:54.000000000 +0100
+++ ntp-4.2.4p6/ntpd/ntpd-opts.h	2009-01-12 12:50:50.000000000 +0100
@@ -81,12 +81,13 @@ typedef enum {
         INDEX_OPT_VAR              = 26,
         INDEX_OPT_DVAR             = 27,
         INDEX_OPT_SLEW             = 28,
-        INDEX_OPT_VERSION          = 29,
-        INDEX_OPT_HELP             = 30,
-        INDEX_OPT_MORE_HELP        = 31
+        INDEX_OPT_MLOCK            = 29,
+        INDEX_OPT_VERSION          = 30,
+        INDEX_OPT_HELP             = 31,
+        INDEX_OPT_MORE_HELP        = 32
 } teOptIndex;
 
-#define OPTION_CT    32
+#define OPTION_CT    33
 #define NTPD_VERSION       "4.2.4p6"
 #define NTPD_FULL_VERSION  "ntpd - NTP daemon program - Ver. 4.2.4p6"
 
@@ -179,6 +180,10 @@ typedef enum {
 #  warning undefining MODIFYMMTIMER due to option name conflict
 #  undef   MODIFYMMTIMER
 # endif
+# ifdef    MLOCK
+#  warning undefining MLOCK due to option name conflict
+#  undef   MLOCK
+# endif
 # ifdef    NOFORK
 #  warning undefining NOFORK due to option name conflict
 #  undef   NOFORK
@@ -248,6 +253,7 @@ typedef enum {
 # undef LOGFILE
 # undef NOVIRTUALIPS
 # undef MODIFYMMTIMER
+# undef MLOCK
 # undef NOFORK
 # undef NICE
 # undef PIDFILE
@@ -290,6 +296,7 @@ typedef enum {
 #ifdef SYS_WINNT
 #define VALUE_OPT_MODIFYMMTIMER  'M'
 #endif /* SYS_WINNT */
+#define VALUE_OPT_MLOCK          'm'
 #define VALUE_OPT_NOFORK         'n'
 #define VALUE_OPT_NICE           'N'
 #define VALUE_OPT_PIDFILE        'p'
diff -up ntp-4.2.4p6/ntpd/ntpd.c.mlock ntp-4.2.4p6/ntpd/ntpd.c
--- ntp-4.2.4p6/ntpd/ntpd.c.mlock	2009-01-12 12:50:50.000000000 +0100
+++ ntp-4.2.4p6/ntpd/ntpd.c	2009-01-12 12:50:50.000000000 +0100
@@ -699,7 +699,8 @@ ntpdmain(
 	}
 #endif
 
-#if defined(HAVE_MLOCKALL) && defined(MCL_CURRENT) && defined(MCL_FUTURE)
+#if defined(MCL_CURRENT) && defined(MCL_FUTURE)
+    if (HAVE_OPT( MLOCK )) {
 # ifdef HAVE_SETRLIMIT
 	/*
 	 * Set the stack limit to something smaller, so that we don't lock a lot
@@ -737,6 +738,7 @@ ntpdmain(
 	 */
 	if (mlockall(MCL_CURRENT|MCL_FUTURE) < 0)
 		msyslog(LOG_ERR, "mlockall(): %m");
+    }
 #else /* not (HAVE_MLOCKALL && MCL_CURRENT && MCL_FUTURE) */
 # ifdef HAVE_PLOCK
 #  ifdef PROCLOCK


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ntp/F-10/.cvsignore,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- .cvsignore	29 Aug 2008 08:26:04 -0000	1.27
+++ .cvsignore	12 Jan 2009 14:01:11 -0000	1.28
@@ -1,2 +1,2 @@
 ntpstat-0.2.tgz
-ntp-4.2.4p5.tar.gz
+ntp-4.2.4p6.tar.gz


Index: ntp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ntp/F-10/ntp.spec,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- ntp.spec	8 Oct 2008 11:10:47 -0000	1.83
+++ ntp.spec	12 Jan 2009 14:01:11 -0000	1.84
@@ -1,7 +1,7 @@
 Summary: The NTP daemon and utilities
 Name: ntp
-Version: 4.2.4p5
-Release: 2%{?dist}
+Version: 4.2.4p6
+Release: 1%{?dist}
 # primary license (COPYRIGHT) : MIT
 # ElectricFence/ (not used) : GPLv2
 # kernel/sys/ppsclock.h (not used) : BSD with advertising
@@ -57,10 +57,13 @@
 Patch11: ntp-4.2.4p2-filegen.patch
 # ntpbz #738
 Patch12: ntp-4.2.4-sprintf.patch
+# drop this and switch to libedit in 4.2.6
 Patch13: ntp-4.2.4p4-bsdadv.patch
-Patch14: ntp-4.2.4p5-mlock.patch
+# add option -m to lock memory
+Patch14: ntp-4.2.4p6-mlock.patch
 # fixed in 4.2.5
 Patch15: ntp-4.2.4p2-clockselect.patch
+# don't build sntp
 Patch16: ntp-4.2.4p2-nosntp.patch
 # ntpbz #802
 Patch17: ntp-4.2.4p5-sleep.patch
@@ -155,7 +158,7 @@
 %patch5 -p1 -b .linkfastmath
 %endif
 
-# replace some BSD with advertising code
+# replace BSD with advertising code in ntp{dc,q} to allow linking with readline
 for f in include/{ntp_rfc2553,rsa_md5}.h \
 	libntp/{mktime,memmove,md5c,ntp_rfc2553,ntp_random}.c
 do rm -f $f; touch $f; done
@@ -308,6 +311,9 @@
 %{_mandir}/man8/ntpdate.8*
 
 %changelog
+* Mon Jan 12 2009 Miroslav Lichvar <mlichvar at redhat.com> 4.2.4p6-1
+- update to 4.2.4p6 (CVE-2009-0021)
+
 * Wed Oct 08 2008 Miroslav Lichvar <mlichvar at redhat.com> 4.2.4p5-2
 - retry failed name resolution few times before giving up (#460561)
 - don't write drift file upon exit


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ntp/F-10/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- sources	29 Aug 2008 08:26:04 -0000	1.28
+++ sources	12 Jan 2009 14:01:11 -0000	1.29
@@ -1,2 +1,2 @@
 6b2bedefe2e7c63ea52609b222022121  ntpstat-0.2.tgz
-eb647e07ecbd6e9e07bf8d3dc555490e  ntp-4.2.4p5.tar.gz
+1961c2c12b66b9046d5df37d0a41b181  ntp-4.2.4p6.tar.gz


--- ntp-4.2.4p5-mlock.patch DELETED ---



From jwboyer at fedoraproject.org  Mon Jan 12 14:05:33 2009
From: jwboyer at fedoraproject.org (Joshua W. Boyer)
Date: Mon, 12 Jan 2009 14:05:33 +0000 (UTC)
Subject: rpms/jfsutils/devel .cvsignore, 1.9, 1.10 jfsutils.spec, 1.21,
	1.22 sources, 1.9, 1.10
Message-ID: <20090112140533.5BE4370123@cvs1.fedora.phx.redhat.com>

Author: jwboyer

Update of /cvs/pkgs/rpms/jfsutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1222

Modified Files:
	.cvsignore jfsutils.spec sources 
Log Message:
* Tue Jan 13 2009 Josh Boyer <jwboyer at gmail.com> - 1.1.13-1
- Update to latest release (bug 479565)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/jfsutils/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	28 Aug 2007 11:53:39 -0000	1.9
+++ .cvsignore	12 Jan 2009 14:05:02 -0000	1.10
@@ -1 +1 @@
-jfsutils-1.1.12.tar.gz
+jfsutils-1.1.13.tar.gz


Index: jfsutils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jfsutils/devel/jfsutils.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- jfsutils.spec	19 Feb 2008 07:32:41 -0000	1.21
+++ jfsutils.spec	12 Jan 2009 14:05:02 -0000	1.22
@@ -1,7 +1,7 @@
 Summary: Utilities for managing the JFS filesystem.
 Name: jfsutils
-Version: 1.1.12
-Release: 2
+Version: 1.1.13
+Release: 1
 Source0: jfsutils-%{version}.tar.gz
 URL: http://jfs.sourceforge.net/
 Group: System Environment/Base
@@ -44,6 +44,9 @@
 %doc AUTHORS COPYING INSTALL NEWS README ChangeLog
 
 %changelog
+* Tue Jan 13 2009 Josh Boyer <jwboyer at gmail.com> - 1.1.13-1
+- Update to latest release (bug 479565)
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1.1.12-2
 - Autorebuild for GCC 4.3
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/jfsutils/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	28 Aug 2007 11:53:39 -0000	1.9
+++ sources	12 Jan 2009 14:05:02 -0000	1.10
@@ -1 +1 @@
-10efa993a62113530645fc7b3fa542f4  jfsutils-1.1.12.tar.gz
+14ad3a2eb26e55ef34ac0569f5739ccc  jfsutils-1.1.13.tar.gz



From atkac at fedoraproject.org  Mon Jan 12 14:10:35 2009
From: atkac at fedoraproject.org (Adam Tkac)
Date: Mon, 12 Jan 2009 14:10:35 +0000 (UTC)
Subject: rpms/mtools/devel mtools.spec,1.39,1.40
Message-ID: <20090112141035.3478670123@cvs1.fedora.phx.redhat.com>

Author: atkac

Update of /cvs/pkgs/rpms/mtools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1863

Modified Files:
	mtools.spec 
Log Message:
- don't ship infodir/dir.gz (#478322)



Index: mtools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mtools/devel/mtools.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- mtools.spec	1 Dec 2008 11:12:58 -0000	1.39
+++ mtools.spec	12 Jan 2009 14:10:04 -0000	1.40
@@ -1,7 +1,7 @@
 Summary: Programs for accessing MS-DOS disks without mounting the disks
 Name: mtools
 Version: 4.0.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Group: Applications/System
 Source: http://mtools.linux.lu/mtools-%{version}.tar.bz2
@@ -46,6 +46,9 @@
 # We aren't shipping this.
 find $RPM_BUILD_ROOT -name "floppyd*" -exec rm {} \;
 
+# dir.gz is handled in %%post and %%preun sections
+rm -f $RPM_BUILD_ROOT/%{_infodir}/dir.gz
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -63,9 +66,12 @@
 %doc COPYING Changelog README Release.notes
 /usr/bin/*
 %{_mandir}/*/*
-%{_infodir}/*
+%{_infodir}/%{name}.info.gz
 
 %changelog
+* Mon Jan 12 2009 Adam Tkac <atkac redhat com> 4.0.0-2
+- don't ship infodir/dir.gz (#478322)
+
 * Mon Dec 01 2008 Adam Tkac <atkac redhat com> 4.0.0-1
 - updated to 4.0.0
 



From mlichvar at fedoraproject.org  Mon Jan 12 14:12:23 2009
From: mlichvar at fedoraproject.org (Miroslav Lichvar)
Date: Mon, 12 Jan 2009 14:12:23 +0000 (UTC)
Subject: rpms/ntp/F-9 ntp-4.2.4p6-mlock.patch, NONE, 1.1 .cvsignore, 1.27,
	1.28 ntp.spec, 1.83, 1.84 sources, 1.28,
	1.29 ntp-4.2.4p5-mlock.patch, 1.1, NONE
Message-ID: <20090112141223.4F8D170123@cvs1.fedora.phx.redhat.com>

Author: mlichvar

Update of /cvs/pkgs/rpms/ntp/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1906

Modified Files:
	.cvsignore ntp.spec sources 
Added Files:
	ntp-4.2.4p6-mlock.patch 
Removed Files:
	ntp-4.2.4p5-mlock.patch 
Log Message:
- update to 4.2.4p6 (CVE-2009-0021)


ntp-4.2.4p6-mlock.patch:

--- NEW FILE ntp-4.2.4p6-mlock.patch ---
diff -up ntp-4.2.4p6/html/ntpd.html.mlock ntp-4.2.4p6/html/ntpd.html
--- ntp-4.2.4p6/html/ntpd.html.mlock	2009-01-12 12:50:50.000000000 +0100
+++ ntp-4.2.4p6/html/ntpd.html	2009-01-12 12:50:50.000000000 +0100
@@ -34,7 +34,7 @@
 		</ul>
 		<hr>
 		<h4 id="synop">Synopsis</h4>
-		<tt>ntpd [ -46aAbdDgLnNqx ] [ -c <i>conffile</i> ] [ -f <i>driftfile</i> ] [ -i <i>jaildir</i> ] [ -I <i>iface</i> ] [ -k <i>keyfile</i> ] [ -l <i>logfile</i> ] [ -p <i>pidfile</i> ] [ -P <i>priority</i> ] [ -r <i>broadcastdelay</i> ] [ -s <i>statsdir</i> ] [ -t <i>key</i> ] [ -u <i>user</i>[:<i>group</i>] ] [ -U <i>interface_update_interval</i> ] [ -v <i>variable</i> ] [ -V <i>variable</i> ]</tt>
+		<tt>ntpd [ -46aAbdDgLmnNqx ] [ -c <i>conffile</i> ] [ -f <i>driftfile</i> ] [ -i <i>jaildir</i> ] [ -I <i>iface</i> ] [ -k <i>keyfile</i> ] [ -l <i>logfile</i> ] [ -p <i>pidfile</i> ] [ -P <i>priority</i> ] [ -r <i>broadcastdelay</i> ] [ -s <i>statsdir</i> ] [ -t <i>key</i> ] [ -u <i>user</i>[:<i>group</i>] ] [ -U <i>interface_update_interval</i> ] [ -v <i>variable</i> ] [ -V <i>variable</i> ]</tt>
 		<h4 id="descr">Description</h4>
 		<p>The <tt>ntpd</tt> program is an operating system daemon which sets and maintains the system time of day in synchronism with Internet standard time servers. It is a complete implementation of the Network Time Protocol (NTP) version 4, but also retains compatibility with version 3, as defined by RFC-1305, and version 1 and 2, as defined by RFC-1059 and RFC-1119, respectively. <tt>ntpd</tt> does most computations in 64-bit floating point arithmetic and does relatively clumsy 64-bit fixed point operations only when necessary to preserve the ultimate precision, about 232 picoseconds. While the ultimate precision is not achievable with ordinary workstations and networks of today, it may be required with future gigahertz CPU clocks and gigabit LANs.</p>
 		<h4 id="op">How NTP Operates</h4>
@@ -96,6 +96,8 @@
 			<dd>Specify the name and path of the log file. The default is the system log file. This is the same operation as the <tt>logfile <i>logfile</i></tt> configuration command.
 			<dt><tt>-L</tt>
 			<dd>Do not listen to virtual IPs. The default is to listen.
+			<dt><tt>-m</tt>
+			<dd>Lock memory.
 			<dt><tt>-n</tt>
 			<dd>Don't fork.
 			<dt><tt>-N</tt>
diff -up ntp-4.2.4p6/ntpd/ntpd-opts.c.mlock ntp-4.2.4p6/ntpd/ntpd-opts.c
--- ntp-4.2.4p6/ntpd/ntpd-opts.c.mlock	2009-01-08 12:11:54.000000000 +0100
+++ ntp-4.2.4p6/ntpd/ntpd-opts.c	2009-01-12 12:50:50.000000000 +0100
@@ -264,6 +264,15 @@ tSCC    zNice_Name[]               = "ni
 #define NICE_FLAGS       (OPTST_DISABLED)
 
 /*
+ *  Mlock option description:
+ */
+tSCC    zMlockText[] =
+        "Lock memory";
+tSCC    zMlock_NAME[]               = "MLOCK";
+tSCC    zMlock_Name[]               = "mlock";
+#define MLOCK_FLAGS       (OPTST_DISABLED)
+
+/*
  *  Pidfile option description:
  */
 tSCC    zPidfileText[] =
@@ -789,6 +798,18 @@ static tOptDesc optDesc[ OPTION_CT ] = {
                                 OPTST_ARG_OPTIONAL | OPTST_IMM | OPTST_NO_INIT
 #endif
 
+  {  /* entry idx, value */ 29, VALUE_OPT_MLOCK,
+     /* equiv idx, value */ 29, VALUE_OPT_MLOCK,
+     /* equivalenced to  */ NO_EQUIVALENT,
+     /* min, max, act ct */ 0, 1, 0,
+     /* opt state flags  */ MLOCK_FLAGS, 0,
+     /* last opt argumnt */ { NULL },
+     /* arg list/cookie  */ NULL,
+     /* must/cannot opts */ NULL, NULL,
+     /* option proc      */ NULL,
+     /* desc, NAME, name */ zMlockText, zMlock_NAME, zMlock_Name,
+     /* disablement strs */ NULL, NULL },
+
   {  /* entry idx, value */ INDEX_OPT_VERSION, VALUE_OPT_VERSION,
      /* equiv idx value  */ NO_EQUIVALENT, 0,
      /* equivalenced to  */ NO_EQUIVALENT,
@@ -881,7 +902,7 @@ tOptions ntpdOptions = {
       NO_EQUIVALENT /* index of '-#' option */,
       NO_EQUIVALENT /* index of default opt */
     },
-    32 /* full option count */, 29 /* user option count */
+    33 /* full option count */, 30 /* user option count */
 };
 
 /*
diff -up ntp-4.2.4p6/ntpd/ntpd-opts.h.mlock ntp-4.2.4p6/ntpd/ntpd-opts.h
--- ntp-4.2.4p6/ntpd/ntpd-opts.h.mlock	2009-01-08 12:11:54.000000000 +0100
+++ ntp-4.2.4p6/ntpd/ntpd-opts.h	2009-01-12 12:50:50.000000000 +0100
@@ -81,12 +81,13 @@ typedef enum {
         INDEX_OPT_VAR              = 26,
         INDEX_OPT_DVAR             = 27,
         INDEX_OPT_SLEW             = 28,
-        INDEX_OPT_VERSION          = 29,
-        INDEX_OPT_HELP             = 30,
-        INDEX_OPT_MORE_HELP        = 31
+        INDEX_OPT_MLOCK            = 29,
+        INDEX_OPT_VERSION          = 30,
+        INDEX_OPT_HELP             = 31,
+        INDEX_OPT_MORE_HELP        = 32
 } teOptIndex;
 
-#define OPTION_CT    32
+#define OPTION_CT    33
 #define NTPD_VERSION       "4.2.4p6"
 #define NTPD_FULL_VERSION  "ntpd - NTP daemon program - Ver. 4.2.4p6"
 
@@ -179,6 +180,10 @@ typedef enum {
 #  warning undefining MODIFYMMTIMER due to option name conflict
 #  undef   MODIFYMMTIMER
 # endif
+# ifdef    MLOCK
+#  warning undefining MLOCK due to option name conflict
+#  undef   MLOCK
+# endif
 # ifdef    NOFORK
 #  warning undefining NOFORK due to option name conflict
 #  undef   NOFORK
@@ -248,6 +253,7 @@ typedef enum {
 # undef LOGFILE
 # undef NOVIRTUALIPS
 # undef MODIFYMMTIMER
+# undef MLOCK
 # undef NOFORK
 # undef NICE
 # undef PIDFILE
@@ -290,6 +296,7 @@ typedef enum {
 #ifdef SYS_WINNT
 #define VALUE_OPT_MODIFYMMTIMER  'M'
 #endif /* SYS_WINNT */
+#define VALUE_OPT_MLOCK          'm'
 #define VALUE_OPT_NOFORK         'n'
 #define VALUE_OPT_NICE           'N'
 #define VALUE_OPT_PIDFILE        'p'
diff -up ntp-4.2.4p6/ntpd/ntpd.c.mlock ntp-4.2.4p6/ntpd/ntpd.c
--- ntp-4.2.4p6/ntpd/ntpd.c.mlock	2009-01-12 12:50:50.000000000 +0100
+++ ntp-4.2.4p6/ntpd/ntpd.c	2009-01-12 12:50:50.000000000 +0100
@@ -699,7 +699,8 @@ ntpdmain(
 	}
 #endif
 
-#if defined(HAVE_MLOCKALL) && defined(MCL_CURRENT) && defined(MCL_FUTURE)
+#if defined(MCL_CURRENT) && defined(MCL_FUTURE)
+    if (HAVE_OPT( MLOCK )) {
 # ifdef HAVE_SETRLIMIT
 	/*
 	 * Set the stack limit to something smaller, so that we don't lock a lot
@@ -737,6 +738,7 @@ ntpdmain(
 	 */
 	if (mlockall(MCL_CURRENT|MCL_FUTURE) < 0)
 		msyslog(LOG_ERR, "mlockall(): %m");
+    }
 #else /* not (HAVE_MLOCKALL && MCL_CURRENT && MCL_FUTURE) */
 # ifdef HAVE_PLOCK
 #  ifdef PROCLOCK


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ntp/F-9/.cvsignore,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- .cvsignore	29 Aug 2008 08:36:37 -0000	1.27
+++ .cvsignore	12 Jan 2009 14:11:52 -0000	1.28
@@ -1,2 +1,2 @@
 ntpstat-0.2.tgz
-ntp-4.2.4p5.tar.gz
+ntp-4.2.4p6.tar.gz


Index: ntp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ntp/F-9/ntp.spec,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- ntp.spec	8 Oct 2008 11:29:13 -0000	1.83
+++ ntp.spec	12 Jan 2009 14:11:52 -0000	1.84
@@ -1,7 +1,7 @@
 Summary: The NTP daemon and utilities
 Name: ntp
-Version: 4.2.4p5
-Release: 2%{?dist}
+Version: 4.2.4p6
+Release: 1%{?dist}
 # primary license (COPYRIGHT) : MIT
 # ElectricFence/ (not used) : GPLv2
 # kernel/sys/ppsclock.h (not used) : BSD with advertising
@@ -57,10 +57,13 @@
 Patch11: ntp-4.2.4p2-filegen.patch
 # ntpbz #738
 Patch12: ntp-4.2.4-sprintf.patch
+# drop this and switch to libedit in 4.2.6
 Patch13: ntp-4.2.4p4-bsdadv.patch
-Patch14: ntp-4.2.4p5-mlock.patch
+# add option -m to lock memory
+Patch14: ntp-4.2.4p6-mlock.patch
 # fixed in 4.2.5
 Patch15: ntp-4.2.4p2-clockselect.patch
+# don't build sntp
 Patch16: ntp-4.2.4p2-nosntp.patch
 # ntpbz #802
 Patch17: ntp-4.2.4p5-sleep.patch
@@ -152,7 +155,7 @@
 %patch5 -p1 -b .linkfastmath
 %endif
 
-# replace some BSD with advertising code
+# replace BSD with advertising code in ntp{dc,q} to allow linking with readline
 for f in include/{ntp_rfc2553,rsa_md5}.h \
 	libntp/{mktime,memmove,md5c,ntp_rfc2553,ntp_random}.c
 do rm -f $f; touch $f; done
@@ -305,6 +308,9 @@
 %{_mandir}/man8/ntpdate.8*
 
 %changelog
+* Mon Jan 12 2009 Miroslav Lichvar <mlichvar at redhat.com> 4.2.4p6-1.fc9
+- update to 4.2.4p6 (CVE-2009-0021)
+
 * Wed Oct 08 2008 Miroslav Lichvar <mlichvar at redhat.com> 4.2.4p5-2.fc9
 - don't write drift file upon exit
 - run ntpq with full path in ntp-wait script


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ntp/F-9/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- sources	29 Aug 2008 08:36:37 -0000	1.28
+++ sources	12 Jan 2009 14:11:52 -0000	1.29
@@ -1,2 +1,2 @@
 6b2bedefe2e7c63ea52609b222022121  ntpstat-0.2.tgz
-eb647e07ecbd6e9e07bf8d3dc555490e  ntp-4.2.4p5.tar.gz
+1961c2c12b66b9046d5df37d0a41b181  ntp-4.2.4p6.tar.gz


--- ntp-4.2.4p5-mlock.patch DELETED ---



From lucilanga at fedoraproject.org  Mon Jan 12 14:18:27 2009
From: lucilanga at fedoraproject.org (Lucian Langa)
Date: Mon, 12 Jan 2009 14:18:27 +0000 (UTC)
Subject: rpms/tqsllib/F-9 tqsllib-2.0-openssl.patch, 1.1, 1.2 tqsllib.spec,
	1.1, 1.2
Message-ID: <20090112141827.3847C70123@cvs1.fedora.phx.redhat.com>

Author: lucilanga

Update of /cvs/pkgs/rpms/tqsllib/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2810

Modified Files:
	tqsllib-2.0-openssl.patch tqsllib.spec 
Log Message:
* Mon Jan 12 2009 Lucian Langa <cooly at gnome.eu.org> - 2.0-5
- modify patch0 to include fix for #479650 (CVE-2008-5077 related)

tqsllib-2.0-openssl.patch:

Index: tqsllib-2.0-openssl.patch
===================================================================
RCS file: /cvs/pkgs/rpms/tqsllib/F-9/tqsllib-2.0-openssl.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tqsllib-2.0-openssl.patch	24 Aug 2008 09:31:17 -0000	1.1
+++ tqsllib-2.0-openssl.patch	12 Jan 2009 14:17:56 -0000	1.2
@@ -1,5 +1,14 @@
 --- tqsllib-2.0/openssl_cert.cpp	2005-03-11 14:47:11.000000000 +0200
-+++ tqsllib-openssl/openssl_cert.cpp	2008-02-26 08:27:47.000000000 +0200
++++ tqsllib-2.0-mod/openssl_cert.cpp	2009-01-12 14:58:00.000000000 +0200
+@@ -1178,7 +1178,7 @@
+ 	}
+ 	EVP_VerifyInit(&ctx, EVP_sha1());
+ 	EVP_VerifyUpdate(&ctx, data, datalen);
+-	if (!EVP_VerifyFinal(&ctx, sig, slen, TQSL_API_TO_CERT(cert)->key)) {
++	if (EVP_VerifyFinal(&ctx, sig, slen, TQSL_API_TO_CERT(cert)->key) <= 0) {
+ 		tQSL_Error = TQSL_OPENSSL_ERROR;
+ 		return 1;
+ 	}
 @@ -1288,7 +1288,7 @@
  							sk_ASN1_TYPE_push(attrib->value.set, val);
  #if (OPENSSL_VERSION_NUMBER & 0xfffff000) == 0x00906000


Index: tqsllib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tqsllib/F-9/tqsllib.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tqsllib.spec	24 Aug 2008 09:31:17 -0000	1.1
+++ tqsllib.spec	12 Jan 2009 14:17:56 -0000	1.2
@@ -1,6 +1,6 @@
 Name: tqsllib
 Version: 2.0
-Release: 4%{?dist}
+Release: 5%{?dist}
 Summary: The TrustedQSL library
 Group: Development/Libraries
 License: BSD
@@ -79,6 +79,9 @@
 %postun -p /sbin/ldconfig
 
 %changelog
+* Mon Jan 12 2009 Lucian Langa <cooly at gnome.eu.org> - 2.0-5
+- modify patch0 to include fix for #479650 (CVE-2008-5077 related)
+
 * Thu Aug 21 2008 Lucian Langa <cooly at gnome.eu.org> - 2.0-4
 - make directory own by package
 



From davej at fedoraproject.org  Mon Jan 12 14:19:59 2009
From: davej at fedoraproject.org (Dave Jones)
Date: Mon, 12 Jan 2009 14:19:59 +0000 (UTC)
Subject: rpms/kernel/devel patch-2.6.29-rc1-git1.bz2.sign, NONE,
	1.1 .cvsignore, 1.988, 1.989 TODO, 1.52, 1.53 kernel.spec, 1.1208,
	1.1209 sources, 1.950, 1.951 upstream, 1.862,
	1.863 linux-2.6-efika-not-chrp.patch, 1.1,
	NONE linux-2.6-ps3-ehci-iso.patch, 1.3,
	NONE linux-2.6-ps3-legacy-bootloader-hack.patch, 1.1,
	NONE powerpc-cpufreq-fix-cpumask-breakage.patch, 1.1, NONE
Message-ID: <20090112141959.ABD9770123@cvs1.fedora.phx.redhat.com>

Author: davej

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3104

Modified Files:
	.cvsignore TODO kernel.spec sources upstream 
Added Files:
	patch-2.6.29-rc1-git1.bz2.sign 
Removed Files:
	linux-2.6-efika-not-chrp.patch linux-2.6-ps3-ehci-iso.patch 
	linux-2.6-ps3-legacy-bootloader-hack.patch 
	powerpc-cpufreq-fix-cpumask-breakage.patch 
Log Message:
2.6.29-rc1-git1


--- NEW FILE patch-2.6.29-rc1-git1.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBJazF3yGugalF9Dw4RAq61AJ4wKTQyYdw4jLO+zI3LwOU6wnrOWwCdGilF
Qftc2LCcqpBw+CV0UgYddjs=
=TeM1
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.988
retrieving revision 1.989
diff -u -r1.988 -r1.989
--- .cvsignore	11 Jan 2009 16:38:41 -0000	1.988
+++ .cvsignore	12 Jan 2009 14:19:28 -0000	1.989
@@ -6,3 +6,4 @@
 linux-2.6.28.tar.bz2
 patch-2.6.28-git14.bz2
 patch-2.6.29-rc1.bz2
+patch-2.6.29-rc1-git1.bz2


Index: TODO
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/TODO,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- TODO	10 Jan 2009 17:14:25 -0000	1.52
+++ TODO	12 Jan 2009 14:19:28 -0000	1.53
@@ -62,11 +62,8 @@
 * linux-2.6-netdev-atl2.patch
 	Should go upstream for .29 ?
 
-* 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.


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1208
retrieving revision 1.1209
diff -u -r1.1208 -r1.1209
--- kernel.spec	12 Jan 2009 01:41:53 -0000	1.1208
+++ kernel.spec	12 Jan 2009 14:19:29 -0000	1.1209
@@ -57,7 +57,7 @@
 # The rc snapshot level
 %define rcrev 1
 # The git snapshot level
-%define gitrev 0
+%define gitrev 1
 # Set rpm version accordingly
 %define rpmversion 2.6.%{upstream_sublevel}
 %endif
@@ -592,13 +592,10 @@
 
 Patch41: linux-2.6-sysrq-c.patch
 
-Patch140: linux-2.6-ps3-ehci-iso.patch
 Patch141: linux-2.6-ps3-storage-alias.patch
-Patch142: linux-2.6-ps3-legacy-bootloader-hack.patch
 Patch143: linux-2.6-g5-therm-shutdown.patch
 Patch144: linux-2.6-vio-modalias.patch
 Patch147: linux-2.6-imac-transparent-bridge.patch
-Patch149: linux-2.6-efika-not-chrp.patch
 
 Patch160: linux-2.6-execshield.patch
 Patch250: linux-2.6-debug-sizeof-structs.patch
@@ -662,7 +659,6 @@
 Patch2802: linux-2.6-silence-acpi-blacklist.patch
 
 Patch9001: revert-fix-modules_install-via-nfs.patch
-Patch9002: powerpc-cpufreq-fix-cpumask-breakage.patch
 
 %endif
 
@@ -1031,22 +1027,16 @@
 # PowerPC
 #
 ### 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
 # 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,
 ApplyPatch linux-2.6-ps3-storage-alias.patch
-# Support booting from Sony's original released 2.6.16-based kboot
-#ApplyPatch linux-2.6-ps3-legacy-bootloader-hack.patch
 # Alleviate G5 thermal shutdown problems
 ApplyPatch linux-2.6-g5-therm-shutdown.patch
 # Provide modalias in sysfs for vio devices
 ApplyPatch linux-2.6-vio-modalias.patch
 # Work around PCIe bridge setup on iSight
 ApplyPatch linux-2.6-imac-transparent-bridge.patch
-# Don't show 'CHRP' in /proc/cpuinfo on Efika
-#ApplyPatch linux-2.6-efika-not-chrp.patch
 
 #
 # SPARC64
@@ -1170,8 +1160,6 @@
 # revert 8b249b6856f16f09b0e5b79ce5f4d435e439b9d6
 ApplyPatch revert-fix-modules_install-via-nfs.patch
 
-ApplyPatch powerpc-cpufreq-fix-cpumask-breakage.patch
-
 # END OF PATCH APPLICATIONS
 
 %endif
@@ -1747,6 +1735,9 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Mon Jan 12 2009 Dave Jones <davej at redhat.com>
+- 2.6.29-rc1-git1
+
 * Sun Jan 09 2009 Kyle McMartin <kyle at redhat.com>
 - Disable CONFIG_MAXSMP on x86_64.
 - Fixup build failure in powerpc due to cpumask changes.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v
retrieving revision 1.950
retrieving revision 1.951
diff -u -r1.950 -r1.951
--- sources	11 Jan 2009 16:38:42 -0000	1.950
+++ sources	12 Jan 2009 14:19:29 -0000	1.951
@@ -1,2 +1,3 @@
 d351e44709c9810b85e29b877f50968a  linux-2.6.28.tar.bz2
 c7280469ffd1edd4b50bac92de172d46  patch-2.6.29-rc1.bz2
+f6052f0626b530ea8e1c6ba6b1ef1f01  patch-2.6.29-rc1-git1.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v
retrieving revision 1.862
retrieving revision 1.863
diff -u -r1.862 -r1.863
--- upstream	11 Jan 2009 16:38:42 -0000	1.862
+++ upstream	12 Jan 2009 14:19:29 -0000	1.863
@@ -1,2 +1,3 @@
 linux-2.6.28.tar.bz2
 patch-2.6.29-rc1.bz2
+patch-2.6.29-rc1-git1.bz2


--- linux-2.6-efika-not-chrp.patch DELETED ---


--- linux-2.6-ps3-ehci-iso.patch DELETED ---


--- linux-2.6-ps3-legacy-bootloader-hack.patch DELETED ---


--- powerpc-cpufreq-fix-cpumask-breakage.patch DELETED ---



From mgrepl at fedoraproject.org  Mon Jan 12 14:37:23 2009
From: mgrepl at fedoraproject.org (Miroslav Grepl)
Date: Mon, 12 Jan 2009 14:37:23 +0000 (UTC)
Subject: rpms/selinux-policy/F-10 policy-20080710.patch, 1.118,
	1.119 selinux-policy.spec, 1.765, 1.766
Message-ID: <20090112143723.7065C70123@cvs1.fedora.phx.redhat.com>

Author: mgrepl

Update of /cvs/extras/rpms/selinux-policy/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5225

Modified Files:
	policy-20080710.patch selinux-policy.spec 
Log Message:
- Allow cups_pdf_t mananage nfs files/dirs
- Add read_lnk_files to postfix_domain_template



policy-20080710.patch:

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.118 -r 1.119 policy-20080710.patch
Index: policy-20080710.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-10/policy-20080710.patch,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -r1.118 -r1.119
--- policy-20080710.patch	4 Jan 2009 19:45:24 -0000	1.118
+++ policy-20080710.patch	12 Jan 2009 14:37:22 -0000	1.119
@@ -1,6 +1,6 @@
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/default_contexts serefpolicy-3.5.13/config/appconfig-mcs/default_contexts
---- nsaserefpolicy/config/appconfig-mcs/default_contexts	2008-10-17 08:49:10.000000000 -0400
-+++ serefpolicy-3.5.13/config/appconfig-mcs/default_contexts	2008-11-24 10:49:49.000000000 -0500
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/default_contexts serefpolicy-3.5.13/config/appconfig-mcs/default_contexts
+--- nsaserefpolicy/config/appconfig-mcs/default_contexts	2008-10-17 14:49:10.000000000 +0200
++++ serefpolicy-3.5.13/config/appconfig-mcs/default_contexts	2009-01-12 11:52:47.000000000 +0100
 @@ -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
@@ -22,15 +22,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.13/config/appconfig-mcs/failsafe_context
---- nsaserefpolicy/config/appconfig-mcs/failsafe_context	2008-10-17 08:49:10.000000000 -0400
-+++ serefpolicy-3.5.13/config/appconfig-mcs/failsafe_context	2008-11-24 10:49:49.000000000 -0500
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/failsafe_context serefpolicy-3.5.13/config/appconfig-mcs/failsafe_context
+--- nsaserefpolicy/config/appconfig-mcs/failsafe_context	2008-10-17 14:49:10.000000000 +0200
++++ serefpolicy-3.5.13/config/appconfig-mcs/failsafe_context	2009-01-12 11:52:47.000000000 +0100
 @@ -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.13/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.13/config/appconfig-mcs/guest_u_default_contexts	2008-11-24 10:49:49.000000000 -0500
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/guest_u_default_contexts serefpolicy-3.5.13/config/appconfig-mcs/guest_u_default_contexts
+--- nsaserefpolicy/config/appconfig-mcs/guest_u_default_contexts	1970-01-01 01:00:00.000000000 +0100
++++ serefpolicy-3.5.13/config/appconfig-mcs/guest_u_default_contexts	2009-01-12 11:52:47.000000000 +0100
 @@ -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
@@ -38,9 +38,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.13/config/appconfig-mcs/root_default_contexts
---- nsaserefpolicy/config/appconfig-mcs/root_default_contexts	2008-10-17 08:49:10.000000000 -0400
-+++ serefpolicy-3.5.13/config/appconfig-mcs/root_default_contexts	2008-11-24 10:49:49.000000000 -0500
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/root_default_contexts serefpolicy-3.5.13/config/appconfig-mcs/root_default_contexts
+--- nsaserefpolicy/config/appconfig-mcs/root_default_contexts	2008-10-17 14:49:10.000000000 +0200
++++ serefpolicy-3.5.13/config/appconfig-mcs/root_default_contexts	2009-01-12 11:52:47.000000000 +0100
 @@ -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
@@ -55,18 +55,18 @@
  #
 -#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.13/config/appconfig-mcs/seusers
---- nsaserefpolicy/config/appconfig-mcs/seusers	2008-10-17 08:49:10.000000000 -0400
-+++ serefpolicy-3.5.13/config/appconfig-mcs/seusers	2008-11-24 10:49:49.000000000 -0500
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/seusers serefpolicy-3.5.13/config/appconfig-mcs/seusers
+--- nsaserefpolicy/config/appconfig-mcs/seusers	2008-10-17 14:49:10.000000000 +0200
++++ serefpolicy-3.5.13/config/appconfig-mcs/seusers	2009-01-12 11:52:47.000000000 +0100
 @@ -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.13/config/appconfig-mcs/staff_u_default_contexts
---- nsaserefpolicy/config/appconfig-mcs/staff_u_default_contexts	2008-10-17 08:49:10.000000000 -0400
-+++ serefpolicy-3.5.13/config/appconfig-mcs/staff_u_default_contexts	2008-11-24 10:49:49.000000000 -0500
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/staff_u_default_contexts serefpolicy-3.5.13/config/appconfig-mcs/staff_u_default_contexts
+--- nsaserefpolicy/config/appconfig-mcs/staff_u_default_contexts	2008-10-17 14:49:10.000000000 +0200
++++ serefpolicy-3.5.13/config/appconfig-mcs/staff_u_default_contexts	2009-01-12 11:52:47.000000000 +0100
 @@ -1,10 +1,12 @@
  system_r:local_login_t:s0	staff_r:staff_t:s0 sysadm_r:sysadm_t:s0
  system_r:remote_login_t:s0	staff_r:staff_t:s0
@@ -81,9 +81,9 @@
  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.13/config/appconfig-mcs/unconfined_u_default_contexts
---- nsaserefpolicy/config/appconfig-mcs/unconfined_u_default_contexts	2008-10-17 08:49:10.000000000 -0400
-+++ serefpolicy-3.5.13/config/appconfig-mcs/unconfined_u_default_contexts	2008-11-24 10:49:49.000000000 -0500
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/unconfined_u_default_contexts serefpolicy-3.5.13/config/appconfig-mcs/unconfined_u_default_contexts
+--- nsaserefpolicy/config/appconfig-mcs/unconfined_u_default_contexts	2008-10-17 14:49:10.000000000 +0200
++++ serefpolicy-3.5.13/config/appconfig-mcs/unconfined_u_default_contexts	2009-01-12 11:52:47.000000000 +0100
 @@ -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
@@ -91,15 +91,15 @@
 +system_r:initrc_su_t:s0		unconfined_r:unconfined_t:s0
 +unconfined_r:unconfined_t:s0	unconfined_r:unconfined_t:s0
  system_r:xdm_t:s0		unconfined_r:unconfined_t:s0
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/userhelper_context serefpolicy-3.5.13/config/appconfig-mcs/userhelper_context
---- nsaserefpolicy/config/appconfig-mcs/userhelper_context	2008-10-17 08:49:10.000000000 -0400
-+++ serefpolicy-3.5.13/config/appconfig-mcs/userhelper_context	2008-11-24 10:49:49.000000000 -0500
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/userhelper_context serefpolicy-3.5.13/config/appconfig-mcs/userhelper_context
+--- nsaserefpolicy/config/appconfig-mcs/userhelper_context	2008-10-17 14:49:10.000000000 +0200
++++ serefpolicy-3.5.13/config/appconfig-mcs/userhelper_context	2009-01-12 11:52:47.000000000 +0100
 @@ -1 +1 @@
 -system_u:sysadm_r:sysadm_t:s0
 +system_u:system_r:unconfined_t:s0	
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/user_u_default_contexts serefpolicy-3.5.13/config/appconfig-mcs/user_u_default_contexts
---- nsaserefpolicy/config/appconfig-mcs/user_u_default_contexts	2008-10-17 08:49:10.000000000 -0400
-+++ serefpolicy-3.5.13/config/appconfig-mcs/user_u_default_contexts	2008-11-24 10:49:49.000000000 -0500
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/user_u_default_contexts serefpolicy-3.5.13/config/appconfig-mcs/user_u_default_contexts
+--- nsaserefpolicy/config/appconfig-mcs/user_u_default_contexts	2008-10-17 14:49:10.000000000 +0200
++++ serefpolicy-3.5.13/config/appconfig-mcs/user_u_default_contexts	2009-01-12 11:52:47.000000000 +0100
 @@ -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
@@ -112,9 +112,9 @@
 -
 +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/xguest_u_default_contexts serefpolicy-3.5.13/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.13/config/appconfig-mcs/xguest_u_default_contexts	2008-11-24 10:49:49.000000000 -0500
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/xguest_u_default_contexts serefpolicy-3.5.13/config/appconfig-mcs/xguest_u_default_contexts
+--- nsaserefpolicy/config/appconfig-mcs/xguest_u_default_contexts	1970-01-01 01:00:00.000000000 +0100
++++ serefpolicy-3.5.13/config/appconfig-mcs/xguest_u_default_contexts	2009-01-12 11:52:47.000000000 +0100
 @@ -0,0 +1,7 @@
 +system_r:local_login_t	xguest_r:xguest_t:s0
 +system_r:remote_login_t	xguest_r:xguest_t:s0
@@ -123,9 +123,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.13/config/appconfig-mls/default_contexts
---- nsaserefpolicy/config/appconfig-mls/default_contexts	2008-10-17 08:49:10.000000000 -0400
-+++ serefpolicy-3.5.13/config/appconfig-mls/default_contexts	2008-11-24 10:49:49.000000000 -0500
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/default_contexts serefpolicy-3.5.13/config/appconfig-mls/default_contexts
+--- nsaserefpolicy/config/appconfig-mls/default_contexts	2008-10-17 14:49:10.000000000 +0200
++++ serefpolicy-3.5.13/config/appconfig-mls/default_contexts	2009-01-12 11:52:47.000000000 +0100
 @@ -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
@@ -147,17 +147,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.13/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.13/config/appconfig-mls/guest_u_default_contexts	2008-11-24 10:49:49.000000000 -0500
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/guest_u_default_contexts serefpolicy-3.5.13/config/appconfig-mls/guest_u_default_contexts
+--- nsaserefpolicy/config/appconfig-mls/guest_u_default_contexts	1970-01-01 01:00:00.000000000 +0100
++++ serefpolicy-3.5.13/config/appconfig-mls/guest_u_default_contexts	2009-01-12 11:52:47.000000000 +0100
 @@ -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.13/config/appconfig-mls/root_default_contexts
---- nsaserefpolicy/config/appconfig-mls/root_default_contexts	2008-10-17 08:49:10.000000000 -0400
-+++ serefpolicy-3.5.13/config/appconfig-mls/root_default_contexts	2008-11-24 10:49:49.000000000 -0500
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/root_default_contexts serefpolicy-3.5.13/config/appconfig-mls/root_default_contexts
+--- nsaserefpolicy/config/appconfig-mls/root_default_contexts	2008-10-17 14:49:10.000000000 +0200
++++ serefpolicy-3.5.13/config/appconfig-mls/root_default_contexts	2009-01-12 11:52:47.000000000 +0100
 @@ -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
@@ -176,9 +176,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.13/config/appconfig-mls/staff_u_default_contexts
---- nsaserefpolicy/config/appconfig-mls/staff_u_default_contexts	2008-10-17 08:49:10.000000000 -0400
-+++ serefpolicy-3.5.13/config/appconfig-mls/staff_u_default_contexts	2008-11-24 10:49:49.000000000 -0500
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/staff_u_default_contexts serefpolicy-3.5.13/config/appconfig-mls/staff_u_default_contexts
+--- nsaserefpolicy/config/appconfig-mls/staff_u_default_contexts	2008-10-17 14:49:10.000000000 +0200
++++ serefpolicy-3.5.13/config/appconfig-mls/staff_u_default_contexts	2009-01-12 11:52:47.000000000 +0100
 @@ -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
@@ -188,9 +188,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.13/config/appconfig-mls/user_u_default_contexts
---- nsaserefpolicy/config/appconfig-mls/user_u_default_contexts	2008-10-17 08:49:10.000000000 -0400
-+++ serefpolicy-3.5.13/config/appconfig-mls/user_u_default_contexts	2008-11-24 10:49:49.000000000 -0500
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/user_u_default_contexts serefpolicy-3.5.13/config/appconfig-mls/user_u_default_contexts
+--- nsaserefpolicy/config/appconfig-mls/user_u_default_contexts	2008-10-17 14:49:10.000000000 +0200
++++ serefpolicy-3.5.13/config/appconfig-mls/user_u_default_contexts	2009-01-12 11:52:47.000000000 +0100
 @@ -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
@@ -200,9 +200,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.13/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.13/config/appconfig-mls/xguest_u_default_contexts	2008-11-24 10:49:49.000000000 -0500
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/xguest_u_default_contexts serefpolicy-3.5.13/config/appconfig-mls/xguest_u_default_contexts
+--- nsaserefpolicy/config/appconfig-mls/xguest_u_default_contexts	1970-01-01 01:00:00.000000000 +0100
++++ serefpolicy-3.5.13/config/appconfig-mls/xguest_u_default_contexts	2009-01-12 11:52:47.000000000 +0100
 @@ -0,0 +1,7 @@
[...5876 lines suppressed...]
-+## </param>
-+#
-+interface(`userdom_read_all_users_state',`
-+	gen_require(`
-+		attribute userdomain;
-+	')
-+
-+	ps_process_pattern($1, userdomain)
-+	kernel_search_proc($1)
+ 		attribute userdomain;
+ 	')
+ 
+-	allow $1 userdomain:key create;
++	allow $1 userdomain:process sigchld;
 +')
 +
 +########################################
 +## <summary>
-+##	Get the attributes of all user domains.
++##	Create keys for all user domains.
 +## </summary>
 +## <param name="domain">
 +##	<summary>
@@ -35538,41 +35539,16 @@
 +##	</summary>
 +## </param>
 +#
-+interface(`userdom_getattr_all_users',`
-+	gen_require(`
-+		attribute userdomain;
- 	')
- 
- 	allow $1 userdomain:process getattr;
-@@ -5447,6 +5551,24 @@
- 
- ########################################
- ## <summary>
-+##	Send signull to all user domains.
-+## </summary>
-+## <param name="domain">
-+##	<summary>
-+##	Domain allowed access.
-+##	</summary>
-+## </param>
-+#
-+interface(`userdom_signull_all_users',`
++interface(`userdom_create_all_users_keys',`
 +	gen_require(`
 +		attribute userdomain;
 +	')
 +
-+	allow $1 userdomain:process signull;
++	allow $1 userdomain:key create;
 +')
 +
 +########################################
 +## <summary>
- ##	Send a SIGCHLD signal to all user domains.
- ## </summary>
- ## <param name="domain">
-@@ -5483,6 +5605,42 @@
- 
- ########################################
- ## <summary>
 +##	Manage keys for all user domains.
 +## </summary>
 +## <param name="domain">
@@ -35605,13 +35581,9 @@
 +	')
 +
 +	dontaudit $1 userdomain:key search;
-+')
-+
-+########################################
-+## <summary>
- ##	Send a dbus message to all user domains.
- ## </summary>
- ## <param name="domain">
+ ')
+ 
+ ########################################
 @@ -5513,3 +5671,601 @@
  interface(`userdom_unconfined',`
  	refpolicywarn(`$0($*) has been deprecated.')
@@ -36214,9 +36186,9 @@
 +
 +	dontaudit $1 admin_home_t:dir list_dir_perms;
 +')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-3.5.13/policy/modules/system/userdomain.te
---- nsaserefpolicy/policy/modules/system/userdomain.te	2008-10-17 08:49:13.000000000 -0400
-+++ serefpolicy-3.5.13/policy/modules/system/userdomain.te	2008-12-02 16:09:55.000000000 -0500
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-3.5.13/policy/modules/system/userdomain.te
+--- nsaserefpolicy/policy/modules/system/userdomain.te	2008-10-17 14:49:13.000000000 +0200
++++ serefpolicy-3.5.13/policy/modules/system/userdomain.te	2009-01-12 11:52:47.000000000 +0100
 @@ -8,13 +8,6 @@
  
  ## <desc>
@@ -36334,9 +36306,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.13/policy/modules/system/xen.fc
---- nsaserefpolicy/policy/modules/system/xen.fc	2008-10-17 08:49:13.000000000 -0400
-+++ serefpolicy-3.5.13/policy/modules/system/xen.fc	2008-11-24 10:49:49.000000000 -0500
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.fc serefpolicy-3.5.13/policy/modules/system/xen.fc
+--- nsaserefpolicy/policy/modules/system/xen.fc	2008-10-17 14:49:13.000000000 +0200
++++ serefpolicy-3.5.13/policy/modules/system/xen.fc	2009-01-12 11:52:47.000000000 +0100
 @@ -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)
@@ -36345,9 +36317,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.13/policy/modules/system/xen.if
---- nsaserefpolicy/policy/modules/system/xen.if	2008-10-17 08:49:13.000000000 -0400
-+++ serefpolicy-3.5.13/policy/modules/system/xen.if	2008-11-24 10:49:49.000000000 -0500
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.if serefpolicy-3.5.13/policy/modules/system/xen.if
+--- nsaserefpolicy/policy/modules/system/xen.if	2008-10-17 14:49:13.000000000 +0200
++++ serefpolicy-3.5.13/policy/modules/system/xen.if	2009-01-12 11:52:47.000000000 +0100
 @@ -155,7 +155,7 @@
  	stream_connect_pattern($1,xenstored_var_run_t,xenstored_var_run_t,xenstored_t)
  ')
@@ -36398,9 +36370,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.13/policy/modules/system/xen.te
---- nsaserefpolicy/policy/modules/system/xen.te	2008-10-17 08:49:13.000000000 -0400
-+++ serefpolicy-3.5.13/policy/modules/system/xen.te	2008-12-04 13:40:54.000000000 -0500
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.te serefpolicy-3.5.13/policy/modules/system/xen.te
+--- nsaserefpolicy/policy/modules/system/xen.te	2008-10-17 14:49:13.000000000 +0200
++++ serefpolicy-3.5.13/policy/modules/system/xen.te	2009-01-12 11:52:47.000000000 +0100
 @@ -6,6 +6,13 @@
  # Declarations
  #
@@ -36632,18 +36604,18 @@
 +optional_policy(`
 +	unconfined_domain(xend_t)
 +')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/policy_capabilities serefpolicy-3.5.13/policy/policy_capabilities
---- nsaserefpolicy/policy/policy_capabilities	2008-10-17 08:49:14.000000000 -0400
-+++ serefpolicy-3.5.13/policy/policy_capabilities	2008-11-24 10:49:49.000000000 -0500
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/policy_capabilities serefpolicy-3.5.13/policy/policy_capabilities
+--- nsaserefpolicy/policy/policy_capabilities	2008-10-17 14:49:14.000000000 +0200
++++ serefpolicy-3.5.13/policy/policy_capabilities	2009-01-12 11:52:47.000000000 +0100
 @@ -29,4 +29,4 @@
  # chr_file: open
  # blk_file: open
  #
 -policycap open_perms;
 +#policycap open_perms;
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/support/obj_perm_sets.spt serefpolicy-3.5.13/policy/support/obj_perm_sets.spt
---- nsaserefpolicy/policy/support/obj_perm_sets.spt	2008-10-17 08:49:14.000000000 -0400
-+++ serefpolicy-3.5.13/policy/support/obj_perm_sets.spt	2008-11-24 10:49:49.000000000 -0500
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/support/obj_perm_sets.spt serefpolicy-3.5.13/policy/support/obj_perm_sets.spt
+--- nsaserefpolicy/policy/support/obj_perm_sets.spt	2008-10-17 14:49:14.000000000 +0200
++++ serefpolicy-3.5.13/policy/support/obj_perm_sets.spt	2009-01-12 11:52:47.000000000 +0100
 @@ -59,22 +59,22 @@
  # 
  # Permissions for executing files.
@@ -36791,9 +36763,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.13/policy/users
---- nsaserefpolicy/policy/users	2008-10-17 08:49:11.000000000 -0400
-+++ serefpolicy-3.5.13/policy/users	2008-11-24 10:49:49.000000000 -0500
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/users serefpolicy-3.5.13/policy/users
+--- nsaserefpolicy/policy/users	2008-10-17 14:49:11.000000000 +0200
++++ serefpolicy-3.5.13/policy/users	2009-01-12 11:52:47.000000000 +0100
 @@ -25,11 +25,8 @@
  # permit any access to such users, then remove this entry.
  #
@@ -36818,9 +36790,9 @@
 -	gen_user(root, sysadm, sysadm_r staff_r ifdef(`enable_mls',`secadm_r auditadm_r'), s0, s0 - mls_systemhigh, mcs_allcats)
 -')
 +gen_user(root, user, unconfined_r sysadm_r staff_r ifdef(`enable_mls',`secadm_r auditadm_r') system_r, s0, s0 - mls_systemhigh, mcs_allcats)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/Rules.modular serefpolicy-3.5.13/Rules.modular
---- nsaserefpolicy/Rules.modular	2008-10-17 08:49:14.000000000 -0400
-+++ serefpolicy-3.5.13/Rules.modular	2008-11-24 10:49:49.000000000 -0500
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/Rules.modular serefpolicy-3.5.13/Rules.modular
+--- nsaserefpolicy/Rules.modular	2008-10-17 14:49:14.000000000 +0200
++++ serefpolicy-3.5.13/Rules.modular	2009-01-12 11:52:47.000000000 +0100
 @@ -73,8 +73,8 @@
  $(tmpdir)/%.mod: $(m4support) $(tmpdir)/generated_definitions.conf $(tmpdir)/all_interfaces.conf %.te
  	@echo "Compliling $(NAME) $(@F) module"
@@ -36867,9 +36839,9 @@
  # Appconfig files
  #
  $(appdir)/customizable_types: $(base_conf)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/support/Makefile.devel serefpolicy-3.5.13/support/Makefile.devel
---- nsaserefpolicy/support/Makefile.devel	2008-10-17 08:49:14.000000000 -0400
-+++ serefpolicy-3.5.13/support/Makefile.devel	2008-11-24 10:49:49.000000000 -0500
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/support/Makefile.devel serefpolicy-3.5.13/support/Makefile.devel
+--- nsaserefpolicy/support/Makefile.devel	2008-10-17 14:49:14.000000000 +0200
++++ serefpolicy-3.5.13/support/Makefile.devel	2009-01-12 11:52:47.000000000 +0100
 @@ -181,8 +181,7 @@
  tmp/%.mod: $(m4support) tmp/all_interfaces.conf %.te
  	@$(EINFO) "Compiling $(NAME) $(basename $(@F)) module"


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-10/selinux-policy.spec,v
retrieving revision 1.765
retrieving revision 1.766
diff -u -r1.765 -r1.766
--- selinux-policy.spec	4 Jan 2009 19:45:26 -0000	1.765
+++ selinux-policy.spec	12 Jan 2009 14:37:22 -0000	1.766
@@ -20,7 +20,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.5.13
-Release: 38%{?dist}
+Release: 39%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -459,6 +459,10 @@
 %endif
 
 %changelog
+* Mon Jan 12 2009 Miroslav Grepl <mgrepl at redhat.com> 3.5.13-39
+- Allow cups_pdf_t mananage nfs files/dirs
+- Add read_lnk_files to postfix_domain_template
+
 * Sun Jan 4 2009 Dan Walsh <dwalsh at redhat.com> 3.5.13-38
 - Allow sendmail to list inotifyfs
 



From rdieter at fedoraproject.org  Mon Jan 12 14:53:04 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 12 Jan 2009 14:53:04 +0000 (UTC)
Subject: rpms/amarok/F-9 amarok-1.4.10-aa_security.patch, NONE,
	1.1 amarok.spec, 1.113, 1.114
Message-ID: <20090112145304.0EED170123@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/amarok/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6845

Modified Files:
	amarok.spec 
Added Files:
	amarok-1.4.10-aa_security.patch 
Log Message:
* Mon Jan 12 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.4.10-2
- backport security patch


amarok-1.4.10-aa_security.patch:

--- NEW FILE amarok-1.4.10-aa_security.patch ---
--- branches/stable/extragear/multimedia/amarok/src/metadata/audible/audibletag.cpp	2007/06/13 18:53:16	675130
+++ branches/stable/extragear/multimedia/amarok/src/metadata/audible/audibletag.cpp	2009/01/09 17:38:50	908415
@@ -71,7 +71,8 @@
 {
     char buf[1023];
     fseek(fp, OFF_PRODUCT_ID, SEEK_SET);
-    fread(buf, strlen("product_id"), 1, fp);
+    if (fread(buf, strlen("product_id"), 1, fp) != 1)
+        return;
     if(memcmp(buf, "product_id", strlen("product_id")))
     {
         buf[20]='\0';
@@ -130,24 +131,65 @@
 
 bool Audible::Tag::readTag( FILE *fp, char **name, char **value)
 {
+    // arbitrary value that has to be smaller than 2^32-1 and that should be large enough for all tags                                                                                         
+    const uint32_t maxtaglen = 100000;    
+
     uint32_t nlen;
-    fread(&nlen, sizeof(nlen), 1, fp);
+    if (fread(&nlen, sizeof(nlen), 1, fp) != 1)
+        return false;
     nlen = ntohl(nlen);
     //fprintf(stderr, "tagname len=%x\n", (unsigned)nlen);
-    *name = new char[nlen+1];
-    (*name)[nlen] = '\0';
+    if (nlen > maxtaglen)
+        return false;
 
     uint32_t vlen;
-    fread(&vlen, sizeof(vlen), 1, fp);
+    if (fread(&vlen, sizeof(vlen), 1, fp) != 1)
+        return false;
     vlen = ntohl(vlen);
     //fprintf(stderr, "tag len=%x\n", (unsigned)vlen);
+    if (vlen > maxtaglen)
+        return false;
+
+    *name = new char[nlen+1];
+    if (!*name)
+        return false;
+        
     *value = new char[vlen+1];
+    if (!*value)
+    {
+        delete[] *name;
+        *name = 0;
+        return false;
+    }
+
+    (*name)[nlen] = '\0';
     (*value)[vlen] = '\0';
 
-    fread(*name, nlen, 1, fp);
-    fread(*value, vlen, 1, fp);
+    if (fread(*name, nlen, 1, fp) != 1)
+    {
+        delete[] *name;
+        *name = 0;
+        delete[] *value;
+        *value = 0;
+        return false;
+    }
+    if (fread(*value, vlen, 1, fp) != 1)
+    {
+        delete[] *name;
+        *name = 0;
+        delete[] *value;
+        *value = 0;
+        return false;
+    }
     char lasttag;
-    fread(&lasttag, 1, 1, fp);
+    if (fread(&lasttag, 1, 1, fp) != 1)
+    {
+        delete[] *name;
+        *name = 0;
+        delete[] *value;
+        *value = 0;
+        return false;
+    }
     //fprintf(stderr, "%s: \"%s\"\n", *name, *value);
 
     m_tagsEndOffset += 2 * 4 + nlen + vlen + 1;


Index: amarok.spec
===================================================================
RCS file: /cvs/pkgs/rpms/amarok/F-9/amarok.spec,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -r1.113 -r1.114
--- amarok.spec	14 Aug 2008 02:07:31 -0000	1.113
+++ amarok.spec	12 Jan 2009 14:52:33 -0000	1.114
@@ -31,7 +31,7 @@
 Name:       amarok
 Summary:    Media player
 Version:    1.4.10
-Release:    1%{?dist}
+Release:    2%{?dist}
 
 Group: 	    Applications/Multimedia
 License:    GPLv2+
@@ -43,6 +43,10 @@
 # Use xdg-open to start the selected browser
 Patch2:     amarok-1.4.7-xdg.patch
 
+## upstream patches
+# security backport: http://websvn.kde.org/?view=rev&revision=908415
+Patch100:   amarok-1.4.10-aa_security.patch
+
 BuildRequires:  alsa-lib-devel
 BuildRequires:  desktop-file-utils
 BuildRequires:  esound-devel
@@ -143,6 +147,7 @@
 
 %patch1 -p1 -b .gcc43
 %patch2 -p1 -b .xdg
+%patch100 -p4 -b .aa_security
 
 
 %build
@@ -304,6 +309,9 @@
 
 
 %changelog
+* Mon Jan 12 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.4.10-2
+- backport security patch
+
 * Wed Aug 13 2008 Rex Dieter <rdieter at fedoraproject.org> - 1.4.10-1
 - amarok-1.4.10
 



From nsantos at fedoraproject.org  Mon Jan 12 15:08:46 2009
From: nsantos at fedoraproject.org (Nuno Santos)
Date: Mon, 12 Jan 2009 15:08:46 +0000 (UTC)
Subject: rpms/qpidc/devel qpidc.spec,1.58,1.59
Message-ID: <20090112150846.4B1AC70123@cvs1.fedora.phx.redhat.com>

Author: nsantos

Update of /cvs/extras/rpms/qpidc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9158

Modified Files:
	qpidc.spec 
Log Message:
fix example building error


Index: qpidc.spec
===================================================================
RCS file: /cvs/extras/rpms/qpidc/devel/qpidc.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- qpidc.spec	9 Jan 2009 21:56:45 -0000	1.58
+++ qpidc.spec	12 Jan 2009 15:08:15 -0000	1.59
@@ -188,7 +188,7 @@
 %build
 CXXFLAGS="%{optflags} -DNDEBUG -O3" \
 %configure --disable-static --with-cpg --without-graphviz --without-help2man
-make #%{?_smp_mflags}
+LANG=C make #%{?_smp_mflags}
 # Remove this generated perl file, we don't need it and it upsets rpmlint.
 # This is generating an error as of 21 Nov 08 becausethe file doesn't exist .
 # rm docs/api/html/installdox
@@ -196,7 +196,7 @@
 # Make perftest utilities
 pushd src/tests
 for ptest in %{perftests}; do
-  make $ptest
+  LANG=C make $ptest
 done
 popd
 



From rdieter at fedoraproject.org  Mon Jan 12 15:16:41 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 12 Jan 2009 15:16:41 +0000 (UTC)
Subject: rpms/amarok/EL-5 amarok-1.4.10-aa_security.patch, NONE,
	1.1 amarok.spec, 1.82, 1.83
Message-ID: <20090112151641.6FDE270123@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/amarok/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9989

Modified Files:
	amarok.spec 
Added Files:
	amarok-1.4.10-aa_security.patch 
Log Message:
* Mon Jan 12 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.4.10-2
- backport security patch


amarok-1.4.10-aa_security.patch:

--- NEW FILE amarok-1.4.10-aa_security.patch ---
--- branches/stable/extragear/multimedia/amarok/src/metadata/audible/audibletag.cpp	2007/06/13 18:53:16	675130
+++ branches/stable/extragear/multimedia/amarok/src/metadata/audible/audibletag.cpp	2009/01/09 17:38:50	908415
@@ -71,7 +71,8 @@
 {
     char buf[1023];
     fseek(fp, OFF_PRODUCT_ID, SEEK_SET);
-    fread(buf, strlen("product_id"), 1, fp);
+    if (fread(buf, strlen("product_id"), 1, fp) != 1)
+        return;
     if(memcmp(buf, "product_id", strlen("product_id")))
     {
         buf[20]='\0';
@@ -130,24 +131,65 @@
 
 bool Audible::Tag::readTag( FILE *fp, char **name, char **value)
 {
+    // arbitrary value that has to be smaller than 2^32-1 and that should be large enough for all tags                                                                                         
+    const uint32_t maxtaglen = 100000;    
+
     uint32_t nlen;
-    fread(&nlen, sizeof(nlen), 1, fp);
+    if (fread(&nlen, sizeof(nlen), 1, fp) != 1)
+        return false;
     nlen = ntohl(nlen);
     //fprintf(stderr, "tagname len=%x\n", (unsigned)nlen);
-    *name = new char[nlen+1];
-    (*name)[nlen] = '\0';
+    if (nlen > maxtaglen)
+        return false;
 
     uint32_t vlen;
-    fread(&vlen, sizeof(vlen), 1, fp);
+    if (fread(&vlen, sizeof(vlen), 1, fp) != 1)
+        return false;
     vlen = ntohl(vlen);
     //fprintf(stderr, "tag len=%x\n", (unsigned)vlen);
+    if (vlen > maxtaglen)
+        return false;
+
+    *name = new char[nlen+1];
+    if (!*name)
+        return false;
+        
     *value = new char[vlen+1];
+    if (!*value)
+    {
+        delete[] *name;
+        *name = 0;
+        return false;
+    }
+
+    (*name)[nlen] = '\0';
     (*value)[vlen] = '\0';
 
-    fread(*name, nlen, 1, fp);
-    fread(*value, vlen, 1, fp);
+    if (fread(*name, nlen, 1, fp) != 1)
+    {
+        delete[] *name;
+        *name = 0;
+        delete[] *value;
+        *value = 0;
+        return false;
+    }
+    if (fread(*value, vlen, 1, fp) != 1)
+    {
+        delete[] *name;
+        *name = 0;
+        delete[] *value;
+        *value = 0;
+        return false;
+    }
     char lasttag;
-    fread(&lasttag, 1, 1, fp);
+    if (fread(&lasttag, 1, 1, fp) != 1)
+    {
+        delete[] *name;
+        *name = 0;
+        delete[] *value;
+        *value = 0;
+        return false;
+    }
     //fprintf(stderr, "%s: \"%s\"\n", *name, *value);
 
     m_tagsEndOffset += 2 * 4 + nlen + vlen + 1;


Index: amarok.spec
===================================================================
RCS file: /cvs/pkgs/rpms/amarok/EL-5/amarok.spec,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -r1.82 -r1.83
--- amarok.spec	14 Aug 2008 13:26:26 -0000	1.82
+++ amarok.spec	12 Jan 2009 15:16:11 -0000	1.83
@@ -31,7 +31,7 @@
 Name:       amarok
 Summary:    Media player
 Version:    1.4.10
-Release:    1%{?dist}
+Release:    2%{?dist}
 
 Group: 	    Applications/Multimedia
 License:    GPLv2+
@@ -43,6 +43,10 @@
 # Use xdg-open to start the selected browser
 Patch2:     amarok-1.4.7-xdg.patch
 
+## upstream patches
+# security backport: http://websvn.kde.org/?view=rev&revision=908415
+Patch100:   amarok-1.4.10-aa_security.patch
+
 BuildRequires:  alsa-lib-devel
 BuildRequires:  desktop-file-utils
 BuildRequires:  esound-devel
@@ -145,6 +149,7 @@
 
 %patch1 -p1 -b .gcc43
 %patch2 -p1 -b .xdg
+%patch100 -p4 -b .aa_security
 
 
 %build
@@ -306,6 +311,9 @@
 
 
 %changelog
+* Mon Jan 12 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.4.10-2
+- backport security patch
+
 * Wed Aug 13 2008 Rex Dieter <rdieter at fedoraproject.org> - 1.4.10-1
 - amarok-1.4.10
 



From ajax at fedoraproject.org  Mon Jan 12 15:23:18 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Mon, 12 Jan 2009 15:23:18 +0000 (UTC)
Subject: rpms/kernel/devel kernel.spec,1.1209,1.1210
Message-ID: <20090112152318.1F45E70123@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10669

Modified Files:
	kernel.spec 
Log Message:
* Mon Jan 12 2009 Adam Jackson <ajax at redhat.com>
- Define %fedora_build a different (faster) way.



Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1209
retrieving revision 1.1210
diff -u -r1.1209 -r1.1210
--- kernel.spec	12 Jan 2009 14:19:29 -0000	1.1209
+++ kernel.spec	12 Jan 2009 15:22:47 -0000	1.1210
@@ -20,12 +20,13 @@
 # kernel spec when the kernel is rebased, so fedora_build automatically
 # works out to the offset from the rebase, so it doesn't get too ginormous.
 #
+# If you're building on a branch, the RCS revision will be something like
+# 1.1205.1.1.  In this case we drop the initial 1, subtract fedora_cvs_origin
+# from the second number, and then append the rest of the RCS string as is.
+# Don't stare at the awk too long, you'll go blind.
 %define fedora_cvs_origin   1180
-%define fedora_build_string %(R="$Revision$"; R="${R%% \$}"; R="${R#: 1.}"; echo $R)
-%define fedora_build_origin %(R=%{fedora_build_string}; R="${R%%%%.*}"; echo $R)
-%define fedora_build_prefix %(expr %{fedora_build_origin} - %{fedora_cvs_origin})
-%define fedora_build_suffix %(R=%{fedora_build_string}; R="${R#%{fedora_build_origin}}"; echo $R)
-%define fedora_build        %{fedora_build_prefix}%{?fedora_build_suffix}
+%define fedora_cvs_revision() %2
+%global fedora_build %(echo %{fedora_cvs_origin}.%{fedora_cvs_revision $Revision$} | awk -F . '{ OFS = "."; ORS = ""; print $3 - $1 ; i = 4 ; OFS = ""; while (i <= NF) { print ".", $i ; i++} }')
 
 # base_sublevel is the kernel version we're starting with and patching
 # on top of -- for example, 2.6.22-rc7-git1 starts with a 2.6.21 base,
@@ -45,7 +46,7 @@
 %define stable_base %{stable_update}
 %if 0%{?stable_rc}
 # stable RCs are incremental patches, so we need the previous stable patch
-%define stable_base %(expr %{stable_update} - 1)
+%define stable_base %(echo $((%{stable_update} - 1)))
 %endif
 %endif
 %define rpmversion 2.6.%{base_sublevel}%{?stablerev}
@@ -53,7 +54,7 @@
 ## The not-released-kernel case ##
 %else
 # The next upstream release sublevel (base_sublevel+1)
-%define upstream_sublevel %(expr %{base_sublevel} + 1)
+%define upstream_sublevel %(echo $((%{base_sublevel} + 1)))
 # The rc snapshot level
 %define rcrev 1
 # The git snapshot level
@@ -1735,6 +1736,9 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Mon Jan 12 2009 Adam Jackson <ajax at redhat.com>
+- Define %%fedora_build a different (faster) way.
+
 * Mon Jan 12 2009 Dave Jones <davej at redhat.com>
 - 2.6.29-rc1-git1
 



From buc at fedoraproject.org  Mon Jan 12 15:32:15 2009
From: buc at fedoraproject.org (Dmitry Butskoy)
Date: Mon, 12 Jan 2009 15:32:15 +0000 (UTC)
Subject: rpms/freetds/devel freetds.spec,1.13,1.14
Message-ID: <20090112153215.4E20270123@cvs1.fedora.phx.redhat.com>

Author: buc

Update of /cvs/extras/rpms/freetds/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12149

Modified Files:
	freetds.spec 
Log Message:



Index: freetds.spec
===================================================================
RCS file: /cvs/extras/rpms/freetds/devel/freetds.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- freetds.spec	11 Jan 2009 17:46:32 -0000	1.13
+++ freetds.spec	12 Jan 2009 15:31:44 -0000	1.14
@@ -70,8 +70,7 @@
 	--with-gnutls
 
 # avoid any rpath
-sed -i -e 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' \
-	-e 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
+sed -i -e 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec="-D__LIBTOOL_IS_A_FOOL__"|g' libtool
 
 make %{?_smp_mflags}
 



From dwalsh at fedoraproject.org  Mon Jan 12 15:56:17 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Mon, 12 Jan 2009 15:56:17 +0000 (UTC)
Subject: rpms/libsemanage/devel libsemanage-rhat.patch, 1.43,
	1.44 libsemanage.spec, 1.170, 1.171
Message-ID: <20090112155617.83AA570123@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/libsemanage/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14380

Modified Files:
	libsemanage-rhat.patch libsemanage.spec 
Log Message:
* Mon Jan 12 2009 Dan Walsh <dwalsh at redhat.com> - 2.0.30-3
- Fix up patch to get it upstreamed


libsemanage-rhat.patch:

Index: libsemanage-rhat.patch
===================================================================
RCS file: /cvs/extras/rpms/libsemanage/devel/libsemanage-rhat.patch,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- libsemanage-rhat.patch	4 Dec 2008 20:19:01 -0000	1.43
+++ libsemanage-rhat.patch	12 Jan 2009 15:55:46 -0000	1.44
@@ -1,6 +1,6 @@
 diff --exclude-from=exclude -N -u -r nsalibsemanage/include/semanage/modules.h libsemanage-2.0.30/include/semanage/modules.h
 --- nsalibsemanage/include/semanage/modules.h	2008-08-28 09:34:24.000000000 -0400
-+++ libsemanage-2.0.30/include/semanage/modules.h	2008-12-04 15:15:23.000000000 -0500
++++ libsemanage-2.0.30/include/semanage/modules.h	2009-01-12 09:38:35.420740000 -0500
 @@ -30,10 +30,16 @@
  
  int semanage_module_install(semanage_handle_t *,
@@ -18,21 +18,9 @@
  int semanage_module_remove(semanage_handle_t *, char *module_name);
  
  /* semanage_module_info is for getting information on installed
-diff --exclude-from=exclude -N -u -r nsalibsemanage/src/Makefile libsemanage-2.0.30/src/Makefile
---- nsalibsemanage/src/Makefile	2008-08-28 09:34:24.000000000 -0400
-+++ libsemanage-2.0.30/src/Makefile	2008-12-04 15:15:23.000000000 -0500
-@@ -54,7 +54,7 @@
- 	ranlib $@
- 
- $(LIBSO): $(LOBJS)
--	$(CC) $(CFLAGS) $(LDFLAGS) -shared -o $@ $^ -lsepol -lselinux -lustr -L$(LIBDIR) -Wl,-soname,$(LIBSO),--version-script=libsemanage.map,-z,defs
-+	$(CC) $(CFLAGS) $(LDFLAGS) -shared -o $@ $^ -lsepol -lselinux -lbz2 -lustr -L$(LIBDIR) -Wl,-soname,$(LIBSO),--version-script=libsemanage.map,-z,defs
- 	ln -sf $@ $(TARGET)
- 
- conf-scan.c: conf-scan.l conf-parse.h
 diff --exclude-from=exclude -N -u -r nsalibsemanage/src/direct_api.c libsemanage-2.0.30/src/direct_api.c
 --- nsalibsemanage/src/direct_api.c	2008-11-14 17:10:15.000000000 -0500
-+++ libsemanage-2.0.30/src/direct_api.c	2008-12-04 15:15:23.000000000 -0500
++++ libsemanage-2.0.30/src/direct_api.c	2009-01-12 10:20:45.394714000 -0500
 @@ -50,6 +50,7 @@
  #include "semanage_store.h"
  #include "database_policydb.h"
@@ -76,8 +64,8 @@
 +#include <string.h>
 +#include <sys/sendfile.h>
 +
-+/* bzip() a file to '*data', returning the total number of uncompressed bytes
-+ * in the file.  Returns 0 if file could not be decompressed. */
++/* bzip() a data to a file, returning the total number of compressed bytes
++ * in the file.  Returns -1 if file could not be compressed. */
 +static size_t bzip(const char *filename, char *data, size_t num_bytes) {
 +	BZFILE* b;
 +	size_t  size = 1<<16;
@@ -87,13 +75,13 @@
 +	FILE *f;
 +
 +	if ((f = fopen(filename, "wb")) == NULL) {
-+		return 0;
++		return -1;
 +	}
 +
 +	b = BZ2_bzWriteOpen( &bzerror, f, 9, 0, 0);
 +	if (bzerror != BZ_OK) {
 +		BZ2_bzWriteClose ( &bzerror, b, 1, 0, 0 );
-+		return 0;
++		return -1;
 +	}
 +	
 +	while ( num_bytes > total ) {
@@ -105,7 +93,7 @@
 +		BZ2_bzWrite ( &bzerror, b, &data[total], len );
 +		if (bzerror == BZ_IO_ERROR) { 
 +			BZ2_bzWriteClose ( &bzerror, b, 1, 0, 0 );
-+			return 0;
++			return -1;
 +		}
 +		total += len;
 +	}
@@ -113,13 +101,13 @@
 +	BZ2_bzWriteClose ( &bzerror, b, 0, 0, 0 );
 +	fclose(f);
 +	if (bzerror == BZ_IO_ERROR) {
-+		return 0;
++		return -1;
 +	}
 +	return total;
 +}
 +
 +/* bunzip() a file to '*data', returning the total number of uncompressed bytes
-+ * in the file.  Returns 0 if file could not be decompressed. */
++ * in the file.  Returns -1 if file could not be decompressed. */
 +size_t bunzip(FILE *f, char **data) {
 +	BZFILE* b;
 +	size_t  nBuf;
@@ -131,7 +119,7 @@
 +	b = BZ2_bzReadOpen ( &bzerror, f, 0, 0, NULL, 0 );
 +	if ( bzerror != BZ_OK ) {
 +		BZ2_bzReadClose ( &bzerror, b );
-+		return 0;
++		return -1;
 +	}
 +	
 +	char *uncompress = realloc(NULL, size);
@@ -150,7 +138,7 @@
 +	if ( bzerror != BZ_STREAM_END ) {
 +		BZ2_bzReadClose ( &bzerror, b );
 +		free(uncompress);
-+		return 0;
++		return -1;
 +	}
 +	BZ2_bzReadClose ( &bzerror, b );
 +
@@ -162,16 +150,16 @@
 + *  If the file is bzip compressed map_file will uncompress 
 + * the file into '*data'.
 + * Returns the total number of bytes in memory .
-+ * Returns 0 if file could not be opened or mapped. */
++ * Returns -1 if file could not be opened or mapped. */
 +static size_t map_file(int fd, char **data, int *compressed)
 +{
-+	int size;
++	int size = -1;
 +	char *uncompress;
 +	if ((size = bunzip(fdopen(fd, "r"), &uncompress)) > 0) {
 +		*data = mmap(0, size, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0);
 +		if (*data == MAP_FAILED) {
 +			free(uncompress);
-+			return 0;
++			return -1;
 +		} else {
 +			memcpy(*data, uncompress, size);
 +		}
@@ -182,7 +170,7 @@
 +		if (fstat(fd, &sb) == -1 ||
 +		    (*data = mmap(NULL, sb.st_size, PROT_READ, MAP_PRIVATE, fd, 0)) ==
 +		    MAP_FAILED) {
-+			size = 0;
++			size = -1;
 +		} else {
 +			size = sb.st_size;
 +		}
@@ -234,18 +222,19 @@
  	    seusers_modified, users_extra_modified;
  	dbase_config_t *users = semanage_user_dbase_local(sh);
  	dbase_config_t *users_base = semanage_user_base_dbase_local(sh);
-@@ -815,7 +967,9 @@
+@@ -815,8 +967,10 @@
  					   &filename)) != 0) {
  		goto cleanup;
  	}
 -	if (write_file(sh, filename, data, data_len) == -1) {
-+
 +	if (bzip(filename, data, data_len) == 0) {
 +		ERR(sh, "Error while writing to %s.", filename);
  		retval = -3;
++		goto cleanup;
  	}
  	retval = 0;
-@@ -826,19 +980,60 @@
+       cleanup:
+@@ -826,17 +980,58 @@
  	return retval;
  }
  
@@ -275,7 +264,7 @@
 +	int in_fd = -1;
 +
 +	if ((in_fd = open(install_filename, O_RDONLY)) == -1) {
-+		return 0;
++		return -1;
 +	}
 +
 +	if ((data_len = map_file(in_fd, &data, &compressed)) == 0) {
@@ -312,12 +301,9 @@
 +static int get_direct_upgrade_filename(semanage_handle_t * sh,
 +				       char *data, size_t data_len, char **outfilename) {
  	int i, retval, num_modules = 0;
--	char *module_name = NULL, *version = NULL, *filename = NULL;
-+	char *filename = NULL, *module_name = NULL, *version = NULL;
+ 	char *module_name = NULL, *version = NULL, *filename = NULL;
  	semanage_module_info_t *modinfo = NULL;
- 	if ((retval = parse_module_headers(sh, data, data_len,
- 					   &module_name, &version,
-@@ -868,14 +1063,10 @@
+@@ -868,14 +1063,9 @@
  	if (retval == -4) {
  		ERR(sh, "There does not already exist a module named %s.",
  		    module_name);
@@ -326,14 +312,13 @@
 -	if (write_file(sh, filename, data, data_len) == -1) {
 -		retval = -3;
  	}
-+
        cleanup:
  	free(version);
 -	free(filename);
  	free(module_name);
  	for (i = 0; modinfo != NULL && i < num_modules; i++) {
  		semanage_module_info_t *m =
-@@ -883,6 +1074,80 @@
+@@ -883,6 +1073,80 @@
  		semanage_module_info_datum_destroy(m);
  	}
  	free(modinfo);
@@ -386,7 +371,7 @@
 +	int in_fd = -1;
 +
 +	if ((in_fd = open(module_filename, O_RDONLY)) == -1) {
-+		return 0;
++		return -1;
 +	}
 +
 +	if ((data_len = map_file(in_fd, &data, &compressed)) == 0) {
@@ -414,7 +399,7 @@
  	return retval;
  }
  
-@@ -903,7 +1168,8 @@
+@@ -903,14 +1167,59 @@
  	if ((filename = semanage_path(SEMANAGE_TMP, SEMANAGE_BASE)) == NULL) {
  		goto cleanup;
  	}
@@ -422,9 +407,10 @@
 +	if (bzip(filename, base_data, data_len) == 0) {
 +		ERR(sh, "Error while writing to %s.", filename);
  		retval = -3;
++		goto cleanup;
  	}
  	retval = 0;
-@@ -911,6 +1177,49 @@
+       cleanup:
  	return retval;
  }
  
@@ -443,7 +429,7 @@
 +	int in_fd;
 +
 +	if ((in_fd = open(install_filename, O_RDONLY)) == -1) {
-+		return 0;
++		return -1;
 +	}
 +
 +	if ((data_len = map_file(in_fd, &data, &compressed)) == 0) {
@@ -474,7 +460,7 @@
  /* Removes a module from the sandbox.  Returns 0 on success, -1 if out
   * of memory, -2 if module not found or could not be removed. */
  static int semanage_direct_remove(semanage_handle_t * sh, char *module_name)
-@@ -1005,15 +1314,26 @@
+@@ -1005,15 +1314,29 @@
  			 * report it */
  			continue;
  		}
@@ -484,9 +470,12 @@
 +		if ((size = bunzip(fp, &data)) != 0) {
 +			fclose(fp);
 +			fp = fmemopen(data, size, "rb");
++			if (!fp) {
++				ERR(sh, "Out of memory!");
++				goto cleanup;
++			}
 +		}
 +		rewind(fp);
-+
  		__fsetlocking(fp, FSETLOCKING_BYCALLER);
  		sepol_policy_file_set_fp(pf, fp);
  		if (sepol_module_package_info(pf, &type, &name, &version)) {
@@ -503,19 +492,18 @@
  			(*modinfo)[*num_modules].version = version;
 diff --exclude-from=exclude -N -u -r nsalibsemanage/src/direct_api.h libsemanage-2.0.30/src/direct_api.h
 --- nsalibsemanage/src/direct_api.h	2008-11-14 17:10:15.000000000 -0500
-+++ libsemanage-2.0.30/src/direct_api.h	2008-12-04 15:15:23.000000000 -0500
-@@ -37,6 +37,7 @@
++++ libsemanage-2.0.30/src/direct_api.h	2009-01-12 10:23:16.078163000 -0500
+@@ -39,4 +39,7 @@
  
- int semanage_direct_access_check(struct semanage_handle *sh);
+ int semanage_direct_mls_enabled(struct semanage_handle *sh);
  
--int semanage_direct_mls_enabled(struct semanage_handle *sh);
 +#include <stdio.h>
 +size_t bunzip(FILE *f, char **data);
- 
++
  #endif
 diff --exclude-from=exclude -N -u -r nsalibsemanage/src/genhomedircon.c libsemanage-2.0.30/src/genhomedircon.c
 --- nsalibsemanage/src/genhomedircon.c	2008-08-28 09:34:24.000000000 -0400
-+++ libsemanage-2.0.30/src/genhomedircon.c	2008-12-04 15:16:11.000000000 -0500
++++ libsemanage-2.0.30/src/genhomedircon.c	2009-01-12 09:38:35.444738000 -0500
 @@ -487,7 +487,6 @@
  				  const char *role_prefix)
  {
@@ -547,7 +535,7 @@
  			*errors = STATUS_ERR;
 diff --exclude-from=exclude -N -u -r nsalibsemanage/src/libsemanage.map libsemanage-2.0.30/src/libsemanage.map
 --- nsalibsemanage/src/libsemanage.map	2008-11-14 17:10:15.000000000 -0500
-+++ libsemanage-2.0.30/src/libsemanage.map	2008-12-04 15:15:23.000000000 -0500
++++ libsemanage-2.0.30/src/libsemanage.map	2009-01-12 09:38:35.456740000 -0500
 @@ -3,8 +3,10 @@
            semanage_is_managed; semanage_connect; semanage_disconnect; 
  	  semanage_msg_*;
@@ -561,9 +549,21 @@
  	  semanage_module_list; semanage_module_info_datum_destroy;
  	  semanage_module_list_nth; semanage_module_get_name;
  	  semanage_module_get_version; semanage_select_store;
+diff --exclude-from=exclude -N -u -r nsalibsemanage/src/Makefile libsemanage-2.0.30/src/Makefile
+--- nsalibsemanage/src/Makefile	2008-08-28 09:34:24.000000000 -0400
++++ libsemanage-2.0.30/src/Makefile	2009-01-12 09:38:35.424738000 -0500
+@@ -54,7 +54,7 @@
+ 	ranlib $@
+ 
+ $(LIBSO): $(LOBJS)
+-	$(CC) $(CFLAGS) $(LDFLAGS) -shared -o $@ $^ -lsepol -lselinux -lustr -L$(LIBDIR) -Wl,-soname,$(LIBSO),--version-script=libsemanage.map,-z,defs
++	$(CC) $(CFLAGS) $(LDFLAGS) -shared -o $@ $^ -lsepol -lselinux -lbz2 -lustr -L$(LIBDIR) -Wl,-soname,$(LIBSO),--version-script=libsemanage.map,-z,defs
+ 	ln -sf $@ $(TARGET)
+ 
+ conf-scan.c: conf-scan.l conf-parse.h
 diff --exclude-from=exclude -N -u -r nsalibsemanage/src/modules.c libsemanage-2.0.30/src/modules.c
 --- nsalibsemanage/src/modules.c	2008-08-28 09:34:24.000000000 -0400
-+++ libsemanage-2.0.30/src/modules.c	2008-12-04 15:15:23.000000000 -0500
++++ libsemanage-2.0.30/src/modules.c	2009-01-12 09:38:35.462738000 -0500
 @@ -52,6 +52,25 @@
  	return sh->funcs->install(sh, module_data, data_len);
  }
@@ -644,7 +644,7 @@
  	if (sh->funcs->remove == NULL) {
 diff --exclude-from=exclude -N -u -r nsalibsemanage/src/policy.h libsemanage-2.0.30/src/policy.h
 --- nsalibsemanage/src/policy.h	2008-08-28 09:34:24.000000000 -0400
-+++ libsemanage-2.0.30/src/policy.h	2008-12-04 15:15:23.000000000 -0500
++++ libsemanage-2.0.30/src/policy.h	2009-01-12 09:38:35.481737000 -0500
 @@ -49,8 +49,14 @@
  	/* Install a policy module */
  	int (*install) (struct semanage_handle *, char *, size_t);
@@ -672,7 +672,7 @@
  /* Should be backend independent */
 diff --exclude-from=exclude -N -u -r nsalibsemanage/src/semanage.conf libsemanage-2.0.30/src/semanage.conf
 --- nsalibsemanage/src/semanage.conf	2008-08-28 09:34:24.000000000 -0400
-+++ libsemanage-2.0.30/src/semanage.conf	2008-12-04 15:15:23.000000000 -0500
++++ libsemanage-2.0.30/src/semanage.conf	2009-01-12 09:38:35.487738000 -0500
 @@ -35,4 +35,4 @@
  # given in <sepol/policydb.h>.  Change this setting if a different
  # version is necessary.
@@ -681,7 +681,7 @@
 +expand-check=0
 diff --exclude-from=exclude -N -u -r nsalibsemanage/src/semanage_store.c libsemanage-2.0.30/src/semanage_store.c
 --- nsalibsemanage/src/semanage_store.c	2008-11-11 16:13:18.000000000 -0500
-+++ libsemanage-2.0.30/src/semanage_store.c	2008-12-04 15:15:23.000000000 -0500
++++ libsemanage-2.0.30/src/semanage_store.c	2009-01-12 10:17:08.334866000 -0500
 @@ -440,6 +440,8 @@
  	char tmp[PATH_MAX];
  	char buf[4192];
@@ -691,7 +691,7 @@
  	n = snprintf(tmp, PATH_MAX, "%s.tmp", dst);
  	if (n < 0 || n >= PATH_MAX)
  		return -1;
-@@ -1523,16 +1525,26 @@
+@@ -1523,16 +1525,30 @@
  		ERR(sh, "Could not open module file %s for reading.", filename);
  		goto cleanup;
  	}
@@ -701,6 +701,10 @@
 +	if ((size = bunzip(fp, &data)) != 0) {
 +		fclose(fp);
 +		fp = fmemopen(data, size, "rb");
++		if (!fp) {
++			ERR(sh, "Out of memory!");
++			goto cleanup;
++		}
 +	}
 +	rewind(fp);
  	__fsetlocking(fp, FSETLOCKING_BYCALLER);


Index: libsemanage.spec
===================================================================
RCS file: /cvs/extras/rpms/libsemanage/devel/libsemanage.spec,v
retrieving revision 1.170
retrieving revision 1.171
diff -u -r1.170 -r1.171
--- libsemanage.spec	4 Dec 2008 21:09:08 -0000	1.170
+++ libsemanage.spec	12 Jan 2009 15:55:47 -0000	1.171
@@ -3,7 +3,7 @@
 Summary: SELinux binary policy manipulation library 
 Name: libsemanage
 Version: 2.0.30
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 Source: http://www.nsa.gov/selinux/archives/libsemanage-%{version}.tgz
@@ -90,6 +90,9 @@
 %{_libdir}/python*/site-packages/*
 
 %changelog
+* Mon Jan 12 2009 Dan Walsh <dwalsh at redhat.com> - 2.0.30-3
+- Fix up patch to get it upstreamed
+
 * Thu Dec 04 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 2.0.30-2
 - Rebuild for Python 2.6
 



From kasal at fedoraproject.org  Mon Jan 12 16:01:59 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Mon, 12 Jan 2009 16:01:59 +0000 (UTC)
Subject: rpms/cpan2rpm/devel cpan2rpm-2.024-nonetwork.patch, 1.1,
	1.2 cpan2rpm.spec, 1.8, 1.9
Message-ID: <20090112160200.0482D70123@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/extras/rpms/cpan2rpm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15679

Modified Files:
	cpan2rpm-2.024-nonetwork.patch cpan2rpm.spec 
Log Message:
... and fix patch0 so that it applies with no fuzz.

cpan2rpm-2.024-nonetwork.patch:

Index: cpan2rpm-2.024-nonetwork.patch
===================================================================
RCS file: /cvs/extras/rpms/cpan2rpm/devel/cpan2rpm-2.024-nonetwork.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cpan2rpm-2.024-nonetwork.patch	8 Nov 2004 04:10:43 -0000	1.1
+++ cpan2rpm-2.024-nonetwork.patch	12 Jan 2009 16:01:59 -0000	1.2
@@ -2,7 +2,7 @@
 +++ BUILD/cpan2rpm-2.024/cpan2rpm.spec.PL	2004-03-15 22:58:15.486225403 +0100
 @@ -8,20 +8,3 @@
      , qq(ver=`rpm -q rpm --qf %%{version}|awk -F . '{print \$1}'`)
-     , qq([ \$ver -le 3 -o -s \$SuSE ] && echo rpm || echo rpm-build)
+     , qq([ \$ver -le 3 -o -n "\$SuSE" ] && echo rpm || echo rpm-build)
      ;
 -
 -my @cmd = (


Index: cpan2rpm.spec
===================================================================
RCS file: /cvs/extras/rpms/cpan2rpm/devel/cpan2rpm.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- cpan2rpm.spec	21 Sep 2008 08:27:19 -0000	1.8
+++ cpan2rpm.spec	12 Jan 2009 16:01:59 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           cpan2rpm
 Version:        2.028
-Release:        3%{?dist}
+Release:        4%{?dist}
 
 Summary:        Perl module packager
 
@@ -58,6 +58,9 @@
 
 
 %changelog
+* Mon Jan 12 2009 Stepan Kasal <skasal at redhat.com> - 2.028-4
+- ... and fix patch0 so that it applies with no fuzz.
+
 * Sun Sep 21 2008 Ville Skytt?? <ville.skytta at iki.fi> - 2.028-3
 - Fix Patch0:/%%patch mismatch.
 



From pkgdb at fedoraproject.org  Mon Jan 12 16:12:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 12 Jan 2009 16:12:12 +0000
Subject: [pkgdb] tcl-zlib was added for spot
Message-ID: <20090112161212.7D5F7208458@bastion.fedora.phx.redhat.com>

spot has added Package tcl-zlib with summary Tcl extension for zlib support
spot has approved Package tcl-zlib
spot has added a Fedora devel branch for tcl-zlib with an owner of spot
spot has approved tcl-zlib in Fedora devel
spot has approved Package tcl-zlib
spot has set commit to Approved for provenpackager on tcl-zlib (Fedora devel)
spot has set build to Approved for provenpackager on tcl-zlib (Fedora devel)
spot has set checkout to Approved for provenpackager on tcl-zlib (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/tcl-zlib



From pkgdb at fedoraproject.org  Mon Jan 12 16:12:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 12 Jan 2009 16:12:13 +0000
Subject: [pkgdb] tcl-zlib (Fedora, 10) updated by spot
Message-ID: <20090112161213.88A15208469@bastion.fedora.phx.redhat.com>

spot added a Fedora 10 branch for tcl-zlib
spot has set commit to Approved for provenpackager on tcl-zlib (Fedora 10)
spot has set build to Approved for provenpackager on tcl-zlib (Fedora 10)
spot has set checkout to Approved for provenpackager on tcl-zlib (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/tcl-zlib



From spot at fedoraproject.org  Mon Jan 12 16:12:27 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Mon, 12 Jan 2009 16:12:27 +0000 (UTC)
Subject: rpms/tcl-zlib - New directory
Message-ID: <20090112161227.380A670123@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/tcl-zlib
In directory cvs1.fedora.phx.redhat.com:/home/fedora/spot/cvs/CVSROOT/admin/tmpcvsO16705/rpms/tcl-zlib

Log Message:
Directory /cvs/pkgs/rpms/tcl-zlib added to the repository




From pkgdb at fedoraproject.org  Mon Jan 12 16:12:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 12 Jan 2009 16:12:13 +0000
Subject: [pkgdb] tcl-zlib (Fedora, 9) updated by spot
Message-ID: <20090112161214.23D9620846C@bastion.fedora.phx.redhat.com>

spot added a Fedora 9 branch for tcl-zlib
spot has set commit to Approved for provenpackager on tcl-zlib (Fedora 9)
spot has set build to Approved for provenpackager on tcl-zlib (Fedora 9)
spot has set checkout to Approved for provenpackager on tcl-zlib (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/tcl-zlib



From spot at fedoraproject.org  Mon Jan 12 16:12:27 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Mon, 12 Jan 2009 16:12:27 +0000 (UTC)
Subject: rpms/tcl-zlib/devel - New directory
Message-ID: <20090112161227.777D570123@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/tcl-zlib/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/spot/cvs/CVSROOT/admin/tmpcvsO16705/rpms/tcl-zlib/devel

Log Message:
Directory /cvs/pkgs/rpms/tcl-zlib/devel added to the repository




From spot at fedoraproject.org  Mon Jan 12 16:12:44 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Mon, 12 Jan 2009 16:12:44 +0000 (UTC)
Subject: rpms/tcl-zlib Makefile,NONE,1.1
Message-ID: <20090112161244.D329570123@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/tcl-zlib
In directory cvs1.fedora.phx.redhat.com:/home/fedora/spot/cvs/CVSROOT/admin/tmpcvsO16705/rpms/tcl-zlib

Added Files:
	Makefile 
Log Message:
Setup of module tcl-zlib


--- NEW FILE Makefile ---
# Top level Makefile for module tcl-zlib
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout 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 Jan 12 16:12:45 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Mon, 12 Jan 2009 16:12:45 +0000 (UTC)
Subject: rpms/tcl-zlib/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090112161245.28DF270123@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/tcl-zlib/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/spot/cvs/CVSROOT/admin/tmpcvsO16705/rpms/tcl-zlib/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module tcl-zlib


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: tcl-zlib
# $Id: Makefile,v 1.1 2009/01/12 16:12:45 spot Exp $
NAME := tcl-zlib
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Jan 12 16:15:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 12 Jan 2009 16:15:35 +0000
Subject: [pkgdb] irrlicht was added for spot
Message-ID: <20090112161535.2EEEF208455@bastion.fedora.phx.redhat.com>

spot has added Package irrlicht with summary A high performance real-time 3D engine
spot has approved Package irrlicht
spot has added a Fedora devel branch for irrlicht with an owner of spot
spot has approved irrlicht in Fedora devel
spot has approved Package irrlicht
spot has set commit to Approved for provenpackager on irrlicht (Fedora devel)
spot has set build to Approved for provenpackager on irrlicht (Fedora devel)
spot has set checkout to Approved for provenpackager on irrlicht (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/irrlicht



From pkgdb at fedoraproject.org  Mon Jan 12 16:15:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 12 Jan 2009 16:15:35 +0000
Subject: [pkgdb] irrlicht (Fedora, 9) updated by spot
Message-ID: <20090112161535.E3D53208467@bastion.fedora.phx.redhat.com>

spot added a Fedora 9 branch for irrlicht
spot has set commit to Approved for provenpackager on irrlicht (Fedora 9)
spot has set build to Approved for provenpackager on irrlicht (Fedora 9)
spot has set checkout to Approved for provenpackager on irrlicht (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/irrlicht



From pkgdb at fedoraproject.org  Mon Jan 12 16:15:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 12 Jan 2009 16:15:35 +0000
Subject: [pkgdb] irrlicht (Fedora, 10) updated by spot
Message-ID: <20090112161535.D375A208457@bastion.fedora.phx.redhat.com>

spot added a Fedora 10 branch for irrlicht
spot has set commit to Approved for provenpackager on irrlicht (Fedora 10)
spot has set build to Approved for provenpackager on irrlicht (Fedora 10)
spot has set checkout to Approved for provenpackager on irrlicht (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/irrlicht



From spot at fedoraproject.org  Mon Jan 12 16:15:47 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Mon, 12 Jan 2009 16:15:47 +0000 (UTC)
Subject: rpms/irrlicht - New directory
Message-ID: <20090112161547.287E570123@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/irrlicht
In directory cvs1.fedora.phx.redhat.com:/home/fedora/spot/cvs/CVSROOT/admin/tmpcvsn17256/rpms/irrlicht

Log Message:
Directory /cvs/pkgs/rpms/irrlicht added to the repository




From spot at fedoraproject.org  Mon Jan 12 16:15:47 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Mon, 12 Jan 2009 16:15:47 +0000 (UTC)
Subject: rpms/irrlicht/devel - New directory
Message-ID: <20090112161547.6414970141@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/irrlicht/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/spot/cvs/CVSROOT/admin/tmpcvsn17256/rpms/irrlicht/devel

Log Message:
Directory /cvs/pkgs/rpms/irrlicht/devel added to the repository




From spot at fedoraproject.org  Mon Jan 12 16:16:03 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Mon, 12 Jan 2009 16:16:03 +0000 (UTC)
Subject: rpms/irrlicht Makefile,NONE,1.1
Message-ID: <20090112161603.785C070123@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/irrlicht
In directory cvs1.fedora.phx.redhat.com:/home/fedora/spot/cvs/CVSROOT/admin/tmpcvsn17256/rpms/irrlicht

Added Files:
	Makefile 
Log Message:
Setup of module irrlicht


--- NEW FILE Makefile ---
# Top level Makefile for module irrlicht
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout 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 Jan 12 16:16:03 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Mon, 12 Jan 2009 16:16:03 +0000 (UTC)
Subject: rpms/irrlicht/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090112161603.B6AA970123@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/irrlicht/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/spot/cvs/CVSROOT/admin/tmpcvsn17256/rpms/irrlicht/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module irrlicht


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: irrlicht
# $Id: Makefile,v 1.1 2009/01/12 16:16:03 spot Exp $
NAME := irrlicht
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Jan 12 16:16:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 12 Jan 2009 16:16:42 +0000
Subject: [pkgdb] SolarModel was added for spot
Message-ID: <20090112161642.63856208455@bastion.fedora.phx.redhat.com>

spot has added Package SolarModel with summary Real-time 3D Solar System simulation
spot has approved Package SolarModel
spot has added a Fedora devel branch for SolarModel with an owner of spot
spot has approved SolarModel in Fedora devel
spot has approved Package SolarModel
spot has set commit to Approved for provenpackager on SolarModel (Fedora devel)
spot has set build to Approved for provenpackager on SolarModel (Fedora devel)
spot has set checkout to Approved for provenpackager on SolarModel (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/SolarModel



From spot at fedoraproject.org  Mon Jan 12 16:16:55 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Mon, 12 Jan 2009 16:16:55 +0000 (UTC)
Subject: rpms/SolarModel - New directory
Message-ID: <20090112161655.3BBB770123@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/SolarModel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/spot/cvs/CVSROOT/admin/tmpcvsE17565/rpms/SolarModel

Log Message:
Directory /cvs/pkgs/rpms/SolarModel added to the repository




From pkgdb at fedoraproject.org  Mon Jan 12 16:16:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 12 Jan 2009 16:16:43 +0000
Subject: [pkgdb] SolarModel (Fedora, 9) updated by spot
Message-ID: <20090112161643.A8607208467@bastion.fedora.phx.redhat.com>

spot added a Fedora 9 branch for SolarModel
spot has set commit to Approved for provenpackager on SolarModel (Fedora 9)
spot has set build to Approved for provenpackager on SolarModel (Fedora 9)
spot has set checkout to Approved for provenpackager on SolarModel (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/SolarModel



From pkgdb at fedoraproject.org  Mon Jan 12 16:16:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 12 Jan 2009 16:16:43 +0000
Subject: [pkgdb] SolarModel (Fedora, 10) updated by spot
Message-ID: <20090112161643.9F832208457@bastion.fedora.phx.redhat.com>

spot added a Fedora 10 branch for SolarModel
spot has set commit to Approved for provenpackager on SolarModel (Fedora 10)
spot has set build to Approved for provenpackager on SolarModel (Fedora 10)
spot has set checkout to Approved for provenpackager on SolarModel (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/SolarModel



From spot at fedoraproject.org  Mon Jan 12 16:16:55 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Mon, 12 Jan 2009 16:16:55 +0000 (UTC)
Subject: rpms/SolarModel/devel - New directory
Message-ID: <20090112161655.747F870123@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/SolarModel/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/spot/cvs/CVSROOT/admin/tmpcvsE17565/rpms/SolarModel/devel

Log Message:
Directory /cvs/pkgs/rpms/SolarModel/devel added to the repository




From spot at fedoraproject.org  Mon Jan 12 16:17:12 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Mon, 12 Jan 2009 16:17:12 +0000 (UTC)
Subject: rpms/SolarModel Makefile,NONE,1.1
Message-ID: <20090112161712.A110970123@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/SolarModel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/spot/cvs/CVSROOT/admin/tmpcvsE17565/rpms/SolarModel

Added Files:
	Makefile 
Log Message:
Setup of module SolarModel


--- NEW FILE Makefile ---
# Top level Makefile for module SolarModel
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout 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 Jan 12 16:17:12 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Mon, 12 Jan 2009 16:17:12 +0000 (UTC)
Subject: rpms/SolarModel/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090112161712.E74A470123@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/SolarModel/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/spot/cvs/CVSROOT/admin/tmpcvsE17565/rpms/SolarModel/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module SolarModel


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: SolarModel
# $Id: Makefile,v 1.1 2009/01/12 16:17:12 spot Exp $
NAME := SolarModel
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out 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 Jan 12 16:21:09 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Mon, 12 Jan 2009 16:21:09 +0000 (UTC)
Subject: rpms/tcl-zlib/devel import.log, NONE, 1.1 tcl-zlib.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090112162109.5CA3670123@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/tcl-zlib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18312/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log tcl-zlib.spec 
Log Message:

initial cvs import



--- NEW FILE import.log ---
tcl-zlib-2_0_1-0_1_svn40_fc10:HEAD:tcl-zlib-2.0.1-0.1.svn40.fc10.src.rpm:1231777115


--- NEW FILE tcl-zlib.spec ---
%{!?tcl_version: %define tcl_version %(echo 'puts $tcl_version' | tclsh)}
%{!?tcl_sitearch: %define tcl_sitearch %{_libdir}/tcl%{tcl_version}}
%define realname zlib

Name:		tcl-%{realname}
Version:	2.0.1
Release:	0.1.svn40%{?dist}
Summary:	Tcl extension for zlib support
Group:		System Environment/Libraries
License:	MIT
URL:		http://svn.scheffers.net/
# Snapshot of SVN40 downloaded on June 26, 2008
Source0:	http://svn.scheffers.net/%{realname}.tar.gz
BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildRequires:	tcl-devel, tk-devel, zlib-devel
Requires:	tcl(abi) = 8.5

%description
This is extension is a standalone version of the tclkit [zlib] 
command/extension. See http://wiki.tcl.tk/zlib for command syntax.

%package devel
Group:		Development/Libraries
Requires:	%{name} = %{version}-%{release}
Summary:	Development files for %{name}
Provides:	tcl-%{realname}-static = %{version}-%{release}

%description devel
Development files for %{name}.

%prep
%setup -q -n %{realname}

%build
%configure --with-tcl=%{_libdir}
# Can't use smp_mflags here. :(
make

%install
rm -rf %{buildroot}
make DESTDIR=%{buildroot} install-binaries install-libraries
install -d %{buildroot}%{tcl_sitearch}
mv %{buildroot}%{_libdir}/%{realname}%{version} %{buildroot}%{tcl_sitearch}/%{realname}%{version}
rm -rf %{buildroot}%{tcl_sitearch}/%{realname}%{version}/zlib.c
chmod -x %{buildroot}%{tcl_sitearch}/%{realname}%{version}/libzlibstub*.a

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc README ChangeLog
%dir %{tcl_sitearch}/%{realname}%{version}
%{tcl_sitearch}/%{realname}%{version}/*.so
%{tcl_sitearch}/%{realname}%{version}/pkgIndex.tcl

%files devel
%defattr(-,root,root,-)
%{tcl_sitearch}/%{realname}%{version}/libzlibstub*.a
%{_includedir}/*.h

%changelog
* Thu Jun 26 2008 Tom "spot" Callaway <tcallawa at redhat.com> 2.0.1-0.1.svn40
- initial package for Fedora


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/tcl-zlib/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	12 Jan 2009 16:12:45 -0000	1.1
+++ .cvsignore	12 Jan 2009 16:20:39 -0000	1.2
@@ -0,0 +1 @@
+zlib.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tcl-zlib/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	12 Jan 2009 16:12:45 -0000	1.1
+++ sources	12 Jan 2009 16:20:39 -0000	1.2
@@ -0,0 +1 @@
+31f85d5a94eb2ee49dfd92bcabf311c5  zlib.tar.gz



From spot at fedoraproject.org  Mon Jan 12 16:32:26 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Mon, 12 Jan 2009 16:32:26 +0000 (UTC)
Subject: rpms/irrlicht/devel import.log, NONE,
	1.1 irrlicht-1.5-optflags.patch, 
	NONE, 1.1 irrlicht-1.5-pngfix.patch, NONE, 1.1 irrlicht.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090112163226.5EFCD70123@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/irrlicht/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20468/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log irrlicht-1.5-optflags.patch 
	irrlicht-1.5-pngfix.patch irrlicht.spec 
Log Message:

initial cvs import



--- NEW FILE import.log ---
irrlicht-1_5-2_fc11:HEAD:irrlicht-1.5-2.fc11.src.rpm:1231777501

irrlicht-1.5-optflags.patch:

--- NEW FILE irrlicht-1.5-optflags.patch ---
diff -up irrlicht-1.5/include/IrrCompileConfig.h.optflags irrlicht-1.5/include/IrrCompileConfig.h
--- irrlicht-1.5/include/IrrCompileConfig.h.optflags	2009-01-08 18:47:11.000000000 -0500
+++ irrlicht-1.5/include/IrrCompileConfig.h	2009-01-08 18:47:41.000000000 -0500
@@ -138,7 +138,7 @@ ones. */
 //! Define _IRR_USE_NON_SYSTEM_ZLIB_ to let irrlicht use the zlib which comes with irrlicht.
 /** If this is commented out, Irrlicht will try to compile using the zlib installed in the system.
 	This is only used when _IRR_COMPILE_WITH_ZLIB_ is defined. */
-#define _IRR_USE_NON_SYSTEM_ZLIB_
+// #define _IRR_USE_NON_SYSTEM_ZLIB_
 
 
 //! Define _IRR_COMPILE_WITH_JPEGLIB_ to enable compiling the engine using libjpeg.
@@ -149,7 +149,7 @@ the engine will no longer read .jpeg ima
 //! Define _IRR_USE_NON_SYSTEM_JPEG_LIB_ to let irrlicht use the jpeglib which comes with irrlicht.
 /** If this is commented out, Irrlicht will try to compile using the jpeg lib installed in the system.
 	This is only used when _IRR_COMPILE_WITH_LIBJPEG_ is defined. */
-#define _IRR_USE_NON_SYSTEM_JPEG_LIB_
+// #define _IRR_USE_NON_SYSTEM_JPEG_LIB_
 
 
 //! Define _IRR_COMPILE_WITH_LIBPNG_ to enable compiling the engine using libpng.
@@ -160,7 +160,7 @@ the engine will no longer read .png imag
 //! Define _IRR_USE_NON_SYSTEM_LIBPNG_ to let irrlicht use the libpng which comes with irrlicht.
 /** If this is commented out, Irrlicht will try to compile using the libpng installed in the system.
 	This is only used when _IRR_COMPILE_WITH_LIBPNG_ is defined. */
-#define _IRR_USE_NON_SYSTEM_LIB_PNG_
+// #define _IRR_USE_NON_SYSTEM_LIB_PNG_
 
 
 //! Define _IRR_D3D_NO_SHADER_DEBUGGING to disable shader debugging in D3D9
diff -up irrlicht-1.5/source/Irrlicht/Makefile.optflags irrlicht-1.5/source/Irrlicht/Makefile
--- irrlicht-1.5/source/Irrlicht/Makefile.optflags	2009-01-08 18:48:16.000000000 -0500
+++ irrlicht-1.5/source/Irrlicht/Makefile	2009-01-08 18:51:11.000000000 -0500
@@ -43,13 +43,13 @@ LIBPNGOBJ = libpng/png.o libpng/pngerror
 EXTRAOBJ =
 LINKOBJ = $(IRRMESHOBJ) $(IRROBJ) $(IRRPARTICLEOBJ) $(IRRANIMOBJ) \
 	$(IRRVIDEOOBJ) $(IRRSWRENDEROBJ) $(IRRIOOBJ) $(IRROTHEROBJ) \
-	$(IRRGUIOBJ) $(ZLIBOBJ) $(JPEGLIBOBJ) $(LIBPNGOBJ) $(EXTRAOBJ)
+	$(IRRGUIOBJ) $(EXTRAOBJ)
 
 ###############
 #Compiler flags
-CXXINCS = -I../../include -Izlib -Ijpeglib -Ilibpng
-CPPFLAGS = $(CXXINCS) -DIRRLICHT_EXPORTS=1
-CXXFLAGS = -Wall -pipe
+CXXINCS = -I../../include
+CPPFLAGS = $(CXXINCS) -DIRRLICHT_EXPORTS=1 $(RPM_OPT_FLAGS)
+CXXFLAGS = -Wall -pipe $(RPM_OPT_FLAGS)
 ifndef NDEBUG
 CXXFLAGS += -g -D_DEBUG
 else
@@ -58,7 +58,7 @@ endif
 ifdef PROFILE
 CXXFLAGS += -pg
 endif
-CFLAGS := -fexpensive-optimizations -O3 -DPNG_THREAD_UNSAFE_OK -DPNG_NO_MMX_CODE -DPNG_NO_MNG_FEATURES
+CFLAGS := -fexpensive-optimizations -O3 -DPNG_THREAD_UNSAFE_OK -DPNG_NO_MMX_CODE -DPNG_NO_MNG_FEATURES $(RPM_OPT_FLAGS)
 
 sharedlib sharedlib_osx: CXXFLAGS += -fpic
 sharedlib sharedlib_osx: CFLAGS += -fpic
@@ -74,9 +74,9 @@ STATIC_LIB = libIrrlicht.a
 IRRLICHT_DLL := ../../bin/Win32-gcc/Irrlicht.dll
 LIB_PATH = ../../lib/$(SYSTEM)
 INSTALL_DIR = /usr/local/lib
-sharedlib: SHARED_LIB = libIrrlicht.so
+sharedlib install: SHARED_LIB = libIrrlicht.so
 staticlib sharedlib: LDFLAGS = --no-export-all-symbols --add-stdcall-alias
-sharedlib: LDFLAGS += -L/usr/X11R6/lib$(LIBSELECT) -lGL -lXxf86vm
+sharedlib: LDFLAGS += -L/usr/X11R6/lib$(LIBSELECT) -lGL -lXxf86vm -lz -ljpeg -lpng
 staticlib sharedlib: CXXINCS += -I/usr/X11R6/include
 
 #OSX specific options
@@ -128,7 +128,6 @@ sharedlib_osx: $(LINKOBJ)
 install:
 	cp $(LIB_PATH)/$(SHARED_LIB).$(VERSION) $(INSTALL_DIR)
 	cd $(INSTALL_DIR) && ln -s libIrrlicht.so.$(VERSION) $(SHARED_LIB)
-	ldconfig -n $(INSTALL_DIR)
 
 install_osx:
 	cp $(LIB_PATH)/$(SHARED_LIB).$(VERSION) $(INSTALL_DIR)

irrlicht-1.5-pngfix.patch:

--- NEW FILE irrlicht-1.5-pngfix.patch ---
diff -up irrlicht-1.5/source/Irrlicht/CImageLoaderPNG.cpp.pngfix irrlicht-1.5/source/Irrlicht/CImageLoaderPNG.cpp
--- irrlicht-1.5/source/Irrlicht/CImageLoaderPNG.cpp.pngfix	2009-01-10 12:46:59.000000000 -0500
+++ irrlicht-1.5/source/Irrlicht/CImageLoaderPNG.cpp	2009-01-10 12:52:19.000000000 -0500
@@ -184,9 +184,14 @@ IImage* CImageLoaderPng::loadImage(io::I
 
 	// Update the changes
 	png_read_update_info(png_ptr, info_ptr);
-	png_get_IHDR(png_ptr, info_ptr,
-		(png_uint_32*)&Width, (png_uint_32*)&Height,
-		&BitDepth, &ColorType, NULL, NULL, NULL);
+	{
+		png_uint_32 w,h;
+		png_get_IHDR(png_ptr, info_ptr,
+			&w, &h,
+			&BitDepth, &ColorType, NULL, NULL, NULL);
+		Width=w;
+		Height=h;
+	}
 
 	// Convert RGBA to BGRA
 	if (ColorType==PNG_COLOR_TYPE_RGB_ALPHA)
@@ -199,9 +204,14 @@ IImage* CImageLoaderPng::loadImage(io::I
 	}
 
 	// Update the changes
-	png_get_IHDR(png_ptr, info_ptr,
-		(png_uint_32*)&Width, (png_uint_32*)&Height,
-		&BitDepth, &ColorType, NULL, NULL, NULL);
+	{
+		png_uint_32 w,h;
+		png_get_IHDR(png_ptr, info_ptr,
+			&w, &h,
+			&BitDepth, &ColorType, NULL, NULL, NULL);
+		Width=w;
+		Height=h;
+	}
 
 	// Create the image structure to be filled by png data
 	if (ColorType==PNG_COLOR_TYPE_RGB_ALPHA)


--- NEW FILE irrlicht.spec ---
Name:		irrlicht
Summary: 	A high performance realtime 3D engine
Version:	1.5
Release:	2%{?dist}
License:	zlib
Group:		System Environment/Libraries
Source0:	http://downloads.sourceforge.net/irrlicht/%{name}-%{version}.zip
# Various fixes, optflags, system libraries/headers
# Don't call ldconfig during make install.
# http://irrlicht.sourceforge.net/phpBB2/viewtopic.php?t=24076&highlight=
Patch0:		irrlicht-1.5-optflags.patch
# Fix how we call libpng so we can use system libpng
Patch1:		irrlicht-1.5-pngfix.patch 
URL:		http://irrlicht.sourceforge.net/
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:	libXxf86vm-devel, mesa-libGL-devel, mesa-libGLU-devel
BuildRequires:	libjpeg-devel, zlib-devel
# XXX: is libpng broken?
BuildRequires: libpng-devel

%description
The Irrlicht Engine is an open source high performance realtime 3D engine 
written and usable in C++ and also available for .NET languages. It is 
completely cross-platform, using D3D, OpenGL and its own software renderer, 
and has all of the state-of-the-art features which can be found in 
commercial 3d engines.

%package devel
Summary:	Development headers and libraries for irrlicht
Requires:	%{name} = %{version}-%{release}
Requires:	mesa-libGL-devel, mesa-libGLU-devel, libXxf86vm-devel
Requires:	libjpeg-devel, zlib-devel, libpng-devel
Group:		Development/Libraries

%description devel
Development headers and libraries for irrlicht.

%prep
%setup -q
%patch0 -p1
%patch1 -p1
sed -i 's/\r//' readme.txt
iconv -o readme.txt.iso88591 -f iso88591 -t utf8 readme.txt
mv readme.txt.iso88591 readme.txt
# We don't use any of this. Deleting it so the debuginfo doesn't pick it up.
rm -rf source/Irrlicht/jpeglib source/Irrlicht/zlib source/Irrlicht/libpng

for i in include/*.h doc/upgrade-guide.txt source/Irrlicht/*.cpp source/Irrlicht/*.h; do
  	sed -i 's/\r//' $i
	chmod -x $i
	touch -r changes.txt $i
done

%build
cd source/Irrlicht
make %{?_smp_mflags} sharedlib

%install
rm -rf %{buildroot}
mkdir -p %{buildroot}%{_libdir}
mkdir -p %{buildroot}%{_includedir}/%{name}
make -C source/Irrlicht INSTALL_DIR=%{buildroot}%{_libdir} install 
cp -a include/* %{buildroot}%{_includedir}/%{name}/
cd %{buildroot}%{_libdir}
ln -s libIrrlicht.so.%{version} libIrrlicht.so.1

%clean
rm -rf %{buildroot}

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files
%defattr(-,root,root,-)
%doc readme.txt
%{_libdir}/libIrrlicht*.so.*

%files devel
%defattr(-,root,root,-)
%doc doc/upgrade-guide.txt
%{_includedir}/%{name}/
%{_libdir}/libIrrlicht*.so

%changelog
* Sat Jan 10 2009 Tom "spot" Callaway <tcallawa at redhat.com> 1.5-2
- fix libpng calls so we can use system libpng (thanks to tom lane)
- fix license tag

* Thu Jan 8 2009 Tom "spot" Callaway <tcallawa at redhat.com> 1.5-1
- build against system libpng
- update to 1.5 final

* Thu Dec 4 2008 Tom "spot" Callaway <tcallawa at redhat.com> 1.5-0.2.beta
- fix optflags patch so that ldconfig isn't called during make install

* Wed Dec 3 2008 Tom "spot" Callaway <tcallawa at redhat.com> 1.5-0.1.beta
- Initial package for Fedora


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/irrlicht/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	12 Jan 2009 16:16:03 -0000	1.1
+++ .cvsignore	12 Jan 2009 16:31:56 -0000	1.2
@@ -0,0 +1 @@
+irrlicht-1.5.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/irrlicht/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	12 Jan 2009 16:16:03 -0000	1.1
+++ sources	12 Jan 2009 16:31:56 -0000	1.2
@@ -0,0 +1 @@
+e3bc8c1074fc0ec2810dc48f94c05d5a  irrlicht-1.5.zip



From awjb at fedoraproject.org  Mon Jan 12 16:35:29 2009
From: awjb at fedoraproject.org (Andreas Bierfert)
Date: Mon, 12 Jan 2009 16:35:29 +0000 (UTC)
Subject: rpms/libnasl/F-10 libnasl-openssl.patch, NONE, 1.1 libnasl.spec,
	1.16, 1.17
Message-ID: <20090112163529.4270E70123@cvs1.fedora.phx.redhat.com>

Author: awjb

Update of /cvs/pkgs/rpms/libnasl/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20902/F-10

Modified Files:
	libnasl.spec 
Added Files:
	libnasl-openssl.patch 
Log Message:
- fix #479655


libnasl-openssl.patch:

--- NEW FILE libnasl-openssl.patch ---
--- nasl/nasl_crypto2.c.orig	2009-01-12 17:27:38.000000000 +0100
+++ nasl/nasl_crypto2.c	2009-01-12 17:30:53.000000000 +0100
@@ -644,7 +644,7 @@
   if (BN_bin2bn((const unsigned char*)s, slen, sig->s) == 0)
      goto fail;
 
-  if (DSA_do_verify((unsigned char*)data, datalen, sig, dsa))
+  if (DSA_do_verify((unsigned char*)data, datalen, sig, dsa) == 1)
      retc->x.i_val = 1;
   
 fail:


Index: libnasl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libnasl/F-10/libnasl.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- libnasl.spec	10 Jan 2009 13:55:17 -0000	1.16
+++ libnasl.spec	12 Jan 2009 16:34:58 -0000	1.17
@@ -1,6 +1,6 @@
 Name:           libnasl
 Version:        2.2.11
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Nessus Attack Scripting Language
 
 Group:          System Environment/Libraries
@@ -11,6 +11,8 @@
 Patch0:         libnasl-config.patch
 Patch1:         libnasl-2.2.4.pki.patch
 Patch2:         libnasl-nasl-config-multi.patch
+# fix #479655 bad signature check
+Patch3:         libnasl-openssl.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  bison
@@ -55,6 +57,7 @@
 %patch0
 %patch1 -p1
 %patch2
+%patch3
 
 %build
 %configure --enable-shared --disable-static --with-pic
@@ -102,6 +105,10 @@
 %doc %{_datadir}/libnasl/
 
 %changelog
+* Mon Jan 12 2009 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- 2.2.11-3
+- fix #479655
+
 * Mon Dec  1 2008 Michael Schwendt <mschwendt at fedoraproject.org> - 2.2.11-2
 - in doc pkg: include missing dirs and mark files as %%doc
 



From awjb at fedoraproject.org  Mon Jan 12 16:35:29 2009
From: awjb at fedoraproject.org (Andreas Bierfert)
Date: Mon, 12 Jan 2009 16:35:29 +0000 (UTC)
Subject: rpms/libnasl/F-9 libnasl-openssl.patch, NONE, 1.1 libnasl.spec, 1.16,
	1.17
Message-ID: <20090112163529.665C170123@cvs1.fedora.phx.redhat.com>

Author: awjb

Update of /cvs/pkgs/rpms/libnasl/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20902/F-9

Modified Files:
	libnasl.spec 
Added Files:
	libnasl-openssl.patch 
Log Message:
- fix #479655


libnasl-openssl.patch:

--- NEW FILE libnasl-openssl.patch ---
--- nasl/nasl_crypto2.c.orig	2009-01-12 17:27:38.000000000 +0100
+++ nasl/nasl_crypto2.c	2009-01-12 17:30:53.000000000 +0100
@@ -644,7 +644,7 @@
   if (BN_bin2bn((const unsigned char*)s, slen, sig->s) == 0)
      goto fail;
 
-  if (DSA_do_verify((unsigned char*)data, datalen, sig, dsa))
+  if (DSA_do_verify((unsigned char*)data, datalen, sig, dsa) == 1)
      retc->x.i_val = 1;
   
 fail:


Index: libnasl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libnasl/F-9/libnasl.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- libnasl.spec	10 Jan 2009 13:55:17 -0000	1.16
+++ libnasl.spec	12 Jan 2009 16:34:59 -0000	1.17
@@ -1,6 +1,6 @@
 Name:           libnasl
 Version:        2.2.11
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Nessus Attack Scripting Language
 
 Group:          System Environment/Libraries
@@ -11,6 +11,8 @@
 Patch0:         libnasl-config.patch
 Patch1:         libnasl-2.2.4.pki.patch
 Patch2:         libnasl-nasl-config-multi.patch
+# fix #479655 bad signature check
+Patch3:         libnasl-openssl.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  bison
@@ -55,6 +57,7 @@
 %patch0
 %patch1 -p1
 %patch2
+%patch3
 
 %build
 %configure --enable-shared --disable-static --with-pic
@@ -102,6 +105,10 @@
 %doc %{_datadir}/libnasl/
 
 %changelog
+* Mon Jan 12 2009 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- 2.2.11-3
+- fix #479655
+
 * Mon Dec  1 2008 Michael Schwendt <mschwendt at fedoraproject.org> - 2.2.11-2
 - in doc pkg: include missing dirs and mark files as %%doc
 



From awjb at fedoraproject.org  Mon Jan 12 16:35:29 2009
From: awjb at fedoraproject.org (Andreas Bierfert)
Date: Mon, 12 Jan 2009 16:35:29 +0000 (UTC)
Subject: rpms/libnasl/devel libnasl-openssl.patch, NONE, 1.1 libnasl.spec,
	1.16, 1.17
Message-ID: <20090112163529.A68E570123@cvs1.fedora.phx.redhat.com>

Author: awjb

Update of /cvs/pkgs/rpms/libnasl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20902/devel

Modified Files:
	libnasl.spec 
Added Files:
	libnasl-openssl.patch 
Log Message:
- fix #479655


libnasl-openssl.patch:

--- NEW FILE libnasl-openssl.patch ---
--- nasl/nasl_crypto2.c.orig	2009-01-12 17:27:38.000000000 +0100
+++ nasl/nasl_crypto2.c	2009-01-12 17:30:53.000000000 +0100
@@ -644,7 +644,7 @@
   if (BN_bin2bn((const unsigned char*)s, slen, sig->s) == 0)
      goto fail;
 
-  if (DSA_do_verify((unsigned char*)data, datalen, sig, dsa))
+  if (DSA_do_verify((unsigned char*)data, datalen, sig, dsa) == 1)
      retc->x.i_val = 1;
   
 fail:


Index: libnasl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libnasl/devel/libnasl.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- libnasl.spec	1 Dec 2008 14:16:30 -0000	1.16
+++ libnasl.spec	12 Jan 2009 16:34:59 -0000	1.17
@@ -1,6 +1,6 @@
 Name:           libnasl
 Version:        2.2.11
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Nessus Attack Scripting Language
 
 Group:          System Environment/Libraries
@@ -11,6 +11,8 @@
 Patch0:         libnasl-config.patch
 Patch1:         libnasl-2.2.4.pki.patch
 Patch2:         libnasl-nasl-config-multi.patch
+# fix #479655 bad signature check
+Patch3:         libnasl-openssl.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  bison
@@ -55,6 +57,7 @@
 %patch0
 %patch1 -p1
 %patch2
+%patch3
 
 %build
 %configure --enable-shared --disable-static --with-pic
@@ -102,6 +105,10 @@
 %doc %{_datadir}/libnasl/
 
 %changelog
+* Mon Jan 12 2009 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- 2.2.11-3
+- fix #479655
+
 * Mon Dec  1 2008 Michael Schwendt <mschwendt at fedoraproject.org> - 2.2.11-2
 - in doc pkg: include missing dirs and mark files as %%doc
 



From spot at fedoraproject.org  Mon Jan 12 16:35:56 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Mon, 12 Jan 2009 16:35:56 +0000 (UTC)
Subject: rpms/tcl-zlib/F-10 tcl-zlib.spec,NONE,1.1 sources,1.1,1.2
Message-ID: <20090112163556.7539A70123@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/tcl-zlib/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21213/F-10

Modified Files:
	sources 
Added Files:
	tcl-zlib.spec 
Log Message:
initial branching


--- NEW FILE tcl-zlib.spec ---
# 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}}
%define realname zlib

Name:		tcl-%{realname}
Version:	2.0.1
Release:	0.2.svn40%{?dist}
Summary:	Tcl extension for zlib support
Group:		System Environment/Libraries
License:	MIT
URL:		http://svn.scheffers.net/
# Snapshot of SVN40 downloaded on June 26, 2008
Source0:	http://svn.scheffers.net/%{realname}.tar.gz
BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildRequires:	tcl-devel, tk-devel, zlib-devel
Requires:	tcl(abi) = %{tcl_version}

%description
This is extension is a standalone version of the tclkit [zlib] 
command/extension. See http://wiki.tcl.tk/zlib for command syntax.

%package devel
Group:		Development/Libraries
Requires:	%{name} = %{version}-%{release}
Summary:	Development files for %{name}
Provides:	tcl-%{realname}-static = %{version}-%{release}

%description devel
Development files for %{name}.

%prep
%setup -q -n %{realname}

%build
%configure --with-tcl=%{_libdir}
# Can't use smp_mflags here. :(
make

%install
rm -rf %{buildroot}
make DESTDIR=%{buildroot} install-binaries install-libraries
install -d %{buildroot}%{tcl_sitearch}
mv %{buildroot}%{_libdir}/%{realname}%{version} %{buildroot}%{tcl_sitearch}/%{realname}%{version}
rm -rf %{buildroot}%{tcl_sitearch}/%{realname}%{version}/zlib.c
chmod -x %{buildroot}%{tcl_sitearch}/%{realname}%{version}/libzlibstub*.a

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc README ChangeLog
%dir %{tcl_sitearch}/%{realname}%{version}
%{tcl_sitearch}/%{realname}%{version}/*.so
%{tcl_sitearch}/%{realname}%{version}/pkgIndex.tcl

%files devel
%defattr(-,root,root,-)
%{tcl_sitearch}/%{realname}%{version}/libzlibstub*.a
%{_includedir}/*.h

%changelog
* Mon Jan 12 2008 Tom "spot" Callaway <tcallawa at redhat.com> 2.0.1-0.2.svn40
- fix tcl version macro

* Thu Jun 26 2008 Tom "spot" Callaway <tcallawa at redhat.com> 2.0.1-0.1.svn40
- initial package for Fedora


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tcl-zlib/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	12 Jan 2009 16:12:45 -0000	1.1
+++ sources	12 Jan 2009 16:35:26 -0000	1.2
@@ -0,0 +1 @@
+31f85d5a94eb2ee49dfd92bcabf311c5  zlib.tar.gz



From spot at fedoraproject.org  Mon Jan 12 16:35:56 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Mon, 12 Jan 2009 16:35:56 +0000 (UTC)
Subject: rpms/tcl-zlib/F-9 tcl-zlib.spec,NONE,1.1 sources,1.1,1.2
Message-ID: <20090112163556.B1D5870123@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/tcl-zlib/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21213/F-9

Modified Files:
	sources 
Added Files:
	tcl-zlib.spec 
Log Message:
initial branching


--- NEW FILE tcl-zlib.spec ---
# 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}}
%define realname zlib

Name:		tcl-%{realname}
Version:	2.0.1
Release:	0.2.svn40%{?dist}
Summary:	Tcl extension for zlib support
Group:		System Environment/Libraries
License:	MIT
URL:		http://svn.scheffers.net/
# Snapshot of SVN40 downloaded on June 26, 2008
Source0:	http://svn.scheffers.net/%{realname}.tar.gz
BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildRequires:	tcl-devel, tk-devel, zlib-devel
Requires:	tcl(abi) = %{tcl_version}

%description
This is extension is a standalone version of the tclkit [zlib] 
command/extension. See http://wiki.tcl.tk/zlib for command syntax.

%package devel
Group:		Development/Libraries
Requires:	%{name} = %{version}-%{release}
Summary:	Development files for %{name}
Provides:	tcl-%{realname}-static = %{version}-%{release}

%description devel
Development files for %{name}.

%prep
%setup -q -n %{realname}

%build
%configure --with-tcl=%{_libdir}
# Can't use smp_mflags here. :(
make

%install
rm -rf %{buildroot}
make DESTDIR=%{buildroot} install-binaries install-libraries
install -d %{buildroot}%{tcl_sitearch}
mv %{buildroot}%{_libdir}/%{realname}%{version} %{buildroot}%{tcl_sitearch}/%{realname}%{version}
rm -rf %{buildroot}%{tcl_sitearch}/%{realname}%{version}/zlib.c
chmod -x %{buildroot}%{tcl_sitearch}/%{realname}%{version}/libzlibstub*.a

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc README ChangeLog
%dir %{tcl_sitearch}/%{realname}%{version}
%{tcl_sitearch}/%{realname}%{version}/*.so
%{tcl_sitearch}/%{realname}%{version}/pkgIndex.tcl

%files devel
%defattr(-,root,root,-)
%{tcl_sitearch}/%{realname}%{version}/libzlibstub*.a
%{_includedir}/*.h

%changelog
* Mon Jan 12 2008 Tom "spot" Callaway <tcallawa at redhat.com> 2.0.1-0.2.svn40
- fix tcl version macro

* Thu Jun 26 2008 Tom "spot" Callaway <tcallawa at redhat.com> 2.0.1-0.1.svn40
- initial package for Fedora


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tcl-zlib/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	12 Jan 2009 16:12:45 -0000	1.1
+++ sources	12 Jan 2009 16:35:26 -0000	1.2
@@ -0,0 +1 @@
+31f85d5a94eb2ee49dfd92bcabf311c5  zlib.tar.gz



From spot at fedoraproject.org  Mon Jan 12 16:35:56 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Mon, 12 Jan 2009 16:35:56 +0000 (UTC)
Subject: rpms/tcl-zlib/devel tcl-zlib.spec,1.1,1.2
Message-ID: <20090112163556.E7B3770123@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/tcl-zlib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21213/devel

Modified Files:
	tcl-zlib.spec 
Log Message:
initial branching


Index: tcl-zlib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tcl-zlib/devel/tcl-zlib.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tcl-zlib.spec	12 Jan 2009 16:20:39 -0000	1.1
+++ tcl-zlib.spec	12 Jan 2009 16:35:26 -0000	1.2
@@ -1,10 +1,14 @@
-%{!?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}}
 %define realname zlib
 
 Name:		tcl-%{realname}
 Version:	2.0.1
-Release:	0.1.svn40%{?dist}
+Release:	0.2.svn40%{?dist}
 Summary:	Tcl extension for zlib support
 Group:		System Environment/Libraries
 License:	MIT
@@ -13,7 +17,7 @@
 Source0:	http://svn.scheffers.net/%{realname}.tar.gz
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildRequires:	tcl-devel, tk-devel, zlib-devel
-Requires:	tcl(abi) = 8.5
+Requires:	tcl(abi) = %{tcl_version}
 
 %description
 This is extension is a standalone version of the tclkit [zlib] 
@@ -60,5 +64,8 @@
 %{_includedir}/*.h
 
 %changelog
+* Mon Jan 12 2008 Tom "spot" Callaway <tcallawa at redhat.com> 2.0.1-0.2.svn40
+- fix tcl version macro
+
 * Thu Jun 26 2008 Tom "spot" Callaway <tcallawa at redhat.com> 2.0.1-0.1.svn40
 - initial package for Fedora



From spot at fedoraproject.org  Mon Jan 12 16:38:05 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Mon, 12 Jan 2009 16:38:05 +0000 (UTC)
Subject: rpms/irrlicht/F-10 irrlicht-1.5-optflags.patch, NONE,
	1.1 irrlicht-1.5-pngfix.patch, NONE, 1.1 irrlicht.spec, NONE,
	1.1 sources, 1.1, 1.2
Message-ID: <20090112163805.5C57D70123@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/irrlicht/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22783/F-10

Modified Files:
	sources 
Added Files:
	irrlicht-1.5-optflags.patch irrlicht-1.5-pngfix.patch 
	irrlicht.spec 
Log Message:
initial branching

irrlicht-1.5-optflags.patch:

--- NEW FILE irrlicht-1.5-optflags.patch ---
diff -up irrlicht-1.5/include/IrrCompileConfig.h.optflags irrlicht-1.5/include/IrrCompileConfig.h
--- irrlicht-1.5/include/IrrCompileConfig.h.optflags	2009-01-08 18:47:11.000000000 -0500
+++ irrlicht-1.5/include/IrrCompileConfig.h	2009-01-08 18:47:41.000000000 -0500
@@ -138,7 +138,7 @@ ones. */
 //! Define _IRR_USE_NON_SYSTEM_ZLIB_ to let irrlicht use the zlib which comes with irrlicht.
 /** If this is commented out, Irrlicht will try to compile using the zlib installed in the system.
 	This is only used when _IRR_COMPILE_WITH_ZLIB_ is defined. */
-#define _IRR_USE_NON_SYSTEM_ZLIB_
+// #define _IRR_USE_NON_SYSTEM_ZLIB_
 
 
 //! Define _IRR_COMPILE_WITH_JPEGLIB_ to enable compiling the engine using libjpeg.
@@ -149,7 +149,7 @@ the engine will no longer read .jpeg ima
 //! Define _IRR_USE_NON_SYSTEM_JPEG_LIB_ to let irrlicht use the jpeglib which comes with irrlicht.
 /** If this is commented out, Irrlicht will try to compile using the jpeg lib installed in the system.
 	This is only used when _IRR_COMPILE_WITH_LIBJPEG_ is defined. */
-#define _IRR_USE_NON_SYSTEM_JPEG_LIB_
+// #define _IRR_USE_NON_SYSTEM_JPEG_LIB_
 
 
 //! Define _IRR_COMPILE_WITH_LIBPNG_ to enable compiling the engine using libpng.
@@ -160,7 +160,7 @@ the engine will no longer read .png imag
 //! Define _IRR_USE_NON_SYSTEM_LIBPNG_ to let irrlicht use the libpng which comes with irrlicht.
 /** If this is commented out, Irrlicht will try to compile using the libpng installed in the system.
 	This is only used when _IRR_COMPILE_WITH_LIBPNG_ is defined. */
-#define _IRR_USE_NON_SYSTEM_LIB_PNG_
+// #define _IRR_USE_NON_SYSTEM_LIB_PNG_
 
 
 //! Define _IRR_D3D_NO_SHADER_DEBUGGING to disable shader debugging in D3D9
diff -up irrlicht-1.5/source/Irrlicht/Makefile.optflags irrlicht-1.5/source/Irrlicht/Makefile
--- irrlicht-1.5/source/Irrlicht/Makefile.optflags	2009-01-08 18:48:16.000000000 -0500
+++ irrlicht-1.5/source/Irrlicht/Makefile	2009-01-08 18:51:11.000000000 -0500
@@ -43,13 +43,13 @@ LIBPNGOBJ = libpng/png.o libpng/pngerror
 EXTRAOBJ =
 LINKOBJ = $(IRRMESHOBJ) $(IRROBJ) $(IRRPARTICLEOBJ) $(IRRANIMOBJ) \
 	$(IRRVIDEOOBJ) $(IRRSWRENDEROBJ) $(IRRIOOBJ) $(IRROTHEROBJ) \
-	$(IRRGUIOBJ) $(ZLIBOBJ) $(JPEGLIBOBJ) $(LIBPNGOBJ) $(EXTRAOBJ)
+	$(IRRGUIOBJ) $(EXTRAOBJ)
 
 ###############
 #Compiler flags
-CXXINCS = -I../../include -Izlib -Ijpeglib -Ilibpng
-CPPFLAGS = $(CXXINCS) -DIRRLICHT_EXPORTS=1
-CXXFLAGS = -Wall -pipe
+CXXINCS = -I../../include
+CPPFLAGS = $(CXXINCS) -DIRRLICHT_EXPORTS=1 $(RPM_OPT_FLAGS)
+CXXFLAGS = -Wall -pipe $(RPM_OPT_FLAGS)
 ifndef NDEBUG
 CXXFLAGS += -g -D_DEBUG
 else
@@ -58,7 +58,7 @@ endif
 ifdef PROFILE
 CXXFLAGS += -pg
 endif
-CFLAGS := -fexpensive-optimizations -O3 -DPNG_THREAD_UNSAFE_OK -DPNG_NO_MMX_CODE -DPNG_NO_MNG_FEATURES
+CFLAGS := -fexpensive-optimizations -O3 -DPNG_THREAD_UNSAFE_OK -DPNG_NO_MMX_CODE -DPNG_NO_MNG_FEATURES $(RPM_OPT_FLAGS)
 
 sharedlib sharedlib_osx: CXXFLAGS += -fpic
 sharedlib sharedlib_osx: CFLAGS += -fpic
@@ -74,9 +74,9 @@ STATIC_LIB = libIrrlicht.a
 IRRLICHT_DLL := ../../bin/Win32-gcc/Irrlicht.dll
 LIB_PATH = ../../lib/$(SYSTEM)
 INSTALL_DIR = /usr/local/lib
-sharedlib: SHARED_LIB = libIrrlicht.so
+sharedlib install: SHARED_LIB = libIrrlicht.so
 staticlib sharedlib: LDFLAGS = --no-export-all-symbols --add-stdcall-alias
-sharedlib: LDFLAGS += -L/usr/X11R6/lib$(LIBSELECT) -lGL -lXxf86vm
+sharedlib: LDFLAGS += -L/usr/X11R6/lib$(LIBSELECT) -lGL -lXxf86vm -lz -ljpeg -lpng
 staticlib sharedlib: CXXINCS += -I/usr/X11R6/include
 
 #OSX specific options
@@ -128,7 +128,6 @@ sharedlib_osx: $(LINKOBJ)
 install:
 	cp $(LIB_PATH)/$(SHARED_LIB).$(VERSION) $(INSTALL_DIR)
 	cd $(INSTALL_DIR) && ln -s libIrrlicht.so.$(VERSION) $(SHARED_LIB)
-	ldconfig -n $(INSTALL_DIR)
 
 install_osx:
 	cp $(LIB_PATH)/$(SHARED_LIB).$(VERSION) $(INSTALL_DIR)

irrlicht-1.5-pngfix.patch:

--- NEW FILE irrlicht-1.5-pngfix.patch ---
diff -up irrlicht-1.5/source/Irrlicht/CImageLoaderPNG.cpp.pngfix irrlicht-1.5/source/Irrlicht/CImageLoaderPNG.cpp
--- irrlicht-1.5/source/Irrlicht/CImageLoaderPNG.cpp.pngfix	2009-01-10 12:46:59.000000000 -0500
+++ irrlicht-1.5/source/Irrlicht/CImageLoaderPNG.cpp	2009-01-10 12:52:19.000000000 -0500
@@ -184,9 +184,14 @@ IImage* CImageLoaderPng::loadImage(io::I
 
 	// Update the changes
 	png_read_update_info(png_ptr, info_ptr);
-	png_get_IHDR(png_ptr, info_ptr,
-		(png_uint_32*)&Width, (png_uint_32*)&Height,
-		&BitDepth, &ColorType, NULL, NULL, NULL);
+	{
+		png_uint_32 w,h;
+		png_get_IHDR(png_ptr, info_ptr,
+			&w, &h,
+			&BitDepth, &ColorType, NULL, NULL, NULL);
+		Width=w;
+		Height=h;
+	}
 
 	// Convert RGBA to BGRA
 	if (ColorType==PNG_COLOR_TYPE_RGB_ALPHA)
@@ -199,9 +204,14 @@ IImage* CImageLoaderPng::loadImage(io::I
 	}
 
 	// Update the changes
-	png_get_IHDR(png_ptr, info_ptr,
-		(png_uint_32*)&Width, (png_uint_32*)&Height,
-		&BitDepth, &ColorType, NULL, NULL, NULL);
+	{
+		png_uint_32 w,h;
+		png_get_IHDR(png_ptr, info_ptr,
+			&w, &h,
+			&BitDepth, &ColorType, NULL, NULL, NULL);
+		Width=w;
+		Height=h;
+	}
 
 	// Create the image structure to be filled by png data
 	if (ColorType==PNG_COLOR_TYPE_RGB_ALPHA)


--- NEW FILE irrlicht.spec ---
Name:		irrlicht
Summary: 	A high performance realtime 3D engine
Version:	1.5
Release:	2%{?dist}
License:	zlib
Group:		System Environment/Libraries
Source0:	http://downloads.sourceforge.net/irrlicht/%{name}-%{version}.zip
# Various fixes, optflags, system libraries/headers
# Don't call ldconfig during make install.
# http://irrlicht.sourceforge.net/phpBB2/viewtopic.php?t=24076&highlight=
Patch0:		irrlicht-1.5-optflags.patch
# Fix how we call libpng so we can use system libpng
Patch1:		irrlicht-1.5-pngfix.patch 
URL:		http://irrlicht.sourceforge.net/
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:	libXxf86vm-devel, mesa-libGL-devel, mesa-libGLU-devel
BuildRequires:	libjpeg-devel, zlib-devel
# XXX: is libpng broken?
BuildRequires: libpng-devel

%description
The Irrlicht Engine is an open source high performance realtime 3D engine 
written and usable in C++ and also available for .NET languages. It is 
completely cross-platform, using D3D, OpenGL and its own software renderer, 
and has all of the state-of-the-art features which can be found in 
commercial 3d engines.

%package devel
Summary:	Development headers and libraries for irrlicht
Requires:	%{name} = %{version}-%{release}
Requires:	mesa-libGL-devel, mesa-libGLU-devel, libXxf86vm-devel
Requires:	libjpeg-devel, zlib-devel, libpng-devel
Group:		Development/Libraries

%description devel
Development headers and libraries for irrlicht.

%prep
%setup -q
%patch0 -p1
%patch1 -p1
sed -i 's/\r//' readme.txt
iconv -o readme.txt.iso88591 -f iso88591 -t utf8 readme.txt
mv readme.txt.iso88591 readme.txt
# We don't use any of this. Deleting it so the debuginfo doesn't pick it up.
rm -rf source/Irrlicht/jpeglib source/Irrlicht/zlib source/Irrlicht/libpng

for i in include/*.h doc/upgrade-guide.txt source/Irrlicht/*.cpp source/Irrlicht/*.h; do
  	sed -i 's/\r//' $i
	chmod -x $i
	touch -r changes.txt $i
done

%build
cd source/Irrlicht
make %{?_smp_mflags} sharedlib

%install
rm -rf %{buildroot}
mkdir -p %{buildroot}%{_libdir}
mkdir -p %{buildroot}%{_includedir}/%{name}
make -C source/Irrlicht INSTALL_DIR=%{buildroot}%{_libdir} install 
cp -a include/* %{buildroot}%{_includedir}/%{name}/
cd %{buildroot}%{_libdir}
ln -s libIrrlicht.so.%{version} libIrrlicht.so.1

%clean
rm -rf %{buildroot}

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files
%defattr(-,root,root,-)
%doc readme.txt
%{_libdir}/libIrrlicht*.so.*

%files devel
%defattr(-,root,root,-)
%doc doc/upgrade-guide.txt
%{_includedir}/%{name}/
%{_libdir}/libIrrlicht*.so

%changelog
* Sat Jan 10 2009 Tom "spot" Callaway <tcallawa at redhat.com> 1.5-2
- fix libpng calls so we can use system libpng (thanks to tom lane)
- fix license tag

* Thu Jan 8 2009 Tom "spot" Callaway <tcallawa at redhat.com> 1.5-1
- build against system libpng
- update to 1.5 final

* Thu Dec 4 2008 Tom "spot" Callaway <tcallawa at redhat.com> 1.5-0.2.beta
- fix optflags patch so that ldconfig isn't called during make install

* Wed Dec 3 2008 Tom "spot" Callaway <tcallawa at redhat.com> 1.5-0.1.beta
- Initial package for Fedora


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/irrlicht/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	12 Jan 2009 16:16:03 -0000	1.1
+++ sources	12 Jan 2009 16:37:34 -0000	1.2
@@ -0,0 +1 @@
+e3bc8c1074fc0ec2810dc48f94c05d5a  irrlicht-1.5.zip



From spot at fedoraproject.org  Mon Jan 12 16:38:05 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Mon, 12 Jan 2009 16:38:05 +0000 (UTC)
Subject: rpms/irrlicht/F-9 irrlicht-1.5-optflags.patch, NONE,
	1.1 irrlicht-1.5-pngfix.patch, NONE, 1.1 irrlicht.spec, NONE,
	1.1 sources, 1.1, 1.2
Message-ID: <20090112163805.8A33270123@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/irrlicht/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22783/F-9

Modified Files:
	sources 
Added Files:
	irrlicht-1.5-optflags.patch irrlicht-1.5-pngfix.patch 
	irrlicht.spec 
Log Message:
initial branching

irrlicht-1.5-optflags.patch:

--- NEW FILE irrlicht-1.5-optflags.patch ---
diff -up irrlicht-1.5/include/IrrCompileConfig.h.optflags irrlicht-1.5/include/IrrCompileConfig.h
--- irrlicht-1.5/include/IrrCompileConfig.h.optflags	2009-01-08 18:47:11.000000000 -0500
+++ irrlicht-1.5/include/IrrCompileConfig.h	2009-01-08 18:47:41.000000000 -0500
@@ -138,7 +138,7 @@ ones. */
 //! Define _IRR_USE_NON_SYSTEM_ZLIB_ to let irrlicht use the zlib which comes with irrlicht.
 /** If this is commented out, Irrlicht will try to compile using the zlib installed in the system.
 	This is only used when _IRR_COMPILE_WITH_ZLIB_ is defined. */
-#define _IRR_USE_NON_SYSTEM_ZLIB_
+// #define _IRR_USE_NON_SYSTEM_ZLIB_
 
 
 //! Define _IRR_COMPILE_WITH_JPEGLIB_ to enable compiling the engine using libjpeg.
@@ -149,7 +149,7 @@ the engine will no longer read .jpeg ima
 //! Define _IRR_USE_NON_SYSTEM_JPEG_LIB_ to let irrlicht use the jpeglib which comes with irrlicht.
 /** If this is commented out, Irrlicht will try to compile using the jpeg lib installed in the system.
 	This is only used when _IRR_COMPILE_WITH_LIBJPEG_ is defined. */
-#define _IRR_USE_NON_SYSTEM_JPEG_LIB_
+// #define _IRR_USE_NON_SYSTEM_JPEG_LIB_
 
 
 //! Define _IRR_COMPILE_WITH_LIBPNG_ to enable compiling the engine using libpng.
@@ -160,7 +160,7 @@ the engine will no longer read .png imag
 //! Define _IRR_USE_NON_SYSTEM_LIBPNG_ to let irrlicht use the libpng which comes with irrlicht.
 /** If this is commented out, Irrlicht will try to compile using the libpng installed in the system.
 	This is only used when _IRR_COMPILE_WITH_LIBPNG_ is defined. */
-#define _IRR_USE_NON_SYSTEM_LIB_PNG_
+// #define _IRR_USE_NON_SYSTEM_LIB_PNG_
 
 
 //! Define _IRR_D3D_NO_SHADER_DEBUGGING to disable shader debugging in D3D9
diff -up irrlicht-1.5/source/Irrlicht/Makefile.optflags irrlicht-1.5/source/Irrlicht/Makefile
--- irrlicht-1.5/source/Irrlicht/Makefile.optflags	2009-01-08 18:48:16.000000000 -0500
+++ irrlicht-1.5/source/Irrlicht/Makefile	2009-01-08 18:51:11.000000000 -0500
@@ -43,13 +43,13 @@ LIBPNGOBJ = libpng/png.o libpng/pngerror
 EXTRAOBJ =
 LINKOBJ = $(IRRMESHOBJ) $(IRROBJ) $(IRRPARTICLEOBJ) $(IRRANIMOBJ) \
 	$(IRRVIDEOOBJ) $(IRRSWRENDEROBJ) $(IRRIOOBJ) $(IRROTHEROBJ) \
-	$(IRRGUIOBJ) $(ZLIBOBJ) $(JPEGLIBOBJ) $(LIBPNGOBJ) $(EXTRAOBJ)
+	$(IRRGUIOBJ) $(EXTRAOBJ)
 
 ###############
 #Compiler flags
-CXXINCS = -I../../include -Izlib -Ijpeglib -Ilibpng
-CPPFLAGS = $(CXXINCS) -DIRRLICHT_EXPORTS=1
-CXXFLAGS = -Wall -pipe
+CXXINCS = -I../../include
+CPPFLAGS = $(CXXINCS) -DIRRLICHT_EXPORTS=1 $(RPM_OPT_FLAGS)
+CXXFLAGS = -Wall -pipe $(RPM_OPT_FLAGS)
 ifndef NDEBUG
 CXXFLAGS += -g -D_DEBUG
 else
@@ -58,7 +58,7 @@ endif
 ifdef PROFILE
 CXXFLAGS += -pg
 endif
-CFLAGS := -fexpensive-optimizations -O3 -DPNG_THREAD_UNSAFE_OK -DPNG_NO_MMX_CODE -DPNG_NO_MNG_FEATURES
+CFLAGS := -fexpensive-optimizations -O3 -DPNG_THREAD_UNSAFE_OK -DPNG_NO_MMX_CODE -DPNG_NO_MNG_FEATURES $(RPM_OPT_FLAGS)
 
 sharedlib sharedlib_osx: CXXFLAGS += -fpic
 sharedlib sharedlib_osx: CFLAGS += -fpic
@@ -74,9 +74,9 @@ STATIC_LIB = libIrrlicht.a
 IRRLICHT_DLL := ../../bin/Win32-gcc/Irrlicht.dll
 LIB_PATH = ../../lib/$(SYSTEM)
 INSTALL_DIR = /usr/local/lib
-sharedlib: SHARED_LIB = libIrrlicht.so
+sharedlib install: SHARED_LIB = libIrrlicht.so
 staticlib sharedlib: LDFLAGS = --no-export-all-symbols --add-stdcall-alias
-sharedlib: LDFLAGS += -L/usr/X11R6/lib$(LIBSELECT) -lGL -lXxf86vm
+sharedlib: LDFLAGS += -L/usr/X11R6/lib$(LIBSELECT) -lGL -lXxf86vm -lz -ljpeg -lpng
 staticlib sharedlib: CXXINCS += -I/usr/X11R6/include
 
 #OSX specific options
@@ -128,7 +128,6 @@ sharedlib_osx: $(LINKOBJ)
 install:
 	cp $(LIB_PATH)/$(SHARED_LIB).$(VERSION) $(INSTALL_DIR)
 	cd $(INSTALL_DIR) && ln -s libIrrlicht.so.$(VERSION) $(SHARED_LIB)
-	ldconfig -n $(INSTALL_DIR)
 
 install_osx:
 	cp $(LIB_PATH)/$(SHARED_LIB).$(VERSION) $(INSTALL_DIR)

irrlicht-1.5-pngfix.patch:

--- NEW FILE irrlicht-1.5-pngfix.patch ---
diff -up irrlicht-1.5/source/Irrlicht/CImageLoaderPNG.cpp.pngfix irrlicht-1.5/source/Irrlicht/CImageLoaderPNG.cpp
--- irrlicht-1.5/source/Irrlicht/CImageLoaderPNG.cpp.pngfix	2009-01-10 12:46:59.000000000 -0500
+++ irrlicht-1.5/source/Irrlicht/CImageLoaderPNG.cpp	2009-01-10 12:52:19.000000000 -0500
@@ -184,9 +184,14 @@ IImage* CImageLoaderPng::loadImage(io::I
 
 	// Update the changes
 	png_read_update_info(png_ptr, info_ptr);
-	png_get_IHDR(png_ptr, info_ptr,
-		(png_uint_32*)&Width, (png_uint_32*)&Height,
-		&BitDepth, &ColorType, NULL, NULL, NULL);
+	{
+		png_uint_32 w,h;
+		png_get_IHDR(png_ptr, info_ptr,
+			&w, &h,
+			&BitDepth, &ColorType, NULL, NULL, NULL);
+		Width=w;
+		Height=h;
+	}
 
 	// Convert RGBA to BGRA
 	if (ColorType==PNG_COLOR_TYPE_RGB_ALPHA)
@@ -199,9 +204,14 @@ IImage* CImageLoaderPng::loadImage(io::I
 	}
 
 	// Update the changes
-	png_get_IHDR(png_ptr, info_ptr,
-		(png_uint_32*)&Width, (png_uint_32*)&Height,
-		&BitDepth, &ColorType, NULL, NULL, NULL);
+	{
+		png_uint_32 w,h;
+		png_get_IHDR(png_ptr, info_ptr,
+			&w, &h,
+			&BitDepth, &ColorType, NULL, NULL, NULL);
+		Width=w;
+		Height=h;
+	}
 
 	// Create the image structure to be filled by png data
 	if (ColorType==PNG_COLOR_TYPE_RGB_ALPHA)


--- NEW FILE irrlicht.spec ---
Name:		irrlicht
Summary: 	A high performance realtime 3D engine
Version:	1.5
Release:	2%{?dist}
License:	zlib
Group:		System Environment/Libraries
Source0:	http://downloads.sourceforge.net/irrlicht/%{name}-%{version}.zip
# Various fixes, optflags, system libraries/headers
# Don't call ldconfig during make install.
# http://irrlicht.sourceforge.net/phpBB2/viewtopic.php?t=24076&highlight=
Patch0:		irrlicht-1.5-optflags.patch
# Fix how we call libpng so we can use system libpng
Patch1:		irrlicht-1.5-pngfix.patch 
URL:		http://irrlicht.sourceforge.net/
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:	libXxf86vm-devel, mesa-libGL-devel, mesa-libGLU-devel
BuildRequires:	libjpeg-devel, zlib-devel
# XXX: is libpng broken?
BuildRequires: libpng-devel

%description
The Irrlicht Engine is an open source high performance realtime 3D engine 
written and usable in C++ and also available for .NET languages. It is 
completely cross-platform, using D3D, OpenGL and its own software renderer, 
and has all of the state-of-the-art features which can be found in 
commercial 3d engines.

%package devel
Summary:	Development headers and libraries for irrlicht
Requires:	%{name} = %{version}-%{release}
Requires:	mesa-libGL-devel, mesa-libGLU-devel, libXxf86vm-devel
Requires:	libjpeg-devel, zlib-devel, libpng-devel
Group:		Development/Libraries

%description devel
Development headers and libraries for irrlicht.

%prep
%setup -q
%patch0 -p1
%patch1 -p1
sed -i 's/\r//' readme.txt
iconv -o readme.txt.iso88591 -f iso88591 -t utf8 readme.txt
mv readme.txt.iso88591 readme.txt
# We don't use any of this. Deleting it so the debuginfo doesn't pick it up.
rm -rf source/Irrlicht/jpeglib source/Irrlicht/zlib source/Irrlicht/libpng

for i in include/*.h doc/upgrade-guide.txt source/Irrlicht/*.cpp source/Irrlicht/*.h; do
  	sed -i 's/\r//' $i
	chmod -x $i
	touch -r changes.txt $i
done

%build
cd source/Irrlicht
make %{?_smp_mflags} sharedlib

%install
rm -rf %{buildroot}
mkdir -p %{buildroot}%{_libdir}
mkdir -p %{buildroot}%{_includedir}/%{name}
make -C source/Irrlicht INSTALL_DIR=%{buildroot}%{_libdir} install 
cp -a include/* %{buildroot}%{_includedir}/%{name}/
cd %{buildroot}%{_libdir}
ln -s libIrrlicht.so.%{version} libIrrlicht.so.1

%clean
rm -rf %{buildroot}

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files
%defattr(-,root,root,-)
%doc readme.txt
%{_libdir}/libIrrlicht*.so.*

%files devel
%defattr(-,root,root,-)
%doc doc/upgrade-guide.txt
%{_includedir}/%{name}/
%{_libdir}/libIrrlicht*.so

%changelog
* Sat Jan 10 2009 Tom "spot" Callaway <tcallawa at redhat.com> 1.5-2
- fix libpng calls so we can use system libpng (thanks to tom lane)
- fix license tag

* Thu Jan 8 2009 Tom "spot" Callaway <tcallawa at redhat.com> 1.5-1
- build against system libpng
- update to 1.5 final

* Thu Dec 4 2008 Tom "spot" Callaway <tcallawa at redhat.com> 1.5-0.2.beta
- fix optflags patch so that ldconfig isn't called during make install

* Wed Dec 3 2008 Tom "spot" Callaway <tcallawa at redhat.com> 1.5-0.1.beta
- Initial package for Fedora


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/irrlicht/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	12 Jan 2009 16:16:03 -0000	1.1
+++ sources	12 Jan 2009 16:37:35 -0000	1.2
@@ -0,0 +1 @@
+e3bc8c1074fc0ec2810dc48f94c05d5a  irrlicht-1.5.zip



From spot at fedoraproject.org  Mon Jan 12 16:38:55 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Mon, 12 Jan 2009 16:38:55 +0000 (UTC)
Subject: rpms/tcl-zlib/F-10 tcl-zlib.spec,1.1,1.2
Message-ID: <20090112163855.6C45470123@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/tcl-zlib/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23054/F-10

Modified Files:
	tcl-zlib.spec 
Log Message:
fix changelog date


Index: tcl-zlib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tcl-zlib/F-10/tcl-zlib.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tcl-zlib.spec	12 Jan 2009 16:35:26 -0000	1.1
+++ tcl-zlib.spec	12 Jan 2009 16:38:25 -0000	1.2
@@ -64,7 +64,7 @@
 %{_includedir}/*.h
 
 %changelog
-* Mon Jan 12 2008 Tom "spot" Callaway <tcallawa at redhat.com> 2.0.1-0.2.svn40
+* Mon Jan 12 2009 Tom "spot" Callaway <tcallawa at redhat.com> 2.0.1-0.2.svn40
 - fix tcl version macro
 
 * Thu Jun 26 2008 Tom "spot" Callaway <tcallawa at redhat.com> 2.0.1-0.1.svn40



From spot at fedoraproject.org  Mon Jan 12 16:38:55 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Mon, 12 Jan 2009 16:38:55 +0000 (UTC)
Subject: rpms/tcl-zlib/F-9 tcl-zlib.spec,1.1,1.2
Message-ID: <20090112163855.AFC0570123@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/tcl-zlib/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23054/F-9

Modified Files:
	tcl-zlib.spec 
Log Message:
fix changelog date


Index: tcl-zlib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tcl-zlib/F-9/tcl-zlib.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tcl-zlib.spec	12 Jan 2009 16:35:26 -0000	1.1
+++ tcl-zlib.spec	12 Jan 2009 16:38:25 -0000	1.2
@@ -64,7 +64,7 @@
 %{_includedir}/*.h
 
 %changelog
-* Mon Jan 12 2008 Tom "spot" Callaway <tcallawa at redhat.com> 2.0.1-0.2.svn40
+* Mon Jan 12 2009 Tom "spot" Callaway <tcallawa at redhat.com> 2.0.1-0.2.svn40
 - fix tcl version macro
 
 * Thu Jun 26 2008 Tom "spot" Callaway <tcallawa at redhat.com> 2.0.1-0.1.svn40



From spot at fedoraproject.org  Mon Jan 12 16:38:55 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Mon, 12 Jan 2009 16:38:55 +0000 (UTC)
Subject: rpms/tcl-zlib/devel tcl-zlib.spec,1.2,1.3
Message-ID: <20090112163855.F180570142@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/tcl-zlib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23054/devel

Modified Files:
	tcl-zlib.spec 
Log Message:
fix changelog date


Index: tcl-zlib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tcl-zlib/devel/tcl-zlib.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- tcl-zlib.spec	12 Jan 2009 16:35:26 -0000	1.2
+++ tcl-zlib.spec	12 Jan 2009 16:38:25 -0000	1.3
@@ -64,7 +64,7 @@
 %{_includedir}/*.h
 
 %changelog
-* Mon Jan 12 2008 Tom "spot" Callaway <tcallawa at redhat.com> 2.0.1-0.2.svn40
+* Mon Jan 12 2009 Tom "spot" Callaway <tcallawa at redhat.com> 2.0.1-0.2.svn40
 - fix tcl version macro
 
 * Thu Jun 26 2008 Tom "spot" Callaway <tcallawa at redhat.com> 2.0.1-0.1.svn40



From spot at fedoraproject.org  Mon Jan 12 16:38:59 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Mon, 12 Jan 2009 16:38:59 +0000 (UTC)
Subject: rpms/SolarModel/devel SolarModel-2.1-Fedora.patch, NONE,
	1.1 SolarModel.desktop, NONE, 1.1 SolarModel.png, NONE,
	1.1 SolarModel.spec, NONE, 1.1 config.dat, NONE, 1.1 data.dat,
	NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090112163859.4E41F70123@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/SolarModel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23116/devel

Modified Files:
	.cvsignore sources 
Added Files:
	SolarModel-2.1-Fedora.patch SolarModel.desktop SolarModel.png 
	SolarModel.spec config.dat data.dat import.log 
Log Message:

initial import


SolarModel-2.1-Fedora.patch:

--- NEW FILE SolarModel-2.1-Fedora.patch ---
diff -up SolarModel_src/GameMain.cpp.Fedora SolarModel_src/GameMain.cpp
--- SolarModel_src/GameMain.cpp.Fedora	2008-06-01 06:29:58.000000000 -0400
+++ SolarModel_src/GameMain.cpp	2009-01-05 17:15:52.000000000 -0500
@@ -109,7 +109,7 @@ void GameInit()
 
 	// Maps setup
 
-	Game.FS->addZipFileArchive("data.dat", true, false);
+	Game.FS->addZipFileArchive("/usr/share/SolarModel/data.dat", true, false);
 
 	Game.Map->Load("maps/sun.xml");
 	Game.Map->Load("maps/mercury.xml");
@@ -479,7 +479,7 @@ void ProcessEvent_GUI_ButtonClicked_Opti
 	// reading options from config file
 
 	GameStruct conf;
-	GameConfig::Load("config.dat", &conf);
+	GameConfig::Load("/usr/share/SolarModel/config.dat", &conf);
 
 	// creating window
 
@@ -1174,7 +1174,7 @@ void ProcessSysInfo()
 	Game.OS->getSystemMemory(&mem_total, &mem_avail);
 
 	wchar_t ss[1024];
-	_snwprintf(ss, sizeof(ss),
+	swprintf(ss, (sizeof(ss)/sizeof(ss[0])),
 		L"FPS:  %03u            "
 		L"POLYGONS DRAWN:  %06u            "
 		L"RENDERER:  %ls\n"
@@ -1384,4 +1384,4 @@ void GameDone()
 {
 	if (mapdesc) delete mapdesc;
 	gameMeasurer.Done();
-}
\ No newline at end of file
+}
diff -up SolarModel_src/GameMeasurer.cpp.Fedora SolarModel_src/GameMeasurer.cpp
--- SolarModel_src/GameMeasurer.cpp.Fedora	2008-05-31 01:34:54.000000000 -0400
+++ SolarModel_src/GameMeasurer.cpp	2009-01-05 17:16:25.000000000 -0500
@@ -298,23 +298,23 @@ core::stringw GameMeasurer::GetDistanceA
 
 	if (distanceKM < 100)
 	{
-		_snwprintf(s, sizeof(s), L"%.0lf m", distanceKM*1000.0f);
+		swprintf(s, (sizeof(s)/sizeof(s[0])), L"%.0lf m", distanceKM*1000.0f);
 	}
 	else
 	{
 		// 1 au == 149,597,871 km
 		wchar_t au[512];
-		_snwprintf(au, sizeof(au), L" (%.3lf au)",
+		swprintf(au, (sizeof(au)/sizeof(au[0])), L" (%.3lf au)",
 			distanceKM/149597871.0f);
 
 		// 1 ly == 9,460,730,472,581 km
 		wchar_t ly[512];
-		_snwprintf(ly, sizeof(ly), L" (%.3lf ly)",
+		swprintf(ly, (sizeof(ly)/sizeof(ly[0])), L" (%.3lf ly)",
 			distanceKM/9460730472581.0f);
 
-		_snwprintf(s, sizeof(s), L"%.0lf km%s%s",
-			distanceKM, distanceKM>149598?au:L"", distanceKM>9460730473?ly:L"");
+		swprintf(s, (sizeof(s)/sizeof(s[0])), L"%.0lf km%s%s",
+			distanceKM, distanceKM>149598?au:L"", distanceKM>9460730473LL?ly:L"");
 	}
 
 	return core::stringw(s);
-}
\ No newline at end of file
+}
diff -up SolarModel_src/Makefile.Fedora SolarModel_src/Makefile
--- SolarModel_src/Makefile.Fedora	2008-05-31 02:29:00.000000000 -0400
+++ SolarModel_src/Makefile	2009-01-05 17:16:03.000000000 -0500
@@ -1,14 +1,11 @@
 # Makefile for SolarModel
 
 Target = SolarModel
-Sources = GameAnimatedMeshObject.cpp GameBillboardObject.cpp GameConfig.cpp GameCore.cpp GameEventReceiver.cpp GameGlobals.cpp GameLightObject.cpp GameMain.cpp GameMap.cpp GameMapDescription.cpp GameObject.cpp GameSkyBoxObject.cpp GamePointcloudObject.cpp GameMeshObject.cpp GameMeasurer.cpp
-
-# Paths
-IRRLICHT_HOME = $(HOME)/irrlicht/svn-plain
+Sources = GameAnimatedMeshObject.cpp GameBillboardObject.cpp GameConfig.cpp GameCore.cpp GameEventReceiver.cpp GameGlobals.cpp GameLightObject.cpp GameMain.cpp GameMap.cpp GameMapDescription.cpp GameObject.cpp GameSkyboxObject.cpp GamePointcloudObject.cpp GameMeshObject.cpp GameMeasurer.cpp
 
 # general compiler settings
-CPPFLAGS = -I$(IRRLICHT_HOME)/include -I/usr/X11R6/include
-CXXFLAGS = -O3 -ffast-math
+CPPFLAGS = -I/usr/include/irrlicht
+CXXFLAGS = -ffast-math $(RPM_OPT_FLAGS)
 #CXXFLAGS = -g -Wall
 
 #default target is Linux
@@ -19,7 +16,7 @@ LIBSELECT=64
 endif
 
 # target specific settings
-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L$(IRRLICHT_HOME)/lib/Linux -lIrrlicht -lGL -lGLU -lXxf86vm -lXext -lX11
+all_linux: LDFLAGS = -lIrrlicht -lGL -lGLU -lXxf86vm -lXext -lX11
 all_linux clean_linux: SYSTEM=Linux
 all_win32: LDFLAGS = -L$(IRRLICHT_HOME)/lib/Win32-gcc -lIrrlicht -lopengl32 -lglu32 -lm
 all_win32 clean_win32: SYSTEM=Win32-gcc


--- NEW FILE SolarModel.desktop ---
[Desktop Entry]
Version=1.0
Name=SolarModel
GenericName=Solar System simulation
Comment=A 3D Real-Time Solar System Simulation
Exec=SolarModel
Icon=SolarModel
StartupNotify=false
Terminal=false
Type=Application
Categories=Graphics;
X-Desktop-File-Install-Version=0.15


--- NEW FILE SolarModel.spec ---
Name:		SolarModel
Summary: 	Real-time 3D Solar System simulation
Version:	2.1
Release:	2%{?dist}
License:	GPL+
Group:		System Environment/Base
Source0:	http://downloads.sourceforge.net/solarmodel/%{name}_src_2_1.zip
# Upstream only has these .dat files in the binary zip file for 2.1
# http://downloads.sourceforge.net/solarmodel/SolarModel_bin_2_1.zip
Source1:	config.dat
Source2:	data.dat
Source3:	SolarModel.desktop
Source4:	SolarModel.png
# Use system locations for libraries, headers
# Use RPM_OPT_FLAGS
# Fix swprintf/Linux related issues
Patch0:		SolarModel-2.1-Fedora.patch
URL:		http://www.ffsoftworks.com/solarmodel.php
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:	irrlicht-devel, libXext-devel, libX11-devel, desktop-file-utils

%description
Solar Model provides realtime modeling of the solar system. It allows the user 
to navigate in space, to control time counting (speed-up time flow) and 
estimate real movement of space bodies like planets, dwarf planets and moons; 
estimate its nowadays positions in space. You may select two possible views: 
Solar System view or Milky Way galaxy view. It also allows the user to bind 
the camera to space objects (for example, you can look from the Moon onto Earth 
in real-time flow). 

%prep
%setup -q -n %{name}_src
%patch0 -p1 -b .Fedora

for i in _dev/*.txt "_dev/map/*.txt"; do
	sed -i 's/\r//' $i
done
iconv -o _dev/Changelog.txt.iso88591 -f iso88591 -t utf8 _dev/Changelog.txt
mv _dev/Changelog.txt.iso88591 _dev/Changelog.txt

%build
make %{_smp_mflags}

%install
rm -rf %{buildroot}
mkdir -p %{buildroot}%{_bindir}
install -m0755 SolarModel %{buildroot}%{_bindir}
mkdir -p %{buildroot}%{_datadir}/%{name}
mkdir -p %{buildroot}%{_datadir}/pixmaps
install -p -m0644 %{SOURCE1} %{buildroot}%{_datadir}/%{name}
install	-p -m0644 %{SOURCE2} %{buildroot}%{_datadir}/%{name}
install -p -m0644 %{SOURCE4} %{buildroot}%{_datadir}/pixmaps

mkdir -p %{buildroot}%{_datadir}/applications
desktop-file-install --dir %{buildroot}%{_datadir}/applications %{SOURCE3}


%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc _dev/Changelog.txt _dev/License.txt _dev/Readme.txt _dev/map/* _dev/num/*
%{_bindir}/%{name}
%{_datadir}/%{name}/
%{_datadir}/applications/*.desktop
%{_datadir}/pixmaps/SolarModel.png

%changelog
* Mon Jan 5 2009 Tom "spot" Callaway <tcallawa at redhat.com> 2.1-2
- add desktop file and icon
- fix 32bit build (thanks to Lubomir Rintel)

* Wed Dec 3 2008 Tom "spot" Callaway <tcallawa at redhat.com> 2.1-1
- Initial package for Fedora


--- NEW FILE config.dat ---
drivertype opengl
width 800
height 600
bitsperpixel 32
fullscreen 0
antialias 0
vsync 0
backgroundrendering 0
screenshotwithoutgui 0
screenshotquality 100


--- NEW FILE data.dat ---
PK

=?f???0??-??]0????qJ?S???W???????'??z\/?}?2S????:O????}2????;?~?K???V??4?????x?]TN??0K"?b?n-?i??i1?


V??????]\X=?m?6?t?(^???P?l??8t?w?U"??v*?M8*{?b14???|."?????@*E?17kZ??`Z??r
pY??^??!?_?&??@^+{???+???M??rzX[Ji???#v?=M???8?????!5?4???x?????h??T???????tE?I?'??.4??1g??V[)/4?J?#8??*M????m?j9?5???BS??&S?&?
|?kQr?;?
?8??L????<?>?)m??C???CO?+?;K>?N???2?pN??????X}J0d??+yz??)G*B?D???`;S???0????P???N??"z,???g??????n?&E<@??K?U????>?3v):Q???v?~>??J??%?v???D????w}F??l??$&1????X?x?F?(?@?`2??i1????_l Na|=dL?.??\0?Tf?~M?n:1??????|??V`m?ttx?Z>G?I???K8P?&N?x?nT5??Q(????\x??~?m??3?*@??M?.????HX?Y?;?????f?W,?p????_?<?@?o?d)?=?F????? W????Jc??9i]??$d?!??????????@BwR??e?p?m???{?pFQ?L?[??P	????T??[??^??@E{?B??w?.|)`??&#?<r"??'O?%????{??????????mMB?2??9??Oj?k?x?0)y??^1K
z0_s];?????L?\k?v???d-w??{???
?Z?H?)???t	??G?<7|!?$f???A????&?????w`?|'?O5W?T3??\??F>?h?3?a?f?7a
SctYVpH??b???vjF?!?`O????/??-K?5??f{? &???????:?k
q?L?0??)rnu?U?Y????r~??+MQ??a???Gy??????]??jl%&?????I?G??D@?q??>?=a??(p	?.?[???g?.U=U?}? ?_w?BI?>?k????{?=F0?h??cD
h?n?Lp??T? ?$G?N????????7??	??>??W??Z??????_?||?l?K#?k?"???G?f?K??
@t?W,??15 ?????_??}?????7??,yt;}??H???m????????
D9??b?g)?n?????op&????GW?V??????0?\????b5????Z?G??/????????x?P.Y????l?cAf????sZR3?"Z????
????-?????I???yi??W??j?\???jF??
V??"?{?95?ZUUu[???????i??^5%7????UP?a?>??a??nz6???yf???^d?	?????b?M;?.
????????(????}?}+??q??????sZ???????|?+???(8-?7Y6?
???[Ut??~f???S?`zo?\?4?;\???U?;?.?Z;q_fiH?yl?7??"??'?]F-H???K??????m?)???Q??WW_`Cn??ad???<a????Z????h2O?S?6O?;??Z??
e???u?q????Q? 5??:r??M?A????hl?E???????Q??N????
r0?P.?|?
??s??fWd?sC?K4?I???.I}?5f}???v??f????p??cR?h?V???'?0???d?S?D?D?????

?h??c?v::??x}D??????7?????3?u{*???]@?hWMWaMA?V?????\?U?Pz
???X?s)??
d???l????Vm?My1???}W??????????W??d??*e????	tXF;??9?>?3:{%4????	?x'?W H/H??F?J?!?????!A? ?e??????????t???%?1???B??x|?x@???????????+?N?\?/	j,??u~?????3%'?j?HI?#????????G!????0??-q??7Y?<??5?x`?M??????+U???????'?p[???Z?l?E)jE?????????hS?F
?dp??Xn???8??
?.? ~???P??????9?SK??f?,;?Zo?i?bh?:5akGu??
??]??i?YY?A?????H?!?PM?????a?~>\??.??????-|Kiv]???b})???=????!8&p	2o?.????p
??=E????
????'??485?6~??@.Q??t??????	~?.?)?V	?^V[2:??
0??AJ???g??V&??????I>?tq$&|D4?e?E??F??????s??w?K(A????Q30?`???c1j????F?5I????{???0?(????y??M??Mf??Z.??H??6e??O??????4???E???7UH|
 ?sz?????????W?V??a ?1?a?H{?A?|??L0?cp??????A?<W4????Pu?l\???????]}Y????h!?B??????????8?`???-??~?66G???d???}DzR????>%
????O??????Y??f??
???#?#]?P?f"?'?$?]<?W?????F? ?jw~????1Cs?8???~?oy4?G??6??-?S?1?v??S<.??R?A????Ve}.?}? ?A??#\0N??,N?t?Q?????n\6??????M??X?O??????
?^6X?h!p???8??Q?;)????HRsyY_?{??f???q?m?#???7???Z?,???x?"D?#ZS?cs??*S??$?	????????k??%
?>p??.????pB/;R??@?~????-6????i?ti
??.j?(5:??y?-}=???aNa:f???o??
??s?p??A????]H1|?????/
??j?
??~?D???Fur????8	??q)??	Y?l?['?? gO??'?-??{???{e??*a?t@??5???
?u"????7P>:??x-h??C????R?????1/?
?B?	vP??e???2?Y???&???p??r??f.2?F
?&?qM?gF???]U?{?Qh?????t?]?y?d?d?J%!]mR??%??s??svN???6K???(????????F??'?7R??K??tZ???o?K?`j?qU?
?
?0f<Gl?n}|??L&u??E?Rh+0N#B>{?E??q?n?????!w??0q???R?????)?>??ws??\???O????????\??
?3AF?U?M:??\/]?{?^??	?h????~z?kW??}??N$? ]??????????????
?	/CO)1m)E?V?)V?p?q?}??????Y
???)????=?t?S?jR????Nf?m????q~?_???9%??????L??<s???Q???f
G8??)??%?5?4??????8??S?f?gph?
??OO?+	??9??0}jA?g/???mF??b???B????????7??v?&??mK???	???PYk?q?GZC?|	????
n??S?[??C?{\%??l?????	O??Bg?g?q?Ws?;????Xq1a?|?5?g??
?
????/YL??|9?@??Q?7?T????im1??V?q????? ?wP????v?
mF?
?0S??aBI*W?W????+??v7??^???????P??72??U??????1???G?b????Q????]?R??m?>^4????N'a
?????P?a???z?KT?0J??#??<75tk????=?:sH[??&??z?I=0????n????g??$`O??!G:?8?l??6?'%V\;^^?r?>???{K?k??y??v?OQ?????x??%?
?{O x??????Lf??<?I?{?wz????%??<l5??k?bd??d?H?6?b?vO????]??Ry?pb?Gr?&???z[?Y>?a,
??
?????5/??H2oB?C#????I|????qw?f}?So?N?"v?e??.=?$??w-dH?F?????4???tI?O??LN?????h>0??????T???+??????Y???????r??????,???X?????E?? !???f?Ul??S?d???F???lz?nS~?1?.w#o?????A???=?_??:`??l?/N<?k???1)?3??J??!x??w???<?G?????F?-K?^?qN??F??h[??7qs.CS??i%?0?m?c
??L??<y??????7?x1B??? *?M???????Sv?? ??-2dC&?Ki|Veyp?
0?l?D?aa0????
Y?rZ???al?)?????4?4?,?:?8?su????0,?3ZBCc!F?c.?j*?*a8?DF?h&????\)?v?q?6!Gx?S??j$?m?U!q]K'??_ ?
??????E????aKI<??sX?uy??f?6Pe?9?	c?kS????6?|?p? (_?????5?v(???t??v????????V`?M,J+?~??$L\r????w??f.r1?T"L??B?o?
>?\9c?????_??n?'=M??Ix?u???j????i????W???
??w???0Ga???@?@??????F?r???%??????	??Q???X???
*GO??
d]??
??%?r(*b??82???????o
?????q?X????Vr?5???P??5ya?]?zP??Q<$?W?0^%?	}?l9>?a??MI?_4???x??Jd.??R???
???w2?eF?7?qi
8&?$?3??}?4s?????O+Y	??I9Z??s?g??V\???????5???"??\??J?S??gaq??????T?????g?\??$???J?J?7???Xi??Q????4`y???Z???~??Y?????2^XY??????7/???=??e?????]f?>?X7;?3F?HC?|SC,?Q?D??	?v?0?a?8???elz?`???	?s?Nz??c?xN??)c;????4????S??????1???D6?3v6???g??y%?	;??`{`???f???8?x?????"?y?7QzO???5??????k??[V?\o?????:?'??????/?e?
????

K=%?


IHDR
m}?:r???????3'??p6W?^@?
?tGr9R?*?"?6q)??f??`???G????????Ri?@?m
NS"?H$?

?k	od}t?-????Q?O
?7T1??Ff??cy%???N5?????S5jai?:?????W????h??
4#=[KFQ*??{,k

A??;????-?u??s?eN???p1???4?Q?M?>???u
p+???#EoLs????N
???a?m????_
?[?U???)??Q/??$rX?k? ?X?S?PNw.?xm
<?5??7????H$?D"?H$???
???vO?c?
?]????].?qms???????t??"??#?;?;/-MxG?m
Q
o:?{/P?5??Y?c?g8#
U????-???????
?fwN??q???e6???`?????2?h,N??v???^?hVLN?@pnD?
b?????>Y?r??_??zG?V???????FI??;2z2?3?????[T?{	?i@?t?w??l????`s(?U<?????
???@<v?????e?5?'??W*??^5?S?n|?e?;R?Z?o)AGI??+??m#?T<z?/?G???}D?V??????????)???l?????y6z699<?@L????Z???????iZ??8Oz=?g??u?Sy??*?x??uu??
?x???????b?1?????P?wT0[@??"onn?psss3M??J????G???????xu?U<????4M??P?nJ??R%?T??F?i??M??o3k?S??4M?-????R???B??M???????4f&?l8?w??gs???k`???di???ky8_???? H??\nzx?t?
?9?i??^p????k??????8??H??/~zA?9?.W-rp??
?S?$??X????????*?D"?H$?D"?H$?????3??#?;?iv??4/??l?F2?2??]T??G'al??x?r????](g??;???&??
?F??Fr ?I???i:V????RA:?T?W^??!d?Ga???N/\=!?h\$????(?9~pe?=??I????x??]??T?V9u?q?8?!?i	|?
`????/??g,?Q9??????ZBm?8???y??n???<??6???8q?y???.??R??E?y?m???`1?~??????J.???*????Ay???Q??BmD?*4???@|
	???O?JZ?Zv??U?c	;bY??Cfw????&9Xz9/??Ul?O?
G??BD?1????
;U?|?|??xM~?-5????R97#?|?y
??
?_P[Z????D"?H$?D"??e"????&??4???=?<*??f??DJhmP?Q????[?????
L???????#?N????<lfr`??My??
|p??e?N??Bo?????W??EXK?? ?b"Y??t?????x?2?(??4d?%t???^?????I	?w
?????U?????]?????9"?U?e+
?{????n
???4??+?$?l#?Y?v{U?{?????b?
????yz?%???t??Z at m=t?t)\=??E??????\?
??,S?_?p?O?
??4M?/???&????l{?	?:l?qo??9?1Z?/?X?=?Uov????C???XGr?c???o?????b9??r5?	???a??C[??xu?????Z=}???{:??g???????r?z???????%?[???v????O?z????r?
???{???Z????@s???}?
????'I??9?c??y?t??D????2???Z?=?E???
?????7?????????wS?Y#"e?(?????????<u=e
+?Jy?f|	???c?P??L??G?s????-!?O?K$??:p??&???4M??c"L?Z?Hs???x??K???????L???????g%@?Ts?f??P?P???????%	zakr?????????5Y[???5?k?????<<??&?=?U?d6?0???????|y?	?e?N?Y??????(?_??t.?U?:?- 4?BG?r???^??s???*??a@?`	??????6.Q??W?{>?~A?x?????l
??C?z?U???RJ??p
?????U)aGQ^???
?$?????E?
Oo?6h????p???????|.~?j??u????
?=??AB?xr?c?QJ|???x?pv??Zhf?Q???????+\fV??Z!?)b?~?
?C??n?q"o?Qk9?dG:{??qI?z??1>??S??x?"XXc~F4?C?s??,????U?[?E?3???G?dQ+#?s??
??B:?ag???W?)?w?Z???0?????S
^??f???o???)??n?"?l???cOt?J}?y0????????>?????-?
???uJ%N+??<
i
???
?]=???=[h?V?7=o???????&???4?8,???????B??p?X???_?l?#???y.h?J??<??????
?????t^?xu?g??N?^?p???N?C ??,?6)?????????N?C
-????m?.??????

!YB??.?.
???????????f[?G??3??????:U????PO?T?u?f??????P]T
}n?+?u?Z??R??j?P???Z???v"??????g??M????.???v??~?<V?,??A?C?bJgv???Y|???]?S??Dm?t??~O?-u?????m???e?????%?!??QW????^?????7Y?{tl??j?|WQ^??????=+??????????'???y?;???j1??\r?	Dqv1?9????e?????	?t3??Y?W???R?u???????
??~??O(??wx?!??h?????h??????????.??(
??M???{?T???S?;??VZG?vb???57cc????C?`?21????\?2??n?psQU];]~?p?\(?~??=5???E????x?U?t??????)??.?h??X?WG??O#zY?N??Y
n2?g&?	K?:2 ?r?
?????@%m??\2?3????x?ZI?q???x/G???????
???|???_)??R??l<?!?0??~??
>?N?w*b???<??
?Qs?cFO??????a??0?5?>m9vTe??se?>=?$???Y??mi???????/?W#?E?<?b?'_???? _r??^7????{7??st?Z???u8?k?S?4hF??pR?d?g??[a?m?#???????{???a???0^t?0G????G??????????)?j?f??)?Z?h?}Z+?_9????|
?\?????g???OF?G2@?????v,=q??z?_?cr??L?
^?1=?#q?D9sv???]?[?????r???e?8U?fC??.3?1w
[????ew??6d}???}qE??
G????*[?L=?[??Vni??C???M?o	?l???y ??B6?p
-]]??.?.J?UJ????
=u???4GLU\?yf?t??)?gt??G?TS??w?B(?%????U?i;4T??S?S|??([w?????q????)k?jU?&H?Sl?.&???H,g???>_^????v?2?Q8?4???G?4?a3??%V???ya??q??*???Z?[??mu2????N???
?Me53????:??`???&\`???vuP?Akw??`[x??????xbJ??
i?/?-??e?T????~?#+vcU
WZ_P?k6d???YHB-???M?????'Q?\?????
kh???l?@I?[D?6??/??f??=?	?
"Z??}?U????i?f???$?J???HgW$9?-??W??-??1?1??W?4?????@?W
?v7?i~?V?s????|fMe??h???]?rT?S}4
7?/?c5???&t-?5?3?v=???`lk??UVm7fFUK?u!????#?/2%?r1?,??+?/$??`??8?R???l?w?5????????F?6T? ?z?>&T???G??TG?0?BE[?n?1?R3^9!?1???Q?a?[??S*&??`Pu????0y?o?2??????_?lNI?)?t}?0?7?-)q?????&??u|z???	?u[???-?~???
:o?????1?????,?????????????????f?$?_??'
w
15???????EpA??B6??N?7???2??7?f.:???????aa?????L???
??w????c1?h?g?X??qH\=?\G)j?9????????Px??d???\C9????z;~1?p$??;8??q?a5r???T?7??
vA?3?"x??v?WB???V	n??N~I\?}??q
??9?H?????|Z?OWyR8K&w:?Oh???e1?1B??Q???Qjy`\??-,gI?xjR?Z??W3l????c????Z??{!q?/?T????)?6??7u?-Rq?(o+?!?q????y?P?q4>3/??-RhI?6&??p?= 1??P9??m???|?k??h????EG?4???=Am???!+???+#Uly?????[??????m
1!?y??????~?o?<??n?Y?[?????m?h?5q???V>?T???B??b?3E??jAT?N???????????E?#cGhh??*?u'??	>?xU)?j???t?Dm?????
?z???a?&ui;?????
?N??%??????E
?m?\?Qnfu*???o??&????H?RCtC?)???????8?????(?,???)??F????-?!oI
cs??p??????<??A
?m?B??jfe??vi????"????+SOe??_?)Br????HM*?L???4??`??3??D????,?B??v??R"*?Mo?3\?7???.K?\?C??????!??DL???d?]S+?k{1?!???D???Go?"I???7???f?y?~+?S2?^~???4|??bc?4??-2?l2?:???hC??C|A??#Wj	Nk?????4??
?t????R?
?
?C	i?
?n?RSF?M????)}?s?d??Vb???e?????Tq?``wb????nCU??T2?=????????^	?c?????
?Wp,?yq??%bu?????^????????F hw?????G??D??????z???A??
?
??ju??_??L??Oq????l??$Me??&?~???
.?oAl\W???/c??I?d?s?E?	??<??z.8Z
?V"?????i?p:???E??v?fy??p?V?????i??????@??
M??"n+??d??d??C?	???OB??ZT?@????R9?^???o?X	??
????Z?w??B???>??M???.?? ???????????p?????)

?.?@?-D??????L???<?A?S?iw???+B??	t?????6o??fx??????z?Mc!??(	{??n?k???.???l0??
-????2[???/b+?/K?l??J??]Q?{???\??
???????zE9t??M5zQ g??v????O?2u\?N?Y?B
?|p??Xj?2???r??|b?P??=?\??m?b????-"Y?x??>?-?#<'?
????????????r1??_cO??RS@*C???o'y??PE$?r??<??????DLK ?:?f??????????,?$???W?@M??cr?K??Pk???e?????Q???UV???.nX}
L#???%I???????9??[?C?O=?l?p{`?.y????T?H(??bm;?
K+?N??>M????)v???1??R??c?5???-q?y??????\R07y??i#??Z??@??????l?????	??????'g?F???.$?7?R??#???????i??)??u???C?w???/?R??2<E??D9?a?@Q?d????U?2#??c???^;K2?>? 4?>?????D?^????'N]?oB?V??I?p_?M????	?
???=?]??p???]???]
!?@??\?{i?????F???'^$N??l??h4?????????T<bM<sq,N??8???8'??3??-??W???kK<??/m??x&?U??}?niI;??9???l?[??S{we?s?n??????-??,u?Z1?wv,?9?????w?????)n??????-n?{??-,m???;%??mu"?Z???^?????mU??$6??k??Sk????v?~?.????{T?O???W=N?qR????[f??\Ol?#;?K=??E????0r???_?ZKh?8??J?p_?*?????W??
?1???LR7W53?????e??9??4"????-W??yS?C,??<??u?
??????P;0S??S?????)?????kD?gD=??????	]F?? Ew45????
??G?"1	?~??
5???a???
??????}r?:#dA?????Y?U?OAI%??3??i??z???j:??9??i????????y????/???? ??_??
c??(?7????Y???q?(c?!?ko?!tI?o?x?hmA?I?*~????yD?L?n?0?v~G?>?????
3@??]i(??
	t??A;?39????@#(A1????????p?>?;?@??1&????ah6??l??4C|???V??`??????????O???>{??gA?%??=a3t,}?=u??:?>?h?nV????
'????[5Q6??P???>b?Z?????Fu?e?
??v>
eC]??m????$?8[?L?^?M?vE???0?f?){R?+sq?n?_????(%??t??????0???????1gm???F]?2?lI?P??K:??96V?bNv}z1H??????	]u<0???=?O7m?????v?"?PK


IHDR
?h??8??i???????ehd?q1&?<????T?'???q??u]?v$??????2?g?|\9???>??.>-uOY?4???P?6???????r?Y??????K^?/@?\??T?Umj?HJj-cI??}????ux_?=????w)?????R
`E?uX?R??i??:????X?????
?uj8?0K????.V,^E3.??(T?
b?PJ)`???<?v?r?(?g",
?
v?N????G
f*?~??<4F???8z??y?h?=e#??|d?????Qn????8??/???????r4???4M?4M?4?gs;?????p??rZ?x??????:=?????y?gz'P;C?????
?|c??$??Ot????B?HiQ???y??;X?b??e?5,3???4%??N?e?o?+??GR?H]???NW????<??yV????&??n??????T>?J>MNh?Zfb??q??E[["????8?????pe#?Q?WX44?L}?<??}W??R9??:k?R????\3??jL????|[?X=?D?'??Z]2?G?9??3?????
?
K??8??x/??ish?
`???r;?L>.?I
t?cu??O?HG??????b "2F???~x?????<??h??dy?	?????G? Pb?
?Xvfr*???[???Y].[v??
M?gj??i??i??i?????j?o???R??????	???z!??6u?b?z4[q??????`7?v?	?v??Y???(?I? ???1???R??z?6f????CyL?????<????-?s????	FU??
7*?Wy??=??????K?x?q?$?p?W?
??XGZF?s*V????+HuPrI?
??i??[???
?y???,3x?p9??D?K??*W?2V?p?\?K5
?????k??V%???'?^UL`Yv?????;?X??@?V?u?^j`pT??>x=?\?p?LvN?B4
,?I????G??'`?;?$Up1????E?I???>X&?[???g?
????*?-???6?2:p?????*}???????????91/??'?QL??bUl?-?.6?gqZ???=??g??;?????
E?w?????o(n@?%:???E<?{???????N?+??Q??	SD]'?te?(c??s??/????[bV\?+}:?L???2??m???;?r?;??%?????hz??????L?2?[????_?Z?q?>~?{?_?????B?^???%gZ|!????AL at Y????)?-3B?????a|
?CCK????U7?Gn]?y??!SE???,?:?Tu?n?D?{?y?+?lYG??,?z?]/5?zWZ5??wh??TW??O???~~?Zf????P?/?Zf?x?Gr/[j???????,?ZVq?????x??8m???????vZ#?k???+qe^??;??r?t??????b	?P?U7r
^1r???
\si???e at N?k???'
r?kqBF???S@?:???iZ??U
????U?*?	??U?OFoY?8.???
n?(?*Hk??"?
??9? ??F(?????,k???"?}?1b???J????"?????????U<????9?;n??k?<???d??:??X|??
\Ox
??
u?
!B??n?s?#N)?{??????[?K???TK=?,.*???[??e?C2?t^[\qB?,-r??,?b???E?F???X???n?e????y?W?	1?W6V????????[??q??????ce?c?i|g?Xixl?A_g?U?>??W?]??6?????
??$e?5]?}??Oh???z????:C}???????2? o?L2?? ?-????]?A?? ?\??w#oZv?'??e?m
M
MzU?



IHDR
??O?Z[???[???i??h?`u?&Xl
??`-?F&?U?F?H_xu??krk????<e??'?M???)???E=e?
???
??????S+????????R~M??4q?:???4+?J?]?[????5^?x=?q6|
???????]A?L?s]?KIEQ?a?ks?X/c}???p????/??f?\?uI0?mV2??l????[?????????
???j??d?y?_??J??????c?}???Q%?R~1IT
?lWU??=?~?gU}??`-`?o????
`$?
S?d0
??? A????GY?b&t`J?w6?M36?ZE?mB?0}?G?W?U?Z????)^??k??J5}???R??H??}??????PX
+?P??*y4?Z???4?????c<??'??:&u?WN
Qv9D???d???u????eX?.?l??D
???ot?5fg?????q?
v
??]?0L?A??? ?$?Gh??8b??W??@{?t[T`?0?CNkz?
??WMo??A?dPe?r6?]6????V?-?.H?N???Bm?????}nZU?	%U??M?$P????#??<?*y?&?f???T?0?cR_I?a?u???x??????G?B_?-M?)? ?d#?l??Y?v??=?????u?
O?;??o?v??>??9????????Lz#2i?W???=??????@?BV?U
????|?u??L0,????7<?l????JC*??d?r?P]2TgK?J$????>??????8??+7?
?j??I?2??1??kSW?m??????rMc?DB(I??*??M?	2-?W}Sm*u+dlZ?F" <?????\????a?O?q???????????{?!?7?}??#s?a\{7
?@?h?????Y???bvT?dw?\!?
?_
??q????O%O?KXN????
??9?*W?,??T???i??,S??`U?P~?????*YE???_%????L??????T?+?@??????q?~?+?a??)?u3z?r??????K???(???8&???A?!;??N
uFDm
??rb?P?!???h?m??????????;b??5~?O????????? 	?|2p?????n??IB?\??,n??*3;P????U?A`
?????9?@???c??`D
?
7??
A1???u????/????/JE?o??6??????{?????o??
)/????1H ????
3??9?$? .
?~+??-K???aiL%??qE?c?X?U?I`?RNUbw,K?
?B??q??rS~?1tL?(u?1??d????
??;N]t?]u?????=? 	@K?7?1???^??k?????kxV?P6
?ReUi5???
w?
???l??????G??E?	?O???r"??T>Oe
?in??+m
??>?G????h4L???????N??\_"?iKD?5"??????1H@?j??????d ??K?X???[Fxc?Kr?T?tm?0<??q?????811???1	Bh
?[~?{I$?]??a?lS?A?)t?v??U?e[_??A?X?=F;????
M??l?rU??Oo???>f~???2?e?3???,?K?3?Yw?Q????|??]s{???o?K?c??Y??? E?1X?2???Z??????X?2+??1?^9?G??<???1?Fa????8t??%
p?W??a?????~I????-?{b?2??%???2
?&;??"????*??
?$?o??3??1???~??????????N??qb?c?}?O???g??#<?"??$
_rp?4???H,k.?O[?l?m??)i??A(?w[?I@??z??v?.=????\????????t{??5????)???h????K8??'?}?q???!|o??c???=rU??r0?7r? C?{q?~q?oI&?????\?Iu?E?????/-?%?@~??W?H?:?????wC
Y??*?0m^h?._\
HH???KTg~?_v??Y_7?x>?'gU???u5q'r??v?????? Nr8H`,/4!?O???I?????B???y????q?O?u??^?4?V?P3??|?:???S???q?X
(?????]???D?>'???$
????????P?;?4??.??uh??K?.???D??=???
???YN|
???Y????Oh??8???W";W??j??1C?%??pl??t?)?q??????S??,?~U?F??2y?S?9M??*t??B?.U? ?????aw?'e?
	??4?? ???nbv?];C?WGV?]?????u???????????????????5??K?N??(?????M-?t?%!	J?J??l?(7+?J????????l?????>???+?Kd?!????XK?I???Y??`\??(?!??|B???{?
$?????2s]???*m}???b?O???G?PO?IAX???B
 ?M'?????q?*??[?:????<`i???F}??J5/3??y@TI?kB?r2`??1?????7?X?=??G??M>???Dr?Q?o45????Q??????|z5??w??B??q??g?? 
?k???*Z"?????W]"P????m??????wV?,??%IQ?M??$??C?2?eKKm?!+'??
?z&??!
=?k?
G?i?Ku???????????V

???+?????o?
Ns\?<=?g?sk?C???bJ#IV??n??LommL???%?{???5?)??up4p%????I??w0|?s?D
X??a??!
?9??["???H????^????~?^?8???$???????A???8??&`.?_?c??)?/?x\?FZRD????l4=? ??U?w???Nw??X??t???.qi?Y?I(?J??}g?:p??hK??Ywza?%?
M)???????????
x????n?)?xM??}?r???M??p???^?+???????k5?X?_3k??]????[????? ?D.	?rYP? >g?tq??y
??J???;???x
????{?c@<?3??3a~P$~??~
????q??Rg????XW?.??????r3???~???????[????h??3+??1fI????E?8r%q+)????)?????r9??6???n????T	??af?+|???|?	?E ?s?K?j??T???t.???????X!?#?r??P??z
?V??	?X_"???Lbi,mK?{
X!
???mD????B"M?R?a??????8?Nn???+?G??j???c<"t?c;L?Y?vh??scU???????_D?l?	?????d|",?l>C??
?	?/
??? @=?5??`}??i?6?k?????o??.????+?????jm?C???u??-$????4Wk??I?Q&??P4??]???G?8?
?????;)?????:?a?????>?J|e?%??fz?uq??5|?,?@b?y4????&l&?I9?=0?G;|3?0??6&??0?WD\????Zk8Q3?D#	YF*?:?Xv??????f???}U??|??:?NyZ{R
|?
????j??K?=^???S?Q?????O?!??
*???g????[j??(?6??\f
?Sx?D????????J	w???2O?????K<1q??3??`$??
???~a??
????A?A
y?.?HcP??+?3?e?3??????Qg?Op/+??{p=?7?
?]xg4????!N????Us???hp????W????z?_??j?m
?2o?)???m7??,??y????i??t???Wv??r??5???????q???????B??L$???3?`??HD
??????o??R???>G?C?!O?8?2u|?`&?!???#}?7?`{????mh$a?%caX??4?
??????Do??Ou??I??~&?;??s??????`?{????*?O?}i??>??????S???*?$Ps(??S?
:?k*???R?PH?jk?l&?y0NL,?U?P??M?O??????P?}????$???$?K(R???3??-O?P??p??j??oA?5p?V?Y
??q~??OZ???z???
???
??L?s?1?1ad???Oo
e??L
SA???1v?o:?[?y?M?M)? ?R?AUk??P??g?RS???J

?e
B9;FU??x??H#?SY8~A??	H
;???{??n??H?O????W?m??28n????DH?WU	@W??qo{(??Q?n?u????x?G?Q???#N???0???fE?????k<z?H7?A?M97?'?R?????#?o???XH?i?%????<KSQ?m?R?6(???L6?tcs??"????J??`???v?3??y-c00?k?D
 ??????qf?y??F???????-?u?%t???]??v??3m?E?a]g??w?h}??"?R?]??q3<?????RG???0??i?Az???}C?????F?y0q?3?&??B(iR!N???d?????????<???????O??	?:?m~	?? ???!?aue????yXsG^??????U??d|(?L???N?3x?J???70?@???????
?]?$???w?g??????$???{???:?P?4?l??,?????
?????AN'l*??t?g?;?????n??~???>??n??t???????(K?B????}4X????I'?8?9#k?
?L?P?16??:{?B?????]??	??$?????|?????:;??6?&n??p&?q????t???
i??GH?U??i^??e???y???p??
vFt?k?1p??:?3?3@?#????&?|
?pu
?????????	e????"g????@??????8?0?=??U????B?_@?4???_j???????	{?t<???+???>W#?????????D?N?,??!??????KH7????????Lz?lK???p}???%Z?_d?r?_??t???3
?u??:n@?/R??3l??v ??y??@???6`?????O?s?? ??????K9zx?????x?_w? V7???P?$?????O??"???????81?x?J?????#I??C?--+5~'??qP?,????E??k?????&~
???w???4?0?6|???P??~ ???????#?;
v?a??e?{6z
Am?p?@`0
pm??tVR???yv??lA???f??
??JJ?3??1??Hsa71W???xv??1py??U]_m?Z?
?K?2@?e8?z?F	C??
Y?I???w
??J?c??G?!?m?<R?$@????_>????c??,??}?5??????.

?
?6???g?=t???I??e?????x?g???????{??????~?6*?m??4?f???xI??r=??I?+?'yM????a??'B?=y???~/?{{????1?{?u???3?.*???r?+?q?}???m?????=9????%&	???\?????????????Q??<A??h?b??0e????D9/??#)Cr~???,??=?????L?&R?X??p?t?.??E?si/?(I?e4?@?^/??Z?#x??wo?e????d'H??9???3?In??
?@?L
?????/???a????2? ???g(?~???
??
#??\?&???P@??????^L??k?z$??)c2em??s_`_??????\??t???-???????s??O[(o4e?$?Y???16??tj at 9?)g?@=??$
w5iU?oR?/??|{??O9(+?G\??w?i?.??|mK??+A????lL???
?
|??
?cP??U?z??:???}??????????]	;?x???|??Q?D?e????C9?F?n'???????Jz???????!?	??l?6{???GA?????3}=??zo???zO?K?{{?b?:^/???]?g??P?4????K
???Fz!?????P?
v???.O~?=
9S?Sg
I <??i)?B??Sc?????]r?????I?v??[??????C?'?????8???? g9???N
TB???g??W????]G$?????|?????E???L??????F???g????h?K$=??\veO?5???8??L:???1!i?a????\/&|*?n?}'??2?E?w??B???x??w?????M??>c? 	?I???
ulL??3??\??,??F??=?k
w???O?"????(??^|XP?k??????{???6???F?s? ???G=?"?gH???e{????q???V7#Fv?<?2?????????6?OG??K???F???n????D??????t[QV_????1;n???\XW`4P?F?m???g?zP?bu?9????????x????????u?????????
z?z??\OL|G`[??(??HO??]){????m??C{????	;??G??H????????"?w??????????????????????n`s???2??2??<??u????????????A?G?:hPw????&m7?teP??[?,??GG???w>??}'H???^O???`2yf?????	?g??????/??4F%w?U??<?`m?????c$'???O?aw&L??HZ??????%??D???
#?uoA?????H???k?]9???!?E??`"y?S??Fo?=???O???L????????}?y*?\?_\N
???I??e?D0?4??e?
3???n??????06????H7}\?y?Q&?
:0???????e???wAY:?<?1??Pt??+$????"?Byt?hT`PaUDc??tm?r??]????>??4??*?q??G??<KN?(???D]*v'????;??a[?.?{?????*:y??>I?eI|*_????g???M??o?????[???i?7"?d?qz???jD????d34@?0`?%?

?e7?7?`?c?yyv??<c??
????A?j?oz????N??)m]??I
xK?JJM???D?[JT?t#M???'p?BK??G".???Do??KhL??^?QHi??%a?F??h??F?a?1?????a???J??e6??h??@x_gc??s?!?????3???!F6?8????????Xu???%?-%s??I?]Ke9?$/??vP?
g???%?Fh?A??1?? H`0J4?4?B9*????'?CC???J??0???4yFvVN L?.??(?3ew???F??P?Ul=?#a?
??? ?A?<?^.?y?2?D?
?K??le?????^??^??Df8$??G?
??d?U??.?0aXwIZB.H?|}???P??????LtzTz?.??vF?e?H??z??+m?D9?(c???~K
????@?<?vG??
?z?D
??@???A???z(??J????5????E??hH???Ah<^??^????l??????!?$??e?????ux?0L???=?rnP?\??y????D??2????g~??????????%?#3
?O?F?e?ay|??c?XH2?}4z?y?R?????KH???S_??L?????
?,%???
??a??4?^??E??L??I?&p}|?_??R????
$?????1^C???O.?????7??B&?zRy???	9??x???x>?~????????M?g????YP????[??4[??_n?2n"u???????G,!?D?j??H?N??????????L*?s]?????$o????y??w?{??,?
??Phg???+?
H????E\?-4?LV?WQ??h$O?<Vc?^i?By?????x??]??m}"??{6"?7???YR?5??4S?L?g? ??????zZ??S?-??z#qG?6??F?#??!?yT6z?~???E?????qg?s'm??l	|?FyXGA7D?????!??a???Cf?i?????=Z??X?>?c?????q????2f)?????#??rv????????*?????r?????S??,<????M?O^@K????W?
??1W????p??Y1??5a?B??P???? ??????x?6h?
??l?1??M??$??W????=?F??oY???i?1????Q??v8^???0????JD$?$O?n??#9?!???,?X]F?JJ??kn???$???(??|??<????RL(?????^?W??0Z?`
F??Pg???&d???,???`??L\??]sz??
??u??4?9+dr?	?<?Ve???RI.g>e???R?i???P?0~?Ux1?[w??%?C??\??F??$???????s?S?3o2????L??xa?K??,?4?q????9_?????0?|J?/?s[JHm.?*
???#?@????????N?)?s?????{?~TA??-?/?r?e?`?_@+???&`?t?<#O{
???g????l??}?l?JA|x
?j|!???
???\^?65?k&?<???%??j?L??L<?q?|??,	xzQ?
?eZ&?FO,?K??%?K???
?.???'?
??)??
?????e??Jg?~(??nJ?Rvm?
???|??.?????nw?g???:?)?1.<??7?0O????lA?YlcZ?g????1?+??H2?X?;??O?6?u?{
?u????7??|?A??Bf?Ji5 ?'?????n=?????b??At?????k|#???#@??%i?R?N?{?&?Je?i?_??Exr?C
???????????}?u?XV:??gf??????Y9?=????r?{?
??(?X??N?H?8?&.??r<??O???I?a???????q??"??]???eQ?)?)}?Kc???F?A&?~O6J?)aG8????e??m??h?????@???v?ed?D{R??n??\??1W????|?@??n?W??:D?
	?w
J/???8T????k?x0????b?????vq
?xiV?r?,+?;3?D??7??)<?{? ??t n/??$? ???$ !X^??tq?l{W??q-?:b?2?)AHq????Me????5?*	&?&??????#??k?ZmC]?K???_?}a???NF??G???9T?G??2?	C?Qg<?vY??^_?W???(?
.?-f?r?b^??q
w???P???-?rc??/?
??C??A???oJ
M?)DYT?????0?r0????6>?>f?xS?:?+`?Q?hO?.?l?e???H???\we?B?????J?*I???eU?(?V?k????-+?0??q???????F9?~????yy?94E?M???q(?F?^????j???.u?v???
[C?
1A?@?????????r?"?W^?????v?m?+??EXk?Y?[??*??=?$?????:?4-??\|k?_?P9?4??j???CG??W2?l?I?W?F???'P%????&*CI?!6??u?]\9xA>?]?-??L_??5????w??l
??????XW!????]-??????.Q+?V??\[????Nu??8?5???+??
?K???Mh


IHDR
~IDATx^?]itTE???????@?CP`T?7??;d#	Y???t6B??A?Q?dQ? ????(?:*???p??dO???U?????I?AO??x???/?S???????nU?{?Iw??=???cpv?;9?5??Nsr??w??Y?v?
?????+?t????v??T??t4?v?j?t?jg?&B?/|????\?C-?)???????4???w2?????
 '#
Q??X?i ?????.??
??Z?]h?yBr??y'@L?:???\v????$?????$???$
Q??????
?:
ha?-?s???(t0?o??9'b??SK?;5
??????
?%F@, ?%???????hq?
??????8d?U???)??????????$H??
??????-?tN?
;
3?u/???D[??!t!tqM6?.?H@?L??)?@??????\?M?jiHs??&L'?r	W?????6?D(???J???><??X`?B?Rf?ORR=c???aJ????Wl??~)J???6?
?????????eQ????E?1???????????B?B??7?
l?G[???mS????????_?R;?]???????_?w???o;?m?????6v??L?1????a>n?2?#?-??? ??e??_M??_??Q???B??/??w?b????'??l????????
?V?X????T??&?r6PG??`???&??????$?W?0??=?o?K?/?*??
??	}F=???Z?+????f?ok????O?oRL^????A?{??VWL\??????^??????1???:??v??D??|?O"?????P?M?+??
??
 ?[9??h.????0??L????$F? ???pe,??34K?`???i??U?Z?@?=?n?x?I????'????	??????????????1??}??????3???vy???+?6?|1??v????G?????|[@?@?@??
??+,'1|/?G\??K??i??????x??&#??
i??6??^??g/i??4eS??l8?????J??}?EMy?{?Nc??

???m???]????7?=?4>??A??x???/??ZG??????C8?N?*??
??
?@%r???G??0z???@?p??y?H^???/Z?%X?c?
?????
z??B?z??8?G?#?????
! g7??????;?l;
y6?h?{W???>???_?|ggL?;???W???7&=??&??~?*?D;~?Z?????L|?9?p???1A?????????????
@?OG@?????&??D???V?!?
1*?
8??=A=?0"p?q?r?e???E???0Z??k]?lUg?F??^?lF^?????
l?P?#a??"??6?OfOb 
Q?"??g???>;?	Q?+I[DgC$`?#????@cH?J?2C)????!w?? ??!??1p?????r?W????c
t?m?P?k? ?LY?6g????<?,0?y
H?l???8?
?4SZ,?R?4????CDAO^??z
???]??
?"?PI$??U???V?A?@??b???
9*?8?q?^??5U<i?X$?r?
t?
?&a?@?u
??E?x:G??eV????p??????y???@I??H4??y]@Q{N??6?;?? ?p( 
?d?????PL
?e?7?+???t??^?K-
>??<?f?????h?????????????gEk???"p4TN??K??Hci?uT???M.??????
hQ?3-????p?H???l~?l?p6 at 8???
B??
?Z??
?6r???{
0q??EJ?Y??IJ+???
&?R??B??+?-?>
????T+??E?|Y??=??r~6?)C?L??}????u?'??!??????P?-?r??C????
z?9?EF-{?t?b?
????	??7(??	????sp?3c#?GV#??br?V?????N????/???A0??'A?????}??eSa???N?f:9???????'????.uV?18?<?y?>???-??4???M????k????C?1k??U???2??Y?????????D??.pAY-??6??ny?~V$?[??)$?<??%?4?????F#G???????\RH$?W)?+????oy?2?3?U?QZ????-??X=??`e.??`WTYHmh??#?i??~????p;?Kp?YP+??Y??5//?LW'>$????????&b?A??;?w?
?g?sb?????Rdw?uR?8D??????=x??^??\?\^:9??8?h?x??8t??I???I?????"_l?V???L????mT?????.'P?Y?sbd?s3?????b?^-??:K6?Xu?MpD?B????????W???!??w???c?t(??^???????????V?E?B>???%???????+v?~t??? F?FY??/CkZ?C?H?????G?0?5
 ???C????y?;??7q??X?|e??"???
9??????lY??5}Am???q?5Kqg6???U3y?U??
??e?????LQ?Vw??y?~?Yn???
??T?????(??d<d??a??????)6L??/?????I?#^?2?S??Y???g?e9???'?[y??$y?"??QH??=
???<???|A??3?2?6(?I?6????Z?rA?i?;~??????4lD??? ?n6{?j???"E?u????y*?<dE??[M??????."?b??.y??.]??^w???2v??_Cn?
4MJ?g?[??C?s?PS?/?9?????[?2??Q?f?6w??,???\?G3??n??q)R?I-Z?]?M??

??C?????????<eG?????Qn??C?????5?c???S?'0???S?M}?:&d?>????????????L?Z???J??a???3?;?l?z
?|R./?W&E?:??\]?"??;?d?i
????'?
v?if??
??G?L?W?9?
?;OX?	?*?:???Z?cJ?rQ?B?CK??5?F=?<R??5????(??e?H????????w?0|?	+?W&
?<??6=~Sb?K	?)C??CH/???q?+C??U????XD-V?#??DZ;;??>)?c,X3eP?oc????G?u?}??v{V?X4??????N?
????????g?$??n?W?.?c%????#	??U??????F_??7?UB at A?
6??M?????J?{????
<?$D?G!U?z????-?,bu?3Om?w???C?[???'??c?/???8??Tov????????4S$???:?????:??J|?B?\??MM?3??s????Y????=??]\?^?X?Mi>??????E?Y??v??HW????2????h:lk??#'|??t?*??(?
D????%d???=0
P?epm???,?+?j????GV?j?J???mp?(?D?n?Q?
=J0Ty????u?N?C?*?g?#?e?K;?6??d???n???V??|$??"+EJY?O?`t=Eg*?:>??r.e?3???YM??K??;c???&?.?vF
???P???a??\(Xo???ox?ObN???9???u?R???bd????C???<U??6h??????$??N?2kRj?????????m?m????JU?U'8{{
?k?????\O???J?B???????S???F?#??????<?mS}?l_2??"????\???e:+1y?d?/f.???;??{x?
?x?I?'?b?????kCQTM{??g??J??	?
????7^F?YcV5????H??6!?fw|r?????&r6?d?9??y??w?Q??????sF???8b????	??7?|?? ??!??C?
?k???|<?2:??F????U5n
?W??$??yWt???7???nb&as9?:?Z? ?? ??i(?q????1?}???e???W????=?G?M?????X?D?JL*r*?A??{:?????c???U??7?????+&
?
$#?????O "_?lq??Ln??Sj?
???v??? w?7w????,n
?-?y?f??<???.&&??k???C??J2??????{??[8??<??????o<???n???;?M??[AI,X???
n???? q?????A???8?W?x\??bu1?2)Uz?u'6???R????u???p??L?^?8??e
???w`&
????D??h?????C??b??????
?c??	)7??}????\???9???
K%????2??-,5\G{????]\?Cr(%~Q?7[?h?R?{&?m?~Q??C?"cO??*	XBD?V???q<??d????RT???!W:??p?;??U???? q???
;c4?K?&???X?n?`??.??'?t?T??d/?7Y?[?g,?2#"?E~
???ZR?XN=-?F+T?7?_??fe.???!2?????!?y'r?????+???Q?/??T>a'Ua??[?{s?18???1??iS?>u??Q\?8?{??????:?5?zy]??gV8fr???ZmQ????9???m>????????5]???r??&1&9b???*???1h??DD????,Aj?~?%??????	<?wh3OZ&}?
 ???Q?????????W?{???3?xku?&d?@4???V????O???\??ml????S?V5B????z_???~qm???Z&3o[????q??]??????I?k?J?W???N?:6m??
??//????W??\?mPo??=?;????[??l??c-?E4$?????4?yU
?M??+3?????$lB???PI???x$?
\??t-?? ???_,???L6??^?a?D????>?61??]????"?T??J?V?Zd????X
,?tN$?d"?f?x???kej?S0??????????a?.F??j??V???????]?z?q?m?.???5)??(6b]??l@????i??W?f?????GL;
"???A?f?????5?im??[??jfI??2?eMN?U1???'$,l
%????c^?$=?$?s?????Un??.?r??wI???)ls???l???3?
y~??1??:`)???g????S<3???ps#z3???iH??k???!"S????X?y????)??+ZlbJ6?<Z?-_?C? ?2A?xb???
?<5???T;Y??S?s?^??.??9a?I?|?f{????2v?&?Y?O?i:?u??????qV?vx?????

?'?3?{?fW???u?M????q?	??&??^?q??MK&=(Z????27a\??\fjJE????????
???24?@]7 at +?????6?i?}?K?l"m ?.???C?Muq\2???p??F??????8????|??rK6??+????:???_?5???]n?)??<?V?"#???S??Ee??????<
HL??X?TFH???|???!?`??+????8/a??V6M??c??.?_o?L?4?tV?????*??O?;@?!??????|??I??u?5Z]?%mJ??]?ac?L???U
Y_?x0W????>P????]??4&4G?*???>>?G?????%???????nH?%X???b?e_??X(?{umcn%???bmhBCF$kr?s
d???!O??$?? ???HDw?h??p??L?mF?d8?mDP at O?B.?K??$??s6j?G?^r???}??\*a??`2\???? ??*},'I/??l??j?m???M`??W??N???u
?B?!Qv??ay??d??u??????W??
??t~??-????Y??#??I??W???H?g.9??7?0?7??D???>????8???????3????l\'#?]?.4?$~???/?o?T????>?~?b?:{U?B%rX~?=G8???O&?]Z?gpy?????????{???`?sv?C4???A)s?g
V?????U??sj?r?S?a?;?P?c?12n??\?3O?
?Y????????OX?????hP	?-??xaS????i6_Wr-2?????X???1*??58Su???@>??.C.c/??Hq2?-??????B??Kf??*??U?}??)???????????????z????K??Y
UV?????%????????SO8?F??/w?Q(???F}??9AT??y? ??G?2??????"?P?N?????X_??zl?x99???#G??q?"?R??N
t?????.5>TuE`?W?7???t0??>S???k???(
?u?z]`?.??o????t???3??????5Z	????|?'?F8u&??N?c?B?|?&=6??
?y???#J?{qo??e/<n?S-???q?r??*??7??v?V(?R??]Y?J???6iG???v???????*?	(?????Q]????
~?s?	?@?>"???T?u?#NaG/F??8???i$??U$n?1wa?6aoH-????]P,?m????bTn?n?m	?Bm?<??
7W??K??R??|n?????&?B?????????"j:F????T???Z??N=???#?{????
qF?aT?6
??
a%?j?????PD???4?a]Z?A]:	???2f?{)Q?x??
????z?????Zu?:?~z<?V
g?'?K ??[F)????o:$.	??j?+???=T)??)????Ji#^????I??A.7?8??V
????ca at Na?????????)|?
'F?.~?V?c?']??K??????m???/????W????5?????-u?
??W?a????6;??GI??????????uxL?????!?F????
?????j?????????>?y?%?s?d??2~??5??l9??CH?f?9.?@?A??lj??o3/?????8???`MpP?????g}vU?????3?Z?u???Arn??(?e?rg??h?????t???:??Un2
wr~G??YU????????o?X?a?6??e?(i?j~??v$??YTH?k??:c$+??1K??~???~*?$?356???~-?|?'?Dx[L
l??gh?@?j???_kI?3???3?F3??????k?#a?\?M?U?????I??`?#?)d????N???)^KEo/???)??a???Tv
K4???"9$Ap1?
~?f????M}1:f|?
[...20587 lines suppressed...]
?E0?da?|ghQ???I????,??	w?!?>J)?"?`I???e4?I+??U*??4?????t?????H?'Z@m?
b???z??1?&n??????z??i}xm?#?;8??&??l???F??	?????y^hy?|Q??&??Tr2s?H?<????????
????-Spu8c?{??C^??i????4?BdR!?r??3?:W????K????:cROucwM??,?n<??'??
,?9?'??S??uosomeR?d?0?I?8??H??s?z?\?????B??!$(?y??Fp
????5XjpE,?,??$??$?dn?O?n#?A\)C??~??{???Us?cI???%?R?w-????s?w???z?*???`?M
*#y??}t?eI??\\????????
$??OL???ZkZtQ?6???R?YB?????)?{???x??q????Izh{XuU.Z??M?Sn?J???y|??q??'9$8??S?????r?!p?	c+
?e<L????????cS?RW??????o???3?`.???N0pOL?s?t??ZD
???%?yIn???&????s?9-??Y?f?0"??v@?A????]?Qah?
??1??>y?????9?H
?s;4??ft???????I9???k?i?rn;???????1??j???Mq+2?:?????????
?_?=iWX?x???{?+&W?
??W??j??????I???%$*?????????a??%@???,
? #???b???	?d??_?Y~l??????V-t????G#4b5'??v~U???
??\5?U??RO??=Q?F
i??ibf1????!pT
?A=??<zu??>?v?n??
???d??fG?^????Itm? q??h???????v?1??;g?a????:?\?S?K??a?0?\?]??L]?O???1a?0???T1?r
???bq[???Dv??#????EU r:??N????o?v"t???%S??Lq??8o????'??</?????q?"i??v??p2??$?y?NH?l6
?4????[??Zx??2???
?#???$???8??^+??? ?g?I<{????c?H????l?r{?T????sz?j:?c????#?n????h?_??x?;?44?~???dl??'9;H???????Y*XxrC????&??95?S?4[ox??????l?8?^???<}???????????sO?-?f??j:???h!??i
?/???#?{?????1jR?Y?[?
???GV3?`+?????h/???7?[???FCr:??c?5??p?n?T??u?x)?+SNM??.???c,PZB???????-??eUO?X3d???k??5??%i?n$$?+?k?p at R>U?H?=Nk?????"Ybi ??
.mbg?????Xr
???9:?????U>??|???j???V?	?wL?|???
???%?)?g??E??go???g??!aw<3? 2???????????C??~????Ft_
C?????L?7v????n#'???????+(F?e$????c?n)?R?)8?z???'?;?.?-???gtP	%?3?3?s???R8?I"2?(??????u?H#??????Vk?c?????X?p????,|?????\F??G$??	;?
??@=>?~M}
e??????aan???:(?Dh^vUS??K	??9<???Y"??$!?a????p1?
?Erp?#
????i????=99ls?G~??dR???d";???=0U??? ??<?gu$???????#W?Y2?#b????8
?? ??p???T??????4??B?M????[W?? ??9\???<p?Zhz?&???v??MH???m?^????;?]k???n7X'?bc?R?
????8>?8?v??c??6:?)???pq?X??`?zpk??????????;?
????S???^y?y???Oj?9?)7tz??,?p?WwL?$6=p??
?????.X??t?O???:w???(?????.Tn?bNrA'??{s????&{41B-?w?o?9 u#??\?z??F?&?"?K8??? ?Z??
@??K????g=?|???+????????R???VP???????	\?nu;?F???%?????c?I'9*?????4?
f)?	??r?????[?b?Q????3??????g{h???E?A:,??Xl`3??z????Q??_{??i{?-??H?:l?4????J??
1?)???<????M???[S???BAl?9?>g'?-??q?????X??q??%?+?h?w????????z???xb????s?|?<?G??$????x???_
??~?xS????y???+?6]???Zw???t?!Qt?y??j?ll
?????
?k&?\?gK6?v??y?q?]??.?dk??????1?/? T?{.?8??|?|?5]/??????9I?>?=???????7D?x??w??yQ???6GL??9?????f???
!J??? ?{???K_[4???\??j?s??G?O?.???=*???.5;?m????x?3r???HF
?x??????T??I(?y????{40iMs]?;S?N?F?2??$?X????B@??A????U?tU?cR]?
,wK!?*?P??\?$?}?8?
|f;4???9s3????9sS??]???S??|??T??dax?x???$???3#nR??.;C>FG????????GH?*?2????dmlA???????Y6?
??<??y??X????m?oN?N?old?3C?F?2B
??k,??p??Q?<u???X??w?~i??~Uw?+E??????y???_???????
u;??3K$?a?????m??r???W??>)??Q?N???>yd[[O?4Rp????F}k?py2?M???S??+??T?T??E?/?????
???d??L??'?+t????	?B?l????[??%?U?#'<`p;??n:??UK??)b%}????^?]<.	m?j:Y.????
s???LO&???c?1DQ
???????uby?
?????,2\(?
?|??>??AI{?^r?.??gRV?W??;??? ????,4x?ie???-(A??'???'?:?????1???SxgQ?????)Ad? K??''??x^??x??w?Kq???6????I,?z`?>^?<?s?xw??M`^??[h???????$6?A???u?
h????]>F??(?R?0??>?<os?^??q"?l_??#t_?=?{M???dC???pw????p???r0A???z??????????e???p?$?;{c
e&??+?M???????b??>??e$?8??? w??T?????l"????I?yH?n?`??]??\??O?H??[??)????????0O????^R???e2*?e???R?u?T??J?3$???U??????5'M??n|???"$?E??{"??I??)Is?*8'?#9
1?R]m?????*J0?n???!?;?o??@?T,? ??`?>?????????ir@
?{d0??z???|???}?R??$??Y?$(Rp??8?=+??G?7R?X??C?y
?v?5%?#??<?u?????????C#???%?$??G=N0y????????1?K?&pFp9?p;
?????_G??Y?.?RM?\c.??q???:c?9????8??cI??ne??????g??k???wb??`RY	9'
??????G?%??L???
??;?K{?H?1??
x???R??B?y?F?i?h??m?&??
??r3]??WHo]?p??D????????|N2?8??S??????G?????<???3???`??z?3????u???;5??TyA??h???????:q?k?
??;g??o??\??)
?x??????H?c??n?]???????A+?#??|?+*rj???0?T??????g?Zg?e ?X,??A!h??????s???C???"e{?f???o??;?#???np?????8?????K[i?????t????i`?(e
????^??x?9?+kK;?d?Q?GM?A????>? t????????o??x|?????=?=~Kid??
*\???!/??7(\?<???????v?sJ?jyfG??G\+pzgvr=??m?k?????F?<?8??Xg???mD?E?????????f*Cu
?==[?i*?s?I=:_??zV?????G??:??????]??g???Be?\???;??*
?j7?Ff{d at v??Rq?9#'
y9????x????b?Y?l??@\|??'???8??=M??yi?t?d5????Pv?h?
!?O???????i???????6"???V???i	?W?!-??"9b1??
??v?
??L??%g??????
32?????8#??????????)???????(SJI|????Ig??9?T?<|??G~???[?j?)??G?Q???%????p W???????kt??\???C?S???c?#?????
?w>??2??2}??(??a???U?
Fg?*G?,s?A?{
??o?n?)b???(?%??b<6??
??5?? !I?m?NMz???F?jKo?i?t?5d??Q6WvO|?zw???__???[V????83??
??99?;??=e????hc??????-|???b?*?^,????v;;O?2_???B?PB<???2En?
???'??O?qu?i???????????B???????y?H?\t?????n?JOhq??db???&K???9,x?q?9??????]/????s?:M?t?I?8'8'????ar??9-8??????
?w
?????1???M:?]?6?o?qn?(?R???	9$a??x??:?5?
xn??&???4]????L^???{?F??????_?3???:????/?<G?J????"Y??pD??T@?`?O???w?^??S2[??A??+/?<??Q?1?:
????v?
??P???/?M?-?
J)??}l????9d??h?\?*???oq
??\?y?ZO?????s?u???
z????S_??	^???1#?N[>??c_G???{?d??F?
??r?#??cq?<???K??
???n??f?y?.??m?9I?{? W???c???O??<e-??|??????I??C?Xy\??{?$?O?+?4?
I??Ko
^Y?P????b}???#?
?0?\?bw??yX?????I;l|??d??/a1?lcEL?d?I??H

\r?[?
T???q??"?{?v???????i
??]kU?Y??7J????9???p
????R???%?i?l??d?-;?4hX?a???8?Xcp,???
x>?k?????yv?+2???+a??
??zrk??????1	5?'???%e	?d??#?pH???L?????1JIT
7?rFs??????G]???????T?q??*???s?8?8???}?
??
??e?*????~???z&??Auz??Bb?I?,3g?*00GQ?
?J??$??OO????G??}{Pi?7S%???o?D?7?
!?y?Y?Dj:T?O??=c??Y??????Ly???;?+?u???]'??&?q{z?|??I???-?P6? ?
?nO5?n|R?d?:???O?s%?????o ??G????)-?`F??@
v??PN????M???yf?
?w?t?????8?%J?m?v???%(??RHcH???0*?????GR<??>0z??q]???W??p'?WA,o
??G?
?????W?Y?2L?9d??c????7+??s??
????Yd?g?S?5???cM???????UQ??=?H??Kx???NL>U?3????c?s??}k?4K??y?-?\:?????-?\???:??$?:E???S*^??+J2[p*1??Xd??1?;o-ng?????.[
???>?N????k?-?3I&?????zl?h?h?E?M???u?A???*!?:??O??h??s
?+$;?y?????K??5???."?R'?F???m????O<?+??w??	?Fw?zXr?????{u????Oi?d???E{)7???Be???? ???H?q?%?Ba?
?pz????|K?A??q??u??l?d??f!W???????????.u?en5??+?
y???
??
K???5f?;x?Y?
??	??v?v?xX???:9}????`??w??~Dx[???j+
?.??	lt?M>?5??kj?X7.H?<m>?v"?3????x'U??4????;,P?????????s?~f|Z???{???????VL
6?[[?}??xf????q__?????{|eD?V?j?d???m(????????????????????|?C???.Cx?T???`?2b?????
?<??l??_??$ko?x??1i?(?i??-?Z?R?x=H?
?F?
|??7??R?????tb?U?1?Y?+\|g?????KL 9[`
?#!??# ??7q????xmY???'?1??mP?q"?????n?j??K/UV?????x????????t?"?????*?
?q	?ul+	_?????p ?????k??????}r"1+?????+?n?????}?D?mwy8?j?? /r?
=?z????(9u?O-3b%N???S??>C??????
??:???D???;?&?M?7y ?????
}	??
+?>?F??b?$??????G<N}&?pupt?_??8+????3R?g?i????????R?l?X?;A;C
??`????????J3Q??xu??r???ls???@?d?PK?y??W??
?s?9
)??t????5?kz??h?4??G?-??;
?????rNk????
??U^???H??????g?z??^?/???%?S???u#t??y??C??L?????????N?8E8?'i_?g?8?'?????H???K$BI2???????zo??Xnd??qv?c?k?Q?I?@D????e$
?Ju?
?vf??6???x;W??m>s'???F?????-?q]l?&?????1????????5?R-M?}u))?8??Sgx?`??\?b:????@=;c??????Gh????U\I????k???4?????aeV,q??? `?9 s]9&?.9??R?'!??;???
????(@?;????Z?1??{?R??O?=J?D??0???F??	 61??????
w6?WI$
??3Eo???=?	'?8????7??
?*??@Ld???z???O?fGwF??C
?t?x??R??Oz?h?|?=3HL??3ndU?3?l8??g?p+???c????e0#1a6W??T??????????e?-??n?
?2>U?R???`t???H?E??aU?w9???????????3I?=5?QK???????R?????T??%@??n2@??z6????m{'???2????W!Wo?t??@?'??<B??#D???|??3?\|?I?:u??o?m at 8?0:A"0f?0??$??q????crj????
F?????*??????????S?]?2??????%???pt????z?S????9c5???.???
?H???d?Cs?????~??/?}>?+??K???\??%b?|??=?W?G???!??/_?^?git???9c?4/???O?J??9?Z4K??''?2?????4?&????#?W?????=?A$???O??P??bN??9?O?9ZG????[?O_?oe#??f?|?N??C???????7??h??-??8?6??HCav?8
??????B????????????
ap??J?G?/??S??C1k?K?????o??????????o???o~?"??D?? ?R?'??8=????>?w??"??K?ar?mv?p
??W=????ZMe???m|?[e?C	?8???H??x???]????U??,??d?
xJ?	<?z???X???iZR?wP??_???S?9??J+f??????K?L6?h??M??I>?u??k;??7?n??n1&0	?\t=x?
:X?)?????1???B?G?s????'l
7%????????Qns???7?
??H
?????????q?a???????*j??g?%??f?a??*RZ?9??^???????J???????????7[?o?3?iV!c???e,I<g?N???Pjz??mp?#?5????K??y?py?\???O?7??8???t??	? 2H????K|?)??j???'????????????i????Y
???
8^r???
{X<?q??0?Z?}?:?c)?v??N???5?D??\3?V?????>??q?s8[??cAn???#f?
@9??Kv??k
???t0????/?D>Y?6??:p=zV|WZ????n??????0?(?V?g?;W?C.?=!)6?l?Vr???z\b?[???O};???? ?s??y?$sP???:??D?T
?!??
??GNx??&?m?C???e?l??.?ZF8???{
J?Q?B???4?+??,<?C?m???<?25???N??(??i??\???o
???$m?5??N??cy?[];;?5?? c????????SX?????????X$?Y?
???6?@
?????????5???Ub??h?????0Y?^y?Cy??e????j?ON??\???????W?k?[?????5??eQ?p?	?:5?~7???\??#f??lQ?	,!?v$m??
??????'?8D??????
A?`/?Ir?????Z?????	??q0?p>???=????gx??????M??P	>???>a]?Ek??-??????-????=????B)X?)T???$u??f
4?
e?	w???????????
?E?<f=?
???We$?5??????UTX??3?
?bs?B>?????5?SV???Y????Z at D??7
\1L
?<?
???A???'??[lF32?[?87?%e?
(\8?>T
????{mr?ky?;L9,n$??
9?u????~???????
?q??????????
??
<qC$??XguU??????B}En?|???Nn`T??kkX?<*???`?????|w???IJ|??????S?Y+GKi~??#?D??[?VxV&??|	nxQ??????]Q?????Hf?[X??m??
?W$?? j?G?[k?n?f????c[????????pr:???w?h??%??1aR3?'n@???_)_1xz??W5G?z???????]9+G?????:???l?5?v????<???p:???q?8???_-l??V9ZPwL????H2x#???
?pq?\???uk?6`?????????Xg?`
??
???'?bc79&?W??G????>e?;k??s]H?#mr'??$?!???`??gvF:??c?]<???R???X?v? ??#??????C
4???V6?w~L?H?????y?{?J?IN?[F??VX?If`p6???O\???????8???;a??Vj????-6??? ?c?-?apq?q??w??\?5?y6D6??g???B???J??'H?w??C2?<?V?"??????????N??z??????[xL??cf7+?8`8?[???????c????????<???aa?'?lx??-??~I?V}???tlx]??????\??F?t?obS??E?)=6??^?8>??h??n??O??b?
?C?w"??i??>??Vt?????"
???D??d????==k??d9?k7?)&?x????????E9Z[?|}g???Z??????YJaR??????????I9?z???f???Y??xY???Y?Q?#???
AS?Al?$&??h?Jc??'??????xw???qiP?D??H??B??s???????ih?
??7+v8Ns???????7?F.)v=???F????????/?????h???l???J?}???#q??q??!??KA-?JQ?d?NJd??r
?.WNq??~U??>5??(???s?:V???B?b	
pT2?	?^-\]I{?????p?x?6?kjt:???l'???2???8rH????~	? W??????,6?w?????wV???/?A???8??x?????^??M??????U?M
?r?? r=?k???x?V?if???<?+jA
)E[?<?f!?|?7~g7?????5k??I?????Fr<?g??Pr9????#????i????4y??W???L%2,???@???~{?_A_?????9~xX??????N?6A+2?B???~??9?????SW?.??N?
??@# ????
??????q??r???????m*?gU???? 2??^?5???$%???0?P(
A^E????b?X????8?L??=q?.??A
A at H
y?}?g=???H!d?ce8bd???3????v????U=?~?[?#???
??d?A#?N?=:WM?X4?3?????A(?*????W'k{??B?h]?1??*?5?X]?
?:?%??
9 ?????3??k??skc??V1JV7Q??b???
?eO???????O?C,????c??u??\???i?m2E????b??6x'r?7b?b????mact???9d?>`q?L??z????"?ik???qQ?=??m^?v?$??m???,X?f=9#?~{??t/???G???W?(??QE#\??9?;dg??W???^??^??

??no$w1??2
H?d6O???;???
)?m??B??????z3??^??u z???m5??`?????E?S?.U?f???#h??????????w?>????S??*??N??~??2u???+M}} ??*??o `???ZZW??5??'N[??Y1qyh"h%|????
?????5;???d0)??p?B??j????%(?o??(C
	????.?X???7O??"???^?;7?7???????G???/?<?5???Y?~?{?[???7(?????k?4?3?=????.??????RF8?
??s/?c???>??4%J?7r>??|?*??.eou??y???
3??j%wv?o_C???????????[\FZ(-?X[?6?+88???QZ1???????m??0$?l?t????7}????0?5?z???????????v??%?pR8???\??c?l[?x?W????p?v?\I,?0?*F???0?R?%?)???????8TMYC?z????.????T????lN????H??b?$t ???U??/????-?o$??L???q?Ep????x?K?;m3IkmZI??V?M1e??-??9Gm?#?q^?+????_????a}qu?u????He<???	??0H???W1???????????c?N?8?:1??c~?^'???7??4????"Kw?S'?%zry????^????p?I
???g?8???
v?m?7??|mgs?
Joj?`??>YZO9??;????s???6??????L?/?pX?????}????k_,T???wV?s:.T(?????4??}m??FX<?w}k)k??V?3??#0?T
?????_?u?>?g?gr??u???O??3??z?????n???/?"D?I?-?|?p[??g???????"??????n??)?e?U?Y??`???_?f9-J?%?v}}????T???????s??
r??????l3????G
zz?=?9?>????i473?lv[???a??
??x?-??_?Z^B./f??s?)?t eH??m???q??F?????/??#.???WG/????F0I??????A??$???r{?m~?=kA???W??y?iz??P???5????/?v??g m????? ??~	?nV/????m??
Qj??m?'??E???	???	^ ???.?)?{??????mq????z??w?i?
????,?????>??#?\^%??t????eU}??X??N?????????]??????9#?>?j?K?H-??N?f??\??(??mvI\??b??1J?Y?????'????H???:?`????a9a??x?(r;I??t~?T?-???}E??G?[?????
?j,??U?Y?rg???*? ??q????<u???????W??SzLv(
?
??????
?L?=F??mI?6Yd9????rr?0x??	??>"?^X?????leEV?W?a?O???y??h???{L?)??n/?*??????m???I;??cu?d?@s???p
??^}?/i?E???? Q1?J|?e?+?8?g????
?m|??<??$d
???W?x????3Z?(??)1?L?? ?px???s?+?????]^N?XK$???9?m???ORx??n????.?????????&{f?`l?=????`???~??(W?*????Y?o??oU?M?oi?w??%?2q?l8#???^???i?
????3MpM?,Y?)t????%z
?4?{??HM??L?-q???r99????????? ?????[??P????c?U?=???]*P????^??????qR???C?{??	5???qr?3??,E ?rI?r8??s?????`?'x???4?I???1?W??}??o?G?????]E4??-?8W??<????????O?`?????(??+0F?t?s?S?~???
??4??+_?<Hfu???B?c???k-?#5??G??E?|?9P???
??
???&Em??a?9#?z??!x??E???;?????A?	??7<?_???????.?mn?^_??
????w=??r???r]?d??????N?U????a?\??>2?B???3L?,???!?o=9#<c?Z???jz????]?W?d????+????????)*4?Mt?1??x?????QZ?Q@Q@???
???%E??l??N8?`?0+?ufFWFdt`??v??r>????W??Y??)e	un?+???w?^?#??????e??????C?"???6???????????i?f?/2?A<?`??t??j?m?????u??s?q?3?0?cr?I?I\??0#?p:??=?^I?kX?)????zTj?????@??=	9??U?a??y?[%?X??p=?2??>sku f]???X?`H'????#?v?t??W??FX1RC}??3????q????;??U?C?,???AY??
????8????4?(????%|???60???	?w?v?S?IL~\j??????????t????m?np?;F?63???t???=5?N??G?B?Q\??y?^??~?mw??????R????i???'?3?????u????u????y?G?9??k???[ ??RC L	??d
G??W?-]??5{?????B?aT???!z?q?6Gj???x???y??~??S?O????x??r?!
??"q??{??????"?)???C?v\?a?Lc??q?3?xm???k#??mnVL2??????(<d??????o
I??4h<?%??W!?FFy?=0O?br?M???j?]?{??*?l[?j?(8n???Vg',???#+????$????????UVF????9?$?0???#?c??
K{*4?i?G?-?IjU???pT??dg?}
?i???m>?????`?4????p?v0I??c_'??
sqKU?vzt??7{????x????<Gt4?X?-2%1??Y???q?q?+g?)????4?F1<v??R?oBy?d?W?>?S??{E??>4???hn-?x???'<
???-??{??:n?????H?+@
p?%?EN???????j?.????d????B+?6H?+??5???fT%?hF}??o??UJ??M?????:?q?????/??X????:p???`???;?h> kR!??7|??"kg????<q?F[?q??????|c?d?m.LwL??
Gl??;?9?w}8???5/???,a???&?xV;h??&????	?????qs??Sj????Y?''E?
4I???pD?L????
????f??gp<q?q~???_?v?
t?GnX??kn?7R0:?????E??uZO??yf8?+?????3?)????j??E?C????k?9??A???????C?uqmow<G?E???????_??y8?S?<r???]L?D?	dL.???n?$qZO??m??I??b?R&I????pFy??{X\?.????N]???s?????m????????n???????[?????s?k~???IG?=????$n?0c?'????d??E???????{???U\)
???Y	??l?T9.??/S??8?u??m.?ck?G&????????
<p .??q??
???9v????~ xo?
?r_??*|?`%?s?a?NJ?rF???k??????M,?i?on?D?gfD?pqn?C??????j???fV?H'@?nh?????9
?<???Btc!?*I?{????@?#
Hpx?5?a(?X?Ly???l??ki%FK]??d?m????H%;???3:?????
J4??????p?????v6?MOD???[???!?R	}?9?N3?q?|??;??X?q??h??o??5???L???9
=?X~>??sK=??.?ec?9Y	?????????$<?Bd%?b???)??9
?????2Y??(?0
\?
????
~:|K????.??O?A1?FB?$*??9??%??_L~????}J?Y?c?Jmy?q?U?<????=????????;???I?$?????
=RZ???|>y?????}??
A????1?#r3??????
?????!??>?>????v??Z???n??????n?p~c?????
??? c???<?"??[??u???	?eYj{????t?y??R???>?Z?:??g??s????8YZYI=?????G
??0???,?r	???q_&?????;?D?????M?RD?5??
? ????G??Gk??Z?S??k???0A?'?N????k?Q??S???};Q???v?/??}??q????Qw?[)I?Q?Wh??????<??v???O??????RX??=??????2P?
?,?2r??=???xb_?????$?i?,a???[ns?G^??:y???k?J-.?k??Zw????????_??????9???N6?;O?C???M9?o-??$??$??gl?K??'S?9????<
??E??mN?!?)J???<???79?0zW????9ms?iv?L?
???d??????r??{?m6=?P?vS?[bL?H????@?q?#??\???u	?Y
?_???ID-3c?1?L????????U???i?)?M5?1????s?H?>R:?m??<v?@??o<y??#+}????@?f??~????zw?*zw????Q????E???-?6?p?Z??.?x]?fw%??'=???k??<W??????k?T(?D2J?A?G???????%5??.?????UM>?++7???P?	?<?{
#?`?????i?|_????#E???/?????eL?;?HpX??
*???/x?P-?
??8l?????x?????????P??????x?\???/??-???i[??)?f?}
??R??|????7?3??4?3[	1??n?E	?s?>^??z?Z???u?"?????"??,0?^???0??\G??Hd5??oY????Z^-??r????V?[?Q?
?~F8??XHN?zS]!?T?T??????y????xvk?/RMC?|LCE???su=I
??_O|$???
?9??W??|D?}?vKne???\[????yO@?9 Uo??
?
t?
??]?s???u)??;z??7??i???=?????h???%??)R??~p1?????
??4?>?+I??P??????????\`u5?|Z???????C8}?m
rev?nzpz?????_^x?W?f??;<?d&9?9
?t,?}H?'?)???????????e#?A?E)EIY?P?*?}?i??Aug?I?%??bIRu
????t??;e@?d!????
???2???@?bE?Uy???q??t?u??8?????9?
;H#????\5??/???6??t?d????&? ?Hu?T?'?=1?O???o??&3,8?E??;mUn?}1???
??K?%?q ??????
k?)'>?".????w?_??eu?;???[	??F-(7????}??LsH??*???`R8?eN?m??????
Dm*?{J<?	WO	?7?m?M????????#
?6l)????&????Y???vTl?Y????
??Y???Ym?dtfH??aQwj?U?N???$v?9??\b*;???>,?s;9??E?h:??r???y?g?n|??Y?P??c??J??|0:?????s-????jq?W??%	Zz??????
*:?x?b_N3??Y`??W??/u?l??????e?H(k2K_??????q?8??5|?E???Uh?	???t?j?*1????L?6
;8+c?}(?+??b?M??w?ab?J]??GO?????N????`?p?2j#??t????????'??????M???$? d?.{??????V?4>????F?i7>i`S2? ?U???u??KP???w-?$j????%.?l_7?_u??e^??@9?????????yQ??B???`?[???(??]?>????z)?\????v2?B?'w47N???????M??:V??????3f??:<?\ ??R??z???????i?l?"??&;?????0?P?7???vT'?????Ok?^???{~?w?W??????N?Y5?.e?????w?????[???????O$3E??)8???j??hx <?zN_
|?uL????$???@?I?B??7~?$?u}p??c<??????5?j{I@?!>o?,B??_fM??fzs??fV@??s9}!3>?eShd?
?7???n}?? ?4??:?0?QI?G??Y6???:??Y?@?$>t?@i%?O???ft?=vP?4??????????
?YUP??'a?Ly???+y?o???uwX?o?@?E??M??DZ	??^?/????
?:L6??t\?R????E????????R??U?3?m]:.?????*?1??Gh??H?Z ???dI?(z?????W?q?y????P?t?,{^a?Y???~???E[?W? ?6:??)Un???>0		???;m??????;?.??r_??????G{d?|?=?v??x???????:???????j????^??4-???qA?|?
???\?:??^?A?Cm??????*TB[?
????&?9????{1?s
?	?"?n??G"?????#????Kt??^$???|???0?x?O???~?$?|]&??Nd1"???0.???x?[?????????e	????
??*??..jr~t47?:?s???T????????2mGje???6}??-?????I?|.?/?~??5?!?tT?kZq?o???#ib???.?p?g?????.3????a?F?a?)????%??,???l??l??GF}???Z?????????f??n??.r?^????Z"??c?????s????O?|???L??#?x?LalC?]?X~??RK6????$??d
i5.H???'????????n/&??=X~??\o\b?????\>???x@??-???????.?????
Q????LqD??V???F??0????
!??6?GK
?g???} 62??8K?/}S??2?-n?o?9??????JK?????M?,g(J?'g???.A\??O0?q????I?Y8?U?????^`???g??????????W?r??
??????/y?O?I??%?n??t????????)aGy+=k???6?R????6????????#?RJ??X???9?8?%???7????I/>V?(??
C?o?&c_\?????<?5s?mI?5a?????4K??6?=|??EA?E?C~)??_?QjiV?5?xX?K??????lM?dW[&?????7
"d??{zm;??f?,???]!8?"??s???cz???????rG?)VR,???????i???|??a???p?h?1}F9K^??!?uH6??.?|/??L8o1??/?R-?r??G????????
??`F!Kv?Rf|r?-7??l?Cz??GQ3)??6?Jp=?&e\&?????????U?/b
?O?@??z???c"?/???+?=?bC:N??"???~)G??????2????1f??????:????????d?????????;?+?????;x_????P??b?F??x-???.rz? Z?"??M??????Y5#????7+`8?p????????,zFC????N??????;????d?T????;c?+G????'?l\?c`5????]??
?d????????Yd??r-??a???????
"??5??????&$/??_?FP??X?%?a70?????{fi??U??"??n]??w?? ?z??I.C??P-9AB?4????<?9?
?????t?N"
Cg??!?RjtE????g?U?R?1??pO*??@
???q???f????????h??~z\?u??q.?:u?s?{?|??%???S??????(??7?07??????&??(??9?Kmg????7?T?S?q?fy??4Y?]#Xj?k?N?6B?2?R?&6??^?????m??Ny??j1tV?/???:???V.????N?????r?G??	?:?i?Z?4,6Q*?????k4*???>?
;X??z???dO?
r`??????x??C?f????????????s{??mg0?4?7?9 e??*?+a??c???g???_????eg*S???g8?{%?K???H??t??????y?eK?Ag??p?q??u?ic??????[???9???+??m??>#`??5??.???i?N?W?Z!?'?????N(q????? -?*u????????G??g??Lm?,??5B]?ht???.O.??XT??RQ??z3N?a=??=?0?w????bq?????j???> 
?*M??)\???gW?????????2?r????fY???????s?????J???A??G>d????n?#???????"g2?[	???Q???>?"sWFK?O?????S
V^K??l??5h????+???
8??\?`!'??f????K????????O@@
?
0x?Oh?9x5?U???g?]??8???x<@?"%???????'gk,??yp
S??T?&???7??64???a??LU??;?iD?7R?CL?e	r?????3?m8???4d??Nc?Y??9??????'.
??:-QJgk;<M??om???bVx???2?woZ%*F?>?V_????|?????6[]Y?58?<eB?*>?x???DT_???m??}????????FN????????w??~v?Q???????P?0?y??=?!Q?O Y???????U???0?6??F?_?|
?N[G?b???~[??u???+???Y???WK???U? ?8X+?(?>m??U????FY?|????Ed??0?8?P:?%}o2E:=???{??W?$????\wJ?~J?x?H<??k/?e	Z??>?q?>?J??6??Vt?mm??-h?f{????h???;	w?_?????0??k+????w???7K????.???'????J??????NMF?'?????H~?eA?
O?B??=???S???=??N??F????s?g2Z?l?C?Z?UsL??
?
!??*M??j???o?`_)K&?6?
~i????sc]???{??7y1bBd
?)P4?????3A??Z??S??7?????????U0-Z?D???!
t???A????????U??????0?!??~/??Q??	??Kf?D?'?F?0@&????.????%??w?m????C7R?I?=`DD??C????r??@R?cu6?k??x?? ??Ls????????A_5Z??????[v???n?k?-r?A?%=[rO~ ?B#???<uRu???=`?? G???37?\???
???G?F=?St??e???a
??0?
???]??.?4?f?vL?v????5;4?u???1??c?K]?9=???jr??x???T,&?H;??L?<?wE=3??p%?w?P??P?x+?n?%Fd?PQ/??????r%?X?}Y??'?"?v?\V????hZ??:Tu?j????a???WX??@????????:9s?<?^3S/q?1*d?4?@Y?&m????????s???V?q<?S?<)??S??<5??????`OO?K??/d_?l?m?:?,Q???$?????=?P?oP?g`
'??n
??
t?u'
w!Hsp???w????U??????????u=?I{?/??y???'?O???<?n???$??4l??K*????}) a??H@?O?	??H????$????$lu?7?????=????x?r?<??j:??1?[[??H?m?Oxzm?f???4FJ???V{????K??
"t}?+?????X?'?????<{{A???I
??d???8?<?Y-
f?[??t??^???q???????#	R?
_s?|?y??&?1??h????#?????g??????Y?W`?,???+d???;???c???sUE?W?G
q???????)#?P?3???}2?????#??k2Avt[???%n/??P??r?^?S?7D at L??Z??<A??
$?w?yk?V?$z?F?????^??k?}??4?>??*??2???????@??
%????B????~`?=^???6^????ye?@~&?'Ym??Sc6?\V'
x?#?}^im???? ???????4e??E1??T??#?? G??e
O?O
??`?/I???
?	?0?$??F%???%o<???l?@,?????\Q???v?????H??hLKl??h?????????T_??:(?Mvs?k3??A?w???W?>???Jd?$???
?e?J??/??N(x;O??
S??R??7?:r^QHE?????i??J?mF?!?S???i?L????-YS?S:BB??}??}??V???E?t????0?????n???X???\[????A
?`?PQ=Y#?????:7?e?b/??z}6@?e????@?J?I?J*75???+??????\?oR??0??:?}??????P???-[b?$??}???#w?:+??d?B+?????@?5o????1?;.?z??'???5A(??T?????C??h??C????z?@s?v?X,12???ZXh?\0Nf??-=???;v????K.???7D?/2.?????[???=S+?p??+????????O???????h??I?@??????1???n?j?B?[????1J???
?O?[{???>???5uHh???f???O??P+???i?r?H#yra?$+W E[$??9>?*x)???
?\?.W=???-Z2E{9?U???'??????H??z?cW???L?L^??? 6??6$?$?3?\?_u?6
?Yw?#?/R?tl?Ewz?CnPh???-???0???
?vN???L*O?X?.?JXd????l??/?uk0o4??Fxp???Z-?wn??ey?D
??<?]o7*y???g??????O???a?Z?X?t?4X?+???n?N????CBG??+??
'hg"??0v?
I?????{
}????mr?	??1c???Jg??????
???dfd????~??????????*????C??K???Wo??V?H??????T?
?m???@??ip?&[t!]W}C?c
??\d???i?BM[?P?Q??gs
Nl????|N?
??????I?0W'??\??g
????<38?X~??s?W?q'?(cX\????k????B9?/~?^????J~mmF?-??????>?????e???v at 9?????????:?3)f?Y[??c???^?N?'?M)????u?]~o?????5:?A@??_-y???KE$???`?	?p???Q???T!?]?@??=N??gD??????
??7?D???? #?gcY??	????y?S???%??pSJ?~??
??m?Yj>Q??????{?????#?g?????JA~?????????k'?3Y???~??->>B?
 ????????KI???7G????bv^???????:????'?)?p??????1?}?<T?????z?O???z`???:W?NYZ_F??V??'???{E?Z::Mq????#?????h?5,??9Std_?h??????{u?N?Mf/L\7q???Z?lt????????
?x?r?`TM???{????J?M???
$Z???LZ??K?HU????Y?????U??m????O???I4?~K?~)z<["y]?r???j4????'???T.?????'?
$?+Y??}z???gA?m??Fl7
?S7
?uX??z)????%?\.
?Czw?,B?)??5???3?P??'|y??n;O??.??(3Gh
??8%U???????V?s<l?r?k	?!??5???X?o#?Ng?"??/?u?
[??f4L~i???J?5???"? ??????a?2Y?O?@?????]????????kb?T?/?9nlM???????%~?
?? O????J?z>?%?l????/??d??KA?????????? ?-9s ??G???bP??|?U????6???	b+R??\??_??~??????rp????M?;????Z???????a?*?Q?Sz?yc/L????#`?"?5|??X??'?
??g_???|BL????E??FU???9??
?
{?~?+??t?O????2n??X?0?4S???Z?l?UK????H?	E??yb???Q$????}??C?e???p???W*l??y?????f?,3??j????Q?
????r?*m???????????2??????m??V???]??cFGcS???Q?
2???????????5S?{wNsf7:??T"h?tn?!?6?F*?R?b?Un?:?2 T2?+?Tt?x?'b1? f???r????w??)?4??Khy?$??_?r?7M???[?Sl^@???M?f???[r?t?	?rcJq???q??????;??????EQ??i	2???
V????BC??zZ?\X4x#??????
6?????K??7qe
??:!a??pC?o????s???6M?jl????<#?,?|
?%???y?l??1?Y?H)?xB>??????k????<T??*?????th0??V?D;?~?|??????>jBu]?m?z???9Mir?4|#w? y
?H;??H???o?.?Ab?r!y???1???{?2,L!?9???$?!???
??
tA???S??jj6T??"??o??_???????
??/?^?_z?s????*4??M?h?.:???9??K!??z
???

S<.Z?R%X?e??
K? ??5??=dO???]|??eK!\*J?%?dar????2??Q??????uahh???`A?*??d?eE(??;????b??m?H??
?w?
??z??j8?????
4???w?XM???u?z??"????Jg??4?u}WZJ?*O????8C`???????!A??W?%?
ik?N?	N8GU{[
??8?????!U?p???3??~???f
???D??y??H????5e?Liqh#K??L?G???'??#t???@j2???Tz@ ????M&'???S62p??{?02a???cY?:???????\?|V?J1?RN???(?\n8????v)Y^1v??	??oku9"?A>&E$?Mn~?^?0?n9?Gh???
???{Lo??C?Xv~?`4?'?3????g"T??M?????=?2W???????\????L?;?=e7?T(??????/9??^??3??9?G??????????&?U'?M7S;
Li@~???C??W?C?Yo????m>eX?^?????@?<,????R??Pd7%?n9??+?8???h???m<mu_??<%???]?lC???5?M)??2?-s?RdV?!??Bp?????s?,W????@U?4Y?}??@??S????dD`gg???%z,??d??????????w??????3tMI?;L??e&?
???"??i???N??DI?A3Jr/???*??k9???urv$f?????a??%m`-???1Q??(M?[????$????f??1??}Y~?i78/??	??k"#????$??????n?????Q@?n?C<f??^qy?Moo??W??
0?J(w???/???yIt???!.q??u???|s??'???dq@??f?g7(6V?T???\,?#Zk?$n??r??t?5???C&?????"[?Bc_1?$e????In3a??????\?	?q?9j.k?[{??\?t???oUQ
U'
YY!
???<t???E??r???L?Q?u?~????????A?-MM??Y?3?g>M?????????V??Z?3u???? G??E=
??SK?????hi>F??Y?|??????? >??	W?
???Y?????l?~??[??^b?L?B?????????&?=9&p??n???8??9???K@???z~	??e?`??7?U???%U???
???c?L6??"??~?????_????1??k??-Y????_|B?????y ??????UV?K?^A?&?
??????K??Ye????=|w;?8? ?i?R?u??u???KK???%U?(%???r s??)????n??:vS
??#\9????W? O+(?<?r??!Y??Gk$l??%
<O?????Cw???L??Y9{?`J???k????T??/h??j??K????F?w?????????????????????B%???^?c~"??RW??^?G????2?X????8f?&?,?^N????f?cY??]!???{V?k??[???x??'Jetx????d;?	n????? ???rV????O??.???-?5d???j?W??????=?g?/?X????g?z??	S??7`?!?j???o\?:
?K?????kf?4]9?
?K0?<??z?}?z?$'?>??_??Z??????%????@???
!??	?O?k?v?"?
?v?:??VnZa?@?X?T?	???^P?m?????{?r?m??Z?kF?l2??]??a???uQ	?7'??]????L<
	q??SB7?Yi????I8???(???*'?O=1?GE???+?
J?4??p????}????Nb^kf???R??yZ?A?/8??-N?/?#A?q?????lN???R.?

??s?????[5??A??

??????Q!????T?E?e;??l?????K??T5\???*(??`??Q?6????-??fo??lt?$?I?a????S-$~??W%9?
?1S?a?n? &??'?z?}@W??n?'@??E???v?r#2???B????,?s?I?v???Sg??????*?IQ4ny???Z?xP?????J???G?	??lKmRmZ???$G????q???!????ge?c?HW?gCN?0?$d??k????)?[
?u?^]????????N??H???nZ??&_??????"????:?*?'?<?0?jK?	???nC?????3?????^(t ????mu*?Ag?Ki?'?	???$?W?q?????og??????????f??????0??2?!M?F?:?r???:?D??
J???
??
???6qLo6????/z|:
#K???wf???????
}B?+??)qz??
???Yw?Vvu???=6`????<??????l5?|%
?X?-/??6?7?????x??????
D
?n??
,?,F?U ???????AO???{?u}i?~S?J?4?<?N? I??#`??:?Z??N??d????4D>N???W??????8z?i???g????Oq??%???????|?????F????0?H??'_D?^?5s??H??nf??et2????J!???R?sM???w??xB?I????9vh
????2??????o	??Pz>???a??????ov?nI?zD_??g?????w??????t??6}??D')!1P]???k?l/2
4o??#???kvh??tD?%????j4T????*??c????*??o??????
??)l?b?????????A,????5???${??8%?MX??U????e?nPA?(A?\g?|?>?????h??;B????&B#{?????????%zU???[??xn???MyE?
/?B/?{?a	c?w(2??	?"??????S?*=/????'?%x?????U????:U&?D?x??S5?:??K??Q?4??M??@??Z?%??Z??d-,??:9y+????.Rr?s?1?s??\?yw?C??I???m
?%D?+?cb?*?_g?v?t??!V5??y?e????NU?????y?1]Ee????+H*A????
Yg?C???,?????vjg??w
5?z?????a.LY?3}c??TS??r?	K??g????[?V?s?*?;????3??P}z?m??Rk??#I?:
P??????Z??i.???-o)K??w?(??s>???'QhJ"QJ??$#?????b?B?5?$???d??P??t??,???Rgv??/?e?En??%??????>??$?)?nK??0+???O4??p??????Z?[@??!???}???O?B?????i?J\?F?V??G??k~
("?"?e?F?+J??M????I???'-?)??W,z??DX?Aw????]?????AY$O????N??jm?>IQ??*?+??ql??g?
??????$G??o,?-T:~_[5?[{??#2????g??9a?B???p????"??n?e???Jxc???????~?vBN?O?*?S?N???`??h?5Eua????P?2???????i:
AEV?Z?Ix?}:
?????v<?P??M?~?8?Cp???)??/w??'?)
J?{qw???h???'Lu?I???w}i?S?W-v????ITqm??JLuTU?TVU?T?|???3???r?pz?????c???<?"?I/sGP??:=???l`?ji??-???7??H??~??7-c?jL?),=C???d??	?.????????I}?l?~Y?????????4k???t?????V1?Z"_0"0:??????+?3m$y??B??P?;??#s????c????~?f??3?-???mrL??????r?o??????~?_?????c???R???t?j?_??G%O??*??B??R&?_?1
}????{?mh8?B/&?c??y?rnDP???J????? )y^?u?J????R`9?????^???'???0(??,~???O?FZ;s??u???]?f???????j?m??i??_?N??2J? M?[??]! k?
??;? ???(?8>?d?h????e/???|???'?o"?	S?R?$b???y?#?Q???Q??????D;[[:L4]w???u????;z?????-n*??fC?/TY?M???L???X?p<?U?A9H?[h????PyR
?Y?
?gD?????'?^l??hL?
P
?????Q??8OW'?c??q_??4??T?9N?z&q?????+v[?-??jxu&?5??G???O?????????"^n?+P-\???
n??x???X? E??"????5???0?p;2?@<?K?$?????JSe????????J6????`(K$	lB??!p?&?_E?J_I? ?H?????
??R??L?????G???l???O???-oI???~??J????5??Z(??VN @kc??M?Hk?0A?&#v?"?1?~m.?6=???Q	??oz??A??tp
:?????m4?ztePX?u^??A?N??Xd?? ??????-?Lv?K<?zHh??x`????>??}6ZZ?W?
i???M?#??b?????bZ???qV-?
E??'g???0
1???1?gR1CB?+?0??)Y????5:9??;ir
@}_C?
_r
^,????E????c???????G&??Ha
????m??j~1s0V"p?a9@?%??l?A?????,Q_1?
L:????c?Y?,?BbH????^?[???????B
???&x??0A??hh??B?I$???r?%????+?Vl6?
??.?????`9X?Q?!@7OB;N?\<?	?-??????Q+??<x????2???z???o{????/S7???q?0?????L????????Q`|???,*????7??s?yu?e???F??Sh,???????%?(?ygm;0:
?V~?????y???v?????? w~??Y??????????#J??t{3?????T?Q:~?!??%????"?!|????a?????????99s3>????:?h??????g?-???z??g<?x??:c??
}?Y?i?z?Wr3??????y??\??W'?7:??uC?Z?p??J??F[?)??D)??5??\???b?&8??`?9=???/y?
U?>
?o?W?~?????P??????41
C????????5??)??If?$?V???K?a??^?????`g*?o9???PQ-????8????9Ld?<X?AY??_?]D?@??`t????u??????%???u????????????Y?dP???3Lt???x????j"??Zg=8??)?<??$j?gg?K??=????si?-????b??T??X?`:??ab?q??y?)?D?U???B??^2k??Y}M#???4?u0?bm??g????0??>?r?~l???hHfh;2k??????9(s??&?-Q???_JRy?~?U5?]??h73?O?s-??????p?????_???i?8I?w??x??/?F?????t?8?=???S\??i???qQ?1Y???T$??+?W?
?+jz ?%U?H???H??E????Z????&??B?G??
CP??@??[?`1?n/n3?3?U?c3l??&?,????N??{
?????a?????wC?Kh;k?pb??S?????$???/???Zz???w????'??z??^W???%????H??l at so
;l?????^?95??????v??Jwt?S?e?U>???$?z??E??'{g?<1;?ZDMi?~?4[#I?"I?:>,Y?E?x?????4?qS&??v
	^?????;F?????"SPh????????Q2{?(?8? ?E?
+????^????SS???,g??*??????????????_?.,|?h?W/???xTX$???0?x??4cy
?"?Bj????Q??]?0?yW????RR^2??{?m?{%
z
?
?v?z*???4&???g-&??L??LK?%J?????t??>,C????%???1>?,?V??G???b8????~??fx??v?
?	???w?8
????????6t???g????1??????????U?bjZ?t?;Z??k?6v?'
q????[??
?????a?PO????`?u`y??????_???(cQ?????????D?????4?w?#??Y??????M]?i?|X?Z?>g?]????a?BN??????Q??J??6[?aIKwz?????t?-e6h??A
Y?k????'q?@?1?F????????u??????~>???????i?????*700Mw???``j?'???u????o?[???.?B?????????.`?a?,??????0??!?L?
O??=??????????C{?8?pX4??????0??s|l??????C??!:jW?3??r`j
?????(xC?\? ?@#3??`?hNc?c????????:??&


K=%?

?6r???{
 ffuse.jpgPK



 Jupiter/ganymede.jpgPK


n?

-


<
<


a!

@
 8?5??R
k
D

--- NEW FILE import.log ---
SolarModel-2_1-2_fc11:HEAD:SolarModel-2.1-2.fc11.src.rpm:1231778039


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/SolarModel/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	12 Jan 2009 16:17:12 -0000	1.1
+++ .cvsignore	12 Jan 2009 16:38:58 -0000	1.2
@@ -0,0 +1 @@
+SolarModel_src_2_1.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/SolarModel/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	12 Jan 2009 16:17:12 -0000	1.1
+++ sources	12 Jan 2009 16:38:59 -0000	1.2
@@ -0,0 +1 @@
+16a81adc25b4c792cc0211fde3208959  SolarModel_src_2_1.zip



From spot at fedoraproject.org  Mon Jan 12 16:44:21 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Mon, 12 Jan 2009 16:44:21 +0000 (UTC)
Subject: rpms/SolarModel/devel .cvsignore, 1.2, 1.3 sources, 1.2,
	1.3 SolarModel.png, 1.1, NONE config.dat, 1.1, NONE data.dat,
	1.1, NONE
Message-ID: <20090112164421.B247B70123@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/SolarModel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24446/devel

Modified Files:
	.cvsignore sources 
Removed Files:
	SolarModel.png config.dat data.dat 
Log Message:
initial branching


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/SolarModel/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	12 Jan 2009 16:38:58 -0000	1.2
+++ .cvsignore	12 Jan 2009 16:43:50 -0000	1.3
@@ -1 +1,4 @@
 SolarModel_src_2_1.zip
+SolarModel.png
+config.dat
+data.dat


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/SolarModel/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	12 Jan 2009 16:38:59 -0000	1.2
+++ sources	12 Jan 2009 16:43:51 -0000	1.3
@@ -1 +1,4 @@
 16a81adc25b4c792cc0211fde3208959  SolarModel_src_2_1.zip
+9ed57377d277819ef25b5d0c082a0b95  SolarModel.png
+91fa848e2720887f010660aad54f66f6  config.dat
+7cdaa99e0da6713e7384c21e45b1fd52  data.dat


--- config.dat DELETED ---


--- data.dat DELETED ---



From spot at fedoraproject.org  Mon Jan 12 16:44:20 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Mon, 12 Jan 2009 16:44:20 +0000 (UTC)
Subject: rpms/SolarModel/F-10 SolarModel-2.1-Fedora.patch, NONE,
	1.1 SolarModel.desktop, NONE, 1.1 SolarModel.spec, NONE,
	1.1 sources, 1.1, 1.2
Message-ID: <20090112164420.4568F70123@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/SolarModel/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24446/F-10

Modified Files:
	sources 
Added Files:
	SolarModel-2.1-Fedora.patch SolarModel.desktop SolarModel.spec 
Log Message:
initial branching

SolarModel-2.1-Fedora.patch:

--- NEW FILE SolarModel-2.1-Fedora.patch ---
diff -up SolarModel_src/GameMain.cpp.Fedora SolarModel_src/GameMain.cpp
--- SolarModel_src/GameMain.cpp.Fedora	2008-06-01 06:29:58.000000000 -0400
+++ SolarModel_src/GameMain.cpp	2009-01-05 17:15:52.000000000 -0500
@@ -109,7 +109,7 @@ void GameInit()
 
 	// Maps setup
 
-	Game.FS->addZipFileArchive("data.dat", true, false);
+	Game.FS->addZipFileArchive("/usr/share/SolarModel/data.dat", true, false);
 
 	Game.Map->Load("maps/sun.xml");
 	Game.Map->Load("maps/mercury.xml");
@@ -479,7 +479,7 @@ void ProcessEvent_GUI_ButtonClicked_Opti
 	// reading options from config file
 
 	GameStruct conf;
-	GameConfig::Load("config.dat", &conf);
+	GameConfig::Load("/usr/share/SolarModel/config.dat", &conf);
 
 	// creating window
 
@@ -1174,7 +1174,7 @@ void ProcessSysInfo()
 	Game.OS->getSystemMemory(&mem_total, &mem_avail);
 
 	wchar_t ss[1024];
-	_snwprintf(ss, sizeof(ss),
+	swprintf(ss, (sizeof(ss)/sizeof(ss[0])),
 		L"FPS:  %03u            "
 		L"POLYGONS DRAWN:  %06u            "
 		L"RENDERER:  %ls\n"
@@ -1384,4 +1384,4 @@ void GameDone()
 {
 	if (mapdesc) delete mapdesc;
 	gameMeasurer.Done();
-}
\ No newline at end of file
+}
diff -up SolarModel_src/GameMeasurer.cpp.Fedora SolarModel_src/GameMeasurer.cpp
--- SolarModel_src/GameMeasurer.cpp.Fedora	2008-05-31 01:34:54.000000000 -0400
+++ SolarModel_src/GameMeasurer.cpp	2009-01-05 17:16:25.000000000 -0500
@@ -298,23 +298,23 @@ core::stringw GameMeasurer::GetDistanceA
 
 	if (distanceKM < 100)
 	{
-		_snwprintf(s, sizeof(s), L"%.0lf m", distanceKM*1000.0f);
+		swprintf(s, (sizeof(s)/sizeof(s[0])), L"%.0lf m", distanceKM*1000.0f);
 	}
 	else
 	{
 		// 1 au == 149,597,871 km
 		wchar_t au[512];
-		_snwprintf(au, sizeof(au), L" (%.3lf au)",
+		swprintf(au, (sizeof(au)/sizeof(au[0])), L" (%.3lf au)",
 			distanceKM/149597871.0f);
 
 		// 1 ly == 9,460,730,472,581 km
 		wchar_t ly[512];
-		_snwprintf(ly, sizeof(ly), L" (%.3lf ly)",
+		swprintf(ly, (sizeof(ly)/sizeof(ly[0])), L" (%.3lf ly)",
 			distanceKM/9460730472581.0f);
 
-		_snwprintf(s, sizeof(s), L"%.0lf km%s%s",
-			distanceKM, distanceKM>149598?au:L"", distanceKM>9460730473?ly:L"");
+		swprintf(s, (sizeof(s)/sizeof(s[0])), L"%.0lf km%s%s",
+			distanceKM, distanceKM>149598?au:L"", distanceKM>9460730473LL?ly:L"");
 	}
 
 	return core::stringw(s);
-}
\ No newline at end of file
+}
diff -up SolarModel_src/Makefile.Fedora SolarModel_src/Makefile
--- SolarModel_src/Makefile.Fedora	2008-05-31 02:29:00.000000000 -0400
+++ SolarModel_src/Makefile	2009-01-05 17:16:03.000000000 -0500
@@ -1,14 +1,11 @@
 # Makefile for SolarModel
 
 Target = SolarModel
-Sources = GameAnimatedMeshObject.cpp GameBillboardObject.cpp GameConfig.cpp GameCore.cpp GameEventReceiver.cpp GameGlobals.cpp GameLightObject.cpp GameMain.cpp GameMap.cpp GameMapDescription.cpp GameObject.cpp GameSkyBoxObject.cpp GamePointcloudObject.cpp GameMeshObject.cpp GameMeasurer.cpp
-
-# Paths
-IRRLICHT_HOME = $(HOME)/irrlicht/svn-plain
+Sources = GameAnimatedMeshObject.cpp GameBillboardObject.cpp GameConfig.cpp GameCore.cpp GameEventReceiver.cpp GameGlobals.cpp GameLightObject.cpp GameMain.cpp GameMap.cpp GameMapDescription.cpp GameObject.cpp GameSkyboxObject.cpp GamePointcloudObject.cpp GameMeshObject.cpp GameMeasurer.cpp
 
 # general compiler settings
-CPPFLAGS = -I$(IRRLICHT_HOME)/include -I/usr/X11R6/include
-CXXFLAGS = -O3 -ffast-math
+CPPFLAGS = -I/usr/include/irrlicht
+CXXFLAGS = -ffast-math $(RPM_OPT_FLAGS)
 #CXXFLAGS = -g -Wall
 
 #default target is Linux
@@ -19,7 +16,7 @@ LIBSELECT=64
 endif
 
 # target specific settings
-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L$(IRRLICHT_HOME)/lib/Linux -lIrrlicht -lGL -lGLU -lXxf86vm -lXext -lX11
+all_linux: LDFLAGS = -lIrrlicht -lGL -lGLU -lXxf86vm -lXext -lX11
 all_linux clean_linux: SYSTEM=Linux
 all_win32: LDFLAGS = -L$(IRRLICHT_HOME)/lib/Win32-gcc -lIrrlicht -lopengl32 -lglu32 -lm
 all_win32 clean_win32: SYSTEM=Win32-gcc


--- NEW FILE SolarModel.desktop ---
[Desktop Entry]
Version=1.0
Name=SolarModel
GenericName=Solar System simulation
Comment=A 3D Real-Time Solar System Simulation
Exec=SolarModel
Icon=SolarModel
StartupNotify=false
Terminal=false
Type=Application
Categories=Graphics;
X-Desktop-File-Install-Version=0.15


--- NEW FILE SolarModel.spec ---
Name:		SolarModel
Summary: 	Real-time 3D Solar System simulation
Version:	2.1
Release:	2%{?dist}
License:	GPL+
Group:		System Environment/Base
Source0:	http://downloads.sourceforge.net/solarmodel/%{name}_src_2_1.zip
# Upstream only has these .dat files in the binary zip file for 2.1
# http://downloads.sourceforge.net/solarmodel/SolarModel_bin_2_1.zip
Source1:	config.dat
Source2:	data.dat
Source3:	SolarModel.desktop
Source4:	SolarModel.png
# Use system locations for libraries, headers
# Use RPM_OPT_FLAGS
# Fix swprintf/Linux related issues
Patch0:		SolarModel-2.1-Fedora.patch
URL:		http://www.ffsoftworks.com/solarmodel.php
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:	irrlicht-devel, libXext-devel, libX11-devel, desktop-file-utils

%description
Solar Model provides realtime modeling of the solar system. It allows the user 
to navigate in space, to control time counting (speed-up time flow) and 
estimate real movement of space bodies like planets, dwarf planets and moons; 
estimate its nowadays positions in space. You may select two possible views: 
Solar System view or Milky Way galaxy view. It also allows the user to bind 
the camera to space objects (for example, you can look from the Moon onto Earth 
in real-time flow). 

%prep
%setup -q -n %{name}_src
%patch0 -p1 -b .Fedora

for i in _dev/*.txt "_dev/map/*.txt"; do
	sed -i 's/\r//' $i
done
iconv -o _dev/Changelog.txt.iso88591 -f iso88591 -t utf8 _dev/Changelog.txt
mv _dev/Changelog.txt.iso88591 _dev/Changelog.txt

%build
make %{_smp_mflags}

%install
rm -rf %{buildroot}
mkdir -p %{buildroot}%{_bindir}
install -m0755 SolarModel %{buildroot}%{_bindir}
mkdir -p %{buildroot}%{_datadir}/%{name}
mkdir -p %{buildroot}%{_datadir}/pixmaps
install -p -m0644 %{SOURCE1} %{buildroot}%{_datadir}/%{name}
install	-p -m0644 %{SOURCE2} %{buildroot}%{_datadir}/%{name}
install -p -m0644 %{SOURCE4} %{buildroot}%{_datadir}/pixmaps

mkdir -p %{buildroot}%{_datadir}/applications
desktop-file-install --dir %{buildroot}%{_datadir}/applications %{SOURCE3}


%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc _dev/Changelog.txt _dev/License.txt _dev/Readme.txt _dev/map/* _dev/num/*
%{_bindir}/%{name}
%{_datadir}/%{name}/
%{_datadir}/applications/*.desktop
%{_datadir}/pixmaps/SolarModel.png

%changelog
* Mon Jan 5 2009 Tom "spot" Callaway <tcallawa at redhat.com> 2.1-2
- add desktop file and icon
- fix 32bit build (thanks to Lubomir Rintel)

* Wed Dec 3 2008 Tom "spot" Callaway <tcallawa at redhat.com> 2.1-1
- Initial package for Fedora


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/SolarModel/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	12 Jan 2009 16:17:12 -0000	1.1
+++ sources	12 Jan 2009 16:43:49 -0000	1.2
@@ -0,0 +1,4 @@
+16a81adc25b4c792cc0211fde3208959  SolarModel_src_2_1.zip
+9ed57377d277819ef25b5d0c082a0b95  SolarModel.png
+91fa848e2720887f010660aad54f66f6  config.dat
+7cdaa99e0da6713e7384c21e45b1fd52  data.dat



From spot at fedoraproject.org  Mon Jan 12 16:44:20 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Mon, 12 Jan 2009 16:44:20 +0000 (UTC)
Subject: rpms/SolarModel/F-9 SolarModel-2.1-Fedora.patch, NONE,
	1.1 SolarModel.desktop, NONE, 1.1 SolarModel.spec, NONE,
	1.1 sources, 1.1, 1.2
Message-ID: <20090112164420.7C99E70123@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/SolarModel/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24446/F-9

Modified Files:
	sources 
Added Files:
	SolarModel-2.1-Fedora.patch SolarModel.desktop SolarModel.spec 
Log Message:
initial branching

SolarModel-2.1-Fedora.patch:

--- NEW FILE SolarModel-2.1-Fedora.patch ---
diff -up SolarModel_src/GameMain.cpp.Fedora SolarModel_src/GameMain.cpp
--- SolarModel_src/GameMain.cpp.Fedora	2008-06-01 06:29:58.000000000 -0400
+++ SolarModel_src/GameMain.cpp	2009-01-05 17:15:52.000000000 -0500
@@ -109,7 +109,7 @@ void GameInit()
 
 	// Maps setup
 
-	Game.FS->addZipFileArchive("data.dat", true, false);
+	Game.FS->addZipFileArchive("/usr/share/SolarModel/data.dat", true, false);
 
 	Game.Map->Load("maps/sun.xml");
 	Game.Map->Load("maps/mercury.xml");
@@ -479,7 +479,7 @@ void ProcessEvent_GUI_ButtonClicked_Opti
 	// reading options from config file
 
 	GameStruct conf;
-	GameConfig::Load("config.dat", &conf);
+	GameConfig::Load("/usr/share/SolarModel/config.dat", &conf);
 
 	// creating window
 
@@ -1174,7 +1174,7 @@ void ProcessSysInfo()
 	Game.OS->getSystemMemory(&mem_total, &mem_avail);
 
 	wchar_t ss[1024];
-	_snwprintf(ss, sizeof(ss),
+	swprintf(ss, (sizeof(ss)/sizeof(ss[0])),
 		L"FPS:  %03u            "
 		L"POLYGONS DRAWN:  %06u            "
 		L"RENDERER:  %ls\n"
@@ -1384,4 +1384,4 @@ void GameDone()
 {
 	if (mapdesc) delete mapdesc;
 	gameMeasurer.Done();
-}
\ No newline at end of file
+}
diff -up SolarModel_src/GameMeasurer.cpp.Fedora SolarModel_src/GameMeasurer.cpp
--- SolarModel_src/GameMeasurer.cpp.Fedora	2008-05-31 01:34:54.000000000 -0400
+++ SolarModel_src/GameMeasurer.cpp	2009-01-05 17:16:25.000000000 -0500
@@ -298,23 +298,23 @@ core::stringw GameMeasurer::GetDistanceA
 
 	if (distanceKM < 100)
 	{
-		_snwprintf(s, sizeof(s), L"%.0lf m", distanceKM*1000.0f);
+		swprintf(s, (sizeof(s)/sizeof(s[0])), L"%.0lf m", distanceKM*1000.0f);
 	}
 	else
 	{
 		// 1 au == 149,597,871 km
 		wchar_t au[512];
-		_snwprintf(au, sizeof(au), L" (%.3lf au)",
+		swprintf(au, (sizeof(au)/sizeof(au[0])), L" (%.3lf au)",
 			distanceKM/149597871.0f);
 
 		// 1 ly == 9,460,730,472,581 km
 		wchar_t ly[512];
-		_snwprintf(ly, sizeof(ly), L" (%.3lf ly)",
+		swprintf(ly, (sizeof(ly)/sizeof(ly[0])), L" (%.3lf ly)",
 			distanceKM/9460730472581.0f);
 
-		_snwprintf(s, sizeof(s), L"%.0lf km%s%s",
-			distanceKM, distanceKM>149598?au:L"", distanceKM>9460730473?ly:L"");
+		swprintf(s, (sizeof(s)/sizeof(s[0])), L"%.0lf km%s%s",
+			distanceKM, distanceKM>149598?au:L"", distanceKM>9460730473LL?ly:L"");
 	}
 
 	return core::stringw(s);
-}
\ No newline at end of file
+}
diff -up SolarModel_src/Makefile.Fedora SolarModel_src/Makefile
--- SolarModel_src/Makefile.Fedora	2008-05-31 02:29:00.000000000 -0400
+++ SolarModel_src/Makefile	2009-01-05 17:16:03.000000000 -0500
@@ -1,14 +1,11 @@
 # Makefile for SolarModel
 
 Target = SolarModel
-Sources = GameAnimatedMeshObject.cpp GameBillboardObject.cpp GameConfig.cpp GameCore.cpp GameEventReceiver.cpp GameGlobals.cpp GameLightObject.cpp GameMain.cpp GameMap.cpp GameMapDescription.cpp GameObject.cpp GameSkyBoxObject.cpp GamePointcloudObject.cpp GameMeshObject.cpp GameMeasurer.cpp
-
-# Paths
-IRRLICHT_HOME = $(HOME)/irrlicht/svn-plain
+Sources = GameAnimatedMeshObject.cpp GameBillboardObject.cpp GameConfig.cpp GameCore.cpp GameEventReceiver.cpp GameGlobals.cpp GameLightObject.cpp GameMain.cpp GameMap.cpp GameMapDescription.cpp GameObject.cpp GameSkyboxObject.cpp GamePointcloudObject.cpp GameMeshObject.cpp GameMeasurer.cpp
 
 # general compiler settings
-CPPFLAGS = -I$(IRRLICHT_HOME)/include -I/usr/X11R6/include
-CXXFLAGS = -O3 -ffast-math
+CPPFLAGS = -I/usr/include/irrlicht
+CXXFLAGS = -ffast-math $(RPM_OPT_FLAGS)
 #CXXFLAGS = -g -Wall
 
 #default target is Linux
@@ -19,7 +16,7 @@ LIBSELECT=64
 endif
 
 # target specific settings
-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L$(IRRLICHT_HOME)/lib/Linux -lIrrlicht -lGL -lGLU -lXxf86vm -lXext -lX11
+all_linux: LDFLAGS = -lIrrlicht -lGL -lGLU -lXxf86vm -lXext -lX11
 all_linux clean_linux: SYSTEM=Linux
 all_win32: LDFLAGS = -L$(IRRLICHT_HOME)/lib/Win32-gcc -lIrrlicht -lopengl32 -lglu32 -lm
 all_win32 clean_win32: SYSTEM=Win32-gcc


--- NEW FILE SolarModel.desktop ---
[Desktop Entry]
Version=1.0
Name=SolarModel
GenericName=Solar System simulation
Comment=A 3D Real-Time Solar System Simulation
Exec=SolarModel
Icon=SolarModel
StartupNotify=false
Terminal=false
Type=Application
Categories=Graphics;
X-Desktop-File-Install-Version=0.15


--- NEW FILE SolarModel.spec ---
Name:		SolarModel
Summary: 	Real-time 3D Solar System simulation
Version:	2.1
Release:	2%{?dist}
License:	GPL+
Group:		System Environment/Base
Source0:	http://downloads.sourceforge.net/solarmodel/%{name}_src_2_1.zip
# Upstream only has these .dat files in the binary zip file for 2.1
# http://downloads.sourceforge.net/solarmodel/SolarModel_bin_2_1.zip
Source1:	config.dat
Source2:	data.dat
Source3:	SolarModel.desktop
Source4:	SolarModel.png
# Use system locations for libraries, headers
# Use RPM_OPT_FLAGS
# Fix swprintf/Linux related issues
Patch0:		SolarModel-2.1-Fedora.patch
URL:		http://www.ffsoftworks.com/solarmodel.php
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:	irrlicht-devel, libXext-devel, libX11-devel, desktop-file-utils

%description
Solar Model provides realtime modeling of the solar system. It allows the user 
to navigate in space, to control time counting (speed-up time flow) and 
estimate real movement of space bodies like planets, dwarf planets and moons; 
estimate its nowadays positions in space. You may select two possible views: 
Solar System view or Milky Way galaxy view. It also allows the user to bind 
the camera to space objects (for example, you can look from the Moon onto Earth 
in real-time flow). 

%prep
%setup -q -n %{name}_src
%patch0 -p1 -b .Fedora

for i in _dev/*.txt "_dev/map/*.txt"; do
	sed -i 's/\r//' $i
done
iconv -o _dev/Changelog.txt.iso88591 -f iso88591 -t utf8 _dev/Changelog.txt
mv _dev/Changelog.txt.iso88591 _dev/Changelog.txt

%build
make %{_smp_mflags}

%install
rm -rf %{buildroot}
mkdir -p %{buildroot}%{_bindir}
install -m0755 SolarModel %{buildroot}%{_bindir}
mkdir -p %{buildroot}%{_datadir}/%{name}
mkdir -p %{buildroot}%{_datadir}/pixmaps
install -p -m0644 %{SOURCE1} %{buildroot}%{_datadir}/%{name}
install	-p -m0644 %{SOURCE2} %{buildroot}%{_datadir}/%{name}
install -p -m0644 %{SOURCE4} %{buildroot}%{_datadir}/pixmaps

mkdir -p %{buildroot}%{_datadir}/applications
desktop-file-install --dir %{buildroot}%{_datadir}/applications %{SOURCE3}


%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc _dev/Changelog.txt _dev/License.txt _dev/Readme.txt _dev/map/* _dev/num/*
%{_bindir}/%{name}
%{_datadir}/%{name}/
%{_datadir}/applications/*.desktop
%{_datadir}/pixmaps/SolarModel.png

%changelog
* Mon Jan 5 2009 Tom "spot" Callaway <tcallawa at redhat.com> 2.1-2
- add desktop file and icon
- fix 32bit build (thanks to Lubomir Rintel)

* Wed Dec 3 2008 Tom "spot" Callaway <tcallawa at redhat.com> 2.1-1
- Initial package for Fedora


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/SolarModel/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	12 Jan 2009 16:17:12 -0000	1.1
+++ sources	12 Jan 2009 16:43:50 -0000	1.2
@@ -0,0 +1,4 @@
+16a81adc25b4c792cc0211fde3208959  SolarModel_src_2_1.zip
+9ed57377d277819ef25b5d0c082a0b95  SolarModel.png
+91fa848e2720887f010660aad54f66f6  config.dat
+7cdaa99e0da6713e7384c21e45b1fd52  data.dat



From mhlavink at fedoraproject.org  Mon Jan 12 16:58:21 2009
From: mhlavink at fedoraproject.org (Michal Hlavinka)
Date: Mon, 12 Jan 2009 16:58:21 +0000 (UTC)
Subject: rpms/ecryptfs-utils/devel ecryptfs-utils-68-headn1.patch, NONE,
	1.1 .cvsignore, 1.19, 1.20 ecryptfs-utils.spec, 1.33,
	1.34 sources, 1.20, 1.21
Message-ID: <20090112165821.45C9270123@cvs1.fedora.phx.redhat.com>

Author: mhlavink

Update of /cvs/extras/rpms/ecryptfs-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25830

Modified Files:
	.cvsignore ecryptfs-utils.spec sources 
Added Files:
	ecryptfs-utils-68-headn1.patch 
Log Message:
updated to 68
fix #478464 - /usr/bin/ecryptfs-setup-private errors out


ecryptfs-utils-68-headn1.patch:

--- NEW FILE ecryptfs-utils-68-headn1.patch ---
diff -up ecryptfs-utils-68/src/utils/ecryptfs-setup-private.headn1 ecryptfs-utils-68/src/utils/ecryptfs-setup-private
--- ecryptfs-utils-68/src/utils/ecryptfs-setup-private.headn1	2008-12-22 23:23:24.000000000 +0100
+++ ecryptfs-utils-68/src/utils/ecryptfs-setup-private	2009-01-12 17:36:20.386755719 +0100
@@ -198,13 +198,13 @@ if [ -z "$LOGINPASS" ] && [ "$BOOTSTRAP"
 	while [ $tries -lt $PW_ATTEMPTS ]; do
 		stty -echo
 		echo -n "$MESSAGE: "
-		LOGINPASS=`line`
+               LOGINPASS=`head -n1`
 		stty $stty_orig
 		echo
 		if [ $WRAPPING_PASS != "LOGIN" ]; then
 			stty -echo
 			echo -n "$MESSAGE (again): "
-			LOGINPASS2=`line`
+                       LOGINPASS2=`head -n1`
 			stty $stty_orig
 			echo
 			if [ "$LOGINPASS" != "$LOGINPASS2" ]; then
@@ -239,7 +239,7 @@ if [ -z "$MOUNTPASS" ]; then
 	while [ $tries -lt $PW_ATTEMPTS ]; do
 		stty -echo
 		echo -n "Enter your mount passphrase [leave blank to generate one]: "
-		MOUNTPASS=`line`
+               MOUNTPASS=`head -n1`
 		stty $stty_orig
 		echo
 		if [ -z "$MOUNTPASS" ]; then
@@ -249,7 +249,7 @@ if [ -z "$MOUNTPASS" ]; then
 		else
 			stty -echo
 			echo -n "Enter your mount passphrase (again): "
-			MOUNTPASS2=`line`
+                       MOUNTPASS2=`head -n1`
 			stty $stty_orig
 			echo
 			if [ "$MOUNTPASS" != "$MOUNTPASS2" ]; then


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ecryptfs-utils/devel/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- .cvsignore	29 Dec 2008 20:03:43 -0000	1.19
+++ .cvsignore	12 Jan 2009 16:57:50 -0000	1.20
@@ -1 +1 @@
-ecryptfs-utils-67.tar.gz
+ecryptfs-utils-68.tar.gz


Index: ecryptfs-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/ecryptfs-utils/devel/ecryptfs-utils.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- ecryptfs-utils.spec	29 Dec 2008 20:36:18 -0000	1.33
+++ ecryptfs-utils.spec	12 Jan 2009 16:57:50 -0000	1.34
@@ -2,8 +2,8 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name: ecryptfs-utils
-Version: 67
-Release: 1%{?dist}
+Version: 68
+Release: 0%{?dist}
 Summary: The eCryptfs mount helper and support libraries
 Group: System Environment/Base
 License: GPLv2+
@@ -14,6 +14,8 @@
 BuildRequires: trousers-devel python python-devel nss-devel
 Conflicts: kernel < 2.6.19
 Patch0: ecryptfs-utils-67-nss3.patch
+#from upstream, required for version <= 68
+Patch1: ecryptfs-utils-68-headn1.patch
 
 %description
 eCryptfs is a stacked cryptographic filesystem that ships in Linux
@@ -45,6 +47,7 @@
 
 %setup -q
 %patch0 -p1 -b .nss3
+%patch1 -p1 -b .headn1
 
 %build
 %configure --disable-rpath --enable-tspi --enable-nss
@@ -81,8 +84,6 @@
 %{_bindir}/ecryptfs-unwrap-passphrase
 %{_bindir}/ecryptfs-wrap-passphrase
 %{_bindir}/ecryptfs-add-passphrase
-%{_bindir}/ecryptfs-zombie-kill
-%{_bindir}/ecryptfs-zombie-list
 %{_bindir}/ecryptfs-generate-tpm-key
 %{_bindir}/ecryptfs-mount-private
 %{_bindir}/ecryptfs-setup-private
@@ -102,8 +103,6 @@
 %{_mandir}/man1/ecryptfs-umount-private.1.gz
 %{_mandir}/man1/ecryptfs-unwrap-passphrase.1.gz
 %{_mandir}/man1/ecryptfs-wrap-passphrase.1.gz
-%{_mandir}/man1/ecryptfs-zombie-kill.1.gz
-%{_mandir}/man1/ecryptfs-zombie-list.1.gz
 %{_mandir}/man1/mount.ecryptfs_private.1.gz
 %{_mandir}/man1/umount.ecryptfs_private.1.gz
 %{_mandir}/man7/ecryptfs.7.gz
@@ -129,6 +128,10 @@
 %{python_sitearch}/ecryptfs-utils/_libecryptfs.so
 
 %changelog
+* Mon Jan 12 2009 Michal Hlavinka <mhlavink at redhat.com> 68-0
+- updated to 68
+- fix #478464 - /usr/bin/ecryptfs-setup-private errors out
+
 * Mon Dec 29 2008 Michal Hlavinka <mhlavink at redhat.com> 67-1
 - bump release for rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ecryptfs-utils/devel/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources	29 Dec 2008 20:03:43 -0000	1.20
+++ sources	12 Jan 2009 16:57:50 -0000	1.21
@@ -1 +1 @@
-0c72ec1328acfa24e2ed299d965e0200  ecryptfs-utils-67.tar.gz
+57428a8bf128bc1f076412c7b6478ca0  ecryptfs-utils-68.tar.gz



From dwalsh at fedoraproject.org  Mon Jan 12 16:59:31 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Mon, 12 Jan 2009 16:59:31 +0000 (UTC)
Subject: rpms/selinux-policy/devel modules-minimum.conf, 1.8,
	1.9 modules-targeted.conf, 1.110, 1.111 policy-20090105.patch,
	1.3, 1.4 selinux-policy.spec, 1.763, 1.764
Message-ID: <20090112165931.3A62A70123@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26113

Modified Files:
	modules-minimum.conf modules-targeted.conf 
	policy-20090105.patch selinux-policy.spec 
Log Message:
* Thu Jan 8 2009 Dan Walsh <dwalsh at redhat.com> 3.6.2-3
- Allow cups_pdf_t write to nfs_t



Index: modules-minimum.conf
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/modules-minimum.conf,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- modules-minimum.conf	11 Dec 2008 15:21:56 -0000	1.8
+++ modules-minimum.conf	12 Jan 2009 16:59:00 -0000	1.9
@@ -607,6 +607,13 @@
 i18n_input = off
 
 
+# Layer: services
+# Module: jabber
+#
+# Jabber instant messaging server
+# 
+jabber = module
+
 # Layer: apps
 # Module: java
 #


Index: modules-targeted.conf
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/modules-targeted.conf,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -r1.110 -r1.111
--- modules-targeted.conf	11 Dec 2008 15:21:56 -0000	1.110
+++ modules-targeted.conf	12 Jan 2009 16:59:00 -0000	1.111
@@ -607,6 +607,13 @@
 i18n_input = off
 
 
+# Layer: services
+# Module: jabber
+#
+# Jabber instant messaging server
+# 
+jabber = module
+
 # Layer: apps
 # Module: java
 #

policy-20090105.patch:

Index: policy-20090105.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-20090105.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- policy-20090105.patch	6 Jan 2009 14:46:21 -0000	1.3
+++ policy-20090105.patch	12 Jan 2009 16:59:00 -0000	1.4
@@ -1456,6 +1456,15 @@
  libs_read_lib_files(awstats_t)
  
  miscfiles_read_localization(awstats_t)
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/cdrecord.fc serefpolicy-3.6.2/policy/modules/apps/cdrecord.fc
+--- nsaserefpolicy/policy/modules/apps/cdrecord.fc	2008-08-07 11:15:03.000000000 -0400
++++ serefpolicy-3.6.2/policy/modules/apps/cdrecord.fc	2009-01-06 10:53:56.000000000 -0500
+@@ -2,4 +2,5 @@
+ # /usr
+ #
+ /usr/bin/cdrecord	--	gen_context(system_u:object_r:cdrecord_exec_t,s0)
++/usr/bin/growisoifs	--	gen_context(system_u:object_r:cdrecord_exec_t,s0)
+ 
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/games.if serefpolicy-3.6.2/policy/modules/apps/games.if
 --- nsaserefpolicy/policy/modules/apps/games.if	2008-11-11 16:13:42.000000000 -0500
 +++ serefpolicy-3.6.2/policy/modules/apps/games.if	2009-01-05 17:54:58.000000000 -0500
@@ -2274,8 +2283,8 @@
 +/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.6.2/policy/modules/apps/mozilla.if
 --- nsaserefpolicy/policy/modules/apps/mozilla.if	2008-11-11 16:13:41.000000000 -0500
-+++ serefpolicy-3.6.2/policy/modules/apps/mozilla.if	2009-01-05 17:54:58.000000000 -0500
-@@ -82,8 +82,7 @@
++++ serefpolicy-3.6.2/policy/modules/apps/mozilla.if	2009-01-12 11:19:04.000000000 -0500
+@@ -82,8 +83,7 @@
  		type mozilla_home_t;
  	')
  
@@ -2287,7 +2296,7 @@
  
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/mozilla.te serefpolicy-3.6.2/policy/modules/apps/mozilla.te
 --- nsaserefpolicy/policy/modules/apps/mozilla.te	2008-11-11 16:13:42.000000000 -0500
-+++ serefpolicy-3.6.2/policy/modules/apps/mozilla.te	2009-01-05 17:54:58.000000000 -0500
++++ serefpolicy-3.6.2/policy/modules/apps/mozilla.te	2009-01-12 11:19:32.000000000 -0500
 @@ -105,6 +105,7 @@
  # Should not need other ports
  corenet_dontaudit_tcp_sendrecv_generic_port(mozilla_t)
@@ -2296,6 +2305,24 @@
  
  dev_read_urand(mozilla_t)
  dev_read_rand(mozilla_t)
+@@ -128,6 +129,7 @@
+ fs_rw_tmpfs_files(mozilla_t)
+ 
+ term_dontaudit_getattr_pty_dirs(mozilla_t)
++term_use_all_user_ttys(mozilla_t)
+ 
+ logging_send_syslog_msg(mozilla_t)
+ 
+@@ -263,5 +265,9 @@
+ ')
+ 
+ optional_policy(`
++	nsplugin_manage_rw(mozilla_t)
++')
++
++optional_policy(`
+ 	thunderbird_domtrans(mozilla_t)
+ ')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/mplayer.fc serefpolicy-3.6.2/policy/modules/apps/mplayer.fc
 --- nsaserefpolicy/policy/modules/apps/mplayer.fc	2008-11-11 16:13:42.000000000 -0500
 +++ serefpolicy-3.6.2/policy/modules/apps/mplayer.fc	2009-01-05 17:54:58.000000000 -0500
@@ -2357,8 +2384,8 @@
 +/usr/lib(64)?/mozilla/plugins-wrapped(/.*)?			gen_context(system_u:object_r:nsplugin_rw_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/nsplugin.if serefpolicy-3.6.2/policy/modules/apps/nsplugin.if
 --- nsaserefpolicy/policy/modules/apps/nsplugin.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.2/policy/modules/apps/nsplugin.if	2009-01-05 17:54:58.000000000 -0500
-@@ -0,0 +1,248 @@
++++ serefpolicy-3.6.2/policy/modules/apps/nsplugin.if	2009-01-12 11:24:07.000000000 -0500
+@@ -0,0 +1,250 @@
 +
 +## <summary>policy for nsplugin</summary>
 +
@@ -2534,6 +2561,8 @@
 +	')
 +
 +	domtrans_pattern($1, nsplugin_exec_t, nsplugin_t)
++	allow $1 nsplugin_t:unix_stream_socket connectto;
++	allow nsplugin_t $1:process signal;
 +')
 +#######################################
 +## <summary>
@@ -4990,7 +5019,7 @@
 +dontaudit can_change_object_identity can_change_object_identity:key link;
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.fc serefpolicy-3.6.2/policy/modules/kernel/files.fc
 --- nsaserefpolicy/policy/modules/kernel/files.fc	2009-01-05 15:39:38.000000000 -0500
-+++ serefpolicy-3.6.2/policy/modules/kernel/files.fc	2009-01-05 17:54:58.000000000 -0500
++++ serefpolicy-3.6.2/policy/modules/kernel/files.fc	2009-01-07 15:44:45.000000000 -0500
 @@ -8,6 +8,8 @@
  /initrd\.img.*		-l	gen_context(system_u:object_r:boot_t,s0)
  /vmlinuz.*		-l	gen_context(system_u:object_r:boot_t,s0)
@@ -5008,6 +5037,15 @@
  /etc/issue		--	gen_context(system_u:object_r:etc_runtime_t,s0)
  /etc/issue\.net		--	gen_context(system_u:object_r:etc_runtime_t,s0)
  /etc/localtime		-l	gen_context(system_u:object_r:etc_t,s0)
+@@ -228,6 +231,8 @@
+ 
+ /var/ftp/etc(/.*)?		gen_context(system_u:object_r:etc_t,s0)
+ 
++/var/named/chroot/etc(/.*)? 	gen_context(system_u:object_r:etc_t,s0)
++
+ /var/lib(/.*)?			gen_context(system_u:object_r:var_lib_t,s0)
+ 
+ /var/lib/nfs/rpc_pipefs(/.*)?	<<none>>
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.if serefpolicy-3.6.2/policy/modules/kernel/files.if
 --- nsaserefpolicy/policy/modules/kernel/files.if	2009-01-05 15:39:38.000000000 -0500
 +++ serefpolicy-3.6.2/policy/modules/kernel/files.if	2009-01-05 17:54:58.000000000 -0500
@@ -6539,7 +6577,7 @@
 -')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/roles/staff.te serefpolicy-3.6.2/policy/modules/roles/staff.te
 --- nsaserefpolicy/policy/modules/roles/staff.te	2008-11-11 16:13:47.000000000 -0500
-+++ serefpolicy-3.6.2/policy/modules/roles/staff.te	2009-01-05 17:54:59.000000000 -0500
++++ serefpolicy-3.6.2/policy/modules/roles/staff.te	2009-01-06 10:51:51.000000000 -0500
 @@ -8,112 +8,32 @@
  
  role staff_r;
@@ -9039,7 +9077,7 @@
  optional_policy(`
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bind.fc serefpolicy-3.6.2/policy/modules/services/bind.fc
 --- nsaserefpolicy/policy/modules/services/bind.fc	2009-01-05 15:39:43.000000000 -0500
-+++ serefpolicy-3.6.2/policy/modules/services/bind.fc	2009-01-05 17:54:59.000000000 -0500
++++ serefpolicy-3.6.2/policy/modules/services/bind.fc	2009-01-07 15:44:12.000000000 -0500
 @@ -1,17 +1,22 @@
  /etc/rc\.d/init\.d/named --	gen_context(system_u:object_r:named_initrc_exec_t,s0)
 +/etc/rc\.d/init\.d/unbound	--	gen_context(system_u:object_r:named_initrc_exec_t,s0)
@@ -9063,6 +9101,14 @@
  
  ifdef(`distro_debian',`
  /etc/bind(/.*)?			gen_context(system_u:object_r:named_zone_t,s0)
+@@ -40,7 +45,6 @@
+ /var/named/data(/.*)?		gen_context(system_u:object_r:named_cache_t,s0)
+ /var/named/named\.ca	--	gen_context(system_u:object_r:named_conf_t,s0)
+ /var/named/chroot(/.*)?		gen_context(system_u:object_r:named_conf_t,s0)
+-/var/named/chroot/etc(/.*)? 	gen_context(system_u:object_r:named_conf_t,s0)
+ /var/named/chroot/etc/rndc\.key -- gen_context(system_u:object_r:dnssec_t,s0)
+ /var/named/chroot/var/run/named.* gen_context(system_u:object_r:named_var_run_t,s0)
+ /var/named/chroot/var/tmp(/.*)? gen_context(system_u:object_r:named_cache_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bind.if serefpolicy-3.6.2/policy/modules/services/bind.if
 --- nsaserefpolicy/policy/modules/services/bind.if	2008-11-11 16:13:46.000000000 -0500
 +++ serefpolicy-3.6.2/policy/modules/services/bind.if	2009-01-05 17:54:59.000000000 -0500
@@ -10523,7 +10569,7 @@
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.te serefpolicy-3.6.2/policy/modules/services/cups.te
 --- nsaserefpolicy/policy/modules/services/cups.te	2009-01-05 15:39:43.000000000 -0500
-+++ serefpolicy-3.6.2/policy/modules/services/cups.te	2009-01-05 17:54:59.000000000 -0500
++++ serefpolicy-3.6.2/policy/modules/services/cups.te	2009-01-12 11:25:36.000000000 -0500
 @@ -20,9 +20,18 @@
  type cupsd_etc_t;
  files_config_file(cupsd_etc_t)
@@ -10850,7 +10896,7 @@
  read_lnk_files_pattern(hplip_t, hplip_etc_t, hplip_etc_t)
  files_search_etc(hplip_t)
  
-+fs_read_anon_inodefs_files(hplip_t)
++fs_rw_anon_inodefs_files(hplip_t)
 +
 +read_files_pattern(cupsd_t, hplip_etc_t, hplip_etc_t)
 +
@@ -10878,7 +10924,7 @@
  
  optional_policy(`
  	dbus_system_bus_client(hplip_t)
-@@ -635,3 +709,39 @@
+@@ -635,3 +709,49 @@
  optional_policy(`
  	udev_read_db(ptal_t)
  ')
@@ -10913,6 +10959,16 @@
 +userdom_manage_user_home_content_dirs(cups_pdf_t)
 +userdom_manage_user_home_content_files(cups_pdf_t)
 +
++tunable_policy(`use_nfs_home_dirs',`
++	fs_manage_nfs_dirs(cups_pdf_t)
++	fs_manage_nfs_files(cups_pdf_t)
++')
++
++tunable_policy(`use_samba_home_dirs',`
++	fs_manage_cifs_dirs(cups_pdf_t)
++	fs_manage_cifs_files(cups_pdf_t)
++')
++
 +lpd_manage_spool(cups_pdf_t)
 +
 +manage_files_pattern(cups_pdf_t, cupsd_log_t, cupsd_log_t)
@@ -12944,16 +13000,18 @@
 +files_type(mailscanner_spool_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mta.fc serefpolicy-3.6.2/policy/modules/services/mta.fc
 --- nsaserefpolicy/policy/modules/services/mta.fc	2008-09-12 10:48:05.000000000 -0400
-+++ serefpolicy-3.6.2/policy/modules/services/mta.fc	2009-01-05 17:54:59.000000000 -0500
++++ serefpolicy-3.6.2/policy/modules/services/mta.fc	2009-01-08 13:25:41.000000000 -0500
 @@ -1,4 +1,4 @@
 -/bin/mail		--	gen_context(system_u:object_r:sendmail_exec_t,s0)
 +/bin/mail(x)?		--	gen_context(system_u:object_r:sendmail_exec_t,s0)
  
  /etc/aliases		--	gen_context(system_u:object_r:etc_aliases_t,s0)
  /etc/aliases\.db	--	gen_context(system_u:object_r:etc_aliases_t,s0)
-@@ -11,9 +11,11 @@
+@@ -10,10 +10,13 @@
+ ')
  
  /usr/lib(64)?/sendmail	--	gen_context(system_u:object_r:sendmail_exec_t,s0)
++/usr/lib/courier/bin/sendmail	--	gen_context(system_u:object_r:sendmail_exec_t,s0)
  
 +/usr/bin/esmtp    		-- gen_context(system_u:object_r:sendmail_exec_t,s0)
  /usr/sbin/rmail		--	gen_context(system_u:object_r:sendmail_exec_t,s0)
@@ -12963,7 +13021,7 @@
  
  /var/mail(/.*)?			gen_context(system_u:object_r:mail_spool_t,s0)
  
-@@ -22,7 +24,3 @@
+@@ -22,7 +25,3 @@
  /var/spool/imap(/.*)?		gen_context(system_u:object_r:mail_spool_t,s0)
  /var/spool/(client)?mqueue(/.*)? gen_context(system_u:object_r:mqueue_spool_t,s0)
  /var/spool/mail(/.*)?		gen_context(system_u:object_r:mail_spool_t,s0)
@@ -16452,8 +16510,16 @@
  /usr/sbin/postkick	--	gen_context(system_u:object_r:postfix_master_exec_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postfix.if serefpolicy-3.6.2/policy/modules/services/postfix.if
 --- nsaserefpolicy/policy/modules/services/postfix.if	2009-01-05 15:39:43.000000000 -0500
-+++ serefpolicy-3.6.2/policy/modules/services/postfix.if	2009-01-05 17:54:59.000000000 -0500
-@@ -174,9 +174,8 @@
++++ serefpolicy-3.6.2/policy/modules/services/postfix.if	2009-01-07 13:21:46.000000000 -0500
+@@ -46,6 +46,7 @@
+ 
+ 	allow postfix_$1_t postfix_etc_t:dir list_dir_perms;
+ 	read_files_pattern(postfix_$1_t, postfix_etc_t, postfix_etc_t)
++	read_lnk_files_pattern(postfix_$1_t, postfix_etc_t, postfix_etc_t)
+ 
+ 	can_exec(postfix_$1_t, postfix_$1_exec_t)
+ 
+@@ -174,9 +175,8 @@
  		type postfix_etc_t;
  	')
  
@@ -16465,7 +16531,7 @@
  	files_search_etc($1)
  ')
  
-@@ -378,7 +377,7 @@
+@@ -378,7 +378,7 @@
  ##	</summary>
  ## </param>
  #
@@ -16474,7 +16540,7 @@
  	gen_require(`
  		type postfix_private_t;
  	')
-@@ -389,6 +388,25 @@
+@@ -389,6 +389,25 @@
  
  ########################################
  ## <summary>
@@ -16500,7 +16566,7 @@
  ##	Execute the master postfix program in the
  ##	postfix_master domain.
  ## </summary>
-@@ -418,10 +436,10 @@
+@@ -418,10 +437,10 @@
  #
  interface(`postfix_search_spool',`
  	gen_require(`
@@ -16513,7 +16579,7 @@
  	files_search_spool($1)
  ')
  
-@@ -437,11 +455,30 @@
+@@ -437,11 +456,30 @@
  #
  interface(`postfix_list_spool',`
  	gen_require(`
@@ -16546,7 +16612,7 @@
  ')
  
  ########################################
-@@ -456,16 +493,16 @@
+@@ -456,16 +494,16 @@
  #
  interface(`postfix_read_spool_files',`
  	gen_require(`
@@ -16566,7 +16632,7 @@
  ## </summary>
  ## <param name="domain">
  ##	<summary>
-@@ -475,11 +512,11 @@
+@@ -475,11 +513,11 @@
  #
  interface(`postfix_manage_spool_files',`
  	gen_require(`
@@ -16580,7 +16646,7 @@
  ')
  
  ########################################
-@@ -500,3 +537,23 @@
+@@ -500,3 +538,23 @@
  
  	typeattribute $1 postfix_user_domtrans;
  ')
@@ -16606,7 +16672,7 @@
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postfix.te serefpolicy-3.6.2/policy/modules/services/postfix.te
 --- nsaserefpolicy/policy/modules/services/postfix.te	2009-01-05 15:39:43.000000000 -0500
-+++ serefpolicy-3.6.2/policy/modules/services/postfix.te	2009-01-05 17:54:59.000000000 -0500
++++ serefpolicy-3.6.2/policy/modules/services/postfix.te	2009-01-07 13:20:40.000000000 -0500
 @@ -6,6 +6,15 @@
  # Declarations
  #
@@ -22147,7 +22213,7 @@
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/authlogin.te serefpolicy-3.6.2/policy/modules/system/authlogin.te
 --- nsaserefpolicy/policy/modules/system/authlogin.te	2008-11-11 16:13:48.000000000 -0500
-+++ serefpolicy-3.6.2/policy/modules/system/authlogin.te	2009-01-05 17:54:59.000000000 -0500
++++ serefpolicy-3.6.2/policy/modules/system/authlogin.te	2009-01-12 11:15:15.000000000 -0500
 @@ -12,7 +12,7 @@
  
  type chkpwd_t, can_read_shadow_passwords;
@@ -22191,6 +22257,15 @@
  ifdef(`distro_ubuntu',`
  	optional_policy(`
  		unconfined_domain(pam_t)
+@@ -183,7 +196,7 @@
+ # PAM console local policy
+ #
+ 
+-allow pam_console_t self:capability { chown fowner fsetid };
++allow pam_console_t self:capability { dac_override dac_read_search chown fowner fsetid };
+ dontaudit pam_console_t self:capability sys_tty_config;
+ 
+ allow pam_console_t self:process { sigchld sigkill sigstop signull signal };
 @@ -201,6 +214,8 @@
  dev_read_sysfs(pam_console_t)
  dev_getattr_apm_bios_dev(pam_console_t)
@@ -22229,7 +22304,7 @@
  /sbin/partx		--	gen_context(system_u:object_r:fsadm_exec_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/fstools.te serefpolicy-3.6.2/policy/modules/system/fstools.te
 --- nsaserefpolicy/policy/modules/system/fstools.te	2009-01-05 15:39:43.000000000 -0500
-+++ serefpolicy-3.6.2/policy/modules/system/fstools.te	2009-01-05 17:54:59.000000000 -0500
++++ serefpolicy-3.6.2/policy/modules/system/fstools.te	2009-01-12 11:11:00.000000000 -0500
 @@ -97,6 +97,10 @@
  fs_getattr_tmpfs_dirs(fsadm_t)
  fs_read_tmpfs_symlinks(fsadm_t)
@@ -23596,7 +23671,7 @@
  ## <param name="domain">
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/modutils.te serefpolicy-3.6.2/policy/modules/system/modutils.te
 --- nsaserefpolicy/policy/modules/system/modutils.te	2009-01-05 15:39:43.000000000 -0500
-+++ serefpolicy-3.6.2/policy/modules/system/modutils.te	2009-01-05 17:54:59.000000000 -0500
++++ serefpolicy-3.6.2/policy/modules/system/modutils.te	2009-01-12 11:28:35.000000000 -0500
 @@ -42,7 +42,7 @@
  # insmod local policy
  #
@@ -23736,7 +23811,7 @@
  
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/mount.te serefpolicy-3.6.2/policy/modules/system/mount.te
 --- nsaserefpolicy/policy/modules/system/mount.te	2009-01-05 15:39:43.000000000 -0500
-+++ serefpolicy-3.6.2/policy/modules/system/mount.te	2009-01-05 17:54:59.000000000 -0500
++++ serefpolicy-3.6.2/policy/modules/system/mount.te	2009-01-12 11:28:54.000000000 -0500
 @@ -18,17 +18,18 @@
  init_system_domain(mount_t,mount_exec_t)
  role system_r types mount_t;
@@ -23769,7 +23844,7 @@
  
  allow mount_t mount_loopback_t:file read_file_perms;
  
-@@ -47,12 +49,17 @@
+@@ -47,12 +49,18 @@
  
  files_tmp_filetrans(mount_t,mount_tmp_t,{ file dir })
  
@@ -23780,6 +23855,7 @@
  kernel_read_kernel_sysctls(mount_t)
  kernel_dontaudit_getattr_core_if(mount_t)
 +kernel_search_debugfs(mount_t)
++kernel_setsched(mount_t)
  
  dev_getattr_all_blk_files(mount_t)
  dev_list_all_dev_nodes(mount_t)
@@ -23787,7 +23863,7 @@
  dev_rw_lvm_control(mount_t)
  dev_dontaudit_getattr_all_chr_files(mount_t)
  dev_dontaudit_getattr_memory_dev(mount_t)
-@@ -62,16 +69,19 @@
+@@ -62,16 +70,19 @@
  storage_raw_write_fixed_disk(mount_t)
  storage_raw_read_removable_device(mount_t)
  storage_raw_write_removable_device(mount_t)
@@ -23810,7 +23886,7 @@
  
  term_use_all_terms(mount_t)
  
-@@ -79,6 +89,7 @@
+@@ -79,6 +90,7 @@
  corecmd_exec_bin(mount_t)
  
  domain_use_interactive_fds(mount_t)
@@ -23818,7 +23894,7 @@
  
  files_search_all(mount_t)
  files_read_etc_files(mount_t)
-@@ -87,7 +98,7 @@
+@@ -87,7 +99,7 @@
  files_mounton_all_mountpoints(mount_t)
  files_unmount_rootfs(mount_t)
  # These rules need to be generalized.  Only admin, initrc should have it:
@@ -23827,7 +23903,7 @@
  files_mount_all_file_type_fs(mount_t)
  files_unmount_all_file_type_fs(mount_t)
  # for when /etc/mtab loses its type
-@@ -100,6 +111,8 @@
+@@ -100,6 +112,8 @@
  init_use_fds(mount_t)
  init_use_script_ptys(mount_t)
  init_dontaudit_getattr_initctl(mount_t)
@@ -23836,7 +23912,7 @@
  
  auth_use_nsswitch(mount_t)
  
-@@ -116,6 +129,7 @@
+@@ -116,6 +130,7 @@
  seutil_read_config(mount_t)
  
  userdom_use_all_users_fds(mount_t)
@@ -23844,7 +23920,7 @@
  
  ifdef(`distro_redhat',`
  	optional_policy(`
-@@ -133,7 +147,7 @@
+@@ -133,7 +148,7 @@
  
  tunable_policy(`allow_mount_anyfile',`
  	auth_read_all_dirs_except_shadow(mount_t)
@@ -23853,7 +23929,7 @@
  	files_mounton_non_security(mount_t)
  ')
  
-@@ -164,6 +178,8 @@
+@@ -164,6 +179,8 @@
  	fs_search_rpc(mount_t)
  
  	rpc_stub(mount_t)
@@ -23862,7 +23938,7 @@
  ')
  
  optional_policy(`
-@@ -171,6 +187,15 @@
+@@ -171,6 +188,15 @@
  ')
  
  optional_policy(`
@@ -23878,7 +23954,7 @@
  	ifdef(`hide_broken_symptoms',`
  		# for a bug in the X server
  		rhgb_dontaudit_rw_stream_sockets(mount_t)
-@@ -178,6 +203,11 @@
+@@ -178,6 +204,11 @@
  	')
  ')
  
@@ -23890,7 +23966,7 @@
  # for kernel package installation
  optional_policy(`
  	rpm_rw_pipes(mount_t)
-@@ -185,6 +215,7 @@
+@@ -185,6 +216,7 @@
  
  optional_policy(`
  	samba_domtrans_smbmount(mount_t)
@@ -23898,7 +23974,7 @@
  ')
  
  ########################################
-@@ -195,4 +226,26 @@
+@@ -195,4 +227,26 @@
  optional_policy(`
  	files_etc_filetrans_etc_runtime(unconfined_mount_t,file)
  	unconfined_domain(unconfined_mount_t)
@@ -25186,8 +25262,8 @@
  ')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.fc serefpolicy-3.6.2/policy/modules/system/unconfined.fc
 --- nsaserefpolicy/policy/modules/system/unconfined.fc	2008-09-11 16:42:49.000000000 -0400
-+++ serefpolicy-3.6.2/policy/modules/system/unconfined.fc	2009-01-05 17:54:59.000000000 -0500
-@@ -2,15 +2,29 @@
++++ serefpolicy-3.6.2/policy/modules/system/unconfined.fc	2009-01-08 10:06:44.000000000 -0500
+@@ -2,15 +2,28 @@
  # 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
@@ -25225,7 +25301,6 @@
 +/usr/lib(64)?/ghc-[^/]+/ghc-.*  --	gen_context(system_u:object_r:execmem_exec_t,s0)
 +
 +/opt/real/(.*/)?realplay\.bin --	gen_context(system_u:object_r:execmem_exec_t,s0)
-+/usr/bin/gcl 		       --	gen_context(system_u:object_r:execmem_exec_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.if serefpolicy-3.6.2/policy/modules/system/unconfined.if
 --- nsaserefpolicy/policy/modules/system/unconfined.if	2008-11-11 16:13:48.000000000 -0500
 +++ serefpolicy-3.6.2/policy/modules/system/unconfined.if	2009-01-05 17:54:59.000000000 -0500
@@ -25809,7 +25884,7 @@
 +/dev/shm/mono.*		gen_context(system_u:object_r:user_tmpfs_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-3.6.2/policy/modules/system/userdomain.if
 --- nsaserefpolicy/policy/modules/system/userdomain.if	2009-01-05 15:39:43.000000000 -0500
-+++ serefpolicy-3.6.2/policy/modules/system/userdomain.if	2009-01-05 17:54:59.000000000 -0500
++++ serefpolicy-3.6.2/policy/modules/system/userdomain.if	2009-01-06 10:53:21.000000000 -0500
 @@ -30,8 +30,9 @@
  	')
  
@@ -26093,10 +26168,12 @@
 -	gen_require(`
 -		type $1_t;
 -	')
--
++interface(`userdom_basic_networking',`
+ 
 -	allow $1_t self:tcp_socket create_stream_socket_perms;
 -	allow $1_t self:udp_socket create_socket_perms;
-+interface(`userdom_basic_networking',`
++	allow $1 self:tcp_socket create_stream_socket_perms;
++	allow $1 self:udp_socket create_socket_perms;
  
 -	corenet_all_recvfrom_unlabeled($1_t)
 -	corenet_all_recvfrom_netlabel($1_t)
@@ -26108,9 +26185,7 @@
 -	corenet_udp_sendrecv_all_ports($1_t)
 -	corenet_tcp_connect_all_ports($1_t)
 -	corenet_sendrecv_all_client_packets($1_t)
-+	allow $1 self:tcp_socket create_stream_socket_perms;
-+	allow $1 self:udp_socket create_socket_perms;
- 
+-
 -	corenet_all_recvfrom_labeled($1_t, $1_t)
 +	corenet_all_recvfrom_unlabeled($1)
 +	corenet_all_recvfrom_netlabel($1)
@@ -26227,26 +26302,26 @@
 +	kernel_get_sysvipc_info($1_usertype)
  	# Find CDROM devices:
 -	kernel_read_device_sysctls($1_t)
--
--	corecmd_exec_bin($1_t)
 +	kernel_read_device_sysctls($1_usertype)
  
--	corenet_udp_bind_all_nodes($1_t)
--	corenet_udp_bind_generic_port($1_t)
+-	corecmd_exec_bin($1_t)
 +	corenet_udp_bind_all_nodes($1_usertype)
 +	corenet_udp_bind_generic_port($1_usertype)
  
--	dev_read_rand($1_t)
--	dev_write_sound($1_t)
--	dev_read_sound($1_t)
--	dev_read_sound_mixer($1_t)
--	dev_write_sound_mixer($1_t)
+-	corenet_udp_bind_all_nodes($1_t)
+-	corenet_udp_bind_generic_port($1_t)
 +	dev_read_rand($1_usertype)
 +	dev_write_sound($1_usertype)
 +	dev_read_sound($1_usertype)
 +	dev_read_sound_mixer($1_usertype)
 +	dev_write_sound_mixer($1_usertype)
  
+-	dev_read_rand($1_t)
+-	dev_write_sound($1_t)
+-	dev_read_sound($1_t)
+-	dev_read_sound_mixer($1_t)
+-	dev_write_sound_mixer($1_t)
+-
 -	files_exec_etc_files($1_t)
 -	files_search_locks($1_t)
 +	files_exec_etc_files($1_usertype)
@@ -26447,16 +26522,16 @@
 -			postgresql_stream_connect($1_t)
 -			postgresql_tcp_connect($1_t)
 +			postgresql_stream_connect($1_usertype)
-+		')
  		')
-+
-+	optional_policy(`
-+		# to allow monitoring of pcmcia status
-+		pcmcia_read_pid($1_usertype)
  	')
  
  	optional_policy(`
 -		resmgr_stream_connect($1_t)
++		# to allow monitoring of pcmcia status
++		pcmcia_read_pid($1_usertype)
++	')
++
++	optional_policy(`
 +		pcscd_read_pub_files($1_usertype)
 +		pcscd_stream_connect($1_usertype)
  	')
@@ -26672,11 +26747,11 @@
  	auth_role($1_r, $1_t)
 -	auth_search_pam_console_data($1_t)
 +	auth_search_pam_console_data($1_usertype)
++
++	xserver_role($1_r, $1_t)
  
 -	dev_read_sound($1_t)
 -	dev_write_sound($1_t)
-+	xserver_role($1_r, $1_t)
-+
 +	dev_read_sound($1_usertype)
 +	dev_write_sound($1_usertype)
  	# gnome keyring wants to read this.
@@ -26758,7 +26833,7 @@
  	# cjp: why?
  	files_read_kernel_symbol_table($1_t)
  
-@@ -986,37 +1040,43 @@
+@@ -986,37 +1040,47 @@
  		')
  	')
  
@@ -26780,22 +26855,26 @@
  	optional_policy(`
 -		netutils_run_ping_cond($1_t,$1_r)
 -		netutils_run_traceroute_cond($1_t,$1_r)
-+		cron_role($1_r, $1_t)
++		cdrecord_role($1_r, $1_t)
  	')
  
  	optional_policy(`
 -		postgresql_role($1_r,$1_t)
-+		games_rw_data($1_usertype)
++		cron_role($1_r, $1_t)
  	')
  
 -	# Run pppd in pppd_t by default for user
  	optional_policy(`
 -		ppp_run_cond($1_t,$1_r)
-+		gpg_role($1_r, $1_usertype)
++		games_rw_data($1_usertype)
  	')
  
  	optional_policy(`
 -		setroubleshoot_stream_connect($1_t)
++		gpg_role($1_r, $1_usertype)
++	')
++
++	optional_policy(`
 +		java_role_template($1, $1_r, $1_t)
 +	')
 +
@@ -26815,7 +26894,7 @@
  ')
  
  #######################################
-@@ -1050,7 +1110,7 @@
+@@ -1050,7 +1114,7 @@
  #
  template(`userdom_admin_user_template',`
  	gen_require(`
@@ -26824,7 +26903,7 @@
  	')
  
  	##############################
-@@ -1059,8 +1119,7 @@
+@@ -1059,8 +1123,7 @@
  	#
  
  	# Inherit rules for ordinary users.
@@ -26834,7 +26913,7 @@
  
  	domain_obj_id_change_exemption($1_t)
  	role system_r types $1_t;
-@@ -1083,7 +1142,8 @@
+@@ -1083,7 +1146,8 @@
  	# Skip authentication when pam_rootok is specified.
  	allow $1_t self:passwd rootok;
  
@@ -26844,7 +26923,7 @@
  
  	kernel_read_software_raid_state($1_t)
  	kernel_getattr_core_if($1_t)
-@@ -1106,8 +1166,6 @@
+@@ -1106,8 +1170,6 @@
  
  	dev_getattr_generic_blk_files($1_t)
  	dev_getattr_generic_chr_files($1_t)
@@ -26853,7 +26932,7 @@
  	# Allow MAKEDEV to work
  	dev_create_all_blk_files($1_t)
  	dev_create_all_chr_files($1_t)
-@@ -1162,20 +1220,6 @@
+@@ -1162,20 +1224,6 @@
  	# But presently necessary for installing the file_contexts file.
  	seutil_manage_bin_policy($1_t)
  
@@ -26874,7 +26953,7 @@
  	optional_policy(`
  		postgresql_unconfined($1_t)
  	')
-@@ -1221,6 +1265,7 @@
+@@ -1221,6 +1269,7 @@
  	dev_relabel_all_dev_nodes($1)
  
  	files_create_boot_flag($1)
@@ -26882,7 +26961,7 @@
  
  	# Necessary for managing /boot/efi
  	fs_manage_dos_files($1)
-@@ -1286,11 +1331,15 @@
+@@ -1286,11 +1335,15 @@
  interface(`userdom_user_home_content',`
  	gen_require(`
  		type user_home_t;
@@ -26898,7 +26977,7 @@
  ')
  
  ########################################
-@@ -1387,7 +1436,7 @@
+@@ -1387,7 +1440,7 @@
  
  ########################################
  ## <summary>
@@ -26907,7 +26986,7 @@
  ## </summary>
  ## <param name="domain">
  ##	<summary>
-@@ -1420,6 +1469,14 @@
+@@ -1420,6 +1473,14 @@
  
  	allow $1 user_home_dir_t:dir list_dir_perms;
  	files_search_home($1)
@@ -26922,7 +27001,7 @@
  ')
  
  ########################################
-@@ -1435,9 +1492,11 @@
+@@ -1435,9 +1496,11 @@
  interface(`userdom_dontaudit_list_user_home_dirs',`
  	gen_require(`
  		type user_home_dir_t;
@@ -26934,7 +27013,7 @@
  ')
  
  ########################################
-@@ -1494,6 +1553,25 @@
+@@ -1494,6 +1557,25 @@
  	allow $1 user_home_dir_t:dir relabelto;
  ')
  
@@ -26960,7 +27039,7 @@
  ########################################
  ## <summary>
  ##	Create directories in the home dir root with
-@@ -1547,9 +1625,9 @@
+@@ -1547,9 +1629,9 @@
  		type user_home_dir_t, user_home_t;
  	')
  
@@ -26972,7 +27051,7 @@
  ')
  
  ########################################
-@@ -1568,6 +1646,8 @@
+@@ -1568,6 +1650,8 @@
  	')
  
  	dontaudit $1 user_home_t:dir search_dir_perms;
@@ -26981,7 +27060,7 @@
  ')
  
  ########################################
-@@ -1643,6 +1723,7 @@
+@@ -1643,6 +1727,7 @@
  		type user_home_dir_t, user_home_t;
  	')
  
@@ -26989,7 +27068,7 @@
  	read_files_pattern($1, { user_home_dir_t user_home_t }, user_home_t)
  	files_search_home($1)
  ')
-@@ -1741,6 +1822,62 @@
+@@ -1741,6 +1826,62 @@
  
  ########################################
  ## <summary>
@@ -27052,7 +27131,7 @@
  ##	Execute user home files.
  ## </summary>
  ## <param name="domain">
-@@ -1757,14 +1894,6 @@
+@@ -1757,14 +1898,6 @@
  
  	files_search_home($1)
  	exec_files_pattern($1, { user_home_dir_t user_home_t }, user_home_t)
@@ -27067,7 +27146,7 @@
  ')
  
  ########################################
-@@ -1787,6 +1916,46 @@
+@@ -1787,6 +1920,46 @@
  
  ########################################
  ## <summary>
@@ -27114,7 +27193,7 @@
  ##	Create, read, write, and delete files
  ##	in a user home subdirectory.
  ## </summary>
-@@ -2819,6 +2988,24 @@
+@@ -2819,6 +2992,24 @@
  
  ########################################
  ## <summary>
@@ -27139,7 +27218,7 @@
  ##	Do not audit attempts to use user ttys.
  ## </summary>
  ## <param name="domain">
-@@ -2851,6 +3038,7 @@
+@@ -2851,6 +3042,7 @@
  	')
  
  	read_files_pattern($1,userdomain,userdomain)
@@ -27147,7 +27226,7 @@
  	kernel_search_proc($1)
  ')
  
-@@ -2965,6 +3153,24 @@
+@@ -2965,6 +3157,24 @@
  
  ########################################
  ## <summary>
@@ -27172,7 +27251,7 @@
  ##	Send a dbus message to all user domains.
  ## </summary>
  ## <param name="domain">
-@@ -2981,3 +3187,264 @@
+@@ -2981,3 +3191,264 @@
  
  	allow $1 userdomain:dbus send_msg;
  ')


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.763
retrieving revision 1.764
diff -u -r1.763 -r1.764
--- selinux-policy.spec	6 Jan 2009 14:46:21 -0000	1.763
+++ selinux-policy.spec	12 Jan 2009 16:59:00 -0000	1.764
@@ -20,7 +20,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.6.2
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -445,6 +445,9 @@
 %endif
 
 %changelog
+* Thu Jan 8 2009 Dan Walsh <dwalsh at redhat.com> 3.6.2-3
+- Allow cups_pdf_t write to nfs_t
+
 * Tue Jan 6 2009 Dan Walsh <dwalsh at redhat.com> 3.6.2-2
 - Remove audio_entropy policy
 



From pkgdb at fedoraproject.org  Mon Jan 12 17:00:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 12 Jan 2009 17:00:42 +0000
Subject: [pkgdb] sos ownership updated
Message-ID: <20090112170042.91CC388021@bastion.fedora.phx.redhat.com>

Package sos in Fedora devel is now owned by astokes

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sos



From pkgdb at fedoraproject.org  Mon Jan 12 17:00:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 12 Jan 2009 17:00:52 +0000
Subject: [pkgdb] sos ownership updated
Message-ID: <20090112170052.D7F1C88026@bastion.fedora.phx.redhat.com>

Package sos in Fedora 9 is now owned by astokes

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sos



From pkgdb at fedoraproject.org  Mon Jan 12 17:00:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 12 Jan 2009 17:00:57 +0000
Subject: [pkgdb] sos ownership updated
Message-ID: <20090112170057.AC73C88027@bastion.fedora.phx.redhat.com>

Package sos in Fedora 10 is now owned by astokes

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sos



From buc at fedoraproject.org  Mon Jan 12 17:02:04 2009
From: buc at fedoraproject.org (Dmitry Butskoy)
Date: Mon, 12 Jan 2009 17:02:04 +0000 (UTC)
Subject: rpms/freetds/devel freetds.spec,1.14,1.15
Message-ID: <20090112170204.2063570123@cvs1.fedora.phx.redhat.com>

Author: buc

Update of /cvs/extras/rpms/freetds/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27091

Modified Files:
	freetds.spec 
Log Message:



Index: freetds.spec
===================================================================
RCS file: /cvs/extras/rpms/freetds/devel/freetds.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- freetds.spec	12 Jan 2009 15:31:44 -0000	1.14
+++ freetds.spec	12 Jan 2009 17:01:33 -0000	1.15
@@ -69,9 +69,6 @@
 	--enable-sybase-compat \
 	--with-gnutls
 
-# avoid any rpath
-sed -i -e 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec="-D__LIBTOOL_IS_A_FOOL__"|g' libtool
-
 make %{?_smp_mflags}
 
  



From buc at fedoraproject.org  Mon Jan 12 17:18:28 2009
From: buc at fedoraproject.org (Dmitry Butskoy)
Date: Mon, 12 Jan 2009 17:18:28 +0000 (UTC)
Subject: rpms/freetds/devel freetds.spec,1.15,1.16
Message-ID: <20090112171828.946F370123@cvs1.fedora.phx.redhat.com>

Author: buc

Update of /cvs/extras/rpms/freetds/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28429

Modified Files:
	freetds.spec 
Log Message:



Index: freetds.spec
===================================================================
RCS file: /cvs/extras/rpms/freetds/devel/freetds.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- freetds.spec	12 Jan 2009 17:01:33 -0000	1.15
+++ freetds.spec	12 Jan 2009 17:17:58 -0000	1.16
@@ -55,6 +55,9 @@
 
 chmod -x samples/*.sh
 
+sed -e '/AM_INIT_AUTOMAKE/ i \
+AC_CONFIG_MACRO_DIR([m4])' configure.in
+
 #  needed after patch0 ...
 autoreconf -f -i
  
@@ -69,6 +72,10 @@
 	--enable-sybase-compat \
 	--with-gnutls
 
+# avoid any rpath
+sed -i -e 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' \
+	-e 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
+
 make %{?_smp_mflags}
 
  



From buc at fedoraproject.org  Mon Jan 12 17:30:22 2009
From: buc at fedoraproject.org (Dmitry Butskoy)
Date: Mon, 12 Jan 2009 17:30:22 +0000 (UTC)
Subject: rpms/freetds/devel freetds.spec,1.16,1.17
Message-ID: <20090112173022.3F04670123@cvs1.fedora.phx.redhat.com>

Author: buc

Update of /cvs/extras/rpms/freetds/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29555

Modified Files:
	freetds.spec 
Log Message:



Index: freetds.spec
===================================================================
RCS file: /cvs/extras/rpms/freetds/devel/freetds.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- freetds.spec	12 Jan 2009 17:17:58 -0000	1.16
+++ freetds.spec	12 Jan 2009 17:29:51 -0000	1.17
@@ -55,6 +55,7 @@
 
 chmod -x samples/*.sh
 
+ls -l
 sed -e '/AM_INIT_AUTOMAKE/ i \
 AC_CONFIG_MACRO_DIR([m4])' configure.in
 



From mclasen at fedoraproject.org  Mon Jan 12 17:35:06 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon, 12 Jan 2009 17:35:06 +0000 (UTC)
Subject: rpms/gvfs/devel gvfs-dav+sd-mount.patch, NONE, 1.1 gvfs.spec, 1.101,
	1.102
Message-ID: <20090112173506.24D4270123@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gvfs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31167

Modified Files:
	gvfs.spec 
Added Files:
	gvfs-dav+sd-mount.patch 
Log Message:
fix dav+sd.mount


gvfs-dav+sd-mount.patch:

--- NEW FILE gvfs-dav+sd-mount.patch ---
diff -up gvfs-1.1.3/daemon/dav+sd.mount.dav+sd-mount gvfs-1.1.3/daemon/dav+sd.mount
--- gvfs-1.1.3/daemon/dav+sd.mount.dav+sd-mount	2009-01-12 12:29:37.000000000 -0500
+++ gvfs-1.1.3/daemon/dav+sd.mount	2009-01-12 12:29:48.000000000 -0500
@@ -1,4 +1,4 @@
 [Mount]
 Type=dav+sd;davs+sd
-Exec=/usr/local/libexec/gvfsd-dav
+Exec=/usr/libexec/gvfsd-dav
 AutoMount=false


Index: gvfs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gvfs/devel/gvfs.spec,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -r1.101 -r1.102
--- gvfs.spec	10 Jan 2009 03:00:18 -0000	1.101
+++ gvfs.spec	12 Jan 2009 17:34:35 -0000	1.102
@@ -1,7 +1,7 @@
 Summary: Backends for the gio framework in GLib
 Name: gvfs
 Version: 1.1.3
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 URL: http://www.gtk.org
@@ -34,6 +34,9 @@
 # http://bugzilla.gnome.org/show_bug.cgi?id=565041
 Patch2: gvfs-burn-move.patch
 
+# fixed correctly upstream
+Patch3: gvfs-dav+sd-mount.patch
+
 %description
 The gvfs package provides backend implementations for the gio 
 framework in GLib. It includes ftp, sftp, cifs. 
@@ -116,6 +119,7 @@
 %setup -q
 %patch1 -p0 -b .archive-integration
 %patch2 -p0 -b .burn-move
+%patch3 -p1 -b .dav+sd-mount
 
 %build
 
@@ -256,6 +260,9 @@
 
 
 %changelog
+* Mon Jan 12 2009 Matthias Clasen  <mclasen at redhat.com> - 1.1.3-3
+- Fix dav+sd.mount
+
 * Fri Jan  9 2009 Matthias Clasen  <mclasen at redhat.com> - 1.1.3-2
 - Support moving files in the burn backend
 



From buc at fedoraproject.org  Mon Jan 12 17:38:39 2009
From: buc at fedoraproject.org (Dmitry Butskoy)
Date: Mon, 12 Jan 2009 17:38:39 +0000 (UTC)
Subject: rpms/freetds/devel freetds.spec,1.17,1.18
Message-ID: <20090112173839.450CA70123@cvs1.fedora.phx.redhat.com>

Author: buc

Update of /cvs/extras/rpms/freetds/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31579

Modified Files:
	freetds.spec 
Log Message:



Index: freetds.spec
===================================================================
RCS file: /cvs/extras/rpms/freetds/devel/freetds.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- freetds.spec	12 Jan 2009 17:29:51 -0000	1.17
+++ freetds.spec	12 Jan 2009 17:38:08 -0000	1.18
@@ -55,9 +55,8 @@
 
 chmod -x samples/*.sh
 
-ls -l
 sed -e '/AM_INIT_AUTOMAKE/ i \
-AC_CONFIG_MACRO_DIR([m4])' configure.in
+AC_CONFIG_MACRO_DIR([m4])' configure.ac
 
 #  needed after patch0 ...
 autoreconf -f -i



From buc at fedoraproject.org  Mon Jan 12 17:47:14 2009
From: buc at fedoraproject.org (Dmitry Butskoy)
Date: Mon, 12 Jan 2009 17:47:14 +0000 (UTC)
Subject: rpms/freetds/devel freetds.spec,1.18,1.19
Message-ID: <20090112174714.6408770123@cvs1.fedora.phx.redhat.com>

Author: buc

Update of /cvs/extras/rpms/freetds/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv321

Modified Files:
	freetds.spec 
Log Message:



Index: freetds.spec
===================================================================
RCS file: /cvs/extras/rpms/freetds/devel/freetds.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- freetds.spec	12 Jan 2009 17:38:08 -0000	1.18
+++ freetds.spec	12 Jan 2009 17:46:44 -0000	1.19
@@ -55,7 +55,7 @@
 
 chmod -x samples/*.sh
 
-sed -e '/AM_INIT_AUTOMAKE/ i \
+sed -i -e '/AM_INIT_AUTOMAKE/ i \
 AC_CONFIG_MACRO_DIR([m4])' configure.ac
 
 #  needed after patch0 ...



From somlo at fedoraproject.org  Mon Jan 12 17:52:49 2009
From: somlo at fedoraproject.org (Gabriel L. Somlo)
Date: Mon, 12 Jan 2009 17:52:49 +0000 (UTC)
Subject: rpms/perl-Catalyst-Authentication-Store-DBIx-Class/devel
	FedoraLicense.txt, NONE, 1.1 import.log, NONE,
	1.1 perl-Catalyst-Authentication-Store-DBIx-Class.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090112175249.43CF070123@cvs1.fedora.phx.redhat.com>

Author: somlo

Update of /cvs/pkgs/rpms/perl-Catalyst-Authentication-Store-DBIx-Class/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1198/devel

Modified Files:
	.cvsignore sources 
Added Files:
	FedoraLicense.txt import.log 
	perl-Catalyst-Authentication-Store-DBIx-Class.spec 
Log Message:
initial commit



--- NEW FILE FedoraLicense.txt ---
Date: Wed, 7 Jan 2009 21:40:28 -0700
From: "Jason Kuri" <bsdmac at gmail.com>
To: "L. Gabriel Somlo" <somlo at cmu.edu>
Subject: Re: license question re. Catalyst-Authentication-Store-DBIx-Class

Hi Gabriel,

Yes, it is under the same license.  It was just an oversight that it
doesn't have the same information in the file.  I will endeavor to add
it for an upcoming release

Jay

On Wed, Jan 7, 2009 at 8:28 PM, L. Gabriel Somlo <somlo at cmu.edu> wrote:
> Jason,
>
> I've created an RPM package of Catalyst-Authentication-Store-DBIx-Class
> and submitted it for inclusion in Fedora.
>
> I've been asked to clarify the licensing of SimpleDB.pm before the
> package can be included in the official Fedora repository. Both
> User.pm and Class.pm contain information about licensing directly
> within the respective files, but SimpleDB.pm does not.
>
> Can you quickly confirm that SimpleDB.pm is subject to the same
> licensing terms as the other two modules ?
>
> Also, would you consider adding a licensing blurb directly within
> SimpleDB.pm to avoid any similar questions in the future ? :)
>
> Thanks much,
>
> --Gabriel
>



--- NEW FILE import.log ---
perl-Catalyst-Authentication-Store-DBIx-Class-0_1082-2_fc10:HEAD:perl-Catalyst-Authentication-Store-DBIx-Class-0.1082-2.fc10.src.rpm:1231782686


--- NEW FILE perl-Catalyst-Authentication-Store-DBIx-Class.spec ---
Name:      perl-Catalyst-Authentication-Store-DBIx-Class
Version:   0.1082
Release:   2%{?dist}
Summary:   A storage class for Catalyst Authentication using DBIx::Class
License:   GPL+ or Artistic
Group:     Development/Libraries
URL:       http://search.cpan.org/dist/Catalyst-Authentication-Store-DBIx-Class/
Source0:   http://search.cpan.org/CPAN/authors/id/J/JA/JAYK/Catalyst-Authentication-Store-DBIx-Class-%{version}.tar.gz
Source1:   FedoraLicense.txt
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

BuildRequires:  perl(ExtUtils::MakeMaker)
BuildRequires:  perl(Test::More)
BuildRequires:  perl(DBIx::Class)
BuildRequires:  perl(Catalyst::Runtime)
BuildRequires:  perl(Catalyst::Plugin::Authentication)
BuildRequires:  perl(Catalyst::Model::DBIC::Schema)
# required for tests
BuildRequires: perl(Test::Pod)
BuildRequires: perl(Test::Pod::Coverage)
BuildRequires: perl(Test::WWW::Mechanize::Catalyst)
BuildRequires: perl(DBD::SQLite)
BuildRequires: perl(Catalyst::Plugin::Session::State::Cookie)
BuildRequires: perl(Catalyst::Plugin::Authorization::Roles)

%description
The Catalyst::Authentication::Store::DBIx::Class class provides access
to authentication information stored in a database via DBIx::Class.

%prep
%setup -q -n Catalyst-Authentication-Store-DBIx-Class-%{version} 
# fix up .t files to shut up rpmlint
%{__sed} -i 's|#!perl|#!/usr/bin/perl|' t/*.t
# clarification on SimpleDB.pm licensing
%{__install} -m 0644 %{SOURCE1} .

# make sure doc/tests don't generate provides
# note we first filter out the bits in _docdir...
cat << \EOF > %{name}-prov
#!/bin/sh
%{__perl_provides} `perl -p -e 's|\S+%{_docdir}/%{name}-%{version}\S+||'`
EOF

%define __perl_provides %{_builddir}/Catalyst-Authentication-Store-DBIx-Class-%{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}/Catalyst-Authentication-Store-DBIx-Class-%{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
TEST_POD=1 make test

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc FedoraLicense.txt Changes README t/
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Mon Jan 5 2009 Gabriel Somlo <somlo at cmu.edu> 0.1082-2
- added FedoraLicense.txt, clarifying licensing on SimpleDB.pm module

* Mon Jan 5 2009 Gabriel Somlo <somlo at cmu.edu> 0.1082-1
- initial specfile based on cpan2rpm and other catalyst examples by Chris Weyl


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Catalyst-Authentication-Store-DBIx-Class/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	11 Jan 2009 17:09:05 -0000	1.1
+++ .cvsignore	12 Jan 2009 17:52:18 -0000	1.2
@@ -0,0 +1 @@
+Catalyst-Authentication-Store-DBIx-Class-0.1082.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Catalyst-Authentication-Store-DBIx-Class/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	11 Jan 2009 17:09:05 -0000	1.1
+++ sources	12 Jan 2009 17:52:18 -0000	1.2
@@ -0,0 +1 @@
+c057bed16d46cd5ac73fdbd0d22b1643  Catalyst-Authentication-Store-DBIx-Class-0.1082.tar.gz



From somlo at fedoraproject.org  Mon Jan 12 17:54:27 2009
From: somlo at fedoraproject.org (Gabriel L. Somlo)
Date: Mon, 12 Jan 2009 17:54:27 +0000 (UTC)
Subject: rpms/perl-Catalyst-Authentication-Store-DBIx-Class/F-9
	FedoraLicense.txt, NONE, 1.1 import.log, NONE,
	1.1 perl-Catalyst-Authentication-Store-DBIx-Class.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090112175427.8096F70123@cvs1.fedora.phx.redhat.com>

Author: somlo

Update of /cvs/pkgs/rpms/perl-Catalyst-Authentication-Store-DBIx-Class/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1623/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	FedoraLicense.txt import.log 
	perl-Catalyst-Authentication-Store-DBIx-Class.spec 
Log Message:
initial commit



--- NEW FILE FedoraLicense.txt ---
Date: Wed, 7 Jan 2009 21:40:28 -0700
From: "Jason Kuri" <bsdmac at gmail.com>
To: "L. Gabriel Somlo" <somlo at cmu.edu>
Subject: Re: license question re. Catalyst-Authentication-Store-DBIx-Class

Hi Gabriel,

Yes, it is under the same license.  It was just an oversight that it
doesn't have the same information in the file.  I will endeavor to add
it for an upcoming release

Jay

On Wed, Jan 7, 2009 at 8:28 PM, L. Gabriel Somlo <somlo at cmu.edu> wrote:
> Jason,
>
> I've created an RPM package of Catalyst-Authentication-Store-DBIx-Class
> and submitted it for inclusion in Fedora.
>
> I've been asked to clarify the licensing of SimpleDB.pm before the
> package can be included in the official Fedora repository. Both
> User.pm and Class.pm contain information about licensing directly
> within the respective files, but SimpleDB.pm does not.
>
> Can you quickly confirm that SimpleDB.pm is subject to the same
> licensing terms as the other two modules ?
>
> Also, would you consider adding a licensing blurb directly within
> SimpleDB.pm to avoid any similar questions in the future ? :)
>
> Thanks much,
>
> --Gabriel
>



--- NEW FILE import.log ---
perl-Catalyst-Authentication-Store-DBIx-Class-0_1082-2_fc10:F-9:perl-Catalyst-Authentication-Store-DBIx-Class-0.1082-2.fc10.src.rpm:1231782810


--- NEW FILE perl-Catalyst-Authentication-Store-DBIx-Class.spec ---
Name:      perl-Catalyst-Authentication-Store-DBIx-Class
Version:   0.1082
Release:   2%{?dist}
Summary:   A storage class for Catalyst Authentication using DBIx::Class
License:   GPL+ or Artistic
Group:     Development/Libraries
URL:       http://search.cpan.org/dist/Catalyst-Authentication-Store-DBIx-Class/
Source0:   http://search.cpan.org/CPAN/authors/id/J/JA/JAYK/Catalyst-Authentication-Store-DBIx-Class-%{version}.tar.gz
Source1:   FedoraLicense.txt
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

BuildRequires:  perl(ExtUtils::MakeMaker)
BuildRequires:  perl(Test::More)
BuildRequires:  perl(DBIx::Class)
BuildRequires:  perl(Catalyst::Runtime)
BuildRequires:  perl(Catalyst::Plugin::Authentication)
BuildRequires:  perl(Catalyst::Model::DBIC::Schema)
# required for tests
BuildRequires: perl(Test::Pod)
BuildRequires: perl(Test::Pod::Coverage)
BuildRequires: perl(Test::WWW::Mechanize::Catalyst)
BuildRequires: perl(DBD::SQLite)
BuildRequires: perl(Catalyst::Plugin::Session::State::Cookie)
BuildRequires: perl(Catalyst::Plugin::Authorization::Roles)

%description
The Catalyst::Authentication::Store::DBIx::Class class provides access
to authentication information stored in a database via DBIx::Class.

%prep
%setup -q -n Catalyst-Authentication-Store-DBIx-Class-%{version} 
# fix up .t files to shut up rpmlint
%{__sed} -i 's|#!perl|#!/usr/bin/perl|' t/*.t
# clarification on SimpleDB.pm licensing
%{__install} -m 0644 %{SOURCE1} .

# make sure doc/tests don't generate provides
# note we first filter out the bits in _docdir...
cat << \EOF > %{name}-prov
#!/bin/sh
%{__perl_provides} `perl -p -e 's|\S+%{_docdir}/%{name}-%{version}\S+||'`
EOF

%define __perl_provides %{_builddir}/Catalyst-Authentication-Store-DBIx-Class-%{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}/Catalyst-Authentication-Store-DBIx-Class-%{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
TEST_POD=1 make test

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc FedoraLicense.txt Changes README t/
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Mon Jan 5 2009 Gabriel Somlo <somlo at cmu.edu> 0.1082-2
- added FedoraLicense.txt, clarifying licensing on SimpleDB.pm module

* Mon Jan 5 2009 Gabriel Somlo <somlo at cmu.edu> 0.1082-1
- initial specfile based on cpan2rpm and other catalyst examples by Chris Weyl


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Catalyst-Authentication-Store-DBIx-Class/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	11 Jan 2009 17:09:05 -0000	1.1
+++ .cvsignore	12 Jan 2009 17:53:57 -0000	1.2
@@ -0,0 +1 @@
+Catalyst-Authentication-Store-DBIx-Class-0.1082.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Catalyst-Authentication-Store-DBIx-Class/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	11 Jan 2009 17:09:05 -0000	1.1
+++ sources	12 Jan 2009 17:53:57 -0000	1.2
@@ -0,0 +1 @@
+c057bed16d46cd5ac73fdbd0d22b1643  Catalyst-Authentication-Store-DBIx-Class-0.1082.tar.gz



From somlo at fedoraproject.org  Mon Jan 12 17:55:52 2009
From: somlo at fedoraproject.org (Gabriel L. Somlo)
Date: Mon, 12 Jan 2009 17:55:52 +0000 (UTC)
Subject: rpms/perl-Catalyst-Authentication-Store-DBIx-Class/F-10
	FedoraLicense.txt, NONE, 1.1 import.log, NONE,
	1.1 perl-Catalyst-Authentication-Store-DBIx-Class.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090112175552.71BBC70123@cvs1.fedora.phx.redhat.com>

Author: somlo

Update of /cvs/pkgs/rpms/perl-Catalyst-Authentication-Store-DBIx-Class/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2038/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	FedoraLicense.txt import.log 
	perl-Catalyst-Authentication-Store-DBIx-Class.spec 
Log Message:
initial commit



--- NEW FILE FedoraLicense.txt ---
Date: Wed, 7 Jan 2009 21:40:28 -0700
From: "Jason Kuri" <bsdmac at gmail.com>
To: "L. Gabriel Somlo" <somlo at cmu.edu>
Subject: Re: license question re. Catalyst-Authentication-Store-DBIx-Class

Hi Gabriel,

Yes, it is under the same license.  It was just an oversight that it
doesn't have the same information in the file.  I will endeavor to add
it for an upcoming release

Jay

On Wed, Jan 7, 2009 at 8:28 PM, L. Gabriel Somlo <somlo at cmu.edu> wrote:
> Jason,
>
> I've created an RPM package of Catalyst-Authentication-Store-DBIx-Class
> and submitted it for inclusion in Fedora.
>
> I've been asked to clarify the licensing of SimpleDB.pm before the
> package can be included in the official Fedora repository. Both
> User.pm and Class.pm contain information about licensing directly
> within the respective files, but SimpleDB.pm does not.
>
> Can you quickly confirm that SimpleDB.pm is subject to the same
> licensing terms as the other two modules ?
>
> Also, would you consider adding a licensing blurb directly within
> SimpleDB.pm to avoid any similar questions in the future ? :)
>
> Thanks much,
>
> --Gabriel
>



--- NEW FILE import.log ---
perl-Catalyst-Authentication-Store-DBIx-Class-0_1082-2_fc10:F-10:perl-Catalyst-Authentication-Store-DBIx-Class-0.1082-2.fc10.src.rpm:1231782897


--- NEW FILE perl-Catalyst-Authentication-Store-DBIx-Class.spec ---
Name:      perl-Catalyst-Authentication-Store-DBIx-Class
Version:   0.1082
Release:   2%{?dist}
Summary:   A storage class for Catalyst Authentication using DBIx::Class
License:   GPL+ or Artistic
Group:     Development/Libraries
URL:       http://search.cpan.org/dist/Catalyst-Authentication-Store-DBIx-Class/
Source0:   http://search.cpan.org/CPAN/authors/id/J/JA/JAYK/Catalyst-Authentication-Store-DBIx-Class-%{version}.tar.gz
Source1:   FedoraLicense.txt
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

BuildRequires:  perl(ExtUtils::MakeMaker)
BuildRequires:  perl(Test::More)
BuildRequires:  perl(DBIx::Class)
BuildRequires:  perl(Catalyst::Runtime)
BuildRequires:  perl(Catalyst::Plugin::Authentication)
BuildRequires:  perl(Catalyst::Model::DBIC::Schema)
# required for tests
BuildRequires: perl(Test::Pod)
BuildRequires: perl(Test::Pod::Coverage)
BuildRequires: perl(Test::WWW::Mechanize::Catalyst)
BuildRequires: perl(DBD::SQLite)
BuildRequires: perl(Catalyst::Plugin::Session::State::Cookie)
BuildRequires: perl(Catalyst::Plugin::Authorization::Roles)

%description
The Catalyst::Authentication::Store::DBIx::Class class provides access
to authentication information stored in a database via DBIx::Class.

%prep
%setup -q -n Catalyst-Authentication-Store-DBIx-Class-%{version} 
# fix up .t files to shut up rpmlint
%{__sed} -i 's|#!perl|#!/usr/bin/perl|' t/*.t
# clarification on SimpleDB.pm licensing
%{__install} -m 0644 %{SOURCE1} .

# make sure doc/tests don't generate provides
# note we first filter out the bits in _docdir...
cat << \EOF > %{name}-prov
#!/bin/sh
%{__perl_provides} `perl -p -e 's|\S+%{_docdir}/%{name}-%{version}\S+||'`
EOF

%define __perl_provides %{_builddir}/Catalyst-Authentication-Store-DBIx-Class-%{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}/Catalyst-Authentication-Store-DBIx-Class-%{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
TEST_POD=1 make test

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc FedoraLicense.txt Changes README t/
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Mon Jan 5 2009 Gabriel Somlo <somlo at cmu.edu> 0.1082-2
- added FedoraLicense.txt, clarifying licensing on SimpleDB.pm module

* Mon Jan 5 2009 Gabriel Somlo <somlo at cmu.edu> 0.1082-1
- initial specfile based on cpan2rpm and other catalyst examples by Chris Weyl


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Catalyst-Authentication-Store-DBIx-Class/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	11 Jan 2009 17:09:05 -0000	1.1
+++ .cvsignore	12 Jan 2009 17:55:22 -0000	1.2
@@ -0,0 +1 @@
+Catalyst-Authentication-Store-DBIx-Class-0.1082.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Catalyst-Authentication-Store-DBIx-Class/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	11 Jan 2009 17:09:05 -0000	1.1
+++ sources	12 Jan 2009 17:55:22 -0000	1.2
@@ -0,0 +1 @@
+c057bed16d46cd5ac73fdbd0d22b1643  Catalyst-Authentication-Store-DBIx-Class-0.1082.tar.gz



From somlo at fedoraproject.org  Mon Jan 12 17:58:00 2009
From: somlo at fedoraproject.org (Gabriel L. Somlo)
Date: Mon, 12 Jan 2009 17:58:00 +0000 (UTC)
Subject: rpms/perl-Catalyst-Plugin-Authorization-ACL/devel import.log, NONE, 
	1.1 perl-Catalyst-Plugin-Authorization-ACL.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090112175800.F2A0A70123@cvs1.fedora.phx.redhat.com>

Author: somlo

Update of /cvs/pkgs/rpms/perl-Catalyst-Plugin-Authorization-ACL/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2493/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-Catalyst-Plugin-Authorization-ACL.spec 
Log Message:
initial commit



--- NEW FILE import.log ---
perl-Catalyst-Plugin-Authorization-ACL-0_10-1:HEAD:perl-Catalyst-Plugin-Authorization-ACL-0.10-1.src.rpm:1231783028


--- NEW FILE perl-Catalyst-Plugin-Authorization-ACL.spec ---
Name:      perl-Catalyst-Plugin-Authorization-ACL
Version:   0.10
Release:   1
Summary:   ACL Support for Catalyst Applications
License:   GPL+ or Artistic
Group:     Development/Libraries
URL:       http://search.cpan.org/dist/Catalyst-Plugin-Authorization-ACL/
Source0:   http://search.cpan.org/CPAN/authors/id/R/RK/RKITOVER/Catalyst-Plugin-Authorization-ACL-%{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(Catalyst::Runtime)
BuildRequires:  perl(Class::Data::Inheritable)
BuildRequires:  perl(Class::Throwable)
BuildRequires:  perl(Test::More)
BuildRequires:  perl(Tree::Simple::Visitor::FindByPath)
BuildRequires:  perl(Tree::Simple::Visitor::GetAllDescendents)
#BuildRequires:  perl(Test::Exception)
#BuildRequires:  perl(Catalyst::Plugin::Authentication)
#BuildRequires:  perl(Set::Object)
#BuildRequires:  perl(UNIVERSAL::isa)
## required for tests
BuildRequires: perl(Test::Pod)
BuildRequires: perl(Test::Pod::Coverage)
BuildRequires: perl(Test::WWW::Mechanize::Catalyst)
BuildRequires: perl(Catalyst::Plugin::Authorization::Roles)
BuildRequires: perl(Catalyst::Plugin::Authentication)
BuildRequires: perl(Catalyst::Plugin::Session::State::Cookie)

%description
This module provides Access Control List style path protection, with
arbitrary rules for Catalyst applications. It operates only on the
Catalyst private namespace, at least at the moment.

%prep
%setup -q -n Catalyst-Plugin-Authorization-ACL-%{version} 

# make sure doc/tests don't generate provides
# note we first filter out the bits in _docdir...
cat << \EOF > %{name}-prov
#!/bin/sh
%{__perl_provides} `perl -p -e 's|\S+%{_docdir}/%{name}-%{version}\S+||'`
EOF

%define __perl_provides %{_builddir}/Catalyst-Plugin-Authorization-ACL-%{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}/Catalyst-Plugin-Authorization-ACL-%{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
TEST_POD=1 make test

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc Changes README t/
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Tue Jan 6 2009 Gabriel Somlo <somlo at cmu.edu> 0.10-1
- initial specfile based on cpan2rpm and other catalyst examples by Chris Weyl


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Catalyst-Plugin-Authorization-ACL/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	11 Jan 2009 17:11:00 -0000	1.1
+++ .cvsignore	12 Jan 2009 17:57:30 -0000	1.2
@@ -0,0 +1 @@
+Catalyst-Plugin-Authorization-ACL-0.10.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Catalyst-Plugin-Authorization-ACL/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	11 Jan 2009 17:11:00 -0000	1.1
+++ sources	12 Jan 2009 17:57:30 -0000	1.2
@@ -0,0 +1 @@
+14e41900d89333b7f4de24309a7e40d8  Catalyst-Plugin-Authorization-ACL-0.10.tar.gz



From somlo at fedoraproject.org  Mon Jan 12 17:59:32 2009
From: somlo at fedoraproject.org (Gabriel L. Somlo)
Date: Mon, 12 Jan 2009 17:59:32 +0000 (UTC)
Subject: rpms/perl-Catalyst-Plugin-Authorization-ACL/F-9 import.log, NONE,
	1.1 perl-Catalyst-Plugin-Authorization-ACL.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090112175932.9647470123@cvs1.fedora.phx.redhat.com>

Author: somlo

Update of /cvs/pkgs/rpms/perl-Catalyst-Plugin-Authorization-ACL/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2894/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-Catalyst-Plugin-Authorization-ACL.spec 
Log Message:
initial commit



--- NEW FILE import.log ---
perl-Catalyst-Plugin-Authorization-ACL-0_10-1:F-9:perl-Catalyst-Plugin-Authorization-ACL-0.10-1.src.rpm:1231783115


--- NEW FILE perl-Catalyst-Plugin-Authorization-ACL.spec ---
Name:      perl-Catalyst-Plugin-Authorization-ACL
Version:   0.10
Release:   1
Summary:   ACL Support for Catalyst Applications
License:   GPL+ or Artistic
Group:     Development/Libraries
URL:       http://search.cpan.org/dist/Catalyst-Plugin-Authorization-ACL/
Source0:   http://search.cpan.org/CPAN/authors/id/R/RK/RKITOVER/Catalyst-Plugin-Authorization-ACL-%{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(Catalyst::Runtime)
BuildRequires:  perl(Class::Data::Inheritable)
BuildRequires:  perl(Class::Throwable)
BuildRequires:  perl(Test::More)
BuildRequires:  perl(Tree::Simple::Visitor::FindByPath)
BuildRequires:  perl(Tree::Simple::Visitor::GetAllDescendents)
#BuildRequires:  perl(Test::Exception)
#BuildRequires:  perl(Catalyst::Plugin::Authentication)
#BuildRequires:  perl(Set::Object)
#BuildRequires:  perl(UNIVERSAL::isa)
## required for tests
BuildRequires: perl(Test::Pod)
BuildRequires: perl(Test::Pod::Coverage)
BuildRequires: perl(Test::WWW::Mechanize::Catalyst)
BuildRequires: perl(Catalyst::Plugin::Authorization::Roles)
BuildRequires: perl(Catalyst::Plugin::Authentication)
BuildRequires: perl(Catalyst::Plugin::Session::State::Cookie)

%description
This module provides Access Control List style path protection, with
arbitrary rules for Catalyst applications. It operates only on the
Catalyst private namespace, at least at the moment.

%prep
%setup -q -n Catalyst-Plugin-Authorization-ACL-%{version} 

# make sure doc/tests don't generate provides
# note we first filter out the bits in _docdir...
cat << \EOF > %{name}-prov
#!/bin/sh
%{__perl_provides} `perl -p -e 's|\S+%{_docdir}/%{name}-%{version}\S+||'`
EOF

%define __perl_provides %{_builddir}/Catalyst-Plugin-Authorization-ACL-%{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}/Catalyst-Plugin-Authorization-ACL-%{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
TEST_POD=1 make test

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc Changes README t/
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Tue Jan 6 2009 Gabriel Somlo <somlo at cmu.edu> 0.10-1
- initial specfile based on cpan2rpm and other catalyst examples by Chris Weyl


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Catalyst-Plugin-Authorization-ACL/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	11 Jan 2009 17:11:00 -0000	1.1
+++ .cvsignore	12 Jan 2009 17:59:02 -0000	1.2
@@ -0,0 +1 @@
+Catalyst-Plugin-Authorization-ACL-0.10.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Catalyst-Plugin-Authorization-ACL/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	11 Jan 2009 17:11:00 -0000	1.1
+++ sources	12 Jan 2009 17:59:02 -0000	1.2
@@ -0,0 +1 @@
+14e41900d89333b7f4de24309a7e40d8  Catalyst-Plugin-Authorization-ACL-0.10.tar.gz



From somlo at fedoraproject.org  Mon Jan 12 18:02:00 2009
From: somlo at fedoraproject.org (Gabriel L. Somlo)
Date: Mon, 12 Jan 2009 18:02:00 +0000 (UTC)
Subject: rpms/perl-Catalyst-Plugin-Authorization-ACL/F-10 import.log, NONE, 
	1.1 perl-Catalyst-Plugin-Authorization-ACL.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090112180200.2ACD870129@cvs1.fedora.phx.redhat.com>

Author: somlo

Update of /cvs/pkgs/rpms/perl-Catalyst-Plugin-Authorization-ACL/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3488/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-Catalyst-Plugin-Authorization-ACL.spec 
Log Message:
initial commit



--- NEW FILE import.log ---
perl-Catalyst-Plugin-Authorization-ACL-0_10-1:F-10:perl-Catalyst-Plugin-Authorization-ACL-0.10-1.src.rpm:1231783263


--- NEW FILE perl-Catalyst-Plugin-Authorization-ACL.spec ---
Name:      perl-Catalyst-Plugin-Authorization-ACL
Version:   0.10
Release:   1
Summary:   ACL Support for Catalyst Applications
License:   GPL+ or Artistic
Group:     Development/Libraries
URL:       http://search.cpan.org/dist/Catalyst-Plugin-Authorization-ACL/
Source0:   http://search.cpan.org/CPAN/authors/id/R/RK/RKITOVER/Catalyst-Plugin-Authorization-ACL-%{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(Catalyst::Runtime)
BuildRequires:  perl(Class::Data::Inheritable)
BuildRequires:  perl(Class::Throwable)
BuildRequires:  perl(Test::More)
BuildRequires:  perl(Tree::Simple::Visitor::FindByPath)
BuildRequires:  perl(Tree::Simple::Visitor::GetAllDescendents)
#BuildRequires:  perl(Test::Exception)
#BuildRequires:  perl(Catalyst::Plugin::Authentication)
#BuildRequires:  perl(Set::Object)
#BuildRequires:  perl(UNIVERSAL::isa)
## required for tests
BuildRequires: perl(Test::Pod)
BuildRequires: perl(Test::Pod::Coverage)
BuildRequires: perl(Test::WWW::Mechanize::Catalyst)
BuildRequires: perl(Catalyst::Plugin::Authorization::Roles)
BuildRequires: perl(Catalyst::Plugin::Authentication)
BuildRequires: perl(Catalyst::Plugin::Session::State::Cookie)

%description
This module provides Access Control List style path protection, with
arbitrary rules for Catalyst applications. It operates only on the
Catalyst private namespace, at least at the moment.

%prep
%setup -q -n Catalyst-Plugin-Authorization-ACL-%{version} 

# make sure doc/tests don't generate provides
# note we first filter out the bits in _docdir...
cat << \EOF > %{name}-prov
#!/bin/sh
%{__perl_provides} `perl -p -e 's|\S+%{_docdir}/%{name}-%{version}\S+||'`
EOF

%define __perl_provides %{_builddir}/Catalyst-Plugin-Authorization-ACL-%{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}/Catalyst-Plugin-Authorization-ACL-%{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
TEST_POD=1 make test

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc Changes README t/
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Tue Jan 6 2009 Gabriel Somlo <somlo at cmu.edu> 0.10-1
- initial specfile based on cpan2rpm and other catalyst examples by Chris Weyl


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Catalyst-Plugin-Authorization-ACL/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	11 Jan 2009 17:11:00 -0000	1.1
+++ .cvsignore	12 Jan 2009 18:01:29 -0000	1.2
@@ -0,0 +1 @@
+Catalyst-Plugin-Authorization-ACL-0.10.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Catalyst-Plugin-Authorization-ACL/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	11 Jan 2009 17:11:00 -0000	1.1
+++ sources	12 Jan 2009 18:01:29 -0000	1.2
@@ -0,0 +1 @@
+14e41900d89333b7f4de24309a7e40d8  Catalyst-Plugin-Authorization-ACL-0.10.tar.gz



From kkofler at fedoraproject.org  Mon Jan 12 18:02:06 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Mon, 12 Jan 2009 18:02:06 +0000 (UTC)
Subject: rpms/kdenetwork/devel kdenetwork-4.1.96-system-libgadu.patch, NONE, 
	1.1 kdenetwork.spec, 1.166, 1.167
Message-ID: <20090112180206.9584B70129@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdenetwork/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3583/devel

Modified Files:
	kdenetwork.spec 
Added Files:
	kdenetwork-4.1.96-system-libgadu.patch 
Log Message:
* Mon Jan 12 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.96-2
- build against system libgadu (trivial patch backported from 4.3)

kdenetwork-4.1.96-system-libgadu.patch:

--- NEW FILE kdenetwork-4.1.96-system-libgadu.patch ---
Index: cmake/modules/FindLibgadu.cmake
===================================================================
--- cmake/modules/FindLibgadu.cmake	(Revision 0)
+++ cmake/modules/FindLibgadu.cmake	(Revision 909145)
@@ -0,0 +1,72 @@
+# - Try to find libgadu (Gadu Gadu protocol support library)
+# Once done this will define
+#
+#  LIBGADU_FOUND - system has LIBGADU
+#  LIBGADU_INCLUDE_DIR - the LIBGADU include directory
+#  LIBGADU_LIBRARIES - the libraries needed to use LIBGADU
+#  LIBGADU_DEFINITIONS - Compiler switches required for using LIBGADU
+#
+# use pkg-config to get the directories and then use these values
+# in the FIND_PATH() and FIND_LIBRARY() calls
+
+# Copyright (c) 2008, Maciej Mrozowski, <reavertm at poczta.fm>
+#
+# Redistribution and use is allowed according to the terms of the BSD license.
+# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+
+include (FindLibraryWithDebug)
+
+if (LIBGADU_INCLUDE_DIR AND LIBGADU_LIBRARIES)
+
+    # in cache already
+    set (LIBGADU_FOUND TRUE)
+
+else (LIBGADU_INCLUDE_DIR AND LIBGADU_LIBRARIES)
+
+    if (NOT WIN32)
+
+        find_package (PkgConfig)
+        pkg_check_modules (PC_LIBGADU libgadu)
+
+        # If pkgconfig found libgadu, get the full path to the library using find_library()
+        # but only in the path reported by pkgconfig.
+        # Otherwise do a normal search.
+        if (PC_LIBGADU_FOUND)
+
+            set (LIBGADU_DEFINITIONS ${PC_LIBGADU_CFLAGS})
+
+            if (PC_LIBGADU_INCLUDE_DIRS)
+                set (LIBGADU_INCLUDE_DIR ${PC_LIBGADU_INCLUDE_DIRS})
+            else (PC_LIBGADU_INCLUDE_DIRS)
+                find_path (LIBGADU_INCLUDE_DIR libgadu.h PATH_SUFFIXES libgadu)
+            endif (PC_LIBGADU_INCLUDE_DIRS)
+
+            find_library (LIBGADU_LIBRARIES NAMES gadu
+                PATHS
+                ${PC_LIBGADU_LIBDIR}
+                NO_DEFAULT_PATH
+            )
+
+        else (PC_LIBGADU_FOUND)
+
+            find_library (LIBGADU_LIBRARIES NAMES gadu)
+            find_path (LIBGADU_INCLUDE_DIR libgadu.h PATH_SUFFIXES libgadu)
+
+        endif (PC_LIBGADU_FOUND)
+
+    else (NOT WIN32)
+
+        find_library_with_debug (LIBGADU_LIBRARIES
+            WIN32_DEBUG_POSTFIX d
+            NAMES gadu
+        )
+        find_path (LIBGADU_INCLUDE_DIR libgadu.h PATH_SUFFIXES libgadu)
+
+    endif (NOT WIN32)
+
+    include (FindPackageHandleStandardArgs)
+    find_package_handle_standard_args (LIBGADU DEFAULT_MSG LIBGADU_LIBRARIES LIBGADU_INCLUDE_DIR)
+
+    mark_as_advanced (LIBGADU_INCLUDE_DIR LIBGADU_LIBRARIES)
+
+endif (LIBGADU_INCLUDE_DIR AND LIBGADU_LIBRARIES)
Index: kopete/protocols/gadu/CMakeLists.txt
===================================================================
--- kopete/protocols/gadu/CMakeLists.txt	(Revision 909143)
+++ kopete/protocols/gadu/CMakeLists.txt	(Revision 909145)
@@ -3,11 +3,8 @@
 KDE4_NO_ENABLE_FINAL(kopete)
 
 add_subdirectory( icons ) 
-add_subdirectory( libgadu )
 
-include_directories( ${KOPETE_INCLUDES} 
-${CMAKE_CURRENT_SOURCE_DIR}/libgadu/ 
-${CMAKE_CURRENT_BINARY_DIR}/libgadu/ 
+include_directories( ${KOPETE_INCLUDES} ${LIBGADU_INCLUDE_DIRS} }
 )
 
 
@@ -46,7 +43,7 @@
 kde4_add_plugin(kopete_gadu ${kopete_gadu_PART_SRCS})
 
 
-target_link_libraries(kopete_gadu ${KDE4_KIO_LIBS} ${QT_QTNETWORK_LIBRARY} ${KDE4_KDE3SUPPORT_LIBS} gadu_kopete kopete )
+target_link_libraries(kopete_gadu ${KDE4_KIO_LIBS} ${QT_QTNETWORK_LIBRARY} ${KDE4_KDE3SUPPORT_LIBS} ${LIBGADU_LIBRARIES} kopete )
 
 install(TARGETS kopete_gadu  DESTINATION ${PLUGIN_INSTALL_DIR})
 
Index: kopete/protocols/CMakeLists.txt
===================================================================
--- kopete/protocols/CMakeLists.txt	(Revision 909143)
+++ kopete/protocols/CMakeLists.txt	(Revision 909145)
@@ -1,6 +1,3 @@
-macro_optional_find_package(OpenSSL)
-macro_log_feature(OPENSSL_FOUND "OpenSSL" "A toolkit implementing the Secure Sockets Layer (SSL v2/v3) and Transport Layer Security (TLS v1) protocols" "http://openssl.org" FALSE "" "Required for the Kopete Gadu-Gadu protocol.")
-
 # On Solaris, some of the name resolution functions are in libnsl;
 # this needs to be linked in if found. Copied from kdelibs.
 check_library_exists(nsl gethostbyname "" HAVE_NSL_LIBRARY)
@@ -47,9 +44,9 @@
   if(WITH_winpopup)
     add_subdirectory( winpopup )
   endif(WITH_winpopup)
-  if(WITH_gadu AND OPENSSL_FOUND)
+  if(WITH_gadu AND LIBGADU_FOUND)
 	add_subdirectory( gadu )
-  endif(WITH_gadu AND OPENSSL_FOUND)
+  endif(WITH_gadu AND LIBGADU_FOUND)
   if(WITH_sms)
     add_subdirectory( sms )
   endif(WITH_sms)
Index: kopete/CMakeLists.txt
===================================================================
--- kopete/CMakeLists.txt	(Revision 909143)
+++ kopete/CMakeLists.txt	(Revision 909145)
@@ -37,6 +37,10 @@
 macro_bool_to_01(LIBMEANWHILE_FOUND HAVE_LIBMEANWHILE)
 macro_log_feature(LIBMEANWHILE_FOUND "libmeanwhile" "A library for protocol support for connection to Sametime servers" "http://meanwhile.sf.net" FALSE "" "Required for the Kopete Meanwhile protocol")
 
+macro_optional_find_package(Libgadu)
+macro_bool_to_01(LIBGADU_FOUND HAVE_LIBGADU)
+macro_log_feature(LIBGADU_FOUND "libgadu" "A library providing support for Gadu-Gadu protocol" "http://toxygen.net/libgadu/" FALSE "1.8.0" "Required for Kopete Gadu-Gadu protocol")
+
 check_include_files(valgrind/valgrind.h HAVE_VALGRIND_H)
 check_include_files(stdint.h HAVE_STDINT_H)
 check_include_files(inttypes.h HAVE_INTTYPES_H)


Index: kdenetwork.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdenetwork/devel/kdenetwork.spec,v
retrieving revision 1.166
retrieving revision 1.167
diff -u -r1.166 -r1.167
--- kdenetwork.spec	9 Jan 2009 18:44:30 -0000	1.166
+++ kdenetwork.spec	12 Jan 2009 18:01:36 -0000	1.167
@@ -2,12 +2,16 @@
 Name: kdenetwork
 Epoch: 7
 Version: 4.1.96
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPLv2
 Group: Applications/Internet
 URL: http://www.kde.org
 Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/%{name}-%{version}.tar.bz2
+# build Kopete against the system libgadu (backported from 4.3)
+# http://websvn.kde.org/?view=rev&revision=909144
+# http://websvn.kde.org/?view=rev&revision=909145
+Patch100: kdenetwork-4.1.96-system-libgadu.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: avahi-compat-libdns_sd-devel
@@ -18,6 +22,7 @@
 BuildRequires: glib2-devel
 BuildRequires: gmp-devel
 BuildRequires: kdepimlibs-devel >= %{version}
+BuildRequires: libgadu-devel >= 1.8.0
 BuildRequires: libidn-devel
 BuildRequires: libmsn-devel >= 4.0-0.4.beta2
 BuildRequires: libotr-devel
@@ -82,6 +87,8 @@
 
 %prep
 %setup -q
+%patch100 -p0 -b .system-libgadu
+rm -rf kopete/protocols/gadu/libgadu/
 
 %build
 mkdir -p %{_target_platform}
@@ -155,6 +162,9 @@
 
 
 %changelog
+* Mon Jan 12 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.96-2
+- build against system libgadu (trivial patch backported from 4.3)
+
 * Wed Jan 07 2009 Than Ngo <than at redhat.com> - 4.1.96-1
 - 4.2rc1
 



From mgrepl at fedoraproject.org  Mon Jan 12 18:03:15 2009
From: mgrepl at fedoraproject.org (Miroslav Grepl)
Date: Mon, 12 Jan 2009 18:03:15 +0000 (UTC)
Subject: rpms/selinux-policy/F-10 policy-20080710.patch, 1.119,
	1.120 selinux-policy.spec, 1.766, 1.767
Message-ID: <20090112180315.E82EC70123@cvs1.fedora.phx.redhat.com>

Author: mgrepl

Update of /cvs/extras/rpms/selinux-policy/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4398

Modified Files:
	policy-20080710.patch selinux-policy.spec 
Log Message:
- Fix hald_acl_t to be able to getattr/setattr on fixed disk device nodes
- Allow prelude_audisp_t to signal itself



policy-20080710.patch:

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.119 -r 1.120 policy-20080710.patch
Index: policy-20080710.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-10/policy-20080710.patch,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -r1.119 -r1.120
--- policy-20080710.patch	12 Jan 2009 14:37:22 -0000	1.119
+++ policy-20080710.patch	12 Jan 2009 18:03:15 -0000	1.120
@@ -1,6 +1,6 @@
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/default_contexts serefpolicy-3.5.13/config/appconfig-mcs/default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/default_contexts	2008-10-17 14:49:10.000000000 +0200
-+++ serefpolicy-3.5.13/config/appconfig-mcs/default_contexts	2009-01-12 11:52:47.000000000 +0100
++++ serefpolicy-3.5.13/config/appconfig-mcs/default_contexts	2009-01-12 17:40:37.000000000 +0100
 @@ -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
@@ -24,13 +24,13 @@
 +system_r:xdm_t:s0		user_r:user_t:s0
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/failsafe_context serefpolicy-3.5.13/config/appconfig-mcs/failsafe_context
 --- nsaserefpolicy/config/appconfig-mcs/failsafe_context	2008-10-17 14:49:10.000000000 +0200
-+++ serefpolicy-3.5.13/config/appconfig-mcs/failsafe_context	2009-01-12 11:52:47.000000000 +0100
++++ serefpolicy-3.5.13/config/appconfig-mcs/failsafe_context	2009-01-12 17:40:37.000000000 +0100
 @@ -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.5.13/config/appconfig-mcs/guest_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/guest_u_default_contexts	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.5.13/config/appconfig-mcs/guest_u_default_contexts	2009-01-12 11:52:47.000000000 +0100
++++ serefpolicy-3.5.13/config/appconfig-mcs/guest_u_default_contexts	2009-01-12 17:40:37.000000000 +0100
 @@ -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
@@ -40,7 +40,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.5.13/config/appconfig-mcs/root_default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/root_default_contexts	2008-10-17 14:49:10.000000000 +0200
-+++ serefpolicy-3.5.13/config/appconfig-mcs/root_default_contexts	2009-01-12 11:52:47.000000000 +0100
++++ serefpolicy-3.5.13/config/appconfig-mcs/root_default_contexts	2009-01-12 17:40:37.000000000 +0100
 @@ -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
@@ -57,7 +57,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/seusers serefpolicy-3.5.13/config/appconfig-mcs/seusers
 --- nsaserefpolicy/config/appconfig-mcs/seusers	2008-10-17 14:49:10.000000000 +0200
-+++ serefpolicy-3.5.13/config/appconfig-mcs/seusers	2009-01-12 11:52:47.000000000 +0100
++++ serefpolicy-3.5.13/config/appconfig-mcs/seusers	2009-01-12 17:40:37.000000000 +0100
 @@ -1,3 +1,3 @@
  system_u:system_u:s0-mcs_systemhigh
 -root:root:s0-mcs_systemhigh
@@ -66,7 +66,7 @@
 +__default__:unconfined_u:s0
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/staff_u_default_contexts serefpolicy-3.5.13/config/appconfig-mcs/staff_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/staff_u_default_contexts	2008-10-17 14:49:10.000000000 +0200
-+++ serefpolicy-3.5.13/config/appconfig-mcs/staff_u_default_contexts	2009-01-12 11:52:47.000000000 +0100
++++ serefpolicy-3.5.13/config/appconfig-mcs/staff_u_default_contexts	2009-01-12 17:40:37.000000000 +0100
 @@ -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
@@ -83,7 +83,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/unconfined_u_default_contexts serefpolicy-3.5.13/config/appconfig-mcs/unconfined_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/unconfined_u_default_contexts	2008-10-17 14:49:10.000000000 +0200
-+++ serefpolicy-3.5.13/config/appconfig-mcs/unconfined_u_default_contexts	2009-01-12 11:52:47.000000000 +0100
++++ serefpolicy-3.5.13/config/appconfig-mcs/unconfined_u_default_contexts	2009-01-12 17:40:37.000000000 +0100
 @@ -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
@@ -93,13 +93,13 @@
  system_r:xdm_t:s0		unconfined_r:unconfined_t:s0
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/userhelper_context serefpolicy-3.5.13/config/appconfig-mcs/userhelper_context
 --- nsaserefpolicy/config/appconfig-mcs/userhelper_context	2008-10-17 14:49:10.000000000 +0200
-+++ serefpolicy-3.5.13/config/appconfig-mcs/userhelper_context	2009-01-12 11:52:47.000000000 +0100
++++ serefpolicy-3.5.13/config/appconfig-mcs/userhelper_context	2009-01-12 17:40:37.000000000 +0100
 @@ -1 +1 @@
 -system_u:sysadm_r:sysadm_t:s0
 +system_u:system_r:unconfined_t:s0	
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/user_u_default_contexts serefpolicy-3.5.13/config/appconfig-mcs/user_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/user_u_default_contexts	2008-10-17 14:49:10.000000000 +0200
-+++ serefpolicy-3.5.13/config/appconfig-mcs/user_u_default_contexts	2009-01-12 11:52:47.000000000 +0100
++++ serefpolicy-3.5.13/config/appconfig-mcs/user_u_default_contexts	2009-01-12 17:40:37.000000000 +0100
 @@ -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
@@ -114,7 +114,7 @@
 +user_r:user_t:s0		user_r:user_t:s0
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/xguest_u_default_contexts serefpolicy-3.5.13/config/appconfig-mcs/xguest_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/xguest_u_default_contexts	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.5.13/config/appconfig-mcs/xguest_u_default_contexts	2009-01-12 11:52:47.000000000 +0100
++++ serefpolicy-3.5.13/config/appconfig-mcs/xguest_u_default_contexts	2009-01-12 17:40:37.000000000 +0100
 @@ -0,0 +1,7 @@
 +system_r:local_login_t	xguest_r:xguest_t:s0
 +system_r:remote_login_t	xguest_r:xguest_t:s0
@@ -125,7 +125,7 @@
 +xguest_r:xguest_t:s0	xguest_r:xguest_t:s0
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/default_contexts serefpolicy-3.5.13/config/appconfig-mls/default_contexts
 --- nsaserefpolicy/config/appconfig-mls/default_contexts	2008-10-17 14:49:10.000000000 +0200
-+++ serefpolicy-3.5.13/config/appconfig-mls/default_contexts	2009-01-12 11:52:47.000000000 +0100
++++ serefpolicy-3.5.13/config/appconfig-mls/default_contexts	2009-01-12 17:40:37.000000000 +0100
 @@ -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
@@ -149,7 +149,7 @@
 +system_r:xdm_t:s0		user_r:user_t:s0
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/guest_u_default_contexts serefpolicy-3.5.13/config/appconfig-mls/guest_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mls/guest_u_default_contexts	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.5.13/config/appconfig-mls/guest_u_default_contexts	2009-01-12 11:52:47.000000000 +0100
++++ serefpolicy-3.5.13/config/appconfig-mls/guest_u_default_contexts	2009-01-12 17:40:37.000000000 +0100
 @@ -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
@@ -157,7 +157,7 @@
 +system_r:crond_t:s0		guest_r:guest_t:s0
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/root_default_contexts serefpolicy-3.5.13/config/appconfig-mls/root_default_contexts
 --- nsaserefpolicy/config/appconfig-mls/root_default_contexts	2008-10-17 14:49:10.000000000 +0200
-+++ serefpolicy-3.5.13/config/appconfig-mls/root_default_contexts	2009-01-12 11:52:47.000000000 +0100
++++ serefpolicy-3.5.13/config/appconfig-mls/root_default_contexts	2009-01-12 17:40:37.000000000 +0100
 @@ -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
@@ -178,7 +178,7 @@
 +#system_r:sshd_t:s0		sysadm_r:sysadm_t:s0 staff_r:staff_t:s0
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/staff_u_default_contexts serefpolicy-3.5.13/config/appconfig-mls/staff_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mls/staff_u_default_contexts	2008-10-17 14:49:10.000000000 +0200
-+++ serefpolicy-3.5.13/config/appconfig-mls/staff_u_default_contexts	2009-01-12 11:52:47.000000000 +0100
++++ serefpolicy-3.5.13/config/appconfig-mls/staff_u_default_contexts	2009-01-12 17:40:37.000000000 +0100
 @@ -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
@@ -190,7 +190,7 @@
  staff_r:staff_sudo_t:s0		staff_r:staff_t:s0
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/user_u_default_contexts serefpolicy-3.5.13/config/appconfig-mls/user_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mls/user_u_default_contexts	2008-10-17 14:49:10.000000000 +0200
-+++ serefpolicy-3.5.13/config/appconfig-mls/user_u_default_contexts	2009-01-12 11:52:47.000000000 +0100
++++ serefpolicy-3.5.13/config/appconfig-mls/user_u_default_contexts	2009-01-12 17:40:37.000000000 +0100
 @@ -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
@@ -202,7 +202,7 @@
  user_r:user_sudo_t:s0		user_r:user_t:s0
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/xguest_u_default_contexts serefpolicy-3.5.13/config/appconfig-mls/xguest_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mls/xguest_u_default_contexts	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.5.13/config/appconfig-mls/xguest_u_default_contexts	2009-01-12 11:52:47.000000000 +0100
++++ serefpolicy-3.5.13/config/appconfig-mls/xguest_u_default_contexts	2009-01-12 17:40:37.000000000 +0100
 @@ -0,0 +1,7 @@
 +system_r:local_login_t	xguest_r:xguest_t:s0
 +system_r:remote_login_t	xguest_r:xguest_t:s0
@@ -213,7 +213,7 @@
 +xguest_r:xguest_t:s0	xguest_r:xguest_t:s0
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-standard/guest_u_default_contexts serefpolicy-3.5.13/config/appconfig-standard/guest_u_default_contexts
 --- nsaserefpolicy/config/appconfig-standard/guest_u_default_contexts	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.5.13/config/appconfig-standard/guest_u_default_contexts	2009-01-12 11:52:47.000000000 +0100
++++ serefpolicy-3.5.13/config/appconfig-standard/guest_u_default_contexts	2009-01-12 17:40:37.000000000 +0100
 @@ -0,0 +1,4 @@
 +system_r:local_login_t	guest_r:guest_t
 +system_r:remote_login_t	guest_r:guest_t
@@ -221,7 +221,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.5.13/config/appconfig-standard/root_default_contexts
 --- nsaserefpolicy/config/appconfig-standard/root_default_contexts	2008-10-17 14:49:10.000000000 +0200
-+++ serefpolicy-3.5.13/config/appconfig-standard/root_default_contexts	2009-01-12 11:52:47.000000000 +0100
++++ serefpolicy-3.5.13/config/appconfig-standard/root_default_contexts	2009-01-12 17:40:37.000000000 +0100
 @@ -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
@@ -237,7 +237,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/staff_u_default_contexts serefpolicy-3.5.13/config/appconfig-standard/staff_u_default_contexts
 --- nsaserefpolicy/config/appconfig-standard/staff_u_default_contexts	2008-10-17 14:49:10.000000000 +0200
-+++ serefpolicy-3.5.13/config/appconfig-standard/staff_u_default_contexts	2009-01-12 11:52:47.000000000 +0100
++++ serefpolicy-3.5.13/config/appconfig-standard/staff_u_default_contexts	2009-01-12 17:40:37.000000000 +0100
 @@ -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
@@ -249,7 +249,7 @@
  staff_r:staff_sudo_t		staff_r:staff_t
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-standard/user_u_default_contexts serefpolicy-3.5.13/config/appconfig-standard/user_u_default_contexts
 --- nsaserefpolicy/config/appconfig-standard/user_u_default_contexts	2008-10-17 14:49:10.000000000 +0200
-+++ serefpolicy-3.5.13/config/appconfig-standard/user_u_default_contexts	2009-01-12 11:52:47.000000000 +0100
++++ serefpolicy-3.5.13/config/appconfig-standard/user_u_default_contexts	2009-01-12 17:40:37.000000000 +0100
 @@ -1,7 +1,7 @@
  system_r:local_login_t		user_r:user_t
  system_r:remote_login_t		user_r:user_t
@@ -261,7 +261,7 @@
  user_r:user_sudo_t		user_r:user_t
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-standard/xguest_u_default_contexts serefpolicy-3.5.13/config/appconfig-standard/xguest_u_default_contexts
 --- nsaserefpolicy/config/appconfig-standard/xguest_u_default_contexts	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.5.13/config/appconfig-standard/xguest_u_default_contexts	2009-01-12 11:52:47.000000000 +0100
++++ serefpolicy-3.5.13/config/appconfig-standard/xguest_u_default_contexts	2009-01-12 17:40:37.000000000 +0100
 @@ -0,0 +1,5 @@
 +system_r:local_login_t	xguest_r:xguest_t
 +system_r:remote_login_t	xguest_r:xguest_t
@@ -270,7 +270,7 @@
 +system_r:xdm_t		xguest_r:xguest_t
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/Makefile serefpolicy-3.5.13/Makefile
 --- nsaserefpolicy/Makefile	2008-10-17 14:49:11.000000000 +0200
-+++ serefpolicy-3.5.13/Makefile	2009-01-12 11:52:47.000000000 +0100
++++ serefpolicy-3.5.13/Makefile	2009-01-12 17:40:37.000000000 +0100
 @@ -311,20 +311,22 @@
  
[...3408 lines suppressed...]
  
  ########################################
@@ -31822,7 +31836,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.te serefpolicy-3.5.13/policy/modules/system/selinuxutil.te
 --- nsaserefpolicy/policy/modules/system/selinuxutil.te	2008-10-17 14:49:13.000000000 +0200
-+++ serefpolicy-3.5.13/policy/modules/system/selinuxutil.te	2009-01-12 11:52:47.000000000 +0100
++++ serefpolicy-3.5.13/policy/modules/system/selinuxutil.te	2009-01-12 17:40:37.000000000 +0100
 @@ -23,6 +23,9 @@
  type selinux_config_t;
  files_type(selinux_config_t)
@@ -32179,7 +32193,7 @@
  ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/setrans.if serefpolicy-3.5.13/policy/modules/system/setrans.if
 --- nsaserefpolicy/policy/modules/system/setrans.if	2008-10-17 14:49:13.000000000 +0200
-+++ serefpolicy-3.5.13/policy/modules/system/setrans.if	2009-01-12 11:52:47.000000000 +0100
++++ serefpolicy-3.5.13/policy/modules/system/setrans.if	2009-01-12 17:40:37.000000000 +0100
 @@ -21,3 +21,23 @@
  	stream_connect_pattern($1,setrans_var_run_t,setrans_var_run_t,setrans_t)
  	files_list_pids($1)
@@ -32206,7 +32220,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/sysnetwork.fc serefpolicy-3.5.13/policy/modules/system/sysnetwork.fc
 --- nsaserefpolicy/policy/modules/system/sysnetwork.fc	2008-10-17 14:49:13.000000000 +0200
-+++ serefpolicy-3.5.13/policy/modules/system/sysnetwork.fc	2009-01-12 11:52:47.000000000 +0100
++++ serefpolicy-3.5.13/policy/modules/system/sysnetwork.fc	2009-01-12 17:40:37.000000000 +0100
 @@ -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)
@@ -32231,7 +32245,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.5.13/policy/modules/system/sysnetwork.if
 --- nsaserefpolicy/policy/modules/system/sysnetwork.if	2008-10-17 14:49:13.000000000 +0200
-+++ serefpolicy-3.5.13/policy/modules/system/sysnetwork.if	2009-01-12 11:52:47.000000000 +0100
++++ serefpolicy-3.5.13/policy/modules/system/sysnetwork.if	2009-01-12 17:40:37.000000000 +0100
 @@ -198,7 +198,25 @@
  		type dhcpc_state_t;
  	')
@@ -32343,7 +32357,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/sysnetwork.te serefpolicy-3.5.13/policy/modules/system/sysnetwork.te
 --- nsaserefpolicy/policy/modules/system/sysnetwork.te	2008-10-17 14:49:13.000000000 +0200
-+++ serefpolicy-3.5.13/policy/modules/system/sysnetwork.te	2009-01-12 11:52:47.000000000 +0100
++++ serefpolicy-3.5.13/policy/modules/system/sysnetwork.te	2009-01-12 17:40:37.000000000 +0100
 @@ -20,6 +20,9 @@
  init_daemon_domain(dhcpc_t,dhcpc_exec_t)
  role system_r types dhcpc_t;
@@ -32533,7 +32547,7 @@
  	xen_append_log(ifconfig_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/udev.fc serefpolicy-3.5.13/policy/modules/system/udev.fc
 --- nsaserefpolicy/policy/modules/system/udev.fc	2008-10-17 14:49:13.000000000 +0200
-+++ serefpolicy-3.5.13/policy/modules/system/udev.fc	2009-01-12 11:52:47.000000000 +0100
++++ serefpolicy-3.5.13/policy/modules/system/udev.fc	2009-01-12 17:40:37.000000000 +0100
 @@ -13,8 +13,11 @@
  /sbin/start_udev --	gen_context(system_u:object_r:udev_exec_t,s0)
  /sbin/udev	--	gen_context(system_u:object_r:udev_exec_t,s0)
@@ -32548,7 +32562,7 @@
 +/var/run/PackageKit/udev(/.*)?		gen_context(system_u:object_r:udev_var_run_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/udev.if serefpolicy-3.5.13/policy/modules/system/udev.if
 --- nsaserefpolicy/policy/modules/system/udev.if	2008-10-17 14:49:13.000000000 +0200
-+++ serefpolicy-3.5.13/policy/modules/system/udev.if	2009-01-12 11:52:47.000000000 +0100
++++ serefpolicy-3.5.13/policy/modules/system/udev.if	2009-01-12 17:40:37.000000000 +0100
 @@ -96,6 +96,24 @@
  
  ########################################
@@ -32604,7 +32618,7 @@
  ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/udev.te serefpolicy-3.5.13/policy/modules/system/udev.te
 --- nsaserefpolicy/policy/modules/system/udev.te	2008-10-17 14:49:13.000000000 +0200
-+++ serefpolicy-3.5.13/policy/modules/system/udev.te	2009-01-12 11:52:47.000000000 +0100
++++ serefpolicy-3.5.13/policy/modules/system/udev.te	2009-01-12 17:40:37.000000000 +0100
 @@ -83,6 +83,7 @@
  kernel_rw_unix_dgram_sockets(udev_t)
  kernel_dgram_send(udev_t)
@@ -32663,7 +32677,7 @@
  ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.fc serefpolicy-3.5.13/policy/modules/system/unconfined.fc
 --- nsaserefpolicy/policy/modules/system/unconfined.fc	2008-10-17 14:49:13.000000000 +0200
-+++ serefpolicy-3.5.13/policy/modules/system/unconfined.fc	2009-01-12 12:08:28.000000000 +0100
++++ serefpolicy-3.5.13/policy/modules/system/unconfined.fc	2009-01-12 17:40:37.000000000 +0100
 @@ -2,15 +2,31 @@
  # e.g.:
  # /usr/local/bin/appsrv		--	gen_context(system_u:object_r:unconfined_exec_t,s0)
@@ -32707,7 +32721,7 @@
 +#/usr/lib(64)?/gcl-[^/]+/unixport/saved_.* 	--	gen_context(system_u:object_r:execmem_exec_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.if serefpolicy-3.5.13/policy/modules/system/unconfined.if
 --- nsaserefpolicy/policy/modules/system/unconfined.if	2008-10-17 14:49:13.000000000 +0200
-+++ serefpolicy-3.5.13/policy/modules/system/unconfined.if	2009-01-12 11:52:47.000000000 +0100
++++ serefpolicy-3.5.13/policy/modules/system/unconfined.if	2009-01-12 17:40:37.000000000 +0100
 @@ -12,14 +12,13 @@
  #
  interface(`unconfined_domain_noaudit',`
@@ -33057,7 +33071,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.te serefpolicy-3.5.13/policy/modules/system/unconfined.te
 --- nsaserefpolicy/policy/modules/system/unconfined.te	2008-10-17 14:49:13.000000000 +0200
-+++ serefpolicy-3.5.13/policy/modules/system/unconfined.te	2009-01-12 11:52:47.000000000 +0100
++++ serefpolicy-3.5.13/policy/modules/system/unconfined.te	2009-01-12 17:40:37.000000000 +0100
 @@ -6,35 +6,77 @@
  # Declarations
  #
@@ -33422,7 +33436,7 @@
 +gen_user(unconfined_u, user, unconfined_r system_r, s0, s0 - mls_systemhigh, mcs_allcats)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.fc serefpolicy-3.5.13/policy/modules/system/userdomain.fc
 --- nsaserefpolicy/policy/modules/system/userdomain.fc	2008-10-17 14:49:13.000000000 +0200
-+++ serefpolicy-3.5.13/policy/modules/system/userdomain.fc	2009-01-12 11:52:47.000000000 +0100
++++ serefpolicy-3.5.13/policy/modules/system/userdomain.fc	2009-01-12 17:40:37.000000000 +0100
 @@ -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)
@@ -33435,7 +33449,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.5.13/policy/modules/system/userdomain.if
 --- nsaserefpolicy/policy/modules/system/userdomain.if	2008-10-17 14:49:13.000000000 +0200
-+++ serefpolicy-3.5.13/policy/modules/system/userdomain.if	2009-01-12 11:52:47.000000000 +0100
++++ serefpolicy-3.5.13/policy/modules/system/userdomain.if	2009-01-12 17:40:37.000000000 +0100
 @@ -28,10 +28,14 @@
  		class context contains;
  	')
@@ -36188,7 +36202,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-3.5.13/policy/modules/system/userdomain.te
 --- nsaserefpolicy/policy/modules/system/userdomain.te	2008-10-17 14:49:13.000000000 +0200
-+++ serefpolicy-3.5.13/policy/modules/system/userdomain.te	2009-01-12 11:52:47.000000000 +0100
++++ serefpolicy-3.5.13/policy/modules/system/userdomain.te	2009-01-12 17:40:37.000000000 +0100
 @@ -8,13 +8,6 @@
  
  ## <desc>
@@ -36308,7 +36322,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.fc serefpolicy-3.5.13/policy/modules/system/xen.fc
 --- nsaserefpolicy/policy/modules/system/xen.fc	2008-10-17 14:49:13.000000000 +0200
-+++ serefpolicy-3.5.13/policy/modules/system/xen.fc	2009-01-12 11:52:47.000000000 +0100
++++ serefpolicy-3.5.13/policy/modules/system/xen.fc	2009-01-12 17:40:37.000000000 +0100
 @@ -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)
@@ -36319,7 +36333,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.if serefpolicy-3.5.13/policy/modules/system/xen.if
 --- nsaserefpolicy/policy/modules/system/xen.if	2008-10-17 14:49:13.000000000 +0200
-+++ serefpolicy-3.5.13/policy/modules/system/xen.if	2009-01-12 11:52:47.000000000 +0100
++++ serefpolicy-3.5.13/policy/modules/system/xen.if	2009-01-12 17:40:37.000000000 +0100
 @@ -155,7 +155,7 @@
  	stream_connect_pattern($1,xenstored_var_run_t,xenstored_var_run_t,xenstored_t)
  ')
@@ -36372,7 +36386,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.te serefpolicy-3.5.13/policy/modules/system/xen.te
 --- nsaserefpolicy/policy/modules/system/xen.te	2008-10-17 14:49:13.000000000 +0200
-+++ serefpolicy-3.5.13/policy/modules/system/xen.te	2009-01-12 11:52:47.000000000 +0100
++++ serefpolicy-3.5.13/policy/modules/system/xen.te	2009-01-12 17:40:37.000000000 +0100
 @@ -6,6 +6,13 @@
  # Declarations
  #
@@ -36606,7 +36620,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/policy_capabilities serefpolicy-3.5.13/policy/policy_capabilities
 --- nsaserefpolicy/policy/policy_capabilities	2008-10-17 14:49:14.000000000 +0200
-+++ serefpolicy-3.5.13/policy/policy_capabilities	2009-01-12 11:52:47.000000000 +0100
++++ serefpolicy-3.5.13/policy/policy_capabilities	2009-01-12 17:40:37.000000000 +0100
 @@ -29,4 +29,4 @@
  # chr_file: open
  # blk_file: open
@@ -36615,7 +36629,7 @@
 +#policycap open_perms;
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/support/obj_perm_sets.spt serefpolicy-3.5.13/policy/support/obj_perm_sets.spt
 --- nsaserefpolicy/policy/support/obj_perm_sets.spt	2008-10-17 14:49:14.000000000 +0200
-+++ serefpolicy-3.5.13/policy/support/obj_perm_sets.spt	2009-01-12 11:52:47.000000000 +0100
++++ serefpolicy-3.5.13/policy/support/obj_perm_sets.spt	2009-01-12 17:40:37.000000000 +0100
 @@ -59,22 +59,22 @@
  # 
  # Permissions for executing files.
@@ -36765,7 +36779,7 @@
 +define(`manage_key_perms', `{ create link read search setattr view write } ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/users serefpolicy-3.5.13/policy/users
 --- nsaserefpolicy/policy/users	2008-10-17 14:49:11.000000000 +0200
-+++ serefpolicy-3.5.13/policy/users	2009-01-12 11:52:47.000000000 +0100
++++ serefpolicy-3.5.13/policy/users	2009-01-12 17:40:37.000000000 +0100
 @@ -25,11 +25,8 @@
  # permit any access to such users, then remove this entry.
  #
@@ -36792,7 +36806,7 @@
 +gen_user(root, user, unconfined_r sysadm_r staff_r ifdef(`enable_mls',`secadm_r auditadm_r') system_r, s0, s0 - mls_systemhigh, mcs_allcats)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/Rules.modular serefpolicy-3.5.13/Rules.modular
 --- nsaserefpolicy/Rules.modular	2008-10-17 14:49:14.000000000 +0200
-+++ serefpolicy-3.5.13/Rules.modular	2009-01-12 11:52:47.000000000 +0100
++++ serefpolicy-3.5.13/Rules.modular	2009-01-12 17:40:37.000000000 +0100
 @@ -73,8 +73,8 @@
  $(tmpdir)/%.mod: $(m4support) $(tmpdir)/generated_definitions.conf $(tmpdir)/all_interfaces.conf %.te
  	@echo "Compliling $(NAME) $(@F) module"
@@ -36841,7 +36855,7 @@
  $(appdir)/customizable_types: $(base_conf)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/support/Makefile.devel serefpolicy-3.5.13/support/Makefile.devel
 --- nsaserefpolicy/support/Makefile.devel	2008-10-17 14:49:14.000000000 +0200
-+++ serefpolicy-3.5.13/support/Makefile.devel	2009-01-12 11:52:47.000000000 +0100
++++ serefpolicy-3.5.13/support/Makefile.devel	2009-01-12 17:40:37.000000000 +0100
 @@ -181,8 +181,7 @@
  tmp/%.mod: $(m4support) tmp/all_interfaces.conf %.te
  	@$(EINFO) "Compiling $(NAME) $(basename $(@F)) module"


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-10/selinux-policy.spec,v
retrieving revision 1.766
retrieving revision 1.767
diff -u -r1.766 -r1.767
--- selinux-policy.spec	12 Jan 2009 14:37:22 -0000	1.766
+++ selinux-policy.spec	12 Jan 2009 18:03:15 -0000	1.767
@@ -462,6 +462,8 @@
 * Mon Jan 12 2009 Miroslav Grepl <mgrepl at redhat.com> 3.5.13-39
 - Allow cups_pdf_t mananage nfs files/dirs
 - Add read_lnk_files to postfix_domain_template
+- Fix hald_acl_t to be able to getattr/setattr on fixed disk device nodes
+- Allow prelude_audisp_t to signal itself
 
 * Sun Jan 4 2009 Dan Walsh <dwalsh at redhat.com> 3.5.13-38
 - Allow sendmail to list inotifyfs



From quantumburnz at fedoraproject.org  Mon Jan 12 18:04:03 2009
From: quantumburnz at fedoraproject.org (Christopher D. Stover)
Date: Mon, 12 Jan 2009 18:04:03 +0000 (UTC)
Subject: rpms/barry/devel .cvsignore, 1.2, 1.3 barry.spec, 1.3, 1.4 sources, 
	1.2, 1.3
Message-ID: <20090112180403.6741170123@cvs1.fedora.phx.redhat.com>

Author: quantumburnz

Update of /cvs/pkgs/rpms/barry/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4474

Modified Files:
	.cvsignore barry.spec sources 
Log Message:
version bump from git



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/barry/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	12 Nov 2008 20:01:28 -0000	1.2
+++ .cvsignore	12 Jan 2009 18:03:33 -0000	1.3
@@ -1 +1 @@
-barry-0.14.tar.bz2
+barry-0.15-20090109.tar.bz2


Index: barry.spec
===================================================================
RCS file: /cvs/pkgs/rpms/barry/devel/barry.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- barry.spec	18 Dec 2008 12:49:28 -0000	1.3
+++ barry.spec	12 Jan 2009 18:03:33 -0000	1.4
@@ -1,18 +1,25 @@
-# Fedora 9/10/11 doesn't support opensync 0.22
+# Fedora 9/10/11 don't support opensync 0.22
 %define with_opensync 1
 %if %{?fedora} > 8
     %define with_opensync 0
 %endif
 
 Name:           barry
-Version:        0.14
-Release:        6%{?dist}
+Version:        0.15
+Release:        0.1.20090109git%{?dist}
 Summary:        BlackBerry Desktop for Linux
 
 Group:          Applications/Productivity
 License:        GPLv2+
 URL:            http://www.netdirect.ca/downloads/barry
-Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
+# The source for this package was pulled from upstream's git.  Use the following
+# commands to generate the tarball:
+# git clone git://repo.or.cz/barry.git
+# cd barry/maintainer
+# ./git-extract.sh 0 15 master
+# (cd build/barry* && ../../tar-prepare.sh)
+# (cd build && ../tar-create.sh 0 15)
+Source0:        %{name}-%{version}-20090109.tar.bz2
 Source1:        %{name}.desktop
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -69,6 +76,25 @@
 %setup -q
 %{__rm} -rf ./doc/www/*.php
 %{__rm} -rf ./doc/www/*.sh
+%{__rm} -rf ./doc/www/doxygen/html/scoped__lock_8h__incl.map
+%{__rm} -rf ./doc/www/doxygen/html/classBarry_1_1ZeroPacket__inherit__graph.map
+%{__rm} -rf ./doc/www/doxygen/html/dataqueue_8h__incl.map
+%{__rm} -rf ./doc/www/doxygen/html/classBarry_1_1ZeroPacket__coll__graph.map
+%{__rm} -rf ./doc/www/doxygen/html/protostructs_8h__incl.map
+%{__rm} -rf ./doc/www/doxygen/html/classBarry_1_1DBPacket__inherit__graph.map
+%{__rm} -rf ./doc/www/doxygen/html/bcharge_8cc__incl.map
+%{__rm} -rf ./doc/www/doxygen/html/bidentify_8cc__incl.map
+%{__rm} -rf ./doc/www/doxygen/html/packet_8h__incl.map
+%{__rm} -rf ./doc/www/doxygen/html/strnlen_8h__incl.map
+%{__rm} -rf ./doc/www/doxygen/html/bs11nread_8cc__incl.map
+%{__rm} -rf ./doc/www/doxygen/html/bfuse_8cc__incl.map
+%{__rm} -rf ./doc/www/doxygen/html/btool_8cc__incl.map
+%{__rm} -rf ./doc/www/doxygen/html/pppob_8cc__incl.map
+%{__rm} -rf ./doc/www/doxygen/html/upldif_8cc__incl.map
+%{__rm} -rf ./doc/www/doxygen/html/brecsum_8cc__incl.map
+%{__rm} -rf ./doc/www/doxygen/html/breset_8cc__incl.map
+%{__rm} -rf ./doc/www/doxygen/html/endian_8h__incl.map
+
 
 %build
 # main tree
@@ -167,6 +193,9 @@
 %postun libs -p /sbin/ldconfig
 
 %changelog
+* Mon Jan 12 2009 Christopher D. Stover <quantumburnz at hotmail.com> 0.15-0.1.20090109git
+- version/git bump
+
 * Thu Dec 18 2008 Petr Machata <pmachata at redhat.com> - 0.14-6
 - rebuild for new boost
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/barry/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	12 Nov 2008 20:01:28 -0000	1.2
+++ sources	12 Jan 2009 18:03:33 -0000	1.3
@@ -1 +1 @@
-8c93abd0011568b540b799d1faa9a625  barry-0.14.tar.bz2
+03f78f7a136eae0ca0b7310354a35afd  barry-0.15-20090109.tar.bz2



From somlo at fedoraproject.org  Mon Jan 12 18:04:39 2009
From: somlo at fedoraproject.org (Gabriel L. Somlo)
Date: Mon, 12 Jan 2009 18:04:39 +0000 (UTC)
Subject: rpms/perl-Class-Throwable/devel import.log, NONE,
	1.1 perl-Class-Throwable.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090112180439.3FCCE70123@cvs1.fedora.phx.redhat.com>

Author: somlo

Update of /cvs/pkgs/rpms/perl-Class-Throwable/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4766/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-Class-Throwable.spec 
Log Message:
initial commit



--- NEW FILE import.log ---
perl-Class-Throwable-0_10-1_fc10:HEAD:perl-Class-Throwable-0.10-1.fc10.src.rpm:1231783382


--- NEW FILE perl-Class-Throwable.spec ---
Name:           perl-Class-Throwable
Version:        0.10
Release:        1%{?dist}
Summary:        A minimal lightweight exception class
Group:          Development/Libraries
License:        GPL+ or Artistic
URL:            http://search.cpan.org/dist/Class-Throwable/
Source0:        http://search.cpan.org/CPAN/authors/id/S/ST/STEVAN/Class-Throwable-%{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(Test::Pod)
BuildRequires: perl(Test::Pod::Coverage)

%description
This module implements a minimal lightweight exception object. It is
meant to be a compromise between more basic solutions like Carp which
can only print information and cannot handle exception objects, and more
complex solutions like Exception::Class which can be used to define
complex inline exceptions and has a number of module dependencies. 

%prep
%setup -q -n Class-Throwable-%{version}

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make 

%install
rm -rf $RPM_BUILD_ROOT
make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';'
find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';'
chmod -R u+w $RPM_BUILD_ROOT/*

%check
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Changes README t/
%{perl_vendorlib}/*
%{_mandir}/man3/*.3*


%changelog
* Tue Jan  6 2008 Gabriel Somlo <somlo at cmu.edu> 0.10-1
- Initial Fedora package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Class-Throwable/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	11 Jan 2009 17:00:14 -0000	1.1
+++ .cvsignore	12 Jan 2009 18:04:09 -0000	1.2
@@ -0,0 +1 @@
+Class-Throwable-0.10.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Class-Throwable/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	11 Jan 2009 17:00:14 -0000	1.1
+++ sources	12 Jan 2009 18:04:09 -0000	1.2
@@ -0,0 +1 @@
+888ea61abfd8d9b60c024a997de9dbbd  Class-Throwable-0.10.tar.gz



From somlo at fedoraproject.org  Mon Jan 12 18:06:06 2009
From: somlo at fedoraproject.org (Gabriel L. Somlo)
Date: Mon, 12 Jan 2009 18:06:06 +0000 (UTC)
Subject: rpms/perl-Class-Throwable/F-9 import.log, NONE,
	1.1 perl-Class-Throwable.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090112180606.7A8F970123@cvs1.fedora.phx.redhat.com>

Author: somlo

Update of /cvs/pkgs/rpms/perl-Class-Throwable/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5256/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-Class-Throwable.spec 
Log Message:
initial commit



--- NEW FILE import.log ---
perl-Class-Throwable-0_10-1_fc10:F-9:perl-Class-Throwable-0.10-1.fc10.src.rpm:1231783512


--- NEW FILE perl-Class-Throwable.spec ---
Name:           perl-Class-Throwable
Version:        0.10
Release:        1%{?dist}
Summary:        A minimal lightweight exception class
Group:          Development/Libraries
License:        GPL+ or Artistic
URL:            http://search.cpan.org/dist/Class-Throwable/
Source0:        http://search.cpan.org/CPAN/authors/id/S/ST/STEVAN/Class-Throwable-%{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(Test::Pod)
BuildRequires: perl(Test::Pod::Coverage)

%description
This module implements a minimal lightweight exception object. It is
meant to be a compromise between more basic solutions like Carp which
can only print information and cannot handle exception objects, and more
complex solutions like Exception::Class which can be used to define
complex inline exceptions and has a number of module dependencies. 

%prep
%setup -q -n Class-Throwable-%{version}

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make 

%install
rm -rf $RPM_BUILD_ROOT
make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';'
find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';'
chmod -R u+w $RPM_BUILD_ROOT/*

%check
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Changes README t/
%{perl_vendorlib}/*
%{_mandir}/man3/*.3*


%changelog
* Tue Jan  6 2008 Gabriel Somlo <somlo at cmu.edu> 0.10-1
- Initial Fedora package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Class-Throwable/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	11 Jan 2009 17:00:14 -0000	1.1
+++ .cvsignore	12 Jan 2009 18:05:36 -0000	1.2
@@ -0,0 +1 @@
+Class-Throwable-0.10.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Class-Throwable/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	11 Jan 2009 17:00:14 -0000	1.1
+++ sources	12 Jan 2009 18:05:36 -0000	1.2
@@ -0,0 +1 @@
+888ea61abfd8d9b60c024a997de9dbbd  Class-Throwable-0.10.tar.gz



From somlo at fedoraproject.org  Mon Jan 12 18:07:30 2009
From: somlo at fedoraproject.org (Gabriel L. Somlo)
Date: Mon, 12 Jan 2009 18:07:30 +0000 (UTC)
Subject: rpms/perl-Class-Throwable/F-10 import.log, NONE,
	1.1 perl-Class-Throwable.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090112180730.783E870123@cvs1.fedora.phx.redhat.com>

Author: somlo

Update of /cvs/pkgs/rpms/perl-Class-Throwable/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5606/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-Class-Throwable.spec 
Log Message:
initial commit



--- NEW FILE import.log ---
perl-Class-Throwable-0_10-1_fc10:F-10:perl-Class-Throwable-0.10-1.fc10.src.rpm:1231783591


--- NEW FILE perl-Class-Throwable.spec ---
Name:           perl-Class-Throwable
Version:        0.10
Release:        1%{?dist}
Summary:        A minimal lightweight exception class
Group:          Development/Libraries
License:        GPL+ or Artistic
URL:            http://search.cpan.org/dist/Class-Throwable/
Source0:        http://search.cpan.org/CPAN/authors/id/S/ST/STEVAN/Class-Throwable-%{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(Test::Pod)
BuildRequires: perl(Test::Pod::Coverage)

%description
This module implements a minimal lightweight exception object. It is
meant to be a compromise between more basic solutions like Carp which
can only print information and cannot handle exception objects, and more
complex solutions like Exception::Class which can be used to define
complex inline exceptions and has a number of module dependencies. 

%prep
%setup -q -n Class-Throwable-%{version}

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make 

%install
rm -rf $RPM_BUILD_ROOT
make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';'
find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';'
chmod -R u+w $RPM_BUILD_ROOT/*

%check
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Changes README t/
%{perl_vendorlib}/*
%{_mandir}/man3/*.3*


%changelog
* Tue Jan  6 2008 Gabriel Somlo <somlo at cmu.edu> 0.10-1
- Initial Fedora package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Class-Throwable/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	11 Jan 2009 17:00:14 -0000	1.1
+++ .cvsignore	12 Jan 2009 18:07:00 -0000	1.2
@@ -0,0 +1 @@
+Class-Throwable-0.10.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Class-Throwable/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	11 Jan 2009 17:00:14 -0000	1.1
+++ sources	12 Jan 2009 18:07:00 -0000	1.2
@@ -0,0 +1 @@
+888ea61abfd8d9b60c024a997de9dbbd  Class-Throwable-0.10.tar.gz



From kevin at fedoraproject.org  Mon Jan 12 18:08:18 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 12 Jan 2009 18:08:18 +0000 (UTC)
Subject: rpms/munin/devel munin.spec,1.19,1.20
Message-ID: <20090112180818.E59B370123@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/munin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5739

Modified Files:
	munin.spec 
Log Message:
Fix to require the correct font



Index: munin.spec
===================================================================
RCS file: /cvs/extras/rpms/munin/devel/munin.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- munin.spec	11 Jan 2009 18:34:54 -0000	1.19
+++ munin.spec	12 Jan 2009 18:07:48 -0000	1.20
@@ -1,6 +1,6 @@
 Name:      munin
 Version:   1.2.6
-Release:   5%{?dist}
+Release:   6%{?dist}
 Summary:   Network-wide graphing framework (grapher/gatherer)
 License:   GPLv2 and Bitstream Vera
 Group:     System Environment/Daemons
@@ -25,7 +25,7 @@
 Requires: logrotate
 Requires(pre): shadow-utils
 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
-Requires: dejavu-fonts
+Requires: dejavu-fonts-sans-mono
 
 %description
 Munin is a highly flexible and powerful solution used to create graphs of
@@ -246,6 +246,9 @@
 %doc %{_mandir}/man5/munin-node*
 
 %changelog
+* Mon Jan 12 2009 Kevin Fenzi <kevin at tummy.com> - 1.2.6-6
+- Fix to require the correct font
+
 * Sun Jan 11 2009 Kevin Fenzi <kevin at tummy.com> - 1.2.6-5
 - Switch to using dejavu-fonts instead of bitstream-vera
 



From somlo at fedoraproject.org  Mon Jan 12 18:11:42 2009
From: somlo at fedoraproject.org (Gabriel L. Somlo)
Date: Mon, 12 Jan 2009 18:11:42 +0000 (UTC)
Subject: rpms/perl-Catalyst-Plugin-Authorization-ACL/devel
	perl-Catalyst-Plugin-Authorization-ACL.spec, 1.1, 1.2
Message-ID: <20090112181142.2916170123@cvs1.fedora.phx.redhat.com>

Author: somlo

Update of /cvs/pkgs/rpms/perl-Catalyst-Plugin-Authorization-ACL/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6540

Modified Files:
	perl-Catalyst-Plugin-Authorization-ACL.spec 
Log Message:
specfile cleanup



Index: perl-Catalyst-Plugin-Authorization-ACL.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Catalyst-Plugin-Authorization-ACL/devel/perl-Catalyst-Plugin-Authorization-ACL.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Catalyst-Plugin-Authorization-ACL.spec	12 Jan 2009 17:57:30 -0000	1.1
+++ perl-Catalyst-Plugin-Authorization-ACL.spec	12 Jan 2009 18:11:11 -0000	1.2
@@ -1,6 +1,6 @@
 Name:      perl-Catalyst-Plugin-Authorization-ACL
 Version:   0.10
-Release:   1
+Release:   2%{?dist}
 Summary:   ACL Support for Catalyst Applications
 License:   GPL+ or Artistic
 Group:     Development/Libraries
@@ -17,10 +17,6 @@
 BuildRequires:  perl(Test::More)
 BuildRequires:  perl(Tree::Simple::Visitor::FindByPath)
 BuildRequires:  perl(Tree::Simple::Visitor::GetAllDescendents)
-#BuildRequires:  perl(Test::Exception)
-#BuildRequires:  perl(Catalyst::Plugin::Authentication)
-#BuildRequires:  perl(Set::Object)
-#BuildRequires:  perl(UNIVERSAL::isa)
 ## required for tests
 BuildRequires: perl(Test::Pod)
 BuildRequires: perl(Test::Pod::Coverage)
@@ -82,5 +78,8 @@
 %{_mandir}/man3/*
 
 %changelog
+* Mon Jan 12 2009 Gabriel Somlo <somlo at cmu.edu> 0.10-2
+- specfile cleanup
+
 * Tue Jan 6 2009 Gabriel Somlo <somlo at cmu.edu> 0.10-1
 - initial specfile based on cpan2rpm and other catalyst examples by Chris Weyl



From buc at fedoraproject.org  Mon Jan 12 18:11:46 2009
From: buc at fedoraproject.org (Dmitry Butskoy)
Date: Mon, 12 Jan 2009 18:11:46 +0000 (UTC)
Subject: rpms/freetds/devel freetds.spec,1.19,1.20
Message-ID: <20090112181146.0608C70123@cvs1.fedora.phx.redhat.com>

Author: buc

Update of /cvs/extras/rpms/freetds/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6573

Modified Files:
	freetds.spec 
Log Message:



Index: freetds.spec
===================================================================
RCS file: /cvs/extras/rpms/freetds/devel/freetds.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- freetds.spec	12 Jan 2009 17:46:44 -0000	1.19
+++ freetds.spec	12 Jan 2009 18:11:15 -0000	1.20
@@ -55,9 +55,6 @@
 
 chmod -x samples/*.sh
 
-sed -i -e '/AM_INIT_AUTOMAKE/ i \
-AC_CONFIG_MACRO_DIR([m4])' configure.ac
-
 #  needed after patch0 ...
 autoreconf -f -i
  
@@ -66,16 +63,13 @@
 %configure \
 	--disable-dependency-tracking \
 	%{!?_with_static: --disable-static} \
+	--disable-rpath \
 	--with-tdsver="4.2" \
 	--with-unixodbc="%{_prefix}" \
 	--enable-msdblib \
 	--enable-sybase-compat \
 	--with-gnutls
 
-# avoid any rpath
-sed -i -e 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' \
-	-e 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
-
 make %{?_smp_mflags}
 
  



From somlo at fedoraproject.org  Mon Jan 12 18:13:27 2009
From: somlo at fedoraproject.org (Gabriel L. Somlo)
Date: Mon, 12 Jan 2009 18:13:27 +0000 (UTC)
Subject: rpms/perl-Catalyst-Plugin-Authorization-ACL/F-9
	perl-Catalyst-Plugin-Authorization-ACL.spec, 1.1, 1.2
Message-ID: <20090112181327.2596B70123@cvs1.fedora.phx.redhat.com>

Author: somlo

Update of /cvs/pkgs/rpms/perl-Catalyst-Plugin-Authorization-ACL/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6922

Modified Files:
	perl-Catalyst-Plugin-Authorization-ACL.spec 
Log Message:
specfile cleanup


Index: perl-Catalyst-Plugin-Authorization-ACL.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Catalyst-Plugin-Authorization-ACL/F-9/perl-Catalyst-Plugin-Authorization-ACL.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Catalyst-Plugin-Authorization-ACL.spec	12 Jan 2009 17:59:02 -0000	1.1
+++ perl-Catalyst-Plugin-Authorization-ACL.spec	12 Jan 2009 18:12:56 -0000	1.2
@@ -1,6 +1,6 @@
 Name:      perl-Catalyst-Plugin-Authorization-ACL
 Version:   0.10
-Release:   1
+Release:   2%{?dist}
 Summary:   ACL Support for Catalyst Applications
 License:   GPL+ or Artistic
 Group:     Development/Libraries
@@ -17,10 +17,6 @@
 BuildRequires:  perl(Test::More)
 BuildRequires:  perl(Tree::Simple::Visitor::FindByPath)
 BuildRequires:  perl(Tree::Simple::Visitor::GetAllDescendents)
-#BuildRequires:  perl(Test::Exception)
-#BuildRequires:  perl(Catalyst::Plugin::Authentication)
-#BuildRequires:  perl(Set::Object)
-#BuildRequires:  perl(UNIVERSAL::isa)
 ## required for tests
 BuildRequires: perl(Test::Pod)
 BuildRequires: perl(Test::Pod::Coverage)
@@ -82,5 +78,8 @@
 %{_mandir}/man3/*
 
 %changelog
+* Mon Jan 12 2009 Gabriel Somlo <somlo at cmu.edu> 0.10-2
+- specfile cleanup
+
 * Tue Jan 6 2009 Gabriel Somlo <somlo at cmu.edu> 0.10-1
 - initial specfile based on cpan2rpm and other catalyst examples by Chris Weyl



From somlo at fedoraproject.org  Mon Jan 12 18:14:17 2009
From: somlo at fedoraproject.org (Gabriel L. Somlo)
Date: Mon, 12 Jan 2009 18:14:17 +0000 (UTC)
Subject: rpms/perl-Catalyst-Plugin-Authorization-ACL/F-10
	perl-Catalyst-Plugin-Authorization-ACL.spec, 1.1, 1.2
Message-ID: <20090112181417.8948E70123@cvs1.fedora.phx.redhat.com>

Author: somlo

Update of /cvs/pkgs/rpms/perl-Catalyst-Plugin-Authorization-ACL/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7100

Modified Files:
	perl-Catalyst-Plugin-Authorization-ACL.spec 
Log Message:
specfile cleanup


Index: perl-Catalyst-Plugin-Authorization-ACL.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Catalyst-Plugin-Authorization-ACL/F-10/perl-Catalyst-Plugin-Authorization-ACL.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Catalyst-Plugin-Authorization-ACL.spec	12 Jan 2009 18:01:29 -0000	1.1
+++ perl-Catalyst-Plugin-Authorization-ACL.spec	12 Jan 2009 18:13:47 -0000	1.2
@@ -1,6 +1,6 @@
 Name:      perl-Catalyst-Plugin-Authorization-ACL
 Version:   0.10
-Release:   1
+Release:   2%{?dist}
 Summary:   ACL Support for Catalyst Applications
 License:   GPL+ or Artistic
 Group:     Development/Libraries
@@ -17,10 +17,6 @@
 BuildRequires:  perl(Test::More)
 BuildRequires:  perl(Tree::Simple::Visitor::FindByPath)
 BuildRequires:  perl(Tree::Simple::Visitor::GetAllDescendents)
-#BuildRequires:  perl(Test::Exception)
-#BuildRequires:  perl(Catalyst::Plugin::Authentication)
-#BuildRequires:  perl(Set::Object)
-#BuildRequires:  perl(UNIVERSAL::isa)
 ## required for tests
 BuildRequires: perl(Test::Pod)
 BuildRequires: perl(Test::Pod::Coverage)
@@ -82,5 +78,8 @@
 %{_mandir}/man3/*
 
 %changelog
+* Mon Jan 12 2009 Gabriel Somlo <somlo at cmu.edu> 0.10-2
+- specfile cleanup
+
 * Tue Jan 6 2009 Gabriel Somlo <somlo at cmu.edu> 0.10-1
 - initial specfile based on cpan2rpm and other catalyst examples by Chris Weyl



From thias at fedoraproject.org  Mon Jan 12 18:15:08 2009
From: thias at fedoraproject.org (Matthias Saou)
Date: Mon, 12 Jan 2009 18:15:08 +0000 (UTC)
Subject: rpms/elisa/devel .cvsignore, 1.9, 1.10 elisa.spec, 1.12,
	1.13 sources, 1.9, 1.10
Message-ID: <20090112181508.8421370123@cvs1.fedora.phx.redhat.com>

Author: thias

Update of /cvs/extras/rpms/elisa/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7283

Modified Files:
	.cvsignore elisa.spec sources 
Log Message:
Update to 0.5.23.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/elisa/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	1 Dec 2008 18:11:55 -0000	1.9
+++ .cvsignore	12 Jan 2009 18:14:38 -0000	1.10
@@ -1 +1 @@
-elisa-0.5.20.tar.gz
+elisa-0.5.23.tar.gz


Index: elisa.spec
===================================================================
RCS file: /cvs/extras/rpms/elisa/devel/elisa.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- elisa.spec	1 Dec 2008 18:11:55 -0000	1.12
+++ elisa.spec	12 Jan 2009 18:14:38 -0000	1.13
@@ -2,7 +2,7 @@
 
 Summary: Media Center
 Name: elisa
-Version: 0.5.20
+Version: 0.5.23
 Release: 1%{?dist}
 # The base of Elisa is GPLv3, some plugins are MIT but are in other packages.
 # See the included COPYING file for the details.
@@ -92,6 +92,12 @@
 
 
 %changelog
+* Mon Jan 12 2009 Matthias Saou <http://freshrpms.net/> 0.5.23-1
+- Update to 0.5.23.
+
+* Thu Dec 18 2008 Matthias Saou <http://freshrpms.net/> 0.5.22-1
+- Update to 0.5.22.
+
 * Mon Dec  1 2008 Matthias Saou <http://freshrpms.net/> 0.5.20-1
 - Update to 0.5.20.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/elisa/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	1 Dec 2008 18:11:55 -0000	1.9
+++ sources	12 Jan 2009 18:14:38 -0000	1.10
@@ -1 +1 @@
-440d1fbebe862c08b2e9db8b6a1da61d  elisa-0.5.20.tar.gz
+20c6a7606ac3a67f233bb5421bfbbb2a  elisa-0.5.23.tar.gz



From astokes at fedoraproject.org  Mon Jan 12 18:25:57 2009
From: astokes at fedoraproject.org (Adam Stokes)
Date: Mon, 12 Jan 2009 18:25:57 +0000 (UTC)
Subject: rpms/sos/devel sos.spec, 1.5, 1.6 sources, 1.3, 1.4 rhsupport.pub,
	1.1, NONE
Message-ID: <20090112182557.EDA6F70123@cvs1.fedora.phx.redhat.com>

Author: astokes

Update of /cvs/pkgs/rpms/sos/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8781

Modified Files:
	sos.spec sources 
Removed Files:
	rhsupport.pub 
Log Message:
- Resolves: bz459845 collect krb5.conf
- Resolves: bz457880 include output of xm list and xm list --long
- Resolves: bz457919 add support for openswan and ipsec-tools
- Resolves: bz456378 capture elilo configuration
- Resolves: bz445007 s390 support
- Resolves: bz371251 hangs when running with a xen kernel where xend has not been started
- Resolves: bz452705 Add /root/anaconda-ks-cfg to sosreport archive
- Resolves: bz445510 Do not rely on env to execute python
- Resolves: bz446868 add support for emc devices
- Resolves: bz453797 fails to generate fdisk -l
- Resolves: bz433183 does not collect ext3 information
- Resolves: bz444838 systool is passed deprecated arguments
- Resolves: bz455096 add %{INSTALLTIME:date} to rpm --qf collection
- Resolves: bz332211 avoid hazardous filenames



Index: sos.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sos/devel/sos.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sos.spec	29 Nov 2008 17:21:12 -0000	1.5
+++ sos.spec	12 Jan 2009 18:25:27 -0000	1.6
@@ -5,22 +5,17 @@
 Summary: A set of tools to gather troubleshooting information from a system
 Name: sos
 Version: 1.8
-Release: 3%{?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
-#  tar -czvf sos-1.7.tar.gz sos-1.7
-Source0: %{name}-%{version}.tar.gz
-Source1: rhsupport.pub
+Release: 5%{?dist}
+Group: Application/Tools
+Source0: https://fedorahosted.org/releases/s/o/sos/%{name}-%{version}.tar.gz
 License: GPLv2+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildArch: noarch
-Url: https://hosted.fedoraproject.org/projects/sos
+Url: http://fedorahosted.org/sos
 BuildRequires: python-devel
 Requires: libxml2-python
 Provides: sysreport = 1.4.3-13
-Obsoletes: sysreport < 1.4.3-13
+Obsoletes: sysreport
 
 %description
 Sos is a set of tools that gathers information about system
@@ -36,40 +31,50 @@
 
 %install
 rm -rf ${RPM_BUILD_ROOT}
-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
+install -D -m644 gpgkeys/rhsupport.pub ${RPM_BUILD_ROOT}/usr/share/sos/rhsupport.pub
+%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
+ln -s /usr/sbin/sosreport $RPM_BUILD_ROOT/usr/sbin/sysreport
 
 %clean
 rm -rf ${RPM_BUILD_ROOT}
 
-%files -f %{name}.lang
+%files
 %defattr(-,root,root,-)
-%{_sbindir}/sosreport
-%{_datadir}/sos/
 %{_bindir}/rh-upload-core
+%{_sbindir}/sosreport
 %{_sbindir}/sysreport
 %{_sbindir}/sysreport.legacy
-%{_datadir}/sysreport
+/usr/share/sysreport
+/usr/share/sos/rhsupport.pub
 %{python_sitelib}/sos/
-%{python_sitelib}/%{name}-0.0.0-py*.egg-info
-%{_mandir}/man1/sosreport.1*
+%{_mandir}/man1/sosreport.1.gz
+%{_localedir}/*/LC_MESSAGES/sos.mo
 %doc README README.rh-upload-core TODO LICENSE ChangeLog
-%config(noreplace) %{_sysconfdir}/sos.conf
+%config %{_sysconfdir}/sos.conf
 
 %changelog
-* Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 1.8-3
-- Rebuild for Python 2.6
-
-* Thu Sep  4 2008 Tom "spot" Callaway <tcallawa at redhat.com> 1.8-2
-- more cleanups to get this package building
+* Mon Dec 29 2008 Adam Stokes <ajs at redhat dot com> - 1.8-5
+- removed source defines as python manifest handles this
 
-* 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)
+* Fri Dec 19 2008 Adam Stokes <ajs at redhat dot com> - 1.8-4
+- spec cleanup, fixed license, source
+- reworked Makefile to build properly
+
+* Thu Oct 23 2008 Adam Stokes <astokes at redhat dot com> - 1.8-1
+- Resolves: bz459845 collect krb5.conf
+- Resolves: bz457880 include output of xm list and xm list --long
+- Resolves: bz457919 add support for openswan and ipsec-tools
+- Resolves: bz456378 capture elilo configuration
+- Resolves: bz445007 s390 support
+- Resolves: bz371251 hangs when running with a xen kernel where xend has not been started
+- Resolves: bz452705 Add /root/anaconda-ks-cfg to sosreport archive
+- Resolves: bz445510 Do not rely on env to execute python
+- Resolves: bz446868 add support for emc devices
+- Resolves: bz453797 fails to generate fdisk -l
+- Resolves: bz433183 does not collect ext3 information
+- Resolves: bz444838 systool is passed deprecated arguments
+- Resolves: bz455096 add %{INSTALLTIME:date} to rpm --qf collection
+- Resolves: bz332211 avoid hazardous filenames
 
 * Wed Nov 21 2007 Navid Sheikhol-Eslami <navid at redhat dot com> - 1.8-0
 - Resolves: bz368261 sosGetCommandOutput() does not block on hung processes


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sos/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	13 Dec 2007 10:37:05 -0000	1.3
+++ sources	12 Jan 2009 18:25:27 -0000	1.4
@@ -1 +1 @@
-fc839be48e8eb5b294e3c64cf0b8e65e  sos-1.8.tar.gz
+04ad06ffb0bc24f96f5704c0c577aaf8  sos-1.8.tar.gz


--- rhsupport.pub DELETED ---



From quantumburnz at fedoraproject.org  Mon Jan 12 18:32:02 2009
From: quantumburnz at fedoraproject.org (Christopher D. Stover)
Date: Mon, 12 Jan 2009 18:32:02 +0000 (UTC)
Subject: rpms/barry/devel barry.spec,1.4,1.5
Message-ID: <20090112183202.14C2170123@cvs1.fedora.phx.redhat.com>

Author: quantumburnz

Update of /cvs/pkgs/rpms/barry/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9815

Modified Files:
	barry.spec 
Log Message:
Add libtool to BuildRequires



Index: barry.spec
===================================================================
RCS file: /cvs/pkgs/rpms/barry/devel/barry.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- barry.spec	12 Jan 2009 18:03:33 -0000	1.4
+++ barry.spec	12 Jan 2009 18:31:31 -0000	1.5
@@ -24,7 +24,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libusb-devel boost-devel desktop-file-utils gtkmm24-devel
-BuildRequires:  libglademm24-devel libglade2-devel libtar-devel
+BuildRequires:  libglademm24-devel libglade2-devel libtar-devel libtool
 Requires:       initscripts
 
 %description



From astokes at fedoraproject.org  Mon Jan 12 18:32:03 2009
From: astokes at fedoraproject.org (Adam Stokes)
Date: Mon, 12 Jan 2009 18:32:03 +0000 (UTC)
Subject: rpms/sos/F-10 sos.spec, 1.4, 1.5 sources, 1.3, 1.4 rhsupport.pub,
	1.1, NONE
Message-ID: <20090112183203.19CE070123@cvs1.fedora.phx.redhat.com>

Author: astokes

Update of /cvs/pkgs/rpms/sos/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9941

Modified Files:
	sos.spec sources 
Removed Files:
	rhsupport.pub 
Log Message:
- Resolves: bz459845 collect krb5.conf
- Resolves: bz457880 include output of xm list and xm list --long
- Resolves: bz457919 add support for openswan and ipsec-tools
- Resolves: bz456378 capture elilo configuration
- Resolves: bz445007 s390 support
- Resolves: bz371251 hangs when running with a xen kernel where xend has not been started
- Resolves: bz452705 Add /root/anaconda-ks-cfg to sosreport archive
- Resolves: bz445510 Do not rely on env to execute python
- Resolves: bz446868 add support for emc devices
- Resolves: bz453797 fails to generate fdisk -l
- Resolves: bz433183 does not collect ext3 information
- Resolves: bz444838 systool is passed deprecated arguments
- Resolves: bz455096 add %{INSTALLTIME:date} to rpm --qf collection
- Resolves: bz332211 avoid hazardous filenames



Index: sos.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sos/F-10/sos.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sos.spec	4 Sep 2008 22:07:42 -0000	1.4
+++ sos.spec	12 Jan 2009 18:31:32 -0000	1.5
@@ -5,22 +5,17 @@
 Summary: A set of tools to gather troubleshooting information from a system
 Name: sos
 Version: 1.8
-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
-#  tar -czvf sos-1.7.tar.gz sos-1.7
-Source0: %{name}-%{version}.tar.gz
-Source1: rhsupport.pub
+Release: 5%{?dist}
+Group: Application/Tools
+Source0: https://fedorahosted.org/releases/s/o/sos/%{name}-%{version}.tar.gz
 License: GPLv2+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildArch: noarch
-Url: https://hosted.fedoraproject.org/projects/sos
+Url: http://fedorahosted.org/sos
 BuildRequires: python-devel
 Requires: libxml2-python
 Provides: sysreport = 1.4.3-13
-Obsoletes: sysreport < 1.4.3-13
+Obsoletes: sysreport
 
 %description
 Sos is a set of tools that gathers information about system
@@ -36,37 +31,50 @@
 
 %install
 rm -rf ${RPM_BUILD_ROOT}
-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
+install -D -m644 gpgkeys/rhsupport.pub ${RPM_BUILD_ROOT}/usr/share/sos/rhsupport.pub
+%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
+ln -s /usr/sbin/sosreport $RPM_BUILD_ROOT/usr/sbin/sysreport
 
 %clean
 rm -rf ${RPM_BUILD_ROOT}
 
-%files -f %{name}.lang
+%files
 %defattr(-,root,root,-)
-%{_sbindir}/sosreport
-%{_datadir}/sos/
 %{_bindir}/rh-upload-core
+%{_sbindir}/sosreport
 %{_sbindir}/sysreport
 %{_sbindir}/sysreport.legacy
-%{_datadir}/sysreport
+/usr/share/sysreport
+/usr/share/sos/rhsupport.pub
 %{python_sitelib}/sos/
-%{python_sitelib}/%{name}-0.0.0-py*.egg-info
-%{_mandir}/man1/sosreport.1*
+%{_mandir}/man1/sosreport.1.gz
+%{_localedir}/*/LC_MESSAGES/sos.mo
 %doc README README.rh-upload-core TODO LICENSE ChangeLog
-%config(noreplace) %{_sysconfdir}/sos.conf
+%config %{_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
+* Mon Dec 29 2008 Adam Stokes <ajs at redhat dot com> - 1.8-5
+- removed source defines as python manifest handles this
 
-* 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)
+* Fri Dec 19 2008 Adam Stokes <ajs at redhat dot com> - 1.8-4
+- spec cleanup, fixed license, source
+- reworked Makefile to build properly
+
+* Thu Oct 23 2008 Adam Stokes <astokes at redhat dot com> - 1.8-1
+- Resolves: bz459845 collect krb5.conf
+- Resolves: bz457880 include output of xm list and xm list --long
+- Resolves: bz457919 add support for openswan and ipsec-tools
+- Resolves: bz456378 capture elilo configuration
+- Resolves: bz445007 s390 support
+- Resolves: bz371251 hangs when running with a xen kernel where xend has not been started
+- Resolves: bz452705 Add /root/anaconda-ks-cfg to sosreport archive
+- Resolves: bz445510 Do not rely on env to execute python
+- Resolves: bz446868 add support for emc devices
+- Resolves: bz453797 fails to generate fdisk -l
+- Resolves: bz433183 does not collect ext3 information
+- Resolves: bz444838 systool is passed deprecated arguments
+- Resolves: bz455096 add %{INSTALLTIME:date} to rpm --qf collection
+- Resolves: bz332211 avoid hazardous filenames
 
 * Wed Nov 21 2007 Navid Sheikhol-Eslami <navid at redhat dot com> - 1.8-0
 - Resolves: bz368261 sosGetCommandOutput() does not block on hung processes


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sos/F-10/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	13 Dec 2007 10:37:05 -0000	1.3
+++ sources	12 Jan 2009 18:31:32 -0000	1.4
@@ -1 +1 @@
-fc839be48e8eb5b294e3c64cf0b8e65e  sos-1.8.tar.gz
+04ad06ffb0bc24f96f5704c0c577aaf8  sos-1.8.tar.gz


--- rhsupport.pub DELETED ---



From astokes at fedoraproject.org  Mon Jan 12 18:33:28 2009
From: astokes at fedoraproject.org (Adam Stokes)
Date: Mon, 12 Jan 2009 18:33:28 +0000 (UTC)
Subject: rpms/sos/F-9 sources,1.3,1.4 rhsupport.pub,1.1,NONE
Message-ID: <20090112183328.587ED70123@cvs1.fedora.phx.redhat.com>

Author: astokes

Update of /cvs/pkgs/rpms/sos/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10703

Modified Files:
	sources 
Removed Files:
	rhsupport.pub 
Log Message:
- Resolves: bz459845 collect krb5.conf
- Resolves: bz457880 include output of xm list and xm list --long
- Resolves: bz457919 add support for openswan and ipsec-tools
- Resolves: bz456378 capture elilo configuration
- Resolves: bz445007 s390 support
- Resolves: bz371251 hangs when running with a xen kernel where xend has not been started
- Resolves: bz452705 Add /root/anaconda-ks-cfg to sosreport archive
- Resolves: bz445510 Do not rely on env to execute python
- Resolves: bz446868 add support for emc devices
- Resolves: bz453797 fails to generate fdisk -l
- Resolves: bz433183 does not collect ext3 information
- Resolves: bz444838 systool is passed deprecated arguments
- Resolves: bz455096 add %{INSTALLTIME:date} to rpm --qf collection
- Resolves: bz332211 avoid hazardous filenames



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sos/F-9/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	13 Dec 2007 10:37:05 -0000	1.3
+++ sources	12 Jan 2009 18:32:58 -0000	1.4
@@ -1 +1 @@
-fc839be48e8eb5b294e3c64cf0b8e65e  sos-1.8.tar.gz
+04ad06ffb0bc24f96f5704c0c577aaf8  sos-1.8.tar.gz


--- rhsupport.pub DELETED ---



From astokes at fedoraproject.org  Mon Jan 12 18:34:36 2009
From: astokes at fedoraproject.org (Adam Stokes)
Date: Mon, 12 Jan 2009 18:34:36 +0000 (UTC)
Subject: rpms/sos/F-9 sos.spec,1.2,1.3
Message-ID: <20090112183436.025BF70123@cvs1.fedora.phx.redhat.com>

Author: astokes

Update of /cvs/pkgs/rpms/sos/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11214

Modified Files:
	sos.spec 
Log Message:
updated sos.spec



Index: sos.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sos/F-9/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	12 Jan 2009 18:34:05 -0000	1.3
@@ -1,26 +1,17 @@
 %{!?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: 5%{?dist}
 Group: Application/Tools
-# 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
-#  tar -czvf sos-1.7.tar.gz sos-1.7
-Source0: %{name}-%{version}.tar.gz
-Source1: rhsupport.pub
-License: GPL
+Source0: https://fedorahosted.org/releases/s/o/sos/%{name}-%{version}.tar.gz
+License: GPLv2+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildArch: noarch
-Url: https://hosted.fedoraproject.org/projects/sos
+Url: http://fedorahosted.org/sos
 BuildRequires: python-devel
 Requires: libxml2-python
 Provides: sysreport = 1.4.3-13
@@ -36,12 +27,12 @@
 %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
+install -D -m644 gpgkeys/rhsupport.pub ${RPM_BUILD_ROOT}/usr/share/sos/rhsupport.pub
+%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
 ln -s /usr/sbin/sosreport $RPM_BUILD_ROOT/usr/sbin/sysreport
 
 %clean
@@ -49,19 +40,42 @@
 
 %files
 %defattr(-,root,root,-)
+%{_bindir}/rh-upload-core
 %{_sbindir}/sosreport
-/usr/share/sos/rhsupport.pub
-/usr/bin/rh-upload-core
-/usr/sbin/sysreport
-/usr/sbin/sysreport.legacy
+%{_sbindir}/sysreport
+%{_sbindir}/sysreport.legacy
 /usr/share/sysreport
+/usr/share/sos/rhsupport.pub
 %{python_sitelib}/sos/
-%{_mandir}/man1/sosreport.1*
+%{_mandir}/man1/sosreport.1.gz
 %{_localedir}/*/LC_MESSAGES/sos.mo
 %doc README README.rh-upload-core TODO LICENSE ChangeLog
-%config /etc/sos.conf
+%config %{_sysconfdir}/sos.conf
 
 %changelog
+* Mon Dec 29 2008 Adam Stokes <ajs at redhat dot com> - 1.8-5
+- removed source defines as python manifest handles this
+
+* Fri Dec 19 2008 Adam Stokes <ajs at redhat dot com> - 1.8-4
+- spec cleanup, fixed license, source
+- reworked Makefile to build properly
+
+* Thu Oct 23 2008 Adam Stokes <astokes at redhat dot com> - 1.8-1
+- Resolves: bz459845 collect krb5.conf
+- Resolves: bz457880 include output of xm list and xm list --long
+- Resolves: bz457919 add support for openswan and ipsec-tools
+- Resolves: bz456378 capture elilo configuration
+- Resolves: bz445007 s390 support
+- Resolves: bz371251 hangs when running with a xen kernel where xend has not been started
+- Resolves: bz452705 Add /root/anaconda-ks-cfg to sosreport archive
+- Resolves: bz445510 Do not rely on env to execute python
+- Resolves: bz446868 add support for emc devices
+- Resolves: bz453797 fails to generate fdisk -l
+- Resolves: bz433183 does not collect ext3 information
+- Resolves: bz444838 systool is passed deprecated arguments
+- Resolves: bz455096 add %{INSTALLTIME:date} to rpm --qf collection
+- Resolves: bz332211 avoid hazardous filenames
+
 * 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 somlo at fedoraproject.org  Mon Jan 12 18:35:38 2009
From: somlo at fedoraproject.org (Gabriel L. Somlo)
Date: Mon, 12 Jan 2009 18:35:38 +0000 (UTC)
Subject: rpms/wmx/devel import.log, NONE, 1.1 wmx-7-cfg.patch, NONE,
	1.1 .cvsignore, 1.3, 1.4 background.xpm, 1.1, 1.2 sources, 1.3,
	1.4 wmx.spec, 1.15, 1.16 wmx-6pl1-cfg.patch, 1.3,
	NONE wmx-6pl1-cvs20071113.patch, 1.1, NONE
Message-ID: <20090112183538.8F1A770123@cvs1.fedora.phx.redhat.com>

Author: somlo

Update of /cvs/pkgs/rpms/wmx/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11618/devel

Modified Files:
	.cvsignore background.xpm sources wmx.spec 
Added Files:
	import.log wmx-7-cfg.patch 
Removed Files:
	wmx-6pl1-cfg.patch wmx-6pl1-cvs20071113.patch 
Log Message:
update to wmx-7



--- NEW FILE import.log ---
wmx-7-1_fc10:HEAD:wmx-7-1.fc10.src.rpm:1231785276

wmx-7-cfg.patch:

--- NEW FILE wmx-7-cfg.patch ---
diff -NarU5 wmx-7.orig/Config.h wmx-7/Config.h
--- wmx-7.orig/Config.h	2009-01-09 06:18:03.000000000 -0500
+++ wmx-7/Config.h	2009-01-11 12:22:25.000000000 -0500
@@ -93,11 +93,11 @@
  
 // Directory under $HOME in which to look for commands for the
 // middle-button menu
 #define CONFIG_COMMAND_MENU       ".wmx"
 // only used if COMMAND_MENU is not found; ignored if invalid directory:
-#define CONFIG_SYSTEM_COMMAND_MENU	"/usr/local/lib/wmx/menu"
+#define CONFIG_SYSTEM_COMMAND_MENU	"/usr/share/wmx"
 // append screennumber to COMMAND_MENU directory;
 // use non screen style as fallback
 #define CONFIG_ADD_SCREEN_TO_COMMAND_MENU False
  
 // Focus possibilities.
@@ -126,11 +126,11 @@
 
 // Number of pixels off the screen you have to push a window
 // before the manager notices the window is off-screen (the higher
 // the value, the easier it is to place windows at the screen edges)
 
-#define CONFIG_BUMP_DISTANCE      16
+#define CONFIG_BUMP_DISTANCE      32
 
 // If CONFIG_BUMP_EVERYWHERE is defined, windows will "bump" against
 // other window edges as well as the edges of the screen
 
 #define CONFIG_BUMP_EVERYWHERE    True
@@ -185,11 +185,11 @@
 
 // This is the key for wm controls: e.g. Alt/Left and Alt/Right to
 // flip channels, and Alt/Tab to switch windows.  (On my 105-key
 // PC keyboard, Meta_L corresponds to the left Windows key.)
 
-#define CONFIG_ALT_KEY            XK_Super_L
+#define CONFIG_ALT_KEY            XK_Meta_L
 
 // And these define the rest of the keyboard controls, when the above
 // modifier is pressed; they're keysyms as defined in <X11/keysym.h>
 // and <X11/keysymdef.h>
 
@@ -329,11 +329,11 @@
 #define CONFIG_MENU_BORDERS       "black"
 
 // Pixel width for the bit of frame to the left of the window and the
 // sum of the two bits at the top
 
-#define CONFIG_FRAME_THICKNESS    8
+#define CONFIG_FRAME_THICKNESS    6
 
 
 // ========================
 // Section IV. Flashy stuff
 // ========================
@@ -342,11 +342,11 @@
 // in ./background.xpm; if USE_PIXMAP_MENUS is also True, the menus
 // will be too.  The latter screws up in palette-based visuals, but
 // should be okay in true-colour.
 
 #define CONFIG_USE_PIXMAPS        True
-#define CONFIG_USE_PIXMAP_MENUS   True
+#define CONFIG_USE_PIXMAP_MENUS   False
 
 // Set CHANNEL_SURF for multi-channel switching; CHANNEL_CLICK_SIZE is
 // how close you have to middle-button-click to the top-right corner
 // of the root window before the channel change happens.  Set
 // USE_CHANNEL_KEYS if you want Alt-F1, Alt-F2 etc for quick channel


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/wmx/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	15 Nov 2007 01:48:40 -0000	1.3
+++ .cvsignore	12 Jan 2009 18:35:08 -0000	1.4
@@ -1,2 +1,2 @@
-wmx-6pl1.tar.gz
 wmx-defaults-1.tar.gz
+wmx-7.tar.gz


Index: background.xpm
===================================================================
RCS file: /cvs/pkgs/rpms/wmx/devel/background.xpm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- background.xpm	14 Feb 2006 21:20:05 -0000	1.1
+++ background.xpm	12 Jan 2009 18:35:08 -0000	1.2
@@ -1,5 +1,5 @@
 /* XPM */
-static char *background[] = {
+static const char *background[] = {
 /* width height num_colors chars_per_pixel */
 "    80    80       27            1",
 /* colors */


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/wmx/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	15 Nov 2007 01:48:40 -0000	1.3
+++ sources	12 Jan 2009 18:35:08 -0000	1.4
@@ -1,2 +1,2 @@
-212297d70acef90bbc9dac254de39cb8  wmx-6pl1.tar.gz
 a5f221d36884276cbf331414d4f2a761  wmx-defaults-1.tar.gz
+e8eda438f5dda09d11ba7de1dcf9e501  wmx-7.tar.gz


Index: wmx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wmx/devel/wmx.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- wmx.spec	20 Feb 2008 00:42:55 -0000	1.15
+++ wmx.spec	12 Jan 2009 18:35:08 -0000	1.16
@@ -1,6 +1,6 @@
 Name: wmx
-Version: 6pl1
-Release: 18%{?dist}
+Version: 7
+Release: 1%{?dist}
 Summary: A really simple window manager for X
 License: BSD
 Group: User Interface/X
@@ -11,10 +11,9 @@
 Source3: wmx.desktop
 Source4: Xclients.wmx.sh
 Source5: xnodecor.c
-Patch0: wmx-6pl1-cvs20071113.patch
-Patch1: wmx-6pl1-cfg.patch
+Patch0: wmx-7-cfg.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: xorg-x11-proto-devel libX11-devel libXpm-devel libXext-devel libXaw-devel libXt-devel
+BuildRequires: xorg-x11-proto-devel libX11-devel libXpm-devel libXext-devel libXaw-devel libXt-devel freetype-devel libXft-devel
 
 %description
 A really simple window manager for X, based on wm2, with a minimal set of
@@ -22,10 +21,9 @@
 
 %prep
 %setup -q
-%setup -a 1
-%{__install} -p %{SOURCE2} .
+%setup -q -a 1
+%{__install} -p -m 0644 %{SOURCE2} .
 %patch0 -p1
-%patch1 -p1
 
 %build
 %configure --x-libraries=%{_libdir} --x-includes=%{_includedir}/X11
@@ -47,12 +45,15 @@
 
 %files
 %defattr(-,root,root)
-%doc README* UPDATES ANNOYING-BUGS
+%doc README* UPDATES TODO.netwm rsharman-patch/
 %{_bindir}/*
 %{_datadir}/*
 %{_sysconfdir}/X11/xinit/Xclients.d/*
 
 %changelog
+* Sat Jan 10 2009 Gabriel Somlo <somlo at cmu.edu> 7-1 
+- update to 7
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 6pl1-18
 - Autorebuild for GCC 4.3
 
@@ -113,8 +114,8 @@
 * Fri Dec 16 2005 Gabriel Somlo <somlo at cmu.edu> 6pl1-3
 - spec file fixes as per P. Lemenkov and I. Vazquez
 - default menu entries now go in /usr/share/wmx/menu
-- example wmx .xsession file added to %doc
-- gave up on using /usr/X11R6/bin -- using %{_bindir} instead 
+- example wmx .xsession file added to doc
+- gave up on using /usr/X11R6/bin -- using bindir instead 
 
 * Wed Dec 14 2005 Gabriel Somlo <somlo at cmu.edu> 6pl1-2
 - increased bump-distance parameter for easier placement at edge of screen


--- wmx-6pl1-cfg.patch DELETED ---


--- wmx-6pl1-cvs20071113.patch DELETED ---



From somlo at fedoraproject.org  Mon Jan 12 18:37:19 2009
From: somlo at fedoraproject.org (Gabriel L. Somlo)
Date: Mon, 12 Jan 2009 18:37:19 +0000 (UTC)
Subject: rpms/wmx/F-9 import.log, NONE, 1.1 wmx-7-cfg.patch, NONE,
	1.1 .cvsignore, 1.3, 1.4 background.xpm, 1.1, 1.2 sources, 1.3,
	1.4 wmx.spec, 1.15, 1.16 wmx-6pl1-cfg.patch, 1.3,
	NONE wmx-6pl1-cvs20071113.patch, 1.1, NONE
Message-ID: <20090112183719.47A8D70123@cvs1.fedora.phx.redhat.com>

Author: somlo

Update of /cvs/pkgs/rpms/wmx/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12213/F-9

Modified Files:
	.cvsignore background.xpm sources wmx.spec 
Added Files:
	import.log wmx-7-cfg.patch 
Removed Files:
	wmx-6pl1-cfg.patch wmx-6pl1-cvs20071113.patch 
Log Message:
update to wmx-7



--- NEW FILE import.log ---
wmx-7-1_fc10:F-9:wmx-7-1.fc10.src.rpm:1231785374

wmx-7-cfg.patch:

--- NEW FILE wmx-7-cfg.patch ---
diff -NarU5 wmx-7.orig/Config.h wmx-7/Config.h
--- wmx-7.orig/Config.h	2009-01-09 06:18:03.000000000 -0500
+++ wmx-7/Config.h	2009-01-11 12:22:25.000000000 -0500
@@ -93,11 +93,11 @@
  
 // Directory under $HOME in which to look for commands for the
 // middle-button menu
 #define CONFIG_COMMAND_MENU       ".wmx"
 // only used if COMMAND_MENU is not found; ignored if invalid directory:
-#define CONFIG_SYSTEM_COMMAND_MENU	"/usr/local/lib/wmx/menu"
+#define CONFIG_SYSTEM_COMMAND_MENU	"/usr/share/wmx"
 // append screennumber to COMMAND_MENU directory;
 // use non screen style as fallback
 #define CONFIG_ADD_SCREEN_TO_COMMAND_MENU False
  
 // Focus possibilities.
@@ -126,11 +126,11 @@
 
 // Number of pixels off the screen you have to push a window
 // before the manager notices the window is off-screen (the higher
 // the value, the easier it is to place windows at the screen edges)
 
-#define CONFIG_BUMP_DISTANCE      16
+#define CONFIG_BUMP_DISTANCE      32
 
 // If CONFIG_BUMP_EVERYWHERE is defined, windows will "bump" against
 // other window edges as well as the edges of the screen
 
 #define CONFIG_BUMP_EVERYWHERE    True
@@ -185,11 +185,11 @@
 
 // This is the key for wm controls: e.g. Alt/Left and Alt/Right to
 // flip channels, and Alt/Tab to switch windows.  (On my 105-key
 // PC keyboard, Meta_L corresponds to the left Windows key.)
 
-#define CONFIG_ALT_KEY            XK_Super_L
+#define CONFIG_ALT_KEY            XK_Meta_L
 
 // And these define the rest of the keyboard controls, when the above
 // modifier is pressed; they're keysyms as defined in <X11/keysym.h>
 // and <X11/keysymdef.h>
 
@@ -329,11 +329,11 @@
 #define CONFIG_MENU_BORDERS       "black"
 
 // Pixel width for the bit of frame to the left of the window and the
 // sum of the two bits at the top
 
-#define CONFIG_FRAME_THICKNESS    8
+#define CONFIG_FRAME_THICKNESS    6
 
 
 // ========================
 // Section IV. Flashy stuff
 // ========================
@@ -342,11 +342,11 @@
 // in ./background.xpm; if USE_PIXMAP_MENUS is also True, the menus
 // will be too.  The latter screws up in palette-based visuals, but
 // should be okay in true-colour.
 
 #define CONFIG_USE_PIXMAPS        True
-#define CONFIG_USE_PIXMAP_MENUS   True
+#define CONFIG_USE_PIXMAP_MENUS   False
 
 // Set CHANNEL_SURF for multi-channel switching; CHANNEL_CLICK_SIZE is
 // how close you have to middle-button-click to the top-right corner
 // of the root window before the channel change happens.  Set
 // USE_CHANNEL_KEYS if you want Alt-F1, Alt-F2 etc for quick channel


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/wmx/F-9/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	15 Nov 2007 01:48:40 -0000	1.3
+++ .cvsignore	12 Jan 2009 18:36:48 -0000	1.4
@@ -1,2 +1,2 @@
-wmx-6pl1.tar.gz
 wmx-defaults-1.tar.gz
+wmx-7.tar.gz


Index: background.xpm
===================================================================
RCS file: /cvs/pkgs/rpms/wmx/F-9/background.xpm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- background.xpm	14 Feb 2006 21:20:05 -0000	1.1
+++ background.xpm	12 Jan 2009 18:36:48 -0000	1.2
@@ -1,5 +1,5 @@
 /* XPM */
-static char *background[] = {
+static const char *background[] = {
 /* width height num_colors chars_per_pixel */
 "    80    80       27            1",
 /* colors */


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/wmx/F-9/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	15 Nov 2007 01:48:40 -0000	1.3
+++ sources	12 Jan 2009 18:36:48 -0000	1.4
@@ -1,2 +1,2 @@
-212297d70acef90bbc9dac254de39cb8  wmx-6pl1.tar.gz
 a5f221d36884276cbf331414d4f2a761  wmx-defaults-1.tar.gz
+e8eda438f5dda09d11ba7de1dcf9e501  wmx-7.tar.gz


Index: wmx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wmx/F-9/wmx.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- wmx.spec	20 Feb 2008 00:42:55 -0000	1.15
+++ wmx.spec	12 Jan 2009 18:36:48 -0000	1.16
@@ -1,6 +1,6 @@
 Name: wmx
-Version: 6pl1
-Release: 18%{?dist}
+Version: 7
+Release: 1%{?dist}
 Summary: A really simple window manager for X
 License: BSD
 Group: User Interface/X
@@ -11,10 +11,9 @@
 Source3: wmx.desktop
 Source4: Xclients.wmx.sh
 Source5: xnodecor.c
-Patch0: wmx-6pl1-cvs20071113.patch
-Patch1: wmx-6pl1-cfg.patch
+Patch0: wmx-7-cfg.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: xorg-x11-proto-devel libX11-devel libXpm-devel libXext-devel libXaw-devel libXt-devel
+BuildRequires: xorg-x11-proto-devel libX11-devel libXpm-devel libXext-devel libXaw-devel libXt-devel freetype-devel libXft-devel
 
 %description
 A really simple window manager for X, based on wm2, with a minimal set of
@@ -22,10 +21,9 @@
 
 %prep
 %setup -q
-%setup -a 1
-%{__install} -p %{SOURCE2} .
+%setup -q -a 1
+%{__install} -p -m 0644 %{SOURCE2} .
 %patch0 -p1
-%patch1 -p1
 
 %build
 %configure --x-libraries=%{_libdir} --x-includes=%{_includedir}/X11
@@ -47,12 +45,15 @@
 
 %files
 %defattr(-,root,root)
-%doc README* UPDATES ANNOYING-BUGS
+%doc README* UPDATES TODO.netwm rsharman-patch/
 %{_bindir}/*
 %{_datadir}/*
 %{_sysconfdir}/X11/xinit/Xclients.d/*
 
 %changelog
+* Sat Jan 10 2009 Gabriel Somlo <somlo at cmu.edu> 7-1 
+- update to 7
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 6pl1-18
 - Autorebuild for GCC 4.3
 
@@ -113,8 +114,8 @@
 * Fri Dec 16 2005 Gabriel Somlo <somlo at cmu.edu> 6pl1-3
 - spec file fixes as per P. Lemenkov and I. Vazquez
 - default menu entries now go in /usr/share/wmx/menu
-- example wmx .xsession file added to %doc
-- gave up on using /usr/X11R6/bin -- using %{_bindir} instead 
+- example wmx .xsession file added to doc
+- gave up on using /usr/X11R6/bin -- using bindir instead 
 
 * Wed Dec 14 2005 Gabriel Somlo <somlo at cmu.edu> 6pl1-2
 - increased bump-distance parameter for easier placement at edge of screen


--- wmx-6pl1-cfg.patch DELETED ---


--- wmx-6pl1-cvs20071113.patch DELETED ---



From somlo at fedoraproject.org  Mon Jan 12 18:38:51 2009
From: somlo at fedoraproject.org (Gabriel L. Somlo)
Date: Mon, 12 Jan 2009 18:38:51 +0000 (UTC)
Subject: rpms/wmx/F-10 import.log, NONE, 1.1 wmx-7-cfg.patch, NONE,
	1.1 .cvsignore, 1.3, 1.4 background.xpm, 1.1, 1.2 sources, 1.3,
	1.4 wmx.spec, 1.15, 1.16 wmx-6pl1-cfg.patch, 1.3,
	NONE wmx-6pl1-cvs20071113.patch, 1.1, NONE
Message-ID: <20090112183851.3F00670123@cvs1.fedora.phx.redhat.com>

Author: somlo

Update of /cvs/pkgs/rpms/wmx/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12723/F-10

Modified Files:
	.cvsignore background.xpm sources wmx.spec 
Added Files:
	import.log wmx-7-cfg.patch 
Removed Files:
	wmx-6pl1-cfg.patch wmx-6pl1-cvs20071113.patch 
Log Message:
update to wmx-7



--- NEW FILE import.log ---
wmx-7-1_fc10:F-10:wmx-7-1.fc10.src.rpm:1231785475

wmx-7-cfg.patch:

--- NEW FILE wmx-7-cfg.patch ---
diff -NarU5 wmx-7.orig/Config.h wmx-7/Config.h
--- wmx-7.orig/Config.h	2009-01-09 06:18:03.000000000 -0500
+++ wmx-7/Config.h	2009-01-11 12:22:25.000000000 -0500
@@ -93,11 +93,11 @@
  
 // Directory under $HOME in which to look for commands for the
 // middle-button menu
 #define CONFIG_COMMAND_MENU       ".wmx"
 // only used if COMMAND_MENU is not found; ignored if invalid directory:
-#define CONFIG_SYSTEM_COMMAND_MENU	"/usr/local/lib/wmx/menu"
+#define CONFIG_SYSTEM_COMMAND_MENU	"/usr/share/wmx"
 // append screennumber to COMMAND_MENU directory;
 // use non screen style as fallback
 #define CONFIG_ADD_SCREEN_TO_COMMAND_MENU False
  
 // Focus possibilities.
@@ -126,11 +126,11 @@
 
 // Number of pixels off the screen you have to push a window
 // before the manager notices the window is off-screen (the higher
 // the value, the easier it is to place windows at the screen edges)
 
-#define CONFIG_BUMP_DISTANCE      16
+#define CONFIG_BUMP_DISTANCE      32
 
 // If CONFIG_BUMP_EVERYWHERE is defined, windows will "bump" against
 // other window edges as well as the edges of the screen
 
 #define CONFIG_BUMP_EVERYWHERE    True
@@ -185,11 +185,11 @@
 
 // This is the key for wm controls: e.g. Alt/Left and Alt/Right to
 // flip channels, and Alt/Tab to switch windows.  (On my 105-key
 // PC keyboard, Meta_L corresponds to the left Windows key.)
 
-#define CONFIG_ALT_KEY            XK_Super_L
+#define CONFIG_ALT_KEY            XK_Meta_L
 
 // And these define the rest of the keyboard controls, when the above
 // modifier is pressed; they're keysyms as defined in <X11/keysym.h>
 // and <X11/keysymdef.h>
 
@@ -329,11 +329,11 @@
 #define CONFIG_MENU_BORDERS       "black"
 
 // Pixel width for the bit of frame to the left of the window and the
 // sum of the two bits at the top
 
-#define CONFIG_FRAME_THICKNESS    8
+#define CONFIG_FRAME_THICKNESS    6
 
 
 // ========================
 // Section IV. Flashy stuff
 // ========================
@@ -342,11 +342,11 @@
 // in ./background.xpm; if USE_PIXMAP_MENUS is also True, the menus
 // will be too.  The latter screws up in palette-based visuals, but
 // should be okay in true-colour.
 
 #define CONFIG_USE_PIXMAPS        True
-#define CONFIG_USE_PIXMAP_MENUS   True
+#define CONFIG_USE_PIXMAP_MENUS   False
 
 // Set CHANNEL_SURF for multi-channel switching; CHANNEL_CLICK_SIZE is
 // how close you have to middle-button-click to the top-right corner
 // of the root window before the channel change happens.  Set
 // USE_CHANNEL_KEYS if you want Alt-F1, Alt-F2 etc for quick channel


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/wmx/F-10/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	15 Nov 2007 01:48:40 -0000	1.3
+++ .cvsignore	12 Jan 2009 18:38:20 -0000	1.4
@@ -1,2 +1,2 @@
-wmx-6pl1.tar.gz
 wmx-defaults-1.tar.gz
+wmx-7.tar.gz


Index: background.xpm
===================================================================
RCS file: /cvs/pkgs/rpms/wmx/F-10/background.xpm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- background.xpm	14 Feb 2006 21:20:05 -0000	1.1
+++ background.xpm	12 Jan 2009 18:38:20 -0000	1.2
@@ -1,5 +1,5 @@
 /* XPM */
-static char *background[] = {
+static const char *background[] = {
 /* width height num_colors chars_per_pixel */
 "    80    80       27            1",
 /* colors */


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/wmx/F-10/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	15 Nov 2007 01:48:40 -0000	1.3
+++ sources	12 Jan 2009 18:38:20 -0000	1.4
@@ -1,2 +1,2 @@
-212297d70acef90bbc9dac254de39cb8  wmx-6pl1.tar.gz
 a5f221d36884276cbf331414d4f2a761  wmx-defaults-1.tar.gz
+e8eda438f5dda09d11ba7de1dcf9e501  wmx-7.tar.gz


Index: wmx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wmx/F-10/wmx.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- wmx.spec	20 Feb 2008 00:42:55 -0000	1.15
+++ wmx.spec	12 Jan 2009 18:38:20 -0000	1.16
@@ -1,6 +1,6 @@
 Name: wmx
-Version: 6pl1
-Release: 18%{?dist}
+Version: 7
+Release: 1%{?dist}
 Summary: A really simple window manager for X
 License: BSD
 Group: User Interface/X
@@ -11,10 +11,9 @@
 Source3: wmx.desktop
 Source4: Xclients.wmx.sh
 Source5: xnodecor.c
-Patch0: wmx-6pl1-cvs20071113.patch
-Patch1: wmx-6pl1-cfg.patch
+Patch0: wmx-7-cfg.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: xorg-x11-proto-devel libX11-devel libXpm-devel libXext-devel libXaw-devel libXt-devel
+BuildRequires: xorg-x11-proto-devel libX11-devel libXpm-devel libXext-devel libXaw-devel libXt-devel freetype-devel libXft-devel
 
 %description
 A really simple window manager for X, based on wm2, with a minimal set of
@@ -22,10 +21,9 @@
 
 %prep
 %setup -q
-%setup -a 1
-%{__install} -p %{SOURCE2} .
+%setup -q -a 1
+%{__install} -p -m 0644 %{SOURCE2} .
 %patch0 -p1
-%patch1 -p1
 
 %build
 %configure --x-libraries=%{_libdir} --x-includes=%{_includedir}/X11
@@ -47,12 +45,15 @@
 
 %files
 %defattr(-,root,root)
-%doc README* UPDATES ANNOYING-BUGS
+%doc README* UPDATES TODO.netwm rsharman-patch/
 %{_bindir}/*
 %{_datadir}/*
 %{_sysconfdir}/X11/xinit/Xclients.d/*
 
 %changelog
+* Sat Jan 10 2009 Gabriel Somlo <somlo at cmu.edu> 7-1 
+- update to 7
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 6pl1-18
 - Autorebuild for GCC 4.3
 
@@ -113,8 +114,8 @@
 * Fri Dec 16 2005 Gabriel Somlo <somlo at cmu.edu> 6pl1-3
 - spec file fixes as per P. Lemenkov and I. Vazquez
 - default menu entries now go in /usr/share/wmx/menu
-- example wmx .xsession file added to %doc
-- gave up on using /usr/X11R6/bin -- using %{_bindir} instead 
+- example wmx .xsession file added to doc
+- gave up on using /usr/X11R6/bin -- using bindir instead 
 
 * Wed Dec 14 2005 Gabriel Somlo <somlo at cmu.edu> 6pl1-2
 - increased bump-distance parameter for easier placement at edge of screen


--- wmx-6pl1-cfg.patch DELETED ---


--- wmx-6pl1-cvs20071113.patch DELETED ---



From rdieter at fedoraproject.org  Mon Jan 12 18:40:00 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 12 Jan 2009 18:40:00 +0000 (UTC)
Subject: rpms/kdeedu/devel kdeedu.spec,1.154,1.155
Message-ID: <20090112184000.AAC1370123@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdeedu/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12966

Modified Files:
	kdeedu.spec 
Log Message:
* Mon Jan 12 2009 Rex Dieter <rdieter at fedoraproject.org> 4.1.96-3
- sane marble packaging (#470577)
- use system dustismo-roman font (#477406)



Index: kdeedu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeedu/devel/kdeedu.spec,v
retrieving revision 1.154
retrieving revision 1.155
diff -u -r1.154 -r1.155
--- kdeedu.spec	9 Jan 2009 04:04:23 -0000	1.154
+++ kdeedu.spec	12 Jan 2009 18:39:30 -0000	1.155
@@ -14,7 +14,7 @@
 Name:    kdeedu
 Summary: Educational/Edutainment applications
 Version: 4.1.96
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 License: GPLv2
 Group:	 Amusements/Games
@@ -26,10 +26,6 @@
 Obsoletes: kalgebra < 1:0.7-7
 Provides:  kalgebra = 1:0.7-7
 
-# http://bugzilla.redhat.com/394011
-Obsoletes: marble < 1:0.5.1-1
-Provides:  marble = 1:0.5.1-1
-
 Obsoletes: kdeedu4 < %{version}-%{release}
 Provides:  kdeedu4 = %{version}-%{release}
 
@@ -59,14 +55,22 @@
 BuildRequires: python-devel python
 BuildRequires: readline-devel
 BuildRequires: python-devel
+
 ## BR's FIXME/TODO:
-#+ libsbigudrv, 1.00: SBIG Universal Driver is needed by KStars <http://indi.sourceforge.net/>
+#-- The following OPTIONAL packages could NOT be located on your system.
+#+ Experimental Python binding support for the Marble library: Experimental Python binding support for the Marble library <http://techbase.kde.org/Development/Languages/Python>
+#Experimental Python binding support for the Marble library. To activate it pass -DEXPERIMENTAL_PYTHON_BINDINGS=TRUE to cmake.
+#+ libindi, 0.6 or higher: A framework for controlling astronomical devices such as telescopes, CCDs, filter wheels..etc. <http://indi.sf.net>
+#Gives KStars support for controlling astronomical devices.
 
 %{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
 Requires: %{name}-libs = %{version}-%{release}
 # split pkgs, (temporary?) upgrade path -- Rex
 Requires: %{name}-kstars = %{version}-%{release}
+Requires: %{name}-marble = %{version}-%{release}
 Requires: %{name}-math = %{version}-%{release}
+# khangman
+Requires: dustin-dustismo-fonts-roman
 Requires(post): xdg-utils
 Requires(postun): xdg-utils
 
@@ -82,7 +86,6 @@
 * ktouch: Learn and practice touch typing
 * kturtle: Logo Programming Environment
 * kwordquiz: Flashcard and vocabulary learning
-* marble: A World Atlas
 * parley: Vocabulary Trainer
 * step: Interactive physical simulator
 
@@ -96,11 +99,13 @@
 Group:    Development/Libraries
 Summary:  Developer files for %{name}
 Requires: %{name}-libs = %{version}-%{release}
+# libmarble
+Requires: %{name}-marble = %{version}-%{release}
 Obsoletes: kdeedu4-devel < %{version}-%{release}
 Provides:  kdeedu4-devel = %{version}-%{release}
 # http://bugzilla.redhat.com/394011
 Obsoletes: marble-devel < 1:0.5.1-1
-Provides:  marble-devel = 1:0.5.1-1
+Provides:  marble-devel = 1:0.7-%{release}
 Requires: kdelibs4-devel
 Requires: giflib-devel
 Requires: pcre-devel
@@ -116,6 +121,19 @@
 %description kstars
 %{summary}.
 
+%package marble 
+Summary: A World Atlas
+Group:   Amusements/Games
+# http://bugzilla.redhat.com/394011
+Obsoletes: marble < 1:0.5.1-1
+Provides:  marble = 1:0.7-%{release}
+Requires: %{name}-libs = %{version}-%{release}
+Requires(post): xdg-utils
+Requires(postun): xdg-utils
+%description marble 
+%{summary}.
+
+
 %package math
 Group:	 Amusements/Games
 Summary: Math applications
@@ -154,6 +172,9 @@
 # omit stuff for which there isn't a clear public API
 rm -f %{buildroot}%{_kde4_libdir}/lib{SatLib,analitza,compoundviewer,htmesh,sbigudrv}.{a,so}
 
+# omti dustismo roman font
+rm -f %{buildroot}%{_kde4_appsdir}/khangman/fonts/Dustismo_Roman.ttf
+
 
 %post
 xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
@@ -175,6 +196,14 @@
 %postun kstars
 xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
 
+%post marble 
+/sbin/ldconfig
+xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
+
+%postun marble 
+/sbin/ldconfig
+xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
+
 %post math
 xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
 
@@ -202,7 +231,6 @@
 %{_kde4_bindir}/ktouch
 %{_kde4_bindir}/kturtle
 %{_kde4_bindir}/kwordquiz
-%{_kde4_bindir}/marble
 %{_kde4_bindir}/parley
 %{_kde4_bindir}/step
 %{_kde4_bindir}/tilecreator
@@ -221,19 +249,15 @@
 %{_kde4_appsdir}/kturtle/
 %{_kde4_appsdir}/kvtml/
 %{_kde4_appsdir}/kwordquiz/
-%{_kde4_appsdir}/marble/
-%{_kde4_appsdir}/marble_part/
 %{_kde4_appsdir}/parley/
 %{_kde4_appsdir}/step/
 
 %{_kde4_datadir}/kde4/services/plasma-applet-kworldclock.desktop
-%{_kde4_datadir}/kde4/services/marble_part.desktop
 %{_kde4_datadir}/kde4/services/plasma-dataengine-parley.desktop
 %{_kde4_datadir}/kde4/services/plasma_parley.desktop
 %{_kde4_datadir}/kde4/services/plasma-dataengine-kalzium.desktop
 %{_kde4_datadir}/kde4/services/plasma_didyouknow.desktop
 
-%{_kde4_libdir}/kde4/libmarble_part.so
 %{_kde4_libdir}/kde4/plasma_applet_kalgebra.so
 %{_kde4_libdir}/kde4/plasma_applet_worldclock.so
 %{_kde4_libdir}/kde4/plasma_applet_parley.so
@@ -251,7 +275,6 @@
 %{_kde4_datadir}/applications/kde4/ktouch.desktop
 %{_kde4_datadir}/applications/kde4/kturtle.desktop
 %{_kde4_datadir}/applications/kde4/kwordquiz.desktop
-%{_kde4_datadir}/applications/kde4/marble.desktop
 %{_kde4_datadir}/applications/kde4/parley.desktop
 %{_kde4_datadir}/applications/kde4/step.desktop
 
@@ -266,7 +289,6 @@
 %{_kde4_datadir}/config.kcfg/ktouch.kcfg
 %{_kde4_datadir}/config.kcfg/kwordquiz.kcfg
 %{_kde4_datadir}/config.kcfg/languagesettings.kcfg
-%{_kde4_datadir}/config.kcfg/marble.kcfg
 %{_kde4_datadir}/config.kcfg/parley.kcfg
 %{_kde4_datadir}/config.kcfg/step.kcfg
 %{_kde4_datadir}/config/kalzium.knsrc
@@ -287,7 +309,6 @@
 %{_kde4_docdir}/HTML/en/ktouch/
 %{_kde4_docdir}/HTML/en/kturtle
 %{_kde4_docdir}/HTML/en/kwordquiz/
-%{_kde4_docdir}/HTML/en/marble/
 %{_kde4_docdir}/HTML/en/parley/
 %{_kde4_docdir}/HTML/en/step/
 
@@ -301,15 +322,10 @@
 %{_kde4_iconsdir}/hicolor/*/*/ktouch.*
 %{_kde4_iconsdir}/hicolor/*/*/kturtle.*
 %{_kde4_iconsdir}/hicolor/*/*/kwordquiz.*
-%{_kde4_iconsdir}/hicolor/*/*/marble.*
 %{_kde4_iconsdir}/hicolor/*/*/parley*.*
 %{_kde4_iconsdir}/hicolor/*/*/step.*
 %{_kde4_iconsdir}/oxygen/*/*/*
 
-%{_kde4_libdir}/avogadro-kalzium/
-# marble
-%{_kde4_libdir}/libcompoundviewer.so.*
-
 %{_mandir}/man1/kalzium.*
 %{_mandir}/man1/ktouch.*
 %{_mandir}/man6/khangman.*
@@ -318,14 +334,13 @@
 %defattr(-,root,root,-)
 %doc COPYING README
 %{_kde4_libdir}/libanalitza.so.*
+%{_kde4_libdir}/avogadro-kalzium/
 %{_kde4_libdir}/libavogadro-kalzium.so.*
+%{_kde4_appsdir}/libkdeedu/
 %{_kde4_libdir}/libkdeedu*.so.*
 %{_kde4_libdir}/libkeduvocdocument.so.*
 %{_kde4_libdir}/libkiten.so.*
-%{_kde4_libdir}/libmarble*.so.*
 %{_kde4_libdir}/libscience.so.*
-%{_kde4_appsdir}/libkdeedu/
-%{_kde4_libdir}/kde4/plugins/marble/
 
 %files devel
 %defattr(-,root,root,-)
@@ -337,8 +352,8 @@
 %{_kde4_libdir}/libkdeedu*.so
 %{_kde4_libdir}/libkeduvocdocument.so
 %{_kde4_libdir}/libkiten.so
-%{_kde4_libdir}/libmarble*.so
 %{_kde4_libdir}/libscience.so
+%{_kde4_libdir}/libmarble*.so
 %{_kde4_libdir}/kde4/plugins/designer/kalziumuiwidgets.so
 
 %files kstars
@@ -352,6 +367,21 @@
 %{_kde4_iconsdir}/hicolor/*/*/kstars.*
 %{_kde4_libdir}/libSatLib.so.*
 
+%files marble
+%defattr(-,root,root,-)
+%{_kde4_appsdir}/marble/
+%{_kde4_appsdir}/marble_part/
+%{_kde4_bindir}/marble
+%{_kde4_datadir}/applications/kde4/marble.desktop
+%{_kde4_datadir}/config.kcfg/marble.kcfg
+%{_kde4_datadir}/kde4/services/marble_part.desktop
+%{_kde4_docdir}/HTML/en/marble/
+%{_kde4_libdir}/libcompoundviewer.so.*
+%{_kde4_libdir}/libmarble*.so.*
+%{_kde4_libdir}/kde4/libmarble_part.so
+%{_kde4_libdir}/kde4/plugins/marble/
+%{_kde4_iconsdir}/hicolor/*/*/marble.*
+
 %files math
 %defattr(-,root,root,-)
 %doc COPYING README
@@ -392,6 +422,10 @@
 
 
 %changelog
+* Mon Jan 12 2009 Rex Dieter <rdieter at fedoraproject.org> 4.1.96-3
+- sane marble packaging (#470577)
+- use system dustismo-roman font (#477406)
+
 * Fri Jan 09 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.96-2
 - drop upstreamed cfitsio patch
 - package manpages



From limb at fedoraproject.org  Mon Jan 12 18:40:58 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Mon, 12 Jan 2009 18:40:58 +0000 (UTC)
Subject: rpms/chipmunk/devel chipmunk.spec,1.2,1.3
Message-ID: <20090112184058.4416670123@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/chipmunk/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13341

Modified Files:
	chipmunk.spec 
Log Message:
Ugly ass lib64 hack.



Index: chipmunk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/chipmunk/devel/chipmunk.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- chipmunk.spec	9 Jan 2009 14:03:57 -0000	1.2
+++ chipmunk.spec	12 Jan 2009 18:40:27 -0000	1.3
@@ -58,13 +58,13 @@
 %setup -qn Chipmunk-%{version}
 
 %build
-#%if "%{?_lib}" == "lib64" 
-#  %{cmake} -DLIB_SUFFIX=64
-#%else
+%if "%{?_lib}" == "lib64"
+  %{cmake} -DLIB_SUFFIX=64
+%else
   %{cmake}
-#%endif 
+%endif 
 
-make VERBOSE=1 %{?_smp_mflags}
+%{__make} VERBOSE=1 %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS"
 pushd ruby
 ruby extconf.rb
 make
@@ -77,7 +77,9 @@
 install -m 755 ruby/libchipmunk.so.* $RPM_BUILD_ROOT/%{ruby_sitearch}
 
 make install DESTDIR=$RPM_BUILD_ROOT
-
+%if "%{?_lib}" == "lib64" 
+  mv $RPM_BUILD_ROOT/usr/lib/* $RPM_BUILD_ROOT/usr/lib64/
+%endif
 
 %clean
 rm -rf $RPM_BUILD_ROOT



From kkofler at fedoraproject.org  Mon Jan 12 18:40:54 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Mon, 12 Jan 2009 18:40:54 +0000 (UTC)
Subject: rpms/kdenetwork/F-10 kdenetwork-4.1.4-system-libgadu.patch, NONE,
	1.1 kdenetwork.spec, 1.160, 1.161
Message-ID: <20090112184054.D9F4A70123@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdenetwork/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13259/F-10

Modified Files:
	kdenetwork.spec 
Added Files:
	kdenetwork-4.1.4-system-libgadu.patch 
Log Message:
* Mon Jan 12 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.4-2
- build against system libgadu (trivial patch backported from 4.3)

kdenetwork-4.1.4-system-libgadu.patch:

--- NEW FILE kdenetwork-4.1.4-system-libgadu.patch ---
diff -Nur kdenetwork-4.1.4/cmake/modules/FindLibgadu.cmake kdenetwork-4.1.4-system-libgadu/cmake/modules/FindLibgadu.cmake
--- kdenetwork-4.1.4/cmake/modules/FindLibgadu.cmake	1970-01-01 01:00:00.000000000 +0100
+++ kdenetwork-4.1.4-system-libgadu/cmake/modules/FindLibgadu.cmake	2009-01-12 19:27:37.000000000 +0100
@@ -0,0 +1,72 @@
+# - Try to find libgadu (Gadu Gadu protocol support library)
+# Once done this will define
+#
+#  LIBGADU_FOUND - system has LIBGADU
+#  LIBGADU_INCLUDE_DIR - the LIBGADU include directory
+#  LIBGADU_LIBRARIES - the libraries needed to use LIBGADU
+#  LIBGADU_DEFINITIONS - Compiler switches required for using LIBGADU
+#
+# use pkg-config to get the directories and then use these values
+# in the FIND_PATH() and FIND_LIBRARY() calls
+
+# Copyright (c) 2008, Maciej Mrozowski, <reavertm at poczta.fm>
+#
+# Redistribution and use is allowed according to the terms of the BSD license.
+# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+
+include (FindLibraryWithDebug)
+
+if (LIBGADU_INCLUDE_DIR AND LIBGADU_LIBRARIES)
+
+    # in cache already
+    set (LIBGADU_FOUND TRUE)
+
+else (LIBGADU_INCLUDE_DIR AND LIBGADU_LIBRARIES)
+
+    if (NOT WIN32)
+
+        find_package (PkgConfig)
+        pkg_check_modules (PC_LIBGADU libgadu)
+
+        # If pkgconfig found libgadu, get the full path to the library using find_library()
+        # but only in the path reported by pkgconfig.
+        # Otherwise do a normal search.
+        if (PC_LIBGADU_FOUND)
+
+            set (LIBGADU_DEFINITIONS ${PC_LIBGADU_CFLAGS})
+
+            if (PC_LIBGADU_INCLUDE_DIRS)
+                set (LIBGADU_INCLUDE_DIR ${PC_LIBGADU_INCLUDE_DIRS})
+            else (PC_LIBGADU_INCLUDE_DIRS)
+                find_path (LIBGADU_INCLUDE_DIR libgadu.h PATH_SUFFIXES libgadu)
+            endif (PC_LIBGADU_INCLUDE_DIRS)
+
+            find_library (LIBGADU_LIBRARIES NAMES gadu
+                PATHS
+                ${PC_LIBGADU_LIBDIR}
+                NO_DEFAULT_PATH
+            )
+
+        else (PC_LIBGADU_FOUND)
+
+            find_library (LIBGADU_LIBRARIES NAMES gadu)
+            find_path (LIBGADU_INCLUDE_DIR libgadu.h PATH_SUFFIXES libgadu)
+
+        endif (PC_LIBGADU_FOUND)
+
+    else (NOT WIN32)
+
+        find_library_with_debug (LIBGADU_LIBRARIES
+            WIN32_DEBUG_POSTFIX d
+            NAMES gadu
+        )
+        find_path (LIBGADU_INCLUDE_DIR libgadu.h PATH_SUFFIXES libgadu)
+
+    endif (NOT WIN32)
+
+    include (FindPackageHandleStandardArgs)
+    find_package_handle_standard_args (LIBGADU DEFAULT_MSG LIBGADU_LIBRARIES LIBGADU_INCLUDE_DIR)
+
+    mark_as_advanced (LIBGADU_INCLUDE_DIR LIBGADU_LIBRARIES)
+
+endif (LIBGADU_INCLUDE_DIR AND LIBGADU_LIBRARIES)
diff -Nur kdenetwork-4.1.4/kopete/CMakeLists.txt kdenetwork-4.1.4-system-libgadu/kopete/CMakeLists.txt
--- kdenetwork-4.1.4/kopete/CMakeLists.txt	2008-03-13 09:16:02.000000000 +0100
+++ kdenetwork-4.1.4-system-libgadu/kopete/CMakeLists.txt	2009-01-12 19:27:37.000000000 +0100
@@ -29,6 +29,10 @@
 macro_bool_to_01(LIBOTR_FOUND HAVE_LIBOTR)
 macro_log_feature(LIBOTR_FOUND "libotr" "A library to encrypt messages with Off-the-Record encryption" "http://www.cypherpunks.ca/otr" FALSE "3.1.0" "Required for the Kopete otr plugin.")
 
+macro_optional_find_package(Libgadu)
+macro_bool_to_01(LIBGADU_FOUND HAVE_LIBGADU)
+macro_log_feature(LIBGADU_FOUND "libgadu" "A library providing support for Gadu-Gadu protocol" "http://toxygen.net/libgadu/" FALSE "1.8.0" "Required for Kopete Gadu-Gadu protocol")
+
 check_include_files(valgrind/valgrind.h HAVE_VALGRIND_H)
 check_include_files(stdint.h HAVE_STDINT_H)
 check_include_files(inttypes.h HAVE_INTTYPES_H)
diff -Nur kdenetwork-4.1.4/kopete/protocols/CMakeLists.txt kdenetwork-4.1.4-system-libgadu/kopete/protocols/CMakeLists.txt
--- kdenetwork-4.1.4/kopete/protocols/CMakeLists.txt	2008-05-29 13:19:54.000000000 +0200
+++ kdenetwork-4.1.4-system-libgadu/kopete/protocols/CMakeLists.txt	2009-01-12 19:27:37.000000000 +0100
@@ -1,6 +1,3 @@
-macro_optional_find_package(OpenSSL)
-macro_log_feature(OPENSSL_FOUND "OpenSSL" "A toolkit implementing the Secure Sockets Layer (SSL v2/v3) and Transport Layer Security (TLS v1) protocols" "http://openssl.org" FALSE "" "Required for the Kopete Gadu-Gadu protocol.")
-
 # On Solaris, some of the name resolution functions are in libnsl;
 # this needs to be linked in if found. Copied from kdelibs.
 check_library_exists(nsl gethostbyname "" HAVE_NSL_LIBRARY)
@@ -40,9 +37,9 @@
   if(WITH_winpopup)
     add_subdirectory( winpopup )
   endif(WITH_winpopup)
-  if(WITH_gadu AND OPENSSL_FOUND)
+  if(WITH_gadu AND LIBGADU_FOUND)
 	add_subdirectory( gadu )
-  endif(WITH_gadu AND OPENSSL_FOUND)
+  endif(WITH_gadu AND LIBGADU_FOUND)
   if(WITH_sms)
     add_subdirectory( sms )
   endif(WITH_sms)
diff -Nur kdenetwork-4.1.4/kopete/protocols/gadu/CMakeLists.txt kdenetwork-4.1.4-system-libgadu/kopete/protocols/gadu/CMakeLists.txt
--- kdenetwork-4.1.4/kopete/protocols/gadu/CMakeLists.txt	2008-08-28 10:08:01.000000000 +0200
+++ kdenetwork-4.1.4-system-libgadu/kopete/protocols/gadu/CMakeLists.txt	2009-01-12 19:27:37.000000000 +0100
@@ -3,11 +3,8 @@
 KDE4_NO_ENABLE_FINAL(kopete)
 
 add_subdirectory( icons ) 
-add_subdirectory( libgadu )
 
-include_directories( ${KOPETE_INCLUDES} 
-${CMAKE_CURRENT_SOURCE_DIR}/libgadu/ 
-${CMAKE_CURRENT_BINARY_DIR}/libgadu/ 
+include_directories( ${KOPETE_INCLUDES} ${LIBGADU_INCLUDE_DIRS} }
 )
 
 
@@ -46,7 +43,7 @@
 kde4_add_plugin(kopete_gadu ${kopete_gadu_PART_SRCS})
 
 
-target_link_libraries(kopete_gadu ${KDE4_KIO_LIBS} ${QT_QTNETWORK_LIBRARY} ${KDE4_KDE3SUPPORT_LIBS} gadu_kopete kopete )
+target_link_libraries(kopete_gadu ${KDE4_KIO_LIBS} ${QT_QTNETWORK_LIBRARY} ${KDE4_KDE3SUPPORT_LIBS} ${LIBGADU_LIBRARIES} kopete )
 
 install(TARGETS kopete_gadu  DESTINATION ${PLUGIN_INSTALL_DIR})
 


Index: kdenetwork.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdenetwork/F-10/kdenetwork.spec,v
retrieving revision 1.160
retrieving revision 1.161
diff -u -r1.160 -r1.161
--- kdenetwork.spec	9 Jan 2009 10:38:39 -0000	1.160
+++ kdenetwork.spec	12 Jan 2009 18:40:24 -0000	1.161
@@ -5,13 +5,17 @@
 Name: kdenetwork
 Epoch: 7
 Version: 4.1.4
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPLv2
 Group: Applications/Internet
 URL: http://www.kde.org
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
 Patch0: kdenetwork-4.1.3-handle-enc-message.patch
+# build Kopete against the system libgadu (backported from 4.3)
+# http://websvn.kde.org/?view=rev&revision=909144
+# http://websvn.kde.org/?view=rev&revision=909145
+Patch100: kdenetwork-4.1.4-system-libgadu.patch
 
 # upstream patches
 
@@ -30,6 +34,7 @@
 BuildRequires: kdelibs4-devel >= %{version}
 BuildRequires: kdepimlibs-devel >= %{version}
 BuildRequires: kdebase-workspace-devel >= %{version}
+BuildRequires: libgadu-devel >= 1.8.0
 BuildRequires: libidn-devel
 BuildRequires: libotr-devel
 BuildRequires: libvncserver-devel
@@ -92,6 +97,8 @@
 %prep
 %setup -q
 %patch0 -p1 -b .handle-enc-message
+%patch100 -p1 -b .system-libgadu
+rm -rf kopete/protocols/gadu/libgadu/
 
 %build
 mkdir -p %{_target_platform}
@@ -166,6 +173,9 @@
 
 
 %changelog
+* Mon Jan 12 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.4-2
+- build against system libgadu (trivial patch backported from 4.3)
+
 * Fri Jan  9 2009 Luk???? Tinkl <ltinkl at redhat.com> 4.1.4-1
 - KDE 4.1.4
 



From kkofler at fedoraproject.org  Mon Jan 12 18:40:55 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Mon, 12 Jan 2009 18:40:55 +0000 (UTC)
Subject: rpms/kdenetwork/F-9 kdenetwork-4.1.4-system-libgadu.patch, NONE,
	1.1 kdenetwork.spec, 1.159, 1.160
Message-ID: <20090112184055.4A66670123@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdenetwork/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13259/F-9

Modified Files:
	kdenetwork.spec 
Added Files:
	kdenetwork-4.1.4-system-libgadu.patch 
Log Message:
* Mon Jan 12 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.4-2
- build against system libgadu (trivial patch backported from 4.3)

kdenetwork-4.1.4-system-libgadu.patch:

--- NEW FILE kdenetwork-4.1.4-system-libgadu.patch ---
diff -Nur kdenetwork-4.1.4/cmake/modules/FindLibgadu.cmake kdenetwork-4.1.4-system-libgadu/cmake/modules/FindLibgadu.cmake
--- kdenetwork-4.1.4/cmake/modules/FindLibgadu.cmake	1970-01-01 01:00:00.000000000 +0100
+++ kdenetwork-4.1.4-system-libgadu/cmake/modules/FindLibgadu.cmake	2009-01-12 19:27:37.000000000 +0100
@@ -0,0 +1,72 @@
+# - Try to find libgadu (Gadu Gadu protocol support library)
+# Once done this will define
+#
+#  LIBGADU_FOUND - system has LIBGADU
+#  LIBGADU_INCLUDE_DIR - the LIBGADU include directory
+#  LIBGADU_LIBRARIES - the libraries needed to use LIBGADU
+#  LIBGADU_DEFINITIONS - Compiler switches required for using LIBGADU
+#
+# use pkg-config to get the directories and then use these values
+# in the FIND_PATH() and FIND_LIBRARY() calls
+
+# Copyright (c) 2008, Maciej Mrozowski, <reavertm at poczta.fm>
+#
+# Redistribution and use is allowed according to the terms of the BSD license.
+# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+
+include (FindLibraryWithDebug)
+
+if (LIBGADU_INCLUDE_DIR AND LIBGADU_LIBRARIES)
+
+    # in cache already
+    set (LIBGADU_FOUND TRUE)
+
+else (LIBGADU_INCLUDE_DIR AND LIBGADU_LIBRARIES)
+
+    if (NOT WIN32)
+
+        find_package (PkgConfig)
+        pkg_check_modules (PC_LIBGADU libgadu)
+
+        # If pkgconfig found libgadu, get the full path to the library using find_library()
+        # but only in the path reported by pkgconfig.
+        # Otherwise do a normal search.
+        if (PC_LIBGADU_FOUND)
+
+            set (LIBGADU_DEFINITIONS ${PC_LIBGADU_CFLAGS})
+
+            if (PC_LIBGADU_INCLUDE_DIRS)
+                set (LIBGADU_INCLUDE_DIR ${PC_LIBGADU_INCLUDE_DIRS})
+            else (PC_LIBGADU_INCLUDE_DIRS)
+                find_path (LIBGADU_INCLUDE_DIR libgadu.h PATH_SUFFIXES libgadu)
+            endif (PC_LIBGADU_INCLUDE_DIRS)
+
+            find_library (LIBGADU_LIBRARIES NAMES gadu
+                PATHS
+                ${PC_LIBGADU_LIBDIR}
+                NO_DEFAULT_PATH
+            )
+
+        else (PC_LIBGADU_FOUND)
+
+            find_library (LIBGADU_LIBRARIES NAMES gadu)
+            find_path (LIBGADU_INCLUDE_DIR libgadu.h PATH_SUFFIXES libgadu)
+
+        endif (PC_LIBGADU_FOUND)
+
+    else (NOT WIN32)
+
+        find_library_with_debug (LIBGADU_LIBRARIES
+            WIN32_DEBUG_POSTFIX d
+            NAMES gadu
+        )
+        find_path (LIBGADU_INCLUDE_DIR libgadu.h PATH_SUFFIXES libgadu)
+
+    endif (NOT WIN32)
+
+    include (FindPackageHandleStandardArgs)
+    find_package_handle_standard_args (LIBGADU DEFAULT_MSG LIBGADU_LIBRARIES LIBGADU_INCLUDE_DIR)
+
+    mark_as_advanced (LIBGADU_INCLUDE_DIR LIBGADU_LIBRARIES)
+
+endif (LIBGADU_INCLUDE_DIR AND LIBGADU_LIBRARIES)
diff -Nur kdenetwork-4.1.4/kopete/CMakeLists.txt kdenetwork-4.1.4-system-libgadu/kopete/CMakeLists.txt
--- kdenetwork-4.1.4/kopete/CMakeLists.txt	2008-03-13 09:16:02.000000000 +0100
+++ kdenetwork-4.1.4-system-libgadu/kopete/CMakeLists.txt	2009-01-12 19:27:37.000000000 +0100
@@ -29,6 +29,10 @@
 macro_bool_to_01(LIBOTR_FOUND HAVE_LIBOTR)
 macro_log_feature(LIBOTR_FOUND "libotr" "A library to encrypt messages with Off-the-Record encryption" "http://www.cypherpunks.ca/otr" FALSE "3.1.0" "Required for the Kopete otr plugin.")
 
+macro_optional_find_package(Libgadu)
+macro_bool_to_01(LIBGADU_FOUND HAVE_LIBGADU)
+macro_log_feature(LIBGADU_FOUND "libgadu" "A library providing support for Gadu-Gadu protocol" "http://toxygen.net/libgadu/" FALSE "1.8.0" "Required for Kopete Gadu-Gadu protocol")
+
 check_include_files(valgrind/valgrind.h HAVE_VALGRIND_H)
 check_include_files(stdint.h HAVE_STDINT_H)
 check_include_files(inttypes.h HAVE_INTTYPES_H)
diff -Nur kdenetwork-4.1.4/kopete/protocols/CMakeLists.txt kdenetwork-4.1.4-system-libgadu/kopete/protocols/CMakeLists.txt
--- kdenetwork-4.1.4/kopete/protocols/CMakeLists.txt	2008-05-29 13:19:54.000000000 +0200
+++ kdenetwork-4.1.4-system-libgadu/kopete/protocols/CMakeLists.txt	2009-01-12 19:27:37.000000000 +0100
@@ -1,6 +1,3 @@
-macro_optional_find_package(OpenSSL)
-macro_log_feature(OPENSSL_FOUND "OpenSSL" "A toolkit implementing the Secure Sockets Layer (SSL v2/v3) and Transport Layer Security (TLS v1) protocols" "http://openssl.org" FALSE "" "Required for the Kopete Gadu-Gadu protocol.")
-
 # On Solaris, some of the name resolution functions are in libnsl;
 # this needs to be linked in if found. Copied from kdelibs.
 check_library_exists(nsl gethostbyname "" HAVE_NSL_LIBRARY)
@@ -40,9 +37,9 @@
   if(WITH_winpopup)
     add_subdirectory( winpopup )
   endif(WITH_winpopup)
-  if(WITH_gadu AND OPENSSL_FOUND)
+  if(WITH_gadu AND LIBGADU_FOUND)
 	add_subdirectory( gadu )
-  endif(WITH_gadu AND OPENSSL_FOUND)
+  endif(WITH_gadu AND LIBGADU_FOUND)
   if(WITH_sms)
     add_subdirectory( sms )
   endif(WITH_sms)
diff -Nur kdenetwork-4.1.4/kopete/protocols/gadu/CMakeLists.txt kdenetwork-4.1.4-system-libgadu/kopete/protocols/gadu/CMakeLists.txt
--- kdenetwork-4.1.4/kopete/protocols/gadu/CMakeLists.txt	2008-08-28 10:08:01.000000000 +0200
+++ kdenetwork-4.1.4-system-libgadu/kopete/protocols/gadu/CMakeLists.txt	2009-01-12 19:27:37.000000000 +0100
@@ -3,11 +3,8 @@
 KDE4_NO_ENABLE_FINAL(kopete)
 
 add_subdirectory( icons ) 
-add_subdirectory( libgadu )
 
-include_directories( ${KOPETE_INCLUDES} 
-${CMAKE_CURRENT_SOURCE_DIR}/libgadu/ 
-${CMAKE_CURRENT_BINARY_DIR}/libgadu/ 
+include_directories( ${KOPETE_INCLUDES} ${LIBGADU_INCLUDE_DIRS} }
 )
 
 
@@ -46,7 +43,7 @@
 kde4_add_plugin(kopete_gadu ${kopete_gadu_PART_SRCS})
 
 
-target_link_libraries(kopete_gadu ${KDE4_KIO_LIBS} ${QT_QTNETWORK_LIBRARY} ${KDE4_KDE3SUPPORT_LIBS} gadu_kopete kopete )
+target_link_libraries(kopete_gadu ${KDE4_KIO_LIBS} ${QT_QTNETWORK_LIBRARY} ${KDE4_KDE3SUPPORT_LIBS} ${LIBGADU_LIBRARIES} kopete )
 
 install(TARGETS kopete_gadu  DESTINATION ${PLUGIN_INSTALL_DIR})
 


Index: kdenetwork.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdenetwork/F-9/kdenetwork.spec,v
retrieving revision 1.159
retrieving revision 1.160
diff -u -r1.159 -r1.160
--- kdenetwork.spec	9 Jan 2009 10:38:40 -0000	1.159
+++ kdenetwork.spec	12 Jan 2009 18:40:24 -0000	1.160
@@ -5,13 +5,17 @@
 Name: kdenetwork
 Epoch: 7
 Version: 4.1.4
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPLv2
 Group: Applications/Internet
 URL: http://www.kde.org
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
-Patch0: kdenetwork-4.1.3-handle-enc-message.patch 
+Patch0: kdenetwork-4.1.3-handle-enc-message.patch
+# build Kopete against the system libgadu (backported from 4.3)
+# http://websvn.kde.org/?view=rev&revision=909144
+# http://websvn.kde.org/?view=rev&revision=909145
+Patch100: kdenetwork-4.1.4-system-libgadu.patch
 
 # upstream patches
 
@@ -30,6 +34,7 @@
 BuildRequires: kdelibs4-devel >= %{version}
 BuildRequires: kdepimlibs-devel >= %{version}
 BuildRequires: kdebase-workspace-devel >= %{version}
+BuildRequires: libgadu-devel >= 1.8.0
 BuildRequires: libidn-devel
 BuildRequires: libotr-devel
 BuildRequires: libvncserver-devel
@@ -92,6 +97,8 @@
 %prep
 %setup -q
 %patch0 -p1 -b .handle-enc-message
+%patch100 -p1 -b .system-libgadu
+rm -rf kopete/protocols/gadu/libgadu/
 
 %build
 mkdir -p %{_target_platform}
@@ -166,14 +173,17 @@
 
 
 %changelog
+* Mon Jan 12 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.4-2
+- build against system libgadu (trivial patch backported from 4.3)
+
 * Fri Jan  9 2009 Luk???? Tinkl <ltinkl at redhat.com> 4.1.4-1
 - KDE 4.1.4
 
-* Thu Dec 11 2008 Jaroslav Reznik <jreznik at redhat.com> 4.1.3-2
+* Wed Dec 10 2008 Jaroslav Reznik <jreznik at redhat.com> 4.1.3-2
 - fix kopete jabber protocol encrypted message handling (#473412)
 
-* Wed Nov  5 2008 Luk???? Tinkl <ltinkl at redhat.com> 4.1.3-1
-- KDE 4.1.3
+* Wed Nov 12 2008 Than Ngo <than at redhat.com> 4.1.3-1
+- 4.1.3
 
 * Mon Oct 20 2008 Luk???? Tinkl <ltinkl at redhat.com> 4.1.2-3
 - fix kopete crashes on logout (kdebug:172011), in the account editor



From twaugh at fedoraproject.org  Mon Jan 12 18:41:38 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Mon, 12 Jan 2009 18:41:38 +0000 (UTC)
Subject: rpms/hplip/devel hplip-no-root-config.patch, 1.7, 1.8 hplip.spec,
	1.192, 1.193
Message-ID: <20090112184138.DE93270123@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/hplip/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13670

Modified Files:
	hplip-no-root-config.patch hplip.spec 
Log Message:
* Mon Jan 12 2009 Tim Waugh <twaugh at redhat.com> 2.8.12-2
- Don't write to system-wide configuration file (bug #479178).


hplip-no-root-config.patch:

Index: hplip-no-root-config.patch
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/devel/hplip-no-root-config.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- hplip-no-root-config.patch	23 Dec 2008 11:38:18 -0000	1.7
+++ hplip-no-root-config.patch	12 Jan 2009 18:41:08 -0000	1.8
@@ -1,7 +1,23 @@
 diff -up hplip-2.8.12/base/g.py.no-root-config hplip-2.8.12/base/g.py
 --- hplip-2.8.12/base/g.py.no-root-config	2008-12-17 20:41:12.000000000 +0000
-+++ hplip-2.8.12/base/g.py	2008-12-23 10:19:44.000000000 +0000
-@@ -107,6 +107,10 @@ class Config(dict):
++++ hplip-2.8.12/base/g.py	2009-01-12 12:22:31.000000000 +0000
+@@ -91,6 +91,15 @@ class ConfigSection(dict):
+ 
+         self.config_obj.set(self.section_name, option, val)
+ 
++        filename = self.filename
++        if filename.startswith ("/root/") or filename.startswith ("/var/"):
++            # Don't try writing a file in root's home directory.
++            return
++        elif filename.startswith ("/etc/"):
++            # Certainly don't try writing the system-wide config file!
++            # See bug #479178.
++            return
++
+         try:
+             f = file(self.filename, 'w')
+             self.config_obj.write(f)
+@@ -107,6 +116,10 @@ class Config(dict):
  
          log.debug("Reading config file %s" % filename)
  


Index: hplip.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/devel/hplip.spec,v
retrieving revision 1.192
retrieving revision 1.193
diff -u -r1.192 -r1.193
--- hplip.spec	23 Dec 2008 11:38:18 -0000	1.192
+++ hplip.spec	12 Jan 2009 18:41:08 -0000	1.193
@@ -1,7 +1,7 @@
 Summary: HP Linux Imaging and Printing Project
 Name: hplip
 Version: 2.8.12
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+ and MIT
 Group: System Environment/Daemons
 Conflicts: system-config-printer < 0.6.132
@@ -313,6 +313,9 @@
 exit 0
 
 %changelog
+* Mon Jan 12 2009 Tim Waugh <twaugh at redhat.com> 2.8.12-2
+- Don't write to system-wide configuration file (bug #479178).
+
 * Tue Dec 23 2008 Tim Waugh <twaugh at redhat.com> 2.8.12-1
 - 2.8.12.
 



From twaugh at fedoraproject.org  Mon Jan 12 18:41:42 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Mon, 12 Jan 2009 18:41:42 +0000 (UTC)
Subject: rpms/hplip/F-10 hplip-no-root-config.patch, 1.7, 1.8 hplip.spec,
	1.191, 1.192
Message-ID: <20090112184142.4251570123@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/hplip/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13739

Modified Files:
	hplip-no-root-config.patch hplip.spec 
Log Message:
* Tue Dec 23 2008 Tim Waugh <twaugh at redhat.com> 2.8.12-1
- 2.8.12.


hplip-no-root-config.patch:

Index: hplip-no-root-config.patch
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/F-10/hplip-no-root-config.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- hplip-no-root-config.patch	23 Dec 2008 11:57:27 -0000	1.7
+++ hplip-no-root-config.patch	12 Jan 2009 18:41:11 -0000	1.8
@@ -1,7 +1,23 @@
 diff -up hplip-2.8.12/base/g.py.no-root-config hplip-2.8.12/base/g.py
 --- hplip-2.8.12/base/g.py.no-root-config	2008-12-17 20:41:12.000000000 +0000
-+++ hplip-2.8.12/base/g.py	2008-12-23 10:19:44.000000000 +0000
-@@ -107,6 +107,10 @@ class Config(dict):
++++ hplip-2.8.12/base/g.py	2009-01-12 12:22:31.000000000 +0000
+@@ -91,6 +91,15 @@ class ConfigSection(dict):
+ 
+         self.config_obj.set(self.section_name, option, val)
+ 
++        filename = self.filename
++        if filename.startswith ("/root/") or filename.startswith ("/var/"):
++            # Don't try writing a file in root's home directory.
++            return
++        elif filename.startswith ("/etc/"):
++            # Certainly don't try writing the system-wide config file!
++            # See bug #479178.
++            return
++
+         try:
+             f = file(self.filename, 'w')
+             self.config_obj.write(f)
+@@ -107,6 +116,10 @@ class Config(dict):
  
          log.debug("Reading config file %s" % filename)
  


Index: hplip.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/F-10/hplip.spec,v
retrieving revision 1.191
retrieving revision 1.192
diff -u -r1.191 -r1.192
--- hplip.spec	23 Dec 2008 11:57:27 -0000	1.191
+++ hplip.spec	12 Jan 2009 18:41:11 -0000	1.192
@@ -1,7 +1,7 @@
 Summary: HP Linux Imaging and Printing Project
 Name: hplip
 Version: 2.8.12
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+ and MIT
 Group: System Environment/Daemons
 Conflicts: system-config-printer < 0.6.132
@@ -313,6 +313,9 @@
 exit 0
 
 %changelog
+* Mon Jan 12 2009 Tim Waugh <twaugh at redhat.com> 2.8.12-2
+- Don't write to system-wide configuration file (bug #479178).
+
 * Tue Dec 23 2008 Tim Waugh <twaugh at redhat.com> 2.8.12-1
 - 2.8.12.
 



From astokes at fedoraproject.org  Mon Jan 12 18:47:30 2009
From: astokes at fedoraproject.org (Adam Stokes)
Date: Mon, 12 Jan 2009 18:47:30 +0000 (UTC)
Subject: rpms/sos/F-9 sos.spec,1.3,1.4
Message-ID: <20090112184730.C4AA270123@cvs1.fedora.phx.redhat.com>

Author: astokes

Update of /cvs/pkgs/rpms/sos/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16760

Modified Files:
	sos.spec 
Log Message:
updated spec to include python egg



Index: sos.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sos/F-9/sos.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sos.spec	12 Jan 2009 18:34:05 -0000	1.3
+++ sos.spec	12 Jan 2009 18:47:00 -0000	1.4
@@ -5,7 +5,7 @@
 Summary: A set of tools to gather troubleshooting information from a system
 Name: sos
 Version: 1.8
-Release: 5%{?dist}
+Release: 6%{?dist}
 Group: Application/Tools
 Source0: https://fedorahosted.org/releases/s/o/sos/%{name}-%{version}.tar.gz
 License: GPLv2+
@@ -46,13 +46,16 @@
 %{_sbindir}/sysreport.legacy
 /usr/share/sysreport
 /usr/share/sos/rhsupport.pub
-%{python_sitelib}/sos/
+%{python_sitelib}/*
 %{_mandir}/man1/sosreport.1.gz
 %{_localedir}/*/LC_MESSAGES/sos.mo
 %doc README README.rh-upload-core TODO LICENSE ChangeLog
 %config %{_sysconfdir}/sos.conf
 
 %changelog
+* Mon Jan 12 2009 Adam Stokes <ajs at redhat dot com> - 1.8-6
+- updated spec to include setuptools/egg file
+
 * Mon Dec 29 2008 Adam Stokes <ajs at redhat dot com> - 1.8-5
 - removed source defines as python manifest handles this
 



From twaugh at fedoraproject.org  Mon Jan 12 18:52:15 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Mon, 12 Jan 2009 18:52:15 +0000 (UTC)
Subject: rpms/foomatic/devel foomatic.spec,1.211,1.212
Message-ID: <20090112185215.CA39670123@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/foomatic/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18082

Modified Files:
	foomatic.spec 
Log Message:
* Mon Jan 12 2009 Tim Waugh <twaugh at redhat.com> 3.0.2-70
- Major gutenprint version is 5.2.



Index: foomatic.spec
===================================================================
RCS file: /cvs/pkgs/rpms/foomatic/devel/foomatic.spec,v
retrieving revision 1.211
retrieving revision 1.212
diff -u -r1.211 -r1.212
--- foomatic.spec	10 Jan 2009 12:38:46 -0000	1.211
+++ foomatic.spec	12 Jan 2009 18:51:45 -0000	1.212
@@ -6,7 +6,7 @@
 Summary: Database of printers and printer drivers
 Name:		foomatic
 Version:	3.0.2
-Release:    69%{?dist}
+Release:    70%{?dist}
 License:	GPLv2+
 Group: System Environment/Libraries
 
@@ -93,8 +93,8 @@
 
 cd db/source
 
-# For gutenprint printers, use gutenprint-ijs-simplified.5.0.
-perl -pi -e 's,>gutenprint<,>gutenprint-ijs-simplified.5.0<,' printer/*.xml
+# For gutenprint printers, use gutenprint-ijs-simplified.5.2.
+perl -pi -e 's,>gutenprint<,>gutenprint-ijs-simplified.5.2<,' printer/*.xml
 
 # Remove references to foo2zjs, foo2oak, foo2hp and foo2qpdl (bug #208851).
 # Also foo2lava, foo2kyo, foo2xqx (bug #438319).
@@ -232,6 +232,9 @@
 %{_var}/cache/foomatic
 
 %changelog
+* Mon Jan 12 2009 Tim Waugh <twaugh at redhat.com> 3.0.2-70
+- Major gutenprint version is 5.2.
+
 * Sat Jan 10 2009 Tim Waugh <twaugh at redhat.com> 3.0.2-69
 - Updated db-hpijs to 20090110.
 - Updated db to 20090110.



From limb at fedoraproject.org  Mon Jan 12 18:55:15 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Mon, 12 Jan 2009 18:55:15 +0000 (UTC)
Subject: rpms/chipmunk/F-10 chipmunk.spec,NONE,1.1 sources,1.1,1.2
Message-ID: <20090112185515.8D39970123@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/chipmunk/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18673

Modified Files:
	sources 
Added Files:
	chipmunk.spec 
Log Message:
Import.



--- NEW FILE chipmunk.spec ---
%{!?ruby_sitearch: %define ruby_sitearch %(ruby -rrbconfig -e "puts Config::CONFIG['sitearchdir']")}
Name:           chipmunk
Version:        4.1.0
Release:        4%{?dist}
Summary:        Physics engine for 2D games

Group:          Development/Libraries
License:        MIT
URL:            http://http://wiki.slembcke.net/main/published/Chipmunk
Source0:        http://files.slembcke.net/chipmunk/release/Chipmunk-%{version}.tgz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires: cmake
BuildRequires: freeglut-devel
BuildRequires: mesa-libGL-devel
BuildRequires: ruby, ruby-devel
BuildRequires: libX11-devel
BuildRequires: libXext-devel
BuildRequires: ruby

%description
Chipmunk is a 2D rigid body physics library distributed under the MIT license.
Though not yet complete, it is intended to be fast, numerically stable, and 
easy to use.


%package        devel
Summary:        Development tools for programs which will use the chipmunk library
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}

%description    devel
Chipmunk is a 2D rigid body physics library distributed under the MIT license.
Though not yet complete, it is intended to be fast, numerically stable, and 
easy to use.

This package contains the header files and  static libraries to develop
programs that will use the chipmunk library.  You should
install this package if you need to develop programs which will use the 
chipmunk library functions.  You'll also need to install the chipmunk package.

%package        ruby
Summary:        Ruby interface to the chipmunk library
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}
Requires:       ruby(abi) = 1.8

%description    ruby
Chipmunk is a 2D rigid body physics library distributed under the MIT license.
Though not yet complete, it is intended to be fast, numerically stable, and 
easy to use.

This package contains the Ruby interface to the chipmunk library.
You'll also need to install the chipmunk package.


%prep
%setup -qn Chipmunk-%{version}

%build
%if "%{?_lib}" == "lib64"
  %{cmake} -DLIB_SUFFIX=64
%else
  %{cmake}
%endif 

%{__make} VERBOSE=1 %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS"
pushd ruby
ruby extconf.rb
make
popd

%install
rm -rf $RPM_BUILD_ROOT

mkdir -p $RPM_BUILD_ROOT/%{ruby_sitearch}
install -m 755 ruby/libchipmunk.so.* $RPM_BUILD_ROOT/%{ruby_sitearch}

make install DESTDIR=$RPM_BUILD_ROOT
%if "%{?_lib}" == "lib64" 
  mv $RPM_BUILD_ROOT/usr/lib/* $RPM_BUILD_ROOT/usr/lib64/
%endif

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files
%defattr(-,root,root,-)
%doc docsrc/ LICENSE.txt README.txt
%{_libdir}/*.so.*
%exclude %{_libdir}/*.a

%files devel
%defattr(-,root,root,-)
%doc Demo/
%{_includedir}/chipmunk
%{_libdir}/*.so

%files ruby
%defattr(-,root,root,-)
%{ruby_sitearch}/*.so.*


%changelog
* Thu Jan 08 2009 Jon Ciesla <limb at jcomserv.net> - 4.1.0-4
- Attempted 64-bit fix.

* Wed Jan 07 2009 Jon Ciesla <limb at jcomserv.net> - 4.1.0-3
- Review fixes.

* Wed Jan 07 2009 Jon Ciesla <limb at jcomserv.net> - 4.1.0-2
- Review fixes.

* Mon Dec 01 2008 Jon Ciesla <limb at jcomserv.net> - 4.1.0-1
- New version.

* Mon Sep 15 2008 Jon Ciesla <limb at jcomserv.net> - 4.0.2-1
- Created package.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/chipmunk/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	9 Jan 2009 05:54:49 -0000	1.1
+++ sources	12 Jan 2009 18:54:45 -0000	1.2
@@ -0,0 +1 @@
+804d0e478f2a27a1d272fa07e41480ba  Chipmunk-4.1.0.tgz



From rdieter at fedoraproject.org  Mon Jan 12 19:04:24 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 12 Jan 2009 19:04:24 +0000 (UTC)
Subject: rpms/kdeedu/devel kdeedu.spec,1.155,1.156
Message-ID: <20090112190425.07AB970123@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdeedu/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20525

Modified Files:
	kdeedu.spec 
Log Message:
* Mon Jan 12 2009 Rex Dieter <rdieter at fedoraproject.org> 4.1.96-4
- drop extraneous giflib pcre deps



Index: kdeedu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeedu/devel/kdeedu.spec,v
retrieving revision 1.155
retrieving revision 1.156
diff -u -r1.155 -r1.156
--- kdeedu.spec	12 Jan 2009 18:39:30 -0000	1.155
+++ kdeedu.spec	12 Jan 2009 19:03:54 -0000	1.156
@@ -14,7 +14,7 @@
 Name:    kdeedu
 Summary: Educational/Edutainment applications
 Version: 4.1.96
-Release: 3%{?dist}
+Release: 4%{?dist}
 
 License: GPLv2
 Group:	 Amusements/Games
@@ -35,7 +35,6 @@
 BuildRequires: cfitsio-devel
 BuildRequires: desktop-file-utils
 BuildRequires: eigen-devel
-BuildRequires: giflib-devel
 BuildRequires: gmm-devel
 BuildRequires: gpsd-devel
 BuildRequires: gsl-devel
@@ -51,7 +50,6 @@
 BuildRequires: ocaml-facile-devel
 %endif
 BuildRequires: openbabel-devel >= 2.2.0-0.4.b5
-BuildRequires: pcre-devel
 BuildRequires: python-devel python
 BuildRequires: readline-devel
 BuildRequires: python-devel
@@ -107,8 +105,6 @@
 Obsoletes: marble-devel < 1:0.5.1-1
 Provides:  marble-devel = 1:0.7-%{release}
 Requires: kdelibs4-devel
-Requires: giflib-devel
-Requires: pcre-devel
 %description devel
 %{summary}.
 
@@ -422,6 +418,9 @@
 
 
 %changelog
+* Mon Jan 12 2009 Rex Dieter <rdieter at fedoraproject.org> 4.1.96-4
+- drop extraneous giflib pcre deps
+
 * Mon Jan 12 2009 Rex Dieter <rdieter at fedoraproject.org> 4.1.96-3
 - sane marble packaging (#470577)
 - use system dustismo-roman font (#477406)



From rdieter at fedoraproject.org  Mon Jan 12 19:05:02 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 12 Jan 2009 19:05:02 +0000 (UTC)
Subject: rpms/digikam/devel digikam.spec,1.80,1.81
Message-ID: <20090112190502.7DCD070123@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/digikam/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20854

Modified Files:
	digikam.spec 
Log Message:
* Mon Jan 12 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.10-0.13.beta8
- re-enable marble integration, kde42+ (bug #470578)



Index: digikam.spec
===================================================================
RCS file: /cvs/pkgs/rpms/digikam/devel/digikam.spec,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- digikam.spec	5 Jan 2009 14:55:34 -0000	1.80
+++ digikam.spec	12 Jan 2009 19:04:32 -0000	1.81
@@ -2,7 +2,7 @@
 
 Name:	 digikam
 Version: 0.10.0
-Release: 0.12.%{beta}%{?dist}
+Release: 0.13.%{beta}%{?dist}
 Summary: A digital camera accessing & photo management application
 
 Group:	 Applications/Multimedia
@@ -19,8 +19,8 @@
 BuildRequires: libkexiv2-devel >= 0.5.0
 BuildRequires: libkipi-devel >= 0.3.0
 BuildRequires: jasper-devel
-## FIXME: marble integration, http://bugzilla.redhat.com/470578 
-#BuildRequires: marble-devel
+# marble integration, http://bugzilla.redhat.com/470578 
+BuildRequires: kdeedu-devel 
 BuildRequires: kdelibs4-devel
 #global kdelibs4_version %((kde4-config --version 2>/dev/null || echo "KDE 4.1.0") | grep ^KDE | cut -d' ' -f2)
 BuildRequires: kdepimlibs-devel
@@ -29,8 +29,6 @@
 BuildRequires: libtiff-devel
 BuildRequires: libpng-devel >= 1.2.7
 BuildRequires: sqlite-devel
-# extraneous/bogus deps ?  -- Rex
-BuildRequires: giflib-devel openldap-devel pcre-devel
 
 Obsoletes: digikamimageplugins < 0.9.1-2
 
@@ -150,6 +148,9 @@
 
 
 %changelog
+* Mon Jan 12 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.10-0.13.beta8
+- re-enable marble integration, kde42+ (bug #470578)
+
 * Mon Jan 05 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.10.0-0.12.beta8
 - digikam-0.10.0-beta8
 



From quantumburnz at fedoraproject.org  Mon Jan 12 19:07:30 2009
From: quantumburnz at fedoraproject.org (Christopher D. Stover)
Date: Mon, 12 Jan 2009 19:07:30 +0000 (UTC)
Subject: rpms/barry/devel barry.spec,1.5,1.6
Message-ID: <20090112190730.7C53E70123@cvs1.fedora.phx.redhat.com>

Author: quantumburnz

Update of /cvs/pkgs/rpms/barry/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21343

Modified Files:
	barry.spec 
Log Message:
Touch files to prevent auto* from running.



Index: barry.spec
===================================================================
RCS file: /cvs/pkgs/rpms/barry/devel/barry.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- barry.spec	12 Jan 2009 18:31:31 -0000	1.5
+++ barry.spec	12 Jan 2009 19:07:00 -0000	1.6
@@ -24,7 +24,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libusb-devel boost-devel desktop-file-utils gtkmm24-devel
-BuildRequires:  libglademm24-devel libglade2-devel libtar-devel libtool
+BuildRequires:  libglademm24-devel libglade2-devel libtar-devel
 Requires:       initscripts
 
 %description
@@ -101,6 +101,8 @@
 %{configure} --with-boost
 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
+# Touch-magic to prevent auto* from running.  Thank you Andreas Metzler.
+touch -r Makefile.am configure.ac aclocal.m4 configure
 %{__make} %{?_smp_mflags}
 
 # gui tree
@@ -108,6 +110,7 @@
 %{configure} PKG_CONFIG_PATH="..:$PKG_CONFIG_PATH" CXXFLAGS="-I../.." LDFLAGS="-L../../src"
 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
+touch -r Makefile.am configure.ac aclocal.m4 configure
 %{__make} %{?_smp_mflags}
 cd ../
 
@@ -117,6 +120,7 @@
 %{configure} PKG_CONFIG_PATH="..:$PKG_CONFIG_PATH" CXXFLAGS="-I../.." LDFLAGS="-L../../src"
 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
+touch -r Makefile.am configure.ac aclocal.m4 configure
 %{__make} %{?_smp_mflags}
 cd ../
 %endif



From nosnilmot at fedoraproject.org  Mon Jan 12 19:36:51 2009
From: nosnilmot at fedoraproject.org (Stu Tomlinson)
Date: Mon, 12 Jan 2009 19:36:51 +0000 (UTC)
Subject: rpms/pidgin/F-10 .cvsignore, 1.21, 1.22 pidgin.spec, 1.72,
	1.73 sources, 1.21, 1.22
Message-ID: <20090112193651.17DDE7013F@cvs1.fedora.phx.redhat.com>

Author: nosnilmot

Update of /cvs/pkgs/rpms/pidgin/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26726/F-10

Modified Files:
	.cvsignore pidgin.spec sources 
Log Message:
Pidgin 2.5.4



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pidgin/F-10/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- .cvsignore	27 Dec 2008 00:03:50 -0000	1.21
+++ .cvsignore	12 Jan 2009 19:36:20 -0000	1.22
@@ -1 +1 @@
-pidgin-2.5.3.tar.bz2
+pidgin-2.5.4.tar.bz2


Index: pidgin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pidgin/F-10/pidgin.spec,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- pidgin.spec	27 Dec 2008 00:03:50 -0000	1.72
+++ pidgin.spec	12 Jan 2009 19:36:20 -0000	1.73
@@ -61,7 +61,7 @@
 %endif
 
 Name:		pidgin
-Version:	2.5.3
+Version:	2.5.4
 Release:	1%{?dist}
 License:        GPLv2+ and GPLv2 and MIT
 # GPLv2+ - libpurple, gnt, finch, pidgin, most prpls
@@ -561,6 +561,9 @@
 %endif
 
 %changelog
+* Mon Jan 12 2009 Stu Tomlinson <stu at nosnilmot.com> 2.5.4-1
+- 2.5.4
+
 * Fri Dec 26 2008 Warren Togami <wtogami at redhat.com> 2.5.3-1
 - 2.5.3
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pidgin/F-10/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sources	27 Dec 2008 00:03:50 -0000	1.21
+++ sources	12 Jan 2009 19:36:20 -0000	1.22
@@ -1 +1 @@
-4abc4ce9e1ad62bbf098f05f305147d7  pidgin-2.5.3.tar.bz2
+295fe533288c821342b660b6fc83bc11  pidgin-2.5.4.tar.bz2



From nosnilmot at fedoraproject.org  Mon Jan 12 19:36:50 2009
From: nosnilmot at fedoraproject.org (Stu Tomlinson)
Date: Mon, 12 Jan 2009 19:36:50 +0000 (UTC)
Subject: rpms/pidgin/F-9 .cvsignore, 1.21, 1.22 pidgin.spec, 1.63,
	1.64 sources, 1.21, 1.22
Message-ID: <20090112193650.ED47E70123@cvs1.fedora.phx.redhat.com>

Author: nosnilmot

Update of /cvs/pkgs/rpms/pidgin/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26726/F-9

Modified Files:
	.cvsignore pidgin.spec sources 
Log Message:
Pidgin 2.5.4



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pidgin/F-9/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- .cvsignore	27 Dec 2008 00:24:00 -0000	1.21
+++ .cvsignore	12 Jan 2009 19:36:20 -0000	1.22
@@ -1 +1 @@
-pidgin-2.5.3.tar.bz2
+pidgin-2.5.4.tar.bz2


Index: pidgin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pidgin/F-9/pidgin.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- pidgin.spec	27 Dec 2008 00:24:00 -0000	1.63
+++ pidgin.spec	12 Jan 2009 19:36:20 -0000	1.64
@@ -61,7 +61,7 @@
 %endif
 
 Name:		pidgin
-Version:	2.5.3
+Version:	2.5.4
 Release:	1%{?dist}
 License:        GPLv2+ and GPLv2 and MIT
 # GPLv2+ - libpurple, gnt, finch, pidgin, most prpls
@@ -561,6 +561,9 @@
 %endif
 
 %changelog
+* Mon Jan 12 2009 Stu Tomlinson <stu at nosnilmot.com> 2.5.4-1
+- 2.5.4
+
 * Fri Dec 26 2008 Warren Togami <wtogami at redhat.com> 2.5.3-1
 - 2.5.3
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pidgin/F-9/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sources	27 Dec 2008 00:24:00 -0000	1.21
+++ sources	12 Jan 2009 19:36:20 -0000	1.22
@@ -1 +1 @@
-4abc4ce9e1ad62bbf098f05f305147d7  pidgin-2.5.3.tar.bz2
+295fe533288c821342b660b6fc83bc11  pidgin-2.5.4.tar.bz2



From nosnilmot at fedoraproject.org  Mon Jan 12 19:36:51 2009
From: nosnilmot at fedoraproject.org (Stu Tomlinson)
Date: Mon, 12 Jan 2009 19:36:51 +0000 (UTC)
Subject: rpms/pidgin/devel .cvsignore, 1.21, 1.22 pidgin.spec, 1.64,
	1.65 sources, 1.21, 1.22
Message-ID: <20090112193651.53C2D70123@cvs1.fedora.phx.redhat.com>

Author: nosnilmot

Update of /cvs/pkgs/rpms/pidgin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26726/devel

Modified Files:
	.cvsignore pidgin.spec sources 
Log Message:
Pidgin 2.5.4



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pidgin/devel/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- .cvsignore	26 Dec 2008 23:50:47 -0000	1.21
+++ .cvsignore	12 Jan 2009 19:36:21 -0000	1.22
@@ -1 +1 @@
-pidgin-2.5.3.tar.bz2
+pidgin-2.5.4.tar.bz2


Index: pidgin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pidgin/devel/pidgin.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- pidgin.spec	26 Dec 2008 22:36:36 -0000	1.64
+++ pidgin.spec	12 Jan 2009 19:36:21 -0000	1.65
@@ -61,7 +61,7 @@
 %endif
 
 Name:		pidgin
-Version:	2.5.3
+Version:	2.5.4
 Release:	1%{?dist}
 License:        GPLv2+ and GPLv2 and MIT
 # GPLv2+ - libpurple, gnt, finch, pidgin, most prpls
@@ -561,6 +561,9 @@
 %endif
 
 %changelog
+* Mon Jan 12 2009 Stu Tomlinson <stu at nosnilmot.com> 2.5.4-1
+- 2.5.4
+
 * Fri Dec 26 2008 Warren Togami <wtogami at redhat.com> 2.5.3-1
 - 2.5.3
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pidgin/devel/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sources	26 Dec 2008 23:50:47 -0000	1.21
+++ sources	12 Jan 2009 19:36:21 -0000	1.22
@@ -1 +1 @@
-4abc4ce9e1ad62bbf098f05f305147d7  pidgin-2.5.3.tar.bz2
+295fe533288c821342b660b6fc83bc11  pidgin-2.5.4.tar.bz2



From dwalsh at fedoraproject.org  Mon Jan 12 19:38:25 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Mon, 12 Jan 2009 19:38:25 +0000 (UTC)
Subject: rpms/libsemanage/devel libsemanage-rhat.patch,1.44,1.45
Message-ID: <20090112193825.6271870123@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/libsemanage/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27211

Modified Files:
	libsemanage-rhat.patch 
Log Message:
* Mon Jan 12 2009 Dan Walsh <dwalsh at redhat.com> - 2.0.30-3
- Fix up patch to get it upstreamed


libsemanage-rhat.patch:

Index: libsemanage-rhat.patch
===================================================================
RCS file: /cvs/extras/rpms/libsemanage/devel/libsemanage-rhat.patch,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- libsemanage-rhat.patch	12 Jan 2009 15:55:46 -0000	1.44
+++ libsemanage-rhat.patch	12 Jan 2009 19:37:55 -0000	1.45
@@ -1,6 +1,6 @@
 diff --exclude-from=exclude -N -u -r nsalibsemanage/include/semanage/modules.h libsemanage-2.0.30/include/semanage/modules.h
 --- nsalibsemanage/include/semanage/modules.h	2008-08-28 09:34:24.000000000 -0400
-+++ libsemanage-2.0.30/include/semanage/modules.h	2009-01-12 09:38:35.420740000 -0500
++++ libsemanage-2.0.30/include/semanage/modules.h	2009-01-12 13:20:46.000000000 -0500
 @@ -30,10 +30,16 @@
  
  int semanage_module_install(semanage_handle_t *,
@@ -20,7 +20,7 @@
  /* semanage_module_info is for getting information on installed
 diff --exclude-from=exclude -N -u -r nsalibsemanage/src/direct_api.c libsemanage-2.0.30/src/direct_api.c
 --- nsalibsemanage/src/direct_api.c	2008-11-14 17:10:15.000000000 -0500
-+++ libsemanage-2.0.30/src/direct_api.c	2009-01-12 10:20:45.394714000 -0500
++++ libsemanage-2.0.30/src/direct_api.c	2009-01-12 14:34:36.000000000 -0500
 @@ -50,6 +50,7 @@
  #include "semanage_store.h"
  #include "database_policydb.h"
@@ -66,7 +66,7 @@
 +
 +/* bzip() a data to a file, returning the total number of compressed bytes
 + * in the file.  Returns -1 if file could not be compressed. */
-+static size_t bzip(const char *filename, char *data, size_t num_bytes) {
++static ssize_t bzip(const char *filename, char *data, size_t num_bytes) {
 +	BZFILE* b;
 +	size_t  size = 1<<16;
 +	int     bzerror;
@@ -108,7 +108,7 @@
 +
 +/* bunzip() a file to '*data', returning the total number of uncompressed bytes
 + * in the file.  Returns -1 if file could not be decompressed. */
-+size_t bunzip(FILE *f, char **data) {
++ssize_t bunzip(FILE *f, char **data) {
 +	BZFILE* b;
 +	size_t  nBuf;
 +	char    buf[1<<18];
@@ -151,9 +151,9 @@
 + * the file into '*data'.
 + * Returns the total number of bytes in memory .
 + * Returns -1 if file could not be opened or mapped. */
-+static size_t map_file(int fd, char **data, int *compressed)
++static ssize_t map_file(int fd, char **data, int *compressed)
 +{
-+	int size = -1;
++	ssize_t size = -1;
 +	char *uncompress;
 +	if ((size = bunzip(fdopen(fd, "r"), &uncompress)) > 0) {
 +		*data = mmap(0, size, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0);
@@ -227,7 +227,7 @@
  		goto cleanup;
  	}
 -	if (write_file(sh, filename, data, data_len) == -1) {
-+	if (bzip(filename, data, data_len) == 0) {
++	if (bzip(filename, data, data_len) <= 0) {
 +		ERR(sh, "Error while writing to %s.", filename);
  		retval = -3;
 +		goto cleanup;
@@ -346,7 +346,7 @@
 +						 data, data_len, 
 +						 &filename);
 +	if (retval == 0) {
-+		if (bzip(filename, data, data_len) == 0) {
++		if (bzip(filename, data, data_len) <= 0) {
 +			ERR(sh, "Error while writing to %s.", filename);
 +			retval = -3;
 +		}
@@ -404,7 +404,7 @@
  		goto cleanup;
  	}
 -	if (write_file(sh, filename, base_data, data_len) == -1) {
-+	if (bzip(filename, base_data, data_len) == 0) {
++	if (bzip(filename, base_data, data_len) <= 0) {
 +		ERR(sh, "Error while writing to %s.", filename);
  		retval = -3;
 +		goto cleanup;
@@ -464,10 +464,10 @@
  			 * report it */
  			continue;
  		}
-+		size_t size;
++		ssize_t size;
 +		char *data = NULL;
 +
-+		if ((size = bunzip(fp, &data)) != 0) {
++		if ((size = bunzip(fp, &data)) > 0) {
 +			fclose(fp);
 +			fp = fmemopen(data, size, "rb");
 +			if (!fp) {
@@ -492,18 +492,19 @@
  			(*modinfo)[*num_modules].version = version;
 diff --exclude-from=exclude -N -u -r nsalibsemanage/src/direct_api.h libsemanage-2.0.30/src/direct_api.h
 --- nsalibsemanage/src/direct_api.h	2008-11-14 17:10:15.000000000 -0500
-+++ libsemanage-2.0.30/src/direct_api.h	2009-01-12 10:23:16.078163000 -0500
-@@ -39,4 +39,7 @@
++++ libsemanage-2.0.30/src/direct_api.h	2009-01-12 13:43:27.000000000 -0500
+@@ -39,4 +39,8 @@
  
  int semanage_direct_mls_enabled(struct semanage_handle *sh);
  
 +#include <stdio.h>
-+size_t bunzip(FILE *f, char **data);
++#include <unistd.h>
++ssize_t bunzip(FILE *f, char **data);
 +
  #endif
 diff --exclude-from=exclude -N -u -r nsalibsemanage/src/genhomedircon.c libsemanage-2.0.30/src/genhomedircon.c
 --- nsalibsemanage/src/genhomedircon.c	2008-08-28 09:34:24.000000000 -0400
-+++ libsemanage-2.0.30/src/genhomedircon.c	2009-01-12 09:38:35.444738000 -0500
++++ libsemanage-2.0.30/src/genhomedircon.c	2009-01-12 13:20:46.000000000 -0500
 @@ -487,7 +487,6 @@
  				  const char *role_prefix)
  {
@@ -535,7 +536,7 @@
  			*errors = STATUS_ERR;
 diff --exclude-from=exclude -N -u -r nsalibsemanage/src/libsemanage.map libsemanage-2.0.30/src/libsemanage.map
 --- nsalibsemanage/src/libsemanage.map	2008-11-14 17:10:15.000000000 -0500
-+++ libsemanage-2.0.30/src/libsemanage.map	2009-01-12 09:38:35.456740000 -0500
++++ libsemanage-2.0.30/src/libsemanage.map	2009-01-12 13:20:46.000000000 -0500
 @@ -3,8 +3,10 @@
            semanage_is_managed; semanage_connect; semanage_disconnect; 
  	  semanage_msg_*;
@@ -551,7 +552,7 @@
  	  semanage_module_get_version; semanage_select_store;
 diff --exclude-from=exclude -N -u -r nsalibsemanage/src/Makefile libsemanage-2.0.30/src/Makefile
 --- nsalibsemanage/src/Makefile	2008-08-28 09:34:24.000000000 -0400
-+++ libsemanage-2.0.30/src/Makefile	2009-01-12 09:38:35.424738000 -0500
++++ libsemanage-2.0.30/src/Makefile	2009-01-12 13:20:46.000000000 -0500
 @@ -54,7 +54,7 @@
  	ranlib $@
  
@@ -563,7 +564,7 @@
  conf-scan.c: conf-scan.l conf-parse.h
 diff --exclude-from=exclude -N -u -r nsalibsemanage/src/modules.c libsemanage-2.0.30/src/modules.c
 --- nsalibsemanage/src/modules.c	2008-08-28 09:34:24.000000000 -0400
-+++ libsemanage-2.0.30/src/modules.c	2009-01-12 09:38:35.462738000 -0500
++++ libsemanage-2.0.30/src/modules.c	2009-01-12 13:20:46.000000000 -0500
 @@ -52,6 +52,25 @@
  	return sh->funcs->install(sh, module_data, data_len);
  }
@@ -644,7 +645,7 @@
  	if (sh->funcs->remove == NULL) {
 diff --exclude-from=exclude -N -u -r nsalibsemanage/src/policy.h libsemanage-2.0.30/src/policy.h
 --- nsalibsemanage/src/policy.h	2008-08-28 09:34:24.000000000 -0400
-+++ libsemanage-2.0.30/src/policy.h	2009-01-12 09:38:35.481737000 -0500
++++ libsemanage-2.0.30/src/policy.h	2009-01-12 13:20:46.000000000 -0500
 @@ -49,8 +49,14 @@
  	/* Install a policy module */
  	int (*install) (struct semanage_handle *, char *, size_t);
@@ -672,7 +673,7 @@
  /* Should be backend independent */
 diff --exclude-from=exclude -N -u -r nsalibsemanage/src/semanage.conf libsemanage-2.0.30/src/semanage.conf
 --- nsalibsemanage/src/semanage.conf	2008-08-28 09:34:24.000000000 -0400
-+++ libsemanage-2.0.30/src/semanage.conf	2009-01-12 09:38:35.487738000 -0500
++++ libsemanage-2.0.30/src/semanage.conf	2009-01-12 13:20:46.000000000 -0500
 @@ -35,4 +35,4 @@
  # given in <sepol/policydb.h>.  Change this setting if a different
  # version is necessary.
@@ -681,7 +682,7 @@
 +expand-check=0
 diff --exclude-from=exclude -N -u -r nsalibsemanage/src/semanage_store.c libsemanage-2.0.30/src/semanage_store.c
 --- nsalibsemanage/src/semanage_store.c	2008-11-11 16:13:18.000000000 -0500
-+++ libsemanage-2.0.30/src/semanage_store.c	2009-01-12 10:17:08.334866000 -0500
++++ libsemanage-2.0.30/src/semanage_store.c	2009-01-12 13:20:46.000000000 -0500
 @@ -440,6 +440,8 @@
  	char tmp[PATH_MAX];
  	char buf[4192];
@@ -698,7 +699,7 @@
 +	size_t size;
 +	char *data = NULL;
 +
-+	if ((size = bunzip(fp, &data)) != 0) {
++	if ((size = bunzip(fp, &data)) > 0) {
 +		fclose(fp);
 +		fp = fmemopen(data, size, "rb");
 +		if (!fp) {



From mbarnes at fedoraproject.org  Mon Jan 12 19:49:35 2009
From: mbarnes at fedoraproject.org (Matthew Barnes)
Date: Mon, 12 Jan 2009 19:49:35 +0000 (UTC)
Subject: rpms/gtkhtml3/F-10 .cvsignore, 1.85, 1.86 gtkhtml3.spec, 1.136,
	1.137 sources, 1.85, 1.86
Message-ID: <20090112194935.7C7D570123@cvs1.fedora.phx.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/gtkhtml3/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28786

Modified Files:
	.cvsignore gtkhtml3.spec sources 
Log Message:

* Mon Jan 22 2009 Matthew Barnes <mbarnes at redhat.com> - 3.24.3-1.fc10
- Update to 3.24.3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gtkhtml3/F-10/.cvsignore,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -r1.85 -r1.86
--- .cvsignore	24 Nov 2008 15:00:13 -0000	1.85
+++ .cvsignore	12 Jan 2009 19:49:04 -0000	1.86
@@ -1 +1 @@
-gtkhtml-3.24.2.tar.bz2
+gtkhtml-3.24.3.tar.bz2


Index: gtkhtml3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtkhtml3/F-10/gtkhtml3.spec,v
retrieving revision 1.136
retrieving revision 1.137
diff -u -r1.136 -r1.137
--- gtkhtml3.spec	24 Nov 2008 15:00:13 -0000	1.136
+++ gtkhtml3.spec	12 Jan 2009 19:49:04 -0000	1.137
@@ -9,7 +9,7 @@
 ### Abstract ###
 
 Name: gtkhtml3
-Version: 3.24.2
+Version: 3.24.3
 Release: 1%{?dist}
 License: LGPLv2+ and GPLv2
 Group: System Environment/Libraries
@@ -123,6 +123,9 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Mon Jan 22 2009 Matthew Barnes <mbarnes at redhat.com> - 3.24.3-1.fc10
+- Update to 3.24.3
+
 * Mon Nov 24 2008 Matthew Barnes <mbarnes at redhat.com> - 3.24.2-1.fc10
 - Update to 3.24.2
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gtkhtml3/F-10/sources,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -r1.85 -r1.86
--- sources	24 Nov 2008 15:00:13 -0000	1.85
+++ sources	12 Jan 2009 19:49:04 -0000	1.86
@@ -1 +1 @@
-d6b7471d2806d28d76b09b20f6ea86b0  gtkhtml-3.24.2.tar.bz2
+d492359012c0a48227bba467492cbf08  gtkhtml-3.24.3.tar.bz2



From mbarnes at fedoraproject.org  Mon Jan 12 19:49:38 2009
From: mbarnes at fedoraproject.org (Matthew Barnes)
Date: Mon, 12 Jan 2009 19:49:38 +0000 (UTC)
Subject: rpms/evolution-data-server/F-10
	evolution-data-server-2.24.3-compiler-warnings.patch, NONE,
	1.1 .cvsignore, 1.97, 1.98 evolution-data-server.spec, 1.239,
	1.240 sources, 1.97, 1.98
Message-ID: <20090112194938.0713170123@cvs1.fedora.phx.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/evolution-data-server/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28870

Modified Files:
	.cvsignore evolution-data-server.spec sources 
Added Files:
	evolution-data-server-2.24.3-compiler-warnings.patch 
Log Message:

* Mon Jan 12 2009 Matthew Barnes <mbarnes at redhat.com> - 2.24.3-1.fc10
- Update to 2.24.3


evolution-data-server-2.24.3-compiler-warnings.patch:

--- NEW FILE evolution-data-server-2.24.3-compiler-warnings.patch ---
diff -up evolution-data-server-2.24.3/camel/camel-folder-summary.c.compiler-warnings evolution-data-server-2.24.3/camel/camel-folder-summary.c
--- evolution-data-server-2.24.3/camel/camel-folder-summary.c.compiler-warnings	2009-01-12 14:42:28.000000000 -0500
+++ evolution-data-server-2.24.3/camel/camel-folder-summary.c	2009-01-12 14:42:36.000000000 -0500
@@ -40,6 +40,7 @@
 
 #include <libedataserver/e-memory.h>
 
+#include "camel-debug.h"
 #include "camel-db.h"
 #include "camel-file-utils.h"
 #include "camel-folder-summary.h"


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-data-server/F-10/.cvsignore,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -r1.97 -r1.98
--- .cvsignore	24 Nov 2008 15:05:06 -0000	1.97
+++ .cvsignore	12 Jan 2009 19:49:07 -0000	1.98
@@ -1 +1 @@
-evolution-data-server-2.24.2.tar.bz2
+evolution-data-server-2.24.3.tar.bz2


Index: evolution-data-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-data-server/F-10/evolution-data-server.spec,v
retrieving revision 1.239
retrieving revision 1.240
diff -u -r1.239 -r1.240
--- evolution-data-server.spec	24 Nov 2008 15:05:06 -0000	1.239
+++ evolution-data-server.spec	12 Jan 2009 19:49:07 -0000	1.240
@@ -28,7 +28,7 @@
 ### Abstract ###
 
 Name: evolution-data-server
-Version: 2.24.2
+Version: 2.24.3
 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.24.3-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 Jan 12 2009 Matthew Barnes <mbarnes at redhat.com> - 2.24.3-1.fc10
+- Update to 2.24.3
+
 * Mon Nov 24 2008 Matthew Barnes <mbarnes at redhat.com> - 2.24.2-1.fc10
 - Update to 2.24.2
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-data-server/F-10/sources,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -r1.97 -r1.98
--- sources	24 Nov 2008 15:05:06 -0000	1.97
+++ sources	12 Jan 2009 19:49:07 -0000	1.98
@@ -1 +1 @@
-ee08e677d30fadd58e53e6e064d4ae6e  evolution-data-server-2.24.2.tar.bz2
+fc0b48f6246ed700fcc2b9f52538dd85  evolution-data-server-2.24.3.tar.bz2



From mbarnes at fedoraproject.org  Mon Jan 12 19:49:39 2009
From: mbarnes at fedoraproject.org (Matthew Barnes)
Date: Mon, 12 Jan 2009 19:49:39 +0000 (UTC)
Subject: rpms/evolution-exchange/F-10 .cvsignore, 1.33,
	1.34 evolution-exchange.spec, 1.46, 1.47 sources, 1.33, 1.34
Message-ID: <20090112194939.0D78870123@cvs1.fedora.phx.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/evolution-exchange/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28840

Modified Files:
	.cvsignore evolution-exchange.spec sources 
Log Message:

* Mon Jan 22 2009 Matthew Barnes <mbarnes at redhat.com> - 2.24.3-1.fc10
- Update to 2.24.3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-exchange/F-10/.cvsignore,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- .cvsignore	24 Nov 2008 15:05:15 -0000	1.33
+++ .cvsignore	12 Jan 2009 19:49:08 -0000	1.34
@@ -1 +1 @@
-evolution-exchange-2.24.2.tar.bz2
+evolution-exchange-2.24.3.tar.bz2


Index: evolution-exchange.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-exchange/F-10/evolution-exchange.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- evolution-exchange.spec	24 Nov 2008 15:05:16 -0000	1.46
+++ evolution-exchange.spec	12 Jan 2009 19:49:08 -0000	1.47
@@ -1,4 +1,4 @@
-%define evo_version 2.23.1
+%define evo_version 2.24.1
 %define eds_version 2.24.1
 %define intltool_version 0.35.5
 %define libsoup_version 2.3.0
@@ -22,7 +22,7 @@
 ### Abstract ###
 
 Name: evolution-exchange
-Version: 2.24.2
+Version: 2.24.3
 Release: 1%{?dist}
 License: GPLv2
 Group: Applications/Productivity
@@ -156,6 +156,9 @@
 %{_sysconfdir}/gconf/schemas/apps_exchange_addressbook-%{evo_major}.schemas
 
 %changelog
+* Mon Jan 22 2009 Matthew Barnes <mbarnes at redhat.com> - 2.24.3-1.fc10
+- Update to 2.24.3
+
 * Mon Nov 24 2008 Matthew Barnes <mbarnes at redhat.com> - 2.24.2-1.fc10
 - Update to 2.24.2
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-exchange/F-10/sources,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- sources	24 Nov 2008 15:05:16 -0000	1.33
+++ sources	12 Jan 2009 19:49:08 -0000	1.34
@@ -1 +1 @@
-718b08eabd8965b18990838ffe1a1bb9  evolution-exchange-2.24.2.tar.bz2
+ec3a9f81d113b96ce3dcb05b1f54eab1  evolution-exchange-2.24.3.tar.bz2



From mbarnes at fedoraproject.org  Mon Jan 12 19:49:39 2009
From: mbarnes at fedoraproject.org (Matthew Barnes)
Date: Mon, 12 Jan 2009 19:49:39 +0000 (UTC)
Subject: rpms/evolution/F-10 .cvsignore, 1.102, 1.103 evolution.spec, 1.364, 
	1.365 sources, 1.102,
	1.103 evolution-2.24.2-broken-account-uris.patch, 1.1,
	NONE evolution-2.24.2-sa-junk-plugin.patch, 1.1, NONE
Message-ID: <20090112194939.2A8247013F@cvs1.fedora.phx.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/evolution/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28815

Modified Files:
	.cvsignore evolution.spec sources 
Removed Files:
	evolution-2.24.2-broken-account-uris.patch 
	evolution-2.24.2-sa-junk-plugin.patch 
Log Message:

* Mon Jan 12 2009 Matthew Barnes <mbarnes at redhat.com> - 2.24.3-1.fc10
- Update to 2.24.3
- Remove patch for RH bug #476438 (fixed upstream).
- Remove patch for GNOME bug #552583 (fixed upstream).



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/F-10/.cvsignore,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -r1.102 -r1.103
--- .cvsignore	24 Nov 2008 15:07:30 -0000	1.102
+++ .cvsignore	12 Jan 2009 19:49:08 -0000	1.103
@@ -1 +1 @@
-evolution-2.24.2.tar.bz2
+evolution-2.24.3.tar.bz2


Index: evolution.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/F-10/evolution.spec,v
retrieving revision 1.364
retrieving revision 1.365
diff -u -r1.364 -r1.365
--- evolution.spec	14 Dec 2008 19:13:41 -0000	1.364
+++ evolution.spec	12 Jan 2009 19:49:08 -0000	1.365
@@ -44,8 +44,8 @@
 ### Abstract ###
 
 Name: evolution
-Version: 2.24.2
-Release: 3%{?dist}
+Version: 2.24.3
+Release: 1%{?dist}
 License: GPLv2 and GFDL
 Group: Applications/Productivity
 Summary: Mail and calendar client for GNOME
@@ -80,12 +80,6 @@
 # Don't ship broken plugins as stable
 Patch15: evolution-2.23.4-experimental-plugins.patch
 
-# GNOME bug #552583
-Patch16: evolution-2.24.2-broken-account-uris.patch
-
-# RH bug #476438 / GNOME bug #560420
-Patch17: evolution-2.24.2-sa-junk-plugin.patch
-
 ## Dependencies ###
 
 Requires(post): GConf2
@@ -238,8 +232,6 @@
 %patch13 -p1 -b .no-gnome-common
 %patch14 -p1 -b .im-context-reset
 %patch15 -p1 -b .experimental-plugins
-%patch16 -p1 -b .broken-account-uris
-%patch17 -p1 -b .sa-junk-plugin
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
@@ -704,6 +696,11 @@
 %{_libexecdir}/evolution/%{evo_major}/evolution-addressbook-clean
 
 %changelog
+* Mon Jan 12 2009 Matthew Barnes <mbarnes at redhat.com> - 2.24.3-1.fc10
+- Update to 2.24.3
+- Remove patch for RH bug #476438 (fixed upstream).
+- Remove patch for GNOME bug #552583 (fixed upstream).
+
 * Sun Dec 14 2008 Matthew Barnes <mbarnes at redhat.com> - 2.24.2-3.fc10
 - Add patch for RH bug #476438 (bogus spamassassin errors).
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/F-10/sources,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -r1.102 -r1.103
--- sources	24 Nov 2008 15:07:31 -0000	1.102
+++ sources	12 Jan 2009 19:49:08 -0000	1.103
@@ -1 +1 @@
-2b6621e8b71b06db57b776f66798f3b4  evolution-2.24.2.tar.bz2
+6671b2d31ea77ba6190fadbc51186567  evolution-2.24.3.tar.bz2


--- evolution-2.24.2-broken-account-uris.patch DELETED ---


--- evolution-2.24.2-sa-junk-plugin.patch DELETED ---



From bpepple at fedoraproject.org  Mon Jan 12 19:51:22 2009
From: bpepple at fedoraproject.org (Brian Pepple)
Date: Mon, 12 Jan 2009 19:51:22 +0000 (UTC)
Subject: rpms/telepathy-glib/devel .cvsignore, 1.21, 1.22 sources, 1.21,
	1.22 telepathy-glib.spec, 1.28, 1.29
Message-ID: <20090112195123.1486770123@cvs1.fedora.phx.redhat.com>

Author: bpepple

Update of /cvs/pkgs/rpms/telepathy-glib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29473

Modified Files:
	.cvsignore sources telepathy-glib.spec 
Log Message:
* Mon Jan 12 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.7.21-1
- Update to 0.7.21.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-glib/devel/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- .cvsignore	15 Dec 2008 21:01:14 -0000	1.21
+++ .cvsignore	12 Jan 2009 19:50:52 -0000	1.22
@@ -1 +1 @@
-telepathy-glib-0.7.20.tar.gz
+telepathy-glib-0.7.21.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-glib/devel/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sources	15 Dec 2008 21:01:14 -0000	1.21
+++ sources	12 Jan 2009 19:50:52 -0000	1.22
@@ -1 +1 @@
-26b32341f5088e8cea28a2b680b076a0  telepathy-glib-0.7.20.tar.gz
+e965bbce3019723377ba9528c86689ed  telepathy-glib-0.7.21.tar.gz


Index: telepathy-glib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-glib/devel/telepathy-glib.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- telepathy-glib.spec	15 Dec 2008 21:01:14 -0000	1.28
+++ telepathy-glib.spec	12 Jan 2009 19:50:52 -0000	1.29
@@ -3,7 +3,7 @@
 %define	glib_ver	2.16
 
 Name:           telepathy-glib
-Version:        0.7.20
+Version:        0.7.21
 Release:        1%{?dist}
 Summary:        GLib bindings for Telepathy
 
@@ -89,6 +89,9 @@
 
 
 %changelog
+* Mon Jan 12 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.7.21-1
+- Update to 0.7.21.
+
 * Mon Dec 15 2008 Brian Pepple <bpepple at fedoraproject.org> - 0.7.20-1
 - Update to 0.7.20.
 



From kyle at fedoraproject.org  Mon Jan 12 19:52:01 2009
From: kyle at fedoraproject.org (Kyle McMartin)
Date: Mon, 12 Jan 2009 19:52:01 +0000 (UTC)
Subject: rpms/kernel/F-10/scripts pull-upstreams.sh,1.6,1.7
Message-ID: <20090112195201.B342F70123@cvs1.fedora.phx.redhat.com>

Author: kyle

Update of /cvs/pkgs/rpms/kernel/F-10/scripts
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29606/scripts

Modified Files:
	pull-upstreams.sh 
Log Message:
* Mon Jan 12 2009 Kyle McMartin <kyle at redhat.com>
- Rebase for Fedora 10.
- Turn off CONFIG_MAXSMP on x86_64.



Index: pull-upstreams.sh
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/scripts/pull-upstreams.sh,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- pull-upstreams.sh	8 Jan 2009 04:44:03 -0000	1.6
+++ pull-upstreams.sh	12 Jan 2009 19:51:31 -0000	1.7
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-url=http://people.redhat.com/roland/utrace/${1:-2.6.27}
+url=http://people.redhat.com/roland/utrace/2.6-current
 
 wget -q -O /dev/stdout $url/series | grep 'patch$' |
 while read i



From kyle at fedoraproject.org  Mon Jan 12 19:52:05 2009
From: kyle at fedoraproject.org (Kyle McMartin)
Date: Mon, 12 Jan 2009 19:52:05 +0000 (UTC)
Subject: rpms/kernel/F-10 linux-2.6-gspca-git.patch, NONE,
	1.1 linux-2.6-olpc-speaker-out.patch, 1.2,
	1.3 linux-2.6-selinux-move-open-perms-check.patch, NONE,
	1.1 linux-2.6-serial.patch, NONE,
	1.1 linux-2.6.27-ext-dir-corruption-fix.patch, 1.2,
	1.3 linux-2.6.27-ext4-2.6.28-backport-fixups.patch, 1.2,
	1.3 linux-2.6.27-ext4-2.6.28-rc3-git6.patch, 1.2,
	1.3 linux-2.6.28.tar.bz2.sign, NONE, 1.1 .cvsignore, 1.960,
	1.961 Makefile, 1.90, 1.91 TODO, 1.46, 1.47 config-debug, 1.20,
	1.21 config-generic, 1.202, 1.203 config-ia64-generic, 1.18,
	1.19 config-nodebug, 1.22, 1.23 config-powerpc-generic, 1.26,
	1.27 config-rhel-generic, 1.15, 1.16 config-s390x, 1.9,
	1.10 config-sparc64-generic, 1.20, 1.21 config-x86-generic, 1.55,
	1.56 config-x86_64-generic, 1.54,
	1.55 drm-modesetting-radeon.patch, 1.68, 1.69 drm-next.patch,
	1.10, 1.11 git-cpufreq.patch, 1.3, 1.4 kernel.spec, 1.1206,
	1.1207 linux-2.6-compile-fixes.patch, 1.178,
	1.179 linux-2.6-crash-driver.patch, 1.11,
	1.12 linux-2.6-debug-taint-vm.patch, 1.21,
	1.22 linux-2.6-defaults-pci_no_msi.patch, 1.1,
	1.2 linux-2.6-execshield.patch, 1.97,
	1.98 linux-2.6-firewire-git-pending.patch, 1.33,
	1.34 linux-2.6-hdpvr.patch, 1.1, 1.2 linux-2.6-netdev-atl2.patch,
	1.2, 1.3 linux-2.6-pciehp-update.patch, 1.6,
	1.7 linux-2.6-silence-noise.patch, 1.21,
	1.22 linux-2.6-squashfs.patch, 1.31,
	1.32 linux-2.6-upstream-reverts.patch, 1.6,
	1.7 linux-2.6-utrace.patch, 1.103, 1.104 linux-2.6.27-lirc.patch,
	1.1, 1.2 linux-2.6.27-pci-hush-allocation-failures.patch, 1.2,
	1.3 sources, 1.922, 1.923 upstream, 1.834,
	1.835 drm-fix-master-enable.patch, 1.1,
	NONE drm-intel-8xx-pae-no-gem.patch, 1.4,
	NONE linux-2.6-acpi-dock-fix-eject-request-process.patch, 1.1,
	NONE linux-2.6-acpi-handle-ec-init-failure.patch, 1.1,
	NONE linux-2.6-alsa-backport-beep-switch.patch, 1.1, NONE
	linux-2.6-alsa-hda-remove-broken-headphone-control-for-dell-laptops.patch,
	1.1, NONE
	linux-2.6-alsa-hda-revert-remove-unneeded-hp-nid-references.patch,
	1.1, NONE linux-2.6-alsa-hda-stac-dell-m6-eapd.patch, 1.1,
	NONE linux-2.6-amd64-yes-i-know-you-live.patch, 1.1,
	NONE linux-2.6-crypto-fips_enable.patch, 1.1,
	NONE linux-2.6-default-mmf_dump_elf_headers.patch, 1.2,
	NONE linux-2.6-defaults-fat-utf8.patch, 1.4,
	NONE linux-2.6-dmi-autoload.patch, 1.1, NONE
	linux-2.6-e1000e-add-support-for-82567LM-3-and-82567LF-3-ICH10D-parts.patch,
	1.2, NONE linux-2.6-e1000e-add-support-for-new-82574L-part.patch, 1.3,
	NONE linux-2.6-e1000e-add-support-for-the-82567LM-4-device.patch,
	1.2, NONE linux-2.6-eeepc-laptop-update.patch, 1.2,
	NONE linux-2.6-gspca-vc0321-fix-frame-overflow.patch, 1.1,
	NONE linux-2.6-input.git-i8042-add-xps-m1530-to-nomux.patch, 1.1,
	NONE linux-2.6-iwl3945-ibss-tsf-fix.patch, 1.1,
	NONE linux-2.6-iwlagn-downgrade-BUG_ON-in-interrupt.patch, 1.1,
	NONE linux-2.6-merge-efifb-imacfb.patch, 1.5,
	NONE linux-2.6-mm-pagefault-enable-ints.patch, 1.1,
	NONE linux-2.6-net-qla-silence-debug-printks.patch, 1.1,
	NONE linux-2.6-netdev-r8169-2.6.28.patch, 1.2,
	NONE linux-2.6-nfs-client-mounts-hang.patch, 1.2,
	NONE linux-2.6-olpc-touchpad.patch, 1.2,
	NONE linux-2.6-pci-fix-pciehp-irq0.patch, 1.1,
	NONE linux-2.6-pciehp-kill-annoying-messages.patch, 1.1,
	NONE linux-2.6-quiet-iommu.patch, 1.1,
	NONE linux-2.6-quieter-mmc.patch, 1.1,
	NONE linux-2.6-sched-fine-tune-SD_MC_INIT.patch, 1.1,
	NONE linux-2.6-sched-fine-tune-SD_SIBLING_INIT.patch, 1.1,
	NONE linux-2.6-sched-wakeup-preempt-when-small-overlap.patch,
	1.1, NONE linux-2.6-selinux-empty-tty-files.patch, 1.1,
	NONE linux-2.6-selinux-recognise-addrlabel.patch, 1.1,
	NONE linux-2.6-toshiba-acpi-update.patch, 1.1,
	NONE linux-2.6-usb-ehci-hcd-respect-nousb.patch, 1.2,
	NONE linux-2.6-uvc-hg.patch, 1.1,
	NONE linux-2.6-uvc-spca525.patch, 1.1,
	NONE linux-2.6-wireless-ath9k-dma-fixes.patch, 1.2,
	NONE linux-2.6-x86-pci-amd-config-space.patch, 1.1,
	NONE linux-2.6-x86-tracehook.patch, 1.10, NONE
	linux-2.6-xen-execshield-add-xen-specific-load_user_cs_desc.patch,
	1.1, NONE
	linux-2.6-xen-execshield-only-define-load_user_cs_desc-on-32-bit.patch,
	1.1, NONE linux-2.6.27-ext4-rename-ext4dev-to-ext4.patch, 1.1,
	NONE linux-2.6.27-hwmon-applesmc-2.6.28.patch, 1.3,
	NONE linux-2.6.27-x86-tracehook-syscall-arg-order.patch, 1.1,
	NONE linux-2.6.27.7-alsa-driver-fixups.patch, 1.2,
	NONE linux-2.6.27.9-alsa-driver-1.0.18a.patch, 1.1,
	NONE linux-2.6.27.9-alsa-hda-add-a-quirk-for-dell-studio-15.patch,
	1.1, NONE linux-2.6.27.9-alsa-hda-mark-dell-studio-1535-quirk.patch, 
	1.1, NONE
	linux-2.6.27.9-alsa-hda-no-headphone-as-line-out-swich-without-line-outs.patch,
	1.1, NONE linux-2.6.27.9-ext4-cap-check-delay.patch, 1.1,
	NONE linux-2.6.27.tar.bz2.sign, 1.1, NONE nvidia-agp.patch, 1.1,
	NONE patch-2.6.27.10.bz2.sign, 1.1,
	NONE sparc-2.6.git-aae7fb87ec4d2df6cb551670b1765cf4e5795a3b.patch,
	1.1, NONE
Message-ID: <20090112195205.8B9C470123@cvs1.fedora.phx.redhat.com>

Author: kyle

Update of /cvs/pkgs/rpms/kernel/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29606

Modified Files:
	.cvsignore Makefile TODO config-debug config-generic 
	config-ia64-generic config-nodebug config-powerpc-generic 
	config-rhel-generic config-s390x config-sparc64-generic 
	config-x86-generic config-x86_64-generic 
	drm-modesetting-radeon.patch drm-next.patch git-cpufreq.patch 
	kernel.spec linux-2.6-compile-fixes.patch 
	linux-2.6-crash-driver.patch linux-2.6-debug-taint-vm.patch 
	linux-2.6-defaults-pci_no_msi.patch linux-2.6-execshield.patch 
	linux-2.6-firewire-git-pending.patch linux-2.6-hdpvr.patch 
	linux-2.6-netdev-atl2.patch linux-2.6-pciehp-update.patch 
	linux-2.6-silence-noise.patch linux-2.6-squashfs.patch 
	linux-2.6-upstream-reverts.patch linux-2.6-utrace.patch 
	linux-2.6.27-lirc.patch 
	linux-2.6.27-pci-hush-allocation-failures.patch sources 
	upstream 
Added Files:
	linux-2.6-gspca-git.patch linux-2.6-olpc-speaker-out.patch 
	linux-2.6-selinux-move-open-perms-check.patch 
	linux-2.6-serial.patch 
	linux-2.6.27-ext-dir-corruption-fix.patch 
	linux-2.6.27-ext4-2.6.28-backport-fixups.patch 
	linux-2.6.27-ext4-2.6.28-rc3-git6.patch 
	linux-2.6.28.tar.bz2.sign 
Removed Files:
	drm-fix-master-enable.patch drm-intel-8xx-pae-no-gem.patch 
	linux-2.6-acpi-dock-fix-eject-request-process.patch 
	linux-2.6-acpi-handle-ec-init-failure.patch 
	linux-2.6-alsa-backport-beep-switch.patch 
	linux-2.6-alsa-hda-remove-broken-headphone-control-for-dell-laptops.patch 
	linux-2.6-alsa-hda-revert-remove-unneeded-hp-nid-references.patch 
	linux-2.6-alsa-hda-stac-dell-m6-eapd.patch 
	linux-2.6-amd64-yes-i-know-you-live.patch 
	linux-2.6-crypto-fips_enable.patch 
	linux-2.6-default-mmf_dump_elf_headers.patch 
	linux-2.6-defaults-fat-utf8.patch linux-2.6-dmi-autoload.patch 
	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-eeepc-laptop-update.patch 
	linux-2.6-gspca-vc0321-fix-frame-overflow.patch 
	linux-2.6-input.git-i8042-add-xps-m1530-to-nomux.patch 
	linux-2.6-iwl3945-ibss-tsf-fix.patch 
	linux-2.6-iwlagn-downgrade-BUG_ON-in-interrupt.patch 
	linux-2.6-merge-efifb-imacfb.patch 
	linux-2.6-mm-pagefault-enable-ints.patch 
	linux-2.6-net-qla-silence-debug-printks.patch 
	linux-2.6-netdev-r8169-2.6.28.patch 
	linux-2.6-nfs-client-mounts-hang.patch 
	linux-2.6-olpc-touchpad.patch 
	linux-2.6-pci-fix-pciehp-irq0.patch 
	linux-2.6-pciehp-kill-annoying-messages.patch 
	linux-2.6-quiet-iommu.patch linux-2.6-quieter-mmc.patch 
	linux-2.6-sched-fine-tune-SD_MC_INIT.patch 
	linux-2.6-sched-fine-tune-SD_SIBLING_INIT.patch 
	linux-2.6-sched-wakeup-preempt-when-small-overlap.patch 
	linux-2.6-selinux-empty-tty-files.patch 
	linux-2.6-selinux-recognise-addrlabel.patch 
	linux-2.6-toshiba-acpi-update.patch 
	linux-2.6-usb-ehci-hcd-respect-nousb.patch 
	linux-2.6-uvc-hg.patch linux-2.6-uvc-spca525.patch 
	linux-2.6-wireless-ath9k-dma-fixes.patch 
	linux-2.6-x86-pci-amd-config-space.patch 
	linux-2.6-x86-tracehook.patch 
	linux-2.6-xen-execshield-add-xen-specific-load_user_cs_desc.patch 
	linux-2.6-xen-execshield-only-define-load_user_cs_desc-on-32-bit.patch 
	linux-2.6.27-ext4-rename-ext4dev-to-ext4.patch 
	linux-2.6.27-hwmon-applesmc-2.6.28.patch 
	linux-2.6.27-x86-tracehook-syscall-arg-order.patch 
	linux-2.6.27.7-alsa-driver-fixups.patch 
	linux-2.6.27.9-alsa-driver-1.0.18a.patch 
	linux-2.6.27.9-alsa-hda-add-a-quirk-for-dell-studio-15.patch 
	linux-2.6.27.9-alsa-hda-mark-dell-studio-1535-quirk.patch 
	linux-2.6.27.9-alsa-hda-no-headphone-as-line-out-swich-without-line-outs.patch 
	linux-2.6.27.9-ext4-cap-check-delay.patch 
	linux-2.6.27.tar.bz2.sign nvidia-agp.patch 
	patch-2.6.27.10.bz2.sign 
	sparc-2.6.git-aae7fb87ec4d2df6cb551670b1765cf4e5795a3b.patch 
Log Message:
* Mon Jan 12 2009 Kyle McMartin <kyle at redhat.com>
- Rebase for Fedora 10.
- Turn off CONFIG_MAXSMP on x86_64.


linux-2.6-gspca-git.patch:

--- NEW FILE linux-2.6-gspca-git.patch ---
diff -urN /home/hans/projects/fedora-extras/kernel/devel/kernel-2.6.27/linux-2.6.27.noarch/drivers/media/video/gspca/Kconfig linux/drivers/media/video/gspca/Kconfig
--- /home/hans/projects/fedora-extras/kernel/devel/kernel-2.6.27/linux-2.6.27.noarch/drivers/media/video/gspca/Kconfig	2008-12-10 19:44:21.000000000 +0100
+++ linux/drivers/media/video/gspca/Kconfig	2008-12-09 21:37:33.000000000 +0100
@@ -12,7 +12,7 @@
 	  "Video For Linux" to use this driver.
 
 	  To compile this driver as modules, choose M here: the
-	  modules will be called gspca_main.
+	  module will be called gspca_main.
 
 
 if USB_GSPCA && VIDEO_V4L2
@@ -64,6 +64,16 @@
 	  To compile this driver as a module, choose M here: the
 	  module will be called gspca_ov519.
 
+config USB_GSPCA_OV534
+	tristate "OV534 USB Camera Driver"
+	depends on VIDEO_V4L2 && USB_GSPCA
+	help
+	  Say Y here if you want support for cameras based on the OV534 chip.
+	  (e.g. Sony Playstation EYE)
+
+	  To compile this driver as a module, choose M here: the
+	  module will be called gspca_ov534.
+
 config USB_GSPCA_PAC207
 	tristate "Pixart PAC207 USB Camera Driver"
 	depends on VIDEO_V4L2 && USB_GSPCA
@@ -83,10 +93,11 @@
 	  module will be called gspca_pac7311.
 
 config USB_GSPCA_SONIXB
-	tristate "SN9C102 USB Camera Driver"
+	tristate "SONIX Bayer USB Camera Driver"
 	depends on VIDEO_V4L2 && USB_GSPCA
 	help
-	  Say Y here if you want support for cameras based on the SONIXB chip.
+	  Say Y here if you want support for cameras based on the Sonix
+	  chips with Bayer format (SN9C101, SN9C102 and SN9C103).
 
 	  To compile this driver as a module, choose M here: the
 	  module will be called gspca_sonixb.
@@ -95,7 +106,8 @@
 	tristate "SONIX JPEG USB Camera Driver"
 	depends on VIDEO_V4L2 && USB_GSPCA
 	help
-	  Say Y here if you want support for cameras based on the SONIXJ chip.
+	  Say Y here if you want support for cameras based on the Sonix
+	  chips with JPEG format (SN9C102P, SN9C105 and >= SN9C110).
 
 	  To compile this driver as a module, choose M here: the
 	  module will be called gspca_sonixj
@@ -171,7 +183,7 @@
 	  SPCA504(abc) SPCA533 SPCA536 chips.
 
 	  To compile this driver as a module, choose M here: the
-	  module will be called gspca_spca5xx.
+	  module will be called gspca_sunplus.
 
 config USB_GSPCA_T613
 	tristate "T613 (JPEG Compliance) USB Camera Driver"
diff -urN /home/hans/projects/fedora-extras/kernel/devel/kernel-2.6.27/linux-2.6.27.noarch/drivers/media/video/gspca/Makefile linux/drivers/media/video/gspca/Makefile
--- /home/hans/projects/fedora-extras/kernel/devel/kernel-2.6.27/linux-2.6.27.noarch/drivers/media/video/gspca/Makefile	2008-12-10 19:44:21.000000000 +0100
+++ linux/drivers/media/video/gspca/Makefile	2008-12-09 21:37:33.000000000 +0100
@@ -4,6 +4,7 @@
 obj-$(CONFIG_USB_GSPCA_FINEPIX)	+= gspca_finepix.o
 obj-$(CONFIG_USB_GSPCA_MARS)	+= gspca_mars.o
 obj-$(CONFIG_USB_GSPCA_OV519)	+= gspca_ov519.o
+obj-$(CONFIG_USB_GSPCA_OV534)	+= gspca_ov534.o
 obj-$(CONFIG_USB_GSPCA_PAC207)	+= gspca_pac207.o
 obj-$(CONFIG_USB_GSPCA_PAC7311) += gspca_pac7311.o
 obj-$(CONFIG_USB_GSPCA_SONIXB)	+= gspca_sonixb.o
@@ -27,6 +28,7 @@
 gspca_finepix-objs		:= finepix.o
 gspca_mars-objs			:= mars.o
 gspca_ov519-objs		:= ov519.o
+gspca_ov534-objs		:= ov534.o
 gspca_pac207-objs		:= pac207.o
 gspca_pac7311-objs		:= pac7311.o
 gspca_sonixb-objs		:= sonixb.o
diff -urN /home/hans/projects/fedora-extras/kernel/devel/kernel-2.6.27/linux-2.6.27.noarch/drivers/media/video/gspca/etoms.c linux/drivers/media/video/gspca/etoms.c
--- /home/hans/projects/fedora-extras/kernel/devel/kernel-2.6.27/linux-2.6.27.noarch/drivers/media/video/gspca/etoms.c	2008-12-10 19:44:21.000000000 +0100
+++ linux/drivers/media/video/gspca/etoms.c	2008-12-09 21:37:33.000000000 +0100
@@ -733,6 +733,12 @@
 
 		i2c_w(gspca_dev, PAS106_REG13, &i2cflags, 1, 3);
 		i2c_w(gspca_dev, PAS106_REG0e, &gain, 1, 1);
+#if 0
+		i2c_w(gspca_dev, 0x09, &gain, 1, 1);
+		i2c_w(gspca_dev, 0x0a, &gain, 1, 1);
+		i2c_w(gspca_dev, 0x0b, &gain, 1, 1);
+		i2c_w(gspca_dev, 0x0c, &gain, 1, 1);
+#endif
 	}
 }
 
diff -urN /home/hans/projects/fedora-extras/kernel/devel/kernel-2.6.27/linux-2.6.27.noarch/drivers/media/video/gspca/finepix.c linux/drivers/media/video/gspca/finepix.c
--- /home/hans/projects/fedora-extras/kernel/devel/kernel-2.6.27/linux-2.6.27.noarch/drivers/media/video/gspca/finepix.c	2008-12-10 19:44:21.000000000 +0100
+++ linux/drivers/media/video/gspca/finepix.c	2008-12-09 21:37:33.000000000 +0100
@@ -314,9 +314,6 @@
 	int ret;
 	int size_ret;
 
-	/* Reset bulk in endpoint */
-	usb_clear_halt(gspca_dev->dev, gspca_dev->cam.epaddr);
-
 	/* Init the device */
 	memset(gspca_dev->usb_buf, 0, 12);
 	gspca_dev->usb_buf[0] = 0xc6;
diff -urN /home/hans/projects/fedora-extras/kernel/devel/kernel-2.6.27/linux-2.6.27.noarch/drivers/media/video/gspca/gspca.c linux/drivers/media/video/gspca/gspca.c
--- /home/hans/projects/fedora-extras/kernel/devel/kernel-2.6.27/linux-2.6.27.noarch/drivers/media/video/gspca/gspca.c	2008-12-10 19:44:21.000000000 +0100
+++ linux/drivers/media/video/gspca/gspca.c	2008-12-10 19:53:43.000000000 +0100
@@ -45,7 +48,7 @@
 MODULE_DESCRIPTION("GSPCA USB Camera Driver");
 MODULE_LICENSE("GPL");
 
-#define DRIVER_VERSION_NUMBER	KERNEL_VERSION(2, 3, 0)
+#define DRIVER_VERSION_NUMBER	KERNEL_VERSION(2, 4, 0)
 
 static int video_nr = -1;
 
@@ -150,8 +153,11 @@
 
 		/* check the packet status and length */
 		len = urb->iso_frame_desc[i].actual_length;
-		if (len == 0)
+		if (len == 0) {
+			if (gspca_dev->empty_packet == 0)
+				gspca_dev->empty_packet = 1;
 			continue;
+		}
 		st = urb->iso_frame_desc[i].status;
 		if (st) {
 			PDEBUG(D_ERR,
@@ -170,7 +176,6 @@
 	}
 
 	/* resubmit the URB */
-	urb->status = 0;
 	st = usb_submit_urb(urb, GFP_ATOMIC);
 	if (st < 0)
 		PDEBUG(D_ERR|D_PACK, "usb_submit_urb() ret %d", st);
@@ -200,11 +208,18 @@
 {
 	struct gspca_dev *gspca_dev = (struct gspca_dev *) urb->context;
 	struct gspca_frame *frame;
+	int st;
 
 	PDEBUG(D_PACK, "bulk irq");
 	if (!gspca_dev->streaming)
 		return;
-	if (urb->status != 0 && urb->status != -ECONNRESET) {
+	switch (urb->status) {
+	case 0:
+		break;
+	case -ECONNRESET:
+		urb->status = 0;
+		break;
+	default:
 #ifdef CONFIG_PM
 		if (!gspca_dev->frozen)
 #endif
@@ -223,6 +241,13 @@
 					urb->transfer_buffer,
 					urb->actual_length);
 	}
+
+	/* resubmit the URB */
+	if (gspca_dev->cam.bulk_nurbs != 0) {
+		st = usb_submit_urb(urb, GFP_ATOMIC);
+		if (st < 0)
+			PDEBUG(D_ERR|D_PACK, "usb_submit_urb() ret %d", st);
+	}
 }
 
 /*
@@ -285,7 +310,6 @@
 		frame->v4l2_buf.bytesused = frame->data_end - frame->data;
 		frame->v4l2_buf.flags &= ~V4L2_BUF_FLAG_QUEUED;
 		frame->v4l2_buf.flags |= V4L2_BUF_FLAG_DONE;
-		atomic_inc(&gspca_dev->nevent);
 		wake_up_interruptible(&gspca_dev->wq);	/* event = new frame */
 		i = (gspca_dev->fr_i + 1) % gspca_dev->nframes;
 		gspca_dev->fr_i = i;
@@ -379,7 +403,6 @@
 	gspca_dev->fr_i = gspca_dev->fr_o = gspca_dev->fr_q = 0;
 	gspca_dev->last_packet_type = DISCARD_PACKET;
 	gspca_dev->sequence = 0;
-	atomic_set(&gspca_dev->nevent, 0);
 	return 0;
 }
 
@@ -520,11 +543,14 @@
 		nurbs = DEF_NURBS;
 	} else {				/* bulk */
 		npkt = 0;
-		bsize = gspca_dev->cam.	bulk_size;
+		bsize = gspca_dev->cam.bulk_size;
[...5646 lines suppressed...]
-		{NULL, NULL,
-		 NULL, NULL,
-		 NULL, NULL},
-/* SENSOR_ICM105A 7 */
+/* SENSOR_ICM105A 6 */
 		{icm105a_NoFliker, icm105a_NoFlikerScale,
 		 icm105a_50HZ, icm105a_50HZScale,
 		 icm105a_60HZ, icm105a_60HZScale},
-/* SENSOR_MC501CB 8 */
+/* SENSOR_MC501CB 7 */
 		{MC501CB_NoFliker, MC501CB_NoFlikerScale,
 		 MC501CB_50HZ, MC501CB_50HZScale,
 		 MC501CB_60HZ, MC501CB_60HZScale},
-/* SENSOR_OV7620 9 */
+/* SENSOR_OV7620 8 */
 		{OV7620_NoFliker, OV7620_NoFliker,
 		 OV7620_50HZ, OV7620_50HZ,
 		 OV7620_60HZ, OV7620_60HZ},
-/* SENSOR_OV7630C 10 */
+/* SENSOR_OV7630C 9 */
 		{NULL, NULL,
 		 NULL, NULL,
 		 NULL, NULL},
-/* SENSOR_PAS106 11 */
+/* SENSOR_PAS106 10 */
 		{pas106b_NoFliker, pas106b_NoFliker,
 		 pas106b_50HZ, pas106b_50HZ,
 		 pas106b_60HZ, pas106b_60HZ},
+/* SENSOR_PAS202B 11 */
+		{pas202b_NoFlikerScale, pas202b_NoFliker,
+		 pas202b_50HZScale, pas202b_50HZ,
+		 pas202b_60HZScale, pas202b_60HZ},
 /* SENSOR_PB0330 12 */
 		{pb0330_NoFliker, pb0330_NoFlikerScale,
 		 pb0330_50HZ, pb0330_50HZScale,
@@ -7002,15 +7017,15 @@
 		5,	/* SENSOR_CS2102 0 */
 		5,	/* SENSOR_CS2102K 1 */
 		4,	/* SENSOR_GC0305 2 */
-		4,	/* SENSOR_HDCS2020 3 */
-		4,	/* SENSOR_HDCS2020b 4 */
-		4,	/* SENSOR_HV7131B 5 */
-		4,	/* SENSOR_HV7131C 6 */
-		4,	/* SENSOR_ICM105A 7 */
-		4,	/* SENSOR_MC501CB 8 */
-		3,	/* SENSOR_OV7620 9 */
-		4,	/* SENSOR_OV7630C 10 */
-		4,	/* SENSOR_PAS106 11 */
+		4,	/* SENSOR_HDCS2020b 3 */
+		4,	/* SENSOR_HV7131B 4 */
+		4,	/* SENSOR_HV7131C 5 */
+		4,	/* SENSOR_ICM105A 6 */
+		4,	/* SENSOR_MC501CB 7 */
+		3,	/* SENSOR_OV7620 8 */
+		4,	/* SENSOR_OV7630C 9 */
+		4,	/* SENSOR_PAS106 10 */
+		4,	/* SENSOR_PAS202B 11 */
 		4,	/* SENSOR_PB0330 12 */
 		4,	/* SENSOR_PO2030 13 */
 		4,	/* SENSOR_TAS5130CK 14 */
@@ -7066,8 +7081,8 @@
 			sd->sensor = SENSOR_ICM105A;
 			break;
 		case 0x0e:
-			PDEBUG(D_PROBE, "Find Sensor HDCS2020");
-			sd->sensor = SENSOR_HDCS2020;
+			PDEBUG(D_PROBE, "Find Sensor PAS202B");
+			sd->sensor = SENSOR_PAS202B;
 			sd->sharpness = 1;
 			break;
 		case 0x0f:
@@ -7153,7 +7168,6 @@
 	sd->gamma = gamma[(int) sd->sensor];
 	sd->autogain = sd_ctrls[SD_AUTOGAIN].qctrl.default_value;
 	sd->lightfreq = sd_ctrls[SD_FREQ].qctrl.default_value;
-	sd->sharpness = sd_ctrls[SD_SHARPNESS].qctrl.default_value;
 
 	switch (sd->sensor) {
 	case SENSOR_GC0305:
@@ -7161,7 +7175,6 @@
 	case SENSOR_PO2030:
 		gspca_dev->ctrl_dis = (1 << BRIGHTNESS_IDX);
 		break;
-	case SENSOR_HDCS2020:
 	case SENSOR_HV7131B:
 	case SENSOR_HV7131C:
 	case SENSOR_OV7630C:
@@ -7191,15 +7204,15 @@
 		{cs2102_InitialScale, cs2102_Initial},		/* 0 */
 		{cs2102K_InitialScale, cs2102K_Initial},	/* 1 */
 		{gc0305_Initial, gc0305_InitialScale},		/* 2 */
-		{hdcs2020xx_InitialScale, hdcs2020xx_Initial},	/* 3 */
-		{hdcs2020xb_InitialScale, hdcs2020xb_Initial},	/* 4 */
-		{hv7131bxx_InitialScale, hv7131bxx_Initial},	/* 5 */
-		{hv7131cxx_InitialScale, hv7131cxx_Initial},	/* 6 */
-		{icm105axx_InitialScale, icm105axx_Initial},	/* 7 */
-		{MC501CB_InitialScale, MC501CB_Initial},	/* 9 */
-		{OV7620_mode0, OV7620_mode1},			/* 9 */
-		{ov7630c_InitialScale, ov7630c_Initial},	/* 10 */
-		{pas106b_InitialScale, pas106b_Initial},	/* 11 */
+		{hdcs2020xb_InitialScale, hdcs2020xb_Initial},	/* 3 */
+		{hv7131bxx_InitialScale, hv7131bxx_Initial},	/* 4 */
+		{hv7131cxx_InitialScale, hv7131cxx_Initial},	/* 5 */
+		{icm105axx_InitialScale, icm105axx_Initial},	/* 6 */
+		{MC501CB_InitialScale, MC501CB_Initial},	/* 7 */
+		{OV7620_mode0, OV7620_mode1},			/* 8 */
+		{ov7630c_InitialScale, ov7630c_Initial},	/* 9 */
+		{pas106b_InitialScale, pas106b_Initial},	/* 10 */
+		{pas202b_Initial, pas202b_InitialScale},	/* 11 */
 		{pb0330xx_InitialScale, pb0330xx_Initial},	/* 12 */
 /* or		{pb03303x_InitialScale, pb03303x_Initial}, */
 		{PO2030_mode0, PO2030_mode1},			/* 13 */
@@ -7256,6 +7269,11 @@
 		reg_r(gspca_dev, 0x0008);
 		reg_w(dev, 0x00, 0x0008);
 		break;
+	case SENSOR_PAS202B:
+#if 0/*fixme*/
+		reg_r(gspca_dev, ZC3XX_R002_CLOCKSELECT);
+		/* fall thru */
+#endif
 	case SENSOR_GC0305:
 		reg_r(gspca_dev, 0x0008);
 		/* fall thru */
@@ -7269,7 +7287,6 @@
 	switch (sd->sensor) {
 	case SENSOR_CS2102:		/* gamma set in xxx_Initial */
 	case SENSOR_CS2102K:
-	case SENSOR_HDCS2020:
 	case SENSOR_HDCS2020b:
 	case SENSOR_PB0330:		/* pb with chip_revision - see above */
 	case SENSOR_OV7630C:
@@ -7282,6 +7299,7 @@
 	setmatrix(gspca_dev);			/* one more time? */
 	switch (sd->sensor) {
 	case SENSOR_OV7620:
+	case SENSOR_PAS202B:
 		reg_r(gspca_dev, 0x0180);	/* from win */
 		reg_w(dev, 0x00, 0x0180);
 		break;
@@ -7293,37 +7311,29 @@
 
 	switch (sd->sensor) {
 	case SENSOR_GC0305:
-	case SENSOR_OV7620:
 		reg_w(dev, 0x09, 0x01ad);	/* (from win traces) */
 		reg_w(dev, 0x15, 0x01ae);
-		sd->autogain = 0;
-		break;
+		/* fall thru */
+	case SENSOR_PAS202B:
 	case SENSOR_PO2030:
-		reg_w(dev, 0x40, 0x0117);	/* (from win traces) */
-		reg_r(gspca_dev, 0x0180);
-		break;
-	}
-
-	setautogain(gspca_dev);
-	switch (sd->sensor) {
-	case SENSOR_GC0305:
-/*		setlightfreq(gspca_dev);	?? (end: 80 -> [18d]) */
-		reg_w(dev, 0x09, 0x01ad);	/* (from win traces) */
-		reg_w(dev, 0x15, 0x01ae);
-		reg_w(dev, 0x40, 0x0180);
-		reg_w(dev, 0x40, 0x0117);
+/*		reg_w(dev, 0x40, ZC3XX_R117_GGAIN);  * (from win traces) */
 		reg_r(gspca_dev, 0x0180);
-		sd->autogain = 1;
-		setautogain(gspca_dev);
 		break;
 	case SENSOR_OV7620:
+		reg_w(dev, 0x09, 0x01ad);
+		reg_w(dev, 0x15, 0x01ae);
 		i2c_read(gspca_dev, 0x13);	/*fixme: returns 0xa3 */
 		i2c_write(gspca_dev, 0x13, 0xa3, 0x00);
 					 /*fixme: returned value to send? */
-		reg_w(dev, 0x40, 0x0117);	/* (from win traces) */
+		reg_w(dev, 0x40, 0x0117);
 		reg_r(gspca_dev, 0x0180);
-		setautogain(gspca_dev);
-		msleep(500);
+		break;
+	}
+
+	setautogain(gspca_dev);
+	switch (sd->sensor) {
+	case SENSOR_PAS202B:
+		reg_w(dev, 0x00, 0x0007);	/* (from win traces) */
 		break;
 	case SENSOR_PO2030:
 		msleep(500);
@@ -7333,6 +7343,8 @@
 		reg_w(dev, 0x02, 0x0008);
 		break;
 	}
+	if (sd->sensor == SENSOR_PAS202B)
+		reg_w(dev, 0x02, ZC3XX_R008_CLOCKSETTING);
 	return 0;
 }
 

linux-2.6-olpc-speaker-out.patch:

Index: linux-2.6-olpc-speaker-out.patch
===================================================================
RCS file: linux-2.6-olpc-speaker-out.patch
diff -N linux-2.6-olpc-speaker-out.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ linux-2.6-olpc-speaker-out.patch	12 Jan 2009 19:51:29 -0000	1.3
@@ -0,0 +1,22 @@
+diff --git a/sound/pci/cs5535audio/cs5535audio.c b/sound/pci/cs5535audio/cs5535audio.c
+index 1d8b160..640f157 100644
+--- a/sound/pci/cs5535audio/cs5535audio.c
++++ b/sound/pci/cs5535audio/cs5535audio.c
+@@ -28,6 +28,7 @@
+ #include <linux/slab.h>
+ #include <linux/moduleparam.h>
+ #include <asm/io.h>
++#include <asm/olpc.h>
+ #include <sound/core.h>
+ #include <sound/control.h>
+ #include <sound/pcm.h>
+@@ -163,6 +164,9 @@ static int __devinit snd_cs5535audio_mixer(struct cs5535audio *cs5535au)
+ 	ac97.private_data = cs5535au;
+ 	ac97.pci = cs5535au->pci;
+ 
++	if (machine_is_olpc())
++		ac97.scaps |= AC97_SCAP_INV_EAPD;
++
+ 	if ((err = snd_ac97_mixer(pbus, &ac97, &cs5535au->ac97)) < 0) {
+ 		snd_printk(KERN_ERR "mixer failed\n");
+ 		return err;

linux-2.6-selinux-move-open-perms-check.patch:

--- NEW FILE linux-2.6-selinux-move-open-perms-check.patch ---
From: Eric Paris <eparis at redhat.com>
Date: Wed, 29 Oct 2008 21:06:46 +0000 (-0400)
Subject: SELinux: check open perms in dentry_open not inode_permission
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Fjmorris%2Fsecurity-testing-2.6.git;a=commitdiff_plain;h=8b6a5a37f87a414ef8636e36ec75accb27bb7508

SELinux: check open perms in dentry_open not inode_permission

Some operations, like searching a directory path or connecting a unix domain
socket, make explicit calls into inode_permission.  Our choices are to
either try to come up with a signature for all of the explicit calls to
inode_permission and do not check open on those, or to move the open checks to
dentry_open where we know this is always an open operation.  This patch moves
the checks to dentry_open.

Signed-off-by: Eric Paris <eparis at redhat.com>
Acked-by:  Stephen Smalley <sds at tycho.nsa.gov>
Signed-off-by: James Morris <jmorris at namei.org>
---

diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c
index c679ba6..03ff7db 100644
--- a/security/selinux/hooks.c
+++ b/security/selinux/hooks.c
@@ -1686,15 +1686,39 @@ static inline u32 file_mask_to_av(int mode, int mask)
 	return av;
 }
 
+/* Convert a Linux file to an access vector. */
+static inline u32 file_to_av(struct file *file)
+{
+	u32 av = 0;
+
+	if (file->f_mode & FMODE_READ)
+		av |= FILE__READ;
+	if (file->f_mode & FMODE_WRITE) {
+		if (file->f_flags & O_APPEND)
+			av |= FILE__APPEND;
+		else
+			av |= FILE__WRITE;
+	}
+	if (!av) {
+		/*
+		 * Special file opened with flags 3 for ioctl-only use.
+		 */
+		av = FILE__IOCTL;
+	}
+
+	return av;
+}
+
 /*
- * Convert a file mask to an access vector and include the correct open
+ * Convert a file to an access vector and include the correct open
  * open permission.
  */
-static inline u32 open_file_mask_to_av(int mode, int mask)
+static inline u32 open_file_to_av(struct file *file)
 {
-	u32 av = file_mask_to_av(mode, mask);
+	u32 av = file_to_av(file);
 
 	if (selinux_policycap_openperm) {
+		mode_t mode = file->f_path.dentry->d_inode->i_mode;
 		/*
 		 * lnk files and socks do not really have an 'open'
 		 */
@@ -1710,34 +1734,11 @@ static inline u32 open_file_mask_to_av(int mode, int mask)
 			av |= DIR__OPEN;
 		else
 			printk(KERN_ERR "SELinux: WARNING: inside %s with "
-				"unknown mode:%x\n", __func__, mode);
+				"unknown mode:%o\n", __func__, mode);
 	}
 	return av;
 }
 
-/* Convert a Linux file to an access vector. */
-static inline u32 file_to_av(struct file *file)
-{
-	u32 av = 0;
-
-	if (file->f_mode & FMODE_READ)
-		av |= FILE__READ;
-	if (file->f_mode & FMODE_WRITE) {
-		if (file->f_flags & O_APPEND)
-			av |= FILE__APPEND;
-		else
-			av |= FILE__WRITE;
-	}
-	if (!av) {
-		/*
-		 * Special file opened with flags 3 for ioctl-only use.
-		 */
-		av = FILE__IOCTL;
-	}
-
-	return av;
-}
-
 /* Hook functions begin here. */
 
 static int selinux_ptrace_may_access(struct task_struct *child,
@@ -2654,7 +2655,7 @@ static int selinux_inode_permission(struct inode *inode, int mask)
 	}
 
 	return inode_has_perm(current, inode,
-			       open_file_mask_to_av(inode->i_mode, mask), NULL);
+			      file_mask_to_av(inode->i_mode, mask), NULL);
 }
 
 static int selinux_inode_setattr(struct dentry *dentry, struct iattr *iattr)
@@ -3170,7 +3171,7 @@ static int selinux_dentry_open(struct file *file)
 	 * new inode label or new policy.
 	 * This check is not redundant - do not remove.
 	 */
-	return inode_has_perm(current, inode, file_to_av(file), NULL);
+	return inode_has_perm(current, inode, open_file_to_av(file), NULL);
 }
 
 /* task security operations */

linux-2.6-serial.patch:

--- NEW FILE linux-2.6-serial.patch ---
From: Andy Whitcroft <apw at canonical.com>
Subject: [PATCH 1/1] serial: RS485 ioctl structure uses __u32 include linux/types.h
Date: Tue, 2 Dec 2008 11:00:25 +0000

In the commit below a new struct serial_rs485 was introduced for a new
ioctl:

    commit c26c56c0f40e200e61d1390629c806f6adaffbcc
    Author: Alan Cox <alan at redhat.com>
    Date:   Mon Oct 13 10:37:48 2008 +0100

	tty: Cris has a nice RS485 ioctl so we should steal it

This structure uses the __u32 types for some of its members, which leads
to the following compile error:

    $ cc -I.../include -c X.c
    In file included from X.c:2: .../include/linux/serial.h:185:
		error: expected specifier-qualifier-list before ???__u32???
    $

It seems that these types are appropriate for this structure as it is
to be exposed to userspace.  These types are available via linux/types.h
so move the include of that outside the __KERNEL__ section.

Signed-off-by: Andy Whitcroft <apw at canonical.com>
---
 include/linux/serial.h |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/include/linux/serial.h b/include/linux/serial.h
index 1ea8d92..9136cc5 100644
--- a/include/linux/serial.h
+++ b/include/linux/serial.h
@@ -10,8 +10,9 @@
 #ifndef _LINUX_SERIAL_H
 #define _LINUX_SERIAL_H
 
-#ifdef __KERNEL__
 #include <linux/types.h>
+
+#ifdef __KERNEL__
 #include <asm/page.h>
 
 /*
-- 
1.6.0.4.911.gc990
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo at vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/



linux-2.6.27-ext-dir-corruption-fix.patch:

Index: linux-2.6.27-ext-dir-corruption-fix.patch
===================================================================
RCS file: linux-2.6.27-ext-dir-corruption-fix.patch
diff -N linux-2.6.27-ext-dir-corruption-fix.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ linux-2.6.27-ext-dir-corruption-fix.patch	12 Jan 2009 19:51:30 -0000	1.3
@@ -0,0 +1,207 @@
+This is a trivial backport of the following upstream commits:
+
+- bd39597cbd42a784105a04010100e27267481c67 (ext2)
+- cdbf6dba28e8e6268c8420857696309470009fd9 (ext3)
+
+This addresses CVE-2008-3528
+
+ext[234]: Avoid printk floods in the face of directory corruption
+
+Note: some people thinks this represents a security bug, since it
+might make the system go away while it is printing a large number of
+console messages, especially if a serial console is involved.  Hence,
+it has been assigned CVE-2008-3528, but it requires that the attacker
+either has physical access to your machine to insert a USB disk with a
+corrupted filesystem image (at which point why not just hit the power
+button), or is otherwise able to convince the system administrator to
+mount an arbitrary filesystem image (at which point why not just
+include a setuid shell or world-writable hard disk device file or some
+such).  Me, I think they're just being silly. --tytso
+
+Signed-off-by: Eric Sandeen <sandeen at redhat.com>
+Signed-off-by: "Theodore Ts'o" <tytso at mit.edu>
+Cc: linux-ext4 at vger.kernel.org
+Cc: Eugene Teo <eugeneteo at kernel.sg>
+---
+
+Index: linux-2.6.27.noarch/fs/ext2/dir.c
+===================================================================
+--- linux-2.6.27.noarch.orig/fs/ext2/dir.c	2008-10-09 17:13:53.000000000 -0500
++++ linux-2.6.27.noarch/fs/ext2/dir.c	2008-10-22 10:17:18.596064472 -0500
+@@ -103,7 +103,7 @@ static int ext2_commit_chunk(struct page
+ 	return err;
+ }
+ 
+-static void ext2_check_page(struct page *page)
++static void ext2_check_page(struct page *page, int quiet)
+ {
+ 	struct inode *dir = page->mapping->host;
+ 	struct super_block *sb = dir->i_sb;
+@@ -146,10 +146,10 @@ out:
+ 	/* Too bad, we had an error */
+ 
+ Ebadsize:
+-	ext2_error(sb, "ext2_check_page",
+-		"size of directory #%lu is not a multiple of chunk size",
+-		dir->i_ino
+-	);
++	if (!quiet)
++		ext2_error(sb, __func__,
++			"size of directory #%lu is not a multiple "
++			"of chunk size", dir->i_ino);
+ 	goto fail;
+ Eshort:
+ 	error = "rec_len is smaller than minimal";
+@@ -166,32 +166,36 @@ Espan:
+ Einumber:
+ 	error = "inode out of bounds";
+ bad_entry:
+-	ext2_error (sb, "ext2_check_page", "bad entry in directory #%lu: %s - "
+-		"offset=%lu, inode=%lu, rec_len=%d, name_len=%d",
+-		dir->i_ino, error, (page->index<<PAGE_CACHE_SHIFT)+offs,
+-		(unsigned long) le32_to_cpu(p->inode),
+-		rec_len, p->name_len);
++	if (!quiet)
++		ext2_error(sb, __func__, "bad entry in directory #%lu: : %s - "
++			"offset=%lu, inode=%lu, rec_len=%d, name_len=%d",
++			dir->i_ino, error, (page->index<<PAGE_CACHE_SHIFT)+offs,
++			(unsigned long) le32_to_cpu(p->inode),
++			rec_len, p->name_len);
+ 	goto fail;
+ Eend:
+-	p = (ext2_dirent *)(kaddr + offs);
+-	ext2_error (sb, "ext2_check_page",
+-		"entry in directory #%lu spans the page boundary"
+-		"offset=%lu, inode=%lu",
+-		dir->i_ino, (page->index<<PAGE_CACHE_SHIFT)+offs,
+-		(unsigned long) le32_to_cpu(p->inode));
++	if (!quiet) {
++		p = (ext2_dirent *)(kaddr + offs);
++		ext2_error(sb, "ext2_check_page",
++			"entry in directory #%lu spans the page boundary"
++			"offset=%lu, inode=%lu",
++			dir->i_ino, (page->index<<PAGE_CACHE_SHIFT)+offs,
++			(unsigned long) le32_to_cpu(p->inode));
++	}
+ fail:
+ 	SetPageChecked(page);
+ 	SetPageError(page);
+ }
+ 
+-static struct page * ext2_get_page(struct inode *dir, unsigned long n)
++static struct page * ext2_get_page(struct inode *dir, unsigned long n,
++				   int quiet)
+ {
+ 	struct address_space *mapping = dir->i_mapping;
+ 	struct page *page = read_mapping_page(mapping, n, NULL);
+ 	if (!IS_ERR(page)) {
+ 		kmap(page);
+ 		if (!PageChecked(page))
+-			ext2_check_page(page);
++			ext2_check_page(page, quiet);
+ 		if (PageError(page))
+ 			goto fail;
+ 	}
+@@ -292,7 +296,7 @@ ext2_readdir (struct file * filp, void *
+ 	for ( ; n < npages; n++, offset = 0) {
+ 		char *kaddr, *limit;
+ 		ext2_dirent *de;
+-		struct page *page = ext2_get_page(inode, n);
++		struct page *page = ext2_get_page(inode, n, 0);
+ 
+ 		if (IS_ERR(page)) {
+ 			ext2_error(sb, __func__,
+@@ -361,6 +365,7 @@ struct ext2_dir_entry_2 * ext2_find_entr
+ 	struct page *page = NULL;
+ 	struct ext2_inode_info *ei = EXT2_I(dir);
+ 	ext2_dirent * de;
++	int dir_has_error = 0;
+ 
+ 	if (npages == 0)
+ 		goto out;
+@@ -374,7 +379,7 @@ struct ext2_dir_entry_2 * ext2_find_entr
+ 	n = start;
+ 	do {
+ 		char *kaddr;
+-		page = ext2_get_page(dir, n);
++		page = ext2_get_page(dir, n, dir_has_error);
+ 		if (!IS_ERR(page)) {
+ 			kaddr = page_address(page);
+ 			de = (ext2_dirent *) kaddr;
+@@ -391,7 +396,9 @@ struct ext2_dir_entry_2 * ext2_find_entr
+ 				de = ext2_next_entry(de);
+ 			}
+ 			ext2_put_page(page);
+-		}
++		} else
++			dir_has_error = 1;
++
+ 		if (++n >= npages)
+ 			n = 0;
+ 		/* next page is past the blocks we've got */
+@@ -414,7 +421,7 @@ found:
+ 
+ struct ext2_dir_entry_2 * ext2_dotdot (struct inode *dir, struct page **p)
+ {
+-	struct page *page = ext2_get_page(dir, 0);
++	struct page *page = ext2_get_page(dir, 0, 0);
+ 	ext2_dirent *de = NULL;
+ 
+ 	if (!IS_ERR(page)) {
+@@ -487,7 +494,7 @@ int ext2_add_link (struct dentry *dentry
+ 	for (n = 0; n <= npages; n++) {
+ 		char *dir_end;
+ 
+-		page = ext2_get_page(dir, n);
++		page = ext2_get_page(dir, n, 0);
+ 		err = PTR_ERR(page);
+ 		if (IS_ERR(page))
+ 			goto out;
+@@ -655,14 +662,17 @@ int ext2_empty_dir (struct inode * inode
+ {
+ 	struct page *page = NULL;
+ 	unsigned long i, npages = dir_pages(inode);
++	int dir_has_error = 0;
+ 
+ 	for (i = 0; i < npages; i++) {
+ 		char *kaddr;
+ 		ext2_dirent * de;
+-		page = ext2_get_page(inode, i);
++		page = ext2_get_page(inode, i, dir_has_error);
+ 
+-		if (IS_ERR(page))
++		if (IS_ERR(page)) {
++			dir_has_error = 1;
+ 			continue;
++		}
+ 
+ 		kaddr = page_address(page);
+ 		de = (ext2_dirent *)kaddr;
+Index: linux-2.6.27.noarch/fs/ext3/dir.c
+===================================================================
+--- linux-2.6.27.noarch.orig/fs/ext3/dir.c	2008-10-09 17:13:53.000000000 -0500
++++ linux-2.6.27.noarch/fs/ext3/dir.c	2008-10-22 10:17:18.614001252 -0500
+@@ -102,6 +102,7 @@ static int ext3_readdir(struct file * fi
+ 	int err;
+ 	struct inode *inode = filp->f_path.dentry->d_inode;
+ 	int ret = 0;
++	int dir_has_error = 0;
+ 
+ 	sb = inode->i_sb;
+ 
+@@ -148,9 +149,12 @@ static int ext3_readdir(struct file * fi
+ 		 * of recovering data when there's a bad sector
+ 		 */
+ 		if (!bh) {
+-			ext3_error (sb, "ext3_readdir",
+-				"directory #%lu contains a hole at offset %lu",
+-				inode->i_ino, (unsigned long)filp->f_pos);
++			if (!dir_has_error) {
++				ext3_error(sb, __func__, "directory #%lu "
++					"contains a hole at offset %lld",
++					inode->i_ino, filp->f_pos);
++				dir_has_error = 1;
++			}
+ 			/* corrupt size?  Maybe no more blocks to read */
+ 			if (filp->f_pos > inode->i_blocks << 9)
+ 				break;

linux-2.6.27-ext4-2.6.28-backport-fixups.patch:

Index: linux-2.6.27-ext4-2.6.28-backport-fixups.patch
===================================================================
RCS file: linux-2.6.27-ext4-2.6.28-backport-fixups.patch
diff -N linux-2.6.27-ext4-2.6.28-backport-fixups.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ linux-2.6.27-ext4-2.6.28-backport-fixups.patch	12 Jan 2009 19:51:30 -0000	1.3
@@ -0,0 +1,449 @@
+Index: linux-2.6.27.x86_64/include/linux/writeback.h
+===================================================================
+--- linux-2.6.27.x86_64.orig/include/linux/writeback.h
++++ linux-2.6.27.x86_64/include/linux/writeback.h
+@@ -63,7 +63,15 @@ struct writeback_control {
+ 	unsigned for_writepages:1;	/* This is a writepages() call */
+ 	unsigned range_cyclic:1;	/* range_start is cyclic */
+ 	unsigned more_io:1;		/* more io to be dispatched */
+-	unsigned range_cont:1;
++	/*
++	 * write_cache_pages() won't update wbc->nr_to_write and
++	 * mapping->writeback_index if no_nrwrite_index_update
++	 * is set.  write_cache_pages() may write more than we
++	 * requested and we want to make sure nr_to_write and
++	 * writeback_index are updated in a consistent manner
++	 * so we use a single control to update them
++	 */
++	unsigned no_nrwrite_index_update:1;
+ };
+ 
+ /*
+Index: linux-2.6.27.x86_64/mm/page-writeback.c
+===================================================================
+--- linux-2.6.27.x86_64.orig/mm/page-writeback.c
++++ linux-2.6.27.x86_64/mm/page-writeback.c
+@@ -876,6 +876,7 @@ int write_cache_pages(struct address_spa
+ 	pgoff_t end;		/* Inclusive */
+ 	int scanned = 0;
+ 	int range_whole = 0;
++	long nr_to_write = wbc->nr_to_write;
+ 
+ 	if (wbc->nonblocking && bdi_write_congested(bdi)) {
+ 		wbc->encountered_congestion = 1;
+@@ -939,7 +940,7 @@ retry:
+ 				unlock_page(page);
+ 				ret = 0;
+ 			}
+-			if (ret || (--(wbc->nr_to_write) <= 0))
++			if (ret || (--nr_to_write <= 0))
+ 				done = 1;
+ 			if (wbc->nonblocking && bdi_write_congested(bdi)) {
+ 				wbc->encountered_congestion = 1;
+@@ -958,11 +959,12 @@ retry:
+ 		index = 0;
+ 		goto retry;
+ 	}
+-	if (wbc->range_cyclic || (range_whole && wbc->nr_to_write > 0))
+-		mapping->writeback_index = index;
++	if (!wbc->no_nrwrite_index_update) {
++		if (wbc->range_cyclic || (range_whole && nr_to_write > 0))
++			mapping->writeback_index = index;
++		wbc->nr_to_write = nr_to_write;
++	}
+ 
+-	if (wbc->range_cont)
+-		wbc->range_start = index << PAGE_CACHE_SHIFT;
+ 	return ret;
+ }
+ EXPORT_SYMBOL(write_cache_pages);
+Index: linux-2.6.27.x86_64/include/linux/percpu_counter.h
+===================================================================
+--- linux-2.6.27.x86_64.orig/include/linux/percpu_counter.h
++++ linux-2.6.27.x86_64/include/linux/percpu_counter.h
+@@ -35,7 +35,7 @@ int percpu_counter_init_irq(struct percp
+ void percpu_counter_destroy(struct percpu_counter *fbc);
+ void percpu_counter_set(struct percpu_counter *fbc, s64 amount);
+ void __percpu_counter_add(struct percpu_counter *fbc, s64 amount, s32 batch);
+-s64 __percpu_counter_sum(struct percpu_counter *fbc, int set);
++s64 __percpu_counter_sum(struct percpu_counter *fbc);
+ 
+ static inline void percpu_counter_add(struct percpu_counter *fbc, s64 amount)
+ {
+@@ -44,19 +44,13 @@ static inline void percpu_counter_add(st
+ 
+ static inline s64 percpu_counter_sum_positive(struct percpu_counter *fbc)
+ {
+-	s64 ret = __percpu_counter_sum(fbc, 0);
++	s64 ret = __percpu_counter_sum(fbc);
+ 	return ret < 0 ? 0 : ret;
+ }
+ 
+-static inline s64 percpu_counter_sum_and_set(struct percpu_counter *fbc)
+-{
+-	return __percpu_counter_sum(fbc, 1);
+-}
+-
+-
+ static inline s64 percpu_counter_sum(struct percpu_counter *fbc)
+ {
+-	return __percpu_counter_sum(fbc, 0);
++	return __percpu_counter_sum(fbc);
+ }
+ 
+ static inline s64 percpu_counter_read(struct percpu_counter *fbc)
+Index: linux-2.6.27.x86_64/lib/percpu_counter.c
+===================================================================
+--- linux-2.6.27.x86_64.orig/lib/percpu_counter.c
++++ linux-2.6.27.x86_64/lib/percpu_counter.c
+@@ -52,7 +52,7 @@ EXPORT_SYMBOL(__percpu_counter_add);
+  * Add up all the per-cpu counts, return the result.  This is a more accurate
+  * but much slower version of percpu_counter_read_positive()
+  */
+-s64 __percpu_counter_sum(struct percpu_counter *fbc, int set)
++s64 __percpu_counter_sum(struct percpu_counter *fbc)
+ {
+ 	s64 ret;
+ 	int cpu;
+@@ -62,11 +62,9 @@ s64 __percpu_counter_sum(struct percpu_c
+ 	for_each_online_cpu(cpu) {
+ 		s32 *pcount = per_cpu_ptr(fbc->counters, cpu);
+ 		ret += *pcount;
+-		if (set)
+-			*pcount = 0;
++		*pcount = 0;
+ 	}
+-	if (set)
+-		fbc->count = ret;
++	fbc->count = ret;
+ 
+ 	spin_unlock(&fbc->lock);
+ 	return ret;
+Index: linux-2.6.27.x86_64/fs/ext4/namei.c
+===================================================================
+--- linux-2.6.27.x86_64.orig/fs/ext4/namei.c
++++ linux-2.6.27.x86_64/fs/ext4/namei.c
+@@ -1061,6 +1061,7 @@ static struct dentry *ext4_lookup(struct
+ struct dentry *ext4_get_parent(struct dentry *child)
+ {
+ 	unsigned long ino;
++	struct dentry *parent;
+ 	struct inode *inode;
+ 	static const struct qstr dotdot = {
+ 		.name = "..",
+@@ -1082,7 +1083,16 @@ struct dentry *ext4_get_parent(struct de
+ 		return ERR_PTR(-EIO);
+ 	}
+ 
+-	return d_obtain_alias(ext4_iget(child->d_inode->i_sb, ino));
++	inode = ext4_iget(child->d_inode->i_sb, ino);
++	if (IS_ERR(inode))
++		return ERR_CAST(inode);
++
++	parent = d_alloc_anon(inode);
++	if (!parent) {
++		iput(inode);
++		parent = ERR_PTR(-ENOMEM);
++	}
++	return parent;
+ }
+ 
+ #define S_SHIFT 12
+Index: linux-2.6.27.x86_64/fs/ext4/super.c
+===================================================================
+--- linux-2.6.27.x86_64.orig/fs/ext4/super.c
++++ linux-2.6.27.x86_64/fs/ext4/super.c
+@@ -400,7 +400,7 @@ fail:
+ static int ext4_blkdev_put(struct block_device *bdev)
+ {
+ 	bd_release(bdev);
+-	return blkdev_put(bdev, FMODE_READ|FMODE_WRITE);
++	return blkdev_put(bdev);
+ }
+ 
+ static int ext4_blkdev_remove(struct ext4_sb_info *sbi)
+@@ -862,7 +862,7 @@ enum {
+ 	Opt_inode_readahead_blks
+ };
+ 
+-static const match_table_t tokens = {
++static match_table_t tokens = {
+ 	{Opt_bsd_df, "bsddf"},
+ 	{Opt_minix_df, "minixdf"},
+ 	{Opt_grpid, "grpid"},
+@@ -2555,7 +2555,7 @@ static journal_t *ext4_get_dev_journal(s
+ 	if (bd_claim(bdev, sb)) {
+ 		printk(KERN_ERR
+ 			"EXT4: failed to claim external journal device.\n");
+-		blkdev_put(bdev, FMODE_READ|FMODE_WRITE);
++		blkdev_put(bdev);
+ 		return NULL;
+ 	}
+ 
+@@ -3327,30 +3327,30 @@ static int ext4_quota_on_mount(struct su
+  * Standard function to be called on quota_on
+  */
+ static int ext4_quota_on(struct super_block *sb, int type, int format_id,
+-			 char *name, int remount)
++			 char *path, int remount)
+ {
+ 	int err;
+-	struct path path;
++	struct nameidata nd;
+ 
+ 	if (!test_opt(sb, QUOTA))
+ 		return -EINVAL;
+-	/* When remounting, no checks are needed and in fact, name is NULL */
++	/* When remounting, no checks are needed and in fact, path is NULL */
+ 	if (remount)
+-		return vfs_quota_on(sb, type, format_id, name, remount);
++		return vfs_quota_on(sb, type, format_id, path, remount);
+ 
+-	err = kern_path(name, LOOKUP_FOLLOW, &path);
++	err = path_lookup(path, LOOKUP_FOLLOW, &nd);
+ 	if (err)
+ 		return err;
+ 
+ 	/* Quotafile not on the same filesystem? */
+-	if (path.mnt->mnt_sb != sb) {
+-		path_put(&path);
++	if (nd.path.mnt->mnt_sb != sb) {
++		path_put(&nd.path);
+ 		return -EXDEV;
+ 	}
+ 	/* Journaling quota? */
+ 	if (EXT4_SB(sb)->s_qf_names[type]) {
+ 		/* Quotafile not in fs root? */
+-		if (path.dentry->d_parent != sb->s_root)
++		if (nd.path.dentry->d_parent->d_inode != sb->s_root->d_inode)
+ 			printk(KERN_WARNING
+ 				"EXT4-fs: Quota file not on filesystem root. "
+ 				"Journaled quota will not work.\n");
+@@ -3360,7 +3360,7 @@ static int ext4_quota_on(struct super_bl
+ 	 * When we journal data on quota file, we have to flush journal to see
+ 	 * all updates to the file when we bypass pagecache...
+ 	 */
+-	if (ext4_should_journal_data(path.dentry->d_inode)) {
++	if (ext4_should_journal_data(nd.path.dentry->d_inode)) {
+ 		/*
+ 		 * We don't need to lock updates but journal_flush() could
+ 		 * otherwise be livelocked...
+@@ -3369,13 +3369,13 @@ static int ext4_quota_on(struct super_bl
+ 		err = jbd2_journal_flush(EXT4_SB(sb)->s_journal);
+ 		jbd2_journal_unlock_updates(EXT4_SB(sb)->s_journal);
+ 		if (err) {
+-			path_put(&path);
++			path_put(&nd.path);
+ 			return err;
+ 		}
+ 	}
+ 
+-	err = vfs_quota_on_path(sb, type, format_id, &path);
+-	path_put(&path);
++	err = vfs_quota_on_path(sb, type, format_id, &nd.path);
++	path_put(&nd.path);
+ 	return err;
+ }
+ 
+Index: linux-2.6.27.x86_64/fs/ext4/mballoc.c
+===================================================================
+--- linux-2.6.27.x86_64.orig/fs/ext4/mballoc.c
++++ linux-2.6.27.x86_64/fs/ext4/mballoc.c
+@@ -2646,7 +2646,6 @@ static void release_blocks_on_commit(jou
+ 	struct ext4_group_info *db;
+ 	int err, count = 0, count2 = 0;
+ 	struct ext4_free_data *entry;
+-	ext4_fsblk_t discard_block;
+ 	struct list_head *l, *ltmp;
+ 
+ 	list_for_each_safe(l, ltmp, &txn->t_private_list) {
+@@ -2676,12 +2675,6 @@ static void release_blocks_on_commit(jou
+ 			page_cache_release(e4b.bd_bitmap_page);
+ 		}
+ 		ext4_unlock_group(sb, entry->group);
+-		discard_block = (ext4_fsblk_t) entry->group * EXT4_BLOCKS_PER_GROUP(sb)
+-			+ entry->start_blk
+-			+ le32_to_cpu(EXT4_SB(sb)->s_es->s_first_data_block);
+-		trace_mark(ext4_discard_blocks, "dev %s blk %llu count %u", sb->s_id,
+-			   (unsigned long long) discard_block, entry->count);
+-		sb_issue_discard(sb, discard_block, entry->count);
+ 
+ 		kmem_cache_free(ext4_free_ext_cachep, entry);
+ 		ext4_mb_release_desc(&e4b);
+Index: linux-2.6.27.x86_64/fs/ext4/file.c
+===================================================================
+--- linux-2.6.27.x86_64.orig/fs/ext4/file.c
++++ linux-2.6.27.x86_64/fs/ext4/file.c
+@@ -140,9 +140,6 @@ static int ext4_file_mmap(struct file *f
+ 	return 0;
+ }
+ 
+-extern int ext4_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo,
+-		__u64 start, __u64 len);
+-
+ const struct file_operations ext4_file_operations = {
+ 	.llseek		= generic_file_llseek,
+ 	.read		= do_sync_read,
+@@ -173,6 +170,5 @@ const struct inode_operations ext4_file_
+ #endif
+ 	.permission	= ext4_permission,
+ 	.fallocate	= ext4_fallocate,
+-	.fiemap		= ext4_fiemap,
+ };
+ 
+Index: linux-2.6.27.x86_64/fs/ext4/extents.c
+===================================================================
+--- linux-2.6.27.x86_64.orig/fs/ext4/extents.c
++++ linux-2.6.27.x86_64/fs/ext4/extents.c
+@@ -40,7 +40,6 @@
+ #include <linux/slab.h>
+ #include <linux/falloc.h>
+ #include <asm/uaccess.h>
+-#include <linux/fiemap.h>
+ #include "ext4_jbd2.h"
+ #include "ext4_extents.h"
+ 
+@@ -3079,143 +3078,3 @@ retry:
+ 	mutex_unlock(&inode->i_mutex);
+ 	return ret > 0 ? ret2 : ret;
+ }
+-
+-/*
+- * Callback function called for each extent to gather FIEMAP information.
+- */
+-int ext4_ext_fiemap_cb(struct inode *inode, struct ext4_ext_path *path,
+-		       struct ext4_ext_cache *newex, struct ext4_extent *ex,
+-		       void *data)
+-{
+-	struct fiemap_extent_info *fieinfo = data;
+-	unsigned long blksize_bits = inode->i_sb->s_blocksize_bits;
+-	__u64	logical;
+-	__u64	physical;
+-	__u64	length;
+-	__u32	flags = 0;
+-	int	error;
+-
+-	logical =  (__u64)newex->ec_block << blksize_bits;
+-
+-	if (newex->ec_type == EXT4_EXT_CACHE_GAP) {
+-		pgoff_t offset;
+-		struct page *page;
+-		struct buffer_head *bh = NULL;
+-
+-		offset = logical >> PAGE_SHIFT;
+-		page = find_get_page(inode->i_mapping, offset);
+-		if (!page || !page_has_buffers(page))
+-			return EXT_CONTINUE;
+-
+-		bh = page_buffers(page);
+-
+-		if (!bh)
+-			return EXT_CONTINUE;
+-
+-		if (buffer_delay(bh)) {
+-			flags |= FIEMAP_EXTENT_DELALLOC;
+-			page_cache_release(page);
+-		} else {
+-			page_cache_release(page);
+-			return EXT_CONTINUE;
+-		}
+-	}
+-
+-	physical = (__u64)newex->ec_start << blksize_bits;
+-	length =   (__u64)newex->ec_len << blksize_bits;
+-
+-	if (ex && ext4_ext_is_uninitialized(ex))
+-		flags |= FIEMAP_EXTENT_UNWRITTEN;
+-
+-	/*
+-	 * If this extent reaches EXT_MAX_BLOCK, it must be last.
+-	 *
+-	 * Or if ext4_ext_next_allocated_block is EXT_MAX_BLOCK,
+-	 * this also indicates no more allocated blocks.
+-	 *
+-	 * XXX this might miss a single-block extent at EXT_MAX_BLOCK
+-	 */
+-	if (logical + length - 1 == EXT_MAX_BLOCK ||
+-	    ext4_ext_next_allocated_block(path) == EXT_MAX_BLOCK)
+-		flags |= FIEMAP_EXTENT_LAST;
+-
+-	error = fiemap_fill_next_extent(fieinfo, logical, physical,
+-					length, flags);
+-	if (error < 0)
+-		return error;
+-	if (error == 1)
+-		return EXT_BREAK;
+-
+-	return EXT_CONTINUE;
+-}
+-
+-/* fiemap flags we can handle specified here */
+-#define EXT4_FIEMAP_FLAGS	(FIEMAP_FLAG_SYNC|FIEMAP_FLAG_XATTR)
+-
+-int ext4_xattr_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo)
+-{
+-	__u64 physical = 0;
+-	__u64 length;
+-	__u32 flags = FIEMAP_EXTENT_LAST;
+-	int blockbits = inode->i_sb->s_blocksize_bits;
+-	int error = 0;
+-
+-	/* in-inode? */
+-	if (EXT4_I(inode)->i_state & EXT4_STATE_XATTR) {
+-		struct ext4_iloc iloc;
+-		int offset;	/* offset of xattr in inode */
+-
+-		error = ext4_get_inode_loc(inode, &iloc);
+-		if (error)
+-			return error;
+-		physical = iloc.bh->b_blocknr << blockbits;
+-		offset = EXT4_GOOD_OLD_INODE_SIZE +
+-				EXT4_I(inode)->i_extra_isize;
+-		physical += offset;
+-		length = EXT4_SB(inode->i_sb)->s_inode_size - offset;
+-		flags |= FIEMAP_EXTENT_DATA_INLINE;
+-	} else { /* external block */
+-		physical = EXT4_I(inode)->i_file_acl << blockbits;
+-		length = inode->i_sb->s_blocksize;
+-	}
+-
+-	if (physical)
+-		error = fiemap_fill_next_extent(fieinfo, 0, physical,
+-						length, flags);
+-	return (error < 0 ? error : 0);
+-}
+-
+-int ext4_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo,
+-		__u64 start, __u64 len)
+-{
+-	ext4_lblk_t start_blk;
+-	ext4_lblk_t len_blks;
+-	int error = 0;
+-
+-	/* fallback to generic here if not in extents fmt */
+-	if (!(EXT4_I(inode)->i_flags & EXT4_EXTENTS_FL))
+-		return generic_block_fiemap(inode, fieinfo, start, len,
+-			ext4_get_block);
+-
+-	if (fiemap_check_flags(fieinfo, EXT4_FIEMAP_FLAGS))
+-		return -EBADR;
+-
+-	if (fieinfo->fi_flags & FIEMAP_FLAG_XATTR) {
+-		error = ext4_xattr_fiemap(inode, fieinfo);
+-	} else {
+-		start_blk = start >> inode->i_sb->s_blocksize_bits;
+-		len_blks = len >> inode->i_sb->s_blocksize_bits;
+-
+-		/*
+-		 * Walk the extent tree gathering extent information.
+-		 * ext4_ext_fiemap_cb will push extents back to user.
+-		 */
+-		down_write(&EXT4_I(inode)->i_data_sem);
+-		error = ext4_ext_walk_space(inode, start_blk, len_blks,
+-					  ext4_ext_fiemap_cb, fieinfo);
+-		up_write(&EXT4_I(inode)->i_data_sem);
+-	}
+-
+-	return error;
+-}
+-

linux-2.6.27-ext4-2.6.28-rc3-git6.patch:

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.2 -r 1.3 linux-2.6.27-ext4-2.6.28-rc3-git6.patch
Index: linux-2.6.27-ext4-2.6.28-rc3-git6.patch
===================================================================
RCS file: linux-2.6.27-ext4-2.6.28-rc3-git6.patch
diff -N linux-2.6.27-ext4-2.6.28-rc3-git6.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ linux-2.6.27-ext4-2.6.28-rc3-git6.patch	12 Jan 2009 19:51:30 -0000	1.3
@@ -0,0 +1,9050 @@
+Index: linux-2.6.27.x86_64/MAINTAINERS
+===================================================================
+--- linux-2.6.27.x86_64.orig/MAINTAINERS
++++ linux-2.6.27.x86_64/MAINTAINERS
+@@ -1648,9 +1648,10 @@ L:	linux-ext4 at vger.kernel.org
+ S:	Maintained
+ 
+ EXT4 FILE SYSTEM
+-P:	Stephen Tweedie, Andrew Morton
+-M:	sct at redhat.com, akpm at linux-foundation.org, adilger at sun.com
++P:	Theodore Ts'o
++M:	tytso at mit.edu, adilger at sun.com
+ L:	linux-ext4 at vger.kernel.org
++W:	http://ext4.wiki.kernel.org
+ S:	Maintained
+ 
+ F71805F HARDWARE MONITORING DRIVER
+Index: linux-2.6.27.x86_64/fs/Makefile
+===================================================================
+--- linux-2.6.27.x86_64.orig/fs/Makefile
++++ linux-2.6.27.x86_64/fs/Makefile
+@@ -69,7 +69,7 @@ obj-$(CONFIG_DLM)		+= dlm/
+ # Do not add any filesystems before this line
+ obj-$(CONFIG_REISERFS_FS)	+= reiserfs/
+ obj-$(CONFIG_EXT3_FS)		+= ext3/ # Before ext2 so root fs can be ext3
+-obj-$(CONFIG_EXT4DEV_FS)	+= ext4/ # Before ext2 so root fs can be ext4dev
++obj-$(CONFIG_EXT4_FS)		+= ext4/ # Before ext2 so root fs can be ext4
+ obj-$(CONFIG_JBD)		+= jbd/
+ obj-$(CONFIG_JBD2)		+= jbd2/
+ obj-$(CONFIG_EXT2_FS)		+= ext2/
+Index: linux-2.6.27.x86_64/fs/ext4/acl.h
+===================================================================
+--- linux-2.6.27.x86_64.orig/fs/ext4/acl.h
++++ linux-2.6.27.x86_64/fs/ext4/acl.h
+@@ -51,18 +51,18 @@ static inline int ext4_acl_count(size_t 
+ 	}
+ }
+ 
+-#ifdef CONFIG_EXT4DEV_FS_POSIX_ACL
++#ifdef CONFIG_EXT4_FS_POSIX_ACL
+ 
+ /* Value for inode->u.ext4_i.i_acl and inode->u.ext4_i.i_default_acl
+    if the ACL has not been cached */
+ #define EXT4_ACL_NOT_CACHED ((void *)-1)
+ 
+ /* acl.c */
+-extern int ext4_permission (struct inode *, int);
+-extern int ext4_acl_chmod (struct inode *);
+-extern int ext4_init_acl (handle_t *, struct inode *, struct inode *);
++extern int ext4_permission(struct inode *, int);
++extern int ext4_acl_chmod(struct inode *);
++extern int ext4_init_acl(handle_t *, struct inode *, struct inode *);
+ 
+-#else  /* CONFIG_EXT4DEV_FS_POSIX_ACL */
++#else  /* CONFIG_EXT4_FS_POSIX_ACL */
+ #include <linux/sched.h>
+ #define ext4_permission NULL
+ 
+@@ -77,5 +77,5 @@ ext4_init_acl(handle_t *handle, struct i
+ {
+ 	return 0;
+ }
+-#endif  /* CONFIG_EXT4DEV_FS_POSIX_ACL */
++#endif  /* CONFIG_EXT4_FS_POSIX_ACL */
+ 
+Index: linux-2.6.27.x86_64/fs/ext4/balloc.c
+===================================================================
+--- linux-2.6.27.x86_64.orig/fs/ext4/balloc.c
++++ linux-2.6.27.x86_64/fs/ext4/balloc.c
+@@ -83,6 +83,7 @@ static int ext4_group_used_meta_blocks(s
+ 	}
+ 	return used_blocks;
+ }
++
+ /* Initializes an uninitialized block bitmap if given, and returns the
+  * number of blocks free in the group. */
+ unsigned ext4_init_block_bitmap(struct super_block *sb, struct buffer_head *bh,
+@@ -132,7 +133,7 @@ unsigned ext4_init_block_bitmap(struct s
+ 		 */
+ 		group_blocks = ext4_blocks_count(sbi->s_es) -
+ 			le32_to_cpu(sbi->s_es->s_first_data_block) -
+-			(EXT4_BLOCKS_PER_GROUP(sb) * (sbi->s_groups_count -1));
++			(EXT4_BLOCKS_PER_GROUP(sb) * (sbi->s_groups_count - 1));
+ 	} else {
+ 		group_blocks = EXT4_BLOCKS_PER_GROUP(sb);
+ 	}
+@@ -200,20 +201,20 @@ unsigned ext4_init_block_bitmap(struct s
+  * @bh:			pointer to the buffer head to store the block
+  *			group descriptor
+  */
+-struct ext4_group_desc * ext4_get_group_desc(struct super_block * sb,
++struct ext4_group_desc * ext4_get_group_desc(struct super_block *sb,
+ 					     ext4_group_t block_group,
+-					     struct buffer_head ** bh)
++					     struct buffer_head **bh)
+ {
+ 	unsigned long group_desc;
+ 	unsigned long offset;
+-	struct ext4_group_desc * desc;
++	struct ext4_group_desc *desc;
+ 	struct ext4_sb_info *sbi = EXT4_SB(sb);
+ 
+ 	if (block_group >= sbi->s_groups_count) {
+-		ext4_error (sb, "ext4_get_group_desc",
+-			    "block_group >= groups_count - "
+-			    "block_group = %lu, groups_count = %lu",
+-			    block_group, sbi->s_groups_count);
++		ext4_error(sb, "ext4_get_group_desc",
++			   "block_group >= groups_count - "
++			   "block_group = %lu, groups_count = %lu",
++			   block_group, sbi->s_groups_count);
+ 
+ 		return NULL;
+ 	}
+@@ -222,10 +223,10 @@ struct ext4_group_desc * ext4_get_group_
+ 	group_desc = block_group >> EXT4_DESC_PER_BLOCK_BITS(sb);
+ 	offset = block_group & (EXT4_DESC_PER_BLOCK(sb) - 1);
+ 	if (!sbi->s_group_desc[group_desc]) {
+-		ext4_error (sb, "ext4_get_group_desc",
+-			    "Group descriptor not loaded - "
+-			    "block_group = %lu, group_desc = %lu, desc = %lu",
+-			     block_group, group_desc, offset);
++		ext4_error(sb, "ext4_get_group_desc",
++			   "Group descriptor not loaded - "
++			   "block_group = %lu, group_desc = %lu, desc = %lu",
++			   block_group, group_desc, offset);
+ 		return NULL;
+ 	}
+ 
+@@ -302,8 +303,8 @@ err_out:
+ struct buffer_head *
+ ext4_read_block_bitmap(struct super_block *sb, ext4_group_t block_group)
+ {
+-	struct ext4_group_desc * desc;
+-	struct buffer_head * bh = NULL;
++	struct ext4_group_desc *desc;
++	struct buffer_head *bh = NULL;
+ 	ext4_fsblk_t bitmap_blk;
+ 
+ 	desc = ext4_get_group_desc(sb, block_group, NULL);
+@@ -318,9 +319,11 @@ ext4_read_block_bitmap(struct super_bloc
+ 			    block_group, bitmap_blk);
+ 		return NULL;
+ 	}
+-	if (bh_uptodate_or_lock(bh))
++	if (buffer_uptodate(bh) &&
++	    !(desc->bg_flags & cpu_to_le16(EXT4_BG_BLOCK_UNINIT)))
+ 		return bh;
+ 
++	lock_buffer(bh);
+ 	spin_lock(sb_bgl_lock(EXT4_SB(sb), block_group));
+ 	if (desc->bg_flags & cpu_to_le16(EXT4_BG_BLOCK_UNINIT)) {
+ 		ext4_init_block_bitmap(sb, bh, block_group, desc);
+@@ -345,301 +348,6 @@ ext4_read_block_bitmap(struct super_bloc
+ 	 */
+ 	return bh;
+ }
+-/*
+- * The reservation window structure operations
+- * --------------------------------------------
+- * Operations include:
+- * dump, find, add, remove, is_empty, find_next_reservable_window, etc.
+- *
+- * We use a red-black tree to represent per-filesystem reservation
+- * windows.
+- *
+- */
+-
+-/**
+- * __rsv_window_dump() -- Dump the filesystem block allocation reservation map
+- * @rb_root:		root of per-filesystem reservation rb tree
+- * @verbose:		verbose mode
+- * @fn:			function which wishes to dump the reservation map
+- *
+- * If verbose is turned on, it will print the whole block reservation
+- * windows(start, end).	Otherwise, it will only print out the "bad" windows,
+- * those windows that overlap with their immediate neighbors.
+- */
+-#if 1
+-static void __rsv_window_dump(struct rb_root *root, int verbose,
+-			      const char *fn)
+-{
+-	struct rb_node *n;
+-	struct ext4_reserve_window_node *rsv, *prev;
+-	int bad;
+-
+-restart:
+-	n = rb_first(root);
+-	bad = 0;
+-	prev = NULL;
+-
+-	printk("Block Allocation Reservation Windows Map (%s):\n", fn);
+-	while (n) {
[...8657 lines suppressed...]
+-stats  stream_req
+-
+-mb_groups:
+-This file gives the details of multiblock allocator buddy cache of free blocks
+-
+-mb_history:
+-Multiblock allocation history.
+-
+-stats:
+-This file indicate whether the multiblock allocator should start collecting
+-statistics. The statistics are shown during unmount
+-
+-group_prealloc:
+-The multiblock allocator normalize the block allocation request to
+-group_prealloc filesystem blocks if we don't have strip value set.
+-The stripe value can be specified at mount time or during mke2fs.
+-
+-max_to_scan:
+-How long multiblock allocator can look for a best extent (in found extents)
+-
+-min_to_scan:
+-How long multiblock allocator  must look for a best extent
+-
+-order2_req:
+-Multiblock allocator use  2^N search using buddies only for requests greater
+-than or equal to order2_req. The request size is specfied in file system
+-blocks. A value of 2 indicate only if the requests are greater than or equal
+-to 4 blocks.
+-
+-stream_req:
+-Files smaller than stream_req are served by the stream allocator, whose
+-purpose is to pack requests as close each to other as possible to
+-produce smooth I/O traffic. Avalue of 16 indicate that file smaller than 16
+-filesystem block size will use group based preallocation.
++
++Information about mounted ext4 file systems can be found in
++/proc/fs/ext4.  Each mounted filesystem will have a directory in
++/proc/fs/ext4 based on its device name (i.e., /proc/fs/ext4/hdc or
++/proc/fs/ext4/dm-0).   The files in each per-device directory are shown
++in Table 1-10, below.
++
++Table 1-10: Files in /proc/fs/ext4/<devname>
++..............................................................................
++ File            Content                                        
++ mb_groups       details of multiblock allocator buddy cache of free blocks
++ mb_history      multiblock allocation history
++ stats           controls whether the multiblock allocator should start
++                 collecting statistics, which are shown during the unmount
++ group_prealloc  the multiblock allocator will round up allocation
++                 requests to a multiple of this tuning parameter if the
++                 stripe size is not set in the ext4 superblock
++ max_to_scan     The maximum number of extents the multiblock allocator
++                 will search to find the best extent
++ min_to_scan     The minimum number of extents the multiblock allocator
++                 will search to find the best extent
++ order2_req      Tuning parameter which controls the minimum size for 
++                 requests (as a power of 2) where the buddy cache is
++                 used
++ stream_req      Files which have fewer blocks than this tunable
++                 parameter will have their blocks allocated out of a
++                 block group specific preallocation pool, so that small
++                 files are packed closely together.  Each large file
++                 will have its blocks allocated out of its own unique
++                 preallocation pool.
++inode_readahead  Tuning parameter which controls the maximum number of
++                 inode table blocks that ext4's inode table readahead
++                 algorithm will pre-read into the buffer cache
++..............................................................................
++
+ 
+ ------------------------------------------------------------------------------
+ Summary
+Index: linux-2.6.27.x86_64/fs/Kconfig
+===================================================================
+--- linux-2.6.27.x86_64.orig/fs/Kconfig
++++ linux-2.6.27.x86_64/fs/Kconfig
+@@ -136,71 +136,7 @@ config EXT3_FS_SECURITY
+ 	  If you are not using a security module that requires using
+ 	  extended attributes for file security labels, say N.
+ 
+-config EXT4DEV_FS
+-	tristate "Ext4dev/ext4 extended fs support development (EXPERIMENTAL)"
+-	depends on EXPERIMENTAL
+-	select JBD2
+-	select CRC16
+-	help
+-	  Ext4dev is a predecessor filesystem of the next generation
+-	  extended fs ext4, based on ext3 filesystem code. It will be
+-	  renamed ext4 fs later, once ext4dev is mature and stabilized.
+-
+-	  Unlike the change from ext2 filesystem to ext3 filesystem,
+-	  the on-disk format of ext4dev is not the same as ext3 any more:
+-	  it is based on extent maps and it supports 48-bit physical block
+-	  numbers. These combined on-disk format changes will allow
+-	  ext4dev/ext4 to handle more than 16 TB filesystem volumes --
+-	  a hard limit that ext3 cannot overcome without changing the
+-	  on-disk format.
+-
+-	  Other than extent maps and 48-bit block numbers, ext4dev also is
+-	  likely to have other new features such as persistent preallocation,
+-	  high resolution time stamps, and larger file support etc.  These
+-	  features will be added to ext4dev gradually.
+-
+-	  To compile this file system support as a module, choose M here. The
+-	  module will be called ext4dev.
+-
+-	  If unsure, say N.
+-
+-config EXT4DEV_FS_XATTR
+-	bool "Ext4dev extended attributes"
+-	depends on EXT4DEV_FS
+-	default y
+-	help
+-	  Extended attributes are name:value pairs associated with inodes by
+-	  the kernel or by users (see the attr(5) manual page, or visit
+-	  <http://acl.bestbits.at/> for details).
+-
+-	  If unsure, say N.
+-
+-	  You need this for POSIX ACL support on ext4dev/ext4.
+-
+-config EXT4DEV_FS_POSIX_ACL
+-	bool "Ext4dev POSIX Access Control Lists"
+-	depends on EXT4DEV_FS_XATTR
+-	select FS_POSIX_ACL
+-	help
+-	  POSIX Access Control Lists (ACLs) support permissions for users and
+-	  groups beyond the owner/group/world scheme.
+-
+-	  To learn more about Access Control Lists, visit the POSIX ACLs for
+-	  Linux website <http://acl.bestbits.at/>.
+-
+-	  If you don't know what Access Control Lists are, say N
+-
+-config EXT4DEV_FS_SECURITY
+-	bool "Ext4dev Security Labels"
+-	depends on EXT4DEV_FS_XATTR
+-	help
+-	  Security labels support alternative access control models
+-	  implemented by security modules like SELinux.  This option
+-	  enables an extended attribute handler for file security
+-	  labels in the ext4dev/ext4 filesystem.
+-
+-	  If you are not using a security module that requires using
+-	  extended attributes for file security labels, say N.
++source "fs/ext4/Kconfig"
+ 
+ config JBD
+ 	tristate
+@@ -234,45 +170,15 @@ config JBD_DEBUG
+ 	  output is generated.  To turn debugging off again, do
+ 	  "echo 0 > /sys/kernel/debug/jbd/jbd-debug".
+ 
+-config JBD2
+-	tristate
+-	select CRC32
+-	help
+-	  This is a generic journaling layer for block devices that support
+-	  both 32-bit and 64-bit block numbers.  It is currently used by
+-	  the ext4dev/ext4 filesystem, but it could also be used to add
+-	  journal support to other file systems or block devices such
+-	  as RAID or LVM.
+-
+-	  If you are using ext4dev/ext4, you need to say Y here. If you are not
+-	  using ext4dev/ext4 then you will probably want to say N.
+-
+-	  To compile this device as a module, choose M here. The module will be
+-	  called jbd2.  If you are compiling ext4dev/ext4 into the kernel,
+-	  you cannot compile this code as a module.
+-
+-config JBD2_DEBUG
+-	bool "JBD2 (ext4dev/ext4) debugging support"
+-	depends on JBD2 && DEBUG_FS
+-	help
+-	  If you are using the ext4dev/ext4 journaled file system (or
+-	  potentially any other filesystem/device using JBD2), this option
+-	  allows you to enable debugging output while the system is running,
+-	  in order to help track down any problems you are having.
+-	  By default, the debugging output will be turned off.
+-
+-	  If you select Y here, then you will be able to turn on debugging
+-	  with "echo N > /sys/kernel/debug/jbd2/jbd2-debug", where N is a
+-	  number between 1 and 5. The higher the number, the more debugging
+-	  output is generated.  To turn debugging off again, do
+-	  "echo 0 > /sys/kernel/debug/jbd2/jbd2-debug".
++source "fs/jbd2/Kconfig"
+ 
+ config FS_MBCACHE
+ # Meta block cache for Extended Attributes (ext2/ext3/ext4)
+ 	tristate
+-	depends on EXT2_FS_XATTR || EXT3_FS_XATTR || EXT4DEV_FS_XATTR
+-	default y if EXT2_FS=y || EXT3_FS=y || EXT4DEV_FS=y
+-	default m if EXT2_FS=m || EXT3_FS=m || EXT4DEV_FS=m
++	default y if EXT2_FS=y && EXT2_FS_XATTR
++	default y if EXT3_FS=y && EXT3_FS_XATTR
++	default y if EXT4_FS=y && EXT4_FS_XATTR
++	default m if EXT2_FS_XATTR || EXT3_FS_XATTR || EXT4_FS_XATTR
+ 
+ config REISERFS_FS
+ 	tristate "Reiserfs support"


--- NEW FILE linux-2.6.28.tar.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBJUsmzyGugalF9Dw4RAmYWAKCUJGMWXRrUNC/XDQl8lXXOv5zMvACfUvU5
Tq+2snGYOGwTki85iNpds/o=
=Ha/W
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/.cvsignore,v
retrieving revision 1.960
retrieving revision 1.961
diff -u -r1.960 -r1.961
--- .cvsignore	18 Dec 2008 22:13:53 -0000	1.960
+++ .cvsignore	12 Jan 2009 19:51:27 -0000	1.961
@@ -2,6 +2,5 @@
 GNUmakefile
 kernel-2.6.*.config
 temp-*
-kernel-2.6.27
-linux-2.6.27.tar.bz2
-patch-2.6.27.10.bz2
+kernel-2.6.28
+linux-2.6.28.tar.bz2


Index: Makefile
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/Makefile,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -r1.90 -r1.91
--- Makefile	5 Nov 2008 18:05:22 -0000	1.90
+++ Makefile	12 Jan 2009 19:51:27 -0000	1.91
@@ -63,8 +63,9 @@
 	@perl -pi -e 's/# CONFIG_CAN_DEBUG_DEVICES is not set/CONFIG_CAN_DEBUG_DEVICES=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
+	@perl -pi -e 's/# CONFIG_PM_TEST_SUSPEND is not set/CONFIG_PM_TEST_SUSPEND=y/' config-generic
 
-	# just in case we're going from extremedebug -> debug
+	@# just in case we're going from extremedebug -> debug
 	@perl -pi -e 's/CONFIG_DEBUG_PAGEALLOC=y/# CONFIG_DEBUG_PAGEALLOC is not set/' config-nodebug
 
 	@perl -pi -e 's/^%define debugbuildsenabled 1/%define debugbuildsenabled 0/' kernel.spec
@@ -100,6 +101,7 @@
 	@perl -pi -e 's/CONFIG_CAN_DEBUG_DEVICES=y/# CONFIG_CAN_DEBUG_DEVICES 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
+	@perl -pi -e 's/CONFIG_PM_TEST_SUSPEND=y/#\ CONFIG_PM_TEST_SUSPEND\ is\ not\ set/' config-generic
 
 	@perl -pi -e 's/CONFIG_NR_CPUS=512/CONFIG_NR_CPUS=64/' config-x86_64-generic
 


Index: TODO
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/TODO,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- TODO	19 Nov 2008 21:10:44 -0000	1.46
+++ TODO	12 Jan 2009 19:51:27 -0000	1.47
@@ -12,9 +12,17 @@
 	Nouveau DRM driver.
 	Won't go upstream until ABI confirmed.
 
+linux-2.6-acpi-clear-wake-status.patch
+linux-2.6-input-dell-keyboard-keyup.patch
+	Upstream in 2.6.28-rc, sent to -stable
+
 linux-2.6-eeepc-laptop-update.patch
 	Upstream but slightly different (commit a195dcdc)
 
+linux-2.6-acpi-ignore-reset_reg_sup.patch
+	Fixes reboot after suspend/resume (https://bugzilla.redhat.com/show_bug.cgi?id=461228)
+	Upstream in .28rc1, sent to stable
+
 linux-2.6-at76.patch
 linux-2.6-iwl3945-ibss-tsf-fix.patch
 linux-2.6-iwlagn-downgrade-BUG_ON-in-interrupt.patch
@@ -56,15 +64,6 @@
 linux-2.6-debug-sizeof-structs.patch
 	Fedora local debug stuff.
 
-linux-2.6-default-mmf_dump_elf_headers.patch
-	Fedora change of /proc/pid/coredump_filter default for build ID.
-	Sent upstream Sep 26 (mm add-config_core_dump_default_elf_headers.patch)
-	will become kconfig setting
-
-linux-2.6-x86-tracehook.patch
-	(utrace prerequisite)
-	In tip/x86/tracehook, to be merged for 2.6.28
-
 linux-2.6-utrace.patch
 	utrace
 
@@ -117,24 +116,16 @@
 	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-piix3-silence-quirk.patch (in -mm)
 linux-2.6-silence-acpi-blacklist.patch
 linux-2.6-silence-fbcon-logo.patch
 linux-2.6-silence-noise.patch
-linux-2.6-amd64-yes-i-know-you-live.patch
 linux-2.6.27-pci-hush-allocation-failures.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
-	Not upstreamable as-is.
-	These changes will cause breakage on distros that haven't got an
-	 up-to-date toolchain.  CONFIG_ option perhaps?
-
-linux-2.6-selinux-recognise-addrlabel.patch
-	https://bugzilla.redhat.com/show_bug.cgi?id=469423
-	posted upstream on nov 5 2008 : http://lkml.org/lkml/2008/11/5/85
+	Not upstreamable.
 
 linux-2.6-serial-460800.patch
 	Probably not upstreamable.
@@ -149,11 +140,29 @@
 	DEBUG_SHIRQ causes an oops.
 	Needs testing, if it works, it'll go upstream soon.
 
-linux-2.6.27-ext4-2.6.28-backport-fixups.patch
-linux-2.6.27-ext4-2.6.28-rc3-git6.patch
+linux-2.6.27-ext4-stable-patch-queue.patch
 	EXT4 bits for 2.6.28
 	Eric looks after this stuff.
 
+linux-2.6.27-fs-disable-fiemap.patch
+	Don't let this interface get out 'til it's official (and
+	released) upstream.
+
+linux-2.6.27-ext-dir-corruption-fix.patch
+	in -stable, but reverted in upstream-reverts
+        (the ext4 patch queue won't apply if we get this patch from -stable)
+
+linux-2.6.27-delay-ext4-free-block-cap-check.patch
+	In the ext4 queue, will be upstream (for bug #467216)
+
+linux-2.6-x86-avoid-dereferencing-beyond-stack-THREAD_SIZE.patch
+	In mainline and 2.6.26-stable, submitted for 2.6.27-stable.
+
+linux-2.6-rtc-cmos-look-for-pnp-rtc-first.patch
+linux-2.6-x86-register-platform-rtc-if-pnp-doesnt-describe-it.patch
+	Fix broken RTC on systems that don't expose it via PnP.
+	Submitted for -stable
+
 linux-2.6.27-sony-laptop-suspend-fix.patch
 	Submitted: http://marc.info/?l=linux-kernel&m=122419261829835&w=2
 
@@ -161,16 +170,29 @@
 	In -stable, reverted in upstream-reverts, reapplied after the drm patch.
 	The drm patch should be fixed up to not conflict with the upstream patch.
 
-linux-2.6-netdev-r8169-2.6.28.patch
-	Update the r8169 driver to 2.6.28-rc3
+linux-2.6-libata-pata_it821x-fix-lba48-on-raid-volumes.patch
+	upstream, sent for -stable
+
+linux-2.6-usb-storage-unusual-devs-jmicron-ata-bridge.patch
+	sent for stable
+
+linux-2.6-net-tcp-option-ordering.patch
+	Backport of fd6149d332973bafa50f03ddb0ea9513e67f4517 from .28
+
+linux-2.6-sched-features-disable-hrtick.patch
+linux-2.6-sched_clock-prevent-scd-clock-from-moving-backwards
+	Scheduler patches from 2.6.28, sent to -stable
+
+linux-2.6-r8169-fix-RxMissed-register-access.patch
+linux-2.6-r8169-wake-up-the-phy-of-the-8168.patch
+	Selected patches from the r8169 2.6.28 driver.
+	Should go to stable after confirming they fix reported bugs.
 
 linux-2.6-olpc-speaker-out.patch
 	Enables speaker output by default on OLPC, going to get review from
 	OLPC folks and then to upstream for .28
 linux-2.6-olpc-touchpad.patch
 	OLPC touchpad tweaks backported from 2.6.28
-linux-2.6-quieter-mmc.patch
-        Quiets a warning from the sdhci stack on boot on XO; en route upstream
 
 linux-2.6-x86-mtrr-kill-bogus-warning.patch
 	Silence bogus warning under vmware ; sent upstream.


Index: config-debug
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/config-debug,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- config-debug	1 Oct 2008 03:49:53 -0000	1.20
+++ config-debug	12 Jan 2009 19:51:27 -0000	1.21
@@ -15,6 +15,7 @@
 CONFIG_FAIL_MAKE_REQUEST=y
 CONFIG_FAULT_INJECTION_DEBUG_FS=y
 CONFIG_FAULT_INJECTION_STACKTRACE_FILTER=y
+CONFIG_FAIL_IO_TIMEOUT=y
 
 CONFIG_SLUB_DEBUG_ON=y
 


Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/config-generic,v
retrieving revision 1.202
retrieving revision 1.203
diff -u -r1.202 -r1.203
--- config-generic	18 Dec 2008 21:51:11 -0000	1.202
+++ config-generic	12 Jan 2009 19:51:27 -0000	1.203
@@ -142,6 +142,7 @@
 # Executable file formats
 #
 CONFIG_BINFMT_ELF=y
+CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
 # CONFIG_BINFMT_AOUT is not set
 CONFIG_BINFMT_MISC=y
 
@@ -289,6 +290,7 @@
 #
 CONFIG_PNP=y
 # CONFIG_PNP_DEBUG is not set
+# CONFIG_PNP_DEBUG_MESSAGES is not set
 
 #
 # Protocols
@@ -296,7 +298,7 @@
 CONFIG_ISAPNP=y
 # CONFIG_PNPBIOS is not set
 
-CONFIG_ACPI_PCI_SLOT=m
+CONFIG_ACPI_PCI_SLOT=y
 CONFIG_HOTPLUG_PCI_ACPI=y
 CONFIG_HOTPLUG_PCI_ACPI_IBM=m
 
@@ -628,6 +630,7 @@
 #
 CONFIG_MD=y
 CONFIG_BLK_DEV_MD=y
+CONFIG_MD_AUTODETECT=y
 CONFIG_MD_FAULTY=m
 CONFIG_MD_LINEAR=m
 CONFIG_MD_MULTIPATH=m
@@ -779,6 +782,7 @@
 CONFIG_NET_9P_FD=m
 CONFIG_NET_9P_VIRTIO=m
 # CONFIG_NET_9P_DEBUG is not set
+CONFIG_NET_9P_RDMA=m
 
 CONFIG_DECNET=m
 CONFIG_DECNET_ROUTER=y
@@ -1222,20 +1226,21 @@
 CONFIG_E1000E=m
 CONFIG_IGB=m
 # CONFIG_IGB_LRO is not set
+CONFIG_IGB_DCA=y
 CONFIG_NS83820=m
 CONFIG_HAMACHI=m
 CONFIG_YELLOWFIN=m
 CONFIG_R8169=m
 CONFIG_R8169_NAPI=y
 CONFIG_R8169_VLAN=y
-# broken on ppc 28 Jul 2008
-# CONFIG_SFC is not set
+CONFIG_SFC=n
 # CONFIG_SK98LIN is not set
 CONFIG_SKGE=m
 # CONFIG_SKGE_DEBUG is not set
 CONFIG_TIGON3=m
 CONFIG_SKY2=m
 # CONFIG_SKY2_DEBUG is not set
+CONFIG_JME=m
 
 #
 # Ethernet (10000 Mbit)
@@ -1248,12 +1253,18 @@
 CONFIG_IXGB=m
 CONFIG_IXGB_NAPI=y
 CONFIG_IXGBE=m
+CONFIG_IXGBE_DCA=y
 CONFIG_MYRI10GE=m
+CONFIG_MYRI10GE_DCA=y
 CONFIG_NETXEN_NIC=m
 CONFIG_NIU=m
 CONFIG_S2IO=m
 CONFIG_S2IO_NAPI=y
 CONFIG_TEHUTI=m
+CONFIG_ENIC=m
+CONFIG_MLX4_EN=m
+# CONFIG_MLX4_DEBUG is not set
+CONFIG_QLGE=m
 
 CONFIG_FDDI=y
 # CONFIG_DEFXX is not set
@@ -1296,6 +1307,7 @@
 CONFIG_MAC80211_MESH=y
 CONFIG_MAC80211_LEDS=y
 CONFIG_MAC80211_DEBUGFS=y
+CONFIG_MAC80211_RC_MINSTREL=y
 # CONFIG_MAC80211_DEBUG_MENU is not set
 # CONFIG_MAC80211_DEBUG is not set
 # CONFIG_MAC80211_DEBUG_PACKET_ALIGNMENT is not set
@@ -1308,6 +1320,8 @@
 CONFIG_IEEE80211_CRYPT_TKIP=m
 CONFIG_CFG80211=m
 CONFIG_NL80211=y
+CONFIG_WIRELESS=y
+CONFIG_WIRELESS_OLD_REGULATORY=y
 CONFIG_WIRELESS_EXT=y
 CONFIG_WIRELESS_EXT_SYSFS=y
 
@@ -1346,6 +1360,8 @@
 CONFIG_LIBERTAS_CS=m
 CONFIG_LIBERTAS_SDIO=m
 CONFIG_LIBERTAS_DEBUG=y
+CONFIG_LIBERTAS_THINFIRM=m
+CONFIG_LIBERTAS_THINFIRM_USB=m
 CONFIG_IWLCORE=m
 CONFIG_IWLCORE_RFKILL=y
 CONFIG_IWLWIFI_LEDS=y
@@ -1455,7 +1471,7 @@
 CONFIG_BPQETHER=m
 CONFIG_SCC=m
 CONFIG_DMASCC=m
-# CONFIG_SCC_DELAY is not set
+CONFIG_SCC_DELAY=n
 CONFIG_SCC_TRXECHO=y
 CONFIG_BAYCOM_SER_FDX=m
 CONFIG_BAYCOM_SER_HDX=m
@@ -1683,6 +1699,7 @@
 
 CONFIG_INPUT_POWERMATE=m
 CONFIG_INPUT_YEALINK=m
+CONFIG_INPUT_CM109=m
 CONFIG_INPUT_POLLDEV=m
 
 #
@@ -1715,6 +1732,7 @@
 CONFIG_INPUT_MOUSE=y
 CONFIG_MOUSE_PS2=y
 # CONFIG_MOUSE_PS2_TOUCHKIT is not set
+# CONFIG_MOUSE_PS2_ELANTECH is not set
 CONFIG_MOUSE_SERIAL=m
 CONFIG_MOUSE_VSXXXAA=m
 CONFIG_MOUSE_APPLETOUCH=m
@@ -2075,6 +2093,11 @@
 CONFIG_RTC_DRV_V3020=m
 CONFIG_RTC_DRV_STK17TA8=m
 # CONFIG_RTC_DRV_S35390A is not set
+CONFIG_RTC_DRV_RX8581=m
+CONFIG_RTC_DRV_DS1286=m
+CONFIG_RTC_DRV_M48T35=m
+CONFIG_RTC_DRV_BQ4802=m
+CONFIG_RTC_DRV_WM8350=m
 
 CONFIG_DTLK=m
 CONFIG_R3964=m
@@ -2099,13 +2122,14 @@
 CONFIG_DRM_TDFX=m
 CONFIG_DRM_R128=m
 CONFIG_DRM_RADEON=m
-CONFIG_DRM_RADEON_KMS=y
+CONFIG_DRM_RADEON_KMS=n
 CONFIG_DRM_I810=m
 CONFIG_DRM_I830=m
 CONFIG_DRM_MGA=m
 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
 
@@ -2277,10 +2301,17 @@
 CONFIG_DVB_TDA1004X=m
 CONFIG_DVB_TUA6100=m
 CONFIG_DVB_TTUSB_DEC=m
+CONFIG_DVB_USB_CINERGY_T2=m
+CONFIG_DVB_USB_DTV5100=m
+CONFIG_DVB_USB_AF9015=m
 CONFIG_DVB_USB_ANYSEE=m
 CONFIG_DVB_USB_DW2102=m
 CONFIG_DVB_VES1820=m
 CONFIG_DVB_VES1X93=m
+CONFIG_DVB_DM1105=m
+CONFIG_DVB_LGS8GL5=m
+# CONFIG_DVB_DUMMY_FE is not set
+CONFIG_DVB_AF9013=m
 
 #
 # Supported SAA7146 based PCI Adapters
@@ -2427,10 +2458,16 @@
 # CONFIG_FB_UVESA is not set
 CONFIG_FB_VESA=y
 CONFIG_FB_VGA16=m
-# CONFIG_FB_VIRTUAL is not set
+CONFIG_FB_VIRTUAL=m
 CONFIG_FB_VOODOO1=m
 # CONFIG_FB_VT8623 is not set
 CONFIG_FB_EFI=y
+CONFIG_FB_VIA=m
+CONFIG_FB_METRONOME=m
+CONFIG_FB_MB862XX=m
+CONFIG_FB_MB862XX_PCI_GDC=y
+CONFIG_FB_MB862XX_LIME=y
+# CONFIG_FB_PRE_INIT_FB is not set
 
 # CONFIG_FIRMWARE_EDID is not set
 
@@ -2476,7 +2513,6 @@
 CONFIG_SND_PCM_OSS=y
 CONFIG_SND_PCM_OSS_PLUGINS=y
 CONFIG_SND_RTCTIMER=y
-# CONFIG_SND_HRTIMER is not set
 CONFIG_SND_DYNAMIC_MINORS=y
 # CONFIG_SND_SUPPORT_OLD_API is not set
 
@@ -2491,7 +2527,7 @@
 CONFIG_SND_MPU401=m
 CONFIG_SND_PORTMAN2X4=m
 CONFIG_SND_AC97_POWER_SAVE=y
-CONFIG_SND_AC97_POWER_SAVE_DEFAULT=0
+CONFIG_SND_AC97_POWER_SAVE_DEFAULT=5
 
 CONFIG_SND_DRIVERS=y
 
@@ -2534,10 +2570,8 @@
 CONFIG_SND_FM801=m
 CONFIG_SND_FM801_TEA575X_BOOL=y
 CONFIG_SND_HDA_INTEL=y
-CONFIG_SND_HDA_HWDEP=y
 CONFIG_SND_HDA_INPUT_BEEP=y
-CONFIG_SND_HDA_CODEC_NVHDMI=y
-CONFIG_SND_HDA_CODEC_INTELHDMI=y
+CONFIG_SND_HDA_HWDEP=y
 CONFIG_SND_HDA_CODEC_REALTEK=y
 CONFIG_SND_HDA_CODEC_ANALOG=y
 CONFIG_SND_HDA_CODEC_SIGMATEL=y
@@ -2546,6 +2580,7 @@
 CONFIG_SND_HDA_CODEC_CONEXANT=y
 CONFIG_SND_HDA_CODEC_CMEDIA=y
 CONFIG_SND_HDA_CODEC_SI3054=y
+CONFIG_SND_HDA_CODEC_NVHDMI=y
 CONFIG_SND_HDA_GENERIC=y
 CONFIG_SND_HDA_POWER_SAVE=y
 CONFIG_SND_HDA_POWER_SAVE_DEFAULT=0
@@ -2644,6 +2679,7 @@
 CONFIG_USB_ACM=m
 CONFIG_USB_PRINTER=m
 CONFIG_USB_WDM=m
+CONFIG_USB_TMC=m
 # CONFIG_BLK_DEV_UB is not set
 CONFIG_USB_STORAGE=m
 # CONFIG_USB_STORAGE_DEBUG is not set
@@ -2675,6 +2711,7 @@
 CONFIG_HIDRAW=y
 CONFIG_HID_FF=y
 CONFIG_HID_PID=y
+# CONFIG_HID_COMPAT is not set
 CONFIG_LOGITECH_FF=y
 CONFIG_LOGIRUMBLEPAD2_FF=y
 CONFIG_PANTHERLORD_FF=y
@@ -2698,7 +2735,30 @@
 CONFIG_USB_VICAM=m
 CONFIG_USB_DSBR=m
 CONFIG_USB_ET61X251=m
+CONFIG_USB_M5602=m
 CONFIG_USB_GSPCA=m
+CONFIG_USB_GSPCA_CONEX=m
+CONFIG_USB_GSPCA_ETOMS=m
+CONFIG_USB_GSPCA_FINEPIX=m
+CONFIG_USB_GSPCA_MARS=m
+CONFIG_USB_GSPCA_OV519=m
+CONFIG_USB_GSPCA_OV534=m
+CONFIG_USB_GSPCA_PAC207=m
+CONFIG_USB_GSPCA_PAC7311=m
+CONFIG_USB_GSPCA_SONIXB=m
+CONFIG_USB_GSPCA_SONIXJ=m
+CONFIG_USB_GSPCA_SPCA500=m
+CONFIG_USB_GSPCA_SPCA501=m
+CONFIG_USB_GSPCA_SPCA505=m
+CONFIG_USB_GSPCA_SPCA506=m
+CONFIG_USB_GSPCA_SPCA508=m
+CONFIG_USB_GSPCA_SPCA561=m
+CONFIG_USB_GSPCA_STK014=m
+CONFIG_USB_GSPCA_SUNPLUS=m
+CONFIG_USB_GSPCA_T613=m
+CONFIG_USB_GSPCA_TV8532=m
+CONFIG_USB_GSPCA_VC032X=m
+CONFIG_USB_GSPCA_ZC3XX=m
 CONFIG_USB_IBMCAM=m
 CONFIG_USB_KONICAWC=m
 CONFIG_USB_OV511=m
@@ -2725,6 +2785,7 @@
 CONFIG_USB_SPEEDTOUCH=m
 CONFIG_USB_NET_AX8817X=m
 CONFIG_USB_NET_DM9601=m
+CONFIG_USB_NET_SMSC95XX=m
 CONFIG_USB_NET_GL620A=m
 CONFIG_USB_NET_NET1080=m
 CONFIG_USB_NET_PLUSB=m
@@ -2770,7 +2831,7 @@
 CONFIG_USB_SERIAL_EMPEG=m
 CONFIG_USB_SERIAL_FTDI_SIO=m
 CONFIG_USB_SERIAL_FUNSOFT=m
-# CONFIG_USB_SERIAL_GARMIN is not set
+CONFIG_USB_SERIAL_GARMIN=m
 CONFIG_USB_SERIAL_HP4X=m
 CONFIG_USB_SERIAL_IPAQ=m
 CONFIG_USB_SERIAL_IPW=m
@@ -2823,6 +2884,7 @@
 #
 
 CONFIG_USB_ADUTUX=m
+CONFIG_USB_SEVSEG=m
 CONFIG_USB_ALI_M5632=y
 CONFIG_USB_APPLEDISPLAY=m
 CONFIG_USB_ATM=m
@@ -2845,6 +2907,7 @@
 # CONFIG_USB_ISP1760_HCD is not set
 CONFIG_USB_IOWARRIOR=m
 CONFIG_USB_ISIGHTFW=m
+CONFIG_USB_VST=m
 CONFIG_USB_LCD=m
 CONFIG_USB_LD=m
 CONFIG_USB_LEGOTOWER=m
@@ -2861,6 +2924,7 @@
 CONFIG_USB_SISUSBVGA=m
 CONFIG_USB_SISUSBVGA_CON=y
 CONFIG_USB_SI470X=m
+CONFIG_USB_MR800=m
 CONFIG_USB_STKWEBCAM=m
 # CONFIG_USB_TEST is not set
 CONFIG_USB_TRANCEVIBRATOR=m
@@ -2869,7 +2933,7 @@
 CONFIG_USB_UVCVIDEO=m
 CONFIG_USB_W9968CF=m
 CONFIG_USB_XUSBATM=m
-# CONFIG_USB_ZC0301 is not set
+CONFIG_USB_ZC0301=n
 CONFIG_USB_ZERO=m
 
 CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
@@ -2936,6 +3000,7 @@
 CONFIG_QFMT_V2=y
 CONFIG_QUOTACTL=y
 CONFIG_DNOTIFY=y
+# Autofsv3 is obsolete.
 # CONFIG_AUTOFS_FS is not set
 CONFIG_AUTOFS4_FS=m
 
@@ -3025,6 +3090,7 @@
 CONFIG_SUNRPC_BIND34=y
 CONFIG_SUNRPC_GSS=m
 CONFIG_SUNRPC_XPRT_RDMA=m
+CONFIG_SUNRPC_REGISTER_V4=y
 CONFIG_RPCSEC_GSS_KRB5=m
 CONFIG_RPCSEC_GSS_SPKM3=m
 # CONFIG_SMB_FS is not set
@@ -3058,6 +3124,7 @@
 CONFIG_OCFS2_FS_O2CB=m
 CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m
 # CONFIG_OCFS2_FS_STATS is not set
+# CONFIG_OCFS2_COMPAT_JBD is not set
 CONFIG_CONFIGFS_FS=m
 
 CONFIG_DLM=m
@@ -3263,6 +3330,8 @@
 CONFIG_CRYPTO_XTS=m
 CONFIG_CRYPTO_TEST=m
 CONFIG_LIBCRC32C=m
+CONFIG_CRYPTO_CRC32C_INTEL=m
+CONFIG_CRYPTO_ANSI_CPRNG=m
 CONFIG_CRYPTO_DEV_HIFN_795X=m
 CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y
 
@@ -3298,6 +3367,7 @@
 CONFIG_FB_RADEON_BACKLIGHT=y
 CONFIG_FB_ATY128_BACKLIGHT=y
 CONFIG_FB_ATY_BACKLIGHT=y
+# CONFIG_BACKLIGHT_SAHARA is not set
 
 CONFIG_LCD_CLASS_DEVICE=m
 CONFIG_LCD_PLATFORM=m
@@ -3309,8 +3379,7 @@
 CONFIG_GROUP_SCHED=y
 CONFIG_RT_GROUP_SCHED=y
 CONFIG_CGROUP_SCHED=y
-# NOTE: Before changing the below, take notice that page struct will grow past a cacheline on 32bit.
-# CONFIG_CGROUP_MEM_RES_CTLR is not set
+CONFIG_CGROUP_MEM_RES_CTLR=y
 
 CONFIG_CPUSETS=y
 CONFIG_CGROUPS=y
@@ -3318,6 +3387,7 @@
 CONFIG_CGROUP_NS=y
 CONFIG_CGROUP_CPUACCT=y
 CONFIG_CGROUP_DEVICE=y
+CONFIG_CGROUP_FREEZER=y
 CONFIG_PROC_PID_CPUSET=y
 
 # CONFIG_SYSFS_DEPRECATED is not set
@@ -3346,7 +3416,7 @@
 CONFIG_PM_DEBUG=y
 CONFIG_PM_TRACE=y
 # CONFIG_PM_VERBOSE is not set
-# CONFIG_PM_TEST_SUSPEND is not set
+CONFIG_PM_TEST_SUSPEND=y
 
 CONFIG_CRASH=m
 
@@ -3521,10 +3591,12 @@
 # CONFIG_LEDS_S3C24XX is not set
 # CONFIG_LEDS_SPITZ is not set
 # CONFIG_LEDS_TOSA is not set
+CONFIG_LEDS_HP_DISK=m
 CONFIG_LEDS_TRIGGERS=y
 CONFIG_LEDS_TRIGGER_TIMER=m
 CONFIG_LEDS_TRIGGER_IDE_DISK=y
 CONFIG_LEDS_TRIGGER_HEARTBEAT=m
+CONFIG_LEDS_TRIGGER_BACKLIGHT=m
 CONFIG_LEDS_TRIGGER_DEFAULT_ON=m
 
 CONFIG_DMADEVICES=y
@@ -3567,6 +3639,7 @@
 CONFIG_APM_POWER=m
 # CONFIG_BATTERY_DS2760 is not set
 CONFIG_BATTERY_PMU=m
+CONFIG_BATTERY_BQ27x00=m
 # CONFIG_PDA_POWER is not set
 
 CONFIG_AUXDISPLAY=y
@@ -3576,6 +3649,7 @@
 CONFIG_UIO_SMX=m
 CONFIG_UIO_PDRV=m
 CONFIG_UIO_PDRV_GENIRQ=m
+CONFIG_UIO_SERCOS3=m
 
 CONFIG_INSTRUMENTATION=y
 CONFIG_MARKERS=y
@@ -3630,6 +3704,7 @@
 CONFIG_I8K=m
 CONFIG_ACER_WMI=m
 CONFIG_EDAC_I3000=m
+CONFIG_EDAC_X38=m
 CONFIG_INPUT_APANEL=m
 
 # CONFIG_INTEL_MENLOW is not set
@@ -3664,3 +3739,74 @@
 # CONFIG_GPIOLIB is not set
 
 CONFIG_HP_WMI=m
+
+CONFIG_UNEVICTABLE_LRU=y
+
+CONFIG_NETFILTER_TPROXY=m
+CONFIG_NETFILTER_XT_TARGET_TPROXY=m
+CONFIG_NETFILTER_XT_MATCH_RECENT=m
+# CONFIG_NETFILTER_XT_MATCH_RECENT_PROC_COMPAT is not set
+CONFIG_NETFILTER_XT_MATCH_SOCKET=m
+
+# CONFIG_IP_VS_IPV6 is not set
+
+CONFIG_NET_DSA=y
+CONFIG_NET_DSA_MV88E6060=y
+CONFIG_NET_DSA_MV88E6131=y
+CONFIG_NET_DSA_MV88E6123_61_65=y
+
+CONFIG_NET_SCH_MULTIQ=m
+CONFIG_NET_ACT_SKBEDIT=m
+
+CONFIG_PHONET=m
+
+CONFIG_ICS932S401=m
+# CONFIG_C2PORT is not set
+CONFIG_W1_SLAVE_BQ27000=m
+
+CONFIG_SENSORS_ADT7462=m
+CONFIG_SENSORS_LIS3LV02D=m
+
+CONFIG_IT87_WDT=m
+CONFIG_W83697UG_WDT=m
+
+CONFIG_MFD_WM8400=m
+CONFIG_MFD_WM8350_I2C=m
+
+CONFIG_REGULATOR=y
+# CONFIG_REGULATOR_DEBUG is not set
+# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set
+CONFIG_REGULATOR_BQ24022=m
+CONFIG_REGULATOR_WM8350=m
+CONFIG_REGULATOR_WM8400=m
+CONFIG_REGULATOR_DA903X=m
+
+# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
+
+CONFIG_SOC_CAMERA_MT9M111=m
+
+CONFIG_USB_WUSB=m
+CONFIG_USB_WUSB_CBAF=m
+# CONFIG_USB_WUSB_CBAF_DEBUG is not set
+CONFIG_USB_WHCI_HCD=m
+CONFIG_USB_HWA_HCD=m
+
+CONFIG_UWB=m
+CONFIG_UWB_HWA=m
+CONFIG_UWB_WHCI=m
+CONFIG_UWB_WLP=m
+CONFIG_UWB_I1480U=m
+CONFIG_UWB_I1480U_WLP=m
+
+# CONFIG_STAGING is not set
+
+# CONFIG_DEBUG_VIRTUAL is not set
+# CONFIG_RCU_CPU_STALL_DETECTOR is not set
+# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
+# CONFIG_FUNCTION_TRACER is not set
+# CONFIG_BOOT_TRACER is not set
+# CONFIG_STACK_TRACER is not set
+# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
+CONFIG_EARLY_PRINTK_DBGP=y
+
+CONFIG_SECURITYFS=y


Index: config-ia64-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/config-ia64-generic,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- config-ia64-generic	25 Sep 2008 19:17:30 -0000	1.18
+++ config-ia64-generic	12 Jan 2009 19:51:27 -0000	1.19
@@ -207,3 +207,6 @@
 
 CONFIG_SYSFS_DEPRECATED=y
 CONFIG_SYSFS_DEPRECATED_V2=y
+
+CONFIG_PARAVIRT_GUEST=y
+CONFIG_PARAVIRT=y


Index: config-nodebug
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/config-nodebug,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- config-nodebug	1 Oct 2008 03:49:53 -0000	1.22
+++ config-nodebug	12 Jan 2009 19:51:27 -0000	1.23
@@ -2,42 +2,43 @@
 CONFIG_SND_DEBUG=y
 CONFIG_SND_PCM_XRUN_DEBUG=y
 
-# CONFIG_DEBUG_MUTEXES is not set
-# CONFIG_DEBUG_RT_MUTEXES is not set
-# CONFIG_DEBUG_LOCK_ALLOC is not set
-# CONFIG_PROVE_LOCKING is not set
-# CONFIG_DEBUG_VM is not set
-# CONFIG_DEBUG_SPINLOCK is not set
-
-# CONFIG_FAULT_INJECTION is not set
-# CONFIG_FAILSLAB is not set
-# CONFIG_FAIL_PAGE_ALLOC is not set
-# CONFIG_FAIL_MAKE_REQUEST is not set
-# CONFIG_FAULT_INJECTION_DEBUG_FS is not set
-# CONFIG_FAULT_INJECTION_STACKTRACE_FILTER is not set
+CONFIG_DEBUG_MUTEXES=y
+CONFIG_DEBUG_RT_MUTEXES=y
+CONFIG_DEBUG_LOCK_ALLOC=y
+CONFIG_PROVE_LOCKING=y
+CONFIG_DEBUG_VM=y
+CONFIG_DEBUG_SPINLOCK=y
+
+CONFIG_FAULT_INJECTION=y
+CONFIG_FAILSLAB=y
+CONFIG_FAIL_PAGE_ALLOC=y
+CONFIG_FAIL_MAKE_REQUEST=y
+CONFIG_FAULT_INJECTION_DEBUG_FS=y
+CONFIG_FAULT_INJECTION_STACKTRACE_FILTER=y
+# CONFIG_FAIL_IO_TIMEOUT is not set
 
-# CONFIG_SLUB_DEBUG_ON is not set
+CONFIG_SLUB_DEBUG_ON=y
 
-# CONFIG_LOCK_STAT is not set
+CONFIG_LOCK_STAT=y
 
-# CONFIG_DEBUG_STACK_USAGE is not set
+CONFIG_DEBUG_STACK_USAGE=y
 
 # CONFIG_ACPI_DEBUG is not set
 
-# CONFIG_DEBUG_SG is not set
+CONFIG_DEBUG_SG=y
 
-# CONFIG_DEBUG_PAGEALLOC is not set
+CONFIG_DEBUG_PAGEALLOC=y
 
-# CONFIG_DEBUG_WRITECOUNT is not set
-# CONFIG_DEBUG_OBJECTS is not set
+CONFIG_DEBUG_WRITECOUNT=y
+CONFIG_DEBUG_OBJECTS=y
 # CONFIG_DEBUG_OBJECTS_SELFTEST is not set
-# CONFIG_DEBUG_OBJECTS_FREE is not set
-# CONFIG_DEBUG_OBJECTS_TIMERS is not set
+CONFIG_DEBUG_OBJECTS_FREE=y
+CONFIG_DEBUG_OBJECTS_TIMERS=y
 
-# CONFIG_X86_PTDUMP is not set
+CONFIG_X86_PTDUMP=y
 
-# CONFIG_CAN_DEBUG_DEVICES is not set
+CONFIG_CAN_DEBUG_DEVICES=y
 
-# CONFIG_MODULE_FORCE_UNLOAD is not set
+CONFIG_MODULE_FORCE_UNLOAD=y
 
-# CONFIG_SYSCTL_SYSCALL_CHECK is not set
+CONFIG_SYSCTL_SYSCALL_CHECK=y


Index: config-powerpc-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/config-powerpc-generic,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- config-powerpc-generic	8 Oct 2008 19:26:22 -0000	1.26
+++ config-powerpc-generic	12 Jan 2009 19:51:27 -0000	1.27
@@ -253,3 +253,27 @@
 CONFIG_SERIO_XILINX_XPS_PS2=m
 
 # CONFIG_PPC_SMLPAR is not set
+
+CONFIG_MGCOGE=y
+CONFIG_GEF_SBC610=y
+CONFIG_QUICC_ENGINE=y
+CONFIG_QE_GPIO=y
+CONFIG_MPC8xxx_GPIO=y
+
+CONFIG_IDE_GD=m
+CONFIG_IDE_GD_ATA=y
+CONFIG_IDE_GD_ATAPI=y
+
+CONFIG_MCU_MPC8349EMITX=m
+
+CONFIG_GPIO_XILINX=y
+
+CONFIG_UCB1400_CORE=m
+
+CONFIG_PMIC_DA903X=y
+CONFIG_BACKLIGHT_DA903X=m
+CONFIG_LEDS_DA903X=m
+
+CONFIG_MSI_BITMAP_SELFTEST=y
+
+CONFIG_RELOCATABLE=y


Index: config-rhel-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/config-rhel-generic,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- config-rhel-generic	5 Nov 2008 20:46:16 -0000	1.15
+++ config-rhel-generic	12 Jan 2009 19:51:27 -0000	1.16
@@ -50,6 +50,8 @@
 # CONFIG_DEPCA is not set
 # CONFIG_ATP is not set
 
+# CONFIG_TR is not set
+
 # CONFIG_GAMEPORT is not set
 
 # CONFIG_SND_AD1816A is not set
@@ -91,6 +93,11 @@
 
 # CONFIG_BLK_DEV_UMEM is not set
 # CONFIG_BLK_DEV_NBD is not set
+# CONFIG_BLK_DEV_DAC960 is not set
+
+# CONFIG_PARIDE is not set
+
+# CONFIG_I2O is not set
 
 # CONFIG_MWAVE is not set
 
@@ -185,7 +192,6 @@
 # CONFIG_FB_3DFX_ACCEL is not set
 # CONFIG_FB_TRIDENT_ACCEL is not set
 
-# CONFIG_AUTOFS_FS is not set
 # CONFIG_JFS_FS is not set
 # CONFIG_NCP_FS is not set
 # CONFIG_CODA_FS is not set


Index: config-s390x
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/config-s390x,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- config-s390x	1 Aug 2008 19:55:06 -0000	1.9
+++ config-s390x	12 Jan 2009 19:51:27 -0000	1.10
@@ -216,3 +216,5 @@
 # drivers/isdn/hardware/mISDN/hfcmulti.c:5255:2: error: #error "not running on big endian machines now"
 # CONFIG_MISDN_HFCMULTI is not set
 
+# CONFIG_CRASH is not set
+


Index: config-sparc64-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/config-sparc64-generic,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- config-sparc64-generic	28 Jul 2008 08:37:10 -0000	1.20
+++ config-sparc64-generic	12 Jan 2009 19:51:27 -0000	1.21
@@ -195,3 +195,8 @@
 
 # drivers/isdn/hardware/mISDN/hfcmulti.c:5255:2: error: #error "not running on big endian machines now"
 # CONFIG_MISDN_HFCMULTI is not set
+
+CONFIG_US3_MC=y
+CONFIG_SENSORS_ULTRA45=m
+CONFIG_LEDS_SUNFIRE=m
+CONFIG_TADPOLE_TS102_UCTRL=m


Index: config-x86-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/config-x86-generic,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- config-x86-generic	25 Nov 2008 15:20:28 -0000	1.55
+++ config-x86-generic	12 Jan 2009 19:51:27 -0000	1.56
@@ -76,7 +76,6 @@
 CONFIG_MTRR=y
 CONFIG_X86_PAT=y
 CONFIG_X86_PM_TIMER=y
-CONFIG_X86_RESERVE_LOW_64K=y
 
 CONFIG_EFI=y
 CONFIG_EFI_VARS=y
@@ -412,3 +411,17 @@
 CONFIG_HP_ILO=m
 
 CONFIG_BACKLIGHT_MBP_NVIDIA=m
+
+CONFIG_OPROFILE_IBS=y
+CONFIG_MICROCODE_INTEL=y
+CONFIG_MICROCODE_AMD=y
+
+# CONFIG_X86_CHECK_BIOS_CORRUPTION is not set
+CONFIG_X86_RESERVE_LOW_64K=y
+
+# CONFIG_CMDLINE_BOOL is not set
+
+CONFIG_PANASONIC_LAPTOP=m
+
+CONFIG_XEN_DEBUG_FS=y
+CONFIG_X86_PTRACE_BTS=y


Index: config-x86_64-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/config-x86_64-generic,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- config-x86_64-generic	12 Jan 2009 03:29:30 -0000	1.54
+++ config-x86_64-generic	12 Jan 2009 19:51:27 -0000	1.55
@@ -10,7 +10,7 @@
 CONFIG_K8_NUMA=y
 CONFIG_X86_64_ACPI_NUMA=y
 # CONFIG_NUMA_EMU is not set
-CONFIG_NR_CPUS=64
+CONFIG_NR_CPUS=512
 CONFIG_X86_POWERNOW_K8=m
 CONFIG_X86_POWERNOW_K8_ACPI=y
 CONFIG_X86_P4_CLOCKMOD=m 
@@ -293,7 +293,6 @@
 # FIXME: These should be 32bit only
 # CONFIG_FB_N411 is not set
 CONFIG_STRICT_DEVMEM=y
-CONFIG_X86_RESERVE_LOW_64K=y
 
 CONFIG_DIRECT_GBPAGES=y
 
@@ -310,3 +309,20 @@
 CONFIG_X86_MPPARSE=y
 
 CONFIG_BACKLIGHT_MBP_NVIDIA=m
+
+CONFIG_OPROFILE_IBS=y
+CONFIG_MICROCODE_INTEL=y
+CONFIG_MICROCODE_AMD=y
+
+# CONFIG_X86_CHECK_BIOS_CORRUPTION is not set
+CONFIG_X86_RESERVE_LOW_64K=y
+
+# CONFIG_CMDLINE_BOOL is not set
+
+CONFIG_PANASONIC_LAPTOP=m
+
+CONFIG_XEN_DEBUG_FS=y
+CONFIG_X86_PTRACE_BTS=y
+
+CONFIG_I7300_IDLE=m
+CONFIG_INTR_REMAP=y

drm-modesetting-radeon.patch:

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.68 -r 1.69 drm-modesetting-radeon.patch
Index: drm-modesetting-radeon.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/drm-modesetting-radeon.patch,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- drm-modesetting-radeon.patch	18 Dec 2008 05:22:42 -0000	1.68
+++ drm-modesetting-radeon.patch	12 Jan 2009 19:51:27 -0000	1.69
@@ -1,36 +1,55 @@
-commit 55c0a3f1d3693cb5c3b65f37d4bb6e8a3c025460
+commit 3ef2b914f9667c70a9711fa31ff95d639ccc8e2e
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Thu Dec 18 23:01:12 2008 +1000
 
     drm: don't set cached bits on pages from uncached allocator.
     
     This should make AGP no corrupt itself to all buggery
+    (cherry picked from commit 55c0a3f1d3693cb5c3b65f37d4bb6e8a3c025460)
 
-commit 6869ac2062aa32d24a13b66630e733864cf8cdda
+commit be5f7447cc492545e225170be38e5e65d7de37d9
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Tue Dec 2 16:38:04 2008 +1000
+
+    drop old CS
+
+commit 91bfed87127c1bd17098803184e43783d55f35e5
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Mon Dec 1 15:09:27 2008 +1000
+
+    radeon: update with latest CS bits
+
+commit a7f6175e3610651b1f84a1b8aa1f61a9a4f3bdb6
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Wed Dec 17 06:56:36 2008 +1000
+
+    fixups post rebase
+
+commit cd29f247278a5949956adbfb75229dc9bad19f8e
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Thu Dec 11 01:35:09 2008 +1000
 
     radeon: fix agp mode when kms isn't enabled
 
-commit 2dd4a9470e5f4c1452d8e28ef9d4429d4fb5d48c
+commit 0d0f9c970263750a68131b5f88735c59f605c69f
 Author: Dave Airlie <airlied at ppcg5.localdomain>
 Date:   Wed Dec 3 17:22:07 2008 +1100
 
     radeon: add support for accessing disabled ROMs.
 
-commit 358ef7eede3e9ee2f7713bcaec25b93df14251b8
+commit 840d823d6f33c1852b92791093b23b1ce7af25ac
 Author: Dave Airlie <airlied at ppcg5.localdomain>
 Date:   Wed Dec 3 17:19:02 2008 +1100
 
     radeon: make cail do pll read/write via actual PLL functions
 
-commit e4f4d44b41882503ec21252836049bbd24549415
+commit 049d865d47cf229234cd7dd0ef8927a41a142b0e
 Author: Dave Airlie <airlied at ppcg5.localdomain>
 Date:   Wed Dec 3 16:36:00 2008 +1100
 
     radeon: atom fixes for endianness
 
-commit 09daed1f3e4942496793c3411aee485cb97eb694
+commit df08dc63cbbd19a8ea0659bdc379147a59201b4c
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Wed Dec 3 20:28:05 2008 +1000
 
@@ -40,7 +59,7 @@
     Limit the AGP aperture to the GART size, and init the registers
     in the right place
 
-commit 4a7eb33e9c27c28129c07123c0878e3e603c937e
+commit 79d6ac96108c29dbce90ce605b01dd6b71673092
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Tue Dec 2 12:49:17 2008 +1000
 
@@ -49,7 +68,7 @@
     1. Proper PCIE fallback on PCIE cards.
     2. Setup agp base + location regs properly
 
-commit b7de4d48a3e45df7d4e0401bc7987089ce2165b2
+commit e6a1353d11f485c99371e0b89c669da0c23e8af4
 Author: Michal Schmidt <mschmidt at redhat.com>
 Date:   Tue Dec 2 08:06:59 2008 +1000
 
@@ -57,21 +76,13 @@
     
     fedora bz 473895
 
-commit 1ff222030a971f3d1274dfcb3742a35996ccc6c8
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Fri Nov 28 09:19:47 2008 +1000
-
-    drm: cleanup exit path mess using a linked list.
-    
-    Just keep a list of devices per driver and cleanup on exit
-
-commit 1f745bdfe55455d707625ad5a28b834db636b679
+commit d879f36aca29ece7c3bfada452266e82df3f2392
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Thu Nov 27 17:14:40 2008 +1000
 
     radeon: post any GPUs that aren't posted
 
-commit 5a7e1ee57ec37fb479cb3f7dc428bdb8cb9099ad
+commit d04c4750aba2b0bd306ab36a0002f2609ed6cc9a
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Mon Nov 24 15:18:31 2008 +1000
 
@@ -82,13 +93,13 @@
     
     Default to 512MB gart.
 
-commit b2628a4d2aeac92530f83c3f425b7593076fb4c8
+commit ae7c33fa98bf4921292f6dffb6e60dd2b85cddfa
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Mon Nov 24 15:17:49 2008 +1000
 
     radeon: add some missing feature checks for modesetting
 
-commit 4f9b537f20809a5e47e8efe49e440afd4dcab4e3
+commit 54fd140cc8c63d5c65fbcdf21259025fd8a431e8
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Mon Nov 24 11:41:06 2008 +1100
 
@@ -97,49 +108,43 @@
     we really need to read back to make sure the invalidate has happened
     before continuing along happily in life.
 
-commit 8e9fc797117820610d5c414f9ad016fd022cde2e
+commit 5e418cef1bfca7e8e0821d6e44a1e1a78e015b17
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Sun Nov 23 19:19:02 2008 +1000
 
     drm: we have discardable now so don't do special cases
 
-commit 4c3d55f855d5f7931b6493b4eb433cfca169d8e4
+commit 87e2de7aef77b96a8be3532358b6ceb9540d622a
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Fri Nov 21 14:52:25 2008 +1000
 
     atom: fix bug in parser for MC reads
 
-commit e8ebeedbc953aec25e546d765dc2271b621ea074
+commit 52eccc11083a1c0636337520187a4e2cf9bfe989
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Mon Nov 17 18:14:28 2008 +1000
 
     radeon: turn of VRAM zeroing by default for now - needs work
 
-commit e6f04b8b47432de09575dd7de51b47553905d96c
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Mon Nov 17 16:59:00 2008 +1000
-
-    drm: make 800x600 be standard not 640x480
-
-commit bf63101f05e0a692f16d1bb0ed4f0e2e36c88178
+commit 7a32efbc88ed749c0cd44a95bb4888cd2bc806c0
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Mon Nov 17 09:03:36 2008 +1000
 
     radeon: fix return value for no relocs
 
-commit 847ae8403cfc09dc422766a5773fe8a26acc6ed5
+commit 5a47b4d8a97949288ebe8f2f3437637e405d1db8
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Mon Nov 17 09:03:01 2008 +1000
 
     ttm: add discard for VRAM buffers
 
-commit 2f4b5f642fd33de9ac31a78f168246b6790e4c8c
+commit 160794bbbb90088a86acc96ca5268bc46255582d
 Author: Dave Airlie <airlied at dhcp-1-203.bne.redhat.com>
 Date:   Fri Nov 14 15:52:32 2008 +1000
 
     drm: fix the exit path of the bo unlocking
 
-commit ca31807fbcfe5bef921d75e385d6b3e12a8c866b
+commit 1ea46b5e3dc7e75afe1936594e0e085c9dc8665d
 Author: Dave Airlie <airlied at dhcp-1-203.bne.redhat.com>
 Date:   Fri Nov 14 15:51:44 2008 +1000
 
@@ -147,55 +152,49 @@
     
     Fixup failure paths and make EAGAIN work
 
-commit 1e587fd7c62ccb6a26fea1de898974cbcf2b2908
+commit e16a76e302eba9b53858457054059985ec0ef9df
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Thu Nov 13 17:22:26 2008 +1100
 
     radeon: fix some issues since last rebase
 
-commit 604e11f3e32bedbe0db22c03aa12757818ca5174
+commit e9ab870ce368dab7ed9e859c157074913353b589
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Wed Nov 12 09:01:14 2008 +1000
[...13843 lines suppressed...]
- /* SAREA area needs to be at least a page */
- #if defined(__alpha__)
--#define SAREA_MAX                       0x2000
-+#define SAREA_MAX                       0x2000UL
- #elif defined(__ia64__)
--#define SAREA_MAX                       0x10000	/* 64kB */
-+#define SAREA_MAX                       0x10000UL	/* 64kB */
- #else
- /* Intel 830M driver needs at least 8k SAREA */
--#define SAREA_MAX                       0x2000
-+#define SAREA_MAX                       0x2000UL
- #endif
- 
- /** Maximum number of drawables in the SAREA */
 diff --git a/include/drm/i915_drm.h b/include/drm/i915_drm.h
-index 152b34d..13c91fc 100644
+index b3bcf72..181d9de 100644
 --- a/include/drm/i915_drm.h
 +++ b/include/drm/i915_drm.h
-@@ -63,7 +63,7 @@ typedef struct _drm_i915_init {
- 	unsigned int chipset;
- } drm_i915_init_t;
- 
--typedef struct _drm_i915_sarea {
-+typedef struct drm_i915_sarea {
- 	struct drm_tex_region texList[I915_NR_TEX_REGIONS + 1];
- 	int last_upload;	/* last time texture was uploaded */
- 	int last_enqueue;	/* last time a buffer was enqueued */
-@@ -105,14 +105,26 @@ typedef struct _drm_i915_sarea {
- 	unsigned int rotated_tiled;
- 	unsigned int rotated2_tiled;
- 
--	int pipeA_x;
--	int pipeA_y;
--	int pipeA_w;
--	int pipeA_h;
--	int pipeB_x;
--	int pipeB_y;
--	int pipeB_w;
--	int pipeB_h;
-+	int planeA_x;
-+	int planeA_y;
-+	int planeA_w;
-+	int planeA_h;
-+	int planeB_x;
-+	int planeB_y;
-+	int planeB_w;
-+	int planeB_h;
-+
-+	/* triple buffering - not in kernel */
-+	drm_handle_t third_handle;
-+	int third_offset;
-+	int third_size;
-+	unsigned int third_tiled;
-+
-+	/* buffer object handles for static buffers */
-+	unsigned int front_bo_handle;
-+	unsigned int back_bo_handle;
-+	unsigned int third_bo_handle;
-+	unsigned int depth_bo_handle;
- } drm_i915_sarea_t;
- 
- /* Flags for perf_boxes
-@@ -163,7 +175,7 @@ typedef struct _drm_i915_sarea {
+@@ -187,7 +187,7 @@ typedef struct _drm_i915_sarea {
  
  #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)
@@ -45226,16 +36034,7 @@
  #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)
-@@ -177,6 +189,8 @@ 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)
-+#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)
- #define DRM_IOCTL_I915_GEM_PIN		DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_GEM_PIN, struct drm_i915_gem_pin)
- #define DRM_IOCTL_I915_GEM_UNPIN	DRM_IOW(DRM_COMMAND_BASE + DRM_I915_GEM_UNPIN, struct drm_i915_gem_unpin)
- #define DRM_IOCTL_I915_GEM_BUSY		DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_GEM_BUSY, struct drm_i915_gem_busy)
-@@ -193,10 +207,22 @@ typedef struct _drm_i915_sarea {
+@@ -220,6 +220,18 @@ typedef struct _drm_i915_sarea {
  #define DRM_IOCTL_I915_GEM_GET_TILING	DRM_IOWR (DRM_COMMAND_BASE + DRM_I915_GEM_GET_TILING, struct drm_i915_gem_get_tiling)
  #define DRM_IOCTL_I915_GEM_GET_APERTURE	DRM_IOR  (DRM_COMMAND_BASE + DRM_I915_GEM_GET_APERTURE, struct drm_i915_gem_get_aperture)
  
@@ -45254,13 +36053,8 @@
  /* Allow drivers to submit batchbuffers directly to hardware, relying
   * on the security mechanisms provided by hardware.
   */
--typedef struct _drm_i915_batchbuffer {
-+typedef struct drm_i915_batchbuffer {
- 	int start;		/* agp offset */
- 	int used;		/* nr bytes in use */
- 	int DR1;		/* hw flags for GFX_OP_DRAWRECT_INFO */
 diff --git a/include/drm/radeon_drm.h b/include/drm/radeon_drm.h
-index 73ff51f..770f6f0 100644
+index 73ff51f..e4f5897 100644
 --- a/include/drm/radeon_drm.h
 +++ b/include/drm/radeon_drm.h
 @@ -453,6 +453,15 @@ typedef struct {
@@ -45279,7 +36073,7 @@
  } drm_radeon_sarea_t;
  
  /* WARNING: If you change any of these defines, make sure to change the
-@@ -493,6 +502,19 @@ typedef struct {
+@@ -493,6 +502,18 @@ typedef struct {
  #define DRM_RADEON_SURF_ALLOC 0x1a
  #define DRM_RADEON_SURF_FREE  0x1b
  
@@ -45293,13 +36087,12 @@
 +#define DRM_RADEON_GEM_SET_DOMAIN 0x23
 +#define DRM_RADEON_GEM_WAIT_RENDERING 0x24
 +
-+#define DRM_RADEON_CS           0x25
-+#define DRM_RADEON_CS2       0x26
++#define DRM_RADEON_CS       0x26
 +
  #define DRM_IOCTL_RADEON_CP_INIT    DRM_IOW( DRM_COMMAND_BASE + DRM_RADEON_CP_INIT, drm_radeon_init_t)
  #define DRM_IOCTL_RADEON_CP_START   DRM_IO(  DRM_COMMAND_BASE + DRM_RADEON_CP_START)
  #define DRM_IOCTL_RADEON_CP_STOP    DRM_IOW( DRM_COMMAND_BASE + DRM_RADEON_CP_STOP, drm_radeon_cp_stop_t)
-@@ -521,6 +543,19 @@ typedef struct {
+@@ -521,6 +542,18 @@ typedef struct {
  #define DRM_IOCTL_RADEON_SURF_ALLOC DRM_IOW( DRM_COMMAND_BASE + DRM_RADEON_SURF_ALLOC, drm_radeon_surface_alloc_t)
  #define DRM_IOCTL_RADEON_SURF_FREE  DRM_IOW( DRM_COMMAND_BASE + DRM_RADEON_SURF_FREE, drm_radeon_surface_free_t)
  
@@ -45313,13 +36106,12 @@
 +#define DRM_IOCTL_RADEON_GEM_SET_DOMAIN  DRM_IOWR(DRM_COMMAND_BASE + DRM_RADEON_GEM_SET_DOMAIN, struct drm_radeon_gem_set_domain)
 +#define DRM_IOCTL_RADEON_GEM_WAIT_RENDERING DRM_IOW(DRM_COMMAND_BASE + DRM_RADEON_GEM_WAIT_RENDERING, struct drm_radeon_gem_wait_rendering) 
 +#define DRM_IOCTL_RADEON_CS DRM_IOWR(DRM_COMMAND_BASE + DRM_RADEON_CS, struct drm_radeon_cs)
-+#define DRM_IOCTL_RADEON_CS2 DRM_IOWR(DRM_COMMAND_BASE + DRM_RADEON_CS2, struct drm_radeon_cs2)
 +
 +
  typedef struct drm_radeon_init {
  	enum {
  		RADEON_INIT_CP = 0x01,
-@@ -677,6 +712,7 @@ typedef struct drm_radeon_indirect {
+@@ -677,6 +710,7 @@ typedef struct drm_radeon_indirect {
  #define RADEON_PARAM_VBLANK_CRTC           13   /* VBLANK CRTC */
  #define RADEON_PARAM_FB_LOCATION           14   /* FB location */
  #define RADEON_PARAM_NUM_GB_PIPES          15   /* num GB pipes */
@@ -45327,7 +36119,7 @@
  
  typedef struct drm_radeon_getparam {
  	int param;
-@@ -731,6 +767,7 @@ typedef struct drm_radeon_setparam {
+@@ -731,6 +765,7 @@ typedef struct drm_radeon_setparam {
  #define RADEON_SETPARAM_NEW_MEMMAP 4		/* Use new memory map */
  #define RADEON_SETPARAM_PCIGART_TABLE_SIZE 5    /* PCI GART Table Size */
  #define RADEON_SETPARAM_VBLANK_CRTC 6           /* VBLANK CRTC */
@@ -45335,7 +36127,7 @@
  /* 1.14: Clients can allocate/free a surface
   */
  typedef struct drm_radeon_surface_alloc {
-@@ -746,4 +783,114 @@ typedef struct drm_radeon_surface_free {
+@@ -746,4 +781,106 @@ typedef struct drm_radeon_surface_free {
  #define	DRM_RADEON_VBLANK_CRTC1		1
  #define	DRM_RADEON_VBLANK_CRTC2		2
  
@@ -45423,14 +36215,6 @@
 +
 +/* New interface which obsolete all previous interface.
 + */
-+
-+
-+struct drm_radeon_cs {
-+	uint32_t            dwords;
-+	uint32_t            cs_id;
-+	uint64_t            packets;
-+};
-+
 +#define RADEON_CHUNK_ID_RELOCS 0x01
 +#define RADEON_CHUNK_ID_IB     0x02
 +#define RADEON_CHUNK_ID_OLD 0xff
@@ -45441,7 +36225,7 @@
 +	uint64_t chunk_data;
 +};
 +
-+struct drm_radeon_cs2 {
++struct drm_radeon_cs {
 +	uint32_t	num_chunks;
 +	uint32_t        cs_id;
 +	uint64_t	chunks; /* this points to uint64_t * which point to
@@ -45450,16 +36234,3 @@
 +
 +
  #endif
-diff --git a/include/linux/console.h b/include/linux/console.h
-index 248e6e3..a67a90c 100644
---- a/include/linux/console.h
-+++ b/include/linux/console.h
-@@ -153,4 +153,8 @@ void vcs_remove_sysfs(struct tty_struct *tty);
- #define VESA_HSYNC_SUSPEND      2
- #define VESA_POWERDOWN          3
- 
-+#ifdef CONFIG_VGA_CONSOLE
-+extern bool vgacon_text_force(void);
-+#endif
-+
- #endif /* _LINUX_CONSOLE_H */

drm-next.patch:

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.10 -r 1.11 drm-next.patch
Index: drm-next.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/drm-next.patch,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- drm-next.patch	1 Dec 2008 01:14:24 -0000	1.10
+++ drm-next.patch	12 Jan 2009 19:51:28 -0000	1.11
@@ -1,8838 +1,6773 @@
-commit 1d44bed6f4ddd05022eeeb7e3bd4125bf1de22b4
-Author: Peng Li <peng.li at intel.com>
-Date:   Tue Nov 18 12:39:02 2008 +0800
-
-    drm/i915: Save/restore HWS_PGA on suspend/resume
-    
-    It fixes suspend/resume failure of xf86-video-intel dri2
-    branch. As dri2 branch doesn't call I830DRIResume() to restore
-    hardware status page anymore, we need to preserve
-    this register across suspend/resume.
-    
-    Signed-off-by: Peng Li <peng.li at intel.com>
-    Signed-off-by: Eric Anholt <eric at anholt.net>
-    Signed-off-by: Dave Airlie <airlied at redhat.com>
-    (cherry picked from commit 461cba2d294fe83297edf8a6556912812903dce1)
-
-commit a538ff2ea6684d60c8ddb1c59991702c4d923ef6
-Author: Keith Packard <keithp at keithp.com>
-Date:   Tue Nov 18 09:30:25 2008 -0800
-
-    drm: move drm vblank initialization/cleanup to driver load/unload
-    
-    drm vblank initialization keeps track of the changes in driver-supplied
-    frame counts across vt switch and mode setting, but only if you let it by
-    not tearing down the drm vblank structure.
-    
-    Signed-off-by: Keith Packard <keithp at keithp.com>
-    Signed-off-by: Dave Airlie <airlied at redhat.com>
-    (cherry picked from commit 52440211dcdc52c0b757f8b34d122e11b12cdd50)
-
-commit c90540c605e1ae1755c6a25c3428503939e09e2e
-Author: Keith Packard <keithp at keithp.com>
-Date:   Thu Nov 20 23:14:48 2008 -0800
-
-    drm/i915: execbuffer pins objects, no need to ensure they're still in the GTT
-    
-    Before we had the notion of pinning objects, we had a kludge around to make
-    sure all of the objects were still resident in the GTT before we committed
-    to executing a batch buffer. We don't need this any longer, and it sticks an
-    error return in the middle of object domain computations that must be
-    associated with a subsequent flush/invalidate emmission into the ring.
-    
-    Signed-off-by: Keith Packard <keithp at keithp.com>
-    Signed-off-by: Eric Anholt <eric at anholt.net>
-    Signed-off-by: Dave Airlie <airlied at redhat.com>
-    (cherry picked from commit 6133047aa64d2fd5b3b79dff74f696ded45615b2)
-
-commit 8807db3522abff3fc9bb6f1e1e77877293fd4d7c
-Author: Keith Packard <keithp at keithp.com>
-Date:   Wed Nov 19 14:03:05 2008 -0800
-
-    drm/i915: Always read pipestat in irq_handler
-    
-    Because we write pipestat before iir, it's possible that a pipestat
-    interrupt will occur between the pipestat write and the iir write. This
-    leaves pipestat with an interrupt status not visible in iir. This may cause
-    an interrupt flood as we never clear the pipestat event.
-    
-    Signed-off-by: Keith Packard <keithp at keithp.com>
-    Signed-off-by: Eric Anholt <eric at anholt.net>
-    Signed-off-by: Dave Airlie <airlied at redhat.com>
-    (cherry picked from commit 05eff845a28499762075d3a72e238a31f4d2407c)
-
-commit 1b2b03fc17b01658f142c77473b80d2b239050c5
-Author: Keith Packard <keithp at keithp.com>
-Date:   Thu Nov 20 22:54:54 2008 -0800
-
-    drm/i915: Subtract total pinned bytes from available aperture size
-    
-    The old code was wandering through the active list looking for pinned
-    buffers; there may be other pinned buffers around. Fortunately, we keep a
-    count of the total amount of pinned memory and can use that instead.
-    
-    Signed-off-by: Keith Packard <keithp at keithp.com>
-    Signed-off-by: Eric Anholt <eric at anholt.net>
-    Signed-off-by: Dave Airlie <airlied at redhat.com>
-    (cherry picked from commit 2678d9d6964b29ecd1975870c7a850242b29bc5c)
-
-commit 9cf12f18923a92772248792c7f0244947b5dad9d
-Author: Eric Anholt <eric at anholt.net>
-Date:   Thu Nov 13 15:00:55 2008 -0800
-
-    drm/i915: Avoid BUG_ONs on VT switch with a wedged chipset.
-    
-    Instead, just warn that bad things are happening and do our best to clean up
-    the mess without the GPU's help.
-    
-    Signed-off-by: Eric Anholt <eric at anholt.net>
-    Signed-off-by: Dave Airlie <airlied at redhat.com>
-    (cherry picked from commit 28dfe52a6e8a1495067c4331358700a170d0ee86)
-
-commit 44078e77a4901e91836b5f9f0fae28d8fac2a17d
-Author: Keith Packard <keithp at keithp.com>
-Date:   Fri Jun 20 00:08:06 2008 -0700
-
-    Export shmem_file_setup for DRM-GEM
-    
-    GEM needs to create shmem files to back buffer objects.  Though currently
-    creation of files for objects could have been driven from userland, the
-    modesetting work will require allocation of buffer objects before userland
-    is running, for boot-time message display.
-    
-    Signed-off-by: Eric Anholt <eric at anholt.net>
-    Cc: Nick Piggin <npiggin at suse.de>
-    Signed-off-by: Dave Airlie <airlied at redhat.com>
-    (cherry picked from commit 395e0ddc44005ced5e4fed9bfc2e4bdf63d37627)
-
-commit 79dd949af73e830f6929b0faf7f3eb409a481166
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Mon Nov 3 11:07:28 2008 +1000
-
-    intel: make GEM on 64-bit go lots faster rollup
-    
-    this patch rolls up a number of upstream patches to make GEM on x86-64
-    useable again.
-    
-    Signed-off-by: Dave Airlie <airlied at redhat.com>
-
-commit beb6264cb9eb4f78f9b2754d4a577330f09d108e
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Wed Nov 12 15:00:33 2008 +1000
-
-    i915: Add /proc debugging entry for reading out the HWS.
-    
-    Signed-off-by: Eric Anholt <eric at anholt.net>
-
-commit e94cd33277b4f95be8d0a19f3fe32e8daef9ce94
-Author: Eric Anholt <eric at anholt.net>
-Date:   Tue Nov 4 15:50:30 2008 -0800
-
-    i915: Remove IMR masking during interrupt handler, and restart it if needed.
-    
-    The IMR masking was a technique recommended for avoiding getting stuck with
-    no interrupts generated again in MSI mode.  It kept new IIR bits from getting
-    set between the IIR read and the IIR write, which would have otherwise
-    prevented an MSI from ever getting generated again.  However, this caused a
-    problem for vblank as the IMR mask would keep the pipe event interrupt from
-    getting reflected in IIR, even after the IMR mask was brought back down.
-    
-    Instead, just check the state of IIR after we ack the interrupts we're going
-    to handle, and restart if we didn't get IIR all the way to zero.
-    
-    Signed-off-by: Eric Anholt <eric at anholt.net>
-
-commit 3437c28f678abfa0e7ebe78176b268cbf0732e81
-Author: Keith Packard <keithp at keithp.com>
-Date:   Tue Nov 4 02:03:27 2008 -0800
-
-    i915: Manage PIPESTAT to control vblank interrupts instead of IMR.
-    
-    The pipestat fields affect reporting of all vblank-related interrupts, so we
-    have to reset them during the irq_handler, and while enabling vblank
-    interrupts.  Otherwise, if a pipe status field had been set to non-zero
-    before enabling reporting, we would never see an interrupt again.
-    
-    This patch adds i915_enable_pipestat and i915_disable_pipestat to abstract
-    out the steps needed to change the reported interrupts.
-    
-    Signed-off-by: Keith Packard <keithp at keithp.com>
-    Signed-off-by: Eric Anholt <eric at anholt.net>
-
-commit 72d34483fe6f50c57f984637fcd7e37e1265f202
-Author: Keith Packard <keithp at keithp.com>
-Date:   Sat Nov 8 11:44:14 2008 +1000
-
-    drm/i915: Move legacy breadcrumb out of the reserved status page area
-    
-    Addresses in the hardware status page below index 0x20 are reserved for use
-    by the hardware. The legacy breadcrumb was sitting at index 5. Move it to
-    index 0x21, and make sure everyone uses the defined value instead of
-    hard-coded constants.
-    
-    Signed-off-by: Keith Packard <keithp at keithp.com>
-    Signed-off-by: Dave Airlie <airlied at linux.ie>
-    (cherry picked from commit 0baf823a10bd4131f70e9712d1f02de3c247f1df)
-
-commit 491983276c934058e7bea557c1eecf6e58d29cd7
-Author: Dave Airlie <airlied at linux.ie>
-Date:   Tue Nov 11 18:02:12 2008 +1000
-
-    drm/i915: Filter pci devices based on PCI_CLASS_DISPLAY_VGA
-    
-    This fixes hangs on 855-class hardware by avoiding double attachment of the
-    driver due to the stub second head device having the same pci id as the real
-    device.
-    
-    Other DRM drivers probably want this treatment as well, but I'm applying it
-    just to this one for safety. But we should clean up the drm_pciids.h mess
-    now so that each driver has its own pci id list header in its own directory.
-    Lets do that in the next release.
-    
[...34745 lines suppressed...]
++	uint64_t value;
++	uint32_t prop_id;
++	uint32_t connector_id;
++};
++
++struct drm_mode_get_blob {
++	uint32_t blob_id;
++	uint32_t length;
++	uint64_t data;
++};
++
++struct drm_mode_fb_cmd {
++	uint32_t fb_id;
++	uint32_t width, height;
++	uint32_t pitch;
++	uint32_t bpp;
++	uint32_t depth;
++	/* driver specific handle */
++	uint32_t handle;
++};
++
++struct drm_mode_mode_cmd {
++	uint32_t connector_id;
++	struct drm_mode_modeinfo mode;
++};
++
++#define DRM_MODE_CURSOR_BO	(1<<0)
++#define DRM_MODE_CURSOR_MOVE	(1<<1)
++
++/*
++ * depending on the value in flags diffrent members are used.
++ *
++ * CURSOR_BO uses
++ *    crtc
++ *    width
++ *    height
++ *    handle - if 0 turns the cursor of
++ *
++ * CURSOR_MOVE uses
++ *    crtc
++ *    x
++ *    y
++ */
++struct drm_mode_cursor {
++	uint32_t flags;
++	uint32_t crtc_id;
++	int32_t x;
++	int32_t y;
++	uint32_t width;
++	uint32_t height;
++	/* driver specific handle */
++	uint32_t handle;
++};
++
++struct drm_mode_crtc_lut {
++	uint32_t crtc_id;
++	uint32_t gamma_size;
++
++	/* pointers to arrays */
++	uint64_t red;
++	uint64_t green;
++	uint64_t blue;
++};
++
++#endif
+diff --git a/include/drm/drm_sarea.h b/include/drm/drm_sarea.h
+index 4800373..ee5389d 100644
+--- a/include/drm/drm_sarea.h
++++ b/include/drm/drm_sarea.h
+@@ -36,12 +36,12 @@
+ 
+ /* SAREA area needs to be at least a page */
+ #if defined(__alpha__)
+-#define SAREA_MAX                       0x2000
++#define SAREA_MAX                       0x2000U
+ #elif defined(__ia64__)
+-#define SAREA_MAX                       0x10000	/* 64kB */
++#define SAREA_MAX                       0x10000U	/* 64kB */
+ #else
+ /* Intel 830M driver needs at least 8k SAREA */
+-#define SAREA_MAX                       0x2000
++#define SAREA_MAX                       0x2000U
+ #endif
  
- /**
-  * shmem_zero_setup - setup a shared anonymous mapping
-diff --git a/mm/tiny-shmem.c b/mm/tiny-shmem.c
-index 8d7a27a..3e67d57 100644
---- a/mm/tiny-shmem.c
-+++ b/mm/tiny-shmem.c
-@@ -95,6 +95,7 @@ put_dentry:
- put_memory:
- 	return ERR_PTR(error);
- }
-+EXPORT_SYMBOL_GPL(shmem_file_setup);
+ /** Maximum number of drawables in the SAREA */
+diff --git a/include/drm/i915_drm.h b/include/drm/i915_drm.h
+index 152b34d..b3bcf72 100644
+--- a/include/drm/i915_drm.h
++++ b/include/drm/i915_drm.h
+@@ -113,8 +113,31 @@ typedef struct _drm_i915_sarea {
+ 	int pipeB_y;
+ 	int pipeB_w;
+ 	int pipeB_h;
++
++	/* fill out some space for old userspace triple buffer */
++	drm_handle_t unused_handle;
++	uint32_t unused1, unused2, unused3;
++
++	/* buffer object handles for static buffers. May change
++	 * over the lifetime of the client.
++	 */
++	uint32_t front_bo_handle;
++	uint32_t back_bo_handle;
++	uint32_t unused_bo_handle;
++	uint32_t depth_bo_handle;
++
+ } drm_i915_sarea_t;
+ 
++/* due to userspace building against these headers we need some compat here */
++#define planeA_x pipeA_x
++#define planeA_y pipeA_y
++#define planeA_w pipeA_w
++#define planeA_h pipeA_h
++#define planeB_x pipeB_x
++#define planeB_y pipeB_y
++#define planeB_w pipeB_w
++#define planeB_h pipeB_h
++
+ /* Flags for perf_boxes
+  */
+ #define I915_BOX_RING_EMPTY    0x1
+@@ -160,6 +183,7 @@ typedef struct _drm_i915_sarea {
+ #define DRM_I915_GEM_SET_TILING	0x21
+ #define DRM_I915_GEM_GET_TILING	0x22
+ #define DRM_I915_GEM_GET_APERTURE 0x23
++#define DRM_I915_GEM_MMAP_GTT	0x24
  
- /**
-  * shmem_zero_setup - setup a shared anonymous mapping
+ #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)
+@@ -177,6 +201,8 @@ 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)
++#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)
+ #define DRM_IOCTL_I915_GEM_PIN		DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_GEM_PIN, struct drm_i915_gem_pin)
+ #define DRM_IOCTL_I915_GEM_UNPIN	DRM_IOW(DRM_COMMAND_BASE + DRM_I915_GEM_UNPIN, struct drm_i915_gem_unpin)
+ #define DRM_IOCTL_I915_GEM_BUSY		DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_GEM_BUSY, struct drm_i915_gem_busy)
+@@ -187,6 +213,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)
+@@ -196,7 +223,7 @@ typedef struct _drm_i915_sarea {
+ /* Allow drivers to submit batchbuffers directly to hardware, relying
+  * on the security mechanisms provided by hardware.
+  */
+-typedef struct _drm_i915_batchbuffer {
++typedef struct drm_i915_batchbuffer {
+ 	int start;		/* agp offset */
+ 	int used;		/* nr bytes in use */
+ 	int DR1;		/* hw flags for GFX_OP_DRAWRECT_INFO */
+@@ -382,6 +409,18 @@ 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;
++	/**
++	 * Fake offset to use for subsequent mmap call
++	 *
++	 * This is a fixed-size type for 32/64 compatibility.
++	 */
++	uint64_t offset;
++};
++
+ struct drm_i915_gem_set_domain {
+ 	/** Handle for the object */
+ 	uint32_t handle;
+diff --git a/include/linux/console.h b/include/linux/console.h
+index 248e6e3..a67a90c 100644
+--- a/include/linux/console.h
++++ b/include/linux/console.h
+@@ -153,4 +153,8 @@ void vcs_remove_sysfs(struct tty_struct *tty);
+ #define VESA_HSYNC_SUSPEND      2
+ #define VESA_POWERDOWN          3
+ 
++#ifdef CONFIG_VGA_CONSOLE
++extern bool vgacon_text_force(void);
++#endif
++
+ #endif /* _LINUX_CONSOLE_H */

git-cpufreq.patch:

Index: git-cpufreq.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/git-cpufreq.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- git-cpufreq.patch	6 Oct 2008 19:55:32 -0000	1.3
+++ git-cpufreq.patch	12 Jan 2009 19:51:28 -0000	1.4
@@ -1,830 +0,0 @@
-diff --git a/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c b/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c
-index dd097b8..c24c4a4 100644
---- a/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c
-+++ b/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c
-@@ -256,7 +256,8 @@ static u32 get_cur_val(const cpumask_t *mask)
-  * Only IA32_APERF/IA32_MPERF ratio is architecturally defined and
-  * no meaning should be associated with absolute values of these MSRs.
-  */
--static unsigned int get_measured_perf(unsigned int cpu)
-+static unsigned int get_measured_perf(struct cpufreq_policy *policy,
-+				      unsigned int cpu)
- {
- 	union {
- 		struct {
-@@ -326,7 +327,7 @@ static unsigned int get_measured_perf(unsigned int cpu)
- 
- #endif
- 
--	retval = per_cpu(drv_data, cpu)->max_freq * perf_percent / 100;
-+	retval = per_cpu(drv_data, policy->cpu)->max_freq * perf_percent / 100;
- 
- 	put_cpu();
- 	set_cpus_allowed_ptr(current, &saved_mask);
-@@ -785,7 +786,11 @@ static int __init acpi_cpufreq_init(void)
- 	if (ret)
- 		return ret;
- 
--	return cpufreq_register_driver(&acpi_cpufreq_driver);
-+	ret = cpufreq_register_driver(&acpi_cpufreq_driver);
-+	if (ret)
-+		free_percpu(acpi_perf_data);
-+
-+	return ret;
- }
- 
- static void __exit acpi_cpufreq_exit(void)
-@@ -795,8 +800,6 @@ static void __exit acpi_cpufreq_exit(void)
- 	cpufreq_unregister_driver(&acpi_cpufreq_driver);
- 
- 	free_percpu(acpi_perf_data);
--
--	return;
- }
- 
- module_param(acpi_pstate_strict, uint, 0644);
-diff --git a/arch/x86/kernel/cpu/cpufreq/elanfreq.c b/arch/x86/kernel/cpu/cpufreq/elanfreq.c
-index e4a4bf8..fe613c9 100644
---- a/arch/x86/kernel/cpu/cpufreq/elanfreq.c
-+++ b/arch/x86/kernel/cpu/cpufreq/elanfreq.c
-@@ -25,8 +25,8 @@
- #include <linux/cpufreq.h>
- 
- #include <asm/msr.h>
--#include <asm/timex.h>
--#include <asm/io.h>
-+#include <linux/timex.h>
-+#include <linux/io.h>
- 
- #define REG_CSCIR 0x22		/* Chip Setup and Control Index Register    */
- #define REG_CSCDR 0x23		/* Chip Setup and Control Data  Register    */
-@@ -82,7 +82,7 @@ static unsigned int elanfreq_get_cpu_frequency(unsigned int cpu)
- 	u8 clockspeed_reg;    /* Clock Speed Register */
- 
- 	local_irq_disable();
--	outb_p(0x80,REG_CSCIR);
-+	outb_p(0x80, REG_CSCIR);
- 	clockspeed_reg = inb_p(REG_CSCDR);
- 	local_irq_enable();
- 
-@@ -98,10 +98,10 @@ static unsigned int elanfreq_get_cpu_frequency(unsigned int cpu)
- 	}
- 
- 	/* 33 MHz is not 32 MHz... */
--	if ((clockspeed_reg & 0xE0)==0xA0)
-+	if ((clockspeed_reg & 0xE0) == 0xA0)
- 		return 33000;
- 
--	return ((1<<((clockspeed_reg & 0xE0) >> 5)) * 1000);
-+	return (1<<((clockspeed_reg & 0xE0) >> 5)) * 1000;
- }
- 
- 
-@@ -117,7 +117,7 @@ static unsigned int elanfreq_get_cpu_frequency(unsigned int cpu)
-  *	There is no return value.
-  */
- 
--static void elanfreq_set_cpu_state (unsigned int state)
-+static void elanfreq_set_cpu_state(unsigned int state)
- {
- 	struct cpufreq_freqs    freqs;
- 
-@@ -144,20 +144,20 @@ static void elanfreq_set_cpu_state (unsigned int state)
- 	 */
- 
- 	local_irq_disable();
--	outb_p(0x40,REG_CSCIR);		/* Disable hyperspeed mode */
--	outb_p(0x00,REG_CSCDR);
-+	outb_p(0x40, REG_CSCIR);		/* Disable hyperspeed mode */
-+	outb_p(0x00, REG_CSCDR);
- 	local_irq_enable();		/* wait till internal pipelines and */
- 	udelay(1000);			/* buffers have cleaned up          */
- 
- 	local_irq_disable();
- 
- 	/* now, set the CPU clock speed register (0x80) */
--	outb_p(0x80,REG_CSCIR);
--	outb_p(elan_multiplier[state].val80h,REG_CSCDR);
-+	outb_p(0x80, REG_CSCIR);
-+	outb_p(elan_multiplier[state].val80h, REG_CSCDR);
- 
- 	/* now, the hyperspeed bit in PMU Force Mode Register (0x40) */
--	outb_p(0x40,REG_CSCIR);
--	outb_p(elan_multiplier[state].val40h,REG_CSCDR);
-+	outb_p(0x40, REG_CSCIR);
-+	outb_p(elan_multiplier[state].val40h, REG_CSCDR);
- 	udelay(10000);
- 	local_irq_enable();
- 
-@@ -173,12 +173,12 @@ static void elanfreq_set_cpu_state (unsigned int state)
-  *	for the hardware supported by the driver.
-  */
- 
--static int elanfreq_verify (struct cpufreq_policy *policy)
-+static int elanfreq_verify(struct cpufreq_policy *policy)
- {
- 	return cpufreq_frequency_table_verify(policy, &elanfreq_table[0]);
- }
- 
--static int elanfreq_target (struct cpufreq_policy *policy,
-+static int elanfreq_target(struct cpufreq_policy *policy,
- 			    unsigned int target_freq,
- 			    unsigned int relation)
- {
-@@ -205,7 +205,7 @@ static int elanfreq_cpu_init(struct cpufreq_policy *policy)
- 
- 	/* capability check */
- 	if ((c->x86_vendor != X86_VENDOR_AMD) ||
--	    (c->x86 != 4) || (c->x86_model!=10))
-+	    (c->x86 != 4) || (c->x86_model != 10))
- 		return -ENODEV;
- 
- 	/* max freq */
-@@ -213,7 +213,7 @@ static int elanfreq_cpu_init(struct cpufreq_policy *policy)
- 		max_freq = elanfreq_get_cpu_frequency(0);
- 
- 	/* table init */
--	for (i=0; (elanfreq_table[i].frequency != CPUFREQ_TABLE_END); i++) {
-+	for (i = 0; (elanfreq_table[i].frequency != CPUFREQ_TABLE_END); i++) {
- 		if (elanfreq_table[i].frequency > max_freq)
- 			elanfreq_table[i].frequency = CPUFREQ_ENTRY_INVALID;
- 	}
-@@ -224,7 +224,7 @@ static int elanfreq_cpu_init(struct cpufreq_policy *policy)
- 
- 	result = cpufreq_frequency_table_cpuinfo(policy, elanfreq_table);
- 	if (result)
--		return (result);
-+		return result;
- 
- 	cpufreq_frequency_table_get_attr(elanfreq_table, policy->cpu);
- 	return 0;
-@@ -260,7 +260,7 @@ __setup("elanfreq=", elanfreq_setup);
- #endif
- 
- 
--static struct freq_attr* elanfreq_attr[] = {
-+static struct freq_attr *elanfreq_attr[] = {
- 	&cpufreq_freq_attr_scaling_available_freqs,
- 	NULL,
- };
-@@ -284,9 +284,9 @@ static int __init elanfreq_init(void)
- 
- 	/* Test if we have the right hardware */
- 	if ((c->x86_vendor != X86_VENDOR_AMD) ||
--		(c->x86 != 4) || (c->x86_model!=10)) {
-+		(c->x86 != 4) || (c->x86_model != 10)) {
- 		printk(KERN_INFO "elanfreq: error: no Elan processor found!\n");
--                return -ENODEV;
-+		return -ENODEV;
- 	}
- 	return cpufreq_register_driver(&elanfreq_driver);
- }
-@@ -298,7 +298,7 @@ static void __exit elanfreq_exit(void)
- }
- 
- 
--module_param (max_freq, int, 0444);
-+module_param(max_freq, int, 0444);
- 
- MODULE_LICENSE("GPL");
- MODULE_AUTHOR("Robert Schwebel <r.schwebel at pengutronix.de>, Sven Geggus <sven at geggus.net>");
-diff --git a/arch/x86/kernel/cpu/cpufreq/powernow-k6.c b/arch/x86/kernel/cpu/cpufreq/powernow-k6.c
-index eb9b62b..b5ced80 100644
---- a/arch/x86/kernel/cpu/cpufreq/powernow-k6.c
-+++ b/arch/x86/kernel/cpu/cpufreq/powernow-k6.c
-@@ -15,12 +15,11 @@
- #include <linux/slab.h>
- 
- #include <asm/msr.h>
--#include <asm/timex.h>
--#include <asm/io.h>
-+#include <linux/timex.h>
-+#include <linux/io.h>
- 
--
--#define POWERNOW_IOPORT 0xfff0         /* it doesn't matter where, as long
--					  as it is unused */
-+#define POWERNOW_IOPORT 0xfff0          /* it doesn't matter where, as long
-+					   as it is unused */
- 
- static unsigned int                     busfreq;   /* FSB, in 10 kHz */
- static unsigned int                     max_multiplier;
-@@ -53,7 +52,7 @@ static int powernow_k6_get_cpu_multiplier(void)
- 
- 	msrval = POWERNOW_IOPORT + 0x1;
- 	wrmsr(MSR_K6_EPMR, msrval, 0); /* enable the PowerNow port */
--	invalue=inl(POWERNOW_IOPORT + 0x8);
-+	invalue = inl(POWERNOW_IOPORT + 0x8);
- 	msrval = POWERNOW_IOPORT + 0x0;
- 	wrmsr(MSR_K6_EPMR, msrval, 0); /* disable it again */
- 
-@@ -67,9 +66,9 @@ static int powernow_k6_get_cpu_multiplier(void)
-  *
-  *   Tries to change the PowerNow! multiplier
-  */
--static void powernow_k6_set_state (unsigned int best_i)
-+static void powernow_k6_set_state(unsigned int best_i)
- {
--	unsigned long           outvalue=0, invalue=0;
-+	unsigned long           outvalue = 0, invalue = 0;
- 	unsigned long           msrval;
- 	struct cpufreq_freqs    freqs;
- 
-@@ -90,10 +89,10 @@ static void powernow_k6_set_state (unsigned int best_i)
- 
- 	msrval = POWERNOW_IOPORT + 0x1;
- 	wrmsr(MSR_K6_EPMR, msrval, 0); /* enable the PowerNow port */
--	invalue=inl(POWERNOW_IOPORT + 0x8);
-+	invalue = inl(POWERNOW_IOPORT + 0x8);
- 	invalue = invalue & 0xf;
- 	outvalue = outvalue | invalue;
--	outl(outvalue ,(POWERNOW_IOPORT + 0x8));
-+	outl(outvalue , (POWERNOW_IOPORT + 0x8));
- 	msrval = POWERNOW_IOPORT + 0x0;
- 	wrmsr(MSR_K6_EPMR, msrval, 0); /* disable it again */
- 
-@@ -124,7 +123,7 @@ static int powernow_k6_verify(struct cpufreq_policy *policy)
-  *
-  * sets a new CPUFreq policy
-  */
--static int powernow_k6_target (struct cpufreq_policy *policy,
-+static int powernow_k6_target(struct cpufreq_policy *policy,
- 			       unsigned int target_freq,
- 			       unsigned int relation)
- {
-@@ -152,7 +151,7 @@ static int powernow_k6_cpu_init(struct cpufreq_policy *policy)
- 	busfreq = cpu_khz / max_multiplier;
- 
- 	/* table init */
--	for (i=0; (clock_ratio[i].frequency != CPUFREQ_TABLE_END); i++) {
-+	for (i = 0; (clock_ratio[i].frequency != CPUFREQ_TABLE_END); i++) {
- 		if (clock_ratio[i].index > max_multiplier)
- 			clock_ratio[i].frequency = CPUFREQ_ENTRY_INVALID;
- 		else
-@@ -165,7 +164,7 @@ static int powernow_k6_cpu_init(struct cpufreq_policy *policy)
- 
- 	result = cpufreq_frequency_table_cpuinfo(policy, clock_ratio);
- 	if (result)
--		return (result);
-+		return result;
- 
- 	cpufreq_frequency_table_get_attr(clock_ratio, policy->cpu);
- 
-@@ -176,8 +175,8 @@ static int powernow_k6_cpu_init(struct cpufreq_policy *policy)
- static int powernow_k6_cpu_exit(struct cpufreq_policy *policy)
- {
- 	unsigned int i;
--	for (i=0; i<8; i++) {
--		if (i==max_multiplier)
-+	for (i = 0; i < 8; i++) {
-+		if (i == max_multiplier)
- 			powernow_k6_set_state(i);
- 	}
- 	cpufreq_frequency_table_put_attr(policy->cpu);
-@@ -189,7 +188,7 @@ static unsigned int powernow_k6_get(unsigned int cpu)
- 	return busfreq * powernow_k6_get_cpu_multiplier();
- }
- 
--static struct freq_attr* powernow_k6_attr[] = {
-+static struct freq_attr *powernow_k6_attr[] = {
- 	&cpufreq_freq_attr_scaling_available_freqs,
- 	NULL,
- };
-@@ -227,7 +226,7 @@ static int __init powernow_k6_init(void)
- 	}
- 
- 	if (cpufreq_register_driver(&powernow_k6_driver)) {
--		release_region (POWERNOW_IOPORT, 16);
-+		release_region(POWERNOW_IOPORT, 16);
- 		return -EINVAL;
- 	}
- 
-@@ -243,13 +242,13 @@ static int __init powernow_k6_init(void)
- static void __exit powernow_k6_exit(void)
- {
- 	cpufreq_unregister_driver(&powernow_k6_driver);
--	release_region (POWERNOW_IOPORT, 16);
-+	release_region(POWERNOW_IOPORT, 16);
- }
- 
- 
--MODULE_AUTHOR ("Arjan van de Ven <arjanv at redhat.com>, Dave Jones <davej at codemonkey.org.uk>, Dominik Brodowski <linux at brodo.de>");
--MODULE_DESCRIPTION ("PowerNow! driver for AMD K6-2+ / K6-3+ processors.");
--MODULE_LICENSE ("GPL");
-+MODULE_AUTHOR("Arjan van de Ven <arjanv at redhat.com>, Dave Jones <davej at codemonkey.org.uk>, Dominik Brodowski <linux at brodo.de>");
-+MODULE_DESCRIPTION("PowerNow! driver for AMD K6-2+ / K6-3+ processors.");
-+MODULE_LICENSE("GPL");
- 
- module_init(powernow_k6_init);
- module_exit(powernow_k6_exit);
-diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c
-index 8a67f16..31d6f53 100644
---- a/drivers/cpufreq/cpufreq.c
-+++ b/drivers/cpufreq/cpufreq.c
-@@ -1467,25 +1467,27 @@ int cpufreq_driver_target(struct cpufreq_policy *policy,
- 			  unsigned int target_freq,
- 			  unsigned int relation)
- {
--	int ret;
-+	int ret = -EINVAL;
- 
- 	policy = cpufreq_cpu_get(policy->cpu);
- 	if (!policy)
--		return -EINVAL;
-+		goto no_policy;
- 
- 	if (unlikely(lock_policy_rwsem_write(policy->cpu)))
--		return -EINVAL;
-+		goto fail;
- 
- 	ret = __cpufreq_driver_target(policy, target_freq, relation);
- 
- 	unlock_policy_rwsem_write(policy->cpu);
- 
-+fail:
- 	cpufreq_cpu_put(policy);
-+no_policy:
- 	return ret;
- }
- EXPORT_SYMBOL_GPL(cpufreq_driver_target);
- 
--int __cpufreq_driver_getavg(struct cpufreq_policy *policy)
-+int __cpufreq_driver_getavg(struct cpufreq_policy *policy, unsigned int cpu)
- {
- 	int ret = 0;
- 
-@@ -1493,8 +1495,8 @@ int __cpufreq_driver_getavg(struct cpufreq_policy *policy)
- 	if (!policy)
- 		return -EINVAL;
- 
--	if (cpu_online(policy->cpu) && cpufreq_driver->getavg)
--		ret = cpufreq_driver->getavg(policy->cpu);
-+	if (cpu_online(cpu) && cpufreq_driver->getavg)
-+		ret = cpufreq_driver->getavg(policy, cpu);
- 
- 	cpufreq_cpu_put(policy);
- 	return ret;
-@@ -1717,13 +1719,17 @@ int cpufreq_update_policy(unsigned int cpu)
- {
- 	struct cpufreq_policy *data = cpufreq_cpu_get(cpu);
- 	struct cpufreq_policy policy;
--	int ret = 0;
-+	int ret;
- 
--	if (!data)
--		return -ENODEV;
-+	if (!data) {
-+		ret = -ENODEV;
-+		goto no_policy;
-+	}
- 
--	if (unlikely(lock_policy_rwsem_write(cpu)))
--		return -EINVAL;
-+	if (unlikely(lock_policy_rwsem_write(cpu))) {
-+		ret = -EINVAL;
-+		goto fail;
-+	}
- 
- 	dprintk("updating policy for CPU %u\n", cpu);
- 	memcpy(&policy, data, sizeof(struct cpufreq_policy));
-@@ -1750,7 +1756,9 @@ int cpufreq_update_policy(unsigned int cpu)
- 
- 	unlock_policy_rwsem_write(cpu);
- 
-+fail:
- 	cpufreq_cpu_put(data);
-+no_policy:
- 	return ret;
- }
- EXPORT_SYMBOL(cpufreq_update_policy);
-diff --git a/drivers/cpufreq/cpufreq_conservative.c b/drivers/cpufreq/cpufreq_conservative.c
-index ac0bbf2..e265783 100644
---- a/drivers/cpufreq/cpufreq_conservative.c
-+++ b/drivers/cpufreq/cpufreq_conservative.c
-@@ -460,6 +460,7 @@ static void do_dbs_timer(struct work_struct *work)
- 
- static inline void dbs_timer_init(void)
- {
-+	init_timer_deferrable(&dbs_work.timer);
- 	schedule_delayed_work(&dbs_work,
- 			usecs_to_jiffies(dbs_tuners_ins.sampling_rate));
- 	return;
-@@ -575,13 +576,15 @@ static int cpufreq_governor_dbs(struct cpufreq_policy *policy,
- 	return 0;
- }
- 
-+#ifndef CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE
-+static
-+#endif
- struct cpufreq_governor cpufreq_gov_conservative = {
- 	.name			= "conservative",
- 	.governor		= cpufreq_governor_dbs,
- 	.max_transition_latency	= TRANSITION_LATENCY_LIMIT,
- 	.owner			= THIS_MODULE,
- };
--EXPORT_SYMBOL(cpufreq_gov_conservative);
- 
- static int __init cpufreq_gov_dbs_init(void)
- {
-diff --git a/drivers/cpufreq/cpufreq_ondemand.c b/drivers/cpufreq/cpufreq_ondemand.c
-index 33855cb..2ab3c12 100644
---- a/drivers/cpufreq/cpufreq_ondemand.c
-+++ b/drivers/cpufreq/cpufreq_ondemand.c
-@@ -18,13 +18,19 @@
- #include <linux/jiffies.h>
- #include <linux/kernel_stat.h>
- #include <linux/mutex.h>
-+#include <linux/hrtimer.h>
-+#include <linux/tick.h>
-+#include <linux/ktime.h>
- 
- /*
-  * dbs is used in this file as a shortform for demandbased switching
-  * It helps to keep variable names smaller, simpler
-  */
- 
-+#define DEF_FREQUENCY_DOWN_DIFFERENTIAL		(10)
- #define DEF_FREQUENCY_UP_THRESHOLD		(80)
-+#define MICRO_FREQUENCY_DOWN_DIFFERENTIAL	(3)
-+#define MICRO_FREQUENCY_UP_THRESHOLD		(95)
- #define MIN_FREQUENCY_UP_THRESHOLD		(11)
- #define MAX_FREQUENCY_UP_THRESHOLD		(100)
- 
-@@ -57,6 +63,7 @@ enum {DBS_NORMAL_SAMPLE, DBS_SUB_SAMPLE};
- struct cpu_dbs_info_s {
- 	cputime64_t prev_cpu_idle;
- 	cputime64_t prev_cpu_wall;
-+	cputime64_t prev_cpu_nice;
- 	struct cpufreq_policy *cur_policy;
-  	struct delayed_work work;
- 	struct cpufreq_frequency_table *freq_table;
-@@ -86,21 +93,24 @@ static struct workqueue_struct	*kondemand_wq;
- static struct dbs_tuners {
- 	unsigned int sampling_rate;
- 	unsigned int up_threshold;
-+	unsigned int down_differential;
- 	unsigned int ignore_nice;
- 	unsigned int powersave_bias;
- } dbs_tuners_ins = {
- 	.up_threshold = DEF_FREQUENCY_UP_THRESHOLD,
-+	.down_differential = DEF_FREQUENCY_DOWN_DIFFERENTIAL,
- 	.ignore_nice = 0,
- 	.powersave_bias = 0,
- };
- 
--static inline cputime64_t get_cpu_idle_time(unsigned int cpu)
-+static inline cputime64_t get_cpu_idle_time_jiffy(unsigned int cpu,
-+							cputime64_t *wall)
- {
- 	cputime64_t idle_time;
--	cputime64_t cur_jiffies;
-+	cputime64_t cur_wall_time;
- 	cputime64_t busy_time;
- 
--	cur_jiffies = jiffies64_to_cputime64(get_jiffies_64());
-+	cur_wall_time = jiffies64_to_cputime64(get_jiffies_64());
- 	busy_time = cputime64_add(kstat_cpu(cpu).cpustat.user,
- 			kstat_cpu(cpu).cpustat.system);
- 
-@@ -113,7 +123,37 @@ static inline cputime64_t get_cpu_idle_time(unsigned int cpu)
- 				kstat_cpu(cpu).cpustat.nice);
- 	}
- 
--	idle_time = cputime64_sub(cur_jiffies, busy_time);
-+	idle_time = cputime64_sub(cur_wall_time, busy_time);
-+	if (wall)
-+		*wall = cur_wall_time;
-+
-+	return idle_time;
-+}
-+
-+static inline cputime64_t get_cpu_idle_time(unsigned int cpu, cputime64_t *wall)
-+{
-+	u64 idle_time = get_cpu_idle_time_us(cpu, wall);
-+
-+	if (idle_time == -1ULL)
-+		return get_cpu_idle_time_jiffy(cpu, wall);
-+
-+	if (dbs_tuners_ins.ignore_nice) {
-+		cputime64_t cur_nice;
-+		unsigned long cur_nice_jiffies;
-+		struct cpu_dbs_info_s *dbs_info;
-+
-+		dbs_info = &per_cpu(cpu_dbs_info, cpu);
-+		cur_nice = cputime64_sub(kstat_cpu(cpu).cpustat.nice,
-+					 dbs_info->prev_cpu_nice);
-+		/*
-+		 * Assumption: nice time between sampling periods will be
-+		 * less than 2^32 jiffies for 32 bit sys
-+		 */
-+		cur_nice_jiffies = (unsigned long)
-+					cputime64_to_jiffies64(cur_nice);
-+		dbs_info->prev_cpu_nice = kstat_cpu(cpu).cpustat.nice;
-+		return idle_time + jiffies_to_usecs(cur_nice_jiffies);
-+	}
- 	return idle_time;
- }
- 
-@@ -277,8 +317,8 @@ static ssize_t store_ignore_nice_load(struct cpufreq_policy *policy,
- 	for_each_online_cpu(j) {
- 		struct cpu_dbs_info_s *dbs_info;
- 		dbs_info = &per_cpu(cpu_dbs_info, j);
--		dbs_info->prev_cpu_idle = get_cpu_idle_time(j);
--		dbs_info->prev_cpu_wall = get_jiffies_64();
-+		dbs_info->prev_cpu_idle = get_cpu_idle_time(j,
-+						&dbs_info->prev_cpu_wall);
- 	}
- 	mutex_unlock(&dbs_mutex);
- 
-@@ -334,9 +374,7 @@ static struct attribute_group dbs_attr_group = {
- 
- static void dbs_check_cpu(struct cpu_dbs_info_s *this_dbs_info)
- {
--	unsigned int idle_ticks, total_ticks;
--	unsigned int load = 0;
--	cputime64_t cur_jiffies;
-+	unsigned int max_load_freq;
- 
- 	struct cpufreq_policy *policy;
- 	unsigned int j;
-@@ -346,13 +384,7 @@ static void dbs_check_cpu(struct cpu_dbs_info_s *this_dbs_info)
- 
- 	this_dbs_info->freq_lo = 0;
- 	policy = this_dbs_info->cur_policy;
--	cur_jiffies = jiffies64_to_cputime64(get_jiffies_64());
--	total_ticks = (unsigned int) cputime64_sub(cur_jiffies,
--			this_dbs_info->prev_cpu_wall);
--	this_dbs_info->prev_cpu_wall = get_jiffies_64();
- 
--	if (!total_ticks)
--		return;
- 	/*
- 	 * Every sampling_rate, we check, if current idle time is less
- 	 * than 20% (default), then we try to increase frequency
-@@ -365,27 +397,44 @@ static void dbs_check_cpu(struct cpu_dbs_info_s *this_dbs_info)
- 	 * 5% (default) of current frequency
- 	 */
- 
--	/* Get Idle Time */
--	idle_ticks = UINT_MAX;
-+	/* Get Absolute Load - in terms of freq */
-+	max_load_freq = 0;
-+
- 	for_each_cpu_mask_nr(j, policy->cpus) {
--		cputime64_t total_idle_ticks;
--		unsigned int tmp_idle_ticks;
- 		struct cpu_dbs_info_s *j_dbs_info;
-+		cputime64_t cur_wall_time, cur_idle_time;
-+		unsigned int idle_time, wall_time;
-+		unsigned int load, load_freq;
-+		int freq_avg;
- 
- 		j_dbs_info = &per_cpu(cpu_dbs_info, j);
--		total_idle_ticks = get_cpu_idle_time(j);
--		tmp_idle_ticks = (unsigned int) cputime64_sub(total_idle_ticks,
-+
-+		cur_idle_time = get_cpu_idle_time(j, &cur_wall_time);
-+
-+		wall_time = (unsigned int) cputime64_sub(cur_wall_time,
-+				j_dbs_info->prev_cpu_wall);
-+		j_dbs_info->prev_cpu_wall = cur_wall_time;
-+
-+		idle_time = (unsigned int) cputime64_sub(cur_idle_time,
- 				j_dbs_info->prev_cpu_idle);
--		j_dbs_info->prev_cpu_idle = total_idle_ticks;
-+		j_dbs_info->prev_cpu_idle = cur_idle_time;
-+
-+		if (unlikely(!wall_time || wall_time < idle_time))
-+			continue;
-+
-+		load = 100 * (wall_time - idle_time) / wall_time;
-+
-+		freq_avg = __cpufreq_driver_getavg(policy, j);
-+		if (freq_avg <= 0)
-+			freq_avg = policy->cur;
- 
--		if (tmp_idle_ticks < idle_ticks)
--			idle_ticks = tmp_idle_ticks;
-+		load_freq = load * freq_avg;
-+		if (load_freq > max_load_freq)
-+			max_load_freq = load_freq;
- 	}
--	if (likely(total_ticks > idle_ticks))
--		load = (100 * (total_ticks - idle_ticks)) / total_ticks;
- 
- 	/* Check for frequency increase */
--	if (load > dbs_tuners_ins.up_threshold) {
-+	if (max_load_freq > dbs_tuners_ins.up_threshold * policy->cur) {
- 		/* if we are already at full speed then break out early */
- 		if (!dbs_tuners_ins.powersave_bias) {
- 			if (policy->cur == policy->max)
-@@ -412,15 +461,13 @@ static void dbs_check_cpu(struct cpu_dbs_info_s *this_dbs_info)
- 	 * can support the current CPU usage without triggering the up
- 	 * policy. To be safe, we focus 10 points under the threshold.
- 	 */
--	if (load < (dbs_tuners_ins.up_threshold - 10)) {
--		unsigned int freq_next, freq_cur;
--
--		freq_cur = __cpufreq_driver_getavg(policy);
--		if (!freq_cur)
--			freq_cur = policy->cur;
--
--		freq_next = (freq_cur * load) /
--			(dbs_tuners_ins.up_threshold - 10);
-+	if (max_load_freq <
-+	    (dbs_tuners_ins.up_threshold - dbs_tuners_ins.down_differential) *
-+	     policy->cur) {
-+		unsigned int freq_next;
-+		freq_next = max_load_freq /
-+				(dbs_tuners_ins.up_threshold -
-+				 dbs_tuners_ins.down_differential);
- 
- 		if (!dbs_tuners_ins.powersave_bias) {
- 			__cpufreq_driver_target(policy, freq_next,
-@@ -526,8 +573,8 @@ static int cpufreq_governor_dbs(struct cpufreq_policy *policy,
- 			j_dbs_info = &per_cpu(cpu_dbs_info, j);
- 			j_dbs_info->cur_policy = policy;
- 
--			j_dbs_info->prev_cpu_idle = get_cpu_idle_time(j);
--			j_dbs_info->prev_cpu_wall = get_jiffies_64();
-+			j_dbs_info->prev_cpu_idle = get_cpu_idle_time(j,
-+						&j_dbs_info->prev_cpu_wall);
- 		}
- 		this_dbs_info->cpu = cpu;
- 		/*
-@@ -579,22 +626,42 @@ static int cpufreq_governor_dbs(struct cpufreq_policy *policy,
- 	return 0;
- }
- 
-+#ifndef CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND
-+static
-+#endif
- struct cpufreq_governor cpufreq_gov_ondemand = {
- 	.name			= "ondemand",
- 	.governor		= cpufreq_governor_dbs,
- 	.max_transition_latency = TRANSITION_LATENCY_LIMIT,
- 	.owner			= THIS_MODULE,
- };
--EXPORT_SYMBOL(cpufreq_gov_ondemand);
- 
- static int __init cpufreq_gov_dbs_init(void)
- {
-+	int err;
-+	cputime64_t wall;
-+	u64 idle_time;
-+	int cpu = get_cpu();
-+
-+	idle_time = get_cpu_idle_time_us(cpu, &wall);
-+	put_cpu();
-+	if (idle_time != -1ULL) {
-+		/* Idle micro accounting is supported. Use finer thresholds */
-+		dbs_tuners_ins.up_threshold = MICRO_FREQUENCY_UP_THRESHOLD;
-+		dbs_tuners_ins.down_differential =
-+					MICRO_FREQUENCY_DOWN_DIFFERENTIAL;
-+	}
-+
- 	kondemand_wq = create_workqueue("kondemand");
- 	if (!kondemand_wq) {
- 		printk(KERN_ERR "Creation of kondemand failed\n");
- 		return -EFAULT;
- 	}
--	return cpufreq_register_governor(&cpufreq_gov_ondemand);
-+	err = cpufreq_register_governor(&cpufreq_gov_ondemand);
-+	if (err)
-+		destroy_workqueue(kondemand_wq);
-+
-+	return err;
- }
- 
- static void __exit cpufreq_gov_dbs_exit(void)
-diff --git a/drivers/cpufreq/cpufreq_performance.c b/drivers/cpufreq/cpufreq_performance.c
-index e8e1451..7e2e515 100644
---- a/drivers/cpufreq/cpufreq_performance.c
-+++ b/drivers/cpufreq/cpufreq_performance.c
-@@ -36,12 +36,14 @@ static int cpufreq_governor_performance(struct cpufreq_policy *policy,
- 	return 0;
- }
- 
-+#ifdef CONFIG_CPU_FREQ_GOV_PERFORMANCE_MODULE
-+static
-+#endif
- struct cpufreq_governor cpufreq_gov_performance = {
- 	.name		= "performance",
- 	.governor	= cpufreq_governor_performance,
- 	.owner		= THIS_MODULE,
- };
--EXPORT_SYMBOL(cpufreq_gov_performance);
- 
- 
- static int __init cpufreq_gov_performance_init(void)
-diff --git a/drivers/cpufreq/cpufreq_powersave.c b/drivers/cpufreq/cpufreq_powersave.c
-index 88d2f44..e6db5fa 100644
---- a/drivers/cpufreq/cpufreq_powersave.c
-+++ b/drivers/cpufreq/cpufreq_powersave.c
-@@ -35,12 +35,14 @@ static int cpufreq_governor_powersave(struct cpufreq_policy *policy,
- 	return 0;
- }
- 
-+#ifndef CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE
-+static
-+#endif
- struct cpufreq_governor cpufreq_gov_powersave = {
- 	.name		= "powersave",
- 	.governor	= cpufreq_governor_powersave,
- 	.owner		= THIS_MODULE,
- };
--EXPORT_SYMBOL(cpufreq_gov_powersave);
- 
- static int __init cpufreq_gov_powersave_init(void)
- {
-diff --git a/drivers/cpufreq/cpufreq_userspace.c b/drivers/cpufreq/cpufreq_userspace.c
-index 32244aa..1442bba 100644
---- a/drivers/cpufreq/cpufreq_userspace.c
-+++ b/drivers/cpufreq/cpufreq_userspace.c
-@@ -187,6 +187,9 @@ static int cpufreq_governor_userspace(struct cpufreq_policy *policy,
- }
- 
- 
-+#ifndef CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE
-+static
-+#endif
- struct cpufreq_governor cpufreq_gov_userspace = {
- 	.name		= "userspace",
- 	.governor	= cpufreq_governor_userspace,
-@@ -194,7 +197,6 @@ struct cpufreq_governor cpufreq_gov_userspace = {
- 	.show_setspeed	= show_speed,
- 	.owner		= THIS_MODULE,
- };
--EXPORT_SYMBOL(cpufreq_gov_userspace);
- 
- static int __init cpufreq_gov_userspace_init(void)
- {
-diff --git a/include/linux/cpufreq.h b/include/linux/cpufreq.h
-index 6fd5668..1ee608f 100644
---- a/include/linux/cpufreq.h
-+++ b/include/linux/cpufreq.h
-@@ -187,7 +187,8 @@ extern int __cpufreq_driver_target(struct cpufreq_policy *policy,
- 				   unsigned int relation);
- 
- 
--extern int __cpufreq_driver_getavg(struct cpufreq_policy *policy);
-+extern int __cpufreq_driver_getavg(struct cpufreq_policy *policy,
-+				   unsigned int cpu);
- 
- int cpufreq_register_governor(struct cpufreq_governor *governor);
- void cpufreq_unregister_governor(struct cpufreq_governor *governor);
-@@ -226,7 +227,9 @@ struct cpufreq_driver {
- 	unsigned int	(*get)	(unsigned int cpu);
- 
- 	/* optional */
--	unsigned int (*getavg)	(unsigned int cpu);
-+	unsigned int (*getavg)	(struct cpufreq_policy *policy,
-+				 unsigned int cpu);
-+
- 	int	(*exit)		(struct cpufreq_policy *policy);
- 	int	(*suspend)	(struct cpufreq_policy *policy, pm_message_t pmsg);
- 	int	(*resume)	(struct cpufreq_policy *policy);
-diff --git a/include/linux/tick.h b/include/linux/tick.h
-index 8cf8cfe..98921a3 100644
---- a/include/linux/tick.h
-+++ b/include/linux/tick.h
-@@ -126,7 +126,7 @@ static inline ktime_t tick_nohz_get_sleep_length(void)
- 	return len;
- }
- static inline void tick_nohz_stop_idle(int cpu) { }
--static inline u64 get_cpu_idle_time_us(int cpu, u64 *unused) { return 0; }
-+static inline u64 get_cpu_idle_time_us(int cpu, u64 *unused) { return -1; }
- # endif /* !NO_HZ */
- 
- #endif
-diff --git a/kernel/time/tick-sched.c b/kernel/time/tick-sched.c
-index cb02324..a4d2193 100644
---- a/kernel/time/tick-sched.c
-+++ b/kernel/time/tick-sched.c
-@@ -20,6 +20,7 @@
- #include <linux/profile.h>
- #include <linux/sched.h>
- #include <linux/tick.h>
-+#include <linux/module.h>
- 
- #include <asm/irq_regs.h>
- 
-@@ -190,9 +191,17 @@ u64 get_cpu_idle_time_us(int cpu, u64 *last_update_time)
- {
- 	struct tick_sched *ts = &per_cpu(tick_cpu_sched, cpu);
- 
--	*last_update_time = ktime_to_us(ts->idle_lastupdate);
-+	if (!tick_nohz_enabled)
-+		return -1;
-+
-+	if (ts->idle_active)
-+		*last_update_time = ktime_to_us(ts->idle_lastupdate);
-+	else
-+		*last_update_time = ktime_to_us(ktime_get());
-+
- 	return ktime_to_us(ts->idle_sleeptime);
- }
-+EXPORT_SYMBOL_GPL(get_cpu_idle_time_us);
- 
- /**
-  * tick_nohz_stop_sched_tick - stop the idle tick from the idle task


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/kernel.spec,v
retrieving revision 1.1206
retrieving revision 1.1207
diff -u -r1.1206 -r1.1207
--- kernel.spec	12 Jan 2009 03:29:30 -0000	1.1206
+++ kernel.spec	12 Jan 2009 19:51:28 -0000	1.1207
@@ -20,7 +20,7 @@
 # kernel spec when the kernel is rebased, so fedora_build automatically
 # works out to the offset from the rebase, so it doesn't get too ginormous.
 #
-%define fedora_cvs_origin   1036
+%define fedora_cvs_origin   1180
 %define fedora_build_string %(R="$Revision$"; R="${R%% \$}"; R="${R#: 1.}"; echo $R)
 %define fedora_build_origin %(R=%{fedora_build_string}; R="${R%%%%.*}"; echo $R)
 %define fedora_build_prefix %(expr %{fedora_build_origin} - %{fedora_cvs_origin})
@@ -30,13 +30,13 @@
 # base_sublevel is the kernel version we're starting with and patching
 # on top of -- for example, 2.6.22-rc7-git1 starts with a 2.6.21 base,
 # which yields a base_sublevel of 21.
-%define base_sublevel 27
+%define base_sublevel 28
 
 ## If this is a released kernel ##
 %if 0%{?released_kernel}
 
 # Do we have a -stable update to apply?
-%define stable_update 10
+%define stable_update 0
 # Is it a -stable RC?
 %define stable_rc 0
 # Set rpm version accordingly
@@ -119,7 +119,7 @@
 # Set debugbuildsenabled to 1 for production (build separate debug kernels)
 #  and 0 for rawhide (all kernels are debug kernels).
 # See also 'make debug' and 'make release'.
-%define debugbuildsenabled 1
+%define debugbuildsenabled 0
 
 # Want to build a vanilla kernel build without any non-upstream patches?
 # (well, almost none, we need nonintconfig for build purposes). Default to 0 (off).
@@ -277,10 +277,10 @@
 # Per-arch tweaks
 
 %ifarch %{all_x86}
+%define asmarch x86
+%define hdrarch i386
 %define all_arch_configs kernel-%{version}-i?86*.config
 %define image_install_path boot
-%define hdrarch i386
-%define asmarch x86
 %define kernel_image arch/x86/boot/bzImage
 %endif
 
@@ -292,20 +292,22 @@
 %endif
 
 %ifarch ppc64
+%define asmarch powerpc
+%define hdrarch powerpc
 %define all_arch_configs kernel-%{version}-ppc64*.config
 %define image_install_path boot
 %define make_target vmlinux
 %define kernel_image vmlinux
 %define kernel_image_elf 1
-%define hdrarch powerpc
 %endif
 
 %ifarch s390x
+%define asmarch s390
+%define hdrarch s390
 %define all_arch_configs kernel-%{version}-s390x.config
 %define image_install_path boot
 %define make_target image
 %define kernel_image arch/s390/boot/image
-%define hdrarch s390
 %endif
 
 %ifarch sparc
@@ -313,6 +315,7 @@
 %endif
 
 %ifarch sparc64
+%define asmarch sparc
 %define all_arch_configs kernel-%{version}-sparc64*.config
 %define make_target image
 %define kernel_image arch/sparc64/boot/image
@@ -320,12 +323,13 @@
 %endif
 
 %ifarch ppc
+%define asmarch powerpc
+%define hdrarch powerpc
 %define all_arch_configs kernel-%{version}-ppc{-,.}*config
 %define image_install_path boot
 %define make_target vmlinux
 %define kernel_image vmlinux
 %define kernel_image_elf 1
-%define hdrarch powerpc
 %endif
 
 %ifarch ia64
@@ -422,7 +426,7 @@
 # Packages that need to be installed before the kernel is, because the %post
 # scripts use them.
 #
-%define kernel_prereq  fileutils, module-init-tools, initscripts >= 8.11.1-1, mkinitrd >= 6.0.61-1, kernel-firmware >= %{rpmversion}-%{pkg_release}
+%define kernel_prereq  fileutils, module-init-tools, initscripts >= 8.11.1-1, mkinitrd >= 6.0.61-1, kernel-firmware >= %{rpmversion}-%{pkg_release}, /sbin/new-kernel-pkg
 
 #
 # This macro does requires, provides, conflicts, obsoletes for a kernel package.
@@ -583,18 +587,11 @@
 Patch20: linux-2.6-hotfixes.patch
 
 Patch21: linux-2.6-utrace.patch
-Patch22: linux-2.6-x86-tracehook.patch
-Patch23: linux-2.6.27-x86-tracehook-syscall-arg-order.patch
 
 Patch30: linux-2.6-x86-mtrr-kill-bogus-warning.patch
-Patch34: linux-2.6-x86-pci-amd-config-space.patch
 
 Patch41: linux-2.6-sysrq-c.patch
 
-Patch60: linux-2.6-sched-fine-tune-SD_MC_INIT.patch
-Patch61: linux-2.6-sched-fine-tune-SD_SIBLING_INIT.patch
-Patch62: linux-2.6-sched-wakeup-preempt-when-small-overlap.patch
-
 Patch140: linux-2.6-ps3-ehci-iso.patch
 Patch141: linux-2.6-ps3-storage-alias.patch
 Patch142: linux-2.6-ps3-legacy-bootloader-hack.patch
@@ -604,70 +601,40 @@
 Patch149: linux-2.6-efika-not-chrp.patch
 
 Patch160: linux-2.6-execshield.patch
-Patch161: linux-2.6-xen-execshield-add-xen-specific-load_user_cs_desc.patch
-Patch163: linux-2.6-xen-execshield-only-define-load_user_cs_desc-on-32-bit.patch
 Patch250: linux-2.6-debug-sizeof-structs.patch
 Patch260: linux-2.6-debug-nmi-timeout.patch
 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
-Patch341: linux-2.6-mm-pagefault-enable-ints.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
 Patch381: linux-2.6-pciehp-update.patch
 Patch382: linux-2.6-defaults-pciehp.patch
-Patch383: linux-2.6-defaults-fat-utf8.patch
 Patch390: linux-2.6-defaults-acpi-video.patch
-
 Patch391: linux-2.6-acpi-video-dos.patch
-Patch394: linux-2.6-acpi-handle-ec-init-failure.patch
-Patch396: linux-2.6-acpi-dock-fix-eject-request-process.patch
-
 Patch400: linux-2.6-scsi-cpqarray-set-master.patch
-
-Patch410: linux-2.6.27.9-alsa-driver-1.0.18a.patch
-Patch411: linux-2.6.27.7-alsa-driver-fixups.patch
-Patch412: linux-2.6.27.9-alsa-hda-add-a-quirk-for-dell-studio-15.patch
-Patch413: linux-2.6.27.9-alsa-hda-no-headphone-as-line-out-swich-without-line-outs.patch
-Patch414: linux-2.6.27.9-alsa-hda-mark-dell-studio-1535-quirk.patch
-Patch415: linux-2.6-alsa-backport-beep-switch.patch
-Patch416: linux-2.6-defaults-alsa-hda-beep-off.patch
-Patch417: linux-2.6-alsa-hda-stac-dell-m6-eapd.patch
-Patch418: linux-2.6-alsa-hda-revert-remove-unneeded-hp-nid-references.patch
-Patch419: linux-2.6-alsa-hda-remove-broken-headphone-control-for-dell-laptops.patch
-
-Patch429: linux-2.6-squashfs.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
-Patch452: linux-2.6.27-hwmon-applesmc-2.6.28.patch
-# 448656
-Patch454: linux-2.6-input.git-i8042-add-xps-m1530-to-nomux.patch
-
 Patch460: linux-2.6-serial-460800.patch
 Patch510: linux-2.6-silence-noise.patch
 Patch530: linux-2.6-silence-fbcon-logo.patch
 Patch570: linux-2.6-selinux-mprotect-checks.patch
 Patch580: linux-2.6-sparc-selinux-mprotect-checks.patch
-Patch590: linux-2.6-selinux-recognise-addrlabel.patch
-# fix for ebus_dma.h
-Patch600: sparc-2.6.git-aae7fb87ec4d2df6cb551670b1765cf4e5795a3b.patch
+Patch590: linux-2.6-selinux-move-open-perms-check.patch
+
+Patch600: linux-2.6-defaults-alsa-hda-beep-off.patch
 
 Patch670: linux-2.6-ata-quirk.patch
 
-Patch680: linux-2.6-iwlagn-downgrade-BUG_ON-in-interrupt.patch
-Patch681: linux-2.6-iwl3945-ibss-tsf-fix.patch
-Patch682: linux-2.6-wireless-ath9k-dma-fixes.patch
-Patch684: linux-2.6-iwlwifi-use-GFP_KERNEL-to-allocate-Rx-SKB-memory.patch
-Patch690: linux-2.6-at76.patch
+Patch680: linux-2.6-iwlwifi-use-GFP_KERNEL-to-allocate-Rx-SKB-memory.patch
 
-Patch700: linux-2.6-nfs-client-mounts-hang.patch
+Patch690: linux-2.6-at76.patch
 
-Patch900: linux-2.6-uvc-hg.patch
-Patch901: linux-2.6-uvc-spca525.patch
-Patch902: linux-2.6-gspca-vc0321-fix-frame-overflow.patch
+# webcam fixes
+Patch900: linux-2.6-gspca-git.patch
 
-Patch1101: linux-2.6-default-mmf_dump_elf_headers.patch
 Patch1515: linux-2.6.27-lirc.patch
 Patch1520: linux-2.6-hdpvr.patch
 
@@ -676,80 +643,36 @@
 Patch1550: linux-2.6-cdrom-door-status.patch
 
 # nouveau + drm fixes
-Patch1800: nvidia-agp.patch
-Patch1810: drm-next.patch
-Patch1813: drm-modesetting-radeon.patch
-Patch1815: drm-nouveau.patch
-Patch1816: drm-intel-8xx-pae-no-gem.patch
-Patch1817: drm-fix-master-enable.patch
+Patch1811: drm-next.patch
+Patch1812: drm-modesetting-radeon.patch
+Patch1814: drm-nouveau.patch
 
 # 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
-
-# r8169 fixes
-Patch2005: linux-2.6-netdev-r8169-2.6.28.patch
-
-# Make Eee laptop driver suck less
-Patch2011: linux-2.6-eeepc-laptop-update.patch
-
-# Backport Toshiba updates so Bluetooth can be enabled (#437091)
-Patch2012: linux-2.6-toshiba-acpi-update.patch
-
 # atl2 network driver
 Patch2020: linux-2.6-netdev-atl2.patch
 
 # Fix DEBUG_SHIRQ problem in tulip driver.  (454575)
 Patch2030: linux-2.6-net-tulip-interrupt.patch
 
-Patch2031: linux-2.6-net-qla-silence-debug-printks.patch
-
 # olpc fixes
-Patch2041: linux-2.6-olpc-touchpad.patch
-Patch2042: linux-2.6-quieter-mmc.patch
+Patch2040: linux-2.6-olpc-speaker-out.patch
+
+# Fix serial header so things can compile (#476327)
+Patch2050: linux-2.6-serial.patch
 
 # linux1394 git patches
 Patch2200: linux-2.6-firewire-git-update.patch
 Patch2201: linux-2.6-firewire-git-pending.patch
 
-# make USB EHCI driver respect "nousb" parameter
-Patch2300: linux-2.6-usb-ehci-hcd-respect-nousb.patch
-
-# Add fips_enable flag
-Patch2400: linux-2.6-crypto-fips_enable.patch
-
-# get rid of imacfb and make efifb work everywhere it was used
-Patch2600: linux-2.6-merge-efifb-imacfb.patch
-
 # Quiet boot fixes
 # silence piix3 in quiet boot (ie, qemu)
 Patch2800: linux-2.6-piix3-silence-quirk.patch
-# Hush IOMMU warnings, you typically can't fix them anyway
-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
 # hush pci bar allocation failures
 Patch2804: linux-2.6.27-pci-hush-allocation-failures.patch
-# Don't attempt to assign IRQ 0
-Patch2806: linux-2.6-pci-fix-pciehp-irq0.patch
-# stop filling the log with messages
-Patch2807: linux-2.6-pciehp-kill-annoying-messages.patch
-
-Patch2900: linux-2.6.27-ext4-rename-ext4dev-to-ext4.patch
-# Delay capable check to avoid most AVCs (#478299)
-Patch2901: linux-2.6.27.9-ext4-cap-check-delay.patch
-
-# Add better support for DMI-based autoloading
-Patch3110: linux-2.6-dmi-autoload.patch
-
-# SELinux: Fix handling of empty tty_files. 37dd0bd04a3240d2922786d501e2f12cec858fbf BZ469079
-Patch3120: linux-2.6-selinux-empty-tty-files.patch
 
 # Provide P4 clock modulation in-kernel for thermal reasons, but don't expose
 # ui
@@ -1104,30 +1027,19 @@
 ApplyPatch linux-2.6-upstream-reverts.patch -R
 fi
 
-ApplyPatch git-cpufreq.patch
+#ApplyPatch git-cpufreq.patch
 
 ApplyPatch linux-2.6-hotfixes.patch
 
 # Roland's utrace ptrace replacement.
 ApplyPatch linux-2.6-utrace.patch
-ApplyPatch linux-2.6-x86-tracehook.patch
-ApplyPatch linux-2.6.27-x86-tracehook-syscall-arg-order.patch
-
-ApplyPatch linux-2.6-x86-mtrr-kill-bogus-warning.patch
-# fix Barcelona config space size
-ApplyPatch linux-2.6-x86-pci-amd-config-space.patch
 
 # enable sysrq-c on all kernels, not only kexec
 ApplyPatch linux-2.6-sysrq-c.patch
 
-# scheduler patches
-# performance fixes from 2.6.28
-ApplyPatch linux-2.6-sched-fine-tune-SD_MC_INIT.patch
-ApplyPatch linux-2.6-sched-fine-tune-SD_SIBLING_INIT.patch
-ApplyPatch linux-2.6-sched-wakeup-preempt-when-small-overlap.patch
-
 # Architecture patches
 # x86(-64)
+ApplyPatch linux-2.6-x86-mtrr-kill-bogus-warning.patch
 
 #
 # PowerPC
@@ -1153,38 +1065,28 @@
 #
 # SPARC64
 #
-ApplyPatch sparc-2.6.git-aae7fb87ec4d2df6cb551670b1765cf4e5795a3b.patch
 
 #
 # Exec shield
 #
 ApplyPatch linux-2.6-execshield.patch
-ApplyPatch linux-2.6-xen-execshield-add-xen-specific-load_user_cs_desc.patch
-
-ApplyPatch linux-2.6-xen-execshield-only-define-load_user_cs_desc-on-32-bit.patch
 
 #
 # bugfixes to drivers and filesystems
 #
 
+# Squashfs
+ApplyPatch linux-2.6-squashfs.patch
+
 # ext4
-ApplyPatch linux-2.6.27-ext4-rename-ext4dev-to-ext4.patch
-ApplyPatch linux-2.6.27.9-ext4-cap-check-delay.patch
 
 # xfs
 
 # USB
-ApplyPatch linux-2.6-usb-ehci-hcd-respect-nousb.patch
-
-# Add the ability to turn FIPS-compliant mode on or off at boot
-ApplyPatch linux-2.6-crypto-fips_enable.patch
 
 # ACPI
 ApplyPatch linux-2.6-defaults-acpi-video.patch
 ApplyPatch linux-2.6-acpi-video-dos.patch
-ApplyPatch linux-2.6-acpi-handle-ec-init-failure.patch
-# fix dock bugs
-ApplyPatch linux-2.6-acpi-dock-fix-eject-request-process.patch
 
 # Various low-impact patches to aid debugging.
 ApplyPatch linux-2.6-debug-sizeof-structs.patch
@@ -1192,12 +1094,9 @@
 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-mm-pagefault-enable-ints.patch
 ApplyPatch linux-2.6-debug-always-inline-kzalloc.patch
 
-#
 # /dev/crash driver for the crashdump analysis tool
-#
 ApplyPatch linux-2.6-crash-driver.patch
 
 #
@@ -1205,14 +1104,10 @@
 #
 # disable message signaled interrupts
 ApplyPatch linux-2.6-defaults-pci_no_msi.patch
-
 # update the pciehp driver
 ApplyPatch linux-2.6-pciehp-update.patch
-
 # default to enabling passively listening for hotplug events
 ApplyPatch linux-2.6-defaults-pciehp.patch
-# UTF8 by default in FAT
-ApplyPatch linux-2.6-defaults-fat-utf8.patch
 
 #
 # SCSI Bits.
@@ -1221,20 +1116,6 @@
 ApplyPatch linux-2.6-scsi-cpqarray-set-master.patch
 
 # ALSA
-ApplyPatch linux-2.6.27.9-alsa-driver-1.0.18a.patch
-ApplyPatch linux-2.6.27.7-alsa-driver-fixups.patch
-ApplyPatch linux-2.6.27.9-alsa-hda-add-a-quirk-for-dell-studio-15.patch
-ApplyPatch linux-2.6.27.9-alsa-hda-no-headphone-as-line-out-swich-without-line-outs.patch
-ApplyPatch linux-2.6.27.9-alsa-hda-mark-dell-studio-1535-quirk.patch
-ApplyPatch linux-2.6-alsa-backport-beep-switch.patch
-ApplyPatch linux-2.6-defaults-alsa-hda-beep-off.patch
-ApplyPatch linux-2.6-alsa-hda-stac-dell-m6-eapd.patch
-ApplyPatch linux-2.6-alsa-hda-revert-remove-unneeded-hp-nid-references.patch
-ApplyPatch linux-2.6-alsa-hda-remove-broken-headphone-control-for-dell-laptops.patch
-
-# Filesystem patches.
-# Squashfs
-ApplyPatch linux-2.6-squashfs.patch
 
 # Networking
 # Disable easy to trigger printk's.
@@ -1243,10 +1124,6 @@
 # Misc fixes
 # The input layer spews crap no-one cares about.
 ApplyPatch linux-2.6-input-kill-stupid-messages.patch
-# kill annoying applesmc debug messages
-ApplyPatch linux-2.6.27-hwmon-applesmc-2.6.28.patch
-# 448656
-ApplyPatch linux-2.6-input.git-i8042-add-xps-m1530-to-nomux.patch
 
 # Allow to use 480600 baud on 16C950 UARTs
 ApplyPatch linux-2.6-serial-460800.patch
@@ -1260,37 +1137,25 @@
 ApplyPatch linux-2.6-selinux-mprotect-checks.patch
 # Fix SELinux for sparc
 ApplyPatch linux-2.6-sparc-selinux-mprotect-checks.patch
-# selinux: recognize netlink messages for 'ip addrlabel'
-ApplyPatch linux-2.6-selinux-recognise-addrlabel.patch
+# SELinux: check open perms in dentry_open not inode_permission
+ApplyPatch linux-2.6-selinux-move-open-perms-check.patch
 
 # Changes to upstream defaults.
 
+# squelch hda_beep by default
+ApplyPatch linux-2.6-defaults-alsa-hda-beep-off.patch
+
 # ia64 ata quirk
 ApplyPatch linux-2.6-ata-quirk.patch
 
-# make jarod's iwl4965 not panic near N APs, hopefully
-ApplyPatch linux-2.6-iwlagn-downgrade-BUG_ON-in-interrupt.patch
-# iwl3945 fix for stable ad-hoc mode connections (#459401)
-ApplyPatch linux-2.6-iwl3945-ibss-tsf-fix.patch
-
-# Backported ath9k DMA fixes from pre-2.6.28
-ApplyPatch linux-2.6-wireless-ath9k-dma-fixes.patch
-
 # iwlwifi: use GFP_KERNEL to allocate Rx SKB memory
 ApplyPatch linux-2.6-iwlwifi-use-GFP_KERNEL-to-allocate-Rx-SKB-memory.patch
 
 # Add misc wireless bits from upstream wireless tree
 ApplyPatch linux-2.6-at76.patch
 
-# NFS Client mounts hang when exported directory do not exist
-ApplyPatch linux-2.6-nfs-client-mounts-hang.patch
-
-ApplyPatch linux-2.6-uvc-hg.patch
-ApplyPatch linux-2.6-uvc-spca525.patch
-ApplyPatch linux-2.6-gspca-vc0321-fix-frame-overflow.patch
-
-# build id related enhancements
-ApplyPatch linux-2.6-default-mmf_dump_elf_headers.patch
+# Webcam patches
+#ApplyPatch linux-2.6-gspca-git.patch
 
 # http://www.lirc.org/
 ApplyPatch linux-2.6.27-lirc.patch
@@ -1303,62 +1168,33 @@
 
 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-netdev-r8169-2.6.28.patch
-
-ApplyPatch linux-2.6-eeepc-laptop-update.patch
-ApplyPatch linux-2.6-toshiba-acpi-update.patch
-
 # atl2 network driver
 ApplyPatch linux-2.6-netdev-atl2.patch
 
 ApplyPatch linux-2.6-net-tulip-interrupt.patch
 
-ApplyPatch linux-2.6-net-qla-silence-debug-printks.patch
+ApplyPatch linux-2.6-olpc-speaker-out.patch
 
-ApplyPatch linux-2.6-olpc-touchpad.patch
-ApplyPatch linux-2.6-quieter-mmc.patch
+ApplyPatch linux-2.6-serial.patch
 
 # Nouveau DRM + drm fixes
-ApplyPatch nvidia-agp.patch
 ApplyPatch drm-next.patch
 ApplyPatch drm-modesetting-radeon.patch
-ApplyPatch drm-nouveau.patch
-ApplyPatch drm-intel-8xx-pae-no-gem.patch
-ApplyPatch drm-fix-master-enable.patch
+#ApplyPatch drm-nouveau.patch
 
 # linux1394 git patches
-ApplyPatch linux-2.6-firewire-git-update.patch
+#ApplyPatch linux-2.6-firewire-git-update.patch
 C=$(wc -l $RPM_SOURCE_DIR/linux-2.6-firewire-git-pending.patch | awk '{print $1}')
 if [ "$C" -gt 10 ]; then
 ApplyPatch linux-2.6-firewire-git-pending.patch
 fi
 
-# get rid of imacfb and make efifb work everywhere it was used
-ApplyPatch linux-2.6-merge-efifb-imacfb.patch
-
-ApplyPatch linux-2.6-dmi-autoload.patch
-
 # silence piix3 in quiet boot (ie, qemu)
 ApplyPatch linux-2.6-piix3-silence-quirk.patch
-# Hush IOMMU warnings, you typically can't fix them anyway
-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
 # hush pci bar allocation failures
 ApplyPatch linux-2.6.27-pci-hush-allocation-failures.patch
-# don't allocate IRQ 0 in pciehp
-ApplyPatch linux-2.6-pci-fix-pciehp-irq0.patch
-#
-ApplyPatch linux-2.6-pciehp-kill-annoying-messages.patch
-
-# SELinux on ppc64 without plymouth can't boot
-ApplyPatch linux-2.6-selinux-empty-tty-files.patch
 
 ApplyPatch disable-p4-cpufreq-ui.patch
 
@@ -1549,8 +1385,8 @@
 %ifarch ppc
     cp -a --parents arch/powerpc/lib/crtsavres.[So] $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/
 %endif
-    if [ -d arch/$Arch/include ]; then
-      cp -a --parents arch/$Arch/include $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/
+    if [ -d arch/%{asmarch}/include ]; then
+      cp -a --parents arch/%{asmarch}/include $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/
     fi
     mkdir -p $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/include
     cd include
@@ -1596,8 +1432,8 @@
     			 'register_netdev|ieee80211_register_hw|usbnet_probe'
     collect_modules_list block \
     			 'ata_scsi_ioctl|scsi_add_host|blk_init_queue|register_mtd_blktrans|scsi_esp_register'
-    collect_modules_list modesetting \
-    			 'drm_crtc_init'
+    collect_modules_list drm \
+    			 'drm_open|drm_init'
 
     # detect missing or incorrect license tags
     rm -f modinfo
@@ -1660,7 +1496,7 @@
 
 %if %{with_doc}
 # Make the HTML and man pages.
-make htmldocs mandocs || %{doc_build_fail}
+make %{?_smp_mflags} htmldocs mandocs || %{doc_build_fail}
 
 # sometimes non-world-readable files sneak into the kernel source tree
 chmod -R a=rX Documentation
@@ -1937,330 +1773,192 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
-* Sun Jan 11 2009 Dave Jones <davej at redhat.com>
-- Don't use MAXSMP on x86-64
+* Mon Jan 12 2009 Kyle McMartin <kyle at redhat.com>
+- Rebase for Fedora 10.
+- Turn off CONFIG_MAXSMP on x86_64.
 
-* Wed Jan  7 2009 Roland McGrath <roland at redhat.com> - 2.6.27.10-169
-- utrace update
+* Wed Dec 24 2008 Dave Jones <davej at redhat.com>
+- 2.6.28
+  Drop gspca-git temporarily.
 
-* Tue Jan 06 2009 Eric Sandeen <sandeen at redhat.com> 2.6.27.10-168
-- ext4 - delay capable() checks in space accounting (#478299)
+* Wed Dec 24 2008 Dave Jones <davej at redhat.com>
+- 2.6.28-rc9-git4
 
-* Tue Dec 23 2008 Dave Airlie <airlied at redhat.com> 2.6.27.10-167
-- drm - fix issue with second driver opening DRI
+* Mon Dec 22 2008 Dave Jones <davej at redhat.com>
+- 2.6.28-rc9-git3
 
-* Mon Dec 22 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.27.10-166
-- Hopefully fix broken headphone output on some Dell notebooks.
+* Mon Dec 22 2008 Bill Nottingham <notting at redhat.com>
+- Fix linux/serial.h so it can be included from userspace (#476327)
 
-* Fri Dec 19 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.27.10-165
-- Linux 2.6.27.10
-  Dropped patches:
-    linux-2.6-lib-idr-fix-bug-introduced-by-rcu-fix.patch
-    linux-2.6.27.7-vmi-fix-crash-on-boot.patch
-    linux-2.6.27.5-sched_clock-prevent-scd-clock-from-moving-backwards.patch
-    linux-2.6-iwlagn-fix-rx-skb-alignment.patch
-  Dropped from firewire-git-pending:
-    firewire: fw-ohci: fix possible IOMMU resource exhaustion
+* Sat Dec 20 2008 Kyle McMartin <kyle at redhat.com>
+- Linux 2.6.28-rc9-git1
+  Rebased patches:
+   linux-2.6-pciehp-update.patch
+   drm-next.patch
 
-* Fri Dec 19 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.27.9-164
-- Disable PATA_HPT3X3_DMA (from F11.)
+* Fri Dec 19 2008 Adam Jackson <ajax at redhat.com>
+- config-generic: FB_VIRTUAL=m
 
-* Thu Dec 18 2008 Dave Airlie <airlied at redhat.com> 2.6.27.9-163
-- radeon drm: fix broken caching bits in radeon which broke AGP
+* Thu Dec 18 2008 Dave Airlie <airlied at redhat.com>
+- drm-next.patch/drm-modesetting-radeon.patch - rebase to upstream.
+- config-generic: turn of KMS on radeon until we fixup userspace
 
-* Wed Dec 17 2008 John W. Linville <linville at redhat.com> 2.6.27.9-162
-- iwlwifi: use GFP_KERNEL to allocate Rx SKB memory
+* Thu Dec 18 2008 Dave Jones <davej at redhat.com>
+- 2.6.28-rc9
 
-* Tue Dec 16 2008 Kyle McMartin <kyle at redhat.com> 2.6.27.9-161
-- Re-enable input beep code, but disable it by default.
-  Added:
-   linux-2.6-alsa-backport-beep-switch.patch
-   linux-2.6-defaults-alsa-hda-beep-off.patch
+* Thu Dec 18 2008 Jeremy Katz <katzj at redhat.com>
+- explicitly prereq /sbin/new-kernel-pkg as opposed to just mkinitrd
 
-* Tue Dec 16 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.27.9-160
-- Disable AC97 audio driver power savings by default.
+* Thu Dec 18 2008 Kyle McMartin <kyle at redhat.com>
+- Disable SND_HDA_BEEP by default
 
-* Tue Dec 16 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.27.9-159
-- Disable input beep feature in Intel HDA sound driver.
+* Thu Dec 18 2008 Dave Jones <davej at redhat.com>
+- 2.6.28-rc8-git6
 
-* Tue Dec 16 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.27.9-158
-- Fix the CDROM door status patch right this time. (from rawhide)
+* Wed Dec 17 2008 Dave Jones <davej at redhat.com>
+- Disable PATA_HPT3X3_DMA as per Alan.
 
-* Mon Dec 15 2008 John W. Linville <linville at redhat.com> 2.6.27.9-157
-- iwlagn: fix RX skb alignment
+* Wed Dec 17 2008 Dave Jones <davej at redhat.com>
+- 2.6.28-rc8-git5
 
-* Mon Dec 15 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.27.9-156
-- Revert -stable patch that causes suspend problems (L-K BZ 12149, 12155)
+* Wed Dec 17 2008 Dave Jones <davej at redhat.com>
+- 2.6.28-rc8-git5
 
-* Sun Dec 14 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.27.9-155
-- Linux 2.6.27.9
-
-* Sat Dec 13 2008 Tom "spot" Callaway <tcallawa at redhat.com> 2.6.27.9-154.rc2
-- pull patch from davem sparc-2.6 git branch to add ebus_dma.h
+* Wed Dec 17 2008 John W. Linville <linville at redhat.com>
+- iwlwifi: use GFP_KERNEL to allocate Rx SKB memory
 
-* Sat Dec 13 2008 Tom "spot" Callaway <tcallawa at redhat.com> 2.6.27.9-153.rc2
-- Add "scsi_esp_register" to the search terms for modules.block so we pick up sun_esp.ko
+* Tue Dec 16 2008 Dave Jones <davej at redhat.com>
+- 2.6.28-rc8-git4
 
-* Fri Dec 12 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.27.9-152.rc2
-- Enable input beep feature in Intel HDA sound driver.
+* Mon Dec 15 2008 Dave Jones <davej at redhat.com>
+- 2.6.28-rc8-git3
 
-* Fri Dec 12 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.27.9-151.rc2
-- Linux 2.6.27.9-rc2
+* Sat Dec 13 2008 Kyle McMartin <kyle at redhat.com>
+- 2.6.28-rc8-git2 
 
-* Fri Dec 12 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.27.9-150.rc1
-- Fix VMI crash on boot introduced in 2.6.27.7 (#476062)
+* Sat Dec 13 2008 Tom "spot" Callaway <tcallawa at redhat.com>
+- Add "scsi_esp_register" to the search terms for modules.block so we pick up sun_esp.ko
 
-* Fri Dec 12 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.27.9-149.rc1
-- Linux 2.6.27.9-rc1
-  Dropped patches:
-    linux-2.6-net-atm-CVE-2008-5079.patch
+* Thu Dec 11 2008 Dave Jones <davej at redhat.com>
+- 2.6.28-rc8-git1
 
-* Fri Dec 12 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.27.8-148
-- Fix IDR allocator bug introduced in 2.6.27.8
+* Thu Dec 11 2008 Dave Jones <davej at redhat.com>
+- Remove noisy message from can network protocol.
 
-* Fri Dec 12 2008 Dave Airlie <airlied at redhat.com> 2.6.27.8-147
-- modeset - fix AGP without kms + fix endian parser/pll programming
+* Thu Dec 11 2008 Hans de Goede <hdegoede at redhat.com>
+- Add a patch updating the gspca driver to the latest "git" (mercurial
+  actually) adding support for ov534 based cams, fixing support for
+  spca501, finepix and vc0321 cams + many more bugfixes
 
-* Wed Dec 10 2008 Jarod Wilson <jarod at redhat.com> 2.6.27.8-146
-- Plug DMA memory leak in firewire drivers (#475156)
+* Wed Dec 10 2008 Dave Jones <davej at redhat.com>
+- 2.6.28-rc8
 
-* Wed Dec 10 2008 Hans de Goede <hdegoede at redhat.com> 2.6.27.8-145
-- Fix vc0321 based webcams (rh 474990)
+* Wed Dec 10 2008 Dave Jones <davej at redhat.com>
+- 2.6.28-rc7-git8
 
-* Tue Dec 09 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.27.8-144
-- Revert idr patch from 2.6.27.8 that caused DRM breakage.
+* Wed Dec 10 2008 Kyle McMartin <kyle at redhat.com>
+- 2.6.28-rc7-git8
+- re-enable drm-nouveau...
 
-* Mon Dec 08 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.27.8-143
-- ATM security fix (CVE-2008-5079)
+* Tue Dec 09 2008 Dave Jones <davej at redhat.com>
+- 2.6.28-rc7-git7
 
-* Mon Dec 08 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.27.8-142
-- Scheduler fixes from 2.6.28
+* Mon Dec 08 2008 Dave Jones <davej at redhat.com>
+- 2.6.28-rc7-git6
 
-* Mon Dec 08 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.27.8-141
-- Stop the pciehp driver from filling the log with status messages.
+* Mon Dec 08 2008 Kyle McMartin <kyle at redhat.com>
+- properly fix headers in kernel-devel if headers are in arch/$arch/include,
+  sadly was not able to kill off %hdrarch since $Arch is undefined at the
+  time we need it for headers install.
 
-* Mon Dec 08 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.27.8-140
-- Linux 2.6.27.8
-  Dropped patches:
-    linux-2.6-x86-sb600-skip-acpi-irq0-override-if-not-routed-to-int2.patch
-    linux-2.6-x86-more-general-id-for-phoenix-bios.patch
-    linux-2.6-xen-dont-reserve-2-pages-of-padding.patch
-    linux-2.6-usb-ehci-fix-sb700-subsystem-hang.patch
-    linux-2.6-usb-usbmon-fix-read.patch
-    linux-2.6-libata-avoid-overflow-with-large-disks.patch
-    linux-2.6-pci-fix-pciehp.patch
-    linux-2.6-input.git-atkbd-add-quirk-for-inventec.patch
-    linux-2.6.27-ext4-2.6.28-backport-fixups.patch
-    linux-2.6.27-ext4-2.6.28-rc3-git6.patch
-  Added patches:
-    linux-2.6.27-ext4-rename-ext4dev-to-ext4.patch
+* Mon Dec 08 2008 Kyle McMartin <kyle at redhat.com>
+- merging, merging, merging...
 
-* Mon Dec 08 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.27.7-139
-- ALSA 1.0.18a
-  Dropped patches:
-    linux-2.6-alsa-ac97-whitelist.patch
-    linux-2.6-alsa-ac97-whitelist-AD1981B.patch
-    linux-2.6-alsa-revo51-headphone.patch
-    linux-2.6-olpc-speaker-out.patch
+* Mon Dec 08 2008 Dave Jones <davej at redhat.com>
+- enable CONFIG_CGROUP_MEM_RES_CTLR.
 
-* Mon Dec 08 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.27.7-138
-- Fix PCI config space size on AMD Barcelona.
+* Mon Dec 08 2008 Kyle McMartin <kyle at redhat.com>
+- execshield re-merge. xen bits shoved into execshield patch
+  (they belong there...)
 
-* Wed Dec 03 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.27.7-137
-- Update applesmc driver to 2.6.28-rc7-git1
-  Adds: module autoloading
+* Mon Dec 08 2008 Dave Airlie <airlied at redhat.com>
+- modesetting: rebase radeon patch
 
-* Tue Dec 03 2008 Dave Airlie <airlied at redhat.com> 2.6.27.7-136
-- radeon: fix AGP harder than the last time.
+* Fri Dec 05 2008 Dave Jones <davej at redhat.com>
+- 2.6.28-rc7-git5
 
-* Tue Dec 02 2008 John W. Linville <linville at redhat.com> 2.6.27.7-135
-- Backported ath9k DMA fixes from pre-2.6.28
-- Drop patch to disable ath9k when swiotlb is in use
+* Fri Dec 05 2008 Dave Jones <davej at redhat.com>
+- SELinux: check open perms in dentry_open not inode_permission
 
-* Tue Dec 02 2008 Dave Airlie <airlied at redhat.com> 2.6.27.7-134
-- radeon: fix IGP aperture sizing (#473895)
+* Fri Dec 05 2008 Dave Jones <davej at redhat.com>
+- 2.6.28-rc7-git4
 
-* Mon Dec 01 2008 Dave Airlie <airlied at redhat.com> 2.6.27.7-133
-- drm-next.patch: drm/intel: fix VT switch issue harder.
+* Thu Dec 04 2008 Kyle McMartin <kyle at redhat.com>
+- linux-2.6-utrace.patch updates
 
-* Sun Nov 30 2008 Dave Airlie <airlied at redhat.com> 2.6.27.7-132
-- radeon: another AGP fix for r500 cards falling back to PCIE
+* Thu Dec 04 2008 Kyle McMartin <kyle at redhat.com>
+- 2.6.28-rc7-git3
 
-* Sun Nov 30 2008 Dave Airlie <airlied at redhat.com> 2.6.27.7-131
-- radeon: fix card posting, module unload and radeon AGP issues
+* Tue Dec 02 2008 Dave Jones <davej at redhat.com>
+- 2.6.28-rc7-git1
 
-* Thu Nov 27 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.27.7-130
-- Additional fixes for 64K lowmem reservation:
-  - More general matching for Phoenix BIOS
-  - Fix Xen when low 64K is reserved
+* Mon Dec 01 2008 Dave Jones <davej at redhat.com>
+- 2.6.28-rc7
 
-* Thu Nov 27 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.27.7-129
-- Update applesmc driver to 2.6.28-rc6-git1
-  Adds: iMac 5/6/8, Macbook 4/5, Macbook Pro 5, generic MacPro
+* Mon Dec 01 2008 Dave Jones <davej at redhat.com>
+- 2.6.28-rc6-git4
 
-* Thu Nov 27 2008 Dave Airlie <airlied at redhat.com> 2.6.27.7-128
-- drm: intel rebase with upstream fixes - radeon add larger GART size
+* Sun Nov 30 2008 Dave Jones <davej at redhat.com>
+- 2.6.28-rc6-git2
 
-* Tue Nov 25 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.27.7-127
-- Two USB patches scheduled for the next -stable release.
+* Mon Nov 24 2008 Dave Jones <davej at redhat.com>
+- 2.6.28-rc6-git1
 
-* Tue Nov 25 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.27.7-126
-- Fix Zepto notebook multimedia keys (F9#460237)
-- Fix Dell XPS 1530 trackpad (F9#448656)
+* Mon Nov 24 2008 Jeremy Katz <katzj at redhat.com>
+- Add modules.drm file so that we can determine the DRM modules to pull into 
+  initrds
 
-* Tue Nov 25 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.27.7-125
-- Linux 2.6.27.7
-  Dropped patches:
-    linux-2.6.27-sony-laptop-suspend-fix.patch
-    linux-2.6-hostap-skb-cb-hack.patch
-    linux-2.6-wireless-iwlagn-avoid-sleep-in-softirq.patch
+* Wed Nov 19 2008 Neil Horman <nhorman at redhat.com>
+- Enable Garmin gps serial module build (#471824)
 
-* Tue Nov 25 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.27.6-124
-- Linux 2.6.27.6
-  Dropped patches:
-    linux-2.6-acpi-dock-avoid-check-sta-method.patch
-    linux-2.6-blk-cciss-fix-regression-sysfs-symlink-missing.patch
-  Updated patch:
-    linux-2.6-netdev-r8169-2.6.28.patch
-  New config variable:
-    CONFIG_X86_RESERVE_LOW_64K=y
-
-* Mon Nov 24 2008 Dave Airlie <airlied at redhat.com> 2.6.27.5-123
-- radeon: hopefully fix rs690 and rs480 GART invalidation
-
-* Wed Nov 19 2008 Dave Jones <davej at redhat.com> 2.6.27.5-122
-- selinux: recognize netlink messages for 'ip addrlabel' (#469423)
-
-* Wed Nov 19 2008 Hans de Goede <hdegoede at redhat.com> 2.6.27.5-121
-- Update uvcvideo to latest git
-- Patch uvcvideo to not make older logitech cams crash (bz 472217)
+* Tue Nov 18 2008 Dave Jones <davej at redhat.com>
+- Reenable debugging config options.
 
-* Tue Nov 18 2008 Dave Jones <davej at redhat.com> 2.6.27.5-120
+* Tue Nov 18 2008 Dave Jones <davej at redhat.com>
 - Only build the x86-64 optimised versions of aes/salsa/Twofish on 64bit.
 
-* Tue Nov 18 2008 Jarod Wilson <jarod at redhat.com> 2.6.27.5-119
-- Fix hang on VT switch w/compiz on intel graphics (#467332)
-
-* Tue Nov 18 2008 Dave Jones <davej at redhat.com> 2.6.27.5-118
+* Tue Nov 18 2008 Dave Jones <davej at redhat.com>
 - Disable autofs v3. (obsoleted by v4 some time ago.)
 
-* Tue Nov 18 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.27.5-117
-- Disable ath9k when swiotlb is in use (#471329)
-
-* Tue Nov 18 2008 Dave Airlie <airlied at redhat.com> 2.6.27.5-116
-- rebase to intel proper set of patches + test patch fix.
-
-* Mon Nov 17 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.27.5-115
-- Fix missing parens in the cdrom-door-status patch.
+* Mon Nov 17 2008 Kyle McMartin <kyle at redhat.com>
+- Linux 2.6.28-rc5
 
-* Mon Nov 17 2008 Dave Airlie <airlied at redhat.com> 2.6.27.5-114
-- make pci_slot modular by default to avoid boot spew when acpiphp has bound
+* Fri Nov 14 2008 Roland McGrath <roland at redhat.com>
+- x86 tracehook merged upstream
+- utrace update (merge conflict only)
 
-* Mon Nov 17 2008 Dave Airlie <airlied at redhat.com> 2.6.27.5-113
-- drm - intel rebase from upstream - radeon fix memory sizing and zeroing
+* Fri Nov 14 2008 Roland McGrath <roland at redhat.com>
+- CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y replaces patch.
 
-* Fri Nov 14 2008 Dave Airlie <airlied at redhat.com> 2.6.27.5-112
-- radeon - backout patch is over zealous in error handling
+* Thu Nov 13 2008 Dave Jones <davej at redhat.com>
+- Revert last change.
 
-* Fri Nov 14 2008 Dave Airlie <airlied at redhat.com> 2.6.27.5-111
-- radeon - fix low memory issues and locking oops causer
-
-* Thu Nov 13 2008 Dave Jones <davej at redhat.com> 2.6.27.5-110
-- Revert previous change.
-
-* Thu Nov 13 2008 Dave Jones <davej at redhat.com> 2.6.27.5-108
+* Thu Nov 13 2008 Dave Jones <davej at redhat.com>
 - Change CONFIG_SECURITY_DEFAULT_MMAP_MIN_ADDR to 4096 on PPC64. (#471478)
 
-* Thu Nov 13 2008 Dave Jones <davej at redhat.com> 2.6.27.5-107
-- Disable CONFIG_PM_TEST_SUSPEND
-
-* Thu Nov 13 2008 Dave Jones <davej at redhat.com> 2.6.27.5-106
+* Thu Nov 13 2008 Dave Jones <davej at redhat.com>
 - Increase CONFIG_FORCE_MAX_ZONEORDER to 13 on ppc64. (#468982)
 
-* Wed Nov 12 2008 Dave Airlie <airlied at redhat.com> 2.6.27.5-105
-- drm-intel-8xx-pae-no-gem.patch - initial disable GEM on 8xx and PAE (#461205)
-
-* Wed Nov 12 2008 Dave Airlie <airlied at redhat.com> 2.6.27.5-104
-- radeon - fix issues with nomodeset + newest intel irq patches
-
-* Wed Nov 12 2008 Matthew Garrett <mjg at redhat.com> 2.6.27.5-103
-- Ensure that the pciehp driver doesn't attempt to claim IRQ 0
+* Wed Nov 12 2008 Kyle McMartin <kyle at redhat.com>
+- Linux 2.6.28-rc4
 
-* Wed Nov 12 2008 Dave Jones <davej at redhat.com> 2.6.27.5-102
-- Fix backtrace in pciehp driver.
-
-* Wed Nov 12 2008 Dave Airlie <airlied at redhat.com> 2.6.27.5-101
-- drm/intel: further interrupt fixes
-
-* Tue Nov 11 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.27.5-100
-- Check for additional ATI chipset timer bugs (#470939, #470723)
-
-* Tue Nov 11 2008 Dave Airlie <airlied at redhat.com> 2.6.27.5-99
-- drm rebase patches against latest upstream tree.
-
-* Tue Nov 11 2008 Dave Jones <davej at redhat.com> 2.6.27.5-98
-- qla3xxx: Cleanup: Fix link print statements. (#461623)
-
-* Tue Nov 11 2008 Dave Jones <davej at redhat.com> 2.6.27.5-97
-- ALSA: revo51: add headphone output. (#470813)
-
-* Mon Nov 10 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.27.5-96
-- Fix "scheduling from idle thread" bug (#468896)
-
-* Mon Nov 10 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.27.5-95
-- Build a list of modules that do kernel modesetting
-  (modules.modesetting) (#470907)
-
-* Mon Nov 10 2008 Jeremy Katz <katzj at redhat.com> 2.6.27.5-94
-- Fix up bogons in OLPC touchpad patch
-- Reduce error level of an mmc warning on boot for XO (#469159)
-
-* Mon Nov 10 2008 Dave Jones <davej at redhat.com> 2.6.27.5-93
-- Make UTF-8 the default for FAT/VFAT filesystems again.
-
-* Mon Nov 10 2008 Dave Airlie <airlied at redhat.com> 2.6.27.5-92
-- radeon modesetting - fix oops on powerpc + ring sizing bug
-
-* Sun Nov 09 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.27.5-91
-- Fix up the CVE-2008-3528 patch so we get it from -stable.
-
-* Sun Nov 09 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.27.5-90
-- ext4 updates to 2.6.28-rc3
-
-* Sun Nov 09 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.27.5-89
-- Fix ACPI dock bugs (#470321)
-
-* Sat Nov 08 2008 Dave Airlie <airlied at redhat.com> 2.6.27.5-88
-- radeon modesetting - fix mouse on second head and 3 second hangs hopefully
-
-* Fri Nov 07 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.27.5-87
-- Linux 2.6.27.5
-  Dropped Patches:
-    linux-2.6-sched-features-disable-hrtick.patch
-    linux-2.6-sched_clock-prevent-scd-clock-from-moving-backwards
-    linux-2.6-x86-avoid-dereferencing-beyond-stack-THREAD_SIZE.patch
-    linux-2.6-usb-storage-unusual-devs-jmicron-ata-bridge.patch
-    linux-2.6-acpi-clear-wake-status.patch
-    linux-2.6-acpi-ignore-reset_reg_sup.patch
-    linux-2.6-net-tcp-option-ordering.patch
-    linux-2.6-input-dell-keyboard-keyup.patch
-    linux-2.6.27-acpi-ec-drizzle.patch
-    linux-2.6-libata-pata_it821x-fix-lba48-on-raid-volumes.patch
-    linux-2.6-rtc-cmos-look-for-pnp-rtc-first.patch
-    linux-2.6-x86-register-platform-rtc-if-pnp-doesnt-describe-it.patch
-    linux-2.6-agp-intel-cantiga-fix.patch
-  Reverted from upstream:
-    firewire-fix-ioctl-return-code.patch
-    firewire-fix-setting-tag-and-sy-in-iso-transmission.patch
-    firewire-fix-struct-fw_node-memory-leak.patch
-    firewire-fw-sbp2-delay-first-login-to-avoid-retries.patch
-    firewire-fw-sbp2-fix-races.patch
-    firewire-survive-more-than-256-bus-resets.patch
+* Sun Nov 09 2008 Eric Sandeen <sandeen at redhat.com>
+- Pull back ext4 updates from 2.6.28-rc3-git6
 
-* Fri Nov 07 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.27.4-86
+* Fri Nov 07 2008 Chuck Ebbert <cebbert at redhat.com>
 - Update the r8169 network driver to the 2.6.28 version.
 
-* Fri Nov 07 2008 John W. Linville <linville at redhat.com> 2.6.27.4-85
+* Fri Nov 07 2008 John W. Linville <linville at redhat.com>
 - Re-modularize ieee80211 component
 - Cleanup ieee80211-related config stuff
 

linux-2.6-compile-fixes.patch:

Index: linux-2.6-compile-fixes.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/linux-2.6-compile-fixes.patch,v
retrieving revision 1.178
retrieving revision 1.179
diff -u -r1.178 -r1.179
--- linux-2.6-compile-fixes.patch	8 Oct 2008 22:32:46 -0000	1.178
+++ linux-2.6-compile-fixes.patch	12 Jan 2009 19:51:28 -0000	1.179
@@ -11,14 +11,15 @@
 Signed-off-by: Dave Jones <davej at redhat.com>
 
 diff --git a/arch/powerpc/sysdev/fsl_lbc.c b/arch/powerpc/sysdev/fsl_lbc.c
-index 422c8fa..1c6c522 100644
+index 0494ee5..43a9e56 100644
 --- a/arch/powerpc/sysdev/fsl_lbc.c
 +++ b/arch/powerpc/sysdev/fsl_lbc.c
-@@ -16,6 +16,7 @@
+@@ -23,6 +23,8 @@
  #include <asm/fsl_lbc.h>
  
- spinlock_t fsl_lbc_lock = __SPIN_LOCK_UNLOCKED(fsl_lbc_lock);
+ static spinlock_t fsl_lbc_lock = __SPIN_LOCK_UNLOCKED(fsl_lbc_lock);
 +EXPORT_SYMBOL(fsl_lbc_lock);
++
+ static struct fsl_lbc_regs __iomem *fsl_lbc_regs;
  
- struct fsl_lbc_regs __iomem *fsl_lbc_regs;
- EXPORT_SYMBOL(fsl_lbc_regs);
+ static char __initdata *compat_lbc[] = {

linux-2.6-crash-driver.patch:

Index: linux-2.6-crash-driver.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/linux-2.6-crash-driver.patch,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- linux-2.6-crash-driver.patch	12 Feb 2008 06:18:04 -0000	1.11
+++ linux-2.6-crash-driver.patch	12 Jan 2009 19:51:28 -0000	1.12
@@ -1,7 +1,104 @@
-diff -urNp --exclude-from=/home/davej/.exclude linux-1050/arch/ia64/kernel/ia64_ksyms.c linux-1060/arch/ia64/kernel/ia64_ksyms.c
---- linux-1050/arch/ia64/kernel/ia64_ksyms.c
-+++ linux-1060/arch/ia64/kernel/ia64_ksyms.c
-@@ -106,6 +106,9 @@ EXPORT_SYMBOL(ia64_save_scratch_fpregs);
+diff --git a/arch/ia64/include/asm/crash.h b/arch/ia64/include/asm/crash.h
+new file mode 100644
+index 0000000..541af84
+--- /dev/null
++++ b/arch/ia64/include/asm/crash.h
+@@ -0,0 +1,90 @@
++#ifndef _ASM_IA64_CRASH_H
++#define _ASM_IA64_CRASH_H
++
++/*
++ * linux/include/asm-ia64/crash.h
++ *
++ * Copyright (c) 2004 Red Hat, Inc. All rights reserved.
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 2, 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.
++ *
++ */
++
++#ifdef __KERNEL__
++
++#include <linux/efi.h>
++#include <linux/mm.h>
++#include <asm/mmzone.h>
++
++static inline void *
++map_virtual(u64 offset, struct page **pp)
++{
++	struct page *page;
++	unsigned long pfn;
++	u32 type;
++
++	if (REGION_NUMBER(offset) == 5) {
++		char byte;
++
++		if (__get_user(byte, (char *)offset) == 0)
++			return (void *)offset;
++		else
++			return NULL;
++	}
++
++	switch (type = efi_mem_type(offset)) 
++	{
++	case EFI_LOADER_CODE:
++	case EFI_LOADER_DATA:
++	case EFI_BOOT_SERVICES_CODE:
++	case EFI_BOOT_SERVICES_DATA:
++	case EFI_CONVENTIONAL_MEMORY:
++		break;
++
++	default:
++		printk(KERN_INFO
++		    "crash memory driver: invalid memory type for %lx: %d\n", 
++			offset, type);
++		return NULL;
++	}
++
++	pfn = offset >> PAGE_SHIFT;
++
++	if (!pfn_valid(pfn)) {
++		printk(KERN_INFO
++			"crash memory driver: invalid pfn: %lx )\n", pfn);
++		return NULL;
++	}
++
++	page = pfn_to_page(pfn);
++
++	if (!page->virtual) {
++		printk(KERN_INFO
++		    "crash memory driver: offset: %lx page: %lx page->virtual: NULL\n", 
++			offset, (unsigned long)page);
++		return NULL;
++	}
++
++	return (page->virtual + (offset & (PAGE_SIZE-1)));
++}
++
++static inline void unmap_virtual(struct page *page) 
++{ 
++	return;
++}
++
++#endif /* __KERNEL__ */
++
++#endif /* _ASM_IA64_CRASH_H */
+diff --git a/arch/ia64/kernel/ia64_ksyms.c b/arch/ia64/kernel/ia64_ksyms.c
+index 6da1f20..2984fb3 100644
+--- a/arch/ia64/kernel/ia64_ksyms.c
++++ b/arch/ia64/kernel/ia64_ksyms.c
+@@ -86,6 +86,9 @@ EXPORT_SYMBOL(ia64_save_scratch_fpregs);
  #include <asm/unwind.h>
  EXPORT_SYMBOL(unw_init_running);
  
@@ -10,10 +107,50 @@
 +
  #ifdef ASM_SUPPORTED
  # ifdef CONFIG_SMP
- #  if __GNUC__ < 3 || (__GNUC__ == 3 && __GNUC_MINOR__ < 3)
-diff -urNp --exclude-from=/home/davej/.exclude linux-1050/drivers/char/crash.c linux-1060/drivers/char/crash.c
---- linux-1050/drivers/char/crash.c
-+++ linux-1060/drivers/char/crash.c
+ #  if (__GNUC__ == 3 && __GNUC_MINOR__ < 3)
+diff --git a/arch/x86/mm/ioremap.c b/arch/x86/mm/ioremap.c
+index d4c4307..d1c968f 100644
+--- a/arch/x86/mm/ioremap.c
++++ b/arch/x86/mm/ioremap.c
+@@ -133,6 +133,7 @@ int page_is_ram(unsigned long pagenr)
+ 	}
+ 	return 0;
+ }
++EXPORT_SYMBOL_GPL(page_is_ram);
+ 
+ int pagerange_is_ram(unsigned long start, unsigned long end)
+ {
+diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
+index 43d6ba8..0d81c9a 100644
+--- a/drivers/char/Kconfig
++++ b/drivers/char/Kconfig
+@@ -460,6 +460,8 @@ config LEGACY_PTYS
+ 	  security.  This option enables these legacy devices; on most
+ 	  systems, it is safe to say N.
+ 
++config CRASH
++        tristate "Crash Utility memory driver"
+ 
+ config LEGACY_PTY_COUNT
+ 	int "Maximum number of legacy PTY in use"
+diff --git a/drivers/char/Makefile b/drivers/char/Makefile
+index 438f713..1b7767b 100644
+--- a/drivers/char/Makefile
++++ b/drivers/char/Makefile
+@@ -109,6 +109,8 @@ obj-$(CONFIG_PS3_FLASH)		+= ps3flash.o
+ obj-$(CONFIG_JS_RTC)		+= js-rtc.o
+ js-rtc-y = rtc.o
+ 
++obj-$(CONFIG_CRASH)		+= crash.o
++
+ # Files generated that shall be removed upon make clean
+ clean-files := consolemap_deftbl.c defkeymap.c
+ 
+diff --git a/drivers/char/crash.c b/drivers/char/crash.c
+new file mode 100644
+index 0000000..e5437de
+--- /dev/null
++++ b/drivers/char/crash.c
 @@ -0,0 +1,128 @@
 +/*
 + *  linux/drivers/char/crash.c
@@ -143,32 +280,11 @@
 +module_exit(crash_cleanup_module);
 +
 +MODULE_LICENSE("GPL");
-diff -urNp --exclude-from=/home/davej/.exclude linux-1050/drivers/char/Kconfig linux-1060/drivers/char/Kconfig
---- linux-1050/drivers/char/Kconfig
-+++ linux-1060/drivers/char/Kconfig
-@@ -441,6 +441,8 @@ config LEGACY_PTYS
- 	  security.  This option enables these legacy devices; on most
- 	  systems, it is safe to say N.
- 
-+config CRASH
-+        tristate "Crash Utility memory driver"
- 
- config LEGACY_PTY_COUNT
- 	int "Maximum number of legacy PTY in use"
---- linux-2.6.16.noarch/drivers/char/Makefile~	2006-03-25 18:50:42.000000000 -0500
-+++ linux-2.6.16.noarch/drivers/char/Makefile	2006-03-25 18:50:59.000000000 -0500
-@@ -95,6 +95,8 @@ obj-$(CONFIG_IPMI_HANDLER)	+= ipmi/
- obj-$(CONFIG_JS_RTC)		+= js-rtc.o
- js-rtc-y = rtc.o
- 
-+obj-$(CONFIG_CRASH)		+= crash.o
-+
- # Files generated that shall be removed upon make clean
- clean-files := consolemap_deftbl.c defkeymap.c
- 
-diff -urNp --exclude-from=/home/davej/.exclude linux-1050/include/asm-i386/crash.h linux-1060/include/asm-i386/crash.h
---- linux-1050/include/asm-x86/crash.h
-+++ linux-1060/include/asm-x86/crash.h
+diff --git a/include/asm-x86/crash.h b/include/asm-x86/crash.h
+new file mode 100644
+index 0000000..dfcc006
+--- /dev/null
++++ b/include/asm-x86/crash.h
 @@ -0,0 +1,75 @@
 +#ifndef _ASM_I386_CRASH_H
 +#define _ASM_I386_CRASH_H
@@ -245,109 +361,3 @@
 +#endif /* __KERNEL__ */
 +
 +#endif /* _ASM_I386_CRASH_H */
-diff -urNp --exclude-from=/home/davej/.exclude linux-1050/include/asm-ia64/crash.h linux-1060/include/asm-ia64/crash.h
---- linux-1050/include/asm-ia64/crash.h
-+++ linux-1060/include/asm-ia64/crash.h
-@@ -0,0 +1,90 @@
-+#ifndef _ASM_IA64_CRASH_H
-+#define _ASM_IA64_CRASH_H
-+
-+/*
-+ * linux/include/asm-ia64/crash.h
-+ *
-+ * Copyright (c) 2004 Red Hat, Inc. All rights reserved.
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2, 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.
-+ *
-+ */
-+
-+#ifdef __KERNEL__
-+
-+#include <linux/efi.h>
-+#include <linux/mm.h>
-+#include <asm/mmzone.h>
-+
-+static inline void *
-+map_virtual(u64 offset, struct page **pp)
-+{
-+	struct page *page;
-+	unsigned long pfn;
-+	u32 type;
-+
-+	if (REGION_NUMBER(offset) == 5) {
-+		char byte;
-+
-+		if (__get_user(byte, (char *)offset) == 0)
-+			return (void *)offset;
-+		else
-+			return NULL;
-+	}
-+
-+	switch (type = efi_mem_type(offset)) 
-+	{
-+	case EFI_LOADER_CODE:
-+	case EFI_LOADER_DATA:
-+	case EFI_BOOT_SERVICES_CODE:
-+	case EFI_BOOT_SERVICES_DATA:
-+	case EFI_CONVENTIONAL_MEMORY:
-+		break;
-+
-+	default:
-+		printk(KERN_INFO
-+		    "crash memory driver: invalid memory type for %lx: %d\n", 
-+			offset, type);
-+		return NULL;
-+	}
-+
-+	pfn = offset >> PAGE_SHIFT;
-+
-+	if (!pfn_valid(pfn)) {
-+		printk(KERN_INFO
-+			"crash memory driver: invalid pfn: %lx )\n", pfn);
-+		return NULL;
-+	}
-+
-+	page = pfn_to_page(pfn);
-+
-+	if (!page->virtual) {
-+		printk(KERN_INFO
-+		    "crash memory driver: offset: %lx page: %lx page->virtual: NULL\n", 
-+			offset, (unsigned long)page);
-+		return NULL;
-+	}
-+
-+	return (page->virtual + (offset & (PAGE_SIZE-1)));
-+}
-+
-+static inline void unmap_virtual(struct page *page) 
-+{ 
-+	return;
-+}
-+
-+#endif /* __KERNEL__ */
-+
-+#endif /* _ASM_IA64_CRASH_H */
-diff --git a/arch/x86/mm/ioremap.c b/arch/x86/mm/ioremap.c
-index c004d94..13417a2 100644
---- a/arch/x86/mm/ioremap.c
-+++ b/arch/x86/mm/ioremap.c
-@@ -65,6 +65,7 @@ int page_is_ram(unsigned long pagenr)
- 	}
- 	return 0;
- }
-+EXPORT_SYMBOL_GPL(page_is_ram);
- 
- /*
-  * Fix up the linear direct mapping of the kernel to avoid cache attribute

linux-2.6-debug-taint-vm.patch:

Index: linux-2.6-debug-taint-vm.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/linux-2.6-debug-taint-vm.patch,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- linux-2.6-debug-taint-vm.patch	5 Mar 2008 15:12:35 -0000	1.21
+++ linux-2.6-debug-taint-vm.patch	12 Jan 2009 19:51:28 -0000	1.22
@@ -1,20 +1,48 @@
 diff --git a/kernel/panic.c b/kernel/panic.c
-index 6f6e03e..198fc58 100644
+index 4d50883..f4a6faa 100644
 --- a/kernel/panic.c
 +++ b/kernel/panic.c
-@@ -173,6 +173,7 @@ const char *print_tainted(void)
+@@ -193,6 +193,7 @@ const char *print_tainted(void)
  		snprintf(buf, sizeof(buf), "Not tainted");
  	return(buf);
  }
 +EXPORT_SYMBOL(print_tainted);
  
- void add_taint(unsigned flag)
+ int test_taint(unsigned flag)
  {
+@@ -328,8 +329,8 @@ void warn_on_slowpath(const char *file, int line)
+ 	sprint_symbol(function, caller);
+ 
+ 	printk(KERN_WARNING "------------[ cut here ]------------\n");
+-	printk(KERN_WARNING "WARNING: at %s:%d %s()\n", file,
+-		line, function);
++	printk(KERN_WARNING "WARNING: at %s:%d %s() (%s)\n", file,
++		line, function, print_tainted());
+ 	print_modules();
+ 	dump_stack();
+ 	print_oops_end_marker();
+diff --git a/mm/page_alloc.c b/mm/page_alloc.c
+index d8ac014..1d035f0 100644
+--- a/mm/page_alloc.c
++++ b/mm/page_alloc.c
+@@ -224,10 +224,10 @@ static inline int bad_range(struct zone *zone, struct page *page)
+ static void bad_page(struct page *page)
+ {
+ 	printk(KERN_EMERG "Bad page state in process '%s'\n" KERN_EMERG
+-		"page:%p flags:0x%0*lx mapping:%p mapcount:%d count:%d\n",
++		"page:%p flags:0x%0*lx mapping:%p mapcount:%d count:%d (%s)\n",
+ 		current->comm, page, (int)(2*sizeof(unsigned long)),
+ 		(unsigned long)page->flags, page->mapping,
+-		page_mapcount(page), page_count(page));
++		page_mapcount(page), page_count(page), print_tainted());
+ 
+ 	printk(KERN_EMERG "Trying to fix it up, but a reboot is needed\n"
+ 		KERN_EMERG "Backtrace:\n");
 diff --git a/mm/slab.c b/mm/slab.c
-index 2e338a5..e5627f9 100644
+index 0918751..0977a03 100644
 --- a/mm/slab.c
 +++ b/mm/slab.c
-@@ -1846,8 +1846,8 @@ static void check_poison_obj(struct kmem_cache *cachep, void *objp)
+@@ -1858,8 +1858,8 @@ static void check_poison_obj(struct kmem_cache *cachep, void *objp)
  			/* Print header */
  			if (lines == 0) {
  				printk(KERN_ERR
@@ -25,7 +53,7 @@
  				print_objinfo(cachep, objp, 0);
  			}
  			/* Hexdump the affected line */
-@@ -2935,8 +2935,8 @@ static void check_slabp(struct kmem_cache *cachep, struct slab *slabp)
+@@ -2928,8 +2928,8 @@ static void check_slabp(struct kmem_cache *cachep, struct slab *slabp)
  	if (entries != cachep->num - slabp->inuse) {
  bad:
  		printk(KERN_ERR "slab: Internal list corruption detected in "
@@ -37,10 +65,10 @@
  		     i < sizeof(*slabp) + cachep->num * sizeof(kmem_bufctl_t);
  		     i++) {
 diff --git a/mm/slub.c b/mm/slub.c
-index 9c1d9f3..e11d58d 100644
+index 749588a..0ef64f1 100644
 --- a/mm/slub.c
 +++ b/mm/slub.c
-@@ -451,7 +451,7 @@ static void slab_bug(struct kmem_cache *s, char *fmt, ...)
+@@ -430,7 +430,7 @@ static void slab_bug(struct kmem_cache *s, char *fmt, ...)
  	va_end(args);
  	printk(KERN_ERR "========================================"
  			"=====================================\n");
@@ -49,35 +77,3 @@
  	printk(KERN_ERR "----------------------------------------"
  			"-------------------------------------\n\n");
  }
-diff --git a/kernel/panic.c b/kernel/panic.c
-index d9e90cf..570b1f6 100644
---- a/kernel/panic.c
-+++ b/kernel/panic.c
-@@ -306,8 +306,8 @@ void warn_on_slowpath(const char *file, int line)
- 	sprint_symbol(function, caller);
- 
- 	printk(KERN_WARNING "------------[ cut here ]------------\n");
--	printk(KERN_WARNING "WARNING: at %s:%d %s()\n", file,
--		line, function);
-+	printk(KERN_WARNING "WARNING: at %s:%d %s() (%s)\n", file,
-+		line, function, print_tainted());
- 	print_modules();
- 	dump_stack();
- 	print_oops_end_marker();
-diff --git a/mm/page_alloc.c b/mm/page_alloc.c
-index 402a504..2085092 100644
---- a/mm/page_alloc.c
-+++ b/mm/page_alloc.c
-@@ -225,10 +225,10 @@ static void bad_page(struct page *page)
- 	void *pc = page_get_page_cgroup(page);
- 
- 	printk(KERN_EMERG "Bad page state in process '%s'\n" KERN_EMERG
--		"page:%p flags:0x%0*lx mapping:%p mapcount:%d count:%d\n",
-+		"page:%p flags:0x%0*lx mapping:%p mapcount:%d count:%d (%s)\n",
- 		current->comm, page, (int)(2*sizeof(unsigned long)),
- 		(unsigned long)page->flags, page->mapping,
--		page_mapcount(page), page_count(page));
-+		page_mapcount(page), page_count(page), print_tainted());
- 	if (pc) {
- 		printk(KERN_EMERG "cgroup:%p\n", pc);
- 		page_reset_bad_cgroup(page);

linux-2.6-defaults-pci_no_msi.patch:

Index: linux-2.6-defaults-pci_no_msi.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/linux-2.6-defaults-pci_no_msi.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-defaults-pci_no_msi.patch	3 May 2008 03:36:55 -0000	1.1
+++ linux-2.6-defaults-pci_no_msi.patch	12 Jan 2009 19:51:29 -0000	1.2
@@ -1,10 +1,22 @@
-Disable PCI MSI by default, add kernel parameter to enable it.
-
-Signed-off-by: Chuck Ebbert <cebbert at redhat.com>
-
---- linux-2.6.20.noarch.orig/drivers/pci/msi.c
-+++ linux-2.6.20.noarch/drivers/pci/msi.c
-@@ -23,7 +23,7 @@ static DEFINE_SPINLOCK(msi_lock);
+diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
+index e0f346d..9e70467 100644
+--- a/Documentation/kernel-parameters.txt
++++ b/Documentation/kernel-parameters.txt
+@@ -1623,6 +1623,9 @@ and is between 256 and 4096 characters. It is defined in the file
+ 				root domains (aka PCI segments, in ACPI-speak).
+ 		nommconf	[X86-32,X86_64] Disable use of MMCONFIG for PCI
+ 				Configuration
++		msi		[MSI] If the PCI_MSI kernel config parameter is
++				enabled, this kernel boot option can be used to
++				enable the use of MSI interrupts system-wide.
+ 		nomsi		[MSI] If the PCI_MSI kernel config parameter is
+ 				enabled, this kernel boot option can be used to
+ 				disable the use of MSI interrupts system-wide.
+diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c
+index 74801f7..ffcf464 100644
+--- a/drivers/pci/msi.c
++++ b/drivers/pci/msi.c
+@@ -23,7 +23,7 @@
  #include "pci.h"
  #include "msi.h"
  
@@ -13,33 +25,23 @@
  
  /* Arch hooks */
  
-@@ -722,6 +722,11 @@ void pci_no_msi(void)
- {
+@@ -755,6 +755,11 @@ void pci_no_msi(void)
  	pci_msi_enable = 0;
  }
-+
+ 
 +void pci_yes_msi(void)
 +{
 +	pci_msi_enable = 1;
 +}
- 
++
  void pci_msi_init_pci_dev(struct pci_dev *dev)
  {
---- linux-2.6.20.noarch.orig/Documentation/kernel-parameters.txt
-+++ linux-2.6.20.noarch/Documentation/kernel-parameters.txt
-@@ -1429,6 +1429,9 @@ and is between 256 and 4096 characters. 
- 				root domains (aka PCI segments, in ACPI-speak).
- 		nommconf	[X86-32,X86_64] Disable use of MMCONFIG for PCI
- 				Configuration
-+		msi		[MSI] If the PCI_MSI kernel config parameter is
-+				enabled, this kernel boot option can be used to
-+				enable the use of MSI interrupts system-wide.
- 		nomsi		[MSI] If the PCI_MSI kernel config parameter is
- 				enabled, this kernel boot option can be used to
- 				disable the use of MSI interrupts system-wide.
---- linux-2.6.20.noarch.orig/drivers/pci/pci.c
-+++ linux-2.6.20.noarch/drivers/pci/pci.c
-@@ -1642,6 +1642,8 @@ static int __devinit pci_setup(char *str
+ 	INIT_LIST_HEAD(&dev->msi_list);
+diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
+index 061d1ee..883e572 100644
+--- a/drivers/pci/pci.c
++++ b/drivers/pci/pci.c
+@@ -2051,6 +2051,8 @@ static int __init pci_setup(char *str)
  		if (*str && (str = pcibios_setup(str)) && *str) {
  			if (!strcmp(str, "nomsi")) {
  				pci_no_msi();
@@ -48,17 +50,20 @@
  			} else if (!strcmp(str, "noaer")) {
  				pci_no_aer();
  			} else if (!strcmp(str, "nodomains")) {
---- linux-2.6.20.noarch.orig/drivers/pci/pci.h
-+++ linux-2.6.20.noarch/drivers/pci/pci.h
-@@ -41,9 +41,11 @@ extern unsigned int pci_pm_d3_delay;
+diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h
+index 9de87e9..c0327e7 100644
+--- a/drivers/pci/pci.h
++++ b/drivers/pci/pci.h
+@@ -97,10 +97,12 @@ extern unsigned int pci_pm_d3_delay;
  
  #ifdef CONFIG_PCI_MSI
  void pci_no_msi(void);
 +void pci_yes_msi(void);
  extern void pci_msi_init_pci_dev(struct pci_dev *dev);
+ extern void __devinit msi_init(void);
  #else
  static inline void pci_no_msi(void) { }
 +static inline void pci_yes_msi(void) { }
  static inline void pci_msi_init_pci_dev(struct pci_dev *dev) { }
+ static inline void msi_init(void) { }
  #endif
- 

linux-2.6-execshield.patch:

Index: linux-2.6-execshield.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/linux-2.6-execshield.patch,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -r1.97 -r1.98
--- linux-2.6-execshield.patch	10 Oct 2008 19:46:18 -0000	1.97
+++ linux-2.6-execshield.patch	12 Jan 2009 19:51:29 -0000	1.98
@@ -1,6 +1,120 @@
---- linux-2.6.25.noarch/arch/x86/kernel/cpu/common.c~	2008-05-16 13:41:08.000000000 -0400
-+++ linux-2.6.25.noarch/arch/x86/kernel/cpu/common.c	2008-05-16 13:42:11.000000000 -0400
-@@ -479,6 +479,21 @@ void __cpuinit identify_cpu(struct cpuin
+diff --git a/arch/x86/include/asm/desc.h b/arch/x86/include/asm/desc.h
+index e6b82b1..c314884 100644
+--- a/arch/x86/include/asm/desc.h
++++ b/arch/x86/include/asm/desc.h
+@@ -6,6 +6,7 @@
+ #include <asm/ldt.h>
+ #include <asm/mmu.h>
+ #include <linux/smp.h>
++#include <linux/mm_types.h>
+ 
+ static inline void fill_ldt(struct desc_struct *desc,
+ 			    const struct user_desc *info)
+@@ -95,6 +96,9 @@ static inline int desc_empty(const void *ptr)
+ 
+ #define load_TLS(t, cpu) native_load_tls(t, cpu)
+ #define set_ldt native_set_ldt
++#ifdef CONFIG_X86_32
++#define load_user_cs_desc native_load_user_cs_desc
++#endif /*CONFIG_X86_32*/
+ 
+ #define write_ldt_entry(dt, entry, desc)	\
+ 	native_write_ldt_entry(dt, entry, desc)
+@@ -381,6 +385,24 @@ static inline void set_system_intr_gate_ist(int n, void *addr, unsigned ist)
+ 	_set_gate(n, GATE_INTERRUPT, addr, 0x3, ist, __KERNEL_CS);
+ }
+ 
++#ifdef CONFIG_X86_32
++static inline void set_user_cs(struct desc_struct *desc, unsigned long limit)
++{
++	limit = (limit - 1) / PAGE_SIZE;
++	desc->a = limit & 0xffff;
++	desc->b = (limit & 0xf0000) | 0x00c0fb00;
++}
++
++static inline void native_load_user_cs_desc(int cpu, struct mm_struct *mm)
++{
++	get_cpu_gdt_table(cpu)[GDT_ENTRY_DEFAULT_USER_CS] = (mm)->context.user_cs;
++}
++
++extern void arch_add_exec_range(struct mm_struct *mm, unsigned long limit);
++extern void arch_remove_exec_range(struct mm_struct *mm, unsigned long limit);
++extern void arch_flush_exec_range(struct mm_struct *mm);
++#endif /* CONFIG_X86_32 */
++
+ #else
+ /*
+  * GET_DESC_BASE reads the descriptor base of the specified segment.
+diff --git a/arch/x86/include/asm/mmu.h b/arch/x86/include/asm/mmu.h
+index 80a1dee..8314c66 100644
+--- a/arch/x86/include/asm/mmu.h
++++ b/arch/x86/include/asm/mmu.h
+@@ -7,12 +7,19 @@
+ /*
+  * The x86 doesn't have a mmu context, but
+  * we put the segment information here.
++ *
++ * exec_limit is used to track the range PROT_EXEC
++ * mappings span.
+  */
+ typedef struct {
+ 	void *ldt;
+ 	int size;
+ 	struct mutex lock;
+ 	void *vdso;
++#ifdef CONFIG_X86_32
++	struct desc_struct user_cs;
++	unsigned long exec_limit;
++#endif
+ } mm_context_t;
+ 
+ #ifdef CONFIG_SMP
+diff --git a/arch/x86/include/asm/paravirt.h b/arch/x86/include/asm/paravirt.h
+index ba3e2ff..42a65f4 100644
+--- a/arch/x86/include/asm/paravirt.h
++++ b/arch/x86/include/asm/paravirt.h
+@@ -113,6 +113,9 @@ struct pv_cpu_ops {
+ 	void (*store_gdt)(struct desc_ptr *);
+ 	void (*store_idt)(struct desc_ptr *);
+ 	void (*set_ldt)(const void *desc, unsigned entries);
++#ifdef CONFIG_X86_32
++	void (*load_user_cs_desc)(int cpu, struct mm_struct *mm);
++#endif /*CONFIG_X86_32*/
+ 	unsigned long (*store_tr)(void);
+ 	void (*load_tls)(struct thread_struct *t, unsigned int cpu);
+ #ifdef CONFIG_X86_64
+@@ -860,6 +863,12 @@ static inline void set_ldt(const void *addr, unsigned entries)
+ {
+ 	PVOP_VCALL2(pv_cpu_ops.set_ldt, addr, entries);
+ }
++#ifdef CONFIG_X86_32
++static inline void load_user_cs_desc(unsigned int cpu, struct mm_struct *mm)
++{
++	PVOP_VCALL2(pv_cpu_ops.load_user_cs_desc, cpu, mm);
++}
++#endif /*CONFIG_X86_32*/
+ static inline void store_gdt(struct desc_ptr *dtr)
+ {
+ 	PVOP_VCALL1(pv_cpu_ops.store_gdt, dtr);
+diff --git a/arch/x86/include/asm/processor.h b/arch/x86/include/asm/processor.h
+index 5ca01e3..4f319b1 100644
+--- a/arch/x86/include/asm/processor.h
++++ b/arch/x86/include/asm/processor.h
+@@ -154,6 +154,9 @@ static inline int hlt_works(int cpu)
+ 
+ #define cache_line_size()	(boot_cpu_data.x86_cache_alignment)
+ 
++#define __HAVE_ARCH_ALIGN_STACK
++extern unsigned long arch_align_stack(unsigned long sp);
++
+ extern void cpu_detect(struct cpuinfo_x86 *c);
+ 
+ extern struct pt_regs *idle_regs(struct pt_regs *);
+diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c
+index b9c9ea0..666dd0e 100644
+--- a/arch/x86/kernel/cpu/common.c
++++ b/arch/x86/kernel/cpu/common.c
+@@ -687,6 +687,21 @@ static void __cpuinit identify_cpu(struct cpuinfo_x86 *c)
  	 * we do "generic changes."
  	 */
  
@@ -13,20 +127,45 @@
 +	 */
 +	if (exec_shield != 0) {
 +#ifdef CONFIG_X86_PAE
-+		if (!test_bit(X86_FEATURE_NX, c->x86_capability))
++		if (!test_cpu_cap(c, X86_FEATURE_NX))
 +#endif
-+			clear_bit(X86_FEATURE_SEP, c->x86_capability);
++			clear_cpu_cap(c, X86_FEATURE_SEP);
 +	}
 +
 +
  	/* If the model name is still unset, do table lookup. */
  	if (!c->x86_model_id[0]) {
  		char *p;
+diff --git a/arch/x86/kernel/paravirt.c b/arch/x86/kernel/paravirt.c
+index e4c8fb6..30f7508 100644
+--- a/arch/x86/kernel/paravirt.c
++++ b/arch/x86/kernel/paravirt.c
+@@ -326,6 +326,9 @@ struct pv_cpu_ops pv_cpu_ops = {
+ 	.read_tscp = native_read_tscp,
+ 	.load_tr_desc = native_load_tr_desc,
+ 	.set_ldt = native_set_ldt,
++#ifdef CONFIG_X86_32
++	.load_user_cs_desc = native_load_user_cs_desc,
++#endif /*CONFIG_X86_32*/
+ 	.load_gdt = native_load_gdt,
+ 	.load_idt = native_load_idt,
+ 	.store_gdt = native_store_gdt,
 diff --git a/arch/x86/kernel/process_32.c b/arch/x86/kernel/process_32.c
-index a7d50a5..83f7b4e 100644
+index 0a1302f..ab96a10 100644
 --- a/arch/x86/kernel/process_32.c
 +++ b/arch/x86/kernel/process_32.c
-@@ -677,7 +677,8 @@ struct task_struct * __switch_to(struct task_struct *prev_p, struct task_struct
+@@ -354,6 +354,10 @@ start_thread(struct pt_regs *regs, unsigned long new_ip, unsigned long new_sp)
+ 	regs->cs		= __USER_CS;
+ 	regs->ip		= new_ip;
+ 	regs->sp		= new_sp;
++	preempt_disable();
++	load_user_cs_desc(smp_processor_id(), current->mm);
++	preempt_enable();
++
+ 	/*
+ 	 * Free the old FP and other extended state
+ 	 */
+@@ -558,7 +562,8 @@ struct task_struct * __switch_to(struct task_struct *prev_p, struct task_struct
  	/* never put a printk in __switch_to... printk() calls wake_up*() indirectly */
  
  	__unlazy_fpu(prev_p);
@@ -36,11 +175,7 @@
  
  	/* we're going to use this soon, after a few expensive things */
  	if (next_p->fpu_counter > 5)
-diff --git a/arch/x86/kernel/process_32.c b/arch/x86/kernel/process_32.c
-index a7d50a5..86e35cb 100644
---- a/arch/x86/kernel/process_32.c
-+++ b/arch/x86/kernel/process_32.c
-@@ -847,3 +847,39 @@ unsigned long arch_randomize_brk(struct mm_struct *mm)
+@@ -731,3 +736,39 @@ unsigned long arch_randomize_brk(struct mm_struct *mm)
  	unsigned long range_end = mm->brk + 0x02000000;
  	return randomize_range(mm->brk, range_end, 0) ? : mm->brk;
  }
@@ -80,8 +215,10 @@
 +	mm->context.exec_limit = 0;
 +	set_user_cs(&mm->context.user_cs, 0);
 +}
---- linux-2.6.25.noarch/arch/x86/kernel/tlb_32.c~	2008-05-16 13:30:44.000000000 -0400
-+++ linux-2.6.25.noarch/arch/x86/kernel/tlb_32.c	2008-05-16 13:31:14.000000000 -0400
+diff --git a/arch/x86/kernel/tlb_32.c b/arch/x86/kernel/tlb_32.c
+index f4049f3..e7a1b7c 100644
+--- a/arch/x86/kernel/tlb_32.c
++++ b/arch/x86/kernel/tlb_32.c
 @@ -2,6 +2,7 @@
  #include <linux/cpu.h>
  #include <linux/interrupt.h>
@@ -90,7 +227,7 @@
  #include <asm/tlbflush.h>
  
  DEFINE_PER_CPU(struct tlb_state, cpu_tlbstate)
-@@ -92,6 +93,8 @@ void smp_invalidate_interrupt(struct pt_
+@@ -92,6 +93,8 @@ void smp_invalidate_interrupt(struct pt_regs *regs)
  	unsigned long cpu;
  
  	cpu = get_cpu();
@@ -99,13 +236,14 @@
  
  	if (!cpu_isset(cpu, flush_cpumask))
  		goto out;
---- linux-2.6.26.noarch/arch/x86/kernel/traps_32.c~	2008-07-14 20:20:15.000000000 -0400
-+++ linux-2.6.26.noarch/arch/x86/kernel/traps_32.c	2008-07-14 20:26:18.000000000 -0400
-@@ -596,7 +596,91 @@ DO_ERROR(10, SIGSEGV, "invalid TSS", inv
- DO_ERROR(11, SIGBUS, "segment not present", segment_not_present)
- DO_ERROR(12, SIGBUS, "stack segment", stack_segment)
- DO_ERROR_INFO(17, SIGBUS, "alignment check", alignment_check, BUS_ADRALN, 0, 0)
--DO_ERROR_INFO(32, SIGILL, "iret exception", iret_error, ILL_BADSTK, 0, 1)
+diff --git a/arch/x86/kernel/traps.c b/arch/x86/kernel/traps.c
+index 04d242a..bb52785 100644
+--- a/arch/x86/kernel/traps.c
++++ b/arch/x86/kernel/traps.c
+@@ -159,6 +159,63 @@ static int lazy_iobitmap_copy(void)
+ 
+ 	return 0;
+ }
 +
 +/*
 + * lazy-check for CS validity on exec-shield binaries:
@@ -157,94 +295,97 @@
 +				current->mm->context.exec_limit, desc1->a, desc1->b, desc2->a, desc2->b);
 +		}
 +		load_user_cs_desc(cpu, current->mm);
++
 +		return 1;
 +	}
 +
 +	return 0;
 +}
-+
-+/*
-+ * The fixup code for errors in iret jumps to here (iret_exc).  It loses
-+ * the original trap number and error code.  The bogus trap 32 and error
-+ * code 0 are what the vanilla kernel delivers via:
-+ * DO_ERROR_INFO(32, SIGSEGV, "iret exception", iret_error, ILL_BADSTK, 0, 1)
-+ *
-+ * NOTE: Because of the final "1" in the macro we need to enable interrupts.
-+ *
-+ * In case of a general protection fault in the iret instruction, we
-+ * need to check for a lazy CS update for exec-shield.
-+ */
-+void do_iret_error(struct pt_regs *regs, long error_code)
-+{
-+	int ok;
-+	local_irq_enable();
-+	ok = check_lazy_exec_limit(get_cpu(), regs, error_code);
-+	put_cpu();
-+	if (!ok && notify_die(DIE_TRAP, "iret exception", regs,
-+		error_code, 32, SIGSEGV) != NOTIFY_STOP) {
-+			siginfo_t info;
-+			info.si_signo = SIGSEGV;
-+			info.si_errno = 0;
-+			info.si_code = ILL_BADSTK;
-+			info.si_addr = 0;
-+			do_trap(32, SIGSEGV, "iret exception", 0, regs, error_code,
-+				&info);
-+	}
-+}
- 
- void __kprobes
- do_general_protection(struct pt_regs *regs, long error_code)
-@@ -605,6 +688,7 @@ do_general_protection(struct pt_regs *re
- 	struct thread_struct *thread;
- 	struct tss_struct *tss;
- 	int cpu;
-+	int ok;
+ #endif
  
- 	cpu = get_cpu();
- 	tss = &per_cpu(init_tss, cpu);
-@@ -645,6 +729,23 @@ do_general_protection(struct pt_regs *re
+ static void __kprobes
+@@ -320,6 +377,29 @@ do_general_protection(struct pt_regs *regs, long error_code)
  	if (!user_mode(regs))
  		goto gp_in_kernel;
  
-+	ok = check_lazy_exec_limit(cpu, regs, error_code);
++#ifdef CONFIG_X86_32
++{
++	int cpu;
++	int ok;
 +
++	cpu = get_cpu();
++	ok = check_lazy_exec_limit(cpu, regs, error_code);
 +	put_cpu();
 +
 +	if (ok)
 +		return;
 +
 +	if (print_fatal_signals) {
-+		printk(KERN_ERR "#GPF(%ld[seg:%lx]) at %08lx, CPU#%d.\n", error_code,
-+			error_code/8, regs->ip, smp_processor_id());
++		printk(KERN_ERR "#GPF(%ld[seg:%lx]) at %08lx, CPU#%d.\n",
++			error_code, error_code/8, regs->ip, smp_processor_id());
 +		printk(KERN_ERR "exec_limit: %08lx, user_cs: %08x/%08x.\n",
 +			current->mm->context.exec_limit,
 +			current->mm->context.user_cs.a,
 +			current->mm->context.user_cs.b);
 +	}
-+
++}
++#endif /*CONFIG_X86_32*/
 +
  	tsk->thread.error_code = error_code;
  	tsk->thread.trap_no = 13;
  
-@@ -662,11 +763,13 @@ do_general_protection(struct pt_regs *re
- 	return;
+@@ -931,19 +1011,37 @@ do_device_not_available(struct pt_regs *regs, long error)
+ }
  
- gp_in_vm86:
-+	put_cpu();
+ #ifdef CONFIG_X86_32
++/*
++ * The fixup code for errors in iret jumps to here (iret_exc). It loses
++ * the original trap number and erorr code. The bogus trap 32 and error
++ * code 0 are what the vanilla kernel delivers via:
++ * DO_ERROR_INFO(32, SIGSEGV, "iret exception", iret_error, ILL_BADSTK, 0, 1)
++ *
++ * NOTE: Because of the final "1" in the macro we need to enable interrupts.
++ *
++ * In case of a general protection fault in the iret instruction, we
++ * need to check for a lazy CS update for exec-shield.
++ */
+ dotraplinkage void do_iret_error(struct pt_regs *regs, long error_code)
+ {
+-	siginfo_t info;
++	int ok;
++	int cpu;
++
  	local_irq_enable();
- 	handle_vm86_fault((struct kernel_vm86_regs *) regs, error_code);
- 	return;
  
- gp_in_kernel:
+-	info.si_signo = SIGILL;
+-	info.si_errno = 0;
+-	info.si_code = ILL_BADSTK;
+-	info.si_addr = 0;
+-	if (notify_die(DIE_TRAP, "iret exception",
+-			regs, error_code, 32, SIGILL) == NOTIFY_STOP)
+-		return;
+-	do_trap(32, SIGILL, "iret exception", regs, error_code, &info);
++	cpu = get_cpu();
++	ok = check_lazy_exec_limit(cpu, regs, error_code);
 +	put_cpu();
- 	if (fixup_exception(regs))
- 		return;
++
++	if (!ok && notify_die(DIE_TRAP, "iret exception", regs,
++		error_code, 32, SIGSEGV) != NOTIFY_STOP) {
++			siginfo_t info;
++			info.si_signo = SIGSEGV;
++			info.si_errno = 0;
++			info.si_code = ILL_BADSTK;
++			info.si_addr = 0;
++			do_trap(32, SIGSEGV, "iret exception", 0, error_code, &info);
++	}
+ }
+ #endif
  
 diff --git a/arch/x86/mm/init_32.c b/arch/x86/mm/init_32.c
-index 8106bba..23932be 100644
+index c483f42..8c3bbd9 100644
 --- a/arch/x86/mm/init_32.c
 +++ b/arch/x86/mm/init_32.c
-@@ -473,7 +473,7 @@ static int disable_nx __initdata;
+@@ -570,7 +570,7 @@ static int disable_nx __initdata;
   * Control non executable mappings.
   *
   * on      Enable
@@ -253,7 +394,7 @@
   */
  static int __init noexec_setup(char *str)
  {
-@@ -482,14 +482,12 @@ static int __init noexec_setup(char *str)
+@@ -579,14 +579,12 @@ static int __init noexec_setup(char *str)
  			__supported_pte_mask |= _PAGE_NX;
  			disable_nx = 0;
  		}
@@ -274,7 +415,8 @@
  
  	return 0;
  }
-@@ -782,6 +782,10 @@ unsigned long __init_refok init_memory_m
+@@ -845,7 +843,11 @@ unsigned long __init_refok init_memory_mapping(unsigned long start,
+ 	set_nx();
  	if (nx_enabled)
  		printk(KERN_INFO "NX (Execute Disable) protection: active\n");
 +	else
@@ -307,10 +449,10 @@
  	}
  }
 diff --git a/arch/x86/vdso/vdso32-setup.c b/arch/x86/vdso/vdso32-setup.c
-index 348f134..0bd5f44 100644
+index 513f330..2fb420a 100644
 --- a/arch/x86/vdso/vdso32-setup.c
 +++ b/arch/x86/vdso/vdso32-setup.c
-@@ -336,7 +336,7 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int exstack)
+@@ -331,7 +331,7 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int exstack)
  	if (compat)
  		addr = VDSO_HIGH_BASE;
  	else {
@@ -319,11 +461,50 @@
  		if (IS_ERR_VALUE(addr)) {
  			ret = addr;
  			goto up_fail;
+diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c
+index 5e4686d..b41f314 100644
+--- a/arch/x86/xen/enlighten.c
++++ b/arch/x86/xen/enlighten.c
+@@ -315,6 +315,24 @@ static void xen_set_ldt(const void *addr, unsigned entries)
+ 	xen_mc_issue(PARAVIRT_LAZY_CPU);
+ }
+ 
++#ifdef CONFIG_X86_32
++static void xen_load_user_cs_desc(int cpu, struct mm_struct *mm)
++{
++	void *gdt;
++	xmaddr_t mgdt;
++	u64 descriptor;
++	struct desc_struct user_cs;
++
++	gdt = &get_cpu_gdt_table(cpu)[GDT_ENTRY_DEFAULT_USER_CS];
++	mgdt = virt_to_machine(gdt);
++
++	user_cs = mm->context.user_cs;
++	descriptor = (u64) user_cs.a | ((u64) user_cs.b) << 32;
++
++	HYPERVISOR_update_descriptor(mgdt.maddr, descriptor);
++}
++#endif /*CONFIG_X86_32*/
++
+ static void xen_load_gdt(const struct desc_ptr *dtr)
+ {
+ 	unsigned long *frames;
+@@ -1231,6 +1249,9 @@ static const struct pv_cpu_ops xen_cpu_ops __initdata = {
+ 
+ 	.load_tr_desc = paravirt_nop,
+ 	.set_ldt = xen_set_ldt,
++#ifdef CONFIG_X86_32
++	.load_user_cs_desc = xen_load_user_cs_desc,
++#endif /*CONFIG_X86_32*/
+ 	.load_gdt = xen_load_gdt,
+ 	.load_idt = xen_load_idt,
+ 	.load_tls = xen_load_tls,
 diff --git a/fs/binfmt_elf.c b/fs/binfmt_elf.c
-index 41a958a..22cbd06 100644
+index 8fcfa39..5e1e2d8 100644
 --- a/fs/binfmt_elf.c
 +++ b/fs/binfmt_elf.c
-@@ -81,7 +81,7 @@ static struct linux_binfmt elf_format = {
+@@ -80,7 +80,7 @@ static struct linux_binfmt elf_format = {
  		.hasvdso	= 1
  };
  
@@ -332,7 +513,7 @@
  
  static int set_brk(unsigned long start, unsigned long end)
  {
-@@ -709,6 +711,11 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs)
+@@ -723,6 +723,11 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs)
  			break;
  		}
  
@@ -344,7 +525,7 @@
  	/* Some simple consistency checks for the interpreter */
  	if (elf_interpreter) {
  		retval = -ELIBBAD;
-@@ -721,6 +721,15 @@ static int load_elf_binary(struct linux_
+@@ -742,6 +747,15 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs)
  	if (retval)
  		goto out_free_dentry;
  
@@ -360,17 +541,17 @@
  	/* OK, This is the point of no return */
  	current->flags &= ~PF_FORKNOEXEC;
  	current->mm->def_flags = def_flags;
-@@ -741,7 +757,8 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs)
+@@ -749,7 +763,8 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs)
  	/* Do this immediately, since STACK_TOP as used in setup_arg_pages
  	   may depend on the personality.  */
- 	SET_PERSONALITY(loc->elf_ex, 0);
+ 	SET_PERSONALITY(loc->elf_ex);
 -	if (elf_read_implies_exec(loc->elf_ex, executable_stack))
 +	if (!(exec_shield & 2) &&
 +			elf_read_implies_exec(loc->elf_ex, executable_stack))
  		current->personality |= READ_IMPLIES_EXEC;
  
  	if (!(current->personality & ADDR_NO_RANDOMIZE) && randomize_va_space)
-@@ -906,7 +923,7 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs)
+@@ -914,7 +929,7 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs)
  					    interpreter,
  					    &interp_map_addr,
  					    load_bias);
@@ -379,9 +560,11 @@
  			/*
  			 * load_elf_interp() returns relocation
  			 * adjustment
---- linux-2.6.25.noarch/fs/proc/array.c~	2008-05-16 13:51:04.000000000 -0400
-+++ linux-2.6.25.noarch/fs/proc/array.c	2008-05-16 13:53:24.000000000 -0400
-@@ -473,8 +473,13 @@ static int do_task_stat(struct seq_file 
+diff --git a/fs/proc/array.c b/fs/proc/array.c
+index 6af7fba..bb98552 100644
+--- a/fs/proc/array.c
++++ b/fs/proc/array.c
+@@ -412,8 +412,13 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
  		unlock_task_sighand(task, &flags);
  	}
  
@@ -397,87 +580,11 @@
  	if (!whole) {
  		min_flt = task->min_flt;
  		maj_flt = task->maj_flt;
-diff --git a/include/asm-x86/desc.h b/include/asm-x86/desc.h
-index 5b6a05d..7ad80b9 100644
---- a/include/asm-x86/desc.h
-+++ b/include/asm-x86/desc.h
-@@ -353,6 +353,22 @@ static inline void set_system_gate_ist(int n, void *addr, unsigned ist)
- 	_set_gate(n, GATE_INTERRUPT, addr, 0x3, ist, __KERNEL_CS);
- }
- 
-+#ifdef CONFIG_X86_32
-+static inline void set_user_cs(struct desc_struct *desc, unsigned long limit)
-+{
-+	limit = (limit - 1) / PAGE_SIZE;
-+	desc->a = limit & 0xffff;
-+	desc->b = (limit & 0xf0000) | 0x00c0fb00;
-+}
-+
-+#define load_user_cs_desc(cpu, mm) \
-+	get_cpu_gdt_table(cpu)[GDT_ENTRY_DEFAULT_USER_CS] = (mm)->context.user_cs
-+
-+extern void arch_add_exec_range(struct mm_struct *mm, unsigned long limit);
-+extern void arch_remove_exec_range(struct mm_struct *mm, unsigned long limit);
-+extern void arch_flush_exec_range(struct mm_struct *mm);
-+#endif /* CONFIG_X86_32 */
-+
- #else
- /*
-  * GET_DESC_BASE reads the descriptor base of the specified segment.
-diff --git a/include/asm-x86/mmu.h b/include/asm-x86/mmu.h
-index efa962c..db9b109 100644
---- a/include/asm-x86/mmu.h
-+++ b/include/asm-x86/mmu.h
-@@ -9,6 +9,8 @@
-  * we put the segment information here.
-  *
-  * cpu_vm_mask is used to optimize ldt flushing.
-+ * exec_limit is used to track the range PROT_EXEC
-+ * mappings span.
-  */
- typedef struct {
- 	void *ldt;
-@@ -18,6 +20,10 @@ typedef struct {
- 	int size;
- 	struct mutex lock;
- 	void *vdso;
-+#ifdef CONFIG_X86_32
-+	struct desc_struct user_cs;
-+	unsigned long exec_limit;
-+#endif
- } mm_context_t;
- 
- #ifdef CONFIG_SMP
---- linux-2.6.25.noarch/include/asm-x86/processor.h~	2008-05-16 15:56:21.000000000 -0400
-+++ linux-2.6.25.noarch/include/asm-x86/processor.h	2008-05-16 16:02:44.000000000 -0400
-@@ -151,6 +151,9 @@ static inline int hlt_works(int cpu)
- 
- #define cache_line_size()	(boot_cpu_data.x86_cache_alignment)
- 
-+#define __HAVE_ARCH_ALIGN_STACK
-+extern unsigned long arch_align_stack(unsigned long sp);
-+
- extern void cpu_detect(struct cpuinfo_x86 *c);
- 
- extern void identify_cpu(struct cpuinfo_x86 *);
---- linux-2.6.25.noarch/arch/x86/kernel/process_32.c~	2008-05-16 16:02:50.000000000 -0400
-+++ linux-2.6.25.noarch/arch/x86/kernel/process_32.c	2008-05-16 16:03:21.000000000 -0400
-@@ -411,6 +411,10 @@ start_thread(struct pt_regs *regs, unsig
- 	regs->cs		= __USER_CS;
- 	regs->ip		= new_ip;
- 	regs->sp		= new_sp;
-+	preempt_disable();
-+	load_user_cs_desc(smp_processor_id(), current->mm);
-+	preempt_enable();
-+
- 	/*
- 	 * Free the old FP and other extended state
- 	 */
 diff --git a/include/linux/mm.h b/include/linux/mm.h
-index e8abb38..1483fc7 100644
+index ffee2f7..c14817b 100644
 --- a/include/linux/mm.h
 +++ b/include/linux/mm.h
-@@ -1041,7 +1041,13 @@ extern int install_special_mapping(struct mm_struct *mm,
+@@ -1105,7 +1105,13 @@ extern int install_special_mapping(struct mm_struct *mm,
  				   unsigned long addr, unsigned long len,
  				   unsigned long flags, struct page **pages);
  
@@ -493,10 +600,10 @@
  extern unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
  	unsigned long len, unsigned long prot,
 diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h
-index bfee0bd..30ec32f 100644
+index fe82547..8007dbf 100644
 --- a/include/linux/mm_types.h
 +++ b/include/linux/mm_types.h
-@@ -166,6 +166,9 @@ struct mm_struct {
+@@ -177,6 +177,9 @@ struct mm_struct {
  	unsigned long (*get_unmapped_area) (struct file *filp,
  				unsigned long addr, unsigned long len,
  				unsigned long pgoff, unsigned long flags);
@@ -507,10 +614,10 @@
  	unsigned long mmap_base;		/* base of mmap area */
  	unsigned long task_size;		/* size of task vm space */
 diff --git a/include/linux/resource.h b/include/linux/resource.h
-index ae13db7..14757af 100644
+index 40fc7e6..68c2549 100644
 --- a/include/linux/resource.h
 +++ b/include/linux/resource.h
-@@ -54,8 +54,11 @@ struct rlimit {
+@@ -55,8 +55,11 @@ struct rlimit {
  /*
   * Limit the stack by to some sane default: root can always
   * increase this limit if needed..  8MB seems reasonable.
@@ -522,12 +629,12 @@
 +#define EXEC_STACK_BIAS	(2*1024*1024)
  
  /*
-  * GPG wants 32kB of mlocked memory, to make sure pass phrases
+  * GPG2 wants 64kB of mlocked memory, to make sure pass phrases
 diff --git a/include/linux/sched.h b/include/linux/sched.h
-index 00e1441..c1c8a7d 100644
+index 55e30d1..d400ab0 100644
 --- a/include/linux/sched.h
 +++ b/include/linux/sched.h
-@@ -98,6 +98,9 @@ struct futex_pi_state;
+@@ -97,6 +97,9 @@ struct futex_pi_state;
  struct robust_list_head;
  struct bio;
  
@@ -537,7 +644,7 @@
  /*
   * List of flags we want to share for kernel threads,
   * if only because they are not used by them anyway.
-@@ -342,6 +345,10 @@ extern int sysctl_max_map_count;
+@@ -345,6 +348,10 @@ extern int sysctl_max_map_count;
  extern unsigned long
  arch_get_unmapped_area(struct file *, unsigned long, unsigned long,
  		       unsigned long, unsigned long);
@@ -549,11 +656,11 @@
  arch_get_unmapped_area_topdown(struct file *filp, unsigned long addr,
  			  unsigned long len, unsigned long pgoff,
 diff --git a/kernel/sysctl.c b/kernel/sysctl.c
-index d41ef6b..5304704 100644
+index 3d56fe7..b512845 100644
 --- a/kernel/sysctl.c
 +++ b/kernel/sysctl.c
-@@ -83,6 +83,26 @@ extern int maps_protect;
- extern int sysctl_stat_interval;
+@@ -82,6 +82,26 @@ extern int percpu_pagelist_fraction;
+ extern int compat_log;
  extern int latencytop_enabled;
  extern int sysctl_nr_open_min, sysctl_nr_open_max;
 +
@@ -579,7 +686,7 @@
  #ifdef CONFIG_RCU_TORTURE_TEST
  extern int rcutorture_runnable;
  #endif /* #ifdef CONFIG_RCU_TORTURE_TEST */
-@@ -383,6 +403,14 @@ static struct ctl_table kern_table[] = {
+@@ -373,6 +393,14 @@ static struct ctl_table kern_table[] = {
  		.proc_handler	= &proc_dointvec,
  	},
  	{
@@ -595,7 +702,7 @@
  		.procname	= "core_uses_pid",
  		.data		= &core_uses_pid,
 diff --git a/mm/mmap.c b/mm/mmap.c
-index a32d28c..7634038 100644
+index d4855a6..0850042 100644
 --- a/mm/mmap.c
 +++ b/mm/mmap.c
 @@ -27,6 +27,7 @@
@@ -606,7 +713,7 @@
  
  #include <asm/uaccess.h>
  #include <asm/cacheflush.h>
-@@ -41,6 +41,18 @@
+@@ -43,6 +44,18 @@
  #define arch_rebalance_pgtables(addr, len)		(addr)
  #endif
  
@@ -625,7 +732,7 @@
  static void unmap_region(struct mm_struct *mm,
  		struct vm_area_struct *vma, struct vm_area_struct *prev,
  		unsigned long start, unsigned long end);
-@@ -377,6 +378,8 @@ static inline void
+@@ -391,6 +404,8 @@ static inline void
  __vma_link_list(struct mm_struct *mm, struct vm_area_struct *vma,
  		struct vm_area_struct *prev, struct rb_node *rb_parent)
  {
@@ -634,7 +741,7 @@
  	if (prev) {
  		vma->vm_next = prev->vm_next;
  		prev->vm_next = vma;
-@@ -480,6 +483,8 @@ __vma_unlink(struct mm_struct *mm, struct vm_area_struct *vma,
+@@ -494,6 +509,8 @@ __vma_unlink(struct mm_struct *mm, struct vm_area_struct *vma,
  	rb_erase(&vma->vm_rb, &mm->mm_rb);
  	if (mm->mmap_cache == vma)
  		mm->mmap_cache = prev;
@@ -643,7 +750,7 @@
  }
  
  /*
-@@ -785,6 +790,8 @@ struct vm_area_struct *vma_merge(struct mm_struct *mm,
+@@ -800,6 +817,8 @@ struct vm_area_struct *vma_merge(struct mm_struct *mm,
  		} else					/* cases 2, 5, 7 */
  			vma_adjust(prev, prev->vm_start,
  				end, prev->vm_pgoff, NULL);
@@ -652,7 +759,7 @@
  		return prev;
  	}
  
-@@ -940,7 +947,8 @@ unsigned long do_mmap_pgoff(struct file * file, unsigned long addr,
+@@ -955,7 +974,8 @@ unsigned long do_mmap_pgoff(struct file * file, unsigned long addr,
  	/* Obtain the address to map to. we verify (or select) it and ensure
  	 * that it represents a valid section of the address space.
  	 */
@@ -662,7 +769,7 @@
  	if (addr & ~PAGE_MASK)
  		return addr;
  
-@@ -1410,13 +1418,17 @@ void arch_unmap_area_topdown(struct mm_struct *mm, unsigned long addr)
+@@ -1440,13 +1460,17 @@ void arch_unmap_area_topdown(struct mm_struct *mm, unsigned long addr)
  }
  
  unsigned long
@@ -683,7 +790,7 @@
  	if (file && file->f_op && file->f_op->get_unmapped_area)
  		get_area = file->f_op->get_unmapped_area;
  	addr = get_area(file, addr, len, pgoff, flags);
-@@ -1430,8 +1442,74 @@ get_unmapped_area(struct file *file, unsigned long addr, unsigned long len,
+@@ -1460,8 +1484,74 @@ get_unmapped_area(struct file *file, unsigned long addr, unsigned long len,
  
  	return arch_rebalance_pgtables(addr, len);
  }
@@ -759,7 +866,7 @@
  
  /* Look up the first VMA which satisfies  addr < vm_end,  NULL if none. */
  struct vm_area_struct * find_vma(struct mm_struct * mm, unsigned long addr)
-@@ -1506,6 +1585,14 @@ out:
+@@ -1536,6 +1626,14 @@ out:
  	return prev ? prev->vm_next : vma;
  }
  
@@ -774,7 +881,7 @@
  /*
   * Verify that the stack growth is acceptable and
   * update accounting. This is shared with both the
-@@ -1522,7 +1609,7 @@ static int acct_stack_growth(struct vm_area_struct * vma, unsigned long size, un
+@@ -1552,7 +1650,7 @@ static int acct_stack_growth(struct vm_area_struct * vma, unsigned long size, un
  		return -ENOMEM;
  
  	/* Stack limit test */
@@ -783,7 +890,7 @@
  		return -ENOMEM;
  
  	/* mlock limit tests */
-@@ -1826,10 +1913,14 @@ int split_vma(struct mm_struct * mm, struct vm_area_struct * vma,
+@@ -1862,10 +1960,14 @@ int split_vma(struct mm_struct * mm, struct vm_area_struct * vma,
  	if (new->vm_ops && new->vm_ops->open)
  		new->vm_ops->open(new);
  
@@ -800,7 +907,7 @@
  		vma_adjust(vma, vma->vm_start, addr, vma->vm_pgoff, new);
  
  	return 0;
-@@ -2173,6 +2173,7 @@ void exit_mmap(struct mm_struct *mm)
+@@ -2109,6 +2211,7 @@ void exit_mmap(struct mm_struct *mm)
  	vm_unacct_memory(nr_accounted);
  	free_pgtables(tlb, vma, FIRST_USER_ADDRESS, 0);
  	tlb_finish_mmu(tlb, 0, end);
@@ -809,11 +916,11 @@
  	/*
  	 * Walk the list again, actually closing and freeing it,
 diff --git a/mm/mprotect.c b/mm/mprotect.c
-index 4de5468..6d822ad 100644
+index fded06f..cdfcbd2 100644
 --- a/mm/mprotect.c
 +++ b/mm/mprotect.c
-@@ -23,8 +23,15 @@
- #include <linux/swapops.h>
+@@ -24,8 +24,15 @@
+ #include <linux/mmu_notifier.h>
  #include <asm/uaccess.h>
  #include <asm/pgtable.h>
 +#include <asm/pgalloc.h>
@@ -828,7 +935,7 @@
  
  #ifndef pgprot_modify
  static inline pgprot_t pgprot_modify(pgprot_t oldprot, pgprot_t newprot)
-@@ -134,7 +138,7 @@ mprotect_fixup(struct vm_area_struct *vma, struct vm_area_struct **pprev,
+@@ -140,7 +147,7 @@ mprotect_fixup(struct vm_area_struct *vma, struct vm_area_struct **pprev,
  	struct mm_struct *mm = vma->vm_mm;
  	unsigned long oldflags = vma->vm_flags;
  	long nrpages = (end - start) >> PAGE_SHIFT;
@@ -837,7 +944,7 @@
  	pgoff_t pgoff;
  	int error;
  	int dirty_accountable = 0;
-@@ -211,6 +211,9 @@ success:
+@@ -204,6 +211,9 @@ success:
  		dirty_accountable = 1;
  	}
  
@@ -848,10 +955,10 @@
  	if (is_vm_hugetlb_page(vma))
  		hugetlb_change_protection(vma, start, end, vma->vm_page_prot);
 diff --git a/mm/mremap.c b/mm/mremap.c
-index 08e3c7f..101f885 100644
+index 58a2908..5bb50e6 100644
 --- a/mm/mremap.c
 +++ b/mm/mremap.c
-@@ -392,8 +392,8 @@ unsigned long do_mremap(unsigned long addr,
+@@ -400,8 +400,8 @@ unsigned long do_mremap(unsigned long addr,
  			if (vma->vm_flags & VM_MAYSHARE)
  				map_flags |= MAP_SHARED;
  

linux-2.6-firewire-git-pending.patch:

Index: linux-2.6-firewire-git-pending.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/linux-2.6-firewire-git-pending.patch,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- linux-2.6-firewire-git-pending.patch	18 Dec 2008 22:13:53 -0000	1.33
+++ linux-2.6-firewire-git-pending.patch	12 Jan 2009 19:51:29 -0000	1.34
@@ -3,128 +3,3 @@
 # tree (and/or in by the time your read this), which we want...
 #
 
-Date: Fri, 26 Sep 2008 16:35:45 -0400
-From: Jay Fenlason <fenlason at redhat.com>
-Subject: [Patch] fix two resource allocation bugs in fw-cdev.c
-
-Bug #1: the resource_handle used to number resources will eventually
-wrap, potentially resulting in two resources having the same handle.
-This will lead to a system crash when the wrong resource is freed.
-
-A better fix for this bug would be to use the idr functions rather
-than keeping a linked list of resources.  I will include that in a
-future patch.
-
-Bug #2: the release_client_resource() function does not check the type
-of the resource it is being asked to free.  Because the handle numbers
-can come directly from userspace, a malicious or buggy program may
-free resources that it shouldn't, possibly causing a program crash.
-
-Signed-off-by: Jay Fenlason <fenlason at redhat.com>
-
---
-
- fw-cdev.c |   32 +++++++++++++++++++++++++-------
- 1 file changed, 25 insertions(+), 7 deletions(-)
-
-diff -rup linux-2.6/drivers/firewire/fw-cdev.c linux-2.6.firewire/drivers/firewire/fw-cdev.c
---- linux-2.6/drivers/firewire/fw-cdev.c	2008-09-22 14:56:02.000000000 -0400
-+++ linux-2.6.firewire/drivers/firewire/fw-cdev.c	2008-09-25 16:13:00.000000000 -0400
-@@ -77,7 +77,6 @@ struct client {
- 	u32 version;
- 	struct fw_device *device;
- 	spinlock_t lock;
--	u32 resource_handle;
- 	struct list_head resource_list;
- 	struct list_head event_list;
- 	wait_queue_head_t wait;
-@@ -321,13 +320,32 @@ add_client_resource(struct client *clien
- 	unsigned long flags;
- 
- 	spin_lock_irqsave(&client->lock, flags);
--	list_add_tail(&resource->link, &client->resource_list);
--	resource->handle = client->resource_handle++;
-+	if (list_empty(&client->resource_list)
-+	    || list_first_entry(&client->resource_list,
-+				struct client_resource,
-+				link)->handle > 0) {
-+		resource->handle = 0;
-+		list_add(&resource->link, &client->resource_list);
-+	} else {
-+		struct client_resource *c_tmp, *c_tmp2;
-+
-+		c_tmp2 = NULL;
-+		list_for_each_entry(c_tmp, &client->resource_list,
-+				    link) {
-+			if (c_tmp2 && c_tmp->handle != c_tmp2->handle+1)
-+				break;
-+			c_tmp2 = c_tmp;
-+		}
-+		BUG_ON(c_tmp2 == NULL);
-+		resource->handle = c_tmp2->handle+1;
-+		list_add(&resource->link, &c_tmp2->link);
-+	}
- 	spin_unlock_irqrestore(&client->lock, flags);
- }
- 
- static int
- release_client_resource(struct client *client, u32 handle,
-+			void (*func)(struct client *client, struct client_resource *r),
- 			struct client_resource **resource)
- {
- 	struct client_resource *r;
-@@ -335,7 +353,7 @@ release_client_resource(struct client *c
- 
- 	spin_lock_irqsave(&client->lock, flags);
- 	list_for_each_entry(r, &client->resource_list, link) {
--		if (r->handle == handle) {
-+		if (r->handle == handle && r->release == func) {
- 			list_del(&r->link);
- 			break;
- 		}
-@@ -555,7 +573,7 @@ static int ioctl_deallocate(struct clien
- {
- 	struct fw_cdev_deallocate *request = buffer;
- 
--	return release_client_resource(client, request->handle, NULL);
-+	return release_client_resource(client, request->handle, release_address_handler, NULL);
- }
- 
- static int ioctl_send_response(struct client *client, void *buffer)
-@@ -564,7 +582,7 @@ static int ioctl_send_response(struct cl
- 	struct client_resource *resource;
- 	struct request *r;
- 
--	if (release_client_resource(client, request->handle, &resource) < 0)
-+	if (release_client_resource(client, request->handle, release_request, &resource) < 0)
- 		return -EINVAL;
- 	r = container_of(resource, struct request, resource);
- 	if (request->length < r->length)
-@@ -646,7 +664,7 @@ static int ioctl_remove_descriptor(struc
- {
- 	struct fw_cdev_remove_descriptor *request = buffer;
- 
--	return release_client_resource(client, request->handle, NULL);
-+	return release_client_resource(client, request->handle, release_descriptor, NULL);
- }
- 
- static void
-
-----------------------
-Date: Wed, 22 Oct 2008 15:59:42 -0400
-From: Jay Fenlason <fenlason at redhat.com>
-Subject: firewire: typo in comment
-
-Signed-off-by: Jay Fenlason <fenlason at redhat.com>
-diff -upr linux-2.6/drivers/firewire/fw-card.c linux-2.6.fw/drivers/firewire/fw-card.c
---- linux-2.6/drivers/firewire/fw-card.c	2008-10-07 11:26:15.000000000 -0400
-+++ linux-2.6.fw/drivers/firewire/fw-card.c	2008-10-22 14:40:14.000000000 -0400
-@@ -76,7 +76,7 @@ generate_config_rom(struct fw_card *card
- 	 * controller, block reads to the config rom accesses the host
- 	 * memory, but quadlet read access the hardware bus info block
- 	 * registers.  That's just crack, but it means we should make
--	 * sure the contents of bus info block in host memory mathces
-+	 * sure the contents of bus info block in host memory matches
- 	 * the version stored in the OHCI registers.
- 	 */
- 

linux-2.6-hdpvr.patch:

Index: linux-2.6-hdpvr.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/linux-2.6-hdpvr.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-hdpvr.patch	6 Oct 2008 17:11:35 -0000	1.1
+++ linux-2.6-hdpvr.patch	12 Jan 2009 19:51:29 -0000	1.2
@@ -1,22 +1,8 @@
- drivers/media/video/Kconfig               |    2 +
- drivers/media/video/Makefile              |    2 +
- drivers/media/video/hdpvr/Kconfig         |   10 +
- drivers/media/video/hdpvr/Makefile        |    7 +
- drivers/media/video/hdpvr/hdpvr-control.c |  212 +++++
- drivers/media/video/hdpvr/hdpvr-core.c    |  455 +++++++++++
- drivers/media/video/hdpvr/hdpvr-i2c.c     |  145 ++++
- drivers/media/video/hdpvr/hdpvr-video.c   | 1258 +++++++++++++++++++++++++++++
- drivers/media/video/hdpvr/hdpvr.h         |  324 ++++++++
- drivers/media/video/v4l2-common.c         |    4 +
- include/linux/i2c-id.h                    |    1 +
- include/linux/videodev2.h                 |    7 +-
- 12 files changed, 2425 insertions(+), 2 deletions(-)
-
 diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig
-index 3e9e0dc..578402f 100644
+index 47102c2..0e279dd 100644
 --- a/drivers/media/video/Kconfig
 +++ b/drivers/media/video/Kconfig
-@@ -801,6 +801,8 @@ source "drivers/media/video/gspca/Kconfig"
+@@ -781,6 +781,8 @@ source "drivers/media/video/gspca/Kconfig"
  
  source "drivers/media/video/pvrusb2/Kconfig"
  
@@ -26,10 +12,10 @@
  
  source "drivers/media/video/usbvision/Kconfig"
 diff --git a/drivers/media/video/Makefile b/drivers/media/video/Makefile
-index ef7c8d3..449ae8b 100644
+index 16962f3..4331a50 100644
 --- a/drivers/media/video/Makefile
 +++ b/drivers/media/video/Makefile
-@@ -121,6 +121,8 @@ obj-$(CONFIG_USB_PWC)           += pwc/
+@@ -115,6 +115,8 @@ obj-$(CONFIG_USB_PWC)           += pwc/
  obj-$(CONFIG_USB_ZC0301)        += zc0301/
  obj-$(CONFIG_USB_GSPCA)         += gspca/
  
@@ -2492,18 +2478,18 @@
 +void print_bytes(char *string, unsigned char *buf, size_t len);
 +#endif
 diff --git a/drivers/media/video/v4l2-common.c b/drivers/media/video/v4l2-common.c
-index 88ca131..8dfaa7d 100644
+index 846763d..34eca15 100644
 --- a/drivers/media/video/v4l2-common.c
 +++ b/drivers/media/video/v4l2-common.c
-@@ -354,6 +354,7 @@ int v4l2_ctrl_query_fill(struct v4l2_queryctrl *qctrl, s32 min, s32 max, s32 ste
- 	case V4L2_CID_CONTRAST: 	name = "Contrast"; break;
- 	case V4L2_CID_SATURATION: 	name = "Saturation"; break;
- 	case V4L2_CID_HUE: 		name = "Hue"; break;
-+	case V4L2_CID_SHARPNESS: 	name = "Sharpness"; break;
+@@ -374,6 +374,7 @@ const char *v4l2_ctrl_get_name(u32 id)
+ 	case V4L2_CID_CONTRAST: 	return "Contrast";
+ 	case V4L2_CID_SATURATION: 	return "Saturation";
+ 	case V4L2_CID_HUE: 		return "Hue";
++	case V4L2_CID_SHARPNESS: 	return "Sharpness";
  
  	/* MPEG controls */
- 	case V4L2_CID_MPEG_CLASS: 		name = "MPEG Encoder Controls"; break;
-@@ -445,6 +446,7 @@ int v4l2_ctrl_query_fill(struct v4l2_queryctrl *qctrl, s32 min, s32 max, s32 ste
+ 	case V4L2_CID_MPEG_CLASS: 		return "MPEG Encoder Controls";
+@@ -480,6 +481,7 @@ int v4l2_ctrl_query_fill(struct v4l2_queryctrl *qctrl, s32 min, s32 max, s32 ste
  	case V4L2_CID_CONTRAST:
  	case V4L2_CID_SATURATION:
  	case V4L2_CID_HUE:
@@ -2511,7 +2497,7 @@
  		qctrl->flags |= V4L2_CTRL_FLAG_SLIDER;
  		break;
  	}
-@@ -483,6 +485,8 @@ int v4l2_ctrl_query_fill_std(struct v4l2_queryctrl *qctrl)
+@@ -518,6 +520,8 @@ int v4l2_ctrl_query_fill_std(struct v4l2_queryctrl *qctrl)
  		return v4l2_ctrl_query_fill(qctrl, 0, 127, 1, 64);
  	case V4L2_CID_HUE:
  		return v4l2_ctrl_query_fill(qctrl, -128, 127, 1, 0);
@@ -2521,10 +2507,10 @@
  	/* MPEG controls */
  	case V4L2_CID_MPEG_AUDIO_SAMPLING_FREQ:
 diff --git a/include/linux/i2c-id.h b/include/linux/i2c-id.h
-index bf34c5f..d0ec672 100644
+index 01d67ba..1a08b81 100644
 --- a/include/linux/i2c-id.h
 +++ b/include/linux/i2c-id.h
-@@ -111,6 +111,7 @@
+@@ -110,6 +110,7 @@
  #define I2C_HW_B_INTELFB	0x010021 /* intel framebuffer driver */
  #define I2C_HW_B_CX23885	0x010022 /* conexant 23885 based tv cards (bus1) */
  #define I2C_HW_B_AU0828		0x010023 /* auvitek au0828 usb bridge */
@@ -2532,28 +2518,3 @@
  
  /* --- PCF 8584 based algorithms					*/
  #define I2C_HW_P_ELEK		0x020002 /* Elektor ISA Bus inteface card */
-diff --git a/include/linux/videodev2.h b/include/linux/videodev2.h
-index 303d93f..f7b6bbc 100644
---- a/include/linux/videodev2.h
-+++ b/include/linux/videodev2.h
-@@ -910,6 +910,8 @@ enum v4l2_mpeg_audio_encoding {
- 	V4L2_MPEG_AUDIO_ENCODING_LAYER_1 = 0,
- 	V4L2_MPEG_AUDIO_ENCODING_LAYER_2 = 1,
- 	V4L2_MPEG_AUDIO_ENCODING_LAYER_3 = 2,
-+	V4L2_MPEG_AUDIO_ENCODING_AAC     = 3,
-+	V4L2_MPEG_AUDIO_ENCODING_AC3     = 4,
- };
- #define V4L2_CID_MPEG_AUDIO_L1_BITRATE 		(V4L2_CID_MPEG_BASE+102)
- enum v4l2_mpeg_audio_l1_bitrate {
-@@ -992,8 +994,9 @@ enum v4l2_mpeg_audio_crc {
- /*  MPEG video */
- #define V4L2_CID_MPEG_VIDEO_ENCODING 		(V4L2_CID_MPEG_BASE+200)
- enum v4l2_mpeg_video_encoding {
--	V4L2_MPEG_VIDEO_ENCODING_MPEG_1 = 0,
--	V4L2_MPEG_VIDEO_ENCODING_MPEG_2 = 1,
-+	V4L2_MPEG_VIDEO_ENCODING_MPEG_1     = 0,
-+	V4L2_MPEG_VIDEO_ENCODING_MPEG_2     = 1,
-+	V4L2_MPEG_VIDEO_ENCODING_MPEG_4_AVC = 2,
- };
- #define V4L2_CID_MPEG_VIDEO_ASPECT 		(V4L2_CID_MPEG_BASE+201)
- enum v4l2_mpeg_video_aspect {

linux-2.6-netdev-atl2.patch:

Index: linux-2.6-netdev-atl2.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/linux-2.6-netdev-atl2.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- linux-2.6-netdev-atl2.patch	20 Jul 2008 21:36:08 -0000	1.2
+++ linux-2.6-netdev-atl2.patch	12 Jan 2009 19:51:29 -0000	1.3
@@ -1,12 +1,12 @@
-Index: linux-2.6.26.noarch/drivers/net/Kconfig
-===================================================================
---- linux-2.6.26.noarch.orig/drivers/net/Kconfig
-+++ linux-2.6.26.noarch/drivers/net/Kconfig
-@@ -2375,6 +2375,17 @@ config ATL1E
+diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
+index 231eeaf..9521c2e 100644
+--- a/drivers/net/Kconfig
++++ b/drivers/net/Kconfig
+@@ -2328,6 +2328,17 @@ config ATL1E
  	  To compile this driver as a module, choose M here.  The module
  	  will be called atl1e.
  
-+	config ATL2
++config ATL2
 +	tristate "Atheros L2 Fast Ethernet support (EXPERIMENTAL)"
 +	depends on PCI && EXPERIMENTAL
 +	select CRC32
@@ -17,32 +17,34 @@
 +	  To compile this driver as a module, choose M here.  The module
 +	  will be called atl2.
 +
- endif # NETDEV_1000
- 
- #
-Index: linux-2.6.26.noarch/drivers/net/Makefile
-===================================================================
---- linux-2.6.26.noarch.orig/drivers/net/Makefile
-+++ linux-2.6.26.noarch/drivers/net/Makefile
-@@ -17,6 +17,7 @@ obj-$(CONFIG_CAN) += can/
- obj-$(CONFIG_BONDING) += bonding/
+ config JME
+ 	tristate "JMicron(R) PCI-Express Gigabit Ethernet support"
+ 	depends on PCI
+diff --git a/drivers/net/Makefile b/drivers/net/Makefile
+index 017383a..8e12ec3 100644
+--- a/drivers/net/Makefile
++++ b/drivers/net/Makefile
+@@ -17,6 +17,7 @@ obj-$(CONFIG_BONDING) += bonding/
  obj-$(CONFIG_ATL1) += atlx/
+ obj-$(CONFIG_ATL2) += atlx/
  obj-$(CONFIG_ATL1E) += atl1e/
 +obj-$(CONFIG_ATL2) += atl2/
  obj-$(CONFIG_GIANFAR) += gianfar_driver.o
  obj-$(CONFIG_TEHUTI) += tehuti.o
- 
-Index: linux-2.6.26.noarch/drivers/net/atl2/Makefile
-===================================================================
+ obj-$(CONFIG_ENIC) += enic/
+diff --git a/drivers/net/atl2/Makefile b/drivers/net/atl2/Makefile
+new file mode 100644
+index 0000000..2e451e9
 --- /dev/null
-+++ linux-2.6.26.noarch/drivers/net/atl2/Makefile
++++ b/drivers/net/atl2/Makefile
 @@ -0,0 +1,2 @@
 +obj-$(CONFIG_ATL2)	+= atl2.o
 +atl2-y			+= atl2_main.o atl2_hw.o atl2_ethtool.o atl2_param.o
-Index: linux-2.6.26.noarch/drivers/net/atl2/atl2.h
-===================================================================
+diff --git a/drivers/net/atl2/atl2.h b/drivers/net/atl2/atl2.h
+new file mode 100644
+index 0000000..dbab2e7
 --- /dev/null
-+++ linux-2.6.26.noarch/drivers/net/atl2/atl2.h
++++ b/drivers/net/atl2/atl2.h
 @@ -0,0 +1,120 @@
 +/* atl2.h -- atl2 driver definitions
 + *
@@ -164,10 +166,11 @@
 +};
 +
 +#endif /* _ATL2_H_ */
-Index: linux-2.6.26.noarch/drivers/net/atl2/atl2_ethtool.c
-===================================================================
+diff --git a/drivers/net/atl2/atl2_ethtool.c b/drivers/net/atl2/atl2_ethtool.c
+new file mode 100644
+index 0000000..0466b4a
 --- /dev/null
-+++ linux-2.6.26.noarch/drivers/net/atl2/atl2_ethtool.c
++++ b/drivers/net/atl2/atl2_ethtool.c
 @@ -0,0 +1,416 @@
 +/* atl2_ethtool.c -- atl2 ethtool support
 + *
@@ -585,10 +588,11 @@
 +{
 +	SET_ETHTOOL_OPS(netdev, &atl2_ethtool_ops);
 +}
-Index: linux-2.6.26.noarch/drivers/net/atl2/atl2_hw.c
-===================================================================
+diff --git a/drivers/net/atl2/atl2_hw.c b/drivers/net/atl2/atl2_hw.c
+new file mode 100644
+index 0000000..b8ac641
 --- /dev/null
-+++ linux-2.6.26.noarch/drivers/net/atl2/atl2_hw.c
++++ b/drivers/net/atl2/atl2_hw.c
 @@ -0,0 +1,760 @@
 +/* atl2_hw.c -- atl2 hardware control functions
 + *
@@ -1350,10 +1354,11 @@
 +	atl2_write_phy_reg(hw, MII_DBG_ADDR, 3);
 +	atl2_write_phy_reg(hw, MII_DBG_DATA, 0);
 +}
-Index: linux-2.6.26.noarch/drivers/net/atl2/atl2_hw.h
-===================================================================
+diff --git a/drivers/net/atl2/atl2_hw.h b/drivers/net/atl2/atl2_hw.h
+new file mode 100644
+index 0000000..e8f5b97
 --- /dev/null
-+++ linux-2.6.26.noarch/drivers/net/atl2/atl2_hw.h
++++ b/drivers/net/atl2/atl2_hw.h
 @@ -0,0 +1,758 @@
 +/* atl2_hw.h -- atl2 hardware definitions
 + *
@@ -2113,10 +2118,11 @@
 +};
 +
 +#endif /* _ATL2_HW_H_ */
-Index: linux-2.6.26.noarch/drivers/net/atl2/atl2_main.c
-===================================================================
+diff --git a/drivers/net/atl2/atl2_main.c b/drivers/net/atl2/atl2_main.c
+new file mode 100644
+index 0000000..f1d1810
 --- /dev/null
-+++ linux-2.6.26.noarch/drivers/net/atl2/atl2_main.c
++++ b/drivers/net/atl2/atl2_main.c
 @@ -0,0 +1,1851 @@
 +/* atl2_main.c -- atl2 driver main functions
 + *
@@ -3969,10 +3975,11 @@
 +	struct atl2_adapter *adapter = hw->back;
 +	pci_write_config_word(adapter->pdev, reg, *value);
 +}
-Index: linux-2.6.26.noarch/drivers/net/atl2/atl2_osdep.h
-===================================================================
+diff --git a/drivers/net/atl2/atl2_osdep.h b/drivers/net/atl2/atl2_osdep.h
+new file mode 100644
+index 0000000..b4cf080
 --- /dev/null
-+++ linux-2.6.26.noarch/drivers/net/atl2/atl2_osdep.h
++++ b/drivers/net/atl2/atl2_osdep.h
 @@ -0,0 +1,72 @@
 +/* atl2_osdep.h -- atl2 compat cruft
 + *
@@ -4046,10 +4053,11 @@
 +	(readl(((a)->hw_addr + reg) + ((offset) << 2)))
 +
 +#endif /* _ATL2_OSDEP_H_ */
-Index: linux-2.6.26.noarch/drivers/net/atl2/atl2_param.c
-===================================================================
+diff --git a/drivers/net/atl2/atl2_param.c b/drivers/net/atl2/atl2_param.c
+new file mode 100644
+index 0000000..b26678c
 --- /dev/null
-+++ linux-2.6.26.noarch/drivers/net/atl2/atl2_param.c
++++ b/drivers/net/atl2/atl2_param.c
 @@ -0,0 +1,317 @@
 +/* atl2_param.c -- atl2 parameter processing
 + *

linux-2.6-pciehp-update.patch:

Index: linux-2.6-pciehp-update.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/linux-2.6-pciehp-update.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- linux-2.6-pciehp-update.patch	8 Dec 2008 07:38:22 -0000	1.6
+++ linux-2.6-pciehp-update.patch	12 Jan 2009 19:51:29 -0000	1.7
@@ -1,7 +1,23 @@
-diff -ur vanilla-2.6.27/drivers/pci/hotplug/pciehp_core.c linux-2.6.27.noarch/drivers/pci/hotplug/pciehp_core.c
---- vanilla-2.6.27/drivers/pci/hotplug/pciehp_core.c	2008-10-09 23:13:53.000000000 +0100
-+++ linux-2.6.27.noarch/drivers/pci/hotplug/pciehp_core.c	2008-11-04 13:53:53.000000000 +0000
-@@ -41,6 +41,7 @@
+diff --git a/drivers/pci/hotplug/pciehp.h b/drivers/pci/hotplug/pciehp.h
+index b2801a7..c9f18f9 100644
+--- a/drivers/pci/hotplug/pciehp.h
++++ b/drivers/pci/hotplug/pciehp.h
+@@ -224,6 +224,10 @@ static inline int pciehp_get_hp_hw_control_from_firmware(struct pci_dev *dev)
+ {
+ 	u32 flags = (OSC_PCI_EXPRESS_NATIVE_HP_CONTROL |
+ 		     OSC_PCI_EXPRESS_CAP_STRUCTURE_CONTROL);
++	if (pciehp_force) {
++		dev_info(&dev->dev, "Bypassing BIOS check for pciehp\n");
++		return 0;
++	}
+ 	return acpi_get_hp_hw_control_from_firmware(dev, flags);
+ }
+ 
+diff --git a/drivers/pci/hotplug/pciehp_core.c b/drivers/pci/hotplug/pciehp_core.c
+index 39cf248..ab6b016 100644
+--- a/drivers/pci/hotplug/pciehp_core.c
++++ b/drivers/pci/hotplug/pciehp_core.c
+@@ -41,6 +41,7 @@ int pciehp_debug;
  int pciehp_poll_mode;
  int pciehp_poll_time;
  int pciehp_force;
@@ -9,7 +25,7 @@
  struct workqueue_struct *pciehp_wq;
  
  #define DRIVER_VERSION	"0.4"
-@@ -50,15 +51,18 @@
+@@ -50,15 +51,18 @@ struct workqueue_struct *pciehp_wq;
  MODULE_AUTHOR(DRIVER_AUTHOR);
  MODULE_DESCRIPTION(DRIVER_DESC);
  MODULE_LICENSE("GPL");
@@ -28,7 +44,7 @@
  
  #define PCIE_MODULE_NAME "pciehp"
  
-@@ -85,6 +89,13 @@
+@@ -85,6 +89,13 @@ static struct hotplug_slot_ops pciehp_hotplug_slot_ops = {
    	.get_cur_bus_speed =	get_cur_bus_speed,
  };
  
@@ -42,7 +58,7 @@
  /*
   * Check the status of the Electro Mechanical Interlock (EMI)
   */
-@@ -208,7 +219,11 @@
+@@ -212,7 +223,11 @@ static int init_slots(struct controller *ctrl)
  		hotplug_slot->info = info;
  		hotplug_slot->private = slot;
  		hotplug_slot->release = &release_slot;
@@ -55,39 +71,34 @@
  		slot->hotplug_slot = hotplug_slot;
  		snprintf(name, SLOT_NAME_SIZE, "%u", slot->number);
  
-@@ -401,10 +416,7 @@
+@@ -407,11 +422,7 @@ static int pciehp_probe(struct pcie_device *dev, const struct pcie_port_service_
  	u8 value;
  	struct pci_dev *pdev = dev->port;
  
 -	if (pciehp_force)
--		dbg("Bypassing BIOS check for pciehp use on %s\n",
--		    pci_name(pdev));
+-		dev_info(&dev->device,
+-			 "Bypassing BIOS check for pciehp use on %s\n",
+-			 pci_name(pdev));
 -	else if (pciehp_get_hp_hw_control_from_firmware(pdev))
 +	if (!pciehp_passive && pciehp_get_hp_hw_control_from_firmware(pdev))
  		goto err_out_none;
  
  	ctrl = pcie_init(dev);
-@@ -429,11 +441,9 @@
+@@ -436,7 +447,7 @@ static int pciehp_probe(struct pcie_device *dev, const struct pcie_port_service_
  	t_slot = pciehp_find_slot(ctrl, ctrl->slot_device_offset);
- 
- 	t_slot->hpc_ops->get_adapter_status(t_slot, &value); /* Check if slot is occupied */
--	if (value && pciehp_force) {
--		rc = pciehp_enable_slot(t_slot);
--		if (rc)	/* -ENODEV: shouldn't happen, but deal with it */
--			value = 0;
--	}
-+	if (value && (pciehp_force || pciehp_passive))
-+		pciehp_enable_slot(t_slot);
-+
- 	if ((POWER_CTRL(ctrl)) && !value) {
- 		rc = t_slot->hpc_ops->power_off_slot(t_slot); /* Power off slot if not occupied*/
- 		if (rc)
-@@ -467,8 +477,11 @@
+ 	t_slot->hpc_ops->get_adapter_status(t_slot, &value);
+ 	if (value) {
+-		if (pciehp_force)
++		if (pciehp_force || pciehp_passive)
+ 			pciehp_enable_slot(t_slot);
+ 	} else {
+ 		/* Power off slot if not occupied */
+@@ -474,8 +485,11 @@ static int pciehp_suspend (struct pcie_device *dev, pm_message_t state)
  
  static int pciehp_resume (struct pcie_device *dev)
  {
 +	struct pci_dev *pdev = dev->port;
- 	printk("%s ENTRY\n", __func__);
+ 	dev_info(&dev->device, "%s ENTRY\n", __func__);
 -	if (pciehp_force) {
 +
 +	if (pciehp_force || (pciehp_passive &&
@@ -95,10 +106,11 @@
  		struct controller *ctrl = get_service_data(dev);
  		struct slot *t_slot;
  		u8 status;
-diff -ur vanilla-2.6.27/drivers/pci/hotplug/pciehp_ctrl.c linux-2.6.27.noarch/drivers/pci/hotplug/pciehp_ctrl.c
---- vanilla-2.6.27/drivers/pci/hotplug/pciehp_ctrl.c	2008-10-09 23:13:53.000000000 +0100
-+++ linux-2.6.27.noarch/drivers/pci/hotplug/pciehp_ctrl.c	2008-11-04 15:14:53.000000000 +0000
-@@ -179,7 +179,8 @@
+diff --git a/drivers/pci/hotplug/pciehp_ctrl.c b/drivers/pci/hotplug/pciehp_ctrl.c
+index fead63c..12640bd 100644
+--- a/drivers/pci/hotplug/pciehp_ctrl.c
++++ b/drivers/pci/hotplug/pciehp_ctrl.c
+@@ -185,7 +185,8 @@ static void set_slot_off(struct controller *ctrl, struct slot * pslot)
  	 * before taking any action that relies on power having been
  	 * removed from the slot/adapter.
  	 */
@@ -108,17 +120,7 @@
  
  	if (PWR_LED(ctrl))
  		pslot->hpc_ops->green_led_off(pslot);
-@@ -219,9 +220,6 @@
- 	if (PWR_LED(ctrl))
- 		p_slot->hpc_ops->green_led_blink(p_slot);
- 
--	/* Wait for ~1 second */
--	msleep(1000);
--
- 	/* Check link training status */
- 	retval = p_slot->hpc_ops->check_lnk_status(ctrl);
- 	if (retval) {
-@@ -284,16 +282,16 @@
+@@ -288,16 +289,16 @@ static int remove_board(struct slot *p_slot)
  		}
  	}
  
@@ -143,123 +145,3 @@
  
  	return 0;
  }
-diff -ur vanilla-2.6.27/drivers/pci/hotplug/pciehp.h linux-2.6.27.noarch/drivers/pci/hotplug/pciehp.h
---- vanilla-2.6.27/drivers/pci/hotplug/pciehp.h	2008-10-09 23:13:53.000000000 +0100
-+++ linux-2.6.27.noarch/drivers/pci/hotplug/pciehp.h	2008-11-04 15:14:53.000000000 +0000
-@@ -98,6 +98,7 @@
- 	struct timer_list poll_timer;
- 	int cmd_busy;
- 	unsigned int no_cmd_complete:1;
-+	unsigned int link_active_reporting:1;
- };
- 
- #define INT_BUTTON_IGNORE		0
-@@ -206,6 +207,10 @@
- {
- 	u32 flags = (OSC_PCI_EXPRESS_NATIVE_HP_CONTROL |
- 		     OSC_PCI_EXPRESS_CAP_STRUCTURE_CONTROL);
-+	if (pciehp_force) {
-+		dev_info(&dev->dev, "Bypassing BIOS check for pciehp\n");
-+		return 0;
-+	}
- 	return acpi_get_hp_hw_control_from_firmware(dev, flags);
- }
- 
-diff -ur vanilla-2.6.27/drivers/pci/hotplug/pciehp_hpc.c linux-2.6.27.noarch/drivers/pci/hotplug/pciehp_hpc.c
---- vanilla-2.6.27/drivers/pci/hotplug/pciehp_hpc.c	2008-10-09 23:13:53.000000000 +0100
-+++ linux-2.6.27.noarch/drivers/pci/hotplug/pciehp_hpc.c	2008-11-04 15:17:48.000000000 +0000
-@@ -125,6 +125,7 @@
- /* Field definitions in Link Capabilities Register */
- #define MAX_LNK_SPEED		0x000F
- #define MAX_LNK_WIDTH		0x03F0
-+#define LINK_ACTIVE_REPORTING	0x00100000
- 
- /* Link Width Encoding */
- #define LNK_X1		0x01
-@@ -141,6 +142,7 @@
- #define LNK_TRN_ERR	0x0400
- #define	LNK_TRN		0x0800
- #define SLOT_CLK_CONF	0x1000
-+#define LINK_ACTIVE	0x2000
- 
- /* Field definitions in Slot Capabilities Register */
- #define ATTN_BUTTN_PRSN	0x00000001
-@@ -363,11 +365,52 @@
- 	return retval;
- }
- 
-+static inline int check_link_active(struct controller *ctrl)
-+{
-+	u16 link_status;
-+
-+	if (pciehp_readw(ctrl, LNKSTATUS, &link_status))
-+		return 0;
-+	return !!(link_status & LINK_ACTIVE);
-+}
-+
-+static void pcie_wait_link_active(struct controller *ctrl)
-+{
-+	int timeout = 1000;
-+
-+	if (check_link_active(ctrl))
-+		return;
-+	while (timeout > 0) {
-+		msleep(10);
-+		timeout -= 10;
-+		if (check_link_active(ctrl))
-+			return;
-+	}
-+	dbg("Data Link Layer Link Active not set in 1000 msec\n");
-+}
-+
- static int hpc_check_lnk_status(struct controller *ctrl)
- {
- 	u16 lnk_status;
- 	int retval = 0;
- 
-+        /*
-+         * Data Link Layer Link Active Reporting must be capable for
-+         * hot-plug capable downstream port. But old controller might
-+         * not implement it. In this case, we wait for 1000 ms.
-+         */
-+        if (ctrl->link_active_reporting){
-+                /* Wait for Data Link Layer Link Active bit to be set */
-+                pcie_wait_link_active(ctrl);
-+                /*
-+                 * We must wait for 100 ms after the Data Link Layer
-+                 * Link Active bit reads 1b before initiating a
-+                 * configuration access to the hot added device.
-+                 */
-+                msleep(100);
-+        } else
-+                msleep(1000);
-+
- 	retval = pciehp_readw(ctrl, LNKSTATUS, &lnk_status);
- 	if (retval) {
- 		err("%s: Cannot read LNKSTATUS register\n", __func__);
-@@ -1104,7 +1147,7 @@
- struct controller *pcie_init(struct pcie_device *dev)
- {
- 	struct controller *ctrl;
--	u32 slot_cap;
-+	u32 slot_cap, link_cap;
- 	struct pci_dev *pdev = dev->port;
- 
- 	ctrl = kzalloc(sizeof(*ctrl), GFP_KERNEL);
-@@ -1144,6 +1187,16 @@
- 	    !(POWER_CTRL(ctrl) | ATTN_LED(ctrl) | PWR_LED(ctrl) | EMI(ctrl)))
- 	    ctrl->no_cmd_complete = 1;
- 
-+        /* Check if Data Link Layer Link Active Reporting is implemented */
-+        if (pciehp_readl(ctrl, LNKCAP, &link_cap)) {
-+                err("%s: Cannot read LNKCAP register\n", __func__);
-+                goto abort_ctrl;
-+        }
-+        if (link_cap & LINK_ACTIVE_REPORTING) {
-+                dbg("Link Active Reporting supported\n");
-+                ctrl->link_active_reporting = 1;
-+        }
-+
- 	/* Clear all remaining event bits in Slot Status register */
- 	if (pciehp_writew(ctrl, SLOTSTATUS, 0x1f))
- 		goto abort_ctrl;

linux-2.6-silence-noise.patch:

Index: linux-2.6-silence-noise.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/linux-2.6-silence-noise.patch,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- linux-2.6-silence-noise.patch	25 Sep 2008 20:36:21 -0000	1.21
+++ linux-2.6-silence-noise.patch	12 Jan 2009 19:51:30 -0000	1.22
@@ -41,3 +41,26 @@
 -- 
 1.6.0.1
 
+Socket fuzzers like sfuzz will trigger this printk a lot, even though it's
+ratelimited. It isn't particularly useful, so just remove it.
+
+Signed-off-by: Dave Jones <davej at redhat.com>
+
+--- linux-2.6.27.noarch/net/can/af_can.c~	2008-12-11 16:53:48.000000000 -0500
++++ linux-2.6.27.noarch/net/can/af_can.c	2008-12-11 16:54:42.000000000 -0500
+@@ -134,13 +134,9 @@ static int can_create(struct net *net, s
+ 		err = request_module("can-proto-%d", protocol);
+ 
+ 		/*
+-		 * In case of error we only print a message but don't
+-		 * return the error code immediately.  Below we will
+-		 * return -EPROTONOSUPPORT
++		 * In case of error we don't return the error code immediately.
++		 * Below we will return -EPROTONOSUPPORT
+ 		 */
+-		if (err && printk_ratelimit())
+-			printk(KERN_ERR "can: request_module "
+-			       "(can-proto-%d) failed.\n", protocol);
+ 	}
+ #endif
+ 

linux-2.6-squashfs.patch:

Index: linux-2.6-squashfs.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/linux-2.6-squashfs.patch,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- linux-2.6-squashfs.patch	30 Sep 2008 19:20:33 -0000	1.31
+++ linux-2.6-squashfs.patch	12 Jan 2009 19:51:30 -0000	1.32
@@ -1,7 +1,8 @@
-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
+diff --git a/fs/Kconfig b/fs/Kconfig
+index 522469a..b3ecd03 100644
+--- a/fs/Kconfig
++++ b/fs/Kconfig
+@@ -931,6 +931,56 @@ config CRAMFS
  
  	  If unsure, say N.
  
@@ -58,10 +59,11 @@
  config VXFS_FS
  	tristate "FreeVxFS file system support (VERITAS VxFS(TM) compatible)"
  	depends on BLOCK
-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/
+diff --git a/fs/Makefile b/fs/Makefile
+index d9f8afe..c567180 100644
+--- a/fs/Makefile
++++ b/fs/Makefile
+@@ -76,6 +76,7 @@ obj-$(CONFIG_JBD)		+= jbd/
  obj-$(CONFIG_JBD2)		+= jbd2/
  obj-$(CONFIG_EXT2_FS)		+= ext2/
  obj-$(CONFIG_CRAMFS)		+= cramfs/
@@ -69,10 +71,25 @@
  obj-y				+= ramfs/
  obj-$(CONFIG_HUGETLBFS)		+= hugetlbfs/
  obj-$(CONFIG_CODA_FS)		+= coda/
-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 @@
+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..335ba3e
+--- /dev/null
++++ b/fs/squashfs/inode.c
+@@ -0,0 +1,2158 @@
 +/*
 + * Squashfs - a compressed read only filesystem for Linux
 + *
@@ -714,29 +731,14 @@
 +{
 +	squashfs_inode_t inode;
 +	struct inode *i;
-+	struct dentry *dentry;
++	struct dentry *dentry = ERR_PTR(-ENOENT);
 +
 +	TRACE("Entered squashfs_export_iget\n");
 +
 +	inode = squashfs_inode_lookup(s, inode_number);
-+	if(inode == SQUASHFS_INVALID_BLK) {
-+		dentry = ERR_PTR(-ENOENT);
-+		goto failure;
-+	}
-+
-+	i = squashfs_iget(s, inode, inode_number);
-+	if(i == NULL) {
-+		dentry = ERR_PTR(-EACCES);
-+		goto failure;
-+	}
++	if (inode != SQUASHFS_INVALID_BLK)
++		dentry = d_obtain_alias(squashfs_iget(s, inode, inode_number));
 +
-+	dentry = d_alloc_anon(i);
-+	if (dentry == NULL) {
-+		iput(i);
-+		dentry = ERR_PTR(-ENOMEM);
-+	}
-+
-+failure:
 +	return dentry;
 +}
 +
@@ -2246,20 +2248,103 @@
 +MODULE_DESCRIPTION("squashfs 3.4, a compressed read-only filesystem");
 +MODULE_AUTHOR("Phillip Lougher <phillip at lougher.demon.co.uk>");
 +MODULE_LICENSE("GPL");
-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.
-+#
+diff --git a/fs/squashfs/squashfs.h b/fs/squashfs/squashfs.h
+new file mode 100644
+index 0000000..4e11742
+--- /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, 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
++ */
 +
-+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
++#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 --git a/fs/squashfs/squashfs2_0.c b/fs/squashfs/squashfs2_0.c
+new file mode 100644
+index 0000000..30ebdb9
+--- /dev/null
++++ b/fs/squashfs/squashfs2_0.c
 @@ -0,0 +1,740 @@
 +/*
 + * Squashfs - a compressed read only filesystem for Linux
@@ -3001,99 +3086,11 @@
 +
 +	return 1;
 +}
-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
+diff --git a/include/linux/squashfs_fs.h b/include/linux/squashfs_fs.h
+new file mode 100644
+index 0000000..4cdd11f
+--- /dev/null
++++ b/include/linux/squashfs_fs.h
 @@ -0,0 +1,935 @@
 +#ifndef SQUASHFS_FS
 +#define SQUASHFS_FS
@@ -4030,9 +4027,11 @@
 +
 +#endif
 +#endif
-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
+diff --git a/include/linux/squashfs_fs_i.h b/include/linux/squashfs_fs_i.h
+new file mode 100644
+index 0000000..b41c13c
+--- /dev/null
++++ b/include/linux/squashfs_fs_i.h
 @@ -0,0 +1,45 @@
 +#ifndef SQUASHFS_FS_I
 +#define SQUASHFS_FS_I
@@ -4079,9 +4078,11 @@
 +	struct inode	vfs_inode;
 +};
 +#endif
-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
+diff --git a/include/linux/squashfs_fs_sb.h b/include/linux/squashfs_fs_sb.h
+new file mode 100644
+index 0000000..75c3716
+--- /dev/null
++++ b/include/linux/squashfs_fs_sb.h
 @@ -0,0 +1,79 @@
 +#ifndef SQUASHFS_FS_SB
 +#define SQUASHFS_FS_SB
@@ -4162,9 +4163,10 @@
 +	int			(*read_fragment_index_table)(struct super_block *s);
 +};
 +#endif
-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
+diff --git a/init/do_mounts_rd.c b/init/do_mounts_rd.c
+index a7c748f..a343342 100644
+--- a/init/do_mounts_rd.c
++++ b/init/do_mounts_rd.c
 @@ -5,6 +5,7 @@
  #include <linux/ext2_fs.h>
  #include <linux/romfs_fs.h>
@@ -4173,7 +4175,7 @@
  #include <linux/initrd.h>
  #include <linux/string.h>
  
-@@ -37,6 +38,7 @@ static int __init crd_load(int in_fd, in
+@@ -37,6 +38,7 @@ static int __init crd_load(int in_fd, int out_fd);
   * numbers could not be found.
   *
   * We currently check for the following magic numbers:
@@ -4181,7 +4183,7 @@
   * 	minix
   * 	ext2
   *	romfs
-@@ -51,6 +53,7 @@ identify_ramdisk_image(int fd, int start
+@@ -51,6 +53,7 @@ identify_ramdisk_image(int fd, int start_block)
  	struct ext2_super_block *ext2sb;
  	struct romfs_super_block *romfsb;
  	struct cramfs_super *cramfsb;
@@ -4189,7 +4191,7 @@
  	int nblocks = -1;
  	unsigned char *buf;
  
-@@ -62,6 +65,7 @@ identify_ramdisk_image(int fd, int start
+@@ -62,6 +65,7 @@ identify_ramdisk_image(int fd, int start_block)
  	ext2sb = (struct ext2_super_block *) buf;
  	romfsb = (struct romfs_super_block *) buf;
  	cramfsb = (struct cramfs_super *) buf;
@@ -4197,7 +4199,7 @@
  	memset(buf, 0xe5, size);
  
  	/*
-@@ -99,6 +103,18 @@ identify_ramdisk_image(int fd, int start
+@@ -99,6 +103,18 @@ identify_ramdisk_image(int fd, int start_block)
  		goto done;
  	}
  

linux-2.6-upstream-reverts.patch:

Index: linux-2.6-upstream-reverts.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/linux-2.6-upstream-reverts.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- linux-2.6-upstream-reverts.patch	9 Nov 2008 22:38:20 -0000	1.6
+++ linux-2.6-upstream-reverts.patch	12 Jan 2009 19:51:30 -0000	1.7
@@ -1,384 +1 @@
-From 4b40893918203ee1a1f6a114316c2a19c072e9bd Mon Sep 17 00:00:00 2001
-From: Matthias Hopf <mhopf at suse.de>
-Date: Sat, 18 Oct 2008 07:18:05 +1000
-Subject: drm/i915: fix ioremap of a user address for non-root (CVE-2008-3831)
-Status: O
-Content-Length: 1367
-Lines: 30
-
-From: Matthias Hopf <mhopf at suse.de>
-
-commit 4b40893918203ee1a1f6a114316c2a19c072e9bd upstream
-
-Olaf Kirch noticed that the i915_set_status_page() function of the i915
-kernel driver calls ioremap with an address offset that is supplied by
-userspace via ioctl. The function zeroes the mapped memory via memset
-and tells the hardware about the address. Turns out that access to that
-ioctl is not restricted to root so users could probably exploit that to
-do nasty things. We haven't tried to write actual exploit code though.
-
-It only affects the Intel G33 series and newer.
-
-Signed-off-by: Dave Airlie <airlied at redhat.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
-
----
- drivers/gpu/drm/i915/i915_dma.c |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/drivers/gpu/drm/i915/i915_dma.c
-+++ b/drivers/gpu/drm/i915/i915_dma.c
-@@ -836,7 +836,7 @@ struct drm_ioctl_desc i915_ioctls[] = {
- 	DRM_IOCTL_DEF(DRM_I915_SET_VBLANK_PIPE,  i915_vblank_pipe_set, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY ),
- 	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),
-+	DRM_IOCTL_DEF(DRM_I915_HWS_ADDR, i915_set_status_page, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),
- };
- 
- int i915_max_ioctl = DRM_ARRAY_SIZE(i915_ioctls);
-From cebbert at redhat.com  Mon Oct 27 13:55:39 2008
-Status: RO
-Content-Length: 324
-Lines: 7
-
-Revert these patches from the stable queue:
-firewire-fix-ioctl-return-code.patch
-firewire-fix-setting-tag-and-sy-in-iso-transmission.patch
-firewire-fix-struct-fw_node-memory-leak.patch
-firewire-fw-sbp2-delay-first-login-to-avoid-retries.patch
-firewire-fw-sbp2-fix-races.patch
-firewire-survive-more-than-256-bus-resets.patch
-
-From stefanr at s5r6.in-berlin.de  Tue Nov  4 13:55:39 2008
-From: Stefan Richter <stefanr at s5r6.in-berlin.de>
-Date: Mon, 27 Oct 2008 23:26:35 +0100 (CET)
-Subject: firewire: fix ioctl() return code
-To: stable at kernel.org
-Cc: linux1394-devel at lists.sourceforge.net, linux-kernel at vger.kernel.org
-Message-ID: <tkrat.509dbd5216c80cfd at s5r6.in-berlin.de>
-Content-Disposition: INLINE
-Status: O
-Content-Length: 680
-Lines: 27
-
-
-From: Stefan Richter <stefanr at s5r6.in-berlin.de>
-
-commit 99692f71ee04c6f249d0bf6a581359f32f409a38 upstream
-
-Reported by Jay Fenlason:  ioctl() did not return as intended
-  - the size of data read into ioctl_send_request,
-  - the number of datagrams enqueued by ioctl_queue_iso.
-
-
-Signed-off-by: Stefan Richter <stefanr at s5r6.in-berlin.de>
-Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
-
----
- drivers/firewire/fw-cdev.c |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/drivers/firewire/fw-cdev.c
-+++ b/drivers/firewire/fw-cdev.c
-@@ -913,7 +913,7 @@ dispatch_ioctl(struct client *client, un
- 			return -EFAULT;
- 	}
- 
--	return 0;
-+	return retval;
- }
- 
- static long
-From stefanr at s5r6.in-berlin.de  Tue Nov  4 13:54:50 2008
-From: Stefan Richter <stefanr at s5r6.in-berlin.de>
-Date: Mon, 27 Oct 2008 23:26:00 +0100 (CET)
-Subject: firewire: fix setting tag and sy in iso transmission
-To: stable at kernel.org
-Cc: linux1394-devel at lists.sourceforge.net, linux-kernel at vger.kernel.org
-Message-ID: <tkrat.c6c9e197bd5d3af2 at s5r6.in-berlin.de>
-Content-Disposition: INLINE
-Status: O
-Content-Length: 948
-Lines: 26
-
-From: Stefan Richter <stefanr at s5r6.in-berlin.de>
-
-commit 7a1003449c693f0d57443c8786bbf19717921ae0 upstream
-
-Reported by Jay Fenlason:
-The iso packet control accessors in fw-cdev.c had bogus masks.
-
-Signed-off-by: Stefan Richter <stefanr at s5r6.in-berlin.de>
-Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
-
----
- drivers/firewire/fw-cdev.c |    4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
---- a/drivers/firewire/fw-cdev.c
-+++ b/drivers/firewire/fw-cdev.c
-@@ -720,8 +720,8 @@ static int ioctl_create_iso_context(stru
- #define GET_PAYLOAD_LENGTH(v)	((v) & 0xffff)
- #define GET_INTERRUPT(v)	(((v) >> 16) & 0x01)
- #define GET_SKIP(v)		(((v) >> 17) & 0x01)
--#define GET_TAG(v)		(((v) >> 18) & 0x02)
--#define GET_SY(v)		(((v) >> 20) & 0x04)
-+#define GET_TAG(v)		(((v) >> 18) & 0x03)
-+#define GET_SY(v)		(((v) >> 20) & 0x0f)
- #define GET_HEADER_LENGTH(v)	(((v) >> 24) & 0xff)
- 
- static int ioctl_queue_iso(struct client *client, void *buffer)
-From stefanr at s5r6.in-berlin.de  Tue Nov  4 13:57:03 2008
-From: Jay Fenlason <fenlason at redhat.com>
-Date: Mon, 27 Oct 2008 23:28:14 +0100 (CET)
-Subject: firewire: fix struct fw_node memory leak
-To: stable at kernel.org
-Cc: linux1394-devel at lists.sourceforge.net, linux-kernel at vger.kernel.org
-Message-ID: <tkrat.e499a05eaa0ec529 at s5r6.in-berlin.de>
-Content-Disposition: INLINE
-Status: O
-Content-Length: 1050
-Lines: 36
-
-From: Jay Fenlason <fenlason at redhat.com>
-
-commit 77e557191701afa55ae7320d42ad6458a2ad292e upstream
-
-With the bus_resets patch applied, it is easy to see this memory leak
-by repeatedly resetting the firewire bus while running slabtop in
-another window.  Just watch kmalloc-32 grow and grow...
-
-Signed-off-by: Jay Fenlason <fenlason at redhat.com>
-Signed-off-by: Stefan Richter <stefanr at s5r6.in-berlin.de>
-
----
- drivers/firewire/fw-topology.c |    6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
---- a/drivers/firewire/fw-topology.c
-+++ b/drivers/firewire/fw-topology.c
-@@ -413,7 +413,7 @@ static void
- update_tree(struct fw_card *card, struct fw_node *root)
- {
- 	struct list_head list0, list1;
--	struct fw_node *node0, *node1;
-+	struct fw_node *node0, *node1, *next1;
- 	int i, event;
- 
- 	INIT_LIST_HEAD(&list0);
-@@ -485,7 +485,9 @@ update_tree(struct fw_card *card, struct
- 		}
- 
- 		node0 = fw_node(node0->link.next);
--		node1 = fw_node(node1->link.next);
-+		next1 = fw_node(node1->link.next);
-+		fw_node_put(node1);
-+		node1 = next1;
- 	}
- }
- 
-From stefanr at s5r6.in-berlin.de  Tue Nov  4 13:57:36 2008
-From: Stefan Richter <stefanr at s5r6.in-berlin.de>
-Date: Mon, 27 Oct 2008 23:29:00 +0100 (CET)
-Subject: firewire: fw-sbp2: delay first login to avoid retries
-To: stable at kernel.org
-Cc: linux1394-devel at lists.sourceforge.net, linux-kernel at vger.kernel.org
-Message-ID: <tkrat.9bc21c3b6a97bebe at s5r6.in-berlin.de>
-Content-Disposition: INLINE
-Status: O
-Content-Length: 1597
-Lines: 40
-
-From: Stefan Richter <stefanr at s5r6.in-berlin.de>
-
-commit 0dcfeb7e3c8695c5aa3677dda8efb9bef2e7e64d upstream
-
-This optimizes firewire-sbp2's device probe for the case that the local
-node and the SBP-2 node were discovered at the same time.  In this case,
-fw-core's bus management work and fw-sbp2's login and SCSI probe work
-are scheduled in parallel (in the globally shared workqueue and in
-fw-sbp2's workqueue, respectively).  The bus reset from fw-core may then
-disturb and extremely delay the login and SCSI probe because the latter
-fails with several command timeouts and retries and has to be retried
-from scratch.
-
-We avoid this particular situation of sbp2_login() and fw_card_bm_work()
-running in parallel by delaying the first sbp2_login() a little bit.
-
-This is meant to be a short-term fix for
-https://bugzilla.redhat.com/show_bug.cgi?id=466679.  In the long run,
-the SCSI probe, i.e. fw-sbp2's call of __scsi_add_device(), should be
-parallelized with sbp2_reconnect().
-
-Problem reported and fix tested and confirmed by Alex Kanavin.
-
-Signed-off-by: Stefan Richter <stefanr at s5r6.in-berlin.de>
-Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
-
----
- drivers/firewire/fw-sbp2.c |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/drivers/firewire/fw-sbp2.c
-+++ b/drivers/firewire/fw-sbp2.c
-@@ -1158,7 +1158,7 @@ static int sbp2_probe(struct device *dev
- 
- 	/* Do the login in a workqueue so we can easily reschedule retries. */
- 	list_for_each_entry(lu, &tgt->lu_list, link)
--		sbp2_queue_work(lu, 0);
-+		sbp2_queue_work(lu, DIV_ROUND_UP(HZ, 5));
- 	return 0;
- 
-  fail_tgt_put:
-From stefanr at s5r6.in-berlin.de  Tue Nov  4 13:58:11 2008
-From: Jay Fenlason <fenlason at redhat.com>
-Date: Mon, 27 Oct 2008 23:29:32 +0100 (CET)
-Subject: firewire: fw-sbp2: fix races
-To: stable at kernel.org
-Cc: linux1394-devel at lists.sourceforge.net, linux-kernel at vger.kernel.org
-Message-ID: <tkrat.84265bc39337ceb3 at s5r6.in-berlin.de>
-Status: O
-Content-Length: 3223
-Lines: 95
-
-From: Jay Fenlason <fenlason at redhat.com>
-
-Same as commit cd1f70fdb4823c97328a1f151f328eb36fafd579 upstream
-
-1: There is a small race between queue_delayed_work() and its
-   corresponding kref_get().  Do the kref_get first, and _put it again
-   if the queue_delayed_work() failed, so there is no chance of the
-   kref going to zero while the work is scheduled.
-2: An SBP2_LOGOUT_REQUEST could be sent out with a login_id full of
-   garbage.  Initialize it to an invalid value so we can tell if we
-   ever got a valid login_id.
-3: The node ID and generation may have changed but the new values may
-   not yet have been recorded in lu and tgt when the final logout is
-   attempted.  Use the latest values from the device in
-   sbp2_release_target().
-
-Signed-off-by: Jay Fenlason <fenlason at redhat.com>
-Signed-off-by: Stefan Richter <stefanr at s5r6.in-berlin.de>
-Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
-
----
- drivers/firewire/fw-sbp2.c |   36 ++++++++++++++++++++++++++----------
- 1 file changed, 26 insertions(+), 10 deletions(-)
-
---- a/drivers/firewire/fw-sbp2.c
-+++ b/drivers/firewire/fw-sbp2.c
-@@ -172,6 +172,9 @@ struct sbp2_target {
- 	int blocked;	/* ditto */
- };
- 
-+/* Impossible login_id, to detect logout attempt before successful login */
-+#define INVALID_LOGIN_ID 0x10000
-+
- /*
-  * Per section 7.4.8 of the SBP-2 spec, a mgt_ORB_timeout value can be
-  * provided in the config rom. Most devices do provide a value, which
-@@ -791,9 +794,20 @@ static void sbp2_release_target(struct k
- 			scsi_remove_device(sdev);
- 			scsi_device_put(sdev);
- 		}
--		sbp2_send_management_orb(lu, tgt->node_id, lu->generation,
--				SBP2_LOGOUT_REQUEST, lu->login_id, NULL);
--
-+		if (lu->login_id != INVALID_LOGIN_ID) {
-+			int generation, node_id;
-+			/*
-+			 * tgt->node_id may be obsolete here if we failed
-+			 * during initial login or after a bus reset where
-+			 * the topology changed.
-+			 */
-+			generation = device->generation;
-+			smp_rmb(); /* node_id vs. generation */
-+			node_id    = device->node_id;
-+			sbp2_send_management_orb(lu, node_id, generation,
-+						 SBP2_LOGOUT_REQUEST,
-+						 lu->login_id, NULL);
-+		}
- 		fw_core_remove_address_handler(&lu->address_handler);
- 		list_del(&lu->link);
- 		kfree(lu);
-@@ -808,19 +822,20 @@ static void sbp2_release_target(struct k
- 
- static struct workqueue_struct *sbp2_wq;
- 
-+static void sbp2_target_put(struct sbp2_target *tgt)
-+{
-+	kref_put(&tgt->kref, sbp2_release_target);
-+}
-+
- /*
-  * Always get the target's kref when scheduling work on one its units.
-  * Each workqueue job is responsible to call sbp2_target_put() upon return.
-  */
- static void sbp2_queue_work(struct sbp2_logical_unit *lu, unsigned long delay)
- {
--	if (queue_delayed_work(sbp2_wq, &lu->work, delay))
--		kref_get(&lu->tgt->kref);
--}
--
--static void sbp2_target_put(struct sbp2_target *tgt)
--{
--	kref_put(&tgt->kref, sbp2_release_target);
-+	kref_get(&lu->tgt->kref);
-+	if (!queue_delayed_work(sbp2_wq, &lu->work, delay))
-+		sbp2_target_put(lu->tgt);
- }
- 
- static void
-@@ -993,6 +1008,7 @@ static int sbp2_add_logical_unit(struct 
- 
- 	lu->tgt      = tgt;
- 	lu->lun      = lun_entry & 0xffff;
-+	lu->login_id = INVALID_LOGIN_ID;
- 	lu->retries  = 0;
- 	lu->has_sdev = false;
- 	lu->blocked  = false;
-From stefanr at s5r6.in-berlin.de  Tue Nov  4 13:56:10 2008
-From: Jay Fenlason <fenlason at redhat.com>
-Date: Mon, 27 Oct 2008 23:27:37 +0100 (CET)
-Subject: firewire: Survive more than 256 bus resets
-To: stable at kernel.org
-Cc: linux1394-devel at lists.sourceforge.net, linux-kernel at vger.kernel.org
-Message-ID: <tkrat.6faab57f3da8f9b9 at s5r6.in-berlin.de>
-Content-Disposition: INLINE
-Status: O
-Content-Length: 1058
-Lines: 31
-
-From: Jay Fenlason <fenlason at redhat.com>
-
-Same as commit 4f9740d4f5a17fa6a1b097fa3ccdfb7246660307 upstream
-
-The "color" is used during the topology building after a bus reset,
-hovever in "struct fw_node"s it is stored in a u8, but in struct fw_card
-it is stored in an int.  When the value wraps in one struct, but not
-the other, disaster strikes.
-
-Fixes http://bugzilla.kernel.org/show_bug.cgi?id=10922 -
-machine locks up solid if a series of bus resets occurs.
-
-
-Signed-off-by: Jay Fenlason <fenlason at redhat.com>
-Signed-off-by: Stefan Richter <stefanr at s5r6.in-berlin.de>
-Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
-
----
- drivers/firewire/fw-transaction.h |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/drivers/firewire/fw-transaction.h
-+++ b/drivers/firewire/fw-transaction.h
-@@ -248,7 +248,7 @@ struct fw_card {
- 	struct fw_node *local_node;
- 	struct fw_node *root_node;
- 	struct fw_node *irm_node;
--	int color;
-+	u8 color; /* must be u8 to match the definition in struct fw_node */
- 	int gap_count;
- 	bool beta_repeaters_present;
- 
+nil

linux-2.6-utrace.patch:

Index: linux-2.6-utrace.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/linux-2.6-utrace.patch,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -r1.103 -r1.104
--- linux-2.6-utrace.patch	8 Jan 2009 04:44:02 -0000	1.103
+++ linux-2.6-utrace.patch	12 Jan 2009 19:51:30 -0000	1.104
@@ -1,5 +1,5 @@
- Documentation/DocBook/Makefile    |    2 +-
- Documentation/DocBook/utrace.tmpl |  571 ++++++++
+ Documentation/DocBook/Makefile    |    4 +-
+ Documentation/DocBook/utrace.tmpl |  566 ++++++++
  fs/proc/array.c                   |    3 +
  include/linux/ptrace.h            |   21 +
  include/linux/sched.h             |    6 +
@@ -9,15 +9,19 @@
  kernel/Makefile                   |    1 +
  kernel/ptrace.c                   |  793 +++++++++++-
  kernel/signal.c                   |   14 +-
- kernel/utrace.c                   | 2590 +++++++++++++++++++++++++++++++++++++
- 12 files changed, 4790 insertions(+), 12 deletions(-)
+ kernel/utrace.c                   | 2587 +++++++++++++++++++++++++++++++++++++
+ 12 files changed, 4783 insertions(+), 13 deletions(-)
 
 diff --git a/Documentation/DocBook/Makefile b/Documentation/DocBook/Makefile
-index 1615350..d27e093 100644  
+index 9b1f6ca..e39334b 100644  
 --- a/Documentation/DocBook/Makefile
 +++ b/Documentation/DocBook/Makefile
-@@ -9,7 +9,7 @@
- DOCBOOKS := wanbook.xml z8530book.xml mcabook.xml videobook.xml \
+@@ -6,10 +6,10 @@
+ # To add a new book the only step required is to add the book to the
+ # list of DOCBOOKS.
+ 
+-DOCBOOKS := wanbook.xml z8530book.xml mcabook.xml \
++DOCBOOKS := wanbook.xml z8530book.xml mcabook.xml \
  	    kernel-hacking.xml kernel-locking.xml deviceiobook.xml \
  	    procfs-guide.xml writing_usb_driver.xml networking.xml \
 -	    kernel-api.xml filesystems.xml lsm.xml usb.xml kgdb.xml \
@@ -27,10 +31,10 @@
  	    mac80211.xml debugobjects.xml sh.xml
 diff --git a/Documentation/DocBook/utrace.tmpl b/Documentation/DocBook/utrace.tmpl
 new file mode 100644
-index ...f253402 100644  
+index ...1c37104 100644  
 --- /dev/null
 +++ b/Documentation/DocBook/utrace.tmpl
-@@ -0,0 +1,571 @@
+@@ -0,0 +1,566 @@
 +<?xml version="1.0" encoding="UTF-8"?>
 +<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
 +"http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" []>
@@ -97,11 +101,6 @@
 +    Many engines can be attached to each thread.  When a thread has an
 +    event, each engine gets a callback if it has set the event flag for
 +    that event type.  Engines are called in the order they attached.
-+    Engines that attach after the event has occurred do not get callbacks
-+    for that event.  This includes any new engines just attached by an
-+    existing engine's callback function.  Once the sequence of callbacks
-+    for that one event has completed, such new engines are then eligible in
-+    the next sequence that starts when there is another event.
 +  </para>
 +
 +  <para>
@@ -603,7 +602,7 @@
 +
 +</book>
 diff --git a/fs/proc/array.c b/fs/proc/array.c
-index 71c9be5..adc7a53 100644  
+index 6af7fba..9b6902a 100644  
 --- a/fs/proc/array.c
 +++ b/fs/proc/array.c
 @@ -81,6 +81,7 @@
@@ -614,7 +613,7 @@
  
  #include <asm/pgtable.h>
  #include <asm/processor.h>
-@@ -190,6 +191,8 @@ static inline void task_state(struct seq
+@@ -185,6 +186,8 @@ static inline void task_state(struct seq
  		p->uid, p->euid, p->suid, p->fsuid,
  		p->gid, p->egid, p->sgid, p->fsgid);
  
@@ -624,10 +623,10 @@
  	if (p->files)
  		fdt = files_fdtable(p->files);
 diff --git a/include/linux/ptrace.h b/include/linux/ptrace.h
-index ea7416c..06eaace 100644  
+index 22641d5..91b3412 100644  
 --- a/include/linux/ptrace.h
 +++ b/include/linux/ptrace.h
-@@ -121,6 +121,7 @@ static inline void ptrace_unlink(struct 
+@@ -120,6 +120,7 @@ static inline void ptrace_unlink(struct 
  int generic_ptrace_peekdata(struct task_struct *tsk, long addr, long data);
  int generic_ptrace_pokedata(struct task_struct *tsk, long addr, long data);
  
@@ -635,7 +634,7 @@
  /**
   * task_ptrace - return %PT_* flags that apply to a task
   * @task:	pointer to &task_struct in question
-@@ -154,6 +155,26 @@ static inline int ptrace_event(int mask,
+@@ -153,6 +154,26 @@ static inline int ptrace_event(int mask,
  	return 1;
  }
  
@@ -663,10 +662,10 @@
   * 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 086f5e1..b0be16c 100644  
+index 55e30d1..b82b5f4 100644  
 --- a/include/linux/sched.h
 +++ b/include/linux/sched.h
-@@ -1200,6 +1200,11 @@ struct task_struct {
+@@ -1243,6 +1243,11 @@ struct task_struct {
  #endif
  	seccomp_t seccomp;
  
@@ -678,7 +677,7 @@
  /* Thread group tracking */
     	u32 parent_exec_id;
     	u32 self_exec_id;
-@@ -1778,6 +1783,7 @@ extern int kill_pgrp(struct pid *pid, in
+@@ -1829,6 +1834,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);
@@ -1633,10 +1632,10 @@
 +
 +#endif	/* linux/utrace.h */
 diff --git a/init/Kconfig b/init/Kconfig
-index c11da38..9ca2a8f 100644  
+index f763762..df75f9c 100644  
 --- a/init/Kconfig
 +++ b/init/Kconfig
-@@ -898,6 +898,32 @@ config STOP_MACHINE
+@@ -923,6 +923,32 @@ config STOP_MACHINE
  	help
  	  Need stop_machine() primitive.
  
@@ -1670,10 +1669,10 @@
  
  config PREEMPT_NOTIFIERS
 diff --git a/kernel/Makefile b/kernel/Makefile
-index 143e8b6..a1e4b62 100644  
+index 19fad00..16a30b0 100644  
 --- a/kernel/Makefile
 +++ b/kernel/Makefile
-@@ -62,6 +62,7 @@ obj-$(CONFIG_IKCONFIG) += configs.o
+@@ -64,6 +64,7 @@ obj-$(CONFIG_IKCONFIG) += configs.o
  obj-$(CONFIG_RESOURCE_COUNTERS) += res_counter.o
  obj-$(CONFIG_STOP_MACHINE) += stop_machine.o
  obj-$(CONFIG_KPROBES_SANITY_TEST) += test_kprobes.o
@@ -1682,7 +1681,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..bc81174 100644  
+index 4c8bcd7..8d19d04 100644  
 --- a/kernel/ptrace.c
 +++ b/kernel/ptrace.c
 @@ -16,6 +16,7 @@
@@ -1701,7 +1700,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,72 @@ void ptrace_untrace(struct task_struct *
+@@ -58,6 +60,72 @@ static void ptrace_untrace(struct task_s
  	spin_unlock(&child->sighand->siglock);
  }
  
@@ -2577,10 +2576,10 @@
  
  /**
 diff --git a/kernel/signal.c b/kernel/signal.c
-index e661b01..1effefc 100644  
+index 4530fc6..0e85826 100644  
 --- a/kernel/signal.c
 +++ b/kernel/signal.c
-@@ -1415,7 +1415,7 @@ int do_notify_parent(struct task_struct 
+@@ -1419,7 +1419,7 @@ int do_notify_parent(struct task_struct 
  	return ret;
  }
  
@@ -2589,7 +2588,7 @@
  {
  	struct siginfo info;
  	unsigned long flags;
-@@ -1470,6 +1470,8 @@ static void do_notify_parent_cldstop(str
+@@ -1474,6 +1474,8 @@ static void do_notify_parent_cldstop(str
  	spin_unlock_irqrestore(&sighand->siglock, flags);
  }
  
@@ -2598,7 +2597,7 @@
  static inline int may_ptrace_stop(void)
  {
  	if (!likely(current->ptrace & PT_PTRACED))
-@@ -1602,6 +1604,8 @@ void ptrace_notify(int exit_code)
+@@ -1606,6 +1608,8 @@ void ptrace_notify(int exit_code)
  	spin_unlock_irq(&current->sighand->siglock);
  }
  
@@ -2607,7 +2606,7 @@
  static void
  finish_stop(int stop_count)
  {
-@@ -1679,6 +1683,7 @@ static int do_signal_stop(int signr)
+@@ -1683,6 +1687,7 @@ static int do_signal_stop(int signr)
  	return 1;
  }
  
@@ -2615,7 +2614,7 @@
  static int ptrace_signal(int signr, siginfo_t *info,
  			 struct pt_regs *regs, void *cookie)
  {
-@@ -1717,6 +1722,13 @@ static int ptrace_signal(int signr, sigi
+@@ -1721,6 +1726,13 @@ static int ptrace_signal(int signr, sigi
  
  	return signr;
  }
@@ -2631,14 +2630,14 @@
  			  struct pt_regs *regs, void *cookie)
 diff --git a/kernel/utrace.c b/kernel/utrace.c
 new file mode 100644
-index ...1873b9d 100644  
+index ...3e2191c 100644  
 --- /dev/null
 +++ b/kernel/utrace.c
-@@ -0,0 +1,2590 @@
+@@ -0,0 +1,2587 @@
 +/*
 + * utrace infrastructure interface for debugging user processes
 + *
-+ * Copyright (C) 2006-2009 Red Hat, Inc.  All rights reserved.
++ * Copyright (C) 2006, 2007, 2008 Red Hat, Inc.  All rights reserved.
 + *
 + * This copyrighted material is made available to anyone wishing to use,
 + * modify, copy, or redistribute it subject to the terms and conditions
@@ -3013,25 +3012,27 @@
 +	list_add_tail(&engine->entry, &utrace->attaching);
 +
 +	/*
-+	 * 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 target == current, it would be safe just to call
-+	 * splice_attaching() right here.  But if we're inside a
-+	 * callback, that would mean the new engine also gets
-+	 * notified about the event that precipitated its own
-+	 * creation.  This is not what the user wants.
-+	 *
-+	 * Setting ->report ensures that start_report() takes the
-+	 * lock and does it next time.  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.
++	 * 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.
 +	 */
-+	utrace->report = 1;
-+	set_notify_resume(target);
++
++	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:
@@ -3455,12 +3456,6 @@
 + *
 + * To synchronize after an -%EINPROGRESS return, see utrace_barrier().
 + *
-+ * When @target is @current, -%EINPROGRESS is not returned.  But
-+ * note that a newly-created engine will not receive any callbacks
-+ * related to an event notification already in progress.  This call
-+ * enables @events callbacks to be made as soon as @engine becomes
-+ * eligible for any callbacks, see utrace_attach_task().
-+ *
 + * These rules provide for coherent synchronization based on %UTRACE_STOP,
 + * even when %SIGKILL is breaking its normal simple rules.
 + */
@@ -3915,10 +3910,11 @@
 +	case UTRACE_REPORT:
 +		/*
 +		 * Make the thread call tracehook_notify_resume() soon.
-+		 * But don't bother if it's already been interrupted.
-+		 * In that case, utrace_get_signal() will be reporting soon.
++		 * But don't bother if it's already been stopped or
++		 * interrupted.  In those cases, utrace_get_signal()
++		 * will be reporting soon.
 +		 */
-+		if (!utrace->report && !utrace->interrupt) {
++		if (!utrace->report && !utrace->interrupt && !utrace->stopped) {
 +			utrace->report = 1;
 +			set_notify_resume(target);
 +		}

linux-2.6.27-lirc.patch:

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.1 -r 1.2 linux-2.6.27-lirc.patch
Index: linux-2.6.27-lirc.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/linux-2.6.27-lirc.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6.27-lirc.patch	21 Oct 2008 21:08:57 -0000	1.1
+++ linux-2.6.27-lirc.patch	12 Jan 2009 19:51:30 -0000	1.2
@@ -1,32 +1,7 @@
-Linux Infrared Remote Control drivers
-
-Signed-off-by: Jarod Wilson <jarod at redhat.com>
-
----
-diff -Naurp linux-2.6.27.noarch/drivers/hid/usbhid/hid-quirks.c linux-2.6.27.noarch.lirc/drivers/hid/usbhid/hid-quirks.c
---- linux-2.6.27.noarch/drivers/hid/usbhid/hid-quirks.c	2008-10-09 18:13:53.000000000 -0400
-+++ linux-2.6.27.noarch.lirc/drivers/hid/usbhid/hid-quirks.c	2008-10-21 16:40:06.000000000 -0400
-@@ -386,6 +386,8 @@
- 
- #define USB_VENDOR_ID_SOUNDGRAPH	0x15c2
- #define USB_DEVICE_ID_SOUNDGRAPH_IMON_LCD	0x0038
-+#define USB_DEVICE_ID_SOUNDGRAPH_IMON_LCD2	0x0036
-+#define USB_DEVICE_ID_SOUNDGRAPH_IMON_LCD3	0x0034
- 
- #define USB_VENDOR_ID_SUN		0x0430
- #define USB_DEVICE_ID_RARITAN_KVM_DONGLE	0xcdab
-@@ -585,6 +587,8 @@ static const struct hid_blacklist {
- 	{ USB_VENDOR_ID_PANJIT, 0x0003, HID_QUIRK_IGNORE },
- 	{ USB_VENDOR_ID_PANJIT, 0x0004, HID_QUIRK_IGNORE },
- 	{ USB_VENDOR_ID_SOUNDGRAPH, USB_DEVICE_ID_SOUNDGRAPH_IMON_LCD, HID_QUIRK_IGNORE },
-+	{ USB_VENDOR_ID_SOUNDGRAPH, USB_DEVICE_ID_SOUNDGRAPH_IMON_LCD2, HID_QUIRK_IGNORE },
-+	{ USB_VENDOR_ID_SOUNDGRAPH, USB_DEVICE_ID_SOUNDGRAPH_IMON_LCD3, HID_QUIRK_IGNORE },
- 	{ USB_VENDOR_ID_VERNIER, USB_DEVICE_ID_VERNIER_LABPRO, HID_QUIRK_IGNORE },
- 	{ USB_VENDOR_ID_VERNIER, USB_DEVICE_ID_VERNIER_GOTEMP, HID_QUIRK_IGNORE },
- 	{ USB_VENDOR_ID_VERNIER, USB_DEVICE_ID_VERNIER_SKIP, HID_QUIRK_IGNORE },
-diff -Naurp linux-2.6.27.noarch/drivers/input/Kconfig linux-2.6.27.noarch.lirc/drivers/input/Kconfig
---- linux-2.6.27.noarch/drivers/input/Kconfig	2008-10-09 18:13:53.000000000 -0400
-+++ linux-2.6.27.noarch.lirc/drivers/input/Kconfig	2008-10-21 16:03:34.000000000 -0400
+diff --git a/drivers/input/Kconfig b/drivers/input/Kconfig
+index 5f9d860..2ba0904 100644
+--- a/drivers/input/Kconfig
++++ b/drivers/input/Kconfig
 @@ -170,6 +170,8 @@ source "drivers/input/tablet/Kconfig"
  
  source "drivers/input/touchscreen/Kconfig"
@@ -36,9 +11,21 @@
  source "drivers/input/misc/Kconfig"
  
  endif
-diff -Naurp linux-2.6.27.noarch/drivers/input/lirc/Kconfig linux-2.6.27.noarch.lirc/drivers/input/lirc/Kconfig
---- linux-2.6.27.noarch/drivers/input/lirc/Kconfig	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.27.noarch.lirc/drivers/input/lirc/Kconfig	2008-10-21 16:04:34.000000000 -0400
+diff --git a/drivers/input/Makefile b/drivers/input/Makefile
+index 98c4f9a..6a1049b 100644
+--- a/drivers/input/Makefile
++++ b/drivers/input/Makefile
+@@ -25,3 +25,5 @@ obj-$(CONFIG_INPUT_MISC)	+= misc/
+ obj-$(CONFIG_INPUT_APMPOWER)	+= apm-power.o
+ 
+ obj-$(CONFIG_XEN_KBDDEV_FRONTEND)	+= xen-kbdfront.o
++
++obj-$(CONFIG_INPUT_LIRC)       += lirc/
+diff --git a/drivers/input/lirc/Kconfig b/drivers/input/lirc/Kconfig
+new file mode 100644
+index 0000000..fad3bbb
+--- /dev/null
++++ b/drivers/input/lirc/Kconfig
 @@ -0,0 +1,128 @@
 +#
 +# LIRC driver(s) configuration
@@ -168,9 +155,149 @@
 +	  PVR-150/500, HVR-1200/1250/1700/1800, HD-PVR and other cards
 +
 +endif
-diff -Naurp linux-2.6.27.noarch/drivers/input/lirc/lirc_bt829.c linux-2.6.27.noarch.lirc/drivers/input/lirc/lirc_bt829.c
---- linux-2.6.27.noarch/drivers/input/lirc/lirc_bt829.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.27.noarch.lirc/drivers/input/lirc/lirc_bt829.c	2008-10-21 16:03:34.000000000 -0400
+diff --git a/drivers/input/lirc/Makefile b/drivers/input/lirc/Makefile
+new file mode 100644
+index 0000000..ceb5c86
+--- /dev/null
++++ b/drivers/input/lirc/Makefile
+@@ -0,0 +1,23 @@
++# Makefile for the lirc drivers.
++#
++
++# Each configuration option enables a list of files.
++
++EXTRA_CFLAGS =-DIRCTL_DEV_MAJOR=61 -DLIRC_SERIAL_TRANSMITTER -I$(src)
++
++obj-$(CONFIG_LIRC_DEV)		+= lirc_dev.o
++obj-$(CONFIG_LIRC_BT829)	+= lirc_bt829.o
++obj-$(CONFIG_LIRC_I2C)		+= lirc_i2c.o
++obj-$(CONFIG_LIRC_IGORPLUGUSB)	+= lirc_igorplugusb.o
++obj-$(CONFIG_LIRC_IMON)		+= lirc_imon.o
++obj-$(CONFIG_LIRC_IT87)		+= lirc_it87.o
++obj-$(CONFIG_LIRC_ITE8709)	+= lirc_ite8709.o
++obj-$(CONFIG_LIRC_MCEUSB)	+= lirc_mceusb.o
++obj-$(CONFIG_LIRC_MCEUSB2)	+= lirc_mceusb2.o
++obj-$(CONFIG_LIRC_PARALLEL)	+= lirc_parallel.o
++obj-$(CONFIG_LIRC_SASEM)	+= lirc_sasem.o
++obj-$(CONFIG_LIRC_SERIAL)	+= lirc_serial.o
++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/lirc.h b/drivers/input/lirc/lirc.h
+new file mode 100644
+index 0000000..dcdb6e8
+--- /dev/null
++++ b/drivers/input/lirc/lirc.h
+@@ -0,0 +1,103 @@
++/*
++ * lirc.h - linux infrared remote control header file
++ * last modified 2007/09/27
++ */
++
++#ifndef _LINUX_LIRC_H
++#define _LINUX_LIRC_H
++
++#include <linux/types.h>
++#include <linux/ioctl.h>
++
++#define PULSE_BIT  0x01000000
++#define PULSE_MASK 0x00FFFFFF
++
++/*
++ * lirc compatible hardware features
++ */
++
++
++#define LIRC_MODE2SEND(x) (x)
++#define LIRC_SEND2MODE(x) (x)
++#define LIRC_MODE2REC(x) ((x) << 16)
++#define LIRC_REC2MODE(x) ((x) >> 16)
++
++#define LIRC_MODE_RAW                  0x00000001
++#define LIRC_MODE_PULSE                0x00000002
++#define LIRC_MODE_MODE2                0x00000004
++#define LIRC_MODE_CODE                 0x00000008
++#define LIRC_MODE_LIRCCODE             0x00000010
++#define LIRC_MODE_STRING               0x00000020
++
++
++#define LIRC_CAN_SEND_RAW              LIRC_MODE2SEND(LIRC_MODE_RAW)
++#define LIRC_CAN_SEND_PULSE            LIRC_MODE2SEND(LIRC_MODE_PULSE)
++#define LIRC_CAN_SEND_MODE2            LIRC_MODE2SEND(LIRC_MODE_MODE2)
++#define LIRC_CAN_SEND_CODE             LIRC_MODE2SEND(LIRC_MODE_CODE)
++#define LIRC_CAN_SEND_LIRCCODE         LIRC_MODE2SEND(LIRC_MODE_LIRCCODE)
++#define LIRC_CAN_SEND_STRING           LIRC_MODE2SEND(LIRC_MODE_STRING)
++
++#define LIRC_CAN_SEND_MASK             0x0000003f
++
++#define LIRC_CAN_SET_SEND_CARRIER      0x00000100
++#define LIRC_CAN_SET_SEND_DUTY_CYCLE   0x00000200
++#define LIRC_CAN_SET_TRANSMITTER_MASK  0x00000400
++
++#define LIRC_CAN_REC_RAW               LIRC_MODE2REC(LIRC_MODE_RAW)
++#define LIRC_CAN_REC_PULSE             LIRC_MODE2REC(LIRC_MODE_PULSE)
++#define LIRC_CAN_REC_MODE2             LIRC_MODE2REC(LIRC_MODE_MODE2)
++#define LIRC_CAN_REC_CODE              LIRC_MODE2REC(LIRC_MODE_CODE)
++#define LIRC_CAN_REC_LIRCCODE          LIRC_MODE2REC(LIRC_MODE_LIRCCODE)
++#define LIRC_CAN_REC_STRING            LIRC_MODE2REC(LIRC_MODE_STRING)
++
++#define LIRC_CAN_REC_MASK              LIRC_MODE2REC(LIRC_CAN_SEND_MASK)
++
++#define LIRC_CAN_SET_REC_CARRIER       (LIRC_CAN_SET_SEND_CARRIER << 16)
++#define LIRC_CAN_SET_REC_DUTY_CYCLE    (LIRC_CAN_SET_SEND_DUTY_CYCLE << 16)
++
++#define LIRC_CAN_SET_REC_DUTY_CYCLE_RANGE 0x40000000
++#define LIRC_CAN_SET_REC_CARRIER_RANGE    0x80000000
++#define LIRC_CAN_GET_REC_RESOLUTION       0x20000000
++
++#define LIRC_CAN_SEND(x) ((x)&LIRC_CAN_SEND_MASK)
++#define LIRC_CAN_REC(x) ((x)&LIRC_CAN_REC_MASK)
++
++#define LIRC_CAN_NOTIFY_DECODE            0x01000000
++
++/*
++ * IOCTL commands for lirc driver
++ */
++
++#define LIRC_GET_FEATURES              _IOR('i', 0x00000000, __u32)
++
++#define LIRC_GET_SEND_MODE             _IOR('i', 0x00000001, __u32)
++#define LIRC_GET_REC_MODE              _IOR('i', 0x00000002, __u32)
++#define LIRC_GET_SEND_CARRIER          _IOR('i', 0x00000003, __u32)
++#define LIRC_GET_REC_CARRIER           _IOR('i', 0x00000004, __u32)
++#define LIRC_GET_SEND_DUTY_CYCLE       _IOR('i', 0x00000005, __u32)
++#define LIRC_GET_REC_DUTY_CYCLE        _IOR('i', 0x00000006, __u32)
++#define LIRC_GET_REC_RESOLUTION        _IOR('i', 0x00000007, __u32)
++
++/* code length in bits, currently only for LIRC_MODE_LIRCCODE */
++#define LIRC_GET_LENGTH                _IOR('i', 0x0000000f, __u32)
++
++#define LIRC_SET_SEND_MODE             _IOW('i', 0x00000011, __u32)
++#define LIRC_SET_REC_MODE              _IOW('i', 0x00000012, __u32)
++/* Note: these can reset the according pulse_width */
++#define LIRC_SET_SEND_CARRIER          _IOW('i', 0x00000013, __u32)
++#define LIRC_SET_REC_CARRIER           _IOW('i', 0x00000014, __u32)
[...3906 lines suppressed...]
++
++	i = usb_register(&usb_remote_driver);
++	if (i < 0) {
++		printk(DRIVER_NAME ": usb register failed, result = %d\n", i);
++		return -ENODEV;
 +	}
 +
-+	info(DRIVER_DESC " " DRIVER_VERSION);
-+	return 0;
++	return SUCCESS;
 +}
 +
-+
-+/**
-+ *	usb_mceusb_exit
-+ */
-+static void __exit usb_mceusb_exit(void)
++static void __exit usb_remote_exit(void)
 +{
-+	/* deregister this driver with the USB subsystem */
-+	usb_deregister(&mceusb_driver);
++	usb_deregister(&usb_remote_driver);
 +}
 +
-+#ifdef MODULE
-+module_init(usb_mceusb_init);
-+module_exit(usb_mceusb_exit);
++module_init(usb_remote_init);
++module_exit(usb_remote_exit);
 +
 +MODULE_DESCRIPTION(DRIVER_DESC);
 +MODULE_AUTHOR(DRIVER_AUTHOR);
 +MODULE_LICENSE("GPL");
-+MODULE_DEVICE_TABLE(usb, mceusb_table);
++MODULE_DEVICE_TABLE(usb, usb_remote_table);
 +
-+module_param(debug, int, 0644);
++module_param(debug, bool, 0644);
 +MODULE_PARM_DESC(debug, "Debug enabled or not");
-+
-+#else /* not MODULE */
-+subsys_initcall(usb_mceusb_init);
-+
 +#endif /* MODULE */
-diff -Naurp linux-2.6.27.noarch/drivers/input/lirc/lirc_parallel.c linux-2.6.27.noarch.lirc/drivers/input/lirc/lirc_parallel.c
---- linux-2.6.27.noarch/drivers/input/lirc/lirc_parallel.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.27.noarch.lirc/drivers/input/lirc/lirc_parallel.c	2008-10-21 16:03:34.000000000 -0400
+diff --git a/drivers/input/lirc/lirc_parallel.c b/drivers/input/lirc/lirc_parallel.c
+new file mode 100644
+index 0000000..912cad2
+--- /dev/null
++++ b/drivers/input/lirc/lirc_parallel.c
 @@ -0,0 +1,728 @@
 +/****************************************************************************
 + ** lirc_parallel.c *********************************************************
@@ -8780,9 +8822,11 @@
 +MODULE_PARM_DESC(debug, "Check for printer (default: 0)");
 +
 +#endif /* MODULE */
-diff -Naurp linux-2.6.27.noarch/drivers/input/lirc/lirc_parallel.h linux-2.6.27.noarch.lirc/drivers/input/lirc/lirc_parallel.h
---- linux-2.6.27.noarch/drivers/input/lirc/lirc_parallel.h	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.27.noarch.lirc/drivers/input/lirc/lirc_parallel.h	2008-10-21 16:03:34.000000000 -0400
+diff --git a/drivers/input/lirc/lirc_parallel.h b/drivers/input/lirc/lirc_parallel.h
+new file mode 100644
+index 0000000..4bed6af
+--- /dev/null
++++ b/drivers/input/lirc/lirc_parallel.h
 @@ -0,0 +1,26 @@
 +/* lirc_parallel.h */
 +
@@ -8810,9 +8854,11 @@
 +#define LIRC_PARALLEL_TRANSMITTER_MASK ((1<<LIRC_PARALLEL_MAX_TRANSMITTERS) - 1)
 +
 +#endif
-diff -Naurp linux-2.6.27.noarch/drivers/input/lirc/lirc_sasem.c linux-2.6.27.noarch.lirc/drivers/input/lirc/lirc_sasem.c
---- linux-2.6.27.noarch/drivers/input/lirc/lirc_sasem.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.27.noarch.lirc/drivers/input/lirc/lirc_sasem.c	2008-10-21 16:03:34.000000000 -0400
+diff --git a/drivers/input/lirc/lirc_sasem.c b/drivers/input/lirc/lirc_sasem.c
+new file mode 100644
+index 0000000..003f492
+--- /dev/null
++++ b/drivers/input/lirc/lirc_sasem.c
 @@ -0,0 +1,969 @@
 +/* lirc_sasem.c - USB remote support for LIRC
 + * Version 0.5
@@ -9783,9 +9829,11 @@
 +module_exit(sasem_exit);
 +
 +#endif /* MODULE */
-diff -Naurp linux-2.6.27.noarch/drivers/input/lirc/lirc_serial.c linux-2.6.27.noarch.lirc/drivers/input/lirc/lirc_serial.c
---- linux-2.6.27.noarch/drivers/input/lirc/lirc_serial.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.27.noarch.lirc/drivers/input/lirc/lirc_serial.c	2008-10-21 16:03:34.000000000 -0400
+diff --git a/drivers/input/lirc/lirc_serial.c b/drivers/input/lirc/lirc_serial.c
+new file mode 100644
+index 0000000..465edd9
+--- /dev/null
++++ b/drivers/input/lirc/lirc_serial.c
 @@ -0,0 +1,1312 @@
 +/****************************************************************************
 + ** lirc_serial.c ***********************************************************
@@ -11099,9 +11147,11 @@
 +MODULE_PARM_DESC(debug, "Enable debugging messages");
 +
 +#endif /* MODULE */
-diff -Naurp linux-2.6.27.noarch/drivers/input/lirc/lirc_sir.c linux-2.6.27.noarch.lirc/drivers/input/lirc/lirc_sir.c
---- linux-2.6.27.noarch/drivers/input/lirc/lirc_sir.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.27.noarch.lirc/drivers/input/lirc/lirc_sir.c	2008-10-21 16:03:34.000000000 -0400
+diff --git a/drivers/input/lirc/lirc_sir.c b/drivers/input/lirc/lirc_sir.c
+new file mode 100644
+index 0000000..ea192b2
+--- /dev/null
++++ b/drivers/input/lirc/lirc_sir.c
 @@ -0,0 +1,1302 @@
 +/*
 + * LIRC SIR driver, (C) 2000 Milan Pikula <www at fornax.sk>
@@ -12405,9 +12455,11 @@
 +MODULE_PARM_DESC(debug, "Enable debugging messages");
 +
 +#endif /* MODULE */
-diff -Naurp linux-2.6.27.noarch/drivers/input/lirc/lirc_streamzap.c linux-2.6.27.noarch.lirc/drivers/input/lirc/lirc_streamzap.c
---- linux-2.6.27.noarch/drivers/input/lirc/lirc_streamzap.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.27.noarch.lirc/drivers/input/lirc/lirc_streamzap.c	2008-10-21 16:03:34.000000000 -0400
+diff --git a/drivers/input/lirc/lirc_streamzap.c b/drivers/input/lirc/lirc_streamzap.c
+new file mode 100644
+index 0000000..69865cb
+--- /dev/null
++++ b/drivers/input/lirc/lirc_streamzap.c
 @@ -0,0 +1,795 @@
 +/*
 + * Streamzap Remote Control driver
@@ -13204,9 +13256,11 @@
 +MODULE_PARM_DESC(debug, "Enable debugging messages");
 +
 +#endif /* MODULE */
-diff -Naurp linux-2.6.27.noarch/drivers/input/lirc/lirc_ttusbir.c linux-2.6.27.noarch.lirc/drivers/input/lirc/lirc_ttusbir.c
---- linux-2.6.27.noarch/drivers/input/lirc/lirc_ttusbir.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.27.noarch.lirc/drivers/input/lirc/lirc_ttusbir.c	2008-10-21 16:03:34.000000000 -0400
+diff --git a/drivers/input/lirc/lirc_ttusbir.c b/drivers/input/lirc/lirc_ttusbir.c
+new file mode 100644
+index 0000000..9ed9c7b
+--- /dev/null
++++ b/drivers/input/lirc/lirc_ttusbir.c
 @@ -0,0 +1,400 @@
 +/****************************************************************************
 + ** lirc_ttusbir.c ***********************************************************
@@ -13608,9 +13662,11 @@
 +subsys_initcall(ttusbir_init_module);
 +
 +#endif /* MODULE */
-diff -Naurp linux-2.6.27.noarch/drivers/input/lirc/lirc_zilog.c linux-2.6.27.noarch.lirc/drivers/input/lirc/lirc_zilog.c
---- linux-2.6.27.noarch/drivers/input/lirc/lirc_zilog.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.27.noarch.lirc/drivers/input/lirc/lirc_zilog.c	2008-10-21 16:03:34.000000000 -0400
+diff --git a/drivers/input/lirc/lirc_zilog.c b/drivers/input/lirc/lirc_zilog.c
+new file mode 100644
+index 0000000..20e6b27
+--- /dev/null
++++ b/drivers/input/lirc/lirc_zilog.c
 @@ -0,0 +1,1395 @@
 +/*
 + * i2c IR lirc plugin for devices with zilog IR processors
@@ -15007,39 +15063,3 @@
 + * c-basic-offset: 8
 + * End:
 + */
-diff -Naurp linux-2.6.27.noarch/drivers/input/lirc/Makefile linux-2.6.27.noarch.lirc/drivers/input/lirc/Makefile
---- linux-2.6.27.noarch/drivers/input/lirc/Makefile	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.27.noarch.lirc/drivers/input/lirc/Makefile	2008-10-21 16:04:26.000000000 -0400
-@@ -0,0 +1,23 @@
-+# Makefile for the lirc drivers.
-+#
-+
-+# Each configuration option enables a list of files.
-+
-+EXTRA_CFLAGS =-DIRCTL_DEV_MAJOR=61 -DLIRC_SERIAL_TRANSMITTER -I$(src)
-+
-+obj-$(CONFIG_LIRC_DEV)		+= lirc_dev.o
-+obj-$(CONFIG_LIRC_BT829)	+= lirc_bt829.o
-+obj-$(CONFIG_LIRC_I2C)		+= lirc_i2c.o
-+obj-$(CONFIG_LIRC_IGORPLUGUSB)	+= lirc_igorplugusb.o
-+obj-$(CONFIG_LIRC_IMON)		+= lirc_imon.o
-+obj-$(CONFIG_LIRC_IT87)		+= lirc_it87.o
-+obj-$(CONFIG_LIRC_ITE8709)	+= lirc_ite8709.o
-+obj-$(CONFIG_LIRC_MCEUSB)	+= lirc_mceusb.o
-+obj-$(CONFIG_LIRC_MCEUSB2)	+= lirc_mceusb2.o
-+obj-$(CONFIG_LIRC_PARALLEL)	+= lirc_parallel.o
-+obj-$(CONFIG_LIRC_SASEM)	+= lirc_sasem.o
-+obj-$(CONFIG_LIRC_SERIAL)	+= lirc_serial.o
-+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 -Naurp linux-2.6.27.noarch/drivers/input/Makefile linux-2.6.27.noarch.lirc/drivers/input/Makefile
---- linux-2.6.27.noarch/drivers/input/Makefile	2008-10-09 18:13:53.000000000 -0400
-+++ linux-2.6.27.noarch.lirc/drivers/input/Makefile	2008-10-21 16:03:34.000000000 -0400
-@@ -25,3 +25,5 @@ obj-$(CONFIG_INPUT_MISC)	+= misc/
- obj-$(CONFIG_INPUT_APMPOWER)	+= apm-power.o
- 
- obj-$(CONFIG_XEN_KBDDEV_FRONTEND)	+= xen-kbdfront.o
-+
-+obj-$(CONFIG_INPUT_LIRC)       += lirc/

linux-2.6.27-pci-hush-allocation-failures.patch:

Index: linux-2.6.27-pci-hush-allocation-failures.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/linux-2.6.27-pci-hush-allocation-failures.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- linux-2.6.27-pci-hush-allocation-failures.patch	23 Oct 2008 14:41:05 -0000	1.2
+++ linux-2.6.27-pci-hush-allocation-failures.patch	12 Jan 2009 19:51:30 -0000	1.3
@@ -1,42 +1,8 @@
-diff -up linux-2.6.27.noarch/drivers/pci/setup-res.c.jx linux-2.6.27.noarch/drivers/pci/setup-res.c
---- linux-2.6.27.noarch/drivers/pci/setup-res.c.jx	2008-10-09 18:13:53.000000000 -0400
-+++ linux-2.6.27.noarch/drivers/pci/setup-res.c	2008-10-16 14:12:13.000000000 -0400
-@@ -138,10 +138,10 @@ int pci_assign_resource(struct pci_dev *
- 
- 	align = resource_alignment(res);
- 	if (!align) {
--		dev_err(&dev->dev, "BAR %d: can't allocate resource (bogus "
--			"alignment) [%#llx-%#llx] flags %#lx\n",
--			resno, (unsigned long long)res->start,
--			(unsigned long long)res->end, res->flags);
-+		dev_info(&dev->dev, "BAR %d: can't allocate resource (bogus "
-+			 "alignment) [%#llx-%#llx] flags %#lx\n",
-+			 resno, (unsigned long long)res->start,
-+			 (unsigned long long)res->end, res->flags);
- 		return -EINVAL;
- 	}
- 
-@@ -162,11 +162,11 @@ int pci_assign_resource(struct pci_dev *
- 	}
- 
- 	if (ret) {
--		dev_err(&dev->dev, "BAR %d: can't allocate %s resource "
--			"[%#llx-%#llx]\n", resno,
--			res->flags & IORESOURCE_IO ? "I/O" : "mem",
--			(unsigned long long)res->start,
--			(unsigned long long)res->end);
-+		dev_info(&dev->dev, "BAR %d: can't allocate %s resource "
-+			 "[%#llx-%#llx]\n", resno,
-+			 res->flags & IORESOURCE_IO ? "I/O" : "mem",
-+			 (unsigned long long)res->start,
-+			 (unsigned long long)res->end);
- 	} else {
- 		res->flags &= ~IORESOURCE_STARTALIGN;
- 		if (resno < PCI_BRIDGE_RESOURCES)
-diff -up linux-2.6.27.noarch/arch/x86/pci/i386.c.jx linux-2.6.27.noarch/arch/x86/pci/i386.c
---- linux-2.6.27.noarch/arch/x86/pci/i386.c.jx	2008-10-09 18:13:53.000000000 -0400
-+++ linux-2.6.27.noarch/arch/x86/pci/i386.c	2008-10-23 10:21:14.000000000 -0400
-@@ -128,7 +128,7 @@ static void __init pcibios_allocate_bus_
+diff --git a/arch/x86/pci/i386.c b/arch/x86/pci/i386.c
+index 844df0c..43d9783 100644
+--- a/arch/x86/pci/i386.c
++++ b/arch/x86/pci/i386.c
+@@ -129,7 +129,7 @@ static void __init pcibios_allocate_bus_resources(struct list_head *bus_list)
  				pr = pci_find_parent_resource(dev, r);
  				if (!r->start || !pr ||
  				    request_resource(pr, r) < 0) {
@@ -45,7 +11,7 @@
  					/*
  					 * Something is wrong with the region.
  					 * Invalidate the resource to prevent
-@@ -169,7 +169,7 @@ static void __init pcibios_allocate_reso
+@@ -170,7 +170,7 @@ static void __init pcibios_allocate_resources(int pass)
  					r->flags, disabled, pass);
  				pr = pci_find_parent_resource(dev, r);
  				if (!pr || request_resource(pr, r) < 0) {
@@ -54,3 +20,25 @@
  					/* We'll assign a new address later */
  					r->end -= r->start;
  					r->start = 0;
+diff --git a/drivers/pci/setup-res.c b/drivers/pci/setup-res.c
+index 2dbd96c..4e37563 100644
+--- a/drivers/pci/setup-res.c
++++ b/drivers/pci/setup-res.c
+@@ -134,7 +134,7 @@ int pci_assign_resource(struct pci_dev *dev, int resno)
+ 
+ 	align = resource_alignment(res);
+ 	if (!align) {
+-		dev_err(&dev->dev, "BAR %d: can't allocate resource (bogus "
++		dev_info(&dev->dev, "BAR %d: can't allocate resource (bogus "
+ 			"alignment) %pR flags %#lx\n",
+ 			resno, res, res->flags);
+ 		return -EINVAL;
+@@ -157,7 +157,7 @@ int pci_assign_resource(struct pci_dev *dev, int resno)
+ 	}
+ 
+ 	if (ret) {
+-		dev_err(&dev->dev, "BAR %d: can't allocate %s resource %pR\n",
++		dev_info(&dev->dev, "BAR %d: can't allocate %s resource %pR\n",
+ 			resno, res->flags & IORESOURCE_IO ? "I/O" : "mem", res);
+ 	} else {
+ 		res->flags &= ~IORESOURCE_STARTALIGN;


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/sources,v
retrieving revision 1.922
retrieving revision 1.923
diff -u -r1.922 -r1.923
--- sources	18 Dec 2008 22:13:54 -0000	1.922
+++ sources	12 Jan 2009 19:51:31 -0000	1.923
@@ -1,2 +1 @@
-b3e78977aa79d3754cb7f8143d7ddabd  linux-2.6.27.tar.bz2
-82691ff96bff9b4fa19f91b69a9695f9  patch-2.6.27.10.bz2
+d351e44709c9810b85e29b877f50968a  linux-2.6.28.tar.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/upstream,v
retrieving revision 1.834
retrieving revision 1.835
diff -u -r1.834 -r1.835
--- upstream	18 Dec 2008 22:13:54 -0000	1.834
+++ upstream	12 Jan 2009 19:51:31 -0000	1.835
@@ -1,2 +1 @@
-linux-2.6.27.tar.bz2
-patch-2.6.27.10.bz2
+linux-2.6.28.tar.bz2


--- drm-fix-master-enable.patch DELETED ---


--- drm-intel-8xx-pae-no-gem.patch DELETED ---


--- linux-2.6-acpi-dock-fix-eject-request-process.patch DELETED ---


--- linux-2.6-acpi-handle-ec-init-failure.patch DELETED ---


--- linux-2.6-alsa-backport-beep-switch.patch DELETED ---


--- linux-2.6-alsa-hda-remove-broken-headphone-control-for-dell-laptops.patch DELETED ---


--- linux-2.6-alsa-hda-revert-remove-unneeded-hp-nid-references.patch DELETED ---


--- linux-2.6-alsa-hda-stac-dell-m6-eapd.patch DELETED ---


--- linux-2.6-amd64-yes-i-know-you-live.patch DELETED ---


--- linux-2.6-crypto-fips_enable.patch DELETED ---


--- linux-2.6-default-mmf_dump_elf_headers.patch DELETED ---


--- linux-2.6-defaults-fat-utf8.patch DELETED ---


--- linux-2.6-dmi-autoload.patch DELETED ---


--- linux-2.6-e1000e-add-support-for-82567LM-3-and-82567LF-3-ICH10D-parts.patch DELETED ---


--- linux-2.6-e1000e-add-support-for-new-82574L-part.patch DELETED ---


--- linux-2.6-e1000e-add-support-for-the-82567LM-4-device.patch DELETED ---


--- linux-2.6-eeepc-laptop-update.patch DELETED ---


--- linux-2.6-gspca-vc0321-fix-frame-overflow.patch DELETED ---


--- linux-2.6-input.git-i8042-add-xps-m1530-to-nomux.patch DELETED ---


--- linux-2.6-iwl3945-ibss-tsf-fix.patch DELETED ---


--- linux-2.6-iwlagn-downgrade-BUG_ON-in-interrupt.patch DELETED ---


--- linux-2.6-merge-efifb-imacfb.patch DELETED ---


--- linux-2.6-mm-pagefault-enable-ints.patch DELETED ---


--- linux-2.6-net-qla-silence-debug-printks.patch DELETED ---


--- linux-2.6-netdev-r8169-2.6.28.patch DELETED ---


--- linux-2.6-nfs-client-mounts-hang.patch DELETED ---


--- linux-2.6-olpc-touchpad.patch DELETED ---


--- linux-2.6-pci-fix-pciehp-irq0.patch DELETED ---


--- linux-2.6-pciehp-kill-annoying-messages.patch DELETED ---


--- linux-2.6-quiet-iommu.patch DELETED ---


--- linux-2.6-quieter-mmc.patch DELETED ---


--- linux-2.6-sched-fine-tune-SD_MC_INIT.patch DELETED ---


--- linux-2.6-sched-fine-tune-SD_SIBLING_INIT.patch DELETED ---


--- linux-2.6-sched-wakeup-preempt-when-small-overlap.patch DELETED ---


--- linux-2.6-selinux-empty-tty-files.patch DELETED ---


--- linux-2.6-selinux-recognise-addrlabel.patch DELETED ---


--- linux-2.6-toshiba-acpi-update.patch DELETED ---


--- linux-2.6-usb-ehci-hcd-respect-nousb.patch DELETED ---


--- linux-2.6-uvc-hg.patch DELETED ---


--- linux-2.6-uvc-spca525.patch DELETED ---


--- linux-2.6-wireless-ath9k-dma-fixes.patch DELETED ---


--- linux-2.6-x86-pci-amd-config-space.patch DELETED ---


--- linux-2.6-x86-tracehook.patch DELETED ---


--- linux-2.6-xen-execshield-add-xen-specific-load_user_cs_desc.patch DELETED ---


--- linux-2.6-xen-execshield-only-define-load_user_cs_desc-on-32-bit.patch DELETED ---


--- linux-2.6.27-ext4-rename-ext4dev-to-ext4.patch DELETED ---


--- linux-2.6.27-hwmon-applesmc-2.6.28.patch DELETED ---


--- linux-2.6.27-x86-tracehook-syscall-arg-order.patch DELETED ---


--- linux-2.6.27.7-alsa-driver-fixups.patch DELETED ---


--- linux-2.6.27.9-alsa-driver-1.0.18a.patch DELETED ---


--- linux-2.6.27.9-alsa-hda-add-a-quirk-for-dell-studio-15.patch DELETED ---


--- linux-2.6.27.9-alsa-hda-mark-dell-studio-1535-quirk.patch DELETED ---


--- linux-2.6.27.9-alsa-hda-no-headphone-as-line-out-swich-without-line-outs.patch DELETED ---


--- linux-2.6.27.9-ext4-cap-check-delay.patch DELETED ---


--- linux-2.6.27.tar.bz2.sign DELETED ---


--- nvidia-agp.patch DELETED ---


--- patch-2.6.27.10.bz2.sign DELETED ---


--- sparc-2.6.git-aae7fb87ec4d2df6cb551670b1765cf4e5795a3b.patch DELETED ---



From spot at fedoraproject.org  Mon Jan 12 19:53:05 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Mon, 12 Jan 2009 19:53:05 +0000 (UTC)
Subject: rpms/kscope/devel kscope-1.9.0-compilefix.patch, NONE,
	1.1 kscope.desktop, NONE, 1.1 .cvsignore, 1.3, 1.4 kscope.spec,
	1.4, 1.5 sources, 1.3, 1.4
Message-ID: <20090112195305.9F81D70123@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/kscope/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30097

Modified Files:
	.cvsignore kscope.spec sources 
Added Files:
	kscope-1.9.0-compilefix.patch kscope.desktop 
Log Message:
update to 1.9.0

kscope-1.9.0-compilefix.patch:

--- NEW FILE kscope-1.9.0-compilefix.patch ---
diff -up kscope-1.9.0/core/locationlistmodel.cpp.BAD kscope-1.9.0/core/locationlistmodel.cpp
--- kscope-1.9.0/core/locationlistmodel.cpp.BAD	2009-01-12 13:22:42.000000000 -0500
+++ kscope-1.9.0/core/locationlistmodel.cpp	2009-01-12 13:23:28.000000000 -0500
@@ -183,7 +183,7 @@ QModelIndex LocationListModel::index(int
 	if (row < 0 || row >= locList_.size())
 		return QModelIndex();
 
-	return createIndex(row, column, NULL);
+	return createIndex(row, column, (int)NULL);
 }
 
 /**


--- NEW FILE kscope.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=KScope
Exec=kscopeapp
Icon=kscope
Type=Application
Comment=Source-editing environment for large C projects
Comment[fr]=Editeur de codes sources pour de gros projets en C
GenericName=Source editing environment
GenericName[fr]=Editeur de code source
Categories=Qt;Development



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kscope/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	12 Sep 2008 16:04:29 -0000	1.3
+++ .cvsignore	12 Jan 2009 19:52:34 -0000	1.4
@@ -1 +1 @@
-kscope-1.6.2.tar.gz
+kscope-1.9.0.tar.gz


Index: kscope.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kscope/devel/kscope.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- kscope.spec	12 Sep 2008 16:04:29 -0000	1.4
+++ kscope.spec	12 Jan 2009 19:52:35 -0000	1.5
@@ -1,14 +1,15 @@
 Name:		kscope
 Summary: 	KDE front-end to Cscope
-Version:	1.6.2
+Version:	1.9.0
 Release:	1%{?dist}
-License:	BSD
+License:	GPLv2+
 Group:		Development/Tools
 Source0:	http://download.sourceforge.net/kscope/%{name}-%{version}.tar.gz
+Source1:	kscope.desktop
+Patch0:		kscope-1.9.0-compilefix.patch
 URL:		http://kscope.sourceforge.net/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:	desktop-file-utils, bison, flex, kdelibs3-devel
-BuildRequires:	libjpeg-devel, libpng-devel, gettext, kdebase3-devel
+BuildRequires:	desktop-file-utils, qt4-devel, gettext, qscintilla-devel
 Requires:	cscope, ctags, graphviz
 
 %description
@@ -21,54 +22,59 @@
 cycle supported by most IDE's. Instead, KScope is focused on source 
 editing and analysis. 
 
+%package devel
+Summary:	Development files for kscope
+Group:		Development/Tools
+Requires:	%{name} = %{version}-%{release}
+
+%description devel
+Development files for kscope.
+
 %prep
 %setup -q
+%patch0 -p1
+sed -i 's|/usr/local|%{buildroot}%{_prefix}|g' config
+for i in app/app.pro core/core.pro cscope/cscope.pro; do
+	sed -i 's|/lib|/%{_lib}|g' $i
+done
 
 %build
-%configure --disable-rpath 
-make %{?_smp_mflags}
+qmake-qt4
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make DESTDIR=$RPM_BUILD_ROOT install
-# Clean up dangling symlink
-rm -rf $RPM_BUILD_ROOT%{_defaultdocdir}/HTML/en/kscope/common 
-pushd $RPM_BUILD_ROOT%{_defaultdocdir}/HTML/en/kscope/
-ln -s ../common common
-popd
-
-desktop-file-install --vendor="" --delete-original \
-  --dir $RPM_BUILD_ROOT%{_datadir}/applications/kde \
-  $RPM_BUILD_ROOT%{_datadir}/applnk/Development/kscope.desktop
-
-%find_lang %{name}
+rm -rf %{buildroot}
+make DESTDIR=%{buildroot} install
+mkdir -p %{buildroot}%{_datadir}/pixmaps
+install -p app/images/kscope.png %{buildroot}%{_datadir}/pixmaps
+mkdir -p %{buildroot}%{_datadir}/applications
+desktop-file-install --dir %{buildroot}%{_datadir}/applications %{SOURCE1}
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+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
+%post -p /sbin/ldconfig
 
-%files -f %{name}.lang
+%postun -p /sbin/ldconfig
+
+%files
+%defattr(-,root,root,-)
+%doc COPYING
+%{_bindir}/kscopeapp
+%{_libdir}/libkscope_core.so.*
+%{_libdir}/libkscope_cscope.so.*
+%{_datadir}/applications/*.desktop
+%{_datadir}/pixmaps/kscope.png
+
+%files devel
 %defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING
-%{_bindir}/kscope
-%{_datadir}/applications/kde/*kscope.desktop
-%{_datadir}/apps/%{name}/
-%{_defaultdocdir}/HTML/en/%{name}/
-%{_datadir}/icons/hicolor/*/apps/%{name}.png
-%{_datadir}/icons/locolor/*/apps/%{name}.png
+%{_libdir}/libkscope_core.so
+%{_libdir}/libkscope_cscope.so
 
 %changelog
+* Mon Jan 12 2009 Tom "spot" Callaway <tcallawa at redhat.com> 1.9.0-1
+- update to 1.9.0, no longer depends on kde
+- license change to GPLv2+
+
 * Fri Sep 12 2008 Tom "spot" Callaway <tcallawa at redhat.com> 1.6.2-1
 - update to 1.6.2
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kscope/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	12 Sep 2008 16:04:29 -0000	1.3
+++ sources	12 Jan 2009 19:52:35 -0000	1.4
@@ -1 +1 @@
-b0c6115fa6ea0c95fe3a8d45baa98392  kscope-1.6.2.tar.gz
+4ff9cb81d06f8adbd98b41b45a0a4999  kscope-1.9.0.tar.gz



From kyle at fedoraproject.org  Mon Jan 12 19:54:49 2009
From: kyle at fedoraproject.org (Kyle McMartin)
Date: Mon, 12 Jan 2009 19:54:49 +0000 (UTC)
Subject: rpms/kernel/F-9/scripts get-snapshot.sh, NONE, 1.1 rebase.sh, 1.14,
	1.15
Message-ID: <20090112195449.AC82A70123@cvs1.fedora.phx.redhat.com>

Author: kyle

Update of /cvs/pkgs/rpms/kernel/F-9/scripts
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30345/scripts

Modified Files:
	rebase.sh 
Added Files:
	get-snapshot.sh 
Log Message:
* Mon Jan 12 2009 Kyle McMartin <kyle at redhat.com>
- Rebase for Fedora 9.
- Turn off CONFIG_MAXSMP on x86_64.



--- NEW FILE get-snapshot.sh ---
#!/bin/bash

VER=$(tail -n1 upstream | sed s/bz2/id/)
rm -f $VER
wget -c http://www.kernel.org/pub/linux/kernel/v2.6/snapshots/$VER
SHA1=$(cat $VER)
rm -f patch-2.6.*-git*.id

cd ~/src/git-trees/kernel/linux-2.6
git pull

DIF=$(git diff $SHA1.. | wc -l)
if [ "$DIF" = "0" ]; then
  echo Nothing changed.
  exit
fi
TOT=$(git log | head -n1)

git diff $SHA1.. > ~/src/fedora/kernel/devel/git-linus-new.diff
cd ~/src/fedora/kernel/devel/
DIF=$(cmp git-linus.diff git-linus-new.diff)
if [ "$?" = "0" ]; then
  echo Nothing new in git
  rm -f git-linus-new.diff
  exit
fi
mv git-linus-new.diff git-linus.diff

perl -p -i -e 's|^#ApplyPatch\ git-linus.diff|ApplyPatch\ git-linus.diff|' kernel.spec

echo "- Merge Linux-2.6 up to" $TOT > ~/src/fedora/kernel/devel/clog.tmp
cd ~/src/fedora/kernel/devel/
bumpspecfile.py kernel.spec "$(cat clog.tmp)"
rm -f clog.tmp
make clog


Index: rebase.sh
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/scripts/rebase.sh,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- rebase.sh	7 Mar 2008 17:35:21 -0000	1.14
+++ rebase.sh	12 Jan 2009 19:54:19 -0000	1.15
@@ -1,5 +1,10 @@
 #!/bin/bash
 
+if [ ! -f /usr/bin/lynx ]; then
+  echo yum install lynx
+  exit 0
+fi
+
 # Current kernel bits
 if [ `grep -c ^patch upstream` -ge 1 ]; then
   export OLD=`grep ^patch upstream | tail -n1 | sed s/patch-// | sed s/\.bz2//`
@@ -32,7 +37,7 @@
       NEW=`lynx -dump http://www.kernel.org/kdist/finger_banner | grep "stable version of the Linux kernel is"`
     else
       echo "No new rc or git snapshot of stable branch".
-      exit
+      exit 0
     fi
   fi
 fi
@@ -75,31 +80,31 @@
 if [ "$NEWRC" -eq 0 -a "$NEWGIT" -eq 0 ]; then
   echo "Rebasing from -rc to final release."
   perl -p -i -e 's/^%define\ released_kernel\ 0/\%define\ released_kernel\ 1/' kernel.spec
-  export TARBALL_BASE=$(($OLDBASE-1))
-  perl -p -i -e 's/^%define\ base_sublevel\ $ENV{TARBALL_BASE}/%define\ base_sublevel\ $ENV{NEWBASE}/' kernel.spec
+  export OLD_TARBALL_BASE=$(($OLDBASE-1))
+  perl -p -i -e 's/^%define\ base_sublevel\ $ENV{OLD_TARBALL_BASE}/%define\ base_sublevel\ $ENV{NEWBASE}/' kernel.spec
   perl -p -i -e 's/^%define\ rcrev.*/\%define\ rcrev\ 0/' kernel.spec
   perl -p -i -e 's/^%define\ gitrev.*/\%define\ gitrev\ 0/' kernel.spec
 
-  grep -v kernel-2.6.$TARBALL_BASE .cvsignore >.cvsignore.tmp ; mv .cvsignore.tmp .cvsignore
+  grep -v kernel-2.6.$OLD_TARBALL_BASE .cvsignore >.cvsignore.tmp ; mv .cvsignore.tmp .cvsignore
   echo kernel-2.6.$NEWBASE >> .cvsignore
 
   for i in upstream sources .cvsignore
   do
-   grep -v linux-2.6.$(($OLDBASE-1)).tar.bz2 $i > .$i.tmp; mv .$i.tmp $i
+   grep -v linux-2.6.$OLD_TARBALL_BASE.tar.bz2 $i > .$i.tmp; mv .$i.tmp $i
    grep -v patch-2.6.$OLDBASE-rc$OLDRC.bz2 $i > .$i.tmp; mv .$i.tmp $i
    grep -v patch-2.6.$OLDBASE-rc$OLDRC-git$OLDGIT.bz2 $i > .$i.tmp; mv .$i.tmp $i
   done
 
-  echo linux-2.6.$TARBALL_BASE.tar.bz2 >> upstream
+  echo linux-2.6.$NEWBASE.tar.bz2 >> upstream
 
-  rm -f linux-2.6.$(($OLDBASE-1)).tar.bz2
-  rm -f linux-2.6.$(($OLDBASE-1)).tar.bz2.sign
+  rm -f linux-2.6.$OLD_TARBALL_BASE.tar.bz2
+  rm -f linux-2.6.$OLD_TARBALL_BASE.tar.bz2.sign
   rm -f patch-2.6.$OLDBASE-rc$OLDRC.bz2
   rm -f patch-2.6.$OLDBASE-rc$OLDRC.bz2.sign
   rm -f patch-2.6.$OLDBASE-rc$OLDRC-git$OLDGIT.bz2
   rm -f patch-2.6.$OLDBASE-rc$OLDRC-git$OLDGIT.bz2.sign
 
-  cvs remove linux-2.6.$(($OLDBASE-1)).tar.bz2.sign
+  cvs remove linux-2.6.$OLD_TARBALL_BASE.tar.bz2.sign
   cvs remove patch-2.6.$OLDBASE-rc$OLDRC.bz2.sign
   cvs remove patch-2.6.$OLDBASE-rc$OLDRC-git$OLDGIT.bz2.sign
 
@@ -112,7 +117,7 @@
   make clog
   echo FIXME! Fix up fedora_cvs_origin
   make verrel
-  exit
+  exit 1
 fi
 
 if [ "$OLDRC" != "$NEWRC" ]; then
@@ -121,6 +126,7 @@
   perl -p -i -e 's/$ENV{OLDBASE}-rc$ENV{OLDRC}.bz2/$ENV{NEWBASE}-rc$ENV{NEWRC}.bz2/' .cvsignore
   perl -p -i -e 's/$ENV{OLDBASE}-rc$ENV{OLDRC}.bz2/$ENV{NEWBASE}-rc$ENV{NEWRC}.bz2/' upstream
   grep -v patch-2.6.$OLDBASE-rc$OLDRC.bz2 sources > .sources.tmp; mv .sources.tmp sources
+  grep -v patch-2.6.$OLDBASE-rc$OLDRC-git$OLDGIT.bz2 .cvsignore >.cvsignore.tmp ; mv .cvsignore.tmp .cvsignore
   if [ `grep -c patch-2.6.$NEWBASE-rc$NEWRC.bz2 upstream` -eq 0 ]; then
     echo patch-2.6.$NEWBASE-rc$NEWRC.bz2 >> .cvsignore
     echo patch-2.6.$NEWBASE-rc$NEWRC.bz2 >> upstream
@@ -128,6 +134,16 @@
   rm -f patch-2.6.$OLDBASE-rc$OLDRC.bz2
   rm -f patch-2.6.$OLDBASE-rc$OLDRC.bz2.sign
   cvs remove patch-2.6.$OLDBASE-rc$OLDRC.bz2.sign
+  make download
+  make upload FILES=patch-2.6.$NEWBASE-rc$NEWRC.bz2
+  cvs add patch-2.6.$NEWBASE-rc$NEWRC.bz2.sign
+
+  # Another awkward (albeit unlikely) corner case.
+  # Moving from say 26-rc3-git1 to 26-rc4-git1
+  # The above will grab the new -rc, but the below will
+  # think that the -git hasn't changed.
+  # Fudge around this, by pretending the old git was something crazy.
+  OLDGIT=99
 fi
 
 if [ "$OLDGIT" != "$NEWGIT" ]; then
@@ -161,7 +177,11 @@
 fi
 
 if [ "$OLDRC" != "$NEWRC" -o "$OLDGIT" != "$NEWGIT" ]; then
+  perl -p -i -e 's|^ApplyPatch\ git-linus.diff|#ApplyPatch\ git-linus.diff|' kernel.spec
+  > git-linus.diff
   bumpspecfile.py kernel.spec "- $NEW"
   make clog
+  exit 1
+else
+  exit 0
 fi
-



From kyle at fedoraproject.org  Mon Jan 12 19:54:52 2009
From: kyle at fedoraproject.org (Kyle McMartin)
Date: Mon, 12 Jan 2009 19:54:52 +0000 (UTC)
Subject: rpms/kernel/F-9 disable-p4-cpufreq-ui.patch, NONE,
	1.1 drm-modesetting-i915.patch, NONE,
	1.1 drm-modesetting-radeon.patch, NONE, 1.1 drm-next.patch, NONE,
	1.1 drm-nouveau.patch, NONE, 1.1 git-cpufreq.patch, 1.2,
	1.3 git-linus.diff, NONE, 1.1 linux-2.6-acpi-video-dos.patch,
	NONE, 1.1 linux-2.6-debug-always-inline-kzalloc.patch, NONE,
	1.1 linux-2.6-defaults-acpi-video.patch, NONE,
	1.1 linux-2.6-efika-not-chrp.patch, 1.2,
	1.3 linux-2.6-export-shmem-bits-for-gem.patch, NONE,
	1.1 linux-2.6-gspca-git.patch, NONE,
	1.1 linux-2.6-olpc-speaker-out.patch, NONE,
	1.1 linux-2.6-piix3-silence-quirk.patch, NONE,
	1.1 linux-2.6-selinux-move-open-perms-check.patch, NONE,
	1.1 linux-2.6-serial.patch, NONE,
	1.1 linux-2.6-silence-acpi-blacklist.patch, NONE,
	1.1 linux-2.6-silence-fbcon-logo.patch, NONE,
	1.1 linux-2.6-x86-mtrr-kill-bogus-warning.patch, NONE,
	1.1 linux-2.6.27-ext-dir-corruption-fix.patch, 1.2,
	1.3 linux-2.6.27-ext4-2.6.28-backport-fixups.patch, 1.2,
	1.3 linux-2.6.27-ext4-2.6.28-rc3-git6.patch, 1.2,
	1.3 linux-2.6.28.tar.bz2.sign, NONE, 1.1 .cvsignore, 1.837,
	1.838 Makefile, 1.71, 1.72 TODO, 1.6, 1.7 config-debug, 1.13,
	1.14 config-generic, 1.133, 1.134 config-i686, 1.4,
	1.5 config-ia64-generic, 1.12, 1.13 config-nodebug, 1.15,
	1.16 config-powerpc-generic, 1.19, 1.20 config-rhel-generic,
	1.12, 1.13 config-s390x, 1.6, 1.7 config-sparc64-generic, 1.18,
	1.19 config-x86-generic, 1.38, 1.39 config-x86_64-generic, 1.39,
	1.40 kernel.spec, 1.891, 1.892 linux-2.6-compile-fixes.patch,
	1.165, 1.166 linux-2.6-crash-driver.patch, 1.11,
	1.12 linux-2.6-debug-taint-vm.patch, 1.21,
	1.22 linux-2.6-defaults-pci_no_msi.patch, 1.1,
	1.2 linux-2.6-execshield.patch, 1.90,
	1.91 linux-2.6-firewire-git-pending.patch, 1.34,
	1.35 linux-2.6-hdpvr.patch, 1.1,
	1.2 linux-2.6-net-tulip-interrupt.patch, 1.1,
	1.2 linux-2.6-netdev-atl2.patch, 1.3,
	1.4 linux-2.6-pciehp-update.patch, 1.3,
	1.4 linux-2.6-ps3-legacy-bootloader-hack.patch, 1.2,
	1.3 linux-2.6-selinux-mprotect-checks.patch, 1.6,
	1.7 linux-2.6-silence-noise.patch, 1.17,
	1.18 linux-2.6-squashfs.patch, 1.30,
	1.31 linux-2.6-upstream-reverts.patch, 1.15,
	1.16 linux-2.6-utrace.patch, 1.81, 1.82 linux-2.6.27-lirc.patch,
	1.1, 1.2 linux-2.6.27-pci-hush-allocation-failures.patch, 1.1,
	1.2 sources, 1.798, 1.799 upstream, 1.717, 1.718 COPYING.modules,
	1.5, NONE Config.mk, 1.4, NONE drm-fedora9-rollup.patch, 1.5,
	NONE drm-mm-readd-nopfn.patch, 1.1,
	NONE linux-2.6-acpi-dock-fix-eject-request-process.patch, 1.1,
	NONE linux-2.6-acpi-ignore-ae_not_found-error-of-ec-reg-method.patch, 
	1.1, NONE linux-2.6-alsa-backport-beep-switch.patch, 1.1,
	NONE linux-2.6-debug-no-quiet.patch, 1.7,
	NONE linux-2.6-default-mmf_dump_elf_headers.patch, 1.2,
	NONE linux-2.6-defaults-fat-utf8.patch, 1.4,
	NONE linux-2.6-dmi-autoload.patch, 1.1,
	NONE linux-2.6-e1000-corrupt-eeprom-checksum.patch, 1.3, NONE
	linux-2.6-e1000e-add-support-for-82567LM-3-and-82567LF-3-ICH10D-parts.patch,
	1.1, NONE linux-2.6-e1000e-add-support-for-new-82574L-part.patch, 1.1,
	NONE linux-2.6-e1000e-add-support-for-the-82567LM-4-device.patch,
	1.1, NONE linux-2.6-gspca-vc0321-fix-frame-overflow.patch, 1.1,
	NONE linux-2.6-input.git-i8042-add-xps-m1530-to-nomux.patch, 1.1,
	NONE linux-2.6-iwl3945-ibss-tsf-fix.patch, 1.1,
	NONE linux-2.6-iwlagn-downgrade-BUG_ON-in-interrupt.patch, 1.1,
	NONE linux-2.6-libata-sata_nv-disable-swncq.patch, 1.1,
	NONE linux-2.6-merge-efifb-imacfb.patch, 1.4,
	NONE linux-2.6-netdev-e1000-disable-alpm.patch, 1.1,
	NONE linux-2.6-netdev-r8169-2.6.28.patch, 1.2,
	NONE linux-2.6-nfs-client-mounts-hang.patch, 1.2,
	NONE linux-2.6-pci-fix-pciehp-irq0.patch, 1.1,
	NONE linux-2.6-pciehp-kill-annoying-messages.patch, 1.2,
	NONE linux-2.6-sata-eeepc-faster.patch, 1.1,
	NONE linux-2.6-sched-fine-tune-SD_MC_INIT.patch, 1.1,
	NONE linux-2.6-sched-fine-tune-SD_SIBLING_INIT.patch, 1.1,
	NONE linux-2.6-sched-wakeup-preempt-when-small-overlap.patch,
	1.1, NONE linux-2.6-scsi-mpt-vmware-fix.patch, 1.1,
	NONE linux-2.6-selinux-recognise-addrlabel.patch, 1.1,
	NONE linux-2.6-smarter-relatime.patch, 1.6,
	NONE linux-2.6-usb-ehci-hcd-respect-nousb.patch, 1.2,
	NONE linux-2.6-uvc-hg.patch, 1.1,
	NONE linux-2.6-uvc-spca525.patch, 1.1,
	NONE linux-2.6-wireless-ath9k-dma-fixes.patch, 1.1,
	NONE linux-2.6-x86-check-for-null-irq-context.patch, 1.1,
	NONE linux-2.6-x86-debug-boot.patch, 1.4,
	NONE linux-2.6-x86-pci-amd-config-space.patch, 1.1,
	NONE linux-2.6-x86-tracehook.patch, 1.1,
	NONE linux-2.6-x86-tune-generic.patch, 1.3,
	NONE linux-2.6.27-ext4-rename-ext4dev-to-ext4.patch, 1.1,
	NONE linux-2.6.27-hwmon-applesmc-2.6.28.patch, 1.4,
	NONE linux-2.6.27-x86-tracehook-syscall-arg-order.patch, 1.1,
	NONE linux-2.6.27.7-alsa-driver-fixups.patch, 1.3,
	NONE linux-2.6.27.9-alsa-driver-1.0.18a.patch, 1.1,
	NONE linux-2.6.27.9-alsa-hda-add-a-quirk-for-dell-studio-15.patch,
	1.1, NONE linux-2.6.27.9-alsa-hda-mark-dell-studio-1535-quirk.patch, 
	1.1, NONE
	linux-2.6.27.9-alsa-hda-no-headphone-as-line-out-swich-without-line-outs.patch,
	1.1, NONE linux-2.6.27.tar.bz2.sign, 1.1,
	NONE patch-2.6.27.10.bz2.sign, 1.1,
	NONE sparc-2.6.git-aae7fb87ec4d2df6cb551670b1765cf4e5795a3b.patch,
	1.1, NONE
Message-ID: <20090112195452.05F3670123@cvs1.fedora.phx.redhat.com>

Author: kyle

Update of /cvs/pkgs/rpms/kernel/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30345

Modified Files:
	.cvsignore Makefile TODO config-debug config-generic 
	config-i686 config-ia64-generic config-nodebug 
	config-powerpc-generic config-rhel-generic config-s390x 
	config-sparc64-generic config-x86-generic 
	config-x86_64-generic kernel.spec 
	linux-2.6-compile-fixes.patch linux-2.6-crash-driver.patch 
	linux-2.6-debug-taint-vm.patch 
	linux-2.6-defaults-pci_no_msi.patch linux-2.6-execshield.patch 
	linux-2.6-firewire-git-pending.patch linux-2.6-hdpvr.patch 
	linux-2.6-net-tulip-interrupt.patch 
	linux-2.6-netdev-atl2.patch linux-2.6-pciehp-update.patch 
	linux-2.6-ps3-legacy-bootloader-hack.patch 
	linux-2.6-selinux-mprotect-checks.patch 
	linux-2.6-silence-noise.patch linux-2.6-squashfs.patch 
	linux-2.6-upstream-reverts.patch linux-2.6-utrace.patch 
	linux-2.6.27-lirc.patch 
	linux-2.6.27-pci-hush-allocation-failures.patch sources 
	upstream 
Added Files:
	disable-p4-cpufreq-ui.patch drm-modesetting-i915.patch 
	drm-modesetting-radeon.patch drm-next.patch drm-nouveau.patch 
	git-cpufreq.patch git-linus.diff 
	linux-2.6-acpi-video-dos.patch 
	linux-2.6-debug-always-inline-kzalloc.patch 
	linux-2.6-defaults-acpi-video.patch 
	linux-2.6-efika-not-chrp.patch 
	linux-2.6-export-shmem-bits-for-gem.patch 
	linux-2.6-gspca-git.patch linux-2.6-olpc-speaker-out.patch 
	linux-2.6-piix3-silence-quirk.patch 
	linux-2.6-selinux-move-open-perms-check.patch 
	linux-2.6-serial.patch linux-2.6-silence-acpi-blacklist.patch 
	linux-2.6-silence-fbcon-logo.patch 
	linux-2.6-x86-mtrr-kill-bogus-warning.patch 
	linux-2.6.27-ext-dir-corruption-fix.patch 
	linux-2.6.27-ext4-2.6.28-backport-fixups.patch 
	linux-2.6.27-ext4-2.6.28-rc3-git6.patch 
	linux-2.6.28.tar.bz2.sign 
Removed Files:
	COPYING.modules Config.mk drm-fedora9-rollup.patch 
	drm-mm-readd-nopfn.patch 
	linux-2.6-acpi-dock-fix-eject-request-process.patch 
	linux-2.6-acpi-ignore-ae_not_found-error-of-ec-reg-method.patch 
	linux-2.6-alsa-backport-beep-switch.patch 
	linux-2.6-debug-no-quiet.patch 
	linux-2.6-default-mmf_dump_elf_headers.patch 
	linux-2.6-defaults-fat-utf8.patch linux-2.6-dmi-autoload.patch 
	linux-2.6-e1000-corrupt-eeprom-checksum.patch 
	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-gspca-vc0321-fix-frame-overflow.patch 
	linux-2.6-input.git-i8042-add-xps-m1530-to-nomux.patch 
	linux-2.6-iwl3945-ibss-tsf-fix.patch 
	linux-2.6-iwlagn-downgrade-BUG_ON-in-interrupt.patch 
	linux-2.6-libata-sata_nv-disable-swncq.patch 
	linux-2.6-merge-efifb-imacfb.patch 
	linux-2.6-netdev-e1000-disable-alpm.patch 
	linux-2.6-netdev-r8169-2.6.28.patch 
	linux-2.6-nfs-client-mounts-hang.patch 
	linux-2.6-pci-fix-pciehp-irq0.patch 
	linux-2.6-pciehp-kill-annoying-messages.patch 
	linux-2.6-sata-eeepc-faster.patch 
	linux-2.6-sched-fine-tune-SD_MC_INIT.patch 
	linux-2.6-sched-fine-tune-SD_SIBLING_INIT.patch 
	linux-2.6-sched-wakeup-preempt-when-small-overlap.patch 
	linux-2.6-scsi-mpt-vmware-fix.patch 
	linux-2.6-selinux-recognise-addrlabel.patch 
	linux-2.6-smarter-relatime.patch 
	linux-2.6-usb-ehci-hcd-respect-nousb.patch 
	linux-2.6-uvc-hg.patch linux-2.6-uvc-spca525.patch 
	linux-2.6-wireless-ath9k-dma-fixes.patch 
	linux-2.6-x86-check-for-null-irq-context.patch 
	linux-2.6-x86-debug-boot.patch 
	linux-2.6-x86-pci-amd-config-space.patch 
	linux-2.6-x86-tracehook.patch linux-2.6-x86-tune-generic.patch 
	linux-2.6.27-ext4-rename-ext4dev-to-ext4.patch 
	linux-2.6.27-hwmon-applesmc-2.6.28.patch 
	linux-2.6.27-x86-tracehook-syscall-arg-order.patch 
	linux-2.6.27.7-alsa-driver-fixups.patch 
	linux-2.6.27.9-alsa-driver-1.0.18a.patch 
	linux-2.6.27.9-alsa-hda-add-a-quirk-for-dell-studio-15.patch 
	linux-2.6.27.9-alsa-hda-mark-dell-studio-1535-quirk.patch 
	linux-2.6.27.9-alsa-hda-no-headphone-as-line-out-swich-without-line-outs.patch 
	linux-2.6.27.tar.bz2.sign patch-2.6.27.10.bz2.sign 
	sparc-2.6.git-aae7fb87ec4d2df6cb551670b1765cf4e5795a3b.patch 
Log Message:
* Mon Jan 12 2009 Kyle McMartin <kyle at redhat.com>
- Rebase for Fedora 9.
- Turn off CONFIG_MAXSMP on x86_64.


disable-p4-cpufreq-ui.patch:

--- NEW FILE disable-p4-cpufreq-ui.patch ---
diff -ur linux-2.6.27.noarch/arch/x86/kernel/cpu/cpufreq/p4-clockmod.c linux-2.6.27.noarch.p4/arch/x86/kernel/cpu/cpufreq/p4-clockmod.c
--- linux-2.6.27.noarch/arch/x86/kernel/cpu/cpufreq/p4-clockmod.c	2008-11-03 17:14:03.000000000 +0000
+++ linux-2.6.27.noarch.p4/arch/x86/kernel/cpu/cpufreq/p4-clockmod.c	2008-11-03 17:18:38.000000000 +0000
@@ -274,6 +274,7 @@
 	.name		= "p4-clockmod",
 	.owner		= THIS_MODULE,
 	.attr		= p4clockmod_attr,
+	.hide_interface	= 1,
 };
 
 
diff -ur linux-2.6.27.noarch/drivers/cpufreq/cpufreq.c linux-2.6.27.noarch.p4/drivers/cpufreq/cpufreq.c
--- linux-2.6.27.noarch/drivers/cpufreq/cpufreq.c	2008-11-03 17:14:03.000000000 +0000
+++ linux-2.6.27.noarch.p4/drivers/cpufreq/cpufreq.c	2008-11-03 17:18:38.000000000 +0000
@@ -754,6 +754,11 @@
 	.release	= cpufreq_sysfs_release,
 };
 
+static struct kobj_type ktype_empty_cpufreq = {
+	.sysfs_ops	= &sysfs_ops,
+	.release	= cpufreq_sysfs_release,
+};
+
 
 /**
  * cpufreq_add_dev - add a CPU device
@@ -876,26 +881,36 @@
 	memcpy(&new_policy, policy, sizeof(struct cpufreq_policy));
 
 	/* prepare interface data */
-	ret = kobject_init_and_add(&policy->kobj, &ktype_cpufreq, &sys_dev->kobj,
-				   "cpufreq");
-	if (ret)
-		goto err_out_driver_exit;
-
-	/* set up files for this cpu device */
-	drv_attr = cpufreq_driver->attr;
-	while ((drv_attr) && (*drv_attr)) {
-		ret = sysfs_create_file(&policy->kobj, &((*drv_attr)->attr));
+	if (!cpufreq_driver->hide_interface) {
+		ret = kobject_init_and_add(&policy->kobj, &ktype_cpufreq,
+					   &sys_dev->kobj, "cpufreq");
 		if (ret)
 			goto err_out_driver_exit;
-		drv_attr++;
-	}
-	if (cpufreq_driver->get) {
-		ret = sysfs_create_file(&policy->kobj, &cpuinfo_cur_freq.attr);
-		if (ret)
-			goto err_out_driver_exit;
-	}
-	if (cpufreq_driver->target) {
-		ret = sysfs_create_file(&policy->kobj, &scaling_cur_freq.attr);
+
+		/* set up files for this cpu device */
+		drv_attr = cpufreq_driver->attr;
+		while ((drv_attr) && (*drv_attr)) {
+			ret = sysfs_create_file(&policy->kobj,
+						&((*drv_attr)->attr));
+			if (ret)
+				goto err_out_driver_exit;
+			drv_attr++;
+		}
+		if (cpufreq_driver->get) {
+			ret = sysfs_create_file(&policy->kobj,
+						&cpuinfo_cur_freq.attr);
+			if (ret)
+				goto err_out_driver_exit;
+		}
+		if (cpufreq_driver->target) {
+			ret = sysfs_create_file(&policy->kobj,
+						&scaling_cur_freq.attr);
+			if (ret)
+				goto err_out_driver_exit;
+		}
+	} else {
+		ret = kobject_init_and_add(&policy->kobj, &ktype_empty_cpufreq,
+					   &sys_dev->kobj, "cpufreq");
 		if (ret)
 			goto err_out_driver_exit;
 	}
diff -ur linux-2.6.27.noarch/include/linux/cpufreq.h linux-2.6.27.noarch.p4/include/linux/cpufreq.h
--- linux-2.6.27.noarch/include/linux/cpufreq.h	2008-11-03 17:14:03.000000000 +0000
+++ linux-2.6.27.noarch.p4/include/linux/cpufreq.h	2008-11-03 17:18:38.000000000 +0000
@@ -234,6 +234,7 @@
 	int	(*suspend)	(struct cpufreq_policy *policy, pm_message_t pmsg);
 	int	(*resume)	(struct cpufreq_policy *policy);
 	struct freq_attr	**attr;
+	bool			hide_interface;
 };
 
 /* flags */

drm-modesetting-i915.patch:

--- NEW FILE drm-modesetting-i915.patch ---
diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig
index 0ef9295..ebbf124 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 ce60285..3bbd73b 100644
--- a/drivers/gpu/drm/i915/Makefile
+++ b/drivers/gpu/drm/i915/Makefile
@@ -8,7 +8,12 @@ i915-y := i915_drv.o i915_dma.o i915_irq.o i915_mem.o i915_init.o i915_opregion.
 	  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 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.
+	 */
+	bool (*set_property)(struct intel_dvo_device *dvo,
+			     struct drm_property *property, uint64_t val);
+#endif
[...10984 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 e7a5a68..d689d36 100644
--- a/mm/mmap.c
+++ b/mm/mmap.c
@@ -1248,6 +1248,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.
  *

drm-modesetting-radeon.patch:

--- NEW FILE drm-modesetting-radeon.patch ---
commit 3ef2b914f9667c70a9711fa31ff95d639ccc8e2e
Author: Dave Airlie <airlied at redhat.com>
Date:   Thu Dec 18 23:01:12 2008 +1000

    drm: don't set cached bits on pages from uncached allocator.
    
    This should make AGP no corrupt itself to all buggery
    (cherry picked from commit 55c0a3f1d3693cb5c3b65f37d4bb6e8a3c025460)

commit be5f7447cc492545e225170be38e5e65d7de37d9
Author: Dave Airlie <airlied at redhat.com>
Date:   Tue Dec 2 16:38:04 2008 +1000

    drop old CS

commit 91bfed87127c1bd17098803184e43783d55f35e5
Author: Dave Airlie <airlied at redhat.com>
Date:   Mon Dec 1 15:09:27 2008 +1000

    radeon: update with latest CS bits

commit a7f6175e3610651b1f84a1b8aa1f61a9a4f3bdb6
Author: Dave Airlie <airlied at redhat.com>
Date:   Wed Dec 17 06:56:36 2008 +1000

    fixups post rebase

commit cd29f247278a5949956adbfb75229dc9bad19f8e
Author: Dave Airlie <airlied at redhat.com>
Date:   Thu Dec 11 01:35:09 2008 +1000

    radeon: fix agp mode when kms isn't enabled

commit 0d0f9c970263750a68131b5f88735c59f605c69f
Author: Dave Airlie <airlied at ppcg5.localdomain>
Date:   Wed Dec 3 17:22:07 2008 +1100

    radeon: add support for accessing disabled ROMs.

commit 840d823d6f33c1852b92791093b23b1ce7af25ac
Author: Dave Airlie <airlied at ppcg5.localdomain>
Date:   Wed Dec 3 17:19:02 2008 +1100

    radeon: make cail do pll read/write via actual PLL functions

commit 049d865d47cf229234cd7dd0ef8927a41a142b0e
Author: Dave Airlie <airlied at ppcg5.localdomain>
Date:   Wed Dec 3 16:36:00 2008 +1100

    radeon: atom fixes for endianness

commit df08dc63cbbd19a8ea0659bdc379147a59201b4c
Author: Dave Airlie <airlied at redhat.com>
Date:   Wed Dec 3 20:28:05 2008 +1000

    radeon: AGP fixes round 2.
    
    More I can't believe its not AGP fixes.
    Limit the AGP aperture to the GART size, and init the registers
    in the right place

commit 79d6ac96108c29dbce90ce605b01dd6b71673092
Author: Dave Airlie <airlied at redhat.com>
Date:   Tue Dec 2 12:49:17 2008 +1000

    radeon: AGP fixes
    
    1. Proper PCIE fallback on PCIE cards.
    2. Setup agp base + location regs properly

commit e6a1353d11f485c99371e0b89c669da0c23e8af4
Author: Michal Schmidt <mschmidt at redhat.com>
Date:   Tue Dec 2 08:06:59 2008 +1000

    radeon: fix IGP GART calcs
    
    fedora bz 473895

commit d879f36aca29ece7c3bfada452266e82df3f2392
Author: Dave Airlie <airlied at redhat.com>
Date:   Thu Nov 27 17:14:40 2008 +1000

    radeon: post any GPUs that aren't posted

commit d04c4750aba2b0bd306ab36a0002f2609ed6cc9a
Author: Dave Airlie <airlied at redhat.com>
Date:   Mon Nov 24 15:18:31 2008 +1000

    radeon: enable larger GART size on PCIE/IGP
    
    Allocate a larger GART on PCIE and IGP chipsets controlled by the gart_size
    command line option.
    
    Default to 512MB gart.

commit ae7c33fa98bf4921292f6dffb6e60dd2b85cddfa
Author: Dave Airlie <airlied at redhat.com>
Date:   Mon Nov 24 15:17:49 2008 +1000

    radeon: add some missing feature checks for modesetting

commit 54fd140cc8c63d5c65fbcdf21259025fd8a431e8
Author: Dave Airlie <airlied at redhat.com>
Date:   Mon Nov 24 11:41:06 2008 +1100

    radeon: make rs480/rs690 gart invalidate work properly.
    
    we really need to read back to make sure the invalidate has happened
    before continuing along happily in life.

commit 5e418cef1bfca7e8e0821d6e44a1e1a78e015b17
Author: Dave Airlie <airlied at redhat.com>
Date:   Sun Nov 23 19:19:02 2008 +1000

    drm: we have discardable now so don't do special cases

commit 87e2de7aef77b96a8be3532358b6ceb9540d622a
Author: Dave Airlie <airlied at redhat.com>
Date:   Fri Nov 21 14:52:25 2008 +1000

    atom: fix bug in parser for MC reads

commit 52eccc11083a1c0636337520187a4e2cf9bfe989
Author: Dave Airlie <airlied at redhat.com>
Date:   Mon Nov 17 18:14:28 2008 +1000

    radeon: turn of VRAM zeroing by default for now - needs work

commit 7a32efbc88ed749c0cd44a95bb4888cd2bc806c0
Author: Dave Airlie <airlied at redhat.com>
Date:   Mon Nov 17 09:03:36 2008 +1000

    radeon: fix return value for no relocs

commit 5a47b4d8a97949288ebe8f2f3437637e405d1db8
Author: Dave Airlie <airlied at redhat.com>
Date:   Mon Nov 17 09:03:01 2008 +1000

    ttm: add discard for VRAM buffers

commit 160794bbbb90088a86acc96ca5268bc46255582d
Author: Dave Airlie <airlied at dhcp-1-203.bne.redhat.com>
Date:   Fri Nov 14 15:52:32 2008 +1000

    drm: fix the exit path of the bo unlocking

commit 1ea46b5e3dc7e75afe1936594e0e085c9dc8665d
Author: Dave Airlie <airlied at dhcp-1-203.bne.redhat.com>
Date:   Fri Nov 14 15:51:44 2008 +1000

    radeon: fixup relocate to work on locate write buffers in VRAM first.
    
    Fixup failure paths and make EAGAIN work

commit e16a76e302eba9b53858457054059985ec0ef9df
Author: Dave Airlie <airlied at redhat.com>
Date:   Thu Nov 13 17:22:26 2008 +1100

    radeon: fix some issues since last rebase

commit e9ab870ce368dab7ed9e859c157074913353b589
Author: Dave Airlie <airlied at redhat.com>
Date:   Wed Nov 12 09:01:14 2008 +1000

    radeon: fix more build

commit 3b7c8b9cb7db0749540f9b042c7bf9e8e65f320d
Author: Dave Airlie <airlied at redhat.com>
Date:   Wed Nov 12 08:59:04 2008 +1000

    radeon: fix compile

commit 8455e44f0909b58b60465e7e8f84b77ec12710cc
Author: Dave Airlie <airlied at redhat.com>
Date:   Mon Nov 10 15:39:25 2008 +1000

    radeon: fix dumbness in cp ring check

commit f6654d03d800ea8e75bffdfad679cf8450c60361
Author: Dave Airlie <airlied at redhat.com>
Date:   Mon Nov 10 14:26:11 2008 +1000

    radeon: add gart useable size to report to userspace

commit 0fb851b61a586a96a39d7f8725b12152c1fa1c27
Author: Dave Airlie <airlied at redhat.com>
Date:   Sun Nov 9 20:34:49 2008 +1000

    radeon: fix powerpc oops on rv280

commit b264e9bd0230865da5406eb991f9afdbedd49385
Author: Dave Airlie <airlied at redhat.com>
Date:   Sun Nov 9 10:23:43 2008 +1000

    radeon: upgrade atom headers

commit b272406d53a36536d0344f3cf1b78322db97a137
Author: Dave Airlie <airlied at redhat.com>
Date:   Sat Nov 8 14:39:41 2008 +1000
[...35837 lines suppressed...]
@@ -220,6 +220,18 @@ typedef struct _drm_i915_sarea {
 #define DRM_IOCTL_I915_GEM_GET_TILING	DRM_IOWR (DRM_COMMAND_BASE + DRM_I915_GEM_GET_TILING, struct drm_i915_gem_get_tiling)
 #define DRM_IOCTL_I915_GEM_GET_APERTURE	DRM_IOR  (DRM_COMMAND_BASE + DRM_I915_GEM_GET_APERTURE, struct drm_i915_gem_get_aperture)
 
+/* 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.
  */
diff --git a/include/drm/radeon_drm.h b/include/drm/radeon_drm.h
index 73ff51f..e4f5897 100644
--- a/include/drm/radeon_drm.h
+++ b/include/drm/radeon_drm.h
@@ -453,6 +453,15 @@ typedef struct {
 	int pfCurrentPage;	/* which buffer is being displayed? */
 	int crtc2_base;		/* CRTC2 frame offset */
 	int tiling_enabled;	/* set by drm, read by 2d + 3d clients */
+
+	unsigned int last_fence;
+
+	uint32_t front_handle;
+	uint32_t back_handle;
+	uint32_t depth_handle;
+	uint32_t front_pitch;
+	uint32_t back_pitch;
+	uint32_t depth_pitch;
 } drm_radeon_sarea_t;
 
 /* WARNING: If you change any of these defines, make sure to change the
@@ -493,6 +502,18 @@ typedef struct {
 #define DRM_RADEON_SURF_ALLOC 0x1a
 #define DRM_RADEON_SURF_FREE  0x1b
 
+#define DRM_RADEON_GEM_INFO   0x1c
+#define DRM_RADEON_GEM_CREATE 0x1d
+#define DRM_RADEON_GEM_MMAP   0x1e
+#define DRM_RADEON_GEM_PIN    0x1f
+#define DRM_RADEON_GEM_UNPIN  0x20
+#define DRM_RADEON_GEM_PREAD  0x21
+#define DRM_RADEON_GEM_PWRITE 0x22
+#define DRM_RADEON_GEM_SET_DOMAIN 0x23
+#define DRM_RADEON_GEM_WAIT_RENDERING 0x24
+
+#define DRM_RADEON_CS       0x26
+
 #define DRM_IOCTL_RADEON_CP_INIT    DRM_IOW( DRM_COMMAND_BASE + DRM_RADEON_CP_INIT, drm_radeon_init_t)
 #define DRM_IOCTL_RADEON_CP_START   DRM_IO(  DRM_COMMAND_BASE + DRM_RADEON_CP_START)
 #define DRM_IOCTL_RADEON_CP_STOP    DRM_IOW( DRM_COMMAND_BASE + DRM_RADEON_CP_STOP, drm_radeon_cp_stop_t)
@@ -521,6 +542,18 @@ typedef struct {
 #define DRM_IOCTL_RADEON_SURF_ALLOC DRM_IOW( DRM_COMMAND_BASE + DRM_RADEON_SURF_ALLOC, drm_radeon_surface_alloc_t)
 #define DRM_IOCTL_RADEON_SURF_FREE  DRM_IOW( DRM_COMMAND_BASE + DRM_RADEON_SURF_FREE, drm_radeon_surface_free_t)
 
+#define DRM_IOCTL_RADEON_GEM_INFO   DRM_IOWR(DRM_COMMAND_BASE + DRM_RADEON_GEM_INFO, struct drm_radeon_gem_info)
+#define DRM_IOCTL_RADEON_GEM_CREATE   DRM_IOWR(DRM_COMMAND_BASE + DRM_RADEON_GEM_CREATE, struct drm_radeon_gem_create)
+#define DRM_IOCTL_RADEON_GEM_MMAP   DRM_IOWR(DRM_COMMAND_BASE + DRM_RADEON_GEM_MMAP, struct drm_radeon_gem_mmap)
+#define DRM_IOCTL_RADEON_GEM_PIN   DRM_IOWR(DRM_COMMAND_BASE + DRM_RADEON_GEM_PIN, struct drm_radeon_gem_pin)
+#define DRM_IOCTL_RADEON_GEM_UNPIN   DRM_IOWR(DRM_COMMAND_BASE + DRM_RADEON_GEM_UNPIN, struct drm_radeon_gem_unpin)
+#define DRM_IOCTL_RADEON_GEM_PREAD   DRM_IOWR(DRM_COMMAND_BASE + DRM_RADEON_GEM_PREAD, struct drm_radeon_gem_pread)
+#define DRM_IOCTL_RADEON_GEM_PWRITE   DRM_IOWR(DRM_COMMAND_BASE + DRM_RADEON_GEM_PWRITE, struct drm_radeon_gem_pwrite)
+#define DRM_IOCTL_RADEON_GEM_SET_DOMAIN  DRM_IOWR(DRM_COMMAND_BASE + DRM_RADEON_GEM_SET_DOMAIN, struct drm_radeon_gem_set_domain)
+#define DRM_IOCTL_RADEON_GEM_WAIT_RENDERING DRM_IOW(DRM_COMMAND_BASE + DRM_RADEON_GEM_WAIT_RENDERING, struct drm_radeon_gem_wait_rendering) 
+#define DRM_IOCTL_RADEON_CS DRM_IOWR(DRM_COMMAND_BASE + DRM_RADEON_CS, struct drm_radeon_cs)
+
+
 typedef struct drm_radeon_init {
 	enum {
 		RADEON_INIT_CP = 0x01,
@@ -677,6 +710,7 @@ typedef struct drm_radeon_indirect {
 #define RADEON_PARAM_VBLANK_CRTC           13   /* VBLANK CRTC */
 #define RADEON_PARAM_FB_LOCATION           14   /* FB location */
 #define RADEON_PARAM_NUM_GB_PIPES          15   /* num GB pipes */
+#define RADEON_PARAM_KERNEL_MM             16
 
 typedef struct drm_radeon_getparam {
 	int param;
@@ -731,6 +765,7 @@ typedef struct drm_radeon_setparam {
 #define RADEON_SETPARAM_NEW_MEMMAP 4		/* Use new memory map */
 #define RADEON_SETPARAM_PCIGART_TABLE_SIZE 5    /* PCI GART Table Size */
 #define RADEON_SETPARAM_VBLANK_CRTC 6           /* VBLANK CRTC */
+#define RADEON_SETPARAM_MM_INIT 7               /* DDX wants memory manager but has no modesetting */
 /* 1.14: Clients can allocate/free a surface
  */
 typedef struct drm_radeon_surface_alloc {
@@ -746,4 +781,106 @@ typedef struct drm_radeon_surface_free {
 #define	DRM_RADEON_VBLANK_CRTC1		1
 #define	DRM_RADEON_VBLANK_CRTC2		2
 
+#define RADEON_GEM_DOMAIN_CPU 0x1   // Cached CPU domain
+#define RADEON_GEM_DOMAIN_GTT 0x2   // GTT or cache flushed
+#define RADEON_GEM_DOMAIN_VRAM 0x4  // VRAM domain
+
+/* return to userspace start/size of gtt and vram apertures */
+struct drm_radeon_gem_info {
+	uint64_t gart_start;
+	uint64_t gart_size;
+	uint64_t vram_start;
+	uint64_t vram_size;
+	uint64_t vram_visible;
+};
+
+struct drm_radeon_gem_create {
+	uint64_t size;
+	uint64_t alignment;
+	uint32_t handle;
+	uint32_t initial_domain; // to allow VRAM to be created
+	uint32_t no_backing_store; // for VRAM objects - select whether they need backing store
+	// pretty much front/back/depth don't need it - other things do
+};
+
+struct drm_radeon_gem_mmap {
+	uint32_t handle;
+	uint32_t pad;
+	uint64_t offset;
+	uint64_t size;
+	uint64_t addr_ptr;
+};
+
+struct drm_radeon_gem_set_domain {
+	uint32_t handle;
+	uint32_t read_domains;
+	uint32_t write_domain;
+};
+
+struct drm_radeon_gem_wait_rendering {
+	uint32_t handle;
+};
+
+struct drm_radeon_gem_pin {
+	uint32_t handle;
+	uint32_t pin_domain;
+	uint64_t alignment;
+	uint64_t offset;
+};
+
+struct drm_radeon_gem_unpin {
+	uint32_t handle;
+	uint32_t pad;
+};
+
+struct drm_radeon_gem_busy {
+	uint32_t handle;
+	uint32_t busy;
+};
+
+struct drm_radeon_gem_pread {
+	/** Handle for the object being read. */
+	uint32_t handle;
+	uint32_t pad;
+	/** Offset into the object to read from */
+	uint64_t offset;
+	/** Length of data to read */
+	uint64_t size;
+	/** Pointer to write the data into. */
+	uint64_t data_ptr;	/* void *, but pointers are not 32/64 compatible */
+};
+
+struct drm_radeon_gem_pwrite {
+	/** Handle for the object being written to. */
+	uint32_t handle;
+	uint32_t pad;
+	/** Offset into the object to write to */
+	uint64_t offset;
+	/** Length of data to write */
+	uint64_t size;
+	/** Pointer to read the data from. */
+	uint64_t data_ptr;	/* void *, but pointers are not 32/64 compatible */
+};
+
+
+/* New interface which obsolete all previous interface.
+ */
+#define RADEON_CHUNK_ID_RELOCS 0x01
+#define RADEON_CHUNK_ID_IB     0x02
+#define RADEON_CHUNK_ID_OLD 0xff
+
+struct drm_radeon_cs_chunk {
+	uint32_t chunk_id;
+	uint32_t length_dw;
+	uint64_t chunk_data;
+};
+
+struct drm_radeon_cs {
+	uint32_t	num_chunks;
+	uint32_t        cs_id;
+	uint64_t	chunks; /* this points to uint64_t * which point to
+				   cs chunks */
+};
+
+
 #endif

drm-next.patch:

--- NEW FILE drm-next.patch ---
diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig
index a8b33c2..5130b72 100644
--- a/drivers/gpu/drm/Kconfig
+++ b/drivers/gpu/drm/Kconfig
@@ -7,6 +7,8 @@
 menuconfig DRM
 	tristate "Direct Rendering Manager (XFree86 4.1.0 and higher DRI support)"
 	depends on (AGP || AGP=n) && PCI && !EMULATED_CMPXCHG && MMU
+	select I2C
+	select I2C_ALGOBIT
 	help
 	  Kernel-level support for the Direct Rendering Infrastructure (DRI)
 	  introduced in XFree86 4.0. If you say Y here, you need to select
@@ -65,6 +67,10 @@ config DRM_I830
 	  will load the correct one.
 
 config DRM_I915
+	select FB_CFB_FILLRECT
+	select FB_CFB_COPYAREA
+	select FB_CFB_IMAGEBLIT
+	depends on FB
 	tristate "i915 driver"
 	help
 	  Choose this option if you have a system that has Intel 830M, 845G,
@@ -76,6 +82,17 @@ 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.  Note that this causes
+	the driver to bind to PCI devices, which precludes loading things
+	like intelfb.
+
+
 config DRM_MGA
 	tristate "Matrox g200/g400"
 	depends on DRM
diff --git a/drivers/gpu/drm/Makefile b/drivers/gpu/drm/Makefile
index 74da994..30022c4 100644
--- a/drivers/gpu/drm/Makefile
+++ b/drivers/gpu/drm/Makefile
@@ -9,7 +9,8 @@ drm-y       :=	drm_auth.o drm_bufs.o drm_cache.o \
 		drm_drv.o drm_fops.o drm_gem.o drm_ioctl.o drm_irq.o \
 		drm_lock.o drm_memory.o drm_proc.o drm_stub.o drm_vm.o \
 		drm_agpsupport.o drm_scatter.o ati_pcigart.o drm_pci.o \
-		drm_sysfs.o drm_hashtab.o drm_sman.o drm_mm.o
+		drm_sysfs.o drm_hashtab.o drm_sman.o drm_mm.o \
+		drm_crtc.o drm_crtc_helper.o drm_modes.o drm_edid.o
 
 drm-$(CONFIG_COMPAT) += drm_ioc32.o
 
diff --git a/drivers/gpu/drm/drm_auth.c b/drivers/gpu/drm/drm_auth.c
index a734627..ca7a9ef 100644
--- a/drivers/gpu/drm/drm_auth.c
+++ b/drivers/gpu/drm/drm_auth.c
@@ -45,14 +45,15 @@
  * the one with matching magic number, while holding the drm_device::struct_mutex
  * lock.
  */
-static struct drm_file *drm_find_file(struct drm_device * dev, drm_magic_t magic)
+static struct drm_file *drm_find_file(struct drm_master *master, drm_magic_t magic)
 {
 	struct drm_file *retval = NULL;
 	struct drm_magic_entry *pt;
 	struct drm_hash_item *hash;
+	struct drm_device *dev = master->minor->dev;
 
 	mutex_lock(&dev->struct_mutex);
-	if (!drm_ht_find_item(&dev->magiclist, (unsigned long)magic, &hash)) {
+	if (!drm_ht_find_item(&master->magiclist, (unsigned long)magic, &hash)) {
 		pt = drm_hash_entry(hash, struct drm_magic_entry, hash_item);
 		retval = pt->priv;
 	}
@@ -71,11 +72,11 @@ static struct drm_file *drm_find_file(struct drm_device * dev, drm_magic_t magic
  * associated the magic number hash key in drm_device::magiclist, while holding
  * the drm_device::struct_mutex lock.
  */
-static int drm_add_magic(struct drm_device * dev, struct drm_file * priv,
+static int drm_add_magic(struct drm_master *master, struct drm_file *priv,
 			 drm_magic_t magic)
 {
 	struct drm_magic_entry *entry;
-
+	struct drm_device *dev = master->minor->dev;
 	DRM_DEBUG("%d\n", magic);
 
 	entry = drm_alloc(sizeof(*entry), DRM_MEM_MAGIC);
@@ -83,11 +84,10 @@ static int drm_add_magic(struct drm_device * dev, struct drm_file * priv,
 		return -ENOMEM;
 	memset(entry, 0, sizeof(*entry));
 	entry->priv = priv;
-
 	entry->hash_item.key = (unsigned long)magic;
 	mutex_lock(&dev->struct_mutex);
-	drm_ht_insert_item(&dev->magiclist, &entry->hash_item);
-	list_add_tail(&entry->head, &dev->magicfree);
+	drm_ht_insert_item(&master->magiclist, &entry->hash_item);
+	list_add_tail(&entry->head, &master->magicfree);
 	mutex_unlock(&dev->struct_mutex);
 
 	return 0;
@@ -102,20 +102,21 @@ static int drm_add_magic(struct drm_device * dev, struct drm_file * priv,
  * Searches and unlinks the entry in drm_device::magiclist with the magic
  * number hash key, while holding the drm_device::struct_mutex lock.
  */
-static int drm_remove_magic(struct drm_device * dev, drm_magic_t magic)
+static int drm_remove_magic(struct drm_master *master, drm_magic_t magic)
 {
 	struct drm_magic_entry *pt;
 	struct drm_hash_item *hash;
+	struct drm_device *dev = master->minor->dev;
 
 	DRM_DEBUG("%d\n", magic);
 
 	mutex_lock(&dev->struct_mutex);
-	if (drm_ht_find_item(&dev->magiclist, (unsigned long)magic, &hash)) {
+	if (drm_ht_find_item(&master->magiclist, (unsigned long)magic, &hash)) {
 		mutex_unlock(&dev->struct_mutex);
 		return -EINVAL;
 	}
 	pt = drm_hash_entry(hash, struct drm_magic_entry, hash_item);
-	drm_ht_remove_item(&dev->magiclist, hash);
+	drm_ht_remove_item(&master->magiclist, hash);
 	list_del(&pt->head);
 	mutex_unlock(&dev->struct_mutex);
 
@@ -153,9 +154,9 @@ int drm_getmagic(struct drm_device *dev, void *data, struct drm_file *file_priv)
 				++sequence;	/* reserve 0 */
 			auth->magic = sequence++;
 			spin_unlock(&lock);
-		} while (drm_find_file(dev, auth->magic));
+		} while (drm_find_file(file_priv->master, auth->magic));
 		file_priv->magic = auth->magic;
-		drm_add_magic(dev, file_priv, auth->magic);
+		drm_add_magic(file_priv->master, file_priv, auth->magic);
 	}
 
 	DRM_DEBUG("%u\n", auth->magic);
@@ -181,9 +182,9 @@ int drm_authmagic(struct drm_device *dev, void *data,
 	struct drm_file *file;
 
 	DRM_DEBUG("%u\n", auth->magic);
-	if ((file = drm_find_file(dev, auth->magic))) {
+	if ((file = drm_find_file(file_priv->master, auth->magic))) {
 		file->authenticated = 1;
-		drm_remove_magic(dev, auth->magic);
+		drm_remove_magic(file_priv->master, auth->magic);
 		return 0;
 	}
 	return -EINVAL;
diff --git a/drivers/gpu/drm/drm_bufs.c b/drivers/gpu/drm/drm_bufs.c
index bde64b8..72c667f 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,
 {
 	struct drm_map_list *entry;
 	list_for_each_entry(entry, &dev->maplist, head) {
-		if (entry->map && map->type == entry->map->type &&
+		if (entry->map && (entry->master == dev->primary->master) && (map->type == entry->map->type) &&
 		    ((entry->map->offset == map->offset) ||
-		     (map->type == _DRM_SHM && map->flags==_DRM_CONTAINS_LOCK))) {
+		     ((map->type == _DRM_SHM) && (map->flags&_DRM_CONTAINS_LOCK)))) {
 			return entry;
 		}
 	}
@@ -210,12 +210,12 @@ static int drm_addmap_core(struct drm_device * dev, unsigned int offset,
 		map->offset = (unsigned long)map->handle;
 		if (map->flags & _DRM_CONTAINS_LOCK) {
 			/* Prevent a 2nd X Server from creating a 2nd lock */
-			if (dev->lock.hw_lock != NULL) {
+			if (dev->primary->master->lock.hw_lock != NULL) {
 				vfree(map->handle);
 				drm_free(map, sizeof(*map), DRM_MEM_MAPS);
 				return -EBUSY;
 			}
-			dev->sigdata.lock = dev->lock.hw_lock = map->handle;	/* Pointer to lock */
+			dev->sigdata.lock = dev->primary->master->lock.hw_lock = map->handle;	/* Pointer to lock */
 		}
 		break;
 	case _DRM_AGP: {
@@ -262,6 +262,9 @@ static int drm_addmap_core(struct drm_device * dev, unsigned int offset,
 		DRM_DEBUG("AGP offset = 0x%08lx, size = 0x%08lx\n", map->offset, map->size);
 
 		break;
+	case _DRM_GEM:
+		DRM_ERROR("tried to rmmap GEM object\n");
+		break;
 	}
 	case _DRM_SCATTER_GATHER:
 		if (!dev->sg) {
@@ -319,6 +322,7 @@ static int drm_addmap_core(struct drm_device * dev, unsigned int offset,
 	list->user_token = list->hash.key << PAGE_SHIFT;
 	mutex_unlock(&dev->struct_mutex);
[...20945 lines suppressed...]
+struct drm_mode_get_property {
+	uint64_t values_ptr; /* values and blob lengths */
+	uint64_t enum_blob_ptr; /* enum and blob id ptrs */
+
+	uint32_t prop_id;
+	uint32_t flags;
+	char name[DRM_PROP_NAME_LEN];
+
+	uint32_t count_values;
+	uint32_t count_enum_blobs;
+};
+
+struct drm_mode_connector_set_property {
+	uint64_t value;
+	uint32_t prop_id;
+	uint32_t connector_id;
+};
+
+struct drm_mode_get_blob {
+	uint32_t blob_id;
+	uint32_t length;
+	uint64_t data;
+};
+
+struct drm_mode_fb_cmd {
+	uint32_t fb_id;
+	uint32_t width, height;
+	uint32_t pitch;
+	uint32_t bpp;
+	uint32_t depth;
+	/* driver specific handle */
+	uint32_t handle;
+};
+
+struct drm_mode_mode_cmd {
+	uint32_t connector_id;
+	struct drm_mode_modeinfo mode;
+};
+
+#define DRM_MODE_CURSOR_BO	(1<<0)
+#define DRM_MODE_CURSOR_MOVE	(1<<1)
+
+/*
+ * depending on the value in flags diffrent members are used.
+ *
+ * CURSOR_BO uses
+ *    crtc
+ *    width
+ *    height
+ *    handle - if 0 turns the cursor of
+ *
+ * CURSOR_MOVE uses
+ *    crtc
+ *    x
+ *    y
+ */
+struct drm_mode_cursor {
+	uint32_t flags;
+	uint32_t crtc_id;
+	int32_t x;
+	int32_t y;
+	uint32_t width;
+	uint32_t height;
+	/* driver specific handle */
+	uint32_t handle;
+};
+
+struct drm_mode_crtc_lut {
+	uint32_t crtc_id;
+	uint32_t gamma_size;
+
+	/* pointers to arrays */
+	uint64_t red;
+	uint64_t green;
+	uint64_t blue;
+};
+
+#endif
diff --git a/include/drm/drm_sarea.h b/include/drm/drm_sarea.h
index 4800373..ee5389d 100644
--- a/include/drm/drm_sarea.h
+++ b/include/drm/drm_sarea.h
@@ -36,12 +36,12 @@
 
 /* SAREA area needs to be at least a page */
 #if defined(__alpha__)
-#define SAREA_MAX                       0x2000
+#define SAREA_MAX                       0x2000U
 #elif defined(__ia64__)
-#define SAREA_MAX                       0x10000	/* 64kB */
+#define SAREA_MAX                       0x10000U	/* 64kB */
 #else
 /* Intel 830M driver needs at least 8k SAREA */
-#define SAREA_MAX                       0x2000
+#define SAREA_MAX                       0x2000U
 #endif
 
 /** Maximum number of drawables in the SAREA */
diff --git a/include/drm/i915_drm.h b/include/drm/i915_drm.h
index 152b34d..b3bcf72 100644
--- a/include/drm/i915_drm.h
+++ b/include/drm/i915_drm.h
@@ -113,8 +113,31 @@ typedef struct _drm_i915_sarea {
 	int pipeB_y;
 	int pipeB_w;
 	int pipeB_h;
+
+	/* fill out some space for old userspace triple buffer */
+	drm_handle_t unused_handle;
+	uint32_t unused1, unused2, unused3;
+
+	/* buffer object handles for static buffers. May change
+	 * over the lifetime of the client.
+	 */
+	uint32_t front_bo_handle;
+	uint32_t back_bo_handle;
+	uint32_t unused_bo_handle;
+	uint32_t depth_bo_handle;
+
 } drm_i915_sarea_t;
 
+/* due to userspace building against these headers we need some compat here */
+#define planeA_x pipeA_x
+#define planeA_y pipeA_y
+#define planeA_w pipeA_w
+#define planeA_h pipeA_h
+#define planeB_x pipeB_x
+#define planeB_y pipeB_y
+#define planeB_w pipeB_w
+#define planeB_h pipeB_h
+
 /* Flags for perf_boxes
  */
 #define I915_BOX_RING_EMPTY    0x1
@@ -160,6 +183,7 @@ typedef struct _drm_i915_sarea {
 #define DRM_I915_GEM_SET_TILING	0x21
 #define DRM_I915_GEM_GET_TILING	0x22
 #define DRM_I915_GEM_GET_APERTURE 0x23
+#define DRM_I915_GEM_MMAP_GTT	0x24
 
 #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)
@@ -177,6 +201,8 @@ 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)
+#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)
 #define DRM_IOCTL_I915_GEM_PIN		DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_GEM_PIN, struct drm_i915_gem_pin)
 #define DRM_IOCTL_I915_GEM_UNPIN	DRM_IOW(DRM_COMMAND_BASE + DRM_I915_GEM_UNPIN, struct drm_i915_gem_unpin)
 #define DRM_IOCTL_I915_GEM_BUSY		DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_GEM_BUSY, struct drm_i915_gem_busy)
@@ -187,6 +213,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)
@@ -196,7 +223,7 @@ typedef struct _drm_i915_sarea {
 /* Allow drivers to submit batchbuffers directly to hardware, relying
  * on the security mechanisms provided by hardware.
  */
-typedef struct _drm_i915_batchbuffer {
+typedef struct drm_i915_batchbuffer {
 	int start;		/* agp offset */
 	int used;		/* nr bytes in use */
 	int DR1;		/* hw flags for GFX_OP_DRAWRECT_INFO */
@@ -382,6 +409,18 @@ 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;
+	/**
+	 * Fake offset to use for subsequent mmap call
+	 *
+	 * This is a fixed-size type for 32/64 compatibility.
+	 */
+	uint64_t offset;
+};
+
 struct drm_i915_gem_set_domain {
 	/** Handle for the object */
 	uint32_t handle;
diff --git a/include/linux/console.h b/include/linux/console.h
index 248e6e3..a67a90c 100644
--- a/include/linux/console.h
+++ b/include/linux/console.h
@@ -153,4 +153,8 @@ void vcs_remove_sysfs(struct tty_struct *tty);
 #define VESA_HSYNC_SUSPEND      2
 #define VESA_POWERDOWN          3
 
+#ifdef CONFIG_VGA_CONSOLE
+extern bool vgacon_text_force(void);
+#endif
+
 #endif /* _LINUX_CONSOLE_H */

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;
+		}
+
[...15242 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__ */

git-cpufreq.patch:

Index: git-cpufreq.patch
===================================================================
RCS file: git-cpufreq.patch
diff -N git-cpufreq.patch

git-linus.diff:

--- NEW FILE git-linus.diff ---

linux-2.6-acpi-video-dos.patch:

--- NEW FILE linux-2.6-acpi-video-dos.patch ---
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
+++ b/drivers/acpi/video.c
@@ -1818,7 +1818,7 @@ static int acpi_video_bus_put_devices(struct acpi_video_bus *video)
 
 static int acpi_video_bus_start_devices(struct acpi_video_bus *video)
 {
-	return acpi_video_bus_DOS(video, 0, 0);
+	return acpi_video_bus_DOS(video, 3, 1);
 }
 
 static int acpi_video_bus_stop_devices(struct acpi_video_bus *video)

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);
 }

linux-2.6-defaults-acpi-video.patch:

--- NEW FILE linux-2.6-defaults-acpi-video.patch ---
diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c
index d8d7596..a1b7117 100644
--- a/drivers/acpi/video.c
+++ b/drivers/acpi/video.c
@@ -71,7 +71,7 @@ MODULE_AUTHOR("Bruno Ducrot");
 MODULE_DESCRIPTION("ACPI Video Driver");
 MODULE_LICENSE("GPL");
 
-static int brightness_switch_enabled = 1;
+static int brightness_switch_enabled = 0;
 module_param(brightness_switch_enabled, bool, 0644);
 
 static int acpi_video_bus_add(struct acpi_device *device);

linux-2.6-efika-not-chrp.patch:

Index: linux-2.6-efika-not-chrp.patch
===================================================================
RCS file: linux-2.6-efika-not-chrp.patch
diff -N linux-2.6-efika-not-chrp.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ linux-2.6-efika-not-chrp.patch	12 Jan 2009 19:54:17 -0000	1.3
@@ -0,0 +1,19 @@
+diff --git a/arch/powerpc/kernel/prom_init.c b/arch/powerpc/kernel/prom_init.c
+index 5ab4c84..723422e 100644
+--- a/arch/powerpc/kernel/prom_init.c
++++ b/arch/powerpc/kernel/prom_init.c
+@@ -2240,6 +2240,14 @@ static void __init fixup_device_tree_efika(void)
+ 	if (rv != PROM_ERROR && (strcmp(prop, "chrp") == 0))
+ 		prom_setprop(node, "/", "device_type", "efika", sizeof("efika"));
+ 
++	/* CODEGEN,description is exposed in /proc/cpuinfo so
++	   change that too */
++	rv = prom_getprop(node, "CODEGEN,description", prop, sizeof(prop));
++	if (rv != PROM_ERROR && (strstr(prop, "CHRP")))
++		prom_setprop(node, "/", "CODEGEN,description",
++			     "Efika 5200B PowerPC System",
++			     sizeof("Efika 5200B PowerPC System"));
++
+ 	/* Fixup bestcomm interrupts property */
+ 	node = call_prom("finddevice", 1, 1, ADDR("/builtin/bestcomm"));
+ 	if (PHANDLE_VALID(node)) {

linux-2.6-export-shmem-bits-for-gem.patch:

--- NEW FILE linux-2.6-export-shmem-bits-for-gem.patch ---
diff --git a/include/linux/mm.h b/include/linux/mm.h
index c31a9cd..d3466e9 100644
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@ -713,6 +713,17 @@ static inline int shmem_lock(struct file *file, int lock,
 #endif
 struct file *shmem_file_setup(char *name, loff_t size, unsigned long flags);
 
+/* Flag allocation requirements to shmem_getpage and shmem_swp_alloc */
+enum sgp_type {
+	SGP_READ,	/* don't exceed i_size, don't allocate page */
+	SGP_CACHE,	/* don't exceed i_size, may allocate page */
+	SGP_DIRTY,	/* like SGP_CACHE, but set new page dirty */
+	SGP_WRITE,	/* may exceed i_size, may allocate page */
+};
+
+extern int shmem_getpage(struct inode *inode, unsigned long idx,
+			 struct page **pagep, enum sgp_type sgp, int *type);
+
 int shmem_zero_setup(struct vm_area_struct *);
 
 #ifndef CONFIG_MMU
diff --git a/mm/shmem.c b/mm/shmem.c
index e2a6ae1..b283554 100644
--- a/mm/shmem.c
+++ b/mm/shmem.c
@@ -77,14 +77,6 @@
 /* Pretend that each entry is of this size in directory's i_size */
 #define BOGO_DIRENT_SIZE 20
 
-/* Flag allocation requirements to shmem_getpage and shmem_swp_alloc */
-enum sgp_type {
-	SGP_READ,	/* don't exceed i_size, don't allocate page */
-	SGP_CACHE,	/* don't exceed i_size, may allocate page */
-	SGP_DIRTY,	/* like SGP_CACHE, but set new page dirty */
-	SGP_WRITE,	/* may exceed i_size, may allocate page */
-};
-
 #ifdef CONFIG_TMPFS
 static unsigned long shmem_default_max_blocks(void)
 {
@@ -97,9 +89,6 @@ static unsigned long shmem_default_max_inodes(void)
 }
 #endif
 
-static int shmem_getpage(struct inode *inode, unsigned long idx,
-			 struct page **pagep, enum sgp_type sgp, int *type);
-
 static inline struct page *shmem_dir_alloc(gfp_t gfp_mask)
 {
 	/*
@@ -1173,8 +1162,8 @@ static inline struct mempolicy *shmem_get_sbmpol(struct shmem_sb_info *sbinfo)
  * vm. If we swap it in we mark it dirty since we also free the swap
  * entry since a page cannot live in both the swap and page cache
  */
-static int shmem_getpage(struct inode *inode, unsigned long idx,
-			struct page **pagep, enum sgp_type sgp, int *type)
+int shmem_getpage(struct inode *inode, unsigned long idx,
+		  struct page **pagep, enum sgp_type sgp, int *type)
 {
 	struct address_space *mapping = inode->i_mapping;
 	struct shmem_inode_info *info = SHMEM_I(inode);
@@ -1421,6 +1410,7 @@ failed:
 	}
 	return error;
 }
+EXPORT_SYMBOL(shmem_getpage);
 
 static int shmem_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
 {
@@ -2558,6 +2548,7 @@ put_memory:
 	shmem_unacct_size(flags, size);
 	return ERR_PTR(error);
 }
+EXPORT_SYMBOL(shmem_file_setup);
 
 /**
  * shmem_zero_setup - setup a shared anonymous mapping

linux-2.6-gspca-git.patch:

--- NEW FILE linux-2.6-gspca-git.patch ---
diff -urN /home/hans/projects/fedora-extras/kernel/devel/kernel-2.6.27/linux-2.6.27.noarch/drivers/media/video/gspca/Kconfig linux/drivers/media/video/gspca/Kconfig
--- /home/hans/projects/fedora-extras/kernel/devel/kernel-2.6.27/linux-2.6.27.noarch/drivers/media/video/gspca/Kconfig	2008-12-10 19:44:21.000000000 +0100
+++ linux/drivers/media/video/gspca/Kconfig	2008-12-09 21:37:33.000000000 +0100
@@ -12,7 +12,7 @@
 	  "Video For Linux" to use this driver.
 
 	  To compile this driver as modules, choose M here: the
-	  modules will be called gspca_main.
+	  module will be called gspca_main.
 
 
 if USB_GSPCA && VIDEO_V4L2
@@ -64,6 +64,16 @@
 	  To compile this driver as a module, choose M here: the
 	  module will be called gspca_ov519.
 
+config USB_GSPCA_OV534
+	tristate "OV534 USB Camera Driver"
+	depends on VIDEO_V4L2 && USB_GSPCA
+	help
+	  Say Y here if you want support for cameras based on the OV534 chip.
+	  (e.g. Sony Playstation EYE)
+
+	  To compile this driver as a module, choose M here: the
+	  module will be called gspca_ov534.
+
 config USB_GSPCA_PAC207
 	tristate "Pixart PAC207 USB Camera Driver"
 	depends on VIDEO_V4L2 && USB_GSPCA
@@ -83,10 +93,11 @@
 	  module will be called gspca_pac7311.
 
 config USB_GSPCA_SONIXB
-	tristate "SN9C102 USB Camera Driver"
+	tristate "SONIX Bayer USB Camera Driver"
 	depends on VIDEO_V4L2 && USB_GSPCA
 	help
-	  Say Y here if you want support for cameras based on the SONIXB chip.
+	  Say Y here if you want support for cameras based on the Sonix
+	  chips with Bayer format (SN9C101, SN9C102 and SN9C103).
 
 	  To compile this driver as a module, choose M here: the
 	  module will be called gspca_sonixb.
@@ -95,7 +106,8 @@
 	tristate "SONIX JPEG USB Camera Driver"
 	depends on VIDEO_V4L2 && USB_GSPCA
 	help
-	  Say Y here if you want support for cameras based on the SONIXJ chip.
+	  Say Y here if you want support for cameras based on the Sonix
+	  chips with JPEG format (SN9C102P, SN9C105 and >= SN9C110).
 
 	  To compile this driver as a module, choose M here: the
 	  module will be called gspca_sonixj
@@ -171,7 +183,7 @@
 	  SPCA504(abc) SPCA533 SPCA536 chips.
 
 	  To compile this driver as a module, choose M here: the
-	  module will be called gspca_spca5xx.
+	  module will be called gspca_sunplus.
 
 config USB_GSPCA_T613
 	tristate "T613 (JPEG Compliance) USB Camera Driver"
diff -urN /home/hans/projects/fedora-extras/kernel/devel/kernel-2.6.27/linux-2.6.27.noarch/drivers/media/video/gspca/Makefile linux/drivers/media/video/gspca/Makefile
--- /home/hans/projects/fedora-extras/kernel/devel/kernel-2.6.27/linux-2.6.27.noarch/drivers/media/video/gspca/Makefile	2008-12-10 19:44:21.000000000 +0100
+++ linux/drivers/media/video/gspca/Makefile	2008-12-09 21:37:33.000000000 +0100
@@ -4,6 +4,7 @@
 obj-$(CONFIG_USB_GSPCA_FINEPIX)	+= gspca_finepix.o
 obj-$(CONFIG_USB_GSPCA_MARS)	+= gspca_mars.o
 obj-$(CONFIG_USB_GSPCA_OV519)	+= gspca_ov519.o
+obj-$(CONFIG_USB_GSPCA_OV534)	+= gspca_ov534.o
 obj-$(CONFIG_USB_GSPCA_PAC207)	+= gspca_pac207.o
 obj-$(CONFIG_USB_GSPCA_PAC7311) += gspca_pac7311.o
 obj-$(CONFIG_USB_GSPCA_SONIXB)	+= gspca_sonixb.o
@@ -27,6 +28,7 @@
 gspca_finepix-objs		:= finepix.o
 gspca_mars-objs			:= mars.o
 gspca_ov519-objs		:= ov519.o
+gspca_ov534-objs		:= ov534.o
 gspca_pac207-objs		:= pac207.o
 gspca_pac7311-objs		:= pac7311.o
 gspca_sonixb-objs		:= sonixb.o
diff -urN /home/hans/projects/fedora-extras/kernel/devel/kernel-2.6.27/linux-2.6.27.noarch/drivers/media/video/gspca/etoms.c linux/drivers/media/video/gspca/etoms.c
--- /home/hans/projects/fedora-extras/kernel/devel/kernel-2.6.27/linux-2.6.27.noarch/drivers/media/video/gspca/etoms.c	2008-12-10 19:44:21.000000000 +0100
+++ linux/drivers/media/video/gspca/etoms.c	2008-12-09 21:37:33.000000000 +0100
@@ -733,6 +733,12 @@
 
 		i2c_w(gspca_dev, PAS106_REG13, &i2cflags, 1, 3);
 		i2c_w(gspca_dev, PAS106_REG0e, &gain, 1, 1);
+#if 0
+		i2c_w(gspca_dev, 0x09, &gain, 1, 1);
+		i2c_w(gspca_dev, 0x0a, &gain, 1, 1);
+		i2c_w(gspca_dev, 0x0b, &gain, 1, 1);
+		i2c_w(gspca_dev, 0x0c, &gain, 1, 1);
+#endif
 	}
 }
 
diff -urN /home/hans/projects/fedora-extras/kernel/devel/kernel-2.6.27/linux-2.6.27.noarch/drivers/media/video/gspca/finepix.c linux/drivers/media/video/gspca/finepix.c
--- /home/hans/projects/fedora-extras/kernel/devel/kernel-2.6.27/linux-2.6.27.noarch/drivers/media/video/gspca/finepix.c	2008-12-10 19:44:21.000000000 +0100
+++ linux/drivers/media/video/gspca/finepix.c	2008-12-09 21:37:33.000000000 +0100
@@ -314,9 +314,6 @@
 	int ret;
 	int size_ret;
 
-	/* Reset bulk in endpoint */
-	usb_clear_halt(gspca_dev->dev, gspca_dev->cam.epaddr);
-
 	/* Init the device */
 	memset(gspca_dev->usb_buf, 0, 12);
 	gspca_dev->usb_buf[0] = 0xc6;
diff -urN /home/hans/projects/fedora-extras/kernel/devel/kernel-2.6.27/linux-2.6.27.noarch/drivers/media/video/gspca/gspca.c linux/drivers/media/video/gspca/gspca.c
--- /home/hans/projects/fedora-extras/kernel/devel/kernel-2.6.27/linux-2.6.27.noarch/drivers/media/video/gspca/gspca.c	2008-12-10 19:44:21.000000000 +0100
+++ linux/drivers/media/video/gspca/gspca.c	2008-12-10 19:53:43.000000000 +0100
@@ -45,7 +48,7 @@
 MODULE_DESCRIPTION("GSPCA USB Camera Driver");
 MODULE_LICENSE("GPL");
 
-#define DRIVER_VERSION_NUMBER	KERNEL_VERSION(2, 3, 0)
+#define DRIVER_VERSION_NUMBER	KERNEL_VERSION(2, 4, 0)
 
 static int video_nr = -1;
 
@@ -150,8 +153,11 @@
 
 		/* check the packet status and length */
 		len = urb->iso_frame_desc[i].actual_length;
-		if (len == 0)
+		if (len == 0) {
+			if (gspca_dev->empty_packet == 0)
+				gspca_dev->empty_packet = 1;
 			continue;
+		}
 		st = urb->iso_frame_desc[i].status;
 		if (st) {
 			PDEBUG(D_ERR,
@@ -170,7 +176,6 @@
 	}
 
 	/* resubmit the URB */
-	urb->status = 0;
 	st = usb_submit_urb(urb, GFP_ATOMIC);
 	if (st < 0)
 		PDEBUG(D_ERR|D_PACK, "usb_submit_urb() ret %d", st);
@@ -200,11 +208,18 @@
 {
 	struct gspca_dev *gspca_dev = (struct gspca_dev *) urb->context;
 	struct gspca_frame *frame;
+	int st;
 
 	PDEBUG(D_PACK, "bulk irq");
 	if (!gspca_dev->streaming)
 		return;
-	if (urb->status != 0 && urb->status != -ECONNRESET) {
+	switch (urb->status) {
+	case 0:
+		break;
+	case -ECONNRESET:
+		urb->status = 0;
+		break;
+	default:
 #ifdef CONFIG_PM
 		if (!gspca_dev->frozen)
 #endif
@@ -223,6 +241,13 @@
 					urb->transfer_buffer,
 					urb->actual_length);
 	}
+
+	/* resubmit the URB */
+	if (gspca_dev->cam.bulk_nurbs != 0) {
+		st = usb_submit_urb(urb, GFP_ATOMIC);
+		if (st < 0)
+			PDEBUG(D_ERR|D_PACK, "usb_submit_urb() ret %d", st);
+	}
 }
 
 /*
@@ -285,7 +310,6 @@
 		frame->v4l2_buf.bytesused = frame->data_end - frame->data;
 		frame->v4l2_buf.flags &= ~V4L2_BUF_FLAG_QUEUED;
 		frame->v4l2_buf.flags |= V4L2_BUF_FLAG_DONE;
-		atomic_inc(&gspca_dev->nevent);
 		wake_up_interruptible(&gspca_dev->wq);	/* event = new frame */
 		i = (gspca_dev->fr_i + 1) % gspca_dev->nframes;
 		gspca_dev->fr_i = i;
@@ -379,7 +403,6 @@
 	gspca_dev->fr_i = gspca_dev->fr_o = gspca_dev->fr_q = 0;
 	gspca_dev->last_packet_type = DISCARD_PACKET;
 	gspca_dev->sequence = 0;
-	atomic_set(&gspca_dev->nevent, 0);
 	return 0;
 }
 
@@ -520,11 +543,14 @@
 		nurbs = DEF_NURBS;
 	} else {				/* bulk */
 		npkt = 0;
-		bsize = gspca_dev->cam.	bulk_size;
+		bsize = gspca_dev->cam.bulk_size;
[...5646 lines suppressed...]
-		{NULL, NULL,
-		 NULL, NULL,
-		 NULL, NULL},
-/* SENSOR_ICM105A 7 */
+/* SENSOR_ICM105A 6 */
 		{icm105a_NoFliker, icm105a_NoFlikerScale,
 		 icm105a_50HZ, icm105a_50HZScale,
 		 icm105a_60HZ, icm105a_60HZScale},
-/* SENSOR_MC501CB 8 */
+/* SENSOR_MC501CB 7 */
 		{MC501CB_NoFliker, MC501CB_NoFlikerScale,
 		 MC501CB_50HZ, MC501CB_50HZScale,
 		 MC501CB_60HZ, MC501CB_60HZScale},
-/* SENSOR_OV7620 9 */
+/* SENSOR_OV7620 8 */
 		{OV7620_NoFliker, OV7620_NoFliker,
 		 OV7620_50HZ, OV7620_50HZ,
 		 OV7620_60HZ, OV7620_60HZ},
-/* SENSOR_OV7630C 10 */
+/* SENSOR_OV7630C 9 */
 		{NULL, NULL,
 		 NULL, NULL,
 		 NULL, NULL},
-/* SENSOR_PAS106 11 */
+/* SENSOR_PAS106 10 */
 		{pas106b_NoFliker, pas106b_NoFliker,
 		 pas106b_50HZ, pas106b_50HZ,
 		 pas106b_60HZ, pas106b_60HZ},
+/* SENSOR_PAS202B 11 */
+		{pas202b_NoFlikerScale, pas202b_NoFliker,
+		 pas202b_50HZScale, pas202b_50HZ,
+		 pas202b_60HZScale, pas202b_60HZ},
 /* SENSOR_PB0330 12 */
 		{pb0330_NoFliker, pb0330_NoFlikerScale,
 		 pb0330_50HZ, pb0330_50HZScale,
@@ -7002,15 +7017,15 @@
 		5,	/* SENSOR_CS2102 0 */
 		5,	/* SENSOR_CS2102K 1 */
 		4,	/* SENSOR_GC0305 2 */
-		4,	/* SENSOR_HDCS2020 3 */
-		4,	/* SENSOR_HDCS2020b 4 */
-		4,	/* SENSOR_HV7131B 5 */
-		4,	/* SENSOR_HV7131C 6 */
-		4,	/* SENSOR_ICM105A 7 */
-		4,	/* SENSOR_MC501CB 8 */
-		3,	/* SENSOR_OV7620 9 */
-		4,	/* SENSOR_OV7630C 10 */
-		4,	/* SENSOR_PAS106 11 */
+		4,	/* SENSOR_HDCS2020b 3 */
+		4,	/* SENSOR_HV7131B 4 */
+		4,	/* SENSOR_HV7131C 5 */
+		4,	/* SENSOR_ICM105A 6 */
+		4,	/* SENSOR_MC501CB 7 */
+		3,	/* SENSOR_OV7620 8 */
+		4,	/* SENSOR_OV7630C 9 */
+		4,	/* SENSOR_PAS106 10 */
+		4,	/* SENSOR_PAS202B 11 */
 		4,	/* SENSOR_PB0330 12 */
 		4,	/* SENSOR_PO2030 13 */
 		4,	/* SENSOR_TAS5130CK 14 */
@@ -7066,8 +7081,8 @@
 			sd->sensor = SENSOR_ICM105A;
 			break;
 		case 0x0e:
-			PDEBUG(D_PROBE, "Find Sensor HDCS2020");
-			sd->sensor = SENSOR_HDCS2020;
+			PDEBUG(D_PROBE, "Find Sensor PAS202B");
+			sd->sensor = SENSOR_PAS202B;
 			sd->sharpness = 1;
 			break;
 		case 0x0f:
@@ -7153,7 +7168,6 @@
 	sd->gamma = gamma[(int) sd->sensor];
 	sd->autogain = sd_ctrls[SD_AUTOGAIN].qctrl.default_value;
 	sd->lightfreq = sd_ctrls[SD_FREQ].qctrl.default_value;
-	sd->sharpness = sd_ctrls[SD_SHARPNESS].qctrl.default_value;
 
 	switch (sd->sensor) {
 	case SENSOR_GC0305:
@@ -7161,7 +7175,6 @@
 	case SENSOR_PO2030:
 		gspca_dev->ctrl_dis = (1 << BRIGHTNESS_IDX);
 		break;
-	case SENSOR_HDCS2020:
 	case SENSOR_HV7131B:
 	case SENSOR_HV7131C:
 	case SENSOR_OV7630C:
@@ -7191,15 +7204,15 @@
 		{cs2102_InitialScale, cs2102_Initial},		/* 0 */
 		{cs2102K_InitialScale, cs2102K_Initial},	/* 1 */
 		{gc0305_Initial, gc0305_InitialScale},		/* 2 */
-		{hdcs2020xx_InitialScale, hdcs2020xx_Initial},	/* 3 */
-		{hdcs2020xb_InitialScale, hdcs2020xb_Initial},	/* 4 */
-		{hv7131bxx_InitialScale, hv7131bxx_Initial},	/* 5 */
-		{hv7131cxx_InitialScale, hv7131cxx_Initial},	/* 6 */
-		{icm105axx_InitialScale, icm105axx_Initial},	/* 7 */
-		{MC501CB_InitialScale, MC501CB_Initial},	/* 9 */
-		{OV7620_mode0, OV7620_mode1},			/* 9 */
-		{ov7630c_InitialScale, ov7630c_Initial},	/* 10 */
-		{pas106b_InitialScale, pas106b_Initial},	/* 11 */
+		{hdcs2020xb_InitialScale, hdcs2020xb_Initial},	/* 3 */
+		{hv7131bxx_InitialScale, hv7131bxx_Initial},	/* 4 */
+		{hv7131cxx_InitialScale, hv7131cxx_Initial},	/* 5 */
+		{icm105axx_InitialScale, icm105axx_Initial},	/* 6 */
+		{MC501CB_InitialScale, MC501CB_Initial},	/* 7 */
+		{OV7620_mode0, OV7620_mode1},			/* 8 */
+		{ov7630c_InitialScale, ov7630c_Initial},	/* 9 */
+		{pas106b_InitialScale, pas106b_Initial},	/* 10 */
+		{pas202b_Initial, pas202b_InitialScale},	/* 11 */
 		{pb0330xx_InitialScale, pb0330xx_Initial},	/* 12 */
 /* or		{pb03303x_InitialScale, pb03303x_Initial}, */
 		{PO2030_mode0, PO2030_mode1},			/* 13 */
@@ -7256,6 +7269,11 @@
 		reg_r(gspca_dev, 0x0008);
 		reg_w(dev, 0x00, 0x0008);
 		break;
+	case SENSOR_PAS202B:
+#if 0/*fixme*/
+		reg_r(gspca_dev, ZC3XX_R002_CLOCKSELECT);
+		/* fall thru */
+#endif
 	case SENSOR_GC0305:
 		reg_r(gspca_dev, 0x0008);
 		/* fall thru */
@@ -7269,7 +7287,6 @@
 	switch (sd->sensor) {
 	case SENSOR_CS2102:		/* gamma set in xxx_Initial */
 	case SENSOR_CS2102K:
-	case SENSOR_HDCS2020:
 	case SENSOR_HDCS2020b:
 	case SENSOR_PB0330:		/* pb with chip_revision - see above */
 	case SENSOR_OV7630C:
@@ -7282,6 +7299,7 @@
 	setmatrix(gspca_dev);			/* one more time? */
 	switch (sd->sensor) {
 	case SENSOR_OV7620:
+	case SENSOR_PAS202B:
 		reg_r(gspca_dev, 0x0180);	/* from win */
 		reg_w(dev, 0x00, 0x0180);
 		break;
@@ -7293,37 +7311,29 @@
 
 	switch (sd->sensor) {
 	case SENSOR_GC0305:
-	case SENSOR_OV7620:
 		reg_w(dev, 0x09, 0x01ad);	/* (from win traces) */
 		reg_w(dev, 0x15, 0x01ae);
-		sd->autogain = 0;
-		break;
+		/* fall thru */
+	case SENSOR_PAS202B:
 	case SENSOR_PO2030:
-		reg_w(dev, 0x40, 0x0117);	/* (from win traces) */
-		reg_r(gspca_dev, 0x0180);
-		break;
-	}
-
-	setautogain(gspca_dev);
-	switch (sd->sensor) {
-	case SENSOR_GC0305:
-/*		setlightfreq(gspca_dev);	?? (end: 80 -> [18d]) */
-		reg_w(dev, 0x09, 0x01ad);	/* (from win traces) */
-		reg_w(dev, 0x15, 0x01ae);
-		reg_w(dev, 0x40, 0x0180);
-		reg_w(dev, 0x40, 0x0117);
+/*		reg_w(dev, 0x40, ZC3XX_R117_GGAIN);  * (from win traces) */
 		reg_r(gspca_dev, 0x0180);
-		sd->autogain = 1;
-		setautogain(gspca_dev);
 		break;
 	case SENSOR_OV7620:
+		reg_w(dev, 0x09, 0x01ad);
+		reg_w(dev, 0x15, 0x01ae);
 		i2c_read(gspca_dev, 0x13);	/*fixme: returns 0xa3 */
 		i2c_write(gspca_dev, 0x13, 0xa3, 0x00);
 					 /*fixme: returned value to send? */
-		reg_w(dev, 0x40, 0x0117);	/* (from win traces) */
+		reg_w(dev, 0x40, 0x0117);
 		reg_r(gspca_dev, 0x0180);
-		setautogain(gspca_dev);
-		msleep(500);
+		break;
+	}
+
+	setautogain(gspca_dev);
+	switch (sd->sensor) {
+	case SENSOR_PAS202B:
+		reg_w(dev, 0x00, 0x0007);	/* (from win traces) */
 		break;
 	case SENSOR_PO2030:
 		msleep(500);
@@ -7333,6 +7343,8 @@
 		reg_w(dev, 0x02, 0x0008);
 		break;
 	}
+	if (sd->sensor == SENSOR_PAS202B)
+		reg_w(dev, 0x02, ZC3XX_R008_CLOCKSETTING);
 	return 0;
 }
 

linux-2.6-olpc-speaker-out.patch:

--- NEW FILE linux-2.6-olpc-speaker-out.patch ---
diff --git a/sound/pci/cs5535audio/cs5535audio.c b/sound/pci/cs5535audio/cs5535audio.c
index 1d8b160..640f157 100644
--- a/sound/pci/cs5535audio/cs5535audio.c
+++ b/sound/pci/cs5535audio/cs5535audio.c
@@ -28,6 +28,7 @@
 #include <linux/slab.h>
 #include <linux/moduleparam.h>
 #include <asm/io.h>
+#include <asm/olpc.h>
 #include <sound/core.h>
 #include <sound/control.h>
 #include <sound/pcm.h>
@@ -163,6 +164,9 @@ static int __devinit snd_cs5535audio_mixer(struct cs5535audio *cs5535au)
 	ac97.private_data = cs5535au;
 	ac97.pci = cs5535au->pci;
 
+	if (machine_is_olpc())
+		ac97.scaps |= AC97_SCAP_INV_EAPD;
+
 	if ((err = snd_ac97_mixer(pbus, &ac97, &cs5535au->ac97)) < 0) {
 		snd_printk(KERN_ERR "mixer failed\n");
 		return err;

linux-2.6-piix3-silence-quirk.patch:

--- NEW FILE linux-2.6-piix3-silence-quirk.patch ---
diff -up linux-2.6.26.noarch/drivers/pci/quirks.c.jx linux-2.6.26.noarch/drivers/pci/quirks.c
--- linux-2.6.26.noarch/drivers/pci/quirks.c.jx	2008-08-08 10:02:20.000000000 -0400
+++ linux-2.6.26.noarch/drivers/pci/quirks.c	2008-08-08 10:07:26.000000000 -0400
@@ -47,7 +47,7 @@ static void quirk_passive_release(struct
 	while ((d = pci_get_device(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82371SB_0, d))) {
 		pci_read_config_byte(d, 0x82, &dlc);
 		if (!(dlc & 1<<1)) {
-			dev_err(&d->dev, "PIIX3: Enabling Passive Release\n");
+			dev_info(&d->dev, "PIIX3: Enabling Passive Release\n");
 			dlc |= 1<<1;
 			pci_write_config_byte(d, 0x82, dlc);
 		}

linux-2.6-selinux-move-open-perms-check.patch:

--- NEW FILE linux-2.6-selinux-move-open-perms-check.patch ---
From: Eric Paris <eparis at redhat.com>
Date: Wed, 29 Oct 2008 21:06:46 +0000 (-0400)
Subject: SELinux: check open perms in dentry_open not inode_permission
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Fjmorris%2Fsecurity-testing-2.6.git;a=commitdiff_plain;h=8b6a5a37f87a414ef8636e36ec75accb27bb7508

SELinux: check open perms in dentry_open not inode_permission

Some operations, like searching a directory path or connecting a unix domain
socket, make explicit calls into inode_permission.  Our choices are to
either try to come up with a signature for all of the explicit calls to
inode_permission and do not check open on those, or to move the open checks to
dentry_open where we know this is always an open operation.  This patch moves
the checks to dentry_open.

Signed-off-by: Eric Paris <eparis at redhat.com>
Acked-by:  Stephen Smalley <sds at tycho.nsa.gov>
Signed-off-by: James Morris <jmorris at namei.org>
---

diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c
index c679ba6..03ff7db 100644
--- a/security/selinux/hooks.c
+++ b/security/selinux/hooks.c
@@ -1686,15 +1686,39 @@ static inline u32 file_mask_to_av(int mode, int mask)
 	return av;
 }
 
+/* Convert a Linux file to an access vector. */
+static inline u32 file_to_av(struct file *file)
+{
+	u32 av = 0;
+
+	if (file->f_mode & FMODE_READ)
+		av |= FILE__READ;
+	if (file->f_mode & FMODE_WRITE) {
+		if (file->f_flags & O_APPEND)
+			av |= FILE__APPEND;
+		else
+			av |= FILE__WRITE;
+	}
+	if (!av) {
+		/*
+		 * Special file opened with flags 3 for ioctl-only use.
+		 */
+		av = FILE__IOCTL;
+	}
+
+	return av;
+}
+
 /*
- * Convert a file mask to an access vector and include the correct open
+ * Convert a file to an access vector and include the correct open
  * open permission.
  */
-static inline u32 open_file_mask_to_av(int mode, int mask)
+static inline u32 open_file_to_av(struct file *file)
 {
-	u32 av = file_mask_to_av(mode, mask);
+	u32 av = file_to_av(file);
 
 	if (selinux_policycap_openperm) {
+		mode_t mode = file->f_path.dentry->d_inode->i_mode;
 		/*
 		 * lnk files and socks do not really have an 'open'
 		 */
@@ -1710,34 +1734,11 @@ static inline u32 open_file_mask_to_av(int mode, int mask)
 			av |= DIR__OPEN;
 		else
 			printk(KERN_ERR "SELinux: WARNING: inside %s with "
-				"unknown mode:%x\n", __func__, mode);
+				"unknown mode:%o\n", __func__, mode);
 	}
 	return av;
 }
 
-/* Convert a Linux file to an access vector. */
-static inline u32 file_to_av(struct file *file)
-{
-	u32 av = 0;
-
-	if (file->f_mode & FMODE_READ)
-		av |= FILE__READ;
-	if (file->f_mode & FMODE_WRITE) {
-		if (file->f_flags & O_APPEND)
-			av |= FILE__APPEND;
-		else
-			av |= FILE__WRITE;
-	}
-	if (!av) {
-		/*
-		 * Special file opened with flags 3 for ioctl-only use.
-		 */
-		av = FILE__IOCTL;
-	}
-
-	return av;
-}
-
 /* Hook functions begin here. */
 
 static int selinux_ptrace_may_access(struct task_struct *child,
@@ -2654,7 +2655,7 @@ static int selinux_inode_permission(struct inode *inode, int mask)
 	}
 
 	return inode_has_perm(current, inode,
-			       open_file_mask_to_av(inode->i_mode, mask), NULL);
+			      file_mask_to_av(inode->i_mode, mask), NULL);
 }
 
 static int selinux_inode_setattr(struct dentry *dentry, struct iattr *iattr)
@@ -3170,7 +3171,7 @@ static int selinux_dentry_open(struct file *file)
 	 * new inode label or new policy.
 	 * This check is not redundant - do not remove.
 	 */
-	return inode_has_perm(current, inode, file_to_av(file), NULL);
+	return inode_has_perm(current, inode, open_file_to_av(file), NULL);
 }
 
 /* task security operations */

linux-2.6-serial.patch:

--- NEW FILE linux-2.6-serial.patch ---
From: Andy Whitcroft <apw at canonical.com>
Subject: [PATCH 1/1] serial: RS485 ioctl structure uses __u32 include linux/types.h
Date: Tue, 2 Dec 2008 11:00:25 +0000

In the commit below a new struct serial_rs485 was introduced for a new
ioctl:

    commit c26c56c0f40e200e61d1390629c806f6adaffbcc
    Author: Alan Cox <alan at redhat.com>
    Date:   Mon Oct 13 10:37:48 2008 +0100

	tty: Cris has a nice RS485 ioctl so we should steal it

This structure uses the __u32 types for some of its members, which leads
to the following compile error:

    $ cc -I.../include -c X.c
    In file included from X.c:2: .../include/linux/serial.h:185:
		error: expected specifier-qualifier-list before ???__u32???
    $

It seems that these types are appropriate for this structure as it is
to be exposed to userspace.  These types are available via linux/types.h
so move the include of that outside the __KERNEL__ section.

Signed-off-by: Andy Whitcroft <apw at canonical.com>
---
 include/linux/serial.h |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/include/linux/serial.h b/include/linux/serial.h
index 1ea8d92..9136cc5 100644
--- a/include/linux/serial.h
+++ b/include/linux/serial.h
@@ -10,8 +10,9 @@
 #ifndef _LINUX_SERIAL_H
 #define _LINUX_SERIAL_H
 
-#ifdef __KERNEL__
 #include <linux/types.h>
+
+#ifdef __KERNEL__
 #include <asm/page.h>
 
 /*
-- 
1.6.0.4.911.gc990
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo at vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/



linux-2.6-silence-acpi-blacklist.patch:

--- NEW FILE linux-2.6-silence-acpi-blacklist.patch ---
diff -up linux-2.6.26.noarch/drivers/acpi/blacklist.c.jx linux-2.6.26.noarch/drivers/acpi/blacklist.c
--- linux-2.6.26.noarch/drivers/acpi/blacklist.c.jx	2008-07-13 17:51:29.000000000 -0400
+++ linux-2.6.26.noarch/drivers/acpi/blacklist.c	2008-08-12 14:21:39.000000000 -0400
@@ -81,18 +81,18 @@ static int __init blacklist_by_year(void
 	int year = dmi_get_year(DMI_BIOS_DATE);
 	/* Doesn't exist? Likely an old system */
 	if (year == -1) {
-		printk(KERN_ERR PREFIX "no DMI BIOS year, "
+		printk(KERN_INFO PREFIX "no DMI BIOS year, "
 			"acpi=force is required to enable ACPI\n" );
 		return 1;
 	}
 	/* 0? Likely a buggy new BIOS */
 	if (year == 0) {
-		printk(KERN_ERR PREFIX "DMI BIOS year==0, "
+		printk(KERN_INFO PREFIX "DMI BIOS year==0, "
 			"assuming ACPI-capable machine\n" );
 		return 0;
 	}
 	if (year < CONFIG_ACPI_BLACKLIST_YEAR) {
-		printk(KERN_ERR PREFIX "BIOS age (%d) fails cutoff (%d), "
+		printk(KERN_INFO PREFIX "BIOS age (%d) fails cutoff (%d), "
 		       "acpi=force is required to enable ACPI\n",
 		       year, CONFIG_ACPI_BLACKLIST_YEAR);
 		return 1;

linux-2.6-silence-fbcon-logo.patch:

--- NEW FILE linux-2.6-silence-fbcon-logo.patch ---
diff --git a/drivers/video/console/fbcon.c b/drivers/video/console/fbcon.c
index 97aff8d..5e230b6 100644
--- a/drivers/video/console/fbcon.c
+++ b/drivers/video/console/fbcon.c
@@ -674,13 +674,15 @@ static void fbcon_prepare_logo(struct vc_data *vc, struct fb_info *info,
 		kfree(save);
 	}
 
-	if (logo_lines > vc->vc_bottom) {
-		logo_shown = FBCON_LOGO_CANSHOW;
-		printk(KERN_INFO
-		       "fbcon_init: disable boot-logo (boot-logo bigger than screen).\n");
-	} else if (logo_shown != FBCON_LOGO_DONTSHOW) {
-		logo_shown = FBCON_LOGO_DRAW;
-		vc->vc_top = logo_lines;
+	if (logo_shown != FBCON_LOGO_DONTSHOW) {
+		if (logo_lines > vc->vc_bottom) {
+			logo_shown = FBCON_LOGO_CANSHOW;
+			printk(KERN_INFO
+			       "fbcon_init: disable boot-logo (boot-logo bigger than screen).\n");
+		} else {
+			logo_shown = FBCON_LOGO_DRAW;
+			vc->vc_top = logo_lines;
+		}
 	}
 }
 #endif /* MODULE */
@@ -3604,6 +3606,13 @@ static int __init fb_console_init(void)
 	return 0;
 }
 
+static int __init quiet_logo(char *str)
+{
+	logo_shown = FBCON_LOGO_DONTSHOW;
+}
+
+early_param("quiet", quiet_logo);
+
 module_init(fb_console_init);
 
 #ifdef MODULE

linux-2.6-x86-mtrr-kill-bogus-warning.patch:

--- NEW FILE linux-2.6-x86-mtrr-kill-bogus-warning.patch ---
Kill bogus MTRR warning when running under vmware:

https://bugzilla.redhat.com/show_bug.cgi?id=468845

Index: linux-2.6.27.noarch/arch/x86/kernel/cpu/mtrr/main.c
===================================================================
--- linux-2.6.27.noarch.orig/arch/x86/kernel/cpu/mtrr/main.c
+++ linux-2.6.27.noarch/arch/x86/kernel/cpu/mtrr/main.c
@@ -1495,11 +1495,8 @@ int __init mtrr_trim_uncached_memory(uns
 	}
 
 	/* kvm/qemu doesn't have mtrr set right, don't trim them all */
-	if (!highest_pfn) {
-		WARN(!kvm_para_available(), KERN_WARNING
-				"WARNING: strange, CPU MTRRs all blank?\n");
+	if (!highest_pfn)
 		return 0;
-	}
 
 	/* check entries number */
 	memset(num, 0, sizeof(num));

linux-2.6.27-ext-dir-corruption-fix.patch:

Index: linux-2.6.27-ext-dir-corruption-fix.patch
===================================================================
RCS file: linux-2.6.27-ext-dir-corruption-fix.patch
diff -N linux-2.6.27-ext-dir-corruption-fix.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ linux-2.6.27-ext-dir-corruption-fix.patch	12 Jan 2009 19:54:18 -0000	1.3
@@ -0,0 +1,207 @@
+This is a trivial backport of the following upstream commits:
+
+- bd39597cbd42a784105a04010100e27267481c67 (ext2)
+- cdbf6dba28e8e6268c8420857696309470009fd9 (ext3)
+
+This addresses CVE-2008-3528
+
+ext[234]: Avoid printk floods in the face of directory corruption
+
+Note: some people thinks this represents a security bug, since it
+might make the system go away while it is printing a large number of
+console messages, especially if a serial console is involved.  Hence,
+it has been assigned CVE-2008-3528, but it requires that the attacker
+either has physical access to your machine to insert a USB disk with a
+corrupted filesystem image (at which point why not just hit the power
+button), or is otherwise able to convince the system administrator to
+mount an arbitrary filesystem image (at which point why not just
+include a setuid shell or world-writable hard disk device file or some
+such).  Me, I think they're just being silly. --tytso
+
+Signed-off-by: Eric Sandeen <sandeen at redhat.com>
+Signed-off-by: "Theodore Ts'o" <tytso at mit.edu>
+Cc: linux-ext4 at vger.kernel.org
+Cc: Eugene Teo <eugeneteo at kernel.sg>
+---
+
+Index: linux-2.6.27.noarch/fs/ext2/dir.c
+===================================================================
+--- linux-2.6.27.noarch.orig/fs/ext2/dir.c	2008-10-09 17:13:53.000000000 -0500
++++ linux-2.6.27.noarch/fs/ext2/dir.c	2008-10-22 10:17:18.596064472 -0500
+@@ -103,7 +103,7 @@ static int ext2_commit_chunk(struct page
+ 	return err;
+ }
+ 
+-static void ext2_check_page(struct page *page)
++static void ext2_check_page(struct page *page, int quiet)
+ {
+ 	struct inode *dir = page->mapping->host;
+ 	struct super_block *sb = dir->i_sb;
+@@ -146,10 +146,10 @@ out:
+ 	/* Too bad, we had an error */
+ 
+ Ebadsize:
+-	ext2_error(sb, "ext2_check_page",
+-		"size of directory #%lu is not a multiple of chunk size",
+-		dir->i_ino
+-	);
++	if (!quiet)
++		ext2_error(sb, __func__,
++			"size of directory #%lu is not a multiple "
++			"of chunk size", dir->i_ino);
+ 	goto fail;
+ Eshort:
+ 	error = "rec_len is smaller than minimal";
+@@ -166,32 +166,36 @@ Espan:
+ Einumber:
+ 	error = "inode out of bounds";
+ bad_entry:
+-	ext2_error (sb, "ext2_check_page", "bad entry in directory #%lu: %s - "
+-		"offset=%lu, inode=%lu, rec_len=%d, name_len=%d",
+-		dir->i_ino, error, (page->index<<PAGE_CACHE_SHIFT)+offs,
+-		(unsigned long) le32_to_cpu(p->inode),
+-		rec_len, p->name_len);
++	if (!quiet)
++		ext2_error(sb, __func__, "bad entry in directory #%lu: : %s - "
++			"offset=%lu, inode=%lu, rec_len=%d, name_len=%d",
++			dir->i_ino, error, (page->index<<PAGE_CACHE_SHIFT)+offs,
++			(unsigned long) le32_to_cpu(p->inode),
++			rec_len, p->name_len);
+ 	goto fail;
+ Eend:
+-	p = (ext2_dirent *)(kaddr + offs);
+-	ext2_error (sb, "ext2_check_page",
+-		"entry in directory #%lu spans the page boundary"
+-		"offset=%lu, inode=%lu",
+-		dir->i_ino, (page->index<<PAGE_CACHE_SHIFT)+offs,
+-		(unsigned long) le32_to_cpu(p->inode));
++	if (!quiet) {
++		p = (ext2_dirent *)(kaddr + offs);
++		ext2_error(sb, "ext2_check_page",
++			"entry in directory #%lu spans the page boundary"
++			"offset=%lu, inode=%lu",
++			dir->i_ino, (page->index<<PAGE_CACHE_SHIFT)+offs,
++			(unsigned long) le32_to_cpu(p->inode));
++	}
+ fail:
+ 	SetPageChecked(page);
+ 	SetPageError(page);
+ }
+ 
+-static struct page * ext2_get_page(struct inode *dir, unsigned long n)
++static struct page * ext2_get_page(struct inode *dir, unsigned long n,
++				   int quiet)
+ {
+ 	struct address_space *mapping = dir->i_mapping;
+ 	struct page *page = read_mapping_page(mapping, n, NULL);
+ 	if (!IS_ERR(page)) {
+ 		kmap(page);
+ 		if (!PageChecked(page))
+-			ext2_check_page(page);
++			ext2_check_page(page, quiet);
+ 		if (PageError(page))
+ 			goto fail;
+ 	}
+@@ -292,7 +296,7 @@ ext2_readdir (struct file * filp, void *
+ 	for ( ; n < npages; n++, offset = 0) {
+ 		char *kaddr, *limit;
+ 		ext2_dirent *de;
+-		struct page *page = ext2_get_page(inode, n);
++		struct page *page = ext2_get_page(inode, n, 0);
+ 
+ 		if (IS_ERR(page)) {
+ 			ext2_error(sb, __func__,
+@@ -361,6 +365,7 @@ struct ext2_dir_entry_2 * ext2_find_entr
+ 	struct page *page = NULL;
+ 	struct ext2_inode_info *ei = EXT2_I(dir);
+ 	ext2_dirent * de;
++	int dir_has_error = 0;
+ 
+ 	if (npages == 0)
+ 		goto out;
+@@ -374,7 +379,7 @@ struct ext2_dir_entry_2 * ext2_find_entr
+ 	n = start;
+ 	do {
+ 		char *kaddr;
+-		page = ext2_get_page(dir, n);
++		page = ext2_get_page(dir, n, dir_has_error);
+ 		if (!IS_ERR(page)) {
+ 			kaddr = page_address(page);
+ 			de = (ext2_dirent *) kaddr;
+@@ -391,7 +396,9 @@ struct ext2_dir_entry_2 * ext2_find_entr
+ 				de = ext2_next_entry(de);
+ 			}
+ 			ext2_put_page(page);
+-		}
++		} else
++			dir_has_error = 1;
++
+ 		if (++n >= npages)
+ 			n = 0;
+ 		/* next page is past the blocks we've got */
+@@ -414,7 +421,7 @@ found:
+ 
+ struct ext2_dir_entry_2 * ext2_dotdot (struct inode *dir, struct page **p)
+ {
+-	struct page *page = ext2_get_page(dir, 0);
++	struct page *page = ext2_get_page(dir, 0, 0);
+ 	ext2_dirent *de = NULL;
+ 
+ 	if (!IS_ERR(page)) {
+@@ -487,7 +494,7 @@ int ext2_add_link (struct dentry *dentry
+ 	for (n = 0; n <= npages; n++) {
+ 		char *dir_end;
+ 
+-		page = ext2_get_page(dir, n);
++		page = ext2_get_page(dir, n, 0);
+ 		err = PTR_ERR(page);
+ 		if (IS_ERR(page))
+ 			goto out;
+@@ -655,14 +662,17 @@ int ext2_empty_dir (struct inode * inode
+ {
+ 	struct page *page = NULL;
+ 	unsigned long i, npages = dir_pages(inode);
++	int dir_has_error = 0;
+ 
+ 	for (i = 0; i < npages; i++) {
+ 		char *kaddr;
+ 		ext2_dirent * de;
+-		page = ext2_get_page(inode, i);
++		page = ext2_get_page(inode, i, dir_has_error);
+ 
+-		if (IS_ERR(page))
++		if (IS_ERR(page)) {
++			dir_has_error = 1;
+ 			continue;
++		}
+ 
+ 		kaddr = page_address(page);
+ 		de = (ext2_dirent *)kaddr;
+Index: linux-2.6.27.noarch/fs/ext3/dir.c
+===================================================================
+--- linux-2.6.27.noarch.orig/fs/ext3/dir.c	2008-10-09 17:13:53.000000000 -0500
++++ linux-2.6.27.noarch/fs/ext3/dir.c	2008-10-22 10:17:18.614001252 -0500
+@@ -102,6 +102,7 @@ static int ext3_readdir(struct file * fi
+ 	int err;
+ 	struct inode *inode = filp->f_path.dentry->d_inode;
+ 	int ret = 0;
++	int dir_has_error = 0;
+ 
+ 	sb = inode->i_sb;
+ 
+@@ -148,9 +149,12 @@ static int ext3_readdir(struct file * fi
+ 		 * of recovering data when there's a bad sector
+ 		 */
+ 		if (!bh) {
+-			ext3_error (sb, "ext3_readdir",
+-				"directory #%lu contains a hole at offset %lu",
+-				inode->i_ino, (unsigned long)filp->f_pos);
++			if (!dir_has_error) {
++				ext3_error(sb, __func__, "directory #%lu "
++					"contains a hole at offset %lld",
++					inode->i_ino, filp->f_pos);
++				dir_has_error = 1;
++			}
+ 			/* corrupt size?  Maybe no more blocks to read */
+ 			if (filp->f_pos > inode->i_blocks << 9)
+ 				break;

linux-2.6.27-ext4-2.6.28-backport-fixups.patch:

Index: linux-2.6.27-ext4-2.6.28-backport-fixups.patch
===================================================================
RCS file: linux-2.6.27-ext4-2.6.28-backport-fixups.patch
diff -N linux-2.6.27-ext4-2.6.28-backport-fixups.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ linux-2.6.27-ext4-2.6.28-backport-fixups.patch	12 Jan 2009 19:54:18 -0000	1.3
@@ -0,0 +1,449 @@
+Index: linux-2.6.27.x86_64/include/linux/writeback.h
+===================================================================
+--- linux-2.6.27.x86_64.orig/include/linux/writeback.h
++++ linux-2.6.27.x86_64/include/linux/writeback.h
+@@ -63,7 +63,15 @@ struct writeback_control {
+ 	unsigned for_writepages:1;	/* This is a writepages() call */
+ 	unsigned range_cyclic:1;	/* range_start is cyclic */
+ 	unsigned more_io:1;		/* more io to be dispatched */
+-	unsigned range_cont:1;
++	/*
++	 * write_cache_pages() won't update wbc->nr_to_write and
++	 * mapping->writeback_index if no_nrwrite_index_update
++	 * is set.  write_cache_pages() may write more than we
++	 * requested and we want to make sure nr_to_write and
++	 * writeback_index are updated in a consistent manner
++	 * so we use a single control to update them
++	 */
++	unsigned no_nrwrite_index_update:1;
+ };
+ 
+ /*
+Index: linux-2.6.27.x86_64/mm/page-writeback.c
+===================================================================
+--- linux-2.6.27.x86_64.orig/mm/page-writeback.c
++++ linux-2.6.27.x86_64/mm/page-writeback.c
+@@ -876,6 +876,7 @@ int write_cache_pages(struct address_spa
+ 	pgoff_t end;		/* Inclusive */
+ 	int scanned = 0;
+ 	int range_whole = 0;
++	long nr_to_write = wbc->nr_to_write;
+ 
+ 	if (wbc->nonblocking && bdi_write_congested(bdi)) {
+ 		wbc->encountered_congestion = 1;
+@@ -939,7 +940,7 @@ retry:
+ 				unlock_page(page);
+ 				ret = 0;
+ 			}
+-			if (ret || (--(wbc->nr_to_write) <= 0))
++			if (ret || (--nr_to_write <= 0))
+ 				done = 1;
+ 			if (wbc->nonblocking && bdi_write_congested(bdi)) {
+ 				wbc->encountered_congestion = 1;
+@@ -958,11 +959,12 @@ retry:
+ 		index = 0;
+ 		goto retry;
+ 	}
+-	if (wbc->range_cyclic || (range_whole && wbc->nr_to_write > 0))
+-		mapping->writeback_index = index;
++	if (!wbc->no_nrwrite_index_update) {
++		if (wbc->range_cyclic || (range_whole && nr_to_write > 0))
++			mapping->writeback_index = index;
++		wbc->nr_to_write = nr_to_write;
++	}
+ 
+-	if (wbc->range_cont)
+-		wbc->range_start = index << PAGE_CACHE_SHIFT;
+ 	return ret;
+ }
+ EXPORT_SYMBOL(write_cache_pages);
+Index: linux-2.6.27.x86_64/include/linux/percpu_counter.h
+===================================================================
+--- linux-2.6.27.x86_64.orig/include/linux/percpu_counter.h
++++ linux-2.6.27.x86_64/include/linux/percpu_counter.h
+@@ -35,7 +35,7 @@ int percpu_counter_init_irq(struct percp
+ void percpu_counter_destroy(struct percpu_counter *fbc);
+ void percpu_counter_set(struct percpu_counter *fbc, s64 amount);
+ void __percpu_counter_add(struct percpu_counter *fbc, s64 amount, s32 batch);
+-s64 __percpu_counter_sum(struct percpu_counter *fbc, int set);
++s64 __percpu_counter_sum(struct percpu_counter *fbc);
+ 
+ static inline void percpu_counter_add(struct percpu_counter *fbc, s64 amount)
+ {
+@@ -44,19 +44,13 @@ static inline void percpu_counter_add(st
+ 
+ static inline s64 percpu_counter_sum_positive(struct percpu_counter *fbc)
+ {
+-	s64 ret = __percpu_counter_sum(fbc, 0);
++	s64 ret = __percpu_counter_sum(fbc);
+ 	return ret < 0 ? 0 : ret;
+ }
+ 
+-static inline s64 percpu_counter_sum_and_set(struct percpu_counter *fbc)
+-{
+-	return __percpu_counter_sum(fbc, 1);
+-}
+-
+-
+ static inline s64 percpu_counter_sum(struct percpu_counter *fbc)
+ {
+-	return __percpu_counter_sum(fbc, 0);
++	return __percpu_counter_sum(fbc);
+ }
+ 
+ static inline s64 percpu_counter_read(struct percpu_counter *fbc)
+Index: linux-2.6.27.x86_64/lib/percpu_counter.c
+===================================================================
+--- linux-2.6.27.x86_64.orig/lib/percpu_counter.c
++++ linux-2.6.27.x86_64/lib/percpu_counter.c
+@@ -52,7 +52,7 @@ EXPORT_SYMBOL(__percpu_counter_add);
+  * Add up all the per-cpu counts, return the result.  This is a more accurate
+  * but much slower version of percpu_counter_read_positive()
+  */
+-s64 __percpu_counter_sum(struct percpu_counter *fbc, int set)
++s64 __percpu_counter_sum(struct percpu_counter *fbc)
+ {
+ 	s64 ret;
+ 	int cpu;
+@@ -62,11 +62,9 @@ s64 __percpu_counter_sum(struct percpu_c
+ 	for_each_online_cpu(cpu) {
+ 		s32 *pcount = per_cpu_ptr(fbc->counters, cpu);
+ 		ret += *pcount;
+-		if (set)
+-			*pcount = 0;
++		*pcount = 0;
+ 	}
+-	if (set)
+-		fbc->count = ret;
++	fbc->count = ret;
+ 
+ 	spin_unlock(&fbc->lock);
+ 	return ret;
+Index: linux-2.6.27.x86_64/fs/ext4/namei.c
+===================================================================
+--- linux-2.6.27.x86_64.orig/fs/ext4/namei.c
++++ linux-2.6.27.x86_64/fs/ext4/namei.c
+@@ -1061,6 +1061,7 @@ static struct dentry *ext4_lookup(struct
+ struct dentry *ext4_get_parent(struct dentry *child)
+ {
+ 	unsigned long ino;
++	struct dentry *parent;
+ 	struct inode *inode;
+ 	static const struct qstr dotdot = {
+ 		.name = "..",
+@@ -1082,7 +1083,16 @@ struct dentry *ext4_get_parent(struct de
+ 		return ERR_PTR(-EIO);
+ 	}
+ 
+-	return d_obtain_alias(ext4_iget(child->d_inode->i_sb, ino));
++	inode = ext4_iget(child->d_inode->i_sb, ino);
++	if (IS_ERR(inode))
++		return ERR_CAST(inode);
++
++	parent = d_alloc_anon(inode);
++	if (!parent) {
++		iput(inode);
++		parent = ERR_PTR(-ENOMEM);
++	}
++	return parent;
+ }
+ 
+ #define S_SHIFT 12
+Index: linux-2.6.27.x86_64/fs/ext4/super.c
+===================================================================
+--- linux-2.6.27.x86_64.orig/fs/ext4/super.c
++++ linux-2.6.27.x86_64/fs/ext4/super.c
+@@ -400,7 +400,7 @@ fail:
+ static int ext4_blkdev_put(struct block_device *bdev)
+ {
+ 	bd_release(bdev);
+-	return blkdev_put(bdev, FMODE_READ|FMODE_WRITE);
++	return blkdev_put(bdev);
+ }
+ 
+ static int ext4_blkdev_remove(struct ext4_sb_info *sbi)
+@@ -862,7 +862,7 @@ enum {
+ 	Opt_inode_readahead_blks
+ };
+ 
+-static const match_table_t tokens = {
++static match_table_t tokens = {
+ 	{Opt_bsd_df, "bsddf"},
+ 	{Opt_minix_df, "minixdf"},
+ 	{Opt_grpid, "grpid"},
+@@ -2555,7 +2555,7 @@ static journal_t *ext4_get_dev_journal(s
+ 	if (bd_claim(bdev, sb)) {
+ 		printk(KERN_ERR
+ 			"EXT4: failed to claim external journal device.\n");
+-		blkdev_put(bdev, FMODE_READ|FMODE_WRITE);
++		blkdev_put(bdev);
+ 		return NULL;
+ 	}
+ 
+@@ -3327,30 +3327,30 @@ static int ext4_quota_on_mount(struct su
+  * Standard function to be called on quota_on
+  */
+ static int ext4_quota_on(struct super_block *sb, int type, int format_id,
+-			 char *name, int remount)
++			 char *path, int remount)
+ {
+ 	int err;
+-	struct path path;
++	struct nameidata nd;
+ 
+ 	if (!test_opt(sb, QUOTA))
+ 		return -EINVAL;
+-	/* When remounting, no checks are needed and in fact, name is NULL */
++	/* When remounting, no checks are needed and in fact, path is NULL */
+ 	if (remount)
+-		return vfs_quota_on(sb, type, format_id, name, remount);
++		return vfs_quota_on(sb, type, format_id, path, remount);
+ 
+-	err = kern_path(name, LOOKUP_FOLLOW, &path);
++	err = path_lookup(path, LOOKUP_FOLLOW, &nd);
+ 	if (err)
+ 		return err;
+ 
+ 	/* Quotafile not on the same filesystem? */
+-	if (path.mnt->mnt_sb != sb) {
+-		path_put(&path);
++	if (nd.path.mnt->mnt_sb != sb) {
++		path_put(&nd.path);
+ 		return -EXDEV;
+ 	}
+ 	/* Journaling quota? */
+ 	if (EXT4_SB(sb)->s_qf_names[type]) {
+ 		/* Quotafile not in fs root? */
+-		if (path.dentry->d_parent != sb->s_root)
++		if (nd.path.dentry->d_parent->d_inode != sb->s_root->d_inode)
+ 			printk(KERN_WARNING
+ 				"EXT4-fs: Quota file not on filesystem root. "
+ 				"Journaled quota will not work.\n");
+@@ -3360,7 +3360,7 @@ static int ext4_quota_on(struct super_bl
+ 	 * When we journal data on quota file, we have to flush journal to see
+ 	 * all updates to the file when we bypass pagecache...
+ 	 */
+-	if (ext4_should_journal_data(path.dentry->d_inode)) {
++	if (ext4_should_journal_data(nd.path.dentry->d_inode)) {
+ 		/*
+ 		 * We don't need to lock updates but journal_flush() could
+ 		 * otherwise be livelocked...
+@@ -3369,13 +3369,13 @@ static int ext4_quota_on(struct super_bl
+ 		err = jbd2_journal_flush(EXT4_SB(sb)->s_journal);
+ 		jbd2_journal_unlock_updates(EXT4_SB(sb)->s_journal);
+ 		if (err) {
+-			path_put(&path);
++			path_put(&nd.path);
+ 			return err;
+ 		}
+ 	}
+ 
+-	err = vfs_quota_on_path(sb, type, format_id, &path);
+-	path_put(&path);
++	err = vfs_quota_on_path(sb, type, format_id, &nd.path);
++	path_put(&nd.path);
+ 	return err;
+ }
+ 
+Index: linux-2.6.27.x86_64/fs/ext4/mballoc.c
+===================================================================
+--- linux-2.6.27.x86_64.orig/fs/ext4/mballoc.c
++++ linux-2.6.27.x86_64/fs/ext4/mballoc.c
+@@ -2646,7 +2646,6 @@ static void release_blocks_on_commit(jou
+ 	struct ext4_group_info *db;
+ 	int err, count = 0, count2 = 0;
+ 	struct ext4_free_data *entry;
+-	ext4_fsblk_t discard_block;
+ 	struct list_head *l, *ltmp;
+ 
+ 	list_for_each_safe(l, ltmp, &txn->t_private_list) {
+@@ -2676,12 +2675,6 @@ static void release_blocks_on_commit(jou
+ 			page_cache_release(e4b.bd_bitmap_page);
+ 		}
+ 		ext4_unlock_group(sb, entry->group);
+-		discard_block = (ext4_fsblk_t) entry->group * EXT4_BLOCKS_PER_GROUP(sb)
+-			+ entry->start_blk
+-			+ le32_to_cpu(EXT4_SB(sb)->s_es->s_first_data_block);
+-		trace_mark(ext4_discard_blocks, "dev %s blk %llu count %u", sb->s_id,
+-			   (unsigned long long) discard_block, entry->count);
+-		sb_issue_discard(sb, discard_block, entry->count);
+ 
+ 		kmem_cache_free(ext4_free_ext_cachep, entry);
+ 		ext4_mb_release_desc(&e4b);
+Index: linux-2.6.27.x86_64/fs/ext4/file.c
+===================================================================
+--- linux-2.6.27.x86_64.orig/fs/ext4/file.c
++++ linux-2.6.27.x86_64/fs/ext4/file.c
+@@ -140,9 +140,6 @@ static int ext4_file_mmap(struct file *f
+ 	return 0;
+ }
+ 
+-extern int ext4_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo,
+-		__u64 start, __u64 len);
+-
+ const struct file_operations ext4_file_operations = {
+ 	.llseek		= generic_file_llseek,
+ 	.read		= do_sync_read,
+@@ -173,6 +170,5 @@ const struct inode_operations ext4_file_
+ #endif
+ 	.permission	= ext4_permission,
+ 	.fallocate	= ext4_fallocate,
+-	.fiemap		= ext4_fiemap,
+ };
+ 
+Index: linux-2.6.27.x86_64/fs/ext4/extents.c
+===================================================================
+--- linux-2.6.27.x86_64.orig/fs/ext4/extents.c
++++ linux-2.6.27.x86_64/fs/ext4/extents.c
+@@ -40,7 +40,6 @@
+ #include <linux/slab.h>
+ #include <linux/falloc.h>
+ #include <asm/uaccess.h>
+-#include <linux/fiemap.h>
+ #include "ext4_jbd2.h"
+ #include "ext4_extents.h"
+ 
+@@ -3079,143 +3078,3 @@ retry:
+ 	mutex_unlock(&inode->i_mutex);
+ 	return ret > 0 ? ret2 : ret;
+ }
+-
+-/*
+- * Callback function called for each extent to gather FIEMAP information.
+- */
+-int ext4_ext_fiemap_cb(struct inode *inode, struct ext4_ext_path *path,
+-		       struct ext4_ext_cache *newex, struct ext4_extent *ex,
+-		       void *data)
+-{
+-	struct fiemap_extent_info *fieinfo = data;
+-	unsigned long blksize_bits = inode->i_sb->s_blocksize_bits;
+-	__u64	logical;
+-	__u64	physical;
+-	__u64	length;
+-	__u32	flags = 0;
+-	int	error;
+-
+-	logical =  (__u64)newex->ec_block << blksize_bits;
+-
+-	if (newex->ec_type == EXT4_EXT_CACHE_GAP) {
+-		pgoff_t offset;
+-		struct page *page;
+-		struct buffer_head *bh = NULL;
+-
+-		offset = logical >> PAGE_SHIFT;
+-		page = find_get_page(inode->i_mapping, offset);
+-		if (!page || !page_has_buffers(page))
+-			return EXT_CONTINUE;
+-
+-		bh = page_buffers(page);
+-
+-		if (!bh)
+-			return EXT_CONTINUE;
+-
+-		if (buffer_delay(bh)) {
+-			flags |= FIEMAP_EXTENT_DELALLOC;
+-			page_cache_release(page);
+-		} else {
+-			page_cache_release(page);
+-			return EXT_CONTINUE;
+-		}
+-	}
+-
+-	physical = (__u64)newex->ec_start << blksize_bits;
+-	length =   (__u64)newex->ec_len << blksize_bits;
+-
+-	if (ex && ext4_ext_is_uninitialized(ex))
+-		flags |= FIEMAP_EXTENT_UNWRITTEN;
+-
+-	/*
+-	 * If this extent reaches EXT_MAX_BLOCK, it must be last.
+-	 *
+-	 * Or if ext4_ext_next_allocated_block is EXT_MAX_BLOCK,
+-	 * this also indicates no more allocated blocks.
+-	 *
+-	 * XXX this might miss a single-block extent at EXT_MAX_BLOCK
+-	 */
+-	if (logical + length - 1 == EXT_MAX_BLOCK ||
+-	    ext4_ext_next_allocated_block(path) == EXT_MAX_BLOCK)
+-		flags |= FIEMAP_EXTENT_LAST;
+-
+-	error = fiemap_fill_next_extent(fieinfo, logical, physical,
+-					length, flags);
+-	if (error < 0)
+-		return error;
+-	if (error == 1)
+-		return EXT_BREAK;
+-
+-	return EXT_CONTINUE;
+-}
+-
+-/* fiemap flags we can handle specified here */
+-#define EXT4_FIEMAP_FLAGS	(FIEMAP_FLAG_SYNC|FIEMAP_FLAG_XATTR)
+-
+-int ext4_xattr_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo)
+-{
+-	__u64 physical = 0;
+-	__u64 length;
+-	__u32 flags = FIEMAP_EXTENT_LAST;
+-	int blockbits = inode->i_sb->s_blocksize_bits;
+-	int error = 0;
+-
+-	/* in-inode? */
+-	if (EXT4_I(inode)->i_state & EXT4_STATE_XATTR) {
+-		struct ext4_iloc iloc;
+-		int offset;	/* offset of xattr in inode */
+-
+-		error = ext4_get_inode_loc(inode, &iloc);
+-		if (error)
+-			return error;
+-		physical = iloc.bh->b_blocknr << blockbits;
+-		offset = EXT4_GOOD_OLD_INODE_SIZE +
+-				EXT4_I(inode)->i_extra_isize;
+-		physical += offset;
+-		length = EXT4_SB(inode->i_sb)->s_inode_size - offset;
+-		flags |= FIEMAP_EXTENT_DATA_INLINE;
+-	} else { /* external block */
+-		physical = EXT4_I(inode)->i_file_acl << blockbits;
+-		length = inode->i_sb->s_blocksize;
+-	}
+-
+-	if (physical)
+-		error = fiemap_fill_next_extent(fieinfo, 0, physical,
+-						length, flags);
+-	return (error < 0 ? error : 0);
+-}
+-
+-int ext4_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo,
+-		__u64 start, __u64 len)
+-{
+-	ext4_lblk_t start_blk;
+-	ext4_lblk_t len_blks;
+-	int error = 0;
+-
+-	/* fallback to generic here if not in extents fmt */
+-	if (!(EXT4_I(inode)->i_flags & EXT4_EXTENTS_FL))
+-		return generic_block_fiemap(inode, fieinfo, start, len,
+-			ext4_get_block);
+-
+-	if (fiemap_check_flags(fieinfo, EXT4_FIEMAP_FLAGS))
+-		return -EBADR;
+-
+-	if (fieinfo->fi_flags & FIEMAP_FLAG_XATTR) {
+-		error = ext4_xattr_fiemap(inode, fieinfo);
+-	} else {
+-		start_blk = start >> inode->i_sb->s_blocksize_bits;
+-		len_blks = len >> inode->i_sb->s_blocksize_bits;
+-
+-		/*
+-		 * Walk the extent tree gathering extent information.
+-		 * ext4_ext_fiemap_cb will push extents back to user.
+-		 */
+-		down_write(&EXT4_I(inode)->i_data_sem);
+-		error = ext4_ext_walk_space(inode, start_blk, len_blks,
+-					  ext4_ext_fiemap_cb, fieinfo);
+-		up_write(&EXT4_I(inode)->i_data_sem);
+-	}
+-
+-	return error;
+-}
+-

linux-2.6.27-ext4-2.6.28-rc3-git6.patch:

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.2 -r 1.3 linux-2.6.27-ext4-2.6.28-rc3-git6.patch
Index: linux-2.6.27-ext4-2.6.28-rc3-git6.patch
===================================================================
RCS file: linux-2.6.27-ext4-2.6.28-rc3-git6.patch
diff -N linux-2.6.27-ext4-2.6.28-rc3-git6.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ linux-2.6.27-ext4-2.6.28-rc3-git6.patch	12 Jan 2009 19:54:18 -0000	1.3
@@ -0,0 +1,9050 @@
+Index: linux-2.6.27.x86_64/MAINTAINERS
+===================================================================
+--- linux-2.6.27.x86_64.orig/MAINTAINERS
++++ linux-2.6.27.x86_64/MAINTAINERS
+@@ -1648,9 +1648,10 @@ L:	linux-ext4 at vger.kernel.org
+ S:	Maintained
+ 
+ EXT4 FILE SYSTEM
+-P:	Stephen Tweedie, Andrew Morton
+-M:	sct at redhat.com, akpm at linux-foundation.org, adilger at sun.com
++P:	Theodore Ts'o
++M:	tytso at mit.edu, adilger at sun.com
+ L:	linux-ext4 at vger.kernel.org
++W:	http://ext4.wiki.kernel.org
+ S:	Maintained
+ 
+ F71805F HARDWARE MONITORING DRIVER
+Index: linux-2.6.27.x86_64/fs/Makefile
+===================================================================
+--- linux-2.6.27.x86_64.orig/fs/Makefile
++++ linux-2.6.27.x86_64/fs/Makefile
+@@ -69,7 +69,7 @@ obj-$(CONFIG_DLM)		+= dlm/
+ # Do not add any filesystems before this line
+ obj-$(CONFIG_REISERFS_FS)	+= reiserfs/
+ obj-$(CONFIG_EXT3_FS)		+= ext3/ # Before ext2 so root fs can be ext3
+-obj-$(CONFIG_EXT4DEV_FS)	+= ext4/ # Before ext2 so root fs can be ext4dev
++obj-$(CONFIG_EXT4_FS)		+= ext4/ # Before ext2 so root fs can be ext4
+ obj-$(CONFIG_JBD)		+= jbd/
+ obj-$(CONFIG_JBD2)		+= jbd2/
+ obj-$(CONFIG_EXT2_FS)		+= ext2/
+Index: linux-2.6.27.x86_64/fs/ext4/acl.h
+===================================================================
+--- linux-2.6.27.x86_64.orig/fs/ext4/acl.h
++++ linux-2.6.27.x86_64/fs/ext4/acl.h
+@@ -51,18 +51,18 @@ static inline int ext4_acl_count(size_t 
+ 	}
+ }
+ 
+-#ifdef CONFIG_EXT4DEV_FS_POSIX_ACL
++#ifdef CONFIG_EXT4_FS_POSIX_ACL
+ 
+ /* Value for inode->u.ext4_i.i_acl and inode->u.ext4_i.i_default_acl
+    if the ACL has not been cached */
+ #define EXT4_ACL_NOT_CACHED ((void *)-1)
+ 
+ /* acl.c */
+-extern int ext4_permission (struct inode *, int);
+-extern int ext4_acl_chmod (struct inode *);
+-extern int ext4_init_acl (handle_t *, struct inode *, struct inode *);
++extern int ext4_permission(struct inode *, int);
++extern int ext4_acl_chmod(struct inode *);
++extern int ext4_init_acl(handle_t *, struct inode *, struct inode *);
+ 
+-#else  /* CONFIG_EXT4DEV_FS_POSIX_ACL */
++#else  /* CONFIG_EXT4_FS_POSIX_ACL */
+ #include <linux/sched.h>
+ #define ext4_permission NULL
+ 
+@@ -77,5 +77,5 @@ ext4_init_acl(handle_t *handle, struct i
+ {
+ 	return 0;
+ }
+-#endif  /* CONFIG_EXT4DEV_FS_POSIX_ACL */
++#endif  /* CONFIG_EXT4_FS_POSIX_ACL */
+ 
+Index: linux-2.6.27.x86_64/fs/ext4/balloc.c
+===================================================================
+--- linux-2.6.27.x86_64.orig/fs/ext4/balloc.c
++++ linux-2.6.27.x86_64/fs/ext4/balloc.c
+@@ -83,6 +83,7 @@ static int ext4_group_used_meta_blocks(s
+ 	}
+ 	return used_blocks;
+ }
++
+ /* Initializes an uninitialized block bitmap if given, and returns the
+  * number of blocks free in the group. */
+ unsigned ext4_init_block_bitmap(struct super_block *sb, struct buffer_head *bh,
+@@ -132,7 +133,7 @@ unsigned ext4_init_block_bitmap(struct s
+ 		 */
+ 		group_blocks = ext4_blocks_count(sbi->s_es) -
+ 			le32_to_cpu(sbi->s_es->s_first_data_block) -
+-			(EXT4_BLOCKS_PER_GROUP(sb) * (sbi->s_groups_count -1));
++			(EXT4_BLOCKS_PER_GROUP(sb) * (sbi->s_groups_count - 1));
+ 	} else {
+ 		group_blocks = EXT4_BLOCKS_PER_GROUP(sb);
+ 	}
+@@ -200,20 +201,20 @@ unsigned ext4_init_block_bitmap(struct s
+  * @bh:			pointer to the buffer head to store the block
+  *			group descriptor
+  */
+-struct ext4_group_desc * ext4_get_group_desc(struct super_block * sb,
++struct ext4_group_desc * ext4_get_group_desc(struct super_block *sb,
+ 					     ext4_group_t block_group,
+-					     struct buffer_head ** bh)
++					     struct buffer_head **bh)
+ {
+ 	unsigned long group_desc;
+ 	unsigned long offset;
+-	struct ext4_group_desc * desc;
++	struct ext4_group_desc *desc;
+ 	struct ext4_sb_info *sbi = EXT4_SB(sb);
+ 
+ 	if (block_group >= sbi->s_groups_count) {
+-		ext4_error (sb, "ext4_get_group_desc",
+-			    "block_group >= groups_count - "
+-			    "block_group = %lu, groups_count = %lu",
+-			    block_group, sbi->s_groups_count);
++		ext4_error(sb, "ext4_get_group_desc",
++			   "block_group >= groups_count - "
++			   "block_group = %lu, groups_count = %lu",
++			   block_group, sbi->s_groups_count);
+ 
+ 		return NULL;
+ 	}
+@@ -222,10 +223,10 @@ struct ext4_group_desc * ext4_get_group_
+ 	group_desc = block_group >> EXT4_DESC_PER_BLOCK_BITS(sb);
+ 	offset = block_group & (EXT4_DESC_PER_BLOCK(sb) - 1);
+ 	if (!sbi->s_group_desc[group_desc]) {
+-		ext4_error (sb, "ext4_get_group_desc",
+-			    "Group descriptor not loaded - "
+-			    "block_group = %lu, group_desc = %lu, desc = %lu",
+-			     block_group, group_desc, offset);
++		ext4_error(sb, "ext4_get_group_desc",
++			   "Group descriptor not loaded - "
++			   "block_group = %lu, group_desc = %lu, desc = %lu",
++			   block_group, group_desc, offset);
+ 		return NULL;
+ 	}
+ 
+@@ -302,8 +303,8 @@ err_out:
+ struct buffer_head *
+ ext4_read_block_bitmap(struct super_block *sb, ext4_group_t block_group)
+ {
+-	struct ext4_group_desc * desc;
+-	struct buffer_head * bh = NULL;
++	struct ext4_group_desc *desc;
++	struct buffer_head *bh = NULL;
+ 	ext4_fsblk_t bitmap_blk;
+ 
+ 	desc = ext4_get_group_desc(sb, block_group, NULL);
+@@ -318,9 +319,11 @@ ext4_read_block_bitmap(struct super_bloc
+ 			    block_group, bitmap_blk);
+ 		return NULL;
+ 	}
+-	if (bh_uptodate_or_lock(bh))
++	if (buffer_uptodate(bh) &&
++	    !(desc->bg_flags & cpu_to_le16(EXT4_BG_BLOCK_UNINIT)))
+ 		return bh;
+ 
++	lock_buffer(bh);
+ 	spin_lock(sb_bgl_lock(EXT4_SB(sb), block_group));
+ 	if (desc->bg_flags & cpu_to_le16(EXT4_BG_BLOCK_UNINIT)) {
+ 		ext4_init_block_bitmap(sb, bh, block_group, desc);
+@@ -345,301 +348,6 @@ ext4_read_block_bitmap(struct super_bloc
+ 	 */
+ 	return bh;
+ }
+-/*
+- * The reservation window structure operations
+- * --------------------------------------------
+- * Operations include:
+- * dump, find, add, remove, is_empty, find_next_reservable_window, etc.
+- *
+- * We use a red-black tree to represent per-filesystem reservation
+- * windows.
+- *
+- */
+-
+-/**
+- * __rsv_window_dump() -- Dump the filesystem block allocation reservation map
+- * @rb_root:		root of per-filesystem reservation rb tree
+- * @verbose:		verbose mode
+- * @fn:			function which wishes to dump the reservation map
+- *
+- * If verbose is turned on, it will print the whole block reservation
+- * windows(start, end).	Otherwise, it will only print out the "bad" windows,
+- * those windows that overlap with their immediate neighbors.
+- */
+-#if 1
+-static void __rsv_window_dump(struct rb_root *root, int verbose,
+-			      const char *fn)
+-{
+-	struct rb_node *n;
+-	struct ext4_reserve_window_node *rsv, *prev;
+-	int bad;
+-
+-restart:
+-	n = rb_first(root);
+-	bad = 0;
+-	prev = NULL;
+-
+-	printk("Block Allocation Reservation Windows Map (%s):\n", fn);
+-	while (n) {
[...8657 lines suppressed...]
+-stats  stream_req
+-
+-mb_groups:
+-This file gives the details of multiblock allocator buddy cache of free blocks
+-
+-mb_history:
+-Multiblock allocation history.
+-
+-stats:
+-This file indicate whether the multiblock allocator should start collecting
+-statistics. The statistics are shown during unmount
+-
+-group_prealloc:
+-The multiblock allocator normalize the block allocation request to
+-group_prealloc filesystem blocks if we don't have strip value set.
+-The stripe value can be specified at mount time or during mke2fs.
+-
+-max_to_scan:
+-How long multiblock allocator can look for a best extent (in found extents)
+-
+-min_to_scan:
+-How long multiblock allocator  must look for a best extent
+-
+-order2_req:
+-Multiblock allocator use  2^N search using buddies only for requests greater
+-than or equal to order2_req. The request size is specfied in file system
+-blocks. A value of 2 indicate only if the requests are greater than or equal
+-to 4 blocks.
+-
+-stream_req:
+-Files smaller than stream_req are served by the stream allocator, whose
+-purpose is to pack requests as close each to other as possible to
+-produce smooth I/O traffic. Avalue of 16 indicate that file smaller than 16
+-filesystem block size will use group based preallocation.
++
++Information about mounted ext4 file systems can be found in
++/proc/fs/ext4.  Each mounted filesystem will have a directory in
++/proc/fs/ext4 based on its device name (i.e., /proc/fs/ext4/hdc or
++/proc/fs/ext4/dm-0).   The files in each per-device directory are shown
++in Table 1-10, below.
++
++Table 1-10: Files in /proc/fs/ext4/<devname>
++..............................................................................
++ File            Content                                        
++ mb_groups       details of multiblock allocator buddy cache of free blocks
++ mb_history      multiblock allocation history
++ stats           controls whether the multiblock allocator should start
++                 collecting statistics, which are shown during the unmount
++ group_prealloc  the multiblock allocator will round up allocation
++                 requests to a multiple of this tuning parameter if the
++                 stripe size is not set in the ext4 superblock
++ max_to_scan     The maximum number of extents the multiblock allocator
++                 will search to find the best extent
++ min_to_scan     The minimum number of extents the multiblock allocator
++                 will search to find the best extent
++ order2_req      Tuning parameter which controls the minimum size for 
++                 requests (as a power of 2) where the buddy cache is
++                 used
++ stream_req      Files which have fewer blocks than this tunable
++                 parameter will have their blocks allocated out of a
++                 block group specific preallocation pool, so that small
++                 files are packed closely together.  Each large file
++                 will have its blocks allocated out of its own unique
++                 preallocation pool.
++inode_readahead  Tuning parameter which controls the maximum number of
++                 inode table blocks that ext4's inode table readahead
++                 algorithm will pre-read into the buffer cache
++..............................................................................
++
+ 
+ ------------------------------------------------------------------------------
+ Summary
+Index: linux-2.6.27.x86_64/fs/Kconfig
+===================================================================
+--- linux-2.6.27.x86_64.orig/fs/Kconfig
++++ linux-2.6.27.x86_64/fs/Kconfig
+@@ -136,71 +136,7 @@ config EXT3_FS_SECURITY
+ 	  If you are not using a security module that requires using
+ 	  extended attributes for file security labels, say N.
+ 
+-config EXT4DEV_FS
+-	tristate "Ext4dev/ext4 extended fs support development (EXPERIMENTAL)"
+-	depends on EXPERIMENTAL
+-	select JBD2
+-	select CRC16
+-	help
+-	  Ext4dev is a predecessor filesystem of the next generation
+-	  extended fs ext4, based on ext3 filesystem code. It will be
+-	  renamed ext4 fs later, once ext4dev is mature and stabilized.
+-
+-	  Unlike the change from ext2 filesystem to ext3 filesystem,
+-	  the on-disk format of ext4dev is not the same as ext3 any more:
+-	  it is based on extent maps and it supports 48-bit physical block
+-	  numbers. These combined on-disk format changes will allow
+-	  ext4dev/ext4 to handle more than 16 TB filesystem volumes --
+-	  a hard limit that ext3 cannot overcome without changing the
+-	  on-disk format.
+-
+-	  Other than extent maps and 48-bit block numbers, ext4dev also is
+-	  likely to have other new features such as persistent preallocation,
+-	  high resolution time stamps, and larger file support etc.  These
+-	  features will be added to ext4dev gradually.
+-
+-	  To compile this file system support as a module, choose M here. The
+-	  module will be called ext4dev.
+-
+-	  If unsure, say N.
+-
+-config EXT4DEV_FS_XATTR
+-	bool "Ext4dev extended attributes"
+-	depends on EXT4DEV_FS
+-	default y
+-	help
+-	  Extended attributes are name:value pairs associated with inodes by
+-	  the kernel or by users (see the attr(5) manual page, or visit
+-	  <http://acl.bestbits.at/> for details).
+-
+-	  If unsure, say N.
+-
+-	  You need this for POSIX ACL support on ext4dev/ext4.
+-
+-config EXT4DEV_FS_POSIX_ACL
+-	bool "Ext4dev POSIX Access Control Lists"
+-	depends on EXT4DEV_FS_XATTR
+-	select FS_POSIX_ACL
+-	help
+-	  POSIX Access Control Lists (ACLs) support permissions for users and
+-	  groups beyond the owner/group/world scheme.
+-
+-	  To learn more about Access Control Lists, visit the POSIX ACLs for
+-	  Linux website <http://acl.bestbits.at/>.
+-
+-	  If you don't know what Access Control Lists are, say N
+-
+-config EXT4DEV_FS_SECURITY
+-	bool "Ext4dev Security Labels"
+-	depends on EXT4DEV_FS_XATTR
+-	help
+-	  Security labels support alternative access control models
+-	  implemented by security modules like SELinux.  This option
+-	  enables an extended attribute handler for file security
+-	  labels in the ext4dev/ext4 filesystem.
+-
+-	  If you are not using a security module that requires using
+-	  extended attributes for file security labels, say N.
++source "fs/ext4/Kconfig"
+ 
+ config JBD
+ 	tristate
+@@ -234,45 +170,15 @@ config JBD_DEBUG
+ 	  output is generated.  To turn debugging off again, do
+ 	  "echo 0 > /sys/kernel/debug/jbd/jbd-debug".
+ 
+-config JBD2
+-	tristate
+-	select CRC32
+-	help
+-	  This is a generic journaling layer for block devices that support
+-	  both 32-bit and 64-bit block numbers.  It is currently used by
+-	  the ext4dev/ext4 filesystem, but it could also be used to add
+-	  journal support to other file systems or block devices such
+-	  as RAID or LVM.
+-
+-	  If you are using ext4dev/ext4, you need to say Y here. If you are not
+-	  using ext4dev/ext4 then you will probably want to say N.
+-
+-	  To compile this device as a module, choose M here. The module will be
+-	  called jbd2.  If you are compiling ext4dev/ext4 into the kernel,
+-	  you cannot compile this code as a module.
+-
+-config JBD2_DEBUG
+-	bool "JBD2 (ext4dev/ext4) debugging support"
+-	depends on JBD2 && DEBUG_FS
+-	help
+-	  If you are using the ext4dev/ext4 journaled file system (or
+-	  potentially any other filesystem/device using JBD2), this option
+-	  allows you to enable debugging output while the system is running,
+-	  in order to help track down any problems you are having.
+-	  By default, the debugging output will be turned off.
+-
+-	  If you select Y here, then you will be able to turn on debugging
+-	  with "echo N > /sys/kernel/debug/jbd2/jbd2-debug", where N is a
+-	  number between 1 and 5. The higher the number, the more debugging
+-	  output is generated.  To turn debugging off again, do
+-	  "echo 0 > /sys/kernel/debug/jbd2/jbd2-debug".
++source "fs/jbd2/Kconfig"
+ 
+ config FS_MBCACHE
+ # Meta block cache for Extended Attributes (ext2/ext3/ext4)
+ 	tristate
+-	depends on EXT2_FS_XATTR || EXT3_FS_XATTR || EXT4DEV_FS_XATTR
+-	default y if EXT2_FS=y || EXT3_FS=y || EXT4DEV_FS=y
+-	default m if EXT2_FS=m || EXT3_FS=m || EXT4DEV_FS=m
++	default y if EXT2_FS=y && EXT2_FS_XATTR
++	default y if EXT3_FS=y && EXT3_FS_XATTR
++	default y if EXT4_FS=y && EXT4_FS_XATTR
++	default m if EXT2_FS_XATTR || EXT3_FS_XATTR || EXT4_FS_XATTR
+ 
+ config REISERFS_FS
+ 	tristate "Reiserfs support"


--- NEW FILE linux-2.6.28.tar.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBJUsmzyGugalF9Dw4RAmYWAKCUJGMWXRrUNC/XDQl8lXXOv5zMvACfUvU5
Tq+2snGYOGwTki85iNpds/o=
=Ha/W
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/.cvsignore,v
retrieving revision 1.837
retrieving revision 1.838
diff -u -r1.837 -r1.838
--- .cvsignore	18 Dec 2008 22:04:28 -0000	1.837
+++ .cvsignore	12 Jan 2009 19:54:16 -0000	1.838
@@ -2,6 +2,5 @@
 GNUmakefile
 kernel-2.6.*.config
 temp-*
-kernel-2.6.27
-linux-2.6.27.tar.bz2
-patch-2.6.27.10.bz2
+kernel-2.6.28
+linux-2.6.28.tar.bz2


Index: Makefile
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/Makefile,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- Makefile	30 Oct 2008 04:41:10 -0000	1.71
+++ Makefile	12 Jan 2009 19:54:16 -0000	1.72
@@ -63,8 +63,9 @@
 	@perl -pi -e 's/# CONFIG_CAN_DEBUG_DEVICES is not set/CONFIG_CAN_DEBUG_DEVICES=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
+	@perl -pi -e 's/# CONFIG_PM_TEST_SUSPEND is not set/CONFIG_PM_TEST_SUSPEND=y/' config-generic
 
-	# just in case we're going from extremedebug -> debug
+	@# just in case we're going from extremedebug -> debug
 	@perl -pi -e 's/CONFIG_DEBUG_PAGEALLOC=y/# CONFIG_DEBUG_PAGEALLOC is not set/' config-nodebug
 
 	@perl -pi -e 's/^%define debugbuildsenabled 1/%define debugbuildsenabled 0/' kernel.spec
@@ -100,6 +101,7 @@
 	@perl -pi -e 's/CONFIG_CAN_DEBUG_DEVICES=y/# CONFIG_CAN_DEBUG_DEVICES 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
+	@perl -pi -e 's/CONFIG_PM_TEST_SUSPEND=y/#\ CONFIG_PM_TEST_SUSPEND\ is\ not\ set/' config-generic
 
 	@perl -pi -e 's/CONFIG_NR_CPUS=512/CONFIG_NR_CPUS=64/' config-x86_64-generic
 


Index: TODO
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/TODO,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- TODO	23 Oct 2008 00:23:57 -0000	1.6
+++ TODO	12 Jan 2009 19:54:16 -0000	1.7
@@ -1,26 +1,209 @@
-Submit for -stable:
-          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-libata-pata_it821x-fix-lba48-on-raid-volumes.patch
-
-Patch420: linux-2.6-fs-cifs-turn-off-unicode-during-session-establishment.patch
-Patch422: linux-2.6-fs-cifs-fix-plaintext-authentication.patch
-
-Patch2002: linux-2.6-e1000e-write-protect-nvm.patch
-
-Patch3100: linux-2.6-wan-missing-capability-checks-in-sbni_ioctl.patch
-
----------------------------------------------------------------------------------
-Submit for -stable after merging:
-
-
----------------------------------------------------------------------------------
-Already scheduled for -stable:
-
-
----------------------------------------------------------------------------------
-Try to get upstream:
-Patch101: linux-2.6-x86-check-for-null-irq-context.patch
+git-cpufreq.patch
+	Assorted fixes/improvements, especially to the ondemand governor.
+	Will go upstream in 2.6.28
+
+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-input-dell-keyboard-keyup.patch
+	Upstream in 2.6.28-rc, sent to -stable
+
+linux-2.6-eeepc-laptop-update.patch
+	Upstream but slightly different (commit a195dcdc)
+
+linux-2.6-acpi-ignore-reset_reg_sup.patch
+	Fixes reboot after suspend/resume (https://bugzilla.redhat.com/show_bug.cgi?id=461228)
+	Upstream in .28rc1, sent to stable
+
+linux-2.6-at76.patch
+linux-2.6-iwl3945-ibss-tsf-fix.patch
+linux-2.6-iwlagn-downgrade-BUG_ON-in-interrupt.patch
+	Linville.  Wireless bits.
+	Most should be upstream for 2.6.28
+
+linux-2.6-hostap-skb-cb-hack.patch
+	"A HORRIBLE HACK THAT SHOULD NOT LIVE TO SEE THE DAY"
+
+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-cdrom-door-status.patch
+	Getting some testing here before I go back to upstream with more
+	data.  See the thread at:
+	http://marc.info/?l=linux-scsi&m=121572509510899&w=2
+
+linux-2.6-compile-fixes.patch
+linux-2.6-hotfixes.patch
+	Empty
+
+linux-2.6-crash-driver.patch
+	Not upstreamable.
+	This is basically a read-only /dev/mem
+	Crazy idea: Add a bootparam that overrides the restricted devmem ?
+
+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-utrace.patch
+	utrace
+
+linux-2.6-acpi-video-dos.patch
+linux-2.6-defaults-acpi-video.patch
+	Fedora policy decisions
+	Turn into CONFIG_ options and upstream ?
+
+linux-2.6-defaults-pci_no_msi.patch
+linux-2.6-input-kill-stupid-messages.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
+	Not interesting to upstream.
+linux-2.6-xen-execshield-add-xen-specific-load_user_cs_desc.patch
+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
+linux-2.6-sysrq-c.patch
+	jarod working on upstreaming
+linux-2.6-hdpvr.patch
+	jarod added, should be in upstream v4l-dvb by .28, linus' tree by .29
+
+linux-2.6-merge-efifb-imacfb.patch
+	pjones.  merge for 2.6.28 ?
+	Applied in -mm, not in mainline yet.
+
+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 (in -mm)
+linux-2.6-silence-acpi-blacklist.patch
+linux-2.6-silence-fbcon-logo.patch
+linux-2.6-silence-noise.patch
+linux-2.6.27-pci-hush-allocation-failures.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
+	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-net-tulip-interrupt.patch
+	DEBUG_SHIRQ causes an oops.
+	Needs testing, if it works, it'll go upstream soon.
+
+linux-2.6.27-ext4-stable-patch-queue.patch
+	EXT4 bits for 2.6.28
+	Eric looks after this stuff.
+
+linux-2.6.27-fs-disable-fiemap.patch
+	Don't let this interface get out 'til it's official (and
+	released) upstream.
+
+linux-2.6.27-ext-dir-corruption-fix.patch
+	in -stable, but reverted in upstream-reverts
+        (the ext4 patch queue won't apply if we get this patch from -stable)
+
+linux-2.6.27-delay-ext4-free-block-cap-check.patch
+	In the ext4 queue, will be upstream (for bug #467216)
+
+linux-2.6-x86-avoid-dereferencing-beyond-stack-THREAD_SIZE.patch
+	In mainline and 2.6.26-stable, submitted for 2.6.27-stable.
+
+linux-2.6-rtc-cmos-look-for-pnp-rtc-first.patch
+linux-2.6-x86-register-platform-rtc-if-pnp-doesnt-describe-it.patch
+	Fix broken RTC on systems that don't expose it via PnP.
+	Submitted for -stable
+
+linux-2.6.27-sony-laptop-suspend-fix.patch
+	Submitted: http://marc.info/?l=linux-kernel&m=122419261829835&w=2
+
+linux-2.6.27-drm-i915-fix-ioctl-security.patch
+	In -stable, reverted in upstream-reverts, reapplied after the drm patch.
+	The drm patch should be fixed up to not conflict with the upstream patch.
+
+linux-2.6-libata-pata_it821x-fix-lba48-on-raid-volumes.patch
+	upstream, sent for -stable
+
+linux-2.6-usb-storage-unusual-devs-jmicron-ata-bridge.patch
+	sent for stable
+
+linux-2.6-net-tcp-option-ordering.patch
+	Backport of fd6149d332973bafa50f03ddb0ea9513e67f4517 from .28
+
+linux-2.6-sched-features-disable-hrtick.patch
+linux-2.6-sched_clock-prevent-scd-clock-from-moving-backwards
+	Scheduler patches from 2.6.28, sent to -stable
+
+linux-2.6-r8169-fix-RxMissed-register-access.patch
+linux-2.6-r8169-wake-up-the-phy-of-the-8168.patch
+	Selected patches from the r8169 2.6.28 driver.
+	Should go to stable after confirming they fix reported bugs.
+
+linux-2.6-olpc-speaker-out.patch
+	Enables speaker output by default on OLPC, going to get review from
+	OLPC folks and then to upstream for .28
+linux-2.6-olpc-touchpad.patch
+	OLPC touchpad tweaks backported from 2.6.28
+
+linux-2.6-x86-mtrr-kill-bogus-warning.patch
+	Silence bogus warning under vmware ; sent upstream.
+
+linux-2.6-selinux-empty-tty-files.patch
+	Sent upstream. In linus 37dd0bd04a3240d2922786d501e2f12cec858fbf
+
+linux-2.6-alsa-ac97-whitelist.patch
+	2b3b5485aa96d18b0025dfb2bc92c824dc81a780 from 2.6.28
+	d695e4ea860fc1cbe1e4b101af4e0450219f2db9 from 2.6.28
+
+linux-2.6-alsa-ac97-whitelist-AD1981B.patch
+	https://bugzilla.redhat.com/show_bug.cgi?id=441087
+	should be pushed upstream


Index: config-debug
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/config-debug,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- config-debug	30 Oct 2008 04:41:11 -0000	1.13
+++ config-debug	12 Jan 2009 19:54:16 -0000	1.14
@@ -15,6 +15,7 @@
 CONFIG_FAIL_MAKE_REQUEST=y
 CONFIG_FAULT_INJECTION_DEBUG_FS=y
 CONFIG_FAULT_INJECTION_STACKTRACE_FILTER=y
+CONFIG_FAIL_IO_TIMEOUT=y
 
 CONFIG_SLUB_DEBUG_ON=y
 


Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/config-generic,v
retrieving revision 1.133
retrieving revision 1.134
diff -u -r1.133 -r1.134
--- config-generic	18 Dec 2008 22:28:29 -0000	1.133
+++ config-generic	12 Jan 2009 19:54:16 -0000	1.134
@@ -142,6 +142,7 @@
 # Executable file formats
 #
 CONFIG_BINFMT_ELF=y
+CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
 # CONFIG_BINFMT_AOUT is not set
 CONFIG_BINFMT_MISC=y
 
@@ -289,6 +290,7 @@
 #
 CONFIG_PNP=y
 # CONFIG_PNP_DEBUG is not set
+# CONFIG_PNP_DEBUG_MESSAGES is not set
 
 #
 # Protocols
@@ -296,7 +298,7 @@
 CONFIG_ISAPNP=y
 # CONFIG_PNPBIOS is not set
 
-CONFIG_ACPI_PCI_SLOT=m
+CONFIG_ACPI_PCI_SLOT=y
 CONFIG_HOTPLUG_PCI_ACPI=y
 CONFIG_HOTPLUG_PCI_ACPI_IBM=m
 
@@ -333,7 +335,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 +429,7 @@
 #
 # SCSI device support
 #
-CONFIG_SCSI=m
+CONFIG_SCSI=y
 
 CONFIG_SCSI_ENCLOSURE=m
 CONFIG_SCSI_PROC_FS=y
@@ -445,12 +447,12 @@
 #
 # SCSI support type (disk, tape, CD-ROM)
 #
-CONFIG_BLK_DEV_SD=m
+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=m
+CONFIG_CHR_DEV_SG=y
 CONFIG_CHR_DEV_SCH=m
 
 #
@@ -506,13 +508,13 @@
 CONFIG_MEGARAID_LEGACY=m
 CONFIG_MEGARAID_SAS=m
 
-CONFIG_ATA=m
+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
@@ -628,6 +630,7 @@
 #
 CONFIG_MD=y
 CONFIG_BLK_DEV_MD=y
+CONFIG_MD_AUTODETECT=y
 CONFIG_MD_FAULTY=m
 CONFIG_MD_LINEAR=m
 CONFIG_MD_MULTIPATH=m
@@ -636,18 +639,18 @@
 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
-CONFIG_DM_MIRROR=m
+CONFIG_DM_MIRROR=y
 CONFIG_DM_MULTIPATH=m
 CONFIG_DM_MULTIPATH_EMC=m
 CONFIG_DM_MULTIPATH_HP=m
 CONFIG_DM_MULTIPATH_RDAC=m
-CONFIG_DM_SNAPSHOT=m
+CONFIG_DM_SNAPSHOT=y
 CONFIG_DM_UEVENT=y
-CONFIG_DM_ZERO=m
+CONFIG_DM_ZERO=y
 
 #
 # Fusion MPT device support
@@ -779,6 +782,7 @@
 CONFIG_NET_9P_FD=m
 CONFIG_NET_9P_VIRTIO=m
 # CONFIG_NET_9P_DEBUG is not set
+CONFIG_NET_9P_RDMA=m
 
 CONFIG_DECNET=m
 CONFIG_DECNET_ROUTER=y
@@ -786,11 +790,11 @@
 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
-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 +812,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
@@ -828,7 +832,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
@@ -857,8 +861,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
@@ -883,7 +887,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
@@ -892,8 +896,8 @@
 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
@@ -1222,20 +1226,21 @@
 CONFIG_E1000E=m
 CONFIG_IGB=m
 # CONFIG_IGB_LRO is not set
+CONFIG_IGB_DCA=y
 CONFIG_NS83820=m
 CONFIG_HAMACHI=m
 CONFIG_YELLOWFIN=m
 CONFIG_R8169=m
 CONFIG_R8169_NAPI=y
 CONFIG_R8169_VLAN=y
-# broken on ppc 28 Jul 2008
-# CONFIG_SFC is not set
+CONFIG_SFC=n
 # CONFIG_SK98LIN is not set
 CONFIG_SKGE=m
 # CONFIG_SKGE_DEBUG is not set
 CONFIG_TIGON3=m
 CONFIG_SKY2=m
 # CONFIG_SKY2_DEBUG is not set
+CONFIG_JME=m
 
 #
 # Ethernet (10000 Mbit)
@@ -1248,12 +1253,18 @@
 CONFIG_IXGB=m
 CONFIG_IXGB_NAPI=y
 CONFIG_IXGBE=m
+CONFIG_IXGBE_DCA=y
 CONFIG_MYRI10GE=m
+CONFIG_MYRI10GE_DCA=y
 CONFIG_NETXEN_NIC=m
 CONFIG_NIU=m
 CONFIG_S2IO=m
 CONFIG_S2IO_NAPI=y
 CONFIG_TEHUTI=m
+CONFIG_ENIC=m
+CONFIG_MLX4_EN=m
+# CONFIG_MLX4_DEBUG is not set
+CONFIG_QLGE=m
 
 CONFIG_FDDI=y
 # CONFIG_DEFXX is not set
@@ -1278,7 +1289,7 @@
 #
 # Wireless LAN
 #
-CONFIG_WLAN_PRE80211=y
+# CONFIG_WLAN_PRE80211 is not set
 # CONFIG_STRIP is not set
 # CONFIG_ARLAN is not set
 CONFIG_PCMCIA_WAVELAN=m
@@ -1296,20 +1307,21 @@
 CONFIG_MAC80211_MESH=y
 CONFIG_MAC80211_LEDS=y
 CONFIG_MAC80211_DEBUGFS=y
+CONFIG_MAC80211_RC_MINSTREL=y
 # CONFIG_MAC80211_DEBUG_MENU is not set
 # CONFIG_MAC80211_DEBUG is not set
 # CONFIG_MAC80211_DEBUG_PACKET_ALIGNMENT is not set
 # CONFIG_MAC80211_DEBUG is not set
 
 CONFIG_IEEE80211=m
-CONFIG_IEEE80211_DEBUG=y
+# CONFIG_IEEE80211_DEBUG is not set
 CONFIG_IEEE80211_CRYPT_WEP=m
 CONFIG_IEEE80211_CRYPT_CCMP=m
 CONFIG_IEEE80211_CRYPT_TKIP=m
-CONFIG_IEEE80211_SOFTMAC=m
-CONFIG_IEEE80211_SOFTMAC_DEBUG=y
 CONFIG_CFG80211=m
 CONFIG_NL80211=y
+CONFIG_WIRELESS=y
+CONFIG_WIRELESS_OLD_REGULATORY=y
 CONFIG_WIRELESS_EXT=y
 CONFIG_WIRELESS_EXT_SYSFS=y
 
@@ -1348,6 +1360,8 @@
 CONFIG_LIBERTAS_CS=m
 CONFIG_LIBERTAS_SDIO=m
 CONFIG_LIBERTAS_DEBUG=y
+CONFIG_LIBERTAS_THINFIRM=m
+CONFIG_LIBERTAS_THINFIRM_USB=m
 CONFIG_IWLCORE=m
 CONFIG_IWLCORE_RFKILL=y
 CONFIG_IWLWIFI_LEDS=y
@@ -1457,7 +1471,7 @@
 CONFIG_BPQETHER=m
 CONFIG_SCC=m
 CONFIG_DMASCC=m
-# CONFIG_SCC_DELAY is not set
+CONFIG_SCC_DELAY=n
 CONFIG_SCC_TRXECHO=y
 CONFIG_BAYCOM_SER_FDX=m
 CONFIG_BAYCOM_SER_HDX=m
@@ -1685,6 +1699,7 @@
 
 CONFIG_INPUT_POWERMATE=m
 CONFIG_INPUT_YEALINK=m
+CONFIG_INPUT_CM109=m
 CONFIG_INPUT_POLLDEV=m
 
 #
@@ -1717,6 +1732,7 @@
 CONFIG_INPUT_MOUSE=y
 CONFIG_MOUSE_PS2=y
 # CONFIG_MOUSE_PS2_TOUCHKIT is not set
+# CONFIG_MOUSE_PS2_ELANTECH is not set
 CONFIG_MOUSE_SERIAL=m
 CONFIG_MOUSE_VSXXXAA=m
 CONFIG_MOUSE_APPLETOUCH=m
@@ -2077,6 +2093,11 @@
 CONFIG_RTC_DRV_V3020=m
 CONFIG_RTC_DRV_STK17TA8=m
 # CONFIG_RTC_DRV_S35390A is not set
+CONFIG_RTC_DRV_RX8581=m
+CONFIG_RTC_DRV_DS1286=m
+CONFIG_RTC_DRV_M48T35=m
+CONFIG_RTC_DRV_BQ4802=m
+CONFIG_RTC_DRV_WM8350=m
 
 CONFIG_DTLK=m
 CONFIG_R3964=m
@@ -2101,14 +2122,14 @@
 CONFIG_DRM_TDFX=m
 CONFIG_DRM_R128=m
 CONFIG_DRM_RADEON=m
-CONFIG_DRM_RADEON_KMS=y
+CONFIG_DRM_RADEON_KMS=n
 CONFIG_DRM_I810=m
 CONFIG_DRM_I830=m
 CONFIG_DRM_MGA=m
 CONFIG_DRM_SIS=m
 CONFIG_DRM_SAVAGE=m
 CONFIG_DRM_I915=m
-# CONFIG_DRM_I915_KMS is not set
+CONFIG_DRM_I915_KMS=n
 CONFIG_DRM_VIA=m
 CONFIG_DRM_NOUVEAU=m
 
@@ -2280,10 +2301,17 @@
 CONFIG_DVB_TDA1004X=m
 CONFIG_DVB_TUA6100=m
 CONFIG_DVB_TTUSB_DEC=m
+CONFIG_DVB_USB_CINERGY_T2=m
+CONFIG_DVB_USB_DTV5100=m
+CONFIG_DVB_USB_AF9015=m
 CONFIG_DVB_USB_ANYSEE=m
 CONFIG_DVB_USB_DW2102=m
 CONFIG_DVB_VES1820=m
 CONFIG_DVB_VES1X93=m
+CONFIG_DVB_DM1105=m
+CONFIG_DVB_LGS8GL5=m
+# CONFIG_DVB_DUMMY_FE is not set
+CONFIG_DVB_AF9013=m
 
 #
 # Supported SAA7146 based PCI Adapters
@@ -2430,10 +2458,16 @@
 # CONFIG_FB_UVESA is not set
 CONFIG_FB_VESA=y
 CONFIG_FB_VGA16=m
-# CONFIG_FB_VIRTUAL is not set
+CONFIG_FB_VIRTUAL=m
 CONFIG_FB_VOODOO1=m
 # CONFIG_FB_VT8623 is not set
 CONFIG_FB_EFI=y
+CONFIG_FB_VIA=m
+CONFIG_FB_METRONOME=m
+CONFIG_FB_MB862XX=m
+CONFIG_FB_MB862XX_PCI_GDC=y
+CONFIG_FB_MB862XX_LIME=y
+# CONFIG_FB_PRE_INIT_FB is not set
 
 # CONFIG_FIRMWARE_EDID is not set
 
@@ -2467,19 +2501,18 @@
 #
 # Advanced Linux Sound Architecture
 #
-CONFIG_SND=m
+CONFIG_SND=y
 # CONFIG_SND_DEBUG_VERBOSE is not set
 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_HRTIMER is not set
+CONFIG_SND_RTCTIMER=y
 CONFIG_SND_DYNAMIC_MINORS=y
 # CONFIG_SND_SUPPORT_OLD_API is not set
 
@@ -2494,7 +2527,7 @@
 CONFIG_SND_MPU401=m
 CONFIG_SND_PORTMAN2X4=m
 CONFIG_SND_AC97_POWER_SAVE=y
-CONFIG_SND_AC97_POWER_SAVE_DEFAULT=0
+CONFIG_SND_AC97_POWER_SAVE_DEFAULT=5
 
 CONFIG_SND_DRIVERS=y
 
@@ -2536,11 +2569,9 @@
 CONFIG_SND_ES1968=m
 CONFIG_SND_FM801=m
 CONFIG_SND_FM801_TEA575X_BOOL=y
-CONFIG_SND_HDA_INTEL=m
-CONFIG_SND_HDA_HWDEP=y
+CONFIG_SND_HDA_INTEL=y
 CONFIG_SND_HDA_INPUT_BEEP=y
-CONFIG_SND_HDA_CODEC_NVHDMI=y
-CONFIG_SND_HDA_CODEC_INTELHDMI=y
+CONFIG_SND_HDA_HWDEP=y
 CONFIG_SND_HDA_CODEC_REALTEK=y
 CONFIG_SND_HDA_CODEC_ANALOG=y
 CONFIG_SND_HDA_CODEC_SIGMATEL=y
@@ -2549,6 +2580,7 @@
 CONFIG_SND_HDA_CODEC_CONEXANT=y
 CONFIG_SND_HDA_CODEC_CMEDIA=y
 CONFIG_SND_HDA_CODEC_SI3054=y
+CONFIG_SND_HDA_CODEC_NVHDMI=y
 CONFIG_SND_HDA_GENERIC=y
 CONFIG_SND_HDA_POWER_SAVE=y
 CONFIG_SND_HDA_POWER_SAVE_DEFAULT=0
@@ -2556,7 +2588,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
@@ -2567,7 +2599,7 @@
 CONFIG_SND_NM256=m
 CONFIG_SND_OXYGEN=m
 CONFIG_SND_RME32=m
-# CONFIG_SND_PCSP is not set
+CONFIG_SND_PCSP=m
 CONFIG_SND_PCXHR=m
 CONFIG_SND_RIPTIDE=m
 CONFIG_SND_RME96=m
@@ -2615,7 +2647,7 @@
 # DEPRECATED: See bug 362221. Fix udev.
 # CONFIG_USB_DEVICE_CLASS is not set
 
-# CONFIG_USB_PERSIST is not set
+CONFIG_USB_PERSIST=y
 
 #
 # Miscellaneous USB options
@@ -2627,13 +2659,13 @@
 #
 # USB Host Controller Drivers
 #
-CONFIG_USB_EHCI_HCD=m
+CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_EHCI_SPLIT_ISO=y
 CONFIG_USB_EHCI_ROOT_HUB_TT=y
 CONFIG_USB_EHCI_TT_NEWSCHED=y
-CONFIG_USB_OHCI_HCD=m
+CONFIG_USB_OHCI_HCD=y
 # CONFIG_USB_OHCI_HCD_SSB is not set
-CONFIG_USB_UHCI_HCD=m
+CONFIG_USB_UHCI_HCD=y
 # CONFIG_USB_SL811_CS is not set
 # CONFIG_USB_R8A66597_HCD is not set
 
@@ -2647,6 +2679,7 @@
 CONFIG_USB_ACM=m
 CONFIG_USB_PRINTER=m
 CONFIG_USB_WDM=m
+CONFIG_USB_TMC=m
 # CONFIG_BLK_DEV_UB is not set
 CONFIG_USB_STORAGE=m
 # CONFIG_USB_STORAGE_DEBUG is not set
@@ -2678,6 +2711,7 @@
 CONFIG_HIDRAW=y
 CONFIG_HID_FF=y
 CONFIG_HID_PID=y
+# CONFIG_HID_COMPAT is not set
 CONFIG_LOGITECH_FF=y
 CONFIG_LOGIRUMBLEPAD2_FF=y
 CONFIG_PANTHERLORD_FF=y
@@ -2701,7 +2735,30 @@
 CONFIG_USB_VICAM=m
 CONFIG_USB_DSBR=m
 CONFIG_USB_ET61X251=m
+CONFIG_USB_M5602=m
 CONFIG_USB_GSPCA=m
+CONFIG_USB_GSPCA_CONEX=m
+CONFIG_USB_GSPCA_ETOMS=m
+CONFIG_USB_GSPCA_FINEPIX=m
+CONFIG_USB_GSPCA_MARS=m
+CONFIG_USB_GSPCA_OV519=m
+CONFIG_USB_GSPCA_OV534=m
+CONFIG_USB_GSPCA_PAC207=m
+CONFIG_USB_GSPCA_PAC7311=m
+CONFIG_USB_GSPCA_SONIXB=m
+CONFIG_USB_GSPCA_SONIXJ=m
+CONFIG_USB_GSPCA_SPCA500=m
+CONFIG_USB_GSPCA_SPCA501=m
+CONFIG_USB_GSPCA_SPCA505=m
+CONFIG_USB_GSPCA_SPCA506=m
+CONFIG_USB_GSPCA_SPCA508=m
+CONFIG_USB_GSPCA_SPCA561=m
+CONFIG_USB_GSPCA_STK014=m
+CONFIG_USB_GSPCA_SUNPLUS=m
+CONFIG_USB_GSPCA_T613=m
+CONFIG_USB_GSPCA_TV8532=m
+CONFIG_USB_GSPCA_VC032X=m
+CONFIG_USB_GSPCA_ZC3XX=m
 CONFIG_USB_IBMCAM=m
 CONFIG_USB_KONICAWC=m
 CONFIG_USB_OV511=m
@@ -2728,6 +2785,7 @@
 CONFIG_USB_SPEEDTOUCH=m
 CONFIG_USB_NET_AX8817X=m
 CONFIG_USB_NET_DM9601=m
+CONFIG_USB_NET_SMSC95XX=m
 CONFIG_USB_NET_GL620A=m
 CONFIG_USB_NET_NET1080=m
 CONFIG_USB_NET_PLUSB=m
@@ -2773,7 +2831,7 @@
 CONFIG_USB_SERIAL_EMPEG=m
 CONFIG_USB_SERIAL_FTDI_SIO=m
 CONFIG_USB_SERIAL_FUNSOFT=m
-# CONFIG_USB_SERIAL_GARMIN is not set
+CONFIG_USB_SERIAL_GARMIN=m
 CONFIG_USB_SERIAL_HP4X=m
 CONFIG_USB_SERIAL_IPAQ=m
 CONFIG_USB_SERIAL_IPW=m
@@ -2826,6 +2884,7 @@
 #
 
 CONFIG_USB_ADUTUX=m
+CONFIG_USB_SEVSEG=m
 CONFIG_USB_ALI_M5632=y
 CONFIG_USB_APPLEDISPLAY=m
 CONFIG_USB_ATM=m
@@ -2848,6 +2907,7 @@
 # CONFIG_USB_ISP1760_HCD is not set
 CONFIG_USB_IOWARRIOR=m
 CONFIG_USB_ISIGHTFW=m
+CONFIG_USB_VST=m
 CONFIG_USB_LCD=m
 CONFIG_USB_LD=m
 CONFIG_USB_LEGOTOWER=m
@@ -2864,6 +2924,7 @@
 CONFIG_USB_SISUSBVGA=m
 CONFIG_USB_SISUSBVGA_CON=y
 CONFIG_USB_SI470X=m
+CONFIG_USB_MR800=m
 CONFIG_USB_STKWEBCAM=m
 # CONFIG_USB_TEST is not set
 CONFIG_USB_TRANCEVIBRATOR=m
@@ -2872,7 +2933,7 @@
 CONFIG_USB_UVCVIDEO=m
 CONFIG_USB_W9968CF=m
 CONFIG_USB_XUSBATM=m
-# CONFIG_USB_ZC0301 is not set
+CONFIG_USB_ZC0301=n
 CONFIG_USB_ZERO=m
 
 CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
@@ -2900,11 +2961,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_EXT4_FS=m
 CONFIG_EXT4_FS_XATTR=y
@@ -2939,7 +3000,8 @@
 CONFIG_QFMT_V2=y
 CONFIG_QUOTACTL=y
 CONFIG_DNOTIFY=y
-CONFIG_AUTOFS_FS=m
+# Autofsv3 is obsolete.
+# CONFIG_AUTOFS_FS is not set
 CONFIG_AUTOFS4_FS=m
 
 #
@@ -3028,6 +3090,7 @@
 CONFIG_SUNRPC_BIND34=y
 CONFIG_SUNRPC_GSS=m
 CONFIG_SUNRPC_XPRT_RDMA=m
+CONFIG_SUNRPC_REGISTER_V4=y
 CONFIG_RPCSEC_GSS_KRB5=m
 CONFIG_RPCSEC_GSS_SPKM3=m
 # CONFIG_SMB_FS is not set
@@ -3061,6 +3124,7 @@
 CONFIG_OCFS2_FS_O2CB=m
 CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m
 # CONFIG_OCFS2_FS_STATS is not set
+# CONFIG_OCFS2_COMPAT_JBD is not set
 CONFIG_CONFIGFS_FS=m
 
 CONFIG_DLM=m
@@ -3266,6 +3330,8 @@
 CONFIG_CRYPTO_XTS=m
 CONFIG_CRYPTO_TEST=m
 CONFIG_LIBCRC32C=m
+CONFIG_CRYPTO_CRC32C_INTEL=m
+CONFIG_CRYPTO_ANSI_CPRNG=m
 CONFIG_CRYPTO_DEV_HIFN_795X=m
 CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y
 
@@ -3301,19 +3367,19 @@
 CONFIG_FB_RADEON_BACKLIGHT=y
 CONFIG_FB_ATY128_BACKLIGHT=y
 CONFIG_FB_ATY_BACKLIGHT=y
+# CONFIG_BACKLIGHT_SAHARA is not set
 
 CONFIG_LCD_CLASS_DEVICE=m
 CONFIG_LCD_PLATFORM=m
 
 CONFIG_SCHEDSTATS=y
 CONFIG_SCHED_DEBUG=y
-# CONFIG_FAIR_GROUP_SCHED is not set
+CONFIG_FAIR_GROUP_SCHED=y
 CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
-# CONFIG_GROUP_SCHED is not set
-# CONFIG_RT_GROUP_SCHED is not set
-# CONFIG_CGROUP_SCHED is not set
-# NOTE: Before changing the below, take notice that page struct will grow past a cacheline on 32bit.
-# CONFIG_CGROUP_MEM_RES_CTLR is not set
+CONFIG_GROUP_SCHED=y
+CONFIG_RT_GROUP_SCHED=y
+CONFIG_CGROUP_SCHED=y
+CONFIG_CGROUP_MEM_RES_CTLR=y
 
 CONFIG_CPUSETS=y
 CONFIG_CGROUPS=y
@@ -3321,6 +3387,7 @@
 CONFIG_CGROUP_NS=y
 CONFIG_CGROUP_CPUACCT=y
 CONFIG_CGROUP_DEVICE=y
+CONFIG_CGROUP_FREEZER=y
 CONFIG_PROC_PID_CPUSET=y
 
 # CONFIG_SYSFS_DEPRECATED is not set
@@ -3349,7 +3416,7 @@
 CONFIG_PM_DEBUG=y
 CONFIG_PM_TRACE=y
 # CONFIG_PM_VERBOSE is not set
-# CONFIG_PM_TEST_SUSPEND is not set
+CONFIG_PM_TEST_SUSPEND=y
 
 CONFIG_CRASH=m
 
@@ -3524,10 +3591,12 @@
 # CONFIG_LEDS_S3C24XX is not set
 # CONFIG_LEDS_SPITZ is not set
 # CONFIG_LEDS_TOSA is not set
+CONFIG_LEDS_HP_DISK=m
 CONFIG_LEDS_TRIGGERS=y
 CONFIG_LEDS_TRIGGER_TIMER=m
 CONFIG_LEDS_TRIGGER_IDE_DISK=y
 CONFIG_LEDS_TRIGGER_HEARTBEAT=m
+CONFIG_LEDS_TRIGGER_BACKLIGHT=m
 CONFIG_LEDS_TRIGGER_DEFAULT_ON=m
 
 CONFIG_DMADEVICES=y
@@ -3570,6 +3639,7 @@
 CONFIG_APM_POWER=m
 # CONFIG_BATTERY_DS2760 is not set
 CONFIG_BATTERY_PMU=m
+CONFIG_BATTERY_BQ27x00=m
 # CONFIG_PDA_POWER is not set
 
 CONFIG_AUXDISPLAY=y
@@ -3579,6 +3649,7 @@
 CONFIG_UIO_SMX=m
 CONFIG_UIO_PDRV=m
 CONFIG_UIO_PDRV_GENIRQ=m
+CONFIG_UIO_SERCOS3=m
 
 CONFIG_INSTRUMENTATION=y
 CONFIG_MARKERS=y
@@ -3633,6 +3704,7 @@
 CONFIG_I8K=m
 CONFIG_ACER_WMI=m
 CONFIG_EDAC_I3000=m
+CONFIG_EDAC_X38=m
 CONFIG_INPUT_APANEL=m
 
 # CONFIG_INTEL_MENLOW is not set
@@ -3667,3 +3739,74 @@
 # CONFIG_GPIOLIB is not set
 
 CONFIG_HP_WMI=m
+
+CONFIG_UNEVICTABLE_LRU=y
+
+CONFIG_NETFILTER_TPROXY=m
+CONFIG_NETFILTER_XT_TARGET_TPROXY=m
+CONFIG_NETFILTER_XT_MATCH_RECENT=m
+# CONFIG_NETFILTER_XT_MATCH_RECENT_PROC_COMPAT is not set
+CONFIG_NETFILTER_XT_MATCH_SOCKET=m
+
+# CONFIG_IP_VS_IPV6 is not set
+
+CONFIG_NET_DSA=y
+CONFIG_NET_DSA_MV88E6060=y
+CONFIG_NET_DSA_MV88E6131=y
+CONFIG_NET_DSA_MV88E6123_61_65=y
+
+CONFIG_NET_SCH_MULTIQ=m
+CONFIG_NET_ACT_SKBEDIT=m
+
+CONFIG_PHONET=m
+
+CONFIG_ICS932S401=m
+# CONFIG_C2PORT is not set
+CONFIG_W1_SLAVE_BQ27000=m
+
+CONFIG_SENSORS_ADT7462=m
+CONFIG_SENSORS_LIS3LV02D=m
+
+CONFIG_IT87_WDT=m
+CONFIG_W83697UG_WDT=m
+
+CONFIG_MFD_WM8400=m
+CONFIG_MFD_WM8350_I2C=m
+
+CONFIG_REGULATOR=y
+# CONFIG_REGULATOR_DEBUG is not set
+# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set
+CONFIG_REGULATOR_BQ24022=m
+CONFIG_REGULATOR_WM8350=m
+CONFIG_REGULATOR_WM8400=m
+CONFIG_REGULATOR_DA903X=m
+
+# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
+
+CONFIG_SOC_CAMERA_MT9M111=m
+
+CONFIG_USB_WUSB=m
+CONFIG_USB_WUSB_CBAF=m
+# CONFIG_USB_WUSB_CBAF_DEBUG is not set
+CONFIG_USB_WHCI_HCD=m
+CONFIG_USB_HWA_HCD=m
+
+CONFIG_UWB=m
+CONFIG_UWB_HWA=m
+CONFIG_UWB_WHCI=m
+CONFIG_UWB_WLP=m
+CONFIG_UWB_I1480U=m
+CONFIG_UWB_I1480U_WLP=m
+
+# CONFIG_STAGING is not set
+
+# CONFIG_DEBUG_VIRTUAL is not set
+# CONFIG_RCU_CPU_STALL_DETECTOR is not set
+# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
+# CONFIG_FUNCTION_TRACER is not set
+# CONFIG_BOOT_TRACER is not set
+# CONFIG_STACK_TRACER is not set
+# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
+CONFIG_EARLY_PRINTK_DBGP=y
+
+CONFIG_SECURITYFS=y


Index: config-i686
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/config-i686,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- config-i686	30 Oct 2008 10:02:44 -0000	1.4
+++ config-i686	12 Jan 2009 19:54:16 -0000	1.5
@@ -3,7 +3,6 @@
 CONFIG_HIGHMEM4G=y
 # CONFIG_HIGHMEM64G is not set
 
-# temporarily disable padlock until bugs are fixed
-# CONFIG_CRYPTO_DEV_PADLOCK is not set
+CONFIG_CRYPTO_DEV_PADLOCK=m
 CONFIG_CRYPTO_DEV_PADLOCK_AES=m
 CONFIG_CRYPTO_DEV_PADLOCK_SHA=m


Index: config-ia64-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/config-ia64-generic,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- config-ia64-generic	30 Oct 2008 04:41:11 -0000	1.12
+++ config-ia64-generic	12 Jan 2009 19:54:16 -0000	1.13
@@ -207,3 +207,6 @@
 
 CONFIG_SYSFS_DEPRECATED=y
 CONFIG_SYSFS_DEPRECATED_V2=y
+
+CONFIG_PARAVIRT_GUEST=y
+CONFIG_PARAVIRT=y


Index: config-nodebug
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/config-nodebug,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- config-nodebug	30 Oct 2008 04:41:11 -0000	1.15
+++ config-nodebug	12 Jan 2009 19:54:16 -0000	1.16
@@ -2,42 +2,43 @@
 CONFIG_SND_DEBUG=y
 CONFIG_SND_PCM_XRUN_DEBUG=y
 
-# CONFIG_DEBUG_MUTEXES is not set
-# CONFIG_DEBUG_RT_MUTEXES is not set
-# CONFIG_DEBUG_LOCK_ALLOC is not set
-# CONFIG_PROVE_LOCKING is not set
-# CONFIG_DEBUG_VM is not set
-# CONFIG_DEBUG_SPINLOCK is not set
-
-# CONFIG_FAULT_INJECTION is not set
-# CONFIG_FAILSLAB is not set
-# CONFIG_FAIL_PAGE_ALLOC is not set
-# CONFIG_FAIL_MAKE_REQUEST is not set
-# CONFIG_FAULT_INJECTION_DEBUG_FS is not set
-# CONFIG_FAULT_INJECTION_STACKTRACE_FILTER is not set
+CONFIG_DEBUG_MUTEXES=y
+CONFIG_DEBUG_RT_MUTEXES=y
+CONFIG_DEBUG_LOCK_ALLOC=y
+CONFIG_PROVE_LOCKING=y
+CONFIG_DEBUG_VM=y
+CONFIG_DEBUG_SPINLOCK=y
+
+CONFIG_FAULT_INJECTION=y
+CONFIG_FAILSLAB=y
+CONFIG_FAIL_PAGE_ALLOC=y
+CONFIG_FAIL_MAKE_REQUEST=y
+CONFIG_FAULT_INJECTION_DEBUG_FS=y
+CONFIG_FAULT_INJECTION_STACKTRACE_FILTER=y
+# CONFIG_FAIL_IO_TIMEOUT is not set
 
-# CONFIG_SLUB_DEBUG_ON is not set
+CONFIG_SLUB_DEBUG_ON=y
 
-# CONFIG_LOCK_STAT is not set
+CONFIG_LOCK_STAT=y
 
-# CONFIG_DEBUG_STACK_USAGE is not set
+CONFIG_DEBUG_STACK_USAGE=y
 
 # CONFIG_ACPI_DEBUG is not set
 
-# CONFIG_DEBUG_SG is not set
+CONFIG_DEBUG_SG=y
 
-# CONFIG_DEBUG_PAGEALLOC is not set
+CONFIG_DEBUG_PAGEALLOC=y
 
-# CONFIG_DEBUG_WRITECOUNT is not set
-# CONFIG_DEBUG_OBJECTS is not set
+CONFIG_DEBUG_WRITECOUNT=y
+CONFIG_DEBUG_OBJECTS=y
 # CONFIG_DEBUG_OBJECTS_SELFTEST is not set
-# CONFIG_DEBUG_OBJECTS_FREE is not set
-# CONFIG_DEBUG_OBJECTS_TIMERS is not set
+CONFIG_DEBUG_OBJECTS_FREE=y
+CONFIG_DEBUG_OBJECTS_TIMERS=y
 
-# CONFIG_X86_PTDUMP is not set
+CONFIG_X86_PTDUMP=y
 
-# CONFIG_CAN_DEBUG_DEVICES is not set
+CONFIG_CAN_DEBUG_DEVICES=y
 
-# CONFIG_MODULE_FORCE_UNLOAD is not set
+CONFIG_MODULE_FORCE_UNLOAD=y
 
-# CONFIG_SYSCTL_SYSCALL_CHECK is not set
+CONFIG_SYSCTL_SYSCALL_CHECK=y


Index: config-powerpc-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/config-powerpc-generic,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- config-powerpc-generic	30 Oct 2008 04:41:11 -0000	1.19
+++ config-powerpc-generic	12 Jan 2009 19:54:16 -0000	1.20
@@ -253,3 +253,27 @@
 CONFIG_SERIO_XILINX_XPS_PS2=m
 
 # CONFIG_PPC_SMLPAR is not set
+
+CONFIG_MGCOGE=y
+CONFIG_GEF_SBC610=y
+CONFIG_QUICC_ENGINE=y
+CONFIG_QE_GPIO=y
+CONFIG_MPC8xxx_GPIO=y
+
+CONFIG_IDE_GD=m
+CONFIG_IDE_GD_ATA=y
+CONFIG_IDE_GD_ATAPI=y
+
+CONFIG_MCU_MPC8349EMITX=m
+
+CONFIG_GPIO_XILINX=y
+
+CONFIG_UCB1400_CORE=m
+
+CONFIG_PMIC_DA903X=y
+CONFIG_BACKLIGHT_DA903X=m
+CONFIG_LEDS_DA903X=m
+
+CONFIG_MSI_BITMAP_SELFTEST=y
+
+CONFIG_RELOCATABLE=y


Index: config-rhel-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/config-rhel-generic,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- config-rhel-generic	30 Oct 2008 04:41:11 -0000	1.12
+++ config-rhel-generic	12 Jan 2009 19:54:16 -0000	1.13
@@ -50,6 +50,8 @@
 # CONFIG_DEPCA is not set
 # CONFIG_ATP is not set
 
+# CONFIG_TR is not set
+
 # CONFIG_GAMEPORT is not set
 
 # CONFIG_SND_AD1816A is not set
@@ -90,6 +92,12 @@
 # CONFIG_DRM_SIS is not set
 
 # CONFIG_BLK_DEV_UMEM is not set
+# CONFIG_BLK_DEV_NBD is not set
+# CONFIG_BLK_DEV_DAC960 is not set
+
+# CONFIG_PARIDE is not set
+
+# CONFIG_I2O is not set
 
 # CONFIG_MWAVE is not set
 
@@ -184,7 +192,6 @@
 # CONFIG_FB_3DFX_ACCEL is not set
 # CONFIG_FB_TRIDENT_ACCEL is not set
 
-# CONFIG_AUTOFS_FS is not set
 # CONFIG_JFS_FS is not set
 # CONFIG_NCP_FS is not set
 # CONFIG_CODA_FS is not set
@@ -201,4 +208,6 @@
 # CONFIG_MINIX_FS is not set
 # CONFIG_9P_FS is not set
 # CONFIG_OCFS2_FS is not set
+# CONFIG_HFS_FS is not set
+# CONFIG_HFSPLUS_FS is not set
 


Index: config-s390x
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/config-s390x,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- config-s390x	30 Oct 2008 04:41:11 -0000	1.6
+++ config-s390x	12 Jan 2009 19:54:16 -0000	1.7
@@ -216,3 +216,5 @@
 # drivers/isdn/hardware/mISDN/hfcmulti.c:5255:2: error: #error "not running on big endian machines now"
 # CONFIG_MISDN_HFCMULTI is not set
 
+# CONFIG_CRASH is not set
+


Index: config-sparc64-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/config-sparc64-generic,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- config-sparc64-generic	30 Oct 2008 04:41:11 -0000	1.18
+++ config-sparc64-generic	12 Jan 2009 19:54:16 -0000	1.19
@@ -195,3 +195,8 @@
 
 # drivers/isdn/hardware/mISDN/hfcmulti.c:5255:2: error: #error "not running on big endian machines now"
 # CONFIG_MISDN_HFCMULTI is not set
+
+CONFIG_US3_MC=y
+CONFIG_SENSORS_ULTRA45=m
+CONFIG_LEDS_SUNFIRE=m
+CONFIG_TADPOLE_TS102_UCTRL=m


Index: config-x86-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/config-x86-generic,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- config-x86-generic	17 Nov 2008 15:12:06 -0000	1.38
+++ config-x86-generic	12 Jan 2009 19:54:16 -0000	1.39
@@ -76,7 +76,6 @@
 CONFIG_MTRR=y
 CONFIG_X86_PAT=y
 CONFIG_X86_PM_TIMER=y
-CONFIG_X86_RESERVE_LOW_64K=y
 
 CONFIG_EFI=y
 CONFIG_EFI_VARS=y
@@ -188,7 +187,7 @@
 CONFIG_X86_SPEEDSTEP_SMI=y
 CONFIG_X86_SPEEDSTEP_LIB=y
 # CONFIG_X86_SPEEDSTEP_RELAXED_CAP_CHECK is not set
-# CONFIG_X86_P4_CLOCKMOD is not set
+CONFIG_X86_P4_CLOCKMOD=m
 CONFIG_X86_LONGRUN=y
 # CONFIG_X86_LONGHAUL is not set
 # CONFIG_X86_CPUFREQ_NFORCE2 is not set
@@ -238,10 +237,6 @@
 # CONFIG_HOTPLUG_PCI_SHPC is not set
 CONFIG_PM=y
 
-CONFIG_IEEE80211=m
-# CONFIG_IEEE80211_DEBUG is not set
-CONFIG_IEEE80211_CRYPT_CCMP=m
-CONFIG_IEEE80211_CRYPT_TKIP=m
 CONFIG_IPW2100=m
 CONFIG_IPW2100_MONITOR=y
 CONFIG_IPW2200=m
@@ -397,6 +392,7 @@
 
 CONFIG_OLPC=y
 CONFIG_BATTERY_OLPC=y
+CONFIG_MOUSE_PS2_OLPC=y
 
 CONFIG_STRICT_DEVMEM=y
 
@@ -415,3 +411,17 @@
 CONFIG_HP_ILO=m
 
 CONFIG_BACKLIGHT_MBP_NVIDIA=m
+
+CONFIG_OPROFILE_IBS=y
+CONFIG_MICROCODE_INTEL=y
+CONFIG_MICROCODE_AMD=y
+
+# CONFIG_X86_CHECK_BIOS_CORRUPTION is not set
+CONFIG_X86_RESERVE_LOW_64K=y
+
+# CONFIG_CMDLINE_BOOL is not set
+
+CONFIG_PANASONIC_LAPTOP=m
+
+CONFIG_XEN_DEBUG_FS=y
+CONFIG_X86_PTRACE_BTS=y


Index: config-x86_64-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/config-x86_64-generic,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- config-x86_64-generic	12 Jan 2009 03:30:33 -0000	1.39
+++ config-x86_64-generic	12 Jan 2009 19:54:16 -0000	1.40
@@ -10,10 +10,10 @@
 CONFIG_K8_NUMA=y
 CONFIG_X86_64_ACPI_NUMA=y
 # CONFIG_NUMA_EMU is not set
-CONFIG_NR_CPUS=64
+CONFIG_NR_CPUS=512
 CONFIG_X86_POWERNOW_K8=m
 CONFIG_X86_POWERNOW_K8_ACPI=y
-# CONFIG_X86_P4_CLOCKMOD is not set
+CONFIG_X86_P4_CLOCKMOD=m 
 CONFIG_IA32_EMULATION=y
 # CONFIG_IA32_AOUT is not set
 # CONFIG_IOMMU_DEBUG is not set
@@ -123,10 +123,6 @@
 # CONFIG_HPET_RTC_IRQ is not set
 CONFIG_PM=y
 
-CONFIG_IEEE80211=m
-# CONFIG_IEEE80211_DEBUG is not set
-CONFIG_IEEE80211_CRYPT_CCMP=m
-CONFIG_IEEE80211_CRYPT_TKIP=m
 CONFIG_IPW2100=m
 CONFIG_IPW2100_MONITOR=y
 CONFIG_IPW2200=m
@@ -297,7 +293,6 @@
 # FIXME: These should be 32bit only
 # CONFIG_FB_N411 is not set
 CONFIG_STRICT_DEVMEM=y
-CONFIG_X86_RESERVE_LOW_64K=y
 
 CONFIG_DIRECT_GBPAGES=y
 
@@ -314,3 +309,20 @@
 CONFIG_X86_MPPARSE=y
 
 CONFIG_BACKLIGHT_MBP_NVIDIA=m
+
+CONFIG_OPROFILE_IBS=y
+CONFIG_MICROCODE_INTEL=y
+CONFIG_MICROCODE_AMD=y
+
+# CONFIG_X86_CHECK_BIOS_CORRUPTION is not set
+CONFIG_X86_RESERVE_LOW_64K=y
+
+# CONFIG_CMDLINE_BOOL is not set
+
+CONFIG_PANASONIC_LAPTOP=m
+
+CONFIG_XEN_DEBUG_FS=y
+CONFIG_X86_PTRACE_BTS=y
+
+CONFIG_I7300_IDLE=m
+CONFIG_INTR_REMAP=y


View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.891 -r 1.892 kernel.spec
Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/kernel.spec,v
retrieving revision 1.891
retrieving revision 1.892
diff -u -r1.891 -r1.892
--- kernel.spec	12 Jan 2009 03:30:33 -0000	1.891
+++ kernel.spec	12 Jan 2009 19:54:17 -0000	1.892
@@ -20,7 +20,7 @@
 # kernel spec when the kernel is rebased, so fedora_build automatically
 # works out to the offset from the rebase, so it doesn't get too ginormous.
 #
-%define fedora_cvs_origin   813
+%define fedora_cvs_origin   1180
 %define fedora_build_string %(R="$Revision$"; R="${R%% \$}"; R="${R#: 1.}"; echo $R)
 %define fedora_build_origin %(R=%{fedora_build_string}; R="${R%%%%.*}"; echo $R)
 %define fedora_build_prefix %(expr %{fedora_build_origin} - %{fedora_cvs_origin})
@@ -30,13 +30,13 @@
 # base_sublevel is the kernel version we're starting with and patching
 # on top of -- for example, 2.6.22-rc7-git1 starts with a 2.6.21 base,
 # which yields a base_sublevel of 21.
-%define base_sublevel 27
+%define base_sublevel 28
 
 ## If this is a released kernel ##
 %if 0%{?released_kernel}
 
 # Do we have a -stable update to apply?
-%define stable_update 10
+%define stable_update 0
 # Is it a -stable RC?
 %define stable_rc 0
 # Set rpm version accordingly
@@ -78,8 +78,6 @@
 %define with_smp       %{?_without_smp:       0} %{?!_without_smp:       1}
 # kernel-PAE (only valid for i686)
 %define with_pae       %{?_without_pae:       0} %{?!_without_pae:       1}
-# kernel-xen
-%define with_xen       %{?_without_xen:       0} %{?!_without_xen:       1}
 # kernel-kdump
 %define with_kdump     %{?_without_kdump:     0} %{?!_without_kdump:     1}
 # kernel-debug
@@ -89,11 +87,22 @@
 # kernel-headers
 %define with_headers   %{?_without_headers:   0} %{?!_without_headers:   1}
 # kernel-firmware
-%define with_firmware  %{?_with_firmware:     1} %{?!_with_firmware:     0}
+%define with_firmware  %{?_with_firmware:  1} %{?!_with_firmware:  0}
 # kernel-debuginfo
 %define with_debuginfo %{?_without_debuginfo: 0} %{?!_without_debuginfo: 1}
 # kernel-bootwrapper (for creating zImages from kernel + initrd)
 %define with_bootwrapper %{?_without_bootwrapper: 0} %{?!_without_bootwrapper: 1}
+# Want to build a the vsdo directories installed
+%define with_vdso_install %{?_without_vdso_install: 0} %{?!_without_vdso_install: 1}
+
+# Build the kernel-doc package, but don't fail the build if it botches.
+# Here "true" means "continue" and "false" means "fail the build".
+#% define with_doc 0
+%if 0%{?released_kernel}
+%define doc_build_fail false
+%else
+%define doc_build_fail true
+%endif
 
 # Additional options for user-friendly one-off kernel building:
 #
@@ -103,21 +112,14 @@
 %define with_smponly   %{?_with_smponly:      1} %{?!_with_smponly:      0}
 # Only build the pae kernel (--with paeonly):
 %define with_paeonly   %{?_with_paeonly:      1} %{?!_with_paeonly:      0}
-# Only build the xen kernel (--with xenonly):
-%define with_xenonly   %{?_with_xenonly:      1} %{?!_with_xenonly:      0}
 
 # should we do C=1 builds with sparse
 %define with_sparse	%{?_with_sparse:      1} %{?!_with_sparse:      0}
 
-# Whether or not to apply the Xen patches -- leave this enabled
-%define includexen 0
-# Xen doesn't work with current upstream kernel, shut it off
-%define with_xen 0
-
 # Set debugbuildsenabled to 1 for production (build separate debug kernels)
 #  and 0 for rawhide (all kernels are debug kernels).
 # See also 'make debug' and 'make release'.
-%define debugbuildsenabled 1
+%define debugbuildsenabled 0
 
 # Want to build a vanilla kernel build without any non-upstream patches?
 # (well, almost none, we need nonintconfig for build purposes). Default to 0 (off).
@@ -152,11 +154,6 @@
 
 %define make_target bzImage
 
-%define xen_hv_cset 11633
-%define xen_flags verbose=y crash_debug=y
-%define xen_target vmlinuz
-%define xen_image vmlinuz
-
 %define KVERREL %{PACKAGE_VERSION}-%{PACKAGE_RELEASE}.%{_target_cpu}
 %define hdrarch %_target_cpu
 %define asmarch %_target_cpu
@@ -170,8 +167,6 @@
 %endif
 
 %if %{nopatches}
-%define includexen 0
-%define with_xen 0
 %define with_bootwrapper 0
 %define variant -vanilla
 %else
@@ -199,7 +194,6 @@
 %if %{with_baseonly}
 %define with_smp 0
 %define with_pae 0
-%define with_xen 0
 %define with_kdump 0
 %define with_debug 0
 %endif
@@ -208,7 +202,6 @@
 %if %{with_smponly}
 %define with_up 0
 %define with_pae 0
-%define with_xen 0
 %define with_kdump 0
 %define with_debug 0
 %endif
@@ -217,24 +210,16 @@
 %if %{with_paeonly}
 %define with_up 0
 %define with_smp 0
-%define with_xen 0
-%define with_kdump 0
-%define with_debug 0
-%endif
-
-# if requested, only build xen kernel
-%if %{with_xenonly}
-%define with_up 0
-%define with_smp 0
-%define with_pae 0
 %define with_kdump 0
 %define with_debug 0
 %endif
 
 %define all_x86 i386 i586 i686
 
+%if %{with_vdso_install}
 # These arches install vdso/ directories.
 %define vdso_arches %{all_x86} x86_64 ppc ppc64
+%endif
 
 # Overrides for generic default options
 
@@ -248,16 +233,12 @@
 %define with_pae 0
 %endif
 
-# xen only builds on i686, x86_64 and ia64
-%ifnarch i686 x86_64 ia64
-%define with_xen 0
-%endif
-
 # 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
@@ -276,7 +257,6 @@
 %endif
 
 # don't build noarch kernels or headers (duh)
-# build firmware noarch unless overridden
 %ifarch noarch
 %define with_up 0
 %define with_headers 0
@@ -297,12 +277,10 @@
 # Per-arch tweaks
 
 %ifarch %{all_x86}
+%define asmarch x86
+%define hdrarch i386
 %define all_arch_configs kernel-%{version}-i?86*.config
 %define image_install_path boot
-%define hdrarch i386
-%define asmarch x86
-# we build always xen i686 HV with pae
-%define xen_flags verbose=y crash_debug=y pae=y
 %define kernel_image arch/x86/boot/bzImage
 %endif
 
@@ -314,20 +292,22 @@
 %endif
 
 %ifarch ppc64
[...4946 lines suppressed...]
-* Fri Dec 07 2007 Peter Jones <pjones at redhat.com>
-- Turn on CONFIG_FB_IMAC .
-
-* Fri Dec 07 2007 Dave Jones <davej at redhat.com>
-- 2.6.24-rc4-git5
-
-* Thu Dec 06 2007 Dave Jones <davej at redhat.com>
-- 2.6.24-rc4-git4
-
-* Wed Dec 05 2007 Dave Jones <davej at redhat.com>
-- 2.6.24-rc4-git3
-
-* Wed Dec 05 2007 Dave Jones <davej at redhat.com>
-- Don't do sparse builds by default.
-  The output is rarely looked at, and it adds time to the build.
-
-* Wed Dec 05 2007 Kyle McMartin <kmcmartin at redhat.com>
-- 2.6.24-rc4-git2
-- remove linux-2.6-pasemi-mac.patch, merged into -git2
-- remove linux-2.6-fec_mpc52xx-fix.patch, merged into -git2
-
-* Tue Dec 04 2007 Dave Jones <davej at redhat.com>
-- 2.6.24-rc4-git1
-
-* Tue Dec 04 2007 John W. Linville <linville at redhat.com>
-- Some wireless driver bits headed for 2.6.25
-
-* Mon Dec 04 2007 David Woodhouse <dwmw2 at redhat.com>
-- Fix HW csum on pasemi_mac
-- Fix i2c bus reservation on pasemi
-
-* Mon Dec 03 2007 Kyle McMartin <kmcmartin at redhat.com>
-- Linux 2.6.24-rc4
-
-* Mon Dec 03 2007 Dave Jones <davej at redhat.com>
-- Enable telclock.
-
-* Mon Dec 03 2007 David Woodhouse <dwmw2 at redhat.com>
-- Add kernel-bootwrapper subpackage for building PowerPC zImages
-- PA Semi updates destined for 2.6.25 (RTC, MDIO, etc.)
-- Remove obsolete pmac_zilog patch, unset CONFIG_SERIAL_PMACZILOG_TTYS
-- Switch to generic RTC class (again)
-
-* Mon Dec 03 2007 Kyle McMartin <kmcmartin at redhat.com>
-- 2.6.24-rc3-git7
-- turn off linux-2.6-wireless.patch, merged into -git7
-- remove linux-2.6-phy-ioctl-fix.patch, merged into -git7
-- remove SET_NETDEV hunk in linux-2.6-fec_mpc52xx-fix.patch, merged in -git7
-
-* Mon Dec 03 2007 Jarod Wilson <jwilson at redhat.com>
-- Fix regression on FireWire OHCI 1.1 controllers introduced
-  by 1.0 support (#344851)
-
-* Mon Dec 03 2007 David Woodhouse <dwmw2 at redhat.com>
-- Enable PASemi support
-
-* Sat Dec 01 2007 Dave Jones <davej at redhat.com>
-- 2.6.24-rc3-git6
-
-* Sat Dec 01 2007 John W. Linville <linville at redhat.com>
-- Some wireless bits headed for 2.6.25
-- Make ath5k use software WEP
-
-* Fri Nov 30 2007 Kyle McMartin <kmcmartin at redhat.com>
-- Oops! Local make-build-go-faster kernel.spec patch slipped in,
-  reverted.
-
-* Fri Nov 30 2007 Jarod Wilson <jwilson at redhat.com>
-- FireWire OHCI 1.0 Isochronous Receive support (#344851)
-
-* Fri Nov 30 2007 John W. Linville <linville at redhat.com>
-- Some wireless bits headed for 2.6.24
-
-* Fri Nov 30 2007 Kyle McMartin <kmcmartin at redhat.com>
-- 2.6.24-rc3-git5
-
-* Thu Nov 29 2007 Dave Jones <davej at redhat.com>
-- 2.6.24-rc3-git4
-
-* Thu Nov 29 2007 John W. Linville <linville at redhat.com>
-- Resync wireless bits headed for 2.6.25
-
-* Thu Nov 29 2007 Dave Airlie <airlied at linux.ie>
-- update drm-mm-git.patch to fix 64-bit truncation
-
-* Thu Nov 29 2007 Dave Airlie <airlied at linux.ie>
-- update drm-mm-git.patch to enable sysfs udev device creation (#401961)
-
-* Wed Nov 28 2007 Kyle McMartin <kmcmartin at redhat.com>
-- Update linux-2.6-debug-acpi-os-write-port.patch for changes to
-  drivers/acpi/osl.c
-
-* Wed Nov 28 2007 Chuck Ebbert <cebbert at redhat.com>
-- Add support for SiS 7019 audio for K12LTSP project
-
-* Wed Nov 28 2007 David Woodhouse <dwmw2 at redhat.com>
-- Fix phy code to not return success to unknown ioctls
-
-* Wed Nov 28 2007 David Woodhouse <dwmw2 at redhat.com>
-- Fix net: symlink in sysfs for fec_mpc52xx
-
-* Wed Nov 28 2007 Kyle McMartin <kmcmartin at redhat.com>
-- 2.6.24-rc3-git3
-
-* Tue Nov 27 2007 Kyle McMartin <kmcmartin at redhat.com>
-- Some USB disks spin themselves down automatically and need
-  scsi_device.allow_restart enabled so they'll spin back up.
-
-* Tue Nov 27 2007 John W. Linville <linville at redhat.com>
-- Fix NULL ptr reference in iwlwifi (CVE-2007-5938)
-
-* Tue Nov 27 2007 Dave Jones <davej at redhat.com>
-- 2.6.24-rc3-git2
-
-* Tue Nov 27 2007 Kyle McMartin <kmcmartin at redhat.com>
-- Slurp up drm-mm/agp-mm from git.
-
-* Mon Nov 26 2007 David Woodhouse <dwmw2 at redhat.com>
-- Build libertas wireless driver
-- Include flash translation layers in modules.block list
-
-* Sat Nov 24 2007 David Woodhouse <dwmw2 at redhat.com>
-- Fix fec_mpc52xx Ethernet driver to use the right skbs
-
-* Wed Nov 21 2007 John W. Linville <linville at redhat.com>
-- Resync wireless bits from upstream
-
-* Wed Nov 21 2007 David Woodhouse <dwmw2 at redhat.com>
-- Fix <linux/kd.h> in userspace.
-
-* Sun Nov 18 2007 Kyle McMartin <kmcmartin at redhat.com>
-- 2.6.24-rc3-git1
-
-* Fri Nov 16 2007 Dave Jones <davej at redhat.com>
-- 2.6.24-rc2-git6
-
-* Thu Nov 15 2007 Chuck Ebbert <cebbert at redhat.com>
-- Add DMI based autoloading for the Dell dcdbas driver (#248257)
-
-* Thu Nov 15 2007 Dave Jones <davej at redhat.com>
-- Change 'make prep' so that vanilla/ is always the latest upstream.
-
-* Thu Nov 15 2007 Dave Jones <davej at redhat.com>
-- 2.6.24-rc2-git5
-
-* Wed Nov 14 2007 Dave Jones <davej at redhat.com>
-- Reenable sparse checking, v0.4.1 is available.
-
-* Wed Nov 14 2007 Dave Jones <davej at redhat.com>
-- 2.6.24-rc2-git4
-
-* Tue Nov 13 2007 Dave Jones <davej at redhat.com>
-- Disable CONFIG_SECURITY_SELINUX_AVC_STATS in production builds.
-
-* Mon Nov 12 2007 Roland McGrath <roland at redhat.com>
-- utrace rebased
-
-* Sun Nov 11 2007 Dave Jones <davej at redhat.com>
-- 2.6.24-rc2-git2
-
-* Wed Nov 07 2007 Dave Jones <davej at redhat.com>
-- 2.6.24-rc2
-
-* Mon Nov 05 2007 Dave Jones <davej at redhat.com>
-- 2.6.24-rc1-git14
-
-* Wed Oct 31 2007 Dave Jones <davej at redhat.com>
-- 2.6.24-rc1-git8
-
-* Mon Oct 29 2007 Dave Jones <davej at redhat.com>
-- 2.6.24-rc1-git5
-
-* Mon Oct 29 2007 Chuck Ebbert <cebbert at redhat.com>
-- Enable hamradio drivers.
-
-* Mon Oct 22 2007 Dave Jones <davej at redhat.com>
-- 2.6.23-git17
-
-* Thu Oct 18 2007 John W. Linville <linville at redhat.com>
-- Latest wireless updates from upstream
-- Update rt2x00 to 2.0.11
-- Convert some wireless drivers to use round_jiffies_relative
-
-* Wed Oct 17 2007 Dave Jones <davej at redhat.com>
-- 2.6.23-git12
 
-* Mon Oct 15 2007 Dave Jones <davej at redhat.com>
-- Work around E1000 corrupt EEPROM problem.
+* Fri May 09 2008 John W. Linville <linville at redhat.com> 2.6.25.2-7
+- Regroup wireless patches as prep for 2.6.26 and F10 cycles
 
-* Fri Oct 12 2007 Dave Jones <davej at redhat.com>
-- 2.6.23-git2
+* Fri May 09 2008 Eric Paris <eparis at redhat.com>
+- support deffered context validation in selinux.  aka rpm can lay down illegal labels. (won't upstream until .27 opens)
 
-* Fri Oct 12 2007 Dave Jones <davej at redhat.com>
-- Start F9 branch.
+* Wed May 07 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.25.2-5
+- Add the patches queued for 2.6.25.3

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.165
retrieving revision 1.166
diff -u -r1.165 -r1.166
--- linux-2.6-compile-fixes.patch	30 Oct 2008 06:04:35 -0000	1.165
+++ linux-2.6-compile-fixes.patch	12 Jan 2009 19:54:17 -0000	1.166
@@ -11,14 +11,15 @@
 Signed-off-by: Dave Jones <davej at redhat.com>
 
 diff --git a/arch/powerpc/sysdev/fsl_lbc.c b/arch/powerpc/sysdev/fsl_lbc.c
-index 422c8fa..1c6c522 100644
+index 0494ee5..43a9e56 100644
 --- a/arch/powerpc/sysdev/fsl_lbc.c
 +++ b/arch/powerpc/sysdev/fsl_lbc.c
-@@ -16,6 +16,7 @@
+@@ -23,6 +23,8 @@
  #include <asm/fsl_lbc.h>
  
- spinlock_t fsl_lbc_lock = __SPIN_LOCK_UNLOCKED(fsl_lbc_lock);
+ static spinlock_t fsl_lbc_lock = __SPIN_LOCK_UNLOCKED(fsl_lbc_lock);
 +EXPORT_SYMBOL(fsl_lbc_lock);
++
+ static struct fsl_lbc_regs __iomem *fsl_lbc_regs;
  
- struct fsl_lbc_regs __iomem *fsl_lbc_regs;
- EXPORT_SYMBOL(fsl_lbc_regs);
+ static char __initdata *compat_lbc[] = {

linux-2.6-crash-driver.patch:

Index: linux-2.6-crash-driver.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/linux-2.6-crash-driver.patch,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- linux-2.6-crash-driver.patch	12 Feb 2008 06:18:04 -0000	1.11
+++ linux-2.6-crash-driver.patch	12 Jan 2009 19:54:17 -0000	1.12
@@ -1,7 +1,104 @@
-diff -urNp --exclude-from=/home/davej/.exclude linux-1050/arch/ia64/kernel/ia64_ksyms.c linux-1060/arch/ia64/kernel/ia64_ksyms.c
---- linux-1050/arch/ia64/kernel/ia64_ksyms.c
-+++ linux-1060/arch/ia64/kernel/ia64_ksyms.c
-@@ -106,6 +106,9 @@ EXPORT_SYMBOL(ia64_save_scratch_fpregs);
+diff --git a/arch/ia64/include/asm/crash.h b/arch/ia64/include/asm/crash.h
+new file mode 100644
+index 0000000..541af84
+--- /dev/null
++++ b/arch/ia64/include/asm/crash.h
+@@ -0,0 +1,90 @@
++#ifndef _ASM_IA64_CRASH_H
++#define _ASM_IA64_CRASH_H
++
++/*
++ * linux/include/asm-ia64/crash.h
++ *
++ * Copyright (c) 2004 Red Hat, Inc. All rights reserved.
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 2, 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.
++ *
++ */
++
++#ifdef __KERNEL__
++
++#include <linux/efi.h>
++#include <linux/mm.h>
++#include <asm/mmzone.h>
++
++static inline void *
++map_virtual(u64 offset, struct page **pp)
++{
++	struct page *page;
++	unsigned long pfn;
++	u32 type;
++
++	if (REGION_NUMBER(offset) == 5) {
++		char byte;
++
++		if (__get_user(byte, (char *)offset) == 0)
++			return (void *)offset;
++		else
++			return NULL;
++	}
++
++	switch (type = efi_mem_type(offset)) 
++	{
++	case EFI_LOADER_CODE:
++	case EFI_LOADER_DATA:
++	case EFI_BOOT_SERVICES_CODE:
++	case EFI_BOOT_SERVICES_DATA:
++	case EFI_CONVENTIONAL_MEMORY:
++		break;
++
++	default:
++		printk(KERN_INFO
++		    "crash memory driver: invalid memory type for %lx: %d\n", 
++			offset, type);
++		return NULL;
++	}
++
++	pfn = offset >> PAGE_SHIFT;
++
++	if (!pfn_valid(pfn)) {
++		printk(KERN_INFO
++			"crash memory driver: invalid pfn: %lx )\n", pfn);
++		return NULL;
++	}
++
++	page = pfn_to_page(pfn);
++
++	if (!page->virtual) {
++		printk(KERN_INFO
++		    "crash memory driver: offset: %lx page: %lx page->virtual: NULL\n", 
++			offset, (unsigned long)page);
++		return NULL;
++	}
++
++	return (page->virtual + (offset & (PAGE_SIZE-1)));
++}
++
++static inline void unmap_virtual(struct page *page) 
++{ 
++	return;
++}
++
++#endif /* __KERNEL__ */
++
++#endif /* _ASM_IA64_CRASH_H */
+diff --git a/arch/ia64/kernel/ia64_ksyms.c b/arch/ia64/kernel/ia64_ksyms.c
+index 6da1f20..2984fb3 100644
+--- a/arch/ia64/kernel/ia64_ksyms.c
++++ b/arch/ia64/kernel/ia64_ksyms.c
+@@ -86,6 +86,9 @@ EXPORT_SYMBOL(ia64_save_scratch_fpregs);
  #include <asm/unwind.h>
  EXPORT_SYMBOL(unw_init_running);
  
@@ -10,10 +107,50 @@
 +
  #ifdef ASM_SUPPORTED
  # ifdef CONFIG_SMP
- #  if __GNUC__ < 3 || (__GNUC__ == 3 && __GNUC_MINOR__ < 3)
-diff -urNp --exclude-from=/home/davej/.exclude linux-1050/drivers/char/crash.c linux-1060/drivers/char/crash.c
---- linux-1050/drivers/char/crash.c
-+++ linux-1060/drivers/char/crash.c
+ #  if (__GNUC__ == 3 && __GNUC_MINOR__ < 3)
+diff --git a/arch/x86/mm/ioremap.c b/arch/x86/mm/ioremap.c
+index d4c4307..d1c968f 100644
+--- a/arch/x86/mm/ioremap.c
++++ b/arch/x86/mm/ioremap.c
+@@ -133,6 +133,7 @@ int page_is_ram(unsigned long pagenr)
+ 	}
+ 	return 0;
+ }
++EXPORT_SYMBOL_GPL(page_is_ram);
+ 
+ int pagerange_is_ram(unsigned long start, unsigned long end)
+ {
+diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
+index 43d6ba8..0d81c9a 100644
+--- a/drivers/char/Kconfig
++++ b/drivers/char/Kconfig
+@@ -460,6 +460,8 @@ config LEGACY_PTYS
+ 	  security.  This option enables these legacy devices; on most
+ 	  systems, it is safe to say N.
+ 
++config CRASH
++        tristate "Crash Utility memory driver"
+ 
+ config LEGACY_PTY_COUNT
+ 	int "Maximum number of legacy PTY in use"
+diff --git a/drivers/char/Makefile b/drivers/char/Makefile
+index 438f713..1b7767b 100644
+--- a/drivers/char/Makefile
++++ b/drivers/char/Makefile
+@@ -109,6 +109,8 @@ obj-$(CONFIG_PS3_FLASH)		+= ps3flash.o
+ obj-$(CONFIG_JS_RTC)		+= js-rtc.o
+ js-rtc-y = rtc.o
+ 
++obj-$(CONFIG_CRASH)		+= crash.o
++
+ # Files generated that shall be removed upon make clean
+ clean-files := consolemap_deftbl.c defkeymap.c
+ 
+diff --git a/drivers/char/crash.c b/drivers/char/crash.c
+new file mode 100644
+index 0000000..e5437de
+--- /dev/null
++++ b/drivers/char/crash.c
 @@ -0,0 +1,128 @@
 +/*
 + *  linux/drivers/char/crash.c
@@ -143,32 +280,11 @@
 +module_exit(crash_cleanup_module);
 +
 +MODULE_LICENSE("GPL");
-diff -urNp --exclude-from=/home/davej/.exclude linux-1050/drivers/char/Kconfig linux-1060/drivers/char/Kconfig
---- linux-1050/drivers/char/Kconfig
-+++ linux-1060/drivers/char/Kconfig
-@@ -441,6 +441,8 @@ config LEGACY_PTYS
- 	  security.  This option enables these legacy devices; on most
- 	  systems, it is safe to say N.
- 
-+config CRASH
-+        tristate "Crash Utility memory driver"
- 
- config LEGACY_PTY_COUNT
- 	int "Maximum number of legacy PTY in use"
---- linux-2.6.16.noarch/drivers/char/Makefile~	2006-03-25 18:50:42.000000000 -0500
-+++ linux-2.6.16.noarch/drivers/char/Makefile	2006-03-25 18:50:59.000000000 -0500
-@@ -95,6 +95,8 @@ obj-$(CONFIG_IPMI_HANDLER)	+= ipmi/
- obj-$(CONFIG_JS_RTC)		+= js-rtc.o
- js-rtc-y = rtc.o
- 
-+obj-$(CONFIG_CRASH)		+= crash.o
-+
- # Files generated that shall be removed upon make clean
- clean-files := consolemap_deftbl.c defkeymap.c
- 
-diff -urNp --exclude-from=/home/davej/.exclude linux-1050/include/asm-i386/crash.h linux-1060/include/asm-i386/crash.h
---- linux-1050/include/asm-x86/crash.h
-+++ linux-1060/include/asm-x86/crash.h
+diff --git a/include/asm-x86/crash.h b/include/asm-x86/crash.h
+new file mode 100644
+index 0000000..dfcc006
+--- /dev/null
++++ b/include/asm-x86/crash.h
 @@ -0,0 +1,75 @@
 +#ifndef _ASM_I386_CRASH_H
 +#define _ASM_I386_CRASH_H
@@ -245,109 +361,3 @@
 +#endif /* __KERNEL__ */
 +
 +#endif /* _ASM_I386_CRASH_H */
-diff -urNp --exclude-from=/home/davej/.exclude linux-1050/include/asm-ia64/crash.h linux-1060/include/asm-ia64/crash.h
---- linux-1050/include/asm-ia64/crash.h
-+++ linux-1060/include/asm-ia64/crash.h
-@@ -0,0 +1,90 @@
-+#ifndef _ASM_IA64_CRASH_H
-+#define _ASM_IA64_CRASH_H
-+
-+/*
-+ * linux/include/asm-ia64/crash.h
-+ *
-+ * Copyright (c) 2004 Red Hat, Inc. All rights reserved.
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2, 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.
-+ *
-+ */
-+
-+#ifdef __KERNEL__
-+
-+#include <linux/efi.h>
-+#include <linux/mm.h>
-+#include <asm/mmzone.h>
-+
-+static inline void *
-+map_virtual(u64 offset, struct page **pp)
-+{
-+	struct page *page;
-+	unsigned long pfn;
-+	u32 type;
-+
-+	if (REGION_NUMBER(offset) == 5) {
-+		char byte;
-+
-+		if (__get_user(byte, (char *)offset) == 0)
-+			return (void *)offset;
-+		else
-+			return NULL;
-+	}
-+
-+	switch (type = efi_mem_type(offset)) 
-+	{
-+	case EFI_LOADER_CODE:
-+	case EFI_LOADER_DATA:
-+	case EFI_BOOT_SERVICES_CODE:
-+	case EFI_BOOT_SERVICES_DATA:
-+	case EFI_CONVENTIONAL_MEMORY:
-+		break;
-+
-+	default:
-+		printk(KERN_INFO
-+		    "crash memory driver: invalid memory type for %lx: %d\n", 
-+			offset, type);
-+		return NULL;
-+	}
-+
-+	pfn = offset >> PAGE_SHIFT;
-+
-+	if (!pfn_valid(pfn)) {
-+		printk(KERN_INFO
-+			"crash memory driver: invalid pfn: %lx )\n", pfn);
-+		return NULL;
-+	}
-+
-+	page = pfn_to_page(pfn);
-+
-+	if (!page->virtual) {
-+		printk(KERN_INFO
-+		    "crash memory driver: offset: %lx page: %lx page->virtual: NULL\n", 
-+			offset, (unsigned long)page);
-+		return NULL;
-+	}
-+
-+	return (page->virtual + (offset & (PAGE_SIZE-1)));
-+}
-+
-+static inline void unmap_virtual(struct page *page) 
-+{ 
-+	return;
-+}
-+
-+#endif /* __KERNEL__ */
-+
-+#endif /* _ASM_IA64_CRASH_H */
-diff --git a/arch/x86/mm/ioremap.c b/arch/x86/mm/ioremap.c
-index c004d94..13417a2 100644
---- a/arch/x86/mm/ioremap.c
-+++ b/arch/x86/mm/ioremap.c
-@@ -65,6 +65,7 @@ int page_is_ram(unsigned long pagenr)
- 	}
- 	return 0;
- }
-+EXPORT_SYMBOL_GPL(page_is_ram);
- 
- /*
-  * Fix up the linear direct mapping of the kernel to avoid cache attribute

linux-2.6-debug-taint-vm.patch:

Index: linux-2.6-debug-taint-vm.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/linux-2.6-debug-taint-vm.patch,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- linux-2.6-debug-taint-vm.patch	5 Mar 2008 15:12:35 -0000	1.21
+++ linux-2.6-debug-taint-vm.patch	12 Jan 2009 19:54:17 -0000	1.22
@@ -1,20 +1,48 @@
 diff --git a/kernel/panic.c b/kernel/panic.c
-index 6f6e03e..198fc58 100644
+index 4d50883..f4a6faa 100644
 --- a/kernel/panic.c
 +++ b/kernel/panic.c
-@@ -173,6 +173,7 @@ const char *print_tainted(void)
+@@ -193,6 +193,7 @@ const char *print_tainted(void)
  		snprintf(buf, sizeof(buf), "Not tainted");
  	return(buf);
  }
 +EXPORT_SYMBOL(print_tainted);
  
- void add_taint(unsigned flag)
+ int test_taint(unsigned flag)
  {
+@@ -328,8 +329,8 @@ void warn_on_slowpath(const char *file, int line)
+ 	sprint_symbol(function, caller);
+ 
+ 	printk(KERN_WARNING "------------[ cut here ]------------\n");
+-	printk(KERN_WARNING "WARNING: at %s:%d %s()\n", file,
+-		line, function);
++	printk(KERN_WARNING "WARNING: at %s:%d %s() (%s)\n", file,
++		line, function, print_tainted());
+ 	print_modules();
+ 	dump_stack();
+ 	print_oops_end_marker();
+diff --git a/mm/page_alloc.c b/mm/page_alloc.c
+index d8ac014..1d035f0 100644
+--- a/mm/page_alloc.c
++++ b/mm/page_alloc.c
+@@ -224,10 +224,10 @@ static inline int bad_range(struct zone *zone, struct page *page)
+ static void bad_page(struct page *page)
+ {
+ 	printk(KERN_EMERG "Bad page state in process '%s'\n" KERN_EMERG
+-		"page:%p flags:0x%0*lx mapping:%p mapcount:%d count:%d\n",
++		"page:%p flags:0x%0*lx mapping:%p mapcount:%d count:%d (%s)\n",
+ 		current->comm, page, (int)(2*sizeof(unsigned long)),
+ 		(unsigned long)page->flags, page->mapping,
+-		page_mapcount(page), page_count(page));
++		page_mapcount(page), page_count(page), print_tainted());
+ 
+ 	printk(KERN_EMERG "Trying to fix it up, but a reboot is needed\n"
+ 		KERN_EMERG "Backtrace:\n");
 diff --git a/mm/slab.c b/mm/slab.c
-index 2e338a5..e5627f9 100644
+index 0918751..0977a03 100644
 --- a/mm/slab.c
 +++ b/mm/slab.c
-@@ -1846,8 +1846,8 @@ static void check_poison_obj(struct kmem_cache *cachep, void *objp)
+@@ -1858,8 +1858,8 @@ static void check_poison_obj(struct kmem_cache *cachep, void *objp)
  			/* Print header */
  			if (lines == 0) {
  				printk(KERN_ERR
@@ -25,7 +53,7 @@
  				print_objinfo(cachep, objp, 0);
  			}
  			/* Hexdump the affected line */
-@@ -2935,8 +2935,8 @@ static void check_slabp(struct kmem_cache *cachep, struct slab *slabp)
+@@ -2928,8 +2928,8 @@ static void check_slabp(struct kmem_cache *cachep, struct slab *slabp)
  	if (entries != cachep->num - slabp->inuse) {
  bad:
  		printk(KERN_ERR "slab: Internal list corruption detected in "
@@ -37,10 +65,10 @@
  		     i < sizeof(*slabp) + cachep->num * sizeof(kmem_bufctl_t);
  		     i++) {
 diff --git a/mm/slub.c b/mm/slub.c
-index 9c1d9f3..e11d58d 100644
+index 749588a..0ef64f1 100644
 --- a/mm/slub.c
 +++ b/mm/slub.c
-@@ -451,7 +451,7 @@ static void slab_bug(struct kmem_cache *s, char *fmt, ...)
+@@ -430,7 +430,7 @@ static void slab_bug(struct kmem_cache *s, char *fmt, ...)
  	va_end(args);
  	printk(KERN_ERR "========================================"
  			"=====================================\n");
@@ -49,35 +77,3 @@
  	printk(KERN_ERR "----------------------------------------"
  			"-------------------------------------\n\n");
  }
-diff --git a/kernel/panic.c b/kernel/panic.c
-index d9e90cf..570b1f6 100644
---- a/kernel/panic.c
-+++ b/kernel/panic.c
-@@ -306,8 +306,8 @@ void warn_on_slowpath(const char *file, int line)
- 	sprint_symbol(function, caller);
- 
- 	printk(KERN_WARNING "------------[ cut here ]------------\n");
--	printk(KERN_WARNING "WARNING: at %s:%d %s()\n", file,
--		line, function);
-+	printk(KERN_WARNING "WARNING: at %s:%d %s() (%s)\n", file,
-+		line, function, print_tainted());
- 	print_modules();
- 	dump_stack();
- 	print_oops_end_marker();
-diff --git a/mm/page_alloc.c b/mm/page_alloc.c
-index 402a504..2085092 100644
---- a/mm/page_alloc.c
-+++ b/mm/page_alloc.c
-@@ -225,10 +225,10 @@ static void bad_page(struct page *page)
- 	void *pc = page_get_page_cgroup(page);
- 
- 	printk(KERN_EMERG "Bad page state in process '%s'\n" KERN_EMERG
--		"page:%p flags:0x%0*lx mapping:%p mapcount:%d count:%d\n",
-+		"page:%p flags:0x%0*lx mapping:%p mapcount:%d count:%d (%s)\n",
- 		current->comm, page, (int)(2*sizeof(unsigned long)),
- 		(unsigned long)page->flags, page->mapping,
--		page_mapcount(page), page_count(page));
-+		page_mapcount(page), page_count(page), print_tainted());
- 	if (pc) {
- 		printk(KERN_EMERG "cgroup:%p\n", pc);
- 		page_reset_bad_cgroup(page);

linux-2.6-defaults-pci_no_msi.patch:

Index: linux-2.6-defaults-pci_no_msi.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/linux-2.6-defaults-pci_no_msi.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-defaults-pci_no_msi.patch	22 Apr 2008 16:42:54 -0000	1.1
+++ linux-2.6-defaults-pci_no_msi.patch	12 Jan 2009 19:54:17 -0000	1.2
@@ -1,10 +1,22 @@
-Disable PCI MSI by default, add kernel parameter to enable it.
-
-Signed-off-by: Chuck Ebbert <cebbert at redhat.com>
-
---- linux-2.6.20.noarch.orig/drivers/pci/msi.c
-+++ linux-2.6.20.noarch/drivers/pci/msi.c
-@@ -23,7 +23,7 @@ static DEFINE_SPINLOCK(msi_lock);
+diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
+index e0f346d..9e70467 100644
+--- a/Documentation/kernel-parameters.txt
++++ b/Documentation/kernel-parameters.txt
+@@ -1623,6 +1623,9 @@ and is between 256 and 4096 characters. It is defined in the file
+ 				root domains (aka PCI segments, in ACPI-speak).
+ 		nommconf	[X86-32,X86_64] Disable use of MMCONFIG for PCI
+ 				Configuration
++		msi		[MSI] If the PCI_MSI kernel config parameter is
++				enabled, this kernel boot option can be used to
++				enable the use of MSI interrupts system-wide.
+ 		nomsi		[MSI] If the PCI_MSI kernel config parameter is
+ 				enabled, this kernel boot option can be used to
+ 				disable the use of MSI interrupts system-wide.
+diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c
+index 74801f7..ffcf464 100644
+--- a/drivers/pci/msi.c
++++ b/drivers/pci/msi.c
+@@ -23,7 +23,7 @@
  #include "pci.h"
  #include "msi.h"
  
@@ -13,33 +25,23 @@
  
  /* Arch hooks */
  
-@@ -722,6 +722,11 @@ void pci_no_msi(void)
- {
+@@ -755,6 +755,11 @@ void pci_no_msi(void)
  	pci_msi_enable = 0;
  }
-+
+ 
 +void pci_yes_msi(void)
 +{
 +	pci_msi_enable = 1;
 +}
- 
++
  void pci_msi_init_pci_dev(struct pci_dev *dev)
  {
---- linux-2.6.20.noarch.orig/Documentation/kernel-parameters.txt
-+++ linux-2.6.20.noarch/Documentation/kernel-parameters.txt
-@@ -1429,6 +1429,9 @@ and is between 256 and 4096 characters. 
- 				root domains (aka PCI segments, in ACPI-speak).
- 		nommconf	[X86-32,X86_64] Disable use of MMCONFIG for PCI
- 				Configuration
-+		msi		[MSI] If the PCI_MSI kernel config parameter is
-+				enabled, this kernel boot option can be used to
-+				enable the use of MSI interrupts system-wide.
- 		nomsi		[MSI] If the PCI_MSI kernel config parameter is
- 				enabled, this kernel boot option can be used to
- 				disable the use of MSI interrupts system-wide.
---- linux-2.6.20.noarch.orig/drivers/pci/pci.c
-+++ linux-2.6.20.noarch/drivers/pci/pci.c
-@@ -1642,6 +1642,8 @@ static int __devinit pci_setup(char *str
+ 	INIT_LIST_HEAD(&dev->msi_list);
+diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
+index 061d1ee..883e572 100644
+--- a/drivers/pci/pci.c
++++ b/drivers/pci/pci.c
+@@ -2051,6 +2051,8 @@ static int __init pci_setup(char *str)
  		if (*str && (str = pcibios_setup(str)) && *str) {
  			if (!strcmp(str, "nomsi")) {
  				pci_no_msi();
@@ -48,17 +50,20 @@
  			} else if (!strcmp(str, "noaer")) {
  				pci_no_aer();
  			} else if (!strcmp(str, "nodomains")) {
---- linux-2.6.20.noarch.orig/drivers/pci/pci.h
-+++ linux-2.6.20.noarch/drivers/pci/pci.h
-@@ -41,9 +41,11 @@ extern unsigned int pci_pm_d3_delay;
+diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h
+index 9de87e9..c0327e7 100644
+--- a/drivers/pci/pci.h
++++ b/drivers/pci/pci.h
+@@ -97,10 +97,12 @@ extern unsigned int pci_pm_d3_delay;
  
  #ifdef CONFIG_PCI_MSI
  void pci_no_msi(void);
 +void pci_yes_msi(void);
  extern void pci_msi_init_pci_dev(struct pci_dev *dev);
+ extern void __devinit msi_init(void);
  #else
  static inline void pci_no_msi(void) { }
 +static inline void pci_yes_msi(void) { }
  static inline void pci_msi_init_pci_dev(struct pci_dev *dev) { }
+ static inline void msi_init(void) { }
  #endif
- 

linux-2.6-execshield.patch:

Index: linux-2.6-execshield.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/linux-2.6-execshield.patch,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -r1.90 -r1.91
--- linux-2.6-execshield.patch	30 Oct 2008 04:41:11 -0000	1.90
+++ linux-2.6-execshield.patch	12 Jan 2009 19:54:17 -0000	1.91
@@ -1,6 +1,120 @@
---- linux-2.6.25.noarch/arch/x86/kernel/cpu/common.c~	2008-05-16 13:41:08.000000000 -0400
-+++ linux-2.6.25.noarch/arch/x86/kernel/cpu/common.c	2008-05-16 13:42:11.000000000 -0400
-@@ -479,6 +479,21 @@ void __cpuinit identify_cpu(struct cpuin
+diff --git a/arch/x86/include/asm/desc.h b/arch/x86/include/asm/desc.h
+index e6b82b1..c314884 100644
+--- a/arch/x86/include/asm/desc.h
++++ b/arch/x86/include/asm/desc.h
+@@ -6,6 +6,7 @@
+ #include <asm/ldt.h>
+ #include <asm/mmu.h>
+ #include <linux/smp.h>
++#include <linux/mm_types.h>
+ 
+ static inline void fill_ldt(struct desc_struct *desc,
+ 			    const struct user_desc *info)
+@@ -95,6 +96,9 @@ static inline int desc_empty(const void *ptr)
+ 
+ #define load_TLS(t, cpu) native_load_tls(t, cpu)
+ #define set_ldt native_set_ldt
++#ifdef CONFIG_X86_32
++#define load_user_cs_desc native_load_user_cs_desc
++#endif /*CONFIG_X86_32*/
+ 
+ #define write_ldt_entry(dt, entry, desc)	\
+ 	native_write_ldt_entry(dt, entry, desc)
+@@ -381,6 +385,24 @@ static inline void set_system_intr_gate_ist(int n, void *addr, unsigned ist)
+ 	_set_gate(n, GATE_INTERRUPT, addr, 0x3, ist, __KERNEL_CS);
+ }
+ 
++#ifdef CONFIG_X86_32
++static inline void set_user_cs(struct desc_struct *desc, unsigned long limit)
++{
++	limit = (limit - 1) / PAGE_SIZE;
++	desc->a = limit & 0xffff;
++	desc->b = (limit & 0xf0000) | 0x00c0fb00;
++}
++
++static inline void native_load_user_cs_desc(int cpu, struct mm_struct *mm)
++{
++	get_cpu_gdt_table(cpu)[GDT_ENTRY_DEFAULT_USER_CS] = (mm)->context.user_cs;
++}
++
++extern void arch_add_exec_range(struct mm_struct *mm, unsigned long limit);
++extern void arch_remove_exec_range(struct mm_struct *mm, unsigned long limit);
++extern void arch_flush_exec_range(struct mm_struct *mm);
++#endif /* CONFIG_X86_32 */
++
+ #else
+ /*
+  * GET_DESC_BASE reads the descriptor base of the specified segment.
+diff --git a/arch/x86/include/asm/mmu.h b/arch/x86/include/asm/mmu.h
+index 80a1dee..8314c66 100644
+--- a/arch/x86/include/asm/mmu.h
++++ b/arch/x86/include/asm/mmu.h
+@@ -7,12 +7,19 @@
+ /*
+  * The x86 doesn't have a mmu context, but
+  * we put the segment information here.
++ *
++ * exec_limit is used to track the range PROT_EXEC
++ * mappings span.
+  */
+ typedef struct {
+ 	void *ldt;
+ 	int size;
+ 	struct mutex lock;
+ 	void *vdso;
++#ifdef CONFIG_X86_32
++	struct desc_struct user_cs;
++	unsigned long exec_limit;
++#endif
+ } mm_context_t;
+ 
+ #ifdef CONFIG_SMP
+diff --git a/arch/x86/include/asm/paravirt.h b/arch/x86/include/asm/paravirt.h
+index ba3e2ff..42a65f4 100644
+--- a/arch/x86/include/asm/paravirt.h
++++ b/arch/x86/include/asm/paravirt.h
+@@ -113,6 +113,9 @@ struct pv_cpu_ops {
+ 	void (*store_gdt)(struct desc_ptr *);
+ 	void (*store_idt)(struct desc_ptr *);
+ 	void (*set_ldt)(const void *desc, unsigned entries);
++#ifdef CONFIG_X86_32
++	void (*load_user_cs_desc)(int cpu, struct mm_struct *mm);
++#endif /*CONFIG_X86_32*/
+ 	unsigned long (*store_tr)(void);
+ 	void (*load_tls)(struct thread_struct *t, unsigned int cpu);
+ #ifdef CONFIG_X86_64
+@@ -860,6 +863,12 @@ static inline void set_ldt(const void *addr, unsigned entries)
+ {
+ 	PVOP_VCALL2(pv_cpu_ops.set_ldt, addr, entries);
+ }
++#ifdef CONFIG_X86_32
++static inline void load_user_cs_desc(unsigned int cpu, struct mm_struct *mm)
++{
++	PVOP_VCALL2(pv_cpu_ops.load_user_cs_desc, cpu, mm);
++}
++#endif /*CONFIG_X86_32*/
+ static inline void store_gdt(struct desc_ptr *dtr)
+ {
+ 	PVOP_VCALL1(pv_cpu_ops.store_gdt, dtr);
+diff --git a/arch/x86/include/asm/processor.h b/arch/x86/include/asm/processor.h
+index 5ca01e3..4f319b1 100644
+--- a/arch/x86/include/asm/processor.h
++++ b/arch/x86/include/asm/processor.h
+@@ -154,6 +154,9 @@ static inline int hlt_works(int cpu)
+ 
+ #define cache_line_size()	(boot_cpu_data.x86_cache_alignment)
+ 
++#define __HAVE_ARCH_ALIGN_STACK
++extern unsigned long arch_align_stack(unsigned long sp);
++
+ extern void cpu_detect(struct cpuinfo_x86 *c);
+ 
+ extern struct pt_regs *idle_regs(struct pt_regs *);
+diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c
+index b9c9ea0..666dd0e 100644
+--- a/arch/x86/kernel/cpu/common.c
++++ b/arch/x86/kernel/cpu/common.c
+@@ -687,6 +687,21 @@ static void __cpuinit identify_cpu(struct cpuinfo_x86 *c)
  	 * we do "generic changes."
  	 */
  
@@ -13,20 +127,45 @@
 +	 */
 +	if (exec_shield != 0) {
 +#ifdef CONFIG_X86_PAE
-+		if (!test_bit(X86_FEATURE_NX, c->x86_capability))
++		if (!test_cpu_cap(c, X86_FEATURE_NX))
 +#endif
-+			clear_bit(X86_FEATURE_SEP, c->x86_capability);
++			clear_cpu_cap(c, X86_FEATURE_SEP);
 +	}
 +
 +
  	/* If the model name is still unset, do table lookup. */
  	if (!c->x86_model_id[0]) {
  		char *p;
+diff --git a/arch/x86/kernel/paravirt.c b/arch/x86/kernel/paravirt.c
+index e4c8fb6..30f7508 100644
+--- a/arch/x86/kernel/paravirt.c
++++ b/arch/x86/kernel/paravirt.c
+@@ -326,6 +326,9 @@ struct pv_cpu_ops pv_cpu_ops = {
+ 	.read_tscp = native_read_tscp,
+ 	.load_tr_desc = native_load_tr_desc,
+ 	.set_ldt = native_set_ldt,
++#ifdef CONFIG_X86_32
++	.load_user_cs_desc = native_load_user_cs_desc,
++#endif /*CONFIG_X86_32*/
+ 	.load_gdt = native_load_gdt,
+ 	.load_idt = native_load_idt,
+ 	.store_gdt = native_store_gdt,
 diff --git a/arch/x86/kernel/process_32.c b/arch/x86/kernel/process_32.c
-index a7d50a5..83f7b4e 100644
+index 0a1302f..ab96a10 100644
 --- a/arch/x86/kernel/process_32.c
 +++ b/arch/x86/kernel/process_32.c
-@@ -677,7 +677,8 @@ struct task_struct * __switch_to(struct task_struct *prev_p, struct task_struct
+@@ -354,6 +354,10 @@ start_thread(struct pt_regs *regs, unsigned long new_ip, unsigned long new_sp)
+ 	regs->cs		= __USER_CS;
+ 	regs->ip		= new_ip;
+ 	regs->sp		= new_sp;
++	preempt_disable();
++	load_user_cs_desc(smp_processor_id(), current->mm);
++	preempt_enable();
++
+ 	/*
+ 	 * Free the old FP and other extended state
+ 	 */
+@@ -558,7 +562,8 @@ struct task_struct * __switch_to(struct task_struct *prev_p, struct task_struct
  	/* never put a printk in __switch_to... printk() calls wake_up*() indirectly */
  
  	__unlazy_fpu(prev_p);
@@ -36,11 +175,7 @@
  
  	/* we're going to use this soon, after a few expensive things */
  	if (next_p->fpu_counter > 5)
-diff --git a/arch/x86/kernel/process_32.c b/arch/x86/kernel/process_32.c
-index a7d50a5..86e35cb 100644
---- a/arch/x86/kernel/process_32.c
-+++ b/arch/x86/kernel/process_32.c
-@@ -847,3 +847,39 @@ unsigned long arch_randomize_brk(struct mm_struct *mm)
+@@ -731,3 +736,39 @@ unsigned long arch_randomize_brk(struct mm_struct *mm)
  	unsigned long range_end = mm->brk + 0x02000000;
  	return randomize_range(mm->brk, range_end, 0) ? : mm->brk;
  }
@@ -80,8 +215,10 @@
 +	mm->context.exec_limit = 0;
 +	set_user_cs(&mm->context.user_cs, 0);
 +}
---- linux-2.6.25.noarch/arch/x86/kernel/tlb_32.c~	2008-05-16 13:30:44.000000000 -0400
-+++ linux-2.6.25.noarch/arch/x86/kernel/tlb_32.c	2008-05-16 13:31:14.000000000 -0400
+diff --git a/arch/x86/kernel/tlb_32.c b/arch/x86/kernel/tlb_32.c
+index f4049f3..e7a1b7c 100644
+--- a/arch/x86/kernel/tlb_32.c
++++ b/arch/x86/kernel/tlb_32.c
 @@ -2,6 +2,7 @@
  #include <linux/cpu.h>
  #include <linux/interrupt.h>
@@ -90,7 +227,7 @@
  #include <asm/tlbflush.h>
  
  DEFINE_PER_CPU(struct tlb_state, cpu_tlbstate)
-@@ -92,6 +93,8 @@ void smp_invalidate_interrupt(struct pt_
+@@ -92,6 +93,8 @@ void smp_invalidate_interrupt(struct pt_regs *regs)
  	unsigned long cpu;
  
  	cpu = get_cpu();
@@ -99,13 +236,14 @@
  
  	if (!cpu_isset(cpu, flush_cpumask))
  		goto out;
---- linux-2.6.26.noarch/arch/x86/kernel/traps_32.c~	2008-07-14 20:20:15.000000000 -0400
-+++ linux-2.6.26.noarch/arch/x86/kernel/traps_32.c	2008-07-14 20:26:18.000000000 -0400
-@@ -596,7 +596,91 @@ DO_ERROR(10, SIGSEGV, "invalid TSS", inv
- DO_ERROR(11, SIGBUS, "segment not present", segment_not_present)
- DO_ERROR(12, SIGBUS, "stack segment", stack_segment)
- DO_ERROR_INFO(17, SIGBUS, "alignment check", alignment_check, BUS_ADRALN, 0, 0)
--DO_ERROR_INFO(32, SIGILL, "iret exception", iret_error, ILL_BADSTK, 0, 1)
+diff --git a/arch/x86/kernel/traps.c b/arch/x86/kernel/traps.c
+index 04d242a..bb52785 100644
+--- a/arch/x86/kernel/traps.c
++++ b/arch/x86/kernel/traps.c
+@@ -159,6 +159,63 @@ static int lazy_iobitmap_copy(void)
+ 
+ 	return 0;
+ }
 +
 +/*
 + * lazy-check for CS validity on exec-shield binaries:
@@ -157,94 +295,97 @@
 +				current->mm->context.exec_limit, desc1->a, desc1->b, desc2->a, desc2->b);
 +		}
 +		load_user_cs_desc(cpu, current->mm);
++
 +		return 1;
 +	}
 +
 +	return 0;
 +}
-+
-+/*
-+ * The fixup code for errors in iret jumps to here (iret_exc).  It loses
-+ * the original trap number and error code.  The bogus trap 32 and error
-+ * code 0 are what the vanilla kernel delivers via:
-+ * DO_ERROR_INFO(32, SIGSEGV, "iret exception", iret_error, ILL_BADSTK, 0, 1)
-+ *
-+ * NOTE: Because of the final "1" in the macro we need to enable interrupts.
-+ *
-+ * In case of a general protection fault in the iret instruction, we
-+ * need to check for a lazy CS update for exec-shield.
-+ */
-+void do_iret_error(struct pt_regs *regs, long error_code)
-+{
-+	int ok;
-+	local_irq_enable();
-+	ok = check_lazy_exec_limit(get_cpu(), regs, error_code);
-+	put_cpu();
-+	if (!ok && notify_die(DIE_TRAP, "iret exception", regs,
-+		error_code, 32, SIGSEGV) != NOTIFY_STOP) {
-+			siginfo_t info;
-+			info.si_signo = SIGSEGV;
-+			info.si_errno = 0;
-+			info.si_code = ILL_BADSTK;
-+			info.si_addr = 0;
-+			do_trap(32, SIGSEGV, "iret exception", 0, regs, error_code,
-+				&info);
-+	}
-+}
- 
- void __kprobes
- do_general_protection(struct pt_regs *regs, long error_code)
-@@ -605,6 +688,7 @@ do_general_protection(struct pt_regs *re
- 	struct thread_struct *thread;
- 	struct tss_struct *tss;
- 	int cpu;
-+	int ok;
+ #endif
  
- 	cpu = get_cpu();
- 	tss = &per_cpu(init_tss, cpu);
-@@ -645,6 +729,23 @@ do_general_protection(struct pt_regs *re
+ static void __kprobes
+@@ -320,6 +377,29 @@ do_general_protection(struct pt_regs *regs, long error_code)
  	if (!user_mode(regs))
  		goto gp_in_kernel;
  
-+	ok = check_lazy_exec_limit(cpu, regs, error_code);
++#ifdef CONFIG_X86_32
++{
++	int cpu;
++	int ok;
 +
++	cpu = get_cpu();
++	ok = check_lazy_exec_limit(cpu, regs, error_code);
 +	put_cpu();
 +
 +	if (ok)
 +		return;
 +
 +	if (print_fatal_signals) {
-+		printk(KERN_ERR "#GPF(%ld[seg:%lx]) at %08lx, CPU#%d.\n", error_code,
-+			error_code/8, regs->ip, smp_processor_id());
++		printk(KERN_ERR "#GPF(%ld[seg:%lx]) at %08lx, CPU#%d.\n",
++			error_code, error_code/8, regs->ip, smp_processor_id());
 +		printk(KERN_ERR "exec_limit: %08lx, user_cs: %08x/%08x.\n",
 +			current->mm->context.exec_limit,
 +			current->mm->context.user_cs.a,
 +			current->mm->context.user_cs.b);
 +	}
-+
++}
++#endif /*CONFIG_X86_32*/
 +
  	tsk->thread.error_code = error_code;
  	tsk->thread.trap_no = 13;
  
-@@ -662,11 +763,13 @@ do_general_protection(struct pt_regs *re
- 	return;
+@@ -931,19 +1011,37 @@ do_device_not_available(struct pt_regs *regs, long error)
+ }
  
- gp_in_vm86:
-+	put_cpu();
+ #ifdef CONFIG_X86_32
++/*
++ * The fixup code for errors in iret jumps to here (iret_exc). It loses
++ * the original trap number and erorr code. The bogus trap 32 and error
++ * code 0 are what the vanilla kernel delivers via:
++ * DO_ERROR_INFO(32, SIGSEGV, "iret exception", iret_error, ILL_BADSTK, 0, 1)
++ *
++ * NOTE: Because of the final "1" in the macro we need to enable interrupts.
++ *
++ * In case of a general protection fault in the iret instruction, we
++ * need to check for a lazy CS update for exec-shield.
++ */
+ dotraplinkage void do_iret_error(struct pt_regs *regs, long error_code)
+ {
+-	siginfo_t info;
++	int ok;
++	int cpu;
++
  	local_irq_enable();
- 	handle_vm86_fault((struct kernel_vm86_regs *) regs, error_code);
- 	return;
  
- gp_in_kernel:
+-	info.si_signo = SIGILL;
+-	info.si_errno = 0;
+-	info.si_code = ILL_BADSTK;
+-	info.si_addr = 0;
+-	if (notify_die(DIE_TRAP, "iret exception",
+-			regs, error_code, 32, SIGILL) == NOTIFY_STOP)
+-		return;
+-	do_trap(32, SIGILL, "iret exception", regs, error_code, &info);
++	cpu = get_cpu();
++	ok = check_lazy_exec_limit(cpu, regs, error_code);
 +	put_cpu();
- 	if (fixup_exception(regs))
- 		return;
++
++	if (!ok && notify_die(DIE_TRAP, "iret exception", regs,
++		error_code, 32, SIGSEGV) != NOTIFY_STOP) {
++			siginfo_t info;
++			info.si_signo = SIGSEGV;
++			info.si_errno = 0;
++			info.si_code = ILL_BADSTK;
++			info.si_addr = 0;
++			do_trap(32, SIGSEGV, "iret exception", 0, error_code, &info);
++	}
+ }
+ #endif
  
 diff --git a/arch/x86/mm/init_32.c b/arch/x86/mm/init_32.c
-index 8106bba..23932be 100644
+index c483f42..8c3bbd9 100644
 --- a/arch/x86/mm/init_32.c
 +++ b/arch/x86/mm/init_32.c
-@@ -473,7 +473,7 @@ static int disable_nx __initdata;
+@@ -570,7 +570,7 @@ static int disable_nx __initdata;
   * Control non executable mappings.
   *
   * on      Enable
@@ -253,7 +394,7 @@
   */
  static int __init noexec_setup(char *str)
  {
-@@ -482,14 +482,12 @@ static int __init noexec_setup(char *str)
+@@ -579,14 +579,12 @@ static int __init noexec_setup(char *str)
  			__supported_pte_mask |= _PAGE_NX;
  			disable_nx = 0;
  		}
@@ -274,7 +415,8 @@
  
  	return 0;
  }
-@@ -782,6 +782,10 @@ unsigned long __init_refok init_memory_m
+@@ -845,7 +843,11 @@ unsigned long __init_refok init_memory_mapping(unsigned long start,
+ 	set_nx();
  	if (nx_enabled)
  		printk(KERN_INFO "NX (Execute Disable) protection: active\n");
 +	else
@@ -307,10 +449,10 @@
  	}
  }
 diff --git a/arch/x86/vdso/vdso32-setup.c b/arch/x86/vdso/vdso32-setup.c
-index 348f134..0bd5f44 100644
+index 513f330..2fb420a 100644
 --- a/arch/x86/vdso/vdso32-setup.c
 +++ b/arch/x86/vdso/vdso32-setup.c
-@@ -336,7 +336,7 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int exstack)
+@@ -331,7 +331,7 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int exstack)
  	if (compat)
  		addr = VDSO_HIGH_BASE;
  	else {
@@ -319,11 +461,50 @@
  		if (IS_ERR_VALUE(addr)) {
  			ret = addr;
  			goto up_fail;
+diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c
+index 5e4686d..b41f314 100644
+--- a/arch/x86/xen/enlighten.c
++++ b/arch/x86/xen/enlighten.c
+@@ -315,6 +315,24 @@ static void xen_set_ldt(const void *addr, unsigned entries)
+ 	xen_mc_issue(PARAVIRT_LAZY_CPU);
+ }
+ 
++#ifdef CONFIG_X86_32
++static void xen_load_user_cs_desc(int cpu, struct mm_struct *mm)
++{
++	void *gdt;
++	xmaddr_t mgdt;
++	u64 descriptor;
++	struct desc_struct user_cs;
++
++	gdt = &get_cpu_gdt_table(cpu)[GDT_ENTRY_DEFAULT_USER_CS];
++	mgdt = virt_to_machine(gdt);
++
++	user_cs = mm->context.user_cs;
++	descriptor = (u64) user_cs.a | ((u64) user_cs.b) << 32;
++
++	HYPERVISOR_update_descriptor(mgdt.maddr, descriptor);
++}
++#endif /*CONFIG_X86_32*/
++
+ static void xen_load_gdt(const struct desc_ptr *dtr)
+ {
+ 	unsigned long *frames;
+@@ -1231,6 +1249,9 @@ static const struct pv_cpu_ops xen_cpu_ops __initdata = {
+ 
+ 	.load_tr_desc = paravirt_nop,
+ 	.set_ldt = xen_set_ldt,
++#ifdef CONFIG_X86_32
++	.load_user_cs_desc = xen_load_user_cs_desc,
++#endif /*CONFIG_X86_32*/
+ 	.load_gdt = xen_load_gdt,
+ 	.load_idt = xen_load_idt,
+ 	.load_tls = xen_load_tls,
 diff --git a/fs/binfmt_elf.c b/fs/binfmt_elf.c
-index 41a958a..22cbd06 100644
+index 8fcfa39..5e1e2d8 100644
 --- a/fs/binfmt_elf.c
 +++ b/fs/binfmt_elf.c
-@@ -81,7 +81,7 @@ static struct linux_binfmt elf_format = {
+@@ -80,7 +80,7 @@ static struct linux_binfmt elf_format = {
  		.hasvdso	= 1
  };
  
@@ -332,7 +513,7 @@
  
  static int set_brk(unsigned long start, unsigned long end)
  {
-@@ -709,6 +711,11 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs)
+@@ -723,6 +723,11 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs)
  			break;
  		}
  
@@ -344,7 +525,7 @@
  	/* Some simple consistency checks for the interpreter */
  	if (elf_interpreter) {
  		retval = -ELIBBAD;
-@@ -721,6 +721,15 @@ static int load_elf_binary(struct linux_
+@@ -742,6 +747,15 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs)
  	if (retval)
  		goto out_free_dentry;
  
@@ -360,17 +541,17 @@
  	/* OK, This is the point of no return */
  	current->flags &= ~PF_FORKNOEXEC;
  	current->mm->def_flags = def_flags;
-@@ -741,7 +757,8 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs)
+@@ -749,7 +763,8 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs)
  	/* Do this immediately, since STACK_TOP as used in setup_arg_pages
  	   may depend on the personality.  */
- 	SET_PERSONALITY(loc->elf_ex, 0);
+ 	SET_PERSONALITY(loc->elf_ex);
 -	if (elf_read_implies_exec(loc->elf_ex, executable_stack))
 +	if (!(exec_shield & 2) &&
 +			elf_read_implies_exec(loc->elf_ex, executable_stack))
  		current->personality |= READ_IMPLIES_EXEC;
  
  	if (!(current->personality & ADDR_NO_RANDOMIZE) && randomize_va_space)
-@@ -906,7 +923,7 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs)
+@@ -914,7 +929,7 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs)
  					    interpreter,
  					    &interp_map_addr,
  					    load_bias);
@@ -379,9 +560,11 @@
  			/*
  			 * load_elf_interp() returns relocation
  			 * adjustment
---- linux-2.6.25.noarch/fs/proc/array.c~	2008-05-16 13:51:04.000000000 -0400
-+++ linux-2.6.25.noarch/fs/proc/array.c	2008-05-16 13:53:24.000000000 -0400
-@@ -473,8 +473,13 @@ static int do_task_stat(struct seq_file 
+diff --git a/fs/proc/array.c b/fs/proc/array.c
+index 6af7fba..bb98552 100644
+--- a/fs/proc/array.c
++++ b/fs/proc/array.c
+@@ -412,8 +412,13 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
  		unlock_task_sighand(task, &flags);
  	}
  
@@ -397,87 +580,11 @@
  	if (!whole) {
  		min_flt = task->min_flt;
  		maj_flt = task->maj_flt;
-diff --git a/include/asm-x86/desc.h b/include/asm-x86/desc.h
-index 5b6a05d..7ad80b9 100644
---- a/include/asm-x86/desc.h
-+++ b/include/asm-x86/desc.h
-@@ -353,6 +353,22 @@ static inline void set_system_gate_ist(int n, void *addr, unsigned ist)
- 	_set_gate(n, GATE_INTERRUPT, addr, 0x3, ist, __KERNEL_CS);
- }
- 
-+#ifdef CONFIG_X86_32
-+static inline void set_user_cs(struct desc_struct *desc, unsigned long limit)
-+{
-+	limit = (limit - 1) / PAGE_SIZE;
-+	desc->a = limit & 0xffff;
-+	desc->b = (limit & 0xf0000) | 0x00c0fb00;
-+}
-+
-+#define load_user_cs_desc(cpu, mm) \
-+	get_cpu_gdt_table(cpu)[GDT_ENTRY_DEFAULT_USER_CS] = (mm)->context.user_cs
-+
-+extern void arch_add_exec_range(struct mm_struct *mm, unsigned long limit);
-+extern void arch_remove_exec_range(struct mm_struct *mm, unsigned long limit);
-+extern void arch_flush_exec_range(struct mm_struct *mm);
-+#endif /* CONFIG_X86_32 */
-+
- #else
- /*
-  * GET_DESC_BASE reads the descriptor base of the specified segment.
-diff --git a/include/asm-x86/mmu.h b/include/asm-x86/mmu.h
-index efa962c..db9b109 100644
---- a/include/asm-x86/mmu.h
-+++ b/include/asm-x86/mmu.h
-@@ -9,6 +9,8 @@
-  * we put the segment information here.
-  *
-  * cpu_vm_mask is used to optimize ldt flushing.
-+ * exec_limit is used to track the range PROT_EXEC
-+ * mappings span.
-  */
- typedef struct {
- 	void *ldt;
-@@ -18,6 +20,10 @@ typedef struct {
- 	int size;
- 	struct mutex lock;
- 	void *vdso;
-+#ifdef CONFIG_X86_32
-+	struct desc_struct user_cs;
-+	unsigned long exec_limit;
-+#endif
- } mm_context_t;
- 
- #ifdef CONFIG_SMP
---- linux-2.6.25.noarch/include/asm-x86/processor.h~	2008-05-16 15:56:21.000000000 -0400
-+++ linux-2.6.25.noarch/include/asm-x86/processor.h	2008-05-16 16:02:44.000000000 -0400
-@@ -151,6 +151,9 @@ static inline int hlt_works(int cpu)
- 
- #define cache_line_size()	(boot_cpu_data.x86_cache_alignment)
- 
-+#define __HAVE_ARCH_ALIGN_STACK
-+extern unsigned long arch_align_stack(unsigned long sp);
-+
- extern void cpu_detect(struct cpuinfo_x86 *c);
- 
- extern void identify_cpu(struct cpuinfo_x86 *);
---- linux-2.6.25.noarch/arch/x86/kernel/process_32.c~	2008-05-16 16:02:50.000000000 -0400
-+++ linux-2.6.25.noarch/arch/x86/kernel/process_32.c	2008-05-16 16:03:21.000000000 -0400
-@@ -411,6 +411,10 @@ start_thread(struct pt_regs *regs, unsig
- 	regs->cs		= __USER_CS;
- 	regs->ip		= new_ip;
- 	regs->sp		= new_sp;
-+	preempt_disable();
-+	load_user_cs_desc(smp_processor_id(), current->mm);
-+	preempt_enable();
-+
- 	/*
- 	 * Free the old FP and other extended state
- 	 */
 diff --git a/include/linux/mm.h b/include/linux/mm.h
-index e8abb38..1483fc7 100644
+index ffee2f7..c14817b 100644
 --- a/include/linux/mm.h
 +++ b/include/linux/mm.h
-@@ -1041,7 +1041,13 @@ extern int install_special_mapping(struct mm_struct *mm,
+@@ -1105,7 +1105,13 @@ extern int install_special_mapping(struct mm_struct *mm,
  				   unsigned long addr, unsigned long len,
  				   unsigned long flags, struct page **pages);
  
@@ -493,10 +600,10 @@
  extern unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
  	unsigned long len, unsigned long prot,
 diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h
-index bfee0bd..30ec32f 100644
+index fe82547..8007dbf 100644
 --- a/include/linux/mm_types.h
 +++ b/include/linux/mm_types.h
-@@ -166,6 +166,9 @@ struct mm_struct {
+@@ -177,6 +177,9 @@ struct mm_struct {
  	unsigned long (*get_unmapped_area) (struct file *filp,
  				unsigned long addr, unsigned long len,
  				unsigned long pgoff, unsigned long flags);
@@ -507,10 +614,10 @@
  	unsigned long mmap_base;		/* base of mmap area */
  	unsigned long task_size;		/* size of task vm space */
 diff --git a/include/linux/resource.h b/include/linux/resource.h
-index ae13db7..14757af 100644
+index 40fc7e6..68c2549 100644
 --- a/include/linux/resource.h
 +++ b/include/linux/resource.h
-@@ -54,8 +54,11 @@ struct rlimit {
+@@ -55,8 +55,11 @@ struct rlimit {
  /*
   * Limit the stack by to some sane default: root can always
   * increase this limit if needed..  8MB seems reasonable.
@@ -522,12 +629,12 @@
 +#define EXEC_STACK_BIAS	(2*1024*1024)
  
  /*
-  * GPG wants 32kB of mlocked memory, to make sure pass phrases
+  * GPG2 wants 64kB of mlocked memory, to make sure pass phrases
 diff --git a/include/linux/sched.h b/include/linux/sched.h
-index 00e1441..c1c8a7d 100644
+index 55e30d1..d400ab0 100644
 --- a/include/linux/sched.h
 +++ b/include/linux/sched.h
-@@ -98,6 +98,9 @@ struct futex_pi_state;
+@@ -97,6 +97,9 @@ struct futex_pi_state;
  struct robust_list_head;
  struct bio;
  
@@ -537,7 +644,7 @@
  /*
   * List of flags we want to share for kernel threads,
   * if only because they are not used by them anyway.
-@@ -342,6 +345,10 @@ extern int sysctl_max_map_count;
+@@ -345,6 +348,10 @@ extern int sysctl_max_map_count;
  extern unsigned long
  arch_get_unmapped_area(struct file *, unsigned long, unsigned long,
  		       unsigned long, unsigned long);
@@ -549,11 +656,11 @@
  arch_get_unmapped_area_topdown(struct file *filp, unsigned long addr,
  			  unsigned long len, unsigned long pgoff,
 diff --git a/kernel/sysctl.c b/kernel/sysctl.c
-index d41ef6b..5304704 100644
+index 3d56fe7..b512845 100644
 --- a/kernel/sysctl.c
 +++ b/kernel/sysctl.c
-@@ -83,6 +83,26 @@ extern int maps_protect;
- extern int sysctl_stat_interval;
+@@ -82,6 +82,26 @@ extern int percpu_pagelist_fraction;
+ extern int compat_log;
  extern int latencytop_enabled;
  extern int sysctl_nr_open_min, sysctl_nr_open_max;
 +
@@ -579,7 +686,7 @@
  #ifdef CONFIG_RCU_TORTURE_TEST
  extern int rcutorture_runnable;
  #endif /* #ifdef CONFIG_RCU_TORTURE_TEST */
-@@ -383,6 +403,14 @@ static struct ctl_table kern_table[] = {
+@@ -373,6 +393,14 @@ static struct ctl_table kern_table[] = {
  		.proc_handler	= &proc_dointvec,
  	},
  	{
@@ -595,7 +702,7 @@
  		.procname	= "core_uses_pid",
  		.data		= &core_uses_pid,
 diff --git a/mm/mmap.c b/mm/mmap.c
-index a32d28c..7634038 100644
+index d4855a6..0850042 100644
 --- a/mm/mmap.c
 +++ b/mm/mmap.c
 @@ -27,6 +27,7 @@
@@ -606,7 +713,7 @@
  
  #include <asm/uaccess.h>
  #include <asm/cacheflush.h>
-@@ -41,6 +41,18 @@
+@@ -43,6 +44,18 @@
  #define arch_rebalance_pgtables(addr, len)		(addr)
  #endif
  
@@ -625,7 +732,7 @@
  static void unmap_region(struct mm_struct *mm,
  		struct vm_area_struct *vma, struct vm_area_struct *prev,
  		unsigned long start, unsigned long end);
-@@ -377,6 +378,8 @@ static inline void
+@@ -391,6 +404,8 @@ static inline void
  __vma_link_list(struct mm_struct *mm, struct vm_area_struct *vma,
  		struct vm_area_struct *prev, struct rb_node *rb_parent)
  {
@@ -634,7 +741,7 @@
  	if (prev) {
  		vma->vm_next = prev->vm_next;
  		prev->vm_next = vma;
-@@ -480,6 +483,8 @@ __vma_unlink(struct mm_struct *mm, struct vm_area_struct *vma,
+@@ -494,6 +509,8 @@ __vma_unlink(struct mm_struct *mm, struct vm_area_struct *vma,
  	rb_erase(&vma->vm_rb, &mm->mm_rb);
  	if (mm->mmap_cache == vma)
  		mm->mmap_cache = prev;
@@ -643,7 +750,7 @@
  }
  
  /*
-@@ -785,6 +790,8 @@ struct vm_area_struct *vma_merge(struct mm_struct *mm,
+@@ -800,6 +817,8 @@ struct vm_area_struct *vma_merge(struct mm_struct *mm,
  		} else					/* cases 2, 5, 7 */
  			vma_adjust(prev, prev->vm_start,
  				end, prev->vm_pgoff, NULL);
@@ -652,7 +759,7 @@
  		return prev;
  	}
  
-@@ -940,7 +947,8 @@ unsigned long do_mmap_pgoff(struct file * file, unsigned long addr,
+@@ -955,7 +974,8 @@ unsigned long do_mmap_pgoff(struct file * file, unsigned long addr,
  	/* Obtain the address to map to. we verify (or select) it and ensure
  	 * that it represents a valid section of the address space.
  	 */
@@ -662,7 +769,7 @@
  	if (addr & ~PAGE_MASK)
  		return addr;
  
-@@ -1410,13 +1418,17 @@ void arch_unmap_area_topdown(struct mm_struct *mm, unsigned long addr)
+@@ -1440,13 +1460,17 @@ void arch_unmap_area_topdown(struct mm_struct *mm, unsigned long addr)
  }
  
  unsigned long
@@ -683,7 +790,7 @@
  	if (file && file->f_op && file->f_op->get_unmapped_area)
  		get_area = file->f_op->get_unmapped_area;
  	addr = get_area(file, addr, len, pgoff, flags);
-@@ -1430,8 +1442,74 @@ get_unmapped_area(struct file *file, unsigned long addr, unsigned long len,
+@@ -1460,8 +1484,74 @@ get_unmapped_area(struct file *file, unsigned long addr, unsigned long len,
  
  	return arch_rebalance_pgtables(addr, len);
  }
@@ -759,7 +866,7 @@
  
  /* Look up the first VMA which satisfies  addr < vm_end,  NULL if none. */
  struct vm_area_struct * find_vma(struct mm_struct * mm, unsigned long addr)
-@@ -1506,6 +1585,14 @@ out:
+@@ -1536,6 +1626,14 @@ out:
  	return prev ? prev->vm_next : vma;
  }
  
@@ -774,7 +881,7 @@
  /*
   * Verify that the stack growth is acceptable and
   * update accounting. This is shared with both the
-@@ -1522,7 +1609,7 @@ static int acct_stack_growth(struct vm_area_struct * vma, unsigned long size, un
+@@ -1552,7 +1650,7 @@ static int acct_stack_growth(struct vm_area_struct * vma, unsigned long size, un
  		return -ENOMEM;
  
  	/* Stack limit test */
@@ -783,7 +890,7 @@
  		return -ENOMEM;
  
  	/* mlock limit tests */
-@@ -1826,10 +1913,14 @@ int split_vma(struct mm_struct * mm, struct vm_area_struct * vma,
+@@ -1862,10 +1960,14 @@ int split_vma(struct mm_struct * mm, struct vm_area_struct * vma,
  	if (new->vm_ops && new->vm_ops->open)
  		new->vm_ops->open(new);
  
@@ -800,7 +907,7 @@
  		vma_adjust(vma, vma->vm_start, addr, vma->vm_pgoff, new);
  
  	return 0;
-@@ -2173,6 +2173,7 @@ void exit_mmap(struct mm_struct *mm)
+@@ -2109,6 +2211,7 @@ void exit_mmap(struct mm_struct *mm)
  	vm_unacct_memory(nr_accounted);
  	free_pgtables(tlb, vma, FIRST_USER_ADDRESS, 0);
  	tlb_finish_mmu(tlb, 0, end);
@@ -809,11 +916,11 @@
  	/*
  	 * Walk the list again, actually closing and freeing it,
 diff --git a/mm/mprotect.c b/mm/mprotect.c
-index 4de5468..6d822ad 100644
+index fded06f..cdfcbd2 100644
 --- a/mm/mprotect.c
 +++ b/mm/mprotect.c
-@@ -23,8 +23,15 @@
- #include <linux/swapops.h>
+@@ -24,8 +24,15 @@
+ #include <linux/mmu_notifier.h>
  #include <asm/uaccess.h>
  #include <asm/pgtable.h>
 +#include <asm/pgalloc.h>
@@ -828,7 +935,7 @@
  
  #ifndef pgprot_modify
  static inline pgprot_t pgprot_modify(pgprot_t oldprot, pgprot_t newprot)
-@@ -134,7 +138,7 @@ mprotect_fixup(struct vm_area_struct *vma, struct vm_area_struct **pprev,
+@@ -140,7 +147,7 @@ mprotect_fixup(struct vm_area_struct *vma, struct vm_area_struct **pprev,
  	struct mm_struct *mm = vma->vm_mm;
  	unsigned long oldflags = vma->vm_flags;
  	long nrpages = (end - start) >> PAGE_SHIFT;
@@ -837,7 +944,7 @@
  	pgoff_t pgoff;
  	int error;
  	int dirty_accountable = 0;
-@@ -211,6 +211,9 @@ success:
+@@ -204,6 +211,9 @@ success:
  		dirty_accountable = 1;
  	}
  
@@ -848,10 +955,10 @@
  	if (is_vm_hugetlb_page(vma))
  		hugetlb_change_protection(vma, start, end, vma->vm_page_prot);
 diff --git a/mm/mremap.c b/mm/mremap.c
-index 08e3c7f..101f885 100644
+index 58a2908..5bb50e6 100644
 --- a/mm/mremap.c
 +++ b/mm/mremap.c
-@@ -392,8 +392,8 @@ unsigned long do_mremap(unsigned long addr,
+@@ -400,8 +400,8 @@ unsigned long do_mremap(unsigned long addr,
  			if (vma->vm_flags & VM_MAYSHARE)
  				map_flags |= MAP_SHARED;
  

linux-2.6-firewire-git-pending.patch:

Index: linux-2.6-firewire-git-pending.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/linux-2.6-firewire-git-pending.patch,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- linux-2.6-firewire-git-pending.patch	18 Dec 2008 22:04:28 -0000	1.34
+++ linux-2.6-firewire-git-pending.patch	12 Jan 2009 19:54:17 -0000	1.35
@@ -3,128 +3,3 @@
 # tree (and/or in by the time your read this), which we want...
 #
 
-Date: Fri, 26 Sep 2008 16:35:45 -0400
-From: Jay Fenlason <fenlason at redhat.com>
-Subject: [Patch] fix two resource allocation bugs in fw-cdev.c
-
-Bug #1: the resource_handle used to number resources will eventually
-wrap, potentially resulting in two resources having the same handle.
-This will lead to a system crash when the wrong resource is freed.
-
-A better fix for this bug would be to use the idr functions rather
-than keeping a linked list of resources.  I will include that in a
-future patch.
-
-Bug #2: the release_client_resource() function does not check the type
-of the resource it is being asked to free.  Because the handle numbers
-can come directly from userspace, a malicious or buggy program may
-free resources that it shouldn't, possibly causing a program crash.
-
-Signed-off-by: Jay Fenlason <fenlason at redhat.com>
-
---
-
- fw-cdev.c |   32 +++++++++++++++++++++++++-------
- 1 file changed, 25 insertions(+), 7 deletions(-)
-
-diff -rup linux-2.6/drivers/firewire/fw-cdev.c linux-2.6.firewire/drivers/firewire/fw-cdev.c
---- linux-2.6/drivers/firewire/fw-cdev.c	2008-09-22 14:56:02.000000000 -0400
-+++ linux-2.6.firewire/drivers/firewire/fw-cdev.c	2008-09-25 16:13:00.000000000 -0400
-@@ -77,7 +77,6 @@ struct client {
- 	u32 version;
- 	struct fw_device *device;
- 	spinlock_t lock;
--	u32 resource_handle;
- 	struct list_head resource_list;
- 	struct list_head event_list;
- 	wait_queue_head_t wait;
-@@ -321,13 +320,32 @@ add_client_resource(struct client *clien
- 	unsigned long flags;
- 
- 	spin_lock_irqsave(&client->lock, flags);
--	list_add_tail(&resource->link, &client->resource_list);
--	resource->handle = client->resource_handle++;
-+	if (list_empty(&client->resource_list)
-+	    || list_first_entry(&client->resource_list,
-+				struct client_resource,
-+				link)->handle > 0) {
-+		resource->handle = 0;
-+		list_add(&resource->link, &client->resource_list);
-+	} else {
-+		struct client_resource *c_tmp, *c_tmp2;
-+
-+		c_tmp2 = NULL;
-+		list_for_each_entry(c_tmp, &client->resource_list,
-+				    link) {
-+			if (c_tmp2 && c_tmp->handle != c_tmp2->handle+1)
-+				break;
-+			c_tmp2 = c_tmp;
-+		}
-+		BUG_ON(c_tmp2 == NULL);
-+		resource->handle = c_tmp2->handle+1;
-+		list_add(&resource->link, &c_tmp2->link);
-+	}
- 	spin_unlock_irqrestore(&client->lock, flags);
- }
- 
- static int
- release_client_resource(struct client *client, u32 handle,
-+			void (*func)(struct client *client, struct client_resource *r),
- 			struct client_resource **resource)
- {
- 	struct client_resource *r;
-@@ -335,7 +353,7 @@ release_client_resource(struct client *c
- 
- 	spin_lock_irqsave(&client->lock, flags);
- 	list_for_each_entry(r, &client->resource_list, link) {
--		if (r->handle == handle) {
-+		if (r->handle == handle && r->release == func) {
- 			list_del(&r->link);
- 			break;
- 		}
-@@ -555,7 +573,7 @@ static int ioctl_deallocate(struct clien
- {
- 	struct fw_cdev_deallocate *request = buffer;
- 
--	return release_client_resource(client, request->handle, NULL);
-+	return release_client_resource(client, request->handle, release_address_handler, NULL);
- }
- 
- static int ioctl_send_response(struct client *client, void *buffer)
-@@ -564,7 +582,7 @@ static int ioctl_send_response(struct cl
- 	struct client_resource *resource;
- 	struct request *r;
- 
--	if (release_client_resource(client, request->handle, &resource) < 0)
-+	if (release_client_resource(client, request->handle, release_request, &resource) < 0)
- 		return -EINVAL;
- 	r = container_of(resource, struct request, resource);
- 	if (request->length < r->length)
-@@ -646,7 +664,7 @@ static int ioctl_remove_descriptor(struc
- {
- 	struct fw_cdev_remove_descriptor *request = buffer;
- 
--	return release_client_resource(client, request->handle, NULL);
-+	return release_client_resource(client, request->handle, release_descriptor, NULL);
- }
- 
- static void
-
-----------------------
-Date: Wed, 22 Oct 2008 15:59:42 -0400
-From: Jay Fenlason <fenlason at redhat.com>
-Subject: firewire: typo in comment
-
-Signed-off-by: Jay Fenlason <fenlason at redhat.com>
-diff -upr linux-2.6/drivers/firewire/fw-card.c linux-2.6.fw/drivers/firewire/fw-card.c
---- linux-2.6/drivers/firewire/fw-card.c	2008-10-07 11:26:15.000000000 -0400
-+++ linux-2.6.fw/drivers/firewire/fw-card.c	2008-10-22 14:40:14.000000000 -0400
-@@ -76,7 +76,7 @@ generate_config_rom(struct fw_card *card
- 	 * controller, block reads to the config rom accesses the host
- 	 * memory, but quadlet read access the hardware bus info block
- 	 * registers.  That's just crack, but it means we should make
--	 * sure the contents of bus info block in host memory mathces
-+	 * sure the contents of bus info block in host memory matches
- 	 * the version stored in the OHCI registers.
- 	 */
- 

linux-2.6-hdpvr.patch:

Index: linux-2.6-hdpvr.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/linux-2.6-hdpvr.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-hdpvr.patch	30 Oct 2008 07:54:24 -0000	1.1
+++ linux-2.6-hdpvr.patch	12 Jan 2009 19:54:17 -0000	1.2
@@ -1,22 +1,8 @@
- drivers/media/video/Kconfig               |    2 +
- drivers/media/video/Makefile              |    2 +
- drivers/media/video/hdpvr/Kconfig         |   10 +
- drivers/media/video/hdpvr/Makefile        |    7 +
- drivers/media/video/hdpvr/hdpvr-control.c |  212 +++++
- drivers/media/video/hdpvr/hdpvr-core.c    |  455 +++++++++++
- drivers/media/video/hdpvr/hdpvr-i2c.c     |  145 ++++
- drivers/media/video/hdpvr/hdpvr-video.c   | 1258 +++++++++++++++++++++++++++++
- drivers/media/video/hdpvr/hdpvr.h         |  324 ++++++++
- drivers/media/video/v4l2-common.c         |    4 +
- include/linux/i2c-id.h                    |    1 +
- include/linux/videodev2.h                 |    7 +-
- 12 files changed, 2425 insertions(+), 2 deletions(-)
-
 diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig
-index 3e9e0dc..578402f 100644
+index 47102c2..0e279dd 100644
 --- a/drivers/media/video/Kconfig
 +++ b/drivers/media/video/Kconfig
-@@ -801,6 +801,8 @@ source "drivers/media/video/gspca/Kconfig"
+@@ -781,6 +781,8 @@ source "drivers/media/video/gspca/Kconfig"
  
  source "drivers/media/video/pvrusb2/Kconfig"
  
@@ -26,10 +12,10 @@
  
  source "drivers/media/video/usbvision/Kconfig"
 diff --git a/drivers/media/video/Makefile b/drivers/media/video/Makefile
-index ef7c8d3..449ae8b 100644
+index 16962f3..4331a50 100644
 --- a/drivers/media/video/Makefile
 +++ b/drivers/media/video/Makefile
-@@ -121,6 +121,8 @@ obj-$(CONFIG_USB_PWC)           += pwc/
+@@ -115,6 +115,8 @@ obj-$(CONFIG_USB_PWC)           += pwc/
  obj-$(CONFIG_USB_ZC0301)        += zc0301/
  obj-$(CONFIG_USB_GSPCA)         += gspca/
  
@@ -2492,18 +2478,18 @@
 +void print_bytes(char *string, unsigned char *buf, size_t len);
 +#endif
 diff --git a/drivers/media/video/v4l2-common.c b/drivers/media/video/v4l2-common.c
-index 88ca131..8dfaa7d 100644
+index 846763d..34eca15 100644
 --- a/drivers/media/video/v4l2-common.c
 +++ b/drivers/media/video/v4l2-common.c
-@@ -354,6 +354,7 @@ int v4l2_ctrl_query_fill(struct v4l2_queryctrl *qctrl, s32 min, s32 max, s32 ste
- 	case V4L2_CID_CONTRAST: 	name = "Contrast"; break;
- 	case V4L2_CID_SATURATION: 	name = "Saturation"; break;
- 	case V4L2_CID_HUE: 		name = "Hue"; break;
-+	case V4L2_CID_SHARPNESS: 	name = "Sharpness"; break;
+@@ -374,6 +374,7 @@ const char *v4l2_ctrl_get_name(u32 id)
+ 	case V4L2_CID_CONTRAST: 	return "Contrast";
+ 	case V4L2_CID_SATURATION: 	return "Saturation";
+ 	case V4L2_CID_HUE: 		return "Hue";
++	case V4L2_CID_SHARPNESS: 	return "Sharpness";
  
  	/* MPEG controls */
- 	case V4L2_CID_MPEG_CLASS: 		name = "MPEG Encoder Controls"; break;
-@@ -445,6 +446,7 @@ int v4l2_ctrl_query_fill(struct v4l2_queryctrl *qctrl, s32 min, s32 max, s32 ste
+ 	case V4L2_CID_MPEG_CLASS: 		return "MPEG Encoder Controls";
+@@ -480,6 +481,7 @@ int v4l2_ctrl_query_fill(struct v4l2_queryctrl *qctrl, s32 min, s32 max, s32 ste
  	case V4L2_CID_CONTRAST:
  	case V4L2_CID_SATURATION:
  	case V4L2_CID_HUE:
@@ -2511,7 +2497,7 @@
  		qctrl->flags |= V4L2_CTRL_FLAG_SLIDER;
  		break;
  	}
-@@ -483,6 +485,8 @@ int v4l2_ctrl_query_fill_std(struct v4l2_queryctrl *qctrl)
+@@ -518,6 +520,8 @@ int v4l2_ctrl_query_fill_std(struct v4l2_queryctrl *qctrl)
  		return v4l2_ctrl_query_fill(qctrl, 0, 127, 1, 64);
  	case V4L2_CID_HUE:
  		return v4l2_ctrl_query_fill(qctrl, -128, 127, 1, 0);
@@ -2521,10 +2507,10 @@
  	/* MPEG controls */
  	case V4L2_CID_MPEG_AUDIO_SAMPLING_FREQ:
 diff --git a/include/linux/i2c-id.h b/include/linux/i2c-id.h
-index bf34c5f..d0ec672 100644
+index 01d67ba..1a08b81 100644
 --- a/include/linux/i2c-id.h
 +++ b/include/linux/i2c-id.h
-@@ -111,6 +111,7 @@
+@@ -110,6 +110,7 @@
  #define I2C_HW_B_INTELFB	0x010021 /* intel framebuffer driver */
  #define I2C_HW_B_CX23885	0x010022 /* conexant 23885 based tv cards (bus1) */
  #define I2C_HW_B_AU0828		0x010023 /* auvitek au0828 usb bridge */
@@ -2532,28 +2518,3 @@
  
  /* --- PCF 8584 based algorithms					*/
  #define I2C_HW_P_ELEK		0x020002 /* Elektor ISA Bus inteface card */
-diff --git a/include/linux/videodev2.h b/include/linux/videodev2.h
-index 303d93f..f7b6bbc 100644
---- a/include/linux/videodev2.h
-+++ b/include/linux/videodev2.h
-@@ -910,6 +910,8 @@ enum v4l2_mpeg_audio_encoding {
- 	V4L2_MPEG_AUDIO_ENCODING_LAYER_1 = 0,
- 	V4L2_MPEG_AUDIO_ENCODING_LAYER_2 = 1,
- 	V4L2_MPEG_AUDIO_ENCODING_LAYER_3 = 2,
-+	V4L2_MPEG_AUDIO_ENCODING_AAC     = 3,
-+	V4L2_MPEG_AUDIO_ENCODING_AC3     = 4,
- };
- #define V4L2_CID_MPEG_AUDIO_L1_BITRATE 		(V4L2_CID_MPEG_BASE+102)
- enum v4l2_mpeg_audio_l1_bitrate {
-@@ -992,8 +994,9 @@ enum v4l2_mpeg_audio_crc {
- /*  MPEG video */
- #define V4L2_CID_MPEG_VIDEO_ENCODING 		(V4L2_CID_MPEG_BASE+200)
- enum v4l2_mpeg_video_encoding {
--	V4L2_MPEG_VIDEO_ENCODING_MPEG_1 = 0,
--	V4L2_MPEG_VIDEO_ENCODING_MPEG_2 = 1,
-+	V4L2_MPEG_VIDEO_ENCODING_MPEG_1     = 0,
-+	V4L2_MPEG_VIDEO_ENCODING_MPEG_2     = 1,
-+	V4L2_MPEG_VIDEO_ENCODING_MPEG_4_AVC = 2,
- };
- #define V4L2_CID_MPEG_VIDEO_ASPECT 		(V4L2_CID_MPEG_BASE+201)
- enum v4l2_mpeg_video_aspect {

linux-2.6-net-tulip-interrupt.patch:

Index: linux-2.6-net-tulip-interrupt.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/linux-2.6-net-tulip-interrupt.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-net-tulip-interrupt.patch	17 Jul 2008 18:13:46 -0000	1.1
+++ linux-2.6-net-tulip-interrupt.patch	12 Jan 2009 19:54:17 -0000	1.2
@@ -2,9 +2,11 @@
 
 Signed-off-by: Dave Jones <davej at redhat.com>
 
---- linux-2.6.26.noarch/drivers/net/tulip/tulip_core.c~	2008-07-17 14:04:46.000000000 -0400
-+++ linux-2.6.26.noarch/drivers/net/tulip/tulip_core.c	2008-07-17 14:07:38.000000000 -0400
-@@ -504,11 +504,11 @@ tulip_open(struct net_device *dev)
+diff --git a/drivers/net/tulip/tulip_core.c b/drivers/net/tulip/tulip_core.c
+index cafa89e..daa83a7 100644
+--- a/drivers/net/tulip/tulip_core.c
++++ b/drivers/net/tulip/tulip_core.c
+@@ -502,11 +502,11 @@ tulip_open(struct net_device *dev)
  {
  	int retval;
  

linux-2.6-netdev-atl2.patch:

Index: linux-2.6-netdev-atl2.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/linux-2.6-netdev-atl2.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- linux-2.6-netdev-atl2.patch	30 Oct 2008 04:41:12 -0000	1.3
+++ linux-2.6-netdev-atl2.patch	12 Jan 2009 19:54:17 -0000	1.4
@@ -1,12 +1,12 @@
-Index: linux-2.6.26.noarch/drivers/net/Kconfig
-===================================================================
---- linux-2.6.26.noarch.orig/drivers/net/Kconfig
-+++ linux-2.6.26.noarch/drivers/net/Kconfig
-@@ -2375,6 +2375,17 @@ config ATL1E
+diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
+index 231eeaf..9521c2e 100644
+--- a/drivers/net/Kconfig
++++ b/drivers/net/Kconfig
+@@ -2328,6 +2328,17 @@ config ATL1E
  	  To compile this driver as a module, choose M here.  The module
  	  will be called atl1e.
  
-+	config ATL2
++config ATL2
 +	tristate "Atheros L2 Fast Ethernet support (EXPERIMENTAL)"
 +	depends on PCI && EXPERIMENTAL
 +	select CRC32
@@ -17,32 +17,34 @@
 +	  To compile this driver as a module, choose M here.  The module
 +	  will be called atl2.
 +
- endif # NETDEV_1000
- 
- #
-Index: linux-2.6.26.noarch/drivers/net/Makefile
-===================================================================
---- linux-2.6.26.noarch.orig/drivers/net/Makefile
-+++ linux-2.6.26.noarch/drivers/net/Makefile
-@@ -17,6 +17,7 @@ obj-$(CONFIG_CAN) += can/
- obj-$(CONFIG_BONDING) += bonding/
+ config JME
+ 	tristate "JMicron(R) PCI-Express Gigabit Ethernet support"
+ 	depends on PCI
+diff --git a/drivers/net/Makefile b/drivers/net/Makefile
+index 017383a..8e12ec3 100644
+--- a/drivers/net/Makefile
++++ b/drivers/net/Makefile
+@@ -17,6 +17,7 @@ obj-$(CONFIG_BONDING) += bonding/
  obj-$(CONFIG_ATL1) += atlx/
+ obj-$(CONFIG_ATL2) += atlx/
  obj-$(CONFIG_ATL1E) += atl1e/
 +obj-$(CONFIG_ATL2) += atl2/
  obj-$(CONFIG_GIANFAR) += gianfar_driver.o
  obj-$(CONFIG_TEHUTI) += tehuti.o
- 
-Index: linux-2.6.26.noarch/drivers/net/atl2/Makefile
-===================================================================
+ obj-$(CONFIG_ENIC) += enic/
+diff --git a/drivers/net/atl2/Makefile b/drivers/net/atl2/Makefile
+new file mode 100644
+index 0000000..2e451e9
 --- /dev/null
-+++ linux-2.6.26.noarch/drivers/net/atl2/Makefile
++++ b/drivers/net/atl2/Makefile
 @@ -0,0 +1,2 @@
 +obj-$(CONFIG_ATL2)	+= atl2.o
 +atl2-y			+= atl2_main.o atl2_hw.o atl2_ethtool.o atl2_param.o
-Index: linux-2.6.26.noarch/drivers/net/atl2/atl2.h
-===================================================================
+diff --git a/drivers/net/atl2/atl2.h b/drivers/net/atl2/atl2.h
+new file mode 100644
+index 0000000..dbab2e7
 --- /dev/null
-+++ linux-2.6.26.noarch/drivers/net/atl2/atl2.h
++++ b/drivers/net/atl2/atl2.h
 @@ -0,0 +1,120 @@
 +/* atl2.h -- atl2 driver definitions
 + *
@@ -164,10 +166,11 @@
 +};
 +
 +#endif /* _ATL2_H_ */
-Index: linux-2.6.26.noarch/drivers/net/atl2/atl2_ethtool.c
-===================================================================
+diff --git a/drivers/net/atl2/atl2_ethtool.c b/drivers/net/atl2/atl2_ethtool.c
+new file mode 100644
+index 0000000..0466b4a
 --- /dev/null
-+++ linux-2.6.26.noarch/drivers/net/atl2/atl2_ethtool.c
++++ b/drivers/net/atl2/atl2_ethtool.c
 @@ -0,0 +1,416 @@
 +/* atl2_ethtool.c -- atl2 ethtool support
 + *
@@ -585,10 +588,11 @@
 +{
 +	SET_ETHTOOL_OPS(netdev, &atl2_ethtool_ops);
 +}
-Index: linux-2.6.26.noarch/drivers/net/atl2/atl2_hw.c
-===================================================================
+diff --git a/drivers/net/atl2/atl2_hw.c b/drivers/net/atl2/atl2_hw.c
+new file mode 100644
+index 0000000..b8ac641
 --- /dev/null
-+++ linux-2.6.26.noarch/drivers/net/atl2/atl2_hw.c
++++ b/drivers/net/atl2/atl2_hw.c
 @@ -0,0 +1,760 @@
 +/* atl2_hw.c -- atl2 hardware control functions
 + *
@@ -1350,10 +1354,11 @@
 +	atl2_write_phy_reg(hw, MII_DBG_ADDR, 3);
 +	atl2_write_phy_reg(hw, MII_DBG_DATA, 0);
 +}
-Index: linux-2.6.26.noarch/drivers/net/atl2/atl2_hw.h
-===================================================================
+diff --git a/drivers/net/atl2/atl2_hw.h b/drivers/net/atl2/atl2_hw.h
+new file mode 100644
+index 0000000..e8f5b97
 --- /dev/null
-+++ linux-2.6.26.noarch/drivers/net/atl2/atl2_hw.h
++++ b/drivers/net/atl2/atl2_hw.h
 @@ -0,0 +1,758 @@
 +/* atl2_hw.h -- atl2 hardware definitions
 + *
@@ -2113,10 +2118,11 @@
 +};
 +
 +#endif /* _ATL2_HW_H_ */
-Index: linux-2.6.26.noarch/drivers/net/atl2/atl2_main.c
-===================================================================
+diff --git a/drivers/net/atl2/atl2_main.c b/drivers/net/atl2/atl2_main.c
+new file mode 100644
+index 0000000..f1d1810
 --- /dev/null
-+++ linux-2.6.26.noarch/drivers/net/atl2/atl2_main.c
++++ b/drivers/net/atl2/atl2_main.c
 @@ -0,0 +1,1851 @@
 +/* atl2_main.c -- atl2 driver main functions
 + *
@@ -3969,10 +3975,11 @@
 +	struct atl2_adapter *adapter = hw->back;
 +	pci_write_config_word(adapter->pdev, reg, *value);
 +}
-Index: linux-2.6.26.noarch/drivers/net/atl2/atl2_osdep.h
-===================================================================
+diff --git a/drivers/net/atl2/atl2_osdep.h b/drivers/net/atl2/atl2_osdep.h
+new file mode 100644
+index 0000000..b4cf080
 --- /dev/null
-+++ linux-2.6.26.noarch/drivers/net/atl2/atl2_osdep.h
++++ b/drivers/net/atl2/atl2_osdep.h
 @@ -0,0 +1,72 @@
 +/* atl2_osdep.h -- atl2 compat cruft
 + *
@@ -4046,10 +4053,11 @@
 +	(readl(((a)->hw_addr + reg) + ((offset) << 2)))
 +
 +#endif /* _ATL2_OSDEP_H_ */
-Index: linux-2.6.26.noarch/drivers/net/atl2/atl2_param.c
-===================================================================
+diff --git a/drivers/net/atl2/atl2_param.c b/drivers/net/atl2/atl2_param.c
+new file mode 100644
+index 0000000..b26678c
 --- /dev/null
-+++ linux-2.6.26.noarch/drivers/net/atl2/atl2_param.c
++++ b/drivers/net/atl2/atl2_param.c
 @@ -0,0 +1,317 @@
 +/* atl2_param.c -- atl2 parameter processing
 + *

linux-2.6-pciehp-update.patch:

Index: linux-2.6-pciehp-update.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/linux-2.6-pciehp-update.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- linux-2.6-pciehp-update.patch	8 Dec 2008 00:04:08 -0000	1.3
+++ linux-2.6-pciehp-update.patch	12 Jan 2009 19:54:17 -0000	1.4
@@ -1,7 +1,23 @@
-diff -ur vanilla-2.6.27/drivers/pci/hotplug/pciehp_core.c linux-2.6.27.noarch/drivers/pci/hotplug/pciehp_core.c
---- vanilla-2.6.27/drivers/pci/hotplug/pciehp_core.c	2008-10-09 23:13:53.000000000 +0100
-+++ linux-2.6.27.noarch/drivers/pci/hotplug/pciehp_core.c	2008-11-04 13:53:53.000000000 +0000
-@@ -41,6 +41,7 @@
+diff --git a/drivers/pci/hotplug/pciehp.h b/drivers/pci/hotplug/pciehp.h
+index b2801a7..c9f18f9 100644
+--- a/drivers/pci/hotplug/pciehp.h
++++ b/drivers/pci/hotplug/pciehp.h
+@@ -224,6 +224,10 @@ static inline int pciehp_get_hp_hw_control_from_firmware(struct pci_dev *dev)
+ {
+ 	u32 flags = (OSC_PCI_EXPRESS_NATIVE_HP_CONTROL |
+ 		     OSC_PCI_EXPRESS_CAP_STRUCTURE_CONTROL);
++	if (pciehp_force) {
++		dev_info(&dev->dev, "Bypassing BIOS check for pciehp\n");
++		return 0;
++	}
+ 	return acpi_get_hp_hw_control_from_firmware(dev, flags);
+ }
+ 
+diff --git a/drivers/pci/hotplug/pciehp_core.c b/drivers/pci/hotplug/pciehp_core.c
+index 39cf248..ab6b016 100644
+--- a/drivers/pci/hotplug/pciehp_core.c
++++ b/drivers/pci/hotplug/pciehp_core.c
+@@ -41,6 +41,7 @@ int pciehp_debug;
  int pciehp_poll_mode;
  int pciehp_poll_time;
  int pciehp_force;
@@ -9,7 +25,7 @@
  struct workqueue_struct *pciehp_wq;
  
  #define DRIVER_VERSION	"0.4"
-@@ -50,15 +51,18 @@
+@@ -50,15 +51,18 @@ struct workqueue_struct *pciehp_wq;
  MODULE_AUTHOR(DRIVER_AUTHOR);
  MODULE_DESCRIPTION(DRIVER_DESC);
  MODULE_LICENSE("GPL");
@@ -28,7 +44,7 @@
  
  #define PCIE_MODULE_NAME "pciehp"
  
-@@ -85,6 +89,13 @@
+@@ -85,6 +89,13 @@ static struct hotplug_slot_ops pciehp_hotplug_slot_ops = {
    	.get_cur_bus_speed =	get_cur_bus_speed,
  };
  
@@ -42,7 +58,7 @@
  /*
   * Check the status of the Electro Mechanical Interlock (EMI)
   */
-@@ -208,7 +219,11 @@
+@@ -212,7 +223,11 @@ static int init_slots(struct controller *ctrl)
  		hotplug_slot->info = info;
  		hotplug_slot->private = slot;
  		hotplug_slot->release = &release_slot;
@@ -55,39 +71,34 @@
  		slot->hotplug_slot = hotplug_slot;
  		snprintf(name, SLOT_NAME_SIZE, "%u", slot->number);
  
-@@ -401,10 +416,7 @@
+@@ -407,11 +422,7 @@ static int pciehp_probe(struct pcie_device *dev, const struct pcie_port_service_
  	u8 value;
  	struct pci_dev *pdev = dev->port;
  
 -	if (pciehp_force)
--		dbg("Bypassing BIOS check for pciehp use on %s\n",
--		    pci_name(pdev));
+-		dev_info(&dev->device,
+-			 "Bypassing BIOS check for pciehp use on %s\n",
+-			 pci_name(pdev));
 -	else if (pciehp_get_hp_hw_control_from_firmware(pdev))
 +	if (!pciehp_passive && pciehp_get_hp_hw_control_from_firmware(pdev))
  		goto err_out_none;
  
  	ctrl = pcie_init(dev);
-@@ -429,11 +441,9 @@
+@@ -436,7 +447,7 @@ static int pciehp_probe(struct pcie_device *dev, const struct pcie_port_service_
  	t_slot = pciehp_find_slot(ctrl, ctrl->slot_device_offset);
- 
- 	t_slot->hpc_ops->get_adapter_status(t_slot, &value); /* Check if slot is occupied */
--	if (value && pciehp_force) {
--		rc = pciehp_enable_slot(t_slot);
--		if (rc)	/* -ENODEV: shouldn't happen, but deal with it */
--			value = 0;
--	}
-+	if (value && (pciehp_force || pciehp_passive))
-+		pciehp_enable_slot(t_slot);
-+
- 	if ((POWER_CTRL(ctrl)) && !value) {
- 		rc = t_slot->hpc_ops->power_off_slot(t_slot); /* Power off slot if not occupied*/
- 		if (rc)
-@@ -467,8 +477,11 @@
+ 	t_slot->hpc_ops->get_adapter_status(t_slot, &value);
+ 	if (value) {
+-		if (pciehp_force)
++		if (pciehp_force || pciehp_passive)
+ 			pciehp_enable_slot(t_slot);
+ 	} else {
+ 		/* Power off slot if not occupied */
+@@ -474,8 +485,11 @@ static int pciehp_suspend (struct pcie_device *dev, pm_message_t state)
  
  static int pciehp_resume (struct pcie_device *dev)
  {
 +	struct pci_dev *pdev = dev->port;
- 	printk("%s ENTRY\n", __func__);
+ 	dev_info(&dev->device, "%s ENTRY\n", __func__);
 -	if (pciehp_force) {
 +
 +	if (pciehp_force || (pciehp_passive &&
@@ -95,10 +106,11 @@
  		struct controller *ctrl = get_service_data(dev);
  		struct slot *t_slot;
  		u8 status;
-diff -ur vanilla-2.6.27/drivers/pci/hotplug/pciehp_ctrl.c linux-2.6.27.noarch/drivers/pci/hotplug/pciehp_ctrl.c
---- vanilla-2.6.27/drivers/pci/hotplug/pciehp_ctrl.c	2008-10-09 23:13:53.000000000 +0100
-+++ linux-2.6.27.noarch/drivers/pci/hotplug/pciehp_ctrl.c	2008-11-04 15:14:53.000000000 +0000
-@@ -179,7 +179,8 @@
+diff --git a/drivers/pci/hotplug/pciehp_ctrl.c b/drivers/pci/hotplug/pciehp_ctrl.c
+index fead63c..12640bd 100644
+--- a/drivers/pci/hotplug/pciehp_ctrl.c
++++ b/drivers/pci/hotplug/pciehp_ctrl.c
+@@ -185,7 +185,8 @@ static void set_slot_off(struct controller *ctrl, struct slot * pslot)
  	 * before taking any action that relies on power having been
  	 * removed from the slot/adapter.
  	 */
@@ -108,17 +120,7 @@
  
  	if (PWR_LED(ctrl))
  		pslot->hpc_ops->green_led_off(pslot);
-@@ -219,9 +220,6 @@
- 	if (PWR_LED(ctrl))
- 		p_slot->hpc_ops->green_led_blink(p_slot);
- 
--	/* Wait for ~1 second */
--	msleep(1000);
--
- 	/* Check link training status */
- 	retval = p_slot->hpc_ops->check_lnk_status(ctrl);
- 	if (retval) {
-@@ -284,16 +282,16 @@
+@@ -288,16 +289,16 @@ static int remove_board(struct slot *p_slot)
  		}
  	}
  
@@ -143,123 +145,3 @@
  
  	return 0;
  }
-diff -ur vanilla-2.6.27/drivers/pci/hotplug/pciehp.h linux-2.6.27.noarch/drivers/pci/hotplug/pciehp.h
---- vanilla-2.6.27/drivers/pci/hotplug/pciehp.h	2008-10-09 23:13:53.000000000 +0100
-+++ linux-2.6.27.noarch/drivers/pci/hotplug/pciehp.h	2008-11-04 15:14:53.000000000 +0000
-@@ -98,6 +98,7 @@
- 	struct timer_list poll_timer;
- 	int cmd_busy;
- 	unsigned int no_cmd_complete:1;
-+	unsigned int link_active_reporting:1;
- };
- 
- #define INT_BUTTON_IGNORE		0
-@@ -206,6 +207,10 @@
- {
- 	u32 flags = (OSC_PCI_EXPRESS_NATIVE_HP_CONTROL |
- 		     OSC_PCI_EXPRESS_CAP_STRUCTURE_CONTROL);
-+	if (pciehp_force) {
-+		dev_info(&dev->dev, "Bypassing BIOS check for pciehp\n");
-+		return 0;
-+	}
- 	return acpi_get_hp_hw_control_from_firmware(dev, flags);
- }
- 
-diff -ur vanilla-2.6.27/drivers/pci/hotplug/pciehp_hpc.c linux-2.6.27.noarch/drivers/pci/hotplug/pciehp_hpc.c
---- vanilla-2.6.27/drivers/pci/hotplug/pciehp_hpc.c	2008-10-09 23:13:53.000000000 +0100
-+++ linux-2.6.27.noarch/drivers/pci/hotplug/pciehp_hpc.c	2008-11-04 15:17:48.000000000 +0000
-@@ -125,6 +125,7 @@
- /* Field definitions in Link Capabilities Register */
- #define MAX_LNK_SPEED		0x000F
- #define MAX_LNK_WIDTH		0x03F0
-+#define LINK_ACTIVE_REPORTING	0x00100000
- 
- /* Link Width Encoding */
- #define LNK_X1		0x01
-@@ -141,6 +142,7 @@
- #define LNK_TRN_ERR	0x0400
- #define	LNK_TRN		0x0800
- #define SLOT_CLK_CONF	0x1000
-+#define LINK_ACTIVE	0x2000
- 
- /* Field definitions in Slot Capabilities Register */
- #define ATTN_BUTTN_PRSN	0x00000001
-@@ -363,11 +365,52 @@
- 	return retval;
- }
- 
-+static inline int check_link_active(struct controller *ctrl)
-+{
-+	u16 link_status;
-+
-+	if (pciehp_readw(ctrl, LNKSTATUS, &link_status))
-+		return 0;
-+	return !!(link_status & LINK_ACTIVE);
-+}
-+
-+static void pcie_wait_link_active(struct controller *ctrl)
-+{
-+	int timeout = 1000;
-+
-+	if (check_link_active(ctrl))
-+		return;
-+	while (timeout > 0) {
-+		msleep(10);
-+		timeout -= 10;
-+		if (check_link_active(ctrl))
-+			return;
-+	}
-+	dbg("Data Link Layer Link Active not set in 1000 msec\n");
-+}
-+
- static int hpc_check_lnk_status(struct controller *ctrl)
- {
- 	u16 lnk_status;
- 	int retval = 0;
- 
-+        /*
-+         * Data Link Layer Link Active Reporting must be capable for
-+         * hot-plug capable downstream port. But old controller might
-+         * not implement it. In this case, we wait for 1000 ms.
-+         */
-+        if (ctrl->link_active_reporting){
-+                /* Wait for Data Link Layer Link Active bit to be set */
-+                pcie_wait_link_active(ctrl);
-+                /*
-+                 * We must wait for 100 ms after the Data Link Layer
-+                 * Link Active bit reads 1b before initiating a
-+                 * configuration access to the hot added device.
-+                 */
-+                msleep(100);
-+        } else
-+                msleep(1000);
-+
- 	retval = pciehp_readw(ctrl, LNKSTATUS, &lnk_status);
- 	if (retval) {
- 		err("%s: Cannot read LNKSTATUS register\n", __func__);
-@@ -1104,7 +1147,7 @@
- struct controller *pcie_init(struct pcie_device *dev)
- {
- 	struct controller *ctrl;
--	u32 slot_cap;
-+	u32 slot_cap, link_cap;
- 	struct pci_dev *pdev = dev->port;
- 
- 	ctrl = kzalloc(sizeof(*ctrl), GFP_KERNEL);
-@@ -1144,6 +1187,16 @@
- 	    !(POWER_CTRL(ctrl) | ATTN_LED(ctrl) | PWR_LED(ctrl) | EMI(ctrl)))
- 	    ctrl->no_cmd_complete = 1;
- 
-+        /* Check if Data Link Layer Link Active Reporting is implemented */
-+        if (pciehp_readl(ctrl, LNKCAP, &link_cap)) {
-+                err("%s: Cannot read LNKCAP register\n", __func__);
-+                goto abort_ctrl;
-+        }
-+        if (link_cap & LINK_ACTIVE_REPORTING) {
-+                dbg("Link Active Reporting supported\n");
-+                ctrl->link_active_reporting = 1;
-+        }
-+
- 	/* Clear all remaining event bits in Slot Status register */
- 	if (pciehp_writew(ctrl, SLOTSTATUS, 0x1f))
- 		goto abort_ctrl;

linux-2.6-ps3-legacy-bootloader-hack.patch:

Index: linux-2.6-ps3-legacy-bootloader-hack.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/linux-2.6-ps3-legacy-bootloader-hack.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- linux-2.6-ps3-legacy-bootloader-hack.patch	5 Aug 2008 04:50:38 -0000	1.2
+++ linux-2.6-ps3-legacy-bootloader-hack.patch	12 Jan 2009 19:54:17 -0000	1.3
@@ -20,8 +20,8 @@
 +	}
 +#endif
  		lmb_add(base, size);
- 
- 		memstart_addr = min((u64)memstart_addr, base);
+ 	}
+ 	return 0;
 --- a/arch/powerpc/platforms/ps3/setup.c
 +++ b/arch/powerpc/platforms/ps3/setup.c
 @@ -210,7 +210,9 @@ static int __init ps3_probe(void)

linux-2.6-selinux-mprotect-checks.patch:

Index: linux-2.6-selinux-mprotect-checks.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/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	12 Jan 2009 19:54:17 -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-silence-noise.patch:

Index: linux-2.6-silence-noise.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/linux-2.6-silence-noise.patch,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- linux-2.6-silence-noise.patch	30 Oct 2008 04:41:12 -0000	1.17
+++ linux-2.6-silence-noise.patch	12 Jan 2009 19:54:17 -0000	1.18
@@ -41,3 +41,26 @@
 -- 
 1.6.0.1
 
+Socket fuzzers like sfuzz will trigger this printk a lot, even though it's
+ratelimited. It isn't particularly useful, so just remove it.
+
+Signed-off-by: Dave Jones <davej at redhat.com>
+
+--- linux-2.6.27.noarch/net/can/af_can.c~	2008-12-11 16:53:48.000000000 -0500
++++ linux-2.6.27.noarch/net/can/af_can.c	2008-12-11 16:54:42.000000000 -0500
+@@ -134,13 +134,9 @@ static int can_create(struct net *net, s
+ 		err = request_module("can-proto-%d", protocol);
+ 
+ 		/*
+-		 * In case of error we only print a message but don't
+-		 * return the error code immediately.  Below we will
+-		 * return -EPROTONOSUPPORT
++		 * In case of error we don't return the error code immediately.
++		 * Below we will return -EPROTONOSUPPORT
+ 		 */
+-		if (err && printk_ratelimit())
+-			printk(KERN_ERR "can: request_module "
+-			       "(can-proto-%d) failed.\n", protocol);
+ 	}
+ #endif
+ 

linux-2.6-squashfs.patch:

Index: linux-2.6-squashfs.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/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	30 Oct 2008 04:41:12 -0000	1.30
+++ linux-2.6-squashfs.patch	12 Jan 2009 19:54:17 -0000	1.31
@@ -1,7 +1,8 @@
-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
+diff --git a/fs/Kconfig b/fs/Kconfig
+index 522469a..b3ecd03 100644
+--- a/fs/Kconfig
++++ b/fs/Kconfig
+@@ -931,6 +931,56 @@ config CRAMFS
  
  	  If unsure, say N.
  
@@ -58,10 +59,11 @@
  config VXFS_FS
  	tristate "FreeVxFS file system support (VERITAS VxFS(TM) compatible)"
  	depends on BLOCK
-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/
+diff --git a/fs/Makefile b/fs/Makefile
+index d9f8afe..c567180 100644
+--- a/fs/Makefile
++++ b/fs/Makefile
+@@ -76,6 +76,7 @@ obj-$(CONFIG_JBD)		+= jbd/
  obj-$(CONFIG_JBD2)		+= jbd2/
  obj-$(CONFIG_EXT2_FS)		+= ext2/
  obj-$(CONFIG_CRAMFS)		+= cramfs/
@@ -69,10 +71,25 @@
  obj-y				+= ramfs/
  obj-$(CONFIG_HUGETLBFS)		+= hugetlbfs/
  obj-$(CONFIG_CODA_FS)		+= coda/
-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 @@
+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..335ba3e
+--- /dev/null
++++ b/fs/squashfs/inode.c
+@@ -0,0 +1,2158 @@
 +/*
 + * Squashfs - a compressed read only filesystem for Linux
 + *
@@ -714,29 +731,14 @@
 +{
 +	squashfs_inode_t inode;
 +	struct inode *i;
-+	struct dentry *dentry;
++	struct dentry *dentry = ERR_PTR(-ENOENT);
 +
 +	TRACE("Entered squashfs_export_iget\n");
 +
 +	inode = squashfs_inode_lookup(s, inode_number);
-+	if(inode == SQUASHFS_INVALID_BLK) {
-+		dentry = ERR_PTR(-ENOENT);
-+		goto failure;
-+	}
-+
-+	i = squashfs_iget(s, inode, inode_number);
-+	if(i == NULL) {
-+		dentry = ERR_PTR(-EACCES);
-+		goto failure;
-+	}
++	if (inode != SQUASHFS_INVALID_BLK)
++		dentry = d_obtain_alias(squashfs_iget(s, inode, inode_number));
 +
-+	dentry = d_alloc_anon(i);
-+	if (dentry == NULL) {
-+		iput(i);
-+		dentry = ERR_PTR(-ENOMEM);
-+	}
-+
-+failure:
 +	return dentry;
 +}
 +
@@ -2246,20 +2248,103 @@
 +MODULE_DESCRIPTION("squashfs 3.4, a compressed read-only filesystem");
 +MODULE_AUTHOR("Phillip Lougher <phillip at lougher.demon.co.uk>");
 +MODULE_LICENSE("GPL");
-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.
-+#
+diff --git a/fs/squashfs/squashfs.h b/fs/squashfs/squashfs.h
+new file mode 100644
+index 0000000..4e11742
+--- /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, 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
++ */
 +
-+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
++#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 --git a/fs/squashfs/squashfs2_0.c b/fs/squashfs/squashfs2_0.c
+new file mode 100644
+index 0000000..30ebdb9
+--- /dev/null
++++ b/fs/squashfs/squashfs2_0.c
 @@ -0,0 +1,740 @@
 +/*
 + * Squashfs - a compressed read only filesystem for Linux
@@ -3001,99 +3086,11 @@
 +
 +	return 1;
 +}
-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
+diff --git a/include/linux/squashfs_fs.h b/include/linux/squashfs_fs.h
+new file mode 100644
+index 0000000..4cdd11f
+--- /dev/null
++++ b/include/linux/squashfs_fs.h
 @@ -0,0 +1,935 @@
 +#ifndef SQUASHFS_FS
 +#define SQUASHFS_FS
@@ -4030,9 +4027,11 @@
 +
 +#endif
 +#endif
-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
+diff --git a/include/linux/squashfs_fs_i.h b/include/linux/squashfs_fs_i.h
+new file mode 100644
+index 0000000..b41c13c
+--- /dev/null
++++ b/include/linux/squashfs_fs_i.h
 @@ -0,0 +1,45 @@
 +#ifndef SQUASHFS_FS_I
 +#define SQUASHFS_FS_I
@@ -4079,9 +4078,11 @@
 +	struct inode	vfs_inode;
 +};
 +#endif
-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
+diff --git a/include/linux/squashfs_fs_sb.h b/include/linux/squashfs_fs_sb.h
+new file mode 100644
+index 0000000..75c3716
+--- /dev/null
++++ b/include/linux/squashfs_fs_sb.h
 @@ -0,0 +1,79 @@
 +#ifndef SQUASHFS_FS_SB
 +#define SQUASHFS_FS_SB
@@ -4162,9 +4163,10 @@
 +	int			(*read_fragment_index_table)(struct super_block *s);
 +};
 +#endif
-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
+diff --git a/init/do_mounts_rd.c b/init/do_mounts_rd.c
+index a7c748f..a343342 100644
+--- a/init/do_mounts_rd.c
++++ b/init/do_mounts_rd.c
 @@ -5,6 +5,7 @@
  #include <linux/ext2_fs.h>
  #include <linux/romfs_fs.h>
@@ -4173,7 +4175,7 @@
  #include <linux/initrd.h>
  #include <linux/string.h>
  
-@@ -37,6 +38,7 @@ static int __init crd_load(int in_fd, in
+@@ -37,6 +38,7 @@ static int __init crd_load(int in_fd, int out_fd);
   * numbers could not be found.
   *
   * We currently check for the following magic numbers:
@@ -4181,7 +4183,7 @@
   * 	minix
   * 	ext2
   *	romfs
-@@ -51,6 +53,7 @@ identify_ramdisk_image(int fd, int start
+@@ -51,6 +53,7 @@ identify_ramdisk_image(int fd, int start_block)
  	struct ext2_super_block *ext2sb;
  	struct romfs_super_block *romfsb;
  	struct cramfs_super *cramfsb;
@@ -4189,7 +4191,7 @@
  	int nblocks = -1;
  	unsigned char *buf;
  
-@@ -62,6 +65,7 @@ identify_ramdisk_image(int fd, int start
+@@ -62,6 +65,7 @@ identify_ramdisk_image(int fd, int start_block)
  	ext2sb = (struct ext2_super_block *) buf;
  	romfsb = (struct romfs_super_block *) buf;
  	cramfsb = (struct cramfs_super *) buf;
@@ -4197,7 +4199,7 @@
  	memset(buf, 0xe5, size);
  
  	/*
-@@ -99,6 +103,18 @@ identify_ramdisk_image(int fd, int start
+@@ -99,6 +103,18 @@ identify_ramdisk_image(int fd, int start_block)
  		goto done;
  	}
  

linux-2.6-upstream-reverts.patch:

Index: linux-2.6-upstream-reverts.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/linux-2.6-upstream-reverts.patch,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- linux-2.6-upstream-reverts.patch	9 Nov 2008 22:29:17 -0000	1.15
+++ linux-2.6-upstream-reverts.patch	12 Jan 2009 19:54:17 -0000	1.16
@@ -1,384 +1 @@
-From 4b40893918203ee1a1f6a114316c2a19c072e9bd Mon Sep 17 00:00:00 2001
-From: Matthias Hopf <mhopf at suse.de>
-Date: Sat, 18 Oct 2008 07:18:05 +1000
-Subject: drm/i915: fix ioremap of a user address for non-root (CVE-2008-3831)
-Status: O
-Content-Length: 1367
-Lines: 30
-
-From: Matthias Hopf <mhopf at suse.de>
-
-commit 4b40893918203ee1a1f6a114316c2a19c072e9bd upstream
-
-Olaf Kirch noticed that the i915_set_status_page() function of the i915
-kernel driver calls ioremap with an address offset that is supplied by
-userspace via ioctl. The function zeroes the mapped memory via memset
-and tells the hardware about the address. Turns out that access to that
-ioctl is not restricted to root so users could probably exploit that to
-do nasty things. We haven't tried to write actual exploit code though.
-
-It only affects the Intel G33 series and newer.
-
-Signed-off-by: Dave Airlie <airlied at redhat.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
-
----
- drivers/gpu/drm/i915/i915_dma.c |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/drivers/gpu/drm/i915/i915_dma.c
-+++ b/drivers/gpu/drm/i915/i915_dma.c
-@@ -836,7 +836,7 @@ struct drm_ioctl_desc i915_ioctls[] = {
- 	DRM_IOCTL_DEF(DRM_I915_SET_VBLANK_PIPE,  i915_vblank_pipe_set, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY ),
- 	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),
-+	DRM_IOCTL_DEF(DRM_I915_HWS_ADDR, i915_set_status_page, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),
- };
- 
- int i915_max_ioctl = DRM_ARRAY_SIZE(i915_ioctls);
-From cebbert at redhat.com  Mon Oct 27 13:55:39 2008
-Status: RO
-Content-Length: 324
-Lines: 7
-
-Revert these patches from the stable queue:
-firewire-fix-ioctl-return-code.patch
-firewire-fix-setting-tag-and-sy-in-iso-transmission.patch
-firewire-fix-struct-fw_node-memory-leak.patch
-firewire-fw-sbp2-delay-first-login-to-avoid-retries.patch
-firewire-fw-sbp2-fix-races.patch
-firewire-survive-more-than-256-bus-resets.patch
-
-From stefanr at s5r6.in-berlin.de  Tue Nov  4 13:55:39 2008
-From: Stefan Richter <stefanr at s5r6.in-berlin.de>
-Date: Mon, 27 Oct 2008 23:26:35 +0100 (CET)
-Subject: firewire: fix ioctl() return code
-To: stable at kernel.org
-Cc: linux1394-devel at lists.sourceforge.net, linux-kernel at vger.kernel.org
-Message-ID: <tkrat.509dbd5216c80cfd at s5r6.in-berlin.de>
-Content-Disposition: INLINE
-Status: O
-Content-Length: 680
-Lines: 27
-
-
-From: Stefan Richter <stefanr at s5r6.in-berlin.de>
-
-commit 99692f71ee04c6f249d0bf6a581359f32f409a38 upstream
-
-Reported by Jay Fenlason:  ioctl() did not return as intended
-  - the size of data read into ioctl_send_request,
-  - the number of datagrams enqueued by ioctl_queue_iso.
-
-
-Signed-off-by: Stefan Richter <stefanr at s5r6.in-berlin.de>
-Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
-
----
- drivers/firewire/fw-cdev.c |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/drivers/firewire/fw-cdev.c
-+++ b/drivers/firewire/fw-cdev.c
-@@ -913,7 +913,7 @@ dispatch_ioctl(struct client *client, un
- 			return -EFAULT;
- 	}
- 
--	return 0;
-+	return retval;
- }
- 
- static long
-From stefanr at s5r6.in-berlin.de  Tue Nov  4 13:54:50 2008
-From: Stefan Richter <stefanr at s5r6.in-berlin.de>
-Date: Mon, 27 Oct 2008 23:26:00 +0100 (CET)
-Subject: firewire: fix setting tag and sy in iso transmission
-To: stable at kernel.org
-Cc: linux1394-devel at lists.sourceforge.net, linux-kernel at vger.kernel.org
-Message-ID: <tkrat.c6c9e197bd5d3af2 at s5r6.in-berlin.de>
-Content-Disposition: INLINE
-Status: O
-Content-Length: 948
-Lines: 26
-
-From: Stefan Richter <stefanr at s5r6.in-berlin.de>
-
-commit 7a1003449c693f0d57443c8786bbf19717921ae0 upstream
-
-Reported by Jay Fenlason:
-The iso packet control accessors in fw-cdev.c had bogus masks.
-
-Signed-off-by: Stefan Richter <stefanr at s5r6.in-berlin.de>
-Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
-
----
- drivers/firewire/fw-cdev.c |    4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
---- a/drivers/firewire/fw-cdev.c
-+++ b/drivers/firewire/fw-cdev.c
-@@ -720,8 +720,8 @@ static int ioctl_create_iso_context(stru
- #define GET_PAYLOAD_LENGTH(v)	((v) & 0xffff)
- #define GET_INTERRUPT(v)	(((v) >> 16) & 0x01)
- #define GET_SKIP(v)		(((v) >> 17) & 0x01)
--#define GET_TAG(v)		(((v) >> 18) & 0x02)
--#define GET_SY(v)		(((v) >> 20) & 0x04)
-+#define GET_TAG(v)		(((v) >> 18) & 0x03)
-+#define GET_SY(v)		(((v) >> 20) & 0x0f)
- #define GET_HEADER_LENGTH(v)	(((v) >> 24) & 0xff)
- 
- static int ioctl_queue_iso(struct client *client, void *buffer)
-From stefanr at s5r6.in-berlin.de  Tue Nov  4 13:57:03 2008
-From: Jay Fenlason <fenlason at redhat.com>
-Date: Mon, 27 Oct 2008 23:28:14 +0100 (CET)
-Subject: firewire: fix struct fw_node memory leak
-To: stable at kernel.org
-Cc: linux1394-devel at lists.sourceforge.net, linux-kernel at vger.kernel.org
-Message-ID: <tkrat.e499a05eaa0ec529 at s5r6.in-berlin.de>
-Content-Disposition: INLINE
-Status: O
-Content-Length: 1050
-Lines: 36
-
-From: Jay Fenlason <fenlason at redhat.com>
-
-commit 77e557191701afa55ae7320d42ad6458a2ad292e upstream
-
-With the bus_resets patch applied, it is easy to see this memory leak
-by repeatedly resetting the firewire bus while running slabtop in
-another window.  Just watch kmalloc-32 grow and grow...
-
-Signed-off-by: Jay Fenlason <fenlason at redhat.com>
-Signed-off-by: Stefan Richter <stefanr at s5r6.in-berlin.de>
-
----
- drivers/firewire/fw-topology.c |    6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
---- a/drivers/firewire/fw-topology.c
-+++ b/drivers/firewire/fw-topology.c
-@@ -413,7 +413,7 @@ static void
- update_tree(struct fw_card *card, struct fw_node *root)
- {
- 	struct list_head list0, list1;
--	struct fw_node *node0, *node1;
-+	struct fw_node *node0, *node1, *next1;
- 	int i, event;
- 
- 	INIT_LIST_HEAD(&list0);
-@@ -485,7 +485,9 @@ update_tree(struct fw_card *card, struct
- 		}
- 
- 		node0 = fw_node(node0->link.next);
--		node1 = fw_node(node1->link.next);
-+		next1 = fw_node(node1->link.next);
-+		fw_node_put(node1);
-+		node1 = next1;
- 	}
- }
- 
-From stefanr at s5r6.in-berlin.de  Tue Nov  4 13:57:36 2008
-From: Stefan Richter <stefanr at s5r6.in-berlin.de>
-Date: Mon, 27 Oct 2008 23:29:00 +0100 (CET)
-Subject: firewire: fw-sbp2: delay first login to avoid retries
-To: stable at kernel.org
-Cc: linux1394-devel at lists.sourceforge.net, linux-kernel at vger.kernel.org
-Message-ID: <tkrat.9bc21c3b6a97bebe at s5r6.in-berlin.de>
-Content-Disposition: INLINE
-Status: O
-Content-Length: 1597
-Lines: 40
-
-From: Stefan Richter <stefanr at s5r6.in-berlin.de>
-
-commit 0dcfeb7e3c8695c5aa3677dda8efb9bef2e7e64d upstream
-
-This optimizes firewire-sbp2's device probe for the case that the local
-node and the SBP-2 node were discovered at the same time.  In this case,
-fw-core's bus management work and fw-sbp2's login and SCSI probe work
-are scheduled in parallel (in the globally shared workqueue and in
-fw-sbp2's workqueue, respectively).  The bus reset from fw-core may then
-disturb and extremely delay the login and SCSI probe because the latter
-fails with several command timeouts and retries and has to be retried
-from scratch.
-
-We avoid this particular situation of sbp2_login() and fw_card_bm_work()
-running in parallel by delaying the first sbp2_login() a little bit.
-
-This is meant to be a short-term fix for
-https://bugzilla.redhat.com/show_bug.cgi?id=466679.  In the long run,
-the SCSI probe, i.e. fw-sbp2's call of __scsi_add_device(), should be
-parallelized with sbp2_reconnect().
-
-Problem reported and fix tested and confirmed by Alex Kanavin.
-
-Signed-off-by: Stefan Richter <stefanr at s5r6.in-berlin.de>
-Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
-
----
- drivers/firewire/fw-sbp2.c |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/drivers/firewire/fw-sbp2.c
-+++ b/drivers/firewire/fw-sbp2.c
-@@ -1158,7 +1158,7 @@ static int sbp2_probe(struct device *dev
- 
- 	/* Do the login in a workqueue so we can easily reschedule retries. */
- 	list_for_each_entry(lu, &tgt->lu_list, link)
--		sbp2_queue_work(lu, 0);
-+		sbp2_queue_work(lu, DIV_ROUND_UP(HZ, 5));
- 	return 0;
- 
-  fail_tgt_put:
-From stefanr at s5r6.in-berlin.de  Tue Nov  4 13:58:11 2008
-From: Jay Fenlason <fenlason at redhat.com>
-Date: Mon, 27 Oct 2008 23:29:32 +0100 (CET)
-Subject: firewire: fw-sbp2: fix races
-To: stable at kernel.org
-Cc: linux1394-devel at lists.sourceforge.net, linux-kernel at vger.kernel.org
-Message-ID: <tkrat.84265bc39337ceb3 at s5r6.in-berlin.de>
-Status: O
-Content-Length: 3223
-Lines: 95
-
-From: Jay Fenlason <fenlason at redhat.com>
-
-Same as commit cd1f70fdb4823c97328a1f151f328eb36fafd579 upstream
-
-1: There is a small race between queue_delayed_work() and its
-   corresponding kref_get().  Do the kref_get first, and _put it again
-   if the queue_delayed_work() failed, so there is no chance of the
-   kref going to zero while the work is scheduled.
-2: An SBP2_LOGOUT_REQUEST could be sent out with a login_id full of
-   garbage.  Initialize it to an invalid value so we can tell if we
-   ever got a valid login_id.
-3: The node ID and generation may have changed but the new values may
-   not yet have been recorded in lu and tgt when the final logout is
-   attempted.  Use the latest values from the device in
-   sbp2_release_target().
-
-Signed-off-by: Jay Fenlason <fenlason at redhat.com>
-Signed-off-by: Stefan Richter <stefanr at s5r6.in-berlin.de>
-Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
-
----
- drivers/firewire/fw-sbp2.c |   36 ++++++++++++++++++++++++++----------
- 1 file changed, 26 insertions(+), 10 deletions(-)
-
---- a/drivers/firewire/fw-sbp2.c
-+++ b/drivers/firewire/fw-sbp2.c
-@@ -172,6 +172,9 @@ struct sbp2_target {
- 	int blocked;	/* ditto */
- };
- 
-+/* Impossible login_id, to detect logout attempt before successful login */
-+#define INVALID_LOGIN_ID 0x10000
-+
- /*
-  * Per section 7.4.8 of the SBP-2 spec, a mgt_ORB_timeout value can be
-  * provided in the config rom. Most devices do provide a value, which
-@@ -791,9 +794,20 @@ static void sbp2_release_target(struct k
- 			scsi_remove_device(sdev);
- 			scsi_device_put(sdev);
- 		}
--		sbp2_send_management_orb(lu, tgt->node_id, lu->generation,
--				SBP2_LOGOUT_REQUEST, lu->login_id, NULL);
--
-+		if (lu->login_id != INVALID_LOGIN_ID) {
-+			int generation, node_id;
-+			/*
-+			 * tgt->node_id may be obsolete here if we failed
-+			 * during initial login or after a bus reset where
-+			 * the topology changed.
-+			 */
-+			generation = device->generation;
-+			smp_rmb(); /* node_id vs. generation */
-+			node_id    = device->node_id;
-+			sbp2_send_management_orb(lu, node_id, generation,
-+						 SBP2_LOGOUT_REQUEST,
-+						 lu->login_id, NULL);
-+		}
- 		fw_core_remove_address_handler(&lu->address_handler);
- 		list_del(&lu->link);
- 		kfree(lu);
-@@ -808,19 +822,20 @@ static void sbp2_release_target(struct k
- 
- static struct workqueue_struct *sbp2_wq;
- 
-+static void sbp2_target_put(struct sbp2_target *tgt)
-+{
-+	kref_put(&tgt->kref, sbp2_release_target);
-+}
-+
- /*
-  * Always get the target's kref when scheduling work on one its units.
-  * Each workqueue job is responsible to call sbp2_target_put() upon return.
-  */
- static void sbp2_queue_work(struct sbp2_logical_unit *lu, unsigned long delay)
- {
--	if (queue_delayed_work(sbp2_wq, &lu->work, delay))
--		kref_get(&lu->tgt->kref);
--}
--
--static void sbp2_target_put(struct sbp2_target *tgt)
--{
--	kref_put(&tgt->kref, sbp2_release_target);
-+	kref_get(&lu->tgt->kref);
-+	if (!queue_delayed_work(sbp2_wq, &lu->work, delay))
-+		sbp2_target_put(lu->tgt);
- }
- 
- static void
-@@ -993,6 +1008,7 @@ static int sbp2_add_logical_unit(struct 
- 
- 	lu->tgt      = tgt;
- 	lu->lun      = lun_entry & 0xffff;
-+	lu->login_id = INVALID_LOGIN_ID;
- 	lu->retries  = 0;
- 	lu->has_sdev = false;
- 	lu->blocked  = false;
-From stefanr at s5r6.in-berlin.de  Tue Nov  4 13:56:10 2008
-From: Jay Fenlason <fenlason at redhat.com>
-Date: Mon, 27 Oct 2008 23:27:37 +0100 (CET)
-Subject: firewire: Survive more than 256 bus resets
-To: stable at kernel.org
-Cc: linux1394-devel at lists.sourceforge.net, linux-kernel at vger.kernel.org
-Message-ID: <tkrat.6faab57f3da8f9b9 at s5r6.in-berlin.de>
-Content-Disposition: INLINE
-Status: O
-Content-Length: 1058
-Lines: 31
-
-From: Jay Fenlason <fenlason at redhat.com>
-
-Same as commit 4f9740d4f5a17fa6a1b097fa3ccdfb7246660307 upstream
-
-The "color" is used during the topology building after a bus reset,
-hovever in "struct fw_node"s it is stored in a u8, but in struct fw_card
-it is stored in an int.  When the value wraps in one struct, but not
-the other, disaster strikes.
-
-Fixes http://bugzilla.kernel.org/show_bug.cgi?id=10922 -
-machine locks up solid if a series of bus resets occurs.
-
-
-Signed-off-by: Jay Fenlason <fenlason at redhat.com>
-Signed-off-by: Stefan Richter <stefanr at s5r6.in-berlin.de>
-Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
-
----
- drivers/firewire/fw-transaction.h |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/drivers/firewire/fw-transaction.h
-+++ b/drivers/firewire/fw-transaction.h
-@@ -248,7 +248,7 @@ struct fw_card {
- 	struct fw_node *local_node;
- 	struct fw_node *root_node;
- 	struct fw_node *irm_node;
--	int color;
-+	u8 color; /* must be u8 to match the definition in struct fw_node */
- 	int gap_count;
- 	bool beta_repeaters_present;
- 
+nil

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.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- linux-2.6-utrace.patch	30 Oct 2008 04:41:12 -0000	1.81
+++ linux-2.6-utrace.patch	12 Jan 2009 19:54:17 -0000	1.82
@@ -1,4 +1,4 @@
- Documentation/DocBook/Makefile    |    2 +-
+ Documentation/DocBook/Makefile    |    4 +-
  Documentation/DocBook/utrace.tmpl |  566 ++++++++
  fs/proc/array.c                   |    3 +
  include/linux/ptrace.h            |   21 +
@@ -7,24 +7,28 @@
  include/linux/utrace.h            |  707 ++++++++++
  init/Kconfig                      |   26 +
  kernel/Makefile                   |    1 +
- kernel/ptrace.c                   |  612 +++++++++-
+ kernel/ptrace.c                   |  793 +++++++++++-
  kernel/signal.c                   |   14 +-
- kernel/utrace.c                   | 2586 +++++++++++++++++++++++++++++++++++++
- 12 files changed, 4604 insertions(+), 8 deletions(-)
+ kernel/utrace.c                   | 2587 +++++++++++++++++++++++++++++++++++++
+ 12 files changed, 4783 insertions(+), 13 deletions(-)
 
 diff --git a/Documentation/DocBook/Makefile b/Documentation/DocBook/Makefile
-index 1615350..92ca631 100644  
+index 9b1f6ca..e39334b 100644  
 --- a/Documentation/DocBook/Makefile
 +++ b/Documentation/DocBook/Makefile
-@@ -7,7 +7,7 @@
+@@ -6,10 +6,10 @@
+ # To add a new book the only step required is to add the book to the
  # list of DOCBOOKS.
  
- DOCBOOKS := wanbook.xml z8530book.xml mcabook.xml videobook.xml \
--	    kernel-hacking.xml kernel-locking.xml deviceiobook.xml \
-+	    kernel-hacking.xml kernel-locking.xml deviceiobook.xml utrace.xml \
+-DOCBOOKS := wanbook.xml z8530book.xml mcabook.xml \
++DOCBOOKS := wanbook.xml z8530book.xml mcabook.xml \
+ 	    kernel-hacking.xml kernel-locking.xml deviceiobook.xml \
  	    procfs-guide.xml writing_usb_driver.xml networking.xml \
- 	    kernel-api.xml filesystems.xml lsm.xml usb.xml kgdb.xml \
+-	    kernel-api.xml filesystems.xml lsm.xml usb.xml kgdb.xml \
++	    kernel-api.xml filesystems.xml lsm.xml usb.xml kgdb.xml utrace.xml \
  	    gadget.xml libata.xml mtdnand.xml librs.xml rapidio.xml \
+ 	    genericirq.xml s390-drivers.xml uio-howto.xml scsi.xml \
+ 	    mac80211.xml debugobjects.xml sh.xml
 diff --git a/Documentation/DocBook/utrace.tmpl b/Documentation/DocBook/utrace.tmpl
 new file mode 100644
 index ...1c37104 100644  
@@ -598,7 +602,7 @@
 +
 +</book>
 diff --git a/fs/proc/array.c b/fs/proc/array.c
-index f4bc0e7..469903f 100644  
+index 6af7fba..9b6902a 100644  
 --- a/fs/proc/array.c
 +++ b/fs/proc/array.c
 @@ -81,6 +81,7 @@
@@ -619,10 +623,10 @@
  	if (p->files)
  		fdt = files_fdtable(p->files);
 diff --git a/include/linux/ptrace.h b/include/linux/ptrace.h
-index ea7416c..06eaace 100644  
+index 22641d5..91b3412 100644  
 --- a/include/linux/ptrace.h
 +++ b/include/linux/ptrace.h
-@@ -121,6 +121,7 @@ static inline void ptrace_unlink(struct 
+@@ -120,6 +120,7 @@ static inline void ptrace_unlink(struct 
  int generic_ptrace_peekdata(struct task_struct *tsk, long addr, long data);
  int generic_ptrace_pokedata(struct task_struct *tsk, long addr, long data);
  
@@ -630,7 +634,7 @@
  /**
   * task_ptrace - return %PT_* flags that apply to a task
   * @task:	pointer to &task_struct in question
-@@ -154,6 +155,26 @@ static inline int ptrace_event(int mask,
+@@ -153,6 +154,26 @@ static inline int ptrace_event(int mask,
  	return 1;
  }
  
@@ -658,10 +662,10 @@
   * 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 c226c7b..97e3606 100644  
+index 55e30d1..b82b5f4 100644  
 --- a/include/linux/sched.h
 +++ b/include/linux/sched.h
-@@ -1199,6 +1199,11 @@ struct task_struct {
+@@ -1243,6 +1243,11 @@ struct task_struct {
  #endif
  	seccomp_t seccomp;
  
@@ -673,7 +677,7 @@
  /* Thread group tracking */
     	u32 parent_exec_id;
     	u32 self_exec_id;
-@@ -1775,6 +1780,7 @@ extern int kill_pgrp(struct pid *pid, in
+@@ -1829,6 +1834,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);
@@ -1628,10 +1632,10 @@
 +
 +#endif	/* linux/utrace.h */
 diff --git a/init/Kconfig b/init/Kconfig
-index 8a8e2d0..e52678f 100644  
+index f763762..df75f9c 100644  
 --- a/init/Kconfig
 +++ b/init/Kconfig
-@@ -888,6 +888,32 @@ config STOP_MACHINE
+@@ -923,6 +923,32 @@ config STOP_MACHINE
  	help
  	  Need stop_machine() primitive.
  
@@ -1665,7 +1669,7 @@
  
  config PREEMPT_NOTIFIERS
 diff --git a/kernel/Makefile b/kernel/Makefile
-index 4e1d7df..eca21ef 100644  
+index 19fad00..16a30b0 100644  
 --- a/kernel/Makefile
 +++ b/kernel/Makefile
 @@ -64,6 +64,7 @@ obj-$(CONFIG_IKCONFIG) += configs.o
@@ -1677,7 +1681,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..29c60d1 100644  
+index 4c8bcd7..8d19d04 100644  
 --- a/kernel/ptrace.c
 +++ b/kernel/ptrace.c
 @@ -16,6 +16,7 @@
@@ -1696,7 +1700,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,55 @@ void ptrace_untrace(struct task_struct *
+@@ -58,6 +60,72 @@ static void ptrace_untrace(struct task_s
  	spin_unlock(&child->sighand->siglock);
  }
  
@@ -1706,7 +1710,7 @@
 +		ptrace_untrace(child);
 +}
 +
-+static void ptrace_detach_task(struct task_struct *child)
++static void ptrace_detach_task(struct task_struct *child, int sig)
 +{
 +	/* Architecture-specific hardware disable .. */
 +	ptrace_disable(child);
@@ -1721,17 +1725,34 @@
 +
 +static const struct utrace_engine_ops ptrace_utrace_ops; /* forward decl */
 +
-+static void ptrace_detach_task(struct task_struct *child)
++static void ptrace_detach_task(struct task_struct *child, int sig)
 +{
++	enum utrace_resume_action action = UTRACE_DETACH;
 +	struct utrace_attached_engine *engine;
++	int ret;
++
 +	engine = utrace_attach_task(child, UTRACE_ATTACH_MATCH_OPS,
 +				    &ptrace_utrace_ops, NULL);
-+	if (likely(!IS_ERR(engine))) {
-+		int ret = utrace_control(child, engine, UTRACE_DETACH);
-+		WARN_ON(ret && ret != -EINPROGRESS &&
-+			ret != -ESRCH && ret != -EALREADY);
-+		utrace_engine_put(engine);
++	if (unlikely(IS_ERR(engine)))
++		return;
++
++	/*
++	 * When leaving a parting signal to deliver, we cannot detach our
++	 * utrace engine yet.  We need it there to get a report_signal()
++	 * callback that can inject our parting signal.  Instead, we'll
++	 * mark our engine by clearing its data pointer.  Our callbacks
++	 * will see this and know it's a PTRACE_DETACH still in progress.
++	 */
++	if (sig) {
++		engine->data = NULL;
++		action = UTRACE_INTERRUPT;
 +	}
++
++	ret = utrace_control(child, engine, action);
++	WARN_ON(ret && ret != -EINPROGRESS &&
++		ret != -ESRCH && ret != -EALREADY);
++
++	utrace_engine_put(engine);
 +}
 +
 +void ptrace_utrace_exit(struct task_struct *task)
@@ -1739,7 +1760,7 @@
 +	struct task_struct *child;
 +	read_lock(&tasklist_lock);
 +	list_for_each_entry(child, &task->ptraced, ptrace_entry)
-+		ptrace_detach_task(child);
++		ptrace_detach_task(child, 0);
 +	read_unlock(&tasklist_lock);
 +}
 +
@@ -1752,7 +1773,7 @@
  /*
   * unptrace a task: move it back to its original parent and
   * remove it from the ptrace list.
-@@ -72,10 +123,11 @@ void __ptrace_unlink(struct task_struct 
+@@ -72,10 +140,11 @@ void __ptrace_unlink(struct task_struct 
  	child->parent = child->real_parent;
  	list_del_init(&child->ptrace_entry);
  
@@ -1766,19 +1787,21 @@
  /*
   * Check that we have indeed attached to the thing..
   */
-@@ -113,6 +165,464 @@ int ptrace_check_attach(struct task_stru
+@@ -113,6 +182,536 @@ int ptrace_check_attach(struct task_stru
  	return ret;
  }
  
-+static struct utrace_attached_engine *ptrace_attach_utrace(
-+	struct task_struct *task)
++static struct utrace_attached_engine *prepare_ptrace_attach(
++	struct task_struct *child, struct task_struct *parent)
 +{
 +	return NULL;
 +}
 +
-+static void ptrace_detach_utrace(struct task_struct *task,
-+				 struct utrace_attached_engine *engine)
++static int finish_ptrace_attach(struct task_struct *task,
++				 struct utrace_attached_engine *engine,
++				 int retval)
 +{
++	return retval;
 +}
 +
 +static int ptrace_update_utrace(struct task_struct *task,
@@ -1863,7 +1886,31 @@
 +	return (task->ptrace >> 16) & UTRACE_SYSCALL_MASK;
 +}
 +
-+static u32 utrace_ptrace_report(u32 action, struct task_struct *task, int code)
++/*
++ * Remember which event stop this was.  We have to keep a record that
++ * won't be wiped by ptrace_do_wait() when @task->exit_code is cleared.
++ * So we store the PTRACE_EVENT_* value in a nybble of @task->ptrace.
++ */
++static void ptrace_set_stop_event(struct task_struct *task, int event)
++{
++	task->ptrace &= 0xf0ffffffU;
++	task->ptrace |= event << 24;
++}
++
++static int ptrace_stop_event(struct task_struct *task)
++{
++	return (task->ptrace >> 24) & 0xf;
++}
++
++/*
++ * This doesn't really exist in the user API, but we pick an unused value
++ * encoded with ptrace_set_stop_event() to record when the last stop was
++ * for a syscall stop.
++ */
++#define PTRACE_EVENT_SYSCALL	0xf
++
++static u32 utrace_ptrace_report(u32 action, struct task_struct *task,
++				int event, int code)
 +{
 +	/*
 +	 * Special kludge magic in utrace.c (utrace_stop) sees this
@@ -1872,7 +1919,15 @@
 +	 */
 +	ptrace_set_action(task, UTRACE_STOP, 0);
 +
-+	task->exit_code = code;
++	/*
++	 * If we already have a pending stop event, then don't override it.
++	 * We'll simulate this stop when the pending one is cleared,
++	 * in ptrace_resume(), below.
++	 */
++	if (ptrace_stop_event(task) == 0) {
++		ptrace_set_stop_event(task, event);
++		task->exit_code = code;
++	}
 +
 +	return action | UTRACE_STOP;
 +}
@@ -1881,7 +1936,7 @@
 +			       int event, unsigned long msg)
 +{
 +	task->ptrace_message = msg;
-+	return utrace_ptrace_report(0, task, (event << 8) | SIGTRAP);
++	return utrace_ptrace_report(0, task, event, (event << 8) | SIGTRAP);
 +}
 +
 +static u32 ptrace_report_exec(enum utrace_resume_action action,
@@ -1909,8 +1964,6 @@
 +	return utrace_ptrace_event(task, PTRACE_EVENT_EXIT, *code);
 +}
 +
-+#define	PT_VFORKING	PT_DTRACE /* reuse obsolete bit */
-+
 +static u32 ptrace_report_clone(enum utrace_resume_action action,
 +			       struct utrace_attached_engine *engine,
 +			       struct task_struct *parent,
@@ -1920,22 +1973,20 @@
 +	int event;
 +	struct utrace_attached_engine *child_engine;
 +
-+	/*
-+	 * To simulate vfork-done tracing, we'll have to catch the
-+	 * parent's syscall-exit event for this vfork/clone system call.
-+	 * Since PTRACE_SETOPTIONS can enable PTRACE_O_TRACEVFORKDONE
-+	 * during the PTRACE_EVENT_VFORK stop, we must do this if either
-+	 * is enabled right now.
-+	 */
 +	if ((clone_flags & CLONE_VFORK) &&
-+	    (parent->ptrace & (PT_TRACE_VFORK | PT_TRACE_VFORK_DONE))) {
-+		if (!(engine->flags & UTRACE_EVENT(SYSCALL_EXIT))) {
-+			int ret = utrace_set_events(parent, engine,
-+						    engine->flags |
-+						    UTRACE_EVENT(SYSCALL_EXIT));
-+			WARN_ON(ret);
-+		}
-+		parent->ptrace |= PT_VFORKING;
++	    (parent->ptrace & PT_TRACE_VFORK_DONE)) {
++		/*
++		 * Stash the child PID for a PTRACE_EVENT_VFORK_DONE report,
++		 * even if we don't report this clone event itself.  Mark
++		 * that we vfork'd even if we don't actually stop here, so
++		 * that we'll know to do the vfork-done report.  (This
++		 * matters when is PTRACE_O_TRACEVFORKDONE set but
++		 * PTRACE_O_TRACEVFORK is not set.)
++		 */
++		int rc = utrace_control(parent, engine, UTRACE_REPORT);
++		WARN_ON(rc);
++		parent->ptrace_message = child->pid;
++		ptrace_set_stop_event(parent, PTRACE_EVENT_VFORK);
 +	}
 +
 +	if (clone_flags & CLONE_UNTRACED)
@@ -1960,7 +2011,8 @@
 +		child_engine = utrace_attach_task(child, UTRACE_ATTACH_CREATE |
 +						  UTRACE_ATTACH_EXCLUSIVE |
 +						  UTRACE_ATTACH_MATCH_OPS,
-+						  &ptrace_utrace_ops, NULL);
++						  &ptrace_utrace_ops,
++						  parent->parent);
 +		if (unlikely(IS_ERR(child_engine))) {
 +			WARN_ON(1);	/* XXX */
 +		} else {
@@ -1982,13 +2034,12 @@
 +	return UTRACE_RESUME;
 +}
 +
-+
 +static u32 ptrace_report_syscall(u32 action, struct task_struct *task)
 +{
 +	int code = SIGTRAP;
 +	if (task->ptrace & PT_TRACESYSGOOD)
 +		code |= 0x80;
-+	return utrace_ptrace_report(action, task, code);
++	return utrace_ptrace_report(action, task, PTRACE_EVENT_SYSCALL, code);
 +}
 +
 +static u32 ptrace_report_syscall_entry(u32 action,
@@ -2006,38 +2057,31 @@
 +	return ptrace_report_syscall(UTRACE_SYSCALL_RUN, task);
 +}
 +
++/*
++ * Report a vfork-done event to precede another event report.
++ * There is no utrace callback associated directly with vfork-done.
++ * Instead, after seeing CLONE_VFORK in report_clone() we notice
++ * the following syscall-exit, signal, or quiesce callback and
++ * inject the PTRACE_EVENT_VFORK_DONE stop there.
++ */
++static u32 ptrace_report_vfork_done(struct task_struct *task)
++{
++	/*
++	 * We got here after a vfork, when vfork-done tracing
++	 * was enabled.
++	 */
++	ptrace_set_stop_event(task, 0);
++	return utrace_ptrace_event(task, PTRACE_EVENT_VFORK_DONE,
++				   task->ptrace_message);
++}
++
 +static u32 ptrace_report_syscall_exit(enum utrace_resume_action action,
 +				      struct utrace_attached_engine *engine,
 +				      struct task_struct *task,
 +				      struct pt_regs *regs)
 +{
-+	if (!(engine->flags & UTRACE_EVENT(SYSCALL_ENTRY))) {
-+		/*
-+		 * We were not really using PTRACE_SYSCALL.
-+		 * SYSCALL_EXIT was only caught for vfork-done tracing.
-+		 */
-+		int ret = utrace_set_events(
-+			task, engine,
-+			engine->flags & ~UTRACE_EVENT(SYSCALL_EXIT));
-+		WARN_ON(ret);
-+		WARN_ON(!(task->ptrace & PT_VFORKING));
-+		task->ptrace &= ~PT_VFORKING;
-+		if (task->ptrace & PT_TRACE_VFORK_DONE)
-+			return utrace_ptrace_event(task,
-+						   PTRACE_EVENT_VFORK_DONE, 0);
-+		return UTRACE_RESUME;
-+	}
-+
-+	if (task->ptrace & PT_VFORKING) {
-+		/*
-+		 * If we're reporting vfork-done, we'll have to
-+		 * remember to report syscall-exit after that.
-+		 */
-+		if (task->ptrace & PT_TRACE_VFORK_DONE)
-+			return utrace_ptrace_event(task,
-+						   PTRACE_EVENT_VFORK_DONE, 0);
-+		task->ptrace &= ~PT_VFORKING;
-+	}
++	if (unlikely(ptrace_stop_event(task) == PTRACE_EVENT_VFORK))
++		return ptrace_report_vfork_done(task);
 +
 +	if (unlikely(ptrace_syscall_action(task)) &&
 +	    unlikely(ptrace_resume_action(task) == UTRACE_SINGLESTEP))
@@ -2051,24 +2095,43 @@
 +	return ptrace_report_syscall(0, task);
 +}
 +
-+static u32 ptrace_resumed(struct task_struct *task, struct pt_regs *regs,
++static u32 ptrace_resumed(struct task_struct *task,
++			  struct utrace_attached_engine *engine,
 +			  siginfo_t *info, struct k_sigaction *return_ka)
 +{
++	enum utrace_resume_action resume = ptrace_resume_action(task);
++
++	if (unlikely(ptrace_stop_event(task) == PTRACE_EVENT_VFORK))
++		return UTRACE_SIGNAL_REPORT | ptrace_report_vfork_done(task);
++
++	/*
++	 * If PTRACE_DETACH had a signal for us to deliver,
++	 * it didn't detach the engine, but marked it for us.
++	 */
++	if (!engine->data) {
++		read_lock(&tasklist_lock);
++		if (task->ptrace & PT_PTRACED)
++			engine->data = task->parent;
++		else
++			resume = UTRACE_DETACH;
++		read_unlock(&tasklist_lock);
++	}
++
 +	/*
-+	 * This is not a new signal, but just a notification we
-+	 * asked for.  Either we're stopping after another report
-+	 * like exec or syscall, or we're resuming.
++	 * If we're stopping, or we haven't reported any signal,
++	 * then we're all done for now.
 +	 */
-+	if (ptrace_resume_action(task) == UTRACE_STOP)
-+		return UTRACE_SIGNAL_REPORT | UTRACE_STOP;
++	if (resume == UTRACE_STOP || !task->last_siginfo)
++		return UTRACE_SIGNAL_REPORT | resume;
 +
 +	/*
 +	 * We're resuming.  If there's no signal to deliver, just go.
 +	 * If we were given a signal, deliver it now.
 +	 */
++	WARN_ON(task->last_siginfo != info);
 +	task->last_siginfo = NULL;
 +	if (!task->exit_code)
-+		return UTRACE_SIGNAL_REPORT | ptrace_resume_action(task);
++		return UTRACE_SIGNAL_REPORT | resume;
 +
 +	/* Update the siginfo structure if the signal has
 +	   changed.  If the debugger wanted something
@@ -2088,7 +2151,7 @@
 +	*return_ka = task->sighand->action[info->si_signo - 1];
 +	spin_unlock_irq(&task->sighand->siglock);
 +
-+	return UTRACE_SIGNAL_DELIVER | ptrace_resume_action(task);
++	return UTRACE_SIGNAL_DELIVER | resume;
 +}
 +
 +static u32 ptrace_report_signal(u32 action,
@@ -2099,28 +2162,12 @@
 +				const struct k_sigaction *orig_ka,
 +				struct k_sigaction *return_ka)
 +{
-+	/*
-+	 * Deal with a pending vfork-done event.  We'll stop again now
-+	 * for the syscall-exit report that was replaced with vfork-done.
-+	 */
-+	if (unlikely(task->ptrace & PT_VFORKING)) {
-+		task->ptrace &= ~PT_VFORKING;
-+		if ((engine->flags & UTRACE_EVENT(SYSCALL_ENTRY)) &&
-+		    utrace_signal_action(action) == UTRACE_SIGNAL_REPORT) {
-+			/*
-+			 * Make sure we get another report on wakeup.
-+			 */
-+			int x = utrace_control(task, engine, UTRACE_INTERRUPT);
-+			WARN_ON(x);
-+			return ptrace_report_syscall(UTRACE_SIGNAL_REPORT,
-+						     task);
-+		}
-+	}
-+
 +	switch (utrace_signal_action(action)) {
 +	default:
++		WARN_ON(ptrace_stop_event(task) && info->si_signo != SIGKILL);
 +		break;
 +	case UTRACE_SIGNAL_HANDLER:
++		WARN_ON(ptrace_stop_event(task));
 +		/*
 +		 * A handler was set up.  If we are stepping, pretend
 +		 * another SIGTRAP arrived.
@@ -2136,11 +2183,17 @@
 +		}
 +		/* Fall through.  */
 +	case UTRACE_SIGNAL_REPORT:
-+		return ptrace_resumed(task, regs, info, return_ka);
++		/*
++		 * This is not a new signal, but just a notification we
++		 * asked for.  Either we're stopping after another report
++		 * like exec or syscall, or we're resuming.
++		 */
++		return ptrace_resumed(task, engine, info, return_ka);
 +	}
 +
++	WARN_ON(!valid_signal(info->si_signo));
 +	task->last_siginfo = info;
-+	return utrace_ptrace_report(UTRACE_SIGNAL_IGN, task, info->si_signo);
++	return utrace_ptrace_report(UTRACE_SIGNAL_IGN, task, 0, info->si_signo);
 +}
 +
 +static u32 ptrace_report_quiesce(u32 action,
@@ -2148,13 +2201,13 @@
 +				 struct task_struct *task,
 +				 unsigned long event)
 +{
-+	/*
-+	 * Make sure we deal with a pending vfork-done event (see above).
-+	 */
-+	if (unlikely(task->ptrace & PT_VFORKING))
-+		return UTRACE_INTERRUPT;
++	if (event == 0) {
++		task->last_siginfo = NULL;
++
++		if (unlikely(ptrace_stop_event(task) == PTRACE_EVENT_VFORK))
++			return ptrace_report_vfork_done(task);
++	}
 +
-+	task->last_siginfo = NULL;
 +	return ptrace_resume_action(task);
 +}
 +
@@ -2171,34 +2224,74 @@
 +};
 +
 +/*
-+ * Detach the utrace engine.
++ * Detach the utrace engine on error.  On success, set @engine->data to
++ * the ptracer's task_struct pointer.  This distinguishes an engine for
++ * attached ptrace from an engine left behind after a PTRACE_DETACH call
++ * that left a parting signal to deliver.
 + */
-+static void ptrace_detach_utrace(struct task_struct *task,
-+				 struct utrace_attached_engine *engine)
++static int finish_ptrace_attach(struct task_struct *task,
++				struct utrace_attached_engine *engine,
++				int retval)
 +{
-+	int ret = utrace_control(task, engine, UTRACE_DETACH);
-+	WARN_ON(ret && ret != -ESRCH && ret != -EALREADY);
++	if (retval) {
++		int error = utrace_control(task, engine, UTRACE_DETACH);
++		WARN_ON(error && error != -ESRCH && error != -EALREADY);
++	} else {
++		engine->data = task->parent;
++	}
++	utrace_engine_put(engine);
++	return retval;
 +}
 +
 +/*
 + * Attach a utrace engine for ptrace and set up its event mask.
 + * Returns the engine pointer or an IS_ERR() pointer.
 + */
-+static struct utrace_attached_engine *ptrace_attach_utrace(
-+	struct task_struct *child)
++static struct utrace_attached_engine *prepare_ptrace_attach(
++	struct task_struct *child, struct task_struct *parent)
 +{
 +	struct utrace_attached_engine *engine;
++restart:
 +	engine = utrace_attach_task(child, UTRACE_ATTACH_CREATE |
 +				    UTRACE_ATTACH_EXCLUSIVE |
 +				    UTRACE_ATTACH_MATCH_OPS,
-+				    &ptrace_utrace_ops, NULL);
-+	if (IS_ERR(engine))
-+		return engine;
-+	if (likely(!ptrace_update_utrace(child, engine)))
-+		return engine;
-+	ptrace_detach_utrace(child, engine);
-+	utrace_engine_put(engine);
-+	return ERR_PTR(-ESRCH);
++				    &ptrace_utrace_ops, parent);
++	if (engine == ERR_PTR(-EEXIST)) {
++		/*
++		 * There is already some ptrace engine attached.  Either
++		 * this attach will fail because another ptracer is
++		 * already attached, or else this engine was left behind
++		 * by PTRACE_DETACH to deliver a signal.
++		 */
++		engine = utrace_attach_task(child,
++					    UTRACE_ATTACH_MATCH_OPS,
++					    &ptrace_utrace_ops, NULL);
++		if (IS_ERR(engine)) {
++			BUG_ON(PTR_ERR(engine) != -ENOENT);
++			goto restart;
++		}
++		if (engine->data) {
++			utrace_engine_put(engine);
++			engine = ERR_PTR(-EEXIST);
++		}
++	}
++	if (IS_ERR(engine)) {
++		if (engine != ERR_PTR(-ESRCH))
++			engine = ERR_PTR(-EPERM);
++	} else {
++		int ret = ptrace_update_utrace(child, engine);
++		if (ret == -EINPROGRESS) {
++			ret = utrace_barrier(child, engine);
++			utrace_engine_put(engine);
++			if (ret != -ERESTARTSYS)
++				goto restart;
++			return ERR_PTR(-ERESTARTNOINTR);
++		}
++		if (ret)
++			engine = ERR_PTR(finish_ptrace_attach(child, engine,
++							      -ESRCH));
++	}
++	return engine;
 +}
 +
 +int ptrace_check_attach(struct task_struct *child, int kill)
@@ -2231,7 +2324,7 @@
  int __ptrace_may_access(struct task_struct *task, unsigned int mode)
  {
  	/* May we inspect the given task?
-@@ -156,6 +666,7 @@ int ptrace_attach(struct task_struct *ta
+@@ -156,12 +755,17 @@ int ptrace_attach(struct task_struct *ta
  {
  	int retval;
  	unsigned long flags;
@@ -2239,44 +2332,40 @@
  
  	audit_ptrace(task);
  
-@@ -163,6 +674,13 @@ int ptrace_attach(struct task_struct *ta
+ 	retval = -EPERM;
  	if (same_thread_group(task, current))
- 		goto out;
- 
-+	engine = ptrace_attach_utrace(task);
-+	if (unlikely(IS_ERR(engine))) {
-+		if (PTR_ERR(engine) == -ESRCH)
-+			retval = -ESRCH;
-+		goto out;
-+	}
+-		goto out;
++		return retval;
 +
++	engine = prepare_ptrace_attach(task, current);
++	if (unlikely(IS_ERR(engine)))
++		return PTR_ERR(engine);
+ 
  repeat:
  	/*
- 	 * Nasty, nasty.
-@@ -202,6 +720,11 @@ repeat:
+@@ -202,8 +806,8 @@ repeat:
  bad:
  	write_unlock_irqrestore(&tasklist_lock, flags);
  	task_unlock(task);
-+	if (!IS_ERR(engine)) {
-+		if (retval)
-+			ptrace_detach_utrace(task, engine);
-+		utrace_engine_put(engine);
-+	}
- out:
- 	return retval;
+-out:
+-	return retval;
++
++	return finish_ptrace_attach(task, engine, retval);
  }
-@@ -221,9 +744,7 @@ int ptrace_detach(struct task_struct *ch
+ 
+ static inline void __ptrace_detach(struct task_struct *child, unsigned int data)
+@@ -221,9 +825,7 @@ int ptrace_detach(struct task_struct *ch
  	if (!valid_signal(data))
  		return -EIO;
  
 -	/* Architecture-specific hardware disable .. */
 -	ptrace_disable(child);
 -	clear_tsk_thread_flag(child, TIF_SYSCALL_TRACE);
-+	ptrace_detach_task(child);
++	ptrace_detach_task(child, data);
  
  	write_lock_irq(&tasklist_lock);
  	/* protect against de_thread()->release_task() */
-@@ -309,6 +830,8 @@ static int ptrace_setoptions(struct task
+@@ -309,6 +911,8 @@ static int ptrace_setoptions(struct task
  	if (data & PTRACE_O_TRACEEXIT)
  		child->ptrace |= PT_TRACE_EXIT;
  
@@ -2285,7 +2374,7 @@
  	return (data & ~PTRACE_O_MASK) ? -EINVAL : 0;
  }
  
-@@ -367,6 +890,7 @@ static int ptrace_setsiginfo(struct task
+@@ -367,6 +971,7 @@ static int ptrace_setsiginfo(struct task
  #define is_sysemu_singlestep(request)	0
  #endif
  
@@ -2293,7 +2382,7 @@
  static int ptrace_resume(struct task_struct *child, long request, long data)
  {
  	if (!valid_signal(data))
-@@ -401,6 +925,76 @@ static int ptrace_resume(struct task_str
+@@ -401,6 +1006,170 @@ static int ptrace_resume(struct task_str
  
  	return 0;
  }
@@ -2342,24 +2431,118 @@
 +	}
 +
 +	if (!ret) {
-+		child->exit_code = data;
++		/*
++		 * If there was a non-signal event reported last time,
++		 * we may need to simulate another event that follows
++		 * it, or do some other special case.  We'll set @event
++		 * nonzero here if there is an event to simulate.
++		 */
++		int event = ptrace_stop_event(child);
++		ptrace_set_stop_event(child, 0);
 +
-+		ptrace_set_action(child, action, syscall);
++		switch (event) {
++		case 0:
++			break;
++
++		default:
++			WARN_ON(1);
++		case PTRACE_EVENT_EXIT:
++			event = 0;
++			break;
++
++		case PTRACE_EVENT_FORK:
++		case PTRACE_EVENT_CLONE:
++		case PTRACE_EVENT_EXEC:
++		case PTRACE_EVENT_VFORK_DONE:
++			/*
++			 * At these events, @data is ignored.
++			 * After these there might be a syscall-exit stop.
++			 */
++			if (request == PTRACE_SYSCALL) {
++				data = SIGTRAP;
++				if (child->ptrace & PT_TRACESYSGOOD)
++					data |= 0x80;
++				ptrace_set_stop_event(child,
++						      PTRACE_EVENT_SYSCALL);
++			} else {
++				data = 0;
++				event = 0;
++			}
++			break;
++
++		case PTRACE_EVENT_SYSCALL:
++			/*
++			 * After a syscall stop, @data is treated specially.
++			 * It just queues the signal.
++			 */
++			if (data)
++				send_sig(data, child, 1);
++			data = 0;
++			event = 0;
++			break;
 +
-+		if (task_is_stopped(child)) {
-+			spin_lock_irq(&child->sighand->siglock);
-+			child->signal->flags &= ~SIGNAL_STOP_STOPPED;
-+			spin_unlock_irq(&child->sighand->siglock);
++		case PTRACE_EVENT_VFORK:
++			/*
++			 * For this event, @data is ignored.  We did have a
++			 * utrace stop right after, so on resuming there
++			 * can be a normal syscall-exit stop next if needed.
++			 * But we may need to simulate a vfork-done stop,
++			 * so we leave the marker in place.
++			 */
++			data = 0;
++			event = 0;
++			if (child->ptrace & PT_TRACE_VFORK_DONE) {
++				ptrace_set_stop_event(child,
++						      PTRACE_EVENT_VFORK);
++				action = UTRACE_REPORT;
++			}
++			break;
 +		}
 +
++		child->exit_code = data;
++
++		ptrace_set_action(child, action, syscall);
++
 +		/*
-+		 * To resume with a signal we must hit ptrace_report_signal.
++		 * Whatever action we want to resume with, we need to make
++		 * sure the child gets into ptrace_report_quiesce() so that
++		 * it clears last_siginfo before going back to user mode.
 +		 */
-+		if (data)
-+			action = UTRACE_INTERRUPT;
++		if (child->last_siginfo)
++			action = UTRACE_REPORT;
 +
-+		if (utrace_control(child, engine, action))
-+			ret = -ESRCH;
++		if (event) {
++			/*
++			 * We have a stacked event.  That is, @child is
++			 * already at the last utrace stop point before
++			 * returning to user mode.  But the ptrace API
++			 * wants multiple stops on the way out.  Here the
++			 * original ptrace would resume the child and have
++			 * to stop again almost immediately.  Instead we
++			 * just leave it stopped and simulate the wake-up
++			 * and new stop by notifying the parent, i.e.
++			 * current's own thread group.
++			 */
++			read_lock(&tasklist_lock);
++			do_notify_parent_cldstop(child, CLD_TRAPPED);
++			read_unlock(&tasklist_lock);
++		} else {
++			if (task_is_stopped(child)) {
++				spin_lock_irq(&child->sighand->siglock);
++				child->signal->flags &= ~SIGNAL_STOP_STOPPED;
++				spin_unlock_irq(&child->sighand->siglock);
++			}
++
++			/*
++			 * To resume with a signal we must arrange
++			 * to enter ptrace_report_signal().
++			 */
++			if (data)
++				action = UTRACE_INTERRUPT;
++
++			if (utrace_control(child, engine, action))
++				ret = -ESRCH;
++		}
 +	}
 +
 +	utrace_engine_put(engine);
@@ -2370,33 +2553,33 @@
  
  int ptrace_request(struct task_struct *child, long request,
  		   long addr, long data)
-@@ -480,6 +1074,11 @@ int ptrace_request(struct task_struct *c
+@@ -480,6 +1249,11 @@ int ptrace_request(struct task_struct *c
  int ptrace_traceme(void)
  {
  	int ret = -EPERM;
 +	struct utrace_attached_engine *engine;
 +
-+	engine = ptrace_attach_utrace(current);
++	engine = prepare_ptrace_attach(current, current->parent);
 +	if (unlikely(IS_ERR(engine)))
-+		return ret;
++		return PTR_ERR(engine);
  
  	/*
  	 * Are we already being traced?
-@@ -513,6 +1112,9 @@ repeat:
+@@ -513,7 +1287,8 @@ repeat:
  		write_unlock_irqrestore(&tasklist_lock, flags);
  	}
  	task_unlock(current);
-+	if (ret)
-+		ptrace_detach_utrace(current, engine);
-+	utrace_engine_put(engine);
- 	return ret;
+-	return ret;
++
++	return finish_ptrace_attach(current, engine, ret);
  }
  
+ /**
 diff --git a/kernel/signal.c b/kernel/signal.c
-index e661b01..1effefc 100644  
+index 4530fc6..0e85826 100644  
 --- a/kernel/signal.c
 +++ b/kernel/signal.c
-@@ -1415,7 +1415,7 @@ int do_notify_parent(struct task_struct 
+@@ -1419,7 +1419,7 @@ int do_notify_parent(struct task_struct 
  	return ret;
  }
  
@@ -2405,7 +2588,7 @@
  {
  	struct siginfo info;
  	unsigned long flags;
-@@ -1470,6 +1470,8 @@ static void do_notify_parent_cldstop(str
+@@ -1474,6 +1474,8 @@ static void do_notify_parent_cldstop(str
  	spin_unlock_irqrestore(&sighand->siglock, flags);
  }
  
@@ -2414,7 +2597,7 @@
  static inline int may_ptrace_stop(void)
  {
  	if (!likely(current->ptrace & PT_PTRACED))
-@@ -1602,6 +1604,8 @@ void ptrace_notify(int exit_code)
+@@ -1606,6 +1608,8 @@ void ptrace_notify(int exit_code)
  	spin_unlock_irq(&current->sighand->siglock);
  }
  
@@ -2423,7 +2606,7 @@
  static void
  finish_stop(int stop_count)
  {
-@@ -1679,6 +1683,7 @@ static int do_signal_stop(int signr)
+@@ -1683,6 +1687,7 @@ static int do_signal_stop(int signr)
  	return 1;
  }
  
@@ -2431,7 +2614,7 @@
  static int ptrace_signal(int signr, siginfo_t *info,
  			 struct pt_regs *regs, void *cookie)
  {
-@@ -1717,6 +1722,13 @@ static int ptrace_signal(int signr, sigi
+@@ -1721,6 +1726,13 @@ static int ptrace_signal(int signr, sigi
  
  	return signr;
  }
@@ -2447,10 +2630,10 @@
  			  struct pt_regs *regs, void *cookie)
 diff --git a/kernel/utrace.c b/kernel/utrace.c
 new file mode 100644
-index ...ff58017 100644  
+index ...3e2191c 100644  
 --- /dev/null
 +++ b/kernel/utrace.c
-@@ -0,0 +1,2586 @@
+@@ -0,0 +1,2587 @@
 +/*
 + * utrace infrastructure interface for debugging user processes
 + *
@@ -2986,7 +3169,8 @@
 +	 * be done after we are in TASK_TRACED.  This makes the
 +	 * synchronization with ptrace_do_wait() work right.
 +	 */
-+	if ((task->ptrace >> 16) == UTRACE_RESUME - UTRACE_STOP) {
++	if (((task->ptrace >> 16) & UTRACE_RESUME_MASK) ==
++	    UTRACE_RESUME - UTRACE_STOP) {
 +		read_lock(&tasklist_lock);
 +		do_notify_parent_cldstop(task, CLD_TRAPPED);
 +		read_unlock(&tasklist_lock);
@@ -3026,6 +3210,15 @@
 +	}
 +	rcu_read_unlock();
 +
++	/*
++	 * While we were in TASK_TRACED, complete_signal() considered
++	 * us "uninterested" in signal wakeups.  Now make sure we our
++	 * TIF_SIGPENDING state is correct for normal running.
++	 */
++	spin_lock_irq(&task->sighand->siglock);
++	recalc_sigpending();
++	spin_unlock_irq(&task->sighand->siglock);
++
 +	return killed;
 +}
 +
@@ -4320,12 +4513,8 @@
 +
 +/*
 + * Finish the last reporting pass before returning to user mode.
-+ *
-+ * Returns true if we might have been in TASK_TRACED and then resumed.
-+ * In that event, signal_pending() might not be set when it should be,
-+ * as the signals code passes us over while we're in TASK_TRACED.
 + */
-+static bool finish_resume_report(struct utrace_report *report,
++static void finish_resume_report(struct utrace_report *report,
 +				 struct task_struct *task,
 +				 struct utrace *utrace)
 +{
@@ -4350,7 +4539,7 @@
 +
 +	case UTRACE_STOP:
 +		report->killed = utrace_stop(task, utrace);
-+		return likely(!report->killed);
++		break;
 +
 +	case UTRACE_REPORT:
 +	case UTRACE_RESUME:
@@ -4358,8 +4547,6 @@
 +		user_disable_single_step(task);
 +		break;
 +	}
-+
-+	return false;
 +}
 +
 +/*
@@ -4414,15 +4601,8 @@
 +
 +	/*
 +	 * Finish the report and either stop or get ready to resume.
-+	 * If we stop and then signal_pending() is clear, we
-+	 * should recompute it before returning to user mode.
 +	 */
-+	if (finish_resume_report(&report, task, utrace) &&
-+	    !signal_pending(task)) {
-+		spin_lock_irq(&task->sighand->siglock);
-+		recalc_sigpending();
-+		spin_unlock_irq(&task->sighand->siglock);
-+	}
++	finish_resume_report(&report, task, utrace);
 +}
 +
 +/*
@@ -4741,16 +4921,14 @@
 +		} else if (return_ka->sa.sa_handler != SIG_IGN &&
 +			   likely(signr)) {
 +			/*
++			 * Complete the bookkeeping after the report.
 +			 * The handler will run.  If an engine wanted to
 +			 * stop or step, then make sure we do another
 +			 * report after signal handler setup.
 +			 */
-+			if (report.action != UTRACE_RESUME) {
-+				spin_lock(&utrace->lock);
-+				utrace->interrupt = 1;
-+				spin_unlock(&utrace->lock);
-+				set_tsk_thread_flag(task, TIF_SIGPENDING);
-+			}
++			if (report.action != UTRACE_RESUME)
++				report.action = UTRACE_INTERRUPT;
++			finish_report(&report, task, utrace);
 +
 +			if (unlikely(report.result & UTRACE_SIGNAL_HOLD))
 +				push_back_signal(task, info);
@@ -4813,6 +4991,12 @@
 +		return -1;
 +	}
 +
++	/*
++	 * Complete the bookkeeping after the report.
++	 * This sets utrace->report if UTRACE_STOP was used.
++	 */
++	finish_report(&report, task, utrace);
++
 +	return_ka->sa.sa_handler = SIG_DFL;
 +
 +	if (unlikely(report.result & UTRACE_SIGNAL_HOLD))

linux-2.6.27-lirc.patch:

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.1 -r 1.2 linux-2.6.27-lirc.patch
Index: linux-2.6.27-lirc.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/linux-2.6.27-lirc.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6.27-lirc.patch	30 Oct 2008 04:41:21 -0000	1.1
+++ linux-2.6.27-lirc.patch	12 Jan 2009 19:54:18 -0000	1.2
@@ -1,32 +1,7 @@
-Linux Infrared Remote Control drivers
-
-Signed-off-by: Jarod Wilson <jarod at redhat.com>
-
----
-diff -Naurp linux-2.6.27.noarch/drivers/hid/usbhid/hid-quirks.c linux-2.6.27.noarch.lirc/drivers/hid/usbhid/hid-quirks.c
---- linux-2.6.27.noarch/drivers/hid/usbhid/hid-quirks.c	2008-10-09 18:13:53.000000000 -0400
-+++ linux-2.6.27.noarch.lirc/drivers/hid/usbhid/hid-quirks.c	2008-10-21 16:40:06.000000000 -0400
-@@ -386,6 +386,8 @@
- 
- #define USB_VENDOR_ID_SOUNDGRAPH	0x15c2
- #define USB_DEVICE_ID_SOUNDGRAPH_IMON_LCD	0x0038
-+#define USB_DEVICE_ID_SOUNDGRAPH_IMON_LCD2	0x0036
-+#define USB_DEVICE_ID_SOUNDGRAPH_IMON_LCD3	0x0034
- 
- #define USB_VENDOR_ID_SUN		0x0430
- #define USB_DEVICE_ID_RARITAN_KVM_DONGLE	0xcdab
-@@ -585,6 +587,8 @@ static const struct hid_blacklist {
- 	{ USB_VENDOR_ID_PANJIT, 0x0003, HID_QUIRK_IGNORE },
- 	{ USB_VENDOR_ID_PANJIT, 0x0004, HID_QUIRK_IGNORE },
- 	{ USB_VENDOR_ID_SOUNDGRAPH, USB_DEVICE_ID_SOUNDGRAPH_IMON_LCD, HID_QUIRK_IGNORE },
-+	{ USB_VENDOR_ID_SOUNDGRAPH, USB_DEVICE_ID_SOUNDGRAPH_IMON_LCD2, HID_QUIRK_IGNORE },
-+	{ USB_VENDOR_ID_SOUNDGRAPH, USB_DEVICE_ID_SOUNDGRAPH_IMON_LCD3, HID_QUIRK_IGNORE },
- 	{ USB_VENDOR_ID_VERNIER, USB_DEVICE_ID_VERNIER_LABPRO, HID_QUIRK_IGNORE },
- 	{ USB_VENDOR_ID_VERNIER, USB_DEVICE_ID_VERNIER_GOTEMP, HID_QUIRK_IGNORE },
- 	{ USB_VENDOR_ID_VERNIER, USB_DEVICE_ID_VERNIER_SKIP, HID_QUIRK_IGNORE },
-diff -Naurp linux-2.6.27.noarch/drivers/input/Kconfig linux-2.6.27.noarch.lirc/drivers/input/Kconfig
---- linux-2.6.27.noarch/drivers/input/Kconfig	2008-10-09 18:13:53.000000000 -0400
-+++ linux-2.6.27.noarch.lirc/drivers/input/Kconfig	2008-10-21 16:03:34.000000000 -0400
+diff --git a/drivers/input/Kconfig b/drivers/input/Kconfig
+index 5f9d860..2ba0904 100644
+--- a/drivers/input/Kconfig
++++ b/drivers/input/Kconfig
 @@ -170,6 +170,8 @@ source "drivers/input/tablet/Kconfig"
  
  source "drivers/input/touchscreen/Kconfig"
@@ -36,9 +11,21 @@
  source "drivers/input/misc/Kconfig"
  
  endif
-diff -Naurp linux-2.6.27.noarch/drivers/input/lirc/Kconfig linux-2.6.27.noarch.lirc/drivers/input/lirc/Kconfig
---- linux-2.6.27.noarch/drivers/input/lirc/Kconfig	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.27.noarch.lirc/drivers/input/lirc/Kconfig	2008-10-21 16:04:34.000000000 -0400
+diff --git a/drivers/input/Makefile b/drivers/input/Makefile
+index 98c4f9a..6a1049b 100644
+--- a/drivers/input/Makefile
++++ b/drivers/input/Makefile
+@@ -25,3 +25,5 @@ obj-$(CONFIG_INPUT_MISC)	+= misc/
+ obj-$(CONFIG_INPUT_APMPOWER)	+= apm-power.o
+ 
+ obj-$(CONFIG_XEN_KBDDEV_FRONTEND)	+= xen-kbdfront.o
++
++obj-$(CONFIG_INPUT_LIRC)       += lirc/
+diff --git a/drivers/input/lirc/Kconfig b/drivers/input/lirc/Kconfig
+new file mode 100644
+index 0000000..fad3bbb
+--- /dev/null
++++ b/drivers/input/lirc/Kconfig
 @@ -0,0 +1,128 @@
 +#
 +# LIRC driver(s) configuration
@@ -168,9 +155,149 @@
 +	  PVR-150/500, HVR-1200/1250/1700/1800, HD-PVR and other cards
 +
 +endif
-diff -Naurp linux-2.6.27.noarch/drivers/input/lirc/lirc_bt829.c linux-2.6.27.noarch.lirc/drivers/input/lirc/lirc_bt829.c
---- linux-2.6.27.noarch/drivers/input/lirc/lirc_bt829.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.27.noarch.lirc/drivers/input/lirc/lirc_bt829.c	2008-10-21 16:03:34.000000000 -0400
+diff --git a/drivers/input/lirc/Makefile b/drivers/input/lirc/Makefile
+new file mode 100644
+index 0000000..ceb5c86
+--- /dev/null
++++ b/drivers/input/lirc/Makefile
+@@ -0,0 +1,23 @@
++# Makefile for the lirc drivers.
++#
++
++# Each configuration option enables a list of files.
++
++EXTRA_CFLAGS =-DIRCTL_DEV_MAJOR=61 -DLIRC_SERIAL_TRANSMITTER -I$(src)
++
++obj-$(CONFIG_LIRC_DEV)		+= lirc_dev.o
++obj-$(CONFIG_LIRC_BT829)	+= lirc_bt829.o
++obj-$(CONFIG_LIRC_I2C)		+= lirc_i2c.o
++obj-$(CONFIG_LIRC_IGORPLUGUSB)	+= lirc_igorplugusb.o
++obj-$(CONFIG_LIRC_IMON)		+= lirc_imon.o
++obj-$(CONFIG_LIRC_IT87)		+= lirc_it87.o
++obj-$(CONFIG_LIRC_ITE8709)	+= lirc_ite8709.o
++obj-$(CONFIG_LIRC_MCEUSB)	+= lirc_mceusb.o
++obj-$(CONFIG_LIRC_MCEUSB2)	+= lirc_mceusb2.o
++obj-$(CONFIG_LIRC_PARALLEL)	+= lirc_parallel.o
++obj-$(CONFIG_LIRC_SASEM)	+= lirc_sasem.o
++obj-$(CONFIG_LIRC_SERIAL)	+= lirc_serial.o
++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/lirc.h b/drivers/input/lirc/lirc.h
+new file mode 100644
+index 0000000..dcdb6e8
+--- /dev/null
++++ b/drivers/input/lirc/lirc.h
+@@ -0,0 +1,103 @@
++/*
++ * lirc.h - linux infrared remote control header file
++ * last modified 2007/09/27
++ */
++
++#ifndef _LINUX_LIRC_H
++#define _LINUX_LIRC_H
++
++#include <linux/types.h>
++#include <linux/ioctl.h>
++
++#define PULSE_BIT  0x01000000
++#define PULSE_MASK 0x00FFFFFF
++
++/*
++ * lirc compatible hardware features
++ */
++
++
++#define LIRC_MODE2SEND(x) (x)
++#define LIRC_SEND2MODE(x) (x)
++#define LIRC_MODE2REC(x) ((x) << 16)
++#define LIRC_REC2MODE(x) ((x) >> 16)
++
++#define LIRC_MODE_RAW                  0x00000001
++#define LIRC_MODE_PULSE                0x00000002
++#define LIRC_MODE_MODE2                0x00000004
++#define LIRC_MODE_CODE                 0x00000008
++#define LIRC_MODE_LIRCCODE             0x00000010
++#define LIRC_MODE_STRING               0x00000020
++
++
++#define LIRC_CAN_SEND_RAW              LIRC_MODE2SEND(LIRC_MODE_RAW)
++#define LIRC_CAN_SEND_PULSE            LIRC_MODE2SEND(LIRC_MODE_PULSE)
++#define LIRC_CAN_SEND_MODE2            LIRC_MODE2SEND(LIRC_MODE_MODE2)
++#define LIRC_CAN_SEND_CODE             LIRC_MODE2SEND(LIRC_MODE_CODE)
++#define LIRC_CAN_SEND_LIRCCODE         LIRC_MODE2SEND(LIRC_MODE_LIRCCODE)
++#define LIRC_CAN_SEND_STRING           LIRC_MODE2SEND(LIRC_MODE_STRING)
++
++#define LIRC_CAN_SEND_MASK             0x0000003f
++
++#define LIRC_CAN_SET_SEND_CARRIER      0x00000100
++#define LIRC_CAN_SET_SEND_DUTY_CYCLE   0x00000200
++#define LIRC_CAN_SET_TRANSMITTER_MASK  0x00000400
++
++#define LIRC_CAN_REC_RAW               LIRC_MODE2REC(LIRC_MODE_RAW)
++#define LIRC_CAN_REC_PULSE             LIRC_MODE2REC(LIRC_MODE_PULSE)
++#define LIRC_CAN_REC_MODE2             LIRC_MODE2REC(LIRC_MODE_MODE2)
++#define LIRC_CAN_REC_CODE              LIRC_MODE2REC(LIRC_MODE_CODE)
++#define LIRC_CAN_REC_LIRCCODE          LIRC_MODE2REC(LIRC_MODE_LIRCCODE)
++#define LIRC_CAN_REC_STRING            LIRC_MODE2REC(LIRC_MODE_STRING)
++
++#define LIRC_CAN_REC_MASK              LIRC_MODE2REC(LIRC_CAN_SEND_MASK)
++
++#define LIRC_CAN_SET_REC_CARRIER       (LIRC_CAN_SET_SEND_CARRIER << 16)
++#define LIRC_CAN_SET_REC_DUTY_CYCLE    (LIRC_CAN_SET_SEND_DUTY_CYCLE << 16)
++
++#define LIRC_CAN_SET_REC_DUTY_CYCLE_RANGE 0x40000000
++#define LIRC_CAN_SET_REC_CARRIER_RANGE    0x80000000
++#define LIRC_CAN_GET_REC_RESOLUTION       0x20000000
++
++#define LIRC_CAN_SEND(x) ((x)&LIRC_CAN_SEND_MASK)
++#define LIRC_CAN_REC(x) ((x)&LIRC_CAN_REC_MASK)
++
++#define LIRC_CAN_NOTIFY_DECODE            0x01000000
++
++/*
++ * IOCTL commands for lirc driver
++ */
++
++#define LIRC_GET_FEATURES              _IOR('i', 0x00000000, __u32)
++
++#define LIRC_GET_SEND_MODE             _IOR('i', 0x00000001, __u32)
++#define LIRC_GET_REC_MODE              _IOR('i', 0x00000002, __u32)
++#define LIRC_GET_SEND_CARRIER          _IOR('i', 0x00000003, __u32)
++#define LIRC_GET_REC_CARRIER           _IOR('i', 0x00000004, __u32)
++#define LIRC_GET_SEND_DUTY_CYCLE       _IOR('i', 0x00000005, __u32)
++#define LIRC_GET_REC_DUTY_CYCLE        _IOR('i', 0x00000006, __u32)
++#define LIRC_GET_REC_RESOLUTION        _IOR('i', 0x00000007, __u32)
++
++/* code length in bits, currently only for LIRC_MODE_LIRCCODE */
++#define LIRC_GET_LENGTH                _IOR('i', 0x0000000f, __u32)
++
++#define LIRC_SET_SEND_MODE             _IOW('i', 0x00000011, __u32)
++#define LIRC_SET_REC_MODE              _IOW('i', 0x00000012, __u32)
++/* Note: these can reset the according pulse_width */
++#define LIRC_SET_SEND_CARRIER          _IOW('i', 0x00000013, __u32)
++#define LIRC_SET_REC_CARRIER           _IOW('i', 0x00000014, __u32)
[...3906 lines suppressed...]
++
++	i = usb_register(&usb_remote_driver);
++	if (i < 0) {
++		printk(DRIVER_NAME ": usb register failed, result = %d\n", i);
++		return -ENODEV;
 +	}
 +
-+	info(DRIVER_DESC " " DRIVER_VERSION);
-+	return 0;
++	return SUCCESS;
 +}
 +
-+
-+/**
-+ *	usb_mceusb_exit
-+ */
-+static void __exit usb_mceusb_exit(void)
++static void __exit usb_remote_exit(void)
 +{
-+	/* deregister this driver with the USB subsystem */
-+	usb_deregister(&mceusb_driver);
++	usb_deregister(&usb_remote_driver);
 +}
 +
-+#ifdef MODULE
-+module_init(usb_mceusb_init);
-+module_exit(usb_mceusb_exit);
++module_init(usb_remote_init);
++module_exit(usb_remote_exit);
 +
 +MODULE_DESCRIPTION(DRIVER_DESC);
 +MODULE_AUTHOR(DRIVER_AUTHOR);
 +MODULE_LICENSE("GPL");
-+MODULE_DEVICE_TABLE(usb, mceusb_table);
++MODULE_DEVICE_TABLE(usb, usb_remote_table);
 +
-+module_param(debug, int, 0644);
++module_param(debug, bool, 0644);
 +MODULE_PARM_DESC(debug, "Debug enabled or not");
-+
-+#else /* not MODULE */
-+subsys_initcall(usb_mceusb_init);
-+
 +#endif /* MODULE */
-diff -Naurp linux-2.6.27.noarch/drivers/input/lirc/lirc_parallel.c linux-2.6.27.noarch.lirc/drivers/input/lirc/lirc_parallel.c
---- linux-2.6.27.noarch/drivers/input/lirc/lirc_parallel.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.27.noarch.lirc/drivers/input/lirc/lirc_parallel.c	2008-10-21 16:03:34.000000000 -0400
+diff --git a/drivers/input/lirc/lirc_parallel.c b/drivers/input/lirc/lirc_parallel.c
+new file mode 100644
+index 0000000..912cad2
+--- /dev/null
++++ b/drivers/input/lirc/lirc_parallel.c
 @@ -0,0 +1,728 @@
 +/****************************************************************************
 + ** lirc_parallel.c *********************************************************
@@ -8780,9 +8822,11 @@
 +MODULE_PARM_DESC(debug, "Check for printer (default: 0)");
 +
 +#endif /* MODULE */
-diff -Naurp linux-2.6.27.noarch/drivers/input/lirc/lirc_parallel.h linux-2.6.27.noarch.lirc/drivers/input/lirc/lirc_parallel.h
---- linux-2.6.27.noarch/drivers/input/lirc/lirc_parallel.h	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.27.noarch.lirc/drivers/input/lirc/lirc_parallel.h	2008-10-21 16:03:34.000000000 -0400
+diff --git a/drivers/input/lirc/lirc_parallel.h b/drivers/input/lirc/lirc_parallel.h
+new file mode 100644
+index 0000000..4bed6af
+--- /dev/null
++++ b/drivers/input/lirc/lirc_parallel.h
 @@ -0,0 +1,26 @@
 +/* lirc_parallel.h */
 +
@@ -8810,9 +8854,11 @@
 +#define LIRC_PARALLEL_TRANSMITTER_MASK ((1<<LIRC_PARALLEL_MAX_TRANSMITTERS) - 1)
 +
 +#endif
-diff -Naurp linux-2.6.27.noarch/drivers/input/lirc/lirc_sasem.c linux-2.6.27.noarch.lirc/drivers/input/lirc/lirc_sasem.c
---- linux-2.6.27.noarch/drivers/input/lirc/lirc_sasem.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.27.noarch.lirc/drivers/input/lirc/lirc_sasem.c	2008-10-21 16:03:34.000000000 -0400
+diff --git a/drivers/input/lirc/lirc_sasem.c b/drivers/input/lirc/lirc_sasem.c
+new file mode 100644
+index 0000000..003f492
+--- /dev/null
++++ b/drivers/input/lirc/lirc_sasem.c
 @@ -0,0 +1,969 @@
 +/* lirc_sasem.c - USB remote support for LIRC
 + * Version 0.5
@@ -9783,9 +9829,11 @@
 +module_exit(sasem_exit);
 +
 +#endif /* MODULE */
-diff -Naurp linux-2.6.27.noarch/drivers/input/lirc/lirc_serial.c linux-2.6.27.noarch.lirc/drivers/input/lirc/lirc_serial.c
---- linux-2.6.27.noarch/drivers/input/lirc/lirc_serial.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.27.noarch.lirc/drivers/input/lirc/lirc_serial.c	2008-10-21 16:03:34.000000000 -0400
+diff --git a/drivers/input/lirc/lirc_serial.c b/drivers/input/lirc/lirc_serial.c
+new file mode 100644
+index 0000000..465edd9
+--- /dev/null
++++ b/drivers/input/lirc/lirc_serial.c
 @@ -0,0 +1,1312 @@
 +/****************************************************************************
 + ** lirc_serial.c ***********************************************************
@@ -11099,9 +11147,11 @@
 +MODULE_PARM_DESC(debug, "Enable debugging messages");
 +
 +#endif /* MODULE */
-diff -Naurp linux-2.6.27.noarch/drivers/input/lirc/lirc_sir.c linux-2.6.27.noarch.lirc/drivers/input/lirc/lirc_sir.c
---- linux-2.6.27.noarch/drivers/input/lirc/lirc_sir.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.27.noarch.lirc/drivers/input/lirc/lirc_sir.c	2008-10-21 16:03:34.000000000 -0400
+diff --git a/drivers/input/lirc/lirc_sir.c b/drivers/input/lirc/lirc_sir.c
+new file mode 100644
+index 0000000..ea192b2
+--- /dev/null
++++ b/drivers/input/lirc/lirc_sir.c
 @@ -0,0 +1,1302 @@
 +/*
 + * LIRC SIR driver, (C) 2000 Milan Pikula <www at fornax.sk>
@@ -12405,9 +12455,11 @@
 +MODULE_PARM_DESC(debug, "Enable debugging messages");
 +
 +#endif /* MODULE */
-diff -Naurp linux-2.6.27.noarch/drivers/input/lirc/lirc_streamzap.c linux-2.6.27.noarch.lirc/drivers/input/lirc/lirc_streamzap.c
---- linux-2.6.27.noarch/drivers/input/lirc/lirc_streamzap.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.27.noarch.lirc/drivers/input/lirc/lirc_streamzap.c	2008-10-21 16:03:34.000000000 -0400
+diff --git a/drivers/input/lirc/lirc_streamzap.c b/drivers/input/lirc/lirc_streamzap.c
+new file mode 100644
+index 0000000..69865cb
+--- /dev/null
++++ b/drivers/input/lirc/lirc_streamzap.c
 @@ -0,0 +1,795 @@
 +/*
 + * Streamzap Remote Control driver
@@ -13204,9 +13256,11 @@
 +MODULE_PARM_DESC(debug, "Enable debugging messages");
 +
 +#endif /* MODULE */
-diff -Naurp linux-2.6.27.noarch/drivers/input/lirc/lirc_ttusbir.c linux-2.6.27.noarch.lirc/drivers/input/lirc/lirc_ttusbir.c
---- linux-2.6.27.noarch/drivers/input/lirc/lirc_ttusbir.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.27.noarch.lirc/drivers/input/lirc/lirc_ttusbir.c	2008-10-21 16:03:34.000000000 -0400
+diff --git a/drivers/input/lirc/lirc_ttusbir.c b/drivers/input/lirc/lirc_ttusbir.c
+new file mode 100644
+index 0000000..9ed9c7b
+--- /dev/null
++++ b/drivers/input/lirc/lirc_ttusbir.c
 @@ -0,0 +1,400 @@
 +/****************************************************************************
 + ** lirc_ttusbir.c ***********************************************************
@@ -13608,9 +13662,11 @@
 +subsys_initcall(ttusbir_init_module);
 +
 +#endif /* MODULE */
-diff -Naurp linux-2.6.27.noarch/drivers/input/lirc/lirc_zilog.c linux-2.6.27.noarch.lirc/drivers/input/lirc/lirc_zilog.c
---- linux-2.6.27.noarch/drivers/input/lirc/lirc_zilog.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.27.noarch.lirc/drivers/input/lirc/lirc_zilog.c	2008-10-21 16:03:34.000000000 -0400
+diff --git a/drivers/input/lirc/lirc_zilog.c b/drivers/input/lirc/lirc_zilog.c
+new file mode 100644
+index 0000000..20e6b27
+--- /dev/null
++++ b/drivers/input/lirc/lirc_zilog.c
 @@ -0,0 +1,1395 @@
 +/*
 + * i2c IR lirc plugin for devices with zilog IR processors
@@ -15007,39 +15063,3 @@
 + * c-basic-offset: 8
 + * End:
 + */
-diff -Naurp linux-2.6.27.noarch/drivers/input/lirc/Makefile linux-2.6.27.noarch.lirc/drivers/input/lirc/Makefile
---- linux-2.6.27.noarch/drivers/input/lirc/Makefile	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.27.noarch.lirc/drivers/input/lirc/Makefile	2008-10-21 16:04:26.000000000 -0400
-@@ -0,0 +1,23 @@
-+# Makefile for the lirc drivers.
-+#
-+
-+# Each configuration option enables a list of files.
-+
-+EXTRA_CFLAGS =-DIRCTL_DEV_MAJOR=61 -DLIRC_SERIAL_TRANSMITTER -I$(src)
-+
-+obj-$(CONFIG_LIRC_DEV)		+= lirc_dev.o
-+obj-$(CONFIG_LIRC_BT829)	+= lirc_bt829.o
-+obj-$(CONFIG_LIRC_I2C)		+= lirc_i2c.o
-+obj-$(CONFIG_LIRC_IGORPLUGUSB)	+= lirc_igorplugusb.o
-+obj-$(CONFIG_LIRC_IMON)		+= lirc_imon.o
-+obj-$(CONFIG_LIRC_IT87)		+= lirc_it87.o
-+obj-$(CONFIG_LIRC_ITE8709)	+= lirc_ite8709.o
-+obj-$(CONFIG_LIRC_MCEUSB)	+= lirc_mceusb.o
-+obj-$(CONFIG_LIRC_MCEUSB2)	+= lirc_mceusb2.o
-+obj-$(CONFIG_LIRC_PARALLEL)	+= lirc_parallel.o
-+obj-$(CONFIG_LIRC_SASEM)	+= lirc_sasem.o
-+obj-$(CONFIG_LIRC_SERIAL)	+= lirc_serial.o
-+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 -Naurp linux-2.6.27.noarch/drivers/input/Makefile linux-2.6.27.noarch.lirc/drivers/input/Makefile
---- linux-2.6.27.noarch/drivers/input/Makefile	2008-10-09 18:13:53.000000000 -0400
-+++ linux-2.6.27.noarch.lirc/drivers/input/Makefile	2008-10-21 16:03:34.000000000 -0400
-@@ -25,3 +25,5 @@ obj-$(CONFIG_INPUT_MISC)	+= misc/
- obj-$(CONFIG_INPUT_APMPOWER)	+= apm-power.o
- 
- obj-$(CONFIG_XEN_KBDDEV_FRONTEND)	+= xen-kbdfront.o
-+
-+obj-$(CONFIG_INPUT_LIRC)       += lirc/

linux-2.6.27-pci-hush-allocation-failures.patch:

Index: linux-2.6.27-pci-hush-allocation-failures.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/linux-2.6.27-pci-hush-allocation-failures.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6.27-pci-hush-allocation-failures.patch	30 Oct 2008 05:43:26 -0000	1.1
+++ linux-2.6.27-pci-hush-allocation-failures.patch	12 Jan 2009 19:54:18 -0000	1.2
@@ -1,42 +1,8 @@
-diff -up linux-2.6.27.noarch/drivers/pci/setup-res.c.jx linux-2.6.27.noarch/drivers/pci/setup-res.c
---- linux-2.6.27.noarch/drivers/pci/setup-res.c.jx	2008-10-09 18:13:53.000000000 -0400
-+++ linux-2.6.27.noarch/drivers/pci/setup-res.c	2008-10-16 14:12:13.000000000 -0400
-@@ -138,10 +138,10 @@ int pci_assign_resource(struct pci_dev *
- 
- 	align = resource_alignment(res);
- 	if (!align) {
--		dev_err(&dev->dev, "BAR %d: can't allocate resource (bogus "
--			"alignment) [%#llx-%#llx] flags %#lx\n",
--			resno, (unsigned long long)res->start,
--			(unsigned long long)res->end, res->flags);
-+		dev_info(&dev->dev, "BAR %d: can't allocate resource (bogus "
-+			 "alignment) [%#llx-%#llx] flags %#lx\n",
-+			 resno, (unsigned long long)res->start,
-+			 (unsigned long long)res->end, res->flags);
- 		return -EINVAL;
- 	}
- 
-@@ -162,11 +162,11 @@ int pci_assign_resource(struct pci_dev *
- 	}
- 
- 	if (ret) {
--		dev_err(&dev->dev, "BAR %d: can't allocate %s resource "
--			"[%#llx-%#llx]\n", resno,
--			res->flags & IORESOURCE_IO ? "I/O" : "mem",
--			(unsigned long long)res->start,
--			(unsigned long long)res->end);
-+		dev_info(&dev->dev, "BAR %d: can't allocate %s resource "
-+			 "[%#llx-%#llx]\n", resno,
-+			 res->flags & IORESOURCE_IO ? "I/O" : "mem",
-+			 (unsigned long long)res->start,
-+			 (unsigned long long)res->end);
- 	} else {
- 		res->flags &= ~IORESOURCE_STARTALIGN;
- 		if (resno < PCI_BRIDGE_RESOURCES)
-diff -up linux-2.6.27.noarch/arch/x86/pci/i386.c.jx linux-2.6.27.noarch/arch/x86/pci/i386.c
---- linux-2.6.27.noarch/arch/x86/pci/i386.c.jx	2008-10-09 18:13:53.000000000 -0400
-+++ linux-2.6.27.noarch/arch/x86/pci/i386.c	2008-10-23 10:21:14.000000000 -0400
-@@ -128,7 +128,7 @@ static void __init pcibios_allocate_bus_
+diff --git a/arch/x86/pci/i386.c b/arch/x86/pci/i386.c
+index 844df0c..43d9783 100644
+--- a/arch/x86/pci/i386.c
++++ b/arch/x86/pci/i386.c
+@@ -129,7 +129,7 @@ static void __init pcibios_allocate_bus_resources(struct list_head *bus_list)
  				pr = pci_find_parent_resource(dev, r);
  				if (!r->start || !pr ||
  				    request_resource(pr, r) < 0) {
@@ -45,7 +11,7 @@
  					/*
  					 * Something is wrong with the region.
  					 * Invalidate the resource to prevent
-@@ -169,7 +169,7 @@ static void __init pcibios_allocate_reso
+@@ -170,7 +170,7 @@ static void __init pcibios_allocate_resources(int pass)
  					r->flags, disabled, pass);
  				pr = pci_find_parent_resource(dev, r);
  				if (!pr || request_resource(pr, r) < 0) {
@@ -54,3 +20,25 @@
  					/* We'll assign a new address later */
  					r->end -= r->start;
  					r->start = 0;
+diff --git a/drivers/pci/setup-res.c b/drivers/pci/setup-res.c
+index 2dbd96c..4e37563 100644
+--- a/drivers/pci/setup-res.c
++++ b/drivers/pci/setup-res.c
+@@ -134,7 +134,7 @@ int pci_assign_resource(struct pci_dev *dev, int resno)
+ 
+ 	align = resource_alignment(res);
+ 	if (!align) {
+-		dev_err(&dev->dev, "BAR %d: can't allocate resource (bogus "
++		dev_info(&dev->dev, "BAR %d: can't allocate resource (bogus "
+ 			"alignment) %pR flags %#lx\n",
+ 			resno, res, res->flags);
+ 		return -EINVAL;
+@@ -157,7 +157,7 @@ int pci_assign_resource(struct pci_dev *dev, int resno)
+ 	}
+ 
+ 	if (ret) {
+-		dev_err(&dev->dev, "BAR %d: can't allocate %s resource %pR\n",
++		dev_info(&dev->dev, "BAR %d: can't allocate %s resource %pR\n",
+ 			resno, res->flags & IORESOURCE_IO ? "I/O" : "mem", res);
+ 	} else {
+ 		res->flags &= ~IORESOURCE_STARTALIGN;


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/sources,v
retrieving revision 1.798
retrieving revision 1.799
diff -u -r1.798 -r1.799
--- sources	18 Dec 2008 22:04:28 -0000	1.798
+++ sources	12 Jan 2009 19:54:18 -0000	1.799
@@ -1,2 +1 @@
-b3e78977aa79d3754cb7f8143d7ddabd  linux-2.6.27.tar.bz2
-82691ff96bff9b4fa19f91b69a9695f9  patch-2.6.27.10.bz2
+d351e44709c9810b85e29b877f50968a  linux-2.6.28.tar.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/upstream,v
retrieving revision 1.717
retrieving revision 1.718
diff -u -r1.717 -r1.718
--- upstream	18 Dec 2008 22:04:28 -0000	1.717
+++ upstream	12 Jan 2009 19:54:18 -0000	1.718
@@ -1,2 +1 @@
-linux-2.6.27.tar.bz2
-patch-2.6.27.10.bz2
+linux-2.6.28.tar.bz2


--- COPYING.modules DELETED ---


--- Config.mk DELETED ---


--- drm-fedora9-rollup.patch DELETED ---


--- drm-mm-readd-nopfn.patch DELETED ---


--- linux-2.6-acpi-dock-fix-eject-request-process.patch DELETED ---


--- linux-2.6-acpi-ignore-ae_not_found-error-of-ec-reg-method.patch DELETED ---


--- linux-2.6-alsa-backport-beep-switch.patch DELETED ---


--- linux-2.6-debug-no-quiet.patch DELETED ---


--- linux-2.6-default-mmf_dump_elf_headers.patch DELETED ---


--- linux-2.6-defaults-fat-utf8.patch DELETED ---


--- linux-2.6-dmi-autoload.patch DELETED ---


--- linux-2.6-e1000-corrupt-eeprom-checksum.patch DELETED ---


--- linux-2.6-e1000e-add-support-for-82567LM-3-and-82567LF-3-ICH10D-parts.patch DELETED ---


--- linux-2.6-e1000e-add-support-for-new-82574L-part.patch DELETED ---


--- linux-2.6-e1000e-add-support-for-the-82567LM-4-device.patch DELETED ---


--- linux-2.6-gspca-vc0321-fix-frame-overflow.patch DELETED ---


--- linux-2.6-input.git-i8042-add-xps-m1530-to-nomux.patch DELETED ---


--- linux-2.6-iwl3945-ibss-tsf-fix.patch DELETED ---


--- linux-2.6-iwlagn-downgrade-BUG_ON-in-interrupt.patch DELETED ---


--- linux-2.6-libata-sata_nv-disable-swncq.patch DELETED ---


--- linux-2.6-merge-efifb-imacfb.patch DELETED ---


--- linux-2.6-netdev-e1000-disable-alpm.patch DELETED ---


--- linux-2.6-netdev-r8169-2.6.28.patch DELETED ---


--- linux-2.6-nfs-client-mounts-hang.patch DELETED ---


--- linux-2.6-pci-fix-pciehp-irq0.patch DELETED ---


--- linux-2.6-pciehp-kill-annoying-messages.patch DELETED ---


--- linux-2.6-sata-eeepc-faster.patch DELETED ---


--- linux-2.6-sched-fine-tune-SD_MC_INIT.patch DELETED ---


--- linux-2.6-sched-fine-tune-SD_SIBLING_INIT.patch DELETED ---


--- linux-2.6-sched-wakeup-preempt-when-small-overlap.patch DELETED ---


--- linux-2.6-scsi-mpt-vmware-fix.patch DELETED ---


--- linux-2.6-selinux-recognise-addrlabel.patch DELETED ---


--- linux-2.6-smarter-relatime.patch DELETED ---


--- linux-2.6-usb-ehci-hcd-respect-nousb.patch DELETED ---


--- linux-2.6-uvc-hg.patch DELETED ---


--- linux-2.6-uvc-spca525.patch DELETED ---


--- linux-2.6-wireless-ath9k-dma-fixes.patch DELETED ---


--- linux-2.6-x86-check-for-null-irq-context.patch DELETED ---


--- linux-2.6-x86-debug-boot.patch DELETED ---


--- linux-2.6-x86-pci-amd-config-space.patch DELETED ---


--- linux-2.6-x86-tracehook.patch DELETED ---


--- linux-2.6-x86-tune-generic.patch DELETED ---


--- linux-2.6.27-ext4-rename-ext4dev-to-ext4.patch DELETED ---


--- linux-2.6.27-hwmon-applesmc-2.6.28.patch DELETED ---


--- linux-2.6.27-x86-tracehook-syscall-arg-order.patch DELETED ---


--- linux-2.6.27.7-alsa-driver-fixups.patch DELETED ---


--- linux-2.6.27.9-alsa-driver-1.0.18a.patch DELETED ---


--- linux-2.6.27.9-alsa-hda-add-a-quirk-for-dell-studio-15.patch DELETED ---


--- linux-2.6.27.9-alsa-hda-mark-dell-studio-1535-quirk.patch DELETED ---


--- linux-2.6.27.9-alsa-hda-no-headphone-as-line-out-swich-without-line-outs.patch DELETED ---


--- linux-2.6.27.tar.bz2.sign DELETED ---


--- patch-2.6.27.10.bz2.sign DELETED ---


--- sparc-2.6.git-aae7fb87ec4d2df6cb551670b1765cf4e5795a3b.patch DELETED ---



From kyle at fedoraproject.org  Mon Jan 12 19:58:07 2009
From: kyle at fedoraproject.org (Kyle McMartin)
Date: Mon, 12 Jan 2009 19:58:07 +0000 (UTC)
Subject: rpms/kernel/F-9 kernel.spec,1.892,1.893
Message-ID: <20090112195807.5550B70123@cvs1.fedora.phx.redhat.com>

Author: kyle

Update of /cvs/pkgs/rpms/kernel/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31063

Modified Files:
	kernel.spec 
Log Message:
poke fedora_cvs_origin


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/kernel.spec,v
retrieving revision 1.892
retrieving revision 1.893
diff -u -r1.892 -r1.893
--- kernel.spec	12 Jan 2009 19:54:17 -0000	1.892
+++ kernel.spec	12 Jan 2009 19:57:36 -0000	1.893
@@ -20,7 +20,7 @@
 # kernel spec when the kernel is rebased, so fedora_build automatically
 # works out to the offset from the rebase, so it doesn't get too ginormous.
 #
-%define fedora_cvs_origin   1180
+%define fedora_cvs_origin   892
 %define fedora_build_string %(R="$Revision$"; R="${R%% \$}"; R="${R#: 1.}"; echo $R)
 %define fedora_build_origin %(R=%{fedora_build_string}; R="${R%%%%.*}"; echo $R)
 %define fedora_build_prefix %(expr %{fedora_build_origin} - %{fedora_cvs_origin})



From kyle at fedoraproject.org  Mon Jan 12 19:59:15 2009
From: kyle at fedoraproject.org (Kyle McMartin)
Date: Mon, 12 Jan 2009 19:59:15 +0000 (UTC)
Subject: rpms/kernel/F-10 kernel.spec,1.1207,1.1208
Message-ID: <20090112195915.4179870123@cvs1.fedora.phx.redhat.com>

Author: kyle

Update of /cvs/pkgs/rpms/kernel/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31261

Modified Files:
	kernel.spec 
Log Message:
poke fedora_cvs_origin


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/kernel.spec,v
retrieving revision 1.1207
retrieving revision 1.1208
diff -u -r1.1207 -r1.1208
--- kernel.spec	12 Jan 2009 19:51:28 -0000	1.1207
+++ kernel.spec	12 Jan 2009 19:58:45 -0000	1.1208
@@ -20,7 +20,7 @@
 # kernel spec when the kernel is rebased, so fedora_build automatically
 # works out to the offset from the rebase, so it doesn't get too ginormous.
 #
-%define fedora_cvs_origin   1180
+%define fedora_cvs_origin   1207
 %define fedora_build_string %(R="$Revision$"; R="${R%% \$}"; R="${R#: 1.}"; echo $R)
 %define fedora_build_origin %(R=%{fedora_build_string}; R="${R%%%%.*}"; echo $R)
 %define fedora_build_prefix %(expr %{fedora_build_origin} - %{fedora_cvs_origin})



From spot at fedoraproject.org  Mon Jan 12 20:05:25 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Mon, 12 Jan 2009 20:05:25 +0000 (UTC)
Subject: rpms/lincity-ng/devel lincity-ng.spec,1.18,1.19
Message-ID: <20090112200525.DCDB970129@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/extras/rpms/lincity-ng/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32359

Modified Files:
	lincity-ng.spec 
Log Message:
symlink to dejavu rather than local copy


Index: lincity-ng.spec
===================================================================
RCS file: /cvs/extras/rpms/lincity-ng/devel/lincity-ng.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- lincity-ng.spec	24 Dec 2008 03:50:56 -0000	1.18
+++ lincity-ng.spec	12 Jan 2009 20:04:55 -0000	1.19
@@ -1,6 +1,6 @@
 Name:		lincity-ng
 Version:	1.97
-Release:	0.1.beta%{?dist}
+Release:	0.2.beta%{?dist}
 License:	GPLv2+
 Group:		Amusements/Games
 Summary:	City Simulation Game
@@ -20,10 +20,11 @@
 
 %package data
 Summary:	Data files needed to run lincity-ng
-# Fonts are Bitstream Vera, data bits are dual licensed GPLv2+ or CC-BY-SA
-License:	(GPLv2+ or CC-BY-SA) and Bitstream Vera
+# data bits are dual licensed GPLv2+ or CC-BY-SA
+License:	GPLv2+ or CC-BY-SA
 Group:		Amusements/Games
 Requires:	%{name} = %{version}-%{release}
+Requires:	dejavu-fonts-sans
 
 %description data
 This package contains the data files (graphics, models, audio) necessary to
@@ -43,6 +44,10 @@
 rm -rf $RPM_BUILD_ROOT
 DESTDIR=$RPM_BUILD_ROOT jam install
 
+# Make a symlink to system font, rather than include a copy of DejaVu Sans
+rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name}/fonts/sans.ttf
+ln -s %{_datadir}/fonts/dejavu/DejaVuSans.ttf $RPM_BUILD_ROOT%{_datadir}/%{name}/fonts/sans.ttf
+
 desktop-file-install --delete-original		\
   --vendor fedora				\
   --dir $RPM_BUILD_ROOT%{_datadir}/applications	\
@@ -65,6 +70,9 @@
 %{_datadir}/lincity-ng/
 
 %changelog
+* Mon Jan 12 2009 Tom "spot" Callaway <tcallawa at redhat.com> 1.97-0.2.beta
+- do not bundle font in data subpackage, use symlink and Requires: dejavu-fonts-sans
+
 * Tue Dec 23 2008 Tom "spot" Callaway <tcallawa at redhat.com> 1.97-0.1.beta
 - update to 1.97.beta
 



From tmz at fedoraproject.org  Mon Jan 12 20:07:51 2009
From: tmz at fedoraproject.org (Todd M. Zullinger)
Date: Mon, 12 Jan 2009 20:07:51 +0000 (UTC)
Subject: rpms/git/EL-5 CVE-2008-5517.patch,NONE,1.1 git.spec,1.37,1.38
Message-ID: <20090112200751.BFDC870123@cvs1.fedora.phx.redhat.com>

Author: tmz

Update of /cvs/extras/rpms/git/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv840

Modified Files:
	git.spec 
Added Files:
	CVE-2008-5517.patch 
Log Message:
* Mon Jan 12 2009 Todd Zullinger <tmz at pobox.com> 1.5.5.6-2
- Fix CVE-2008-5517, gitweb remote command injection


CVE-2008-5517.patch:

--- NEW FILE CVE-2008-5517.patch ---
>From 516381d50ba7acb66f260461f4d566ab9b6df107 Mon Sep 17 00:00:00 2001
From: Lea Wiemann <lewiemann at gmail.com>
Date: Tue, 17 Jun 2008 23:46:35 +0200
Subject: [PATCH] gitweb: quote commands properly when calling the shell

This eliminates the function git_cmd_str, which was used for composing
command lines, and adds a quote_command function, which quotes all of
its arguments (as in quote.c).

Signed-off-by: Lea Wiemann <LeWiemann at gmail.com>
Signed-off-by: Junio C Hamano <gitster at pobox.com>
---
 gitweb/gitweb.perl |   24 ++++++++++++++----------
 1 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl
index 4de9647..d7ee267 100755
--- a/gitweb/gitweb.perl
+++ b/gitweb/gitweb.perl
@@ -1500,9 +1500,13 @@ sub git_cmd {
 	return $GIT, '--git-dir='.$git_dir;
 }
 
-# returns path to the core git executable and the --git-dir parameter as string
-sub git_cmd_str {
-	return join(' ', git_cmd());
+# quote the given arguments for passing them to the shell
+# quote_command("command", "arg 1", "arg with ' and ! characters")
+# => "'command' 'arg 1' 'arg with '\'' and '\!' characters'"
+# Try to avoid using this function wherever possible.
+sub quote_command {
+	return join(' ',
+		    map( { my $a = $_; $a =~ s/(['!])/'\\$1'/g; "'$a'" } @_ ));
 }
 
 # get HEAD ref of given project as hash
@@ -4633,7 +4637,6 @@ sub git_snapshot {
 		$hash = git_get_head_hash($project);
 	}
 
-	my $git_command = git_cmd_str();
 	my $name = $project;
 	$name =~ s,([^/])/*\.git$,$1,;
 	$name = basename($name);
@@ -4641,11 +4644,12 @@ sub git_snapshot {
 	$name =~ s/\047/\047\\\047\047/g;
 	my $cmd;
 	$filename .= "-$hash$known_snapshot_formats{$format}{'suffix'}";
-	$cmd = "$git_command archive " .
-		"--format=$known_snapshot_formats{$format}{'format'} " .
-		"--prefix=\'$name\'/ $hash";
+	$cmd = quote_command(
+		git_cmd(), 'archive',
+		"--format=$known_snapshot_formats{$format}{'format'}",
+		"--prefix=$name/", $hash);
 	if (exists $known_snapshot_formats{$format}{'compressor'}) {
-		$cmd .= ' | ' . join ' ', @{$known_snapshot_formats{$format}{'compressor'}};
+		$cmd .= ' | ' . quote_command(@{$known_snapshot_formats{$format}{'compressor'}});
 	}
 
 	print $cgi->header(
@@ -4858,8 +4862,8 @@ sub git_object {
 	if ($hash || ($hash_base && !defined $file_name)) {
 		my $object_id = $hash || $hash_base;
 
-		my $git_command = git_cmd_str();
-		open my $fd, "-|", "$git_command cat-file -t $object_id 2>/dev/null"
+		open my $fd, "-|", quote_command(
+			git_cmd(), 'cat-file', '-t', $object_id) . ' 2> /dev/null'
 			or die_error('404 Not Found', "Object does not exist");
 		$type = <$fd>;
 		chomp $type;
-- 
1.6.1



Index: git.spec
===================================================================
RCS file: /cvs/extras/rpms/git/EL-5/git.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- git.spec	20 Dec 2008 18:15:40 -0000	1.37
+++ git.spec	12 Jan 2009 20:07:21 -0000	1.38
@@ -1,7 +1,7 @@
 # Pass --without docs to rpmbuild if you don't want the documentation
 Name: 		git
 Version: 	1.5.5.6
-Release: 	1%{?dist}
+Release: 	2%{?dist}
 Summary:  	Core git tools
 License: 	GPL
 Group: 		Development/Tools
@@ -11,6 +11,7 @@
 Source2:	git.xinetd
 Source3:	git.conf.httpd
 Patch0:		git-1.5-gitweb-home-link.patch
+Patch1:         CVE-2008-5517.patch
 BuildRequires:	perl, zlib-devel >= 1.2, openssl-devel, curl-devel, expat-devel, emacs, gettext %{!?_without_docs:, xmlto, asciidoc > 6.0.3}
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -120,6 +121,7 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1 -b .CVE-2008-5517
 
 %build
 make %{_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" \
@@ -244,6 +246,9 @@
 # No files for you!
 
 %changelog
+* Mon Jan 12 2009 Todd Zullinger <tmz at pobox.com> 1.5.5.6-2
+- Fix CVE-2008-5517, gitweb remote command injection
+
 * Sat Dec 20 2008 James Bowes <jbowes at redhat.com> 1.5.5.6-1
 - git-1.5.5.6
 



From roland at fedoraproject.org  Mon Jan 12 20:12:14 2009
From: roland at fedoraproject.org (Roland McGrath)
Date: Mon, 12 Jan 2009 20:12:14 +0000 (UTC)
Subject: rpms/kernel/F-10 kernel.spec, 1.1208, 1.1209 linux-2.6-utrace.patch,
	1.104, 1.105
Message-ID: <20090112201214.54D4770123@cvs1.fedora.phx.redhat.com>

Author: roland

Update of /cvs/pkgs/rpms/kernel/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1599

Modified Files:
	kernel.spec linux-2.6-utrace.patch 
Log Message:
utrace update


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/kernel.spec,v
retrieving revision 1.1208
retrieving revision 1.1209
diff -u -r1.1208 -r1.1209
--- kernel.spec	12 Jan 2009 19:58:45 -0000	1.1208
+++ kernel.spec	12 Jan 2009 20:11:43 -0000	1.1209
@@ -1773,6 +1773,9 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Mon Jan 12 2009 Roland McGrath <roland at redhat.com>
+- utrace update
+
 * Mon Jan 12 2009 Kyle McMartin <kyle at redhat.com>
 - Rebase for Fedora 10.
 - Turn off CONFIG_MAXSMP on x86_64.
@@ -1834,7 +1837,7 @@
 - 2.6.28-rc8-git3
 
 * Sat Dec 13 2008 Kyle McMartin <kyle at redhat.com>
-- 2.6.28-rc8-git2 
+- 2.6.28-rc8-git2
 
 * Sat Dec 13 2008 Tom "spot" Callaway <tcallawa at redhat.com>
 - Add "scsi_esp_register" to the search terms for modules.block so we pick up sun_esp.ko
@@ -1915,7 +1918,7 @@
 - 2.6.28-rc6-git1
 
 * Mon Nov 24 2008 Jeremy Katz <katzj at redhat.com>
-- Add modules.drm file so that we can determine the DRM modules to pull into 
+- Add modules.drm file so that we can determine the DRM modules to pull into
   initrds
 
 * Wed Nov 19 2008 Neil Horman <nhorman at redhat.com>

linux-2.6-utrace.patch:

Index: linux-2.6-utrace.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/linux-2.6-utrace.patch,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -r1.104 -r1.105
--- linux-2.6-utrace.patch	12 Jan 2009 19:51:30 -0000	1.104
+++ linux-2.6-utrace.patch	12 Jan 2009 20:11:43 -0000	1.105
@@ -1,5 +1,5 @@
- Documentation/DocBook/Makefile    |    4 +-
- Documentation/DocBook/utrace.tmpl |  566 ++++++++
+ Documentation/DocBook/Makefile    |    2 +-
+ Documentation/DocBook/utrace.tmpl |  571 ++++++++
  fs/proc/array.c                   |    3 +
  include/linux/ptrace.h            |   21 +
  include/linux/sched.h             |    6 +
@@ -9,19 +9,15 @@
  kernel/Makefile                   |    1 +
  kernel/ptrace.c                   |  793 +++++++++++-
  kernel/signal.c                   |   14 +-
- kernel/utrace.c                   | 2587 +++++++++++++++++++++++++++++++++++++
- 12 files changed, 4783 insertions(+), 13 deletions(-)
+ kernel/utrace.c                   | 2590 +++++++++++++++++++++++++++++++++++++
+ 12 files changed, 4790 insertions(+), 12 deletions(-)
 
 diff --git a/Documentation/DocBook/Makefile b/Documentation/DocBook/Makefile
-index 9b1f6ca..e39334b 100644  
+index 9b1f6ca..1fd3feb 100644  
 --- a/Documentation/DocBook/Makefile
 +++ b/Documentation/DocBook/Makefile
-@@ -6,10 +6,10 @@
- # To add a new book the only step required is to add the book to the
- # list of DOCBOOKS.
- 
--DOCBOOKS := wanbook.xml z8530book.xml mcabook.xml \
-+DOCBOOKS := wanbook.xml z8530book.xml mcabook.xml \
+@@ -9,7 +9,7 @@
+ DOCBOOKS := wanbook.xml z8530book.xml mcabook.xml \
  	    kernel-hacking.xml kernel-locking.xml deviceiobook.xml \
  	    procfs-guide.xml writing_usb_driver.xml networking.xml \
 -	    kernel-api.xml filesystems.xml lsm.xml usb.xml kgdb.xml \
@@ -31,10 +27,10 @@
  	    mac80211.xml debugobjects.xml sh.xml
 diff --git a/Documentation/DocBook/utrace.tmpl b/Documentation/DocBook/utrace.tmpl
 new file mode 100644
-index ...1c37104 100644  
+index ...f253402 100644  
 --- /dev/null
 +++ b/Documentation/DocBook/utrace.tmpl
-@@ -0,0 +1,566 @@
+@@ -0,0 +1,571 @@
 +<?xml version="1.0" encoding="UTF-8"?>
 +<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
 +"http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" []>
@@ -101,6 +97,11 @@
 +    Many engines can be attached to each thread.  When a thread has an
 +    event, each engine gets a callback if it has set the event flag for
 +    that event type.  Engines are called in the order they attached.
++    Engines that attach after the event has occurred do not get callbacks
++    for that event.  This includes any new engines just attached by an
++    existing engine's callback function.  Once the sequence of callbacks
++    for that one event has completed, such new engines are then eligible in
++    the next sequence that starts when there is another event.
 +  </para>
 +
 +  <para>
@@ -2630,14 +2631,14 @@
  			  struct pt_regs *regs, void *cookie)
 diff --git a/kernel/utrace.c b/kernel/utrace.c
 new file mode 100644
-index ...3e2191c 100644  
+index ...1873b9d 100644  
 --- /dev/null
 +++ b/kernel/utrace.c
-@@ -0,0 +1,2587 @@
+@@ -0,0 +1,2590 @@
 +/*
 + * utrace infrastructure interface for debugging user processes
 + *
-+ * Copyright (C) 2006, 2007, 2008 Red Hat, Inc.  All rights reserved.
++ * Copyright (C) 2006-2009 Red Hat, Inc.  All rights reserved.
 + *
 + * This copyrighted material is made available to anyone wishing to use,
 + * modify, copy, or redistribute it subject to the terms and conditions
@@ -3012,27 +3013,25 @@
 +	list_add_tail(&engine->entry, &utrace->attaching);
 +
 +	/*
-+	 * 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.
++	 * 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 target == current, it would be safe just to call
++	 * splice_attaching() right here.  But if we're inside a
++	 * callback, that would mean the new engine also gets
++	 * notified about the event that precipitated its own
++	 * creation.  This is not what the user wants.
++	 *
++	 * Setting ->report ensures that start_report() takes the
++	 * lock and does it next time.  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.
 +	 */
-+
-+	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);
-+	}
++	utrace->report = 1;
++	set_notify_resume(target);
 +	goto finish;
 +
 +first:
@@ -3456,6 +3455,12 @@
 + *
 + * To synchronize after an -%EINPROGRESS return, see utrace_barrier().
 + *
++ * When @target is @current, -%EINPROGRESS is not returned.  But
++ * note that a newly-created engine will not receive any callbacks
++ * related to an event notification already in progress.  This call
++ * enables @events callbacks to be made as soon as @engine becomes
++ * eligible for any callbacks, see utrace_attach_task().
++ *
 + * These rules provide for coherent synchronization based on %UTRACE_STOP,
 + * even when %SIGKILL is breaking its normal simple rules.
 + */
@@ -3910,11 +3915,10 @@
 +	case UTRACE_REPORT:
 +		/*
 +		 * Make the thread call tracehook_notify_resume() soon.
-+		 * But don't bother if it's already been stopped or
-+		 * interrupted.  In those cases, utrace_get_signal()
-+		 * will be reporting soon.
++		 * But don't bother if it's already been interrupted.
++		 * In that case, utrace_get_signal() will be reporting soon.
 +		 */
-+		if (!utrace->report && !utrace->interrupt && !utrace->stopped) {
++		if (!utrace->report && !utrace->interrupt) {
 +			utrace->report = 1;
 +			set_notify_resume(target);
 +		}



From roland at fedoraproject.org  Mon Jan 12 20:12:14 2009
From: roland at fedoraproject.org (Roland McGrath)
Date: Mon, 12 Jan 2009 20:12:14 +0000 (UTC)
Subject: rpms/kernel/F-10/scripts pull-upstreams.sh,1.7,1.8
Message-ID: <20090112201214.638F870129@cvs1.fedora.phx.redhat.com>

Author: roland

Update of /cvs/pkgs/rpms/kernel/F-10/scripts
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1599/scripts

Modified Files:
	pull-upstreams.sh 
Log Message:
utrace update


Index: pull-upstreams.sh
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/scripts/pull-upstreams.sh,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- pull-upstreams.sh	12 Jan 2009 19:51:31 -0000	1.7
+++ pull-upstreams.sh	12 Jan 2009 20:11:44 -0000	1.8
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-url=http://people.redhat.com/roland/utrace/2.6-current
+url=http://people.redhat.com/roland/utrace/${1:2.6.28}
 
 wget -q -O /dev/stdout $url/series | grep 'patch$' |
 while read i



From rdieter at fedoraproject.org  Mon Jan 12 20:16:14 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 12 Jan 2009 20:16:14 +0000 (UTC)
Subject: rpms/qt/devel qt.spec, 1.219,
	1.220 qt-x11-opensource-src-4.3.4-no-hardcoded-font-aliases.patch,
	1.1, NONE
Message-ID: <20090112201614.7218A70123@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/qt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2231

Modified Files:
	qt.spec 
Removed Files:
	qt-x11-opensource-src-4.3.4-no-hardcoded-font-aliases.patch 
Log Message:
* Mon Jan 12 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.4.3-10
- drop qt-x11-opensource-src-4.3.4-no-hardcoded-font-aliases.patch (#447298),
  in favor of qt-copy's 0263-fix-fontconfig-handling.diff



Index: qt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qt/devel/qt.spec,v
retrieving revision 1.219
retrieving revision 1.220
diff -u -r1.219 -r1.220
--- qt.spec	12 Jan 2009 12:09:49 -0000	1.219
+++ qt.spec	12 Jan 2009 20:15:44 -0000	1.220
@@ -9,7 +9,7 @@
 Name:    qt4
 %endif
 Version: 4.4.3
-Release: 9%{?dist}
+Release: 10%{?dist}
 
 # GPLv2 exceptions(see GPL_EXCEPTIONS*.txt)
 License: GPLv3 with exceptions or GPLv2 with exceptions
@@ -33,8 +33,6 @@
 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
@@ -284,7 +282,6 @@
 %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 .im
 
@@ -734,6 +731,10 @@
 
 
 %changelog
+* Mon Jan 12 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.4.3-10
+- drop qt-x11-opensource-src-4.3.4-no-hardcoded-font-aliases.patch (#447298),
+  in favor of qt-copy's 0263-fix-fontconfig-handling.diff
+
 * Mon Jan 12 2009 Than Ngo <than at redhat.com> - 4.4.3-9
 - qt-copy-patches-20090112
 


--- qt-x11-opensource-src-4.3.4-no-hardcoded-font-aliases.patch DELETED ---



From quantumburnz at fedoraproject.org  Mon Jan 12 20:23:56 2009
From: quantumburnz at fedoraproject.org (Christopher D. Stover)
Date: Mon, 12 Jan 2009 20:23:56 +0000 (UTC)
Subject: rpms/barry/devel barry.spec,1.6,1.7
Message-ID: <20090112202356.DF2FE70123@cvs1.fedora.phx.redhat.com>

Author: quantumburnz

Update of /cvs/pkgs/rpms/barry/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3221

Modified Files:
	barry.spec 
Log Message:
remove configure macros


Index: barry.spec
===================================================================
RCS file: /cvs/pkgs/rpms/barry/devel/barry.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- barry.spec	12 Jan 2009 19:07:00 -0000	1.6
+++ barry.spec	12 Jan 2009 20:23:26 -0000	1.7
@@ -24,7 +24,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libusb-devel boost-devel desktop-file-utils gtkmm24-devel
-BuildRequires:  libglademm24-devel libglade2-devel libtar-devel
+BuildRequires:  libglademm24-devel libglade2-devel libtar-devel libtool
 Requires:       initscripts
 
 %description
@@ -64,7 +64,7 @@
 Summary: BlackBerry Desktop for Linux - opensync plugin
 Group: Applications/Productivity
 BuildRequires: libopensync-devel
-Requires: libopensync
+Requires: libopensync == 0.22
 
 %description opensync
 Barry is a desktop toolset for managing your BlackBerry device.
@@ -98,30 +98,30 @@
 
 %build
 # main tree
-%{configure} --with-boost
+# %{configure} --with-boost
 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
 # Touch-magic to prevent auto* from running.  Thank you Andreas Metzler.
-touch -r Makefile.am configure.ac aclocal.m4 configure
-%{__make} %{?_smp_mflags}
+#touch -r Makefile ./src/Makefile ./tools/Makefile ./examples/Makefile ./man/Makefile libbarry-0.pc config.h Makefile.am configure.ac aclocal.m4 configure
+#%{__make} %{?_smp_mflags}
 
 # gui tree
 cd gui/
-%{configure} PKG_CONFIG_PATH="..:$PKG_CONFIG_PATH" CXXFLAGS="-I../.." LDFLAGS="-L../../src"
+# %{configure} PKG_CONFIG_PATH="..:$PKG_CONFIG_PATH" CXXFLAGS="-I../.." LDFLAGS="-L../../src"
 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
-touch -r Makefile.am configure.ac aclocal.m4 configure
-%{__make} %{?_smp_mflags}
+#touch -r Makefile ./src/Makefile.am ./man/Makefile.am config.h Makefile.am configure.ac aclocal.m4 configure
+#%{__make} %{?_smp_mflags}
 cd ../
 
 # opensync tree
 %if %{with_opensync}
 cd opensync-plugin/
-%{configure} PKG_CONFIG_PATH="..:$PKG_CONFIG_PATH" CXXFLAGS="-I../.." LDFLAGS="-L../../src"
+# %{configure} PKG_CONFIG_PATH="..:$PKG_CONFIG_PATH" CXXFLAGS="-I../.." LDFLAGS="-L../../src"
 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
-touch -r Makefile.am configure.ac aclocal.m4 configure
-%{__make} %{?_smp_mflags}
+#touch -r Makefile.am configure.ac aclocal.m4 configure
+#%{__make} %{?_smp_mflags}
 cd ../
 %endif
 



From mbarnes at fedoraproject.org  Mon Jan 12 20:24:24 2009
From: mbarnes at fedoraproject.org (Matthew Barnes)
Date: Mon, 12 Jan 2009 20:24:24 +0000 (UTC)
Subject: rpms/evolution/F-10 evolution.spec,1.365,1.366
Message-ID: <20090112202424.CE70170123@cvs1.fedora.phx.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/evolution/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3282

Modified Files:
	evolution.spec 
Log Message:

* Mon Jan 12 2009 Matthew Barnes <mbarnes at redhat.com> - 2.24.3-1.fc10
- Update to 2.24.3
- Bump eds_version to 2.24.3.
- Remove patch for RH bug #476438 (fixed upstream).
- Remove patch for GNOME bug #552583 (fixed upstream).



Index: evolution.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/F-10/evolution.spec,v
retrieving revision 1.365
retrieving revision 1.366
diff -u -r1.365 -r1.366
--- evolution.spec	12 Jan 2009 19:49:08 -0000	1.365
+++ evolution.spec	12 Jan 2009 20:23:54 -0000	1.366
@@ -1,6 +1,6 @@
 %define dbus_glib_version 0.70
 %define dbus_version 1.0
-%define eds_version 2.24.1
+%define eds_version 2.24.3
 %define glib2_version 2.16.0
 %define gnome_doc_utils_version 0.8.0
 %define gnome_icon_theme_version 2.19.91
@@ -698,6 +698,7 @@
 %changelog
 * Mon Jan 12 2009 Matthew Barnes <mbarnes at redhat.com> - 2.24.3-1.fc10
 - Update to 2.24.3
+- Bump eds_version to 2.24.3.
 - Remove patch for RH bug #476438 (fixed upstream).
 - Remove patch for GNOME bug #552583 (fixed upstream).
 



From pkgdb at fedoraproject.org  Mon Jan 12 20:27:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 12 Jan 2009 20:27:38 +0000
Subject: [pkgdb] gtk+ had acl change status
Message-ID: <20090112202739.5C438208421@bastion.fedora.phx.redhat.com>

toshio has set the watchbugzilla acl on gtk+ (Fedora 9) to Obsolete for dhurander3

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gtk+



From rdieter at fedoraproject.org  Mon Jan 12 20:30:36 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 12 Jan 2009 20:30:36 +0000 (UTC)
Subject: rpms/uw-imap/devel uw-imap.spec,1.55,1.56
Message-ID: <20090112203036.2113970123@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/uw-imap/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4186

Modified Files:
	uw-imap.spec 
Log Message:
* Mon Jan 12 2009 Rex Dieter <rdieter at fedoraproject.org> 2007e-2
- main/-utils: +Req: %{imap_libs} = %{version}-%{release}



Index: uw-imap.spec
===================================================================
RCS file: /cvs/pkgs/rpms/uw-imap/devel/uw-imap.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- uw-imap.spec	19 Dec 2008 18:53:28 -0000	1.55
+++ uw-imap.spec	12 Jan 2009 20:30:05 -0000	1.56
@@ -14,7 +14,7 @@
 Summary: UW Server daemons for IMAP and POP network mail protocols
 Name:	 uw-imap 
 Version: 2007e
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 # See LICENSE.txt, http://www.apache.org/licenses/LICENSE-2.0
 License: ASL 2.0 
@@ -68,6 +68,8 @@
 Prereq: xinetd
 Requires(post): openssl
 
+Requires: %{imap_libs} = %{version}-%{release}
+
 %description
 The %{name} package provides UW server daemons for both the IMAP (Internet
 Message Access Protocol) and POP (Post Office Protocol) mail access
@@ -118,6 +120,7 @@
 %package utils
 Summary: UW IMAP Utilities to make managing your email simpler
 Group: 	 Applications/System 
+Requires: %{imap_libs} = %{version}-%{release}
 # imap -> uw-imap rename
 Obsoletes: imap-utils < 1:%{version}
 %description utils
@@ -309,6 +312,9 @@
 
 
 %changelog
+* Mon Jan 12 2009 Rex Dieter <rdieter at fedoraproject.org> 2007e-2
+- main/-utils: +Req: %%{imap_libs} = %{version}-%{release}
+
 * Fri Dec 19 2008 Rex Dieter <rdieter at fedoraproject.org> 2007e-1
 - imap-2007e
 



From rdieter at fedoraproject.org  Mon Jan 12 20:33:12 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 12 Jan 2009 20:33:12 +0000 (UTC)
Subject: rpms/strigi/devel .cvsignore, 1.13, 1.14 sources, 1.13,
	1.14 strigi.spec, 1.32, 1.33
Message-ID: <20090112203312.9A44570123@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/strigi/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4706

Modified Files:
	.cvsignore sources strigi.spec 
Log Message:
* Mon Jan 12 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.6.3-1
- strigi-0.6.3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/strigi/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	9 Jan 2009 14:21:25 -0000	1.13
+++ .cvsignore	12 Jan 2009 20:32:42 -0000	1.14
@@ -1 +1 @@
-strigi-0.6.2.tar.bz2
+strigi-0.6.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/strigi/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	9 Jan 2009 14:21:25 -0000	1.13
+++ sources	12 Jan 2009 20:32:42 -0000	1.14
@@ -1 +1 @@
-0b17b84a4db7b3ad9da342a9c093a14d  strigi-0.6.2.tar.bz2
+52787a80278d24b0ee552b81bbf547aa  strigi-0.6.3.tar.bz2


Index: strigi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/strigi/devel/strigi.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- strigi.spec	9 Jan 2009 14:21:25 -0000	1.32
+++ strigi.spec	12 Jan 2009 20:32:42 -0000	1.33
@@ -1,5 +1,5 @@
 Name:		strigi
-Version:	0.6.2
+Version:	0.6.3
 Release:	1%{?dist}
 Summary:	A desktop search program for KDE
 Group:		Applications/Productivity
@@ -107,6 +107,9 @@
 %{_libdir}/strigi/
 
 %changelog
+* Mon Jan 12 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.6.3-1
+- strigi-0.6.3
+
 * Tue Jan 06 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.6.2-1
 - strigi-0.6.2
 - use %%cmake macro



From rdieter at fedoraproject.org  Mon Jan 12 20:35:22 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 12 Jan 2009 20:35:22 +0000 (UTC)
Subject: rpms/kdelibs/devel kde4.sh,1.3,1.4 kdelibs.spec,1.414,1.415
Message-ID: <20090112203522.EA9B870123@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdelibs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5191

Modified Files:
	kde4.sh kdelibs.spec 
Log Message:
* Mon Jan 12 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.1.96-7
- Slight speedup to profile.d/kde.sh (#465370)
- (Build)Req: strigi(-devel) >= 0.6.3



Index: kde4.sh
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/kde4.sh,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- kde4.sh	9 Jan 2009 15:43:38 -0000	1.3
+++ kde4.sh	12 Jan 2009 20:34:52 -0000	1.4
@@ -5,12 +5,12 @@
 [ -z "$KDEDIRS" ] && KDEDIRS="/usr" && export KDEDIRS
 
 ## When/if using prelinking, avoids (some) use of kdeinit
-if [ -f /etc/sysconfig/prelink ]; then
-  if [ `grep '^PRELINKING=yes' /etc/sysconfig/prelink` ] ; then
-    [ -z "$KDE_IS_PRELINKED" ] && KDE_IS_PRELINKED=1 && export KDE_IS_PRELINKED
-  fi
+if [ -z "$KDE_IS_PRELINKED" ] ; then
+  grep -qs '^PRELINKING=yes' /etc/sysconfig/prelink && \
+  KDE_IS_PRELINKED=1 && export KDE_IS_PRELINKED
 fi
 
+
 # handled in startkde, but this sets for other DE's too
 if [ -n "$QT_PLUGIN_PATH" ] ; then
   if ! echo "$QT_PLUGIN_PATH" | grep -qw `kde4-config --path qtplugins` ; then


Index: kdelibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.414
retrieving revision 1.415
diff -u -r1.414 -r1.415
--- kdelibs.spec	12 Jan 2009 13:43:16 -0000	1.414
+++ kdelibs.spec	12 Jan 2009 20:34:52 -0000	1.415
@@ -118,7 +118,7 @@
 BuildRequires: phonon-devel >= 4.2.96
 BuildRequires: shared-mime-info
 BuildRequires: soprano-devel >= 2.1.64
-BuildRequires: strigi-devel >= 0.5.9
+BuildRequires: strigi-devel >= 0.6.3
 BuildRequires: zlib-devel
 BuildRequires: libutempter-devel
 # extra X deps (seemingly needed and/or checked-for by most kde4 buildscripts)
@@ -158,7 +158,7 @@
 Requires: qt4-devel
 Requires: openssl-devel
 Requires: phonon-devel >= 4.2.96
-Requires: strigi-devel
+Requires: strigi-devel >= 0.6.3
 Requires: bzip2-devel gamin-devel libacl-devel zlib-devel libutempter-devel
 %{?x_deps:Requires: %{x_deps}}
 %description devel
@@ -371,6 +371,10 @@
 
 
 %changelog
+* Mon Jan 12 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.1.96-7
+- Slight speedup to profile.d/kde.sh (#465370)
+- (Build)Req: strigi(-devel) >= 0.6.3
+
 * Mon Jan 12 2009 Than Ngo <than at redhat.com> - 4.1.96-6
 - fix a crash (appearing in KSMServer)
 



From rdieter at fedoraproject.org  Mon Jan 12 20:36:21 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 12 Jan 2009 20:36:21 +0000 (UTC)
Subject: rpms/kdelibs/devel kdelibs.spec,1.415,1.416
Message-ID: <20090112203621.C5F417013F@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdelibs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5429

Modified Files:
	kdelibs.spec 
Log Message:
doh, Release++



Index: kdelibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.415
retrieving revision 1.416
diff -u -r1.415 -r1.416
--- kdelibs.spec	12 Jan 2009 20:34:52 -0000	1.415
+++ kdelibs.spec	12 Jan 2009 20:35:51 -0000	1.416
@@ -1,6 +1,6 @@
 Summary: K Desktop Environment 4 - Libraries
 Version: 4.1.96
-Release: 6%{?dist}
+Release: 7%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs



From rdieter at fedoraproject.org  Mon Jan 12 20:46:52 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 12 Jan 2009 20:46:52 +0000 (UTC)
Subject: rpms/uw-imap/devel uw-imap.spec,1.56,1.57
Message-ID: <20090112204652.9864270123@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/uw-imap/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7741

Modified Files:
	uw-imap.spec 
Log Message:
escape macros in changelog



Index: uw-imap.spec
===================================================================
RCS file: /cvs/pkgs/rpms/uw-imap/devel/uw-imap.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- uw-imap.spec	12 Jan 2009 20:30:05 -0000	1.56
+++ uw-imap.spec	12 Jan 2009 20:46:22 -0000	1.57
@@ -14,7 +14,7 @@
 Summary: UW Server daemons for IMAP and POP network mail protocols
 Name:	 uw-imap 
 Version: 2007e
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 # See LICENSE.txt, http://www.apache.org/licenses/LICENSE-2.0
 License: ASL 2.0 
@@ -312,8 +312,8 @@
 
 
 %changelog
-* Mon Jan 12 2009 Rex Dieter <rdieter at fedoraproject.org> 2007e-2
-- main/-utils: +Req: %%{imap_libs} = %{version}-%{release}
+* Mon Jan 12 2009 Rex Dieter <rdieter at fedoraproject.org> 2007e-3
+- main/-utils: +Req: %%imap_libs = %%version-%%release
 
 * Fri Dec 19 2008 Rex Dieter <rdieter at fedoraproject.org> 2007e-1
 - imap-2007e



From spot at fedoraproject.org  Mon Jan 12 20:49:55 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Mon, 12 Jan 2009 20:49:55 +0000 (UTC)
Subject: rpms/asymptote/devel .cvsignore, 1.39, 1.40 asymptote.spec, 1.47,
	1.48 sources, 1.39, 1.40
Message-ID: <20090112204955.50AEB70123@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/asymptote/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8245

Modified Files:
	.cvsignore asymptote.spec sources 
Log Message:
1.58


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/asymptote/devel/.cvsignore,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- .cvsignore	15 Dec 2008 14:40:07 -0000	1.39
+++ .cvsignore	12 Jan 2009 20:49:24 -0000	1.40
@@ -1 +1 @@
-asymptote-1.57.src.tgz
+asymptote-1.58.src.tgz


Index: asymptote.spec
===================================================================
RCS file: /cvs/pkgs/rpms/asymptote/devel/asymptote.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- asymptote.spec	15 Dec 2008 14:40:08 -0000	1.47
+++ asymptote.spec	12 Jan 2009 20:49:24 -0000	1.48
@@ -4,7 +4,7 @@
 %define xemacs_sitelisp %{_datadir}/xemacs/site-packages/lisp
 
 Name:           asymptote
-Version:        1.57
+Version:        1.58
 Release:        1%{?dist}
 Summary:        Descriptive vector graphics language
 
@@ -140,6 +140,9 @@
 
 
 %changelog
+* Mon Jan 12 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 1.58-1
+- 1.58
+
 * Mon Dec 15 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1.57-1
 - 1.57
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/asymptote/devel/sources,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- sources	15 Dec 2008 14:40:08 -0000	1.39
+++ sources	12 Jan 2009 20:49:24 -0000	1.40
@@ -1 +1 @@
-48e54ce340a54d3cfc79f4170c62b60d  asymptote-1.57.src.tgz
+1a832a2a0286f517611641a67dcb5b13  asymptote-1.58.src.tgz



From josef at fedoraproject.org  Mon Jan 12 20:53:58 2009
From: josef at fedoraproject.org (Josef Bacik)
Date: Mon, 12 Jan 2009 20:53:58 +0000 (UTC)
Subject: rpms/btrfs-progs/devel .cvsignore, 1.4, 1.5 btrfs-progs.spec, 1.4, 
	1.5 sources, 1.4, 1.5
Message-ID: <20090112205358.D523B70123@cvs1.fedora.phx.redhat.com>

Author: josef

Update of /cvs/pkgs/rpms/btrfs-progs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8804

Modified Files:
	.cvsignore btrfs-progs.spec sources 
Log Message:
updating btrfs-progs to new 0.17 release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/btrfs-progs/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	10 Jan 2009 20:37:03 -0000	1.4
+++ .cvsignore	12 Jan 2009 20:53:28 -0000	1.5
@@ -1 +1 @@
-btrfs-progs-0.16.git1.tar.bz2
+btrfs-progs-0.17.tar.gz


Index: btrfs-progs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/btrfs-progs/devel/btrfs-progs.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- btrfs-progs.spec	10 Jan 2009 20:37:03 -0000	1.4
+++ btrfs-progs.spec	12 Jan 2009 20:53:28 -0000	1.5
@@ -1,5 +1,5 @@
 Name:           btrfs-progs
-Version:        0.16.git1
+Version:        0.17
 Release:        1%{?dist}
 Summary:        Userspace programs for btrfs
 
@@ -43,6 +43,9 @@
 %{_root_sbindir}/btrfstune
 
 %changelog
+* Mon Jan 12 2009 Josef Bacik <josef at toxicpanda.com> 0.17
+- Upstream release 0.17
+
 * Sat Jan 10 2009 Kyle McMartin <kyle at redhat.com> 0.16.git1-1
 - Upstream git sync from -g72359e8 (needed for kernel...)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/btrfs-progs/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	10 Jan 2009 20:37:03 -0000	1.4
+++ sources	12 Jan 2009 20:53:28 -0000	1.5
@@ -1 +1 @@
-2da10995e9d41c4a8bbd9a50d00daa08  btrfs-progs-0.16.git1.tar.bz2
+ea28f7173e39c2110cff85932529b47d  btrfs-progs-0.17.tar.gz



From kwizart at fedoraproject.org  Mon Jan 12 21:00:21 2009
From: kwizart at fedoraproject.org (Chauvet Nicolas)
Date: Mon, 12 Jan 2009 21:00:21 +0000 (UTC)
Subject: rpms/python-BeautifulSoup/devel sources, 1.5, 1.6 .cvsignore, 1.5, 
	1.6 python-BeautifulSoup.spec, 1.10, 1.11
Message-ID: <20090112210021.F086F70123@cvs1.fedora.phx.redhat.com>

Author: kwizart

Update of /cvs/pkgs/rpms/python-BeautifulSoup/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9795

Modified Files:
	sources .cvsignore python-BeautifulSoup.spec 
Log Message:
Update to 3.1.0.1



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-BeautifulSoup/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	4 Dec 2008 19:16:51 -0000	1.5
+++ sources	12 Jan 2009 20:59:51 -0000	1.6
@@ -1 +1 @@
-d28c8148bb770e72762eb202fa797b56  BeautifulSoup-3.0.7a.tar.gz
+bcffef3eda6e06e6d1e18c06a9db8a24  BeautifulSoup-3.1.0.1.tar.gz


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-BeautifulSoup/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	4 Dec 2008 19:16:51 -0000	1.5
+++ .cvsignore	12 Jan 2009 20:59:51 -0000	1.6
@@ -1 +1 @@
-BeautifulSoup-3.0.7a.tar.gz
+BeautifulSoup-3.1.0.1.tar.gz


Index: python-BeautifulSoup.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-BeautifulSoup/devel/python-BeautifulSoup.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- python-BeautifulSoup.spec	4 Dec 2008 19:16:51 -0000	1.10
+++ python-BeautifulSoup.spec	12 Jan 2009 20:59:51 -0000	1.11
@@ -4,8 +4,8 @@
 %define oname   BeautifulSoup
 
 Name:           python-BeautifulSoup
-Version:        3.0.7a
-Release:        3%{?dist}
+Version:        3.1.0.1
+Release:        1%{?dist}
 Summary:        HTML/XML parser for quick-turnaround applications like screen-scraping
 
 Group:          Development/Languages
@@ -70,6 +70,9 @@
 %endif
 
 %changelog
+* Mon Jan 12 2009 kwizart < kwizart at gmail.com > - 3.1.0.1-1
+- Update to 3.1.0.1
+
 * Thu Dec  4 2008 kwizart < kwizart at gmail.com > - 3.0.7a-3
 - ReTag
 



From josef at fedoraproject.org  Mon Jan 12 21:02:51 2009
From: josef at fedoraproject.org (Josef Bacik)
Date: Mon, 12 Jan 2009 21:02:51 +0000 (UTC)
Subject: rpms/btrfs-progs/devel .cvsignore,1.5,1.6 sources,1.5,1.6
Message-ID: <20090112210251.F3DD270123@cvs1.fedora.phx.redhat.com>

Author: josef

Update of /cvs/pkgs/rpms/btrfs-progs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10142

Modified Files:
	.cvsignore sources 
Log Message:
hrm, helps if i upload the right source tarball.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/btrfs-progs/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	12 Jan 2009 20:53:28 -0000	1.5
+++ .cvsignore	12 Jan 2009 21:02:21 -0000	1.6
@@ -1 +1 @@
-btrfs-progs-0.17.tar.gz
+btrfs-progs-0.17.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/btrfs-progs/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	12 Jan 2009 20:53:28 -0000	1.5
+++ sources	12 Jan 2009 21:02:21 -0000	1.6
@@ -1 +1 @@
-ea28f7173e39c2110cff85932529b47d  btrfs-progs-0.17.tar.gz
+88d1fde8ecf237fc210510911ba06786  btrfs-progs-0.17.tar.bz2



From josef at fedoraproject.org  Mon Jan 12 21:05:52 2009
From: josef at fedoraproject.org (Josef Bacik)
Date: Mon, 12 Jan 2009 21:05:52 +0000 (UTC)
Subject: rpms/btrfs-progs/devel btrfs-progs.spec,1.5,1.6
Message-ID: <20090112210552.D870F70123@cvs1.fedora.phx.redhat.com>

Author: josef

Update of /cvs/pkgs/rpms/btrfs-progs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10593

Modified Files:
	btrfs-progs.spec 
Log Message:
upping the version rev for the sources mistake



Index: btrfs-progs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/btrfs-progs/devel/btrfs-progs.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- btrfs-progs.spec	12 Jan 2009 20:53:28 -0000	1.5
+++ btrfs-progs.spec	12 Jan 2009 21:05:22 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           btrfs-progs
 Version:        0.17
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Userspace programs for btrfs
 
 Group:          System Environment/Base
@@ -43,6 +43,9 @@
 %{_root_sbindir}/btrfstune
 
 %changelog
+* Mon Jan 12 2009 Josef Bacik <josef at toxicpanda.com> 0.17-2
+- fixed wrong sources upload
+
 * Mon Jan 12 2009 Josef Bacik <josef at toxicpanda.com> 0.17
 - Upstream release 0.17
 



From quantumburnz at fedoraproject.org  Mon Jan 12 21:12:50 2009
From: quantumburnz at fedoraproject.org (Christopher D. Stover)
Date: Mon, 12 Jan 2009 21:12:50 +0000 (UTC)
Subject: rpms/barry/devel barry.spec,1.7,1.8
Message-ID: <20090112211250.ECF2F70123@cvs1.fedora.phx.redhat.com>

Author: quantumburnz

Update of /cvs/pkgs/rpms/barry/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12117

Modified Files:
	barry.spec 
Log Message:
added fuse-devel BR


Index: barry.spec
===================================================================
RCS file: /cvs/pkgs/rpms/barry/devel/barry.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- barry.spec	12 Jan 2009 20:23:26 -0000	1.7
+++ barry.spec	12 Jan 2009 21:12:20 -0000	1.8
@@ -25,6 +25,7 @@
 
 BuildRequires:  libusb-devel boost-devel desktop-file-utils gtkmm24-devel
 BuildRequires:  libglademm24-devel libglade2-devel libtar-devel libtool
+BuildRequires:  fuse-devel
 Requires:       initscripts
 
 %description
@@ -98,30 +99,29 @@
 
 %build
 # main tree
-# %{configure} --with-boost
+%{configure} --with-boost
 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
-# Touch-magic to prevent auto* from running.  Thank you Andreas Metzler.
-#touch -r Makefile ./src/Makefile ./tools/Makefile ./examples/Makefile ./man/Makefile libbarry-0.pc config.h Makefile.am configure.ac aclocal.m4 configure
-#%{__make} %{?_smp_mflags}
+%{__make} %{?_smp_mflags}
 
 # gui tree
 cd gui/
-# %{configure} PKG_CONFIG_PATH="..:$PKG_CONFIG_PATH" CXXFLAGS="-I../.." LDFLAGS="-L../../src"
+%{configure} PKG_CONFIG_PATH="..:$PKG_CONFIG_PATH" CXXFLAGS="-I../.." LDFLAGS="-L../../src"
 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
-#touch -r Makefile ./src/Makefile.am ./man/Makefile.am config.h Makefile.am configure.ac aclocal.m4 configure
-#%{__make} %{?_smp_mflags}
+# Touch-magic to prevent auto* from running.  Thank you Andreas Metzler.
+touch -r Makefile ./src/Makefile ./src/Makefile.am ./src/Makefile.in \
+  ./man/Makefile.am ./man/Makefile.in config.h config.h.in Makefile.am \
+  Makefile.in configure.ac aclocal.m4 configure
+%{__make} %{?_smp_mflags}
 cd ../
 
 # opensync tree
 %if %{with_opensync}
 cd opensync-plugin/
-# %{configure} PKG_CONFIG_PATH="..:$PKG_CONFIG_PATH" CXXFLAGS="-I../.." LDFLAGS="-L../../src"
+%{configure} PKG_CONFIG_PATH="..:$PKG_CONFIG_PATH" CXXFLAGS="-I../.." LDFLAGS="-L../../src"
 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
-#touch -r Makefile.am configure.ac aclocal.m4 configure
-#%{__make} %{?_smp_mflags}
 cd ../
 %endif
 



From pkgdb at fedoraproject.org  Mon Jan 12 21:14:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 12 Jan 2009 21:14:52 +0000
Subject: [pkgdb] gpsbabel ownership updated
Message-ID: <20090112211452.4FDA2208456@bastion.fedora.phx.redhat.com>

Package gpsbabel in Fedora devel was orphaned by roozbeh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gpsbabel



From pkgdb at fedoraproject.org  Mon Jan 12 21:14:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 12 Jan 2009 21:14:57 +0000
Subject: [pkgdb] gpsbabel ownership updated
Message-ID: <20090112211457.5ABCB208467@bastion.fedora.phx.redhat.com>

Package gpsbabel in Fedora EPEL 5 was orphaned by roozbeh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gpsbabel



From pkgdb at fedoraproject.org  Mon Jan 12 21:15:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 12 Jan 2009 21:15:00 +0000
Subject: [pkgdb] gpsbabel ownership updated
Message-ID: <20090112211500.ACBB820846B@bastion.fedora.phx.redhat.com>

Package gpsbabel in Fedora 7 was orphaned by roozbeh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gpsbabel



From pkgdb at fedoraproject.org  Mon Jan 12 21:15:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 12 Jan 2009 21:15:03 +0000
Subject: [pkgdb] gpsbabel ownership updated
Message-ID: <20090112211504.36B2520846C@bastion.fedora.phx.redhat.com>

Package gpsbabel in Fedora 8 was orphaned by roozbeh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gpsbabel



From pkgdb at fedoraproject.org  Mon Jan 12 21:15:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 12 Jan 2009 21:15:07 +0000
Subject: [pkgdb] gpsbabel ownership updated
Message-ID: <20090112211508.027AA208471@bastion.fedora.phx.redhat.com>

Package gpsbabel in Fedora 9 was orphaned by roozbeh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gpsbabel



From kwizart at fedoraproject.org  Mon Jan 12 21:15:31 2009
From: kwizart at fedoraproject.org (Chauvet Nicolas)
Date: Mon, 12 Jan 2009 21:15:31 +0000 (UTC)
Subject: rpms/python-BeautifulSoup/devel python-BeautifulSoup.spec, 1.11,
	1.12
Message-ID: <20090112211531.1D8E170123@cvs1.fedora.phx.redhat.com>

Author: kwizart

Update of /cvs/pkgs/rpms/python-BeautifulSoup/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12469

Modified Files:
	python-BeautifulSoup.spec 
Log Message:
Fix



Index: python-BeautifulSoup.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-BeautifulSoup/devel/python-BeautifulSoup.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- python-BeautifulSoup.spec	12 Jan 2009 20:59:51 -0000	1.11
+++ python-BeautifulSoup.spec	12 Jan 2009 21:15:00 -0000	1.12
@@ -5,7 +5,7 @@
 
 Name:           python-BeautifulSoup
 Version:        3.1.0.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        HTML/XML parser for quick-turnaround applications like screen-scraping
 
 Group:          Development/Languages
@@ -51,6 +51,9 @@
 rm -rf $RPM_BUILD_ROOT
 %{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
 
+#Files installed by error
+rm -rf %exclude $RPM_BUILD_ROOT%{_bindir}
+
  
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -70,6 +73,9 @@
 %endif
 
 %changelog
+* Mon Jan 12 2009 kwizart < kwizart at gmail.com > - 3.1.0.1-2
+- Fix installed files.
+
 * Mon Jan 12 2009 kwizart < kwizart at gmail.com > - 3.1.0.1-1
 - Update to 3.1.0.1
 



From pkgdb at fedoraproject.org  Mon Jan 12 21:15:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 12 Jan 2009 21:15:10 +0000
Subject: [pkgdb] gpsbabel ownership updated
Message-ID: <20090112211510.D666B208474@bastion.fedora.phx.redhat.com>

Package gpsbabel in Fedora 10 was orphaned by roozbeh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gpsbabel



From kwizart at fedoraproject.org  Mon Jan 12 21:26:59 2009
From: kwizart at fedoraproject.org (Chauvet Nicolas)
Date: Mon, 12 Jan 2009 21:26:59 +0000 (UTC)
Subject: rpms/perl-AnyEvent/devel .cvsignore, 1.6, 1.7 sources, 1.6,
	1.7 perl-AnyEvent.spec, 1.7, 1.8
Message-ID: <20090112212659.706E070123@cvs1.fedora.phx.redhat.com>

Author: kwizart

Update of /cvs/pkgs/rpms/perl-AnyEvent/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13816

Modified Files:
	.cvsignore sources perl-AnyEvent.spec 
Log Message:
Update to 4.331



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-AnyEvent/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	14 Oct 2008 18:04:51 -0000	1.6
+++ .cvsignore	12 Jan 2009 21:26:28 -0000	1.7
@@ -1 +1 @@
-AnyEvent-4.3.tar.gz
+AnyEvent-4.331.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-AnyEvent/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	14 Oct 2008 18:04:51 -0000	1.6
+++ sources	12 Jan 2009 21:26:28 -0000	1.7
@@ -1 +1 @@
-6d41a947f3d2b82cc4a546df7feb4896  AnyEvent-4.3.tar.gz
+e4e560095dec173b89362232d03ab7fa  AnyEvent-4.331.tar.gz


Index: perl-AnyEvent.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-AnyEvent/devel/perl-AnyEvent.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- perl-AnyEvent.spec	17 Oct 2008 08:48:21 -0000	1.7
+++ perl-AnyEvent.spec	12 Jan 2009 21:26:28 -0000	1.8
@@ -1,7 +1,7 @@
-%define         version_anyevent 4.3
+%define         version_anyevent 4.331
 
 Name:           perl-AnyEvent
-Version:        4.300
+Version:        4.331
 Release:        1%{?dist}
 Summary:        Framework for multiple event loops
 
@@ -77,6 +77,9 @@
 
 
 %changelog
+* Mon Jan 12 2009 kwizart < kwizart at gmail.com > - 4.331-1
+- Update to 4.331   (rpm version : same )
+
 * Fri Oct 17 2008 kwizart < kwizart at gmail.com > - 4.300-1
 - Update to 4.3   (rpm version : 4.300 )
 



From kwizart at fedoraproject.org  Mon Jan 12 21:44:20 2009
From: kwizart at fedoraproject.org (Chauvet Nicolas)
Date: Mon, 12 Jan 2009 21:44:20 +0000 (UTC)
Subject: rpms/python-BeautifulSoup/devel python-BeautifulSoup.spec, 1.12,
	1.13
Message-ID: <20090112214420.AA91B70123@cvs1.fedora.phx.redhat.com>

Author: kwizart

Update of /cvs/pkgs/rpms/python-BeautifulSoup/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16848

Modified Files:
	python-BeautifulSoup.spec 
Log Message:
Fix typo



Index: python-BeautifulSoup.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-BeautifulSoup/devel/python-BeautifulSoup.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- python-BeautifulSoup.spec	12 Jan 2009 21:15:00 -0000	1.12
+++ python-BeautifulSoup.spec	12 Jan 2009 21:43:49 -0000	1.13
@@ -52,7 +52,7 @@
 %{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
 
 #Files installed by error
-rm -rf %exclude $RPM_BUILD_ROOT%{_bindir}
+rm -rf $RPM_BUILD_ROOT%{_bindir}
 
  
 %clean



From quantumburnz at fedoraproject.org  Mon Jan 12 21:51:53 2009
From: quantumburnz at fedoraproject.org (Christopher D. Stover)
Date: Mon, 12 Jan 2009 21:51:53 +0000 (UTC)
Subject: rpms/barry/devel barry.spec,1.8,1.9
Message-ID: <20090112215153.D404C70123@cvs1.fedora.phx.redhat.com>

Author: quantumburnz

Update of /cvs/pkgs/rpms/barry/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17860

Modified Files:
	barry.spec 
Log Message:
release tag bump


Index: barry.spec
===================================================================
RCS file: /cvs/pkgs/rpms/barry/devel/barry.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- barry.spec	12 Jan 2009 21:12:20 -0000	1.8
+++ barry.spec	12 Jan 2009 21:51:23 -0000	1.9
@@ -6,7 +6,7 @@
 
 Name:           barry
 Version:        0.15
-Release:        0.1.20090109git%{?dist}
+Release:        0.2.20090109git%{?dist}
 Summary:        BlackBerry Desktop for Linux
 
 Group:          Applications/Productivity
@@ -197,6 +197,9 @@
 %postun libs -p /sbin/ldconfig
 
 %changelog
+* Mon Jan 12 2009 Christopher D. Stover <quantumburnz at hotmail.com> 0.15-0.2.20090109git
+- enable fuse module during build
+
 * Mon Jan 12 2009 Christopher D. Stover <quantumburnz at hotmail.com> 0.15-0.1.20090109git
 - version/git bump
 



From dp67 at fedoraproject.org  Mon Jan 12 21:54:11 2009
From: dp67 at fedoraproject.org (Randy Berry)
Date: Mon, 12 Jan 2009 21:54:11 +0000 (UTC)
Subject: rpms/HamFax/F-10 HamFax-0.6.4-configure.patch, NONE,
	1.1 HamFax.desktop, NONE, 1.1 HamFax.png, NONE, 1.1 HamFax.spec,
	NONE, 1.1 import.log, NONE, 1.1
Message-ID: <20090112215412.126F070123@cvs1.fedora.phx.redhat.com>

Author: dp67

Update of /cvs/pkgs/rpms/HamFax/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18252

Added Files:
	HamFax-0.6.4-configure.patch HamFax.desktop HamFax.png 
	HamFax.spec import.log 
Log Message:

config file patch for x86_64i



HamFax-0.6.4-configure.patch:

--- NEW FILE HamFax-0.6.4-configure.patch ---
diff -up HamFax-0.6.4/configure.orig HamFax-0.6.4/configure
--- HamFax-0.6.4/configure.orig	2004-10-12 15:38:28.000000000 -0400
+++ HamFax-0.6.4/configure	2008-10-18 00:44:10.000000000 -0400
@@ -2860,7 +2860,7 @@ _ACEOF
 	*) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes=$ac_im_incroot;;
     esac
     case $ac_im_usrlibdir in
-	/usr/lib | /lib) ;;
+	/usr/lib | /lib | /usr/lib64 | /lib64) ;;
 	*) test -d "$ac_im_usrlibdir" && ac_x_libraries=$ac_im_usrlibdir ;;
     esac
   fi
@@ -3100,7 +3100,7 @@ _ACEOF
 	*) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes=$ac_im_incroot;;
     esac
     case $ac_im_usrlibdir in
-	/usr/lib | /lib) ;;
+	/usr/lib | /lib | /usr/lib64 | /lib64) ;;
 	*) test -d "$ac_im_usrlibdir" && ac_x_libraries=$ac_im_usrlibdir ;;
     esac
   fi
@@ -4539,6 +4539,7 @@ else
       /usr/include
       `ls -dr /usr/include/qt* 2>/dev/null`
       `ls -dr /usr/lib/qt*/include 2>/dev/null`
+      `ls -dr /usr/lib64/qt*/include 2>/dev/null`
       `ls -dr /usr/local/qt*/include 2>/dev/null`
       `ls -dr /opt/qt*/include 2>/dev/null`
     "
@@ -4754,10 +4755,13 @@ sed 's/^/| /' conftest.$ac_ext >&5
             bnv_dir_list="
               `echo $bnv_qt_includes | sed ss/includess`
               /lib
+              /lib64
               /usr/lib
+              /usr/lib64
               /usr/local/lib
               /opt/lib
               `ls -dr /usr/lib/qt* 2>/dev/null`
+              `ls -dr /usr/lib64/qt* 2>/dev/null`
               `ls -dr /usr/local/qt* 2>/dev/null`
               `ls -dr /opt/qt* 2>/dev/null`
             "


--- NEW FILE HamFax.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=HamFax
GenericName=HamFax
Comment=A ham radio Fax for linux
Exec=HamFax
Icon=HamFax.png
Terminal=false
Type=Application
Categories=HamRadio;
Version=1.0


--- NEW FILE HamFax.spec ---
Name:           HamFax
Version:        0.6.4
Release:        2%{?dist}
Summary:        HamFax is an application for sending and receiving facsimiles in amateur radio      

Group:          Applications/Communications  
License:        GPLv2+ 
URL:            http://hamfax.sourceforge.net/
Source0:        http://downloads.sourceforge.net/hamfax/%{name}-%{version}.tar.bz2
Source1:        %{name}.desktop
Source2:        %{name}.png
Patch0:         %{name}-%{version}-configure.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:   audiofile-devel qt-devel qt3-devel libXmu-devel libX11-devel desktop-file-utils
#Requires:       


%description
HamFax is an application for sending and receiving facsimiles in
amateur radio and for receiving public facsimile broadcasts like
weather maps. Supported interfaces are sound cards and the SCS-PTCII
from Special Communication Systems.


%prep
%setup -q
%patch0 -p1 -b %{name}-%{vesrion}-configure.patch

%build
%configure
make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS"


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
cp hamfax ${RPM_BUILD_ROOT}%{_bindir}/hamfax
 mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/pixmaps/
# No upstream icon so we'll use a temporary icon
 cp %{SOURCE2} ${RPM_BUILD_ROOT}%{_datadir}/pixmaps/%{name}.png
 desktop-file-install --vendor="fedora" \
       --dir=${RPM_BUILD_ROOT}%{_datadir}/applications %{SOURCE1}


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING NEWS README TODO 
%{_datadir}/pixmaps/%{name}.png
%{_datadir}/applications/*%{name}.desktop
%{_datadir}/HamFax/HamFax.html
%{_datadir}/HamFax/hamfax_de.qm
%{_bindir}/*


%changelog
* Tue Oct 14 2008 Randall J. Berry 'Dp67' <randyn3lrx at gmail.com> 0.6.4-2
- Add patch to allow build on x86_64
- Edit spec per review
- rpmlint    = pass
- rpmbuild   = pass
- mock build = 9, rawhide (i386)

* Sun Sep 28 2008 Randall J. Berry 'Dp67' <randyn3lrx at gmail.com> 0.6.4-1
- Initial Spec
- rpmlint    = pass
- rpmbuild   = pass
- mock build = pass


--- NEW FILE import.log ---
HamFax-0_6_4-2_fc9:HEAD:HamFax-0.6.4-2.fc9.src.rpm:1224111818
HamFax-0_6_4-3_fc9:HEAD:HamFax-0.6.4-3.fc9.src.rpm:1224306331
HamFax-0_6_4-3_fc9:HEAD:HamFax-0.6.4-3.fc9.src.rpm:1224306917
HamFax-0_6_4-2_fc9:HEAD:HamFax-0.6.4-2.fc9.src.rpm:1224310260
HamFax-0_6_4-2_fc9:HEAD:HamFax-0.6.4-2.fc9.src.rpm:1224363819



From kwizart at fedoraproject.org  Mon Jan 12 21:56:15 2009
From: kwizart at fedoraproject.org (Chauvet Nicolas)
Date: Mon, 12 Jan 2009 21:56:15 +0000 (UTC)
Subject: rpms/python-BeautifulSoup/EL-5 python-BeautifulSoup.spec,1.1,1.2
Message-ID: <20090112215615.BA6F570123@cvs1.fedora.phx.redhat.com>

Author: kwizart

Update of /cvs/pkgs/rpms/python-BeautifulSoup/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18682

Modified Files:
	python-BeautifulSoup.spec 
Log Message:
Backport 3.0.7a for EL-5



Index: python-BeautifulSoup.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-BeautifulSoup/EL-5/python-BeautifulSoup.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- python-BeautifulSoup.spec	4 May 2007 07:54:58 -0000	1.1
+++ python-BeautifulSoup.spec	12 Jan 2009 21:55:45 -0000	1.2
@@ -1,49 +1,98 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+%{!?pyver: %define pyver %(%{__python} -c "import sys ; print sys.version[:3]")}
+
+%define oname   BeautifulSoup
 
 Name:           python-BeautifulSoup
-Version:        3.0.4
-Release:        1%{?dist}
+Version:        3.0.7a
+Release:        2%{?dist}
 Summary:        HTML/XML parser for quick-turnaround applications like screen-scraping
 
 Group:          Development/Languages
-License:        Python Software Foundation License
+License:        BSD
 URL:            http://www.crummy.com/software/BeautifulSoup/
-Source0:        http://www.crummy.com/software/BeautifulSoup/download/BeautifulSoup-%{version}.tar.gz
+Source0:        http://www.crummy.com/software/BeautifulSoup/download/3.x/%{oname}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
 BuildRequires:  python-devel
 
 %description
-Beautiful Soup parses arbitrarily invalid SGML and provides a variety
-of methods and Pythonic idioms for iterating and searching the parse tree.
+Beautiful Soup is a Python HTML/XML parser designed for quick
+turnaround projects like screen-scraping. Three features make it
+powerful:
+
+Beautiful Soup won't choke if you give it bad markup.
+
+Beautiful Soup provides a few simple methods and Pythonic idioms for
+navigating, searching, and modifying a parse tree.
+
+Beautiful Soup automatically converts incoming documents to Unicode
+and outgoing documents to UTF-8.
+
+Beautiful Soup parses anything you give it.
+
+Valuable data that was once locked up in poorly-designed websites is
+now within your reach. Projects that would have taken hours take only
+minutes with Beautiful Soup.
 
 
 %prep
-%setup -q -n BeautifulSoup-%{version}
+%setup -q -n %{oname}-%{version}
 
 
 %build
 %{__python} setup.py build
+%{__python} -c 'import %{oname} as bs; print bs.__doc__' > COPYING
+touch -r %{oname}.py COPYING
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
 %{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
 
+#Files installed by error
+rm -rf $RPM_BUILD_ROOT%{_bindir}
+
  
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 
+%check
+%{__python} BeautifulSoupTests.py
+
+
 %files
 %defattr(-,root,root,-)
-%doc PKG-INFO
-# For noarch packages: sitelib
-%{python_sitelib}/*
-
+%doc COPYING
+%{python_sitelib}/%{oname}.py*
+%exclude %{python_sitelib}/%{oname}Tests.py*
 
 %changelog
+* Mon Jan 12 2009 kwizart < kwizart at gmail.com > - 3.0.7a-2
+- Backport for EL-5
+
+* Wed Oct 15 2008 kwizart < kwizart at gmail.com > - 3.0.7a-1
+- Update to 3.0.7a
+
+* Mon Jun 30 2008 Terje Rosten <terje.rosten at ntnu.no> - 3.0.7-2
+- Rebuild
+
+* Mon Jun 23 2008 Michel Alexandre Salim <salimma at fedoraproject.org> - 3.0.7-1
+- Update to 3.0.7
+
+* Tue Feb  5 2008 Terje Rosten <terje.rosten at ntnu.no> - 3.0.5-3
+- Fix typo
+
+* Tue Feb  5 2008 Terje Rosten <terje.rosten at ntnu.no> - 3.0.5-2
+- Handle egg info
+- Bump release
+
+* Tue Feb  5 2008 Terje Rosten <terje.rosten at ntnu.no> - 3.0.5-1
+- Update to 3.0.5
+- Minor tweaks to spec file
+
 * Wed Apr 18 2007 kwizart < kwizart at gmail.com > - 3.0.4-1
 - Update to 3.0.4
 



From kwizart at fedoraproject.org  Mon Jan 12 21:59:17 2009
From: kwizart at fedoraproject.org (Chauvet Nicolas)
Date: Mon, 12 Jan 2009 21:59:17 +0000 (UTC)
Subject: rpms/python-BeautifulSoup/EL-5 sources,1.2,1.3 .cvsignore,1.1,1.2
Message-ID: <20090112215917.68B5F70123@cvs1.fedora.phx.redhat.com>

Author: kwizart

Update of /cvs/pkgs/rpms/python-BeautifulSoup/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19185

Modified Files:
	sources .cvsignore 
Log Message:
Update source



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-BeautifulSoup/EL-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	4 May 2007 07:54:58 -0000	1.2
+++ sources	12 Jan 2009 21:58:46 -0000	1.3
@@ -1 +1 @@
-13a7a16e7f3b8febaace13b1b2790550  BeautifulSoup-3.0.4.tar.gz
+d28c8148bb770e72762eb202fa797b56  BeautifulSoup-3.0.7a.tar.gz


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-BeautifulSoup/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	4 May 2007 00:57:20 -0000	1.1
+++ .cvsignore	12 Jan 2009 21:58:46 -0000	1.2
@@ -0,0 +1 @@
+BeautifulSoup-3.0.7a.tar.gz



From dp67 at fedoraproject.org  Mon Jan 12 22:01:36 2009
From: dp67 at fedoraproject.org (Randy Berry)
Date: Mon, 12 Jan 2009 22:01:36 +0000 (UTC)
Subject: rpms/HamFax/F-9 HamFax-0.6.4-configure.patch, NONE,
	1.1 HamFax.desktop, 
	NONE, 1.1 HamFax.png, NONE, 1.1 HamFax.spec, NONE, 1.1
Message-ID: <20090112220136.EAF1B70123@cvs1.fedora.phx.redhat.com>

Author: dp67

Update of /cvs/pkgs/rpms/HamFax/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19517

Added Files:
	HamFax-0.6.4-configure.patch HamFax.desktop HamFax.png 
	HamFax.spec 
Log Message:

Update config file for x86_64


HamFax-0.6.4-configure.patch:

--- NEW FILE HamFax-0.6.4-configure.patch ---
diff -up HamFax-0.6.4/configure.orig HamFax-0.6.4/configure
--- HamFax-0.6.4/configure.orig	2004-10-12 15:38:28.000000000 -0400
+++ HamFax-0.6.4/configure	2008-10-18 00:44:10.000000000 -0400
@@ -2860,7 +2860,7 @@ _ACEOF
 	*) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes=$ac_im_incroot;;
     esac
     case $ac_im_usrlibdir in
-	/usr/lib | /lib) ;;
+	/usr/lib | /lib | /usr/lib64 | /lib64) ;;
 	*) test -d "$ac_im_usrlibdir" && ac_x_libraries=$ac_im_usrlibdir ;;
     esac
   fi
@@ -3100,7 +3100,7 @@ _ACEOF
 	*) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes=$ac_im_incroot;;
     esac
     case $ac_im_usrlibdir in
-	/usr/lib | /lib) ;;
+	/usr/lib | /lib | /usr/lib64 | /lib64) ;;
 	*) test -d "$ac_im_usrlibdir" && ac_x_libraries=$ac_im_usrlibdir ;;
     esac
   fi
@@ -4539,6 +4539,7 @@ else
       /usr/include
       `ls -dr /usr/include/qt* 2>/dev/null`
       `ls -dr /usr/lib/qt*/include 2>/dev/null`
+      `ls -dr /usr/lib64/qt*/include 2>/dev/null`
       `ls -dr /usr/local/qt*/include 2>/dev/null`
       `ls -dr /opt/qt*/include 2>/dev/null`
     "
@@ -4754,10 +4755,13 @@ sed 's/^/| /' conftest.$ac_ext >&5
             bnv_dir_list="
               `echo $bnv_qt_includes | sed ss/includess`
               /lib
+              /lib64
               /usr/lib
+              /usr/lib64
               /usr/local/lib
               /opt/lib
               `ls -dr /usr/lib/qt* 2>/dev/null`
+              `ls -dr /usr/lib64/qt* 2>/dev/null`
               `ls -dr /usr/local/qt* 2>/dev/null`
               `ls -dr /opt/qt* 2>/dev/null`
             "


--- NEW FILE HamFax.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=HamFax
GenericName=HamFax
Comment=A ham radio Fax for linux
Exec=HamFax
Icon=HamFax.png
Terminal=false
Type=Application
Categories=HamRadio;
Version=1.0


--- NEW FILE HamFax.spec ---
Name:           HamFax
Version:        0.6.4
Release:        2%{?dist}
Summary:        HamFax is an application for sending and receiving facsimiles in amateur radio      

Group:          Applications/Communications  
License:        GPLv2+ 
URL:            http://hamfax.sourceforge.net/
Source0:        http://downloads.sourceforge.net/hamfax/%{name}-%{version}.tar.bz2
Source1:        %{name}.desktop
Source2:        %{name}.png
Patch0:         %{name}-%{version}-configure.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:   audiofile-devel qt-devel qt3-devel libXmu-devel libX11-devel desktop-file-utils
#Requires:       


%description
HamFax is an application for sending and receiving facsimiles in
amateur radio and for receiving public facsimile broadcasts like
weather maps. Supported interfaces are sound cards and the SCS-PTCII
from Special Communication Systems.


%prep
%setup -q
%patch0 -p1 -b %{name}-%{vesrion}-configure.patch

%build
%configure
make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS"


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
cp hamfax ${RPM_BUILD_ROOT}%{_bindir}/hamfax
 mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/pixmaps/
# No upstream icon so we'll use a temporary icon
 cp %{SOURCE2} ${RPM_BUILD_ROOT}%{_datadir}/pixmaps/%{name}.png
 desktop-file-install --vendor="fedora" \
       --dir=${RPM_BUILD_ROOT}%{_datadir}/applications %{SOURCE1}


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING NEWS README TODO 
%{_datadir}/pixmaps/%{name}.png
%{_datadir}/applications/*%{name}.desktop
%{_datadir}/HamFax/HamFax.html
%{_datadir}/HamFax/hamfax_de.qm
%{_bindir}/*


%changelog
* Tue Oct 14 2008 Randall J. Berry 'Dp67' <randyn3lrx at gmail.com> 0.6.4-2
- Add patch to allow build on x86_64
- Edit spec per review
- rpmlint    = pass
- rpmbuild   = pass
- mock build = 9, rawhide (i386)

* Sun Sep 28 2008 Randall J. Berry 'Dp67' <randyn3lrx at gmail.com> 0.6.4-1
- Initial Spec
- rpmlint    = pass
- rpmbuild   = pass
- mock build = pass



From walters at fedoraproject.org  Mon Jan 12 22:01:54 2009
From: walters at fedoraproject.org (Colin Walters)
Date: Mon, 12 Jan 2009 22:01:54 +0000 (UTC)
Subject: rpms/antlr3/devel antlr3.spec,1.4,1.5
Message-ID: <20090112220154.D5C1070123@cvs1.fedora.phx.redhat.com>

Author: walters

Update of /cvs/pkgs/rpms/antlr3/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19640

Modified Files:
	antlr3.spec 
Log Message:
* Mon Jan 12 2009 Colin Walters <walters at redhat.com> - 3.1.1-4
- Add bcel build dep to version jar name



Index: antlr3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/antlr3/devel/antlr3.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- antlr3.spec	10 Nov 2008 13:52:51 -0000	1.4
+++ antlr3.spec	12 Jan 2009 22:01:24 -0000	1.5
@@ -3,7 +3,7 @@
 Summary: ANother Tool for Language Recognition
 Name: antlr3
 Version: 3.1.1
-Release: 3%{?dist}
+Release: 4%{?dist}
 URL: http://www.antlr.org/
 Source0: http://www.antlr.org/download/antlr-3.1.1.tar.gz
 # Utility file, in conversation with upstream about this
@@ -17,6 +17,8 @@
 # For cleaner script
 BuildRequires: python
 BuildRequires: ant, stringtemplate, ant-antlr, ant-junit
+# The build.xml uses this to version the jar
+BuildRequires: bcel
 BuildRequires: jpackage-utils
 Requires: jpackage-utils
 Requires: antlr
@@ -78,6 +80,9 @@
 %{python_sitelib}/antlr_python_runtime-*
 
 %changelog
+* Mon Jan 12 2009 Colin Walters <walters at redhat.com> - 3.1.1-4
+- Add bcel build dep to version jar name
+
 * Mon Nov 10 2008 Colin Walters <walters at redhat.com> - 3.1.1-3
 - Add antlr3 script
 



From kwizart at fedoraproject.org  Mon Jan 12 22:08:01 2009
From: kwizart at fedoraproject.org (Chauvet Nicolas)
Date: Mon, 12 Jan 2009 22:08:01 +0000 (UTC)
Subject: rpms/python-BeautifulSoup/EL-5 python-BeautifulSoup.spec,1.2,1.3
Message-ID: <20090112220801.2033F70123@cvs1.fedora.phx.redhat.com>

Author: kwizart

Update of /cvs/pkgs/rpms/python-BeautifulSoup/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20722

Modified Files:
	python-BeautifulSoup.spec 
Log Message:
Update tag



Index: python-BeautifulSoup.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-BeautifulSoup/EL-5/python-BeautifulSoup.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- python-BeautifulSoup.spec	12 Jan 2009 21:55:45 -0000	1.2
+++ python-BeautifulSoup.spec	12 Jan 2009 22:07:30 -0000	1.3
@@ -5,7 +5,7 @@
 
 Name:           python-BeautifulSoup
 Version:        3.0.7a
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        HTML/XML parser for quick-turnaround applications like screen-scraping
 
 Group:          Development/Languages
@@ -70,6 +70,9 @@
 %exclude %{python_sitelib}/%{oname}Tests.py*
 
 %changelog
+* Mon Jan 12 2009 kwizart < kwizart at gmail.com > - 3.0.7a-3
+- ReTag
+
 * Mon Jan 12 2009 kwizart < kwizart at gmail.com > - 3.0.7a-2
 - Backport for EL-5
 



From nsantos at fedoraproject.org  Mon Jan 12 22:15:40 2009
From: nsantos at fedoraproject.org (Nuno Santos)
Date: Mon, 12 Jan 2009 22:15:40 +0000 (UTC)
Subject: rpms/qpidc/devel qpidc.spec,1.59,1.60
Message-ID: <20090112221540.A5CF270123@cvs1.fedora.phx.redhat.com>

Author: nsantos

Update of /cvs/extras/rpms/qpidc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22460

Modified Files:
	qpidc.spec 
Log Message:
set ECHO in env for make, to deal with libtool 2.2.6


Index: qpidc.spec
===================================================================
RCS file: /cvs/extras/rpms/qpidc/devel/qpidc.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- qpidc.spec	12 Jan 2009 15:08:15 -0000	1.59
+++ qpidc.spec	12 Jan 2009 22:15:10 -0000	1.60
@@ -188,15 +188,15 @@
 %build
 CXXFLAGS="%{optflags} -DNDEBUG -O3" \
 %configure --disable-static --with-cpg --without-graphviz --without-help2man
-LANG=C make #%{?_smp_mflags}
+ECHO=echo make #%{?_smp_mflags}
 # Remove this generated perl file, we don't need it and it upsets rpmlint.
-# This is generating an error as of 21 Nov 08 becausethe file doesn't exist .
+# This is generating an error as of 21 Nov 08 because the file doesn't exist.
 # rm docs/api/html/installdox
 
 # Make perftest utilities
 pushd src/tests
 for ptest in %{perftests}; do
-  LANG=C make $ptest
+  ECHO=echo make $ptest
 done
 popd
 
@@ -229,7 +229,7 @@
 
 %check
 # LANG=C needs to be in the environment to deal with a libtool issue
-LANG=C make check
+LANG=C ECHO=echo make check
 
 %files
 %defattr(-,root,root,-)



From katzj at fedoraproject.org  Mon Jan 12 22:57:50 2009
From: katzj at fedoraproject.org (Jeremy Katz)
Date: Mon, 12 Jan 2009 22:57:50 +0000 (UTC)
Subject: rpms/squashfs-tools/devel .cvsignore, 1.6, 1.7 sources, 1.6,
	1.7 squashfs-cflags.patch, 1.4, 1.5 squashfs-tools.spec, 1.18, 1.19
Message-ID: <20090112225750.0F74270123@cvs1.fedora.phx.redhat.com>

Author: katzj

Update of /cvs/pkgs/rpms/squashfs-tools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27982

Modified Files:
	.cvsignore sources squashfs-cflags.patch squashfs-tools.spec 
Log Message:
* Mon Jan 12 2009  <katzj at redhat.com> - 4.0-0.20090112
- update to cvs snap that generates v4.0 images



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/squashfs-tools/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	30 Sep 2008 19:20:42 -0000	1.6
+++ .cvsignore	12 Jan 2009 22:57:19 -0000	1.7
@@ -1 +1 @@
-squashfs3.4.tar.gz
+squashfs-20090112.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/squashfs-tools/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	30 Sep 2008 19:20:42 -0000	1.6
+++ sources	12 Jan 2009 22:57:19 -0000	1.7
@@ -1 +1 @@
-2a4d2995ad5aa6840c95a95ffa6b1da6  squashfs3.4.tar.gz
+73e3445f064d29a5f244afc1a9c8172a  squashfs-20090112.tar.bz2

squashfs-cflags.patch:

Index: squashfs-cflags.patch
===================================================================
RCS file: /cvs/pkgs/rpms/squashfs-tools/devel/squashfs-cflags.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- squashfs-cflags.patch	30 Sep 2008 19:20:42 -0000	1.4
+++ squashfs-cflags.patch	12 Jan 2009 22:57:19 -0000	1.5
@@ -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
+diff -up squashfs/squashfs-tools/Makefile.cflags squashfs/squashfs-tools/Makefile
+--- squashfs/squashfs-tools/Makefile.cflags	2008-08-26 03:15:16.000000000 -0400
++++ squashfs/squashfs-tools/Makefile	2008-12-18 06:59:01.000000000 -0500
 @@ -2,7 +2,7 @@ INSTALL_DIR = /usr/local/bin
  
  INCLUDEDIR = .
@@ -8,5 +8,5 @@
 -CFLAGS := -I$(INCLUDEDIR) -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE -O2
 +CFLAGS := $(RPM_OPT_FLAGS) -I$(INCLUDEDIR) -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE -O2
  
- all: mksquashfs unsquashfs
+ all: mksquashfs
  


Index: squashfs-tools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/squashfs-tools/devel/squashfs-tools.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- squashfs-tools.spec	30 Sep 2008 19:20:42 -0000	1.18
+++ squashfs-tools.spec	12 Jan 2009 22:57:19 -0000	1.19
@@ -1,11 +1,12 @@
 Summary: Utility for the creation of squashfs filesystems
 Name: squashfs-tools
-Version: 3.4
-Release: 1
+Version: 4.0
+# cvs snapshot from cvs -d:pserver:anonymous at squashfs.cvs.sourceforge.net:/cvsroot/squashfs co squashfs on 2009-01-12
+Release: 0.20090112
 License: GPLv2+
 Group: System Environment/Base
 URL: http://squashfs.sf.net
-Source0: squashfs3.4.tar.gz
+Source0: squashfs-20090112.tar.bz2
 Patch0: squashfs-cflags.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: zlib-devel
@@ -15,7 +16,7 @@
 contains the utilities for manipulating squashfs filesystems.
 
 %prep
-%setup -q -n squashfs3.4
+%setup -q -n squashfs
 %patch0 -p1 -b .cflags
 
 %build
@@ -26,9 +27,9 @@
 rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT/sbin $RPM_BUILD_ROOT/usr/sbin
 install -m 755 squashfs-tools/mksquashfs $RPM_BUILD_ROOT/sbin/mksquashfs
-install -m 755 squashfs-tools/unsquashfs $RPM_BUILD_ROOT%{_sbindir}/unsquashfs
+#install -m 755 squashfs-tools/unsquashfs $RPM_BUILD_ROOT%{_sbindir}/unsquashfs
 
-chmod -x README PERFORMANCE.README COPYING ACKNOWLEDGEMENTS CHANGES
+chmod -x README
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -36,11 +37,14 @@
 
 %files
 %defattr(-,root,root,-)
-%doc README PERFORMANCE.README COPYING ACKNOWLEDGEMENTS CHANGES
+%doc README
 /sbin/mksquashfs
-%{_sbindir}/unsquashfs
+#%{_sbindir}/unsquashfs
 
 %changelog
+* Mon Jan 12 2009  <katzj at redhat.com> - 4.0-0.20090112
+- update to cvs snap that generates v4.0 images
+
 * Tue Sep 30 2008 Jeremy Katz <katzj at redhat.com> - 3.4-1
 - update to 3.4
 



From whot at fedoraproject.org  Mon Jan 12 23:21:54 2009
From: whot at fedoraproject.org (Peter Hutterer)
Date: Mon, 12 Jan 2009 23:21:54 +0000 (UTC)
Subject: rpms/xorg-x11-server/devel .cvsignore, 1.53,
	1.54 make-git-snapshot.sh, 
	1.5, 1.6 sources, 1.48, 1.49 xorg-x11-server.spec, 1.389, 1.390
Message-ID: <20090112232154.CBFAD70123@cvs1.fedora.phx.redhat.com>

Author: whot

Update of /cvs/pkgs/rpms/xorg-x11-server/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31341

Modified Files:
	.cvsignore make-git-snapshot.sh sources xorg-x11-server.spec 
Log Message:
* Tue Jan 13 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.5.99.901-1
- xserver 1.6 RC 1
- fix "git-xyz" to "git xyz"
- revert yesterdays changes to make-git-snapshot.sh, that was a bad idea.




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/.cvsignore,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- .cvsignore	12 Jan 2009 01:26:08 -0000	1.53
+++ .cvsignore	12 Jan 2009 23:21:24 -0000	1.54
@@ -1 +1 @@
-xorg-server-20090112.tar.bz2
+xorg-server-1.5.99.901.tar.bz2


Index: make-git-snapshot.sh
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/make-git-snapshot.sh,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- make-git-snapshot.sh	12 Jan 2009 01:26:08 -0000	1.5
+++ make-git-snapshot.sh	12 Jan 2009 23:21:24 -0000	1.6
@@ -8,7 +8,7 @@
 if [ -z "$1" ]; then
     git log | head -1
 else
-    git checkout -b $1 origin/$1
+    git checkout $1
 fi
 git log | head -1 | awk '{ print $2 }' > ../commitid
 git repack -a -d


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/sources,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- sources	12 Jan 2009 01:26:08 -0000	1.48
+++ sources	12 Jan 2009 23:21:24 -0000	1.49
@@ -1 +1 @@
-c3b4a1c33dae3aba6fd544c73bd4f6dc  xorg-server-20090112.tar.bz2
+905970280ee831ddbde1aa7bef352ada  xorg-server-1.5.99.901.tar.bz2


Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.389
retrieving revision 1.390
diff -u -r1.389 -r1.390
--- xorg-x11-server.spec	12 Jan 2009 01:26:08 -0000	1.389
+++ xorg-x11-server.spec	12 Jan 2009 23:21:24 -0000	1.390
@@ -14,12 +14,12 @@
 # Fix rhpxl to no longer need vesamodes/extramodes
 
 %define pkgname xorg-server
-%define gitdate 20090112
+#define gitdate 20090112
 
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
-Version:   1.5.99.3
-Release:   9%{?dist}
+Version:   1.5.99.901
+Release:   1%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -73,8 +73,6 @@
 Patch6002: xserver-1.5.1-mode-debug.patch
 
 Patch6004: xserver-1.5.99.3-dmx-xcalloc.patch
-# 6005 should be in 1.5.99.4
-Patch6005: xserver-1.5.99.3-ddx-rules.patch
 # hack around broken mtrr.h.  drop me as soon as possible.
 Patch6007: xserver-1.5.99.3-broken-mtrr-header.patch
 
@@ -274,18 +272,18 @@
 git checkout -b fedora
 sed -i 's/git/&+ssh/' .git/config
 %else
-git-init-db
+git init-db
 if [ -z "$GIT_COMMITTER_NAME" ]; then
-    git-config user.email "x at fedoraproject.org"
-    git-config user.name "Fedora X Ninjas"
+    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."
+git add .
+git commit -a -q -m "%{version} baseline."
 %endif
 
 # Apply all the patches.
-#git-am -p1 %{patches}
+#git am -p1 %{patches}
 git am -p1 $(awk '/^Patch.*:/ { print "%{_sourcedir}/"$2 }' %{_specdir}/%{name}.spec)
 
 %build
@@ -494,6 +492,11 @@
 
 
 %changelog
+* Tue Jan 13 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.5.99.901-1
+- xserver 1.6 RC 1
+- fix "git-xyz" to "git xyz"
+- revert yesterdays changes to make-git-snapshot.sh, that was a bad idea.
+
 * Mon Jan 12 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.5.99.3-5
 - rebase to today's server-1.6-enterleave branch, current 1.6 plus enterleave
   patches.



From kevin at fedoraproject.org  Mon Jan 12 23:22:10 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 12 Jan 2009 23:22:10 +0000 (UTC)
Subject: rpms/libxfce4util/devel libxfce4util.spec, 1.21, 1.22 sources, 1.11,
	1.12 .cvsignore, 1.11, 1.12
Message-ID: <20090112232210.6342B70123@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/libxfce4util/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31447

Modified Files:
	libxfce4util.spec sources .cvsignore 
Log Message:
Update to 4.5.92



Index: libxfce4util.spec
===================================================================
RCS file: /cvs/extras/rpms/libxfce4util/devel/libxfce4util.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- libxfce4util.spec	27 Oct 2008 08:57:07 -0000	1.21
+++ libxfce4util.spec	12 Jan 2009 23:21:40 -0000	1.22
@@ -1,6 +1,6 @@
 Summary: Utility library for the Xfce4 desktop environment
 Name: libxfce4util
-Version: 4.4.3
+Version: 4.5.92
 Release: 1%{?dist}
 License: LGPLv2+
 URL: http://www.xfce.org/
@@ -30,6 +30,9 @@
 
 %build
 %configure --disable-static
+sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
+sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
+
 make %{?_smp_mflags}
 
 %install
@@ -61,6 +64,9 @@
 %{_datadir}/gtk-doc/html/libxfce4util/
 
 %changelog
+* Sun Dec 21 2008 Kevin Fenzi <kevin at tummy.com> - 4.5.92-1
+- Update to 4.5.92
+
 * Mon Oct 27 2008 Christoph Wickert <cwickert at fedoraproject.org> - 4.4.3-1
 - Update to 4.4.3
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libxfce4util/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	27 Oct 2008 08:36:01 -0000	1.11
+++ sources	12 Jan 2009 23:21:40 -0000	1.12
@@ -1 +1 @@
-0a4d887b84c8b79ae09a1c6b20626c95  libxfce4util-4.4.3.tar.bz2
+a38edd1bfaa016ab7abd3f4693eaecbd  libxfce4util-4.5.92.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libxfce4util/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	27 Oct 2008 08:36:01 -0000	1.11
+++ .cvsignore	12 Jan 2009 23:21:40 -0000	1.12
@@ -1 +1 @@
-libxfce4util-4.4.3.tar.bz2
+libxfce4util-4.5.92.tar.bz2



From lmacken at fedoraproject.org  Mon Jan 12 23:28:53 2009
From: lmacken at fedoraproject.org (Luke Macken)
Date: Mon, 12 Jan 2009 23:28:53 +0000 (UTC)
Subject: rpms/bodhi/F-9 .cvsignore, 1.16, 1.17 bodhi.spec, 1.24, 1.25 sources,
	1.20, 1.21
Message-ID: <20090112232853.8443A70123@cvs1.fedora.phx.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/bodhi/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32411

Modified Files:
	.cvsignore bodhi.spec sources 
Log Message:
0.5.16


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bodhi/F-9/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore	10 Dec 2008 22:04:00 -0000	1.16
+++ .cvsignore	12 Jan 2009 23:28:23 -0000	1.17
@@ -1 +1 @@
-bodhi-0.5.13.tar.bz2
+bodhi-0.5.16.tar.bz2


Index: bodhi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bodhi/F-9/bodhi.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- bodhi.spec	20 Dec 2008 02:28:54 -0000	1.24
+++ bodhi.spec	12 Jan 2009 23:28:23 -0000	1.25
@@ -2,7 +2,7 @@
 %{!?pyver: %define pyver %(%{__python} -c "import sys ; print sys.version[:3]")}
 
 Name:           bodhi
-Version:        0.5.14
+Version:        0.5.16
 Release:        1%{?dist}
 Summary:        A modular framework that facilitates publishing software updates
 Group:          Applications/Internet
@@ -113,6 +113,12 @@
 
 
 %changelog
+* Mon Jan 05 2009 Luke Macken <lmacken at redhat.com> - 0.5.16-1
+- Latest upstream bugfix release.
+
+* Mon Dec 22 2008 Luke Macken <lmacken at redhat.com> - 0.5.15-1
+- Latest release, with more masher improvements.
+
 * Fri Dec 19 2008 Luke Macken <lmacken at redhat.com> - 0.5.14-1
 - Latest upstream release, containing some masher improvements.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bodhi/F-9/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources	10 Dec 2008 22:04:00 -0000	1.20
+++ sources	12 Jan 2009 23:28:23 -0000	1.21
@@ -1 +1 @@
-2a42dedefcdc1c900878cce64ce59824  bodhi-0.5.13.tar.bz2
+a76e28c05ab3349f538087046b3aac28  bodhi-0.5.16.tar.bz2



From lmacken at fedoraproject.org  Mon Jan 12 23:32:55 2009
From: lmacken at fedoraproject.org (Luke Macken)
Date: Mon, 12 Jan 2009 23:32:55 +0000 (UTC)
Subject: rpms/bodhi/F-10 .cvsignore, 1.19, 1.20 bodhi.spec, 1.25,
	1.26 sources, 1.21, 1.22
Message-ID: <20090112233255.48D8370123@cvs1.fedora.phx.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/bodhi/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv499

Modified Files:
	.cvsignore bodhi.spec sources 
Log Message:
0.5.16


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bodhi/F-10/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- .cvsignore	10 Dec 2008 21:50:20 -0000	1.19
+++ .cvsignore	12 Jan 2009 23:32:24 -0000	1.20
@@ -1 +1 @@
-bodhi-0.5.13.tar.bz2
+bodhi-0.5.16.tar.bz2


Index: bodhi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bodhi/F-10/bodhi.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- bodhi.spec	20 Dec 2008 02:27:23 -0000	1.25
+++ bodhi.spec	12 Jan 2009 23:32:24 -0000	1.26
@@ -2,7 +2,7 @@
 %{!?pyver: %define pyver %(%{__python} -c "import sys ; print sys.version[:3]")}
 
 Name:           bodhi
-Version:        0.5.14
+Version:        0.5.16
 Release:        1%{?dist}
 Summary:        A modular framework that facilitates publishing software updates
 Group:          Applications/Internet
@@ -113,6 +113,12 @@
 
 
 %changelog
+* Mon Jan 05 2009 Luke Macken <lmacken at redhat.com> - 0.5.16-1
+- Latest upstream bugfix release.
+
+* Mon Dec 22 2008 Luke Macken <lmacken at redhat.com> - 0.5.15-1
+- Latest release, with more masher improvements.
+
 * Fri Dec 19 2008 Luke Macken <lmacken at redhat.com> - 0.5.14-1
 - Latest upstream release, containing some masher improvements.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bodhi/F-10/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sources	10 Dec 2008 21:50:20 -0000	1.21
+++ sources	12 Jan 2009 23:32:24 -0000	1.22
@@ -1 +1 @@
-2a42dedefcdc1c900878cce64ce59824  bodhi-0.5.13.tar.bz2
+a76e28c05ab3349f538087046b3aac28  bodhi-0.5.16.tar.bz2



From lmacken at fedoraproject.org  Mon Jan 12 23:34:06 2009
From: lmacken at fedoraproject.org (Luke Macken)
Date: Mon, 12 Jan 2009 23:34:06 +0000 (UTC)
Subject: rpms/bodhi/EL-5 .cvsignore, 1.10, 1.11 bodhi.spec, 1.11,
	1.12 sources, 1.11, 1.12
Message-ID: <20090112233406.CDDF870123@cvs1.fedora.phx.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/bodhi/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv714

Modified Files:
	.cvsignore bodhi.spec sources 
Log Message:
0.5.16


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bodhi/EL-5/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	28 Jan 2008 22:34:32 -0000	1.10
+++ .cvsignore	12 Jan 2009 23:33:36 -0000	1.11
@@ -1 +1 @@
-bodhi-0.4.10.tar.bz2
+bodhi-0.5.16.tar.bz2


Index: bodhi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bodhi/EL-5/bodhi.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- bodhi.spec	28 Jan 2008 22:34:32 -0000	1.11
+++ bodhi.spec	12 Jan 2009 23:33:36 -0000	1.12
@@ -2,20 +2,26 @@
 %{!?pyver: %define pyver %(%{__python} -c "import sys ; print sys.version[:3]")}
 
 Name:           bodhi
-Version:        0.4.10
-Release:        2%{?dist}
+Version:        0.5.16
+Release:        1%{?dist}
 Summary:        A modular framework that facilitates publishing software updates
 Group:          Applications/Internet
 License:        GPLv2+
-URL:            https://hosted.fedoraproject.org/projects/bodhi
+URL:            https://fedorahosted.org/bodhi
 Source0:        bodhi-%{version}.tar.bz2
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
-BuildRequires: python-setuptools-devel TurboGears python-genshi python-elixir
+BuildRequires: python-setuptools 
+BuildRequires: python-setuptools-devel
+BuildRequires: python-devel
+
+BuildRequires: TurboGears python-bugzilla
+BuildRequires: python-fedora python-TurboMail TurboGears yum koji
 
 %description
-Bodhi is a modular framework that facilitates the process of publishing
+Bodhi is a web application that facilitates the process of publishing
 updates for a software distribution.
 
 A modular piece of the Fedora Infrastructure stack
@@ -23,19 +29,35 @@
 * Creates the update repositories using Mash, which composes a repository based
   on tagged builds in Koji. 
 
+
 %package client
 Summary: Bodhi Client
 Group: Applications/Internet
-Requires: python-simplejson python-fedora koji yum
+Requires: python-simplejson koji yum
+Requires: python-fedora >= 0.3.5
 
-%description client 
+%description client
 Client tools for interacting with bodhi
 
 
 %package server
 Summary: A modular framework that facilitates publishing software updates
 Group: Applications/Internet
-Requires: TurboGears createrepo python-TurboMail intltool mash cvs python-fedora
+Requires: TurboGears
+Requires: python-TurboMail
+Requires: intltool
+Requires: mash
+Requires: cvs
+Requires: koji
+Requires: python-fedora
+Requires: python-bugzilla
+Requires: python-imaging
+Requires: python-crypto
+Requires: python-turboflot
+Requires: python-tgcaptcha
+Requires: python-decorator
+Requires: mod_wsgi
+
 
 %description server
 Bodhi is a modular framework that facilitates the process of publishing
@@ -46,35 +68,132 @@
 rm -rf bodhi/tests bodhi/tools/test-bodhi.py
 
 %build
-%{__python} setup.py build --install-conf=%{_sysconfdir} \
-        --install-data=%{_datadir}
+%{__python} setup.py build --install-data=%{_datadir}
 
 %install
-rm -rf $RPM_BUILD_ROOT
-%{__python} setup.py install --skip-build --install-conf=%{_sysconfdir} \
+%{__rm} -rf %{buildroot}
+%{__python} setup.py install -O1 --skip-build \
     --install-data=%{_datadir} --root %{buildroot}
-%{__install} -D bodhi/tools/bodhi_client.py $RPM_BUILD_ROOT/usr/bin/bodhi
-chmod +x $RPM_BUILD_ROOT/%{_datadir}/%{name}/bodhi/tools/{bodhi_client,init,dev_init,pickledb}.py
+
+%{__mkdir_p} %{buildroot}/var/lib/bodhi
+%{__mkdir_p} %{buildroot}%{_sysconfdir}/httpd/conf.d
+%{__mkdir_p} %{buildroot}%{_sysconfdir}/bodhi
+%{__mkdir_p} %{buildroot}%{_datadir}/%{name}
+%{__mkdir_p} -m 0755 %{buildroot}/%{_localstatedir}/log/bodhi
+
+%{__install} -m 640 apache/%{name}.conf %{buildroot}%{_sysconfdir}/httpd/conf.d/%{name}.conf
+%{__install} -m 640 %{name}.cfg %{buildroot}%{_sysconfdir}/%{name}/
+%{__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 $RPM_BUILD_ROOT
+%{__rm} -rf %{buildroot}
 
 
 %files server
 %defattr(-,root,root,-)
 %doc README COPYING
-%{_datadir}/%{name}
-%{_bindir}/start-bodhi
-%config(noreplace) %{_sysconfdir}/%{name}.cfg
+%{python_sitelib}/%{name}/
+%{_bindir}/start-%{name}
+%{_bindir}/%{name}-*
+%{_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
+%defattr(-,root,root,-)
 %{_bindir}/bodhi
 %{_mandir}/man1/bodhi.1.gz
 
 
 %changelog
+* Mon Jan 05 2009 Luke Macken <lmacken at redhat.com> - 0.5.16-1
+- Latest upstream bugfix release.
+
+* Mon Dec 22 2008 Luke Macken <lmacken at redhat.com> - 0.5.15-1
+- Latest release, with more masher improvements.
+
+* Fri Dec 19 2008 Luke Macken <lmacken at redhat.com> - 0.5.14-1
+- Latest upstream release, containing some masher improvements.
+
+* Wed Dec 10 2008 Luke Macken <lmacken at redhat.com> - 0.5.13-1
+- Latest upstream release to fix various metrics/rss issues
+
+* Mon Nov 24 2008 Luke Macken <lmacken at redhat.com> - 0.5.12-1
+- Latest upstream release, to fix the 10k bug
+
+* Fri Nov 21 2008 Luke Macken <lmacken at redhat.com> - 0.5.11-1
+- Various F10 release tweaks
+
+* Fri Oct 24 2008 Luke Macken <lmacken at redhat.com> - 0.5.10-3
+- Latest upstream release
+
+* Wed Oct 15 2008 Luke Macken <lmacken at redhat.com> - 0.5.9-2
+- Fix a trivial module import issue
+
+* Tue Oct 14 2008 Luke Macken <lmacken at redhat.com> - 0.5.9-1
+- Fix a variety of bugs, including a race-condition when editing.
+
+* Thu Oct 13 2008 Steve 'Ashcrow' Milner <smilner at redhat.com> - 0.5.8-2
+- Added default attributes to client files.
+
+* Sun Oct 12 2008 Luke Macken <lmacken at redhat.com> - 0.5.8-1
+- Minor release to fix some new update creation bugs
+
+* Thu Oct 09 2008 Luke Macken <lmacken at redhat.com> - 0.5.7-1
+- Latest release, containing some API improvements
+
+* Tue Oct 07 2008 Luke Macken <lmacken at redhat.com> - 0.5.6-1
+- Latest upstream release.
+
+* Mon Oct 06 2008 Luke Macken <lmacken at redhat.com> - 0.5.5-1
+- Latest upstream release.
+
+* Sat Oct 04 2008 Luke Macken <lmacken at redhat.com> - 0.5.4-2
+- Make our masher extension point less obtrusive.
+
+* Tue Sep 16 2008 Luke Macken <lmacken at redhat.com> - 0.5.4-1
+- Latest upstream release, containing various bugfixes
+- Make our python-fedora requirement explicit (#461518)
+
+* 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
+
+* 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
+
+* Sun Jul 06 2008 Luke Macken <lmacken at redhat.com> - 0.5.0-1
+- Latest upstream release
+
+* Thu Jun 12 2008 Todd Zullinger <tmz at pobox.com> - 0.4.10-5
+- update URL to point to fedorahosted.org
+
+* Fri Apr 04 2008 Luke Macken <lmacken at redhat.com> - 0.4.10-4
+- Add python-tgcaptcha to our server requirements
+
+* Tue Feb 26 2008 Luke Macken <lmacken at redhat.com> - 0.4.10-3
+- Add python-bugzilla to our server requirements
+
 * Fri Jan 25 2008 Luke Macken <lmacken at redhat.com> - 0.4.10-2
 - Add python-elixir to BuildRequires to make the new TG happy
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bodhi/EL-5/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	28 Jan 2008 22:34:32 -0000	1.11
+++ sources	12 Jan 2009 23:33:36 -0000	1.12
@@ -1 +1 @@
-b567b445f7624ad5392c6ace48b767a9  bodhi-0.4.10.tar.bz2
+a76e28c05ab3349f538087046b3aac28  bodhi-0.5.16.tar.bz2



From walters at fedoraproject.org  Mon Jan 12 23:39:06 2009
From: walters at fedoraproject.org (Colin Walters)
Date: Mon, 12 Jan 2009 23:39:06 +0000 (UTC)
Subject: rpms/antlr3/devel antlr3.spec,1.5,1.6
Message-ID: <20090112233906.1D33270123@cvs1.fedora.phx.redhat.com>

Author: walters

Update of /cvs/pkgs/rpms/antlr3/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1264

Modified Files:
	antlr3.spec 
Log Message:
* Mon Jan 12 2009 Colin Walters <walters at redhat.com> - 3.1.1-5
- Add bcel to build path



Index: antlr3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/antlr3/devel/antlr3.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- antlr3.spec	12 Jan 2009 22:01:24 -0000	1.5
+++ antlr3.spec	12 Jan 2009 23:38:35 -0000	1.6
@@ -3,7 +3,7 @@
 Summary: ANother Tool for Language Recognition
 Name: antlr3
 Version: 3.1.1
-Release: 4%{?dist}
+Release: 5%{?dist}
 URL: http://www.antlr.org/
 Source0: http://www.antlr.org/download/antlr-3.1.1.tar.gz
 # Utility file, in conversation with upstream about this
@@ -45,7 +45,7 @@
 
 %build
 rm -f lib/*.jar
-build-jar-repository -s -p lib stringtemplate
+build-jar-repository -s -p lib stringtemplate bcel
 # Clean out generated files upstream includes
 %{__python} %{SOURCE1} .
 # Build
@@ -80,6 +80,9 @@
 %{python_sitelib}/antlr_python_runtime-*
 
 %changelog
+* Mon Jan 12 2009 Colin Walters <walters at redhat.com> - 3.1.1-5
+- Add bcel to build path
+
 * Mon Jan 12 2009 Colin Walters <walters at redhat.com> - 3.1.1-4
 - Add bcel build dep to version jar name
 



From astokes at fedoraproject.org  Mon Jan 12 23:46:33 2009
From: astokes at fedoraproject.org (Adam Stokes)
Date: Mon, 12 Jan 2009 23:46:33 +0000 (UTC)
Subject: rpms/sos/F-10 sos.spec,1.5,1.6
Message-ID: <20090112234633.5EA5270123@cvs1.fedora.phx.redhat.com>

Author: astokes

Update of /cvs/pkgs/rpms/sos/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2811

Modified Files:
	sos.spec 
Log Message:
updated spec to include python egg



Index: sos.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sos/F-10/sos.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sos.spec	12 Jan 2009 18:31:32 -0000	1.5
+++ sos.spec	12 Jan 2009 23:46:03 -0000	1.6
@@ -5,7 +5,7 @@
 Summary: A set of tools to gather troubleshooting information from a system
 Name: sos
 Version: 1.8
-Release: 5%{?dist}
+Release: 6%{?dist}
 Group: Application/Tools
 Source0: https://fedorahosted.org/releases/s/o/sos/%{name}-%{version}.tar.gz
 License: GPLv2+
@@ -46,13 +46,16 @@
 %{_sbindir}/sysreport.legacy
 /usr/share/sysreport
 /usr/share/sos/rhsupport.pub
-%{python_sitelib}/sos/
+%{python_sitelib}/*
 %{_mandir}/man1/sosreport.1.gz
 %{_localedir}/*/LC_MESSAGES/sos.mo
 %doc README README.rh-upload-core TODO LICENSE ChangeLog
 %config %{_sysconfdir}/sos.conf
 
 %changelog
+* Mon Jan 12 2009 Adam Stokes <ajs at redhat dot com> - 1.8-6
+- updated spec to include setuptools/egg file
+
 * Mon Dec 29 2008 Adam Stokes <ajs at redhat dot com> - 1.8-5
 - removed source defines as python manifest handles this
 



From astokes at fedoraproject.org  Mon Jan 12 23:51:53 2009
From: astokes at fedoraproject.org (Adam Stokes)
Date: Mon, 12 Jan 2009 23:51:53 +0000 (UTC)
Subject: rpms/sos/devel sos.spec,1.6,1.7
Message-ID: <20090112235153.140CE70123@cvs1.fedora.phx.redhat.com>

Author: astokes

Update of /cvs/pkgs/rpms/sos/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3694

Modified Files:
	sos.spec 
Log Message:
updated spec to include python egg



Index: sos.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sos/devel/sos.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sos.spec	12 Jan 2009 18:25:27 -0000	1.6
+++ sos.spec	12 Jan 2009 23:51:22 -0000	1.7
@@ -5,7 +5,7 @@
 Summary: A set of tools to gather troubleshooting information from a system
 Name: sos
 Version: 1.8
-Release: 5%{?dist}
+Release: 6%{?dist}
 Group: Application/Tools
 Source0: https://fedorahosted.org/releases/s/o/sos/%{name}-%{version}.tar.gz
 License: GPLv2+
@@ -46,13 +46,16 @@
 %{_sbindir}/sysreport.legacy
 /usr/share/sysreport
 /usr/share/sos/rhsupport.pub
-%{python_sitelib}/sos/
+%{python_sitelib}/*
 %{_mandir}/man1/sosreport.1.gz
 %{_localedir}/*/LC_MESSAGES/sos.mo
 %doc README README.rh-upload-core TODO LICENSE ChangeLog
 %config %{_sysconfdir}/sos.conf
 
 %changelog
+* Mon Jan 12 2009 Adam Stokes <ajs at redhat dot com> - 1.8-6
+- updated spec to include setuptools/egg file
+
 * Mon Dec 29 2008 Adam Stokes <ajs at redhat dot com> - 1.8-5
 - removed source defines as python manifest handles this
 



From cdamian at fedoraproject.org  Tue Jan 13 00:22:01 2009
From: cdamian at fedoraproject.org (Christof Damian)
Date: Tue, 13 Jan 2009 00:22:01 +0000 (UTC)
Subject: rpms/podcatcher/F-10 import.log, NONE, 1.1 podcatcher.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090113002201.5257170129@cvs1.fedora.phx.redhat.com>

Author: cdamian

Update of /cvs/pkgs/rpms/podcatcher/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7622/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	import.log podcatcher.spec 
Log Message:
import of podcatcher-3.1.4-3.fc10.src.rpm



--- NEW FILE import.log ---
podcatcher-3_1_4-3_fc10:F-10:podcatcher-3.1.4-3.fc10.src.rpm:1231806060


--- NEW FILE podcatcher.spec ---
%define repoid  43722

Name:           podcatcher
Version:        3.1.4
Release:        3%{?dist}
Summary:        Armangil's podcatcher 

Group:          Applications/Internet

License:        GPL+
URL:            http://podcatcher.rubyforge.org/
Source0:        http://rubyforge.org/frs/download.php/%{repoid}/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch

Requires:       ruby >= 1.8.2

%description

Armangil's podcatcher is a podcast client for the command line. It provides 
several download strategies (new shows only, back-catalog allowed, etc), offers 
cache management, supports BitTorrent, and generates playlists for media player
applications.

%prep
%setup -q -n %{name}

%build

%install
rm -rf $RPM_BUILD_ROOT
install -p -D bin/podcatcher $RPM_BUILD_ROOT/%{_bindir}/podcatcher

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc demo/
%doc README.txt
%{_bindir}/podcatcher

%changelog
* Mon Jan 5 2009 Christof Damian <christof at damian.net> 3.1.4-3
- add repoid for download link and use name macro too
- removed unused macros

* Thu Jan 1 2009 Christof Damian <christof at damian.net> 3.1.4-2
- fixed some problems in the spec file

* Fri Dec 26 2008 Christof Damian <christof at damian.net> 3.1.4-1
- initial rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/podcatcher/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	11 Jan 2009 17:16:24 -0000	1.1
+++ .cvsignore	13 Jan 2009 00:21:30 -0000	1.2
@@ -0,0 +1 @@
+podcatcher-3.1.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/podcatcher/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	11 Jan 2009 17:16:24 -0000	1.1
+++ sources	13 Jan 2009 00:21:30 -0000	1.2
@@ -0,0 +1 @@
+38e5382613c4a454b8138bcc2b881e68  podcatcher-3.1.4.tar.gz



From quantumburnz at fedoraproject.org  Tue Jan 13 00:30:53 2009
From: quantumburnz at fedoraproject.org (Christopher D. Stover)
Date: Tue, 13 Jan 2009 00:30:53 +0000 (UTC)
Subject: rpms/barry/devel barry.spec,1.9,1.10
Message-ID: <20090113003053.D85E970129@cvs1.fedora.phx.redhat.com>

Author: quantumburnz

Update of /cvs/pkgs/rpms/barry/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8686

Modified Files:
	barry.spec 
Log Message:
ip_modem patch


Index: barry.spec
===================================================================
RCS file: /cvs/pkgs/rpms/barry/devel/barry.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- barry.spec	12 Jan 2009 21:51:23 -0000	1.9
+++ barry.spec	13 Jan 2009 00:30:23 -0000	1.10
@@ -21,6 +21,9 @@
 # (cd build && ../tar-create.sh 0 15)
 Source0:        %{name}-%{version}-20090109.tar.bz2
 Source1:        %{name}.desktop
+# ip_modem password patch for the Blackberry Bold 9000
+# http://sourceforge.net/mailarchive/forum.php?thread_name=4968F513.1050909%40comcast.net&forum_name=barry-devel
+Patch0:         ipmodem.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libusb-devel boost-devel desktop-file-utils gtkmm24-devel
@@ -95,6 +98,7 @@
 %{__rm} -rf ./doc/www/doxygen/html/brecsum_8cc__incl.map
 %{__rm} -rf ./doc/www/doxygen/html/breset_8cc__incl.map
 %{__rm} -rf ./doc/www/doxygen/html/endian_8h__incl.map
+%patch0 -p1
 
 
 %build
@@ -199,6 +203,7 @@
 %changelog
 * Mon Jan 12 2009 Christopher D. Stover <quantumburnz at hotmail.com> 0.15-0.2.20090109git
 - enable fuse module during build
+- include ip_modem password patch for the Blackberry Bold 9000
 
 * Mon Jan 12 2009 Christopher D. Stover <quantumburnz at hotmail.com> 0.15-0.1.20090109git
 - version/git bump



From quantumburnz at fedoraproject.org  Tue Jan 13 00:34:05 2009
From: quantumburnz at fedoraproject.org (Christopher D. Stover)
Date: Tue, 13 Jan 2009 00:34:05 +0000 (UTC)
Subject: rpms/barry/devel barry-ipmodem.patch,NONE,1.1
Message-ID: <20090113003405.DE7DD70129@cvs1.fedora.phx.redhat.com>

Author: quantumburnz

Update of /cvs/pkgs/rpms/barry/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9286

Added Files:
	barry-ipmodem.patch 
Log Message:
add barry-ipmodem.patch file

barry-ipmodem.patch:

--- NEW FILE barry-ipmodem.patch ---
diff --git a/src/m_ipmodem.cc b/src/m_ipmodem.cc
index 23c81c1..dae0f08 100644
--- a/src/m_ipmodem.cc
+++ b/src/m_ipmodem.cc
@@ -60,95 +60,78 @@ IpModem::~IpModem()
 	}
 }
 
-bool IpModem::SendPassword(const char *password)
+bool IpModem::SendPassword( const char *password, uint32_t seed )
 {
-	if( !password || strlen(password) == 0  ) {
-		throw BadPassword("No password provided.", 0, false);
-	}
-
 	int read_ep  = m_con.GetProbeResult().m_epModem.read;
 	int write_ep = m_con.GetProbeResult().m_epModem.write;
+	unsigned char pwdigest[SHA_DIGEST_LENGTH];
+	unsigned char prefixedhash[SHA_DIGEST_LENGTH + 4];
+	unsigned char pw_response[SHA_DIGEST_LENGTH + 8];
+	uint32_t new_seed;
 	Data data;
 
-	m_dev.BulkWrite(write_ep, pw_start, sizeof(pw_start));
-	m_dev.BulkRead(read_ep, data);
-	ddout("IPModem read packet.\n" << data);
-
-	// Need to add checks for other packet types.
-	// check for 02 00 00 00 SS SS SS SS RR 00 00 00 0a 00 00 00 PP PP PP PP PP 00 00 00 78 56 34 12
-        if( data.GetSize() >= 9 && data.GetData()[0] == 0x02  &&
-	    memcmp(data.GetData() + data.GetSize() - 4, special_flag, sizeof(special_flag))== 0 ) {
-		// Got a password request packet
-		ddout("IPModem password request packet:\n" << data);
-
-		// Check how many retries are left
-		if( data.GetData()[8] < BARRY_MIN_PASSWORD_TRIES ) {
-			throw BadPassword("Fewer than " BARRY_MIN_PASSWORD_TRIES_ASC " password tries remaining in device. Refusing to proceed, to avoid device zapping itself.  Use a Windows client, or re-cradle the device.",
-				data.GetData()[8],
-				true);
-		}
+	if( !password || strlen(password) == 0  ) {
+		throw BadPassword("No password provided.", 0, false);
+	}
 
-		// Build the password hash
-		unsigned char pwdigest[SHA_DIGEST_LENGTH];
-		unsigned char prefixedhash[SHA_DIGEST_LENGTH + 4];
-		unsigned char pw_response[SHA_DIGEST_LENGTH + 8];
-		unsigned char seed[4];
+	// Build the password hash
+	// first, hash the password by itself
+	SHA1((unsigned char *) password, strlen(password), pwdigest);
 
-		// first, hash the password by itself
-		SHA1((unsigned char *) password, strlen(password), pwdigest);
+	// prefix the resulting hash with the provided seed
+	memcpy(&prefixedhash[0], &seed, sizeof(uint32_t));
+	memcpy(&prefixedhash[4], pwdigest, SHA_DIGEST_LENGTH);
 
-		// prefix the resulting hash with the provided seed
-		memcpy(&seed[0], data.GetData() + 4, sizeof(uint32_t));
-		memcpy(&prefixedhash[0], &seed, sizeof(uint32_t));
-		memcpy(&prefixedhash[4], pwdigest, SHA_DIGEST_LENGTH);
+	// hash again
+	SHA1((unsigned char *) prefixedhash, SHA_DIGEST_LENGTH + 4, pwdigest);
 
-		// hash again
-		SHA1((unsigned char *) prefixedhash, SHA_DIGEST_LENGTH + 4, pwdigest);
+	// Build the response packet
+	const char pw_rsphdr[]  = { 0x03, 0x00, 0x00, 0x00 };
+	memcpy(&pw_response[0], pw_rsphdr, sizeof(pw_rsphdr));
+	memcpy(&pw_response[4], pwdigest, SHA_DIGEST_LENGTH);
+	memcpy(&pw_response[24], special_flag, sizeof(special_flag));
 
-		// Build the response packet
-		const char pw_rsphdr[]  = { 0x03, 0x00, 0x00, 0x00 };
-		memcpy(&pw_response[0], pw_rsphdr, sizeof(pw_rsphdr));
-		memcpy(&pw_response[4], pwdigest, SHA_DIGEST_LENGTH);
-		memcpy(&pw_response[24], special_flag, sizeof(special_flag));
+	// Send the password response packet
+	m_dev.BulkWrite(write_ep, pw_response, sizeof(pw_response));
+	m_dev.BulkRead(read_ep, data);
+	ddout("IPModem: Read password response.\n" << data);
 
-		// Send the password response packet
-		m_dev.BulkWrite(write_ep, pw_response, sizeof(pw_response));
-		m_dev.BulkRead(read_ep, data);
-		ddout("IPModem read password response.\n" << data);
-
-		// check response 04 00 00 00 .......
-		// On the 8703e the seed is incremented, retries are reset to 10 when the password is accepted.
-		// if( data.GetData()[0] == 0x04  && data.GetData()[8] == 0x0a ) {
-                if( data.GetSize() >= 9 && data.GetData()[0] == 0x04 ) {
-			if( memcmp(data.GetData() + 4, seed, sizeof(seed)) == 0 ) {
-				ddout("IPModem invalid password.\n" << data);
-				throw BadPassword("Password rejected by device.", data.GetData()[8], false);
-			}
-			ddout("IPModem password accepted.\n");
-			// send "start"? packet
-			m_dev.BulkWrite(write_ep, pw_start, sizeof(pw_start));
+	// Added for the BB Storm 9000's second password request
+	if( data.GetSize() >= 16 && data.GetData()[0] == 0x00 ) {
+		try {
+			m_dev.BulkRead(read_ep, data, 500);
+			ddout("IPModem: Null Response Packet:\n" << data);
+		}
+		catch( Usb::Timeout &to ) {
+			// do nothing on timeouts
+			ddout("IPModem: Null Response Timeout");
+		}
+	}
 
-			// send packet with the last 8 bytes of the password hash (session_key?)
-			//unsigned char pw_response[SHA_DIGEST_LENGTH + 8];
-			unsigned char pw_rsphdr[] = { 0x00, 0, 0, 0, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0xc2, 1, 0 };
+	// check response 04 00 00 00 .......
+	// On the 8703e the seed is incremented, retries are reset to 10 when the password is accepted.
+	// If data.GetData() + 4 is = to the orginal seed +1 or 00 00 00 00 then the password was acceppted.
+	// When data.GetData() + 4 is not 00 00 00 00 then data.GetData()[8] contains the number of password retrys left.
+	if( data.GetSize() >= 9 && data.GetData()[0] == 0x04 ) {
+		memcpy(&new_seed, data.GetData() + 4, sizeof(uint32_t));
+		seed++;
+		if( seed == new_seed || new_seed == 0 ) {
+			ddout("IPModem: Password accepted.\n");
+			// Create session key - last 8 bytes of the password hash
 			memcpy(&m_session_key[0], pwdigest + 12, sizeof(m_session_key));
-			memcpy(&pw_response[0], pw_rsphdr, sizeof(pw_rsphdr));
-			memcpy(&pw_response[16], pwdigest + 12, 8);
-			//memcpy(&pw_response[16], m_session_key, 8);
-			memcpy(&pw_response[24], special_flag, sizeof(special_flag));
-			m_dev.BulkWrite(write_ep, pw_response, sizeof(pw_response));
 
 			// blank password hashes as we don't need these anymore
 			memset(pwdigest, 0, sizeof(pwdigest));
 			memset(prefixedhash, 0, sizeof(prefixedhash));
-
-			// The modem should be ready to accept AT commands
 			return true;
 		}
-
-		// Unknown packet
-		ddout("IPModem Error unknown packet.\n" << data);
+		else {
+			ddout("IPModem: Invalid password.\n" << data);
+			throw BadPassword("Password rejected by device.", data.GetData()[8], false);
+		}
 	}
+	// Unknown packet
+	ddout("IPModem: Error unknown packet.\n" << data);
 	return false;
 }
 
@@ -172,7 +155,7 @@ void *IpModem::DataReadThread(void *userptr)
 			if( data.GetSize() > 4 &&
 			    memcmp(data.GetData() + data.GetSize() - 4, special_flag, sizeof(special_flag)) == 0 ) {
 				// log, then drop it on the floor for now
-				ddout("IPModem special packet:\n" << data);
+				ddout("IPModem: Special packet:\n" << data);
 				continue;
 			}
 
@@ -190,7 +173,7 @@ void *IpModem::DataReadThread(void *userptr)
 		}
 		catch( Usb::Timeout &to ) {
 			// do nothing on timeouts
-			ddout("Timeout in DataReadThread!");
+			ddout("IPModem: Timeout in DataReadThread!");
 		}
 		catch( std::exception &e ) {
 			eout("Exception in IpModem::DataReadThread: " << e.what());
@@ -207,7 +190,10 @@ void IpModem::Open(const char *password)
 {
 	int read_ep  = m_con.GetProbeResult().m_epModem.read;
 	int write_ep = m_con.GetProbeResult().m_epModem.write;
+	unsigned char response[28];
+	uint32_t seed;
 	Data data;
+
 	// check that we have endpoints for the modem
 	const Usb::EndpointPair &pair = m_con.GetProbeResult().m_epModem;
 	if( !pair.IsComplete() ) {
@@ -224,28 +210,110 @@ void IpModem::Open(const char *password)
 	m_dev.ClearHalt(pair.read);
 	m_dev.ClearHalt(pair.write);
 
-	if( !password || strlen(password) == 0 ) {
-		Data block(start, sizeof(start));
-		Write(block);
+	// Send stop command
+	ddout("IPModem: Sending Stop Response:\n");
+	m_dev.BulkWrite(write_ep, stop, sizeof(stop));
+	try {
+		m_dev.BulkRead(read_ep, data, 500);
+		ddout("IPModem: Stop Response Packet:\n" << data);
 	}
-	else {
-		if( !SendPassword(password) ) {
-			throw Barry::Error("IpModem:: Error sending password.");
+	catch( Usb::Timeout &to ) {
+		// do nothing on timeouts
+		ddout("IPModem: Stop Response Timeout");
+	}
+
+	// Send start commands to figure out if the device needs a password.
+	ddout("IPModem: Sending Start Response:\n");
+	m_dev.BulkWrite(write_ep, pw_start, sizeof(pw_start));
+	m_dev.BulkRead(read_ep, data, 5000);
+	ddout("IPModem: Start Response Packet:\n" << data);
+
+	// check for 02 00 00 00 SS SS SS SS RR 00 00 00 0a 00 00 00 PP PP PP PP PP 00 00 00 78 56 34 12
+        if( data.GetSize() >= 9 && data.GetData()[0] == 0x02  &&
+	    memcmp(data.GetData() + data.GetSize() - 4, special_flag, sizeof(special_flag))== 0 ) {
+		// Got a password request packet
+		ddout("IPModem: Password request packet:\n" << data);
+
+		// Check how many retries are left
+		if( data.GetData()[8] < BARRY_MIN_PASSWORD_TRIES ) {
+			throw BadPassword("Fewer than " BARRY_MIN_PASSWORD_TRIES_ASC " password tries remaining in device. Refusing to proceed, to avoid device zapping itself.  Use a Windows client, or re-cradle the device.",
+				data.GetData()[8],
+				true);
+		}
+		memcpy(&seed, data.GetData() + 4, sizeof(uint32_t));
+		// Send password
+		if( !SendPassword(password, seed) ) {
+			throw Barry::Error("IpModem: Error sending password.");
+		}
+
+		// Re-send "start" packet
+		ddout("IPModem: Re-sending Start Response:\n");
+		m_dev.BulkWrite(write_ep, pw_start, sizeof(pw_start));
+		m_dev.BulkRead(read_ep, data);
+		ddout("IPModem: Start Response Packet:\n" << data);
+
+		// send packet with the session_key
+		unsigned char response_header[] = { 0x00, 0, 0, 0, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0xc2, 1, 0 };
+		memcpy(&response[0], response_header, sizeof(response_header));
+		memcpy(&response[16], m_session_key,  sizeof(m_session_key));
+		memcpy(&response[24], special_flag, sizeof(special_flag));
+		ddout("IPModem: Sending Session key:\n");
+		m_dev.BulkWrite(write_ep, response, sizeof(response));
+		if( data.GetSize() >= 16 ) {
+			switch(data.GetData()[0])
+			{
+			case 0x00:	// Null packet
+				break;
+
+			case 0x02:	// password seed received
+				memcpy(&seed, data.GetData() + 4, sizeof(uint32_t));
+				if( !SendPassword( password, seed ) ) {
+					throw Barry::Error("IpModem: Error sending password.");
+				}
+				break;
+			case 0x04:	// command accepted
+				break;
+
+			default: 	// ???
+				ddout("IPModem: Unknown response.\n");
+				break;
+			}
 		}
+
 	}
 
 	// see if the modem will respond to commands
 	const char modem_command[] = { "AT\r" };
+	//ddout("IPModem: Test command response.\n" << data);
 	m_dev.BulkWrite(write_ep, modem_command, strlen(modem_command));
 	m_dev.BulkRead(read_ep, data);
-	ddout("IPModem:: AT command response.\n" << data);
+	ddout("IPModem: Test command response.\n" << data);
 	if( data.GetSize() >= 1 ) {
 		switch(data.GetData()[0])
 		{
-		case 0x02:	// password seed received
-			throw BadPassword("This device requested a password.",
-				data.GetSize() >= 9 ? data.GetData()[8] : 0, false);
+		case 0x00:	// Null packet
+			try {
+				m_dev.BulkRead(read_ep, data, 5000);
+				ddout("IPModem: AT Response Packet:\n" << data);
+			}
+			catch( Usb::Timeout &to ) {
+				// do nothing on timeouts
+				ddout("IPModem: AT Response Timeout");
+			}
+			break;
 
+		case 0x02:	// password seed received
+			if( !password || strlen(password) == 0 ) {
+				throw BadPassword("This device requested a password.",
+					data.GetSize() >= 9 ? data.GetData()[8] : 0, false);
+			}
+			else {	// added for the Storm 9000
+				memcpy(&seed, data.GetData() + 4, sizeof(uint32_t));
+				if( !SendPassword( password, seed ) ) {
+					throw Barry::Error("IpModem: Error sending password.");
+				}
+			}
+			break;
 		case 0x04:	// command accepted
 			break;
 
@@ -253,17 +321,18 @@ void IpModem::Open(const char *password)
 			throw BadPassword("This device requires a password.", 0, false);
 
 		default: 	// ???
-			ddout("IPModem:: unknown AT command response.\n");
+			ddout("IPModem: Unknown AT command response.\n");
 			break;
 		}
 	}
+	ddout("IPModem: Modem Ready.\n");
 
 	// spawn read thread
 	m_continue_reading = true;
 	int ret = pthread_create(&m_modem_read_thread, NULL, &IpModem::DataReadThread, this);
 	if( ret ) {
 		m_continue_reading = false;
-		throw Barry::ErrnoError("IpModem:: Error creating USB read thread.", ret);
+		throw Barry::ErrnoError("IpModem: Error creating USB read thread.", ret);
 	}
 }
 
@@ -293,7 +362,7 @@ void IpModem::Close()
 	Data data;
 
 	//0 0 0 0 b0 0 0 0 0 0 0 0 0 c2 1 0 + session_key + special_flag
-	ddout("IpModem:: Closing connection.");
+	ddout("IpModem: Closing connection.");
 	memset(end, 0, sizeof(end));
 	end[4]  = 0xb0;
 	end[13] = 0xc2;
@@ -324,18 +393,18 @@ void IpModem::Close()
 	m_dev.BulkWrite(write_ep, stop, sizeof(stop));
 	try {
 		m_dev.BulkRead(read_ep, data, 5000);
-		ddout("IPModem:: Close read packet:\n" << data);
+		ddout("IPModem: Close read packet:\n" << data);
 	}
 	catch( Usb::Timeout &to ) {
 		// do nothing on timeouts
-		ddout("IPModem:: Close Read Timeout");
+		ddout("IPModem: Close Read Timeout");
 	}
 	// stop the read thread
 	if( m_continue_reading ) {
 		m_continue_reading = false;
 		pthread_join(m_modem_read_thread, NULL);
 	}
-	ddout("IPmodem:: Closed!");
+	ddout("IPmodem: Closed!");
 
 }
 
diff --git a/src/m_ipmodem.h b/src/m_ipmodem.h
index 23e5ffa..c58882f 100644
--- a/src/m_ipmodem.h
+++ b/src/m_ipmodem.h
@@ -59,7 +59,7 @@ private:
 	unsigned char m_session_key[8];		// = { 0x00, 0, 0, 0, 0, 0, 0, 0 };
 
 private:
-	BXLOCAL bool SendPassword(const char *password = 0);
+	BXLOCAL bool SendPassword(const char *password = 0, uint32_t seed = 0);
 
 protected:
 	static void *DataReadThread(void *userptr);



From quantumburnz at fedoraproject.org  Tue Jan 13 00:40:20 2009
From: quantumburnz at fedoraproject.org (Christopher D. Stover)
Date: Tue, 13 Jan 2009 00:40:20 +0000 (UTC)
Subject: rpms/barry/devel barry.spec,1.10,1.11
Message-ID: <20090113004020.800D370129@cvs1.fedora.phx.redhat.com>

Author: quantumburnz

Update of /cvs/pkgs/rpms/barry/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9997

Modified Files:
	barry.spec 
Log Message:
proper patch name


Index: barry.spec
===================================================================
RCS file: /cvs/pkgs/rpms/barry/devel/barry.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- barry.spec	13 Jan 2009 00:30:23 -0000	1.10
+++ barry.spec	13 Jan 2009 00:39:50 -0000	1.11
@@ -23,7 +23,7 @@
 Source1:        %{name}.desktop
 # ip_modem password patch for the Blackberry Bold 9000
 # http://sourceforge.net/mailarchive/forum.php?thread_name=4968F513.1050909%40comcast.net&forum_name=barry-devel
-Patch0:         ipmodem.diff
+Patch0:         barry-ipmodem.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libusb-devel boost-devel desktop-file-utils gtkmm24-devel



From quantumburnz at fedoraproject.org  Tue Jan 13 00:43:02 2009
From: quantumburnz at fedoraproject.org (Christopher D. Stover)
Date: Tue, 13 Jan 2009 00:43:02 +0000 (UTC)
Subject: rpms/barry/devel barry.spec,1.11,1.12
Message-ID: <20090113004302.1A31070129@cvs1.fedora.phx.redhat.com>

Author: quantumburnz

Update of /cvs/pkgs/rpms/barry/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10271

Modified Files:
	barry.spec 
Log Message:
version bump for new tag


Index: barry.spec
===================================================================
RCS file: /cvs/pkgs/rpms/barry/devel/barry.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- barry.spec	13 Jan 2009 00:39:50 -0000	1.11
+++ barry.spec	13 Jan 2009 00:42:31 -0000	1.12
@@ -6,7 +6,7 @@
 
 Name:           barry
 Version:        0.15
-Release:        0.2.20090109git%{?dist}
+Release:        0.3.20090109git%{?dist}
 Summary:        BlackBerry Desktop for Linux
 
 Group:          Applications/Productivity
@@ -201,6 +201,9 @@
 %postun libs -p /sbin/ldconfig
 
 %changelog
+* Mon Jan 12 2009 Christopher D. Stover <quantumburnz at hotmail.com> 0.15-0.3.20090109git
+- version bump for proper patch name
+
 * Mon Jan 12 2009 Christopher D. Stover <quantumburnz at hotmail.com> 0.15-0.2.20090109git
 - enable fuse module during build
 - include ip_modem password patch for the Blackberry Bold 9000



From notting at fedoraproject.org  Tue Jan 13 00:49:00 2009
From: notting at fedoraproject.org (Bill Nottingham)
Date: Tue, 13 Jan 2009 00:49:00 +0000 (UTC)
Subject: rpms/upstart/F-10 upstart.spec,1.29,1.30
Message-ID: <20090113004900.071BD70129@cvs1.fedora.phx.redhat.com>

Author: notting

Update of /cvs/extras/rpms/upstart/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11534/F-10

Modified Files:
	upstart.spec 
Log Message:
add changelog



Index: upstart.spec
===================================================================
RCS file: /cvs/extras/rpms/upstart/F-10/upstart.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- upstart.spec	10 Jan 2009 21:48:21 -0000	1.29
+++ upstart.spec	13 Jan 2009 00:48:29 -0000	1.30
@@ -1,6 +1,6 @@
 Name:           upstart
 Version:        0.3.9
-Release:        20%{?dist}
+Release:        21%{?dist}
 Summary:        An event-driven init system
 
 Group:          System Environment/Base
@@ -99,6 +99,9 @@
 %{_mandir}/man8/telinit.8.gz
 
 %changelog
+* Mon Jan 12 2009 Bill Nottingham <notting at redhat.com> - 0.3.9-21
+- Remove 'telinit u' support as it is broken (#450488, <cjdahlin at ncsu.edu>)
+
 * Fri Apr 25 2008 Bill Nottingham <notting at redhat.com> - 0.3.9-19
 - with the merge of event-compat-sysv, move the sysvinit obsoletes/provides here
 



From notting at fedoraproject.org  Tue Jan 13 00:49:00 2009
From: notting at fedoraproject.org (Bill Nottingham)
Date: Tue, 13 Jan 2009 00:49:00 +0000 (UTC)
Subject: rpms/upstart/F-9 upstart.spec,1.22,1.23
Message-ID: <20090113004900.4FE9470129@cvs1.fedora.phx.redhat.com>

Author: notting

Update of /cvs/extras/rpms/upstart/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11534/F-9

Modified Files:
	upstart.spec 
Log Message:
add changelog



Index: upstart.spec
===================================================================
RCS file: /cvs/extras/rpms/upstart/F-9/upstart.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- upstart.spec	10 Jan 2009 21:48:21 -0000	1.22
+++ upstart.spec	13 Jan 2009 00:48:29 -0000	1.23
@@ -1,6 +1,6 @@
 Name:           upstart
 Version:        0.3.9
-Release:        20%{?dist}
+Release:        21%{?dist}
 Summary:        An event-driven init system
 
 Group:          System Environment/Base
@@ -99,6 +99,9 @@
 %{_mandir}/man8/telinit.8.gz
 
 %changelog
+* Mon Jan 12 2009 Bill Nottingham <notting at redhat.com> - 0.3.9-21
+- Remove 'telinit u' support as it is broken (#450488, <cjdahlin at ncsu.edu>)
+
 * Fri Apr 25 2008 Bill Nottingham <notting at redhat.com> - 0.3.9-19
 - with the merge of event-compat-sysv, move the sysvinit obsoletes/provides here
 



From stingray at fedoraproject.org  Tue Jan 13 01:03:23 2009
From: stingray at fedoraproject.org (Paul P Komkoff Jr)
Date: Tue, 13 Jan 2009 01:03:23 +0000 (UTC)
Subject: rpms/libnetfilter_conntrack/devel .cvsignore, 1.11,
	1.12 libnetfilter_conntrack.spec, 1.20, 1.21 sources, 1.11, 1.12
Message-ID: <20090113010323.D15B370129@cvs1.fedora.phx.redhat.com>

Author: stingray

Update of /cvs/extras/rpms/libnetfilter_conntrack/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13104

Modified Files:
	.cvsignore libnetfilter_conntrack.spec sources 
Log Message:
libnetfilter_conntrack-0.0.99


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libnetfilter_conntrack/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	26 Oct 2008 09:37:47 -0000	1.11
+++ .cvsignore	13 Jan 2009 01:02:53 -0000	1.12
@@ -1 +1 @@
-libnetfilter_conntrack-0.0.97.tar.bz2
+libnetfilter_conntrack-0.0.99.tar.bz2


Index: libnetfilter_conntrack.spec
===================================================================
RCS file: /cvs/extras/rpms/libnetfilter_conntrack/devel/libnetfilter_conntrack.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- libnetfilter_conntrack.spec	26 Oct 2008 13:11:38 -0000	1.20
+++ libnetfilter_conntrack.spec	13 Jan 2009 01:02:53 -0000	1.21
@@ -2,7 +2,7 @@
 # %define basever 0.0.82
 
 Name:           libnetfilter_conntrack
-Version:        0.0.97
+Version:        0.0.99
 Release:        1%{?dist}
 Summary:        Netfilter conntrack userspace library
 Group:          System Environment/Libraries
@@ -61,6 +61,9 @@
 %{_includedir}/libnetfilter_conntrack/*.h
 
 %changelog
+* Tue Jan 13 2009 Paul P. Komkoff Jr <i at stingr.net> - 0.0.99-1
+- new upstream version
+
 * Sun Oct 26 2008 Paul P. Komkoff Jr <i at stingr.net> - 0.0.97-1
 - new upstream version
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libnetfilter_conntrack/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	26 Oct 2008 09:37:47 -0000	1.11
+++ sources	13 Jan 2009 01:02:53 -0000	1.12
@@ -1 +1 @@
-25b341b6ae14e0c40e9cf5088fd7ae09  libnetfilter_conntrack-0.0.97.tar.bz2
+960c3d347d7f4e3fe7437aa198f36e6e  libnetfilter_conntrack-0.0.99.tar.bz2



From davej at fedoraproject.org  Tue Jan 13 01:21:32 2009
From: davej at fedoraproject.org (Dave Jones)
Date: Tue, 13 Jan 2009 01:21:32 +0000 (UTC)
Subject: rpms/kernel/devel patch-2.6.29-rc1-git2.bz2.sign, NONE,
	1.1 .cvsignore, 
	1.989, 1.990 kernel.spec, 1.1210, 1.1211 sources, 1.951,
	1.952 upstream, 1.863, 1.864 patch-2.6.29-rc1-git1.bz2.sign, 1.1, NONE
Message-ID: <20090113012132.9269C70129@cvs1.fedora.phx.redhat.com>

Author: davej

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15537

Modified Files:
	.cvsignore kernel.spec sources upstream 
Added Files:
	patch-2.6.29-rc1-git2.bz2.sign 
Removed Files:
	patch-2.6.29-rc1-git1.bz2.sign 
Log Message:
2.6.29-rc1-git2


--- NEW FILE patch-2.6.29-rc1-git2.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBJa9qHyGugalF9Dw4RAvDWAJ9vbKpbS45+Pc+JFxcSI6C5uV3h0QCePum3
rrWWXw0oUl3O4K8rSX0w07A=
=qqra
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.989
retrieving revision 1.990
diff -u -r1.989 -r1.990
--- .cvsignore	12 Jan 2009 14:19:28 -0000	1.989
+++ .cvsignore	13 Jan 2009 01:21:01 -0000	1.990
@@ -6,4 +6,4 @@
 linux-2.6.28.tar.bz2
 patch-2.6.28-git14.bz2
 patch-2.6.29-rc1.bz2
-patch-2.6.29-rc1-git1.bz2
+patch-2.6.29-rc1-git2.bz2


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1210
retrieving revision 1.1211
diff -u -r1.1210 -r1.1211
--- kernel.spec	12 Jan 2009 15:22:47 -0000	1.1210
+++ kernel.spec	13 Jan 2009 01:21:01 -0000	1.1211
@@ -58,7 +58,7 @@
 # The rc snapshot level
 %define rcrev 1
 # The git snapshot level
-%define gitrev 1
+%define gitrev 2
 # Set rpm version accordingly
 %define rpmversion 2.6.%{upstream_sublevel}
 %endif
@@ -1736,6 +1736,9 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Mon Jan 12 2009 Dave Jones <davej at redhat.com>
+- 2.6.29-rc1-git2
+
 * Mon Jan 12 2009 Adam Jackson <ajax at redhat.com>
 - Define %%fedora_build a different (faster) way.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v
retrieving revision 1.951
retrieving revision 1.952
diff -u -r1.951 -r1.952
--- sources	12 Jan 2009 14:19:29 -0000	1.951
+++ sources	13 Jan 2009 01:21:01 -0000	1.952
@@ -1,3 +1,3 @@
 d351e44709c9810b85e29b877f50968a  linux-2.6.28.tar.bz2
 c7280469ffd1edd4b50bac92de172d46  patch-2.6.29-rc1.bz2
-f6052f0626b530ea8e1c6ba6b1ef1f01  patch-2.6.29-rc1-git1.bz2
+6f097de5d75a31989636a562543e3ab3  patch-2.6.29-rc1-git2.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v
retrieving revision 1.863
retrieving revision 1.864
diff -u -r1.863 -r1.864
--- upstream	12 Jan 2009 14:19:29 -0000	1.863
+++ upstream	13 Jan 2009 01:21:01 -0000	1.864
@@ -1,3 +1,3 @@
 linux-2.6.28.tar.bz2
 patch-2.6.29-rc1.bz2
-patch-2.6.29-rc1-git1.bz2
+patch-2.6.29-rc1-git2.bz2


--- patch-2.6.29-rc1-git1.bz2.sign DELETED ---



From stingray at fedoraproject.org  Tue Jan 13 01:24:57 2009
From: stingray at fedoraproject.org (Paul P Komkoff Jr)
Date: Tue, 13 Jan 2009 01:24:57 +0000 (UTC)
Subject: rpms/conntrack-tools/devel .cvsignore, 1.5, 1.6 conntrack-tools.spec,
	1.7, 1.8 sources, 1.5, 1.6
Message-ID: <20090113012457.4032270129@cvs1.fedora.phx.redhat.com>

Author: stingray

Update of /cvs/extras/rpms/conntrack-tools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15990

Modified Files:
	.cvsignore conntrack-tools.spec sources 
Log Message:
conntrack-tools-0.9.9


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/conntrack-tools/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	26 Oct 2008 15:34:50 -0000	1.5
+++ .cvsignore	13 Jan 2009 01:24:26 -0000	1.6
@@ -1 +1 @@
-conntrack-tools-0.9.8.tar.bz2
+conntrack-tools-0.9.9.tar.bz2


Index: conntrack-tools.spec
===================================================================
RCS file: /cvs/extras/rpms/conntrack-tools/devel/conntrack-tools.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- conntrack-tools.spec	26 Oct 2008 15:34:50 -0000	1.7
+++ conntrack-tools.spec	13 Jan 2009 01:24:26 -0000	1.8
@@ -1,5 +1,5 @@
 Name:           conntrack-tools
-Version:        0.9.8
+Version:        0.9.9
 Release: 	1%{?dist}
 Summary:        Tools to manipulate netfilter connection tracking table
 Group:          System Environment/Base
@@ -50,6 +50,9 @@
 %{_mandir}/man8/*
 
 %changelog
+* Tue Jan 13 2009 Paul P. Komkoff Jr <i at stingr.net> - 0.9.9-1
+- new upstream version
+
 * Sun Oct 26 2008 Paul P. Komkoff Jr <i at stingr.net> - 0.9.8-1
 - new upstream version
 - remove rollup patch


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/conntrack-tools/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	26 Oct 2008 15:34:50 -0000	1.5
+++ sources	13 Jan 2009 01:24:26 -0000	1.6
@@ -1 +1 @@
-faa795dca2b2765e11dd15e1b0b5b6df  conntrack-tools-0.9.8.tar.bz2
+35b0ab9cde069b4ec8a493daae82d67b  conntrack-tools-0.9.9.tar.bz2



From pbrobinson at fedoraproject.org  Tue Jan 13 01:34:57 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Tue, 13 Jan 2009 01:34:57 +0000 (UTC)
Subject: rpms/ptlib/F-10 .cvsignore, 1.4, 1.5 ptlib.spec, 1.5, 1.6 sources,
	1.4, 1.5
Message-ID: <20090113013457.6EA7570129@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/ptlib/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16877

Modified Files:
	.cvsignore ptlib.spec sources 
Log Message:
- Update to new stable release for ekiga 3.0.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ptlib/F-10/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	20 Oct 2008 19:37:54 -0000	1.4
+++ .cvsignore	13 Jan 2009 01:34:27 -0000	1.5
@@ -1 +1 @@
-ptlib-2.4.2.tar.bz2
+ptlib-2.4.4.tar.bz2


Index: ptlib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ptlib/F-10/ptlib.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ptlib.spec	20 Oct 2008 19:37:54 -0000	1.5
+++ ptlib.spec	13 Jan 2009 01:34:27 -0000	1.6
@@ -1,6 +1,6 @@
 Name:		ptlib
 Summary:	Portable Tools Library
-Version:	2.4.2
+Version:	2.4.4
 Release:	1%{?dist}
 URL:		http://www.opalvoip.org/
 Source0:	ftp://ftp.gnome.org/pub/gnome/sources/%{name}/2.4/%{name}-%{version}.tar.bz2
@@ -62,7 +62,7 @@
 %postun -p /sbin/ldconfig
 
 %files
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc History.txt ReadMe.txt mpl-1.0.htm
 %attr(755,root,root) %{_libdir}/libpt*.so.*
 %dir %{_libdir}/%{name}-%{version}
@@ -74,7 +74,7 @@
 %attr(755,root,root) %{_libdir}/%{name}-%{version}/devices/videoinput/v4l2_pwplugin.so
 
 %files devel
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %{_libdir}/libpt*.so
 %{_includedir}/*
 %{_datadir}/ptlib
@@ -82,6 +82,9 @@
 %attr(755,root,root) %{_bindir}/*
 
 %changelog
+* Tue Jan 13 2009 Peter Robinson <pbrobinson at gmail.com> - 2.4.4-1
+- Update to new stable release for ekiga 3.0.2
+
 * Mon Oct 20 2008 Peter Robinson <pbrobinson at gmail.com> - 2.4.2-1
 - Update to new stable release for ekiga 3.0.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ptlib/F-10/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	20 Oct 2008 19:37:54 -0000	1.4
+++ sources	13 Jan 2009 01:34:27 -0000	1.5
@@ -1 +1 @@
-47ba7da2a339643d5f5406215d457d5a  ptlib-2.4.2.tar.bz2
+221ea2f96ff6bae9cf604d8766eae526  ptlib-2.4.4.tar.bz2



From pbrobinson at fedoraproject.org  Tue Jan 13 01:44:15 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Tue, 13 Jan 2009 01:44:15 +0000 (UTC)
Subject: rpms/opal/F-10 .cvsignore, 1.14, 1.15 opal.spec, 1.31, 1.32 sources,
	1.15, 1.16
Message-ID: <20090113014415.32F7A70129@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/opal/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17094

Modified Files:
	.cvsignore opal.spec sources 
Log Message:
 - Update to new stable release for ekiga 3.0.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/opal/F-10/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	20 Oct 2008 19:41:44 -0000	1.14
+++ .cvsignore	13 Jan 2009 01:43:44 -0000	1.15
@@ -1 +1 @@
-opal-3.4.2.tar.bz2
+opal-3.4.4.tar.bz2


Index: opal.spec
===================================================================
RCS file: /cvs/pkgs/rpms/opal/F-10/opal.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- opal.spec	6 Jan 2009 07:34:04 -0000	1.31
+++ opal.spec	13 Jan 2009 01:43:44 -0000	1.32
@@ -1,12 +1,12 @@
 Name:		opal
 Summary:	Open Phone Abstraction Library
-Version:	3.4.2
-Release:	2%{?dist}
+Version:	3.4.4
+Release:	1%{?dist}
 URL:		http://www.opalvoip.org/
 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.4.2
+BuildRequires:	ptlib-devel = 2.4.4
 BuildRequires:	openldap-devel
 BuildRequires:	openssl-devel
 BuildRequires:	libtheora-devel
@@ -23,7 +23,7 @@
 Group:		Development/Libraries
 Requires:	opal = %{version}-%{release}
 Requires:	openssl-devel
-Requires:	ptlib-devel = 2.4.2
+Requires:	ptlib-devel = 2.4.4
 Requires:	pkgconfig
 
 %description devel
@@ -68,6 +68,9 @@
 %{_libdir}/pkgconfig/opal.pc
 
 %changelog
+* Tue Jan 13 2009 Peter Robinson <pbrobinson at gmail.com> - 3.4.4-1
+- Update to new stable release for ekiga 3.0.2
+
 * Mon Oct 20 2008 Peter Robinson <pbrobinson at gmail.com> - 3.4.2-2
 - Some merge review updates
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/opal/F-10/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	20 Oct 2008 19:41:44 -0000	1.15
+++ sources	13 Jan 2009 01:43:44 -0000	1.16
@@ -1 +1 @@
-a1d11099fa00d77a79dcfe513872e8dc  opal-3.4.2.tar.bz2
+01e76bc1261ab6c5b537387a81e7fdd9  opal-3.4.4.tar.bz2



From pbrobinson at fedoraproject.org  Tue Jan 13 01:44:46 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Tue, 13 Jan 2009 01:44:46 +0000 (UTC)
Subject: rpms/ekiga/F-10 .cvsignore, 1.15, 1.16 ekiga.spec, 1.62,
	1.63 sources, 1.17, 1.18
Message-ID: <20090113014446.5C88170129@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/ekiga/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17915

Modified Files:
	.cvsignore ekiga.spec sources 
Log Message:
- Update to 3.0.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ekiga/F-10/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	20 Oct 2008 19:58:02 -0000	1.15
+++ .cvsignore	13 Jan 2009 01:44:15 -0000	1.16
@@ -1 +1 @@
-ekiga-3.0.1.tar.bz2
+ekiga-3.0.2.tar.bz2


Index: ekiga.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ekiga/F-10/ekiga.spec,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- ekiga.spec	13 Nov 2008 23:15:29 -0000	1.62
+++ ekiga.spec	13 Jan 2009 01:44:16 -0000	1.63
@@ -1,7 +1,7 @@
 Summary:	A Gnome based SIP/H323 teleconferencing application
 Name:		ekiga
-Version:	3.0.1
-Release:	4%{?dist}
+Version:	3.0.2
+Release:	1%{?dist}
 URL:		http://www.ekiga.org/
 Source0:	ftp://ftp.gnome.org/pub/gnome/sources/ekiga/3.0/%{name}-%{version}.tar.bz2
 Patch0:		ekiga-fixlibnotify.patch
@@ -12,6 +12,8 @@
 Requires:	evolution-data-server
 Requires:	dbus
 Requires:	GConf2
+BuildRequires:	ptlib-devel = 2.4.4
+BuildRequires:	opal-devel = 3.4.4
 BuildRequires:	gtk2-devel >= 2.12
 BuildRequires:	GConf2-devel >= 2.2.0
 BuildRequires:	libgnomeui-devel >= 2.0
@@ -22,8 +24,6 @@
 BuildRequires:	dbus-glib-devel >= 0.70
 BuildRequires:	openldap-devel
 BuildRequires:	openssl-devel
-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
@@ -141,6 +141,9 @@
 %{_sysconfdir}/gconf/schemas/ekiga.schemas
 
 %changelog
+* Tue Jan 13 2009 Peter Robinson <pbrobinson at gmail.com> - 3.0.2-1
+- Update to 3.0.2
+
 * Mon Nov 13 2008 Peter Robinson <pbrobinson at gmail.com> - 3.0.1-4
 - Fix spec file error
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ekiga/F-10/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources	20 Oct 2008 19:58:02 -0000	1.17
+++ sources	13 Jan 2009 01:44:16 -0000	1.18
@@ -1 +1 @@
-69b4cb7ec2041c5b76861d161d993820  ekiga-3.0.1.tar.bz2
+8007925925f50b2ba89bd821f623ae32  ekiga-3.0.2.tar.bz2



From kevin at fedoraproject.org  Tue Jan 13 01:50:54 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 13 Jan 2009 01:50:54 +0000 (UTC)
Subject: rpms/xfconf/devel import.log, NONE, 1.1 xfconf-4.5.92-perl.patch,
	NONE, 
	1.1 xfconf.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090113015054.2D33B70129@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfconf/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19279/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log xfconf-4.5.92-perl.patch xfconf.spec 
Log Message:
Initial version checkin for fedora



--- NEW FILE import.log ---
xfconf-4_5_92-4_fc11:HEAD:xfconf-4.5.92-4.fc11.src.rpm:1231811349

xfconf-4.5.92-perl.patch:

--- NEW FILE xfconf-4.5.92-perl.patch ---
diff -Nur xfconf-4.5.92.orig/xfconf-perl/Makefile.in xfconf-4.5.92/xfconf-perl/Makefile.in
--- xfconf-4.5.92.orig/xfconf-perl/Makefile.in	2008-11-09 16:08:15.000000000 -0700
+++ xfconf-4.5.92/xfconf-perl/Makefile.in	2008-12-22 21:30:56.000000000 -0700
@@ -551,7 +551,7 @@
 @BUILD_PERL_BINDINGS_TRUE@	        test -f $$f || $(LN_S) $(srcdir)/$$f $$f; \
 @BUILD_PERL_BINDINGS_TRUE@	    done; \
 @BUILD_PERL_BINDINGS_TRUE@	fi
- at BUILD_PERL_BINDINGS_TRUE@	top_builddir="$(top_srcdir)" $(PERL) Makefile.PL
+ at BUILD_PERL_BINDINGS_TRUE@	top_builddir="$(top_srcdir)" $(PERL) Makefile.PL INSTALLDIRS="vendor"
 
 @BUILD_PERL_BINDINGS_TRUE at all-local: Makefile.perl
 @BUILD_PERL_BINDINGS_TRUE@	$(MAKE) -f Makefile.perl


--- NEW FILE xfconf.spec ---
Name:           xfconf
Version:        4.5.92
Release:        4%{?dist}
Summary:        Hierarchical configuration system for Xfce

Group:          Development/Libraries
License:        GPLv2
URL:            http://www.xfce.org/
Source0:        http://www.xfce.org/archive/xfce-%{version}/src/xfconf-%{version}.tar.bz2
Patch1:         xfconf-4.5.92-perl.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  glib2-devel
BuildRequires:  libxfce4util-devel = 4.5.92
BuildRequires:  dbus-devel
BuildRequires:  dbus-glib-devel
BuildRequires:  perl(ExtUtils::Depends) perl(ExtUtils::PkgConfig) perl(Glib)
BuildRequires:  gettext

Obsoletes: libxfce4mcs < 4.4.3-2
Obsoletes: xfce-mcs-manager < 4.4.3-2
Obsoletes: xfce-mcs-plugins < 4.4.3-2
Obsoletes: xfce-mcs-plugins-extra < 2.0-3
Obsoletes: xfce4-gsynaptics-mcs-plugin < 1.0.0-3

%description
Xfconf is a hierarchical (tree-like) configuration system where the
immediate child nodes of the root are called "channels".  All settings
beneath the channel nodes are called "properties."

%package devel
Summary: Developpment tools for xfconf
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
Requires: pkgconfig
Requires: dbus-devel
Requires: dbus-glib-devel
Requires: glib2-devel
Obsoletes: libxfce4mcs-devel < 4.4.3-2

%description devel
This package includes the libraries and header files you will need
to compile applications for xfconf.

%package perl
Summary: Perl modules for xfconf
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description perl
This package includes the perl modules and files you will need to 
interact with xfconf using perl. 

%prep
%setup -q

%patch1 -p1 

%build
%configure --disable-static --disable-rpath
sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool

make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

# remove unneeded la files. 
rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la
# remove perl temp file
rm -f $RPM_BUILD_ROOT/%{perl_archlib}/perllocal.pod
# remove unneeded dynloader bootstrap file
rm -f $RPM_BUILD_ROOT/%{perl_vendorarch}/auto/Xfce4/Xfconf/Xfconf.bs
# remove .packlist files. 
find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
# fix permissions on the .so file
chmod 755 $RPM_BUILD_ROOT/%{perl_vendorarch}/auto/Xfce4/Xfconf/Xfconf.so

%find_lang %{name}

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog NEWS TODO COPYING
%{_libdir}/lib*.so.*
%{_bindir}/xfconf-query
%{_bindir}/xfconfd
%{_datadir}/dbus-1/services/org.xfce.Xfconf.service
%{_datadir}/gtk-doc/html/xfconf

%files devel
%defattr(-,root,root,-)
%{_libdir}/lib*.so
%{_libdir}/pkgconfig/*.pc
%{_includedir}/xfce4/xfconf-0

%files perl
%defattr(-,root,root,-)
%{perl_vendorarch}/auto/*
%{perl_vendorarch}/Xfce4
%{_mandir}/man3/*.3*

%changelog
* Fri Jan 02 2009 Kevin Fenzi <kevin at tummy.com> - 4.5.92-4
- Add Obsoletes for mcs packages

* Mon Dec 22 2008 Kevin Fenzi <kevin at tummy.com> - 4.5.92-3
- Fixes for review ( bug 477732 )

* Mon Dec 22 2008 Kevin Fenzi <kevin at tummy.com> - 4.5.92-2
- Add gettext BuildRequires

* Sun Dec 21 2008 Kevin Fenzi <kevin at tummy.com> - 4.5.92-1
- Initial version for Fedora


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfconf/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	11 Jan 2009 16:58:13 -0000	1.1
+++ .cvsignore	13 Jan 2009 01:50:23 -0000	1.2
@@ -0,0 +1 @@
+xfconf-4.5.92.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfconf/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	11 Jan 2009 16:58:13 -0000	1.1
+++ sources	13 Jan 2009 01:50:23 -0000	1.2
@@ -0,0 +1 @@
+1ca682571554c7704f4c09398b74529d  xfconf-4.5.92.tar.bz2



From whot at fedoraproject.org  Tue Jan 13 01:54:46 2009
From: whot at fedoraproject.org (Peter Hutterer)
Date: Tue, 13 Jan 2009 01:54:46 +0000 (UTC)
Subject: rpms/xorg-x11-drv-evdev/F-10 .cvsignore, 1.20, 1.21 sources, 1.20, 
	1.21 xorg-x11-drv-evdev.spec, 1.39, 1.40
Message-ID: <20090113015446.E551270129@cvs1.fedora.phx.redhat.com>

Author: whot

Update of /cvs/pkgs/rpms/xorg-x11-drv-evdev/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20098

Modified Files:
	.cvsignore sources xorg-x11-drv-evdev.spec 
Log Message:
* Tue Jan 13 2009 Peter Hutterer <peter.hutterer at redhat.com> 2.1.1-1
- evdev 2.1.1




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-evdev/F-10/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- .cvsignore	19 Nov 2008 01:37:00 -0000	1.20
+++ .cvsignore	13 Jan 2009 01:54:16 -0000	1.21
@@ -1 +1 @@
-xf86-input-evdev-2.1.0.tar.bz2
+xf86-input-evdev-2.1.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-evdev/F-10/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources	19 Nov 2008 01:37:00 -0000	1.20
+++ sources	13 Jan 2009 01:54:16 -0000	1.21
@@ -1 +1 @@
-a6070ead29b2d81b5b386a96df2661b8  xf86-input-evdev-2.1.0.tar.bz2
+2f3995658e7f864c11c3b93216050cc4  xf86-input-evdev-2.1.1.tar.bz2


Index: xorg-x11-drv-evdev.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-evdev/F-10/xorg-x11-drv-evdev.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- xorg-x11-drv-evdev.spec	25 Nov 2008 22:56:40 -0000	1.39
+++ xorg-x11-drv-evdev.spec	13 Jan 2009 01:54:16 -0000	1.40
@@ -7,7 +7,7 @@
 
 Summary:    Xorg X11 evdev input driver
 Name:	    xorg-x11-drv-evdev
-Version:    2.1.0
+Version:    2.1.1
 Release:    1%{?dist}
 URL:	    http://www.x.org
 License:    MIT
@@ -68,6 +68,9 @@
 %{sdkdir}/evdev-properties.h
 
 %changelog
+* Tue Jan 13 2009 Peter Hutterer <peter.hutterer at redhat.com> 2.1.1-1
+- evdev 2.1.1
+
 * Wed Nov 26 2008 Peter Hutterer <peter.hutterer at redhat.com>
 - remove now un-used patches
 



From kevin at fedoraproject.org  Tue Jan 13 02:14:45 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 13 Jan 2009 02:14:45 +0000 (UTC)
Subject: rpms/libxfcegui4/devel sources, 1.10, 1.11 .cvsignore, 1.10,
	1.11 libxfcegui4.spec, 1.25, 1.26
Message-ID: <20090113021445.8681F70129@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/libxfcegui4/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22332

Modified Files:
	sources .cvsignore libxfcegui4.spec 
Log Message:
Update to 4.5.92



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libxfcegui4/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	27 Oct 2008 12:06:42 -0000	1.10
+++ sources	13 Jan 2009 02:14:15 -0000	1.11
@@ -1 +1 @@
-fc6f5a0ab478fc6840e8a19737d0b748  libxfcegui4-4.4.3.tar.bz2
+f4c0e9740b0e1bb04c66ea1d263ce013  libxfcegui4-4.5.92.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libxfcegui4/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	27 Oct 2008 12:06:41 -0000	1.10
+++ .cvsignore	13 Jan 2009 02:14:15 -0000	1.11
@@ -1 +1 @@
-libxfcegui4-4.4.3.tar.bz2
+libxfcegui4-4.5.92.tar.bz2


Index: libxfcegui4.spec
===================================================================
RCS file: /cvs/extras/rpms/libxfcegui4/devel/libxfcegui4.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- libxfcegui4.spec	27 Oct 2008 12:06:42 -0000	1.25
+++ libxfcegui4.spec	13 Jan 2009 02:14:15 -0000	1.26
@@ -1,6 +1,6 @@
 Summary: GTK widgets for Xfce
 Name: libxfcegui4
-Version: 4.4.3
+Version: 4.5.92
 Release: 1%{?dist}
 License: LGPLv2+
 URL: http://www.xfce.org/
@@ -16,6 +16,11 @@
 BuildRequires: imake
 BuildRequires: libXt-devel
 BuildRequires: gettext
+BuildRequires: xfconf-devel
+BuildRequires: startup-notification-devel
+BuildRequires: libglade2-devel
+BuildRequires: glade3-libgladeui-devel
+BuildRequires: perl(XML::Parser)
 
 %description
 The package includes various gtk widgets for Xfce.
@@ -37,6 +42,8 @@
 
 %build
 %configure --enable-xinerama --disable-static
+sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
+sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
 
 make %{?_smp_mflags}
 
@@ -45,6 +52,8 @@
 make install DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir}
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 rm -f $RPM_BUILD_ROOT%{_libdir}/xfce4/modules/*.la
+rm -f $RPM_BUILD_ROOT%{_libdir}/libglade/*/*.la
+rm -f $RPM_BUILD_ROOT%{_libdir}/glade3/*/*.la
 
 %find_lang %{name}
 
@@ -65,17 +74,26 @@
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING 
 %{_libdir}/lib*.so.*
+%{_libdir}/libglade/*/lib*.so
 %{_datadir}/icons/hicolor/*/*/*.png
 %{_datadir}/icons/hicolor/scalable/apps/xfce-filemanager.svg
+%{_sysconfdir}/xdg/xfce4
 
 %files devel
 %defattr(-, root,root,-)
 %{_libdir}/lib*.so
+%{_libdir}/glade3/modules/lib*.so
 %{_libdir}/pkgconfig/*.pc
 %{_includedir}/xfce4/*
 %{_datadir}/gtk-doc/html/libxfcegui4/
+%{_datadir}/glade3/catalogs/xfce4.xml
+%{_datadir}/glade3/catalogs/xfce4.xml.in
+%{_datadir}/glade3/pixmaps/hicolor/*/actions/*
 
 %changelog
+* Sun Dec 21 2008 Kevin Fenzi <kevin at tummy.com> - 4.5.92-1
+- Update to 4.5.92
+
 * Mon Oct 27 2008 Christoph Wickert <cwickert at fedoraproject.org> - 4.4.3-1
 - Update to 4.4.3
 



From kevin at fedoraproject.org  Tue Jan 13 02:25:01 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 13 Jan 2009 02:25:01 +0000 (UTC)
Subject: rpms/libxfce4menu/devel import.log, NONE, 1.1 libxfce4menu.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090113022501.B655770129@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/libxfce4menu/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23954/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log libxfce4menu.spec 
Log Message:
Initial version for fedora



--- NEW FILE import.log ---
libxfce4menu-4_5_92-1_fc11:HEAD:libxfce4menu-4.5.92-1.fc11.src.rpm:1231813355


--- NEW FILE libxfce4menu.spec ---
Name:           libxfce4menu
Version:        4.5.92
Release:        1%{?dist}
Summary:        A freedesktop.org compliant menu implementation for Xfce

Group:          System Environment/Libraries
License:        GPLv2+
URL:            http://www.xfce.org/
Source0:        http://www.xfce.org/archive/xfce-%{version}/src/libxfce4menu-%{version}.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires: gettext
BuildRequires: glib2-devel
BuildRequires: gtk2-devel
BuildRequires: libxfce4util-devel >= 4.5.92

%description
libxfce4menu is a freedesktop.org compliant menu library written for Xfce. 
It implements the Desktop Menu Specification version 1.0

%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 $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'

%find_lang %{name}-0.1

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files -f %{name}-0.1.lang
%defattr(-,root,root,-)
%doc AUTHORS HACKING COPYING NEWS README TODO
%{_libdir}/*.so.*

%files devel
%defattr(-,root,root,-)
%{_includedir}/*
%{_libdir}/*.so
%{_datadir}/gtk-doc/html/libxfce4menu
%{_libdir}/pkgconfig/%{name}-0.1.pc

%changelog
* Tue Dec 23 2008 Kevin Fenzi <kevin at tummy.com> - 4.5.92-1
- Initial packaging for Fedora


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libxfce4menu/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	28 Dec 2008 19:03:47 -0000	1.1
+++ .cvsignore	13 Jan 2009 02:24:31 -0000	1.2
@@ -0,0 +1 @@
+libxfce4menu-4.5.92.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libxfce4menu/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	28 Dec 2008 19:03:47 -0000	1.1
+++ sources	13 Jan 2009 02:24:31 -0000	1.2
@@ -0,0 +1 @@
+4a92cbc2d568181f688b971670946e92  libxfce4menu-4.5.92.tar.bz2



From alexlan at fedoraproject.org  Tue Jan 13 02:29:59 2009
From: alexlan at fedoraproject.org (Alex Lancaster)
Date: Tue, 13 Jan 2009 02:29:59 +0000 (UTC)
Subject: rpms/libopensync-plugin-python/devel
	libopensync-plugin-python-python26.patch, NONE,
	1.1 libopensync-plugin-python.spec, 1.15, 1.16
Message-ID: <20090113022959.110F670129@cvs1.fedora.phx.redhat.com>

Author: alexlan

Update of /cvs/pkgs/rpms/libopensync-plugin-python/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24724

Modified Files:
	libopensync-plugin-python.spec 
Added Files:
	libopensync-plugin-python-python26.patch 
Log Message:
* Mon Jan 12 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 0.36-3
- Copy patch from libopensync, which is the same as upstream changeset
  for Python 2.6 (http://www.opensync.org/changeset/4383)


libopensync-plugin-python-python26.patch:

--- NEW FILE libopensync-plugin-python-python26.patch ---
Index: /branches/3rd-party-cmake-modules/modules/FindPythonLibs.cmake
===================================================================
--- /branches/3rd-party-cmake-modules/modules/FindPythonLibs.cmake (revision 2767)
+++ /branches/3rd-party-cmake-modules/modules/FindPythonLibs.cmake (revision 4383)
@@ -18,6 +18,8 @@
 IF(WIN32)
   FIND_LIBRARY(PYTHON_DEBUG_LIBRARY
-    NAMES python25_d python24_d python23_d python22_d python21_d python20_d python
+    NAMES python26_d python25_d python24_d python23_d python22_d python21_d python20_d python
     PATHS
+    [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.6\\InstallPath]/libs/Debug
+    [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.6\\InstallPath]/libs
     [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.5\\InstallPath]/libs/Debug
     [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.5\\InstallPath]/libs
@@ -40,5 +42,6 @@
 
 FIND_LIBRARY(PYTHON_LIBRARY ${PREFERRED_PYTHON_VERSION}
-  NAMES python25 python2.5
+  NAMES python26 python2.6
+        python25 python2.5
         python24 python2.4
         python23 python2.3
@@ -50,4 +53,5 @@
 
   PATHS
+    [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.6\\InstallPath]/libs
     [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.5\\InstallPath]/libs
     [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.4\\InstallPath]/libs
@@ -60,4 +64,5 @@
 
   PATH_SUFFIXES
+    python2.6/config
     python2.5/config
     python2.4/config
@@ -78,5 +83,5 @@
 IF(Python_FRAMEWORKS)
   IF(NOT PYTHON_INCLUDE_PATH)
-    FOREACH(version 2.5 2.4 2.3 2.2 2.1 2.0 1.6 1.5)
+    FOREACH(version 2.6 2.5 2.4 2.3 2.2 2.1 2.0 1.6 1.5)
       FOREACH(dir ${Python_FRAMEWORKS})
         SET(PYTHON_FRAMEWORK_INCLUDES ${PYTHON_FRAMEWORK_INCLUDES}
@@ -92,4 +97,5 @@
   PATHS
     ${PYTHON_FRAMEWORK_INCLUDES}
+    [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.6\\InstallPath]/include
     [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.5\\InstallPath]/include
     [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.4\\InstallPath]/include
@@ -103,4 +109,5 @@
   PATH_SUFFIXES
     ${PREFERRED_PYTHON_VERSION}
+    python2.6
     python2.5
     python2.4


Index: libopensync-plugin-python.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libopensync-plugin-python/devel/libopensync-plugin-python.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- libopensync-plugin-python.spec	1 Dec 2008 05:03:50 -0000	1.15
+++ libopensync-plugin-python.spec	13 Jan 2009 02:29:28 -0000	1.16
@@ -1,12 +1,13 @@
 Name:           libopensync-plugin-python
 Version:        0.36
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Python plugin for libopensync
 
 Group:          System Environment/Libraries
 License:        LGPLv2+
 URL:            http://www.opensync.org
 Source0:        http://www.opensync.org/download/releases/%{version}/%{name}-%{version}.tar.bz2
+Patch0:         %{name}-python26.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  cmake
@@ -18,6 +19,8 @@
 
 %prep
 %setup -q
+cd cmake 
+%patch0 -p3
 
 %build
 mkdir build
@@ -40,6 +43,10 @@
 %{_libdir}/opensync-1.0/python-plugins/sample*
 
 %changelog
+* Mon Jan 12 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 0.36-3
+- Copy patch from libopensync, which is the same as upstream changeset
+  for Python 2.6 (http://www.opensync.org/changeset/4383)
+
 * Sun Nov 30 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 0.36-2
 - Rebuild for Python 2.6
 



From pkgdb at fedoraproject.org  Tue Jan 13 02:31:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 02:31:17 +0000
Subject: [pkgdb] gpsbabel ownership updated
Message-ID: <20090113023117.7E9C02081F4@bastion.fedora.phx.redhat.com>

Package gpsbabel in Fedora devel is now owned by silfreed

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gpsbabel



From pkgdb at fedoraproject.org  Tue Jan 13 02:31:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 02:31:24 +0000
Subject: [pkgdb] gpsbabel ownership updated
Message-ID: <20090113023124.0BF952081FC@bastion.fedora.phx.redhat.com>

Package gpsbabel in Fedora EPEL 5 is now owned by silfreed

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gpsbabel



From pkgdb at fedoraproject.org  Tue Jan 13 02:31:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 02:31:25 +0000
Subject: [pkgdb] gpsbabel ownership updated
Message-ID: <20090113023125.C66B5208207@bastion.fedora.phx.redhat.com>

Package gpsbabel in Fedora EPEL 5 was orphaned by silfreed

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gpsbabel



From pkgdb at fedoraproject.org  Tue Jan 13 02:31:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 02:31:33 +0000
Subject: [pkgdb] gpsbabel ownership updated
Message-ID: <20090113023133.7D6842081FB@bastion.fedora.phx.redhat.com>

Package gpsbabel in Fedora 8 is now owned by silfreed

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gpsbabel



From pkgdb at fedoraproject.org  Tue Jan 13 02:31:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 02:31:36 +0000
Subject: [pkgdb] gpsbabel ownership updated
Message-ID: <20090113023136.48C4F208468@bastion.fedora.phx.redhat.com>

Package gpsbabel in Fedora 8 was orphaned by silfreed

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gpsbabel



From pkgdb at fedoraproject.org  Tue Jan 13 02:31:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 02:31:28 +0000
Subject: [pkgdb] gpsbabel ownership updated
Message-ID: <20090113023128.9A32F208457@bastion.fedora.phx.redhat.com>

Package gpsbabel in Fedora EPEL 5 is now owned by silfreed

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gpsbabel



From pkgdb at fedoraproject.org  Tue Jan 13 02:31:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 02:31:39 +0000
Subject: [pkgdb] gpsbabel: silfreed has given up watchcommits
Message-ID: <20090113023139.4111620846E@bastion.fedora.phx.redhat.com>

silfreed has given up the watchcommits acl on gpsbabel (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gpsbabel



From pkgdb at fedoraproject.org  Tue Jan 13 02:31:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 02:31:38 +0000
Subject: [pkgdb] gpsbabel: silfreed has given up watchbugzilla
Message-ID: <20090113023138.3FEB720846B@bastion.fedora.phx.redhat.com>

silfreed has given up the watchbugzilla acl on gpsbabel (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gpsbabel



From pkgdb at fedoraproject.org  Tue Jan 13 02:31:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 02:31:40 +0000
Subject: [pkgdb] gpsbabel: silfreed has given up commit
Message-ID: <20090113023140.5DA9B208471@bastion.fedora.phx.redhat.com>

silfreed has given up the commit acl on gpsbabel (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gpsbabel



From pkgdb at fedoraproject.org  Tue Jan 13 02:31:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 02:31:44 +0000
Subject: [pkgdb] gpsbabel ownership updated
Message-ID: <20090113023144.C8E8F2081F4@bastion.fedora.phx.redhat.com>

Package gpsbabel in Fedora 9 is now owned by silfreed

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gpsbabel



From pkgdb at fedoraproject.org  Tue Jan 13 02:31:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 02:31:46 +0000
Subject: [pkgdb] gpsbabel ownership updated
Message-ID: <20090113023146.96D2C208207@bastion.fedora.phx.redhat.com>

Package gpsbabel in Fedora 10 is now owned by silfreed

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gpsbabel



From pkgdb at fedoraproject.org  Tue Jan 13 02:32:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 02:32:04 +0000
Subject: [pkgdb] gpsbabel: silfreed has requested approveacls
Message-ID: <20090113023204.8AC362081FB@bastion.fedora.phx.redhat.com>

silfreed has requested the approveacls acl on gpsbabel (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gpsbabel



From pkgdb at fedoraproject.org  Tue Jan 13 02:32:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 02:32:08 +0000
Subject: [pkgdb] gpsbabel: silfreed has given up watchbugzilla
Message-ID: <20090113023208.EE77D208458@bastion.fedora.phx.redhat.com>

silfreed has given up the watchbugzilla acl on gpsbabel (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gpsbabel



From pkgdb at fedoraproject.org  Tue Jan 13 02:32:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 02:32:09 +0000
Subject: [pkgdb] gpsbabel: silfreed has given up watchcommits
Message-ID: <20090113023209.9BEDC208468@bastion.fedora.phx.redhat.com>

silfreed has given up the watchcommits acl on gpsbabel (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gpsbabel



From pkgdb at fedoraproject.org  Tue Jan 13 02:32:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 02:32:11 +0000
Subject: [pkgdb] gpsbabel: silfreed has given up commit
Message-ID: <20090113023212.0481920846B@bastion.fedora.phx.redhat.com>

silfreed has given up the commit acl on gpsbabel (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gpsbabel



From pkgdb at fedoraproject.org  Tue Jan 13 02:32:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 02:32:13 +0000
Subject: [pkgdb] gpsbabel: silfreed has given up commit
Message-ID: <20090113023213.A717220846E@bastion.fedora.phx.redhat.com>

silfreed has given up the commit acl on gpsbabel (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gpsbabel



From pkgdb at fedoraproject.org  Tue Jan 13 02:32:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 02:32:15 +0000
Subject: [pkgdb] gpsbabel: silfreed has given up watchbugzilla
Message-ID: <20090113023215.F1CD0208203@bastion.fedora.phx.redhat.com>

silfreed has given up the watchbugzilla acl on gpsbabel (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gpsbabel



From pkgdb at fedoraproject.org  Tue Jan 13 02:32:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 02:32:17 +0000
Subject: [pkgdb] gpsbabel: silfreed has given up watchcommits
Message-ID: <20090113023217.766DC208472@bastion.fedora.phx.redhat.com>

silfreed has given up the watchcommits acl on gpsbabel (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gpsbabel



From pkgdb at fedoraproject.org  Tue Jan 13 02:32:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 02:32:16 +0000
Subject: [pkgdb] gpsbabel: silfreed has given up approveacls
Message-ID: <20090113023216.4EA87208207@bastion.fedora.phx.redhat.com>

silfreed has given up the approveacls acl on gpsbabel (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gpsbabel



From pkgdb at fedoraproject.org  Tue Jan 13 02:32:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 02:32:24 +0000
Subject: [pkgdb] gpsbabel: silfreed has given up watchbugzilla
Message-ID: <20090113023224.5D12B208477@bastion.fedora.phx.redhat.com>

silfreed has given up the watchbugzilla acl on gpsbabel (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gpsbabel



From pkgdb at fedoraproject.org  Tue Jan 13 02:32:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 02:32:24 +0000
Subject: [pkgdb] gpsbabel: silfreed has given up commit
Message-ID: <20090113023224.E88552081FC@bastion.fedora.phx.redhat.com>

silfreed has given up the commit acl on gpsbabel (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gpsbabel



From pkgdb at fedoraproject.org  Tue Jan 13 02:32:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 02:32:25 +0000
Subject: [pkgdb] gpsbabel: silfreed has given up watchcommits
Message-ID: <20090113023225.6585C20847A@bastion.fedora.phx.redhat.com>

silfreed has given up the watchcommits acl on gpsbabel (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gpsbabel



From pkgdb at fedoraproject.org  Tue Jan 13 02:32:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 02:32:35 +0000
Subject: [pkgdb] gpsbabel: silfreed has given up watchbugzilla
Message-ID: <20090113023235.92833208481@bastion.fedora.phx.redhat.com>

silfreed has given up the watchbugzilla acl on gpsbabel (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gpsbabel



From pkgdb at fedoraproject.org  Tue Jan 13 02:32:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 02:32:36 +0000
Subject: [pkgdb] gpsbabel: silfreed has given up watchcommits
Message-ID: <20090113023236.88C11208467@bastion.fedora.phx.redhat.com>

silfreed has given up the watchcommits acl on gpsbabel (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gpsbabel



From pkgdb at fedoraproject.org  Tue Jan 13 02:32:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 02:32:37 +0000
Subject: [pkgdb] gpsbabel: silfreed has given up commit
Message-ID: <20090113023237.2AF99208485@bastion.fedora.phx.redhat.com>

silfreed has given up the commit acl on gpsbabel (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gpsbabel



From pkgdb at fedoraproject.org  Tue Jan 13 02:32:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 02:32:45 +0000
Subject: [pkgdb] gpsbabel: silfreed has given up watchbugzilla
Message-ID: <20090113023245.7BC84208469@bastion.fedora.phx.redhat.com>

silfreed has given up the watchbugzilla acl on gpsbabel (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gpsbabel



From pkgdb at fedoraproject.org  Tue Jan 13 02:32:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 02:32:46 +0000
Subject: [pkgdb] gpsbabel: silfreed has given up watchcommits
Message-ID: <20090113023246.EDF0B20846C@bastion.fedora.phx.redhat.com>

silfreed has given up the watchcommits acl on gpsbabel (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gpsbabel



From pkgdb at fedoraproject.org  Tue Jan 13 02:32:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 02:32:51 +0000
Subject: [pkgdb] gpsbabel: silfreed has given up commit
Message-ID: <20090113023251.217FB208203@bastion.fedora.phx.redhat.com>

silfreed has given up the commit acl on gpsbabel (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gpsbabel



From pkgdb at fedoraproject.org  Tue Jan 13 02:33:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 02:33:04 +0000
Subject: [pkgdb] gpsbabel had acl change status
Message-ID: <20090113023304.DC4CF208474@bastion.fedora.phx.redhat.com>

silfreed has set the commit acl on gpsbabel (Fedora 10) to Obsolete for silfreed

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gpsbabel



From whot at fedoraproject.org  Tue Jan 13 02:36:22 2009
From: whot at fedoraproject.org (Peter Hutterer)
Date: Tue, 13 Jan 2009 02:36:22 +0000 (UTC)
Subject: rpms/xorg-x11-drv-evdev/devel .cvsignore, 1.23, 1.24 sources, 1.23, 
	1.24 xorg-x11-drv-evdev.spec, 1.39, 1.40
Message-ID: <20090113023622.480E270129@cvs1.fedora.phx.redhat.com>

Author: whot

Update of /cvs/pkgs/rpms/xorg-x11-drv-evdev/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25499

Modified Files:
	.cvsignore sources xorg-x11-drv-evdev.spec 
Log Message:
* Tue Jan 13 2009 Peter Hutterer <peter.hutterer at redhat.com> 2.1.1-1
- evdev 2.1.1
- update Requires to 1.5.99.1 to make sure the ABI is right.




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-evdev/devel/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- .cvsignore	19 Nov 2008 00:49:59 -0000	1.23
+++ .cvsignore	13 Jan 2009 02:35:51 -0000	1.24
@@ -1 +1 @@
-xf86-input-evdev-2.1.0.tar.bz2
+xf86-input-evdev-2.1.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-evdev/devel/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sources	19 Nov 2008 00:49:59 -0000	1.23
+++ sources	13 Jan 2009 02:35:51 -0000	1.24
@@ -1 +1 @@
-a6070ead29b2d81b5b386a96df2661b8  xf86-input-evdev-2.1.0.tar.bz2
+2f3995658e7f864c11c3b93216050cc4  xf86-input-evdev-2.1.1.tar.bz2


Index: xorg-x11-drv-evdev.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-evdev/devel/xorg-x11-drv-evdev.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- xorg-x11-drv-evdev.spec	22 Dec 2008 03:44:50 -0000	1.39
+++ xorg-x11-drv-evdev.spec	13 Jan 2009 02:35:51 -0000	1.40
@@ -6,8 +6,8 @@
 
 Summary:    Xorg X11 evdev input driver
 Name:	    xorg-x11-drv-evdev
-Version:    2.1.0
-Release:    3%{?dist}
+Version:    2.1.1
+Release:    1%{?dist}
 URL:	    http://www.x.org
 License:    MIT
 Group:	    User Interface/X Hardware Support
@@ -20,10 +20,10 @@
 ExcludeArch: s390 s390x
 
 BuildRequires: autoconf automake libtool
-BuildRequires: xorg-x11-server-sdk >= 1.3.0.0-6
+BuildRequires: xorg-x11-server-sdk >= 1.5.99.1
 BuildRequires: libxkbfile-devel
 
-Requires:  xorg-x11-server-Xorg >= 1.3.0.0-6
+Requires:  xorg-x11-server-Xorg >= 1.5.99.1
 Requires:  xkeyboard-config >= 1.4-1
 
 %description 
@@ -72,6 +72,10 @@
 
 
 %changelog
+* Tue Jan 13 2009 Peter Hutterer <peter.hutterer at redhat.com> 2.1.1-1
+- evdev 2.1.1
+- update Requires to 1.5.99.1 to make sure the ABI is right.
+
 * Mon Dec 22 2008 Dave Airlie <airlied at redhat.com> 2.1.0-3
 - Rebuild again - latest tag wasn't in buildroot
 



From kevin at fedoraproject.org  Tue Jan 13 02:48:03 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 13 Jan 2009 02:48:03 +0000 (UTC)
Subject: rpms/exo/devel exo.spec, 1.28, 1.29 sources, 1.7, 1.8 .cvsignore,
	1.7, 1.8 exo-0.3.4-fix_broken_regexp.patch, 1.1,
	NONE exo-0.3.4-gcc_hardening_fix.patch, 1.1, NONE
Message-ID: <20090113024803.D406170129@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/exo/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26854

Modified Files:
	exo.spec sources .cvsignore 
Removed Files:
	exo-0.3.4-fix_broken_regexp.patch 
	exo-0.3.4-gcc_hardening_fix.patch 
Log Message:
Update to 0.3.92
Add hal-devel Requires to devel package



Index: exo.spec
===================================================================
RCS file: /cvs/extras/rpms/exo/devel/exo.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- exo.spec	29 Nov 2008 16:36:54 -0000	1.28
+++ exo.spec	13 Jan 2009 02:47:33 -0000	1.29
@@ -2,16 +2,14 @@
 
 Summary: Application library for the Xfce desktop environment
 Name: exo
-Version: 0.3.4
-Release: 4%{?dist}
+Version: 0.3.92
+Release: 1%{?dist}
 # libexo-hal exo-helper mount-notify and exo-mount are all GPLv2+
 # everything else is LGPLv2+
 License: LGPLv2+ and GPLv2+
 URL: http://xfce.org/
-Source0: http://www.xfce.org/archive/xfce-4.4.2/src/exo-%{version}.tar.bz2
+Source0: http://www.xfce.org/archive/xfce-4.5.92/src/exo-%{version}.tar.bz2
 Patch0: exo-0.3.0-x86_64-build.patch
-Patch1: exo-0.3.4-fix_broken_regexp.patch
-Patch2: exo-0.3.4-gcc_hardening_fix.patch
 Group: System Environment/Libraries
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: dbus-glib >= 0.22
@@ -23,9 +21,10 @@
 BuildRequires: imake
 BuildRequires: libXt-devel
 BuildRequires: perl-URI
-BuildRequires: xfce-mcs-manager-devel
 BuildRequires: libxfce4util-devel
 BuildRequires: hal-devel libnotify-devel
+BuildRequires: intltool >= 0.31
+BuildRequires: chrpath
 
 %description
 Extension library for Xfce, targeted at application development.
@@ -35,6 +34,7 @@
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
 Requires: libxfce4util-devel
+Requires: hal-devel
 
 %description devel
 Static libraries and header files for the exo library.
@@ -51,11 +51,10 @@
 %setup -q
 
 %patch0 -p1 -b .x86_64-build
-%patch1 -p1 -b .broken-regex
-%patch2 -p1 -b .gcc-hardening
 
 %build
 %configure --enable-gtk-doc --disable-static
+
 make %{?_smp_mflags}
 
 %install
@@ -65,6 +64,12 @@
 rm -f $RPM_BUILD_ROOT/%{_libdir}/xfce4/mcs-plugins/*.la
 rm -f $RPM_BUILD_ROOT/%{python_sitearch}/*.la
 
+chrpath --delete $RPM_BUILD_ROOT%{_bindir}/exo-mount
+chrpath --delete $RPM_BUILD_ROOT%{_bindir}/exo-desktop-item-edit
+chrpath --delete $RPM_BUILD_ROOT%{_bindir}/exo-open
+chrpath --delete $RPM_BUILD_ROOT%{_libexecdir}/exo-helper-0.3
+chrpath --delete $RPM_BUILD_ROOT%{_libdir}/python*/site-packages/exo-0.3/_exo.so
+
 %find_lang libexo-0.3
 
 %clean
@@ -106,7 +111,6 @@
 %{_libexecdir}/exo-mount-notify-0.3
 %{_libexecdir}/exo-compose-mail-0.3
 %{_datadir}/applications/exo-preferred-applications.desktop
-%{_libdir}/xfce4/mcs-plugins/exo-preferred-applications-settings.so
 %{_datadir}/icons/hicolor/24x24/apps/preferences-desktop-default-applications.png
 %{_datadir}/icons/hicolor/48x48/apps/preferences-desktop-default-applications.png
 %{_datadir}/icons/hicolor/48x48/apps/applications-internet.png
@@ -127,6 +131,12 @@
 %{python_sitearch}/pyexo.*
 
 %changelog
+* Tue Dec 23 2008 Kevin Fenzi <kevin at tummy.com> 0.3.92-1
+- Update to 0.3.92
+
+* Tue Dec 16 2008 Kevin Fenzi <kevin at tummy.com> 0.3.4-5
+- Add hal-devel Requires to devel package. 
+
 * Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 0.3.4-4
 - Rebuild for Python 2.6
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/exo/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	3 Dec 2007 05:21:43 -0000	1.7
+++ sources	13 Jan 2009 02:47:33 -0000	1.8
@@ -1 +1 @@
-7a1af943b1df32b6f89ae91823118a22  exo-0.3.4.tar.bz2
+42f7e60ce8d8a6ba233a91c62a5d78bb  exo-0.3.92.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/exo/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	3 Dec 2007 05:21:43 -0000	1.7
+++ .cvsignore	13 Jan 2009 02:47:33 -0000	1.8
@@ -1 +1 @@
-exo-0.3.4.tar.bz2
+exo-0.3.92.tar.bz2


--- exo-0.3.4-fix_broken_regexp.patch DELETED ---


--- exo-0.3.4-gcc_hardening_fix.patch DELETED ---



From pkgdb at fedoraproject.org  Tue Jan 13 03:04:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 03:04:50 +0000
Subject: [pkgdb] ntop ownership updated
Message-ID: <20090113030450.B4E392081FB@bastion.fedora.phx.redhat.com>

Package ntop in Fedora EPEL 5 is now owned by huzaifas

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ntop



From pkgdb at fedoraproject.org  Tue Jan 13 03:04:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 03:04:59 +0000
Subject: [pkgdb] ntop: huzaifas has requested watchbugzilla
Message-ID: <20090113030459.57D38208457@bastion.fedora.phx.redhat.com>

huzaifas has requested the watchbugzilla acl on ntop (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ntop



From pkgdb at fedoraproject.org  Tue Jan 13 03:04:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 03:04:58 +0000
Subject: [pkgdb] ntop: huzaifas has requested watchcommits
Message-ID: <20090113030458.8166F208207@bastion.fedora.phx.redhat.com>

huzaifas has requested the watchcommits acl on ntop (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ntop



From pkgdb at fedoraproject.org  Tue Jan 13 03:04:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 03:04:59 +0000
Subject: [pkgdb] ntop: huzaifas has requested commit
Message-ID: <20090113030459.E4E2E208467@bastion.fedora.phx.redhat.com>

huzaifas has requested the commit acl on ntop (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ntop



From pkgdb at fedoraproject.org  Tue Jan 13 03:05:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 03:05:00 +0000
Subject: [pkgdb] ntop: huzaifas has requested approveacls
Message-ID: <20090113030500.6D0CC208469@bastion.fedora.phx.redhat.com>

huzaifas has requested the approveacls acl on ntop (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ntop



From pkgdb at fedoraproject.org  Tue Jan 13 03:05:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 03:05:41 +0000
Subject: [pkgdb] ntop had acl change status
Message-ID: <20090113030541.34C17208456@bastion.fedora.phx.redhat.com>

huzaifas has set the watchbugzilla acl on ntop (Fedora EPEL 5) to Approved for huzaifas

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ntop



From pkgdb at fedoraproject.org  Tue Jan 13 03:05:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 03:05:44 +0000
Subject: [pkgdb] ntop had acl change status
Message-ID: <20090113030544.05A98208469@bastion.fedora.phx.redhat.com>

huzaifas has set the watchcommits acl on ntop (Fedora EPEL 5) to Approved for huzaifas

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ntop



From pkgdb at fedoraproject.org  Tue Jan 13 03:05:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 03:05:46 +0000
Subject: [pkgdb] ntop had acl change status
Message-ID: <20090113030546.8C19F208203@bastion.fedora.phx.redhat.com>

huzaifas has set the approveacls acl on ntop (Fedora EPEL 5) to Approved for huzaifas

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ntop



From pkgdb at fedoraproject.org  Tue Jan 13 03:05:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 03:05:47 +0000
Subject: [pkgdb] ntop had acl change status
Message-ID: <20090113030547.4D5FB20846B@bastion.fedora.phx.redhat.com>

huzaifas has set the commit acl on ntop (Fedora EPEL 5) to Approved for huzaifas

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ntop



From mbarnes at fedoraproject.org  Tue Jan 13 03:06:49 2009
From: mbarnes at fedoraproject.org (Matthew Barnes)
Date: Tue, 13 Jan 2009 03:06:49 +0000 (UTC)
Subject: rpms/libsoup/F-10 .cvsignore, 1.42, 1.43 libsoup.spec, 1.77,
	1.78 sources, 1.42, 1.43
Message-ID: <20090113030649.2F2C470129@cvs1.fedora.phx.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/libsoup/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29221

Modified Files:
	.cvsignore libsoup.spec sources 
Log Message:

* Mon Jan 12 2009 Matthew Barnes <mbarnes2redhat.com> - 2.24.3-1
- Update to 2.24.3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libsoup/F-10/.cvsignore,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- .cvsignore	25 Nov 2008 18:49:44 -0000	1.42
+++ .cvsignore	13 Jan 2009 03:06:18 -0000	1.43
@@ -1 +1 @@
-libsoup-2.24.2.1.tar.bz2
+libsoup-2.24.3.tar.bz2


Index: libsoup.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libsoup/F-10/libsoup.spec,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- libsoup.spec	25 Nov 2008 18:49:44 -0000	1.77
+++ libsoup.spec	13 Jan 2009 03:06:18 -0000	1.78
@@ -3,7 +3,7 @@
 ### Abstract ###
 
 Name: libsoup
-Version: 2.24.2.1
+Version: 2.24.3
 Release: 1%{?dist}
 License: LGPLv2
 Group: Development/Libraries
@@ -80,6 +80,9 @@
 %{_datadir}/gtk-doc/html/%{name}-2.4
 
 %changelog
+* Mon Jan 12 2009 Matthew Barnes <mbarnes2redhat.com> - 2.24.3-1
+- Update to 2.24.3
+
 * Tue Nov 25 2008 Matthias Clasen  <mclasen at redhat.com> - 2.24.2.1-1
 - Update to 2.24.2.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libsoup/F-10/sources,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- sources	25 Nov 2008 18:49:44 -0000	1.42
+++ sources	13 Jan 2009 03:06:18 -0000	1.43
@@ -1 +1 @@
-27409ea1a93e45668e1b999f162ee4d0  libsoup-2.24.2.1.tar.bz2
+118967f097a7e1e9d5023f1f06e0b65a  libsoup-2.24.3.tar.bz2



From kevin at fedoraproject.org  Tue Jan 13 03:09:36 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 13 Jan 2009 03:09:36 +0000 (UTC)
Subject: rpms/xfce4-settings/devel import.log, NONE, 1.1 xfce4-settings.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090113030936.4B6D870129@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce4-settings/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29779/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log xfce4-settings.spec 
Log Message:
Initial version for fedora



--- NEW FILE import.log ---
xfce4-settings-4_5_92-2_fc11:HEAD:xfce4-settings-4.5.92-2.fc11.src.rpm:1231816081


--- NEW FILE xfce4-settings.spec ---
Name:           xfce4-settings
Version:        4.5.92
Release:        2%{?dist}
Summary:        Settings Manager for Xfce

Group:          User Interface/Desktops
# xfce4-settings-helper is GPLv2 only. 
License:        GPLv2+ and GPLv2
URL:            http://www.xfce.org/
Source0:        http://www.xfce.org/archive/xfce-%{version}/src/xfce4-settings-%{version}.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires: gettext
BuildRequires: exo-devel >= 0.3.92
BuildRequires: libxfcegui4-devel >= 4.5.92
BuildRequires: libglade2-devel
BuildRequires: libwnck-devel
BuildRequires: desktop-file-utils >= 0.7
BuildRequires: libnotify-devel
BuildRequires: libcanberra-devel
BuildRequires: libxklavier-devel

%description
This package includes the settings manager applications for the Xfce desktop. 

%prep
%setup -q


%build
%configure --enable-sound-settings
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

desktop-file-install --vendor "fedora"                          \
        --dir ${RPM_BUILD_ROOT}%{_datadir}/applications/        \
        --delete-original                                       \
        dialogs/display-settings/xfce-display-settings.desktop

desktop-file-install --vendor "fedora"                          \
        --dir ${RPM_BUILD_ROOT}%{_datadir}/applications/        \
        --delete-original                                       \
        dialogs/keyboard-settings/xfce-keyboard-settings.desktop

desktop-file-install --vendor "fedora"                          \
        --dir ${RPM_BUILD_ROOT}%{_datadir}/applications/        \
        --delete-original                                       \
        dialogs/mouse-settings/xfce-mouse-settings.desktop

desktop-file-install --vendor "fedora"                          \
        --dir ${RPM_BUILD_ROOT}%{_datadir}/applications/        \
        --delete-original                                       \
        xfce4-settings-manager/xfce-settings-manager.desktop

desktop-file-install --vendor "fedora"                          \
        --dir ${RPM_BUILD_ROOT}%{_datadir}/applications/        \
        --delete-original                                       \
        dialogs/appearance-settings/xfce-ui-settings.desktop

desktop-file-install --vendor "fedora"                    \
        --dir ${RPM_BUILD_ROOT}%{_datadir}/applications/  \
        --delete-original                                       \
        dialogs/accessibility-settings/xfce4-accessibility-settings.desktop

desktop-file-install --vendor "fedora"                    \
        --dir ${RPM_BUILD_ROOT}%{_datadir}/applications/  \
        --delete-original                                       \
        xfce4-settings-editor/xfce4-settings-editor.desktop

%find_lang %{name}

%clean
rm -rf $RPM_BUILD_ROOT


%files -f %{name}.lang
%defattr(-,root,root,-)
%doc
%config(noreplace) %{_sysconfdir}/xdg/autostart/xfce4-settings-helper-autostart.desktop
%dir %{_sysconfdir}/xdg/xfce4
%dir %{_sysconfdir}/xdg/xfce4/xfconf/
%dir %{_sysconfdir}/xdg/xfce4/xfconf/xfce-perchannel-xml
%config(noreplace) %{_sysconfdir}/xdg/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml
%{_bindir}/xfce4-accessibility-settings
%{_bindir}/xfce4-appearance-settings
%{_bindir}/xfce4-display-settings
%{_bindir}/xfce4-keyboard-settings
%{_bindir}/xfce4-mouse-settings
%{_bindir}/xfce4-settings-editor
%{_bindir}/xfce4-settings-helper
%{_bindir}/xfce4-settings-manager
%{_bindir}/xfsettingsd
%{_datadir}/applications/*.desktop

%changelog
* Sat Dec 27 2008 Kevin Fenzi <kevin at tummy.com> - 4.5.92-2
- Cleaned up desktop-file-install
- Added some BuildRequires. 

* Fri Dec 26 2008 Kevin Fenzi <kevin at tummy.com> - 4.5.92-1
- Initial version for Fedora. 



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfce4-settings/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	28 Dec 2008 19:05:45 -0000	1.1
+++ .cvsignore	13 Jan 2009 03:09:05 -0000	1.2
@@ -0,0 +1 @@
+xfce4-settings-4.5.92.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfce4-settings/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	28 Dec 2008 19:05:45 -0000	1.1
+++ sources	13 Jan 2009 03:09:05 -0000	1.2
@@ -0,0 +1 @@
+0e9f8ea8043a902353d4b5b1c0528e4b  xfce4-settings-4.5.92.tar.bz2



From pkgdb at fedoraproject.org  Tue Jan 13 03:17:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 03:17:33 +0000
Subject: [pkgdb] uriparser (Fedora EPEL, 5) updated by huzaifas
Message-ID: <20090113031733.523092081FC@bastion.fedora.phx.redhat.com>

huzaifas added a Fedora EPEL 5 branch for uriparser
huzaifas has set commit to Approved for provenpackager on uriparser (Fedora EPEL 5)
huzaifas has set build to Approved for provenpackager on uriparser (Fedora EPEL 5)
huzaifas has set checkout to Approved for provenpackager on uriparser (Fedora EPEL 5)
huzaifas changed owner of uriparser in Fedora EPEL 5 to rakesh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/uriparser



From pkgdb at fedoraproject.org  Tue Jan 13 03:18:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 03:18:25 +0000
Subject: [pkgdb] uriparser ownership updated
Message-ID: <20090113031825.2A8B92081FC@bastion.fedora.phx.redhat.com>

Package uriparser in Fedora EPEL 5 was orphaned by huzaifas

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/uriparser



From pkgdb at fedoraproject.org  Tue Jan 13 03:18:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 03:18:27 +0000
Subject: [pkgdb] uriparser ownership updated
Message-ID: <20090113031830.B95442081F4@bastion.fedora.phx.redhat.com>

Package uriparser in Fedora EPEL 5 is now owned by huzaifas

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/uriparser



From pkgdb at fedoraproject.org  Tue Jan 13 03:18:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 03:18:31 +0000
Subject: [pkgdb] uriparser: huzaifas has requested watchbugzilla
Message-ID: <20090113031831.B83BC208457@bastion.fedora.phx.redhat.com>

huzaifas has requested the watchbugzilla acl on uriparser (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/uriparser



From pkgdb at fedoraproject.org  Tue Jan 13 03:18:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 03:18:32 +0000
Subject: [pkgdb] uriparser: huzaifas has requested watchcommits
Message-ID: <20090113031833.566BF208468@bastion.fedora.phx.redhat.com>

huzaifas has requested the watchcommits acl on uriparser (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/uriparser



From pkgdb at fedoraproject.org  Tue Jan 13 03:18:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 03:18:33 +0000
Subject: [pkgdb] uriparser: huzaifas has requested commit
Message-ID: <20090113031833.C1AFF20846B@bastion.fedora.phx.redhat.com>

huzaifas has requested the commit acl on uriparser (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/uriparser



From pkgdb at fedoraproject.org  Tue Jan 13 03:18:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 03:18:34 +0000
Subject: [pkgdb] uriparser: huzaifas has requested approveacls
Message-ID: <20090113031834.A32FD20846E@bastion.fedora.phx.redhat.com>

huzaifas has requested the approveacls acl on uriparser (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/uriparser



From pkgdb at fedoraproject.org  Tue Jan 13 03:18:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 03:18:58 +0000
Subject: [pkgdb] uriparser had acl change status
Message-ID: <20090113031858.D6E0A208207@bastion.fedora.phx.redhat.com>

huzaifas has set the watchcommits acl on uriparser (Fedora EPEL 5) to Approved for huzaifas

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/uriparser



From pkgdb at fedoraproject.org  Tue Jan 13 03:18:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 03:18:58 +0000
Subject: [pkgdb] uriparser had acl change status
Message-ID: <20090113031858.6BF7C2081FC@bastion.fedora.phx.redhat.com>

huzaifas has set the watchbugzilla acl on uriparser (Fedora EPEL 5) to Approved for huzaifas

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/uriparser



From pkgdb at fedoraproject.org  Tue Jan 13 03:18:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 03:18:59 +0000
Subject: [pkgdb] uriparser had acl change status
Message-ID: <20090113031900.4190A208456@bastion.fedora.phx.redhat.com>

huzaifas has set the commit acl on uriparser (Fedora EPEL 5) to Approved for huzaifas

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/uriparser



From pkgdb at fedoraproject.org  Tue Jan 13 03:19:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 03:19:01 +0000
Subject: [pkgdb] uriparser had acl change status
Message-ID: <20090113031901.3AC98208458@bastion.fedora.phx.redhat.com>

huzaifas has set the approveacls acl on uriparser (Fedora EPEL 5) to Approved for huzaifas

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/uriparser



From pkgdb at fedoraproject.org  Tue Jan 13 03:21:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 03:21:49 +0000
Subject: [pkgdb] gpsbabel: itamarjp has requested watchbugzilla
Message-ID: <20090113032149.BE9832081FB@bastion.fedora.phx.redhat.com>

itamarjp has requested the watchbugzilla acl on gpsbabel (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gpsbabel



From pkgdb at fedoraproject.org  Tue Jan 13 03:21:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 03:21:53 +0000
Subject: [pkgdb] gpsbabel: itamarjp has requested commit
Message-ID: <20090113032153.41A3E208207@bastion.fedora.phx.redhat.com>

itamarjp has requested the commit acl on gpsbabel (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gpsbabel



From pkgdb at fedoraproject.org  Tue Jan 13 03:21:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 03:21:56 +0000
Subject: [pkgdb] gpsbabel: itamarjp has requested watchcommits
Message-ID: <20090113032156.DECA4208467@bastion.fedora.phx.redhat.com>

itamarjp has requested the watchcommits acl on gpsbabel (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gpsbabel



From pkgdb at fedoraproject.org  Tue Jan 13 03:21:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 03:21:57 +0000
Subject: [pkgdb] gpsbabel: itamarjp has requested approveacls
Message-ID: <20090113032157.55332208469@bastion.fedora.phx.redhat.com>

itamarjp has requested the approveacls acl on gpsbabel (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gpsbabel



From pkgdb at fedoraproject.org  Tue Jan 13 03:22:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 03:22:12 +0000
Subject: [pkgdb] gpsbabel: itamarjp has requested watchbugzilla
Message-ID: <20090113032212.82AE02081FB@bastion.fedora.phx.redhat.com>

itamarjp has requested the watchbugzilla acl on gpsbabel (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gpsbabel



From pkgdb at fedoraproject.org  Tue Jan 13 03:22:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 03:22:14 +0000
Subject: [pkgdb] gpsbabel: itamarjp has requested watchcommits
Message-ID: <20090113032214.1FBA5208203@bastion.fedora.phx.redhat.com>

itamarjp has requested the watchcommits acl on gpsbabel (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gpsbabel



From pkgdb at fedoraproject.org  Tue Jan 13 03:22:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 03:22:15 +0000
Subject: [pkgdb] gpsbabel: itamarjp has requested commit
Message-ID: <20090113032215.EE69320846E@bastion.fedora.phx.redhat.com>

itamarjp has requested the commit acl on gpsbabel (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gpsbabel



From pkgdb at fedoraproject.org  Tue Jan 13 03:22:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 03:22:18 +0000
Subject: [pkgdb] gpsbabel: itamarjp has requested approveacls
Message-ID: <20090113032219.8AEBB208471@bastion.fedora.phx.redhat.com>

itamarjp has requested the approveacls acl on gpsbabel (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gpsbabel



From pkgdb at fedoraproject.org  Tue Jan 13 03:22:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 03:22:22 +0000
Subject: [pkgdb] gpsbabel: itamarjp has requested watchbugzilla
Message-ID: <20090113032222.DE31C208474@bastion.fedora.phx.redhat.com>

itamarjp has requested the watchbugzilla acl on gpsbabel (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gpsbabel



From pkgdb at fedoraproject.org  Tue Jan 13 03:22:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 03:22:23 +0000
Subject: [pkgdb] gpsbabel: itamarjp has requested commit
Message-ID: <20090113032224.03475208476@bastion.fedora.phx.redhat.com>

itamarjp has requested the commit acl on gpsbabel (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gpsbabel



From pkgdb at fedoraproject.org  Tue Jan 13 03:22:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 03:22:24 +0000
Subject: [pkgdb] gpsbabel: itamarjp has requested watchcommits
Message-ID: <20090113032224.4E295208478@bastion.fedora.phx.redhat.com>

itamarjp has requested the watchcommits acl on gpsbabel (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gpsbabel



From pkgdb at fedoraproject.org  Tue Jan 13 03:22:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 03:22:25 +0000
Subject: [pkgdb] gpsbabel: itamarjp has requested approveacls
Message-ID: <20090113032225.C65C8208469@bastion.fedora.phx.redhat.com>

itamarjp has requested the approveacls acl on gpsbabel (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gpsbabel



From deji at fedoraproject.org  Tue Jan 13 03:24:56 2009
From: deji at fedoraproject.org (Deji Akingunola)
Date: Tue, 13 Jan 2009 03:24:56 +0000 (UTC)
Subject: rpms/gegl/devel .cvsignore, 1.7, 1.8 gegl.spec, 1.8, 1.9 sources,
	1.7, 1.8
Message-ID: <20090113032456.D400B70129@cvs1.fedora.phx.redhat.com>

Author: deji

Update of /cvs/pkgs/rpms/gegl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32430

Modified Files:
	.cvsignore gegl.spec sources 
Log Message:
* Tue Jan 13 2009 Deji Akingunola <dakingun at gmail.com> - 0.0.22-1
- Update to version 0.0.22



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gegl/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	7 Oct 2008 14:32:06 -0000	1.7
+++ .cvsignore	13 Jan 2009 03:24:26 -0000	1.8
@@ -1 +1 @@
-gegl-0.0.20.tar.bz2
+gegl-0.0.22.tar.bz2


Index: gegl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gegl/devel/gegl.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- gegl.spec	7 Oct 2008 14:32:06 -0000	1.8
+++ gegl.spec	13 Jan 2009 03:24:26 -0000	1.9
@@ -1,17 +1,16 @@
 Summary:	A graph based image processing framework
 Name:		gegl
-Version:	0.0.20
+Version:	0.0.22
 Release:	1%{?dist}
 # The binary is under the GPL, while the libs are under LGPL
 License:	LGPLv3+ and GPLv3+
 Group:		System Environment/Libraries
 URL:		http://www.gegl.org/
 Source0:	ftp://ftp.gtk.org/pub/gegl/0.0/%{name}-%{version}.tar.bz2
-Patch0:		gegl-missing_header.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	babl-devel gtk2-devel ruby
 BuildRequires:	libpng-devel libjpeg-devel librsvg2-devel libopenraw-devel
-BuildRequires:	perl-devel SDL-devel OpenEXR-devel lua-devel
+BuildRequires:	perl-devel SDL-devel OpenEXR-devel lua-devel libspiro-devel
 BuildRequires:	asciidoc enscript w3m graphviz pkgconfig
 
 %description
@@ -32,7 +31,6 @@
 
 %prep
 %setup -q
-%patch0 -p0
 chmod -x operations/external/ff-load.c operations/common/perlin/perlin.*
 
 %build
@@ -76,6 +74,9 @@
 %endif
 
 %changelog
+* Tue Jan 13 2009 Deji Akingunola <dakingun at gmail.com> - 0.0.22-1
+- Update to version 0.0.22
+
 * Tue Oct 07 2008 Deji Akingunola <dakingun at gmail.com> - 0.0.20-1
 - Update to latest release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gegl/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	7 Oct 2008 14:32:06 -0000	1.7
+++ sources	13 Jan 2009 03:24:26 -0000	1.8
@@ -1 +1 @@
-2e1f97ec8abd9a4a21f458b43799bff2  gegl-0.0.20.tar.bz2
+e2196c2016d16a4479e157f8fdee4162  gegl-0.0.22.tar.bz2



From pkgdb at fedoraproject.org  Tue Jan 13 03:31:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 03:31:56 +0000
Subject: [pkgdb] gpsbabel had acl change status
Message-ID: <20090113033156.0B7AF2081FB@bastion.fedora.phx.redhat.com>

silfreed has set the watchbugzilla acl on gpsbabel (Fedora devel) to Approved for itamarjp

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gpsbabel



From pkgdb at fedoraproject.org  Tue Jan 13 03:31:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 03:31:57 +0000
Subject: [pkgdb] gpsbabel had acl change status
Message-ID: <20090113033157.7E665208207@bastion.fedora.phx.redhat.com>

silfreed has set the watchcommits acl on gpsbabel (Fedora devel) to Approved for itamarjp

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gpsbabel



From pkgdb at fedoraproject.org  Tue Jan 13 03:32:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 03:32:02 +0000
Subject: [pkgdb] gpsbabel had acl change status
Message-ID: <20090113033202.CF6342081F4@bastion.fedora.phx.redhat.com>

silfreed has set the commit acl on gpsbabel (Fedora devel) to Approved for itamarjp

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gpsbabel



From pkgdb at fedoraproject.org  Tue Jan 13 03:32:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 03:32:16 +0000
Subject: [pkgdb] gpsbabel had acl change status
Message-ID: <20090113033216.BACA22081FB@bastion.fedora.phx.redhat.com>

silfreed has set the watchbugzilla acl on gpsbabel (Fedora 9) to Approved for itamarjp

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gpsbabel



From pkgdb at fedoraproject.org  Tue Jan 13 03:32:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 03:32:19 +0000
Subject: [pkgdb] gpsbabel had acl change status
Message-ID: <20090113033219.8989C208207@bastion.fedora.phx.redhat.com>

silfreed has set the watchcommits acl on gpsbabel (Fedora 9) to Approved for itamarjp

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gpsbabel



From pkgdb at fedoraproject.org  Tue Jan 13 03:32:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 03:32:23 +0000
Subject: [pkgdb] gpsbabel had acl change status
Message-ID: <20090113033224.15D9C208458@bastion.fedora.phx.redhat.com>

silfreed has set the commit acl on gpsbabel (Fedora 9) to Approved for itamarjp

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gpsbabel



From quantumburnz at fedoraproject.org  Tue Jan 13 03:32:22 2009
From: quantumburnz at fedoraproject.org (Christopher D. Stover)
Date: Tue, 13 Jan 2009 03:32:22 +0000 (UTC)
Subject: rpms/barry/F-10 barry-ipmodem.patch,NONE,1.1 barry.spec,1.1,1.2
Message-ID: <20090113033222.BD8A970129@cvs1.fedora.phx.redhat.com>

Author: quantumburnz

Update of /cvs/pkgs/rpms/barry/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv981

Modified Files:
	barry.spec 
Added Files:
	barry-ipmodem.patch 
Log Message:
version bump to 0.15

barry-ipmodem.patch:

--- NEW FILE barry-ipmodem.patch ---
diff --git a/src/m_ipmodem.cc b/src/m_ipmodem.cc
index 23c81c1..dae0f08 100644
--- a/src/m_ipmodem.cc
+++ b/src/m_ipmodem.cc
@@ -60,95 +60,78 @@ IpModem::~IpModem()
 	}
 }
 
-bool IpModem::SendPassword(const char *password)
+bool IpModem::SendPassword( const char *password, uint32_t seed )
 {
-	if( !password || strlen(password) == 0  ) {
-		throw BadPassword("No password provided.", 0, false);
-	}
-
 	int read_ep  = m_con.GetProbeResult().m_epModem.read;
 	int write_ep = m_con.GetProbeResult().m_epModem.write;
+	unsigned char pwdigest[SHA_DIGEST_LENGTH];
+	unsigned char prefixedhash[SHA_DIGEST_LENGTH + 4];
+	unsigned char pw_response[SHA_DIGEST_LENGTH + 8];
+	uint32_t new_seed;
 	Data data;
 
-	m_dev.BulkWrite(write_ep, pw_start, sizeof(pw_start));
-	m_dev.BulkRead(read_ep, data);
-	ddout("IPModem read packet.\n" << data);
-
-	// Need to add checks for other packet types.
-	// check for 02 00 00 00 SS SS SS SS RR 00 00 00 0a 00 00 00 PP PP PP PP PP 00 00 00 78 56 34 12
-        if( data.GetSize() >= 9 && data.GetData()[0] == 0x02  &&
-	    memcmp(data.GetData() + data.GetSize() - 4, special_flag, sizeof(special_flag))== 0 ) {
-		// Got a password request packet
-		ddout("IPModem password request packet:\n" << data);
-
-		// Check how many retries are left
-		if( data.GetData()[8] < BARRY_MIN_PASSWORD_TRIES ) {
-			throw BadPassword("Fewer than " BARRY_MIN_PASSWORD_TRIES_ASC " password tries remaining in device. Refusing to proceed, to avoid device zapping itself.  Use a Windows client, or re-cradle the device.",
-				data.GetData()[8],
-				true);
-		}
+	if( !password || strlen(password) == 0  ) {
+		throw BadPassword("No password provided.", 0, false);
+	}
 
-		// Build the password hash
-		unsigned char pwdigest[SHA_DIGEST_LENGTH];
-		unsigned char prefixedhash[SHA_DIGEST_LENGTH + 4];
-		unsigned char pw_response[SHA_DIGEST_LENGTH + 8];
-		unsigned char seed[4];
+	// Build the password hash
+	// first, hash the password by itself
+	SHA1((unsigned char *) password, strlen(password), pwdigest);
 
-		// first, hash the password by itself
-		SHA1((unsigned char *) password, strlen(password), pwdigest);
+	// prefix the resulting hash with the provided seed
+	memcpy(&prefixedhash[0], &seed, sizeof(uint32_t));
+	memcpy(&prefixedhash[4], pwdigest, SHA_DIGEST_LENGTH);
 
-		// prefix the resulting hash with the provided seed
-		memcpy(&seed[0], data.GetData() + 4, sizeof(uint32_t));
-		memcpy(&prefixedhash[0], &seed, sizeof(uint32_t));
-		memcpy(&prefixedhash[4], pwdigest, SHA_DIGEST_LENGTH);
+	// hash again
+	SHA1((unsigned char *) prefixedhash, SHA_DIGEST_LENGTH + 4, pwdigest);
 
-		// hash again
-		SHA1((unsigned char *) prefixedhash, SHA_DIGEST_LENGTH + 4, pwdigest);
+	// Build the response packet
+	const char pw_rsphdr[]  = { 0x03, 0x00, 0x00, 0x00 };
+	memcpy(&pw_response[0], pw_rsphdr, sizeof(pw_rsphdr));
+	memcpy(&pw_response[4], pwdigest, SHA_DIGEST_LENGTH);
+	memcpy(&pw_response[24], special_flag, sizeof(special_flag));
 
-		// Build the response packet
-		const char pw_rsphdr[]  = { 0x03, 0x00, 0x00, 0x00 };
-		memcpy(&pw_response[0], pw_rsphdr, sizeof(pw_rsphdr));
-		memcpy(&pw_response[4], pwdigest, SHA_DIGEST_LENGTH);
-		memcpy(&pw_response[24], special_flag, sizeof(special_flag));
+	// Send the password response packet
+	m_dev.BulkWrite(write_ep, pw_response, sizeof(pw_response));
+	m_dev.BulkRead(read_ep, data);
+	ddout("IPModem: Read password response.\n" << data);
 
-		// Send the password response packet
-		m_dev.BulkWrite(write_ep, pw_response, sizeof(pw_response));
-		m_dev.BulkRead(read_ep, data);
-		ddout("IPModem read password response.\n" << data);
-
-		// check response 04 00 00 00 .......
-		// On the 8703e the seed is incremented, retries are reset to 10 when the password is accepted.
-		// if( data.GetData()[0] == 0x04  && data.GetData()[8] == 0x0a ) {
-                if( data.GetSize() >= 9 && data.GetData()[0] == 0x04 ) {
-			if( memcmp(data.GetData() + 4, seed, sizeof(seed)) == 0 ) {
-				ddout("IPModem invalid password.\n" << data);
-				throw BadPassword("Password rejected by device.", data.GetData()[8], false);
-			}
-			ddout("IPModem password accepted.\n");
-			// send "start"? packet
-			m_dev.BulkWrite(write_ep, pw_start, sizeof(pw_start));
+	// Added for the BB Storm 9000's second password request
+	if( data.GetSize() >= 16 && data.GetData()[0] == 0x00 ) {
+		try {
+			m_dev.BulkRead(read_ep, data, 500);
+			ddout("IPModem: Null Response Packet:\n" << data);
+		}
+		catch( Usb::Timeout &to ) {
+			// do nothing on timeouts
+			ddout("IPModem: Null Response Timeout");
+		}
+	}
 
-			// send packet with the last 8 bytes of the password hash (session_key?)
-			//unsigned char pw_response[SHA_DIGEST_LENGTH + 8];
-			unsigned char pw_rsphdr[] = { 0x00, 0, 0, 0, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0xc2, 1, 0 };
+	// check response 04 00 00 00 .......
+	// On the 8703e the seed is incremented, retries are reset to 10 when the password is accepted.
+	// If data.GetData() + 4 is = to the orginal seed +1 or 00 00 00 00 then the password was acceppted.
+	// When data.GetData() + 4 is not 00 00 00 00 then data.GetData()[8] contains the number of password retrys left.
+	if( data.GetSize() >= 9 && data.GetData()[0] == 0x04 ) {
+		memcpy(&new_seed, data.GetData() + 4, sizeof(uint32_t));
+		seed++;
+		if( seed == new_seed || new_seed == 0 ) {
+			ddout("IPModem: Password accepted.\n");
+			// Create session key - last 8 bytes of the password hash
 			memcpy(&m_session_key[0], pwdigest + 12, sizeof(m_session_key));
-			memcpy(&pw_response[0], pw_rsphdr, sizeof(pw_rsphdr));
-			memcpy(&pw_response[16], pwdigest + 12, 8);
-			//memcpy(&pw_response[16], m_session_key, 8);
-			memcpy(&pw_response[24], special_flag, sizeof(special_flag));
-			m_dev.BulkWrite(write_ep, pw_response, sizeof(pw_response));
 
 			// blank password hashes as we don't need these anymore
 			memset(pwdigest, 0, sizeof(pwdigest));
 			memset(prefixedhash, 0, sizeof(prefixedhash));
-
-			// The modem should be ready to accept AT commands
 			return true;
 		}
-
-		// Unknown packet
-		ddout("IPModem Error unknown packet.\n" << data);
+		else {
+			ddout("IPModem: Invalid password.\n" << data);
+			throw BadPassword("Password rejected by device.", data.GetData()[8], false);
+		}
 	}
+	// Unknown packet
+	ddout("IPModem: Error unknown packet.\n" << data);
 	return false;
 }
 
@@ -172,7 +155,7 @@ void *IpModem::DataReadThread(void *userptr)
 			if( data.GetSize() > 4 &&
 			    memcmp(data.GetData() + data.GetSize() - 4, special_flag, sizeof(special_flag)) == 0 ) {
 				// log, then drop it on the floor for now
-				ddout("IPModem special packet:\n" << data);
+				ddout("IPModem: Special packet:\n" << data);
 				continue;
 			}
 
@@ -190,7 +173,7 @@ void *IpModem::DataReadThread(void *userptr)
 		}
 		catch( Usb::Timeout &to ) {
 			// do nothing on timeouts
-			ddout("Timeout in DataReadThread!");
+			ddout("IPModem: Timeout in DataReadThread!");
 		}
 		catch( std::exception &e ) {
 			eout("Exception in IpModem::DataReadThread: " << e.what());
@@ -207,7 +190,10 @@ void IpModem::Open(const char *password)
 {
 	int read_ep  = m_con.GetProbeResult().m_epModem.read;
 	int write_ep = m_con.GetProbeResult().m_epModem.write;
+	unsigned char response[28];
+	uint32_t seed;
 	Data data;
+
 	// check that we have endpoints for the modem
 	const Usb::EndpointPair &pair = m_con.GetProbeResult().m_epModem;
 	if( !pair.IsComplete() ) {
@@ -224,28 +210,110 @@ void IpModem::Open(const char *password)
 	m_dev.ClearHalt(pair.read);
 	m_dev.ClearHalt(pair.write);
 
-	if( !password || strlen(password) == 0 ) {
-		Data block(start, sizeof(start));
-		Write(block);
+	// Send stop command
+	ddout("IPModem: Sending Stop Response:\n");
+	m_dev.BulkWrite(write_ep, stop, sizeof(stop));
+	try {
+		m_dev.BulkRead(read_ep, data, 500);
+		ddout("IPModem: Stop Response Packet:\n" << data);
 	}
-	else {
-		if( !SendPassword(password) ) {
-			throw Barry::Error("IpModem:: Error sending password.");
+	catch( Usb::Timeout &to ) {
+		// do nothing on timeouts
+		ddout("IPModem: Stop Response Timeout");
+	}
+
+	// Send start commands to figure out if the device needs a password.
+	ddout("IPModem: Sending Start Response:\n");
+	m_dev.BulkWrite(write_ep, pw_start, sizeof(pw_start));
+	m_dev.BulkRead(read_ep, data, 5000);
+	ddout("IPModem: Start Response Packet:\n" << data);
+
+	// check for 02 00 00 00 SS SS SS SS RR 00 00 00 0a 00 00 00 PP PP PP PP PP 00 00 00 78 56 34 12
+        if( data.GetSize() >= 9 && data.GetData()[0] == 0x02  &&
+	    memcmp(data.GetData() + data.GetSize() - 4, special_flag, sizeof(special_flag))== 0 ) {
+		// Got a password request packet
+		ddout("IPModem: Password request packet:\n" << data);
+
+		// Check how many retries are left
+		if( data.GetData()[8] < BARRY_MIN_PASSWORD_TRIES ) {
+			throw BadPassword("Fewer than " BARRY_MIN_PASSWORD_TRIES_ASC " password tries remaining in device. Refusing to proceed, to avoid device zapping itself.  Use a Windows client, or re-cradle the device.",
+				data.GetData()[8],
+				true);
+		}
+		memcpy(&seed, data.GetData() + 4, sizeof(uint32_t));
+		// Send password
+		if( !SendPassword(password, seed) ) {
+			throw Barry::Error("IpModem: Error sending password.");
+		}
+
+		// Re-send "start" packet
+		ddout("IPModem: Re-sending Start Response:\n");
+		m_dev.BulkWrite(write_ep, pw_start, sizeof(pw_start));
+		m_dev.BulkRead(read_ep, data);
+		ddout("IPModem: Start Response Packet:\n" << data);
+
+		// send packet with the session_key
+		unsigned char response_header[] = { 0x00, 0, 0, 0, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0xc2, 1, 0 };
+		memcpy(&response[0], response_header, sizeof(response_header));
+		memcpy(&response[16], m_session_key,  sizeof(m_session_key));
+		memcpy(&response[24], special_flag, sizeof(special_flag));
+		ddout("IPModem: Sending Session key:\n");
+		m_dev.BulkWrite(write_ep, response, sizeof(response));
+		if( data.GetSize() >= 16 ) {
+			switch(data.GetData()[0])
+			{
+			case 0x00:	// Null packet
+				break;
+
+			case 0x02:	// password seed received
+				memcpy(&seed, data.GetData() + 4, sizeof(uint32_t));
+				if( !SendPassword( password, seed ) ) {
+					throw Barry::Error("IpModem: Error sending password.");
+				}
+				break;
+			case 0x04:	// command accepted
+				break;
+
+			default: 	// ???
+				ddout("IPModem: Unknown response.\n");
+				break;
+			}
 		}
+
 	}
 
 	// see if the modem will respond to commands
 	const char modem_command[] = { "AT\r" };
+	//ddout("IPModem: Test command response.\n" << data);
 	m_dev.BulkWrite(write_ep, modem_command, strlen(modem_command));
 	m_dev.BulkRead(read_ep, data);
-	ddout("IPModem:: AT command response.\n" << data);
+	ddout("IPModem: Test command response.\n" << data);
 	if( data.GetSize() >= 1 ) {
 		switch(data.GetData()[0])
 		{
-		case 0x02:	// password seed received
-			throw BadPassword("This device requested a password.",
-				data.GetSize() >= 9 ? data.GetData()[8] : 0, false);
+		case 0x00:	// Null packet
+			try {
+				m_dev.BulkRead(read_ep, data, 5000);
+				ddout("IPModem: AT Response Packet:\n" << data);
+			}
+			catch( Usb::Timeout &to ) {
+				// do nothing on timeouts
+				ddout("IPModem: AT Response Timeout");
+			}
+			break;
 
+		case 0x02:	// password seed received
+			if( !password || strlen(password) == 0 ) {
+				throw BadPassword("This device requested a password.",
+					data.GetSize() >= 9 ? data.GetData()[8] : 0, false);
+			}
+			else {	// added for the Storm 9000
+				memcpy(&seed, data.GetData() + 4, sizeof(uint32_t));
+				if( !SendPassword( password, seed ) ) {
+					throw Barry::Error("IpModem: Error sending password.");
+				}
+			}
+			break;
 		case 0x04:	// command accepted
 			break;
 
@@ -253,17 +321,18 @@ void IpModem::Open(const char *password)
 			throw BadPassword("This device requires a password.", 0, false);
 
 		default: 	// ???
-			ddout("IPModem:: unknown AT command response.\n");
+			ddout("IPModem: Unknown AT command response.\n");
 			break;
 		}
 	}
+	ddout("IPModem: Modem Ready.\n");
 
 	// spawn read thread
 	m_continue_reading = true;
 	int ret = pthread_create(&m_modem_read_thread, NULL, &IpModem::DataReadThread, this);
 	if( ret ) {
 		m_continue_reading = false;
-		throw Barry::ErrnoError("IpModem:: Error creating USB read thread.", ret);
+		throw Barry::ErrnoError("IpModem: Error creating USB read thread.", ret);
 	}
 }
 
@@ -293,7 +362,7 @@ void IpModem::Close()
 	Data data;
 
 	//0 0 0 0 b0 0 0 0 0 0 0 0 0 c2 1 0 + session_key + special_flag
-	ddout("IpModem:: Closing connection.");
+	ddout("IpModem: Closing connection.");
 	memset(end, 0, sizeof(end));
 	end[4]  = 0xb0;
 	end[13] = 0xc2;
@@ -324,18 +393,18 @@ void IpModem::Close()
 	m_dev.BulkWrite(write_ep, stop, sizeof(stop));
 	try {
 		m_dev.BulkRead(read_ep, data, 5000);
-		ddout("IPModem:: Close read packet:\n" << data);
+		ddout("IPModem: Close read packet:\n" << data);
 	}
 	catch( Usb::Timeout &to ) {
 		// do nothing on timeouts
-		ddout("IPModem:: Close Read Timeout");
+		ddout("IPModem: Close Read Timeout");
 	}
 	// stop the read thread
 	if( m_continue_reading ) {
 		m_continue_reading = false;
 		pthread_join(m_modem_read_thread, NULL);
 	}
-	ddout("IPmodem:: Closed!");
+	ddout("IPmodem: Closed!");
 
 }
 
diff --git a/src/m_ipmodem.h b/src/m_ipmodem.h
index 23e5ffa..c58882f 100644
--- a/src/m_ipmodem.h
+++ b/src/m_ipmodem.h
@@ -59,7 +59,7 @@ private:
 	unsigned char m_session_key[8];		// = { 0x00, 0, 0, 0, 0, 0, 0, 0 };
 
 private:
-	BXLOCAL bool SendPassword(const char *password = 0);
+	BXLOCAL bool SendPassword(const char *password = 0, uint32_t seed = 0);
 
 protected:
 	static void *DataReadThread(void *userptr);


Index: barry.spec
===================================================================
RCS file: /cvs/pkgs/rpms/barry/F-10/barry.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- barry.spec	12 Nov 2008 20:24:06 -0000	1.1
+++ barry.spec	13 Jan 2009 03:31:52 -0000	1.2
@@ -1,26 +1,34 @@
-# Fedora 9/10 doesn't support opensync 0.22
+# Fedora 9/10/11 don't support opensync 0.22
 %define with_opensync 1
-%if 0%{?fc9}
-    %define with_opensync 0
-%endif
-%if 0%{?fc10}
+%if %{?fedora} > 8
     %define with_opensync 0
 %endif
 
 Name:           barry
-Version:        0.14
-Release:        4%{?dist}
+Version:        0.15
+Release:        0.3.20090109git%{?dist}
 Summary:        BlackBerry Desktop for Linux
 
 Group:          Applications/Productivity
 License:        GPLv2+
 URL:            http://www.netdirect.ca/downloads/barry
-Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
+# The source for this package was pulled from upstream's git.  Use the following
+# commands to generate the tarball:
+# git clone git://repo.or.cz/barry.git
+# cd barry/maintainer
+# ./git-extract.sh 0 15 master
+# (cd build/barry* && ../../tar-prepare.sh)
+# (cd build && ../tar-create.sh 0 15)
+Source0:        %{name}-%{version}-20090109.tar.bz2
 Source1:        %{name}.desktop
+# ip_modem password patch for the Blackberry Bold 9000
+# http://sourceforge.net/mailarchive/forum.php?thread_name=4968F513.1050909%40comcast.net&forum_name=barry-devel
+Patch0:         barry-ipmodem.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libusb-devel boost-devel desktop-file-utils gtkmm24-devel
-BuildRequires:  libglademm24-devel libglade2-devel libtar-devel
+BuildRequires:  libglademm24-devel libglade2-devel libtar-devel libtool
+BuildRequires:  fuse-devel
 Requires:       initscripts
 
 %description
@@ -60,7 +68,7 @@
 Summary: BlackBerry Desktop for Linux - opensync plugin
 Group: Applications/Productivity
 BuildRequires: libopensync-devel
-Requires: libopensync
+Requires: libopensync == 0.22
 
 %description opensync
 Barry is a desktop toolset for managing your BlackBerry device.
@@ -72,6 +80,26 @@
 %setup -q
 %{__rm} -rf ./doc/www/*.php
 %{__rm} -rf ./doc/www/*.sh
+%{__rm} -rf ./doc/www/doxygen/html/scoped__lock_8h__incl.map
+%{__rm} -rf ./doc/www/doxygen/html/classBarry_1_1ZeroPacket__inherit__graph.map
+%{__rm} -rf ./doc/www/doxygen/html/dataqueue_8h__incl.map
+%{__rm} -rf ./doc/www/doxygen/html/classBarry_1_1ZeroPacket__coll__graph.map
+%{__rm} -rf ./doc/www/doxygen/html/protostructs_8h__incl.map
+%{__rm} -rf ./doc/www/doxygen/html/classBarry_1_1DBPacket__inherit__graph.map
+%{__rm} -rf ./doc/www/doxygen/html/bcharge_8cc__incl.map
+%{__rm} -rf ./doc/www/doxygen/html/bidentify_8cc__incl.map
+%{__rm} -rf ./doc/www/doxygen/html/packet_8h__incl.map
+%{__rm} -rf ./doc/www/doxygen/html/strnlen_8h__incl.map
+%{__rm} -rf ./doc/www/doxygen/html/bs11nread_8cc__incl.map
+%{__rm} -rf ./doc/www/doxygen/html/bfuse_8cc__incl.map
+%{__rm} -rf ./doc/www/doxygen/html/btool_8cc__incl.map
+%{__rm} -rf ./doc/www/doxygen/html/pppob_8cc__incl.map
+%{__rm} -rf ./doc/www/doxygen/html/upldif_8cc__incl.map
+%{__rm} -rf ./doc/www/doxygen/html/brecsum_8cc__incl.map
+%{__rm} -rf ./doc/www/doxygen/html/breset_8cc__incl.map
+%{__rm} -rf ./doc/www/doxygen/html/endian_8h__incl.map
+%patch0 -p1
+
 
 %build
 # main tree
@@ -85,6 +113,10 @@
 %{configure} PKG_CONFIG_PATH="..:$PKG_CONFIG_PATH" CXXFLAGS="-I../.." LDFLAGS="-L../../src"
 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
+# Touch-magic to prevent auto* from running.  Thank you Andreas Metzler.
+touch -r Makefile ./src/Makefile ./src/Makefile.am ./src/Makefile.in \
+  ./man/Makefile.am ./man/Makefile.in config.h config.h.in Makefile.am \
+  Makefile.in configure.ac aclocal.m4 configure
 %{__make} %{?_smp_mflags}
 cd ../
 
@@ -94,7 +126,6 @@
 %{configure} PKG_CONFIG_PATH="..:$PKG_CONFIG_PATH" CXXFLAGS="-I../.." LDFLAGS="-L../../src"
 sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
 sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
-%{__make} %{?_smp_mflags}
 cd ../
 %endif
 
@@ -170,6 +201,22 @@
 %postun libs -p /sbin/ldconfig
 
 %changelog
+* Mon Jan 12 2009 Christopher D. Stover <quantumburnz at hotmail.com> 0.15-0.3.20090109git
+- version bump for proper patch name
+
+* Mon Jan 12 2009 Christopher D. Stover <quantumburnz at hotmail.com> 0.15-0.2.20090109git
+- enable fuse module during build
+- include ip_modem password patch for the Blackberry Bold 9000
+
+* Mon Jan 12 2009 Christopher D. Stover <quantumburnz at hotmail.com> 0.15-0.1.20090109git
+- version/git bump
+
+* Thu Dec 18 2008 Petr Machata <pmachata at redhat.com> - 0.14-6
+- rebuild for new boost
+
+* Mon Nov 12 2008 Christopher D. Stover <quantumburnz at hotmail.com> 0.14-5
+- removed opensync support for F11
+
 * Mon Nov 10 2008 Christopher D. Stover <quantumburnz at hotmail.com> 0.14-4
 - merged gui with the main package
 



From pkgdb at fedoraproject.org  Tue Jan 13 03:32:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 03:32:25 +0000
Subject: [pkgdb] gpsbabel had acl change status
Message-ID: <20090113033225.54DA3208469@bastion.fedora.phx.redhat.com>

silfreed has set the watchbugzilla acl on gpsbabel (Fedora 10) to Approved for itamarjp

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gpsbabel



From pkgdb at fedoraproject.org  Tue Jan 13 03:32:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 03:32:27 +0000
Subject: [pkgdb] gpsbabel had acl change status
Message-ID: <20090113033227.57D5320846C@bastion.fedora.phx.redhat.com>

silfreed has set the watchcommits acl on gpsbabel (Fedora 10) to Approved for itamarjp

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gpsbabel



From pkgdb at fedoraproject.org  Tue Jan 13 03:32:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 03:32:29 +0000
Subject: [pkgdb] gpsbabel had acl change status
Message-ID: <20090113033229.BEFA02081FB@bastion.fedora.phx.redhat.com>

silfreed has set the commit acl on gpsbabel (Fedora 10) to Approved for itamarjp

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gpsbabel



From pkgdb at fedoraproject.org  Tue Jan 13 03:33:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 03:33:34 +0000
Subject: [pkgdb] gpsbabel had acl change status
Message-ID: <20090113033334.5FEBD2081F4@bastion.fedora.phx.redhat.com>

silfreed has set the approveacls acl on gpsbabel (Fedora devel) to Denied for itamarjp

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gpsbabel



From pkgdb at fedoraproject.org  Tue Jan 13 03:33:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 03:33:38 +0000
Subject: [pkgdb] gpsbabel had acl change status
Message-ID: <20090113033338.A4631208203@bastion.fedora.phx.redhat.com>

silfreed has set the approveacls acl on gpsbabel (Fedora 9) to Denied for itamarjp

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gpsbabel



From pkgdb at fedoraproject.org  Tue Jan 13 03:33:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 03:33:42 +0000
Subject: [pkgdb] gpsbabel had acl change status
Message-ID: <20090113033342.73655208457@bastion.fedora.phx.redhat.com>

silfreed has set the approveacls acl on gpsbabel (Fedora 10) to Denied for itamarjp

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gpsbabel



From deji at fedoraproject.org  Tue Jan 13 03:33:46 2009
From: deji at fedoraproject.org (Deji Akingunola)
Date: Tue, 13 Jan 2009 03:33:46 +0000 (UTC)
Subject: rpms/gnome-scan/devel .cvsignore, 1.5, 1.6 gnome-scan.spec, 1.8,
	1.9 sources, 1.6, 1.7 gnome-scan-cursor_fix.patch, 1.1, NONE
Message-ID: <20090113033346.0E94570129@cvs1.fedora.phx.redhat.com>

Author: deji

Update of /cvs/pkgs/rpms/gnome-scan/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1298

Modified Files:
	.cvsignore gnome-scan.spec sources 
Removed Files:
	gnome-scan-cursor_fix.patch 
Log Message:
* Tue Jan 13 2009 Deji Akingunola <dakingun at gmail.com> - 0.6.1-1
- Update to version 0.6.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-scan/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	11 Mar 2008 01:51:02 -0000	1.5
+++ .cvsignore	13 Jan 2009 03:33:15 -0000	1.6
@@ -1 +1 @@
-gnome-scan-0.6.tar.bz2
+gnome-scan-0.6.1.tar.bz2


Index: gnome-scan.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-scan/devel/gnome-scan.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- gnome-scan.spec	14 Mar 2008 01:54:51 -0000	1.8
+++ gnome-scan.spec	13 Jan 2009 03:33:15 -0000	1.9
@@ -1,12 +1,11 @@
 Summary:	Gnome solution for scanning in the desktop on top of libsane
 Name:		gnome-scan
-Version:	0.6
-Release:	2%{?dist}
+Version:	0.6.1
+Release:	1%{?dist}
 Group:		Applications/System
 License:	LGPLv2+
 URL:		http://home.gna.org/gnomescan/
 Source0:	http://ftp.gnome.org/pub/GNOME/sources/%{name}/0.6/%{name}-%{version}.tar.bz2
-Patch0:		gnome-scan-cursor_fix.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	gtk2-devel libgnomeui-devel sane-backends-devel
 BuildRequires:	gegl-devel gimp-devel
@@ -43,7 +42,6 @@
 
 %prep
 %setup -q
-%patch0 -p0 -b .fix
 
 %build
 %configure --disable-static
@@ -110,6 +108,9 @@
 %doc %{_datadir}/gtk-doc/html/gnome-scan*/
 
 %changelog
+* Tue Jan 13 2009 Deji Akingunola <dakingun at gmail.com> - 0.6.1-1
+- Update to version 0.6.1
+
 * Thu Mar 13 2008 Deji Akingunola <dakingun at gmail.com> - 0.6-2
 - Fix wrong mouse cursor (Bug #437417)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-scan/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	11 Mar 2008 01:51:02 -0000	1.6
+++ sources	13 Jan 2009 03:33:15 -0000	1.7
@@ -1 +1 @@
-4bdf2d0ce27893aa802743d24b853afd  gnome-scan-0.6.tar.bz2
+aac087c9c36b92cbd87063e6d7017fe4  gnome-scan-0.6.1.tar.bz2


--- gnome-scan-cursor_fix.patch DELETED ---



From alexlan at fedoraproject.org  Tue Jan 13 03:37:38 2009
From: alexlan at fedoraproject.org (Alex Lancaster)
Date: Tue, 13 Jan 2009 03:37:38 +0000 (UTC)
Subject: rpms/php-ZendFramework/devel php-ZendFramework.spec,1.9,1.10
Message-ID: <20090113033738.1D2DF70129@cvs1.fedora.phx.redhat.com>

Author: alexlan

Update of /cvs/pkgs/rpms/php-ZendFramework/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1913

Modified Files:
	php-ZendFramework.spec 
Log Message:
* Mon Jan 12 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 1.7.2-4
- Fix Requires, BuildRequires: bitstream-vera-fonts-{sans,sans-mono,serif}
  fixes broken deps



Index: php-ZendFramework.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php-ZendFramework/devel/php-ZendFramework.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- php-ZendFramework.spec	2 Jan 2009 11:30:13 -0000	1.9
+++ php-ZendFramework.spec	13 Jan 2009 03:37:07 -0000	1.10
@@ -3,7 +3,7 @@
 Summary:         Leading open-source PHP framework
 Name:            php-ZendFramework
 Version:         1.7.2
-Release:         3%{?dist}
+Release:         4%{?dist}
 
 License:         BSD
 Group:           Development/Libraries
@@ -57,8 +57,8 @@
 Group:    Development/Libraries
 Requires: %{name} = %{version}-%{release}
 Requires: php-pear(pear.phpunit.de/PHPUnit) >= 3.0.0
-Requires: bitstream-vera-fonts
-BuildRequires: bitstream-vera-fonts
+Requires: bitstream-vera-fonts-sans bitstream-vera-fonts-sans-mono bitstream-vera-fonts-serif
+BuildRequires: bitstream-vera-fonts-sans bitstream-vera-fonts-sans-mono bitstream-vera-fonts-serif
 
 %description tests
 This package includes Zend Framework unit tests for all available subpackages.
@@ -453,6 +453,10 @@
 
 
 %changelog
+* Mon Jan 12 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 1.7.2-4
+- Fix Requires, BuildRequires: bitstream-vera-fonts-{sans,sans-mono,serif}
+  fixes broken deps
+
 * Fri Jan  2 2009 Alexander Kahl <akahl at iconmobile.com> - 1.7.2-3
 - +BuildRequires: bitstream-vera-fonts
 - -Requires: bitstream-vera-fonts



From quantumburnz at fedoraproject.org  Tue Jan 13 03:39:10 2009
From: quantumburnz at fedoraproject.org (Christopher D. Stover)
Date: Tue, 13 Jan 2009 03:39:10 +0000 (UTC)
Subject: rpms/barry/F-10 .cvsignore, 1.2, 1.3 barry.spec, 1.2, 1.3 sources,
	1.2, 1.3
Message-ID: <20090113033910.D5A9370129@cvs1.fedora.phx.redhat.com>

Author: quantumburnz

Update of /cvs/pkgs/rpms/barry/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2189

Modified Files:
	.cvsignore barry.spec sources 
Log Message:
new source


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/barry/F-10/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	12 Nov 2008 20:24:06 -0000	1.2
+++ .cvsignore	13 Jan 2009 03:38:40 -0000	1.3
@@ -1 +1 @@
-barry-0.14.tar.bz2
+barry-0.15-20090109.tar.bz2


Index: barry.spec
===================================================================
RCS file: /cvs/pkgs/rpms/barry/F-10/barry.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- barry.spec	13 Jan 2009 03:31:52 -0000	1.2
+++ barry.spec	13 Jan 2009 03:38:40 -0000	1.3
@@ -6,7 +6,7 @@
 
 Name:           barry
 Version:        0.15
-Release:        0.3.20090109git%{?dist}
+Release:        0.4.20090109git%{?dist}
 Summary:        BlackBerry Desktop for Linux
 
 Group:          Applications/Productivity
@@ -201,8 +201,11 @@
 %postun libs -p /sbin/ldconfig
 
 %changelog
+* Mon Jan 12 2009 Christopher D. Stover <quantumburnz at hotmail.com> 0.15-0.4.20090109git
+- release bump for new source
+
 * Mon Jan 12 2009 Christopher D. Stover <quantumburnz at hotmail.com> 0.15-0.3.20090109git
-- version bump for proper patch name
+- release bump for proper patch name
 
 * Mon Jan 12 2009 Christopher D. Stover <quantumburnz at hotmail.com> 0.15-0.2.20090109git
 - enable fuse module during build


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/barry/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	12 Nov 2008 20:24:06 -0000	1.2
+++ sources	13 Jan 2009 03:38:40 -0000	1.3
@@ -1 +1 @@
-8c93abd0011568b540b799d1faa9a625  barry-0.14.tar.bz2
+03f78f7a136eae0ca0b7310354a35afd  barry-0.15-20090109.tar.bz2



From firewing at fedoraproject.org  Tue Jan 13 03:42:24 2009
From: firewing at fedoraproject.org (Stewart Adam)
Date: Tue, 13 Jan 2009 03:42:24 +0000 (UTC)
Subject: rpms/audio-convert-mod/devel .cvsignore, 1.5,
	1.6 audio-convert-mod.spec, 1.8, 1.9 sources, 1.5,
	1.6 audio-convert-mod-3.45.4-lame.patch, 1.1, NONE
Message-ID: <20090113034224.644F470129@cvs1.fedora.phx.redhat.com>

Author: firewing

Update of /cvs/extras/rpms/audio-convert-mod/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2742

Modified Files:
	.cvsignore audio-convert-mod.spec sources 
Removed Files:
	audio-convert-mod-3.45.4-lame.patch 
Log Message:
Update to 3.45.5



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/audio-convert-mod/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	11 May 2008 21:46:49 -0000	1.5
+++ .cvsignore	13 Jan 2009 03:41:53 -0000	1.6
@@ -1 +1 @@
-audio-convert-mod-3.45.4.tar.gz
+audio-convert-mod-3.45.5.tar.gz


Index: audio-convert-mod.spec
===================================================================
RCS file: /cvs/extras/rpms/audio-convert-mod/devel/audio-convert-mod.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- audio-convert-mod.spec	13 Dec 2008 20:34:44 -0000	1.8
+++ audio-convert-mod.spec	13 Jan 2009 03:41:54 -0000	1.9
@@ -1,47 +1,40 @@
-%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
-%define pythonname audio_convert_mod
-#define pretag rc1
-
 Name:              audio-convert-mod
-# can't use 3.45.3 for non-testing releases: 3.45.3beta > 3.45.3
-Version:           3.45.4
-Release:           3%{?dist}
-#Release:           0.1.%{pretag}%{?dist}
+Version:           3.45.5
+Release:           1%{?dist}
 BuildArch:         noarch
-Summary:           A simple audio file converter supporting many formats
+Summary:           A simple audio file converter which supports many formats
 Group:             Applications/Multimedia
 License:           GPLv2+
-URL:               http://www.diffingo.com/content/view/13/47/lang,en/
+URL:               http://www.diffingo.com/oss/audio-convert-mod
 Source0:           http://www.diffingo.com/downloads/audio-convert-mod/audio-convert-mod-%{version}.tar.gz
-Patch0:            audio-convert-mod-3.45.4-lame.patch
 BuildRoot:         %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:     desktop-file-utils
-BuildRequires:     gettext
-BuildRequires:     intltool, automake, make
+BuildRequires:     gettext, intltool, automake, autoconf
 BuildRequires:     python-devel >= 2.4
 Requires:          python >= 2.4
 Requires:          pygtk2, pygtk2-libglade
-Requires:          flac, vorbis-tools, wavpack
+Requires:          notify-python
+
+# FOSS encoders, decoders, taggers
+Requires:          flac
+Requires:          id3lib
+Requires:          libmp4v2
+Requires:          vorbis-tools
+Requires:          wavpack
 
 %description
-%{name} is a simple audio file converter supporting various formats
+audio-convert-mod is a simple audio file converter supporting various formats
 via external binaries. It facilitates the batch conversion of audio files
-from one format to another by access from the menu or by the user script where
-at a right-click files can be converted at once. It also supports file
-tags/metadata where applicable.
+from one format to another at a right-click. Drag-and-drop is also supported.
+File tags/metadata are preserved when possible.
 
 
 %prep
 %setup -q
-#setup -q -n %{name}-%{version}%{pretag}
-
-%patch0 -b .lame
 
 %build
 %configure
-# We don't implement this yet
-# make %{?_smp_mflags}
 make
 
 %install
@@ -55,19 +48,28 @@
 
 %find_lang %{name}
 
+%check
+make check
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING NEWS INSTALL README TODO
 %{_bindir}/*
 %{_datadir}/%{name}/
 %{_datadir}/applications/fedora-*.desktop
-%{python_sitelib}/%{pythonname}/
+
+%doc AUTHORS ChangeLog COPYING NEWS INSTALL README TODO
 
 
 %changelog
+* Mon Jan 12 2009 Stewart Adam <s.adam at diffingo.com> - 3.45.5-1
+- Update to 3.45.5 (see ChangeLog for details on version changes)
+- Add BR on autoconf
+- Require libmp4v2 for AAC tagging, id3lib for MP3 tagging and notify-python
+- Add %%check section
+
 * Sat Dec 13 2008 Stewart Adam <s.adam at diffingo.com> - 3.45.4-3
 - Add patch for fixing lame decode
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/audio-convert-mod/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	11 May 2008 21:46:49 -0000	1.5
+++ sources	13 Jan 2009 03:41:54 -0000	1.6
@@ -1 +1 @@
-d4b1a16aab437301f499b15925c9aff1  audio-convert-mod-3.45.4.tar.gz
+39bba3a8ecae014e58d72d56d5fd46ec  audio-convert-mod-3.45.5.tar.gz


--- audio-convert-mod-3.45.4-lame.patch DELETED ---



From quantumburnz at fedoraproject.org  Tue Jan 13 03:45:47 2009
From: quantumburnz at fedoraproject.org (Christopher D. Stover)
Date: Tue, 13 Jan 2009 03:45:47 +0000 (UTC)
Subject: rpms/barry/F-9 barry-ipmodem.patch, NONE, 1.1 .cvsignore, 1.2,
	1.3 barry.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20090113034547.6725370129@cvs1.fedora.phx.redhat.com>

Author: quantumburnz

Update of /cvs/pkgs/rpms/barry/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3484

Modified Files:
	.cvsignore barry.spec sources 
Added Files:
	barry-ipmodem.patch 
Log Message:
version bump

barry-ipmodem.patch:

--- NEW FILE barry-ipmodem.patch ---
diff --git a/src/m_ipmodem.cc b/src/m_ipmodem.cc
index 23c81c1..dae0f08 100644
--- a/src/m_ipmodem.cc
+++ b/src/m_ipmodem.cc
@@ -60,95 +60,78 @@ IpModem::~IpModem()
 	}
 }
 
-bool IpModem::SendPassword(const char *password)
+bool IpModem::SendPassword( const char *password, uint32_t seed )
 {
-	if( !password || strlen(password) == 0  ) {
-		throw BadPassword("No password provided.", 0, false);
-	}
-
 	int read_ep  = m_con.GetProbeResult().m_epModem.read;
 	int write_ep = m_con.GetProbeResult().m_epModem.write;
+	unsigned char pwdigest[SHA_DIGEST_LENGTH];
+	unsigned char prefixedhash[SHA_DIGEST_LENGTH + 4];
+	unsigned char pw_response[SHA_DIGEST_LENGTH + 8];
+	uint32_t new_seed;
 	Data data;
 
-	m_dev.BulkWrite(write_ep, pw_start, sizeof(pw_start));
-	m_dev.BulkRead(read_ep, data);
-	ddout("IPModem read packet.\n" << data);
-
-	// Need to add checks for other packet types.
-	// check for 02 00 00 00 SS SS SS SS RR 00 00 00 0a 00 00 00 PP PP PP PP PP 00 00 00 78 56 34 12
-        if( data.GetSize() >= 9 && data.GetData()[0] == 0x02  &&
-	    memcmp(data.GetData() + data.GetSize() - 4, special_flag, sizeof(special_flag))== 0 ) {
-		// Got a password request packet
-		ddout("IPModem password request packet:\n" << data);
-
-		// Check how many retries are left
-		if( data.GetData()[8] < BARRY_MIN_PASSWORD_TRIES ) {
-			throw BadPassword("Fewer than " BARRY_MIN_PASSWORD_TRIES_ASC " password tries remaining in device. Refusing to proceed, to avoid device zapping itself.  Use a Windows client, or re-cradle the device.",
-				data.GetData()[8],
-				true);
-		}
+	if( !password || strlen(password) == 0  ) {
+		throw BadPassword("No password provided.", 0, false);
+	}
 
-		// Build the password hash
-		unsigned char pwdigest[SHA_DIGEST_LENGTH];
-		unsigned char prefixedhash[SHA_DIGEST_LENGTH + 4];
-		unsigned char pw_response[SHA_DIGEST_LENGTH + 8];
-		unsigned char seed[4];
+	// Build the password hash
+	// first, hash the password by itself
+	SHA1((unsigned char *) password, strlen(password), pwdigest);
 
-		// first, hash the password by itself
-		SHA1((unsigned char *) password, strlen(password), pwdigest);
+	// prefix the resulting hash with the provided seed
+	memcpy(&prefixedhash[0], &seed, sizeof(uint32_t));
+	memcpy(&prefixedhash[4], pwdigest, SHA_DIGEST_LENGTH);
 
-		// prefix the resulting hash with the provided seed
-		memcpy(&seed[0], data.GetData() + 4, sizeof(uint32_t));
-		memcpy(&prefixedhash[0], &seed, sizeof(uint32_t));
-		memcpy(&prefixedhash[4], pwdigest, SHA_DIGEST_LENGTH);
+	// hash again
+	SHA1((unsigned char *) prefixedhash, SHA_DIGEST_LENGTH + 4, pwdigest);
 
-		// hash again
-		SHA1((unsigned char *) prefixedhash, SHA_DIGEST_LENGTH + 4, pwdigest);
+	// Build the response packet
+	const char pw_rsphdr[]  = { 0x03, 0x00, 0x00, 0x00 };
+	memcpy(&pw_response[0], pw_rsphdr, sizeof(pw_rsphdr));
+	memcpy(&pw_response[4], pwdigest, SHA_DIGEST_LENGTH);
+	memcpy(&pw_response[24], special_flag, sizeof(special_flag));
 
-		// Build the response packet
-		const char pw_rsphdr[]  = { 0x03, 0x00, 0x00, 0x00 };
-		memcpy(&pw_response[0], pw_rsphdr, sizeof(pw_rsphdr));
-		memcpy(&pw_response[4], pwdigest, SHA_DIGEST_LENGTH);
-		memcpy(&pw_response[24], special_flag, sizeof(special_flag));
+	// Send the password response packet
+	m_dev.BulkWrite(write_ep, pw_response, sizeof(pw_response));
+	m_dev.BulkRead(read_ep, data);
+	ddout("IPModem: Read password response.\n" << data);
 
-		// Send the password response packet
-		m_dev.BulkWrite(write_ep, pw_response, sizeof(pw_response));
-		m_dev.BulkRead(read_ep, data);
-		ddout("IPModem read password response.\n" << data);
-
-		// check response 04 00 00 00 .......
-		// On the 8703e the seed is incremented, retries are reset to 10 when the password is accepted.
-		// if( data.GetData()[0] == 0x04  && data.GetData()[8] == 0x0a ) {
-                if( data.GetSize() >= 9 && data.GetData()[0] == 0x04 ) {
-			if( memcmp(data.GetData() + 4, seed, sizeof(seed)) == 0 ) {
-				ddout("IPModem invalid password.\n" << data);
-				throw BadPassword("Password rejected by device.", data.GetData()[8], false);
-			}
-			ddout("IPModem password accepted.\n");
-			// send "start"? packet
-			m_dev.BulkWrite(write_ep, pw_start, sizeof(pw_start));
+	// Added for the BB Storm 9000's second password request
+	if( data.GetSize() >= 16 && data.GetData()[0] == 0x00 ) {
+		try {
+			m_dev.BulkRead(read_ep, data, 500);
+			ddout("IPModem: Null Response Packet:\n" << data);
+		}
+		catch( Usb::Timeout &to ) {
+			// do nothing on timeouts
+			ddout("IPModem: Null Response Timeout");
+		}
+	}
 
-			// send packet with the last 8 bytes of the password hash (session_key?)
-			//unsigned char pw_response[SHA_DIGEST_LENGTH + 8];
-			unsigned char pw_rsphdr[] = { 0x00, 0, 0, 0, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0xc2, 1, 0 };
+	// check response 04 00 00 00 .......
+	// On the 8703e the seed is incremented, retries are reset to 10 when the password is accepted.
+	// If data.GetData() + 4 is = to the orginal seed +1 or 00 00 00 00 then the password was acceppted.
+	// When data.GetData() + 4 is not 00 00 00 00 then data.GetData()[8] contains the number of password retrys left.
+	if( data.GetSize() >= 9 && data.GetData()[0] == 0x04 ) {
+		memcpy(&new_seed, data.GetData() + 4, sizeof(uint32_t));
+		seed++;
+		if( seed == new_seed || new_seed == 0 ) {
+			ddout("IPModem: Password accepted.\n");
+			// Create session key - last 8 bytes of the password hash
 			memcpy(&m_session_key[0], pwdigest + 12, sizeof(m_session_key));
-			memcpy(&pw_response[0], pw_rsphdr, sizeof(pw_rsphdr));
-			memcpy(&pw_response[16], pwdigest + 12, 8);
-			//memcpy(&pw_response[16], m_session_key, 8);
-			memcpy(&pw_response[24], special_flag, sizeof(special_flag));
-			m_dev.BulkWrite(write_ep, pw_response, sizeof(pw_response));
 
 			// blank password hashes as we don't need these anymore
 			memset(pwdigest, 0, sizeof(pwdigest));
 			memset(prefixedhash, 0, sizeof(prefixedhash));
-
-			// The modem should be ready to accept AT commands
 			return true;
 		}
-
-		// Unknown packet
-		ddout("IPModem Error unknown packet.\n" << data);
+		else {
+			ddout("IPModem: Invalid password.\n" << data);
+			throw BadPassword("Password rejected by device.", data.GetData()[8], false);
+		}
 	}
+	// Unknown packet
+	ddout("IPModem: Error unknown packet.\n" << data);
 	return false;
 }
 
@@ -172,7 +155,7 @@ void *IpModem::DataReadThread(void *userptr)
 			if( data.GetSize() > 4 &&
 			    memcmp(data.GetData() + data.GetSize() - 4, special_flag, sizeof(special_flag)) == 0 ) {
 				// log, then drop it on the floor for now
-				ddout("IPModem special packet:\n" << data);
+				ddout("IPModem: Special packet:\n" << data);
 				continue;
 			}
 
@@ -190,7 +173,7 @@ void *IpModem::DataReadThread(void *userptr)
 		}
 		catch( Usb::Timeout &to ) {
 			// do nothing on timeouts
-			ddout("Timeout in DataReadThread!");
+			ddout("IPModem: Timeout in DataReadThread!");
 		}
 		catch( std::exception &e ) {
 			eout("Exception in IpModem::DataReadThread: " << e.what());
@@ -207,7 +190,10 @@ void IpModem::Open(const char *password)
 {
 	int read_ep  = m_con.GetProbeResult().m_epModem.read;
 	int write_ep = m_con.GetProbeResult().m_epModem.write;
+	unsigned char response[28];
+	uint32_t seed;
 	Data data;
+
 	// check that we have endpoints for the modem
 	const Usb::EndpointPair &pair = m_con.GetProbeResult().m_epModem;
 	if( !pair.IsComplete() ) {
@@ -224,28 +210,110 @@ void IpModem::Open(const char *password)
 	m_dev.ClearHalt(pair.read);
 	m_dev.ClearHalt(pair.write);
 
-	if( !password || strlen(password) == 0 ) {
-		Data block(start, sizeof(start));
-		Write(block);
+	// Send stop command
+	ddout("IPModem: Sending Stop Response:\n");
+	m_dev.BulkWrite(write_ep, stop, sizeof(stop));
+	try {
+		m_dev.BulkRead(read_ep, data, 500);
+		ddout("IPModem: Stop Response Packet:\n" << data);
 	}
-	else {
-		if( !SendPassword(password) ) {
-			throw Barry::Error("IpModem:: Error sending password.");
+	catch( Usb::Timeout &to ) {
+		// do nothing on timeouts
+		ddout("IPModem: Stop Response Timeout");
+	}
+
+	// Send start commands to figure out if the device needs a password.
+	ddout("IPModem: Sending Start Response:\n");
+	m_dev.BulkWrite(write_ep, pw_start, sizeof(pw_start));
+	m_dev.BulkRead(read_ep, data, 5000);
+	ddout("IPModem: Start Response Packet:\n" << data);
+
+	// check for 02 00 00 00 SS SS SS SS RR 00 00 00 0a 00 00 00 PP PP PP PP PP 00 00 00 78 56 34 12
+        if( data.GetSize() >= 9 && data.GetData()[0] == 0x02  &&
+	    memcmp(data.GetData() + data.GetSize() - 4, special_flag, sizeof(special_flag))== 0 ) {
+		// Got a password request packet
+		ddout("IPModem: Password request packet:\n" << data);
+
+		// Check how many retries are left
+		if( data.GetData()[8] < BARRY_MIN_PASSWORD_TRIES ) {
+			throw BadPassword("Fewer than " BARRY_MIN_PASSWORD_TRIES_ASC " password tries remaining in device. Refusing to proceed, to avoid device zapping itself.  Use a Windows client, or re-cradle the device.",
+				data.GetData()[8],
+				true);
+		}
+		memcpy(&seed, data.GetData() + 4, sizeof(uint32_t));
+		// Send password
+		if( !SendPassword(password, seed) ) {
+			throw Barry::Error("IpModem: Error sending password.");
+		}
+
+		// Re-send "start" packet
+		ddout("IPModem: Re-sending Start Response:\n");
+		m_dev.BulkWrite(write_ep, pw_start, sizeof(pw_start));
+		m_dev.BulkRead(read_ep, data);
+		ddout("IPModem: Start Response Packet:\n" << data);
+
+		// send packet with the session_key
+		unsigned char response_header[] = { 0x00, 0, 0, 0, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0xc2, 1, 0 };
+		memcpy(&response[0], response_header, sizeof(response_header));
+		memcpy(&response[16], m_session_key,  sizeof(m_session_key));
+		memcpy(&response[24], special_flag, sizeof(special_flag));
+		ddout("IPModem: Sending Session key:\n");
+		m_dev.BulkWrite(write_ep, response, sizeof(response));
+		if( data.GetSize() >= 16 ) {
+			switch(data.GetData()[0])
+			{
+			case 0x00:	// Null packet
+				break;
+
+			case 0x02:	// password seed received
+				memcpy(&seed, data.GetData() + 4, sizeof(uint32_t));
+				if( !SendPassword( password, seed ) ) {
+					throw Barry::Error("IpModem: Error sending password.");
+				}
+				break;
+			case 0x04:	// command accepted
+				break;
+
+			default: 	// ???
+				ddout("IPModem: Unknown response.\n");
+				break;
+			}
 		}
+
 	}
 
 	// see if the modem will respond to commands
 	const char modem_command[] = { "AT\r" };
+	//ddout("IPModem: Test command response.\n" << data);
 	m_dev.BulkWrite(write_ep, modem_command, strlen(modem_command));
 	m_dev.BulkRead(read_ep, data);
-	ddout("IPModem:: AT command response.\n" << data);
+	ddout("IPModem: Test command response.\n" << data);
 	if( data.GetSize() >= 1 ) {
 		switch(data.GetData()[0])
 		{
-		case 0x02:	// password seed received
-			throw BadPassword("This device requested a password.",
-				data.GetSize() >= 9 ? data.GetData()[8] : 0, false);
+		case 0x00:	// Null packet
+			try {
+				m_dev.BulkRead(read_ep, data, 5000);
+				ddout("IPModem: AT Response Packet:\n" << data);
+			}
+			catch( Usb::Timeout &to ) {
+				// do nothing on timeouts
+				ddout("IPModem: AT Response Timeout");
+			}
+			break;
 
+		case 0x02:	// password seed received
+			if( !password || strlen(password) == 0 ) {
+				throw BadPassword("This device requested a password.",
+					data.GetSize() >= 9 ? data.GetData()[8] : 0, false);
+			}
+			else {	// added for the Storm 9000
+				memcpy(&seed, data.GetData() + 4, sizeof(uint32_t));
+				if( !SendPassword( password, seed ) ) {
+					throw Barry::Error("IpModem: Error sending password.");
+				}
+			}
+			break;
 		case 0x04:	// command accepted
 			break;
 
@@ -253,17 +321,18 @@ void IpModem::Open(const char *password)
 			throw BadPassword("This device requires a password.", 0, false);
 
 		default: 	// ???
-			ddout("IPModem:: unknown AT command response.\n");
+			ddout("IPModem: Unknown AT command response.\n");
 			break;
 		}
 	}
+	ddout("IPModem: Modem Ready.\n");
 
 	// spawn read thread
 	m_continue_reading = true;
 	int ret = pthread_create(&m_modem_read_thread, NULL, &IpModem::DataReadThread, this);
 	if( ret ) {
 		m_continue_reading = false;
-		throw Barry::ErrnoError("IpModem:: Error creating USB read thread.", ret);
+		throw Barry::ErrnoError("IpModem: Error creating USB read thread.", ret);
 	}
 }
 
@@ -293,7 +362,7 @@ void IpModem::Close()
 	Data data;
 
 	//0 0 0 0 b0 0 0 0 0 0 0 0 0 c2 1 0 + session_key + special_flag
-	ddout("IpModem:: Closing connection.");
+	ddout("IpModem: Closing connection.");
 	memset(end, 0, sizeof(end));
 	end[4]  = 0xb0;
 	end[13] = 0xc2;
@@ -324,18 +393,18 @@ void IpModem::Close()
 	m_dev.BulkWrite(write_ep, stop, sizeof(stop));
 	try {
 		m_dev.BulkRead(read_ep, data, 5000);
-		ddout("IPModem:: Close read packet:\n" << data);
+		ddout("IPModem: Close read packet:\n" << data);
 	}
 	catch( Usb::Timeout &to ) {
 		// do nothing on timeouts
-		ddout("IPModem:: Close Read Timeout");
+		ddout("IPModem: Close Read Timeout");
 	}
 	// stop the read thread
 	if( m_continue_reading ) {
 		m_continue_reading = false;
 		pthread_join(m_modem_read_thread, NULL);
 	}
-	ddout("IPmodem:: Closed!");
+	ddout("IPmodem: Closed!");
 
 }
 
diff --git a/src/m_ipmodem.h b/src/m_ipmodem.h
index 23e5ffa..c58882f 100644
--- a/src/m_ipmodem.h
+++ b/src/m_ipmodem.h
@@ -59,7 +59,7 @@ private:
 	unsigned char m_session_key[8];		// = { 0x00, 0, 0, 0, 0, 0, 0, 0 };
 
 private:
-	BXLOCAL bool SendPassword(const char *password = 0);
+	BXLOCAL bool SendPassword(const char *password = 0, uint32_t seed = 0);
 
 protected:
 	static void *DataReadThread(void *userptr);


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/barry/F-9/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	12 Nov 2008 20:36:13 -0000	1.2
+++ .cvsignore	13 Jan 2009 03:45:16 -0000	1.3
@@ -1 +1 @@
-barry-0.14.tar.bz2
+barry-0.15-20090109.tar.bz2


Index: barry.spec
===================================================================
RCS file: /cvs/pkgs/rpms/barry/F-9/barry.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- barry.spec	12 Nov 2008 20:36:13 -0000	1.1
+++ barry.spec	13 Jan 2009 03:45:16 -0000	1.2
@@ -1,26 +1,34 @@
-# Fedora 9/10 doesn't support opensync 0.22
+# Fedora 9/10/11 don't support opensync 0.22
 %define with_opensync 1
-%if 0%{?fc9}
-    %define with_opensync 0
-%endif
-%if 0%{?fc10}
+%if %{?fedora} > 8
     %define with_opensync 0
 %endif
 
 Name:           barry
-Version:        0.14
-Release:        4%{?dist}
+Version:        0.15
+Release:        0.4.20090109git%{?dist}
 Summary:        BlackBerry Desktop for Linux
 
 Group:          Applications/Productivity
 License:        GPLv2+
 URL:            http://www.netdirect.ca/downloads/barry
-Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
+# The source for this package was pulled from upstream's git.  Use the following
+# commands to generate the tarball:
+# git clone git://repo.or.cz/barry.git
+# cd barry/maintainer
+# ./git-extract.sh 0 15 master
+# (cd build/barry* && ../../tar-prepare.sh)
+# (cd build && ../tar-create.sh 0 15)
+Source0:        %{name}-%{version}-20090109.tar.bz2
 Source1:        %{name}.desktop
+# ip_modem password patch for the Blackberry Bold 9000
+# http://sourceforge.net/mailarchive/forum.php?thread_name=4968F513.1050909%40comcast.net&forum_name=barry-devel
+Patch0:         barry-ipmodem.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libusb-devel boost-devel desktop-file-utils gtkmm24-devel
-BuildRequires:  libglademm24-devel libglade2-devel libtar-devel
+BuildRequires:  libglademm24-devel libglade2-devel libtar-devel libtool
+BuildRequires:  fuse-devel
 Requires:       initscripts
 
 %description
@@ -60,7 +68,7 @@
 Summary: BlackBerry Desktop for Linux - opensync plugin
 Group: Applications/Productivity
 BuildRequires: libopensync-devel
-Requires: libopensync
+Requires: libopensync == 0.22
 
 %description opensync
 Barry is a desktop toolset for managing your BlackBerry device.
@@ -72,6 +80,26 @@
 %setup -q
 %{__rm} -rf ./doc/www/*.php
 %{__rm} -rf ./doc/www/*.sh
+%{__rm} -rf ./doc/www/doxygen/html/scoped__lock_8h__incl.map
+%{__rm} -rf ./doc/www/doxygen/html/classBarry_1_1ZeroPacket__inherit__graph.map
+%{__rm} -rf ./doc/www/doxygen/html/dataqueue_8h__incl.map
+%{__rm} -rf ./doc/www/doxygen/html/classBarry_1_1ZeroPacket__coll__graph.map
+%{__rm} -rf ./doc/www/doxygen/html/protostructs_8h__incl.map
+%{__rm} -rf ./doc/www/doxygen/html/classBarry_1_1DBPacket__inherit__graph.map
+%{__rm} -rf ./doc/www/doxygen/html/bcharge_8cc__incl.map
+%{__rm} -rf ./doc/www/doxygen/html/bidentify_8cc__incl.map
+%{__rm} -rf ./doc/www/doxygen/html/packet_8h__incl.map
+%{__rm} -rf ./doc/www/doxygen/html/strnlen_8h__incl.map
+%{__rm} -rf ./doc/www/doxygen/html/bs11nread_8cc__incl.map
+%{__rm} -rf ./doc/www/doxygen/html/bfuse_8cc__incl.map
+%{__rm} -rf ./doc/www/doxygen/html/btool_8cc__incl.map
+%{__rm} -rf ./doc/www/doxygen/html/pppob_8cc__incl.map
+%{__rm} -rf ./doc/www/doxygen/html/upldif_8cc__incl.map
+%{__rm} -rf ./doc/www/doxygen/html/brecsum_8cc__incl.map
+%{__rm} -rf ./doc/www/doxygen/html/breset_8cc__incl.map
+%{__rm} -rf ./doc/www/doxygen/html/endian_8h__incl.map
+%patch0 -p1
+
 
 %build
 # main tree
@@ -85,6 +113,10 @@
 %{configure} PKG_CONFIG_PATH="..:$PKG_CONFIG_PATH" CXXFLAGS="-I../.." LDFLAGS="-L../../src"
 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
+# Touch-magic to prevent auto* from running.  Thank you Andreas Metzler.
+touch -r Makefile ./src/Makefile ./src/Makefile.am ./src/Makefile.in \
+  ./man/Makefile.am ./man/Makefile.in config.h config.h.in Makefile.am \
+  Makefile.in configure.ac aclocal.m4 configure
 %{__make} %{?_smp_mflags}
 cd ../
 
@@ -94,7 +126,6 @@
 %{configure} PKG_CONFIG_PATH="..:$PKG_CONFIG_PATH" CXXFLAGS="-I../.." LDFLAGS="-L../../src"
 sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
 sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
-%{__make} %{?_smp_mflags}
 cd ../
 %endif
 
@@ -170,6 +201,25 @@
 %postun libs -p /sbin/ldconfig
 
 %changelog
+* Mon Jan 12 2009 Christopher D. Stover <quantumburnz at hotmail.com> 0.15-0.4.20090109git
+- release bump for new source
+
+* Mon Jan 12 2009 Christopher D. Stover <quantumburnz at hotmail.com> 0.15-0.3.20090109git
+- release bump for proper patch name
+
+* Mon Jan 12 2009 Christopher D. Stover <quantumburnz at hotmail.com> 0.15-0.2.20090109git
+- enable fuse module during build
+- include ip_modem password patch for the Blackberry Bold 9000
+
+* Mon Jan 12 2009 Christopher D. Stover <quantumburnz at hotmail.com> 0.15-0.1.20090109git
+- version/git bump
+
+* Thu Dec 18 2008 Petr Machata <pmachata at redhat.com> - 0.14-6
+- rebuild for new boost
+
+* Mon Nov 12 2008 Christopher D. Stover <quantumburnz at hotmail.com> 0.14-5
+- removed opensync support for F11
+
 * Mon Nov 10 2008 Christopher D. Stover <quantumburnz at hotmail.com> 0.14-4
 - merged gui with the main package
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/barry/F-9/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	12 Nov 2008 20:36:13 -0000	1.2
+++ sources	13 Jan 2009 03:45:16 -0000	1.3
@@ -1 +1 @@
-8c93abd0011568b540b799d1faa9a625  barry-0.14.tar.bz2
+03f78f7a136eae0ca0b7310354a35afd  barry-0.15-20090109.tar.bz2



From deji at fedoraproject.org  Tue Jan 13 04:03:45 2009
From: deji at fedoraproject.org (Deji Akingunola)
Date: Tue, 13 Jan 2009 04:03:45 +0000 (UTC)
Subject: rpms/gnome-scan/devel gnome-scan.spec,1.9,1.10
Message-ID: <20090113040345.29A4F70129@cvs1.fedora.phx.redhat.com>

Author: deji

Update of /cvs/pkgs/rpms/gnome-scan/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6182

Modified Files:
	gnome-scan.spec 
Log Message:
Add missing BR (intltool)



Index: gnome-scan.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-scan/devel/gnome-scan.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- gnome-scan.spec	13 Jan 2009 03:33:15 -0000	1.9
+++ gnome-scan.spec	13 Jan 2009 04:03:14 -0000	1.10
@@ -9,7 +9,7 @@
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	gtk2-devel libgnomeui-devel sane-backends-devel
 BuildRequires:	gegl-devel gimp-devel
-BuildRequires:	gettext perl(XML::Parser) pkgconfig
+BuildRequires:	gettext perl(XML::Parser) pkgconfig intltool
 BuildRequires:	desktop-file-utils gtk-doc gnome-doc-utils
 Requires:	gimp
 Provides:	flegita = %{version}-%{release}



From firewing at fedoraproject.org  Tue Jan 13 04:10:38 2009
From: firewing at fedoraproject.org (Stewart Adam)
Date: Tue, 13 Jan 2009 04:10:38 +0000 (UTC)
Subject: rpms/audio-convert-mod/F-9 .cvsignore, 1.5,
	1.6 audio-convert-mod.spec, 
	1.8, 1.9 sources, 1.5, 1.6 audio-convert-mod-3.45.4-lame.patch,
	1.1, NONE
Message-ID: <20090113041038.7A2CF70141@cvs1.fedora.phx.redhat.com>

Author: firewing

Update of /cvs/extras/rpms/audio-convert-mod/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6962/F-9

Modified Files:
	.cvsignore audio-convert-mod.spec sources 
Removed Files:
	audio-convert-mod-3.45.4-lame.patch 
Log Message:
Update to 3.45.5



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/audio-convert-mod/F-9/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	11 May 2008 21:46:40 -0000	1.5
+++ .cvsignore	13 Jan 2009 04:10:08 -0000	1.6
@@ -1 +1 @@
-audio-convert-mod-3.45.4.tar.gz
+audio-convert-mod-3.45.5.tar.gz


Index: audio-convert-mod.spec
===================================================================
RCS file: /cvs/extras/rpms/audio-convert-mod/F-9/audio-convert-mod.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- audio-convert-mod.spec	13 Dec 2008 20:34:44 -0000	1.8
+++ audio-convert-mod.spec	13 Jan 2009 04:10:08 -0000	1.9
@@ -1,47 +1,40 @@
-%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
-%define pythonname audio_convert_mod
-#define pretag rc1
-
 Name:              audio-convert-mod
-# can't use 3.45.3 for non-testing releases: 3.45.3beta > 3.45.3
-Version:           3.45.4
-Release:           2%{?dist}
-#Release:           0.1.%{pretag}%{?dist}
+Version:           3.45.5
+Release:           1%{?dist}
 BuildArch:         noarch
-Summary:           A simple audio file converter supporting many formats
+Summary:           A simple audio file converter which supports many formats
 Group:             Applications/Multimedia
 License:           GPLv2+
-URL:               http://www.diffingo.com/content/view/13/47/lang,en/
+URL:               http://www.diffingo.com/oss/audio-convert-mod
 Source0:           http://www.diffingo.com/downloads/audio-convert-mod/audio-convert-mod-%{version}.tar.gz
-Patch0:            audio-convert-mod-3.45.4-lame.patch
 BuildRoot:         %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:     desktop-file-utils
-BuildRequires:     gettext
-BuildRequires:     intltool, automake, make
+BuildRequires:     gettext, intltool, automake, autoconf
 BuildRequires:     python-devel >= 2.4
 Requires:          python >= 2.4
 Requires:          pygtk2, pygtk2-libglade
-Requires:          flac, vorbis-tools, wavpack
+Requires:          notify-python
+
+# FOSS encoders, decoders, taggers
+Requires:          flac
+Requires:          id3lib
+Requires:          libmp4v2
+Requires:          vorbis-tools
+Requires:          wavpack
 
 %description
-%{name} is a simple audio file converter supporting various formats
+audio-convert-mod is a simple audio file converter supporting various formats
 via external binaries. It facilitates the batch conversion of audio files
-from one format to another by access from the menu or by the user script where
-at a right-click files can be converted at once. It also supports file
-tags/metadata where applicable.
+from one format to another at a right-click. Drag-and-drop is also supported.
+File tags/metadata are preserved when possible.
 
 
 %prep
 %setup -q
-#setup -q -n %{name}-%{version}%{pretag}
-
-%patch0 -b .lame
 
 %build
 %configure
-# We don't implement this yet
-# make %{?_smp_mflags}
 make
 
 %install
@@ -55,19 +48,28 @@
 
 %find_lang %{name}
 
+%check
+make check
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING NEWS INSTALL README TODO
 %{_bindir}/*
 %{_datadir}/%{name}/
 %{_datadir}/applications/fedora-*.desktop
-%{python_sitelib}/%{pythonname}/
+
+%doc AUTHORS ChangeLog COPYING NEWS INSTALL README TODO
 
 
 %changelog
+* Mon Jan 12 2009 Stewart Adam <s.adam at diffingo.com> 3.45.5-1
+- Update to 3.45.5 (see ChangeLog for details on version changes)
+- Add BR on autoconf
+- Require libmp4v2 for AAC tagging, id3lib for MP3 tagging and notify-python
+- Add %%check section
+
 * Sat Dec 13 2008 Steart Adam <s.adam at diffingo.com> 3.45.4-2
 - Add patch for fixing lame decode
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/audio-convert-mod/F-9/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	11 May 2008 21:46:40 -0000	1.5
+++ sources	13 Jan 2009 04:10:08 -0000	1.6
@@ -1 +1 @@
-d4b1a16aab437301f499b15925c9aff1  audio-convert-mod-3.45.4.tar.gz
+39bba3a8ecae014e58d72d56d5fd46ec  audio-convert-mod-3.45.5.tar.gz


--- audio-convert-mod-3.45.4-lame.patch DELETED ---



From firewing at fedoraproject.org  Tue Jan 13 04:10:38 2009
From: firewing at fedoraproject.org (Stewart Adam)
Date: Tue, 13 Jan 2009 04:10:38 +0000 (UTC)
Subject: rpms/audio-convert-mod/F-10 .cvsignore, 1.5,
	1.6 audio-convert-mod.spec, 1.7, 1.8 sources, 1.5,
	1.6 audio-convert-mod-3.45.4-lame.patch, 1.1, NONE
Message-ID: <20090113041038.66AEA70129@cvs1.fedora.phx.redhat.com>

Author: firewing

Update of /cvs/extras/rpms/audio-convert-mod/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6962/F-10

Modified Files:
	.cvsignore audio-convert-mod.spec sources 
Removed Files:
	audio-convert-mod-3.45.4-lame.patch 
Log Message:
Update to 3.45.5



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/audio-convert-mod/F-10/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	11 May 2008 21:46:49 -0000	1.5
+++ .cvsignore	13 Jan 2009 04:10:07 -0000	1.6
@@ -1 +1 @@
-audio-convert-mod-3.45.4.tar.gz
+audio-convert-mod-3.45.5.tar.gz


Index: audio-convert-mod.spec
===================================================================
RCS file: /cvs/extras/rpms/audio-convert-mod/F-10/audio-convert-mod.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- audio-convert-mod.spec	13 Dec 2008 20:34:43 -0000	1.7
+++ audio-convert-mod.spec	13 Jan 2009 04:10:07 -0000	1.8
@@ -1,47 +1,40 @@
-%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
-%define pythonname audio_convert_mod
-#define pretag rc1
-
 Name:              audio-convert-mod
-# can't use 3.45.3 for non-testing releases: 3.45.3beta > 3.45.3
-Version:           3.45.4
-Release:           2%{?dist}
-#Release:           0.1.%{pretag}%{?dist}
+Version:           3.45.5
+Release:           1%{?dist}
 BuildArch:         noarch
-Summary:           A simple audio file converter supporting many formats
+Summary:           A simple audio file converter which supports many formats
 Group:             Applications/Multimedia
 License:           GPLv2+
-URL:               http://www.diffingo.com/content/view/13/47/lang,en/
+URL:               http://www.diffingo.com/oss/audio-convert-mod
 Source0:           http://www.diffingo.com/downloads/audio-convert-mod/audio-convert-mod-%{version}.tar.gz
-Patch0:            audio-convert-mod-3.45.4-lame.patch
 BuildRoot:         %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:     desktop-file-utils
-BuildRequires:     gettext
-BuildRequires:     intltool, automake, make
+BuildRequires:     gettext, intltool, automake, autoconf
 BuildRequires:     python-devel >= 2.4
 Requires:          python >= 2.4
 Requires:          pygtk2, pygtk2-libglade
-Requires:          flac, vorbis-tools, wavpack
+Requires:          notify-python
+
+# FOSS encoders, decoders, taggers
+Requires:          flac
+Requires:          id3lib
+Requires:          libmp4v2
+Requires:          vorbis-tools
+Requires:          wavpack
 
 %description
-%{name} is a simple audio file converter supporting various formats
+audio-convert-mod is a simple audio file converter supporting various formats
 via external binaries. It facilitates the batch conversion of audio files
-from one format to another by access from the menu or by the user script where
-at a right-click files can be converted at once. It also supports file
-tags/metadata where applicable.
+from one format to another at a right-click. Drag-and-drop is also supported.
+File tags/metadata are preserved when possible.
 
 
 %prep
 %setup -q
-#setup -q -n %{name}-%{version}%{pretag}
-
-%patch0 -b .lame
 
 %build
 %configure
-# We don't implement this yet
-# make %{?_smp_mflags}
 make
 
 %install
@@ -55,19 +48,28 @@
 
 %find_lang %{name}
 
+%check
+make check
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING NEWS INSTALL README TODO
 %{_bindir}/*
 %{_datadir}/%{name}/
 %{_datadir}/applications/fedora-*.desktop
-%{python_sitelib}/%{pythonname}/
+
+%doc AUTHORS ChangeLog COPYING NEWS INSTALL README TODO
 
 
 %changelog
+* Mon Jan 12 2009 Stewart Adam <s.adam at diffingo.com> 3.45.5-1
+- Update to 3.45.5 (see ChangeLog for details on version changes)
+- Add BR on autoconf
+- Require libmp4v2 for AAC tagging, id3lib for MP3 tagging and notify-python
+- Add %%check section
+
 * Sat Dec 13 2008 Steart Adam <s.adam at diffingo.com> 3.45.4-2
 - Add patch for fixing lame decode
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/audio-convert-mod/F-10/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	11 May 2008 21:46:49 -0000	1.5
+++ sources	13 Jan 2009 04:10:07 -0000	1.6
@@ -1 +1 @@
-d4b1a16aab437301f499b15925c9aff1  audio-convert-mod-3.45.4.tar.gz
+39bba3a8ecae014e58d72d56d5fd46ec  audio-convert-mod-3.45.5.tar.gz


--- audio-convert-mod-3.45.4-lame.patch DELETED ---



From alexlan at fedoraproject.org  Tue Jan 13 04:14:42 2009
From: alexlan at fedoraproject.org (Alex Lancaster)
Date: Tue, 13 Jan 2009 04:14:42 +0000 (UTC)
Subject: rpms/kawa/devel kawa.spec,1.23,1.24
Message-ID: <20090113041442.9F78370129@cvs1.fedora.phx.redhat.com>

Author: alexlan

Update of /cvs/pkgs/rpms/kawa/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7381

Modified Files:
	kawa.spec 
Log Message:
* Mon Jan 12 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 1:1.9.1-7
- Requires in -javadoc subpackage needs epoch



Index: kawa.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kawa/devel/kawa.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- kawa.spec	10 Nov 2008 21:02:43 -0000	1.23
+++ kawa.spec	13 Jan 2009 04:14:11 -0000	1.24
@@ -5,7 +5,7 @@
 %define nversion 1.9.1
 %define dversion 1.9.1
 
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: MIT
 Group: Development/Languages
 URL: http://www.gnu.org/software/kawa/
@@ -37,7 +37,7 @@
 %package        javadoc
 Summary:        Javadoc for %{name}
 Group:          Development/Documentation
-Requires:	%{name} = %{version}-%{release}
+Requires:	%{name} = %{epoch}:%{version}-%{release}
 
 %description    javadoc
 %{summary}.
@@ -99,6 +99,9 @@
 %doc %{_javadocdir}/%{name}
 
 %changelog
+* Mon Jan 12 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 1:1.9.1-7
+- Requires in -javadoc subpackage needs epoch
+
 * Mon Nov 10 2008 Anthony Green <green at redhat.com> - 1:1.9.1-6
 - The -javadoc package should Require the main package. (#451861)
 



From firewing at fedoraproject.org  Tue Jan 13 04:18:44 2009
From: firewing at fedoraproject.org (Stewart Adam)
Date: Tue, 13 Jan 2009 04:18:44 +0000 (UTC)
Subject: rpms/audio-convert-mod/F-9 audio-convert-mod.spec,1.9,1.10
Message-ID: <20090113041844.CC84270129@cvs1.fedora.phx.redhat.com>

Author: firewing

Update of /cvs/extras/rpms/audio-convert-mod/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8018

Modified Files:
	audio-convert-mod.spec 
Log Message:
Bump for retag


Index: audio-convert-mod.spec
===================================================================
RCS file: /cvs/extras/rpms/audio-convert-mod/F-9/audio-convert-mod.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- audio-convert-mod.spec	13 Jan 2009 04:10:08 -0000	1.9
+++ audio-convert-mod.spec	13 Jan 2009 04:18:14 -0000	1.10
@@ -1,6 +1,6 @@
 Name:              audio-convert-mod
 Version:           3.45.5
-Release:           1%{?dist}
+Release:           1%{?dist}.1
 BuildArch:         noarch
 Summary:           A simple audio file converter which supports many formats
 Group:             Applications/Multimedia
@@ -64,6 +64,9 @@
 
 
 %changelog
+* Mon Jan 12 2009 Stewart Adam <s.adam at diffingo.com> 3.45.5-1.1
+- Bump for retag
+
 * Mon Jan 12 2009 Stewart Adam <s.adam at diffingo.com> 3.45.5-1
 - Update to 3.45.5 (see ChangeLog for details on version changes)
 - Add BR on autoconf



From rishi at fedoraproject.org  Tue Jan 13 04:47:50 2009
From: rishi at fedoraproject.org (Debarshi Ray)
Date: Tue, 13 Jan 2009 04:47:50 +0000 (UTC)
Subject: rpms/libical/devel libical-0.43-implicit-pointer-conversion.patch, 
	NONE, 1.1 libical-0.43-makefile.patch, NONE, 1.1 libical.spec,
	1.16, 1.17 libical-0.41-configure.patch, 1.1,
	NONE libical-0.41-makefile.patch, 1.1, NONE
Message-ID: <20090113044751.14CA170129@cvs1.fedora.phx.redhat.com>

Author: rishi

Update of /cvs/pkgs/rpms/libical/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12070

Modified Files:
	libical.spec 
Added Files:
	libical-0.43-implicit-pointer-conversion.patch 
	libical-0.43-makefile.patch 
Removed Files:
	libical-0.41-configure.patch libical-0.41-makefile.patch 
Log Message:
* Tue Jan 13 2009 Debarshi Ray <rishi at fedoraproject.org> - 0.43-1
- Version bump to 0.43.
- Added patch to fix implicit pointer conversion from Debian. Fixes Debian BTS
  bug #511598.
- Upstream has switched off ICAL_ERRORS_ARE_FATAL by default. This behaviour
  is being retained across all distributions, including Fedora 11.
- Added 'Requires: tzdata'.
- Enabled backtrace dumps in the syslog.


libical-0.43-implicit-pointer-conversion.patch:

--- NEW FILE libical-0.43-implicit-pointer-conversion.patch ---
diff -urNp libical-0.43.orig/src/test/regression.c libical-0.43/src/test/regression.c
--- libical-0.43.orig/src/test/regression.c	2009-01-13 09:34:39.000000000 +0530
+++ libical-0.43/src/test/regression.c	2009-01-13 09:54:37.000000000 +0530
@@ -34,6 +34,8 @@
 #include <libical/ical.h>
 #include <libical/icalss.h>
 #include <libicalvcal/vobject.h>
+#include <libicalvcal/icalvcal.h>
+#include <libicalvcal/vcc.h>
 
 #include "regression.h"
 

libical-0.43-makefile.patch:

--- NEW FILE libical-0.43-makefile.patch ---
diff -urNp libical-0.43.orig/src/libicalss/Makefile.in libical-0.43/src/libicalss/Makefile.in
--- libical-0.43.orig/src/libicalss/Makefile.in	2009-01-13 09:34:39.000000000 +0530
+++ libical-0.43/src/libicalss/Makefile.in	2009-01-13 09:52:10.000000000 +0530
@@ -308,7 +308,7 @@ INCLUDES = \
 	$(BDB_INCLUDE)
 
 libicalss_la_LDFLAGS = -version-info 43:0:43
-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 = \


Index: libical.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libical/devel/libical.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- libical.spec	8 Jan 2009 04:07:02 -0000	1.16
+++ libical.spec	13 Jan 2009 04:47:19 -0000	1.17
@@ -1,6 +1,6 @@
 Name:		libical
-Version:	0.41
-Release:	2%{?dist}
+Version:	0.43
+Release:	1%{?dist}
 Summary:	Reference implementation of the iCalendar data type and serialization format
 Summary(pl):	Implementacja formatu iCalendar
 
@@ -9,15 +9,14 @@
 URL:		http://freeassociation.sourceforge.net/
 Source0:	http://downloads.sourceforge.net/freeassociation/%{name}-%{version}.tar.gz
 
-%if 0%{?fc11}
-%else
-Patch0:		%{name}-%{version}-configure.patch
-%endif
-
+# http://bugs.debian.org/511598
+Patch0:		%{name}-%{version}-implicit-pointer-conversion.patch
 Patch1:		%{name}-%{version}-makefile.patch
 
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
+Requires: 	tzdata
+
 BuildRequires:	bison
 BuildRequires:	byacc
 BuildRequires:	flex
@@ -47,16 +46,11 @@
 
 %prep
 %setup -q
-
-%if 0%{?fc11}
-%else
 %patch0 -p1
-%endif
-
 %patch1 -p1
 
 %build
-%configure --disable-static --enable-reentrant
+%configure --disable-static --enable-reentrant --with-backtrace
 
 make %{?_smp_mflags}
 
@@ -110,6 +104,15 @@
 %{_includedir}/%{name}/vobject.h
 
 %changelog
+* Tue Jan 13 2009 Debarshi Ray <rishi at fedoraproject.org> - 0.43-1
+- Version bump to 0.43.
+- Added patch to fix implicit pointer conversion from Debian. Fixes Debian BTS
+  bug #511598.
+- Upstream has switched off ICAL_ERRORS_ARE_FATAL by default. This behaviour
+  is being retained across all distributions, including Fedora 11.
+- Added 'Requires: tzdata'.
+- Enabled backtrace dumps in the syslog.
+
 * Thu Jan 08 2009 Debarshi Ray <rishi at fedoraproject.org> - 0.41-2
 - Switched off ICAL_ERRORS_ARE_FATAL for all distributions, except Fedora 11.
   Closes Red Hat Bugzilla bug #478331.


--- libical-0.41-configure.patch DELETED ---


--- libical-0.41-makefile.patch DELETED ---



From rishi at fedoraproject.org  Tue Jan 13 04:51:21 2009
From: rishi at fedoraproject.org (Debarshi Ray)
Date: Tue, 13 Jan 2009 04:51:21 +0000 (UTC)
Subject: rpms/libical/devel .cvsignore,1.7,1.8 sources,1.7,1.8
Message-ID: <20090113045121.F0F2E70141@cvs1.fedora.phx.redhat.com>

Author: rishi

Update of /cvs/pkgs/rpms/libical/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12626

Modified Files:
	.cvsignore sources 
Log Message:
* Tue Jan 13 2009 Debarshi Ray <rishi at fedoraproject.org> - 0.43-1
- Version bump to 0.43.
- Added patch to fix implicit pointer conversion from Debian. Fixes Debian BTS
  bug #511598.
- Upstream has switched off ICAL_ERRORS_ARE_FATAL by default. This behaviour
  is being retained across all distributions, including Fedora 11.
- Added 'Requires: tzdata'.
- Enabled backtrace dumps in the syslog.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libical/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	25 Nov 2008 08:50:48 -0000	1.7
+++ .cvsignore	13 Jan 2009 04:50:51 -0000	1.8
@@ -1 +1 @@
-libical-0.41.tar.gz
+libical-0.43.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libical/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	25 Nov 2008 08:50:48 -0000	1.7
+++ sources	13 Jan 2009 04:50:51 -0000	1.8
@@ -1 +1 @@
-981731f5618c7f1944e0262babdcc910  libical-0.41.tar.gz
+5f0a1feb60894d0be537aefea5647474  libical-0.43.tar.gz



From iarnell at fedoraproject.org  Tue Jan 13 05:00:39 2009
From: iarnell at fedoraproject.org (Iain Arnell)
Date: Tue, 13 Jan 2009 05:00:39 +0000 (UTC)
Subject: rpms/perl-Data-Dump-Streamer/F-10 perl-Data-Dump-Streamer.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090113050039.E77C570129@cvs1.fedora.phx.redhat.com>

Author: iarnell

Update of /cvs/pkgs/rpms/perl-Data-Dump-Streamer/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14670/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Data-Dump-Streamer.spec 
Log Message:
initial import on branches


--- NEW FILE perl-Data-Dump-Streamer.spec ---
Name:           perl-Data-Dump-Streamer
Version:        2.08
%define         tarversion %{version}-40
Release:        1%{?dist}
Summary:        Accurately serialize a data structure as Perl code
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Data-Dump-Streamer/
Source0:        http://www.cpan.org/authors/id/Y/YV/YVES/Data-Dump-Streamer-%{tarversion}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  perl(B::Utils) >= 0.05
BuildRequires:  perl(Compress::Zlib)
BuildRequires:  perl(Data::Dumper)
BuildRequires:  perl(ExtUtils::MakeMaker)
BuildRequires:  perl(MIME::Base64)
BuildRequires:  perl(PadWalker)
BuildRequires:  perl(Test::More)
BuildRequires:  perl(Text::Balanced)
Requires:       perl(B::Utils) >= 0.05
Requires:       perl(Compress::Zlib)
Requires:       perl(MIME::Base64)
Requires:       perl(PadWalker)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
Given a list of scalars or reference variables, writes out their contents
in perl syntax. The references can also be objects. The contents of each
variable is output using the least number of Perl statements as convenient,
usually only one. Self-referential structures, closures, and objects are
output correctly.

%prep
%setup -q -n Data-Dump-Streamer-%{tarversion}
find . -type f | xargs chmod -x

# Strip out private provides/requires
cat << \EOF > %{name}-prov
#!/bin/sh
%{__perl_provides} $* |\
sed -e '/perl(Data::Dump::Streamer::_::/d'
EOF
%define __perl_provides %{_builddir}/Data-Dump-Streamer-%{tarversion}/%{name}-prov
chmod +x %{__perl_provides}

cat << \EOF > %{name}-req
#!/bin/sh
%{__perl_requires} $* |\
sed -e '/perl(Data::Dump::Streamer::_::/d'
EOF
%define __perl_requires %{_builddir}/Data-Dump-Streamer-%{tarversion}/%{name}-req
chmod +x %{__perl_requires}


%build
%{__perl} Makefile.PL NODDS INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS"
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT

make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT

find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
find $RPM_BUILD_ROOT -type f -name '*.bs' -size 0 -exec rm -f {} \;
find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;

%{_fixperms} $RPM_BUILD_ROOT/*

%check
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Changes README
%{perl_vendorarch}/auto/*
%{perl_vendorarch}/Data*
%{_mandir}/man3/*

%changelog
* Fri Dec 05 2008 Iain Arnell 2.08-1
- Specfile autogenerated by cpanspec 1.77.
- strip private provides/requires


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Data-Dump-Streamer/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	10 Dec 2008 03:33:59 -0000	1.1
+++ .cvsignore	13 Jan 2009 05:00:09 -0000	1.2
@@ -0,0 +1 @@
+Data-Dump-Streamer-2.08-40.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Data-Dump-Streamer/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	10 Dec 2008 03:33:59 -0000	1.1
+++ sources	13 Jan 2009 05:00:09 -0000	1.2
@@ -0,0 +1 @@
+162dc81be6df36d184e516b8ef4b7701  Data-Dump-Streamer-2.08-40.tar.gz



From iarnell at fedoraproject.org  Tue Jan 13 05:00:40 2009
From: iarnell at fedoraproject.org (Iain Arnell)
Date: Tue, 13 Jan 2009 05:00:40 +0000 (UTC)
Subject: rpms/perl-Data-Dump-Streamer/F-9 perl-Data-Dump-Streamer.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090113050040.2F6C870129@cvs1.fedora.phx.redhat.com>

Author: iarnell

Update of /cvs/pkgs/rpms/perl-Data-Dump-Streamer/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14670/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Data-Dump-Streamer.spec 
Log Message:
initial import on branches


--- NEW FILE perl-Data-Dump-Streamer.spec ---
Name:           perl-Data-Dump-Streamer
Version:        2.08
%define         tarversion %{version}-40
Release:        1%{?dist}
Summary:        Accurately serialize a data structure as Perl code
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Data-Dump-Streamer/
Source0:        http://www.cpan.org/authors/id/Y/YV/YVES/Data-Dump-Streamer-%{tarversion}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  perl(B::Utils) >= 0.05
BuildRequires:  perl(Compress::Zlib)
BuildRequires:  perl(Data::Dumper)
BuildRequires:  perl(ExtUtils::MakeMaker)
BuildRequires:  perl(MIME::Base64)
BuildRequires:  perl(PadWalker)
BuildRequires:  perl(Test::More)
BuildRequires:  perl(Text::Balanced)
Requires:       perl(B::Utils) >= 0.05
Requires:       perl(Compress::Zlib)
Requires:       perl(MIME::Base64)
Requires:       perl(PadWalker)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
Given a list of scalars or reference variables, writes out their contents
in perl syntax. The references can also be objects. The contents of each
variable is output using the least number of Perl statements as convenient,
usually only one. Self-referential structures, closures, and objects are
output correctly.

%prep
%setup -q -n Data-Dump-Streamer-%{tarversion}
find . -type f | xargs chmod -x

# Strip out private provides/requires
cat << \EOF > %{name}-prov
#!/bin/sh
%{__perl_provides} $* |\
sed -e '/perl(Data::Dump::Streamer::_::/d'
EOF
%define __perl_provides %{_builddir}/Data-Dump-Streamer-%{tarversion}/%{name}-prov
chmod +x %{__perl_provides}

cat << \EOF > %{name}-req
#!/bin/sh
%{__perl_requires} $* |\
sed -e '/perl(Data::Dump::Streamer::_::/d'
EOF
%define __perl_requires %{_builddir}/Data-Dump-Streamer-%{tarversion}/%{name}-req
chmod +x %{__perl_requires}


%build
%{__perl} Makefile.PL NODDS INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS"
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT

make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT

find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
find $RPM_BUILD_ROOT -type f -name '*.bs' -size 0 -exec rm -f {} \;
find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;

%{_fixperms} $RPM_BUILD_ROOT/*

%check
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Changes README
%{perl_vendorarch}/auto/*
%{perl_vendorarch}/Data*
%{_mandir}/man3/*

%changelog
* Fri Dec 05 2008 Iain Arnell 2.08-1
- Specfile autogenerated by cpanspec 1.77.
- strip private provides/requires


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Data-Dump-Streamer/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	10 Dec 2008 03:33:59 -0000	1.1
+++ .cvsignore	13 Jan 2009 05:00:09 -0000	1.2
@@ -0,0 +1 @@
+Data-Dump-Streamer-2.08-40.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Data-Dump-Streamer/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	10 Dec 2008 03:33:59 -0000	1.1
+++ sources	13 Jan 2009 05:00:09 -0000	1.2
@@ -0,0 +1 @@
+162dc81be6df36d184e516b8ef4b7701  Data-Dump-Streamer-2.08-40.tar.gz



From mclasen at fedoraproject.org  Tue Jan 13 05:05:26 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 13 Jan 2009 05:05:26 +0000 (UTC)
Subject: rpms/poppler/devel .cvsignore, 1.33, 1.34 poppler.spec, 1.78,
	1.79 sources, 1.34, 1.35
Message-ID: <20090113050526.6747F70129@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/poppler/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15366

Modified Files:
	.cvsignore poppler.spec sources 
Log Message:
0.10.3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/poppler/devel/.cvsignore,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- .cvsignore	18 Dec 2008 03:22:42 -0000	1.33
+++ .cvsignore	13 Jan 2009 05:04:55 -0000	1.34
@@ -1 +1 @@
-poppler-0.10.2.tar.gz
+poppler-0.10.3.tar.gz


Index: poppler.spec
===================================================================
RCS file: /cvs/pkgs/rpms/poppler/devel/poppler.spec,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- poppler.spec	18 Dec 2008 03:22:42 -0000	1.78
+++ poppler.spec	13 Jan 2009 05:04:55 -0000	1.79
@@ -2,7 +2,7 @@
 
 Summary: PDF rendering library
 Name: poppler
-Version: 0.10.2
+Version: 0.10.3
 Release: 1%{?dist}
 License: GPLv2 and Redistributable, no modification permitted
 # the code is GPLv2
@@ -195,6 +195,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Tue Jan 13 2009 Matthias Clasen <mclasen at redhat.com> - 0.10.3-1
+- Update to 0.10.3
+
 * Wed Dec 17 2008 Matthias Clasen <mclasen at redhat.com> - 0.10.2-1
 - Update to 0.10.2
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/poppler/devel/sources,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- sources	18 Dec 2008 03:22:43 -0000	1.34
+++ sources	13 Jan 2009 05:04:55 -0000	1.35
@@ -1,2 +1 @@
-a802a178d12f453f1d0176d67f923c7d  poppler-0.10.2.tar.gz
-bca78b8786746c7b48b324283992d658  poppler-data-0.2.1.tar.gz
+da04d9b4099a1ce15f9a0ac8ec205346  poppler-0.10.3.tar.gz



From mclasen at fedoraproject.org  Tue Jan 13 05:08:39 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 13 Jan 2009 05:08:39 +0000 (UTC)
Subject: rpms/poppler/devel sources,1.35,1.36
Message-ID: <20090113050839.2D9D670129@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/poppler/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15889

Modified Files:
	sources 
Log Message:
fix sources



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/poppler/devel/sources,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- sources	13 Jan 2009 05:04:55 -0000	1.35
+++ sources	13 Jan 2009 05:08:08 -0000	1.36
@@ -1 +1,2 @@
 da04d9b4099a1ce15f9a0ac8ec205346  poppler-0.10.3.tar.gz
+bca78b8786746c7b48b324283992d658  poppler-data-0.2.1.tar.gz



From kevin at fedoraproject.org  Tue Jan 13 05:08:51 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 13 Jan 2009 05:08:51 +0000 (UTC)
Subject: rpms/Thunar/devel Thunar.spec, 1.17, 1.18 sources, 1.6,
	1.7 .cvsignore, 
	1.6, 1.7 thunar-0.9.0-xdg-userdir-compat.patch, 1.1,
	NONE thunar-vfs-audio-cd-fix.patch, 1.1,
	NONE thunar-vfs-nozombies.patch, 1.1, NONE
Message-ID: <20090113050851.2EBE070129@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/Thunar/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15952

Modified Files:
	Thunar.spec sources .cvsignore 
Removed Files:
	thunar-0.9.0-xdg-userdir-compat.patch 
	thunar-vfs-audio-cd-fix.patch thunar-vfs-nozombies.patch 
Log Message:
Update to 0.9.92



Index: Thunar.spec
===================================================================
RCS file: /cvs/extras/rpms/Thunar/devel/Thunar.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- Thunar.spec	28 Oct 2008 10:37:14 -0000	1.17
+++ Thunar.spec	13 Jan 2009 05:08:20 -0000	1.18
@@ -1,19 +1,12 @@
 Summary: Thunar File Manager
 Name: Thunar
-Version: 0.9.3
+Version: 0.9.92
 Release: 1%{?dist}
 License: GPLv2+
 URL: http://thunar.xfce.org/
 Source0: http://www.xfce.org/archive/xfce-4.4.2/src/Thunar-%{version}.tar.bz2
 Source1: thunar-sendto-bluetooth.desktop
 Source2: thunar-sendto-audacious-playlist.desktop
-Patch0: thunar-vfs-audio-cd-fix.patch
-# according to http://bugzilla.xfce.org/show_bug.cgi?id=2983 
-# this should be applied, but it isn't =< 0.9.3
-Patch1: thunar-vfs-nozombies.patch
-# send upstream via http://bugzilla.xfce.org/show_bug.cgi?id=4365
-# applied in trunk for 4.6
-Patch2: thunar-0.9.0-xdg-userdir-compat.patch
 Group: User Interface/Desktops
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: fam-devel
@@ -33,6 +26,7 @@
 BuildRequires: libxslt
 BuildRequires: GConf2-devel
 BuildRequires: gtk-doc
+BuildRequires: chrpath
 Requires: shared-mime-info
 
 # obsolete xffm to allow for smooth upgrades
@@ -61,9 +55,6 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .vfs-fix
-%patch1 -p0 -b .nozombies
-%patch2 -p1 -b .userdir
 
 # fix icon in thunar-sendto-email.desktop
 sed -i 's!internet-mail!mail-message-new!' \
@@ -92,8 +83,17 @@
 rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la
 rm -f $RPM_BUILD_ROOT/%{_libdir}/thunarx-1/*.la
 
+chrpath --delete $RPM_BUILD_ROOT/%{_bindir}/Thunar
+chrpath --delete $RPM_BUILD_ROOT/%{_libexecdir}/thunar-sendto-email
+
 %find_lang Thunar
 
+rm -f ${RPM_BUILD_ROOT}%{_datadir}/applications/thunar-settings.desktop
+desktop-file-install --vendor fedora                            \
+        --dir ${RPM_BUILD_ROOT}%{_datadir}/applications         \
+        --add-category X-Fedora                                 \
+        thunar/thunar-settings.desktop
+
 rm -f ${RPM_BUILD_ROOT}%{_datadir}/applications/Thunar-bulk-rename.desktop
 desktop-file-install --vendor fedora                            \
         --dir ${RPM_BUILD_ROOT}%{_datadir}/applications         \
@@ -154,6 +154,7 @@
 %exclude %{_datadir}/doc/Thunar/ThumbnailersCacheFormat.txt
 %{_bindir}/Thunar
 %{_bindir}/thunar
+%{_bindir}/thunar-settings
 %{_libdir}/libthunar*.so.*
 %dir %{_libdir}/thunarx-1/
 %{_libdir}/thunarx-1/thunar*.so
@@ -169,6 +170,7 @@
 %{_datadir}/Thunar/sendto/*.desktop
 %dir %{_datadir}/thumbnailers
 %{_datadir}/thumbnailers/thunar-vfs-font-thumbnailer-1.desktop
+%{_datadir}/applications/fedora-thunar-settings.desktop
 %{_datadir}/applications/fedora-Thunar-bulk-rename.desktop
 %{_datadir}/applications/fedora-Thunar-folder-handler.desktop
 %{_datadir}/applications/fedora-Thunar.desktop
@@ -196,6 +198,9 @@
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Fri Dec 26 2008 Kevin Fenzi <kevin at tummy.com> - 0.9.92-1
+- Update to 0.9.92
+
 * Mon Oct 27 2008 Christoph Wickert <cwickert at fedoraproject.org> - 0.9.3-1
 - Update to 0.9.3
 - Respect xdg user directory paths (#457740)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/Thunar/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	28 Oct 2008 10:04:37 -0000	1.6
+++ sources	13 Jan 2009 05:08:20 -0000	1.7
@@ -1 +1 @@
-438b0d55ac9ecabdb58f84c4c039ae5c  Thunar-0.9.3.tar.bz2
+8717e7e6125ff841dda4e9301889afd0  Thunar-0.9.92.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/Thunar/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	28 Oct 2008 10:04:37 -0000	1.6
+++ .cvsignore	13 Jan 2009 05:08:20 -0000	1.7
@@ -1 +1 @@
-Thunar-0.9.3.tar.bz2
+Thunar-0.9.92.tar.bz2


--- thunar-0.9.0-xdg-userdir-compat.patch DELETED ---


--- thunar-vfs-audio-cd-fix.patch DELETED ---


--- thunar-vfs-nozombies.patch DELETED ---



From pkgdb at fedoraproject.org  Tue Jan 13 05:21:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 05:21:55 +0000
Subject: [pkgdb] perl-File-Copy-Recursive ownership updated
Message-ID: <20090113052155.A58EF2081FC@bastion.fedora.phx.redhat.com>

Package perl-File-Copy-Recursive in Fedora 5 was orphaned by corsepiu

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-File-Copy-Recursive



From pkgdb at fedoraproject.org  Tue Jan 13 05:21:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 05:21:59 +0000
Subject: [pkgdb] perl-File-Copy-Recursive ownership updated
Message-ID: <20090113052159.0B8E8208468@bastion.fedora.phx.redhat.com>

Package perl-File-Copy-Recursive in Fedora 6 was orphaned by corsepiu

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-File-Copy-Recursive



From pkgdb at fedoraproject.org  Tue Jan 13 05:22:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 05:22:04 +0000
Subject: [pkgdb] perl-File-Copy-Recursive ownership updated
Message-ID: <20090113052204.CD00A208470@bastion.fedora.phx.redhat.com>

Package perl-File-Copy-Recursive in Fedora 7 was orphaned by corsepiu

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-File-Copy-Recursive



From pkgdb at fedoraproject.org  Tue Jan 13 05:22:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 05:22:40 +0000
Subject: [pkgdb] po4a: corsepiu has requested watchbugzilla
Message-ID: <20090113052240.ADC152081FB@bastion.fedora.phx.redhat.com>

corsepiu has requested the watchbugzilla acl on po4a (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/po4a



From pkgdb at fedoraproject.org  Tue Jan 13 05:22:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 05:22:41 +0000
Subject: [pkgdb] po4a: corsepiu has requested commit
Message-ID: <20090113052241.C9C43208456@bastion.fedora.phx.redhat.com>

corsepiu has requested the commit acl on po4a (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/po4a



From pkgdb at fedoraproject.org  Tue Jan 13 05:22:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 05:22:49 +0000
Subject: [pkgdb] po4a: corsepiu has requested approveacls
Message-ID: <20090113052249.654E8208468@bastion.fedora.phx.redhat.com>

corsepiu has requested the approveacls acl on po4a (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/po4a



From pkgdb at fedoraproject.org  Tue Jan 13 05:22:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 05:22:52 +0000
Subject: [pkgdb] po4a: corsepiu has requested watchcommits
Message-ID: <20090113052252.8F1EE208469@bastion.fedora.phx.redhat.com>

corsepiu has requested the watchcommits acl on po4a (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/po4a



From pkgdb at fedoraproject.org  Tue Jan 13 05:23:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 05:23:06 +0000
Subject: [pkgdb] po4a: corsepiu has requested watchbugzilla
Message-ID: <20090113052306.90FE5208207@bastion.fedora.phx.redhat.com>

corsepiu has requested the watchbugzilla acl on po4a (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/po4a



From pkgdb at fedoraproject.org  Tue Jan 13 05:23:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 05:23:08 +0000
Subject: [pkgdb] po4a: corsepiu has requested watchcommits
Message-ID: <20090113052308.A181F208470@bastion.fedora.phx.redhat.com>

corsepiu has requested the watchcommits acl on po4a (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/po4a



From pkgdb at fedoraproject.org  Tue Jan 13 05:23:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 05:23:11 +0000
Subject: [pkgdb] po4a: corsepiu has requested commit
Message-ID: <20090113052311.33EDD208473@bastion.fedora.phx.redhat.com>

corsepiu has requested the commit acl on po4a (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/po4a



From pkgdb at fedoraproject.org  Tue Jan 13 05:23:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 05:23:15 +0000
Subject: [pkgdb] po4a: corsepiu has requested approveacls
Message-ID: <20090113052315.C5468208458@bastion.fedora.phx.redhat.com>

corsepiu has requested the approveacls acl on po4a (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/po4a



From pkgdb at fedoraproject.org  Tue Jan 13 05:23:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 05:23:19 +0000
Subject: [pkgdb] po4a: corsepiu has requested watchbugzilla
Message-ID: <20090113052319.B7CD1208474@bastion.fedora.phx.redhat.com>

corsepiu has requested the watchbugzilla acl on po4a (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/po4a



From pkgdb at fedoraproject.org  Tue Jan 13 05:23:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 05:23:23 +0000
Subject: [pkgdb] po4a: corsepiu has requested commit
Message-ID: <20090113052323.2E32120847D@bastion.fedora.phx.redhat.com>

corsepiu has requested the commit acl on po4a (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/po4a



From pkgdb at fedoraproject.org  Tue Jan 13 05:23:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 05:23:21 +0000
Subject: [pkgdb] po4a: corsepiu has requested watchcommits
Message-ID: <20090113052321.C4F57208477@bastion.fedora.phx.redhat.com>

corsepiu has requested the watchcommits acl on po4a (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/po4a



From pkgdb at fedoraproject.org  Tue Jan 13 05:23:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 05:23:27 +0000
Subject: [pkgdb] po4a: corsepiu has requested approveacls
Message-ID: <20090113052327.3B400208469@bastion.fedora.phx.redhat.com>

corsepiu has requested the approveacls acl on po4a (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/po4a



From pkgdb at fedoraproject.org  Tue Jan 13 05:25:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 05:25:51 +0000
Subject: [pkgdb] Coin2 ownership updated
Message-ID: <20090113052551.7506F2081FB@bastion.fedora.phx.redhat.com>

Package Coin2 in Fedora 1 was orphaned by corsepiu

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/Coin2



From pkgdb at fedoraproject.org  Tue Jan 13 05:25:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 05:25:53 +0000
Subject: [pkgdb] Coin2 ownership updated
Message-ID: <20090113052553.BF235208457@bastion.fedora.phx.redhat.com>

Package Coin2 in Fedora 2 was orphaned by corsepiu

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/Coin2



From pkgdb at fedoraproject.org  Tue Jan 13 05:25:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 05:25:57 +0000
Subject: [pkgdb] Coin2 ownership updated
Message-ID: <20090113052558.34535208469@bastion.fedora.phx.redhat.com>

Package Coin2 in Fedora 4 was orphaned by corsepiu

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/Coin2



From pkgdb at fedoraproject.org  Tue Jan 13 05:25:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 05:25:57 +0000
Subject: [pkgdb] Coin2 ownership updated
Message-ID: <20090113052559.0F120208203@bastion.fedora.phx.redhat.com>

Package Coin2 in Fedora 3 was orphaned by corsepiu

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/Coin2



From pkgdb at fedoraproject.org  Tue Jan 13 05:25:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 05:25:59 +0000
Subject: [pkgdb] Coin2 ownership updated
Message-ID: <20090113052559.96C95208467@bastion.fedora.phx.redhat.com>

Package Coin2 in Fedora 5 was orphaned by corsepiu

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/Coin2



From pkgdb at fedoraproject.org  Tue Jan 13 05:26:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 05:26:00 +0000
Subject: [pkgdb] Coin2 ownership updated
Message-ID: <20090113052600.6CBA120846B@bastion.fedora.phx.redhat.com>

Package Coin2 in Fedora 6 was orphaned by corsepiu

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/Coin2



From pkgdb at fedoraproject.org  Tue Jan 13 05:26:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 05:26:08 +0000
Subject: [pkgdb] Coin2 ownership updated
Message-ID: <20090113052608.7A5BB208456@bastion.fedora.phx.redhat.com>

Package Coin2 in Fedora 7 was orphaned by corsepiu

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/Coin2



From pkgdb at fedoraproject.org  Tue Jan 13 05:27:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 05:27:20 +0000
Subject: [pkgdb] qhull ownership updated
Message-ID: <20090113052721.080AD2081FB@bastion.fedora.phx.redhat.com>

Package qhull in Fedora 1 was orphaned by corsepiu

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qhull



From pkgdb at fedoraproject.org  Tue Jan 13 05:27:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 05:27:21 +0000
Subject: [pkgdb] qhull ownership updated
Message-ID: <20090113052721.794F1208207@bastion.fedora.phx.redhat.com>

Package qhull in Fedora 2 was orphaned by corsepiu

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qhull



From pkgdb at fedoraproject.org  Tue Jan 13 05:27:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 05:27:22 +0000
Subject: [pkgdb] qhull ownership updated
Message-ID: <20090113052722.93801208458@bastion.fedora.phx.redhat.com>

Package qhull in Fedora 3 was orphaned by corsepiu

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qhull



From pkgdb at fedoraproject.org  Tue Jan 13 05:27:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 05:27:24 +0000
Subject: [pkgdb] qhull ownership updated
Message-ID: <20090113052724.D6021208469@bastion.fedora.phx.redhat.com>

Package qhull in Fedora 4 was orphaned by corsepiu

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qhull



From pkgdb at fedoraproject.org  Tue Jan 13 05:27:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 05:27:26 +0000
Subject: [pkgdb] qhull ownership updated
Message-ID: <20090113052726.85A7220846E@bastion.fedora.phx.redhat.com>

Package qhull in Fedora 5 was orphaned by corsepiu

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qhull



From pkgdb at fedoraproject.org  Tue Jan 13 05:27:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 05:27:32 +0000
Subject: [pkgdb] qhull ownership updated
Message-ID: <20090113052732.C86E22081FB@bastion.fedora.phx.redhat.com>

Package qhull in Fedora 6 was orphaned by corsepiu

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qhull



From pkgdb at fedoraproject.org  Tue Jan 13 05:27:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 05:27:42 +0000
Subject: [pkgdb] qhull ownership updated
Message-ID: <20090113052742.439AF208473@bastion.fedora.phx.redhat.com>

Package qhull in Fedora 7 was orphaned by corsepiu

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qhull



From alexlan at fedoraproject.org  Tue Jan 13 05:54:38 2009
From: alexlan at fedoraproject.org (Alex Lancaster)
Date: Tue, 13 Jan 2009 05:54:38 +0000 (UTC)
Subject: rpms/bibus/devel bibus.spec,1.4,1.5
Message-ID: <20090113055438.EA3D070129@cvs1.fedora.phx.redhat.com>

Author: alexlan

Update of /cvs/extras/rpms/bibus/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22340

Modified Files:
	bibus.spec 
Log Message:
- Fix paths to openoffice (#479099)



Index: bibus.spec
===================================================================
RCS file: /cvs/extras/rpms/bibus/devel/bibus.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- bibus.spec	2 Dec 2008 05:57:14 -0000	1.4
+++ bibus.spec	13 Jan 2009 05:54:08 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           bibus
 Version:        1.4.3.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Bibliographic and reference management software
 
 Group:          Applications/Publishing
@@ -63,7 +63,9 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make DESTDIR=$RPM_BUILD_ROOT/%{_prefix} sysconfdir=$RPM_BUILD_ROOT/etc oopath=%{_libdir}/openoffice.org/program/ install
+make DESTDIR=$RPM_BUILD_ROOT/%{_prefix} sysconfdir=$RPM_BUILD_ROOT/etc \
+ oopath=%{_libdir}/openoffice.org3/program/ ooure=%{_libdir}/openoffice.org/basis3.0/ure-link/lib \
+ oobasis=%{_libdir}/openoffice.org/basis3.0/program  install
 
 ## fix symlink
 rm $RPM_BUILD_ROOT%{_bindir}/bibus
@@ -108,6 +110,9 @@
 
 
 %changelog
+* Mon Jan 12 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 1.4.3.1-2
+- Fix paths to openoffice (#479099)
+
 * Mon Dec  1 2008 Alex Lancaster <alexlan[AT]fedoraproject org> - 1.4.3.1-1
 - Updating to new upstream (1.4.3.1)
 - Adds support for OpenOffice 3.x



From alexlan at fedoraproject.org  Tue Jan 13 05:58:52 2009
From: alexlan at fedoraproject.org (Alex Lancaster)
Date: Tue, 13 Jan 2009 05:58:52 +0000 (UTC)
Subject: rpms/bibus/F-10 bibus-build-1.4.3.1.patch, NONE, 1.1 .cvsignore, 1.3,
	1.4 bibus.spec, 1.2, 1.3 sources, 1.3, 1.4
Message-ID: <20090113055852.9B2BE70129@cvs1.fedora.phx.redhat.com>

Author: alexlan

Update of /cvs/extras/rpms/bibus/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22856

Modified Files:
	.cvsignore bibus.spec sources 
Added Files:
	bibus-build-1.4.3.1.patch 
Log Message:
* Mon Jan 12 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 1.4.3.1-2
- Fix paths to openoffice (#479099)

* Mon Dec  1 2008 Alex Lancaster <alexlan[AT]fedoraproject org> - 1.4.3.1-1
- Updating to new upstream (1.4.3.1)
- Adds support for OpenOffice 3.x
- Add patch to fix broken Makefile and desktop file
- Cleanup .spec


bibus-build-1.4.3.1.patch:

--- NEW FILE bibus-build-1.4.3.1.patch ---
--- Setup/bibus.desktop.orig	2008-12-01 22:39:16.000000000 -0700
+++ Setup/bibus.desktop	2008-12-01 22:40:05.000000000 -0700
@@ -6,6 +6,7 @@
 Name[de]=Bibus
 Name[fr]=Bibus
 Name[hu]=Bibus
+GenericName=Bibus bibliographic database
 GenericName[en]=Bibus bibliographic database
 GenericName[de]=Bibliographische Datenbank Bibus
 GenericName[fr]=Base de donn??e bibliographique Bibus
@@ -19,6 +20,5 @@
 Type=Application
 Terminal=false
 Exec=bibus
-Icon=bibus.png
+Icon=bibus
 StartupNotify=true
-
--- Makefile.orig	2008-12-01 22:38:59.000000000 -0700
+++ Makefile	2008-12-01 22:39:26.000000000 -0700
@@ -35,8 +35,6 @@
 	# freedesktop icon and shortcut
 	install -m644 Pixmaps/bibus.png -D $(datadir)/icons/hicolor/48x48/apps/bibus.png
 	install -m644 Setup/bibus.desktop -D $(datadir)/applications/bibus.desktop
-	echo 'Exec=$(bindir)/bibus' >> $(datadir)/applications/bibus.desktop
-	echo 'Icon=$(datadir)/icons/hicolor/48x48/apps/bibus.png' >> $(datadir)/applications/bibus.desktop
 
 	# bibus command
 	install -d $(bindir)


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/bibus/F-10/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	10 Jun 2008 10:08:47 -0000	1.3
+++ .cvsignore	13 Jan 2009 05:58:22 -0000	1.4
@@ -1 +1 @@
-bibus_1.4.3-2.tar.gz
+bibus-1.4.3.1.tar.gz


Index: bibus.spec
===================================================================
RCS file: /cvs/extras/rpms/bibus/F-10/bibus.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- bibus.spec	10 Jun 2008 10:08:47 -0000	1.2
+++ bibus.spec	13 Jan 2009 05:58:22 -0000	1.3
@@ -1,12 +1,14 @@
 Name:           bibus
-Version:        1.4.3
-Release:        1%{?dist}
+Version:        1.4.3.1
+Release:        2%{?dist}
 Summary:        Bibliographic and reference management software
 
 Group:          Applications/Publishing
 License:        GPLv2+
 URL:            http://bibus-biblio.sourceforge.net/
-Source0:        http://downloads.sourceforge.net/bibus-biblio/%{name}_%{version}-2.tar.gz
+Source0:        http://downloads.sourceforge.net/bibus-biblio/%{name}-%{version}.tar.gz
+
+Patch0:		%{name}-build-1.4.3.1.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 ## temporarily removing noarch to workaround this bug:
@@ -32,7 +34,8 @@
 
 
 %prep
-%setup -q -n %{name}1.4
+%setup -q -n %{name}-%{version}
+%patch0 -p0
 
 ## make files UTF-8 
 for i in bibMSW.htm eTBlast\ Interface\ to\ Bibus.htm
@@ -60,7 +63,9 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make DESTDIR=$RPM_BUILD_ROOT/%{_prefix} sysconfdir=$RPM_BUILD_ROOT/etc oopath=%{_libdir}/openoffice.org/program/ install
+make DESTDIR=$RPM_BUILD_ROOT/%{_prefix} sysconfdir=$RPM_BUILD_ROOT/etc \
+ oopath=%{_libdir}/openoffice.org3/program/ ooure=%{_libdir}/openoffice.org/basis3.0/ure-link/lib \
+ oobasis=%{_libdir}/openoffice.org/basis3.0/program  install
 
 ## fix symlink
 rm $RPM_BUILD_ROOT%{_bindir}/bibus
@@ -82,12 +87,6 @@
 ## remove uninstall program, not necessary for RPM package
 rm $RPM_BUILD_ROOT%{_datadir}/%{name}/Setup/uninstall.sh
 
-## fix bibus.desktop to fix binary and icon locations
-sed -i "s:$RPM_BUILD_ROOT::" $RPM_BUILD_ROOT%{_datadir}/applications/bibus.desktop
-
-## remove localization from generic name
-sed -i 's/GenericName\[fr_FR\]/GenericName/' $RPM_BUILD_ROOT%{_datadir}/applications/bibus.desktop
-
 desktop-file-install --vendor="fedora"               \
      --delete-original                               \
      --dir=${RPM_BUILD_ROOT}%{_datadir}/applications \
@@ -111,6 +110,18 @@
 
 
 %changelog
+* Mon Jan 12 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 1.4.3.1-2
+- Fix paths to openoffice (#479099)
+
+* Mon Dec  1 2008 Alex Lancaster <alexlan[AT]fedoraproject org> - 1.4.3.1-1
+- Updating to new upstream (1.4.3.1)
+- Adds support for OpenOffice 3.x
+- Add patch to fix broken Makefile and desktop file
+- Cleanup .spec
+
+* Mon Dec 01 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 1.4.3-2
+- Rebuild for Python 2.6
+
 * Tue Jun 10 2008 Alex Lancaster <alexlan[AT]fedoraproject org> - 1.4.3-1
 - Update to latest upstream (1.4.3)
 - Make package arch-specific to allow package to find appropriate location


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/bibus/F-10/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	10 Jun 2008 10:08:47 -0000	1.3
+++ sources	13 Jan 2009 05:58:22 -0000	1.4
@@ -1 +1 @@
-8e1e13469fa4099c384009a0350c926a  bibus_1.4.3-2.tar.gz
+1924aaca754e55464635647a5b6d8063  bibus-1.4.3.1.tar.gz



From pkgdb at fedoraproject.org  Tue Jan 13 06:31:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 06:31:43 +0000
Subject: [pkgdb] mediawiki: roozbeh has given up watchcommits
Message-ID: <20090113063143.838852081FC@bastion.fedora.phx.redhat.com>

roozbeh has given up the watchcommits acl on mediawiki (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mediawiki



From pkgdb at fedoraproject.org  Tue Jan 13 06:31:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 06:31:44 +0000
Subject: [pkgdb] mediawiki: roozbeh has given up watchbugzilla
Message-ID: <20090113063145.0F774208456@bastion.fedora.phx.redhat.com>

roozbeh has given up the watchbugzilla acl on mediawiki (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mediawiki



From pkgdb at fedoraproject.org  Tue Jan 13 06:31:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 06:31:55 +0000
Subject: [pkgdb] mediawiki: roozbeh has given up watchbugzilla
Message-ID: <20090113063155.72B4120846B@bastion.fedora.phx.redhat.com>

roozbeh has given up the watchbugzilla acl on mediawiki (Fedora EPEL 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mediawiki



From pkgdb at fedoraproject.org  Tue Jan 13 06:31:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 06:31:53 +0000
Subject: [pkgdb] mediawiki: roozbeh has given up watchcommits
Message-ID: <20090113063153.9044E208467@bastion.fedora.phx.redhat.com>

roozbeh has given up the watchcommits acl on mediawiki (Fedora EPEL 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mediawiki



From pkgdb at fedoraproject.org  Tue Jan 13 06:32:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 06:32:02 +0000
Subject: [pkgdb] mediawiki: roozbeh has given up watchcommits
Message-ID: <20090113063202.260FD2081FB@bastion.fedora.phx.redhat.com>

roozbeh has given up the watchcommits acl on mediawiki (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mediawiki



From pkgdb at fedoraproject.org  Tue Jan 13 06:32:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 06:32:02 +0000
Subject: [pkgdb] mediawiki: roozbeh has given up watchbugzilla
Message-ID: <20090113063202.B9747208470@bastion.fedora.phx.redhat.com>

roozbeh has given up the watchbugzilla acl on mediawiki (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mediawiki



From pkgdb at fedoraproject.org  Tue Jan 13 06:32:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 06:32:05 +0000
Subject: [pkgdb] mediawiki: roozbeh has given up watchcommits
Message-ID: <20090113063205.1AA8C208474@bastion.fedora.phx.redhat.com>

roozbeh has given up the watchcommits acl on mediawiki (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mediawiki



From pkgdb at fedoraproject.org  Tue Jan 13 06:32:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 06:32:06 +0000
Subject: [pkgdb] mediawiki: roozbeh has given up watchbugzilla
Message-ID: <20090113063206.9D03E208477@bastion.fedora.phx.redhat.com>

roozbeh has given up the watchbugzilla acl on mediawiki (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mediawiki



From pkgdb at fedoraproject.org  Tue Jan 13 06:32:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 06:32:15 +0000
Subject: [pkgdb] mediawiki: roozbeh has given up watchcommits
Message-ID: <20090113063215.76A67208207@bastion.fedora.phx.redhat.com>

roozbeh has given up the watchcommits acl on mediawiki (Fedora 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mediawiki



From pkgdb at fedoraproject.org  Tue Jan 13 06:32:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 06:32:16 +0000
Subject: [pkgdb] mediawiki: roozbeh has given up watchbugzilla
Message-ID: <20090113063216.AAEED208479@bastion.fedora.phx.redhat.com>

roozbeh has given up the watchbugzilla acl on mediawiki (Fedora 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mediawiki



From pkgdb at fedoraproject.org  Tue Jan 13 06:32:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 06:32:22 +0000
Subject: [pkgdb] mediawiki: roozbeh has given up watchcommits
Message-ID: <20090113063222.DE00620846B@bastion.fedora.phx.redhat.com>

roozbeh has given up the watchcommits acl on mediawiki (Fedora 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mediawiki



From pkgdb at fedoraproject.org  Tue Jan 13 06:32:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 06:32:23 +0000
Subject: [pkgdb] mediawiki: roozbeh has given up watchbugzilla
Message-ID: <20090113063223.3DD7720847B@bastion.fedora.phx.redhat.com>

roozbeh has given up the watchbugzilla acl on mediawiki (Fedora 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mediawiki



From pkgdb at fedoraproject.org  Tue Jan 13 06:32:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 06:32:25 +0000
Subject: [pkgdb] mediawiki: roozbeh has given up watchbugzilla
Message-ID: <20090113063225.CD69A20847E@bastion.fedora.phx.redhat.com>

roozbeh has given up the watchbugzilla acl on mediawiki (Fedora 6)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mediawiki



From pkgdb at fedoraproject.org  Tue Jan 13 06:32:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 06:32:27 +0000
Subject: [pkgdb] mediawiki: roozbeh has given up watchcommits
Message-ID: <20090113063227.A16E1208480@bastion.fedora.phx.redhat.com>

roozbeh has given up the watchcommits acl on mediawiki (Fedora 6)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mediawiki



From pkgdb at fedoraproject.org  Tue Jan 13 06:32:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 06:32:33 +0000
Subject: [pkgdb] mediawiki: roozbeh has given up watchcommits
Message-ID: <20090113063233.52F1B208482@bastion.fedora.phx.redhat.com>

roozbeh has given up the watchcommits acl on mediawiki (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mediawiki



From pkgdb at fedoraproject.org  Tue Jan 13 06:32:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 06:32:34 +0000
Subject: [pkgdb] mediawiki: roozbeh has given up watchbugzilla
Message-ID: <20090113063234.860A0208485@bastion.fedora.phx.redhat.com>

roozbeh has given up the watchbugzilla acl on mediawiki (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mediawiki



From pkgdb at fedoraproject.org  Tue Jan 13 06:32:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 06:32:37 +0000
Subject: [pkgdb] mediawiki: roozbeh has given up watchcommits
Message-ID: <20090113063237.A5B9E208487@bastion.fedora.phx.redhat.com>

roozbeh has given up the watchcommits acl on mediawiki (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mediawiki



From pkgdb at fedoraproject.org  Tue Jan 13 06:32:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 06:32:37 +0000
Subject: [pkgdb] mediawiki: roozbeh has given up watchbugzilla
Message-ID: <20090113063238.150A020848A@bastion.fedora.phx.redhat.com>

roozbeh has given up the watchbugzilla acl on mediawiki (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mediawiki



From pkgdb at fedoraproject.org  Tue Jan 13 06:32:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 06:32:43 +0000
Subject: [pkgdb] mediawiki: roozbeh has given up watchcommits
Message-ID: <20090113063244.52BB420848E@bastion.fedora.phx.redhat.com>

roozbeh has given up the watchcommits acl on mediawiki (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mediawiki



From pkgdb at fedoraproject.org  Tue Jan 13 06:32:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 06:32:44 +0000
Subject: [pkgdb] mediawiki: roozbeh has given up watchbugzilla
Message-ID: <20090113063245.195CD20848F@bastion.fedora.phx.redhat.com>

roozbeh has given up the watchbugzilla acl on mediawiki (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mediawiki



From pkgdb at fedoraproject.org  Tue Jan 13 06:33:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 06:33:42 +0000
Subject: [pkgdb] perl-Math-Vec ownership updated
Message-ID: <20090113063342.7FE89208469@bastion.fedora.phx.redhat.com>

Package perl-Math-Vec in Fedora EPEL 5 was orphaned by roozbeh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Math-Vec



From pkgdb at fedoraproject.org  Tue Jan 13 06:33:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 06:33:44 +0000
Subject: [pkgdb] perl-Math-Vec ownership updated
Message-ID: <20090113063344.37F6D2081FB@bastion.fedora.phx.redhat.com>

Package perl-Math-Vec in Fedora devel was orphaned by roozbeh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Math-Vec



From pkgdb at fedoraproject.org  Tue Jan 13 06:33:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 06:33:45 +0000
Subject: [pkgdb] perl-Math-Vec ownership updated
Message-ID: <20090113063345.B50A6208477@bastion.fedora.phx.redhat.com>

Package perl-Math-Vec in Fedora 5 was orphaned by roozbeh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Math-Vec



From pkgdb at fedoraproject.org  Tue Jan 13 06:33:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 06:33:51 +0000
Subject: [pkgdb] perl-Math-Vec ownership updated
Message-ID: <20090113063351.9BE5320847A@bastion.fedora.phx.redhat.com>

Package perl-Math-Vec in Fedora 6 was orphaned by roozbeh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Math-Vec



From pkgdb at fedoraproject.org  Tue Jan 13 06:33:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 06:33:56 +0000
Subject: [pkgdb] perl-Math-Vec ownership updated
Message-ID: <20090113063358.411A320847F@bastion.fedora.phx.redhat.com>

Package perl-Math-Vec in Fedora 8 was orphaned by roozbeh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Math-Vec



From pkgdb at fedoraproject.org  Tue Jan 13 06:34:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 06:34:02 +0000
Subject: [pkgdb] perl-Math-Vec ownership updated
Message-ID: <20090113063402.DDBE7208482@bastion.fedora.phx.redhat.com>

Package perl-Math-Vec in Fedora 9 was orphaned by roozbeh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Math-Vec



From pkgdb at fedoraproject.org  Tue Jan 13 06:34:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 06:34:06 +0000
Subject: [pkgdb] perl-Math-Vec ownership updated
Message-ID: <20090113063406.A812A208485@bastion.fedora.phx.redhat.com>

Package perl-Math-Vec in Fedora 10 was orphaned by roozbeh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Math-Vec



From pkgdb at fedoraproject.org  Tue Jan 13 06:35:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 06:35:30 +0000
Subject: [pkgdb] pyfribidi ownership updated
Message-ID: <20090113063530.56CC6208456@bastion.fedora.phx.redhat.com>

Package pyfribidi in Fedora 5 was orphaned by roozbeh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pyfribidi



From pkgdb at fedoraproject.org  Tue Jan 13 06:35:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 06:35:38 +0000
Subject: [pkgdb] pyfribidi ownership updated
Message-ID: <20090113063538.6E8E7208467@bastion.fedora.phx.redhat.com>

Package pyfribidi in Fedora 6 was orphaned by roozbeh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pyfribidi



From pkgdb at fedoraproject.org  Tue Jan 13 06:35:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 06:35:45 +0000
Subject: [pkgdb] pyfribidi ownership updated
Message-ID: <20090113063545.2906820846C@bastion.fedora.phx.redhat.com>

Package pyfribidi in Fedora 7 was orphaned by roozbeh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pyfribidi



From pkgdb at fedoraproject.org  Tue Jan 13 06:36:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 06:36:20 +0000
Subject: [pkgdb] python-enchant ownership updated
Message-ID: <20090113063620.35BC82081FB@bastion.fedora.phx.redhat.com>

Package python-enchant in Fedora 7 was orphaned by roozbeh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-enchant



From pkgdb at fedoraproject.org  Tue Jan 13 06:36:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 06:36:26 +0000
Subject: [pkgdb] python-enchant ownership updated
Message-ID: <20090113063626.681BF208457@bastion.fedora.phx.redhat.com>

Package python-enchant in Fedora 4 was orphaned by roozbeh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-enchant



From pkgdb at fedoraproject.org  Tue Jan 13 06:36:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 06:36:28 +0000
Subject: [pkgdb] python-enchant ownership updated
Message-ID: <20090113063628.30A40208468@bastion.fedora.phx.redhat.com>

Package python-enchant in Fedora 5 was orphaned by roozbeh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-enchant



From pkgdb at fedoraproject.org  Tue Jan 13 06:36:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 06:36:37 +0000
Subject: [pkgdb] python-enchant ownership updated
Message-ID: <20090113063637.436E8208467@bastion.fedora.phx.redhat.com>

Package python-enchant in Fedora 6 was orphaned by roozbeh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-enchant



From pkgdb at fedoraproject.org  Tue Jan 13 06:37:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 06:37:56 +0000
Subject: [pkgdb] t1lib: roozbeh has given up watchcommits
Message-ID: <20090113063756.C7533208203@bastion.fedora.phx.redhat.com>

roozbeh has given up the watchcommits acl on t1lib (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/t1lib



From pkgdb at fedoraproject.org  Tue Jan 13 06:37:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 06:37:56 +0000
Subject: [pkgdb] t1lib: roozbeh has given up watchbugzilla
Message-ID: <20090113063757.0228C208457@bastion.fedora.phx.redhat.com>

roozbeh has given up the watchbugzilla acl on t1lib (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/t1lib



From pkgdb at fedoraproject.org  Tue Jan 13 06:37:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 06:37:59 +0000
Subject: [pkgdb] t1lib: roozbeh has given up watchcommits
Message-ID: <20090113063759.CF0A5208468@bastion.fedora.phx.redhat.com>

roozbeh has given up the watchcommits acl on t1lib (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/t1lib



From pkgdb at fedoraproject.org  Tue Jan 13 06:38:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 06:38:01 +0000
Subject: [pkgdb] t1lib: roozbeh has given up watchbugzilla
Message-ID: <20090113063801.4C20620846C@bastion.fedora.phx.redhat.com>

roozbeh has given up the watchbugzilla acl on t1lib (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/t1lib



From pkgdb at fedoraproject.org  Tue Jan 13 06:38:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 06:38:04 +0000
Subject: [pkgdb] t1lib: roozbeh has given up watchbugzilla
Message-ID: <20090113063804.82563208471@bastion.fedora.phx.redhat.com>

roozbeh has given up the watchbugzilla acl on t1lib (Fedora 1)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/t1lib



From pkgdb at fedoraproject.org  Tue Jan 13 06:38:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 06:38:04 +0000
Subject: [pkgdb] t1lib: roozbeh has given up watchcommits
Message-ID: <20090113063804.DA314208473@bastion.fedora.phx.redhat.com>

roozbeh has given up the watchcommits acl on t1lib (Fedora 1)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/t1lib



From pkgdb at fedoraproject.org  Tue Jan 13 06:38:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 06:38:09 +0000
Subject: [pkgdb] t1lib: roozbeh has given up watchcommits
Message-ID: <20090113063809.2AE81208475@bastion.fedora.phx.redhat.com>

roozbeh has given up the watchcommits acl on t1lib (Fedora 2)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/t1lib



From pkgdb at fedoraproject.org  Tue Jan 13 06:38:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 06:38:10 +0000
Subject: [pkgdb] t1lib: roozbeh has given up watchbugzilla
Message-ID: <20090113063810.934AC208478@bastion.fedora.phx.redhat.com>

roozbeh has given up the watchbugzilla acl on t1lib (Fedora 2)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/t1lib



From pkgdb at fedoraproject.org  Tue Jan 13 06:38:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 06:38:14 +0000
Subject: [pkgdb] t1lib: roozbeh has given up watchbugzilla
Message-ID: <20090113063814.6250420847E@bastion.fedora.phx.redhat.com>

roozbeh has given up the watchbugzilla acl on t1lib (Fedora 3)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/t1lib



From pkgdb at fedoraproject.org  Tue Jan 13 06:38:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 06:38:13 +0000
Subject: [pkgdb] t1lib: roozbeh has given up watchcommits
Message-ID: <20090113063813.7788F20847B@bastion.fedora.phx.redhat.com>

roozbeh has given up the watchcommits acl on t1lib (Fedora 3)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/t1lib



From pkgdb at fedoraproject.org  Tue Jan 13 06:38:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 06:38:17 +0000
Subject: [pkgdb] t1lib: roozbeh has given up watchcommits
Message-ID: <20090113063817.E2BB5208203@bastion.fedora.phx.redhat.com>

roozbeh has given up the watchcommits acl on t1lib (Fedora 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/t1lib



From pkgdb at fedoraproject.org  Tue Jan 13 06:38:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 06:38:18 +0000
Subject: [pkgdb] t1lib: roozbeh has given up watchbugzilla
Message-ID: <20090113063819.01ED2208457@bastion.fedora.phx.redhat.com>

roozbeh has given up the watchbugzilla acl on t1lib (Fedora 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/t1lib



From pkgdb at fedoraproject.org  Tue Jan 13 06:38:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 06:38:22 +0000
Subject: [pkgdb] t1lib: roozbeh has given up watchcommits
Message-ID: <20090113063822.C1EF3208482@bastion.fedora.phx.redhat.com>

roozbeh has given up the watchcommits acl on t1lib (Fedora 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/t1lib



From pkgdb at fedoraproject.org  Tue Jan 13 06:38:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 06:38:24 +0000
Subject: [pkgdb] t1lib: roozbeh has given up watchbugzilla
Message-ID: <20090113063824.54E4C208485@bastion.fedora.phx.redhat.com>

roozbeh has given up the watchbugzilla acl on t1lib (Fedora 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/t1lib



From pkgdb at fedoraproject.org  Tue Jan 13 06:38:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 06:38:26 +0000
Subject: [pkgdb] t1lib: roozbeh has given up watchcommits
Message-ID: <20090113063826.AA197208467@bastion.fedora.phx.redhat.com>

roozbeh has given up the watchcommits acl on t1lib (Fedora 6)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/t1lib



From pkgdb at fedoraproject.org  Tue Jan 13 06:38:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 06:38:31 +0000
Subject: [pkgdb] t1lib: roozbeh has given up watchcommits
Message-ID: <20090113063832.1A47B208489@bastion.fedora.phx.redhat.com>

roozbeh has given up the watchcommits acl on t1lib (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/t1lib



From pkgdb at fedoraproject.org  Tue Jan 13 06:38:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 06:38:28 +0000
Subject: [pkgdb] t1lib: roozbeh has given up watchbugzilla
Message-ID: <20090113063828.D72EB20846C@bastion.fedora.phx.redhat.com>

roozbeh has given up the watchbugzilla acl on t1lib (Fedora 6)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/t1lib



From pkgdb at fedoraproject.org  Tue Jan 13 06:38:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 06:38:33 +0000
Subject: [pkgdb] t1lib: roozbeh has given up watchbugzilla
Message-ID: <20090113063833.446DE20848C@bastion.fedora.phx.redhat.com>

roozbeh has given up the watchbugzilla acl on t1lib (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/t1lib



From pkgdb at fedoraproject.org  Tue Jan 13 06:38:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 06:38:37 +0000
Subject: [pkgdb] t1lib: roozbeh has given up watchbugzilla
Message-ID: <20090113063838.2853120846B@bastion.fedora.phx.redhat.com>

roozbeh has given up the watchbugzilla acl on t1lib (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/t1lib



From pkgdb at fedoraproject.org  Tue Jan 13 06:38:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 06:38:38 +0000
Subject: [pkgdb] t1lib: roozbeh has given up watchcommits
Message-ID: <20090113063838.48C29208491@bastion.fedora.phx.redhat.com>

roozbeh has given up the watchcommits acl on t1lib (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/t1lib



From pkgdb at fedoraproject.org  Tue Jan 13 06:38:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 06:38:40 +0000
Subject: [pkgdb] t1lib: roozbeh has given up watchbugzilla
Message-ID: <20090113063840.BA384208470@bastion.fedora.phx.redhat.com>

roozbeh has given up the watchbugzilla acl on t1lib (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/t1lib



From pkgdb at fedoraproject.org  Tue Jan 13 06:38:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 06:38:42 +0000
Subject: [pkgdb] t1lib: roozbeh has given up watchcommits
Message-ID: <20090113063842.9E90E208495@bastion.fedora.phx.redhat.com>

roozbeh has given up the watchcommits acl on t1lib (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/t1lib



From pkgdb at fedoraproject.org  Tue Jan 13 06:38:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 06:38:57 +0000
Subject: [pkgdb] t1utils: roozbeh has given up watchcommits
Message-ID: <20090113063858.809C6208475@bastion.fedora.phx.redhat.com>

roozbeh has given up the watchcommits acl on t1utils (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/t1utils



From pkgdb at fedoraproject.org  Tue Jan 13 06:38:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 06:38:55 +0000
Subject: [pkgdb] t1utils: roozbeh has given up watchbugzilla
Message-ID: <20090113063858.869222084B7@bastion.fedora.phx.redhat.com>

roozbeh has given up the watchbugzilla acl on t1utils (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/t1utils



From pkgdb at fedoraproject.org  Tue Jan 13 06:39:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 06:39:00 +0000
Subject: [pkgdb] t1utils: roozbeh has given up watchcommits
Message-ID: <20090113063900.A9B17208678@bastion.fedora.phx.redhat.com>

roozbeh has given up the watchcommits acl on t1utils (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/t1utils



From pkgdb at fedoraproject.org  Tue Jan 13 06:39:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 06:39:01 +0000
Subject: [pkgdb] t1utils: roozbeh has given up watchbugzilla
Message-ID: <20090113063901.EC2EF208701@bastion.fedora.phx.redhat.com>

roozbeh has given up the watchbugzilla acl on t1utils (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/t1utils



From pkgdb at fedoraproject.org  Tue Jan 13 06:39:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 06:39:08 +0000
Subject: [pkgdb] t1utils: roozbeh has given up watchcommits
Message-ID: <20090113063908.8E621208479@bastion.fedora.phx.redhat.com>

roozbeh has given up the watchcommits acl on t1utils (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/t1utils



From pkgdb at fedoraproject.org  Tue Jan 13 06:39:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 06:39:09 +0000
Subject: [pkgdb] t1utils: roozbeh has given up watchbugzilla
Message-ID: <20090113063909.F2EC9208744@bastion.fedora.phx.redhat.com>

roozbeh has given up the watchbugzilla acl on t1utils (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/t1utils



From pkgdb at fedoraproject.org  Tue Jan 13 06:39:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 06:39:10 +0000
Subject: [pkgdb] t1utils: roozbeh has given up watchbugzilla
Message-ID: <20090113063910.E6F7020876B@bastion.fedora.phx.redhat.com>

roozbeh has given up the watchbugzilla acl on t1utils (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/t1utils



From pkgdb at fedoraproject.org  Tue Jan 13 06:39:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 06:39:11 +0000
Subject: [pkgdb] t1utils: roozbeh has given up watchcommits
Message-ID: <20090113063911.D7BE220847D@bastion.fedora.phx.redhat.com>

roozbeh has given up the watchcommits acl on t1utils (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/t1utils



From pkgdb at fedoraproject.org  Tue Jan 13 06:39:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 06:39:13 +0000
Subject: [pkgdb] t1utils: roozbeh has given up watchbugzilla
Message-ID: <20090113063914.2C44420847C@bastion.fedora.phx.redhat.com>

roozbeh has given up the watchbugzilla acl on t1utils (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/t1utils



From pkgdb at fedoraproject.org  Tue Jan 13 06:39:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 06:39:21 +0000
Subject: [pkgdb] t1utils: roozbeh has given up watchbugzilla
Message-ID: <20090113063921.BF65120897C@bastion.fedora.phx.redhat.com>

roozbeh has given up the watchbugzilla acl on t1utils (Red Hat Linux 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/t1utils



From pkgdb at fedoraproject.org  Tue Jan 13 06:39:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 06:39:15 +0000
Subject: [pkgdb] t1utils: roozbeh has given up watchcommits
Message-ID: <20090113063915.9F7FA208977@bastion.fedora.phx.redhat.com>

roozbeh has given up the watchcommits acl on t1utils (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/t1utils



From pkgdb at fedoraproject.org  Tue Jan 13 06:39:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 06:39:23 +0000
Subject: [pkgdb] t1utils: roozbeh has given up watchcommits
Message-ID: <20090113063923.628E920847F@bastion.fedora.phx.redhat.com>

roozbeh has given up the watchcommits acl on t1utils (Red Hat Linux 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/t1utils



From pkgdb at fedoraproject.org  Tue Jan 13 06:39:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 06:39:27 +0000
Subject: [pkgdb] t1utils: roozbeh has given up watchbugzilla
Message-ID: <20090113063927.7265D208457@bastion.fedora.phx.redhat.com>

roozbeh has given up the watchbugzilla acl on t1utils (Red Hat Linux 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/t1utils



From pkgdb at fedoraproject.org  Tue Jan 13 06:39:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 06:39:28 +0000
Subject: [pkgdb] t1utils: roozbeh has given up watchcommits
Message-ID: <20090113063928.4CA4B208DDB@bastion.fedora.phx.redhat.com>

roozbeh has given up the watchcommits acl on t1utils (Red Hat Linux 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/t1utils



From pkgdb at fedoraproject.org  Tue Jan 13 06:39:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 06:39:30 +0000
Subject: [pkgdb] t1utils: roozbeh has given up watchbugzilla
Message-ID: <20090113063930.1F6CC208DDE@bastion.fedora.phx.redhat.com>

roozbeh has given up the watchbugzilla acl on t1utils (Fedora 6)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/t1utils



From pkgdb at fedoraproject.org  Tue Jan 13 06:39:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 06:39:30 +0000
Subject: [pkgdb] t1utils: roozbeh has given up watchcommits
Message-ID: <20090113063930.CD07C208DE1@bastion.fedora.phx.redhat.com>

roozbeh has given up the watchcommits acl on t1utils (Fedora 6)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/t1utils



From pkgdb at fedoraproject.org  Tue Jan 13 06:39:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 06:39:35 +0000
Subject: [pkgdb] t1utils: roozbeh has given up watchcommits
Message-ID: <20090113063935.80635208DE4@bastion.fedora.phx.redhat.com>

roozbeh has given up the watchcommits acl on t1utils (Fedora 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/t1utils



From pkgdb at fedoraproject.org  Tue Jan 13 06:39:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 06:39:36 +0000
Subject: [pkgdb] t1utils: roozbeh has given up watchbugzilla
Message-ID: <20090113063936.825C1208483@bastion.fedora.phx.redhat.com>

roozbeh has given up the watchbugzilla acl on t1utils (Fedora 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/t1utils



From pkgdb at fedoraproject.org  Tue Jan 13 06:39:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 06:39:38 +0000
Subject: [pkgdb] t1utils: roozbeh has given up watchbugzilla
Message-ID: <20090113063938.89733208DE6@bastion.fedora.phx.redhat.com>

roozbeh has given up the watchbugzilla acl on t1utils (Fedora 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/t1utils



From pkgdb at fedoraproject.org  Tue Jan 13 06:39:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 06:39:39 +0000
Subject: [pkgdb] t1utils: roozbeh has given up watchcommits
Message-ID: <20090113063939.78103208DE9@bastion.fedora.phx.redhat.com>

roozbeh has given up the watchcommits acl on t1utils (Fedora 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/t1utils



From pkgdb at fedoraproject.org  Tue Jan 13 06:39:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 06:39:43 +0000
Subject: [pkgdb] t1utils: roozbeh has given up watchcommits
Message-ID: <20090113063943.CE70B208DED@bastion.fedora.phx.redhat.com>

roozbeh has given up the watchcommits acl on t1utils (Fedora 3)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/t1utils



From pkgdb at fedoraproject.org  Tue Jan 13 06:39:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 06:39:45 +0000
Subject: [pkgdb] t1utils: roozbeh has given up watchbugzilla
Message-ID: <20090113063945.4D688208DEF@bastion.fedora.phx.redhat.com>

roozbeh has given up the watchbugzilla acl on t1utils (Fedora 3)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/t1utils



From pkgdb at fedoraproject.org  Tue Jan 13 06:39:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 06:39:47 +0000
Subject: [pkgdb] t1utils: roozbeh has given up watchcommits
Message-ID: <20090113063947.A66F1208468@bastion.fedora.phx.redhat.com>

roozbeh has given up the watchcommits acl on t1utils (Fedora 2)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/t1utils



From pkgdb at fedoraproject.org  Tue Jan 13 06:39:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 06:39:48 +0000
Subject: [pkgdb] t1utils: roozbeh has given up watchbugzilla
Message-ID: <20090113063949.9EB75208DF2@bastion.fedora.phx.redhat.com>

roozbeh has given up the watchbugzilla acl on t1utils (Fedora 2)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/t1utils



From pkgdb at fedoraproject.org  Tue Jan 13 06:39:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 06:39:52 +0000
Subject: [pkgdb] t1utils: roozbeh has given up watchcommits
Message-ID: <20090113063952.4ED35208DF6@bastion.fedora.phx.redhat.com>

roozbeh has given up the watchcommits acl on t1utils (Fedora 1)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/t1utils



From pkgdb at fedoraproject.org  Tue Jan 13 06:39:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 06:39:54 +0000
Subject: [pkgdb] t1utils: roozbeh has given up watchbugzilla
Message-ID: <20090113063954.6901E208DF9@bastion.fedora.phx.redhat.com>

roozbeh has given up the watchbugzilla acl on t1utils (Fedora 1)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/t1utils



From pkgdb at fedoraproject.org  Tue Jan 13 06:40:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 06:40:27 +0000
Subject: [pkgdb] translate-toolkit ownership updated
Message-ID: <20090113064027.4E383208489@bastion.fedora.phx.redhat.com>

Package translate-toolkit in Fedora 7 was orphaned by roozbeh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/translate-toolkit



From pkgdb at fedoraproject.org  Tue Jan 13 06:40:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 06:40:32 +0000
Subject: [pkgdb] translate-toolkit ownership updated
Message-ID: <20090113064032.79B4E208470@bastion.fedora.phx.redhat.com>

Package translate-toolkit in Fedora 4 was orphaned by roozbeh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/translate-toolkit



From pkgdb at fedoraproject.org  Tue Jan 13 06:40:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 06:40:38 +0000
Subject: [pkgdb] translate-toolkit ownership updated
Message-ID: <20090113064038.DEC9D20848C@bastion.fedora.phx.redhat.com>

Package translate-toolkit in Fedora 5 was orphaned by roozbeh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/translate-toolkit



From pkgdb at fedoraproject.org  Tue Jan 13 06:40:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 06:40:40 +0000
Subject: [pkgdb] translate-toolkit ownership updated
Message-ID: <20090113064041.005D420848D@bastion.fedora.phx.redhat.com>

Package translate-toolkit in Fedora 6 was orphaned by roozbeh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/translate-toolkit



From pkgdb at fedoraproject.org  Tue Jan 13 06:41:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 06:41:17 +0000
Subject: [pkgdb] ttf2pt1: roozbeh has given up watchcommits
Message-ID: <20090113064117.88813208476@bastion.fedora.phx.redhat.com>

roozbeh has given up the watchcommits acl on ttf2pt1 (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ttf2pt1



From pkgdb at fedoraproject.org  Tue Jan 13 06:41:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 06:41:22 +0000
Subject: [pkgdb] ttf2pt1: roozbeh has given up watchbugzilla
Message-ID: <20090113064122.71991208479@bastion.fedora.phx.redhat.com>

roozbeh has given up the watchbugzilla acl on ttf2pt1 (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ttf2pt1



From pkgdb at fedoraproject.org  Tue Jan 13 06:41:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 06:41:24 +0000
Subject: [pkgdb] ttf2pt1: roozbeh has given up watchcommits
Message-ID: <20090113064124.54D33208493@bastion.fedora.phx.redhat.com>

roozbeh has given up the watchcommits acl on ttf2pt1 (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ttf2pt1



From pkgdb at fedoraproject.org  Tue Jan 13 06:41:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 06:41:31 +0000
Subject: [pkgdb] ttf2pt1: roozbeh has given up watchcommits
Message-ID: <20090113064131.B1ADE2084B6@bastion.fedora.phx.redhat.com>

roozbeh has given up the watchcommits acl on ttf2pt1 (Fedora 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ttf2pt1



From pkgdb at fedoraproject.org  Tue Jan 13 06:41:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 06:41:25 +0000
Subject: [pkgdb] ttf2pt1: roozbeh has given up watchbugzilla
Message-ID: <20090113064126.4CDC62084BD@bastion.fedora.phx.redhat.com>

roozbeh has given up the watchbugzilla acl on ttf2pt1 (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ttf2pt1



From pkgdb at fedoraproject.org  Tue Jan 13 06:41:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 06:41:35 +0000
Subject: [pkgdb] ttf2pt1: roozbeh has given up watchbugzilla
Message-ID: <20090113064135.AEDD6208678@bastion.fedora.phx.redhat.com>

roozbeh has given up the watchbugzilla acl on ttf2pt1 (Fedora 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ttf2pt1



From pkgdb at fedoraproject.org  Tue Jan 13 06:41:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 06:41:37 +0000
Subject: [pkgdb] ttf2pt1: roozbeh has given up watchbugzilla
Message-ID: <20090113064138.07C8C208745@bastion.fedora.phx.redhat.com>

roozbeh has given up the watchbugzilla acl on ttf2pt1 (Fedora 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ttf2pt1



From pkgdb at fedoraproject.org  Tue Jan 13 06:42:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 06:42:58 +0000
Subject: [pkgdb] autotrace: roozbeh has given up watchbugzilla
Message-ID: <20090113064258.5C92E20848E@bastion.fedora.phx.redhat.com>

roozbeh has given up the watchbugzilla acl on autotrace (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/autotrace



From pkgdb at fedoraproject.org  Tue Jan 13 06:42:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 06:42:59 +0000
Subject: [pkgdb] autotrace: roozbeh has given up watchcommits
Message-ID: <20090113064259.3FC16208748@bastion.fedora.phx.redhat.com>

roozbeh has given up the watchcommits acl on autotrace (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/autotrace



From pkgdb at fedoraproject.org  Tue Jan 13 06:43:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 06:43:01 +0000
Subject: [pkgdb] autotrace: roozbeh has given up watchcommits
Message-ID: <20090113064301.6A798208974@bastion.fedora.phx.redhat.com>

roozbeh has given up the watchcommits acl on autotrace (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/autotrace



From pkgdb at fedoraproject.org  Tue Jan 13 06:43:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 06:43:06 +0000
Subject: [pkgdb] autotrace: roozbeh has given up watchcommits
Message-ID: <20090113064307.3C92F208A61@bastion.fedora.phx.redhat.com>

roozbeh has given up the watchcommits acl on autotrace (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/autotrace



From pkgdb at fedoraproject.org  Tue Jan 13 06:43:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 06:43:06 +0000
Subject: [pkgdb] autotrace: roozbeh has given up watchbugzilla
Message-ID: <20090113064307.9EA9D208D0C@bastion.fedora.phx.redhat.com>

roozbeh has given up the watchbugzilla acl on autotrace (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/autotrace



From pkgdb at fedoraproject.org  Tue Jan 13 06:43:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 06:43:07 +0000
Subject: [pkgdb] autotrace: roozbeh has given up watchbugzilla
Message-ID: <20090113064307.D9DA4208DDB@bastion.fedora.phx.redhat.com>

roozbeh has given up the watchbugzilla acl on autotrace (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/autotrace



From pkgdb at fedoraproject.org  Tue Jan 13 06:43:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 06:43:13 +0000
Subject: [pkgdb] autotrace: roozbeh has given up watchcommits
Message-ID: <20090113064314.10ED7208DDF@bastion.fedora.phx.redhat.com>

roozbeh has given up the watchcommits acl on autotrace (Fedora 6)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/autotrace



From pkgdb at fedoraproject.org  Tue Jan 13 06:44:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 06:44:55 +0000
Subject: [pkgdb] autotrace: roozbeh has given up watchbugzilla
Message-ID: <20090113064455.C215C208473@bastion.fedora.phx.redhat.com>

roozbeh has given up the watchbugzilla acl on autotrace (Fedora 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/autotrace



From pkgdb at fedoraproject.org  Tue Jan 13 06:44:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 06:44:56 +0000
Subject: [pkgdb] autotrace: roozbeh has given up watchcommits
Message-ID: <20090113064456.372D7208476@bastion.fedora.phx.redhat.com>

roozbeh has given up the watchcommits acl on autotrace (Fedora 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/autotrace



From pkgdb at fedoraproject.org  Tue Jan 13 06:44:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 06:44:56 +0000
Subject: [pkgdb] autotrace: roozbeh has given up watchbugzilla
Message-ID: <20090113064456.D4A6D208487@bastion.fedora.phx.redhat.com>

roozbeh has given up the watchbugzilla acl on autotrace (Fedora 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/autotrace



From pkgdb at fedoraproject.org  Tue Jan 13 06:44:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 06:44:56 +0000
Subject: [pkgdb] autotrace: roozbeh has given up watchbugzilla
Message-ID: <20090113064457.007B9208489@bastion.fedora.phx.redhat.com>

roozbeh has given up the watchbugzilla acl on autotrace (Fedora 2)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/autotrace



From pkgdb at fedoraproject.org  Tue Jan 13 06:44:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 06:44:57 +0000
Subject: [pkgdb] autotrace: roozbeh has given up watchcommits
Message-ID: <20090113064457.69B9020848C@bastion.fedora.phx.redhat.com>

roozbeh has given up the watchcommits acl on autotrace (Fedora 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/autotrace



From pkgdb at fedoraproject.org  Tue Jan 13 06:44:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 06:44:57 +0000
Subject: [pkgdb] autotrace: roozbeh has given up watchcommits
Message-ID: <20090113064457.99FAA208490@bastion.fedora.phx.redhat.com>

roozbeh has given up the watchcommits acl on autotrace (Fedora 2)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/autotrace



From pkgdb at fedoraproject.org  Tue Jan 13 06:44:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 06:44:58 +0000
Subject: [pkgdb] autotrace: roozbeh has given up watchbugzilla
Message-ID: <20090113064458.ACBF7208DE4@bastion.fedora.phx.redhat.com>

roozbeh has given up the watchbugzilla acl on autotrace (Fedora 1)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/autotrace



From pkgdb at fedoraproject.org  Tue Jan 13 06:44:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 06:44:58 +0000
Subject: [pkgdb] autotrace: roozbeh has given up watchbugzilla
Message-ID: <20090113064458.C414D208DE7@bastion.fedora.phx.redhat.com>

roozbeh has given up the watchbugzilla acl on autotrace (Fedora 6)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/autotrace



From pkgdb at fedoraproject.org  Tue Jan 13 06:45:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 06:45:00 +0000
Subject: [pkgdb] autotrace: roozbeh has given up watchcommits
Message-ID: <20090113064500.725F5208DEA@bastion.fedora.phx.redhat.com>

roozbeh has given up the watchcommits acl on autotrace (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/autotrace



From pkgdb at fedoraproject.org  Tue Jan 13 06:45:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 06:45:00 +0000
Subject: [pkgdb] autotrace: roozbeh has given up watchcommits
Message-ID: <20090113064500.A14EF208DED@bastion.fedora.phx.redhat.com>

roozbeh has given up the watchcommits acl on autotrace (Fedora 1)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/autotrace



From pkgdb at fedoraproject.org  Tue Jan 13 06:45:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 06:45:01 +0000
Subject: [pkgdb] autotrace: roozbeh has given up watchbugzilla
Message-ID: <20090113064502.C1E28208DF2@bastion.fedora.phx.redhat.com>

roozbeh has given up the watchbugzilla acl on autotrace (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/autotrace



From pkgdb at fedoraproject.org  Tue Jan 13 06:45:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 06:45:02 +0000
Subject: [pkgdb] autotrace: roozbeh has given up watchcommits
Message-ID: <20090113064502.C34B6208DF4@bastion.fedora.phx.redhat.com>

roozbeh has given up the watchcommits acl on autotrace (Fedora 3)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/autotrace



From pkgdb at fedoraproject.org  Tue Jan 13 06:45:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 06:45:02 +0000
Subject: [pkgdb] autotrace: roozbeh has given up watchbugzilla
Message-ID: <20090113064503.94041208DF9@bastion.fedora.phx.redhat.com>

roozbeh has given up the watchbugzilla acl on autotrace (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/autotrace



From pkgdb at fedoraproject.org  Tue Jan 13 06:45:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 06:45:03 +0000
Subject: [pkgdb] autotrace: roozbeh has given up watchcommits
Message-ID: <20090113064503.C9C59208DF8@bastion.fedora.phx.redhat.com>

roozbeh has given up the watchcommits acl on autotrace (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/autotrace



From pkgdb at fedoraproject.org  Tue Jan 13 06:45:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 06:45:04 +0000
Subject: [pkgdb] autotrace: roozbeh has given up watchbugzilla
Message-ID: <20090113064504.BA37C208496@bastion.fedora.phx.redhat.com>

roozbeh has given up the watchbugzilla acl on autotrace (Fedora 3)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/autotrace



From pkgdb at fedoraproject.org  Tue Jan 13 06:45:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 06:45:18 +0000
Subject: [pkgdb] gtranslator: roozbeh has given up watchcommits
Message-ID: <20090113064518.F1E45208493@bastion.fedora.phx.redhat.com>

roozbeh has given up the watchcommits acl on gtranslator (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gtranslator



From pkgdb at fedoraproject.org  Tue Jan 13 06:45:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 06:45:19 +0000
Subject: [pkgdb] gtranslator: roozbeh has given up watchbugzilla
Message-ID: <20090113064519.D07EB2084BA@bastion.fedora.phx.redhat.com>

roozbeh has given up the watchbugzilla acl on gtranslator (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gtranslator



From pkgdb at fedoraproject.org  Tue Jan 13 06:45:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 06:45:21 +0000
Subject: [pkgdb] gtranslator: roozbeh has given up watchbugzilla
Message-ID: <20090113064521.6684C208DFB@bastion.fedora.phx.redhat.com>

roozbeh has given up the watchbugzilla acl on gtranslator (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gtranslator



From pkgdb at fedoraproject.org  Tue Jan 13 06:45:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 06:45:22 +0000
Subject: [pkgdb] gtranslator: roozbeh has given up watchcommits
Message-ID: <20090113064522.A9201208DFE@bastion.fedora.phx.redhat.com>

roozbeh has given up the watchcommits acl on gtranslator (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gtranslator



From pkgdb at fedoraproject.org  Tue Jan 13 06:45:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 06:45:29 +0000
Subject: [pkgdb] gtranslator: roozbeh has given up watchcommits
Message-ID: <20090113064529.E136B2086F2@bastion.fedora.phx.redhat.com>

roozbeh has given up the watchcommits acl on gtranslator (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gtranslator



From pkgdb at fedoraproject.org  Tue Jan 13 06:45:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 06:45:31 +0000
Subject: [pkgdb] gtranslator: roozbeh has given up watchbugzilla
Message-ID: <20090113064531.7CC91208745@bastion.fedora.phx.redhat.com>

roozbeh has given up the watchbugzilla acl on gtranslator (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gtranslator



From pkgdb at fedoraproject.org  Tue Jan 13 06:45:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 06:45:33 +0000
Subject: [pkgdb] gtranslator: roozbeh has given up watchcommits
Message-ID: <20090113064534.00C63208E06@bastion.fedora.phx.redhat.com>

roozbeh has given up the watchcommits acl on gtranslator (Fedora 6)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gtranslator



From pkgdb at fedoraproject.org  Tue Jan 13 06:45:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 06:45:34 +0000
Subject: [pkgdb] gtranslator: roozbeh has given up watchbugzilla
Message-ID: <20090113064535.03DE4208E09@bastion.fedora.phx.redhat.com>

roozbeh has given up the watchbugzilla acl on gtranslator (Fedora 6)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gtranslator



From pkgdb at fedoraproject.org  Tue Jan 13 06:45:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 06:45:39 +0000
Subject: [pkgdb] gtranslator: roozbeh has given up watchcommits
Message-ID: <20090113064539.EC891208456@bastion.fedora.phx.redhat.com>

roozbeh has given up the watchcommits acl on gtranslator (Fedora 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gtranslator



From pkgdb at fedoraproject.org  Tue Jan 13 06:45:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 06:45:43 +0000
Subject: [pkgdb] gtranslator: roozbeh has given up watchbugzilla
Message-ID: <20090113064543.CD6DD208701@bastion.fedora.phx.redhat.com>

roozbeh has given up the watchbugzilla acl on gtranslator (Fedora 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gtranslator



From pkgdb at fedoraproject.org  Tue Jan 13 06:45:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 06:45:43 +0000
Subject: [pkgdb] gtranslator: roozbeh has given up watchbugzilla
Message-ID: <20090113064544.043A9208E0D@bastion.fedora.phx.redhat.com>

roozbeh has given up the watchbugzilla acl on gtranslator (Fedora 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gtranslator



From pkgdb at fedoraproject.org  Tue Jan 13 06:45:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 06:45:48 +0000
Subject: [pkgdb] gtranslator: roozbeh has given up watchcommits
Message-ID: <20090113064548.F2BCB208E15@bastion.fedora.phx.redhat.com>

roozbeh has given up the watchcommits acl on gtranslator (Fedora 3)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gtranslator



From pkgdb at fedoraproject.org  Tue Jan 13 06:45:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 06:45:49 +0000
Subject: [pkgdb] gtranslator: roozbeh has given up watchcommits
Message-ID: <20090113064550.D006B208457@bastion.fedora.phx.redhat.com>

roozbeh has given up the watchcommits acl on gtranslator (Fedora 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gtranslator



From pkgdb at fedoraproject.org  Tue Jan 13 06:45:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 06:45:50 +0000
Subject: [pkgdb] gtranslator: roozbeh has given up watchbugzilla
Message-ID: <20090113064550.74962208E12@bastion.fedora.phx.redhat.com>

roozbeh has given up the watchbugzilla acl on gtranslator (Fedora 2)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gtranslator



From pkgdb at fedoraproject.org  Tue Jan 13 06:45:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 06:45:52 +0000
Subject: [pkgdb] gtranslator: roozbeh has given up watchcommits
Message-ID: <20090113064552.416BB208E10@bastion.fedora.phx.redhat.com>

roozbeh has given up the watchcommits acl on gtranslator (Fedora 2)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gtranslator



From pkgdb at fedoraproject.org  Tue Jan 13 06:45:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 06:45:52 +0000
Subject: [pkgdb] gtranslator: roozbeh has given up watchbugzilla
Message-ID: <20090113064552.88836208E1A@bastion.fedora.phx.redhat.com>

roozbeh has given up the watchbugzilla acl on gtranslator (Fedora 3)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gtranslator



From pkgdb at fedoraproject.org  Tue Jan 13 06:45:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 06:45:55 +0000
Subject: [pkgdb] gtranslator: roozbeh has given up watchcommits
Message-ID: <20090113064555.70DD8208E1D@bastion.fedora.phx.redhat.com>

roozbeh has given up the watchcommits acl on gtranslator (Fedora 1)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gtranslator



From pkgdb at fedoraproject.org  Tue Jan 13 06:45:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 06:45:56 +0000
Subject: [pkgdb] gtranslator: roozbeh has given up watchbugzilla
Message-ID: <20090113064556.CEE59208481@bastion.fedora.phx.redhat.com>

roozbeh has given up the watchbugzilla acl on gtranslator (Fedora 1)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gtranslator



From pkgdb at fedoraproject.org  Tue Jan 13 06:45:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 06:45:58 +0000
Subject: [pkgdb] gtranslator: roozbeh has given up watchbugzilla
Message-ID: <20090113064558.9844A208E21@bastion.fedora.phx.redhat.com>

roozbeh has given up the watchbugzilla acl on gtranslator (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gtranslator



From pkgdb at fedoraproject.org  Tue Jan 13 06:45:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 06:45:59 +0000
Subject: [pkgdb] gtranslator: roozbeh has given up watchcommits
Message-ID: <20090113064559.AD1E2208E25@bastion.fedora.phx.redhat.com>

roozbeh has given up the watchcommits acl on gtranslator (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gtranslator



From pkgdb at fedoraproject.org  Tue Jan 13 06:46:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 06:46:03 +0000
Subject: [pkgdb] gtranslator: roozbeh has given up watchcommits
Message-ID: <20090113064603.523F9208483@bastion.fedora.phx.redhat.com>

roozbeh has given up the watchcommits acl on gtranslator (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gtranslator



From pkgdb at fedoraproject.org  Tue Jan 13 06:46:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 06:46:04 +0000
Subject: [pkgdb] gtranslator: roozbeh has given up watchbugzilla
Message-ID: <20090113064604.3158B208E26@bastion.fedora.phx.redhat.com>

roozbeh has given up the watchbugzilla acl on gtranslator (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gtranslator



From pbrobinson at fedoraproject.org  Tue Jan 13 06:50:52 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Tue, 13 Jan 2009 06:50:52 +0000 (UTC)
Subject: rpms/opal/devel opal.spec,1.34,1.35
Message-ID: <20090113065052.A9B4B70129@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/opal/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28416

Modified Files:
	opal.spec 
Log Message:
- Add a build dep


Index: opal.spec
===================================================================
RCS file: /cvs/pkgs/rpms/opal/devel/opal.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- opal.spec	6 Jan 2009 07:29:24 -0000	1.34
+++ opal.spec	13 Jan 2009 06:50:22 -0000	1.35
@@ -1,7 +1,7 @@
 Name:		opal
 Summary:	Open Phone Abstraction Library
 Version:	3.5.2
-Release:	1%{?dist}
+Release:	2%{?dist}
 URL:		http://www.opalvoip.org/
 Source0:	ftp://ftp.gnome.org/pub/gnome/sources/%{name}/3.4/%{name}-%{version}.tar.bz2
 License:	MPLv1.0
@@ -11,6 +11,7 @@
 BuildRequires:	openssl-devel
 BuildRequires:	libtheora-devel
 BuildRequires:	speex-devel
+BuildRequires:	SDL-devel
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -68,6 +69,9 @@
 %{_libdir}/pkgconfig/opal.pc
 
 %changelog
+* Tue Jan 13 2009 Peter Robinson <pbrobinson at gmail.com> - 3.5.2-2
+- Add a build dep
+
 * Tue Jan  6 2009 Peter Robinson <pbrobinson at gmail.com> - 3.5.2-1
 - New release for ekiga 3.1.0 beta
 - Some updates from merge review



From pbrobinson at fedoraproject.org  Tue Jan 13 06:55:50 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Tue, 13 Jan 2009 06:55:50 +0000 (UTC)
Subject: rpms/ekiga/devel ekiga-fix-desktop-in.patch, NONE, 1.1 ekiga.spec, 
	1.64, 1.65 ekiga-fixlibnotify.patch, 1.1, NONE
Message-ID: <20090113065550.D3DC570129@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/ekiga/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29563

Modified Files:
	ekiga.spec 
Added Files:
	ekiga-fix-desktop-in.patch 
Removed Files:
	ekiga-fixlibnotify.patch 
Log Message:
- Proper fix from upstream for desktop file

ekiga-fix-desktop-in.patch:

--- NEW FILE ekiga-fix-desktop-in.patch ---
--- trunk/Makefile.am	2009/01/05 19:55:14	7522
+++ trunk/Makefile.am	2009/01/06 21:08:47	7529
@@ -12,7 +12,6 @@
 
 DESKTOP_IN_FILE=@PACKAGE_NAME at .desktop.in.in
 DESKTOP_FILE=@PACKAGE_NAME at .desktop
-DESKTOP_FILES=$(DESKTOP_IN_FILE:.desktop.in=.desktop)
 
 SCHEMAS_IN_IN_FILE = @PACKAGE_NAME at .schemas.in.in
 SCHEMAS_FILE = @PACKAGE_NAME at .schemas
@@ -61,7 +60,7 @@
 	$(WIN32_DIST)
 
 Applicationsdir = $(datadir)/applications
-Applications_DATA = $(DESKTOP_FILES)
+Applications_DATA = $(DESKTOP_FILE)
 
 
 ### Dist Clear


Index: ekiga.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ekiga/devel/ekiga.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- ekiga.spec	7 Jan 2009 07:02:38 -0000	1.64
+++ ekiga.spec	13 Jan 2009 06:55:20 -0000	1.65
@@ -1,10 +1,10 @@
 Summary:	A Gnome based SIP/H323 teleconferencing application
 Name:		ekiga
 Version:	3.1.0
-Release:	2%{?dist}
+Release:	3%{?dist}
 URL:		http://www.ekiga.org/
 Source0:	ftp://ftp.gnome.org/pub/gnome/sources/ekiga/3.0/%{name}-%{version}.tar.bz2
-Source1:	ekiga.desktop
+Patch0:		ekiga-fix-desktop-in.patch
 License:	GPLv2+
 Group:		Applications/Communications
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -49,6 +49,7 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .fix-desktop-in
 
 %build
 CXXFLAGS="$RPM_OPT_FLAGS -DLDAP_DEPRECATED=1 -fPIC"
@@ -63,10 +64,6 @@
 
 rm -rf $RPM_BUILD_ROOT/var/scrollkeeper
 
-# Temporarily remove the desktop.in.in file and replace with the real thing
-rm -rf $RPM_BUILD_ROOT%{_datadir}/applications/ekiga.desktop.in.in
-cp %{SOURCE1}  $RPM_BUILD_ROOT%{_datadir}/applications/ekiga.desktop
-
 # Replace identical images in the help by links.
 # This reduces the RPM size by several megabytes.
 helpdir=$RPM_BUILD_ROOT%{_datadir}/gnome/help/%{name}
@@ -138,6 +135,9 @@
 %{_sysconfdir}/gconf/schemas/ekiga.schemas
 
 %changelog
+* Tue Jan 13 2009 Peter Robinson <pbrobinson at gmail.com> - 3.1.0-3
+- Proper fix from upstream for desktop file
+
 * Wed Jan  7 2009 Peter Robinson <pbrobinson at gmail.com> - 3.1.0-2
 - Fix issues with the desktop file
 


--- ekiga-fixlibnotify.patch DELETED ---



From pbrobinson at fedoraproject.org  Tue Jan 13 07:01:40 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Tue, 13 Jan 2009 07:01:40 +0000 (UTC)
Subject: rpms/ptlib/devel ptlib.spec,1.7,1.8
Message-ID: <20090113070140.67E1E70129@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/ptlib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30273

Modified Files:
	ptlib.spec 
Log Message:
- Add an extra build dep


Index: ptlib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ptlib/devel/ptlib.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ptlib.spec	7 Jan 2009 05:43:12 -0000	1.7
+++ ptlib.spec	13 Jan 2009 07:01:09 -0000	1.8
@@ -1,7 +1,7 @@
 Name:		ptlib
 Summary:	Portable Tools Library
 Version:	2.5.2
-Release:	2%{?dist}
+Release:	3%{?dist}
 URL:		http://www.opalvoip.org/
 Source0:	ftp://ftp.gnome.org/pub/gnome/sources/%{name}/2.5/%{name}-%{version}.tar.bz2
 License:	MPLv1.0
@@ -11,6 +11,7 @@
 BuildRequires:	expat openssl-devel pkgconfig
 BuildRequires:  alsa-lib-devel, libstdc++-devel, libv4l-devel
 BuildRequires:  openldap-devel, expat-devel, flex, bison
+BuildRequires:  SDL-devel
 Obsoletes:	pwlib
 
 %description
@@ -82,6 +83,9 @@
 %attr(755,root,root) %{_bindir}/*
 
 %changelog
+* Tue Jan 13 2009 Peter Robinson <pbrobinson at gmail.com> - 2.5.2-3
+- Add an extra build dep
+
 * Tue Jan  6 2009 Peter Robinson <pbrobinson at gmail.com> - 2.5.2-2
 - remove --enable-opal termpoarily, ironically so opal will compile
 



From iarnell at fedoraproject.org  Tue Jan 13 07:10:54 2009
From: iarnell at fedoraproject.org (Iain Arnell)
Date: Tue, 13 Jan 2009 07:10:54 +0000 (UTC)
Subject: rpms/perl-Catalyst-Controller-HTML-FormFu/F-9
	perl-Catalyst-Controller-HTML-FormFu.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090113071054.3A29370129@cvs1.fedora.phx.redhat.com>

Author: iarnell

Update of /cvs/pkgs/rpms/perl-Catalyst-Controller-HTML-FormFu/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31364

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Catalyst-Controller-HTML-FormFu.spec 
Log Message:
initial import on branch


--- NEW FILE perl-Catalyst-Controller-HTML-FormFu.spec ---
Name:           perl-Catalyst-Controller-HTML-FormFu
Version:        0.03007
Release:        2%{?dist}
Summary:        HTML::FormFu controller for Catalyst
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Catalyst-Controller-HTML-FormFu/
Source0:        http://search.cpan.org/CPAN/authors/id/C/CF/CFRANKS/Catalyst-Controller-HTML-FormFu-0.03007.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(Catalyst::Action::RenderView)
BuildRequires:  perl(Catalyst::Component::InstancePerContext)
BuildRequires:  perl(Catalyst::Plugin::ConfigLoader)
BuildRequires:  perl(Catalyst::Runtime) >= 5.70
BuildRequires:  perl(Catalyst::View::TT)
BuildRequires:  perl(Config::Any)
BuildRequires:  perl(Config::General)
BuildRequires:  perl(ExtUtils::MakeMaker)
BuildRequires:  perl(HTML::FormFu) >= 0.03007
BuildRequires:  perl(Moose)
BuildRequires:  perl(Regexp::Assemble)
BuildRequires:  perl(Task::Weaken)
BuildRequires:  perl(Template)
BuildRequires:  perl(Test::WWW::Mechanize) >= 1.16
BuildRequires:  perl(Test::WWW::Mechanize::Catalyst)
Requires:       perl(Catalyst::Component::InstancePerContext)
Requires:       perl(Catalyst::Runtime) >= 5.70
Requires:       perl(HTML::FormFu) >= 0.03007
Requires:       perl(Task::Weaken)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
This base controller merges the functionality of HTML::FormFu with Catalyst.

%prep
%setup -q -n Catalyst-Controller-HTML-FormFu-%{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
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Wed Dec 10 2008 Iain Arnell <iarnell at gmail.com> 0.03007-2
- temporarily change source url to use search.cpan.org

* Mon Dec 08 2008 Iain Arnell 0.03007-1
- Specfile autogenerated by cpanspec 1.77.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Catalyst-Controller-HTML-FormFu/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	14 Dec 2008 05:05:52 -0000	1.1
+++ .cvsignore	13 Jan 2009 07:10:23 -0000	1.2
@@ -0,0 +1 @@
+Catalyst-Controller-HTML-FormFu-0.03007.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Catalyst-Controller-HTML-FormFu/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	14 Dec 2008 05:05:52 -0000	1.1
+++ sources	13 Jan 2009 07:10:23 -0000	1.2
@@ -0,0 +1 @@
+9e510b1106b8dac95f1f09ed1edb48ea  Catalyst-Controller-HTML-FormFu-0.03007.tar.gz



From bskeggs at fedoraproject.org  Tue Jan 13 08:10:39 2009
From: bskeggs at fedoraproject.org (Ben Skeggs)
Date: Tue, 13 Jan 2009 08:10:39 +0000 (UTC)
Subject: rpms/xorg-x11-drv-nouveau/F-10 .cvsignore, 1.7, 1.8 sources, 1.7,
	1.8 xorg-x11-drv-nouveau.spec, 1.6, 1.7
Message-ID: <20090113081039.16EBB70129@cvs1.fedora.phx.redhat.com>

Author: bskeggs

Update of /cvs/pkgs/rpms/xorg-x11-drv-nouveau/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5591

Modified Files:
	.cvsignore sources xorg-x11-drv-nouveau.spec 
Log Message:
update to latest snapshot


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/F-10/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	19 Nov 2008 08:57:47 -0000	1.7
+++ .cvsignore	13 Jan 2009 08:10:08 -0000	1.8
@@ -1 +1 @@
-xf86-video-nouveau-0.0.11-20081119.tar.bz2
+xf86-video-nouveau-0.0.11-20090106.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/F-10/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	19 Nov 2008 08:57:47 -0000	1.7
+++ sources	13 Jan 2009 08:10:08 -0000	1.8
@@ -1 +1 @@
-a8a8bed68bdb29609dec45d7218a357a  xf86-video-nouveau-0.0.11-20081119.tar.bz2
+ebc2aa34568a9cefef9f430305be9ec9  xf86-video-nouveau-0.0.11-20090106.tar.bz2


Index: xorg-x11-drv-nouveau.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/F-10/xorg-x11-drv-nouveau.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- xorg-x11-drv-nouveau.spec	19 Nov 2008 08:57:47 -0000	1.6
+++ xorg-x11-drv-nouveau.spec	13 Jan 2009 08:10:08 -0000	1.7
@@ -7,8 +7,8 @@
 # git clone git://git.freedesktop.org/git/nouveau/xf86-video-nouveau
 # git-archive --format=tar --prefix=xf86-video-nouveau-0.0.10/ %{git_version} | bzip2 > xf86-video-nouveau-0.0.10-%{gitdate}.tar.bz2
 
-%define gitdate 20081119
-%define git_version 65b956f
+%define gitdate 20090106
+%define git_version 133c1a5
 
 %define tarfile %{tarball}-%{nouveau_version}-%{gitdate}.tar.bz2
 
@@ -68,6 +68,9 @@
 %{_mandir}/man4/nouveau.4*
 
 %changelog
+* Tue Jan 13 2009 Ben Skeggs <bskeggs at redhat.com> 0.0.11-1.20090106git133c1a5
+- update to latest snapshot
+
 * Wed Nov 19 2008 Dave Airlie <airlied at redhat.com> 0.0.11-1.20081119git65b956f
 - update to latest upstream snapshot
 



From bskeggs at fedoraproject.org  Tue Jan 13 08:11:28 2009
From: bskeggs at fedoraproject.org (Ben Skeggs)
Date: Tue, 13 Jan 2009 08:11:28 +0000 (UTC)
Subject: rpms/xorg-x11-drv-nouveau/devel .cvsignore, 1.6, 1.7 sources, 1.7, 
	1.8 xorg-x11-drv-nouveau.spec, 1.6, 1.7
Message-ID: <20090113081128.126AC70129@cvs1.fedora.phx.redhat.com>

Author: bskeggs

Update of /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5701

Modified Files:
	.cvsignore sources xorg-x11-drv-nouveau.spec 
Log Message:
update to latest snapshot


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	2 Sep 2008 11:20:27 -0000	1.6
+++ .cvsignore	13 Jan 2009 08:10:57 -0000	1.7
@@ -1 +1 @@
-xf86-video-nouveau-0.0.11-20080902.tar.bz2
+xf86-video-nouveau-0.0.11-20090106.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	22 Dec 2008 03:52:41 -0000	1.7
+++ sources	13 Jan 2009 08:10:57 -0000	1.8
@@ -1 +1 @@
-a8a8bed68bdb29609dec45d7218a357a  xf86-video-nouveau-0.0.11-20081119.tar.bz2
+ebc2aa34568a9cefef9f430305be9ec9  xf86-video-nouveau-0.0.11-20090106.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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- xorg-x11-drv-nouveau.spec	22 Dec 2008 03:48:21 -0000	1.6
+++ xorg-x11-drv-nouveau.spec	13 Jan 2009 08:10:57 -0000	1.7
@@ -7,8 +7,8 @@
 # git clone git://git.freedesktop.org/git/nouveau/xf86-video-nouveau
 # git-archive --format=tar --prefix=xf86-video-nouveau-0.0.10/ %{git_version} | bzip2 > xf86-video-nouveau-0.0.10-%{gitdate}.tar.bz2
 
-%define gitdate 20081119
-%define git_version 65b956f
+%define gitdate 20090106
+%define git_version 133c1a5
 
 %define tarfile %{tarball}-%{nouveau_version}-%{gitdate}.tar.bz2
 
@@ -68,6 +68,9 @@
 %{_mandir}/man4/nouveau.4*
 
 %changelog
+* Tue Jan 13 2009 Ben Skeggs <bskeggs at redhat.com> 0.0.11-1.20090106git133c1a5
+- update to latest snapshot
+
 * Wed Nov 19 2008 Dave Airlie <airlied at redhat.com> 0.0.11-1.20081119git65b956f
 - update to latest upstream snapshot
 



From adrian at fedoraproject.org  Tue Jan 13 08:19:56 2009
From: adrian at fedoraproject.org (Adrian Reber)
Date: Tue, 13 Jan 2009 08:19:56 +0000 (UTC)
Subject: rpms/libcdio/devel libcdio-0.81-cdio_get_default_device_linux.patch,
	NONE, 1.1 .cvsignore, 1.11, 1.12 libcdio.spec, 1.34,
	1.35 sources, 1.11, 1.12 libcdio-0.80-paranoia-fix.patch, 1.1, NONE
Message-ID: <20090113081956.E144F70129@cvs1.fedora.phx.redhat.com>

Author: adrian

Update of /cvs/extras/rpms/libcdio/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6689

Modified Files:
	.cvsignore libcdio.spec sources 
Added Files:
	libcdio-0.81-cdio_get_default_device_linux.patch 
Removed Files:
	libcdio-0.80-paranoia-fix.patch 
Log Message:
* Tue Oct 07 2008 Adrian Reber <adrian at lisas.de> - 0.81-1
- updated to 0.81
- license changed to GPLv3+
- fixed #477288 (libcdio-devel multilib conflict)
- applied patch to fix endless loop in mock


libcdio-0.81-cdio_get_default_device_linux.patch:

--- NEW FILE libcdio-0.81-cdio_get_default_device_linux.patch ---
diff --git a/lib/driver/gnu_linux.c b/lib/driver/gnu_linux.c
index 7e2f3c4..092af0d 100644
--- a/lib/driver/gnu_linux.c
+++ b/lib/driver/gnu_linux.c
@@ -1448,7 +1448,7 @@ cdio_get_default_device_linux(void)
   /* Scan the system for CD-ROM drives.
      Not always 100% reliable, so use the USE_MNTENT code above first.
   */
-  for ( i=0; checklist2[i].format; ++i ) {
+  for ( i=0; i < checklist2_size; ++i ) {
     unsigned int j;
     for ( j=checklist2[i].num_min; j<=checklist2[i].num_max; ++j ) {
       if (snprintf(drive, sizeof(drive), checklist2[i].format, j) < 0)


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libcdio/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	30 May 2008 06:57:27 -0000	1.11
+++ .cvsignore	13 Jan 2009 08:19:26 -0000	1.12
@@ -1,2 +1,2 @@
-libcdio-0.80.tar.gz
-libcdio-0.80.tar.gz.sig
+libcdio-0.81.tar.gz.sig
+libcdio-0.81.tar.gz


Index: libcdio.spec
===================================================================
RCS file: /cvs/extras/rpms/libcdio/devel/libcdio.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- libcdio.spec	7 Oct 2008 20:20:05 -0000	1.34
+++ libcdio.spec	13 Jan 2009 08:19:26 -0000	1.35
@@ -1,13 +1,14 @@
 Name: libcdio
-Version: 0.80
-Release: 5%{?dist}
+Version: 0.81
+Release: 1%{?dist}
 Summary: CD-ROM input and control library
 Group: System Environment/Libraries
-License: GPLv2+
+License: GPLv3+
 URL: http://www.gnu.org/software/libcdio/
-Source0: http://ftp.gnu.org/gnu/libcdio/libcdio-0.80.tar.gz
-Source1: http://ftp.gnu.org/gnu/libcdio/libcdio-0.80.tar.gz.sig
+Source0: http://ftp.gnu.org/gnu/libcdio/libcdio-0.81.tar.gz
+Source1: http://ftp.gnu.org/gnu/libcdio/libcdio-0.81.tar.gz.sig
 Source2: libcdio-no_date_footer.hml
+Patch0: libcdio-0.81-cdio_get_default_device_linux.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: pkgconfig doxygen
 BuildRequires: ncurses-devel
@@ -15,12 +16,7 @@
 Requires(post): /sbin/ldconfig
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
-
-# The patch touches Makefile.am files:
-BuildRequires: automake autoconf
-BuildRequires: libtool
 BuildRequires: gettext-devel
-Patch1: libcdio-0.80-paranoia-fix.patch
 
 
 %description
@@ -40,24 +36,23 @@
 
 %prep
 %setup -q
-%patch1 -p1 -b .paranoia_pc
+%patch0 -p1
 
 f=src/cd-paranoia/doc/ja/cd-paranoia.1.in
 iconv -f euc-jp -t utf-8 -o $f.utf8 $f && mv $f.utf8 $f
 
 
 %build
-libtoolize --force  || :
-aclocal  || :
-autoheader  || :
-automake  || :
-autoconf  || :
 %configure \
 	--disable-vcd-info \
 	--disable-dependency-tracking \
 	--disable-cddb \
 	--disable-rpath
 make %{?_smp_mflags}
+
+# another multilib fix; remove the architecture information from version.h
+sed -i -e "s,%{version}.*$,%{version}\\\",g" include/cdio/version.h
+
 cd doc/doxygen
 sed -i -e "s,HTML_FOOTER.*$,HTML_FOOTER = libcdio-no_date_footer.hml,g" Doxyfile
 cp %{SOURCE2} .
@@ -89,7 +84,8 @@
 
 %check
 # disable test using local CDROM
-%{__sed} -i -e  "s,testiso9660\$(EXEEXT),,g" \
+%{__sed} -i -e "s,testiso9660\$(EXEEXT),,g" \
+	    -e "s,testisocd\$(EXEEXT),,g" \
             -e "s,check_paranoia.sh check_opts.sh, check_opts.sh,g" \
             test/Makefile
 make check
@@ -133,6 +129,12 @@
 
 
 %changelog
+* Tue Oct 07 2008 Adrian Reber <adrian at lisas.de> - 0.81-1
+- updated to 0.81
+- license changed to GPLv3+
+- fixed #477288 (libcdio-devel multilib conflict)
+- applied patch to fix endless loop in mock
+
 * Tue Oct 07 2008 Adrian Reber <adrian at lisas.de> - 0.80-5
 - fixed #462125 (Multilib conflict) - really, really, really
   (also remove architecture information from man pages)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libcdio/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	30 May 2008 06:57:27 -0000	1.11
+++ sources	13 Jan 2009 08:19:26 -0000	1.12
@@ -1,2 +1,2 @@
-6495add276ed11b7ac8a88092799ab4f  libcdio-0.80.tar.gz
-8eb4a8d3d1bb1ceec336863980171c8c  libcdio-0.80.tar.gz.sig
+57c2ba8e6132a39b18ee7d320b9aa484  libcdio-0.81.tar.gz.sig
+2ad1622b672ccf53a3444a0c55724d38  libcdio-0.81.tar.gz


--- libcdio-0.80-paranoia-fix.patch DELETED ---



From pbrobinson at fedoraproject.org  Tue Jan 13 08:26:00 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Tue, 13 Jan 2009 08:26:00 +0000 (UTC)
Subject: rpms/opal/devel opal.spec,1.35,1.36
Message-ID: <20090113082600.8077070129@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/opal/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7375

Modified Files:
	opal.spec 
Log Message:
- Yet another dep that configure doesn't check and it just fails on


Index: opal.spec
===================================================================
RCS file: /cvs/pkgs/rpms/opal/devel/opal.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- opal.spec	13 Jan 2009 06:50:22 -0000	1.35
+++ opal.spec	13 Jan 2009 08:25:30 -0000	1.36
@@ -1,7 +1,7 @@
 Name:		opal
 Summary:	Open Phone Abstraction Library
 Version:	3.5.2
-Release:	2%{?dist}
+Release:	3%{?dist}
 URL:		http://www.opalvoip.org/
 Source0:	ftp://ftp.gnome.org/pub/gnome/sources/%{name}/3.4/%{name}-%{version}.tar.bz2
 License:	MPLv1.0
@@ -12,6 +12,7 @@
 BuildRequires:	libtheora-devel
 BuildRequires:	speex-devel
 BuildRequires:	SDL-devel
+BuildRequires:	expat-devel
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -69,6 +70,9 @@
 %{_libdir}/pkgconfig/opal.pc
 
 %changelog
+* Tue Jan 13 2009 Peter Robinson <pbrobinson at gmail.com> - 3.5.2-3
+- Yet another dep that configure doesn't check and it just fails on
+
 * Tue Jan 13 2009 Peter Robinson <pbrobinson at gmail.com> - 3.5.2-2
 - Add a build dep
 



From pkgdb at fedoraproject.org  Tue Jan 13 08:53:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 08:53:50 +0000
Subject: [pkgdb] curry: oliver has requested commit
Message-ID: <20090113085350.685C8208203@bastion.fedora.phx.redhat.com>

oliver has requested the commit acl on curry (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/curry



From pkgdb at fedoraproject.org  Tue Jan 13 08:53:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 08:53:59 +0000
Subject: [pkgdb] curry: oliver has requested commit
Message-ID: <20090113085359.AA0FD208457@bastion.fedora.phx.redhat.com>

oliver has requested the commit acl on curry (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/curry



From pkgdb at fedoraproject.org  Tue Jan 13 08:54:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 08:54:05 +0000
Subject: [pkgdb] curry: oliver has requested commit
Message-ID: <20090113085405.42BEE208458@bastion.fedora.phx.redhat.com>

oliver has requested the commit acl on curry (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/curry



From paragn at fedoraproject.org  Tue Jan 13 08:55:58 2009
From: paragn at fedoraproject.org (Parag Ashok Nemade)
Date: Tue, 13 Jan 2009 08:55:58 +0000 (UTC)
Subject: rpms/iok/devel .cvsignore,1.3,1.4 iok.spec,1.2,1.3 sources,1.3,1.4
Message-ID: <20090113085558.C7D8170129@cvs1.fedora.phx.redhat.com>

Author: paragn

Update of /cvs/pkgs/rpms/iok/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10934

Modified Files:
	.cvsignore iok.spec sources 
Log Message:

* Tue Jan 13 2009 Parag Nemade <panemade at gmail.com>- 1.1.0-1
- Update to Next release 1.1.0




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/iok/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	18 Dec 2008 04:39:01 -0000	1.3
+++ .cvsignore	13 Jan 2009 08:55:28 -0000	1.4
@@ -1,2 +1,3 @@
 iok-1.0.8.tar.gz
 iok-1.0.9.tar.gz
+iok-1.1.0.tar.gz


Index: iok.spec
===================================================================
RCS file: /cvs/pkgs/rpms/iok/devel/iok.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- iok.spec	18 Dec 2008 04:39:01 -0000	1.2
+++ iok.spec	13 Jan 2009 08:55:28 -0000	1.3
@@ -1,5 +1,5 @@
 Name:           iok
-Version:        1.0.9
+Version:        1.1.0
 Release:        1%{?dist}
 Summary:        Indic Onscreen Virtual Keyboard
 Group:          Applications/System
@@ -8,7 +8,7 @@
 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
+BuildRequires:  gtk2-devel gettext
 
 %description
 iok is Indic Onscreen Keyboard. It provides virtual Keyboard functionality. 
@@ -32,11 +32,13 @@
     --dir %{buildroot}/%{_datadir}/applications/ \
      %{buildroot}%{_datadir}/applications/%{name}.desktop
 
+%find_lang %{name}
+
 
 %clean
 rm -rf %{buildroot}
 
-%files
+%files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc COPYING AUTHORS ChangeLog README
 %{_bindir}/iok
@@ -44,7 +46,10 @@
 %{_datadir}/pixmaps/iok.xpm
 
 %changelog
-* Thu Dec 18 2008 Parag Nemade <panemade at gmail.com>- 1.0.9-1
+* Tue Jan 13 2009 Parag Nemade <panemade at gmail.com>- 1.1.0-1
+- Update to Next release 1.1.0
+
+* Thu Dec 17 2008 Parag Nemade <panemade at gmail.com>- 1.0.9-1
 - Update to Next release 1.0.9
 
 * Tue Sep 02 2008 Parag Nemade <panemade at gmail.com>- 1.0.8-2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/iok/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	18 Dec 2008 04:39:01 -0000	1.3
+++ sources	13 Jan 2009 08:55:28 -0000	1.4
@@ -1 +1,2 @@
 400cacfd92dbdb7016a16e7ea0d05e14  iok-1.0.9.tar.gz
+05b33004d90a3a09b6e898ffa6600cc7  iok-1.1.0.tar.gz



From caolanm at fedoraproject.org  Tue Jan 13 09:01:30 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Tue, 13 Jan 2009 09:01:30 +0000 (UTC)
Subject: rpms/libart_lgpl/devel libart_lgpl.spec,1.23,1.24
Message-ID: <20090113090130.338CB70129@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/libart_lgpl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12380

Modified Files:
	libart_lgpl.spec 
Log Message:
rebuild to get provides pkgconfig(libart-2.0)


Index: libart_lgpl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libart_lgpl/devel/libart_lgpl.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- libart_lgpl.spec	26 May 2008 17:01:31 -0000	1.23
+++ libart_lgpl.spec	13 Jan 2009 09:00:59 -0000	1.24
@@ -1,13 +1,14 @@
 Summary: Library of graphics routines used by libgnomecanvas
 Name: libart_lgpl
 Version: 2.3.20
-Release: 2%{?dist}
+Release: 3%{?dist}
 URL: http://www.gnome.org/
 Source0: http://ftp.gnome.org/pub/gnome/sources/libart_lgpl/2.3/%{name}-%{version}.tar.bz2
 Patch0: libart-multilib.patch
 License: LGPLv2+
 Group: System Environment/Libraries 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
+BuildRequires: pkgconfig
 
 %description
 
@@ -89,6 +90,9 @@
 %{_includedir}/*
 
 %changelog
+* Tue Jan 13 2009 Caol??n McNamara <caolanm at redhat.com> - 2.3.20-3
+- rebuild to get provides pkgconfig(libart-2.0)
+
 * Mon May 26 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 2.3.20-2
 - add sparc64 for multilib
 



From caolanm at fedoraproject.org  Tue Jan 13 09:10:57 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Tue, 13 Jan 2009 09:10:57 +0000 (UTC)
Subject: rpms/libnfnetlink/devel libnfnetlink.spec,1.12,1.13
Message-ID: <20090113091057.88CFC70129@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/libnfnetlink/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13652

Modified Files:
	libnfnetlink.spec 
Log Message:
rebuild to get provides pkgconfig(libnfnetlink)


Index: libnfnetlink.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libnfnetlink/devel/libnfnetlink.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- libnfnetlink.spec	21 Sep 2008 08:41:11 -0000	1.12
+++ libnfnetlink.spec	13 Jan 2009 09:10:27 -0000	1.13
@@ -3,7 +3,7 @@
 
 Name:           libnfnetlink
 Version:        0.0.39
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Netfilter netlink userspace library
 Group:          System Environment/Libraries
 License:        GPLv2
@@ -13,7 +13,7 @@
 Patch0:		libnfnetlink-sysheader.patch
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildRequires:	kernel-headers
-BuildRequires:  automake autoconf libtool
+BuildRequires:  automake autoconf libtool pkgconfig
 
 %description
 libnfnetlink is a userspace library that provides some low-level
@@ -69,6 +69,9 @@
 %{_includedir}/libnfnetlink/*.h
 
 %changelog
+* Tue Jan 13 2009 Caol??n McNamara <caolanm at redhat.com> - 0.0.39-4
+- rebuild to get provides pkgconfig(libnfnetlink)
+
 * Sun Sep 21 2008 Ville Skytt?? <ville.skytta at iki.fi> - 0.0.39-3
 - Fix Patch0:/%%patch mismatch.
 



From adrian at fedoraproject.org  Tue Jan 13 09:16:29 2009
From: adrian at fedoraproject.org (Adrian Reber)
Date: Tue, 13 Jan 2009 09:16:29 +0000 (UTC)
Subject: rpms/libcddb/devel libcddb.spec,1.25,1.26
Message-ID: <20090113091629.9893670129@cvs1.fedora.phx.redhat.com>

Author: adrian

Update of /cvs/extras/rpms/libcddb/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14392

Modified Files:
	libcddb.spec 
Log Message:
* Tue Jan 13 2009 Adrian Reber <adrian at lisas.de> 1.3.0-6
- Rebuild for new libcdio



Index: libcddb.spec
===================================================================
RCS file: /cvs/extras/rpms/libcddb/devel/libcddb.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- libcddb.spec	19 Feb 2008 12:38:15 -0000	1.25
+++ libcddb.spec	13 Jan 2009 09:15:59 -0000	1.26
@@ -1,7 +1,7 @@
 Summary:	Library (C API) for accessing CDDB servers
 Name:		libcddb
 Version:	1.3.0
-Release:	5%{?dist}
+Release:	6%{?dist}
 License: 	LGPLv2+
 Group: 		System Environment/Libraries
 URL: 		http://libcddb.sourceforge.net/
@@ -71,6 +71,9 @@
 
 
 %changelog
+* Tue Jan 13 2009 Adrian Reber <adrian at lisas.de> 1.3.0-6
+- Rebuild for new libcdio
+
 * Tue Feb 19 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 1.3.0-5
 - Fix Source0 URL
 



From pbrobinson at fedoraproject.org  Tue Jan 13 09:21:57 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Tue, 13 Jan 2009 09:21:57 +0000 (UTC)
Subject: rpms/ekiga/devel ekiga.spec,1.65,1.66
Message-ID: <20090113092157.DDEC570129@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/ekiga/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15127

Modified Files:
	ekiga.spec 
Log Message:
- Disable gstreamer support until there's a new gst-plugins-base


Index: ekiga.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ekiga/devel/ekiga.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- ekiga.spec	13 Jan 2009 06:55:20 -0000	1.65
+++ ekiga.spec	13 Jan 2009 09:21:27 -0000	1.66
@@ -1,7 +1,7 @@
 Summary:	A Gnome based SIP/H323 teleconferencing application
 Name:		ekiga
 Version:	3.1.0
-Release:	3%{?dist}
+Release:	4%{?dist}
 URL:		http://www.ekiga.org/
 Source0:	ftp://ftp.gnome.org/pub/gnome/sources/ekiga/3.0/%{name}-%{version}.tar.bz2
 Patch0:		ekiga-fix-desktop-in.patch
@@ -33,9 +33,8 @@
 BuildRequires:	gnome-doc-utils >= 0.3.2
 BuildRequires:	libsigc++20-devel
 BuildRequires:	speex-devel
-BuildRequires:	gstreamer-devel
-BuildRequires:	gstreamer-plugins-base-devel
-BuildRequires:	gstreamer-plugins-bad-devel
+#BuildRequires:	gstreamer-devel
+#BuildRequires:	gstreamer-plugins-base-devel
 
 Requires(pre):	GConf2
 Requires(post):	GConf2
@@ -53,7 +52,7 @@
 
 %build
 CXXFLAGS="$RPM_OPT_FLAGS -DLDAP_DEPRECATED=1 -fPIC"
-%configure --disable-scrollkeeper --enable-gstreamer --enable-xcap
+%configure --disable-scrollkeeper --enable-xcap
 make %{?_smp_mflags}
 
 %install
@@ -135,6 +134,9 @@
 %{_sysconfdir}/gconf/schemas/ekiga.schemas
 
 %changelog
+* Tue Jan 13 2009 Peter Robinson <pbrobinson at gmail.com> - 3.1.0-4
+- Disable gstreamer support until there's a new gst-plugins-base
+
 * Tue Jan 13 2009 Peter Robinson <pbrobinson at gmail.com> - 3.1.0-3
 - Proper fix from upstream for desktop file
 



From pbrobinson at fedoraproject.org  Tue Jan 13 09:37:14 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Tue, 13 Jan 2009 09:37:14 +0000 (UTC)
Subject: rpms/ekiga/devel ekiga.spec,1.66,1.67
Message-ID: <20090113093714.7BA0170129@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/ekiga/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17362

Modified Files:
	ekiga.spec 
Log Message:
- Add expat-devel, why not everything else wants it


Index: ekiga.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ekiga/devel/ekiga.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- ekiga.spec	13 Jan 2009 09:21:27 -0000	1.66
+++ ekiga.spec	13 Jan 2009 09:36:44 -0000	1.67
@@ -1,7 +1,7 @@
 Summary:	A Gnome based SIP/H323 teleconferencing application
 Name:		ekiga
 Version:	3.1.0
-Release:	4%{?dist}
+Release:	5%{?dist}
 URL:		http://www.ekiga.org/
 Source0:	ftp://ftp.gnome.org/pub/gnome/sources/ekiga/3.0/%{name}-%{version}.tar.bz2
 Patch0:		ekiga-fix-desktop-in.patch
@@ -33,6 +33,7 @@
 BuildRequires:	gnome-doc-utils >= 0.3.2
 BuildRequires:	libsigc++20-devel
 BuildRequires:	speex-devel
+BuildRequires:	expat-devel
 #BuildRequires:	gstreamer-devel
 #BuildRequires:	gstreamer-plugins-base-devel
 
@@ -134,6 +135,9 @@
 %{_sysconfdir}/gconf/schemas/ekiga.schemas
 
 %changelog
+* Tue Jan 13 2009 Peter Robinson <pbrobinson at gmail.com> - 3.1.0-5
+- Add expat-devel, why not everything else wants it
+
 * Tue Jan 13 2009 Peter Robinson <pbrobinson at gmail.com> - 3.1.0-4
 - Disable gstreamer support until there's a new gst-plugins-base
 



From adrian at fedoraproject.org  Tue Jan 13 09:46:17 2009
From: adrian at fedoraproject.org (Adrian Reber)
Date: Tue, 13 Jan 2009 09:46:17 +0000 (UTC)
Subject: rpms/kover/devel kover.spec,1.22,1.23
Message-ID: <20090113094617.94A8D70129@cvs1.fedora.phx.redhat.com>

Author: adrian

Update of /cvs/extras/rpms/kover/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18587

Modified Files:
	kover.spec 
Log Message:
* Mon Feb 11 2008 Adrian Reber <adrian at lisas.de> - 4-2
- rebuilt for new libcdio



Index: kover.spec
===================================================================
RCS file: /cvs/extras/rpms/kover/devel/kover.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- kover.spec	21 Nov 2008 08:32:23 -0000	1.22
+++ kover.spec	13 Jan 2009 09:45:47 -0000	1.23
@@ -1,7 +1,7 @@
 Name: kover
 Summary: WYSIWYG CD cover printer with CDDB support
 Version: 4
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Group: Applications/Publishing
 Source0 http://lisas.de/kover/kover-4.tar.bz2
@@ -71,6 +71,9 @@
 %attr(755,root,root)%{_bindir}/kover
 
 %changelog
+* Mon Feb 11 2008 Adrian Reber <adrian at lisas.de> - 4-2
+- rebuilt for new libcdio
+
 * Thu Nov 13 2008 Adrian Reber <adrian at lisas.de> - 4-1
 - updated to 4
 



From pbrobinson at fedoraproject.org  Tue Jan 13 09:47:25 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Tue, 13 Jan 2009 09:47:25 +0000 (UTC)
Subject: rpms/ekiga/devel ekiga.spec,1.67,1.68
Message-ID: <20090113094725.13E2A70129@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/ekiga/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18763

Modified Files:
	ekiga.spec 
Log Message:
- And SDL too


Index: ekiga.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ekiga/devel/ekiga.spec,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- ekiga.spec	13 Jan 2009 09:36:44 -0000	1.67
+++ ekiga.spec	13 Jan 2009 09:46:54 -0000	1.68
@@ -1,7 +1,7 @@
 Summary:	A Gnome based SIP/H323 teleconferencing application
 Name:		ekiga
 Version:	3.1.0
-Release:	5%{?dist}
+Release:	6%{?dist}
 URL:		http://www.ekiga.org/
 Source0:	ftp://ftp.gnome.org/pub/gnome/sources/ekiga/3.0/%{name}-%{version}.tar.bz2
 Patch0:		ekiga-fix-desktop-in.patch
@@ -34,6 +34,7 @@
 BuildRequires:	libsigc++20-devel
 BuildRequires:	speex-devel
 BuildRequires:	expat-devel
+BuildRequires:	SDL-devel
 #BuildRequires:	gstreamer-devel
 #BuildRequires:	gstreamer-plugins-base-devel
 
@@ -135,6 +136,9 @@
 %{_sysconfdir}/gconf/schemas/ekiga.schemas
 
 %changelog
+* Tue Jan 13 2009 Peter Robinson <pbrobinson at gmail.com> - 3.1.0-6
+- And SDL too
+
 * Tue Jan 13 2009 Peter Robinson <pbrobinson at gmail.com> - 3.1.0-5
 - Add expat-devel, why not everything else wants it
 



From adrian at fedoraproject.org  Tue Jan 13 09:47:53 2009
From: adrian at fedoraproject.org (Adrian Reber)
Date: Tue, 13 Jan 2009 09:47:53 +0000 (UTC)
Subject: rpms/kover/devel kover.spec,1.23,1.24
Message-ID: <20090113094753.C854170129@cvs1.fedora.phx.redhat.com>

Author: adrian

Update of /cvs/extras/rpms/kover/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18833

Modified Files:
	kover.spec 
Log Message:
fix date



Index: kover.spec
===================================================================
RCS file: /cvs/extras/rpms/kover/devel/kover.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- kover.spec	13 Jan 2009 09:45:47 -0000	1.23
+++ kover.spec	13 Jan 2009 09:47:23 -0000	1.24
@@ -71,7 +71,7 @@
 %attr(755,root,root)%{_bindir}/kover
 
 %changelog
-* Mon Feb 11 2008 Adrian Reber <adrian at lisas.de> - 4-2
+* Tue Jan 13 2009 Adrian Reber <adrian at lisas.de> - 4-2
 - rebuilt for new libcdio
 
 * Thu Nov 13 2008 Adrian Reber <adrian at lisas.de> - 4-1



From pbrobinson at fedoraproject.org  Tue Jan 13 09:53:39 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Tue, 13 Jan 2009 09:53:39 +0000 (UTC)
Subject: rpms/ptlib/F-9 ptlib.spec,1.5,1.6 sources,1.4,1.5
Message-ID: <20090113095339.346D570129@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/ptlib/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19612

Modified Files:
	ptlib.spec sources 
Log Message:
- Update to new stable release for ekiga 3.0.2


Index: ptlib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ptlib/F-9/ptlib.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ptlib.spec	25 Oct 2008 13:28:11 -0000	1.5
+++ ptlib.spec	13 Jan 2009 09:53:08 -0000	1.6
@@ -1,6 +1,6 @@
 Name:		ptlib
 Summary:	Portable Tools Library
-Version:	2.4.2
+Version:	2.4.4
 Release:	1%{?dist}
 URL:		http://www.opalvoip.org/
 Source0:	ftp://ftp.gnome.org/pub/gnome/sources/%{name}/2.4/%{name}-%{version}.tar.bz2
@@ -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 --disable-v4l
+%configure --prefix=%{_prefix} --disable-static --enable-opal --enable-plugins --disable-oss --enable-v4l2
 make %{?_smp_mflags}
 
 %install
@@ -60,7 +60,7 @@
 %postun -p /sbin/ldconfig
 
 %files
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc History.txt ReadMe.txt mpl-1.0.htm
 %attr(755,root,root) %{_libdir}/libpt*.so.*
 %dir %{_libdir}/%{name}-%{version}
@@ -72,7 +72,7 @@
 %attr(755,root,root) %{_libdir}/%{name}-%{version}/devices/videoinput/v4l2_pwplugin.so
 
 %files devel
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %{_libdir}/libpt*.so
 %{_includedir}/*
 %{_datadir}/ptlib
@@ -80,6 +80,9 @@
 %attr(755,root,root) %{_bindir}/*
 
 %changelog
+* Tue Jan 13 2009 Peter Robinson <pbrobinson at gmail.com> - 2.4.4-1
+- Update to new stable release for ekiga 3.0.2
+
 * Mon Oct 20 2008 Peter Robinson <pbrobinson at gmail.com> - 2.4.2-1
 - Update to new stable release for ekiga 3.0.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ptlib/F-9/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	25 Oct 2008 13:28:11 -0000	1.4
+++ sources	13 Jan 2009 09:53:08 -0000	1.5
@@ -1 +1 @@
-47ba7da2a339643d5f5406215d457d5a  ptlib-2.4.2.tar.bz2
+221ea2f96ff6bae9cf604d8766eae526  ptlib-2.4.4.tar.bz2



From adrian at fedoraproject.org  Tue Jan 13 10:00:19 2009
From: adrian at fedoraproject.org (Adrian Reber)
Date: Tue, 13 Jan 2009 10:00:19 +0000 (UTC)
Subject: rpms/xmms2/devel xmms2.spec,1.2,1.3
Message-ID: <20090113100019.AA92C70129@cvs1.fedora.phx.redhat.com>

Author: adrian

Update of /cvs/extras/rpms/xmms2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20979

Modified Files:
	xmms2.spec 
Log Message:
* Tue Jan 13 2009 Adrian Reber <adrian at lisas.de> - 0.5-4
- Rebuild for libcdio-0.81



Index: xmms2.spec
===================================================================
RCS file: /cvs/extras/rpms/xmms2/devel/xmms2.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xmms2.spec	18 Dec 2008 22:34:36 -0000	1.2
+++ xmms2.spec	13 Jan 2009 09:59:49 -0000	1.3
@@ -6,7 +6,7 @@
 Name:			xmms2
 Summary: 		A modular audio framework and plugin architecture
 Version:		0.5
-Release:		3%{?dist}
+Release:		4%{?dist}
 License:		LGPLv2+ and GPLv2+ and BSD
 Group:			Applications/Multimedia
 # We can't use the upstream source tarball as-is, because it includes an mp4 decoder.
@@ -180,6 +180,9 @@
 %{ruby_sitearch}/xmmsclient*
 
 %changelog
+* Tue Jan 13 2009 Adrian Reber <adrian at lisas.de> - 0.5-4
+- Rebuild for libcdio-0.81
+
 * Wed Dec 17 2008 Benjamin Kosnik  <bkoz at redhat.com> - 0.5-3
 - Rebuild for boost-1.37.0.
 



From bcornec at fedoraproject.org  Tue Jan 13 10:04:42 2009
From: bcornec at fedoraproject.org (Bruno Cornec)
Date: Tue, 13 Jan 2009 10:04:42 +0000 (UTC)
Subject: rpms/buffer/devel 01-debian-patches.all, NONE, 1.1 .cvsignore, 1.3, 
	1.4 sources, 1.2, 1.3 01-debian-patches.all.gz, 1.1, NONE
Message-ID: <20090113100442.0D26D70129@cvs1.fedora.phx.redhat.com>

Author: bcornec

Update of /cvs/pkgs/rpms/buffer/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21840

Modified Files:
	.cvsignore sources 
Added Files:
	01-debian-patches.all 
Removed Files:
	01-debian-patches.all.gz 
Log Message:
- Replace a compressed patch by an uncompressed one for buffer



***** Error reading new file: [Errno 2] No such file or directory: '01-debian-patches.all'

Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/buffer/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	23 Dec 2008 16:47:52 -0000	1.3
+++ .cvsignore	13 Jan 2009 10:04:11 -0000	1.4
@@ -1 +1,2 @@
+01-debian-patches.all
 buffer-1.19.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/buffer/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	23 Dec 2008 16:34:20 -0000	1.2
+++ sources	13 Jan 2009 10:04:11 -0000	1.3
@@ -1,2 +1,2 @@
-09a40d349fd22810dde40cc66dc4fba2  01-debian-patches.all.gz
+b16e46c0c04dd86234c6d7cc6c1eec9a  01-debian-patches.all
 35951ffca7e4df9ad7f97092e1f05b75  buffer-1.19.tar.gz


--- 01-debian-patches.all.gz DELETED ---



From rakesh at fedoraproject.org  Tue Jan 13 10:05:14 2009
From: rakesh at fedoraproject.org (Rakesh Pandit)
Date: Tue, 13 Jan 2009 10:05:14 +0000 (UTC)
Subject: rpms/gdmap/devel gdmap.spec,1.12,1.13
Message-ID: <20090113100514.3AF3870129@cvs1.fedora.phx.redhat.com>

Author: rakesh

Update of /cvs/pkgs/rpms/gdmap/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21723

Modified Files:
	gdmap.spec 
Log Message:
reverted to 1.9



Index: gdmap.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdmap/devel/gdmap.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- gdmap.spec	11 Jan 2009 19:33:08 -0000	1.12
+++ gdmap.spec	13 Jan 2009 10:04:43 -0000	1.13
@@ -1,15 +1,17 @@
 Name:	gdmap
 Version:	0.8.1
-Release:	3%{?dist}
+Release:	2%{?dist}
 Summary:	A tool which allows to visualize disk space
 
 Group:	Applications/System
-License:	GPLv2
+# 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
@@ -18,7 +20,7 @@
 
 %prep
 %setup -q
-
+%patch0 -p1
 
 %build
 %configure
@@ -29,14 +31,11 @@
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
-sed -i -e 's|gdmap_icon\.png|gdmap_icon|g' \
-  -e 's|^Version=.*$|Version=1.0|g' \
-  $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
 
-desktop-file-install --vendor "" --delete-original	\
-  --add-category X-Fedora				\
-  --add-category System					\
-  --dir $RPM_BUILD_ROOT%{_datadir}/applications		\
+desktop-file-install --vendor fedora --delete-original \
+  --add-category X-Fedora                              \
+  --add-category System                                \
+  --dir $RPM_BUILD_ROOT%{_datadir}/applications        \
   $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
 
 %find_lang GdMap
@@ -49,23 +48,26 @@
 %defattr(-,root,root,-)
 %doc COPYING
 %{_bindir}/%{name}
-%dir %{_datadir}/%{name}
-%{_datadir}/%{name}/
 %{_datadir}/applications/*.desktop
-%{_datadir}/pixmaps/*
+%dir %{_datadir}/%{name}
+%dir %{_datadir}/%{name}/pixmaps
+%{_datadir}/%{name}/pixmaps/%{name}*
+%{_datadir}/pixmaps/%{name}*
 %{_mandir}/man1/*
 
 
 %changelog
-* Mon Jan 12 2009 Rakesh Pandit <rakesh at fedoraproject.org> - 0.8.1-3
-- Bump
+* Thu Dec  4 2008 Michael Schwendt <mschwendt at fedoraproject.org> - 0.8.1-2
+- Include unowned /usr/share/gdmap/pixmaps directory.
+
+* Tue Sep 16 2008 Matt Domsch <mdomsch at fedoraproject.org> - 0.8.1-1
+- update to 0.8.1, fix FTBFS BZ#434529
 
-* Mon Jan 12 2009 Rakesh Pandit <rakesh at fedoraproject.org> - 0.8.1-2
-- Bump + some cleaning.
+* Mon Jul 21 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.7.5-8
+- fix license tag
 
-* Sun Jan 11 2009 Rakesh Pandit <rakesh at fedoraproject.org> - 0.8.1-1
-- Updated to 0.8.1, fixed .desktop file and license tag.
-- Fixed Unowned directories.
+* Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.7.5-7
+- Autorebuild for GCC 4.3
 
 * Mon Oct 16 2006 Damien Durand <splinux at fedoraproject.org> - 0.7.5-6
 - Bumped
@@ -77,12 +79,12 @@
 - Fixed Desktop file
 
 * Fri Jul 7 2006 Damien Durand <splinux at fedoraproject.org> - 0.7.5-3
-- Fixed mixed-use-of-spaces-and-tabs and %%find_lang in changelog
+- Fixed mixed-use-of-spaces-and-tabs and %find_lang in changelog
 - added category System and delete-original in desktop-file-install
 
 * Tue Apr 6 2006 Damien Durand <splinux at fedoraproject.org> - 0.7.5-2
 - Fixed Buidrequires, add intltool
-- Fixed locales, add %%find_lang GdMap and %%files -f GdMap.lang and remove {_datadir}/locales
+- Fixed locales, add %find_lang GdMap and %%files -f GdMap.lang and remove {_datadir}/locales
 
 * Tue Apr 6 2006 Damien Durand <splinux at fedoraproject.org> - 0.7.5-1
 - Initial package



From bcornec at fedoraproject.org  Tue Jan 13 10:06:57 2009
From: bcornec at fedoraproject.org (Bruno Cornec)
Date: Tue, 13 Jan 2009 10:06:57 +0000 (UTC)
Subject: rpms/buffer/devel buffer.spec,1.2,1.3
Message-ID: <20090113100657.C75AD70129@cvs1.fedora.phx.redhat.com>

Author: bcornec

Update of /cvs/pkgs/rpms/buffer/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22117

Modified Files:
	buffer.spec 
Log Message:
buffer spec file now referes to uncompressed patch



Index: buffer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/buffer/devel/buffer.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- buffer.spec	23 Dec 2008 16:43:40 -0000	1.2
+++ buffer.spec	13 Jan 2009 10:06:27 -0000	1.3
@@ -12,7 +12,7 @@
 Group:          Applications/Archiving
 Url:            http://hello-penguin.com/software/buffer
 Source:         http://hello-penguin.com/software/buffer/%{name}-%{version}.tar.gz
-Patch0:         01-debian-patches.all.gz
+Patch0:         01-debian-patches.all
 
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 



From rakesh at fedoraproject.org  Tue Jan 13 10:08:33 2009
From: rakesh at fedoraproject.org (Rakesh Pandit)
Date: Tue, 13 Jan 2009 10:08:33 +0000 (UTC)
Subject: rpms/gdmap/F-10 gdmap.spec,1.10,1.11
Message-ID: <20090113100833.BBBA470129@cvs1.fedora.phx.redhat.com>

Author: rakesh

Update of /cvs/pkgs/rpms/gdmap/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22348

Modified Files:
	gdmap.spec 
Log Message:
reverted to 1.8



Index: gdmap.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdmap/F-10/gdmap.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- gdmap.spec	11 Jan 2009 18:55:36 -0000	1.10
+++ gdmap.spec	13 Jan 2009 10:08:03 -0000	1.11
@@ -1,15 +1,17 @@
 Name:	gdmap
 Version:	0.8.1
-Release:	2%{?dist}
+Release:	1%{?dist}
 Summary:	A tool which allows to visualize disk space
 
 Group:	Applications/System
-License:	GPLv2
+# 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
@@ -18,7 +20,7 @@
 
 %prep
 %setup -q
-
+%patch0 -p1
 
 %build
 %configure
@@ -29,14 +31,11 @@
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
-sed -i -e 's|gdmap_icon\.png|gdmap_icon|g' \
-  -e 's|^Version=.*$|Version=1.0|g' \
-  $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
 
-desktop-file-install --vendor "" --delete-original	\
-  --add-category X-Fedora				\
-  --add-category System					\
-  --dir $RPM_BUILD_ROOT%{_datadir}/applications		\
+desktop-file-install --vendor fedora --delete-original \
+  --add-category X-Fedora                              \
+  --add-category System                                \
+  --dir $RPM_BUILD_ROOT%{_datadir}/applications        \
   $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
 
 %find_lang GdMap
@@ -49,20 +48,22 @@
 %defattr(-,root,root,-)
 %doc COPYING
 %{_bindir}/%{name}
-%dir %{_datadir}/%{name}
-%{_datadir}/%{name}/
 %{_datadir}/applications/*.desktop
-%{_datadir}/pixmaps/*
+%dir %{_datadir}/%{name}
+%{_datadir}/%{name}/pixmaps/%{name}*
+%{_datadir}/pixmaps/%{name}*
 %{_mandir}/man1/*
 
 
 %changelog
-* Mon Jan 12 2009 Rakesh Pandit <rakesh at fedoraproject.org> - 0.8.1-2
-- Bump + some cleaning.
+* 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
 
-* Sun Jan 11 2009 Rakesh Pandit <rakesh at fedoraproject.org> - 0.8.1-1
-- Updated to 0.8.1, fixed .desktop file and license tag.
-- Fixed Unowned directories.
+* Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.7.5-7
+- Autorebuild for GCC 4.3
 
 * Mon Oct 16 2006 Damien Durand <splinux at fedoraproject.org> - 0.7.5-6
 - Bumped
@@ -74,12 +75,12 @@
 - Fixed Desktop file
 
 * Fri Jul 7 2006 Damien Durand <splinux at fedoraproject.org> - 0.7.5-3
-- Fixed mixed-use-of-spaces-and-tabs and %%find_lang in changelog
+- Fixed mixed-use-of-spaces-and-tabs and %find_lang in changelog
 - added category System and delete-original in desktop-file-install
 
 * Tue Apr 6 2006 Damien Durand <splinux at fedoraproject.org> - 0.7.5-2
 - Fixed Buidrequires, add intltool
-- Fixed locales, add %%find_lang GdMap and %%files -f GdMap.lang and remove {_datadir}/locales
+- Fixed locales, add %find_lang GdMap and %%files -f GdMap.lang and remove {_datadir}/locales
 
 * Tue Apr 6 2006 Damien Durand <splinux at fedoraproject.org> - 0.7.5-1
 - Initial package



From mnowak at fedoraproject.org  Tue Jan 13 10:14:31 2009
From: mnowak at fedoraproject.org (Michal Nowak)
Date: Tue, 13 Jan 2009 10:14:31 +0000 (UTC)
Subject: rpms/libev/F-10 .cvsignore, 1.3, 1.4 import.log, 1.2, 1.3 libev.spec,
	1.2, 1.3 sources, 1.3, 1.4
Message-ID: <20090113101431.CC4F170129@cvs1.fedora.phx.redhat.com>

Author: mnowak

Update of /cvs/pkgs/rpms/libev/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23172/F-10

Modified Files:
	.cvsignore import.log libev.spec sources 
Log Message:
3.52



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libev/F-10/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	28 Nov 2008 22:03:04 -0000	1.3
+++ .cvsignore	13 Jan 2009 10:14:01 -0000	1.4
@@ -1 +1 @@
-libev-3.49.tar.gz
+libev-3.52.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/libev/F-10/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	28 Nov 2008 22:03:04 -0000	1.2
+++ import.log	13 Jan 2009 10:14:01 -0000	1.3
@@ -1,2 +1,3 @@
 libev-3_48-1_fc10:F-10:libev-3.48-1.fc10.src.rpm:1226236087
 libev-3_49-1_fc10:F-10:libev-3.49-1.fc10.src.rpm:1227909751
+libev-3_52-1_fc10:F-10:libev-3.52-1.fc10.src.rpm:1231841586


Index: libev.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libev/F-10/libev.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- libev.spec	28 Nov 2008 22:03:04 -0000	1.2
+++ libev.spec	13 Jan 2009 10:14:01 -0000	1.3
@@ -1,5 +1,5 @@
 Name:		libev
-Version:	3.49
+Version:	3.52
 Release:	1%{?dist}
 Summary:	High-performance event loop/event model with lots of features
 
@@ -21,7 +21,7 @@
 Summary:	High-performance event loop/event model with lots of features
 Group:		System Environment/Libraries
 Requires: 	%{name} = %{version}-%{release}
-Requires:       pkgconfig
+Requires: 	pkgconfig
 
 %description 	devel
 Libev is modelled (very losely) after libevent and the Event perl
@@ -82,7 +82,13 @@
 
 
 %changelog
-* Fri Nov 28 2008 Michal Nowak <mnowak at redhat.com> - 3.49-1
+* Wed Jan 07 2009 Michal Nowak <mnowak at redhat.com> - 3.52-1
+- 3.52
+
+* Wed Dec 24 2008 Michal Nowak <mnowak at redhat.com> - 3.51-1
+- 3.51
+
+* Thu Nov 20 2008 Michal Nowak <mnowak at redhat.com> - 3.49-1
 - version bump: 3.49
 
 * Sun Nov  9 2008 Michal Nowak <mnowak at redhat.com> - 3.48-1


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libev/F-10/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	28 Nov 2008 22:03:04 -0000	1.3
+++ sources	13 Jan 2009 10:14:01 -0000	1.4
@@ -1 +1 @@
-57a7ca1faf0910fa19c1e56e316793bd  libev-3.49.tar.gz
+5bdabddcd63680b31cff97aa668e5b03  libev-3.52.tar.gz



From mnowak at fedoraproject.org  Tue Jan 13 10:17:38 2009
From: mnowak at fedoraproject.org (Michal Nowak)
Date: Tue, 13 Jan 2009 10:17:38 +0000 (UTC)
Subject: rpms/libev/F-9 .cvsignore, 1.3, 1.4 import.log, 1.2, 1.3 libev.spec,
	1.2, 1.3 sources, 1.3, 1.4
Message-ID: <20090113101738.886AC70129@cvs1.fedora.phx.redhat.com>

Author: mnowak

Update of /cvs/pkgs/rpms/libev/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23760/F-9

Modified Files:
	.cvsignore import.log libev.spec sources 
Log Message:
3.52



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libev/F-9/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	28 Nov 2008 22:06:11 -0000	1.3
+++ .cvsignore	13 Jan 2009 10:17:08 -0000	1.4
@@ -1 +1 @@
-libev-3.49.tar.gz
+libev-3.52.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/libev/F-9/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	28 Nov 2008 22:06:11 -0000	1.2
+++ import.log	13 Jan 2009 10:17:08 -0000	1.3
@@ -1,2 +1,3 @@
 libev-3_48-1_fc10:F-9:libev-3.48-1.fc10.src.rpm:1226236311
 libev-3_49-1_fc10:F-9:libev-3.49-1.fc10.src.rpm:1227909940
+libev-3_52-1_fc10:F-9:libev-3.52-1.fc10.src.rpm:1231841768


Index: libev.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libev/F-9/libev.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- libev.spec	28 Nov 2008 22:06:11 -0000	1.2
+++ libev.spec	13 Jan 2009 10:17:08 -0000	1.3
@@ -1,5 +1,5 @@
 Name:		libev
-Version:	3.49
+Version:	3.52
 Release:	1%{?dist}
 Summary:	High-performance event loop/event model with lots of features
 
@@ -21,7 +21,7 @@
 Summary:	High-performance event loop/event model with lots of features
 Group:		System Environment/Libraries
 Requires: 	%{name} = %{version}-%{release}
-Requires:       pkgconfig
+Requires: 	pkgconfig
 
 %description 	devel
 Libev is modelled (very losely) after libevent and the Event perl
@@ -82,7 +82,13 @@
 
 
 %changelog
-* Fri Nov 28 2008 Michal Nowak <mnowak at redhat.com> - 3.49-1
+* Wed Jan 07 2009 Michal Nowak <mnowak at redhat.com> - 3.52-1
+- 3.52
+
+* Wed Dec 24 2008 Michal Nowak <mnowak at redhat.com> - 3.51-1
+- 3.51
+
+* Thu Nov 20 2008 Michal Nowak <mnowak at redhat.com> - 3.49-1
 - version bump: 3.49
 
 * Sun Nov  9 2008 Michal Nowak <mnowak at redhat.com> - 3.48-1


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libev/F-9/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	28 Nov 2008 22:06:11 -0000	1.3
+++ sources	13 Jan 2009 10:17:08 -0000	1.4
@@ -1 +1 @@
-57a7ca1faf0910fa19c1e56e316793bd  libev-3.49.tar.gz
+5bdabddcd63680b31cff97aa668e5b03  libev-3.52.tar.gz



From rakesh at fedoraproject.org  Tue Jan 13 10:17:59 2009
From: rakesh at fedoraproject.org (Rakesh Pandit)
Date: Tue, 13 Jan 2009 10:17:59 +0000 (UTC)
Subject: rpms/gdmap/F-9 gdmap.spec,1.6,1.7
Message-ID: <20090113101759.3475C70129@cvs1.fedora.phx.redhat.com>

Author: rakesh

Update of /cvs/pkgs/rpms/gdmap/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23819

Modified Files:
	gdmap.spec 
Log Message:
reverting to 1.5



Index: gdmap.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdmap/F-9/gdmap.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- gdmap.spec	11 Jan 2009 19:51:21 -0000	1.6
+++ gdmap.spec	13 Jan 2009 10:17:28 -0000	1.7
@@ -1,10 +1,10 @@
 Name:	gdmap
-Version:	0.8.1
-Release:	2%{?dist}
+Version:	0.7.5
+Release:	7%{?dist}
 Summary:	A tool which allows to visualize disk space
 
 Group:	Applications/System
-License:	GPLv2
+License:	GPL
 URL:	http://gdmap.sourceforge.net
 Source0:	http://belnet.dl.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -29,14 +29,11 @@
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
-sed -i -e 's|gdmap_icon\.png|gdmap_icon|g' \
-  -e 's|^Version=.*$|Version=1.0|g' \
-  $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
 
-desktop-file-install --vendor "" --delete-original	\
-  --add-category X-Fedora				\
-  --add-category System					\
-  --dir $RPM_BUILD_ROOT%{_datadir}/applications		\
+desktop-file-install --vendor fedora --delete-original \
+  --add-category X-Fedora                              \
+  --add-category System                                \
+  --dir $RPM_BUILD_ROOT%{_datadir}/applications        \
   $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
 
 %find_lang GdMap
@@ -49,20 +46,15 @@
 %defattr(-,root,root,-)
 %doc COPYING
 %{_bindir}/%{name}
-%dir %{_datadir}/%{name}
-%{_datadir}/%{name}/
 %{_datadir}/applications/*.desktop
+%{_datadir}/%{name}/pixmaps/*
 %{_datadir}/pixmaps/*
 %{_mandir}/man1/*
 
 
 %changelog
-* Mon Jan 12 2009 Rakesh Pandit <rakesh at fedoraproject.org> - 0.8.1-2
-- Bump + some cleaning.
-
-* Sun Jan 11 2009 Rakesh Pandit <rakesh at fedoraproject.org> - 0.8.1-1
-- Updated to 0.8.1, fixed .desktop file and license tag.
-- Fixed Unowned directories.
+* Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.7.5-7
+- Autorebuild for GCC 4.3
 
 * Mon Oct 16 2006 Damien Durand <splinux at fedoraproject.org> - 0.7.5-6
 - Bumped
@@ -74,12 +66,12 @@
 - Fixed Desktop file
 
 * Fri Jul 7 2006 Damien Durand <splinux at fedoraproject.org> - 0.7.5-3
-- Fixed mixed-use-of-spaces-and-tabs and %%find_lang in changelog
+- Fixed mixed-use-of-spaces-and-tabs and %find_lang in changelog
 - added category System and delete-original in desktop-file-install
 
 * Tue Apr 6 2006 Damien Durand <splinux at fedoraproject.org> - 0.7.5-2
 - Fixed Buidrequires, add intltool
-- Fixed locales, add %%find_lang GdMap and %%files -f GdMap.lang and remove {_datadir}/locales
+- Fixed locales, add %find_lang GdMap and %%files -f GdMap.lang and remove {_datadir}/locales
 
 * Tue Apr 6 2006 Damien Durand <splinux at fedoraproject.org> - 0.7.5-1
 - Initial package



From caolanm at fedoraproject.org  Tue Jan 13 10:18:42 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Tue, 13 Jan 2009 10:18:42 +0000 (UTC)
Subject: rpms/openoffice.org/devel
	openoffice.org-3.0.1.ooo98024.vcl.emboldenoverlap.patch, NONE,
	1.1 openoffice.org.spec, 1.1751, 1.1752
Message-ID: <20090113101842.B7C9D70129@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24034

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-3.0.1.ooo98024.vcl.emboldenoverlap.patch 
Log Message:
Resolves: rhbz#479624 add openoffice.org-3.0.1.ooo98024.vcl.emboldenoverlap.patch

openoffice.org-3.0.1.ooo98024.vcl.emboldenoverlap.patch:

--- NEW FILE openoffice.org-3.0.1.ooo98024.vcl.emboldenoverlap.patch ---
Index: source/glyphs/gcach_ftyp.cxx
===================================================================
RCS file: /cvs/gsl/vcl/source/glyphs/gcach_ftyp.cxx,v
retrieving revision 1.150.2.1
diff -u -r1.150.2.1 gcach_ftyp.cxx
--- openoffice.org.orig/vcl/source/glyphs/gcach_ftyp.cxx	26 Aug 2008 12:26:31 -0000	1.150.2.1
+++ openoffice.org/vcl/source/glyphs/gcach_ftyp.cxx	13 Jan 2009 10:05:32 -0000
@@ -1241,6 +1269,22 @@
     return nGlyphIndex;
 }
 
+static int lcl_GetCharWidth(FT_FaceRec_* pFaceFT, double fStretch, int nGlyphFlags)
+{
+    int nCharWidth = pFaceFT->glyph->metrics.horiAdvance;
+
+    if( nGlyphFlags & GF_ROTMASK ) {  // for bVertical rotated glyphs
+        const FT_Size_Metrics& rMetrics = pFaceFT->size->metrics;
+#if (FTVERSION < 2000)
+        nCharWidth = (int)((rMetrics.height - rMetrics.descender) * fStretch);
+#else
+        nCharWidth = (int)((rMetrics.height + rMetrics.descender) * fStretch);
+#endif
+    }
+
+    return (nCharWidth + 32) >> 6;
+}
+
 // -----------------------------------------------------------------------
 
 void FreetypeServerFont::InitGlyphData( int nGlyphIndex, GlyphData& rGD ) const
@@ -1282,20 +1327,17 @@
         return;
     }
 
+    bool bOriginallyZeroWidth = false;
     if( mbArtBold && pFTEmbolden )
+    {
+        if (lcl_GetCharWidth(maFaceFT, mfStretch, nGlyphFlags) == 0)
+            bOriginallyZeroWidth = true;
         (*pFTEmbolden)( maFaceFT->glyph );
+    }
 
-    int nCharWidth = maFaceFT->glyph->metrics.horiAdvance;
+    int nCharWidth = !bOriginallyZeroWidth ? lcl_GetCharWidth(maFaceFT, mfStretch, nGlyphFlags) : 0;
 
-    if( nGlyphFlags & GF_ROTMASK ) {  // for bVertical rotated glyphs
-        const FT_Size_Metrics& rMetrics = maFaceFT->size->metrics;
-#if (FTVERSION < 2000)
-        nCharWidth = (int)((rMetrics.height - rMetrics.descender) * mfStretch);
-#else
-        nCharWidth = (int)((rMetrics.height + rMetrics.descender) * mfStretch);
-#endif
-    }
-    rGD.SetCharWidth( (nCharWidth + 32) >> 6 );
+    rGD.SetCharWidth( nCharWidth );
 
     FT_Glyph pGlyphFT;
     rc = FT_Get_Glyph( maFaceFT->glyph, &pGlyphFT );


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1751
retrieving revision 1.1752
diff -u -r1.1751 -r1.1752
--- openoffice.org.spec	12 Jan 2009 12:31:23 -0000	1.1751
+++ openoffice.org.spec	13 Jan 2009 10:18:12 -0000	1.1752
@@ -1,6 +1,6 @@
 %define oootag OOO300
 %define ooomilestone 15
-%define rh_rpm_release 1
+%define rh_rpm_release 2
 
 # rhbz#465664 jar-repacking breaks help by reordering META-INF/MANIFEST.MF
 %define __jar_repack %{nil}
@@ -134,6 +134,7 @@
 Patch61: openoffice.org-3.0.1.oooXXXXX.extensions.npapi.patch
 Patch62: openoffice.org-3.0.1.ooo97975.bridges.mainalreadyexited.patch
 Patch63: openoffice.org-3.0.1.ooo97488.sw.ww8toc.patch
+Patch64: openoffice.org-3.0.1.ooo98024.vcl.emboldenoverlap.patch
 
 %define instdir %{_libdir}
 %define baseinstdir %{instdir}/openoffice.org
@@ -1415,6 +1416,7 @@
 %patch61 -p1 -b .oooXXXXX.extensions.npapi.patch
 %patch62 -p1 -b .ooo97975.bridges.mainalreadyexited.patch
 %patch63 -p1 -b .ooo97488.sw.ww8toc.patch
+%patch64 -p1 -b .ooo98024.vcl.emboldenoverlap.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -3824,6 +3826,10 @@
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
+* Tue Jan 13 2009 Caol??n McNamara <caolanm at redhat.com> - 1:3.0.1-15.2
+- Resolves: rhbz#479624 add
+  openoffice.org-3.0.1.ooo98024.vcl.emboldenoverlap.patch
+
 * Mon Jan 12 2009 Caol??n McNamara <caolanm at redhat.com> - 1:3.0.1-15.1
 - next milestone
 - rename openoffice.org-3.0.0.ooo90072.sw.undo-longtext.patch to 



From mnowak at fedoraproject.org  Tue Jan 13 10:19:45 2009
From: mnowak at fedoraproject.org (Michal Nowak)
Date: Tue, 13 Jan 2009 10:19:45 +0000 (UTC)
Subject: rpms/libev/F-8 .cvsignore, 1.3, 1.4 import.log, 1.2, 1.3 libev.spec,
	1.2, 1.3 sources, 1.3, 1.4
Message-ID: <20090113101945.B868870129@cvs1.fedora.phx.redhat.com>

Author: mnowak

Update of /cvs/pkgs/rpms/libev/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24253/F-8

Modified Files:
	.cvsignore import.log libev.spec sources 
Log Message:
3.52



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libev/F-8/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	28 Nov 2008 22:08:37 -0000	1.3
+++ .cvsignore	13 Jan 2009 10:19:15 -0000	1.4
@@ -1 +1 @@
-libev-3.49.tar.gz
+libev-3.52.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/libev/F-8/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	28 Nov 2008 22:08:37 -0000	1.2
+++ import.log	13 Jan 2009 10:19:15 -0000	1.3
@@ -1,2 +1,3 @@
 libev-3_48-1_fc10:F-8:libev-3.48-1.fc10.src.rpm:1226236462
 libev-3_49-1_fc10:F-8:libev-3.49-1.fc10.src.rpm:1227910081
+libev-3_52-1_fc10:F-8:libev-3.52-1.fc10.src.rpm:1231841897


Index: libev.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libev/F-8/libev.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- libev.spec	28 Nov 2008 22:08:37 -0000	1.2
+++ libev.spec	13 Jan 2009 10:19:15 -0000	1.3
@@ -1,5 +1,5 @@
 Name:		libev
-Version:	3.49
+Version:	3.52
 Release:	1%{?dist}
 Summary:	High-performance event loop/event model with lots of features
 
@@ -21,7 +21,7 @@
 Summary:	High-performance event loop/event model with lots of features
 Group:		System Environment/Libraries
 Requires: 	%{name} = %{version}-%{release}
-Requires:       pkgconfig
+Requires: 	pkgconfig
 
 %description 	devel
 Libev is modelled (very losely) after libevent and the Event perl
@@ -82,7 +82,13 @@
 
 
 %changelog
-* Fri Nov 28 2008 Michal Nowak <mnowak at redhat.com> - 3.49-1
+* Wed Jan 07 2009 Michal Nowak <mnowak at redhat.com> - 3.52-1
+- 3.52
+
+* Wed Dec 24 2008 Michal Nowak <mnowak at redhat.com> - 3.51-1
+- 3.51
+
+* Thu Nov 20 2008 Michal Nowak <mnowak at redhat.com> - 3.49-1
 - version bump: 3.49
 
 * Sun Nov  9 2008 Michal Nowak <mnowak at redhat.com> - 3.48-1


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libev/F-8/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	28 Nov 2008 22:08:37 -0000	1.3
+++ sources	13 Jan 2009 10:19:15 -0000	1.4
@@ -1 +1 @@
-57a7ca1faf0910fa19c1e56e316793bd  libev-3.49.tar.gz
+5bdabddcd63680b31cff97aa668e5b03  libev-3.52.tar.gz



From caolanm at fedoraproject.org  Tue Jan 13 10:20:04 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Tue, 13 Jan 2009 10:20:04 +0000 (UTC)
Subject: rpms/openoffice.org/F-10
	openoffice.org-3.0.1.ooo98024.vcl.emboldenoverlap.patch, NONE,
	1.1 openoffice.org.spec, 1.1709, 1.1710
Message-ID: <20090113102004.8863C70129@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24391

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-3.0.1.ooo98024.vcl.emboldenoverlap.patch 
Log Message:
Resolves: rhbz#479624 add openoffice.org-3.0.1.ooo98024.vcl.emboldenoverlap.patch

openoffice.org-3.0.1.ooo98024.vcl.emboldenoverlap.patch:

--- NEW FILE openoffice.org-3.0.1.ooo98024.vcl.emboldenoverlap.patch ---
Index: source/glyphs/gcach_ftyp.cxx
===================================================================
RCS file: /cvs/gsl/vcl/source/glyphs/gcach_ftyp.cxx,v
retrieving revision 1.150.2.1
diff -u -r1.150.2.1 gcach_ftyp.cxx
--- openoffice.org.orig/vcl/source/glyphs/gcach_ftyp.cxx	26 Aug 2008 12:26:31 -0000	1.150.2.1
+++ openoffice.org/vcl/source/glyphs/gcach_ftyp.cxx	13 Jan 2009 10:05:32 -0000
@@ -1241,6 +1269,22 @@
     return nGlyphIndex;
 }
 
+static int lcl_GetCharWidth(FT_FaceRec_* pFaceFT, double fStretch, int nGlyphFlags)
+{
+    int nCharWidth = pFaceFT->glyph->metrics.horiAdvance;
+
+    if( nGlyphFlags & GF_ROTMASK ) {  // for bVertical rotated glyphs
+        const FT_Size_Metrics& rMetrics = pFaceFT->size->metrics;
+#if (FTVERSION < 2000)
+        nCharWidth = (int)((rMetrics.height - rMetrics.descender) * fStretch);
+#else
+        nCharWidth = (int)((rMetrics.height + rMetrics.descender) * fStretch);
+#endif
+    }
+
+    return (nCharWidth + 32) >> 6;
+}
+
 // -----------------------------------------------------------------------
 
 void FreetypeServerFont::InitGlyphData( int nGlyphIndex, GlyphData& rGD ) const
@@ -1282,20 +1327,17 @@
         return;
     }
 
+    bool bOriginallyZeroWidth = false;
     if( mbArtBold && pFTEmbolden )
+    {
+        if (lcl_GetCharWidth(maFaceFT, mfStretch, nGlyphFlags) == 0)
+            bOriginallyZeroWidth = true;
         (*pFTEmbolden)( maFaceFT->glyph );
+    }
 
-    int nCharWidth = maFaceFT->glyph->metrics.horiAdvance;
+    int nCharWidth = !bOriginallyZeroWidth ? lcl_GetCharWidth(maFaceFT, mfStretch, nGlyphFlags) : 0;
 
-    if( nGlyphFlags & GF_ROTMASK ) {  // for bVertical rotated glyphs
-        const FT_Size_Metrics& rMetrics = maFaceFT->size->metrics;
-#if (FTVERSION < 2000)
-        nCharWidth = (int)((rMetrics.height - rMetrics.descender) * mfStretch);
-#else
-        nCharWidth = (int)((rMetrics.height + rMetrics.descender) * mfStretch);
-#endif
-    }
-    rGD.SetCharWidth( (nCharWidth + 32) >> 6 );
+    rGD.SetCharWidth( nCharWidth );
 
     FT_Glyph pGlyphFT;
     rc = FT_Get_Glyph( maFaceFT->glyph, &pGlyphFT );


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-10/openoffice.org.spec,v
retrieving revision 1.1709
retrieving revision 1.1710
diff -u -r1.1709 -r1.1710
--- openoffice.org.spec	12 Jan 2009 12:29:02 -0000	1.1709
+++ openoffice.org.spec	13 Jan 2009 10:19:34 -0000	1.1710
@@ -1,6 +1,6 @@
 %define oootag OOO300
 %define ooomilestone 15
-%define rh_rpm_release 1
+%define rh_rpm_release 2
 
 # rhbz#465664 jar-repacking breaks help by reordering META-INF/MANIFEST.MF
 %define __jar_repack %{nil}
@@ -132,6 +132,7 @@
 Patch59: openoffice.org-3.0.1.ooo97428.config_office.xinerama-on-x86_64.patch
 Patch60: openoffice.org-3.0.1.oooXXXXX.extensions.npapi.patch
 Patch61: openoffice.org-3.0.1.ooo97975.bridges.mainalreadyexited.patch
+Patch62: openoffice.org-3.0.1.ooo98024.vcl.emboldenoverlap.patch
 
 %define instdir %{_libdir}
 %define baseinstdir %{instdir}/openoffice.org
@@ -1388,6 +1389,7 @@
 %patch59 -p1 -b .ooo97428.config_office.xinerama-on-x86_64.patch
 %patch60 -p1 -b .oooXXXXX.extensions.npapi.patch
 %patch61 -p1 -b .ooo97975.bridges.mainalreadyexited.patch
+%patch62 -p1 -b .ooo98024.vcl.emboldenoverlap.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -3754,6 +3756,10 @@
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
+* Tue Jan 13 2009 Caol??n McNamara <caolanm at redhat.com> - 1:3.0.1-15.2
+- Resolves: rhbz#479624 add
+  openoffice.org-3.0.1.ooo98024.vcl.emboldenoverlap.patch
+
 * Mon Jan 12 2009 Caol??n McNamara <caolanm at redhat.com> - 1:3.0.1-15.1
 - Resolves: rhbz#470302 g_file_input_stream_query_info doesn't do anything 
   remotely



From bcornec at fedoraproject.org  Tue Jan 13 10:21:05 2009
From: bcornec at fedoraproject.org (Bruno Cornec)
Date: Tue, 13 Jan 2009 10:21:05 +0000 (UTC)
Subject: rpms/buffer/devel 01-debian-patches.all,1.1,1.2
Message-ID: <20090113102105.C8B2C70129@cvs1.fedora.phx.redhat.com>

Author: bcornec

Update of /cvs/pkgs/rpms/buffer/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24569

Modified Files:
	01-debian-patches.all 
Log Message:
Fix an error in the buffer patch around the rcsid chain






From adrian at fedoraproject.org  Tue Jan 13 10:29:43 2009
From: adrian at fedoraproject.org (Adrian Reber)
Date: Tue, 13 Jan 2009 10:29:43 +0000 (UTC)
Subject: rpms/oxine/devel oxine.spec,1.7,1.8
Message-ID: <20090113102943.3D13F70129@cvs1.fedora.phx.redhat.com>

Author: adrian

Update of /cvs/extras/rpms/oxine/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25800

Modified Files:
	oxine.spec 
Log Message:
* Tue Jan 13 2009 Adrian Reber <adrian at lisas.de> 0.7.1-2
- Rebuild for libcdio-0.81



Index: oxine.spec
===================================================================
RCS file: /cvs/extras/rpms/oxine/devel/oxine.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- oxine.spec	13 May 2008 14:22:00 -0000	1.7
+++ oxine.spec	13 Jan 2009 10:29:12 -0000	1.8
@@ -1,7 +1,7 @@
 Summary: Lightweight, purely OSD based xine frontend
 Name: oxine
 Version: 0.7.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Group: Applications/Multimedia
 URL: http://oxine.sourceforge.net/
@@ -94,6 +94,9 @@
 
 
 %changelog
+* Tue Jan 13 2009 Adrian Reber <adrian at lisas.de> 0.7.1-2
+- Rebuild for libcdio-0.81
+
 * Tue May 13 2008 Matthias Saou <http://freshrpms.net/> 0.7.1-1
 - Update to 0.7.1.
 - Convert AUTHORS file to utf-8.



From mnowak at fedoraproject.org  Tue Jan 13 10:45:49 2009
From: mnowak at fedoraproject.org (Michal Nowak)
Date: Tue, 13 Jan 2009 10:45:49 +0000 (UTC)
Subject: rpms/xcb-util/F-10 import.log, NONE,
	1.1 xcb-util-0.3.2-revert-keysyms-use-xcb_key_lookup_t.patch,
	NONE, 1.1 xcb-util-0.3.2-xcb_keysyms-remove-xcb_lookup_t.patch,
	NONE, 1.1 xcb-util.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <20090113104549.230D870129@cvs1.fedora.phx.redhat.com>

Author: mnowak

Update of /cvs/pkgs/rpms/xcb-util/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28514/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	import.log 
	xcb-util-0.3.2-revert-keysyms-use-xcb_key_lookup_t.patch 
	xcb-util-0.3.2-xcb_keysyms-remove-xcb_lookup_t.patch 
	xcb-util.spec 
Log Message:
new pkg: 0.3.2+patches



--- NEW FILE import.log ---
xcb-util-0_3_2-2_fc10:F-10:xcb-util-0.3.2-2.fc10.src.rpm:1231843041

xcb-util-0.3.2-revert-keysyms-use-xcb_key_lookup_t.patch:

--- NEW FILE xcb-util-0.3.2-revert-keysyms-use-xcb_key_lookup_t.patch ---
>From e9db47701cf7ce17c8ab03cc8cc3618bccba2026 Mon Sep 17 00:00:00 2001
From: Julien Danjou<julien at danjou.info>
Date: Tue, 16  Dec  2008  17:21:41  +0000
Subject: Revert "keysyms: use xcb_key_lookup_t type for col paramter"

This reverts commit 24da2934459c7811f77713a3c7aaa6691ad203f2.
---
diff --git a/keysyms/keysyms.c b/keysyms/keysyms.c
index b6f6ab8..d1f1d52 100644
--- a/keysyms/keysyms.c
+++ b/keysyms/keysyms.c
@@ -185,8 +185,8 @@ rule that is satisfied from the following list:
 */
 
 xcb_keysym_t xcb_key_symbols_get_keysym (xcb_key_symbols_t *syms,
-                                         xcb_keycode_t     keycode,
-                                         xcb_key_lookup_t col)
+				  xcb_keycode_t     keycode,
+				  int            col)
 {
   xcb_keysym_t *keysyms;
   xcb_keysym_t  keysym_null = { XCB_NO_SYMBOL };
@@ -266,17 +266,17 @@ xcb_key_symbols_get_keycode (xcb_key_symbols_t *syms,
 }
 
 xcb_keysym_t
-xcb_key_press_lookup_keysym (xcb_key_symbols_t     *syms,
-                             xcb_key_press_event_t *event,
-                             xcb_key_lookup_t col)
+xcb_key_press_lookup_keysym (xcb_key_symbols_t    *syms,
+			 xcb_key_press_event_t *event,
+			 int               col)
 {
   return xcb_key_symbols_get_keysym (syms, event->detail, col);
 }
 
 xcb_keysym_t
-xcb_key_release_lookup_keysym (xcb_key_symbols_t       *syms,
-                               xcb_key_release_event_t *event,
-                               xcb_key_lookup_t col)
+xcb_key_release_lookup_keysym (xcb_key_symbols_t      *syms,
+			   xcb_key_release_event_t *event,
+			   int                 col)
 {
   return xcb_key_symbols_get_keysym (syms, event->detail, col);
 }
diff --git a/keysyms/xcb_keysyms.h b/keysyms/xcb_keysyms.h
index 3b408e4..2b46239 100644
--- a/keysyms/xcb_keysyms.h
+++ b/keysyms/xcb_keysyms.h
@@ -3,41 +3,43 @@
 
 #include <xcb/xcb.h>
 
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
+
 typedef struct _XCBKeySymbols xcb_key_symbols_t;
 
 /* enumeration for col parameter? */
-typedef enum {
-        xcb_key_lookup_none_t    = 1,
-        xcb_key_lookup_chars_t   = 2,
-        xcb_key_lookup_key_sym_t = 3,
-        xcb_key_lookup_both_t    = 4
-} xcb_key_lookup_t;
+enum {
+	xcb_lookup_none_t   = 1,
+	xcb_lookup_chars_t  = 2,
+	xcb_lookup_key_sym_t = 3,
+	xcb_lookup_both_t   = 4
+} xcb_lookup_t;
 
 xcb_key_symbols_t *xcb_key_symbols_alloc        (xcb_connection_t         *c);
 
 void           xcb_key_symbols_free         (xcb_key_symbols_t         *syms);
 
-xcb_keysym_t xcb_key_symbols_get_keysym (xcb_key_symbols_t *syms,
-                                         xcb_keycode_t     keycode,
-                                         xcb_key_lookup_t  col);
+xcb_keysym_t      xcb_key_symbols_get_keysym    (xcb_key_symbols_t         *syms,
+					  xcb_keycode_t             keycode,
+					  int                    col);
 
 xcb_keycode_t     xcb_key_symbols_get_keycode   (xcb_key_symbols_t         *syms,
-                                          xcb_keysym_t              keysym);
+					  xcb_keysym_t              keysym);
 
-xcb_keysym_t xcb_key_press_lookup_keysym (xcb_key_symbols_t      *syms,
-                                          xcb_key_press_event_t  *event,
-                                          xcb_key_lookup_t       col);
+xcb_keysym_t      xcb_key_press_lookup_keysym   (xcb_key_symbols_t         *syms,
+					  xcb_key_press_event_t      *event,
+					  int                    col);
 
-xcb_keysym_t xcb_key_release_lookup_keysym (xcb_key_symbols_t       *syms,
-                                            xcb_key_release_event_t *event,
-                                            xcb_key_lookup_t        col);
+xcb_keysym_t      xcb_key_release_lookup_keysym (xcb_key_symbols_t         *syms,
+					  xcb_key_release_event_t    *event,
+					  int                    col);
 
 int            xcb_refresh_keyboard_mapping (xcb_key_symbols_t         *syms,
-                                          xcb_mapping_notify_event_t *event);
+					  xcb_mapping_notify_event_t *event);
 
 /* TODO:  need XLookupString equivalent */
 
@@ -62,4 +64,5 @@ int xcb_is_modifier_key      (xcb_keysym_t keysym);
 }
 #endif
 
+
 #endif /* __XCB_KEYSYMS_H__ */
--
cgit v0.8.1-24-ge5fb

xcb-util-0.3.2-xcb_keysyms-remove-xcb_lookup_t.patch:

--- NEW FILE xcb-util-0.3.2-xcb_keysyms-remove-xcb_lookup_t.patch ---
>From 6cf9c8d121888d688464a1551342de3f9d6206f6 Mon Sep 17 00:00:00 2001
From: Julien Danjou<julien at danjou.info>
Date: Tue, 16  Dec  2008  17:22:06  +0000
Subject: xcb_keysyms: remove xcb_lookup_t

Signed-off-by: Julien Danjou <julien at danjou.info>
---
diff --git a/keysyms/xcb_keysyms.h b/keysyms/xcb_keysyms.h
index 2b46239..1202982 100644
--- a/keysyms/xcb_keysyms.h
+++ b/keysyms/xcb_keysyms.h
@@ -11,14 +11,6 @@ extern "C" {
 
 typedef struct _XCBKeySymbols xcb_key_symbols_t;
 
-/* enumeration for col parameter? */
-enum {
-	xcb_lookup_none_t   = 1,
-	xcb_lookup_chars_t  = 2,
-	xcb_lookup_key_sym_t = 3,
-	xcb_lookup_both_t   = 4
-} xcb_lookup_t;
-
 xcb_key_symbols_t *xcb_key_symbols_alloc        (xcb_connection_t         *c);
 
 void           xcb_key_symbols_free         (xcb_key_symbols_t         *syms);
--
cgit v0.8.1-24-ge5fb


--- NEW FILE xcb-util.spec ---
Name:		xcb-util
Version:	0.3.2
Release:	2%{?dist}
Summary:	Convenience libraries sitting on top of libxcb

Group:		System Environment/Libraries
License:	MIT
URL:		http://xcb.freedesktop.org
Source0:	http://xcb.freedesktop.org/dist/%{name}-%{version}.tar.bz2
Patch0:		xcb-util-0.3.2-revert-keysyms-use-xcb_key_lookup_t.patch
Patch1:		xcb-util-0.3.2-xcb_keysyms-remove-xcb_lookup_t.patch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:	gperf, pkgconfig, libxcb-devel, m4, xorg-x11-proto-devel
BuildRequires:	chrpath


%description
The xcb-util module provides a number of libraries which sit on top of
libxcb, the core X protocol library, and some of the extension
libraries. These experimental libraries provide convenience functions
and interfaces which make the raw X protocol more usable. Some of the
libraries also provide client-side code which is not strictly part of
the X protocol but which have traditionally been provided by Xlib.


%package 	devel
Summary:	Development and header files for xcb-util
Group:		System Environment/Libraries
Requires:	%{name} = %{version}-%{release}, pkgconfig
%description	devel
Development files for xcb-util.


%prep
%setup -q
# taken from upstream git, both post 0.3.2 patches
%patch0 -p1
%patch1 -p1


%build
%configure --with-pic --disable-static

make %{?_smp_mflags}


%check

make check


%install
rm -rf %{buildroot}

make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"

# remove RPATH
chrpath --delete $RPM_BUILD_ROOT%{_prefix}/%{_lib}/libxcb-icccm.so.1.0.0 $RPM_BUILD_ROOT%{_prefix}/%{_lib}/libxcb-property.so.1.0.0 $RPM_BUILD_ROOT%{_prefix}/%{_lib}/libxcb-wm.so.0.0.0 $RPM_BUILD_ROOT%{_prefix}/%{_lib}/libxcb-image.so.0.0.0

rm %{buildroot}%{_libdir}/*.la


%post -p /sbin/ldconfig


%postun -p /sbin/ldconfig


%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%doc README
%{_libdir}/*.so.*.*
%{_libdir}/*.so.?


%files devel
%defattr(-,root,root,-)
%{_libdir}/pkgconfig/*.pc
%{_libdir}/*.so
%{_includedir}/xcb/*.h


%changelog
* Fri Dec 19 2008 Michal Nowak <mnowak at redhat.com> - 0.3.2-2
- hack the sed lines after %%configure out and hack chrpath in
- make check is running again

* Thu Dec 18 2008 Michal Nowak <mnowak at redhat.com> - 0.3.2-1
- 0.3.2
- remove rpath (x86-64)
- xcb_keysyms: remove xcb_lookup_t
- Revert "keysyms: use xcb_key_lookup_t type for col paramter"
- temporary disabled %%check due to RPATH regression

* Thu Dec  4 2008 Michal Nowak <mnowak at redhat.com> - 0.3.1-2
- patch for exit() in aux library (Peter Harris)
- slight changes in spec file

* Mon Nov 24 2008 Michal Nowak <mnowak at redhat.com> - 0.3.1-1
- 0.3.1
- fix license issue (Jonathan Landis)

* Fri Sep 19 2008 Michal Nowak <mnowak at redhat.com> - 0.3.0-1
- bump to 0.3.0

* Sun Aug 17 2008 Michal Nowak <mnowak at redhat.com> - 0.2.1-2
- new build deps: gperf, pkgconfig, libxcb, m4, xorg-x11-proto-devel
- not installing *.a files anymore
- configure with --with-pic

* Mon Aug 04 2008 Michal Nowak <mnowak at redhat.com> - 0.2.1-1
- initial package



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xcb-util/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	7 Dec 2008 03:29:15 -0000	1.1
+++ .cvsignore	13 Jan 2009 10:45:18 -0000	1.2
@@ -0,0 +1 @@
+xcb-util-0.3.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xcb-util/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	7 Dec 2008 03:29:15 -0000	1.1
+++ sources	13 Jan 2009 10:45:18 -0000	1.2
@@ -0,0 +1 @@
+fa41a147f5a63b01207cfd975fecc45c  xcb-util-0.3.2.tar.bz2



From mnowak at fedoraproject.org  Tue Jan 13 10:48:57 2009
From: mnowak at fedoraproject.org (Michal Nowak)
Date: Tue, 13 Jan 2009 10:48:57 +0000 (UTC)
Subject: rpms/xcb-util/F-9 import.log, NONE,
	1.1 xcb-util-0.3.2-revert-keysyms-use-xcb_key_lookup_t.patch,
	NONE, 1.1 xcb-util-0.3.2-xcb_keysyms-remove-xcb_lookup_t.patch,
	NONE, 1.1 xcb-util.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <20090113104857.31DFB70129@cvs1.fedora.phx.redhat.com>

Author: mnowak

Update of /cvs/pkgs/rpms/xcb-util/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29255/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	import.log 
	xcb-util-0.3.2-revert-keysyms-use-xcb_key_lookup_t.patch 
	xcb-util-0.3.2-xcb_keysyms-remove-xcb_lookup_t.patch 
	xcb-util.spec 
Log Message:
new pkg: 0.3.2+patches




--- NEW FILE import.log ---
xcb-util-0_3_2-2_fc10:F-9:xcb-util-0.3.2-2.fc10.src.rpm:1231843664

xcb-util-0.3.2-revert-keysyms-use-xcb_key_lookup_t.patch:

--- NEW FILE xcb-util-0.3.2-revert-keysyms-use-xcb_key_lookup_t.patch ---
>From e9db47701cf7ce17c8ab03cc8cc3618bccba2026 Mon Sep 17 00:00:00 2001
From: Julien Danjou<julien at danjou.info>
Date: Tue, 16  Dec  2008  17:21:41  +0000
Subject: Revert "keysyms: use xcb_key_lookup_t type for col paramter"

This reverts commit 24da2934459c7811f77713a3c7aaa6691ad203f2.
---
diff --git a/keysyms/keysyms.c b/keysyms/keysyms.c
index b6f6ab8..d1f1d52 100644
--- a/keysyms/keysyms.c
+++ b/keysyms/keysyms.c
@@ -185,8 +185,8 @@ rule that is satisfied from the following list:
 */
 
 xcb_keysym_t xcb_key_symbols_get_keysym (xcb_key_symbols_t *syms,
-                                         xcb_keycode_t     keycode,
-                                         xcb_key_lookup_t col)
+				  xcb_keycode_t     keycode,
+				  int            col)
 {
   xcb_keysym_t *keysyms;
   xcb_keysym_t  keysym_null = { XCB_NO_SYMBOL };
@@ -266,17 +266,17 @@ xcb_key_symbols_get_keycode (xcb_key_symbols_t *syms,
 }
 
 xcb_keysym_t
-xcb_key_press_lookup_keysym (xcb_key_symbols_t     *syms,
-                             xcb_key_press_event_t *event,
-                             xcb_key_lookup_t col)
+xcb_key_press_lookup_keysym (xcb_key_symbols_t    *syms,
+			 xcb_key_press_event_t *event,
+			 int               col)
 {
   return xcb_key_symbols_get_keysym (syms, event->detail, col);
 }
 
 xcb_keysym_t
-xcb_key_release_lookup_keysym (xcb_key_symbols_t       *syms,
-                               xcb_key_release_event_t *event,
-                               xcb_key_lookup_t col)
+xcb_key_release_lookup_keysym (xcb_key_symbols_t      *syms,
+			   xcb_key_release_event_t *event,
+			   int                 col)
 {
   return xcb_key_symbols_get_keysym (syms, event->detail, col);
 }
diff --git a/keysyms/xcb_keysyms.h b/keysyms/xcb_keysyms.h
index 3b408e4..2b46239 100644
--- a/keysyms/xcb_keysyms.h
+++ b/keysyms/xcb_keysyms.h
@@ -3,41 +3,43 @@
 
 #include <xcb/xcb.h>
 
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
+
 typedef struct _XCBKeySymbols xcb_key_symbols_t;
 
 /* enumeration for col parameter? */
-typedef enum {
-        xcb_key_lookup_none_t    = 1,
-        xcb_key_lookup_chars_t   = 2,
-        xcb_key_lookup_key_sym_t = 3,
-        xcb_key_lookup_both_t    = 4
-} xcb_key_lookup_t;
+enum {
+	xcb_lookup_none_t   = 1,
+	xcb_lookup_chars_t  = 2,
+	xcb_lookup_key_sym_t = 3,
+	xcb_lookup_both_t   = 4
+} xcb_lookup_t;
 
 xcb_key_symbols_t *xcb_key_symbols_alloc        (xcb_connection_t         *c);
 
 void           xcb_key_symbols_free         (xcb_key_symbols_t         *syms);
 
-xcb_keysym_t xcb_key_symbols_get_keysym (xcb_key_symbols_t *syms,
-                                         xcb_keycode_t     keycode,
-                                         xcb_key_lookup_t  col);
+xcb_keysym_t      xcb_key_symbols_get_keysym    (xcb_key_symbols_t         *syms,
+					  xcb_keycode_t             keycode,
+					  int                    col);
 
 xcb_keycode_t     xcb_key_symbols_get_keycode   (xcb_key_symbols_t         *syms,
-                                          xcb_keysym_t              keysym);
+					  xcb_keysym_t              keysym);
 
-xcb_keysym_t xcb_key_press_lookup_keysym (xcb_key_symbols_t      *syms,
-                                          xcb_key_press_event_t  *event,
-                                          xcb_key_lookup_t       col);
+xcb_keysym_t      xcb_key_press_lookup_keysym   (xcb_key_symbols_t         *syms,
+					  xcb_key_press_event_t      *event,
+					  int                    col);
 
-xcb_keysym_t xcb_key_release_lookup_keysym (xcb_key_symbols_t       *syms,
-                                            xcb_key_release_event_t *event,
-                                            xcb_key_lookup_t        col);
+xcb_keysym_t      xcb_key_release_lookup_keysym (xcb_key_symbols_t         *syms,
+					  xcb_key_release_event_t    *event,
+					  int                    col);
 
 int            xcb_refresh_keyboard_mapping (xcb_key_symbols_t         *syms,
-                                          xcb_mapping_notify_event_t *event);
+					  xcb_mapping_notify_event_t *event);
 
 /* TODO:  need XLookupString equivalent */
 
@@ -62,4 +64,5 @@ int xcb_is_modifier_key      (xcb_keysym_t keysym);
 }
 #endif
 
+
 #endif /* __XCB_KEYSYMS_H__ */
--
cgit v0.8.1-24-ge5fb

xcb-util-0.3.2-xcb_keysyms-remove-xcb_lookup_t.patch:

--- NEW FILE xcb-util-0.3.2-xcb_keysyms-remove-xcb_lookup_t.patch ---
>From 6cf9c8d121888d688464a1551342de3f9d6206f6 Mon Sep 17 00:00:00 2001
From: Julien Danjou<julien at danjou.info>
Date: Tue, 16  Dec  2008  17:22:06  +0000
Subject: xcb_keysyms: remove xcb_lookup_t

Signed-off-by: Julien Danjou <julien at danjou.info>
---
diff --git a/keysyms/xcb_keysyms.h b/keysyms/xcb_keysyms.h
index 2b46239..1202982 100644
--- a/keysyms/xcb_keysyms.h
+++ b/keysyms/xcb_keysyms.h
@@ -11,14 +11,6 @@ extern "C" {
 
 typedef struct _XCBKeySymbols xcb_key_symbols_t;
 
-/* enumeration for col parameter? */
-enum {
-	xcb_lookup_none_t   = 1,
-	xcb_lookup_chars_t  = 2,
-	xcb_lookup_key_sym_t = 3,
-	xcb_lookup_both_t   = 4
-} xcb_lookup_t;
-
 xcb_key_symbols_t *xcb_key_symbols_alloc        (xcb_connection_t         *c);
 
 void           xcb_key_symbols_free         (xcb_key_symbols_t         *syms);
--
cgit v0.8.1-24-ge5fb


--- NEW FILE xcb-util.spec ---
Name:		xcb-util
Version:	0.3.2
Release:	2%{?dist}
Summary:	Convenience libraries sitting on top of libxcb

Group:		System Environment/Libraries
License:	MIT
URL:		http://xcb.freedesktop.org
Source0:	http://xcb.freedesktop.org/dist/%{name}-%{version}.tar.bz2
Patch0:		xcb-util-0.3.2-revert-keysyms-use-xcb_key_lookup_t.patch
Patch1:		xcb-util-0.3.2-xcb_keysyms-remove-xcb_lookup_t.patch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:	gperf, pkgconfig, libxcb-devel, m4, xorg-x11-proto-devel
BuildRequires:	chrpath


%description
The xcb-util module provides a number of libraries which sit on top of
libxcb, the core X protocol library, and some of the extension
libraries. These experimental libraries provide convenience functions
and interfaces which make the raw X protocol more usable. Some of the
libraries also provide client-side code which is not strictly part of
the X protocol but which have traditionally been provided by Xlib.


%package 	devel
Summary:	Development and header files for xcb-util
Group:		System Environment/Libraries
Requires:	%{name} = %{version}-%{release}, pkgconfig
%description	devel
Development files for xcb-util.


%prep
%setup -q
# taken from upstream git, both post 0.3.2 patches
%patch0 -p1
%patch1 -p1


%build
%configure --with-pic --disable-static

make %{?_smp_mflags}


%check

make check


%install
rm -rf %{buildroot}

make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"

# remove RPATH
chrpath --delete $RPM_BUILD_ROOT%{_prefix}/%{_lib}/libxcb-icccm.so.1.0.0 $RPM_BUILD_ROOT%{_prefix}/%{_lib}/libxcb-property.so.1.0.0 $RPM_BUILD_ROOT%{_prefix}/%{_lib}/libxcb-wm.so.0.0.0 $RPM_BUILD_ROOT%{_prefix}/%{_lib}/libxcb-image.so.0.0.0

rm %{buildroot}%{_libdir}/*.la


%post -p /sbin/ldconfig


%postun -p /sbin/ldconfig


%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%doc README
%{_libdir}/*.so.*.*
%{_libdir}/*.so.?


%files devel
%defattr(-,root,root,-)
%{_libdir}/pkgconfig/*.pc
%{_libdir}/*.so
%{_includedir}/xcb/*.h


%changelog
* Fri Dec 19 2008 Michal Nowak <mnowak at redhat.com> - 0.3.2-2
- hack the sed lines after %%configure out and hack chrpath in
- make check is running again

* Thu Dec 18 2008 Michal Nowak <mnowak at redhat.com> - 0.3.2-1
- 0.3.2
- remove rpath (x86-64)
- xcb_keysyms: remove xcb_lookup_t
- Revert "keysyms: use xcb_key_lookup_t type for col paramter"
- temporary disabled %%check due to RPATH regression

* Thu Dec  4 2008 Michal Nowak <mnowak at redhat.com> - 0.3.1-2
- patch for exit() in aux library (Peter Harris)
- slight changes in spec file

* Mon Nov 24 2008 Michal Nowak <mnowak at redhat.com> - 0.3.1-1
- 0.3.1
- fix license issue (Jonathan Landis)

* Fri Sep 19 2008 Michal Nowak <mnowak at redhat.com> - 0.3.0-1
- bump to 0.3.0

* Sun Aug 17 2008 Michal Nowak <mnowak at redhat.com> - 0.2.1-2
- new build deps: gperf, pkgconfig, libxcb, m4, xorg-x11-proto-devel
- not installing *.a files anymore
- configure with --with-pic

* Mon Aug 04 2008 Michal Nowak <mnowak at redhat.com> - 0.2.1-1
- initial package



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xcb-util/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	7 Dec 2008 03:29:15 -0000	1.1
+++ .cvsignore	13 Jan 2009 10:48:26 -0000	1.2
@@ -0,0 +1 @@
+xcb-util-0.3.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xcb-util/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	7 Dec 2008 03:29:15 -0000	1.1
+++ sources	13 Jan 2009 10:48:26 -0000	1.2
@@ -0,0 +1 @@
+fa41a147f5a63b01207cfd975fecc45c  xcb-util-0.3.2.tar.bz2



From caolanm at fedoraproject.org  Tue Jan 13 10:57:41 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Tue, 13 Jan 2009 10:57:41 +0000 (UTC)
Subject: rpms/hunspell-en/devel .cvsignore, 1.13, 1.14 hunspell-en.spec, 1.26,
	1.27 sources, 1.15, 1.16
Message-ID: <20090113105741.DB82170129@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/hunspell-en/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30407

Modified Files:
	.cvsignore hunspell-en.spec sources 
Log Message:
latest version


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-en/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	11 Jan 2009 12:55:15 -0000	1.13
+++ .cvsignore	13 Jan 2009 10:57:11 -0000	1.14
@@ -1,2 +1,2 @@
 en_GB.zip
-wordlist-20090110.tar.bz2
+wordlist-20090112.tar.bz2


Index: hunspell-en.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-en/devel/hunspell-en.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- hunspell-en.spec	11 Jan 2009 12:55:15 -0000	1.26
+++ hunspell-en.spec	13 Jan 2009 10:57:11 -0000	1.27
@@ -1,6 +1,6 @@
 Name: hunspell-en
 Summary: English hunspell dictionaries
-%define upstreamid 20090110
+%define upstreamid 20090112
 Version: 0.%{upstreamid}
 Release: 1%{?dist}
 #svn co https://wordlist.svn.sourceforge.net/svnroot/wordlist/trunk wordlist
@@ -64,6 +64,9 @@
 %{_datadir}/myspell/*
 
 %changelog
+* Tue Jan 13 2009 Caolan McNamara <caolanm at redhat.com> - 0.20090112-1
+- latest version
+
 * Sun Jan 11 2009 Caolan McNamara <caolanm at redhat.com> - 0.20090110-1
 - latest version
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-en/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	11 Jan 2009 12:55:15 -0000	1.15
+++ sources	13 Jan 2009 10:57:11 -0000	1.16
@@ -1,2 +1,2 @@
 218909136738f4564b81ecd145ade6ee  en_GB.zip
-9fa7c4a4dbf6edcabd2fc9a3fed20f13  wordlist-20090110.tar.bz2
+439b7c6d5d450302d304baca1922b434  wordlist-20090112.tar.bz2



From tagoh at fedoraproject.org  Tue Jan 13 11:27:10 2009
From: tagoh at fedoraproject.org (Akira TAGOH)
Date: Tue, 13 Jan 2009 11:27:10 +0000 (UTC)
Subject: rpms/libgxim/devel .cvsignore, 1.6, 1.7 libgxim.spec, 1.5,
	1.6 sources, 1.6, 1.7
Message-ID: <20090113112710.3E05870129@cvs1.fedora.phx.redhat.com>

Author: tagoh

Update of /cvs/pkgs/rpms/libgxim/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2020

Modified Files:
	.cvsignore libgxim.spec sources 
Log Message:
* Tue Jan 13 2009 Akira TAGOH <tagoh at redhat.com> - 0.3.2-1
- New upstream release.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libgxim/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	23 Oct 2008 12:54:41 -0000	1.6
+++ .cvsignore	13 Jan 2009 11:26:39 -0000	1.7
@@ -6,3 +6,4 @@
 libgxim-0.2.0.tar.bz2
 libgxim-0.3.0.tar.bz2
 libgxim-0.3.1.tar.bz2
+libgxim-0.3.2.tar.bz2


Index: libgxim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libgxim/devel/libgxim.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- libgxim.spec	23 Oct 2008 12:54:41 -0000	1.5
+++ libgxim.spec	13 Jan 2009 11:26:39 -0000	1.6
@@ -1,5 +1,5 @@
 Name:		libgxim
-Version:	0.3.1
+Version:	0.3.2
 Release:	1%{?dist}
 License:	LGPLv2+
 URL:		http://code.google.com/p/libgxim/
@@ -77,6 +77,9 @@
 %{_datadir}/gtk-doc/html/libgxim
 
 %changelog
+* Tue Jan 13 2009 Akira TAGOH <tagoh at redhat.com> - 0.3.2-1
+- New upstream release.
+
 * Thu Oct 23 2008 Akira TAGOH <tagoh at redhat.com> - 0.3.1-1
 - New upstream release.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libgxim/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	23 Oct 2008 12:54:41 -0000	1.6
+++ sources	13 Jan 2009 11:26:39 -0000	1.7
@@ -1 +1 @@
-ba72c71bb34a26a0c4ecd56bf4d71345  libgxim-0.3.1.tar.bz2
+03cb1b6c7f9a7842b416ae20fb10cad0  libgxim-0.3.2.tar.bz2



From mfleming at fedoraproject.org  Tue Jan 13 11:30:12 2009
From: mfleming at fedoraproject.org (Michael Fleming)
Date: Tue, 13 Jan 2009 11:30:12 +0000 (UTC)
Subject: rpms/pyicq-t/devel .cvsignore, 1.5, 1.6 pyicq-t.spec, 1.11,
	1.12 sources, 1.5, 1.6
Message-ID: <20090113113013.04E7870129@cvs1.fedora.phx.redhat.com>

Author: mfleming

Update of /cvs/extras/rpms/pyicq-t/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2473

Modified Files:
	.cvsignore pyicq-t.spec sources 
Log Message:
* Tue Jan 13 2009 Michael Fleming <mfleming+rpm at enlartenment.com> - 0.8.1-1
- New upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pyicq-t/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	23 Feb 2008 13:22:24 -0000	1.5
+++ .cvsignore	13 Jan 2009 11:29:42 -0000	1.6
@@ -1 +1 @@
-pyicq-t-0.8b.tar.gz
+pyicqt-0.8.1.tar.gz


Index: pyicq-t.spec
===================================================================
RCS file: /cvs/extras/rpms/pyicq-t/devel/pyicq-t.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- pyicq-t.spec	1 Dec 2008 15:00:39 -0000	1.11
+++ pyicq-t.spec	13 Jan 2009 11:29:42 -0000	1.12
@@ -1,16 +1,14 @@
 %{!?python_standard_lib: %define python_standard_lib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(standard_lib=1)")}
 
-%define subver b
-
 Name:           pyicq-t
-Version:        0.8
-Release:        7%{?subver:.%{subver}}%{?dist}
+Version:        0.8.1
+Release:        1%{?dist}
 Summary:        ICQ Transport for Jabber Servers
 
 Group:          Applications/Internet
 License:        GPLv2
 URL:            http://code.google.com/p/pyicqt/
-Source0:	http://pyicqt.googlecode.com/files/pyicq-t-%{version}%{?subver:%{subver}}.tar.gz
+Source0:	http://pyicqt.googlecode.com/files/pyicqt-%{version}.tar.gz
 Source1:        pyicq-t.init
 Patch0:         config.patch
 
@@ -48,7 +46,7 @@
 MySQL backend for ICQ transport
 
 %prep
-%setup -q -n %{name}-%{version}%{?subver:%{subver}}
+%setup -q -n pyicqt-%{version}
 %patch0 -p0
 
 %build
@@ -110,6 +108,9 @@
 %{_datadir}/pyicq-t/src/xdb/mysql.py*
 
 %changelog
+* Tue Jan 13 2009 Michael Fleming <mfleming+rpm at enlartenment.com> - 0.8.1-1
+- New upstream release
+
 * Mon Dec 01 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 0.8-7.b
 - Rebuild for Python 2.6
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pyicq-t/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	23 Feb 2008 13:22:24 -0000	1.5
+++ sources	13 Jan 2009 11:29:42 -0000	1.6
@@ -1 +1 @@
-961952be1f88d0b97bc7cc36c75d1215  pyicq-t-0.8b.tar.gz
+50d14f537b8ae871a2d816cd1a527faa  pyicqt-0.8.1.tar.gz



From mnowak at fedoraproject.org  Tue Jan 13 11:44:03 2009
From: mnowak at fedoraproject.org (Michal Nowak)
Date: Tue, 13 Jan 2009 11:44:03 +0000 (UTC)
Subject: rpms/python-dateutil/EL-4 import.log, NONE, 1.1 python-dateutil.spec,
	1.7, 1.8
Message-ID: <20090113114403.C243870129@cvs1.fedora.phx.redhat.com>

Author: mnowak

Update of /cvs/pkgs/rpms/python-dateutil/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4714/EL-4

Modified Files:
	python-dateutil.spec 
Added Files:
	import.log 
Log Message:
new pkg



--- NEW FILE import.log ---
python-dateutil-1_1-6_fc10:EL-4:python-dateutil-1.1-6.fc10.src.rpm:1231846968


Index: python-dateutil.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-dateutil/EL-4/python-dateutil.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- python-dateutil.spec	12 Dec 2006 08:26:01 -0000	1.7
+++ python-dateutil.spec	13 Jan 2009 11:43:33 -0000	1.8
@@ -2,11 +2,11 @@
 
 Name:           python-dateutil
 Version:        1.1
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Powerful extensions to the standard datetime module
 
 Group:          Development/Languages
-License:        Python Software Foundation License
+License:        Python
 URL:            http://labix.org/python-dateutil
 Source0:        http://labix.org/download/python-dateutil/python-dateutil-%{version}.tar.bz2
 Patch0:         python-dateutil-1.1-x86_64.patch
@@ -21,7 +21,7 @@
 
 %prep
 %setup -q
-%patch -p1
+%patch0 -p1
 
 
 %build
@@ -43,6 +43,9 @@
 %{python_sitelib}/dateutil/
 
 %changelog
+* Tue Jan 13 2009 Michal Nowak <mnowak at redhat.com> 1.1-6
+- fixed the license field and patch0 line
+
 * Mon Dec 11 2006 Jef Spaleta <jspaleta at gmail.com> 1.1-5
 - Fix python-devel BR, as per discussion in maintainers-list
 



From varekova at fedoraproject.org  Tue Jan 13 11:51:38 2009
From: varekova at fedoraproject.org (Ivana Varekova)
Date: Tue, 13 Jan 2009 11:51:38 +0000 (UTC)
Subject: rpms/gnuplot/devel gnuplot.spec,1.60,1.61
Message-ID: <20090113115138.7F62A70129@cvs1.fedora.phx.redhat.com>

Author: varekova

Update of /cvs/pkgs/rpms/gnuplot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5808

Modified Files:
	gnuplot.spec 
Log Message:
- add minimal package for server SIG purposes



Index: gnuplot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnuplot/devel/gnuplot.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- gnuplot.spec	7 Nov 2008 13:57:15 -0000	1.60
+++ gnuplot.spec	13 Jan 2009 11:51:08 -0000	1.61
@@ -17,7 +17,7 @@
 Summary: A program for plotting mathematical expressions and data
 Name: gnuplot
 Version: %{major}.%{minor}.%{patchlevel}
-Release: 1%{?dist}
+Release: 2%{?dist}
 # Modifications are to be distributed as patches to the released version.
 License: gnuplot and GPLv2
 Group: Applications/Engineering
@@ -28,8 +28,9 @@
 BuildRequires: libpng-devel, tetex-latex, zlib-devel, libX11-devel, emacs
 BuildRequires: texinfo, readline-devel, libXt-devel, gd-devel, wxGTK-devel
 BuildRequires: latex2html
-Requires(post): /sbin/install-info
-Requires(preun): /sbin/install-info
+Requires: %{name}-common = %{version}-%{release}
+Requires(post): %{_sbindir}/alternatives
+Requires(preun): %{_sbindir}/alternatives
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -41,6 +42,36 @@
 Install gnuplot if you need a graphics package for scientific data
 representation.
 
+%package common
+Group: Applications/Engineering
+Summary: common gnuplot parts
+Requires(post): %{_sbindir}/install-info
+Requires(preun): %{_sbindir}/install-info
+
+%description common
+Gnuplot is a command-line driven, interactive function plotting
+program especially suited for scientific data representation.  Gnuplot
+can be used to plot functions and data points in both two and three
+dimensions and in many different formats.
+
+This subpackage contains common parts needed for arbitrary version of gnuplot
+
+%package minimal
+Group: Applications/Engineering
+Summary: Minimal version of program for plotting mathematical expressions and data
+Requires: %{name}-common = %{version}-%{release}
+Requires(post): %{_sbindir}/alternatives
+Requires(preun): %{_sbindir}/alternatives
+
+%description minimal
+Gnuplot is a command-line driven, interactive function plotting
+program especially suited for scientific data representation.  Gnuplot
+can be used to plot functions and data points in both two and three
+dimensions and in many different formats.
+
+Install gnuplot-minimal if you need a minimal version of graphics package 
+for scientific data representation.
+
 %package -n emacs-%{name}
 Group: Applications/Engineering
 Summary: Emacs bindings for the gnuplot main application
@@ -75,9 +106,17 @@
 chmod 644 demo/html/webify.pl
 
 %build
+# at first create minimal version of gnuplot for server SIG purposes
 %configure --with-readline=gnu --with-png --without-linux-vga \
- --enable-history-file
+ --enable-history-file --disable-wxwidgets
+make %{?_smp_mflags}
+mv src/gnuplot src/gnuplot-minimal
 
+# clean all settings
+make clean
+# create full version of gnuplot
+%configure --with-readline=gnu --with-png --without-linux-vga \
+ --enable-history-file
 make %{?_smp_mflags}
 
 cd docs
@@ -103,32 +142,56 @@
 mv $RPM_BUILD_ROOT%{_libdir}/X11/app-defaults/Gnuplot $RPM_BUILD_ROOT%{x11_app_defaults_dir}/Gnuplot
 rm -rf $RPM_BUILD_ROOT%{_libdir}/
 
-%post 
+# rename binary
+mv $RPM_BUILD_ROOT%{_bindir}/gnuplot $RPM_BUILD_ROOT%{_bindir}/gnuplot-wx
+# install minimal binary
+install -p -m 755 ./src/gnuplot-minimal $RPM_BUILD_ROOT%{_bindir}/gnuplot-minimal
+
+%post
+%{_sbindir}/alternatives --install %{_bindir}/gnuplot gnuplot %{_bindir}/gnuplot-wx 60
+
+%post common
 /sbin/install-info %{_infodir}/gnuplot.info %{_infodir}/dir || :
 
+%post minimal
+%{_sbindir}/alternatives --install %{_bindir}/gnuplot gnuplot %{_bindir}/gnuplot-minimal 40
+
 %preun
-if [ "$1" = "0" ] ; then # last uninstall
+if [ $1 = 0 ]; then
+    %{_sbindir}/alternatives --remove gnuplot %{_bindir}/gnuplot-wx
+fi
+
+%preun common
+if [ $1 = 0 ] ; then # last uninstall
    /sbin/install-info --delete %{_infodir}/gnuplot.info %{_infodir}/dir || :
 fi
 
+%preun minimal
+if [ $1 = 0 ]; then
+    %{_sbindir}/alternatives --remove gnuplot %{_bindir}/gnuplot-minimal
+fi
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc BUGS ChangeLog Copyright FAQ NEWS README TODO 
-%doc docs/psdoc/ps_guide.ps docs/psdoc/ps_symbols.ps tutorial/tutorial.dvi demo docs/psdoc/ps_file.doc 
+%{_bindir}/gnuplot-wx
+
+%files common
+%defattr(-,root,root,-)
+%doc BUGS ChangeLog Copyright FAQ NEWS README TODO
+%doc docs/psdoc/ps_guide.ps docs/psdoc/ps_symbols.ps tutorial/tutorial.dvi demo docs/psdoc/ps_file.doc
 %doc docs/psdoc/ps_fontfile_doc.pdf docs/htmldocs tutorial/eg7.eps
-%dir %{_libexecdir}/gnuplot
-%dir %{_libexecdir}/gnuplot/%{major}.%{minor}
-%{_libexecdir}/gnuplot/%{major}.%{minor}/gnuplot_x11
-%{_bindir}/gnuplot
 %{_mandir}/man1/gnuplot.1.gz
 %dir %{_datadir}/gnuplot
 %dir %{_datadir}/gnuplot/%{major}.%{minor}
 %dir %{_datadir}/gnuplot/%{major}.%{minor}/PostScript
 %{_datadir}/gnuplot/%{major}.%{minor}/PostScript/*.ps
 %{_datadir}/gnuplot/%{major}.%{minor}/gnuplot.gih
+%dir %{_libexecdir}/gnuplot
+%dir %{_libexecdir}/gnuplot/%{major}.%{minor}
+%{_libexecdir}/gnuplot/%{major}.%{minor}/gnuplot_x11
 %dir %{_datadir}/texmf
 %dir %{_datadir}/texmf/tex
 %dir %{_datadir}/texmf/tex/latex
@@ -137,6 +200,10 @@
 %{x11_app_defaults_dir}/Gnuplot
 %{_infodir}/gnuplot.info.gz
 
+%files minimal
+%defattr(-,root,root,-)
+%{_bindir}/gnuplot-minimal
+
 %files -n emacs-%{name}
 %defattr(-,root,root,-)
 %doc ChangeLog Copyright
@@ -150,7 +217,10 @@
 %{emacs_lispdir}/%{name}/*.el
 
 %changelog
-* Fri Nov  7 2008 Ivana Varekova <varekova at redhat.com> - 4.2.4-1 
+* Tue Jan 13 2008 Ivana Varekova <varekova at redhat.com> - 4.2.4-2
+- add minimal package for server SIG purposes
+
+* Fri Nov  7 2008 Ivana Varekova <varekova at redhat.com> - 4.2.4-1
 - update to 4.2.4
 
 * Fri May  9 2008 Ivana Varekova <varekova at redhat.com> - 4.2.3-1



From than at fedoraproject.org  Tue Jan 13 11:54:53 2009
From: than at fedoraproject.org (Than Ngo)
Date: Tue, 13 Jan 2009 11:54:53 +0000 (UTC)
Subject: rpms/kdebase/F-10 kdebase.spec,1.349,1.350 sources,1.104,1.105
Message-ID: <20090113115454.0887470129@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdebase/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6182

Modified Files:
	kdebase.spec sources 
Log Message:
respin



Index: kdebase.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebase/F-10/kdebase.spec,v
retrieving revision 1.349
retrieving revision 1.350
diff -u -r1.349 -r1.350
--- kdebase.spec	8 Jan 2009 17:24:52 -0000	1.349
+++ kdebase.spec	13 Jan 2009 11:54:23 -0000	1.350
@@ -1,7 +1,7 @@
 
 Summary: K Desktop Environment 4 - Core Files
 Version: 4.1.4
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdebase
@@ -314,6 +314,9 @@
 
 
 %changelog
+* Tue Jan 13 2009 Than Ngo <than at redhat.com> - 4.1.4-2
+- respin
+
 * Thu Jan  8 2009 Luk???? Tinkl <ltinkl at redhat.com> 4.1.4-1
 - KDE 4.1.4
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdebase/F-10/sources,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -r1.104 -r1.105
--- sources	8 Jan 2009 17:24:52 -0000	1.104
+++ sources	13 Jan 2009 11:54:23 -0000	1.105
@@ -1 +1 @@
-d693d77d88c5b57eb506d405c2f61449  kdebase-4.1.4.tar.bz2
+9a76438f5453a3ba4f773db6847825f7  kdebase-4.1.4.tar.bz2



From than at fedoraproject.org  Tue Jan 13 11:59:03 2009
From: than at fedoraproject.org (Than Ngo)
Date: Tue, 13 Jan 2009 11:59:03 +0000 (UTC)
Subject: rpms/kdebase/F-9 kdebase.spec,1.340,1.341 sources,1.99,1.100
Message-ID: <20090113115903.3340270129@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdebase/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6844

Modified Files:
	kdebase.spec sources 
Log Message:
respin



Index: kdebase.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebase/F-9/kdebase.spec,v
retrieving revision 1.340
retrieving revision 1.341
diff -u -r1.340 -r1.341
--- kdebase.spec	8 Jan 2009 17:24:52 -0000	1.340
+++ kdebase.spec	13 Jan 2009 11:58:32 -0000	1.341
@@ -1,7 +1,7 @@
 
 Summary: K Desktop Environment 4 - Core Files
 Version: 4.1.4
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdebase
@@ -314,6 +314,9 @@
 
 
 %changelog
+* Tue Jan 13 2009 Than Ngo <than at redhat.com> - 4.1.4-2
+- respin
+
 * Thu Jan  8 2009 Luk???? Tinkl <ltinkl at redhat.com> 4.1.4-1
 - KDE 4.1.4
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdebase/F-9/sources,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -r1.99 -r1.100
--- sources	8 Jan 2009 17:24:53 -0000	1.99
+++ sources	13 Jan 2009 11:58:32 -0000	1.100
@@ -1 +1 @@
-d693d77d88c5b57eb506d405c2f61449  kdebase-4.1.4.tar.bz2
+9a76438f5453a3ba4f773db6847825f7  kdebase-4.1.4.tar.bz2



From rakesh at fedoraproject.org  Tue Jan 13 12:02:44 2009
From: rakesh at fedoraproject.org (Rakesh Pandit)
Date: Tue, 13 Jan 2009 12:02:44 +0000 (UTC)
Subject: rpms/gdmap/devel gdmap-0.8.1-desktop.patch,1.2,1.3
Message-ID: <20090113120244.C0CCF70141@cvs1.fedora.phx.redhat.com>

Author: rakesh

Update of /cvs/pkgs/rpms/gdmap/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6991

Added Files:
	gdmap-0.8.1-desktop.patch 
Log Message:
reverting: added back desktop file patch


gdmap-0.8.1-desktop.patch:

Index: gdmap-0.8.1-desktop.patch
===================================================================
RCS file: gdmap-0.8.1-desktop.patch
diff -N gdmap-0.8.1-desktop.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ gdmap-0.8.1-desktop.patch	13 Jan 2009 12:02:14 -0000	1.3
@@ -0,0 +1,17 @@
+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;



From ovasik at fedoraproject.org  Tue Jan 13 12:04:47 2009
From: ovasik at fedoraproject.org (Ondrej Vasik)
Date: Tue, 13 Jan 2009 12:04:47 +0000 (UTC)
Subject: rpms/quota/devel .cvsignore, 1.11,
	1.12 quota-3.06-no-stripping.patch, 
	1.3, 1.4 quota.spec, 1.49, 1.50 sources, 1.12,
	1.13 quota-3.16-ext4support.patch, 1.1,
	NONE quota-3.16-formatstring.patch, 1.1,
	NONE quota-3.16-rquotad3Ninconsistency.patch, 1.1,
	NONE quota-3.16-upstreampatches.patch, 1.1, NONE
Message-ID: <20090113120447.911B470129@cvs1.fedora.phx.redhat.com>

Author: ovasik

Update of /cvs/extras/rpms/quota/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8466

Modified Files:
	.cvsignore quota-3.06-no-stripping.patch quota.spec sources 
Removed Files:
	quota-3.16-ext4support.patch quota-3.16-formatstring.patch 
	quota-3.16-rquotad3Ninconsistency.patch 
	quota-3.16-upstreampatches.patch 
Log Message:
new upstream release, remove already applied patches


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/quota/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	23 Apr 2008 12:46:25 -0000	1.11
+++ .cvsignore	13 Jan 2009 12:04:17 -0000	1.12
@@ -1 +1 @@
-quota-3.16.tar.gz
+quota-3.17.tar.gz

quota-3.06-no-stripping.patch:

Index: quota-3.06-no-stripping.patch
===================================================================
RCS file: /cvs/extras/rpms/quota/devel/quota-3.06-no-stripping.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- quota-3.06-no-stripping.patch	20 Jun 2008 08:51:07 -0000	1.3
+++ quota-3.06-no-stripping.patch	13 Jan 2009 12:04:17 -0000	1.4
@@ -24,7 +24,7 @@
  	edquota repquota warnquota quotastats setquota quot xqmstats \
  	convertquota $(ROOTDIR)$(sbindir)
  	-mkdir -p $(ROOTDIR)$(sysconfdir)
-@@ -90,8 +90,8 @@
+@@ -90,11 +90,11 @@
  	-mkdir -p $(ROOTDIR)$(mandir)/man8
  	-$(INSTALL) -m 755 -d $(ROOTDIR)$(includedir)/rpcsvc
  	-$(INSTALL) -m 644 rquota.h rquota.x $(ROOTDIR)$(includedir)/rpcsvc
@@ -32,6 +32,10 @@
 -	-$(INSTALL) $(STRIP) -m $(DEF_SBIN_MODE) rpc.rquotad $(ROOTDIR)$(sbindir)
 +	-$(INSTALL) -m $(DEF_SBIN_MODE) quota $(ROOTDIR)$(bindir)
 +	-$(INSTALL) -m $(DEF_SBIN_MODE) rpc.rquotad $(ROOTDIR)$(sbindir)
+ ifneq ($(NETLINKLIBS),)
+-	-$(INSTALL) $(STRIP) -m $(DEF_SBIN_MODE) quota_nld $(ROOTDIR)$(sbindir)
++	-$(INSTALL) -m $(DEF_SBIN_MODE) quota_nld $(ROOTDIR)$(sbindir)
+ endif
  	-$(INSTALL) -m $(DEF_MAN_MODE) *.1 $(ROOTDIR)$(mandir)/man1
  	-$(INSTALL) -m $(DEF_MAN_MODE) *.2 $(ROOTDIR)$(mandir)/man2
  	-$(INSTALL) -m $(DEF_MAN_MODE) *.3 $(ROOTDIR)$(mandir)/man3


Index: quota.spec
===================================================================
RCS file: /cvs/extras/rpms/quota/devel/quota.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- quota.spec	8 Dec 2008 13:18:22 -0000	1.49
+++ quota.spec	13 Jan 2009 12:04:17 -0000	1.50
@@ -4,8 +4,8 @@
 Name: quota
 Summary: System administration tools for monitoring users' disk usage
 Epoch: 1
-Version: 3.16
-Release: 8%{?dist}
+Version: 3.17
+Release: 1%{?dist}
 License: BSD and GPLv2+
 URL: http://sourceforge.net/projects/linuxquota/
 Group: System Environment/Base
@@ -19,12 +19,8 @@
 Patch2: quota-3.06-man-page.patch
 Patch3: quota-3.06-pie.patch
 Patch4: quota-3.13-wrong-ports.patch
-Patch5: quota-3.16-formatstring.patch
-Patch6: quota-3.16-helpoption.patch
-Patch7: quota-3.16-upstreampatches.patch
-Patch8: quota-3.16-ext4support.patch
-Patch9: quota-3.16-quotaoffhelp.patch
-Patch10: quota-3.16-rquotad3Ninconsistency.patch
+Patch5: quota-3.16-helpoption.patch
+Patch6: quota-3.16-quotaoffhelp.patch
 
 %description
 The quota package contains system administration tools for monitoring
@@ -53,11 +49,7 @@
 %endif
 %patch4 -p1
 %patch5 -p1
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1 -b .ext4
-%patch9 -p1 -b .usage
-%patch10 -p1 -b .3N
+%patch6 -p1 -b .usage
 
 #fix typos/mistakes in localized documentation
 for pofile in $(find ./po/*.p*)
@@ -117,8 +109,11 @@
 %attr(0644,root,root) %{_mandir}/man3/*
 
 %changelog
+* Tue Jan 13 2009 Ondrej Vasik <ovasik at redhat.com> 1:3.17-1
+- new upstream release, remove already applied patches
+
 * Mon Dec 08 2008 Ondrej Vasik <ovasik at redhat.com> 1:3.16-8
-- fix documentation inconsistency (now rpc(3) instead of 
+- fix documentation inconsistency (now rpc(3) instead of
   rpc(3N) in rquotad manpage) (#474836)
 
 * Fri Nov 14 2008 Ondrej Vasik <ovasik at redhat.com> 1:3.16-7


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/quota/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	23 Apr 2008 12:46:25 -0000	1.12
+++ sources	13 Jan 2009 12:04:17 -0000	1.13
@@ -1 +1 @@
-6d1467458a092c4754abef92e7fa6ebe  quota-3.16.tar.gz
+cb3e98a039c0cf98e7c1ad4b50a5bda7  quota-3.17.tar.gz


--- quota-3.16-ext4support.patch DELETED ---


--- quota-3.16-formatstring.patch DELETED ---


--- quota-3.16-rquotad3Ninconsistency.patch DELETED ---


--- quota-3.16-upstreampatches.patch DELETED ---



From hadess at fedoraproject.org  Tue Jan 13 12:05:54 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Tue, 13 Jan 2009 12:05:54 +0000 (UTC)
Subject: rpms/rhythmbox/devel rhythmbox.spec,1.220,1.221
Message-ID: <20090113120554.4474170129@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/rhythmbox/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8602

Modified Files:
	rhythmbox.spec 
Log Message:
* Tue Jan 13 2009 - Bastien Nocera <bnocera at redhat.com> - 0.11.6-21.r6096
- Add more Python deps for the UPNP plugin (#474372)



Index: rhythmbox.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rhythmbox/devel/rhythmbox.spec,v
retrieving revision 1.220
retrieving revision 1.221
diff -u -r1.220 -r1.221
--- rhythmbox.spec	5 Jan 2009 16:51:53 -0000	1.220
+++ rhythmbox.spec	13 Jan 2009 12:05:23 -0000	1.221
@@ -3,7 +3,7 @@
 Name: rhythmbox
 Summary: Music Management Application 
 Version: 0.11.6
-Release: 20.r6096%{?dist}
+Release: 21.r6096%{?dist}
 License: GPLv2+ with exceptions and GFDL
 Group: Applications/Multimedia
 URL: http://projects.gnome.org/rhythmbox/
@@ -76,6 +76,8 @@
 Group: Applications/Multimedia
 Requires: %{name} = %{version}-%{release}
 Requires: python-Coherence
+Requires: python-louie python-twisted
+
 
 %description upnp
 This package contains a Rhythmbox plugin to add support for playing media 
@@ -218,6 +220,9 @@
 %{_libdir}/rhythmbox/plugins/upnp_coherence
 
 %changelog
+* Tue Jan 13 2009 - Bastien Nocera <bnocera at redhat.com> - 0.11.6-21.r6096
+- Add more Python deps for the UPNP plugin (#474372)
+
 * Mon Jan 05 2009 - Bastien Nocera <bnocera at redhat.com> - 0.11.6-20.r6096
 - Don't ship our own iradio playlist, the changes are already upstream
 



From rakesh at fedoraproject.org  Tue Jan 13 12:08:19 2009
From: rakesh at fedoraproject.org (Rakesh Pandit)
Date: Tue, 13 Jan 2009 12:08:19 +0000 (UTC)
Subject: rpms/gdmap/F-10 gdmap-0.8.1-desktop.patch,1.2,1.3
Message-ID: <20090113120819.09B0D70129@cvs1.fedora.phx.redhat.com>

Author: rakesh

Update of /cvs/pkgs/rpms/gdmap/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9086

Added Files:
	gdmap-0.8.1-desktop.patch 
Log Message:
reverting: adding back the desktop patch


gdmap-0.8.1-desktop.patch:

Index: gdmap-0.8.1-desktop.patch
===================================================================
RCS file: gdmap-0.8.1-desktop.patch
diff -N gdmap-0.8.1-desktop.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ gdmap-0.8.1-desktop.patch	13 Jan 2009 12:08:18 -0000	1.3
@@ -0,0 +1,17 @@
+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;



From hadess at fedoraproject.org  Tue Jan 13 12:09:27 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Tue, 13 Jan 2009 12:09:27 +0000 (UTC)
Subject: rpms/rhythmbox/F-10 rhythmbox.spec,1.216,1.217
Message-ID: <20090113120927.40DBC70129@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/rhythmbox/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9320

Modified Files:
	rhythmbox.spec 
Log Message:
* Tue Jan 13 2009 - Bastien Nocera <bnocera at redhat.com> - 0.11.6-18.r6096
- Add more Python deps for the UPNP plugin (#474372)



Index: rhythmbox.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rhythmbox/F-10/rhythmbox.spec,v
retrieving revision 1.216
retrieving revision 1.217
diff -u -r1.216 -r1.217
--- rhythmbox.spec	9 Dec 2008 15:07:50 -0000	1.216
+++ rhythmbox.spec	13 Jan 2009 12:08:56 -0000	1.217
@@ -74,6 +74,7 @@
 Group: Applications/Multimedia
 Requires: %{name} = %{version}-%{release}
 Requires: python-Coherence
+Requires: python-louie python-twisted
 
 %description upnp
 A plugin to add support to Rhythmbox, for playing media from, and sending media to
@@ -219,6 +220,9 @@
 %{_libdir}/rhythmbox/plugins/upnp_coherence
 
 %changelog
+* Tue Jan 13 2009 - Bastien Nocera <bnocera at redhat.com> - 0.11.6-18.r6096
+- Add more Python deps for the UPNP plugin (#474372)
+
 * Tue Dec 09 2008 - Bastien Nocera <bnocera at redhat.com> - 0.11.6-17.r6096
 - Update to rev 6096
 - Fixes some crashers during playback



From adrian at fedoraproject.org  Tue Jan 13 12:09:51 2009
From: adrian at fedoraproject.org (Adrian Reber)
Date: Tue, 13 Jan 2009 12:09:51 +0000 (UTC)
Subject: rpms/gvfs/devel gvfs.spec,1.102,1.103
Message-ID: <20090113120951.2E6AA70129@cvs1.fedora.phx.redhat.com>

Author: adrian

Update of /cvs/extras/rpms/gvfs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9459

Modified Files:
	gvfs.spec 
Log Message:
* Tue Jan 13 2009 Adrian Reber <adrian at lisas.de> - 1.1.3-4
- Rebuild for libcdio-0.81



Index: gvfs.spec
===================================================================
RCS file: /cvs/extras/rpms/gvfs/devel/gvfs.spec,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -r1.102 -r1.103
--- gvfs.spec	12 Jan 2009 17:34:35 -0000	1.102
+++ gvfs.spec	13 Jan 2009 12:09:20 -0000	1.103
@@ -1,7 +1,7 @@
 Summary: Backends for the gio framework in GLib
 Name: gvfs
 Version: 1.1.3
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 URL: http://www.gtk.org
@@ -260,6 +260,9 @@
 
 
 %changelog
+* Tue Jan 13 2009 Adrian Reber <adrian at lisas.de> - 1.1.3-4
+- Rebuild for libcdio-0.81
+
 * Mon Jan 12 2009 Matthias Clasen  <mclasen at redhat.com> - 1.1.3-3
 - Fix dav+sd.mount
 



From lennart at fedoraproject.org  Tue Jan 13 12:11:36 2009
From: lennart at fedoraproject.org (Lennart Poettering)
Date: Tue, 13 Jan 2009 12:11:36 +0000 (UTC)
Subject: rpms/pulseaudio/devel pulseaudio.spec,1.64,1.65
Message-ID: <20090113121136.DD8A270129@cvs1.fedora.phx.redhat.com>

Author: lennart

Update of /cvs/pkgs/rpms/pulseaudio/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9812

Modified Files:
	pulseaudio.spec 
Log Message:
New release 0.9.14


Index: pulseaudio.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pulseaudio/devel/pulseaudio.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- pulseaudio.spec	18 Dec 2008 15:21:36 -0000	1.64
+++ pulseaudio.spec	13 Jan 2009 12:11:06 -0000	1.65
@@ -2,8 +2,8 @@
 
 Name:		pulseaudio
 Summary: 	Improved Linux sound server
-Version:	0.9.13
-Release:	7%{?dist}
+Version:	0.9.14
+Release:	1%{?dist}
 License:	GPLv2+
 Group:		System Environment/Daemons
 Source0:	http://0pointer.de/lennart/projects/pulseaudio/pulseaudio-%{version}.tar.gz
@@ -26,30 +26,6 @@
 BuildRequires: intltool
 Requires:	%{name}-core-libs = %{version}-%{release}
 Obsoletes:	pulseaudio-devel
-Patch1: 0001-Initialize-exit_idle_time-to-1-instead-of-0-when-i.patch
-Patch2: 0002-Unload-module-bluetooth-device-if-the-remote-device.patch
-Patch3: 0003-instead-of-resetting-virtual_volume-unconditionally.patch
-Patch4: 0004-use-pa_channel_map_init_extend-instead-of-pa_chann.patch
-Patch5: 0005-if-the-channel-map-was-modified-due-to-PA_SINK_INPUT.patch
-Patch6: 0006-define-0dB-in-PA-as-maximum-amplification.patch
-Patch7: 0007-Fix-a-potential-C-C99-ism-add-a-log-message-on-er.patch
-Patch8: 0008-Fix-two-typos-that-broke-tunnels.patch
-Patch9: 0009-properly-remove-dbus-matches-an-filters-when-unloadi.patch
-Patch10: 0010-Fix-possible-invalid-read-while-attempting-to-load-m.patch
-Patch11: 0011-always-check-for-libtool-prefix-binary-name-to-avoid.patch
-Patch12: 0012-Fix-spelling-of-privilige.patch
-Patch13: 0013-Make-missing-git-changelog.perl-non-fatal.patch
-Patch14: 0014-fix-invalid-validity-check.patch
-Patch15: 0015-convert-argument-to-boolean-int-in-PA_UNLIKELY-too.patch
-Patch16: 0016-include-log.h-near-the-end-so-that-macro.h-can-be-in.patch
-Patch17: 0017-Try-to-catch-certain-driver-errors.patch
-Patch18: 0018-make-the-debug-trap-macro-a-proper-macro-in-macro.h.patch
-Patch19: 0019-don-t-set-the-volume-of-pacat-unless-it-is-explicitl.patch
-Patch20: 0020-warn-if-ALSA-wakes-us-up-and-there-is-actually-nothi.patch
-Patch21: 0021-fix-build.patch
-Patch22: 0022-make-sure-to-use-64bit-rounding-even-on-32bit-machin.patch
-Patch23: 0023-make-shm-marker-architecture-independant-patch-from.patch
-Patch24: 0024-Make-sure-libpulse-never-gets-unloaded.patch
 
 %description
 PulseAudio is a sound server for Linux and other Unix like operating 
@@ -187,30 +163,6 @@
 
 %prep
 %setup -q -T -b0
-%patch1 -p1 -b .0001-Initialize-exit_idle_time-to-1-instead-of-0-when-i.patch
-%patch2 -p1 -b .0002-Unload-module-bluetooth-device-if-the-remote-device.patch
-%patch3 -p1 -b .0003-instead-of-resetting-virtual_volume-unconditionally.patch
-%patch4 -p1 -b .0004-use-pa_channel_map_init_extend-instead-of-pa_chann.patch
-%patch5 -p1 -b .0005-if-the-channel-map-was-modified-due-to-PA_SINK_INPUT.patch
-%patch6 -p1 -b .0006-define-0dB-in-PA-as-maximum-amplification.patch
-%patch7 -p1 -b .0007-Fix-a-potential-C-C99-ism-add-a-log-message-on-er.patch
-%patch8 -p1 -b .0008-Fix-two-typos-that-broke-tunnels.patch
-%patch9 -p1 -b .0009-properly-remove-dbus-matches-an-filters-when-unloadi.patch
-%patch10 -p1 -b .0010-Fix-possible-invalid-read-while-attempting-to-load-m.patch
-%patch11 -p1 -b .0011-always-check-for-libtool-prefix-binary-name-to-avoid.patch
-%patch12 -p1 -b .0012-Fix-spelling-of-privilige.patch
-%patch13 -p1 -b .0013-Make-missing-git-changelog.perl-non-fatal.patch
-%patch14 -p1 -b .0014-fix-invalid-validity-check.patch
-%patch15 -p1 -b .0015-convert-argument-to-boolean-int-in-PA_UNLIKELY-too.patch
-%patch16 -p1 -b .0016-include-log.h-near-the-end-so-that-macro.h-can-be-in.patch
-%patch17 -p1 -b .0017-Try-to-catch-certain-driver-errors.patch
-%patch18 -p1 -b .0018-make-the-debug-trap-macro-a-proper-macro-in-macro.h.patch
-%patch19 -p1 -b .0019-don-t-set-the-volume-of-pacat-unless-it-is-explicitl.patch
-%patch20 -p1 -b .0020-warn-if-ALSA-wakes-us-up-and-there-is-actually-nothi.patch
-%patch21 -p1 -b .0021-fix-build.patch
-%patch22 -p1 -b .0022-make-sure-to-use-64bit-rounding-even-on-32bit-machin.patch
-%patch23 -p1 -b .0023-make-shm-marker-architecture-independant-patch-from.patch
-%patch24 -p1 -b .0024-Make-sure-libpulse-never-gets-unloaded.patch
 
 %build
 CFLAGS="-ggdb" %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
@@ -442,6 +394,9 @@
 %{_mandir}/man1/pax11publish.1.gz
 
 %changelog
+* Tue Jan 13 2009 Lennart Poettering <lpoetter at redhat.com> 0.9.14-1
+- New release
+
 * Thu Nov 13 2008 Matthias Clasen <mclasen at redhat.com> 0.9.13-7
 - Rebuild 
 



From hadess at fedoraproject.org  Tue Jan 13 12:11:37 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Tue, 13 Jan 2009 12:11:37 +0000 (UTC)
Subject: rpms/rhythmbox/F-10 rhythmbox.spec,1.217,1.218
Message-ID: <20090113121137.1CD9270129@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/rhythmbox/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9775

Modified Files:
	rhythmbox.spec 
Log Message:
Up release as well



Index: rhythmbox.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rhythmbox/F-10/rhythmbox.spec,v
retrieving revision 1.217
retrieving revision 1.218
diff -u -r1.217 -r1.218
--- rhythmbox.spec	13 Jan 2009 12:08:56 -0000	1.217
+++ rhythmbox.spec	13 Jan 2009 12:11:06 -0000	1.218
@@ -3,7 +3,7 @@
 Name: rhythmbox
 Summary: Music Management Application 
 Version: 0.11.6
-Release: 17.r6096%{?dist}
+Release: 18.r6096%{?dist}
 License: GPLv2+ with exceptions and GFDL
 Group: Applications/Multimedia
 URL: http://www.gnome.org/projects/rhythmbox/



From lennart at fedoraproject.org  Tue Jan 13 12:16:37 2009
From: lennart at fedoraproject.org (Lennart Poettering)
Date: Tue, 13 Jan 2009 12:16:37 +0000 (UTC)
Subject: rpms/pulseaudio/devel .cvsignore,1.24,1.25 sources,1.26,1.27
Message-ID: <20090113121637.9B39770129@cvs1.fedora.phx.redhat.com>

Author: lennart

Update of /cvs/pkgs/rpms/pulseaudio/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10586

Modified Files:
	.cvsignore sources 
Log Message:
missing sources


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pulseaudio/devel/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- .cvsignore	6 Oct 2008 02:21:31 -0000	1.24
+++ .cvsignore	13 Jan 2009 12:16:07 -0000	1.25
@@ -1 +1 @@
-pulseaudio-0.9.13.tar.gz
+pulseaudio-0.9.14.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pulseaudio/devel/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- sources	6 Oct 2008 02:21:31 -0000	1.26
+++ sources	13 Jan 2009 12:16:07 -0000	1.27
@@ -1 +1 @@
-279fb92f08393a6a992d55e3ac9a006b  pulseaudio-0.9.13.tar.gz
+0ed1115222d1d8c64cc14961cccb2eb0  pulseaudio-0.9.14.tar.gz



From ovasik at fedoraproject.org  Tue Jan 13 12:31:37 2009
From: ovasik at fedoraproject.org (Ondrej Vasik)
Date: Tue, 13 Jan 2009 12:31:37 +0000 (UTC)
Subject: rpms/quota/devel quota-3.06-no-stripping.patch,1.4,1.5
Message-ID: <20090113123137.935D670129@cvs1.fedora.phx.redhat.com>

Author: ovasik

Update of /cvs/extras/rpms/quota/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12502

Modified Files:
	quota-3.06-no-stripping.patch 
Log Message:
defuzz patch

quota-3.06-no-stripping.patch:

Index: quota-3.06-no-stripping.patch
===================================================================
RCS file: /cvs/extras/rpms/quota/devel/quota-3.06-no-stripping.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- quota-3.06-no-stripping.patch	13 Jan 2009 12:04:17 -0000	1.4
+++ quota-3.06-no-stripping.patch	13 Jan 2009 12:31:37 -0000	1.5
@@ -24,7 +24,7 @@
  	edquota repquota warnquota quotastats setquota quot xqmstats \
  	convertquota $(ROOTDIR)$(sbindir)
  	-mkdir -p $(ROOTDIR)$(sysconfdir)
-@@ -90,11 +90,11 @@
+@@ -99,10 +99,10 @@
  	-mkdir -p $(ROOTDIR)$(mandir)/man8
  	-$(INSTALL) -m 755 -d $(ROOTDIR)$(includedir)/rpcsvc
  	-$(INSTALL) -m 644 rquota.h rquota.x $(ROOTDIR)$(includedir)/rpcsvc
@@ -38,4 +38,3 @@
  endif
  	-$(INSTALL) -m $(DEF_MAN_MODE) *.1 $(ROOTDIR)$(mandir)/man1
  	-$(INSTALL) -m $(DEF_MAN_MODE) *.2 $(ROOTDIR)$(mandir)/man2
- 	-$(INSTALL) -m $(DEF_MAN_MODE) *.3 $(ROOTDIR)$(mandir)/man3



From lennart at fedoraproject.org  Tue Jan 13 12:32:48 2009
From: lennart at fedoraproject.org (Lennart Poettering)
Date: Tue, 13 Jan 2009 12:32:48 +0000 (UTC)
Subject: rpms/pulseaudio/F-10 .cvsignore, 1.24, 1.25 pulseaudio.spec, 1.63, 
	1.64 sources, 1.26, 1.27
Message-ID: <20090113123248.582AF70129@cvs1.fedora.phx.redhat.com>

Author: lennart

Update of /cvs/pkgs/rpms/pulseaudio/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12768

Modified Files:
	.cvsignore pulseaudio.spec sources 
Log Message:
New release, incorporating all 24 patches we were shipping in the rpm plus quite a few more fixes.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pulseaudio/F-10/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- .cvsignore	6 Oct 2008 02:21:31 -0000	1.24
+++ .cvsignore	13 Jan 2009 12:32:17 -0000	1.25
@@ -1 +1 @@
-pulseaudio-0.9.13.tar.gz
+pulseaudio-0.9.14.tar.gz


Index: pulseaudio.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pulseaudio/F-10/pulseaudio.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- pulseaudio.spec	18 Dec 2008 15:21:36 -0000	1.63
+++ pulseaudio.spec	13 Jan 2009 12:32:18 -0000	1.64
@@ -2,8 +2,8 @@
 
 Name:		pulseaudio
 Summary: 	Improved Linux sound server
-Version:	0.9.13
-Release:	6%{?dist}
+Version:	0.9.14
+Release:	1%{?dist}
 License:	GPLv2+
 Group:		System Environment/Daemons
 Source0:	http://0pointer.de/lennart/projects/pulseaudio/pulseaudio-%{version}.tar.gz
@@ -26,30 +26,6 @@
 BuildRequires: intltool
 Requires:	%{name}-core-libs = %{version}-%{release}
 Obsoletes:	pulseaudio-devel
-Patch1: 0001-Initialize-exit_idle_time-to-1-instead-of-0-when-i.patch
-Patch2: 0002-Unload-module-bluetooth-device-if-the-remote-device.patch
-Patch3: 0003-instead-of-resetting-virtual_volume-unconditionally.patch
-Patch4: 0004-use-pa_channel_map_init_extend-instead-of-pa_chann.patch
-Patch5: 0005-if-the-channel-map-was-modified-due-to-PA_SINK_INPUT.patch
-Patch6: 0006-define-0dB-in-PA-as-maximum-amplification.patch
-Patch7: 0007-Fix-a-potential-C-C99-ism-add-a-log-message-on-er.patch
-Patch8: 0008-Fix-two-typos-that-broke-tunnels.patch
-Patch9: 0009-properly-remove-dbus-matches-an-filters-when-unloadi.patch
-Patch10: 0010-Fix-possible-invalid-read-while-attempting-to-load-m.patch
-Patch11: 0011-always-check-for-libtool-prefix-binary-name-to-avoid.patch
-Patch12: 0012-Fix-spelling-of-privilige.patch
-Patch13: 0013-Make-missing-git-changelog.perl-non-fatal.patch
-Patch14: 0014-fix-invalid-validity-check.patch
-Patch15: 0015-convert-argument-to-boolean-int-in-PA_UNLIKELY-too.patch
-Patch16: 0016-include-log.h-near-the-end-so-that-macro.h-can-be-in.patch
-Patch17: 0017-Try-to-catch-certain-driver-errors.patch
-Patch18: 0018-make-the-debug-trap-macro-a-proper-macro-in-macro.h.patch
-Patch19: 0019-don-t-set-the-volume-of-pacat-unless-it-is-explicitl.patch
-Patch20: 0020-warn-if-ALSA-wakes-us-up-and-there-is-actually-nothi.patch
-Patch21: 0021-fix-build.patch
-Patch22: 0022-make-sure-to-use-64bit-rounding-even-on-32bit-machin.patch
-Patch23: 0023-make-shm-marker-architecture-independant-patch-from.patch
-Patch24: 0024-Make-sure-libpulse-never-gets-unloaded.patch
 
 %description
 PulseAudio is a sound server for Linux and other Unix like operating 
@@ -187,30 +163,6 @@
 
 %prep
 %setup -q -T -b0
-%patch1 -p1 -b .0001-Initialize-exit_idle_time-to-1-instead-of-0-when-i.patch
-%patch2 -p1 -b .0002-Unload-module-bluetooth-device-if-the-remote-device.patch
-%patch3 -p1 -b .0003-instead-of-resetting-virtual_volume-unconditionally.patch
-%patch4 -p1 -b .0004-use-pa_channel_map_init_extend-instead-of-pa_chann.patch
-%patch5 -p1 -b .0005-if-the-channel-map-was-modified-due-to-PA_SINK_INPUT.patch
-%patch6 -p1 -b .0006-define-0dB-in-PA-as-maximum-amplification.patch
-%patch7 -p1 -b .0007-Fix-a-potential-C-C99-ism-add-a-log-message-on-er.patch
-%patch8 -p1 -b .0008-Fix-two-typos-that-broke-tunnels.patch
-%patch9 -p1 -b .0009-properly-remove-dbus-matches-an-filters-when-unloadi.patch
-%patch10 -p1 -b .0010-Fix-possible-invalid-read-while-attempting-to-load-m.patch
-%patch11 -p1 -b .0011-always-check-for-libtool-prefix-binary-name-to-avoid.patch
-%patch12 -p1 -b .0012-Fix-spelling-of-privilige.patch
-%patch13 -p1 -b .0013-Make-missing-git-changelog.perl-non-fatal.patch
-%patch14 -p1 -b .0014-fix-invalid-validity-check.patch
-%patch15 -p1 -b .0015-convert-argument-to-boolean-int-in-PA_UNLIKELY-too.patch
-%patch16 -p1 -b .0016-include-log.h-near-the-end-so-that-macro.h-can-be-in.patch
-%patch17 -p1 -b .0017-Try-to-catch-certain-driver-errors.patch
-%patch18 -p1 -b .0018-make-the-debug-trap-macro-a-proper-macro-in-macro.h.patch
-%patch19 -p1 -b .0019-don-t-set-the-volume-of-pacat-unless-it-is-explicitl.patch
-%patch20 -p1 -b .0020-warn-if-ALSA-wakes-us-up-and-there-is-actually-nothi.patch
-%patch21 -p1 -b .0021-fix-build.patch
-%patch22 -p1 -b .0022-make-sure-to-use-64bit-rounding-even-on-32bit-machin.patch
-%patch23 -p1 -b .0023-make-shm-marker-architecture-independant-patch-from.patch
-%patch24 -p1 -b .0024-Make-sure-libpulse-never-gets-unloaded.patch
 
 %build
 CFLAGS="-ggdb" %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
@@ -442,6 +394,10 @@
 %{_mandir}/man1/pax11publish.1.gz
 
 %changelog
+* Tue Jan 13 2009 Lennart Poettering <lpoetter at redhat.com> 0.9.14-1
+- New release, incorporating all 24 patches we were shipping in the rpm plus
+  quite a few more fixes.
+
 * Sat Nov 1 2008 Lennart Poettering <lpoetter at redhat.com> 0.9.13-6
 - Backport another two fixes from current git master
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pulseaudio/F-10/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- sources	6 Oct 2008 02:21:31 -0000	1.26
+++ sources	13 Jan 2009 12:32:18 -0000	1.27
@@ -1 +1 @@
-279fb92f08393a6a992d55e3ac9a006b  pulseaudio-0.9.13.tar.gz
+0ed1115222d1d8c64cc14961cccb2eb0  pulseaudio-0.9.14.tar.gz



From varekova at fedoraproject.org  Tue Jan 13 12:35:19 2009
From: varekova at fedoraproject.org (Ivana Varekova)
Date: Tue, 13 Jan 2009 12:35:19 +0000 (UTC)
Subject: rpms/gnuplot/devel gnuplot.spec,1.61,1.62
Message-ID: <20090113123519.1F05770129@cvs1.fedora.phx.redhat.com>

Author: varekova

Update of /cvs/pkgs/rpms/gnuplot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13710

Modified Files:
	gnuplot.spec 
Log Message:
chanhe changelog date 



Index: gnuplot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnuplot/devel/gnuplot.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- gnuplot.spec	13 Jan 2009 11:51:08 -0000	1.61
+++ gnuplot.spec	13 Jan 2009 12:34:48 -0000	1.62
@@ -217,7 +217,7 @@
 %{emacs_lispdir}/%{name}/*.el
 
 %changelog
-* Tue Jan 13 2008 Ivana Varekova <varekova at redhat.com> - 4.2.4-2
+* Tue Jan 13 2009 Ivana Varekova <varekova at redhat.com> - 4.2.4-2
 - add minimal package for server SIG purposes
 
 * Fri Nov  7 2008 Ivana Varekova <varekova at redhat.com> - 4.2.4-1



From rakesh at fedoraproject.org  Tue Jan 13 12:45:39 2009
From: rakesh at fedoraproject.org (Rakesh Pandit)
Date: Tue, 13 Jan 2009 12:45:39 +0000 (UTC)
Subject: rpms/gdmap/devel gdmap.spec,1.13,1.14 import.log,1.3,1.4
Message-ID: <20090113124539.4C69570129@cvs1.fedora.phx.redhat.com>

Author: rakesh

Update of /cvs/pkgs/rpms/gdmap/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14669/devel

Modified Files:
	gdmap.spec import.log 
Log Message:
fixed mix of space and tab and escape the use of macros in old changelog
entries to make rpmlint silent. Bumped to make up for tags.



Index: gdmap.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdmap/devel/gdmap.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- gdmap.spec	13 Jan 2009 10:04:43 -0000	1.13
+++ gdmap.spec	13 Jan 2009 12:45:08 -0000	1.14
@@ -1,6 +1,6 @@
 Name:	gdmap
 Version:	0.8.1
-Release:	2%{?dist}
+Release:	4%{?dist}
 Summary:	A tool which allows to visualize disk space
 
 Group:	Applications/System
@@ -8,7 +8,7 @@
 License:	GPL+
 URL:	http://gdmap.sourceforge.net
 Source0:	http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
-Patch0:         %{name}-0.8.1-desktop.patch
+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, pkgconfig
@@ -33,10 +33,10 @@
 
 
 desktop-file-install --vendor fedora --delete-original \
-  --add-category X-Fedora                              \
-  --add-category System                                \
-  --dir $RPM_BUILD_ROOT%{_datadir}/applications        \
-  $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
+	--add-category X-Fedora \
+	--add-category System \
+	--dir $RPM_BUILD_ROOT%{_datadir}/applications \
+	$RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
 
 %find_lang GdMap
 
@@ -57,6 +57,13 @@
 
 
 %changelog
+* Tue Jan 13 2009 Rakesh Pandit <rakesh at fedoraproject.org> - 0.8.1-4
+- Bumped
+
+* Tue Jan 13 2009 Rakesh Pandit <rakesh at fedoraproject.org> - 0.8.1-3
+- Escaped macros in changelog to make rpmlint silent.
+- Removed mixed space and tab.
+
 * Thu Dec  4 2008 Michael Schwendt <mschwendt at fedoraproject.org> - 0.8.1-2
 - Include unowned /usr/share/gdmap/pixmaps directory.
 
@@ -79,12 +86,12 @@
 - Fixed Desktop file
 
 * Fri Jul 7 2006 Damien Durand <splinux at fedoraproject.org> - 0.7.5-3
-- Fixed mixed-use-of-spaces-and-tabs and %find_lang in changelog
+- Fixed mixed-use-of-spaces-and-tabs and %%find_lang in changelog
 - added category System and delete-original in desktop-file-install
 
 * Tue Apr 6 2006 Damien Durand <splinux at fedoraproject.org> - 0.7.5-2
 - Fixed Buidrequires, add intltool
-- Fixed locales, add %find_lang GdMap and %%files -f GdMap.lang and remove {_datadir}/locales
+- Fixed locales, add %%find_lang GdMap and %%files -f GdMap.lang and remove {_datadir}/locales
 
 * Tue Apr 6 2006 Damien Durand <splinux at fedoraproject.org> - 0.7.5-1
 - Initial package


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/gdmap/devel/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- import.log	11 Jan 2009 19:33:08 -0000	1.3
+++ import.log	13 Jan 2009 12:45:08 -0000	1.4
@@ -1,3 +1,4 @@
 gdmap-0_8_1-1_fc10:HEAD:gdmap-0.8.1-1.fc10.src.rpm:1231698330
 gdmap-0_8_1-2_fc10:HEAD:gdmap-0.8.1-2.fc10.src.rpm:1231700056
 gdmap-0_8_1-3_fc10:HEAD:gdmap-0.8.1-3.fc10.src.rpm:1231702222
+gdmap-0_8_1-4_fc10:HEAD:gdmap-0.8.1-4.fc10.src.rpm:1231850357



From buc at fedoraproject.org  Tue Jan 13 13:01:08 2009
From: buc at fedoraproject.org (Dmitry Butskoy)
Date: Tue, 13 Jan 2009 13:01:08 +0000 (UTC)
Subject: rpms/freetds/devel freetds.spec,1.20,1.21
Message-ID: <20090113130109.0F98570129@cvs1.fedora.phx.redhat.com>

Author: buc

Update of /cvs/extras/rpms/freetds/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17788

Modified Files:
	freetds.spec 
Log Message:



Index: freetds.spec
===================================================================
RCS file: /cvs/extras/rpms/freetds/devel/freetds.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- freetds.spec	12 Jan 2009 18:11:15 -0000	1.20
+++ freetds.spec	13 Jan 2009 13:00:38 -0000	1.21
@@ -63,13 +63,16 @@
 %configure \
 	--disable-dependency-tracking \
 	%{!?_with_static: --disable-static} \
-	--disable-rpath \
 	--with-tdsver="4.2" \
 	--with-unixodbc="%{_prefix}" \
 	--enable-msdblib \
 	--enable-sybase-compat \
 	--with-gnutls
 
+# avoid any rpath
+sed -i -e 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' \
+	-e 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
+
 make %{?_smp_mflags}
 
  



From corsepiu at fedoraproject.org  Tue Jan 13 13:08:11 2009
From: corsepiu at fedoraproject.org (=?utf-8?q?Ralf_Cors=C3=A9pius?=)
Date: Tue, 13 Jan 2009 13:08:11 +0000 (UTC)
Subject: rpms/po4a/devel .cvsignore, 1.3, 1.4 po4a.spec, 1.7, 1.8 sources,
	1.3, 1.4
Message-ID: <20090113130811.64CFA70129@cvs1.fedora.phx.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/po4a/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19391

Modified Files:
	.cvsignore po4a.spec sources 
Log Message:
* Tue Jan 13 2009 Ralf Cors??pius <corsepiu at fedoraproject.org> - 0.34-1
- Reset %release.
- Add BuildRequires: perl(Test::More), BuildRequires: docbook-dtds.
- Activate tests.
- Fix Source0:-URL.
- Spec file cosmetics.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/po4a/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	20 Aug 2007 17:21:39 -0000	1.3
+++ .cvsignore	13 Jan 2009 13:07:40 -0000	1.4
@@ -1 +1 @@
-po4a-0.32.tar.gz
+po4a-0.34.tar.gz


Index: po4a.spec
===================================================================
RCS file: /cvs/pkgs/rpms/po4a/devel/po4a.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- po4a.spec	26 Aug 2008 17:57:14 -0000	1.7
+++ po4a.spec	13 Jan 2009 13:07:40 -0000	1.8
@@ -1,12 +1,12 @@
 Name: po4a
 Version: 0.34
-Release: 9%{?dist}
+Release: 1%{?dist}
 Summary: A tool maintaining translations anywhere
 Group: Applications/System
 # Nothing in the source tree specifies a version of the GPL.
 License: GPL+
 URL: http://alioth.debian.org/projects/po4a/
-Source0: http://alioth.debian.org/download.php/1798/%{name}-%{version}.tar.gz
+Source0: http://alioth.debian.org/download.php/2518/%{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildArch: noarch
 BuildRequires: perl(Module::Build)
@@ -15,6 +15,10 @@
 BuildRequires: perl(Locale::gettext) >= 1.01, gettext
 BuildRequires: perl(Term::ReadKey)
 
+# Required by the tests.
+BuildRequires: perl(Test::More)
+BuildRequires: docbook-dtds
+
 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 Requires: gettext
 
@@ -35,8 +39,9 @@
 make install DESTDIR=%{buildroot}
 find %{buildroot} -type f \( -name .packlist -or -name perllocal.pod \
   -or \( -name '*.bs' -a -empty \) \) -exec rm -f {} \;
-find %{buildroot} -depth -type d -exec rmdir {} \;
-chmod -R u+w %{buildroot}
+find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null \;
+
+%{_fixperms} %{buildroot}
 
 %find_lang %{name}
 
@@ -47,8 +52,8 @@
 done
 
 %check
-# check is currently broken due to absence of data-23/fonts
-#./Build test verbose=1
+# The tests are unclean
+./Build test ||:
 
 %clean
 rm -rf %{buildroot}
@@ -71,7 +76,14 @@
 
 
 %changelog
-* Sun Aug 24 2008 Axel Thimm <Axel.Thimm at ATrpms.net> - 0.34-9
+* Tue Jan 13 2009 Ralf Cors??pius <corsepiu at fedoraproject.org> - 0.34-1
+- Reset %%release.
+- Add BuildRequires: perl(Test::More), BuildRequires: docbook-dtds.
+- Activate tests.
+- Fix Source0:-URL.
+- Spec file cosmetics.
+
+* Sun Aug 24 2008 Axel Thimm <Axel.Thimm at ATrpms.net>
 - Update to 0.34.
 
 * Sun Jun 01 2008 Ralf Cors??pius <rc040203 at freenet.de> - 0.32-8


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/po4a/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	20 Aug 2007 17:21:39 -0000	1.3
+++ sources	13 Jan 2009 13:07:41 -0000	1.4
@@ -1 +1 @@
-d026b224965b50afd9924b61d0df2a06  po4a-0.32.tar.gz
+883b616e8c2ec6dc5bab53118afd270a  po4a-0.34.tar.gz



From dwalsh at fedoraproject.org  Tue Jan 13 13:14:56 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Tue, 13 Jan 2009 13:14:56 +0000 (UTC)
Subject: rpms/libsemanage/devel .cvsignore, 1.98, 1.99 libsemanage-rhat.patch,
	1.45, 1.46 libsemanage.spec, 1.171, 1.172 sources, 1.100, 1.101
Message-ID: <20090113131456.A260C70129@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/libsemanage/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20366

Modified Files:
	.cvsignore libsemanage-rhat.patch libsemanage.spec sources 
Log Message:
* Mon Jan 12 2009 Dan Walsh <dwalsh at redhat.com> - 2.0.31-1
- Update to upstream
	* Policy module compression (bzip) support from Dan Walsh.
	* Hard link files between tmp/active/previous from Dan Walsh.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libsemanage/devel/.cvsignore,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -r1.98 -r1.99
--- .cvsignore	4 Dec 2008 19:39:35 -0000	1.98
+++ .cvsignore	13 Jan 2009 13:14:23 -0000	1.99
@@ -104,3 +104,4 @@
 libsemanage-2.0.28.tgz
 libsemanage-2.0.29.tgz
 libsemanage-2.0.30.tgz
+libsemanage-2.0.31.tgz

libsemanage-rhat.patch:

Index: libsemanage-rhat.patch
===================================================================
RCS file: /cvs/extras/rpms/libsemanage/devel/libsemanage-rhat.patch,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- libsemanage-rhat.patch	12 Jan 2009 19:37:55 -0000	1.45
+++ libsemanage-rhat.patch	13 Jan 2009 13:14:25 -0000	1.46
@@ -1,526 +1,6 @@
-diff --exclude-from=exclude -N -u -r nsalibsemanage/include/semanage/modules.h libsemanage-2.0.30/include/semanage/modules.h
---- nsalibsemanage/include/semanage/modules.h	2008-08-28 09:34:24.000000000 -0400
-+++ libsemanage-2.0.30/include/semanage/modules.h	2009-01-12 13:20:46.000000000 -0500
-@@ -30,10 +30,16 @@
- 
- int semanage_module_install(semanage_handle_t *,
- 			    char *module_data, size_t data_len);
-+int semanage_module_install_file(semanage_handle_t *,
-+				 const char *module_name);
- int semanage_module_upgrade(semanage_handle_t *,
- 			    char *module_data, size_t data_len);
-+int semanage_module_upgrade_file(semanage_handle_t *,
-+				 const char *module_name);
- int semanage_module_install_base(semanage_handle_t *,
- 				 char *module_data, size_t data_len);
-+int semanage_module_install_base_file(semanage_handle_t *,
-+				      const char *module_name);
- int semanage_module_remove(semanage_handle_t *, char *module_name);
- 
- /* semanage_module_info is for getting information on installed
-diff --exclude-from=exclude -N -u -r nsalibsemanage/src/direct_api.c libsemanage-2.0.30/src/direct_api.c
---- nsalibsemanage/src/direct_api.c	2008-11-14 17:10:15.000000000 -0500
-+++ libsemanage-2.0.30/src/direct_api.c	2009-01-12 14:34:36.000000000 -0500
-@@ -50,6 +50,7 @@
- #include "semanage_store.h"
- #include "database_policydb.h"
- #include "policy.h"
-+#include <sys/mman.h>
- 
- static void semanage_direct_destroy(semanage_handle_t * sh);
- static int semanage_direct_disconnect(semanage_handle_t * sh);
-@@ -57,10 +58,13 @@
- static int semanage_direct_commit(semanage_handle_t * sh);
- static int semanage_direct_install(semanage_handle_t * sh, char *data,
- 				   size_t data_len);
-+static int semanage_direct_install_file(semanage_handle_t * sh, const char *module_name);
- static int semanage_direct_upgrade(semanage_handle_t * sh, char *data,
- 				   size_t data_len);
-+static int semanage_direct_upgrade_file(semanage_handle_t * sh, const char *module_name);
- static int semanage_direct_install_base(semanage_handle_t * sh, char *base_data,
- 					size_t data_len);
-+static int semanage_direct_install_base_file(semanage_handle_t * sh, const char *module_name);
- static int semanage_direct_remove(semanage_handle_t * sh, char *module_name);
- static int semanage_direct_list(semanage_handle_t * sh,
- 				semanage_module_info_t ** modinfo,
-@@ -73,8 +77,11 @@
- 	.begin_trans = semanage_direct_begintrans,
- 	.commit = semanage_direct_commit,
- 	.install = semanage_direct_install,
-+	.install_file = semanage_direct_install_file,
- 	.upgrade = semanage_direct_upgrade,
-+	.upgrade_file = semanage_direct_upgrade_file,
- 	.install_base = semanage_direct_install_base,
-+	.install_base_file = semanage_direct_install_base_file,
- 	.remove = semanage_direct_remove,
- 	.list = semanage_direct_list
- };
-@@ -378,12 +385,157 @@
- 	return 0;
- }
- 
-+#include <stdlib.h>
-+#include <bzlib.h>
-+#include <string.h>
-+#include <sys/sendfile.h>
-+
-+/* bzip() a data to a file, returning the total number of compressed bytes
-+ * in the file.  Returns -1 if file could not be compressed. */
-+static ssize_t bzip(const char *filename, char *data, size_t num_bytes) {
-+	BZFILE* b;
-+	size_t  size = 1<<16;
-+	int     bzerror;
-+	size_t  total = 0;
-+	size_t len = 0;
-+	FILE *f;
-+
-+	if ((f = fopen(filename, "wb")) == NULL) {
-+		return -1;
-+	}
-+
-+	b = BZ2_bzWriteOpen( &bzerror, f, 9, 0, 0);
-+	if (bzerror != BZ_OK) {
-+		BZ2_bzWriteClose ( &bzerror, b, 1, 0, 0 );
-+		return -1;
-+	}
-+	
-+	while ( num_bytes > total ) {
-+		if (num_bytes - total > size) {
-+			len = size;
-+		} else {
-+			len = num_bytes - total;
-+		}
-+		BZ2_bzWrite ( &bzerror, b, &data[total], len );
-+		if (bzerror == BZ_IO_ERROR) { 
-+			BZ2_bzWriteClose ( &bzerror, b, 1, 0, 0 );
-+			return -1;
-+		}
-+		total += len;
-+	}
-+
-+	BZ2_bzWriteClose ( &bzerror, b, 0, 0, 0 );
-+	fclose(f);
-+	if (bzerror == BZ_IO_ERROR) {
-+		return -1;
-+	}
-+	return total;
-+}
-+
-+/* bunzip() a file to '*data', returning the total number of uncompressed bytes
-+ * in the file.  Returns -1 if file could not be decompressed. */
-+ssize_t bunzip(FILE *f, char **data) {
-+	BZFILE* b;
-+	size_t  nBuf;
-+	char    buf[1<<18];
-+	size_t  size = sizeof(buf);
-+	int     bzerror;
-+	size_t  total=0;
-+	
-+	b = BZ2_bzReadOpen ( &bzerror, f, 0, 0, NULL, 0 );
-+	if ( bzerror != BZ_OK ) {
-+		BZ2_bzReadClose ( &bzerror, b );
-+		return -1;
-+	}
-+	
-+	char *uncompress = realloc(NULL, size);
-+	
-+	while ( bzerror == BZ_OK) {
-+		nBuf = BZ2_bzRead ( &bzerror, b, buf, sizeof(buf));
-+		if (( bzerror == BZ_OK ) || ( bzerror == BZ_STREAM_END )) {
-+			if (total + nBuf > size) {
-+				size *= 2;
-+				uncompress = realloc(uncompress, size);
-+			}
-+			memcpy(&uncompress[total], buf, nBuf);
-+			total += nBuf;
-+		}
-+	}
-+	if ( bzerror != BZ_STREAM_END ) {
-+		BZ2_bzReadClose ( &bzerror, b );
-+		free(uncompress);
-+		return -1;
-+	}
-+	BZ2_bzReadClose ( &bzerror, b );
-+
-+	*data = uncompress;
-+	return  total;
-+}
-+
-+/* mmap() a file to '*data',
-+ *  If the file is bzip compressed map_file will uncompress 
-+ * the file into '*data'.
-+ * Returns the total number of bytes in memory .
-+ * Returns -1 if file could not be opened or mapped. */
-+static ssize_t map_file(int fd, char **data, int *compressed)
-+{
-+	ssize_t size = -1;
-+	char *uncompress;
-+	if ((size = bunzip(fdopen(fd, "r"), &uncompress)) > 0) {
-+		*data = mmap(0, size, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0);
-+		if (*data == MAP_FAILED) {
-+			free(uncompress);
-+			return -1;
-+		} else {
-+			memcpy(*data, uncompress, size);
-+		}
-+		free(uncompress);
-+		*compressed = 1;
-+	} else {
-+		struct stat sb;
-+		if (fstat(fd, &sb) == -1 ||
-+		    (*data = mmap(NULL, sb.st_size, PROT_READ, MAP_PRIVATE, fd, 0)) ==
-+		    MAP_FAILED) {
-+			size = -1;
-+		} else {
-+			size = sb.st_size;
-+		}
-+		*compressed = 0;
-+	} 
-+
-+	return size;
-+}
-+
-+static int dupfile( const char *dest, int src_fd) {
-+	int dest_fd = -1;
-+	int retval = 0;
-+	int cnt;
-+	char    buf[1<<18];
-+
-+	if (lseek(src_fd, 0, SEEK_SET)  == -1 ) return -1;
-+
-+	if ((dest_fd = open(dest, O_WRONLY | O_CREAT | O_TRUNC,
-+			   S_IRUSR | S_IWUSR)) == -1) {
-+		return -1;
-+	}
-+
-+	while (( retval == 0 ) && 
-+	       ( cnt = read(src_fd, buf, sizeof(buf)))> 0 ) {
-+		if (write(dest_fd, buf, cnt) < cnt) retval = -1;
-+	}
-+	close(dest_fd);
-+	return retval;
-+}
-+
- /* Writes a block of data to a file.  Returns 0 on success, -1 on
-  * error. */
- static int write_file(semanage_handle_t * sh,
- 		      const char *filename, char *data, size_t num_bytes)
- {
- 	int out;
-+
-+	/* Unlink no matter what, incase this file is a hard link, ignore error */
-+	unlink(filename);
- 	if ((out =
- 	     open(filename, O_WRONLY | O_CREAT | O_TRUNC,
- 		  S_IRUSR | S_IWUSR)) == -1) {
-@@ -499,7 +651,7 @@
- 	sepol_policydb_t *out = NULL;
- 
- 	/* Declare some variables */
--	int modified, fcontexts_modified, ports_modified,
-+	int modified = 0, fcontexts_modified, ports_modified,
- 	    seusers_modified, users_extra_modified;
- 	dbase_config_t *users = semanage_user_dbase_local(sh);
- 	dbase_config_t *users_base = semanage_user_base_dbase_local(sh);
-@@ -815,8 +967,10 @@
- 					   &filename)) != 0) {
- 		goto cleanup;
- 	}
--	if (write_file(sh, filename, data, data_len) == -1) {
-+	if (bzip(filename, data, data_len) <= 0) {
-+		ERR(sh, "Error while writing to %s.", filename);
- 		retval = -3;
-+		goto cleanup;
- 	}
- 	retval = 0;
-       cleanup:
-@@ -826,17 +980,58 @@
- 	return retval;
- }
- 
--/* Similar to semanage_direct_install(), except that it checks that
-- * there already exists a module with the same name and that the
-- * module is an older version then the one in 'data'.  Returns 0 on
-- * success, -1 if out of memory, -2 if the data does not represent a
-- * valid module file, -3 if error while writing file or reading
-- * modules directory, -4 if there does not exist an older module or if
-- * the previous module is same or newer than 'data'.
-- */
--static int semanage_direct_upgrade(semanage_handle_t * sh,
--				   char *data, size_t data_len)
-+/* Attempts to link a module to the sandbox's module directory, unlinking any
-+ * previous module stored within.  Returns 0 on success, -1 if out of memory, -2 if the
-+ * data does not represent a valid module file, -3 if error while
-+ * writing file. */
-+
-+static int semanage_direct_install_file(semanage_handle_t * sh,
-+					const char *install_filename)
- {
-+
-+	int retval = -1;
-+	char *data = NULL;
-+	size_t data_len = 0;
-+	int compressed = 0;
-+	int in_fd = -1;
-+
-+	if ((in_fd = open(install_filename, O_RDONLY)) == -1) {
-+		return -1;
-+	}
-+
-+	if ((data_len = map_file(in_fd, &data, &compressed)) == 0) {
-+		goto cleanup;
-+	}
-+		
-+	if (compressed) {
-+		char *module_name = NULL, *version = NULL, *filename = NULL;
-+		if ((retval = parse_module_headers(sh, data, data_len,
-+						   &module_name, &version,
-+						   &filename)) != 0) {
-+			goto cleanup;
-+		}
-+
-+		if (data_len > 0) munmap(data, data_len);
-+		data_len = 0;
-+		retval = dupfile(filename, in_fd);
-+		free(version);
-+		free(filename);
-+		free(module_name);
-+
-+	} else {
-+		retval = semanage_direct_install(sh, data, data_len);
-+	}
-+
-+      cleanup:
-+	close(in_fd);
-+	if (data_len > 0) munmap(data, data_len);
-+
-+	return retval;
-+}
-+
-+
-+static int get_direct_upgrade_filename(semanage_handle_t * sh,
-+				       char *data, size_t data_len, char **outfilename) {
- 	int i, retval, num_modules = 0;
- 	char *module_name = NULL, *version = NULL, *filename = NULL;
- 	semanage_module_info_t *modinfo = NULL;
-@@ -868,14 +1063,9 @@
- 	if (retval == -4) {
- 		ERR(sh, "There does not already exist a module named %s.",
- 		    module_name);
--		goto cleanup;
--	}
--	if (write_file(sh, filename, data, data_len) == -1) {
--		retval = -3;
- 	}
-       cleanup:
- 	free(version);
--	free(filename);
- 	free(module_name);
- 	for (i = 0; modinfo != NULL && i < num_modules; i++) {
- 		semanage_module_info_t *m =
-@@ -883,6 +1073,80 @@
- 		semanage_module_info_datum_destroy(m);
- 	}
- 	free(modinfo);
-+	if (retval == 0) {
-+		*outfilename = filename;
-+	} else {
-+		free(filename);
-+	}
-+	return retval;
-+}
-+
-+/* Similar to semanage_direct_install(), except that it checks that
-+ * there already exists a module with the same name and that the
-+ * module is an older version then the one in 'data'.  Returns 0 on
-+ * success, -1 if out of memory, -2 if the data does not represent a
-+ * valid module file, -3 if error while writing file or reading
-+ * modules directory, -4 if there does not exist an older module or if
-+ * the previous module is same or newer than 'data'.
-+ */
-+static int semanage_direct_upgrade(semanage_handle_t * sh,
-+				   char *data, size_t data_len)
-+{
-+	char *filename = NULL;
-+	int retval = get_direct_upgrade_filename(sh,
-+						 data, data_len, 
-+						 &filename);
-+	if (retval == 0) {
-+		if (bzip(filename, data, data_len) <= 0) {
-+			ERR(sh, "Error while writing to %s.", filename);
-+			retval = -3;
-+		}
-+		free(filename);
-+	}
-+	return retval;
-+}
-+
-+/* Attempts to link a module to the sandbox's module directory, unlinking any
-+ * previous module stored within.  
-+ * Returns 0 on success, -1 if out of memory, -2 if the
-+ * data does not represent a valid module file, -3 if error while
-+ * writing file. */
-+
-+static int semanage_direct_upgrade_file(semanage_handle_t * sh,
-+					const char *module_filename)
-+{
-+	int retval = -1;
-+	char *data = NULL;
-+	size_t data_len = 0;
-+	int compressed = 0;
-+	int in_fd = -1;
-+
-+	if ((in_fd = open(module_filename, O_RDONLY)) == -1) {
-+		return -1;
-+	}
-+
-+	if ((data_len = map_file(in_fd, &data, &compressed)) == 0) {
-+		goto cleanup;
-+	}
-+
-+	if (compressed) {
-+		char *filename = NULL;
-+		retval = get_direct_upgrade_filename(sh,
-+					 	     data, data_len, 
-+						     &filename);
-+		
-+		if (retval != 0)  goto cleanup;
-+
-+		retval = dupfile(filename, in_fd);
-+		free(filename);
-+	} else {
-+		retval = semanage_direct_upgrade(sh, data, data_len);
-+	}
-+
-+      cleanup:
-+	close(in_fd);
-+	if (data_len > 0) munmap(data, data_len);
-+
- 	return retval;
- }
- 
-@@ -903,14 +1167,59 @@
- 	if ((filename = semanage_path(SEMANAGE_TMP, SEMANAGE_BASE)) == NULL) {
- 		goto cleanup;
- 	}
--	if (write_file(sh, filename, base_data, data_len) == -1) {
-+	if (bzip(filename, base_data, data_len) <= 0) {
-+		ERR(sh, "Error while writing to %s.", filename);
- 		retval = -3;
-+		goto cleanup;
- 	}
- 	retval = 0;
-       cleanup:
- 	return retval;
- }
- 
-+/* Writes a base module into a sandbox, overwriting any previous base
-+ * module.  
-+ * Returns 0 on success, -1 if out of memory, -2 if the data does not represent
-+ * a valid base module file, -3 if error while writing file.
-+ */
-+static int semanage_direct_install_base_file(semanage_handle_t * sh,
-+					     const char *install_filename)
-+{
-+	int retval = -1;
-+	char *data = NULL;
-+	size_t data_len = 0;
-+	int compressed = 0;
-+	int in_fd;
-+
-+	if ((in_fd = open(install_filename, O_RDONLY)) == -1) {
-+		return -1;
-+	}
-+
-+	if ((data_len = map_file(in_fd, &data, &compressed)) == 0) {
-+		goto cleanup;
-+	}
-+		
-+	if (compressed) {
-+		const char *filename = NULL;
-+		if ((retval = parse_base_headers(sh, data, data_len)) != 0) {
-+			goto cleanup;
-+		}
-+		if ((filename = semanage_path(SEMANAGE_TMP, SEMANAGE_BASE)) == NULL) {
-+			goto cleanup;
-+		}
-+
-+		retval = dupfile(filename, in_fd);
-+	} else {
-+		retval = semanage_direct_install_base(sh, data, data_len);
-+	}
-+
-+      cleanup:
-+	close(in_fd);
-+	if (data_len > 0) munmap(data, data_len);
-+
-+	return retval;
-+}
-+
- /* Removes a module from the sandbox.  Returns 0 on success, -1 if out
-  * of memory, -2 if module not found or could not be removed. */
- static int semanage_direct_remove(semanage_handle_t * sh, char *module_name)
-@@ -1005,15 +1314,29 @@
- 			 * report it */
- 			continue;
- 		}
-+		ssize_t size;
-+		char *data = NULL;
-+
-+		if ((size = bunzip(fp, &data)) > 0) {
-+			fclose(fp);
-+			fp = fmemopen(data, size, "rb");
-+			if (!fp) {
-+				ERR(sh, "Out of memory!");
-+				goto cleanup;
-+			}
-+		}
-+		rewind(fp);
- 		__fsetlocking(fp, FSETLOCKING_BYCALLER);
- 		sepol_policy_file_set_fp(pf, fp);
- 		if (sepol_module_package_info(pf, &type, &name, &version)) {
- 			fclose(fp);
-+			free(data);
- 			free(name);
- 			free(version);
- 			continue;
- 		}
- 		fclose(fp);
-+		free(data);
- 		if (type == SEPOL_POLICY_MOD) {
- 			(*modinfo)[*num_modules].name = name;
- 			(*modinfo)[*num_modules].version = version;
-diff --exclude-from=exclude -N -u -r nsalibsemanage/src/direct_api.h libsemanage-2.0.30/src/direct_api.h
---- nsalibsemanage/src/direct_api.h	2008-11-14 17:10:15.000000000 -0500
-+++ libsemanage-2.0.30/src/direct_api.h	2009-01-12 13:43:27.000000000 -0500
-@@ -39,4 +39,8 @@
- 
- int semanage_direct_mls_enabled(struct semanage_handle *sh);
- 
-+#include <stdio.h>
-+#include <unistd.h>
-+ssize_t bunzip(FILE *f, char **data);
-+
- #endif
 diff --exclude-from=exclude -N -u -r nsalibsemanage/src/genhomedircon.c libsemanage-2.0.30/src/genhomedircon.c
 --- nsalibsemanage/src/genhomedircon.c	2008-08-28 09:34:24.000000000 -0400
-+++ libsemanage-2.0.30/src/genhomedircon.c	2009-01-12 13:20:46.000000000 -0500
-@@ -487,7 +487,6 @@
- 				  const char *role_prefix)
- {
- 	replacement_pair_t repl[] = {
--		{.search_for = TEMPLATE_SEUSER,.replace_with = seuser},
- 		{.search_for = TEMPLATE_HOME_DIR,.replace_with = home},
- 		{.search_for = TEMPLATE_ROLE,.replace_with = role_prefix},
- 		{NULL, NULL}
-@@ -547,7 +546,6 @@
- 	replacement_pair_t repl[] = {
- 		{.search_for = TEMPLATE_USER,.replace_with = user},
- 		{.search_for = TEMPLATE_ROLE,.replace_with = role_prefix},
--		{.search_for = TEMPLATE_SEUSER,.replace_with = seuser},
- 		{NULL, NULL}
- 	};
- 	Ustr *line = USTR_NULL;
++++ libsemanage-2.0.30/src/genhomedircon.c	2009-01-12 10:29:24.000000000 -0500
 @@ -794,6 +792,12 @@
  			 * /root */
  			continue;
@@ -534,192 +14,12 @@
  		if (push_user_entry(&head, name, seuname,
  				    prefix, pwent->pw_dir) != STATUS_SUCCESS) {
  			*errors = STATUS_ERR;
-diff --exclude-from=exclude -N -u -r nsalibsemanage/src/libsemanage.map libsemanage-2.0.30/src/libsemanage.map
---- nsalibsemanage/src/libsemanage.map	2008-11-14 17:10:15.000000000 -0500
-+++ libsemanage-2.0.30/src/libsemanage.map	2009-01-12 13:20:46.000000000 -0500
-@@ -3,8 +3,10 @@
-           semanage_is_managed; semanage_connect; semanage_disconnect; 
- 	  semanage_msg_*;
-           semanage_begin_transaction; semanage_commit;
--          semanage_module_install; semanage_module_upgrade;
--	  semanage_module_install_base; semanage_module_remove;
-+	  semanage_module_install; semanage_module_install_file;
-+	  semanage_module_upgrade; semanage_module_upgrade_file;
-+	  semanage_module_install_base; semanage_module_install_base_file;
-+	  semanage_module_remove;
- 	  semanage_module_list; semanage_module_info_datum_destroy;
- 	  semanage_module_list_nth; semanage_module_get_name;
- 	  semanage_module_get_version; semanage_select_store;
-diff --exclude-from=exclude -N -u -r nsalibsemanage/src/Makefile libsemanage-2.0.30/src/Makefile
---- nsalibsemanage/src/Makefile	2008-08-28 09:34:24.000000000 -0400
-+++ libsemanage-2.0.30/src/Makefile	2009-01-12 13:20:46.000000000 -0500
-@@ -54,7 +54,7 @@
- 	ranlib $@
- 
- $(LIBSO): $(LOBJS)
--	$(CC) $(CFLAGS) $(LDFLAGS) -shared -o $@ $^ -lsepol -lselinux -lustr -L$(LIBDIR) -Wl,-soname,$(LIBSO),--version-script=libsemanage.map,-z,defs
-+	$(CC) $(CFLAGS) $(LDFLAGS) -shared -o $@ $^ -lsepol -lselinux -lbz2 -lustr -L$(LIBDIR) -Wl,-soname,$(LIBSO),--version-script=libsemanage.map,-z,defs
- 	ln -sf $@ $(TARGET)
- 
- conf-scan.c: conf-scan.l conf-parse.h
-diff --exclude-from=exclude -N -u -r nsalibsemanage/src/modules.c libsemanage-2.0.30/src/modules.c
---- nsalibsemanage/src/modules.c	2008-08-28 09:34:24.000000000 -0400
-+++ libsemanage-2.0.30/src/modules.c	2009-01-12 13:20:46.000000000 -0500
-@@ -52,6 +52,25 @@
- 	return sh->funcs->install(sh, module_data, data_len);
- }
- 
-+int semanage_module_install_file(semanage_handle_t * sh,
-+				 const char *module_name) {
-+
-+	if (sh->funcs->install_file == NULL) {
-+		ERR(sh,
-+		    "No install function defined for this connection type.");
-+		return -1;
-+	} else if (!sh->is_connected) {
-+		ERR(sh, "Not connected.");
-+		return -1;
-+	} else if (!sh->is_in_transaction) {
-+		if (semanage_begin_transaction(sh) < 0) {
-+			return -1;
-+		}
-+	}
-+	sh->modules_modified = 1;
-+	return sh->funcs->install_file(sh, module_name);
-+}
-+
- int semanage_module_upgrade(semanage_handle_t * sh,
- 			    char *module_data, size_t data_len)
- {
-@@ -71,6 +90,25 @@
- 	return sh->funcs->upgrade(sh, module_data, data_len);
- }
- 
-+int semanage_module_upgrade_file(semanage_handle_t * sh,
-+				 const char *module_name) {
-+
-+	if (sh->funcs->upgrade_file == NULL) {
-+		ERR(sh,
-+		    "No upgrade function defined for this connection type.");
-+		return -1;
-+	} else if (!sh->is_connected) {
-+		ERR(sh, "Not connected.");
-+		return -1;
-+	} else if (!sh->is_in_transaction) {
-+		if (semanage_begin_transaction(sh) < 0) {
-+			return -1;
-+		}
-+	}
-+	sh->modules_modified = 1;
-+	return sh->funcs->upgrade_file(sh, module_name);
-+}
-+
- int semanage_module_install_base(semanage_handle_t * sh,
- 				 char *module_data, size_t data_len)
- {
-@@ -90,6 +128,25 @@
- 	return sh->funcs->install_base(sh, module_data, data_len);
- }
- 
-+int semanage_module_install_base_file(semanage_handle_t * sh,
-+				 const char *module_name) {
-+
-+	if (sh->funcs->install_base_file == NULL) {
-+		ERR(sh,
-+		    "No install base function defined for this connection type.");
-+		return -1;
-+	} else if (!sh->is_connected) {
-+		ERR(sh, "Not connected.");
-+		return -1;
-+	} else if (!sh->is_in_transaction) {
-+		if (semanage_begin_transaction(sh) < 0) {
-+			return -1;
-+		}
-+	}
-+	sh->modules_modified = 1;
-+	return sh->funcs->install_base_file(sh, module_name);
-+}
-+
- int semanage_module_remove(semanage_handle_t * sh, char *module_name)
- {
- 	if (sh->funcs->remove == NULL) {
-diff --exclude-from=exclude -N -u -r nsalibsemanage/src/policy.h libsemanage-2.0.30/src/policy.h
---- nsalibsemanage/src/policy.h	2008-08-28 09:34:24.000000000 -0400
-+++ libsemanage-2.0.30/src/policy.h	2009-01-12 13:20:46.000000000 -0500
-@@ -49,8 +49,14 @@
- 	/* Install a policy module */
- 	int (*install) (struct semanage_handle *, char *, size_t);
- 
-+	/* Install a policy module */
-+	int (*install_file) (struct semanage_handle *, const char *);
-+
- 	/* Upgrade a policy module */
- 	int (*upgrade) (struct semanage_handle *, char *, size_t);
-+	
-+	/* Upgrade a policy module */
-+	int (*upgrade_file) (struct semanage_handle *, const char *);
- 
- 	/* Remove a policy module */
- 	int (*remove) (struct semanage_handle *, char *);
-@@ -61,6 +67,9 @@
- 
- 	/* Install base policy */
- 	int (*install_base) (struct semanage_handle *, char *, size_t);
-+
-+	/* Install a base module */
-+	int (*install_base_file) (struct semanage_handle *, const char *);
- };
- 
- /* Should be backend independent */
 diff --exclude-from=exclude -N -u -r nsalibsemanage/src/semanage.conf libsemanage-2.0.30/src/semanage.conf
 --- nsalibsemanage/src/semanage.conf	2008-08-28 09:34:24.000000000 -0400
-+++ libsemanage-2.0.30/src/semanage.conf	2009-01-12 13:20:46.000000000 -0500
++++ libsemanage-2.0.30/src/semanage.conf	2009-01-12 10:29:24.000000000 -0500
 @@ -35,4 +35,4 @@
  # given in <sepol/policydb.h>.  Change this setting if a different
  # version is necessary.
  #policy-version = 19
 -
 +expand-check=0
-diff --exclude-from=exclude -N -u -r nsalibsemanage/src/semanage_store.c libsemanage-2.0.30/src/semanage_store.c
---- nsalibsemanage/src/semanage_store.c	2008-11-11 16:13:18.000000000 -0500
-+++ libsemanage-2.0.30/src/semanage_store.c	2009-01-12 13:20:46.000000000 -0500
-@@ -440,6 +440,8 @@
- 	char tmp[PATH_MAX];
- 	char buf[4192];
- 
-+	if (link(src,dst) == 0) return 0;
-+
- 	n = snprintf(tmp, PATH_MAX, "%s.tmp", dst);
- 	if (n < 0 || n >= PATH_MAX)
- 		return -1;
-@@ -1523,16 +1525,30 @@
- 		ERR(sh, "Could not open module file %s for reading.", filename);
- 		goto cleanup;
- 	}
-+	size_t size;
-+	char *data = NULL;
-+
-+	if ((size = bunzip(fp, &data)) > 0) {
-+		fclose(fp);
-+		fp = fmemopen(data, size, "rb");
-+		if (!fp) {
-+			ERR(sh, "Out of memory!");
-+			goto cleanup;
-+		}
-+	}
-+	rewind(fp);
- 	__fsetlocking(fp, FSETLOCKING_BYCALLER);
- 	sepol_policy_file_set_fp(pf, fp);
- 	sepol_policy_file_set_handle(pf, sh->sepolh);
- 	if (sepol_module_package_read(*package, pf, 0) == -1) {
- 		ERR(sh, "Error while reading from module file %s.", filename);
- 		fclose(fp);
-+		free(data);
- 		goto cleanup;
- 	}
- 	sepol_policy_file_free(pf);
- 	fclose(fp);
-+	free(data);
- 	return retval;
- 
-       cleanup:


Index: libsemanage.spec
===================================================================
RCS file: /cvs/extras/rpms/libsemanage/devel/libsemanage.spec,v
retrieving revision 1.171
retrieving revision 1.172
diff -u -r1.171 -r1.172
--- libsemanage.spec	12 Jan 2009 15:55:47 -0000	1.171
+++ libsemanage.spec	13 Jan 2009 13:14:25 -0000	1.172
@@ -2,8 +2,8 @@
 %define libselinuxver 2.0.0-1
 Summary: SELinux binary policy manipulation library 
 Name: libsemanage
-Version: 2.0.30
-Release: 3%{?dist}
+Version: 2.0.31
+Release: 1%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 Source: http://www.nsa.gov/selinux/archives/libsemanage-%{version}.tgz
@@ -90,6 +90,11 @@
 %{_libdir}/python*/site-packages/*
 
 %changelog
+* Mon Jan 12 2009 Dan Walsh <dwalsh at redhat.com> - 2.0.31-1
+- Update to upstream
+	* Policy module compression (bzip) support from Dan Walsh.
+	* Hard link files between tmp/active/previous from Dan Walsh.
+
 * Mon Jan 12 2009 Dan Walsh <dwalsh at redhat.com> - 2.0.30-3
 - Fix up patch to get it upstreamed
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libsemanage/devel/sources,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -r1.100 -r1.101
--- sources	4 Dec 2008 19:39:35 -0000	1.100
+++ sources	13 Jan 2009 13:14:25 -0000	1.101
@@ -1 +1 @@
-e160a593f1313a3e1aec5148b4941f99  libsemanage-2.0.30.tgz
+7231fa877020bc5fbb2008adfd5dec89  libsemanage-2.0.31.tgz



From twaugh at fedoraproject.org  Tue Jan 13 13:18:59 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Tue, 13 Jan 2009 13:18:59 +0000 (UTC)
Subject: rpms/hplip/F-10 hplip.spec,1.192,1.193
Message-ID: <20090113131859.A61D970129@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/hplip/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20924

Modified Files:
	hplip.spec 
Log Message:
* Tue Jan 13 2009 Tim Waugh <twaugh at redhat.com> 2.8.12-3
- Make --qt4 the default for the systray applet, so that it appears
  in the right place, again (bug #479751).
- Removed hal preprobe rules as they were causing breakage
  (bug #479648).



Index: hplip.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/F-10/hplip.spec,v
retrieving revision 1.192
retrieving revision 1.193
diff -u -r1.192 -r1.193
--- hplip.spec	12 Jan 2009 18:41:11 -0000	1.192
+++ hplip.spec	13 Jan 2009 13:18:29 -0000	1.193
@@ -1,7 +1,7 @@
 Summary: HP Linux Imaging and Printing Project
 Name: hplip
 Version: 2.8.12
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+ and MIT
 Group: System Environment/Daemons
 Conflicts: system-config-printer < 0.6.132
@@ -126,7 +126,8 @@
 %build
 %configure --disable-foomatic-xml-install --disable-cups-install \
 	--enable-scan-build --enable-gui-build --enable-fax-build \
-	--disable-foomatic-rip-hplip-install --enable-dbus
+	--disable-foomatic-rip-hplip-install --enable-dbus \
+	--enable-qt4
 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,6 +177,9 @@
 # window), so don't ship the launcher yet.
 rm -f %{buildroot}%{_sysconfdir}/xdg/autostart/hplip-systray.desktop
 
+# Remove the hal preprobe rules as they were causing breakage (bug #479648).
+rm -f %{buildroot}%{_datadir}/hal/fdi/preprobe/10osvendor/20-hplip-devices.fdi
+
 %clean
 rm -rf %{buildroot}
 
@@ -183,7 +187,6 @@
 %defattr(-,root,root)
 %doc COPYING doc/*
 %{_datadir}/hal/fdi/policy/10osvendor/10-hplip.fdi
-%{_datadir}/hal/fdi/preprobe/10osvendor/20-hplip-devices.fdi
 %dir %{_sysconfdir}/hp
 %config(noreplace) %{_sysconfdir}/hp/hplip.conf
 %{_bindir}/hp-align
@@ -277,6 +280,7 @@
 %{_datadir}/hplip/data/images
 %{_datadir}/hplip/plugins
 %{_datadir}/hplip/ui
+%{_datadir}/hplip/ui4
 
 %files -n hpijs
 %defattr(-,root,root)
@@ -313,6 +317,12 @@
 exit 0
 
 %changelog
+* Tue Jan 13 2009 Tim Waugh <twaugh at redhat.com> 2.8.12-3
+- Make --qt4 the default for the systray applet, so that it appears
+  in the right place, again (bug #479751).
+- Removed hal preprobe rules as they were causing breakage
+  (bug #479648).
+
 * Mon Jan 12 2009 Tim Waugh <twaugh at redhat.com> 2.8.12-2
 - Don't write to system-wide configuration file (bug #479178).
 



From twaugh at fedoraproject.org  Tue Jan 13 13:20:28 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Tue, 13 Jan 2009 13:20:28 +0000 (UTC)
Subject: rpms/hplip/devel hplip.spec,1.193,1.194
Message-ID: <20090113132028.4133670129@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/hplip/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21192

Modified Files:
	hplip.spec 
Log Message:
* Tue Jan 13 2009 Tim Waugh <twaugh at redhat.com> 2.8.12-3
- Make --qt4 the default for the systray applet, so that it appears
  in the right place, again (bug #479751).
- Removed hal preprobe rules as they were causing breakage
  (bug #479648).



Index: hplip.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/devel/hplip.spec,v
retrieving revision 1.193
retrieving revision 1.194
diff -u -r1.193 -r1.194
--- hplip.spec	12 Jan 2009 18:41:08 -0000	1.193
+++ hplip.spec	13 Jan 2009 13:19:57 -0000	1.194
@@ -1,7 +1,7 @@
 Summary: HP Linux Imaging and Printing Project
 Name: hplip
 Version: 2.8.12
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+ and MIT
 Group: System Environment/Daemons
 Conflicts: system-config-printer < 0.6.132
@@ -126,7 +126,8 @@
 %build
 %configure --disable-foomatic-xml-install --disable-cups-install \
 	--enable-scan-build --enable-gui-build --enable-fax-build \
-	--disable-foomatic-rip-hplip-install --enable-dbus
+	--disable-foomatic-rip-hplip-install --enable-dbus \
+	--enable-qt4
 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,6 +177,9 @@
 # window), so don't ship the launcher yet.
 rm -f %{buildroot}%{_sysconfdir}/xdg/autostart/hplip-systray.desktop
 
+# Remove the hal preprobe rules as they were causing breakage (bug #479648).
+rm -f %{buildroot}%{_datadir}/hal/fdi/preprobe/10osvendor/20-hplip-devices.fdi
+
 %clean
 rm -rf %{buildroot}
 
@@ -183,7 +187,6 @@
 %defattr(-,root,root)
 %doc COPYING doc/*
 %{_datadir}/hal/fdi/policy/10osvendor/10-hplip.fdi
-%{_datadir}/hal/fdi/preprobe/10osvendor/20-hplip-devices.fdi
 %dir %{_sysconfdir}/hp
 %config(noreplace) %{_sysconfdir}/hp/hplip.conf
 %{_bindir}/hp-align
@@ -277,6 +280,7 @@
 %{_datadir}/hplip/data/images
 %{_datadir}/hplip/plugins
 %{_datadir}/hplip/ui
+%{_datadir}/hplip/ui4
 
 %files -n hpijs
 %defattr(-,root,root)
@@ -313,6 +317,12 @@
 exit 0
 
 %changelog
+* Tue Jan 13 2009 Tim Waugh <twaugh at redhat.com> 2.8.12-3
+- Make --qt4 the default for the systray applet, so that it appears
+  in the right place, again (bug #479751).
+- Removed hal preprobe rules as they were causing breakage
+  (bug #479648).
+
 * Mon Jan 12 2009 Tim Waugh <twaugh at redhat.com> 2.8.12-2
 - Don't write to system-wide configuration file (bug #479178).
 



From rakesh at fedoraproject.org  Tue Jan 13 13:22:10 2009
From: rakesh at fedoraproject.org (Rakesh Pandit)
Date: Tue, 13 Jan 2009 13:22:10 +0000 (UTC)
Subject: rpms/gdmap/F-10 gdmap.spec,1.11,1.12 import.log,1.2,1.3
Message-ID: <20090113132210.7D04570129@cvs1.fedora.phx.redhat.com>

Author: rakesh

Update of /cvs/pkgs/rpms/gdmap/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21446/F-10

Modified Files:
	gdmap.spec import.log 
Log Message:
Escaped macros in changelog to make rpmlint silent.
Removed mixed space and tab and bumped to make for tags.



Index: gdmap.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdmap/F-10/gdmap.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- gdmap.spec	13 Jan 2009 10:08:03 -0000	1.11
+++ gdmap.spec	13 Jan 2009 13:21:40 -0000	1.12
@@ -1,6 +1,6 @@
 Name:	gdmap
 Version:	0.8.1
-Release:	1%{?dist}
+Release:	3%{?dist}
 Summary:	A tool which allows to visualize disk space
 
 Group:	Applications/System
@@ -8,7 +8,7 @@
 License:	GPL+
 URL:	http://gdmap.sourceforge.net
 Source0:	http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
-Patch0:         %{name}-0.8.1-desktop.patch
+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, pkgconfig
@@ -33,10 +33,10 @@
 
 
 desktop-file-install --vendor fedora --delete-original \
-  --add-category X-Fedora                              \
-  --add-category System                                \
-  --dir $RPM_BUILD_ROOT%{_datadir}/applications        \
-  $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
+	--add-category X-Fedora \
+	--add-category System \
+	--dir $RPM_BUILD_ROOT%{_datadir}/applications \
+	$RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
 
 %find_lang GdMap
 
@@ -56,6 +56,13 @@
 
 
 %changelog
+* Tue Jan 13 2009 Rakesh Pandit <rakesh at fedoraproject.org> - 0.8.1-3
+- Bumped
+
+* Tue Jan 13 2009 Rakesh Pandit <rakesh at fedoraproject.org> - 0.8.1-2
+- Escaped macros in changelog to make rpmlint silent.
+- Removed mixed space and tab.
+
 * Tue Sep 16 2008 Matt Domsch <mdomsch at fedoraproject.org> - 0.8.1-1
 - update to 0.8.1, fix FTBFS BZ#434529
 
@@ -75,12 +82,12 @@
 - Fixed Desktop file
 
 * Fri Jul 7 2006 Damien Durand <splinux at fedoraproject.org> - 0.7.5-3
-- Fixed mixed-use-of-spaces-and-tabs and %find_lang in changelog
+- Fixed mixed-use-of-spaces-and-tabs and %%find_lang in changelog
 - added category System and delete-original in desktop-file-install
 
 * Tue Apr 6 2006 Damien Durand <splinux at fedoraproject.org> - 0.7.5-2
 - Fixed Buidrequires, add intltool
-- Fixed locales, add %find_lang GdMap and %%files -f GdMap.lang and remove {_datadir}/locales
+- Fixed locales, add %%find_lang GdMap and %%files -f GdMap.lang and remove {_datadir}/locales
 
 * Tue Apr 6 2006 Damien Durand <splinux at fedoraproject.org> - 0.7.5-1
 - Initial package


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/gdmap/F-10/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	11 Jan 2009 18:55:36 -0000	1.2
+++ import.log	13 Jan 2009 13:21:40 -0000	1.3
@@ -1,2 +1,3 @@
 gdmap-0_8_1-1_fc10:F-10:gdmap-0.8.1-1.fc10.src.rpm:1231699066
 gdmap-0_8_1-2_fc10:F-10:gdmap-0.8.1-2.fc10.src.rpm:1231699963
+gdmap-0_8_1-3_fc10:F-10:gdmap-0.8.1-3.fc10.src.rpm:1231852688



From rakesh at fedoraproject.org  Tue Jan 13 13:46:33 2009
From: rakesh at fedoraproject.org (Rakesh Pandit)
Date: Tue, 13 Jan 2009 13:46:33 +0000 (UTC)
Subject: rpms/gdmap/F-9 gdmap-0.8.1-desktop.patch, NONE, 1.1 gdmap.spec, 1.7,
	1.8 import.log, 1.1, 1.2
Message-ID: <20090113134633.99F0E70129@cvs1.fedora.phx.redhat.com>

Author: rakesh

Update of /cvs/pkgs/rpms/gdmap/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25246/F-9

Modified Files:
	gdmap.spec import.log 
Added Files:
	gdmap-0.8.1-desktop.patch 
Log Message:
Updated to 0.8.1 and added desktop patch.
Escaped macros in changelog to make rpmlint silent.
Removed mixed space and tab.


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/pkgs/rpms/gdmap/F-9/gdmap.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- gdmap.spec	13 Jan 2009 10:17:28 -0000	1.7
+++ gdmap.spec	13 Jan 2009 13:46:02 -0000	1.8
@@ -1,15 +1,17 @@
 Name:	gdmap
-Version:	0.7.5
-Release:	7%{?dist}
+Version:	0.8.1
+Release:	3%{?dist}
 Summary:	A tool which allows to visualize disk space
 
 Group:	Applications/System
-License:	GPL
+# 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
@@ -18,7 +20,7 @@
 
 %prep
 %setup -q
-
+%patch0 -p1
 
 %build
 %configure
@@ -31,10 +33,10 @@
 
 
 desktop-file-install --vendor fedora --delete-original \
-  --add-category X-Fedora                              \
-  --add-category System                                \
-  --dir $RPM_BUILD_ROOT%{_datadir}/applications        \
-  $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
+	--add-category X-Fedora \
+	--add-category System \
+	--dir $RPM_BUILD_ROOT%{_datadir}/applications \
+	$RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
 
 %find_lang GdMap
 
@@ -47,12 +49,23 @@
 %doc COPYING
 %{_bindir}/%{name}
 %{_datadir}/applications/*.desktop
-%{_datadir}/%{name}/pixmaps/*
-%{_datadir}/pixmaps/*
+%dir %{_datadir}/%{name}
+%{_datadir}/%{name}/pixmaps/%{name}*
+%{_datadir}/pixmaps/%{name}*
 %{_mandir}/man1/*
 
 
 %changelog
+* Tue Jan 13 2009 Rakesh Pandit <rakesh at fedoraproject.org> - 0.8.1-3
+- Fixing URL and unowned directories.
+
+* Tue Jan 13 2009 Rakesh Pandit <rakesh at fedoraproject.org> - 0.8.1-2
+- Escaped macros in changelog to make rpmlint silent.
+- Removed mixed space and tab.
+
+* Tue Jan 13 2009 Rakesh Pandit <rakesh at fedoraproject.org> - 0.8.1-1
+- Updated to 0.8.1 and added the desktop file patch.
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.7.5-7
 - Autorebuild for GCC 4.3
 
@@ -66,12 +79,12 @@
 - Fixed Desktop file
 
 * Fri Jul 7 2006 Damien Durand <splinux at fedoraproject.org> - 0.7.5-3
-- Fixed mixed-use-of-spaces-and-tabs and %find_lang in changelog
+- Fixed mixed-use-of-spaces-and-tabs and %%find_lang in changelog
 - added category System and delete-original in desktop-file-install
 
 * Tue Apr 6 2006 Damien Durand <splinux at fedoraproject.org> - 0.7.5-2
 - Fixed Buidrequires, add intltool
-- Fixed locales, add %find_lang GdMap and %%files -f GdMap.lang and remove {_datadir}/locales
+- Fixed locales, add %%find_lang GdMap and %%files -f GdMap.lang and remove {_datadir}/locales
 
 * Tue Apr 6 2006 Damien Durand <splinux at fedoraproject.org> - 0.7.5-1
 - Initial package


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/gdmap/F-9/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	11 Jan 2009 19:51:21 -0000	1.1
+++ import.log	13 Jan 2009 13:46:02 -0000	1.2
@@ -1 +1,2 @@
 gdmap-0_8_1-2_fc10:F-9:gdmap-0.8.1-2.fc10.src.rpm:1231703216
+gdmap-0_8_1-3_fc10:F-9:gdmap-0.8.1-3.fc10.src.rpm:1231854154



From twaugh at fedoraproject.org  Tue Jan 13 13:56:03 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Tue, 13 Jan 2009 13:56:03 +0000 (UTC)
Subject: rpms/hal-cups-utils/devel hal-cups-utils-0.6.19.tar.gz.sig, NONE,
	1.1 .cvsignore, 1.26, 1.27 hal-cups-utils.spec, 1.74,
	1.75 sources, 1.26, 1.27 hal-cups-utils-git.patch, 1.2, NONE
Message-ID: <20090113135603.206CF70129@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/hal-cups-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26514

Modified Files:
	.cvsignore hal-cups-utils.spec sources 
Added Files:
	hal-cups-utils-0.6.19.tar.gz.sig 
Removed Files:
	hal-cups-utils-git.patch 
Log Message:
* Tue Jan 13 2009 Tim Waugh <twaugh at redhat.com> 0.6.19-1
- 0.6.19.



--- NEW FILE hal-cups-utils-0.6.19.tar.gz.sig ---
?>

Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hal-cups-utils/devel/.cvsignore,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- .cvsignore	7 Jul 2008 17:38:08 -0000	1.26
+++ .cvsignore	13 Jan 2009 13:55:32 -0000	1.27
@@ -14,3 +14,4 @@
 hal-cups-utils-0.6.15.tar.gz
 hal-cups-utils-0.6.16.tar.gz
 hal-cups-utils-0.6.17.tar.gz
+hal-cups-utils-0.6.19.tar.gz


Index: hal-cups-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hal-cups-utils/devel/hal-cups-utils.spec,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- hal-cups-utils.spec	24 Oct 2008 16:27:04 -0000	1.74
+++ hal-cups-utils.spec	13 Jan 2009 13:55:32 -0000	1.75
@@ -1,14 +1,13 @@
 Summary: Halified CUPS utilities 
 Name: hal-cups-utils
-Version: 0.6.17
-Release: 4%{?dist}
+Version: 0.6.19
+Release: 1%{?dist}
 License: GPLv2
 Group: Applications/System
 URL: https://fedorahosted.org/hal-cups-utils
 # Add "?format=raw" to the following URL to download file:
 Source: https://fedorahosted.org/hal-cups-utils/attachment/wiki/ProjectReleases/%{name}-%{version}.tar.gz
 Source1: cups-config-daemon
-Patch1: hal-cups-utils-git.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: glib2-devel
 BuildRequires: dbus-devel >= 0.60
@@ -30,7 +29,6 @@
 rm -rf $RPM_BUILD_ROOT
 
 %setup -q
-%patch1 -p1 -b .git
 
 %build
 
@@ -62,6 +60,9 @@
 %{_initrddir}/cups-config-daemon
 
 %changelog
+* Tue Jan 13 2009 Tim Waugh <twaugh at redhat.com> 0.6.19-1
+- 0.6.19.
+
 * Fri Oct 24 2008 Tim Waugh <twaugh at redhat.com> 0.6.17-4
 - Don't fail due to missing usb Python module (bug #468408).
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hal-cups-utils/devel/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- sources	7 Jul 2008 17:38:08 -0000	1.26
+++ sources	13 Jan 2009 13:55:32 -0000	1.27
@@ -1 +1 @@
-deaf77a71d3610c8df8a2328bef063b1  hal-cups-utils-0.6.17.tar.gz
+58e1c8f5597dd39e57dcf3c4aabe60f8  hal-cups-utils-0.6.19.tar.gz


--- hal-cups-utils-git.patch DELETED ---



From twaugh at fedoraproject.org  Tue Jan 13 13:56:38 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Tue, 13 Jan 2009 13:56:38 +0000 (UTC)
Subject: rpms/hal-cups-utils/F-10 hal-cups-utils-0.6.19.tar.gz.sig, NONE,
	1.1 .cvsignore, 1.26, 1.27 hal-cups-utils.spec, 1.74,
	1.75 sources, 1.26, 1.27 hal-cups-utils-git.patch, 1.2, NONE
Message-ID: <20090113135638.8BB0370129@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/hal-cups-utils/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26611

Modified Files:
	.cvsignore hal-cups-utils.spec sources 
Added Files:
	hal-cups-utils-0.6.19.tar.gz.sig 
Removed Files:
	hal-cups-utils-git.patch 
Log Message:
* Tue Jan 13 2009 Tim Waugh <twaugh at redhat.com> 0.6.19-1
- 0.6.19.



--- NEW FILE hal-cups-utils-0.6.19.tar.gz.sig ---
?>

Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hal-cups-utils/F-10/.cvsignore,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- .cvsignore	7 Jul 2008 17:38:08 -0000	1.26
+++ .cvsignore	13 Jan 2009 13:56:08 -0000	1.27
@@ -14,3 +14,4 @@
 hal-cups-utils-0.6.15.tar.gz
 hal-cups-utils-0.6.16.tar.gz
 hal-cups-utils-0.6.17.tar.gz
+hal-cups-utils-0.6.19.tar.gz


Index: hal-cups-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hal-cups-utils/F-10/hal-cups-utils.spec,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- hal-cups-utils.spec	24 Oct 2008 16:27:04 -0000	1.74
+++ hal-cups-utils.spec	13 Jan 2009 13:56:08 -0000	1.75
@@ -1,14 +1,13 @@
 Summary: Halified CUPS utilities 
 Name: hal-cups-utils
-Version: 0.6.17
-Release: 4%{?dist}
+Version: 0.6.19
+Release: 1%{?dist}
 License: GPLv2
 Group: Applications/System
 URL: https://fedorahosted.org/hal-cups-utils
 # Add "?format=raw" to the following URL to download file:
 Source: https://fedorahosted.org/hal-cups-utils/attachment/wiki/ProjectReleases/%{name}-%{version}.tar.gz
 Source1: cups-config-daemon
-Patch1: hal-cups-utils-git.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: glib2-devel
 BuildRequires: dbus-devel >= 0.60
@@ -30,7 +29,6 @@
 rm -rf $RPM_BUILD_ROOT
 
 %setup -q
-%patch1 -p1 -b .git
 
 %build
 
@@ -62,6 +60,9 @@
 %{_initrddir}/cups-config-daemon
 
 %changelog
+* Tue Jan 13 2009 Tim Waugh <twaugh at redhat.com> 0.6.19-1
+- 0.6.19.
+
 * Fri Oct 24 2008 Tim Waugh <twaugh at redhat.com> 0.6.17-4
 - Don't fail due to missing usb Python module (bug #468408).
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hal-cups-utils/F-10/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- sources	7 Jul 2008 17:38:08 -0000	1.26
+++ sources	13 Jan 2009 13:56:08 -0000	1.27
@@ -1 +1,2 @@
 deaf77a71d3610c8df8a2328bef063b1  hal-cups-utils-0.6.17.tar.gz
+58e1c8f5597dd39e57dcf3c4aabe60f8  hal-cups-utils-0.6.19.tar.gz


--- hal-cups-utils-git.patch DELETED ---



From drago01 at fedoraproject.org  Tue Jan 13 14:01:26 2009
From: drago01 at fedoraproject.org (Adel Gadllah)
Date: Tue, 13 Jan 2009 14:01:26 +0000 (UTC)
Subject: rpms/pulseaudio/F-10 pulseaudio-0.9.14-mixer-select.patch, NONE,
	1.1 pulseaudio.spec, 1.64, 1.65
Message-ID: <20090113140126.32C9E70129@cvs1.fedora.phx.redhat.com>

Author: drago01

Update of /cvs/pkgs/rpms/pulseaudio/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27358

Modified Files:
	pulseaudio.spec 
Added Files:
	pulseaudio-0.9.14-mixer-select.patch 
Log Message:
Prefer mixer controls with volumes over switches

pulseaudio-0.9.14-mixer-select.patch:

--- NEW FILE pulseaudio-0.9.14-mixer-select.patch ---
From: Lennart Poettering <lennart at poettering.net>
Date: Thu, 8 Jan 2009 00:03:42 +0000 (+0100)
Subject: Prefer mixer controls with volumes over switches
X-Git-Url: http://git.0pointer.de/?p=pulseaudio.git;a=commitdiff_plain;h=c2450501af82d1c9d1994e4f4ce80d506d3c90ae

Prefer mixer controls with volumes over switches

When we look for a mixer control prefer controls that have both volume
and a mute switch over those that have only a volume switch over those
that only have a mute switch.

Originally pointed out by Adel Gadllah.
---

diff --git a/src/modules/alsa-util.c b/src/modules/alsa-util.c
index 75b84c4..ff3af19 100644
--- a/src/modules/alsa-util.c
+++ b/src/modules/alsa-util.c
@@ -760,8 +760,32 @@ int pa_alsa_prepare_mixer(snd_mixer_t *mixer, const char *dev) {
     return 0;
 }
 
-snd_mixer_elem_t *pa_alsa_find_elem(snd_mixer_t *mixer, const char *name, const char *fallback) {
-    snd_mixer_elem_t *elem;
+static pa_bool_t elem_has_volume(snd_mixer_elem_t *elem, pa_bool_t playback) {
+    pa_assert(elem);
+
+    if (playback && snd_mixer_selem_has_playback_volume(elem))
+        return TRUE;
+
+    if (!playback && snd_mixer_selem_has_capture_volume(elem))
+        return TRUE;
+
+    return FALSE;
+}
+
+static pa_bool_t elem_has_switch(snd_mixer_elem_t *elem, pa_bool_t playback) {
+    pa_assert(elem);
+
+    if (playback && snd_mixer_selem_has_playback_switch(elem))
+        return TRUE;
+
+    if (!playback && snd_mixer_selem_has_capture_switch(elem))
+        return TRUE;
+
+    return FALSE;
+}
+
+snd_mixer_elem_t *pa_alsa_find_elem(snd_mixer_t *mixer, const char *name, const char *fallback, pa_bool_t playback) {
+    snd_mixer_elem_t *elem = NULL, *fallback_elem = NULL;
     snd_mixer_selem_id_t *sid = NULL;
 
     snd_mixer_selem_id_alloca(&sid);
@@ -771,17 +795,57 @@ snd_mixer_elem_t *pa_alsa_find_elem(snd_mixer_t *mixer, const char *name, const
 
     snd_mixer_selem_id_set_name(sid, name);
 
-    if (!(elem = snd_mixer_find_selem(mixer, sid))) {
-        pa_log_info("Cannot find mixer control \"%s\".", snd_mixer_selem_id_get_name(sid));
+    if ((elem = snd_mixer_find_selem(mixer, sid))) {
+
+        if (elem_has_volume(elem, playback) &&
+            elem_has_switch(elem, playback))
+            goto success;
+
+        if (!elem_has_volume(elem, playback) &&
+            !elem_has_switch(elem, playback))
+            elem = NULL;
+    }
+
+    pa_log_info("Cannot find mixer control \"%s\" or mixer control is no combination of switch/volume.", snd_mixer_selem_id_get_name(sid));
+
+    if (fallback) {
+        snd_mixer_selem_id_set_name(sid, fallback);
+
+        if ((fallback_elem = snd_mixer_find_selem(mixer, sid))) {
+
+            if (elem_has_volume(fallback_elem, playback) &&
+                elem_has_switch(fallback_elem, playback)) {
+                elem = fallback_elem;
+                goto success;
+            }
+
+            if (!elem_has_volume(fallback_elem, playback) &&
+                !elem_has_switch(fallback_elem, playback))
+                fallback_elem = NULL;
+        }
+
+        pa_log_warn("Cannot find fallback mixer control \"%s\" or mixer control is no combination of switch/volume.", snd_mixer_selem_id_get_name(sid));
+    }
+
+    if (elem && fallback_elem) {
 
-        if (fallback) {
-            snd_mixer_selem_id_set_name(sid, fallback);
+        /* Hmm, so we have both elements, but neither has both mute
+         * and volume. Let's prefer the one with the volume */
 
-            if (!(elem = snd_mixer_find_selem(mixer, sid)))
-                pa_log_warn("Cannot find fallback mixer control \"%s\".", snd_mixer_selem_id_get_name(sid));
+        if (elem_has_volume(elem, playback))
+            goto success;
+
+        if (elem_has_volume(fallback_elem, playback)) {
+            elem = fallback_elem;
+            goto success;
         }
     }
 
+    if (!elem && fallback_elem)
+        elem = fallback_elem;
+
+success:
+
     if (elem)
         pa_log_info("Using mixer control \"%s\".", snd_mixer_selem_id_get_name(sid));
 
diff --git a/src/modules/alsa-util.h b/src/modules/alsa-util.h
index aaa01c7..95bb983 100644
--- a/src/modules/alsa-util.h
+++ b/src/modules/alsa-util.h
@@ -52,7 +52,7 @@ int pa_alsa_set_hw_params(
 int pa_alsa_set_sw_params(snd_pcm_t *pcm, snd_pcm_uframes_t avail_min);
 
 int pa_alsa_prepare_mixer(snd_mixer_t *mixer, const char *dev);
-snd_mixer_elem_t *pa_alsa_find_elem(snd_mixer_t *mixer, const char *name, const char *fallback);
+snd_mixer_elem_t *pa_alsa_find_elem(snd_mixer_t *mixer, const char *name, const char *fallback, pa_bool_t playback);
 
 snd_pcm_t *pa_alsa_open_by_device_id(
         const char *dev_id,
diff --git a/src/modules/module-alsa-sink.c b/src/modules/module-alsa-sink.c
index 6dea172..95a8c97 100644
--- a/src/modules/module-alsa-sink.c
+++ b/src/modules/module-alsa-sink.c
@@ -1409,7 +1409,7 @@ int pa__init(pa_module*m) {
         }
 
         if (found)
-            if (!(u->mixer_elem = pa_alsa_find_elem(u->mixer_handle, "Master", "PCM")))
+            if (!(u->mixer_elem = pa_alsa_find_elem(u->mixer_handle, "Master", "PCM", TRUE)))
                 found = FALSE;
 
         if (!found) {
diff --git a/src/modules/module-alsa-source.c b/src/modules/module-alsa-source.c
index f796ef1..b6c6ed1 100644
--- a/src/modules/module-alsa-source.c
+++ b/src/modules/module-alsa-source.c
@@ -1236,7 +1236,7 @@ int pa__init(pa_module*m) {
         }
 
         if (found)
-            if (!(u->mixer_elem = pa_alsa_find_elem(u->mixer_handle, "Capture", "Mic")))
+            if (!(u->mixer_elem = pa_alsa_find_elem(u->mixer_handle, "Capture", "Mic", FALSE)))
                 found = FALSE;
 
         if (!found) {



Index: pulseaudio.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pulseaudio/F-10/pulseaudio.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- pulseaudio.spec	13 Jan 2009 12:32:18 -0000	1.64
+++ pulseaudio.spec	13 Jan 2009 14:00:55 -0000	1.65
@@ -3,7 +3,7 @@
 Name:		pulseaudio
 Summary: 	Improved Linux sound server
 Version:	0.9.14
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GPLv2+
 Group:		System Environment/Daemons
 Source0:	http://0pointer.de/lennart/projects/pulseaudio/pulseaudio-%{version}.tar.gz
@@ -26,6 +26,8 @@
 BuildRequires: intltool
 Requires:	%{name}-core-libs = %{version}-%{release}
 Obsoletes:	pulseaudio-devel
+#upstream commit c245050
+Patch1:		pulseaudio-0.9.14-mixer-select.patch
 
 %description
 PulseAudio is a sound server for Linux and other Unix like operating 
@@ -163,6 +165,7 @@
 
 %prep
 %setup -q -T -b0
+%patch1 -p1 -b .mixer-select
 
 %build
 CFLAGS="-ggdb" %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
@@ -394,6 +397,9 @@
 %{_mandir}/man1/pax11publish.1.gz
 
 %changelog
+* Tue Jan 13 2009 Adel Gadllah <adel.gadllah at gmail.com> 0.9.14-2
+- Prefer mixer controls with volumes over switches
+
 * Tue Jan 13 2009 Lennart Poettering <lpoetter at redhat.com> 0.9.14-1
 - New release, incorporating all 24 patches we were shipping in the rpm plus
   quite a few more fixes.



From drago01 at fedoraproject.org  Tue Jan 13 14:01:37 2009
From: drago01 at fedoraproject.org (Adel Gadllah)
Date: Tue, 13 Jan 2009 14:01:37 +0000 (UTC)
Subject: rpms/pulseaudio/devel pulseaudio-0.9.14-mixer-select.patch, NONE,
	1.1 pulseaudio.spec, 1.65, 1.66
Message-ID: <20090113140137.DA3E270129@cvs1.fedora.phx.redhat.com>

Author: drago01

Update of /cvs/pkgs/rpms/pulseaudio/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27425

Modified Files:
	pulseaudio.spec 
Added Files:
	pulseaudio-0.9.14-mixer-select.patch 
Log Message:
Prefer mixer controls with volumes over switches

pulseaudio-0.9.14-mixer-select.patch:

--- NEW FILE pulseaudio-0.9.14-mixer-select.patch ---
From: Lennart Poettering <lennart at poettering.net>
Date: Thu, 8 Jan 2009 00:03:42 +0000 (+0100)
Subject: Prefer mixer controls with volumes over switches
X-Git-Url: http://git.0pointer.de/?p=pulseaudio.git;a=commitdiff_plain;h=c2450501af82d1c9d1994e4f4ce80d506d3c90ae

Prefer mixer controls with volumes over switches

When we look for a mixer control prefer controls that have both volume
and a mute switch over those that have only a volume switch over those
that only have a mute switch.

Originally pointed out by Adel Gadllah.
---

diff --git a/src/modules/alsa-util.c b/src/modules/alsa-util.c
index 75b84c4..ff3af19 100644
--- a/src/modules/alsa-util.c
+++ b/src/modules/alsa-util.c
@@ -760,8 +760,32 @@ int pa_alsa_prepare_mixer(snd_mixer_t *mixer, const char *dev) {
     return 0;
 }
 
-snd_mixer_elem_t *pa_alsa_find_elem(snd_mixer_t *mixer, const char *name, const char *fallback) {
-    snd_mixer_elem_t *elem;
+static pa_bool_t elem_has_volume(snd_mixer_elem_t *elem, pa_bool_t playback) {
+    pa_assert(elem);
+
+    if (playback && snd_mixer_selem_has_playback_volume(elem))
+        return TRUE;
+
+    if (!playback && snd_mixer_selem_has_capture_volume(elem))
+        return TRUE;
+
+    return FALSE;
+}
+
+static pa_bool_t elem_has_switch(snd_mixer_elem_t *elem, pa_bool_t playback) {
+    pa_assert(elem);
+
+    if (playback && snd_mixer_selem_has_playback_switch(elem))
+        return TRUE;
+
+    if (!playback && snd_mixer_selem_has_capture_switch(elem))
+        return TRUE;
+
+    return FALSE;
+}
+
+snd_mixer_elem_t *pa_alsa_find_elem(snd_mixer_t *mixer, const char *name, const char *fallback, pa_bool_t playback) {
+    snd_mixer_elem_t *elem = NULL, *fallback_elem = NULL;
     snd_mixer_selem_id_t *sid = NULL;
 
     snd_mixer_selem_id_alloca(&sid);
@@ -771,17 +795,57 @@ snd_mixer_elem_t *pa_alsa_find_elem(snd_mixer_t *mixer, const char *name, const
 
     snd_mixer_selem_id_set_name(sid, name);
 
-    if (!(elem = snd_mixer_find_selem(mixer, sid))) {
-        pa_log_info("Cannot find mixer control \"%s\".", snd_mixer_selem_id_get_name(sid));
+    if ((elem = snd_mixer_find_selem(mixer, sid))) {
+
+        if (elem_has_volume(elem, playback) &&
+            elem_has_switch(elem, playback))
+            goto success;
+
+        if (!elem_has_volume(elem, playback) &&
+            !elem_has_switch(elem, playback))
+            elem = NULL;
+    }
+
+    pa_log_info("Cannot find mixer control \"%s\" or mixer control is no combination of switch/volume.", snd_mixer_selem_id_get_name(sid));
+
+    if (fallback) {
+        snd_mixer_selem_id_set_name(sid, fallback);
+
+        if ((fallback_elem = snd_mixer_find_selem(mixer, sid))) {
+
+            if (elem_has_volume(fallback_elem, playback) &&
+                elem_has_switch(fallback_elem, playback)) {
+                elem = fallback_elem;
+                goto success;
+            }
+
+            if (!elem_has_volume(fallback_elem, playback) &&
+                !elem_has_switch(fallback_elem, playback))
+                fallback_elem = NULL;
+        }
+
+        pa_log_warn("Cannot find fallback mixer control \"%s\" or mixer control is no combination of switch/volume.", snd_mixer_selem_id_get_name(sid));
+    }
+
+    if (elem && fallback_elem) {
 
-        if (fallback) {
-            snd_mixer_selem_id_set_name(sid, fallback);
+        /* Hmm, so we have both elements, but neither has both mute
+         * and volume. Let's prefer the one with the volume */
 
-            if (!(elem = snd_mixer_find_selem(mixer, sid)))
-                pa_log_warn("Cannot find fallback mixer control \"%s\".", snd_mixer_selem_id_get_name(sid));
+        if (elem_has_volume(elem, playback))
+            goto success;
+
+        if (elem_has_volume(fallback_elem, playback)) {
+            elem = fallback_elem;
+            goto success;
         }
     }
 
+    if (!elem && fallback_elem)
+        elem = fallback_elem;
+
+success:
+
     if (elem)
         pa_log_info("Using mixer control \"%s\".", snd_mixer_selem_id_get_name(sid));
 
diff --git a/src/modules/alsa-util.h b/src/modules/alsa-util.h
index aaa01c7..95bb983 100644
--- a/src/modules/alsa-util.h
+++ b/src/modules/alsa-util.h
@@ -52,7 +52,7 @@ int pa_alsa_set_hw_params(
 int pa_alsa_set_sw_params(snd_pcm_t *pcm, snd_pcm_uframes_t avail_min);
 
 int pa_alsa_prepare_mixer(snd_mixer_t *mixer, const char *dev);
-snd_mixer_elem_t *pa_alsa_find_elem(snd_mixer_t *mixer, const char *name, const char *fallback);
+snd_mixer_elem_t *pa_alsa_find_elem(snd_mixer_t *mixer, const char *name, const char *fallback, pa_bool_t playback);
 
 snd_pcm_t *pa_alsa_open_by_device_id(
         const char *dev_id,
diff --git a/src/modules/module-alsa-sink.c b/src/modules/module-alsa-sink.c
index 6dea172..95a8c97 100644
--- a/src/modules/module-alsa-sink.c
+++ b/src/modules/module-alsa-sink.c
@@ -1409,7 +1409,7 @@ int pa__init(pa_module*m) {
         }
 
         if (found)
-            if (!(u->mixer_elem = pa_alsa_find_elem(u->mixer_handle, "Master", "PCM")))
+            if (!(u->mixer_elem = pa_alsa_find_elem(u->mixer_handle, "Master", "PCM", TRUE)))
                 found = FALSE;
 
         if (!found) {
diff --git a/src/modules/module-alsa-source.c b/src/modules/module-alsa-source.c
index f796ef1..b6c6ed1 100644
--- a/src/modules/module-alsa-source.c
+++ b/src/modules/module-alsa-source.c
@@ -1236,7 +1236,7 @@ int pa__init(pa_module*m) {
         }
 
         if (found)
-            if (!(u->mixer_elem = pa_alsa_find_elem(u->mixer_handle, "Capture", "Mic")))
+            if (!(u->mixer_elem = pa_alsa_find_elem(u->mixer_handle, "Capture", "Mic", FALSE)))
                 found = FALSE;
 
         if (!found) {



Index: pulseaudio.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pulseaudio/devel/pulseaudio.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- pulseaudio.spec	13 Jan 2009 12:11:06 -0000	1.65
+++ pulseaudio.spec	13 Jan 2009 14:01:07 -0000	1.66
@@ -3,7 +3,7 @@
 Name:		pulseaudio
 Summary: 	Improved Linux sound server
 Version:	0.9.14
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GPLv2+
 Group:		System Environment/Daemons
 Source0:	http://0pointer.de/lennart/projects/pulseaudio/pulseaudio-%{version}.tar.gz
@@ -26,6 +26,8 @@
 BuildRequires: intltool
 Requires:	%{name}-core-libs = %{version}-%{release}
 Obsoletes:	pulseaudio-devel
+#upstream commit c245050
+Patch1:		pulseaudio-0.9.14-mixer-select.patch
 
 %description
 PulseAudio is a sound server for Linux and other Unix like operating 
@@ -163,6 +165,7 @@
 
 %prep
 %setup -q -T -b0
+%patch1 -p1 -b .mixer-select
 
 %build
 CFLAGS="-ggdb" %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
@@ -394,6 +397,9 @@
 %{_mandir}/man1/pax11publish.1.gz
 
 %changelog
+* Tue Jan 13 2009 Adel Gadllah <adel.gadllah at gmail.com> 0.9.14-2
+- Prefer mixer controls with volumes over switches
+
 * Tue Jan 13 2009 Lennart Poettering <lpoetter at redhat.com> 0.9.14-1
 - New release
 



From dwalsh at fedoraproject.org  Tue Jan 13 14:01:42 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Tue, 13 Jan 2009 14:01:42 +0000 (UTC)
Subject: rpms/policycoreutils/devel .cvsignore, 1.191,
	1.192 policycoreutils-rhat.patch, 1.406,
	1.407 policycoreutils-sepolgen.patch, 1.18,
	1.19 policycoreutils.spec, 1.580, 1.581 sources, 1.196, 1.197
Message-ID: <20090113140142.4D42C70129@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/policycoreutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27458

Modified Files:
	.cvsignore policycoreutils-rhat.patch 
	policycoreutils-sepolgen.patch policycoreutils.spec sources 
Log Message:
* Tue Jan 13 2009 Dan Walsh <dwalsh at redhat.com> 2.0.61-1
- Update to upstream
	* chcat: cut categories at arbitrary point (25) from Dan Walsh
	* semodule: use new interfaces in libsemanage for compressed files
	  from Dan Walsh
	* audit2allow: string changes for usage



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/.cvsignore,v
retrieving revision 1.191
retrieving revision 1.192
diff -u -r1.191 -r1.192
--- .cvsignore	1 Dec 2008 16:49:49 -0000	1.191
+++ .cvsignore	13 Jan 2009 14:01:10 -0000	1.192
@@ -193,3 +193,4 @@
 policycoreutils-2.0.59.tgz
 policycoreutils-2.0.60.tgz
 sepolgen-1.0.14.tgz
+policycoreutils-2.0.61.tgz

policycoreutils-rhat.patch:

Index: policycoreutils-rhat.patch
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils-rhat.patch,v
retrieving revision 1.406
retrieving revision 1.407
diff -u -r1.406 -r1.407
--- policycoreutils-rhat.patch	6 Jan 2009 14:12:27 -0000	1.406
+++ policycoreutils-rhat.patch	13 Jan 2009 14:01:10 -0000	1.407
@@ -1,54 +1,7 @@
-diff --exclude-from=exclude --exclude=sepolgen-1.0.14 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/audit2allow/audit2allow policycoreutils-2.0.60/audit2allow/audit2allow
---- nsapolicycoreutils/audit2allow/audit2allow	2008-11-10 08:53:49.000000000 -0500
-+++ policycoreutils-2.0.60/audit2allow/audit2allow	2008-12-15 15:34:54.000000000 -0500
-@@ -42,10 +42,10 @@
-         from optparse import OptionParser
- 
-         parser = OptionParser(version=self.VERSION)
--        parser.add_option("-a", "--audit", action="store_true", dest="audit", default=False,
-+        parser.add_option("-a", "--all", action="store_true", dest="audit", default=False,
-                           help="read input from audit log - conflicts with -i")
-         parser.add_option("-d", "--dmesg", action="store_true", dest="dmesg", default=False,
--                          help="read input from dmesg - conflicts with --audit and --input")
-+                          help="read input from dmesg - conflicts with --all and --input")
-         parser.add_option("-i", "--input", dest="input",
-                           help="read input from <input> - conflicts with -a")
-         parser.add_option("-l", "--lastreload", action="store_true", dest="lastreload", default=False,
-@@ -82,9 +82,9 @@
-         # Make -d, -a, and -i conflict
-         if options.audit is True:
-             if options.input is not None:
--                sys.stderr.write("error: --audit conflicts with --input\n")
-+                sys.stderr.write("error: --all conflicts with --input\n")
-             if options.dmesg is True:
--                sys.stderr.write("error: --audit conflicts with --dmesg\n")
-+                sys.stderr.write("error: --all conflicts with --dmesg\n")
-         if options.input is not None and options.dmesg is True:
-             sys.stderr.write("error: --input conflicts with --dmesg\n")
- 
-@@ -200,7 +200,7 @@
-         try:
-             fd = open(filename, "w")
-         except IOError, e:
--            sys.stderr.write("could not write output file: %s\n", str(e))
-+            sys.stderr.write("could not write output file: %s\n" % str(e))
-             sys.exit(1)
- 
-         writer.write(generator.get_module(), fd)
 diff --exclude-from=exclude --exclude=sepolgen-1.0.14 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/audit2allow/audit2allow.1 policycoreutils-2.0.60/audit2allow/audit2allow.1
---- nsapolicycoreutils/audit2allow/audit2allow.1	2008-11-10 08:53:49.000000000 -0500
+--- nsapolicycoreutils/audit2allow/audit2allow.1	2009-01-13 08:45:35.000000000 -0500
 +++ policycoreutils-2.0.60/audit2allow/audit2allow.1	2008-12-15 15:35:46.000000000 -0500
-@@ -44,9 +44,6 @@
- Note that all audit messages are not available via dmesg when
- auditd is running; use "ausearch -m avc | audit2allow"  or "-a" instead.
- .TP
--.B "\-f" | "\-\-fcfile" <File Context File>
--Add File Context File to generated Module Package. Requires -M option.
--.TP
- .B "\-h" | "\-\-help"
- Print a short usage message
- .TP
-@@ -78,9 +75,6 @@
+@@ -75,9 +75,6 @@
  Generate reference policy using installed macros.
  This attempts to match denials against interfaces and may be inaccurate.
  .TP
@@ -116,21 +69,9 @@
  	if (prev_utmp_ptr) {
  		changed = strings_list_diff(prev_utmp_ptr, utmp_ptr);
  		strings_list_free(prev_utmp_ptr);
-diff --exclude-from=exclude --exclude=sepolgen-1.0.14 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/scripts/chcat policycoreutils-2.0.60/scripts/chcat
---- nsapolicycoreutils/scripts/chcat	2008-08-28 09:34:24.000000000 -0400
-+++ policycoreutils-2.0.60/scripts/chcat	2008-12-15 15:34:54.000000000 -0500
-@@ -291,6 +291,8 @@
-             for i in c.split(","):
-                 if i not in newcats:
-                     newcats.append(i)
-+    if len(newcats) > 25:
-+        return cats
-     return newcats
- 
- def translate(cats):
 diff --exclude-from=exclude --exclude=sepolgen-1.0.14 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/semanage policycoreutils-2.0.60/semanage/semanage
 --- nsapolicycoreutils/semanage/semanage	2008-11-14 17:10:15.000000000 -0500
-+++ policycoreutils-2.0.60/semanage/semanage	2009-01-05 14:07:44.000000000 -0500
++++ policycoreutils-2.0.60/semanage/semanage	2009-01-13 08:55:07.000000000 -0500
 @@ -219,6 +219,7 @@
  					     'seuser=',
  					     'store=',
@@ -140,79 +81,9 @@
  					     'roles=',
  					     'type=',
 diff --exclude-from=exclude --exclude=sepolgen-1.0.14 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semodule/semodule.c policycoreutils-2.0.60/semodule/semodule.c
---- nsapolicycoreutils/semodule/semodule.c	2008-08-28 09:34:24.000000000 -0400
+--- nsapolicycoreutils/semodule/semodule.c	2009-01-13 08:45:35.000000000 -0500
 +++ policycoreutils-2.0.60/semodule/semodule.c	2009-01-06 08:56:37.000000000 -0500
-@@ -60,24 +60,6 @@
- 	free(commands);
- }
- 
--/* mmap() a file to '*data', returning the total number of bytes in
-- * the file.  Returns 0 if file could not be opened or mapped. */
--static size_t map_file(char *filename, char **data)
--{
--	int fd;
--	struct stat sb;
--	if ((fd = open(filename, O_RDONLY)) == -1) {
--		return 0;
--	}
--	if (fstat(fd, &sb) == -1 ||
--	    (*data = mmap(NULL, sb.st_size, PROT_READ, MAP_PRIVATE, fd, 0)) ==
--	    MAP_FAILED) {
--		sb.st_size = 0;
--	}
--	close(fd);
--	return sb.st_size;
--}
--
- /* Signal handlers. */
- static void handle_signal(int sig_num)
- {
-@@ -339,16 +321,6 @@
- 	for (i = 0; i < num_commands; i++) {
- 		enum client_modes mode = commands[i].mode;
- 		char *mode_arg = commands[i].arg;
--		char *data = NULL;
--		size_t data_len = 0;
--		if (mode == INSTALL_M || mode == UPGRADE_M || mode == BASE_M) {
--			if ((data_len = map_file(mode_arg, &data)) == 0) {
--				fprintf(stderr,
--					"%s:  Could not read file '%s': %s\n",
--					argv[0], mode_arg, errno ? strerror(errno) : "");
--				goto cleanup;
--			}
--		}
- 		switch (mode) {
- 		case INSTALL_M:{
- 				if (verbose) {
-@@ -357,7 +329,7 @@
- 					     mode_arg);
- 				}
- 				result =
--				    semanage_module_install(sh, data, data_len);
-+				    semanage_module_install_file(sh, mode_arg);
- 				break;
- 			}
- 		case UPGRADE_M:{
-@@ -367,7 +339,7 @@
- 					     mode_arg);
- 				}
- 				result =
--				    semanage_module_upgrade(sh, data, data_len);
-+				    semanage_module_upgrade_file(sh, mode_arg);
- 				break;
- 			}
- 		case BASE_M:{
-@@ -377,8 +349,7 @@
- 					     mode_arg);
- 				}
- 				result =
--				    semanage_module_install_base(sh, data,
--								 data_len);
-+				    semanage_module_install_base_file(sh, mode_arg);
- 				break;
- 			}
- 		case REMOVE_M:{
-@@ -388,6 +359,9 @@
+@@ -359,6 +359,9 @@
  					     mode_arg);
  				}
  				result = semanage_module_remove(sh, mode_arg);
@@ -222,14 +93,3 @@
  				break;
  			}
  		case LIST_M:{
-@@ -429,9 +403,6 @@
- 			}
- 		}
- 		commit += do_commit[mode];
--		if (mode == INSTALL_M || mode == UPGRADE_M || mode == BASE_M) {
--			munmap(data, data_len);
--		}
- 		if (result < 0) {
- 			fprintf(stderr, "%s:  Failed on %s!\n", argv[0],
- 				mode_arg ? : "list");
-Binary files nsapolicycoreutils/semodule/semodule.o and policycoreutils-2.0.60/semodule/semodule.o differ

policycoreutils-sepolgen.patch:

Index: policycoreutils-sepolgen.patch
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils-sepolgen.patch,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- policycoreutils-sepolgen.patch	6 Dec 2008 12:28:04 -0000	1.18
+++ policycoreutils-sepolgen.patch	13 Jan 2009 14:01:11 -0000	1.19
@@ -1,18 +1,6 @@
-diff --exclude-from=exclude -N -u -r nsasepolgen/src/sepolgen/access.py policycoreutils-2.0.60/sepolgen-1.0.14/src/sepolgen/access.py
---- nsasepolgen/src/sepolgen/access.py	2008-08-28 09:34:24.000000000 -0400
-+++ policycoreutils-2.0.60/sepolgen-1.0.14/src/sepolgen/access.py	2008-12-01 11:47:09.000000000 -0500
-@@ -313,7 +313,7 @@
- 
-     def __len__(self):
-         """Return the unique number of role allow statements."""
--        return len(self.roles)
-+        return len(self.role_type.keys())
- 
-     def add(self, role, type):
-         if self.role_types.has_key(role):
 diff --exclude-from=exclude -N -u -r nsasepolgen/src/sepolgen/refparser.py policycoreutils-2.0.60/sepolgen-1.0.14/src/sepolgen/refparser.py
 --- nsasepolgen/src/sepolgen/refparser.py	2008-08-28 09:34:24.000000000 -0400
-+++ policycoreutils-2.0.60/sepolgen-1.0.14/src/sepolgen/refparser.py	2008-12-01 11:47:09.000000000 -0500
++++ policycoreutils-2.0.60/sepolgen-1.0.14/src/sepolgen/refparser.py	2008-12-15 15:34:55.000000000 -0500
 @@ -919,7 +919,7 @@
  def list_headers(root):
      modules = []
@@ -24,7 +12,7 @@
          for name in filenames:
 diff --exclude-from=exclude -N -u -r nsasepolgen/src/sepolgen/yacc.py policycoreutils-2.0.60/sepolgen-1.0.14/src/sepolgen/yacc.py
 --- nsasepolgen/src/sepolgen/yacc.py	2008-08-28 09:34:24.000000000 -0400
-+++ policycoreutils-2.0.60/sepolgen-1.0.14/src/sepolgen/yacc.py	2008-12-06 07:26:04.000000000 -0500
++++ policycoreutils-2.0.60/sepolgen-1.0.14/src/sepolgen/yacc.py	2008-12-15 15:34:55.000000000 -0500
 @@ -67,7 +67,7 @@
  
  error_count = 3                # Number of symbols that must be shifted to leave recovery mode


Index: policycoreutils.spec
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils.spec,v
retrieving revision 1.580
retrieving revision 1.581
diff -u -r1.580 -r1.581
--- policycoreutils.spec	6 Jan 2009 14:12:28 -0000	1.580
+++ policycoreutils.spec	13 Jan 2009 14:01:11 -0000	1.581
@@ -5,8 +5,8 @@
 %define	sepolgenver	1.0.14
 Summary: SELinux policy core utilities
 Name:	 policycoreutils
-Version: 2.0.60
-Release: 7%{?dist}
+Version: 2.0.61
+Release: 1%{?dist}
 License: GPLv2+
 Group:	 System Environment/Base
 Source:	 http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@@ -25,7 +25,7 @@
 Patch4:	 policycoreutils-sepolgen.patch
 
 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: /bin/mount /bin/egrep /bin/awk /usr/bin/diff rpm /bin/sed /usr/bin/make
 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)
@@ -192,6 +192,13 @@
 fi
 
 %changelog
+* Tue Jan 13 2009 Dan Walsh <dwalsh at redhat.com> 2.0.61-1
+- Update to upstream
+	* chcat: cut categories at arbitrary point (25) from Dan Walsh
+	* semodule: use new interfaces in libsemanage for compressed files
+	  from Dan Walsh
+	* audit2allow: string changes for usage
+
 * Tue Jan 6 2009 Dan Walsh <dwalsh at redhat.com> 2.0.60-7
 - Don't error out when removing a non existing module
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/sources,v
retrieving revision 1.196
retrieving revision 1.197
diff -u -r1.196 -r1.197
--- sources	1 Dec 2008 16:49:50 -0000	1.196
+++ sources	13 Jan 2009 14:01:11 -0000	1.197
@@ -1,2 +1,2 @@
-53c9e85e3807a80e3ccca2bfd42e787d  policycoreutils-2.0.60.tgz
 df57d9d33c940c60994c6cbaa9f8e4a3  sepolgen-1.0.14.tgz
+1ba7555adc6d14e0bf41186aa9ce833e  policycoreutils-2.0.61.tgz



From dwalsh at fedoraproject.org  Tue Jan 13 14:10:18 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Tue, 13 Jan 2009 14:10:18 +0000 (UTC)
Subject: rpms/policycoreutils/devel .cvsignore, 1.192,
	1.193 policycoreutils-sepolgen.patch, 1.19,
	1.20 policycoreutils.spec, 1.581, 1.582 sources, 1.197, 1.198
Message-ID: <20090113141018.2EA1A70129@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/policycoreutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29645

Modified Files:
	.cvsignore policycoreutils-sepolgen.patch policycoreutils.spec 
	sources 
Log Message:
* Tue Jan 13 2009 Dan Walsh <dwalsh at redhat.com> 2.0.61-1
- Update to upstream
	* chcat: cut categories at arbitrary point (25) from Dan Walsh
	* semodule: use new interfaces in libsemanage for compressed files
	  from Dan Walsh
	* audit2allow: string changes for usage



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/.cvsignore,v
retrieving revision 1.192
retrieving revision 1.193
diff -u -r1.192 -r1.193
--- .cvsignore	13 Jan 2009 14:01:10 -0000	1.192
+++ .cvsignore	13 Jan 2009 14:09:47 -0000	1.193
@@ -194,3 +194,4 @@
 policycoreutils-2.0.60.tgz
 sepolgen-1.0.14.tgz
 policycoreutils-2.0.61.tgz
+sepolgen-1.0.15.tgz

policycoreutils-sepolgen.patch:

Index: policycoreutils-sepolgen.patch
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils-sepolgen.patch,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- policycoreutils-sepolgen.patch	13 Jan 2009 14:01:11 -0000	1.19
+++ policycoreutils-sepolgen.patch	13 Jan 2009 14:09:47 -0000	1.20
@@ -1,6 +1,6 @@
-diff --exclude-from=exclude -N -u -r nsasepolgen/src/sepolgen/refparser.py policycoreutils-2.0.60/sepolgen-1.0.14/src/sepolgen/refparser.py
+diff --exclude-from=exclude -N -u -r nsasepolgen/src/sepolgen/refparser.py policycoreutils-2.0.61/sepolgen-1.0.15/src/sepolgen/refparser.py
 --- nsasepolgen/src/sepolgen/refparser.py	2008-08-28 09:34:24.000000000 -0400
-+++ policycoreutils-2.0.60/sepolgen-1.0.14/src/sepolgen/refparser.py	2008-12-15 15:34:55.000000000 -0500
++++ policycoreutils-2.0.61/sepolgen-1.0.15/src/sepolgen/refparser.py	2008-12-15 15:34:55.000000000 -0500
 @@ -919,7 +919,7 @@
  def list_headers(root):
      modules = []
@@ -10,9 +10,9 @@
  
      for dirpath, dirnames, filenames in os.walk(root):
          for name in filenames:
-diff --exclude-from=exclude -N -u -r nsasepolgen/src/sepolgen/yacc.py policycoreutils-2.0.60/sepolgen-1.0.14/src/sepolgen/yacc.py
+diff --exclude-from=exclude -N -u -r nsasepolgen/src/sepolgen/yacc.py policycoreutils-2.0.61/sepolgen-1.0.15/src/sepolgen/yacc.py
 --- nsasepolgen/src/sepolgen/yacc.py	2008-08-28 09:34:24.000000000 -0400
-+++ policycoreutils-2.0.60/sepolgen-1.0.14/src/sepolgen/yacc.py	2008-12-15 15:34:55.000000000 -0500
++++ policycoreutils-2.0.61/sepolgen-1.0.15/src/sepolgen/yacc.py	2008-12-15 15:34:55.000000000 -0500
 @@ -67,7 +67,7 @@
  
  error_count = 3                # Number of symbols that must be shifted to leave recovery mode


Index: policycoreutils.spec
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils.spec,v
retrieving revision 1.581
retrieving revision 1.582
diff -u -r1.581 -r1.582
--- policycoreutils.spec	13 Jan 2009 14:01:11 -0000	1.581
+++ policycoreutils.spec	13 Jan 2009 14:09:47 -0000	1.582
@@ -2,7 +2,7 @@
 %define	libsepolver	2.0.19-1
 %define	libsemanagever	2.0.28-2
 %define	libselinuxver	2.0.46-5
-%define	sepolgenver	1.0.14
+%define	sepolgenver	1.0.15
 Summary: SELinux policy core utilities
 Name:	 policycoreutils
 Version: 2.0.61


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/sources,v
retrieving revision 1.197
retrieving revision 1.198
diff -u -r1.197 -r1.198
--- sources	13 Jan 2009 14:01:11 -0000	1.197
+++ sources	13 Jan 2009 14:09:47 -0000	1.198
@@ -1,2 +1,2 @@
-df57d9d33c940c60994c6cbaa9f8e4a3  sepolgen-1.0.14.tgz
-1ba7555adc6d14e0bf41186aa9ce833e  policycoreutils-2.0.61.tgz
+9e7c3efe622c9feab5c32ce480af2190  sepolgen-1.0.15.tgz
+42f7f691dd8798fe7a8a21635f96d5d2  policycoreutils-2.0.61.tgz



From kwizart at fedoraproject.org  Tue Jan 13 14:16:13 2009
From: kwizart at fedoraproject.org (Chauvet Nicolas)
Date: Tue, 13 Jan 2009 14:16:13 +0000 (UTC)
Subject: rpms/python-kaa-metadata/F-9 sources, 1.5,
	1.6 python-kaa-metadata.spec, 1.10, 1.11
Message-ID: <20090113141613.0ABDD70129@cvs1.fedora.phx.redhat.com>

Author: kwizart

Update of /cvs/pkgs/rpms/python-kaa-metadata/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30336

Modified Files:
	sources python-kaa-metadata.spec 
Log Message:
Update to 0.7.5



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-kaa-metadata/F-9/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	25 Mar 2008 14:41:22 -0000	1.5
+++ sources	13 Jan 2009 14:15:42 -0000	1.6
@@ -1 +1 @@
-ce116b588e1ebbdcd0b8bf4aa4ba5ed4  kaa-metadata-0.7.3.tar.gz
+012d1de5593d1a4e0e97cec52de7f1ac  kaa-metadata-0.7.5.tar.gz


Index: python-kaa-metadata.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-kaa-metadata/F-9/python-kaa-metadata.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- python-kaa-metadata.spec	25 Mar 2008 14:41:22 -0000	1.10
+++ python-kaa-metadata.spec	13 Jan 2009 14:15:42 -0000	1.11
@@ -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-kaa-metadata
-Version:        0.7.3
+Version:        0.7.5
 Release:        1%{?dist}
 Summary:        The Kaa Media - metadata binding for python
 
@@ -70,6 +70,9 @@
 
 
 %changelog
+* Mon Jan  5 2009 kwizart < kwizart at gmail.com > - 0.7.5-1
+- Update to 0.7.5
+
 * Tue Mar 25 2008 kwizart < kwizart at gmail.com > - 0.7.3-1
 - Update to 0.7.3
 



From kwizart at fedoraproject.org  Tue Jan 13 14:18:37 2009
From: kwizart at fedoraproject.org (Chauvet Nicolas)
Date: Tue, 13 Jan 2009 14:18:37 +0000 (UTC)
Subject: rpms/python-kaa-metadata/F-10 sources, 1.5,
	1.6 python-kaa-metadata.spec, 1.10, 1.11
Message-ID: <20090113141837.65B2B70129@cvs1.fedora.phx.redhat.com>

Author: kwizart

Update of /cvs/pkgs/rpms/python-kaa-metadata/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30682

Modified Files:
	sources python-kaa-metadata.spec 
Log Message:
Update to 0.7.5



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-kaa-metadata/F-10/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	25 Mar 2008 14:41:22 -0000	1.5
+++ sources	13 Jan 2009 14:18:06 -0000	1.6
@@ -1 +1 @@
-ce116b588e1ebbdcd0b8bf4aa4ba5ed4  kaa-metadata-0.7.3.tar.gz
+012d1de5593d1a4e0e97cec52de7f1ac  kaa-metadata-0.7.5.tar.gz


Index: python-kaa-metadata.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-kaa-metadata/F-10/python-kaa-metadata.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- python-kaa-metadata.spec	25 Mar 2008 14:41:22 -0000	1.10
+++ python-kaa-metadata.spec	13 Jan 2009 14:18:06 -0000	1.11
@@ -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-kaa-metadata
-Version:        0.7.3
+Version:        0.7.5
 Release:        1%{?dist}
 Summary:        The Kaa Media - metadata binding for python
 
@@ -70,6 +70,9 @@
 
 
 %changelog
+* Mon Jan  5 2009 kwizart < kwizart at gmail.com > - 0.7.5-1
+- Update to 0.7.5
+
 * Tue Mar 25 2008 kwizart < kwizart at gmail.com > - 0.7.3-1
 - Update to 0.7.3
 



From limb at fedoraproject.org  Tue Jan 13 14:23:13 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Tue, 13 Jan 2009 14:23:13 +0000 (UTC)
Subject: rpms/inksmoto/devel .cvsignore, 1.3, 1.4 inksmoto.spec, 1.4,
	1.5 sources, 1.3, 1.4
Message-ID: <20090113142313.AC92470129@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/inksmoto/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31291

Modified Files:
	.cvsignore inksmoto.spec sources 
Log Message:
New upstream.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/inksmoto/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	18 Dec 2008 15:04:45 -0000	1.3
+++ .cvsignore	13 Jan 2009 14:22:43 -0000	1.4
@@ -1 +1 @@
-inksmoto-0.5.0~rc1.tar.gz
+inksmoto-0.5.0~rc2.tar.gz


Index: inksmoto.spec
===================================================================
RCS file: /cvs/pkgs/rpms/inksmoto/devel/inksmoto.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- inksmoto.spec	19 Dec 2008 17:34:17 -0000	1.4
+++ inksmoto.spec	13 Jan 2009 14:22:43 -0000	1.5
@@ -1,6 +1,6 @@
 Name: inksmoto
 Version: 0.5.0
-Release:  2.rc1%{?dist}
+Release:  3.rc2%{?dist}
 Summary: The new xmoto level editor for Inkscape
 
 Group: Amusements/Games 
@@ -44,6 +44,9 @@
 %doc AUTHORS COPYING INSTALL README
 
 %changelog
+* Tue Jan 13 2009 Jon Ciesla <limb at jcomserv.net> - 0.5.0-3.rc2
+- New upstream.
+
 * Thu Dec 18 2008 Jon Ciesla <limb at jcomserv.net> - 0.5.0-2.rc1
 - Added xmoto_install and xmoto_bitmap.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/inksmoto/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	18 Dec 2008 15:04:45 -0000	1.3
+++ sources	13 Jan 2009 14:22:43 -0000	1.4
@@ -1 +1 @@
-89c404359917abfcc698d8d6cc484e24  inksmoto-0.5.0~rc1.tar.gz
+c79bbb45c8e1632c8f631f599c882bb1  inksmoto-0.5.0~rc2.tar.gz



From hadess at fedoraproject.org  Tue Jan 13 14:23:11 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Tue, 13 Jan 2009 14:23:11 +0000 (UTC)
Subject: rpms/gnome-media/devel gnome-media.spec,1.148,1.149
Message-ID: <20090113142311.37D0470129@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/gnome-media/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31265

Modified Files:
	gnome-media.spec 
Log Message:
* Tue Jan 13 2009 - Bastien Nocera <bnocera at redhat.com> - 2.25.1-5
- Another try at fixing the scriplets



Index: gnome-media.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-media/devel/gnome-media.spec,v
retrieving revision 1.148
retrieving revision 1.149
diff -u -r1.148 -r1.149
--- gnome-media.spec	11 Jan 2009 20:58:17 -0000	1.148
+++ gnome-media.spec	13 Jan 2009 14:22:40 -0000	1.149
@@ -14,7 +14,7 @@
 Summary:        GNOME media programs
 Name:           gnome-media
 Version:        2.25.1
-Release:        4%{?dist}
+Release:        5%{?dist}
 License:        GPLv2+ and GFDL
 Group:          Applications/Multimedia
 Source:         http://download.gnome.org/sources/gnome-media/2.25/gnome-media-%{version}.tar.bz2
@@ -175,6 +175,7 @@
 
 %pre libs
 if [ "$1" -gt 1 ]; then
+  export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
   gconftool-2 --makefile-uninstall-rule \
   %{_sysconfdir}/gconf/schemas/gnome-audio-profiles.schemas \
   > /dev/null || :
@@ -204,6 +205,7 @@
 %preun libs
 if [ "$1" -eq 0 ]; then
   if [ -f %{_sysconfdir}/gconf/schemas/gnome-audio-profiles.schemas ] ; then
+    export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
     gconftool-2 --makefile-uninstall-rule \
     %{_sysconfdir}/gconf/schemas/gnome-audio-profiles.schemas \
     > /dev/null || :
@@ -244,6 +246,9 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Tue Jan 13 2009 - Bastien Nocera <bnocera at redhat.com> - 2.25.1-5
+- Another try at fixing the scriplets
+
 * Sun Jan 11 2009 Matthias Clasen <mclasen at redhat.com>  2.25.1-4
 - Silence %%pre and %%preun
 



From ovasik at fedoraproject.org  Tue Jan 13 14:27:51 2009
From: ovasik at fedoraproject.org (Ondrej Vasik)
Date: Tue, 13 Jan 2009 14:27:51 +0000 (UTC)
Subject: rpms/inn/devel inn.spec,1.54,1.55
Message-ID: <20090113142751.1B19870129@cvs1.fedora.phx.redhat.com>

Author: ovasik

Update of /cvs/extras/rpms/inn/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32098

Modified Files:
	inn.spec 
Log Message:
fix changed upstream URL


Index: inn.spec
===================================================================
RCS file: /cvs/extras/rpms/inn/devel/inn.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- inn.spec	1 Dec 2008 15:00:32 -0000	1.54
+++ inn.spec	13 Jan 2009 14:27:20 -0000	1.55
@@ -1,11 +1,11 @@
 Summary: The InterNetNews system, an Usenet news server
 Name: inn
 Version: 2.4.5
-Release: 6%{?dist}
+Release: 7%{?dist}
 #see LICENSE file for details
 License: GPL+ and BSD and MIT and Public Domain
 Group: System Environment/Daemons
-URL: http://www.isc.org/products/INN/
+URL: https://www.isc.org/software/INN/
 Source0: ftp://ftp.isc.org/isc/inn/inn-%{version}.tar.gz
 Source2: inn-default-distributions
 Source4: inn-cron-expire
@@ -354,6 +354,9 @@
 %{_mandir}/man1/inews*
 
 %changelog
+* Wed Jan 13 2009 Ondrej Vasik <ovasik at redhat.com> - 2.4.5-7
+- fix upstream url
+
 * Mon Dec  1 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 2.4.5-6
 - Rebuild for Python 2.6
 



From ajax at fedoraproject.org  Tue Jan 13 14:43:54 2009
From: ajax at fedoraproject.org (Adam Jackson)
Date: Tue, 13 Jan 2009 14:43:54 +0000 (UTC)
Subject: rpms/xorg-x11-drv-mga/F-10 import.log, NONE, 1.1 .cvsignore, 1.11, 
	1.12 sources, 1.11, 1.12 xorg-x11-drv-mga.spec, 1.27,
	1.28 mga-1.4.7-alloca.patch, 1.1,
	NONE mga-1.4.7-death-to-cfb.patch, 1.1, NONE
Message-ID: <20090113144354.24CE570129@cvs1.fedora.phx.redhat.com>

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-drv-mga/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2376/F-10

Modified Files:
	.cvsignore sources xorg-x11-drv-mga.spec 
Added Files:
	import.log 
Removed Files:
	mga-1.4.7-alloca.patch mga-1.4.7-death-to-cfb.patch 
Log Message:
mga 1.4.9



--- NEW FILE import.log ---
xorg-x11-drv-mga-1_4_9-1_fc10:F-10:xorg-x11-drv-mga-1.4.9-1.fc10.src.rpm:1231857779


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-mga/F-10/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	22 Feb 2008 18:35:11 -0000	1.11
+++ .cvsignore	13 Jan 2009 14:43:23 -0000	1.12
@@ -1 +1 @@
-xf86-video-mga-1.4.8.tar.bz2
+xf86-video-mga-1.4.9.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-mga/F-10/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	22 Feb 2008 18:35:11 -0000	1.11
+++ sources	13 Jan 2009 14:43:23 -0000	1.12
@@ -1 +1 @@
-e7783c7609d441237d665b7fc47288c7  xf86-video-mga-1.4.8.tar.bz2
+11066b84b949cd04300ec819c9c51532  xf86-video-mga-1.4.9.tar.bz2


Index: xorg-x11-drv-mga.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-mga/F-10/xorg-x11-drv-mga.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- xorg-x11-drv-mga.spec	22 Feb 2008 18:35:11 -0000	1.27
+++ xorg-x11-drv-mga.spec	13 Jan 2009 14:43:23 -0000	1.28
@@ -6,7 +6,7 @@
 
 Summary:   Xorg X11 mga video driver
 Name:      xorg-x11-drv-mga
-Version:   1.4.8
+Version:   1.4.9
 Release:   1%{?dist}
 URL:       http://www.x.org
 License: MIT
@@ -19,8 +19,6 @@
 
 Patch0: mga-1.4.5-no-hal-advertising.patch
 Patch1: mga-1.4.6.1-get-client-pointer.patch
-Patch2: mga-1.4.7-death-to-cfb.patch
-Patch3: mga-1.4.7-alloca.patch
 
 ExcludeArch: s390 s390x
 
@@ -39,8 +37,6 @@
 %setup -q -n %{tarball}-%{version}
 %patch0 -p1 -b .hal
 %patch1 -p1 -b .gcp
-%patch2 -p1 -b .cfb
-%patch3 -p1 -b .alloca
 
 %build
 autoreconf -v --install || exit 1
@@ -67,6 +63,9 @@
 %{_mandir}/man4/mga.4*
 
 %changelog
+* Wed Jul 02 2008 Adam Jackson <ajax at redhat.com> 1.4.9-1
+- mga 1.4.9
+
 * Fri Feb 22 2008 Adam Jackson <ajax at redhat.com> 1.4.8-1
 - mga 1.4.8
 


--- mga-1.4.7-alloca.patch DELETED ---


--- mga-1.4.7-death-to-cfb.patch DELETED ---



From limb at fedoraproject.org  Tue Jan 13 14:45:08 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Tue, 13 Jan 2009 14:45:08 +0000 (UTC)
Subject: rpms/inksmoto/devel inksmoto.spec,1.5,1.6
Message-ID: <20090113144508.21B8C70129@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/inksmoto/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2328

Modified Files:
	inksmoto.spec 
Log Message:
Oops.



Index: inksmoto.spec
===================================================================
RCS file: /cvs/pkgs/rpms/inksmoto/devel/inksmoto.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- inksmoto.spec	13 Jan 2009 14:22:43 -0000	1.5
+++ inksmoto.spec	13 Jan 2009 14:44:37 -0000	1.6
@@ -6,7 +6,7 @@
 Group: Amusements/Games 
 License: GPLv2
 URL: http://xmoto.sourceforge.net/
-Source0: http://download.tuxfamily.org/xmoto/svg2lvl/%{version}~rc1/inksmoto-%{version}~rc1.tar.gz       
+Source0: http://download.tuxfamily.org/xmoto/svg2lvl/%{version}~rc1/inksmoto-%{version}~rc2.tar.gz       
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root%(%{__id_u} -n)
 Requires: xmoto, inkscape, PyXML, tkinter, python-imaging-tk
 BuildArch: noarch



From dcantrel at fedoraproject.org  Tue Jan 13 14:46:02 2009
From: dcantrel at fedoraproject.org (David Cantrell)
Date: Tue, 13 Jan 2009 14:46:02 +0000 (UTC)
Subject: rpms/dhcp/devel dhcp.spec,1.237,1.238 dhcpd.init,1.28,1.29
Message-ID: <20090113144602.730AA70129@cvs1.fedora.phx.redhat.com>

Author: dcantrel

Update of /cvs/pkgs/rpms/dhcp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2634

Modified Files:
	dhcp.spec dhcpd.init 
Log Message:
* Tue Jan 13 2009 David Cantrell <dcantrell at redhat.com> - 12:4.1.0-4
- Updated LSB init script header to reference /etc/dhcp/dhcpd.conf (#479012)



Index: dhcp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dhcp/devel/dhcp.spec,v
retrieving revision 1.237
retrieving revision 1.238
diff -u -r1.237 -r1.238
--- dhcp.spec	11 Jan 2009 20:07:56 -0000	1.237
+++ dhcp.spec	13 Jan 2009 14:45:31 -0000	1.238
@@ -12,7 +12,7 @@
 Summary:  Dynamic host configuration protocol software
 Name:     dhcp
 Version:  4.1.0
-Release:  3%{?dist}
+Release:  4%{?dist}
 # NEVER CHANGE THE EPOCH on this package.  The previous maintainer (prior to
 # dcantrell maintaining the package) made incorrect use of the epoch and
 # that's why it is at 12 now.  It should have never been used, but it was.
@@ -407,6 +407,9 @@
 %attr(0644,root,root) %{_mandir}/man3/omapi.3.gz
 
 %changelog
+* Tue Jan 13 2009 David Cantrell <dcantrell at redhat.com> - 12:4.1.0-4
+- Updated LSB init script header to reference /etc/dhcp/dhcpd.conf (#479012)
+
 * Sun Jan 11 2009 David Cantrell <dcantrell at redhat.com> - 12:4.1.0-3
 - Correct syntax errors in %%post script (#479012)
 


Index: dhcpd.init
===================================================================
RCS file: /cvs/pkgs/rpms/dhcp/devel/dhcpd.init,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- dhcpd.init	6 Jan 2009 23:46:51 -0000	1.28
+++ dhcpd.init	13 Jan 2009 14:45:32 -0000	1.29
@@ -18,7 +18,7 @@
 # description: dhcpd provides the Dynamic Host Configuration Protocol (DHCP) \
 #              server
 # processname: dhcpd
-# config: /etc/dhcpd.conf
+# config: /etc/dhcp/dhcpd.conf
 # config: /var/lib/dhcpd/dhcpd.leases
 # pidfile: /var/run/dhcpd.pid
 



From jeffg at fedoraproject.org  Tue Jan 13 15:03:31 2009
From: jeffg at fedoraproject.org (Jeff Gilchrist)
Date: Tue, 13 Jan 2009 15:03:31 +0000 (UTC)
Subject: rpms/pbzip2/devel import.log, NONE, 1.1 .cvsignore, 1.7,
	1.8 pbzip2.spec, 1.13, 1.14 sources, 1.7, 1.8
Message-ID: <20090113150331.44BA470129@cvs1.fedora.phx.redhat.com>

Author: jeffg

Update of /cvs/pkgs/rpms/pbzip2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4493/devel

Modified Files:
	.cvsignore pbzip2.spec sources 
Added Files:
	import.log 
Log Message:
Updated code from upstream to 1.0.5



--- NEW FILE import.log ---
pbzip2-1_0_5-1:HEAD:pbzip2-1.0.5-1.src.rpm:1231858917


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pbzip2/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	26 Jul 2007 17:16:26 -0000	1.7
+++ .cvsignore	13 Jan 2009 15:03:00 -0000	1.8
@@ -1 +1 @@
-pbzip2-1.0.2.tar.gz
+pbzip2-1.0.5.tar.gz


Index: pbzip2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pbzip2/devel/pbzip2.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- pbzip2.spec	10 Feb 2008 12:25:45 -0000	1.13
+++ pbzip2.spec	13 Jan 2009 15:03:00 -0000	1.14
@@ -1,12 +1,16 @@
 Name:		pbzip2
-Version:	1.0.2
-Release:	4%{?dist}
+Version:	1.0.5
+Release:	1%{?dist}
 Summary:	Parallel implementation of bzip2
 URL:		http://www.compression.ca/pbzip2/
 License:	BSD
 Group:		Applications/File
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:	bzip2-devel
+%if %{?suse_version:1}0
+BuildRequires:  bzip2
+%else
+BuildRequires:  bzip2-devel
+%endif
 Source0:	http://www.compression.ca/pbzip2/%{name}-%{version}.tar.gz
 
 %description
@@ -19,7 +23,7 @@
 
 %prep
 %setup -q
-sed -i -e 's/ -O3 / %{optflags} /' Makefile
+sed -i -e 's/ -O2/ %{optflags} /' Makefile
 
 
 %build
@@ -31,6 +35,7 @@
 install -D -m755 %{name} %{buildroot}%{_bindir}/%{name}
 install -D -m644 %{name}.1 %{buildroot}%{_mandir}/man1/%{name}.1
 ln -sf ./%{name} %{buildroot}%{_bindir}/pbunzip2
+ln -sf ./%{name} %{buildroot}%{_bindir}/pbzcat
 
 
 %clean
@@ -42,15 +47,21 @@
 %doc AUTHORS ChangeLog COPYING README
 %{_bindir}/%{name}
 %{_bindir}/pbunzip2
+%{_bindir}/pbzcat
 %{_mandir}/man1/*
 
 
 %changelog
-* Sun Feb 10 2008 Jeff Gilchrist <pbzip2 at compression.ca> - 1.0.2-4
-- Rebuild for gcc 4.3
+* Fri Jan 8 2009 Jeff Gilchrist <pbzip2 at compression.ca> - 1.0.5-1
+- Release 1.0.5
 
-* Wed Aug 29 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 1.0.2-3
-- Rebuild for selinux ppc32 issue.
+* Fri Dec 21 2008 Jeff Gilchrist <pbzip2 at compression.ca> - 1.0.4-1
+- Release 1.0.4
+
+* Tue Oct 31 2008 Jeff Gilchrist <pbzip2 at compression.ca> - 1.0.3-1
+- Release 1.0.3
+- Added support for SUSE RPM build
+- Added symlink for pbzcat
 
 * Thu Jul 26 2007 Jeff Gilchrist <pbzip2 at compression.ca> - 1.0.2-2
 - Fixed symbolic link for pbunzip2 file


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pbzip2/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	26 Jul 2007 17:16:26 -0000	1.7
+++ sources	13 Jan 2009 15:03:00 -0000	1.8
@@ -1 +1 @@
-2f58b4e844c74d0c98b98326c6a3945f  pbzip2-1.0.2.tar.gz
+e2448d22ee29d1e6549ac58b98df11ab  pbzip2-1.0.5.tar.gz



From jwilson at fedoraproject.org  Tue Jan 13 15:10:56 2009
From: jwilson at fedoraproject.org (Jarod Wilson)
Date: Tue, 13 Jan 2009 15:10:56 +0000 (UTC)
Subject: rpms/libraw1394/devel
	libraw1394-use-errno-ENOSYS-in-unimplemented-functions.patch,
	NONE, 1.1 libraw1394-work-without-write-on-local-node-dev.patch,
	NONE, 1.1 libraw1394.spec, 1.49, 1.50
Message-ID: <20090113151056.B53E270129@cvs1.fedora.phx.redhat.com>

Author: jwilson

Update of /cvs/pkgs/rpms/libraw1394/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5956

Modified Files:
	libraw1394.spec 
Added Files:
	libraw1394-use-errno-ENOSYS-in-unimplemented-functions.patch 
	libraw1394-work-without-write-on-local-node-dev.patch 
Log Message:
* Tue Jan 13 2009 Jarod Wilson <jarod at redhat.com> - 2.0.0-6
- Set errno = ENOSYS for all unimplemented functions
- Make dvgrab and friends work w/o requiring r/w on the local fw node (#441073)


libraw1394-use-errno-ENOSYS-in-unimplemented-functions.patch:

--- NEW FILE libraw1394-use-errno-ENOSYS-in-unimplemented-functions.patch ---
Date: Sun, 11 Jan 2009 22:39:17 +0100 (CET)
From: Stefan Richter <stefanr at s5r6.in-berlin.de>
Subject: [PATCH libraw1394 fix] Set errno = ENOSYS in unimplemented functions
To: Dan Dennedy <dan at dennedy.org>
Cc: linux1394-devel at lists.sourceforge.net

Most of them do this already, only a few missed it.

Signed-off-by: Stefan Richter <stefanr at s5r6.in-berlin.de>
---
 src/fw.c |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/src/fw.c b/src/fw.c
index 3f5d806..ba3a807 100644
--- a/src/fw.c
+++ b/src/fw.c
@@ -1104,6 +1104,7 @@ fw_start_async_stream(fw_handle_t handle, unsigned int channel,
 			   unsigned long rawtag)
 {
 	/* FIXME: implement this? */
+	errno = ENOSYS;
 	return -1;
 }
 
@@ -1115,6 +1116,7 @@ fw_start_async_send(fw_handle_t handle,
 			 quadlet_t *data, unsigned long rawtag)
 {
 	/* FIXME: implement this? */
+	errno = ENOSYS;
 	return -1;
 }
 
@@ -1233,6 +1235,7 @@ fw_async_stream(fw_handle_t handle, unsigned int channel,
 		     size_t length, quadlet_t *data)
 {
 	/* FIXME: implement this? */
+	errno = ENOSYS;
 	return -1;
 }
 
@@ -1243,6 +1246,7 @@ fw_async_send(fw_handle_t handle,
 		   quadlet_t *data)
 {
 	/* FIXME: implement this? */
+	errno = ENOSYS;
 	return -1;
 }
 
@@ -1284,6 +1288,7 @@ int
 fw_update_config_rom(fw_handle_t handle, const quadlet_t *new_rom,
 			  size_t size, unsigned char rom_version)
 {
+	errno = ENOSYS;
 	return -1;
 }
 
-- 
1.6.0.6

libraw1394-work-without-write-on-local-node-dev.patch:

--- NEW FILE libraw1394-work-without-write-on-local-node-dev.patch ---
Date: Sat, 10 Jan 2009 21:14:50 +0100 (CET)
From: Stefan Richter <stefanr at s5r6.in-berlin.de>
Subject: Re: [PATCH libraw1394] Work without permission to access local node's
	/dev/fw*
To: Dan Dennedy <dan at dennedy.org>
Cc: linux1394-devel at lists.sourceforge.net,
 dcm at acm.org

On 10 Jan, Stefan Richter wrote:
> --- a/src/fw.c
> +++ b/src/fw.c
> @@ -125,17 +125,19 @@ scan_devices(fw_handle_t handle)
>  	char filename[32];
>  	struct fw_cdev_get_info get_info;
>  	struct fw_cdev_event_bus_reset reset;
> -	int fd, err, i, fname_str_sz;
> +	int fd, err, i, j, fname_str_sz;
>  	struct port *ports;
>  
>  	ports = handle->ports;
>  	memset(ports, 0, sizeof handle->ports);
> +	for (i = 0; i < MAX_PORTS; i++)
> +		ports[i].card = -1;
> +

The memset is not necessary.


From: Stefan Richter <stefanr at s5r6.in-berlin.de>
Subject: [PATCH] Work without permission to access local node's /dev/fw*

Fix for juju backend:

libraw1394 required write permission to the character device file of
the local node(s) in order to enumerate cards and for a number of
other operations.  This forced users to either run applications like
dvgrab and kino with elevated privileges, or to configure write
permission for all /dev/fw* or at least for local nodes' /dev/fw*.

We now use the first accessible file which was found for each card
for as many tasks as possible, instead of the local node's file.

This allows distributors or admins to implement stricter access
rights (default off, e.g. only on for AV/C and IIDC devices)
without sacrificing functionality of said class of applications.
Access to the local node is now only required by low-level tools
like gscanbus.

Signed-off-by: Stefan Richter <stefanr at s5r6.in-berlin.de>
---
 src/fw-iso.c |    4 ++--
 src/fw.c     |   50 +++++++++++++++++++++++++++++++++-----------------
 src/fw.h     |    6 +++---
 3 files changed, 38 insertions(+), 22 deletions(-)

diff --git a/src/fw-iso.c b/src/fw-iso.c
index 6a84662..a87259b 100644
--- a/src/fw-iso.c
+++ b/src/fw-iso.c
@@ -407,7 +407,7 @@ iso_init(fw_handle_t handle, int type,
 	if (handle->iso.packets == NULL)
 		return -1;
 
-	handle->iso.fd = open(handle->local_filename, O_RDWR);
+	handle->iso.fd = open(handle->iso.filename, O_RDWR);
 	if (handle->iso.fd < 0) {
 		free(handle->iso.packets);
 		handle->iso.packets = NULL;
@@ -557,7 +557,7 @@ int fw_read_cycle_timer(fw_handle_t handle,
 	int err;
 	struct fw_cdev_get_cycle_timer ctr = { 0 };
 
-	err = ioctl(handle->local_fd, FW_CDEV_IOC_GET_CYCLE_TIMER, &ctr);
+	err = ioctl(handle->ioctl_fd, FW_CDEV_IOC_GET_CYCLE_TIMER, &ctr);
 	if (!err) {
 		*cycle_timer = ctr.cycle_timer;
 		*local_time  = ctr.local_time;
diff --git a/src/fw.c b/src/fw.c
index e211b60..3f5d806 100644
--- a/src/fw.c
+++ b/src/fw.c
@@ -125,17 +125,18 @@ scan_devices(fw_handle_t handle)
 	char filename[32];
 	struct fw_cdev_get_info get_info;
 	struct fw_cdev_event_bus_reset reset;
-	int fd, err, i, fname_str_sz;
+	int fd, err, i, j, fname_str_sz;
 	struct port *ports;
 
 	ports = handle->ports;
-	memset(ports, 0, sizeof handle->ports);
+	for (i = 0; i < MAX_PORTS; i++)
+		ports[i].card = -1;
+
 	dir = opendir(FW_DEVICE_DIR);
 	if (dir == NULL)
 		return -1;
 
-	i = 0;
-	while (1) {
+	for (i = 0; i < MAX_PORTS; ) {
 		de = readdir(dir);
 		if (de == NULL)
 			break;
@@ -161,7 +162,10 @@ scan_devices(fw_handle_t handle)
 		if (err < 0)
 			continue;
 
-		if (i < MAX_PORTS && reset.node_id == reset.local_node_id) {
+		for (j = 0; j < i; j++)
+			if (ports[j].card == get_info.card)
+				break;
+		if (j == i) {
 			fname_str_sz = sizeof(ports[i].device_file) - 1;
 			strncpy(ports[i].device_file, filename, fname_str_sz);
 			ports[i].device_file[fname_str_sz] = '\0';
@@ -626,20 +630,27 @@ int fw_set_port(fw_handle_t handle, int port)
 			return -1;
 		}
 
-		handle->generation = reset.generation;
-		if (reset.node_id == reset.local_node_id) {
+		if (handle->iso.filename == NULL) {
 			memcpy(&handle->reset, &reset, sizeof handle->reset);
-			handle->local_fd = fd;
-			fname_str_sz = sizeof(handle->local_filename) -1;
-			strncpy(handle->local_filename, filename, fname_str_sz);
-			handle->local_filename[fname_str_sz] = '\0';
+			handle->iso.filename = handle->devices[i].filename;
+			handle->ioctl_fd = fd;
 		}
 
+		if (reset.node_id == reset.local_node_id)
+			handle->local_device = &handle->devices[i];
+
+		handle->generation = reset.generation;
+
 		i++;
 	}
 
 	closedir(dir);
 
+	if (i == 0) {
+		errno = ENODEV;
+		return -1;
+	}
+
 	return 0;
 }
 
@@ -656,7 +667,7 @@ int fw_reset_bus_new(fw_handle_t handle, int type)
 		break;
 	}
 
-	return ioctl(handle->local_fd,
+	return ioctl(handle->ioctl_fd,
 		     FW_CDEV_IOC_INITIATE_BUS_RESET, &initiate);
 }
 
@@ -817,7 +828,7 @@ fw_arm_register(fw_handle_t handle, nodeaddr_t start,
 	request.length = length;
 	request.closure = ptr_to_u64(&allocation->closure);
 
-	retval = ioctl(handle->local_fd, FW_CDEV_IOC_ALLOCATE, &request);
+	retval = ioctl(handle->ioctl_fd, FW_CDEV_IOC_ALLOCATE, &request);
 	if (retval < 0) {
 		free(allocation);
 		return -1;
@@ -863,7 +874,7 @@ fw_arm_unregister(fw_handle_t handle, nodeaddr_t start)
 	request.handle = allocation->handle;
 	free(allocation);
 
-	return ioctl(handle->local_fd, FW_CDEV_IOC_DEALLOCATE, &request);
+	return ioctl(handle->ioctl_fd, FW_CDEV_IOC_DEALLOCATE, &request);
 }
 
 int
@@ -1251,7 +1262,7 @@ fw_start_fcp_listen(fw_handle_t handle)
 	request.offset = CSR_REGISTER_BASE + CSR_FCP_COMMAND;
 	request.length = CSR_FCP_END - CSR_FCP_COMMAND;
 	request.closure = ptr_to_u64(closure);
-	if (ioctl(handle->local_fd, FW_CDEV_IOC_ALLOCATE, &request) < 0)
+	if (ioctl(handle->ioctl_fd, FW_CDEV_IOC_ALLOCATE, &request) < 0)
 		return -1;
 
 	handle->fcp_allocation_handle = request.handle;
@@ -1266,7 +1277,7 @@ fw_stop_fcp_listen(fw_handle_t handle)
 
 	request.handle = handle->fcp_allocation_handle;
 
-	return ioctl(handle->local_fd, FW_CDEV_IOC_DEALLOCATE, &request);
+	return ioctl(handle->ioctl_fd, FW_CDEV_IOC_DEALLOCATE, &request);
 }
 
 int
@@ -1284,13 +1295,18 @@ fw_get_config_rom(fw_handle_t handle, quadlet_t *buffer,
 	struct fw_cdev_get_info get_info;
 	int err;
 
+	if (handle->local_device == NULL) {
+		errno = EPERM;
+		return -1;
+	}
+
 	memset(&get_info, 0, sizeof(get_info));
 	get_info.version = FW_CDEV_VERSION;
 	get_info.rom = ptr_to_u64(buffer);
 	get_info.rom_length = buffersize;
 	get_info.bus_reset = 0;
 
-	err = ioctl(handle->local_fd, FW_CDEV_IOC_GET_INFO, &get_info);
+	err = ioctl(handle->local_device->fd, FW_CDEV_IOC_GET_INFO, &get_info);
 	if (err)
 		return err;
 
diff --git a/src/fw.h b/src/fw.h
index 56b59d9..a5e3772 100644
--- a/src/fw.h
+++ b/src/fw.h
@@ -101,6 +101,7 @@ struct fw_handle {
 	__u32 fcp_allocation_handle;
 	struct allocation *allocations;
 
+	int ioctl_fd;
 	int epoll_fd;
 	int inotify_fd;
 	int inotify_watch;
@@ -110,13 +111,12 @@ struct fw_handle {
 	struct epoll_closure inotify_closure;
 
 	struct device devices[MAX_DEVICES];
+	struct device *local_device;
 	int nodes[MAX_DEVICES];
-	int local_fd;
-	char local_filename[FILENAME_SIZE];
-
 	struct fw_cdev_event_bus_reset reset;
 
 	struct {
+		char *filename;
 		struct epoll_closure closure;
 		int fd;
 		int type;
-- 
1.6.0.6


Index: libraw1394.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libraw1394/devel/libraw1394.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- libraw1394.spec	9 Dec 2008 15:40:49 -0000	1.49
+++ libraw1394.spec	13 Jan 2009 15:10:26 -0000	1.50
@@ -1,11 +1,13 @@
 Summary:        Library providing low-level IEEE-1394 access
 Name:           libraw1394
 Version:        2.0.0
-Release:        5%{?dist}
+Release:        6%{?dist}
 License:        LGPLv2+
 Group:          System Environment/Libraries
 Source:         http://www.linux1394.org/dl/libraw1394-%{version}.tar.gz
 Patch0:         libraw1394-2.0.0-git-update.patch
+Patch1:         libraw1394-use-errno-ENOSYS-in-unimplemented-functions.patch
+Patch2:         libraw1394-work-without-write-on-local-node-dev.patch
 URL:            http://www.linux1394.org/
 ExcludeArch:    s390 s390x
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -29,6 +31,8 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
+%patch2 -p1
 
 %build
 %configure --disable-static
@@ -67,6 +71,10 @@
 
 
 %changelog
+* Tue Jan 13 2009 Jarod Wilson <jarod at redhat.com> - 2.0.0-6
+- Set errno = ENOSYS for all unimplemented functions
+- Make dvgrab and friends work w/o requiring r/w on the local fw node (#441073)
+
 * Mon Dec 08 2008 Jarod Wilson <jarod at redhat.com> - 2.0.0-5
 - Fix up iso stop command so starting/stopping/starting iso reception works
 - Plug firewire handle leak



From twaugh at fedoraproject.org  Tue Jan 13 15:20:09 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Tue, 13 Jan 2009 15:20:09 +0000 (UTC)
Subject: rpms/hplip/devel hplip-segfault.patch,NONE,1.1
Message-ID: <20090113152009.B28CE70129@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/hplip/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6784

Added Files:
	hplip-segfault.patch 
Log Message:
* Tue Jan 13 2009 Tim Waugh <twaugh at redhat.com> 2.8.12-4
- Prevent crash when DEVICE_URI/PRINTER environment variables are not
  set (bug #479808 comment 6).


hplip-segfault.patch:

--- NEW FILE hplip-segfault.patch ---
diff -up hplip-2.8.12/prnt/hpijs/hpijs.cpp.segfault hplip-2.8.12/prnt/hpijs/hpijs.cpp
--- hplip-2.8.12/prnt/hpijs/hpijs.cpp.segfault	2009-01-13 15:11:55.000000000 +0000
+++ hplip-2.8.12/prnt/hpijs/hpijs.cpp	2009-01-13 15:13:49.000000000 +0000
@@ -231,8 +231,14 @@ int hpijs_set_cb (void *set_cb_data, Ijs
 		// call dbus here
 		const char    *user_name = " ";
 		const char    *title     = " ";
+		char *device_uri = getenv ("DEVICE_URI");
+		char *printer = getenv("PRINTER");
 		int     job_id = 0;
-                SendDbusMessage (getenv ("DEVICE_URI"), getenv("PRINTER"),
+		if (!device_uri)
+		    device_uri = "";
+		if (!printer)
+		    printer = "";
+                SendDbusMessage (device_uri, printer,
 	     	                 EVENT_PRINT_FAILED_MISSING_PLUGIN,
 				 user_name, job_id, title);
                 bug("unable to set device=%s, err=%d\n", svalue, r);



From twaugh at fedoraproject.org  Tue Jan 13 15:20:12 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Tue, 13 Jan 2009 15:20:12 +0000 (UTC)
Subject: rpms/hplip/devel hplip.spec,1.194,1.195
Message-ID: <20090113152012.A803D70129@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/hplip/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6696

Modified Files:
	hplip.spec 
Log Message:
* Tue Jan 13 2009 Tim Waugh <twaugh at redhat.com> 2.8.12-4
- Prevent crash when DEVICE_URI/PRINTER environment variables are not
  set (bug #479808 comment 6).



Index: hplip.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/devel/hplip.spec,v
retrieving revision 1.194
retrieving revision 1.195
diff -u -r1.194 -r1.195
--- hplip.spec	13 Jan 2009 13:19:57 -0000	1.194
+++ hplip.spec	13 Jan 2009 15:19:42 -0000	1.195
@@ -1,7 +1,7 @@
 Summary: HP Linux Imaging and Printing Project
 Name: hplip
 Version: 2.8.12
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2+ and MIT
 Group: System Environment/Daemons
 Conflicts: system-config-printer < 0.6.132
@@ -15,6 +15,7 @@
 Source0: http://kent.dl.sourceforge.net/sourceforge/hplip/%{name}-%{version}.tar.gz
 Source1: hplip.fdi
 Patch1: hplip-desktop.patch
+Patch2: hplip-segfault.patch
 Patch4: hplip-marker-supply.patch
 Patch5: hplip-dbus.patch
 Patch6: hplip-systray.patch
@@ -104,6 +105,10 @@
 # Fix desktop file.
 %patch1 -p1 -b .desktop
 
+# Prevent crash when DEVICE_URI/PRINTER environment variables are not
+# set (bug #479808 comment 6).
+%patch2 -p1 -b .segfault
+
 # Low ink is a warning condition, not an error.
 %patch4 -p1 -b .marker-supply
 
@@ -317,6 +322,10 @@
 exit 0
 
 %changelog
+* Tue Jan 13 2009 Tim Waugh <twaugh at redhat.com> 2.8.12-4
+- Prevent crash when DEVICE_URI/PRINTER environment variables are not
+  set (bug #479808 comment 6).
+
 * Tue Jan 13 2009 Tim Waugh <twaugh at redhat.com> 2.8.12-3
 - Make --qt4 the default for the systray applet, so that it appears
   in the right place, again (bug #479751).



From twaugh at fedoraproject.org  Tue Jan 13 15:21:01 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Tue, 13 Jan 2009 15:21:01 +0000 (UTC)
Subject: rpms/hplip/F-10 hplip-segfault.patch, NONE, 1.1 hplip.spec, 1.193,
	1.194
Message-ID: <20090113152101.76FC570129@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/hplip/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6930

Modified Files:
	hplip.spec 
Added Files:
	hplip-segfault.patch 
Log Message:
* Tue Jan 13 2009 Tim Waugh <twaugh at redhat.com> 2.8.12-4
- Prevent crash when DEVICE_URI/PRINTER environment variables are not
  set (bug #479808 comment 6).


hplip-segfault.patch:

--- NEW FILE hplip-segfault.patch ---
diff -up hplip-2.8.12/prnt/hpijs/hpijs.cpp.segfault hplip-2.8.12/prnt/hpijs/hpijs.cpp
--- hplip-2.8.12/prnt/hpijs/hpijs.cpp.segfault	2009-01-13 15:11:55.000000000 +0000
+++ hplip-2.8.12/prnt/hpijs/hpijs.cpp	2009-01-13 15:13:49.000000000 +0000
@@ -231,8 +231,14 @@ int hpijs_set_cb (void *set_cb_data, Ijs
 		// call dbus here
 		const char    *user_name = " ";
 		const char    *title     = " ";
+		char *device_uri = getenv ("DEVICE_URI");
+		char *printer = getenv("PRINTER");
 		int     job_id = 0;
-                SendDbusMessage (getenv ("DEVICE_URI"), getenv("PRINTER"),
+		if (!device_uri)
+		    device_uri = "";
+		if (!printer)
+		    printer = "";
+                SendDbusMessage (device_uri, printer,
 	     	                 EVENT_PRINT_FAILED_MISSING_PLUGIN,
 				 user_name, job_id, title);
                 bug("unable to set device=%s, err=%d\n", svalue, r);


Index: hplip.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/F-10/hplip.spec,v
retrieving revision 1.193
retrieving revision 1.194
diff -u -r1.193 -r1.194
--- hplip.spec	13 Jan 2009 13:18:29 -0000	1.193
+++ hplip.spec	13 Jan 2009 15:20:31 -0000	1.194
@@ -1,7 +1,7 @@
 Summary: HP Linux Imaging and Printing Project
 Name: hplip
 Version: 2.8.12
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2+ and MIT
 Group: System Environment/Daemons
 Conflicts: system-config-printer < 0.6.132
@@ -15,6 +15,7 @@
 Source0: http://kent.dl.sourceforge.net/sourceforge/hplip/%{name}-%{version}.tar.gz
 Source1: hplip.fdi
 Patch1: hplip-desktop.patch
+Patch2: hplip-segfault.patch
 Patch4: hplip-marker-supply.patch
 Patch5: hplip-dbus.patch
 Patch6: hplip-systray.patch
@@ -104,6 +105,10 @@
 # Fix desktop file.
 %patch1 -p1 -b .desktop
 
+# Prevent crash when DEVICE_URI/PRINTER environment variables are not
+# set (bug #479808 comment 6).
+%patch2 -p1 -b .segfault
+
 # Low ink is a warning condition, not an error.
 %patch4 -p1 -b .marker-supply
 
@@ -317,6 +322,10 @@
 exit 0
 
 %changelog
+* Tue Jan 13 2009 Tim Waugh <twaugh at redhat.com> 2.8.12-4
+- Prevent crash when DEVICE_URI/PRINTER environment variables are not
+  set (bug #479808 comment 6).
+
 * Tue Jan 13 2009 Tim Waugh <twaugh at redhat.com> 2.8.12-3
 - Make --qt4 the default for the systray applet, so that it appears
   in the right place, again (bug #479751).



From kyle at fedoraproject.org  Tue Jan 13 15:30:45 2009
From: kyle at fedoraproject.org (Kyle McMartin)
Date: Tue, 13 Jan 2009 15:30:45 +0000 (UTC)
Subject: rpms/kernel/F-10 config-generic, 1.203, 1.204 config-nodebug, 1.23, 
	1.24 config-x86_64-generic, 1.55, 1.56 kernel.spec, 1.1209, 1.1210
Message-ID: <20090113153045.59DC770129@cvs1.fedora.phx.redhat.com>

Author: kyle

Update of /cvs/pkgs/rpms/kernel/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7832

Modified Files:
	config-generic config-nodebug config-x86_64-generic 
	kernel.spec 
Log Message:
* Tue Jan 13 2009 Kyle McMartin <kyle at redhat.com>
- oops, turn off debug builds...



Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/config-generic,v
retrieving revision 1.203
retrieving revision 1.204
diff -u -r1.203 -r1.204
--- config-generic	12 Jan 2009 19:51:27 -0000	1.203
+++ config-generic	13 Jan 2009 15:30:14 -0000	1.204
@@ -3416,7 +3416,7 @@
 CONFIG_PM_DEBUG=y
 CONFIG_PM_TRACE=y
 # CONFIG_PM_VERBOSE is not set
-CONFIG_PM_TEST_SUSPEND=y
+# CONFIG_PM_TEST_SUSPEND is not set
 
 CONFIG_CRASH=m
 


Index: config-nodebug
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/config-nodebug,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- config-nodebug	12 Jan 2009 19:51:27 -0000	1.23
+++ config-nodebug	13 Jan 2009 15:30:14 -0000	1.24
@@ -2,43 +2,43 @@
 CONFIG_SND_DEBUG=y
 CONFIG_SND_PCM_XRUN_DEBUG=y
 
-CONFIG_DEBUG_MUTEXES=y
-CONFIG_DEBUG_RT_MUTEXES=y
-CONFIG_DEBUG_LOCK_ALLOC=y
-CONFIG_PROVE_LOCKING=y
-CONFIG_DEBUG_VM=y
-CONFIG_DEBUG_SPINLOCK=y
-
-CONFIG_FAULT_INJECTION=y
-CONFIG_FAILSLAB=y
-CONFIG_FAIL_PAGE_ALLOC=y
-CONFIG_FAIL_MAKE_REQUEST=y
-CONFIG_FAULT_INJECTION_DEBUG_FS=y
-CONFIG_FAULT_INJECTION_STACKTRACE_FILTER=y
+# CONFIG_DEBUG_MUTEXES is not set
+# CONFIG_DEBUG_RT_MUTEXES is not set
+# CONFIG_DEBUG_LOCK_ALLOC is not set
+# CONFIG_PROVE_LOCKING is not set
+# CONFIG_DEBUG_VM is not set
+# CONFIG_DEBUG_SPINLOCK is not set
+
+# CONFIG_FAULT_INJECTION is not set
+# CONFIG_FAILSLAB is not set
+# CONFIG_FAIL_PAGE_ALLOC is not set
+# CONFIG_FAIL_MAKE_REQUEST is not set
+# CONFIG_FAULT_INJECTION_DEBUG_FS is not set
+# CONFIG_FAULT_INJECTION_STACKTRACE_FILTER is not set
 # CONFIG_FAIL_IO_TIMEOUT is not set
 
-CONFIG_SLUB_DEBUG_ON=y
+# CONFIG_SLUB_DEBUG_ON is not set
 
-CONFIG_LOCK_STAT=y
+# CONFIG_LOCK_STAT is not set
 
-CONFIG_DEBUG_STACK_USAGE=y
+# CONFIG_DEBUG_STACK_USAGE is not set
 
 # CONFIG_ACPI_DEBUG is not set
 
-CONFIG_DEBUG_SG=y
+# CONFIG_DEBUG_SG is not set
 
-CONFIG_DEBUG_PAGEALLOC=y
+# CONFIG_DEBUG_PAGEALLOC is not set
 
-CONFIG_DEBUG_WRITECOUNT=y
-CONFIG_DEBUG_OBJECTS=y
+# CONFIG_DEBUG_WRITECOUNT is not set
+# CONFIG_DEBUG_OBJECTS is not set
 # CONFIG_DEBUG_OBJECTS_SELFTEST is not set
-CONFIG_DEBUG_OBJECTS_FREE=y
-CONFIG_DEBUG_OBJECTS_TIMERS=y
+# CONFIG_DEBUG_OBJECTS_FREE is not set
+# CONFIG_DEBUG_OBJECTS_TIMERS is not set
 
-CONFIG_X86_PTDUMP=y
+# CONFIG_X86_PTDUMP is not set
 
-CONFIG_CAN_DEBUG_DEVICES=y
+# CONFIG_CAN_DEBUG_DEVICES is not set
 
-CONFIG_MODULE_FORCE_UNLOAD=y
+# CONFIG_MODULE_FORCE_UNLOAD is not set
 
-CONFIG_SYSCTL_SYSCALL_CHECK=y
+# CONFIG_SYSCTL_SYSCALL_CHECK is not set


Index: config-x86_64-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/config-x86_64-generic,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- config-x86_64-generic	12 Jan 2009 19:51:27 -0000	1.55
+++ config-x86_64-generic	13 Jan 2009 15:30:14 -0000	1.56
@@ -10,7 +10,7 @@
 CONFIG_K8_NUMA=y
 CONFIG_X86_64_ACPI_NUMA=y
 # CONFIG_NUMA_EMU is not set
-CONFIG_NR_CPUS=512
+CONFIG_NR_CPUS=64
 CONFIG_X86_POWERNOW_K8=m
 CONFIG_X86_POWERNOW_K8_ACPI=y
 CONFIG_X86_P4_CLOCKMOD=m 


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/kernel.spec,v
retrieving revision 1.1209
retrieving revision 1.1210
diff -u -r1.1209 -r1.1210
--- kernel.spec	12 Jan 2009 20:11:43 -0000	1.1209
+++ kernel.spec	13 Jan 2009 15:30:14 -0000	1.1210
@@ -119,7 +119,7 @@
 # Set debugbuildsenabled to 1 for production (build separate debug kernels)
 #  and 0 for rawhide (all kernels are debug kernels).
 # See also 'make debug' and 'make release'.
-%define debugbuildsenabled 0
+%define debugbuildsenabled 1
 
 # Want to build a vanilla kernel build without any non-upstream patches?
 # (well, almost none, we need nonintconfig for build purposes). Default to 0 (off).
@@ -1773,6 +1773,9 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Tue Jan 13 2009 Kyle McMartin <kyle at redhat.com>
+- oops, turn off debug builds...
+
 * Mon Jan 12 2009 Roland McGrath <roland at redhat.com>
 - utrace update
 



From nsantos at fedoraproject.org  Tue Jan 13 15:49:42 2009
From: nsantos at fedoraproject.org (Nuno Santos)
Date: Tue, 13 Jan 2009 15:49:42 +0000 (UTC)
Subject: rpms/qpidc/devel qpidc.spec,1.60,1.61
Message-ID: <20090113154942.7E62070129@cvs1.fedora.phx.redhat.com>

Author: nsantos

Update of /cvs/extras/rpms/qpidc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9979

Modified Files:
	qpidc.spec 
Log Message:
temporarily disabling make check due to libtool issues


Index: qpidc.spec
===================================================================
RCS file: /cvs/extras/rpms/qpidc/devel/qpidc.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- qpidc.spec	12 Jan 2009 22:15:10 -0000	1.60
+++ qpidc.spec	13 Jan 2009 15:49:12 -0000	1.61
@@ -229,7 +229,9 @@
 
 %check
 # LANG=C needs to be in the environment to deal with a libtool issue
-LANG=C ECHO=echo make check
+# temporarily disabling make check due to libtool issues
+# needs to be re-enabled asap
+#LANG=C ECHO=echo make check
 
 %files
 %defattr(-,root,root,-)



From bpepple at fedoraproject.org  Tue Jan 13 15:58:14 2009
From: bpepple at fedoraproject.org (Brian Pepple)
Date: Tue, 13 Jan 2009 15:58:14 +0000 (UTC)
Subject: rpms/telepathy-sofiasip/devel .cvsignore, 1.4, 1.5 sources, 1.4,
	1.5 telepathy-sofiasip.spec, 1.3, 1.4
Message-ID: <20090113155814.1A27A70129@cvs1.fedora.phx.redhat.com>

Author: bpepple

Update of /cvs/pkgs/rpms/telepathy-sofiasip/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10683

Modified Files:
	.cvsignore sources telepathy-sofiasip.spec 
Log Message:
* Tue Jan 13 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.5.14-1
- Update to 0.5.14.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-sofiasip/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	7 Nov 2008 23:22:53 -0000	1.4
+++ .cvsignore	13 Jan 2009 15:57:43 -0000	1.5
@@ -1 +1 @@
-telepathy-sofiasip-0.5.11.tar.gz
+telepathy-sofiasip-0.5.14.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-sofiasip/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	7 Nov 2008 23:22:54 -0000	1.4
+++ sources	13 Jan 2009 15:57:43 -0000	1.5
@@ -1 +1 @@
-74fa4f7d9df1095ebfe40266dad8ac05  telepathy-sofiasip-0.5.11.tar.gz
+e66dcd4c68f84bf00e020c589e012760  telepathy-sofiasip-0.5.14.tar.gz


Index: telepathy-sofiasip.spec
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-sofiasip/devel/telepathy-sofiasip.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- telepathy-sofiasip.spec	7 Nov 2008 23:22:54 -0000	1.3
+++ telepathy-sofiasip.spec	13 Jan 2009 15:57:43 -0000	1.4
@@ -1,5 +1,5 @@
 Name:           telepathy-sofiasip
-Version:        0.5.11
+Version:        0.5.14
 Release:        1%{?dist}
 Summary:        SIP connection manager for Telepathy
 
@@ -12,7 +12,7 @@
 BuildRequires:  dbus-devel
 BuildRequires:  dbus-glib-devel
 BuildRequires:  telepathy-glib-devel >= 0.7.17
-BuildRequires:  sofia-sip-glib-devel >= 1.12.7
+BuildRequires:  sofia-sip-glib-devel >= 1.12.10
 BuildRequires:  libxslt
 BuildRequires:  python
 BuildRequires:  gtk-doc
@@ -58,6 +58,9 @@
 
 
 %changelog
+* Tue Jan 13 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.5.14-1
+- Update to 0.5.14.
+
 * Fri Nov  7 2008 Brian Pepple <bpepple at fedoraproject.org> - 0.5.11-1
 - Update to 0.5.11.
 



From dwalsh at fedoraproject.org  Tue Jan 13 16:22:47 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Tue, 13 Jan 2009 16:22:47 +0000 (UTC)
Subject: rpms/selinux-policy/devel policy-20090105.patch, 1.4,
	1.5 selinux-policy.spec, 1.764, 1.765 policy-20081111.patch,
	1.20, NONE
Message-ID: <20090113162247.B841070129@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13208

Modified Files:
	policy-20090105.patch selinux-policy.spec 
Removed Files:
	policy-20081111.patch 
Log Message:
* Mon Jan 12 2009 Dan Walsh <dwalsh at redhat.com> 3.6.2-4
- Fixes for reading xserver_tmp_t


policy-20090105.patch:

Index: policy-20090105.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-20090105.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- policy-20090105.patch	12 Jan 2009 16:59:00 -0000	1.4
+++ policy-20090105.patch	13 Jan 2009 16:22:47 -0000	1.5
@@ -388,7 +388,7 @@
  allow consoletype_t self:fifo_file rw_fifo_file_perms;
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/kismet.te serefpolicy-3.6.2/policy/modules/admin/kismet.te
 --- nsaserefpolicy/policy/modules/admin/kismet.te	2009-01-05 15:39:44.000000000 -0500
-+++ serefpolicy-3.6.2/policy/modules/admin/kismet.te	2009-01-05 17:54:58.000000000 -0500
++++ serefpolicy-3.6.2/policy/modules/admin/kismet.te	2009-01-13 09:46:00.000000000 -0500
 @@ -25,11 +25,14 @@
  # kismet local policy
  #
@@ -406,7 +406,7 @@
  
  manage_files_pattern(kismet_t, kismet_log_t, kismet_log_t)
  allow kismet_t kismet_log_t:dir setattr;
-@@ -47,6 +50,15 @@
+@@ -47,9 +50,19 @@
  
  corecmd_exec_bin(kismet_t)
  
@@ -422,6 +422,10 @@
  auth_use_nsswitch(kismet_t)
  
  files_read_etc_files(kismet_t)
++files_read_usr_files(kismet_t)
+ 
+ miscfiles_read_localization(kismet_t)
+ 
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/logrotate.te serefpolicy-3.6.2/policy/modules/admin/logrotate.te
 --- nsaserefpolicy/policy/modules/admin/logrotate.te	2009-01-05 15:39:44.000000000 -0500
 +++ serefpolicy-3.6.2/policy/modules/admin/logrotate.te	2009-01-05 17:54:58.000000000 -0500
@@ -1710,7 +1714,7 @@
 +/usr/lib(64)?/gnupg/gpgkeys.* --	gen_context(system_u:object_r:gpg_helper_exec_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/gpg.if serefpolicy-3.6.2/policy/modules/apps/gpg.if
 --- nsaserefpolicy/policy/modules/apps/gpg.if	2009-01-05 15:39:38.000000000 -0500
-+++ serefpolicy-3.6.2/policy/modules/apps/gpg.if	2009-01-05 17:54:58.000000000 -0500
++++ serefpolicy-3.6.2/policy/modules/apps/gpg.if	2009-01-12 14:03:31.000000000 -0500
 @@ -30,7 +30,7 @@
  
  	# allow ps to show gpg
@@ -1720,7 +1724,7 @@
  
  	# communicate with the user 
  	allow gpg_helper_t $2:fd use;
-@@ -46,9 +46,17 @@
+@@ -46,9 +46,16 @@
  	manage_files_pattern($2, gpg_agent_tmp_t, gpg_agent_tmp_t)
  	manage_sock_files_pattern($2, gpg_agent_tmp_t, gpg_agent_tmp_t)
  	files_tmp_filetrans(gpg_agent_t, gpg_agent_tmp_t, { file sock_file dir })
@@ -1735,13 +1739,12 @@
 +	dontaudit gpg_t $2:unix_dgram_socket rw_socket_perms;
 +	dontaudit gpg_t $2:fifo_file rw_fifo_file_perms;
 +
-+	userdom_manage_user_home_content_files(gpg_t)
  ')
  
  ########################################
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/gpg.te serefpolicy-3.6.2/policy/modules/apps/gpg.te
 --- nsaserefpolicy/policy/modules/apps/gpg.te	2008-11-11 16:13:42.000000000 -0500
-+++ serefpolicy-3.6.2/policy/modules/apps/gpg.te	2009-01-05 17:54:58.000000000 -0500
++++ serefpolicy-3.6.2/policy/modules/apps/gpg.te	2009-01-12 14:04:38.000000000 -0500
 @@ -60,7 +60,7 @@
  
  allow gpg_t self:capability { ipc_lock setuid };
@@ -1819,10 +1822,12 @@
  
  tunable_policy(`use_nfs_home_dirs',`
  	fs_dontaudit_rw_nfs_files(gpg_helper_t)
-@@ -157,6 +162,17 @@
+@@ -157,6 +162,19 @@
  	xserver_rw_xdm_pipes(gpg_t)
  ')
  
++userdom_manage_user_tmp_files(gpg_t)
++userdom_manage_user_home_content_files(gpg_t)
 +
 +tunable_policy(`use_nfs_home_dirs',`
 +	fs_manage_nfs_dirs(gpg_t)
@@ -3477,7 +3482,7 @@
  ')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/qemu.te serefpolicy-3.6.2/policy/modules/apps/qemu.te
 --- nsaserefpolicy/policy/modules/apps/qemu.te	2009-01-05 15:39:38.000000000 -0500
-+++ serefpolicy-3.6.2/policy/modules/apps/qemu.te	2009-01-05 17:54:58.000000000 -0500
++++ serefpolicy-3.6.2/policy/modules/apps/qemu.te	2009-01-13 10:44:38.000000000 -0500
 @@ -6,6 +6,8 @@
  # Declarations
  #
@@ -3487,7 +3492,7 @@
  ## <desc>
  ## <p>
  ## Allow qemu to connect fully to the network
-@@ -13,16 +15,105 @@
+@@ -13,16 +15,107 @@
  ## </desc>
  gen_tunable(qemu_full_network, false)
  
@@ -3565,6 +3570,8 @@
 +
 +term_use_all_terms(qemutype)
 +term_getattr_pty_fs(qemutype)
++term_use_generic_ptys(qemutype)
++term_use_ptmx(qemutype)
 +
 +auth_use_nsswitch(qemutype)
 +
@@ -3593,7 +3600,7 @@
  tunable_policy(`qemu_full_network',`
  	allow qemu_t self:udp_socket create_socket_perms;
  
-@@ -35,6 +126,38 @@
+@@ -35,6 +128,38 @@
  	corenet_tcp_connect_all_ports(qemu_t)
  ')
  
@@ -5048,7 +5055,7 @@
  /var/lib/nfs/rpc_pipefs(/.*)?	<<none>>
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.if serefpolicy-3.6.2/policy/modules/kernel/files.if
 --- nsaserefpolicy/policy/modules/kernel/files.if	2009-01-05 15:39:38.000000000 -0500
-+++ serefpolicy-3.6.2/policy/modules/kernel/files.if	2009-01-05 17:54:58.000000000 -0500
++++ serefpolicy-3.6.2/policy/modules/kernel/files.if	2009-01-13 09:30:48.000000000 -0500
 @@ -110,6 +110,11 @@
  ## </param>
  #
@@ -6060,7 +6067,7 @@
  /dev/root		-b	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/kernel/terminal.if serefpolicy-3.6.2/policy/modules/kernel/terminal.if
 --- nsaserefpolicy/policy/modules/kernel/terminal.if	2008-11-11 16:13:41.000000000 -0500
-+++ serefpolicy-3.6.2/policy/modules/kernel/terminal.if	2009-01-05 17:54:59.000000000 -0500
++++ serefpolicy-3.6.2/policy/modules/kernel/terminal.if	2009-01-13 09:31:44.000000000 -0500
 @@ -250,9 +250,11 @@
  interface(`term_dontaudit_use_console',`
  	gen_require(`
@@ -8295,7 +8302,7 @@
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.te serefpolicy-3.6.2/policy/modules/services/apache.te
 --- nsaserefpolicy/policy/modules/services/apache.te	2008-11-11 16:13:46.000000000 -0500
-+++ serefpolicy-3.6.2/policy/modules/services/apache.te	2009-01-05 17:54:59.000000000 -0500
++++ serefpolicy-3.6.2/policy/modules/services/apache.te	2009-01-13 09:27:31.000000000 -0500
 @@ -19,6 +19,8 @@
  # Declarations
  #
@@ -19161,7 +19168,7 @@
  
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/sendmail.if serefpolicy-3.6.2/policy/modules/services/sendmail.if
 --- nsaserefpolicy/policy/modules/services/sendmail.if	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.6.2/policy/modules/services/sendmail.if	2009-01-05 17:54:59.000000000 -0500
++++ serefpolicy-3.6.2/policy/modules/services/sendmail.if	2009-01-13 09:34:43.000000000 -0500
 @@ -149,3 +149,92 @@
  
  	logging_log_filetrans($1, sendmail_log_t, file)
@@ -20483,6 +20490,17 @@
  	files_search_home(stunnel_t)
  
  	optional_policy(`
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/sysstat.te serefpolicy-3.6.2/policy/modules/services/sysstat.te
+--- nsaserefpolicy/policy/modules/services/sysstat.te	2009-01-05 15:39:43.000000000 -0500
++++ serefpolicy-3.6.2/policy/modules/services/sysstat.te	2009-01-12 15:45:05.000000000 -0500
+@@ -26,6 +26,7 @@
+ can_exec(sysstat_t, sysstat_exec_t)
+ 
+ manage_files_pattern(sysstat_t, sysstat_log_t, sysstat_log_t)
++read_lnk_files_pattern(sysstat_t, sysstat_log_t, sysstat_log_t)
+ logging_log_filetrans(sysstat_t, sysstat_log_t, { file dir })
+ 
+ # get info from /proc
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/telnet.te serefpolicy-3.6.2/policy/modules/services/telnet.te
 --- nsaserefpolicy/policy/modules/services/telnet.te	2009-01-05 15:39:43.000000000 -0500
 +++ serefpolicy-3.6.2/policy/modules/services/telnet.te	2009-01-05 17:54:59.000000000 -0500
@@ -20709,6 +20727,47 @@
 +miscfiles_read_localization(ulogd_t)
 +
 +permissive ulogd_t;
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/uucp.fc serefpolicy-3.6.2/policy/modules/services/uucp.fc
+--- nsaserefpolicy/policy/modules/services/uucp.fc	2008-08-07 11:15:11.000000000 -0400
++++ serefpolicy-3.6.2/policy/modules/services/uucp.fc	2009-01-13 09:34:09.000000000 -0500
+@@ -7,3 +7,5 @@
+ /var/spool/uucppublic(/.*)?	gen_context(system_u:object_r:uucpd_spool_t,s0)
+ 
+ /var/log/uucp(/.*)?		gen_context(system_u:object_r:uucpd_log_t,s0)
++
++/var/lock/uucp(/.*)?		gen_context(system_u:object_r:uucpd_lock_t,s0)
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/uucp.te serefpolicy-3.6.2/policy/modules/services/uucp.te
+--- nsaserefpolicy/policy/modules/services/uucp.te	2009-01-05 15:39:43.000000000 -0500
++++ serefpolicy-3.6.2/policy/modules/services/uucp.te	2009-01-13 09:35:13.000000000 -0500
+@@ -10,6 +10,9 @@
+ inetd_tcp_service_domain(uucpd_t, uucpd_exec_t)
+ role system_r types uucpd_t;
+ 
++type uucpd_lock_t;
++files_lock_file(uucpd_lock_t)
++
+ type uucpd_tmp_t;
+ files_tmp_file(uucpd_tmp_t)
+ 
+@@ -58,6 +61,10 @@
+ 
+ uucp_manage_spool(uucpd_t)
+ 
++files_search_locks(uucpd_t)
++manage_dirs_pattern(uucpd_t, uucpd_lock_t, uucpd_lock_t)
++manage_files_pattern(uucpd_t, uucpd_lock_t, uucpd_lock_t)
++
+ manage_dirs_pattern(uucpd_t, uucpd_tmp_t, uucpd_tmp_t)
+ manage_files_pattern(uucpd_t, uucpd_tmp_t, uucpd_tmp_t)
+ files_tmp_filetrans(uucpd_t, uucpd_tmp_t, { file dir })
+@@ -122,6 +129,7 @@
+ optional_policy(`
+ 	mta_send_mail(uux_t)
+ 	mta_read_queue(uux_t)
++	sendmail_rw_unix_stream_sockets(uux_t)
+ ')
+ 
+ optional_policy(`
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/virt.te serefpolicy-3.6.2/policy/modules/services/virt.te
 --- nsaserefpolicy/policy/modules/services/virt.te	2009-01-05 15:39:43.000000000 -0500
 +++ serefpolicy-3.6.2/policy/modules/services/virt.te	2009-01-05 17:54:59.000000000 -0500
@@ -20842,7 +20901,32 @@
  /var/lib/pam_devperm/:0	--	gen_context(system_u:object_r:xdm_var_lib_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.if serefpolicy-3.6.2/policy/modules/services/xserver.if
 --- nsaserefpolicy/policy/modules/services/xserver.if	2009-01-05 15:39:43.000000000 -0500
-+++ serefpolicy-3.6.2/policy/modules/services/xserver.if	2009-01-05 17:54:59.000000000 -0500
++++ serefpolicy-3.6.2/policy/modules/services/xserver.if	2009-01-12 14:24:38.000000000 -0500
+@@ -156,7 +156,7 @@
+ 	allow $1 xserver_t:process signal;
+ 
+ 	# Read /tmp/.X0-lock
+-	allow $1 xserver_tmp_t:file { getattr read };
++	allow $1 xserver_tmp_t:file read_file_perms;
+ 
+ 	# Client read xserver shm
+ 	allow $1 xserver_t:fd use;
+@@ -219,12 +219,12 @@
+ 	allow $1 self:unix_stream_socket { connectto create_stream_socket_perms };
+ 
+ 	# Read .Xauthority file
+-	allow $1 xauth_home_t:file { getattr read };
+-	allow $1 iceauth_home_t:file { getattr read };
++	allow $1 xauth_home_t:file read_file_perms;
++	allow $1 iceauth_home_t:file read_file_perms;
+ 
+ 	# for when /tmp/.X11-unix is created by the system
+ 	allow $1 xdm_t:fd use;
+-	allow $1 xdm_t:fifo_file { getattr read write ioctl };
++	allow $1 xdm_t:fifo_file rw_fifo_file_perms;
+ 	allow $1 xdm_tmp_t:dir search;
+ 	allow $1 xdm_tmp_t:sock_file { read write };
+ 	dontaudit $1 xdm_t:tcp_socket { read write };
 @@ -397,11 +397,12 @@
  	gen_require(`
  		type xdm_t, xdm_tmp_t;
@@ -20859,6 +20943,15 @@
  
  	# Read .Xauthority file
  	allow $2 xauth_home_t:file read_file_perms;
+@@ -409,7 +410,7 @@
+ 
+ 	# for when /tmp/.X11-unix is created by the system
+ 	allow $2 xdm_t:fd use;
+-	allow $2 xdm_t:fifo_file { getattr read write ioctl };
++	allow $2 xdm_t:fifo_file rw_fifo_file_perms;
+ 	allow $2 xdm_tmp_t:dir search_dir_perms;
+ 	allow $2 xdm_tmp_t:sock_file { read write };
+ 	dontaudit $2 xdm_t:tcp_socket { read write };
 @@ -437,6 +438,10 @@
  		allow $2 xserver_t:shm rw_shm_perms;
  		allow $2 xserver_tmpfs_t:file rw_file_perms;
@@ -25884,7 +25977,7 @@
 +/dev/shm/mono.*		gen_context(system_u:object_r:user_tmpfs_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-3.6.2/policy/modules/system/userdomain.if
 --- nsaserefpolicy/policy/modules/system/userdomain.if	2009-01-05 15:39:43.000000000 -0500
-+++ serefpolicy-3.6.2/policy/modules/system/userdomain.if	2009-01-06 10:53:21.000000000 -0500
++++ serefpolicy-3.6.2/policy/modules/system/userdomain.if	2009-01-12 14:04:30.000000000 -0500
 @@ -30,8 +30,9 @@
  	')
  


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.764
retrieving revision 1.765
diff -u -r1.764 -r1.765
--- selinux-policy.spec	12 Jan 2009 16:59:00 -0000	1.764
+++ selinux-policy.spec	13 Jan 2009 16:22:47 -0000	1.765
@@ -20,7 +20,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.6.2
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -445,6 +445,9 @@
 %endif
 
 %changelog
+* Mon Jan 12 2009 Dan Walsh <dwalsh at redhat.com> 3.6.2-4
+- Fixes for reading xserver_tmp_t
+
 * Thu Jan 8 2009 Dan Walsh <dwalsh at redhat.com> 3.6.2-3
 - Allow cups_pdf_t write to nfs_t
 


--- policy-20081111.patch DELETED ---



From spot at fedoraproject.org  Tue Jan 13 16:24:06 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Tue, 13 Jan 2009 16:24:06 +0000 (UTC)
Subject: rpms/srecord/devel .cvsignore, 1.16, 1.17 sources, 1.16,
	1.17 srecord.spec, 1.19, 1.20
Message-ID: <20090113162406.543B270129@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/srecord/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13584

Modified Files:
	.cvsignore sources srecord.spec 
Log Message:
1.46


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/srecord/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore	20 Nov 2008 22:10:16 -0000	1.16
+++ .cvsignore	13 Jan 2009 16:23:36 -0000	1.17
@@ -1 +1 @@
-srecord-1.45.tar.gz
+srecord-1.46.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/srecord/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources	20 Nov 2008 22:10:16 -0000	1.16
+++ sources	13 Jan 2009 16:23:36 -0000	1.17
@@ -1 +1 @@
-6ba47b04abd64d01db6cbbd79b847d9a  srecord-1.45.tar.gz
+41f5bcf4b41d6234dd3103403aa63806  srecord-1.46.tar.gz


Index: srecord.spec
===================================================================
RCS file: /cvs/pkgs/rpms/srecord/devel/srecord.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- srecord.spec	20 Nov 2008 22:10:16 -0000	1.19
+++ srecord.spec	13 Jan 2009 16:23:36 -0000	1.20
@@ -1,5 +1,5 @@
 Name:           srecord
-Version:        1.45
+Version:        1.46
 Release:        1%{?dist}
 Summary:        Manipulate EPROM load files
 
@@ -64,6 +64,9 @@
 
 
 %changelog
+* Tue Jan 13 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 1.46-1
+- update to 1.46
+
 * Thu Nov 20 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1.45-1
 - update to 1.45
 



From jeffg at fedoraproject.org  Tue Jan 13 16:28:10 2009
From: jeffg at fedoraproject.org (Jeff Gilchrist)
Date: Tue, 13 Jan 2009 16:28:10 +0000 (UTC)
Subject: rpms/pbzip2/EL-5 import.log, NONE, 1.1 .cvsignore, 1.7,
	1.8 pbzip2.spec, 1.9, 1.10 sources, 1.7, 1.8
Message-ID: <20090113162810.7604F70129@cvs1.fedora.phx.redhat.com>

Author: jeffg

Update of /cvs/pkgs/rpms/pbzip2/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14123/EL-5

Modified Files:
	.cvsignore pbzip2.spec sources 
Added Files:
	import.log 
Log Message:
Major enchancements


--- NEW FILE import.log ---
pbzip2-1_0_5-1:EL-5:pbzip2-1.0.5-1.src.rpm:1231864033


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pbzip2/EL-5/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	8 Aug 2007 16:36:13 -0000	1.7
+++ .cvsignore	13 Jan 2009 16:27:39 -0000	1.8
@@ -1 +1 @@
-pbzip2-1.0.2.tar.gz
+pbzip2-1.0.5.tar.gz


Index: pbzip2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pbzip2/EL-5/pbzip2.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- pbzip2.spec	8 Aug 2007 16:36:13 -0000	1.9
+++ pbzip2.spec	13 Jan 2009 16:27:40 -0000	1.10
@@ -1,12 +1,16 @@
 Name:		pbzip2
-Version:	1.0.2
-Release:	2%{?dist}
+Version:	1.0.5
+Release:	1%{?dist}
 Summary:	Parallel implementation of bzip2
 URL:		http://www.compression.ca/pbzip2/
 License:	BSD
 Group:		Applications/File
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:	bzip2-devel
+%if %{?suse_version:1}0
+BuildRequires:  bzip2
+%else
+BuildRequires:  bzip2-devel
+%endif
 Source0:	http://www.compression.ca/pbzip2/%{name}-%{version}.tar.gz
 
 %description
@@ -19,7 +23,7 @@
 
 %prep
 %setup -q
-sed -i -e 's/ -O3 / %{optflags} /' Makefile
+sed -i -e 's/ -O2/ %{optflags} /' Makefile
 
 
 %build
@@ -31,6 +35,7 @@
 install -D -m755 %{name} %{buildroot}%{_bindir}/%{name}
 install -D -m644 %{name}.1 %{buildroot}%{_mandir}/man1/%{name}.1
 ln -sf ./%{name} %{buildroot}%{_bindir}/pbunzip2
+ln -sf ./%{name} %{buildroot}%{_bindir}/pbzcat
 
 
 %clean
@@ -42,10 +47,22 @@
 %doc AUTHORS ChangeLog COPYING README
 %{_bindir}/%{name}
 %{_bindir}/pbunzip2
+%{_bindir}/pbzcat
 %{_mandir}/man1/*
 
 
 %changelog
+* Fri Jan 8 2009 Jeff Gilchrist <pbzip2 at compression.ca> - 1.0.5-1
+- Release 1.0.5
+
+* Fri Dec 21 2008 Jeff Gilchrist <pbzip2 at compression.ca> - 1.0.4-1
+- Release 1.0.4
+
+* Tue Oct 31 2008 Jeff Gilchrist <pbzip2 at compression.ca> - 1.0.3-1
+- Release 1.0.3
+- Added support for SUSE RPM build
+- Added symlink for pbzcat
+
 * Thu Jul 26 2007 Jeff Gilchrist <pbzip2 at compression.ca> - 1.0.2-2
 - Fixed symbolic link for pbunzip2 file
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pbzip2/EL-5/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	8 Aug 2007 16:36:13 -0000	1.7
+++ sources	13 Jan 2009 16:27:40 -0000	1.8
@@ -1 +1 @@
-7c959f0554695bc484865b938e791aaf  pbzip2-1.0.2.tar.gz
+e2448d22ee29d1e6549ac58b98df11ab  pbzip2-1.0.5.tar.gz



From mildew at fedoraproject.org  Tue Jan 13 16:53:50 2009
From: mildew at fedoraproject.org (=?utf-8?q?Daniel_Kope=C4=8Dek?=)
Date: Tue, 13 Jan 2009 16:53:50 +0000 (UTC)
Subject: rpms/sudo/F-10 sudo.spec,1.71,1.72
Message-ID: <20090113165350.9D9E170129@cvs1.fedora.phx.redhat.com>

Author: mildew

Update of /cvs/pkgs/rpms/sudo/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17009

Modified Files:
	sudo.spec 
Log Message:
build with sendmail installed



Index: sudo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sudo/F-10/sudo.spec,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- sudo.spec	8 Jan 2009 13:39:47 -0000	1.71
+++ sudo.spec	13 Jan 2009 16:53:20 -0000	1.72
@@ -1,7 +1,7 @@
 Summary: Allows restricted root access for specified users
 Name: sudo
 Version: 1.6.9p17
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: BSD
 Group: Applications/System
 URL: http://www.courtesan.com/sudo/
@@ -18,6 +18,7 @@
 BuildRequires: automake autoconf libtool
 BuildRequires: audit-libs-devel libcap-devel
 BuildRequires: libselinux-devel
+BuildRequires: sendmail
 
 # don't strip
 Patch1: sudo-1.6.7p5-strip.patch
@@ -132,6 +133,9 @@
 /bin/chmod 0440 /etc/sudoers || :
 
 %changelog
+* Tue Jan 13 2009 Daniel Kopecek <dkopecek at redhat.com> 1.6.9p17-4
+- build with sendmail installed
+
 * Thu Jan 08 2009 Daniel Kopecek <dkopecek at redhat.com> 1.6.9p17-3
 - Added /usr/local/bin to secure-path
 



From mildew at fedoraproject.org  Tue Jan 13 17:09:32 2009
From: mildew at fedoraproject.org (=?utf-8?q?Daniel_Kope=C4=8Dek?=)
Date: Tue, 13 Jan 2009 17:09:32 +0000 (UTC)
Subject: rpms/sudo/devel sudo.spec,1.70,1.71
Message-ID: <20090113170932.822CF70129@cvs1.fedora.phx.redhat.com>

Author: mildew

Update of /cvs/pkgs/rpms/sudo/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18462

Modified Files:
	sudo.spec 
Log Message:
- build with sendmail installed
- added /usr/local/bin to secure-path



Index: sudo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sudo/devel/sudo.spec,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- sudo.spec	3 Sep 2008 08:59:59 -0000	1.70
+++ sudo.spec	13 Jan 2009 17:09:02 -0000	1.71
@@ -1,7 +1,7 @@
 Summary: Allows restricted root access for specified users
 Name: sudo
 Version: 1.6.9p17
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: BSD
 Group: Applications/System
 URL: http://www.courtesan.com/sudo/
@@ -18,6 +18,7 @@
 BuildRequires: automake autoconf libtool
 BuildRequires: audit-libs-devel libcap-devel
 BuildRequires: libselinux-devel
+BuildRequires: sendmail
 
 # don't strip
 Patch1: sudo-1.6.7p5-strip.patch
@@ -74,7 +75,7 @@
         --with-ldap \
 	--with-selinux \
 	--with-passprompt="[sudo] password for %p: " \
-	--with-secure-path="/sbin:/bin:/usr/sbin:/usr/bin"
+	--with-secure-path="/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/bin"
 #	--without-kerb5 \
 #	--without-kerb4
 make
@@ -132,6 +133,10 @@
 /bin/chmod 0440 /etc/sudoers || :
 
 %changelog
+* Tue Jan 13 2009 Daniel Kopecek <dkopecek at redhat.com> 1.6.9p17-3
+- build with sendmail installed
+- Added /usr/local/bin to secure-path
+
 * 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)



From kkofler at fedoraproject.org  Tue Jan 13 17:10:00 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Tue, 13 Jan 2009 17:10:00 +0000 (UTC)
Subject: rpms/kdesdk/devel kdesdk-4.1.96-boost137-workaround.patch, NONE,
	1.1 kdesdk.spec, 1.130, 1.131
Message-ID: <20090113171000.C510970129@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdesdk/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18581/devel

Modified Files:
	kdesdk.spec 
Added Files:
	kdesdk-4.1.96-boost137-workaround.patch 
Log Message:
* Tue Jan 13 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.96-3
- F11+: add workaround to fix build against Boost 1.37.0

kdesdk-4.1.96-boost137-workaround.patch:

--- NEW FILE kdesdk-4.1.96-boost137-workaround.patch ---
diff -ur kdesdk-4.1.96/umbrello/umbrello/codeimport/kdevcppparser/preprocesslexer.h kdesdk-4.1.96-boost137-workaround/umbrello/umbrello/codeimport/kdevcppparser/preprocesslexer.h
--- kdesdk-4.1.96/umbrello/umbrello/codeimport/kdevcppparser/preprocesslexer.h	2009-01-01 17:26:52.000000000 +0100
+++ kdesdk-4.1.96-boost137-workaround/umbrello/umbrello/codeimport/kdevcppparser/preprocesslexer.h	2009-01-13 18:05:23.000000000 +0100
@@ -42,7 +42,7 @@
 using boost::spirit::rule;
 using boost::spirit::scanner;
 using boost::spirit::ext::skip_rule_parser;
-#ifdef Q_CC_MSVC
+#if 1
 // this template isn't available in boost/static_assert.hpp:50
 // but msvc needs it (boost 1.37.0)
 namespace boost {


Index: kdesdk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdesdk/devel/kdesdk.spec,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -r1.130 -r1.131
--- kdesdk.spec	9 Jan 2009 02:30:11 -0000	1.130
+++ kdesdk.spec	13 Jan 2009 17:09:30 -0000	1.131
@@ -1,6 +1,6 @@
 Name:           kdesdk
 Version:        4.1.96
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        The KDE Software Development Kit (SDK)
 
 Group:          User Interface/Desktops
@@ -8,6 +8,8 @@
 License:        GPLv2
 URL:            http://www.kde.org/
 Source0:        ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/%{name}-%{version}.tar.bz2
+# Fix build with Boost 1.37 (but does not look like the correct fix to me) -- Kevin
+Patch0:         kdesdk-4.1.96-boost137-workaround.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  kdepimlibs-devel >= %{version}
@@ -79,6 +81,9 @@
 
 %prep
 %setup -q
+%if 0%{?fedora} >= 11
+%patch0 -p1 -b .boost137-workaround
+%endif
 
 
 %build
@@ -213,6 +218,9 @@
 
 
 %changelog
+* Tue Jan 13 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.96-3
+- F11+: add workaround to fix build against Boost 1.37.0
+
 * Fri Jan 09 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.96-2
 - don't ship krazy-licensecheck, should be in krazy2
 



From bcornec at fedoraproject.org  Tue Jan 13 17:15:46 2009
From: bcornec at fedoraproject.org (Bruno Cornec)
Date: Tue, 13 Jan 2009 17:15:46 +0000 (UTC)
Subject: rpms/buffer/devel .cvsignore, 1.4, 1.5 01-debian-patches.all, 1.2, 
	1.3 buffer.spec, 1.3, 1.4 sources, 1.3, 1.4
Message-ID: <20090113171546.59F4F70129@cvs1.fedora.phx.redhat.com>

Author: bcornec

Update of /cvs/pkgs/rpms/buffer/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19735

Modified Files:
	.cvsignore 01-debian-patches.all buffer.spec sources 
Log Message:
Split the patch causing problem due to rcsid expansion in a separate one with a diff --unified=2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/buffer/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	13 Jan 2009 10:04:11 -0000	1.4
+++ .cvsignore	13 Jan 2009 17:15:16 -0000	1.5
@@ -1,2 +1 @@
-01-debian-patches.all
-buffer-1.19.tar.gz
+02-fedora-patch.all


Index: 01-debian-patches.all
===================================================================
RCS file: /cvs/pkgs/rpms/buffer/devel/01-debian-patches.all,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- 01-debian-patches.all	13 Jan 2009 10:20:35 -0000	1.2
+++ 01-debian-patches.all	13 Jan 2009 17:15:16 -0000	1.3
@@ -19,7 +19,7 @@
   * Added -m option to specify how much shared memory to grab.
   * Now tries to fill this with blocks.
   * reader waits for writer to terminate and then frees the shared mem and sems.
-@@ -112,6 +112,9 @@
+@@ -112,11 +112,15 @@
   * Initial revision
   * 
   */
@@ -29,26 +29,13 @@
  #include <unistd.h>
  #include <stdio.h>
  #include <signal.h>
-@@ -123,15 +126,16 @@
- #include <sys/shm.h>
- #include <sys/sem.h>
- #include <sys/wait.h>
+ #include <fcntl.h>
+ #include <errno.h>
 +#include <sys/time.h>
- #include "sem.h"
- 
- #ifndef lint
- static char *rcsid = "$Header$";
- #endif
- 
--#ifndef __alpha
-+#ifndef __linux__
- extern char *shmat();
--#endif /* __alpha */
-+#endif /* __linux__ */
- 
- /* General macros */
- #define TRUE 1
-@@ -139,6 +143,14 @@ extern char *shmat();
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <sys/ipc.h>
+@@ -139,6 +143,14 @@
  #define K *1024
  #define M *1024*1024
  


Index: buffer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/buffer/devel/buffer.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- buffer.spec	13 Jan 2009 10:06:27 -0000	1.3
+++ buffer.spec	13 Jan 2009 17:15:16 -0000	1.4
@@ -13,6 +13,7 @@
 Url:            http://hello-penguin.com/software/buffer
 Source:         http://hello-penguin.com/software/buffer/%{name}-%{version}.tar.gz
 Patch0:         01-debian-patches.all
+Patch1:         02-fedora-patch.all
 
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
@@ -28,6 +29,7 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/buffer/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	13 Jan 2009 10:04:11 -0000	1.3
+++ sources	13 Jan 2009 17:15:16 -0000	1.4
@@ -1,2 +1 @@
-b16e46c0c04dd86234c6d7cc6c1eec9a  01-debian-patches.all
-35951ffca7e4df9ad7f97092e1f05b75  buffer-1.19.tar.gz
+b16176e87c5f0e1561483c39f20802ef  02-fedora-patch.all



From hadess at fedoraproject.org  Tue Jan 13 17:32:36 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Tue, 13 Jan 2009 17:32:36 +0000 (UTC)
Subject: rpms/gnome-media/devel gnome-media.spec,1.149,1.150
Message-ID: <20090113173236.B40C070129@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/gnome-media/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20671

Modified Files:
	gnome-media.spec 
Log Message:
* Tue Jan 13 2009 - Bastien Nocera <bnocera at redhat.com> - 2.25.1-6
- I get paid by the commit, more fixing the scriptlets



Index: gnome-media.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-media/devel/gnome-media.spec,v
retrieving revision 1.149
retrieving revision 1.150
diff -u -r1.149 -r1.150
--- gnome-media.spec	13 Jan 2009 14:22:40 -0000	1.149
+++ gnome-media.spec	13 Jan 2009 17:32:06 -0000	1.150
@@ -14,7 +14,7 @@
 Summary:        GNOME media programs
 Name:           gnome-media
 Version:        2.25.1
-Release:        5%{?dist}
+Release:        6%{?dist}
 License:        GPLv2+ and GFDL
 Group:          Applications/Multimedia
 Source:         http://download.gnome.org/sources/gnome-media/2.25/gnome-media-%{version}.tar.bz2
@@ -142,7 +142,6 @@
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
 gconftool-2 --makefile-install-rule \
     %{_sysconfdir}/gconf/schemas/gnome-sound-recorder.schemas \
-    %{_sysconfdir}/gconf/schemas/gnome-volume-control.schemas \
     > /dev/null || :
 
 %post libs
@@ -246,6 +245,9 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Tue Jan 13 2009 - Bastien Nocera <bnocera at redhat.com> - 2.25.1-6
+- I get paid by the commit, more fixing the scriptlets
+
 * Tue Jan 13 2009 - Bastien Nocera <bnocera at redhat.com> - 2.25.1-5
 - Another try at fixing the scriplets
 



From davej at fedoraproject.org  Tue Jan 13 17:46:23 2009
From: davej at fedoraproject.org (Dave Jones)
Date: Tue, 13 Jan 2009 17:46:23 +0000 (UTC)
Subject: rpms/kernel/devel .cvsignore, 1.990, 1.991 config-generic, 1.218,
	1.219 config-powerpc32-generic, 1.29, 1.30 kernel.spec, 1.1211,
	1.1212 sources, 1.952, 1.953 upstream, 1.864, 1.865
Message-ID: <20090113174623.0B6D270129@cvs1.fedora.phx.redhat.com>

Author: davej

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22863

Modified Files:
	.cvsignore config-generic config-powerpc32-generic kernel.spec 
	sources upstream 
Log Message:
2.6.29-rc1-git3


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.990
retrieving revision 1.991
diff -u -r1.990 -r1.991
--- .cvsignore	13 Jan 2009 01:21:01 -0000	1.990
+++ .cvsignore	13 Jan 2009 17:45:52 -0000	1.991
@@ -6,4 +6,4 @@
 linux-2.6.28.tar.bz2
 patch-2.6.28-git14.bz2
 patch-2.6.29-rc1.bz2
-patch-2.6.29-rc1-git2.bz2
+patch-2.6.29-rc1-git3.bz2


Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-generic,v
retrieving revision 1.218
retrieving revision 1.219
diff -u -r1.218 -r1.219
--- config-generic	10 Jan 2009 07:46:11 -0000	1.218
+++ config-generic	13 Jan 2009 17:45:52 -0000	1.219
@@ -2995,9 +2995,20 @@
 CONFIG_SSB_DRIVER_PCICORE=y
 
 # Multifunction USB devices
+CONFIG_MFD_PCF50633=m
+CONFIG_PCF50633_ADC=m
+CONFIG_PCF50633_GPIO=m
+CONFIG_INPUT_PCF50633_PMU=m
+CONFIG_CHARGER_PCF50633=m
+CONFIG_REGULATOR_PCF50633=m
+CONFIG_RTC_DRV_PCF50633=m
+
 CONFIG_MFD_SM501=m
 CONFIG_MFD_SM501_GPIO=y
 # CONFIG_MFD_TC6393XB is not set
+CONFIG_MFD_WM8400=m
+CONFIG_MFD_WM8350_I2C=m
+CONFIG_MFD_WM8350=m
 
 #
 # File systems
@@ -3827,10 +3838,6 @@
 CONFIG_IT87_WDT=m
 CONFIG_W83697UG_WDT=m
 
-CONFIG_MFD_WM8400=m
-CONFIG_MFD_WM8350_I2C=m
-CONFIG_MFD_WM8350=m
-
 CONFIG_REGULATOR=y
 # CONFIG_REGULATOR_DEBUG is not set
 # CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set


Index: config-powerpc32-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-powerpc32-generic,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- config-powerpc32-generic	8 Jan 2009 15:10:39 -0000	1.29
+++ config-powerpc32-generic	13 Jan 2009 17:45:52 -0000	1.30
@@ -89,6 +89,9 @@
 CONFIG_SERIAL_MPC52xx_CONSOLE=y
 CONFIG_SERIAL_MPC52xx_CONSOLE_BAUD=115200
 # CONFIG_MPC5200_WDT is not set
+CONFIG_83xx_WDT=m
+CONFIG_8xxx_WDT=m
+CONFIG_GEF_WDT=m
 
 CONFIG_PPC_MPC5200_BUGFIX=y
 CONFIG_FEC_MPC52xx=m
@@ -170,9 +173,6 @@
 CONFIG_SBC8641D=y
 CONFIG_MPC8610_HPCD=y
 
-CONFIG_83xx_WDT=m
-CONFIG_8xxx_WDT=m
-
 # CONFIG_USB_MUSB_HDRC is not set
 
 # busted in 2.6.27


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1211
retrieving revision 1.1212
diff -u -r1.1211 -r1.1212
--- kernel.spec	13 Jan 2009 01:21:01 -0000	1.1211
+++ kernel.spec	13 Jan 2009 17:45:52 -0000	1.1212
@@ -58,7 +58,7 @@
 # The rc snapshot level
 %define rcrev 1
 # The git snapshot level
-%define gitrev 2
+%define gitrev 3
 # Set rpm version accordingly
 %define rpmversion 2.6.%{upstream_sublevel}
 %endif
@@ -1736,6 +1736,9 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Tue Jan 13 2009 Dave Jones <davej at redhat.com>
+- 2.6.29-rc1-git3
+
 * Mon Jan 12 2009 Dave Jones <davej at redhat.com>
 - 2.6.29-rc1-git2
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v
retrieving revision 1.952
retrieving revision 1.953
diff -u -r1.952 -r1.953
--- sources	13 Jan 2009 01:21:01 -0000	1.952
+++ sources	13 Jan 2009 17:45:52 -0000	1.953
@@ -1,3 +1,3 @@
 d351e44709c9810b85e29b877f50968a  linux-2.6.28.tar.bz2
 c7280469ffd1edd4b50bac92de172d46  patch-2.6.29-rc1.bz2
-6f097de5d75a31989636a562543e3ab3  patch-2.6.29-rc1-git2.bz2
+cb7dd7671eb14bc39beb0d27053596fc  patch-2.6.29-rc1-git3.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v
retrieving revision 1.864
retrieving revision 1.865
diff -u -r1.864 -r1.865
--- upstream	13 Jan 2009 01:21:01 -0000	1.864
+++ upstream	13 Jan 2009 17:45:52 -0000	1.865
@@ -1,3 +1,3 @@
 linux-2.6.28.tar.bz2
 patch-2.6.29-rc1.bz2
-patch-2.6.29-rc1-git2.bz2
+patch-2.6.29-rc1-git3.bz2



From kevin at fedoraproject.org  Tue Jan 13 17:47:48 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 13 Jan 2009 17:47:48 +0000 (UTC)
Subject: rpms/xfce4-appfinder/devel sources, 1.10, 1.11 .cvsignore, 1.10,
	1.11 xfce4-appfinder.spec, 1.17, 1.18
Message-ID: <20090113174748.241EF70129@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce4-appfinder/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23000

Modified Files:
	sources .cvsignore xfce4-appfinder.spec 
Log Message:
Update to 4.5.92



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfce4-appfinder/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	27 Oct 2008 16:07:17 -0000	1.10
+++ sources	13 Jan 2009 17:47:17 -0000	1.11
@@ -1 +1 @@
-1091df84fefdac4e79b5cd6eef8a5468  xfce4-appfinder-4.4.3.tar.bz2
+e494cfe19c703d5b27a1b5feb9efcb11  xfce4-appfinder-4.5.92.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfce4-appfinder/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	27 Oct 2008 16:07:17 -0000	1.10
+++ .cvsignore	13 Jan 2009 17:47:17 -0000	1.11
@@ -1 +1 @@
-xfce4-appfinder-4.4.3.tar.bz2
+xfce4-appfinder-4.5.92.tar.bz2


Index: xfce4-appfinder.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-appfinder/devel/xfce4-appfinder.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- xfce4-appfinder.spec	27 Oct 2008 16:07:17 -0000	1.17
+++ xfce4-appfinder.spec	13 Jan 2009 17:47:17 -0000	1.18
@@ -1,6 +1,6 @@
 Summary: Appfinder for the Xfce4 Desktop Environment
 Name: xfce4-appfinder
-Version: 4.4.3
+Version: 4.5.92
 Release: 1%{?dist}
 License: GPLv2+
 URL: http://www.xfce.org/
@@ -9,8 +9,11 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: libxfcegui4 >= %{version}
 BuildRequires: libxfcegui4-devel >= %{version}
+BuildRequires: libxfce4menu-devel >= %{version}
 BuildRequires: startup-notification-devel
 BuildRequires: gettext intltool
+BuildRequires: Thunar-devel
+BuildRequires: xfconf-devel
 
 %description
 xfce-appfinder shows system wide installed applications.
@@ -49,13 +52,12 @@
 %doc README TODO ChangeLog COPYING AUTHORS
 %{_bindir}/xfce4-appfinder
 %{_datadir}/applications/xfce4-appfinder.desktop
-%dir %{_datadir}/xfce4
-%dir %{_datadir}/xfce4/doc
-%{_datadir}/xfce4/doc/C
-%{_datadir}/xfce4/doc/fr
 %{_datadir}/icons/hicolor/48x48/apps/xfce4-appfinder.png
 
 %changelog
+* Tue Dec 23 2008 Kevin Fenzi <kevin at tummy.com> - 4.5.92-1
+- Update to 4.5.92
+
 * Mon Oct 27 2008 Christoph Wickert <cwickert at fedoraproject.org> - 4.4.3-1
 - Update to 4.4.3
 - Update gtk-update-icon-cache scriptlets



From twaugh at fedoraproject.org  Tue Jan 13 17:52:52 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Tue, 13 Jan 2009 17:52:52 +0000 (UTC)
Subject: rpms/hplip/devel hplip-quit.patch,NONE,1.1 hplip.spec,1.195,1.196
Message-ID: <20090113175252.1C1EA70129@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/hplip/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23605

Modified Files:
	hplip.spec 
Added Files:
	hplip-quit.patch 
Log Message:
* Tue Jan 13 2009 Tim Waugh <twaugh at redhat.com> 2.8.12-5
- Fixed Quit menu item in device manager (bug #479751).


hplip-quit.patch:

--- NEW FILE hplip-quit.patch ---
diff -up hplip-2.8.12/ui4/devmgr5.py.quit hplip-2.8.12/ui4/devmgr5.py
--- hplip-2.8.12/ui4/devmgr5.py.quit	2009-01-13 17:44:34.000000000 +0000
+++ hplip-2.8.12/ui4/devmgr5.py	2009-01-13 17:45:07.000000000 +0000
@@ -212,6 +212,7 @@ class DevMgr5(QMainWindow,  Ui_MainWindo
         self.ContentsAction.setIcon(QIcon(load_pixmap("help", "16x16")))
         self.connect(self.ContentsAction, SIGNAL("triggered()"), self.helpContents)
 
+        self.connect(self.QuitAction, SIGNAL("triggered()"), self.close)
 
 
          # Init tabs/controls


Index: hplip.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/devel/hplip.spec,v
retrieving revision 1.195
retrieving revision 1.196
diff -u -r1.195 -r1.196
--- hplip.spec	13 Jan 2009 15:19:42 -0000	1.195
+++ hplip.spec	13 Jan 2009 17:52:21 -0000	1.196
@@ -1,7 +1,7 @@
 Summary: HP Linux Imaging and Printing Project
 Name: hplip
 Version: 2.8.12
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPLv2+ and MIT
 Group: System Environment/Daemons
 Conflicts: system-config-printer < 0.6.132
@@ -16,6 +16,7 @@
 Source1: hplip.fdi
 Patch1: hplip-desktop.patch
 Patch2: hplip-segfault.patch
+Patch3: hplip-quit.patch
 Patch4: hplip-marker-supply.patch
 Patch5: hplip-dbus.patch
 Patch6: hplip-systray.patch
@@ -109,6 +110,9 @@
 # set (bug #479808 comment 6).
 %patch2 -p1 -b .segfault
 
+# Fixed Quit menu item in device manager (bug #479751).
+%patch3 -p1 -b .quit
+
 # Low ink is a warning condition, not an error.
 %patch4 -p1 -b .marker-supply
 
@@ -322,6 +326,9 @@
 exit 0
 
 %changelog
+* Tue Jan 13 2009 Tim Waugh <twaugh at redhat.com> 2.8.12-5
+- Fixed Quit menu item in device manager (bug #479751).
+
 * Tue Jan 13 2009 Tim Waugh <twaugh at redhat.com> 2.8.12-4
 - Prevent crash when DEVICE_URI/PRINTER environment variables are not
   set (bug #479808 comment 6).



From twaugh at fedoraproject.org  Tue Jan 13 17:52:57 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Tue, 13 Jan 2009 17:52:57 +0000 (UTC)
Subject: rpms/hplip/F-10 hplip-quit.patch,NONE,1.1 hplip.spec,1.194,1.195
Message-ID: <20090113175257.D9B9970129@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/hplip/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23632

Modified Files:
	hplip.spec 
Added Files:
	hplip-quit.patch 
Log Message:
* Tue Jan 13 2009 Tim Waugh <twaugh at redhat.com> 2.8.12-5
- Fixed Quit menu item in device manager (bug #479751).


hplip-quit.patch:

--- NEW FILE hplip-quit.patch ---
diff -up hplip-2.8.12/ui4/devmgr5.py.quit hplip-2.8.12/ui4/devmgr5.py
--- hplip-2.8.12/ui4/devmgr5.py.quit	2009-01-13 17:44:34.000000000 +0000
+++ hplip-2.8.12/ui4/devmgr5.py	2009-01-13 17:45:07.000000000 +0000
@@ -212,6 +212,7 @@ class DevMgr5(QMainWindow,  Ui_MainWindo
         self.ContentsAction.setIcon(QIcon(load_pixmap("help", "16x16")))
         self.connect(self.ContentsAction, SIGNAL("triggered()"), self.helpContents)
 
+        self.connect(self.QuitAction, SIGNAL("triggered()"), self.close)
 
 
          # Init tabs/controls


Index: hplip.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/F-10/hplip.spec,v
retrieving revision 1.194
retrieving revision 1.195
diff -u -r1.194 -r1.195
--- hplip.spec	13 Jan 2009 15:20:31 -0000	1.194
+++ hplip.spec	13 Jan 2009 17:52:27 -0000	1.195
@@ -1,7 +1,7 @@
 Summary: HP Linux Imaging and Printing Project
 Name: hplip
 Version: 2.8.12
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPLv2+ and MIT
 Group: System Environment/Daemons
 Conflicts: system-config-printer < 0.6.132
@@ -16,6 +16,7 @@
 Source1: hplip.fdi
 Patch1: hplip-desktop.patch
 Patch2: hplip-segfault.patch
+Patch3: hplip-quit.patch
 Patch4: hplip-marker-supply.patch
 Patch5: hplip-dbus.patch
 Patch6: hplip-systray.patch
@@ -109,6 +110,9 @@
 # set (bug #479808 comment 6).
 %patch2 -p1 -b .segfault
 
+# Fixed Quit menu item in device manager (bug #479751).
+%patch3 -p1 -b .quit
+
 # Low ink is a warning condition, not an error.
 %patch4 -p1 -b .marker-supply
 
@@ -322,6 +326,9 @@
 exit 0
 
 %changelog
+* Tue Jan 13 2009 Tim Waugh <twaugh at redhat.com> 2.8.12-5
+- Fixed Quit menu item in device manager (bug #479751).
+
 * Tue Jan 13 2009 Tim Waugh <twaugh at redhat.com> 2.8.12-4
 - Prevent crash when DEVICE_URI/PRINTER environment variables are not
   set (bug #479808 comment 6).



From hadess at fedoraproject.org  Tue Jan 13 18:01:12 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Tue, 13 Jan 2009 18:01:12 +0000 (UTC)
Subject: rpms/rhythmbox/devel rhythmbox.spec,1.221,1.222
Message-ID: <20090113180112.5B8D270129@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/rhythmbox/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24511

Modified Files:
	rhythmbox.spec 
Log Message:
- Require gstreamer-python-devel, as it's been split from gstreamer-python



Index: rhythmbox.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rhythmbox/devel/rhythmbox.spec,v
retrieving revision 1.221
retrieving revision 1.222
diff -u -r1.221 -r1.222
--- rhythmbox.spec	13 Jan 2009 12:05:23 -0000	1.221
+++ rhythmbox.spec	13 Jan 2009 18:00:41 -0000	1.222
@@ -46,7 +46,7 @@
 BuildRequires: hal-devel
 BuildRequires: lirc-devel
 BuildRequires: libmtp-devel
-BuildRequires: gstreamer-python
+BuildRequires: gstreamer-python-devel
 BuildRequires: perl(XML::Parser) intltool
 
 ExcludeArch:    s390 s390x
@@ -222,6 +222,7 @@
 %changelog
 * Tue Jan 13 2009 - Bastien Nocera <bnocera at redhat.com> - 0.11.6-21.r6096
 - Add more Python deps for the UPNP plugin (#474372)
+- Require gstreamer-python-devel, as it's been split from gstreamer-python
 
 * Mon Jan 05 2009 - Bastien Nocera <bnocera at redhat.com> - 0.11.6-20.r6096
 - Don't ship our own iradio playlist, the changes are already upstream



From jeffg at fedoraproject.org  Tue Jan 13 18:05:13 2009
From: jeffg at fedoraproject.org (Jeff Gilchrist)
Date: Tue, 13 Jan 2009 18:05:13 +0000 (UTC)
Subject: rpms/pbzip2/EL-4 import.log, NONE, 1.1 .cvsignore, 1.6,
	1.7 pbzip2.spec, 1.5, 1.6 sources, 1.6, 1.7
Message-ID: <20090113180513.8759970129@cvs1.fedora.phx.redhat.com>

Author: jeffg

Update of /cvs/pkgs/rpms/pbzip2/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25023/EL-4

Modified Files:
	.cvsignore pbzip2.spec sources 
Added Files:
	import.log 
Log Message:
Major enchancements


--- NEW FILE import.log ---
pbzip2-1_0_5-1:EL-4:pbzip2-1.0.5-1.src.rpm:1231868668


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pbzip2/EL-4/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	9 Aug 2007 11:14:15 -0000	1.6
+++ .cvsignore	13 Jan 2009 18:04:43 -0000	1.7
@@ -1 +1 @@
-pbzip2-1.0.2.tar.gz
+pbzip2-1.0.5.tar.gz


Index: pbzip2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pbzip2/EL-4/pbzip2.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- pbzip2.spec	9 Aug 2007 11:14:15 -0000	1.5
+++ pbzip2.spec	13 Jan 2009 18:04:43 -0000	1.6
@@ -1,12 +1,16 @@
 Name:		pbzip2
-Version:	1.0.2
-Release:	2%{?dist}
+Version:	1.0.5
+Release:	1%{?dist}
 Summary:	Parallel implementation of bzip2
 URL:		http://www.compression.ca/pbzip2/
 License:	BSD
 Group:		Applications/File
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:	bzip2-devel
+%if %{?suse_version:1}0
+BuildRequires:  bzip2
+%else
+BuildRequires:  bzip2-devel
+%endif
 Source0:	http://www.compression.ca/pbzip2/%{name}-%{version}.tar.gz
 
 %description
@@ -19,7 +23,7 @@
 
 %prep
 %setup -q
-sed -i -e 's/ -O3 / %{optflags} /' Makefile
+sed -i -e 's/ -O2/ %{optflags} /' Makefile
 
 
 %build
@@ -31,6 +35,7 @@
 install -D -m755 %{name} %{buildroot}%{_bindir}/%{name}
 install -D -m644 %{name}.1 %{buildroot}%{_mandir}/man1/%{name}.1
 ln -sf ./%{name} %{buildroot}%{_bindir}/pbunzip2
+ln -sf ./%{name} %{buildroot}%{_bindir}/pbzcat
 
 
 %clean
@@ -42,10 +47,22 @@
 %doc AUTHORS ChangeLog COPYING README
 %{_bindir}/%{name}
 %{_bindir}/pbunzip2
+%{_bindir}/pbzcat
 %{_mandir}/man1/*
 
 
 %changelog
+* Fri Jan 8 2009 Jeff Gilchrist <pbzip2 at compression.ca> - 1.0.5-1
+- Release 1.0.5
+
+* Fri Dec 21 2008 Jeff Gilchrist <pbzip2 at compression.ca> - 1.0.4-1
+- Release 1.0.4
+
+* Tue Oct 31 2008 Jeff Gilchrist <pbzip2 at compression.ca> - 1.0.3-1
+- Release 1.0.3
+- Added support for SUSE RPM build
+- Added symlink for pbzcat
+
 * Thu Jul 26 2007 Jeff Gilchrist <pbzip2 at compression.ca> - 1.0.2-2
 - Fixed symbolic link for pbunzip2 file
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pbzip2/EL-4/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	9 Aug 2007 11:14:15 -0000	1.6
+++ sources	13 Jan 2009 18:04:43 -0000	1.7
@@ -1 +1 @@
-7c959f0554695bc484865b938e791aaf  pbzip2-1.0.2.tar.gz
+e2448d22ee29d1e6549ac58b98df11ab  pbzip2-1.0.5.tar.gz



From jeffg at fedoraproject.org  Tue Jan 13 18:17:20 2009
From: jeffg at fedoraproject.org (Jeff Gilchrist)
Date: Tue, 13 Jan 2009 18:17:20 +0000 (UTC)
Subject: rpms/pbzip2/F-10 import.log, NONE, 1.1 .cvsignore, 1.7,
	1.8 pbzip2.spec, 1.13, 1.14 sources, 1.7, 1.8
Message-ID: <20090113181720.C2DFB70129@cvs1.fedora.phx.redhat.com>

Author: jeffg

Update of /cvs/pkgs/rpms/pbzip2/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26936/F-10

Modified Files:
	.cvsignore pbzip2.spec sources 
Added Files:
	import.log 
Log Message:
New upstream package with major enhancements


--- NEW FILE import.log ---
pbzip2-1_0_5-1:F-10:pbzip2-1.0.5-1.src.rpm:1231870581


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pbzip2/F-10/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	26 Jul 2007 17:16:26 -0000	1.7
+++ .cvsignore	13 Jan 2009 18:16:50 -0000	1.8
@@ -1 +1 @@
-pbzip2-1.0.2.tar.gz
+pbzip2-1.0.5.tar.gz


Index: pbzip2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pbzip2/F-10/pbzip2.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- pbzip2.spec	10 Feb 2008 12:25:45 -0000	1.13
+++ pbzip2.spec	13 Jan 2009 18:16:50 -0000	1.14
@@ -1,12 +1,16 @@
 Name:		pbzip2
-Version:	1.0.2
-Release:	4%{?dist}
+Version:	1.0.5
+Release:	1%{?dist}
 Summary:	Parallel implementation of bzip2
 URL:		http://www.compression.ca/pbzip2/
 License:	BSD
 Group:		Applications/File
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:	bzip2-devel
+%if %{?suse_version:1}0
+BuildRequires:  bzip2
+%else
+BuildRequires:  bzip2-devel
+%endif
 Source0:	http://www.compression.ca/pbzip2/%{name}-%{version}.tar.gz
 
 %description
@@ -19,7 +23,7 @@
 
 %prep
 %setup -q
-sed -i -e 's/ -O3 / %{optflags} /' Makefile
+sed -i -e 's/ -O2/ %{optflags} /' Makefile
 
 
 %build
@@ -31,6 +35,7 @@
 install -D -m755 %{name} %{buildroot}%{_bindir}/%{name}
 install -D -m644 %{name}.1 %{buildroot}%{_mandir}/man1/%{name}.1
 ln -sf ./%{name} %{buildroot}%{_bindir}/pbunzip2
+ln -sf ./%{name} %{buildroot}%{_bindir}/pbzcat
 
 
 %clean
@@ -42,15 +47,21 @@
 %doc AUTHORS ChangeLog COPYING README
 %{_bindir}/%{name}
 %{_bindir}/pbunzip2
+%{_bindir}/pbzcat
 %{_mandir}/man1/*
 
 
 %changelog
-* Sun Feb 10 2008 Jeff Gilchrist <pbzip2 at compression.ca> - 1.0.2-4
-- Rebuild for gcc 4.3
+* Fri Jan 8 2009 Jeff Gilchrist <pbzip2 at compression.ca> - 1.0.5-1
+- Release 1.0.5
 
-* Wed Aug 29 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 1.0.2-3
-- Rebuild for selinux ppc32 issue.
+* Fri Dec 21 2008 Jeff Gilchrist <pbzip2 at compression.ca> - 1.0.4-1
+- Release 1.0.4
+
+* Tue Oct 31 2008 Jeff Gilchrist <pbzip2 at compression.ca> - 1.0.3-1
+- Release 1.0.3
+- Added support for SUSE RPM build
+- Added symlink for pbzcat
 
 * Thu Jul 26 2007 Jeff Gilchrist <pbzip2 at compression.ca> - 1.0.2-2
 - Fixed symbolic link for pbunzip2 file


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pbzip2/F-10/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	26 Jul 2007 17:16:26 -0000	1.7
+++ sources	13 Jan 2009 18:16:50 -0000	1.8
@@ -1 +1 @@
-2f58b4e844c74d0c98b98326c6a3945f  pbzip2-1.0.2.tar.gz
+e2448d22ee29d1e6549ac58b98df11ab  pbzip2-1.0.5.tar.gz



From somlo at fedoraproject.org  Tue Jan 13 18:33:36 2009
From: somlo at fedoraproject.org (Gabriel L. Somlo)
Date: Tue, 13 Jan 2009 18:33:36 +0000 (UTC)
Subject: rpms/wmx/devel wmx-7-cfg.patch,1.1,1.2 wmx.spec,1.16,1.17
Message-ID: <20090113183336.7FA9870129@cvs1.fedora.phx.redhat.com>

Author: somlo

Update of /cvs/pkgs/rpms/wmx/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28596/devel

Modified Files:
	wmx-7-cfg.patch wmx.spec 
Log Message:
re-enabled scroll-wheel-cycles-channels feature

wmx-7-cfg.patch:

Index: wmx-7-cfg.patch
===================================================================
RCS file: /cvs/pkgs/rpms/wmx/devel/wmx-7-cfg.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- wmx-7-cfg.patch	12 Jan 2009 18:35:08 -0000	1.1
+++ wmx-7-cfg.patch	13 Jan 2009 18:33:36 -0000	1.2
@@ -1,6 +1,6 @@
 diff -NarU5 wmx-7.orig/Config.h wmx-7/Config.h
 --- wmx-7.orig/Config.h	2009-01-09 06:18:03.000000000 -0500
-+++ wmx-7/Config.h	2009-01-11 12:22:25.000000000 -0500
++++ wmx-7/Config.h	2009-01-13 13:23:31.000000000 -0500
 @@ -93,11 +93,11 @@
   
  // Directory under $HOME in which to look for commands for the
@@ -40,6 +40,21 @@
  // modifier is pressed; they're keysyms as defined in <X11/keysym.h>
  // and <X11/keysymdef.h>
  
+@@ -253,12 +253,12 @@
+ // at all, define it to CONFIG_NO_BUTTON.
+ #define CONFIG_NO_BUTTON 999
+ #define CONFIG_CLIENTMENU_BUTTON  Button1
+ #define CONFIG_COMMANDMENU_BUTTON Button2
+ #define CONFIG_CIRCULATE_BUTTON   Button3 // switch window, when over frame
+-#define CONFIG_PREVCHANNEL_BUTTON CONFIG_NO_BUTTON // flip channel, when over frame
+-#define CONFIG_NEXTCHANNEL_BUTTON CONFIG_NO_BUTTON
++#define CONFIG_PREVCHANNEL_BUTTON Button4 // flip channel, when over frame
++#define CONFIG_NEXTCHANNEL_BUTTON Button5
+ //#define CONFIG_PREVCHANNEL_BUTTON CONFIG_NO_BUTTON
+ //#define CONFIG_NEXTCHANNEL_BUTTON CONFIG_NO_BUTTON
+ 
+ 
+ // ==============================
 @@ -329,11 +329,11 @@
  #define CONFIG_MENU_BORDERS       "black"
  


Index: wmx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wmx/devel/wmx.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- wmx.spec	12 Jan 2009 18:35:08 -0000	1.16
+++ wmx.spec	13 Jan 2009 18:33:36 -0000	1.17
@@ -1,6 +1,6 @@
 Name: wmx
 Version: 7
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: A really simple window manager for X
 License: BSD
 Group: User Interface/X
@@ -51,6 +51,9 @@
 %{_sysconfdir}/X11/xinit/Xclients.d/*
 
 %changelog
+* Tue Jan 13 2009 Gabriel Somlo <somlo at cmu.edu> 7-2 
+- re-enabled scroll-wheel-cycles-channels feature
+
 * Sat Jan 10 2009 Gabriel Somlo <somlo at cmu.edu> 7-1 
 - update to 7
 



From somlo at fedoraproject.org  Tue Jan 13 18:34:05 2009
From: somlo at fedoraproject.org (Gabriel L. Somlo)
Date: Tue, 13 Jan 2009 18:34:05 +0000 (UTC)
Subject: rpms/wmx/F-10 wmx-7-cfg.patch,1.1,1.2 wmx.spec,1.16,1.17
Message-ID: <20090113183405.EB4EC70129@cvs1.fedora.phx.redhat.com>

Author: somlo

Update of /cvs/pkgs/rpms/wmx/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28596/F-10

Modified Files:
	wmx-7-cfg.patch wmx.spec 
Log Message:
re-enabled scroll-wheel-cycles-channels feature

wmx-7-cfg.patch:

Index: wmx-7-cfg.patch
===================================================================
RCS file: /cvs/pkgs/rpms/wmx/F-10/wmx-7-cfg.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- wmx-7-cfg.patch	12 Jan 2009 18:38:20 -0000	1.1
+++ wmx-7-cfg.patch	13 Jan 2009 18:33:35 -0000	1.2
@@ -1,6 +1,6 @@
 diff -NarU5 wmx-7.orig/Config.h wmx-7/Config.h
 --- wmx-7.orig/Config.h	2009-01-09 06:18:03.000000000 -0500
-+++ wmx-7/Config.h	2009-01-11 12:22:25.000000000 -0500
++++ wmx-7/Config.h	2009-01-13 13:23:31.000000000 -0500
 @@ -93,11 +93,11 @@
   
  // Directory under $HOME in which to look for commands for the
@@ -40,6 +40,21 @@
  // modifier is pressed; they're keysyms as defined in <X11/keysym.h>
  // and <X11/keysymdef.h>
  
+@@ -253,12 +253,12 @@
+ // at all, define it to CONFIG_NO_BUTTON.
+ #define CONFIG_NO_BUTTON 999
+ #define CONFIG_CLIENTMENU_BUTTON  Button1
+ #define CONFIG_COMMANDMENU_BUTTON Button2
+ #define CONFIG_CIRCULATE_BUTTON   Button3 // switch window, when over frame
+-#define CONFIG_PREVCHANNEL_BUTTON CONFIG_NO_BUTTON // flip channel, when over frame
+-#define CONFIG_NEXTCHANNEL_BUTTON CONFIG_NO_BUTTON
++#define CONFIG_PREVCHANNEL_BUTTON Button4 // flip channel, when over frame
++#define CONFIG_NEXTCHANNEL_BUTTON Button5
+ //#define CONFIG_PREVCHANNEL_BUTTON CONFIG_NO_BUTTON
+ //#define CONFIG_NEXTCHANNEL_BUTTON CONFIG_NO_BUTTON
+ 
+ 
+ // ==============================
 @@ -329,11 +329,11 @@
  #define CONFIG_MENU_BORDERS       "black"
  


Index: wmx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wmx/F-10/wmx.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- wmx.spec	12 Jan 2009 18:38:20 -0000	1.16
+++ wmx.spec	13 Jan 2009 18:33:35 -0000	1.17
@@ -1,6 +1,6 @@
 Name: wmx
 Version: 7
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: A really simple window manager for X
 License: BSD
 Group: User Interface/X
@@ -51,6 +51,9 @@
 %{_sysconfdir}/X11/xinit/Xclients.d/*
 
 %changelog
+* Tue Jan 13 2009 Gabriel Somlo <somlo at cmu.edu> 7-2 
+- re-enabled scroll-wheel-cycles-channels feature
+
 * Sat Jan 10 2009 Gabriel Somlo <somlo at cmu.edu> 7-1 
 - update to 7
 



From somlo at fedoraproject.org  Tue Jan 13 18:34:06 2009
From: somlo at fedoraproject.org (Gabriel L. Somlo)
Date: Tue, 13 Jan 2009 18:34:06 +0000 (UTC)
Subject: rpms/wmx/F-9 wmx-7-cfg.patch,1.1,1.2 wmx.spec,1.16,1.17
Message-ID: <20090113183406.2FE7E70141@cvs1.fedora.phx.redhat.com>

Author: somlo

Update of /cvs/pkgs/rpms/wmx/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28596/F-9

Modified Files:
	wmx-7-cfg.patch wmx.spec 
Log Message:
re-enabled scroll-wheel-cycles-channels feature

wmx-7-cfg.patch:

Index: wmx-7-cfg.patch
===================================================================
RCS file: /cvs/pkgs/rpms/wmx/F-9/wmx-7-cfg.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- wmx-7-cfg.patch	12 Jan 2009 18:36:48 -0000	1.1
+++ wmx-7-cfg.patch	13 Jan 2009 18:33:35 -0000	1.2
@@ -1,6 +1,6 @@
 diff -NarU5 wmx-7.orig/Config.h wmx-7/Config.h
 --- wmx-7.orig/Config.h	2009-01-09 06:18:03.000000000 -0500
-+++ wmx-7/Config.h	2009-01-11 12:22:25.000000000 -0500
++++ wmx-7/Config.h	2009-01-13 13:23:31.000000000 -0500
 @@ -93,11 +93,11 @@
   
  // Directory under $HOME in which to look for commands for the
@@ -40,6 +40,21 @@
  // modifier is pressed; they're keysyms as defined in <X11/keysym.h>
  // and <X11/keysymdef.h>
  
+@@ -253,12 +253,12 @@
+ // at all, define it to CONFIG_NO_BUTTON.
+ #define CONFIG_NO_BUTTON 999
+ #define CONFIG_CLIENTMENU_BUTTON  Button1
+ #define CONFIG_COMMANDMENU_BUTTON Button2
+ #define CONFIG_CIRCULATE_BUTTON   Button3 // switch window, when over frame
+-#define CONFIG_PREVCHANNEL_BUTTON CONFIG_NO_BUTTON // flip channel, when over frame
+-#define CONFIG_NEXTCHANNEL_BUTTON CONFIG_NO_BUTTON
++#define CONFIG_PREVCHANNEL_BUTTON Button4 // flip channel, when over frame
++#define CONFIG_NEXTCHANNEL_BUTTON Button5
+ //#define CONFIG_PREVCHANNEL_BUTTON CONFIG_NO_BUTTON
+ //#define CONFIG_NEXTCHANNEL_BUTTON CONFIG_NO_BUTTON
+ 
+ 
+ // ==============================
 @@ -329,11 +329,11 @@
  #define CONFIG_MENU_BORDERS       "black"
  


Index: wmx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wmx/F-9/wmx.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- wmx.spec	12 Jan 2009 18:36:48 -0000	1.16
+++ wmx.spec	13 Jan 2009 18:33:35 -0000	1.17
@@ -1,6 +1,6 @@
 Name: wmx
 Version: 7
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: A really simple window manager for X
 License: BSD
 Group: User Interface/X
@@ -51,6 +51,9 @@
 %{_sysconfdir}/X11/xinit/Xclients.d/*
 
 %changelog
+* Tue Jan 13 2009 Gabriel Somlo <somlo at cmu.edu> 7-2 
+- re-enabled scroll-wheel-cycles-channels feature
+
 * Sat Jan 10 2009 Gabriel Somlo <somlo at cmu.edu> 7-1 
 - update to 7
 



From hadess at fedoraproject.org  Tue Jan 13 18:38:01 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Tue, 13 Jan 2009 18:38:01 +0000 (UTC)
Subject: rpms/gstreamer-plugins-base/devel gstpb-pulse-hang-bz556986.patch, 
	NONE, 1.1 gstreamer-plugins-base.spec, 1.67, 1.68
Message-ID: <20090113183801.3A25C70129@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-serv29406

Modified Files:
	gstreamer-plugins-base.spec 
Added Files:
	gstpb-pulse-hang-bz556986.patch 
Log Message:
* Tue Jan 13 2009 - Bastien Nocera <bnocera at redhat.com> - 0.10.2-4
- Avoid deadlocks when PulseAudio disappears


gstpb-pulse-hang-bz556986.patch:

--- NEW FILE gstpb-pulse-hang-bz556986.patch ---
--- gst-libs/gst/audio/gstbaseaudiosink.c	2008/12/20 12:45:03	1.113
+++ gst-libs/gst/audio/gstbaseaudiosink.c	2009/01/05 17:13:13	1.114
@@ -1710,18 +1710,6 @@
 }
 
 static GstStateChangeReturn
-gst_base_audio_sink_do_play (GstBaseAudioSink * sink)
-{
-  GstStateChangeReturn ret;
-
-  GST_OBJECT_LOCK (sink);
-  ret = gst_base_audio_sink_async_play (GST_BASE_SINK_CAST (sink));
-  GST_OBJECT_UNLOCK (sink);
-
-  return ret;
-}
-
-static GstStateChangeReturn
 gst_base_audio_sink_change_state (GstElement * element,
     GstStateChange transition)
 {
@@ -1745,15 +1733,23 @@
       gst_ring_buffer_may_start (sink->ringbuffer, FALSE);
       break;
     case GST_STATE_CHANGE_PAUSED_TO_PLAYING:
-      gst_base_audio_sink_do_play (sink);
+      GST_OBJECT_LOCK (sink);
+      GST_DEBUG_OBJECT (sink, "ringbuffer may start now");
+      sink->priv->sync_latency = TRUE;
+      GST_OBJECT_UNLOCK (sink);
+
+      gst_ring_buffer_may_start (sink->ringbuffer, TRUE);
+      if (GST_BASE_SINK_CAST (sink)->pad_mode == GST_ACTIVATE_PULL) {
+        /* we always start the ringbuffer in pull mode immediatly */
+        gst_ring_buffer_start (sink->ringbuffer);
+      }
       break;
     case GST_STATE_CHANGE_PLAYING_TO_PAUSED:
-      /* need to take the lock so we don't interfere with an
-       * async play */
-      GST_OBJECT_LOCK (sink);
       /* ringbuffer cannot start anymore */
       gst_ring_buffer_may_start (sink->ringbuffer, FALSE);
       gst_ring_buffer_pause (sink->ringbuffer);
+
+      GST_OBJECT_LOCK (sink);
       sink->priv->sync_latency = FALSE;
       GST_OBJECT_UNLOCK (sink);
       break;


Index: gstreamer-plugins-base.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamer-plugins-base/devel/gstreamer-plugins-base.spec,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- gstreamer-plugins-base.spec	1 Jan 2009 18:18:06 -0000	1.67
+++ gstreamer-plugins-base.spec	13 Jan 2009 18:37:30 -0000	1.68
@@ -5,7 +5,7 @@
 
 Name: 		%{gstreamer}-plugins-base
 Version: 	0.10.21
-Release:  	3%{?dist}	
+Release:  	4%{?dist}	
 Summary: 	GStreamer streaming media framework base plug-ins
 
 Group: 		Applications/Multimedia
@@ -15,6 +15,8 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Patch0:		gstpb-0.10.15-cd-speed.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=556986
+Patch1:		gstpb-pulse-hang-bz556986.patch
 
 Requires:       %{gstreamer} >= %{_gst}
 Requires:	liboil >= 0.3.12-9
@@ -53,6 +55,7 @@
 %prep
 %setup -q -n gst-plugins-base-%{version}
 %patch0 -p1 -b .cd-speed
+%patch1 -p0 -b .pulse-hang
 
 %build
 %configure \
@@ -238,6 +241,9 @@
 %doc %{_datadir}/gtk-doc/html/gst-plugins-base-plugins-%{majorminor}
 
 %changelog
+* Tue Jan 13 2009 - Bastien Nocera <bnocera at redhat.com> - 0.10.2-4
+- Avoid deadlocks when PulseAudio disappears
+
 * Thu Jan 1 2009 - Rex Dieter <rdieter at fedoraproject.org> - 0.10.2-3
 - rebuild for pkgconfig deps (#478577)
 



From hadess at fedoraproject.org  Tue Jan 13 18:44:53 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Tue, 13 Jan 2009 18:44:53 +0000 (UTC)
Subject: rpms/gstreamer-plugins-good/devel
	gst-plugins-good-0.10.11-pulse-hang-bz556986.patch, NONE,
	1.1 gstreamer-plugins-good.spec, 1.77, 1.78
Message-ID: <20090113184453.1F75470129@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-serv30351

Modified Files:
	gstreamer-plugins-good.spec 
Added Files:
	gst-plugins-good-0.10.11-pulse-hang-bz556986.patch 
Log Message:
* Tue Jan 13 2009 - Bastien Nocera <bnocera at redhat.com> - 0.10.11-2
- Avoid pulsesink hang when PulseAudio disappears


gst-plugins-good-0.10.11-pulse-hang-bz556986.patch:

--- NEW FILE gst-plugins-good-0.10.11-pulse-hang-bz556986.patch ---
--- ext/pulse/pulsesink.c	2008/11/23 15:08:45	1.11
+++ ext/pulse/pulsesink.c	2009/01/05 17:31:13	1.12
@@ -279,7 +279,6 @@
 {
   if (pulsesink->stream) {
     pa_stream_disconnect (pulsesink->stream);
-    pa_threaded_mainloop_wait (pulsesink->mainloop);
     pa_stream_unref (pulsesink->stream);
     pulsesink->stream = NULL;
   }
@@ -588,16 +587,14 @@
   if (!pulsesink->context
       || pa_context_get_state (pulsesink->context) != PA_CONTEXT_READY) {
     GST_ELEMENT_ERROR (pulsesink, RESOURCE, FAILED, ("Bad context state: %s",
-            pulsesink->
-            context ? pa_strerror (pa_context_errno (pulsesink->context)) :
-            NULL), (NULL));
+            pulsesink->context ? pa_strerror (pa_context_errno (pulsesink->
+                    context)) : NULL), (NULL));
     goto unlock_and_fail;
   }
 
   if (!(pulsesink->stream = pa_stream_new (pulsesink->context,
-              pulsesink->
-              stream_name ? pulsesink->stream_name : "Playback Stream",
-              &pulsesink->sample_spec,
+              pulsesink->stream_name ? pulsesink->
+              stream_name : "Playback Stream", &pulsesink->sample_spec,
               gst_pulse_gst_to_channel_map (&channel_map, spec)))) {
     GST_ELEMENT_ERROR (pulsesink, RESOURCE, FAILED,
         ("Failed to create stream: %s",
--- ext/pulse/pulsesink.c	2009/01/05 17:31:13	1.12
+++ ext/pulse/pulsesink.c	2009/01/07 20:38:50	1.13
@@ -264,6 +264,8 @@
   pulsesink->context = NULL;
   pulsesink->stream = NULL;
 
+  pulsesink->stream_mutex = g_mutex_new ();
+
   pulsesink->mainloop = pa_threaded_mainloop_new ();
   g_assert (pulsesink->mainloop);
 
@@ -277,11 +279,13 @@
 static void
 gst_pulsesink_destroy_stream (GstPulseSink * pulsesink)
 {
+  g_mutex_lock (pulsesink->stream_mutex);
   if (pulsesink->stream) {
     pa_stream_disconnect (pulsesink->stream);
     pa_stream_unref (pulsesink->stream);
     pulsesink->stream = NULL;
   }
+  g_mutex_unlock (pulsesink->stream_mutex);
 
   g_free (pulsesink->stream_name);
   pulsesink->stream_name = NULL;
@@ -290,7 +294,6 @@
 static void
 gst_pulsesink_destroy_context (GstPulseSink * pulsesink)
 {
-
   gst_pulsesink_destroy_stream (pulsesink);
 
   if (pulsesink->context) {
@@ -313,6 +316,8 @@
   g_free (pulsesink->device);
   g_free (pulsesink->stream_name);
 
+  g_mutex_free (pulsesink->stream_mutex);
+
   pa_threaded_mainloop_free (pulsesink->mainloop);
 
   if (pulsesink->probe) {
@@ -482,8 +487,16 @@
 
     case PA_STREAM_READY:
     case PA_STREAM_FAILED:
-    case PA_STREAM_TERMINATED:
-      pa_threaded_mainloop_signal (pulsesink->mainloop, 0);
+    case PA_STREAM_TERMINATED:{
+      pa_stream *cur_stream;
+
+      g_mutex_lock (pulsesink->stream_mutex);
+      cur_stream = pulsesink->stream;
+      g_mutex_unlock (pulsesink->stream_mutex);
+
+      if (cur_stream == s)
+        pa_threaded_mainloop_signal (pulsesink->mainloop, 0);
+    }
       break;
 
     case PA_STREAM_UNCONNECTED:
@@ -496,16 +509,28 @@
 gst_pulsesink_stream_request_cb (pa_stream * s, size_t length, void *userdata)
 {
   GstPulseSink *pulsesink = GST_PULSESINK (userdata);
+  pa_stream *cur_stream;
 
-  pa_threaded_mainloop_signal (pulsesink->mainloop, 0);
+  g_mutex_lock (pulsesink->stream_mutex);
+  cur_stream = pulsesink->stream;
+  g_mutex_unlock (pulsesink->stream_mutex);
+
+  if (cur_stream == s)
+    pa_threaded_mainloop_signal (pulsesink->mainloop, 0);
 }
 
 static void
 gst_pulsesink_stream_latency_update_cb (pa_stream * s, void *userdata)
 {
   GstPulseSink *pulsesink = GST_PULSESINK (userdata);
+  pa_stream *cur_stream;
 
-  pa_threaded_mainloop_signal (pulsesink->mainloop, 0);
+  g_mutex_lock (pulsesink->stream_mutex);
+  cur_stream = pulsesink->stream;
+  g_mutex_unlock (pulsesink->stream_mutex);
+
+  if (cur_stream == s)
+    pa_threaded_mainloop_signal (pulsesink->mainloop, 0);
 }
 
 static gboolean
@@ -592,15 +617,18 @@
     goto unlock_and_fail;
   }
 
+  g_mutex_lock (pulsesink->stream_mutex);
   if (!(pulsesink->stream = pa_stream_new (pulsesink->context,
               pulsesink->stream_name ? pulsesink->
               stream_name : "Playback Stream", &pulsesink->sample_spec,
               gst_pulse_gst_to_channel_map (&channel_map, spec)))) {
+    g_mutex_unlock (pulsesink->stream_mutex);
     GST_ELEMENT_ERROR (pulsesink, RESOURCE, FAILED,
         ("Failed to create stream: %s",
             pa_strerror (pa_context_errno (pulsesink->context))), (NULL));
     goto unlock_and_fail;
   }
+  g_mutex_unlock (pulsesink->stream_mutex);
 
   pa_stream_set_state_callback (pulsesink->stream,
       gst_pulsesink_stream_state_cb, pulsesink);


Index: gstreamer-plugins-good.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamer-plugins-good/devel/gstreamer-plugins-good.spec,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- gstreamer-plugins-good.spec	25 Oct 2008 00:18:49 -0000	1.77
+++ gstreamer-plugins-good.spec	13 Jan 2009 18:44:22 -0000	1.78
@@ -6,7 +6,7 @@
 
 Name: 		%{gstreamer}-plugins-good
 Version: 	0.10.11
-Release:  	1%{?dist}
+Release:  	2%{?dist}
 Summary: 	GStreamer plug-ins with good code and licensing
 
 Group: 		Applications/Multimedia
@@ -17,6 +17,8 @@
 
 # http://bugzilla.gnome.org/show_bug.cgi?id=545033
 Patch0: gst-plugins-good-0.10.9-libv4l.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=556986
+Patch1: gst-plugins-good-0.10.11-pulse-hang-bz556986.patch
 
 Requires: 	%{gstreamer} >= %{_gst}
 Requires(pre): GConf2 
@@ -101,6 +103,7 @@
 %prep
 %setup -q -n gst-plugins-good-%{version}
 %patch0 -p0 -b .libv4l
+%patch1 -p0 -b .pulse-hang
 
 %build
 
@@ -245,6 +248,9 @@
 gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/gstreamer-%{majorminor}.schemas > /dev/null || :
 
 %changelog
+* Tue Jan 13 2009 - Bastien Nocera <bnocera at redhat.com> - 0.10.11-2
+- Avoid pulsesink hang when PulseAudio disappears
+
 * Sat Oct 25 2008 - Bastien Nocera <bnocera at redhat.com> - 0.10.11-1
 - Update to 0.10.11
 - Update libv4l patch



From hadess at fedoraproject.org  Tue Jan 13 18:46:06 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Tue, 13 Jan 2009 18:46:06 +0000 (UTC)
Subject: rpms/gstreamer-plugins-base/F-10 gstpb-pulse-hang-bz556986.patch,
	NONE, 1.1 gstreamer-plugins-base.spec, 1.66, 1.67
Message-ID: <20090113184606.B06C970129@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/gstreamer-plugins-base/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31026

Modified Files:
	gstreamer-plugins-base.spec 
Added Files:
	gstpb-pulse-hang-bz556986.patch 
Log Message:
* Tue Jan 13 2009 - Bastien Nocera <bnocera at redhat.com> - 0.10.21-3
- Avoid deadlocks when PulseAudio disappears


gstpb-pulse-hang-bz556986.patch:

--- NEW FILE gstpb-pulse-hang-bz556986.patch ---
--- gst-libs/gst/audio/gstbaseaudiosink.c	2008/12/20 12:45:03	1.113
+++ gst-libs/gst/audio/gstbaseaudiosink.c	2009/01/05 17:13:13	1.114
@@ -1710,18 +1710,6 @@
 }
 
 static GstStateChangeReturn
-gst_base_audio_sink_do_play (GstBaseAudioSink * sink)
-{
-  GstStateChangeReturn ret;
-
-  GST_OBJECT_LOCK (sink);
-  ret = gst_base_audio_sink_async_play (GST_BASE_SINK_CAST (sink));
-  GST_OBJECT_UNLOCK (sink);
-
-  return ret;
-}
-
-static GstStateChangeReturn
 gst_base_audio_sink_change_state (GstElement * element,
     GstStateChange transition)
 {
@@ -1745,15 +1733,23 @@
       gst_ring_buffer_may_start (sink->ringbuffer, FALSE);
       break;
     case GST_STATE_CHANGE_PAUSED_TO_PLAYING:
-      gst_base_audio_sink_do_play (sink);
+      GST_OBJECT_LOCK (sink);
+      GST_DEBUG_OBJECT (sink, "ringbuffer may start now");
+      sink->priv->sync_latency = TRUE;
+      GST_OBJECT_UNLOCK (sink);
+
+      gst_ring_buffer_may_start (sink->ringbuffer, TRUE);
+      if (GST_BASE_SINK_CAST (sink)->pad_mode == GST_ACTIVATE_PULL) {
+        /* we always start the ringbuffer in pull mode immediatly */
+        gst_ring_buffer_start (sink->ringbuffer);
+      }
       break;
     case GST_STATE_CHANGE_PLAYING_TO_PAUSED:
-      /* need to take the lock so we don't interfere with an
-       * async play */
-      GST_OBJECT_LOCK (sink);
       /* ringbuffer cannot start anymore */
       gst_ring_buffer_may_start (sink->ringbuffer, FALSE);
       gst_ring_buffer_pause (sink->ringbuffer);
+
+      GST_OBJECT_LOCK (sink);
       sink->priv->sync_latency = FALSE;
       GST_OBJECT_UNLOCK (sink);
       break;


Index: gstreamer-plugins-base.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamer-plugins-base/F-10/gstreamer-plugins-base.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- gstreamer-plugins-base.spec	3 Oct 2008 09:55:19 -0000	1.66
+++ gstreamer-plugins-base.spec	13 Jan 2009 18:45:36 -0000	1.67
@@ -5,7 +5,7 @@
 
 Name: 		%{gstreamer}-plugins-base
 Version: 	0.10.21
-Release:  	2%{?dist}	
+Release:  	3%{?dist}	
 Summary: 	GStreamer streaming media framework base plug-ins
 
 Group: 		Applications/Multimedia
@@ -15,6 +15,8 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Patch0:		gstpb-0.10.15-cd-speed.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=556986
+Patch1:		gstpb-pulse-hang-bz556986.patch
 
 Requires:       %{gstreamer} >= %{_gst}
 Requires:	liboil >= 0.3.12-9
@@ -52,6 +54,7 @@
 %prep
 %setup -q -n gst-plugins-base-%{version}
 %patch0 -p1 -b .cd-speed
+%patch1 -p0 -b .pulse-hang
 
 %build
 %configure \
@@ -237,6 +240,9 @@
 %doc %{_datadir}/gtk-doc/html/gst-plugins-base-plugins-%{majorminor}
 
 %changelog
+* Tue Jan 13 2009 - Bastien Nocera <bnocera at redhat.com> - 0.10.21-3
+- Avoid deadlocks when PulseAudio disappears
+
 * Fri Oct 03 2008 - Bastien Nocera <bnocera at redhat.com> - 0.10.21-2
 - Update the gstreamer requirement
 - Add a gtk2-devel BR, so that the test-colorkey program will be built



From mgrepl at fedoraproject.org  Tue Jan 13 18:49:49 2009
From: mgrepl at fedoraproject.org (Miroslav Grepl)
Date: Tue, 13 Jan 2009 18:49:49 +0000 (UTC)
Subject: rpms/selinux-policy/F-9 policy-20071130.patch, 1.246,
	1.247 selinux-policy.spec, 1.732, 1.733
Message-ID: <20090113184949.2CD8C70129@cvs1.fedora.phx.redhat.com>

Author: mgrepl

Update of /cvs/extras/rpms/selinux-policy/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31558

Modified Files:
	policy-20071130.patch selinux-policy.spec 
Log Message:
- Allow kismet read generic files in /usr
- Lots of fixes for munin



policy-20071130.patch:

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.246 -r 1.247 policy-20071130.patch
Index: policy-20071130.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-9/policy-20071130.patch,v
retrieving revision 1.246
retrieving revision 1.247
diff -u -r1.246 -r1.247
--- policy-20071130.patch	5 Jan 2009 12:28:36 -0000	1.246
+++ policy-20071130.patch	13 Jan 2009 18:49:47 -0000	1.247
@@ -1,12 +1,25 @@
+Binary files nsaserefpolicy/amavis.pp and serefpolicy-3.3.1/amavis.pp differ
+Binary files nsaserefpolicy/amtu.pp and serefpolicy-3.3.1/amtu.pp differ
+Binary files nsaserefpolicy/apcupsd.pp and serefpolicy-3.3.1/apcupsd.pp differ
+Binary files nsaserefpolicy/audioentropy.pp and serefpolicy-3.3.1/audioentropy.pp differ
+Binary files nsaserefpolicy/awstats.pp and serefpolicy-3.3.1/awstats.pp differ
+Binary files nsaserefpolicy/base.pp and serefpolicy-3.3.1/base.pp differ
+Binary files nsaserefpolicy/bitlbee.pp and serefpolicy-3.3.1/bitlbee.pp differ
+Binary files nsaserefpolicy/calamaris.pp and serefpolicy-3.3.1/calamaris.pp differ
+Binary files nsaserefpolicy/ccs.pp and serefpolicy-3.3.1/ccs.pp differ
+Binary files nsaserefpolicy/cdrecord.pp and serefpolicy-3.3.1/cdrecord.pp differ
+Binary files nsaserefpolicy/certwatch.pp and serefpolicy-3.3.1/certwatch.pp differ
+Binary files nsaserefpolicy/cipe.pp and serefpolicy-3.3.1/cipe.pp differ
+Binary files nsaserefpolicy/clamav.pp and serefpolicy-3.3.1/clamav.pp differ
 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-02-26 14:23:12.000000000 +0100
-+++ serefpolicy-3.3.1/config/appconfig-mcs/failsafe_context	2009-01-05 11:17:34.000000000 +0100
++++ serefpolicy-3.3.1/config/appconfig-mcs/failsafe_context	2009-01-13 19:18:30.000000000 +0100
 @@ -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	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.3.1/config/appconfig-mcs/guest_u_default_contexts	2009-01-05 11:17:34.000000000 +0100
++++ serefpolicy-3.3.1/config/appconfig-mcs/guest_u_default_contexts	2009-01-13 19:18:30.000000000 +0100
 @@ -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
@@ -16,7 +29,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-02-26 14:23:12.000000000 +0100
-+++ serefpolicy-3.3.1/config/appconfig-mcs/root_default_contexts	2009-01-05 11:17:34.000000000 +0100
++++ serefpolicy-3.3.1/config/appconfig-mcs/root_default_contexts	2009-01-13 19:18:30.000000000 +0100
 @@ -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
@@ -32,7 +45,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-02-26 14:23:12.000000000 +0100
-+++ serefpolicy-3.3.1/config/appconfig-mcs/staff_u_default_contexts	2009-01-05 11:17:34.000000000 +0100
++++ serefpolicy-3.3.1/config/appconfig-mcs/staff_u_default_contexts	2009-01-13 19:18:30.000000000 +0100
 @@ -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
@@ -44,7 +57,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	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.3.1/config/appconfig-mcs/unconfined_u_default_contexts	2009-01-05 11:17:34.000000000 +0100
++++ serefpolicy-3.3.1/config/appconfig-mcs/unconfined_u_default_contexts	2009-01-13 19:18:30.000000000 +0100
 @@ -0,0 +1,11 @@
 +system_r:crond_t:s0		unconfined_r:unconfined_t:s0
 +system_r:initrc_t:s0		unconfined_r:unconfined_t:s0
@@ -59,13 +72,13 @@
 +system_r:xdm_t:s0		unconfined_r:unconfined_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-02-26 14:23:12.000000000 +0100
-+++ serefpolicy-3.3.1/config/appconfig-mcs/userhelper_context	2009-01-05 11:17:34.000000000 +0100
++++ serefpolicy-3.3.1/config/appconfig-mcs/userhelper_context	2009-01-13 19:18:30.000000000 +0100
 @@ -1 +1 @@
 -system_u:sysadm_r:sysadm_t:s0
 +system_u:system_r:unconfined_t:s0	
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/user_u_default_contexts serefpolicy-3.3.1/config/appconfig-mcs/user_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/user_u_default_contexts	2008-02-26 14:23:12.000000000 +0100
-+++ serefpolicy-3.3.1/config/appconfig-mcs/user_u_default_contexts	2009-01-05 11:17:34.000000000 +0100
++++ serefpolicy-3.3.1/config/appconfig-mcs/user_u_default_contexts	2009-01-13 19:18:30.000000000 +0100
 @@ -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
@@ -75,7 +88,7 @@
 +user_r:user_t:s0		user_r:user_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	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.3.1/config/appconfig-mcs/x_contexts	2009-01-05 11:17:34.000000000 +0100
++++ serefpolicy-3.3.1/config/appconfig-mcs/x_contexts	2009-01-13 19:18:30.000000000 +0100
 @@ -0,0 +1,188 @@
 +#
 +# Config file for XSELinux extension
@@ -267,7 +280,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	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.3.1/config/appconfig-mcs/xguest_u_default_contexts	2009-01-05 11:17:34.000000000 +0100
++++ serefpolicy-3.3.1/config/appconfig-mcs/xguest_u_default_contexts	2009-01-13 19:18:30.000000000 +0100
 @@ -0,0 +1,7 @@
 +system_r:local_login_t	xguest_r:xguest_t:s0
 +system_r:remote_login_t	xguest_r:xguest_t:s0
@@ -278,7 +291,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	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.3.1/config/appconfig-mls/guest_u_default_contexts	2009-01-05 11:17:34.000000000 +0100
++++ serefpolicy-3.3.1/config/appconfig-mls/guest_u_default_contexts	2009-01-13 19:18:30.000000000 +0100
 @@ -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
@@ -286,7 +299,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	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.3.1/config/appconfig-mls/x_contexts	2009-01-05 11:17:34.000000000 +0100
++++ serefpolicy-3.3.1/config/appconfig-mls/x_contexts	2009-01-13 19:18:30.000000000 +0100
 @@ -0,0 +1,188 @@
 +#
 +# Config file for XSELinux extension
@@ -478,7 +491,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	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.3.1/config/appconfig-standard/guest_u_default_contexts	2009-01-05 11:17:34.000000000 +0100
++++ serefpolicy-3.3.1/config/appconfig-standard/guest_u_default_contexts	2009-01-13 19:18:30.000000000 +0100
 @@ -0,0 +1,4 @@
 +system_r:local_login_t	guest_r:guest_t
 +system_r:remote_login_t	guest_r:guest_t
@@ -486,7 +499,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-02-26 14:23:12.000000000 +0100
-+++ serefpolicy-3.3.1/config/appconfig-standard/root_default_contexts	2009-01-05 11:17:34.000000000 +0100
++++ serefpolicy-3.3.1/config/appconfig-standard/root_default_contexts	2009-01-13 19:18:30.000000000 +0100
 @@ -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
@@ -502,7 +515,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	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.3.1/config/appconfig-standard/x_contexts	2009-01-05 11:17:34.000000000 +0100
++++ serefpolicy-3.3.1/config/appconfig-standard/x_contexts	2009-01-13 19:18:30.000000000 +0100
 @@ -0,0 +1,188 @@
 +#
 +# Config file for XSELinux extension
@@ -694,16 +707,196 @@
 +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	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.3.1/config/appconfig-standard/xguest_u_default_contexts	2009-01-05 11:17:34.000000000 +0100
++++ serefpolicy-3.3.1/config/appconfig-standard/xguest_u_default_contexts	2009-01-13 19:18:30.000000000 +0100
 @@ -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
+Binary files nsaserefpolicy/consolekit.pp and serefpolicy-3.3.1/consolekit.pp differ
+Binary files nsaserefpolicy/courier.pp and serefpolicy-3.3.1/courier.pp differ
+Binary files nsaserefpolicy/cyphesis.pp and serefpolicy-3.3.1/cyphesis.pp differ
+Binary files nsaserefpolicy/daemontools.pp and serefpolicy-3.3.1/daemontools.pp differ
+Binary files nsaserefpolicy/dcc.pp and serefpolicy-3.3.1/dcc.pp differ
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/doc/global_booleans.xml serefpolicy-3.3.1/doc/global_booleans.xml
+--- nsaserefpolicy/doc/global_booleans.xml	1970-01-01 01:00:00.000000000 +0100
++++ serefpolicy-3.3.1/doc/global_booleans.xml	2009-01-13 19:18:38.000000000 +0100
+@@ -0,0 +1,25 @@
++<bool name="secure_mode" dftval="false">
++<desc>
++<p>
++Enabling secure mode disallows programs, such as
++newrole, from transitioning to administrative
++user domains.
++</p>
++</desc>
++</bool>
++<bool name="secure_mode_insmod" dftval="false">
++<desc>
++<p>
++Disable transitions to insmod.
++</p>
++</desc>
++</bool>
++<bool name="secure_mode_policyload" dftval="false">
++<desc>
++<p>
++boolean to determine whether the system permits loading policy, setting
++enforcing mode, and changing boolean values.  Set this to true and you
++have to reboot to set it back
++</p>
++</desc>
++</bool>
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/doc/global_tunables.xml serefpolicy-3.3.1/doc/global_tunables.xml
+--- nsaserefpolicy/doc/global_tunables.xml	1970-01-01 01:00:00.000000000 +0100
++++ serefpolicy-3.3.1/doc/global_tunables.xml	2009-01-13 19:18:38.000000000 +0100
+@@ -0,0 +1,124 @@
++<tunable name="allow_execheap" dftval="false">
++<desc>
++<p>
++Allow unconfined executables to make their heap memory executable.  Doing this is a really bad idea. Probably indicates a badly coded executable, but could indicate an attack. This executable should be reported in bugzilla
++</p>
++</desc>
++</tunable>
++<tunable name="allow_execmem" dftval="false">
[...68356 lines suppressed...]
 +policy_module(auditadm,1.0.1)
 +gen_require(`
@@ -43807,17 +106779,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	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.3.1/policy/modules/users/guest.fc	2009-01-05 11:17:34.000000000 +0100
++++ serefpolicy-3.3.1/policy/modules/users/guest.fc	2009-01-13 19:18:30.000000000 +0100
 @@ -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	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.3.1/policy/modules/users/guest.if	2009-01-05 11:17:34.000000000 +0100
++++ serefpolicy-3.3.1/policy/modules/users/guest.if	2009-01-13 19:18:30.000000000 +0100
 @@ -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	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.3.1/policy/modules/users/guest.te	2009-01-05 11:17:34.000000000 +0100
++++ serefpolicy-3.3.1/policy/modules/users/guest.te	2009-01-13 19:18:30.000000000 +0100
 @@ -0,0 +1,33 @@
 +policy_module(guest,1.0.1)
 +userdom_restricted_user_template(guest)
@@ -43854,17 +106826,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	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.3.1/policy/modules/users/logadm.fc	2009-01-05 11:17:34.000000000 +0100
++++ serefpolicy-3.3.1/policy/modules/users/logadm.fc	2009-01-13 19:18:30.000000000 +0100
 @@ -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	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.3.1/policy/modules/users/logadm.if	2009-01-05 11:17:34.000000000 +0100
++++ serefpolicy-3.3.1/policy/modules/users/logadm.if	2009-01-13 19:18:30.000000000 +0100
 @@ -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	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.3.1/policy/modules/users/logadm.te	2009-01-05 11:17:34.000000000 +0100
++++ serefpolicy-3.3.1/policy/modules/users/logadm.te	2009-01-13 19:18:30.000000000 +0100
 @@ -0,0 +1,11 @@
 +policy_module(logadm,1.0.0)
 +
@@ -43879,22 +106851,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	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.3.1/policy/modules/users/metadata.xml	2009-01-05 11:17:34.000000000 +0100
++++ serefpolicy-3.3.1/policy/modules/users/metadata.xml	2009-01-13 19:18:30.000000000 +0100
 @@ -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	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.3.1/policy/modules/users/secadm.fc	2009-01-05 11:17:34.000000000 +0100
++++ serefpolicy-3.3.1/policy/modules/users/secadm.fc	2009-01-13 19:18:30.000000000 +0100
 @@ -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	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.3.1/policy/modules/users/secadm.if	2009-01-05 11:17:34.000000000 +0100
++++ serefpolicy-3.3.1/policy/modules/users/secadm.if	2009-01-13 19:18:30.000000000 +0100
 @@ -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	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.3.1/policy/modules/users/secadm.te	2009-01-05 11:17:34.000000000 +0100
++++ serefpolicy-3.3.1/policy/modules/users/secadm.te	2009-01-13 19:18:30.000000000 +0100
 @@ -0,0 +1,39 @@
 +policy_module(secadm,1.0.1)
 +gen_require(`
@@ -43937,17 +106909,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	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.3.1/policy/modules/users/staff.fc	2009-01-05 11:17:34.000000000 +0100
++++ serefpolicy-3.3.1/policy/modules/users/staff.fc	2009-01-13 19:18:30.000000000 +0100
 @@ -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	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.3.1/policy/modules/users/staff.if	2009-01-05 11:17:34.000000000 +0100
++++ serefpolicy-3.3.1/policy/modules/users/staff.if	2009-01-13 19:18:30.000000000 +0100
 @@ -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	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.3.1/policy/modules/users/staff.te	2009-01-05 11:17:34.000000000 +0100
++++ serefpolicy-3.3.1/policy/modules/users/staff.te	2009-01-13 19:18:30.000000000 +0100
 @@ -0,0 +1,30 @@
 +policy_module(staff,1.0.1)
 +userdom_admin_login_user_template(staff)
@@ -43981,17 +106953,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	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.3.1/policy/modules/users/user.fc	2009-01-05 11:17:34.000000000 +0100
++++ serefpolicy-3.3.1/policy/modules/users/user.fc	2009-01-13 19:18:30.000000000 +0100
 @@ -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	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.3.1/policy/modules/users/user.if	2009-01-05 11:17:34.000000000 +0100
++++ serefpolicy-3.3.1/policy/modules/users/user.if	2009-01-13 19:18:30.000000000 +0100
 @@ -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	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.3.1/policy/modules/users/user.te	2009-01-05 11:17:34.000000000 +0100
++++ serefpolicy-3.3.1/policy/modules/users/user.te	2009-01-13 19:18:30.000000000 +0100
 @@ -0,0 +1,18 @@
 +policy_module(user,1.0.1)
 +userdom_unpriv_user_template(user)
@@ -44013,17 +106985,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	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.3.1/policy/modules/users/webadm.fc	2009-01-05 11:17:34.000000000 +0100
++++ serefpolicy-3.3.1/policy/modules/users/webadm.fc	2009-01-13 19:18:30.000000000 +0100
 @@ -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	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.3.1/policy/modules/users/webadm.if	2009-01-05 11:17:34.000000000 +0100
++++ serefpolicy-3.3.1/policy/modules/users/webadm.if	2009-01-13 19:18:30.000000000 +0100
 @@ -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	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.3.1/policy/modules/users/webadm.te	2009-01-05 11:17:34.000000000 +0100
++++ serefpolicy-3.3.1/policy/modules/users/webadm.te	2009-01-13 19:18:30.000000000 +0100
 @@ -0,0 +1,41 @@
 +policy_module(webadm,1.0.0)
 +
@@ -44068,17 +107040,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	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.3.1/policy/modules/users/xguest.fc	2009-01-05 11:17:34.000000000 +0100
++++ serefpolicy-3.3.1/policy/modules/users/xguest.fc	2009-01-13 19:18:30.000000000 +0100
 @@ -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	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.3.1/policy/modules/users/xguest.if	2009-01-05 11:17:34.000000000 +0100
++++ serefpolicy-3.3.1/policy/modules/users/xguest.if	2009-01-13 19:18:30.000000000 +0100
 @@ -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	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.3.1/policy/modules/users/xguest.te	2009-01-05 11:17:34.000000000 +0100
++++ serefpolicy-3.3.1/policy/modules/users/xguest.te	2009-01-13 19:18:30.000000000 +0100
 @@ -0,0 +1,69 @@
 +policy_module(xguest,1.0.1)
 +
@@ -44151,7 +107123,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-02-26 14:23:09.000000000 +0100
-+++ serefpolicy-3.3.1/policy/support/file_patterns.spt	2009-01-05 11:17:34.000000000 +0100
++++ serefpolicy-3.3.1/policy/support/file_patterns.spt	2009-01-13 19:18:30.000000000 +0100
 @@ -537,3 +537,23 @@
  	allow $1 $2:dir rw_dir_perms;
  	type_transition $1 $2:$4 $3;
@@ -44178,7 +107150,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-02-26 14:23:09.000000000 +0100
-+++ serefpolicy-3.3.1/policy/support/obj_perm_sets.spt	2009-01-05 11:17:34.000000000 +0100
++++ serefpolicy-3.3.1/policy/support/obj_perm_sets.spt	2009-01-13 19:18:30.000000000 +0100
 @@ -193,7 +193,7 @@
  define(`create_dir_perms',`{ getattr create }')
  define(`rename_dir_perms',`{ getattr rename }')
@@ -44258,7 +107230,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-02-26 14:23:12.000000000 +0100
-+++ serefpolicy-3.3.1/policy/users	2009-01-05 11:17:34.000000000 +0100
++++ serefpolicy-3.3.1/policy/users	2009-01-13 19:18:30.000000000 +0100
 @@ -16,7 +16,7 @@
  # and a user process should never be assigned the system user
  # identity.
@@ -44294,7 +107266,7 @@
 +gen_user(root, user, unconfined_r sysadm_r staff_r ifdef(`enable_mls',`secadm_r auditadm_r') system_r, s0, s0 - mls_systemhigh, mcs_allcats)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/Rules.modular serefpolicy-3.3.1/Rules.modular
 --- nsaserefpolicy/Rules.modular	2008-02-26 14:23:12.000000000 +0100
-+++ serefpolicy-3.3.1/Rules.modular	2009-01-05 11:17:34.000000000 +0100
++++ serefpolicy-3.3.1/Rules.modular	2009-01-13 19:18:30.000000000 +0100
 @@ -73,8 +73,8 @@
  $(tmpdir)/%.mod: $(m4support) $(tmpdir)/generated_definitions.conf $(tmpdir)/all_interfaces.conf %.te
  	@echo "Compliling $(NAME) $(@F) module"
@@ -44326,7 +107298,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-02-26 14:23:13.000000000 +0100
-+++ serefpolicy-3.3.1/Rules.monolithic	2009-01-05 11:17:34.000000000 +0100
++++ serefpolicy-3.3.1/Rules.monolithic	2009-01-13 19:18:30.000000000 +0100
 @@ -96,7 +96,7 @@
  #
  # Load the binary policy


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-9/selinux-policy.spec,v
retrieving revision 1.732
retrieving revision 1.733
diff -u -r1.732 -r1.733
--- selinux-policy.spec	5 Jan 2009 12:28:38 -0000	1.732
+++ selinux-policy.spec	13 Jan 2009 18:49:48 -0000	1.733
@@ -20,7 +20,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.3.1
-Release: 117%{?dist}
+Release: 118%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -443,6 +443,10 @@
 %endif
 
 %changelog
+* Tue Jan 13 2009 Miroslav Grepl <mgrepl at redhat.com> 3.3.1-118
+- Allow kismet read generic files in /usr
+- Lots of fixes for munin
+
 * Mon Jan 5 2009  Miroslav Grepl <mgrepl at redhat.com> 3.3.1-117
 - Add label to /var/run/mod_.*
 - Add label to /var/turboprint(/.*)?



From hadess at fedoraproject.org  Tue Jan 13 18:54:41 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Tue, 13 Jan 2009 18:54:41 +0000 (UTC)
Subject: rpms/gstreamer-plugins-good/devel
	gst-plugins-good-0.10.11-pulse-hang-bz556986.patch, 1.1, 1.2
Message-ID: <20090113185442.05C6270129@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-serv32087

Modified Files:
	gst-plugins-good-0.10.11-pulse-hang-bz556986.patch 
Log Message:
Add missing part of the patch


gst-plugins-good-0.10.11-pulse-hang-bz556986.patch:

Index: gst-plugins-good-0.10.11-pulse-hang-bz556986.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamer-plugins-good/devel/gst-plugins-good-0.10.11-pulse-hang-bz556986.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gst-plugins-good-0.10.11-pulse-hang-bz556986.patch	13 Jan 2009 18:44:22 -0000	1.1
+++ gst-plugins-good-0.10.11-pulse-hang-bz556986.patch	13 Jan 2009 18:54:11 -0000	1.2
@@ -140,3 +140,13 @@
  
    pa_stream_set_state_callback (pulsesink->stream,
        gst_pulsesink_stream_state_cb, pulsesink);
+--- ext/pulse/pulsesink.h	2008/08/13 13:57:01	1.3
++++ ext/pulse/pulsesink.h	2009/01/07 20:38:50	1.4
+@@ -57,6 +57,7 @@
+ 
+   pa_context *context;
+   pa_stream *stream;
++  GMutex *stream_mutex;
+ 
+   pa_sample_spec sample_spec;
+ 



From mhlavink at fedoraproject.org  Tue Jan 13 18:57:45 2009
From: mhlavink at fedoraproject.org (Michal Hlavinka)
Date: Tue, 13 Jan 2009 18:57:45 +0000 (UTC)
Subject: rpms/dovecot/devel .cvsignore, 1.46,
	1.47 dovecot-1.1-default-settings.patch, 1.3, 1.4 dovecot.spec,
	1.117, 1.118 sources, 1.49, 1.50
Message-ID: <20090113185745.897C670129@cvs1.fedora.phx.redhat.com>

Author: mhlavink

Update of /cvs/extras/rpms/dovecot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32557

Modified Files:
	.cvsignore dovecot-1.1-default-settings.patch dovecot.spec 
	sources 
Log Message:
added managesieve support



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/dovecot/devel/.cvsignore,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- .cvsignore	8 Jan 2009 06:32:20 -0000	1.46
+++ .cvsignore	13 Jan 2009 18:57:14 -0000	1.47
@@ -2,3 +2,6 @@
 dovecot-1.1.8.tar.gz.sig
 dovecot-sieve-1.1.6.tar.gz
 dovecot-sieve-1.1.6.tar.gz.sig
+dovecot-1.1.8-managesieve-0.10.4.diff.gz
+dovecot-1.1.8-managesieve-0.10.4.diff.gz.sig
+dovecot-1.1-managesieve-0.10.4.tar.gz

dovecot-1.1-default-settings.patch:

Index: dovecot-1.1-default-settings.patch
===================================================================
RCS file: /cvs/extras/rpms/dovecot/devel/dovecot-1.1-default-settings.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- dovecot-1.1-default-settings.patch	2 Dec 2008 14:23:37 -0000	1.3
+++ dovecot-1.1-default-settings.patch	13 Jan 2009 18:57:14 -0000	1.4
@@ -1,6 +1,6 @@
-diff -up dovecot-1.1.7/dovecot-example.conf.default-settings dovecot-1.1.7/dovecot-example.conf
---- dovecot-1.1.7/dovecot-example.conf.default-settings	2008-11-23 22:53:53.000000000 +0100
-+++ dovecot-1.1.7/dovecot-example.conf	2008-12-02 15:18:54.961559642 +0100
+diff -up dovecot-1.1.8/dovecot-example.conf.default-settings dovecot-1.1.8/dovecot-example.conf
+--- dovecot-1.1.8/dovecot-example.conf.default-settings	2009-01-13 19:34:30.390937820 +0100
++++ dovecot-1.1.8/dovecot-example.conf	2009-01-13 19:37:00.217687707 +0100
 @@ -10,17 +10,14 @@
  # value inside quotes, eg.: key = "# char and trailing whitespace  "
  
@@ -14,15 +14,15 @@
  # Base directory where to store runtime data.
  #base_dir = /var/run/dovecot/
  
- # Protocols we want to be serving: imap imaps pop3 pop3s
+ # Protocols we want to be serving: imap imaps pop3 pop3s managesieve
  # If you only want to use dovecot-auth, you can set this to "none".
 -#protocols = imap imaps
 +#protocols = imap imaps pop3 pop3s
  
  # A space separated list of IP or host addresses where to listen in for
  # connections. "*" listens in all IPv4 interfaces. "[::]" listens in all IPv6
-@@ -38,13 +35,13 @@
- #     listen = *:10100
+@@ -42,13 +39,13 @@
+ #     listen = *:12000
  #     ..
  #   }
 -#listen = *
@@ -37,7 +37,7 @@
  
  # Should all IMAP and POP3 processes be killed when Dovecot master process
  # shuts down. Setting this to "no" means that Dovecot can be upgraded without
-@@ -90,8 +87,8 @@
+@@ -95,8 +92,8 @@
  # dropping root privileges, so keep the key file unreadable by anyone but
  # root. Included doc/mkcert.sh can be used to easily generate self-signed
  # certificate, just make sure to update the domains in dovecot-openssl.cnf
@@ -48,7 +48,7 @@
  
  # If key file is password protected, give the password here. Alternatively
  # give it when starting dovecot with -p parameter. Since this file is often
-@@ -449,7 +446,7 @@
+@@ -452,7 +449,7 @@
  # locking methods as well. Some operating systems don't allow using some of
  # them simultaneously.
  #mbox_read_locks = fcntl
@@ -57,9 +57,9 @@
  
  # Maximum time in seconds to wait for lock (all of them) before aborting.
  #mbox_lock_timeout = 300
-diff -up dovecot-1.1.7/src/master/master-settings.c.default-settings dovecot-1.1.7/src/master/master-settings.c
---- dovecot-1.1.7/src/master/master-settings.c.default-settings	2008-11-15 18:13:18.000000000 +0100
-+++ dovecot-1.1.7/src/master/master-settings.c	2008-12-02 15:17:11.762934079 +0100
+diff -up dovecot-1.1.8/src/master/master-settings.c.default-settings dovecot-1.1.8/src/master/master-settings.c
+--- dovecot-1.1.8/src/master/master-settings.c.default-settings	2009-01-13 19:34:30.408937169 +0100
++++ dovecot-1.1.8/src/master/master-settings.c	2009-01-13 19:34:30.419937312 +0100
 @@ -178,8 +178,8 @@ struct settings default_settings = {
  	MEMBER(syslog_facility) "mail",
  


Index: dovecot.spec
===================================================================
RCS file: /cvs/extras/rpms/dovecot/devel/dovecot.spec,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -r1.117 -r1.118
--- dovecot.spec	8 Jan 2009 06:32:20 -0000	1.117
+++ dovecot.spec	13 Jan 2009 18:57:14 -0000	1.118
@@ -2,7 +2,7 @@
 Name: dovecot
 Epoch: 1
 Version: 1.1.8
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: MIT and LGPLv2 and BSD with advertising
 Group: System Environment/Daemons
 
@@ -13,8 +13,11 @@
 %define build_gssapi 1
 
 %define build_sieve 1
+%define build_managesieve 1
 %define sieve_version 1.1.6
 %define sieve_name dovecot-sieve
+%define managesieve_version 0.10.4
+%define managesieve_name dovecot-1.1-managesieve
 
 URL: http://www.dovecot.org/
 Source: http://www.dovecot.org/releases/1.1/%{name}-%{version}.tar.gz
@@ -27,6 +30,9 @@
 Source7: dovecot-REDHAT-FAQ.txt
 Source8: http://dovecot.org/releases/sieve/%{sieve_name}-%{sieve_version}.tar.gz
 Source9: dovecot.sysconfig
+Source10: http://www.rename-it.nl/dovecot/1.1/%{managesieve_name}-%{managesieve_version}.tar.gz
+Source11: http://www.rename-it.nl/dovecot/1.1/dovecot-%{version}-managesieve-%{managesieve_version}.diff.gz
+Patch0: dovecot-%{version}-managesieve-%{managesieve_version}.diff.gz
 Patch1: dovecot-1.1-default-settings.patch
 Patch2: dovecot-1.0.beta2-mkcert-permissions.patch
 # local filesystem rules
@@ -89,6 +95,17 @@
 This package provides the CMU Sieve plugin version %{sieve_version} for dovecot LDA.
 %endif
 
+%if %{build_managesieve}
+%package managesieve
+Requires: %{name} = %{epoch}:%{version}-%{release}
+Summary: Manage Sieve daemon for dovecot
+Group: System Environment/Daemons
+License: LGPLv2.1
+
+%description managesieve
+This package provides the Manage Sieve daemon version %{managesieve_version} for dovecot.
+%endif
+
 %if %{build_postgres}
 %package pgsql
 Requires: %{name} = %{epoch}:%{version}-%{release}
@@ -146,6 +163,7 @@
 
 %setup -q
 
+%patch0 -p1 -b .managesieve
 %patch1 -p1 -b .default-settings
 %patch2 -p1 -b .mkcert-permissions
 %patch3 -p1 -b .mkcert-paths
@@ -154,6 +172,10 @@
 %setup -q -D -T -a 8
 %endif
 
+%if %{build_managesieve}
+%setup -q -D -T -a 10
+%endif
+
 %build
 rm -f ./configure
 autoreconf -i -f
@@ -196,6 +218,21 @@
 make %{?_smp_mflags}
 %endif
 
+%if %{build_managesieve}
+cd ..
+cd %{managesieve_name}-%{managesieve_version}
+
+rm -f ./configure
+autoreconf -i -f
+%configure                           \
+    INSTALL_DATA="install -c -p -m644" \
+    --disable-static                 \
+    --with-dovecot=../               \
+    --with-dovecot-sieve=../%{sieve_name}-%{sieve_version}/
+
+make %{?_smp_mflags}
+%endif
+
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
@@ -258,6 +295,13 @@
 popd
 %endif
 
+%if %{build_managesieve}
+# dovecot-managesieve
+pushd %{managesieve_name}-%{managesieve_version}
+make install DESTDIR=$RPM_BUILD_ROOT
+popd
+%endif
+
 #remove the libtool archives
 find $RPM_BUILD_ROOT%{_libdir}/%{name}/ -name '*.la' | xargs rm -f
 
@@ -331,6 +375,13 @@
 %{_libdir}/%{name}/lda/lib90_cmusieve_plugin.so
 %endif
 
+%if %{build_managesieve}
+%files managesieve
+%defattr(-,root,root,-)
+%{_libexecdir}/%{name}/managesieve
+%{_libexecdir}/%{name}/managesieve-login
+%endif
+
 %if %{build_mysql}
 %files mysql
 %defattr(-,root,root,-)
@@ -374,6 +425,9 @@
 
 
 %changelog
+* Tue Jan 13 2009 Michal Hlavinka <mhlavink at redhat.com> - 1:1.1.8-2
+- added managesieve support (thanks Helmut K. C. Tessarek)
+
 * Thu Jan 8 2009 Michal Hlavinka <mhlavink at redhat.com> - 1:1.1.8-1
 - dovecot updated to 1.1.8
 - sieve-plugin updated to 1.1.6


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/dovecot/devel/sources,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- sources	8 Jan 2009 06:32:20 -0000	1.49
+++ sources	13 Jan 2009 18:57:15 -0000	1.50
@@ -2,3 +2,6 @@
 085419d609721f2281f38cbda7c897fd  dovecot-1.1.8.tar.gz.sig
 7acf3d98974a515b868addbdb73054eb  dovecot-sieve-1.1.6.tar.gz
 a9c6b8b2eab4d6a72395ffde1fb53327  dovecot-sieve-1.1.6.tar.gz.sig
+a2f663940115e136db4bf3b1b760759b  dovecot-1.1.8-managesieve-0.10.4.diff.gz
+5ec09d3a116ddbf3353a6efd703316b2  dovecot-1.1.8-managesieve-0.10.4.diff.gz.sig
+3e8e3490cb2d9cd58450d19e666c9a59  dovecot-1.1-managesieve-0.10.4.tar.gz



From pkgdb at fedoraproject.org  Tue Jan 13 19:08:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 19:08:57 +0000
Subject: [pkgdb] po4a had acl change status
Message-ID: <20090113190857.97552208207@bastion.fedora.phx.redhat.com>

athimm has set the watchcommits acl on po4a (Fedora devel) to Approved for corsepiu

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/po4a



From pkgdb at fedoraproject.org  Tue Jan 13 19:08:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 19:08:57 +0000
Subject: [pkgdb] po4a had acl change status
Message-ID: <20090113190857.ACACB208458@bastion.fedora.phx.redhat.com>

athimm has set the watchbugzilla acl on po4a (Fedora devel) to Approved for corsepiu

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/po4a



From pkgdb at fedoraproject.org  Tue Jan 13 19:08:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 19:08:59 +0000
Subject: [pkgdb] po4a had acl change status
Message-ID: <20090113190859.42B2F208469@bastion.fedora.phx.redhat.com>

athimm has set the commit acl on po4a (Fedora devel) to Approved for corsepiu

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/po4a



From pkgdb at fedoraproject.org  Tue Jan 13 19:09:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 19:09:00 +0000
Subject: [pkgdb] po4a had acl change status
Message-ID: <20090113190900.5E01720846E@bastion.fedora.phx.redhat.com>

athimm has set the approveacls acl on po4a (Fedora devel) to Approved for corsepiu

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/po4a



From pkgdb at fedoraproject.org  Tue Jan 13 19:09:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 19:09:08 +0000
Subject: [pkgdb] po4a ownership updated
Message-ID: <20090113190908.6DA83208471@bastion.fedora.phx.redhat.com>

Package po4a in Fedora EPEL 4 was orphaned by athimm

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/po4a



From pkgdb at fedoraproject.org  Tue Jan 13 19:09:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 19:09:09 +0000
Subject: [pkgdb] po4a ownership updated
Message-ID: <20090113190909.A5EBB208472@bastion.fedora.phx.redhat.com>

Package po4a in Fedora EPEL 5 was orphaned by athimm

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/po4a



From pkgdb at fedoraproject.org  Tue Jan 13 19:09:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 19:09:24 +0000
Subject: [pkgdb] po4a had acl change status
Message-ID: <20090113190924.E7D18208457@bastion.fedora.phx.redhat.com>

athimm has set the watchbugzilla acl on po4a (Fedora 9) to Approved for corsepiu

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/po4a



From pkgdb at fedoraproject.org  Tue Jan 13 19:09:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 19:09:27 +0000
Subject: [pkgdb] po4a had acl change status
Message-ID: <20090113190927.4B13E208467@bastion.fedora.phx.redhat.com>

athimm has set the watchcommits acl on po4a (Fedora 9) to Approved for corsepiu

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/po4a



From pkgdb at fedoraproject.org  Tue Jan 13 19:09:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 19:09:30 +0000
Subject: [pkgdb] po4a had acl change status
Message-ID: <20090113190930.6ED7120846B@bastion.fedora.phx.redhat.com>

athimm has set the commit acl on po4a (Fedora 9) to Approved for corsepiu

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/po4a



From pkgdb at fedoraproject.org  Tue Jan 13 19:09:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 19:09:32 +0000
Subject: [pkgdb] po4a had acl change status
Message-ID: <20090113190932.E571620846E@bastion.fedora.phx.redhat.com>

athimm has set the approveacls acl on po4a (Fedora 9) to Approved for corsepiu

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/po4a



From pkgdb at fedoraproject.org  Tue Jan 13 19:09:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 19:09:38 +0000
Subject: [pkgdb] po4a had acl change status
Message-ID: <20090113190939.43C6B208474@bastion.fedora.phx.redhat.com>

athimm has set the watchbugzilla acl on po4a (Fedora 10) to Approved for corsepiu

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/po4a



From pkgdb at fedoraproject.org  Tue Jan 13 19:09:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 19:09:41 +0000
Subject: [pkgdb] po4a had acl change status
Message-ID: <20090113190941.D2005208475@bastion.fedora.phx.redhat.com>

athimm has set the watchcommits acl on po4a (Fedora 10) to Approved for corsepiu

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/po4a



From pkgdb at fedoraproject.org  Tue Jan 13 19:09:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 19:09:44 +0000
Subject: [pkgdb] po4a had acl change status
Message-ID: <20090113190944.3DB84208203@bastion.fedora.phx.redhat.com>

athimm has set the commit acl on po4a (Fedora 10) to Approved for corsepiu

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/po4a



From pkgdb at fedoraproject.org  Tue Jan 13 19:09:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 19:09:51 +0000
Subject: [pkgdb] po4a had acl change status
Message-ID: <20090113190951.E585E20847B@bastion.fedora.phx.redhat.com>

athimm has set the approveacls acl on po4a (Fedora 10) to Obsolete for corsepiu

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/po4a



From pkgdb at fedoraproject.org  Tue Jan 13 19:09:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 19:09:45 +0000
Subject: [pkgdb] po4a had acl change status
Message-ID: <20090113190945.41032208478@bastion.fedora.phx.redhat.com>

athimm has set the approveacls acl on po4a (Fedora 10) to Approved for corsepiu

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/po4a



From mhlavink at fedoraproject.org  Tue Jan 13 19:26:55 2009
From: mhlavink at fedoraproject.org (Michal Hlavinka)
Date: Tue, 13 Jan 2009 19:26:55 +0000 (UTC)
Subject: rpms/cyrus-imapd/devel .cvsignore, 1.12,
	1.13 cyrus-imapd-2.3.1-authid_normalize.patch, 1.1,
	1.2 cyrus-imapd-2.3.1-make_md5_defaults.patch, 1.2,
	1.3 cyrus-imapd-2.3.12p2-autocreate-0.10-0.diff, 1.1,
	1.2 cyrus-imapd.spec, 1.44, 1.45 sources, 1.14, 1.15
Message-ID: <20090113192655.A14367013F@cvs1.fedora.phx.redhat.com>

Author: mhlavink

Update of /cvs/extras/rpms/cyrus-imapd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4451

Modified Files:
	.cvsignore cyrus-imapd-2.3.1-authid_normalize.patch 
	cyrus-imapd-2.3.1-make_md5_defaults.patch 
	cyrus-imapd-2.3.12p2-autocreate-0.10-0.diff cyrus-imapd.spec 
	sources 
Log Message:
updated to 2.3.13



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cyrus-imapd/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	1 Sep 2008 11:50:44 -0000	1.12
+++ .cvsignore	13 Jan 2009 19:26:23 -0000	1.13
@@ -1,3 +1,3 @@
+cyrus-imapd-2.3.13.tar.gz
+cyrus-imapd-2.3.13.tar.gz.sig
 cyrus_sharedbackup-0.1.tar.gz
-cyrus-imapd-2.3.12p2.tar.gz
-cyrus-imapd-2.3.12p2.tar.gz.sig

cyrus-imapd-2.3.1-authid_normalize.patch:

Index: cyrus-imapd-2.3.1-authid_normalize.patch
===================================================================
RCS file: /cvs/extras/rpms/cyrus-imapd/devel/cyrus-imapd-2.3.1-authid_normalize.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cyrus-imapd-2.3.1-authid_normalize.patch	28 Feb 2006 20:04:01 -0000	1.1
+++ cyrus-imapd-2.3.1-authid_normalize.patch	13 Jan 2009 19:26:23 -0000	1.2
@@ -1,7 +1,17 @@
-diff -Naur cyrus-imapd-2.3.1.orig/lib/auth_unix.c cyrus-imapd-2.3.1/lib/auth_unix.c
---- cyrus-imapd-2.3.1.orig/lib/auth_unix.c	Wed Feb 16 22:06:50 2005
-+++ cyrus-imapd-2.3.1/lib/auth_unix.c	Wed Dec 21 13:50:05 2005
-@@ -157,10 +157,12 @@
+--- cyrus-imapd-2.3.13/lib/libcyr_cfg.h.authid_normalize	2008-07-30 18:03:39.000000000 +0200
++++ cyrus-imapd-2.3.13/lib/libcyr_cfg.h	2009-01-13 11:41:59.000000000 +0100
+@@ -100,6 +100,8 @@
+     CYRUSOPT_BERKELEY_TXNS_MAX,
+     /* RFC 2086 right which allows DELETE ("c") */
+     CYRUSOPT_DELETERIGHT,
++    /* Lowercase uid and strip leading and trailing blanks (OFF) */
++    CYRUSOPT_NORMALIZEUID,
+     /* SQL database */
+     CYRUSOPT_SQL_DATABASE,
+     /* SQL engine ("mysql") */
+--- cyrus-imapd-2.3.13/lib/auth_unix.c.authid_normalize	2009-01-13 11:38:08.000000000 +0100
++++ cyrus-imapd-2.3.13/lib/auth_unix.c	2009-01-13 11:38:08.000000000 +0100
+@@ -155,10 +155,12 @@
  size_t len;
  {
      static char retbuf[81];
@@ -37,10 +47,9 @@
      return retbuf;
  }
  
-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	Tue Dec 13 20:36:11 2005
-+++ cyrus-imapd-2.3.1/lib/imapoptions	Wed Dec 21 13:50:05 2005
-@@ -990,6 +990,11 @@
+--- cyrus-imapd-2.3.13/lib/imapoptions.authid_normalize	2009-01-13 11:38:08.000000000 +0100
++++ cyrus-imapd-2.3.13/lib/imapoptions	2009-01-13 11:38:08.000000000 +0100
+@@ -1182,6 +1182,11 @@
     interface, otherwise the user is assumed to be in the default
     domain (if set). */
  
@@ -52,12 +61,11 @@
  /*
  .SH SEE ALSO
  .PP
-diff -Naur cyrus-imapd-2.3.1.orig/lib/libcyr_cfg.c cyrus-imapd-2.3.1/lib/libcyr_cfg.c
---- cyrus-imapd-2.3.1.orig/lib/libcyr_cfg.c	Tue Dec 13 20:36:12 2005
-+++ cyrus-imapd-2.3.1/lib/libcyr_cfg.c	Wed Dec 21 13:50:05 2005
-@@ -127,6 +127,11 @@
-       CFGVAL(const char *, "c"),
-       CYRUS_OPT_STRING },
+--- cyrus-imapd-2.3.13/lib/libcyr_cfg.c.authid_normalize	2008-07-30 18:03:38.000000000 +0200
++++ cyrus-imapd-2.3.13/lib/libcyr_cfg.c	2009-01-13 11:38:08.000000000 +0100
+@@ -150,6 +150,11 @@
+       CFGVAL(long, 0),
+       CYRUS_OPT_SWITCH },
  
 +    { CYRUSOPT_NORMALIZEUID,
 +      CFGVAL(long, 1),
@@ -67,15 +75,3 @@
      { CYRUSOPT_LAST, { NULL }, CYRUS_OPT_NOTOPT }
  };
  
-diff -Naur cyrus-imapd-2.3.1.orig/lib/libcyr_cfg.h cyrus-imapd-2.3.1/lib/libcyr_cfg.h
---- cyrus-imapd-2.3.1.orig/lib/libcyr_cfg.h	Tue Dec 13 20:36:12 2005
-+++ cyrus-imapd-2.3.1/lib/libcyr_cfg.h	Wed Dec 21 13:51:37 2005
-@@ -101,6 +101,8 @@
-     CYRUSOPT_BERKELEY_TXNS_MAX,
-     /* RFC 2086 right which allows DELETE ("c") */
-     CYRUSOPT_DELETERIGHT,
-+    /* Lowercase uid and strip leading and trailing blanks (OFF) */
-+    CYRUSOPT_NORMALIZEUID,
- 
-     CYRUSOPT_LAST
-     

cyrus-imapd-2.3.1-make_md5_defaults.patch:

Index: cyrus-imapd-2.3.1-make_md5_defaults.patch
===================================================================
RCS file: /cvs/extras/rpms/cyrus-imapd/devel/cyrus-imapd-2.3.1-make_md5_defaults.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- cyrus-imapd-2.3.1-make_md5_defaults.patch	1 Sep 2008 09:41:02 -0000	1.2
+++ cyrus-imapd-2.3.1-make_md5_defaults.patch	13 Jan 2009 19:26:23 -0000	1.3
@@ -1,7 +1,6 @@
-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 @@
+--- cyrus-imapd-2.3.13/imap/make_md5.c.make_md5_defaults	2008-10-02 16:05:44.000000000 +0200
++++ cyrus-imapd-2.3.13/imap/make_md5.c	2009-01-13 11:44:24.000000000 +0100
+@@ -857,7 +857,7 @@
      if (!md5_dir) md5_dir = config_getstring(IMAPOPT_MD5_DIR);
  
      if (!md5_dir)
@@ -10,10 +9,9 @@
  
      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 @@
+--- cyrus-imapd-2.3.13/lib/imapoptions.make_md5_defaults	2009-01-13 11:44:24.000000000 +0100
++++ cyrus-imapd-2.3.13/lib/imapoptions	2009-01-13 14:17:35.000000000 +0100
+@@ -634,10 +634,14 @@
     mailspool, but each have their own "replicated" copy of
     mailboxes.db. */
  
@@ -21,11 +19,11 @@
 +{ "md5_dir", "/var/lib/imap/md5", STRING }
  /* Top level directory for MD5 store manipulated by make_md5. File
     structure within this directory is one file for each user on the system,
--   hashed on the first letter of the userid (e.g: /var/imap/md5/d/dpc22). */
+-   hashed on the first letter of the userid (e.g., /var/imap/md5/d/dpc22). */
 +   hashed on the first letter of the
-+   userid (e.g: /var/lib/imap/md5/d/dpc22).
-+.PP
-+   Note: This Invoca RPM build uses \fI/var/lib/imap/md5\fR by default
++   userid (e.g., /var/imap/md5/d/dpc22).
++.PP   
++   Note: This Invoca RPM build uses \fI/var/lib/imap/md5\fR by default 
 +   instead of \fI/var/imap/md5\fR for \fBmd5_dir\fR. */
  
  { "md5_user_map", NULL, STRING }

cyrus-imapd-2.3.12p2-autocreate-0.10-0.diff:

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.1 -r 1.2 cyrus-imapd-2.3.12p2-autocreate-0.10-0.diff
Index: cyrus-imapd-2.3.12p2-autocreate-0.10-0.diff
===================================================================
RCS file: /cvs/extras/rpms/cyrus-imapd/devel/cyrus-imapd-2.3.12p2-autocreate-0.10-0.diff,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cyrus-imapd-2.3.12p2-autocreate-0.10-0.diff	1 Sep 2008 11:50:44 -0000	1.1
+++ cyrus-imapd-2.3.12p2-autocreate-0.10-0.diff	13 Jan 2009 19:26:23 -0000	1.2
@@ -1,485 +1,426 @@
-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
-+----------------------------------
+--- cyrus-imapd-2.3.13/notifyd/notifyd.c.autocreate	2008-03-24 20:59:32.000000000 +0100
++++ cyrus-imapd-2.3.13/notifyd/notifyd.c	2009-01-13 11:14:09.000000000 +0100
+@@ -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);
+--- cyrus-imapd-2.3.13/notifyd/Makefile.in.autocreate	2008-03-24 20:59:32.000000000 +0100
++++ cyrus-imapd-2.3.13/notifyd/Makefile.in	2009-01-13 11:14:09.000000000 +0100
+@@ -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
+--- cyrus-imapd-2.3.13/imap/mboxlist.c.autocreate	2008-10-08 17:47:08.000000000 +0200
++++ cyrus-imapd-2.3.13/imap/mboxlist.c	2009-01-13 11:14:09.000000000 +0100
+@@ -83,6 +83,12 @@
+ #include "quota.h"
+ #include "sync_log.h"
+ 
++#ifdef USE_SIEVE
++extern int autoadd_sieve(char *userid, 
++		const char *source_script);
++#endif
 +
-+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:
+ #define DB config_mboxlist_db
+ #define SUBDB config_subscription_db
+ 
+@@ -100,11 +106,29 @@
+ static int mboxlist_changequota(const char *name, int matchlen, int maycreate,
+ 				void *rock);
+ 
++static int mboxlist_autochangesub(char *name, int matchlen, int maycreate,
++			      void *rock);
 +
-+  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. 
++static int mboxlist_autosubscribe_sharedfolders(struct namespace *namespace,
++                        char *userid, char *auth_userid,
++                        struct auth_state *auth_state);
 +
-+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. 
+ struct change_rock {
+     struct quota *quota;
+     struct txn **tid;
+ };
+ 
++/*
++ * Struct needed to be passed as void *rock to
++ * mboxlist_autochangesub();
++ */
++struct changesub_rock_st {
++        char *userid;
++        char *auth_userid;
++        struct auth_state *auth_state;
++};
 +
-+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".
-+ 
 +
+ #define FNAME_SUBSSUFFIX ".sub"
+ 
+ /*
+@@ -3383,3 +3407,349 @@
+ 
+     return(config_delete_mode == IMAP_ENUM_DELETE_MODE_DELAYED);
+ }
 +
-+Create on login
-+===============
-+This feauture provides automatic creation of a user's INBOX folder when all of the 
-+following requirements are met:
++/*
++ * Automatically subscribe user to *ALL* shared folders,
++ * one has permissions to be subscribed to.
++ * INBOX subfolders are excluded.
++ */
++static int mboxlist_autochangesub(char *name, int matchlen, int maycreate,
++                        void *rock) {
 +
-+i)  The user has succesfully passed the authentication procedure.
++  struct changesub_rock_st *changesub_rock = (struct changesub_rock_st *) rock;
++  char *userid = changesub_rock->userid;
++  char *auth_userid = changesub_rock->auth_userid;
++  struct auth_state *auth_state = changesub_rock->auth_state;
++  int r;
 +
-+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. 
++  if((strlen(name) == 5 && !strncmp(name, "INBOX", 5)) || /* Exclude INBOX */
++     (strlen(name) > 5  && !strncmp(name, "INBOX.",6)) || /* Exclude INBOX subfolders */
++     (strlen(name) > 4  && !strncmp(name, "user.", 5)))   /* Exclude other users' folders */
++	  return 0;
 +
-+iv) The corresponding to the user's authorisation ID INBOX folder
-+does not exist.
++     
++  r = mboxlist_changesub(name, userid, auth_state, 1, 0);
 +
-+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.
++  if (r) {
++      syslog(LOG_WARNING,
++             "autosubscribe: User %s to folder %s, subscription failed: %s",
++             auth_userid, name, error_message(r));
++  } else {
++      syslog(LOG_NOTICE,
++             "autosubscribe: User %s to folder %s, subscription succeeded",
++             auth_userid, name);
++  }
 +
++  return 0;
++}
 +
++#define SEP '|'
 +
-+Create on post
-+==============
-+This feauture provides automatic creation of a user's INBOX folder when all of the 
-+following requirements are met. 
++/*
++ * Automatically subscribe user to a shared folder.
++ * Subscription is done successfully, if the shared
++ * folder exists and the user has the necessary 
++ * permissions.
++ */
++static int mboxlist_autosubscribe_sharedfolders(struct namespace *namespace,
++                        char *userid, char *auth_userid,
++                        struct auth_state *auth_state) {
++        
++    const char *sub ;
++    char *p, *q, *next_sub;
++    char folder[MAX_MAILBOX_NAME+1], name[MAX_MAILBOX_NAME+1], mailboxname[MAX_MAILBOX_NAME+1];
++    int len;
++    int r = 0;
++    int subscribe_all_sharedfolders = 0;
 +
-+i) An email message addressed to the user has been received.  
++    subscribe_all_sharedfolders = config_getswitch(IMAPOPT_AUTOSUBSCRIBE_ALL_SHAREDFOLDERS);
 +
-+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.
++    /*
++     * If subscribeallsharedfolders is set to yes in imapd.conf, then
++     * subscribe user to every shared folder one has the apropriate 
++     * permissions.
++     */
++    if(subscribe_all_sharedfolders) {
++       char pattern[MAX_MAILBOX_PATH+1];
++       struct changesub_rock_st changesub_rock;
 +
[...1873 lines suppressed...]
  }
@@ -2194,46 +2212,8 @@
      &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
+--- cyrus-imapd-2.3.13/lib/auth_pts.c.autocreate	2008-03-24 18:43:08.000000000 +0100
++++ cyrus-imapd-2.3.13/lib/auth_pts.c	2009-01-13 11:14:09.000000000 +0100
 @@ -512,6 +512,14 @@
      free(auth_state);
  }
@@ -2255,38 +2235,64 @@
      &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);
+--- cyrus-imapd-2.3.13/lib/auth.h.autocreate	2008-03-24 18:43:08.000000000 +0100
++++ cyrus-imapd-2.3.13/lib/auth.h	2009-01-13 11:14:09.000000000 +0100
+@@ -55,6 +55,7 @@
+              const char *identifier);
+     struct auth_state *(*newstate)(const char *identifier);
+     void (*freestate)(struct auth_state *auth_state);
++    char *(*auth_canonuser)(struct auth_state *auth_state);
+ };
+ 
+ extern struct auth_mech *auth_mechs[];
+@@ -77,5 +78,6 @@
+  	 const char *identifier);
+ struct auth_state *auth_newstate(const char *identifier);
+ void auth_freestate(struct auth_state *auth_state);
++char *auth_canonuser(struct auth_state *auth_state);
+ 
+ #endif /* INCLUDED_AUTH_H */
+--- cyrus-imapd-2.3.13/lib/auth_krb5.c.autocreate	2008-03-24 18:43:08.000000000 +0100
++++ cyrus-imapd-2.3.13/lib/auth_krb5.c	2009-01-13 11:14:09.000000000 +0100
+@@ -199,6 +199,14 @@
+     free(auth_state);
  }
  
-+static char *mycanonuser(auth_state)
-+    struct auth_state *auth_state;
++static char *mycanonuser(struct auth_state *auth_state)
 +{
 +    if (auth_state)
-+         return auth_state->userid;
++       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_unix = 
- {
-@@ -321,4 +331,5 @@
+ struct auth_mech auth_krb5 = 
+@@ -240,4 +254,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
+--- cyrus-imapd-2.3.13/lib/imapoptions.autocreate	2008-10-08 19:18:12.000000000 +0200
++++ cyrus-imapd-2.3.13/lib/imapoptions	2009-01-13 11:14:09.000000000 +0100
 @@ -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) */
+    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,
@@ -2340,47 +2346,28 @@
  { "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 @@
+--- cyrus-imapd-2.3.13/lib/auth_unix.c.autocreate	2008-08-26 21:20:39.000000000 +0200
++++ cyrus-imapd-2.3.13/lib/auth_unix.c	2009-01-13 11:14:09.000000000 +0100
+@@ -314,6 +314,16 @@
+     free((char *)auth_state);
+ }
  
- #define NOTIFY_MAXSIZE 8192
++static char *mycanonuser(auth_state)
++    struct auth_state *auth_state;
++{
++    if (auth_state)
++         return auth_state->userid;
++
++    return NULL;
++}
++
++
  
--int do_notify()
-+static int do_notify()
+ struct auth_mech auth_unix = 
  {
-     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@
+@@ -323,4 +333,5 @@
+     &mymemberof,
+     &mynewstate,
+     &myfreestate,
++    &mycanonuser,
+ };


Index: cyrus-imapd.spec
===================================================================
RCS file: /cvs/extras/rpms/cyrus-imapd/devel/cyrus-imapd.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- cyrus-imapd.spec	26 Sep 2008 11:39:02 -0000	1.44
+++ cyrus-imapd.spec	13 Jan 2009 19:26:24 -0000	1.45
@@ -1,7 +1,7 @@
-%define upstream_ver 2.3.12p2
+%define upstream_ver 2.3.13
 Name: cyrus-imapd
-Version: 2.3.12p2
-Release: 3%{?dist}
+Version: 2.3.13
+Release: 1%{?dist}
 
 # ********************** BUILD TIME OPTIONS START **********************
 
@@ -704,6 +704,7 @@
 %attr(0755,root,root) %{_cyrexecdir}/reconstruct
 %attr(0755,root,root) %{_cyrexecdir}/rehash
 %attr(0755,root,root) %{_cyrexecdir}/sievec
+%attr(0755,root,root) %{_cyrexecdir}/sieved
 %attr(0755,root,root) %{_cyrexecdir}/smmapd
 %attr(0755,root,root) %{_cyrexecdir}/squatter
 %attr(0755,root,root) %{_cyrexecdir}/timsieved
@@ -785,6 +786,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Tue Jan 13 2009 Michal Hlavinka <mhlavink at redhat.com> - 2.3.13-1
+- updated to 2.3.13
+
 * Fri Sep 26 2008 Dan Hor??k <dan[at]danny.cz - 2.3.12p2-3
 - better fix for linking with recent db4.x
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cyrus-imapd/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	1 Sep 2008 11:50:44 -0000	1.14
+++ sources	13 Jan 2009 19:26:24 -0000	1.15
@@ -1,3 +1,3 @@
+7dc48324c3a99e210bf777ea74aae694  cyrus-imapd-2.3.13.tar.gz
+6b58bb8dd2c47af02b45c5a426b1335c  cyrus-imapd-2.3.13.tar.gz.sig
 8f7a26b0556369827bb5c8084a3e3ea1  cyrus_sharedbackup-0.1.tar.gz
-ee2c300687994e4982c6af6aa154c742  cyrus-imapd-2.3.12p2.tar.gz
-a04fd37f1e47cfbed3394758ac2e4981  cyrus-imapd-2.3.12p2.tar.gz.sig



From mhlavink at fedoraproject.org  Tue Jan 13 19:33:01 2009
From: mhlavink at fedoraproject.org (Michal Hlavinka)
Date: Tue, 13 Jan 2009 19:33:01 +0000 (UTC)
Subject: rpms/cyrus-imapd/F-10 .cvsignore, 1.12,
	1.13 cyrus-imapd-2.3.1-authid_normalize.patch, 1.1,
	1.2 cyrus-imapd-2.3.1-make_md5_defaults.patch, 1.2,
	1.3 cyrus-imapd-2.3.12p2-autocreate-0.10-0.diff, 1.1,
	1.2 cyrus-imapd.spec, 1.44, 1.45 sources, 1.14, 1.15
Message-ID: <20090113193301.A25457013F@cvs1.fedora.phx.redhat.com>

Author: mhlavink

Update of /cvs/extras/rpms/cyrus-imapd/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13535

Modified Files:
	.cvsignore cyrus-imapd-2.3.1-authid_normalize.patch 
	cyrus-imapd-2.3.1-make_md5_defaults.patch 
	cyrus-imapd-2.3.12p2-autocreate-0.10-0.diff cyrus-imapd.spec 
	sources 
Log Message:
updated to 2.3.13



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cyrus-imapd/F-10/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	1 Sep 2008 11:50:44 -0000	1.12
+++ .cvsignore	13 Jan 2009 19:32:30 -0000	1.13
@@ -1,3 +1,3 @@
+cyrus-imapd-2.3.13.tar.gz
+cyrus-imapd-2.3.13.tar.gz.sig
 cyrus_sharedbackup-0.1.tar.gz
-cyrus-imapd-2.3.12p2.tar.gz
-cyrus-imapd-2.3.12p2.tar.gz.sig

cyrus-imapd-2.3.1-authid_normalize.patch:

Index: cyrus-imapd-2.3.1-authid_normalize.patch
===================================================================
RCS file: /cvs/extras/rpms/cyrus-imapd/F-10/cyrus-imapd-2.3.1-authid_normalize.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cyrus-imapd-2.3.1-authid_normalize.patch	28 Feb 2006 20:04:01 -0000	1.1
+++ cyrus-imapd-2.3.1-authid_normalize.patch	13 Jan 2009 19:32:30 -0000	1.2
@@ -1,7 +1,17 @@
-diff -Naur cyrus-imapd-2.3.1.orig/lib/auth_unix.c cyrus-imapd-2.3.1/lib/auth_unix.c
---- cyrus-imapd-2.3.1.orig/lib/auth_unix.c	Wed Feb 16 22:06:50 2005
-+++ cyrus-imapd-2.3.1/lib/auth_unix.c	Wed Dec 21 13:50:05 2005
-@@ -157,10 +157,12 @@
+--- cyrus-imapd-2.3.13/lib/libcyr_cfg.h.authid_normalize	2008-07-30 18:03:39.000000000 +0200
++++ cyrus-imapd-2.3.13/lib/libcyr_cfg.h	2009-01-13 11:41:59.000000000 +0100
+@@ -100,6 +100,8 @@
+     CYRUSOPT_BERKELEY_TXNS_MAX,
+     /* RFC 2086 right which allows DELETE ("c") */
+     CYRUSOPT_DELETERIGHT,
++    /* Lowercase uid and strip leading and trailing blanks (OFF) */
++    CYRUSOPT_NORMALIZEUID,
+     /* SQL database */
+     CYRUSOPT_SQL_DATABASE,
+     /* SQL engine ("mysql") */
+--- cyrus-imapd-2.3.13/lib/auth_unix.c.authid_normalize	2009-01-13 11:38:08.000000000 +0100
++++ cyrus-imapd-2.3.13/lib/auth_unix.c	2009-01-13 11:38:08.000000000 +0100
+@@ -155,10 +155,12 @@
  size_t len;
  {
      static char retbuf[81];
@@ -37,10 +47,9 @@
      return retbuf;
  }
  
-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	Tue Dec 13 20:36:11 2005
-+++ cyrus-imapd-2.3.1/lib/imapoptions	Wed Dec 21 13:50:05 2005
-@@ -990,6 +990,11 @@
+--- cyrus-imapd-2.3.13/lib/imapoptions.authid_normalize	2009-01-13 11:38:08.000000000 +0100
++++ cyrus-imapd-2.3.13/lib/imapoptions	2009-01-13 11:38:08.000000000 +0100
+@@ -1182,6 +1182,11 @@
     interface, otherwise the user is assumed to be in the default
     domain (if set). */
  
@@ -52,12 +61,11 @@
  /*
  .SH SEE ALSO
  .PP
-diff -Naur cyrus-imapd-2.3.1.orig/lib/libcyr_cfg.c cyrus-imapd-2.3.1/lib/libcyr_cfg.c
---- cyrus-imapd-2.3.1.orig/lib/libcyr_cfg.c	Tue Dec 13 20:36:12 2005
-+++ cyrus-imapd-2.3.1/lib/libcyr_cfg.c	Wed Dec 21 13:50:05 2005
-@@ -127,6 +127,11 @@
-       CFGVAL(const char *, "c"),
-       CYRUS_OPT_STRING },
+--- cyrus-imapd-2.3.13/lib/libcyr_cfg.c.authid_normalize	2008-07-30 18:03:38.000000000 +0200
++++ cyrus-imapd-2.3.13/lib/libcyr_cfg.c	2009-01-13 11:38:08.000000000 +0100
+@@ -150,6 +150,11 @@
+       CFGVAL(long, 0),
+       CYRUS_OPT_SWITCH },
  
 +    { CYRUSOPT_NORMALIZEUID,
 +      CFGVAL(long, 1),
@@ -67,15 +75,3 @@
      { CYRUSOPT_LAST, { NULL }, CYRUS_OPT_NOTOPT }
  };
  
-diff -Naur cyrus-imapd-2.3.1.orig/lib/libcyr_cfg.h cyrus-imapd-2.3.1/lib/libcyr_cfg.h
---- cyrus-imapd-2.3.1.orig/lib/libcyr_cfg.h	Tue Dec 13 20:36:12 2005
-+++ cyrus-imapd-2.3.1/lib/libcyr_cfg.h	Wed Dec 21 13:51:37 2005
-@@ -101,6 +101,8 @@
-     CYRUSOPT_BERKELEY_TXNS_MAX,
-     /* RFC 2086 right which allows DELETE ("c") */
-     CYRUSOPT_DELETERIGHT,
-+    /* Lowercase uid and strip leading and trailing blanks (OFF) */
-+    CYRUSOPT_NORMALIZEUID,
- 
-     CYRUSOPT_LAST
-     

cyrus-imapd-2.3.1-make_md5_defaults.patch:

Index: cyrus-imapd-2.3.1-make_md5_defaults.patch
===================================================================
RCS file: /cvs/extras/rpms/cyrus-imapd/F-10/cyrus-imapd-2.3.1-make_md5_defaults.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- cyrus-imapd-2.3.1-make_md5_defaults.patch	1 Sep 2008 09:41:02 -0000	1.2
+++ cyrus-imapd-2.3.1-make_md5_defaults.patch	13 Jan 2009 19:32:30 -0000	1.3
@@ -1,7 +1,6 @@
-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 @@
+--- cyrus-imapd-2.3.13/imap/make_md5.c.make_md5_defaults	2008-10-02 16:05:44.000000000 +0200
++++ cyrus-imapd-2.3.13/imap/make_md5.c	2009-01-13 11:44:24.000000000 +0100
+@@ -857,7 +857,7 @@
      if (!md5_dir) md5_dir = config_getstring(IMAPOPT_MD5_DIR);
  
      if (!md5_dir)
@@ -10,10 +9,9 @@
  
      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 @@
+--- cyrus-imapd-2.3.13/lib/imapoptions.make_md5_defaults	2009-01-13 11:44:24.000000000 +0100
++++ cyrus-imapd-2.3.13/lib/imapoptions	2009-01-13 14:17:35.000000000 +0100
+@@ -634,10 +634,14 @@
     mailspool, but each have their own "replicated" copy of
     mailboxes.db. */
  
@@ -21,11 +19,11 @@
 +{ "md5_dir", "/var/lib/imap/md5", STRING }
  /* Top level directory for MD5 store manipulated by make_md5. File
     structure within this directory is one file for each user on the system,
--   hashed on the first letter of the userid (e.g: /var/imap/md5/d/dpc22). */
+-   hashed on the first letter of the userid (e.g., /var/imap/md5/d/dpc22). */
 +   hashed on the first letter of the
-+   userid (e.g: /var/lib/imap/md5/d/dpc22).
-+.PP
-+   Note: This Invoca RPM build uses \fI/var/lib/imap/md5\fR by default
++   userid (e.g., /var/imap/md5/d/dpc22).
++.PP   
++   Note: This Invoca RPM build uses \fI/var/lib/imap/md5\fR by default 
 +   instead of \fI/var/imap/md5\fR for \fBmd5_dir\fR. */
  
  { "md5_user_map", NULL, STRING }

cyrus-imapd-2.3.12p2-autocreate-0.10-0.diff:

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.1 -r 1.2 cyrus-imapd-2.3.12p2-autocreate-0.10-0.diff
Index: cyrus-imapd-2.3.12p2-autocreate-0.10-0.diff
===================================================================
RCS file: /cvs/extras/rpms/cyrus-imapd/F-10/cyrus-imapd-2.3.12p2-autocreate-0.10-0.diff,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cyrus-imapd-2.3.12p2-autocreate-0.10-0.diff	1 Sep 2008 11:50:44 -0000	1.1
+++ cyrus-imapd-2.3.12p2-autocreate-0.10-0.diff	13 Jan 2009 19:32:30 -0000	1.2
@@ -1,485 +1,426 @@
-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
-+----------------------------------
+--- cyrus-imapd-2.3.13/notifyd/notifyd.c.autocreate	2008-03-24 20:59:32.000000000 +0100
++++ cyrus-imapd-2.3.13/notifyd/notifyd.c	2009-01-13 11:14:09.000000000 +0100
+@@ -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);
+--- cyrus-imapd-2.3.13/notifyd/Makefile.in.autocreate	2008-03-24 20:59:32.000000000 +0100
++++ cyrus-imapd-2.3.13/notifyd/Makefile.in	2009-01-13 11:14:09.000000000 +0100
+@@ -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
+--- cyrus-imapd-2.3.13/imap/mboxlist.c.autocreate	2008-10-08 17:47:08.000000000 +0200
++++ cyrus-imapd-2.3.13/imap/mboxlist.c	2009-01-13 11:14:09.000000000 +0100
+@@ -83,6 +83,12 @@
+ #include "quota.h"
+ #include "sync_log.h"
+ 
++#ifdef USE_SIEVE
++extern int autoadd_sieve(char *userid, 
++		const char *source_script);
++#endif
 +
-+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:
+ #define DB config_mboxlist_db
+ #define SUBDB config_subscription_db
+ 
+@@ -100,11 +106,29 @@
+ static int mboxlist_changequota(const char *name, int matchlen, int maycreate,
+ 				void *rock);
+ 
++static int mboxlist_autochangesub(char *name, int matchlen, int maycreate,
++			      void *rock);
 +
-+  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. 
++static int mboxlist_autosubscribe_sharedfolders(struct namespace *namespace,
++                        char *userid, char *auth_userid,
++                        struct auth_state *auth_state);
 +
-+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. 
+ struct change_rock {
+     struct quota *quota;
+     struct txn **tid;
+ };
+ 
++/*
++ * Struct needed to be passed as void *rock to
++ * mboxlist_autochangesub();
++ */
++struct changesub_rock_st {
++        char *userid;
++        char *auth_userid;
++        struct auth_state *auth_state;
++};
 +
-+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".
-+ 
 +
+ #define FNAME_SUBSSUFFIX ".sub"
+ 
+ /*
+@@ -3383,3 +3407,349 @@
+ 
+     return(config_delete_mode == IMAP_ENUM_DELETE_MODE_DELAYED);
+ }
 +
-+Create on login
-+===============
-+This feauture provides automatic creation of a user's INBOX folder when all of the 
-+following requirements are met:
++/*
++ * Automatically subscribe user to *ALL* shared folders,
++ * one has permissions to be subscribed to.
++ * INBOX subfolders are excluded.
++ */
++static int mboxlist_autochangesub(char *name, int matchlen, int maycreate,
++                        void *rock) {
 +
-+i)  The user has succesfully passed the authentication procedure.
++  struct changesub_rock_st *changesub_rock = (struct changesub_rock_st *) rock;
++  char *userid = changesub_rock->userid;
++  char *auth_userid = changesub_rock->auth_userid;
++  struct auth_state *auth_state = changesub_rock->auth_state;
++  int r;
 +
-+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. 
++  if((strlen(name) == 5 && !strncmp(name, "INBOX", 5)) || /* Exclude INBOX */
++     (strlen(name) > 5  && !strncmp(name, "INBOX.",6)) || /* Exclude INBOX subfolders */
++     (strlen(name) > 4  && !strncmp(name, "user.", 5)))   /* Exclude other users' folders */
++	  return 0;
 +
-+iv) The corresponding to the user's authorisation ID INBOX folder
-+does not exist.
++     
++  r = mboxlist_changesub(name, userid, auth_state, 1, 0);
 +
-+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.
++  if (r) {
++      syslog(LOG_WARNING,
++             "autosubscribe: User %s to folder %s, subscription failed: %s",
++             auth_userid, name, error_message(r));
++  } else {
++      syslog(LOG_NOTICE,
++             "autosubscribe: User %s to folder %s, subscription succeeded",
++             auth_userid, name);
++  }
 +
++  return 0;
++}
 +
++#define SEP '|'
 +
-+Create on post
-+==============
-+This feauture provides automatic creation of a user's INBOX folder when all of the 
-+following requirements are met. 
++/*
++ * Automatically subscribe user to a shared folder.
++ * Subscription is done successfully, if the shared
++ * folder exists and the user has the necessary 
++ * permissions.
++ */
++static int mboxlist_autosubscribe_sharedfolders(struct namespace *namespace,
++                        char *userid, char *auth_userid,
++                        struct auth_state *auth_state) {
++        
++    const char *sub ;
++    char *p, *q, *next_sub;
++    char folder[MAX_MAILBOX_NAME+1], name[MAX_MAILBOX_NAME+1], mailboxname[MAX_MAILBOX_NAME+1];
++    int len;
++    int r = 0;
++    int subscribe_all_sharedfolders = 0;
 +
-+i) An email message addressed to the user has been received.  
++    subscribe_all_sharedfolders = config_getswitch(IMAPOPT_AUTOSUBSCRIBE_ALL_SHAREDFOLDERS);
 +
-+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.
++    /*
++     * If subscribeallsharedfolders is set to yes in imapd.conf, then
++     * subscribe user to every shared folder one has the apropriate 
++     * permissions.
++     */
++    if(subscribe_all_sharedfolders) {
++       char pattern[MAX_MAILBOX_PATH+1];
++       struct changesub_rock_st changesub_rock;
 +
[...1873 lines suppressed...]
  }
@@ -2194,46 +2212,8 @@
      &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
+--- cyrus-imapd-2.3.13/lib/auth_pts.c.autocreate	2008-03-24 18:43:08.000000000 +0100
++++ cyrus-imapd-2.3.13/lib/auth_pts.c	2009-01-13 11:14:09.000000000 +0100
 @@ -512,6 +512,14 @@
      free(auth_state);
  }
@@ -2255,38 +2235,64 @@
      &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);
+--- cyrus-imapd-2.3.13/lib/auth.h.autocreate	2008-03-24 18:43:08.000000000 +0100
++++ cyrus-imapd-2.3.13/lib/auth.h	2009-01-13 11:14:09.000000000 +0100
+@@ -55,6 +55,7 @@
+              const char *identifier);
+     struct auth_state *(*newstate)(const char *identifier);
+     void (*freestate)(struct auth_state *auth_state);
++    char *(*auth_canonuser)(struct auth_state *auth_state);
+ };
+ 
+ extern struct auth_mech *auth_mechs[];
+@@ -77,5 +78,6 @@
+  	 const char *identifier);
+ struct auth_state *auth_newstate(const char *identifier);
+ void auth_freestate(struct auth_state *auth_state);
++char *auth_canonuser(struct auth_state *auth_state);
+ 
+ #endif /* INCLUDED_AUTH_H */
+--- cyrus-imapd-2.3.13/lib/auth_krb5.c.autocreate	2008-03-24 18:43:08.000000000 +0100
++++ cyrus-imapd-2.3.13/lib/auth_krb5.c	2009-01-13 11:14:09.000000000 +0100
+@@ -199,6 +199,14 @@
+     free(auth_state);
  }
  
-+static char *mycanonuser(auth_state)
-+    struct auth_state *auth_state;
++static char *mycanonuser(struct auth_state *auth_state)
 +{
 +    if (auth_state)
-+         return auth_state->userid;
++       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_unix = 
- {
-@@ -321,4 +331,5 @@
+ struct auth_mech auth_krb5 = 
+@@ -240,4 +254,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
+--- cyrus-imapd-2.3.13/lib/imapoptions.autocreate	2008-10-08 19:18:12.000000000 +0200
++++ cyrus-imapd-2.3.13/lib/imapoptions	2009-01-13 11:14:09.000000000 +0100
 @@ -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) */
+    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,
@@ -2340,47 +2346,28 @@
  { "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 @@
+--- cyrus-imapd-2.3.13/lib/auth_unix.c.autocreate	2008-08-26 21:20:39.000000000 +0200
++++ cyrus-imapd-2.3.13/lib/auth_unix.c	2009-01-13 11:14:09.000000000 +0100
+@@ -314,6 +314,16 @@
+     free((char *)auth_state);
+ }
  
- #define NOTIFY_MAXSIZE 8192
++static char *mycanonuser(auth_state)
++    struct auth_state *auth_state;
++{
++    if (auth_state)
++         return auth_state->userid;
++
++    return NULL;
++}
++
++
  
--int do_notify()
-+static int do_notify()
+ struct auth_mech auth_unix = 
  {
-     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@
+@@ -323,4 +333,5 @@
+     &mymemberof,
+     &mynewstate,
+     &myfreestate,
++    &mycanonuser,
+ };


Index: cyrus-imapd.spec
===================================================================
RCS file: /cvs/extras/rpms/cyrus-imapd/F-10/cyrus-imapd.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- cyrus-imapd.spec	26 Sep 2008 11:39:02 -0000	1.44
+++ cyrus-imapd.spec	13 Jan 2009 19:32:30 -0000	1.45
@@ -1,7 +1,7 @@
-%define upstream_ver 2.3.12p2
+%define upstream_ver 2.3.13
 Name: cyrus-imapd
-Version: 2.3.12p2
-Release: 3%{?dist}
+Version: 2.3.13
+Release: 1%{?dist}
 
 # ********************** BUILD TIME OPTIONS START **********************
 
@@ -704,6 +704,7 @@
 %attr(0755,root,root) %{_cyrexecdir}/reconstruct
 %attr(0755,root,root) %{_cyrexecdir}/rehash
 %attr(0755,root,root) %{_cyrexecdir}/sievec
+%attr(0755,root,root) %{_cyrexecdir}/sieved
 %attr(0755,root,root) %{_cyrexecdir}/smmapd
 %attr(0755,root,root) %{_cyrexecdir}/squatter
 %attr(0755,root,root) %{_cyrexecdir}/timsieved
@@ -785,6 +786,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Tue Jan 13 2009 Michal Hlavinka <mhlavink at redhat.com> - 2.3.13-1
+- updated to 2.3.13
+
 * Fri Sep 26 2008 Dan Hor??k <dan[at]danny.cz - 2.3.12p2-3
 - better fix for linking with recent db4.x
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cyrus-imapd/F-10/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	1 Sep 2008 11:50:44 -0000	1.14
+++ sources	13 Jan 2009 19:32:30 -0000	1.15
@@ -1,3 +1,3 @@
+7dc48324c3a99e210bf777ea74aae694  cyrus-imapd-2.3.13.tar.gz
+6b58bb8dd2c47af02b45c5a426b1335c  cyrus-imapd-2.3.13.tar.gz.sig
 8f7a26b0556369827bb5c8084a3e3ea1  cyrus_sharedbackup-0.1.tar.gz
-ee2c300687994e4982c6af6aa154c742  cyrus-imapd-2.3.12p2.tar.gz
-a04fd37f1e47cfbed3394758ac2e4981  cyrus-imapd-2.3.12p2.tar.gz.sig



From remi at fedoraproject.org  Tue Jan 13 19:56:35 2009
From: remi at fedoraproject.org (Remi Collet)
Date: Tue, 13 Jan 2009 19:56:35 +0000 (UTC)
Subject: rpms/php-pecl-memcache/devel .cvsignore, 1.7,
	1.8 php-pecl-memcache.spec, 1.7, 1.8 sources, 1.7, 1.8
Message-ID: <20090113195635.4EAD27013F@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-serv30568

Modified Files:
	.cvsignore php-pecl-memcache.spec sources 
Log Message:
update to 3.0.3


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php-pecl-memcache/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	13 Sep 2008 05:33:30 -0000	1.7
+++ .cvsignore	13 Jan 2009 19:56:04 -0000	1.8
@@ -1 +1 @@
-memcache-3.0.2.tgz
+memcache-3.0.3.tgz


Index: php-pecl-memcache.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pecl-memcache/devel/php-pecl-memcache.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- php-pecl-memcache.spec	13 Sep 2008 05:33:30 -0000	1.7
+++ php-pecl-memcache.spec	13 Jan 2009 19:56:04 -0000	1.8
@@ -6,7 +6,7 @@
 
 Summary:      Extension to work with the Memcached caching daemon
 Name:         php-pecl-memcache
-Version:      3.0.2
+Version:      3.0.3
 Release:      1%{?dist}
 License:      PHP
 Group:        Development/Languages
@@ -67,6 +67,8 @@
 ;memcache.allow_failover=1
 ;  Data will be transferred in chunks of this size
 ;memcache.chunk_size=32768
+;  Autocompress large data
+;memcache.compress_threshold=20000
 ;  The default TCP port number to use when connecting to the memcached server 
 ;memcache.default_port=11211
 ;  Hash function {crc32, fnv}
@@ -125,6 +127,9 @@
 
 
 %changelog
+* Tue Jan 13 2009 Remi Collet <Fedora at FamilleCollet.com> 3.0.3-1
+- new version 3.0.3
+
 * Fri Sep 11 2008 Remi Collet <Fedora at FamilleCollet.com> 3.0.2-1
 - new version 3.0.2
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pecl-memcache/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	13 Sep 2008 05:33:30 -0000	1.7
+++ sources	13 Jan 2009 19:56:04 -0000	1.8
@@ -1 +1 @@
-06079c86e13a970a2efe40018966acb4  memcache-3.0.2.tgz
+75472e0a12c1a7e3647bf490618a1e35  memcache-3.0.3.tgz



From remi at fedoraproject.org  Tue Jan 13 20:02:56 2009
From: remi at fedoraproject.org (Remi Collet)
Date: Tue, 13 Jan 2009 20:02:56 +0000 (UTC)
Subject: rpms/php-pecl-memcache/F-10 php-pecl-memcache.spec, 1.7, 1.8 sources,
	1.7, 1.8
Message-ID: <20090113200256.452267013F@cvs1.fedora.phx.redhat.com>

Author: remi

Update of /cvs/extras/rpms/php-pecl-memcache/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31240

Modified Files:
	php-pecl-memcache.spec sources 
Log Message:
update to 3.0.3


Index: php-pecl-memcache.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pecl-memcache/F-10/php-pecl-memcache.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- php-pecl-memcache.spec	13 Sep 2008 05:33:30 -0000	1.7
+++ php-pecl-memcache.spec	13 Jan 2009 20:02:25 -0000	1.8
@@ -6,7 +6,7 @@
 
 Summary:      Extension to work with the Memcached caching daemon
 Name:         php-pecl-memcache
-Version:      3.0.2
+Version:      3.0.3
 Release:      1%{?dist}
 License:      PHP
 Group:        Development/Languages
@@ -67,6 +67,8 @@
 ;memcache.allow_failover=1
 ;  Data will be transferred in chunks of this size
 ;memcache.chunk_size=32768
+;  Autocompress large data
+;memcache.compress_threshold=20000
 ;  The default TCP port number to use when connecting to the memcached server 
 ;memcache.default_port=11211
 ;  Hash function {crc32, fnv}
@@ -125,6 +127,9 @@
 
 
 %changelog
+* Tue Jan 13 2009 Remi Collet <Fedora at FamilleCollet.com> 3.0.3-1
+- new version 3.0.3
+
 * Fri Sep 11 2008 Remi Collet <Fedora at FamilleCollet.com> 3.0.2-1
 - new version 3.0.2
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pecl-memcache/F-10/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	13 Sep 2008 05:33:30 -0000	1.7
+++ sources	13 Jan 2009 20:02:25 -0000	1.8
@@ -1 +1 @@
-06079c86e13a970a2efe40018966acb4  memcache-3.0.2.tgz
+75472e0a12c1a7e3647bf490618a1e35  memcache-3.0.3.tgz



From rdieter at fedoraproject.org  Tue Jan 13 20:04:52 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Tue, 13 Jan 2009 20:04:52 +0000 (UTC)
Subject: rpms/qt/devel 0256-fix-recursive-backingstore-sync-crash.diff, 1.1, 
	NONE
Message-ID: <20090113200452.B29807013F@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/qt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31635

Removed Files:
	0256-fix-recursive-backingstore-sync-crash.diff 
Log Message:
drop old patch



--- 0256-fix-recursive-backingstore-sync-crash.diff DELETED ---



From rdieter at fedoraproject.org  Tue Jan 13 20:10:50 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Tue, 13 Jan 2009 20:10:50 +0000 (UTC)
Subject: rpms/qt/F-9 .cvsignore, 1.36, 1.37 qt.spec, 1.190, 1.191 sources,
	1.39, 
	1.40 qt-x11-opensource-src-4.3.4-no-hardcoded-font-aliases.patch,
	1.1, NONE
Message-ID: <20090113201050.B48957013F@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/qt/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32326/F-9

Modified Files:
	.cvsignore qt.spec sources 
Removed Files:
	qt-x11-opensource-src-4.3.4-no-hardcoded-font-aliases.patch 
Log Message:
* Mon Jan 12 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.4.3-10
- drop qt-x11-opensource-src-4.3.4-no-hardcoded-font-aliases.patch (#447298),
  in favor of qt-copy's 0263-fix-fontconfig-handling.diff

* Mon Jan 12 2009 Than Ngo <than at redhat.com> - 4.4.3-9
- qt-copy-patches-20090112



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qt/F-9/.cvsignore,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- .cvsignore	31 Dec 2008 19:16:54 -0000	1.36
+++ .cvsignore	13 Jan 2009 20:10:20 -0000	1.37
@@ -2,3 +2,4 @@
 hi48-app-qt4-logo.png
 qt-x11-opensource-src-4.4.3.tar.bz2
 qt-copy-patches-20081225svn.tar.bz2
+qt-copy-patches-20090112svn.tar.bz2


Index: qt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qt/F-9/qt.spec,v
retrieving revision 1.190
retrieving revision 1.191
diff -u -r1.190 -r1.191
--- qt.spec	31 Dec 2008 19:16:54 -0000	1.190
+++ qt.spec	13 Jan 2009 20:10:20 -0000	1.191
@@ -9,7 +9,7 @@
 Name:    qt4
 %endif
 Version: 4.4.3
-Release: 8%{?dist}
+Release: 10%{?dist}
 
 # GPLv2 exceptions(see GPL_EXCEPTIONS*.txt)
 License: GPLv3 with exceptions or GPLv2 with exceptions
@@ -33,15 +33,13 @@
 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.3-im.patch
 
 ## qt-copy patches
-%define qt_copy 20081225 
+%define qt_copy 20090112
 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}}
@@ -284,7 +282,6 @@
 %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 .im
 
@@ -734,6 +731,13 @@
 
 
 %changelog
+* Mon Jan 12 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.4.3-10
+- drop qt-x11-opensource-src-4.3.4-no-hardcoded-font-aliases.patch (#447298),
+  in favor of qt-copy's 0263-fix-fontconfig-handling.diff
+
+* Mon Jan 12 2009 Than Ngo <than at redhat.com> - 4.4.3-9
+- qt-copy-patches-20090112
+
 * Tue Dec 30 2008 Rex Dieter <rdieter at fedoraproject.org> 4.4.3-8
 - qt-copy-patches-20081225
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qt/F-9/sources,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- sources	31 Dec 2008 19:16:54 -0000	1.39
+++ sources	13 Jan 2009 20:10:20 -0000	1.40
@@ -1,4 +1,4 @@
 d9f511e4b51983b4e10eb58b320416d5  hi128-app-qt4-logo.png
 6dcc0672ff9e60a6b83f95c5f42bec5b  hi48-app-qt4-logo.png
 00e00c6324d342a7b0d8653112b4f08c  qt-x11-opensource-src-4.4.3.tar.bz2
-00cd44f34d1e4840805ae71a20b378a4  qt-copy-patches-20081225svn.tar.bz2
+9c51cc569de37085da1af39750a35ba7  qt-copy-patches-20090112svn.tar.bz2


--- qt-x11-opensource-src-4.3.4-no-hardcoded-font-aliases.patch DELETED ---



From rdieter at fedoraproject.org  Tue Jan 13 20:10:51 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Tue, 13 Jan 2009 20:10:51 +0000 (UTC)
Subject: rpms/qt/F-10 .cvsignore, 1.43, 1.44 qt.spec, 1.218, 1.219 sources, 
	1.44,
	1.45 qt-x11-opensource-src-4.3.4-no-hardcoded-font-aliases.patch,
	1.1, NONE
Message-ID: <20090113201051.023577013F@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/qt/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32326/F-10

Modified Files:
	.cvsignore qt.spec sources 
Removed Files:
	qt-x11-opensource-src-4.3.4-no-hardcoded-font-aliases.patch 
Log Message:
* Mon Jan 12 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.4.3-10
- drop qt-x11-opensource-src-4.3.4-no-hardcoded-font-aliases.patch (#447298),
  in favor of qt-copy's 0263-fix-fontconfig-handling.diff

* Mon Jan 12 2009 Than Ngo <than at redhat.com> - 4.4.3-9
- qt-copy-patches-20090112



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qt/F-10/.cvsignore,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- .cvsignore	30 Dec 2008 06:27:31 -0000	1.43
+++ .cvsignore	13 Jan 2009 20:10:20 -0000	1.44
@@ -2,3 +2,4 @@
 hi48-app-qt4-logo.png
 qt-x11-opensource-src-4.4.3.tar.bz2
 qt-copy-patches-20081225svn.tar.bz2
+qt-copy-patches-20090112svn.tar.bz2


Index: qt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qt/F-10/qt.spec,v
retrieving revision 1.218
retrieving revision 1.219
diff -u -r1.218 -r1.219
--- qt.spec	30 Dec 2008 06:27:31 -0000	1.218
+++ qt.spec	13 Jan 2009 20:10:20 -0000	1.219
@@ -9,7 +9,7 @@
 Name:    qt4
 %endif
 Version: 4.4.3
-Release: 8%{?dist}
+Release: 10%{?dist}
 
 # GPLv2 exceptions(see GPL_EXCEPTIONS*.txt)
 License: GPLv3 with exceptions or GPLv2 with exceptions
@@ -33,15 +33,13 @@
 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.3-im.patch
 
 ## qt-copy patches
-%define qt_copy 20081225 
+%define qt_copy 20090112
 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}}
@@ -284,7 +282,6 @@
 %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 .im
 
@@ -734,6 +731,13 @@
 
 
 %changelog
+* Mon Jan 12 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.4.3-10
+- drop qt-x11-opensource-src-4.3.4-no-hardcoded-font-aliases.patch (#447298),
+  in favor of qt-copy's 0263-fix-fontconfig-handling.diff
+
+* Mon Jan 12 2009 Than Ngo <than at redhat.com> - 4.4.3-9
+- qt-copy-patches-20090112
+
 * Tue Dec 30 2008 Rex Dieter <rdieter at fedoraproject.org> 4.4.3-8
 - qt-copy-patches-20081225
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qt/F-10/sources,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- sources	30 Dec 2008 06:27:31 -0000	1.44
+++ sources	13 Jan 2009 20:10:20 -0000	1.45
@@ -1,4 +1,4 @@
 d9f511e4b51983b4e10eb58b320416d5  hi128-app-qt4-logo.png
 6dcc0672ff9e60a6b83f95c5f42bec5b  hi48-app-qt4-logo.png
 00e00c6324d342a7b0d8653112b4f08c  qt-x11-opensource-src-4.4.3.tar.bz2
-00cd44f34d1e4840805ae71a20b378a4  qt-copy-patches-20081225svn.tar.bz2
+9c51cc569de37085da1af39750a35ba7  qt-copy-patches-20090112svn.tar.bz2


--- qt-x11-opensource-src-4.3.4-no-hardcoded-font-aliases.patch DELETED ---



From pkgdb at fedoraproject.org  Tue Jan 13 20:24:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 20:24:47 +0000
Subject: [pkgdb] docbook5-style-xsl was added for ovasik
Message-ID: <20090113202447.304FB2081FC@bastion.fedora.phx.redhat.com>

kevin has added Package docbook5-style-xsl with summary Norman Walsh's XSL stylesheets for DocBook 5.X
kevin has approved Package docbook5-style-xsl
kevin has added a Fedora devel branch for docbook5-style-xsl with an owner of ovasik
kevin has approved docbook5-style-xsl in Fedora devel
kevin has approved Package docbook5-style-xsl
kevin has set commit to Approved for provenpackager on docbook5-style-xsl (Fedora devel)
kevin has set build to Approved for provenpackager on docbook5-style-xsl (Fedora devel)
kevin has set checkout to Approved for provenpackager on docbook5-style-xsl (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/docbook5-style-xsl



From pkgdb at fedoraproject.org  Tue Jan 13 20:24:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 20:24:51 +0000
Subject: [pkgdb] docbook5-style-xsl (Fedora, 10) updated by kevin
Message-ID: <20090113202451.39E6D208457@bastion.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for docbook5-style-xsl
kevin has set commit to Approved for provenpackager on docbook5-style-xsl (Fedora 10)
kevin has set build to Approved for provenpackager on docbook5-style-xsl (Fedora 10)
kevin has set checkout to Approved for provenpackager on docbook5-style-xsl (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/docbook5-style-xsl



From kevin at fedoraproject.org  Tue Jan 13 20:25:30 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 13 Jan 2009 20:25:30 +0000 (UTC)
Subject: rpms/docbook5-style-xsl - New directory
Message-ID: <20090113202530.24F077013F@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/docbook5-style-xsl
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvscZ2257/rpms/docbook5-style-xsl

Log Message:
Directory /cvs/pkgs/rpms/docbook5-style-xsl added to the repository




From kevin at fedoraproject.org  Tue Jan 13 20:25:30 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 13 Jan 2009 20:25:30 +0000 (UTC)
Subject: rpms/docbook5-style-xsl/devel - New directory
Message-ID: <20090113202530.54AF37013F@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/docbook5-style-xsl/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvscZ2257/rpms/docbook5-style-xsl/devel

Log Message:
Directory /cvs/pkgs/rpms/docbook5-style-xsl/devel added to the repository




From kevin at fedoraproject.org  Tue Jan 13 20:25:44 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 13 Jan 2009 20:25:44 +0000 (UTC)
Subject: rpms/docbook5-style-xsl Makefile,NONE,1.1
Message-ID: <20090113202544.C48767013F@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/docbook5-style-xsl
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvscZ2257/rpms/docbook5-style-xsl

Added Files:
	Makefile 
Log Message:
Setup of module docbook5-style-xsl


--- NEW FILE Makefile ---
# Top level Makefile for module docbook5-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 kevin at fedoraproject.org  Tue Jan 13 20:25:45 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 13 Jan 2009 20:25:45 +0000 (UTC)
Subject: rpms/docbook5-style-xsl/devel .cvsignore, NONE, 1.1 Makefile, NONE, 
	1.1 sources, NONE, 1.1
Message-ID: <20090113202545.1520E7013F@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/docbook5-style-xsl/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvscZ2257/rpms/docbook5-style-xsl/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module docbook5-style-xsl


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: docbook5-style-xsl
# $Id: Makefile,v 1.1 2009/01/13 20:25:44 kevin Exp $
NAME := docbook5-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  Tue Jan 13 20:26:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 20:26:50 +0000
Subject: [pkgdb] docbook5-schemas was added for ovasik
Message-ID: <20090113202650.416772081FC@bastion.fedora.phx.redhat.com>

kevin has added Package docbook5-schemas with summary Norman Walsh's schemas (DTD, Relax NG, W3C schema) for Docbook 5.X
kevin has approved Package docbook5-schemas
kevin has added a Fedora devel branch for docbook5-schemas with an owner of ovasik
kevin has approved docbook5-schemas in Fedora devel
kevin has approved Package docbook5-schemas
kevin has set commit to Approved for provenpackager on docbook5-schemas (Fedora devel)
kevin has set build to Approved for provenpackager on docbook5-schemas (Fedora devel)
kevin has set checkout to Approved for provenpackager on docbook5-schemas (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/docbook5-schemas



From pkgdb at fedoraproject.org  Tue Jan 13 20:26:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 20:26:52 +0000
Subject: [pkgdb] docbook5-schemas (Fedora, 10) updated by kevin
Message-ID: <20090113202652.1157D208457@bastion.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for docbook5-schemas
kevin has set commit to Approved for provenpackager on docbook5-schemas (Fedora 10)
kevin has set build to Approved for provenpackager on docbook5-schemas (Fedora 10)
kevin has set checkout to Approved for provenpackager on docbook5-schemas (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/docbook5-schemas



From kevin at fedoraproject.org  Tue Jan 13 20:27:06 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 13 Jan 2009 20:27:06 +0000 (UTC)
Subject: rpms/docbook5-schemas - New directory
Message-ID: <20090113202706.218817013F@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/docbook5-schemas
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsgJ2525/rpms/docbook5-schemas

Log Message:
Directory /cvs/pkgs/rpms/docbook5-schemas added to the repository




From kevin at fedoraproject.org  Tue Jan 13 20:27:06 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 13 Jan 2009 20:27:06 +0000 (UTC)
Subject: rpms/docbook5-schemas/devel - New directory
Message-ID: <20090113202706.578E070143@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/docbook5-schemas/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsgJ2525/rpms/docbook5-schemas/devel

Log Message:
Directory /cvs/pkgs/rpms/docbook5-schemas/devel added to the repository




From kevin at fedoraproject.org  Tue Jan 13 20:27:20 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 13 Jan 2009 20:27:20 +0000 (UTC)
Subject: rpms/docbook5-schemas Makefile,NONE,1.1
Message-ID: <20090113202720.DBDBB7013F@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/docbook5-schemas
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsgJ2525/rpms/docbook5-schemas

Added Files:
	Makefile 
Log Message:
Setup of module docbook5-schemas


--- NEW FILE Makefile ---
# Top level Makefile for module docbook5-schemas
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Jan 13 20:27:21 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 13 Jan 2009 20:27:21 +0000 (UTC)
Subject: rpms/docbook5-schemas/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090113202721.30A9D70142@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/docbook5-schemas/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsgJ2525/rpms/docbook5-schemas/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module docbook5-schemas


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: docbook5-schemas
# $Id: Makefile,v 1.1 2009/01/13 20:27:21 kevin Exp $
NAME := docbook5-schemas
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Jan 13 20:29:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 20:29:16 +0000
Subject: [pkgdb] perl-Parse-ErrorString-Perl was added for mmaslano
Message-ID: <20090113202916.65F1B2081FC@bastion.fedora.phx.redhat.com>

kevin has added Package perl-Parse-ErrorString-Perl with summary Parse error messages from the perl interpreter
kevin has approved Package perl-Parse-ErrorString-Perl
kevin has added a Fedora devel branch for perl-Parse-ErrorString-Perl with an owner of mmaslano
kevin has approved perl-Parse-ErrorString-Perl in Fedora devel
kevin has approved Package perl-Parse-ErrorString-Perl
kevin has set commit to Approved for provenpackager on perl-Parse-ErrorString-Perl (Fedora devel)
kevin has set build to Approved for provenpackager on perl-Parse-ErrorString-Perl (Fedora devel)
kevin has set checkout to Approved for provenpackager on perl-Parse-ErrorString-Perl (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Parse-ErrorString-Perl



From pkgdb at fedoraproject.org  Tue Jan 13 20:29:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 20:29:18 +0000
Subject: [pkgdb] perl-Parse-ErrorString-Perl (Fedora, 10) updated by kevin
Message-ID: <20090113202918.B50C7208469@bastion.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for perl-Parse-ErrorString-Perl
kevin has set commit to Approved for provenpackager on perl-Parse-ErrorString-Perl (Fedora 10)
kevin has set build to Approved for provenpackager on perl-Parse-ErrorString-Perl (Fedora 10)
kevin has set checkout to Approved for provenpackager on perl-Parse-ErrorString-Perl (Fedora 10)
kevin approved watchbugzilla on perl-Parse-ErrorString-Perl (Fedora 10) for perl-sig
kevin approved watchcommits on perl-Parse-ErrorString-Perl (Fedora 10) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Parse-ErrorString-Perl



From pkgdb at fedoraproject.org  Tue Jan 13 20:29:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 20:29:18 +0000
Subject: [pkgdb] perl-Parse-ErrorString-Perl (Fedora, devel) updated by kevin
Message-ID: <20090113202918.AB8D4208458@bastion.fedora.phx.redhat.com>

kevin approved watchbugzilla on perl-Parse-ErrorString-Perl (Fedora devel) for perl-sig
kevin approved watchcommits on perl-Parse-ErrorString-Perl (Fedora devel) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Parse-ErrorString-Perl



From kevin at fedoraproject.org  Tue Jan 13 20:29:33 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 13 Jan 2009 20:29:33 +0000 (UTC)
Subject: rpms/perl-Parse-ErrorString-Perl/devel - New directory
Message-ID: <20090113202933.6CAA57013F@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Parse-ErrorString-Perl/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsSJ2898/rpms/perl-Parse-ErrorString-Perl/devel

Log Message:
Directory /cvs/pkgs/rpms/perl-Parse-ErrorString-Perl/devel added to the repository




From kevin at fedoraproject.org  Tue Jan 13 20:29:33 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 13 Jan 2009 20:29:33 +0000 (UTC)
Subject: rpms/perl-Parse-ErrorString-Perl - New directory
Message-ID: <20090113202933.31BAD7013F@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Parse-ErrorString-Perl
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsSJ2898/rpms/perl-Parse-ErrorString-Perl

Log Message:
Directory /cvs/pkgs/rpms/perl-Parse-ErrorString-Perl added to the repository




From kevin at fedoraproject.org  Tue Jan 13 20:29:48 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 13 Jan 2009 20:29:48 +0000 (UTC)
Subject: rpms/perl-Parse-ErrorString-Perl Makefile,NONE,1.1
Message-ID: <20090113202948.184627013F@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Parse-ErrorString-Perl
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsSJ2898/rpms/perl-Parse-ErrorString-Perl

Added Files:
	Makefile 
Log Message:
Setup of module perl-Parse-ErrorString-Perl


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Parse-ErrorString-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  Tue Jan 13 20:29:48 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 13 Jan 2009 20:29:48 +0000 (UTC)
Subject: rpms/perl-Parse-ErrorString-Perl/devel .cvsignore, NONE,
	1.1 Makefile, NONE, 1.1 sources, NONE, 1.1
Message-ID: <20090113202948.632957013F@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Parse-ErrorString-Perl/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsSJ2898/rpms/perl-Parse-ErrorString-Perl/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Parse-ErrorString-Perl


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: perl-Parse-ErrorString-Perl
# $Id: Makefile,v 1.1 2009/01/13 20:29:48 kevin Exp $
NAME := perl-Parse-ErrorString-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  Tue Jan 13 20:30:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 20:30:28 +0000
Subject: [pkgdb] cgit was added for tmz
Message-ID: <20090113203028.8D4C2208203@bastion.fedora.phx.redhat.com>

kevin has added Package cgit with summary A fast webinterface for git
kevin has approved Package cgit
kevin has added a Fedora devel branch for cgit with an owner of tmz
kevin has approved cgit in Fedora devel
kevin has approved Package cgit
kevin has set commit to Approved for provenpackager on cgit (Fedora devel)
kevin has set build to Approved for provenpackager on cgit (Fedora devel)
kevin has set checkout to Approved for provenpackager on cgit (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cgit



From pkgdb at fedoraproject.org  Tue Jan 13 20:30:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 20:30:30 +0000
Subject: [pkgdb] cgit (Fedora, 9) updated by kevin
Message-ID: <20090113203030.5E7F9208457@bastion.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for cgit
kevin has set commit to Approved for provenpackager on cgit (Fedora 9)
kevin has set build to Approved for provenpackager on cgit (Fedora 9)
kevin has set checkout to Approved for provenpackager on cgit (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cgit



From pkgdb at fedoraproject.org  Tue Jan 13 20:30:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 20:30:30 +0000
Subject: [pkgdb] cgit (Fedora, 10) updated by kevin
Message-ID: <20090113203030.68A30208468@bastion.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for cgit
kevin has set commit to Approved for provenpackager on cgit (Fedora 10)
kevin has set build to Approved for provenpackager on cgit (Fedora 10)
kevin has set checkout to Approved for provenpackager on cgit (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cgit



From kevin at fedoraproject.org  Tue Jan 13 20:30:49 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 13 Jan 2009 20:30:49 +0000 (UTC)
Subject: rpms/cgit - New directory
Message-ID: <20090113203049.2415B7013F@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/cgit
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsCz3103/rpms/cgit

Log Message:
Directory /cvs/pkgs/rpms/cgit added to the repository




From pkgdb at fedoraproject.org  Tue Jan 13 20:30:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 20:30:30 +0000
Subject: [pkgdb] cgit (Fedora EPEL, 5) updated by kevin
Message-ID: <20090113203030.71E088801D@bastion.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for cgit
kevin has set commit to Approved for provenpackager on cgit (Fedora EPEL 5)
kevin has set build to Approved for provenpackager on cgit (Fedora EPEL 5)
kevin has set checkout to Approved for provenpackager on cgit (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cgit



From kevin at fedoraproject.org  Tue Jan 13 20:31:07 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 13 Jan 2009 20:31:07 +0000 (UTC)
Subject: rpms/cgit/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <20090113203107.6D66970142@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/cgit/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsCz3103/rpms/cgit/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module cgit


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: cgit
# $Id: Makefile,v 1.1 2009/01/13 20:31:07 kevin Exp $
NAME := cgit
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out 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 Jan 13 20:30:49 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 13 Jan 2009 20:30:49 +0000 (UTC)
Subject: rpms/cgit/devel - New directory
Message-ID: <20090113203049.7044A7013F@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/cgit/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsCz3103/rpms/cgit/devel

Log Message:
Directory /cvs/pkgs/rpms/cgit/devel added to the repository




From kevin at fedoraproject.org  Tue Jan 13 20:31:07 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 13 Jan 2009 20:31:07 +0000 (UTC)
Subject: rpms/cgit Makefile,NONE,1.1
Message-ID: <20090113203107.22EBD7013F@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/cgit
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsCz3103/rpms/cgit

Added Files:
	Makefile 
Log Message:
Setup of module cgit


--- NEW FILE Makefile ---
# Top level Makefile for module cgit
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout 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 Jan 13 20:32:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 20:32:09 +0000
Subject: [pkgdb] mingw32-libpng was added for rjones
Message-ID: <20090113203209.19DE7208467@bastion.fedora.phx.redhat.com>

kevin has added Package mingw32-libpng with summary MinGW Windows Libpng library
kevin has approved Package mingw32-libpng
kevin has added a Fedora devel branch for mingw32-libpng with an owner of rjones
kevin has approved mingw32-libpng in Fedora devel
kevin has approved Package mingw32-libpng
kevin has set commit to Approved for provenpackager on mingw32-libpng (Fedora devel)
kevin has set build to Approved for provenpackager on mingw32-libpng (Fedora devel)
kevin has set checkout to Approved for provenpackager on mingw32-libpng (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-libpng



From pkgdb at fedoraproject.org  Tue Jan 13 20:32:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 20:32:12 +0000
Subject: [pkgdb] mingw32-libpng (Fedora EPEL, 5) updated by kevin
Message-ID: <20090113203212.23E0B208469@bastion.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for mingw32-libpng
kevin has set commit to Approved for provenpackager on mingw32-libpng (Fedora EPEL 5)
kevin has set build to Approved for provenpackager on mingw32-libpng (Fedora EPEL 5)
kevin has set checkout to Approved for provenpackager on mingw32-libpng (Fedora EPEL 5)
kevin approved watchbugzilla on mingw32-libpng (Fedora EPEL 5) for berrange
kevin approved watchcommits on mingw32-libpng (Fedora EPEL 5) for berrange
kevin approved commit on mingw32-libpng (Fedora EPEL 5) for berrange
kevin approved build on mingw32-libpng (Fedora EPEL 5) for berrange
kevin approved approveacls on mingw32-libpng (Fedora EPEL 5) for berrange
kevin approved watchbugzilla on mingw32-libpng (Fedora EPEL 5) for lfarkas
kevin approved watchcommits on mingw32-libpng (Fedora EPEL 5) for lfarkas
kevin approved commit on mingw32-libpng (Fedora EPEL 5) for lfarkas
kevin approved build on mingw32-libpng (Fedora EPEL 5) for lfarkas
kevin approved approveacls on mingw32-libpng (Fedora EPEL 5) for lfarkas

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-libpng



From pkgdb at fedoraproject.org  Tue Jan 13 20:32:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 20:32:12 +0000
Subject: [pkgdb] mingw32-libpng (Fedora, devel) updated by kevin
Message-ID: <20090113203212.5BD3C208472@bastion.fedora.phx.redhat.com>

kevin approved watchbugzilla on mingw32-libpng (Fedora devel) for berrange
kevin approved watchcommits on mingw32-libpng (Fedora devel) for berrange
kevin approved commit on mingw32-libpng (Fedora devel) for berrange
kevin approved build on mingw32-libpng (Fedora devel) for berrange
kevin approved approveacls on mingw32-libpng (Fedora devel) for berrange
kevin approved watchbugzilla on mingw32-libpng (Fedora devel) for lfarkas
kevin approved watchcommits on mingw32-libpng (Fedora devel) for lfarkas
kevin approved commit on mingw32-libpng (Fedora devel) for lfarkas
kevin approved build on mingw32-libpng (Fedora devel) for lfarkas
kevin approved approveacls on mingw32-libpng (Fedora devel) for lfarkas

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-libpng



From pkgdb at fedoraproject.org  Tue Jan 13 20:32:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 20:32:12 +0000
Subject: [pkgdb] mingw32-libpng (Fedora, 10) updated by kevin
Message-ID: <20090113203212.79562208476@bastion.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for mingw32-libpng
kevin has set commit to Approved for provenpackager on mingw32-libpng (Fedora 10)
kevin has set build to Approved for provenpackager on mingw32-libpng (Fedora 10)
kevin has set checkout to Approved for provenpackager on mingw32-libpng (Fedora 10)
kevin approved watchbugzilla on mingw32-libpng (Fedora 10) for berrange
kevin approved watchcommits on mingw32-libpng (Fedora 10) for berrange
kevin approved commit on mingw32-libpng (Fedora 10) for berrange
kevin approved build on mingw32-libpng (Fedora 10) for berrange
kevin approved approveacls on mingw32-libpng (Fedora 10) for berrange
kevin approved watchbugzilla on mingw32-libpng (Fedora 10) for lfarkas
kevin approved watchcommits on mingw32-libpng (Fedora 10) for lfarkas
kevin approved commit on mingw32-libpng (Fedora 10) for lfarkas
kevin approved build on mingw32-libpng (Fedora 10) for lfarkas
kevin approved approveacls on mingw32-libpng (Fedora 10) for lfarkas

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-libpng



From kevin at fedoraproject.org  Tue Jan 13 20:32:25 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 13 Jan 2009 20:32:25 +0000 (UTC)
Subject: rpms/mingw32-libpng - New directory
Message-ID: <20090113203225.21ACC7013F@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/mingw32-libpng
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsTH3462/rpms/mingw32-libpng

Log Message:
Directory /cvs/pkgs/rpms/mingw32-libpng added to the repository




From kevin at fedoraproject.org  Tue Jan 13 20:32:25 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 13 Jan 2009 20:32:25 +0000 (UTC)
Subject: rpms/mingw32-libpng/devel - New directory
Message-ID: <20090113203225.6204A70143@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/mingw32-libpng/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsTH3462/rpms/mingw32-libpng/devel

Log Message:
Directory /cvs/pkgs/rpms/mingw32-libpng/devel added to the repository




From kevin at fedoraproject.org  Tue Jan 13 20:32:41 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 13 Jan 2009 20:32:41 +0000 (UTC)
Subject: rpms/mingw32-libpng Makefile,NONE,1.1
Message-ID: <20090113203241.34AF67013F@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/mingw32-libpng
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsTH3462/rpms/mingw32-libpng

Added Files:
	Makefile 
Log Message:
Setup of module mingw32-libpng


--- NEW FILE Makefile ---
# Top level Makefile for module mingw32-libpng
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Jan 13 20:32:41 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 13 Jan 2009 20:32:41 +0000 (UTC)
Subject: rpms/mingw32-libpng/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090113203241.7DA307013F@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/mingw32-libpng/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsTH3462/rpms/mingw32-libpng/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module mingw32-libpng


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: mingw32-libpng
# $Id: Makefile,v 1.1 2009/01/13 20:32:41 kevin Exp $
NAME := mingw32-libpng
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Jan 13 20:34:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 20:34:10 +0000
Subject: [pkgdb] nopaste was added for cassmodiah
Message-ID: <20090113203410.C08CA2081FC@bastion.fedora.phx.redhat.com>

kevin has added Package nopaste with summary Command-line interface to rafb.net/paste
kevin has approved Package nopaste
kevin has added a Fedora devel branch for nopaste with an owner of cassmodiah
kevin has approved nopaste in Fedora devel
kevin has approved Package nopaste
kevin has set commit to Approved for provenpackager on nopaste (Fedora devel)
kevin has set build to Approved for provenpackager on nopaste (Fedora devel)
kevin has set checkout to Approved for provenpackager on nopaste (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/nopaste



From pkgdb at fedoraproject.org  Tue Jan 13 20:34:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 20:34:14 +0000
Subject: [pkgdb] nopaste (Fedora, 9) updated by kevin
Message-ID: <20090113203415.29986208458@bastion.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for nopaste
kevin has set commit to Approved for provenpackager on nopaste (Fedora 9)
kevin has set build to Approved for provenpackager on nopaste (Fedora 9)
kevin has set checkout to Approved for provenpackager on nopaste (Fedora 9)
kevin approved watchbugzilla on nopaste (Fedora 9) for fab
kevin approved watchcommits on nopaste (Fedora 9) for fab
kevin approved commit on nopaste (Fedora 9) for fab
kevin approved build on nopaste (Fedora 9) for fab
kevin approved approveacls on nopaste (Fedora 9) for fab

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/nopaste



From pkgdb at fedoraproject.org  Tue Jan 13 20:34:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 20:34:14 +0000
Subject: [pkgdb] nopaste (Fedora EPEL, 4) updated by kevin
Message-ID: <20090113203415.49679208469@bastion.fedora.phx.redhat.com>

kevin added a Fedora EPEL 4 branch for nopaste
kevin has set commit to Approved for provenpackager on nopaste (Fedora EPEL 4)
kevin has set build to Approved for provenpackager on nopaste (Fedora EPEL 4)
kevin has set checkout to Approved for provenpackager on nopaste (Fedora EPEL 4)
kevin approved watchbugzilla on nopaste (Fedora EPEL 4) for fab
kevin approved watchcommits on nopaste (Fedora EPEL 4) for fab
kevin approved commit on nopaste (Fedora EPEL 4) for fab
kevin approved build on nopaste (Fedora EPEL 4) for fab
kevin approved approveacls on nopaste (Fedora EPEL 4) for fab

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/nopaste



From pkgdb at fedoraproject.org  Tue Jan 13 20:34:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 20:34:14 +0000
Subject: [pkgdb] nopaste (Fedora EPEL, 5) updated by kevin
Message-ID: <20090113203415.62F28208470@bastion.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for nopaste
kevin has set commit to Approved for provenpackager on nopaste (Fedora EPEL 5)
kevin has set build to Approved for provenpackager on nopaste (Fedora EPEL 5)
kevin has set checkout to Approved for provenpackager on nopaste (Fedora EPEL 5)
kevin approved watchbugzilla on nopaste (Fedora EPEL 5) for fab
kevin approved watchcommits on nopaste (Fedora EPEL 5) for fab
kevin approved commit on nopaste (Fedora EPEL 5) for fab
kevin approved build on nopaste (Fedora EPEL 5) for fab
kevin approved approveacls on nopaste (Fedora EPEL 5) for fab

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/nopaste



From pkgdb at fedoraproject.org  Tue Jan 13 20:34:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 20:34:14 +0000
Subject: [pkgdb] nopaste (Fedora, devel) updated by kevin
Message-ID: <20090113203415.846EB2D002A@bastion.fedora.phx.redhat.com>

kevin approved watchbugzilla on nopaste (Fedora devel) for fab
kevin approved watchcommits on nopaste (Fedora devel) for fab
kevin approved commit on nopaste (Fedora devel) for fab
kevin approved build on nopaste (Fedora devel) for fab
kevin approved approveacls on nopaste (Fedora devel) for fab

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/nopaste



From pkgdb at fedoraproject.org  Tue Jan 13 20:34:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 20:34:14 +0000
Subject: [pkgdb] nopaste (Fedora, 10) updated by kevin
Message-ID: <20090113203415.71B782D0023@bastion.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for nopaste
kevin has set commit to Approved for provenpackager on nopaste (Fedora 10)
kevin has set build to Approved for provenpackager on nopaste (Fedora 10)
kevin has set checkout to Approved for provenpackager on nopaste (Fedora 10)
kevin approved watchbugzilla on nopaste (Fedora 10) for fab
kevin approved watchcommits on nopaste (Fedora 10) for fab
kevin approved commit on nopaste (Fedora 10) for fab
kevin approved build on nopaste (Fedora 10) for fab
kevin approved approveacls on nopaste (Fedora 10) for fab

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/nopaste



From kevin at fedoraproject.org  Tue Jan 13 20:34:28 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 13 Jan 2009 20:34:28 +0000 (UTC)
Subject: rpms/nopaste - New directory
Message-ID: <20090113203428.268447013F@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/nopaste
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsIt3783/rpms/nopaste

Log Message:
Directory /cvs/pkgs/rpms/nopaste added to the repository




From kevin at fedoraproject.org  Tue Jan 13 20:34:28 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 13 Jan 2009 20:34:28 +0000 (UTC)
Subject: rpms/nopaste/devel - New directory
Message-ID: <20090113203428.7ECB17013F@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/nopaste/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsIt3783/rpms/nopaste/devel

Log Message:
Directory /cvs/pkgs/rpms/nopaste/devel added to the repository




From kevin at fedoraproject.org  Tue Jan 13 20:34:45 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 13 Jan 2009 20:34:45 +0000 (UTC)
Subject: rpms/nopaste/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <20090113203445.3D92570143@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/nopaste/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsIt3783/rpms/nopaste/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module nopaste


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: nopaste
# $Id: Makefile,v 1.1 2009/01/13 20:34:45 kevin Exp $
NAME := nopaste
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out 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 Jan 13 20:34:44 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 13 Jan 2009 20:34:44 +0000 (UTC)
Subject: rpms/nopaste Makefile,NONE,1.1
Message-ID: <20090113203444.F30C67013F@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/nopaste
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsIt3783/rpms/nopaste

Added Files:
	Makefile 
Log Message:
Setup of module nopaste


--- NEW FILE Makefile ---
# Top level Makefile for module nopaste
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout 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 Jan 13 20:35:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 20:35:13 +0000
Subject: [pkgdb] mingw32-pthreads was added for rjones
Message-ID: <20090113203513.D4727208469@bastion.fedora.phx.redhat.com>

kevin has added Package mingw32-pthreads with summary MinGW pthread library
kevin has approved Package mingw32-pthreads
kevin has added a Fedora devel branch for mingw32-pthreads with an owner of rjones
kevin has approved mingw32-pthreads in Fedora devel
kevin has approved Package mingw32-pthreads
kevin has set commit to Approved for provenpackager on mingw32-pthreads (Fedora devel)
kevin has set build to Approved for provenpackager on mingw32-pthreads (Fedora devel)
kevin has set checkout to Approved for provenpackager on mingw32-pthreads (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-pthreads



From pkgdb at fedoraproject.org  Tue Jan 13 20:35:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 20:35:17 +0000
Subject: [pkgdb] mingw32-pthreads (Fedora EPEL, 5) updated by kevin
Message-ID: <20090113203517.54D3520846E@bastion.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for mingw32-pthreads
kevin has set commit to Approved for provenpackager on mingw32-pthreads (Fedora EPEL 5)
kevin has set build to Approved for provenpackager on mingw32-pthreads (Fedora EPEL 5)
kevin has set checkout to Approved for provenpackager on mingw32-pthreads (Fedora EPEL 5)
kevin approved watchbugzilla on mingw32-pthreads (Fedora EPEL 5) for berrange
kevin approved watchcommits on mingw32-pthreads (Fedora EPEL 5) for berrange
kevin approved commit on mingw32-pthreads (Fedora EPEL 5) for berrange
kevin approved build on mingw32-pthreads (Fedora EPEL 5) for berrange
kevin approved approveacls on mingw32-pthreads (Fedora EPEL 5) for berrange
kevin approved watchbugzilla on mingw32-pthreads (Fedora EPEL 5) for lfarkas
kevin approved watchcommits on mingw32-pthreads (Fedora EPEL 5) for lfarkas
kevin approved commit on mingw32-pthreads (Fedora EPEL 5) for lfarkas
kevin approved build on mingw32-pthreads (Fedora EPEL 5) for lfarkas
kevin approved approveacls on mingw32-pthreads (Fedora EPEL 5) for lfarkas

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-pthreads



From pkgdb at fedoraproject.org  Tue Jan 13 20:35:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 20:35:17 +0000
Subject: [pkgdb] mingw32-pthreads (Fedora, devel) updated by kevin
Message-ID: <20090113203517.83F48208473@bastion.fedora.phx.redhat.com>

kevin approved watchbugzilla on mingw32-pthreads (Fedora devel) for berrange
kevin approved watchcommits on mingw32-pthreads (Fedora devel) for berrange
kevin approved commit on mingw32-pthreads (Fedora devel) for berrange
kevin approved build on mingw32-pthreads (Fedora devel) for berrange
kevin approved approveacls on mingw32-pthreads (Fedora devel) for berrange
kevin approved watchbugzilla on mingw32-pthreads (Fedora devel) for lfarkas
kevin approved watchcommits on mingw32-pthreads (Fedora devel) for lfarkas
kevin approved commit on mingw32-pthreads (Fedora devel) for lfarkas
kevin approved build on mingw32-pthreads (Fedora devel) for lfarkas
kevin approved approveacls on mingw32-pthreads (Fedora devel) for lfarkas

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-pthreads



From kevin at fedoraproject.org  Tue Jan 13 20:35:29 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 13 Jan 2009 20:35:29 +0000 (UTC)
Subject: rpms/mingw32-pthreads/devel - New directory
Message-ID: <20090113203529.9032E70143@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/mingw32-pthreads/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvstu4125/rpms/mingw32-pthreads/devel

Log Message:
Directory /cvs/pkgs/rpms/mingw32-pthreads/devel added to the repository




From kevin at fedoraproject.org  Tue Jan 13 20:35:29 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 13 Jan 2009 20:35:29 +0000 (UTC)
Subject: rpms/mingw32-pthreads - New directory
Message-ID: <20090113203529.384337013F@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/mingw32-pthreads
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvstu4125/rpms/mingw32-pthreads

Log Message:
Directory /cvs/pkgs/rpms/mingw32-pthreads added to the repository




From pkgdb at fedoraproject.org  Tue Jan 13 20:35:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 20:35:17 +0000
Subject: [pkgdb] mingw32-pthreads (Fedora, 10) updated by kevin
Message-ID: <20090113203517.A13CC208477@bastion.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for mingw32-pthreads
kevin has set commit to Approved for provenpackager on mingw32-pthreads (Fedora 10)
kevin has set build to Approved for provenpackager on mingw32-pthreads (Fedora 10)
kevin has set checkout to Approved for provenpackager on mingw32-pthreads (Fedora 10)
kevin approved watchbugzilla on mingw32-pthreads (Fedora 10) for berrange
kevin approved watchcommits on mingw32-pthreads (Fedora 10) for berrange
kevin approved commit on mingw32-pthreads (Fedora 10) for berrange
kevin approved build on mingw32-pthreads (Fedora 10) for berrange
kevin approved approveacls on mingw32-pthreads (Fedora 10) for berrange
kevin approved watchbugzilla on mingw32-pthreads (Fedora 10) for lfarkas
kevin approved watchcommits on mingw32-pthreads (Fedora 10) for lfarkas
kevin approved commit on mingw32-pthreads (Fedora 10) for lfarkas
kevin approved build on mingw32-pthreads (Fedora 10) for lfarkas
kevin approved approveacls on mingw32-pthreads (Fedora 10) for lfarkas

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-pthreads



From kevin at fedoraproject.org  Tue Jan 13 20:35:51 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 13 Jan 2009 20:35:51 +0000 (UTC)
Subject: rpms/mingw32-pthreads Makefile,NONE,1.1
Message-ID: <20090113203551.B524C7013F@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/mingw32-pthreads
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvstu4125/rpms/mingw32-pthreads

Added Files:
	Makefile 
Log Message:
Setup of module mingw32-pthreads


--- NEW FILE Makefile ---
# Top level Makefile for module mingw32-pthreads
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Jan 13 20:35:52 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 13 Jan 2009 20:35:52 +0000 (UTC)
Subject: rpms/mingw32-pthreads/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090113203552.19D4A7013F@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/mingw32-pthreads/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvstu4125/rpms/mingw32-pthreads/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module mingw32-pthreads


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: mingw32-pthreads
# $Id: Makefile,v 1.1 2009/01/13 20:35:51 kevin Exp $
NAME := mingw32-pthreads
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Jan 13 20:36:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 20:36:56 +0000
Subject: [pkgdb] latexdiff was added for danken
Message-ID: <20090113203657.011AC2081FC@bastion.fedora.phx.redhat.com>

kevin has added Package latexdiff with summary Determine and mark up significant differences between latex
kevin has approved Package latexdiff
kevin has added a Fedora devel branch for latexdiff with an owner of danken
kevin has approved latexdiff in Fedora devel
kevin has approved Package latexdiff
kevin has set commit to Approved for provenpackager on latexdiff (Fedora devel)
kevin has set build to Approved for provenpackager on latexdiff (Fedora devel)
kevin has set checkout to Approved for provenpackager on latexdiff (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/latexdiff



From pkgdb at fedoraproject.org  Tue Jan 13 20:36:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 20:36:59 +0000
Subject: [pkgdb] latexdiff (Fedora, 10) updated by kevin
Message-ID: <20090113203659.DA498208467@bastion.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for latexdiff
kevin has set commit to Approved for provenpackager on latexdiff (Fedora 10)
kevin has set build to Approved for provenpackager on latexdiff (Fedora 10)
kevin has set checkout to Approved for provenpackager on latexdiff (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/latexdiff



From kevin at fedoraproject.org  Tue Jan 13 20:37:13 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 13 Jan 2009 20:37:13 +0000 (UTC)
Subject: rpms/latexdiff - New directory
Message-ID: <20090113203713.29C467013F@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/latexdiff
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsvS4397/rpms/latexdiff

Log Message:
Directory /cvs/pkgs/rpms/latexdiff added to the repository




From kevin at fedoraproject.org  Tue Jan 13 20:37:13 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 13 Jan 2009 20:37:13 +0000 (UTC)
Subject: rpms/latexdiff/devel - New directory
Message-ID: <20090113203713.66B4070142@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/latexdiff/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsvS4397/rpms/latexdiff/devel

Log Message:
Directory /cvs/pkgs/rpms/latexdiff/devel added to the repository




From kevin at fedoraproject.org  Tue Jan 13 20:37:29 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 13 Jan 2009 20:37:29 +0000 (UTC)
Subject: rpms/latexdiff Makefile,NONE,1.1
Message-ID: <20090113203729.924FF7013F@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/latexdiff
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsvS4397/rpms/latexdiff

Added Files:
	Makefile 
Log Message:
Setup of module latexdiff


--- NEW FILE Makefile ---
# Top level Makefile for module latexdiff
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Jan 13 20:37:29 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 13 Jan 2009 20:37:29 +0000 (UTC)
Subject: rpms/latexdiff/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090113203729.D54A57013F@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/latexdiff/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsvS4397/rpms/latexdiff/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module latexdiff


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: latexdiff
# $Id: Makefile,v 1.1 2009/01/13 20:37:29 kevin Exp $
NAME := latexdiff
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Jan 13 20:38:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 20:38:03 +0000
Subject: [pkgdb] serafettin-cartoon-fonts was added for oget
Message-ID: <20090113203803.883452081FC@bastion.fedora.phx.redhat.com>

kevin has added Package serafettin-cartoon-fonts with summary Sans-serif Cartoon Fonts
kevin has approved Package serafettin-cartoon-fonts
kevin has added a Fedora devel branch for serafettin-cartoon-fonts with an owner of oget
kevin has approved serafettin-cartoon-fonts in Fedora devel
kevin has approved Package serafettin-cartoon-fonts
kevin has set commit to Approved for provenpackager on serafettin-cartoon-fonts (Fedora devel)
kevin has set build to Approved for provenpackager on serafettin-cartoon-fonts (Fedora devel)
kevin has set checkout to Approved for provenpackager on serafettin-cartoon-fonts (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/serafettin-cartoon-fonts



From pkgdb at fedoraproject.org  Tue Jan 13 20:38:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 20:38:05 +0000
Subject: [pkgdb] serafettin-cartoon-fonts (Fedora, 9) updated by kevin
Message-ID: <20090113203805.3FCC5208457@bastion.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for serafettin-cartoon-fonts
kevin has set commit to Approved for provenpackager on serafettin-cartoon-fonts (Fedora 9)
kevin has set build to Approved for provenpackager on serafettin-cartoon-fonts (Fedora 9)
kevin has set checkout to Approved for provenpackager on serafettin-cartoon-fonts (Fedora 9)
kevin approved watchbugzilla on serafettin-cartoon-fonts (Fedora 9) for fonts-sig
kevin approved watchcommits on serafettin-cartoon-fonts (Fedora 9) for fonts-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/serafettin-cartoon-fonts



From pkgdb at fedoraproject.org  Tue Jan 13 20:38:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 20:38:05 +0000
Subject: [pkgdb] serafettin-cartoon-fonts (Fedora, devel) updated by kevin
Message-ID: <20090113203805.4E906208469@bastion.fedora.phx.redhat.com>

kevin approved watchbugzilla on serafettin-cartoon-fonts (Fedora devel) for fonts-sig
kevin approved watchcommits on serafettin-cartoon-fonts (Fedora devel) for fonts-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/serafettin-cartoon-fonts



From pkgdb at fedoraproject.org  Tue Jan 13 20:38:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 20:38:05 +0000
Subject: [pkgdb] serafettin-cartoon-fonts (Fedora, 10) updated by kevin
Message-ID: <20090113203805.6150D20846E@bastion.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for serafettin-cartoon-fonts
kevin has set commit to Approved for provenpackager on serafettin-cartoon-fonts (Fedora 10)
kevin has set build to Approved for provenpackager on serafettin-cartoon-fonts (Fedora 10)
kevin has set checkout to Approved for provenpackager on serafettin-cartoon-fonts (Fedora 10)
kevin approved watchbugzilla on serafettin-cartoon-fonts (Fedora 10) for fonts-sig
kevin approved watchcommits on serafettin-cartoon-fonts (Fedora 10) for fonts-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/serafettin-cartoon-fonts



From kevin at fedoraproject.org  Tue Jan 13 20:38:17 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 13 Jan 2009 20:38:17 +0000 (UTC)
Subject: rpms/serafettin-cartoon-fonts - New directory
Message-ID: <20090113203817.24A237013F@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/serafettin-cartoon-fonts
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsfj4609/rpms/serafettin-cartoon-fonts

Log Message:
Directory /cvs/pkgs/rpms/serafettin-cartoon-fonts added to the repository




From kevin at fedoraproject.org  Tue Jan 13 20:38:17 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 13 Jan 2009 20:38:17 +0000 (UTC)
Subject: rpms/serafettin-cartoon-fonts/devel - New directory
Message-ID: <20090113203817.586E770143@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/serafettin-cartoon-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsfj4609/rpms/serafettin-cartoon-fonts/devel

Log Message:
Directory /cvs/pkgs/rpms/serafettin-cartoon-fonts/devel added to the repository




From kevin at fedoraproject.org  Tue Jan 13 20:38:31 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 13 Jan 2009 20:38:31 +0000 (UTC)
Subject: rpms/serafettin-cartoon-fonts Makefile,NONE,1.1
Message-ID: <20090113203831.C0C5F7013F@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/serafettin-cartoon-fonts
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsfj4609/rpms/serafettin-cartoon-fonts

Added Files:
	Makefile 
Log Message:
Setup of module serafettin-cartoon-fonts


--- NEW FILE Makefile ---
# Top level Makefile for module serafettin-cartoon-fonts
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Tue Jan 13 20:38:32 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 13 Jan 2009 20:38:32 +0000 (UTC)
Subject: rpms/serafettin-cartoon-fonts/devel .cvsignore, NONE, 1.1 Makefile, 
	NONE, 1.1 sources, NONE, 1.1
Message-ID: <20090113203832.0B7977013F@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/serafettin-cartoon-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsfj4609/rpms/serafettin-cartoon-fonts/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module serafettin-cartoon-fonts


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: serafettin-cartoon-fonts
# $Id: Makefile,v 1.1 2009/01/13 20:38:31 kevin Exp $
NAME := serafettin-cartoon-fonts
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Tue Jan 13 20:38:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 20:38:55 +0000
Subject: [pkgdb] perl-Devel-Dumpvar was added for mmaslano
Message-ID: <20090113203855.1C405208207@bastion.fedora.phx.redhat.com>

kevin has added Package perl-Devel-Dumpvar with summary Pure-OO reimplementation of dumpvar.pl
kevin has approved Package perl-Devel-Dumpvar
kevin has added a Fedora devel branch for perl-Devel-Dumpvar with an owner of mmaslano
kevin has approved perl-Devel-Dumpvar in Fedora devel
kevin has approved Package perl-Devel-Dumpvar
kevin has set commit to Approved for provenpackager on perl-Devel-Dumpvar (Fedora devel)
kevin has set build to Approved for provenpackager on perl-Devel-Dumpvar (Fedora devel)
kevin has set checkout to Approved for provenpackager on perl-Devel-Dumpvar (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Devel-Dumpvar



From pkgdb at fedoraproject.org  Tue Jan 13 20:38:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 20:38:56 +0000
Subject: [pkgdb] perl-Devel-Dumpvar (Fedora, devel) updated by kevin
Message-ID: <20090113203857.659BA208469@bastion.fedora.phx.redhat.com>

kevin approved watchbugzilla on perl-Devel-Dumpvar (Fedora devel) for perl-sig
kevin approved watchcommits on perl-Devel-Dumpvar (Fedora devel) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Devel-Dumpvar



From pkgdb at fedoraproject.org  Tue Jan 13 20:38:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 20:38:56 +0000
Subject: [pkgdb] perl-Devel-Dumpvar (Fedora, 10) updated by kevin
Message-ID: <20090113203857.98E992081FB@bastion.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for perl-Devel-Dumpvar
kevin has set commit to Approved for provenpackager on perl-Devel-Dumpvar (Fedora 10)
kevin has set build to Approved for provenpackager on perl-Devel-Dumpvar (Fedora 10)
kevin has set checkout to Approved for provenpackager on perl-Devel-Dumpvar (Fedora 10)
kevin approved watchbugzilla on perl-Devel-Dumpvar (Fedora 10) for perl-sig
kevin approved watchcommits on perl-Devel-Dumpvar (Fedora 10) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Devel-Dumpvar



From kevin at fedoraproject.org  Tue Jan 13 20:39:08 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 13 Jan 2009 20:39:08 +0000 (UTC)
Subject: rpms/perl-Devel-Dumpvar - New directory
Message-ID: <20090113203908.2215A7013F@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Devel-Dumpvar
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvstD4819/rpms/perl-Devel-Dumpvar

Log Message:
Directory /cvs/pkgs/rpms/perl-Devel-Dumpvar added to the repository




From kevin at fedoraproject.org  Tue Jan 13 20:39:24 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 13 Jan 2009 20:39:24 +0000 (UTC)
Subject: rpms/perl-Devel-Dumpvar Makefile,NONE,1.1
Message-ID: <20090113203924.29D867013F@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Devel-Dumpvar
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvstD4819/rpms/perl-Devel-Dumpvar

Added Files:
	Makefile 
Log Message:
Setup of module perl-Devel-Dumpvar


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Devel-Dumpvar
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Jan 13 20:39:24 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 13 Jan 2009 20:39:24 +0000 (UTC)
Subject: rpms/perl-Devel-Dumpvar/devel .cvsignore, NONE, 1.1 Makefile, NONE, 
	1.1 sources, NONE, 1.1
Message-ID: <20090113203924.7BCA07013F@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Devel-Dumpvar/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvstD4819/rpms/perl-Devel-Dumpvar/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Devel-Dumpvar


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: perl-Devel-Dumpvar
# $Id: Makefile,v 1.1 2009/01/13 20:39:24 kevin Exp $
NAME := perl-Devel-Dumpvar
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out 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 Jan 13 20:39:08 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 13 Jan 2009 20:39:08 +0000 (UTC)
Subject: rpms/perl-Devel-Dumpvar/devel - New directory
Message-ID: <20090113203908.5B4177013F@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Devel-Dumpvar/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvstD4819/rpms/perl-Devel-Dumpvar/devel

Log Message:
Directory /cvs/pkgs/rpms/perl-Devel-Dumpvar/devel added to the repository




From bpepple at fedoraproject.org  Tue Jan 13 20:39:55 2009
From: bpepple at fedoraproject.org (Brian Pepple)
Date: Tue, 13 Jan 2009 20:39:55 +0000 (UTC)
Subject: rpms/telepathy-glib/devel .cvsignore, 1.22, 1.23 sources, 1.22,
	1.23 telepathy-glib.spec, 1.29, 1.30
Message-ID: <20090113203955.E16667013F@cvs1.fedora.phx.redhat.com>

Author: bpepple

Update of /cvs/pkgs/rpms/telepathy-glib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4892

Modified Files:
	.cvsignore sources telepathy-glib.spec 
Log Message:
* Tue Jan 13 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.7.22-1
- Update to 0.7.22.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-glib/devel/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- .cvsignore	12 Jan 2009 19:50:52 -0000	1.22
+++ .cvsignore	13 Jan 2009 20:39:25 -0000	1.23
@@ -1 +1 @@
-telepathy-glib-0.7.21.tar.gz
+telepathy-glib-0.7.22.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-glib/devel/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- sources	12 Jan 2009 19:50:52 -0000	1.22
+++ sources	13 Jan 2009 20:39:25 -0000	1.23
@@ -1 +1 @@
-e965bbce3019723377ba9528c86689ed  telepathy-glib-0.7.21.tar.gz
+558d463816ca71955ca27fdcddf715c2  telepathy-glib-0.7.22.tar.gz


Index: telepathy-glib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-glib/devel/telepathy-glib.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- telepathy-glib.spec	12 Jan 2009 19:50:52 -0000	1.29
+++ telepathy-glib.spec	13 Jan 2009 20:39:25 -0000	1.30
@@ -3,7 +3,7 @@
 %define	glib_ver	2.16
 
 Name:           telepathy-glib
-Version:        0.7.21
+Version:        0.7.22
 Release:        1%{?dist}
 Summary:        GLib bindings for Telepathy
 
@@ -89,6 +89,9 @@
 
 
 %changelog
+* Tue Jan 13 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.7.22-1
+- Update to 0.7.22.
+
 * Mon Jan 12 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.7.21-1
 - Update to 0.7.21.
 



From pkgdb at fedoraproject.org  Tue Jan 13 20:41:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 20:41:07 +0000
Subject: [pkgdb] perl-File-pushd (Fedora, devel) updated by kevin
Message-ID: <20090113204107.EBEAF208456@bastion.fedora.phx.redhat.com>

kevin approved watchbugzilla on perl-File-pushd (Fedora devel) for perl-sig
kevin approved watchcommits on perl-File-pushd (Fedora devel) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-File-pushd



From pkgdb at fedoraproject.org  Tue Jan 13 20:41:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 20:41:05 +0000
Subject: [pkgdb] perl-File-pushd was added for mmaslano
Message-ID: <20090113204105.7276C2081FC@bastion.fedora.phx.redhat.com>

kevin has added Package perl-File-pushd with summary Change directory temporarily for a limited scope
kevin has approved Package perl-File-pushd
kevin has added a Fedora devel branch for perl-File-pushd with an owner of mmaslano
kevin has approved perl-File-pushd in Fedora devel
kevin has approved Package perl-File-pushd
kevin has set commit to Approved for provenpackager on perl-File-pushd (Fedora devel)
kevin has set build to Approved for provenpackager on perl-File-pushd (Fedora devel)
kevin has set checkout to Approved for provenpackager on perl-File-pushd (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-File-pushd



From kevin at fedoraproject.org  Tue Jan 13 20:41:19 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 13 Jan 2009 20:41:19 +0000 (UTC)
Subject: rpms/perl-File-pushd - New directory
Message-ID: <20090113204119.26D917013F@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-File-pushd
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsMC5195/rpms/perl-File-pushd

Log Message:
Directory /cvs/pkgs/rpms/perl-File-pushd added to the repository




From kevin at fedoraproject.org  Tue Jan 13 20:41:19 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 13 Jan 2009 20:41:19 +0000 (UTC)
Subject: rpms/perl-File-pushd/devel - New directory
Message-ID: <20090113204119.5BD877013F@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-File-pushd/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsMC5195/rpms/perl-File-pushd/devel

Log Message:
Directory /cvs/pkgs/rpms/perl-File-pushd/devel added to the repository




From pkgdb at fedoraproject.org  Tue Jan 13 20:41:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 20:41:07 +0000
Subject: [pkgdb] perl-File-pushd (Fedora, 10) updated by kevin
Message-ID: <20090113204108.03B4F208467@bastion.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for perl-File-pushd
kevin has set commit to Approved for provenpackager on perl-File-pushd (Fedora 10)
kevin has set build to Approved for provenpackager on perl-File-pushd (Fedora 10)
kevin has set checkout to Approved for provenpackager on perl-File-pushd (Fedora 10)
kevin approved watchbugzilla on perl-File-pushd (Fedora 10) for perl-sig
kevin approved watchcommits on perl-File-pushd (Fedora 10) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-File-pushd



From kevin at fedoraproject.org  Tue Jan 13 20:41:34 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 13 Jan 2009 20:41:34 +0000 (UTC)
Subject: rpms/perl-File-pushd Makefile,NONE,1.1
Message-ID: <20090113204134.015F37013F@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-File-pushd
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsMC5195/rpms/perl-File-pushd

Added Files:
	Makefile 
Log Message:
Setup of module perl-File-pushd


--- NEW FILE Makefile ---
# Top level Makefile for module perl-File-pushd
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Jan 13 20:41:34 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 13 Jan 2009 20:41:34 +0000 (UTC)
Subject: rpms/perl-File-pushd/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090113204134.43D807013F@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-File-pushd/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsMC5195/rpms/perl-File-pushd/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-File-pushd


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: perl-File-pushd
# $Id: Makefile,v 1.1 2009/01/13 20:41:34 kevin Exp $
NAME := perl-File-pushd
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Jan 13 20:41:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 20:41:59 +0000
Subject: [pkgdb] perl-Test-HTTP-Server-Simple-StashWarnings was added for
	corsepiu
Message-ID: <20090113204159.738A12081FC@bastion.fedora.phx.redhat.com>

kevin has added Package perl-Test-HTTP-Server-Simple-StashWarnings with summary Catch your forked server's warnings
kevin has approved Package perl-Test-HTTP-Server-Simple-StashWarnings
kevin has added a Fedora devel branch for perl-Test-HTTP-Server-Simple-StashWarnings with an owner of corsepiu
kevin has approved perl-Test-HTTP-Server-Simple-StashWarnings in Fedora devel
kevin has approved Package perl-Test-HTTP-Server-Simple-StashWarnings
kevin has set commit to Approved for provenpackager on perl-Test-HTTP-Server-Simple-StashWarnings (Fedora devel)
kevin has set build to Approved for provenpackager on perl-Test-HTTP-Server-Simple-StashWarnings (Fedora devel)
kevin has set checkout to Approved for provenpackager on perl-Test-HTTP-Server-Simple-StashWarnings (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Test-HTTP-Server-Simple-StashWarnings



From pkgdb at fedoraproject.org  Tue Jan 13 20:42:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 20:42:02 +0000
Subject: [pkgdb] perl-Test-HTTP-Server-Simple-StashWarnings (Fedora,
	devel) updated by kevin
Message-ID: <20090113204202.74DBE208456@bastion.fedora.phx.redhat.com>

kevin approved watchbugzilla on perl-Test-HTTP-Server-Simple-StashWarnings (Fedora devel) for perl-sig
kevin approved watchcommits on perl-Test-HTTP-Server-Simple-StashWarnings (Fedora devel) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Test-HTTP-Server-Simple-StashWarnings



From kevin at fedoraproject.org  Tue Jan 13 20:42:13 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 13 Jan 2009 20:42:13 +0000 (UTC)
Subject: rpms/perl-Test-HTTP-Server-Simple-StashWarnings - New directory
Message-ID: <20090113204213.358AD7013F@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Test-HTTP-Server-Simple-StashWarnings
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvssl5342/rpms/perl-Test-HTTP-Server-Simple-StashWarnings

Log Message:
Directory /cvs/pkgs/rpms/perl-Test-HTTP-Server-Simple-StashWarnings added to the repository




From kevin at fedoraproject.org  Tue Jan 13 20:42:13 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 13 Jan 2009 20:42:13 +0000 (UTC)
Subject: rpms/perl-Test-HTTP-Server-Simple-StashWarnings/devel - New
	directory
Message-ID: <20090113204213.736C97013F@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Test-HTTP-Server-Simple-StashWarnings/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvssl5342/rpms/perl-Test-HTTP-Server-Simple-StashWarnings/devel

Log Message:
Directory /cvs/pkgs/rpms/perl-Test-HTTP-Server-Simple-StashWarnings/devel added to the repository




From pkgdb at fedoraproject.org  Tue Jan 13 20:42:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 20:42:02 +0000
Subject: [pkgdb] perl-Test-HTTP-Server-Simple-StashWarnings (Fedora,
	10) updated by kevin
Message-ID: <20090113204202.7E0C5208467@bastion.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for perl-Test-HTTP-Server-Simple-StashWarnings
kevin has set commit to Approved for provenpackager on perl-Test-HTTP-Server-Simple-StashWarnings (Fedora 10)
kevin has set build to Approved for provenpackager on perl-Test-HTTP-Server-Simple-StashWarnings (Fedora 10)
kevin has set checkout to Approved for provenpackager on perl-Test-HTTP-Server-Simple-StashWarnings (Fedora 10)
kevin approved watchbugzilla on perl-Test-HTTP-Server-Simple-StashWarnings (Fedora 10) for perl-sig
kevin approved watchcommits on perl-Test-HTTP-Server-Simple-StashWarnings (Fedora 10) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Test-HTTP-Server-Simple-StashWarnings



From kevin at fedoraproject.org  Tue Jan 13 20:42:30 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 13 Jan 2009 20:42:30 +0000 (UTC)
Subject: rpms/perl-Test-HTTP-Server-Simple-StashWarnings Makefile,NONE,1.1
Message-ID: <20090113204230.EF8AA7013F@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Test-HTTP-Server-Simple-StashWarnings
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvssl5342/rpms/perl-Test-HTTP-Server-Simple-StashWarnings

Added Files:
	Makefile 
Log Message:
Setup of module perl-Test-HTTP-Server-Simple-StashWarnings


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Test-HTTP-Server-Simple-StashWarnings
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Jan 13 20:42:31 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 13 Jan 2009 20:42:31 +0000 (UTC)
Subject: rpms/perl-Test-HTTP-Server-Simple-StashWarnings/devel .cvsignore,
	NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1
Message-ID: <20090113204231.414607013F@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Test-HTTP-Server-Simple-StashWarnings/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvssl5342/rpms/perl-Test-HTTP-Server-Simple-StashWarnings/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Test-HTTP-Server-Simple-StashWarnings


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: perl-Test-HTTP-Server-Simple-StashWarnings
# $Id: Makefile,v 1.1 2009/01/13 20:42:31 kevin Exp $
NAME := perl-Test-HTTP-Server-Simple-StashWarnings
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From lkundrak at fedoraproject.org  Tue Jan 13 20:45:18 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Tue, 13 Jan 2009 20:45:18 +0000 (UTC)
Subject: rpms/inkscape/F-10 inkscape-0.46-bitmap-fonts.patch, NONE,
	1.1 inkscape.spec, 1.57, 1.58
Message-ID: <20090113204518.7C2317013F@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/inkscape/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5859

Modified Files:
	inkscape.spec 
Added Files:
	inkscape-0.46-bitmap-fonts.patch 
Log Message:
* Tue Jan 13 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.46-7
- Fix crash with bitmap font (#477158)


inkscape-0.46-bitmap-fonts.patch:

--- NEW FILE inkscape-0.46-bitmap-fonts.patch ---
Fix crash with bitmap fonts. Fixes #477158
https://bugzilla.redhat.com/show_bug.cgi?id=477158

Comes from this upstream commit:

r19758 | buliabyak | 2008-08-28 20:35:16 +0200 (Thu, 28 Aug 2008) | 1 line
null check fixes patch from bug 261475

diff -up inkscape-0.46/src/libnrtype/FontFactory.cpp.bitmap-fonts inkscape-0.46/src/libnrtype/FontFactory.cpp
--- inkscape-0.46/src/libnrtype/FontFactory.cpp.bitmap-fonts	2008-03-11 05:20:29.000000000 +0100
+++ inkscape-0.46/src/libnrtype/FontFactory.cpp	2009-01-13 21:37:13.000000000 +0100
@@ -817,7 +817,8 @@ font_instance *font_factory::Face(PangoF
         res->Ref();
         AddInCache(res);
     }
-    res->InitTheFace();
+    if(res)
+	res->InitTheFace();
     return res;
 }
 
diff -up inkscape-0.46/src/libnrtype/Layout-TNG-Compute.cpp.bitmap-fonts inkscape-0.46/src/libnrtype/Layout-TNG-Compute.cpp
--- inkscape-0.46/src/libnrtype/Layout-TNG-Compute.cpp.bitmap-fonts	2008-03-11 05:20:29.000000000 +0100
+++ inkscape-0.46/src/libnrtype/Layout-TNG-Compute.cpp	2009-01-13 21:37:13.000000000 +0100
@@ -475,9 +475,9 @@ class Layout::Calculator
                 new_span.in_input_stream_item = unbroken_span.input_index;
                 new_span.baseline_shift = _y_offset;
                 new_span.block_progression = _block_progression;
-                if (_flow._input_stream[unbroken_span.input_index]->Type() == TEXT_SOURCE) {
-                    new_span.font = para.pango_items[unbroken_span.pango_item_index].font;
-                    new_span.font->Ref();
+                if ((_flow._input_stream[unbroken_span.input_index]->Type() == TEXT_SOURCE) && (new_span.font = para.pango_items[unbroken_span.pango_item_index].font))
+                    {
+		    new_span.font->Ref();
                     new_span.font_size = unbroken_span.font_size;
                     new_span.direction = para.pango_items[unbroken_span.pango_item_index].item->analysis.level & 1 ? RIGHT_TO_LEFT : LEFT_TO_RIGHT;
                     new_span.input_stream_first_character = Glib::ustring::const_iterator(unbroken_span.input_stream_first_character.base() + it_span->start.char_byte);
@@ -562,7 +562,7 @@ class Layout::Calculator
                             new_glyph.x = x + unbroken_span.glyph_string->glyphs[glyph_index].geometry.x_offset * font_size_multiplier;
                             new_glyph.y = _y_offset + unbroken_span.glyph_string->glyphs[glyph_index].geometry.y_offset * font_size_multiplier;
                             new_glyph.width = unbroken_span.glyph_string->glyphs[glyph_index].geometry.width * font_size_multiplier;
-                            if (new_glyph.width == 0)
+                            if ((new_glyph.width == 0) && (para.pango_items[unbroken_span.pango_item_index].font))
                                 new_glyph.width = new_span.font_size * para.pango_items[unbroken_span.pango_item_index].font->Advance(unbroken_span.glyph_string->glyphs[glyph_index].glyph, false);
                                 // for some reason pango returns zero width for invalid glyph characters (those empty boxes), so go to freetype for the info
                         }
@@ -903,7 +903,8 @@ void Layout::Calculator::_computeFontLin
         line_height->setZero();
         *line_height_multiplier = 1.0;
     }
-    font->FontMetrics(line_height->ascent, line_height->descent, line_height->leading);
+    else
+	font->FontMetrics(line_height->ascent, line_height->descent, line_height->leading);
     *line_height *= font_size;
 
     // yet another borked SPStyle member that we're going to have to fix ourselves
diff -up inkscape-0.46/src/libnrtype/Layout-TNG-Output.cpp.bitmap-fonts inkscape-0.46/src/libnrtype/Layout-TNG-Output.cpp
--- inkscape-0.46/src/libnrtype/Layout-TNG-Output.cpp.bitmap-fonts	2008-03-11 05:20:29.000000000 +0100
+++ inkscape-0.46/src/libnrtype/Layout-TNG-Output.cpp	2009-01-13 21:39:18.000000000 +0100
@@ -112,21 +112,23 @@ void Layout::getBoundingBox(NRRect *boun
         _getGlyphTransformMatrix(glyph_index, &glyph_matrix);
         NR::Matrix total_transform = glyph_matrix;
         total_transform *= transform;
-        NR::Maybe<NR::Rect> glyph_rect = _glyphs[glyph_index].span(this).font->BBox(_glyphs[glyph_index].glyph);
-        if (glyph_rect) {
-            NR::Point bmi = glyph_rect->min(), bma = glyph_rect->max();
-            NR::Point tlp(bmi[0],bmi[1]), trp(bma[0],bmi[1]), blp(bmi[0],bma[1]), brp(bma[0],bma[1]);
-            tlp *= total_transform;
-            trp *= total_transform;
-            blp *= total_transform;
-            brp *= total_transform;
-            *glyph_rect = NR::Rect(tlp,trp);
-            glyph_rect->expandTo(blp);
-            glyph_rect->expandTo(brp);
-            if ( (glyph_rect->min())[0] < bounding_box->x0 ) bounding_box->x0=(glyph_rect->min())[0];
-            if ( (glyph_rect->max())[0] > bounding_box->x1 ) bounding_box->x1=(glyph_rect->max())[0];
-            if ( (glyph_rect->min())[1] < bounding_box->y0 ) bounding_box->y0=(glyph_rect->min())[1];
-            if ( (glyph_rect->max())[1] > bounding_box->y1 ) bounding_box->y1=(glyph_rect->max())[1];
+        if (_glyphs[glyph_index].span(this).font) {
+            NR::Maybe<NR::Rect> glyph_rect = _glyphs[glyph_index].span(this).font->BBox(_glyphs[glyph_index].glyph);
+            if (glyph_rect) {
+                NR::Point bmi = glyph_rect->min(), bma = glyph_rect->max();
+                NR::Point tlp(bmi[0],bmi[1]), trp(bma[0],bmi[1]), blp(bmi[0],bma[1]), brp(bma[0],bma[1]);
+                tlp *= total_transform;
+                trp *= total_transform;
+                blp *= total_transform;
+                brp *= total_transform;
+                *glyph_rect = NR::Rect(tlp,trp);
+                glyph_rect->expandTo(blp);
+                glyph_rect->expandTo(brp);
+                if ( (glyph_rect->min())[0] < bounding_box->x0 ) bounding_box->x0=(glyph_rect->min())[0];
+                if ( (glyph_rect->max())[0] > bounding_box->x1 ) bounding_box->x1=(glyph_rect->max())[0];
+                if ( (glyph_rect->min())[1] < bounding_box->y0 ) bounding_box->y0=(glyph_rect->min())[1];
+                if ( (glyph_rect->max())[1] > bounding_box->y1 ) bounding_box->y1=(glyph_rect->max())[1];
+            }
         }
     }
 }


Index: inkscape.spec
===================================================================
RCS file: /cvs/pkgs/rpms/inkscape/F-10/inkscape.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- inkscape.spec	17 Oct 2008 16:44:59 -0000	1.57
+++ inkscape.spec	13 Jan 2009 20:44:48 -0000	1.58
@@ -1,6 +1,6 @@
 Name:           inkscape
 Version:        0.46
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Vector-based drawing program using SVG
 
 Group:          Applications/Productivity
@@ -16,6 +16,7 @@
 Patch6:         inkscape-0.46-poppler-0.8.3.patch
 Patch7:         inkscape-0.46-uniconv.patch
 Patch8:         inkscape-0.46-colors.patch
+Patch9:         inkscape-0.46-bitmap-fonts.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -144,6 +145,9 @@
 
 
 %changelog
+* Tue Jan 13 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.46-7
+- Fix crash with bitmap font (#477158)
+
 * Fri Oct 17 2008 Lubomir Rintel <lkundrak at v3.sk> - 0.46-6
 - Fix color sliders with recent GTK (#467431)
 



From cdamian at fedoraproject.org  Tue Jan 13 20:45:52 2009
From: cdamian at fedoraproject.org (Christof Damian)
Date: Tue, 13 Jan 2009 20:45:52 +0000 (UTC)
Subject: rpms/podcatcher/EL-5 import.log, NONE, 1.1 podcatcher.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090113204552.D50DA7013F@cvs1.fedora.phx.redhat.com>

Author: cdamian

Update of /cvs/pkgs/rpms/podcatcher/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5886/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	import.log podcatcher.spec 
Log Message:
initial import of podcaster into EL-5 branch



--- NEW FILE import.log ---
podcatcher-3_1_4-3_fc10:EL-5:podcatcher-3.1.4-3.fc10.src.rpm:1231879450


--- NEW FILE podcatcher.spec ---
%define repoid  43722

Name:           podcatcher
Version:        3.1.4
Release:        3%{?dist}
Summary:        Armangil's podcatcher 

Group:          Applications/Internet

License:        GPL+
URL:            http://podcatcher.rubyforge.org/
Source0:        http://rubyforge.org/frs/download.php/%{repoid}/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch

Requires:       ruby >= 1.8.2

%description

Armangil's podcatcher is a podcast client for the command line. It provides 
several download strategies (new shows only, back-catalog allowed, etc), offers 
cache management, supports BitTorrent, and generates playlists for media player
applications.

%prep
%setup -q -n %{name}

%build

%install
rm -rf $RPM_BUILD_ROOT
install -p -D bin/podcatcher $RPM_BUILD_ROOT/%{_bindir}/podcatcher

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc demo/
%doc README.txt
%{_bindir}/podcatcher

%changelog
* Mon Jan 5 2009 Christof Damian <christof at damian.net> 3.1.4-3
- add repoid for download link and use name macro too
- removed unused macros

* Thu Jan 1 2009 Christof Damian <christof at damian.net> 3.1.4-2
- fixed some problems in the spec file

* Fri Dec 26 2008 Christof Damian <christof at damian.net> 3.1.4-1
- initial rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/podcatcher/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	11 Jan 2009 17:16:24 -0000	1.1
+++ .cvsignore	13 Jan 2009 20:45:22 -0000	1.2
@@ -0,0 +1 @@
+podcatcher-3.1.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/podcatcher/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	11 Jan 2009 17:16:24 -0000	1.1
+++ sources	13 Jan 2009 20:45:22 -0000	1.2
@@ -0,0 +1 @@
+38e5382613c4a454b8138bcc2b881e68  podcatcher-3.1.4.tar.gz



From rdieter at fedoraproject.org  Tue Jan 13 20:47:15 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Tue, 13 Jan 2009 20:47:15 +0000 (UTC)
Subject: rpms/kdebase-runtime/devel .cvsignore, 1.25,
	1.26 kdebase-runtime.spec, 1.85, 1.86 sources, 1.26, 1.27
Message-ID: <20090113204715.1712670141@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdebase-runtime/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6327

Modified Files:
	.cvsignore kdebase-runtime.spec sources 
Log Message:
* Tue Jan 13 2009 Rex Dieter <rdieter at fedoraproject.org> 4.1.96-2
- tarball respin
- drop extraneous deps (that are in kdelibs)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-runtime/devel/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- .cvsignore	7 Jan 2009 15:29:33 -0000	1.25
+++ .cvsignore	13 Jan 2009 20:46:44 -0000	1.26
@@ -1,12 +1 @@
-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
-kdebase-runtime-4.1.80.tar.bz2
-kdebase-runtime-4.1.85.tar.bz2
 kdebase-runtime-4.1.96.tar.bz2


Index: kdebase-runtime.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-runtime/devel/kdebase-runtime.spec,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -r1.85 -r1.86
--- kdebase-runtime.spec	7 Jan 2009 15:29:33 -0000	1.85
+++ kdebase-runtime.spec	13 Jan 2009 20:46:44 -0000	1.86
@@ -8,7 +8,7 @@
 Name:          kdebase-runtime
 Summary:       K Desktop Environment - Runtime
 Version:       4.1.96
-Release:       1%{?dist}
+Release:       2%{?dist}
 
 License:       GPLv2
 Group:         User Interface/Desktops
@@ -47,7 +47,6 @@
 %endif
 
 BuildRequires: alsa-lib-devel
-BuildRequires: cmake >= 2.6.2
 BuildRequires: clucene-core-devel
 BuildRequires: giflib-devel
 BuildRequires: hal-devel
@@ -60,8 +59,6 @@
 BuildRequires: pcre-devel
 BuildRequires: pkgconfig
 BuildRequires: qimageblitz-devel
-BuildRequires: soprano-devel >= 2.0.97
-BuildRequires: strigi-devel >= 0.5.11.1
 # needed for phonon-xine VideoWidget, also need xine-lib built with libxcb support
 BuildRequires: libxcb-devel
 # needed?
@@ -338,6 +335,10 @@
 
 
 %changelog
+* Tue Jan 13 2009 Rex Dieter <rdieter at fedoraproject.org> 4.1.96-2
+- tarball respin
+- drop extraneous deps (that are in kdelibs)
+
 * Wed Jan 07 2009 Than Ngo <than at redhat.com> - 4.1.96-1
 - 4.2rc1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-runtime/devel/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- sources	7 Jan 2009 15:29:33 -0000	1.26
+++ sources	13 Jan 2009 20:46:44 -0000	1.27
@@ -1 +1 @@
-a3fbdae9774545991aac839d9971f62c  kdebase-runtime-4.1.96.tar.bz2
+2c34b66f9d1e7dfc1e0fa78087ddd773  kdebase-runtime-4.1.96.tar.bz2



From linville at fedoraproject.org  Tue Jan 13 20:52:53 2009
From: linville at fedoraproject.org (John W. Linville)
Date: Tue, 13 Jan 2009 20:52:53 +0000 (UTC)
Subject: rpms/kernel/F-10
	linux-2.6-ath5k-ignore-the-return-value-of-ath5k_hw_noise_floor_calibration.patch,
	NONE, 1.1 kernel.spec, 1.1210, 1.1211
Message-ID: <20090113205253.4A3E67013F@cvs1.fedora.phx.redhat.com>

Author: linville

Update of /cvs/pkgs/rpms/kernel/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7554

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-ath5k-ignore-the-return-value-of-ath5k_hw_noise_floor_calibration.patch 
Log Message:
ath5k: ignore the return value of ath5k_hw_noise_floor_calibration

linux-2.6-ath5k-ignore-the-return-value-of-ath5k_hw_noise_floor_calibration.patch:

--- NEW FILE linux-2.6-ath5k-ignore-the-return-value-of-ath5k_hw_noise_floor_calibration.patch ---
commit 8b0162a3dc5c30e862b7a73da29e32de3170f5e4
Author: Felix Fietkau <nbd at openwrt.org>
Date:   Mon Nov 3 11:27:38 2008 +0100

    ath5k: ignore the return value of ath5k_hw_noise_floor_calibration
    
    Noise floor calibration occasionally fails on Atheros hardware.
    This is not fatal and can happen if there's simply too much
    noise on the air. Ignoring the calibration error is the right
    thing to do here, because when the error is ignored, the hardware
    will still work, whereas if the error causes the driver to bail out
    of a bigger configuration function and does not configure the tx
    queues or the IMR (as is the case in reset.c), the hw no longer
    works properly until the next reset.
    
    Signed-off-by: Felix Fietkau <nbd at openwrt.org>
    Signed-off-by: John W. Linville <linville at tuxdriver.com>

diff --git a/drivers/net/wireless/ath5k/phy.c b/drivers/net/wireless/ath5k/phy.c
index 69625bf..7ba18e0 100644
--- a/drivers/net/wireless/ath5k/phy.c
+++ b/drivers/net/wireless/ath5k/phy.c
@@ -2196,9 +2196,7 @@ static int ath5k_hw_rf5110_calibrate(struct ath5k_hw *ah,
 		return ret;
 	}
 
-	ret = ath5k_hw_noise_floor_calibration(ah, channel->center_freq);
-	if (ret)
-		return ret;
+	ath5k_hw_noise_floor_calibration(ah, channel->center_freq);
 
 	/*
 	 * Re-enable RX/TX and beacons
diff --git a/drivers/net/wireless/ath5k/reset.c b/drivers/net/wireless/ath5k/reset.c
index b51bc03..5003263 100644
--- a/drivers/net/wireless/ath5k/reset.c
+++ b/drivers/net/wireless/ath5k/reset.c
@@ -842,9 +842,7 @@ int ath5k_hw_reset(struct ath5k_hw *ah, enum nl80211_iftype op_mode,
 	 *
 	 * XXX: Find an interval that's OK for all cards...
 	 */
-	ret = ath5k_hw_noise_floor_calibration(ah, channel->center_freq);
-	if (ret)
-		return ret;
+	ath5k_hw_noise_floor_calibration(ah, channel->center_freq);
 
 	/*
 	 * Reset queues and start beacon timers at the end of the reset routine


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/kernel.spec,v
retrieving revision 1.1210
retrieving revision 1.1211
diff -u -r1.1210 -r1.1211
--- kernel.spec	13 Jan 2009 15:30:14 -0000	1.1210
+++ kernel.spec	13 Jan 2009 20:52:22 -0000	1.1211
@@ -629,6 +629,7 @@
 Patch670: linux-2.6-ata-quirk.patch
 
 Patch680: linux-2.6-iwlwifi-use-GFP_KERNEL-to-allocate-Rx-SKB-memory.patch
+Patch681: linux-2.6-ath5k-ignore-the-return-value-of-ath5k_hw_noise_floor_calibration.patch
 
 Patch690: linux-2.6-at76.patch
 
@@ -1151,6 +1152,9 @@
 # iwlwifi: use GFP_KERNEL to allocate Rx SKB memory
 ApplyPatch linux-2.6-iwlwifi-use-GFP_KERNEL-to-allocate-Rx-SKB-memory.patch
 
+# ath5k: ignore the return value of ath5k_hw_noise_floor_calibration
+ApplyPatch linux-2.6-ath5k-ignore-the-return-value-of-ath5k_hw_noise_floor_calibration.patch
+
 # Add misc wireless bits from upstream wireless tree
 ApplyPatch linux-2.6-at76.patch
 
@@ -1773,6 +1777,9 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Tue Jan 13 2009 John W. Linville <linville at redhat.com>
+- ath5k: ignore the return value of ath5k_hw_noise_floor_calibration
+
 * Tue Jan 13 2009 Kyle McMartin <kyle at redhat.com>
 - oops, turn off debug builds...
 



From rdieter at fedoraproject.org  Tue Jan 13 20:54:41 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Tue, 13 Jan 2009 20:54:41 +0000 (UTC)
Subject: rpms/gnupg2/devel .cvsignore, 1.27, 1.28 gnupg2.spec, 1.87,
	1.88 sources, 1.29, 1.30 gnupg-1.9.16-testverbose.patch, 1.1,
	NONE gnupg2-2.0.9-gcc43.patch, 1.1, NONE
Message-ID: <20090113205441.4748B7013F@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/gnupg2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8087

Modified Files:
	.cvsignore gnupg2.spec sources 
Removed Files:
	gnupg-1.9.16-testverbose.patch gnupg2-2.0.9-gcc43.patch 
Log Message:
* Tue Jan 13 2009 Rex Dieter <rdieter at fedoraproject.org> 2.0.10-1
- gnupg-2.0.10



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnupg2/devel/.cvsignore,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- .cvsignore	26 Mar 2008 17:15:26 -0000	1.27
+++ .cvsignore	13 Jan 2009 20:54:10 -0000	1.28
@@ -1,2 +1,2 @@
-gnupg-2.0.9.tar.bz2
-gnupg-2.0.9.tar.bz2.sig
+gnupg-2.0.10.tar.bz2
+gnupg-2.0.10.tar.bz2.sig


Index: gnupg2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnupg2/devel/gnupg2.spec,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -r1.87 -r1.88
--- gnupg2.spec	5 Aug 2008 00:56:00 -0000	1.87
+++ gnupg2.spec	13 Jan 2009 20:54:10 -0000	1.88
@@ -1,8 +1,8 @@
 
 Summary: Utility for secure communication and data storage
 Name:    gnupg2
-Version: 2.0.9
-Release: 3%{?dist}
+Version: 2.0.10
+Release: 1%{?dist}
 
 License: GPLv3+
 Group:   Applications/System
@@ -11,21 +11,15 @@
 URL:     http://www.gnupg.org/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Patch1: gnupg-1.9.16-testverbose.patch
-
-# Patch from upstream to fix curl 7.18.1+ and gcc4.3+ compile error
-# http://lists.gnupg.org/pipermail/gnupg-devel/2008-April/024344.html
-Patch2: gnupg2-2.0.9-gcc43.patch
-
 BuildRequires: bzip2-devel
 BuildRequires: curl-devel
 BuildRequires: docbook-utils
 BuildRequires: gettext
 BuildRequires: libassuan-devel >= 1.0.4
 # libgcrypt-devel >= 1.4.0 is preferred, see http://bugzilla.redhat.com/435320
-#BuildRequires:  libgcrypt-devel >= 1.4.0
-#Requires(hint): libgcrypt >= 1.4.0
-BuildRequires: libgcrypt-devel => 1.2.2
+BuildRequires:  libgcrypt-devel >= 1.4
+#Requires(hint): libgcrypt >= 1.4
+#BuildRequires: libgcrypt-devel => 1.2.2
 BuildRequires: libgpg-error-devel => 1.4
 BuildRequires: libksba-devel >= 1.0.2
 BuildRequires: libusb-devel
@@ -72,9 +66,6 @@
 %prep
 %setup -q -n gnupg-%{version}%{?pre}
 
-#patch1 -p1 -b .testverbose
-%patch2 -p1 -b .gcc43
-
 # pcsc-lite library major: 0 in 1.2.0, 1 in 1.2.9+ (dlopen()'d in pcsc-wrapper)
 # Note: this is just the name of the default shared lib to load in scdaemon,
 # it can use other implementations too (including non-pcsc ones).
@@ -102,7 +93,8 @@
 rm -rf %{buildroot}
 
 make install DESTDIR=%{buildroot} \
-  INSTALL="install -p"
+  INSTALL="install -p" \
+  docdir=%{_docdir}/%{name}-%{version}
 
 %find_lang %{name}
 
@@ -110,11 +102,15 @@
 mkdir -p %{buildroot}%{_sysconfdir}/gnupg
 touch %{buildroot}%{_sysconfdir}/gnupg/gpgconf.conf
 
+# more docs
+install -m644 -p AUTHORS COPYING ChangeLog NEWS THANKS TODO \
+  %{buildroot}%{_docdir}/%{name}-%{version}/
+
 ## Unpackaged files
 # file conflicts with gnupg-1.x
-# shouldn't gnupg2 be providing these now (maybe only f9+)? -- Rex
+# shouldn't gnupg2 be providing these now (maybe only f11+)? -- Rex
 rm -f %{buildroot}%{_bindir}/{gpgsplit,gpg-zip} 
-rm -f %{buildroot}%{_datadir}/gnupg/{FAQ,faq.html}
+rm -f %{buildroot}%{_mandir}/man1/gpg-zip.1*
 
 # info dir
 rm -f %{buildroot}%{_infodir}/dir
@@ -138,7 +134,8 @@
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING ChangeLog NEWS README THANKS TODO
+#doc AUTHORS COPYING ChangeLog NEWS README THANKS TODO
+%{_docdir}/%{name}-%{version}/
 %dir %{_sysconfdir}/gnupg
 %ghost %config(noreplace) %{_sysconfdir}/gnupg/gpgconf.conf
 #docs say to install suid root, but we won't, for now.
@@ -168,6 +165,9 @@
 
 
 %changelog
+* Tue Jan 13 2009 Rex Dieter <rdieter at fedoraproject.org> 2.0.10-1
+- gnupg-2.0.10
+
 * Mon Aug 04 2008 Rex Dieter <rdieter at fedoraproject.org> 2.0.9-3
 - workaround rpm quirks 
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnupg2/devel/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- sources	26 Mar 2008 17:15:26 -0000	1.29
+++ sources	13 Jan 2009 20:54:10 -0000	1.30
@@ -1,2 +1,2 @@
-b41f3f6716a74c46a609a71853e85c7b  gnupg-2.0.9.tar.bz2
-29a90f2bdd27d79b7e9a0885f119832a  gnupg-2.0.9.tar.bz2.sig
+1cb778dd555f87685a8fde2f7113725e  gnupg-2.0.10.tar.bz2
+bf002a27b578b229adae914769272b27  gnupg-2.0.10.tar.bz2.sig


--- gnupg-1.9.16-testverbose.patch DELETED ---


--- gnupg2-2.0.9-gcc43.patch DELETED ---



From rdieter at fedoraproject.org  Tue Jan 13 21:02:05 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Tue, 13 Jan 2009 21:02:05 +0000 (UTC)
Subject: rpms/kdebase-runtime/devel kdebase-runtime.spec,1.86,1.87
Message-ID: <20090113210205.E2D797013F@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdebase-runtime/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9210

Modified Files:
	kdebase-runtime.spec 
Log Message:
oops, still need soprano-devel



Index: kdebase-runtime.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-runtime/devel/kdebase-runtime.spec,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -r1.86 -r1.87
--- kdebase-runtime.spec	13 Jan 2009 20:46:44 -0000	1.86
+++ kdebase-runtime.spec	13 Jan 2009 21:01:35 -0000	1.87
@@ -59,6 +59,7 @@
 BuildRequires: pcre-devel
 BuildRequires: pkgconfig
 BuildRequires: qimageblitz-devel
+BuildRequires: soprano-devel
 # needed for phonon-xine VideoWidget, also need xine-lib built with libxcb support
 BuildRequires: libxcb-devel
 # needed?



From linville at fedoraproject.org  Tue Jan 13 21:07:45 2009
From: linville at fedoraproject.org (John W. Linville)
Date: Tue, 13 Jan 2009 21:07:45 +0000 (UTC)
Subject: rpms/kernel/F-9
	linux-2.6-ath5k-ignore-the-return-value-of-ath5k_hw_noise_floor_calibration.patch,
	NONE, 1.1 kernel.spec, 1.893, 1.894
Message-ID: <20090113210745.21DF27013F@cvs1.fedora.phx.redhat.com>

Author: linville

Update of /cvs/pkgs/rpms/kernel/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9978

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-ath5k-ignore-the-return-value-of-ath5k_hw_noise_floor_calibration.patch 
Log Message:
ath5k: ignore the return value of ath5k_hw_noise_floor_calibration

linux-2.6-ath5k-ignore-the-return-value-of-ath5k_hw_noise_floor_calibration.patch:

--- NEW FILE linux-2.6-ath5k-ignore-the-return-value-of-ath5k_hw_noise_floor_calibration.patch ---
commit 8b0162a3dc5c30e862b7a73da29e32de3170f5e4
Author: Felix Fietkau <nbd at openwrt.org>
Date:   Mon Nov 3 11:27:38 2008 +0100

    ath5k: ignore the return value of ath5k_hw_noise_floor_calibration
    
    Noise floor calibration occasionally fails on Atheros hardware.
    This is not fatal and can happen if there's simply too much
    noise on the air. Ignoring the calibration error is the right
    thing to do here, because when the error is ignored, the hardware
    will still work, whereas if the error causes the driver to bail out
    of a bigger configuration function and does not configure the tx
    queues or the IMR (as is the case in reset.c), the hw no longer
    works properly until the next reset.
    
    Signed-off-by: Felix Fietkau <nbd at openwrt.org>
    Signed-off-by: John W. Linville <linville at tuxdriver.com>

diff --git a/drivers/net/wireless/ath5k/phy.c b/drivers/net/wireless/ath5k/phy.c
index 69625bf..7ba18e0 100644
--- a/drivers/net/wireless/ath5k/phy.c
+++ b/drivers/net/wireless/ath5k/phy.c
@@ -2196,9 +2196,7 @@ static int ath5k_hw_rf5110_calibrate(struct ath5k_hw *ah,
 		return ret;
 	}
 
-	ret = ath5k_hw_noise_floor_calibration(ah, channel->center_freq);
-	if (ret)
-		return ret;
+	ath5k_hw_noise_floor_calibration(ah, channel->center_freq);
 
 	/*
 	 * Re-enable RX/TX and beacons
diff --git a/drivers/net/wireless/ath5k/reset.c b/drivers/net/wireless/ath5k/reset.c
index b51bc03..5003263 100644
--- a/drivers/net/wireless/ath5k/reset.c
+++ b/drivers/net/wireless/ath5k/reset.c
@@ -842,9 +842,7 @@ int ath5k_hw_reset(struct ath5k_hw *ah, enum nl80211_iftype op_mode,
 	 *
 	 * XXX: Find an interval that's OK for all cards...
 	 */
-	ret = ath5k_hw_noise_floor_calibration(ah, channel->center_freq);
-	if (ret)
-		return ret;
+	ath5k_hw_noise_floor_calibration(ah, channel->center_freq);
 
 	/*
 	 * Reset queues and start beacon timers at the end of the reset routine


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/kernel.spec,v
retrieving revision 1.893
retrieving revision 1.894
diff -u -r1.893 -r1.894
--- kernel.spec	12 Jan 2009 19:57:36 -0000	1.893
+++ kernel.spec	13 Jan 2009 21:07:14 -0000	1.894
@@ -629,6 +629,7 @@
 Patch670: linux-2.6-ata-quirk.patch
 
 Patch680: linux-2.6-iwlwifi-use-GFP_KERNEL-to-allocate-Rx-SKB-memory.patch
+Patch681: linux-2.6-ath5k-ignore-the-return-value-of-ath5k_hw_noise_floor_calibration.patch
 
 Patch690: linux-2.6-at76.patch
 
@@ -1151,6 +1152,9 @@
 # iwlwifi: use GFP_KERNEL to allocate Rx SKB memory
 ApplyPatch linux-2.6-iwlwifi-use-GFP_KERNEL-to-allocate-Rx-SKB-memory.patch
 
+# ath5k: ignore the return value of ath5k_hw_noise_floor_calibration
+ApplyPatch linux-2.6-ath5k-ignore-the-return-value-of-ath5k_hw_noise_floor_calibration.patch
+
 # Add misc wireless bits from upstream wireless tree
 ApplyPatch linux-2.6-at76.patch
 
@@ -1773,6 +1777,9 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Tue Jan 13 2009 John W. Linville <linville at redhat.com>
+- ath5k: ignore the return value of ath5k_hw_noise_floor_calibration
+
 * Mon Jan 12 2009 Kyle McMartin <kyle at redhat.com>
 - Rebase for Fedora 9.
 - Turn off CONFIG_MAXSMP on x86_64.



From pkgdb at fedoraproject.org  Tue Jan 13 21:13:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 21:13:51 +0000
Subject: [pkgdb] fsniper was added for jhrozek
Message-ID: <20090113211351.EE0E1208203@bastion.fedora.phx.redhat.com>

kevin has added Package fsniper with summary A tool that monitors directories for new files and invokes scripts on them
kevin has approved Package fsniper
kevin has added a Fedora devel branch for fsniper with an owner of jhrozek
kevin has approved fsniper in Fedora devel
kevin has approved Package fsniper
kevin has set commit to Approved for provenpackager on fsniper (Fedora devel)
kevin has set build to Approved for provenpackager on fsniper (Fedora devel)
kevin has set checkout to Approved for provenpackager on fsniper (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fsniper



From kevin at fedoraproject.org  Tue Jan 13 21:14:07 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 13 Jan 2009 21:14:07 +0000 (UTC)
Subject: rpms/fsniper - New directory
Message-ID: <20090113211407.2C3247013F@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/fsniper
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsQ10873/rpms/fsniper

Log Message:
Directory /cvs/pkgs/rpms/fsniper added to the repository




From pkgdb at fedoraproject.org  Tue Jan 13 21:13:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 21:13:53 +0000
Subject: [pkgdb] fsniper (Fedora, 9) updated by kevin
Message-ID: <20090113211353.5B077208457@bastion.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for fsniper
kevin has set commit to Approved for provenpackager on fsniper (Fedora 9)
kevin has set build to Approved for provenpackager on fsniper (Fedora 9)
kevin has set checkout to Approved for provenpackager on fsniper (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fsniper



From pkgdb at fedoraproject.org  Tue Jan 13 21:13:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 21:13:53 +0000
Subject: [pkgdb] fsniper (Fedora, 10) updated by kevin
Message-ID: <20090113211353.797B4208468@bastion.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for fsniper
kevin has set commit to Approved for provenpackager on fsniper (Fedora 10)
kevin has set build to Approved for provenpackager on fsniper (Fedora 10)
kevin has set checkout to Approved for provenpackager on fsniper (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fsniper



From kevin at fedoraproject.org  Tue Jan 13 21:14:07 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 13 Jan 2009 21:14:07 +0000 (UTC)
Subject: rpms/fsniper/devel - New directory
Message-ID: <20090113211407.6CE817013F@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/fsniper/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsQ10873/rpms/fsniper/devel

Log Message:
Directory /cvs/pkgs/rpms/fsniper/devel added to the repository




From kevin at fedoraproject.org  Tue Jan 13 21:14:26 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 13 Jan 2009 21:14:26 +0000 (UTC)
Subject: rpms/fsniper Makefile,NONE,1.1
Message-ID: <20090113211426.76F157013F@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/fsniper
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsQ10873/rpms/fsniper

Added Files:
	Makefile 
Log Message:
Setup of module fsniper


--- NEW FILE Makefile ---
# Top level Makefile for module fsniper
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Jan 13 21:14:26 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 13 Jan 2009 21:14:26 +0000 (UTC)
Subject: rpms/fsniper/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <20090113211426.D20867013F@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/fsniper/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsQ10873/rpms/fsniper/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module fsniper


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: fsniper
# $Id: Makefile,v 1.1 2009/01/13 21:14:26 kevin Exp $
NAME := fsniper
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Jan 13 21:14:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 21:14:57 +0000
Subject: [pkgdb] perl-Eval-Context was added for cweyl
Message-ID: <20090113211457.8B2FA2081FC@bastion.fedora.phx.redhat.com>

kevin has added Package perl-Eval-Context with summary Evaluate perl code in context wrapper
kevin has approved Package perl-Eval-Context
kevin has added a Fedora devel branch for perl-Eval-Context with an owner of cweyl
kevin has approved perl-Eval-Context in Fedora devel
kevin has approved Package perl-Eval-Context
kevin has set commit to Approved for provenpackager on perl-Eval-Context (Fedora devel)
kevin has set build to Approved for provenpackager on perl-Eval-Context (Fedora devel)
kevin has set checkout to Approved for provenpackager on perl-Eval-Context (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Eval-Context



From pkgdb at fedoraproject.org  Tue Jan 13 21:14:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 21:14:59 +0000
Subject: [pkgdb] perl-Eval-Context (Fedora, 9) updated by kevin
Message-ID: <20090113211459.535AC208467@bastion.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for perl-Eval-Context
kevin has set commit to Approved for provenpackager on perl-Eval-Context (Fedora 9)
kevin has set build to Approved for provenpackager on perl-Eval-Context (Fedora 9)
kevin has set checkout to Approved for provenpackager on perl-Eval-Context (Fedora 9)
kevin approved watchbugzilla on perl-Eval-Context (Fedora 9) for perl-sig
kevin approved watchcommits on perl-Eval-Context (Fedora 9) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Eval-Context



From pkgdb at fedoraproject.org  Tue Jan 13 21:14:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 21:14:59 +0000
Subject: [pkgdb] perl-Eval-Context (Fedora, devel) updated by kevin
Message-ID: <20090113211459.C530B208207@bastion.fedora.phx.redhat.com>

kevin approved watchbugzilla on perl-Eval-Context (Fedora devel) for perl-sig
kevin approved watchcommits on perl-Eval-Context (Fedora devel) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Eval-Context



From kevin at fedoraproject.org  Tue Jan 13 21:15:16 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 13 Jan 2009 21:15:16 +0000 (UTC)
Subject: rpms/perl-Eval-Context - New directory
Message-ID: <20090113211516.25EF57013F@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Eval-Context
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsC11111/rpms/perl-Eval-Context

Log Message:
Directory /cvs/pkgs/rpms/perl-Eval-Context added to the repository




From pkgdb at fedoraproject.org  Tue Jan 13 21:14:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 21:14:59 +0000
Subject: [pkgdb] perl-Eval-Context (Fedora, 10) updated by kevin
Message-ID: <20090113211459.F2ABA208469@bastion.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for perl-Eval-Context
kevin has set commit to Approved for provenpackager on perl-Eval-Context (Fedora 10)
kevin has set build to Approved for provenpackager on perl-Eval-Context (Fedora 10)
kevin has set checkout to Approved for provenpackager on perl-Eval-Context (Fedora 10)
kevin approved watchbugzilla on perl-Eval-Context (Fedora 10) for perl-sig
kevin approved watchcommits on perl-Eval-Context (Fedora 10) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Eval-Context



From kevin at fedoraproject.org  Tue Jan 13 21:15:16 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 13 Jan 2009 21:15:16 +0000 (UTC)
Subject: rpms/perl-Eval-Context/devel - New directory
Message-ID: <20090113211516.64F147013F@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Eval-Context/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsC11111/rpms/perl-Eval-Context/devel

Log Message:
Directory /cvs/pkgs/rpms/perl-Eval-Context/devel added to the repository




From kevin at fedoraproject.org  Tue Jan 13 21:15:35 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 13 Jan 2009 21:15:35 +0000 (UTC)
Subject: rpms/perl-Eval-Context Makefile,NONE,1.1
Message-ID: <20090113211535.6092F7013F@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Eval-Context
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsC11111/rpms/perl-Eval-Context

Added Files:
	Makefile 
Log Message:
Setup of module perl-Eval-Context


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Eval-Context
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Jan 13 21:15:35 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 13 Jan 2009 21:15:35 +0000 (UTC)
Subject: rpms/perl-Eval-Context/devel .cvsignore, NONE, 1.1 Makefile, NONE, 
	1.1 sources, NONE, 1.1
Message-ID: <20090113211535.ABFC17013F@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Eval-Context/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsC11111/rpms/perl-Eval-Context/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Eval-Context


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: perl-Eval-Context
# $Id: Makefile,v 1.1 2009/01/13 21:15:35 kevin Exp $
NAME := perl-Eval-Context
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Jan 13 21:15:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 21:15:57 +0000
Subject: [pkgdb] hyphen-uk was added for caolanm
Message-ID: <20090113211557.A1F00208207@bastion.fedora.phx.redhat.com>

kevin has added Package hyphen-uk with summary Ukrainian hyphenation rules
kevin has approved Package hyphen-uk
kevin has added a Fedora devel branch for hyphen-uk with an owner of caolanm
kevin has approved hyphen-uk in Fedora devel
kevin has approved Package hyphen-uk
kevin has set commit to Approved for provenpackager on hyphen-uk (Fedora devel)
kevin has set build to Approved for provenpackager on hyphen-uk (Fedora devel)
kevin has set checkout to Approved for provenpackager on hyphen-uk (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/hyphen-uk



From kevin at fedoraproject.org  Tue Jan 13 21:16:12 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 13 Jan 2009 21:16:12 +0000 (UTC)
Subject: rpms/hyphen-uk - New directory
Message-ID: <20090113211612.2A3C77013F@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/hyphen-uk
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsT11403/rpms/hyphen-uk

Log Message:
Directory /cvs/pkgs/rpms/hyphen-uk added to the repository




From kevin at fedoraproject.org  Tue Jan 13 21:16:12 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 13 Jan 2009 21:16:12 +0000 (UTC)
Subject: rpms/hyphen-uk/devel - New directory
Message-ID: <20090113211612.682B57013F@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/hyphen-uk/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsT11403/rpms/hyphen-uk/devel

Log Message:
Directory /cvs/pkgs/rpms/hyphen-uk/devel added to the repository




From kevin at fedoraproject.org  Tue Jan 13 21:16:31 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 13 Jan 2009 21:16:31 +0000 (UTC)
Subject: rpms/hyphen-uk Makefile,NONE,1.1
Message-ID: <20090113211631.0D8137013F@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/hyphen-uk
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsT11403/rpms/hyphen-uk

Added Files:
	Makefile 
Log Message:
Setup of module hyphen-uk


--- NEW FILE Makefile ---
# Top level Makefile for module hyphen-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  Tue Jan 13 21:16:31 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 13 Jan 2009 21:16:31 +0000 (UTC)
Subject: rpms/hyphen-uk/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090113211631.51FE17013F@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/hyphen-uk/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsT11403/rpms/hyphen-uk/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module hyphen-uk


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: hyphen-uk
# $Id: Makefile,v 1.1 2009/01/13 21:16:31 kevin Exp $
NAME := hyphen-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  Tue Jan 13 21:17:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 21:17:13 +0000
Subject: [pkgdb] hyphen-mi was added for caolanm
Message-ID: <20090113211713.C7E02208203@bastion.fedora.phx.redhat.com>

kevin has added Package hyphen-mi with summary Maori hyphenation rules
kevin has approved Package hyphen-mi
kevin has added a Fedora devel branch for hyphen-mi with an owner of caolanm
kevin has approved hyphen-mi in Fedora devel
kevin has approved Package hyphen-mi
kevin has set commit to Approved for provenpackager on hyphen-mi (Fedora devel)
kevin has set build to Approved for provenpackager on hyphen-mi (Fedora devel)
kevin has set checkout to Approved for provenpackager on hyphen-mi (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/hyphen-mi



From kevin at fedoraproject.org  Tue Jan 13 21:17:29 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 13 Jan 2009 21:17:29 +0000 (UTC)
Subject: rpms/hyphen-mi - New directory
Message-ID: <20090113211729.2B20A70141@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/hyphen-mi
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsq11545/rpms/hyphen-mi

Log Message:
Directory /cvs/pkgs/rpms/hyphen-mi added to the repository




From kevin at fedoraproject.org  Tue Jan 13 21:17:29 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 13 Jan 2009 21:17:29 +0000 (UTC)
Subject: rpms/hyphen-mi/devel - New directory
Message-ID: <20090113211729.71A4670141@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/hyphen-mi/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsq11545/rpms/hyphen-mi/devel

Log Message:
Directory /cvs/pkgs/rpms/hyphen-mi/devel added to the repository




From kevin at fedoraproject.org  Tue Jan 13 21:17:50 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 13 Jan 2009 21:17:50 +0000 (UTC)
Subject: rpms/hyphen-mi Makefile,NONE,1.1
Message-ID: <20090113211750.551DB70141@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/hyphen-mi
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsq11545/rpms/hyphen-mi

Added Files:
	Makefile 
Log Message:
Setup of module hyphen-mi


--- NEW FILE Makefile ---
# Top level Makefile for module hyphen-mi
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Jan 13 21:17:50 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 13 Jan 2009 21:17:50 +0000 (UTC)
Subject: rpms/hyphen-mi/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090113211750.C18C570141@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/hyphen-mi/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsq11545/rpms/hyphen-mi/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module hyphen-mi


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: hyphen-mi
# $Id: Makefile,v 1.1 2009/01/13 21:17:50 kevin Exp $
NAME := hyphen-mi
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Jan 13 21:17:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 21:17:59 +0000
Subject: [pkgdb] perl-Time-Duration-Parse was added for cweyl
Message-ID: <20090113211759.E45AD2081FB@bastion.fedora.phx.redhat.com>

kevin has added Package perl-Time-Duration-Parse with summary Parse string that represents time duration
kevin has approved Package perl-Time-Duration-Parse
kevin has added a Fedora devel branch for perl-Time-Duration-Parse with an owner of cweyl
kevin has approved perl-Time-Duration-Parse in Fedora devel
kevin has approved Package perl-Time-Duration-Parse
kevin has set commit to Approved for provenpackager on perl-Time-Duration-Parse (Fedora devel)
kevin has set build to Approved for provenpackager on perl-Time-Duration-Parse (Fedora devel)
kevin has set checkout to Approved for provenpackager on perl-Time-Duration-Parse (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Time-Duration-Parse



From pkgdb at fedoraproject.org  Tue Jan 13 21:18:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 21:18:01 +0000
Subject: [pkgdb] perl-Time-Duration-Parse (Fedora, 9) updated by kevin
Message-ID: <20090113211801.5B601208456@bastion.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for perl-Time-Duration-Parse
kevin has set commit to Approved for provenpackager on perl-Time-Duration-Parse (Fedora 9)
kevin has set build to Approved for provenpackager on perl-Time-Duration-Parse (Fedora 9)
kevin has set checkout to Approved for provenpackager on perl-Time-Duration-Parse (Fedora 9)
kevin approved watchbugzilla on perl-Time-Duration-Parse (Fedora 9) for perl-sig
kevin approved watchcommits on perl-Time-Duration-Parse (Fedora 9) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Time-Duration-Parse



From pkgdb at fedoraproject.org  Tue Jan 13 21:18:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 21:18:01 +0000
Subject: [pkgdb] perl-Time-Duration-Parse (Fedora, devel) updated by kevin
Message-ID: <20090113211801.81A7D208467@bastion.fedora.phx.redhat.com>

kevin approved watchbugzilla on perl-Time-Duration-Parse (Fedora devel) for perl-sig
kevin approved watchcommits on perl-Time-Duration-Parse (Fedora devel) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Time-Duration-Parse



From pkgdb at fedoraproject.org  Tue Jan 13 21:18:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 21:18:01 +0000
Subject: [pkgdb] perl-Time-Duration-Parse (Fedora, 10) updated by kevin
Message-ID: <20090113211801.9F55620846B@bastion.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for perl-Time-Duration-Parse
kevin has set commit to Approved for provenpackager on perl-Time-Duration-Parse (Fedora 10)
kevin has set build to Approved for provenpackager on perl-Time-Duration-Parse (Fedora 10)
kevin has set checkout to Approved for provenpackager on perl-Time-Duration-Parse (Fedora 10)
kevin approved watchbugzilla on perl-Time-Duration-Parse (Fedora 10) for perl-sig
kevin approved watchcommits on perl-Time-Duration-Parse (Fedora 10) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Time-Duration-Parse



From kevin at fedoraproject.org  Tue Jan 13 21:18:15 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 13 Jan 2009 21:18:15 +0000 (UTC)
Subject: rpms/perl-Time-Duration-Parse - New directory
Message-ID: <20090113211815.2DC287013F@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Time-Duration-Parse
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsK12187/rpms/perl-Time-Duration-Parse

Log Message:
Directory /cvs/pkgs/rpms/perl-Time-Duration-Parse added to the repository




From kevin at fedoraproject.org  Tue Jan 13 21:18:15 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 13 Jan 2009 21:18:15 +0000 (UTC)
Subject: rpms/perl-Time-Duration-Parse/devel - New directory
Message-ID: <20090113211815.71A527013F@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Time-Duration-Parse/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsK12187/rpms/perl-Time-Duration-Parse/devel

Log Message:
Directory /cvs/pkgs/rpms/perl-Time-Duration-Parse/devel added to the repository




From kevin at fedoraproject.org  Tue Jan 13 21:18:35 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 13 Jan 2009 21:18:35 +0000 (UTC)
Subject: rpms/perl-Time-Duration-Parse Makefile,NONE,1.1
Message-ID: <20090113211835.A2B8E7013F@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Time-Duration-Parse
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsK12187/rpms/perl-Time-Duration-Parse

Added Files:
	Makefile 
Log Message:
Setup of module perl-Time-Duration-Parse


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Time-Duration-Parse
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Jan 13 21:18:35 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 13 Jan 2009 21:18:35 +0000 (UTC)
Subject: rpms/perl-Time-Duration-Parse/devel .cvsignore, NONE, 1.1 Makefile, 
	NONE, 1.1 sources, NONE, 1.1
Message-ID: <20090113211835.EDFA87013F@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Time-Duration-Parse/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsK12187/rpms/perl-Time-Duration-Parse/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Time-Duration-Parse


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: perl-Time-Duration-Parse
# $Id: Makefile,v 1.1 2009/01/13 21:18:35 kevin Exp $
NAME := perl-Time-Duration-Parse
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Jan 13 21:18:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 21:18:53 +0000
Subject: [pkgdb] perl-DateTimeX-Easy was added for cweyl
Message-ID: <20090113211853.0E20C2081FB@bastion.fedora.phx.redhat.com>

kevin has added Package perl-DateTimeX-Easy with summary Parse a date/time string using the best method available
kevin has approved Package perl-DateTimeX-Easy
kevin has added a Fedora devel branch for perl-DateTimeX-Easy with an owner of cweyl
kevin has approved perl-DateTimeX-Easy in Fedora devel
kevin has approved Package perl-DateTimeX-Easy
kevin has set commit to Approved for provenpackager on perl-DateTimeX-Easy (Fedora devel)
kevin has set build to Approved for provenpackager on perl-DateTimeX-Easy (Fedora devel)
kevin has set checkout to Approved for provenpackager on perl-DateTimeX-Easy (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-DateTimeX-Easy



From pkgdb at fedoraproject.org  Tue Jan 13 21:18:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 21:18:54 +0000
Subject: [pkgdb] perl-DateTimeX-Easy (Fedora, 9) updated by kevin
Message-ID: <20090113211854.D9E99208207@bastion.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for perl-DateTimeX-Easy
kevin has set commit to Approved for provenpackager on perl-DateTimeX-Easy (Fedora 9)
kevin has set build to Approved for provenpackager on perl-DateTimeX-Easy (Fedora 9)
kevin has set checkout to Approved for provenpackager on perl-DateTimeX-Easy (Fedora 9)
kevin approved watchbugzilla on perl-DateTimeX-Easy (Fedora 9) for perl-sig
kevin approved watchcommits on perl-DateTimeX-Easy (Fedora 9) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-DateTimeX-Easy



From pkgdb at fedoraproject.org  Tue Jan 13 21:18:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 21:18:54 +0000
Subject: [pkgdb] perl-DateTimeX-Easy (Fedora, devel) updated by kevin
Message-ID: <20090113211855.4B672208469@bastion.fedora.phx.redhat.com>

kevin approved watchbugzilla on perl-DateTimeX-Easy (Fedora devel) for perl-sig
kevin approved watchcommits on perl-DateTimeX-Easy (Fedora devel) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-DateTimeX-Easy



From pkgdb at fedoraproject.org  Tue Jan 13 21:18:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 21:18:54 +0000
Subject: [pkgdb] perl-DateTimeX-Easy (Fedora, 10) updated by kevin
Message-ID: <20090113211855.10308208458@bastion.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for perl-DateTimeX-Easy
kevin has set commit to Approved for provenpackager on perl-DateTimeX-Easy (Fedora 10)
kevin has set build to Approved for provenpackager on perl-DateTimeX-Easy (Fedora 10)
kevin has set checkout to Approved for provenpackager on perl-DateTimeX-Easy (Fedora 10)
kevin approved watchbugzilla on perl-DateTimeX-Easy (Fedora 10) for perl-sig
kevin approved watchcommits on perl-DateTimeX-Easy (Fedora 10) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-DateTimeX-Easy



From kevin at fedoraproject.org  Tue Jan 13 21:19:10 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 13 Jan 2009 21:19:10 +0000 (UTC)
Subject: rpms/perl-DateTimeX-Easy - New directory
Message-ID: <20090113211910.2912D7013F@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-DateTimeX-Easy
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsp12509/rpms/perl-DateTimeX-Easy

Log Message:
Directory /cvs/pkgs/rpms/perl-DateTimeX-Easy added to the repository




From kevin at fedoraproject.org  Tue Jan 13 21:19:10 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 13 Jan 2009 21:19:10 +0000 (UTC)
Subject: rpms/perl-DateTimeX-Easy/devel - New directory
Message-ID: <20090113211910.6902370142@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-DateTimeX-Easy/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsp12509/rpms/perl-DateTimeX-Easy/devel

Log Message:
Directory /cvs/pkgs/rpms/perl-DateTimeX-Easy/devel added to the repository




From kevin at fedoraproject.org  Tue Jan 13 21:19:29 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 13 Jan 2009 21:19:29 +0000 (UTC)
Subject: rpms/perl-DateTimeX-Easy Makefile,NONE,1.1
Message-ID: <20090113211929.C972A7013F@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-DateTimeX-Easy
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsp12509/rpms/perl-DateTimeX-Easy

Added Files:
	Makefile 
Log Message:
Setup of module perl-DateTimeX-Easy


--- NEW FILE Makefile ---
# Top level Makefile for module perl-DateTimeX-Easy
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Jan 13 21:19:30 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 13 Jan 2009 21:19:30 +0000 (UTC)
Subject: rpms/perl-DateTimeX-Easy/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090113211930.1F81E7013F@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-DateTimeX-Easy/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsp12509/rpms/perl-DateTimeX-Easy/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-DateTimeX-Easy


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: perl-DateTimeX-Easy
# $Id: Makefile,v 1.1 2009/01/13 21:19:29 kevin Exp $
NAME := perl-DateTimeX-Easy
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Jan 13 21:19:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 21:19:39 +0000
Subject: [pkgdb] perl-MooseX-Role-Parameterized was added for cweyl
Message-ID: <20090113211939.417942081FB@bastion.fedora.phx.redhat.com>

kevin has added Package perl-MooseX-Role-Parameterized with summary parameterized roles
kevin has approved Package perl-MooseX-Role-Parameterized
kevin has added a Fedora devel branch for perl-MooseX-Role-Parameterized with an owner of cweyl
kevin has approved perl-MooseX-Role-Parameterized in Fedora devel
kevin has approved Package perl-MooseX-Role-Parameterized
kevin has set commit to Approved for provenpackager on perl-MooseX-Role-Parameterized (Fedora devel)
kevin has set build to Approved for provenpackager on perl-MooseX-Role-Parameterized (Fedora devel)
kevin has set checkout to Approved for provenpackager on perl-MooseX-Role-Parameterized (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-MooseX-Role-Parameterized



From pkgdb at fedoraproject.org  Tue Jan 13 21:19:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 21:19:41 +0000
Subject: [pkgdb] perl-MooseX-Role-Parameterized (Fedora, 9) updated by kevin
Message-ID: <20090113211941.7623D208207@bastion.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for perl-MooseX-Role-Parameterized
kevin has set commit to Approved for provenpackager on perl-MooseX-Role-Parameterized (Fedora 9)
kevin has set build to Approved for provenpackager on perl-MooseX-Role-Parameterized (Fedora 9)
kevin has set checkout to Approved for provenpackager on perl-MooseX-Role-Parameterized (Fedora 9)
kevin approved watchbugzilla on perl-MooseX-Role-Parameterized (Fedora 9) for perl-sig
kevin approved watchcommits on perl-MooseX-Role-Parameterized (Fedora 9) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-MooseX-Role-Parameterized



From pkgdb at fedoraproject.org  Tue Jan 13 21:19:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 21:19:41 +0000
Subject: [pkgdb] perl-MooseX-Role-Parameterized (Fedora,
	devel) updated by kevin
Message-ID: <20090113211941.80AD620846C@bastion.fedora.phx.redhat.com>

kevin approved watchbugzilla on perl-MooseX-Role-Parameterized (Fedora devel) for perl-sig
kevin approved watchcommits on perl-MooseX-Role-Parameterized (Fedora devel) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-MooseX-Role-Parameterized



From pkgdb at fedoraproject.org  Tue Jan 13 21:19:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 21:19:41 +0000
Subject: [pkgdb] perl-MooseX-Role-Parameterized (Fedora, 10) updated by kevin
Message-ID: <20090113211941.9448C208471@bastion.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for perl-MooseX-Role-Parameterized
kevin has set commit to Approved for provenpackager on perl-MooseX-Role-Parameterized (Fedora 10)
kevin has set build to Approved for provenpackager on perl-MooseX-Role-Parameterized (Fedora 10)
kevin has set checkout to Approved for provenpackager on perl-MooseX-Role-Parameterized (Fedora 10)
kevin approved watchbugzilla on perl-MooseX-Role-Parameterized (Fedora 10) for perl-sig
kevin approved watchcommits on perl-MooseX-Role-Parameterized (Fedora 10) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-MooseX-Role-Parameterized



From kevin at fedoraproject.org  Tue Jan 13 21:19:59 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 13 Jan 2009 21:19:59 +0000 (UTC)
Subject: rpms/perl-MooseX-Role-Parameterized - New directory
Message-ID: <20090113211959.375A27013F@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-MooseX-Role-Parameterized
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsp12778/rpms/perl-MooseX-Role-Parameterized

Log Message:
Directory /cvs/pkgs/rpms/perl-MooseX-Role-Parameterized added to the repository




From kevin at fedoraproject.org  Tue Jan 13 21:19:59 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 13 Jan 2009 21:19:59 +0000 (UTC)
Subject: rpms/perl-MooseX-Role-Parameterized/devel - New directory
Message-ID: <20090113211959.94B907013F@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-MooseX-Role-Parameterized/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsp12778/rpms/perl-MooseX-Role-Parameterized/devel

Log Message:
Directory /cvs/pkgs/rpms/perl-MooseX-Role-Parameterized/devel added to the repository




From kevin at fedoraproject.org  Tue Jan 13 21:20:19 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 13 Jan 2009 21:20:19 +0000 (UTC)
Subject: rpms/perl-MooseX-Role-Parameterized Makefile,NONE,1.1
Message-ID: <20090113212019.8FA037013F@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-MooseX-Role-Parameterized
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsp12778/rpms/perl-MooseX-Role-Parameterized

Added Files:
	Makefile 
Log Message:
Setup of module perl-MooseX-Role-Parameterized


--- NEW FILE Makefile ---
# Top level Makefile for module perl-MooseX-Role-Parameterized
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Jan 13 21:20:19 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 13 Jan 2009 21:20:19 +0000 (UTC)
Subject: rpms/perl-MooseX-Role-Parameterized/devel .cvsignore, NONE,
	1.1 Makefile, NONE, 1.1 sources, NONE, 1.1
Message-ID: <20090113212019.E4A827013F@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-MooseX-Role-Parameterized/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsp12778/rpms/perl-MooseX-Role-Parameterized/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-MooseX-Role-Parameterized


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: perl-MooseX-Role-Parameterized
# $Id: Makefile,v 1.1 2009/01/13 21:20:19 kevin Exp $
NAME := perl-MooseX-Role-Parameterized
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Jan 13 21:20:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 21:20:23 +0000
Subject: [pkgdb] hunspell-no (Fedora, 10) updated by kevin
Message-ID: <20090113212023.E70F6208481@bastion.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for hunspell-no
kevin has set commit to Approved for provenpackager on hunspell-no (Fedora 10)
kevin has set build to Approved for provenpackager on hunspell-no (Fedora 10)
kevin has set checkout to Approved for provenpackager on hunspell-no (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/hunspell-no



From kyle at fedoraproject.org  Tue Jan 13 21:23:25 2009
From: kyle at fedoraproject.org (Kyle McMartin)
Date: Tue, 13 Jan 2009 21:23:25 +0000 (UTC)
Subject: rpms/kernel/devel config-x86-generic, 1.59,
	1.60 config-x86_64-generic, 1.62, 1.63 kernel.spec, 1.1212, 1.1213
Message-ID: <20090113212325.5FEF87013F@cvs1.fedora.phx.redhat.com>

Author: kyle

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13347

Modified Files:
	config-x86-generic config-x86_64-generic kernel.spec 
Log Message:
* Tue Jan 13 2009 Kyle McMartin <kyle at redhat.com>
- Enable CONFIG_DMAR (and GFX_WA and FLOPPY_WA) requested by Gerd.



Index: config-x86-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-x86-generic,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- config-x86-generic	9 Jan 2009 05:13:21 -0000	1.59
+++ config-x86-generic	13 Jan 2009 21:22:54 -0000	1.60
@@ -224,7 +224,6 @@
 CONFIG_PCI_DIRECT=y
 CONFIG_PCI_MMCONFIG=y
 CONFIG_PCI_BIOS=y
-# CONFIG_DMAR is not set
 
 CONFIG_HOTPLUG_PCI=y
 CONFIG_HOTPLUG_PCI_COMPAQ=m


Index: config-x86_64-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-x86_64-generic,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- config-x86_64-generic	12 Jan 2009 00:15:28 -0000	1.62
+++ config-x86_64-generic	13 Jan 2009 21:22:54 -0000	1.63
@@ -27,7 +27,9 @@
 # CONFIG_EDD_OFF is not set
 CONFIG_PCI_BIOS=y
 CONFIG_PCI_MMCONFIG=y
-# CONFIG_DMAR is not set
+CONFIG_DMAR=y
+CONFIG_DMAR_GFX_WA=y
+CONFIG_DMAR_FLOPPY_WA=y
 
 CONFIG_EFI=y
 CONFIG_EFI_VARS=y


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1212
retrieving revision 1.1213
diff -u -r1.1212 -r1.1213
--- kernel.spec	13 Jan 2009 17:45:52 -0000	1.1212
+++ kernel.spec	13 Jan 2009 21:22:54 -0000	1.1213
@@ -1736,6 +1736,9 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Tue Jan 13 2009 Kyle McMartin <kyle at redhat.com>
+- Enable CONFIG_DMAR (and GFX_WA and FLOPPY_WA) requested by Gerd.
+
 * Tue Jan 13 2009 Dave Jones <davej at redhat.com>
 - 2.6.29-rc1-git3
 



From pkgdb at fedoraproject.org  Tue Jan 13 21:23:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 21:23:48 +0000
Subject: [pkgdb] netbeans-platform was added for victorv
Message-ID: <20090113212348.70F7E208203@bastion.fedora.phx.redhat.com>

kevin has added Package netbeans-platform with summary NetBeans Platform
kevin has approved Package netbeans-platform
kevin has added a Fedora devel branch for netbeans-platform with an owner of victorv
kevin has approved netbeans-platform in Fedora devel
kevin has approved Package netbeans-platform
kevin has set commit to Approved for provenpackager on netbeans-platform (Fedora devel)
kevin has set build to Approved for provenpackager on netbeans-platform (Fedora devel)
kevin has set checkout to Approved for provenpackager on netbeans-platform (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/netbeans-platform



From pkgdb at fedoraproject.org  Tue Jan 13 21:23:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 21:23:51 +0000
Subject: [pkgdb] netbeans-platform (Fedora EPEL, 5) updated by kevin
Message-ID: <20090113212351.879CB208457@bastion.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for netbeans-platform
kevin has set commit to Approved for provenpackager on netbeans-platform (Fedora EPEL 5)
kevin has set build to Approved for provenpackager on netbeans-platform (Fedora EPEL 5)
kevin has set checkout to Approved for provenpackager on netbeans-platform (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/netbeans-platform



From kevin at fedoraproject.org  Tue Jan 13 21:24:03 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 13 Jan 2009 21:24:03 +0000 (UTC)
Subject: rpms/netbeans-platform - New directory
Message-ID: <20090113212403.25CC37013F@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/netbeans-platform
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsJ13576/rpms/netbeans-platform

Log Message:
Directory /cvs/pkgs/rpms/netbeans-platform added to the repository




From pkgdb at fedoraproject.org  Tue Jan 13 21:23:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 21:23:51 +0000
Subject: [pkgdb] netbeans-platform (Fedora, 10) updated by kevin
Message-ID: <20090113212351.B8468208468@bastion.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for netbeans-platform
kevin has set commit to Approved for provenpackager on netbeans-platform (Fedora 10)
kevin has set build to Approved for provenpackager on netbeans-platform (Fedora 10)
kevin has set checkout to Approved for provenpackager on netbeans-platform (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/netbeans-platform



From kevin at fedoraproject.org  Tue Jan 13 21:24:03 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 13 Jan 2009 21:24:03 +0000 (UTC)
Subject: rpms/netbeans-platform/devel - New directory
Message-ID: <20090113212403.6AEC37013F@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/netbeans-platform/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsJ13576/rpms/netbeans-platform/devel

Log Message:
Directory /cvs/pkgs/rpms/netbeans-platform/devel added to the repository




From kevin at fedoraproject.org  Tue Jan 13 21:24:20 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 13 Jan 2009 21:24:20 +0000 (UTC)
Subject: rpms/netbeans-platform Makefile,NONE,1.1
Message-ID: <20090113212420.D4E5F7013F@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/netbeans-platform
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsJ13576/rpms/netbeans-platform

Added Files:
	Makefile 
Log Message:
Setup of module netbeans-platform


--- NEW FILE Makefile ---
# Top level Makefile for module netbeans-platform
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Tue Jan 13 21:24:21 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 13 Jan 2009 21:24:21 +0000 (UTC)
Subject: rpms/netbeans-platform/devel .cvsignore, NONE, 1.1 Makefile, NONE, 
	1.1 sources, NONE, 1.1
Message-ID: <20090113212421.192477013F@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/netbeans-platform/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsJ13576/rpms/netbeans-platform/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module netbeans-platform


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: netbeans-platform
# $Id: Makefile,v 1.1 2009/01/13 21:24:20 kevin Exp $
NAME := netbeans-platform
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From lkundrak at fedoraproject.org  Tue Jan 13 21:26:20 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Tue, 13 Jan 2009 21:26:20 +0000 (UTC)
Subject: rpms/inkscape/devel inkscape-0.46-bitmap-fonts.patch, NONE,
	1.1 inkscape.spec, 1.59, 1.60
Message-ID: <20090113212620.74FB47013F@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/inkscape/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13923

Modified Files:
	inkscape.spec 
Added Files:
	inkscape-0.46-bitmap-fonts.patch 
Log Message:
* Tue Jan 13 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.46-9
- Fix crash with bitmap font (#477158)


inkscape-0.46-bitmap-fonts.patch:

--- NEW FILE inkscape-0.46-bitmap-fonts.patch ---
Fix crash with bitmap fonts. Fixes #477158
https://bugzilla.redhat.com/show_bug.cgi?id=477158

Comes from this upstream commit:

r19758 | buliabyak | 2008-08-28 20:35:16 +0200 (Thu, 28 Aug 2008) | 1 line
null check fixes patch from bug 261475

diff -up inkscape-0.46/src/libnrtype/FontFactory.cpp.bitmap-fonts inkscape-0.46/src/libnrtype/FontFactory.cpp
--- inkscape-0.46/src/libnrtype/FontFactory.cpp.bitmap-fonts	2008-03-11 05:20:29.000000000 +0100
+++ inkscape-0.46/src/libnrtype/FontFactory.cpp	2009-01-13 21:37:13.000000000 +0100
@@ -817,7 +817,8 @@ font_instance *font_factory::Face(PangoF
         res->Ref();
         AddInCache(res);
     }
-    res->InitTheFace();
+    if(res)
+	res->InitTheFace();
     return res;
 }
 
diff -up inkscape-0.46/src/libnrtype/Layout-TNG-Compute.cpp.bitmap-fonts inkscape-0.46/src/libnrtype/Layout-TNG-Compute.cpp
--- inkscape-0.46/src/libnrtype/Layout-TNG-Compute.cpp.bitmap-fonts	2008-03-11 05:20:29.000000000 +0100
+++ inkscape-0.46/src/libnrtype/Layout-TNG-Compute.cpp	2009-01-13 21:37:13.000000000 +0100
@@ -475,9 +475,9 @@ class Layout::Calculator
                 new_span.in_input_stream_item = unbroken_span.input_index;
                 new_span.baseline_shift = _y_offset;
                 new_span.block_progression = _block_progression;
-                if (_flow._input_stream[unbroken_span.input_index]->Type() == TEXT_SOURCE) {
-                    new_span.font = para.pango_items[unbroken_span.pango_item_index].font;
-                    new_span.font->Ref();
+                if ((_flow._input_stream[unbroken_span.input_index]->Type() == TEXT_SOURCE) && (new_span.font = para.pango_items[unbroken_span.pango_item_index].font))
+                    {
+		    new_span.font->Ref();
                     new_span.font_size = unbroken_span.font_size;
                     new_span.direction = para.pango_items[unbroken_span.pango_item_index].item->analysis.level & 1 ? RIGHT_TO_LEFT : LEFT_TO_RIGHT;
                     new_span.input_stream_first_character = Glib::ustring::const_iterator(unbroken_span.input_stream_first_character.base() + it_span->start.char_byte);
@@ -562,7 +562,7 @@ class Layout::Calculator
                             new_glyph.x = x + unbroken_span.glyph_string->glyphs[glyph_index].geometry.x_offset * font_size_multiplier;
                             new_glyph.y = _y_offset + unbroken_span.glyph_string->glyphs[glyph_index].geometry.y_offset * font_size_multiplier;
                             new_glyph.width = unbroken_span.glyph_string->glyphs[glyph_index].geometry.width * font_size_multiplier;
-                            if (new_glyph.width == 0)
+                            if ((new_glyph.width == 0) && (para.pango_items[unbroken_span.pango_item_index].font))
                                 new_glyph.width = new_span.font_size * para.pango_items[unbroken_span.pango_item_index].font->Advance(unbroken_span.glyph_string->glyphs[glyph_index].glyph, false);
                                 // for some reason pango returns zero width for invalid glyph characters (those empty boxes), so go to freetype for the info
                         }
@@ -903,7 +903,8 @@ void Layout::Calculator::_computeFontLin
         line_height->setZero();
         *line_height_multiplier = 1.0;
     }
-    font->FontMetrics(line_height->ascent, line_height->descent, line_height->leading);
+    else
+	font->FontMetrics(line_height->ascent, line_height->descent, line_height->leading);
     *line_height *= font_size;
 
     // yet another borked SPStyle member that we're going to have to fix ourselves
diff -up inkscape-0.46/src/libnrtype/Layout-TNG-Output.cpp.bitmap-fonts inkscape-0.46/src/libnrtype/Layout-TNG-Output.cpp
--- inkscape-0.46/src/libnrtype/Layout-TNG-Output.cpp.bitmap-fonts	2008-03-11 05:20:29.000000000 +0100
+++ inkscape-0.46/src/libnrtype/Layout-TNG-Output.cpp	2009-01-13 21:39:18.000000000 +0100
@@ -112,21 +112,23 @@ void Layout::getBoundingBox(NRRect *boun
         _getGlyphTransformMatrix(glyph_index, &glyph_matrix);
         NR::Matrix total_transform = glyph_matrix;
         total_transform *= transform;
-        NR::Maybe<NR::Rect> glyph_rect = _glyphs[glyph_index].span(this).font->BBox(_glyphs[glyph_index].glyph);
-        if (glyph_rect) {
-            NR::Point bmi = glyph_rect->min(), bma = glyph_rect->max();
-            NR::Point tlp(bmi[0],bmi[1]), trp(bma[0],bmi[1]), blp(bmi[0],bma[1]), brp(bma[0],bma[1]);
-            tlp *= total_transform;
-            trp *= total_transform;
-            blp *= total_transform;
-            brp *= total_transform;
-            *glyph_rect = NR::Rect(tlp,trp);
-            glyph_rect->expandTo(blp);
-            glyph_rect->expandTo(brp);
-            if ( (glyph_rect->min())[0] < bounding_box->x0 ) bounding_box->x0=(glyph_rect->min())[0];
-            if ( (glyph_rect->max())[0] > bounding_box->x1 ) bounding_box->x1=(glyph_rect->max())[0];
-            if ( (glyph_rect->min())[1] < bounding_box->y0 ) bounding_box->y0=(glyph_rect->min())[1];
-            if ( (glyph_rect->max())[1] > bounding_box->y1 ) bounding_box->y1=(glyph_rect->max())[1];
+        if (_glyphs[glyph_index].span(this).font) {
+            NR::Maybe<NR::Rect> glyph_rect = _glyphs[glyph_index].span(this).font->BBox(_glyphs[glyph_index].glyph);
+            if (glyph_rect) {
+                NR::Point bmi = glyph_rect->min(), bma = glyph_rect->max();
+                NR::Point tlp(bmi[0],bmi[1]), trp(bma[0],bmi[1]), blp(bmi[0],bma[1]), brp(bma[0],bma[1]);
+                tlp *= total_transform;
+                trp *= total_transform;
+                blp *= total_transform;
+                brp *= total_transform;
+                *glyph_rect = NR::Rect(tlp,trp);
+                glyph_rect->expandTo(blp);
+                glyph_rect->expandTo(brp);
+                if ( (glyph_rect->min())[0] < bounding_box->x0 ) bounding_box->x0=(glyph_rect->min())[0];
+                if ( (glyph_rect->max())[0] > bounding_box->x1 ) bounding_box->x1=(glyph_rect->max())[0];
+                if ( (glyph_rect->min())[1] < bounding_box->y0 ) bounding_box->y0=(glyph_rect->min())[1];
+                if ( (glyph_rect->max())[1] > bounding_box->y1 ) bounding_box->y1=(glyph_rect->max())[1];
+            }
         }
     }
 }


Index: inkscape.spec
===================================================================
RCS file: /cvs/pkgs/rpms/inkscape/devel/inkscape.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- inkscape.spec	1 Dec 2008 05:03:49 -0000	1.59
+++ inkscape.spec	13 Jan 2009 21:25:50 -0000	1.60
@@ -1,6 +1,6 @@
 Name:           inkscape
 Version:        0.46
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        Vector-based drawing program using SVG
 
 Group:          Applications/Productivity
@@ -16,6 +16,7 @@
 Patch6:         inkscape-0.46-poppler-0.8.3.patch
 Patch7:         inkscape-0.46-uniconv.patch
 Patch8:         inkscape-0.46-colors.patch
+Patch9:         inkscape-0.46-bitmap-fonts.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -144,12 +145,15 @@
 
 
 %changelog
+* Tue Jan 13 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.46-9
+- Fix crash with bitmap font (#477158)
+
 * Sun Nov 30 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 0.46-8
 - Rebuild for Python 2.6
 
 * Fri Nov 28 2008 Caol??n McNamara <caolanm at redhat.com> - 0.46-7
 - rebuild for dependencies
-
+ 
 * Fri Oct 17 2008 Lubomir Rintel <lkundrak at v3.sk> - 0.46-6
 - Fix color sliders with recent GTK (#467431)
 



From lkundrak at fedoraproject.org  Tue Jan 13 21:29:43 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Tue, 13 Jan 2009 21:29:43 +0000 (UTC)
Subject: rpms/inkscape/F-10 inkscape.spec,1.58,1.59
Message-ID: <20090113212943.CD5787013F@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/inkscape/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14335

Modified Files:
	inkscape.spec 
Log Message:
Apply the patch, fix the NVR


Index: inkscape.spec
===================================================================
RCS file: /cvs/pkgs/rpms/inkscape/F-10/inkscape.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- inkscape.spec	13 Jan 2009 20:44:48 -0000	1.58
+++ inkscape.spec	13 Jan 2009 21:29:13 -0000	1.59
@@ -1,6 +1,6 @@
 Name:           inkscape
 Version:        0.46
-Release:        7%{?dist}
+Release:        6%{?dist}.1
 Summary:        Vector-based drawing program using SVG
 
 Group:          Applications/Productivity
@@ -86,6 +86,7 @@
 %patch6 -p1 -b .poppler-0.8.3
 %patch7 -p1 -b .uniconv
 %patch8 -p2 -b .colors
+%patch9 -p2 -b .bitmap-fonts
 find -type f -regex '.*\.\(cpp\|h\)' -perm +111 -exec chmod -x {} ';'
 find share/extensions/ -type f -regex '.*\.py' -perm +111 -exec chmod -x {} ';'
 dos2unix -k -q share/extensions/*.py
@@ -145,7 +146,7 @@
 
 
 %changelog
-* Tue Jan 13 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.46-7
+* Tue Jan 13 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.46-6.1
 - Fix crash with bitmap font (#477158)
 
 * Fri Oct 17 2008 Lubomir Rintel <lkundrak at v3.sk> - 0.46-6



From lkundrak at fedoraproject.org  Tue Jan 13 21:30:32 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Tue, 13 Jan 2009 21:30:32 +0000 (UTC)
Subject: rpms/inkscape/F-10 inkscape.spec,1.59,1.60
Message-ID: <20090113213032.33E8F7013F@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/inkscape/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14441

Modified Files:
	inkscape.spec 
Log Message:
Apply the patch, fix the NVR


Index: inkscape.spec
===================================================================
RCS file: /cvs/pkgs/rpms/inkscape/F-10/inkscape.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- inkscape.spec	13 Jan 2009 21:29:13 -0000	1.59
+++ inkscape.spec	13 Jan 2009 21:30:01 -0000	1.60
@@ -86,7 +86,7 @@
 %patch6 -p1 -b .poppler-0.8.3
 %patch7 -p1 -b .uniconv
 %patch8 -p2 -b .colors
-%patch9 -p2 -b .bitmap-fonts
+%patch9 -p1 -b .bitmap-fonts
 find -type f -regex '.*\.\(cpp\|h\)' -perm +111 -exec chmod -x {} ';'
 find share/extensions/ -type f -regex '.*\.py' -perm +111 -exec chmod -x {} ';'
 dos2unix -k -q share/extensions/*.py



From oget at fedoraproject.org  Tue Jan 13 21:34:09 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Tue, 13 Jan 2009 21:34:09 +0000 (UTC)
Subject: rpms/serafettin-cartoon-fonts/devel import.log, NONE,
	1.1 serafettin-cartoon-fonts.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090113213409.1B23F7013F@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/serafettin-cartoon-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15264/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log serafettin-cartoon-fonts.spec 
Log Message:
* Tue Jan 13 2009 <oget [DOT] fedora [AT] gmail [DOT] com> - 0.5-1
- New version with various fixes suggested by review in RHBZ#479596

* Sun Jan 11 2009 <oget [DOT] fedora [AT] gmail [DOT] com> - 0.4-1
- New version with a name change (comic -> cartoon)

* Sun Dec 28 2008 <oget [DOT] fedora [AT] gmail [DOT] com> - 0.3-1
- Initial release



--- NEW FILE import.log ---
serafettin-cartoon-fonts-0_5-1_fc10:HEAD:serafettin-cartoon-fonts-0.5-1.fc10.src.rpm:1231882386


--- NEW FILE serafettin-cartoon-fonts.spec ---
%define fontname serafettin-cartoon
%define fontconf 66-%{fontname}.conf
%define archivename %{name}-%{version}

Name:          %{fontname}-fonts
Version:       0.5
Release:       1%{?dist}
Summary:       Sans-serif Cartoon Fonts
Group:         User Interface/X
License:       GPLv2+
URL:           http://serafettin.sourceforge.net/
Source0:       http://downloads.sourceforge.net/serafettin/%{archivename}.tar.bz2
BuildRoot:     %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildArch:     noarch

BuildRequires: fontforge
BuildRequires: fontpackages-devel

Requires:      fontpackages-filesystem

%description
Serafettin aims to be a collection of free Latin fonts for daily usage.
Currently it contains a free cartoon sans-serif font. It is based on Thukkaram 
Gopalrao's TSCu_Comic of tamillinux project. 

%prep
%setup -q -n %{archivename}


%build
make %{?_smp_flags}


%install
rm -fr %{buildroot}

DESTDIR=%{buildroot} make install

install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} \
                   %{buildroot}%{_fontconfig_confdir}

install -m 0644 -p %{fontname}.conf \
        %{buildroot}%{_fontconfig_templatedir}/%{fontconf}
ln -s %{_fontconfig_templatedir}/%{fontconf} \
      %{buildroot}%{_fontconfig_confdir}/%{fontconf}


%clean
rm -fr %{buildroot}


%_font_pkg -f %{fontconf} *.ttf

%doc ChangeLog.txt COPYING.txt FONTLOG.txt README.txt
%dir %{_fontdir}


%changelog
* Tue Jan 13 2009 <oget [DOT] fedora [AT] gmail [DOT] com> - 0.5-1
- New version with various fixes suggested by review in RHBZ#479596

* Sun Jan 11 2009 <oget [DOT] fedora [AT] gmail [DOT] com> - 0.4-1
- New version with a name change (comic -> cartoon)

* Sun Dec 28 2008 <oget [DOT] fedora [AT] gmail [DOT] com> - 0.3-1
- Initial release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/serafettin-cartoon-fonts/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	13 Jan 2009 20:38:31 -0000	1.1
+++ .cvsignore	13 Jan 2009 21:33:38 -0000	1.2
@@ -0,0 +1 @@
+serafettin-cartoon-fonts-0.5.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/serafettin-cartoon-fonts/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	13 Jan 2009 20:38:31 -0000	1.1
+++ sources	13 Jan 2009 21:33:38 -0000	1.2
@@ -0,0 +1 @@
+41a8673cb16fe0597eb5ef5c76a8336b  serafettin-cartoon-fonts-0.5.tar.bz2



From oget at fedoraproject.org  Tue Jan 13 21:35:54 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Tue, 13 Jan 2009 21:35:54 +0000 (UTC)
Subject: rpms/serafettin-cartoon-fonts/F-9 import.log, NONE,
	1.1 serafettin-cartoon-fonts.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090113213554.10C287013F@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/serafettin-cartoon-fonts/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15650/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	import.log serafettin-cartoon-fonts.spec 
Log Message:
* Tue Jan 13 2009 <oget [DOT] fedora [AT] gmail [DOT] com> - 0.5-1
- New version with various fixes suggested by review in RHBZ#479596

* Sun Jan 11 2009 <oget [DOT] fedora [AT] gmail [DOT] com> - 0.4-1
- New version with a name change (comic -> cartoon)

* Sun Dec 28 2008 <oget [DOT] fedora [AT] gmail [DOT] com> - 0.3-1
- Initial release



--- NEW FILE import.log ---
serafettin-cartoon-fonts-0_5-1_fc10:F-9:serafettin-cartoon-fonts-0.5-1.fc10.src.rpm:1231882487


--- NEW FILE serafettin-cartoon-fonts.spec ---
%define fontname serafettin-cartoon
%define fontconf 66-%{fontname}.conf
%define archivename %{name}-%{version}

Name:          %{fontname}-fonts
Version:       0.5
Release:       1%{?dist}
Summary:       Sans-serif Cartoon Fonts
Group:         User Interface/X
License:       GPLv2+
URL:           http://serafettin.sourceforge.net/
Source0:       http://downloads.sourceforge.net/serafettin/%{archivename}.tar.bz2
BuildRoot:     %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildArch:     noarch

BuildRequires: fontforge
BuildRequires: fontpackages-devel

Requires:      fontpackages-filesystem

%description
Serafettin aims to be a collection of free Latin fonts for daily usage.
Currently it contains a free cartoon sans-serif font. It is based on Thukkaram 
Gopalrao's TSCu_Comic of tamillinux project. 

%prep
%setup -q -n %{archivename}


%build
make %{?_smp_flags}


%install
rm -fr %{buildroot}

DESTDIR=%{buildroot} make install

install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} \
                   %{buildroot}%{_fontconfig_confdir}

install -m 0644 -p %{fontname}.conf \
        %{buildroot}%{_fontconfig_templatedir}/%{fontconf}
ln -s %{_fontconfig_templatedir}/%{fontconf} \
      %{buildroot}%{_fontconfig_confdir}/%{fontconf}


%clean
rm -fr %{buildroot}


%_font_pkg -f %{fontconf} *.ttf

%doc ChangeLog.txt COPYING.txt FONTLOG.txt README.txt
%dir %{_fontdir}


%changelog
* Tue Jan 13 2009 <oget [DOT] fedora [AT] gmail [DOT] com> - 0.5-1
- New version with various fixes suggested by review in RHBZ#479596

* Sun Jan 11 2009 <oget [DOT] fedora [AT] gmail [DOT] com> - 0.4-1
- New version with a name change (comic -> cartoon)

* Sun Dec 28 2008 <oget [DOT] fedora [AT] gmail [DOT] com> - 0.3-1
- Initial release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/serafettin-cartoon-fonts/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	13 Jan 2009 20:38:31 -0000	1.1
+++ .cvsignore	13 Jan 2009 21:35:23 -0000	1.2
@@ -0,0 +1 @@
+serafettin-cartoon-fonts-0.5.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/serafettin-cartoon-fonts/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	13 Jan 2009 20:38:31 -0000	1.1
+++ sources	13 Jan 2009 21:35:23 -0000	1.2
@@ -0,0 +1 @@
+41a8673cb16fe0597eb5ef5c76a8336b  serafettin-cartoon-fonts-0.5.tar.bz2



From oget at fedoraproject.org  Tue Jan 13 21:37:20 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Tue, 13 Jan 2009 21:37:20 +0000 (UTC)
Subject: rpms/serafettin-cartoon-fonts/F-10 import.log, NONE,
	1.1 serafettin-cartoon-fonts.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090113213720.A75CB7013F@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/serafettin-cartoon-fonts/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15968/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	import.log serafettin-cartoon-fonts.spec 
Log Message:
* Tue Jan 13 2009 <oget [DOT] fedora [AT] gmail [DOT] com> - 0.5-1
- New version with various fixes suggested by review in RHBZ#479596

* Sun Jan 11 2009 <oget [DOT] fedora [AT] gmail [DOT] com> - 0.4-1
- New version with a name change (comic -> cartoon)

* Sun Dec 28 2008 <oget [DOT] fedora [AT] gmail [DOT] com> - 0.3-1
- Initial release



--- NEW FILE import.log ---
serafettin-cartoon-fonts-0_5-1_fc10:F-10:serafettin-cartoon-fonts-0.5-1.fc10.src.rpm:1231882586


--- NEW FILE serafettin-cartoon-fonts.spec ---
%define fontname serafettin-cartoon
%define fontconf 66-%{fontname}.conf
%define archivename %{name}-%{version}

Name:          %{fontname}-fonts
Version:       0.5
Release:       1%{?dist}
Summary:       Sans-serif Cartoon Fonts
Group:         User Interface/X
License:       GPLv2+
URL:           http://serafettin.sourceforge.net/
Source0:       http://downloads.sourceforge.net/serafettin/%{archivename}.tar.bz2
BuildRoot:     %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildArch:     noarch

BuildRequires: fontforge
BuildRequires: fontpackages-devel

Requires:      fontpackages-filesystem

%description
Serafettin aims to be a collection of free Latin fonts for daily usage.
Currently it contains a free cartoon sans-serif font. It is based on Thukkaram 
Gopalrao's TSCu_Comic of tamillinux project. 

%prep
%setup -q -n %{archivename}


%build
make %{?_smp_flags}


%install
rm -fr %{buildroot}

DESTDIR=%{buildroot} make install

install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} \
                   %{buildroot}%{_fontconfig_confdir}

install -m 0644 -p %{fontname}.conf \
        %{buildroot}%{_fontconfig_templatedir}/%{fontconf}
ln -s %{_fontconfig_templatedir}/%{fontconf} \
      %{buildroot}%{_fontconfig_confdir}/%{fontconf}


%clean
rm -fr %{buildroot}


%_font_pkg -f %{fontconf} *.ttf

%doc ChangeLog.txt COPYING.txt FONTLOG.txt README.txt
%dir %{_fontdir}


%changelog
* Tue Jan 13 2009 <oget [DOT] fedora [AT] gmail [DOT] com> - 0.5-1
- New version with various fixes suggested by review in RHBZ#479596

* Sun Jan 11 2009 <oget [DOT] fedora [AT] gmail [DOT] com> - 0.4-1
- New version with a name change (comic -> cartoon)

* Sun Dec 28 2008 <oget [DOT] fedora [AT] gmail [DOT] com> - 0.3-1
- Initial release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/serafettin-cartoon-fonts/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	13 Jan 2009 20:38:31 -0000	1.1
+++ .cvsignore	13 Jan 2009 21:36:50 -0000	1.2
@@ -0,0 +1 @@
+serafettin-cartoon-fonts-0.5.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/serafettin-cartoon-fonts/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	13 Jan 2009 20:38:31 -0000	1.1
+++ sources	13 Jan 2009 21:36:50 -0000	1.2
@@ -0,0 +1 @@
+41a8673cb16fe0597eb5ef5c76a8336b  serafettin-cartoon-fonts-0.5.tar.bz2



From tmz at fedoraproject.org  Tue Jan 13 21:49:26 2009
From: tmz at fedoraproject.org (Todd M. Zullinger)
Date: Tue, 13 Jan 2009 21:49:26 +0000 (UTC)
Subject: rpms/cgit/devel README.SELinux, NONE,
	1.1 cgit-0.8.1-Makefile-install.patch, NONE, 1.1 cgit.httpd,
	NONE, 1.1 cgit.spec, NONE, 1.1 cgitrc, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090113214926.8B6747013F@cvs1.fedora.phx.redhat.com>

Author: tmz

Update of /cvs/extras/rpms/cgit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17865

Modified Files:
	.cvsignore sources 
Added Files:
	README.SELinux cgit-0.8.1-Makefile-install.patch cgit.httpd 
	cgit.spec cgitrc 
Log Message:
Import cgit on devel branch


--- NEW FILE README.SELinux ---
If you use SELinux, there are a few things you'll need to take care of
for cgit to work smoothly.  (Most of these should be fixed in the
official selinux-policy packages before cgit makes it into Fedora).

1. Enable the httpd_enable_cgi boolean
   $ setsebool -P httpd_enable_cgi 1

2. Set proper file contexts
   (These should be taken care of in the selinux-policy package before
   cgit makes it into stable Fedora versions.)

   a) The cache dir needs to be writable by the cgi
      # semanage fcontext -a -t httpd_sys_content_rw_t "/var/cache/cgit(/.*)?"

   b) The git repositories need to be readable by the cgi
      # semanage fcontext -a -t httpd_sys_content_t "/var/lib/git(/.*)?"

      If your git repositories are somewhere other than /var/lib/git, use that
      path in the command above.  If you have other confined daemons that need
      to access the git repositories, you may want to use public_content_t
      instead of httpd_sys_content_t.

   c) Run restorecon to update the contexts
      # restorecon -R /var/cache/cgit /var/lib/git

cgit-0.8.1-Makefile-install.patch:

--- NEW FILE cgit-0.8.1-Makefile-install.patch ---
diff -up cgit-0.8.1/Makefile.install cgit-0.8.1/Makefile
--- cgit-0.8.1/Makefile.install	2008-10-11 14:22:57.000000000 -0400
+++ cgit-0.8.1/Makefile	2009-01-11 11:56:51.000000000 -0500
@@ -1,11 +1,13 @@
 CGIT_VERSION = v0.8.1
 CGIT_SCRIPT_NAME = cgit.cgi
 CGIT_SCRIPT_PATH = /var/www/htdocs/cgit
+CGIT_DATA_PATH = $(CGIT_SCRIPT_PATH)
 CGIT_CONFIG = /etc/cgitrc
 CACHE_ROOT = /var/cache/cgit
 SHA1_HEADER = <openssl/sha.h>
 GIT_VER = 1.6.0.2
 GIT_URL = http://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.bz2
+INSTALL = install
 
 #
 # Let the user override the above settings.
@@ -112,10 +114,11 @@ test: all
 	$(QUIET_SUBDIR0)tests $(QUIET_SUBDIR1) all
 
 install: all
-	mkdir -p $(DESTDIR)$(CGIT_SCRIPT_PATH)
-	install cgit $(DESTDIR)$(CGIT_SCRIPT_PATH)/$(CGIT_SCRIPT_NAME)
-	install cgit.css $(DESTDIR)$(CGIT_SCRIPT_PATH)/cgit.css
-	install cgit.png $(DESTDIR)$(CGIT_SCRIPT_PATH)/cgit.png
+	$(INSTALL) -m0755 -d $(DESTDIR)$(CGIT_SCRIPT_PATH)
+	$(INSTALL) -m0755 cgit $(DESTDIR)$(CGIT_SCRIPT_PATH)/$(CGIT_SCRIPT_NAME)
+	$(INSTALL) -m0755 -d $(DESTDIR)$(CGIT_DATA_PATH)
+	$(INSTALL) -m0644 cgit.css $(DESTDIR)$(CGIT_DATA_PATH)/cgit.css
+	$(INSTALL) -m0644 cgit.png $(DESTDIR)$(CGIT_DATA_PATH)/cgit.png
 
 uninstall:
 	rm -f $(CGIT_SCRIPT_PATH)/$(CGIT_SCRIPT_NAME)


--- NEW FILE cgit.httpd ---
Alias /cgit-data /usr/share/cgit
ScriptAlias /cgit /var/www/cgi-bin/cgit


--- NEW FILE cgit.spec ---
# Review bug: https://bugzilla.redhat.com/479723

%define gitver      1.6.0.2
%define cachedir    %{_localstatedir}/cache/cgit
%define scriptdir   %{_localstatedir}/www/cgi-bin
%define cgitdata    %{_datadir}/cgit

%define make_cgit \
export CFLAGS="%{optflags}" \
make V=1 %{?_smp_mflags} \\\
     DESTDIR=%{buildroot} \\\
     INSTALL="install -p"  \\\
     CACHE_ROOT=%{cachedir} \\\
     CGIT_SCRIPT_PATH=%{scriptdir} \\\
     CGIT_SCRIPT_NAME=cgit \\\
     CGIT_DATA_PATH=%{cgitdata}

Name:           cgit
Version:        0.8.1
Release:        1%{?dist}
Summary:        A fast webinterface for git

Group:          Development/Tools
License:        GPLv2
URL:            http://hjemli.net/git/cgit/
Source0:        http://hjemli.net/git/cgit/snapshot/cgit-0.8.1.tar.bz2
Source1:        http://www.kernel.org/pub/software/scm/git/git-%{gitver}.tar.bz2
Source2:        cgitrc
Source3:        cgit.httpd
Source4:        README.SELinux
# Applied upstream stable branch (4ac89ec and d529c6f)
Patch0:         cgit-0.8.1-Makefile-install.patch
BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

%if 0%{?fedora}
BuildRequires:  libcurl-devel
%else
BuildRequires:  curl-devel
%endif
BuildRequires:  openssl-devel
Requires:       httpd

%description
This is an attempt to create a fast web interface for the git scm,
using a builtin cache to decrease server io-pressure.

%prep
%setup -q -a 1
%patch0 -p1 -b .install

# setup the git dir
rm -rf git
mv git-%{gitver} git
sed -i 's/^\(CFLAGS = \).*/\1%{optflags}/' git/Makefile

# add README.SELinux
cp -p %{SOURCE4} .


%build
%{make_cgit}


%install
rm -rf %{buildroot}
%{make_cgit} install
install -d -m0755 %{buildroot}%{_sysconfdir}/httpd/conf.d
install -p -m0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/cgitrc
install -p -m0644 %{SOURCE3} %{buildroot}%{_sysconfdir}/httpd/conf.d/cgit.conf
install -d -m0755 %{buildroot}%{cachedir}

%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%doc COPYING README* cgitrc.5.txt
%config(noreplace) %{_sysconfdir}/cgitrc
%config(noreplace) %{_sysconfdir}/httpd/conf.d/cgit.conf
%dir %attr(-,apache,root) %{cachedir}
%{cgitdata}
%{scriptdir}/*


%changelog
* Mon Jan 12 2009 Todd Zullinger <tmz at pobox.com> - 0.8.1-1
- Initial package


--- NEW FILE cgitrc ---
#
# See /usr/share/doc/cgit-*/cgitrc.5.txt for details
#

# Enable caching of up to 1000 output entries
cache-size=1000

# Specify some default clone prefixes
#clone-prefix=git://example.com ssh://example.com/pub/git http://example.com/git

# Specify the css url
css=/cgit-data/cgit.css

# Show extra links for each repository on the index page
enable-index-links=1

# Show number of affected files per commit on the log pages
enable-log-filecount=1

# Show number of added/removed lines per commit on the log pages
enable-log-linecount=1

# Add a cgit favicon
#favicon=/favicon.ico

# Use a custom logo
logo=/cgit-data/cgit.png

# Set the title and heading of the repository index page
#root-title=example.com git repositories

# Set a subheading for the repository index page
#root-desc=tracking the foobar development

# Include some more info about this site on the index page
#root-readme=/var/www/html/about.html

# Allow download of tar.gz, tar.bz2 and zip-files
#snapshots=tar.gz tar.bz2 zip

##
## List of repositories.
## PS: Any repositories listed when repo.group is unset will not be
##     displayed under a group heading
## PPS: This list could be kept in a different file (e.g. '/etc/cgitrepos')
##      and included like this:
##        include=/etc/cgitrepos
##

#repo.url=foo
#repo.path=/var/lib/git/foo.git
#repo.desc=the master foo repository
#repo.owner=fooman at example.com
#repo.readme=info/web/about.html


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cgit/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	13 Jan 2009 20:31:07 -0000	1.1
+++ .cvsignore	13 Jan 2009 21:48:56 -0000	1.2
@@ -0,0 +1,3 @@
+*.rpm
+*.tar.bz2
+clog


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cgit/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	13 Jan 2009 20:31:07 -0000	1.1
+++ sources	13 Jan 2009 21:48:56 -0000	1.2
@@ -0,0 +1,2 @@
+654850ded01dd2f6b732aa7c1b0856dc  cgit-0.8.1.tar.bz2
+1e4d9bfc1cb0abf165d4de93b5172324  git-1.6.0.2.tar.bz2



From sgrubb at fedoraproject.org  Tue Jan 13 21:52:13 2009
From: sgrubb at fedoraproject.org (Steve Grubb)
Date: Tue, 13 Jan 2009 21:52:13 +0000 (UTC)
Subject: rpms/audit/devel audit-1.8-crypto.patch, NONE, 1.1 audit.spec, 1.199,
	1.200
Message-ID: <20090113215213.230857013F@cvs1.fedora.phx.redhat.com>

Author: sgrubb

Update of /cvs/pkgs/rpms/audit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18584

Modified Files:
	audit.spec 
Added Files:
	audit-1.8-crypto.patch 
Log Message:
Add crypto event definitions


audit-1.8-crypto.patch:

--- NEW FILE audit-1.8-crypto.patch ---
Index: /trunk/lib/libaudit.h
===================================================================
--- /trunk/lib/libaudit.h (revision 171)
+++ /trunk/lib/libaudit.h (revision 234)
@@ -227,4 +227,12 @@
 
 #define AUDIT_FIRST_CRYPTO_MSG		2400
+#define AUDIT_CRYPTO_TEST_USER		2400 /* Crypto test results */
+#define AUDIT_CRYPTO_PARAM_CHANGE_USER	2401 /* Crypto attribute change */
+#define AUDIT_CRYPTO_LOGIN		2402 /* Logged in as crypto officer */
+#define AUDIT_CRYPTO_LOGOUT		2403 /* Logged out from crypto */
+#define AUDIT_CRYPTO_KEY_USER		2404 /* Create,delete,negotiate */
+#define AUDIT_CRYPTO_FAILURE_USER	2405 /* Fail decrypt,encrypt,randomiz */
+#define AUDIT_CRYPTO_REPLAY_USER	2406 /* Crypto replay detected */
+
 #define AUDIT_LAST_CRYPTO_MSG		2499
 
Index: /trunk/lib/msg_typetab.h
===================================================================
--- /trunk/lib/msg_typetab.h (revision 171)
+++ /trunk/lib/msg_typetab.h (revision 234)
@@ -175,3 +175,10 @@
 _S(AUDIT_FS_RELABEL,                 "FS_RELABEL"                    )
 _S(AUDIT_USER_MAC_POLICY_LOAD,       "USER_MAC_POLICY_LOAD"          )
+_S(AUDIT_CRYPTO_TEST_USER,           "CRYPTO_TEST_USER"              )
+_S(AUDIT_CRYPTO_PARAM_CHANGE_USER,   "CRYPTO_PARAM_CHANGE_USER"      )
+_S(AUDIT_CRYPTO_LOGIN,               "CRYPTO_LOGIN"                  )
+_S(AUDIT_CRYPTO_LOGOUT,              "CRYPTO_LOGOUT"                 )
+_S(AUDIT_CRYPTO_KEY_USER,            "CRYPTO_KEY_USER"               )
+_S(AUDIT_CRYPTO_FAILURE_USER,        "CRYPTO_FAILURE_USER"           )
+_S(AUDIT_CRYPTO_REPLAY_USER,         "CRYPTO_REPLAY_USER"            )
 


Index: audit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/audit/devel/audit.spec,v
retrieving revision 1.199
retrieving revision 1.200
diff -u -r1.199 -r1.200
--- audit.spec	10 Jan 2009 21:10:21 -0000	1.199
+++ audit.spec	13 Jan 2009 21:51:42 -0000	1.200
@@ -1,7 +1,7 @@
 %define audit_version 1.7.11
-%define audit_release 1%{?dist}
+%define audit_release 2%{?dist}
 %define sca_version 0.4.8
-%define sca_release 14
+%define sca_release 15
 %{!?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
@@ -12,6 +12,7 @@
 Group: System Environment/Daemons
 URL: http://people.redhat.com/sgrubb/audit/
 Source0: http://people.redhat.com/sgrubb/audit/%{name}-%{version}.tar.gz
+Patch1: audit-1.8-crypto.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: gettext-devel intltool libtool swig python-devel
 BuildRequires: tcp_wrappers-devel 
@@ -89,6 +90,7 @@
 
 %prep
 %setup -q
+%patch1 -p1
 
 %build
 %configure --sbindir=/sbin --libdir=/%{_lib} --with-prelude --with-libwrap --enable-gssapi-krb5=no
@@ -259,6 +261,9 @@
 %config(noreplace) %{_sysconfdir}/security/console.apps/system-config-audit-server
 
 %changelog
+* Tue Jan 13 2009 Steve Grubb <sgrubb at redhat.com> 1.7.11-2
+- Add crypto event definitions
+
 * Sat Jan 10 2009 Steve Grubb <sgrubb at redhat.com> 1.7.11-1
 - New upstream release
 



From pkgdb at fedoraproject.org  Tue Jan 13 21:54:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 21:54:12 +0000
Subject: [pkgdb] system-autodeath was added for skvidal
Message-ID: <20090113215412.AAE9C208203@bastion.fedora.phx.redhat.com>

kevin has added Package system-autodeath with summary Automatically disable system default route on a specific
kevin has approved Package system-autodeath
kevin has added a Fedora devel branch for system-autodeath with an owner of skvidal
kevin has approved system-autodeath in Fedora devel
kevin has approved Package system-autodeath
kevin has set commit to Approved for provenpackager on system-autodeath (Fedora devel)
kevin has set build to Approved for provenpackager on system-autodeath (Fedora devel)
kevin has set checkout to Approved for provenpackager on system-autodeath (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/system-autodeath



From pkgdb at fedoraproject.org  Tue Jan 13 21:54:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 13 Jan 2009 21:54:14 +0000
Subject: [pkgdb] system-autodeath (Fedora, 10) updated by kevin
Message-ID: <20090113215415.49A08208456@bastion.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for system-autodeath
kevin has set commit to Approved for provenpackager on system-autodeath (Fedora 10)
kevin has set build to Approved for provenpackager on system-autodeath (Fedora 10)
kevin has set checkout to Approved for provenpackager on system-autodeath (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/system-autodeath



From kevin at fedoraproject.org  Tue Jan 13 21:54:45 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 13 Jan 2009 21:54:45 +0000 (UTC)
Subject: rpms/system-autodeath - New directory
Message-ID: <20090113215445.2AFA57013F@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/system-autodeath
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsU19240/rpms/system-autodeath

Log Message:
Directory /cvs/pkgs/rpms/system-autodeath added to the repository




From kevin at fedoraproject.org  Tue Jan 13 21:54:45 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 13 Jan 2009 21:54:45 +0000 (UTC)
Subject: rpms/system-autodeath/devel - New directory
Message-ID: <20090113215445.7E5817013F@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/system-autodeath/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsU19240/rpms/system-autodeath/devel

Log Message:
Directory /cvs/pkgs/rpms/system-autodeath/devel added to the repository




From kevin at fedoraproject.org  Tue Jan 13 21:55:04 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 13 Jan 2009 21:55:04 +0000 (UTC)
Subject: rpms/system-autodeath Makefile,NONE,1.1
Message-ID: <20090113215504.67FF47013F@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/system-autodeath
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsU19240/rpms/system-autodeath

Added Files:
	Makefile 
Log Message:
Setup of module system-autodeath


--- NEW FILE Makefile ---
# Top level Makefile for module system-autodeath
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Jan 13 21:55:04 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 13 Jan 2009 21:55:04 +0000 (UTC)
Subject: rpms/system-autodeath/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090113215504.D37667013F@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/system-autodeath/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsU19240/rpms/system-autodeath/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module system-autodeath


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: system-autodeath
# $Id: Makefile,v 1.1 2009/01/13 21:55:04 kevin Exp $
NAME := system-autodeath
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From sgrubb at fedoraproject.org  Tue Jan 13 22:02:15 2009
From: sgrubb at fedoraproject.org (Steve Grubb)
Date: Tue, 13 Jan 2009 22:02:15 +0000 (UTC)
Subject: rpms/audit/devel audit.spec,1.200,1.201
Message-ID: <20090113220215.DE8C07013F@cvs1.fedora.phx.redhat.com>

Author: sgrubb

Update of /cvs/pkgs/rpms/audit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20201

Modified Files:
	audit.spec 
Log Message:
* Tue Jan 13 2009 Steve Grubb <sgrubb at redhat.com> 1.7.11-2
- Add crypto event definitions



Index: audit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/audit/devel/audit.spec,v
retrieving revision 1.200
retrieving revision 1.201
diff -u -r1.200 -r1.201
--- audit.spec	13 Jan 2009 21:51:42 -0000	1.200
+++ audit.spec	13 Jan 2009 22:01:45 -0000	1.201
@@ -90,7 +90,7 @@
 
 %prep
 %setup -q
-%patch1 -p1
+%patch1 -p0
 
 %build
 %configure --sbindir=/sbin --libdir=/%{_lib} --with-prelude --with-libwrap --enable-gssapi-krb5=no



From kevin at fedoraproject.org  Tue Jan 13 22:13:12 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 13 Jan 2009 22:13:12 +0000 (UTC)
Subject: rpms/xfce4-session/devel xfce4-session-4.5.92-hide-tips.patch, NONE,
	1.1 xfce4-session.spec, 1.22, 1.23 sources, 1.10,
	1.11 .cvsignore, 1.10,
	1.11 xfce4-session-4.4.2-autostarteditor-icon.patch, 1.1,
	NONE xfce4-session-4.4.2-hide-tips.patch, 1.1, NONE
Message-ID: <20090113221312.9350D7013F@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce4-session/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21835

Modified Files:
	xfce4-session.spec sources .cvsignore 
Added Files:
	xfce4-session-4.5.92-hide-tips.patch 
Removed Files:
	xfce4-session-4.4.2-autostarteditor-icon.patch 
	xfce4-session-4.4.2-hide-tips.patch 
Log Message:
Update 4.5.92


xfce4-session-4.5.92-hide-tips.patch:

--- NEW FILE xfce4-session-4.5.92-hide-tips.patch ---
diff -Nur xfce4-session-4.5.92.orig/xfce4-tips/xfce4-tips-autostart.desktop.in xfce4-session-4.5.92/xfce4-tips/xfce4-tips-autostart.desktop.in
--- xfce4-session-4.5.92.orig/xfce4-tips/xfce4-tips-autostart.desktop.in	2008-09-06 05:05:55.000000000 -0600
+++ xfce4-session-4.5.92/xfce4-tips/xfce4-tips-autostart.desktop.in	2008-12-30 14:47:15.000000000 -0700
@@ -7,4 +7,4 @@
 Terminal=false
 Type=Application
 OnlyShowIn=XFCE;
-Hidden=false
+Hidden=true


Index: xfce4-session.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-session/devel/xfce4-session.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- xfce4-session.spec	12 Aug 2008 05:30:09 -0000	1.22
+++ xfce4-session.spec	13 Jan 2009 22:12:42 -0000	1.23
@@ -1,29 +1,27 @@
 Summary: Xfce session manager
 Name: xfce4-session
-Version: 4.4.2
-Release: 4%{?dist}
+Version: 4.5.92
+Release: 1%{?dist}
 License: GPLv2+
 URL: http://www.xfce.org/
-Source0: http://www.xfce.org/archive/xfce-4.4.2/src/xfce4-session-4.4.2.tar.bz2
-Source1: http://svn.xfce.org/index.cgi/xfce/checkout/xfce4-session/trunk/icons/48x48/xfce4-autostart-editor.png
-Patch0: xfce4-session-4.4.2-hide-tips.patch
-Patch1: xfce4-session-4.4.2-autostarteditor-icon.patch
+Source0: http://www.xfce.org/archive/xfce-%{version}/src/xfce4-session-%{version}.tar.bz2
+Patch0: xfce4-session-4.5.92-hide-tips.patch
 Group: User Interface/Desktops
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: libxfcegui4 >= %{version}
-Requires: libxfce4mcs >= %{version}
-Requires: xfce-mcs-manager >= %{version}
 Requires: xorg-x11-server-utils
 Requires: redhat-menus
 BuildRequires: libxfcegui4-devel >= %{version}
-BuildRequires: libxfce4mcs-devel >= %{version}
-BuildRequires: xfce-mcs-manager-devel >= %{version}
 BuildRequires: startup-notification-devel
 BuildRequires: gettext intltool
 BuildRequires: imake
 BuildRequires: libXt-devel
 BuildRequires: xorg-x11-server-utils
 BuildRequires: dbus-devel GConf2-devel
+BuildRequires: libwnck-devel
+BuildRequires: libglade2-devel
+BuildRequires: dbus-glib-devel
+BuildRequires: xfconf-devel
 Requires: fortune-mod
 
 %description
@@ -34,7 +32,6 @@
 Group: Development/Libraries
 Requires: xfce4-session >= %{version}
 Requires: libxfcegui4-devel >= %{version}
-Requires: libxfce4mcs-devel >= %{version}
 
 %description devel
 Header files for the Xfce Session Manager.
@@ -50,17 +47,16 @@
 %prep
 %setup -q
 %patch0 -p1 -b .disable-tips
-%patch1 -p1 -b .autostarteditor-icon
 
 %build
 %configure --enable-gnome --enable-final
-
+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
-cp -a %{SOURCE1} $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/48x48/apps/
 rm -f $RPM_BUILD_ROOT/%{_libdir}/xfce4/*/*.a
 rm -f $RPM_BUILD_ROOT/%{_libdir}/xfce4/*/*/*.a
 rm -f $RPM_BUILD_ROOT/%{_libdir}/xfce4/*/*.la
@@ -97,29 +93,29 @@
 %{_datadir}/icons/hicolor/72x72/apps/xfsm-trash-normal.png
 %{_datadir}/icons/hicolor/scalable/apps/xfce4-session.svg
 %{_datadir}/icons/hicolor/scalable/apps/xfsm-shutdown.svg
+%{_datadir}/icons/hicolor/48x48/apps/xfsm-hibernate.png
+%{_datadir}/icons/hicolor/48x48/apps/xfsm-suspend.png
 %{_datadir}/xfce4/doc/*/images/*
 %{_datadir}/xfce4/doc/*/*.html
 %dir %{_datadir}/xfce4/tips/
 %{_datadir}/xfce4/tips/tips
 %{_datadir}/xfce4/tips/tips.dat
 %{_libdir}/lib*.so.*
-%{_libdir}/xfce4/mcs-plugins/*
 %dir %{_libdir}/xfce4/splash/
 %dir %{_libdir}/xfce4/splash/engines
 %{_libdir}/xfce4/splash/engines/libmice.*
 %{_libexecdir}/xfsm-shutdown-helper
 %{_mandir}/man1/*
-%dir %{_sysconfdir}/xdg/xfce4-session/
-%config(noreplace) %{_sysconfdir}/xdg/xfce4-session/xfce4-session.rc
 %dir %{_sysconfdir}/xdg/autostart/
+%{_sysconfdir}/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml
 %config(noreplace) %{_sysconfdir}/xdg/autostart/xfce4-tips-autostart.desktop
 
 %files devel
 %defattr(-,root,root,-)
-%{_includedir}/xfce4/xfce4-session-4.2/
 %{_libdir}/lib*.so
 %{_libdir}/*a
 %{_libdir}/pkgconfig/*.pc
+%{_includedir}/xfce4/xfce4-session-4.6
 
 %files engines
 %defattr(-,root,root,-)
@@ -129,6 +125,9 @@
 %{_libexecdir}/balou-*
 
 %changelog
+* Fri Dec 26 2008 Kevin Fenzi <kevin at tummy.com> - 4.5.92-1
+- Update 4.5.92
+
 * Mon Aug 11 2008 Kevin Fenzi <kevin at tummy.com> - 4.4.2-4
 - Fix icon for autostarted applications (fixes #442804)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfce4-session/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	12 Aug 2008 05:30:09 -0000	1.10
+++ sources	13 Jan 2009 22:12:42 -0000	1.11
@@ -1,2 +1 @@
-4c3d1acb8ce37ea4dd55d82aeb38e9e7  xfce4-session-4.4.2.tar.bz2
-ce94b443704322c6a3e0053f11f1dd9e  xfce4-autostart-editor.png
+bf094cce9c2150438a1c7e03bec5ee0d  xfce4-session-4.5.92.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfce4-session/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	12 Aug 2008 05:30:09 -0000	1.10
+++ .cvsignore	13 Jan 2009 22:12:42 -0000	1.11
@@ -1,2 +1 @@
-xfce4-session-4.4.2.tar.bz2
-xfce4-autostart-editor.png
+xfce4-session-4.5.92.tar.bz2


--- xfce4-session-4.4.2-autostarteditor-icon.patch DELETED ---


--- xfce4-session-4.4.2-hide-tips.patch DELETED ---



From sgrubb at fedoraproject.org  Tue Jan 13 22:13:29 2009
From: sgrubb at fedoraproject.org (Steve Grubb)
Date: Tue, 13 Jan 2009 22:13:29 +0000 (UTC)
Subject: rpms/audit/devel audit.spec,1.201,1.202
Message-ID: <20090113221329.20BAB7013F@cvs1.fedora.phx.redhat.com>

Author: sgrubb

Update of /cvs/pkgs/rpms/audit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21900

Modified Files:
	audit.spec 
Log Message:
* Tue Jan 13 2009 Steve Grubb <sgrubb at redhat.com> 1.7.11-2
- Add crypto event definitions



Index: audit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/audit/devel/audit.spec,v
retrieving revision 1.201
retrieving revision 1.202
diff -u -r1.201 -r1.202
--- audit.spec	13 Jan 2009 22:01:45 -0000	1.201
+++ audit.spec	13 Jan 2009 22:12:58 -0000	1.202
@@ -90,7 +90,7 @@
 
 %prep
 %setup -q
-%patch1 -p0
+%patch1 -p2
 
 %build
 %configure --sbindir=/sbin --libdir=/%{_lib} --with-prelude --with-libwrap --enable-gssapi-krb5=no



From oget at fedoraproject.org  Tue Jan 13 22:15:26 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Tue, 13 Jan 2009 22:15:26 +0000 (UTC)
Subject: comps comps-f10.xml.in,1.203,1.204 comps-f11.xml.in,1.55,1.56
Message-ID: <20090113221526.659907013F@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22257

Modified Files:
	comps-f10.xml.in comps-f11.xml.in 
Log Message:
Add serafettin-cartoon-fonts under fonts as optional and also under Tamil Support as optional



Index: comps-f10.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f10.xml.in,v
retrieving revision 1.203
retrieving revision 1.204
diff -u -r1.203 -r1.204
--- comps-f10.xml.in	11 Jan 2009 13:27:16 -0000	1.203
+++ comps-f10.xml.in	13 Jan 2009 22:14:56 -0000	1.204
@@ -1494,6 +1494,7 @@
       <packagereq type="optional">sarai-fonts</packagereq>
       <packagereq type="optional">sazanami-fonts-gothic</packagereq>
       <packagereq type="optional">sazanami-fonts-mincho</packagereq>
+      <packagereq type="optional">serafettin-cartoon-fonts</packagereq>
       <packagereq type="optional">silkscreen-fonts</packagereq>
       <packagereq type="optional">smc-fonts-anjalioldlipi</packagereq>
       <packagereq type="optional">smc-fonts-dyuthi</packagereq>
@@ -4511,6 +4512,7 @@
       <packagereq type="conditional" requires="xorg-x11-server-Xorg">scim-lang-tamil</packagereq>
       <packagereq type="default">iok</packagereq>
       <packagereq type="default">samyak-fonts-tamil</packagereq>
+      <packagereq type="optional">serafettin-cartoon-fonts</packagereq>
     </packagelist>
   </group>
   <group>


Index: comps-f11.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f11.xml.in,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- comps-f11.xml.in	11 Jan 2009 13:27:16 -0000	1.55
+++ comps-f11.xml.in	13 Jan 2009 22:14:56 -0000	1.56
@@ -1564,6 +1564,7 @@
       <packagereq type="optional">sarai-fonts</packagereq>
       <packagereq type="optional">sazanami-fonts-gothic</packagereq>
       <packagereq type="optional">sazanami-fonts-mincho</packagereq>
+      <packagereq type="optional">serafettin-cartoon-fonts</packagereq>
       <packagereq type="optional">silkscreen-fonts</packagereq>
       <packagereq type="optional">smc-fonts-anjalioldlipi</packagereq>
       <packagereq type="optional">smc-fonts-dyuthi</packagereq>
@@ -4629,6 +4630,7 @@
       <packagereq type="conditional" requires="xorg-x11-server-Xorg">scim-lang-tamil</packagereq>
       <packagereq type="default">iok</packagereq>
       <packagereq type="default">samyak-fonts-tamil</packagereq>
+      <packagereq type="optional">serafettin-cartoon-fonts</packagereq>
     </packagelist>
   </group>
   <group>



From jkeating at fedoraproject.org  Tue Jan 13 22:22:52 2009
From: jkeating at fedoraproject.org (Jesse Keating)
Date: Tue, 13 Jan 2009 22:22:52 +0000 (UTC)
Subject: comps comps-f11.xml.in,1.56,1.57
Message-ID: <20090113222252.3BED87013F@cvs1.fedora.phx.redhat.com>

Author: jkeating

Update of /cvs/pkgs/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24137

Modified Files:
	comps-f11.xml.in 
Log Message:
Demote font-design to non-default group.  Not something that the average
Fedora user is going to want/need.



Index: comps-f11.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f11.xml.in,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- comps-f11.xml.in	13 Jan 2009 22:14:56 -0000	1.56
+++ comps-f11.xml.in	13 Jan 2009 22:22:21 -0000	1.57
@@ -1418,7 +1418,7 @@
     <id>font-design</id>
     <_name>Font design and packaging</_name>
     <_description>This group is a collection of tools used in the design, modification, manipulation, and packaging of fonts.</_description>
-    <default>true</default>
+    <default>false</default>
     <uservisible>true</uservisible>
     <packagelist>
       <packagereq type="mandatory">fontforge</packagereq>



From kevin at fedoraproject.org  Tue Jan 13 22:39:21 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 13 Jan 2009 22:39:21 +0000 (UTC)
Subject: rpms/xfce-utils/devel sources, 1.10, 1.11 .cvsignore, 1.10,
	1.11 xfce-utils.spec, 1.22, 1.23
Message-ID: <20090113223921.1EEF77013F@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25970

Modified Files:
	sources .cvsignore xfce-utils.spec 
Log Message:
Update to 4.5.92



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfce-utils/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	27 Oct 2008 20:28:05 -0000	1.10
+++ sources	13 Jan 2009 22:38:50 -0000	1.11
@@ -1 +1 @@
-6d6ae1f048e1dc1348ad050498af5a18  xfce-utils-4.4.3.tar.bz2
+8700842ab643838910ec9adfa08aa01d  xfce-utils-4.5.92.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfce-utils/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	27 Oct 2008 20:28:05 -0000	1.10
+++ .cvsignore	13 Jan 2009 22:38:50 -0000	1.11
@@ -1 +1 @@
-xfce-utils-4.4.3.tar.bz2
+xfce-utils-4.5.92.tar.bz2


Index: xfce-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce-utils/devel/xfce-utils.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- xfce-utils.spec	27 Oct 2008 20:28:05 -0000	1.22
+++ xfce-utils.spec	13 Jan 2009 22:38:50 -0000	1.23
@@ -2,7 +2,7 @@
 
 Summary: Utilities for the Xfce Desktop Environment
 Name: xfce-utils
-Version: 4.4.3
+Version: 4.5.92
 Release: 1%{?dist}
 License: GPLv2+
 URL: http://www.xfce.org/
@@ -13,18 +13,16 @@
 Patch2: xfce-utils-4.4.3-gnome-screensaver.patch
 Group: User Interface/Desktops
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-Requires: xfce-mcs-manager
 Requires: xfwm4
 Requires: xfdesktop
 Requires: /usr/bin/id
 BuildRequires: libxfcegui4-devel >= %{version}
-BuildRequires: libxfce4mcs-devel >= %{version}
-BuildRequires: xfce-mcs-manager-devel
 BuildRequires: imake
 BuildRequires: libXt-devel
 BuildRequires: gettext
 BuildRequires: dbus-devel 
 BuildRequires: dbus-glib-devel
+BuildRequires: perl(XML::Parser)
 
 %description
 This package includes utilities for the Xfce Desktop Environment
@@ -76,14 +74,19 @@
 %defattr(-,root,root,-)
 %doc README ChangeLog NEWS COPYING AUTHORS
 %attr(0755,root,root) 
-%{_sysconfdir}/xdg/xfce4/xinitrc
-%{_sysconfdir}/xdg/xfce4/Xft.xrdb
+%config(noreplace) %{_sysconfdir}/xdg/xfce4/xinitrc
+%config(noreplace) %{_sysconfdir}/xdg/xfce4/Xft.xrdb
+%config(noreplace) %{_sysconfdir}/xdg/autostart/xfconf-migration-4.6.desktop
+%dir %{_libexecdir}/xfce4 
+%dir %{_libexecdir}/xfce4/xfconf-migration
+%{_libexecdir}/xfce4/xfconf-migration/xfconf-migration-4.6.pl
 %{_bindir}/*
 %{_datadir}/xfce4/AUTHORS
 %{_datadir}/xfce4/BSD
 %{_datadir}/xfce4/COPYING
 %{_datadir}/xfce4/GPL
 %{_datadir}/xfce4/INFO
+%lang(de) %{_datadir}/xfce4/INFO.de
 %lang(ca) %{_datadir}/xfce4/INFO.ca
 %lang(es) %{_datadir}/xfce4/INFO.es
 %lang(fi) %{_datadir}/xfce4/INFO.fi
@@ -104,6 +107,9 @@
 %{_datadir}/dbus-1/services/org.xfce.RunDialog.service
 
 %changelog
+* Sat Dec 27 2008 Kevin Fenzi <kevin at tummy.com> - 4.5.92-1
+- Update to 4.5.92
+
 * Mon Oct 27 2008 Christoph Wickert <cwickert at fedoraproject.org> - 4.4.3-1
 - Update to 4.4.3
 - Prefer gnome-screensaver over xscreensaver if installed



From sgrubb at fedoraproject.org  Tue Jan 13 22:46:03 2009
From: sgrubb at fedoraproject.org (Steve Grubb)
Date: Tue, 13 Jan 2009 22:46:03 +0000 (UTC)
Subject: rpms/audit/F-10 audit-1.8-crypto.patch, NONE, 1.1 audit.spec, 1.199,
	1.200
Message-ID: <20090113224603.523E67013F@cvs1.fedora.phx.redhat.com>

Author: sgrubb

Update of /cvs/pkgs/rpms/audit/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26891

Modified Files:
	audit.spec 
Added Files:
	audit-1.8-crypto.patch 
Log Message:
* Tue Jan 13 2009 Steve Grubb <sgrubb at redhat.com> 1.7.11-2
- Add crypto event definitions


audit-1.8-crypto.patch:

--- NEW FILE audit-1.8-crypto.patch ---
Index: /trunk/lib/libaudit.h
===================================================================
--- /trunk/lib/libaudit.h (revision 171)
+++ /trunk/lib/libaudit.h (revision 234)
@@ -227,4 +227,12 @@
 
 #define AUDIT_FIRST_CRYPTO_MSG		2400
+#define AUDIT_CRYPTO_TEST_USER		2400 /* Crypto test results */
+#define AUDIT_CRYPTO_PARAM_CHANGE_USER	2401 /* Crypto attribute change */
+#define AUDIT_CRYPTO_LOGIN		2402 /* Logged in as crypto officer */
+#define AUDIT_CRYPTO_LOGOUT		2403 /* Logged out from crypto */
+#define AUDIT_CRYPTO_KEY_USER		2404 /* Create,delete,negotiate */
+#define AUDIT_CRYPTO_FAILURE_USER	2405 /* Fail decrypt,encrypt,randomiz */
+#define AUDIT_CRYPTO_REPLAY_USER	2406 /* Crypto replay detected */
+
 #define AUDIT_LAST_CRYPTO_MSG		2499
 
Index: /trunk/lib/msg_typetab.h
===================================================================
--- /trunk/lib/msg_typetab.h (revision 171)
+++ /trunk/lib/msg_typetab.h (revision 234)
@@ -175,3 +175,10 @@
 _S(AUDIT_FS_RELABEL,                 "FS_RELABEL"                    )
 _S(AUDIT_USER_MAC_POLICY_LOAD,       "USER_MAC_POLICY_LOAD"          )
+_S(AUDIT_CRYPTO_TEST_USER,           "CRYPTO_TEST_USER"              )
+_S(AUDIT_CRYPTO_PARAM_CHANGE_USER,   "CRYPTO_PARAM_CHANGE_USER"      )
+_S(AUDIT_CRYPTO_LOGIN,               "CRYPTO_LOGIN"                  )
+_S(AUDIT_CRYPTO_LOGOUT,              "CRYPTO_LOGOUT"                 )
+_S(AUDIT_CRYPTO_KEY_USER,            "CRYPTO_KEY_USER"               )
+_S(AUDIT_CRYPTO_FAILURE_USER,        "CRYPTO_FAILURE_USER"           )
+_S(AUDIT_CRYPTO_REPLAY_USER,         "CRYPTO_REPLAY_USER"            )
 


Index: audit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/audit/F-10/audit.spec,v
retrieving revision 1.199
retrieving revision 1.200
diff -u -r1.199 -r1.200
--- audit.spec	10 Jan 2009 21:25:41 -0000	1.199
+++ audit.spec	13 Jan 2009 22:45:32 -0000	1.200
@@ -1,7 +1,7 @@
 %define audit_version 1.7.11
-%define audit_release 1%{?dist}
+%define audit_release 2%{?dist}
 %define sca_version 0.4.8
-%define sca_release 14
+%define sca_release 15
 %{!?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
@@ -12,6 +12,7 @@
 Group: System Environment/Daemons
 URL: http://people.redhat.com/sgrubb/audit/
 Source0: http://people.redhat.com/sgrubb/audit/%{name}-%{version}.tar.gz
+Patch1: audit-1.8-crypto.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: gettext-devel intltool libtool swig python-devel
 BuildRequires: tcp_wrappers-devel 
@@ -89,6 +90,7 @@
 
 %prep
 %setup -q
+%patch1 -p2
 
 %build
 %configure --sbindir=/sbin --libdir=/%{_lib} --with-prelude --with-libwrap --enable-gssapi-krb5=no
@@ -259,6 +261,9 @@
 %config(noreplace) %{_sysconfdir}/security/console.apps/system-config-audit-server
 
 %changelog
+* Tue Jan 13 2009 Steve Grubb <sgrubb at redhat.com> 1.7.11-2
+- Add crypto event definitions
+
 * Sat Jan 10 2009 Steve Grubb <sgrubb at redhat.com> 1.7.11-1
 - New upstream release
 



From walters at fedoraproject.org  Tue Jan 13 22:51:16 2009
From: walters at fedoraproject.org (Colin Walters)
Date: Tue, 13 Jan 2009 22:51:16 +0000 (UTC)
Subject: rpms/krb5-auth-dialog/devel krb5-auth-dialog.spec,1.29,1.30
Message-ID: <20090113225116.413FD7013F@cvs1.fedora.phx.redhat.com>

Author: walters

Update of /cvs/pkgs/rpms/krb5-auth-dialog/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27810

Modified Files:
	krb5-auth-dialog.spec 
Log Message:
* Tue Jan 13 2009 Colin Walters <walters at verbum.org> - 0.8-1
- New upstream release
- Remove both patches; they are upstreamed
- Add gconf spec goo
- Add new stuff to files list



Index: krb5-auth-dialog.spec
===================================================================
RCS file: /cvs/pkgs/rpms/krb5-auth-dialog/devel/krb5-auth-dialog.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- krb5-auth-dialog.spec	18 Feb 2008 02:51:21 -0000	1.29
+++ krb5-auth-dialog.spec	13 Jan 2009 22:50:45 -0000	1.30
@@ -5,12 +5,12 @@
 
 Summary: Kerberos 5 authentication dialog
 Name: krb5-auth-dialog
-Version: 0.7
-Release: 7%{?dist}
+Version: 0.8
+Release: 1%{?dist}
 License: GPLv2+
 Group: User Interface/X
 URL: http://www.redhat.com/
-Source0: %{name}-%{version}.tar.bz2
+Source0: %{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: libgnomeui-devel >= %{libgnomeui_version}
 BuildRequires: krb5-devel >= %{krb5_version}
@@ -21,8 +21,10 @@
 %endif
 Requires: libgnomeui >= %{libgnomeui_version}
 Requires: krb5-libs >= %{krb5_version}
+Requires(pre): GConf2
+Requires(post): GConf2
+Requires(preun): GConf2
 
-Patch1: krb5-auth-dialog-0.7-sm-disable.patch
 Patch2: desktop-file-comment.patch
 
 %description
@@ -31,8 +33,6 @@
 
 %prep
 %setup -q
-%patch1 -p1 -b .sm-disable
-%patch2 -p1 -b .comment
 
 %build
 %configure
@@ -50,13 +50,39 @@
 %files -f %name.lang
 %defattr(-,root,root,-)
 %doc
+%{_sysconfdir}/gconf/schemas/*.schemas
 %{_bindir}/krb5-auth-dialog
 %{_datadir}/krb5-auth-dialog/
+%{_datadir}/icons/*
 %{_mandir}/man1/*
 %{_sysconfdir}/xdg/autostart/krb5-auth-dialog.desktop
 
+%post
+export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+gconftool-2 --makefile-install-rule \
+        %{_sysconfdir}/gconf/schemas/krb5-auth-dialog.schemas >/dev/null || :
+
+%pre
+if [ "$1" -gt 1 ]; then
+    export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+    gconftool-2 --makefile-uninstall-rule \
+      %{_sysconfdir}/gconf/schemas/krb5-auth-dialog.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/krb5-auth-dialog.schemas &> /dev/null || :
+fi
 
 %changelog
+* Tue Jan 13 2009 Colin Walters <walters at verbum.org> - 0.8-1
+- New upstream release
+- Remove both patches; they are upstreamed
+- Add gconf spec goo
+- Add new stuff to files list
+
 * Mon Feb 18 2008 Christopher Aillon <caillon at redhat.com> - 0.7-7
 - Rebuild to celebrate my birthday (and GCC 4.3)
 



From kevin at fedoraproject.org  Tue Jan 13 22:52:52 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 13 Jan 2009 22:52:52 +0000 (UTC)
Subject: rpms/xfprint/devel sources, 1.10, 1.11 .cvsignore, 1.10,
	1.11 xfprint.spec, 1.22, 1.23
Message-ID: <20090113225252.BF4D77013F@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfprint/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28500

Modified Files:
	sources .cvsignore xfprint.spec 
Log Message:
Update to 4.5.92



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfprint/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	27 Oct 2008 18:24:33 -0000	1.10
+++ sources	13 Jan 2009 22:52:22 -0000	1.11
@@ -1 +1 @@
-7fc2cb1e531d22717b17f9f87711ec05  xfprint-4.4.3.tar.bz2
+7945ab513be2a518cfaa03ba9867b066  xfprint-4.5.92.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfprint/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	27 Oct 2008 18:24:33 -0000	1.10
+++ .cvsignore	13 Jan 2009 22:52:22 -0000	1.11
@@ -1 +1 @@
-xfprint-4.4.3.tar.bz2
+xfprint-4.5.92.tar.bz2


Index: xfprint.spec
===================================================================
RCS file: /cvs/extras/rpms/xfprint/devel/xfprint.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- xfprint.spec	27 Oct 2008 18:24:33 -0000	1.22
+++ xfprint.spec	13 Jan 2009 22:52:22 -0000	1.23
@@ -1,6 +1,6 @@
 Summary: Print dialog and printer manager for Xfce 4
 Name: xfprint
-Version: 4.4.3
+Version: 4.5.92
 Release: 1%{?dist}
 License: GPLv2+
 URL: http://www.xfce.org
@@ -9,15 +9,13 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: libxfcegui4 >= %{version}
 Requires: a2ps
-Requires: xfce-mcs-manager >= %{version}
 BuildRequires: glib2-devel
 BuildRequires: libxfcegui4-devel >= %{version}
-BuildRequires: libxfce4mcs-devel >= %{version}
-BuildRequires: xfce-mcs-manager-devel >= %{version}
 BuildRequires: a2ps
 BuildRequires: cups-devel
 BuildRequires: gnutls-devel
 BuildRequires: gettext intltool
+BuildRequires: xfconf-devel
 
 %description
 xfprint contains a print dialog and a printer manager for the
@@ -37,7 +35,8 @@
 
 %build
 %configure  --disable-static
-
+sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
+sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
 make %{?_smp_mflags}
 
 %install
@@ -70,7 +69,6 @@
 %defattr(-,root,root,-)
 %doc README ChangeLog NEWS COPYING AUTHORS
 %{_bindir}/*
-%{_libdir}/xfce4/mcs-plugins/*
 %{_libdir}/xfce4/xfprint-plugins
 %{_libdir}/*.so.*
 %{_datadir}/applications/*
@@ -86,6 +84,9 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Sat Dec 27 2008 Kevin Fenzi <kevin at tummy.com> - 4.5.92-1
+- Update to 4.5.92
+
 * Mon Oct 27 2008 Christoph Wickert <cwickert at fedoraproject.org> - 4.4.3-1
 - Update to 4.4.3
 - BuildRequire intltool



From walters at fedoraproject.org  Tue Jan 13 22:53:16 2009
From: walters at fedoraproject.org (Colin Walters)
Date: Tue, 13 Jan 2009 22:53:16 +0000 (UTC)
Subject: rpms/krb5-auth-dialog/devel .cvsignore,1.8,1.9 sources,1.8,1.9
Message-ID: <20090113225316.0CC847013F@cvs1.fedora.phx.redhat.com>

Author: walters

Update of /cvs/pkgs/rpms/krb5-auth-dialog/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28587

Modified Files:
	.cvsignore sources 
Log Message:
* Tue Jan 13 2009 Colin Walters <walters at verbum.org> - 0.8-1
- New upstream release
- Remove both patches; they are upstreamed
- Add gconf spec goo
- Add new stuff to files list



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/krb5-auth-dialog/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	24 Jul 2006 18:08:31 -0000	1.8
+++ .cvsignore	13 Jan 2009 22:52:45 -0000	1.9
@@ -1 +1 @@
-krb5-auth-dialog-0.7.tar.bz2
+krb5-auth-dialog-0.8.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/krb5-auth-dialog/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	24 Jul 2006 18:08:32 -0000	1.8
+++ sources	13 Jan 2009 22:52:45 -0000	1.9
@@ -1 +1 @@
-0c37b6d9d5a195ffbbf7c9dbbc6391f9  krb5-auth-dialog-0.7.tar.bz2
+a1cd821bba2a8ea6dae8ced2d191502d  krb5-auth-dialog-0.8.tar.gz



From mathstuf at fedoraproject.org  Tue Jan 13 23:05:06 2009
From: mathstuf at fedoraproject.org (Ben Boeckel)
Date: Tue, 13 Jan 2009 23:05:06 +0000 (UTC)
Subject: rpms/krazy2/devel .cvsignore, 1.2, 1.3 krazy2.spec, 1.3, 1.4 sources,
	1.4, 1.5
Message-ID: <20090113230506.828BC7013F@cvs1.fedora.phx.redhat.com>

Author: mathstuf

Update of /cvs/pkgs/rpms/krazy2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30067

Modified Files:
	.cvsignore krazy2.spec sources 
Log Message:
Updated to version 2.8
Added krazy-licensecheck (taken from kdesdk)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/krazy2/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	23 Sep 2008 03:21:02 -0000	1.2
+++ .cvsignore	13 Jan 2009 23:04:36 -0000	1.3
@@ -1 +1 @@
-krazy2-2.6.tar.bz2
+krazy2-2.8.tar.bz2


Index: krazy2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/krazy2/devel/krazy2.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- krazy2.spec	8 Oct 2008 17:06:25 -0000	1.3
+++ krazy2.spec	13 Jan 2009 23:04:36 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           krazy2
-Version:        2.6
-Release:        6.20081008svn869261%{?dist}
+Version:        2.8
+Release:        2.20090105svn909634%{?dist}
 Summary:        Krazy is a tool for checking code against the KDE coding guidelines
 
 Group:          Development/Libraries
@@ -8,9 +8,14 @@
 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 869261 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
+#  svn export -r 909634 svn://anonsvn.kde.org/home/kde/trunk/quality/krazy2 krazy2-2.8
+#  tar -c krazy2-2.8 | bzip2 --best -c > krazy2-2.8.tar.bz2
 Source0:        krazy2-%{version}.tar.bz2
+# TODO: Remove if/when 4.2 hits F9 and F10
+%if 0%{?fedora} > 10
+Source1:        krazy2-licensecheck
+Patch0:         checkutil-libsuffix.patch
+%endif
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  groff
@@ -19,6 +24,10 @@
 BuildRequires:  perl(Tie::IxHash)
 BuildRequires:  perl(XML::LibXML)
 BuildRequires:  qt4-devel
+# FIXME: Needs KDevPlatform4
+# BuildRequires:  cmake
+# BuildRequires:  kdelibs4-devel
+# BuildRequires:  kdevplatform-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
@@ -31,6 +40,9 @@
 
 %prep
 %setup -q
+%if 0%{?fedora} > 10
+%patch0
+%endif
 
 
 %build
@@ -40,6 +52,11 @@
 %{_qt4_qmake}
 make %{?_smp_mflags}
 popd
+# FIXME: Needs KDevelop4
+#pushd cppchecks
+#{cmake}
+#make VERBOSE=1 %{?_smp_mflags}
+#popd
 
 
 %install
@@ -82,6 +99,13 @@
 pushd doc
 make DESTDIR=%{buildroot}%{_mandir} install
 popd
+%if 0%{fedora} > 10
+install -m 644 %{SOURCE1} %{buildroot}%{_bindir}/krazy-licensecheck
+%endif
+# FIXME: Needs KDevelop4
+# pushd cppchecks
+# make DESTDIR=%{buildroot} PREFIX=%{_prefix} 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 ';'
@@ -103,6 +127,9 @@
 %{_mandir}/man1/krazy2all.1.gz
 %{_mandir}/man1/krazy2ebn.1.gz
 %{_mandir}/man5/krazyrc.5.gz
+%if 0%{fedora} > 10
+%{_bindir}/krazy-licensecheck
+%endif
 %{_bindir}/krazy2
 %{_bindir}/krazy2all
 %{_bindir}/krazy2ebn
@@ -112,6 +139,13 @@
 
 
 %changelog
+* Thu Jan 8 2009 Ben Boeckel <MathStuf at gmail.com> 2.8-2.20090105svn906738
+- Moved krazy-licensecheck from kdesdk to here
+
+* Tue Jan 6 2009 Ben Boeckel <MathStuf at gmail.com> 2.8-1.20090105svn906738
+- New plugins and extra checks
+- Updated plugins
+
 * Wed Oct 8 2008 Ben Boeckel <MathStuf at gmail.com> 2.6-6.20081008svn869261
 - Updated SVN
 - Patch applied upstream


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/krazy2/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	8 Oct 2008 17:06:25 -0000	1.4
+++ sources	13 Jan 2009 23:04:36 -0000	1.5
@@ -1 +1 @@
-adfb89dcec51e6a0f2d12147caa441fc  krazy2-2.6.tar.bz2
+e0507238f2643be52e9edae5e2059c7d  krazy2-2.8.tar.bz2



From mathstuf at fedoraproject.org  Tue Jan 13 23:08:06 2009
From: mathstuf at fedoraproject.org (Ben Boeckel)
Date: Tue, 13 Jan 2009 23:08:06 +0000 (UTC)
Subject: rpms/krazy2/devel krazy2.spec,1.4,1.5
Message-ID: <20090113230806.D4D057013F@cvs1.fedora.phx.redhat.com>

Author: mathstuf

Update of /cvs/pkgs/rpms/krazy2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30426

Modified Files:
	krazy2.spec 
Log Message:
Fixed some mistakes in spec file



Index: krazy2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/krazy2/devel/krazy2.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- krazy2.spec	13 Jan 2009 23:04:36 -0000	1.4
+++ krazy2.spec	13 Jan 2009 23:07:36 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           krazy2
 Version:        2.8
-Release:        2.20090105svn909634%{?dist}
+Release:        2.20090111svn909634%{?dist}
 Summary:        Krazy is a tool for checking code against the KDE coding guidelines
 
 Group:          Development/Libraries
@@ -139,7 +139,7 @@
 
 
 %changelog
-* Thu Jan 8 2009 Ben Boeckel <MathStuf at gmail.com> 2.8-2.20090105svn906738
+* Tue Jan 13 2009 Ben Boeckel <MathStuf at gmail.com> 2.8-2.20090111svn909634
 - Moved krazy-licensecheck from kdesdk to here
 
 * Tue Jan 6 2009 Ben Boeckel <MathStuf at gmail.com> 2.8-1.20090105svn906738



From mathstuf at fedoraproject.org  Tue Jan 13 23:09:14 2009
From: mathstuf at fedoraproject.org (Ben Boeckel)
Date: Tue, 13 Jan 2009 23:09:14 +0000 (UTC)
Subject: rpms/krazy2/devel checkutil-libsuffix.patch,NONE,1.1
Message-ID: <20090113230914.050987013F@cvs1.fedora.phx.redhat.com>

Author: mathstuf

Update of /cvs/pkgs/rpms/krazy2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30712

Added Files:
	checkutil-libsuffix.patch 
Log Message:
Forgot checkutil patch

checkutil-libsuffix.patch:

--- NEW FILE checkutil-libsuffix.patch ---
diff -r -U 5 cppchecks/checkutil/CMakeLists.txt cppchecks/checkutil/CMakeLists.txt
--- cppchecks/checkutil/CMakeLists.txt	2009-01-10 17:11:44.000000000 -0500
+++ cppchecks/checkutil/CMakeLists.txt	2009-01-13 17:58:02.000000000 -0500
@@ -9,6 +9,6 @@
     ${QT_QTCORE_LIBRARY}
     # For these two you need to install KDevelop
     c++parser
 )
 set_target_properties(checkutil PROPERTIES VERSION 1 SOVERSION 1.0)
-install(TARGETS checkutil DESTINATION ${CMAKE_PREFIX_PATH}/lib)
+install(TARGETS checkutil DESTINATION ${CMAKE_PREFIX_PATH}/lib${LIB_SUFFIX})



From kevin at fedoraproject.org  Tue Jan 13 23:11:48 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 13 Jan 2009 23:11:48 +0000 (UTC)
Subject: rpms/xfwm4/devel xfwm4.spec, 1.27, 1.28 sources, 1.11,
	1.12 .cvsignore, 1.11, 1.12 xfwm4-4.4.2-nodoka.patch, 1.1,
	NONE xfwm4-bluecurve.patch, 1.1,
	NONE xfwm4-bluecurve-prep-4.2.2.patch, 1.1,
	NONE xfwm4-bluecurve-prep-4.2.3.1.patch, 1.1,
	NONE xfwm4-bluecurve-prep.patch, 1.1, NONE xfwm4-focus-bug.patch,
	1.1, NONE
Message-ID: <20090113231148.47AD27013F@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfwm4/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31014

Modified Files:
	xfwm4.spec sources .cvsignore 
Removed Files:
	xfwm4-4.4.2-nodoka.patch xfwm4-bluecurve.patch 
	xfwm4-bluecurve-prep-4.2.2.patch 
	xfwm4-bluecurve-prep-4.2.3.1.patch xfwm4-bluecurve-prep.patch 
	xfwm4-focus-bug.patch 
Log Message:
Update to 4.5.92



Index: xfwm4.spec
===================================================================
RCS file: /cvs/extras/rpms/xfwm4/devel/xfwm4.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- xfwm4.spec	27 Oct 2008 21:09:01 -0000	1.27
+++ xfwm4.spec	13 Jan 2009 23:11:17 -0000	1.28
@@ -1,21 +1,17 @@
 Summary: Next generation window manager for Xfce
 Name: xfwm4
-Version: 4.4.3
+Version: 4.5.92
 Release: 1%{?dist}
 License: GPLv2+
 URL: http://www.xfce.org/
 Source0: http://www.xfce.org/archive/xfce-%{version}/src/xfwm4-%{version}.tar.bz2
-Patch0: xfwm4-4.4.2-nodoka.patch
+Patch0: xfwm4-4.5.92-nodoka.patch
 
 Group: User Interface/Desktops
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Requires: libxfce4mcs >= %{version}
 Requires: libxfcegui4 >= %{version}
-Requires: xfce-mcs-manager >= %{version}
-BuildRequires: libxfce4mcs-devel >= %{version}
 BuildRequires: libxfcegui4-devel >= %{version}
-BuildRequires: xfce-mcs-manager-devel >= %{version}
 BuildRequires: imake
 BuildRequires: libXt-devel
 BuildRequires: libXpm-devel
@@ -24,6 +20,9 @@
 BuildRequires: libXcomposite-devel
 BuildRequires: libXdamage-devel
 BuildRequires: startup-notification-devel
+BuildRequires: libglade2-devel
+BuildRequires: libwnck-devel
+BuildRequires: xfconf-devel
 
 %description
 xfwm4 is a window manager compatible with GNOME, GNOME2, KDE2, KDE3 and Xfce.
@@ -42,8 +41,6 @@
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
-rm -f $RPM_BUILD_ROOT/%{_libdir}/xfce4/mcs-plugins/*.la
-
 %find_lang %{name}
 
 %clean
@@ -65,7 +62,9 @@
 %defattr(-,root,root,-)
 %doc example.gtkrc-2.0 README TODO COPYING AUTHORS COMPOSITOR
 %{_bindir}/xfwm4
-%{_libdir}/xfce4/mcs-plugins/*.so
+%{_bindir}/xfwm4-settings
+%{_bindir}/xfwm4-tweaks-settings
+%{_bindir}/xfwm4-workspace-settings
 %{_datadir}/applications/*
 %{_datadir}/icons/hicolor/*/*/*
 %dir %{_datadir}/xfce4
@@ -73,8 +72,12 @@
 %{_datadir}/xfce4/doc/*/*.html
 %{_datadir}/xfwm4
 %{_datadir}/themes
+%{_libexecdir}/xfce4
 
 %changelog
+* Sat Dec 27 2008 Kevin Fenzi <kevin at tummy.com> - 4.5.92-1
+- Update to 4.5.92
+
 * Mon Oct 27 2008 Christoph Wickert <cwickert at fedoraproject.org> - 4.4.3-1
 - Update to 4.4.3
 - Update gtk-update-icon-cache scriptlets


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfwm4/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	27 Oct 2008 20:59:49 -0000	1.11
+++ sources	13 Jan 2009 23:11:17 -0000	1.12
@@ -1 +1 @@
-d15089f06187c029aee4cb87f75c302d  xfwm4-4.4.3.tar.bz2
+941823870ee48b025f2cb72bec9d6fd3  xfwm4-4.5.92.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfwm4/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	27 Oct 2008 20:59:49 -0000	1.11
+++ .cvsignore	13 Jan 2009 23:11:17 -0000	1.12
@@ -1 +1 @@
-xfwm4-4.4.3.tar.bz2
+xfwm4-4.5.92.tar.bz2


--- xfwm4-4.4.2-nodoka.patch DELETED ---


--- xfwm4-bluecurve.patch DELETED ---


--- xfwm4-bluecurve-prep-4.2.2.patch DELETED ---


--- xfwm4-bluecurve-prep-4.2.3.1.patch DELETED ---


--- xfwm4-bluecurve-prep.patch DELETED ---


--- xfwm4-focus-bug.patch DELETED ---



From kevin at fedoraproject.org  Tue Jan 13 23:12:25 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 13 Jan 2009 23:12:25 +0000 (UTC)
Subject: rpms/xfwm4/devel xfwm4-4.5.92-nodoka.patch,NONE,1.1
Message-ID: <20090113231225.BBE657013F@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfwm4/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31204

Added Files:
	xfwm4-4.5.92-nodoka.patch 
Log Message:
Update to 4.5.92


xfwm4-4.5.92-nodoka.patch:

--- NEW FILE xfwm4-4.5.92-nodoka.patch ---
diff -Nur xfwm4-4.5.92.orig/src/parserc.c xfwm4-4.5.92/src/parserc.c
--- xfwm4-4.5.92.orig/src/parserc.c	2008-11-11 15:54:25.000000000 -0700
+++ xfwm4-4.5.92/src/parserc.c	2008-12-30 15:24:26.000000000 -0700
@@ -36,7 +36,7 @@
 #include "parserc.h"
 
 #ifndef DEFAULT_THEME
-#define DEFAULT_THEME "Default"
+#define DEFAULT_THEME "Nodoka"
 #endif
 
 #define TOINT(x)                (x ? atoi(x) : 0)



From mathstuf at fedoraproject.org  Tue Jan 13 23:14:02 2009
From: mathstuf at fedoraproject.org (Ben Boeckel)
Date: Tue, 13 Jan 2009 23:14:02 +0000 (UTC)
Subject: rpms/krazy2/devel krazy2.spec,1.5,1.6
Message-ID: <20090113231402.17F207013F@cvs1.fedora.phx.redhat.com>

Author: mathstuf

Update of /cvs/pkgs/rpms/krazy2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31503

Modified Files:
	krazy2.spec 
Log Message:
Retagging for missed patch



Index: krazy2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/krazy2/devel/krazy2.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- krazy2.spec	13 Jan 2009 23:07:36 -0000	1.5
+++ krazy2.spec	13 Jan 2009 23:13:31 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           krazy2
 Version:        2.8
-Release:        2.20090111svn909634%{?dist}
+Release:        3.20090111svn909634%{?dist}
 Summary:        Krazy is a tool for checking code against the KDE coding guidelines
 
 Group:          Development/Libraries
@@ -139,6 +139,9 @@
 
 
 %changelog
+* Tue Jan 13 2009 Ben Boeckel <MathStuf at gmail.com> 2.8-3.20090111svn909634
+- Missed the patch
+
 * Tue Jan 13 2009 Ben Boeckel <MathStuf at gmail.com> 2.8-2.20090111svn909634
 - Moved krazy-licensecheck from kdesdk to here
 



From kevin at fedoraproject.org  Tue Jan 13 23:19:17 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 13 Jan 2009 23:19:17 +0000 (UTC)
Subject: rpms/xfce4-panel/devel xfce4-panel-4.5.92-defaults.patch, NONE,
	1.1 sources, 1.10, 1.11 .cvsignore, 1.10, 1.11 xfce4-panel.spec,
	1.28, 1.29 panel-htmlview.patch, 1.2,
	NONE panel-launchmail.patch, 1.1,
	NONE xfce4-panel-4.4.1-multilib.patch, 1.1,
	NONE xfce4-panel-4.4.2-defaults.patch, 1.7, NONE
Message-ID: <20090113231917.C6A177013F@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce4-panel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32599

Modified Files:
	sources .cvsignore xfce4-panel.spec 
Added Files:
	xfce4-panel-4.5.92-defaults.patch 
Removed Files:
	panel-htmlview.patch panel-launchmail.patch 
	xfce4-panel-4.4.1-multilib.patch 
	xfce4-panel-4.4.2-defaults.patch 
Log Message:
Update to 4.5.92


xfce4-panel-4.5.92-defaults.patch:

--- NEW FILE xfce4-panel-4.5.92-defaults.patch ---
diff -Nur xfce4-panel-4.5.92.orig/config/Makefile.am xfce4-panel-4.5.92/config/Makefile.am
--- xfce4-panel-4.5.92.orig/config/Makefile.am	2008-09-06 04:10:18.000000000 -0600
+++ xfce4-panel-4.5.92/config/Makefile.am	2008-12-30 15:56:48.000000000 -0700
@@ -17,6 +17,7 @@
 	systray-4.rc							\
 	xfce4-menu-5.rc							\
 	clock-14.rc							\
+	xfce4-mixer-20.rc						\
 	$(conf_files)
 
 # copied from INTLTOOL_DESKTOP_RULE
@@ -27,6 +28,7 @@
 	systray-4.rc							\
 	xfce4-menu-5.rc							\
 	clock-14.rc							\
+	xfce4-mixer-20.rc						\
 	$(conf_in_files)
 
 distclean-local:
diff -Nur xfce4-panel-4.5.92.orig/config/Makefile.in xfce4-panel-4.5.92/config/Makefile.in
--- xfce4-panel-4.5.92.orig/config/Makefile.in	2008-11-11 23:40:39.000000000 -0700
+++ xfce4-panel-4.5.92/config/Makefile.in	2008-12-30 15:57:35.000000000 -0700
@@ -279,6 +279,7 @@
 	systray-4.rc							\
 	xfce4-menu-5.rc							\
 	clock-14.rc							\
+	xfce4-mixer-20.rc						\
 	$(conf_files)
 
 EXTRA_DIST = \
@@ -286,6 +287,7 @@
 	systray-4.rc							\
 	xfce4-menu-5.rc							\
 	clock-14.rc							\
+	xfce4-mixer-20.rc						\
 	$(conf_in_files)
 
 all: all-am
diff -Nur xfce4-panel-4.5.92.orig/config/panels.xml xfce4-panel-4.5.92/config/panels.xml
--- xfce4-panel-4.5.92.orig/config/panels.xml	2008-09-06 04:10:18.000000000 -0600
+++ xfce4-panel-4.5.92/config/panels.xml	2008-12-30 15:58:09.000000000 -0700
@@ -19,6 +19,8 @@
 			<item name="pager" id="2"/>
 			<item name="tasklist" id="3"/>
 			<item name="systray" id="4"/>
+			<item name="xfce4-mixer" id="20"/>
+			<item name="thunar-tpa" id="21"/>
 		</items>
 	</panel>
 	<panel>
diff -Nur xfce4-panel-4.5.92.orig/config/xfce4-mixer-20.rc xfce4-panel-4.5.92/config/xfce4-mixer-20.rc
--- xfce4-panel-4.5.92.orig/config/xfce4-mixer-20.rc	1969-12-31 17:00:00.000000000 -0700
+++ xfce4-panel-4.5.92/config/xfce4-mixer-20.rc	2008-12-30 15:58:36.000000000 -0700
@@ -0,0 +1,6 @@
+[mixer-plugin]
+LauncherRunInTerminal=false
+LauncherUseStartupNotification=false
+Device=default
+LauncherCommand=xfce4-mixer
+MasterControl=Master,0


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfce4-panel/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	27 Oct 2008 21:29:16 -0000	1.10
+++ sources	13 Jan 2009 23:18:47 -0000	1.11
@@ -1 +1 @@
-06ef9294062f9bdee4106772e62802f5  xfce4-panel-4.4.3.tar.bz2
+a76c63aaa1a13ab9eac83651573770c4  xfce4-panel-4.5.92.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfce4-panel/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	27 Oct 2008 21:29:16 -0000	1.10
+++ .cvsignore	13 Jan 2009 23:18:47 -0000	1.11
@@ -1 +1 @@
-xfce4-panel-4.4.3.tar.bz2
+xfce4-panel-4.5.92.tar.bz2


Index: xfce4-panel.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-panel/devel/xfce4-panel.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- xfce4-panel.spec	27 Oct 2008 21:29:16 -0000	1.28
+++ xfce4-panel.spec	13 Jan 2009 23:18:47 -0000	1.29
@@ -1,27 +1,25 @@
 Summary: Next generation panel for Xfce
 Name: xfce4-panel
-Version: 4.4.3
+Version: 4.5.92
 Release: 1%{?dist}
 License: GPLv2+ and LGPLv2+
 URL: http://www.xfce.org/
 Source0: http://www.xfce.org/archive/xfce-%{version}/src/xfce4-panel-%{version}.tar.bz2
-Patch0: xfce4-panel-4.4.1-multilib.patch
-Patch1: xfce4-panel-4.4.2-defaults.patch
+Patch0: xfce4-panel-4.5.92-defaults.patch
 Group: User Interface/Desktops
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires: libxfcegui4 >= %{version}
-Requires: libxfce4mcs >= %{version}
-Requires: xfce-mcs-manager >= %{version}
 Requires: Terminal
 Requires: mousepad
 BuildRequires: libxfcegui4-devel >= %{version}
-BuildRequires: libxfce4mcs-devel >= %{version}
-BuildRequires: xfce-mcs-manager-devel >= %{version}
 BuildRequires: libxml2-devel >= 2.4.0
 BuildRequires: startup-notification-devel
 BuildRequires: imake
 BuildRequires: libXt-devel
 BuildRequires: gettext intltool
+BuildRequires: exo-devel >= 0.3.92
+BuildRequires: libwnck-devel
+
 # xfce4-iconbox isn't in Xfce 4.4
 Provides: xfce4-iconbox = %{version}-%{release}
 Obsoletes: xfce4-iconbox <= 4.2.3-4.fc6
@@ -62,17 +60,17 @@
 %prep
 %setup -q
 
-%patch0 -p1 -b .multilib
-%patch1 -p1 -b .default
+%patch0 -p1 -b .default
 
 %build
 %configure
+sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
+sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
 make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
-rm -f $RPM_BUILD_ROOT/%{_libdir}/xfce4/mcs-plugins/*.la
 rm -f $RPM_BUILD_ROOT/%{_libdir}/xfce4/panel-plugins/*.la
 rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la
 # remove useless dummy files
@@ -108,7 +106,6 @@
 %config(noreplace) %{_sysconfdir}/xdg/xfce4/panel/*.rc
 %config(noreplace) %{_sysconfdir}/xdg/xfce4/panel/panels.xml
 
-%{_libdir}/xfce4/mcs-plugins/*
 %{_libdir}/xfce4/panel-plugins/
 %{_libdir}/libxfce4panel.so.*
 %{_bindir}/*
@@ -127,6 +124,9 @@
 %{_includedir}/xfce4/libxfce4panel
 
 %changelog
+* Sat Dec 27 2008 Kevin Fenzi <kevin at tummy.com> - 4.5.92-1
+- Update to 4.5.92
+
 * Mon Oct 27 2008 Christoph Wickert <cwickert at fedoraproject.org> - 4.4.3-1
 - Update to 4.4.3
 - Remove mailwatch-plugin from default panel config again


--- panel-htmlview.patch DELETED ---


--- panel-launchmail.patch DELETED ---


--- xfce4-panel-4.4.1-multilib.patch DELETED ---


--- xfce4-panel-4.4.2-defaults.patch DELETED ---



From mathstuf at fedoraproject.org  Tue Jan 13 23:19:41 2009
From: mathstuf at fedoraproject.org (Ben Boeckel)
Date: Tue, 13 Jan 2009 23:19:41 +0000 (UTC)
Subject: rpms/krazy2/devel krazy-licensecheck,NONE,1.1 krazy2.spec,1.6,1.7
Message-ID: <20090113231941.4EB767013F@cvs1.fedora.phx.redhat.com>

Author: mathstuf

Update of /cvs/pkgs/rpms/krazy2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32667

Modified Files:
	krazy2.spec 
Added Files:
	krazy-licensecheck 
Log Message:
Added krazy-licensecheck


--- NEW FILE krazy-licensecheck ---
#!/bin/sh

krazy2 --verbose --check license $@


Index: krazy2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/krazy2/devel/krazy2.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- krazy2.spec	13 Jan 2009 23:13:31 -0000	1.6
+++ krazy2.spec	13 Jan 2009 23:19:11 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           krazy2
 Version:        2.8
-Release:        3.20090111svn909634%{?dist}
+Release:        4.20090111svn909634%{?dist}
 Summary:        Krazy is a tool for checking code against the KDE coding guidelines
 
 Group:          Development/Libraries
@@ -139,6 +139,9 @@
 
 
 %changelog
+* Tue Jan 13 2009 Ben Boeckel <MathStuf at gmail.com> 2.8-4.20090111svn909634
+- Forgot to commit krazy-licensecheck
+
 * Tue Jan 13 2009 Ben Boeckel <MathStuf at gmail.com> 2.8-3.20090111svn909634
 - Missed the patch
 



From orion at fedoraproject.org  Tue Jan 13 23:23:08 2009
From: orion at fedoraproject.org (Orion Poplawski)
Date: Tue, 13 Jan 2009 23:23:08 +0000 (UTC)
Subject: rpms/cmake/devel .cvsignore, 1.24, 1.25 cmake.spec, 1.50,
	1.51 sources, 1.24, 1.25
Message-ID: <20090113232308.627197013F@cvs1.fedora.phx.redhat.com>

Author: orion

Update of /cvs/pkgs/rpms/cmake/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1532

Modified Files:
	.cvsignore cmake.spec sources 
Log Message:
* Tue Jan 13 2009 Orion Poplawski <orion at cora.nwra.com> - 2.6.3-0.rc8.1
- Update to 2.6.3-RC-8



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cmake/devel/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- .cvsignore	10 Dec 2008 21:42:46 -0000	1.24
+++ .cvsignore	13 Jan 2009 23:22:37 -0000	1.25
@@ -1 +1 @@
-cmake-2.6.3-RC-5.tar.gz
+cmake-2.6.3-RC-8.tar.gz


Index: cmake.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cmake/devel/cmake.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- cmake.spec	4 Jan 2009 21:19:11 -0000	1.50
+++ cmake.spec	13 Jan 2009 23:22:37 -0000	1.51
@@ -4,11 +4,11 @@
 # Set to bcond_with or use --without gui to disable qt4 gui build
 %bcond_without gui
 # Set to RC version if building RC, else %{nil}
-%define rcver -RC-5
+%define rcver -RC-8
 
 Name:           cmake
 Version:        2.6.3
-Release:        0.2.rc5%{?dist}
+Release:        0.rc8.1%{?dist}
 Summary:        Cross-platform make system
 
 Group:          Development/Tools
@@ -125,6 +125,9 @@
 
 
 %changelog
+* Tue Jan 13 2009 Orion Poplawski <orion at cora.nwra.com> - 2.6.3-0.rc8.1
+- Update to 2.6.3-RC-8
+
 * Sun Jan 04 2009 Rex Dieter <rdieter at fedoraproject.org> - 2.6.3-0.2.rc5
 - macros.cmake: add -DCMAKE_SKIP_RPATH:BOOL=ON
 - fix Release tag


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cmake/devel/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- sources	10 Dec 2008 21:42:46 -0000	1.24
+++ sources	13 Jan 2009 23:22:37 -0000	1.25
@@ -1 +1 @@
-b4f84a6e4c3063e65a2989f5246252da  cmake-2.6.3-RC-5.tar.gz
+fa27971281311af285bc653d5c78f19d  cmake-2.6.3-RC-8.tar.gz



From scop at fedoraproject.org  Tue Jan 13 23:24:57 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Tue, 13 Jan 2009 23:24:57 +0000 (UTC)
Subject: rpms/rpmlint/devel rpmlint.spec,1.55,1.56 rpmlint.config,1.27,1.28
Message-ID: <20090113232457.80B097013F@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/rpmlint/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1980

Modified Files:
	rpmlint.spec rpmlint.config 
Log Message:
Mute filename-too-long-for-joliet warnings in default config.


Index: rpmlint.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rpmlint/devel/rpmlint.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- rpmlint.spec	1 Dec 2008 15:00:40 -0000	1.55
+++ rpmlint.spec	13 Jan 2009 23:24:27 -0000	1.56
@@ -70,6 +70,9 @@
 
 
 %changelog
+* Wed Jan 14 2009 Ville Skytt?? <ville.skytta at iki.fi>
+- Mute filename-too-long-for-joliet warnings in default config.
+
 * Mon Dec 01 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 0.85-3
 - Rebuild for Python 2.6
 


Index: rpmlint.config
===================================================================
RCS file: /cvs/pkgs/rpms/rpmlint/devel/rpmlint.config,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- rpmlint.config	30 Oct 2008 22:01:09 -0000	1.27
+++ rpmlint.config	13 Jan 2009 23:24:27 -0000	1.28
@@ -255,3 +255,4 @@
 addFilter("hardcoded-library-path .*/lib/udev(/|$)")
 addFilter("not-standard-release-extension")
 addFilter("explicit-lib-dependency (liberation-fonts|libertas-.*-firmware)")
+addFilter("filename-too-long-for-joliet")



From orion at fedoraproject.org  Tue Jan 13 23:28:32 2009
From: orion at fedoraproject.org (Orion Poplawski)
Date: Tue, 13 Jan 2009 23:28:32 +0000 (UTC)
Subject: rpms/ftnchek/devel ftnchek-3.3.1-varfmt.patch, NONE,
	1.1 ftnchek.spec, 1.7, 1.8
Message-ID: <20090113232832.669C17013F@cvs1.fedora.phx.redhat.com>

Author: orion

Update of /cvs/pkgs/rpms/ftnchek/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2452

Modified Files:
	ftnchek.spec 
Added Files:
	ftnchek-3.3.1-varfmt.patch 
Log Message:
* Tue Jan 13 2009 Orion Poplawski <orion at cora.nwra.com> 3.3.1-9
- Add upstream varfmt patch


ftnchek-3.3.1-varfmt.patch:

--- NEW FILE ftnchek-3.3.1-varfmt.patch ---
diff -c ftnchek-3.3.1/forlex.c ftnchek-3.3.1-1/forlex.c
*** ftnchek-3.3.1/forlex.c	2004-12-31 12:22:16.000000000 -0500
--- ftnchek-3.3.1-1/forlex.c	2006-06-25 12:59:02.000000000 -0400
***************
*** 755,760 ****
--- 755,766 ----
  	  }
  	  break;
  
+ 	  /* Next case can only occur in illegal code */
+         case 'H':
+ 	      syntax_error(token->line_num,token->col_num,
+ 			   "H specifier missing preceding number");
+ 	      break;
+ 
  	default:
  	  if(f77_format_extensions || f90_format_extensions) {
  	    nonstandard(token->line_num,token->col_num,f90_format_extensions,0);
***************
*** 1553,1558 ****
--- 1559,1575 ----
                  advance();
  		src_text_buf[src_text_len++] = curr_char;
  	}
+ 	/* Catch closing > of variable format here so it taken as
+ 	   delimiter not f90 relops.   Note that inside_format is
+ 	   turned off while scanning the expr inside < > so we use
+ 	   curr_stmt_class instead to detect this case.  Assumes that
+ 	   a > as relop cannot occur in var fmt expr.  This could be
+ 	   made sure by checking if outside of parens.
+ 	*/
+ 	else if( curr_char == '>'  && curr_stmt_class == tok_FORMAT ) {
+ 	  get_simple_punctuation(token);
+ 	  return;
+ 	}
  				/* recognize F90 rel-ops here */
  	else if( f90_relop(token,&multichar) ) {
  	  token->tclass = tok_relop;
diff -c ftnchek-3.3.1/fortran.y ftnchek-3.3.1-1/fortran.y
*** ftnchek-3.3.1/fortran.y	2004-11-17 21:06:04.000000000 -0500
--- ftnchek-3.3.1-1/fortran.y	2006-06-25 13:03:34.000000000 -0400
***************
*** 3496,3501 ****
--- 3496,3502 ----
  			{
  			  if(f77_variable_format || f90_variable_format)
  			     nonstandard($1.line_num,$1.col_num,f90_variable_format,0);
+ 			  msg_tail(": variable format");
  			}
  		;
  


Index: ftnchek.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ftnchek/devel/ftnchek.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ftnchek.spec	28 Aug 2008 16:34:44 -0000	1.7
+++ ftnchek.spec	13 Jan 2009 23:28:01 -0000	1.8
@@ -8,6 +8,7 @@
 URL:            http://www.dsm.fordham.edu/~ftnchek/
 Source0:        http://www.dsm.fordham.edu/~ftnchek/download/ftnchek-3.3.1.tar.gz
 Patch0:         ftnchek-3.3.1-datadir.patch
+Patch1:         http://www.dsm.fordham.edu/~ftnchek/download/ftnchek-3.3.1-varfmt.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  groff, emacs
@@ -41,6 +42,7 @@
 %prep
 %setup -q
 %patch0 -p1 -b .datadir
+%patch1 -p1 -b .varfmt
 #Stop configure from overriding CFLAGS
 sed -i -e 's/CFLAGS="-DUNIX.*"//' configure
 
@@ -77,6 +79,9 @@
 
 
 %changelog
+* Tue Jan 13 2009 Orion Poplawski <orion at cora.nwra.com> 3.3.1-9
+- Add upstream varfmt patch
+
 * Thu Aug 28 2008 Orion Poplawski <orion at cora.nwra.com> 3.3.1-8
 - Change %%patch -> %%patch0
 



From deji at fedoraproject.org  Tue Jan 13 23:32:25 2009
From: deji at fedoraproject.org (Deji Akingunola)
Date: Tue, 13 Jan 2009 23:32:25 +0000 (UTC)
Subject: rpms/tokyocabinet/devel .cvsignore, 1.8, 1.9 sources, 1.8,
	1.9 tokyocabinet-fedora.patch, 1.1, 1.2 tokyocabinet.spec, 1.8, 1.9
Message-ID: <20090113233225.8E3A67013F@cvs1.fedora.phx.redhat.com>

Author: deji

Update of /cvs/pkgs/rpms/tokyocabinet/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3150

Modified Files:
	.cvsignore sources tokyocabinet-fedora.patch tokyocabinet.spec 
Log Message:
* Tue Jan 13 2009 Deji Akingunola <dakingun at gmail.com> - 1.3.27-1
- Update to version 1.3.27



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/tokyocabinet/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	26 Aug 2008 03:27:50 -0000	1.8
+++ .cvsignore	13 Jan 2009 23:31:55 -0000	1.9
@@ -1 +1 @@
-tokyocabinet-1.3.4.tar.gz
+tokyocabinet-1.3.27.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tokyocabinet/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	26 Aug 2008 03:27:50 -0000	1.8
+++ sources	13 Jan 2009 23:31:55 -0000	1.9
@@ -1 +1 @@
-2ce8b1d19ceb1ecdd07951bf019f3c89  tokyocabinet-1.3.4.tar.gz
+9dfaa4311717ee3ab56c873af312f045  tokyocabinet-1.3.27.tar.gz

tokyocabinet-fedora.patch:

Index: tokyocabinet-fedora.patch
===================================================================
RCS file: /cvs/pkgs/rpms/tokyocabinet/devel/tokyocabinet-fedora.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tokyocabinet-fedora.patch	29 Nov 2007 22:34:36 -0000	1.1
+++ tokyocabinet-fedora.patch	13 Jan 2009 23:31:55 -0000	1.2
@@ -1,15 +1,16 @@
---- configure.in	2007-11-26 22:05:32.000000000 -0500
-+++ configure.in.new	2007-11-28 09:55:52.000000000 -0500
-@@ -25,25 +25,13 @@
+--- configure.in	2008-12-27 05:21:45.000000000 -0500
++++ configure.in.new	2009-01-13 18:16:44.000000000 -0500
+@@ -31,26 +31,14 @@
  MYPCFILES="tokyocabinet.pc"
  
  # Building flags
 -MYCFLAGS="-std=c99 -Wall -fPIC -fsigned-char -O2"
--MYCPPFLAGS="-I. -I\$(INCLUDEDIR) -L$HOME/include -L/usr/local/include -DNDEBUG -D_GNU_SOURCE=1"
+-MYCPPFLAGS="-I. -I\$(INCLUDEDIR) -I$HOME/include -I/usr/local/include -DNDEBUG -D_GNU_SOURCE=1"
 -MYLDFLAGS="-L. -L\$(LIBDIR) -L$HOME/lib -L/usr/local/lib"
 +MYCFLAGS="-std=c99 -Wall -fPIC -fsigned-char $CFLAGS"
 +MYCPPFLAGS="-I. -I\$(INCLUDEDIR) -DNDEBUG -D_GNU_SOURCE=1"
 +MYLDFLAGS="-L. -L\$(LIBDIR)"
+ MYCMDLDFLAGS=""
  MYRUNPATH="\$(LIBDIR)"
  MYLDLIBPATHENV="LD_LIBRARY_PATH"
  MYPOSTCMD="true"
@@ -18,18 +19,18 @@
 -pathtmp="$PATH"
 -PATH="$HOME/bin:/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin:/bin:/sbin"
 -PATH="$PATH:/usr/ccs/bin:/usr/ucb:/usr/xpg4/bin:/usr/xpg6/bin:$pathtmp"
+-CPATH="$HOME/include:/usr/local/include:$CPATH"
 -LIBRARY_PATH="$HOME/lib:/usr/local/lib:$LIBRARY_PATH"
 -LD_LIBRARY_PATH="$HOME/lib:/usr/local/lib:$LD_LIBRARY_PATH"
--CPATH="$HOME/include:/usr/local/include:$CPATH"
 -PKG_CONFIG_PATH="$HOME/lib/pkgconfig:/usr/local/lib/pkgconfig:$PKG_CONFIG_PATH"
--export PATH LIBRARY_PATH LD_LIBRARY_PATH CPATH PKG_CONFIG_PATH
+-export PATH CPATH LIBRARY_PATH LD_LIBRARY_PATH PKG_CONFIG_PATH
 -
 -
 -
  #================================================================
  # Options
  #================================================================
-@@ -96,7 +84,7 @@
+@@ -103,7 +91,7 @@
    AC_HELP_STRING([--enable-fastest], [build for fastest run]))
  if test "$enable_fastest" = "yes"
  then
@@ -38,11 +39,11 @@
    MYCFLAGS="$MYCFLAGS -fomit-frame-pointer -fforce-addr -minline-all-stringops"
    MYCPPFLAGS="$MYCPPFLAGS -D_MYFASTEST"
    enables="$enables (fastest)"
---- Makefile.in	2007-11-26 06:36:37.000000000 -0500
-+++ Makefile.in.new	2007-11-28 09:52:22.000000000 -0500
-@@ -51,8 +51,8 @@
- CFLAGS = @MYCFLAGS@
+--- Makefile.in	2008-12-22 12:02:44.000000000 -0500
++++ Makefile.in.new	2009-01-13 18:17:54.000000000 -0500
+@@ -54,8 +54,8 @@
  LDFLAGS = @MYLDFLAGS@
+ CMDLDFLAGS = @MYCMDLDFLAGS@
  LIBS = @LIBS@
 -LDENV = LD_RUN_PATH=/lib:/usr/lib:$(LIBDIR):$(HOME)/lib:/usr/local/lib:@MYRUNPATH@:.
 -RUNENV = @MYLDLIBPATHENV@=.:/lib:/usr/lib:$(LIBDIR):$(HOME)/lib:/usr/local/lib:@MYRUNPATH@
@@ -51,9 +52,9 @@
  POSTCMD = @MYPOSTCMD@
  
  
---- tokyocabinet.pc.in	2007-11-04 20:05:50.000000000 -0500
-+++ tokyocabinet.pc.in.new	2007-11-28 09:49:01.000000000 -0500
-@@ -9,5 +9,5 @@
+--- tokyocabinet.pc.in	2008-02-18 02:25:18.000000000 -0500
++++ tokyocabinet.pc.in.new	2009-01-13 18:18:52.000000000 -0500
+@@ -10,5 +10,5 @@
  Name: Tokyo Cabinet
  Description: a modern implementation of DBM
  Version: @PACKAGE_VERSION@


Index: tokyocabinet.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tokyocabinet/devel/tokyocabinet.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- tokyocabinet.spec	26 Aug 2008 03:48:20 -0000	1.8
+++ tokyocabinet.spec	13 Jan 2009 23:31:55 -0000	1.9
@@ -1,6 +1,6 @@
 Summary:	A modern implementation of a DBM
 Name:		tokyocabinet
-Version:	1.3.4
+Version:	1.3.27
 Release:	1%{?dist}
 License:	LGPLv2+
 Group:		Development/Libraries
@@ -70,9 +70,11 @@
 %doc doc/*
 
 %changelog
+* Tue Jan 13 2009 Deji Akingunola <dakingun at gmail.com> - 1.3.27-1
+- Update to version 1.3.27
+
 * Mon Aug 25 2008 Deji Akingunola <dakingun at gmail.com> - 1.3.4-1
 - Update to 1.3.4
-- Add bzip2-devel BR
 
 * Sun May 25 2008 Masahiro Hasegawa <masahase at gmail.com> - 1.2.6-1
 - Update to 1.2.6



From mathstuf at fedoraproject.org  Tue Jan 13 23:33:00 2009
From: mathstuf at fedoraproject.org (Ben Boeckel)
Date: Tue, 13 Jan 2009 23:33:00 +0000 (UTC)
Subject: rpms/krazy2/devel krazy2.spec,1.7,1.8
Message-ID: <20090113233300.697F17013F@cvs1.fedora.phx.redhat.com>

Author: mathstuf

Update of /cvs/pkgs/rpms/krazy2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3215

Modified Files:
	krazy2.spec 
Log Message:
Typo in spec file


Index: krazy2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/krazy2/devel/krazy2.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- krazy2.spec	13 Jan 2009 23:19:11 -0000	1.7
+++ krazy2.spec	13 Jan 2009 23:32:30 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           krazy2
 Version:        2.8
-Release:        4.20090111svn909634%{?dist}
+Release:        5.20090111svn909634%{?dist}
 Summary:        Krazy is a tool for checking code against the KDE coding guidelines
 
 Group:          Development/Libraries
@@ -13,7 +13,7 @@
 Source0:        krazy2-%{version}.tar.bz2
 # TODO: Remove if/when 4.2 hits F9 and F10
 %if 0%{?fedora} > 10
-Source1:        krazy2-licensecheck
+Source1:        krazy-licensecheck
 Patch0:         checkutil-libsuffix.patch
 %endif
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -139,6 +139,9 @@
 
 
 %changelog
+* Tue Jan 13 2009 Ben Boeckel <MathStuf at gmail.com> 2.8-5.20090111svn909634
+- Typo with sources
+
 * Tue Jan 13 2009 Ben Boeckel <MathStuf at gmail.com> 2.8-4.20090111svn909634
 - Forgot to commit krazy-licensecheck
 



From bskeggs at fedoraproject.org  Tue Jan 13 23:33:30 2009
From: bskeggs at fedoraproject.org (Ben Skeggs)
Date: Tue, 13 Jan 2009 23:33:30 +0000 (UTC)
Subject: rpms/kernel/F-10 drm-nouveau.patch, 1.3, 1.4 kernel.spec, 1.1211,
	1.1212
Message-ID: <20090113233330.1D7447013F@cvs1.fedora.phx.redhat.com>

Author: bskeggs

Update of /cvs/pkgs/rpms/kernel/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3298

Modified Files:
	drm-nouveau.patch kernel.spec 
Log Message:
update nouveau snapshot, and reenable

drm-nouveau.patch:

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.3 -r 1.4 drm-nouveau.patch
Index: drm-nouveau.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/drm-nouveau.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- drm-nouveau.patch	2 Sep 2008 14:56:52 -0000	1.3
+++ drm-nouveau.patch	13 Jan 2009 23:32:59 -0000	1.4
@@ -1,19 +1,110 @@
+From 5df129a266643714f0f5718ca972b7d959512072 Mon Sep 17 00:00:00 2001
+From: Ben Skeggs <skeggsb at gmail.com>
+Date: Tue, 13 Jan 2009 14:24:46 +1000
+Subject: [PATCH] drm: import nouveau driver
+
+---
+ drivers/gpu/drm/Kconfig                    |    6 +
+ drivers/gpu/drm/Makefile                   |    1 +
+ drivers/gpu/drm/drm_bufs.c                 |    5 +-
+ drivers/gpu/drm/nouveau/Makefile           |   20 +
+ drivers/gpu/drm/nouveau/nouveau_bo.c       |  296 +
+ drivers/gpu/drm/nouveau/nouveau_dma.c      |  172 +
+ drivers/gpu/drm/nouveau/nouveau_dma.h      |   96 +
+ drivers/gpu/drm/nouveau/nouveau_drm.h      |  184 +
+ drivers/gpu/drm/nouveau/nouveau_drv.c      |  112 +
+ drivers/gpu/drm/nouveau/nouveau_drv.h      |  621 ++
+ drivers/gpu/drm/nouveau/nouveau_fence.c    |  119 +
+ drivers/gpu/drm/nouveau/nouveau_fifo.c     |  601 ++
+ drivers/gpu/drm/nouveau/nouveau_ioc32.c    |   72 +
+ drivers/gpu/drm/nouveau/nouveau_irq.c      |  588 ++
+ drivers/gpu/drm/nouveau/nouveau_mem.c      |  867 +++
+ drivers/gpu/drm/nouveau/nouveau_notifier.c |  165 +
+ drivers/gpu/drm/nouveau/nouveau_object.c   | 1174 +++
+ drivers/gpu/drm/nouveau/nouveau_reg.h      |  593 ++
+ drivers/gpu/drm/nouveau/nouveau_sgdma.c    |  341 +
+ drivers/gpu/drm/nouveau/nouveau_state.c    |  867 +++
+ drivers/gpu/drm/nouveau/nouveau_swmthd.c   |  191 +
+ drivers/gpu/drm/nouveau/nouveau_swmthd.h   |   33 +
+ drivers/gpu/drm/nouveau/nv04_fb.c          |   23 +
+ drivers/gpu/drm/nouveau/nv04_fifo.c        |  138 +
+ drivers/gpu/drm/nouveau/nv04_graph.c       |  516 ++
+ drivers/gpu/drm/nouveau/nv04_instmem.c     |  159 +
+ drivers/gpu/drm/nouveau/nv04_mc.c          |   22 +
+ drivers/gpu/drm/nouveau/nv04_timer.c       |   53 +
+ drivers/gpu/drm/nouveau/nv10_fb.c          |   25 +
+ drivers/gpu/drm/nouveau/nv10_fifo.c        |  169 +
+ drivers/gpu/drm/nouveau/nv10_graph.c       |  914 +++
+ drivers/gpu/drm/nouveau/nv20_graph.c       |  913 +++
+ drivers/gpu/drm/nouveau/nv40_fb.c          |   62 +
+ drivers/gpu/drm/nouveau/nv40_fifo.c        |  209 +
+ drivers/gpu/drm/nouveau/nv40_graph.c       | 2193 ++++++
+ drivers/gpu/drm/nouveau/nv40_mc.c          |   38 +
+ drivers/gpu/drm/nouveau/nv50_fifo.c        |  343 +
+ drivers/gpu/drm/nouveau/nv50_graph.c       |  321 +
+ drivers/gpu/drm/nouveau/nv50_grctx.h       |11512 ++++++++++++++++++++++++++++
+ drivers/gpu/drm/nouveau/nv50_instmem.c     |  324 +
+ drivers/gpu/drm/nouveau/nv50_mc.c          |   43 +
+ include/drm/Kbuild                         |    2 +
+ include/drm/drmP.h                         |    2 +
+ include/drm/nouveau_drm.h                  |  184 +
+ 44 files changed, 25287 insertions(+), 2 deletions(-)
+ create mode 100644 drivers/gpu/drm/nouveau/Makefile
+ create mode 100644 drivers/gpu/drm/nouveau/nouveau_bo.c
+ create mode 100644 drivers/gpu/drm/nouveau/nouveau_dma.c
+ create mode 100644 drivers/gpu/drm/nouveau/nouveau_dma.h
+ create mode 100644 drivers/gpu/drm/nouveau/nouveau_drm.h
+ create mode 100644 drivers/gpu/drm/nouveau/nouveau_drv.c
+ create mode 100644 drivers/gpu/drm/nouveau/nouveau_drv.h
+ create mode 100644 drivers/gpu/drm/nouveau/nouveau_fence.c
+ create mode 100644 drivers/gpu/drm/nouveau/nouveau_fifo.c
+ create mode 100644 drivers/gpu/drm/nouveau/nouveau_ioc32.c
+ create mode 100644 drivers/gpu/drm/nouveau/nouveau_irq.c
+ create mode 100644 drivers/gpu/drm/nouveau/nouveau_mem.c
+ create mode 100644 drivers/gpu/drm/nouveau/nouveau_notifier.c
+ create mode 100644 drivers/gpu/drm/nouveau/nouveau_object.c
+ create mode 100644 drivers/gpu/drm/nouveau/nouveau_reg.h
+ create mode 100644 drivers/gpu/drm/nouveau/nouveau_sgdma.c
+ create mode 100644 drivers/gpu/drm/nouveau/nouveau_state.c
+ create mode 100644 drivers/gpu/drm/nouveau/nouveau_swmthd.c
+ create mode 100644 drivers/gpu/drm/nouveau/nouveau_swmthd.h
+ create mode 100644 drivers/gpu/drm/nouveau/nv04_fb.c
+ create mode 100644 drivers/gpu/drm/nouveau/nv04_fifo.c
+ create mode 100644 drivers/gpu/drm/nouveau/nv04_graph.c
+ create mode 100644 drivers/gpu/drm/nouveau/nv04_instmem.c
+ create mode 100644 drivers/gpu/drm/nouveau/nv04_mc.c
+ create mode 100644 drivers/gpu/drm/nouveau/nv04_timer.c
+ create mode 100644 drivers/gpu/drm/nouveau/nv10_fb.c
+ create mode 100644 drivers/gpu/drm/nouveau/nv10_fifo.c
+ create mode 100644 drivers/gpu/drm/nouveau/nv10_graph.c
+ create mode 100644 drivers/gpu/drm/nouveau/nv20_graph.c
+ create mode 100644 drivers/gpu/drm/nouveau/nv40_fb.c
+ create mode 100644 drivers/gpu/drm/nouveau/nv40_fifo.c
+ create mode 100644 drivers/gpu/drm/nouveau/nv40_graph.c
+ create mode 100644 drivers/gpu/drm/nouveau/nv40_mc.c
+ create mode 100644 drivers/gpu/drm/nouveau/nv50_fifo.c
+ create mode 100644 drivers/gpu/drm/nouveau/nv50_graph.c
+ create mode 100644 drivers/gpu/drm/nouveau/nv50_grctx.h
+ create mode 100644 drivers/gpu/drm/nouveau/nv50_instmem.c
+ create mode 100644 drivers/gpu/drm/nouveau/nv50_mc.c
+ create mode 100644 include/drm/nouveau_drm.h
+
 diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig
-index 649757f..014fa6f 100644
+index af32c34..1766c5a 100644
 --- a/drivers/gpu/drm/Kconfig
 +++ b/drivers/gpu/drm/Kconfig
-@@ -113,3 +113,9 @@ config DRM_SAVAGE
+@@ -114,3 +114,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"
++	tristate "Nouveau (nVidia) cards"
 +	depends on DRM
 +	help
-+	  Choose for nvidia support
++	  Choose this option for open-source nVidia support.
 diff --git a/drivers/gpu/drm/Makefile b/drivers/gpu/drm/Makefile
-index 48567a9..e68042b 100644
+index cf6af69..dc12f9a 100644
 --- a/drivers/gpu/drm/Makefile
 +++ b/drivers/gpu/drm/Makefile
 @@ -26,4 +26,5 @@ obj-$(CONFIG_DRM_I915)  += i915/
@@ -23,7 +114,7 @@
 +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
+index 9ed8259..ed46425 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
@@ -33,7 +124,7 @@
 -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)
++					   drm_local_map_t *map)
  {
  	struct drm_map_list *entry;
  	list_for_each_entry(entry, &dev->maplist, head) {
@@ -47,18 +138,19 @@
  			  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
+index 0000000..557f04e
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/Makefile
-@@ -0,0 +1,19 @@
+@@ -0,0 +1,20 @@
 +#
 +# 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 \
++             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 \
@@ -652,6 +744,196 @@
 +} while(0)
 +
 +#endif
+diff --git a/drivers/gpu/drm/nouveau/nouveau_drm.h b/drivers/gpu/drm/nouveau/nouveau_drm.h
+new file mode 100644
+index 0000000..a99c615
+--- /dev/null
++++ b/drivers/gpu/drm/nouveau/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.
++ */
++
[...13929 lines suppressed...]
++	0x0007, 0x00000000,
++	0x0001, 0x3f800000,
++	0x0007, 0x00000000,
++	0x0001, 0x3f800000,
++	0x0007, 0x00000000,
++	0x0001, 0x3f800000,
++	0x0007, 0x00000000,
++	0x0001, 0x3f800000,
++	0x0007, 0x00000000,
++	0x0001, 0x3f800000,
++	0x0007, 0x00000000,
++	0x0001, 0x3f800000,
++	0x0007, 0x00000000,
++	0x0001, 0x00000010,
++	0x0017, 0x00000000,
++	0x0001, 0x00000003,
++	0x0047, 0x00000000,
++	0x0001, 0x08100c12,
++	0x0008, 0x00000000,
++	0x0003, 0x00000080,
++	0x0004, 0x00000000,
++	0x0001, 0x00000080,
++	0x0003, 0x80007004,
++	0x0004, 0x00000000,
++	0x0001, 0x80007004,
++	0x0003, 0x04000400,
++	0x0004, 0x00000000,
++	0x0001, 0x04000400,
++	0x0003, 0x00001000,
++	0x0004, 0x00000000,
++	0x0001, 0x00001000,
++	0x0010, 0x00000000,
++	0x0003, 0x00000001,
++	0x0004, 0x00000000,
++	0x0001, 0x00000001,
++	0x0010, 0x00000000,
++	0x0003, 0x00000001,
++	0x0004, 0x00000000,
++	0x0001, 0x00000001,
++	0x0008, 0x00000000,
++	0x0003, 0x00000004,
++	0x0004, 0x00000000,
++	0x0001, 0x00000004,
++	0x0003, 0x00000002,
++	0x0004, 0x00000000,
++	0x0001, 0x00000002,
++	0x0058, 0x00000000,
++	0x0003, 0x00000080,
++	0x0004, 0x00000000,
++	0x0001, 0x00000080,
++	0x0003, 0x80007004,
++	0x0004, 0x00000000,
++	0x0001, 0x80007004,
++	0x0003, 0x04000400,
++	0x0004, 0x00000000,
++	0x0001, 0x04000400,
++	0x0003, 0x00001000,
++	0x0004, 0x00000000,
++	0x0001, 0x00001000,
++	0x0010, 0x00000000,
++	0x0003, 0x00000001,
++	0x0004, 0x00000000,
++	0x0001, 0x00000001,
++	0x0010, 0x00000000,
++	0x0003, 0x00000001,
++	0x0004, 0x00000000,
++	0x0001, 0x00000001,
++	0x0008, 0x00000000,
++	0x0003, 0x00000004,
++	0x0004, 0x00000000,
++	0x0001, 0x00000004,
++	0x0003, 0x00000002,
++	0x0004, 0x00000000,
++	0x0001, 0x00000002,
++	0x0050, 0x00000000,
++	0x0003, 0x08100c12,
++	0x0004, 0x00000000,
++	0x0001, 0x08100c12,
++	0x0030, 0x00000000,
++	0x0003, 0x0000ffff,
++	0x0004, 0x00000000,
++	0x0004, 0x0000ffff,
++	0x0004, 0x00000000,
++	0x0004, 0x0000ffff,
++	0x0004, 0x00000000,
++	0x0004, 0x0000ffff,
++	0x0004, 0x00000000,
++	0x0001, 0x0000ffff,
++	0x0003, 0x00000001,
++	0x0004, 0x00000000,
++	0x0001, 0x00000001,
++	0x0003, 0x00010001,
++	0x0004, 0x00000000,
++	0x0004, 0x00010001,
++	0x0004, 0x00000000,
++	0x0001, 0x00010001,
++	0x0003, 0x00000001,
++	0x0004, 0x00000000,
++	0x0001, 0x00000001,
++	0x0008, 0x00000000,
++	0x0003, 0x0001fe21,
++	0x0004, 0x00000000,
++	0x0001, 0x0001fe21,
++	0x0028, 0x00000000,
++	0x0003, 0x08100c12,
++	0x0004, 0x00000000,
++	0x0001, 0x08100c12,
++	0x0003, 0x00000004,
++	0x0004, 0x00000000,
++	0x0001, 0x00000004,
++	0x0008, 0x00000000,
++	0x0003, 0x00000002,
++	0x0004, 0x00000000,
++	0x0001, 0x00000002,
++	0x0003, 0x00000011,
++	0x0004, 0x00000000,
++	0x0001, 0x00000011,
++	0x0040, 0x00000000,
++	0x0003, 0x0fac6881,
++	0x0004, 0x00000000,
++	0x0001, 0x0fac6881,
++	0x0020, 0x00000000,
++	0x0003, 0x00000004,
++	0x0004, 0x00000000,
++	0x0001, 0x00000004,
++	0x0048, 0x00000000,
++	0x0003, 0x00000002,
++	0x0004, 0x00000000,
++	0x0001, 0x00000002,
++	0x0003, 0x00000001,
++	0x0004, 0x00000000,
++	0x0004, 0x00000001,
++	0x0004, 0x00000000,
++	0x0001, 0x00000001,
++	0x0003, 0x00000002,
++	0x0004, 0x00000000,
++	0x0001, 0x00000002,
++	0x0003, 0x00000001,
++	0x0004, 0x00000000,
++	0x0004, 0x00000001,
++	0x0004, 0x00000000,
++	0x0004, 0x00000001,
++	0x0004, 0x00000000,
++	0x0001, 0x00000001,
++	0x0008, 0x00000000,
++	0x0003, 0x00000004,
++	0x0004, 0x00000000,
++	0x0001, 0x00000004,
++	0x1d18, 0x00000000,
++	0x0003, 0x00000011,
++	0x0004, 0x00000000,
++	0x0001, 0x00000011,
++	0x0008, 0x00000000,
++	0x0003, 0x00000001,
++	0x0004, 0x00000000,
++	0x0001, 0x00000001,
++	0x0000
++};
++#endif
 diff --git a/drivers/gpu/drm/nouveau/nv50_instmem.c b/drivers/gpu/drm/nouveau/nv50_instmem.c
 new file mode 100644
 index 0000000..b7a51f0
@@ -15428,24 +25454,25 @@
 +{
 +}
 diff --git a/include/drm/Kbuild b/include/drm/Kbuild
-index 82b6983..d65553c 100644
+index b940fdf..a9de055 100644
 --- a/include/drm/Kbuild
 +++ b/include/drm/Kbuild
-@@ -8,3 +8,4 @@ unifdef-y += radeon_drm.h
+@@ -8,3 +8,5 @@ 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
+index 18cae19..df715fe 100644
 --- a/include/drm/drmP.h
 +++ b/include/drm/drmP.h
-@@ -1136,6 +1136,8 @@ extern void drm_idlelock_release(struct drm_lock_data *lock_data);
+@@ -1202,6 +1202,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);
++						  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,
@@ -15639,3 +25666,6 @@
 +#define DRM_NOUVEAU_RESUME             0x0c
 +
 +#endif /* __NOUVEAU_DRM_H__ */
+-- 
+1.6.0.6
+


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/kernel.spec,v
retrieving revision 1.1211
retrieving revision 1.1212
diff -u -r1.1211 -r1.1212
--- kernel.spec	13 Jan 2009 20:52:22 -0000	1.1211
+++ kernel.spec	13 Jan 2009 23:32:59 -0000	1.1212
@@ -1184,7 +1184,7 @@
 # Nouveau DRM + drm fixes
 ApplyPatch drm-next.patch
 ApplyPatch drm-modesetting-radeon.patch
-#ApplyPatch drm-nouveau.patch
+ApplyPatch drm-nouveau.patch
 
 # linux1394 git patches
 #ApplyPatch linux-2.6-firewire-git-update.patch
@@ -1777,6 +1777,9 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Wed Jan 14 2009 Ben Skeggs <bskeggs at redhat.com>
+- nouveau: update snapshot, and reenable
+
 * Tue Jan 13 2009 John W. Linville <linville at redhat.com>
 - ath5k: ignore the return value of ath5k_hw_noise_floor_calibration
 



From deji at fedoraproject.org  Tue Jan 13 23:34:39 2009
From: deji at fedoraproject.org (Deji Akingunola)
Date: Tue, 13 Jan 2009 23:34:39 +0000 (UTC)
Subject: rpms/tokyocabinet/F-10 .cvsignore, 1.8, 1.9 sources, 1.8,
	1.9 tokyocabinet-fedora.patch, 1.1, 1.2 tokyocabinet.spec, 1.8, 1.9
Message-ID: <20090113233439.BC2177013F@cvs1.fedora.phx.redhat.com>

Author: deji

Update of /cvs/pkgs/rpms/tokyocabinet/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3656

Modified Files:
	.cvsignore sources tokyocabinet-fedora.patch tokyocabinet.spec 
Log Message:
* Tue Jan 13 2009 Deji Akingunola <dakingun at gmail.com> - 1.3.27-1
- Update to version 1.3.27



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/tokyocabinet/F-10/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	26 Aug 2008 03:27:50 -0000	1.8
+++ .cvsignore	13 Jan 2009 23:34:09 -0000	1.9
@@ -1 +1 @@
-tokyocabinet-1.3.4.tar.gz
+tokyocabinet-1.3.27.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tokyocabinet/F-10/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	26 Aug 2008 03:27:50 -0000	1.8
+++ sources	13 Jan 2009 23:34:09 -0000	1.9
@@ -1 +1 @@
-2ce8b1d19ceb1ecdd07951bf019f3c89  tokyocabinet-1.3.4.tar.gz
+9dfaa4311717ee3ab56c873af312f045  tokyocabinet-1.3.27.tar.gz

tokyocabinet-fedora.patch:

Index: tokyocabinet-fedora.patch
===================================================================
RCS file: /cvs/pkgs/rpms/tokyocabinet/F-10/tokyocabinet-fedora.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tokyocabinet-fedora.patch	29 Nov 2007 22:34:36 -0000	1.1
+++ tokyocabinet-fedora.patch	13 Jan 2009 23:34:09 -0000	1.2
@@ -1,15 +1,16 @@
---- configure.in	2007-11-26 22:05:32.000000000 -0500
-+++ configure.in.new	2007-11-28 09:55:52.000000000 -0500
-@@ -25,25 +25,13 @@
+--- configure.in	2008-12-27 05:21:45.000000000 -0500
++++ configure.in.new	2009-01-13 18:16:44.000000000 -0500
+@@ -31,26 +31,14 @@
  MYPCFILES="tokyocabinet.pc"
  
  # Building flags
 -MYCFLAGS="-std=c99 -Wall -fPIC -fsigned-char -O2"
--MYCPPFLAGS="-I. -I\$(INCLUDEDIR) -L$HOME/include -L/usr/local/include -DNDEBUG -D_GNU_SOURCE=1"
+-MYCPPFLAGS="-I. -I\$(INCLUDEDIR) -I$HOME/include -I/usr/local/include -DNDEBUG -D_GNU_SOURCE=1"
 -MYLDFLAGS="-L. -L\$(LIBDIR) -L$HOME/lib -L/usr/local/lib"
 +MYCFLAGS="-std=c99 -Wall -fPIC -fsigned-char $CFLAGS"
 +MYCPPFLAGS="-I. -I\$(INCLUDEDIR) -DNDEBUG -D_GNU_SOURCE=1"
 +MYLDFLAGS="-L. -L\$(LIBDIR)"
+ MYCMDLDFLAGS=""
  MYRUNPATH="\$(LIBDIR)"
  MYLDLIBPATHENV="LD_LIBRARY_PATH"
  MYPOSTCMD="true"
@@ -18,18 +19,18 @@
 -pathtmp="$PATH"
 -PATH="$HOME/bin:/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin:/bin:/sbin"
 -PATH="$PATH:/usr/ccs/bin:/usr/ucb:/usr/xpg4/bin:/usr/xpg6/bin:$pathtmp"
+-CPATH="$HOME/include:/usr/local/include:$CPATH"
 -LIBRARY_PATH="$HOME/lib:/usr/local/lib:$LIBRARY_PATH"
 -LD_LIBRARY_PATH="$HOME/lib:/usr/local/lib:$LD_LIBRARY_PATH"
--CPATH="$HOME/include:/usr/local/include:$CPATH"
 -PKG_CONFIG_PATH="$HOME/lib/pkgconfig:/usr/local/lib/pkgconfig:$PKG_CONFIG_PATH"
--export PATH LIBRARY_PATH LD_LIBRARY_PATH CPATH PKG_CONFIG_PATH
+-export PATH CPATH LIBRARY_PATH LD_LIBRARY_PATH PKG_CONFIG_PATH
 -
 -
 -
  #================================================================
  # Options
  #================================================================
-@@ -96,7 +84,7 @@
+@@ -103,7 +91,7 @@
    AC_HELP_STRING([--enable-fastest], [build for fastest run]))
  if test "$enable_fastest" = "yes"
  then
@@ -38,11 +39,11 @@
    MYCFLAGS="$MYCFLAGS -fomit-frame-pointer -fforce-addr -minline-all-stringops"
    MYCPPFLAGS="$MYCPPFLAGS -D_MYFASTEST"
    enables="$enables (fastest)"
---- Makefile.in	2007-11-26 06:36:37.000000000 -0500
-+++ Makefile.in.new	2007-11-28 09:52:22.000000000 -0500
-@@ -51,8 +51,8 @@
- CFLAGS = @MYCFLAGS@
+--- Makefile.in	2008-12-22 12:02:44.000000000 -0500
++++ Makefile.in.new	2009-01-13 18:17:54.000000000 -0500
+@@ -54,8 +54,8 @@
  LDFLAGS = @MYLDFLAGS@
+ CMDLDFLAGS = @MYCMDLDFLAGS@
  LIBS = @LIBS@
 -LDENV = LD_RUN_PATH=/lib:/usr/lib:$(LIBDIR):$(HOME)/lib:/usr/local/lib:@MYRUNPATH@:.
 -RUNENV = @MYLDLIBPATHENV@=.:/lib:/usr/lib:$(LIBDIR):$(HOME)/lib:/usr/local/lib:@MYRUNPATH@
@@ -51,9 +52,9 @@
  POSTCMD = @MYPOSTCMD@
  
  
---- tokyocabinet.pc.in	2007-11-04 20:05:50.000000000 -0500
-+++ tokyocabinet.pc.in.new	2007-11-28 09:49:01.000000000 -0500
-@@ -9,5 +9,5 @@
+--- tokyocabinet.pc.in	2008-02-18 02:25:18.000000000 -0500
++++ tokyocabinet.pc.in.new	2009-01-13 18:18:52.000000000 -0500
+@@ -10,5 +10,5 @@
  Name: Tokyo Cabinet
  Description: a modern implementation of DBM
  Version: @PACKAGE_VERSION@


Index: tokyocabinet.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tokyocabinet/F-10/tokyocabinet.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- tokyocabinet.spec	26 Aug 2008 03:48:20 -0000	1.8
+++ tokyocabinet.spec	13 Jan 2009 23:34:09 -0000	1.9
@@ -1,6 +1,6 @@
 Summary:	A modern implementation of a DBM
 Name:		tokyocabinet
-Version:	1.3.4
+Version:	1.3.27
 Release:	1%{?dist}
 License:	LGPLv2+
 Group:		Development/Libraries
@@ -70,9 +70,11 @@
 %doc doc/*
 
 %changelog
+* Tue Jan 13 2009 Deji Akingunola <dakingun at gmail.com> - 1.3.27-1
+- Update to version 1.3.27
+
 * Mon Aug 25 2008 Deji Akingunola <dakingun at gmail.com> - 1.3.4-1
 - Update to 1.3.4
-- Add bzip2-devel BR
 
 * Sun May 25 2008 Masahiro Hasegawa <masahase at gmail.com> - 1.2.6-1
 - Update to 1.2.6



From deji at fedoraproject.org  Tue Jan 13 23:36:41 2009
From: deji at fedoraproject.org (Deji Akingunola)
Date: Tue, 13 Jan 2009 23:36:41 +0000 (UTC)
Subject: rpms/tokyocabinet/F-9 .cvsignore, 1.6, 1.7 sources, 1.6,
	1.7 tokyocabinet-fedora.patch, 1.1, 1.2 tokyocabinet.spec, 1.5, 1.6
Message-ID: <20090113233641.790087013F@cvs1.fedora.phx.redhat.com>

Author: deji

Update of /cvs/pkgs/rpms/tokyocabinet/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3944

Modified Files:
	.cvsignore sources tokyocabinet-fedora.patch tokyocabinet.spec 
Log Message:
* Tue Jan 13 2009 Deji Akingunola <dakingun at gmail.com> - 1.3.27-1
- Update to version 1.3.27



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/tokyocabinet/F-9/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	28 Apr 2008 15:14:17 -0000	1.6
+++ .cvsignore	13 Jan 2009 23:36:10 -0000	1.7
@@ -1 +1 @@
-tokyocabinet-1.2.5.tar.gz
+tokyocabinet-1.3.27.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tokyocabinet/F-9/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	28 Apr 2008 15:14:17 -0000	1.6
+++ sources	13 Jan 2009 23:36:10 -0000	1.7
@@ -1 +1 @@
-4d33c099caf3ef3928eb967164444653  tokyocabinet-1.2.5.tar.gz
+9dfaa4311717ee3ab56c873af312f045  tokyocabinet-1.3.27.tar.gz

tokyocabinet-fedora.patch:

Index: tokyocabinet-fedora.patch
===================================================================
RCS file: /cvs/pkgs/rpms/tokyocabinet/F-9/tokyocabinet-fedora.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tokyocabinet-fedora.patch	29 Nov 2007 22:34:36 -0000	1.1
+++ tokyocabinet-fedora.patch	13 Jan 2009 23:36:10 -0000	1.2
@@ -1,15 +1,16 @@
---- configure.in	2007-11-26 22:05:32.000000000 -0500
-+++ configure.in.new	2007-11-28 09:55:52.000000000 -0500
-@@ -25,25 +25,13 @@
+--- configure.in	2008-12-27 05:21:45.000000000 -0500
++++ configure.in.new	2009-01-13 18:16:44.000000000 -0500
+@@ -31,26 +31,14 @@
  MYPCFILES="tokyocabinet.pc"
  
  # Building flags
 -MYCFLAGS="-std=c99 -Wall -fPIC -fsigned-char -O2"
--MYCPPFLAGS="-I. -I\$(INCLUDEDIR) -L$HOME/include -L/usr/local/include -DNDEBUG -D_GNU_SOURCE=1"
+-MYCPPFLAGS="-I. -I\$(INCLUDEDIR) -I$HOME/include -I/usr/local/include -DNDEBUG -D_GNU_SOURCE=1"
 -MYLDFLAGS="-L. -L\$(LIBDIR) -L$HOME/lib -L/usr/local/lib"
 +MYCFLAGS="-std=c99 -Wall -fPIC -fsigned-char $CFLAGS"
 +MYCPPFLAGS="-I. -I\$(INCLUDEDIR) -DNDEBUG -D_GNU_SOURCE=1"
 +MYLDFLAGS="-L. -L\$(LIBDIR)"
+ MYCMDLDFLAGS=""
  MYRUNPATH="\$(LIBDIR)"
  MYLDLIBPATHENV="LD_LIBRARY_PATH"
  MYPOSTCMD="true"
@@ -18,18 +19,18 @@
 -pathtmp="$PATH"
 -PATH="$HOME/bin:/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin:/bin:/sbin"
 -PATH="$PATH:/usr/ccs/bin:/usr/ucb:/usr/xpg4/bin:/usr/xpg6/bin:$pathtmp"
+-CPATH="$HOME/include:/usr/local/include:$CPATH"
 -LIBRARY_PATH="$HOME/lib:/usr/local/lib:$LIBRARY_PATH"
 -LD_LIBRARY_PATH="$HOME/lib:/usr/local/lib:$LD_LIBRARY_PATH"
--CPATH="$HOME/include:/usr/local/include:$CPATH"
 -PKG_CONFIG_PATH="$HOME/lib/pkgconfig:/usr/local/lib/pkgconfig:$PKG_CONFIG_PATH"
--export PATH LIBRARY_PATH LD_LIBRARY_PATH CPATH PKG_CONFIG_PATH
+-export PATH CPATH LIBRARY_PATH LD_LIBRARY_PATH PKG_CONFIG_PATH
 -
 -
 -
  #================================================================
  # Options
  #================================================================
-@@ -96,7 +84,7 @@
+@@ -103,7 +91,7 @@
    AC_HELP_STRING([--enable-fastest], [build for fastest run]))
  if test "$enable_fastest" = "yes"
  then
@@ -38,11 +39,11 @@
    MYCFLAGS="$MYCFLAGS -fomit-frame-pointer -fforce-addr -minline-all-stringops"
    MYCPPFLAGS="$MYCPPFLAGS -D_MYFASTEST"
    enables="$enables (fastest)"
---- Makefile.in	2007-11-26 06:36:37.000000000 -0500
-+++ Makefile.in.new	2007-11-28 09:52:22.000000000 -0500
-@@ -51,8 +51,8 @@
- CFLAGS = @MYCFLAGS@
+--- Makefile.in	2008-12-22 12:02:44.000000000 -0500
++++ Makefile.in.new	2009-01-13 18:17:54.000000000 -0500
+@@ -54,8 +54,8 @@
  LDFLAGS = @MYLDFLAGS@
+ CMDLDFLAGS = @MYCMDLDFLAGS@
  LIBS = @LIBS@
 -LDENV = LD_RUN_PATH=/lib:/usr/lib:$(LIBDIR):$(HOME)/lib:/usr/local/lib:@MYRUNPATH@:.
 -RUNENV = @MYLDLIBPATHENV@=.:/lib:/usr/lib:$(LIBDIR):$(HOME)/lib:/usr/local/lib:@MYRUNPATH@
@@ -51,9 +52,9 @@
  POSTCMD = @MYPOSTCMD@
  
  
---- tokyocabinet.pc.in	2007-11-04 20:05:50.000000000 -0500
-+++ tokyocabinet.pc.in.new	2007-11-28 09:49:01.000000000 -0500
-@@ -9,5 +9,5 @@
+--- tokyocabinet.pc.in	2008-02-18 02:25:18.000000000 -0500
++++ tokyocabinet.pc.in.new	2009-01-13 18:18:52.000000000 -0500
+@@ -10,5 +10,5 @@
  Name: Tokyo Cabinet
  Description: a modern implementation of DBM
  Version: @PACKAGE_VERSION@


Index: tokyocabinet.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tokyocabinet/F-9/tokyocabinet.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- tokyocabinet.spec	28 Apr 2008 15:14:17 -0000	1.5
+++ tokyocabinet.spec	13 Jan 2009 23:36:10 -0000	1.6
@@ -1,14 +1,14 @@
 Summary:	A modern implementation of a DBM
 Name:		tokyocabinet
-Version:	1.2.5
+Version:	1.3.27
 Release:	1%{?dist}
 License:	LGPLv2+
 Group:		Development/Libraries
 URL:		http://tokyocabinet.sourceforge.net/
-Source:		http://tokyocabinet.sourceforge.net/%{name}-%{version}.tar.gz
+Source:		http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 Patch0:		tokyocabinet-fedora.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:	pkgconfig zlib-devel autoconf
+BuildRequires:	pkgconfig zlib-devel bzip2-devel autoconf
 
 %description
 Tokyo Cabinet is a library of routines for managing a database. It is the 
@@ -58,6 +58,7 @@
 %doc ChangeLog COPYING README
 %{_bindir}/tc*
 %{_libdir}/libtokyocabinet.so.*
+%{_libexecdir}/tcawmgr.cgi
 %{_mandir}/man1/tc*.gz
 
 %files devel
@@ -69,6 +70,15 @@
 %doc doc/*
 
 %changelog
+* Tue Jan 13 2009 Deji Akingunola <dakingun at gmail.com> - 1.3.27-1
+- Update to version 1.3.27
+
+* Mon Aug 25 2008 Deji Akingunola <dakingun at gmail.com> - 1.3.4-1
+- Update to 1.3.4
+
+* Sun May 25 2008 Masahiro Hasegawa <masahase at gmail.com> - 1.2.6-1
+- Update to 1.2.6
+
 * Mon Apr 28 2008 Deji Akingunola <dakingun at gmail.com> - 1.2.5-1
 - Update to 1.2.5
 



From orion at fedoraproject.org  Tue Jan 13 23:38:31 2009
From: orion at fedoraproject.org (Orion Poplawski)
Date: Tue, 13 Jan 2009 23:38:31 +0000 (UTC)
Subject: rpms/ftnchek/devel ftnchek.spec,1.8,1.9
Message-ID: <20090113233831.C49A77013F@cvs1.fedora.phx.redhat.com>

Author: orion

Update of /cvs/pkgs/rpms/ftnchek/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4236

Modified Files:
	ftnchek.spec 
Log Message:
- Add BR bison to handle change to yacc file



Index: ftnchek.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ftnchek/devel/ftnchek.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ftnchek.spec	13 Jan 2009 23:28:01 -0000	1.8
+++ ftnchek.spec	13 Jan 2009 23:38:01 -0000	1.9
@@ -11,6 +11,7 @@
 Patch1:         http://www.dsm.fordham.edu/~ftnchek/download/ftnchek-3.3.1-varfmt.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+BuildRequires:  bison
 BuildRequires:  groff, emacs
 
 %description
@@ -81,6 +82,7 @@
 %changelog
 * Tue Jan 13 2009 Orion Poplawski <orion at cora.nwra.com> 3.3.1-9
 - Add upstream varfmt patch
+- Add BR bison to handle change to yacc file
 
 * Thu Aug 28 2008 Orion Poplawski <orion at cora.nwra.com> 3.3.1-8
 - Change %%patch -> %%patch0



From orion at fedoraproject.org  Tue Jan 13 23:53:46 2009
From: orion at fedoraproject.org (Orion Poplawski)
Date: Tue, 13 Jan 2009 23:53:46 +0000 (UTC)
Subject: rpms/ftnchek/devel ftnchek.spec,1.9,1.10
Message-ID: <20090113235346.775E2700EC@cvs1.fedora.phx.redhat.com>

Author: orion

Update of /cvs/pkgs/rpms/ftnchek/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6531

Modified Files:
	ftnchek.spec 
Log Message:
Add extra make call to process bison files



Index: ftnchek.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ftnchek/devel/ftnchek.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ftnchek.spec	13 Jan 2009 23:38:01 -0000	1.9
+++ ftnchek.spec	13 Jan 2009 23:53:16 -0000	1.10
@@ -51,6 +51,7 @@
 %build
 export CFLAGS="$RPM_OPT_FLAGS -DUNIX"
 %configure
+make || :
 make %{?_smp_mflags}
 
 



From hadess at fedoraproject.org  Wed Jan 14 00:08:06 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Wed, 14 Jan 2009 00:08:06 +0000 (UTC)
Subject: rpms/gstreamer-plugins-good/F-10
	gst-plugins-good-0.10.11-pulse-hang-bz556986.patch, NONE,
	1.1 gstreamer-plugins-good.spec, 1.77, 1.78
Message-ID: <20090114000806.921F170136@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/gstreamer-plugins-good/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8000

Modified Files:
	gstreamer-plugins-good.spec 
Added Files:
	gst-plugins-good-0.10.11-pulse-hang-bz556986.patch 
Log Message:
* Tue Jan 13 2009 - Bastien Nocera <bnocera at redhat.com> - 0.10.11-2
- Avoid pulsesink hang when PulseAudio disappears


gst-plugins-good-0.10.11-pulse-hang-bz556986.patch:

--- NEW FILE gst-plugins-good-0.10.11-pulse-hang-bz556986.patch ---
--- ext/pulse/pulsesink.c	2008/11/23 15:08:45	1.11
+++ ext/pulse/pulsesink.c	2009/01/05 17:31:13	1.12
@@ -279,7 +279,6 @@
 {
   if (pulsesink->stream) {
     pa_stream_disconnect (pulsesink->stream);
-    pa_threaded_mainloop_wait (pulsesink->mainloop);
     pa_stream_unref (pulsesink->stream);
     pulsesink->stream = NULL;
   }
@@ -588,16 +587,14 @@
   if (!pulsesink->context
       || pa_context_get_state (pulsesink->context) != PA_CONTEXT_READY) {
     GST_ELEMENT_ERROR (pulsesink, RESOURCE, FAILED, ("Bad context state: %s",
-            pulsesink->
-            context ? pa_strerror (pa_context_errno (pulsesink->context)) :
-            NULL), (NULL));
+            pulsesink->context ? pa_strerror (pa_context_errno (pulsesink->
+                    context)) : NULL), (NULL));
     goto unlock_and_fail;
   }
 
   if (!(pulsesink->stream = pa_stream_new (pulsesink->context,
-              pulsesink->
-              stream_name ? pulsesink->stream_name : "Playback Stream",
-              &pulsesink->sample_spec,
+              pulsesink->stream_name ? pulsesink->
+              stream_name : "Playback Stream", &pulsesink->sample_spec,
               gst_pulse_gst_to_channel_map (&channel_map, spec)))) {
     GST_ELEMENT_ERROR (pulsesink, RESOURCE, FAILED,
         ("Failed to create stream: %s",
--- ext/pulse/pulsesink.c	2009/01/05 17:31:13	1.12
+++ ext/pulse/pulsesink.c	2009/01/07 20:38:50	1.13
@@ -264,6 +264,8 @@
   pulsesink->context = NULL;
   pulsesink->stream = NULL;
 
+  pulsesink->stream_mutex = g_mutex_new ();
+
   pulsesink->mainloop = pa_threaded_mainloop_new ();
   g_assert (pulsesink->mainloop);
 
@@ -277,11 +279,13 @@
 static void
 gst_pulsesink_destroy_stream (GstPulseSink * pulsesink)
 {
+  g_mutex_lock (pulsesink->stream_mutex);
   if (pulsesink->stream) {
     pa_stream_disconnect (pulsesink->stream);
     pa_stream_unref (pulsesink->stream);
     pulsesink->stream = NULL;
   }
+  g_mutex_unlock (pulsesink->stream_mutex);
 
   g_free (pulsesink->stream_name);
   pulsesink->stream_name = NULL;
@@ -290,7 +294,6 @@
 static void
 gst_pulsesink_destroy_context (GstPulseSink * pulsesink)
 {
-
   gst_pulsesink_destroy_stream (pulsesink);
 
   if (pulsesink->context) {
@@ -313,6 +316,8 @@
   g_free (pulsesink->device);
   g_free (pulsesink->stream_name);
 
+  g_mutex_free (pulsesink->stream_mutex);
+
   pa_threaded_mainloop_free (pulsesink->mainloop);
 
   if (pulsesink->probe) {
@@ -482,8 +487,16 @@
 
     case PA_STREAM_READY:
     case PA_STREAM_FAILED:
-    case PA_STREAM_TERMINATED:
-      pa_threaded_mainloop_signal (pulsesink->mainloop, 0);
+    case PA_STREAM_TERMINATED:{
+      pa_stream *cur_stream;
+
+      g_mutex_lock (pulsesink->stream_mutex);
+      cur_stream = pulsesink->stream;
+      g_mutex_unlock (pulsesink->stream_mutex);
+
+      if (cur_stream == s)
+        pa_threaded_mainloop_signal (pulsesink->mainloop, 0);
+    }
       break;
 
     case PA_STREAM_UNCONNECTED:
@@ -496,16 +509,28 @@
 gst_pulsesink_stream_request_cb (pa_stream * s, size_t length, void *userdata)
 {
   GstPulseSink *pulsesink = GST_PULSESINK (userdata);
+  pa_stream *cur_stream;
 
-  pa_threaded_mainloop_signal (pulsesink->mainloop, 0);
+  g_mutex_lock (pulsesink->stream_mutex);
+  cur_stream = pulsesink->stream;
+  g_mutex_unlock (pulsesink->stream_mutex);
+
+  if (cur_stream == s)
+    pa_threaded_mainloop_signal (pulsesink->mainloop, 0);
 }
 
 static void
 gst_pulsesink_stream_latency_update_cb (pa_stream * s, void *userdata)
 {
   GstPulseSink *pulsesink = GST_PULSESINK (userdata);
+  pa_stream *cur_stream;
 
-  pa_threaded_mainloop_signal (pulsesink->mainloop, 0);
+  g_mutex_lock (pulsesink->stream_mutex);
+  cur_stream = pulsesink->stream;
+  g_mutex_unlock (pulsesink->stream_mutex);
+
+  if (cur_stream == s)
+    pa_threaded_mainloop_signal (pulsesink->mainloop, 0);
 }
 
 static gboolean
@@ -592,15 +617,18 @@
     goto unlock_and_fail;
   }
 
+  g_mutex_lock (pulsesink->stream_mutex);
   if (!(pulsesink->stream = pa_stream_new (pulsesink->context,
               pulsesink->stream_name ? pulsesink->
               stream_name : "Playback Stream", &pulsesink->sample_spec,
               gst_pulse_gst_to_channel_map (&channel_map, spec)))) {
+    g_mutex_unlock (pulsesink->stream_mutex);
     GST_ELEMENT_ERROR (pulsesink, RESOURCE, FAILED,
         ("Failed to create stream: %s",
             pa_strerror (pa_context_errno (pulsesink->context))), (NULL));
     goto unlock_and_fail;
   }
+  g_mutex_unlock (pulsesink->stream_mutex);
 
   pa_stream_set_state_callback (pulsesink->stream,
       gst_pulsesink_stream_state_cb, pulsesink);
--- ext/pulse/pulsesink.h	2008/08/13 13:57:01	1.3
+++ ext/pulse/pulsesink.h	2009/01/07 20:38:50	1.4
@@ -57,6 +57,7 @@
 
   pa_context *context;
   pa_stream *stream;
+  GMutex *stream_mutex;
 
   pa_sample_spec sample_spec;
 


Index: gstreamer-plugins-good.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamer-plugins-good/F-10/gstreamer-plugins-good.spec,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- gstreamer-plugins-good.spec	25 Oct 2008 00:18:49 -0000	1.77
+++ gstreamer-plugins-good.spec	14 Jan 2009 00:07:36 -0000	1.78
@@ -6,7 +6,7 @@
 
 Name: 		%{gstreamer}-plugins-good
 Version: 	0.10.11
-Release:  	1%{?dist}
+Release:  	2%{?dist}
 Summary: 	GStreamer plug-ins with good code and licensing
 
 Group: 		Applications/Multimedia
@@ -17,6 +17,8 @@
 
 # http://bugzilla.gnome.org/show_bug.cgi?id=545033
 Patch0: gst-plugins-good-0.10.9-libv4l.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=556986
+Patch1: gst-plugins-good-0.10.11-pulse-hang-bz556986.patch
 
 Requires: 	%{gstreamer} >= %{_gst}
 Requires(pre): GConf2 
@@ -101,6 +103,7 @@
 %prep
 %setup -q -n gst-plugins-good-%{version}
 %patch0 -p0 -b .libv4l
+%patch1 -p0 -b .pulse-hang
 
 %build
 
@@ -245,6 +248,9 @@
 gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/gstreamer-%{majorminor}.schemas > /dev/null || :
 
 %changelog
+* Tue Jan 13 2009 - Bastien Nocera <bnocera at redhat.com> - 0.10.11-2
+- Avoid pulsesink hang when PulseAudio disappears
+
 * Sat Oct 25 2008 - Bastien Nocera <bnocera at redhat.com> - 0.10.11-1
 - Update to 0.10.11
 - Update libv4l patch



From kyle at fedoraproject.org  Wed Jan 14 00:48:21 2009
From: kyle at fedoraproject.org (Kyle McMartin)
Date: Wed, 14 Jan 2009 00:48:21 +0000 (UTC)
Subject: rpms/kernel/devel patch-2.6.29-rc1-git4.bz2.sign, NONE,
	1.1 .cvsignore, 
	1.991, 1.992 kernel.spec, 1.1213, 1.1214 sources, 1.953,
	1.954 upstream, 1.865, 1.866
Message-ID: <20090114004821.1F48070136@cvs1.fedora.phx.redhat.com>

Author: kyle

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12391

Modified Files:
	.cvsignore kernel.spec sources upstream 
Added Files:
	patch-2.6.29-rc1-git4.bz2.sign 
Log Message:
* Tue Jan 13 2009 Kyle McMartin <kyle at redhat.com>
- 2.6.29-rc1-git4



--- NEW FILE patch-2.6.29-rc1-git4.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBJbSywyGugalF9Dw4RAiZuAJoDHSfd2fKvZdiCXqsL219LjQnqzgCeP+EM
niWXMVzNDvPPpl9OW75Aqtk=
=ORLR
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.991
retrieving revision 1.992
diff -u -r1.991 -r1.992
--- .cvsignore	13 Jan 2009 17:45:52 -0000	1.991
+++ .cvsignore	14 Jan 2009 00:47:50 -0000	1.992
@@ -6,4 +6,4 @@
 linux-2.6.28.tar.bz2
 patch-2.6.28-git14.bz2
 patch-2.6.29-rc1.bz2
-patch-2.6.29-rc1-git3.bz2
+patch-2.6.29-rc1-git4.bz2


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1213
retrieving revision 1.1214
diff -u -r1.1213 -r1.1214
--- kernel.spec	13 Jan 2009 21:22:54 -0000	1.1213
+++ kernel.spec	14 Jan 2009 00:47:50 -0000	1.1214
@@ -58,7 +58,7 @@
 # The rc snapshot level
 %define rcrev 1
 # The git snapshot level
-%define gitrev 3
+%define gitrev 4
 # Set rpm version accordingly
 %define rpmversion 2.6.%{upstream_sublevel}
 %endif
@@ -1737,6 +1737,9 @@
 
 %changelog
 * Tue Jan 13 2009 Kyle McMartin <kyle at redhat.com>
+- 2.6.29-rc1-git4
+
+* Tue Jan 13 2009 Kyle McMartin <kyle at redhat.com>
 - Enable CONFIG_DMAR (and GFX_WA and FLOPPY_WA) requested by Gerd.
 
 * Tue Jan 13 2009 Dave Jones <davej at redhat.com>


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v
retrieving revision 1.953
retrieving revision 1.954
diff -u -r1.953 -r1.954
--- sources	13 Jan 2009 17:45:52 -0000	1.953
+++ sources	14 Jan 2009 00:47:50 -0000	1.954
@@ -1,3 +1,3 @@
 d351e44709c9810b85e29b877f50968a  linux-2.6.28.tar.bz2
 c7280469ffd1edd4b50bac92de172d46  patch-2.6.29-rc1.bz2
-cb7dd7671eb14bc39beb0d27053596fc  patch-2.6.29-rc1-git3.bz2
+3ebb40941bd64fd79c0c62a043c1806d  patch-2.6.29-rc1-git4.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v
retrieving revision 1.865
retrieving revision 1.866
diff -u -r1.865 -r1.866
--- upstream	13 Jan 2009 17:45:52 -0000	1.865
+++ upstream	14 Jan 2009 00:47:50 -0000	1.866
@@ -1,3 +1,3 @@
 linux-2.6.28.tar.bz2
 patch-2.6.29-rc1.bz2
-patch-2.6.29-rc1-git3.bz2
+patch-2.6.29-rc1-git4.bz2



From kyle at fedoraproject.org  Wed Jan 14 00:55:31 2009
From: kyle at fedoraproject.org (Kyle McMartin)
Date: Wed, 14 Jan 2009 00:55:31 +0000 (UTC)
Subject: rpms/kernel/devel/scripts rebase.sh,1.23,1.24
Message-ID: <20090114005531.864A370136@cvs1.fedora.phx.redhat.com>

Author: kyle

Update of /cvs/pkgs/rpms/kernel/devel/scripts
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13753/scripts

Modified Files:
	rebase.sh 
Log Message:
use curl -s instead of lynx -dump. we have curl anyway...


Index: rebase.sh
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/scripts/rebase.sh,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- rebase.sh	10 Oct 2008 00:26:04 -0000	1.23
+++ rebase.sh	14 Jan 2009 00:55:01 -0000	1.24
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-if [ ! -f /usr/bin/lynx ]; then
-  echo yum install lynx
+if [ ! -f /usr/bin/curl ]; then
+  echo yum install curl
   exit 0
 fi
 
@@ -29,12 +29,12 @@
 fi
 
 # Is there a new snapshot or prepatch ?
-NEW=`lynx -dump http://www.kernel.org/kdist/finger_banner | grep "snapshot for the stable"`
+NEW=`curl -s http://www.kernel.org/kdist/finger_banner | grep "snapshot for the stable"`
 if [ -z "$NEW" ] ; then
-  NEW=`lynx -dump http://www.kernel.org/kdist/finger_banner | grep "prepatch for the stable"`
+  NEW=`curl -s http://www.kernel.org/kdist/finger_banner | grep "prepatch for the stable"`
   if [ -z "$NEW" ] ; then
     if [ "$OLDRC" -ne 0 ] ; then
-      NEW=`lynx -dump http://www.kernel.org/kdist/finger_banner | grep "stable version of the Linux kernel is"`
+      NEW=`curl -s http://www.kernel.org/kdist/finger_banner | grep "stable version of the Linux kernel is"`
     else
       echo "No new rc or git snapshot of stable branch".
       exit 0



From walters at fedoraproject.org  Wed Jan 14 01:03:34 2009
From: walters at fedoraproject.org (Colin Walters)
Date: Wed, 14 Jan 2009 01:03:34 +0000 (UTC)
Subject: rpms/krb5-auth-dialog/devel krb5-auth-dialog.spec,1.30,1.31
Message-ID: <20090114010334.1C76F70136@cvs1.fedora.phx.redhat.com>

Author: walters

Update of /cvs/pkgs/rpms/krb5-auth-dialog/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14442

Modified Files:
	krb5-auth-dialog.spec 
Log Message:
br intltool


Index: krb5-auth-dialog.spec
===================================================================
RCS file: /cvs/pkgs/rpms/krb5-auth-dialog/devel/krb5-auth-dialog.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- krb5-auth-dialog.spec	13 Jan 2009 22:50:45 -0000	1.30
+++ krb5-auth-dialog.spec	14 Jan 2009 01:03:03 -0000	1.31
@@ -16,6 +16,7 @@
 BuildRequires: krb5-devel >= %{krb5_version}
 BuildRequires: dbus-devel >= %{dbus_version}
 BuildRequires: perl-XML-Parser, gettext
+BuildRequires: intltool
 %ifnarch s390 s390x
 BuildRequires: NetworkManager-glib-devel >= %{libnm_version}
 %endif



From rdieter at fedoraproject.org  Wed Jan 14 01:04:34 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed, 14 Jan 2009 01:04:34 +0000 (UTC)
Subject: comps comps-f10.xml.in, 1.204, 1.205 comps-f11.xml.in, 1.57,
	1.58 comps-f9.xml.in, 1.430, 1.431
Message-ID: <20090114010434.DDFD070136@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14511

Modified Files:
	comps-f10.xml.in comps-f11.xml.in comps-f9.xml.in 
Log Message:
+xsettings-kde (f11+ default)



Index: comps-f10.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f10.xml.in,v
retrieving revision 1.204
retrieving revision 1.205
diff -u -r1.204 -r1.205
--- comps-f10.xml.in	13 Jan 2009 22:14:56 -0000	1.204
+++ comps-f10.xml.in	14 Jan 2009 01:04:04 -0000	1.205
@@ -3007,6 +3007,7 @@
       <packagereq type="optional">smb4k</packagereq>
       <packagereq type="optional">speedcrunch</packagereq>
       <packagereq type="optional">uim-qt3</packagereq>
+      <packagereq type="optional">xsettings-kde</packagereq>
       <packagereq type="optional">yakuake</packagereq>
     </packagelist>
   </group>


Index: comps-f11.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f11.xml.in,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- comps-f11.xml.in	13 Jan 2009 22:22:21 -0000	1.57
+++ comps-f11.xml.in	14 Jan 2009 01:04:04 -0000	1.58
@@ -3040,6 +3040,7 @@
       <packagereq type="default">pinentry-qt</packagereq>
       <packagereq type="default">qgtkstyle</packagereq>
       <packagereq type="default">scribus</packagereq>
+      <packagereq type="default">xsettings-kde</packagereq>
       <packagereq type="default">zenity</packagereq>
       <packagereq type="optional">apollon</packagereq>
       <packagereq type="optional">basket</packagereq>


Index: comps-f9.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f9.xml.in,v
retrieving revision 1.430
retrieving revision 1.431
diff -u -r1.430 -r1.431
--- comps-f9.xml.in	4 Jan 2009 22:22:00 -0000	1.430
+++ comps-f9.xml.in	14 Jan 2009 01:04:04 -0000	1.431
@@ -2706,6 +2706,7 @@
       <packagereq type="optional">smb4k</packagereq>
       <packagereq type="optional">speedcrunch</packagereq>
       <packagereq type="optional">uim-qt3</packagereq>
+      <packagereq type="optional">xsettings-kde</packagereq>
       <packagereq type="optional">yakuake</packagereq>
     </packagelist>
   </group>



From roozbeh at fedoraproject.org  Wed Jan 14 02:05:27 2009
From: roozbeh at fedoraproject.org (Roozbeh Pournader)
Date: Wed, 14 Jan 2009 02:05:27 +0000 (UTC)
Subject: rpms/doulos-fonts/devel .cvsignore, 1.6, 1.7 doulos-fonts.spec, 1.6,
	1.7 sources, 1.6, 1.7
Message-ID: <20090114020527.8EA6F70136@cvs1.fedora.phx.redhat.com>

Author: roozbeh

Update of /cvs/pkgs/rpms/doulos-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21116

Modified Files:
	.cvsignore doulos-fonts.spec sources 
Log Message:
* Tue Jan 13 2009 Roozbeh Pournader <roozbeh at gmail.com> - 4.104-1
- Update main font to 4.104 (with Unicode 5.1 support)
- Remove Doulos Literacy (not maintained anymore)
- Last update before conversion to new fonts policy



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/doulos-fonts/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	11 Dec 2007 14:17:36 -0000	1.6
+++ .cvsignore	14 Jan 2009 02:04:57 -0000	1.7
@@ -1,2 +1 @@
-DoulosSIL4.100.zip
-DoulosSILLit4.0.14.r1.zip
+DoulosSIL4.104.zip


Index: doulos-fonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/doulos-fonts/devel/doulos-fonts.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- doulos-fonts.spec	11 Dec 2007 14:17:36 -0000	1.6
+++ doulos-fonts.spec	14 Jan 2009 02:04:57 -0000	1.7
@@ -1,8 +1,8 @@
 %define fontdir         %{_datadir}/fonts/doulos
-%define litversion	4.0.14
+%define docversion      4.100
 
 Name:           doulos-fonts
-Version:        4.100
+Version:        4.104
 Release:        1%{?dist}
 Summary:        Doulos SIL fonts
 
@@ -11,7 +11,6 @@
 URL:            http://scripts.sil.org/DoulosSILFont
 # Sources can be downloaded from http://scripts.sil.org/DoulosSIL_download#FontsDownload
 Source0:        DoulosSIL%{version}.zip
-Source1:        DoulosSILLit%{litversion}.r1.zip
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
@@ -23,9 +22,8 @@
 
 
 %prep
-%setup -q -c -a 1
-mv 0NRSI/RFS/documentation/DoulosSILLiteracy/FONTLOG.txt FONTLOG-Literacy.txt
-mv DoulosSILLiteracy/*.ttf .
+%setup -q -c
+mv DoulosSIL/* .
 %{__sed} -i 's/\r//' *.txt 
 
 
@@ -59,14 +57,19 @@
 
 %files
 %defattr(0644,root,root,0755)
-%doc FONTLOG.txt FONTLOG-Literacy.txt OFL.txt OFL-FAQ.txt README.txt
-%doc DoulosSIL%{version}FontDocumentation.pdf
+%doc FONTLOG.txt OFL.txt OFL-FAQ.txt README.txt
+%doc DoulosSIL%{docversion}FontDocumentation.pdf
 
 %dir %{fontdir}
 %{fontdir}/*.ttf
 
 
 %changelog
+* Tue Jan 13 2009 Roozbeh Pournader <roozbeh at gmail.com> - 4.104-1
+- Update main font to 4.104 (with Unicode 5.1 support)
+- Remove Doulos Literacy (not maintained anymore)
+- Last update before conversion to new fonts policy
+
 * Tue Dec 11 2007 Roozbeh Pournader <roozbeh at farsiweb.info> - 4.100-1
 - Update main font to 4.100, keep old Doulos Literacy which is latest
 - Change license tag to OFL


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/doulos-fonts/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	11 Dec 2007 14:17:36 -0000	1.6
+++ sources	14 Jan 2009 02:04:57 -0000	1.7
@@ -1,2 +1 @@
-0f043d34dd190259b64d57a501173c92  DoulosSIL4.100.zip
-c7cac6597ed75f4df89a9579a5d0e419  DoulosSILLit4.0.14.r1.zip
+b11373034e7e417b6e00b394c8da7f67  DoulosSIL4.104.zip



From kyle at fedoraproject.org  Wed Jan 14 02:24:16 2009
From: kyle at fedoraproject.org (Kyle McMartin)
Date: Wed, 14 Jan 2009 02:24:16 +0000 (UTC)
Subject: rpms/kernel/devel config-generic, 1.219, 1.220 kernel.spec, 1.1214, 
	1.1215
Message-ID: <20090114022416.4D9FD70136@cvs1.fedora.phx.redhat.com>

Author: kyle

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23074

Modified Files:
	config-generic kernel.spec 
Log Message:
* Tue Jan 13 2009 Kyle McMartin <kyle at redhat.com>
- 2.6.29-rc1-git4
- CONFIG_MFD_PCF50633 fails. disable it for now.



Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-generic,v
retrieving revision 1.219
retrieving revision 1.220
diff -u -r1.219 -r1.220
--- config-generic	13 Jan 2009 17:45:52 -0000	1.219
+++ config-generic	14 Jan 2009 02:23:45 -0000	1.220
@@ -2995,7 +2995,7 @@
 CONFIG_SSB_DRIVER_PCICORE=y
 
 # Multifunction USB devices
-CONFIG_MFD_PCF50633=m
+# CONFIG_MFD_PCF50633 is not set
 CONFIG_PCF50633_ADC=m
 CONFIG_PCF50633_GPIO=m
 CONFIG_INPUT_PCF50633_PMU=m


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1214
retrieving revision 1.1215
diff -u -r1.1214 -r1.1215
--- kernel.spec	14 Jan 2009 00:47:50 -0000	1.1214
+++ kernel.spec	14 Jan 2009 02:23:45 -0000	1.1215
@@ -1738,6 +1738,7 @@
 %changelog
 * Tue Jan 13 2009 Kyle McMartin <kyle at redhat.com>
 - 2.6.29-rc1-git4
+- CONFIG_MFD_PCF50633 fails. disable it for now.
 
 * Tue Jan 13 2009 Kyle McMartin <kyle at redhat.com>
 - Enable CONFIG_DMAR (and GFX_WA and FLOPPY_WA) requested by Gerd.



From rdieter at fedoraproject.org  Wed Jan 14 02:47:20 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed, 14 Jan 2009 02:47:20 +0000 (UTC)
Subject: rpms/cmake/devel cmake.spec,1.51,1.52
Message-ID: <20090114024720.4815B70136@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/cmake/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25766

Modified Files:
	cmake.spec 
Log Message:
fix Release



Index: cmake.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cmake/devel/cmake.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- cmake.spec	13 Jan 2009 23:22:37 -0000	1.51
+++ cmake.spec	14 Jan 2009 02:46:49 -0000	1.52
@@ -8,7 +8,7 @@
 
 Name:           cmake
 Version:        2.6.3
-Release:        0.rc8.1%{?dist}
+Release:        0.3.rc8%{?dist}
 Summary:        Cross-platform make system
 
 Group:          Development/Tools
@@ -125,7 +125,7 @@
 
 
 %changelog
-* Tue Jan 13 2009 Orion Poplawski <orion at cora.nwra.com> - 2.6.3-0.rc8.1
+* Tue Jan 13 2009 Orion Poplawski <orion at cora.nwra.com> - 2.6.3-0.3.rc8
 - Update to 2.6.3-RC-8
 
 * Sun Jan 04 2009 Rex Dieter <rdieter at fedoraproject.org> - 2.6.3-0.2.rc5



From pkgdb at fedoraproject.org  Wed Jan 14 03:02:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 14 Jan 2009 03:02:00 +0000
Subject: [pkgdb] fontforge: roozbeh has requested commit
Message-ID: <20090114030200.694662081FC@bastion.fedora.phx.redhat.com>

roozbeh has requested the commit acl on fontforge (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fontforge



From pkgdb at fedoraproject.org  Wed Jan 14 03:02:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 14 Jan 2009 03:02:09 +0000
Subject: [pkgdb] fontforge: roozbeh has requested commit
Message-ID: <20090114030209.4E607208456@bastion.fedora.phx.redhat.com>

roozbeh has requested the commit acl on fontforge (Fedora EPEL 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fontforge



From pkgdb at fedoraproject.org  Wed Jan 14 03:02:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 14 Jan 2009 03:02:15 +0000
Subject: [pkgdb] fontforge: roozbeh has requested commit
Message-ID: <20090114030215.5A43D2081FC@bastion.fedora.phx.redhat.com>

roozbeh has requested the commit acl on fontforge (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fontforge



From pkgdb at fedoraproject.org  Wed Jan 14 03:02:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 14 Jan 2009 03:02:18 +0000
Subject: [pkgdb] fontforge: roozbeh has given up commit
Message-ID: <20090114030218.CE845208468@bastion.fedora.phx.redhat.com>

roozbeh has given up the commit acl on fontforge (Fedora EPEL 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fontforge



From pkgdb at fedoraproject.org  Wed Jan 14 03:02:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 14 Jan 2009 03:02:31 +0000
Subject: [pkgdb] fontforge: roozbeh has requested commit
Message-ID: <20090114030231.A85BE208207@bastion.fedora.phx.redhat.com>

roozbeh has requested the commit acl on fontforge (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fontforge



From pkgdb at fedoraproject.org  Wed Jan 14 03:02:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 14 Jan 2009 03:02:33 +0000
Subject: [pkgdb] fontforge: roozbeh has requested commit
Message-ID: <20090114030234.5507A208470@bastion.fedora.phx.redhat.com>

roozbeh has requested the commit acl on fontforge (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fontforge



From dwayne at fedoraproject.org  Wed Jan 14 04:24:07 2009
From: dwayne at fedoraproject.org (Dwayne Bailey)
Date: Wed, 14 Jan 2009 04:24:07 +0000 (UTC)
Subject: comps comps-f11.xml.in,1.58,1.59
Message-ID: <20090114042407.4B23170136@cvs1.fedora.phx.redhat.com>

Author: dwayne

Update of /cvs/pkgs/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3717

Modified Files:
	comps-f11.xml.in 
Log Message:
+virtaal: in development tools



Index: comps-f11.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f11.xml.in,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- comps-f11.xml.in	14 Jan 2009 01:04:04 -0000	1.58
+++ comps-f11.xml.in	14 Jan 2009 04:23:36 -0000	1.59
@@ -1008,6 +1008,7 @@
       <packagereq type="optional">translate-toolkit</packagereq>
       <packagereq type="optional">ucblogo</packagereq>
       <packagereq type="optional">utrac</packagereq>
+      <packagereq type="optional">virtaal</packagereq>
       <packagereq type="optional">wxGlade</packagereq>
       <packagereq type="optional">xbsql</packagereq>
       <packagereq type="optional">xfce4-dev-tools</packagereq>



From wtogami at fedoraproject.org  Wed Jan 14 04:25:35 2009
From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=)
Date: Wed, 14 Jan 2009 04:25:35 +0000 (UTC)
Subject: rpms/plymouth/F-10 plymouth-0.6.0-drop-nash.patch, NONE,
	1.1 plymouth.spec, 1.116,
	1.117 plymouth-0.6.0-dont-crash-on-null-free.patch, 1.1, NONE
Message-ID: <20090114042535.0CB1270136@cvs1.fedora.phx.redhat.com>

Author: wtogami

Update of /cvs/pkgs/rpms/plymouth/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3939

Modified Files:
	plymouth.spec 
Added Files:
	plymouth-0.6.0-drop-nash.patch 
Removed Files:
	plymouth-0.6.0-dont-crash-on-null-free.patch 
Log Message:
build for F-10 to enable testing of dracut
(not pushing to updates)


plymouth-0.6.0-drop-nash.patch:

--- NEW FILE plymouth-0.6.0-drop-nash.patch ---
============================================================
 Create pseudo-terminal if one isn't passed in

  This may help us drop the nash depedency for
pty handling.

diff --git a/src/libply/ply-terminal-session.c b/src/libply/ply-terminal-session.c
--- a/src/libply/ply-terminal-session.c
+++ b/src/libply/ply-terminal-session.c
@@ -309,12 +309,24 @@ ply_terminal_session_attach (ply_terminal_session_t               *session,
   assert (session->loop != NULL);
   assert (!session->is_running);
   assert (session->done_handler == NULL);
-  assert (ptmx >= 0);
 
   should_redirect_console = 
     (flags & PLY_TERMINAL_SESSION_FLAGS_REDIRECT_CONSOLE) != 0;
 
-  ply_terminal_set_fd(session->terminal, ptmx);
+  if (ptmx >= 0)
+    {
+      ply_trace ("ptmx passed in, using it");
+      ply_terminal_set_fd(session->terminal, ptmx);
+    }
+  else
+    {
+      ply_trace ("ptmx not passed in, creating one");
+      if (!ply_terminal_create_device (session->terminal))
+        {
+          ply_trace ("could not create pseudo-terminal: %m");
+          return false;
+        }
+    }
 
   if (should_redirect_console)
     ply_trace ("redirecting system console to terminal device");
diff --git a/src/main.c b/src/main.c
--- a/src/main.c
+++ b/src/main.c
@@ -838,12 +838,6 @@ main (int    argc,
         }
     }
 
-  if ((attach_to_session && argc != 3) || (attach_to_session && state.ptmx == -1))
-    {
-      ply_error ("%s [--attach-to-session <pty_master_fd>]", argv[0]);
-      return EX_USAGE;
-    }
-
   if (geteuid () != 0)
     {
       ply_error ("plymouthd must be run as root user");


Index: plymouth.spec
===================================================================
RCS file: /cvs/pkgs/rpms/plymouth/F-10/plymouth.spec,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -r1.116 -r1.117
--- plymouth.spec	11 Dec 2008 20:26:03 -0000	1.116
+++ plymouth.spec	14 Jan 2009 04:25:04 -0000	1.117
@@ -2,10 +2,10 @@
 %define plymouthclient_execdir /bin
 %define plymouth_libdir /%{_lib}
 
-Summary: Plymouth Graphical Boot Animation and Logger
+Summary: Graphical Boot Animation and Logger
 Name: plymouth
 Version: 0.6.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source0: http://freedesktop.org/software/plymouth/releases/%{name}-%{version}.tar.bz2
@@ -20,6 +20,8 @@
 
 Obsoletes: plymouth-text-and-details-only < %{version}-%{release}
 
+Patch0: plymouth-0.6.0-drop-nash.patch
+
 %description
 Plymouth provides an attractive graphical boot animation in
 place of the text messages that normally get shown.  Text
@@ -149,6 +151,7 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .drop-nash
 
 %build
 %configure --enable-tracing --disable-tests --without-boot-entry \
@@ -178,7 +181,6 @@
 cp $RPM_SOURCE_DIR/boot-duration $RPM_BUILD_ROOT%{_datadir}/plymouth/default-boot-duration
 cp $RPM_SOURCE_DIR/boot-duration $RPM_BUILD_ROOT%{_localstatedir}/lib/plymouth
 
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -312,8 +314,14 @@
 %defattr(-, root, root)
 
 %changelog
-* Thu Dec 11 2008 Ray Strode <rstrode at redhat.com> 0.6.0-1
-- Upgrade to 0.6.0 (to fix bug 475878)
+* Wed Dec 17 2008 Ray Strode <rstrode at redhat.com> 0.6.0-2
+- Add patch from drop-nash branch for jeremy
+
+* Wed Dec  3 2008 Ray Strode <rstrode at redhat.com> 0.6.0-1
+- Update to 0.6.0
+
+* Sat Nov 22 2008 Matthias Clasen <mclasen at redhat.com> 0.6.0-0.2008.11.17.3.1
+- Strip %%name from %%summary
 
 * Mon Nov 17 2008 Ray Strode <rstrode at redhat.com> 0.6.0-0.2008.11.17.3
 - don't give error about missing default.so
@@ -327,9 +335,6 @@
 * Mon Nov 17 2008 Ray Strode <rstrode at redhat.com> 0.6.0-0.2008.11.17.1
 - Crawl progress bar if boot is way off course (Charlie, bug 471089)
 
-* Fri Nov 14 2008 Ray Strode <rstrode at redhat.com> 0.6.0-0.2008.11.14.3
-- Allow NULL to ply_image_free
-
 * Fri Nov 14 2008 Ray Strode <rstrode at redhat.com> 0.6.0-0.2008.11.14.2
 - Don't loop forever when tty returns NUL byte (bug 471498)
 
@@ -369,16 +374,21 @@
 - make boot-duration config(noreplace)
 
 * Mon Nov 10 2008 Ray Strode <rstrode at redhat.com> 0.6.0-0.2008.11.10.3
+- Don't abort if no splash when root is mounted
 - Actually move patches upstream
 
-* Mon Nov 10 2008 Ray Strode <rstrode at redhat.com> 0.6.0-0.2008.11.10.2
-- Don't abort if no splash when root gets mounted
-
 * Mon Nov 10 2008 Ray Strode <rstrode at redhat.com> 0.6.0-0.2008.11.10.1
 - Fix feedback loop with plymouth:debug
 - Move patches upstream
 - Improve comet animation
 
+* Sun Nov  9 2008 Ray Strode <rstrode at redhat.com> 0.6.0-0.2008.11.06.4
+- Fix up more-debug patch to not assert with plymouth:nolog
+  (bug 470569)
+
+* Fri Nov  7 2008 Ray Strode <rstrode at redhat.com> 0.6.0-0.2008.11.06.3
+- add some more debug spew to help debug a problem jlaska is having
+
 * Thu Nov  6 2008 Ray Strode <rstrode at redhat.com> 0.6.0-0.2008.11.06.2
 - show details plugin on --hide-splash so people can see why the splash
   got hidden.


--- plymouth-0.6.0-dont-crash-on-null-free.patch DELETED ---



From pnemade at fedoraproject.org  Wed Jan 14 04:47:42 2009
From: pnemade at fedoraproject.org (Parag Nemade)
Date: Wed, 14 Jan 2009 04:47:42 +0000 (UTC)
Subject: rpms/icon-naming-utils/devel icon-naming-utils.spec,1.16,1.17
Message-ID: <20090114044742.72BD170136@cvs1.fedora.phx.redhat.com>

Author: pnemade

Update of /cvs/pkgs/rpms/icon-naming-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6361

Modified Files:
	icon-naming-utils.spec 
Log Message:

* Wed Jan 14 2009 Parag <pnemade at redhat.com> - 0.8.7-2
- spec file cleanup as suggested in merge-review rh#225894




Index: icon-naming-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/icon-naming-utils/devel/icon-naming-utils.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- icon-naming-utils.spec	22 Jul 2008 05:05:19 -0000	1.16
+++ icon-naming-utils.spec	14 Jan 2009 04:47:12 -0000	1.17
@@ -1,10 +1,10 @@
 Name:           icon-naming-utils
 Version:        0.8.7
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary: 	A script to handle icon names in desktop icon themes
 
 Group:          Development/Tools
-License:        GPL+
+License:        GPLv2
 BuildArch:	noarch
 URL:            http://tango-project.org/Standard_Icon_Naming_Specification
 Source0:        http://tango-project.org/releases/icon-naming-utils-%{version}.tar.gz
@@ -12,7 +12,6 @@
 
 BuildRequires:  perl(XML::Simple)
 BuildRequires:  automake
-Requires:       perl(XML::Simple)
 Requires:	pkgconfig
 
 Patch0:		icon-naming-utils-0.8.7-paths.patch
@@ -53,6 +52,9 @@
 %{_datadir}/pkgconfig/icon-naming-utils.pc
 
 %changelog
+* Wed Jan 14 2009 Parag <pnemade at redhat.com> - 0.8.7-2
+- spec file cleanup as suggested in merge-review rh#225894
+
 * Tue Jul 22 2008 Matthias Clasen <mclasen at redhat.com> - 0.8.7-1
 - Update to 0.8.7
 



From cchance at fedoraproject.org  Wed Jan 14 04:48:08 2009
From: cchance at fedoraproject.org (Caius Chance)
Date: Wed, 14 Jan 2009 04:48:08 +0000 (UTC)
Subject: rpms/cjkunifonts/devel cjkunifonts.spec,1.29,1.30
Message-ID: <20090114044808.777D070136@cvs1.fedora.phx.redhat.com>

Author: cchance

Update of /cvs/pkgs/rpms/cjkunifonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6413

Modified Files:
	cjkunifonts.spec 
Log Message:
* Wed Jan 14 2009 Caius Chance <cchance at redhat.com> - 0.2.20080216.1-13.fc11
- Resolves: rhbz#477373
- Included _font_pkg macro to conform new font packaging guidelines.
- Tidy up .spec file.




Index: cjkunifonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cjkunifonts/devel/cjkunifonts.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- cjkunifonts.spec	8 Jan 2009 07:00:44 -0000	1.29
+++ cjkunifonts.spec	14 Jan 2009 04:47:38 -0000	1.30
@@ -1,21 +1,20 @@
 %define fontname cjkunifonts
-%define fontconf <65>-%{fontname}
-%define archivename %{name}-%{version}
 %define common_desc \
-Chinese Unicode TrueType fonts derived from the original fonts generously made \available by Arphic Technology under the "Arphic Public License" and extended \
-by the CJK Unifonts project.
+Chinese Unicode TrueType fonts derived from original fonts made available by \
+Arphic Technology under "Arphic Public License" and extended by the CJK \
+Unifonts project.
 
-%define umingbuilddir   ../%{name}-uming-%{version}
-%define ukaibuilddir    ../%{name}-ukai-%{version}
-%define umingfontdir    %{_datadir}/fonts/%{name}-uming
-%define ukaifontdir     %{_datadir}/fonts/%{name}-ukai
-%define cidmapdir       %{_datadir}/ghostscript/conf.d
+%define fontdir         %{_datadir}/fonts/%{name}
+%define gsdir           %{_datadir}/ghostscript/conf.d
 %define catalogue       %{_sysconfdir}/X11/fontpath.d
 
+%define umingbuilddir   %{name}-uming-%{version}
+%define ukaibuilddir    %{name}-ukai-%{version}
+
 Name:        %{fontname}
 Version:     0.2.20080216.1
-Release:     12%{?dist}
-Summary:     Chinese TrueType Fonts -- Simplified and Traditional Chinese Ming and Kai Face
+Release:     13%{?dist}
+Summary:     Chinese Unicode TrueType fonts in Ming and Kai face.
 License:     Arphic
 Group:       User Interface/X
 URL:         http://www.freedesktop.org/wiki/Software/CJKUnifonts
@@ -38,7 +37,7 @@
 %common_desc
 
 %package uming
-Summary:      Chinese Uming style face TrueType Font
+Summary:      Chinese Unicode TrueType font in Ming face.
 License:      Arphic
 Group:        User Interface/X
 Requires:     fontpackages-filesystem
@@ -49,11 +48,36 @@
 %description uming
 %common_desc
 
-Chinese Uming style face TrueType Font derived from the original fonts released
-by Arphic Technology and extended by the CJK Unifonts project.
+Ming face Chinese Unicode TrueType font derived from the original fonts \
+released by Arphic Technology and extended by the CJK Unifonts project.
+
+%_font_pkg -n uming -f *-ttf-arphic-uming*.conf uming.ttc
+
+# remaining uming files
+%doc ../%{umingbuilddir}/license
+%doc ../%{umingbuilddir}/CONTRIBUTERS
+%doc ../%{umingbuilddir}/Font_Comparison_ShanHeiSun_UMing.odt
+%doc ../%{umingbuilddir}/Font_Comparison_ShanHeiSun_UMing.pdf
+%doc ../%{umingbuilddir}/FONTLOG
+%doc ../%{umingbuilddir}/INSTALL
+%doc ../%{umingbuilddir}/KNOWN_ISSUES
+%doc ../%{umingbuilddir}/NEWS
+%doc ../%{umingbuilddir}/README
+%doc ../%{umingbuilddir}/TODO
+%{gsdir}/FAPIcidfmap.zh_TW
+%{gsdir}/FAPIcidfmap.zh_CN
+%{gsdir}/cidfmap.zh_TW
+%{gsdir}/cidfmap.zh_CN
+%{gsdir}/CIDFnmap.zh_TW
+%{gsdir}/CIDFnmap.zh_CN
+%verify(not md5 size mtime) %{fontdir}/fonts.dir
+%verify(not md5 size mtime) %{fontdir}/fonts.scale
+%verify(not md5 size mtime) %{_datadir}/fonts/zh_CN/TrueType/zysong.ttf
+%verify(not md5 size mtime) %{_datadir}/fonts/zh_TW/TrueType/bsmi00lp.ttf
+%{catalogue}/%{name}
 
 %package ukai
-Summary:      Chinese Ukai style face TrueType font
+Summary:      Chinese Unicode TrueType font in Kai face.
 License:      Arphic
 Group:        User Interface/X
 Requires:     fontpackages-filesystem
@@ -64,162 +88,102 @@
 %description ukai
 %common_desc
 
-Chinese Ukai style face TrueType Font derived from the original fonts released
-by Arphic Technology and extended by the CJK Unifonts project.
+Kai face Chinese Unicode TrueType font derived from the original fonts \
+released by Arphic Technology and extended by the CJK Unifonts project.
+
+%_font_pkg -n ukai -f *-ttf-arphic-ukai*.conf ukai.ttc
+
+# remaining ukai files
+%doc ../%{ukaibuilddir}/license
+%doc ../%{ukaibuilddir}/CONTRIBUTERS
+%doc ../%{ukaibuilddir}/Font_Comparison_ZenKai_UKai.odt
+%doc ../%{ukaibuilddir}/Font_Comparison_ZenKai_UKai.pdf
+%doc ../%{ukaibuilddir}/FONTLOG
+%doc ../%{ukaibuilddir}/INSTALL
+%doc ../%{ukaibuilddir}/KNOWN_ISSUES
+%doc ../%{ukaibuilddir}/NEWS
+%doc ../%{ukaibuilddir}/README
+%doc ../%{ukaibuilddir}/TODO
+%{gsdir}/FAPIcidfmap.zh_TW
+%{gsdir}/FAPIcidfmap.zh_CN
+%{gsdir}/cidfmap.zh_TW
+%{gsdir}/cidfmap.zh_CN
+%{gsdir}/CIDFnmap.zh_TW
+%{gsdir}/CIDFnmap.zh_CN
+%verify(not md5 size mtime) %{fontdir}/fonts.dir
+%verify(not md5 size mtime) %{fontdir}/fonts.scale
+%{catalogue}/%{name}
 
 %prep
-%setup -q -c -T -a1 -n %{name}-uming-%{version}
+%setup -q -c -T -a1 -n %{umingbuilddir}
 %patch1 -p1 -b .1-rhbz466667
-%setup -q -c -T -a2 -n %{name}-ukai-%{version}
+%setup -q -c -T -a2 -n %{ukaibuilddir}
 
 %build
 %{nil}
 
 %install
-rm -rf %{buildroot}
+%__rm -rf %{buildroot}
 
-# dirs
-install -m 0755 -d %{buildroot}%{catalogue}
-install -m 0755 -d %{buildroot}%{umingfontdir}
-install -m 0755 -d %{buildroot}%{ukaifontdir}
-
-# ttfs
-install -m 0644 %{umingbuilddir}/uming.ttc %{buildroot}%{umingfontdir}/
-install -m 0644 %{ukaibuilddir}/ukai.ttc %{buildroot}%{ukaifontdir}/
+# *.ttc(ttf)
+%__install -m 0755 -d %{buildroot}%{fontdir}
+%__install -m 0644 ../%{umingbuilddir}/uming.ttc %{buildroot}%{fontdir}/
+%__install -m 0644 ../%{ukaibuilddir}/ukai.ttc %{buildroot}%{fontdir}/
 
 # fonts.{scale,dir}
-%{_bindir}/ttmkfdir -d %{buildroot}%{umingfontdir} -o %{buildroot}%{umingfontdir}/fonts.scale
-mkfontdir %{buildroot}%{umingfontdir}
-%{_bindir}/ttmkfdir -d %{buildroot}%{ukaifontdir} -o %{buildroot}%{ukaifontdir}/fonts.scale
-mkfontdir %{buildroot}%{ukaifontdir}
-
-# fontconfig config files
-install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} \
-    %{buildroot}%{_fontconfig_confdir}
-
-cd %{umingbuilddir}
+%{_bindir}/ttmkfdir -d %{buildroot}%{fontdir} \
+    -o %{buildroot}%{fontdir}/fonts.scale
+%{_bindir}/mkfontdir %{buildroot}%{fontdir}
+
+# *.conf
+%__install -m 0755 -d %{buildroot}%{_fontconfig_templatedir}
+%__install -m 0755 -d %{buildroot}%{_fontconfig_confdir}
+cd ../%{umingbuilddir}
 for fconf in `ls *-ttf-arphic-uming*.conf`
 do
-    install -m 0644 $fconf %{buildroot}%{_fontconfig_templatedir}/
-    cd %{buildroot}%{_fontconfig_confdir}/ && \
-        ln -s %{_fontconfig_templatedir}/$fconf $fconf && \
-        cd -
+    %__install -m 0644 $fconf %{buildroot}%{_fontconfig_templatedir}/
+    %__ln_s %{_fontconfig_templatedir}/$fconf \
+        %{buildroot}%{_fontconfig_confdir}/$fconf
 done
-cd %{ukaibuilddir}
+cd ../%{ukaibuilddir}
 for fconf in `ls *-ttf-arphic-ukai*.conf`
 do
-    install -m 0644 $fconf %{buildroot}%{_fontconfig_templatedir}/
-    cd %{buildroot}%{_fontconfig_confdir}/ && \
-        ln -s %{_fontconfig_templatedir}/$fconf $fconf && \
-        cd -
+    %__install -m 0644 $fconf %{buildroot}%{_fontconfig_templatedir}/
+    %__ln_s %{_fontconfig_templatedir}/$fconf \
+        %{buildroot}%{_fontconfig_confdir}/$fconf
 done
 cd -
 
-# backward compat
-install -d %{buildroot}%{_datadir}/fonts/zh_CN/TrueType
-install -d %{buildroot}%{_datadir}/fonts/zh_TW/TrueType
-%{__ln_s} ../../%{name}-uming/uming.ttc %{buildroot}%{_datadir}/fonts/zh_CN/TrueType/zysong.ttf
-%{__ln_s} ../../%{name}-uming/uming.ttc %{buildroot}%{_datadir}/fonts/zh_TW/TrueType/bsmi00lp.ttf
-
-# catalogue
-%{__ln_s} %{umingfontdir} %{buildroot}%{catalogue}/%{name}-uming
-%{__ln_s} %{ukaifontdir} %{buildroot}%{catalogue}/%{name}-ukai
+# backward compat to obsoleted ttf
+%__install -m 0755 -d %{buildroot}%{_datadir}/fonts/zh_CN/TrueType
+%__install -m 0755 -d %{buildroot}%{_datadir}/fonts/zh_TW/TrueType
+%__ln_s ../../%{name}/uming.ttc \
+    %{buildroot}%{_datadir}/fonts/zh_CN/TrueType/zysong.ttf
+%__ln_s ../../%{name}/uming.ttc \
+    %{buildroot}%{_datadir}/fonts/zh_TW/TrueType/bsmi00lp.ttf
 
 # ghostscript
-install -d %{buildroot}%{cidmapdir}
-install -m 0644 %{SOURCE3} %{buildroot}%{cidmapdir}/
-install -m 0644 %{SOURCE4} %{buildroot}%{cidmapdir}/
-install -m 0644 %{SOURCE5} %{buildroot}%{cidmapdir}/
-install -m 0644 %{SOURCE6} %{buildroot}%{cidmapdir}/
-install -m 0644 %{SOURCE7} %{buildroot}%{cidmapdir}/
-install -m 0644 %{SOURCE8} %{buildroot}%{cidmapdir}/
-
-%clean
-rm -fr ${buildroot}
+%__install -m 0755 -d %{buildroot}%{gsdir}
+%__install -m 0644 %{SOURCE3} %{buildroot}%{gsdir}/
+%__install -m 0644 %{SOURCE4} %{buildroot}%{gsdir}/
+%__install -m 0644 %{SOURCE5} %{buildroot}%{gsdir}/
+%__install -m 0644 %{SOURCE6} %{buildroot}%{gsdir}/
+%__install -m 0644 %{SOURCE7} %{buildroot}%{gsdir}/
+%__install -m 0644 %{SOURCE8} %{buildroot}%{gsdir}/
 
-%post uming
-if [ -x %{_bindir}/fc-cache ]; then
-    %{_bindir}/fc-cache -f %{umingfontdir}
-fi
-
-%post ukai
-if [ -x %{_bindir}/fc-cache ]; then
-    %{_bindir}/fc-cache -f %{ukaifontdir}
-fi
-
-%postun uming
-if [ "$1" = 0 ]; then
-    if [ -x %{_bindir}/fc-cache ]; then
-        %{_bindir}/fc-cache -f %{_datadir}/fonts
-    fi
-fi
-
-%postun ukai
-if [ "$1" = 0 ]; then
-    if [ -x %{_bindir}/fc-cache ]; then
-        %{_bindir}/fc-cache -f %{_datadir}/fonts
-    fi
-fi
-
-%files uming
-%defattr(0644,root,root,0755)
-%doc %{umingbuilddir}/license
-%doc %{umingbuilddir}/CONTRIBUTERS
-%doc %{umingbuilddir}/Font_Comparison_ShanHeiSun_UMing.odt
-%doc %{umingbuilddir}/Font_Comparison_ShanHeiSun_UMing.pdf
-%doc %{umingbuilddir}/FONTLOG
-%doc %{umingbuilddir}/INSTALL
-%doc %{umingbuilddir}/KNOWN_ISSUES
-%doc %{umingbuilddir}/NEWS
-%doc %{umingbuilddir}/README
-%doc %{umingbuilddir}/TODO
-%dir %{umingfontdir}
-%dir %{_datadir}/fonts/zh_CN
-%dir %{_datadir}/fonts/zh_TW
-%dir %{_datadir}/fonts/zh_CN/TrueType
-%dir %{_datadir}/fonts/zh_TW/TrueType
-%{cidmapdir}/FAPIcidfmap.zh_TW
-%{cidmapdir}/FAPIcidfmap.zh_CN
-%{cidmapdir}/cidfmap.zh_TW
-%{cidmapdir}/cidfmap.zh_CN
-%{cidmapdir}/CIDFnmap.zh_TW
-%{cidmapdir}/CIDFnmap.zh_CN
-%{umingfontdir}/*.ttc
-%{_fontconfig_templatedir}/*-ttf-arphic-uming*.conf
-%verify(not md5 size mtime) %{_fontconfig_confdir}/*-ttf-arphic-uming*.conf
-%verify(not md5 size mtime) %{umingfontdir}/fonts.dir
-%verify(not md5 size mtime) %{umingfontdir}/fonts.scale
-%verify(not md5 size mtime) %{_datadir}/fonts/zh_CN/TrueType/zysong.ttf
-%verify(not md5 size mtime) %{_datadir}/fonts/zh_TW/TrueType/bsmi00lp.ttf
-%{catalogue}/%{name}-uming
+# catalogue
+%__install -m 0755 -d %{buildroot}%{catalogue}
+%__ln_s %{fontdir} %{buildroot}%{catalogue}/%{name}
 
-%files ukai
-%defattr(0644,root,root,0755)
-%doc %{ukaibuilddir}/license
-%doc %{ukaibuilddir}/CONTRIBUTERS
-%doc %{ukaibuilddir}/Font_Comparison_ZenKai_UKai.odt
-%doc %{ukaibuilddir}/Font_Comparison_ZenKai_UKai.pdf
-%doc %{ukaibuilddir}/FONTLOG
-%doc %{ukaibuilddir}/INSTALL
-%doc %{ukaibuilddir}/KNOWN_ISSUES
-%doc %{ukaibuilddir}/NEWS
-%doc %{ukaibuilddir}/README
-%doc %{ukaibuilddir}/TODO
-%dir %{ukaifontdir}
-%{cidmapdir}/FAPIcidfmap.zh_TW
-%{cidmapdir}/FAPIcidfmap.zh_CN
-%{cidmapdir}/cidfmap.zh_TW
-%{cidmapdir}/cidfmap.zh_CN
-%{cidmapdir}/CIDFnmap.zh_TW
-%{cidmapdir}/CIDFnmap.zh_CN
-%{ukaifontdir}/*.ttc
-%{_fontconfig_templatedir}/*-ttf-arphic-ukai*.conf
-%verify(not md5 size mtime) %{_fontconfig_confdir}/*-ttf-arphic-ukai*.conf
-%verify(not md5 size mtime) %{ukaifontdir}/fonts.dir
-%verify(not md5 size mtime) %{ukaifontdir}/fonts.scale
-%{catalogue}/%{name}-ukai
+%clean
+%__rm -fr ${buildroot}
 
 %changelog
+* Wed Jan 14 2009 Caius Chance <cchance at redhat.com> - 0.2.20080216.1-13.fc11
+- Resolves: rhbz#477373
+- Included _font_pkg macro to conform new font packaging guidelines.
+- Tidy up .spec file.
+
 * Tue Jan 06 2009 Caius Chance <cchance at redhat.com> - 0.2.20080216.1-12.fc11
 - Resolves: rhbz#477373 (Converted to new font packaging guidelines.)
 



From pkgdb at fedoraproject.org  Wed Jan 14 05:03:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 14 Jan 2009 05:03:27 +0000
Subject: [pkgdb] fontforge had acl change status
Message-ID: <20090114050328.2A4E02081FC@bastion.fedora.phx.redhat.com>

kevin has set the commit acl on fontforge (Fedora devel) to Approved for roozbeh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fontforge



From clumens at fedoraproject.org  Wed Jan 14 05:04:25 2009
From: clumens at fedoraproject.org (Christopher Edward Lumens)
Date: Wed, 14 Jan 2009 05:04:25 +0000 (UTC)
Subject: rpms/anaconda/devel .cvsignore, 1.596, 1.597 anaconda.spec, 1.740, 
	1.741 sources, 1.731, 1.732
Message-ID: <20090114050425.86DF170136@cvs1.fedora.phx.redhat.com>

Author: clumens

Update of /cvs/pkgs/rpms/anaconda/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8382

Modified Files:
	.cvsignore anaconda.spec sources 
Log Message:
New version.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/devel/.cvsignore,v
retrieving revision 1.596
retrieving revision 1.597
diff -u -r1.596 -r1.597
--- .cvsignore	9 Jan 2009 04:59:13 -0000	1.596
+++ .cvsignore	14 Jan 2009 05:03:54 -0000	1.597
@@ -1 +1,2 @@
 anaconda-11.5.0.6.tar.bz2
+anaconda-11.5.0.7.tar.bz2


Index: anaconda.spec
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/devel/anaconda.spec,v
retrieving revision 1.740
retrieving revision 1.741
diff -u -r1.740 -r1.741
--- anaconda.spec	9 Jan 2009 04:59:13 -0000	1.740
+++ anaconda.spec	14 Jan 2009 05:03:54 -0000	1.741
@@ -2,7 +2,7 @@
 
 Summary: Graphical system installer
 Name:    anaconda
-Version: 11.5.0.6
+Version: 11.5.0.7
 Release: 1
 License: GPLv2+
 Group:   Applications/System
@@ -204,6 +204,12 @@
 %endif
 
 %changelog
+* Wed Jan 14 2009 Chris Lumens <clumens at redhat.com> - 11.5.0.7-1
+- How to get raw pages from the wiki has changed again. (clumens)
+- Make sure the 'anaconda' file gets the right detected type (alsadi,
+  #479574).
+- Include the missing import. (clumens)
+
 * Thu Jan 08 2009 David Cantrell <dcantrell at redhat.com> - 11.5.0.6-1
 - Collect DSO deps for NetworkManager plugins. (dcantrell)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/devel/sources,v
retrieving revision 1.731
retrieving revision 1.732
diff -u -r1.731 -r1.732
--- sources	9 Jan 2009 04:59:13 -0000	1.731
+++ sources	14 Jan 2009 05:03:54 -0000	1.732
@@ -1 +1 @@
-ae7ad3fb457c2e4d5e863500e44bcd33  anaconda-11.5.0.6.tar.bz2
+0d5c8ec5b01555611e75ed0d3f75b963  anaconda-11.5.0.7.tar.bz2



From walters at fedoraproject.org  Wed Jan 14 05:26:43 2009
From: walters at fedoraproject.org (Colin Walters)
Date: Wed, 14 Jan 2009 05:26:43 +0000 (UTC)
Subject: rpms/ConsoleKit/devel consolekit-dbus-permissions.patch, NONE,
	1.1 ConsoleKit.spec, 1.34, 1.35
Message-ID: <20090114052643.3912670136@cvs1.fedora.phx.redhat.com>

Author: walters

Update of /cvs/pkgs/rpms/ConsoleKit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10096

Modified Files:
	ConsoleKit.spec 
Added Files:
	consolekit-dbus-permissions.patch 
Log Message:
* Wed Jan 14 2009 Colin Walters <walters at verbum.org> - 0.3.0-4
- Add patch to fix up dbus permissions


consolekit-dbus-permissions.patch:

--- NEW FILE consolekit-dbus-permissions.patch ---
--- data/ConsoleKit.conf	2008-04-19 01:39:49.000000000 -0400
+++ /home/walters/ConsoleKit.conf.in	2008-12-11 14:05:46.000000000 -0500
@@ -8,88 +8,128 @@
     <allow own="org.freedesktop.ConsoleKit"/>
 
     <!-- Allow all methods on interfaces -->
-    <allow send_interface="org.freedesktop.ConsoleKit.Manager"/>
-    <allow send_interface="org.freedesktop.ConsoleKit.Seat"/>
-    <allow send_interface="org.freedesktop.ConsoleKit.Session"/>
+    <allow send_destination="org.freedesktop.ConsoleKit"/>
   </policy>
 
   <!-- Deny all and then allow some methods on interfaces -->
   <policy context="default">
-    <deny send_interface="org.freedesktop.ConsoleKit.Manager"/>
-    <deny send_interface="org.freedesktop.ConsoleKit.Seat"/>
-    <deny send_interface="org.freedesktop.ConsoleKit.Session"/>
+    <allow send_destination="org.freedesktop.ConsoleKit"
+           send_interface="org.freedesktop.DBus.Introspectable"/>
+    <deny send_destination="org.freedesktop.ConsoleKit" 
+          send_interface="org.freedesktop.ConsoleKit.Manager"/>
+    <deny send_destination="org.freedesktop.ConsoleKit" 
+          send_interface="org.freedesktop.ConsoleKit.Seat"/>
+    <deny send_destination="org.freedesktop.ConsoleKit" 
+          send_interface="org.freedesktop.ConsoleKit.Session"/>
     <deny send_destination="org.freedesktop.ConsoleKit"
           send_interface="org.freedesktop.DBus.Properties" />
 
-    <allow send_interface="org.freedesktop.ConsoleKit.Manager"
+    <allow send_destination="org.freedesktop.ConsoleKit"
+           send_interface="org.freedesktop.ConsoleKit.Manager"
            send_member="Restart"/>
-    <allow send_interface="org.freedesktop.ConsoleKit.Manager"
+    <allow send_destination="org.freedesktop.ConsoleKit"
+           send_interface="org.freedesktop.ConsoleKit.Manager"
            send_member="Stop"/>
-    <allow send_interface="org.freedesktop.ConsoleKit.Manager"
+    <allow send_destination="org.freedesktop.ConsoleKit"
+           send_interface="org.freedesktop.ConsoleKit.Manager"
            send_member="OpenSession"/>
-    <allow send_interface="org.freedesktop.ConsoleKit.Manager"
+    <allow send_destination="org.freedesktop.ConsoleKit"
+           send_interface="org.freedesktop.ConsoleKit.Manager"
            send_member="CloseSession"/>
-    <allow send_interface="org.freedesktop.ConsoleKit.Manager"
+    <allow send_destination="org.freedesktop.ConsoleKit"
+           send_interface="org.freedesktop.ConsoleKit.Manager"
            send_member="GetSeats"/>
-    <allow send_interface="org.freedesktop.ConsoleKit.Manager"
+    <allow send_destination="org.freedesktop.ConsoleKit"
+           send_interface="org.freedesktop.ConsoleKit.Manager"
            send_member="GetSessionForCookie"/>
-    <allow send_interface="org.freedesktop.ConsoleKit.Manager"
+    <allow send_destination="org.freedesktop.ConsoleKit"
+           send_interface="org.freedesktop.ConsoleKit.Manager"
            send_member="GetSessionForUnixProcess"/>
-    <allow send_interface="org.freedesktop.ConsoleKit.Manager"
+    <allow send_destination="org.freedesktop.ConsoleKit"
+           send_interface="org.freedesktop.ConsoleKit.Manager"
            send_member="GetCurrentSession"/>
-    <allow send_interface="org.freedesktop.ConsoleKit.Manager"
+    <allow send_destination="org.freedesktop.ConsoleKit"
+           send_interface="org.freedesktop.ConsoleKit.Manager"
            send_member="GetSessionsForUnixUser"/>
-    <allow send_interface="org.freedesktop.ConsoleKit.Manager"
+    <allow send_destination="org.freedesktop.ConsoleKit"
+           send_interface="org.freedesktop.ConsoleKit.Manager"
            send_member="GetSessionsForUser"/>
-    <allow send_interface="org.freedesktop.ConsoleKit.Manager"
+    <allow send_destination="org.freedesktop.ConsoleKit"
+           send_interface="org.freedesktop.ConsoleKit.Manager"
            send_member="GetSystemIdleHint"/>
-    <allow send_interface="org.freedesktop.ConsoleKit.Manager"
+    <allow send_destination="org.freedesktop.ConsoleKit"
+           send_interface="org.freedesktop.ConsoleKit.Manager"
            send_member="GetSystemIdleSinceHint"/>
 
-    <allow send_interface="org.freedesktop.ConsoleKit.Seat"
+    <allow send_destination="org.freedesktop.ConsoleKit"
+           send_interface="org.freedesktop.ConsoleKit.Seat"
            send_member="GetId"/>
-    <allow send_interface="org.freedesktop.ConsoleKit.Seat"
+    <allow send_destination="org.freedesktop.ConsoleKit"
+           send_interface="org.freedesktop.ConsoleKit.Seat"
            send_member="GetSessions"/>
-    <allow send_interface="org.freedesktop.ConsoleKit.Seat"
+    <allow send_destination="org.freedesktop.ConsoleKit"
+           send_interface="org.freedesktop.ConsoleKit.Seat"
            send_member="GetDevices"/>
-    <allow send_interface="org.freedesktop.ConsoleKit.Seat"
+    <allow send_destination="org.freedesktop.ConsoleKit"
+           send_interface="org.freedesktop.ConsoleKit.Seat"
            send_member="GetActiveSession"/>
-    <allow send_interface="org.freedesktop.ConsoleKit.Seat"
+    <allow send_destination="org.freedesktop.ConsoleKit"
+           send_interface="org.freedesktop.ConsoleKit.Seat"
            send_member="CanActivateSessions"/>
-    <allow send_interface="org.freedesktop.ConsoleKit.Seat"
+    <allow send_destination="org.freedesktop.ConsoleKit"
+           send_interface="org.freedesktop.ConsoleKit.Seat"
            send_member="ActivateSession"/>
 
-    <allow send_interface="org.freedesktop.ConsoleKit.Session"
+    <allow send_destination="org.freedesktop.ConsoleKit"
+           send_interface="org.freedesktop.ConsoleKit.Session"
            send_member="GetId"/>
-    <allow send_interface="org.freedesktop.ConsoleKit.Session"
+    <allow send_destination="org.freedesktop.ConsoleKit"
+           send_interface="org.freedesktop.ConsoleKit.Session"
            send_member="GetSeatId"/>
-    <allow send_interface="org.freedesktop.ConsoleKit.Session"
+    <allow send_destination="org.freedesktop.ConsoleKit"
+           send_interface="org.freedesktop.ConsoleKit.Session"
            send_member="GetLoginSessionId"/>
-    <allow send_interface="org.freedesktop.ConsoleKit.Session"
+    <allow send_destination="org.freedesktop.ConsoleKit"
+           send_interface="org.freedesktop.ConsoleKit.Session"
            send_member="GetSessionType"/>
-    <allow send_interface="org.freedesktop.ConsoleKit.Session"
+    <allow send_destination="org.freedesktop.ConsoleKit"
+           send_interface="org.freedesktop.ConsoleKit.Session"
            send_member="GetUser"/>
-    <allow send_interface="org.freedesktop.ConsoleKit.Session"
+    <allow send_destination="org.freedesktop.ConsoleKit"
+           send_interface="org.freedesktop.ConsoleKit.Session"
            send_member="GetUnixUser"/>
-    <allow send_interface="org.freedesktop.ConsoleKit.Session"
+    <allow send_destination="org.freedesktop.ConsoleKit"
+           send_interface="org.freedesktop.ConsoleKit.Session"
            send_member="GetX11Display"/>
-    <allow send_interface="org.freedesktop.ConsoleKit.Session"
+    <allow send_destination="org.freedesktop.ConsoleKit"
+           send_interface="org.freedesktop.ConsoleKit.Session"
            send_member="GetX11DisplayDevice"/>
-    <allow send_interface="org.freedesktop.ConsoleKit.Session"
+    <allow send_destination="org.freedesktop.ConsoleKit"
+           send_interface="org.freedesktop.ConsoleKit.Session"
            send_member="GetDisplayDevice"/>
-    <allow send_interface="org.freedesktop.ConsoleKit.Session"
+    <allow send_destination="org.freedesktop.ConsoleKit"
+           send_interface="org.freedesktop.ConsoleKit.Session"
            send_member="GetRemoteHostName"/>
-    <allow send_interface="org.freedesktop.ConsoleKit.Session"
+    <allow send_destination="org.freedesktop.ConsoleKit"
+           send_interface="org.freedesktop.ConsoleKit.Session"
            send_member="IsActive"/>
-    <allow send_interface="org.freedesktop.ConsoleKit.Session"
+    <allow send_destination="org.freedesktop.ConsoleKit"
+           send_interface="org.freedesktop.ConsoleKit.Session"
            send_member="IsLocal"/>
-    <allow send_interface="org.freedesktop.ConsoleKit.Session"
+    <allow send_destination="org.freedesktop.ConsoleKit"
+           send_interface="org.freedesktop.ConsoleKit.Session"
            send_member="GetCreationTime"/>
-    <allow send_interface="org.freedesktop.ConsoleKit.Session"
+    <allow send_destination="org.freedesktop.ConsoleKit"
+           send_interface="org.freedesktop.ConsoleKit.Session"
            send_member="Activate"/>
-    <allow send_interface="org.freedesktop.ConsoleKit.Session"
+    <allow send_destination="org.freedesktop.ConsoleKit"
+           send_interface="org.freedesktop.ConsoleKit.Session"
            send_member="GetIdleHint"/>
-    <allow send_interface="org.freedesktop.ConsoleKit.Session"
+    <allow send_destination="org.freedesktop.ConsoleKit"
+           send_interface="org.freedesktop.ConsoleKit.Session"
+           send_member="SetIdleHint"/>
+    <allow send_destination="org.freedesktop.ConsoleKit"
+           send_interface="org.freedesktop.ConsoleKit.Session"
            send_member="GetIdleSinceHint"/>
   </policy>
 


Index: ConsoleKit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ConsoleKit/devel/ConsoleKit.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- ConsoleKit.spec	21 Nov 2008 21:16:59 -0000	1.34
+++ ConsoleKit.spec	14 Jan 2009 05:26:12 -0000	1.35
@@ -25,6 +25,8 @@
 BuildRequires: xmlto
 
 Patch0: ConsoleKit-0.3.0-get-vt-from-display-instead-of-controlling-tty.patch
+# http://bugs.freedesktop.org/show_bug.cgi?id=19020
+Patch1: consolekit-dbus-permissions.patch
 
 %description
 ConsoleKit is a system daemon for tracking what users are logged
@@ -80,6 +82,7 @@
 %prep
 %setup -q
 %patch0 -p1 -b .get-vt-from-display-instead-of-controlling-tty
+%patch1 -p0 -b .consolekit
 
 %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}
@@ -160,6 +163,9 @@
 %doc %{_datadir}/doc/%{name}-%{version}/spec/*
 
 %changelog
+* Wed Jan 14 2009 Colin Walters <walters at verbum.org> - 0.3.0-4
+- Add patch to fix up dbus permissions
+
 * Fri Nov 21 2008 Matthias Clasen  <mclasen at redhat.com> - 0.3.0-3
 - Tweak descriptions
 



From mtasaka at fedoraproject.org  Wed Jan 14 05:27:09 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Wed, 14 Jan 2009 05:27:09 +0000 (UTC)
Subject: rpms/cairo-dock/devel .cvsignore, 1.97, 1.98 cairo-dock.spec, 1.129,
	1.130 sources, 1.97, 1.98
Message-ID: <20090114052709.5E23A70136@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/cairo-dock/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10175

Modified Files:
	.cvsignore cairo-dock.spec sources 
Log Message:
* Wed Jan 14 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
- rev 1483



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cairo-dock/devel/.cvsignore,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -r1.97 -r1.98
--- .cvsignore	12 Jan 2009 05:18:17 -0000	1.97
+++ .cvsignore	14 Jan 2009 05:26:39 -0000	1.98
@@ -1 +1 @@
-cairo-dock-sources-svn1481_trunk.tar.bz2
+cairo-dock-sources-svn1483_trunk.tar.bz2


Index: cairo-dock.spec
===================================================================
RCS file: /cvs/extras/rpms/cairo-dock/devel/cairo-dock.spec,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -r1.129 -r1.130
--- cairo-dock.spec	12 Jan 2009 05:27:20 -0000	1.129
+++ cairo-dock.spec	14 Jan 2009 05:26:39 -0000	1.130
@@ -11,7 +11,7 @@
 %undefine		betaver		
 %define		build_webkit	1
 %define		build_xfce	1
-%define		tarballver	svn1481_trunk
+%define		tarballver	svn1483_trunk
 
 %define		fedora_main_rel	3
 
@@ -637,8 +637,8 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
-* Mon Jan 12 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
-- rev 1481
+* Wed Jan 14 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- rev 1483
 
 * Thu Dec 25 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
 - rev 1451


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cairo-dock/devel/sources,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -r1.97 -r1.98
--- sources	12 Jan 2009 05:18:17 -0000	1.97
+++ sources	14 Jan 2009 05:26:39 -0000	1.98
@@ -1 +1 @@
-d553004d811672bca1ba889669b792d2  cairo-dock-sources-svn1481_trunk.tar.bz2
+47a69764d639bb8087c0b7f1ba0005c6  cairo-dock-sources-svn1483_trunk.tar.bz2



From kyle at fedoraproject.org  Wed Jan 14 05:28:27 2009
From: kyle at fedoraproject.org (Kyle McMartin)
Date: Wed, 14 Jan 2009 05:28:27 +0000 (UTC)
Subject: rpms/kernel/devel kzalloc-mod_ref-instead-of-wasting-space.patch,
	NONE, 1.1 kernel.spec, 1.1215, 1.1216
Message-ID: <20090114052827.2A15170136@cvs1.fedora.phx.redhat.com>

Author: kyle

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10461

Modified Files:
	kernel.spec 
Added Files:
	kzalloc-mod_ref-instead-of-wasting-space.patch 
Log Message:
* Tue Jan 13 2009 Kyle McMartin <kyle at redhat.com>
- Stop wasting so much disk space with a static module_ref array.


kzalloc-mod_ref-instead-of-wasting-space.patch:

--- NEW FILE kzalloc-mod_ref-instead-of-wasting-space.patch ---
diff --git a/include/linux/module.h b/include/linux/module.h
index 4f7ea12..f89ce89 100644
--- a/include/linux/module.h
+++ b/include/linux/module.h
@@ -222,7 +222,7 @@ void *__symbol_get_gpl(const char *symbol);
 struct module_ref
 {
 	local_t count;
-} ____cacheline_aligned;
+};
 
 enum module_state
 {
@@ -345,7 +345,7 @@ struct module
 	void (*exit)(void);
 
 	/* Reference counts */
-	struct module_ref ref[NR_CPUS];
+	struct module_ref *ref;
 #endif
 };
 #ifndef MODULE_ARCH_INIT
diff --git a/kernel/module.c b/kernel/module.c
index c9332c9..9377560 100644
--- a/kernel/module.c
+++ b/kernel/module.c
@@ -571,17 +571,21 @@ static char last_unloaded_module[MODULE_NAME_LEN+1];
 
 #ifdef CONFIG_MODULE_UNLOAD
 /* Init the unload section of the module. */
-static void module_unload_init(struct module *mod)
+static int module_unload_init(struct module *mod)
 {
 	unsigned int i;
 
+	mod->ref = kzalloc(NR_CPUS * sizeof(struct module_ref), GFP_KERNEL);
+	if (!mod->ref)
+		return -ENOMEM;
+
 	INIT_LIST_HEAD(&mod->modules_which_use_me);
-	for (i = 0; i < NR_CPUS; i++)
-		local_set(&mod->ref[i].count, 0);
 	/* Hold reference count during initialization. */
 	local_set(&mod->ref[raw_smp_processor_id()].count, 1);
 	/* Backwards compatibility macros put refcount during init. */
 	mod->waiter = current;
+
+	return 0;
 }
 
 /* modules using other modules */
@@ -919,8 +923,9 @@ static inline int use_module(struct module *a, struct module *b)
 	return strong_try_module_get(b) == 0;
 }
 
-static inline void module_unload_init(struct module *mod)
+static inline int module_unload_init(struct module *mod)
 {
+	return 0;
 }
 #endif /* CONFIG_MODULE_UNLOAD */
 
@@ -2071,7 +2076,9 @@ static noinline struct module *load_module(void __user *umod,
 	mod = (void *)sechdrs[modindex].sh_addr;
 
 	/* Now we've moved module, initialize linked lists, etc. */
-	module_unload_init(mod);
+	err = module_unload_init(mod);
+	if (err < 0)
+		goto free_unload;
 
 	/* add kobject, so we can reference it. */
 	err = mod_sysfs_init(mod);


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1215
retrieving revision 1.1216
diff -u -r1.1215 -r1.1216
--- kernel.spec	14 Jan 2009 02:23:45 -0000	1.1215
+++ kernel.spec	14 Jan 2009 05:27:56 -0000	1.1216
@@ -659,6 +659,7 @@
 # silence the ACPI blacklist code
 Patch2802: linux-2.6-silence-acpi-blacklist.patch
 
+Patch9000: kzalloc-mod_ref-instead-of-wasting-space.patch
 Patch9001: revert-fix-modules_install-via-nfs.patch
 
 %endif
@@ -1161,6 +1162,7 @@
 # revert 8b249b6856f16f09b0e5b79ce5f4d435e439b9d6
 ApplyPatch revert-fix-modules_install-via-nfs.patch
 
+ApplyPatch kzalloc-mod_ref-instead-of-wasting-space.patch
 # END OF PATCH APPLICATIONS
 
 %endif
@@ -1737,6 +1739,9 @@
 
 %changelog
 * Tue Jan 13 2009 Kyle McMartin <kyle at redhat.com>
+- Stop wasting so much disk space with a static module_ref array.
+
+* Tue Jan 13 2009 Kyle McMartin <kyle at redhat.com>
 - 2.6.29-rc1-git4
 - CONFIG_MFD_PCF50633 fails. disable it for now.
 



From walters at fedoraproject.org  Wed Jan 14 05:29:56 2009
From: walters at fedoraproject.org (Colin Walters)
Date: Wed, 14 Jan 2009 05:29:56 +0000 (UTC)
Subject: rpms/krb5-auth-dialog/devel krb5-auth-dialog.spec,1.31,1.32
Message-ID: <20090114052956.7187B70136@cvs1.fedora.phx.redhat.com>

Author: walters

Update of /cvs/pkgs/rpms/krb5-auth-dialog/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10610

Modified Files:
	krb5-auth-dialog.spec 
Log Message:
* Wed Jan 14 2009 Colin Walters <walters at verbum.org> - 0.8-2
- BR notify, pointed out by Bojan Smojver <bojan at rexursive.com>



Index: krb5-auth-dialog.spec
===================================================================
RCS file: /cvs/pkgs/rpms/krb5-auth-dialog/devel/krb5-auth-dialog.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- krb5-auth-dialog.spec	14 Jan 2009 01:03:03 -0000	1.31
+++ krb5-auth-dialog.spec	14 Jan 2009 05:29:26 -0000	1.32
@@ -6,7 +6,7 @@
 Summary: Kerberos 5 authentication dialog
 Name: krb5-auth-dialog
 Version: 0.8
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Group: User Interface/X
 URL: http://www.redhat.com/
@@ -17,6 +17,7 @@
 BuildRequires: dbus-devel >= %{dbus_version}
 BuildRequires: perl-XML-Parser, gettext
 BuildRequires: intltool
+BuildRequires: libnotify-devel
 %ifnarch s390 s390x
 BuildRequires: NetworkManager-glib-devel >= %{libnm_version}
 %endif
@@ -78,6 +79,9 @@
 fi
 
 %changelog
+* Wed Jan 14 2009 Colin Walters <walters at verbum.org> - 0.8-2
+- BR notify, pointed out by Bojan Smojver <bojan at rexursive.com>
+
 * Tue Jan 13 2009 Colin Walters <walters at verbum.org> - 0.8-1
 - New upstream release
 - Remove both patches; they are upstreamed



From mtasaka at fedoraproject.org  Wed Jan 14 05:33:21 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Wed, 14 Jan 2009 05:33:21 +0000 (UTC)
Subject: rpms/gnome-commander/devel .cvsignore, 1.23,
	1.24 gnome-commander.spec, 1.46, 1.47 sources, 1.23, 1.24
Message-ID: <20090114053321.7310B70136@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/gnome-commander/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11653

Modified Files:
	.cvsignore gnome-commander.spec sources 
Log Message:
* Wed Jan 14 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
- rev 2426



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-commander/devel/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- .cvsignore	3 Jan 2009 17:16:00 -0000	1.23
+++ .cvsignore	14 Jan 2009 05:32:51 -0000	1.24
@@ -1 +1 @@
-gnome-commander-1.2.8-svn2379_trunk.tar.bz2
+gnome-commander-1.2.8-svn2426_trunk.tar.bz2


Index: gnome-commander.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-commander/devel/gnome-commander.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- gnome-commander.spec	3 Jan 2009 17:16:01 -0000	1.46
+++ gnome-commander.spec	14 Jan 2009 05:32:51 -0000	1.47
@@ -18,7 +18,7 @@
 %define        use_autotool          0
 %define        if_pre                1
 %define        main_release          3 
-%define        extratag              svn2379_trunk
+%define        extratag              svn2426_trunk
 %define        mimeedit_rev          1958
 
 %if 0%{?if_pre} > 0
@@ -211,8 +211,8 @@
 %{_datadir}/pixmaps/%{name}/
 
 %changelog
-* Sun Jan  4 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
-- rev 2379
+* Wed Jan 14 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- rev 2426
 
 * Thu Dec 18 2008 Rex Dieter <rdieter at fedoraproject.org>
 - respin (exiv2)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-commander/devel/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sources	3 Jan 2009 17:16:01 -0000	1.23
+++ sources	14 Jan 2009 05:32:51 -0000	1.24
@@ -1 +1 @@
-8b64a481f2f565f608dc54f04d62d928  gnome-commander-1.2.8-svn2379_trunk.tar.bz2
+cdd27dc1bea60e00ea64b5eee3f0b673  gnome-commander-1.2.8-svn2426_trunk.tar.bz2



From corsepiu at fedoraproject.org  Wed Jan 14 05:41:08 2009
From: corsepiu at fedoraproject.org (=?utf-8?q?Ralf_Cors=C3=A9pius?=)
Date: Wed, 14 Jan 2009 05:41:08 +0000 (UTC)
Subject: rpms/perl-Test-HTTP-Server-Simple-StashWarnings/devel import.log,
	NONE, 1.1 perl-Test-HTTP-Server-Simple-StashWarnings.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090114054108.58A1B70136@cvs1.fedora.phx.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-Test-HTTP-Server-Simple-StashWarnings/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12294/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-Test-HTTP-Server-Simple-StashWarnings.spec 
Log Message:



--- NEW FILE import.log ---
perl-Test-HTTP-Server-Simple-StashWarnings-0_03-1_fc11:HEAD:perl-Test-HTTP-Server-Simple-StashWarnings-0.03-1.fc11.src.rpm:1231911535


--- NEW FILE perl-Test-HTTP-Server-Simple-StashWarnings.spec ---
Name:           perl-Test-HTTP-Server-Simple-StashWarnings
Version:        0.03
Release:        1%{?dist}
Summary:        Catch your forked server's warnings
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Test-HTTP-Server-Simple-StashWarnings/
Source0:        http://www.cpan.org/authors/id/S/SA/SARTAK/Test-HTTP-Server-Simple-StashWarnings-%{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(HTTP::Server::Simple) >= 0.34
BuildRequires:  perl(Test::HTTP::Server::Simple)
BuildRequires:  perl(WWW::Mechanize)
Requires:       perl(Test::HTTP::Server::Simple)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
Warnings are an important part of any application. Your web application
should warn the user when something is amiss.

%prep
%setup -q -n Test-HTTP-Server-Simple-StashWarnings-%{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
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Tue Jan 13 2009 Ralf Cors??pius <corsepiu at fedoraproject.org> 0.03-1
- Specfile autogenerated by cpanspec 1.77.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-HTTP-Server-Simple-StashWarnings/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	13 Jan 2009 20:42:31 -0000	1.1
+++ .cvsignore	14 Jan 2009 05:40:37 -0000	1.2
@@ -0,0 +1 @@
+Test-HTTP-Server-Simple-StashWarnings-0.03.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-HTTP-Server-Simple-StashWarnings/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	13 Jan 2009 20:42:31 -0000	1.1
+++ sources	14 Jan 2009 05:40:37 -0000	1.2
@@ -0,0 +1 @@
+0a63b8f45217f05611717292b7ec02e5  Test-HTTP-Server-Simple-StashWarnings-0.03.tar.gz



From pbrobinson at fedoraproject.org  Wed Jan 14 05:52:50 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Wed, 14 Jan 2009 05:52:50 +0000 (UTC)
Subject: rpms/gupnp/devel .cvsignore, 1.5, 1.6 gupnp.spec, 1.12, 1.13 sources,
	1.5, 1.6
Message-ID: <20090114055250.183FF70136@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/gupnp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13253

Modified Files:
	.cvsignore gupnp.spec sources 
Log Message:
- New upstream release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gupnp/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	17 Nov 2008 21:49:13 -0000	1.5
+++ .cvsignore	14 Jan 2009 05:52:19 -0000	1.6
@@ -1 +1 @@
-gupnp-0.12.4.tar.gz
+gupnp-0.12.5.tar.gz


Index: gupnp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gupnp/devel/gupnp.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- gupnp.spec	18 Dec 2008 10:45:34 -0000	1.12
+++ gupnp.spec	14 Jan 2009 05:52:19 -0000	1.13
@@ -1,6 +1,6 @@
 Name:           gupnp
-Version:        0.12.4
-Release:        3%{?dist}
+Version:        0.12.5
+Release:        1%{?dist}
 Summary:        A framework for creating UPnP devices & control points
 
 Group:          System Environment/Libraries
@@ -68,6 +68,9 @@
 %{_includedir}/gupnp-1.0
 
 %changelog
+* Wed Jan 14 2009 Peter Robinson <pbrobinson at gmail.com> 0.12.5-1
+- New upstream release
+
 * Thu Dec 18 2008 Peter Robinson <pbrobinson at gmail.com> 0.12.4-3
 - Add gtk-doc build req
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gupnp/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	17 Nov 2008 21:49:14 -0000	1.5
+++ sources	14 Jan 2009 05:52:19 -0000	1.6
@@ -1 +1 @@
-91b4337d22f6dd931888a33553ab945a  gupnp-0.12.4.tar.gz
+bfb12195c76bb6632bd917f2c2bc12d6  gupnp-0.12.5.tar.gz



From kyle at fedoraproject.org  Wed Jan 14 05:54:56 2009
From: kyle at fedoraproject.org (Kyle McMartin)
Date: Wed, 14 Jan 2009 05:54:56 +0000 (UTC)
Subject: rpms/kernel/devel kzalloc-mod_ref-instead-of-wasting-space.patch,
	1.1, 1.2
Message-ID: <20090114055456.55A7870136@cvs1.fedora.phx.redhat.com>

Author: kyle

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13592

Modified Files:
	kzalloc-mod_ref-instead-of-wasting-space.patch 
Log Message:
davej is smartr than me.

kzalloc-mod_ref-instead-of-wasting-space.patch:

Index: kzalloc-mod_ref-instead-of-wasting-space.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kzalloc-mod_ref-instead-of-wasting-space.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kzalloc-mod_ref-instead-of-wasting-space.patch	14 Jan 2009 05:27:56 -0000	1.1
+++ kzalloc-mod_ref-instead-of-wasting-space.patch	14 Jan 2009 05:54:55 -0000	1.2
@@ -21,22 +21,21 @@
  };
  #ifndef MODULE_ARCH_INIT
 diff --git a/kernel/module.c b/kernel/module.c
-index c9332c9..9377560 100644
+index c9332c9..8c8fe13 100644
 --- a/kernel/module.c
 +++ b/kernel/module.c
-@@ -571,17 +571,21 @@ static char last_unloaded_module[MODULE_NAME_LEN+1];
+@@ -571,17 +571,19 @@ static char last_unloaded_module[MODULE_NAME_LEN+1];
  
  #ifdef CONFIG_MODULE_UNLOAD
  /* Init the unload section of the module. */
 -static void module_unload_init(struct module *mod)
 +static int module_unload_init(struct module *mod)
  {
- 	unsigned int i;
- 
-+	mod->ref = kzalloc(NR_CPUS * sizeof(struct module_ref), GFP_KERNEL);
+-	unsigned int i;
++	mod->ref = kzalloc(NR_CPUS * sizeof(*mod->ref), GFP_KERNEL);
 +	if (!mod->ref)
 +		return -ENOMEM;
-+
+ 
  	INIT_LIST_HEAD(&mod->modules_which_use_me);
 -	for (i = 0; i < NR_CPUS; i++)
 -		local_set(&mod->ref[i].count, 0);
@@ -49,6 +48,15 @@
  }
  
  /* modules using other modules */
+@@ -661,6 +663,8 @@ static void module_unload_free(struct module *mod)
+ 			}
+ 		}
+ 	}
++
++	kfree(mod->ref);
+ }
+ 
+ #ifdef CONFIG_MODULE_FORCE_UNLOAD
 @@ -919,8 +923,9 @@ static inline int use_module(struct module *a, struct module *b)
  	return strong_try_module_get(b) == 0;
  }



From pbrobinson at fedoraproject.org  Wed Jan 14 05:55:27 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Wed, 14 Jan 2009 05:55:27 +0000 (UTC)
Subject: rpms/gupnp-av/devel .cvsignore, 1.2, 1.3 gupnp-av.spec, 1.5,
	1.6 sources, 1.2, 1.3
Message-ID: <20090114055527.72DCD70136@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/gupnp-av/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13612

Modified Files:
	.cvsignore gupnp-av.spec sources 
Log Message:
- New upstream release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gupnp-av/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	5 Sep 2008 18:08:02 -0000	1.2
+++ .cvsignore	14 Jan 2009 05:54:57 -0000	1.3
@@ -1 +1 @@
-gupnp-av-0.2.1.tar.gz
+gupnp-av-0.3.tar.gz


Index: gupnp-av.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gupnp-av/devel/gupnp-av.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- gupnp-av.spec	18 Dec 2008 10:50:09 -0000	1.5
+++ gupnp-av.spec	14 Jan 2009 05:54:57 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           gupnp-av
-Version:        0.2.1
-Release:        7%{?dist}
+Version:        0.3
+Release:        1%{?dist}
 Summary:        A collection of helpers for building UPnP AV applications
 
 Group:          System Environment/Libraries
@@ -69,6 +69,9 @@
 %{_libdir}/libgupnp-av-1.0.so
 
 %changelog
+* Thu Dec 18 2008 Peter Robinson <pbrobinson at gmail.com> 0.3.1
+- New upstream release
+
 * Thu Dec 18 2008 Peter Robinson <pbrobinson at gmail.com> 0.2.1-7
 - Add gtk-doc build req
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gupnp-av/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	5 Sep 2008 18:08:02 -0000	1.2
+++ sources	14 Jan 2009 05:54:57 -0000	1.3
@@ -1 +1 @@
-af9898820fe57b93387d17f32121367d  gupnp-av-0.2.1.tar.gz
+f6e813591ff89e8e61a46f416046450f  gupnp-av-0.3.tar.gz



From pkgdb at fedoraproject.org  Wed Jan 14 05:57:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 14 Jan 2009 05:57:18 +0000
Subject: [pkgdb] perl-Test-HTTP-Server-Simple-StashWarnings (Fedora,
	9) updated by kevin
Message-ID: <20090114055718.93279208203@bastion.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for perl-Test-HTTP-Server-Simple-StashWarnings
kevin has set commit to Approved for provenpackager on perl-Test-HTTP-Server-Simple-StashWarnings (Fedora 9)
kevin has set build to Approved for provenpackager on perl-Test-HTTP-Server-Simple-StashWarnings (Fedora 9)
kevin has set checkout to Approved for provenpackager on perl-Test-HTTP-Server-Simple-StashWarnings (Fedora 9)
kevin changed owner of perl-Test-HTTP-Server-Simple-StashWarnings in Fedora 9 to corsepiu
kevin approved watchbugzilla on perl-Test-HTTP-Server-Simple-StashWarnings (Fedora 9) for perl-sig
kevin approved watchcommits on perl-Test-HTTP-Server-Simple-StashWarnings (Fedora 9) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Test-HTTP-Server-Simple-StashWarnings



From pbrobinson at fedoraproject.org  Wed Jan 14 05:59:30 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Wed, 14 Jan 2009 05:59:30 +0000 (UTC)
Subject: rpms/gupnp/devel gupnp-0.12-disabletestapps.patch,1.1,NONE
Message-ID: <20090114055931.002E670136@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/gupnp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14165

Removed Files:
	gupnp-0.12-disabletestapps.patch 
Log Message:
- remove old patch that's fixed upstream


--- gupnp-0.12-disabletestapps.patch DELETED ---



From pbrobinson at fedoraproject.org  Wed Jan 14 06:01:52 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Wed, 14 Jan 2009 06:01:52 +0000 (UTC)
Subject: rpms/gupnp/F-10 gupnp.spec, 1.10, 1.11 sources, 1.5,
	1.6 gupnp-0.12-disabletestapps.patch, 1.1, NONE
Message-ID: <20090114060152.356E770136@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/gupnp/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14442

Modified Files:
	gupnp.spec sources 
Removed Files:
	gupnp-0.12-disabletestapps.patch 
Log Message:
- New upstream release


Index: gupnp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gupnp/F-10/gupnp.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- gupnp.spec	17 Nov 2008 22:01:40 -0000	1.10
+++ gupnp.spec	14 Jan 2009 06:01:21 -0000	1.11
@@ -1,7 +1,7 @@
 Name:           gupnp
-Version:        0.12.4
-Release:        2%{?dist}
-Summary:        GUPnP is an framework for creating UPnP devices & control points
+Version:        0.12.5
+Release:        1%{?dist}
+Summary:        A framework for creating UPnP devices & control points
 
 Group:          System Environment/Libraries
 License:        LGPLv2+
@@ -9,9 +9,9 @@
 Source0:        http://www.gupnp.org/sources/%{name}/%{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: gtk-doc
 BuildRequires: libsoup-devel
 BuildRequires: libxml2-devel
 BuildRequires: e2fsprogs-devel
@@ -68,8 +68,14 @@
 %{_includedir}/gupnp-1.0
 
 %changelog
-* Mon Nov 17 2008 Peter Robinson <pbrobinson at gmail.com> 0.12.4-1
-- Update sources file with new source
+* Wed Jan 14 2009 Peter Robinson <pbrobinson at gmail.com> 0.12.5-1
+- New upstream release
+
+* Thu Dec 18 2008 Peter Robinson <pbrobinson at gmail.com> 0.12.4-3
+- Add gtk-doc build req
+
+* Sat Nov 22 2008 Peter Robinson <pbrobinson at gmail.com> 0.12.4-2
+- Fix summary
 
 * Mon Nov 17 2008 Peter Robinson <pbrobinson at gmail.com> 0.12.4-1
 - New upstream release


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gupnp/F-10/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	17 Nov 2008 22:01:40 -0000	1.5
+++ sources	14 Jan 2009 06:01:21 -0000	1.6
@@ -1 +1 @@
-91b4337d22f6dd931888a33553ab945a  gupnp-0.12.4.tar.gz
+bfb12195c76bb6632bd917f2c2bc12d6  gupnp-0.12.5.tar.gz


--- gupnp-0.12-disabletestapps.patch DELETED ---



From corsepiu at fedoraproject.org  Wed Jan 14 06:02:48 2009
From: corsepiu at fedoraproject.org (=?utf-8?q?Ralf_Cors=C3=A9pius?=)
Date: Wed, 14 Jan 2009 06:02:48 +0000 (UTC)
Subject: rpms/perl-Test-HTTP-Server-Simple-StashWarnings/devel import.log,
	1.1, NONE
Message-ID: <20090114060248.D365B70142@cvs1.fedora.phx.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-Test-HTTP-Server-Simple-StashWarnings/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14854/devel

Removed Files:
	import.log 
Log Message:
Remove.


--- import.log DELETED ---



From corsepiu at fedoraproject.org  Wed Jan 14 06:02:49 2009
From: corsepiu at fedoraproject.org (=?utf-8?q?Ralf_Cors=C3=A9pius?=)
Date: Wed, 14 Jan 2009 06:02:49 +0000 (UTC)
Subject: rpms/perl-Test-HTTP-Server-Simple-StashWarnings/F-9 import.log, 1.1,
	NONE
Message-ID: <20090114060249.2A91E70142@cvs1.fedora.phx.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-Test-HTTP-Server-Simple-StashWarnings/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14854/F-9

Removed Files:
	import.log 
Log Message:
Remove.


--- import.log DELETED ---



From corsepiu at fedoraproject.org  Wed Jan 14 06:06:32 2009
From: corsepiu at fedoraproject.org (=?utf-8?q?Ralf_Cors=C3=A9pius?=)
Date: Wed, 14 Jan 2009 06:06:32 +0000 (UTC)
Subject: rpms/perl-Test-HTTP-Server-Simple-StashWarnings/F-10
	perl-Test-HTTP-Server-Simple-StashWarnings.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090114060632.7E98570136@cvs1.fedora.phx.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-Test-HTTP-Server-Simple-StashWarnings/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15635/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Test-HTTP-Server-Simple-StashWarnings.spec 
Log Message:
Import.


--- NEW FILE perl-Test-HTTP-Server-Simple-StashWarnings.spec ---
Name:           perl-Test-HTTP-Server-Simple-StashWarnings
Version:        0.03
Release:        1%{?dist}
Summary:        Catch your forked server's warnings
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Test-HTTP-Server-Simple-StashWarnings/
Source0:        http://www.cpan.org/authors/id/S/SA/SARTAK/Test-HTTP-Server-Simple-StashWarnings-%{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(HTTP::Server::Simple) >= 0.34
BuildRequires:  perl(Test::HTTP::Server::Simple)
BuildRequires:  perl(WWW::Mechanize)
Requires:       perl(Test::HTTP::Server::Simple)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
Warnings are an important part of any application. Your web application
should warn the user when something is amiss.

%prep
%setup -q -n Test-HTTP-Server-Simple-StashWarnings-%{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
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Tue Jan 13 2009 Ralf Cors??pius <corsepiu at fedoraproject.org> 0.03-1
- Specfile autogenerated by cpanspec 1.77.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-HTTP-Server-Simple-StashWarnings/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	13 Jan 2009 20:42:31 -0000	1.1
+++ .cvsignore	14 Jan 2009 06:06:02 -0000	1.2
@@ -0,0 +1 @@
+Test-HTTP-Server-Simple-StashWarnings-0.03.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-HTTP-Server-Simple-StashWarnings/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	13 Jan 2009 20:42:31 -0000	1.1
+++ sources	14 Jan 2009 06:06:02 -0000	1.2
@@ -0,0 +1 @@
+0a63b8f45217f05611717292b7ec02e5  Test-HTTP-Server-Simple-StashWarnings-0.03.tar.gz



From pbrobinson at fedoraproject.org  Wed Jan 14 06:11:17 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Wed, 14 Jan 2009 06:11:17 +0000 (UTC)
Subject: rpms/gupnp/F-9 gupnp.spec,1.4,1.5 sources,1.4,1.5
Message-ID: <20090114061117.A13A770136@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/gupnp/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15938

Modified Files:
	gupnp.spec sources 
Log Message:
- New upstream release


Index: gupnp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gupnp/F-9/gupnp.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gupnp.spec	17 Nov 2008 22:17:22 -0000	1.4
+++ gupnp.spec	14 Jan 2009 06:10:47 -0000	1.5
@@ -1,7 +1,7 @@
 Name:           gupnp
-Version:        0.12.4
+Version:        0.12.5
 Release:        1%{?dist}
-Summary:        GUPnP is an framework for creating UPnP devices & control points
+Summary:        A framework for creating UPnP devices & control points
 
 Group:          System Environment/Libraries
 License:        LGPLv2+
@@ -9,9 +9,9 @@
 Source0:        http://www.gupnp.org/sources/%{name}/%{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: gtk-doc
 BuildRequires: libsoup-devel
 BuildRequires: libxml2-devel
 BuildRequires: e2fsprogs-devel
@@ -68,6 +68,15 @@
 %{_includedir}/gupnp-1.0
 
 %changelog
+* Wed Jan 14 2009 Peter Robinson <pbrobinson at gmail.com> 0.12.5-1
+- New upstream release
+
+* Thu Dec 18 2008 Peter Robinson <pbrobinson at gmail.com> 0.12.4-3
+- Add gtk-doc build req
+
+* Sat Nov 22 2008 Peter Robinson <pbrobinson at gmail.com> 0.12.4-2
+- Fix summary
+
 * Mon Nov 17 2008 Peter Robinson <pbrobinson at gmail.com> 0.12.4-1
 - New upstream release
 





From pbrobinson at fedoraproject.org  Wed Jan 14 06:13:05 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Wed, 14 Jan 2009 06:13:05 +0000 (UTC)
Subject: rpms/gupnp-av/F-10 gupnp-av.spec,1.3,1.4 sources,1.2,1.3
Message-ID: <20090114061305.682EF70136@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/gupnp-av/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16190

Modified Files:
	gupnp-av.spec sources 
Log Message:
- New upstream release


Index: gupnp-av.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gupnp-av/F-10/gupnp-av.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gupnp-av.spec	1 Dec 2008 23:03:56 -0000	1.3
+++ gupnp-av.spec	14 Jan 2009 06:12:35 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           gupnp-av
-Version:        0.2.1
-Release:        6%{?dist}
+Version:        0.3
+Release:        1%{?dist}
 Summary:        A collection of helpers for building UPnP AV applications
 
 Group:          System Environment/Libraries
@@ -10,10 +10,11 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: glib2-devel
-BuildRequires: libxml2-devel
-BuildRequires: libsoup-devel
+BuildRequires: gtk-doc
 BuildRequires: gssdp-devel
 BuildRequires: gupnp-devel
+BuildRequires: libxml2-devel
+BuildRequires: libsoup-devel
 
 %description
 GUPnP is an object-oriented open source framework for creating UPnP
@@ -68,6 +69,12 @@
 %{_libdir}/libgupnp-av-1.0.so
 
 %changelog
+* Thu Dec 18 2008 Peter Robinson <pbrobinson at gmail.com> 0.3.1
+- New upstream release
+
+* Thu Dec 18 2008 Peter Robinson <pbrobinson at gmail.com> 0.2.1-7
+- Add gtk-doc build req
+
 * Mon Dec 1 2008 Peter Robinson <pbrobinson at gmail.com> 0.2.1-6
 - Fix directory ownership
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gupnp-av/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	5 Sep 2008 18:08:02 -0000	1.2
+++ sources	14 Jan 2009 06:12:35 -0000	1.3
@@ -1 +1 @@
-af9898820fe57b93387d17f32121367d  gupnp-av-0.2.1.tar.gz
+f6e813591ff89e8e61a46f416046450f  gupnp-av-0.3.tar.gz



From pbrobinson at fedoraproject.org  Wed Jan 14 06:21:52 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Wed, 14 Jan 2009 06:21:52 +0000 (UTC)
Subject: rpms/gupnp-av/F-9 gupnp-av.spec,1.3,1.4 sources,1.2,1.3
Message-ID: <20090114062152.A549D70136@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-serv19455

Modified Files:
	gupnp-av.spec sources 
Log Message:
- New upstream release


Index: gupnp-av.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gupnp-av/F-9/gupnp-av.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gupnp-av.spec	1 Dec 2008 23:08:36 -0000	1.3
+++ gupnp-av.spec	14 Jan 2009 06:21:22 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           gupnp-av
-Version:        0.2.1
-Release:        6%{?dist}
+Version:        0.3
+Release:        1%{?dist}
 Summary:        A collection of helpers for building UPnP AV applications
 
 Group:          System Environment/Libraries
@@ -10,10 +10,11 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: glib2-devel
-BuildRequires: libxml2-devel
-BuildRequires: libsoup-devel
+BuildRequires: gtk-doc
 BuildRequires: gssdp-devel
 BuildRequires: gupnp-devel
+BuildRequires: libxml2-devel
+BuildRequires: libsoup-devel
 
 %description
 GUPnP is an object-oriented open source framework for creating UPnP
@@ -68,6 +69,12 @@
 %{_libdir}/libgupnp-av-1.0.so
 
 %changelog
+* Thu Dec 18 2008 Peter Robinson <pbrobinson at gmail.com> 0.3.1
+- New upstream release
+
+* Thu Dec 18 2008 Peter Robinson <pbrobinson at gmail.com> 0.2.1-7
+- Add gtk-doc build req
+
 * Mon Dec 1 2008 Peter Robinson <pbrobinson at gmail.com> 0.2.1-6
 - Fix directory ownership
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gupnp-av/F-9/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	6 Sep 2008 14:34:58 -0000	1.2
+++ sources	14 Jan 2009 06:21:22 -0000	1.3
@@ -1 +1 @@
-af9898820fe57b93387d17f32121367d  gupnp-av-0.2.1.tar.gz
+f6e813591ff89e8e61a46f416046450f  gupnp-av-0.3.tar.gz



From mmaslano at fedoraproject.org  Wed Jan 14 06:24:19 2009
From: mmaslano at fedoraproject.org (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?=)
Date: Wed, 14 Jan 2009 06:24:19 +0000 (UTC)
Subject: rpms/perl-Devel-Dumpvar/devel perl-Devel-Dumpvar.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090114062419.A215E70136@cvs1.fedora.phx.redhat.com>

Author: mmaslano

Update of /cvs/pkgs/rpms/perl-Devel-Dumpvar/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20805

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Devel-Dumpvar.spec 
Log Message:
* Tue Jan 13 2009 Marcela Ma??l????ov?? <mmaslano at redhat.com> 0.04-2
- removed useless requirement



--- NEW FILE perl-Devel-Dumpvar.spec ---
Name:           perl-Devel-Dumpvar
Version:        0.04
Release:        2%{?dist}
Summary:        Pure-OO reimplementation of dumpvar.pl
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Devel-Dumpvar/
Source0:        http://www.cpan.org/authors/id/A/AD/ADAMK/Devel-Dumpvar-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(ExtUtils::MakeMaker)
BuildRequires:  perl(Test::More) >= 0.42
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
Most perl dumping modules are focused on serializing data structures into
a format that can be rebuilt into the original data structure. They do
this with a variety of different focuses, such as human readability, the
ability to execute the dumped code directly, or to minimize the size of
the dumped data.

%prep
%setup -q -n Devel-Dumpvar-%{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
* Tue Jan 13 2009 Marcela Ma??l????ov?? <mmaslano at redhat.com> 0.04-2
- removed useless requirement

* Mon Jan 12 2009 Marcela Ma??l????ov?? <mmaslano at redhat.com> 0.04-1
- Specfile autogenerated by cpanspec 1.77.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Devel-Dumpvar/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	13 Jan 2009 20:39:24 -0000	1.1
+++ .cvsignore	14 Jan 2009 06:23:49 -0000	1.2
@@ -0,0 +1 @@
+Devel-Dumpvar-0.04.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Devel-Dumpvar/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	13 Jan 2009 20:39:24 -0000	1.1
+++ sources	14 Jan 2009 06:23:49 -0000	1.2
@@ -0,0 +1 @@
+751632a35f17c95c8d31ba2fe5aab44b  Devel-Dumpvar-0.04.tar.gz



From dchen at fedoraproject.org  Wed Jan 14 06:28:52 2009
From: dchen at fedoraproject.org (Ding-Yi Chen)
Date: Wed, 14 Jan 2009 06:28:52 +0000 (UTC)
Subject: rpms/libchewing/devel import.log,1.5,1.6 libchewing.spec,1.25,1.26
Message-ID: <20090114062852.279A870136@cvs1.fedora.phx.redhat.com>

Author: dchen

Update of /cvs/pkgs/rpms/libchewing/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22616/devel

Modified Files:
	import.log libchewing.spec 
Log Message:
Add python support


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/libchewing/devel/import.log,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- import.log	23 Dec 2008 05:41:25 -0000	1.5
+++ import.log	14 Jan 2009 06:28:21 -0000	1.6
@@ -3,3 +3,4 @@
 libchewing-0_3_2-0_fc9:HEAD:libchewing-0.3.2-0.fc9.src.rpm:1228279004
 libchewing-0_3_2-1_fc10:HEAD:libchewing-0.3.2-1.fc10.src.rpm:1229994594
 libchewing-0_3_2-2_fc10:HEAD:libchewing-0.3.2-2.fc10.src.rpm:1230010807
+libchewing-0_3_2-3_fc10:HEAD:libchewing-0.3.2-3.fc10.src.rpm:1231914268


Index: libchewing.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libchewing/devel/libchewing.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- libchewing.spec	23 Dec 2008 05:41:25 -0000	1.25
+++ libchewing.spec	14 Jan 2009 06:28:21 -0000	1.26
@@ -1,6 +1,7 @@
+
 Name:           libchewing
 Version:        0.3.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Intelligent phonetic input method library for Traditional Chinese
 
 Group:          System Environment/Libraries
@@ -18,6 +19,9 @@
 #Patch8: libchewing-0.3.0-11.bz195416.patch
 Patch9: libchewing-0.3.2.bz477690.patch
 
+%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
+%define libchewing_python_dir %{python_sitearch}/%{name}
+
 BuildRoot:     %{_tmppath}/%{name}-%{version}-root
 BuildRequires:  libtool
 
@@ -58,7 +62,8 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 make DESTDIR=%{buildroot} install
-
+mkdir -p $RPM_BUILD_ROOT%{libchewing_python_dir}
+cp python/chewing.py $RPM_BUILD_ROOT%{libchewing_python_dir}
 rm $RPM_BUILD_ROOT%{_libdir}/libchewing.la
 
 %post -p /sbin/ldconfig
@@ -75,6 +80,7 @@
 %{_datadir}/chewing/*
 %{_libdir}/*.so.*
 %{_libdir}/chewing
+%{libchewing_python_dir} 
 
 %files devel
 %defattr(-, root, root)
@@ -84,6 +90,10 @@
 %{_libdir}/*.so
 
 %changelog
+* Thu Jan 14 2009 Ding-Yi Chen <dchen at redhat dot com> - 0.3.2-3
+- Add python binding by copy python/chewing.py to 
+  <python_dir>/site_packages/libchewing
+
 * Tue Dec 23 2008 Ding-Yi Chen <dchen at redhat dot com> - 0.3.2-2
 - [Bug 477690] libchewing multilib conflict
   Move /usr/share/chewing/fonetree.dat to corresponding libdir.



From mmaslano at fedoraproject.org  Wed Jan 14 06:30:13 2009
From: mmaslano at fedoraproject.org (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?=)
Date: Wed, 14 Jan 2009 06:30:13 +0000 (UTC)
Subject: rpms/perl-Devel-Dumpvar/F-10 perl-Devel-Dumpvar.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090114063013.0B20370136@cvs1.fedora.phx.redhat.com>

Author: mmaslano

Update of /cvs/pkgs/rpms/perl-Devel-Dumpvar/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22835

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Devel-Dumpvar.spec 
Log Message:
* Tue Jan 13 2009 Marcela Ma??l????ov?? <mmaslano at redhat.com> 0.04-2
- removed useless requirement



--- NEW FILE perl-Devel-Dumpvar.spec ---
Name:           perl-Devel-Dumpvar
Version:        0.04
Release:        2%{?dist}
Summary:        Pure-OO reimplementation of dumpvar.pl
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Devel-Dumpvar/
Source0:        http://www.cpan.org/authors/id/A/AD/ADAMK/Devel-Dumpvar-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(ExtUtils::MakeMaker)
BuildRequires:  perl(Test::More) >= 0.42
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
Most perl dumping modules are focused on serializing data structures into
a format that can be rebuilt into the original data structure. They do
this with a variety of different focuses, such as human readability, the
ability to execute the dumped code directly, or to minimize the size of
the dumped data.

%prep
%setup -q -n Devel-Dumpvar-%{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
* Tue Jan 13 2009 Marcela Ma??l????ov?? <mmaslano at redhat.com> 0.04-2
- removed useless requirement

* Mon Jan 12 2009 Marcela Ma??l????ov?? <mmaslano at redhat.com> 0.04-1
- Specfile autogenerated by cpanspec 1.77.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Devel-Dumpvar/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	13 Jan 2009 20:39:24 -0000	1.1
+++ .cvsignore	14 Jan 2009 06:29:42 -0000	1.2
@@ -0,0 +1 @@
+Devel-Dumpvar-0.04.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Devel-Dumpvar/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	13 Jan 2009 20:39:24 -0000	1.1
+++ sources	14 Jan 2009 06:29:42 -0000	1.2
@@ -0,0 +1 @@
+751632a35f17c95c8d31ba2fe5aab44b  Devel-Dumpvar-0.04.tar.gz



From dchen at fedoraproject.org  Wed Jan 14 06:32:35 2009
From: dchen at fedoraproject.org (Ding-Yi Chen)
Date: Wed, 14 Jan 2009 06:32:35 +0000 (UTC)
Subject: rpms/libchewing/F-9 import.log,1.5,1.6 libchewing.spec,1.22,1.23
Message-ID: <20090114063235.7987F70136@cvs1.fedora.phx.redhat.com>

Author: dchen

Update of /cvs/pkgs/rpms/libchewing/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23145/F-9

Modified Files:
	import.log libchewing.spec 
Log Message:
Add python support


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/libchewing/F-9/import.log,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- import.log	23 Dec 2008 05:44:42 -0000	1.5
+++ import.log	14 Jan 2009 06:32:05 -0000	1.6
@@ -3,3 +3,4 @@
 libchewing-0_3_2-0_fc9:F-9:libchewing-0.3.2-0.fc9.src.rpm:1228285800
 libchewing-0_3_2-1_fc10:F-9:libchewing-0.3.2-1.fc10.src.rpm:1229994763
 libchewing-0_3_2-2_fc10:F-9:libchewing-0.3.2-2.fc10.src.rpm:1230011048
+libchewing-0_3_2-3_fc10:F-9:libchewing-0.3.2-3.fc10.src.rpm:1231914689


Index: libchewing.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libchewing/F-9/libchewing.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- libchewing.spec	23 Dec 2008 05:44:42 -0000	1.22
+++ libchewing.spec	14 Jan 2009 06:32:05 -0000	1.23
@@ -1,6 +1,7 @@
+
 Name:           libchewing
 Version:        0.3.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Intelligent phonetic input method library for Traditional Chinese
 
 Group:          System Environment/Libraries
@@ -18,6 +19,9 @@
 #Patch8: libchewing-0.3.0-11.bz195416.patch
 Patch9: libchewing-0.3.2.bz477690.patch
 
+%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
+%define libchewing_python_dir %{python_sitearch}/%{name}
+
 BuildRoot:     %{_tmppath}/%{name}-%{version}-root
 BuildRequires:  libtool
 
@@ -58,7 +62,8 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 make DESTDIR=%{buildroot} install
-
+mkdir -p $RPM_BUILD_ROOT%{libchewing_python_dir}
+cp python/chewing.py $RPM_BUILD_ROOT%{libchewing_python_dir}
 rm $RPM_BUILD_ROOT%{_libdir}/libchewing.la
 
 %post -p /sbin/ldconfig
@@ -75,6 +80,7 @@
 %{_datadir}/chewing/*
 %{_libdir}/*.so.*
 %{_libdir}/chewing
+%{libchewing_python_dir} 
 
 %files devel
 %defattr(-, root, root)
@@ -84,6 +90,10 @@
 %{_libdir}/*.so
 
 %changelog
+* Thu Jan 14 2009 Ding-Yi Chen <dchen at redhat dot com> - 0.3.2-3
+- Add python binding by copy python/chewing.py to 
+  <python_dir>/site_packages/libchewing
+
 * Tue Dec 23 2008 Ding-Yi Chen <dchen at redhat dot com> - 0.3.2-2
 - [Bug 477690] libchewing multilib conflict
   Move /usr/share/chewing/fonetree.dat to corresponding libdir.



From mmaslano at fedoraproject.org  Wed Jan 14 06:44:03 2009
From: mmaslano at fedoraproject.org (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?=)
Date: Wed, 14 Jan 2009 06:44:03 +0000 (UTC)
Subject: rpms/perl-File-pushd/devel perl-File-pushd.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090114064403.B9C7C70136@cvs1.fedora.phx.redhat.com>

Author: mmaslano

Update of /cvs/pkgs/rpms/perl-File-pushd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24616

Modified Files:
	.cvsignore sources 
Added Files:
	perl-File-pushd.spec 
Log Message:
* Mon Jan 12 2009 Marcela Ma??l????ov?? <mmaslano at redhat.com> 1.00-1
- Specfile autogenerated by cpanspec 1.77.



--- NEW FILE perl-File-pushd.spec ---
Name:           perl-File-pushd
Version:        1.00
Release:        1%{?dist}
Summary:        Change directory temporarily for a limited scope
License:        ASL 2.0
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/File-pushd/
Source0:        http://www.cpan.org/authors/id/D/DA/DAGOLDEN/File-pushd-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(Module::Build)
BuildRequires:  perl(Test::More) >= 0.45
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
File::pushd does a temporary chdir that is easily and automatically
reverted, similar to pushd in some Unix command shells. It works by
creating an object that caches the original working directory. When the
object is destroyed, the destructor calls chdir to revert to the original
working directory. By storing the object in a lexical variable with a
limited scope, this happens automatically at the end of the scope.

%prep
%setup -q -n File-pushd-%{version}

%build
%{__perl} Build.PL installdirs=vendor
./Build

%install
rm -rf $RPM_BUILD_ROOT

./Build install destdir=$RPM_BUILD_ROOT create_packlist=0
find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;

%{_fixperms} $RPM_BUILD_ROOT/*

%check
./Build test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Changes LICENSE README Todo
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Mon Jan 12 2009 Marcela Ma??l????ov?? <mmaslano at redhat.com> 1.00-1
- Specfile autogenerated by cpanspec 1.77.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-File-pushd/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	13 Jan 2009 20:41:34 -0000	1.1
+++ .cvsignore	14 Jan 2009 06:43:33 -0000	1.2
@@ -0,0 +1 @@
+File-pushd-1.00.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-File-pushd/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	13 Jan 2009 20:41:34 -0000	1.1
+++ sources	14 Jan 2009 06:43:33 -0000	1.2
@@ -0,0 +1 @@
+c0d63d05db01a6da3aebd7cd6f93e520  File-pushd-1.00.tar.gz



From mmaslano at fedoraproject.org  Wed Jan 14 06:57:59 2009
From: mmaslano at fedoraproject.org (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?=)
Date: Wed, 14 Jan 2009 06:57:59 +0000 (UTC)
Subject: rpms/perl-File-pushd/F-10 perl-File-pushd.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090114065800.0416E70136@cvs1.fedora.phx.redhat.com>

Author: mmaslano

Update of /cvs/pkgs/rpms/perl-File-pushd/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25535

Modified Files:
	.cvsignore sources 
Added Files:
	perl-File-pushd.spec 
Log Message:
* Mon Jan 12 2009 Marcela Ma??l????ov?? <mmaslano at redhat.com> 1.00-1
- Specfile autogenerated by cpanspec 1.77.



--- NEW FILE perl-File-pushd.spec ---
Name:           perl-File-pushd
Version:        1.00
Release:        1%{?dist}
Summary:        Change directory temporarily for a limited scope
License:        ASL 2.0
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/File-pushd/
Source0:        http://www.cpan.org/authors/id/D/DA/DAGOLDEN/File-pushd-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(Module::Build)
BuildRequires:  perl(Test::More) >= 0.45
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
File::pushd does a temporary chdir that is easily and automatically
reverted, similar to pushd in some Unix command shells. It works by
creating an object that caches the original working directory. When the
object is destroyed, the destructor calls chdir to revert to the original
working directory. By storing the object in a lexical variable with a
limited scope, this happens automatically at the end of the scope.

%prep
%setup -q -n File-pushd-%{version}

%build
%{__perl} Build.PL installdirs=vendor
./Build

%install
rm -rf $RPM_BUILD_ROOT

./Build install destdir=$RPM_BUILD_ROOT create_packlist=0
find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;

%{_fixperms} $RPM_BUILD_ROOT/*

%check
./Build test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Changes LICENSE README Todo
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Mon Jan 12 2009 Marcela Ma??l????ov?? <mmaslano at redhat.com> 1.00-1
- Specfile autogenerated by cpanspec 1.77.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-File-pushd/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	13 Jan 2009 20:41:34 -0000	1.1
+++ .cvsignore	14 Jan 2009 06:57:29 -0000	1.2
@@ -0,0 +1 @@
+File-pushd-1.00.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-File-pushd/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	13 Jan 2009 20:41:34 -0000	1.1
+++ sources	14 Jan 2009 06:57:29 -0000	1.2
@@ -0,0 +1 @@
+c0d63d05db01a6da3aebd7cd6f93e520  File-pushd-1.00.tar.gz



From mmaslano at fedoraproject.org  Wed Jan 14 07:04:41 2009
From: mmaslano at fedoraproject.org (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?=)
Date: Wed, 14 Jan 2009 07:04:41 +0000 (UTC)
Subject: rpms/perl-Parse-ErrorString-Perl/devel
	perl-Parse-ErrorString-Perl.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090114070441.F1B0A70142@cvs1.fedora.phx.redhat.com>

Author: mmaslano

Update of /cvs/pkgs/rpms/perl-Parse-ErrorString-Perl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26232

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Parse-ErrorString-Perl.spec 
Log Message:
* Tue Jan 13 2009 Marcela Ma??l????ov?? <mmaslano at redhat.com> 0.11-2
- fix dos2unix according to patch from Ralf Corsepius



--- NEW FILE perl-Parse-ErrorString-Perl.spec ---
Name:           perl-Parse-ErrorString-Perl
Version:        0.11
Release:        2%{?dist}
Summary:        Module for parsing error messages
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Parse-ErrorString-Perl/
Source0:        http://www.cpan.org/authors/id/S/SZ/SZABGAB/Parse-ErrorString-Perl-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  /usr/bin/dos2unix
BuildRequires:  perl(Class::XSAccessor)
BuildRequires:  perl(Module::Build)
BuildRequires:  perl(Test::Differences)
BuildRequires:  perl(Test::More)
Requires:       perl(Class::XSAccessor)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
Parse error messages from the perl interpreter.

%prep
%setup -q -n Parse-ErrorString-Perl-%{version}

%build
%{__perl} Build.PL installdirs=vendor

#remove CRLF
/usr/bin/dos2unix Changes
/usr/bin/dos2unix README
/usr/bin/dos2unix bin/check_perldiag

./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/*
%{_bindir}/check_perldiag
%{_mandir}/man1/check_perldiag.1.gz

%changelog
* Tue Jan 13 2009 Marcela Ma??l????ov?? <mmaslano at redhat.com> 0.11-2
- fix dos2unix according to patch from Ralf Corsepius

* Mon Jan 12 2009 Marcela Ma??l????ov?? <mmaslano at redhat.com> 0.11-1
- Specfile autogenerated by cpanspec 1.77.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Parse-ErrorString-Perl/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	13 Jan 2009 20:29:48 -0000	1.1
+++ .cvsignore	14 Jan 2009 07:04:11 -0000	1.2
@@ -0,0 +1 @@
+Parse-ErrorString-Perl-0.11.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Parse-ErrorString-Perl/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	13 Jan 2009 20:29:48 -0000	1.1
+++ sources	14 Jan 2009 07:04:11 -0000	1.2
@@ -0,0 +1 @@
+1eb37f5d7eefaccfb98355fbee64e042  Parse-ErrorString-Perl-0.11.tar.gz



From salimma at fedoraproject.org  Wed Jan 14 07:26:11 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Wed, 14 Jan 2009 07:26:11 +0000 (UTC)
Subject: rpms/fbreader/EL-5 fbreader-0.10.0-desktop-file.patch, NONE,
	1.1 .cvsignore, 1.7, 1.8 fbreader.spec, 1.9, 1.10 sources, 1.7,
	1.8 fbreader-0.8.17-desktop-file.patch, 1.1, NONE
Message-ID: <20090114072611.E7ADF70136@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/fbreader/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28869/EL-5

Modified Files:
	.cvsignore fbreader.spec sources 
Added Files:
	fbreader-0.10.0-desktop-file.patch 
Removed Files:
	fbreader-0.8.17-desktop-file.patch 
Log Message:
* Wed Jan 14 2009 Michel Salim <salimma at fedoraproject.org> - 0.10.0-1
- Update to 0.10.0


fbreader-0.10.0-desktop-file.patch:

--- NEW FILE fbreader-0.10.0-desktop-file.patch ---
--- fbreader-0.10.0/fbreader/desktop/desktop.desktop-file	2009-01-10 19:44:33.000000000 -0500
+++ fbreader-0.10.0/fbreader/desktop/desktop	2009-01-14 01:46:20.000000000 -0500
@@ -1,5 +1,5 @@
 [Desktop Entry]
-Name=E-book reader
+Name=FBReader E-book reader
 Name[ru]=???????????? ?????????????????????? ????????
 GenericName=E-book reader
 GenericName[ru]=???????????? ?????????????????????? ????????
@@ -10,5 +10,5 @@
 StartupNotify=true
 Terminal=false
 Type=Application
-Icon=FBReader.png
-Categories=Office;Viewer;Literature;
+Icon=FBReader
+Categories=GTK;Office;Viewer


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fbreader/EL-5/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	31 Jul 2008 07:41:43 -0000	1.7
+++ .cvsignore	14 Jan 2009 07:25:41 -0000	1.8
@@ -1 +1 @@
-fbreader-sources-0.8.17.tgz
+fbreader-sources-0.10.0.tgz


Index: fbreader.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fbreader/EL-5/fbreader.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- fbreader.spec	31 Jul 2008 07:41:43 -0000	1.9
+++ fbreader.spec	14 Jan 2009 07:25:41 -0000	1.10
@@ -1,6 +1,6 @@
 # rebuild with --with qt4 to build optional qt4 UI
 Name:           fbreader
-Version:        0.8.17
+Version:        0.10.0
 Release:        1%{?dist}
 Summary:        E-book reader
 
@@ -8,7 +8,7 @@
 License:        GPLv2+
 URL:            http://www.fbreader.org/
 Source0:        http://www.fbreader.org/fbreader-sources-%{version}.tgz
-Patch0:         fbreader-0.8.17-desktop-file.patch
+Patch0:         fbreader-0.10.0-desktop-file.patch
 Patch1:         fbreader-optflags.patch
 # Use to expose the compiler flags used during build
 # Patch2:         fbreader-debug.patch
@@ -16,7 +16,8 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  expat-devel bzip2-devel liblinebreak-static
-BuildRequires:  gtk2-devel libjpeg-devel desktop-file-utils
+BuildRequires:  gtk2-devel fribidi-devel libcurl-devel
+BuildRequires:  libjpeg-devel desktop-file-utils
 %{?_with_qt4:BuildRequires: qt4-devel}
 #Requires:       
 
@@ -116,6 +117,9 @@
 
 
 %changelog
+* Wed Jan 14 2009 Michel Salim <salimma at fedoraproject.org> - 0.10.0-1
+- Update to 0.10.0
+
 * Thu Jul 31 2008 Michel Alexandre Salim <salimma at fedoraproject.org> - 0.8.17-1
 - Update to 0.8.17
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fbreader/EL-5/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	31 Jul 2008 07:41:43 -0000	1.7
+++ sources	14 Jan 2009 07:25:41 -0000	1.8
@@ -1 +1 @@
-cde2f1224c51d0adbf970bdb6748eb90  fbreader-sources-0.8.17.tgz
+e2e4eb0a3de3c11475b0d077e49d5086  fbreader-sources-0.10.0.tgz


--- fbreader-0.8.17-desktop-file.patch DELETED ---



From salimma at fedoraproject.org  Wed Jan 14 07:26:12 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Wed, 14 Jan 2009 07:26:12 +0000 (UTC)
Subject: rpms/fbreader/F-9 fbreader-0.10.0-desktop-file.patch, NONE,
	1.1 .cvsignore, 1.7, 1.8 fbreader.spec, 1.12, 1.13 sources, 1.7,
	1.8 fbreader-0.8.17-desktop-file.patch, 1.1, NONE
Message-ID: <20090114072612.A17C470142@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/fbreader/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28869/F-9

Modified Files:
	.cvsignore fbreader.spec sources 
Added Files:
	fbreader-0.10.0-desktop-file.patch 
Removed Files:
	fbreader-0.8.17-desktop-file.patch 
Log Message:
* Wed Jan 14 2009 Michel Salim <salimma at fedoraproject.org> - 0.10.0-1
- Update to 0.10.0


fbreader-0.10.0-desktop-file.patch:

--- NEW FILE fbreader-0.10.0-desktop-file.patch ---
--- fbreader-0.10.0/fbreader/desktop/desktop.desktop-file	2009-01-10 19:44:33.000000000 -0500
+++ fbreader-0.10.0/fbreader/desktop/desktop	2009-01-14 01:46:20.000000000 -0500
@@ -1,5 +1,5 @@
 [Desktop Entry]
-Name=E-book reader
+Name=FBReader E-book reader
 Name[ru]=???????????? ?????????????????????? ????????
 GenericName=E-book reader
 GenericName[ru]=???????????? ?????????????????????? ????????
@@ -10,5 +10,5 @@
 StartupNotify=true
 Terminal=false
 Type=Application
-Icon=FBReader.png
-Categories=Office;Viewer;Literature;
+Icon=FBReader
+Categories=GTK;Office;Viewer


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fbreader/F-9/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	31 Jul 2008 07:41:44 -0000	1.7
+++ .cvsignore	14 Jan 2009 07:25:42 -0000	1.8
@@ -1 +1 @@
-fbreader-sources-0.8.17.tgz
+fbreader-sources-0.10.0.tgz


Index: fbreader.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fbreader/F-9/fbreader.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- fbreader.spec	31 Jul 2008 07:41:44 -0000	1.12
+++ fbreader.spec	14 Jan 2009 07:25:42 -0000	1.13
@@ -1,6 +1,6 @@
 # rebuild with --with qt4 to build optional qt4 UI
 Name:           fbreader
-Version:        0.8.17
+Version:        0.10.0
 Release:        1%{?dist}
 Summary:        E-book reader
 
@@ -8,7 +8,7 @@
 License:        GPLv2+
 URL:            http://www.fbreader.org/
 Source0:        http://www.fbreader.org/fbreader-sources-%{version}.tgz
-Patch0:         fbreader-0.8.17-desktop-file.patch
+Patch0:         fbreader-0.10.0-desktop-file.patch
 Patch1:         fbreader-optflags.patch
 # Use to expose the compiler flags used during build
 # Patch2:         fbreader-debug.patch
@@ -16,7 +16,8 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  expat-devel bzip2-devel liblinebreak-static
-BuildRequires:  gtk2-devel libjpeg-devel desktop-file-utils
+BuildRequires:  gtk2-devel fribidi-devel libcurl-devel
+BuildRequires:  libjpeg-devel desktop-file-utils
 %{?_with_qt4:BuildRequires: qt4-devel}
 #Requires:       
 
@@ -116,6 +117,9 @@
 
 
 %changelog
+* Wed Jan 14 2009 Michel Salim <salimma at fedoraproject.org> - 0.10.0-1
+- Update to 0.10.0
+
 * Thu Jul 31 2008 Michel Alexandre Salim <salimma at fedoraproject.org> - 0.8.17-1
 - Update to 0.8.17
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fbreader/F-9/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	31 Jul 2008 07:41:44 -0000	1.7
+++ sources	14 Jan 2009 07:25:42 -0000	1.8
@@ -1 +1 @@
-cde2f1224c51d0adbf970bdb6748eb90  fbreader-sources-0.8.17.tgz
+e2e4eb0a3de3c11475b0d077e49d5086  fbreader-sources-0.10.0.tgz


--- fbreader-0.8.17-desktop-file.patch DELETED ---



From salimma at fedoraproject.org  Wed Jan 14 07:26:12 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Wed, 14 Jan 2009 07:26:12 +0000 (UTC)
Subject: rpms/fbreader/F-10 fbreader-0.10.0-desktop-file.patch, NONE,
	1.1 .cvsignore, 1.7, 1.8 fbreader.spec, 1.12, 1.13 sources, 1.7,
	1.8 fbreader-0.8.17-desktop-file.patch, 1.1, NONE
Message-ID: <20090114072612.3BD7F70136@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/fbreader/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28869/F-10

Modified Files:
	.cvsignore fbreader.spec sources 
Added Files:
	fbreader-0.10.0-desktop-file.patch 
Removed Files:
	fbreader-0.8.17-desktop-file.patch 
Log Message:
* Wed Jan 14 2009 Michel Salim <salimma at fedoraproject.org> - 0.10.0-1
- Update to 0.10.0


fbreader-0.10.0-desktop-file.patch:

--- NEW FILE fbreader-0.10.0-desktop-file.patch ---
--- fbreader-0.10.0/fbreader/desktop/desktop.desktop-file	2009-01-10 19:44:33.000000000 -0500
+++ fbreader-0.10.0/fbreader/desktop/desktop	2009-01-14 01:46:20.000000000 -0500
@@ -1,5 +1,5 @@
 [Desktop Entry]
-Name=E-book reader
+Name=FBReader E-book reader
 Name[ru]=???????????? ?????????????????????? ????????
 GenericName=E-book reader
 GenericName[ru]=???????????? ?????????????????????? ????????
@@ -10,5 +10,5 @@
 StartupNotify=true
 Terminal=false
 Type=Application
-Icon=FBReader.png
-Categories=Office;Viewer;Literature;
+Icon=FBReader
+Categories=GTK;Office;Viewer


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fbreader/F-10/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	31 Jul 2008 07:36:09 -0000	1.7
+++ .cvsignore	14 Jan 2009 07:25:41 -0000	1.8
@@ -1 +1 @@
-fbreader-sources-0.8.17.tgz
+fbreader-sources-0.10.0.tgz


Index: fbreader.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fbreader/F-10/fbreader.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- fbreader.spec	31 Jul 2008 07:41:45 -0000	1.12
+++ fbreader.spec	14 Jan 2009 07:25:41 -0000	1.13
@@ -1,6 +1,6 @@
 # rebuild with --with qt4 to build optional qt4 UI
 Name:           fbreader
-Version:        0.8.17
+Version:        0.10.0
 Release:        1%{?dist}
 Summary:        E-book reader
 
@@ -8,7 +8,7 @@
 License:        GPLv2+
 URL:            http://www.fbreader.org/
 Source0:        http://www.fbreader.org/fbreader-sources-%{version}.tgz
-Patch0:         fbreader-0.8.17-desktop-file.patch
+Patch0:         fbreader-0.10.0-desktop-file.patch
 Patch1:         fbreader-optflags.patch
 # Use to expose the compiler flags used during build
 # Patch2:         fbreader-debug.patch
@@ -16,7 +16,8 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  expat-devel bzip2-devel liblinebreak-static
-BuildRequires:  gtk2-devel libjpeg-devel desktop-file-utils
+BuildRequires:  gtk2-devel fribidi-devel libcurl-devel
+BuildRequires:  libjpeg-devel desktop-file-utils
 %{?_with_qt4:BuildRequires: qt4-devel}
 #Requires:       
 
@@ -116,6 +117,9 @@
 
 
 %changelog
+* Wed Jan 14 2009 Michel Salim <salimma at fedoraproject.org> - 0.10.0-1
+- Update to 0.10.0
+
 * Thu Jul 31 2008 Michel Alexandre Salim <salimma at fedoraproject.org> - 0.8.17-1
 - Update to 0.8.17
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fbreader/F-10/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	31 Jul 2008 07:36:09 -0000	1.7
+++ sources	14 Jan 2009 07:25:41 -0000	1.8
@@ -1 +1 @@
-cde2f1224c51d0adbf970bdb6748eb90  fbreader-sources-0.8.17.tgz
+e2e4eb0a3de3c11475b0d077e49d5086  fbreader-sources-0.10.0.tgz


--- fbreader-0.8.17-desktop-file.patch DELETED ---



From salimma at fedoraproject.org  Wed Jan 14 07:26:13 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Wed, 14 Jan 2009 07:26:13 +0000 (UTC)
Subject: rpms/fbreader/devel fbreader-0.10.0-desktop-file.patch, NONE,
	1.1 .cvsignore, 1.7, 1.8 fbreader.spec, 1.12, 1.13 sources, 1.7,
	1.8 fbreader-0.8.17-desktop-file.patch, 1.1, NONE
Message-ID: <20090114072613.03A7670143@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/fbreader/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28869/devel

Modified Files:
	.cvsignore fbreader.spec sources 
Added Files:
	fbreader-0.10.0-desktop-file.patch 
Removed Files:
	fbreader-0.8.17-desktop-file.patch 
Log Message:
* Wed Jan 14 2009 Michel Salim <salimma at fedoraproject.org> - 0.10.0-1
- Update to 0.10.0


fbreader-0.10.0-desktop-file.patch:

--- NEW FILE fbreader-0.10.0-desktop-file.patch ---
--- fbreader-0.10.0/fbreader/desktop/desktop.desktop-file	2009-01-10 19:44:33.000000000 -0500
+++ fbreader-0.10.0/fbreader/desktop/desktop	2009-01-14 01:46:20.000000000 -0500
@@ -1,5 +1,5 @@
 [Desktop Entry]
-Name=E-book reader
+Name=FBReader E-book reader
 Name[ru]=???????????? ?????????????????????? ????????
 GenericName=E-book reader
 GenericName[ru]=???????????? ?????????????????????? ????????
@@ -10,5 +10,5 @@
 StartupNotify=true
 Terminal=false
 Type=Application
-Icon=FBReader.png
-Categories=Office;Viewer;Literature;
+Icon=FBReader
+Categories=GTK;Office;Viewer


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fbreader/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	31 Jul 2008 07:36:09 -0000	1.7
+++ .cvsignore	14 Jan 2009 07:25:42 -0000	1.8
@@ -1 +1 @@
-fbreader-sources-0.8.17.tgz
+fbreader-sources-0.10.0.tgz


Index: fbreader.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fbreader/devel/fbreader.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- fbreader.spec	31 Jul 2008 07:41:45 -0000	1.12
+++ fbreader.spec	14 Jan 2009 07:25:42 -0000	1.13
@@ -1,6 +1,6 @@
 # rebuild with --with qt4 to build optional qt4 UI
 Name:           fbreader
-Version:        0.8.17
+Version:        0.10.0
 Release:        1%{?dist}
 Summary:        E-book reader
 
@@ -8,7 +8,7 @@
 License:        GPLv2+
 URL:            http://www.fbreader.org/
 Source0:        http://www.fbreader.org/fbreader-sources-%{version}.tgz
-Patch0:         fbreader-0.8.17-desktop-file.patch
+Patch0:         fbreader-0.10.0-desktop-file.patch
 Patch1:         fbreader-optflags.patch
 # Use to expose the compiler flags used during build
 # Patch2:         fbreader-debug.patch
@@ -16,7 +16,8 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  expat-devel bzip2-devel liblinebreak-static
-BuildRequires:  gtk2-devel libjpeg-devel desktop-file-utils
+BuildRequires:  gtk2-devel fribidi-devel libcurl-devel
+BuildRequires:  libjpeg-devel desktop-file-utils
 %{?_with_qt4:BuildRequires: qt4-devel}
 #Requires:       
 
@@ -116,6 +117,9 @@
 
 
 %changelog
+* Wed Jan 14 2009 Michel Salim <salimma at fedoraproject.org> - 0.10.0-1
+- Update to 0.10.0
+
 * Thu Jul 31 2008 Michel Alexandre Salim <salimma at fedoraproject.org> - 0.8.17-1
 - Update to 0.8.17
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fbreader/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	31 Jul 2008 07:36:09 -0000	1.7
+++ sources	14 Jan 2009 07:25:42 -0000	1.8
@@ -1 +1 @@
-cde2f1224c51d0adbf970bdb6748eb90  fbreader-sources-0.8.17.tgz
+e2e4eb0a3de3c11475b0d077e49d5086  fbreader-sources-0.10.0.tgz


--- fbreader-0.8.17-desktop-file.patch DELETED ---



From corsepiu at fedoraproject.org  Wed Jan 14 07:29:52 2009
From: corsepiu at fedoraproject.org (=?utf-8?q?Ralf_Cors=C3=A9pius?=)
Date: Wed, 14 Jan 2009 07:29:52 +0000 (UTC)
Subject: rpms/po4a/F-10 .cvsignore, 1.3, 1.4 po4a.spec, 1.7, 1.8 sources, 1.3,
	1.4
Message-ID: <20090114072952.28D7770136@cvs1.fedora.phx.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/po4a/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29254

Modified Files:
	.cvsignore po4a.spec sources 
Log Message:
* Tue Jan 13 2009 Ralf Cors??pius <corsepiu at fedoraproject.org> - 0.34-1
- Reset %release.
- Add BuildRequires: perl(Test::More), BuildRequires: docbook-dtds.
- Activate tests.
- Fix Source0:-URL.
- Spec file cosmetics.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/po4a/F-10/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	20 Aug 2007 17:21:39 -0000	1.3
+++ .cvsignore	14 Jan 2009 07:29:21 -0000	1.4
@@ -1 +1 @@
-po4a-0.32.tar.gz
+po4a-0.34.tar.gz


Index: po4a.spec
===================================================================
RCS file: /cvs/pkgs/rpms/po4a/F-10/po4a.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- po4a.spec	26 Aug 2008 17:57:14 -0000	1.7
+++ po4a.spec	14 Jan 2009 07:29:21 -0000	1.8
@@ -1,12 +1,12 @@
 Name: po4a
 Version: 0.34
-Release: 9%{?dist}
+Release: 1%{?dist}
 Summary: A tool maintaining translations anywhere
 Group: Applications/System
 # Nothing in the source tree specifies a version of the GPL.
 License: GPL+
 URL: http://alioth.debian.org/projects/po4a/
-Source0: http://alioth.debian.org/download.php/1798/%{name}-%{version}.tar.gz
+Source0: http://alioth.debian.org/download.php/2518/%{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildArch: noarch
 BuildRequires: perl(Module::Build)
@@ -15,6 +15,10 @@
 BuildRequires: perl(Locale::gettext) >= 1.01, gettext
 BuildRequires: perl(Term::ReadKey)
 
+# Required by the tests.
+BuildRequires: perl(Test::More)
+BuildRequires: docbook-dtds
+
 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 Requires: gettext
 
@@ -35,8 +39,9 @@
 make install DESTDIR=%{buildroot}
 find %{buildroot} -type f \( -name .packlist -or -name perllocal.pod \
   -or \( -name '*.bs' -a -empty \) \) -exec rm -f {} \;
-find %{buildroot} -depth -type d -exec rmdir {} \;
-chmod -R u+w %{buildroot}
+find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null \;
+
+%{_fixperms} %{buildroot}
 
 %find_lang %{name}
 
@@ -47,8 +52,8 @@
 done
 
 %check
-# check is currently broken due to absence of data-23/fonts
-#./Build test verbose=1
+# The tests are unclean
+./Build test ||:
 
 %clean
 rm -rf %{buildroot}
@@ -71,7 +76,14 @@
 
 
 %changelog
-* Sun Aug 24 2008 Axel Thimm <Axel.Thimm at ATrpms.net> - 0.34-9
+* Tue Jan 13 2009 Ralf Cors??pius <corsepiu at fedoraproject.org> - 0.34-1
+- Reset %%release.
+- Add BuildRequires: perl(Test::More), BuildRequires: docbook-dtds.
+- Activate tests.
+- Fix Source0:-URL.
+- Spec file cosmetics.
+
+* Sun Aug 24 2008 Axel Thimm <Axel.Thimm at ATrpms.net>
 - Update to 0.34.
 
 * Sun Jun 01 2008 Ralf Cors??pius <rc040203 at freenet.de> - 0.32-8


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/po4a/F-10/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	20 Aug 2007 17:21:39 -0000	1.3
+++ sources	14 Jan 2009 07:29:21 -0000	1.4
@@ -1 +1 @@
-d026b224965b50afd9924b61d0df2a06  po4a-0.32.tar.gz
+883b616e8c2ec6dc5bab53118afd270a  po4a-0.34.tar.gz



From mmaslano at fedoraproject.org  Wed Jan 14 07:43:31 2009
From: mmaslano at fedoraproject.org (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?=)
Date: Wed, 14 Jan 2009 07:43:31 +0000 (UTC)
Subject: rpms/perl-Parse-ErrorString-Perl/devel
	perl-Parse-ErrorString-Perl.spec, 1.1, 1.2
Message-ID: <20090114074331.1A99570136@cvs1.fedora.phx.redhat.com>

Author: mmaslano

Update of /cvs/pkgs/rpms/perl-Parse-ErrorString-Perl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30757

Modified Files:
	perl-Parse-ErrorString-Perl.spec 
Log Message:
It won't build without Pod::POM like BR.



Index: perl-Parse-ErrorString-Perl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Parse-ErrorString-Perl/devel/perl-Parse-ErrorString-Perl.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Parse-ErrorString-Perl.spec	14 Jan 2009 07:04:11 -0000	1.1
+++ perl-Parse-ErrorString-Perl.spec	14 Jan 2009 07:43:00 -0000	1.2
@@ -14,6 +14,7 @@
 BuildRequires:  perl(Test::Differences)
 BuildRequires:  perl(Test::More)
 Requires:       perl(Class::XSAccessor)
+BuildRequires:       perl(Pod::POM)
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description



From corsepiu at fedoraproject.org  Wed Jan 14 07:44:59 2009
From: corsepiu at fedoraproject.org (=?utf-8?q?Ralf_Cors=C3=A9pius?=)
Date: Wed, 14 Jan 2009 07:44:59 +0000 (UTC)
Subject: rpms/po4a/F-9 .cvsignore,1.3,1.4 po4a.spec,1.5,1.6 sources,1.3,1.4
Message-ID: <20090114074459.E934F70136@cvs1.fedora.phx.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/po4a/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31107

Modified Files:
	.cvsignore po4a.spec sources 
Log Message:
* Tue Jan 13 2009 Ralf Cors??pius <corsepiu at fedoraproject.org> - 0.34-1
- Reset %release.
- Add BuildRequires: perl(Test::More), BuildRequires: docbook-dtds.
- Activate tests.
- Fix Source0:-URL.
- Spec file cosmetics.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/po4a/F-9/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	20 Aug 2007 17:21:39 -0000	1.3
+++ .cvsignore	14 Jan 2009 07:44:29 -0000	1.4
@@ -1 +1 @@
-po4a-0.32.tar.gz
+po4a-0.34.tar.gz


Index: po4a.spec
===================================================================
RCS file: /cvs/pkgs/rpms/po4a/F-9/po4a.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- po4a.spec	1 Jun 2008 05:40:57 -0000	1.5
+++ po4a.spec	14 Jan 2009 07:44:29 -0000	1.6
@@ -1,12 +1,12 @@
 Name: po4a
-Version: 0.32
-Release: 8%{?dist}
+Version: 0.34
+Release: 1%{?dist}
 Summary: A tool maintaining translations anywhere
 Group: Applications/System
 # Nothing in the source tree specifies a version of the GPL.
 License: GPL+
 URL: http://alioth.debian.org/projects/po4a/
-Source0: http://alioth.debian.org/download.php/1798/%{name}-%{version}.tar.gz
+Source0: http://alioth.debian.org/download.php/2518/%{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildArch: noarch
 BuildRequires: perl(Module::Build)
@@ -15,6 +15,10 @@
 BuildRequires: perl(Locale::gettext) >= 1.01, gettext
 BuildRequires: perl(Term::ReadKey)
 
+# Required by the tests.
+BuildRequires: perl(Test::More)
+BuildRequires: docbook-dtds
+
 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 Requires: gettext
 
@@ -35,8 +39,9 @@
 make install DESTDIR=%{buildroot}
 find %{buildroot} -type f \( -name .packlist -or -name perllocal.pod \
   -or \( -name '*.bs' -a -empty \) \) -exec rm -f {} \;
-find %{buildroot} -depth -type d -exec rmdir {} \;
-chmod -R u+w %{buildroot}
+find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null \;
+
+%{_fixperms} %{buildroot}
 
 %find_lang %{name}
 
@@ -47,8 +52,8 @@
 done
 
 %check
-# check is currently broken due to absence of data-23/fonts
-#./Build test verbose=1
+# The tests are unclean
+./Build test ||:
 
 %clean
 rm -rf %{buildroot}
@@ -64,13 +69,23 @@
 %{_mandir}/man1/msguntypot.1*
 %{_mandir}/man3/Locale::Po4a::*.3pm*
 %{_mandir}/man7/po4a.7*
-%{_mandir}/*/man1/po4a*.1p*
+%{_mandir}/*/man1/po4a*.1*
 %{_mandir}/*/man1/msguntypot.1*
 %{_mandir}/*/man3/Locale::Po4a::*.3pm*
 %{_mandir}/*/man7/po4a.7*
 
 
 %changelog
+* Tue Jan 13 2009 Ralf Cors??pius <corsepiu at fedoraproject.org> - 0.34-1
+- Reset %%release.
+- Add BuildRequires: perl(Test::More), BuildRequires: docbook-dtds.
+- Activate tests.
+- Fix Source0:-URL.
+- Spec file cosmetics.
+
+* Sun Aug 24 2008 Axel Thimm <Axel.Thimm at ATrpms.net>
+- Update to 0.34.
+
 * Sun Jun 01 2008 Ralf Cors??pius <rc040203 at freenet.de> - 0.32-8
 - Let package own %%{perl_vendorlib}/Locale (BZ 449258).
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/po4a/F-9/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	20 Aug 2007 17:21:39 -0000	1.3
+++ sources	14 Jan 2009 07:44:29 -0000	1.4
@@ -1 +1 @@
-d026b224965b50afd9924b61d0df2a06  po4a-0.32.tar.gz
+883b616e8c2ec6dc5bab53118afd270a  po4a-0.34.tar.gz



From varekova at fedoraproject.org  Wed Jan 14 07:47:00 2009
From: varekova at fedoraproject.org (Ivana Varekova)
Date: Wed, 14 Jan 2009 07:47:00 +0000 (UTC)
Subject: rpms/gnuplot/devel gnuplot.spec,1.62,1.63
Message-ID: <20090114074701.00F1C70136@cvs1.fedora.phx.redhat.com>

Author: varekova

Update of /cvs/pkgs/rpms/gnuplot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31399

Modified Files:
	gnuplot.spec 
Log Message:
- fix sbin path



Index: gnuplot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnuplot/devel/gnuplot.spec,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- gnuplot.spec	13 Jan 2009 12:34:48 -0000	1.62
+++ gnuplot.spec	14 Jan 2009 07:46:30 -0000	1.63
@@ -17,7 +17,7 @@
 Summary: A program for plotting mathematical expressions and data
 Name: gnuplot
 Version: %{major}.%{minor}.%{patchlevel}
-Release: 2%{?dist}
+Release: 3%{?dist}
 # Modifications are to be distributed as patches to the released version.
 License: gnuplot and GPLv2
 Group: Applications/Engineering
@@ -45,8 +45,8 @@
 %package common
 Group: Applications/Engineering
 Summary: common gnuplot parts
-Requires(post): %{_sbindir}/install-info
-Requires(preun): %{_sbindir}/install-info
+Requires(post): /sbin/install-info
+Requires(preun): /sbin/install-info
 
 %description common
 Gnuplot is a command-line driven, interactive function plotting
@@ -217,6 +217,9 @@
 %{emacs_lispdir}/%{name}/*.el
 
 %changelog
+* Wed Jan 14 2009 Ivana Varekova <varekova at redhat.com> - 4.2.4-3
+- fix sbin path
+
 * Tue Jan 13 2009 Ivana Varekova <varekova at redhat.com> - 4.2.4-2
 - add minimal package for server SIG purposes
 



From mmaslano at fedoraproject.org  Wed Jan 14 07:51:39 2009
From: mmaslano at fedoraproject.org (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?=)
Date: Wed, 14 Jan 2009 07:51:39 +0000 (UTC)
Subject: rpms/perl-Parse-ErrorString-Perl/F-10 .cvsignore, 1.1, 1.2 sources, 
	1.1, 1.2
Message-ID: <20090114075139.5AD1570136@cvs1.fedora.phx.redhat.com>

Author: mmaslano

Update of /cvs/pkgs/rpms/perl-Parse-ErrorString-Perl/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32023

Modified Files:
	.cvsignore sources 
Log Message:
* Tue Jan 13 2009 Marcela Ma??l????ov?? <mmaslano at redhat.com> 0.11-2
- fix dos2unix according to patch from Ralf Corsepius



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Parse-ErrorString-Perl/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	13 Jan 2009 20:29:48 -0000	1.1
+++ .cvsignore	14 Jan 2009 07:51:08 -0000	1.2
@@ -0,0 +1 @@
+Parse-ErrorString-Perl-0.11.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Parse-ErrorString-Perl/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	13 Jan 2009 20:29:48 -0000	1.1
+++ sources	14 Jan 2009 07:51:09 -0000	1.2
@@ -0,0 +1 @@
+1eb37f5d7eefaccfb98355fbee64e042  Parse-ErrorString-Perl-0.11.tar.gz



From mmaslano at fedoraproject.org  Wed Jan 14 07:53:07 2009
From: mmaslano at fedoraproject.org (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?=)
Date: Wed, 14 Jan 2009 07:53:07 +0000 (UTC)
Subject: rpms/perl-Parse-ErrorString-Perl/F-10
	perl-Parse-ErrorString-Perl.spec, NONE, 1.1
Message-ID: <20090114075307.D3ADF70136@cvs1.fedora.phx.redhat.com>

Author: mmaslano

Update of /cvs/pkgs/rpms/perl-Parse-ErrorString-Perl/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32258

Added Files:
	perl-Parse-ErrorString-Perl.spec 
Log Message:
* Tue Jan 13 2009 Marcela Ma??l????ov?? <mmaslano at redhat.com> 0.11-2
- fix dos2unix according to patch from Ralf Corsepius



--- NEW FILE perl-Parse-ErrorString-Perl.spec ---
Name:           perl-Parse-ErrorString-Perl
Version:        0.11
Release:        2%{?dist}
Summary:        Module for parsing error messages
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Parse-ErrorString-Perl/
Source0:        http://www.cpan.org/authors/id/S/SZ/SZABGAB/Parse-ErrorString-Perl-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  /usr/bin/dos2unix
BuildRequires:  perl(Class::XSAccessor)
BuildRequires:  perl(Module::Build)
BuildRequires:  perl(Test::Differences)
BuildRequires:  perl(Test::More)
Requires:       perl(Class::XSAccessor)
BuildRequires:       perl(Pod::POM)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
Parse error messages from the perl interpreter.

%prep
%setup -q -n Parse-ErrorString-Perl-%{version}

%build
%{__perl} Build.PL installdirs=vendor

#remove CRLF
/usr/bin/dos2unix Changes
/usr/bin/dos2unix README
/usr/bin/dos2unix bin/check_perldiag

./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/*
%{_bindir}/check_perldiag
%{_mandir}/man1/check_perldiag.1.gz

%changelog
* Tue Jan 13 2009 Marcela Ma??l????ov?? <mmaslano at redhat.com> 0.11-2
- fix dos2unix according to patch from Ralf Corsepius

* Mon Jan 12 2009 Marcela Ma??l????ov?? <mmaslano at redhat.com> 0.11-1
- Specfile autogenerated by cpanspec 1.77.



From dchen at fedoraproject.org  Wed Jan 14 08:16:39 2009
From: dchen at fedoraproject.org (Ding-Yi Chen)
Date: Wed, 14 Jan 2009 08:16:39 +0000 (UTC)
Subject: rpms/libchewing/F-10 import.log,1.5,1.6 libchewing.spec,1.25,1.26
Message-ID: <20090114081639.E57BA70136@cvs1.fedora.phx.redhat.com>

Author: dchen

Update of /cvs/pkgs/rpms/libchewing/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2573/F-10

Modified Files:
	import.log libchewing.spec 
Log Message:
Add python support


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/libchewing/F-10/import.log,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- import.log	23 Dec 2008 05:43:13 -0000	1.5
+++ import.log	14 Jan 2009 08:16:09 -0000	1.6
@@ -3,3 +3,4 @@
 libchewing-0_3_2-0_fc9:F-10:libchewing-0.3.2-0.fc9.src.rpm:1228283261
 libchewing-0_3_2-1_fc10:F-10:libchewing-0.3.2-1.fc10.src.rpm:1229994672
 libchewing-0_3_2-2_fc10:F-10:libchewing-0.3.2-2.fc10.src.rpm:1230010931
+libchewing-0_3_2-3_fc10:F-10:libchewing-0.3.2-3.fc10.src.rpm:1231920830


Index: libchewing.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libchewing/F-10/libchewing.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- libchewing.spec	23 Dec 2008 05:43:13 -0000	1.25
+++ libchewing.spec	14 Jan 2009 08:16:09 -0000	1.26
@@ -1,6 +1,7 @@
+
 Name:           libchewing
 Version:        0.3.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Intelligent phonetic input method library for Traditional Chinese
 
 Group:          System Environment/Libraries
@@ -18,6 +19,9 @@
 #Patch8: libchewing-0.3.0-11.bz195416.patch
 Patch9: libchewing-0.3.2.bz477690.patch
 
+%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
+%define libchewing_python_dir %{python_sitearch}/%{name}
+
 BuildRoot:     %{_tmppath}/%{name}-%{version}-root
 BuildRequires:  libtool
 
@@ -58,7 +62,8 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 make DESTDIR=%{buildroot} install
-
+mkdir -p $RPM_BUILD_ROOT%{libchewing_python_dir}
+cp python/chewing.py $RPM_BUILD_ROOT%{libchewing_python_dir}
 rm $RPM_BUILD_ROOT%{_libdir}/libchewing.la
 
 %post -p /sbin/ldconfig
@@ -75,6 +80,7 @@
 %{_datadir}/chewing/*
 %{_libdir}/*.so.*
 %{_libdir}/chewing
+%{libchewing_python_dir} 
 
 %files devel
 %defattr(-, root, root)
@@ -84,6 +90,10 @@
 %{_libdir}/*.so
 
 %changelog
+* Thu Jan 14 2009 Ding-Yi Chen <dchen at redhat dot com> - 0.3.2-3
+- Add python binding by copy python/chewing.py to 
+  <python_dir>/site_packages/libchewing
+
 * Tue Dec 23 2008 Ding-Yi Chen <dchen at redhat dot com> - 0.3.2-2
 - [Bug 477690] libchewing multilib conflict
   Move /usr/share/chewing/fonetree.dat to corresponding libdir.



From alexlan at fedoraproject.org  Wed Jan 14 08:18:20 2009
From: alexlan at fedoraproject.org (Alex Lancaster)
Date: Wed, 14 Jan 2009 08:18:20 +0000 (UTC)
Subject: rpms/mutt/devel mutt.spec,1.58,1.59
Message-ID: <20090114081820.BE7F970136@cvs1.fedora.phx.redhat.com>

Author: alexlan

Update of /cvs/pkgs/rpms/mutt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2777

Modified Files:
	mutt.spec 
Log Message:
* Wed Jan 14 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 5:1.5.19-2
- Rebuild for deps



Index: mutt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mutt/devel/mutt.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- mutt.spec	7 Jan 2009 14:06:21 -0000	1.58
+++ mutt.spec	14 Jan 2009 08:17:50 -0000	1.59
@@ -16,7 +16,7 @@
 Summary: A text mode mail user agent
 Name: mutt
 Version: 1.5.19
-Release: 1%{?dist}
+Release: 2%{?dist}
 Epoch: 5
 # The entire source code is GPLv2+ except
 # pgpewrap.c setenv.c sha1.c wcwidth.c which are Public Domain
@@ -142,6 +142,9 @@
 %{_mandir}/man5/muttrc.*
 
 %changelog
+* Wed Jan 14 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 5:1.5.19-2
+- Rebuild for deps
+
 * Wed Jan 07 2009 Miroslav Lichvar <mlichvar at redhat.com> 5:1.5.19-1
 - update to 1.5.19
 - switch hcache backend to tokyocabinet



From jwrdegoede at fedoraproject.org  Wed Jan 14 08:42:31 2009
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Wed, 14 Jan 2009 08:42:31 +0000 (UTC)
Subject: rpms/kernel/F-10 linux-2.6-gspca-stv06xx-git.patch, NONE,
	1.1 kernel.spec, 1.1212, 1.1213 linux-2.6-gspca-git.patch, 1.1, 1.2
Message-ID: <20090114084231.A7AFF70136@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/kernel/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5268

Modified Files:
	kernel.spec linux-2.6-gspca-git.patch 
Added Files:
	linux-2.6-gspca-stv06xx-git.patch 
Log Message:
* Wed Jan 14 2009 Hans de Goede <hdegoede at redhat.com>
- Rebase gspca git patch and re-enable
- Add gscpa-stv06xx (qc-usb replacement) driver from its own git tree


linux-2.6-gspca-stv06xx-git.patch:

--- NEW FILE linux-2.6-gspca-stv06xx-git.patch ---
diff -urpN linux/drivers/media/video/gspca/Kconfig linux/drivers/media/video/gspca/Kconfig
--- linux/drivers/media/video/gspca/Kconfig	2008-12-09 21:37:33.000000000 +0100
+++ linux/drivers/media/video/gspca/Kconfig	2008-12-25 17:09:06.000000000 +0100
@@ -18,6 +18,7 @@ menuconfig USB_GSPCA
 if USB_GSPCA && VIDEO_V4L2
 
 source "drivers/media/video/gspca/m5602/Kconfig"
+source "drivers/media/video/gspca/stv06xx/Kconfig"
 
 config USB_GSPCA_CONEX
 	tristate "Conexant Camera Driver"
diff -urpN linux/drivers/media/video/gspca/Makefile linux/drivers/media/video/gspca/Makefile
--- linux/drivers/media/video/gspca/Makefile	2008-12-09 21:37:33.000000000 +0100
+++ linux/drivers/media/video/gspca/Makefile	2008-12-25 17:09:06.000000000 +0100
@@ -47,4 +45,4 @@ gspca_vc032x-objs		:= vc032x.o
 gspca_zc3xx-objs		:= zc3xx.o
 
 obj-$(CONFIG_USB_M5602)		+= m5602/
-
+obj-$(CONFIG_USB_STV06XX) 	+= stv06xx/
diff -urpN linux/drivers/media/video/gspca/gspca.h linux/drivers/media/video/gspca/gspca.h
--- linux/drivers/media/video/gspca/gspca.h	2008-12-10 19:53:43.000000000 +0100
+++ linux/drivers/media/video/gspca/gspca.h	2008-12-25 20:55:35.000000000 +0100
@@ -56,7 +56,7 @@ extern int gspca_debug;
 /* device information - set at probe time */
 struct cam {
 	int bulk_size;		/* buffer size when image transfer by bulk */
-	struct v4l2_pix_format *cam_mode;	/* size nmodes */
+	const struct v4l2_pix_format *cam_mode;	/* size nmodes */
 	char nmodes;
 	__u8 bulk_nurbs;	/* number of URBs in bulk mode
 				 * - cannot be > MAX_NURBS
diff -urpN linux/drivers/media/video/gspca/stv06xx/Kconfig linux/drivers/media/video/gspca/stv06xx/Kconfig
--- linux/drivers/media/video/gspca/stv06xx/Kconfig	1970-01-01 01:00:00.000000000 +0100
+++ linux/drivers/media/video/gspca/stv06xx/Kconfig	2008-12-25 17:09:06.000000000 +0100
@@ -0,0 +1,8 @@
+config USB_STV06XX
+	tristate "ST USB STV06XX Camera Driver"
+	depends on VIDEO_V4L2 && USB_GSPCA
+	help
+	  Say Y here if you want support for cameras based on the ST STV06XX chip.
+
+	  To compile this driver as a module, choose M here: the
+	  module will be called gspca_stv06xx.
diff -urpN linux/drivers/media/video/gspca/stv06xx/Makefile linux/drivers/media/video/gspca/stv06xx/Makefile
--- linux/drivers/media/video/gspca/stv06xx/Makefile	1970-01-01 01:00:00.000000000 +0100
+++ linux/drivers/media/video/gspca/stv06xx/Makefile	2008-12-25 17:09:06.000000000 +0100
@@ -0,0 +1,8 @@
+obj-$(CONFIG_USB_STV06XX) += gspca_stv06xx.o
+
+gspca_stv06xx-objs := stv06xx.o \
+		      stv06xx_vv6410.o \
+		      stv06xx_hdcs.o \
+		      stv06xx_pb0100.o
+
+EXTRA_CFLAGS += -Idrivers/media/video/gspca
diff -urpN linux/drivers/media/video/gspca/stv06xx/stv06xx.c linux/drivers/media/video/gspca/stv06xx/stv06xx.c
--- linux/drivers/media/video/gspca/stv06xx/stv06xx.c	1970-01-01 01:00:00.000000000 +0100
+++ linux/drivers/media/video/gspca/stv06xx/stv06xx.c	2008-12-25 21:17:34.000000000 +0100
@@ -0,0 +1,522 @@
+/*
+ * Copyright (c) 2001 Jean-Fredric Clere, Nikolas Zimmermann, Georg Acher
+ *		      Mark Cave-Ayland, Carlo E Prelz, Dick Streefland
+ * Copyright (c) 2002, 2003 Tuukka Toivonen
+ * Copyright (c) 2008 Erik Andr??n
+ *
+ * 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
+ *
+ * P/N 861037:      Sensor HDCS1000        ASIC STV0600
+ * P/N 861050-0010: Sensor HDCS1000        ASIC STV0600
+ * P/N 861050-0020: Sensor Photobit PB100  ASIC STV0600-1 - QuickCam Express
+ * P/N 861055:      Sensor ST VV6410       ASIC STV0610   - LEGO cam
+ * P/N 861075-0040: Sensor HDCS1000        ASIC
+ * P/N 961179-0700: Sensor ST VV6410       ASIC STV0602   - Dexxa WebCam USB
+ * P/N 861040-0000: Sensor ST VV6410       ASIC STV0610   - QuickCam Web
+ */
+
+#include "stv06xx_sensor.h"
+
+MODULE_AUTHOR("Erik Andr??n");
+MODULE_DESCRIPTION("STV06XX USB Camera Driver");
+MODULE_LICENSE("GPL");
+
+int dump_bridge;
+int dump_sensor;
+
+int stv06xx_write_bridge(struct sd *sd, u16 address, u16 i2c_data)
+{
+	int err;
+	struct usb_device *udev = sd->gspca_dev.dev;
+	__u8 *buf = sd->gspca_dev.usb_buf;
+	u8 len = (i2c_data > 0xff) ? 2 : 1;
+
+	buf[0] = i2c_data & 0xff;
+	buf[1] = (i2c_data >> 8) & 0xff;
+
+	err = usb_control_msg(udev, usb_sndctrlpipe(udev, 0),
+			      0x04, 0x40, address, 0, buf, len,
+			      STV06XX_URB_MSG_TIMEOUT);
+
+
+	PDEBUG(D_CONF, "Written 0x%x to address 0x%x, status: %d",
+	       i2c_data, address, err);
+
+	return (err < 0) ? err : 0;
+}
+
+int stv06xx_read_bridge(struct sd *sd, u16 address, u8 *i2c_data)
+{
+	int err;
+	struct usb_device *udev = sd->gspca_dev.dev;
+	__u8 *buf = sd->gspca_dev.usb_buf;
+
+	err = usb_control_msg(udev, usb_rcvctrlpipe(udev, 0),
+			      0x04, 0xc0, address, 0, buf, 1,
+			      STV06XX_URB_MSG_TIMEOUT);
+
+	*i2c_data = buf[0];
+
+	PDEBUG(D_CONF, "Read 0x%x from address 0x%x, status %d",
+	       *i2c_data, address, err);
+
+	return (err < 0) ? err : 0;
+}
+
+/* Wraps the normal write sensor bytes / words functions for writing a
+   single value */
+int stv06xx_write_sensor(struct sd *sd, u8 address, u16 value)
+{
+	if (sd->sensor->i2c_len == 2) {
+		u16 data[2] = { address, value };
+		return stv06xx_write_sensor_words(sd, data, 1);
+	} else {
+		u8 data[2] = { address, value };
+		return stv06xx_write_sensor_bytes(sd, data, 1);
+	}
+}
+
+static int stv06xx_write_sensor_finish(struct sd *sd)
+{
+	int err = 0;
+
+	if (IS_850(sd)) {
+		struct usb_device *udev = sd->gspca_dev.dev;
+		__u8 *buf = sd->gspca_dev.usb_buf;
+
+		/* Quickam Web needs an extra packet */
+		buf[0] = 0;
+		err = usb_control_msg(udev, usb_sndctrlpipe(udev, 0),
+				      0x04, 0x40, 0x1704, 0, buf, 1,
+				      STV06XX_URB_MSG_TIMEOUT);
+	}
+
+	return (err < 0) ? err : 0;
+}
+
+int stv06xx_write_sensor_bytes(struct sd *sd, const u8 *data, u8 len)
+{
+	int err, i, j;
+	struct usb_device *udev = sd->gspca_dev.dev;
+	__u8 *buf = sd->gspca_dev.usb_buf;
+
+	PDEBUG(D_USBO, "I2C: Command buffer contains %d entries", len);
+	for (i = 0; i < len;) {
+		/* Build the command buffer */
+		memset(buf, 0, I2C_BUFFER_LENGTH);
+		for (j = 0; j < I2C_MAX_BYTES && i < len; j++, i++) {
+			buf[j] = data[2*i];
+			buf[0x10 + j] = data[2*i+1];
+			PDEBUG(D_USBO, "I2C: Writing 0x%02x to reg 0x%02x",
+			data[2*i+1], data[2*i]);
+		}
+		buf[0x20] = sd->sensor->i2c_addr;
+		buf[0x21] = j - 1; /* Number of commands to send - 1 */
+		buf[0x22] = I2C_WRITE_CMD;
+		err = usb_control_msg(udev, usb_sndctrlpipe(udev, 0),
+				      0x04, 0x40, 0x0400, 0, buf,
+				      I2C_BUFFER_LENGTH,
+				      STV06XX_URB_MSG_TIMEOUT);
+				      if (err < 0)
+					return err;
+       }
+       return stv06xx_write_sensor_finish(sd);
+}
+
+int stv06xx_write_sensor_words(struct sd *sd, const u16 *data, u8 len)
+{
[...2502 lines suppressed...]
+
+/* Dark line offset cancellation enable */
+#define VV6410_DARKOFFSETSETUP		0x2e
+
+/* Video timing registers */
+/* Line Length (Pixel Clocks) */
+#define VV6410_LINELENGTHH		0x52
+#define VV6410_LINELENGTHL		0x53
+
+/* X-co-ordinate of top left corner of region of interest (x-offset) */
+#define VV6410_XOFFSETH			0x57
+#define VV6410_XOFFSETL			0x58
+
+/* Y-coordinate of top left corner of region of interest (y-offset) */
+#define VV6410_YOFFSETH			0x59
+#define VV6410_YOFFSETL			0x5a
+
+/* Field length (Lines) */
+#define VV6410_FIELDLENGTHH		0x61
+#define VV6410_FIELDLENGTHL		0x62
+
+/* System registers */
+/* Black offset cancellation default value */
+#define VV6410_BLACKOFFSETH		0x70
+#define VV6410_BLACKOFFSETL		0x71
+
+/* Black offset cancellation setup */
+#define VV6410_BLACKOFFSETSETUP		0x72
+
+/* Analog Control Register 0 */
+#define VV6410_CR0			0x75
+
+/* Analog Control Register 1 */
+#define VV6410_CR1			0x76
+
+/* ADC Setup Register */
+#define VV6410_AS0			0x77
+
+/* Analog Test Register */
+#define VV6410_AT0			0x78
+
+/* Audio Amplifier Setup Register */
+#define VV6410_AT1			0x79
+
+#define VV6410_HFLIP 			(1 << 3)
+#define VV6410_VFLIP 			(1 << 4)
+
+#define VV6410_LOW_POWER_MODE		(1 << 0)
+#define VV6410_SOFT_RESET		(1 << 2)
+#define VV6410_PAL_25_FPS		(0 << 3)
+
+#define VV6410_CLK_DIV_2		(1 << 1)
+
+#define VV6410_FINE_EXPOSURE		320
+#define VV6410_COARSE_EXPOSURE		192
+#define VV6410_DEFAULT_GAIN		11
+
+#define VV6410_SUBSAMPLE		0x01
+#define VV6410_CROP_TO_QVGA		0x02
+
+int vv6410_probe(struct sd *sd);
+int vv6410_start(struct sd *sd);
+int vv6410_init(struct sd *sd);
+int vv6410_stop(struct sd *sd);
+int vv6410_dump(struct sd *sd);
+
+/* V4L2 controls supported by the driver */
+int vv6410_get_hflip(struct gspca_dev *gspca_dev, __s32 *val);
+int vv6410_set_hflip(struct gspca_dev *gspca_dev, __s32 val);
+int vv6410_get_vflip(struct gspca_dev *gspca_dev, __s32 *val);
+int vv6410_set_vflip(struct gspca_dev *gspca_dev, __s32 val);
+int vv6410_get_analog_gain(struct gspca_dev *gspca_dev, __s32 *val);
+int vv6410_set_analog_gain(struct gspca_dev *gspca_dev, __s32 val);
+
+const struct stv06xx_sensor stv06xx_sensor_vv6410 = {
+	.name = "ST VV6410",
+	.i2c_flush = 5,
+	.i2c_addr = 0x20,
+	.i2c_len = 1,
+	.init = vv6410_init,
+	.probe = vv6410_probe,
+	.start = vv6410_start,
+	.stop = vv6410_stop,
+	.dump = vv6410_dump,
+
+	.nctrls = 3,
+	.ctrls = {
+	{
+		{
+			.id		= V4L2_CID_HFLIP,
+			.type		= V4L2_CTRL_TYPE_BOOLEAN,
+			.name		= "horizontal flip",
+			.minimum	= 0,
+			.maximum	= 1,
+			.step		= 1,
+			.default_value	= 0
+		},
+		.set = vv6410_set_hflip,
+		.get = vv6410_get_hflip
+	}, {
+		{
+			.id		= V4L2_CID_VFLIP,
+			.type		= V4L2_CTRL_TYPE_BOOLEAN,
+			.name		= "vertical flip",
+			.minimum	= 0,
+			.maximum	= 1,
+			.step		= 1,
+			.default_value 	= 0
+		},
+		.set = vv6410_set_vflip,
+		.get = vv6410_get_vflip
+	}, {
+		{
+			.id		= V4L2_CID_GAIN,
+			.type		= V4L2_CTRL_TYPE_INTEGER,
+			.name		= "analog gain",
+			.minimum	= 0,
+			.maximum	= 15,
+			.step		= 1,
+			.default_value  = 0
+		},
+		.set = vv6410_set_analog_gain,
+		.get = vv6410_get_analog_gain
+	}
+	},
+
+	.nmodes = 1,
+	.modes = {
+	{
+		356,
+		292,
+		V4L2_PIX_FMT_SGRBG8,
+		V4L2_FIELD_NONE,
+		.sizeimage =
+			356 * 292,
+		.bytesperline = 356,
+		.colorspace = V4L2_COLORSPACE_SRGB,
+		.priv = 0
+	}
+	}
+};
+
+/* If NULL, only single value to write, stored in len */
+struct stv_init {
+	const u8 *data;
+	u16 start;
+	u8 len;
+};
+
+static const u8 x1500[] = {	/* 0x1500 - 0x150f */
+	0x0b, 0xa7, 0xb7, 0x00, 0x00
+};
+
+static const u8 x1536[] = {	/* 0x1536 - 0x153b */
+	0x02, 0x00, 0x60, 0x01, 0x20, 0x01
+};
+
+static const u8 x15c1[] = {	/* 0x15c1 - 0x15c2 */
+	0xff, 0x03 /* Output word 0x03ff = 1023 (ISO size) */
+};
+
+static const struct stv_init stv_bridge_init[] = {
+	/* This reg is written twice. Some kind of reset? */
+	{NULL,  0x1620, 0x80},
+	{NULL,  0x1620, 0x00},
+	{NULL,  0x1423, 0x04},
+	{x1500, 0x1500, ARRAY_SIZE(x1500)},
+	{x1536, 0x1536, ARRAY_SIZE(x1536)},
+	{x15c1, 0x15c1, ARRAY_SIZE(x15c1)}
+};
+
+static const u8 vv6410_sensor_init[][2] = {
+	/* Setup registers */
+	{VV6410_SETUP0,		VV6410_SOFT_RESET},
+	{VV6410_SETUP0,		VV6410_LOW_POWER_MODE},
+	/* Use shuffled read-out mode */
+	{VV6410_SETUP1,		BIT(6)},
+	/* All modes to 1 */
+	{VV6410_FGMODES,	BIT(6) | BIT(4) | BIT(2) | BIT(0)},
+	{VV6410_PINMAPPING,	0x00},
+	/* Pre-clock generator divide off */
+	{VV6410_DATAFORMAT,	BIT(7) | BIT(0)},
+
+	/* Exposure registers */
+	{VV6410_FINEH,		VV6410_FINE_EXPOSURE >> 8},
+	{VV6410_FINEL,		VV6410_FINE_EXPOSURE & 0xff},
+	{VV6410_COARSEH,	VV6410_COARSE_EXPOSURE >> 8},
+	{VV6410_COARSEL,	VV6410_COARSE_EXPOSURE & 0xff},
+	{VV6410_ANALOGGAIN,	0xf0 | VV6410_DEFAULT_GAIN},
+	{VV6410_CLKDIV,		VV6410_CLK_DIV_2},
+
+	/* System registers */
+	/* Enable voltage doubler */
+	{VV6410_AS0,		BIT(6) | BIT(4) | BIT(3) | BIT(2) | BIT(1)},
+	{VV6410_AT0,		0x00},
+	/* Power up audio, differential */
+	{VV6410_AT1,		BIT(4)|BIT(0)},
+};
+
+#endif


Index: kernel.spec
===================================================================
RCS file: /cvs/extras/rpms/kernel/F-10/kernel.spec,v
retrieving revision 1.1212
retrieving revision 1.1213
diff -u -r1.1212 -r1.1213
--- kernel.spec	13 Jan 2009 23:32:59 -0000	1.1212
+++ kernel.spec	14 Jan 2009 08:42:00 -0000	1.1213
@@ -635,6 +635,7 @@
 
 # webcam fixes
 Patch900: linux-2.6-gspca-git.patch
+Patch901: linux-2.6-gspca-stv06xx-git.patch
 
 Patch1515: linux-2.6.27-lirc.patch
 Patch1520: linux-2.6-hdpvr.patch
@@ -1159,7 +1160,8 @@
 ApplyPatch linux-2.6-at76.patch
 
 # Webcam patches
-#ApplyPatch linux-2.6-gspca-git.patch
+ApplyPatch linux-2.6-gspca-git.patch
+ApplyPatch linux-2.6-gspca-stv06xx-git.patch
 
 # http://www.lirc.org/
 ApplyPatch linux-2.6.27-lirc.patch
@@ -1777,6 +1779,10 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Wed Jan 14 2009 Hans de Goede <hdegoede at redhat.com>
+- Rebase gspca git patch and re-enable
+- Add gscpa-stv06xx (qc-usb replacement) driver from its own git tree
+
 * Wed Jan 14 2009 Ben Skeggs <bskeggs at redhat.com>
 - nouveau: update snapshot, and reenable
 

linux-2.6-gspca-git.patch:

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.1 -r 1.2 linux-2.6-gspca-git.patch
Index: linux-2.6-gspca-git.patch
===================================================================
RCS file: /cvs/extras/rpms/kernel/F-10/linux-2.6-gspca-git.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-gspca-git.patch	12 Jan 2009 19:51:29 -0000	1.1
+++ linux-2.6-gspca-git.patch	14 Jan 2009 08:42:01 -0000	1.2
@@ -1,5 +1,5 @@
-diff -urN /home/hans/projects/fedora-extras/kernel/devel/kernel-2.6.27/linux-2.6.27.noarch/drivers/media/video/gspca/Kconfig linux/drivers/media/video/gspca/Kconfig
---- /home/hans/projects/fedora-extras/kernel/devel/kernel-2.6.27/linux-2.6.27.noarch/drivers/media/video/gspca/Kconfig	2008-12-10 19:44:21.000000000 +0100
+diff -urN linux/drivers/media/video/gspca/Kconfig linux/drivers/media/video/gspca/Kconfig
+--- linux/drivers/media/video/gspca/Kconfig	2008-12-25 00:26:37.000000000 +0100
 +++ linux/drivers/media/video/gspca/Kconfig	2008-12-09 21:37:33.000000000 +0100
 @@ -12,7 +12,7 @@
  	  "Video For Linux" to use this driver.
@@ -60,8 +60,8 @@
  
  config USB_GSPCA_T613
  	tristate "T613 (JPEG Compliance) USB Camera Driver"
-diff -urN /home/hans/projects/fedora-extras/kernel/devel/kernel-2.6.27/linux-2.6.27.noarch/drivers/media/video/gspca/Makefile linux/drivers/media/video/gspca/Makefile
---- /home/hans/projects/fedora-extras/kernel/devel/kernel-2.6.27/linux-2.6.27.noarch/drivers/media/video/gspca/Makefile	2008-12-10 19:44:21.000000000 +0100
+diff -urN linux/drivers/media/video/gspca/Makefile linux/drivers/media/video/gspca/Makefile
+--- linux/drivers/media/video/gspca/Makefile	2008-12-25 00:26:37.000000000 +0100
 +++ linux/drivers/media/video/gspca/Makefile	2008-12-09 21:37:33.000000000 +0100
 @@ -4,6 +4,7 @@
  obj-$(CONFIG_USB_GSPCA_FINEPIX)	+= gspca_finepix.o
@@ -79,24 +79,8 @@
  gspca_pac207-objs		:= pac207.o
  gspca_pac7311-objs		:= pac7311.o
  gspca_sonixb-objs		:= sonixb.o
-diff -urN /home/hans/projects/fedora-extras/kernel/devel/kernel-2.6.27/linux-2.6.27.noarch/drivers/media/video/gspca/etoms.c linux/drivers/media/video/gspca/etoms.c
---- /home/hans/projects/fedora-extras/kernel/devel/kernel-2.6.27/linux-2.6.27.noarch/drivers/media/video/gspca/etoms.c	2008-12-10 19:44:21.000000000 +0100
-+++ linux/drivers/media/video/gspca/etoms.c	2008-12-09 21:37:33.000000000 +0100
-@@ -733,6 +733,12 @@
- 
- 		i2c_w(gspca_dev, PAS106_REG13, &i2cflags, 1, 3);
- 		i2c_w(gspca_dev, PAS106_REG0e, &gain, 1, 1);
-+#if 0
-+		i2c_w(gspca_dev, 0x09, &gain, 1, 1);
-+		i2c_w(gspca_dev, 0x0a, &gain, 1, 1);
-+		i2c_w(gspca_dev, 0x0b, &gain, 1, 1);
-+		i2c_w(gspca_dev, 0x0c, &gain, 1, 1);
-+#endif
- 	}
- }
- 
-diff -urN /home/hans/projects/fedora-extras/kernel/devel/kernel-2.6.27/linux-2.6.27.noarch/drivers/media/video/gspca/finepix.c linux/drivers/media/video/gspca/finepix.c
---- /home/hans/projects/fedora-extras/kernel/devel/kernel-2.6.27/linux-2.6.27.noarch/drivers/media/video/gspca/finepix.c	2008-12-10 19:44:21.000000000 +0100
+diff -urN linux/drivers/media/video/gspca/finepix.c linux/drivers/media/video/gspca/finepix.c
+--- linux/drivers/media/video/gspca/finepix.c	2008-12-25 00:26:37.000000000 +0100
 +++ linux/drivers/media/video/gspca/finepix.c	2008-12-09 21:37:33.000000000 +0100
 @@ -314,9 +314,6 @@
  	int ret;
@@ -108,9 +92,9 @@
  	/* Init the device */
  	memset(gspca_dev->usb_buf, 0, 12);
  	gspca_dev->usb_buf[0] = 0xc6;
-diff -urN /home/hans/projects/fedora-extras/kernel/devel/kernel-2.6.27/linux-2.6.27.noarch/drivers/media/video/gspca/gspca.c linux/drivers/media/video/gspca/gspca.c
---- /home/hans/projects/fedora-extras/kernel/devel/kernel-2.6.27/linux-2.6.27.noarch/drivers/media/video/gspca/gspca.c	2008-12-10 19:44:21.000000000 +0100
-+++ linux/drivers/media/video/gspca/gspca.c	2008-12-10 19:53:43.000000000 +0100
+diff -urN linux/drivers/media/video/gspca/gspca.c linux/drivers/media/video/gspca/gspca.c
+--- linux/drivers/media/video/gspca/gspca.c	2008-12-25 00:26:37.000000000 +0100
++++ linux/drivers/media/video/gspca/gspca.c	2008-12-25 15:33:23.000000000 +0100
 @@ -45,7 +48,7 @@
  MODULE_DESCRIPTION("GSPCA USB Camera Driver");
  MODULE_LICENSE("GPL");
@@ -141,7 +125,7 @@
  	st = usb_submit_urb(urb, GFP_ATOMIC);
  	if (st < 0)
  		PDEBUG(D_ERR|D_PACK, "usb_submit_urb() ret %d", st);
-@@ -200,11 +208,18 @@
+@@ -200,11 +204,18 @@
  {
  	struct gspca_dev *gspca_dev = (struct gspca_dev *) urb->context;
  	struct gspca_frame *frame;
@@ -273,7 +257,25 @@
  				return -EINVAL;
  		}
  	}
-@@ -846,11 +879,11 @@
+@@ -752,8 +785,6 @@
+ 	struct gspca_dev *gspca_dev = priv;
+ 	int mode;
+ 
+-	if (fmt->type != V4L2_BUF_TYPE_VIDEO_CAPTURE)
+-		return -EINVAL;
+ 	mode = gspca_dev->curr_mode;
+ 	memcpy(&fmt->fmt.pix, &gspca_dev->cam.cam_mode[mode],
+ 		sizeof fmt->fmt.pix);
+@@ -765,8 +796,6 @@
+ {
+ 	int w, h, mode, mode2;
+ 
+-	if (fmt->type != V4L2_BUF_TYPE_VIDEO_CAPTURE)
+-		return -EINVAL;
+ 	w = fmt->fmt.pix.width;
+ 	h = fmt->fmt.pix.height;
+ 
+@@ -846,11 +875,11 @@
  	return ret;
  }
  
@@ -288,7 +290,7 @@
  
  	kfree(gspca_dev->usb_buf);
  	kfree(gspca_dev);
-@@ -862,7 +895,7 @@
+@@ -862,7 +891,7 @@
  	int ret;
  
  	PDEBUG(D_STREAM, "%s open", current->comm);
@@ -297,7 +299,7 @@
  	if (mutex_lock_interruptible(&gspca_dev->queue_lock))
  		return -ERESTARTSYS;
  	if (!gspca_dev->present) {
-@@ -883,17 +916,14 @@
+@@ -883,17 +912,14 @@
  
  	gspca_dev->users++;
  
@@ -317,7 +319,7 @@
  					| V4L2_DEBUG_IOCTL_ARG);
  #endif
  	ret = 0;
-@@ -932,8 +962,6 @@
+@@ -932,8 +958,6 @@
  
  	PDEBUG(D_STREAM, "close done");
  
@@ -326,7 +328,7 @@
  	return 0;
  }
  
-@@ -1053,6 +1081,35 @@
+@@ -1053,6 +1077,35 @@
  	return -EINVAL;
  }
  
@@ -362,7 +364,36 @@
  static int vidioc_querymenu(struct file *file, void *priv,
  			    struct v4l2_querymenu *qmenu)
  {
-@@ -1236,7 +1293,6 @@
+@@ -1096,8 +1149,6 @@
+ 	struct gspca_dev *gspca_dev = priv;
+ 	int i, ret = 0;
+ 
+-	if (rb->type != V4L2_BUF_TYPE_VIDEO_CAPTURE)
+-		return -EINVAL;
+ 	switch (rb->memory) {
+ 	case GSPCA_MEMORY_READ:			/* (internal call) */
+ 	case V4L2_MEMORY_MMAP:
+@@ -1162,8 +1213,7 @@
+ 	struct gspca_dev *gspca_dev = priv;
+ 	struct gspca_frame *frame;
+ 
+-	if (v4l2_buf->type != V4L2_BUF_TYPE_VIDEO_CAPTURE
+-	    || v4l2_buf->index < 0
++	if (v4l2_buf->index < 0
+ 	    || v4l2_buf->index >= gspca_dev->nframes)
+ 		return -EINVAL;
+ 
+@@ -1186,7 +1236,8 @@
+ 		ret = -ENODEV;
+ 		goto out;
+ 	}
+-	if (gspca_dev->nframes == 0) {
++	if (gspca_dev->nframes == 0
++	    || !(gspca_dev->frame[0].v4l2_buf.flags & V4L2_BUF_FLAG_QUEUED)) {
+ 		ret = -EINVAL;
+ 		goto out;
+ 	}
+@@ -1236,7 +1287,6 @@
  	gspca_dev->fr_i = gspca_dev->fr_o = gspca_dev->fr_q = 0;
  	gspca_dev->last_packet_type = DISCARD_PACKET;
  	gspca_dev->sequence = 0;
@@ -370,20 +401,7 @@
  	ret = 0;
  out:
  	mutex_unlock(&gspca_dev->queue_lock);
-@@ -1264,10 +1320,10 @@
- 	struct gspca_dev *gspca_dev = priv;
- 	int ret;
- 
--	if (mutex_lock_interruptible(&gspca_dev->usb_lock))
--		return -ERESTARTSYS;
- 	if (!gspca_dev->sd_desc->set_jcomp)
- 		return -EINVAL;
-+	if (mutex_lock_interruptible(&gspca_dev->usb_lock))
-+		return -ERESTARTSYS;
- 	ret = gspca_dev->sd_desc->set_jcomp(gspca_dev, jpegcomp);
- 	mutex_unlock(&gspca_dev->usb_lock);
- 	return ret;
-@@ -1281,6 +1337,17 @@
+@@ -1281,6 +1331,17 @@
  	memset(parm, 0, sizeof *parm);
  	parm->type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
  	parm->parm.capture.readbuffers = gspca_dev->nbufread;
@@ -401,7 +419,7 @@
[...1918 lines suppressed...]
++	case SENSOR_PO1200:
++		data = 0;
++		i2c_write(gspca_dev, 0x03, &data, 1);
++		data = 0x80 * sd->hflip
++			| 0x40 * sd->vflip
++			| 0x06;
++		i2c_write(gspca_dev, 0x1e, &data, 1);
++		return;
 +	default:
 +		return;
 +	}
@@ -4701,7 +5162,28 @@
  }
  
  static void setlightfreq(struct gspca_dev *gspca_dev)
-@@ -1551,6 +2157,17 @@
+@@ -1501,6 +2133,20 @@
+ 	usb_exchange(gspca_dev, ov7660_freq_tb[sd->lightfreq]);
+ }
+ 
++/* po1200 only */
++static void setsharpness(struct gspca_dev *gspca_dev)
++{
++	struct sd *sd = (struct sd *) gspca_dev;
++	__u8 data;
++
++	if (sd->sensor != SENSOR_PO1200)
++		return;
++	data = 0;
++	i2c_write(gspca_dev, 0x03, &data, 1);
++	data = 0xb5 + sd->sharpness * 3;
++	i2c_write(gspca_dev, 0x61, &data, 1);
++}
++
+ static int sd_start(struct gspca_dev *gspca_dev)
+ {
+ 	struct sd *sd = (struct sd *) gspca_dev;
+@@ -1551,6 +2197,17 @@
  			usb_exchange(gspca_dev, ov7670_initVGA_JPG);
  		}
  		break;
@@ -4719,7 +5201,7 @@
  	case SENSOR_MI1310_SOC:
  		if (mode) {
  			/* 320x240 */
-@@ -1583,6 +2200,11 @@
+@@ -1583,6 +2240,11 @@
  		}
  		usb_exchange(gspca_dev, po3130_rundata);
  		break;
@@ -4731,7 +5213,7 @@
  	default:
  		PDEBUG(D_PROBE, "Damned !! no sensor found Bye");
  		return -EMEDIUMTYPE;
-@@ -1615,11 +2237,15 @@
+@@ -1615,11 +2277,16 @@
  		reg_w(gspca_dev->dev, 0xa0, 0x23, 0xb800); * ISP CTRL_BAS
  		*/
  		/* set the led on 0x0892 0x0896 */
@@ -4743,36 +5225,38 @@
 +		if (sd->sensor != SENSOR_PO1200) {
 +			reg_w(gspca_dev->dev, 0x89, 0xffff, 0xfdff);
 +			msleep(100);
-+			setquality(gspca_dev);
 +			sethvflip(gspca_dev);
 +			setlightfreq(gspca_dev);
 +		} else {
++			setsharpness(gspca_dev);
++			sethvflip(gspca_dev);
 +			reg_w(gspca_dev->dev, 0x89, 0x0400, 0x1415);
 +		}
  	}
  	return 0;
  }
-@@ -1665,24 +2291,49 @@
+@@ -1665,24 +2332,48 @@
  				data, len);
  		return;
  	}
 +
 +	/* The vc0321 sends some additional data after sending the complete
-+	   frame, we ignore this. */
-+	if (sd->bridge == BRIDGE_VC0321 && ((frame->data_end - frame->data)
-+			+ len) > frame->v4l2_buf.length)
++	 * frame, we ignore this. */
++	if (sd->bridge == BRIDGE_VC0321
++	    && len > frame->v4l2_buf.length - (frame->data_end - frame->data))
 +		len = frame->v4l2_buf.length - (frame->data_end - frame->data);
-+
  	gspca_frame_add(gspca_dev, INTER_PACKET, frame, data, len);
  }
  
 -static int sd_setautogain(struct gspca_dev *gspca_dev, __s32 val)
 +static int sd_sethflip(struct gspca_dev *gspca_dev, __s32 val)
-+{
-+	struct sd *sd = (struct sd *) gspca_dev;
-+
+ {
+ 	struct sd *sd = (struct sd *) gspca_dev;
+ 
+-	sd->autogain = val;
 +	sd->hflip = val;
-+	if (gspca_dev->streaming)
+ 	if (gspca_dev->streaming)
+-		setautogain(gspca_dev);
 +		sethvflip(gspca_dev);
 +	return 0;
 +}
@@ -4782,32 +5266,55 @@
 +	struct sd *sd = (struct sd *) gspca_dev;
 +
 +	*val = sd->hflip;
-+	return 0;
-+}
-+
-+static int sd_setvflip(struct gspca_dev *gspca_dev, __s32 val)
- {
- 	struct sd *sd = (struct sd *) gspca_dev;
- 
--	sd->autogain = val;
-+	sd->vflip = val;
- 	if (gspca_dev->streaming)
--		setautogain(gspca_dev);
-+		sethvflip(gspca_dev);
  	return 0;
  }
  
 -static int sd_getautogain(struct gspca_dev *gspca_dev, __s32 *val)
-+static int sd_getvflip(struct gspca_dev *gspca_dev, __s32 *val)
++static int sd_setvflip(struct gspca_dev *gspca_dev, __s32 val)
  {
  	struct sd *sd = (struct sd *) gspca_dev;
  
 -	*val = sd->autogain;
++	sd->vflip = val;
++	if (gspca_dev->streaming)
++		sethvflip(gspca_dev);
++	return 0;
++}
++
++static int sd_getvflip(struct gspca_dev *gspca_dev, __s32 *val)
++{
++	struct sd *sd = (struct sd *) gspca_dev;
++
 +	*val = sd->vflip;
  	return 0;
  }
  
-@@ -1748,6 +2399,7 @@
+@@ -1704,6 +2395,24 @@
+ 	return 0;
+ }
+ 
++static int sd_setsharpness(struct gspca_dev *gspca_dev, __s32 val)
++{
++	struct sd *sd = (struct sd *) gspca_dev;
++
++	sd->sharpness = val;
++	if (gspca_dev->streaming)
++		setsharpness(gspca_dev);
++	return 0;
++}
++
++static int sd_getsharpness(struct gspca_dev *gspca_dev, __s32 *val)
++{
++	struct sd *sd = (struct sd *) gspca_dev;
++
++	*val = sd->sharpness;
++	return 0;
++}
++
+ static int sd_querymenu(struct gspca_dev *gspca_dev,
+ 			struct v4l2_querymenu *menu)
+ {
+@@ -1748,6 +2457,7 @@
  	{USB_DEVICE(0x0ac8, 0x0328), .driver_info = BRIDGE_VC0321},
  	{USB_DEVICE(0x0ac8, 0xc001), .driver_info = BRIDGE_VC0321},
  	{USB_DEVICE(0x0ac8, 0xc002), .driver_info = BRIDGE_VC0321},
@@ -4815,8 +5322,8 @@
  	{USB_DEVICE(0x17ef, 0x4802), .driver_info = BRIDGE_VC0323},
  	{}
  };
-diff -urN /home/hans/projects/fedora-extras/kernel/devel/kernel-2.6.27/linux-2.6.27.noarch/drivers/media/video/gspca/zc3xx-reg.h linux/drivers/media/video/gspca/zc3xx-reg.h
---- /home/hans/projects/fedora-extras/kernel/devel/kernel-2.6.27/linux-2.6.27.noarch/drivers/media/video/gspca/zc3xx-reg.h	2008-10-10 00:13:53.000000000 +0200
+diff -urN linux/drivers/media/video/gspca/zc3xx-reg.h linux/drivers/media/video/gspca/zc3xx-reg.h
+--- linux/drivers/media/video/gspca/zc3xx-reg.h	2008-12-25 00:26:37.000000000 +0100
 +++ linux/drivers/media/video/gspca/zc3xx-reg.h	2008-12-09 21:37:33.000000000 +0100
 @@ -244,14 +244,6 @@
  #define ZC3XX_R1CA_SHARPNESS04         0x01ca
@@ -4833,8 +5340,8 @@
  /* Dead pixels */
  #define ZC3XX_R250_DEADPIXELSMODE      0x0250
  
-diff -urN /home/hans/projects/fedora-extras/kernel/devel/kernel-2.6.27/linux-2.6.27.noarch/drivers/media/video/gspca/zc3xx.c linux/drivers/media/video/gspca/zc3xx.c
---- /home/hans/projects/fedora-extras/kernel/devel/kernel-2.6.27/linux-2.6.27.noarch/drivers/media/video/gspca/zc3xx.c	2008-12-10 19:44:21.000000000 +0100
+diff -urN linux/drivers/media/video/gspca/zc3xx.c linux/drivers/media/video/gspca/zc3xx.c
+--- linux/drivers/media/video/gspca/zc3xx.c	2008-12-25 00:26:37.000000000 +0100
 +++ linux/drivers/media/video/gspca/zc3xx.c	2008-12-09 21:37:33.000000000 +0100
 @@ -51,16 +51,16 @@
  #define SENSOR_CS2102 0



From pbrobinson at fedoraproject.org  Wed Jan 14 08:57:23 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Wed, 14 Jan 2009 08:57:23 +0000 (UTC)
Subject: rpms/ekiga/devel .cvsignore, 1.16, 1.17 ekiga.spec, 1.68,
	1.69 sources, 1.18, 1.19
Message-ID: <20090114085723.C64D770136@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/ekiga/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6461

Modified Files:
	.cvsignore ekiga.spec sources 
Log Message:
- Another fix


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ekiga/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore	6 Jan 2009 06:31:25 -0000	1.16
+++ .cvsignore	14 Jan 2009 08:56:53 -0000	1.17
@@ -1 +1,2 @@
 ekiga-3.1.0.tar.bz2
+ekiga.desktop


Index: ekiga.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ekiga/devel/ekiga.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- ekiga.spec	13 Jan 2009 09:46:54 -0000	1.68
+++ ekiga.spec	14 Jan 2009 08:56:53 -0000	1.69
@@ -1,9 +1,10 @@
 Summary:	A Gnome based SIP/H323 teleconferencing application
 Name:		ekiga
 Version:	3.1.0
-Release:	6%{?dist}
+Release:	7%{?dist}
 URL:		http://www.ekiga.org/
-Source0:	ftp://ftp.gnome.org/pub/gnome/sources/ekiga/3.0/%{name}-%{version}.tar.bz2
+Source0:	ftp://ftp.gnome.org/pub/gnome/sources/ekiga/3.1/%{name}-%{version}.tar.bz2
+Source1:	ekiga.desktop
 Patch0:		ekiga-fix-desktop-in.patch
 License:	GPLv2+
 Group:		Applications/Communications
@@ -65,6 +66,10 @@
 
 rm -rf $RPM_BUILD_ROOT/var/scrollkeeper
 
+# Temporarily remove the desktop.in.in file and replace with the real thing
+rm -rf $RPM_BUILD_ROOT%{_datadir}/applications/ekiga.desktop.in.in
+cp %{SOURCE1}  $RPM_BUILD_ROOT%{_datadir}/applications/ekiga.desktop
+
 # Replace identical images in the help by links.
 # This reduces the RPM size by several megabytes.
 helpdir=$RPM_BUILD_ROOT%{_datadir}/gnome/help/%{name}
@@ -136,6 +141,9 @@
 %{_sysconfdir}/gconf/schemas/ekiga.schemas
 
 %changelog
+* Wed Jan 14 2009 Peter Robinson <pbrobinson at gmail.com> - 3.1.0-7
+- Another fix
+
 * Tue Jan 13 2009 Peter Robinson <pbrobinson at gmail.com> - 3.1.0-6
 - And SDL too
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ekiga/devel/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources	6 Jan 2009 06:31:25 -0000	1.18
+++ sources	14 Jan 2009 08:56:53 -0000	1.19
@@ -1 +1,2 @@
 ec8690ff84b364d2df5b2443a01ba529  ekiga-3.1.0.tar.bz2
+d13f57c9df3344a90697d88490adbf20  ekiga.desktop



From pkgdb at fedoraproject.org  Wed Jan 14 09:00:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 14 Jan 2009 09:00:32 +0000
Subject: [pkgdb] kernel: jwrdegoede has requested watchcommits
Message-ID: <20090114090032.7004F208458@bastion.fedora.phx.redhat.com>

jwrdegoede has requested the watchcommits acl on kernel (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kernel



From pkgdb at fedoraproject.org  Wed Jan 14 09:00:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 14 Jan 2009 09:00:34 +0000
Subject: [pkgdb] kernel: jwrdegoede has requested commit
Message-ID: <20090114090034.9CCB720846C@bastion.fedora.phx.redhat.com>

jwrdegoede has requested the commit acl on kernel (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kernel



From caolanm at fedoraproject.org  Wed Jan 14 09:04:47 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Wed, 14 Jan 2009 09:04:47 +0000 (UTC)
Subject: rpms/hunspell-nn/F-10 dead.package, NONE, 1.1 .cvsignore, 1.2,
	NONE Makefile, 1.2, NONE hunspell-nn.spec, 1.2, NONE sources,
	1.2, NONE
Message-ID: <20090114090447.E3A8670136@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/hunspell-nn/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7487

Added Files:
	dead.package 
Removed Files:
	.cvsignore Makefile hunspell-nn.spec sources 
Log Message:
set to dead.package


--- NEW FILE dead.package ---
Replaced by combined hunspell-no package


--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- hunspell-nn.spec DELETED ---


--- sources DELETED ---



From danken at fedoraproject.org  Wed Jan 14 09:05:18 2009
From: danken at fedoraproject.org (Dan Kenigsberg)
Date: Wed, 14 Jan 2009 09:05:18 +0000 (UTC)
Subject: rpms/latexdiff/devel import.log, NONE, 1.1 latexdiff.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090114090518.B997D70136@cvs1.fedora.phx.redhat.com>

Author: danken

Update of /cvs/extras/rpms/latexdiff/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7371/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log latexdiff.spec 
Log Message:
initial commit



--- NEW FILE import.log ---
latexdiff-0_5-2_fc10:HEAD:latexdiff-0.5-2.fc10.src.rpm:1231923804


--- NEW FILE latexdiff.spec ---
Summary: Determine and mark up significant differences between latex files
Name: latexdiff
Version: 0.5
Release: 2%{?dist}
URL: http://tug.ctan.org/cgi-bin/ctanPackageInformation.py?id=latexdiff
Source: http://tug.ctan.org/cgi-bin/getFile.py?fn=/systems/win32/miktex/tm/packages/latexdiff.tar.bz2
License: GPLv2
Group: Applications/Text
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: tex(latex)
BuildArch: noarch

%description
Latexdiff is a Perl script for visual mark up and revision of significant
differences between two latex files.  Various options are available for visual
markup using standard latex packages such as color.  Changes not directly
affecting visible text, for example in formatting commands, are still marked in
the latex source.  A rudimentary revision facility is provided by another
Perl script, latexrevise, which accepts or rejects all changes.  Manual editing
of the difference file can be used to override this default behaviour and
accept or reject selected changes only.

%prep
%setup -q -c

%build

%install
rm -rf %{buildroot}
mkdir -p %{buildroot}/%{_bindir} %{buildroot}/%{_mandir}/man1
cp -p texmf/scripts/latexdiff/perl/latexdiff-fast.pl %{buildroot}/%{_bindir}/latexdiff
cp -p texmf/scripts/latexdiff/perl/latexdiff-vc.pl %{buildroot}/%{_bindir}/latexdiff-vc
cp -p texmf/scripts/latexdiff/perl/latexrevise.pl %{buildroot}/%{_bindir}/latexrevise
cp -p texmf/source/latexdiff/latex{diff,diff-vc,revise}.1 %{buildroot}/%{_mandir}/man1
chmod a-x %{buildroot}/%{_mandir}/man1/*
chmod a-x texmf/doc/support/latexdiff/*

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc texmf/doc/support/latexdiff/*
%{_bindir}/latexdiff
%{_bindir}/latexdiff-vc
%{_bindir}/latexrevise
%{_mandir}/man1/latexdiff.1*
%{_mandir}/man1/latexdiff-vc.1*
%{_mandir}/man1/latexrevise.1*

%changelog
* Sat Jan 10 2009 Dan Kenigsberg <danken at cs.technion.ac.il> 0.5-2
- preserve file timestamps, correct defattr, drop pointless comment.
* Sun Dec 14 2008 Dan Kenigsberg <danken at cs.technion.ac.il> 0.5-1
- Initial build.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/latexdiff/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	13 Jan 2009 20:37:29 -0000	1.1
+++ .cvsignore	14 Jan 2009 09:04:48 -0000	1.2
@@ -0,0 +1 @@
+latexdiff.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/latexdiff/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	13 Jan 2009 20:37:29 -0000	1.1
+++ sources	14 Jan 2009 09:04:48 -0000	1.2
@@ -0,0 +1 @@
+6cab5bba342f519eff08b0fadd303d7d  latexdiff.tar.bz2



From danken at fedoraproject.org  Wed Jan 14 09:10:57 2009
From: danken at fedoraproject.org (Dan Kenigsberg)
Date: Wed, 14 Jan 2009 09:10:57 +0000 (UTC)
Subject: rpms/latexdiff/F-10 import.log, NONE, 1.1 latexdiff.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090114091057.8489C70136@cvs1.fedora.phx.redhat.com>

Author: danken

Update of /cvs/extras/rpms/latexdiff/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8598/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	import.log latexdiff.spec 
Log Message:
initial F-10 commit



--- NEW FILE import.log ---
latexdiff-0_5-2_fc10:F-10:latexdiff-0.5-2.fc10.src.rpm:1231924089


--- NEW FILE latexdiff.spec ---
Summary: Determine and mark up significant differences between latex files
Name: latexdiff
Version: 0.5
Release: 2%{?dist}
URL: http://tug.ctan.org/cgi-bin/ctanPackageInformation.py?id=latexdiff
Source: http://tug.ctan.org/cgi-bin/getFile.py?fn=/systems/win32/miktex/tm/packages/latexdiff.tar.bz2
License: GPLv2
Group: Applications/Text
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: tex(latex)
BuildArch: noarch

%description
Latexdiff is a Perl script for visual mark up and revision of significant
differences between two latex files.  Various options are available for visual
markup using standard latex packages such as color.  Changes not directly
affecting visible text, for example in formatting commands, are still marked in
the latex source.  A rudimentary revision facility is provided by another
Perl script, latexrevise, which accepts or rejects all changes.  Manual editing
of the difference file can be used to override this default behaviour and
accept or reject selected changes only.

%prep
%setup -q -c

%build

%install
rm -rf %{buildroot}
mkdir -p %{buildroot}/%{_bindir} %{buildroot}/%{_mandir}/man1
cp -p texmf/scripts/latexdiff/perl/latexdiff-fast.pl %{buildroot}/%{_bindir}/latexdiff
cp -p texmf/scripts/latexdiff/perl/latexdiff-vc.pl %{buildroot}/%{_bindir}/latexdiff-vc
cp -p texmf/scripts/latexdiff/perl/latexrevise.pl %{buildroot}/%{_bindir}/latexrevise
cp -p texmf/source/latexdiff/latex{diff,diff-vc,revise}.1 %{buildroot}/%{_mandir}/man1
chmod a-x %{buildroot}/%{_mandir}/man1/*
chmod a-x texmf/doc/support/latexdiff/*

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc texmf/doc/support/latexdiff/*
%{_bindir}/latexdiff
%{_bindir}/latexdiff-vc
%{_bindir}/latexrevise
%{_mandir}/man1/latexdiff.1*
%{_mandir}/man1/latexdiff-vc.1*
%{_mandir}/man1/latexrevise.1*

%changelog
* Sat Jan 10 2009 Dan Kenigsberg <danken at cs.technion.ac.il> 0.5-2
- preserve file timestamps, correct defattr, drop pointless comment.
* Sun Dec 14 2008 Dan Kenigsberg <danken at cs.technion.ac.il> 0.5-1
- Initial build.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/latexdiff/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	13 Jan 2009 20:37:29 -0000	1.1
+++ .cvsignore	14 Jan 2009 09:10:27 -0000	1.2
@@ -0,0 +1 @@
+latexdiff.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/latexdiff/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	13 Jan 2009 20:37:29 -0000	1.1
+++ sources	14 Jan 2009 09:10:27 -0000	1.2
@@ -0,0 +1 @@
+6cab5bba342f519eff08b0fadd303d7d  latexdiff.tar.bz2



From caolanm at fedoraproject.org  Wed Jan 14 09:03:49 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Wed, 14 Jan 2009 09:03:49 +0000 (UTC)
Subject: rpms/hunspell-nb/F-10 dead.package, NONE, 1.1 .cvsignore, 1.2,
	NONE Makefile, 1.3, NONE hunspell-nb.spec, 1.2, NONE sources,
	1.2, NONE
Message-ID: <20090114090349.3F70870136@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/hunspell-nb/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7313

Added Files:
	dead.package 
Removed Files:
	.cvsignore Makefile hunspell-nb.spec sources 
Log Message:
set to dead.package


--- NEW FILE dead.package ---
Replaced by combined hunspell-no package


--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- hunspell-nb.spec DELETED ---


--- sources DELETED ---



From caolanm at fedoraproject.org  Wed Jan 14 09:17:50 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Wed, 14 Jan 2009 09:17:50 +0000 (UTC)
Subject: rpms/hyphen-uk/devel hyphen-uk.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090114091750.4039770136@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/hyphen-uk/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9294/devel

Modified Files:
	.cvsignore sources 
Added Files:
	hyphen-uk.spec import.log 
Log Message:



--- NEW FILE hyphen-uk.spec ---
Name: hyphen-uk
Summary: Ukrainian hyphenation rules
%define upstreamid 20030903
Version: 0.%{upstreamid}
Release: 1%{?dist}
Source: http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/dictionaries/hyph_uk_UA.zip
Group: Applications/Text
URL: http://wiki.services.openoffice.org/wiki/Dictionaries
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
License: GPLv2+
BuildArch: noarch

Requires: hyphen

%description
Ukrainian hyphenation rules.

%prep
%setup -q -c

%build

%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT/%{_datadir}/hyphen
cp -p *.dic $RPM_BUILD_ROOT/%{_datadir}/hyphen

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc README_hyph_uk_UA.txt
%{_datadir}/hyphen/*

%changelog
* Fri Jan 09 2009 Caolan McNamara <caolanm at redhat.com> - 0.20030903-1
- initial version


--- NEW FILE import.log ---
hyphen-uk-0_20030903-1_fc10:HEAD:hyphen-uk-0.20030903-1.fc10.src.rpm:1231924601


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hyphen-uk/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	13 Jan 2009 21:16:31 -0000	1.1
+++ .cvsignore	14 Jan 2009 09:17:19 -0000	1.2
@@ -0,0 +1 @@
+hyph_uk_UA.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hyphen-uk/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	13 Jan 2009 21:16:31 -0000	1.1
+++ sources	14 Jan 2009 09:17:19 -0000	1.2
@@ -0,0 +1 @@
+caae40c900d8e1fdd3e0ad095ce1e787  hyph_uk_UA.zip



From caolanm at fedoraproject.org  Wed Jan 14 09:21:30 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Wed, 14 Jan 2009 09:21:30 +0000 (UTC)
Subject: rpms/hyphen-mi/devel hyphen-mi.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090114092130.E831770136@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/hyphen-mi/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9761/devel

Modified Files:
	.cvsignore sources 
Added Files:
	hyphen-mi.spec import.log 
Log Message:



--- NEW FILE hyphen-mi.spec ---
Name: hyphen-mi
Summary: Maori hyphenation rules
%define upstreamid 20080630
Version: 0.%{upstreamid}
Release: 1%{?dist}
Source: http://packages.papakupu.maori.nz/hunspell-hyphen/hunspell-hyphen-mi-0.1.%{upstreamid}-beta.tar.gz
Group: Applications/Text
URL: http://papakupu.maori.nz/
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
License: GPLv3+
BuildArch: noarch

Requires: hyphen

%description
Maori hyphenation rules.

%prep
%setup -q -c

%build

%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT/%{_datadir}/hyphen
cp -p mi.dic $RPM_BUILD_ROOT/%{_datadir}/hyphen/hyph_mi_NZ.dic

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc mi.LICENSE mi.README
%{_datadir}/hyphen/*

%changelog
* Fri Jan 09 2008 Caolan McNamara <caolanm at redhat.com> - 0.20080630-1
- initial version


--- NEW FILE import.log ---
hyphen-mi-0_20080630-1_fc10:HEAD:hyphen-mi-0.20080630-1.fc10.src.rpm:1231924798


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hyphen-mi/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	13 Jan 2009 21:17:50 -0000	1.1
+++ .cvsignore	14 Jan 2009 09:21:00 -0000	1.2
@@ -0,0 +1 @@
+hunspell-hyphen-mi-0.1.20080630-beta.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hyphen-mi/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	13 Jan 2009 21:17:50 -0000	1.1
+++ sources	14 Jan 2009 09:21:00 -0000	1.2
@@ -0,0 +1 @@
+0c63b0c6888c4a0518a5f5182a36d51c  hunspell-hyphen-mi-0.1.20080630-beta.tar.gz



From caolanm at fedoraproject.org  Wed Jan 14 09:25:01 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Wed, 14 Jan 2009 09:25:01 +0000 (UTC)
Subject: rpms/openoffice.org/devel openoffice.org.spec,1.1752,1.1753
Message-ID: <20090114092501.AF76870136@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10095

Modified Files:
	openoffice.org.spec 
Log Message:
add hyphen-uk depend


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1752
retrieving revision 1.1753
diff -u -r1.1752 -r1.1753
--- openoffice.org.spec	13 Jan 2009 10:18:12 -0000	1.1752
+++ openoffice.org.spec	14 Jan 2009 09:24:31 -0000	1.1753
@@ -1334,7 +1334,7 @@
 Summary: Ukrainian language pack for %{name}
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
-Requires: hunspell-uk
+Requires: hunspell-uk, hyphen-uk
 
 %description langpack-uk
 Provides additional Ukrainian translations and resources for %{name}.
@@ -3826,9 +3826,10 @@
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
-* Tue Jan 13 2009 Caol??n McNamara <caolanm at redhat.com> - 1:3.0.1-15.2
+* Wed Jan 14 2009 Caol??n McNamara <caolanm at redhat.com> - 1:3.0.1-15.2
 - Resolves: rhbz#479624 add
   openoffice.org-3.0.1.ooo98024.vcl.emboldenoverlap.patch
+- add hyphen-uk dependency
 
 * Mon Jan 12 2009 Caol??n McNamara <caolanm at redhat.com> - 1:3.0.1-15.1
 - next milestone



From denis at fedoraproject.org  Wed Jan 14 09:36:57 2009
From: denis at fedoraproject.org (Denis Leroy)
Date: Wed, 14 Jan 2009 09:36:57 +0000 (UTC)
Subject: rpms/libnotifymm/devel libnotifymm.spec,1.1,1.2
Message-ID: <20090114093657.527CB70136@cvs1.fedora.phx.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/libnotifymm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11171

Modified Files:
	libnotifymm.spec 
Log Message:
Added sed line to quiet rpmlint


Index: libnotifymm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libnotifymm/devel/libnotifymm.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libnotifymm.spec	26 Dec 2008 07:44:17 -0000	1.1
+++ libnotifymm.spec	14 Jan 2009 09:36:26 -0000	1.2
@@ -3,7 +3,7 @@
 
 Name:           libnotifymm
 Version:        0.6.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        C++ interface for libnotify
 
 Group:          System Environment/Libraries
@@ -49,6 +49,7 @@
 
 %build
 %configure --disable-static --enable-reference --disable-dependency-tracking
+sed -i -e 's! -shared ! -Wl,--as-needed\0!g' libtool
 make %{?_smp_mflags}
 
 
@@ -86,6 +87,9 @@
 
 
 %changelog
+* Fri Dec 26 2008 Denis Leroy <denis at poolshark.org> - 0.6.1-3
+- Added sed line to quiet rpmlint
+
 * Fri Sep  5 2008 Denis Leroy <denis at poolshark.org> - 0.6.1-2
 - Added patch to address libnotify rawhide API breakage
 



From rjones at fedoraproject.org  Wed Jan 14 09:45:41 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Wed, 14 Jan 2009 09:45:41 +0000 (UTC)
Subject: rpms/mingw32-pthreads/devel import.log, NONE,
	1.1 mingw32-pthreads-2.8.0-no-failing-tests.patch, NONE,
	1.1 mingw32-pthreads-2.8.0-use-wine-for-tests.patch, NONE,
	1.1 mingw32-pthreads-flags.patch, NONE,
	1.1 mingw32-pthreads.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090114094541.791ED70136@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/mingw32-pthreads/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12493/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log mingw32-pthreads-2.8.0-no-failing-tests.patch 
	mingw32-pthreads-2.8.0-use-wine-for-tests.patch 
	mingw32-pthreads-flags.patch mingw32-pthreads.spec 
Log Message:
Initial import.



--- NEW FILE import.log ---
mingw32-pthreads-2_8_0-4_fc10:HEAD:mingw32-pthreads-2.8.0-4.fc10.src.rpm:1231925723

mingw32-pthreads-2.8.0-no-failing-tests.patch:

--- NEW FILE mingw32-pthreads-2.8.0-no-failing-tests.patch ---
--- pthreads-w32-2-8-0-release/tests/GNUmakefile.wine	2008-10-10 14:19:06.000000000 +0100
+++ pthreads-w32-2-8-0-release/tests/GNUmakefile	2008-10-10 14:19:40.000000000 +0100
@@ -87,7 +87,7 @@
 	  mutex6s mutex6es mutex6rs \
 	  mutex7 mutex7n mutex7e mutex7r mutex8 mutex8n mutex8e mutex8r \
 	  count1 \
-	  once1 once2 once3 once4 self2 \
+	  once1 self2 \
 	  cancel1 cancel2 \
 	  semaphore4 semaphore4t semaphore5 \
 	  barrier1 barrier2 barrier3 barrier4 barrier5 \
@@ -274,9 +274,9 @@
 mutex8e.pass: mutex7e.pass
 mutex8r.pass: mutex7r.pass
 once1.pass: create1.pass
-once2.pass: once1.pass
-once3.pass: once2.pass
-once4.pass: once3.pass
+#once2.pass: once1.pass
+#once3.pass: once2.pass
+#once4.pass: once3.pass
 priority1.pass: join1.pass
 priority2.pass: priority1.pass barrier3.pass
 reuse1.pass: create2.pass

mingw32-pthreads-2.8.0-use-wine-for-tests.patch:

--- NEW FILE mingw32-pthreads-2.8.0-use-wine-for-tests.patch ---
--- pthreads-w32-2-8-0-release/tests/GNUmakefile.orig	2008-10-10 14:16:03.000000000 +0100
+++ pthreads-w32-2-8-0-release/tests/GNUmakefile	2008-10-10 14:19:06.000000000 +0100
@@ -316,20 +316,20 @@
 
 sizes.pass: sizes.exe
 	@ $(ECHO) Running $*
-	$< > SIZES.$(TEST)
+	wine $< > SIZES.$(TEST)
 	@ $(CAT) SIZES.$(TEST)
 	@ $(ECHO) Passed
 	@ $(TOUCH) $@
 
 %.pass: %.exe
 	@ $(ECHO) Running $*
-	$*
+	wine $*
 	@ $(ECHO) Passed
 	@ $(TOUCH) $@
 
 %.bench: $(LIB) $(DLL) $(HDR) $(QAPC) $(XXLIBS) %.exe
 	@ $(ECHO) Running $*
-	$*
+	wine $*
 	@ $(ECHO) Done
 	@ $(TOUCH) $@
 

mingw32-pthreads-flags.patch:

--- NEW FILE mingw32-pthreads-flags.patch ---
--- ./GNUmakefile.lfarkas	2008-12-29 16:23:03.000000000 +0100
+++ ./GNUmakefile	2008-12-29 16:23:45.000000000 +0100
@@ -58,8 +58,8 @@
 RANLIB  = $(CROSS)ranlib
 RC	= $(CROSS)windres
 
-OPT	= $(CLEANUP) -O3 -finline-functions
-DOPT	= $(CLEANUP) -g -O0
+OPT	= $(CLEANUP) -O3 -finline-functions -mms-bitfields
+DOPT	= $(CLEANUP) -g -O0 -mms-bitfields
 XOPT	=
 
 RCFLAGS		= --include-dir=.


--- NEW FILE mingw32-pthreads.spec ---
%define __strip %{_mingw32_strip}
%define __objdump %{_mingw32_objdump}
%define _use_internal_dependency_generator 0
%define __find_requires %{_mingw32_findrequires}
%define __find_provides %{_mingw32_findprovides}

# The tests take ages to run and require Wine.
%define run_tests 0

Name:           mingw32-pthreads
Version:        2.8.0
Release:        4%{?dist}
Summary:        MinGW pthread library

%define crazy_version %(echo %{version}|tr . -)

License:        LGPLv2+
Group:          Development/Libraries
URL:            http://sourceware.org/pthreads-win32/
Source0:        ftp://sourceware.org/pub/pthreads-win32/pthreads-w32-%{crazy_version}-release.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch

Patch0:         mingw32-pthreads-2.8.0-use-wine-for-tests.patch
Patch1:         mingw32-pthreads-2.8.0-no-failing-tests.patch
Patch2:		mingw32-pthreads-flags.patch

BuildRequires:  mingw32-filesystem >= 40
BuildRequires:  mingw32-gcc
BuildRequires:  mingw32-gcc-c++
BuildRequires:  mingw32-binutils

%if %{run_tests}
BuildRequires:  wine
%endif


%description
The POSIX 1003.1-2001 standard defines an application programming
interface (API) for writing multithreaded applications. This interface
is known more commonly as pthreads. A good number of modern operating
systems include a threading library of some kind: Solaris (UI)
threads, Win32 threads, DCE threads, DECthreads, or any of the draft
revisions of the pthreads standard. The trend is that most of these
systems are slowly adopting the pthreads standard API, with
application developers following suit to reduce porting woes.

Win32 does not, and is unlikely to ever, support pthreads
natively. This project seeks to provide a freely available and
high-quality solution to this problem.


%prep
%setup -q -n pthreads-w32-%{crazy_version}-release

%patch0 -p1
%patch1 -p1
%patch2 -p1


%build
%{_mingw32_make} clean
%{_mingw32_make} CROSS=%{_mingw32_host}- GC-inlined
%{_mingw32_make} clean
%{_mingw32_make} CROSS=%{_mingw32_host}- GCE-inlined


%check
%if %{run_tests}
pushd tests
%{_mingw32_make} clean
%{_mingw32_make} QAPC= \
  CC=%{_mingw32_cc} XXCFLAGS="-D__CLEANUP_C" TEST=GC all-pass
%{_mingw32_make} clean
%{_mingw32_make} QAPC= \
  CC=%{_mingw32_cc} XXCFLAGS="-D__CLEANUP_C" TEST=GCE all-pass
popd
%endif


%install
rm -rf $RPM_BUILD_ROOT

mkdir -p $RPM_BUILD_ROOT%{_mingw32_bindir}
mkdir -p $RPM_BUILD_ROOT%{_mingw32_libdir}
mkdir -p $RPM_BUILD_ROOT%{_mingw32_includedir}/pthread

install -m 0755 *.dll $RPM_BUILD_ROOT%{_mingw32_bindir}
install -m 0644 *.def $RPM_BUILD_ROOT%{_mingw32_bindir}
install -m 0644 *.a $RPM_BUILD_ROOT%{_mingw32_libdir}
install -m 0644 *.h $RPM_BUILD_ROOT%{_mingw32_includedir}/pthread


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root)
%doc ANNOUNCE BUGS ChangeLog CONTRIBUTORS COPYING COPYING.LIB
%doc FAQ MAINTAINERS NEWS PROGRESS README README.NONPORTABLE TODO
%{_mingw32_bindir}/pthreadGC2.dll
%{_mingw32_bindir}/pthreadGCE2.dll
%{_mingw32_bindir}/pthread.def
%{_mingw32_libdir}/libpthreadGC2.a
%{_mingw32_libdir}/libpthreadGCE2.a
%{_mingw32_includedir}/pthread


%changelog
* Tue Jan 13 2009 Richard W.M. Jones <rjones at redhat.com> - 2.8.0-4
- Cleanup to the spec file, no functional changes.

* Mon Dec 29 2008 Levente Farkas <lfarkas at lfarkas.org> - 2.8.0-3
- minor cleanup

* Fri Oct 10 2008 Richard W.M. Jones <rjones at redhat.com> - 2.8.0-2
- Initial RPM release.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-pthreads/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	13 Jan 2009 20:35:51 -0000	1.1
+++ .cvsignore	14 Jan 2009 09:45:11 -0000	1.2
@@ -0,0 +1 @@
+pthreads-w32-2-8-0-release.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-pthreads/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	13 Jan 2009 20:35:51 -0000	1.1
+++ sources	14 Jan 2009 09:45:11 -0000	1.2
@@ -0,0 +1 @@
+6d30c693233b1464ef8983fedd8ccb22  pthreads-w32-2-8-0-release.tar.gz



From rjones at fedoraproject.org  Wed Jan 14 09:45:52 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Wed, 14 Jan 2009 09:45:52 +0000 (UTC)
Subject: rpms/mingw32-libpng/devel import.log, NONE,
	1.1 libpng-multilib.patch, 
	NONE, 1.1 libpng-pngconf.patch, NONE, 1.1 mingw32-libpng.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090114094552.0C76C70136@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/mingw32-libpng/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12826/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log libpng-multilib.patch libpng-pngconf.patch 
	mingw32-libpng.spec 
Log Message:
Initial import.



--- NEW FILE import.log ---
mingw32-libpng-1_2_34-2_fc10:HEAD:mingw32-libpng-1.2.34-2.fc10.src.rpm:1231925894

libpng-multilib.patch:

--- NEW FILE libpng-multilib.patch ---
Use pkg-config to report libpng version and installation directories.


diff -Naur libpng-1.2.31.orig/scripts/libpng-config.in libpng-1.2.31/scripts/libpng-config.in
--- libpng-1.2.31.orig/scripts/libpng-config.in	2008-05-29 13:37:58.000000000 -0400
+++ libpng-1.2.31/scripts/libpng-config.in	2008-08-23 16:57:20.000000000 -0400
@@ -8,11 +8,11 @@
 
 # Modeled after libxml-config.
 
-version="@PNGLIB_VERSION@"
-prefix="@prefix@"
-exec_prefix="@exec_prefix@"
-libdir="@libdir@"
-includedir="@includedir@/libpng at PNGLIB_MAJOR@@PNGLIB_MINOR@"
+version=`pkg-config --modversion libpng`
+prefix=`pkg-config --variable prefix libpng`
+exec_prefix=`pkg-config --variable exec_prefix libpng`
+libdir=`pkg-config --variable libdir libpng`
+includedir=`pkg-config --variable includedir libpng`
 libs="-lpng at PNGLIB_MAJOR@@PNGLIB_MINOR@"
 all_libs="-lpng at PNGLIB_MAJOR@@PNGLIB_MINOR@ @LIBS@"
 I_opts="-I${includedir}"

libpng-pngconf.patch:

--- NEW FILE libpng-pngconf.patch ---
diff -Naur libpng-1.2.29.orig/configure.ac libpng-1.2.29/configure.ac
--- libpng-1.2.29.orig/configure.ac	2008-05-08 07:58:11.000000000 -0400
+++ libpng-1.2.29/configure.ac	2008-05-31 20:21:12.000000000 -0400
@@ -63,7 +63,8 @@
 AC_MSG_CHECKING(
   [if assembler code in pnggccrd.c can be compiled without PNG_NO_MMX_CODE])
 AC_TRY_COMPILE(
-  [#include "$srcdir/pnggccrd.c"],
+  [#define PNG_CONFIGURE_LIBPNG
+   #include "$srcdir/pnggccrd.c"],
   [return 0;],
   AC_MSG_RESULT(yes)
   LIBPNG_NO_MMX="",
diff -Naur libpng-1.2.29.orig/pngconf.h libpng-1.2.29/pngconf.h
--- libpng-1.2.29.orig/pngconf.h	2008-05-08 07:58:03.000000000 -0400
+++ libpng-1.2.29/pngconf.h	2008-05-31 20:21:12.000000000 -0400
@@ -35,6 +35,25 @@
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
+#else
+/* pngconf.h is part of the exported API. When a libpng-using application
+   includes us, PNG_CONFIGURE_LIBPNG is of course not defined as we do not have
+   libpng's config.h available in this case. This means that we do not have the
+   defines added to config.h and the commandline by libpng's ./configure .
+   
+   For all defines from config.h not having them set is not a problem, however
+   ./configure also adds -DPNG_NO_ASSEMBLER_CODE to the CFLAGS when compiling
+   on a platform on which the MMX and SSE asm code in libpng is not supported.
+   
+   We do need this define as this define is used to determine whether or not
+   to define PNG_ASSEMBLER_CODE_SUPPORTED and other assembler related defines
+   and prototypes. PNG_ASSEMBLER_CODE_SUPPORTED in turn is used by applications
+   (ImageMagick for example) to determine whether or not they can use the asm
+   functions. Thus we need to define PNG_NO_ASSEMBLER_CODE here on platforms
+   on which the MMX and SSE asm code in libpng is not supported: */
+#ifndef __i386__ /* change this if MMX/SSE become supported on x86_64! */
+#define PNG_NO_ASSEMBLER_CODE
+#endif
 #endif
 
 /*


--- NEW FILE mingw32-libpng.spec ---
%define __strip %{_mingw32_strip}
%define __objdump %{_mingw32_objdump}
%define _use_internal_dependency_generator 0
%define __find_requires %{_mingw32_findrequires}
%define __find_provides %{_mingw32_findprovides}

Name:           mingw32-libpng
Version:        1.2.34
Release:        2%{?dist}
Summary:        MinGW Windows Libpng library

License:        zlib
URL:            http://www.libpng.org/pub/png/
Source0:        ftp://ftp.simplesystems.org/pub/png/src/libpng-%{version}.tar.bz2
Patch0:         libpng-multilib.patch
Patch1:         libpng-pngconf.patch

Group:          Development/Libraries
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch

BuildRequires:  mingw32-filesystem >= 40
BuildRequires:  mingw32-gcc
BuildRequires:  mingw32-binutils
BuildRequires:  mingw32-zlib

Requires:       pkgconfig

%description
MinGW Windows Libpng library.


%prep
%setup -q -n libpng-%{version}
%patch0 -p1
%patch1 -p1

%build
%{_mingw32_configure}
make


%install
rm -rf $RPM_BUILD_ROOT

make DESTDIR=$RPM_BUILD_ROOT install

rm $RPM_BUILD_ROOT%{_mingw32_libdir}/libpng.a

# No need to distribute manpages which appear in the Fedora
# native packages already.
rm -rf $RPM_BUILD_ROOT%{_mingw32_mandir}

%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root)
%doc ANNOUNCE CHANGES KNOWNBUG LICENSE README TODO Y2KINFO
%{_mingw32_bindir}/libpng-3.dll
%{_mingw32_bindir}/libpng-config
%{_mingw32_bindir}/libpng12-0.dll
%{_mingw32_bindir}/libpng12-config
%{_mingw32_includedir}/libpng12
%{_mingw32_includedir}/png.h
%{_mingw32_includedir}/pngconf.h
%{_mingw32_libdir}/libpng.dll.a
%{_mingw32_libdir}/libpng.la
%{_mingw32_libdir}/libpng12.a
%{_mingw32_libdir}/libpng12.dll.a
%{_mingw32_libdir}/libpng12.la
%{_mingw32_libdir}/pkgconfig/libpng.pc
%{_mingw32_libdir}/pkgconfig/libpng12.pc


%changelog
* Tue Jan 13 2009 Richard W.M. Jones <rjones at redhat.com> - 1.2.34-2
- Depend on mingw32-filesystem >= 40 so we can still build in F-10.

* Tue Jan 13 2009 Richard W.M. Jones <rjones at redhat.com> - 1.2.34-1
- Rebase to 1.2.34 and patches from Fedora.
- Requires pkgconfig.
- Add documentation.

* Wed Sep 24 2008 Richard W.M. Jones <rjones at redhat.com> - 1.2.31-5
- Rename mingw -> mingw32.

* Mon Sep 22 2008 Daniel P. Berrange <berrange at redhat.com> - 1.2.31-4
- Add patches from rawhide RPM

* Sun Sep 21 2008 Richard W.M. Jones <rjones at redhat.com> - 1.2.31-3
- Don't duplicate Fedora native manpages.

* Wed Sep 10 2008 Richard W.M. Jones <rjones at redhat.com> - 1.2.31-2
- Remove static library.

* Tue Sep  9 2008 Daniel P. Berrange <berrange at redhat.com> - 1.2.31-1
- Initial RPM release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-libpng/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	13 Jan 2009 20:32:41 -0000	1.1
+++ .cvsignore	14 Jan 2009 09:45:21 -0000	1.2
@@ -0,0 +1 @@
+libpng-1.2.34.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-libpng/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	13 Jan 2009 20:32:41 -0000	1.1
+++ sources	14 Jan 2009 09:45:21 -0000	1.2
@@ -0,0 +1 @@
+37362876feb21344fd3af1228527db0f  libpng-1.2.34.tar.bz2



From rjones at fedoraproject.org  Wed Jan 14 09:51:13 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Wed, 14 Jan 2009 09:51:13 +0000 (UTC)
Subject: rpms/mingw32-pthreads/EL-5 import.log, NONE,
	1.1 mingw32-pthreads-2.8.0-no-failing-tests.patch, NONE,
	1.1 mingw32-pthreads-2.8.0-use-wine-for-tests.patch, NONE,
	1.1 mingw32-pthreads-flags.patch, NONE,
	1.1 mingw32-pthreads.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090114095113.CC78B70136@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/mingw32-pthreads/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14018/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	import.log mingw32-pthreads-2.8.0-no-failing-tests.patch 
	mingw32-pthreads-2.8.0-use-wine-for-tests.patch 
	mingw32-pthreads-flags.patch mingw32-pthreads.spec 
Log Message:
Initial import.



--- NEW FILE import.log ---
mingw32-pthreads-2_8_0-4_fc10:EL-5:mingw32-pthreads-2.8.0-4.fc10.src.rpm:1231926110

mingw32-pthreads-2.8.0-no-failing-tests.patch:

--- NEW FILE mingw32-pthreads-2.8.0-no-failing-tests.patch ---
--- pthreads-w32-2-8-0-release/tests/GNUmakefile.wine	2008-10-10 14:19:06.000000000 +0100
+++ pthreads-w32-2-8-0-release/tests/GNUmakefile	2008-10-10 14:19:40.000000000 +0100
@@ -87,7 +87,7 @@
 	  mutex6s mutex6es mutex6rs \
 	  mutex7 mutex7n mutex7e mutex7r mutex8 mutex8n mutex8e mutex8r \
 	  count1 \
-	  once1 once2 once3 once4 self2 \
+	  once1 self2 \
 	  cancel1 cancel2 \
 	  semaphore4 semaphore4t semaphore5 \
 	  barrier1 barrier2 barrier3 barrier4 barrier5 \
@@ -274,9 +274,9 @@
 mutex8e.pass: mutex7e.pass
 mutex8r.pass: mutex7r.pass
 once1.pass: create1.pass
-once2.pass: once1.pass
-once3.pass: once2.pass
-once4.pass: once3.pass
+#once2.pass: once1.pass
+#once3.pass: once2.pass
+#once4.pass: once3.pass
 priority1.pass: join1.pass
 priority2.pass: priority1.pass barrier3.pass
 reuse1.pass: create2.pass

mingw32-pthreads-2.8.0-use-wine-for-tests.patch:

--- NEW FILE mingw32-pthreads-2.8.0-use-wine-for-tests.patch ---
--- pthreads-w32-2-8-0-release/tests/GNUmakefile.orig	2008-10-10 14:16:03.000000000 +0100
+++ pthreads-w32-2-8-0-release/tests/GNUmakefile	2008-10-10 14:19:06.000000000 +0100
@@ -316,20 +316,20 @@
 
 sizes.pass: sizes.exe
 	@ $(ECHO) Running $*
-	$< > SIZES.$(TEST)
+	wine $< > SIZES.$(TEST)
 	@ $(CAT) SIZES.$(TEST)
 	@ $(ECHO) Passed
 	@ $(TOUCH) $@
 
 %.pass: %.exe
 	@ $(ECHO) Running $*
-	$*
+	wine $*
 	@ $(ECHO) Passed
 	@ $(TOUCH) $@
 
 %.bench: $(LIB) $(DLL) $(HDR) $(QAPC) $(XXLIBS) %.exe
 	@ $(ECHO) Running $*
-	$*
+	wine $*
 	@ $(ECHO) Done
 	@ $(TOUCH) $@
 

mingw32-pthreads-flags.patch:

--- NEW FILE mingw32-pthreads-flags.patch ---
--- ./GNUmakefile.lfarkas	2008-12-29 16:23:03.000000000 +0100
+++ ./GNUmakefile	2008-12-29 16:23:45.000000000 +0100
@@ -58,8 +58,8 @@
 RANLIB  = $(CROSS)ranlib
 RC	= $(CROSS)windres
 
-OPT	= $(CLEANUP) -O3 -finline-functions
-DOPT	= $(CLEANUP) -g -O0
+OPT	= $(CLEANUP) -O3 -finline-functions -mms-bitfields
+DOPT	= $(CLEANUP) -g -O0 -mms-bitfields
 XOPT	=
 
 RCFLAGS		= --include-dir=.


--- NEW FILE mingw32-pthreads.spec ---
%define __strip %{_mingw32_strip}
%define __objdump %{_mingw32_objdump}
%define _use_internal_dependency_generator 0
%define __find_requires %{_mingw32_findrequires}
%define __find_provides %{_mingw32_findprovides}

# The tests take ages to run and require Wine.
%define run_tests 0

Name:           mingw32-pthreads
Version:        2.8.0
Release:        4%{?dist}
Summary:        MinGW pthread library

%define crazy_version %(echo %{version}|tr . -)

License:        LGPLv2+
Group:          Development/Libraries
URL:            http://sourceware.org/pthreads-win32/
Source0:        ftp://sourceware.org/pub/pthreads-win32/pthreads-w32-%{crazy_version}-release.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch

Patch0:         mingw32-pthreads-2.8.0-use-wine-for-tests.patch
Patch1:         mingw32-pthreads-2.8.0-no-failing-tests.patch
Patch2:		mingw32-pthreads-flags.patch

BuildRequires:  mingw32-filesystem >= 40
BuildRequires:  mingw32-gcc
BuildRequires:  mingw32-gcc-c++
BuildRequires:  mingw32-binutils

%if %{run_tests}
BuildRequires:  wine
%endif


%description
The POSIX 1003.1-2001 standard defines an application programming
interface (API) for writing multithreaded applications. This interface
is known more commonly as pthreads. A good number of modern operating
systems include a threading library of some kind: Solaris (UI)
threads, Win32 threads, DCE threads, DECthreads, or any of the draft
revisions of the pthreads standard. The trend is that most of these
systems are slowly adopting the pthreads standard API, with
application developers following suit to reduce porting woes.

Win32 does not, and is unlikely to ever, support pthreads
natively. This project seeks to provide a freely available and
high-quality solution to this problem.


%prep
%setup -q -n pthreads-w32-%{crazy_version}-release

%patch0 -p1
%patch1 -p1
%patch2 -p1


%build
%{_mingw32_make} clean
%{_mingw32_make} CROSS=%{_mingw32_host}- GC-inlined
%{_mingw32_make} clean
%{_mingw32_make} CROSS=%{_mingw32_host}- GCE-inlined


%check
%if %{run_tests}
pushd tests
%{_mingw32_make} clean
%{_mingw32_make} QAPC= \
  CC=%{_mingw32_cc} XXCFLAGS="-D__CLEANUP_C" TEST=GC all-pass
%{_mingw32_make} clean
%{_mingw32_make} QAPC= \
  CC=%{_mingw32_cc} XXCFLAGS="-D__CLEANUP_C" TEST=GCE all-pass
popd
%endif


%install
rm -rf $RPM_BUILD_ROOT

mkdir -p $RPM_BUILD_ROOT%{_mingw32_bindir}
mkdir -p $RPM_BUILD_ROOT%{_mingw32_libdir}
mkdir -p $RPM_BUILD_ROOT%{_mingw32_includedir}/pthread

install -m 0755 *.dll $RPM_BUILD_ROOT%{_mingw32_bindir}
install -m 0644 *.def $RPM_BUILD_ROOT%{_mingw32_bindir}
install -m 0644 *.a $RPM_BUILD_ROOT%{_mingw32_libdir}
install -m 0644 *.h $RPM_BUILD_ROOT%{_mingw32_includedir}/pthread


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root)
%doc ANNOUNCE BUGS ChangeLog CONTRIBUTORS COPYING COPYING.LIB
%doc FAQ MAINTAINERS NEWS PROGRESS README README.NONPORTABLE TODO
%{_mingw32_bindir}/pthreadGC2.dll
%{_mingw32_bindir}/pthreadGCE2.dll
%{_mingw32_bindir}/pthread.def
%{_mingw32_libdir}/libpthreadGC2.a
%{_mingw32_libdir}/libpthreadGCE2.a
%{_mingw32_includedir}/pthread


%changelog
* Tue Jan 13 2009 Richard W.M. Jones <rjones at redhat.com> - 2.8.0-4
- Cleanup to the spec file, no functional changes.

* Mon Dec 29 2008 Levente Farkas <lfarkas at lfarkas.org> - 2.8.0-3
- minor cleanup

* Fri Oct 10 2008 Richard W.M. Jones <rjones at redhat.com> - 2.8.0-2
- Initial RPM release.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-pthreads/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	13 Jan 2009 20:35:51 -0000	1.1
+++ .cvsignore	14 Jan 2009 09:50:43 -0000	1.2
@@ -0,0 +1 @@
+pthreads-w32-2-8-0-release.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-pthreads/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	13 Jan 2009 20:35:51 -0000	1.1
+++ sources	14 Jan 2009 09:50:43 -0000	1.2
@@ -0,0 +1 @@
+6d30c693233b1464ef8983fedd8ccb22  pthreads-w32-2-8-0-release.tar.gz



From rjones at fedoraproject.org  Wed Jan 14 09:51:18 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Wed, 14 Jan 2009 09:51:18 +0000 (UTC)
Subject: rpms/mingw32-libpng/EL-5 import.log, NONE, 1.1 libpng-multilib.patch,
	NONE, 1.1 libpng-pngconf.patch, NONE, 1.1 mingw32-libpng.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090114095118.5637170136@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/mingw32-libpng/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13995/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	import.log libpng-multilib.patch libpng-pngconf.patch 
	mingw32-libpng.spec 
Log Message:
Initial import.



--- NEW FILE import.log ---
mingw32-libpng-1_2_34-2_fc10:EL-5:mingw32-libpng-1.2.34-2.fc10.src.rpm:1231926106

libpng-multilib.patch:

--- NEW FILE libpng-multilib.patch ---
Use pkg-config to report libpng version and installation directories.


diff -Naur libpng-1.2.31.orig/scripts/libpng-config.in libpng-1.2.31/scripts/libpng-config.in
--- libpng-1.2.31.orig/scripts/libpng-config.in	2008-05-29 13:37:58.000000000 -0400
+++ libpng-1.2.31/scripts/libpng-config.in	2008-08-23 16:57:20.000000000 -0400
@@ -8,11 +8,11 @@
 
 # Modeled after libxml-config.
 
-version="@PNGLIB_VERSION@"
-prefix="@prefix@"
-exec_prefix="@exec_prefix@"
-libdir="@libdir@"
-includedir="@includedir@/libpng at PNGLIB_MAJOR@@PNGLIB_MINOR@"
+version=`pkg-config --modversion libpng`
+prefix=`pkg-config --variable prefix libpng`
+exec_prefix=`pkg-config --variable exec_prefix libpng`
+libdir=`pkg-config --variable libdir libpng`
+includedir=`pkg-config --variable includedir libpng`
 libs="-lpng at PNGLIB_MAJOR@@PNGLIB_MINOR@"
 all_libs="-lpng at PNGLIB_MAJOR@@PNGLIB_MINOR@ @LIBS@"
 I_opts="-I${includedir}"

libpng-pngconf.patch:

--- NEW FILE libpng-pngconf.patch ---
diff -Naur libpng-1.2.29.orig/configure.ac libpng-1.2.29/configure.ac
--- libpng-1.2.29.orig/configure.ac	2008-05-08 07:58:11.000000000 -0400
+++ libpng-1.2.29/configure.ac	2008-05-31 20:21:12.000000000 -0400
@@ -63,7 +63,8 @@
 AC_MSG_CHECKING(
   [if assembler code in pnggccrd.c can be compiled without PNG_NO_MMX_CODE])
 AC_TRY_COMPILE(
-  [#include "$srcdir/pnggccrd.c"],
+  [#define PNG_CONFIGURE_LIBPNG
+   #include "$srcdir/pnggccrd.c"],
   [return 0;],
   AC_MSG_RESULT(yes)
   LIBPNG_NO_MMX="",
diff -Naur libpng-1.2.29.orig/pngconf.h libpng-1.2.29/pngconf.h
--- libpng-1.2.29.orig/pngconf.h	2008-05-08 07:58:03.000000000 -0400
+++ libpng-1.2.29/pngconf.h	2008-05-31 20:21:12.000000000 -0400
@@ -35,6 +35,25 @@
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
+#else
+/* pngconf.h is part of the exported API. When a libpng-using application
+   includes us, PNG_CONFIGURE_LIBPNG is of course not defined as we do not have
+   libpng's config.h available in this case. This means that we do not have the
+   defines added to config.h and the commandline by libpng's ./configure .
+   
+   For all defines from config.h not having them set is not a problem, however
+   ./configure also adds -DPNG_NO_ASSEMBLER_CODE to the CFLAGS when compiling
+   on a platform on which the MMX and SSE asm code in libpng is not supported.
+   
+   We do need this define as this define is used to determine whether or not
+   to define PNG_ASSEMBLER_CODE_SUPPORTED and other assembler related defines
+   and prototypes. PNG_ASSEMBLER_CODE_SUPPORTED in turn is used by applications
+   (ImageMagick for example) to determine whether or not they can use the asm
+   functions. Thus we need to define PNG_NO_ASSEMBLER_CODE here on platforms
+   on which the MMX and SSE asm code in libpng is not supported: */
+#ifndef __i386__ /* change this if MMX/SSE become supported on x86_64! */
+#define PNG_NO_ASSEMBLER_CODE
+#endif
 #endif
 
 /*


--- NEW FILE mingw32-libpng.spec ---
%define __strip %{_mingw32_strip}
%define __objdump %{_mingw32_objdump}
%define _use_internal_dependency_generator 0
%define __find_requires %{_mingw32_findrequires}
%define __find_provides %{_mingw32_findprovides}

Name:           mingw32-libpng
Version:        1.2.34
Release:        2%{?dist}
Summary:        MinGW Windows Libpng library

License:        zlib
URL:            http://www.libpng.org/pub/png/
Source0:        ftp://ftp.simplesystems.org/pub/png/src/libpng-%{version}.tar.bz2
Patch0:         libpng-multilib.patch
Patch1:         libpng-pngconf.patch

Group:          Development/Libraries
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch

BuildRequires:  mingw32-filesystem >= 40
BuildRequires:  mingw32-gcc
BuildRequires:  mingw32-binutils
BuildRequires:  mingw32-zlib

Requires:       pkgconfig

%description
MinGW Windows Libpng library.


%prep
%setup -q -n libpng-%{version}
%patch0 -p1
%patch1 -p1

%build
%{_mingw32_configure}
make


%install
rm -rf $RPM_BUILD_ROOT

make DESTDIR=$RPM_BUILD_ROOT install

rm $RPM_BUILD_ROOT%{_mingw32_libdir}/libpng.a

# No need to distribute manpages which appear in the Fedora
# native packages already.
rm -rf $RPM_BUILD_ROOT%{_mingw32_mandir}

%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root)
%doc ANNOUNCE CHANGES KNOWNBUG LICENSE README TODO Y2KINFO
%{_mingw32_bindir}/libpng-3.dll
%{_mingw32_bindir}/libpng-config
%{_mingw32_bindir}/libpng12-0.dll
%{_mingw32_bindir}/libpng12-config
%{_mingw32_includedir}/libpng12
%{_mingw32_includedir}/png.h
%{_mingw32_includedir}/pngconf.h
%{_mingw32_libdir}/libpng.dll.a
%{_mingw32_libdir}/libpng.la
%{_mingw32_libdir}/libpng12.a
%{_mingw32_libdir}/libpng12.dll.a
%{_mingw32_libdir}/libpng12.la
%{_mingw32_libdir}/pkgconfig/libpng.pc
%{_mingw32_libdir}/pkgconfig/libpng12.pc


%changelog
* Tue Jan 13 2009 Richard W.M. Jones <rjones at redhat.com> - 1.2.34-2
- Depend on mingw32-filesystem >= 40 so we can still build in F-10.

* Tue Jan 13 2009 Richard W.M. Jones <rjones at redhat.com> - 1.2.34-1
- Rebase to 1.2.34 and patches from Fedora.
- Requires pkgconfig.
- Add documentation.

* Wed Sep 24 2008 Richard W.M. Jones <rjones at redhat.com> - 1.2.31-5
- Rename mingw -> mingw32.

* Mon Sep 22 2008 Daniel P. Berrange <berrange at redhat.com> - 1.2.31-4
- Add patches from rawhide RPM

* Sun Sep 21 2008 Richard W.M. Jones <rjones at redhat.com> - 1.2.31-3
- Don't duplicate Fedora native manpages.

* Wed Sep 10 2008 Richard W.M. Jones <rjones at redhat.com> - 1.2.31-2
- Remove static library.

* Tue Sep  9 2008 Daniel P. Berrange <berrange at redhat.com> - 1.2.31-1
- Initial RPM release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-libpng/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	13 Jan 2009 20:32:41 -0000	1.1
+++ .cvsignore	14 Jan 2009 09:50:48 -0000	1.2
@@ -0,0 +1 @@
+libpng-1.2.34.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-libpng/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	13 Jan 2009 20:32:41 -0000	1.1
+++ sources	14 Jan 2009 09:50:48 -0000	1.2
@@ -0,0 +1 @@
+37362876feb21344fd3af1228527db0f  libpng-1.2.34.tar.bz2



From rjones at fedoraproject.org  Wed Jan 14 09:51:21 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Wed, 14 Jan 2009 09:51:21 +0000 (UTC)
Subject: rpms/mingw32-libpng/F-10 import.log, NONE, 1.1 libpng-multilib.patch,
	NONE, 1.1 libpng-pngconf.patch, NONE, 1.1 mingw32-libpng.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090114095121.BFDF170136@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/mingw32-libpng/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14055/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	import.log libpng-multilib.patch libpng-pngconf.patch 
	mingw32-libpng.spec 
Log Message:
Initial import.



--- NEW FILE import.log ---
mingw32-libpng-1_2_34-2_fc10:F-10:mingw32-libpng-1.2.34-2.fc10.src.rpm:1231926106

libpng-multilib.patch:

--- NEW FILE libpng-multilib.patch ---
Use pkg-config to report libpng version and installation directories.


diff -Naur libpng-1.2.31.orig/scripts/libpng-config.in libpng-1.2.31/scripts/libpng-config.in
--- libpng-1.2.31.orig/scripts/libpng-config.in	2008-05-29 13:37:58.000000000 -0400
+++ libpng-1.2.31/scripts/libpng-config.in	2008-08-23 16:57:20.000000000 -0400
@@ -8,11 +8,11 @@
 
 # Modeled after libxml-config.
 
-version="@PNGLIB_VERSION@"
-prefix="@prefix@"
-exec_prefix="@exec_prefix@"
-libdir="@libdir@"
-includedir="@includedir@/libpng at PNGLIB_MAJOR@@PNGLIB_MINOR@"
+version=`pkg-config --modversion libpng`
+prefix=`pkg-config --variable prefix libpng`
+exec_prefix=`pkg-config --variable exec_prefix libpng`
+libdir=`pkg-config --variable libdir libpng`
+includedir=`pkg-config --variable includedir libpng`
 libs="-lpng at PNGLIB_MAJOR@@PNGLIB_MINOR@"
 all_libs="-lpng at PNGLIB_MAJOR@@PNGLIB_MINOR@ @LIBS@"
 I_opts="-I${includedir}"

libpng-pngconf.patch:

--- NEW FILE libpng-pngconf.patch ---
diff -Naur libpng-1.2.29.orig/configure.ac libpng-1.2.29/configure.ac
--- libpng-1.2.29.orig/configure.ac	2008-05-08 07:58:11.000000000 -0400
+++ libpng-1.2.29/configure.ac	2008-05-31 20:21:12.000000000 -0400
@@ -63,7 +63,8 @@
 AC_MSG_CHECKING(
   [if assembler code in pnggccrd.c can be compiled without PNG_NO_MMX_CODE])
 AC_TRY_COMPILE(
-  [#include "$srcdir/pnggccrd.c"],
+  [#define PNG_CONFIGURE_LIBPNG
+   #include "$srcdir/pnggccrd.c"],
   [return 0;],
   AC_MSG_RESULT(yes)
   LIBPNG_NO_MMX="",
diff -Naur libpng-1.2.29.orig/pngconf.h libpng-1.2.29/pngconf.h
--- libpng-1.2.29.orig/pngconf.h	2008-05-08 07:58:03.000000000 -0400
+++ libpng-1.2.29/pngconf.h	2008-05-31 20:21:12.000000000 -0400
@@ -35,6 +35,25 @@
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
+#else
+/* pngconf.h is part of the exported API. When a libpng-using application
+   includes us, PNG_CONFIGURE_LIBPNG is of course not defined as we do not have
+   libpng's config.h available in this case. This means that we do not have the
+   defines added to config.h and the commandline by libpng's ./configure .
+   
+   For all defines from config.h not having them set is not a problem, however
+   ./configure also adds -DPNG_NO_ASSEMBLER_CODE to the CFLAGS when compiling
+   on a platform on which the MMX and SSE asm code in libpng is not supported.
+   
+   We do need this define as this define is used to determine whether or not
+   to define PNG_ASSEMBLER_CODE_SUPPORTED and other assembler related defines
+   and prototypes. PNG_ASSEMBLER_CODE_SUPPORTED in turn is used by applications
+   (ImageMagick for example) to determine whether or not they can use the asm
+   functions. Thus we need to define PNG_NO_ASSEMBLER_CODE here on platforms
+   on which the MMX and SSE asm code in libpng is not supported: */
+#ifndef __i386__ /* change this if MMX/SSE become supported on x86_64! */
+#define PNG_NO_ASSEMBLER_CODE
+#endif
 #endif
 
 /*


--- NEW FILE mingw32-libpng.spec ---
%define __strip %{_mingw32_strip}
%define __objdump %{_mingw32_objdump}
%define _use_internal_dependency_generator 0
%define __find_requires %{_mingw32_findrequires}
%define __find_provides %{_mingw32_findprovides}

Name:           mingw32-libpng
Version:        1.2.34
Release:        2%{?dist}
Summary:        MinGW Windows Libpng library

License:        zlib
URL:            http://www.libpng.org/pub/png/
Source0:        ftp://ftp.simplesystems.org/pub/png/src/libpng-%{version}.tar.bz2
Patch0:         libpng-multilib.patch
Patch1:         libpng-pngconf.patch

Group:          Development/Libraries
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch

BuildRequires:  mingw32-filesystem >= 40
BuildRequires:  mingw32-gcc
BuildRequires:  mingw32-binutils
BuildRequires:  mingw32-zlib

Requires:       pkgconfig

%description
MinGW Windows Libpng library.


%prep
%setup -q -n libpng-%{version}
%patch0 -p1
%patch1 -p1

%build
%{_mingw32_configure}
make


%install
rm -rf $RPM_BUILD_ROOT

make DESTDIR=$RPM_BUILD_ROOT install

rm $RPM_BUILD_ROOT%{_mingw32_libdir}/libpng.a

# No need to distribute manpages which appear in the Fedora
# native packages already.
rm -rf $RPM_BUILD_ROOT%{_mingw32_mandir}

%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root)
%doc ANNOUNCE CHANGES KNOWNBUG LICENSE README TODO Y2KINFO
%{_mingw32_bindir}/libpng-3.dll
%{_mingw32_bindir}/libpng-config
%{_mingw32_bindir}/libpng12-0.dll
%{_mingw32_bindir}/libpng12-config
%{_mingw32_includedir}/libpng12
%{_mingw32_includedir}/png.h
%{_mingw32_includedir}/pngconf.h
%{_mingw32_libdir}/libpng.dll.a
%{_mingw32_libdir}/libpng.la
%{_mingw32_libdir}/libpng12.a
%{_mingw32_libdir}/libpng12.dll.a
%{_mingw32_libdir}/libpng12.la
%{_mingw32_libdir}/pkgconfig/libpng.pc
%{_mingw32_libdir}/pkgconfig/libpng12.pc


%changelog
* Tue Jan 13 2009 Richard W.M. Jones <rjones at redhat.com> - 1.2.34-2
- Depend on mingw32-filesystem >= 40 so we can still build in F-10.

* Tue Jan 13 2009 Richard W.M. Jones <rjones at redhat.com> - 1.2.34-1
- Rebase to 1.2.34 and patches from Fedora.
- Requires pkgconfig.
- Add documentation.

* Wed Sep 24 2008 Richard W.M. Jones <rjones at redhat.com> - 1.2.31-5
- Rename mingw -> mingw32.

* Mon Sep 22 2008 Daniel P. Berrange <berrange at redhat.com> - 1.2.31-4
- Add patches from rawhide RPM

* Sun Sep 21 2008 Richard W.M. Jones <rjones at redhat.com> - 1.2.31-3
- Don't duplicate Fedora native manpages.

* Wed Sep 10 2008 Richard W.M. Jones <rjones at redhat.com> - 1.2.31-2
- Remove static library.

* Tue Sep  9 2008 Daniel P. Berrange <berrange at redhat.com> - 1.2.31-1
- Initial RPM release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-libpng/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	13 Jan 2009 20:32:41 -0000	1.1
+++ .cvsignore	14 Jan 2009 09:50:51 -0000	1.2
@@ -0,0 +1 @@
+libpng-1.2.34.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-libpng/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	13 Jan 2009 20:32:41 -0000	1.1
+++ sources	14 Jan 2009 09:50:51 -0000	1.2
@@ -0,0 +1 @@
+37362876feb21344fd3af1228527db0f  libpng-1.2.34.tar.bz2



From rjones at fedoraproject.org  Wed Jan 14 09:51:25 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Wed, 14 Jan 2009 09:51:25 +0000 (UTC)
Subject: rpms/mingw32-pthreads/F-10 import.log, NONE,
	1.1 mingw32-pthreads-2.8.0-no-failing-tests.patch, NONE,
	1.1 mingw32-pthreads-2.8.0-use-wine-for-tests.patch, NONE,
	1.1 mingw32-pthreads-flags.patch, NONE,
	1.1 mingw32-pthreads.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090114095125.93B5670136@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/mingw32-pthreads/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14036/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	import.log mingw32-pthreads-2.8.0-no-failing-tests.patch 
	mingw32-pthreads-2.8.0-use-wine-for-tests.patch 
	mingw32-pthreads-flags.patch mingw32-pthreads.spec 
Log Message:
Initial import.



--- NEW FILE import.log ---
mingw32-pthreads-2_8_0-4_fc10:F-10:mingw32-pthreads-2.8.0-4.fc10.src.rpm:1231926111

mingw32-pthreads-2.8.0-no-failing-tests.patch:

--- NEW FILE mingw32-pthreads-2.8.0-no-failing-tests.patch ---
--- pthreads-w32-2-8-0-release/tests/GNUmakefile.wine	2008-10-10 14:19:06.000000000 +0100
+++ pthreads-w32-2-8-0-release/tests/GNUmakefile	2008-10-10 14:19:40.000000000 +0100
@@ -87,7 +87,7 @@
 	  mutex6s mutex6es mutex6rs \
 	  mutex7 mutex7n mutex7e mutex7r mutex8 mutex8n mutex8e mutex8r \
 	  count1 \
-	  once1 once2 once3 once4 self2 \
+	  once1 self2 \
 	  cancel1 cancel2 \
 	  semaphore4 semaphore4t semaphore5 \
 	  barrier1 barrier2 barrier3 barrier4 barrier5 \
@@ -274,9 +274,9 @@
 mutex8e.pass: mutex7e.pass
 mutex8r.pass: mutex7r.pass
 once1.pass: create1.pass
-once2.pass: once1.pass
-once3.pass: once2.pass
-once4.pass: once3.pass
+#once2.pass: once1.pass
+#once3.pass: once2.pass
+#once4.pass: once3.pass
 priority1.pass: join1.pass
 priority2.pass: priority1.pass barrier3.pass
 reuse1.pass: create2.pass

mingw32-pthreads-2.8.0-use-wine-for-tests.patch:

--- NEW FILE mingw32-pthreads-2.8.0-use-wine-for-tests.patch ---
--- pthreads-w32-2-8-0-release/tests/GNUmakefile.orig	2008-10-10 14:16:03.000000000 +0100
+++ pthreads-w32-2-8-0-release/tests/GNUmakefile	2008-10-10 14:19:06.000000000 +0100
@@ -316,20 +316,20 @@
 
 sizes.pass: sizes.exe
 	@ $(ECHO) Running $*
-	$< > SIZES.$(TEST)
+	wine $< > SIZES.$(TEST)
 	@ $(CAT) SIZES.$(TEST)
 	@ $(ECHO) Passed
 	@ $(TOUCH) $@
 
 %.pass: %.exe
 	@ $(ECHO) Running $*
-	$*
+	wine $*
 	@ $(ECHO) Passed
 	@ $(TOUCH) $@
 
 %.bench: $(LIB) $(DLL) $(HDR) $(QAPC) $(XXLIBS) %.exe
 	@ $(ECHO) Running $*
-	$*
+	wine $*
 	@ $(ECHO) Done
 	@ $(TOUCH) $@
 

mingw32-pthreads-flags.patch:

--- NEW FILE mingw32-pthreads-flags.patch ---
--- ./GNUmakefile.lfarkas	2008-12-29 16:23:03.000000000 +0100
+++ ./GNUmakefile	2008-12-29 16:23:45.000000000 +0100
@@ -58,8 +58,8 @@
 RANLIB  = $(CROSS)ranlib
 RC	= $(CROSS)windres
 
-OPT	= $(CLEANUP) -O3 -finline-functions
-DOPT	= $(CLEANUP) -g -O0
+OPT	= $(CLEANUP) -O3 -finline-functions -mms-bitfields
+DOPT	= $(CLEANUP) -g -O0 -mms-bitfields
 XOPT	=
 
 RCFLAGS		= --include-dir=.


--- NEW FILE mingw32-pthreads.spec ---
%define __strip %{_mingw32_strip}
%define __objdump %{_mingw32_objdump}
%define _use_internal_dependency_generator 0
%define __find_requires %{_mingw32_findrequires}
%define __find_provides %{_mingw32_findprovides}

# The tests take ages to run and require Wine.
%define run_tests 0

Name:           mingw32-pthreads
Version:        2.8.0
Release:        4%{?dist}
Summary:        MinGW pthread library

%define crazy_version %(echo %{version}|tr . -)

License:        LGPLv2+
Group:          Development/Libraries
URL:            http://sourceware.org/pthreads-win32/
Source0:        ftp://sourceware.org/pub/pthreads-win32/pthreads-w32-%{crazy_version}-release.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch

Patch0:         mingw32-pthreads-2.8.0-use-wine-for-tests.patch
Patch1:         mingw32-pthreads-2.8.0-no-failing-tests.patch
Patch2:		mingw32-pthreads-flags.patch

BuildRequires:  mingw32-filesystem >= 40
BuildRequires:  mingw32-gcc
BuildRequires:  mingw32-gcc-c++
BuildRequires:  mingw32-binutils

%if %{run_tests}
BuildRequires:  wine
%endif


%description
The POSIX 1003.1-2001 standard defines an application programming
interface (API) for writing multithreaded applications. This interface
is known more commonly as pthreads. A good number of modern operating
systems include a threading library of some kind: Solaris (UI)
threads, Win32 threads, DCE threads, DECthreads, or any of the draft
revisions of the pthreads standard. The trend is that most of these
systems are slowly adopting the pthreads standard API, with
application developers following suit to reduce porting woes.

Win32 does not, and is unlikely to ever, support pthreads
natively. This project seeks to provide a freely available and
high-quality solution to this problem.


%prep
%setup -q -n pthreads-w32-%{crazy_version}-release

%patch0 -p1
%patch1 -p1
%patch2 -p1


%build
%{_mingw32_make} clean
%{_mingw32_make} CROSS=%{_mingw32_host}- GC-inlined
%{_mingw32_make} clean
%{_mingw32_make} CROSS=%{_mingw32_host}- GCE-inlined


%check
%if %{run_tests}
pushd tests
%{_mingw32_make} clean
%{_mingw32_make} QAPC= \
  CC=%{_mingw32_cc} XXCFLAGS="-D__CLEANUP_C" TEST=GC all-pass
%{_mingw32_make} clean
%{_mingw32_make} QAPC= \
  CC=%{_mingw32_cc} XXCFLAGS="-D__CLEANUP_C" TEST=GCE all-pass
popd
%endif


%install
rm -rf $RPM_BUILD_ROOT

mkdir -p $RPM_BUILD_ROOT%{_mingw32_bindir}
mkdir -p $RPM_BUILD_ROOT%{_mingw32_libdir}
mkdir -p $RPM_BUILD_ROOT%{_mingw32_includedir}/pthread

install -m 0755 *.dll $RPM_BUILD_ROOT%{_mingw32_bindir}
install -m 0644 *.def $RPM_BUILD_ROOT%{_mingw32_bindir}
install -m 0644 *.a $RPM_BUILD_ROOT%{_mingw32_libdir}
install -m 0644 *.h $RPM_BUILD_ROOT%{_mingw32_includedir}/pthread


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root)
%doc ANNOUNCE BUGS ChangeLog CONTRIBUTORS COPYING COPYING.LIB
%doc FAQ MAINTAINERS NEWS PROGRESS README README.NONPORTABLE TODO
%{_mingw32_bindir}/pthreadGC2.dll
%{_mingw32_bindir}/pthreadGCE2.dll
%{_mingw32_bindir}/pthread.def
%{_mingw32_libdir}/libpthreadGC2.a
%{_mingw32_libdir}/libpthreadGCE2.a
%{_mingw32_includedir}/pthread


%changelog
* Tue Jan 13 2009 Richard W.M. Jones <rjones at redhat.com> - 2.8.0-4
- Cleanup to the spec file, no functional changes.

* Mon Dec 29 2008 Levente Farkas <lfarkas at lfarkas.org> - 2.8.0-3
- minor cleanup

* Fri Oct 10 2008 Richard W.M. Jones <rjones at redhat.com> - 2.8.0-2
- Initial RPM release.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-pthreads/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	13 Jan 2009 20:35:51 -0000	1.1
+++ .cvsignore	14 Jan 2009 09:50:55 -0000	1.2
@@ -0,0 +1 @@
+pthreads-w32-2-8-0-release.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-pthreads/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	13 Jan 2009 20:35:51 -0000	1.1
+++ sources	14 Jan 2009 09:50:55 -0000	1.2
@@ -0,0 +1 @@
+6d30c693233b1464ef8983fedd8ccb22  pthreads-w32-2-8-0-release.tar.gz



From alexlan at fedoraproject.org  Wed Jan 14 09:51:50 2009
From: alexlan at fedoraproject.org (Alex Lancaster)
Date: Wed, 14 Jan 2009 09:51:50 +0000 (UTC)
Subject: rpms/osmo/devel osmo.spec,1.9,1.10
Message-ID: <20090114095150.B27FE70136@cvs1.fedora.phx.redhat.com>

Author: alexlan

Update of /cvs/pkgs/rpms/osmo/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14166

Modified Files:
	osmo.spec 
Log Message:
* Wed Jan 14 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 0.2.4-3
- Disable libsyncml until version with support for new syncml 0.5.0 is
  released (#479954)



Index: osmo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/osmo/devel/osmo.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- osmo.spec	14 Dec 2008 16:12:32 -0000	1.9
+++ osmo.spec	14 Jan 2009 09:51:20 -0000	1.10
@@ -2,7 +2,7 @@
 Summary(pl):	Osobisty organizer
 Name:		osmo
 Version:	0.2.4
-Release:	2%{?dist}
+Release:	3%{?dist}
 License:	GPLv2+
 Group:		Applications/Productivity
 URL:		http://clay.ll.pl/osmo/
@@ -21,7 +21,7 @@
 BuildRequires:	libical-devel
 BuildRequires:	libgringotts-devel
 BuildRequires:	libnotify-devel
-BuildRequires:	libsyncml-devel
+#BuildRequires:	libsyncml-devel
 BuildRequires:	libxml2-devel
 
 %description
@@ -44,7 +44,10 @@
 %patch0 -p1
 
 %build
-%configure --with-gringrotts --with-libical --with-libsyncml
+%configure --with-gringrotts --with-libical 
+# disable until release with support for syncml 0.5.0 is released
+# see: http://bugzilla.redhat.com/show_bug.cgi?id
+# --with-libsyncml
 make %{?_smp_mflags}
 
 %install
@@ -99,6 +102,10 @@
 %{_mandir}/man1/%{name}.1*
 
 %changelog
+* Wed Jan 14 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 0.2.4-3
+- Disable libsyncml until version with support for new syncml 0.5.0 is
+  released (#479954)
+
 * Sun Dec 14 2008 Debarshi Ray <rishi at fedoraproject.org> - 0.2.4-2
 - Fixed crash due to SIGABRT using patch written by Tomasz Maka.
 



From denis at fedoraproject.org  Wed Jan 14 10:00:38 2009
From: denis at fedoraproject.org (Denis Leroy)
Date: Wed, 14 Jan 2009 10:00:38 +0000 (UTC)
Subject: rpms/libnotifymm/F-9 libnotifymm-0.6.1-closesig.patch, NONE,
	1.1 libnotifymm-0.6.1-pkgconfig.patch, NONE,
	1.1 libnotifymm.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090114100038.5D79770136@cvs1.fedora.phx.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/libnotifymm/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15053

Modified Files:
	.cvsignore sources 
Added Files:
	libnotifymm-0.6.1-closesig.patch 
	libnotifymm-0.6.1-pkgconfig.patch libnotifymm.spec 
Log Message:
Initial version, based on F-10 spec

libnotifymm-0.6.1-closesig.patch:

--- NEW FILE libnotifymm-0.6.1-closesig.patch ---
diff -ru --exclude 'Makefile*' libnotifymm-0.6.1/libnotify/libnotifymm/notification.cc libnotifymm-0.6.1/libnotify/libnotifymm/notification.cc
--- libnotifymm-0.6.1/libnotify/libnotifymm/notification.cc	2008-03-26 11:47:06.000000000 +0100
+++ libnotifymm-0.6.1/libnotify/libnotifymm/notification.cc	2008-09-05 10:53:29.000000000 +0200
@@ -100,11 +100,35 @@
 {
 
 
+static void Notification_signal_closed_callback(NotifyNotification* self, gint p0,void* data)
+{
+  using namespace Notify;
+  typedef sigc::slot< void,gint > SlotType;
+
+  // Do not try to call a signal on a disassociated wrapper.
+  if(Glib::ObjectBase::_get_current_wrapper((GObject*) self))
+  {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
+    try
+    {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
+      if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot(data))
+        (*static_cast<SlotType*>(slot))(p0);
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
+    }
+    catch(...)
+    {
+      Glib::exception_handlers_invoke();
+    }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
+  }
+}
+
 static const Glib::SignalProxyInfo Notification_signal_closed_info =
 {
   "closed",
-  (GCallback) &Glib::SignalProxyNormal::slot0_void_callback,
-  (GCallback) &Glib::SignalProxyNormal::slot0_void_callback
+  (GCallback) &Notification_signal_closed_callback,
+  (GCallback) &Notification_signal_closed_callback
 };
 
 
@@ -173,7 +197,7 @@
 #endif //GLIBMM_VFUNCS_ENABLED
 
 #ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
-void Notification_Class::closed_callback(NotifyNotification* self)
+void Notification_Class::closed_callback(NotifyNotification* self, gint p0)
 {
   Glib::ObjectBase *const obj_base = static_cast<Glib::ObjectBase*>(
       Glib::ObjectBase::_get_current_wrapper((GObject*)self));
@@ -193,7 +217,7 @@
       {
       #endif //GLIBMM_EXCEPTIONS_ENABLED
         // Call the virtual member method, which derived classes might override.
-        obj->on_closed();
+        obj->on_closed(p0);
         return;
       #ifdef GLIBMM_EXCEPTIONS_ENABLED
       }
@@ -211,7 +235,7 @@
 
   // Call the original underlying C function:
   if(base && base->closed)
-    (*base->closed)(self);
+    (*base->closed)(self, p0);
 }
 #endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
@@ -389,9 +413,9 @@
 }
 
 
-Glib::SignalProxy0< void > Notification::signal_closed()
+Glib::SignalProxy1< void,gint > Notification::signal_closed()
 {
-  return Glib::SignalProxy0< void >(this, &Notification_signal_closed_info);
+  return Glib::SignalProxy1< void,gint >(this, &Notification_signal_closed_info);
 }
 
 
@@ -467,14 +491,14 @@
 
 
 #ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
-void Notify::Notification::on_closed()
+void Notify::Notification::on_closed(gint reason)
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
       g_type_class_peek_parent(G_OBJECT_GET_CLASS(gobject_)) // Get the parent class of the object class (The original underlying C class).
   );
 
   if(base && base->closed)
-    (*base->closed)(gobj());
+    (*base->closed)(gobj(),reason);
 }
 #endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
diff -ru --exclude 'Makefile*' libnotifymm-0.6.1/libnotify/libnotifymm/notification.h libnotifymm-0.6.1/libnotify/libnotifymm/notification.h
--- libnotifymm-0.6.1/libnotify/libnotifymm/notification.h	2008-03-26 11:47:06.000000000 +0100
+++ libnotifymm-0.6.1/libnotify/libnotifymm/notification.h	2008-09-05 10:52:55.000000000 +0200
@@ -329,10 +329,10 @@
   
   /**
    * @par Prototype:
-   * <tt>void on_my_%closed()</tt>
+   * <tt>void on_my_%closed(gint reason)</tt>
    */
 
-  Glib::SignalProxy0< void > signal_closed();
+  Glib::SignalProxy1< void,gint > signal_closed();
 ;
   
   //gtkmmproc error: id : property defs lookup failed.
@@ -451,7 +451,7 @@
 
   //Default Signal Handlers::
 #ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
-  virtual void on_closed();
+  virtual void on_closed(gint reason);
 #endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
diff -ru --exclude 'Makefile*' libnotifymm-0.6.1/libnotify/libnotifymm/private/notification_p.h libnotifymm-0.6.1/libnotify/libnotifymm/private/notification_p.h
--- libnotifymm-0.6.1/libnotify/libnotifymm/private/notification_p.h	2007-09-25 12:02:03.000000000 +0200
+++ libnotifymm-0.6.1/libnotify/libnotifymm/private/notification_p.h	2008-09-05 10:53:29.000000000 +0200
@@ -36,7 +36,7 @@
   //Callbacks (default signal handlers):
   //These will call the *_impl member methods, which will then call the existing default signal callbacks, if any.
   //You could prevent the original default signal handlers being called by overriding the *_impl method.
-  static void closed_callback(NotifyNotification* self);
+  static void closed_callback(NotifyNotification* self, gint p0);
 #endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
   //Callbacks (virtual functions):

libnotifymm-0.6.1-pkgconfig.patch:

--- NEW FILE libnotifymm-0.6.1-pkgconfig.patch ---
--- libnotifymm-0.6.1/libnotify/libnotifymm-1.0.pc.in.orig	2008-09-05 11:27:22.000000000 +0200
+++ libnotifymm-0.6.1/libnotify/libnotifymm-1.0.pc.in	2008-09-05 11:27:35.000000000 +0200
@@ -5,7 +5,7 @@
 
 Name: libnotifymm
 Description: C++ wrapper for libnotify
-Requires: glibmm-2.4 libnotify
+Requires: gtkmm-2.4 libnotify
 Version: @VERSION@
 Libs: -L${libdir} -lnotifymm-1.0
 Cflags: -I${includedir}/libnotifymm-1.0 -I${libdir}/libnotifymm-1.0/include


--- NEW FILE libnotifymm.spec ---
%define apiver 1.0
%define docdeveldir %{_docdir}/%{name}-devel-%{version}

Name:           libnotifymm
Version:        0.6.1
Release:        1%{?dist}
Summary:        C++ interface for libnotify

Group:          System Environment/Libraries
License:        LGPLv2+
URL:            http://gtkmm.sourceforge.net/
Source0:        http://ftp.gnome.org/pub/GNOME/sources/libnotifymm/0.6/%{name}-%{version}.tar.bz2
Patch0:         libnotifymm-0.6.1-closesig.patch
Patch1:         libnotifymm-0.6.1-pkgconfig.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  glibmm24-devel >= 2.12.8
BuildRequires:  gtkmm24-devel >= 2.10
BuildRequires:  libnotify-devel >= 0.4.3
BuildRequires:  doxygen graphviz


%description
libnotifymm provides a C++ interface to the libnotify
library. Highlights include typesafe callbacks, widgets extensible via
inheritance and a comprehensive set of widget classes that can be
freely combined to quickly create complex user interfaces.


%package devel
Summary:        Headers for developing programs that will use %{name}
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}
Requires:       gtkmm24-devel
Requires:       libnotify-devel
Requires:       pkgconfig


%description devel
This package contains the libraries and header files needed for
developing %{name} applications.


%prep
%setup -q
%patch0 -p1 -b .signalsig
%patch1 -p1 -b .pkgconfig


%build
%configure --disable-static --enable-reference --disable-dependency-tracking
sed -i -e 's! -shared ! -Wl,--as-needed\0!g' libtool
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" \
        referencedir=%{docdeveldir}/html
find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
# Remove code-generation related files
rm -rf $RPM_BUILD_ROOT%{_libdir}/%{name}-%{apiver}


%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}/*.so.*


%files devel
%defattr(-, root, root, -)
%doc %{docdeveldir}/html
%{_includedir}/%{name}-%{apiver}
%{_libdir}/*.so
%{_libdir}/pkgconfig/*.pc


%changelog
* Wed Jan 14 2009 Denis Leroy <denis at poolshark.org> - 0.6.1-1
- Initial version, based on F-10 spec



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libnotifymm/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	25 Dec 2008 00:38:00 -0000	1.1
+++ .cvsignore	14 Jan 2009 10:00:07 -0000	1.2
@@ -0,0 +1 @@
+libnotifymm-0.6.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libnotifymm/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	25 Dec 2008 00:38:00 -0000	1.1
+++ sources	14 Jan 2009 10:00:08 -0000	1.2
@@ -0,0 +1 @@
+e7943688768aed3c695b1643448274c5  libnotifymm-0.6.1.tar.bz2



From denis at fedoraproject.org  Wed Jan 14 10:07:58 2009
From: denis at fedoraproject.org (Denis Leroy)
Date: Wed, 14 Jan 2009 10:07:58 +0000 (UTC)
Subject: rpms/libnotifymm/F-9 libnotifymm.spec, 1.1,
	1.2 libnotifymm-0.6.1-closesig.patch, 1.1, NONE
Message-ID: <20090114100758.0C60870136@cvs1.fedora.phx.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/libnotifymm/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16016

Modified Files:
	libnotifymm.spec 
Removed Files:
	libnotifymm-0.6.1-closesig.patch 
Log Message:
Removed closesig patch


Index: libnotifymm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libnotifymm/F-9/libnotifymm.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libnotifymm.spec	14 Jan 2009 10:00:08 -0000	1.1
+++ libnotifymm.spec	14 Jan 2009 10:07:27 -0000	1.2
@@ -10,7 +10,6 @@
 License:        LGPLv2+
 URL:            http://gtkmm.sourceforge.net/
 Source0:        http://ftp.gnome.org/pub/GNOME/sources/libnotifymm/0.6/%{name}-%{version}.tar.bz2
-Patch0:         libnotifymm-0.6.1-closesig.patch
 Patch1:         libnotifymm-0.6.1-pkgconfig.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -43,7 +42,6 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .signalsig
 %patch1 -p1 -b .pkgconfig
 
 


--- libnotifymm-0.6.1-closesig.patch DELETED ---



From kanarip at fedoraproject.org  Wed Jan 14 10:08:06 2009
From: kanarip at fedoraproject.org (Jeroen van Meeuwen)
Date: Wed, 14 Jan 2009 10:08:06 +0000 (UTC)
Subject: rpms/sysklogd/devel import.log, 1.6, 1.7 sysklogd-1.5.init, 1.1,
	1.2 sysklogd.spec, 1.66, 1.67
Message-ID: <20090114100806.9151770136@cvs1.fedora.phx.redhat.com>

Author: kanarip

Update of /cvs/pkgs/rpms/sysklogd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16083/devel

Modified Files:
	import.log sysklogd-1.5.init sysklogd.spec 
Log Message:
1.5-7


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/sysklogd/devel/import.log,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- import.log	25 Dec 2008 13:02:47 -0000	1.6
+++ import.log	14 Jan 2009 10:07:36 -0000	1.7
@@ -4,3 +4,4 @@
 sysklogd-1_5-4_fc10:HEAD:sysklogd-1.5-4.fc10.src.rpm:1229174543
 sysklogd-1_5-5_fc10:HEAD:sysklogd-1.5-5.fc10.src.rpm:1229174791
 sysklogd-1_5-6_fc10:HEAD:sysklogd-1.5-6.fc10.src.rpm:1230210148
+sysklogd-1_5-7_fc10:HEAD:sysklogd-1.5-7.fc10.src.rpm:1231927636


Index: sysklogd-1.5.init
===================================================================
RCS file: /cvs/pkgs/rpms/sysklogd/devel/sysklogd-1.5.init,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sysklogd-1.5.init	24 Aug 2008 20:25:54 -0000	1.1
+++ sysklogd-1.5.init	14 Jan 2009 10:07:36 -0000	1.2
@@ -3,7 +3,7 @@
 # sysklogd        Starts syslogd/klogd.
 #
 #
-# chkconfig: - 2345 12 88
+# chkconfig: 2345 12 88
 # description: Syslog is the facility by which many daemons use to log \
 # messages to various system log files.  It is a good idea to always \
 # run syslog.


Index: sysklogd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sysklogd/devel/sysklogd.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- sysklogd.spec	25 Dec 2008 13:02:47 -0000	1.66
+++ sysklogd.spec	14 Jan 2009 10:07:36 -0000	1.67
@@ -1,7 +1,7 @@
 Summary: System logging and kernel message trapping daemons
 Name: sysklogd
 Version: 1.5
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 URL: http://www.infodrom.org/projects/sysklogd/
@@ -125,6 +125,9 @@
 #%{_includedir}/sysklogd/*
 
 %changelog
+* Wed Jan 14 2009 Jeroen van Meeuwen <kanarip at kanarip.com> - 1.5-7
+Fix chkconfig line (#478794)
+
 * Thu Dec 25 2008 Jeroen van Meeuwen <kanarip at fedoraproject.org> - 1.5-6
 - XMas build
 - Fix chkconfig service syslog -> chkconfig service sysklogd



From kanarip at fedoraproject.org  Wed Jan 14 10:09:07 2009
From: kanarip at fedoraproject.org (Jeroen van Meeuwen)
Date: Wed, 14 Jan 2009 10:09:07 +0000 (UTC)
Subject: rpms/sysklogd/F-10 import.log, 1.5, 1.6 sysklogd-1.5.init, 1.1,
	1.2 sysklogd.spec, 1.65, 1.66
Message-ID: <20090114100907.6926170136@cvs1.fedora.phx.redhat.com>

Author: kanarip

Update of /cvs/pkgs/rpms/sysklogd/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16378/F-10

Modified Files:
	import.log sysklogd-1.5.init sysklogd.spec 
Log Message:
1.5-7


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/sysklogd/F-10/import.log,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- import.log	25 Dec 2008 13:03:48 -0000	1.5
+++ import.log	14 Jan 2009 10:08:37 -0000	1.6
@@ -3,3 +3,4 @@
 sysklogd-1_5-4_fc10:F-10:sysklogd-1.5-4.fc10.src.rpm:1229174613
 sysklogd-1_5-5_fc10:F-10:sysklogd-1.5-5.fc10.src.rpm:1229174862
 sysklogd-1_5-6_fc10:F-10:sysklogd-1.5-6.fc10.src.rpm:1230210209
+sysklogd-1_5-7_fc10:F-10:sysklogd-1.5-7.fc10.src.rpm:1231927696


Index: sysklogd-1.5.init
===================================================================
RCS file: /cvs/pkgs/rpms/sysklogd/F-10/sysklogd-1.5.init,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sysklogd-1.5.init	24 Aug 2008 20:25:54 -0000	1.1
+++ sysklogd-1.5.init	14 Jan 2009 10:08:37 -0000	1.2
@@ -3,7 +3,7 @@
 # sysklogd        Starts syslogd/klogd.
 #
 #
-# chkconfig: - 2345 12 88
+# chkconfig: 2345 12 88
 # description: Syslog is the facility by which many daemons use to log \
 # messages to various system log files.  It is a good idea to always \
 # run syslog.


Index: sysklogd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sysklogd/F-10/sysklogd.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- sysklogd.spec	25 Dec 2008 13:03:48 -0000	1.65
+++ sysklogd.spec	14 Jan 2009 10:08:37 -0000	1.66
@@ -1,7 +1,7 @@
 Summary: System logging and kernel message trapping daemons
 Name: sysklogd
 Version: 1.5
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 URL: http://www.infodrom.org/projects/sysklogd/
@@ -125,6 +125,9 @@
 #%{_includedir}/sysklogd/*
 
 %changelog
+* Wed Jan 14 2009 Jeroen van Meeuwen <kanarip at kanarip.com> - 1.5-7
+Fix chkconfig line (#478794)
+
 * Thu Dec 25 2008 Jeroen van Meeuwen <kanarip at fedoraproject.org> - 1.5-6
 - XMas build
 - Fix chkconfig service syslog -> chkconfig service sysklogd



From rjones at fedoraproject.org  Wed Jan 14 10:18:57 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Wed, 14 Jan 2009 10:18:57 +0000 (UTC)
Subject: rpms/mingw32-filesystem/devel mingw32-filesystem.spec,1.8,1.9
Message-ID: <20090114101857.C036970136@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/mingw32-filesystem/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18333

Modified Files:
	mingw32-filesystem.spec 
Log Message:
Add pseudo-provides secur32.dll


Index: mingw32-filesystem.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-filesystem/devel/mingw32-filesystem.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- mingw32-filesystem.spec	18 Dec 2008 10:53:30 -0000	1.8
+++ mingw32-filesystem.spec	14 Jan 2009 10:18:27 -0000	1.9
@@ -44,6 +44,7 @@
 Provides:       mingw32(user32.dll)
 Provides:       mingw32(wldap32.dll)
 Provides:       mingw32(glut32.dll)
+Provides:       mingw32(secur32.dll)
 
 
 %description
@@ -144,6 +145,9 @@
 
 
 %changelog
+* Wed Jan 14 2009 Richard W.M. Jones <rjones at redhat.com> - 42-1
+- Add pseudo-provides secur32.dll
+
 * Wed Dec 17 2008 Levente Farkas <lfarkas at lfarkas.org> - 41-1
 - Re-add mingw32-make
 



From rjones at fedoraproject.org  Wed Jan 14 10:18:59 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Wed, 14 Jan 2009 10:18:59 +0000 (UTC)
Subject: rpms/mingw32-filesystem/F-10 mingw32-filesystem.spec,1.7,1.8
Message-ID: <20090114101859.7DE5F70136@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/mingw32-filesystem/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18355

Modified Files:
	mingw32-filesystem.spec 
Log Message:
Add pseudo-provides secur32.dll


Index: mingw32-filesystem.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-filesystem/F-10/mingw32-filesystem.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- mingw32-filesystem.spec	6 Dec 2008 14:33:40 -0000	1.7
+++ mingw32-filesystem.spec	14 Jan 2009 10:18:29 -0000	1.8
@@ -2,7 +2,7 @@
 
 Name:           mingw32-filesystem
 Version:        40
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        MinGW base filesystem and environment
 
 Group:          Development/Libraries
@@ -44,6 +44,7 @@
 Provides:       mingw32(user32.dll)
 Provides:       mingw32(wldap32.dll)
 Provides:       mingw32(glut32.dll)
+Provides:       mingw32(secur32.dll)
 
 
 %description
@@ -143,6 +144,9 @@
 
 
 %changelog
+* Wed Jan 14 2009 Richard W.M. Jones <rjones at redhat.com> - 40-3
+- Add pseudo-provides secur32.dll
+
 * Sat Dec  6 2008 Levente Farkas <lfarkas at lfarkas.org> - 40-2
 - Rewrite mingw32-scripts to run in the current shell
 - (Re-add mingw32-make) - Removed by RWMJ.



From rjones at fedoraproject.org  Wed Jan 14 10:19:00 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Wed, 14 Jan 2009 10:19:00 +0000 (UTC)
Subject: rpms/mingw32-filesystem/EL-5 mingw32-filesystem.spec,1.9,1.10
Message-ID: <20090114101900.8F6AE70136@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/mingw32-filesystem/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18376

Modified Files:
	mingw32-filesystem.spec 
Log Message:
Add pseudo-provides secur32.dll


Index: mingw32-filesystem.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-filesystem/EL-5/mingw32-filesystem.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- mingw32-filesystem.spec	6 Dec 2008 14:33:40 -0000	1.9
+++ mingw32-filesystem.spec	14 Jan 2009 10:18:30 -0000	1.10
@@ -2,7 +2,7 @@
 
 Name:           mingw32-filesystem
 Version:        40
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        MinGW base filesystem and environment
 
 Group:          Development/Libraries
@@ -44,6 +44,7 @@
 Provides:       mingw32(user32.dll)
 Provides:       mingw32(wldap32.dll)
 Provides:       mingw32(glut32.dll)
+Provides:       mingw32(secur32.dll)
 
 
 %description
@@ -143,6 +144,9 @@
 
 
 %changelog
+* Wed Jan 14 2009 Richard W.M. Jones <rjones at redhat.com> - 40-3
+- Add pseudo-provides secur32.dll
+
 * Sat Dec  6 2008 Levente Farkas <lfarkas at lfarkas.org> - 40-2
 - Rewrite mingw32-scripts to run in the current shell
 - (Re-add mingw32-make) - Removed by RWMJ.



From rjones at fedoraproject.org  Wed Jan 14 10:20:33 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Wed, 14 Jan 2009 10:20:33 +0000 (UTC)
Subject: rpms/mingw32-filesystem/devel mingw32-filesystem.spec,1.9,1.10
Message-ID: <20090114102033.D5FA370136@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/mingw32-filesystem/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18716

Modified Files:
	mingw32-filesystem.spec 
Log Message:
Add pseudo-provides secur32.dll


Index: mingw32-filesystem.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-filesystem/devel/mingw32-filesystem.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- mingw32-filesystem.spec	14 Jan 2009 10:18:27 -0000	1.9
+++ mingw32-filesystem.spec	14 Jan 2009 10:20:03 -0000	1.10
@@ -1,7 +1,7 @@
 %define debug_package %{nil}
 
 Name:           mingw32-filesystem
-Version:        41
+Version:        42
 Release:        1%{?dist}
 Summary:        MinGW base filesystem and environment
 



From denis at fedoraproject.org  Wed Jan 14 10:20:35 2009
From: denis at fedoraproject.org (Denis Leroy)
Date: Wed, 14 Jan 2009 10:20:35 +0000 (UTC)
Subject: rpms/libnotifymm/devel libnotifymm.spec, 1.2,
	1.3 libnotifymm-0.6.1-closesig.patch, 1.1, NONE
Message-ID: <20090114102035.760D170136@cvs1.fedora.phx.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/libnotifymm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18737

Modified Files:
	libnotifymm.spec 
Removed Files:
	libnotifymm-0.6.1-closesig.patch 
Log Message:
Removed closesig patch


Index: libnotifymm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libnotifymm/devel/libnotifymm.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- libnotifymm.spec	14 Jan 2009 09:36:26 -0000	1.2
+++ libnotifymm.spec	14 Jan 2009 10:20:05 -0000	1.3
@@ -3,14 +3,13 @@
 
 Name:           libnotifymm
 Version:        0.6.1
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        C++ interface for libnotify
 
 Group:          System Environment/Libraries
 License:        LGPLv2+
 URL:            http://gtkmm.sourceforge.net/
 Source0:        http://ftp.gnome.org/pub/GNOME/sources/libnotifymm/0.6/%{name}-%{version}.tar.bz2
-Patch0:         libnotifymm-0.6.1-closesig.patch
 Patch1:         libnotifymm-0.6.1-pkgconfig.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -43,7 +42,6 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .signalsig
 %patch1 -p1 -b .pkgconfig
 
 
@@ -87,6 +85,9 @@
 
 
 %changelog
+* Wed Jan 14 2009 Denis Leroy <denis at poolshark.org> - 0.6.1-4
+- Removed closesig patch
+
 * Fri Dec 26 2008 Denis Leroy <denis at poolshark.org> - 0.6.1-3
 - Added sed line to quiet rpmlint
 


--- libnotifymm-0.6.1-closesig.patch DELETED ---



From jwrdegoede at fedoraproject.org  Wed Jan 14 10:53:38 2009
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Wed, 14 Jan 2009 10:53:38 +0000 (UTC)
Subject: rpms/DevIL/devel DevIL-1.7.5-CVE-2008-5262.patch, NONE,
	1.1 DevIL-1.7.5-allegropicfix.patch, NONE,
	1.1 DevIL-1.7.5-il_endian_h.patch, NONE, 1.1 .cvsignore, 1.3,
	1.4 DevIL.spec, 1.9, 1.10 sources, 1.3,
	1.4 DevIL-1.6.8-rc2-allegropicfix.patch, 1.1,
	NONE DevIL-1.6.8-rc2-gcc43headerfix.patch, 1.1,
	NONE DevIL-1.6.8-rc2-il_endian_h.patch, 1.1,
	NONE DevIL-1.6.8-rc2-il_io_c.patch, 1.1,
	NONE DevIL-1.6.8-rc2-il_wrap_h.patch, 1.1,
	NONE DevIL-1.6.8-rc2-ilu_region.patch, 1.1,
	NONE DevIL-1.6.8-rc2-ilut_h.patch, 1.1, NONE
Message-ID: <20090114105338.3ACF270136@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/DevIL/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22621

Modified Files:
	.cvsignore DevIL.spec sources 
Added Files:
	DevIL-1.7.5-CVE-2008-5262.patch 
	DevIL-1.7.5-allegropicfix.patch DevIL-1.7.5-il_endian_h.patch 
Removed Files:
	DevIL-1.6.8-rc2-allegropicfix.patch 
	DevIL-1.6.8-rc2-gcc43headerfix.patch 
	DevIL-1.6.8-rc2-il_endian_h.patch 
	DevIL-1.6.8-rc2-il_io_c.patch DevIL-1.6.8-rc2-il_wrap_h.patch 
	DevIL-1.6.8-rc2-ilu_region.patch DevIL-1.6.8-rc2-ilut_h.patch 
Log Message:
* Tue Jan 13 2009 Hans de Goede <hdegoede at redhat.com> 1.7.5-1
- Update to latest upstream: 1.7.5
- Add patch to fix CVE-2008-5262


DevIL-1.7.5-CVE-2008-5262.patch:

--- NEW FILE DevIL-1.7.5-CVE-2008-5262.patch ---
--- DevIL-1.6.8/src-IL/src/il_hdr.c	2008/12/15 05:27:55	1.17
+++ DevIL-1.6.8/src-IL/src/il_hdr.c	2009/01/09 22:11:02	1.18
@@ -85,7 +85,7 @@
 	if (iread(&a, 1, 1) != 1)
 		return IL_FALSE;
 
-	while(!done) {
+	while (!done) {
 		if (iread(&b, 1, 1) != 1)
 			return IL_FALSE;
 		if (b == '\n' && a == '\n')
@@ -98,6 +98,10 @@
 	if (iread(&a, 1, 1) != 1)
 		return IL_FALSE;
 	while (a != '\n') {
+		if (count >= 80) {  // Line shouldn't be this long at all.
+			ilSetError(IL_INVALID_FILE_HEADER);
+			return IL_FALSE;
+		}
 		buff[count] = a;
 		if (iread(&a, 1, 1) != 1)
 			return IL_FALSE;
@@ -113,8 +117,9 @@
 	//nothing that really changes the appearance of the loaded image...
 	//(The code as it is now assumes that y contains "-Y" and x contains
 	//"+X" after the following line)
-	//Furthermore, this crashes if the read strings are longer than 2 chars o_O
-	sscanf(buff, "%s %d %s %d", y, &Header->Height, x, &Header->Width);
+	
+	// The 2 has to be in the %s format specifier to prevent buffer overruns.
+	sscanf(buff, "%2s %d %2s %d", y, &Header->Height, x, &Header->Width);
 
 	return IL_TRUE;
 }

DevIL-1.7.5-allegropicfix.patch:

--- NEW FILE DevIL-1.7.5-allegropicfix.patch ---
diff -up devil-1.7.5/configure~ devil-1.7.5/configure
--- devil-1.7.5/configure~	2009-01-13 20:36:43.000000000 +0100
+++ devil-1.7.5/configure	2009-01-13 20:36:43.000000000 +0100
@@ -21763,7 +21763,7 @@ echo $ECHO_N "checking for Allegro - ver
     no_allegro=yes
   else
     allegro_CFLAGS=`$ALLEGRO_CONFIG $ALLEGRO_CONFIG_args --cflags`
-    allegro_LIBS=`$ALLEGRO_CONFIG $ALLEGRO_CONFIG_args --libs`
+    allegro_LIBS=`$ALLEGRO_CONFIG $ALLEGRO_CONFIG_args --libs | sed 's/-lalleg_unsharable//'`
     ALLEGRO_CONFIG_major_version=`$ALLEGRO_CONFIG $ALLEGRO_CONFIG_args --version | \
            sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'`
     ALLEGRO_CONFIG_minor_version=`$ALLEGRO_CONFIG $ALLEGRO_CONFIG_args --version | \

DevIL-1.7.5-il_endian_h.patch:

--- NEW FILE DevIL-1.7.5-il_endian_h.patch ---
--- DevIL-1.6.8/src-IL/include/il_endian.h.orig	2006-12-21 03:40:57.000000000 +0000
+++ DevIL-1.6.8/src-IL/include/il_endian.h	2006-12-21 03:33:34.000000000 +0000
@@ -15,6 +15,10 @@
 
 #include "il_internal.h"
 
+#ifdef GCC_X86_ASM
+#include <byteswap.h>
+#endif
+
 #ifdef WORDS_BIGENDIAN //this is defined by ./configure
 	#ifndef __BIG_ENDIAN__
 	#define __BIG_ENDIAN__
@@ -101,9 +105,7 @@
 		}
 	#else
 	#ifdef GCC_X86_ASM
-		asm("ror $8,%0"
-			: 
-			: "r"  (*s) );
+		*s = __bswap_16(*s);
 	#else
 		*s = ((*s)>>8) | ((*s)<<8);
 	#endif //GCC_X86_ASM
@@ -124,8 +126,7 @@
 		}
 	#else
 	#ifdef GCC_X86_ASM
-			asm("bswap  %0;"
-				: "=r" (*i) );
+		*i = __bswap_32(*i);
 	#else
 		*i = ((*i)>>24) | (((*i)>>8) & 0xff00) | (((*i)<<8) & 0xff0000) | ((*i)<<24);
 	#endif //GCC_X86_ASM


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/DevIL/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	7 Sep 2006 22:01:24 -0000	1.3
+++ .cvsignore	14 Jan 2009 10:53:07 -0000	1.4
@@ -1 +1 @@
-DevIL-1.6.8-rc2.tar.bz2
+DevIL-1.7.5.tar.gz


Index: DevIL.spec
===================================================================
RCS file: /cvs/extras/rpms/DevIL/devel/DevIL.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- DevIL.spec	19 Feb 2008 16:34:16 -0000	1.9
+++ DevIL.spec	14 Jan 2009 10:53:07 -0000	1.10
@@ -1,28 +1,25 @@
 Name:           DevIL
-Version:        1.6.8
-Release:        0.15.rc2%{?dist}
+Version:        1.7.5
+Release:        1%{?dist}
 Summary:        A cross-platform image library
 Group:          System Environment/Libraries
 License:        LGPLv2
 URL:            http://openil.sourceforge.net/
-Source0:        http://downloads.sourceforge.net/openil/%{name}-%{version}-rc2.tar.bz2
-Patch0:         %{name}-1.6.8-rc2-allegropicfix.patch
-Patch1:         %{name}-1.6.8-rc2-ilut_h.patch
-Patch2:         %{name}-1.6.8-rc2-il_wrap_h.patch
-Patch3:         %{name}-1.6.8-rc2-ilu_region.patch
-Patch4:         %{name}-1.6.8-rc2-il_endian_h.patch
-Patch5:         %{name}-1.6.8-rc2-il_io_c.patch
-Patch6:         %{name}-1.6.8-rc2-gcc43headerfix.patch
+Source0:        http://downloads.sourceforge.net/openil/%{name}-%{version}.tar.gz
+Patch0:         DevIL-1.7.5-allegropicfix.patch
+Patch1:         DevIL-1.7.5-il_endian_h.patch
+Patch2:         DevIL-1.7.5-CVE-2008-5262.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  allegro-devel
 BuildRequires:  lcms-devel
 BuildRequires:  libGLU-devel
 BuildRequires:  libICE-devel
+BuildRequires:  libXext-devel
 BuildRequires:  libjpeg-devel
 BuildRequires:  libmng-devel
 BuildRequires:  libpng-devel
 BuildRequires:  libtiff-devel
-BuildRequires:  libtool
+BuildRequires:  jasper-devel
 BuildRequires:  SDL-devel => 1.2.5
 
 %description
@@ -38,6 +35,8 @@
 Summary:        Development files for DevIL
 Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
+Requires(post): info
+Requires(preun): info
 
 %description devel
 Development files for DevIL
@@ -65,44 +64,27 @@
 
 
 %prep
-%setup -q
+%setup -q -n devil-%{version}
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-
-# Convert to UTF8
-iconv -f iso8859-1 CREDITS -t utf8 > CREDITS.conv \
-    && /bin/mv -f CREDITS.conv CREDITS
+iconv -f iso8859-1 CREDITS -t utf8 > CREDITS.conv
+touch -r CREDITS CREDITS.conv
+mv CREDITS.conv CREDITS
 
 
 %build
-%configure
-make %{?_smp_mflags} LIBTOOL=%{_bindir}/libtool
+%configure --enable-ILU --enable-ILUT --disable-static --disable-allegrotest
+sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
+sed -i 's|LD_RUN_PATH|DIE_RPATH_DIE|g' libtool
+make %{?_smp_mflags}
 
 
 %install
 rm -rf %{buildroot}
 make install DESTDIR=%{buildroot}
-
-#Some cleanups
-rm -f %{buildroot}%{_libdir}/*.la
-rm -f %{buildroot}%{_libdir}/*.a
-
-#Replace autoconf generated config.h to avoid potential define collisions
-cat >%{buildroot}%{_includedir}/IL/config.h <<EOF
-/* Support Allegro API */
-#define ILUT_USE_ALLEGRO
-
-/* Support OpenGL API */
-#define ILUT_USE_OPENGL
-
-/* Support SDL API */
-#define ILUT_USE_SDL
-EOF
+rm %{buildroot}%{_libdir}/*.la
+rm %{buildroot}%{_infodir}/dir
 
 
 %clean
@@ -112,6 +94,12 @@
 %post -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
 
+%post devel
+/sbin/install-info %{_infodir}/DevIL_manual.info %{_infodir}/dir 2> /dev/null || :
+%preun devel
+if [ $1 = 0 ] ; then
+  /sbin/install-info --delete %{_infodir}/DevIL_manual.info %{_infodir}/dir 2> /dev/null || :
+fi
 
 %post ILUT -p /sbin/ldconfig
 %postun ILUT -p /sbin/ldconfig
@@ -129,24 +117,29 @@
 %{_libdir}/libIL.so
 %{_libdir}/libILU.so
 %dir %{_includedir}/IL
-%{_includedir}/IL/devil_internal_exports.h
+%{_includedir}/IL/devil_cpp_wrapper.hpp
 %{_includedir}/IL/il.h
 %{_includedir}/IL/ilu.h
 %{_includedir}/IL/ilu_region.h
+%{_infodir}/DevIL_manual.info.gz
 
 
 %files ILUT
+%defattr(-,root,root,-)
 %{_libdir}/libILUT.so.*
 
 
 %files ILUT-devel
+%defattr(-,root,root,-)
 %{_libdir}/libILUT.so
-%{_includedir}/IL/config.h
 %{_includedir}/IL/ilut.h
-%{_includedir}/IL/il_wrap.h
 
 
 %changelog
+* Tue Jan 13 2009 Hans de Goede <hdegoede at redhat.com> 1.7.5-1
+- Update to latest upstream: 1.7.5
+- Add patch to fix CVE-2008-5262
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1.6.8-0.15.rc2
 - Autorebuild for GCC 4.3
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/DevIL/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	7 Sep 2006 22:01:24 -0000	1.3
+++ sources	14 Jan 2009 10:53:07 -0000	1.4
@@ -1 +1 @@
-444f1290a4688c4530b9d07a521da212  DevIL-1.6.8-rc2.tar.bz2
+2a74578507a21d75d7fcc5afd41444d0  DevIL-1.7.5.tar.gz


--- DevIL-1.6.8-rc2-allegropicfix.patch DELETED ---


--- DevIL-1.6.8-rc2-gcc43headerfix.patch DELETED ---


--- DevIL-1.6.8-rc2-il_endian_h.patch DELETED ---


--- DevIL-1.6.8-rc2-il_io_c.patch DELETED ---


--- DevIL-1.6.8-rc2-il_wrap_h.patch DELETED ---


--- DevIL-1.6.8-rc2-ilu_region.patch DELETED ---


--- DevIL-1.6.8-rc2-ilut_h.patch DELETED ---



From emunson at fedoraproject.org  Wed Jan 14 10:54:47 2009
From: emunson at fedoraproject.org (Eric Munson)
Date: Wed, 14 Jan 2009 10:54:47 +0000 (UTC)
Subject: rpms/libhugetlbfs/devel .cvsignore, 1.11, 1.12 import.log, 1.3,
	1.4 libhugetlbfs.spec, 1.20, 1.21 sources, 1.11, 1.12
Message-ID: <20090114105447.EF79C70136@cvs1.fedora.phx.redhat.com>

Author: emunson

Update of /cvs/pkgs/rpms/libhugetlbfs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22886/devel

Modified Files:
	.cvsignore import.log libhugetlbfs.spec sources 
Log Message:
Updating to libhugetlbfs 2.1.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libhugetlbfs/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	19 Dec 2008 11:00:54 -0000	1.11
+++ .cvsignore	14 Jan 2009 10:54:17 -0000	1.12
@@ -1 +1 @@
-libhugetlbfs-2.1.1.tar.gz
+libhugetlbfs-2.1.2.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/libhugetlbfs/devel/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- import.log	19 Dec 2008 11:00:54 -0000	1.3
+++ import.log	14 Jan 2009 10:54:17 -0000	1.4
@@ -1,3 +1,4 @@
 libhugetlbfs-2_0-1:HEAD:libhugetlbfs-2.0-1.src.rpm:1218744620
 libhugetlbfs-2_1-1_fc10:HEAD:libhugetlbfs-2.1-1.fc10.src.rpm:1228490213
 libhugetlbfs-2_1_1-1_fc10:HEAD:libhugetlbfs-2.1.1.src.rpm:1229684394
+libhugetlbfs-2_1_2-1_fc10:HEAD:libhugetlbfs-2.1.2.src.rpm:1231930438


Index: libhugetlbfs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libhugetlbfs/devel/libhugetlbfs.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- libhugetlbfs.spec	19 Dec 2008 11:00:54 -0000	1.20
+++ libhugetlbfs.spec	14 Jan 2009 10:54:17 -0000	1.21
@@ -1,5 +1,5 @@
 Name: libhugetlbfs
-Version: 2.1.1
+Version: 2.1.2
 Release: 1%{?dist}
 Summary: A library which provides easy access to huge pages of memory
 
@@ -92,6 +92,9 @@
 %{_mandir}/man1/pagesize.1.gz
 
 %changelog
+* Fri Dec 19 2008 Eric Munson <ebmunson at us.ibm.com> 2.1.2-1
+- Updating for libhugetlbfs-2.1.2 release
+
 * Fri Dec 19 2008 Eric Munson <ebmunson at us.ibm.com> 2.1.1-1
 - Updating for libhugetlbfs-2.1.1 release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libhugetlbfs/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	19 Dec 2008 11:00:54 -0000	1.11
+++ sources	14 Jan 2009 10:54:17 -0000	1.12
@@ -1 +1 @@
-547c7709163320b8bea250b679ffa86c  libhugetlbfs-2.1.1.tar.gz
+6dd879f378e4f788f6a7eac137ed0edd  libhugetlbfs-2.1.2.tar.gz



From hadess at fedoraproject.org  Wed Jan 14 10:55:56 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Wed, 14 Jan 2009 10:55:56 +0000 (UTC)
Subject: rpms/gstreamer-plugins-base/F-10 gstreamer-plugins-base.spec, 1.67, 
	1.68
Message-ID: <20090114105556.8224A70136@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/gstreamer-plugins-base/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23032

Modified Files:
	gstreamer-plugins-base.spec 
Log Message:
Fix build with newer Theora



Index: gstreamer-plugins-base.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamer-plugins-base/F-10/gstreamer-plugins-base.spec,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- gstreamer-plugins-base.spec	13 Jan 2009 18:45:36 -0000	1.67
+++ gstreamer-plugins-base.spec	14 Jan 2009 10:55:26 -0000	1.68
@@ -57,6 +57,8 @@
 %patch1 -p0 -b .pulse-hang
 
 %build
+# Fix build with newer Theoras
+sed -i 's/1.0alpha5/1.0RC1' configure
 %configure \
   --with-package-name='Fedora gstreamer-plugins-base package' \
   --with-package-origin='http://download.fedora.redhat.com/fedora' \



From jwrdegoede at fedoraproject.org  Wed Jan 14 10:56:32 2009
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Wed, 14 Jan 2009 10:56:32 +0000 (UTC)
Subject: rpms/DevIL/F-9 DevIL-1.7.5-CVE-2008-5262.patch, NONE,
	1.1 DevIL-1.7.5-allegropicfix.patch, NONE,
	1.1 DevIL-1.7.5-il_endian_h.patch, NONE, 1.1 .cvsignore, 1.3,
	1.4 DevIL.spec, 1.9, 1.10 sources, 1.3,
	1.4 DevIL-1.6.8-rc2-allegropicfix.patch, 1.1,
	NONE DevIL-1.6.8-rc2-gcc43headerfix.patch, 1.1,
	NONE DevIL-1.6.8-rc2-il_endian_h.patch, 1.1,
	NONE DevIL-1.6.8-rc2-il_io_c.patch, 1.1,
	NONE DevIL-1.6.8-rc2-il_wrap_h.patch, 1.1,
	NONE DevIL-1.6.8-rc2-ilu_region.patch, 1.1,
	NONE DevIL-1.6.8-rc2-ilut_h.patch, 1.1, NONE
Message-ID: <20090114105632.C40E270136@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/DevIL/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23311

Modified Files:
	.cvsignore DevIL.spec sources 
Added Files:
	DevIL-1.7.5-CVE-2008-5262.patch 
	DevIL-1.7.5-allegropicfix.patch DevIL-1.7.5-il_endian_h.patch 
Removed Files:
	DevIL-1.6.8-rc2-allegropicfix.patch 
	DevIL-1.6.8-rc2-gcc43headerfix.patch 
	DevIL-1.6.8-rc2-il_endian_h.patch 
	DevIL-1.6.8-rc2-il_io_c.patch DevIL-1.6.8-rc2-il_wrap_h.patch 
	DevIL-1.6.8-rc2-ilu_region.patch DevIL-1.6.8-rc2-ilut_h.patch 
Log Message:
* Tue Jan 13 2009 Hans de Goede <hdegoede at redhat.com> 1.7.5-1
- Update to latest upstream: 1.7.5
- Add patch to fix CVE-2008-5262


DevIL-1.7.5-CVE-2008-5262.patch:

--- NEW FILE DevIL-1.7.5-CVE-2008-5262.patch ---
--- DevIL-1.6.8/src-IL/src/il_hdr.c	2008/12/15 05:27:55	1.17
+++ DevIL-1.6.8/src-IL/src/il_hdr.c	2009/01/09 22:11:02	1.18
@@ -85,7 +85,7 @@
 	if (iread(&a, 1, 1) != 1)
 		return IL_FALSE;
 
-	while(!done) {
+	while (!done) {
 		if (iread(&b, 1, 1) != 1)
 			return IL_FALSE;
 		if (b == '\n' && a == '\n')
@@ -98,6 +98,10 @@
 	if (iread(&a, 1, 1) != 1)
 		return IL_FALSE;
 	while (a != '\n') {
+		if (count >= 80) {  // Line shouldn't be this long at all.
+			ilSetError(IL_INVALID_FILE_HEADER);
+			return IL_FALSE;
+		}
 		buff[count] = a;
 		if (iread(&a, 1, 1) != 1)
 			return IL_FALSE;
@@ -113,8 +117,9 @@
 	//nothing that really changes the appearance of the loaded image...
 	//(The code as it is now assumes that y contains "-Y" and x contains
 	//"+X" after the following line)
-	//Furthermore, this crashes if the read strings are longer than 2 chars o_O
-	sscanf(buff, "%s %d %s %d", y, &Header->Height, x, &Header->Width);
+	
+	// The 2 has to be in the %s format specifier to prevent buffer overruns.
+	sscanf(buff, "%2s %d %2s %d", y, &Header->Height, x, &Header->Width);
 
 	return IL_TRUE;
 }

DevIL-1.7.5-allegropicfix.patch:

--- NEW FILE DevIL-1.7.5-allegropicfix.patch ---
diff -up devil-1.7.5/configure~ devil-1.7.5/configure
--- devil-1.7.5/configure~	2009-01-13 20:36:43.000000000 +0100
+++ devil-1.7.5/configure	2009-01-13 20:36:43.000000000 +0100
@@ -21763,7 +21763,7 @@ echo $ECHO_N "checking for Allegro - ver
     no_allegro=yes
   else
     allegro_CFLAGS=`$ALLEGRO_CONFIG $ALLEGRO_CONFIG_args --cflags`
-    allegro_LIBS=`$ALLEGRO_CONFIG $ALLEGRO_CONFIG_args --libs`
+    allegro_LIBS=`$ALLEGRO_CONFIG $ALLEGRO_CONFIG_args --libs | sed 's/-lalleg_unsharable//'`
     ALLEGRO_CONFIG_major_version=`$ALLEGRO_CONFIG $ALLEGRO_CONFIG_args --version | \
            sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'`
     ALLEGRO_CONFIG_minor_version=`$ALLEGRO_CONFIG $ALLEGRO_CONFIG_args --version | \

DevIL-1.7.5-il_endian_h.patch:

--- NEW FILE DevIL-1.7.5-il_endian_h.patch ---
--- DevIL-1.6.8/src-IL/include/il_endian.h.orig	2006-12-21 03:40:57.000000000 +0000
+++ DevIL-1.6.8/src-IL/include/il_endian.h	2006-12-21 03:33:34.000000000 +0000
@@ -15,6 +15,10 @@
 
 #include "il_internal.h"
 
+#ifdef GCC_X86_ASM
+#include <byteswap.h>
+#endif
+
 #ifdef WORDS_BIGENDIAN //this is defined by ./configure
 	#ifndef __BIG_ENDIAN__
 	#define __BIG_ENDIAN__
@@ -101,9 +105,7 @@
 		}
 	#else
 	#ifdef GCC_X86_ASM
-		asm("ror $8,%0"
-			: 
-			: "r"  (*s) );
+		*s = __bswap_16(*s);
 	#else
 		*s = ((*s)>>8) | ((*s)<<8);
 	#endif //GCC_X86_ASM
@@ -124,8 +126,7 @@
 		}
 	#else
 	#ifdef GCC_X86_ASM
-			asm("bswap  %0;"
-				: "=r" (*i) );
+		*i = __bswap_32(*i);
 	#else
 		*i = ((*i)>>24) | (((*i)>>8) & 0xff00) | (((*i)<<8) & 0xff0000) | ((*i)<<24);
 	#endif //GCC_X86_ASM


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/DevIL/F-9/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	7 Sep 2006 22:01:24 -0000	1.3
+++ .cvsignore	14 Jan 2009 10:56:02 -0000	1.4
@@ -1 +1 @@
-DevIL-1.6.8-rc2.tar.bz2
+DevIL-1.7.5.tar.gz


Index: DevIL.spec
===================================================================
RCS file: /cvs/extras/rpms/DevIL/F-9/DevIL.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- DevIL.spec	19 Feb 2008 16:34:16 -0000	1.9
+++ DevIL.spec	14 Jan 2009 10:56:02 -0000	1.10
@@ -1,28 +1,25 @@
 Name:           DevIL
-Version:        1.6.8
-Release:        0.15.rc2%{?dist}
+Version:        1.7.5
+Release:        1%{?dist}
 Summary:        A cross-platform image library
 Group:          System Environment/Libraries
 License:        LGPLv2
 URL:            http://openil.sourceforge.net/
-Source0:        http://downloads.sourceforge.net/openil/%{name}-%{version}-rc2.tar.bz2
-Patch0:         %{name}-1.6.8-rc2-allegropicfix.patch
-Patch1:         %{name}-1.6.8-rc2-ilut_h.patch
-Patch2:         %{name}-1.6.8-rc2-il_wrap_h.patch
-Patch3:         %{name}-1.6.8-rc2-ilu_region.patch
-Patch4:         %{name}-1.6.8-rc2-il_endian_h.patch
-Patch5:         %{name}-1.6.8-rc2-il_io_c.patch
-Patch6:         %{name}-1.6.8-rc2-gcc43headerfix.patch
+Source0:        http://downloads.sourceforge.net/openil/%{name}-%{version}.tar.gz
+Patch0:         DevIL-1.7.5-allegropicfix.patch
+Patch1:         DevIL-1.7.5-il_endian_h.patch
+Patch2:         DevIL-1.7.5-CVE-2008-5262.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  allegro-devel
 BuildRequires:  lcms-devel
 BuildRequires:  libGLU-devel
 BuildRequires:  libICE-devel
+BuildRequires:  libXext-devel
 BuildRequires:  libjpeg-devel
 BuildRequires:  libmng-devel
 BuildRequires:  libpng-devel
 BuildRequires:  libtiff-devel
-BuildRequires:  libtool
+BuildRequires:  jasper-devel
 BuildRequires:  SDL-devel => 1.2.5
 
 %description
@@ -38,6 +35,8 @@
 Summary:        Development files for DevIL
 Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
+Requires(post): info
+Requires(preun): info
 
 %description devel
 Development files for DevIL
@@ -65,44 +64,27 @@
 
 
 %prep
-%setup -q
+%setup -q -n devil-%{version}
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-
-# Convert to UTF8
-iconv -f iso8859-1 CREDITS -t utf8 > CREDITS.conv \
-    && /bin/mv -f CREDITS.conv CREDITS
+iconv -f iso8859-1 CREDITS -t utf8 > CREDITS.conv
+touch -r CREDITS CREDITS.conv
+mv CREDITS.conv CREDITS
 
 
 %build
-%configure
-make %{?_smp_mflags} LIBTOOL=%{_bindir}/libtool
+%configure --enable-ILU --enable-ILUT --disable-static --disable-allegrotest
+sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
+sed -i 's|LD_RUN_PATH|DIE_RPATH_DIE|g' libtool
+make %{?_smp_mflags}
 
 
 %install
 rm -rf %{buildroot}
 make install DESTDIR=%{buildroot}
-
-#Some cleanups
-rm -f %{buildroot}%{_libdir}/*.la
-rm -f %{buildroot}%{_libdir}/*.a
-
-#Replace autoconf generated config.h to avoid potential define collisions
-cat >%{buildroot}%{_includedir}/IL/config.h <<EOF
-/* Support Allegro API */
-#define ILUT_USE_ALLEGRO
-
-/* Support OpenGL API */
-#define ILUT_USE_OPENGL
-
-/* Support SDL API */
-#define ILUT_USE_SDL
-EOF
+rm %{buildroot}%{_libdir}/*.la
+rm %{buildroot}%{_infodir}/dir
 
 
 %clean
@@ -112,6 +94,12 @@
 %post -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
 
+%post devel
+/sbin/install-info %{_infodir}/DevIL_manual.info %{_infodir}/dir 2> /dev/null || :
+%preun devel
+if [ $1 = 0 ] ; then
+  /sbin/install-info --delete %{_infodir}/DevIL_manual.info %{_infodir}/dir 2> /dev/null || :
+fi
 
 %post ILUT -p /sbin/ldconfig
 %postun ILUT -p /sbin/ldconfig
@@ -129,24 +117,29 @@
 %{_libdir}/libIL.so
 %{_libdir}/libILU.so
 %dir %{_includedir}/IL
-%{_includedir}/IL/devil_internal_exports.h
+%{_includedir}/IL/devil_cpp_wrapper.hpp
 %{_includedir}/IL/il.h
 %{_includedir}/IL/ilu.h
 %{_includedir}/IL/ilu_region.h
+%{_infodir}/DevIL_manual.info.gz
 
 
 %files ILUT
+%defattr(-,root,root,-)
 %{_libdir}/libILUT.so.*
 
 
 %files ILUT-devel
+%defattr(-,root,root,-)
 %{_libdir}/libILUT.so
-%{_includedir}/IL/config.h
 %{_includedir}/IL/ilut.h
-%{_includedir}/IL/il_wrap.h
 
 
 %changelog
+* Tue Jan 13 2009 Hans de Goede <hdegoede at redhat.com> 1.7.5-1
+- Update to latest upstream: 1.7.5
+- Add patch to fix CVE-2008-5262
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1.6.8-0.15.rc2
 - Autorebuild for GCC 4.3
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/DevIL/F-9/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	7 Sep 2006 22:01:24 -0000	1.3
+++ sources	14 Jan 2009 10:56:02 -0000	1.4
@@ -1 +1 @@
-444f1290a4688c4530b9d07a521da212  DevIL-1.6.8-rc2.tar.bz2
+2a74578507a21d75d7fcc5afd41444d0  DevIL-1.7.5.tar.gz


--- DevIL-1.6.8-rc2-allegropicfix.patch DELETED ---


--- DevIL-1.6.8-rc2-gcc43headerfix.patch DELETED ---


--- DevIL-1.6.8-rc2-il_endian_h.patch DELETED ---


--- DevIL-1.6.8-rc2-il_io_c.patch DELETED ---


--- DevIL-1.6.8-rc2-il_wrap_h.patch DELETED ---


--- DevIL-1.6.8-rc2-ilu_region.patch DELETED ---


--- DevIL-1.6.8-rc2-ilut_h.patch DELETED ---



From jwrdegoede at fedoraproject.org  Wed Jan 14 10:56:36 2009
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Wed, 14 Jan 2009 10:56:36 +0000 (UTC)
Subject: rpms/DevIL/F-10 DevIL-1.7.5-CVE-2008-5262.patch, NONE,
	1.1 DevIL-1.7.5-allegropicfix.patch, NONE,
	1.1 DevIL-1.7.5-il_endian_h.patch, NONE, 1.1 .cvsignore, 1.3,
	1.4 DevIL.spec, 1.9, 1.10 sources, 1.3,
	1.4 DevIL-1.6.8-rc2-allegropicfix.patch, 1.1,
	NONE DevIL-1.6.8-rc2-gcc43headerfix.patch, 1.1,
	NONE DevIL-1.6.8-rc2-il_endian_h.patch, 1.1,
	NONE DevIL-1.6.8-rc2-il_io_c.patch, 1.1,
	NONE DevIL-1.6.8-rc2-il_wrap_h.patch, 1.1,
	NONE DevIL-1.6.8-rc2-ilu_region.patch, 1.1,
	NONE DevIL-1.6.8-rc2-ilut_h.patch, 1.1, NONE
Message-ID: <20090114105636.EAAC970136@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/DevIL/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23360

Modified Files:
	.cvsignore DevIL.spec sources 
Added Files:
	DevIL-1.7.5-CVE-2008-5262.patch 
	DevIL-1.7.5-allegropicfix.patch DevIL-1.7.5-il_endian_h.patch 
Removed Files:
	DevIL-1.6.8-rc2-allegropicfix.patch 
	DevIL-1.6.8-rc2-gcc43headerfix.patch 
	DevIL-1.6.8-rc2-il_endian_h.patch 
	DevIL-1.6.8-rc2-il_io_c.patch DevIL-1.6.8-rc2-il_wrap_h.patch 
	DevIL-1.6.8-rc2-ilu_region.patch DevIL-1.6.8-rc2-ilut_h.patch 
Log Message:
* Tue Jan 13 2009 Hans de Goede <hdegoede at redhat.com> 1.7.5-1
- Update to latest upstream: 1.7.5
- Add patch to fix CVE-2008-5262


DevIL-1.7.5-CVE-2008-5262.patch:

--- NEW FILE DevIL-1.7.5-CVE-2008-5262.patch ---
--- DevIL-1.6.8/src-IL/src/il_hdr.c	2008/12/15 05:27:55	1.17
+++ DevIL-1.6.8/src-IL/src/il_hdr.c	2009/01/09 22:11:02	1.18
@@ -85,7 +85,7 @@
 	if (iread(&a, 1, 1) != 1)
 		return IL_FALSE;
 
-	while(!done) {
+	while (!done) {
 		if (iread(&b, 1, 1) != 1)
 			return IL_FALSE;
 		if (b == '\n' && a == '\n')
@@ -98,6 +98,10 @@
 	if (iread(&a, 1, 1) != 1)
 		return IL_FALSE;
 	while (a != '\n') {
+		if (count >= 80) {  // Line shouldn't be this long at all.
+			ilSetError(IL_INVALID_FILE_HEADER);
+			return IL_FALSE;
+		}
 		buff[count] = a;
 		if (iread(&a, 1, 1) != 1)
 			return IL_FALSE;
@@ -113,8 +117,9 @@
 	//nothing that really changes the appearance of the loaded image...
 	//(The code as it is now assumes that y contains "-Y" and x contains
 	//"+X" after the following line)
-	//Furthermore, this crashes if the read strings are longer than 2 chars o_O
-	sscanf(buff, "%s %d %s %d", y, &Header->Height, x, &Header->Width);
+	
+	// The 2 has to be in the %s format specifier to prevent buffer overruns.
+	sscanf(buff, "%2s %d %2s %d", y, &Header->Height, x, &Header->Width);
 
 	return IL_TRUE;
 }

DevIL-1.7.5-allegropicfix.patch:

--- NEW FILE DevIL-1.7.5-allegropicfix.patch ---
diff -up devil-1.7.5/configure~ devil-1.7.5/configure
--- devil-1.7.5/configure~	2009-01-13 20:36:43.000000000 +0100
+++ devil-1.7.5/configure	2009-01-13 20:36:43.000000000 +0100
@@ -21763,7 +21763,7 @@ echo $ECHO_N "checking for Allegro - ver
     no_allegro=yes
   else
     allegro_CFLAGS=`$ALLEGRO_CONFIG $ALLEGRO_CONFIG_args --cflags`
-    allegro_LIBS=`$ALLEGRO_CONFIG $ALLEGRO_CONFIG_args --libs`
+    allegro_LIBS=`$ALLEGRO_CONFIG $ALLEGRO_CONFIG_args --libs | sed 's/-lalleg_unsharable//'`
     ALLEGRO_CONFIG_major_version=`$ALLEGRO_CONFIG $ALLEGRO_CONFIG_args --version | \
            sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'`
     ALLEGRO_CONFIG_minor_version=`$ALLEGRO_CONFIG $ALLEGRO_CONFIG_args --version | \

DevIL-1.7.5-il_endian_h.patch:

--- NEW FILE DevIL-1.7.5-il_endian_h.patch ---
--- DevIL-1.6.8/src-IL/include/il_endian.h.orig	2006-12-21 03:40:57.000000000 +0000
+++ DevIL-1.6.8/src-IL/include/il_endian.h	2006-12-21 03:33:34.000000000 +0000
@@ -15,6 +15,10 @@
 
 #include "il_internal.h"
 
+#ifdef GCC_X86_ASM
+#include <byteswap.h>
+#endif
+
 #ifdef WORDS_BIGENDIAN //this is defined by ./configure
 	#ifndef __BIG_ENDIAN__
 	#define __BIG_ENDIAN__
@@ -101,9 +105,7 @@
 		}
 	#else
 	#ifdef GCC_X86_ASM
-		asm("ror $8,%0"
-			: 
-			: "r"  (*s) );
+		*s = __bswap_16(*s);
 	#else
 		*s = ((*s)>>8) | ((*s)<<8);
 	#endif //GCC_X86_ASM
@@ -124,8 +126,7 @@
 		}
 	#else
 	#ifdef GCC_X86_ASM
-			asm("bswap  %0;"
-				: "=r" (*i) );
+		*i = __bswap_32(*i);
 	#else
 		*i = ((*i)>>24) | (((*i)>>8) & 0xff00) | (((*i)<<8) & 0xff0000) | ((*i)<<24);
 	#endif //GCC_X86_ASM


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/DevIL/F-10/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	7 Sep 2006 22:01:24 -0000	1.3
+++ .cvsignore	14 Jan 2009 10:56:06 -0000	1.4
@@ -1 +1 @@
-DevIL-1.6.8-rc2.tar.bz2
+DevIL-1.7.5.tar.gz


Index: DevIL.spec
===================================================================
RCS file: /cvs/extras/rpms/DevIL/F-10/DevIL.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- DevIL.spec	19 Feb 2008 16:34:16 -0000	1.9
+++ DevIL.spec	14 Jan 2009 10:56:06 -0000	1.10
@@ -1,28 +1,25 @@
 Name:           DevIL
-Version:        1.6.8
-Release:        0.15.rc2%{?dist}
+Version:        1.7.5
+Release:        1%{?dist}
 Summary:        A cross-platform image library
 Group:          System Environment/Libraries
 License:        LGPLv2
 URL:            http://openil.sourceforge.net/
-Source0:        http://downloads.sourceforge.net/openil/%{name}-%{version}-rc2.tar.bz2
-Patch0:         %{name}-1.6.8-rc2-allegropicfix.patch
-Patch1:         %{name}-1.6.8-rc2-ilut_h.patch
-Patch2:         %{name}-1.6.8-rc2-il_wrap_h.patch
-Patch3:         %{name}-1.6.8-rc2-ilu_region.patch
-Patch4:         %{name}-1.6.8-rc2-il_endian_h.patch
-Patch5:         %{name}-1.6.8-rc2-il_io_c.patch
-Patch6:         %{name}-1.6.8-rc2-gcc43headerfix.patch
+Source0:        http://downloads.sourceforge.net/openil/%{name}-%{version}.tar.gz
+Patch0:         DevIL-1.7.5-allegropicfix.patch
+Patch1:         DevIL-1.7.5-il_endian_h.patch
+Patch2:         DevIL-1.7.5-CVE-2008-5262.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  allegro-devel
 BuildRequires:  lcms-devel
 BuildRequires:  libGLU-devel
 BuildRequires:  libICE-devel
+BuildRequires:  libXext-devel
 BuildRequires:  libjpeg-devel
 BuildRequires:  libmng-devel
 BuildRequires:  libpng-devel
 BuildRequires:  libtiff-devel
-BuildRequires:  libtool
+BuildRequires:  jasper-devel
 BuildRequires:  SDL-devel => 1.2.5
 
 %description
@@ -38,6 +35,8 @@
 Summary:        Development files for DevIL
 Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
+Requires(post): info
+Requires(preun): info
 
 %description devel
 Development files for DevIL
@@ -65,44 +64,27 @@
 
 
 %prep
-%setup -q
+%setup -q -n devil-%{version}
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-
-# Convert to UTF8
-iconv -f iso8859-1 CREDITS -t utf8 > CREDITS.conv \
-    && /bin/mv -f CREDITS.conv CREDITS
+iconv -f iso8859-1 CREDITS -t utf8 > CREDITS.conv
+touch -r CREDITS CREDITS.conv
+mv CREDITS.conv CREDITS
 
 
 %build
-%configure
-make %{?_smp_mflags} LIBTOOL=%{_bindir}/libtool
+%configure --enable-ILU --enable-ILUT --disable-static --disable-allegrotest
+sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
+sed -i 's|LD_RUN_PATH|DIE_RPATH_DIE|g' libtool
+make %{?_smp_mflags}
 
 
 %install
 rm -rf %{buildroot}
 make install DESTDIR=%{buildroot}
-
-#Some cleanups
-rm -f %{buildroot}%{_libdir}/*.la
-rm -f %{buildroot}%{_libdir}/*.a
-
-#Replace autoconf generated config.h to avoid potential define collisions
-cat >%{buildroot}%{_includedir}/IL/config.h <<EOF
-/* Support Allegro API */
-#define ILUT_USE_ALLEGRO
-
-/* Support OpenGL API */
-#define ILUT_USE_OPENGL
-
-/* Support SDL API */
-#define ILUT_USE_SDL
-EOF
+rm %{buildroot}%{_libdir}/*.la
+rm %{buildroot}%{_infodir}/dir
 
 
 %clean
@@ -112,6 +94,12 @@
 %post -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
 
+%post devel
+/sbin/install-info %{_infodir}/DevIL_manual.info %{_infodir}/dir 2> /dev/null || :
+%preun devel
+if [ $1 = 0 ] ; then
+  /sbin/install-info --delete %{_infodir}/DevIL_manual.info %{_infodir}/dir 2> /dev/null || :
+fi
 
 %post ILUT -p /sbin/ldconfig
 %postun ILUT -p /sbin/ldconfig
@@ -129,24 +117,29 @@
 %{_libdir}/libIL.so
 %{_libdir}/libILU.so
 %dir %{_includedir}/IL
-%{_includedir}/IL/devil_internal_exports.h
+%{_includedir}/IL/devil_cpp_wrapper.hpp
 %{_includedir}/IL/il.h
 %{_includedir}/IL/ilu.h
 %{_includedir}/IL/ilu_region.h
+%{_infodir}/DevIL_manual.info.gz
 
 
 %files ILUT
+%defattr(-,root,root,-)
 %{_libdir}/libILUT.so.*
 
 
 %files ILUT-devel
+%defattr(-,root,root,-)
 %{_libdir}/libILUT.so
-%{_includedir}/IL/config.h
 %{_includedir}/IL/ilut.h
-%{_includedir}/IL/il_wrap.h
 
 
 %changelog
+* Tue Jan 13 2009 Hans de Goede <hdegoede at redhat.com> 1.7.5-1
+- Update to latest upstream: 1.7.5
+- Add patch to fix CVE-2008-5262
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1.6.8-0.15.rc2
 - Autorebuild for GCC 4.3
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/DevIL/F-10/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	7 Sep 2006 22:01:24 -0000	1.3
+++ sources	14 Jan 2009 10:56:06 -0000	1.4
@@ -1 +1 @@
-444f1290a4688c4530b9d07a521da212  DevIL-1.6.8-rc2.tar.bz2
+2a74578507a21d75d7fcc5afd41444d0  DevIL-1.7.5.tar.gz


--- DevIL-1.6.8-rc2-allegropicfix.patch DELETED ---


--- DevIL-1.6.8-rc2-gcc43headerfix.patch DELETED ---


--- DevIL-1.6.8-rc2-il_endian_h.patch DELETED ---


--- DevIL-1.6.8-rc2-il_io_c.patch DELETED ---


--- DevIL-1.6.8-rc2-il_wrap_h.patch DELETED ---


--- DevIL-1.6.8-rc2-ilu_region.patch DELETED ---


--- DevIL-1.6.8-rc2-ilut_h.patch DELETED ---



From denis at fedoraproject.org  Wed Jan 14 10:58:41 2009
From: denis at fedoraproject.org (Denis Leroy)
Date: Wed, 14 Jan 2009 10:58:41 +0000 (UTC)
Subject: rpms/transmission/F-10 transmission-1.42-libevent.patch, NONE,
	1.1 .cvsignore, 1.24, 1.25 sources, 1.24, 1.25 transmission.spec,
	1.28, 1.29 transmission-1.40-libevent.patch, 1.1, NONE
Message-ID: <20090114105841.59E6170136@cvs1.fedora.phx.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/transmission/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23855

Modified Files:
	.cvsignore sources transmission.spec 
Added Files:
	transmission-1.42-libevent.patch 
Removed Files:
	transmission-1.40-libevent.patch 
Log Message:
Update to upstream version 1.42, updated libevent patch accordingly

transmission-1.42-libevent.patch:

--- NEW FILE transmission-1.42-libevent.patch ---
diff -ur transmission-1.42.OLD/cli/Makefile.in transmission-1.42/cli/Makefile.in
--- transmission-1.42.OLD/cli/Makefile.in	2008-12-24 12:53:03.000000000 -0500
+++ transmission-1.42/cli/Makefile.in	2008-12-31 11:30:31.000000000 -0500
@@ -54,7 +54,6 @@
 am__DEPENDENCIES_1 =
 transmissioncli_DEPENDENCIES =  \
 	$(top_builddir)/libtransmission/libtransmission.a \
-	$(top_builddir)/third-party/libevent/libevent.la \
 	$(top_builddir)/third-party/libnatpmp/libnatpmp.a \
 	$(top_builddir)/third-party/miniupnp/libminiupnp.a \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
@@ -289,7 +288,7 @@
 transmissioncli_SOURCES = cli.c
 transmissioncli_LDADD = \
     $(top_builddir)/libtransmission/libtransmission.a \
-    $(top_builddir)/third-party/libevent/libevent.la \
+    -levent -levent_core \
     $(top_builddir)/third-party/libnatpmp/libnatpmp.a \
     $(top_builddir)/third-party/miniupnp/libminiupnp.a \
     $(INTLLIBS) \
diff -ur transmission-1.42.OLD/configure transmission-1.42/configure
--- transmission-1.42.OLD/configure	2008-12-24 12:53:05.000000000 -0500
+++ transmission-1.42/configure	2008-12-31 11:31:37.000000000 -0500
@@ -1056,7 +1056,6 @@
 LIBNOTIFY_LIBS
 DBUS_GLIB_CFLAGS
 DBUS_GLIB_LIBS'
-ac_subdirs_all='third-party/libevent'
 
 # Initialize some variables set by options.
 ac_init_help=
@@ -23820,16 +23819,6 @@
 
 
 
-subdirs="$subdirs third-party/libevent"
-
-{ $as_echo "$as_me:$LINENO: invoking libevent's configure script" >&5
-$as_echo "$as_me: invoking libevent's configure script" >&6;}
-LIBEVENT_CPPFLAGS="-I\$(top_srcdir)/third-party/libevent"
-
-
-
-
-
 pkg_failed=no
 { $as_echo "$as_me:$LINENO: checking for GTK" >&5
 $as_echo_n "checking for GTK... " >&6; }
diff -ur transmission-1.42.OLD/daemon/Makefile.in transmission-1.42/daemon/Makefile.in
--- transmission-1.42.OLD/daemon/Makefile.in	2008-12-24 12:53:03.000000000 -0500
+++ transmission-1.42/daemon/Makefile.in	2008-12-31 11:33:13.000000000 -0500
@@ -58,7 +58,6 @@
 	$(top_builddir)/libtransmission/libtransmission.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) \
 	$(am__DEPENDENCIES_1)
@@ -69,7 +68,6 @@
 	$(top_builddir)/libtransmission/libtransmission.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) \
 	$(am__DEPENDENCIES_1)
@@ -308,7 +306,7 @@
     $(top_builddir)/libtransmission/libtransmission.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) \
     $(ZLIB_LIBS) \
diff -ur transmission-1.42.OLD/daemon/remote.c transmission-1.42/daemon/remote.c
--- transmission-1.42.OLD/daemon/remote.c	2008-12-24 12:48:44.000000000 -0500
+++ transmission-1.42/daemon/remote.c	2008-12-31 11:34:05.000000000 -0500
@@ -15,7 +15,7 @@
 #include <stdlib.h>
 #include <string.h> /* strcmp */
 
-#include <libevent/event.h>
+#include <event.h>
 #include <curl/curl.h>
 
 #include <libtransmission/transmission.h>
diff -ur transmission-1.42.OLD/gtk/Makefile.in transmission-1.42/gtk/Makefile.in
--- transmission-1.42.OLD/gtk/Makefile.in	2008-12-24 12:53:03.000000000 -0500
+++ transmission-1.42/gtk/Makefile.in	2008-12-31 11:35:10.000000000 -0500
@@ -73,7 +73,6 @@
 am__DEPENDENCIES_1 =
 transmission_DEPENDENCIES =  \
 	$(top_builddir)/libtransmission/libtransmission.a \
-	$(top_builddir)/third-party/libevent/libevent.la \
 	$(top_builddir)/third-party/miniupnp/libminiupnp.a \
 	$(top_builddir)/third-party/libnatpmp/libnatpmp.a \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
@@ -398,7 +397,7 @@
 dist_man_MANS = transmission.1
 transmission_LDADD =  \
 	$(top_builddir)/libtransmission/libtransmission.a \
-	$(top_builddir)/third-party/libevent/libevent.la \
+	-levent -levent_core \
 	$(top_builddir)/third-party/miniupnp/libminiupnp.a \
 	$(top_builddir)/third-party/libnatpmp/libnatpmp.a $(GTK_LIBS) \
 	$(GIO_LIBS) $(LIBNOTIFY_LIBS) $(DBUS_GLIB_LIBS) \
diff -ur transmission-1.42.OLD/gtk/util.c transmission-1.42/gtk/util.c
--- transmission-1.42.OLD/gtk/util.c	2008-12-24 12:48:40.000000000 -0500
+++ transmission-1.42/gtk/util.c	2008-12-31 11:35:56.000000000 -0500
@@ -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 -ur transmission-1.42.OLD/libtransmission/clients.c transmission-1.42/libtransmission/clients.c
--- transmission-1.42.OLD/libtransmission/clients.c	2008-12-24 12:48:40.000000000 -0500
+++ transmission-1.42/libtransmission/clients.c	2008-12-31 11:36:35.000000000 -0500
@@ -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 -ur transmission-1.42.OLD/libtransmission/Makefile.in transmission-1.42/libtransmission/Makefile.in
--- transmission-1.42.OLD/libtransmission/Makefile.in	2008-12-24 12:53:03.000000000 -0500
+++ transmission-1.42/libtransmission/Makefile.in	2008-12-31 11:38:46.000000000 -0500
@@ -83,7 +83,6 @@
 am__DEPENDENCIES_2 = ./libtransmission.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) \
 	$(am__DEPENDENCIES_1)
@@ -466,7 +465,7 @@
     ./libtransmission.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) \
diff -ur transmission-1.42.OLD/libtransmission/net.c transmission-1.42/libtransmission/net.c
--- transmission-1.42.OLD/libtransmission/net.c	2008-12-24 12:48:40.000000000 -0500
+++ transmission-1.42/libtransmission/net.c	2008-12-31 11:39:24.000000000 -0500
@@ -37,6 +37,7 @@
  #include <fcntl.h>
 #endif
 
+#include <stdarg.h>
 #include <evutil.h>
 
 #include "transmission.h"
diff -ur transmission-1.42.OLD/libtransmission/rpc-server.c transmission-1.42/libtransmission/rpc-server.c
--- transmission-1.42.OLD/libtransmission/rpc-server.c	2008-12-24 12:48:40.000000000 -0500
+++ transmission-1.42/libtransmission/rpc-server.c	2008-12-31 11:39:53.000000000 -0500
@@ -24,8 +24,8 @@
  #include <zlib.h>
 #endif
 
-#include <libevent/event.h>
-#include <libevent/evhttp.h>
+#include <event.h>
+#include <evhttp.h>
 
 #include "transmission.h"
 #include "bencode.h"
diff -ur transmission-1.42.OLD/third-party/Makefile.in transmission-1.42/third-party/Makefile.in
--- transmission-1.42.OLD/third-party/Makefile.in	2008-12-24 12:53:03.000000000 -0500
+++ transmission-1.42/third-party/Makefile.in	2008-12-31 11:40:42.000000000 -0500
@@ -254,7 +254,6 @@
 top_srcdir = @top_srcdir@
 transmissionlocaledir = @transmissionlocaledir@
 SUBDIRS = \
-    libevent \
     libnatpmp \
     miniupnp
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/transmission/F-10/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- .cvsignore	27 Nov 2008 08:39:00 -0000	1.24
+++ .cvsignore	14 Jan 2009 10:58:10 -0000	1.25
@@ -1 +1 @@
-transmission-1.40.tar.bz2
+transmission-1.42.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/transmission/F-10/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- sources	27 Nov 2008 08:39:00 -0000	1.24
+++ sources	14 Jan 2009 10:58:10 -0000	1.25
@@ -1 +1 @@
-490d13c141ba7b4a96582541ea83a461  transmission-1.40.tar.bz2
+c083bdcb01426466e80ee339bccd9351  transmission-1.42.tar.bz2


Index: transmission.spec
===================================================================
RCS file: /cvs/pkgs/rpms/transmission/F-10/transmission.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- transmission.spec	27 Nov 2008 08:39:00 -0000	1.28
+++ transmission.spec	14 Jan 2009 10:58:10 -0000	1.29
@@ -1,6 +1,6 @@
 
 Name:           transmission
-Version:        1.40
+Version:        1.42
 Release:        1%{?dist}
 Summary:        A lightweight GTK+ BitTorrent client
 
@@ -10,7 +10,7 @@
 URL:            http://www.transmissionbt.com/
 Source0:        http://download.m0k.org/transmission/files/transmission-%{version}.tar.bz2
 Patch2:         transmission-1.40-copt.patch
-Patch3:         transmission-1.40-libevent.patch
+Patch3:         transmission-1.42-libevent.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  openssl-devel >= 0.9.4
@@ -76,6 +76,10 @@
 
 
 %changelog
+* Wed Jan 14 2009 Denis Leroy <denis at poolshark.org> - 1.42-1
+- Update to upstream version 1.42
+- Updated libevent patch
+
 * Thu Nov 27 2008 Denis Leroy <denis at poolshark.org> - 1.40-1
 - Update to upstream 1.40, patches ported
 - Should fix #472682 and #473207


--- transmission-1.40-libevent.patch DELETED ---



From hadess at fedoraproject.org  Wed Jan 14 11:02:07 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Wed, 14 Jan 2009 11:02:07 +0000 (UTC)
Subject: rpms/gstreamer-plugins-base/F-10 gstreamer-plugins-base.spec, 1.68, 
	1.69
Message-ID: <20090114110207.4FADA70136@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/gstreamer-plugins-base/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24174

Modified Files:
	gstreamer-plugins-base.spec 
Log Message:
Fix stupidness in sed line



Index: gstreamer-plugins-base.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamer-plugins-base/F-10/gstreamer-plugins-base.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- gstreamer-plugins-base.spec	14 Jan 2009 10:55:26 -0000	1.68
+++ gstreamer-plugins-base.spec	14 Jan 2009 11:01:36 -0000	1.69
@@ -58,7 +58,7 @@
 
 %build
 # Fix build with newer Theoras
-sed -i 's/1.0alpha5/1.0RC1' configure
+sed -i 's/1.0alpha5/1.0RC1/' configure
 %configure \
   --with-package-name='Fedora gstreamer-plugins-base package' \
   --with-package-origin='http://download.fedora.redhat.com/fedora' \



From emunson at fedoraproject.org  Wed Jan 14 11:02:39 2009
From: emunson at fedoraproject.org (Eric Munson)
Date: Wed, 14 Jan 2009 11:02:39 +0000 (UTC)
Subject: rpms/libhugetlbfs/F-10 .cvsignore, 1.10, 1.11 import.log, 1.2,
	1.3 libhugetlbfs.spec, 1.19, 1.20 sources, 1.10, 1.11
Message-ID: <20090114110239.D571B70136@cvs1.fedora.phx.redhat.com>

Author: emunson

Update of /cvs/pkgs/rpms/libhugetlbfs/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23569/F-10

Modified Files:
	.cvsignore import.log libhugetlbfs.spec sources 
Log Message:
Updating to 2.1.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libhugetlbfs/F-10/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	19 Dec 2008 10:58:37 -0000	1.10
+++ .cvsignore	14 Jan 2009 11:02:09 -0000	1.11
@@ -1 +1 @@
-libhugetlbfs-2.1.1.tar.gz
+libhugetlbfs-2.1.2.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/libhugetlbfs/F-10/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	19 Dec 2008 10:58:37 -0000	1.2
+++ import.log	14 Jan 2009 11:02:09 -0000	1.3
@@ -1,2 +1,3 @@
 libhugetlbfs-2_0-1:HEAD:libhugetlbfs-2.0-1.src.rpm:1218744620
 libhugetlbfs-2_1_1-1_fc10:F-10:libhugetlbfs-2.1.1.src.rpm:1229684265
+libhugetlbfs-2_1_2-1_fc10:F-10:libhugetlbfs-2.1.2.src.rpm:1231930556


Index: libhugetlbfs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libhugetlbfs/F-10/libhugetlbfs.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- libhugetlbfs.spec	19 Dec 2008 10:58:37 -0000	1.19
+++ libhugetlbfs.spec	14 Jan 2009 11:02:09 -0000	1.20
@@ -1,5 +1,5 @@
 Name: libhugetlbfs
-Version: 2.1.1
+Version: 2.1.2
 Release: 1%{?dist}
 Summary: A library which provides easy access to huge pages of memory
 
@@ -92,6 +92,9 @@
 %{_mandir}/man1/pagesize.1.gz
 
 %changelog
+* Fri Dec 19 2008 Eric Munson <ebmunson at us.ibm.com> 2.1.2-1
+- Updating for libhugetlbfs-2.1.2 release
+
 * Fri Dec 19 2008 Eric Munson <ebmunson at us.ibm.com> 2.1.1-1
 - Updating for libhugetlbfs-2.1.1 release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libhugetlbfs/F-10/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	19 Dec 2008 10:58:37 -0000	1.10
+++ sources	14 Jan 2009 11:02:09 -0000	1.11
@@ -1 +1 @@
-547c7709163320b8bea250b679ffa86c  libhugetlbfs-2.1.1.tar.gz
+6dd879f378e4f788f6a7eac137ed0edd  libhugetlbfs-2.1.2.tar.gz



From emunson at fedoraproject.org  Wed Jan 14 11:04:58 2009
From: emunson at fedoraproject.org (Eric Munson)
Date: Wed, 14 Jan 2009 11:04:58 +0000 (UTC)
Subject: rpms/libhugetlbfs/F-9 .cvsignore, 1.11, 1.12 import.log, 1.3,
	1.4 libhugetlbfs.spec, 1.20, 1.21 sources, 1.11, 1.12
Message-ID: <20090114110458.1767170136@cvs1.fedora.phx.redhat.com>

Author: emunson

Update of /cvs/pkgs/rpms/libhugetlbfs/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24723/F-9

Modified Files:
	.cvsignore import.log libhugetlbfs.spec sources 
Log Message:
Updating to libhugetlbfs-2.1.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libhugetlbfs/F-9/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	19 Dec 2008 10:56:48 -0000	1.11
+++ .cvsignore	14 Jan 2009 11:04:27 -0000	1.12
@@ -1 +1 @@
-libhugetlbfs-2.1.1.tar.gz
+libhugetlbfs-2.1.2.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/libhugetlbfs/F-9/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- import.log	19 Dec 2008 10:56:48 -0000	1.3
+++ import.log	14 Jan 2009 11:04:27 -0000	1.4
@@ -1,3 +1,4 @@
 libhugetlbfs-2_0-1:F-9:libhugetlbfs-2.0-1.src.rpm:1218744721
 libhugetlbfs-2_1-1_fc10:F-9:libhugetlbfs-2.1-1.fc10.src.rpm:1228490343
 libhugetlbfs-2_1_1-1_fc10:F-9:libhugetlbfs-2.1.1.src.rpm:1229684152
+libhugetlbfs-2_1_2-1_fc10:F-9:libhugetlbfs-2.1.2.src.rpm:1231931015


Index: libhugetlbfs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libhugetlbfs/F-9/libhugetlbfs.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- libhugetlbfs.spec	19 Dec 2008 10:56:48 -0000	1.20
+++ libhugetlbfs.spec	14 Jan 2009 11:04:27 -0000	1.21
@@ -1,5 +1,5 @@
 Name: libhugetlbfs
-Version: 2.1.1
+Version: 2.1.2
 Release: 1%{?dist}
 Summary: A library which provides easy access to huge pages of memory
 
@@ -92,6 +92,9 @@
 %{_mandir}/man1/pagesize.1.gz
 
 %changelog
+* Fri Dec 19 2008 Eric Munson <ebmunson at us.ibm.com> 2.1.2-1
+- Updating for libhugetlbfs-2.1.2 release
+
 * Fri Dec 19 2008 Eric Munson <ebmunson at us.ibm.com> 2.1.1-1
 - Updating for libhugetlbfs-2.1.1 release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libhugetlbfs/F-9/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	19 Dec 2008 10:56:48 -0000	1.11
+++ sources	14 Jan 2009 11:04:27 -0000	1.12
@@ -1 +1 @@
-547c7709163320b8bea250b679ffa86c  libhugetlbfs-2.1.1.tar.gz
+6dd879f378e4f788f6a7eac137ed0edd  libhugetlbfs-2.1.2.tar.gz



From jwrdegoede at fedoraproject.org  Wed Jan 14 11:06:23 2009
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Wed, 14 Jan 2009 11:06:23 +0000 (UTC)
Subject: rpms/DevIL/F-9 DevIL.spec,1.10,1.11
Message-ID: <20090114110623.E56E770136@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/DevIL/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24930

Modified Files:
	DevIL.spec 
Log Message:
* Tue Jan 13 2009 Hans de Goede <hdegoede at redhat.com> 1.7.5-1
- Update to latest upstream: 1.7.5
- Add patch to fix CVE-2008-5262



Index: DevIL.spec
===================================================================
RCS file: /cvs/extras/rpms/DevIL/F-9/DevIL.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- DevIL.spec	14 Jan 2009 10:56:02 -0000	1.10
+++ DevIL.spec	14 Jan 2009 11:05:53 -0000	1.11
@@ -84,7 +84,7 @@
 rm -rf %{buildroot}
 make install DESTDIR=%{buildroot}
 rm %{buildroot}%{_libdir}/*.la
-rm %{buildroot}%{_infodir}/dir
+rm -f %{buildroot}%{_infodir}/dir
 
 
 %clean



From ovasik at fedoraproject.org  Wed Jan 14 11:16:43 2009
From: ovasik at fedoraproject.org (Ondrej Vasik)
Date: Wed, 14 Jan 2009 11:16:43 +0000 (UTC)
Subject: rpms/elinks/devel elinks.spec,1.60,1.61
Message-ID: <20090114111643.C8DE470136@cvs1.fedora.phx.redhat.com>

Author: ovasik

Update of /cvs/extras/rpms/elinks/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26452

Modified Files:
	elinks.spec 
Log Message:
versioned obsoletes and provides for links v.1 (shipped by RedHat in past until version 0:0.96)


Index: elinks.spec
===================================================================
RCS file: /cvs/extras/rpms/elinks/devel/elinks.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- elinks.spec	1 Oct 2008 09:46:03 -0000	1.60
+++ elinks.spec	14 Jan 2009 11:16:11 -0000	1.61
@@ -1,7 +1,7 @@
 Name:      elinks
 Summary:   A text-mode Web browser
 Version:   0.12
-Release:   0.6.pre2%{?dist}
+Release:   0.7.pre2%{?dist}
 License:   GPLv2
 URL:       http://elinks.or.cz
 Group:     Applications/Internet
@@ -17,8 +17,8 @@
 Requires: zlib >= 1.2.0.2
 
 Provides:  webclient
-Obsoletes: links
-Provides:  links
+Obsoletes: links < 1:%{version}-%{release}
+Provides:  links = 1:%{version}-%{release}
 Provides: text-www-browser
 
 Patch0: elinks-0.11.0-ssl-noegd.patch
@@ -90,6 +90,9 @@
 %{_mandir}/man5/*
 
 %changelog
+* Wed Jan 14 2009 Ondrej Vasik <ovasik at redhat.com> 0.12.0.7.pre2
+- versioned obsoletes and provides for links
+
 * Wed Oct  1 2008 Kamil Dudka <kdudka at redhat.com> 0.12-0.6.pre2
 - port elinks to use NSS library for cryptography (#346861)
 



From pkgdb at fedoraproject.org  Wed Jan 14 11:41:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 14 Jan 2009 11:41:00 +0000
Subject: [pkgdb] autoconf had group_acl changed
Message-ID: <20090114114100.9105A208203@bastion.fedora.phx.redhat.com>

karsten has set the commit acl on autoconf (Fedora devel) to Approved for provenpackager

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/autoconf



From pkgdb at fedoraproject.org  Wed Jan 14 11:41:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 14 Jan 2009 11:41:15 +0000
Subject: [pkgdb] autoconf213 had group_acl changed
Message-ID: <20090114114115.69BFF2081FC@bastion.fedora.phx.redhat.com>

karsten has set the commit acl on autoconf213 (Fedora devel) to Approved for provenpackager

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/autoconf213



From pkgdb at fedoraproject.org  Wed Jan 14 11:41:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 14 Jan 2009 11:41:24 +0000
Subject: [pkgdb] automake had group_acl changed
Message-ID: <20090114114124.9C4A6208457@bastion.fedora.phx.redhat.com>

karsten has set the commit acl on automake (Fedora devel) to Approved for provenpackager

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/automake



From pkgdb at fedoraproject.org  Wed Jan 14 11:41:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 14 Jan 2009 11:41:35 +0000
Subject: [pkgdb] automake14 had group_acl changed
Message-ID: <20090114114135.5AC10208458@bastion.fedora.phx.redhat.com>

karsten has set the commit acl on automake14 (Fedora devel) to Approved for provenpackager

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/automake14



From pkgdb at fedoraproject.org  Wed Jan 14 11:41:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 14 Jan 2009 11:41:46 +0000
Subject: [pkgdb] automake15 had group_acl changed
Message-ID: <20090114114146.A2A71208207@bastion.fedora.phx.redhat.com>

karsten has set the commit acl on automake15 (Fedora devel) to Approved for provenpackager

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/automake15



From pkgdb at fedoraproject.org  Wed Jan 14 11:42:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 14 Jan 2009 11:42:00 +0000
Subject: [pkgdb] automake16 had group_acl changed
Message-ID: <20090114114200.99909208203@bastion.fedora.phx.redhat.com>

karsten has set the commit acl on automake16 (Fedora devel) to Approved for provenpackager

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/automake16



From pkgdb at fedoraproject.org  Wed Jan 14 11:42:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 14 Jan 2009 11:42:11 +0000
Subject: [pkgdb] automake17 had group_acl changed
Message-ID: <20090114114211.E2C82208203@bastion.fedora.phx.redhat.com>

karsten has set the commit acl on automake17 (Fedora devel) to Approved for provenpackager

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/automake17



From pkgdb at fedoraproject.org  Wed Jan 14 11:43:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 14 Jan 2009 11:43:11 +0000
Subject: [pkgdb] hdparm had group_acl changed
Message-ID: <20090114114312.052462081FC@bastion.fedora.phx.redhat.com>

karsten has set the commit acl on hdparm (Fedora devel) to Approved for provenpackager

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/hdparm



From pkgdb at fedoraproject.org  Wed Jan 14 11:43:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 14 Jan 2009 11:43:39 +0000
Subject: [pkgdb] irda-utils had group_acl changed
Message-ID: <20090114114339.C0AE4208203@bastion.fedora.phx.redhat.com>

karsten has set the commit acl on irda-utils (Fedora devel) to Approved for provenpackager

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/irda-utils



From pkgdb at fedoraproject.org  Wed Jan 14 11:44:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 14 Jan 2009 11:44:02 +0000
Subject: [pkgdb] libtool had group_acl changed
Message-ID: <20090114114402.61FF92081FC@bastion.fedora.phx.redhat.com>

karsten has set the commit acl on libtool (Fedora devel) to Approved for provenpackager

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libtool



From pkgdb at fedoraproject.org  Wed Jan 14 11:44:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 14 Jan 2009 11:44:15 +0000
Subject: [pkgdb] prctl had group_acl changed
Message-ID: <20090114114415.7E438208457@bastion.fedora.phx.redhat.com>

karsten has set the commit acl on prctl (Fedora devel) to Approved for provenpackager

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/prctl



From pkgdb at fedoraproject.org  Wed Jan 14 11:44:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 14 Jan 2009 11:44:31 +0000
Subject: [pkgdb] wget had group_acl changed
Message-ID: <20090114114431.35540208207@bastion.fedora.phx.redhat.com>

karsten has set the commit acl on wget (Fedora devel) to Approved for provenpackager

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/wget



From mitr at fedoraproject.org  Wed Jan 14 11:54:37 2009
From: mitr at fedoraproject.org (Miloslav Trmac)
Date: Wed, 14 Jan 2009 11:54:37 +0000 (UTC)
Subject: rpms/usermode/devel usermode.spec,1.83,1.84
Message-ID: <20090114115437.8AA2D70136@cvs1.fedora.phx.redhat.com>

Author: mitr

Update of /cvs/pkgs/rpms/usermode/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14736

Modified Files:
	usermode.spec 
Log Message:
* Wed Jan 14 2009 Miloslav Trma?? <mitr at redhat.com> - 1.99-2
- Fix problems pointed out in merge review:
  - Drop Conflicts: SysVinit < very-old
  - Remove very old version requirements from Requires and BuildRequires
  - Make /etc/security/console.apps/* %%config(noreplace)
  - Update BuildRoot



Index: usermode.spec
===================================================================
RCS file: /cvs/pkgs/rpms/usermode/devel/usermode.spec,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- usermode.spec	11 Nov 2008 11:57:13 -0000	1.83
+++ usermode.spec	14 Jan 2009 11:54:06 -0000	1.84
@@ -1,18 +1,17 @@
 Summary: Tools for certain user account management tasks
 Name: usermode
 Version: 1.99
-Release: 1
+Release: 2
 License: GPLv2+
 Group: Applications/System
 URL: https://fedorahosted.org/usermode/
 Source: https://fedorahosted.org/releases/u/s/usermode/usermode-%{version}.tar.bz2
-Requires: util-linux, pam >= 0.75-37, /etc/pam.d/system-auth, passwd
-Conflicts: SysVinit < 2.74-14
+Requires: pam, passwd, util-linux
 BuildRequires: desktop-file-utils, e2fsprogs-devel, glib2-devel, gtk2-devel
 BuildRequires: libglade2-devel, libuser-devel, pam-devel, util-linux
 BuildRequires: perl-XML-Parser, libSM-devel, startup-notification-devel, gettext
-BuildRequires: libselinux-devel >= 1.17.13-2
-BuildRoot: %{_tmppath}/%{name}-root
+BuildRequires: libselinux-devel
+BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 %package gtk
 Summary: Graphical tools for certain user account management tasks
@@ -89,9 +88,9 @@
 %config(noreplace) /etc/pam.d/reboot
 %config(noreplace) /etc/pam.d/poweroff
 %config(noreplace) /etc/security/console.apps/config-util
-%config /etc/security/console.apps/halt
-%config /etc/security/console.apps/reboot
-%config /etc/security/console.apps/poweroff
+%config(noreplace) /etc/security/console.apps/halt
+%config(noreplace) /etc/security/console.apps/reboot
+%config(noreplace) /etc/security/console.apps/poweroff
 
 %files gtk
 %defattr(-,root,root)
@@ -109,6 +108,13 @@
 %{_datadir}/applications/*
 
 %changelog
+* Wed Jan 14 2009 Miloslav Trma?? <mitr at redhat.com> - 1.99-2
+- Fix problems pointed out in merge review:
+  - Drop Conflicts: SysVinit < very-old
+  - Remove very old version requirements from Requires and BuildRequires
+  - Make /etc/security/console.apps/* %%config(noreplace)
+  - Update BuildRoot
+
 * Tue Nov 11 2008 Miloslav Trma?? <mitr at redhat.com> - 1.99-1
 - Update to usermode-1.99
   Resolves: #470834



From jussilehtola at fedoraproject.org  Wed Jan 14 12:13:44 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Wed, 14 Jan 2009 12:13:44 +0000 (UTC)
Subject: rpms/gromacs/devel .cvsignore, 1.4, 1.5 gromacs.spec, 1.4,
	1.5 import.log, 1.3, 1.4 sources, 1.4, 1.5
Message-ID: <20090114121344.7F24270142@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

Update of /cvs/pkgs/rpms/gromacs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16551/devel

Modified Files:
	.cvsignore gromacs.spec import.log sources 
Log Message:
* Wed Jan 14 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0.2-7
- Update manual to latest version.
- Removed Requires: blas and lapack.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gromacs/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	10 Nov 2008 08:28:45 -0000	1.4
+++ .cvsignore	14 Jan 2009 12:13:14 -0000	1.5
@@ -1,2 +1,2 @@
-gromacs-4.0.pdf
 gromacs-4.0.2.tar.gz
+manual-4.0.pdf


Index: gromacs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gromacs/devel/gromacs.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gromacs.spec	10 Nov 2008 08:28:45 -0000	1.4
+++ gromacs.spec	14 Jan 2009 12:13:14 -0000	1.5
@@ -1,13 +1,12 @@
 Name:		gromacs
 Version:	4.0.2
-Release:	6%{?dist}
+Release:	7%{?dist}
 Summary:	GROMACS binaries
 Group:		Applications/Engineering
 License:	GPLv2+
 URL:		http://www.gromacs.org
 Source0:	ftp://ftp.gromacs.org/pub/gromacs/gromacs-%{version}.tar.gz
-#Source1:	ftp://ftp.gromacs.org/pub/manual/manual-%{version}.pdf
-Source1:	ftp://ftp.gromacs.org/pub/beta/gromacs-4.0.pdf
+Source1:	ftp://ftp.gromacs.org/pub/manual/manual-4.0.pdf
 Source2:	gromacs-template-makefile-single
 Source3:	gromacs-template-makefile-double
 Source4:	gromacs-template-makefile-mpi-single
@@ -25,11 +24,6 @@
 BuildRequires:	libxml2-devel
 BuildRequires:	openmpi-devel
 
-
-# Need to have this so that yum doesn't pull atlas instead
-Requires:	blas
-Requires:	lapack
-
 %if 0%{?rhel} == 4
 BuildRequires:	blas
 BuildRequires:	lapack
@@ -488,7 +482,7 @@
 
 %files common
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING README gromacs-4.0.pdf README.fedora
+%doc AUTHORS COPYING README manual-4.0.pdf README.fedora
 %{_bindir}/GMXRC
 %{_bindir}/GMXRC.bash
 %{_mandir}/man1/*
@@ -538,56 +532,60 @@
 
 
 %changelog
-* Mon Nov 10 2008 Jussi Lehtola - 4.0.2-6
+* Wed Jan 14 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0.2-7
+- Update manual to latest version.
+- Removed Requires: blas and lapack.
+
+* Mon Nov 10 2008 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0.2-6
 - Update to 4.0.2.
 
-* Sun Nov 09 2008 Jussi Lehtola - 4.0.1-5
+* Sun Nov 09 2008 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0.1-5
 - Add Requires: blas too.
 
-* Sun Nov 09 2008 Jussi Lehtola - 4.0.1-4
+* Sun Nov 09 2008 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0.1-4
 - Update to 4.0.1.
 - Add Requires: lapack and openmpi to prevent yum from pulling atlas and lam
 instead.
 
-* Wed Oct 15 2008 Jussi Lehtola - 4.0-3
+* Wed Oct 15 2008 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0-3
 - Rename also man pages.
 
-* Mon Oct 13 2008 Jussi Lehtola - 4.0-2
+* Mon Oct 13 2008 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0-2
 - Added noreplace to bash completion file.
 - Changed double precision mpi binary suffix to _mpi_d.
 
-* Sun Oct 12 2008 Jussi Lehtola - 4.0-1
+* Sun Oct 12 2008 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0-1
 - Update to Gromacs 4.0.
 - Remove module system and patch file names to begin with g_.
 
-* Wed Oct 08 2008 Jussi Lehtola - 4.0-0.15.rc3
+* Wed Oct 08 2008 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0-0.15.rc3
 - Changed location of binaries.
 - Removed conflict of module file, as the program is binary compatible with older versions.
 
-* Wed Oct 08 2008 Jussi Lehtola - 4.0-0.14.rc3
+* Wed Oct 08 2008 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0-0.14.rc3
 - The gromacs module is loaded automatically and it conflicts with gromacs3.
 
-* Tue Oct 07 2008 Jussi Lehtola - 4.0-0.13.rc3
+* Tue Oct 07 2008 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0-0.13.rc3
 - Renamed module files from %%{name}-%%{version} to %%{name}.
 
-* Mon Oct 06 2008 Jussi Lehtola - 4.0-0.12.rc3
+* Mon Oct 06 2008 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0-0.12.rc3
 - Fix BR to get GROMACS to build in mock for epel-4.
 
-* Sat Oct 04 2008 Jussi Lehtola - 4.0-0.11.rc3
+* Sat Oct 04 2008 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0-0.11.rc3
 - Fix to get GROMACS to build in mock for epel-5.
 
-* Sat Oct 04 2008 Jussi Lehtola - 4.0-0.10.rc3
+* Sat Oct 04 2008 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0-0.10.rc3
 - Implement module system & remove binary renaming.
 - No need for autoreconf anymore.
 - Update to rc3.
 
-* Sat Oct 04 2008 Jussi Lehtola - 4.0-0.9.rc2
+* Sat Oct 04 2008 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0-0.9.rc2
 - Fall back to autoreconf due to binary renaming.
 
-* Fri Oct 03 2008 Jussi Lehtola - 4.0-0.8.rc2
+* Fri Oct 03 2008 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0-0.8.rc2
 - Modified install commands to preserve timestamps.
 
-* Fri Oct 03 2008 Jussi Lehtola - 4.0-0.7.rc2
+* Fri Oct 03 2008 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0-0.7.rc2
 - Even more review fixes.
 - Binaries renamed:
 	highway	->	g_highway
@@ -595,31 +593,31 @@
 	sigeps	->	g_sigeps
 	wheel	->	g_wheel
 
-* Thu Oct 02 2008 Jussi Lehtola - 4.0-0.6.rc2
+* Thu Oct 02 2008 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0-0.6.rc2
 - Final review fixes.
 
-* Wed Oct 01 2008 Jussi Lehtola - 4.0-0.5.rc2
+* Wed Oct 01 2008 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0-0.5.rc2
 - Strip down requires by branching tutor to its own package.
 
-* Tue Sep 30 2008 Jussi Lehtola - 4.0-0.4.rc2
+* Tue Sep 30 2008 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0-0.4.rc2
 - Extensive package review fixes.
 - Unclear licenses on some files, filed upstream bug 217.
   http://bugzilla.gromacs.org/show_bug.cgi?id=217
 
-* Mon Sep 29 2008 Jussi Lehtola - 4.0-0.3.rc2
+* Mon Sep 29 2008 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0-0.3.rc2
 - Move .so files to -devel package.
 - Remove .la files.
 
-* Mon Sep 29 2008 Jussi Lehtola - 4.0-0.2.rc2
+* Mon Sep 29 2008 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0-0.2.rc2
 - Implement out-of-tree-builds.
 - Add --noexecstack to CFLAGS.
 - Remove execstack procedure and prelink from buildreqs.
 - Filed upstream bug 215 to add .note.GNU-stack .
 - Fix incorrect file permission on src/tools/gmx_xpm2ps.c .
 
-* Mon Sep 29 2008 Jussi Lehtola - 4.0-0.1.rc2
+* Mon Sep 29 2008 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0-0.1.rc2
 - Alphabetized buildrequires.
 - Changed gromacs-share to gromacs-common.
 
-* Fri Sep 26 2008 Jussi Lehtola - 4.0-0.0.rc2
+* Fri Sep 26 2008 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0-0.0.rc2
 - Initial build.


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/gromacs/devel/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- import.log	10 Nov 2008 08:28:45 -0000	1.3
+++ import.log	14 Jan 2009 12:13:14 -0000	1.4
@@ -1,3 +1,4 @@
 gromacs-4_0-3_fc9:HEAD:gromacs-4.0-3.fc9.src.rpm:1224069849
 gromacs-4_0_1-4_fc9:HEAD:gromacs-4.0.1-4.fc9.src.rpm:1226248354
 gromacs-4_0_2-6_fc9:HEAD:gromacs-4.0.2-6.fc9.src.rpm:1226305676
+gromacs-4_0_2-7_fc10:HEAD:gromacs-4.0.2-7.fc10.src.rpm:1231935162


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gromacs/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	10 Nov 2008 08:28:45 -0000	1.4
+++ sources	14 Jan 2009 12:13:14 -0000	1.5
@@ -1,2 +1,2 @@
-7a7680983a3a6fcc06b2817c6ab614fc  gromacs-4.0.pdf
 7a9eedf9ef365d32cd01355b8950ddc5  gromacs-4.0.2.tar.gz
+2b6565bef76109a579c39ec1dcb0ecf2  manual-4.0.pdf



From jussilehtola at fedoraproject.org  Wed Jan 14 12:16:59 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Wed, 14 Jan 2009 12:16:59 +0000 (UTC)
Subject: rpms/gromacs/EL-4 gromacs.spec,1.4,1.5 sources,1.4,1.5
Message-ID: <20090114121659.4EDE170136@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

Update of /cvs/pkgs/rpms/gromacs/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17466/EL-4

Modified Files:
	gromacs.spec sources 
Log Message:
* Wed Jan 14 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0.2-7
- Update manual to latest version.
- Removed Requires: blas and lapack.



Index: gromacs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gromacs/EL-4/gromacs.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gromacs.spec	10 Nov 2008 08:33:55 -0000	1.4
+++ gromacs.spec	14 Jan 2009 12:16:29 -0000	1.5
@@ -1,13 +1,12 @@
 Name:		gromacs
 Version:	4.0.2
-Release:	6%{?dist}
+Release:	7%{?dist}
 Summary:	GROMACS binaries
 Group:		Applications/Engineering
 License:	GPLv2+
 URL:		http://www.gromacs.org
 Source0:	ftp://ftp.gromacs.org/pub/gromacs/gromacs-%{version}.tar.gz
-#Source1:	ftp://ftp.gromacs.org/pub/manual/manual-%{version}.pdf
-Source1:	ftp://ftp.gromacs.org/pub/beta/gromacs-4.0.pdf
+Source1:	ftp://ftp.gromacs.org/pub/manual/manual-4.0.pdf
 Source2:	gromacs-template-makefile-single
 Source3:	gromacs-template-makefile-double
 Source4:	gromacs-template-makefile-mpi-single
@@ -25,11 +24,6 @@
 BuildRequires:	libxml2-devel
 BuildRequires:	openmpi-devel
 
-
-# Need to have this so that yum doesn't pull atlas instead
-Requires:	blas
-Requires:	lapack
-
 %if 0%{?rhel} == 4
 BuildRequires:	blas
 BuildRequires:	lapack
@@ -488,7 +482,7 @@
 
 %files common
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING README gromacs-4.0.pdf README.fedora
+%doc AUTHORS COPYING README manual-4.0.pdf README.fedora
 %{_bindir}/GMXRC
 %{_bindir}/GMXRC.bash
 %{_mandir}/man1/*
@@ -538,56 +532,60 @@
 
 
 %changelog
-* Mon Nov 10 2008 Jussi Lehtola - 4.0.2-6
+* Wed Jan 14 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0.2-7
+- Update manual to latest version.
+- Removed Requires: blas and lapack.
+
+* Mon Nov 10 2008 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0.2-6
 - Update to 4.0.2.
 
-* Sun Nov 09 2008 Jussi Lehtola - 4.0.1-5
+* Sun Nov 09 2008 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0.1-5
 - Add Requires: blas too.
 
-* Sun Nov 09 2008 Jussi Lehtola - 4.0.1-4
+* Sun Nov 09 2008 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0.1-4
 - Update to 4.0.1.
 - Add Requires: lapack and openmpi to prevent yum from pulling atlas and lam
 instead.
 
-* Wed Oct 15 2008 Jussi Lehtola - 4.0-3
+* Wed Oct 15 2008 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0-3
 - Rename also man pages.
 
-* Mon Oct 13 2008 Jussi Lehtola - 4.0-2
+* Mon Oct 13 2008 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0-2
 - Added noreplace to bash completion file.
 - Changed double precision mpi binary suffix to _mpi_d.
 
-* Sun Oct 12 2008 Jussi Lehtola - 4.0-1
+* Sun Oct 12 2008 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0-1
 - Update to Gromacs 4.0.
 - Remove module system and patch file names to begin with g_.
 
-* Wed Oct 08 2008 Jussi Lehtola - 4.0-0.15.rc3
+* Wed Oct 08 2008 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0-0.15.rc3
 - Changed location of binaries.
 - Removed conflict of module file, as the program is binary compatible with older versions.
 
-* Wed Oct 08 2008 Jussi Lehtola - 4.0-0.14.rc3
+* Wed Oct 08 2008 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0-0.14.rc3
 - The gromacs module is loaded automatically and it conflicts with gromacs3.
 
-* Tue Oct 07 2008 Jussi Lehtola - 4.0-0.13.rc3
+* Tue Oct 07 2008 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0-0.13.rc3
 - Renamed module files from %%{name}-%%{version} to %%{name}.
 
-* Mon Oct 06 2008 Jussi Lehtola - 4.0-0.12.rc3
+* Mon Oct 06 2008 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0-0.12.rc3
 - Fix BR to get GROMACS to build in mock for epel-4.
 
-* Sat Oct 04 2008 Jussi Lehtola - 4.0-0.11.rc3
+* Sat Oct 04 2008 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0-0.11.rc3
 - Fix to get GROMACS to build in mock for epel-5.
 
-* Sat Oct 04 2008 Jussi Lehtola - 4.0-0.10.rc3
+* Sat Oct 04 2008 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0-0.10.rc3
 - Implement module system & remove binary renaming.
 - No need for autoreconf anymore.
 - Update to rc3.
 
-* Sat Oct 04 2008 Jussi Lehtola - 4.0-0.9.rc2
+* Sat Oct 04 2008 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0-0.9.rc2
 - Fall back to autoreconf due to binary renaming.
 
-* Fri Oct 03 2008 Jussi Lehtola - 4.0-0.8.rc2
+* Fri Oct 03 2008 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0-0.8.rc2
 - Modified install commands to preserve timestamps.
 
-* Fri Oct 03 2008 Jussi Lehtola - 4.0-0.7.rc2
+* Fri Oct 03 2008 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0-0.7.rc2
 - Even more review fixes.
 - Binaries renamed:
 	highway	->	g_highway
@@ -595,31 +593,31 @@
 	sigeps	->	g_sigeps
 	wheel	->	g_wheel
 
-* Thu Oct 02 2008 Jussi Lehtola - 4.0-0.6.rc2
+* Thu Oct 02 2008 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0-0.6.rc2
 - Final review fixes.
 
-* Wed Oct 01 2008 Jussi Lehtola - 4.0-0.5.rc2
+* Wed Oct 01 2008 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0-0.5.rc2
 - Strip down requires by branching tutor to its own package.
 
-* Tue Sep 30 2008 Jussi Lehtola - 4.0-0.4.rc2
+* Tue Sep 30 2008 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0-0.4.rc2
 - Extensive package review fixes.
 - Unclear licenses on some files, filed upstream bug 217.
   http://bugzilla.gromacs.org/show_bug.cgi?id=217
 
-* Mon Sep 29 2008 Jussi Lehtola - 4.0-0.3.rc2
+* Mon Sep 29 2008 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0-0.3.rc2
 - Move .so files to -devel package.
 - Remove .la files.
 
-* Mon Sep 29 2008 Jussi Lehtola - 4.0-0.2.rc2
+* Mon Sep 29 2008 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0-0.2.rc2
 - Implement out-of-tree-builds.
 - Add --noexecstack to CFLAGS.
 - Remove execstack procedure and prelink from buildreqs.
 - Filed upstream bug 215 to add .note.GNU-stack .
 - Fix incorrect file permission on src/tools/gmx_xpm2ps.c .
 
-* Mon Sep 29 2008 Jussi Lehtola - 4.0-0.1.rc2
+* Mon Sep 29 2008 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0-0.1.rc2
 - Alphabetized buildrequires.
 - Changed gromacs-share to gromacs-common.
 
-* Fri Sep 26 2008 Jussi Lehtola - 4.0-0.0.rc2
+* Fri Sep 26 2008 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0-0.0.rc2
 - Initial build.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gromacs/EL-4/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	10 Nov 2008 08:33:55 -0000	1.4
+++ sources	14 Jan 2009 12:16:29 -0000	1.5
@@ -1,2 +1,2 @@
-7a7680983a3a6fcc06b2817c6ab614fc  gromacs-4.0.pdf
 7a9eedf9ef365d32cd01355b8950ddc5  gromacs-4.0.2.tar.gz
+2b6565bef76109a579c39ec1dcb0ecf2  manual-4.0.pdf



From jussilehtola at fedoraproject.org  Wed Jan 14 12:16:59 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Wed, 14 Jan 2009 12:16:59 +0000 (UTC)
Subject: rpms/gromacs/EL-5 gromacs.spec,1.4,1.5 sources,1.4,1.5
Message-ID: <20090114121659.6DC9570136@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

Update of /cvs/pkgs/rpms/gromacs/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17466/EL-5

Modified Files:
	gromacs.spec sources 
Log Message:
* Wed Jan 14 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0.2-7
- Update manual to latest version.
- Removed Requires: blas and lapack.



Index: gromacs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gromacs/EL-5/gromacs.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gromacs.spec	10 Nov 2008 08:33:56 -0000	1.4
+++ gromacs.spec	14 Jan 2009 12:16:29 -0000	1.5
@@ -1,13 +1,12 @@
 Name:		gromacs
 Version:	4.0.2
-Release:	6%{?dist}
+Release:	7%{?dist}
 Summary:	GROMACS binaries
 Group:		Applications/Engineering
 License:	GPLv2+
 URL:		http://www.gromacs.org
 Source0:	ftp://ftp.gromacs.org/pub/gromacs/gromacs-%{version}.tar.gz
-#Source1:	ftp://ftp.gromacs.org/pub/manual/manual-%{version}.pdf
-Source1:	ftp://ftp.gromacs.org/pub/beta/gromacs-4.0.pdf
+Source1:	ftp://ftp.gromacs.org/pub/manual/manual-4.0.pdf
 Source2:	gromacs-template-makefile-single
 Source3:	gromacs-template-makefile-double
 Source4:	gromacs-template-makefile-mpi-single
@@ -25,11 +24,6 @@
 BuildRequires:	libxml2-devel
 BuildRequires:	openmpi-devel
 
-
-# Need to have this so that yum doesn't pull atlas instead
-Requires:	blas
-Requires:	lapack
-
 %if 0%{?rhel} == 4
 BuildRequires:	blas
 BuildRequires:	lapack
@@ -488,7 +482,7 @@
 
 %files common
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING README gromacs-4.0.pdf README.fedora
+%doc AUTHORS COPYING README manual-4.0.pdf README.fedora
 %{_bindir}/GMXRC
 %{_bindir}/GMXRC.bash
 %{_mandir}/man1/*
@@ -538,56 +532,60 @@
 
 
 %changelog
-* Mon Nov 10 2008 Jussi Lehtola - 4.0.2-6
+* Wed Jan 14 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0.2-7
+- Update manual to latest version.
+- Removed Requires: blas and lapack.
+
+* Mon Nov 10 2008 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0.2-6
 - Update to 4.0.2.
 
-* Sun Nov 09 2008 Jussi Lehtola - 4.0.1-5
+* Sun Nov 09 2008 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0.1-5
 - Add Requires: blas too.
 
-* Sun Nov 09 2008 Jussi Lehtola - 4.0.1-4
+* Sun Nov 09 2008 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0.1-4
 - Update to 4.0.1.
 - Add Requires: lapack and openmpi to prevent yum from pulling atlas and lam
 instead.
 
-* Wed Oct 15 2008 Jussi Lehtola - 4.0-3
+* Wed Oct 15 2008 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0-3
 - Rename also man pages.
 
-* Mon Oct 13 2008 Jussi Lehtola - 4.0-2
+* Mon Oct 13 2008 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0-2
 - Added noreplace to bash completion file.
 - Changed double precision mpi binary suffix to _mpi_d.
 
-* Sun Oct 12 2008 Jussi Lehtola - 4.0-1
+* Sun Oct 12 2008 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0-1
 - Update to Gromacs 4.0.
 - Remove module system and patch file names to begin with g_.
 
-* Wed Oct 08 2008 Jussi Lehtola - 4.0-0.15.rc3
+* Wed Oct 08 2008 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0-0.15.rc3
 - Changed location of binaries.
 - Removed conflict of module file, as the program is binary compatible with older versions.
 
-* Wed Oct 08 2008 Jussi Lehtola - 4.0-0.14.rc3
+* Wed Oct 08 2008 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0-0.14.rc3
 - The gromacs module is loaded automatically and it conflicts with gromacs3.
 
-* Tue Oct 07 2008 Jussi Lehtola - 4.0-0.13.rc3
+* Tue Oct 07 2008 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0-0.13.rc3
 - Renamed module files from %%{name}-%%{version} to %%{name}.
 
-* Mon Oct 06 2008 Jussi Lehtola - 4.0-0.12.rc3
+* Mon Oct 06 2008 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0-0.12.rc3
 - Fix BR to get GROMACS to build in mock for epel-4.
 
-* Sat Oct 04 2008 Jussi Lehtola - 4.0-0.11.rc3
+* Sat Oct 04 2008 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0-0.11.rc3
 - Fix to get GROMACS to build in mock for epel-5.
 
-* Sat Oct 04 2008 Jussi Lehtola - 4.0-0.10.rc3
+* Sat Oct 04 2008 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0-0.10.rc3
 - Implement module system & remove binary renaming.
 - No need for autoreconf anymore.
 - Update to rc3.
 
-* Sat Oct 04 2008 Jussi Lehtola - 4.0-0.9.rc2
+* Sat Oct 04 2008 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0-0.9.rc2
 - Fall back to autoreconf due to binary renaming.
 
-* Fri Oct 03 2008 Jussi Lehtola - 4.0-0.8.rc2
+* Fri Oct 03 2008 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0-0.8.rc2
 - Modified install commands to preserve timestamps.
 
-* Fri Oct 03 2008 Jussi Lehtola - 4.0-0.7.rc2
+* Fri Oct 03 2008 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0-0.7.rc2
 - Even more review fixes.
 - Binaries renamed:
 	highway	->	g_highway
@@ -595,31 +593,31 @@
 	sigeps	->	g_sigeps
 	wheel	->	g_wheel
 
-* Thu Oct 02 2008 Jussi Lehtola - 4.0-0.6.rc2
+* Thu Oct 02 2008 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0-0.6.rc2
 - Final review fixes.
 
-* Wed Oct 01 2008 Jussi Lehtola - 4.0-0.5.rc2
+* Wed Oct 01 2008 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0-0.5.rc2
 - Strip down requires by branching tutor to its own package.
 
-* Tue Sep 30 2008 Jussi Lehtola - 4.0-0.4.rc2
+* Tue Sep 30 2008 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0-0.4.rc2
 - Extensive package review fixes.
 - Unclear licenses on some files, filed upstream bug 217.
   http://bugzilla.gromacs.org/show_bug.cgi?id=217
 
-* Mon Sep 29 2008 Jussi Lehtola - 4.0-0.3.rc2
+* Mon Sep 29 2008 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0-0.3.rc2
 - Move .so files to -devel package.
 - Remove .la files.
 
-* Mon Sep 29 2008 Jussi Lehtola - 4.0-0.2.rc2
+* Mon Sep 29 2008 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0-0.2.rc2
 - Implement out-of-tree-builds.
 - Add --noexecstack to CFLAGS.
 - Remove execstack procedure and prelink from buildreqs.
 - Filed upstream bug 215 to add .note.GNU-stack .
 - Fix incorrect file permission on src/tools/gmx_xpm2ps.c .
 
-* Mon Sep 29 2008 Jussi Lehtola - 4.0-0.1.rc2
+* Mon Sep 29 2008 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0-0.1.rc2
 - Alphabetized buildrequires.
 - Changed gromacs-share to gromacs-common.
 
-* Fri Sep 26 2008 Jussi Lehtola - 4.0-0.0.rc2
+* Fri Sep 26 2008 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0-0.0.rc2
 - Initial build.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gromacs/EL-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	10 Nov 2008 08:33:56 -0000	1.4
+++ sources	14 Jan 2009 12:16:29 -0000	1.5
@@ -1,2 +1,2 @@
-7a7680983a3a6fcc06b2817c6ab614fc  gromacs-4.0.pdf
 7a9eedf9ef365d32cd01355b8950ddc5  gromacs-4.0.2.tar.gz
+2b6565bef76109a579c39ec1dcb0ecf2  manual-4.0.pdf



From jussilehtola at fedoraproject.org  Wed Jan 14 12:16:59 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Wed, 14 Jan 2009 12:16:59 +0000 (UTC)
Subject: rpms/gromacs/F-10 gromacs.spec,1.4,1.5 sources,1.4,1.5
Message-ID: <20090114121659.A61DD70136@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

Update of /cvs/pkgs/rpms/gromacs/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17466/F-10

Modified Files:
	gromacs.spec sources 
Log Message:
* Wed Jan 14 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0.2-7
- Update manual to latest version.
- Removed Requires: blas and lapack.



Index: gromacs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gromacs/F-10/gromacs.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gromacs.spec	10 Nov 2008 08:33:57 -0000	1.4
+++ gromacs.spec	14 Jan 2009 12:16:29 -0000	1.5
@@ -1,13 +1,12 @@
 Name:		gromacs
 Version:	4.0.2
-Release:	6%{?dist}
+Release:	7%{?dist}
 Summary:	GROMACS binaries
 Group:		Applications/Engineering
 License:	GPLv2+
 URL:		http://www.gromacs.org
 Source0:	ftp://ftp.gromacs.org/pub/gromacs/gromacs-%{version}.tar.gz
-#Source1:	ftp://ftp.gromacs.org/pub/manual/manual-%{version}.pdf
-Source1:	ftp://ftp.gromacs.org/pub/beta/gromacs-4.0.pdf
+Source1:	ftp://ftp.gromacs.org/pub/manual/manual-4.0.pdf
 Source2:	gromacs-template-makefile-single
 Source3:	gromacs-template-makefile-double
 Source4:	gromacs-template-makefile-mpi-single
@@ -25,11 +24,6 @@
 BuildRequires:	libxml2-devel
 BuildRequires:	openmpi-devel
 
-
-# Need to have this so that yum doesn't pull atlas instead
-Requires:	blas
-Requires:	lapack
-
 %if 0%{?rhel} == 4
 BuildRequires:	blas
 BuildRequires:	lapack
@@ -488,7 +482,7 @@
 
 %files common
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING README gromacs-4.0.pdf README.fedora
+%doc AUTHORS COPYING README manual-4.0.pdf README.fedora
 %{_bindir}/GMXRC
 %{_bindir}/GMXRC.bash
 %{_mandir}/man1/*
@@ -538,56 +532,60 @@
 
 
 %changelog
-* Mon Nov 10 2008 Jussi Lehtola - 4.0.2-6
+* Wed Jan 14 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0.2-7
+- Update manual to latest version.
+- Removed Requires: blas and lapack.
+
+* Mon Nov 10 2008 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0.2-6
 - Update to 4.0.2.
 
-* Sun Nov 09 2008 Jussi Lehtola - 4.0.1-5
+* Sun Nov 09 2008 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0.1-5
 - Add Requires: blas too.
 
-* Sun Nov 09 2008 Jussi Lehtola - 4.0.1-4
+* Sun Nov 09 2008 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0.1-4
 - Update to 4.0.1.
 - Add Requires: lapack and openmpi to prevent yum from pulling atlas and lam
 instead.
 
-* Wed Oct 15 2008 Jussi Lehtola - 4.0-3
+* Wed Oct 15 2008 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0-3
 - Rename also man pages.
 
-* Mon Oct 13 2008 Jussi Lehtola - 4.0-2
+* Mon Oct 13 2008 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0-2
 - Added noreplace to bash completion file.
 - Changed double precision mpi binary suffix to _mpi_d.
 
-* Sun Oct 12 2008 Jussi Lehtola - 4.0-1
+* Sun Oct 12 2008 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0-1
 - Update to Gromacs 4.0.
 - Remove module system and patch file names to begin with g_.
 
-* Wed Oct 08 2008 Jussi Lehtola - 4.0-0.15.rc3
+* Wed Oct 08 2008 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0-0.15.rc3
 - Changed location of binaries.
 - Removed conflict of module file, as the program is binary compatible with older versions.
 
-* Wed Oct 08 2008 Jussi Lehtola - 4.0-0.14.rc3
+* Wed Oct 08 2008 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0-0.14.rc3
 - The gromacs module is loaded automatically and it conflicts with gromacs3.
 
-* Tue Oct 07 2008 Jussi Lehtola - 4.0-0.13.rc3
+* Tue Oct 07 2008 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0-0.13.rc3
 - Renamed module files from %%{name}-%%{version} to %%{name}.
 
-* Mon Oct 06 2008 Jussi Lehtola - 4.0-0.12.rc3
+* Mon Oct 06 2008 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0-0.12.rc3
 - Fix BR to get GROMACS to build in mock for epel-4.
 
-* Sat Oct 04 2008 Jussi Lehtola - 4.0-0.11.rc3
+* Sat Oct 04 2008 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0-0.11.rc3
 - Fix to get GROMACS to build in mock for epel-5.
 
-* Sat Oct 04 2008 Jussi Lehtola - 4.0-0.10.rc3
+* Sat Oct 04 2008 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0-0.10.rc3
 - Implement module system & remove binary renaming.
 - No need for autoreconf anymore.
 - Update to rc3.
 
-* Sat Oct 04 2008 Jussi Lehtola - 4.0-0.9.rc2
+* Sat Oct 04 2008 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0-0.9.rc2
 - Fall back to autoreconf due to binary renaming.
 
-* Fri Oct 03 2008 Jussi Lehtola - 4.0-0.8.rc2
+* Fri Oct 03 2008 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0-0.8.rc2
 - Modified install commands to preserve timestamps.
 
-* Fri Oct 03 2008 Jussi Lehtola - 4.0-0.7.rc2
+* Fri Oct 03 2008 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0-0.7.rc2
 - Even more review fixes.
 - Binaries renamed:
 	highway	->	g_highway
@@ -595,31 +593,31 @@
 	sigeps	->	g_sigeps
 	wheel	->	g_wheel
 
-* Thu Oct 02 2008 Jussi Lehtola - 4.0-0.6.rc2
+* Thu Oct 02 2008 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0-0.6.rc2
 - Final review fixes.
 
-* Wed Oct 01 2008 Jussi Lehtola - 4.0-0.5.rc2
+* Wed Oct 01 2008 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0-0.5.rc2
 - Strip down requires by branching tutor to its own package.
 
-* Tue Sep 30 2008 Jussi Lehtola - 4.0-0.4.rc2
+* Tue Sep 30 2008 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0-0.4.rc2
 - Extensive package review fixes.
 - Unclear licenses on some files, filed upstream bug 217.
   http://bugzilla.gromacs.org/show_bug.cgi?id=217
 
-* Mon Sep 29 2008 Jussi Lehtola - 4.0-0.3.rc2
+* Mon Sep 29 2008 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0-0.3.rc2
 - Move .so files to -devel package.
 - Remove .la files.
 
-* Mon Sep 29 2008 Jussi Lehtola - 4.0-0.2.rc2
+* Mon Sep 29 2008 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0-0.2.rc2
 - Implement out-of-tree-builds.
 - Add --noexecstack to CFLAGS.
 - Remove execstack procedure and prelink from buildreqs.
 - Filed upstream bug 215 to add .note.GNU-stack .
 - Fix incorrect file permission on src/tools/gmx_xpm2ps.c .
 
-* Mon Sep 29 2008 Jussi Lehtola - 4.0-0.1.rc2
+* Mon Sep 29 2008 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0-0.1.rc2
 - Alphabetized buildrequires.
 - Changed gromacs-share to gromacs-common.
 
-* Fri Sep 26 2008 Jussi Lehtola - 4.0-0.0.rc2
+* Fri Sep 26 2008 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0-0.0.rc2
 - Initial build.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gromacs/F-10/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	10 Nov 2008 08:33:57 -0000	1.4
+++ sources	14 Jan 2009 12:16:29 -0000	1.5
@@ -1,2 +1,2 @@
-7a7680983a3a6fcc06b2817c6ab614fc  gromacs-4.0.pdf
 7a9eedf9ef365d32cd01355b8950ddc5  gromacs-4.0.2.tar.gz
+2b6565bef76109a579c39ec1dcb0ecf2  manual-4.0.pdf



From jussilehtola at fedoraproject.org  Wed Jan 14 12:16:59 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Wed, 14 Jan 2009 12:16:59 +0000 (UTC)
Subject: rpms/gromacs/F-9 gromacs.spec,1.4,1.5 sources,1.4,1.5
Message-ID: <20090114121659.DFDC370136@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

Update of /cvs/pkgs/rpms/gromacs/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17466/F-9

Modified Files:
	gromacs.spec sources 
Log Message:
* Wed Jan 14 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0.2-7
- Update manual to latest version.
- Removed Requires: blas and lapack.



Index: gromacs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gromacs/F-9/gromacs.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gromacs.spec	10 Nov 2008 08:34:00 -0000	1.4
+++ gromacs.spec	14 Jan 2009 12:16:29 -0000	1.5
@@ -1,13 +1,12 @@
 Name:		gromacs
 Version:	4.0.2
-Release:	6%{?dist}
+Release:	7%{?dist}
 Summary:	GROMACS binaries
 Group:		Applications/Engineering
 License:	GPLv2+
 URL:		http://www.gromacs.org
 Source0:	ftp://ftp.gromacs.org/pub/gromacs/gromacs-%{version}.tar.gz
-#Source1:	ftp://ftp.gromacs.org/pub/manual/manual-%{version}.pdf
-Source1:	ftp://ftp.gromacs.org/pub/beta/gromacs-4.0.pdf
+Source1:	ftp://ftp.gromacs.org/pub/manual/manual-4.0.pdf
 Source2:	gromacs-template-makefile-single
 Source3:	gromacs-template-makefile-double
 Source4:	gromacs-template-makefile-mpi-single
@@ -25,11 +24,6 @@
 BuildRequires:	libxml2-devel
 BuildRequires:	openmpi-devel
 
-
-# Need to have this so that yum doesn't pull atlas instead
-Requires:	blas
-Requires:	lapack
-
 %if 0%{?rhel} == 4
 BuildRequires:	blas
 BuildRequires:	lapack
@@ -488,7 +482,7 @@
 
 %files common
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING README gromacs-4.0.pdf README.fedora
+%doc AUTHORS COPYING README manual-4.0.pdf README.fedora
 %{_bindir}/GMXRC
 %{_bindir}/GMXRC.bash
 %{_mandir}/man1/*
@@ -538,56 +532,60 @@
 
 
 %changelog
-* Mon Nov 10 2008 Jussi Lehtola - 4.0.2-6
+* Wed Jan 14 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0.2-7
+- Update manual to latest version.
+- Removed Requires: blas and lapack.
+
+* Mon Nov 10 2008 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0.2-6
 - Update to 4.0.2.
 
-* Sun Nov 09 2008 Jussi Lehtola - 4.0.1-5
+* Sun Nov 09 2008 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0.1-5
 - Add Requires: blas too.
 
-* Sun Nov 09 2008 Jussi Lehtola - 4.0.1-4
+* Sun Nov 09 2008 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0.1-4
 - Update to 4.0.1.
 - Add Requires: lapack and openmpi to prevent yum from pulling atlas and lam
 instead.
 
-* Wed Oct 15 2008 Jussi Lehtola - 4.0-3
+* Wed Oct 15 2008 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0-3
 - Rename also man pages.
 
-* Mon Oct 13 2008 Jussi Lehtola - 4.0-2
+* Mon Oct 13 2008 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0-2
 - Added noreplace to bash completion file.
 - Changed double precision mpi binary suffix to _mpi_d.
 
-* Sun Oct 12 2008 Jussi Lehtola - 4.0-1
+* Sun Oct 12 2008 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0-1
 - Update to Gromacs 4.0.
 - Remove module system and patch file names to begin with g_.
 
-* Wed Oct 08 2008 Jussi Lehtola - 4.0-0.15.rc3
+* Wed Oct 08 2008 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0-0.15.rc3
 - Changed location of binaries.
 - Removed conflict of module file, as the program is binary compatible with older versions.
 
-* Wed Oct 08 2008 Jussi Lehtola - 4.0-0.14.rc3
+* Wed Oct 08 2008 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0-0.14.rc3
 - The gromacs module is loaded automatically and it conflicts with gromacs3.
 
-* Tue Oct 07 2008 Jussi Lehtola - 4.0-0.13.rc3
+* Tue Oct 07 2008 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0-0.13.rc3
 - Renamed module files from %%{name}-%%{version} to %%{name}.
 
-* Mon Oct 06 2008 Jussi Lehtola - 4.0-0.12.rc3
+* Mon Oct 06 2008 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0-0.12.rc3
 - Fix BR to get GROMACS to build in mock for epel-4.
 
-* Sat Oct 04 2008 Jussi Lehtola - 4.0-0.11.rc3
+* Sat Oct 04 2008 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0-0.11.rc3
 - Fix to get GROMACS to build in mock for epel-5.
 
-* Sat Oct 04 2008 Jussi Lehtola - 4.0-0.10.rc3
+* Sat Oct 04 2008 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0-0.10.rc3
 - Implement module system & remove binary renaming.
 - No need for autoreconf anymore.
 - Update to rc3.
 
-* Sat Oct 04 2008 Jussi Lehtola - 4.0-0.9.rc2
+* Sat Oct 04 2008 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0-0.9.rc2
 - Fall back to autoreconf due to binary renaming.
 
-* Fri Oct 03 2008 Jussi Lehtola - 4.0-0.8.rc2
+* Fri Oct 03 2008 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0-0.8.rc2
 - Modified install commands to preserve timestamps.
 
-* Fri Oct 03 2008 Jussi Lehtola - 4.0-0.7.rc2
+* Fri Oct 03 2008 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0-0.7.rc2
 - Even more review fixes.
 - Binaries renamed:
 	highway	->	g_highway
@@ -595,31 +593,31 @@
 	sigeps	->	g_sigeps
 	wheel	->	g_wheel
 
-* Thu Oct 02 2008 Jussi Lehtola - 4.0-0.6.rc2
+* Thu Oct 02 2008 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0-0.6.rc2
 - Final review fixes.
 
-* Wed Oct 01 2008 Jussi Lehtola - 4.0-0.5.rc2
+* Wed Oct 01 2008 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0-0.5.rc2
 - Strip down requires by branching tutor to its own package.
 
-* Tue Sep 30 2008 Jussi Lehtola - 4.0-0.4.rc2
+* Tue Sep 30 2008 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0-0.4.rc2
 - Extensive package review fixes.
 - Unclear licenses on some files, filed upstream bug 217.
   http://bugzilla.gromacs.org/show_bug.cgi?id=217
 
-* Mon Sep 29 2008 Jussi Lehtola - 4.0-0.3.rc2
+* Mon Sep 29 2008 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0-0.3.rc2
 - Move .so files to -devel package.
 - Remove .la files.
 
-* Mon Sep 29 2008 Jussi Lehtola - 4.0-0.2.rc2
+* Mon Sep 29 2008 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0-0.2.rc2
 - Implement out-of-tree-builds.
 - Add --noexecstack to CFLAGS.
 - Remove execstack procedure and prelink from buildreqs.
 - Filed upstream bug 215 to add .note.GNU-stack .
 - Fix incorrect file permission on src/tools/gmx_xpm2ps.c .
 
-* Mon Sep 29 2008 Jussi Lehtola - 4.0-0.1.rc2
+* Mon Sep 29 2008 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0-0.1.rc2
 - Alphabetized buildrequires.
 - Changed gromacs-share to gromacs-common.
 
-* Fri Sep 26 2008 Jussi Lehtola - 4.0-0.0.rc2
+* Fri Sep 26 2008 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0-0.0.rc2
 - Initial build.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gromacs/F-9/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	10 Nov 2008 08:34:00 -0000	1.4
+++ sources	14 Jan 2009 12:16:29 -0000	1.5
@@ -1,2 +1,2 @@
-7a7680983a3a6fcc06b2817c6ab614fc  gromacs-4.0.pdf
 7a9eedf9ef365d32cd01355b8950ddc5  gromacs-4.0.2.tar.gz
+2b6565bef76109a579c39ec1dcb0ecf2  manual-4.0.pdf



From karsten at fedoraproject.org  Wed Jan 14 12:19:38 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Wed, 14 Jan 2009 12:19:38 +0000 (UTC)
Subject: rpms/hdparm/devel hdparm-9.8-nostrip.patch, NONE, 1.1 .cvsignore,
	1.19, 1.20 hdparm.spec, 1.43, 1.44 sources, 1.20,
	1.21 hdparm-8.4-nostrip.patch, 1.1, NONE
Message-ID: <20090114121938.E1FB270136@cvs1.fedora.phx.redhat.com>

Author: karsten

Update of /cvs/extras/rpms/hdparm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18026

Modified Files:
	.cvsignore hdparm.spec sources 
Added Files:
	hdparm-9.8-nostrip.patch 
Removed Files:
	hdparm-8.4-nostrip.patch 
Log Message:
- update

hdparm-9.8-nostrip.patch:

--- NEW FILE hdparm-9.8-nostrip.patch ---
diff -up hdparm-9.8/Makefile.nostrip hdparm-9.8/Makefile
--- hdparm-9.8/Makefile.nostrip	2009-01-14 12:48:52.000000000 +0100
+++ hdparm-9.8/Makefile	2009-01-14 12:49:17.000000000 +0100
@@ -16,7 +16,7 @@ STRIP ?= strip
 CFLAGS := -O2 -W -Wall -Wbad-function-cast -Wcast-align -Wpointer-arith -Wcast-qual -Wshadow -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -fkeep-inline-functions -Wwrite-strings -Waggregate-return -Wnested-externs -Wtrigraphs $(CFLAGS)
 
 #LDFLAGS = -s -static
-LDFLAGS = -s
+LDFLAGS =
 INSTALL = install
 INSTALL_DATA = $(INSTALL) -m 644
 INSTALL_DIR = $(INSTALL) -m 755 -d
@@ -28,7 +28,6 @@ all: hdparm
 
 hdparm: hdparm.h sgio.h $(OBJS)
 	$(CC) $(LDFLAGS) -o hdparm $(OBJS)
-	$(STRIP) hdparm
 
 hdparm.o:	hdparm.h sgio.h
 


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/hdparm/devel/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- .cvsignore	5 Mar 2008 12:51:01 -0000	1.19
+++ .cvsignore	14 Jan 2009 12:19:08 -0000	1.20
@@ -1 +1 @@
-hdparm-8.6.tar.gz
+hdparm-9.8.tar.gz


Index: hdparm.spec
===================================================================
RCS file: /cvs/extras/rpms/hdparm/devel/hdparm.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- hdparm.spec	5 Mar 2008 12:51:01 -0000	1.43
+++ hdparm.spec	14 Jan 2009 12:19:08 -0000	1.44
@@ -1,12 +1,12 @@
 Summary: A utility for displaying and/or setting hard disk parameters
 Name: hdparm
-Version: 8.6
+Version: 9.8
 Release: 1%{?dist}
 License: BSD
 Group: Applications/System
 URL:    http://sourceforge.net/projects/hdparm/
 Source: http://download.sourceforge.net/hdparm/hdparm-%{version}.tar.gz
-Patch0: hdparm-8.4-nostrip.patch
+Patch0: hdparm-9.8-nostrip.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 ExcludeArch: s390 s390x
 
@@ -41,6 +41,9 @@
 %{_mandir}/man8/hdparm.8*
 
 %changelog
+* Wed Jan 14 2009 Karsten Hopp <karsten at redhat.com> 9.8-1
+- update
+
 * Wed Mar 05 2008 Karsten Hopp <karsten at redhat.com> 8.6-1
 - update to 8.6
 - fix source URL


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/hdparm/devel/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources	5 Mar 2008 12:51:01 -0000	1.20
+++ sources	14 Jan 2009 12:19:08 -0000	1.21
@@ -1 +1 @@
-237fbceeeba6318b987983fd858994df  hdparm-8.6.tar.gz
+e393c9d938200b378dfa6a935825329c  hdparm-9.8.tar.gz


--- hdparm-8.4-nostrip.patch DELETED ---



From caolanm at fedoraproject.org  Wed Jan 14 12:19:55 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Wed, 14 Jan 2009 12:19:55 +0000 (UTC)
Subject: rpms/hunspell-en/devel .cvsignore, 1.14, 1.15 hunspell-en.spec, 1.27,
	1.28 sources, 1.16, 1.17
Message-ID: <20090114121955.DB8B670136@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/hunspell-en/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18086

Modified Files:
	.cvsignore hunspell-en.spec sources 
Log Message:
next version


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-en/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	13 Jan 2009 10:57:11 -0000	1.14
+++ .cvsignore	14 Jan 2009 12:19:25 -0000	1.15
@@ -1,2 +1,2 @@
 en_GB.zip
-wordlist-20090112.tar.bz2
+wordlist-20090114.tar.bz2


Index: hunspell-en.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-en/devel/hunspell-en.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- hunspell-en.spec	13 Jan 2009 10:57:11 -0000	1.27
+++ hunspell-en.spec	14 Jan 2009 12:19:25 -0000	1.28
@@ -1,6 +1,6 @@
 Name: hunspell-en
 Summary: English hunspell dictionaries
-%define upstreamid 20090112
+%define upstreamid 20090114
 Version: 0.%{upstreamid}
 Release: 1%{?dist}
 #svn co https://wordlist.svn.sourceforge.net/svnroot/wordlist/trunk wordlist
@@ -64,7 +64,7 @@
 %{_datadir}/myspell/*
 
 %changelog
-* Tue Jan 13 2009 Caolan McNamara <caolanm at redhat.com> - 0.20090112-1
+* Wed Jan 14 2009 Caolan McNamara <caolanm at redhat.com> - 0.20090114-1
 - latest version
 
 * Sun Jan 11 2009 Caolan McNamara <caolanm at redhat.com> - 0.20090110-1


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-en/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources	13 Jan 2009 10:57:11 -0000	1.16
+++ sources	14 Jan 2009 12:19:25 -0000	1.17
@@ -1,2 +1,2 @@
 218909136738f4564b81ecd145ade6ee  en_GB.zip
-439b7c6d5d450302d304baca1922b434  wordlist-20090112.tar.bz2
+d7b135d273fcb105bf242621c2e586c1  wordlist-20090114.tar.bz2



From denis at fedoraproject.org  Wed Jan 14 12:21:40 2009
From: denis at fedoraproject.org (Denis Leroy)
Date: Wed, 14 Jan 2009 12:21:40 +0000 (UTC)
Subject: rpms/glibmm24/devel .cvsignore, 1.33, 1.34 glibmm.spec, 1.49,
	1.50 sources, 1.34, 1.35
Message-ID: <20090114122140.BF16A70136@cvs1.fedora.phx.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/glibmm24/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18440

Modified Files:
	.cvsignore glibmm.spec sources 
Log Message:
Update to upstream 2.19.1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/glibmm24/devel/.cvsignore,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- .cvsignore	21 Oct 2008 11:31:57 -0000	1.33
+++ .cvsignore	14 Jan 2009 12:21:10 -0000	1.34
@@ -1 +1 @@
-glibmm-2.18.1.tar.bz2
+glibmm-2.19.1.tar.bz2


Index: glibmm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/glibmm24/devel/glibmm.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- glibmm.spec	10 Dec 2008 18:05:11 -0000	1.49
+++ glibmm.spec	14 Jan 2009 12:21:10 -0000	1.50
@@ -1,6 +1,6 @@
 Name:           glibmm24
-Version:        2.18.1
-Release:        2%{?dist}
+Version:        2.19.1
+Release:        1%{?dist}
 Summary:        C++ interface for GTK2 (a GUI library for X)
 
 Group:          System Environment/Libraries
@@ -10,7 +10,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libsigc++20-devel >= 2.0.0
-BuildRequires:  glib2-devel >= 2.17.3
+BuildRequires:  glib2-devel >= 2.19.0
 
 
 %description
@@ -100,6 +100,9 @@
 
 
 %changelog
+* Wed Jan 14 2009 Denis Leroy <denis at poolshark.org> - 2.19.1-1
+- Update to upstream 2.19.1
+
 * Thu Dec 11 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.18.1-2
 - Rebuild for pkgconfig provides
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/glibmm24/devel/sources,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- sources	21 Oct 2008 11:31:57 -0000	1.34
+++ sources	14 Jan 2009 12:21:10 -0000	1.35
@@ -1 +1 @@
-942290a4b77dac3ea18a5b70373fe04c  glibmm-2.18.1.tar.bz2
+4346ac42b8a2b53a08572df0eaf8493e  glibmm-2.19.1.tar.bz2



From karsten at fedoraproject.org  Wed Jan 14 12:44:38 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Wed, 14 Jan 2009 12:44:38 +0000 (UTC)
Subject: rpms/automake/devel .cvsignore, 1.20, 1.21 automake.spec, 1.37,
	1.38 sources, 1.20, 1.21
Message-ID: <20090114124438.B29C770141@cvs1.fedora.phx.redhat.com>

Author: karsten

Update of /cvs/extras/rpms/automake/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19971

Modified Files:
	.cvsignore automake.spec sources 
Log Message:
- version 1.10.2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/automake/devel/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- .cvsignore	25 Jan 2008 11:02:16 -0000	1.20
+++ .cvsignore	14 Jan 2009 12:44:08 -0000	1.21
@@ -1 +1 @@
-automake-1.10.1.tar.bz2
+automake-1.10.2.tar.bz2


Index: automake.spec
===================================================================
RCS file: /cvs/extras/rpms/automake/devel/automake.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- automake.spec	4 Feb 2008 13:49:44 -0000	1.37
+++ automake.spec	14 Jan 2009 12:44:08 -0000	1.38
@@ -2,8 +2,8 @@
 
 Summary:    A GNU tool for automatically creating Makefiles
 Name:       automake
-Version:    %{api_version}.1
-Release:    2
+Version:    %{api_version}.2
+Release:    1
 License:    GPLv2+ and GFDL and MIT 
 Group:      Development/Tools
 Source:     http://ftp.gnu.org/gnu/automake/automake-%{version}.tar.bz2
@@ -78,6 +78,9 @@
 %dir %{_datadir}/aclocal
 
 %changelog
+* Wed Jan 14 2009 Karsten Hopp <karsten at redhat.com> 1.10.2-1
+- version 1.10.2
+
 * Mon Feb  4 2008 Stepan Kasal <skasal at redhat.com> 1.10.1-2
 - require autoconf 2.60 or later
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/automake/devel/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources	25 Jan 2008 11:02:16 -0000	1.20
+++ sources	14 Jan 2009 12:44:08 -0000	1.21
@@ -1 +1 @@
-4510391e6b3edaa4cffb3ced87c9560c  automake-1.10.1.tar.bz2
+1498208ab1c8393dcbd9afb7d06df6d5  automake-1.10.2.tar.bz2



From karsten at fedoraproject.org  Wed Jan 14 13:03:27 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Wed, 14 Jan 2009 13:03:27 +0000 (UTC)
Subject: rpms/dictd/devel dictd-1.9.15-cflags.patch,1.1,NONE
Message-ID: <20090114130327.B46C870136@cvs1.fedora.phx.redhat.com>

Author: karsten

Update of /cvs/extras/rpms/dictd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22206

Removed Files:
	dictd-1.9.15-cflags.patch 
Log Message:
- remove unused patch


--- dictd-1.9.15-cflags.patch DELETED ---



From ovasik at fedoraproject.org  Wed Jan 14 13:10:38 2009
From: ovasik at fedoraproject.org (Ondrej Vasik)
Date: Wed, 14 Jan 2009 13:10:38 +0000 (UTC)
Subject: rpms/docbook5-style-xsl/devel docbook5-style-xsl.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090114131038.4259070136@cvs1.fedora.phx.redhat.com>

Author: ovasik

Update of /cvs/extras/rpms/docbook5-style-xsl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22844

Modified Files:
	.cvsignore sources 
Added Files:
	docbook5-style-xsl.spec 
Log Message:
Initial Fedora release


--- NEW FILE docbook5-style-xsl.spec ---
Name: docbook5-style-xsl
Version: 1.74.0
Release: 1%{?dist}
Group: Applications/Text

Summary: Norman Walsh's XSL stylesheets for DocBook 5.X

License: Freely redistributable without restriction
URL: http://docbook.sourceforge.net/projects/xsl/

Provides: docbook-xsl-ns = %{version}
# xml-common was using /usr/share/xml until 0.6.3-8.
Requires: xml-common >= 0.6.3-8
# libxml2 required because of usage of /usr/bin/xmlcatalog
Requires(post): libxml2 >= 2.4.8
Requires(postun): libxml2 >= 2.4.8
Conflicts: passivetex < 1.21

BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root

BuildArch: noarch
Source0: http://downloads.sourceforge.net/docbook/docbook-xsl-ns-%{version}.tar.bz2

%description
These XSL namespace aware stylesheets allow you to transform any
DocBook 5 document to other formats, such as HTML, manpages, FO,
XHMTL and other formats. They are highly customizable. For more
information see W3C page about XSL.

%prep
%setup -q -n docbook-xsl-ns-%{version}
#remove .gitignore files
rm -rf $(find -name '.gitignore' -type f)
#make ruby scripts executable
chmod +x epub/bin/dbtoepub
chmod +x epub/bin/spec/epub*.rb

%build

%install
DESTDIR=$RPM_BUILD_ROOT
rm -rf $RPM_BUILD_ROOT
mkdir -p $DESTDIR%{_datadir}/sgml/docbook/xsl-ns-stylesheets-%version
cp -a [[:lower:]]* $DESTDIR%{_datadir}/sgml/docbook/xsl-ns-stylesheets-%version/
ln -s xsl-ns-stylesheets-%{version} \
 $DESTDIR%{_datadir}/sgml/docbook/xsl-ns-stylesheets

# Don't ship the extensions.
rm -rf $DESTDIR%{_datadir}/sgml/docbook/xsl-ns-stylesheets/extensions
# Don't ship install shell script.
rm -rf $DESTDIR%{_datadir}/sgml/docbook/xsl-ns-stylesheets/install.sh

%clean
DESTDIR=$RPM_BUILD_ROOT
rm -rf $RPM_BUILD_ROOT

%files
%defattr (-,root,root,-)
%doc BUGS
%doc README COPYING
%doc TODO NEWS
%{_datadir}/sgml/docbook/xsl-ns-stylesheets-%{version}
%{_datadir}/sgml/docbook/xsl-ns-stylesheets

%post
CATALOG=%{_sysconfdir}/xml/catalog
%{_bindir}/xmlcatalog --noout --add "rewriteSystem" \
 "http://docbook.sourceforge.net/release/xsl-ns/%{version}" \
 "file://%{_datadir}/sgml/docbook/xsl-ns-stylesheets-%{version}" $CATALOG
%{_bindir}/xmlcatalog --noout --add "rewriteURI" \
 "http://docbook.sourceforge.net/release/xsl-ns/%{version}" \
 "file://%{_datadir}/sgml/docbook/xsl-ns-stylesheets-%{version}" $CATALOG
%{_bindir}/xmlcatalog --noout --add "rewriteSystem" \
 "http://docbook.sourceforge.net/release/xsl-ns/current" \
 "file://%{_datadir}/sgml/docbook/xsl-ns-stylesheets-%{version}" $CATALOG
%{_bindir}/xmlcatalog --noout --add "rewriteURI" \
 "http://docbook.sourceforge.net/release/xsl-ns/current" \
 "file://%{_datadir}/sgml/docbook/xsl-ns-stylesheets-%{version}" $CATALOG


%postun
# remove entries only on removal of package
if [ "$1" = 0 ]; then
  CATALOG=%{_sysconfdir}/xml/catalog
  %{_bindir}/xmlcatalog --noout --del \
   "file://%{_datadir}/sgml/docbook/xsl-ns-stylesheets-%{version}" $CATALOG
fi

%changelog
* Mon Nov 10 2008 Ondrej Vasik <ovasik at redhat.com> 1.74.0-1
- Initial Fedora release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/docbook5-style-xsl/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	13 Jan 2009 20:25:44 -0000	1.1
+++ .cvsignore	14 Jan 2009 13:10:07 -0000	1.2
@@ -0,0 +1 @@
+docbook-xsl-ns-1.74.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/docbook5-style-xsl/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	13 Jan 2009 20:25:44 -0000	1.1
+++ sources	14 Jan 2009 13:10:07 -0000	1.2
@@ -0,0 +1 @@
+42f5f41ff5822c57242d9413e7f98aef  docbook-xsl-ns-1.74.0.tar.bz2



From victorv at fedoraproject.org  Wed Jan 14 13:15:03 2009
From: victorv at fedoraproject.org (Victor G. Vasilyev)
Date: Wed, 14 Jan 2009 13:15:03 +0000 (UTC)
Subject: rpms/netbeans-platform/devel import.log, NONE,
	1.1 netbeans-platform-6.5-build_bootstrap.patch, NONE,
	1.1 netbeans-platform-6.5-properties.patch, NONE,
	1.1 netbeans-platform-6.5-win_launcher.patch, NONE,
	1.1 netbeans-platform.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090114131503.C755E70141@cvs1.fedora.phx.redhat.com>

Author: victorv

Update of /cvs/pkgs/rpms/netbeans-platform/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23170/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log netbeans-platform-6.5-build_bootstrap.patch 
	netbeans-platform-6.5-properties.patch 
	netbeans-platform-6.5-win_launcher.patch 
	netbeans-platform.spec 
Log Message:
Initial version of the NetBeans Platform



--- NEW FILE import.log ---
netbeans-platform-6_5-4_fc11:HEAD:netbeans-platform-6.5-4.fc11.src.rpm:1231938808

netbeans-platform-6.5-build_bootstrap.patch:

--- NEW FILE netbeans-platform-6.5-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-platform-6.5-properties.patch:

--- NEW FILE netbeans-platform-6.5-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-platform-6.5-win_launcher.patch:

--- NEW FILE netbeans-platform-6.5-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-platform.spec ---
# Prevent brp-java-repack-jars from being run.
%define __jar_repack %{nil}

%define nb_             netbeans
%define nb_ver          6.5
%define nb_release_time 200811100001
%define nb_home         %{_datadir}/%{nb_}
%define nb_dir          %{nb_home}/%{nb_ver}

%define nb_platform_ver 9
%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

Name:         netbeans-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

Source0: http://download.netbeans.org/%{nb_}/%{version}/final/zip/%{nb_}-%{version}-%{nb_release_time}-ml-platform-src.zip

Patch0: %{name}-%{version}-build_bootstrap.patch
Patch1: %{name}-%{version}-properties.patch
# 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: junit4 >= 4.5
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

Obsoletes: netbeans-platform8 < 6.5

%description
The NetBeans Platform is a generic framework for Swing applications. 
It provides the services common to almost all large desktop applications: 
window management, menus, settings and storage, update management, file 
access, etc.

%package %{nb_javadoc}
Summary: Javadoc documentation for NetBeans Platform %{nb_platform_ver}
Group: Documentation
Obsoletes: netbeans-platform8-javadoc < 6.5
%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
Obsoletes: netbeans-platform8-harness < 6.5
%description %{nb_harness}
Harness with build scripts and ant tasks for everyone who
build an application on top of NetBeans Platform

%prep
%setup -q -c 

find . -type f \( -iname "*.jar" -o -iname "*.zip" \) | xargs -t %{__rm} -f
find . -type f \( -iname "*.exe" \) | xargs -t %{__rm} -f
find . -type f \( -iname "binaries-list" \) | 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
%{__ln_s} -f %{_javadir}/junit4.jar libs.junit4/external/junit-4.5.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
%{__ln_s} -f %{_javadir}/junit4.jar nbbuild/netbeans/%{nb_platform}/modules/ext/junit-4.5.jar

# build platform harness
%{ant_nb_opt} -f apisupport.harness/build.xml
%{__ln_s} -f %{_javadir}/javahelp2.jar nbbuild/netbeans/%{nb_harness}/jsearch-2.0_05.jar

# build platform javadoc
%{ant_nb_opt} \
   -Dallmodules= \
   -Dcluster.config=platform \
   -Dconfig.javadoc.cluster=%{nb_platform} \
   -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_platform}/modules/ext/junit-4.5.jar
%{__rm} -f nbbuild/netbeans/%{nb_harness}/jsearch-2.0_05.jar

# clean up stub jars
%{__rm} -f nbbuild/netbeans/%{nb_platform}/modules/ext/script-api.jar

%install

%{__rm} -rf %{buildroot}

# install platform
%{__mkdir_p} %{buildroot}%{nb_platform_dir}
%{__cp} -pr nbbuild/netbeans/%{nb_platform}/* %{buildroot}%{nb_platform_dir}
%noautoupdate %{buildroot}%{nb_platform_dir}

# linking the platform to the external JARs
%{__ln_s} -f %{_javadir}/swing-layout.jar %{buildroot}%{nb_platform_dir}/modules/ext/swing-layout-1.0.3.jar
%{__ln_s} -f %{_javadir}/javahelp2.jar %{buildroot}%{nb_platform_dir}/modules/ext/jsearch-2.0_05.jar
%{__ln_s} -f %{_javadir}/javahelp2.jar %{buildroot}%{nb_platform_dir}/modules/ext/jh-2.0_05.jar
%{__ln_s} -f %{_javadir}/jna.jar %{buildroot}%{nb_platform_dir}/modules/ext/jna-3.0.2.jar
%{__ln_s} -f %{_javadir}/junit4.jar %{buildroot}%{nb_platform_dir}/modules/ext/junit-4.5.jar

# install harness
%{__mkdir_p} %{buildroot}%{nb_harness_dir}
%{__cp} -pr nbbuild/netbeans/%{nb_harness}/* %{buildroot}%{nb_harness_dir}
%noautoupdate %{buildroot}%{nb_harness_dir}

# linking the harness to the external JARs
%{__ln_s} -f %{_javadir}/javahelp2.jar %{buildroot}%{nb_harness_dir}/jsearch-2.0_05.jar

# install javadoc
%{__mkdir_p} %{buildroot}%{nb_javadoc_dir}
%{__cp} -pr nbbuild/build/javadoc/* %{buildroot}%{nb_javadoc_dir}

%clean
%{__rm} -rf %{buildroot}

%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
%{nb_platform_dir}/.noautoupdate

%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}/suite.xml.orig
%{nb_harness_dir}/tasks.jar
%{nb_harness_dir}/.noautoupdate

%files %{nb_javadoc}
%defattr(-,root,root,-)
%doc %{nb_javadoc_dir}/

%changelog
* Mon Jan 12 2009 Victor Vasilyev <victor.vasilyev at sun.com> 6.5-4
- Creation of the .noautoupdate files is  moved to the install section

* Tue Dec 30 2008 Victor Vasilyev <victor.vasilyev at sun.com> 6.5-3
- The "Distrubution" tag is deleted
- The "6.1" references are removed from the changelog
- Specifications of providing non-Fedora packages are removed

* Tue Dec 19 2008 Victor Vasilyev <victor.vasilyev at sun.com> 6.5-2
- The platform version number is removed from the package names
- "Obsoletes" are added for the netbeans-platform8* packages

* Tue Dec 02 2008 Victor Vasilyev <victor.vasilyev at sun.com> 6.5-1
- Bootstrapping of the spec 6.1 for platform of the NetBeans 6.5
- Patch for the fixed issue http://www.netbeans.org/issues/show_bug.cgi?id=143729 is deleted
- The binaries-list files are removed from the sources
- BR junit -> junit4
- An original of suite.xml is saved as suite.xml.orig in the harness
- Call of the brp-java-repack-jars script is disabled
- Description for the platform is changed
- A previous version of harness is marked as obsolete


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/netbeans-platform/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	13 Jan 2009 21:24:20 -0000	1.1
+++ .cvsignore	14 Jan 2009 13:14:33 -0000	1.2
@@ -0,0 +1 @@
+netbeans-6.5-200811100001-ml-platform-src.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/netbeans-platform/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	13 Jan 2009 21:24:20 -0000	1.1
+++ sources	14 Jan 2009 13:14:33 -0000	1.2
@@ -0,0 +1 @@
+2925d770380fbd028230788120816281  netbeans-6.5-200811100001-ml-platform-src.zip



From mgrepl at fedoraproject.org  Wed Jan 14 13:18:17 2009
From: mgrepl at fedoraproject.org (Miroslav Grepl)
Date: Wed, 14 Jan 2009 13:18:17 +0000 (UTC)
Subject: rpms/selinux-policy/F-9 policy-20071130.patch,1.247,1.248
Message-ID: <20090114131817.640D570136@cvs1.fedora.phx.redhat.com>

Author: mgrepl

Update of /cvs/extras/rpms/selinux-policy/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24324

Modified Files:
	policy-20071130.patch 
Log Message:
- Lots of fixes for munin



policy-20071130.patch:

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.247 -r 1.248 policy-20071130.patch
Index: policy-20071130.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-9/policy-20071130.patch,v
retrieving revision 1.247
retrieving revision 1.248
diff -u -r1.247 -r1.248
--- policy-20071130.patch	13 Jan 2009 18:49:47 -0000	1.247
+++ policy-20071130.patch	14 Jan 2009 13:18:13 -0000	1.248
@@ -1,25 +1,15 @@
-Binary files nsaserefpolicy/amavis.pp and serefpolicy-3.3.1/amavis.pp differ
 Binary files nsaserefpolicy/amtu.pp and serefpolicy-3.3.1/amtu.pp differ
-Binary files nsaserefpolicy/apcupsd.pp and serefpolicy-3.3.1/apcupsd.pp differ
-Binary files nsaserefpolicy/audioentropy.pp and serefpolicy-3.3.1/audioentropy.pp differ
-Binary files nsaserefpolicy/awstats.pp and serefpolicy-3.3.1/awstats.pp differ
+Binary files nsaserefpolicy/auditadm.pp and serefpolicy-3.3.1/auditadm.pp differ
 Binary files nsaserefpolicy/base.pp and serefpolicy-3.3.1/base.pp differ
-Binary files nsaserefpolicy/bitlbee.pp and serefpolicy-3.3.1/bitlbee.pp differ
-Binary files nsaserefpolicy/calamaris.pp and serefpolicy-3.3.1/calamaris.pp differ
-Binary files nsaserefpolicy/ccs.pp and serefpolicy-3.3.1/ccs.pp differ
-Binary files nsaserefpolicy/cdrecord.pp and serefpolicy-3.3.1/cdrecord.pp differ
-Binary files nsaserefpolicy/certwatch.pp and serefpolicy-3.3.1/certwatch.pp differ
-Binary files nsaserefpolicy/cipe.pp and serefpolicy-3.3.1/cipe.pp differ
-Binary files nsaserefpolicy/clamav.pp and serefpolicy-3.3.1/clamav.pp differ
 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-02-26 14:23:12.000000000 +0100
-+++ serefpolicy-3.3.1/config/appconfig-mcs/failsafe_context	2009-01-13 19:18:30.000000000 +0100
++++ serefpolicy-3.3.1/config/appconfig-mcs/failsafe_context	2009-01-14 11:05:46.000000000 +0100
 @@ -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	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.3.1/config/appconfig-mcs/guest_u_default_contexts	2009-01-13 19:18:30.000000000 +0100
++++ serefpolicy-3.3.1/config/appconfig-mcs/guest_u_default_contexts	2009-01-14 11:05:46.000000000 +0100
 @@ -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
@@ -29,7 +19,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-02-26 14:23:12.000000000 +0100
-+++ serefpolicy-3.3.1/config/appconfig-mcs/root_default_contexts	2009-01-13 19:18:30.000000000 +0100
++++ serefpolicy-3.3.1/config/appconfig-mcs/root_default_contexts	2009-01-14 11:05:46.000000000 +0100
 @@ -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
@@ -45,7 +35,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-02-26 14:23:12.000000000 +0100
-+++ serefpolicy-3.3.1/config/appconfig-mcs/staff_u_default_contexts	2009-01-13 19:18:30.000000000 +0100
++++ serefpolicy-3.3.1/config/appconfig-mcs/staff_u_default_contexts	2009-01-14 11:05:46.000000000 +0100
 @@ -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
@@ -57,7 +47,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	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.3.1/config/appconfig-mcs/unconfined_u_default_contexts	2009-01-13 19:18:30.000000000 +0100
++++ serefpolicy-3.3.1/config/appconfig-mcs/unconfined_u_default_contexts	2009-01-14 11:05:46.000000000 +0100
 @@ -0,0 +1,11 @@
 +system_r:crond_t:s0		unconfined_r:unconfined_t:s0
 +system_r:initrc_t:s0		unconfined_r:unconfined_t:s0
@@ -72,13 +62,13 @@
 +system_r:xdm_t:s0		unconfined_r:unconfined_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-02-26 14:23:12.000000000 +0100
-+++ serefpolicy-3.3.1/config/appconfig-mcs/userhelper_context	2009-01-13 19:18:30.000000000 +0100
++++ serefpolicy-3.3.1/config/appconfig-mcs/userhelper_context	2009-01-14 11:05:46.000000000 +0100
 @@ -1 +1 @@
 -system_u:sysadm_r:sysadm_t:s0
 +system_u:system_r:unconfined_t:s0	
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/user_u_default_contexts serefpolicy-3.3.1/config/appconfig-mcs/user_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/user_u_default_contexts	2008-02-26 14:23:12.000000000 +0100
-+++ serefpolicy-3.3.1/config/appconfig-mcs/user_u_default_contexts	2009-01-13 19:18:30.000000000 +0100
++++ serefpolicy-3.3.1/config/appconfig-mcs/user_u_default_contexts	2009-01-14 11:05:46.000000000 +0100
 @@ -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
@@ -88,7 +78,7 @@
 +user_r:user_t:s0		user_r:user_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	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.3.1/config/appconfig-mcs/x_contexts	2009-01-13 19:18:30.000000000 +0100
++++ serefpolicy-3.3.1/config/appconfig-mcs/x_contexts	2009-01-14 11:05:46.000000000 +0100
 @@ -0,0 +1,188 @@
 +#
 +# Config file for XSELinux extension
@@ -280,7 +270,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	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.3.1/config/appconfig-mcs/xguest_u_default_contexts	2009-01-13 19:18:30.000000000 +0100
++++ serefpolicy-3.3.1/config/appconfig-mcs/xguest_u_default_contexts	2009-01-14 11:05:46.000000000 +0100
 @@ -0,0 +1,7 @@
 +system_r:local_login_t	xguest_r:xguest_t:s0
 +system_r:remote_login_t	xguest_r:xguest_t:s0
@@ -291,7 +281,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	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.3.1/config/appconfig-mls/guest_u_default_contexts	2009-01-13 19:18:30.000000000 +0100
++++ serefpolicy-3.3.1/config/appconfig-mls/guest_u_default_contexts	2009-01-14 11:05:46.000000000 +0100
 @@ -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
@@ -299,7 +289,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	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.3.1/config/appconfig-mls/x_contexts	2009-01-13 19:18:30.000000000 +0100
++++ serefpolicy-3.3.1/config/appconfig-mls/x_contexts	2009-01-14 11:05:46.000000000 +0100
 @@ -0,0 +1,188 @@
 +#
 +# Config file for XSELinux extension
@@ -491,7 +481,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	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.3.1/config/appconfig-standard/guest_u_default_contexts	2009-01-13 19:18:30.000000000 +0100
++++ serefpolicy-3.3.1/config/appconfig-standard/guest_u_default_contexts	2009-01-14 11:05:46.000000000 +0100
 @@ -0,0 +1,4 @@
 +system_r:local_login_t	guest_r:guest_t
 +system_r:remote_login_t	guest_r:guest_t
@@ -499,7 +489,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-02-26 14:23:12.000000000 +0100
-+++ serefpolicy-3.3.1/config/appconfig-standard/root_default_contexts	2009-01-13 19:18:30.000000000 +0100
++++ serefpolicy-3.3.1/config/appconfig-standard/root_default_contexts	2009-01-14 11:05:46.000000000 +0100
 @@ -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
@@ -515,7 +505,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	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.3.1/config/appconfig-standard/x_contexts	2009-01-13 19:18:30.000000000 +0100
++++ serefpolicy-3.3.1/config/appconfig-standard/x_contexts	2009-01-14 11:05:46.000000000 +0100
 @@ -0,0 +1,188 @@
 +#
 +# Config file for XSELinux extension
@@ -707,21 +697,17 @@
 +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	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.3.1/config/appconfig-standard/xguest_u_default_contexts	2009-01-13 19:18:30.000000000 +0100
++++ serefpolicy-3.3.1/config/appconfig-standard/xguest_u_default_contexts	2009-01-14 11:05:46.000000000 +0100
 @@ -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
-Binary files nsaserefpolicy/consolekit.pp and serefpolicy-3.3.1/consolekit.pp differ
 Binary files nsaserefpolicy/courier.pp and serefpolicy-3.3.1/courier.pp differ
-Binary files nsaserefpolicy/cyphesis.pp and serefpolicy-3.3.1/cyphesis.pp differ
-Binary files nsaserefpolicy/daemontools.pp and serefpolicy-3.3.1/daemontools.pp differ
-Binary files nsaserefpolicy/dcc.pp and serefpolicy-3.3.1/dcc.pp differ
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/doc/global_booleans.xml serefpolicy-3.3.1/doc/global_booleans.xml
 --- nsaserefpolicy/doc/global_booleans.xml	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.3.1/doc/global_booleans.xml	2009-01-13 19:18:38.000000000 +0100
++++ serefpolicy-3.3.1/doc/global_booleans.xml	2009-01-14 11:07:04.000000000 +0100
 @@ -0,0 +1,25 @@
 +<bool name="secure_mode" dftval="false">
 +<desc>
@@ -750,7 +736,7 @@
 +</bool>
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/doc/global_tunables.xml serefpolicy-3.3.1/doc/global_tunables.xml
 --- nsaserefpolicy/doc/global_tunables.xml	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.3.1/doc/global_tunables.xml	2009-01-13 19:18:38.000000000 +0100
++++ serefpolicy-3.3.1/doc/global_tunables.xml	2009-01-14 11:07:04.000000000 +0100
 @@ -0,0 +1,124 @@
 +<tunable name="allow_execheap" dftval="false">
 +<desc>
@@ -876,27 +862,570908 @@
 +</p>
 +</desc>
 +</tunable>
-Binary files nsaserefpolicy/ethereal.pp and serefpolicy-3.3.1/ethereal.pp differ
-Binary files nsaserefpolicy/exim.pp and serefpolicy-3.3.1/exim.pp differ
-Binary files nsaserefpolicy/fail2ban.pp and serefpolicy-3.3.1/fail2ban.pp differ
-Binary files nsaserefpolicy/games.pp and serefpolicy-3.3.1/games.pp differ
-Binary files nsaserefpolicy/gamin.pp and serefpolicy-3.3.1/gamin.pp differ
-Binary files nsaserefpolicy/gnomeclock.pp and serefpolicy-3.3.1/gnomeclock.pp differ
-Binary files nsaserefpolicy/gnome.pp and serefpolicy-3.3.1/gnome.pp differ
-Binary files nsaserefpolicy/gpg.pp and serefpolicy-3.3.1/gpg.pp differ
-Binary files nsaserefpolicy/guest.pp and serefpolicy-3.3.1/guest.pp differ
-Binary files nsaserefpolicy/hal.pp and serefpolicy-3.3.1/hal.pp differ
-Binary files nsaserefpolicy/ipsec.pp and serefpolicy-3.3.1/ipsec.pp differ
-Binary files nsaserefpolicy/irc.pp and serefpolicy-3.3.1/irc.pp differ
-Binary files nsaserefpolicy/iscsi.pp and serefpolicy-3.3.1/iscsi.pp differ
-Binary files nsaserefpolicy/kerneloops.pp and serefpolicy-3.3.1/kerneloops.pp differ
-Binary files nsaserefpolicy/kismet.pp and serefpolicy-3.3.1/kismet.pp differ
-Binary files nsaserefpolicy/lockdev.pp and serefpolicy-3.3.1/lockdev.pp differ
-Binary files nsaserefpolicy/logadm.pp and serefpolicy-3.3.1/logadm.pp differ
-Binary files nsaserefpolicy/mailscanner.pp and serefpolicy-3.3.1/mailscanner.pp differ
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/doc/html/admin_acct.html serefpolicy-3.3.1/doc/html/admin_acct.html
+--- nsaserefpolicy/doc/html/admin_acct.html	1970-01-01 01:00:00.000000000 +0100
[...575581 lines suppressed...]
 +# 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	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.3.1/policy/modules/users/guest.if	2009-01-13 19:18:30.000000000 +0100
++++ serefpolicy-3.3.1/policy/modules/users/guest.if	2009-01-14 11:05:46.000000000 +0100
 @@ -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	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.3.1/policy/modules/users/guest.te	2009-01-13 19:18:30.000000000 +0100
++++ serefpolicy-3.3.1/policy/modules/users/guest.te	2009-01-14 11:05:46.000000000 +0100
 @@ -0,0 +1,33 @@
 +policy_module(guest,1.0.1)
 +userdom_restricted_user_template(guest)
@@ -106826,17 +677757,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	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.3.1/policy/modules/users/logadm.fc	2009-01-13 19:18:30.000000000 +0100
++++ serefpolicy-3.3.1/policy/modules/users/logadm.fc	2009-01-14 11:05:46.000000000 +0100
 @@ -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	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.3.1/policy/modules/users/logadm.if	2009-01-13 19:18:30.000000000 +0100
++++ serefpolicy-3.3.1/policy/modules/users/logadm.if	2009-01-14 11:05:46.000000000 +0100
 @@ -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	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.3.1/policy/modules/users/logadm.te	2009-01-13 19:18:30.000000000 +0100
++++ serefpolicy-3.3.1/policy/modules/users/logadm.te	2009-01-14 11:05:46.000000000 +0100
 @@ -0,0 +1,11 @@
 +policy_module(logadm,1.0.0)
 +
@@ -106851,22 +677782,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	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.3.1/policy/modules/users/metadata.xml	2009-01-13 19:18:30.000000000 +0100
++++ serefpolicy-3.3.1/policy/modules/users/metadata.xml	2009-01-14 11:05:46.000000000 +0100
 @@ -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	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.3.1/policy/modules/users/secadm.fc	2009-01-13 19:18:30.000000000 +0100
++++ serefpolicy-3.3.1/policy/modules/users/secadm.fc	2009-01-14 11:05:46.000000000 +0100
 @@ -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	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.3.1/policy/modules/users/secadm.if	2009-01-13 19:18:30.000000000 +0100
++++ serefpolicy-3.3.1/policy/modules/users/secadm.if	2009-01-14 11:05:46.000000000 +0100
 @@ -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	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.3.1/policy/modules/users/secadm.te	2009-01-13 19:18:30.000000000 +0100
++++ serefpolicy-3.3.1/policy/modules/users/secadm.te	2009-01-14 11:05:46.000000000 +0100
 @@ -0,0 +1,39 @@
 +policy_module(secadm,1.0.1)
 +gen_require(`
@@ -106909,17 +677840,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	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.3.1/policy/modules/users/staff.fc	2009-01-13 19:18:30.000000000 +0100
++++ serefpolicy-3.3.1/policy/modules/users/staff.fc	2009-01-14 11:05:46.000000000 +0100
 @@ -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	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.3.1/policy/modules/users/staff.if	2009-01-13 19:18:30.000000000 +0100
++++ serefpolicy-3.3.1/policy/modules/users/staff.if	2009-01-14 11:05:46.000000000 +0100
 @@ -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	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.3.1/policy/modules/users/staff.te	2009-01-13 19:18:30.000000000 +0100
++++ serefpolicy-3.3.1/policy/modules/users/staff.te	2009-01-14 11:05:46.000000000 +0100
 @@ -0,0 +1,30 @@
 +policy_module(staff,1.0.1)
 +userdom_admin_login_user_template(staff)
@@ -106953,17 +677884,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	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.3.1/policy/modules/users/user.fc	2009-01-13 19:18:30.000000000 +0100
++++ serefpolicy-3.3.1/policy/modules/users/user.fc	2009-01-14 11:05:46.000000000 +0100
 @@ -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	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.3.1/policy/modules/users/user.if	2009-01-13 19:18:30.000000000 +0100
++++ serefpolicy-3.3.1/policy/modules/users/user.if	2009-01-14 11:05:46.000000000 +0100
 @@ -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	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.3.1/policy/modules/users/user.te	2009-01-13 19:18:30.000000000 +0100
++++ serefpolicy-3.3.1/policy/modules/users/user.te	2009-01-14 11:05:46.000000000 +0100
 @@ -0,0 +1,18 @@
 +policy_module(user,1.0.1)
 +userdom_unpriv_user_template(user)
@@ -106985,17 +677916,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	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.3.1/policy/modules/users/webadm.fc	2009-01-13 19:18:30.000000000 +0100
++++ serefpolicy-3.3.1/policy/modules/users/webadm.fc	2009-01-14 11:05:46.000000000 +0100
 @@ -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	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.3.1/policy/modules/users/webadm.if	2009-01-13 19:18:30.000000000 +0100
++++ serefpolicy-3.3.1/policy/modules/users/webadm.if	2009-01-14 11:05:46.000000000 +0100
 @@ -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	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.3.1/policy/modules/users/webadm.te	2009-01-13 19:18:30.000000000 +0100
++++ serefpolicy-3.3.1/policy/modules/users/webadm.te	2009-01-14 11:05:46.000000000 +0100
 @@ -0,0 +1,41 @@
 +policy_module(webadm,1.0.0)
 +
@@ -107040,17 +677971,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	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.3.1/policy/modules/users/xguest.fc	2009-01-13 19:18:30.000000000 +0100
++++ serefpolicy-3.3.1/policy/modules/users/xguest.fc	2009-01-14 11:05:46.000000000 +0100
 @@ -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	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.3.1/policy/modules/users/xguest.if	2009-01-13 19:18:30.000000000 +0100
++++ serefpolicy-3.3.1/policy/modules/users/xguest.if	2009-01-14 11:05:46.000000000 +0100
 @@ -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	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.3.1/policy/modules/users/xguest.te	2009-01-13 19:18:30.000000000 +0100
++++ serefpolicy-3.3.1/policy/modules/users/xguest.te	2009-01-14 11:05:46.000000000 +0100
 @@ -0,0 +1,69 @@
 +policy_module(xguest,1.0.1)
 +
@@ -107123,7 +678054,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-02-26 14:23:09.000000000 +0100
-+++ serefpolicy-3.3.1/policy/support/file_patterns.spt	2009-01-13 19:18:30.000000000 +0100
++++ serefpolicy-3.3.1/policy/support/file_patterns.spt	2009-01-14 11:05:46.000000000 +0100
 @@ -537,3 +537,23 @@
  	allow $1 $2:dir rw_dir_perms;
  	type_transition $1 $2:$4 $3;
@@ -107150,7 +678081,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-02-26 14:23:09.000000000 +0100
-+++ serefpolicy-3.3.1/policy/support/obj_perm_sets.spt	2009-01-13 19:18:30.000000000 +0100
++++ serefpolicy-3.3.1/policy/support/obj_perm_sets.spt	2009-01-14 11:05:46.000000000 +0100
 @@ -193,7 +193,7 @@
  define(`create_dir_perms',`{ getattr create }')
  define(`rename_dir_perms',`{ getattr rename }')
@@ -107230,7 +678161,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-02-26 14:23:12.000000000 +0100
-+++ serefpolicy-3.3.1/policy/users	2009-01-13 19:18:30.000000000 +0100
++++ serefpolicy-3.3.1/policy/users	2009-01-14 11:05:46.000000000 +0100
 @@ -16,7 +16,7 @@
  # and a user process should never be assigned the system user
  # identity.
@@ -107264,9 +678195,11 @@
 -	gen_user(root, sysadm, sysadm_r staff_r ifdef(`enable_mls',`secadm_r auditadm_r'), s0, s0 - mls_systemhigh, mcs_allcats)
 -')
 +gen_user(root, user, unconfined_r sysadm_r staff_r ifdef(`enable_mls',`secadm_r auditadm_r') system_r, s0, s0 - mls_systemhigh, mcs_allcats)
+Binary files nsaserefpolicy/prelude.pp and serefpolicy-3.3.1/prelude.pp differ
+Binary files nsaserefpolicy/rpcbind.pp and serefpolicy-3.3.1/rpcbind.pp differ
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/Rules.modular serefpolicy-3.3.1/Rules.modular
 --- nsaserefpolicy/Rules.modular	2008-02-26 14:23:12.000000000 +0100
-+++ serefpolicy-3.3.1/Rules.modular	2009-01-13 19:18:30.000000000 +0100
++++ serefpolicy-3.3.1/Rules.modular	2009-01-14 11:05:46.000000000 +0100
 @@ -73,8 +73,8 @@
  $(tmpdir)/%.mod: $(m4support) $(tmpdir)/generated_definitions.conf $(tmpdir)/all_interfaces.conf %.te
  	@echo "Compliling $(NAME) $(@F) module"
@@ -107298,7 +678231,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-02-26 14:23:13.000000000 +0100
-+++ serefpolicy-3.3.1/Rules.monolithic	2009-01-13 19:18:30.000000000 +0100
++++ serefpolicy-3.3.1/Rules.monolithic	2009-01-14 11:05:46.000000000 +0100
 @@ -96,7 +96,7 @@
  #
  # Load the binary policy
@@ -107308,3 +678241,4 @@
  	@echo "Loading $(NAME) $(loadpath)"
  	$(verbose) $(LOADPOLICY) -q $(loadpath)
  	@touch $(tmpdir)/load
+Binary files nsaserefpolicy/secadm.pp and serefpolicy-3.3.1/secadm.pp differ



From ovasik at fedoraproject.org  Wed Jan 14 13:25:20 2009
From: ovasik at fedoraproject.org (Ondrej Vasik)
Date: Wed, 14 Jan 2009 13:25:20 +0000 (UTC)
Subject: rpms/docbook5-schemas/devel docbook5-schemas.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090114132520.44C9770136@cvs1.fedora.phx.redhat.com>

Author: ovasik

Update of /cvs/extras/rpms/docbook5-schemas/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24946

Modified Files:
	.cvsignore sources 
Added Files:
	docbook5-schemas.spec 
Log Message:
Initial Fedora Release


--- NEW FILE docbook5-schemas.spec ---
Name: docbook5-schemas
Version: 5.0
Release: 1%{?dist}
Group: Applications/Text

Summary: Norman Walsh's schemas (DTD, Relax NG, W3C schema) for Docbook 5.X

License: Freely redistributable without restriction
URL: http://www.oasis-open.org/docbook/

Provides: docbook5-dtd = %{version}-%{release}
Provides: docbook5-rng = %{version}-%{release}
Provides: docbook5-sch = %{version}-%{release}
Provides: docbook5-xsd = %{version}-%{release}

Requires(post): libxml2 >= 2.4.8
Requires(postun): libxml2 >= 2.4.8
Requires: xml-common >= 0.6.3-24
BuildRequires: unzip
BuildRequires: libxml2 >= 2.4.8

BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch

Source0:  http://www.docbook.org/xml/%{version}/docbook-%{version}.zip

%description
Docbook 5.X is a complete rewrite of Docbook in RELAX NG and not compatible
with previous Docbook versions. This package contains Relax NG , DTD and W3C
schema for Docbook 5.X. Syntax of those schemas is XML-compliant and is
developed by the OASIS consortium.

%prep
%setup -q -n docbook-5.0


%build
CATALOG=docbook-5.xml
%{_bindir}/xmlcatalog --create --noout $CATALOG
for v in 5.0
do
  # DTD
  %{_bindir}/xmlcatalog --noout --add "public" \
     "-//OASIS//DTD DocBook XML ${v}//EN" \
     "file://%{_datadir}/xml/docbook5/schema/dtd/${v}/docbook.dtd" ${CATALOG}
  %{_bindir}/xmlcatalog --noout --add "system" \
     "http://www.oasis-open.org/docbook/xml/${v}/dtd/docbook.dtd" \
     "file://%{_datadir}/xml/docbook5/schema/dtd/${v}/docbook.dtd" ${CATALOG}
  %{_bindir}/xmlcatalog --noout --add "system" \
     "http://docbook.org/xml/${v}/dtd/docbook.dtd" \
     "file://%{_datadir}/xml/docbook5/schema/dtd/${v}/docbook.dtd" ${CATALOG}
  # RNG
  %{_bindir}/xmlcatalog --noout --add "uri" \
     "http://www.oasis-open.org/docbook/xml/${v}/rng/docbook.rng" \
     "file://%{_datadir}/xml/docbook5/schema/rng/${v}/docbook.rng" ${CATALOG}
  %{_bindir}/xmlcatalog --noout --add "uri" \
     "http://docbook.org/xml/${v}/rng/docbook.rng" \
     "file://%{_datadir}/xml/docbook5/schema/rng/${v}/docbook.rng" ${CATALOG}
  # RNG+XInclude
  %{_bindir}/xmlcatalog --noout --add "uri" \
     "http://www.oasis-open.org/docbook/xml/${v}/rng/docbookxi.rng" \
     "file://%{_datadir}/xml/docbook5/schema/rng/${v}/docbookxi.rng" ${CATALOG}
  %{_bindir}/xmlcatalog --noout --add "uri" \
     "http://docbook.org/xml/${v}/rng/docbookxi.rng" \
     "file://%{_datadir}/xml/docbook5/schema/rng/${v}/docbookxi.rng" ${CATALOG}
  # RNC
  %{_bindir}/xmlcatalog --noout --add "uri" \
     "http://www.oasis-open.org/docbook/xml/${v}/rnc/docbook.rnc" \
     "file://%{_datadir}/xml/docbook5/schema/rng/${v}/docbook.rnc" ${CATALOG}
  %{_bindir}/xmlcatalog --noout --add "uri" \
     "http://docbook.org/xml/${v}/rng/docbook.rnc" \
     "file://%{_datadir}/xml/docbook5/schema/rng/${v}/docbook.rnc" ${CATALOG}
  # RNC+XInclude
  %{_bindir}/xmlcatalog --noout --add "uri" \
     "http://www.oasis-open.org/docbook/xml/${v}/rnc/docbookxi.rnc" \
     "file://%{_datadir}/xml/docbook5/schema/rng/${v}/docbookxi.rnc" ${CATALOG}
  %{_bindir}/xmlcatalog --noout --add "uri" \
     "http://docbook.org/xml/${v}/rng/docbookxi.rnc" \
     "file://%{_datadir}/xml/docbook5/schema/rng/${v}/docbookxi.rnc" ${CATALOG}
  # XSD
  %{_bindir}/xmlcatalog --noout --add "uri" \
     "http://www.oasis-open.org/docbook/xml/${v}/xsd/docbook.xsd" \
     "file://%{_datadir}/xml/docbook5/schema/xsd/${v}/docbook.xsd" ${CATALOG}
  %{_bindir}/xmlcatalog --noout --add "uri" \
     "http://docbook.org/xml/${v}/xsd/docbook.xsd" \
     "file://%{_datadir}/xml/docbook5/schema/xsd/${v}/docbook.xsd" ${CATALOG}
  # XSD + XInclude
  %{_bindir}/xmlcatalog --noout --add "uri" \
     "http://www.oasis-open.org/docbook/xml/${v}/xsd/docbookxi.xsd" \
     "file://%{_datadir}/xml/docbook5/schema/xsd/${v}/docbookxi.xsd" ${CATALOG}
  %{_bindir}/xmlcatalog --noout --add "uri" \
     "http://docbook.org/xml/${v}/xsd/docbookxi.xsd" \
     "file://%{_datadir}/xml/docbook5/schema/xsd/${v}/docbookxi.xsd" ${CATALOG}
  %{_bindir}/xmlcatalog --noout --add "uri" \
     "http://www.oasis-open.org/docbook/xml/${v}/xsd/xi.xsd" \
     "file://%{_datadir}/xml/docbook5/schema/xsd/${v}/xi.xsd" ${CATALOG}
  %{_bindir}/xmlcatalog --noout --add "uri" \
     "http://docbook.org/xml/${v}/xsd/xi.xsd" \
     "file://%{_datadir}/xml/docbook5/schema/xsd/${v}/xi.xsd" ${CATALOG}
  # XLink + XML
  %{_bindir}/xmlcatalog --noout --add "uri" \
     "http://www.oasis-open.org/docbook/xml/${v}/xsd/xlink.xsd" \
     "file://%{_datadir}/xml/docbook5/schema/xsd/${v}/xlink.xsd" ${CATALOG}
  %{_bindir}/xmlcatalog --noout --add "uri" \
     "http://docbook.org/xml/${v}/xsd/xlink.xsd" \
     "file://%{_datadir}/xml/docbook5/schema/xsd/${v}/xlink.xsd" ${CATALOG}
  %{_bindir}/xmlcatalog --noout --add "uri" \
     "http://www.oasis-open.org/docbook/xml/${v}/xsd/xml.xsd" \
     "file://%{_datadir}/xml/docbook5/schema/xsd/${v}/xml.xsd" ${CATALOG}
  %{_bindir}/xmlcatalog --noout --add "uri" \
     "http://docbook.org/xml/${v}/xsd/xml.xsd" \
     "file://%{_datadir}/xml/docbook5/schema/xsd/${v}/xml.xsd" ${CATALOG}
  # Schematron
  %{_bindir}/xmlcatalog --noout --add "uri" \
     "http://www.oasis-open.org/docbook/xml/${v}/sch/docbook.sch" \
     "file://%{_datadir}/xml/docbook5/schema/sch/${v}/docbook.sch" ${CATALOG}
  %{_bindir}/xmlcatalog --noout --add "uri" \
     "http://docbook.org/xml/${v}/sch/docbook.sch" \
     "file://%{_datadir}/xml/docbook5/schema/sch/${v}/docbook.sch" ${CATALOG}
done
# ---------------------
# Build XML catalog files for each Schema
for v in 5.0
do
  for s in dtd rng sch xsd; do
   cat=${s}/catalog.xml
   %{_bindir}/xmlcatalog --noout --create ${cat}
   case $s in
    dtd)
     %{_bindir}/xmlcatalog --noout --add "public" \
       "-//OASIS//DTD DocBook XML ${v}//EN" \
       "docbook.dtd" ${cat}
     %{_bindir}/xmlcatalog --noout --add "system" \
       "http://www.oasis-open.org/docbook/xml/${v}/dtd/docbook.dtd" \
       "docbook.dtd" ${cat}
     ;;
    sch)
     %{_bindir}/xmlcatalog --noout --add "uri" \
       "http://docbook.org/xml/${v}/${s}/docbook.${s}" \
       "docbook.${s}" ${cat}
     %{_bindir}/xmlcatalog --noout --add "uri" \
       "http://www.oasis-open.org/docbook/xml/${v}/${s}/docbook.${s}" \
       "docbook.${s}" ${cat}
     ;;
    rng)
     %{_bindir}/xmlcatalog --noout --add "uri" \
       "http://docbook.org/xml/${v}/${s}/docbook.${s}" \
       "docbook.${s}" ${cat}
     %{_bindir}/xmlcatalog --noout --add "uri" \
       "http://www.oasis-open.org/docbook/xml/${v}/${s}/docbook.${s}" \
       "docbook.${s}" ${cat}
     %{_bindir}/xmlcatalog --noout --add "uri" \
       "http://docbook.org/xml/${v}/${s}/docbookxi.${s}" \
       "docbookxi.${s}" ${cat}
     %{_bindir}/xmlcatalog --noout --add "uri" \
       "http://www.oasis-open.org/docbook/xml/${v}/${s}/docbookxi.${s}" \
       "docbookxi.${s}" ${cat}
     %{_bindir}/xmlcatalog --noout --add "uri" \
       "http://docbook.org/xml/${v}/${s}/docbook.rnc" \
       "docbook.rnc" ${cat}
     %{_bindir}/xmlcatalog --noout --add "uri" \
       "http://www.oasis-open.org/docbook/xml/${v}/${s}/docbook.rnc" \
       "docbook.rnc" ${cat}
     %{_bindir}/xmlcatalog --noout --add "uri" \
       "http://docbook.org/xml/${v}/${s}/docbookxi.rnc" \
       "docbookxi.rnc" ${cat}
     %{_bindir}/xmlcatalog --noout --add "uri" \
       "http://www.oasis-open.org/docbook/xml/${v}/${s}/docbookxi.rnc" \
       "docbookxi.rnc" ${cat}
     ;;
    xsd)
     # http://www.oasis-open.org/docbook/xml/5.0/xsd/docbookxi.xsd
     # http://www.oasis-open.org/docbook/xml/5.0/xsd/xlink.xsd
     %{_bindir}/xmlcatalog --noout --add "uri" \
       "http://docbook.org/xml/${v}/${s}/docbook.${s}" \
       "docbook.${s}" ${cat}
     %{_bindir}/xmlcatalog --noout --add "uri" \
       "http://www.oasis-open.org/docbook/xml/${v}/${s}/docbook.${s}" \
       "docbook.${s}" ${cat}
     %{_bindir}/xmlcatalog --noout --add "uri" \
       "http://docbook.org/xml/${v}/${s}/docbookxi.${s}" \
       "docbookxi.${s}" ${cat}
     %{_bindir}/xmlcatalog --noout --add "uri" \
       "http://www.oasis-open.org/docbook/xml/${v}/${s}/docbookxi.${s}" \
       "docbookxi.${s}" ${cat}
     # XLink + XML:
     %{_bindir}/xmlcatalog --noout --add "uri" \
       "http://docbook.org/xml/${v}/${s}/xlink.xsd" \
       "xlink.xsd" ${cat}
     %{_bindir}/xmlcatalog --noout --add "uri" \
       "http://www.oasis-open.org/docbook/xml/${v}/${s}/xlink.xsd" \
       "xlink.xsd" ${cat}
     %{_bindir}/xmlcatalog --noout --add "uri" \
       "http://docbook.org/xml/${v}/${s}/xml.xsd" \
       "xml.xsd" ${cat}
     %{_bindir}/xmlcatalog --noout --add "uri" \
       "http://www.oasis-open.org/docbook/xml/${v}/${s}/xml.xsd" \
       "xml.xsd" ${cat}
     ;;
   esac
  done
done

%install
rm -rf $RPM_BUILD_ROOT
DOCBOOK5DIR=$RPM_BUILD_ROOT%{_datadir}/xml/docbook5
for v in 5.0
do
mkdir -p ${DOCBOOK5DIR}/schema/dtd/$v
mkdir -p ${DOCBOOK5DIR}/schema/rng/$v
mkdir -p ${DOCBOOK5DIR}/schema/sch/$v
mkdir -p ${DOCBOOK5DIR}/schema/xsd/$v
install -m644 dtd/* ${DOCBOOK5DIR}/schema/dtd/$v
install -m644 rng/* ${DOCBOOK5DIR}/schema/rng/$v
install -m644 sch/* ${DOCBOOK5DIR}/schema/sch/$v
install -m644 xsd/* ${DOCBOOK5DIR}/schema/xsd/$v
done
mkdir -p $RPM_BUILD_ROOT%{_bindir}
install -m755 tools/db4-entities.pl $RPM_BUILD_ROOT%{_bindir}
mkdir -p ${DOCBOOK5DIR}/stylesheet/upgrade
install -m644 tools/db4-upgrade.xsl ${DOCBOOK5DIR}/stylesheet/upgrade

mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/xml
install -m644 docbook-5.xml $RPM_BUILD_ROOT%{_sysconfdir}/xml/docbook-5.xml

%clean
rm -fr $RPM_BUILD_ROOT

%post
ROOTCATALOG=%{_sysconfdir}/xml/catalog
if [ -w $ROOTCATALOG ]
then
  for v in 5.0
  do
  %{_bindir}/xmlcatalog --noout --add "delegatePublic" \
    "-//OASIS//DTD DocBook XML ${v}//EN" \
    "file://%{_datadir}/xml/docbook5/schema/dtd/${v}/catalog.xml" \
    $ROOTCATALOG
  %{_bindir}/xmlcatalog --noout --add "delegateSystem" \
    "http://docbook.org/xml/${v}/dtd/" \
    "file://%{_datadir}/xml/docbook5/schema/dtd/${v}/catalog.xml" \
    $ROOTCATALOG
  %{_bindir}/xmlcatalog --noout --add "delegateURI" \
    "http://docbook.org/xml/${v}/dtd/" \
    "file://%{_datadir}/xml/docbook5/schema/dtd/${v}/catalog.xml" \
    $ROOTCATALOG
  %{_bindir}/xmlcatalog --noout --add "delegateURI" \
    "http://docbook.org/xml/${v}/rng/"  \
    "file://%{_datadir}/xml/docbook5/schema/rng/${v}/catalog.xml" \
    $ROOTCATALOG
  %{_bindir}/xmlcatalog --noout --add "delegateURI" \
    "http://docbook.org/xml/${v}/sch/"  \
    "file://%{_datadir}/xml/docbook5/schema/sch/${v}/catalog.xml" \
    $ROOTCATALOG
  %{_bindir}/xmlcatalog --noout --add "delegateURI" \
    "http://docbook.org/xml/${v}/xsd/"  \
    "file://%{_datadir}/xml/docbook5/schema/xsd/${v}/catalog.xml" \
    $ROOTCATALOG
   done
fi

%postun
if [ "$1" = 0 ]; then
  ROOTCATALOG=%{_sysconfdir}/xml/catalog
  if [ -w $ROOTCATALOG ]
  then
    for v in 5.0
    do
       %{_bindir}/xmlcatalog --noout --del \
       "file://%{_datadir}/xml/docbook5/schema/dtd/${v}/catalog.xml" \
       $ROOTCATALOG
       %{_bindir}/xmlcatalog --noout --del \
       "file://%{_datadir}/xml/docbook5/schema/rng/${v}/catalog.xml" \
       $ROOTCATALOG
       %{_bindir}/xmlcatalog --noout --del \
       "file://%{_datadir}/xml/docbook5/schema/sch/${v}/catalog.xml" \
       $ROOTCATALOG
       %{_bindir}/xmlcatalog --noout --del \
       "file://%{_datadir}/xml/docbook5/schema/xsd/${v}/catalog.xml" \
       $ROOTCATALOG
     done
  fi
fi

%files
%defattr(-, root, root, -)
%doc docs/* README ChangeLog
%config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/xml/docbook-5.xml
%dir %{_datadir}/xml/docbook5/schema
%dir %{_datadir}/xml/docbook5/schema/dtd
%dir %{_datadir}/xml/docbook5/schema/rng
%dir %{_datadir}/xml/docbook5/schema/sch
%dir %{_datadir}/xml/docbook5/schema/xsd
%dir %{_datadir}/xml/docbook5/stylesheet
%dir %{_datadir}/xml/docbook5/stylesheet/upgrade
# Docbook5.0
%{_datadir}/xml/docbook5/schema/dtd/%{version}
%{_datadir}/xml/docbook5/schema/rng/%{version}
%{_datadir}/xml/docbook5/schema/sch/%{version}
%{_datadir}/xml/docbook5/schema/xsd/%{version}
%{_datadir}/xml/docbook5/stylesheet/upgrade/db4-upgrade.xsl
%{_bindir}/db4-entities.pl

%ChangeLog
* Thu Nov 13 2008 Ondrej Vasik <ovasik at redhat.com> 5.0-1
- Initial Fedora release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/docbook5-schemas/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	13 Jan 2009 20:27:21 -0000	1.1
+++ .cvsignore	14 Jan 2009 13:24:49 -0000	1.2
@@ -0,0 +1 @@
+docbook-5.0.zip


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/docbook5-schemas/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	13 Jan 2009 20:27:21 -0000	1.1
+++ sources	14 Jan 2009 13:24:49 -0000	1.2
@@ -0,0 +1 @@
+2411c19ed4fb141f3fa3d389fae40736  docbook-5.0.zip



From denis at fedoraproject.org  Wed Jan 14 13:27:32 2009
From: denis at fedoraproject.org (Denis Leroy)
Date: Wed, 14 Jan 2009 13:27:32 +0000 (UTC)
Subject: rpms/gtkmm24/devel .cvsignore, 1.30, 1.31 gtkmm.spec, 1.46,
	1.47 sources, 1.32, 1.33
Message-ID: <20090114132732.8373770136@cvs1.fedora.phx.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/gtkmm24/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25198

Modified Files:
	.cvsignore gtkmm.spec sources 
Log Message:
Update to upstream 2.15.0


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gtkmm24/devel/.cvsignore,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- .cvsignore	26 Nov 2008 10:33:06 -0000	1.30
+++ .cvsignore	14 Jan 2009 13:27:02 -0000	1.31
@@ -1 +1 @@
-gtkmm-2.14.3.tar.bz2
+gtkmm-2.15.0.tar.bz2


Index: gtkmm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtkmm24/devel/gtkmm.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- gtkmm.spec	10 Dec 2008 18:05:12 -0000	1.46
+++ gtkmm.spec	14 Jan 2009 13:27:02 -0000	1.47
@@ -1,6 +1,6 @@
 Name:           gtkmm24
-Version:        2.14.3
-Release:        2%{?dist}
+Version:        2.15.0
+Release:        1%{?dist}
 
 Summary:        C++ interface for GTK2 (a GUI library for X)
 
@@ -109,6 +109,9 @@
 
 
 %changelog
+* Wed Jan 14 2009 Denis Leroy <denis at poolshark.org> - 2.15.0-1
+- Update to upstream 2.15.0
+
 * Thu Dec 11 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.14.3-2
 - Rebuild for pkgconfig provides
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gtkmm24/devel/sources,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- sources	26 Nov 2008 10:33:06 -0000	1.32
+++ sources	14 Jan 2009 13:27:02 -0000	1.33
@@ -1 +1 @@
-10039f35d7f815d47f926a13cefe65d6  gtkmm-2.14.3.tar.bz2
+b1b3e8efa33425bf91ba49922fab13ac  gtkmm-2.15.0.tar.bz2



From nphilipp at fedoraproject.org  Wed Jan 14 13:46:57 2009
From: nphilipp at fedoraproject.org (Nils Philippsen)
Date: Wed, 14 Jan 2009 13:46:57 +0000 (UTC)
Subject: rpms/system-config-users/devel .cvsignore, 1.70, 1.71 sources, 1.78,
	1.79 system-config-users.spec, 1.84, 1.85
Message-ID: <20090114134658.03F8770136@cvs1.fedora.phx.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/system-config-users/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27120

Modified Files:
	.cvsignore sources system-config-users.spec 
Log Message:
version 1.2.84



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-users/devel/.cvsignore,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- .cvsignore	22 Dec 2008 18:18:15 -0000	1.70
+++ .cvsignore	14 Jan 2009 13:46:27 -0000	1.71
@@ -1 +1 @@
-system-config-users-1.2.83.tar.bz2
+system-config-users-1.2.84.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-users/devel/sources,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- sources	22 Dec 2008 18:18:15 -0000	1.78
+++ sources	14 Jan 2009 13:46:27 -0000	1.79
@@ -1 +1 @@
-1ee6b0a8c9e41e6a5bc85ae3f5fff49f  system-config-users-1.2.83.tar.bz2
+fe5dbe54973a2bb3d9ff47b2ebc80e5a  system-config-users-1.2.84.tar.bz2


Index: system-config-users.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-users/devel/system-config-users.spec,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -r1.84 -r1.85
--- system-config-users.spec	22 Dec 2008 18:18:15 -0000	1.84
+++ system-config-users.spec	14 Jan 2009 13:46:27 -0000	1.85
@@ -28,7 +28,7 @@
 
 Summary: A graphical interface for administering users and groups
 Name: system-config-users
-Version: 1.2.83
+Version: 1.2.84
 Release: 1%{?dist}
 URL: http://fedorahosted.org/%{name}
 License: GPLv2+
@@ -125,6 +125,10 @@
 %config(noreplace) %{_sysconfdir}/sysconfig/system-config-users
 
 %changelog
+* Mon Dec 22 2008 Nils Philippsen <nils at redhat.com> - 1.2.84-1
+- use ValueError.message, not .msg to get cracklib error message (#479858)
+- pull in updated translations
+
 * Mon Dec 22 2008 Nils Philippsen <nils at redhat.com> - 1.2.83-1
 - fix typo in Source0 URL
 



From karsten at fedoraproject.org  Wed Jan 14 13:58:07 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Wed, 14 Jan 2009 13:58:07 +0000 (UTC)
Subject: rpms/dictd/devel .cvsignore, 1.6, 1.7 dictd.spec, 1.33, 1.34 sources,
	1.6, 1.7
Message-ID: <20090114135807.E4ADA70136@cvs1.fedora.phx.redhat.com>

Author: karsten

Update of /cvs/extras/rpms/dictd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28410

Modified Files:
	.cvsignore dictd.spec sources 
Log Message:
- update


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/dictd/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	7 May 2008 10:04:24 -0000	1.6
+++ .cvsignore	14 Jan 2009 13:57:37 -0000	1.7
@@ -1 +1,2 @@
-dictd-1.10.11.tar.gz
+dictd-1.11.0.tar.gz
+libmaa-1.1.0.tar.gz


Index: dictd.spec
===================================================================
RCS file: /cvs/extras/rpms/dictd/devel/dictd.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- dictd.spec	16 Jul 2008 16:26:04 -0000	1.33
+++ dictd.spec	14 Jan 2009 13:57:37 -0000	1.34
@@ -1,11 +1,13 @@
+%define libmaaVersion 1.1.0
 Summary:   DICT protocol (RFC 2229) command-line client
 Name:      dictd
-Version:   1.10.11
-Release:   3
+Version:   1.11.0
+Release:   1
 License:   GPL+ and zlib and MIT
 Group:     Applications/Internet
 Source0:   http://downloads.sourceforge.net/dict/%{name}-%{version}.tar.gz
 Source1:   dictd.init
+Source2:   libmaa-%{libmaaVersion}.tar.gz
 URL:       http://www.dict.org/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires(post):  chkconfig
@@ -21,9 +23,12 @@
 
 %prep
 %setup -q
+tar xzf %{SOURCE2}
+mv libmaa-%{libmaaVersion} libmaa
 
 %build
-%configure --with-cflags="$RPM_OPT_FLAGS" --enable-dictorg --disable-plugin 
+%configure --with-cflags="$RPM_OPT_FLAGS" --enable-dictorg --disable-plugin \
+            --with-local-libmaa
 make %{?_smp_mflags}
 
 %install
@@ -56,6 +61,9 @@
 %config(noreplace) %{_sysconfdir}/sysconfig/dictd
 
 %changelog
+* Wed Jan 14 2009 Karsten Hopp <karsten at redhat.com> 1.11.0-1
+- update
+
 * Wed Jul 16 2008 Tom "spot" Callaway <tcallawa at redhat.com> 1.10.11-3
 - fix license tag
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/dictd/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	7 May 2008 10:04:24 -0000	1.6
+++ sources	14 Jan 2009 13:57:37 -0000	1.7
@@ -1 +1,2 @@
-7145acf0eded8b67e842eef0dd9f4189  dictd-1.10.11.tar.gz
+1b316bf797ff239eb87110c18cd7d5d9  dictd-1.11.0.tar.gz
+d1883d09f65179a3b6aa16579cb5a7e9  libmaa-1.1.0.tar.gz



From dnovotny at fedoraproject.org  Wed Jan 14 14:22:10 2009
From: dnovotny at fedoraproject.org (Daniel Novotny)
Date: Wed, 14 Jan 2009 14:22:10 +0000 (UTC)
Subject: rpms/file/F-9 file-4.23-jpeg2000.patch, NONE, 1.1 file.spec, 1.72,
	1.73
Message-ID: <20090114142210.1B2CB70136@cvs1.fedora.phx.redhat.com>

Author: dnovotny

Update of /cvs/extras/rpms/file/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31254

Modified Files:
	file.spec 
Added Files:
	file-4.23-jpeg2000.patch 
Log Message:

provide jpc (JPEG-2000 Code Stream Bitmap) detection


file-4.23-jpeg2000.patch:

--- NEW FILE file-4.23-jpeg2000.patch ---
diff -up file-4.23/magic/Magdir/images.jpeg2000 file-4.23/magic/Magdir/images
--- file-4.23/magic/Magdir/images.jpeg2000	2009-01-12 17:24:40.000000000 +0100
+++ file-4.23/magic/Magdir/images	2009-01-12 17:26:00.000000000 +0100
@@ -535,3 +535,8 @@
 # Xara (for a while: Corel Xara) is a graphic package, see
 # http://www.xara.com/ for Windows and as GPL application for
 0	string	XARA\243\243	Xara graphics file
+
+#JPEG 2000 Code Stream Bitmap
+# From Petr Splichal <psplicha at redhat.com>
+0	string	\xFF\x4F\xFF\x51\x00	JPEG-2000 Code Stream Bitmap data
+


Index: file.spec
===================================================================
RCS file: /cvs/extras/rpms/file/F-9/file.spec,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- file.spec	23 Oct 2008 09:55:22 -0000	1.72
+++ file.spec	14 Jan 2009 14:21:39 -0000	1.73
@@ -5,7 +5,7 @@
 Summary: A utility for determining file types
 Name: file
 Version: 4.23
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: BSD
 Group: Applications/File
 Source0: ftp://ftp.astron.com/pub/file/file-%{version}.tar.gz
@@ -28,6 +28,7 @@
 patch16: file-4.23-ext4.patch
 patch17: file-4.23-mismatch.patch
 patch18: file-4.23-typo.patch
+patch19: file-4.23-jpeg2000.patch
 
 Requires: file-libs = %{version}-%{release}
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -90,6 +91,7 @@
 %patch16 -p1 -b .ext4
 %patch17 -p1 -b .mismatch
 %patch18 -p1 -b .typo
+%patch19 -p1 -b .jpeg2000
 
 
 iconv -f iso-8859-1 -t utf-8 < doc/libmagic.man > doc/libmagic.man_
@@ -163,6 +165,9 @@
 %endif
 
 %changelog
+* Wed Jan 14 2009 Daniel Novotny <dnovotny at redhat.com> - 4.23-7
+- fix #476655 detect JPEG-2000 Code Stream Bitmap
+
 * Thu Oct 23 2008 Daniel Novotny <dnovotny at redhat.com> - 4.23-6
 - fix typo in man page
 



From pkgdb at fedoraproject.org  Wed Jan 14 14:29:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 14 Jan 2009 14:29:43 +0000
Subject: [pkgdb] kernel had acl change status
Message-ID: <20090114142943.431CA208456@bastion.fedora.phx.redhat.com>

davej has set the watchcommits acl on kernel (Fedora 9) to Approved for jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kernel



From pkgdb at fedoraproject.org  Wed Jan 14 14:29:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 14 Jan 2009 14:29:44 +0000
Subject: [pkgdb] kernel had acl change status
Message-ID: <20090114142944.BCA73208468@bastion.fedora.phx.redhat.com>

davej has set the commit acl on kernel (Fedora 9) to Approved for jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kernel



From mcepl at fedoraproject.org  Wed Jan 14 14:37:27 2009
From: mcepl at fedoraproject.org (Matej Cepl)
Date: Wed, 14 Jan 2009 14:37:27 +0000 (UTC)
Subject: rpms/epiphany/devel epiphany.spec,1.211,1.212
Message-ID: <20090114143727.D0B5D70136@cvs1.fedora.phx.redhat.com>

Author: mcepl

Update of /cvs/extras/rpms/epiphany/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32419

Modified Files:
	epiphany.spec 
Log Message:
Creates also plugins and extensions subdirectories (fixing bug #479921).


Index: epiphany.spec
===================================================================
RCS file: /cvs/extras/rpms/epiphany/devel/epiphany.spec,v
retrieving revision 1.211
retrieving revision 1.212
diff -u -r1.211 -r1.212
--- epiphany.spec	6 Jan 2009 19:00:12 -0000	1.211
+++ epiphany.spec	14 Jan 2009 14:36:57 -0000	1.212
@@ -8,7 +8,9 @@
 Summary: Web browser for GNOME
 Name: epiphany
 Version: 2.24.2.1
-Release: 4%{?dist}
+Release: 5%{?dist}
+%define major_version 2.24
+Provides: epiphany(abi) = %{major_version}
 License: GPLv2+ and GFDL
 Group: Applications/Internet
 URL: http://www.gnome.org/projects/epiphany/
@@ -175,6 +177,11 @@
 # LowContrastLargePrint seems to be obsolete, so remove it until further notice
 rm -rf $RPM_BUILD_ROOT/%{_datadir}/icons/LowContrastLargePrint
 
+# directories for plugins and extensions
+mkdir -p $RPM_BUILD_ROOT%{_libdir}/epiphany/%{version}/{plugins,extensions}
+ln -sf %{version}/plugins $RPM_BUILD_ROOT%{_libdir}/epiphany/plugins
+ln -sf %{version}/extensions $RPM_BUILD_ROOT%{_libdir}/epiphany/extensions
+
 %post
 update-desktop-database -q %{_datadir}/applications
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
@@ -227,8 +234,8 @@
 %{_sysconfdir}/gconf/schemas/epiphany-lockdown.schemas
 %{_sysconfdir}/gconf/schemas/epiphany-fonts.schemas
 %{_sysconfdir}/gconf/schemas/epiphany-pango.schemas
-%{_bindir}/epiphany
 %{_libdir}/epiphany
+%{_bindir}/epiphany
 %{_datadir}/applications/*.desktop
 %{_datadir}/epiphany
 %{_mandir}/man*/*
@@ -248,6 +255,10 @@
 %{_datadir}/pygtk/2.0/defs/epiphany.defs
 
 %changelog
+* Wed Jan 14 2009 Mat??j Cepl <mcepl at redhat.com> 2.24.2.1-5
+- Make epiphany own directories for plugins and extensions
+  (#479921).
+
 * Tue Jan 06 2009 Christopher Aillon <caillon at redhat.com> - 2.24.2.1-4
 - Rebuild against newer gecko
 



From mcepl at fedoraproject.org  Wed Jan 14 14:38:52 2009
From: mcepl at fedoraproject.org (Matej Cepl)
Date: Wed, 14 Jan 2009 14:38:52 +0000 (UTC)
Subject: rpms/epiphany/F-10 epiphany.spec,1.219,1.220
Message-ID: <20090114143852.697F970136@cvs1.fedora.phx.redhat.com>

Author: mcepl

Update of /cvs/extras/rpms/epiphany/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32629

Modified Files:
	epiphany.spec 
Log Message:
Creates also plugins and extensions subdirectories (fixing bug #479921).


Index: epiphany.spec
===================================================================
RCS file: /cvs/extras/rpms/epiphany/F-10/epiphany.spec,v
retrieving revision 1.219
retrieving revision 1.220
diff -u -r1.219 -r1.220
--- epiphany.spec	5 Jan 2009 19:36:25 -0000	1.219
+++ epiphany.spec	14 Jan 2009 14:38:22 -0000	1.220
@@ -8,7 +8,9 @@
 Summary: GNOME web browser based on the Mozilla rendering engine
 Name: epiphany
 Version: 2.24.2.1
-Release: 1%{?dist}
+Release: 2%{?dist}
+%define major_version 2.24
+Provides: epiphany(abi) = %{major_version}
 License: GPLv2+ and GFDL
 Group: Applications/Internet
 URL: http://www.gnome.org/projects/epiphany/
@@ -179,6 +181,11 @@
 # LowContrastLargePrint seems to be obsolete, so remove it until further notice
 rm -rf $RPM_BUILD_ROOT/%{_datadir}/icons/LowContrastLargePrint
 
+# directories for plugins and extensions
+mkdir -p $RPM_BUILD_ROOT%{_libdir}/epiphany/%{version}/{plugins,extensions}
+ln -sf %{version}/plugins $RPM_BUILD_ROOT%{_libdir}/epiphany/plugins
+ln -sf %{version}/extensions $RPM_BUILD_ROOT%{_libdir}/epiphany/extensions
+
 %post
 update-desktop-database -q %{_datadir}/applications
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
@@ -231,8 +238,8 @@
 %{_sysconfdir}/gconf/schemas/epiphany-lockdown.schemas
 %{_sysconfdir}/gconf/schemas/epiphany-fonts.schemas
 %{_sysconfdir}/gconf/schemas/epiphany-pango.schemas
-%{_bindir}/epiphany
 %{_libdir}/epiphany
+%{_bindir}/epiphany
 %{_datadir}/applications/*.desktop
 %{_datadir}/epiphany
 %{_mandir}/man*/*
@@ -242,6 +249,11 @@
 %{_datadir}/icons/HighContrastLargePrint/48x48/apps/gnome-web-browser.png
 %{_datadir}/icons/HighContrastLargePrintInverse/48x48/apps/gnome-web-browser.png
 %{_datadir}/dbus-1/services/org.gnome.Epiphany.service
+#%{_libdir}/epiphany/plugins
+#%{_libdir}/epiphany/extensions
+#%{_libdir}/epiphany/%{version}
+#%{_libdir}/epiphany/%{version}/plugins
+#%{_libdir}/epiphany/%{version}/extensions
 
 %files devel
 %defattr(-, root, root)
@@ -252,6 +264,10 @@
 %{_datadir}/pygtk/2.0/defs/epiphany.defs
 
 %changelog
+* Wed Jan 14 2009 Mat??j Cepl <mcepl at redhat.com> 2.24.2.1-2
+- Make epiphany own directories for plugins and extensions
+  (#479921).
+
 * Mon Jan  5 2009 Christopher Aillon <caillon at redhat.com> - 2.24.2.1-1
 - Update to 2.24.2.1
 



From dnovotny at fedoraproject.org  Wed Jan 14 14:41:57 2009
From: dnovotny at fedoraproject.org (Daniel Novotny)
Date: Wed, 14 Jan 2009 14:41:57 +0000 (UTC)
Subject: rpms/file/F-10 file-4.26-jpeg2000.patch, NONE, 1.1 file.spec, 1.81,
	1.82
Message-ID: <20090114144157.E5ADB70136@cvs1.fedora.phx.redhat.com>

Author: dnovotny

Update of /cvs/extras/rpms/file/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv432

Modified Files:
	file.spec 
Added Files:
	file-4.26-jpeg2000.patch 
Log Message:

- fix #476655 detect JPEG-2000 Code Stream Bitmap


file-4.26-jpeg2000.patch:

--- NEW FILE file-4.26-jpeg2000.patch ---
diff -up file-4.26/magic/Magdir/images.jpeg2000 file-4.26/magic/Magdir/images
--- file-4.26/magic/Magdir/images.jpeg2000	2009-01-12 14:37:52.000000000 +0100
+++ file-4.26/magic/Magdir/images	2009-01-12 14:43:50.000000000 +0100
@@ -600,3 +600,8 @@
 # Wavelet Scalar Quantization format used in gray-scale fingerprint images
 # From Tano M Fotang <mfotang at quanteq.com>
 0	string	\xff\xa0\xff\xa8\x00	Wavelet Scalar Quantization image data
+
+# JPEG 2000 Code Stream Bitmap
+# From Petr Splichal <psplicha at redhat.com>
+0	string	\xFF\x4F\xFF\x51\x00	JPEG-2000 Code Stream Bitmap data
+


Index: file.spec
===================================================================
RCS file: /cvs/extras/rpms/file/F-10/file.spec,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- file.spec	16 Oct 2008 11:01:33 -0000	1.81
+++ file.spec	14 Jan 2009 14:41:27 -0000	1.82
@@ -5,7 +5,7 @@
 Summary: A utility for determining file types
 Name: file
 Version: 4.26
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: BSD
 Group: Applications/File
 Source0: ftp://ftp.astron.com/pub/file/file-%{version}.tar.gz
@@ -13,6 +13,7 @@
 Patch0: file-4.21-pybuild.patch
 Patch1: file-4.26-devdrv.patch
 Patch2: file-4.26-mime-encoding.patch
+Patch3: file-4.26-jpeg2000.patch
 
 Requires: file-libs = %{version}-%{release}
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -63,6 +64,8 @@
 %patch1 -p1
 #fixes #465994
 %patch2 -p1
+# fixes #476655
+%patch3 -p1
 
 iconv -f iso-8859-1 -t utf-8 < doc/libmagic.man > doc/libmagic.man_
 touch -r doc/libmagic.man doc/libmagic.man_
@@ -136,6 +139,9 @@
 %endif
 
 %changelog
+* Wed Jan 14 2009 Daniel Novotny <dnovotny at redhat.com> 4.26-4
+- fix #476655 detect JPEG-2000 Code Stream Bitmap
+
 * Thu Oct 16 2008 Daniel Novotny <dnovotny at redhat.com> 4.26-3
 - fix #465994 file --mime-encoding seems broken
 



From dwalsh at fedoraproject.org  Wed Jan 14 14:50:37 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Wed, 14 Jan 2009 14:50:37 +0000 (UTC)
Subject: rpms/policycoreutils/devel policycoreutils.spec,1.582,1.583
Message-ID: <20090114145037.AC14370136@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/policycoreutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2268

Modified Files:
	policycoreutils.spec 
Log Message:
Split out python package


Index: policycoreutils.spec
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils.spec,v
retrieving revision 1.582
retrieving revision 1.583
diff -u -r1.582 -r1.583
--- policycoreutils.spec	13 Jan 2009 14:09:47 -0000	1.582
+++ policycoreutils.spec	14 Jan 2009 14:50:07 -0000	1.583
@@ -25,8 +25,8 @@
 Patch4:	 policycoreutils-sepolgen.patch
 
 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 /usr/bin/make
-Requires: libsepol >= %{libsepolver} libsemanage-python >= %{libsemanagever} coreutils audit-libs-python >=  %{libauditver} checkpolicy libselinux-python libselinux-utils >=  %{libselinuxver} 
+Requires: /bin/mount /bin/egrep /bin/awk /usr/bin/diff rpm /bin/sed 
+Requires: libsepol >= %{libsepolver} coreutils checkpolicy  libselinux-utils >=  %{libselinuxver} 
 Requires(post): /sbin/service /sbin/chkconfig 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -92,6 +92,31 @@
 		     %{SOURCE6}
 %find_lang %{name}
 
+%package python
+Summary: SELinux policy core python utilities
+Group:	 System Environment/Base
+Requires: policycoreutils = %{version}-%{release} 
+Requires: libsemanage-python >= %{libsemanagever} libselinux-python
+Requires: audit-libs-python >=  %{libauditver} 
+Requires: python >= 2.6 /usr/bin/make
+
+%description python
+The policycoreutils-python package contains the management tools use to manage an SELinux environment.
+
+%files python
+%defattr(-,root,root,-)
+%{_sbindir}/semanage
+%{_bindir}/audit2allow
+%{_bindir}/audit2why
+%{_bindir}/chcat
+%{_bindir}/sepolgen-ifgen
+%{_libdir}/python?.?/site-packages/seobject.py*
+%{_libdir}/python?.?/site-packages/sepolgen/*
+%dir %{_libdir}/python?.?/site-packages/sepolgen
+%dir  /var/lib/sepolgen
+%dir  /var/lib/selinux
+/var/lib/sepolgen/perm_map
+
 %package newrole
 Summary: The newrole application for RBAC/MLS 
 Group: System Environment/Base
@@ -108,12 +133,12 @@
 %package gui
 Summary: SELinux configuration GUI
 Group: System Environment/Base
-Requires: policycoreutils = %{version}-%{release} 
+Requires: policycoreutils-python = %{version}-%{release} 
 Requires: gnome-python2-gnome, pygtk2, pygtk2-libglade, gnome-python2-canvas 
 Requires: usermode-gtk 
 Requires: setools-console
-Requires: selinux-policy-devel
-Requires: python >= 2.4
+Requires: selinux-policy
+Requires: python >= 2.6
 BuildRequires: desktop-file-utils
 
 %description gui
@@ -148,15 +173,10 @@
 %{_sbindir}/restorecond
 %{_sbindir}/setsebool
 %{_sbindir}/semodule
-%{_sbindir}/semanage
 %{_sbindir}/load_policy
 %{_sbindir}/sestatus
 %{_sbindir}/run_init
 %{_sbindir}/open_init_pty
-%{_bindir}/sepolgen-ifgen
-%{_bindir}/audit2allow
-%{_bindir}/audit2why
-%{_bindir}/chcat
 %{_bindir}/secon
 %{_bindir}/semodule_deps
 %{_bindir}/semodule_expand
@@ -166,14 +186,8 @@
 %config(noreplace) %{_sysconfdir}/pam.d/newrole
 %config(noreplace) %{_sysconfdir}/pam.d/run_init
 %config(noreplace) %{_sysconfdir}/sestatus.conf
-%{_libdir}/python?.?/site-packages/seobject.py*
 %attr(755,root,root) /etc/rc.d/init.d/restorecond
 %config(noreplace) /etc/selinux/restorecond.conf
-%dir %{_libdir}/python?.?/site-packages/sepolgen
-%{_libdir}/python?.?/site-packages/sepolgen/*
-%dir  /var/lib/sepolgen
-%dir  /var/lib/selinux
-/var/lib/sepolgen/perm_map
 
 %preun
 if [ $1 -eq 0 ]; then
@@ -192,6 +206,9 @@
 fi
 
 %changelog
+* Wed Jan 14 2009 Dan Walsh <dwalsh at redhat.com> 2.0.61-2
+- Split python into a separate package
+
 * Tue Jan 13 2009 Dan Walsh <dwalsh at redhat.com> 2.0.61-1
 - Update to upstream
 	* chcat: cut categories at arbitrary point (25) from Dan Walsh



From pwouters at fedoraproject.org  Wed Jan 14 14:54:53 2009
From: pwouters at fedoraproject.org (Paul Wouters)
Date: Wed, 14 Jan 2009 14:54:53 +0000 (UTC)
Subject: rpms/unbound/devel sources,1.6,1.7 .cvsignore,1.5,1.6
Message-ID: <20090114145453.25F0C70136@cvs1.fedora.phx.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/unbound/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2610

Modified Files:
	sources .cvsignore 
Log Message:
new sources



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/unbound/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	28 Nov 2008 09:46:49 -0000	1.6
+++ sources	14 Jan 2009 14:54:22 -0000	1.7
@@ -1 +1,2 @@
 43586f18b4d917887c92a35ff460c923  unbound-1.1.1.tar.gz
+2517f811ec4939c0ea602c99a6fdea23  unbound-1.2.0.tar.gz


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/unbound/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	28 Nov 2008 09:46:49 -0000	1.5
+++ .cvsignore	14 Jan 2009 14:54:22 -0000	1.6
@@ -1 +1,2 @@
 unbound-1.1.1.tar.gz
+unbound-1.2.0.tar.gz



From stransky at fedoraproject.org  Wed Jan 14 14:56:58 2009
From: stransky at fedoraproject.org (Martin Stransky)
Date: Wed, 14 Jan 2009 14:56:58 +0000 (UTC)
Subject: rpms/xulrunner/devel xulrunner.spec,1.146,1.147
Message-ID: <20090114145658.B506C70136@cvs1.fedora.phx.redhat.com>

Author: stransky

Update of /cvs/pkgs/rpms/xulrunner/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2833

Modified Files:
	xulrunner.spec 
Log Message:
Adjusted cairo version (#452032)


Index: xulrunner.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xulrunner/devel/xulrunner.spec,v
retrieving revision 1.146
retrieving revision 1.147
diff -u -r1.146 -r1.147
--- xulrunner.spec	7 Jan 2009 21:28:06 -0000	1.146
+++ xulrunner.spec	14 Jan 2009 14:56:28 -0000	1.147
@@ -1,6 +1,6 @@
 %define nspr_version 4.7.1
 %define nss_version 3.12.1.1
-%define cairo_version 0.6
+%define cairo_version 1.6.0
 %define lcms_version 1.17
 %define freetype_version 2.1.9
 %define sqlite_version 3.5



From pwouters at fedoraproject.org  Wed Jan 14 14:57:41 2009
From: pwouters at fedoraproject.org (Paul Wouters)
Date: Wed, 14 Jan 2009 14:57:41 +0000 (UTC)
Subject: rpms/unbound/devel unbound.conf,1.7,1.8 unbound.spec,1.14,1.15
Message-ID: <20090114145741.DFC3F70136@cvs1.fedora.phx.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/unbound/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2962

Modified Files:
	unbound.conf unbound.spec 
Log Message:
merge spec file



Index: unbound.conf
===================================================================
RCS file: /cvs/extras/rpms/unbound/devel/unbound.conf,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- unbound.conf	2 Dec 2008 02:13:31 -0000	1.7
+++ unbound.conf	14 Jan 2009 14:57:11 -0000	1.8
@@ -256,7 +256,7 @@
 	# infrastructure data.  Validates the replies (if possible).
 	# Default off, because the lookups burden the server.  Experimental 
 	# implementation of draft-wijngaards-dnsext-resolver-side-mitigation.
-	# harden-referral-path: no
+	harden-referral-path: yes
 
 	# Use 0x20-encoded random bits in the query to foil spoof attempts.
 	# This feature is an experimental implementation of draft dns-0x20.
@@ -283,7 +283,7 @@
 	# threshold, a warning is printed and a defensive action is taken,
 	# the cache is cleared to flush potential poison out of it.
 	# A suggested value is 10000000, the default is 0 (turned off).
-	# unwanted-reply-threshold: 0
+	unwanted-reply-threshold: 10000000
 
 	# Do not query the following addresses. No DNS queries are sent there.
 	# List one address per entry. List classless netblocks with /size,
@@ -301,7 +301,7 @@
 	# File with DLV trusted keys. Same format as trust-anchor-file.
 	# There can be only one DLV configured, it is trusted from root down.
 	# Download https://secure.isc.org/ops/dlv/dlv.isc.org.key
-	# dlv-anchor-file: "/etc/pki/dnssec-dlv/dlv.isc.org.key"
+	# dlv-anchor-file: "/etc/pki/dnssec-keys/dlv.isc.org.key"
 
 	# File with trusted keys for validation. Specify more than one file
 	# with several entries, one file per entry.
@@ -333,7 +333,7 @@
 	# unsecure data. Useful to shield the users of this validator from
 	# potential bogus data in the additional section. All unsigned data 
 	# in the additional section is removed from secure messages.
-	# val-clean-additional: yes
+	val-clean-additional: yes
 	
 	# Turn permissive mode on to permit bogus messages. Thus, messages
 	# for which security checks failed will be returned to clients,


Index: unbound.spec
===================================================================
RCS file: /cvs/extras/rpms/unbound/devel/unbound.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- unbound.spec	5 Jan 2009 13:19:32 -0000	1.14
+++ unbound.spec	14 Jan 2009 14:57:11 -0000	1.15
@@ -1,7 +1,7 @@
 Summary: Validating, recursive, and caching DNS(SEC) resolver
 Name: unbound
-Version: 1.1.1
-Release: 7%{?dist}
+Version: 1.2.0
+Release: 1%{?dist}
 License: BSD
 Url: http://www.nlnetlabs.nl/unbound/
 Source: http://www.unbound.net/downloads/%{name}-%{version}.tar.gz
@@ -19,7 +19,6 @@
 Requires(postun): initscripts
 Requires: ldns >= 1.4.0
 Requires(pre): shadow-utils
-Requires: selinux-policy >= 3.5.13-33
 # Is this obsolete?
 #Provides: caching-nameserver
 
@@ -38,7 +37,7 @@
 Summary: Plugin for the munin / munin-node monitoring package
 Group:     System Environment/Daemons
 Requires: munin-node
-Requires: %{name} = %{version}-%{release}
+Requires: %{name} = %{version}-%{release}, bc
 
 %description munin
 Plugin for the munin / munin-node monitoring package
@@ -46,7 +45,7 @@
 %package devel
 Summary: Development package that includes the unbound header files
 Group: Development/Libraries
-Requires: %{name}-libs = %{version}-%{release}, openssl-devel, ldns-devel
+Requires: %{name}-libs = %{version}-%{release}, openssl-devel >= 0.9.8g-12, ldns-devel
 Requires: libevent-devel
 
 %description devel
@@ -57,6 +56,7 @@
 Group: Applications/System
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
+Requires: openssl >= 0.9.8g-12
 
 %description libs
 Contains libraries used by the unbound server and client applications
@@ -149,6 +149,16 @@
 %postun libs -p /sbin/ldconfig
 
 %changelog
+* Wed Jan 14 2009 Paul Wouters <paul at xelerance.com - 1.2.0-1
+- Updated to 1.2.0
+- Added dependancy on minimum SSL for CVE-2008-5077
+- Added dependancy on bc for unbound-munin
+- Removed dependancy on selinux-policy (will get used when available)
+- Enable options as per draft-wijngaards-dnsext-resolver-side-mitigation-00.txt
+- Enable unwanted-reply-threshold to mitigate against a Kaminsky attack
+- Enable val-clean-additional to drop addition unsigned data from signed
+  response.
+
 * Mon Jan  5 2009 Paul Wouters <paul at xelerance.com> - 1.1.1-7
 - Modified scandir patch to silently fail when wildcard matches nothing
 - Patch to allow unbound-checkconf to find empty wildcard matches



From lennart at fedoraproject.org  Wed Jan 14 14:58:05 2009
From: lennart at fedoraproject.org (Lennart Poettering)
Date: Wed, 14 Jan 2009 14:58:05 +0000 (UTC)
Subject: rpms/gstreamer-plugins-good/devel pulseprobe-fix.patch, NONE,
	1.1 gstreamer-plugins-good.spec, 1.78, 1.79
Message-ID: <20090114145805.03AC070136@cvs1.fedora.phx.redhat.com>

Author: lennart

Update of /cvs/pkgs/rpms/gstreamer-plugins-good/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3058

Modified Files:
	gstreamer-plugins-good.spec 
Added Files:
	pulseprobe-fix.patch 
Log Message:
Fix thread/memleak due to ref-loop

pulseprobe-fix.patch:

--- NEW FILE pulseprobe-fix.patch ---
--- gst-plugins-good-0.10.11.old/ext/pulse/pulseprobe.c	2008-10-11 01:13:34.000000000 +0200
+++ gst-plugins-good-0.10.11/ext/pulse/pulseprobe.c	2009-01-14 14:38:33.000000000 +0100
@@ -263,7 +263,7 @@
   GstPulseProbe *c = NULL;
 
   c = g_new (GstPulseProbe, 1);
-  c->object = g_object_ref (object);
+  c->object = object; /* We don't inc the ref counter here to avoid a ref loop */
   c->server = g_strdup (server);
   c->enumerate_sinks = sinks;
   c->enumerate_sources = sources;
@@ -293,8 +293,6 @@
   g_list_foreach (c->devices, (GFunc) g_free, NULL);
   g_list_free (c->devices);
 
-  g_object_unref (c->object);
-
   g_free (c);
 }
 


Index: gstreamer-plugins-good.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamer-plugins-good/devel/gstreamer-plugins-good.spec,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- gstreamer-plugins-good.spec	13 Jan 2009 18:44:22 -0000	1.78
+++ gstreamer-plugins-good.spec	14 Jan 2009 14:57:34 -0000	1.79
@@ -6,7 +6,7 @@
 
 Name: 		%{gstreamer}-plugins-good
 Version: 	0.10.11
-Release:  	2%{?dist}
+Release:  	3%{?dist}
 Summary: 	GStreamer plug-ins with good code and licensing
 
 Group: 		Applications/Multimedia
@@ -19,6 +19,8 @@
 Patch0: gst-plugins-good-0.10.9-libv4l.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=556986
 Patch1: gst-plugins-good-0.10.11-pulse-hang-bz556986.patch
+# https://bugzilla.redhat.com/show_bug.cgi?id=470000
+Patch2: pulseprobe-fix.patch
 
 Requires: 	%{gstreamer} >= %{_gst}
 Requires(pre): GConf2 
@@ -104,6 +106,7 @@
 %setup -q -n gst-plugins-good-%{version}
 %patch0 -p0 -b .libv4l
 %patch1 -p0 -b .pulse-hang
+%patch2 -p1 -b .pulseprobe-fix
 
 %build
 
@@ -248,6 +251,9 @@
 gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/gstreamer-%{majorminor}.schemas > /dev/null || :
 
 %changelog
+* Wed Jan 14 2009 - Lennart Poettering <lpoetter at redhat.com> 0.10.11-3
+- Fix thread/memleak due to ref-loop
+
 * Tue Jan 13 2009 - Bastien Nocera <bnocera at redhat.com> - 0.10.11-2
 - Avoid pulsesink hang when PulseAudio disappears
 



From dnovotny at fedoraproject.org  Wed Jan 14 14:58:26 2009
From: dnovotny at fedoraproject.org (Daniel Novotny)
Date: Wed, 14 Jan 2009 14:58:26 +0000 (UTC)
Subject: rpms/file/devel file-4.26-jpeg2000.patch, NONE, 1.1 file.spec, 1.86,
	1.87
Message-ID: <20090114145826.81BF870136@cvs1.fedora.phx.redhat.com>

Author: dnovotny

Update of /cvs/extras/rpms/file/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2931

Modified Files:
	file.spec 
Added Files:
	file-4.26-jpeg2000.patch 
Log Message:

- fix #476655 detect JPEG-2000 Code Stream Bitmap


file-4.26-jpeg2000.patch:

--- NEW FILE file-4.26-jpeg2000.patch ---
diff -up file-4.26/magic/Magdir/images.jpeg2000 file-4.26/magic/Magdir/images
--- file-4.26/magic/Magdir/images.jpeg2000	2009-01-12 14:37:52.000000000 +0100
+++ file-4.26/magic/Magdir/images	2009-01-12 14:43:50.000000000 +0100
@@ -600,3 +600,8 @@
 # Wavelet Scalar Quantization format used in gray-scale fingerprint images
 # From Tano M Fotang <mfotang at quanteq.com>
 0	string	\xff\xa0\xff\xa8\x00	Wavelet Scalar Quantization image data
+
+# JPEG 2000 Code Stream Bitmap
+# From Petr Splichal <psplicha at redhat.com>
+0	string	\xFF\x4F\xFF\x51\x00	JPEG-2000 Code Stream Bitmap data
+


Index: file.spec
===================================================================
RCS file: /cvs/extras/rpms/file/devel/file.spec,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -r1.86 -r1.87
--- file.spec	12 Jan 2009 12:05:30 -0000	1.86
+++ file.spec	14 Jan 2009 14:57:56 -0000	1.87
@@ -5,7 +5,7 @@
 Summary: A utility for determining file types
 Name: file
 Version: 4.26
-Release: 8%{?dist}
+Release: 9%{?dist}
 License: BSD
 Group: Applications/File
 Source0: ftp://ftp.astron.com/pub/file/file-%{version}.tar.gz
@@ -16,6 +16,7 @@
 Patch3: file-4.26-perl5.patch
 Patch4: file-4.26-graphviz-latex.patch
 Patch5: file-4.26-btrfs.patch
+Patch6: file-4.26-jpeg2000.patch
 
 Requires: file-libs = %{version}-%{release}
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -72,6 +73,8 @@
 %patch4 -p1
 #fixes #479300
 %patch5 -p1
+#fixes #476655
+%patch6 -p1
 
 iconv -f iso-8859-1 -t utf-8 < doc/libmagic.man > doc/libmagic.man_
 touch -r doc/libmagic.man doc/libmagic.man_
@@ -145,6 +148,9 @@
 %endif
 
 %changelog
+* Wed Jan 14 2009 Daniel Novotny <dnovotny at redhat.com> 4.26-9
+- fix #476655 detect JPEG-2000 Code Stream Bitmap
+
 * Mon Jan 12 2009 Daniel Novotny <dnovotny at redhat.com> 4.26-8
 - fix #479300 - add btrfs filesystem magic
 



From dwalsh at fedoraproject.org  Wed Jan 14 15:00:38 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Wed, 14 Jan 2009 15:00:38 +0000 (UTC)
Subject: rpms/policycoreutils/devel policycoreutils.spec,1.583,1.584
Message-ID: <20090114150038.7672F70136@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/policycoreutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3471

Modified Files:
	policycoreutils.spec 
Log Message:
* Wed Jan 14 2009 Dan Walsh <dwalsh at redhat.com> 2.0.61-2
- Split python into a separate package



Index: policycoreutils.spec
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils.spec,v
retrieving revision 1.583
retrieving revision 1.584
diff -u -r1.583 -r1.584
--- policycoreutils.spec	14 Jan 2009 14:50:07 -0000	1.583
+++ policycoreutils.spec	14 Jan 2009 15:00:08 -0000	1.584
@@ -6,7 +6,7 @@
 Summary: SELinux policy core utilities
 Name:	 policycoreutils
 Version: 2.0.61
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Group:	 System Environment/Base
 Source:	 http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz



From pwouters at fedoraproject.org  Wed Jan 14 15:01:14 2009
From: pwouters at fedoraproject.org (Paul Wouters)
Date: Wed, 14 Jan 2009 15:01:14 +0000 (UTC)
Subject: rpms/unbound/devel unbound.spec,1.15,1.16
Message-ID: <20090114150114.C9B8D70136@cvs1.fedora.phx.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/unbound/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3453

Modified Files:
	unbound.spec 
Log Message:
remove patches that got accepted upstream



Index: unbound.spec
===================================================================
RCS file: /cvs/extras/rpms/unbound/devel/unbound.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- unbound.spec	14 Jan 2009 14:57:11 -0000	1.15
+++ unbound.spec	14 Jan 2009 15:00:44 -0000	1.16
@@ -8,8 +8,6 @@
 Source1: unbound.init
 Source2: unbound.conf
 Source3: unbound.munin
-Patch0: unbound-1.1-scandir.patch
-Patch1: unbound-1.1-checkconf.patch
 Group: System Environment/Daemons
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: flex, openssl-devel, ldns-devel >= 1.4.0, libevent-devel
@@ -63,8 +61,6 @@
 
 %prep
 %setup -q 
-%patch0 -p0
-%patch1 -p0
 
 %build
 %configure  --with-ldns= --with-libevent --with-pthreads --with-ssl \
@@ -158,6 +154,7 @@
 - Enable unwanted-reply-threshold to mitigate against a Kaminsky attack
 - Enable val-clean-additional to drop addition unsigned data from signed
   response.
+- Removed patches (got merged into upstream)
 
 * Mon Jan  5 2009 Paul Wouters <paul at xelerance.com> - 1.1.1-7
 - Modified scandir patch to silently fail when wildcard matches nothing



From spot at fedoraproject.org  Wed Jan 14 15:08:45 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Wed, 14 Jan 2009 15:08:45 +0000 (UTC)
Subject: rpms/fedora-logos/devel fedora-logos.spec,1.118,1.119
Message-ID: <20090114150845.9365670136@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/fedora-logos/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4483

Modified Files:
	fedora-logos.spec 
Log Message:
grub subpackage


Index: fedora-logos.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-logos/devel/fedora-logos.spec,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -r1.118 -r1.119
--- fedora-logos.spec	6 Nov 2008 22:19:04 -0000	1.118
+++ fedora-logos.spec	14 Jan 2009 15:08:15 -0000	1.119
@@ -1,7 +1,7 @@
 Name: fedora-logos
 Summary: Fedora-related icons and pictures
 Version: 10.0.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 Group: System Environment/Base
 URL: http://git.fedorahosted.org/git/fedora-logos.git/
 Source0: https://fedorahosted.org/releases/f/e/fedora-logos/fedora-logos-%{version}.tar.bz2
@@ -35,6 +35,20 @@
 See the included COPYING file for information on copying and
 redistribution.
 
+%package grub
+Summary: Fedora splash art for grub bootloader
+Group: System Environment/Base
+
+%description grub
+The fedora-logos-grub package contains image files which incorporate the
+Fedora trademark and the RPM logo (the "Marks"). The Marks are trademarks 
+or registered trademarks of Red Hat, Inc. in the United States and other 
+countries and are used by permission. 
+
+See the included COPYING file for information on copying and redistribution.
+
+Specifically, it contains splash art used with the grub bootloader.
+
 %prep
 %setup -q
 
@@ -133,7 +147,7 @@
 fi
 
 %files
-%defattr(-, root, root)
+%defattr(-, root, root, -)
 %doc COPYING
 %config(noreplace) %{_sysconfdir}/favicon.png
 %{_datadir}/firstboot/themes/fedora-solar
@@ -148,9 +162,6 @@
 /usr/lib/anaconda-runtime/boot/*png
 /usr/lib/anaconda-runtime/*.sh
 /usr/lib/anaconda-runtime/*.jpg
-# should be ifarch i386
-/boot/grub/splash.xpm.gz
-# end i386 bits
 
 # we multi-own these directories, so as not to require the packages that
 # provide them, thereby dragging in excess dependencies.
@@ -182,7 +193,16 @@
 %dir %{_kde4_appsdir}/ksplash
 %dir %{_kde4_appsdir}/ksplash/Themes
 
+%files grub
+%defattr(-, root, root, -)
+# should be ifarch i386
+/boot/grub/splash.xpm.gz
+# end i386 bits
+
 %changelog
+* Wed Jan 14 2009 Tom "spot" Callaway <tcallawa at redhat.com> 10.0.1-3
+- make grub subpackage (bz 479949)
+
 * Thu Nov  6 2008 Tom "spot" Callaway <tcallawa at redhat.com> 10.0.1-2
 - pull .git files out of source tarball to keep SRPM size down
 



From dwalsh at fedoraproject.org  Wed Jan 14 15:11:43 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Wed, 14 Jan 2009 15:11:43 +0000 (UTC)
Subject: rpms/policycoreutils/devel sources,1.198,1.199
Message-ID: <20090114151143.0AFB770136@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/policycoreutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5023

Modified Files:
	sources 
Log Message:
* Wed Jan 14 2009 Dan Walsh <dwalsh at redhat.com> 2.0.61-2
- Split python into a separate package



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/sources,v
retrieving revision 1.198
retrieving revision 1.199
diff -u -r1.198 -r1.199
--- sources	13 Jan 2009 14:09:47 -0000	1.198
+++ sources	14 Jan 2009 15:11:12 -0000	1.199
@@ -1,2 +1,2 @@
-9e7c3efe622c9feab5c32ce480af2190  sepolgen-1.0.15.tgz
 42f7f691dd8798fe7a8a21635f96d5d2  policycoreutils-2.0.61.tgz
+a10512e5637e2d9e95278c7cfcdce567  sepolgen-1.0.15.tgz



From pwouters at fedoraproject.org  Wed Jan 14 15:16:05 2009
From: pwouters at fedoraproject.org (Paul Wouters)
Date: Wed, 14 Jan 2009 15:16:05 +0000 (UTC)
Subject: rpms/unbound/devel unbound.spec,1.16,1.17
Message-ID: <20090114151605.D249770136@cvs1.fedora.phx.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/unbound/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5356

Modified Files:
	unbound.spec 
Log Message:
Commented out libevent use (we need >= 1.4.5 but fedora only has 1.1)
Fix openssl requirements



Index: unbound.spec
===================================================================
RCS file: /cvs/extras/rpms/unbound/devel/unbound.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- unbound.spec	14 Jan 2009 15:00:44 -0000	1.16
+++ unbound.spec	14 Jan 2009 15:15:35 -0000	1.17
@@ -10,7 +10,8 @@
 Source3: unbound.munin
 Group: System Environment/Daemons
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: flex, openssl-devel, ldns-devel >= 1.4.0, libevent-devel
+BuildRequires: flex, openssl-devel >= 0.9.8g-12, ldns-devel >= 1.4.0, 
+#BuildRequires libevent-devel >= 1.4.5
 Requires(post): chkconfig
 Requires(preun): chkconfig
 Requires(preun): initscripts
@@ -43,8 +44,8 @@
 %package devel
 Summary: Development package that includes the unbound header files
 Group: Development/Libraries
-Requires: %{name}-libs = %{version}-%{release}, openssl-devel >= 0.9.8g-12, ldns-devel
-Requires: libevent-devel
+Requires: %{name}-libs = %{version}-%{release}, openssl-devel, ldns-devel
+#Requires: libevent-devel >= 1.4.5
 
 %description devel
 The devel package contains the unbound library and the include files
@@ -63,7 +64,8 @@
 %setup -q 
 
 %build
-%configure  --with-ldns= --with-libevent --with-pthreads --with-ssl \
+#%configure  --with-ldns= -with-libevent --with-pthreads --with-ssl 
+%configure  --with-ldns= --with-pthreads --with-ssl \
             --disable-rpath --enable-debug --disable-static \
             --with-conf-file=%{_sysconfdir}/%{name}/unbound.conf \
             --with-pidfile=%{_localstatedir}/run/%{name}/%{name}.pid



From pkgdb at fedoraproject.org  Wed Jan 14 15:34:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 14 Jan 2009 15:34:59 +0000
Subject: [pkgdb] perl-Math-Vec ownership updated
Message-ID: <20090114153459.3BB77208457@bastion.fedora.phx.redhat.com>

Package perl-Math-Vec in Fedora devel is now owned by kasal

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Math-Vec



From pkgdb at fedoraproject.org  Wed Jan 14 15:35:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 14 Jan 2009 15:35:00 +0000
Subject: [pkgdb] perl-Math-Vec ownership updated
Message-ID: <20090114153500.39D38208467@bastion.fedora.phx.redhat.com>

Package perl-Math-Vec in Fedora EPEL 5 is now owned by kasal

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Math-Vec



From pkgdb at fedoraproject.org  Wed Jan 14 15:35:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 14 Jan 2009 15:35:05 +0000
Subject: [pkgdb] perl-Math-Vec ownership updated
Message-ID: <20090114153505.C92E0208469@bastion.fedora.phx.redhat.com>

Package perl-Math-Vec in Fedora 10 is now owned by kasal

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Math-Vec



From pkgdb at fedoraproject.org  Wed Jan 14 15:35:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 14 Jan 2009 15:35:35 +0000
Subject: [pkgdb] perl-Math-Vec ownership updated
Message-ID: <20090114153536.B470F208207@bastion.fedora.phx.redhat.com>

Package perl-Math-Vec in Fedora 9 is now owned by kasal

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Math-Vec



From pkgdb at fedoraproject.org  Wed Jan 14 15:36:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 14 Jan 2009 15:36:19 +0000
Subject: [pkgdb] asa ownership updated
Message-ID: <20090114153619.92A5B208203@bastion.fedora.phx.redhat.com>

Package asa in Fedora devel is now owned by kasal

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/asa



From pkgdb at fedoraproject.org  Wed Jan 14 15:38:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 14 Jan 2009 15:38:32 +0000
Subject: [pkgdb] pmount ownership updated
Message-ID: <20090114153832.90D01208207@bastion.fedora.phx.redhat.com>

Package pmount in Fedora devel is now owned by kasal

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pmount



From ovasik at fedoraproject.org  Wed Jan 14 15:39:06 2009
From: ovasik at fedoraproject.org (Ondrej Vasik)
Date: Wed, 14 Jan 2009 15:39:06 +0000 (UTC)
Subject: rpms/docbook5-schemas/F-10 docbook5-schemas.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090114153906.D151370136@cvs1.fedora.phx.redhat.com>

Author: ovasik

Update of /cvs/extras/rpms/docbook5-schemas/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7679

Modified Files:
	.cvsignore sources 
Added Files:
	docbook5-schemas.spec 
Log Message:
Initial Fedora release


--- NEW FILE docbook5-schemas.spec ---
Name: docbook5-schemas
Version: 5.0
Release: 1%{?dist}
Group: Applications/Text

Summary: Norman Walsh's schemas (DTD, Relax NG, W3C schema) for Docbook 5.X

License: Freely redistributable without restriction
URL: http://www.oasis-open.org/docbook/

Provides: docbook5-dtd = %{version}-%{release}
Provides: docbook5-rng = %{version}-%{release}
Provides: docbook5-sch = %{version}-%{release}
Provides: docbook5-xsd = %{version}-%{release}

Requires(post): libxml2 >= 2.4.8
Requires(postun): libxml2 >= 2.4.8
Requires: xml-common >= 0.6.3-24
BuildRequires: unzip
BuildRequires: libxml2 >= 2.4.8

BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch

Source0:  http://www.docbook.org/xml/%{version}/docbook-%{version}.zip

%description
Docbook 5.X is a complete rewrite of Docbook in RELAX NG and not compatible
with previous Docbook versions. This package contains Relax NG , DTD and W3C
schema for Docbook 5.X. Syntax of those schemas is XML-compliant and is
developed by the OASIS consortium.

%prep
%setup -q -n docbook-5.0


%build
CATALOG=docbook-5.xml
%{_bindir}/xmlcatalog --create --noout $CATALOG
for v in 5.0
do
  # DTD
  %{_bindir}/xmlcatalog --noout --add "public" \
     "-//OASIS//DTD DocBook XML ${v}//EN" \
     "file://%{_datadir}/xml/docbook5/schema/dtd/${v}/docbook.dtd" ${CATALOG}
  %{_bindir}/xmlcatalog --noout --add "system" \
     "http://www.oasis-open.org/docbook/xml/${v}/dtd/docbook.dtd" \
     "file://%{_datadir}/xml/docbook5/schema/dtd/${v}/docbook.dtd" ${CATALOG}
  %{_bindir}/xmlcatalog --noout --add "system" \
     "http://docbook.org/xml/${v}/dtd/docbook.dtd" \
     "file://%{_datadir}/xml/docbook5/schema/dtd/${v}/docbook.dtd" ${CATALOG}
  # RNG
  %{_bindir}/xmlcatalog --noout --add "uri" \
     "http://www.oasis-open.org/docbook/xml/${v}/rng/docbook.rng" \
     "file://%{_datadir}/xml/docbook5/schema/rng/${v}/docbook.rng" ${CATALOG}
  %{_bindir}/xmlcatalog --noout --add "uri" \
     "http://docbook.org/xml/${v}/rng/docbook.rng" \
     "file://%{_datadir}/xml/docbook5/schema/rng/${v}/docbook.rng" ${CATALOG}
  # RNG+XInclude
  %{_bindir}/xmlcatalog --noout --add "uri" \
     "http://www.oasis-open.org/docbook/xml/${v}/rng/docbookxi.rng" \
     "file://%{_datadir}/xml/docbook5/schema/rng/${v}/docbookxi.rng" ${CATALOG}
  %{_bindir}/xmlcatalog --noout --add "uri" \
     "http://docbook.org/xml/${v}/rng/docbookxi.rng" \
     "file://%{_datadir}/xml/docbook5/schema/rng/${v}/docbookxi.rng" ${CATALOG}
  # RNC
  %{_bindir}/xmlcatalog --noout --add "uri" \
     "http://www.oasis-open.org/docbook/xml/${v}/rnc/docbook.rnc" \
     "file://%{_datadir}/xml/docbook5/schema/rng/${v}/docbook.rnc" ${CATALOG}
  %{_bindir}/xmlcatalog --noout --add "uri" \
     "http://docbook.org/xml/${v}/rng/docbook.rnc" \
     "file://%{_datadir}/xml/docbook5/schema/rng/${v}/docbook.rnc" ${CATALOG}
  # RNC+XInclude
  %{_bindir}/xmlcatalog --noout --add "uri" \
     "http://www.oasis-open.org/docbook/xml/${v}/rnc/docbookxi.rnc" \
     "file://%{_datadir}/xml/docbook5/schema/rng/${v}/docbookxi.rnc" ${CATALOG}
  %{_bindir}/xmlcatalog --noout --add "uri" \
     "http://docbook.org/xml/${v}/rng/docbookxi.rnc" \
     "file://%{_datadir}/xml/docbook5/schema/rng/${v}/docbookxi.rnc" ${CATALOG}
  # XSD
  %{_bindir}/xmlcatalog --noout --add "uri" \
     "http://www.oasis-open.org/docbook/xml/${v}/xsd/docbook.xsd" \
     "file://%{_datadir}/xml/docbook5/schema/xsd/${v}/docbook.xsd" ${CATALOG}
  %{_bindir}/xmlcatalog --noout --add "uri" \
     "http://docbook.org/xml/${v}/xsd/docbook.xsd" \
     "file://%{_datadir}/xml/docbook5/schema/xsd/${v}/docbook.xsd" ${CATALOG}
  # XSD + XInclude
  %{_bindir}/xmlcatalog --noout --add "uri" \
     "http://www.oasis-open.org/docbook/xml/${v}/xsd/docbookxi.xsd" \
     "file://%{_datadir}/xml/docbook5/schema/xsd/${v}/docbookxi.xsd" ${CATALOG}
  %{_bindir}/xmlcatalog --noout --add "uri" \
     "http://docbook.org/xml/${v}/xsd/docbookxi.xsd" \
     "file://%{_datadir}/xml/docbook5/schema/xsd/${v}/docbookxi.xsd" ${CATALOG}
  %{_bindir}/xmlcatalog --noout --add "uri" \
     "http://www.oasis-open.org/docbook/xml/${v}/xsd/xi.xsd" \
     "file://%{_datadir}/xml/docbook5/schema/xsd/${v}/xi.xsd" ${CATALOG}
  %{_bindir}/xmlcatalog --noout --add "uri" \
     "http://docbook.org/xml/${v}/xsd/xi.xsd" \
     "file://%{_datadir}/xml/docbook5/schema/xsd/${v}/xi.xsd" ${CATALOG}
  # XLink + XML
  %{_bindir}/xmlcatalog --noout --add "uri" \
     "http://www.oasis-open.org/docbook/xml/${v}/xsd/xlink.xsd" \
     "file://%{_datadir}/xml/docbook5/schema/xsd/${v}/xlink.xsd" ${CATALOG}
  %{_bindir}/xmlcatalog --noout --add "uri" \
     "http://docbook.org/xml/${v}/xsd/xlink.xsd" \
     "file://%{_datadir}/xml/docbook5/schema/xsd/${v}/xlink.xsd" ${CATALOG}
  %{_bindir}/xmlcatalog --noout --add "uri" \
     "http://www.oasis-open.org/docbook/xml/${v}/xsd/xml.xsd" \
     "file://%{_datadir}/xml/docbook5/schema/xsd/${v}/xml.xsd" ${CATALOG}
  %{_bindir}/xmlcatalog --noout --add "uri" \
     "http://docbook.org/xml/${v}/xsd/xml.xsd" \
     "file://%{_datadir}/xml/docbook5/schema/xsd/${v}/xml.xsd" ${CATALOG}
  # Schematron
  %{_bindir}/xmlcatalog --noout --add "uri" \
     "http://www.oasis-open.org/docbook/xml/${v}/sch/docbook.sch" \
     "file://%{_datadir}/xml/docbook5/schema/sch/${v}/docbook.sch" ${CATALOG}
  %{_bindir}/xmlcatalog --noout --add "uri" \
     "http://docbook.org/xml/${v}/sch/docbook.sch" \
     "file://%{_datadir}/xml/docbook5/schema/sch/${v}/docbook.sch" ${CATALOG}
done
# ---------------------
# Build XML catalog files for each Schema
for v in 5.0
do
  for s in dtd rng sch xsd; do
   cat=${s}/catalog.xml
   %{_bindir}/xmlcatalog --noout --create ${cat}
   case $s in
    dtd)
     %{_bindir}/xmlcatalog --noout --add "public" \
       "-//OASIS//DTD DocBook XML ${v}//EN" \
       "docbook.dtd" ${cat}
     %{_bindir}/xmlcatalog --noout --add "system" \
       "http://www.oasis-open.org/docbook/xml/${v}/dtd/docbook.dtd" \
       "docbook.dtd" ${cat}
     ;;
    sch)
     %{_bindir}/xmlcatalog --noout --add "uri" \
       "http://docbook.org/xml/${v}/${s}/docbook.${s}" \
       "docbook.${s}" ${cat}
     %{_bindir}/xmlcatalog --noout --add "uri" \
       "http://www.oasis-open.org/docbook/xml/${v}/${s}/docbook.${s}" \
       "docbook.${s}" ${cat}
     ;;
    rng)
     %{_bindir}/xmlcatalog --noout --add "uri" \
       "http://docbook.org/xml/${v}/${s}/docbook.${s}" \
       "docbook.${s}" ${cat}
     %{_bindir}/xmlcatalog --noout --add "uri" \
       "http://www.oasis-open.org/docbook/xml/${v}/${s}/docbook.${s}" \
       "docbook.${s}" ${cat}
     %{_bindir}/xmlcatalog --noout --add "uri" \
       "http://docbook.org/xml/${v}/${s}/docbookxi.${s}" \
       "docbookxi.${s}" ${cat}
     %{_bindir}/xmlcatalog --noout --add "uri" \
       "http://www.oasis-open.org/docbook/xml/${v}/${s}/docbookxi.${s}" \
       "docbookxi.${s}" ${cat}
     %{_bindir}/xmlcatalog --noout --add "uri" \
       "http://docbook.org/xml/${v}/${s}/docbook.rnc" \
       "docbook.rnc" ${cat}
     %{_bindir}/xmlcatalog --noout --add "uri" \
       "http://www.oasis-open.org/docbook/xml/${v}/${s}/docbook.rnc" \
       "docbook.rnc" ${cat}
     %{_bindir}/xmlcatalog --noout --add "uri" \
       "http://docbook.org/xml/${v}/${s}/docbookxi.rnc" \
       "docbookxi.rnc" ${cat}
     %{_bindir}/xmlcatalog --noout --add "uri" \
       "http://www.oasis-open.org/docbook/xml/${v}/${s}/docbookxi.rnc" \
       "docbookxi.rnc" ${cat}
     ;;
    xsd)
     # http://www.oasis-open.org/docbook/xml/5.0/xsd/docbookxi.xsd
     # http://www.oasis-open.org/docbook/xml/5.0/xsd/xlink.xsd
     %{_bindir}/xmlcatalog --noout --add "uri" \
       "http://docbook.org/xml/${v}/${s}/docbook.${s}" \
       "docbook.${s}" ${cat}
     %{_bindir}/xmlcatalog --noout --add "uri" \
       "http://www.oasis-open.org/docbook/xml/${v}/${s}/docbook.${s}" \
       "docbook.${s}" ${cat}
     %{_bindir}/xmlcatalog --noout --add "uri" \
       "http://docbook.org/xml/${v}/${s}/docbookxi.${s}" \
       "docbookxi.${s}" ${cat}
     %{_bindir}/xmlcatalog --noout --add "uri" \
       "http://www.oasis-open.org/docbook/xml/${v}/${s}/docbookxi.${s}" \
       "docbookxi.${s}" ${cat}
     # XLink + XML:
     %{_bindir}/xmlcatalog --noout --add "uri" \
       "http://docbook.org/xml/${v}/${s}/xlink.xsd" \
       "xlink.xsd" ${cat}
     %{_bindir}/xmlcatalog --noout --add "uri" \
       "http://www.oasis-open.org/docbook/xml/${v}/${s}/xlink.xsd" \
       "xlink.xsd" ${cat}
     %{_bindir}/xmlcatalog --noout --add "uri" \
       "http://docbook.org/xml/${v}/${s}/xml.xsd" \
       "xml.xsd" ${cat}
     %{_bindir}/xmlcatalog --noout --add "uri" \
       "http://www.oasis-open.org/docbook/xml/${v}/${s}/xml.xsd" \
       "xml.xsd" ${cat}
     ;;
   esac
  done
done

%install
rm -rf $RPM_BUILD_ROOT
DOCBOOK5DIR=$RPM_BUILD_ROOT%{_datadir}/xml/docbook5
for v in 5.0
do
mkdir -p ${DOCBOOK5DIR}/schema/dtd/$v
mkdir -p ${DOCBOOK5DIR}/schema/rng/$v
mkdir -p ${DOCBOOK5DIR}/schema/sch/$v
mkdir -p ${DOCBOOK5DIR}/schema/xsd/$v
install -m644 dtd/* ${DOCBOOK5DIR}/schema/dtd/$v
install -m644 rng/* ${DOCBOOK5DIR}/schema/rng/$v
install -m644 sch/* ${DOCBOOK5DIR}/schema/sch/$v
install -m644 xsd/* ${DOCBOOK5DIR}/schema/xsd/$v
done
mkdir -p $RPM_BUILD_ROOT%{_bindir}
install -m755 tools/db4-entities.pl $RPM_BUILD_ROOT%{_bindir}
mkdir -p ${DOCBOOK5DIR}/stylesheet/upgrade
install -m644 tools/db4-upgrade.xsl ${DOCBOOK5DIR}/stylesheet/upgrade

mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/xml
install -m644 docbook-5.xml $RPM_BUILD_ROOT%{_sysconfdir}/xml/docbook-5.xml

%clean
rm -fr $RPM_BUILD_ROOT

%post
ROOTCATALOG=%{_sysconfdir}/xml/catalog
if [ -w $ROOTCATALOG ]
then
  for v in 5.0
  do
  %{_bindir}/xmlcatalog --noout --add "delegatePublic" \
    "-//OASIS//DTD DocBook XML ${v}//EN" \
    "file://%{_datadir}/xml/docbook5/schema/dtd/${v}/catalog.xml" \
    $ROOTCATALOG
  %{_bindir}/xmlcatalog --noout --add "delegateSystem" \
    "http://docbook.org/xml/${v}/dtd/" \
    "file://%{_datadir}/xml/docbook5/schema/dtd/${v}/catalog.xml" \
    $ROOTCATALOG
  %{_bindir}/xmlcatalog --noout --add "delegateURI" \
    "http://docbook.org/xml/${v}/dtd/" \
    "file://%{_datadir}/xml/docbook5/schema/dtd/${v}/catalog.xml" \
    $ROOTCATALOG
  %{_bindir}/xmlcatalog --noout --add "delegateURI" \
    "http://docbook.org/xml/${v}/rng/"  \
    "file://%{_datadir}/xml/docbook5/schema/rng/${v}/catalog.xml" \
    $ROOTCATALOG
  %{_bindir}/xmlcatalog --noout --add "delegateURI" \
    "http://docbook.org/xml/${v}/sch/"  \
    "file://%{_datadir}/xml/docbook5/schema/sch/${v}/catalog.xml" \
    $ROOTCATALOG
  %{_bindir}/xmlcatalog --noout --add "delegateURI" \
    "http://docbook.org/xml/${v}/xsd/"  \
    "file://%{_datadir}/xml/docbook5/schema/xsd/${v}/catalog.xml" \
    $ROOTCATALOG
   done
fi

%postun
if [ "$1" = 0 ]; then
  ROOTCATALOG=%{_sysconfdir}/xml/catalog
  if [ -w $ROOTCATALOG ]
  then
    for v in 5.0
    do
       %{_bindir}/xmlcatalog --noout --del \
       "file://%{_datadir}/xml/docbook5/schema/dtd/${v}/catalog.xml" \
       $ROOTCATALOG
       %{_bindir}/xmlcatalog --noout --del \
       "file://%{_datadir}/xml/docbook5/schema/rng/${v}/catalog.xml" \
       $ROOTCATALOG
       %{_bindir}/xmlcatalog --noout --del \
       "file://%{_datadir}/xml/docbook5/schema/sch/${v}/catalog.xml" \
       $ROOTCATALOG
       %{_bindir}/xmlcatalog --noout --del \
       "file://%{_datadir}/xml/docbook5/schema/xsd/${v}/catalog.xml" \
       $ROOTCATALOG
     done
  fi
fi

%files
%defattr(-, root, root, -)
%doc docs/* README ChangeLog
%config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/xml/docbook-5.xml
%dir %{_datadir}/xml/docbook5/schema
%dir %{_datadir}/xml/docbook5/schema/dtd
%dir %{_datadir}/xml/docbook5/schema/rng
%dir %{_datadir}/xml/docbook5/schema/sch
%dir %{_datadir}/xml/docbook5/schema/xsd
%dir %{_datadir}/xml/docbook5/stylesheet
%dir %{_datadir}/xml/docbook5/stylesheet/upgrade
# Docbook5.0
%{_datadir}/xml/docbook5/schema/dtd/%{version}
%{_datadir}/xml/docbook5/schema/rng/%{version}
%{_datadir}/xml/docbook5/schema/sch/%{version}
%{_datadir}/xml/docbook5/schema/xsd/%{version}
%{_datadir}/xml/docbook5/stylesheet/upgrade/db4-upgrade.xsl
%{_bindir}/db4-entities.pl

%ChangeLog
* Thu Nov 13 2008 Ondrej Vasik <ovasik at redhat.com> 5.0-1
- Initial Fedora release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/docbook5-schemas/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	13 Jan 2009 20:27:21 -0000	1.1
+++ .cvsignore	14 Jan 2009 15:38:36 -0000	1.2
@@ -0,0 +1 @@
+docbook-5.0.zip


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/docbook5-schemas/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	13 Jan 2009 20:27:21 -0000	1.1
+++ sources	14 Jan 2009 15:38:36 -0000	1.2
@@ -0,0 +1 @@
+2411c19ed4fb141f3fa3d389fae40736  docbook-5.0.zip



From rdieter at fedoraproject.org  Wed Jan 14 15:39:17 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed, 14 Jan 2009 15:39:17 +0000 (UTC)
Subject: rpms/rsibreak/F-10 rsibreak.spec,1.10,1.11
Message-ID: <20090114153917.65E7370136@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/rsibreak/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7717

Modified Files:
	rsibreak.spec 
Log Message:
* Wed Jan 14 2009 Rex Dieter <rdieter at fedoraproject.org> 0.9.0-3
- fix %find_lang usage
- BR: kdelibs4-devel plasma-devel



Index: rsibreak.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rsibreak/F-10/rsibreak.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- rsibreak.spec	1 Dec 2008 22:40:14 -0000	1.10
+++ rsibreak.spec	14 Jan 2009 15:38:46 -0000	1.11
@@ -1,8 +1,7 @@
-%define desktopvendor fedora
 
 Name:           rsibreak
 Version:        0.9.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A small utility which bothers you at certain intervals
 Group:          Amusements/Graphics
 License:        GPLv2+
@@ -10,7 +9,10 @@
 Source0:        http://rsibreak.org/files/rsibreak-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  kdelibs-devel desktop-file-utils gettext
+# note, build fails with kde >= 4.2, since plasma moved into kdelibs and
+# CMakeLists.txt macros/usage need updating
+BuildRequires:  kdelibs4-devel desktop-file-utils gettext
+BuildRequires:  plasma-devel
 
 %description
 RSIBreak is a small utility which bothers you at certain intervals. The
@@ -32,10 +34,11 @@
 
 %install
 %{__rm} -rf %{buildroot}
-mkdir -p %{buildroot}
-make install DESTDIR=%{buildroot} -C %{_target_platform}
+make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
-%find_lang %{name} plasma_applet_%{name}
+%find_lang %{name} --with-kde
+%find_lang plasma_applet_%{name}
+cat plasma_applet_%{name}.lang >> %{name}.lang
 
 # validate desktop file
 desktop-file-install --vendor ""                          \
@@ -44,11 +47,9 @@
 
 %post
 xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
-/sbin/ldconfig 2>/dev/null
 
 %postun
 xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
-/sbin/ldconfig 2>/dev/null
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -56,6 +57,8 @@
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING NEWS TODO
+# These could/should be updated to %%_kde4_* equivalents, 
+# see /etc/rpm/macros.kde4 -- Rex
 %{_bindir}/rsibreak
 %{_datadir}/autostart/rsibreak.desktop
 %{_datadir}/applications/kde4/rsibreak.desktop
@@ -68,11 +71,14 @@
 %{_datadir}/kde4/apps/desktoptheme/default/widgets/rsibreak.svg 
 %{_datadir}/kde4/services/plasma-engine-rsibreak.desktop           
 %{_datadir}/kde4/services/plasma-applet-rsibreak.desktop           
-%{_docdir}/HTML/*/rsibreak
 %{_libdir}/kde4/plasma_engine_rsibreak.so                         
 %{_libdir}/kde4/plasma_applet_rsibreak.so                         
 
 %changelog
+* Wed Jan 14 2009 Rex Dieter <rdieter at fedoraproject.org> 0.9.0-3
+- fix %%find_lang usage
+- BR: kdelibs4-devel plasma-devel
+
 * Fri Nov 28 2008 Roland Wolters <wolters.liste at gmx.net> 0.9.0-2
 - update to version 0.9 featuring a KDE 4 version
 



From pkgdb at fedoraproject.org  Wed Jan 14 15:40:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 14 Jan 2009 15:40:31 +0000
Subject: [pkgdb] perl-Text-Unidecode ownership updated
Message-ID: <20090114154031.43A152081FF@bastion.fedora.phx.redhat.com>

Package perl-Text-Unidecode in Fedora devel is now owned by kasal

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Text-Unidecode



From pkgdb at fedoraproject.org  Wed Jan 14 15:40:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 14 Jan 2009 15:40:42 +0000
Subject: [pkgdb] perl-Parse-Yapp ownership updated
Message-ID: <20090114154043.7B739208458@bastion.fedora.phx.redhat.com>

Package perl-Parse-Yapp in Fedora devel is now owned by kasal

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Parse-Yapp



From pkgdb at fedoraproject.org  Wed Jan 14 15:40:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 14 Jan 2009 15:40:53 +0000
Subject: [pkgdb] perl-Math-Symbolic ownership updated
Message-ID: <20090114154053.E1F13208468@bastion.fedora.phx.redhat.com>

Package perl-Math-Symbolic in Fedora devel is now owned by kasal

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Math-Symbolic



From pkgdb at fedoraproject.org  Wed Jan 14 15:41:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 14 Jan 2009 15:41:02 +0000
Subject: [pkgdb] perl-Math-MatrixReal ownership updated
Message-ID: <20090114154102.BD9D5208457@bastion.fedora.phx.redhat.com>

Package perl-Math-MatrixReal in Fedora devel is now owned by kasal

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Math-MatrixReal



From pkgdb at fedoraproject.org  Wed Jan 14 15:42:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 14 Jan 2009 15:42:05 +0000
Subject: [pkgdb] perl-HTML-FormatText-WithLinks ownership updated
Message-ID: <20090114154205.7D21C208456@bastion.fedora.phx.redhat.com>

Package perl-HTML-FormatText-WithLinks in Fedora devel is now owned by kasal

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-HTML-FormatText-WithLinks



From pkgdb at fedoraproject.org  Wed Jan 14 15:42:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 14 Jan 2009 15:42:17 +0000
Subject: [pkgdb] perl-Heap ownership updated
Message-ID: <20090114154218.0C1DA208468@bastion.fedora.phx.redhat.com>

Package perl-Heap in Fedora devel is now owned by kasal

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Heap



From pkgdb at fedoraproject.org  Wed Jan 14 15:42:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 14 Jan 2009 15:42:57 +0000
Subject: [pkgdb] perl-File-NFSLock ownership updated
Message-ID: <20090114154258.130C5208207@bastion.fedora.phx.redhat.com>

Package perl-File-NFSLock in Fedora devel is now owned by kasal

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-File-NFSLock



From pkgdb at fedoraproject.org  Wed Jan 14 15:43:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 14 Jan 2009 15:43:11 +0000
Subject: [pkgdb] perl-File-MimeInfo ownership updated
Message-ID: <20090114154311.CDAE9208457@bastion.fedora.phx.redhat.com>

Package perl-File-MimeInfo in Fedora devel is now owned by kasal

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-File-MimeInfo



From pkgdb at fedoraproject.org  Wed Jan 14 15:43:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 14 Jan 2009 15:43:28 +0000
Subject: [pkgdb] perl-File-DesktopEntry ownership updated
Message-ID: <20090114154328.6B552208203@bastion.fedora.phx.redhat.com>

Package perl-File-DesktopEntry in Fedora devel is now owned by kasal

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-File-DesktopEntry



From pkgdb at fedoraproject.org  Wed Jan 14 15:43:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 14 Jan 2009 15:43:37 +0000
Subject: [pkgdb] perl-File-BaseDir ownership updated
Message-ID: <20090114154337.344EA208468@bastion.fedora.phx.redhat.com>

Package perl-File-BaseDir in Fedora devel is now owned by kasal

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-File-BaseDir



From pkgdb at fedoraproject.org  Wed Jan 14 15:44:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 14 Jan 2009 15:44:00 +0000
Subject: [pkgdb] perl-Feed-Find ownership updated
Message-ID: <20090114154400.8A528208457@bastion.fedora.phx.redhat.com>

Package perl-Feed-Find in Fedora devel is now owned by kasal

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Feed-Find



From pkgdb at fedoraproject.org  Wed Jan 14 15:44:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 14 Jan 2009 15:44:16 +0000
Subject: [pkgdb] perl-Algorithm-CurveFit ownership updated
Message-ID: <20090114154416.B6EFF208207@bastion.fedora.phx.redhat.com>

Package perl-Algorithm-CurveFit in Fedora devel is now owned by kasal

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Algorithm-CurveFit



From pkgdb at fedoraproject.org  Wed Jan 14 15:44:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 14 Jan 2009 15:44:24 +0000
Subject: [pkgdb] ooo2txt ownership updated
Message-ID: <20090114154424.EE4CD208458@bastion.fedora.phx.redhat.com>

Package ooo2txt in Fedora devel is now owned by kasal

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ooo2txt



From pwouters at fedoraproject.org  Wed Jan 14 15:44:43 2009
From: pwouters at fedoraproject.org (Paul Wouters)
Date: Wed, 14 Jan 2009 15:44:43 +0000 (UTC)
Subject: rpms/unbound/devel unbound.spec,1.17,1.18
Message-ID: <20090114154443.4A9FA70136@cvs1.fedora.phx.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/unbound/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8440

Modified Files:
	unbound.spec 
Log Message:
put libevent back in (got confused between devel and EL-5)



Index: unbound.spec
===================================================================
RCS file: /cvs/extras/rpms/unbound/devel/unbound.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- unbound.spec	14 Jan 2009 15:15:35 -0000	1.17
+++ unbound.spec	14 Jan 2009 15:44:12 -0000	1.18
@@ -11,7 +11,7 @@
 Group: System Environment/Daemons
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: flex, openssl-devel >= 0.9.8g-12, ldns-devel >= 1.4.0, 
-#BuildRequires libevent-devel >= 1.4.5
+BuildRequires: libevent-devel >= 1.4.5
 Requires(post): chkconfig
 Requires(preun): chkconfig
 Requires(preun): initscripts
@@ -45,7 +45,6 @@
 Summary: Development package that includes the unbound header files
 Group: Development/Libraries
 Requires: %{name}-libs = %{version}-%{release}, openssl-devel, ldns-devel
-#Requires: libevent-devel >= 1.4.5
 
 %description devel
 The devel package contains the unbound library and the include files
@@ -64,8 +63,7 @@
 %setup -q 
 
 %build
-#%configure  --with-ldns= -with-libevent --with-pthreads --with-ssl 
-%configure  --with-ldns= --with-pthreads --with-ssl \
+%configure  --with-ldns= -with-libevent --with-pthreads --with-ssl \
             --disable-rpath --enable-debug --disable-static \
             --with-conf-file=%{_sysconfdir}/%{name}/unbound.conf \
             --with-pidfile=%{_localstatedir}/run/%{name}/%{name}.pid
@@ -151,6 +149,8 @@
 - Updated to 1.2.0
 - Added dependancy on minimum SSL for CVE-2008-5077
 - Added dependancy on bc for unbound-munin
+- Added minimum requirement of libevent 1.4.5. Crashes with older versions
+  (note: libevent is stale in EL-4 and not in EL-5, needs fixing there)
 - Removed dependancy on selinux-policy (will get used when available)
 - Enable options as per draft-wijngaards-dnsext-resolver-side-mitigation-00.txt
 - Enable unwanted-reply-threshold to mitigate against a Kaminsky attack



From pkgdb at fedoraproject.org  Wed Jan 14 15:44:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 14 Jan 2009 15:44:43 +0000
Subject: [pkgdb] libsx ownership updated
Message-ID: <20090114154443.A84AC208207@bastion.fedora.phx.redhat.com>

Package libsx in Fedora devel is now owned by kasal

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libsx



From pkgdb at fedoraproject.org  Wed Jan 14 15:45:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 14 Jan 2009 15:45:24 +0000
Subject: [pkgdb] intuitively ownership updated
Message-ID: <20090114154524.4B80E208203@bastion.fedora.phx.redhat.com>

Package intuitively in Fedora devel is now owned by kasal

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/intuitively



From pkgdb at fedoraproject.org  Wed Jan 14 15:45:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 14 Jan 2009 15:45:33 +0000
Subject: [pkgdb] html2ps ownership updated
Message-ID: <20090114154533.78953208457@bastion.fedora.phx.redhat.com>

Package html2ps in Fedora devel is now owned by kasal

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/html2ps



From pkgdb at fedoraproject.org  Wed Jan 14 15:45:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 14 Jan 2009 15:45:43 +0000
Subject: [pkgdb] halevt ownership updated
Message-ID: <20090114154543.82206208468@bastion.fedora.phx.redhat.com>

Package halevt in Fedora devel is now owned by kasal

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/halevt



From pkgdb at fedoraproject.org  Wed Jan 14 15:45:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 14 Jan 2009 15:45:54 +0000
Subject: [pkgdb] fcron ownership updated
Message-ID: <20090114154554.619FE208203@bastion.fedora.phx.redhat.com>

Package fcron in Fedora devel is now owned by kasal

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fcron



From pkgdb at fedoraproject.org  Wed Jan 14 15:46:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 14 Jan 2009 15:46:00 +0000
Subject: [pkgdb] debootstrap ownership updated
Message-ID: <20090114154600.AFB17208458@bastion.fedora.phx.redhat.com>

Package debootstrap in Fedora devel is now owned by kasal

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/debootstrap



From pkgdb at fedoraproject.org  Wed Jan 14 15:46:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 14 Jan 2009 15:46:24 +0000
Subject: [pkgdb] bitmap ownership updated
Message-ID: <20090114154624.73F242081FF@bastion.fedora.phx.redhat.com>

Package bitmap in Fedora devel is now owned by kasal

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bitmap



From pkgdb at fedoraproject.org  Wed Jan 14 15:46:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 14 Jan 2009 15:46:45 +0000
Subject: [pkgdb] bibexport ownership updated
Message-ID: <20090114154645.491AF208458@bastion.fedora.phx.redhat.com>

Package bibexport in Fedora devel is now owned by kasal

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bibexport



From ovasik at fedoraproject.org  Wed Jan 14 15:47:43 2009
From: ovasik at fedoraproject.org (Ondrej Vasik)
Date: Wed, 14 Jan 2009 15:47:43 +0000 (UTC)
Subject: rpms/docbook5-style-xsl/F-10 docbook5-style-xsl.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090114154743.DF80C70136@cvs1.fedora.phx.redhat.com>

Author: ovasik

Update of /cvs/extras/rpms/docbook5-style-xsl/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8841

Modified Files:
	.cvsignore sources 
Added Files:
	docbook5-style-xsl.spec 
Log Message:
Initial Fedora Release


--- NEW FILE docbook5-style-xsl.spec ---
Name: docbook5-style-xsl
Version: 1.74.0
Release: 1%{?dist}
Group: Applications/Text

Summary: Norman Walsh's XSL stylesheets for DocBook 5.X

License: Freely redistributable without restriction
URL: http://docbook.sourceforge.net/projects/xsl/

Provides: docbook-xsl-ns = %{version}
# xml-common was using /usr/share/xml until 0.6.3-8.
Requires: xml-common >= 0.6.3-8
# libxml2 required because of usage of /usr/bin/xmlcatalog
Requires(post): libxml2 >= 2.4.8
Requires(postun): libxml2 >= 2.4.8
Conflicts: passivetex < 1.21

BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root

BuildArch: noarch
Source0: http://downloads.sourceforge.net/docbook/docbook-xsl-ns-%{version}.tar.bz2

%description
These XSL namespace aware stylesheets allow you to transform any
DocBook 5 document to other formats, such as HTML, manpages, FO,
XHMTL and other formats. They are highly customizable. For more
information see W3C page about XSL.

%prep
%setup -q -n docbook-xsl-ns-%{version}
#remove .gitignore files
rm -rf $(find -name '.gitignore' -type f)
#make ruby scripts executable
chmod +x epub/bin/dbtoepub
chmod +x epub/bin/spec/epub*.rb

%build

%install
DESTDIR=$RPM_BUILD_ROOT
rm -rf $RPM_BUILD_ROOT
mkdir -p $DESTDIR%{_datadir}/sgml/docbook/xsl-ns-stylesheets-%version
cp -a [[:lower:]]* $DESTDIR%{_datadir}/sgml/docbook/xsl-ns-stylesheets-%version/
ln -s xsl-ns-stylesheets-%{version} \
 $DESTDIR%{_datadir}/sgml/docbook/xsl-ns-stylesheets

# Don't ship the extensions.
rm -rf $DESTDIR%{_datadir}/sgml/docbook/xsl-ns-stylesheets/extensions
# Don't ship install shell script.
rm -rf $DESTDIR%{_datadir}/sgml/docbook/xsl-ns-stylesheets/install.sh

%clean
DESTDIR=$RPM_BUILD_ROOT
rm -rf $RPM_BUILD_ROOT

%files
%defattr (-,root,root,-)
%doc BUGS
%doc README COPYING
%doc TODO NEWS
%{_datadir}/sgml/docbook/xsl-ns-stylesheets-%{version}
%{_datadir}/sgml/docbook/xsl-ns-stylesheets

%post
CATALOG=%{_sysconfdir}/xml/catalog
%{_bindir}/xmlcatalog --noout --add "rewriteSystem" \
 "http://docbook.sourceforge.net/release/xsl-ns/%{version}" \
 "file://%{_datadir}/sgml/docbook/xsl-ns-stylesheets-%{version}" $CATALOG
%{_bindir}/xmlcatalog --noout --add "rewriteURI" \
 "http://docbook.sourceforge.net/release/xsl-ns/%{version}" \
 "file://%{_datadir}/sgml/docbook/xsl-ns-stylesheets-%{version}" $CATALOG
%{_bindir}/xmlcatalog --noout --add "rewriteSystem" \
 "http://docbook.sourceforge.net/release/xsl-ns/current" \
 "file://%{_datadir}/sgml/docbook/xsl-ns-stylesheets-%{version}" $CATALOG
%{_bindir}/xmlcatalog --noout --add "rewriteURI" \
 "http://docbook.sourceforge.net/release/xsl-ns/current" \
 "file://%{_datadir}/sgml/docbook/xsl-ns-stylesheets-%{version}" $CATALOG


%postun
# remove entries only on removal of package
if [ "$1" = 0 ]; then
  CATALOG=%{_sysconfdir}/xml/catalog
  %{_bindir}/xmlcatalog --noout --del \
   "file://%{_datadir}/sgml/docbook/xsl-ns-stylesheets-%{version}" $CATALOG
fi

%changelog
* Mon Nov 10 2008 Ondrej Vasik <ovasik at redhat.com> 1.74.0-1
- Initial Fedora release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/docbook5-style-xsl/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	13 Jan 2009 20:25:44 -0000	1.1
+++ .cvsignore	14 Jan 2009 15:47:13 -0000	1.2
@@ -0,0 +1 @@
+docbook-xsl-ns-1.74.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/docbook5-style-xsl/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	13 Jan 2009 20:25:44 -0000	1.1
+++ sources	14 Jan 2009 15:47:13 -0000	1.2
@@ -0,0 +1 @@
+42f5f41ff5822c57242d9413e7f98aef  docbook-xsl-ns-1.74.0.tar.bz2



From pkgdb at fedoraproject.org  Wed Jan 14 15:52:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 14 Jan 2009 15:52:57 +0000
Subject: [pkgdb] halevt: wolfy has requested watchbugzilla
Message-ID: <20090114155257.8679F2081FF@bastion.fedora.phx.redhat.com>

wolfy has requested the watchbugzilla acl on halevt (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/halevt



From pkgdb at fedoraproject.org  Wed Jan 14 15:52:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 14 Jan 2009 15:52:58 +0000
Subject: [pkgdb] halevt: wolfy has requested watchcommits
Message-ID: <20090114155258.48CBB208456@bastion.fedora.phx.redhat.com>

wolfy has requested the watchcommits acl on halevt (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/halevt



From pkgdb at fedoraproject.org  Wed Jan 14 15:53:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 14 Jan 2009 15:53:00 +0000
Subject: [pkgdb] halevt: wolfy has requested commit
Message-ID: <20090114155300.9B6CC208467@bastion.fedora.phx.redhat.com>

wolfy has requested the commit acl on halevt (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/halevt



From victorv at fedoraproject.org  Wed Jan 14 15:55:42 2009
From: victorv at fedoraproject.org (Victor G. Vasilyev)
Date: Wed, 14 Jan 2009 15:55:42 +0000 (UTC)
Subject: rpms/netbeans-javaparser/devel .cvsignore, 1.2,
	1.3 netbeans-javaparser.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20090114155542.7ACBE70136@cvs1.fedora.phx.redhat.com>

Author: victorv

Update of /cvs/pkgs/rpms/netbeans-javaparser/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10250

Modified Files:
	.cvsignore netbeans-javaparser.spec sources 
Log Message:
Version 6.5 https://bugzilla.redhat.com/show_bug.cgi?id=479877



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/netbeans-javaparser/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	29 Aug 2008 11:08:36 -0000	1.2
+++ .cvsignore	14 Jan 2009 15:55:12 -0000	1.3
@@ -1 +1 @@
-nb-javaparser-6.1-src.zip
+nb-javac-6.5.tar.gz


Index: netbeans-javaparser.spec
===================================================================
RCS file: /cvs/pkgs/rpms/netbeans-javaparser/devel/netbeans-javaparser.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- netbeans-javaparser.spec	29 Aug 2008 11:08:36 -0000	1.1
+++ netbeans-javaparser.spec	14 Jan 2009 15:55:12 -0000	1.2
@@ -1,13 +1,20 @@
-%define nb_javaparser_dir nb-javaparser-6.1
+# Prevent brp-java-repack-jars from being run.
+%define __jar_repack %{nil}
 
 Name:           netbeans-javaparser
-Version:        6.1
-Release:        2%{?dist}
+Version:        6.5
+Release:        1%{?dist}
 Summary:        NetBeans Java Parser
 License:        GPLv2 with exceptions
 Url:            http://java.netbeans.org/javaparser/
 Group:          Development/Libraries
-Source0:        http://java.netbeans.org/files/documents/25/2033/nb-javaparser-6.1-src.zip
+# The source for this package was pulled from upstream's vcs.  Use the
+# following commands to generate the tarball:
+# hg clone http://hg.netbeans.org/main/nb-javac/
+# cd nb-javac/
+# hg update -r release65_base
+# tar -czvf ../nb-javac-6.5.tar.gz .
+Source0:        nb-javac-%{version}.tar.gz
 
 BuildRequires:  ant
 BuildRequires:  ant-nodeps
@@ -25,8 +32,7 @@
 Java parser to analyse Java source files inside of the NetBeans IDE
 
 %prep
-%{__rm} -fr %{nb_javaparser_dir}
-%setup -q -n %{nb_javaparser_dir}
+%setup -q -c
 # remove all binary libs
 find . -name "*.jar" -exec %{__rm} -f {} \;
 
@@ -54,6 +60,10 @@
 
 
 %changelog
+* Wed Dec 24 2008 Victor G. Vasilyev <victor.vasilyev at sun.com> 6.5-1
+- New vesion of sources
+- Call of the brp-java-repack-jars script is disabled
+
 * Wed Aug 13 2008 Victor G. Vasilyev <victor.vasilyev at sun.com> 6.1-2
 - java-devel & jpackage-utils are added as the build requirements
 - jpackage-utils is added as the run-time requirement
@@ -82,4 +92,3 @@
 + Revision: 117585
 - Initial version of the NetBeans javaparser library
 - create libnb-javaparser
-


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/netbeans-javaparser/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	29 Aug 2008 11:08:36 -0000	1.2
+++ sources	14 Jan 2009 15:55:12 -0000	1.3
@@ -1 +1 @@
-668f3fa1d2189f58f02309d518f1aa14  nb-javaparser-6.1-src.zip
+2e899df9e15daffe0f3eb18ff9041907  nb-javac-6.5.tar.gz



From jwrdegoede at fedoraproject.org  Wed Jan 14 16:01:32 2009
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Wed, 14 Jan 2009 16:01:32 +0000 (UTC)
Subject: rpms/kernel/F-10 config-generic,1.204,1.205
Message-ID: <20090114160132.59B0C70136@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/kernel/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10873

Modified Files:
	config-generic 
Log Message:
Add matching gspca-stv06xx update to config-generic


Index: config-generic
===================================================================
RCS file: /cvs/extras/rpms/kernel/F-10/config-generic,v
retrieving revision 1.204
retrieving revision 1.205
diff -u -r1.204 -r1.205
--- config-generic	13 Jan 2009 15:30:14 -0000	1.204
+++ config-generic	14 Jan 2009 16:01:01 -0000	1.205
@@ -2736,6 +2736,7 @@
 CONFIG_USB_DSBR=m
 CONFIG_USB_ET61X251=m
 CONFIG_USB_M5602=m
+CONFIG_USB_STV06XX=m
 CONFIG_USB_GSPCA=m
 CONFIG_USB_GSPCA_CONEX=m
 CONFIG_USB_GSPCA_ETOMS=m



From jwrdegoede at fedoraproject.org  Wed Jan 14 16:03:35 2009
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Wed, 14 Jan 2009 16:03:35 +0000 (UTC)
Subject: rpms/kernel/F-9 linux-2.6-gspca-stv06xx-git.patch, NONE,
	1.1 config-generic, 1.134, 1.135 kernel.spec, 1.894,
	1.895 linux-2.6-gspca-git.patch, 1.1, 1.2
Message-ID: <20090114160335.5B82070136@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/kernel/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11053

Modified Files:
	config-generic kernel.spec linux-2.6-gspca-git.patch 
Added Files:
	linux-2.6-gspca-stv06xx-git.patch 
Log Message:
* Wed Jan 14 2009 Hans de Goede <hdegoede at redhat.com>
- Rebase gspca git patch and re-enable
- Add gscpa-stv06xx (qc-usb replacement) driver from its own git tree


linux-2.6-gspca-stv06xx-git.patch:

--- NEW FILE linux-2.6-gspca-stv06xx-git.patch ---
diff -urpN linux/drivers/media/video/gspca/Kconfig linux/drivers/media/video/gspca/Kconfig
--- linux/drivers/media/video/gspca/Kconfig	2008-12-09 21:37:33.000000000 +0100
+++ linux/drivers/media/video/gspca/Kconfig	2008-12-25 17:09:06.000000000 +0100
@@ -18,6 +18,7 @@ menuconfig USB_GSPCA
 if USB_GSPCA && VIDEO_V4L2
 
 source "drivers/media/video/gspca/m5602/Kconfig"
+source "drivers/media/video/gspca/stv06xx/Kconfig"
 
 config USB_GSPCA_CONEX
 	tristate "Conexant Camera Driver"
diff -urpN linux/drivers/media/video/gspca/Makefile linux/drivers/media/video/gspca/Makefile
--- linux/drivers/media/video/gspca/Makefile	2008-12-09 21:37:33.000000000 +0100
+++ linux/drivers/media/video/gspca/Makefile	2008-12-25 17:09:06.000000000 +0100
@@ -47,4 +45,4 @@ gspca_vc032x-objs		:= vc032x.o
 gspca_zc3xx-objs		:= zc3xx.o
 
 obj-$(CONFIG_USB_M5602)		+= m5602/
-
+obj-$(CONFIG_USB_STV06XX) 	+= stv06xx/
diff -urpN linux/drivers/media/video/gspca/gspca.h linux/drivers/media/video/gspca/gspca.h
--- linux/drivers/media/video/gspca/gspca.h	2008-12-10 19:53:43.000000000 +0100
+++ linux/drivers/media/video/gspca/gspca.h	2008-12-25 20:55:35.000000000 +0100
@@ -56,7 +56,7 @@ extern int gspca_debug;
 /* device information - set at probe time */
 struct cam {
 	int bulk_size;		/* buffer size when image transfer by bulk */
-	struct v4l2_pix_format *cam_mode;	/* size nmodes */
+	const struct v4l2_pix_format *cam_mode;	/* size nmodes */
 	char nmodes;
 	__u8 bulk_nurbs;	/* number of URBs in bulk mode
 				 * - cannot be > MAX_NURBS
diff -urpN linux/drivers/media/video/gspca/stv06xx/Kconfig linux/drivers/media/video/gspca/stv06xx/Kconfig
--- linux/drivers/media/video/gspca/stv06xx/Kconfig	1970-01-01 01:00:00.000000000 +0100
+++ linux/drivers/media/video/gspca/stv06xx/Kconfig	2008-12-25 17:09:06.000000000 +0100
@@ -0,0 +1,8 @@
+config USB_STV06XX
+	tristate "ST USB STV06XX Camera Driver"
+	depends on VIDEO_V4L2 && USB_GSPCA
+	help
+	  Say Y here if you want support for cameras based on the ST STV06XX chip.
+
+	  To compile this driver as a module, choose M here: the
+	  module will be called gspca_stv06xx.
diff -urpN linux/drivers/media/video/gspca/stv06xx/Makefile linux/drivers/media/video/gspca/stv06xx/Makefile
--- linux/drivers/media/video/gspca/stv06xx/Makefile	1970-01-01 01:00:00.000000000 +0100
+++ linux/drivers/media/video/gspca/stv06xx/Makefile	2008-12-25 17:09:06.000000000 +0100
@@ -0,0 +1,8 @@
+obj-$(CONFIG_USB_STV06XX) += gspca_stv06xx.o
+
+gspca_stv06xx-objs := stv06xx.o \
+		      stv06xx_vv6410.o \
+		      stv06xx_hdcs.o \
+		      stv06xx_pb0100.o
+
+EXTRA_CFLAGS += -Idrivers/media/video/gspca
diff -urpN linux/drivers/media/video/gspca/stv06xx/stv06xx.c linux/drivers/media/video/gspca/stv06xx/stv06xx.c
--- linux/drivers/media/video/gspca/stv06xx/stv06xx.c	1970-01-01 01:00:00.000000000 +0100
+++ linux/drivers/media/video/gspca/stv06xx/stv06xx.c	2008-12-25 21:17:34.000000000 +0100
@@ -0,0 +1,522 @@
+/*
+ * Copyright (c) 2001 Jean-Fredric Clere, Nikolas Zimmermann, Georg Acher
+ *		      Mark Cave-Ayland, Carlo E Prelz, Dick Streefland
+ * Copyright (c) 2002, 2003 Tuukka Toivonen
+ * Copyright (c) 2008 Erik Andr??n
+ *
+ * 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
+ *
+ * P/N 861037:      Sensor HDCS1000        ASIC STV0600
+ * P/N 861050-0010: Sensor HDCS1000        ASIC STV0600
+ * P/N 861050-0020: Sensor Photobit PB100  ASIC STV0600-1 - QuickCam Express
+ * P/N 861055:      Sensor ST VV6410       ASIC STV0610   - LEGO cam
+ * P/N 861075-0040: Sensor HDCS1000        ASIC
+ * P/N 961179-0700: Sensor ST VV6410       ASIC STV0602   - Dexxa WebCam USB
+ * P/N 861040-0000: Sensor ST VV6410       ASIC STV0610   - QuickCam Web
+ */
+
+#include "stv06xx_sensor.h"
+
+MODULE_AUTHOR("Erik Andr??n");
+MODULE_DESCRIPTION("STV06XX USB Camera Driver");
+MODULE_LICENSE("GPL");
+
+int dump_bridge;
+int dump_sensor;
+
+int stv06xx_write_bridge(struct sd *sd, u16 address, u16 i2c_data)
+{
+	int err;
+	struct usb_device *udev = sd->gspca_dev.dev;
+	__u8 *buf = sd->gspca_dev.usb_buf;
+	u8 len = (i2c_data > 0xff) ? 2 : 1;
+
+	buf[0] = i2c_data & 0xff;
+	buf[1] = (i2c_data >> 8) & 0xff;
+
+	err = usb_control_msg(udev, usb_sndctrlpipe(udev, 0),
+			      0x04, 0x40, address, 0, buf, len,
+			      STV06XX_URB_MSG_TIMEOUT);
+
+
+	PDEBUG(D_CONF, "Written 0x%x to address 0x%x, status: %d",
+	       i2c_data, address, err);
+
+	return (err < 0) ? err : 0;
+}
+
+int stv06xx_read_bridge(struct sd *sd, u16 address, u8 *i2c_data)
+{
+	int err;
+	struct usb_device *udev = sd->gspca_dev.dev;
+	__u8 *buf = sd->gspca_dev.usb_buf;
+
+	err = usb_control_msg(udev, usb_rcvctrlpipe(udev, 0),
+			      0x04, 0xc0, address, 0, buf, 1,
+			      STV06XX_URB_MSG_TIMEOUT);
+
+	*i2c_data = buf[0];
+
+	PDEBUG(D_CONF, "Read 0x%x from address 0x%x, status %d",
+	       *i2c_data, address, err);
+
+	return (err < 0) ? err : 0;
+}
+
+/* Wraps the normal write sensor bytes / words functions for writing a
+   single value */
+int stv06xx_write_sensor(struct sd *sd, u8 address, u16 value)
+{
+	if (sd->sensor->i2c_len == 2) {
+		u16 data[2] = { address, value };
+		return stv06xx_write_sensor_words(sd, data, 1);
+	} else {
+		u8 data[2] = { address, value };
+		return stv06xx_write_sensor_bytes(sd, data, 1);
+	}
+}
+
+static int stv06xx_write_sensor_finish(struct sd *sd)
+{
+	int err = 0;
+
+	if (IS_850(sd)) {
+		struct usb_device *udev = sd->gspca_dev.dev;
+		__u8 *buf = sd->gspca_dev.usb_buf;
+
+		/* Quickam Web needs an extra packet */
+		buf[0] = 0;
+		err = usb_control_msg(udev, usb_sndctrlpipe(udev, 0),
+				      0x04, 0x40, 0x1704, 0, buf, 1,
+				      STV06XX_URB_MSG_TIMEOUT);
+	}
+
+	return (err < 0) ? err : 0;
+}
+
+int stv06xx_write_sensor_bytes(struct sd *sd, const u8 *data, u8 len)
+{
+	int err, i, j;
+	struct usb_device *udev = sd->gspca_dev.dev;
+	__u8 *buf = sd->gspca_dev.usb_buf;
+
+	PDEBUG(D_USBO, "I2C: Command buffer contains %d entries", len);
+	for (i = 0; i < len;) {
+		/* Build the command buffer */
+		memset(buf, 0, I2C_BUFFER_LENGTH);
+		for (j = 0; j < I2C_MAX_BYTES && i < len; j++, i++) {
+			buf[j] = data[2*i];
+			buf[0x10 + j] = data[2*i+1];
+			PDEBUG(D_USBO, "I2C: Writing 0x%02x to reg 0x%02x",
+			data[2*i+1], data[2*i]);
+		}
+		buf[0x20] = sd->sensor->i2c_addr;
+		buf[0x21] = j - 1; /* Number of commands to send - 1 */
+		buf[0x22] = I2C_WRITE_CMD;
+		err = usb_control_msg(udev, usb_sndctrlpipe(udev, 0),
+				      0x04, 0x40, 0x0400, 0, buf,
+				      I2C_BUFFER_LENGTH,
+				      STV06XX_URB_MSG_TIMEOUT);
+				      if (err < 0)
+					return err;
+       }
+       return stv06xx_write_sensor_finish(sd);
+}
+
+int stv06xx_write_sensor_words(struct sd *sd, const u16 *data, u8 len)
+{
[...2502 lines suppressed...]
+
+/* Dark line offset cancellation enable */
+#define VV6410_DARKOFFSETSETUP		0x2e
+
+/* Video timing registers */
+/* Line Length (Pixel Clocks) */
+#define VV6410_LINELENGTHH		0x52
+#define VV6410_LINELENGTHL		0x53
+
+/* X-co-ordinate of top left corner of region of interest (x-offset) */
+#define VV6410_XOFFSETH			0x57
+#define VV6410_XOFFSETL			0x58
+
+/* Y-coordinate of top left corner of region of interest (y-offset) */
+#define VV6410_YOFFSETH			0x59
+#define VV6410_YOFFSETL			0x5a
+
+/* Field length (Lines) */
+#define VV6410_FIELDLENGTHH		0x61
+#define VV6410_FIELDLENGTHL		0x62
+
+/* System registers */
+/* Black offset cancellation default value */
+#define VV6410_BLACKOFFSETH		0x70
+#define VV6410_BLACKOFFSETL		0x71
+
+/* Black offset cancellation setup */
+#define VV6410_BLACKOFFSETSETUP		0x72
+
+/* Analog Control Register 0 */
+#define VV6410_CR0			0x75
+
+/* Analog Control Register 1 */
+#define VV6410_CR1			0x76
+
+/* ADC Setup Register */
+#define VV6410_AS0			0x77
+
+/* Analog Test Register */
+#define VV6410_AT0			0x78
+
+/* Audio Amplifier Setup Register */
+#define VV6410_AT1			0x79
+
+#define VV6410_HFLIP 			(1 << 3)
+#define VV6410_VFLIP 			(1 << 4)
+
+#define VV6410_LOW_POWER_MODE		(1 << 0)
+#define VV6410_SOFT_RESET		(1 << 2)
+#define VV6410_PAL_25_FPS		(0 << 3)
+
+#define VV6410_CLK_DIV_2		(1 << 1)
+
+#define VV6410_FINE_EXPOSURE		320
+#define VV6410_COARSE_EXPOSURE		192
+#define VV6410_DEFAULT_GAIN		11
+
+#define VV6410_SUBSAMPLE		0x01
+#define VV6410_CROP_TO_QVGA		0x02
+
+int vv6410_probe(struct sd *sd);
+int vv6410_start(struct sd *sd);
+int vv6410_init(struct sd *sd);
+int vv6410_stop(struct sd *sd);
+int vv6410_dump(struct sd *sd);
+
+/* V4L2 controls supported by the driver */
+int vv6410_get_hflip(struct gspca_dev *gspca_dev, __s32 *val);
+int vv6410_set_hflip(struct gspca_dev *gspca_dev, __s32 val);
+int vv6410_get_vflip(struct gspca_dev *gspca_dev, __s32 *val);
+int vv6410_set_vflip(struct gspca_dev *gspca_dev, __s32 val);
+int vv6410_get_analog_gain(struct gspca_dev *gspca_dev, __s32 *val);
+int vv6410_set_analog_gain(struct gspca_dev *gspca_dev, __s32 val);
+
+const struct stv06xx_sensor stv06xx_sensor_vv6410 = {
+	.name = "ST VV6410",
+	.i2c_flush = 5,
+	.i2c_addr = 0x20,
+	.i2c_len = 1,
+	.init = vv6410_init,
+	.probe = vv6410_probe,
+	.start = vv6410_start,
+	.stop = vv6410_stop,
+	.dump = vv6410_dump,
+
+	.nctrls = 3,
+	.ctrls = {
+	{
+		{
+			.id		= V4L2_CID_HFLIP,
+			.type		= V4L2_CTRL_TYPE_BOOLEAN,
+			.name		= "horizontal flip",
+			.minimum	= 0,
+			.maximum	= 1,
+			.step		= 1,
+			.default_value	= 0
+		},
+		.set = vv6410_set_hflip,
+		.get = vv6410_get_hflip
+	}, {
+		{
+			.id		= V4L2_CID_VFLIP,
+			.type		= V4L2_CTRL_TYPE_BOOLEAN,
+			.name		= "vertical flip",
+			.minimum	= 0,
+			.maximum	= 1,
+			.step		= 1,
+			.default_value 	= 0
+		},
+		.set = vv6410_set_vflip,
+		.get = vv6410_get_vflip
+	}, {
+		{
+			.id		= V4L2_CID_GAIN,
+			.type		= V4L2_CTRL_TYPE_INTEGER,
+			.name		= "analog gain",
+			.minimum	= 0,
+			.maximum	= 15,
+			.step		= 1,
+			.default_value  = 0
+		},
+		.set = vv6410_set_analog_gain,
+		.get = vv6410_get_analog_gain
+	}
+	},
+
+	.nmodes = 1,
+	.modes = {
+	{
+		356,
+		292,
+		V4L2_PIX_FMT_SGRBG8,
+		V4L2_FIELD_NONE,
+		.sizeimage =
+			356 * 292,
+		.bytesperline = 356,
+		.colorspace = V4L2_COLORSPACE_SRGB,
+		.priv = 0
+	}
+	}
+};
+
+/* If NULL, only single value to write, stored in len */
+struct stv_init {
+	const u8 *data;
+	u16 start;
+	u8 len;
+};
+
+static const u8 x1500[] = {	/* 0x1500 - 0x150f */
+	0x0b, 0xa7, 0xb7, 0x00, 0x00
+};
+
+static const u8 x1536[] = {	/* 0x1536 - 0x153b */
+	0x02, 0x00, 0x60, 0x01, 0x20, 0x01
+};
+
+static const u8 x15c1[] = {	/* 0x15c1 - 0x15c2 */
+	0xff, 0x03 /* Output word 0x03ff = 1023 (ISO size) */
+};
+
+static const struct stv_init stv_bridge_init[] = {
+	/* This reg is written twice. Some kind of reset? */
+	{NULL,  0x1620, 0x80},
+	{NULL,  0x1620, 0x00},
+	{NULL,  0x1423, 0x04},
+	{x1500, 0x1500, ARRAY_SIZE(x1500)},
+	{x1536, 0x1536, ARRAY_SIZE(x1536)},
+	{x15c1, 0x15c1, ARRAY_SIZE(x15c1)}
+};
+
+static const u8 vv6410_sensor_init[][2] = {
+	/* Setup registers */
+	{VV6410_SETUP0,		VV6410_SOFT_RESET},
+	{VV6410_SETUP0,		VV6410_LOW_POWER_MODE},
+	/* Use shuffled read-out mode */
+	{VV6410_SETUP1,		BIT(6)},
+	/* All modes to 1 */
+	{VV6410_FGMODES,	BIT(6) | BIT(4) | BIT(2) | BIT(0)},
+	{VV6410_PINMAPPING,	0x00},
+	/* Pre-clock generator divide off */
+	{VV6410_DATAFORMAT,	BIT(7) | BIT(0)},
+
+	/* Exposure registers */
+	{VV6410_FINEH,		VV6410_FINE_EXPOSURE >> 8},
+	{VV6410_FINEL,		VV6410_FINE_EXPOSURE & 0xff},
+	{VV6410_COARSEH,	VV6410_COARSE_EXPOSURE >> 8},
+	{VV6410_COARSEL,	VV6410_COARSE_EXPOSURE & 0xff},
+	{VV6410_ANALOGGAIN,	0xf0 | VV6410_DEFAULT_GAIN},
+	{VV6410_CLKDIV,		VV6410_CLK_DIV_2},
+
+	/* System registers */
+	/* Enable voltage doubler */
+	{VV6410_AS0,		BIT(6) | BIT(4) | BIT(3) | BIT(2) | BIT(1)},
+	{VV6410_AT0,		0x00},
+	/* Power up audio, differential */
+	{VV6410_AT1,		BIT(4)|BIT(0)},
+};
+
+#endif


Index: config-generic
===================================================================
RCS file: /cvs/extras/rpms/kernel/F-9/config-generic,v
retrieving revision 1.134
retrieving revision 1.135
diff -u -r1.134 -r1.135
--- config-generic	12 Jan 2009 19:54:16 -0000	1.134
+++ config-generic	14 Jan 2009 16:03:04 -0000	1.135
@@ -2736,6 +2736,7 @@
 CONFIG_USB_DSBR=m
 CONFIG_USB_ET61X251=m
 CONFIG_USB_M5602=m
+CONFIG_USB_STV06XX=m
 CONFIG_USB_GSPCA=m
 CONFIG_USB_GSPCA_CONEX=m
 CONFIG_USB_GSPCA_ETOMS=m


Index: kernel.spec
===================================================================
RCS file: /cvs/extras/rpms/kernel/F-9/kernel.spec,v
retrieving revision 1.894
retrieving revision 1.895
diff -u -r1.894 -r1.895
--- kernel.spec	13 Jan 2009 21:07:14 -0000	1.894
+++ kernel.spec	14 Jan 2009 16:03:04 -0000	1.895
@@ -635,6 +635,7 @@
 
 # webcam fixes
 Patch900: linux-2.6-gspca-git.patch
+Patch901: linux-2.6-gspca-stv06xx-git.patch
 
 Patch1515: linux-2.6.27-lirc.patch
 Patch1520: linux-2.6-hdpvr.patch
@@ -1159,7 +1160,8 @@
 ApplyPatch linux-2.6-at76.patch
 
 # Webcam patches
-#ApplyPatch linux-2.6-gspca-git.patch
+ApplyPatch linux-2.6-gspca-git.patch
+ApplyPatch linux-2.6-gspca-stv06xx-git.patch
 
 # http://www.lirc.org/
 ApplyPatch linux-2.6.27-lirc.patch
@@ -1777,6 +1779,10 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Wed Jan 14 2009 Hans de Goede <hdegoede at redhat.com>
+- Rebase gspca git patch and re-enable
+- Add gscpa-stv06xx (qc-usb replacement) driver from its own git tree
+
 * Tue Jan 13 2009 John W. Linville <linville at redhat.com>
 - ath5k: ignore the return value of ath5k_hw_noise_floor_calibration
 

linux-2.6-gspca-git.patch:

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.1 -r 1.2 linux-2.6-gspca-git.patch
Index: linux-2.6-gspca-git.patch
===================================================================
RCS file: /cvs/extras/rpms/kernel/F-9/linux-2.6-gspca-git.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-gspca-git.patch	12 Jan 2009 19:54:17 -0000	1.1
+++ linux-2.6-gspca-git.patch	14 Jan 2009 16:03:04 -0000	1.2
@@ -1,5 +1,5 @@
-diff -urN /home/hans/projects/fedora-extras/kernel/devel/kernel-2.6.27/linux-2.6.27.noarch/drivers/media/video/gspca/Kconfig linux/drivers/media/video/gspca/Kconfig
---- /home/hans/projects/fedora-extras/kernel/devel/kernel-2.6.27/linux-2.6.27.noarch/drivers/media/video/gspca/Kconfig	2008-12-10 19:44:21.000000000 +0100
+diff -urN linux/drivers/media/video/gspca/Kconfig linux/drivers/media/video/gspca/Kconfig
+--- linux/drivers/media/video/gspca/Kconfig	2008-12-25 00:26:37.000000000 +0100
 +++ linux/drivers/media/video/gspca/Kconfig	2008-12-09 21:37:33.000000000 +0100
 @@ -12,7 +12,7 @@
  	  "Video For Linux" to use this driver.
@@ -60,8 +60,8 @@
  
  config USB_GSPCA_T613
  	tristate "T613 (JPEG Compliance) USB Camera Driver"
-diff -urN /home/hans/projects/fedora-extras/kernel/devel/kernel-2.6.27/linux-2.6.27.noarch/drivers/media/video/gspca/Makefile linux/drivers/media/video/gspca/Makefile
---- /home/hans/projects/fedora-extras/kernel/devel/kernel-2.6.27/linux-2.6.27.noarch/drivers/media/video/gspca/Makefile	2008-12-10 19:44:21.000000000 +0100
+diff -urN linux/drivers/media/video/gspca/Makefile linux/drivers/media/video/gspca/Makefile
+--- linux/drivers/media/video/gspca/Makefile	2008-12-25 00:26:37.000000000 +0100
 +++ linux/drivers/media/video/gspca/Makefile	2008-12-09 21:37:33.000000000 +0100
 @@ -4,6 +4,7 @@
  obj-$(CONFIG_USB_GSPCA_FINEPIX)	+= gspca_finepix.o
@@ -79,24 +79,8 @@
  gspca_pac207-objs		:= pac207.o
  gspca_pac7311-objs		:= pac7311.o
  gspca_sonixb-objs		:= sonixb.o
-diff -urN /home/hans/projects/fedora-extras/kernel/devel/kernel-2.6.27/linux-2.6.27.noarch/drivers/media/video/gspca/etoms.c linux/drivers/media/video/gspca/etoms.c
---- /home/hans/projects/fedora-extras/kernel/devel/kernel-2.6.27/linux-2.6.27.noarch/drivers/media/video/gspca/etoms.c	2008-12-10 19:44:21.000000000 +0100
-+++ linux/drivers/media/video/gspca/etoms.c	2008-12-09 21:37:33.000000000 +0100
-@@ -733,6 +733,12 @@
- 
- 		i2c_w(gspca_dev, PAS106_REG13, &i2cflags, 1, 3);
- 		i2c_w(gspca_dev, PAS106_REG0e, &gain, 1, 1);
-+#if 0
-+		i2c_w(gspca_dev, 0x09, &gain, 1, 1);
-+		i2c_w(gspca_dev, 0x0a, &gain, 1, 1);
-+		i2c_w(gspca_dev, 0x0b, &gain, 1, 1);
-+		i2c_w(gspca_dev, 0x0c, &gain, 1, 1);
-+#endif
- 	}
- }
- 
-diff -urN /home/hans/projects/fedora-extras/kernel/devel/kernel-2.6.27/linux-2.6.27.noarch/drivers/media/video/gspca/finepix.c linux/drivers/media/video/gspca/finepix.c
---- /home/hans/projects/fedora-extras/kernel/devel/kernel-2.6.27/linux-2.6.27.noarch/drivers/media/video/gspca/finepix.c	2008-12-10 19:44:21.000000000 +0100
+diff -urN linux/drivers/media/video/gspca/finepix.c linux/drivers/media/video/gspca/finepix.c
+--- linux/drivers/media/video/gspca/finepix.c	2008-12-25 00:26:37.000000000 +0100
 +++ linux/drivers/media/video/gspca/finepix.c	2008-12-09 21:37:33.000000000 +0100
 @@ -314,9 +314,6 @@
  	int ret;
@@ -108,9 +92,9 @@
  	/* Init the device */
  	memset(gspca_dev->usb_buf, 0, 12);
  	gspca_dev->usb_buf[0] = 0xc6;
-diff -urN /home/hans/projects/fedora-extras/kernel/devel/kernel-2.6.27/linux-2.6.27.noarch/drivers/media/video/gspca/gspca.c linux/drivers/media/video/gspca/gspca.c
---- /home/hans/projects/fedora-extras/kernel/devel/kernel-2.6.27/linux-2.6.27.noarch/drivers/media/video/gspca/gspca.c	2008-12-10 19:44:21.000000000 +0100
-+++ linux/drivers/media/video/gspca/gspca.c	2008-12-10 19:53:43.000000000 +0100
+diff -urN linux/drivers/media/video/gspca/gspca.c linux/drivers/media/video/gspca/gspca.c
+--- linux/drivers/media/video/gspca/gspca.c	2008-12-25 00:26:37.000000000 +0100
++++ linux/drivers/media/video/gspca/gspca.c	2008-12-25 15:33:23.000000000 +0100
 @@ -45,7 +48,7 @@
  MODULE_DESCRIPTION("GSPCA USB Camera Driver");
  MODULE_LICENSE("GPL");
@@ -141,7 +125,7 @@
  	st = usb_submit_urb(urb, GFP_ATOMIC);
  	if (st < 0)
  		PDEBUG(D_ERR|D_PACK, "usb_submit_urb() ret %d", st);
-@@ -200,11 +208,18 @@
+@@ -200,11 +204,18 @@
  {
  	struct gspca_dev *gspca_dev = (struct gspca_dev *) urb->context;
  	struct gspca_frame *frame;
@@ -273,7 +257,25 @@
  				return -EINVAL;
  		}
  	}
-@@ -846,11 +879,11 @@
+@@ -752,8 +785,6 @@
+ 	struct gspca_dev *gspca_dev = priv;
+ 	int mode;
+ 
+-	if (fmt->type != V4L2_BUF_TYPE_VIDEO_CAPTURE)
+-		return -EINVAL;
+ 	mode = gspca_dev->curr_mode;
+ 	memcpy(&fmt->fmt.pix, &gspca_dev->cam.cam_mode[mode],
+ 		sizeof fmt->fmt.pix);
+@@ -765,8 +796,6 @@
+ {
+ 	int w, h, mode, mode2;
+ 
+-	if (fmt->type != V4L2_BUF_TYPE_VIDEO_CAPTURE)
+-		return -EINVAL;
+ 	w = fmt->fmt.pix.width;
+ 	h = fmt->fmt.pix.height;
+ 
+@@ -846,11 +875,11 @@
  	return ret;
  }
  
@@ -288,7 +290,7 @@
  
  	kfree(gspca_dev->usb_buf);
  	kfree(gspca_dev);
-@@ -862,7 +895,7 @@
+@@ -862,7 +891,7 @@
  	int ret;
  
  	PDEBUG(D_STREAM, "%s open", current->comm);
@@ -297,7 +299,7 @@
  	if (mutex_lock_interruptible(&gspca_dev->queue_lock))
  		return -ERESTARTSYS;
  	if (!gspca_dev->present) {
-@@ -883,17 +916,14 @@
+@@ -883,17 +912,14 @@
  
  	gspca_dev->users++;
  
@@ -317,7 +319,7 @@
  					| V4L2_DEBUG_IOCTL_ARG);
  #endif
  	ret = 0;
-@@ -932,8 +962,6 @@
+@@ -932,8 +958,6 @@
  
  	PDEBUG(D_STREAM, "close done");
  
@@ -326,7 +328,7 @@
  	return 0;
  }
  
-@@ -1053,6 +1081,35 @@
+@@ -1053,6 +1077,35 @@
  	return -EINVAL;
  }
  
@@ -362,7 +364,36 @@
  static int vidioc_querymenu(struct file *file, void *priv,
  			    struct v4l2_querymenu *qmenu)
  {
-@@ -1236,7 +1293,6 @@
+@@ -1096,8 +1149,6 @@
+ 	struct gspca_dev *gspca_dev = priv;
+ 	int i, ret = 0;
+ 
+-	if (rb->type != V4L2_BUF_TYPE_VIDEO_CAPTURE)
+-		return -EINVAL;
+ 	switch (rb->memory) {
+ 	case GSPCA_MEMORY_READ:			/* (internal call) */
+ 	case V4L2_MEMORY_MMAP:
+@@ -1162,8 +1213,7 @@
+ 	struct gspca_dev *gspca_dev = priv;
+ 	struct gspca_frame *frame;
+ 
+-	if (v4l2_buf->type != V4L2_BUF_TYPE_VIDEO_CAPTURE
+-	    || v4l2_buf->index < 0
++	if (v4l2_buf->index < 0
+ 	    || v4l2_buf->index >= gspca_dev->nframes)
+ 		return -EINVAL;
+ 
+@@ -1186,7 +1236,8 @@
+ 		ret = -ENODEV;
+ 		goto out;
+ 	}
+-	if (gspca_dev->nframes == 0) {
++	if (gspca_dev->nframes == 0
++	    || !(gspca_dev->frame[0].v4l2_buf.flags & V4L2_BUF_FLAG_QUEUED)) {
+ 		ret = -EINVAL;
+ 		goto out;
+ 	}
+@@ -1236,7 +1287,6 @@
  	gspca_dev->fr_i = gspca_dev->fr_o = gspca_dev->fr_q = 0;
  	gspca_dev->last_packet_type = DISCARD_PACKET;
  	gspca_dev->sequence = 0;
@@ -370,20 +401,7 @@
  	ret = 0;
  out:
  	mutex_unlock(&gspca_dev->queue_lock);
-@@ -1264,10 +1320,10 @@
- 	struct gspca_dev *gspca_dev = priv;
- 	int ret;
- 
--	if (mutex_lock_interruptible(&gspca_dev->usb_lock))
--		return -ERESTARTSYS;
- 	if (!gspca_dev->sd_desc->set_jcomp)
- 		return -EINVAL;
-+	if (mutex_lock_interruptible(&gspca_dev->usb_lock))
-+		return -ERESTARTSYS;
- 	ret = gspca_dev->sd_desc->set_jcomp(gspca_dev, jpegcomp);
- 	mutex_unlock(&gspca_dev->usb_lock);
- 	return ret;
-@@ -1281,6 +1337,17 @@
+@@ -1281,6 +1331,17 @@
  	memset(parm, 0, sizeof *parm);
  	parm->type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
  	parm->parm.capture.readbuffers = gspca_dev->nbufread;
@@ -401,7 +419,7 @@
[...1918 lines suppressed...]
++	case SENSOR_PO1200:
++		data = 0;
++		i2c_write(gspca_dev, 0x03, &data, 1);
++		data = 0x80 * sd->hflip
++			| 0x40 * sd->vflip
++			| 0x06;
++		i2c_write(gspca_dev, 0x1e, &data, 1);
++		return;
 +	default:
 +		return;
 +	}
@@ -4701,7 +5162,28 @@
  }
  
  static void setlightfreq(struct gspca_dev *gspca_dev)
-@@ -1551,6 +2157,17 @@
+@@ -1501,6 +2133,20 @@
+ 	usb_exchange(gspca_dev, ov7660_freq_tb[sd->lightfreq]);
+ }
+ 
++/* po1200 only */
++static void setsharpness(struct gspca_dev *gspca_dev)
++{
++	struct sd *sd = (struct sd *) gspca_dev;
++	__u8 data;
++
++	if (sd->sensor != SENSOR_PO1200)
++		return;
++	data = 0;
++	i2c_write(gspca_dev, 0x03, &data, 1);
++	data = 0xb5 + sd->sharpness * 3;
++	i2c_write(gspca_dev, 0x61, &data, 1);
++}
++
+ static int sd_start(struct gspca_dev *gspca_dev)
+ {
+ 	struct sd *sd = (struct sd *) gspca_dev;
+@@ -1551,6 +2197,17 @@
  			usb_exchange(gspca_dev, ov7670_initVGA_JPG);
  		}
  		break;
@@ -4719,7 +5201,7 @@
  	case SENSOR_MI1310_SOC:
  		if (mode) {
  			/* 320x240 */
-@@ -1583,6 +2200,11 @@
+@@ -1583,6 +2240,11 @@
  		}
  		usb_exchange(gspca_dev, po3130_rundata);
  		break;
@@ -4731,7 +5213,7 @@
  	default:
  		PDEBUG(D_PROBE, "Damned !! no sensor found Bye");
  		return -EMEDIUMTYPE;
-@@ -1615,11 +2237,15 @@
+@@ -1615,11 +2277,16 @@
  		reg_w(gspca_dev->dev, 0xa0, 0x23, 0xb800); * ISP CTRL_BAS
  		*/
  		/* set the led on 0x0892 0x0896 */
@@ -4743,36 +5225,38 @@
 +		if (sd->sensor != SENSOR_PO1200) {
 +			reg_w(gspca_dev->dev, 0x89, 0xffff, 0xfdff);
 +			msleep(100);
-+			setquality(gspca_dev);
 +			sethvflip(gspca_dev);
 +			setlightfreq(gspca_dev);
 +		} else {
++			setsharpness(gspca_dev);
++			sethvflip(gspca_dev);
 +			reg_w(gspca_dev->dev, 0x89, 0x0400, 0x1415);
 +		}
  	}
  	return 0;
  }
-@@ -1665,24 +2291,49 @@
+@@ -1665,24 +2332,48 @@
  				data, len);
  		return;
  	}
 +
 +	/* The vc0321 sends some additional data after sending the complete
-+	   frame, we ignore this. */
-+	if (sd->bridge == BRIDGE_VC0321 && ((frame->data_end - frame->data)
-+			+ len) > frame->v4l2_buf.length)
++	 * frame, we ignore this. */
++	if (sd->bridge == BRIDGE_VC0321
++	    && len > frame->v4l2_buf.length - (frame->data_end - frame->data))
 +		len = frame->v4l2_buf.length - (frame->data_end - frame->data);
-+
  	gspca_frame_add(gspca_dev, INTER_PACKET, frame, data, len);
  }
  
 -static int sd_setautogain(struct gspca_dev *gspca_dev, __s32 val)
 +static int sd_sethflip(struct gspca_dev *gspca_dev, __s32 val)
-+{
-+	struct sd *sd = (struct sd *) gspca_dev;
-+
+ {
+ 	struct sd *sd = (struct sd *) gspca_dev;
+ 
+-	sd->autogain = val;
 +	sd->hflip = val;
-+	if (gspca_dev->streaming)
+ 	if (gspca_dev->streaming)
+-		setautogain(gspca_dev);
 +		sethvflip(gspca_dev);
 +	return 0;
 +}
@@ -4782,32 +5266,55 @@
 +	struct sd *sd = (struct sd *) gspca_dev;
 +
 +	*val = sd->hflip;
-+	return 0;
-+}
-+
-+static int sd_setvflip(struct gspca_dev *gspca_dev, __s32 val)
- {
- 	struct sd *sd = (struct sd *) gspca_dev;
- 
--	sd->autogain = val;
-+	sd->vflip = val;
- 	if (gspca_dev->streaming)
--		setautogain(gspca_dev);
-+		sethvflip(gspca_dev);
  	return 0;
  }
  
 -static int sd_getautogain(struct gspca_dev *gspca_dev, __s32 *val)
-+static int sd_getvflip(struct gspca_dev *gspca_dev, __s32 *val)
++static int sd_setvflip(struct gspca_dev *gspca_dev, __s32 val)
  {
  	struct sd *sd = (struct sd *) gspca_dev;
  
 -	*val = sd->autogain;
++	sd->vflip = val;
++	if (gspca_dev->streaming)
++		sethvflip(gspca_dev);
++	return 0;
++}
++
++static int sd_getvflip(struct gspca_dev *gspca_dev, __s32 *val)
++{
++	struct sd *sd = (struct sd *) gspca_dev;
++
 +	*val = sd->vflip;
  	return 0;
  }
  
-@@ -1748,6 +2399,7 @@
+@@ -1704,6 +2395,24 @@
+ 	return 0;
+ }
+ 
++static int sd_setsharpness(struct gspca_dev *gspca_dev, __s32 val)
++{
++	struct sd *sd = (struct sd *) gspca_dev;
++
++	sd->sharpness = val;
++	if (gspca_dev->streaming)
++		setsharpness(gspca_dev);
++	return 0;
++}
++
++static int sd_getsharpness(struct gspca_dev *gspca_dev, __s32 *val)
++{
++	struct sd *sd = (struct sd *) gspca_dev;
++
++	*val = sd->sharpness;
++	return 0;
++}
++
+ static int sd_querymenu(struct gspca_dev *gspca_dev,
+ 			struct v4l2_querymenu *menu)
+ {
+@@ -1748,6 +2457,7 @@
  	{USB_DEVICE(0x0ac8, 0x0328), .driver_info = BRIDGE_VC0321},
  	{USB_DEVICE(0x0ac8, 0xc001), .driver_info = BRIDGE_VC0321},
  	{USB_DEVICE(0x0ac8, 0xc002), .driver_info = BRIDGE_VC0321},
@@ -4815,8 +5322,8 @@
  	{USB_DEVICE(0x17ef, 0x4802), .driver_info = BRIDGE_VC0323},
  	{}
  };
-diff -urN /home/hans/projects/fedora-extras/kernel/devel/kernel-2.6.27/linux-2.6.27.noarch/drivers/media/video/gspca/zc3xx-reg.h linux/drivers/media/video/gspca/zc3xx-reg.h
---- /home/hans/projects/fedora-extras/kernel/devel/kernel-2.6.27/linux-2.6.27.noarch/drivers/media/video/gspca/zc3xx-reg.h	2008-10-10 00:13:53.000000000 +0200
+diff -urN linux/drivers/media/video/gspca/zc3xx-reg.h linux/drivers/media/video/gspca/zc3xx-reg.h
+--- linux/drivers/media/video/gspca/zc3xx-reg.h	2008-12-25 00:26:37.000000000 +0100
 +++ linux/drivers/media/video/gspca/zc3xx-reg.h	2008-12-09 21:37:33.000000000 +0100
 @@ -244,14 +244,6 @@
  #define ZC3XX_R1CA_SHARPNESS04         0x01ca
@@ -4833,8 +5340,8 @@
  /* Dead pixels */
  #define ZC3XX_R250_DEADPIXELSMODE      0x0250
  
-diff -urN /home/hans/projects/fedora-extras/kernel/devel/kernel-2.6.27/linux-2.6.27.noarch/drivers/media/video/gspca/zc3xx.c linux/drivers/media/video/gspca/zc3xx.c
---- /home/hans/projects/fedora-extras/kernel/devel/kernel-2.6.27/linux-2.6.27.noarch/drivers/media/video/gspca/zc3xx.c	2008-12-10 19:44:21.000000000 +0100
+diff -urN linux/drivers/media/video/gspca/zc3xx.c linux/drivers/media/video/gspca/zc3xx.c
+--- linux/drivers/media/video/gspca/zc3xx.c	2008-12-25 00:26:37.000000000 +0100
 +++ linux/drivers/media/video/gspca/zc3xx.c	2008-12-09 21:37:33.000000000 +0100
 @@ -51,16 +51,16 @@
  #define SENSOR_CS2102 0



From caolanm at fedoraproject.org  Wed Jan 14 16:07:47 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Wed, 14 Jan 2009 16:07:47 +0000 (UTC)
Subject: rpms/openoffice.org/devel
	openoffice.org-3.0.1.oooXXXXX.fpicker.allformatsonsave.patch,
	NONE, 1.1 openoffice.org.spec, 1.1753, 1.1754
Message-ID: <20090114160747.97C2D70136@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11401

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-3.0.1.oooXXXXX.fpicker.allformatsonsave.patch 
Log Message:
Resolves: rhbz#479163 openoffice.org-3.0.1.oooXXXXX.fpicker.allformatsonsave.patch

openoffice.org-3.0.1.oooXXXXX.fpicker.allformatsonsave.patch:

--- NEW FILE openoffice.org-3.0.1.oooXXXXX.fpicker.allformatsonsave.patch ---
diff -ru svtools.orig/inc/svtools/svtools.hrc svtools/inc/svtools/svtools.hrc
--- openoffice.org.orig/svtools/inc/svtools/svtools.hrc	2009-01-14 15:52:54.000000000 +0000
+++ openoffice.org/svtools/inc/svtools/svtools.hrc	2009-01-14 15:53:18.000000000 +0000
@@ -73,6 +73,7 @@
 #define RID_FILEOPEN_INVALIDFOLDER		(RID_SVTOOLS_START + 34)
 #define RID_FILEOPEN_NOTEXISTENTFILE	(RID_SVTOOLS_START + 35)
 #define STR_SVT_NOREMOVABLEDEVICE       (RID_SVTOOLS_START + 36)
+#define STR_SVT_ALLFORMATS				(RID_SVTOOLS_START + 37)
 
 // doc template dialog
 #define DLG_DOCTEMPLATE					(RID_SVTOOLS_START+50)
diff -ru fpicker.orig/source/office/iodlg.src fpicker/source/office/iodlg.src
--- openoffice.org.orig/fpicker/source/office/iodlg.src	2009-01-14 11:56:02.000000000 +0000
+++ openoffice.org/fpicker/source/office/iodlg.src	2009-01-14 15:59:44.000000000 +0000
@@ -317,5 +312,10 @@
     Text [ en-US ] = "No removable storage device detected.\nMake sure it is plugged in properly and try again." ;
 };
 
+String STR_SVT_ALLFORMATS
+{
+	Text [ en-US ] = "All Formats" ;
+};
+
 //******************************************************************** EOF
 
diff -ru fpicker.orig/source/unx/gnome/resourceprovider.cxx fpicker/source/unx/gnome/resourceprovider.cxx
--- openoffice.org.orig/fpicker/source/unx/gnome/resourceprovider.cxx	2009-01-14 11:56:02.000000000 +0000
+++ openoffice.org/fpicker/source/unx/gnome/resourceprovider.cxx	2009-01-14 15:42:26.000000000 +0000
@@ -85,7 +85,8 @@
     { CHECKBOX_SELECTION,                       STR_SVT_FILEPICKER_SELECTION },
     { FOLDERPICKER_TITLE,                       STR_SVT_FOLDERPICKER_DEFAULT_TITLE },
     { FOLDER_PICKER_DEF_DESCRIPTION,            STR_SVT_FOLDERPICKER_DEFAULT_DESCRIPTION },
-    { FILE_PICKER_OVERWRITE,                    STR_SVT_ALREADYEXISTOVERWRITE }
+    { FILE_PICKER_OVERWRITE,                    STR_SVT_ALREADYEXISTOVERWRITE },
+    { FILE_PICKER_ALLFORMATS,                   STR_SVT_ALLFORMATS }
 };
 
 _Entry OtherCtrlIdToResIdTable[] = {
diff -ru fpicker.orig/source/unx/gnome/resourceprovider.hxx fpicker/source/unx/gnome/resourceprovider.hxx
--- openoffice.org.orig/fpicker/source/unx/gnome/resourceprovider.hxx	2009-01-14 11:56:02.000000000 +0000
+++ openoffice.org/fpicker/source/unx/gnome/resourceprovider.hxx	2009-01-14 15:40:34.000000000 +0000
@@ -48,6 +48,7 @@
 #define FILE_PICKER_TITLE_SAVE        503
 #define FILE_PICKER_FILE_TYPE         504
 #define FILE_PICKER_OVERWRITE         505
+#define FILE_PICKER_ALLFORMATS        506
 
 //------------------------------------------------------------------------
 // deklarations
diff -ru fpicker.orig/source/unx/gnome/SalGtkFilePicker.cxx fpicker/source/unx/gnome/SalGtkFilePicker.cxx
--- openoffice.org.orig/fpicker/source/unx/gnome/SalGtkFilePicker.cxx	2009-01-14 11:56:02.000000000 +0000
+++ openoffice.org/fpicker/source/unx/gnome/SalGtkFilePicker.cxx	2009-01-14 15:42:05.000000000 +0000
@@ -55,6 +55,7 @@
 
 #include <iostream>
 #include <algorithm>
+#include <set>
 #include "resourceprovider.hxx"
 #ifndef _SV_RC_H
 #include <tools/rc.hxx>
@@ -180,6 +181,7 @@
     mbPreviewState( sal_False ),
     mHID_Preview( 0 ),
 	m_pPreview( NULL ),
+    m_pPseudoFilter( NULL ),
 	m_PreviewImageWidth( 256 ),
     m_PreviewImageHeight( 256 )
 {
@@ -713,7 +715,6 @@
 
 	// append the filter
 	m_pFilterList->insert( m_pFilterList->end(), FilterEntry( aTitle, aFilter ) );
-	// implAddFilter( aTitle, aFilter );
 }
 
 //-----------------------------------------------------------------------------------------
@@ -778,7 +779,10 @@
     }
     else if( GtkFileFilter *filter = gtk_file_chooser_get_filter(GTK_FILE_CHOOSER(m_pDialog)))
     {
-        updateCurrentFilterFromName(gtk_file_filter_get_name( filter ));
+		if (m_pPseudoFilter != filter)
+        	updateCurrentFilterFromName(gtk_file_filter_get_name( filter ));
+		else
+        	updateCurrentFilterFromName(OUStringToOString( m_aInitialFilter, RTL_TEXTENCODING_UTF8 ).getStr());
     }
 }
 
@@ -945,9 +949,15 @@
                     }
                 }
 
-			    const gchar* filtername = 
-				    gtk_file_filter_get_name( gtk_file_chooser_get_filter( GTK_FILE_CHOOSER( m_pDialog ) ) );
-                sFilterName = OUString( filtername, strlen( filtername ), RTL_TEXTENCODING_UTF8 );
+				GtkFileFilter *filter = gtk_file_chooser_get_filter(GTK_FILE_CHOOSER(m_pDialog));
+        		if (m_pPseudoFilter != filter)
+				{
+			    	const gchar* filtername = 
+				    	gtk_file_filter_get_name( filter );
+                	sFilterName = OUString( filtername, strlen( filtername ), RTL_TEXTENCODING_UTF8 );
+				}
+				else
+					sFilterName = m_aInitialFilter;
             }
 
 			OSL_TRACE( "2: current filter is %s\n", 
@@ -1904,7 +1914,7 @@
 }
 }
 
-int SalGtkFilePicker::implAddFilter( const OUString& rFilter, const OUString& rType )
+GtkFileFilter * SalGtkFilePicker::implAddFilter( const OUString& rFilter, const OUString& rType )
 {
 	GtkFileFilter *filter = gtk_file_filter_new();
 
@@ -1953,7 +1963,6 @@
 
 	gtk_file_chooser_add_filter( GTK_FILE_CHOOSER( m_pDialog ), filter );
 
-    int nAdded = 0;
     if (!bAllGlob)
     {
         GtkTreeIter iter;
@@ -1964,27 +1973,64 @@
             2, aFilterName.getStr(),
             3, OUStringToOString(rType, RTL_TEXTENCODING_UTF8).getStr(),
             -1);
-        nAdded = 1;
     }
-    return nAdded;
+
+	return filter;
 }
 
-int SalGtkFilePicker::implAddFilterGroup( const OUString& /*_rFilter*/, const Sequence< StringPair >& _rFilters )
+void SalGtkFilePicker::implAddFilterGroup( const OUString& /*_rFilter*/, const Sequence< StringPair >& _rFilters )
 {
 	// Gtk+ has no filter group concept I think so ...
 	// implAddFilter( _rFilter, String() );
-    int nAdded = 0;
 	const StringPair* pSubFilters	= _rFilters.getConstArray();
 	const StringPair* pSubFiltersEnd = pSubFilters + _rFilters.getLength();
 	for( ; pSubFilters != pSubFiltersEnd; ++pSubFilters )
-		nAdded += implAddFilter( pSubFilters->First, pSubFilters->Second );
-    return nAdded;
+		implAddFilter( pSubFilters->First, pSubFilters->Second );
 }
 
 void SalGtkFilePicker::SetFilters()
 {
-	OSL_TRACE( "start setting filters\n");
-    int nAdded = 0;
+	if (!m_aInitialFilter.getLength())
+		m_aInitialFilter = m_aCurrentFilter;
+
+    if( GTK_FILE_CHOOSER_ACTION_SAVE == gtk_file_chooser_get_action( GTK_FILE_CHOOSER( m_pDialog ) ) )
+    {
+		std::set<OUString> aAllFormats;
+		if( m_pFilterList && !m_pFilterList->empty() )
+		{
+			for	(	FilterList::iterator aListIter = m_pFilterList->begin();
+					aListIter != m_pFilterList->end();
+					++aListIter
+				)
+			{
+				if( aListIter->hasSubFilters() )
+				{	// it's a filter group
+					UnoFilterList aSubFilters;
+					aListIter->getSubFilters( aSubFilters );
+					const StringPair* pSubFilters   = aSubFilters.getConstArray();
+					const StringPair* pSubFiltersEnd = pSubFilters + aSubFilters.getLength();
+					for( ; pSubFilters != pSubFiltersEnd; ++pSubFilters )
+						aAllFormats.insert(pSubFilters->Second);
+				}
+				else
+					aAllFormats.insert(aListIter->getFilter());
+			}
+		}
+		if (aAllFormats.size() > 1)
+		{
+			rtl::OUString sAllFilter;
+			std::set<OUString>::const_iterator aEnd = aAllFormats.end();
+			for (std::set<OUString>::const_iterator aIter = aAllFormats.begin(); aIter != aEnd; ++aIter)
+			{
+				if (sAllFilter.getLength())
+					sAllFilter += OUString(sal_Unicode(';'));
+				sAllFilter += *aIter;
+			}
+			CResourceProvider aResProvider;
+			m_pPseudoFilter = implAddFilter( aResProvider.getResString(FILE_PICKER_ALLFORMATS), sAllFilter );
+		}
+    }
+
 	if( m_pFilterList && !m_pFilterList->empty() )
 	{
 		for	(	FilterList::iterator aListIter = m_pFilterList->begin();
@@ -1998,18 +2044,18 @@
 				UnoFilterList aSubFilters;
 				aListIter->getSubFilters( aSubFilters );
 
-				nAdded += implAddFilterGroup( aListIter->getTitle(), aSubFilters );
+				implAddFilterGroup( aListIter->getTitle(), aSubFilters );
 			}
 			else
 			{
 				// it's a single filter
 
-				nAdded += implAddFilter( aListIter->getTitle(), aListIter->getFilter() );
+				implAddFilter( aListIter->getTitle(), aListIter->getFilter() );
 			}
 		}
 	}
 
-    if (nAdded)
+    if (gtk_tree_model_iter_n_children(GTK_TREE_MODEL(m_pFilterStore), NULL)) //If m_pFilterStore is not empty
         gtk_widget_show( m_pFilterExpander );
     else
         gtk_widget_hide( m_pFilterExpander );
diff -ru fpicker.orig/source/unx/gnome/SalGtkFilePicker.hxx fpicker/source/unx/gnome/SalGtkFilePicker.hxx
--- openoffice.org.orig/fpicker/source/unx/gnome/SalGtkFilePicker.hxx	2009-01-14 11:56:02.000000000 +0000
+++ openoffice.org/fpicker/source/unx/gnome/SalGtkFilePicker.hxx	2009-01-14 15:34:41.000000000 +0000
@@ -317,11 +317,13 @@
         gulong mnHID_SelectionChange;
 
 		::rtl::OUString	m_aCurrentFilter;
+		::rtl::OUString	m_aInitialFilter;
 
         bool bVersionWidthUnset;
         sal_Bool mbPreviewState;
         gulong mHID_Preview;
         GtkWidget* m_pPreview;
+		GtkFileFilter* m_pPseudoFilter;
         sal_Int32 m_PreviewImageWidth;
         sal_Int32 m_PreviewImageHeight;
         
@@ -332,8 +334,8 @@
         void UpdateFilterfromUI();
 
         void implChangeType( GtkTreeSelection *selection );
-		int implAddFilter( const OUString& rFilter, const OUString& rType);
-		int implAddFilterGroup( const OUString& rFilter, 
+		GtkFileFilter * implAddFilter( const OUString& rFilter, const OUString& rType );
+		void implAddFilterGroup( const OUString& rFilter, 
 					 const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::StringPair>& _rFilters );
         void updateCurrentFilterFromName(const gchar* filtername);
         void unselect_type();


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1753
retrieving revision 1.1754
diff -u -r1.1753 -r1.1754
--- openoffice.org.spec	14 Jan 2009 09:24:31 -0000	1.1753
+++ openoffice.org.spec	14 Jan 2009 16:07:17 -0000	1.1754
@@ -135,6 +135,7 @@
 Patch62: openoffice.org-3.0.1.ooo97975.bridges.mainalreadyexited.patch
 Patch63: openoffice.org-3.0.1.ooo97488.sw.ww8toc.patch
 Patch64: openoffice.org-3.0.1.ooo98024.vcl.emboldenoverlap.patch
+Patch65: openoffice.org-3.0.1.oooXXXXX.fpicker.allformatsonsave.patch
 
 %define instdir %{_libdir}
 %define baseinstdir %{instdir}/openoffice.org
@@ -1417,6 +1418,7 @@
 %patch62 -p1 -b .ooo97975.bridges.mainalreadyexited.patch
 %patch63 -p1 -b .ooo97488.sw.ww8toc.patch
 %patch64 -p1 -b .ooo98024.vcl.emboldenoverlap.patch
+%patch65 -p1 -b .oooXXXXX.fpicker.allformatsonsave.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -3830,6 +3832,7 @@
 - Resolves: rhbz#479624 add
   openoffice.org-3.0.1.ooo98024.vcl.emboldenoverlap.patch
 - add hyphen-uk dependency
+- Resolves: rhbz#479163 openoffice.org-3.0.1.oooXXXXX.fpicker.allformatsonsave.patch
 
 * Mon Jan 12 2009 Caol??n McNamara <caolanm at redhat.com> - 1:3.0.1-15.1
 - next milestone



From caolanm at fedoraproject.org  Wed Jan 14 16:16:30 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Wed, 14 Jan 2009 16:16:30 +0000 (UTC)
Subject: rpms/openoffice.org/devel
	openoffice.org-3.0.1.oooXXXXX.fpicker.allformatsonsave.patch, 1.1, 1.2
Message-ID: <20090114161630.E8C0D70136@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12061

Modified Files:
	openoffice.org-3.0.1.oooXXXXX.fpicker.allformatsonsave.patch 
Log Message:
Resolves: rhbz#479163 openoffice.org-3.0.1.oooXXXXX.fpicker.allformatsonsave.patch

openoffice.org-3.0.1.oooXXXXX.fpicker.allformatsonsave.patch:

Index: openoffice.org-3.0.1.oooXXXXX.fpicker.allformatsonsave.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-3.0.1.oooXXXXX.fpicker.allformatsonsave.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openoffice.org-3.0.1.oooXXXXX.fpicker.allformatsonsave.patch	14 Jan 2009 16:07:17 -0000	1.1
+++ openoffice.org-3.0.1.oooXXXXX.fpicker.allformatsonsave.patch	14 Jan 2009 16:16:30 -0000	1.2
@@ -66,6 +66,15 @@
  	m_PreviewImageWidth( 256 ),
      m_PreviewImageHeight( 256 )
  {
+@@ -689,7 +691,7 @@
+ 		m_pFilterList = new FilterList;
+ 
+ 		// set the first filter to the current filter
+-		if( ( !m_aCurrentFilter ) || ( !m_aCurrentFilter.getLength() ) )
++		if ( !m_aCurrentFilter.getLength() )
+ 			m_aCurrentFilter = _rInitialCurrentFilter;
+ 	}
+ }
 @@ -713,7 +715,6 @@
  
  	// append the filter
@@ -122,7 +131,7 @@
      if (!bAllGlob)
      {
          GtkTreeIter iter;
-@@ -1964,27 +1973,64 @@
+@@ -1964,27 +1973,66 @@
              2, aFilterName.getStr(),
              3, OUStringToOString(rType, RTL_TEXTENCODING_UTF8).getStr(),
              -1);
@@ -154,6 +163,7 @@
 +	if (!m_aInitialFilter.getLength())
 +		m_aInitialFilter = m_aCurrentFilter;
 +
++	rtl::OUString sPseudoFilter;
 +    if( GTK_FILE_CHOOSER_ACTION_SAVE == gtk_file_chooser_get_action( GTK_FILE_CHOOSER( m_pDialog ) ) )
 +    {
 +		std::set<OUString> aAllFormats;
@@ -188,14 +198,15 @@
 +				sAllFilter += *aIter;
 +			}
 +			CResourceProvider aResProvider;
-+			m_pPseudoFilter = implAddFilter( aResProvider.getResString(FILE_PICKER_ALLFORMATS), sAllFilter );
++			sPseudoFilter = aResProvider.getResString(FILE_PICKER_ALLFORMATS);
++			m_pPseudoFilter = implAddFilter( sPseudoFilter, sAllFilter );
 +		}
 +    }
 +
  	if( m_pFilterList && !m_pFilterList->empty() )
  	{
  		for	(	FilterList::iterator aListIter = m_pFilterList->begin();
-@@ -1998,18 +2044,18 @@
+@@ -1998,30 +2046,27 @@
  				UnoFilterList aSubFilters;
  				aListIter->getSubFilters( aSubFilters );
  
@@ -217,6 +228,21 @@
          gtk_widget_show( m_pFilterExpander );
      else
          gtk_widget_hide( m_pFilterExpander );
+ 
+ 	// set the default filter
+-	if( m_aCurrentFilter && (m_aCurrentFilter.getLength() > 0) )
+-	{
+-		OSL_TRACE( "Setting current filter to %s\n", 
+-			OUStringToOString( m_aCurrentFilter, RTL_TEXTENCODING_UTF8 ).getStr() );
+-
++	if (sPseudoFilter.getLength())
++		SetCurFilter( sPseudoFilter );
++	else if(m_aCurrentFilter.getLength())
+ 		SetCurFilter( m_aCurrentFilter );
+-	}
+ 
+ 	OSL_TRACE( "end setting filters\n");
+ }
 diff -ru fpicker.orig/source/unx/gnome/SalGtkFilePicker.hxx fpicker/source/unx/gnome/SalGtkFilePicker.hxx
 --- openoffice.org.orig/fpicker/source/unx/gnome/SalGtkFilePicker.hxx	2009-01-14 11:56:02.000000000 +0000
 +++ openoffice.org/fpicker/source/unx/gnome/SalGtkFilePicker.hxx	2009-01-14 15:34:41.000000000 +0000



From pkgdb at fedoraproject.org  Wed Jan 14 16:29:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 14 Jan 2009 16:29:59 +0000
Subject: [pkgdb] halevt had acl change status
Message-ID: <20090114162959.98468208203@bastion.fedora.phx.redhat.com>

pertusus has set the watchbugzilla acl on halevt (Fedora EPEL 5) to Approved for wolfy

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/halevt



From pkgdb at fedoraproject.org  Wed Jan 14 16:30:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 14 Jan 2009 16:30:02 +0000
Subject: [pkgdb] halevt had acl change status
Message-ID: <20090114163003.3DF22208457@bastion.fedora.phx.redhat.com>

pertusus has set the watchcommits acl on halevt (Fedora EPEL 5) to Approved for wolfy

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/halevt



From pkgdb at fedoraproject.org  Wed Jan 14 16:30:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 14 Jan 2009 16:30:06 +0000
Subject: [pkgdb] halevt had acl change status
Message-ID: <20090114163006.885E5208468@bastion.fedora.phx.redhat.com>

pertusus has set the commit acl on halevt (Fedora EPEL 5) to Approved for wolfy

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/halevt



From pkgdb at fedoraproject.org  Wed Jan 14 16:39:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 14 Jan 2009 16:39:22 +0000
Subject: [pkgdb] ivman ownership updated
Message-ID: <20090114163922.F3DEF2081FC@bastion.fedora.phx.redhat.com>

Package ivman in Fedora 9 was orphaned by pertusus

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ivman



From pkgdb at fedoraproject.org  Wed Jan 14 16:39:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 14 Jan 2009 16:39:33 +0000
Subject: [pkgdb] ivman ownership updated
Message-ID: <20090114163933.98AF3208207@bastion.fedora.phx.redhat.com>

Package ivman in Fedora 6 was orphaned by pertusus

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ivman



From pkgdb at fedoraproject.org  Wed Jan 14 16:39:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 14 Jan 2009 16:39:35 +0000
Subject: [pkgdb] ivman ownership updated
Message-ID: <20090114163935.7DB0D208456@bastion.fedora.phx.redhat.com>

Package ivman in Fedora 5 was orphaned by pertusus

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ivman



From caolanm at fedoraproject.org  Wed Jan 14 16:42:54 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Wed, 14 Jan 2009 16:42:54 +0000 (UTC)
Subject: rpms/hunspell-pl/devel .cvsignore, 1.37, 1.38 hunspell-pl.spec, 1.40,
	1.41 sources, 1.37, 1.38
Message-ID: <20090114164254.E86B870136@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/hunspell-pl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14703

Modified Files:
	.cvsignore hunspell-pl.spec sources 
Log Message:
latest version


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-pl/devel/.cvsignore,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- .cvsignore	23 Aug 2008 18:29:57 -0000	1.37
+++ .cvsignore	14 Jan 2009 16:42:24 -0000	1.38
@@ -1,2 +1 @@
-sjp-myspell-pl-20080715.zip
-sjp-myspell-pl-20080823.zip
+sjp-myspell-pl-20090114.zip


Index: hunspell-pl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-pl/devel/hunspell-pl.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- hunspell-pl.spec	23 Aug 2008 18:29:57 -0000	1.40
+++ hunspell-pl.spec	14 Jan 2009 16:42:24 -0000	1.41
@@ -1,6 +1,6 @@
 Name: hunspell-pl
 Summary: Polish hunspell dictionaries
-%define upstreamid 20080823
+%define upstreamid 20090114
 Version: 0.%{upstreamid}
 Release: 1%{?dist}
 Source: http://sjp.pl/slownik/ort/sjp-myspell-pl-%{upstreamid}.zip
@@ -35,6 +35,9 @@
 %{_datadir}/myspell/*
 
 %changelog
+* Wed Jan 14 2009 Caolan McNamara <caolanm at redhat.com> - 0.20090114-1
+- latest version
+
 * Sat Aug 23 2008 Caolan McNamara <caolanm at redhat.com> - 0.20080823-1
 - latest version
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-pl/devel/sources,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- sources	23 Aug 2008 18:29:57 -0000	1.37
+++ sources	14 Jan 2009 16:42:24 -0000	1.38
@@ -1 +1 @@
-31175881557fdd70528d14ec89c57a0a  sjp-myspell-pl-20080823.zip
+eb7674b29f991bb283940ff77d7a153b  sjp-myspell-pl-20090114.zip



From pkgdb at fedoraproject.org  Wed Jan 14 16:46:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 14 Jan 2009 16:46:18 +0000
Subject: [pkgdb] wdm: pertusus has requested watchbugzilla
Message-ID: <20090114164619.0CDE3208203@bastion.fedora.phx.redhat.com>

pertusus has requested the watchbugzilla acl on wdm (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/wdm



From pkgdb at fedoraproject.org  Wed Jan 14 16:46:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 14 Jan 2009 16:46:20 +0000
Subject: [pkgdb] wdm: pertusus has requested watchcommits
Message-ID: <20090114164620.8C463208456@bastion.fedora.phx.redhat.com>

pertusus has requested the watchcommits acl on wdm (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/wdm



From pkgdb at fedoraproject.org  Wed Jan 14 16:46:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 14 Jan 2009 16:46:21 +0000
Subject: [pkgdb] wdm: pertusus has requested commit
Message-ID: <20090114164621.5A717208458@bastion.fedora.phx.redhat.com>

pertusus has requested the commit acl on wdm (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/wdm



From pkgdb at fedoraproject.org  Wed Jan 14 16:46:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 14 Jan 2009 16:46:24 +0000
Subject: [pkgdb] wdm: pertusus has requested approveacls
Message-ID: <20090114164624.58CFD208467@bastion.fedora.phx.redhat.com>

pertusus has requested the approveacls acl on wdm (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/wdm



From pkgdb at fedoraproject.org  Wed Jan 14 16:47:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 14 Jan 2009 16:47:07 +0000
Subject: [pkgdb] wdm had acl change status
Message-ID: <20090114164707.49250208456@bastion.fedora.phx.redhat.com>

pertusus has set the watchbugzilla acl on wdm (Fedora devel) to Approved for pertusus

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/wdm



From pkgdb at fedoraproject.org  Wed Jan 14 16:47:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 14 Jan 2009 16:47:08 +0000
Subject: [pkgdb] wdm had acl change status
Message-ID: <20090114164708.57A1F208458@bastion.fedora.phx.redhat.com>

pertusus has set the watchcommits acl on wdm (Fedora devel) to Approved for pertusus

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/wdm



From pkgdb at fedoraproject.org  Wed Jan 14 16:47:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 14 Jan 2009 16:47:10 +0000
Subject: [pkgdb] wdm had acl change status
Message-ID: <20090114164710.33A4520846E@bastion.fedora.phx.redhat.com>

pertusus has set the commit acl on wdm (Fedora devel) to Approved for pertusus

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/wdm



From pkgdb at fedoraproject.org  Wed Jan 14 16:47:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 14 Jan 2009 16:47:10 +0000
Subject: [pkgdb] wdm had acl change status
Message-ID: <20090114164710.9B54F208468@bastion.fedora.phx.redhat.com>

pertusus has set the approveacls acl on wdm (Fedora devel) to Approved for pertusus

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/wdm



From pkgdb at fedoraproject.org  Wed Jan 14 16:47:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 14 Jan 2009 16:47:18 +0000
Subject: [pkgdb] wdm ownership updated
Message-ID: <20090114164718.7350E2081FC@bastion.fedora.phx.redhat.com>

Package wdm in Fedora devel was orphaned by pertusus

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/wdm



From spot at fedoraproject.org  Wed Jan 14 16:53:12 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Wed, 14 Jan 2009 16:53:12 +0000 (UTC)
Subject: rpms/fedora-logos/devel fedora-logos.spec,1.119,1.120
Message-ID: <20090114165312.63EDB70136@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/fedora-logos/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16307

Modified Files:
	fedora-logos.spec 
Log Message:
revert subpackage change


Index: fedora-logos.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-logos/devel/fedora-logos.spec,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -r1.119 -r1.120
--- fedora-logos.spec	14 Jan 2009 15:08:15 -0000	1.119
+++ fedora-logos.spec	14 Jan 2009 16:52:42 -0000	1.120
@@ -1,7 +1,7 @@
 Name: fedora-logos
 Summary: Fedora-related icons and pictures
 Version: 10.0.1
-Release: 3%{?dist}
+Release: 4%{?dist}
 Group: System Environment/Base
 URL: http://git.fedorahosted.org/git/fedora-logos.git/
 Source0: https://fedorahosted.org/releases/f/e/fedora-logos/fedora-logos-%{version}.tar.bz2
@@ -35,20 +35,6 @@
 See the included COPYING file for information on copying and
 redistribution.
 
-%package grub
-Summary: Fedora splash art for grub bootloader
-Group: System Environment/Base
-
-%description grub
-The fedora-logos-grub package contains image files which incorporate the
-Fedora trademark and the RPM logo (the "Marks"). The Marks are trademarks 
-or registered trademarks of Red Hat, Inc. in the United States and other 
-countries and are used by permission. 
-
-See the included COPYING file for information on copying and redistribution.
-
-Specifically, it contains splash art used with the grub bootloader.
-
 %prep
 %setup -q
 
@@ -192,14 +178,14 @@
 %dir %{_kde4_appsdir}
 %dir %{_kde4_appsdir}/ksplash
 %dir %{_kde4_appsdir}/ksplash/Themes
-
-%files grub
-%defattr(-, root, root, -)
 # should be ifarch i386
 /boot/grub/splash.xpm.gz
 # end i386 bits
 
 %changelog
+* Wed Jan 14 2009 Tom "spot" Callaway <tcallawa at redhat.com> 10.0.1-4
+- actually, no. I won't make a grub subpackage. No real benefit aside from saving 1MB on disk.
+
 * Wed Jan 14 2009 Tom "spot" Callaway <tcallawa at redhat.com> 10.0.1-3
 - make grub subpackage (bz 479949)
 



From rishi at fedoraproject.org  Wed Jan 14 17:00:18 2009
From: rishi at fedoraproject.org (Debarshi Ray)
Date: Wed, 14 Jan 2009 17:00:18 +0000 (UTC)
Subject: rpms/gengetopt/devel gengetopt.spec,1.7,1.8
Message-ID: <20090114170018.2570C70136@cvs1.fedora.phx.redhat.com>

Author: rishi

Update of /cvs/pkgs/rpms/gengetopt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16995

Modified Files:
	gengetopt.spec 
Log Message:
Fixed Spec in devel.
 
 Modified Files:
 	gengetopt.spec 



Index: gengetopt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gengetopt/devel/gengetopt.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- gengetopt.spec	2 Jun 2008 18:37:08 -0000	1.7
+++ gengetopt.spec	14 Jan 2009 16:59:47 -0000	1.8
@@ -9,8 +9,8 @@
 
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
-Requires(post):	/sbin/install-info
-Requires(preun): /sbin/install-info
+Requires(post):	info
+Requires(preun): info
 
 %ifarch %{ix86} x86_64 ppc ppc64
 BuildRequires:	valgrind
@@ -79,9 +79,9 @@
 %doc doc/index.html
 %doc doc/%{name}.html
 %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}/getopt.c



From rishi at fedoraproject.org  Wed Jan 14 17:01:57 2009
From: rishi at fedoraproject.org (Debarshi Ray)
Date: Wed, 14 Jan 2009 17:01:57 +0000 (UTC)
Subject: rpms/gengetopt/F-10 gengetopt.spec,1.7,1.8
Message-ID: <20090114170157.A5B6170136@cvs1.fedora.phx.redhat.com>

Author: rishi

Update of /cvs/pkgs/rpms/gengetopt/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17220

Modified Files:
	gengetopt.spec 
Log Message:
Fixed Spec in F-10.
 
 Modified Files:
 	gengetopt.spec 



Index: gengetopt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gengetopt/F-10/gengetopt.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- gengetopt.spec	2 Jun 2008 18:37:08 -0000	1.7
+++ gengetopt.spec	14 Jan 2009 17:01:27 -0000	1.8
@@ -9,8 +9,8 @@
 
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
-Requires(post):	/sbin/install-info
-Requires(preun): /sbin/install-info
+Requires(post):	info
+Requires(preun): info
 
 %ifarch %{ix86} x86_64 ppc ppc64
 BuildRequires:	valgrind
@@ -79,9 +79,9 @@
 %doc doc/index.html
 %doc doc/%{name}.html
 %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}/getopt.c



From rvinyard at fedoraproject.org  Wed Jan 14 17:02:49 2009
From: rvinyard at fedoraproject.org (Rick L. Vinyard, Jr.)
Date: Wed, 14 Jan 2009 17:02:49 +0000 (UTC)
Subject: rpms/papyrus/F-10 .cvsignore, 1.10, 1.11 papyrus.spec, 1.19,
	1.20 sources, 1.10, 1.11
Message-ID: <20090114170249.96E4170136@cvs1.fedora.phx.redhat.com>

Author: rvinyard

Update of /cvs/pkgs/rpms/papyrus/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17464

Modified Files:
	.cvsignore papyrus.spec sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/papyrus/F-10/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	4 Mar 2008 04:08:01 -0000	1.10
+++ .cvsignore	14 Jan 2009 17:02:19 -0000	1.11
@@ -1,2 +1 @@
-papyrus-0.7.1.tar.bz2
-papyrus.patch
+papyrus-0.8.0.tar.bz2


Index: papyrus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/papyrus/F-10/papyrus.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- papyrus.spec	1 Jan 2009 10:56:14 -0000	1.19
+++ papyrus.spec	14 Jan 2009 17:02:19 -0000	1.20
@@ -1,54 +1,89 @@
-
-Summary:          Papyrus is a C++ canvas library similar to the Gnome canvas
+Summary:          Cairo based C++ scenegraph library
 Name:             papyrus
-Version:          0.7.1
-Release:          6%{?dist}
-License:          LGPLv2
+Version:          0.8.0
+Release:          1%{?dist}
+License:          GPLv3
 URL:              http://libpapyrus.sourceforge.net/
 Group:            System Environment/Libraries
-Source:           http://download.sourceforge.net/libpapyrus/%{name}-%{version}.tar.bz2
-Patch0:           papyrus.patch
-Patch1:           papyrus-0.7.1-typedef-fixes.patch
-Patch2:           papyrus-0.7.1-valarray.patch
-Patch3:           papyrus-0.7.1-virtual-dtors.patch
+Source:           http://download.sourceforge.net/libpapyrus/papyrus-0.8.0.tar.bz2
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:    gtkmm24-devel >= 2.10 cairomm-devel >= 1.2 boost-devel pkgconfig m4
+BuildRequires:    gtkmm24-devel >= 2.10
+BuildRequires:    cairomm-devel >= 1.2
+BuildRequires:    expat-devel
+BuildRequires:    pkgconfig
+BuildRequires:    m4
 
 %description
-Papyrus is a C++ canvas library similar in scope
-and function to the Gnome canvas, but designed to render on a
-Cairo surface.
+Cairo based C++ scenegraph library
 
 %package          devel
 Summary:          Headers for developing programs that will use %{name}
 Group:            Development/Libraries
 Requires:         papyrus = %{version}-%{release}
-Requires:         gtkmm24-devel >= 2.10 cairomm-devel >= 1.2 pkgconfig
+Requires:         cairomm-devel >= 1.2
+Requires:         pkgconfig
 
-%description    devel
+%description      devel
 This package contains the libraries and header files needed for
-developing Papyrus applications. Papyrus is a C++ canvas library similar
-in scope and function to the Gnome canvas, but designed to render on a
-Cairo surface.
+developing papyrus applications.Papyrus is a cairo based C++
+scenegraph library.
+
+%package          extras
+Summary:          Extra shapes for the papyrus scenegraph library
+Group:            System Environment/Libraries
+Requires:         papyrus = %{version}-%{release}
+
+%description      extras
+This package contains extra drawables, renderables and shape objects
+for the papyrus scenegraph library.
+
+%package          extras-devel
+Summary:          Headers for developing programs that will use papyrus-extras
+Group:            Development/Libraries
+Requires:         papyrus-extras = %{version}-%{release}
+Requires:         papyrus-devel = %{version}-%{release}
+
+%description      extras-devel
+This package contains the libraries and header files needed for
+developing papyrus-extras applications.
+
+%package          gtkmm
+Summary:          Gtkmm UI widgets for the papyrus scenegraph library
+Group:            System Environment/Libraries
+Requires:         papyrus = %{version}-%{release}
+
+%description      gtkmm
+This package contains gtkmm widgets associated with the papyrus library.
+
+%package          gtkmm-devel
+Summary:          Headers for developing programs that will use papyrus-gtkmm
+Group:            Development/Libraries
+Requires:         papyrus-gtkmm = %{version}-%{release}
+Requires:         papyrus-devel = %{version}-%{release}
+Requires:         gtkmm24-devel >= 2.6
+
+%description    gtkmm-devel
+This package contains the libraries and header files needed for
+developing papyrus-gtkmm applications.
+
 
 %prep
 %setup -q
-%patch0 -p1 -b gcc43
-%patch1 -p1 -b typedef-fixes
-%patch2 -p1 -b valarray
-%patch3 -p1 -b virtual-dtors
 
 %build
 %configure --enable-static=no
 %{__make} %{?_smp_mflags}
 
-
 %install
 %{__rm} -rf %{buildroot}
 
 %{__make} DESTDIR=%{buildroot} INSTALL="%{__install} -p" install
 find %{buildroot} -type f -name "*.la" -exec rm -f {} ';'
 
+# Fix documentation installation and put papyrus-gtkmm docs under gtk-doc
+%{__mkdir} -p %{buildroot}%{_datadir}/gtk-doc/html/papyrus-gtkmm/
+%{__install} --mode=0664 -t %{buildroot}%{_datadir}/gtk-doc/html/papyrus-gtkmm/ doc/reference/papyrus-gtkmm/html/*
+
 %clean
 %{__rm} -rf %{buildroot}
 
@@ -56,24 +91,70 @@
 
 %postun -p /sbin/ldconfig
 
+%post extras -p /sbin/ldconfig
+
+%postun extras -p /sbin/ldconfig
+
+%post gtkmm -p /sbin/ldconfig
+
+%postun gtkmm -p /sbin/ldconfig
+
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING
-%{_libdir}/lib*papyrus*.so.*
-
+%{_libdir}/libpapyrus.so.*
 
 %files devel
 %defattr(-,root,root,-)
-%{_libdir}/lib*papyrus*.so
-%{_libdir}/pkgconfig/papyrus*.pc
-%{_includedir}/papyrus-0.7/
-%{_includedir}/papyrusmm-0.7/
-%doc ChangeLog docs/reference docs/gallery
-%{_bindir}/*papyrus*-demo
-%{_datadir}/papyrus-0.7.1/
-%{_datadir}/papyrusmm-0.7.1/
+%{_libdir}/libpapyrus.so
+%{_libdir}/pkgconfig/papyrus-1.0.pc
+%{_includedir}/papyrus-0.8/papyrus.h
+%{_includedir}/papyrus-0.8/papyrus/
+%{_bindir}/papyrus-demo
+%{_datadir}/papyrus-0.8.0/
+%doc ChangeLog
+#%doc doc/reference/papyrus/html
+
+%files extras
+%defattr(-,root,root,-)
+%doc AUTHORS COPYING
+%{_libdir}/libpapyrus-extras.so.*
+
+%files extras-devel
+%defattr(-,root,root,-)
+%{_libdir}/libpapyrus-extras.so
+%{_libdir}/pkgconfig/papyrus-extras-1.0.pc
+%{_includedir}/papyrus-0.8/papyrus-extras.h
+%{_includedir}/papyrus-0.8/papyrus-extras/
+%{_bindir}/papyrus-extras-demo
+#%{_datadir}/papyrus-extras-PACKAGE_VERSION/
+#%doc doc/reference/papyrus-extras/html
+
+%files gtkmm
+%defattr(-,root,root,-)
+%{_libdir}/libpapyrus-gtkmm.so.*
+
+%files gtkmm-devel
+%defattr(-,root,root,-)
+%{_libdir}/libpapyrus-gtkmm.so
+%{_libdir}/pkgconfig/papyrus-gtkmm-1.0.pc
+%{_includedir}/papyrus-0.8/papyrus-gtkmm.h
+%{_includedir}/papyrus-0.8/papyrus-gtkmm/
+%{_bindir}/papyrus-gtkmm-demo
+%{_datadir}/papyrus-gtkmm-0.8.0/
+%doc %{_datadir}/gtk-doc/html/papyrus-gtkmm/
+
 
 %changelog
+* Tue Jan 13 2009 Rick L Vinyard Jr <rvinyard at cs.nmsu.edu> - 0.8.0-1
+- New release
+
+* Sat Jan 05 2009 Rick L Vinyard Jr <rvinyard at cs.nmsu.edu> - 0.7.91-1
+- New release
+
+* Wed Jan 02 2009 Rick L Vinyard Jr <rvinyard at cs.nmsu.edu> - 0.7.90-1
+- New release
+
 * Thu Jan 01 2009 Tim Niemueller <tim at niemueller.de> - 0.7.1-6
 - Make all dtors virtual to fix compile warnings (errors with -Wall -Werror)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/papyrus/F-10/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	4 Mar 2008 04:08:01 -0000	1.10
+++ sources	14 Jan 2009 17:02:19 -0000	1.11
@@ -1,2 +1 @@
-d25b6df97378549840ce7f4bad6a64dd  papyrus-0.7.1.tar.bz2
-acc829df7aafb169747bc00eed7535c1  papyrus.patch
+ebaf2cb1240ba692b819d391b2baf3cc  papyrus-0.8.0.tar.bz2



From rvinyard at fedoraproject.org  Wed Jan 14 17:02:51 2009
From: rvinyard at fedoraproject.org (Rick L. Vinyard, Jr.)
Date: Wed, 14 Jan 2009 17:02:51 +0000 (UTC)
Subject: rpms/papyrus/devel .cvsignore, 1.10, 1.11 papyrus.spec, 1.16,
	1.17 sources, 1.10, 1.11
Message-ID: <20090114170251.A7B3070136@cvs1.fedora.phx.redhat.com>

Author: rvinyard

Update of /cvs/pkgs/rpms/papyrus/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17518

Modified Files:
	.cvsignore papyrus.spec sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/papyrus/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	4 Mar 2008 04:08:01 -0000	1.10
+++ .cvsignore	14 Jan 2009 17:02:21 -0000	1.11
@@ -1,2 +1 @@
-papyrus-0.7.1.tar.bz2
-papyrus.patch
+papyrus-0.8.0.tar.bz2


Index: papyrus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/papyrus/devel/papyrus.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- papyrus.spec	1 Jan 2009 11:09:11 -0000	1.16
+++ papyrus.spec	14 Jan 2009 17:02:21 -0000	1.17
@@ -1,54 +1,89 @@
-
-Summary:          Papyrus is a C++ canvas library similar to the Gnome canvas
+Summary:          Cairo based C++ scenegraph library
 Name:             papyrus
-Version:          0.7.1
-Release:          6%{?dist}
-License:          LGPLv2
+Version:          0.8.0
+Release:          1%{?dist}
+License:          GPLv3
 URL:              http://libpapyrus.sourceforge.net/
 Group:            System Environment/Libraries
-Source:           http://download.sourceforge.net/libpapyrus/%{name}-%{version}.tar.bz2
-Patch0:           papyrus.patch
-Patch1:           papyrus-0.7.1-typedef-fixes.patch
-Patch2:           papyrus-0.7.1-valarray.patch
-Patch3:           papyrus-0.7.1-virtual-dtors.patch
+Source:           http://download.sourceforge.net/libpapyrus/papyrus-0.8.0.tar.bz2
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:    gtkmm24-devel >= 2.10 cairomm-devel >= 1.2 boost-devel pkgconfig m4
+BuildRequires:    gtkmm24-devel >= 2.10
+BuildRequires:    cairomm-devel >= 1.2
+BuildRequires:    expat-devel
+BuildRequires:    pkgconfig
+BuildRequires:    m4
 
 %description
-Papyrus is a C++ canvas library similar in scope
-and function to the Gnome canvas, but designed to render on a
-Cairo surface.
+Cairo based C++ scenegraph library
 
 %package          devel
 Summary:          Headers for developing programs that will use %{name}
 Group:            Development/Libraries
 Requires:         papyrus = %{version}-%{release}
-Requires:         gtkmm24-devel >= 2.10 cairomm-devel >= 1.2 pkgconfig
+Requires:         cairomm-devel >= 1.2
+Requires:         pkgconfig
 
-%description    devel
+%description      devel
 This package contains the libraries and header files needed for
-developing Papyrus applications. Papyrus is a C++ canvas library similar
-in scope and function to the Gnome canvas, but designed to render on a
-Cairo surface.
+developing papyrus applications.Papyrus is a cairo based C++
+scenegraph library.
+
+%package          extras
+Summary:          Extra shapes for the papyrus scenegraph library
+Group:            System Environment/Libraries
+Requires:         papyrus = %{version}-%{release}
+
+%description      extras
+This package contains extra drawables, renderables and shape objects
+for the papyrus scenegraph library.
+
+%package          extras-devel
+Summary:          Headers for developing programs that will use papyrus-extras
+Group:            Development/Libraries
+Requires:         papyrus-extras = %{version}-%{release}
+Requires:         papyrus-devel = %{version}-%{release}
+
+%description      extras-devel
+This package contains the libraries and header files needed for
+developing papyrus-extras applications.
+
+%package          gtkmm
+Summary:          Gtkmm UI widgets for the papyrus scenegraph library
+Group:            System Environment/Libraries
+Requires:         papyrus = %{version}-%{release}
+
+%description      gtkmm
+This package contains gtkmm widgets associated with the papyrus library.
+
+%package          gtkmm-devel
+Summary:          Headers for developing programs that will use papyrus-gtkmm
+Group:            Development/Libraries
+Requires:         papyrus-gtkmm = %{version}-%{release}
+Requires:         papyrus-devel = %{version}-%{release}
+Requires:         gtkmm24-devel >= 2.6
+
+%description    gtkmm-devel
+This package contains the libraries and header files needed for
+developing papyrus-gtkmm applications.
+
 
 %prep
 %setup -q
-%patch0 -p1 -b gcc43
-%patch1 -p1 -b typedef-fixes
-%patch2 -p1 -b valarray
-%patch3 -p1 -b virtual-dtors
 
 %build
 %configure --enable-static=no
 %{__make} %{?_smp_mflags}
 
-
 %install
 %{__rm} -rf %{buildroot}
 
 %{__make} DESTDIR=%{buildroot} INSTALL="%{__install} -p" install
 find %{buildroot} -type f -name "*.la" -exec rm -f {} ';'
 
+# Fix documentation installation and put papyrus-gtkmm docs under gtk-doc
+%{__mkdir} -p %{buildroot}%{_datadir}/gtk-doc/html/papyrus-gtkmm/
+%{__install} --mode=0664 -t %{buildroot}%{_datadir}/gtk-doc/html/papyrus-gtkmm/ doc/reference/papyrus-gtkmm/html/*
+
 %clean
 %{__rm} -rf %{buildroot}
 
@@ -56,24 +91,70 @@
 
 %postun -p /sbin/ldconfig
 
+%post extras -p /sbin/ldconfig
+
+%postun extras -p /sbin/ldconfig
+
+%post gtkmm -p /sbin/ldconfig
+
+%postun gtkmm -p /sbin/ldconfig
+
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING
-%{_libdir}/lib*papyrus*.so.*
-
+%{_libdir}/libpapyrus.so.*
 
 %files devel
 %defattr(-,root,root,-)
-%{_libdir}/lib*papyrus*.so
-%{_libdir}/pkgconfig/papyrus*.pc
-%{_includedir}/papyrus-0.7/
-%{_includedir}/papyrusmm-0.7/
-%doc ChangeLog docs/reference docs/gallery
-%{_bindir}/*papyrus*-demo
-%{_datadir}/papyrus-0.7.1/
-%{_datadir}/papyrusmm-0.7.1/
+%{_libdir}/libpapyrus.so
+%{_libdir}/pkgconfig/papyrus-1.0.pc
+%{_includedir}/papyrus-0.8/papyrus.h
+%{_includedir}/papyrus-0.8/papyrus/
+%{_bindir}/papyrus-demo
+%{_datadir}/papyrus-0.8.0/
+%doc ChangeLog
+#%doc doc/reference/papyrus/html
+
+%files extras
+%defattr(-,root,root,-)
+%doc AUTHORS COPYING
+%{_libdir}/libpapyrus-extras.so.*
+
+%files extras-devel
+%defattr(-,root,root,-)
+%{_libdir}/libpapyrus-extras.so
+%{_libdir}/pkgconfig/papyrus-extras-1.0.pc
+%{_includedir}/papyrus-0.8/papyrus-extras.h
+%{_includedir}/papyrus-0.8/papyrus-extras/
+%{_bindir}/papyrus-extras-demo
+#%{_datadir}/papyrus-extras-PACKAGE_VERSION/
+#%doc doc/reference/papyrus-extras/html
+
+%files gtkmm
+%defattr(-,root,root,-)
+%{_libdir}/libpapyrus-gtkmm.so.*
+
+%files gtkmm-devel
+%defattr(-,root,root,-)
+%{_libdir}/libpapyrus-gtkmm.so
+%{_libdir}/pkgconfig/papyrus-gtkmm-1.0.pc
+%{_includedir}/papyrus-0.8/papyrus-gtkmm.h
+%{_includedir}/papyrus-0.8/papyrus-gtkmm/
+%{_bindir}/papyrus-gtkmm-demo
+%{_datadir}/papyrus-gtkmm-0.8.0/
+%doc %{_datadir}/gtk-doc/html/papyrus-gtkmm/
+
 
 %changelog
+* Tue Jan 13 2009 Rick L Vinyard Jr <rvinyard at cs.nmsu.edu> - 0.8.0-1
+- New release
+
+* Sat Jan 05 2009 Rick L Vinyard Jr <rvinyard at cs.nmsu.edu> - 0.7.91-1
+- New release
+
+* Wed Jan 02 2009 Rick L Vinyard Jr <rvinyard at cs.nmsu.edu> - 0.7.90-1
+- New release
+
 * Thu Jan 01 2009 Tim Niemueller <tim at niemueller.de> - 0.7.1-6
 - Make all dtors virtual to fix compile warnings (errors with -Wall -Werror)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/papyrus/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	4 Mar 2008 04:08:01 -0000	1.10
+++ sources	14 Jan 2009 17:02:21 -0000	1.11
@@ -1,2 +1 @@
-d25b6df97378549840ce7f4bad6a64dd  papyrus-0.7.1.tar.bz2
-acc829df7aafb169747bc00eed7535c1  papyrus.patch
+ebaf2cb1240ba692b819d391b2baf3cc  papyrus-0.8.0.tar.bz2



From rishi at fedoraproject.org  Wed Jan 14 17:03:43 2009
From: rishi at fedoraproject.org (Debarshi Ray)
Date: Wed, 14 Jan 2009 17:03:43 +0000 (UTC)
Subject: rpms/gengetopt/F-9 gengetopt.spec,1.7,1.8
Message-ID: <20090114170343.7180170136@cvs1.fedora.phx.redhat.com>

Author: rishi

Update of /cvs/pkgs/rpms/gengetopt/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17798

Modified Files:
	gengetopt.spec 
Log Message:
Fixed Spec in F-9.
 
 Modified Files:
 	gengetopt.spec 



Index: gengetopt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gengetopt/F-9/gengetopt.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- gengetopt.spec	2 Jun 2008 18:32:48 -0000	1.7
+++ gengetopt.spec	14 Jan 2009 17:03:13 -0000	1.8
@@ -9,8 +9,8 @@
 
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
-Requires(post):	/sbin/install-info
-Requires(preun): /sbin/install-info
+Requires(post):	info
+Requires(preun): info
 
 %ifarch %{ix86} x86_64 ppc ppc64
 BuildRequires:	valgrind
@@ -79,9 +79,9 @@
 %doc doc/index.html
 %doc doc/%{name}.html
 %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}/getopt.c



From tgl at fedoraproject.org  Wed Jan 14 17:10:36 2009
From: tgl at fedoraproject.org (Tom Lane)
Date: Wed, 14 Jan 2009 17:10:36 +0000 (UTC)
Subject: rpms/mysql/devel mysql-bogus-ssl-test.patch, NONE,
	1.1 mysql-embedded-check.c, NONE, 1.1 mysql-plugin-bug.patch,
	NONE, 1.1 mysql-ssl-multilib.patch, NONE, 1.1 .cvsignore, 1.33,
	1.34 mysql-errno.patch, 1.4, 1.5 mysql-install-test.patch, 1.6,
	1.7 mysql-stack-guard.patch, 1.3, 1.4 mysql-stack.patch, 1.11,
	1.12 mysql-testing.patch, 1.11, 1.12 mysql.spec, 1.109,
	1.110 sources, 1.33, 1.34 mysql-bdb-link.patch, 1.1,
	NONE mysql-bdb-open.patch, 1.1, NONE mysql-libdir.patch, 1.3,
	NONE mysql-no-atomic.patch, 1.4, NONE mysql-no-dbug.patch, 1.1,
	NONE mysql-rpl-test.patch, 1.1, NONE mysql-rpl_ddl.patch, 1.1, NONE
Message-ID: <20090114171036.6B7E870136@cvs1.fedora.phx.redhat.com>

Author: tgl

Update of /cvs/pkgs/rpms/mysql/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18524

Modified Files:
	.cvsignore mysql-errno.patch mysql-install-test.patch 
	mysql-stack-guard.patch mysql-stack.patch mysql-testing.patch 
	mysql.spec sources 
Added Files:
	mysql-bogus-ssl-test.patch mysql-embedded-check.c 
	mysql-plugin-bug.patch mysql-ssl-multilib.patch 
Removed Files:
	mysql-bdb-link.patch mysql-bdb-open.patch mysql-libdir.patch 
	mysql-no-atomic.patch mysql-no-dbug.patch mysql-rpl-test.patch 
	mysql-rpl_ddl.patch 
Log Message:
Update to MySQL 5.1.30

mysql-bogus-ssl-test.patch:

--- NEW FILE mysql-bogus-ssl-test.patch ---
AFAICT this test is simply guaranteed to fail if run with SSL connections
enabled.  Remove the part that depends on the SSL connection history.


diff -Naur mysql-5.1.30.orig/mysql-test/r/openssl_1.result mysql-5.1.30/mysql-test/r/openssl_1.result
--- mysql-5.1.30.orig/mysql-test/r/openssl_1.result	2008-11-14 12:30:53.000000000 -0500
+++ mysql-5.1.30/mysql-test/r/openssl_1.result	2009-01-13 12:57:01.000000000 -0500
@@ -68,12 +68,10 @@
 CREATE TABLE thread_status
 SELECT variable_name, variable_value
 FROM information_schema.session_status
-WHERE variable_name LIKE 'SSL_ACCEPTS' OR
-variable_name LIKE 'SSL_CALLBACK_CACHE_HITS';
+WHERE variable_name LIKE 'SSL_CALLBACK_CACHE_HITS';
 END$$
 SELECT variable_name, variable_value FROM thread_status;
 variable_name	variable_value
-SSL_ACCEPTS	0
 SSL_CALLBACK_CACHE_HITS	0
 DROP TABLE thread_status;
 SET GLOBAL event_scheduler=0;
diff -Naur mysql-5.1.30.orig/mysql-test/t/openssl_1.test mysql-5.1.30/mysql-test/t/openssl_1.test
--- mysql-5.1.30.orig/mysql-test/t/openssl_1.test	2008-11-14 12:30:15.000000000 -0500
+++ mysql-5.1.30/mysql-test/t/openssl_1.test	2009-01-13 12:56:42.000000000 -0500
@@ -136,8 +136,7 @@
   CREATE TABLE thread_status
   SELECT variable_name, variable_value
   FROM information_schema.session_status
-  WHERE variable_name LIKE 'SSL_ACCEPTS' OR
-  variable_name LIKE 'SSL_CALLBACK_CACHE_HITS';
+  WHERE variable_name LIKE 'SSL_CALLBACK_CACHE_HITS';
 END$$
 
 DELIMITER ;$$


--- NEW FILE mysql-embedded-check.c ---
/* simple test program to see if we can link the embedded server library */

#include <stdio.h>
#include <stdlib.h>
#include <stdarg.h>

#include "mysql.h"

MYSQL *mysql;

static char *server_options[] = \
       { "mysql_test", "--defaults-file=my.cnf", NULL };
int num_elements = (sizeof(server_options) / sizeof(char *)) - 1;

static char *server_groups[] = { "libmysqld_server", 
                                 "libmysqld_client", NULL };

int main(int argc, char **argv)
{
   mysql_library_init(num_elements, server_options, server_groups);
   mysql = mysql_init(NULL);
   mysql_close(mysql);
   mysql_library_end();

   return 0;
}

mysql-plugin-bug.patch:

--- NEW FILE mysql-plugin-bug.patch ---
The plugins stuff has got obscure problems on PPC64 ... figure it out
another day ...


diff -Naur mysql-5.1.30.orig/mysql-test/t/disabled.def mysql-5.1.30/mysql-test/t/disabled.def
--- mysql-5.1.30.orig/mysql-test/t/disabled.def	2008-11-14 12:30:00.000000000 -0500
+++ mysql-5.1.30/mysql-test/t/disabled.def	2009-01-14 01:15:24.000000000 -0500
@@ -15,3 +15,5 @@
 log_tables.test                       : Bug #37798: main.log_tables fails randomly on powermacg5 and windows
 slow_query_log_func.test              : Bug #37962: *_func tests containing sleeps/race conditions
 events-bugs.test                      : Bug #39848, Bug #39863, Bug #39569, Bug #37774
+#
+plugin_load     : gives wrong answer on PPC64

mysql-ssl-multilib.patch:

--- NEW FILE mysql-ssl-multilib.patch ---
We can do without -L/usr/lib/, especially in 64-bit builds ...


diff -Naur mysql-5.1.30.orig/config/ac-macros/ssl.m4 mysql-5.1.30/config/ac-macros/ssl.m4
--- mysql-5.1.30.orig/config/ac-macros/ssl.m4	2008-11-14 11:34:23.000000000 -0500
+++ mysql-5.1.30/config/ac-macros/ssl.m4	2009-01-13 19:17:09.000000000 -0500
@@ -102,7 +102,12 @@
   #
   # Try to link with openSSL libs in <location>
   #
-  openssl_libs="-L$location/lib/ -lssl -lcrypto"
+  if test "$location" != "/usr"
+  then
+    openssl_libs="-L$location/lib/ -lssl -lcrypto"
+  else
+    openssl_libs="-lssl -lcrypto"
+  fi
   MYSQL_CHECK_SSL_DIR([$openssl_includes], [$openssl_libs])
 
   if test "$mysql_ssl_found" == "no"


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mysql/devel/.cvsignore,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- .cvsignore	23 Aug 2008 20:31:19 -0000	1.33
+++ .cvsignore	14 Jan 2009 17:10:05 -0000	1.34
@@ -1 +1 @@
-mysql-5.0.67.tar.gz
+mysql-5.1.30.tar.gz

mysql-errno.patch:

Index: mysql-errno.patch
===================================================================
RCS file: /cvs/pkgs/rpms/mysql/devel/mysql-errno.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- mysql-errno.patch	23 Aug 2008 20:31:19 -0000	1.4
+++ mysql-errno.patch	14 Jan 2009 17:10:05 -0000	1.5
@@ -1,12 +1,12 @@
 "extern int errno" is just a really bad idea.
 
 
-diff -Naur mysql-5.0.67.orig/include/my_sys.h mysql-5.0.67/include/my_sys.h
---- mysql-5.0.67.orig/include/my_sys.h	2008-08-04 08:19:12.000000000 -0400
-+++ mysql-5.0.67/include/my_sys.h	2008-08-23 14:39:08.000000000 -0400
-@@ -208,13 +208,8 @@
- #endif
- #endif /* MSDOS */
+diff -Naur mysql-5.1.30.orig/include/my_sys.h mysql-5.1.30/include/my_sys.h
+--- mysql-5.1.30.orig/include/my_sys.h	2008-11-14 11:34:35.000000000 -0500
++++ mysql-5.1.30/include/my_sys.h	2009-01-13 11:04:15.000000000 -0500
+@@ -201,13 +201,8 @@
+ #define my_afree(PTR) my_free(PTR,MYF(MY_WME))
+ #endif /* HAVE_ALLOCA */
  
 -#ifndef errno				/* did we already get it? */
 -#ifdef HAVE_ERRNO_AS_DEFINE

mysql-install-test.patch:

Index: mysql-install-test.patch
===================================================================
RCS file: /cvs/pkgs/rpms/mysql/devel/mysql-install-test.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- mysql-install-test.patch	23 Aug 2008 20:31:19 -0000	1.6
+++ mysql-install-test.patch	14 Jan 2009 17:10:05 -0000	1.7
@@ -4,9 +4,9 @@
 This patch also improves the documentation a tad.
 
 
-diff -Naur mysql-5.0.67.orig/mysql-test/README mysql-5.0.67/mysql-test/README
---- mysql-5.0.67.orig/mysql-test/README	2008-08-04 08:19:20.000000000 -0400
-+++ mysql-5.0.67/mysql-test/README	2008-08-23 16:25:14.000000000 -0400
+diff -Naur mysql-5.1.30.orig/mysql-test/README mysql-5.1.30/mysql-test/README
+--- mysql-5.1.30.orig/mysql-test/README	2008-11-14 11:34:38.000000000 -0500
++++ mysql-5.1.30/mysql-test/README	2009-01-13 11:30:00.000000000 -0500
 @@ -6,6 +6,19 @@
  actually have a co-existing MySQL installation. The tests will not
  conflict with it.
@@ -37,9 +37,9 @@
  
  
  You can create your own test cases. To create a test case, create a new
-diff -Naur mysql-5.0.67.orig/mysql-test/install_test_db.sh mysql-5.0.67/mysql-test/install_test_db.sh
---- mysql-5.0.67.orig/mysql-test/install_test_db.sh	2008-08-04 08:19:21.000000000 -0400
-+++ mysql-5.0.67/mysql-test/install_test_db.sh	2008-08-23 16:21:59.000000000 -0400
+diff -Naur mysql-5.1.30.orig/mysql-test/install_test_db.sh mysql-5.1.30/mysql-test/install_test_db.sh
+--- mysql-5.1.30.orig/mysql-test/install_test_db.sh	2008-11-14 11:34:47.000000000 -0500
++++ mysql-5.1.30/mysql-test/install_test_db.sh	2009-01-13 11:30:00.000000000 -0500
 @@ -26,18 +26,15 @@
    libexecdir=../libexec
  
@@ -65,7 +65,7 @@
    fix_bin=mysql-test
  else
    execdir=../sql
-@@ -97,7 +94,8 @@
+@@ -96,7 +93,8 @@
  
  #for error messages
  if [ x$BINARY_DIST = x1 ] ; then

mysql-stack-guard.patch:

Index: mysql-stack-guard.patch
===================================================================
RCS file: /cvs/pkgs/rpms/mysql/devel/mysql-stack-guard.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- mysql-stack-guard.patch	4 Mar 2008 00:44:31 -0000	1.3
+++ mysql-stack-guard.patch	14 Jan 2009 17:10:05 -0000	1.4
@@ -8,13 +8,13 @@
 Filed upstream at http://bugs.mysql.com/bug.php?id=35019
 
 
-diff -Naur mysql-5.0.45.orig/sql/mysqld.cc mysql-5.0.45/sql/mysqld.cc
---- mysql-5.0.45.orig/sql/mysqld.cc	2007-07-04 09:06:03.000000000 -0400
-+++ mysql-5.0.45/sql/mysqld.cc	2008-03-03 17:16:25.000000000 -0500
-@@ -2281,6 +2281,68 @@
-   DBUG_VOID_RETURN;
+diff -Naur mysql-5.1.30.orig/sql/mysqld.cc mysql-5.1.30/sql/mysqld.cc
+--- mysql-5.1.30.orig/sql/mysqld.cc	2008-11-14 11:37:13.000000000 -0500
++++ mysql-5.1.30/sql/mysqld.cc	2009-01-13 12:08:35.000000000 -0500
+@@ -2602,6 +2602,70 @@
  }
  
+ 
 +/* pthread_attr_setstacksize without so much platform-dependency */
 +/* returns the actual stack size if possible */
 +static size_t my_setstacksize(pthread_attr_t *attr, size_t stacksize)
@@ -77,10 +77,12 @@
 +#endif
 +  return stacksize;
 +}
- 
++
++
  static void start_signal_handler(void)
  {
-@@ -2294,15 +2356,7 @@
+   int error;
+@@ -2614,15 +2678,7 @@
    (void) pthread_attr_setdetachstate(&thr_attr,PTHREAD_CREATE_DETACHED);
    if (!(opt_specialflag & SPECIAL_NO_PRIOR))
      my_pthread_attr_setprio(&thr_attr,INTERRUPT_PRIOR);
@@ -89,15 +91,15 @@
 -    Peculiar things with ia64 platforms - it seems we only have half the
 -    stack size in reality, so we have to double it here
 -  */
--  pthread_attr_setstacksize(&thr_attr,thread_stack*2);
+-  pthread_attr_setstacksize(&thr_attr,my_thread_stack_size*2);
 -#else
--  pthread_attr_setstacksize(&thr_attr,thread_stack);
+-  pthread_attr_setstacksize(&thr_attr,my_thread_stack_size);
 -#endif
-+  (void) my_setstacksize(&thr_attr,thread_stack);
++  (void) my_setstacksize(&thr_attr,my_thread_stack_size);
  #endif
  
    (void) pthread_mutex_lock(&LOCK_thread_count);
-@@ -3499,41 +3553,12 @@
+@@ -4176,40 +4232,12 @@
    init_signals();
    if (!(opt_specialflag & SPECIAL_NO_PRIOR))
      my_pthread_setprio(pthread_self(),CONNECT_PRIOR);
@@ -106,9 +108,9 @@
 -    Peculiar things with ia64 platforms - it seems we only have half the
 -    stack size in reality, so we have to double it here
 -  */
--  pthread_attr_setstacksize(&connection_attrib,thread_stack*2);
+-  pthread_attr_setstacksize(&connection_attrib,my_thread_stack_size*2);
 -#else
--  pthread_attr_setstacksize(&connection_attrib,thread_stack);
+-  pthread_attr_setstacksize(&connection_attrib,my_thread_stack_size);
 -#endif
 -#ifdef HAVE_PTHREAD_ATTR_GETSTACKSIZE
 -  {
@@ -119,15 +121,15 @@
 -    stack_size/= 2;
 -#endif
 -    /* We must check if stack_size = 0 as Solaris 2.9 can return 0 here */
--    if (stack_size && stack_size < thread_stack)
+-    if (stack_size && stack_size < my_thread_stack_size)
 -    {
 -      if (global_system_variables.log_warnings)
 -	sql_print_warning("Asked for %lu thread stack, but got %ld",
--			  thread_stack, (long) stack_size);
+-			  my_thread_stack_size, (long) stack_size);
 -#if defined(__ia64__) || defined(__ia64)
--      thread_stack= stack_size*2;
+-      my_thread_stack_size= stack_size*2;
 -#else
--      thread_stack= stack_size;
+-      my_thread_stack_size= stack_size;
 -#endif
 -    }
 -  }
@@ -135,10 +137,9 @@
 +
  #ifdef __NETWARE__
    /* Increasing stacksize of threads on NetWare */
--
    pthread_attr_setstacksize(&connection_attrib, NW_THD_STACKSIZE);
 +#else
-+  thread_stack = my_setstacksize(&connection_attrib,thread_stack);
++  my_thread_stack_size = my_setstacksize(&connection_attrib,my_thread_stack_size);
  #endif
  
    (void) thr_setconcurrency(concurrency);	// 10 by default

mysql-stack.patch:

Index: mysql-stack.patch
===================================================================
RCS file: /cvs/pkgs/rpms/mysql/devel/mysql-stack.patch,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- mysql-stack.patch	28 Feb 2008 21:23:49 -0000	1.11
+++ mysql-stack.patch	14 Jan 2009 17:10:05 -0000	1.12
@@ -9,15 +9,15 @@
 further without increasing the latter as well.
 
 
-diff -Naur mysql-5.0.45.orig/sql/mysql_priv.h mysql-5.0.45/sql/mysql_priv.h
---- mysql-5.0.45.orig/sql/mysql_priv.h	2007-07-04 09:06:41.000000000 -0400
-+++ mysql-5.0.45/sql/mysql_priv.h	2008-01-08 17:32:22.000000000 -0500
-@@ -173,7 +173,7 @@
+diff -Naur mysql-5.1.30.orig/sql/mysql_priv.h mysql-5.1.30/sql/mysql_priv.h
+--- mysql-5.1.30.orig/sql/mysql_priv.h	2008-11-14 11:37:13.000000000 -0500
++++ mysql-5.1.30/sql/mysql_priv.h	2009-01-13 11:07:35.000000000 -0500
+@@ -286,7 +286,7 @@
   Feel free to raise this by the smallest amount you can to get the
   "execution_constants" test to pass.
   */
--#define STACK_MIN_SIZE          12000   // Abort if less stack during eval.
-+#define STACK_MIN_SIZE          16384   // Abort if less stack during eval.
+-#define STACK_MIN_SIZE          12000   ///< Abort if less stack during eval.
++#define STACK_MIN_SIZE          16384   ///< Abort if less stack during eval.
  
  #define STACK_MIN_SIZE_FOR_OPEN 1024*80
- #define STACK_BUFF_ALLOC        352     // For stack overrun checks
+ #define STACK_BUFF_ALLOC        352     ///< For stack overrun checks

mysql-testing.patch:

Index: mysql-testing.patch
===================================================================
RCS file: /cvs/pkgs/rpms/mysql/devel/mysql-testing.patch,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- mysql-testing.patch	23 Aug 2008 20:31:19 -0000	1.11
+++ mysql-testing.patch	14 Jan 2009 17:10:05 -0000	1.12
@@ -5,30 +5,22 @@
 from the calling terminal session.  Without this, the ssl_des test hangs up
 because OpenSSL tries to read a PEM key from /dev/tty.
 
-Also, tweak the Perl test script to find some files where we install them;
-without this, the build-time test works but the mysql-test RPM doesn't.
 
-
-diff -Naur mysql-5.0.67.orig/Makefile.am mysql-5.0.67/Makefile.am
---- mysql-5.0.67.orig/Makefile.am	2008-08-04 08:18:47.000000000 -0400
-+++ mysql-5.0.67/Makefile.am	2008-08-23 13:49:56.000000000 -0400
-@@ -127,11 +127,11 @@
- 
- test-ps:
- 	cd mysql-test ; \
--	    @PERL@ ./mysql-test-run.pl $(force) $(mem) --ps-protocol
-+	    @PERL@ ./mysql-test-run.pl $(force) $(mem) --ssl --ps-protocol
+diff -Naur mysql-5.1.30.orig/Makefile.am mysql-5.1.30/Makefile.am
+--- mysql-5.1.30.orig/Makefile.am	2008-11-14 11:34:15.000000000 -0500
++++ mysql-5.1.30/Makefile.am	2009-01-13 11:13:12.000000000 -0500
+@@ -98,7 +98,7 @@
  
  test-ns:
  	cd mysql-test ; \
--	    @PERL@ ./mysql-test-run.pl $(force) $(mem)
-+	    @PERL@ ./mysql-test-run.pl $(force) $(mem) --ssl
- 
- test:	test-ns test-ps
+-	    @PERL@ ./mysql-test-run.pl $(force) $(mem) --mysqld=--binlog-format=mixed
++	    @PERL@ ./mysql-test-run.pl $(force) $(mem) --ssl --mysqld=--binlog-format=mixed
  
-diff -Naur mysql-5.0.67.orig/mysql-test/lib/mtr_process.pl mysql-5.0.67/mysql-test/lib/mtr_process.pl
---- mysql-5.0.67.orig/mysql-test/lib/mtr_process.pl	2008-08-04 08:32:17.000000000 -0400
-+++ mysql-5.0.67/mysql-test/lib/mtr_process.pl	2008-08-23 13:48:23.000000000 -0400
+ test-binlog-statement:
+ 	cd mysql-test ; \
+diff -Naur mysql-5.1.30.orig/mysql-test/lib/mtr_process.pl mysql-5.1.30/mysql-test/lib/mtr_process.pl
+--- mysql-5.1.30.orig/mysql-test/lib/mtr_process.pl	2008-11-14 12:31:10.000000000 -0500
++++ mysql-5.1.30/mysql-test/lib/mtr_process.pl	2009-01-13 11:14:25.000000000 -0500
 @@ -150,6 +150,9 @@
      {
        # Child, redirect output and exec
@@ -39,38 +31,10 @@
        $SIG{INT}= 'DEFAULT';         # Parent do some stuff, we don't
  
        my $log_file_open_mode = '>';
-diff -Naur mysql-5.0.67.orig/mysql-test/mysql-test-run.pl mysql-5.0.67/mysql-test/mysql-test-run.pl
---- mysql-5.0.67.orig/mysql-test/mysql-test-run.pl	2008-08-04 08:19:21.000000000 -0400
-+++ mysql-5.0.67/mysql-test/mysql-test-run.pl	2008-08-23 13:48:23.000000000 -0400
-@@ -1510,13 +1510,15 @@
- 
-   $exe_ndbd=
-     mtr_exe_maybe_exists("$ndb_path/src/kernel/ndbd",
--			 "$ndb_path/ndbd");
-+			 "$ndb_path/ndbd",
-+    			 "/usr/libexec/ndbd");
-   $exe_ndb_mgm=
-     mtr_exe_maybe_exists("$ndb_path/src/mgmclient/ndb_mgm",
- 			 "$ndb_path/ndb_mgm");
-   $exe_ndb_mgmd=
-     mtr_exe_maybe_exists("$ndb_path/src/mgmsrv/ndb_mgmd",
--			 "$ndb_path/ndb_mgmd");
-+			 "$ndb_path/ndb_mgmd",
-+			 "/usr/libexec/ndb_mgmd");
-   $exe_ndb_waiter=
-     mtr_exe_maybe_exists("$ndb_path/tools/ndb_waiter",
- 			 "$ndb_path/ndb_waiter");
-@@ -1617,7 +1619,8 @@
-     # Look for mysql_fix_privilege_tables.sql script
-     $file_mysql_fix_privilege_tables=
-       mtr_file_exists("$glob_basedir/scripts/mysql_fix_privilege_tables.sql",
--		      "$glob_basedir/share/mysql_fix_privilege_tables.sql");
-+		      "$glob_basedir/share/mysql_fix_privilege_tables.sql",
-+		      "$path_share/mysql_fix_privilege_tables.sql");
- 
-     if ( ! $opt_skip_ndbcluster and executable_setup_ndb()) {
-       mtr_warning("Could not find all required ndb binaries, " .
-@@ -4094,7 +4097,7 @@
+diff -Naur mysql-5.1.30.orig/mysql-test/mysql-test-run.pl mysql-5.1.30/mysql-test/mysql-test-run.pl
+--- mysql-5.1.30.orig/mysql-test/mysql-test-run.pl	2008-11-14 11:34:48.000000000 -0500
++++ mysql-5.1.30/mysql-test/mysql-test-run.pl	2009-01-13 11:17:52.000000000 -0500
+@@ -4204,7 +4204,7 @@
  
    if ( defined $exe )
    {


Index: mysql.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mysql/devel/mysql.spec,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -r1.109 -r1.110
--- mysql.spec	1 Oct 2008 23:17:59 -0000	1.109
+++ mysql.spec	14 Jan 2009 17:10:05 -0000	1.110
@@ -1,6 +1,6 @@
 Name: mysql
-Version: 5.0.67
-Release: 2%{?dist}
+Version: 5.1.30
+Release: 1%{?dist}
 Summary: MySQL client programs and shared libraries
 Group: Applications/Databases
 URL: http://www.mysql.com
@@ -11,7 +11,7 @@
 # Regression tests take a long time, you can skip 'em with this
 %{!?runselftest:%define runselftest 1}
 
-Source0: http://dev.mysql.com/get/Downloads/MySQL-5.0/mysql-%{version}.tar.gz
+Source0: http://dev.mysql.com/get/Downloads/MySQL-5.1/mysql-%{version}.tar.gz
 Source1: mysql.init
 Source3: my.cnf
 Source4: scriptstub.c
@@ -19,20 +19,18 @@
 Source6: ndbd.init
 Source7: ndb_mgmd.init
 Source8: ndb_types.h
+Source9: mysql-embedded-check.c
 # Working around perl dependency checking bug in rpm FTTB. Remove later.
-Source999: filter-requires-mysql.sh 
-Patch1: mysql-libdir.patch
+Source999: filter-requires-mysql.sh
+
+Patch1: mysql-ssl-multilib.patch
 Patch2: mysql-errno.patch
 Patch3: mysql-stack.patch
 Patch4: mysql-testing.patch
-Patch5: mysql-no-atomic.patch
-Patch6: mysql-rpl_ddl.patch
-Patch7: mysql-rpl-test.patch
-Patch8: mysql-install-test.patch
-Patch9: mysql-bdb-link.patch
-Patch10: mysql-bdb-open.patch
-Patch13: mysql-no-dbug.patch
-Patch15: mysql-stack-guard.patch
+Patch5: mysql-install-test.patch
+Patch6: mysql-stack-guard.patch
+Patch7: mysql-bogus-ssl-test.patch
+Patch8: mysql-plugin-bug.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: gperf, perl, readline-devel, openssl-devel
@@ -43,7 +41,7 @@
 # Socket is needed to run regression tests
 BuildRequires: perl(Socket)
 
-Prereq: /sbin/install-info, grep, fileutils
+Requires: /sbin/install-info, grep, fileutils
 Requires: %{name}-libs = %{version}-%{release}
 Requires: bash
 Conflicts: MySQL
@@ -62,7 +60,7 @@
 
 Summary: The shared libraries required for MySQL clients
 Group: Applications/Databases
-Prereq: /sbin/ldconfig
+Requires: /sbin/ldconfig
 
 %description libs
 The mysql-libs package provides the essential shared libraries for any 
@@ -74,7 +72,7 @@
 
 Summary: The MySQL server and related files
 Group: Applications/Databases
-Prereq: /sbin/chkconfig, /usr/sbin/useradd
+Requires: /sbin/chkconfig, /usr/sbin/useradd
 Requires: %{name} = %{version}-%{release}
 Requires: sh-utils
 # mysqlhotcopy needs DBI/DBD support
@@ -174,10 +172,6 @@
 %patch6 -p1
 %patch7 -p1
 %patch8 -p1
-%patch9 -p1
-%patch10 -p1
-%patch13 -p1
-%patch15 -p1
 
 libtoolize --force
 aclocal
@@ -192,12 +186,15 @@
 CFLAGS="$CFLAGS -fno-strict-aliasing -fwrapv"
 # force PIC mode so that we can build libmysqld.so
 CFLAGS="$CFLAGS -fPIC"
-CXXFLAGS="$CFLAGS -fno-rtti -fno-exceptions"
+# extra C++ flags as per recommendations in mysql's INSTALL-SOURCE doc
+CXXFLAGS="$CFLAGS -felide-constructors -fno-rtti -fno-exceptions"
 export CFLAGS CXXFLAGS
 
+# mysql 5.1.30 fails regression tests on x86 unless we use --with-big-tables,
+# suggesting that upstream doesn't bother to test the other case ...
 %configure \
 	--with-readline \
-	--with-openssl \
+	--with-ssl=/usr \
 	--without-debug \
 	--enable-shared \
 	--with-bench \
@@ -206,9 +203,9 @@
 	--with-unix-socket-path=/var/lib/mysql/mysql.sock \
 	--with-mysqld-user="mysql" \
 	--with-extra-charsets=all \
+	--with-big-tables \
 	--with-innodb \
 	--with-ndbcluster \
-	--with-berkeley-db \
 	--enable-local-infile \
 	--enable-largefile \
 	--enable-thread-safe-client \
@@ -226,10 +223,14 @@
 cd libmysqld/work
 ar -x ../libmysqld.a
 gcc -shared -Wl,-soname,libmysqld.so.0 -o libmysqld.so.0.0.1 *.o \
-	../../bdb/build_unix/libdb.a -lpthread -lcrypt -lnsl -lssl -lcrypto -lrt -lstdc++ -lm -lc
+	-lpthread -lcrypt -lnsl -lssl -lcrypto -lz -lrt -lstdc++ -lm -lc
+# this is to check that we built a complete library
+cp %{SOURCE9} .
+ln -s libmysqld.so.0.0.1 libmysqld.so.0
+gcc -I../../include mysql-embedded-check.c libmysqld.so.0
+LD_LIBRARY_PATH=. ldd ./a.out
 cd ../..
 
-%check
 make check
 
 %if %runselftest
@@ -244,7 +245,9 @@
   esac
   export MTR_BUILD_THREAD
 
-  make test
+  # note: "make test" invokes two largely-duplicate sets of tests,
+  # which makes the runtime really unacceptably long ...
+  make test-ns
 %endif
 
 %install
@@ -258,8 +261,8 @@
   i386 | x86_64 | ppc | ppc64 | s390 | s390x | sparc | sparcv9 | sparc64 )
     mv $RPM_BUILD_ROOT/usr/include/mysql/my_config.h $RPM_BUILD_ROOT/usr/include/mysql/my_config_`uname -i`.h
     install -m 644 %{SOURCE5} $RPM_BUILD_ROOT/usr/include/mysql/
-    mv $RPM_BUILD_ROOT/usr/include/mysql/ndb/ndb_types.h $RPM_BUILD_ROOT/usr/include/mysql/ndb/ndb_types_`uname -i`.h
-    install -m 644 %{SOURCE8} $RPM_BUILD_ROOT/usr/include/mysql/ndb/
+    mv $RPM_BUILD_ROOT/usr/include/mysql/storage/ndb/ndb_types.h $RPM_BUILD_ROOT/usr/include/mysql/storage/ndb/ndb_types_`uname -i`.h
+    install -m 644 %{SOURCE8} $RPM_BUILD_ROOT/usr/include/mysql/storage/ndb/
     ;;
   *)
     ;;
@@ -303,6 +306,8 @@
 rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/make_win_src_distribution.1*
 rm -f ${RPM_BUILD_ROOT}%{_libdir}/mysql/libmysqlclient*.la
 rm -f ${RPM_BUILD_ROOT}%{_libdir}/mysql/libndbclient.la
+rm -f ${RPM_BUILD_ROOT}%{_libdir}/mysql/plugin/*.la
+rm -f ${RPM_BUILD_ROOT}%{_libdir}/mysql/plugin/*.a
 rm -f ${RPM_BUILD_ROOT}%{_datadir}/mysql/binary-configure
 rm -f ${RPM_BUILD_ROOT}%{_datadir}/mysql/make_binary_distribution
 rm -f ${RPM_BUILD_ROOT}%{_datadir}/mysql/make_sharedlib_distribution
@@ -315,6 +320,7 @@
 rm -f ${RPM_BUILD_ROOT}%{_datadir}/mysql/postinstall
 rm -f ${RPM_BUILD_ROOT}%{_datadir}/mysql/mysql-*.spec
 rm -f ${RPM_BUILD_ROOT}%{_datadir}/mysql/mysql-log-rotate
+rm -f ${RPM_BUILD_ROOT}%{_datadir}/mysql/ChangeLog
 rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/mysql-stress-test.pl.1*
 rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/mysql-test-run.pl.1*
 rm -f ${RPM_BUILD_ROOT}/usr/libexec/ndb_cpcd
@@ -400,7 +406,6 @@
 %{_bindir}/mysql
 %{_bindir}/mysql_config
 %{_bindir}/mysql_find_rows
-%{_bindir}/mysql_tableinfo
 %{_bindir}/mysql_waitpid
 %{_bindir}/mysqlaccess
 %{_bindir}/mysqladmin
@@ -409,6 +414,7 @@
 %{_bindir}/mysqldump
 %{_bindir}/mysqlimport
 %{_bindir}/mysqlshow
+%{_bindir}/mysqlslap
 %{_bindir}/my_print_defaults
 
 %{_infodir}/*
@@ -416,12 +422,12 @@
 %{_mandir}/man1/mysql.1*
 %{_mandir}/man1/mysql_config.1*
 %{_mandir}/man1/mysql_find_rows.1*
-%{_mandir}/man1/mysql_tableinfo.1*
 %{_mandir}/man1/mysql_waitpid.1*
 %{_mandir}/man1/mysqlaccess.1*
 %{_mandir}/man1/mysqladmin.1*
 %{_mandir}/man1/mysqldump.1*
 %{_mandir}/man1/mysqlshow.1*
+%{_mandir}/man1/mysqlslap.1*
 %{_mandir}/man1/my_print_defaults.1*
 
 %{_libdir}/mysql/mysqlbug
@@ -474,7 +480,6 @@
 %{_bindir}/myisamlog
 %{_bindir}/myisampack
 %{_bindir}/mysql_convert_table_format
-%{_bindir}/mysql_explain_log
 %{_bindir}/mysql_fix_extensions
 %{_bindir}/mysql_fix_privilege_tables
 %{_bindir}/mysql_install_db
@@ -482,16 +487,12 @@
 %{_bindir}/mysql_setpermission
 %{_bindir}/mysql_tzinfo_to_sql
 %{_bindir}/mysql_upgrade
-%{_bindir}/mysql_upgrade_shell
 %{_bindir}/mysql_zap
 %{_bindir}/mysqlbug
 %{_bindir}/mysqldumpslow
 %{_bindir}/mysqld_multi
 %{_bindir}/mysqld_safe
 %{_bindir}/mysqlhotcopy
-%{_bindir}/mysqltestmanager
-%{_bindir}/mysqltestmanager-pwgen
-%{_bindir}/mysqltestmanagerc
 %{_bindir}/mysqltest
 %{_bindir}/innochecksum
 %{_bindir}/perror
@@ -502,6 +503,8 @@
 /usr/libexec/mysqld
 /usr/libexec/mysqlmanager
 
+%{_libdir}/mysql/plugin
+
 %{_mandir}/man1/msql2mysql.1*
 %{_mandir}/man1/myisamchk.1*
 %{_mandir}/man1/myisamlog.1*
@@ -509,7 +512,6 @@
 %{_mandir}/man1/mysql_convert_table_format.1*
 %{_mandir}/man1/myisam_ftdump.1*
 %{_mandir}/man1/mysql.server.1*
-%{_mandir}/man1/mysql_explain_log.1*
 %{_mandir}/man1/mysql_fix_extensions.1*
 %{_mandir}/man1/mysql_fix_privilege_tables.1*
 %{_mandir}/man1/mysql_install_db.1*
@@ -531,10 +533,7 @@
 %{_mandir}/man1/replace.1*
 %{_mandir}/man1/resolve_stack_dump.1*
 %{_mandir}/man1/resolveip.1*
-%{_mandir}/man1/safe_mysqld.1*
 %{_mandir}/man1/mysql_tzinfo_to_sql.1*
-%{_mandir}/man1/mysqlmanager-pwgen.1*
-%{_mandir}/man1/mysqlmanagerc.1*
 %{_mandir}/man8/mysqld.8*
 %{_mandir}/man8/mysqlmanager.8*
 
@@ -545,6 +544,8 @@
 %{_datadir}/mysql/mysql_system_tables_data.sql
 %{_datadir}/mysql/mysql_test_data_timezone.sql
 %{_datadir}/mysql/my-*.cnf
+%{_datadir}/mysql/config.*.ini
+
 /etc/rc.d/init.d/mysqld
 %attr(0755,mysql,mysql) %dir /var/run/mysqld
 %attr(0755,mysql,mysql) %dir /var/lib/mysql
@@ -560,6 +561,9 @@
 %{_bindir}/ndb_drop_table
 %{_bindir}/ndb_error_reporter
 %{_bindir}/ndb_mgm
+%{_bindir}/ndb_print_backup_file
+%{_bindir}/ndb_print_schema_file
+%{_bindir}/ndb_print_sys_file
 %{_bindir}/ndb_restore
 %{_bindir}/ndb_select_all
 %{_bindir}/ndb_select_count
@@ -593,12 +597,14 @@
 %{_mandir}/man1/ndb_show_tables.1*
 #%{_mandir}/man1/ndb_size.pl.1*
 %{_mandir}/man1/ndb_waiter.1*
+%{_mandir}/man1/ndbd_redo_log_reader.1*
 %{_mandir}/man8/ndbd.8*
 %{_mandir}/man8/ndb_mgmd.8*
 
 %files devel
 %defattr(-,root,root)
 /usr/include/mysql
+/usr/share/aclocal/mysql.m4
 %{_libdir}/mysql/*.a
 %{_libdir}/mysql/libmysqlclient*.so
 %{_libdir}/mysql/libndbclient.so
@@ -627,6 +633,10 @@
 %{_mandir}/man1/mysql_client_test.1*
 
 %changelog
+* Wed Jan 14 2009 Tom Lane <tgl at redhat.com> 5.1.30-1
+- Update to MySQL 5.1.30.  Note that this includes an ABI break for
+  libmysqlclient (it's now got .so major version 16).
+
 * Wed Oct  1 2008 Tom Lane <tgl at redhat.com> 5.0.67-2
 - Build the "embedded server" library, and package it in a new sub-RPM
   mysql-embedded, along with mysql-embedded-devel for devel support files.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mysql/devel/sources,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- sources	23 Aug 2008 20:31:19 -0000	1.33
+++ sources	14 Jan 2009 17:10:05 -0000	1.34
@@ -1 +1 @@
-7164483a5ffb8f7aa59b761c13cdbd6e  mysql-5.0.67.tar.gz
+b658e58887a74dce65224ae0fc8ee06a  mysql-5.1.30.tar.gz


--- mysql-bdb-link.patch DELETED ---


--- mysql-bdb-open.patch DELETED ---


--- mysql-libdir.patch DELETED ---


--- mysql-no-atomic.patch DELETED ---


--- mysql-no-dbug.patch DELETED ---


--- mysql-rpl-test.patch DELETED ---


--- mysql-rpl_ddl.patch DELETED ---



From victorv at fedoraproject.org  Wed Jan 14 17:15:11 2009
From: victorv at fedoraproject.org (Victor G. Vasilyev)
Date: Wed, 14 Jan 2009 17:15:11 +0000 (UTC)
Subject: rpms/netbeans-svnclientadapter/devel
	svnClientAdapter-1.4.0-build.patch, NONE, 1.1 .cvsignore, 1.2,
	1.3 netbeans-svnclientadapter.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20090114171511.7D6C870136@cvs1.fedora.phx.redhat.com>

Author: victorv

Update of /cvs/pkgs/rpms/netbeans-svnclientadapter/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18887

Modified Files:
	.cvsignore netbeans-svnclientadapter.spec sources 
Added Files:
	svnClientAdapter-1.4.0-build.patch 
Log Message:
Version 6.5 https://bugzilla.redhat.com/show_bug.cgi?id=480001


svnClientAdapter-1.4.0-build.patch:

--- NEW FILE svnClientAdapter-1.4.0-build.patch ---
diff -Nur svnClientAdapter/build.properties svnClientAdapter.new/build.properties
--- svnClientAdapter/build.properties	2008-12-23 19:54:52.000000000 +0300
+++ svnClientAdapter.new/build.properties	2008-12-25 19:31:37.000000000 +0300
@@ -35,9 +35,9 @@
 # all jar needed
 # -----------------------------------------------------------------------------
 lib.dir=lib
-svnjavahl.jar=${lib.dir}/svnjavahl.jar
-svnkit.jar=${lib.dir}/svnkit.jar
-ganymed.jar=${lib.dir}/ganymed.jar
+svnjavahl.jar=/usr/share/java/svn-javahl.jar
+#svnkit.jar=/usr/share/java/svnkit.jar
+#ganymed.jar=${lib.dir}/ganymed.jar
 
 # -----------------------------------------------------------------------------
 # JavaHL win32 lib dir
diff -Nur svnClientAdapter/build.xml svnClientAdapter.new/build.xml
--- svnClientAdapter/build.xml	2008-12-23 19:54:52.000000000 +0300
+++ svnClientAdapter.new/build.xml	2008-12-25 19:31:13.000000000 +0300
@@ -54,14 +54,14 @@
            includes="**"
 		   classpathref="project.classpath">
     </javac>
-    <javac srcdir="${src.svnkit.dir}"
+    <!--javac srcdir="${src.svnkit.dir}"
            destdir="${build.classes.dir}"
            debug="${debug}"
 		   source="${targetJvm}"    	
 		   target="${targetJvm}"    	
            includes="**"
 		   classpathref="project.classpath">
-    </javac>
+    </javac-->
     <javac srcdir="${src.cmdline.dir}"
            destdir="${build.classes.dir}"
            debug="${debug}"


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/netbeans-svnclientadapter/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	12 Aug 2008 12:21:23 -0000	1.2
+++ .cvsignore	14 Jan 2009 17:14:41 -0000	1.3
@@ -1 +1 @@
-svnClientAdapter-nb6.0.1-src.zip
+svnClientAdapter-1.4.0.tar.gz


Index: netbeans-svnclientadapter.spec
===================================================================
RCS file: /cvs/pkgs/rpms/netbeans-svnclientadapter/devel/netbeans-svnclientadapter.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- netbeans-svnclientadapter.spec	12 Aug 2008 12:21:23 -0000	1.1
+++ netbeans-svnclientadapter.spec	14 Jan 2009 17:14:41 -0000	1.2
@@ -1,16 +1,26 @@
 %define nb_            netbeans
 %define nb_org         %{nb_}.org
-%define nb_ver         6.1
+%define nb_ver         6.5
 
 Name:           %{nb_}-svnclientadapter
 Version:        %{nb_ver}
-Release:        3%{?dist}
+Release:        1%{?dist}
 Summary:        Subversion Client Adapter
 
 License:        ASL 2.0
-Url:            http://subversion.netbeans.org/teepee/svnclientadapter.html
+Url:            http://subclipse.tigris.org/svnClientAdapter.html
 Group:          Development/Libraries
-Source0:        http://subversion.netbeans.org/files/documents/193/1800/svnClientAdapter-nb6.0.1-src.zip
+
+%define svnCA_ver      1.4.0
+# The source for this package was pulled from upstream's vcs.  Use the
+# following commands to generate the tarball:
+# svn --username guest co \
+#     http://subclipse.tigris.org/svn/subclipse/tags/subclipse/%{svnCA_ver}/svnClientAdapter \
+#     svnClientAdapter
+# tar -czvf svnClientAdapter-%{svnCA_ver}.tar.gz svnClientAdapter
+Source0:        svnClientAdapter-%{svnCA_ver}.tar.gz
+
+Patch0:         svnClientAdapter-%{svnCA_ver}-build.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
@@ -20,6 +30,7 @@
 BuildRequires:  ant-junit
 BuildRequires:  java-devel >= 1:1.6.0
 BuildRequires:  jpackage-utils
+BuildRequires:  subversion-javahl >= 1.5.0
 
 Requires:       java >= 1:1.6.0
 Requires:       jpackage-utils
@@ -29,16 +40,21 @@
 
 %description
 SVNClientAdapter is a high-level Java API for Subversion.
-This is a NetBeans forked version of SvnClientAdapter.
 
 %prep
-%setup -q -n svnClientAdapter-nb6.0.1-src
+%setup -q -n svnClientAdapter
+
 # remove all binary libs
 find . -name "*.jar" -exec %{__rm} -f {} \;
 
+%patch0 -p1 -b .sav
+
+%{__ln_s} -f %{_javadir}//svnkit-javahl.jar lib/svnjavahl.jar
+
+
 %build
 [ -z "$JAVA_HOME" ] && export JAVA_HOME=%{_jvmdir}/java 
-ant -verbose
+ant -verbose svnClientAdapter.jar
 
 %install
 %{__rm} -fr %{buildroot}
@@ -56,6 +72,11 @@
 %{_javadir}/*
 
 %changelog
+* Tue Dec 23 2008 Victor G. Vasilyev <victor.vasilyev at sun.com> 6.5-1
+- Adapt to NetBeans 6.5
+- Change URL tag
+- Use the original upstream's vcs (version 1.4.0)
+
 * Fri Aug  8 2008 Brian Pepple <bpepple at fedoraproject.org> - 6.1-3
 - Use the preferred method to package docs.
 - Remove Distribution tag.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/netbeans-svnclientadapter/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	12 Aug 2008 12:21:23 -0000	1.2
+++ sources	14 Jan 2009 17:14:41 -0000	1.3
@@ -1 +1 @@
-4d6925a0dc7d95949325bd4d496e51cf  svnClientAdapter-nb6.0.1-src.zip
+ba0e7ad0dd90e3c8193b1f1f3e4c10f2  svnClientAdapter-1.4.0.tar.gz



From mlichvar at fedoraproject.org  Wed Jan 14 17:46:52 2009
From: mlichvar at fedoraproject.org (Miroslav Lichvar)
Date: Wed, 14 Jan 2009 17:46:52 +0000 (UTC)
Subject: rpms/ntp/devel ntp.dhclient,NONE,1.1 ntp.spec,1.84,1.85
Message-ID: <20090114174652.E7EA170136@cvs1.fedora.phx.redhat.com>

Author: mlichvar

Update of /cvs/pkgs/rpms/ntp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21589

Modified Files:
	ntp.spec 
Added Files:
	ntp.dhclient 
Log Message:
- include dhclient script (David Cantrell)
- convert COPYRIGHT to UTF-8



--- NEW FILE ntp.dhclient ---
#!/bin/bash
#
# ntp.sh: dhclient-script plugin for NTP settings,
#         place in /etc/dhcp/dhclient.d and 'chmod +x ntp.sh' to enable
#
# 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 General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program.  If not, see <http://www.gnu.org/licenses/>.
#
# Author(s): David Cantrell <dcantrell at redhat.com>
#            Miroslav Lichvar <mlichvar at redhat.com>
#

CONF=/etc/ntp.conf
SAVECONF=${SAVEDIR}/${CONF##*/}.predhclient.${interface}

ntp_config() {
    if [ ! "${PEERNTP}" = "no" ] && [ -n "${new_ntp_servers}" ] &&
        [ -e ${CONF} ] && [ -d ${SAVEDIR} ]; then
        mv -f ${CONF} ${SAVECONF}

        egrep -v '^server .*  # added by /sbin/dhclient-script$' < ${SAVECONF} > ${CONF}

        diff -q ${CONF} ${SAVECONF} >/dev/null 2>&1
        if [ $? -eq 1 ]; then
            rm -f ${SAVECONF}
            cp -f ${CONF} ${SAVECONF}
        fi

        for s in ${new_ntp_servers}; do
            echo "server ${s}  # added by /sbin/dhclient-script" >> ${CONF}
        done

        restorecon ${CONF} ${SAVECONF} >/dev/null 2>&1
        service ntpd condrestart >/dev/null 2>&1
    fi
}

ntp_restore() {
    if [ ! "${PEERNTP}" = "no" ] && [ -f ${SAVECONF} ]; then
        mv -f ${SAVECONF} ${CONF}
        restorecon ${CONF} >/dev/null 2>&1
        service ntpd condrestart >/dev/null 2>&1
    fi
}


Index: ntp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ntp/devel/ntp.spec,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -r1.84 -r1.85
--- ntp.spec	12 Jan 2009 13:53:46 -0000	1.84
+++ ntp.spec	14 Jan 2009 17:46:22 -0000	1.85
@@ -38,6 +38,7 @@
 Source7: ntpdate.init
 Source8: ntp.cryptopw
 Source9: ntpdate.sysconfig
+Source10: ntp.dhclient
 
 # ntpbz #628, #1073
 Patch1: ntp-4.2.4p4-kernel.patch
@@ -166,6 +167,10 @@
 ln -sf md5.c libntp/md5c.c
 %patch13 -p1 -b .bsdadv
 
+for f in COPYRIGHT; do
+	iconv -f iso8859-1 -t utf8 -o ${f}{_,} && touch -r ${f}{,_} && mv -f ${f}{_,}
+done
+
 %build
 export CFLAGS="$RPM_OPT_FLAGS"
 if echo 'int main () { return 0; }' | gcc -pie -fPIE -O2 -xc - -o pietest 2>/dev/null; then
@@ -218,7 +223,7 @@
 find htmldoc -type d | xargs chmod 755
 
 pushd $RPM_BUILD_ROOT
-mkdir -p .%{_sysconfdir}/{ntp,ntp/crypto,sysconfig} .%{_initrddir}
+mkdir -p .%{_sysconfdir}/{ntp/crypto,sysconfig,dhcp/dhclient.d} .%{_initrddir}
 mkdir -p .%{_localstatedir}/{lib/ntp,log/ntpstats}
 touch .%{_localstatedir}/lib/ntp/drift
 sed -e 's|ETCNTP|%{_sysconfdir}/ntp|' -e 's|VARNTP|%{_localstatedir}/lib/ntp|' \
@@ -231,6 +236,7 @@
 install -p -m644 %{SOURCE9} .%{_sysconfdir}/sysconfig/ntpdate
 install -p -m644 %{SOURCE6} .%{_sysconfdir}/ntp/step-tickers
 install -p -m600 %{SOURCE8} .%{_sysconfdir}/ntp/crypto/pw
+install -p -m755 %{SOURCE10} .%{_sysconfdir}/dhcp/dhclient.d/ntp.sh
 popd
 
 %clean
@@ -282,6 +288,8 @@
 %config(noreplace) %{_sysconfdir}/ntp.conf
 %dir %attr(750,root,ntp) %{_sysconfdir}/ntp/crypto
 %config(noreplace) %{_sysconfdir}/ntp/crypto/pw
+%dir %{_sysconfdir}/dhcp/dhclient.d
+%{_sysconfdir}/dhcp/dhclient.d/ntp.sh
 %dir %attr(-,ntp,ntp) %{_localstatedir}/lib/ntp
 %ghost %attr(644,ntp,ntp) %{_localstatedir}/lib/ntp/drift
 %dir %attr(-,ntp,ntp) %{_localstatedir}/log/ntpstats
@@ -311,8 +319,10 @@
 %{_mandir}/man8/ntpdate.8*
 
 %changelog
-* Mon Jan 12 2009 Miroslav Lichvar <mlichvar at redhat.com> 4.2.4p6-1
+* Wed Jan 14 2009 Miroslav Lichvar <mlichvar at redhat.com> 4.2.4p6-1
 - update to 4.2.4p6 (CVE-2009-0021)
+- include dhclient script (David Cantrell)
+- convert COPYRIGHT to UTF-8
 
 * Wed Oct 08 2008 Miroslav Lichvar <mlichvar at redhat.com> 4.2.4p5-2
 - retry failed name resolution few times before giving up (#460561)



From rdieter at fedoraproject.org  Wed Jan 14 17:49:15 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed, 14 Jan 2009 17:49:15 +0000 (UTC)
Subject: rpms/google-gadgets/devel .cvsignore, 1.4, 1.5 google-gadgets.spec, 
	1.8, 1.9 sources, 1.4, 1.5
Message-ID: <20090114174915.2AEF570136@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/google-gadgets/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22011

Modified Files:
	.cvsignore google-gadgets.spec sources 
Log Message:
* Wed Jan 14 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.10.5-1
- 0.10.5, req'd by kde



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/google-gadgets/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	20 Dec 2008 20:38:39 -0000	1.4
+++ .cvsignore	14 Jan 2009 17:48:44 -0000	1.5
@@ -1 +1 @@
-google-gadgets-for-linux-0.10.4.tar.bz2
+google-gadgets-for-linux-0.10.5.tar.bz2


Index: google-gadgets.spec
===================================================================
RCS file: /cvs/pkgs/rpms/google-gadgets/devel/google-gadgets.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- google-gadgets.spec	30 Dec 2008 22:42:28 -0000	1.8
+++ google-gadgets.spec	14 Jan 2009 17:48:44 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           google-gadgets
-Version:        0.10.4
-Release:        2%{?dist}
+Version:        0.10.5
+Release:        1%{?dist}
 Summary:        Google Gadgets for Linux
 
 Group:          User Interface/Desktops
@@ -189,6 +189,9 @@
 
 
 %changelog
+* Wed Jan 14 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.10.5-1
+- 0.10.5, req'd by kde
+
 * Tue Dec 30 2008 Michel Salim <salimma at fedoraproject.org> - 0.10.4-2
 - BR: Network-Manager-devel, startup-notification-devel
 - Pass the browser plugin directory to ./configure


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/google-gadgets/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	20 Dec 2008 20:38:39 -0000	1.4
+++ sources	14 Jan 2009 17:48:44 -0000	1.5
@@ -1 +1 @@
-0ef0a62e0a575388084a77759b646718  google-gadgets-for-linux-0.10.4.tar.bz2
+fdad6bd761b6c603e457b5d0d92ec2f9  google-gadgets-for-linux-0.10.5.tar.bz2



From rdieter at fedoraproject.org  Wed Jan 14 17:50:41 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed, 14 Jan 2009 17:50:41 +0000 (UTC)
Subject: rpms/kdebase-workspace/devel kdebase-workspace.spec,1.166,1.167
Message-ID: <20090114175041.1BC9F70136@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdebase-workspace/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22195

Modified Files:
	kdebase-workspace.spec 
Log Message:
* Wed Jan 14 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.1.96-3
- BR: google-gadgets-devel > 0.10.5



Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/devel/kdebase-workspace.spec,v
retrieving revision 1.166
retrieving revision 1.167
diff -u -r1.166 -r1.167
--- kdebase-workspace.spec	9 Jan 2009 21:35:16 -0000	1.166
+++ kdebase-workspace.spec	14 Jan 2009 17:50:10 -0000	1.167
@@ -4,7 +4,7 @@
 Name: kdebase-workspace
 Version: 4.1.96
 
-Release: 2%{?dist}
+Release: 3%{?dist}
 Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdebase-workspace-%{version}.tar.bz2
 License: GPLv2
 Group: User Interface/Desktops
@@ -49,7 +49,7 @@
 
 BuildRequires: bluez-libs-devel
 BuildRequires: ConsoleKit-devel
-BuildRequires: google-gadgets-devel >= 0.10.4
+BuildRequires: google-gadgets-devel >= 0.10.5
 BuildRequires: glib2-devel
 BuildRequires: kdelibs4-devel >= %{version}
 BuildRequires: libcaptury-devel
@@ -296,6 +296,9 @@
 
 
 %changelog
+* Wed Jan 14 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.1.96-3
+- BR: google-gadgets-devel > 0.10.5
+
 * Fri Jan 09 2009 Than Ngo <than at redhat.com> - 4.1.96-2
 - remove Provides: plasma-devel  
 



From orion at fedoraproject.org  Wed Jan 14 17:55:21 2009
From: orion at fedoraproject.org (Orion Poplawski)
Date: Wed, 14 Jan 2009 17:55:21 +0000 (UTC)
Subject: rpms/R-car/devel .cvsignore, 1.4, 1.5 R-car.spec, 1.3, 1.4 sources, 
	1.4, 1.5
Message-ID: <20090114175521.7CFCF70136@cvs1.fedora.phx.redhat.com>

Author: orion

Update of /cvs/pkgs/rpms/R-car/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23269

Modified Files:
	.cvsignore R-car.spec sources 
Log Message:
* Wed Jan 14 2009 Orion Poplawski <orion at cora.nwra.com> 1.2-5
- Update to 1.2-11



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/R-car/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	23 Oct 2008 14:46:02 -0000	1.4
+++ .cvsignore	14 Jan 2009 17:54:51 -0000	1.5
@@ -1 +1 @@
-car_1.2-9.tar.gz
+car_1.2-11.tar.gz


Index: R-car.spec
===================================================================
RCS file: /cvs/pkgs/rpms/R-car/devel/R-car.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- R-car.spec	23 Oct 2008 14:45:33 -0000	1.3
+++ R-car.spec	14 Jan 2009 17:54:51 -0000	1.4
@@ -1,6 +1,6 @@
 %define packname car
 # Note that some R packages do not use packrel
-%define packrel 9
+%define packrel 11
 
 Name:             R-%{packname}
 Version:          1.2
@@ -77,6 +77,9 @@
 %{_datadir}/R/library/%{packname}/help
 
 %changelog
+* Wed Jan 14 2009 Orion Poplawski <orion at cora.nwra.com> 1.2-5
+- Update to 1.2-11
+
 * Thu Oct 23 2008 Orion Poplawski <orion at cora.nwra.com> 1.2-4
 - Update to 1.2-9
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/R-car/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	23 Oct 2008 14:46:02 -0000	1.4
+++ sources	14 Jan 2009 17:54:51 -0000	1.5
@@ -1 +1 @@
-57a090daea84556f781d2cda24098885  car_1.2-9.tar.gz
+7335f6e3eec1c8d9fe07b9ce0d18cd08  car_1.2-11.tar.gz



From hedayat at fedoraproject.org  Wed Jan 14 18:35:06 2009
From: hedayat at fedoraproject.org (Hedayat Vatankhah)
Date: Wed, 14 Jan 2009 18:35:06 +0000 (UTC)
Subject: rpms/rcssserver3d/devel rcssserver3d.spec,1.4,1.5
Message-ID: <20090114183506.2C64B70136@cvs1.fedora.phx.redhat.com>

Author: hedayat

Update of /cvs/pkgs/rpms/rcssserver3d/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27090

Modified Files:
	rcssserver3d.spec 
Log Message:
Removing the font file


Index: rcssserver3d.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rcssserver3d/devel/rcssserver3d.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- rcssserver3d.spec	19 Dec 2008 13:22:42 -0000	1.4
+++ rcssserver3d.spec	14 Jan 2009 18:34:35 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           rcssserver3d
 Version:        0.6
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Robocup 3D Soccer Simulation Server
 
 Group:          Applications/System
@@ -105,6 +105,9 @@
 desktop-file-install --vendor="%{linvendor}"                 \
   --dir=%{buildroot}/%{_datadir}/applications %{SOURCE2} %{SOURCE3}
 
+ln -fs %{_datadir}/fonts/dejavu/DejaVuSansMono.ttf \
+      %{buildroot}/%{_datadir}/%{name}/fonts/VeraMono.ttf
+
 rm -rf %{buildroot}/%{_libdir}/%{name}/*.la
 rm -rf %{buildroot}/%{_bindir}/{rcsoccersim3D,rcssmonitor3D-*,rcssserver3D,agenttest}
 rm -rf %{buildroot}/%{_datadir}/%{name}/*.h
@@ -168,6 +171,10 @@
 %endif
 
 %changelog
+* Wed Jan 14 2008 Hedayat Vatankhah <hedayat at grad.com> 0.6-7
+- Removing VeraMono.ttf from the package because of new Fedora font guidelines.
+- Adding dejavu-fonts-sans-mono as a requirement for VeraMono.ttf replacement.
+
 * Fri Dec 19 2008 Petr Machata <pmachata at redhat.com> - 0.6-6
 - Rebuild for boost-1.37.0.
 - Add patch to convert make_shared(X) to X.lock()



From hedayat at fedoraproject.org  Wed Jan 14 18:36:37 2009
From: hedayat at fedoraproject.org (Hedayat Vatankhah)
Date: Wed, 14 Jan 2009 18:36:37 +0000 (UTC)
Subject: rpms/rcssserver3d/devel rcssserver3d.spec,1.5,1.6
Message-ID: <20090114183637.64CDA70136@cvs1.fedora.phx.redhat.com>

Author: hedayat

Update of /cvs/pkgs/rpms/rcssserver3d/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27231

Modified Files:
	rcssserver3d.spec 
Log Message:
Added dejavu-fonts-sans-mono as a requirement


Index: rcssserver3d.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rcssserver3d/devel/rcssserver3d.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- rcssserver3d.spec	14 Jan 2009 18:34:35 -0000	1.5
+++ rcssserver3d.spec	14 Jan 2009 18:36:07 -0000	1.6
@@ -20,7 +20,7 @@
 BuildRequires:  automake autoconf gcc-c++ boost-devel slang-devel
 BuildRequires:  ruby ruby-devel SDL-devel desktop-file-utils libtool
 BuildRequires:  ode-devel libGL-devel DevIL-devel freetype-devel libGLU-devel
-Requires:       ruby ruby(abi) = 1.8
+Requires:       ruby ruby(abi) = 1.8 dejavu-fonts-sans-mono 
 
 %define         linvendor fedora
 



From hedayat at fedoraproject.org  Wed Jan 14 18:38:20 2009
From: hedayat at fedoraproject.org (Hedayat Vatankhah)
Date: Wed, 14 Jan 2009 18:38:20 +0000 (UTC)
Subject: rpms/rcssserver3d/devel rcssserver3d.spec,1.6,1.7
Message-ID: <20090114183820.AAC5970136@cvs1.fedora.phx.redhat.com>

Author: hedayat

Update of /cvs/pkgs/rpms/rcssserver3d/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27407

Modified Files:
	rcssserver3d.spec 
Log Message:
Wow! we are in 2009 :)


Index: rcssserver3d.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rcssserver3d/devel/rcssserver3d.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- rcssserver3d.spec	14 Jan 2009 18:36:07 -0000	1.6
+++ rcssserver3d.spec	14 Jan 2009 18:37:50 -0000	1.7
@@ -171,7 +171,7 @@
 %endif
 
 %changelog
-* Wed Jan 14 2008 Hedayat Vatankhah <hedayat at grad.com> 0.6-7
+* Wed Jan 14 2009 Hedayat Vatankhah <hedayat at grad.com> 0.6-7
 - Removing VeraMono.ttf from the package because of new Fedora font guidelines.
 - Adding dejavu-fonts-sans-mono as a requirement for VeraMono.ttf replacement.
 



From rjones at fedoraproject.org  Wed Jan 14 18:43:30 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Wed, 14 Jan 2009 18:43:30 +0000 (UTC)
Subject: rpms/cduce/devel cduce-0.5.2.1-ocaml-3.11.0.patch, 1.1,
	1.2 cduce.spec, 1.8, 1.9
Message-ID: <20090114184330.17E9670136@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/cduce/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27861

Modified Files:
	cduce-0.5.2.1-ocaml-3.11.0.patch cduce.spec 
Log Message:
Improve the OCaml 3.11.0 patch (suggested by Kim Nguyen).

cduce-0.5.2.1-ocaml-3.11.0.patch:

Index: cduce-0.5.2.1-ocaml-3.11.0.patch
===================================================================
RCS file: /cvs/pkgs/rpms/cduce/devel/cduce-0.5.2.1-ocaml-3.11.0.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cduce-0.5.2.1-ocaml-3.11.0.patch	5 Dec 2008 14:44:43 -0000	1.1
+++ cduce-0.5.2.1-ocaml-3.11.0.patch	14 Jan 2009 18:43:29 -0000	1.2
@@ -1,6 +1,6 @@
-diff -ur cduce-0.5.2.orig/ocamliface/location.ml cduce-0.5.2.newcaml/ocamliface/location.ml
+diff -ur cduce-0.5.2.orig/ocamliface/location.ml cduce-0.5.2/ocamliface/location.ml
 --- cduce-0.5.2.orig/ocamliface/location.ml	2008-02-25 10:10:27.000000000 +0000
-+++ cduce-0.5.2.newcaml/ocamliface/location.ml	2008-12-05 14:20:56.000000000 +0000
++++ cduce-0.5.2/ocamliface/location.ml	2009-01-14 18:34:20.000000000 +0000
 @@ -15,6 +15,8 @@
  let input_name = ref ""
  let input_lexbuf = ref None
@@ -10,9 +10,9 @@
  let print = dummy
  let print_warning = dummy
  let prerr_warning = dummy
-diff -ur cduce-0.5.2.orig/ocamliface/Makefile cduce-0.5.2.newcaml/ocamliface/Makefile
---- cduce-0.5.2.orig/ocamliface/Makefile	2008-12-05 14:36:18.000000000 +0000
-+++ cduce-0.5.2.newcaml/ocamliface/Makefile	2008-12-05 14:38:27.000000000 +0000
+diff -ur cduce-0.5.2.orig/ocamliface/Makefile cduce-0.5.2/ocamliface/Makefile
+--- cduce-0.5.2.orig/ocamliface/Makefile	2008-02-25 10:10:28.000000000 +0000
++++ cduce-0.5.2/ocamliface/Makefile	2009-01-14 18:34:20.000000000 +0000
 @@ -41,6 +41,7 @@
  	rm -Rf ocaml_files *~ *.cm*
  
@@ -30,9 +30,9 @@
    ident.ml path.ml \
    primitive.ml types.ml \
    btype.ml oprint.ml \
-diff -ur cduce-0.5.2.orig/ocamliface/mltypes.ml cduce-0.5.2.newcaml/ocamliface/mltypes.ml
+diff -ur cduce-0.5.2.orig/ocamliface/mltypes.ml cduce-0.5.2/ocamliface/mltypes.ml
 --- cduce-0.5.2.orig/ocamliface/mltypes.ml	2008-02-25 10:10:42.000000000 +0000
-+++ cduce-0.5.2.newcaml/ocamliface/mltypes.ml	2008-12-05 14:26:27.000000000 +0000
++++ cduce-0.5.2/ocamliface/mltypes.ml	2009-01-14 18:34:20.000000000 +0000
 @@ -169,14 +169,14 @@
  
        slot.def <- 
@@ -52,26 +52,29 @@
  	   | Type_abstract, Some t ->
  	       Link (unfold env t)
  	   | Type_abstract, None ->
-diff -ur cduce-0.5.2.orig/parser/cduce_curl.ml cduce-0.5.2.newcaml/parser/cduce_curl.ml
+diff -ur cduce-0.5.2.orig/parser/cduce_curl.ml cduce-0.5.2/parser/cduce_curl.ml
 --- cduce-0.5.2.orig/parser/cduce_curl.ml	2008-02-25 10:10:42.000000000 +0000
-+++ cduce-0.5.2.newcaml/parser/cduce_curl.ml	2008-12-05 14:34:07.000000000 +0000
-@@ -9,7 +9,12 @@
++++ cduce-0.5.2/parser/cduce_curl.ml	2009-01-14 18:36:47.000000000 +0000
+@@ -9,7 +9,14 @@
      let buff = Buffer.create 4096 in 
      let conn = Curl.init () in
      Curl.set_url conn s;
 -    Curl.set_writefunction conn (Buffer.add_string buff);
 +    Curl.set_writefunction conn (
 +      fun str ->
-+        Buffer.add_string buff str;
-+	(* Not clear what Curl is expecting -- the string length? (RWMJ) *)
-+	String.length str
++	try
++          Buffer.add_string buff str;
++	  String.length str
++	with
++	  Failure msg -> Printf.eprintf "load_url: %s\n" msg; 0
 +      );
      Curl.perform conn;
      Buffer.contents buff
    with Curl.CurlException (code, n, msg) ->
-diff -ur cduce-0.5.2.orig/runtime/print_xml.ml cduce-0.5.2.newcaml/runtime/print_xml.ml
+Only in cduce-0.5.2/parser: cduce_curl.ml~
+diff -ur cduce-0.5.2.orig/runtime/print_xml.ml cduce-0.5.2/runtime/print_xml.ml
 --- cduce-0.5.2.orig/runtime/print_xml.ml	2008-02-25 10:10:40.000000000 +0000
-+++ cduce-0.5.2.newcaml/runtime/print_xml.ml	2008-12-05 14:11:05.000000000 +0000
++++ cduce-0.5.2/runtime/print_xml.ml	2009-01-14 18:34:20.000000000 +0000
 @@ -108,7 +108,6 @@
    let wms = write_markup_string ~to_enc buffer
    and wds s = write_data_string ~to_enc buffer (U.get_str s)


Index: cduce.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cduce/devel/cduce.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- cduce.spec	5 Dec 2008 14:44:43 -0000	1.8
+++ cduce.spec	14 Jan 2009 18:43:29 -0000	1.9
@@ -5,7 +5,7 @@
 
 Name:           cduce
 Version:        0.5.2.1
-Release:        11%{?dist}
+Release:        12%{?dist}
 Summary:        modern XML-oriented functional language
 
 Group:          Development/Libraries
@@ -112,6 +112,9 @@
 
 
 %changelog
+* Wed Jan 14 2009 Richard W.M. Jones <rjones at redhat.com> - 0.5.2.1-12
+- Improve the OCaml 3.11.0 patch (suggested by Kim Nguyen).
+
 * Fri Dec  5 2008 Richard W.M. Jones <rjones at redhat.com> - 0.5.2.1-11
 - Attempt to rebuild against OCaml 3.11.0.
 



From tmz at fedoraproject.org  Wed Jan 14 18:59:10 2009
From: tmz at fedoraproject.org (Todd M. Zullinger)
Date: Wed, 14 Jan 2009 18:59:10 +0000 (UTC)
Subject: rpms/git/EL-4 gitweb-CVE-2008-5516.patch, NONE,
	1.1 gitweb-CVE-2008-5517.patch, NONE, 1.1 git.spec, 1.32, 1.33
Message-ID: <20090114185910.0CE8170136@cvs1.fedora.phx.redhat.com>

Author: tmz

Update of /cvs/extras/rpms/git/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29749

Modified Files:
	git.spec 
Added Files:
	gitweb-CVE-2008-5516.patch gitweb-CVE-2008-5517.patch 
Log Message:
Backport gitweb fixes for CVE-2008-5516 and CVE-2008-5517 (bug 479715)

gitweb-CVE-2008-5516.patch:

--- NEW FILE gitweb-CVE-2008-5516.patch ---
>From 8f8bfb38271775770cd1da8fb7cfd1e2d7ef2481 Mon Sep 17 00:00:00 2001
From: Jakub Narebski <jnareb at gmail.com>
Date: Wed, 5 Mar 2008 09:31:55 +0100
Subject: [PATCH 1/2] gitweb: Fix and simplify pickaxe search

Instead of using "git-rev-list | git-diff-tree" pipeline for pickaxe
search, use git-log with appropriate options.  Besides reducing number
of forks by one, this allows to use list form of open, which in turn
allow to not worry about quoting arguments and to avoid forking shell.

The options to git-log were chosen to reduce required changes in
pickaxe git command output parsing; gitweb still parses returned
commits one by one.

Parsing "pickaxe" output is simplified: git_search now reuses
parse_difftree_raw_line and writes affected files as they arrive using
the fact that commit name goes always before [raw] diff.

While at it long bug of pickaxe search was fixed, namely that the last
commit found by pickaxe search was never shown.

Signed-off-by: Jakub Narebski <jnareb at gmail.com>
Signed-off-by: Junio C Hamano <gitster at pobox.com>

Note: This patch was backported to 1.5.4.7 by Todd Zullinger
<tmz at pobox.com>.  Any blame for problems should come to me, not the
upstream authors. :)
---
 gitweb/gitweb.perl |   83 ++++++++++++++++++++++++++-------------------------
 1 files changed, 42 insertions(+), 41 deletions(-)

diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl
index 86a6ced..e011393 100755
--- a/gitweb/gitweb.perl
+++ b/gitweb/gitweb.perl
@@ -5199,50 +5199,18 @@ sub git_search {
 		print "<table class=\"pickaxe search\">\n";
 		my $alternate = 1;
 		$/ = "\n";
-		my $git_command = git_cmd_str();
-		my $searchqtext = $searchtext;
-		$searchqtext =~ s/'/'\\''/;
-		open my $fd, "-|", "$git_command rev-list $hash | " .
-			"$git_command diff-tree -r --stdin -S\'$searchqtext\'";
+		open my $fd, '-|', git_cmd(), '--no-pager', 'log', @diff_opts,
+			'--pretty=format:%H', '--no-abbrev', '--raw', "-S$searchtext";
 		undef %co;
 		my @files;
 		while (my $line = <$fd>) {
-			if (%co && $line =~ m/^:([0-7]{6}) ([0-7]{6}) ([0-9a-fA-F]{40}) ([0-9a-fA-F]{40}) (.)\t(.*)$/) {
-				my %set;
-				$set{'file'} = $6;
-				$set{'from_id'} = $3;
-				$set{'to_id'} = $4;
-				$set{'id'} = $set{'to_id'};
-				if ($set{'id'} =~ m/0{40}/) {
-					$set{'id'} = $set{'from_id'};
-				}
-				if ($set{'id'} =~ m/0{40}/) {
-					next;
-				}
-				push @files, \%set;
-			} elsif ($line =~ m/^([0-9a-fA-F]{40})$/){
+			chomp $line;
+			next unless $line;
+
+			my %set = parse_difftree_raw_line($line);
+			if (defined $set{'commit'}) {
+				# finish previous commit
 				if (%co) {
-					if ($alternate) {
-						print "<tr class=\"dark\">\n";
-					} else {
-						print "<tr class=\"light\">\n";
-					}
-					$alternate ^= 1;
-					my $author = chop_and_escape_str($co{'author_name'}, 15, 5);
-					print "<td title=\"$co{'age_string_age'}\"><i>$co{'age_string_date'}</i></td>\n" .
-					      "<td><i>" . $author . "</i></td>\n" .
-					      "<td>" .
-					      $cgi->a({-href => href(action=>"commit", hash=>$co{'id'}),
-					              -class => "list subject"},
-					              chop_and_escape_str($co{'title'}, 50) . "<br/>");
-					while (my $setref = shift @files) {
-						my %set = %$setref;
-						print $cgi->a({-href => href(action=>"blob", hash_base=>$co{'id'},
-						                             hash=>$set{'id'}, file_name=>$set{'file'}),
-						              -class => "list"},
-						              "<span class=\"match\">" . esc_path($set{'file'}) . "</span>") .
-						      "<br/>\n";
-					}
 					print "</td>\n" .
 					      "<td class=\"link\">" .
 					      $cgi->a({-href => href(action=>"commit", hash=>$co{'id'})}, "commit") .
@@ -5251,11 +5219,44 @@ sub git_search {
 					print "</td>\n" .
 					      "</tr>\n";
 				}
-				%co = parse_commit($1);
+
+				if ($alternate) {
+					print "<tr class=\"dark\">\n";
+				} else {
+					print "<tr class=\"light\">\n";
+				}
+				$alternate ^= 1;
+				%co = parse_commit($set{'commit'});
+				my $author = chop_and_escape_str($co{'author_name'}, 15, 5);
+				print "<td title=\"$co{'age_string_age'}\"><i>$co{'age_string_date'}</i></td>\n" .
+				      "<td><i>$author</i></td>\n" .
+				      "<td>" .
+				      $cgi->a({-href => href(action=>"commit", hash=>$co{'id'}),
+				              -class => "list subject"},
+				              chop_and_escape_str($co{'title'}, 50) . "<br/>");
+			} elsif (defined $set{'to_id'}) {
+				next if ($set{'to_id'} =~ m/^0{40}$/);
+
+				print $cgi->a({-href => href(action=>"blob", hash_base=>$co{'id'},
+				                             hash=>$set{'to_id'}, file_name=>$set{'to_file'}),
+				              -class => "list"},
+				              "<span class=\"match\">" . esc_path($set{'file'}) . "</span>") .
+				      "<br/>\n";
 			}
 		}
 		close $fd;
 
+		# finish last commit (warning: repetition!)
+		if (%co) {
+			print "</td>\n" .
+			      "<td class=\"link\">" .
+			      $cgi->a({-href => href(action=>"commit", hash=>$co{'id'})}, "commit") .
+			      " | " .
+			      $cgi->a({-href => href(action=>"tree", hash=>$co{'tree'}, hash_base=>$co{'id'})}, "tree");
+			print "</td>\n" .
+			      "</tr>\n";
+		}
+
 		print "</table>\n";
 	}
 
-- 
1.6.1


gitweb-CVE-2008-5517.patch:

--- NEW FILE gitweb-CVE-2008-5517.patch ---
>From 2813e6cef24a8b363a97ea0c86bf4494fc453f32 Mon Sep 17 00:00:00 2001
From: Lea Wiemann <lewiemann at gmail.com>
Date: Tue, 17 Jun 2008 23:46:35 +0200
Subject: [PATCH 2/2] gitweb: quote commands properly when calling the shell

This eliminates the function git_cmd_str, which was used for composing
command lines, and adds a quote_command function, which quotes all of
its arguments (as in quote.c).

Signed-off-by: Lea Wiemann <LeWiemann at gmail.com>
Signed-off-by: Junio C Hamano <gitster at pobox.com>
---
 gitweb/gitweb.perl |   24 ++++++++++++++----------
 1 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl
index e011393..bd50c07 100755
--- a/gitweb/gitweb.perl
+++ b/gitweb/gitweb.perl
@@ -1396,9 +1396,13 @@ sub git_cmd {
 	return $GIT, '--git-dir='.$git_dir;
 }
 
-# returns path to the core git executable and the --git-dir parameter as string
-sub git_cmd_str {
-	return join(' ', git_cmd());
+# quote the given arguments for passing them to the shell
+# quote_command("command", "arg 1", "arg with ' and ! characters")
+# => "'command' 'arg 1' 'arg with '\'' and '\!' characters'"
+# Try to avoid using this function wherever possible.
+sub quote_command {
+	return join(' ',
+		    map( { my $a = $_; $a =~ s/(['!])/'\\$1'/g; "'$a'" } @_ ));
 }
 
 # get HEAD ref of given project as hash
@@ -4477,7 +4481,6 @@ sub git_snapshot {
 		$hash = git_get_head_hash($project);
 	}
 
-	my $git_command = git_cmd_str();
 	my $name = $project;
 	$name =~ s,([^/])/*\.git$,$1,;
 	$name = basename($name);
@@ -4485,11 +4488,12 @@ sub git_snapshot {
 	$name =~ s/\047/\047\\\047\047/g;
 	my $cmd;
 	$filename .= "-$hash$known_snapshot_formats{$format}{'suffix'}";
-	$cmd = "$git_command archive " .
-		"--format=$known_snapshot_formats{$format}{'format'} " .
-		"--prefix=\'$name\'/ $hash";
+	$cmd = quote_command(
+		git_cmd(), 'archive',
+		"--format=$known_snapshot_formats{$format}{'format'}",
+		"--prefix=$name/", $hash);
 	if (exists $known_snapshot_formats{$format}{'compressor'}) {
-		$cmd .= ' | ' . join ' ', @{$known_snapshot_formats{$format}{'compressor'}};
+		$cmd .= ' | ' . quote_command(@{$known_snapshot_formats{$format}{'compressor'}});
 	}
 
 	print $cgi->header(
@@ -4702,8 +4706,8 @@ sub git_object {
 	if ($hash || ($hash_base && !defined $file_name)) {
 		my $object_id = $hash || $hash_base;
 
-		my $git_command = git_cmd_str();
-		open my $fd, "-|", "$git_command cat-file -t $object_id 2>/dev/null"
+		open my $fd, "-|", quote_command(
+			git_cmd(), 'cat-file', '-t', $object_id) . ' 2> /dev/null'
 			or die_error('404 Not Found', "Object does not exist");
 		$type = <$fd>;
 		chomp $type;
-- 
1.6.1



Index: git.spec
===================================================================
RCS file: /cvs/extras/rpms/git/EL-4/git.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- git.spec	20 Dec 2008 18:15:48 -0000	1.32
+++ git.spec	14 Jan 2009 18:58:39 -0000	1.33
@@ -1,7 +1,7 @@
 # Pass --without docs to rpmbuild if you don't want the documentation
 Name: 		git
 Version: 	1.5.4.7
-Release: 	1%{?dist}
+Release: 	2%{?dist}
 Summary:  	Git core and tools
 License: 	GPL
 Group: 		Development/Tools
@@ -10,6 +10,8 @@
 Source1:	git.xinetd
 Source2:	git.conf.httpd
 Patch0:		git-1.5-gitweb-home-link.patch
+Patch1:		gitweb-CVE-2008-5516.patch
+Patch2:		gitweb-CVE-2008-5517.patch
 BuildRequires:	perl, zlib-devel >= 1.2, openssl-devel, curl-devel, expat-devel, gettext %{!?_without_docs:, xmlto, asciidoc > 6.0.3}
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:	git-core, git-svn, git-cvs, git-email, gitk, git-gui, perl-Git
@@ -93,6 +95,8 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1 -b .CVE-2008-5516
+%patch2 -p1 -b .CVE-2008-5517
 
 %build
 make %{_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" \
@@ -196,6 +200,9 @@
 
 
 %changelog
+* Mon Jan 12 2009 Todd Zullinger <tmz at pobox.com> 1.5.4.7-2
+- Backport gitweb fixes for CVE-2008-5516 and CVE-2008-5517 (bug 479715)
+
 * Sat Dec 20 2008 James Bowes <jbowes at redhat.com> 1.5.4.7-1
 - Update to latest maintenence release.
 



From spot at fedoraproject.org  Wed Jan 14 19:28:49 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Wed, 14 Jan 2009 19:28:49 +0000 (UTC)
Subject: rpms/pdsh/F-10 pdsh.spec,1.11,1.12 sources,1.5,1.6
Message-ID: <20090114192849.5CD1270136@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/pdsh/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32206/F-10

Modified Files:
	pdsh.spec sources 
Log Message:
fix netgroup, update to 2.17


Index: pdsh.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pdsh/F-10/pdsh.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- pdsh.spec	28 Aug 2008 15:32:48 -0000	1.11
+++ pdsh.spec	14 Jan 2009 19:28:18 -0000	1.12
@@ -1,20 +1,17 @@
 Name: pdsh
-Version: 2.16
+Version: 2.17
 Release: 1%{?dist}
 Summary: Parallel remote shell program
 License: GPLv2+
 Url: http://sourceforge.net/projects/pdsh/
 Group: System Environment/Base
 Source0: http://dl.sourceforge.net/sourceforge/pdsh/pdsh-%{version}.tar.bz2
-# Filed upstream:
-# http://sourceforge.net/tracker/index.php?func=detail&aid=2080721&group_id=33530&atid=408635
-Patch0: pdsh-2.16-ARG_MAX.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: pdsh-rcmd
 
 # Enabling and disabling pdsh options
 #  defaults:
-#  enabled:  readline, rsh, ssh, dshgroup, netgroups, debug
+#  enabled:  readline, rsh, ssh, dshgroup, netgroup, debug
 #  disabled: rms, mrsh, qshell, mqshell, xcpu, genders, nodeattr, machines,
 #            nodeupdown, slurm
 #
@@ -35,7 +32,7 @@
 %{!?_with_rsh: %{!?_without_rsh: %define _with_rsh --with-rsh}}
 %{!?_with_ssh: %{!?_without_ssh: %define _with_ssh --with-ssh}}
 %{!?_with_dshgroups: %{!?_without_dshgroups: %define _with_dshgroups --with-dshgroups}}
-%{!?_with_netgroups: %{!?_without_netgroups: %define _with_netgroups --with-netgroups}}
+%{!?_with_netgroup: %{!?_without_netgroup: %define _with_netgroup --with-netgroup}}
 %{!?_with_debug: %{!?_without_debug: %define _with_debug --with-debug}}
 # These are default DISABLED.
 %{!?_with_rms: %{!?_without_rms: %define _without_rms --without-rms}}
@@ -217,7 +214,6 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .ARG_MAX
 
 %build
 %configure \
@@ -328,7 +324,7 @@
 
 %if %{?_with_nodeattr:1}%{!?_with_nodeattr:0}
 %files mod-nodeattr
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %{_libdir}/pdsh/nodeattr.*
 %endif
 
@@ -340,37 +336,37 @@
 
 %if %{?_with_rms:1}%{!?_with_rms:0}
 %files mod-rms
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %{_libdir}/pdsh/rms.*
 %endif
 
 %if %{?_with_machines:1}%{!?_with_machines:0}
 %files mod-machines
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %{_libdir}/pdsh/machines.*
 %endif
 
 %if %{?_with_dshgroups:1}%{!?_with_dshgroups:0}
 %files mod-dshgroup
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %{_libdir}/pdsh/dshgroup.*
 %endif
 
 %if %{?_with_netgroup:1}%{!?_with_netgroup:0}
 %files mod-netgroup
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %{_libdir}/pdsh/netgroup.*
 %endif
 
 %if %{?_with_slurm:1}%{!?_with_slurm:0}
 %files mod-slurm
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %{_libdir}/pdsh/slurm.*
 %endif
 
 %if %{?_with_qshell:1}%{!?_with_qshell:0}
 %files qshd
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %{_sbindir}/in.qshd
 %{_sysconfdir}/xinetd.d/qshell
 
@@ -397,6 +393,10 @@
 %endif
 
 %changelog
+* Wed Jan 14 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 2.17-1
+- update to 2.17
+- fix netgroup
+
 * Thu Aug 28 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 2.16-1
 - attempt to make this package suck... less.
 - fix license tag


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pdsh/F-10/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	28 Aug 2008 15:32:48 -0000	1.5
+++ sources	14 Jan 2009 19:28:19 -0000	1.6
@@ -1 +1 @@
-44a6905b56eabe7efda9f399699b0b11  pdsh-2.16.tar.bz2
+94c5ca03a3e4bd221aa54e3cb452bea5  pdsh-2.17.tar.bz2



From spot at fedoraproject.org  Wed Jan 14 19:28:49 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Wed, 14 Jan 2009 19:28:49 +0000 (UTC)
Subject: rpms/pdsh/devel .cvsignore, 1.5, 1.6 pdsh.spec, 1.11, 1.12 sources, 
	1.5, 1.6
Message-ID: <20090114192849.7F74570136@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/pdsh/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32206/devel

Modified Files:
	.cvsignore pdsh.spec sources 
Log Message:
fix netgroup, update to 2.17


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pdsh/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	28 Aug 2008 15:32:47 -0000	1.5
+++ .cvsignore	14 Jan 2009 19:28:19 -0000	1.6
@@ -1 +1 @@
-pdsh-2.16.tar.bz2
+pdsh-2.17.tar.bz2


Index: pdsh.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pdsh/devel/pdsh.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- pdsh.spec	28 Aug 2008 15:32:48 -0000	1.11
+++ pdsh.spec	14 Jan 2009 19:28:19 -0000	1.12
@@ -1,20 +1,17 @@
 Name: pdsh
-Version: 2.16
+Version: 2.17
 Release: 1%{?dist}
 Summary: Parallel remote shell program
 License: GPLv2+
 Url: http://sourceforge.net/projects/pdsh/
 Group: System Environment/Base
 Source0: http://dl.sourceforge.net/sourceforge/pdsh/pdsh-%{version}.tar.bz2
-# Filed upstream:
-# http://sourceforge.net/tracker/index.php?func=detail&aid=2080721&group_id=33530&atid=408635
-Patch0: pdsh-2.16-ARG_MAX.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: pdsh-rcmd
 
 # Enabling and disabling pdsh options
 #  defaults:
-#  enabled:  readline, rsh, ssh, dshgroup, netgroups, debug
+#  enabled:  readline, rsh, ssh, dshgroup, netgroup, debug
 #  disabled: rms, mrsh, qshell, mqshell, xcpu, genders, nodeattr, machines,
 #            nodeupdown, slurm
 #
@@ -35,7 +32,7 @@
 %{!?_with_rsh: %{!?_without_rsh: %define _with_rsh --with-rsh}}
 %{!?_with_ssh: %{!?_without_ssh: %define _with_ssh --with-ssh}}
 %{!?_with_dshgroups: %{!?_without_dshgroups: %define _with_dshgroups --with-dshgroups}}
-%{!?_with_netgroups: %{!?_without_netgroups: %define _with_netgroups --with-netgroups}}
+%{!?_with_netgroup: %{!?_without_netgroup: %define _with_netgroup --with-netgroup}}
 %{!?_with_debug: %{!?_without_debug: %define _with_debug --with-debug}}
 # These are default DISABLED.
 %{!?_with_rms: %{!?_without_rms: %define _without_rms --without-rms}}
@@ -217,7 +214,6 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .ARG_MAX
 
 %build
 %configure \
@@ -328,7 +324,7 @@
 
 %if %{?_with_nodeattr:1}%{!?_with_nodeattr:0}
 %files mod-nodeattr
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %{_libdir}/pdsh/nodeattr.*
 %endif
 
@@ -340,37 +336,37 @@
 
 %if %{?_with_rms:1}%{!?_with_rms:0}
 %files mod-rms
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %{_libdir}/pdsh/rms.*
 %endif
 
 %if %{?_with_machines:1}%{!?_with_machines:0}
 %files mod-machines
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %{_libdir}/pdsh/machines.*
 %endif
 
 %if %{?_with_dshgroups:1}%{!?_with_dshgroups:0}
 %files mod-dshgroup
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %{_libdir}/pdsh/dshgroup.*
 %endif
 
 %if %{?_with_netgroup:1}%{!?_with_netgroup:0}
 %files mod-netgroup
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %{_libdir}/pdsh/netgroup.*
 %endif
 
 %if %{?_with_slurm:1}%{!?_with_slurm:0}
 %files mod-slurm
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %{_libdir}/pdsh/slurm.*
 %endif
 
 %if %{?_with_qshell:1}%{!?_with_qshell:0}
 %files qshd
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %{_sbindir}/in.qshd
 %{_sysconfdir}/xinetd.d/qshell
 
@@ -397,6 +393,10 @@
 %endif
 
 %changelog
+* Wed Jan 14 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 2.17-1
+- update to 2.17
+- fix netgroup
+
 * Thu Aug 28 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 2.16-1
 - attempt to make this package suck... less.
 - fix license tag


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pdsh/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	28 Aug 2008 15:32:48 -0000	1.5
+++ sources	14 Jan 2009 19:28:19 -0000	1.6
@@ -1 +1 @@
-44a6905b56eabe7efda9f399699b0b11  pdsh-2.16.tar.bz2
+94c5ca03a3e4bd221aa54e3cb452bea5  pdsh-2.17.tar.bz2



From orion at fedoraproject.org  Wed Jan 14 19:41:51 2009
From: orion at fedoraproject.org (Orion Poplawski)
Date: Wed, 14 Jan 2009 19:41:51 +0000 (UTC)
Subject: rpms/R-multcomp/devel .cvsignore, 1.8, 1.9 R-multcomp.spec, 1.10,
	1.11 sources, 1.8, 1.9
Message-ID: <20090114194151.27D0F70136@cvs1.fedora.phx.redhat.com>

Author: orion

Update of /cvs/pkgs/rpms/R-multcomp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv531

Modified Files:
	.cvsignore R-multcomp.spec sources 
Log Message:
* Wed Jan 14 2009 Orion Poplawski <orion at cora.nwra.com> - 1.0-3
- Update to 1.0-5



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/R-multcomp/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	23 Oct 2008 15:18:09 -0000	1.8
+++ .cvsignore	14 Jan 2009 19:41:20 -0000	1.9
@@ -1 +1 @@
-multcomp_1.0-3.tar.gz
+multcomp_1.0-5.tar.gz


Index: R-multcomp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/R-multcomp/devel/R-multcomp.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- R-multcomp.spec	23 Oct 2008 15:18:09 -0000	1.10
+++ R-multcomp.spec	14 Jan 2009 19:41:20 -0000	1.11
@@ -1,10 +1,10 @@
 %define packname multcomp
-%define packrel  3
+%define packrel  5
 
 Summary:	Simultaneous inference for general linear hypotheses R Package
 Name:		R-%{packname}
 Version:	1.0
-Release:	2%{?dist}
+Release:	3%{?dist}
 License:	GPLv2
 Group:		Applications/Engineering
 Source0:	http://cran.r-project.org/src/contrib/%{packname}_%{version}-%{packrel}.tar.gz
@@ -27,8 +27,6 @@
 
 %prep
 %setup -q -c -n %{packname}
-#Delete stray file
-rm multcomp/inst/svn-commit.tmp
 
 
 %build
@@ -86,6 +84,9 @@
 
 
 %changelog
+* Wed Jan 14 2009 Orion Poplawski <orion at cora.nwra.com> - 1.0-3
+- Update to 1.0-5
+
 * Thu Oct 23 2008 Orion Poplawski <orion at cora.nwra.com> - 1.0-2
 - Update to 1.0-3
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/R-multcomp/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	23 Oct 2008 15:18:09 -0000	1.8
+++ sources	14 Jan 2009 19:41:20 -0000	1.9
@@ -1 +1 @@
-508a6b18f56254c406b2ae5638132d15  multcomp_1.0-3.tar.gz
+06dc644538cb11258730c912868dbb9e  multcomp_1.0-5.tar.gz



From akurtakov at fedoraproject.org  Wed Jan 14 20:11:40 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Wed, 14 Jan 2009 20:11:40 +0000 (UTC)
Subject: rpms/eclipse-pydev/devel .cvsignore, 1.13, 1.14 sources, 1.13,
	1.14 eclipse-pydev.spec, 1.20, 1.21
Message-ID: <20090114201141.0097970136@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/eclipse-pydev/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3480/devel

Modified Files:
	.cvsignore sources eclipse-pydev.spec 
Log Message:
Update to 1.4.2.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-pydev/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	5 Jan 2009 08:27:35 -0000	1.13
+++ .cvsignore	14 Jan 2009 20:11:10 -0000	1.14
@@ -4,3 +4,4 @@
 org.python.pydev.feature-src-1_3_23.zip
 org.python.pydev.feature-src-1_3_24.zip
 org.python.pydev.feature-src-1_4_0.zip
+org.python.pydev.feature-src-1_4_2.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-pydev/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	5 Jan 2009 08:27:35 -0000	1.13
+++ sources	14 Jan 2009 20:11:10 -0000	1.14
@@ -1,2 +1,2 @@
 3a42402df10a42af0a8d648711c36239  org.python.pydev.mylyn.feature-fetched-src-pydev_1_3_7.tar.bz2
-bbc66c7501ef55179c331121239fa289  org.python.pydev.feature-src-1_4_0.zip
+22b7dbf332b2c53372154f5ba651a41a  org.python.pydev.feature-src-1_4_2.zip


Index: eclipse-pydev.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-pydev/devel/eclipse-pydev.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- eclipse-pydev.spec	5 Jan 2009 08:27:35 -0000	1.20
+++ eclipse-pydev.spec	14 Jan 2009 20:11:10 -0000	1.21
@@ -5,7 +5,7 @@
 
 %define major     1
 %define minor     4
-%define maint     0
+%define maint     2
 Summary:          Eclipse Python development plug-in
 Name:             eclipse-pydev
 Version:          %{major}.%{minor}.%{maint}
@@ -209,6 +209,9 @@
 %{install_loc}/pydev-mylyn
 
 %changelog
+* Wed Jan 14 2009 Alexander Kurtakov <akurtako at redhat.com> 1:1.4.2-1
+- Update to 1.4.2.
+
 * Thu Dec 25 2008 Alexander Kurtakov <akurtako at redhat.com> 1:1.4.0-1
 - Update to 1.4.0 - adds support for Python 2.6/3.0.
 - Use system jakarta-commons-logging and xmlrpc3.



From nsantos at fedoraproject.org  Wed Jan 14 20:41:05 2009
From: nsantos at fedoraproject.org (Nuno Santos)
Date: Wed, 14 Jan 2009 20:41:05 +0000 (UTC)
Subject: rpms/amqp/F-10 .cvsignore, 1.11, 1.12 amqp.spec, 1.16, 1.17 sources,
	1.14, 1.15
Message-ID: <20090114204105.5DE3670136@cvs1.fedora.phx.redhat.com>

Author: nsantos

Update of /cvs/extras/rpms/amqp/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6088

Modified Files:
	.cvsignore amqp.spec sources 
Log Message:
Rebased to svn rev 734452


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/amqp/F-10/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	23 Dec 2008 15:44:56 -0000	1.11
+++ .cvsignore	14 Jan 2009 20:40:34 -0000	1.12
@@ -1 +1 @@
-amqp-1.0.728142.tar.gz
+amqp-1.0.734452.tar.gz


Index: amqp.spec
===================================================================
RCS file: /cvs/extras/rpms/amqp/F-10/amqp.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- amqp.spec	23 Dec 2008 16:20:57 -0000	1.16
+++ amqp.spec	14 Jan 2009 20:40:34 -0000	1.17
@@ -1,6 +1,6 @@
 Name:           amqp
-Version:        1.0.728142
-Release:        2%{?dist}
+Version:        1.0.734452
+Release:        1%{?dist}
 Epoch:          0
 Summary:        The AMQP specification
 
@@ -39,6 +39,9 @@
 
 
 %changelog
+* Wed Jan 14 2009 Nuno Santos <nsantos at redhat.com> - 0:1.0.734452-1
+- Rebased to svn rev 734452
+
 * Tue Dec 23 2008 Nuno Santos <nsantos at redhat.com> - 0:1.0.728142-2
 - Rebased to svn rev 728142
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/amqp/F-10/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	23 Dec 2008 15:44:56 -0000	1.14
+++ sources	14 Jan 2009 20:40:34 -0000	1.15
@@ -1 +1 @@
-c5981e60692fe413c430a46433793e65  amqp-1.0.728142.tar.gz
+201602662e6a756afe2167b9650d787b  amqp-1.0.734452.tar.gz



From akurtakov at fedoraproject.org  Wed Jan 14 20:50:37 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Wed, 14 Jan 2009 20:50:37 +0000 (UTC)
Subject: rpms/eclipse-pydev/F-10 sources, 1.12, 1.13 .cvsignore, 1.12,
	1.13 eclipse-pydev.spec, 1.18, 1.19
Message-ID: <20090114205037.E052270136@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/eclipse-pydev/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6908/F-10

Modified Files:
	sources .cvsignore eclipse-pydev.spec 
Log Message:
new release 1.4.2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-pydev/F-10/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	27 Oct 2008 20:47:50 -0000	1.12
+++ sources	14 Jan 2009 20:50:07 -0000	1.13
@@ -1,2 +1,2 @@
 3a42402df10a42af0a8d648711c36239  org.python.pydev.mylyn.feature-fetched-src-pydev_1_3_7.tar.bz2
-d1569c0e4264bbdfa34fe9339560baa5  org.python.pydev.feature-src-1_3_24.zip
+22b7dbf332b2c53372154f5ba651a41a  org.python.pydev.feature-src-1_4_2.zip


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-pydev/F-10/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	27 Oct 2008 20:47:50 -0000	1.12
+++ .cvsignore	14 Jan 2009 20:50:07 -0000	1.13
@@ -3,3 +3,4 @@
 org.python.pydev.feature-src-1_3_22.zip
 org.python.pydev.feature-src-1_3_23.zip
 org.python.pydev.feature-src-1_3_24.zip
+org.python.pydev.feature-src-1_4_2.zip


Index: eclipse-pydev.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-pydev/F-10/eclipse-pydev.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- eclipse-pydev.spec	15 Dec 2008 10:33:30 -0000	1.18
+++ eclipse-pydev.spec	14 Jan 2009 20:50:07 -0000	1.19
@@ -3,12 +3,12 @@
 %define eclipse_base        %{_libdir}/eclipse
 
 %define major     1
-%define minor     3
-%define maint     24
+%define minor     4
+%define maint     2
 Summary:          Eclipse Python development plug-in
 Name:             eclipse-pydev
 Version:          %{major}.%{minor}.%{maint}
-Release:          3%{?dist}
+Release:          1%{?dist}
 License:          EPL
 URL:              http://pydev.sourceforge.net
 Group:            Development/Tools
@@ -176,6 +176,9 @@
 %endif 
 
 %changelog
+* Wed Jan 14 2009 Alexander Kurtakov <akurtako at redhat.com> 1:1.4.2-1
+- 1.4.2
+
 * Thu Dec 11 2008 Alexander Kurtakov <akurtako at redhat.com> 1:1.3.24-3
 - Make it arch package and require python-psyco only on x86.
 



From cdamian at fedoraproject.org  Wed Jan 14 21:02:48 2009
From: cdamian at fedoraproject.org (Christof Damian)
Date: Wed, 14 Jan 2009 21:02:48 +0000 (UTC)
Subject: rpms/python-progressbar/EL-5 import.log, NONE,
	1.1 python-progressbar.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090114210248.BECCC70136@cvs1.fedora.phx.redhat.com>

Author: cdamian

Update of /cvs/pkgs/rpms/python-progressbar/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8759/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	import.log python-progressbar.spec 
Log Message:
initial import of python-progressbar-2.2-5 from the package review



--- NEW FILE import.log ---
python-progressbar-2_2-5_fc10:EL-5:python-progressbar-2.2-5.fc10.src.rpm:1231966554


--- NEW FILE python-progressbar.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

%define realname progressbar

Name:           python-%{realname}
Version:        2.2
Release:        5%{?dist}
Summary:        Text progressbar library for python

Group:          Development/Libraries
License:        LGPLv2+ 
URL:            http://pypi.python.org/pypi/%{realname}/
Source0:        http://pypi.python.org/packages/source/p/%{realname}/%{realname}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  python-devel
BuildArch:      noarch

%description

This library provides a text mode progress bar. This is typically used to 
display the progress of a long running operation, providing a visual clue that 
processing is under way.

The progressbar module is very easy to use, yet very powerful. And 
automatically supports features like auto-resizing when available.

%prep
%setup -q -n %{realname}-%{version}


%build
%{__python} setup.py build


%install
rm -rf $RPM_BUILD_ROOT
%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
chmod 0755 $RPM_BUILD_ROOT/%{python_sitelib}/progressbar.py
 
%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc LICENSE
%doc README
%{python_sitelib}/*

%changelog
* Thu Jan 8 2009 Christof Damian <christof at damian.net> 2.2-5
- don't include sitelib in files 

* Thu Jan 8 2009 Christof Damian <christof at damian.net> 2.2-4
- change the attributes of progressbar.py in install

* Thu Jan 8 2009 Christof Damian <christof at damian.net> 2.2-3
- changed attributes for progressbar.py, it contains excuteable examples

* Tue Jan 6 2009 Christof Damian <christof at damian.net> 2.2-2
- remove version from upstream url

* Sat Jan 3 2009 Christof Damian <christof at damian.net> 2.2-1
- initial spec file


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-progressbar/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	11 Jan 2009 17:20:25 -0000	1.1
+++ .cvsignore	14 Jan 2009 21:02:18 -0000	1.2
@@ -0,0 +1 @@
+progressbar-2.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-progressbar/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	11 Jan 2009 17:20:25 -0000	1.1
+++ sources	14 Jan 2009 21:02:18 -0000	1.2
@@ -0,0 +1 @@
+8ea4e2c17a8ec9e7d153767c5f2a7b28  progressbar-2.2.tar.gz



From ausil at fedoraproject.org  Wed Jan 14 21:07:31 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Wed, 14 Jan 2009 21:07:31 +0000 (UTC)
Subject: rpms/vbetool/devel vbetool.spec,1.7,1.8
Message-ID: <20090114210731.A5E0870136@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/vbetool/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9073

Modified Files:
	vbetool.spec 
Log Message:
exclude sparc arches no sys/io.h



Index: vbetool.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vbetool/devel/vbetool.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- vbetool.spec	20 May 2008 19:45:17 -0000	1.7
+++ vbetool.spec	14 Jan 2009 21:07:01 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           vbetool
 Version:        1.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Run real-mode video BIOS code to alter hardware state
 
 Group:          System Environment/Base
@@ -10,10 +10,10 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  zlib-devel pciutils-devel libx86-devel
-# does not build on ppc and ppc64, see #285361 (RedHat Bugzilla)
+# does not build on ppc, ppc64 and sparc arches, see #285361 (RedHat Bugzilla)
 # on ppc sys/io.h is missing, on ppc64 there are more complaints
 # build.logs are attached in the bug report
-ExcludeArch:    ppc ppc64
+ExcludeArch:    ppc ppc64 %{sparc}
 # vbetool is included in (some of) these pm-utils releases
 Conflicts:      pm-utils <= 0.99.3-11
 
@@ -49,6 +49,9 @@
 
 
 %changelog
+* Wed Jan 14 2009 Dennis Gilmore <dennis at ausil.us> - 1.1-2
+- exclude sparc arches missing sys/io.h
+
 * Mon May 19 2008 Matthew Garrett <mjg at redhat.com> - 1.1-1
 - update to version 1.1
 



From tgl at fedoraproject.org  Wed Jan 14 21:11:04 2009
From: tgl at fedoraproject.org (Tom Lane)
Date: Wed, 14 Jan 2009 21:11:04 +0000 (UTC)
Subject: rpms/mysql-connector-odbc/devel myodbc-my-bool.patch, NONE,
	1.1 .cvsignore, 1.6, 1.7 myodbc-multilib.patch, 1.1,
	1.2 myodbc-shutdown.patch, 1.2, 1.3 mysql-connector-odbc.spec,
	1.14, 1.15 sources, 1.6, 1.7
Message-ID: <20090114211105.0439170136@cvs1.fedora.phx.redhat.com>

Author: tgl

Update of /cvs/pkgs/rpms/mysql-connector-odbc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9621

Modified Files:
	.cvsignore myodbc-multilib.patch myodbc-shutdown.patch 
	mysql-connector-odbc.spec sources 
Added Files:
	myodbc-my-bool.patch 
Log Message:
Update to mysql-connector-odbc 5.1.5r1144

myodbc-my-bool.patch:

--- NEW FILE myodbc-my-bool.patch ---
mysql 5.1 include files intentionally break user use of "bool", which is
probably a seriously bad idea; but for now we'll work around it here not
there.


diff -Naur mysql-connector-odbc-5.1.5r1144.orig/driver/myutil.h mysql-connector-odbc-5.1.5r1144/driver/myutil.h
--- mysql-connector-odbc-5.1.5r1144.orig/driver/myutil.h	2008-04-14 21:03:13.000000000 -0400
+++ mysql-connector-odbc-5.1.5r1144/driver/myutil.h	2009-01-14 15:45:46.000000000 -0500
@@ -204,7 +204,7 @@
 				      SQLLEN *pcbValue);
 SQLRETURN SQL_API my_SQLExtendedFetch(SQLHSTMT hstmt, SQLUSMALLINT fFetchType,
 				      SQLROWOFFSET irow, SQLULEN *pcrow,
-				      SQLUSMALLINT FAR *rgfRowStatus, bool upd_status);
+				      SQLUSMALLINT FAR *rgfRowStatus, my_bool upd_status);
 SQLRETURN copy_stmt_error(STMT FAR *src, STMT FAR *dst);
 int unireg_to_c_datatype(MYSQL_FIELD *field);
 int default_c_type(int sql_data_type);
diff -Naur mysql-connector-odbc-5.1.5r1144.orig/driver/results.c mysql-connector-odbc-5.1.5r1144/driver/results.c
--- mysql-connector-odbc-5.1.5r1144.orig/driver/results.c	2008-06-06 15:37:04.000000000 -0400
+++ mysql-connector-odbc-5.1.5r1144/driver/results.c	2009-01-14 15:46:04.000000000 -0500
@@ -1184,7 +1184,7 @@
                                        SQLROWOFFSET         irow,
                                        SQLULEN             *pcrow,
                                        SQLUSMALLINT FAR    *rgfRowStatus,
-                                       bool                 upd_status )
+                                       my_bool              upd_status )
 {
     ulong rows_to_fetch;
     long cur_row, max_row;


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mysql-connector-odbc/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	5 Aug 2008 17:53:22 -0000	1.6
+++ .cvsignore	14 Jan 2009 21:10:34 -0000	1.7
@@ -1 +1 @@
-mysql-connector-odbc-3.51.26r1127.tar.gz
+mysql-connector-odbc-5.1.5r1144.tar.gz

myodbc-multilib.patch:

Index: myodbc-multilib.patch
===================================================================
RCS file: /cvs/pkgs/rpms/mysql-connector-odbc/devel/myodbc-multilib.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- myodbc-multilib.patch	20 Apr 2007 17:58:49 -0000	1.1
+++ myodbc-multilib.patch	14 Jan 2009 21:10:34 -0000	1.2
@@ -1,10 +1,10 @@
 Get rid of useless and pernicious -L/usr/lib
 
 
-diff -Naur mysql-connector-odbc-3.51.14r248.orig/configure.in mysql-connector-odbc-3.51.14r248/configure.in
---- mysql-connector-odbc-3.51.14r248.orig/configure.in	2007-03-08 12:26:58.000000000 -0500
-+++ mysql-connector-odbc-3.51.14r248/configure.in	2007-04-20 13:35:35.000000000 -0400
-@@ -183,7 +183,7 @@
+diff -Naur mysql-connector-odbc-5.1.5r1144.orig/configure.in mysql-connector-odbc-5.1.5r1144/configure.in
+--- mysql-connector-odbc-5.1.5r1144.orig/configure.in	2008-04-16 14:01:58.000000000 -0400
++++ mysql-connector-odbc-5.1.5r1144/configure.in	2009-01-14 15:37:18.000000000 -0500
+@@ -84,7 +84,7 @@
    else
     LTDL_LIB="-L$withval/lib -lltdl"
    fi

myodbc-shutdown.patch:

Index: myodbc-shutdown.patch
===================================================================
RCS file: /cvs/pkgs/rpms/mysql-connector-odbc/devel/myodbc-shutdown.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- myodbc-shutdown.patch	20 Apr 2007 17:58:49 -0000	1.2
+++ myodbc-shutdown.patch	14 Jan 2009 21:10:34 -0000	1.3
@@ -3,10 +3,10 @@
 accounts for our bug #185343 and several bugs filed at mysql.com.
 
 
-diff -Naur mysql-connector-odbc-3.51.14r248.orig/driver/handle.c mysql-connector-odbc-3.51.14r248/driver/handle.c
---- mysql-connector-odbc-3.51.14r248.orig/driver/handle.c	2007-03-07 18:56:40.000000000 -0500
-+++ mysql-connector-odbc-3.51.14r248/driver/handle.c	2007-04-20 13:12:25.000000000 -0400
-@@ -121,7 +121,6 @@
+diff -Naur mysql-connector-odbc-5.1.5r1144.orig/driver/handle.c mysql-connector-odbc-5.1.5r1144/driver/handle.c
+--- mysql-connector-odbc-5.1.5r1144.orig/driver/handle.c	2008-02-23 12:51:58.000000000 -0500
++++ mysql-connector-odbc-5.1.5r1144/driver/handle.c	2009-01-14 15:55:10.000000000 -0500
+@@ -111,7 +111,6 @@
      GlobalFree(GlobalHandle((HGLOBAL) henv));
  #else
      if (henv) my_free((char*) henv,MYF(0));


Index: mysql-connector-odbc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mysql-connector-odbc/devel/mysql-connector-odbc.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- mysql-connector-odbc.spec	5 Aug 2008 17:53:22 -0000	1.14
+++ mysql-connector-odbc.spec	14 Jan 2009 21:10:34 -0000	1.15
@@ -1,14 +1,16 @@
 Summary: ODBC driver for MySQL
 Name: mysql-connector-odbc
-Version: 3.51.26r1127
+Version: 5.1.5r1144
 Release: 1%{?dist}
 Group: System Environment/Libraries
-URL: http://www.mysql.com/downloads/api-myodbc.html
+URL: http://dev.mysql.com/downloads/connector/odbc/5.1.html
 # exceptions allow library to be linked with most open source SW,
 # not only GPL code.
 License: GPLv2 with exceptions
 
 Source: http://dev.mysql.com/downloads/connector/odbc/mysql-connector-odbc-%{version}.tar.gz
+
+Patch1: myodbc-my-bool.patch
 Patch2: myodbc-shutdown.patch
 Patch3: myodbc-multilib.patch
 
@@ -23,6 +25,7 @@
 %prep
 %setup -q
 
+%patch1 -p1
 %patch2 -p1
 %patch3 -p1
 
@@ -51,12 +54,10 @@
 %makeinstall LIBTOOL=/usr/bin/libtool
 
 # Remove stuff not to be packaged (possibly reconsider later)
-rm -f $RPM_BUILD_ROOT%{_bindir}/myodbc3i
-rm -f $RPM_BUILD_ROOT%{_bindir}/myodbc3m
+rm -f $RPM_BUILD_ROOT%{_bindir}/myodbc-installer
 
-# we don't want the static libraries, thanks
-rm -f $RPM_BUILD_ROOT%{_libdir}/libmyodbc3.*a
-rm -f $RPM_BUILD_ROOT%{_libdir}/libmyodbc3_r.*a
+# we don't want static libraries, thanks
+rm -f $RPM_BUILD_ROOT%{_libdir}/libmyodbc5.*a
 
 # makefile thinks it should install docs in totally wrong place
 rm -f $RPM_BUILD_ROOT/usr/share/mysql-connector-odbc/README
@@ -79,6 +80,10 @@
 %{_libdir}/lib*so
 
 %changelog
+* Wed Jan 14 2009 Tom Lane <tgl at redhat.com> 5.1.5r1144-1
+- Update to mysql-connector-odbc 5.1.5r1144, to go with MySQL 5.1.x.
+  Note the library name has changed from libmyodbc3 to libmyodbc5.
+
 * Tue Aug  5 2008 Tom Lane <tgl at redhat.com> 3.51.26r1127-1
 - Update to mysql-connector-odbc 3.51.26r1127
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mysql-connector-odbc/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	5 Aug 2008 17:53:22 -0000	1.6
+++ sources	14 Jan 2009 21:10:34 -0000	1.7
@@ -1 +1 @@
-ad2ac7a7dbef36f0d25bb1cdecc90389  mysql-connector-odbc-3.51.26r1127.tar.gz
+bfe284789154c6071311325415de541c  mysql-connector-odbc-5.1.5r1144.tar.gz



From nsantos at fedoraproject.org  Wed Jan 14 21:11:29 2009
From: nsantos at fedoraproject.org (Nuno Santos)
Date: Wed, 14 Jan 2009 21:11:29 +0000 (UTC)
Subject: rpms/python-qpid/F-10 .cvsignore, 1.10, 1.11 python-qpid.spec, 1.17,
	1.18 sources, 1.14, 1.15
Message-ID: <20090114211129.BE0AD70136@cvs1.fedora.phx.redhat.com>

Author: nsantos

Update of /cvs/extras/rpms/python-qpid/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9701

Modified Files:
	.cvsignore python-qpid.spec sources 
Log Message:
Rebased to svn rev 734452


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-qpid/F-10/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	23 Dec 2008 16:00:38 -0000	1.10
+++ .cvsignore	14 Jan 2009 21:10:59 -0000	1.11
@@ -1 +1 @@
-python-qpid-0.4.728142.tar.gz
+python-qpid-0.4.734452.tar.gz


Index: python-qpid.spec
===================================================================
RCS file: /cvs/extras/rpms/python-qpid/F-10/python-qpid.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- python-qpid.spec	8 Jan 2009 17:49:17 -0000	1.17
+++ python-qpid.spec	14 Jan 2009 21:10:59 -0000	1.18
@@ -1,6 +1,6 @@
 Name:           python-qpid
-Version:        0.4.728142
-Release:        3%{?dist}
+Version:        0.4.734452
+Release:        1%{?dist}
 Summary:        Python language client for AMQP
 
 Group:          Development/Python
@@ -16,7 +16,7 @@
 BuildRequires:  python-devel
 
 Requires:       python
-Requires:       amqp >= 1.0.728142
+Requires:       amqp >= 1.0.734452
 
 %description
 The Apache Qpid project's Python language client for AMQP.
@@ -32,6 +32,7 @@
 chmod 0644 LICENSE.txt
 echo "\n" > cpp_failing_0-8.txt
 echo 'amqp_spec = "%{_datadir}/amqp/amqp.0-10-qpid-errata.xml"' > qpid_config.py
+find examples/ -type f -exec chmod -c 644 {} ';'
 
 %build
 #empty
@@ -69,11 +70,15 @@
 %{python_sitelib}/qmf
 %{_bindir}/python-qpid-tests
 %{_bindir}/qpid-*
-%doc LICENSE.txt NOTICE.txt README.txt doc/test-requirements.txt
+%doc LICENSE.txt NOTICE.txt README.txt doc/test-requirements.txt examples/
 
 
 
 %changelog
+* Wed Jan 14 2009 Nuno Santos <nsantos at redhat.com> - 0.4.734452-1
+- Rebased to svn rev 734452
+- BZ 478467: include examples
+
 * Thu Jan  8 2009 Nuno Santos <nsantos at redhat.com> - 0.4.728142-3
 - BZ 479212: add qmf dirs
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-qpid/F-10/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	23 Dec 2008 16:00:38 -0000	1.14
+++ sources	14 Jan 2009 21:10:59 -0000	1.15
@@ -1 +1 @@
-8d66db177502bc8ebcf86b426779f74e  python-qpid-0.4.728142.tar.gz
+cb50d8ba6012bbc674c2d87860d4838d  python-qpid-0.4.734452.tar.gz



From cdamian at fedoraproject.org  Wed Jan 14 21:14:55 2009
From: cdamian at fedoraproject.org (Christof Damian)
Date: Wed, 14 Jan 2009 21:14:55 +0000 (UTC)
Subject: rpms/python-progressbar/F-10 import.log, NONE,
	1.1 python-progressbar.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090114211455.2B52F70136@cvs1.fedora.phx.redhat.com>

Author: cdamian

Update of /cvs/pkgs/rpms/python-progressbar/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9967/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	import.log python-progressbar.spec 
Log Message:
initial import of python-progressbar-2.2-5 from the package review



--- NEW FILE import.log ---
python-progressbar-2_2-5_fc10:F-10:python-progressbar-2.2-5.fc10.src.rpm:1231967371


--- NEW FILE python-progressbar.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

%define realname progressbar

Name:           python-%{realname}
Version:        2.2
Release:        5%{?dist}
Summary:        Text progressbar library for python

Group:          Development/Libraries
License:        LGPLv2+ 
URL:            http://pypi.python.org/pypi/%{realname}/
Source0:        http://pypi.python.org/packages/source/p/%{realname}/%{realname}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  python-devel
BuildArch:      noarch

%description

This library provides a text mode progress bar. This is typically used to 
display the progress of a long running operation, providing a visual clue that 
processing is under way.

The progressbar module is very easy to use, yet very powerful. And 
automatically supports features like auto-resizing when available.

%prep
%setup -q -n %{realname}-%{version}


%build
%{__python} setup.py build


%install
rm -rf $RPM_BUILD_ROOT
%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
chmod 0755 $RPM_BUILD_ROOT/%{python_sitelib}/progressbar.py
 
%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc LICENSE
%doc README
%{python_sitelib}/*

%changelog
* Thu Jan 8 2009 Christof Damian <christof at damian.net> 2.2-5
- don't include sitelib in files 

* Thu Jan 8 2009 Christof Damian <christof at damian.net> 2.2-4
- change the attributes of progressbar.py in install

* Thu Jan 8 2009 Christof Damian <christof at damian.net> 2.2-3
- changed attributes for progressbar.py, it contains excuteable examples

* Tue Jan 6 2009 Christof Damian <christof at damian.net> 2.2-2
- remove version from upstream url

* Sat Jan 3 2009 Christof Damian <christof at damian.net> 2.2-1
- initial spec file


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-progressbar/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	11 Jan 2009 17:20:25 -0000	1.1
+++ .cvsignore	14 Jan 2009 21:14:24 -0000	1.2
@@ -0,0 +1 @@
+progressbar-2.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-progressbar/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	11 Jan 2009 17:20:25 -0000	1.1
+++ sources	14 Jan 2009 21:14:24 -0000	1.2
@@ -0,0 +1 @@
+8ea4e2c17a8ec9e7d153767c5f2a7b28  progressbar-2.2.tar.gz



From georgiou at fedoraproject.org  Wed Jan 14 21:14:51 2009
From: georgiou at fedoraproject.org (Kostas Georgiou)
Date: Wed, 14 Jan 2009 21:14:51 +0000 (UTC)
Subject: rpms/ganglia/devel gmetad-bof-dos.patch, NONE, 1.1 ganglia.spec,
	1.22, 1.23
Message-ID: <20090114211451.6CDFD70136@cvs1.fedora.phx.redhat.com>

Author: georgiou

Update of /cvs/extras/rpms/ganglia/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9293

Modified Files:
	ganglia.spec 
Added Files:
	gmetad-bof-dos.patch 
Log Message:
Fix gmetad buffer overflow


gmetad-bof-dos.patch:

--- NEW FILE gmetad-bof-dos.patch ---
--- gmetad/server.c.orig	2009-01-09 00:30:10.000000000 +0800
+++ gmetad/server.c	2009-01-09 00:42:52.000000000 +0800
@@ -11,6 +11,7 @@
 #include "dtd.h"
 #include "gmetad.h"
 #include "my_inet_ntop.h"
+#include <stdlib.h>
 
 extern g_tcp_socket *server_socket;
 extern pthread_mutex_t  server_socket_mutex;
@@ -377,7 +378,7 @@
 process_path (client_t *client, char *path, datum_t *myroot, datum_t *key)
 {
    char *p, *q, *pathend;
-   char element[256];
+   char *element;
    int rc, len;
    datum_t *found;
    datum_t findkey;
@@ -419,6 +420,8 @@
          if (!q) q=pathend;
       
          len = q-p;
+         /* +1 not needed as q-p is already accounting for that */
+         element = malloc(len);
          strncpy(element, p, len);
          element[len] = '\0';
       
@@ -435,10 +438,13 @@
                rc = process_path(client, q, found, &findkey);
                
                datum_free(found);
+               free(element);
             }
          else
             {
-               rc = process_path(client, 0, myroot, NULL);
+               /* element not found */
+               free(element);
+               return 1;
             }
       }
    if (rc) return 1;
@@ -600,8 +606,8 @@
                if (process_request(&client, request))
                   {
                      err_msg("Got a malformed path request from %s", remote_ip);
-                     /* Send them the entire tree to discourage attacks. */
-                     strcpy(request, "/");
+                     close(client.fd);
+                     continue;
                   }
             }
          else


Index: ganglia.spec
===================================================================
RCS file: /cvs/extras/rpms/ganglia/devel/ganglia.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- ganglia.spec	1 Dec 2008 05:03:46 -0000	1.22
+++ ganglia.spec	14 Jan 2009 21:14:20 -0000	1.23
@@ -1,6 +1,6 @@
 Name:               ganglia
 Version:            3.1.1
-Release:            2%{?svnrev:.r%{svnrev}}%{?dist}
+Release:            3%{?svnrev:.r%{svnrev}}%{?dist}
 Summary:            Ganglia Distributed Monitoring System
 
 Group:              Applications/Internet
@@ -9,6 +9,7 @@
 Source0:            http://dl.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.gz
 #Source0:            http://www.ganglia.info/snapshots/3.1.x/%{name}-%{version}.%{svnrev}.tar.gz
 Patch0:             diskusage-fix.patch
+Patch1:             gmetad-bof-dos.patch
 Buildroot:          %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:      rrdtool-devel, apr-devel >= 1
@@ -89,6 +90,7 @@
 %prep
 %setup -q -n %{name}-%{version}%{?svnrev:.%{svnrev}}
 %patch0 -p0
+%patch1 -p0
 ## Hey, those shouldn't be executable...
 chmod -x lib/*.{h,x}
 
@@ -264,11 +266,15 @@
 %defattr(-,root,root,-)
 %doc web/AUTHORS web/COPYING
 %config(noreplace) %{_sysconfdir}/%{name}/conf.php
-%config(noreplace) %{_sysconfdir}/%{name}/private_clusters
+%attr(0640,root,apache) %config(noreplace) %{_sysconfdir}/%{name}/private_clusters
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/%{name}.conf
 %{_datadir}/%{name}
 
 %changelog
+* Wed Jan 14 2009 Kostas Georgiou <k.georgiou at imperial.ac.uk> - 3.1.1-3
+- Fix for gmetad server buffer overflow
+- The private_clusters file should not be readable by everyone
+
 * Sun Nov 30 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 3.1.1-2
 - Rebuild for Python 2.6
 



From pkgdb at fedoraproject.org  Wed Jan 14 21:17:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 14 Jan 2009 21:17:09 +0000
Subject: [pkgdb] perl-WWW-Curl was added for eponyme
Message-ID: <20090114211709.84120208207@bastion.fedora.phx.redhat.com>

kevin has added Package perl-WWW-Curl with summary Perl extension interface for libcurl
kevin has approved Package perl-WWW-Curl
kevin has added a Fedora devel branch for perl-WWW-Curl with an owner of eponyme
kevin has approved perl-WWW-Curl in Fedora devel
kevin has approved Package perl-WWW-Curl
kevin has set commit to Approved for provenpackager on perl-WWW-Curl (Fedora devel)
kevin has set build to Approved for provenpackager on perl-WWW-Curl (Fedora devel)
kevin has set checkout to Approved for provenpackager on perl-WWW-Curl (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-WWW-Curl



From pkgdb at fedoraproject.org  Wed Jan 14 21:17:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 14 Jan 2009 21:17:11 +0000
Subject: [pkgdb] perl-WWW-Curl (Fedora, 9) updated by kevin
Message-ID: <20090114211711.DE678208458@bastion.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for perl-WWW-Curl
kevin has set commit to Approved for provenpackager on perl-WWW-Curl (Fedora 9)
kevin has set build to Approved for provenpackager on perl-WWW-Curl (Fedora 9)
kevin has set checkout to Approved for provenpackager on perl-WWW-Curl (Fedora 9)
kevin approved watchbugzilla on perl-WWW-Curl (Fedora 9) for perl-sig
kevin approved watchcommits on perl-WWW-Curl (Fedora 9) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-WWW-Curl



From pkgdb at fedoraproject.org  Wed Jan 14 21:17:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 14 Jan 2009 21:17:11 +0000
Subject: [pkgdb] perl-WWW-Curl (Fedora, devel) updated by kevin
Message-ID: <20090114211712.04789208469@bastion.fedora.phx.redhat.com>

kevin approved watchbugzilla on perl-WWW-Curl (Fedora devel) for perl-sig
kevin approved watchcommits on perl-WWW-Curl (Fedora devel) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-WWW-Curl



From kevin at fedoraproject.org  Wed Jan 14 21:17:27 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 14 Jan 2009 21:17:27 +0000 (UTC)
Subject: rpms/perl-WWW-Curl - New directory
Message-ID: <20090114211727.3747070136@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-WWW-Curl
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsD10380/rpms/perl-WWW-Curl

Log Message:
Directory /cvs/pkgs/rpms/perl-WWW-Curl added to the repository




From kevin at fedoraproject.org  Wed Jan 14 21:17:27 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 14 Jan 2009 21:17:27 +0000 (UTC)
Subject: rpms/perl-WWW-Curl/devel - New directory
Message-ID: <20090114211727.7A65D70136@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-WWW-Curl/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsD10380/rpms/perl-WWW-Curl/devel

Log Message:
Directory /cvs/pkgs/rpms/perl-WWW-Curl/devel added to the repository




From pkgdb at fedoraproject.org  Wed Jan 14 21:17:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 14 Jan 2009 21:17:11 +0000
Subject: [pkgdb] perl-WWW-Curl (Fedora, 10) updated by kevin
Message-ID: <20090114211712.2C2A7208470@bastion.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for perl-WWW-Curl
kevin has set commit to Approved for provenpackager on perl-WWW-Curl (Fedora 10)
kevin has set build to Approved for provenpackager on perl-WWW-Curl (Fedora 10)
kevin has set checkout to Approved for provenpackager on perl-WWW-Curl (Fedora 10)
kevin approved watchbugzilla on perl-WWW-Curl (Fedora 10) for perl-sig
kevin approved watchcommits on perl-WWW-Curl (Fedora 10) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-WWW-Curl



From kevin at fedoraproject.org  Wed Jan 14 21:17:45 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 14 Jan 2009 21:17:45 +0000 (UTC)
Subject: rpms/perl-WWW-Curl Makefile,NONE,1.1
Message-ID: <20090114211745.9D3E370136@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-WWW-Curl
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsD10380/rpms/perl-WWW-Curl

Added Files:
	Makefile 
Log Message:
Setup of module perl-WWW-Curl


--- NEW FILE Makefile ---
# Top level Makefile for module perl-WWW-Curl
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Jan 14 21:17:46 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 14 Jan 2009 21:17:46 +0000 (UTC)
Subject: rpms/perl-WWW-Curl/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090114211746.6F2B770136@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-WWW-Curl/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsD10380/rpms/perl-WWW-Curl/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-WWW-Curl


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: perl-WWW-Curl
# $Id: Makefile,v 1.1 2009/01/14 21:17:46 kevin Exp $
NAME := perl-WWW-Curl
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out 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 Jan 14 21:23:13 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 14 Jan 2009 21:23:13 +0000 (UTC)
Subject: rpms/hyphen-pt - New directory
Message-ID: <20090114212313.39D9F70136@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/hyphen-pt
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsf10996/rpms/hyphen-pt

Log Message:
Directory /cvs/pkgs/rpms/hyphen-pt added to the repository




From pkgdb at fedoraproject.org  Wed Jan 14 21:22:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 14 Jan 2009 21:22:54 +0000
Subject: [pkgdb] hyphen-pt was added for caolanm
Message-ID: <20090114212254.B01562081FF@bastion.fedora.phx.redhat.com>

kevin has added Package hyphen-pt with summary Portuguese hyphenation rules
kevin has approved Package hyphen-pt
kevin has added a Fedora devel branch for hyphen-pt with an owner of caolanm
kevin has approved hyphen-pt in Fedora devel
kevin has approved Package hyphen-pt
kevin has set commit to Approved for provenpackager on hyphen-pt (Fedora devel)
kevin has set build to Approved for provenpackager on hyphen-pt (Fedora devel)
kevin has set checkout to Approved for provenpackager on hyphen-pt (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/hyphen-pt



From kevin at fedoraproject.org  Wed Jan 14 21:23:13 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 14 Jan 2009 21:23:13 +0000 (UTC)
Subject: rpms/hyphen-pt/devel - New directory
Message-ID: <20090114212313.7D36D70136@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/hyphen-pt/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsf10996/rpms/hyphen-pt/devel

Log Message:
Directory /cvs/pkgs/rpms/hyphen-pt/devel added to the repository




From kevin at fedoraproject.org  Wed Jan 14 21:23:30 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 14 Jan 2009 21:23:30 +0000 (UTC)
Subject: rpms/hyphen-pt Makefile,NONE,1.1
Message-ID: <20090114212330.81AD870136@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/hyphen-pt
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsf10996/rpms/hyphen-pt

Added Files:
	Makefile 
Log Message:
Setup of module hyphen-pt


--- NEW FILE Makefile ---
# Top level Makefile for module hyphen-pt
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Jan 14 21:23:30 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 14 Jan 2009 21:23:30 +0000 (UTC)
Subject: rpms/hyphen-pt/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090114212330.CF12070136@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/hyphen-pt/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsf10996/rpms/hyphen-pt/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module hyphen-pt


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: hyphen-pt
# $Id: Makefile,v 1.1 2009/01/14 21:23:30 kevin Exp $
NAME := hyphen-pt
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Jan 14 21:23:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 14 Jan 2009 21:23:32 +0000
Subject: [pkgdb] hyphen-ro was added for caolanm
Message-ID: <20090114212332.6D4C7208458@bastion.fedora.phx.redhat.com>

kevin has added Package hyphen-ro with summary Romanian hyphenation rules
kevin has approved Package hyphen-ro
kevin has added a Fedora devel branch for hyphen-ro with an owner of caolanm
kevin has approved hyphen-ro in Fedora devel
kevin has approved Package hyphen-ro
kevin has set commit to Approved for provenpackager on hyphen-ro (Fedora devel)
kevin has set build to Approved for provenpackager on hyphen-ro (Fedora devel)
kevin has set checkout to Approved for provenpackager on hyphen-ro (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/hyphen-ro



From kevin at fedoraproject.org  Wed Jan 14 21:23:45 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 14 Jan 2009 21:23:45 +0000 (UTC)
Subject: rpms/hyphen-ro - New directory
Message-ID: <20090114212345.2DA1770136@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/hyphen-ro
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsN11116/rpms/hyphen-ro

Log Message:
Directory /cvs/pkgs/rpms/hyphen-ro added to the repository




From kevin at fedoraproject.org  Wed Jan 14 21:23:45 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 14 Jan 2009 21:23:45 +0000 (UTC)
Subject: rpms/hyphen-ro/devel - New directory
Message-ID: <20090114212345.73CC970136@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/hyphen-ro/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsN11116/rpms/hyphen-ro/devel

Log Message:
Directory /cvs/pkgs/rpms/hyphen-ro/devel added to the repository




From kevin at fedoraproject.org  Wed Jan 14 21:24:01 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 14 Jan 2009 21:24:01 +0000 (UTC)
Subject: rpms/hyphen-ro/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090114212401.D948D70141@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/hyphen-ro/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsN11116/rpms/hyphen-ro/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module hyphen-ro


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: hyphen-ro
# $Id: Makefile,v 1.1 2009/01/14 21:24:01 kevin Exp $
NAME := hyphen-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 kevin at fedoraproject.org  Wed Jan 14 21:24:01 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 14 Jan 2009 21:24:01 +0000 (UTC)
Subject: rpms/hyphen-ro Makefile,NONE,1.1
Message-ID: <20090114212401.85C6C70136@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/hyphen-ro
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsN11116/rpms/hyphen-ro

Added Files:
	Makefile 
Log Message:
Setup of module hyphen-ro


--- NEW FILE Makefile ---
# Top level Makefile for module hyphen-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 pkgdb at fedoraproject.org  Wed Jan 14 21:24:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 14 Jan 2009 21:24:26 +0000
Subject: [pkgdb] ocaml-preludeml (Fedora, 10) updated by kevin
Message-ID: <20090114212426.77BCF208457@bastion.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for ocaml-preludeml
kevin has set commit to Approved for provenpackager on ocaml-preludeml (Fedora 10)
kevin has set build to Approved for provenpackager on ocaml-preludeml (Fedora 10)
kevin has set checkout to Approved for provenpackager on ocaml-preludeml (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-preludeml



From pkgdb at fedoraproject.org  Wed Jan 14 21:24:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 14 Jan 2009 21:24:24 +0000
Subject: [pkgdb] ocaml-preludeml was added for rjones
Message-ID: <20090114212424.6FCA52081FF@bastion.fedora.phx.redhat.com>

kevin has added Package ocaml-preludeml with summary OCaml utility functions
kevin has approved Package ocaml-preludeml
kevin has added a Fedora devel branch for ocaml-preludeml with an owner of rjones
kevin has approved ocaml-preludeml in Fedora devel
kevin has approved Package ocaml-preludeml
kevin has set commit to Approved for provenpackager on ocaml-preludeml (Fedora devel)
kevin has set build to Approved for provenpackager on ocaml-preludeml (Fedora devel)
kevin has set checkout to Approved for provenpackager on ocaml-preludeml (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-preludeml



From kevin at fedoraproject.org  Wed Jan 14 21:24:44 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 14 Jan 2009 21:24:44 +0000 (UTC)
Subject: rpms/ocaml-preludeml - New directory
Message-ID: <20090114212444.3103470136@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/ocaml-preludeml
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsa11226/rpms/ocaml-preludeml

Log Message:
Directory /cvs/pkgs/rpms/ocaml-preludeml added to the repository




From kevin at fedoraproject.org  Wed Jan 14 21:24:44 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 14 Jan 2009 21:24:44 +0000 (UTC)
Subject: rpms/ocaml-preludeml/devel - New directory
Message-ID: <20090114212444.874E270136@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/ocaml-preludeml/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsa11226/rpms/ocaml-preludeml/devel

Log Message:
Directory /cvs/pkgs/rpms/ocaml-preludeml/devel added to the repository




From kevin at fedoraproject.org  Wed Jan 14 21:25:03 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 14 Jan 2009 21:25:03 +0000 (UTC)
Subject: rpms/ocaml-preludeml Makefile,NONE,1.1
Message-ID: <20090114212503.06F1A70136@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/ocaml-preludeml
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsa11226/rpms/ocaml-preludeml

Added Files:
	Makefile 
Log Message:
Setup of module ocaml-preludeml


--- NEW FILE Makefile ---
# Top level Makefile for module ocaml-preludeml
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Jan 14 21:25:03 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 14 Jan 2009 21:25:03 +0000 (UTC)
Subject: rpms/ocaml-preludeml/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090114212503.6879D70136@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/ocaml-preludeml/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsa11226/rpms/ocaml-preludeml/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module ocaml-preludeml


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: ocaml-preludeml
# $Id: Makefile,v 1.1 2009/01/14 21:25:03 kevin Exp $
NAME := ocaml-preludeml
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From nsantos at fedoraproject.org  Wed Jan 14 21:25:15 2009
From: nsantos at fedoraproject.org (Nuno Santos)
Date: Wed, 14 Jan 2009 21:25:15 +0000 (UTC)
Subject: rpms/ruby-qpid/F-10 .cvsignore, 1.5, 1.6 ruby-qpid.spec, 1.6,
	1.7 sources, 1.5, 1.6
Message-ID: <20090114212515.32D5770136@cvs1.fedora.phx.redhat.com>

Author: nsantos

Update of /cvs/extras/rpms/ruby-qpid/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11238

Modified Files:
	.cvsignore ruby-qpid.spec sources 
Log Message:
Rebased to svn rev 734452


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ruby-qpid/F-10/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	23 Dec 2008 16:45:00 -0000	1.5
+++ .cvsignore	14 Jan 2009 21:24:44 -0000	1.6
@@ -1 +1 @@
-ruby-qpid-0.4.728142.tar.gz
+ruby-qpid-0.4.734452.tar.gz


Index: ruby-qpid.spec
===================================================================
RCS file: /cvs/extras/rpms/ruby-qpid/F-10/ruby-qpid.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ruby-qpid.spec	23 Dec 2008 16:45:00 -0000	1.6
+++ ruby-qpid.spec	14 Jan 2009 21:24:44 -0000	1.7
@@ -1,5 +1,5 @@
 Name:           ruby-qpid
-Version:	0.4.728142
+Version:	0.4.734452
 Release:        1%{?dist}
 Summary:        Ruby language client for AMQP
 
@@ -18,7 +18,7 @@
 
 Requires:       ruby
 Requires:       ruby(abi) = 1.8
-Requires:       amqp >= 1.0.728142
+Requires:       amqp >= 1.0.734452
 
 Provides:       ruby(qpid) = %{version}
 
@@ -51,6 +51,9 @@
 %doc LICENSE.txt NOTICE.txt
 
 %changelog
+* Wed Jan 14 2009 Nuno Santos <nsantos at redhat.com> - 0.4.734452-1
+- Rebased to svn rev 734452
+
 * Tue Dec 23 2008 Nuno Santos <nsantos at redhat.com> - 0.4.728142-1
 - Rebased to svn rev 728142
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ruby-qpid/F-10/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	23 Dec 2008 16:45:00 -0000	1.5
+++ sources	14 Jan 2009 21:24:44 -0000	1.6
@@ -1 +1 @@
-ab08d2532283b4987498af12c9b5104c  ruby-qpid-0.4.728142.tar.gz
+4a8ef6ba2a2c4b50d100c950ce236e68  ruby-qpid-0.4.734452.tar.gz



From pkgdb at fedoraproject.org  Wed Jan 14 21:25:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 14 Jan 2009 21:25:57 +0000
Subject: [pkgdb] perl-ORLite-Migrate was added for mmaslano
Message-ID: <20090114212558.1E2B42081FF@bastion.fedora.phx.redhat.com>

kevin has added Package perl-ORLite-Migrate with summary light weight SQLite-specific schema migration
kevin has approved Package perl-ORLite-Migrate
kevin has added a Fedora devel branch for perl-ORLite-Migrate with an owner of mmaslano
kevin has approved perl-ORLite-Migrate in Fedora devel
kevin has approved Package perl-ORLite-Migrate
kevin has set commit to Approved for provenpackager on perl-ORLite-Migrate (Fedora devel)
kevin has set build to Approved for provenpackager on perl-ORLite-Migrate (Fedora devel)
kevin has set checkout to Approved for provenpackager on perl-ORLite-Migrate (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-ORLite-Migrate



From pkgdb at fedoraproject.org  Wed Jan 14 21:25:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 14 Jan 2009 21:25:59 +0000
Subject: [pkgdb] perl-ORLite-Migrate (Fedora, devel) updated by kevin
Message-ID: <20090114212600.1FE05208457@bastion.fedora.phx.redhat.com>

kevin approved watchbugzilla on perl-ORLite-Migrate (Fedora devel) for perl-sig
kevin approved watchcommits on perl-ORLite-Migrate (Fedora devel) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-ORLite-Migrate



From kevin at fedoraproject.org  Wed Jan 14 21:26:19 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 14 Jan 2009 21:26:19 +0000 (UTC)
Subject: rpms/perl-ORLite-Migrate - New directory
Message-ID: <20090114212619.33AC170136@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-ORLite-Migrate
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsa11573/rpms/perl-ORLite-Migrate

Log Message:
Directory /cvs/pkgs/rpms/perl-ORLite-Migrate added to the repository




From kevin at fedoraproject.org  Wed Jan 14 21:26:19 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 14 Jan 2009 21:26:19 +0000 (UTC)
Subject: rpms/perl-ORLite-Migrate/devel - New directory
Message-ID: <20090114212619.6F30B70136@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-ORLite-Migrate/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsa11573/rpms/perl-ORLite-Migrate/devel

Log Message:
Directory /cvs/pkgs/rpms/perl-ORLite-Migrate/devel added to the repository




From pkgdb at fedoraproject.org  Wed Jan 14 21:25:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 14 Jan 2009 21:25:59 +0000
Subject: [pkgdb] perl-ORLite-Migrate (Fedora, 10) updated by kevin
Message-ID: <20090114212600.297C0208468@bastion.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for perl-ORLite-Migrate
kevin has set commit to Approved for provenpackager on perl-ORLite-Migrate (Fedora 10)
kevin has set build to Approved for provenpackager on perl-ORLite-Migrate (Fedora 10)
kevin has set checkout to Approved for provenpackager on perl-ORLite-Migrate (Fedora 10)
kevin approved watchbugzilla on perl-ORLite-Migrate (Fedora 10) for perl-sig
kevin approved watchcommits on perl-ORLite-Migrate (Fedora 10) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-ORLite-Migrate



From kevin at fedoraproject.org  Wed Jan 14 21:26:36 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 14 Jan 2009 21:26:36 +0000 (UTC)
Subject: rpms/perl-ORLite-Migrate Makefile,NONE,1.1
Message-ID: <20090114212636.2249770136@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-ORLite-Migrate
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsa11573/rpms/perl-ORLite-Migrate

Added Files:
	Makefile 
Log Message:
Setup of module perl-ORLite-Migrate


--- NEW FILE Makefile ---
# Top level Makefile for module perl-ORLite-Migrate
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Jan 14 21:26:36 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 14 Jan 2009 21:26:36 +0000 (UTC)
Subject: rpms/perl-ORLite-Migrate/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090114212636.642A570136@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-ORLite-Migrate/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsa11573/rpms/perl-ORLite-Migrate/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-ORLite-Migrate


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: perl-ORLite-Migrate
# $Id: Makefile,v 1.1 2009/01/14 21:26:36 kevin Exp $
NAME := perl-ORLite-Migrate
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Jan 14 21:32:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 14 Jan 2009 21:32:30 +0000
Subject: [pkgdb] perl-DDL-Oracle was added for mzazrive
Message-ID: <20090114213230.33729208207@bastion.fedora.phx.redhat.com>

kevin has added Package perl-DDL-Oracle with summary DDL generator for Oracle databases
kevin has approved Package perl-DDL-Oracle
kevin has added a Fedora devel branch for perl-DDL-Oracle with an owner of mzazrive
kevin has approved perl-DDL-Oracle in Fedora devel
kevin has approved Package perl-DDL-Oracle
kevin has set commit to Approved for provenpackager on perl-DDL-Oracle (Fedora devel)
kevin has set build to Approved for provenpackager on perl-DDL-Oracle (Fedora devel)
kevin has set checkout to Approved for provenpackager on perl-DDL-Oracle (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-DDL-Oracle



From pkgdb at fedoraproject.org  Wed Jan 14 21:32:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 14 Jan 2009 21:32:35 +0000
Subject: [pkgdb] perl-DDL-Oracle (Fedora, 9) updated by kevin
Message-ID: <20090114213235.A84D5208467@bastion.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for perl-DDL-Oracle
kevin has set commit to Approved for provenpackager on perl-DDL-Oracle (Fedora 9)
kevin has set build to Approved for provenpackager on perl-DDL-Oracle (Fedora 9)
kevin has set checkout to Approved for provenpackager on perl-DDL-Oracle (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-DDL-Oracle



From pkgdb at fedoraproject.org  Wed Jan 14 21:32:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 14 Jan 2009 21:32:35 +0000
Subject: [pkgdb] perl-DDL-Oracle (Fedora EPEL, 5) updated by kevin
Message-ID: <20090114213235.B198520846C@bastion.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for perl-DDL-Oracle
kevin has set commit to Approved for provenpackager on perl-DDL-Oracle (Fedora EPEL 5)
kevin has set build to Approved for provenpackager on perl-DDL-Oracle (Fedora EPEL 5)
kevin has set checkout to Approved for provenpackager on perl-DDL-Oracle (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-DDL-Oracle



From kevin at fedoraproject.org  Wed Jan 14 21:32:47 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 14 Jan 2009 21:32:47 +0000 (UTC)
Subject: rpms/perl-DDL-Oracle - New directory
Message-ID: <20090114213247.2E3CF70136@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-DDL-Oracle
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsE12846/rpms/perl-DDL-Oracle

Log Message:
Directory /cvs/pkgs/rpms/perl-DDL-Oracle added to the repository




From pkgdb at fedoraproject.org  Wed Jan 14 21:32:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 14 Jan 2009 21:32:35 +0000
Subject: [pkgdb] perl-DDL-Oracle (Fedora, 10) updated by kevin
Message-ID: <20090114213235.BF823208471@bastion.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for perl-DDL-Oracle
kevin has set commit to Approved for provenpackager on perl-DDL-Oracle (Fedora 10)
kevin has set build to Approved for provenpackager on perl-DDL-Oracle (Fedora 10)
kevin has set checkout to Approved for provenpackager on perl-DDL-Oracle (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-DDL-Oracle



From kevin at fedoraproject.org  Wed Jan 14 21:32:47 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 14 Jan 2009 21:32:47 +0000 (UTC)
Subject: rpms/perl-DDL-Oracle/devel - New directory
Message-ID: <20090114213247.7E04B70136@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-DDL-Oracle/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsE12846/rpms/perl-DDL-Oracle/devel

Log Message:
Directory /cvs/pkgs/rpms/perl-DDL-Oracle/devel added to the repository




From kevin at fedoraproject.org  Wed Jan 14 21:33:05 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 14 Jan 2009 21:33:05 +0000 (UTC)
Subject: rpms/perl-DDL-Oracle Makefile,NONE,1.1
Message-ID: <20090114213305.9ACF070136@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-DDL-Oracle
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsE12846/rpms/perl-DDL-Oracle

Added Files:
	Makefile 
Log Message:
Setup of module perl-DDL-Oracle


--- NEW FILE Makefile ---
# Top level Makefile for module perl-DDL-Oracle
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Jan 14 21:33:05 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 14 Jan 2009 21:33:05 +0000 (UTC)
Subject: rpms/perl-DDL-Oracle/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090114213305.E176A70136@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-DDL-Oracle/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsE12846/rpms/perl-DDL-Oracle/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-DDL-Oracle


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: perl-DDL-Oracle
# $Id: Makefile,v 1.1 2009/01/14 21:33:05 kevin Exp $
NAME := perl-DDL-Oracle
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out 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 Jan 14 21:42:17 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Wed, 14 Jan 2009 21:42:17 +0000 (UTC)
Subject: rpms/perl-GDTextUtil/devel perl-GDTextUtil.spec,1.12,1.13
Message-ID: <20090114214217.0C64070136@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/perl-GDTextUtil/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14087

Modified Files:
	perl-GDTextUtil.spec 
Log Message:
do not package font


Index: perl-GDTextUtil.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-GDTextUtil/devel/perl-GDTextUtil.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- perl-GDTextUtil.spec	28 Feb 2008 13:15:39 -0000	1.12
+++ perl-GDTextUtil.spec	14 Jan 2009 21:41:46 -0000	1.13
@@ -1,9 +1,6 @@
-
-%define fontdir %{_datadir}/fonts/perl
-
 Name:           perl-GDTextUtil
 Version:        0.86
-Release:        11%{?dist}
+Release:        12%{?dist}
 Summary:        Text utilities for use with GD
 
 Group:          Development/Libraries
@@ -18,7 +15,6 @@
 BuildRequires:  perl(Test::More)
 
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
-Requires:       fontconfig
 
 %description
 This package provides three modules that make it possible to work with
@@ -30,7 +26,6 @@
 
 %prep
 %setup -q -n GDTextUtil-%{version}
-%{__perl} -pi -e 's/\r\n/\n/' Dustismo.LICENSE
 
 
 %build
@@ -45,11 +40,6 @@
 find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';'
 chmod -R u+w $RPM_BUILD_ROOT/*
 
-# Install the TrueType font
-install -d $RPM_BUILD_ROOT%{fontdir}
-install -p -m 644 Dustismo_Sans.ttf $RPM_BUILD_ROOT%{fontdir}/
-touch $RPM_BUILD_ROOT%{fontdir}/fonts.cache-1
-
 
 %check
 make test
@@ -59,21 +49,17 @@
 rm -rf $RPM_BUILD_ROOT
 
 
-%post
-fc-cache -f %{fontdir} || :
-
-
 %files
 %defattr(-,root,root,-)
-%doc Changes README Dustismo.LICENSE demo/
+%doc Changes README demo/
 %{perl_vendorlib}/GD/
 %{_mandir}/man3/*.3pm*
-%dir %{fontdir}/
-%{fontdir}/*ttf
-%ghost %{fontdir}/fonts.cache-1
 
 
 %changelog
+* Wed Jan 14 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 0.86-12
+- no need to package this font, only used for buildtime tests
+
 * Wed Feb 27 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.86-11
 - Rebuild for perl 5.10 (again)
 



From katzj at fedoraproject.org  Wed Jan 14 21:44:39 2009
From: katzj at fedoraproject.org (Jeremy Katz)
Date: Wed, 14 Jan 2009 21:44:39 +0000 (UTC)
Subject: rpms/mkinitrd/devel .cvsignore, 1.213, 1.214 mkinitrd.spec, 1.306, 
	1.307 sources, 1.255, 1.256
Message-ID: <20090114214439.C290370136@cvs1.fedora.phx.redhat.com>

Author: katzj

Update of /cvs/pkgs/rpms/mkinitrd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14484

Modified Files:
	.cvsignore mkinitrd.spec sources 
Log Message:
* Wed Jan 14 2009 Jeremy Katz <katzj at redhat.com> - 6.0.74-1
- modesetting for live images



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mkinitrd/devel/.cvsignore,v
retrieving revision 1.213
retrieving revision 1.214
diff -u -r1.213 -r1.214
--- .cvsignore	4 Dec 2008 18:28:46 -0000	1.213
+++ .cvsignore	14 Jan 2009 21:44:09 -0000	1.214
@@ -1,2 +1 @@
-clog
-mkinitrd-6.0.73.tar.bz2
+mkinitrd-6.0.74.tar.bz2


Index: mkinitrd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mkinitrd/devel/mkinitrd.spec,v
retrieving revision 1.306
retrieving revision 1.307
diff -u -r1.306 -r1.307
--- mkinitrd.spec	18 Dec 2008 21:07:04 -0000	1.306
+++ mkinitrd.spec	14 Jan 2009 21:44:09 -0000	1.307
@@ -2,8 +2,8 @@
 
 Summary: Creates an initial ramdisk image for preloading modules.
 Name: mkinitrd
-Version: 6.0.73
-Release: 7%{?dist}
+Version: 6.0.74
+Release: 1%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source0: mkinitrd-%{version}.tar.bz2
@@ -136,6 +136,9 @@
 %dir %{_sysconfdir}/kernel/prerm.d
 
 %changelog
+* Wed Jan 14 2009 Jeremy Katz <katzj at redhat.com> - 6.0.74-1
+- modesetting for live images
+
 * Thu Dec 18 2008 Jeremy Katz <katzj at redhat.com> - 6.0.73-7
 - Split grubby/new-kernel-pkg into their own package
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mkinitrd/devel/sources,v
retrieving revision 1.255
retrieving revision 1.256
diff -u -r1.255 -r1.256
--- sources	4 Dec 2008 18:28:46 -0000	1.255
+++ sources	14 Jan 2009 21:44:09 -0000	1.256
@@ -1 +1 @@
-e106484924ad5c62b3dd384c32d77775  mkinitrd-6.0.73.tar.bz2
+8f11feba21f89d6428a01f18e2e79081  mkinitrd-6.0.74.tar.bz2



From jwilson at fedoraproject.org  Wed Jan 14 21:49:00 2009
From: jwilson at fedoraproject.org (Jarod Wilson)
Date: Wed, 14 Jan 2009 21:49:00 +0000 (UTC)
Subject: rpms/libraw1394/F-10
	libraw1394-use-errno-ENOSYS-in-unimplemented-functions.patch,
	NONE, 1.1 libraw1394-work-without-write-on-local-node-dev.patch,
	NONE, 1.1 libraw1394.spec, 1.49, 1.50
Message-ID: <20090114214900.14A9370136@cvs1.fedora.phx.redhat.com>

Author: jwilson

Update of /cvs/pkgs/rpms/libraw1394/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14920

Modified Files:
	libraw1394.spec 
Added Files:
	libraw1394-use-errno-ENOSYS-in-unimplemented-functions.patch 
	libraw1394-work-without-write-on-local-node-dev.patch 
Log Message:
* Tue Jan 13 2009 Jarod Wilson <jarod at redhat.com> - 2.0.0-6
- Set errno = ENOSYS for all unimplemented functions
- Make dvgrab and friends work w/o requiring r/w on the local fw node (#441073)


libraw1394-use-errno-ENOSYS-in-unimplemented-functions.patch:

--- NEW FILE libraw1394-use-errno-ENOSYS-in-unimplemented-functions.patch ---
Date: Sun, 11 Jan 2009 22:39:17 +0100 (CET)
From: Stefan Richter <stefanr at s5r6.in-berlin.de>
Subject: [PATCH libraw1394 fix] Set errno = ENOSYS in unimplemented functions
To: Dan Dennedy <dan at dennedy.org>
Cc: linux1394-devel at lists.sourceforge.net

Most of them do this already, only a few missed it.

Signed-off-by: Stefan Richter <stefanr at s5r6.in-berlin.de>
---
 src/fw.c |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/src/fw.c b/src/fw.c
index 3f5d806..ba3a807 100644
--- a/src/fw.c
+++ b/src/fw.c
@@ -1104,6 +1104,7 @@ fw_start_async_stream(fw_handle_t handle, unsigned int channel,
 			   unsigned long rawtag)
 {
 	/* FIXME: implement this? */
+	errno = ENOSYS;
 	return -1;
 }
 
@@ -1115,6 +1116,7 @@ fw_start_async_send(fw_handle_t handle,
 			 quadlet_t *data, unsigned long rawtag)
 {
 	/* FIXME: implement this? */
+	errno = ENOSYS;
 	return -1;
 }
 
@@ -1233,6 +1235,7 @@ fw_async_stream(fw_handle_t handle, unsigned int channel,
 		     size_t length, quadlet_t *data)
 {
 	/* FIXME: implement this? */
+	errno = ENOSYS;
 	return -1;
 }
 
@@ -1243,6 +1246,7 @@ fw_async_send(fw_handle_t handle,
 		   quadlet_t *data)
 {
 	/* FIXME: implement this? */
+	errno = ENOSYS;
 	return -1;
 }
 
@@ -1284,6 +1288,7 @@ int
 fw_update_config_rom(fw_handle_t handle, const quadlet_t *new_rom,
 			  size_t size, unsigned char rom_version)
 {
+	errno = ENOSYS;
 	return -1;
 }
 
-- 
1.6.0.6

libraw1394-work-without-write-on-local-node-dev.patch:

--- NEW FILE libraw1394-work-without-write-on-local-node-dev.patch ---
Date: Sat, 10 Jan 2009 21:14:50 +0100 (CET)
From: Stefan Richter <stefanr at s5r6.in-berlin.de>
Subject: Re: [PATCH libraw1394] Work without permission to access local node's
	/dev/fw*
To: Dan Dennedy <dan at dennedy.org>
Cc: linux1394-devel at lists.sourceforge.net,
 dcm at acm.org

On 10 Jan, Stefan Richter wrote:
> --- a/src/fw.c
> +++ b/src/fw.c
> @@ -125,17 +125,19 @@ scan_devices(fw_handle_t handle)
>  	char filename[32];
>  	struct fw_cdev_get_info get_info;
>  	struct fw_cdev_event_bus_reset reset;
> -	int fd, err, i, fname_str_sz;
> +	int fd, err, i, j, fname_str_sz;
>  	struct port *ports;
>  
>  	ports = handle->ports;
>  	memset(ports, 0, sizeof handle->ports);
> +	for (i = 0; i < MAX_PORTS; i++)
> +		ports[i].card = -1;
> +

The memset is not necessary.


From: Stefan Richter <stefanr at s5r6.in-berlin.de>
Subject: [PATCH] Work without permission to access local node's /dev/fw*

Fix for juju backend:

libraw1394 required write permission to the character device file of
the local node(s) in order to enumerate cards and for a number of
other operations.  This forced users to either run applications like
dvgrab and kino with elevated privileges, or to configure write
permission for all /dev/fw* or at least for local nodes' /dev/fw*.

We now use the first accessible file which was found for each card
for as many tasks as possible, instead of the local node's file.

This allows distributors or admins to implement stricter access
rights (default off, e.g. only on for AV/C and IIDC devices)
without sacrificing functionality of said class of applications.
Access to the local node is now only required by low-level tools
like gscanbus.

Signed-off-by: Stefan Richter <stefanr at s5r6.in-berlin.de>
---
 src/fw-iso.c |    4 ++--
 src/fw.c     |   50 +++++++++++++++++++++++++++++++++-----------------
 src/fw.h     |    6 +++---
 3 files changed, 38 insertions(+), 22 deletions(-)

diff --git a/src/fw-iso.c b/src/fw-iso.c
index 6a84662..a87259b 100644
--- a/src/fw-iso.c
+++ b/src/fw-iso.c
@@ -407,7 +407,7 @@ iso_init(fw_handle_t handle, int type,
 	if (handle->iso.packets == NULL)
 		return -1;
 
-	handle->iso.fd = open(handle->local_filename, O_RDWR);
+	handle->iso.fd = open(handle->iso.filename, O_RDWR);
 	if (handle->iso.fd < 0) {
 		free(handle->iso.packets);
 		handle->iso.packets = NULL;
@@ -557,7 +557,7 @@ int fw_read_cycle_timer(fw_handle_t handle,
 	int err;
 	struct fw_cdev_get_cycle_timer ctr = { 0 };
 
-	err = ioctl(handle->local_fd, FW_CDEV_IOC_GET_CYCLE_TIMER, &ctr);
+	err = ioctl(handle->ioctl_fd, FW_CDEV_IOC_GET_CYCLE_TIMER, &ctr);
 	if (!err) {
 		*cycle_timer = ctr.cycle_timer;
 		*local_time  = ctr.local_time;
diff --git a/src/fw.c b/src/fw.c
index e211b60..3f5d806 100644
--- a/src/fw.c
+++ b/src/fw.c
@@ -125,17 +125,18 @@ scan_devices(fw_handle_t handle)
 	char filename[32];
 	struct fw_cdev_get_info get_info;
 	struct fw_cdev_event_bus_reset reset;
-	int fd, err, i, fname_str_sz;
+	int fd, err, i, j, fname_str_sz;
 	struct port *ports;
 
 	ports = handle->ports;
-	memset(ports, 0, sizeof handle->ports);
+	for (i = 0; i < MAX_PORTS; i++)
+		ports[i].card = -1;
+
 	dir = opendir(FW_DEVICE_DIR);
 	if (dir == NULL)
 		return -1;
 
-	i = 0;
-	while (1) {
+	for (i = 0; i < MAX_PORTS; ) {
 		de = readdir(dir);
 		if (de == NULL)
 			break;
@@ -161,7 +162,10 @@ scan_devices(fw_handle_t handle)
 		if (err < 0)
 			continue;
 
-		if (i < MAX_PORTS && reset.node_id == reset.local_node_id) {
+		for (j = 0; j < i; j++)
+			if (ports[j].card == get_info.card)
+				break;
+		if (j == i) {
 			fname_str_sz = sizeof(ports[i].device_file) - 1;
 			strncpy(ports[i].device_file, filename, fname_str_sz);
 			ports[i].device_file[fname_str_sz] = '\0';
@@ -626,20 +630,27 @@ int fw_set_port(fw_handle_t handle, int port)
 			return -1;
 		}
 
-		handle->generation = reset.generation;
-		if (reset.node_id == reset.local_node_id) {
+		if (handle->iso.filename == NULL) {
 			memcpy(&handle->reset, &reset, sizeof handle->reset);
-			handle->local_fd = fd;
-			fname_str_sz = sizeof(handle->local_filename) -1;
-			strncpy(handle->local_filename, filename, fname_str_sz);
-			handle->local_filename[fname_str_sz] = '\0';
+			handle->iso.filename = handle->devices[i].filename;
+			handle->ioctl_fd = fd;
 		}
 
+		if (reset.node_id == reset.local_node_id)
+			handle->local_device = &handle->devices[i];
+
+		handle->generation = reset.generation;
+
 		i++;
 	}
 
 	closedir(dir);
 
+	if (i == 0) {
+		errno = ENODEV;
+		return -1;
+	}
+
 	return 0;
 }
 
@@ -656,7 +667,7 @@ int fw_reset_bus_new(fw_handle_t handle, int type)
 		break;
 	}
 
-	return ioctl(handle->local_fd,
+	return ioctl(handle->ioctl_fd,
 		     FW_CDEV_IOC_INITIATE_BUS_RESET, &initiate);
 }
 
@@ -817,7 +828,7 @@ fw_arm_register(fw_handle_t handle, nodeaddr_t start,
 	request.length = length;
 	request.closure = ptr_to_u64(&allocation->closure);
 
-	retval = ioctl(handle->local_fd, FW_CDEV_IOC_ALLOCATE, &request);
+	retval = ioctl(handle->ioctl_fd, FW_CDEV_IOC_ALLOCATE, &request);
 	if (retval < 0) {
 		free(allocation);
 		return -1;
@@ -863,7 +874,7 @@ fw_arm_unregister(fw_handle_t handle, nodeaddr_t start)
 	request.handle = allocation->handle;
 	free(allocation);
 
-	return ioctl(handle->local_fd, FW_CDEV_IOC_DEALLOCATE, &request);
+	return ioctl(handle->ioctl_fd, FW_CDEV_IOC_DEALLOCATE, &request);
 }
 
 int
@@ -1251,7 +1262,7 @@ fw_start_fcp_listen(fw_handle_t handle)
 	request.offset = CSR_REGISTER_BASE + CSR_FCP_COMMAND;
 	request.length = CSR_FCP_END - CSR_FCP_COMMAND;
 	request.closure = ptr_to_u64(closure);
-	if (ioctl(handle->local_fd, FW_CDEV_IOC_ALLOCATE, &request) < 0)
+	if (ioctl(handle->ioctl_fd, FW_CDEV_IOC_ALLOCATE, &request) < 0)
 		return -1;
 
 	handle->fcp_allocation_handle = request.handle;
@@ -1266,7 +1277,7 @@ fw_stop_fcp_listen(fw_handle_t handle)
 
 	request.handle = handle->fcp_allocation_handle;
 
-	return ioctl(handle->local_fd, FW_CDEV_IOC_DEALLOCATE, &request);
+	return ioctl(handle->ioctl_fd, FW_CDEV_IOC_DEALLOCATE, &request);
 }
 
 int
@@ -1284,13 +1295,18 @@ fw_get_config_rom(fw_handle_t handle, quadlet_t *buffer,
 	struct fw_cdev_get_info get_info;
 	int err;
 
+	if (handle->local_device == NULL) {
+		errno = EPERM;
+		return -1;
+	}
+
 	memset(&get_info, 0, sizeof(get_info));
 	get_info.version = FW_CDEV_VERSION;
 	get_info.rom = ptr_to_u64(buffer);
 	get_info.rom_length = buffersize;
 	get_info.bus_reset = 0;
 
-	err = ioctl(handle->local_fd, FW_CDEV_IOC_GET_INFO, &get_info);
+	err = ioctl(handle->local_device->fd, FW_CDEV_IOC_GET_INFO, &get_info);
 	if (err)
 		return err;
 
diff --git a/src/fw.h b/src/fw.h
index 56b59d9..a5e3772 100644
--- a/src/fw.h
+++ b/src/fw.h
@@ -101,6 +101,7 @@ struct fw_handle {
 	__u32 fcp_allocation_handle;
 	struct allocation *allocations;
 
+	int ioctl_fd;
 	int epoll_fd;
 	int inotify_fd;
 	int inotify_watch;
@@ -110,13 +111,12 @@ struct fw_handle {
 	struct epoll_closure inotify_closure;
 
 	struct device devices[MAX_DEVICES];
+	struct device *local_device;
 	int nodes[MAX_DEVICES];
-	int local_fd;
-	char local_filename[FILENAME_SIZE];
-
 	struct fw_cdev_event_bus_reset reset;
 
 	struct {
+		char *filename;
 		struct epoll_closure closure;
 		int fd;
 		int type;
-- 
1.6.0.6


Index: libraw1394.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libraw1394/F-10/libraw1394.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- libraw1394.spec	9 Dec 2008 16:32:13 -0000	1.49
+++ libraw1394.spec	14 Jan 2009 21:48:29 -0000	1.50
@@ -1,11 +1,13 @@
 Summary:        Library providing low-level IEEE-1394 access
 Name:           libraw1394
 Version:        2.0.0
-Release:        5%{?dist}
+Release:        6%{?dist}
 License:        LGPLv2+
 Group:          System Environment/Libraries
 Source:         http://www.linux1394.org/dl/libraw1394-%{version}.tar.gz
 Patch0:         libraw1394-2.0.0-git-update.patch
+Patch1:         libraw1394-use-errno-ENOSYS-in-unimplemented-functions.patch
+Patch2:         libraw1394-work-without-write-on-local-node-dev.patch
 URL:            http://www.linux1394.org/
 ExcludeArch:    s390 s390x
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -29,6 +31,8 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
+%patch2 -p1
 
 %build
 %configure --disable-static
@@ -67,6 +71,10 @@
 
 
 %changelog
+* Tue Jan 13 2009 Jarod Wilson <jarod at redhat.com> - 2.0.0-6
+- Set errno = ENOSYS for all unimplemented functions
+- Make dvgrab and friends work w/o requiring r/w on the local fw node (#441073)
+
 * Mon Dec 08 2008 Jarod Wilson <jarod at redhat.com> - 2.0.0-5
 - Fix up iso stop command so starting/stopping/starting iso reception works
 - Plug firewire handle leak



From nsantos at fedoraproject.org  Wed Jan 14 21:52:33 2009
From: nsantos at fedoraproject.org (Nuno Santos)
Date: Wed, 14 Jan 2009 21:52:33 +0000 (UTC)
Subject: rpms/qpidc/F-10 .cvsignore, 1.14, 1.15 qpidc.spec, 1.55,
	1.56 sources, 1.30, 1.31
Message-ID: <20090114215233.C756770136@cvs1.fedora.phx.redhat.com>

Author: nsantos

Update of /cvs/extras/rpms/qpidc/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15329

Modified Files:
	.cvsignore qpidc.spec sources 
Log Message:
Rebased to svn rev 734452


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/qpidc/F-10/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	23 Dec 2008 18:28:21 -0000	1.14
+++ .cvsignore	14 Jan 2009 21:52:03 -0000	1.15
@@ -1 +1 @@
-qpidc-0.4.728142.tar.gz
+qpidc-0.4.734479.tar.gz


Index: qpidc.spec
===================================================================
RCS file: /cvs/extras/rpms/qpidc/F-10/qpidc.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- qpidc.spec	23 Dec 2008 19:34:48 -0000	1.55
+++ qpidc.spec	14 Jan 2009 21:52:03 -0000	1.56
@@ -6,7 +6,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           qpidc
-Version:        0.4.728142
+Version:        0.4.734452
 Release:        1%{?dist}
 Summary:        Libraries for Qpid C++ client applications
 Group:          System Environment/Libraries
@@ -222,7 +222,7 @@
 rm -f %{buildroot}%_libdir/qpid/client/*.la
 rm -f %{buildroot}%_libdir/qpid/daemon/*.la
 # remove examples, are being packages separately in the rhm-docs package
-rm -fr %{buildroot}/usr/share/qpidc/examples
+#rm -fr %{buildroot}/usr/share/qpidc/examples
 
 %clean
 rm -rf %{buildroot}
@@ -253,7 +253,7 @@
 %_includedir/qmf
 %_libdir/libqpidcommon.so
 %_libdir/libqpidclient.so
-%doc docs/api/html
+%doc docs/api/html /usr/share/qpidc/examples
 
 %files -n qpidd
 %defattr(-,root,root,-)
@@ -366,6 +366,9 @@
 %postun -n qmf -p /sbin/ldconfig
 
 %changelog
+* Wed Jan 14 2009 Nuno Santos <nsantos at redhat.com> - 0.4.734452-1
+- Rebased to svn rev 734452
+
 * Tue Dec 23 2008 Nuno Santos <nsantos at redhat.com> - 0.4.728142-1
 - Rebased to svn rev 728142
 - Re-enable cluster, now using corosync


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/qpidc/F-10/sources,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- sources	23 Dec 2008 18:28:21 -0000	1.30
+++ sources	14 Jan 2009 21:52:03 -0000	1.31
@@ -1 +1 @@
-cc0a9f74d2c94a8c843c60415a869fc5  qpidc-0.4.728142.tar.gz
+3e624e673360e245de53f2f70c99e4be  qpidc-0.4.734479.tar.gz



From tgl at fedoraproject.org  Wed Jan 14 22:08:12 2009
From: tgl at fedoraproject.org (Tom Lane)
Date: Wed, 14 Jan 2009 22:08:12 +0000 (UTC)
Subject: rpms/mysql-connector-odbc/devel myodbc-my-bool.patch,1.1,1.2
Message-ID: <20090114220812.45CA570136@cvs1.fedora.phx.redhat.com>

Author: tgl

Update of /cvs/pkgs/rpms/mysql-connector-odbc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17404

Modified Files:
	myodbc-my-bool.patch 
Log Message:
Add link to upstream bug report

myodbc-my-bool.patch:

Index: myodbc-my-bool.patch
===================================================================
RCS file: /cvs/pkgs/rpms/mysql-connector-odbc/devel/myodbc-my-bool.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- myodbc-my-bool.patch	14 Jan 2009 21:10:34 -0000	1.1
+++ myodbc-my-bool.patch	14 Jan 2009 22:07:41 -0000	1.2
@@ -2,6 +2,8 @@
 probably a seriously bad idea; but for now we'll work around it here not
 there.
 
+Reported upstream at http://bugs.mysql.com/bug.php?id=42120
+
 
 diff -Naur mysql-connector-odbc-5.1.5r1144.orig/driver/myutil.h mysql-connector-odbc-5.1.5r1144/driver/myutil.h
 --- mysql-connector-odbc-5.1.5r1144.orig/driver/myutil.h	2008-04-14 21:03:13.000000000 -0400



From spot at fedoraproject.org  Wed Jan 14 22:21:12 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Wed, 14 Jan 2009 22:21:12 +0000 (UTC)
Subject: rpms/rocksndiamonds/F-10
	rocksndiamonds-3.2.6.0-music-info-url.patch, 
	NONE, 1.1 rocksndiamonds-3.2.6.0-nosmpeg.patch, NONE,
	1.1 rocksndiamonds.spec, 1.13, 1.14 sources, 1.7, 1.8
Message-ID: <20090114222113.101DC70143@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/extras/rpms/rocksndiamonds/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18446/F-10

Modified Files:
	rocksndiamonds.spec sources 
Added Files:
	rocksndiamonds-3.2.6.0-music-info-url.patch 
	rocksndiamonds-3.2.6.0-nosmpeg.patch 
Log Message:
update to 3.2.6.0

rocksndiamonds-3.2.6.0-music-info-url.patch:

--- NEW FILE rocksndiamonds-3.2.6.0-music-info-url.patch ---
diff -up rocksndiamonds-3.2.6.0/src/files.c.url rocksndiamonds-3.2.6.0/src/files.c
--- rocksndiamonds-3.2.6.0/src/files.c.url	2008-07-14 11:55:01.000000000 -0400
+++ rocksndiamonds-3.2.6.0/src/files.c	2009-01-14 15:17:03.000000000 -0500
@@ -9214,11 +9214,13 @@ static struct MusicFileInfo *get_music_f
     { "artist_header",	&tmp_music_file_info.artist_header	},
     { "album_header",	&tmp_music_file_info.album_header	},
     { "year_header",	&tmp_music_file_info.year_header	},
+    { "url_header",	&tmp_music_file_info.url_header		},
 
     { "title",		&tmp_music_file_info.title		},
     { "artist",		&tmp_music_file_info.artist		},
     { "album",		&tmp_music_file_info.album		},
     { "year",		&tmp_music_file_info.year		},
+    { "url",		&tmp_music_file_info.url		},
 
     { NULL,		NULL					},
   };
@@ -9342,11 +9344,13 @@ void LoadMusicInfo()
     checked_free(music_file_info->artist_header);
     checked_free(music_file_info->album_header);
     checked_free(music_file_info->year_header);
+    checked_free(music_file_info->url_header);
 
     checked_free(music_file_info->title);
     checked_free(music_file_info->artist);
     checked_free(music_file_info->album);
     checked_free(music_file_info->year);
+    checked_free(music_file_info->url);
 
     free(music_file_info);
 
diff -up rocksndiamonds-3.2.6.0/src/main.h.url rocksndiamonds-3.2.6.0/src/main.h
--- rocksndiamonds-3.2.6.0/src/main.h.url	2008-07-14 17:42:31.000000000 -0400
+++ rocksndiamonds-3.2.6.0/src/main.h	2009-01-14 15:17:03.000000000 -0500
@@ -2699,11 +2699,13 @@ struct MusicFileInfo
   char *artist_header;
   char *album_header;
   char *year_header;
+  char *url_header;
 
   char *title;
   char *artist;
   char *album;
   char *year;
+  char *url;
 
   int music;
 
diff -up rocksndiamonds-3.2.6.0/src/screens.c.url rocksndiamonds-3.2.6.0/src/screens.c
--- rocksndiamonds-3.2.6.0/src/screens.c.url	2008-07-14 17:35:19.000000000 -0400
+++ rocksndiamonds-3.2.6.0/src/screens.c	2009-01-14 15:18:17.000000000 -0500
@@ -2497,6 +2497,16 @@ void HandleInfoScreen_Music(int button)
       DrawTextFCentered(ystart2 + y++ * dy, FONT_TEXT_3, "%s", list->year);
     }
 
+    if (!strEqual(list->url, UNKNOWN_NAME))
+    {
+      if (!strEqual(list->url_header, UNKNOWN_NAME))
+	DrawTextSCentered(ystart2 + y++ * dy, FONT_TEXT_2, list->url_header);
+      else
+        DrawTextSCentered(ystart2 + y++ * dy, FONT_TEXT_2, "from the website");
+
+      DrawTextFCentered(ystart2 + y++ * dy, FONT_TEXT_3, "%s", list->url);
+    }
+
     DrawTextSCentered(ybottom, FONT_TEXT_4,
 		      "Press any key or button for next page");
 

rocksndiamonds-3.2.6.0-nosmpeg.patch:

--- NEW FILE rocksndiamonds-3.2.6.0-nosmpeg.patch ---
diff -up rocksndiamonds-3.2.6.0/src/Makefile.BAD rocksndiamonds-3.2.6.0/src/Makefile
--- rocksndiamonds-3.2.6.0/src/Makefile.BAD	2009-01-14 15:15:40.000000000 -0500
+++ rocksndiamonds-3.2.6.0/src/Makefile	2009-01-14 15:15:52.000000000 -0500
@@ -102,13 +102,13 @@ endif
 
 ifeq ($(TARGET),sdl)			# compiling for SDL target
 SYS_CFLAGS  = -DTARGET_SDL $(shell sdl-config --cflags)
-SDL_LIBS = -lSDL_image -lSDL_mixer -lSDL_net -lsmpeg
+SDL_LIBS = -lSDL_image -lSDL_mixer -lSDL_net
 SYS_LDFLAGS = $(SDL_LIBS) $(shell sdl-config --libs)
 endif
 
 ifeq ($(TARGET),sdl-static)		# compiling for SDL target (static)
 SYS_CFLAGS  = -DTARGET_SDL $(shell sdl-config --cflags)
-SDL_LIBS = -lSDL_image -lSDL_mixer -lSDL_net -lsmpeg
+SDL_LIBS = -lSDL_image -lSDL_mixer -lSDL_net
 SYS_LDFLAGS = $(SDL_LIBS) $(shell sdl-config --static-libs)
 endif
 


Index: rocksndiamonds.spec
===================================================================
RCS file: /cvs/extras/rpms/rocksndiamonds/F-10/rocksndiamonds.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- rocksndiamonds.spec	20 Feb 2008 18:53:53 -0000	1.13
+++ rocksndiamonds.spec	14 Jan 2009 22:20:40 -0000	1.14
@@ -1,5 +1,5 @@
 Name:		rocksndiamonds
-Version:	3.2.4
+Version:	3.2.6.0
 Release:	1%{?dist}
 License:	GPL+
 Group:		Amusements/Games
@@ -15,10 +15,10 @@
 Source2:	rocksndiamonds.png
 # Music files we have permission for!
 Source3:	rocksndiamonds-distributable-music.tar.bz2
-Patch0:		rocksndiamonds-3.1.1-nosmpeg.patch
+Patch0:		rocksndiamonds-3.2.6.0-nosmpeg.patch
 Patch1:		rocksndiamonds-highscore.patch
 Patch2:		rocksndiamonds-YN.patch
-Patch3:		rocksndiamonds-3.2.4-music-info-url.patch
+Patch3:		rocksndiamonds-3.2.6.0-music-info-url.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	SDL-devel, libX11-devel, desktop-file-utils, xorg-x11-proto-devel
 BuildRequires:	SDL_image-devel, SDL_mixer-devel, SDL_net-devel


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rocksndiamonds/F-10/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	20 Feb 2008 18:53:53 -0000	1.7
+++ sources	14 Jan 2009 22:20:40 -0000	1.8
@@ -1,2 +1,2 @@
-d4803571066862c9c8484b2b913381f8  rocksndiamonds-3.2.4-clean.tar.gz
+bb77a0c6a5737a863528053a27fad430  rocksndiamonds-3.2.6.0-clean.tar.gz
 6a9a5ae28689254363c91716fbad1824  rocksndiamonds-distributable-music.tar.bz2



From spot at fedoraproject.org  Wed Jan 14 22:21:12 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Wed, 14 Jan 2009 22:21:12 +0000 (UTC)
Subject: rpms/rocksndiamonds/devel
	rocksndiamonds-3.2.6.0-music-info-url.patch, 
	NONE, 1.1 rocksndiamonds-3.2.6.0-nosmpeg.patch, NONE,
	1.1 .cvsignore, 1.7, 1.8 rocksndiamonds.desktop, 1.1,
	1.2 rocksndiamonds.spec, 1.13, 1.14 sources, 1.7, 1.8
Message-ID: <20090114222113.0FA7070141@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/extras/rpms/rocksndiamonds/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18446/devel

Modified Files:
	.cvsignore rocksndiamonds.desktop rocksndiamonds.spec sources 
Added Files:
	rocksndiamonds-3.2.6.0-music-info-url.patch 
	rocksndiamonds-3.2.6.0-nosmpeg.patch 
Log Message:
update to 3.2.6.0

rocksndiamonds-3.2.6.0-music-info-url.patch:

--- NEW FILE rocksndiamonds-3.2.6.0-music-info-url.patch ---
diff -up rocksndiamonds-3.2.6.0/src/files.c.url rocksndiamonds-3.2.6.0/src/files.c
--- rocksndiamonds-3.2.6.0/src/files.c.url	2008-07-14 11:55:01.000000000 -0400
+++ rocksndiamonds-3.2.6.0/src/files.c	2009-01-14 15:17:03.000000000 -0500
@@ -9214,11 +9214,13 @@ static struct MusicFileInfo *get_music_f
     { "artist_header",	&tmp_music_file_info.artist_header	},
     { "album_header",	&tmp_music_file_info.album_header	},
     { "year_header",	&tmp_music_file_info.year_header	},
+    { "url_header",	&tmp_music_file_info.url_header		},
 
     { "title",		&tmp_music_file_info.title		},
     { "artist",		&tmp_music_file_info.artist		},
     { "album",		&tmp_music_file_info.album		},
     { "year",		&tmp_music_file_info.year		},
+    { "url",		&tmp_music_file_info.url		},
 
     { NULL,		NULL					},
   };
@@ -9342,11 +9344,13 @@ void LoadMusicInfo()
     checked_free(music_file_info->artist_header);
     checked_free(music_file_info->album_header);
     checked_free(music_file_info->year_header);
+    checked_free(music_file_info->url_header);
 
     checked_free(music_file_info->title);
     checked_free(music_file_info->artist);
     checked_free(music_file_info->album);
     checked_free(music_file_info->year);
+    checked_free(music_file_info->url);
 
     free(music_file_info);
 
diff -up rocksndiamonds-3.2.6.0/src/main.h.url rocksndiamonds-3.2.6.0/src/main.h
--- rocksndiamonds-3.2.6.0/src/main.h.url	2008-07-14 17:42:31.000000000 -0400
+++ rocksndiamonds-3.2.6.0/src/main.h	2009-01-14 15:17:03.000000000 -0500
@@ -2699,11 +2699,13 @@ struct MusicFileInfo
   char *artist_header;
   char *album_header;
   char *year_header;
+  char *url_header;
 
   char *title;
   char *artist;
   char *album;
   char *year;
+  char *url;
 
   int music;
 
diff -up rocksndiamonds-3.2.6.0/src/screens.c.url rocksndiamonds-3.2.6.0/src/screens.c
--- rocksndiamonds-3.2.6.0/src/screens.c.url	2008-07-14 17:35:19.000000000 -0400
+++ rocksndiamonds-3.2.6.0/src/screens.c	2009-01-14 15:18:17.000000000 -0500
@@ -2497,6 +2497,16 @@ void HandleInfoScreen_Music(int button)
       DrawTextFCentered(ystart2 + y++ * dy, FONT_TEXT_3, "%s", list->year);
     }
 
+    if (!strEqual(list->url, UNKNOWN_NAME))
+    {
+      if (!strEqual(list->url_header, UNKNOWN_NAME))
+	DrawTextSCentered(ystart2 + y++ * dy, FONT_TEXT_2, list->url_header);
+      else
+        DrawTextSCentered(ystart2 + y++ * dy, FONT_TEXT_2, "from the website");
+
+      DrawTextFCentered(ystart2 + y++ * dy, FONT_TEXT_3, "%s", list->url);
+    }
+
     DrawTextSCentered(ybottom, FONT_TEXT_4,
 		      "Press any key or button for next page");
 

rocksndiamonds-3.2.6.0-nosmpeg.patch:

--- NEW FILE rocksndiamonds-3.2.6.0-nosmpeg.patch ---
diff -up rocksndiamonds-3.2.6.0/src/Makefile.BAD rocksndiamonds-3.2.6.0/src/Makefile
--- rocksndiamonds-3.2.6.0/src/Makefile.BAD	2009-01-14 15:15:40.000000000 -0500
+++ rocksndiamonds-3.2.6.0/src/Makefile	2009-01-14 15:15:52.000000000 -0500
@@ -102,13 +102,13 @@ endif
 
 ifeq ($(TARGET),sdl)			# compiling for SDL target
 SYS_CFLAGS  = -DTARGET_SDL $(shell sdl-config --cflags)
-SDL_LIBS = -lSDL_image -lSDL_mixer -lSDL_net -lsmpeg
+SDL_LIBS = -lSDL_image -lSDL_mixer -lSDL_net
 SYS_LDFLAGS = $(SDL_LIBS) $(shell sdl-config --libs)
 endif
 
 ifeq ($(TARGET),sdl-static)		# compiling for SDL target (static)
 SYS_CFLAGS  = -DTARGET_SDL $(shell sdl-config --cflags)
-SDL_LIBS = -lSDL_image -lSDL_mixer -lSDL_net -lsmpeg
+SDL_LIBS = -lSDL_image -lSDL_mixer -lSDL_net
 SYS_LDFLAGS = $(SDL_LIBS) $(shell sdl-config --static-libs)
 endif
 


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rocksndiamonds/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	20 Feb 2008 18:53:53 -0000	1.7
+++ .cvsignore	14 Jan 2009 22:20:42 -0000	1.8
@@ -2,3 +2,4 @@
 rocksndiamonds-3.2.3-clean.tar.gz
 rocksndiamonds-3.2.4-clean.tar.gz
 rocksndiamonds-distributable-music.tar.bz2
+rocksndiamonds-3.2.6.0-clean.tar.gz


Index: rocksndiamonds.desktop
===================================================================
RCS file: /cvs/extras/rpms/rocksndiamonds/devel/rocksndiamonds.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- rocksndiamonds.desktop	23 Sep 2005 14:46:17 -0000	1.1
+++ rocksndiamonds.desktop	14 Jan 2009 22:20:42 -0000	1.2
@@ -5,7 +5,7 @@
 Name=Rocks'N'Diamonds
 GenericName=Underground digging game
 Comment=Dig for treasure and solve puzzles underground
-Icon=rocksndiamonds.png
+Icon=rocksndiamonds
 Exec=rocksndiamonds
 Terminal=false
 StartupNotify=false


Index: rocksndiamonds.spec
===================================================================
RCS file: /cvs/extras/rpms/rocksndiamonds/devel/rocksndiamonds.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- rocksndiamonds.spec	20 Feb 2008 18:53:53 -0000	1.13
+++ rocksndiamonds.spec	14 Jan 2009 22:20:42 -0000	1.14
@@ -1,5 +1,5 @@
 Name:		rocksndiamonds
-Version:	3.2.4
+Version:	3.2.6.0
 Release:	1%{?dist}
 License:	GPL+
 Group:		Amusements/Games
@@ -15,10 +15,10 @@
 Source2:	rocksndiamonds.png
 # Music files we have permission for!
 Source3:	rocksndiamonds-distributable-music.tar.bz2
-Patch0:		rocksndiamonds-3.1.1-nosmpeg.patch
+Patch0:		rocksndiamonds-3.2.6.0-nosmpeg.patch
 Patch1:		rocksndiamonds-highscore.patch
 Patch2:		rocksndiamonds-YN.patch
-Patch3:		rocksndiamonds-3.2.4-music-info-url.patch
+Patch3:		rocksndiamonds-3.2.6.0-music-info-url.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	SDL-devel, libX11-devel, desktop-file-utils, xorg-x11-proto-devel
 BuildRequires:	SDL_image-devel, SDL_mixer-devel, SDL_net-devel


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rocksndiamonds/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	20 Feb 2008 18:53:53 -0000	1.7
+++ sources	14 Jan 2009 22:20:42 -0000	1.8
@@ -1,2 +1,2 @@
-d4803571066862c9c8484b2b913381f8  rocksndiamonds-3.2.4-clean.tar.gz
+bb77a0c6a5737a863528053a27fad430  rocksndiamonds-3.2.6.0-clean.tar.gz
 6a9a5ae28689254363c91716fbad1824  rocksndiamonds-distributable-music.tar.bz2



From spot at fedoraproject.org  Wed Jan 14 22:21:12 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Wed, 14 Jan 2009 22:21:12 +0000 (UTC)
Subject: rpms/rocksndiamonds/F-9 rocksndiamonds-3.2.6.0-music-info-url.patch,
	NONE, 1.1 rocksndiamonds-3.2.6.0-nosmpeg.patch, NONE,
	1.1 rocksndiamonds.spec, 1.13, 1.14 sources, 1.7, 1.8
Message-ID: <20090114222113.0528870136@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/extras/rpms/rocksndiamonds/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18446/F-9

Modified Files:
	rocksndiamonds.spec sources 
Added Files:
	rocksndiamonds-3.2.6.0-music-info-url.patch 
	rocksndiamonds-3.2.6.0-nosmpeg.patch 
Log Message:
update to 3.2.6.0

rocksndiamonds-3.2.6.0-music-info-url.patch:

--- NEW FILE rocksndiamonds-3.2.6.0-music-info-url.patch ---
diff -up rocksndiamonds-3.2.6.0/src/files.c.url rocksndiamonds-3.2.6.0/src/files.c
--- rocksndiamonds-3.2.6.0/src/files.c.url	2008-07-14 11:55:01.000000000 -0400
+++ rocksndiamonds-3.2.6.0/src/files.c	2009-01-14 15:17:03.000000000 -0500
@@ -9214,11 +9214,13 @@ static struct MusicFileInfo *get_music_f
     { "artist_header",	&tmp_music_file_info.artist_header	},
     { "album_header",	&tmp_music_file_info.album_header	},
     { "year_header",	&tmp_music_file_info.year_header	},
+    { "url_header",	&tmp_music_file_info.url_header		},
 
     { "title",		&tmp_music_file_info.title		},
     { "artist",		&tmp_music_file_info.artist		},
     { "album",		&tmp_music_file_info.album		},
     { "year",		&tmp_music_file_info.year		},
+    { "url",		&tmp_music_file_info.url		},
 
     { NULL,		NULL					},
   };
@@ -9342,11 +9344,13 @@ void LoadMusicInfo()
     checked_free(music_file_info->artist_header);
     checked_free(music_file_info->album_header);
     checked_free(music_file_info->year_header);
+    checked_free(music_file_info->url_header);
 
     checked_free(music_file_info->title);
     checked_free(music_file_info->artist);
     checked_free(music_file_info->album);
     checked_free(music_file_info->year);
+    checked_free(music_file_info->url);
 
     free(music_file_info);
 
diff -up rocksndiamonds-3.2.6.0/src/main.h.url rocksndiamonds-3.2.6.0/src/main.h
--- rocksndiamonds-3.2.6.0/src/main.h.url	2008-07-14 17:42:31.000000000 -0400
+++ rocksndiamonds-3.2.6.0/src/main.h	2009-01-14 15:17:03.000000000 -0500
@@ -2699,11 +2699,13 @@ struct MusicFileInfo
   char *artist_header;
   char *album_header;
   char *year_header;
+  char *url_header;
 
   char *title;
   char *artist;
   char *album;
   char *year;
+  char *url;
 
   int music;
 
diff -up rocksndiamonds-3.2.6.0/src/screens.c.url rocksndiamonds-3.2.6.0/src/screens.c
--- rocksndiamonds-3.2.6.0/src/screens.c.url	2008-07-14 17:35:19.000000000 -0400
+++ rocksndiamonds-3.2.6.0/src/screens.c	2009-01-14 15:18:17.000000000 -0500
@@ -2497,6 +2497,16 @@ void HandleInfoScreen_Music(int button)
       DrawTextFCentered(ystart2 + y++ * dy, FONT_TEXT_3, "%s", list->year);
     }
 
+    if (!strEqual(list->url, UNKNOWN_NAME))
+    {
+      if (!strEqual(list->url_header, UNKNOWN_NAME))
+	DrawTextSCentered(ystart2 + y++ * dy, FONT_TEXT_2, list->url_header);
+      else
+        DrawTextSCentered(ystart2 + y++ * dy, FONT_TEXT_2, "from the website");
+
+      DrawTextFCentered(ystart2 + y++ * dy, FONT_TEXT_3, "%s", list->url);
+    }
+
     DrawTextSCentered(ybottom, FONT_TEXT_4,
 		      "Press any key or button for next page");
 

rocksndiamonds-3.2.6.0-nosmpeg.patch:

--- NEW FILE rocksndiamonds-3.2.6.0-nosmpeg.patch ---
diff -up rocksndiamonds-3.2.6.0/src/Makefile.BAD rocksndiamonds-3.2.6.0/src/Makefile
--- rocksndiamonds-3.2.6.0/src/Makefile.BAD	2009-01-14 15:15:40.000000000 -0500
+++ rocksndiamonds-3.2.6.0/src/Makefile	2009-01-14 15:15:52.000000000 -0500
@@ -102,13 +102,13 @@ endif
 
 ifeq ($(TARGET),sdl)			# compiling for SDL target
 SYS_CFLAGS  = -DTARGET_SDL $(shell sdl-config --cflags)
-SDL_LIBS = -lSDL_image -lSDL_mixer -lSDL_net -lsmpeg
+SDL_LIBS = -lSDL_image -lSDL_mixer -lSDL_net
 SYS_LDFLAGS = $(SDL_LIBS) $(shell sdl-config --libs)
 endif
 
 ifeq ($(TARGET),sdl-static)		# compiling for SDL target (static)
 SYS_CFLAGS  = -DTARGET_SDL $(shell sdl-config --cflags)
-SDL_LIBS = -lSDL_image -lSDL_mixer -lSDL_net -lsmpeg
+SDL_LIBS = -lSDL_image -lSDL_mixer -lSDL_net
 SYS_LDFLAGS = $(SDL_LIBS) $(shell sdl-config --static-libs)
 endif
 


Index: rocksndiamonds.spec
===================================================================
RCS file: /cvs/extras/rpms/rocksndiamonds/F-9/rocksndiamonds.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- rocksndiamonds.spec	20 Feb 2008 18:53:53 -0000	1.13
+++ rocksndiamonds.spec	14 Jan 2009 22:20:41 -0000	1.14
@@ -1,5 +1,5 @@
 Name:		rocksndiamonds
-Version:	3.2.4
+Version:	3.2.6.0
 Release:	1%{?dist}
 License:	GPL+
 Group:		Amusements/Games
@@ -15,10 +15,10 @@
 Source2:	rocksndiamonds.png
 # Music files we have permission for!
 Source3:	rocksndiamonds-distributable-music.tar.bz2
-Patch0:		rocksndiamonds-3.1.1-nosmpeg.patch
+Patch0:		rocksndiamonds-3.2.6.0-nosmpeg.patch
 Patch1:		rocksndiamonds-highscore.patch
 Patch2:		rocksndiamonds-YN.patch
-Patch3:		rocksndiamonds-3.2.4-music-info-url.patch
+Patch3:		rocksndiamonds-3.2.6.0-music-info-url.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	SDL-devel, libX11-devel, desktop-file-utils, xorg-x11-proto-devel
 BuildRequires:	SDL_image-devel, SDL_mixer-devel, SDL_net-devel


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rocksndiamonds/F-9/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	20 Feb 2008 18:53:53 -0000	1.7
+++ sources	14 Jan 2009 22:20:41 -0000	1.8
@@ -1,2 +1,2 @@
-d4803571066862c9c8484b2b913381f8  rocksndiamonds-3.2.4-clean.tar.gz
+bb77a0c6a5737a863528053a27fad430  rocksndiamonds-3.2.6.0-clean.tar.gz
 6a9a5ae28689254363c91716fbad1824  rocksndiamonds-distributable-music.tar.bz2



From nsantos at fedoraproject.org  Wed Jan 14 22:51:25 2009
From: nsantos at fedoraproject.org (Nuno Santos)
Date: Wed, 14 Jan 2009 22:51:25 +0000 (UTC)
Subject: rpms/qpidc/F-10 .cvsignore,1.15,1.16 sources,1.31,1.32
Message-ID: <20090114225126.0D76B70136@cvs1.fedora.phx.redhat.com>

Author: nsantos

Update of /cvs/extras/rpms/qpidc/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21423

Modified Files:
	.cvsignore sources 
Log Message:
Rebased to svn rev 734452


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/qpidc/F-10/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	14 Jan 2009 21:52:03 -0000	1.15
+++ .cvsignore	14 Jan 2009 22:50:55 -0000	1.16
@@ -1 +1 @@
-qpidc-0.4.734479.tar.gz
+qpidc-0.4.734452.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/qpidc/F-10/sources,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- sources	14 Jan 2009 21:52:03 -0000	1.31
+++ sources	14 Jan 2009 22:50:55 -0000	1.32
@@ -1 +1 @@
-3e624e673360e245de53f2f70c99e4be  qpidc-0.4.734479.tar.gz
+2b11da88553b325b1c6cfdb3031f077c  qpidc-0.4.734452.tar.gz



From cweyl at fedoraproject.org  Wed Jan 14 23:00:17 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Wed, 14 Jan 2009 23:00:17 +0000 (UTC)
Subject: rpms/perl-MooseX-Role-Parameterized/devel import.log, NONE,
	1.1 perl-MooseX-Role-Parameterized.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090114230017.1556270136@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-MooseX-Role-Parameterized/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22194/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-MooseX-Role-Parameterized.spec 
Log Message:
initial import


--- NEW FILE import.log ---
perl-MooseX-Role-Parameterized-0_02-1_fc10:HEAD:perl-MooseX-Role-Parameterized-0.02-1.fc10.src.rpm:1231973975


--- NEW FILE perl-MooseX-Role-Parameterized.spec ---
Name:       perl-MooseX-Role-Parameterized 
Version:    0.02 
Release:    1%{?dist}
# see LICENSE 
License:    GPL+ or Artistic
Group:      Development/Libraries
Summary:    Make your roles flexible through parameterization
Source:     http://search.cpan.org/CPAN/authors/id/S/SA/SARTAK/MooseX-Role-Parameterized-%{version}.tar.gz 
Url:        http://search.cpan.org/dist/MooseX-Role-Parameterized
BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
Requires:   perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
BuildArch:  noarch

BuildRequires: perl(Moose) >= 0.63
# tests
BuildRequires: perl(Test::More)
BuildRequires: perl(Test::Exception)
BuildRequires: perl(Storable)
BuildRequires: perl(Data::Dumper)

%description
Roles are composable units of behavior. They are useful for factoring out
functionality common to many classes from any part of your class hierarchy.
(See Moose::Cookbook::Roles::Recipe1 for an introduction to Moose::Role.)

While combining roles affords you a great deal of flexibility, individual
roles have very little in the way of configurability. Core Moose provides
alias for renaming methods to avoid conflicts, and excludes for ignoring
methods you don't want or need (see Moose::Cookbook::Roles::Recipe2 for more
about alias and excludes).

Because roles serve many different masters, they usually provide only the
least common denominator of functionality. To empower roles further, more
configurability than alias and excludes is required. Perhaps your role needs
to know which method to call when it is done. Or what default value to use for
its url attribute.

Parameterized roles offer exactly this solution.

%prep
%setup -q -n MooseX-Role-Parameterized-%{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 
%{perl_vendorlib}/*
%{_mandir}/man3/*.3*

%changelog
* Mon Jan 12 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.02-1
- update for submission

* Sun Jan 11 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.02-0
- initial RPM packaging
- generated with cpan2dist (CPANPLUS::Dist::RPM version 0.0.7)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-MooseX-Role-Parameterized/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	13 Jan 2009 21:20:19 -0000	1.1
+++ .cvsignore	14 Jan 2009 22:59:46 -0000	1.2
@@ -0,0 +1 @@
+MooseX-Role-Parameterized-0.02.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-MooseX-Role-Parameterized/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	13 Jan 2009 21:20:19 -0000	1.1
+++ sources	14 Jan 2009 22:59:46 -0000	1.2
@@ -0,0 +1 @@
+2adcf2c7225c34768d80efb018d877ab  MooseX-Role-Parameterized-0.02.tar.gz



From cweyl at fedoraproject.org  Wed Jan 14 23:01:08 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Wed, 14 Jan 2009 23:01:08 +0000 (UTC)
Subject: rpms/perl-MooseX-Role-Parameterized/F-10 import.log, NONE,
	1.1 perl-MooseX-Role-Parameterized.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090114230108.1E56F70142@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-MooseX-Role-Parameterized/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22486/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-MooseX-Role-Parameterized.spec 
Log Message:
initial import


--- NEW FILE import.log ---
perl-MooseX-Role-Parameterized-0_02-1_fc10:F-10:perl-MooseX-Role-Parameterized-0.02-1.fc10.src.rpm:1231974026


--- NEW FILE perl-MooseX-Role-Parameterized.spec ---
Name:       perl-MooseX-Role-Parameterized 
Version:    0.02 
Release:    1%{?dist}
# see LICENSE 
License:    GPL+ or Artistic
Group:      Development/Libraries
Summary:    Make your roles flexible through parameterization
Source:     http://search.cpan.org/CPAN/authors/id/S/SA/SARTAK/MooseX-Role-Parameterized-%{version}.tar.gz 
Url:        http://search.cpan.org/dist/MooseX-Role-Parameterized
BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
Requires:   perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
BuildArch:  noarch

BuildRequires: perl(Moose) >= 0.63
# tests
BuildRequires: perl(Test::More)
BuildRequires: perl(Test::Exception)
BuildRequires: perl(Storable)
BuildRequires: perl(Data::Dumper)

%description
Roles are composable units of behavior. They are useful for factoring out
functionality common to many classes from any part of your class hierarchy.
(See Moose::Cookbook::Roles::Recipe1 for an introduction to Moose::Role.)

While combining roles affords you a great deal of flexibility, individual
roles have very little in the way of configurability. Core Moose provides
alias for renaming methods to avoid conflicts, and excludes for ignoring
methods you don't want or need (see Moose::Cookbook::Roles::Recipe2 for more
about alias and excludes).

Because roles serve many different masters, they usually provide only the
least common denominator of functionality. To empower roles further, more
configurability than alias and excludes is required. Perhaps your role needs
to know which method to call when it is done. Or what default value to use for
its url attribute.

Parameterized roles offer exactly this solution.

%prep
%setup -q -n MooseX-Role-Parameterized-%{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 
%{perl_vendorlib}/*
%{_mandir}/man3/*.3*

%changelog
* Mon Jan 12 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.02-1
- update for submission

* Sun Jan 11 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.02-0
- initial RPM packaging
- generated with cpan2dist (CPANPLUS::Dist::RPM version 0.0.7)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-MooseX-Role-Parameterized/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	13 Jan 2009 21:20:19 -0000	1.1
+++ .cvsignore	14 Jan 2009 23:00:37 -0000	1.2
@@ -0,0 +1 @@
+MooseX-Role-Parameterized-0.02.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-MooseX-Role-Parameterized/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	13 Jan 2009 21:20:19 -0000	1.1
+++ sources	14 Jan 2009 23:00:37 -0000	1.2
@@ -0,0 +1 @@
+2adcf2c7225c34768d80efb018d877ab  MooseX-Role-Parameterized-0.02.tar.gz



From cweyl at fedoraproject.org  Wed Jan 14 23:01:58 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Wed, 14 Jan 2009 23:01:58 +0000 (UTC)
Subject: rpms/perl-MooseX-Role-Parameterized/F-9 import.log, NONE,
	1.1 perl-MooseX-Role-Parameterized.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090114230158.7F47D70141@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-MooseX-Role-Parameterized/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22831/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-MooseX-Role-Parameterized.spec 
Log Message:
initial import


--- NEW FILE import.log ---
perl-MooseX-Role-Parameterized-0_02-1_fc10:F-9:perl-MooseX-Role-Parameterized-0.02-1.fc10.src.rpm:1231974076


--- NEW FILE perl-MooseX-Role-Parameterized.spec ---
Name:       perl-MooseX-Role-Parameterized 
Version:    0.02 
Release:    1%{?dist}
# see LICENSE 
License:    GPL+ or Artistic
Group:      Development/Libraries
Summary:    Make your roles flexible through parameterization
Source:     http://search.cpan.org/CPAN/authors/id/S/SA/SARTAK/MooseX-Role-Parameterized-%{version}.tar.gz 
Url:        http://search.cpan.org/dist/MooseX-Role-Parameterized
BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
Requires:   perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
BuildArch:  noarch

BuildRequires: perl(Moose) >= 0.63
# tests
BuildRequires: perl(Test::More)
BuildRequires: perl(Test::Exception)
BuildRequires: perl(Storable)
BuildRequires: perl(Data::Dumper)

%description
Roles are composable units of behavior. They are useful for factoring out
functionality common to many classes from any part of your class hierarchy.
(See Moose::Cookbook::Roles::Recipe1 for an introduction to Moose::Role.)

While combining roles affords you a great deal of flexibility, individual
roles have very little in the way of configurability. Core Moose provides
alias for renaming methods to avoid conflicts, and excludes for ignoring
methods you don't want or need (see Moose::Cookbook::Roles::Recipe2 for more
about alias and excludes).

Because roles serve many different masters, they usually provide only the
least common denominator of functionality. To empower roles further, more
configurability than alias and excludes is required. Perhaps your role needs
to know which method to call when it is done. Or what default value to use for
its url attribute.

Parameterized roles offer exactly this solution.

%prep
%setup -q -n MooseX-Role-Parameterized-%{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 
%{perl_vendorlib}/*
%{_mandir}/man3/*.3*

%changelog
* Mon Jan 12 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.02-1
- update for submission

* Sun Jan 11 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.02-0
- initial RPM packaging
- generated with cpan2dist (CPANPLUS::Dist::RPM version 0.0.7)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-MooseX-Role-Parameterized/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	13 Jan 2009 21:20:19 -0000	1.1
+++ .cvsignore	14 Jan 2009 23:01:27 -0000	1.2
@@ -0,0 +1 @@
+MooseX-Role-Parameterized-0.02.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-MooseX-Role-Parameterized/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	13 Jan 2009 21:20:19 -0000	1.1
+++ sources	14 Jan 2009 23:01:28 -0000	1.2
@@ -0,0 +1 @@
+2adcf2c7225c34768d80efb018d877ab  MooseX-Role-Parameterized-0.02.tar.gz



From kkofler at fedoraproject.org  Wed Jan 14 23:05:12 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Wed, 14 Jan 2009 23:05:12 +0000 (UTC)
Subject: rpms/kdepim/devel kdepim.spec,1.201,1.202
Message-ID: <20090114230512.A34D370136@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdepim/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23619/devel

Modified Files:
	kdepim.spec 
Log Message:
* Thu Jan 15 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.96-2
- reenable BR pilot-link-devel, add missing BR libmal-devel (for KPilot)


Index: kdepim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdepim/devel/kdepim.spec,v
retrieving revision 1.201
retrieving revision 1.202
diff -u -r1.201 -r1.202
--- kdepim.spec	7 Jan 2009 20:10:07 -0000	1.201
+++ kdepim.spec	14 Jan 2009 23:04:42 -0000	1.202
@@ -1,12 +1,12 @@
 %ifnarch s390 s390x
-#define _with_pilot_link 1
+%define _with_pilot_link 1
 %endif
 
 Name:    kdepim
 Summary: PIM (Personal Information Manager) applications
 Epoch:   6
 Version: 4.1.96
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPLv2
 Group:   Applications/Productivity
@@ -38,7 +38,7 @@
 #BuildRequires: libopensync-devel
 BuildRequires: libxslt-devel
 BuildRequires: lockdev-devel
-%{?_with_pilot_link:BuildRequires: pilot-link-devel >= 0.12}
+%{?_with_pilot_link:BuildRequires: pilot-link-devel >= 0.12 libmal-devel >= 0.40}
 BuildRequires: python-devel
 BuildRequires: soprano-devel
 BuildRequires: qca2-devel
@@ -174,7 +174,10 @@
 
 
 %changelog
-* Wed Jan 07 2009 Than Ngo <than at redhat.com> - 4.1.96-1
+* Thu Jan 15 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.96-2
+- reenable BR pilot-link-devel, add missing BR libmal-devel (for KPilot)
+
+* Wed Jan 07 2009 Than Ngo <than at redhat.com> 4.1.96-1
 - 4.2rc1
 
 * Fri Dec 12 2008 Than Ngo <than at redhat.com> 4.1.85-1



From cweyl at fedoraproject.org  Wed Jan 14 23:07:45 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Wed, 14 Jan 2009 23:07:45 +0000 (UTC)
Subject: rpms/perl-Eval-Context/devel import.log, NONE,
	1.1 perl-Eval-Context.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090114230745.BC50070136@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Eval-Context/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23903/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-Eval-Context.spec 
Log Message:
initial import


--- NEW FILE import.log ---
perl-Eval-Context-0_07-2_fc10:HEAD:perl-Eval-Context-0.07-2.fc10.src.rpm:1231974424


--- NEW FILE perl-Eval-Context.spec ---
Name:       perl-Eval-Context 
Version:    0.07 
Release:    2%{?dist}
# see lib/Eval/Context.pm
License:    GPL+ or Artistic
Group:      Development/Libraries
Summary:    Evalute perl code in context wraper 
Source:     http://search.cpan.org/CPAN/authors/id/N/NK/NKH/Eval-Context-%{version}.tar.gz 
Url:        http://search.cpan.org/dist/Eval-Context
BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
Requires:   perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
BuildArch:  noarch

BuildRequires: perl(ExtUtils::MakeMaker) 
BuildRequires: perl(Module::Build::Compat)
BuildRequires: perl(Data::Compare)
BuildRequires: perl(Data::Dumper)
BuildRequires: perl(Data::TreeDumper)
BuildRequires: perl(Directory::Scratch::Structured)
BuildRequires: perl(File::Slurp)
BuildRequires: perl(Package::Generator)
BuildRequires: perl(Readonly)
BuildRequires: perl(Safe)
BuildRequires: perl(Sub::Exporter)
BuildRequires: perl(Sub::Install)
BuildRequires: perl(Symbol)
BuildRequires: perl(Test::More)
BuildRequires: perl(Test::Block)
BuildRequires: perl(Test::Dependencies)
BuildRequires: perl(Test::Distribution)
BuildRequires: perl(Test::Exception)
BuildRequires: perl(Test::NoWarnings)
BuildRequires: perl(Test::Output)
#BuildRequires: perl(Test::Perl::Critic)
BuildRequires: perl(Test::Pod)
BuildRequires: perl(Test::Pod::Coverage)
BuildRequires: perl(Test::Spelling)
BuildRequires: perl(Test::Strict)
BuildRequires: perl(Test::Warn)
BuildRequires: perl(version) >= 0.5


%description
This module defines a subroutine that let you evaluate Perl code in a
specific context. The code can be passed directly as a string or as a file
name to read from.  It also provides some subroutines to let you define and
optionally share variables and subroutines between your code and the code
you wish to evaluate. Finally there is some support for running your code
in a safe compartment.

%prep
%setup -q -n Eval-Context-%{version}

perl -pi -e 's/^#~ //' t/003*

%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
# note: Test::Fixme and Test::Kwalitee are both author tests, not tests that
# exercise functionality
make test

%clean
rm -rf %{buildroot} 

%files
%defattr(-,root,root,-)
%doc README Changes Todo.txt 
%{perl_vendorlib}/*
%{_mandir}/man3/*.3*

%changelog
* Sat Jan 10 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.07-2
- drop Test::Perl::Critic -- it's failing, and an author test to boot

* Sat Nov 29 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.07-1
- update for submission

* Sat Nov 29 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.07-0.1
- initial RPM packaging
- generated with cpan2dist (CPANPLUS::Dist::RPM version 0.0.5)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Eval-Context/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	13 Jan 2009 21:15:35 -0000	1.1
+++ .cvsignore	14 Jan 2009 23:07:15 -0000	1.2
@@ -0,0 +1 @@
+Eval-Context-0.07.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Eval-Context/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	13 Jan 2009 21:15:35 -0000	1.1
+++ sources	14 Jan 2009 23:07:15 -0000	1.2
@@ -0,0 +1 @@
+7989ee29343f562f6c37b17ed68df373  Eval-Context-0.07.tar.gz



From cweyl at fedoraproject.org  Wed Jan 14 23:08:34 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Wed, 14 Jan 2009 23:08:34 +0000 (UTC)
Subject: rpms/perl-Eval-Context/F-10 import.log, NONE,
	1.1 perl-Eval-Context.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090114230834.E5CE870136@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Eval-Context/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24179/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-Eval-Context.spec 
Log Message:
initial import


--- NEW FILE import.log ---
perl-Eval-Context-0_07-2_fc10:F-10:perl-Eval-Context-0.07-2.fc10.src.rpm:1231974474


--- NEW FILE perl-Eval-Context.spec ---
Name:       perl-Eval-Context 
Version:    0.07 
Release:    2%{?dist}
# see lib/Eval/Context.pm
License:    GPL+ or Artistic
Group:      Development/Libraries
Summary:    Evalute perl code in context wraper 
Source:     http://search.cpan.org/CPAN/authors/id/N/NK/NKH/Eval-Context-%{version}.tar.gz 
Url:        http://search.cpan.org/dist/Eval-Context
BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
Requires:   perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
BuildArch:  noarch

BuildRequires: perl(ExtUtils::MakeMaker) 
BuildRequires: perl(Module::Build::Compat)
BuildRequires: perl(Data::Compare)
BuildRequires: perl(Data::Dumper)
BuildRequires: perl(Data::TreeDumper)
BuildRequires: perl(Directory::Scratch::Structured)
BuildRequires: perl(File::Slurp)
BuildRequires: perl(Package::Generator)
BuildRequires: perl(Readonly)
BuildRequires: perl(Safe)
BuildRequires: perl(Sub::Exporter)
BuildRequires: perl(Sub::Install)
BuildRequires: perl(Symbol)
BuildRequires: perl(Test::More)
BuildRequires: perl(Test::Block)
BuildRequires: perl(Test::Dependencies)
BuildRequires: perl(Test::Distribution)
BuildRequires: perl(Test::Exception)
BuildRequires: perl(Test::NoWarnings)
BuildRequires: perl(Test::Output)
#BuildRequires: perl(Test::Perl::Critic)
BuildRequires: perl(Test::Pod)
BuildRequires: perl(Test::Pod::Coverage)
BuildRequires: perl(Test::Spelling)
BuildRequires: perl(Test::Strict)
BuildRequires: perl(Test::Warn)
BuildRequires: perl(version) >= 0.5


%description
This module defines a subroutine that let you evaluate Perl code in a
specific context. The code can be passed directly as a string or as a file
name to read from.  It also provides some subroutines to let you define and
optionally share variables and subroutines between your code and the code
you wish to evaluate. Finally there is some support for running your code
in a safe compartment.

%prep
%setup -q -n Eval-Context-%{version}

perl -pi -e 's/^#~ //' t/003*

%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
# note: Test::Fixme and Test::Kwalitee are both author tests, not tests that
# exercise functionality
make test

%clean
rm -rf %{buildroot} 

%files
%defattr(-,root,root,-)
%doc README Changes Todo.txt 
%{perl_vendorlib}/*
%{_mandir}/man3/*.3*

%changelog
* Sat Jan 10 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.07-2
- drop Test::Perl::Critic -- it's failing, and an author test to boot

* Sat Nov 29 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.07-1
- update for submission

* Sat Nov 29 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.07-0.1
- initial RPM packaging
- generated with cpan2dist (CPANPLUS::Dist::RPM version 0.0.5)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Eval-Context/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	13 Jan 2009 21:15:35 -0000	1.1
+++ .cvsignore	14 Jan 2009 23:08:04 -0000	1.2
@@ -0,0 +1 @@
+Eval-Context-0.07.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Eval-Context/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	13 Jan 2009 21:15:35 -0000	1.1
+++ sources	14 Jan 2009 23:08:04 -0000	1.2
@@ -0,0 +1 @@
+7989ee29343f562f6c37b17ed68df373  Eval-Context-0.07.tar.gz



From cweyl at fedoraproject.org  Wed Jan 14 23:09:25 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Wed, 14 Jan 2009 23:09:25 +0000 (UTC)
Subject: rpms/perl-Eval-Context/F-9 import.log, NONE,
	1.1 perl-Eval-Context.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090114230925.A587970136@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Eval-Context/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24504/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-Eval-Context.spec 
Log Message:
initial import


--- NEW FILE import.log ---
perl-Eval-Context-0_07-2_fc10:F-9:perl-Eval-Context-0.07-2.fc10.src.rpm:1231974522


--- NEW FILE perl-Eval-Context.spec ---
Name:       perl-Eval-Context 
Version:    0.07 
Release:    2%{?dist}
# see lib/Eval/Context.pm
License:    GPL+ or Artistic
Group:      Development/Libraries
Summary:    Evalute perl code in context wraper 
Source:     http://search.cpan.org/CPAN/authors/id/N/NK/NKH/Eval-Context-%{version}.tar.gz 
Url:        http://search.cpan.org/dist/Eval-Context
BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
Requires:   perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
BuildArch:  noarch

BuildRequires: perl(ExtUtils::MakeMaker) 
BuildRequires: perl(Module::Build::Compat)
BuildRequires: perl(Data::Compare)
BuildRequires: perl(Data::Dumper)
BuildRequires: perl(Data::TreeDumper)
BuildRequires: perl(Directory::Scratch::Structured)
BuildRequires: perl(File::Slurp)
BuildRequires: perl(Package::Generator)
BuildRequires: perl(Readonly)
BuildRequires: perl(Safe)
BuildRequires: perl(Sub::Exporter)
BuildRequires: perl(Sub::Install)
BuildRequires: perl(Symbol)
BuildRequires: perl(Test::More)
BuildRequires: perl(Test::Block)
BuildRequires: perl(Test::Dependencies)
BuildRequires: perl(Test::Distribution)
BuildRequires: perl(Test::Exception)
BuildRequires: perl(Test::NoWarnings)
BuildRequires: perl(Test::Output)
#BuildRequires: perl(Test::Perl::Critic)
BuildRequires: perl(Test::Pod)
BuildRequires: perl(Test::Pod::Coverage)
BuildRequires: perl(Test::Spelling)
BuildRequires: perl(Test::Strict)
BuildRequires: perl(Test::Warn)
BuildRequires: perl(version) >= 0.5


%description
This module defines a subroutine that let you evaluate Perl code in a
specific context. The code can be passed directly as a string or as a file
name to read from.  It also provides some subroutines to let you define and
optionally share variables and subroutines between your code and the code
you wish to evaluate. Finally there is some support for running your code
in a safe compartment.

%prep
%setup -q -n Eval-Context-%{version}

perl -pi -e 's/^#~ //' t/003*

%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
# note: Test::Fixme and Test::Kwalitee are both author tests, not tests that
# exercise functionality
make test

%clean
rm -rf %{buildroot} 

%files
%defattr(-,root,root,-)
%doc README Changes Todo.txt 
%{perl_vendorlib}/*
%{_mandir}/man3/*.3*

%changelog
* Sat Jan 10 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.07-2
- drop Test::Perl::Critic -- it's failing, and an author test to boot

* Sat Nov 29 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.07-1
- update for submission

* Sat Nov 29 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.07-0.1
- initial RPM packaging
- generated with cpan2dist (CPANPLUS::Dist::RPM version 0.0.5)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Eval-Context/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	13 Jan 2009 21:15:35 -0000	1.1
+++ .cvsignore	14 Jan 2009 23:08:55 -0000	1.2
@@ -0,0 +1 @@
+Eval-Context-0.07.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Eval-Context/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	13 Jan 2009 21:15:35 -0000	1.1
+++ sources	14 Jan 2009 23:08:55 -0000	1.2
@@ -0,0 +1 @@
+7989ee29343f562f6c37b17ed68df373  Eval-Context-0.07.tar.gz



From cweyl at fedoraproject.org  Wed Jan 14 23:10:09 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Wed, 14 Jan 2009 23:10:09 +0000 (UTC)
Subject: rpms/perl-Eval-Context/devel import.log,1.1,1.2
Message-ID: <20090114231009.9EED370136@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Eval-Context/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24806/devel

Modified Files:
	import.log 
Log Message:
initial import


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Eval-Context/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	14 Jan 2009 23:07:15 -0000	1.1
+++ import.log	14 Jan 2009 23:09:39 -0000	1.2
@@ -1 +1,2 @@
 perl-Eval-Context-0_07-2_fc10:HEAD:perl-Eval-Context-0.07-2.fc10.src.rpm:1231974424
+perl-Eval-Context-0_07-2_fc10:HEAD:perl-Eval-Context-0.07-2.fc10.src.rpm:1231974570



From cweyl at fedoraproject.org  Wed Jan 14 23:11:21 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Wed, 14 Jan 2009 23:11:21 +0000 (UTC)
Subject: rpms/perl-Time-Duration-Parse/devel import.log, NONE,
	1.1 perl-Time-Duration-Parse.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090114231121.81D8370136@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Time-Duration-Parse/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25148/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-Time-Duration-Parse.spec 
Log Message:
initial import


--- NEW FILE import.log ---
perl-Time-Duration-Parse-0_06-1_fc10:HEAD:perl-Time-Duration-Parse-0.06-1.fc10.src.rpm:1231974641


--- NEW FILE perl-Time-Duration-Parse.spec ---
Name:       perl-Time-Duration-Parse 
Version:    0.06 
Release:    1%{?dist}
# see lib/Time/Duration/Parse.pm
License:    GPL+ or Artistic 
Group:      Development/Libraries
Summary:    Parse string that represents time duration 
Source:     http://search.cpan.org/CPAN/authors/id/M/MI/MIYAGAWA/Time-Duration-Parse-%{version}.tar.gz 
Url:        http://search.cpan.org/dist/Time-Duration-Parse
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(Exporter::Lite)
BuildRequires: perl(Test::More)
# optional tests
BuildRequires: perl(Time::Duration)


%description
Time::Duration::Parse is a module to parse human readable duration strings
like _2 minutes and 3 seconds_ to seconds.

It does the opposite of duration_exact() in Time::Duration and is roundtrip 
safe. So, the following is always true.

%prep
%setup -q -n Time-Duration-Parse-%{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 
%{perl_vendorlib}/*
%{_mandir}/man3/*.3*

%changelog
* Sat Jan 10 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.06-1
- brush-up for review

* Sat Oct 11 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.06-0.1
- initial RPM packaging
- generated with cpan2dist (CPANPLUS::Dist::RPM version 0.0.1)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Time-Duration-Parse/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	13 Jan 2009 21:18:35 -0000	1.1
+++ .cvsignore	14 Jan 2009 23:10:51 -0000	1.2
@@ -0,0 +1 @@
+Time-Duration-Parse-0.06.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Time-Duration-Parse/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	13 Jan 2009 21:18:35 -0000	1.1
+++ sources	14 Jan 2009 23:10:51 -0000	1.2
@@ -0,0 +1 @@
+a23b7ca50a909df57e484cf39a3fa414  Time-Duration-Parse-0.06.tar.gz



From cweyl at fedoraproject.org  Wed Jan 14 23:12:12 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Wed, 14 Jan 2009 23:12:12 +0000 (UTC)
Subject: rpms/perl-Time-Duration-Parse/F-10 import.log, NONE,
	1.1 perl-Time-Duration-Parse.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090114231212.E7CCE70136@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Time-Duration-Parse/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25453/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-Time-Duration-Parse.spec 
Log Message:
initial import


--- NEW FILE import.log ---
perl-Time-Duration-Parse-0_06-1_fc10:F-10:perl-Time-Duration-Parse-0.06-1.fc10.src.rpm:1231974690


--- NEW FILE perl-Time-Duration-Parse.spec ---
Name:       perl-Time-Duration-Parse 
Version:    0.06 
Release:    1%{?dist}
# see lib/Time/Duration/Parse.pm
License:    GPL+ or Artistic 
Group:      Development/Libraries
Summary:    Parse string that represents time duration 
Source:     http://search.cpan.org/CPAN/authors/id/M/MI/MIYAGAWA/Time-Duration-Parse-%{version}.tar.gz 
Url:        http://search.cpan.org/dist/Time-Duration-Parse
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(Exporter::Lite)
BuildRequires: perl(Test::More)
# optional tests
BuildRequires: perl(Time::Duration)


%description
Time::Duration::Parse is a module to parse human readable duration strings
like _2 minutes and 3 seconds_ to seconds.

It does the opposite of duration_exact() in Time::Duration and is roundtrip 
safe. So, the following is always true.

%prep
%setup -q -n Time-Duration-Parse-%{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 
%{perl_vendorlib}/*
%{_mandir}/man3/*.3*

%changelog
* Sat Jan 10 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.06-1
- brush-up for review

* Sat Oct 11 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.06-0.1
- initial RPM packaging
- generated with cpan2dist (CPANPLUS::Dist::RPM version 0.0.1)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Time-Duration-Parse/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	13 Jan 2009 21:18:35 -0000	1.1
+++ .cvsignore	14 Jan 2009 23:11:42 -0000	1.2
@@ -0,0 +1 @@
+Time-Duration-Parse-0.06.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Time-Duration-Parse/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	13 Jan 2009 21:18:35 -0000	1.1
+++ sources	14 Jan 2009 23:11:42 -0000	1.2
@@ -0,0 +1 @@
+a23b7ca50a909df57e484cf39a3fa414  Time-Duration-Parse-0.06.tar.gz



From caolanm at fedoraproject.org  Wed Jan 14 23:12:19 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Wed, 14 Jan 2009 23:12:19 +0000 (UTC)
Subject: rpms/hyphen-pt/devel hyphen-pt.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090114231219.9794F70136@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/hyphen-pt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25254/devel

Modified Files:
	.cvsignore sources 
Added Files:
	hyphen-pt.spec import.log 
Log Message:



--- NEW FILE hyphen-pt.spec ---
Name: hyphen-pt
Summary: Portuguese hyphenation rules
%define upstreamid 20021021
Version: 0.%{upstreamid}
Release: 1%{?dist}
Source: http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/dictionaries/hyph_pt_PT.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: hyphen

%description
Portuguese hyphenation rules.

%prep
%setup -q -c

%build
chmod -x *

%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT/%{_datadir}/hyphen
cp -p *.dic $RPM_BUILD_ROOT/%{_datadir}/hyphen
pushd $RPM_BUILD_ROOT/%{_datadir}/hyphen/
pt_PT_aliases="pt_BR"
for lang in $pt_PT_aliases; do
        ln -s hyph_pt_PT.dic "hyph_"$lang".dic"
done

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc README_hyph_pt_PT.txt
%{_datadir}/hyphen/*

%changelog
* Wed Jan 14 2009 Caolan McNamara <caolanm at redhat.com> - 0.20021021-1
- initial version


--- NEW FILE import.log ---
hyphen-pt-0_20021021-1_fc10:HEAD:hyphen-pt-0.20021021-1.fc10.src.rpm:1231974613


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hyphen-pt/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	14 Jan 2009 21:23:30 -0000	1.1
+++ .cvsignore	14 Jan 2009 23:11:49 -0000	1.2
@@ -0,0 +1 @@
+hyph_pt_PT.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hyphen-pt/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	14 Jan 2009 21:23:30 -0000	1.1
+++ sources	14 Jan 2009 23:11:49 -0000	1.2
@@ -0,0 +1 @@
+327989bbbfc9f9d56eb772427a344eb3  hyph_pt_PT.zip



From cweyl at fedoraproject.org  Wed Jan 14 23:13:03 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Wed, 14 Jan 2009 23:13:03 +0000 (UTC)
Subject: rpms/perl-Time-Duration-Parse/F-9 import.log, NONE,
	1.1 perl-Time-Duration-Parse.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090114231303.32EE370136@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Time-Duration-Parse/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25816/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-Time-Duration-Parse.spec 
Log Message:
initial import


--- NEW FILE import.log ---
perl-Time-Duration-Parse-0_06-1_fc10:F-9:perl-Time-Duration-Parse-0.06-1.fc10.src.rpm:1231974742


--- NEW FILE perl-Time-Duration-Parse.spec ---
Name:       perl-Time-Duration-Parse 
Version:    0.06 
Release:    1%{?dist}
# see lib/Time/Duration/Parse.pm
License:    GPL+ or Artistic 
Group:      Development/Libraries
Summary:    Parse string that represents time duration 
Source:     http://search.cpan.org/CPAN/authors/id/M/MI/MIYAGAWA/Time-Duration-Parse-%{version}.tar.gz 
Url:        http://search.cpan.org/dist/Time-Duration-Parse
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(Exporter::Lite)
BuildRequires: perl(Test::More)
# optional tests
BuildRequires: perl(Time::Duration)


%description
Time::Duration::Parse is a module to parse human readable duration strings
like _2 minutes and 3 seconds_ to seconds.

It does the opposite of duration_exact() in Time::Duration and is roundtrip 
safe. So, the following is always true.

%prep
%setup -q -n Time-Duration-Parse-%{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 
%{perl_vendorlib}/*
%{_mandir}/man3/*.3*

%changelog
* Sat Jan 10 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.06-1
- brush-up for review

* Sat Oct 11 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.06-0.1
- initial RPM packaging
- generated with cpan2dist (CPANPLUS::Dist::RPM version 0.0.1)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Time-Duration-Parse/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	13 Jan 2009 21:18:35 -0000	1.1
+++ .cvsignore	14 Jan 2009 23:12:32 -0000	1.2
@@ -0,0 +1 @@
+Time-Duration-Parse-0.06.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Time-Duration-Parse/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	13 Jan 2009 21:18:35 -0000	1.1
+++ sources	14 Jan 2009 23:12:32 -0000	1.2
@@ -0,0 +1 @@
+a23b7ca50a909df57e484cf39a3fa414  Time-Duration-Parse-0.06.tar.gz



From cweyl at fedoraproject.org  Wed Jan 14 23:13:54 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Wed, 14 Jan 2009 23:13:54 +0000 (UTC)
Subject: rpms/perl-DateTimeX-Easy/devel import.log, NONE,
	1.1 perl-DateTimeX-Easy.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090114231354.6C57C70136@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-DateTimeX-Easy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26109/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-DateTimeX-Easy.spec 
Log Message:
initial import


--- NEW FILE import.log ---
perl-DateTimeX-Easy-0_085-1_fc10:HEAD:perl-DateTimeX-Easy-0.085-1.fc10.src.rpm:1231974793


--- NEW FILE perl-DateTimeX-Easy.spec ---
Name:       perl-DateTimeX-Easy 
Version:    0.085 
Release:    1%{?dist}
# see lib/DateTimeX/Easy.pm
License:    GPL+ or Artistic
Group:      Development/Libraries
Summary:    Parse a date/time string using the best method available 
Source:     http://search.cpan.org/CPAN/authors/id/R/RK/RKRIMEN/DateTimeX-Easy-%{version}.tar.gz 
Url:        http://search.cpan.org/dist/DateTimeX-Easy
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(DateTime)
BuildRequires: perl(DateTime::Format::DateParse)
BuildRequires: perl(DateTime::Format::Flexible)
BuildRequires: perl(DateTime::Format::Natural)
BuildRequires: perl(DateTime::Format::ICal)
BuildRequires: perl(DateTime::Format::DateManip)
BuildRequires: perl(Scalar::Util)
BuildRequires: perl(Test::More)

# not picked up
Provides:      perl(DateTimeX::Easy::DateParse)

%description
DateTimeX::Easy makes DateTime object creation quick and easy. It uses a
variety of DateTime::Format packages to do the bulk of the parsing, with
some custom tweaks to smooth out the rough edges (mainly concerning
timezone detection and selection).

%prep
%setup -q -n DateTimeX-Easy-%{version}

# note -- we cannot package/use Test::Most as it requires newer levels of core
# modules than are currently present in F-9+
perl -pi -e 's/Most/More/g' t/*.t Makefile.PL

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

%install
rm -rf %{buildroot}

make pure_install PERL_INSTALL_ROOT=%{buildroot}
find %{buildroot} -type f -name .packlist -exec rm -f {} ';'
find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null ';'

%{_fixperms} %{buildroot}/*

%check
make test

%clean
rm -rf %{buildroot} 

%files
%defattr(-,root,root,-)
%doc Changes README 
%{perl_vendorlib}/*
%{_mandir}/man3/*.3*

%changelog
* Mon Jan 12 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.085-1
- update to 0.085
- touch up for review

* Sun Dec 07 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.084-0.1
- update to 0.084

* Sat Oct 11 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.082-1
- initial RPM packaging
- generated with cpan2dist (CPANPLUS::Dist::RPM version 0.0.1)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-DateTimeX-Easy/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	13 Jan 2009 21:19:29 -0000	1.1
+++ .cvsignore	14 Jan 2009 23:13:24 -0000	1.2
@@ -0,0 +1 @@
+DateTimeX-Easy-0.085.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-DateTimeX-Easy/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	13 Jan 2009 21:19:29 -0000	1.1
+++ sources	14 Jan 2009 23:13:24 -0000	1.2
@@ -0,0 +1 @@
+a43d1aeefd0e3cdac3228df0be053713  DateTimeX-Easy-0.085.tar.gz



From caolanm at fedoraproject.org  Wed Jan 14 23:14:25 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Wed, 14 Jan 2009 23:14:25 +0000 (UTC)
Subject: rpms/openoffice.org/devel openoffice.org.spec,1.1754,1.1755
Message-ID: <20090114231425.7F37070136@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26261

Modified Files:
	openoffice.org.spec 
Log Message:
add hyphen-pt depend


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1754
retrieving revision 1.1755
diff -u -r1.1754 -r1.1755
--- openoffice.org.spec	14 Jan 2009 16:07:17 -0000	1.1754
+++ openoffice.org.spec	14 Jan 2009 23:13:54 -0000	1.1755
@@ -1025,7 +1025,7 @@
 Summary: Portuguese language pack for %{name}
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
-Requires: hunspell-pt
+Requires: hunspell-pt, hyphen-pt
 Obsoletes: openoffice.org-i18n < 1.9.0
 Obsoletes: openoffice.org-langpack-pt < 1:2.0.3
 Obsoletes: openoffice.org2-langpack-pt_PT < 1:3.0.0
@@ -1037,7 +1037,7 @@
 Summary: Brazilian Portuguese language pack for %{name}
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
-Requires: hunspell-pt
+Requires: hunspell-pt, hyphen-pt
 Obsoletes: openoffice.org-i18n < 1.9.0
 Obsoletes: openoffice.org-langpack-pt-BR < 1:2.0.3
 Obsoletes: openoffice.org2-langpack-pt_BR < 1:3.0.0
@@ -3831,7 +3831,7 @@
 * Wed Jan 14 2009 Caol??n McNamara <caolanm at redhat.com> - 1:3.0.1-15.2
 - Resolves: rhbz#479624 add
   openoffice.org-3.0.1.ooo98024.vcl.emboldenoverlap.patch
-- add hyphen-uk dependency
+- add hyphen-uk, hyphen-pt dependency
 - Resolves: rhbz#479163 openoffice.org-3.0.1.oooXXXXX.fpicker.allformatsonsave.patch
 
 * Mon Jan 12 2009 Caol??n McNamara <caolanm at redhat.com> - 1:3.0.1-15.1



From cweyl at fedoraproject.org  Wed Jan 14 23:14:43 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Wed, 14 Jan 2009 23:14:43 +0000 (UTC)
Subject: rpms/perl-DateTimeX-Easy/F-10 import.log, NONE,
	1.1 perl-DateTimeX-Easy.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090114231443.CAF6370136@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-DateTimeX-Easy/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26493/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-DateTimeX-Easy.spec 
Log Message:
initial import


--- NEW FILE import.log ---
perl-DateTimeX-Easy-0_085-1_fc10:F-10:perl-DateTimeX-Easy-0.085-1.fc10.src.rpm:1231974842


--- NEW FILE perl-DateTimeX-Easy.spec ---
Name:       perl-DateTimeX-Easy 
Version:    0.085 
Release:    1%{?dist}
# see lib/DateTimeX/Easy.pm
License:    GPL+ or Artistic
Group:      Development/Libraries
Summary:    Parse a date/time string using the best method available 
Source:     http://search.cpan.org/CPAN/authors/id/R/RK/RKRIMEN/DateTimeX-Easy-%{version}.tar.gz 
Url:        http://search.cpan.org/dist/DateTimeX-Easy
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(DateTime)
BuildRequires: perl(DateTime::Format::DateParse)
BuildRequires: perl(DateTime::Format::Flexible)
BuildRequires: perl(DateTime::Format::Natural)
BuildRequires: perl(DateTime::Format::ICal)
BuildRequires: perl(DateTime::Format::DateManip)
BuildRequires: perl(Scalar::Util)
BuildRequires: perl(Test::More)

# not picked up
Provides:      perl(DateTimeX::Easy::DateParse)

%description
DateTimeX::Easy makes DateTime object creation quick and easy. It uses a
variety of DateTime::Format packages to do the bulk of the parsing, with
some custom tweaks to smooth out the rough edges (mainly concerning
timezone detection and selection).

%prep
%setup -q -n DateTimeX-Easy-%{version}

# note -- we cannot package/use Test::Most as it requires newer levels of core
# modules than are currently present in F-9+
perl -pi -e 's/Most/More/g' t/*.t Makefile.PL

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

%install
rm -rf %{buildroot}

make pure_install PERL_INSTALL_ROOT=%{buildroot}
find %{buildroot} -type f -name .packlist -exec rm -f {} ';'
find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null ';'

%{_fixperms} %{buildroot}/*

%check
make test

%clean
rm -rf %{buildroot} 

%files
%defattr(-,root,root,-)
%doc Changes README 
%{perl_vendorlib}/*
%{_mandir}/man3/*.3*

%changelog
* Mon Jan 12 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.085-1
- update to 0.085
- touch up for review

* Sun Dec 07 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.084-0.1
- update to 0.084

* Sat Oct 11 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.082-1
- initial RPM packaging
- generated with cpan2dist (CPANPLUS::Dist::RPM version 0.0.1)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-DateTimeX-Easy/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	13 Jan 2009 21:19:29 -0000	1.1
+++ .cvsignore	14 Jan 2009 23:14:13 -0000	1.2
@@ -0,0 +1 @@
+DateTimeX-Easy-0.085.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-DateTimeX-Easy/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	13 Jan 2009 21:19:29 -0000	1.1
+++ sources	14 Jan 2009 23:14:13 -0000	1.2
@@ -0,0 +1 @@
+a43d1aeefd0e3cdac3228df0be053713  DateTimeX-Easy-0.085.tar.gz



From cweyl at fedoraproject.org  Wed Jan 14 23:15:33 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Wed, 14 Jan 2009 23:15:33 +0000 (UTC)
Subject: rpms/perl-DateTimeX-Easy/F-9 import.log, NONE,
	1.1 perl-DateTimeX-Easy.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090114231533.9327370136@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-DateTimeX-Easy/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26776/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-DateTimeX-Easy.spec 
Log Message:
initial import


--- NEW FILE import.log ---
perl-DateTimeX-Easy-0_085-1_fc10:F-9:perl-DateTimeX-Easy-0.085-1.fc10.src.rpm:1231974892


--- NEW FILE perl-DateTimeX-Easy.spec ---
Name:       perl-DateTimeX-Easy 
Version:    0.085 
Release:    1%{?dist}
# see lib/DateTimeX/Easy.pm
License:    GPL+ or Artistic
Group:      Development/Libraries
Summary:    Parse a date/time string using the best method available 
Source:     http://search.cpan.org/CPAN/authors/id/R/RK/RKRIMEN/DateTimeX-Easy-%{version}.tar.gz 
Url:        http://search.cpan.org/dist/DateTimeX-Easy
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(DateTime)
BuildRequires: perl(DateTime::Format::DateParse)
BuildRequires: perl(DateTime::Format::Flexible)
BuildRequires: perl(DateTime::Format::Natural)
BuildRequires: perl(DateTime::Format::ICal)
BuildRequires: perl(DateTime::Format::DateManip)
BuildRequires: perl(Scalar::Util)
BuildRequires: perl(Test::More)

# not picked up
Provides:      perl(DateTimeX::Easy::DateParse)

%description
DateTimeX::Easy makes DateTime object creation quick and easy. It uses a
variety of DateTime::Format packages to do the bulk of the parsing, with
some custom tweaks to smooth out the rough edges (mainly concerning
timezone detection and selection).

%prep
%setup -q -n DateTimeX-Easy-%{version}

# note -- we cannot package/use Test::Most as it requires newer levels of core
# modules than are currently present in F-9+
perl -pi -e 's/Most/More/g' t/*.t Makefile.PL

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

%install
rm -rf %{buildroot}

make pure_install PERL_INSTALL_ROOT=%{buildroot}
find %{buildroot} -type f -name .packlist -exec rm -f {} ';'
find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null ';'

%{_fixperms} %{buildroot}/*

%check
make test

%clean
rm -rf %{buildroot} 

%files
%defattr(-,root,root,-)
%doc Changes README 
%{perl_vendorlib}/*
%{_mandir}/man3/*.3*

%changelog
* Mon Jan 12 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.085-1
- update to 0.085
- touch up for review

* Sun Dec 07 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.084-0.1
- update to 0.084

* Sat Oct 11 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.082-1
- initial RPM packaging
- generated with cpan2dist (CPANPLUS::Dist::RPM version 0.0.1)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-DateTimeX-Easy/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	13 Jan 2009 21:19:29 -0000	1.1
+++ .cvsignore	14 Jan 2009 23:15:03 -0000	1.2
@@ -0,0 +1 @@
+DateTimeX-Easy-0.085.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-DateTimeX-Easy/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	13 Jan 2009 21:19:29 -0000	1.1
+++ sources	14 Jan 2009 23:15:03 -0000	1.2
@@ -0,0 +1 @@
+a43d1aeefd0e3cdac3228df0be053713  DateTimeX-Easy-0.085.tar.gz



From caolanm at fedoraproject.org  Wed Jan 14 23:17:33 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Wed, 14 Jan 2009 23:17:33 +0000 (UTC)
Subject: rpms/hyphen-ro/devel hyphen-ro.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090114231733.B13AF70136@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/hyphen-ro/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27153/devel

Modified Files:
	.cvsignore sources 
Added Files:
	hyphen-ro.spec import.log 
Log Message:



--- NEW FILE hyphen-ro.spec ---
Name: hyphen-ro
Summary: Romanian hyphenation rules
Version: 3.3
Release: 0.1.test3%{?dist}
Source: http://downloads.sourceforge.net/rospell/hyph_ro_RO.3.3-test3.zip
Group: Applications/Text
URL: http://rospell.sourceforge.net/
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
License: GPLv2+
BuildArch: noarch

Requires: hyphen

%description
Romanian hyphenation rules.

%prep
%setup -q -c

%build

%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT/%{_datadir}/hyphen
cp -p *.dic $RPM_BUILD_ROOT/%{_datadir}/hyphen/

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc COPYING.GPL README          
%{_datadir}/hyphen/*

%changelog
* Fri Jan 09 2008 Caolan McNamara <caolanm at redhat.com> - 3.3-0.1.test3
- initial version


--- NEW FILE import.log ---
hyphen-ro-3_3-0_1_test3_fc10:HEAD:hyphen-ro-3.3-0.1.test3.fc10.src.rpm:1231974918


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hyphen-ro/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	14 Jan 2009 21:24:01 -0000	1.1
+++ .cvsignore	14 Jan 2009 23:17:03 -0000	1.2
@@ -0,0 +1 @@
+hyph_ro_RO.3.3-test3.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hyphen-ro/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	14 Jan 2009 21:24:01 -0000	1.1
+++ sources	14 Jan 2009 23:17:03 -0000	1.2
@@ -0,0 +1 @@
+b984466d932377b9a81a93644efcf663  hyph_ro_RO.3.3-test3.zip



From nsantos at fedoraproject.org  Wed Jan 14 23:36:16 2009
From: nsantos at fedoraproject.org (Nuno Santos)
Date: Wed, 14 Jan 2009 23:36:16 +0000 (UTC)
Subject: rpms/qpidc/F-10 qpidc.spec,1.56,1.57
Message-ID: <20090114233616.349A370136@cvs1.fedora.phx.redhat.com>

Author: nsantos

Update of /cvs/extras/rpms/qpidc/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29164

Modified Files:
	qpidc.spec 
Log Message:
Rebased to svn rev 734452


Index: qpidc.spec
===================================================================
RCS file: /cvs/extras/rpms/qpidc/F-10/qpidc.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- qpidc.spec	14 Jan 2009 21:52:03 -0000	1.56
+++ qpidc.spec	14 Jan 2009 23:35:45 -0000	1.57
@@ -253,7 +253,8 @@
 %_includedir/qmf
 %_libdir/libqpidcommon.so
 %_libdir/libqpidclient.so
-%doc docs/api/html /usr/share/qpidc/examples
+%_datadir/qpidc/examples
+%doc docs/api/html
 
 %files -n qpidd
 %defattr(-,root,root,-)



From kkofler at fedoraproject.org  Wed Jan 14 23:39:04 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Wed, 14 Jan 2009 23:39:04 +0000 (UTC)
Subject: rpms/libmal/devel libmal-0.44-64bit.patch, NONE, 1.1 .cvsignore, 1.2,
	1.3 libmal.spec, 1.9, 1.10 sources, 1.2,
	1.3 libmal-0.31-64bit.patch, 1.1, NONE libmal-0.31-pi12.patch,
	1.1, NONE
Message-ID: <20090114233904.1423970136@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/libmal/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29634/devel

Modified Files:
	.cvsignore libmal.spec sources 
Added Files:
	libmal-0.44-64bit.patch 
Removed Files:
	libmal-0.31-64bit.patch libmal-0.31-pi12.patch 
Log Message:
* Thu Jan 15 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 0.44-1
- update to 0.44 (for kdepim 4.2)
- drop libmal-0.31-pi12.patch (fixed upstream)
- rebase 64bit patch

(Note: This should also go to F-10 for the KDE 4.2 update, but not F-9 which has kdepim 3.5.)

libmal-0.44-64bit.patch:

--- NEW FILE libmal-0.44-64bit.patch ---
diff -ur libmal-0.44/configure libmal-0.44-64bit/configure
--- libmal-0.44/configure	2007-01-17 00:19:11.000000000 +0100
+++ libmal-0.44-64bit/configure	2009-01-15 00:35:18.000000000 +0100
@@ -19680,7 +19680,7 @@
 PILOT_LIBS="-lpisock"
 
 if test $pilotlibs = no ; then
-    for pilot_libs in $pilot_prefix/lib /usr/lib /usr/local/lib/ \
+    for pilot_libs in $pilot_prefix/lib $libdir /usr/lib /usr/local/lib/ \
         /usr/extra/pilot/lib ; do
         if test -r "$pilot_libs/libpisock.so" ; then
             pilotlibs=yes
diff -ur libmal-0.44/configure.in libmal-0.44-64bit/configure.in
--- libmal-0.44/configure.in	2007-01-07 19:04:48.000000000 +0100
+++ libmal-0.44-64bit/configure.in	2009-01-15 00:34:57.000000000 +0100
@@ -59,7 +59,7 @@
 PILOT_LIBS="-lpisock"
 
 if test $pilotlibs = no ; then
-    for pilot_libs in $pilot_prefix/lib /usr/lib /usr/local/lib/ \
+    for pilot_libs in $pilot_prefix/lib $libdir /usr/lib /usr/local/lib/ \
         /usr/extra/pilot/lib ; do
         if test -r "$pilot_libs/libpisock.so" ; then
             pilotlibs=yes


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libmal/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	22 Mar 2006 15:22:43 -0000	1.2
+++ .cvsignore	14 Jan 2009 23:38:33 -0000	1.3
@@ -1 +1 @@
-libmal-0.31.tar.gz
+libmal-0.44.tar.gz


Index: libmal.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libmal/devel/libmal.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- libmal.spec	11 Feb 2008 12:36:54 -0000	1.9
+++ libmal.spec	14 Jan 2009 23:38:33 -0000	1.10
@@ -1,20 +1,16 @@
 
 Summary: A convenience library for malsync
 Name:    libmal
-# NOTE: this isn't the latest version, but is the last version known to 
-# work with kdepim-3.5.x
-Version: 0.31 
-Release: 8%{?dist}
+Version: 0.44
+Release: 1%{?dist}
 
 License: MPLv1.0
-Url: 	 http://jasonday.home.att.net/code/libmal/ 
-Source0: http://jasonday.home.att.net/code/libmal/libmal-%{version}.tar.gz 
+Url: 	 http://jasonday.home.att.net/code/libmal/
+Source0: http://jasonday.home.att.net/code/libmal/libmal-%{version}.tar.gz
 Group:   System Environment/Libraries	
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Patch1: libmal-0.31-64bit.patch
-# pilot-link-0.12 fixes
-Patch2: libmal-0.31-pi12.patch
+Patch1: libmal-0.44-64bit.patch
 
 BuildRequires: pilot-link-devel 
 
@@ -34,7 +30,6 @@
 %setup -q 
 
 %patch1 -p1 -b .64bits
-%patch2 -p1 -b .pi12
 
 
 %build
@@ -75,6 +70,11 @@
 
 
 %changelog
+* Thu Jan 15 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 0.44-1
+- update to 0.44 (for kdepim 4.2)
+- drop libmal-0.31-pi12.patch (fixed upstream)
+- rebase 64bit patch
+
 * Fri Feb 08 2008 Rex Dieter <rdieter at fedoraproject.org> 0.31-8 
 - respin (gcc43)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libmal/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	22 Mar 2006 15:22:43 -0000	1.2
+++ sources	14 Jan 2009 23:38:33 -0000	1.3
@@ -1 +1 @@
-3d1fd0a5ece6de47d55df5829ee8b6a2  libmal-0.31.tar.gz
+826f2334c8eb24f5e170f208581fdffb  libmal-0.44.tar.gz


--- libmal-0.31-64bit.patch DELETED ---


--- libmal-0.31-pi12.patch DELETED ---



From jjames at fedoraproject.org  Wed Jan 14 23:39:37 2009
From: jjames at fedoraproject.org (Jerry James)
Date: Wed, 14 Jan 2009 23:39:37 +0000 (UTC)
Subject: rpms/pmd/devel pmd-4.2.4-build.patch, NONE,
	1.1 pmd-4.2.4-nicerhtml.patch, NONE, 1.1 .cvsignore, 1.2,
	1.3 pmd.spec, 1.4, 1.5 sources, 1.2, 1.3
Message-ID: <20090114233937.1FF6970136@cvs1.fedora.phx.redhat.com>

Author: jjames

Update of /cvs/pkgs/rpms/pmd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29607

Modified Files:
	.cvsignore pmd.spec sources 
Added Files:
	pmd-4.2.4-build.patch pmd-4.2.4-nicerhtml.patch 
Log Message:
* Wed Jan 14 2009 Jerry James <loganjerry at gmail.com> - 0:4.2.4-1
- Upgrade to 4.2.4
- Drop unnecessary scripts/files in etc
- Add more documentation files
- Drop useless manual subpackage; it's really small, and contains files that
  should be docs for the main package


pmd-4.2.4-build.patch:

--- NEW FILE pmd-4.2.4-build.patch ---
diff -dur pmd-4.2.4.ORIG/bin/build.xml pmd-4.2.4/bin/build.xml
--- pmd-4.2.4.ORIG/bin/build.xml	2008-08-31 15:32:19.000000000 -0600
+++ pmd-4.2.4/bin/build.xml	2009-01-14 13:47:44.000000000 -0700
@@ -14,7 +14,6 @@
 	<property name="asm.version" value="3.1" />
 	<property name="jaxen.version" value="1.1.1" />
 	<property name="junit.version" value="4.4" />
-	<property name="retroweaver.version" value="2.0.5" />
 	<property name="javacc-home.path" value="${dir.lib}" />
 
 	<!--Settings-->
@@ -22,10 +21,12 @@
 
 	<path id="dependencies.path">
 		<pathelement location="${dir.build}" />
-		<fileset dir="${dir.lib}">
+		<fileset dir="/usr/share/java">
 			<include name="jaxen-${jaxen.version}.jar" />
+			<include name="junit4-${junit.version}.jar" />
+		</fileset>
+		<fileset dir="/usr/share/java/objectweb-asm">
 			<include name="asm-${asm.version}.jar" />
-			<include name="junit-${junit.version}.jar" />
 		</fileset>
 	</path>
 
@@ -76,7 +77,7 @@
 			<zipfileset dir="etc" includes="ruleset.dtd,ruleset_xml_schema.xsd" prefix="rulesets"/>
 			<manifest>
 				<attribute name="Main-Class" value="net.sourceforge.pmd.PMD" />
-				<attribute name="Class-Path" value="jaxen-${jaxen.version}.jar asm-${asm.version}.jar" />
+				<attribute name="Class-Path" value="jaxen-${jaxen.version}.jar objectweb-asm/asm-${asm.version}.jar" />
 			</manifest>
 		</jar>
 
@@ -86,58 +87,6 @@
 			basedir="${dir.build}" />
 	</target>
 
-	<taskdef name="retroweaver" classname="net.sourceforge.retroweaver.ant.RetroWeaverTask">
-		<classpath>
-			<pathelement location="${dir.lib14}/retroweaver-${retroweaver.version}.jar"/>
-			<pathelement location="${dir.lib14}/retroweaver-rt-${retroweaver.version}.jar"/>
-			<pathelement location="${dir.lib14}/backport-util-concurrent.jar"/>
-			<pathelement location="${dir.lib14}/asm-commons-${asm.version}.jar"/>
-			<pathelement location="${dir.lib14}/asm-util-${asm.version}.jar"/>
-			<pathelement location="${dir.lib}/asm-${asm.version}.jar"/>
-		</classpath>
-	</taskdef>
-
-	<target name="weavejunit" depends="jar">
-		<path id="retroweaverclasspath">
-			<pathelement location="${dir.lib14}/retroweaver-rt-${retroweaver.version}.jar"/>
-			<pathelement location="${dir.lib14}/backport-util-concurrent.jar"/>
-			<pathelement location="${dir.lib}/asm-${asm.version}.jar"/>
-			<pathelement location="${jvm14.runtime}" />
-			<pathelement location="${dir.lib}/jaxen-${jaxen.version}.jar" />
-			<pathelement location="${dir.lib14}/junit.jar" />
-			<pathelement location="${ant.jar}" />
-		</path>
-
-		<retroweaver inputjar="${dir.lib}/junit-${junit.version}.jar" outputjar="${dir.lib14}/junit.jar" target="1.4" failonerror="true" verify="true">
-			<classpath refid="retroweaverclasspath" />
-		</retroweaver>
-	</target>
-
-	<target name="weave" depends="jar, weavejunit">
-		<fail unless="ant.jar" message="ant.jar location is not defined properly" />
-		<fail unless="jvm14.runtime" message="jvm14.runtime (i.e. rt.jar) location is not defined properly" />
-
-		<path id="retroweaverclasspath">
-			<pathelement location="${dir.lib14}/pmd14-${version}.jar" />
-			<pathelement location="${dir.lib14}/pmd14-test-${version}.jar" />
-			<pathelement location="${dir.lib14}/retroweaver-rt-${retroweaver.version}.jar"/>
-			<pathelement location="${dir.lib14}/backport-util-concurrent.jar"/>
-			<pathelement location="${dir.lib}/asm-${asm.version}.jar"/>
-			<pathelement location="${jvm14.runtime}" />
-			<pathelement location="${dir.lib}/jaxen-${jaxen.version}.jar" />
-			<pathelement location="${dir.lib14}/junit.jar" />
-			<pathelement location="${ant.jar}" />
-		</path>
-
-		<retroweaver inputjar="${dir.lib}/pmd-${version}.jar" outputjar="${dir.lib14}/pmd14-${version}.jar" target="1.4" failonerror="true" verify="true">
-			<classpath refid="retroweaverclasspath" />
-		</retroweaver>
-
-		<retroweaver inputjar="${dir.lib}/pmd-test-${version}.jar" outputjar="${dir.lib14}/pmd14-test-${version}.jar" target="1.4" failonerror="true" verify="true">
-			<classpath refid="retroweaverclasspath" />
-		</retroweaver>
-	</target>
-
 	<target name="jarsrc" depends="copy,compile" description="Jars up the source directory">
 		<jar jarfile="${dir.lib}/pmd-src-${version}.jar" basedir="${dir.src}" />
 	</target>
@@ -247,44 +196,6 @@
 		</concat>
 	</target>
 
-	<path id="dependencies14.path">
-		<fileset dir="${dir.lib14}">
-			<include name="backport-util-concurrent.jar" />
-			<include name="pmd14-${version}.jar" />
-			<include name="pmd14-test-${version}.jar" />
-			<include name="retroweaver-rt-${retroweaver.version}.jar" />
-			<include name="junit.jar" />
-		</fileset>
-		<fileset dir="${dir.lib}">
-			<include name="jaxen-${jaxen.version}.jar" />
-			<include name="asm-${asm.version}.jar" />
-		</fileset>
-	</path>
-
-	<target name="test14" depends="requires-junit,compile,copy,weavejunit,weave" description="Runs the unit tests with 1.4 jvm">
-		<fail unless="jvm14.exe" message="jvm14.exe location is not defined properly" />
-
-		<antcall target="test-execute">
-			<param name="test.outputdir" value="${dir.build}/reports14"/>
-			<param name="test.jvm" value="${jvm14.exe}"/>
-			<param name="test.dependencies" value="dependencies14.path"/>
-			<param name="test.regression" value="false"/>
-			<param name="test.printsummary" value="true"/>
-		</antcall>
-	</target>
-
-	<target name="regress14" depends="requires-junit,compile,copy,weavejunit,weave" description="Runs the regression unit tests with 1.4 jvm">
-		<fail unless="jvm14.exe" message="jvm14.exe location is not defined properly" />
-
-		<antcall target="test-execute">
-			<param name="test.outputdir" value="${dir.build}/reports14"/>
-			<param name="test.jvm" value="${jvm14.exe}"/>
-			<param name="test.dependencies" value="dependencies14.path"/>
-			<param name="test.regression" value="true"/>
-			<param name="test.printsummary" value="false"/>
-		</antcall>
-	</target>
-
 	<target name="symtabtest" depends="compile" description="Runs the unit tests for the symboltable package">
 		<junit printsummary="yes" haltonfailure="yes">
 			<classpath>
@@ -422,7 +333,7 @@
 
 	<target name="clean" depends="delete,compile,copy" description="Does a complete recompile" />
 
-	<target name="dist" depends="clean,jar,weave" description="Preps things for a release" />
+	<target name="dist" depends="clean,jar" description="Preps things for a release" />
 
 	<target name="cpdjnlp" depends="dist" description="Uploads a new CPD JNLP thingy to the PMD web site">
 		<signjar jar="${dir.lib}/pmd-${version}.jar" storetype="${keystore.type}" alias="${keystore.alias}" keystore="${keystore.path}" storepass="${keystore.password}" />
@@ -464,7 +375,7 @@
 	<target name="javadoc" description="Generates Javadocs">
 		<mkdir dir="docs/api" />
 
-		<javadoc packagenames="com.*, net.*, org.*" sourcepath="${dir.src}" destdir="docs/api" doctitle="PMD ${version} API" failonerror="yes">
+		<javadoc packagenames="com.*, net.*, org.*" sourcepath="${dir.src}" destdir="docs/api" doctitle="PMD ${version} API" failonerror="yes" Encoding="latin1">
 			<tag name="todo" enabled="false"/>
 			<classpath>
 				<fileset dir="${dir.lib}">
@@ -475,7 +386,7 @@
 		</javadoc>
 	</target>
 
-	<target name="qa" depends="dist, regress, regress14, pmdOnPmd, cpdOnPmd, symtabtest, dfatest, cpdtest, javadoc" description="Runs all tests (used for continuous integration tests with cruise control)"/>
+	<target name="qa" depends="dist, regress, pmdOnPmd, cpdOnPmd, symtabtest, dfatest, cpdtest, javadoc" description="Runs all tests (used for continuous integration tests with cruise control)"/>
 
 </project>
 

pmd-4.2.4-nicerhtml.patch:

--- NEW FILE pmd-4.2.4-nicerhtml.patch ---
diff -dur pmd-4.2.4.ORIG/src/net/sourceforge/pmd/renderers/XSLTRenderer.java pmd-4.2.4/src/net/sourceforge/pmd/renderers/XSLTRenderer.java
--- pmd-4.2.4.ORIG/src/net/sourceforge/pmd/renderers/XSLTRenderer.java	2007-10-19 13:21:30.000000000 -0600
+++ pmd-4.2.4/src/net/sourceforge/pmd/renderers/XSLTRenderer.java	2009-01-14 16:16:48.000000000 -0700
@@ -45,9 +45,11 @@
 	 * @param xsltFilename
 	 */
 	public XSLTRenderer(String xsltFilename) {
-		File file = new File(xsltFilename);
-		if ( xsltFilename != null && file.exists() && file.canRead() ) {
-			this.xsltFilename = xsltFilename;
+		if ( xsltFilename != null ) {
+			File file = new File(xsltFilename);
+			if ( file.exists() && file.canRead() ) {
+				this.xsltFilename = xsltFilename;
+			}
 		}
 	}
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pmd/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	13 Mar 2007 23:10:32 -0000	1.2
+++ .cvsignore	14 Jan 2009 23:39:06 -0000	1.3
@@ -1 +1 @@
-pmd-src.tar.gz
+pmd-src-4.2.4.zip


Index: pmd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pmd/devel/pmd.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- pmd.spec	10 Jul 2008 02:01:37 -0000	1.4
+++ pmd.spec	14 Jan 2009 23:39:06 -0000	1.5
@@ -28,27 +28,34 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 Name:           pmd
-Version:        3.6
-Release:        1.4%{?dist}
+Version:        4.2.4
+Release:        1%{?dist}
 Epoch:          0
 Summary:        Scans Java source code and looks for potential problems
 License:        BSD
 
-# cvs -z3 -d:pserver:anonymous at pmd.cvs.sourceforge.net:/cvsroot/pmd export \
-# -r pmd_release_3_6 pmd
-# tar -czvf pmd-src.tar.gz pmd
-Source0:        %{name}-src.tar.gz
+Source0:        http://downloads.sourceforge.net/pmd/pmd-src-%{version}.zip
+# This patch has not been sent upstream.  It causes the build to use installed
+# jars for dependencies rather than use those distributed with the source.  It
+# also kills retroweaver dead, dead, dead so it won't interfere with the build.
+Patch0:         pmd-4.2.4-build.patch
+# This patch has not been sent upstream yet.  It fixes a null pointer exception
+# when using the nicehtml output format.
+Patch1:         pmd-4.2.4-nicerhtml.patch
 Url:            http://pmd.sourceforge.net/
 
 BuildRequires:  jpackage-utils >= 0:1.6
+BuildRequires:  java-devel
 BuildRequires:  ant >= 0:1.6
 BuildRequires:  ant-junit
-BuildRequires:  junit
-BuildRequires:  jaxen >= 0:1.1
-BuildRequires:  xerces-j2
+BuildRequires:  junit4 = 0:4.5
+BuildRequires:  jaxen >= 0:1.1.1
+BuildRequires:  objectweb-asm >= 0:3.1
 BuildRequires:  xml-commons-apis >= 1.3.02
-BuildRequires:  jakarta-oro
-Requires:       jaxen >= 0:1.1
+Requires:       jpackage-utils >= 0:1.6
+Requires:       java
+Requires:       jaxen >= 0:1.1.1
+Requires:       objectweb-asm >= 0:3.1
 Requires:       xerces-j2
 Requires:       xml-commons-apis >= 1.3.02
 Requires:       jakarta-oro
@@ -56,27 +63,21 @@
 Buildarch:      noarch
 Buildroot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-%description
-PMD scans Java source code and looks for potential 
-problems like:
-+ Unused local variables 
-+ Empty catch blocks 
-+ Unused parameters 
-+ Empty 'if' statements 
-+ Duplicate import statements 
-+ Unused private methods 
-+ Classes which could be Singletons 
-+ Short/long variable and method names 
-PMD has plugins for JDeveloper, JEdit, JBuilder, 
-NetBeans/Sun ONE Studio, IntelliJ IDEA, TextPad, 
-Maven, Ant, Eclipse, Gel, and Emacs. 
-
-%package manual
-Summary:        Manual for %{name}
-Group:          Documentation
+Provides:       %{name}-manual = %{epoch}:%{version}-%{release}
+Obsoletes:      %{name}-manual < 0:4.0.0-1
 
-%description manual
-Documentation for %{name}.
+%description
+PMD scans Java source code and looks for potential problems like:
+* Possible bugs: empty try/catch/finally/switch statements
++ Dead code: unused local variables, parameters and private methods
++ Suboptimal code: wasteful String/StringBuffer usage
++ Overcomplicated expressions: unnecessary if statements, for loops
+  that could be while loops
++ Duplicate code: copied/pasted code means copied/pasted bugs
+
+PMD has plugins for JDeveloper, Eclipse, JEdit, JBuilder, BlueJ,
+CodeGuide, NetBeans/Sun Java Studio Enterprise/Creator, IntelliJ IDEA,
+TextPad, Maven, Ant, Gel, JCreator, and Emacs.
 
 %package javadoc
 Summary:        Javadoc for %{name}
@@ -86,23 +87,19 @@
 Javadoc for %{name}.
 
 %prep
-%setup -q -n %{name}
+%setup -q
+%patch0 -p1
+%patch1 -p1
 
-# set right permissions
-find . -name "*.sh" -exec chmod 755 \{\} \;
 # remove all binary libs
 find . -name "*.jar" -exec rm -f {} \;
 
+# remove an unneeded script in an otherwise documentation directory
+rm -f etc/fr_docs/copy_up.sh
+
 %build
-export OPT_JAR_LIST="ant/ant-junit junit"
-export CLASSPATH=$(build-classpath \
-jaxen \
-oro \
-xerces-j2 \
-xml-commons-apis)
-CLASSPATH=$CLASSPATH:target/classes:target/test-classes
-cd bin
-ant -Dbuild.sysclasspath=only dist javadoc
+ant -Djunit.version=4.5 jar
+ant -f bin/build.xml -Ddir.lib=%{_javadir} javadoc
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -113,8 +110,10 @@
   $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
 (cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}.jar; \
    do ln -sf ${jar} ${jar/-%{version}/}; done)
-install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/%{name}-%{version}/etc
-cp -pr etc/* $RPM_BUILD_ROOT%{_datadir}/%{name}-%{version}/etc
+install -d -m 755 $RPM_BUILD_ROOT%{_sysconfdir}
+cp -p etc/pmd-nicerhtml.xsl $RPM_BUILD_ROOT%{_sysconfdir}
+install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/%{name}-%{version}
+cp -pr etc/xslt $RPM_BUILD_ROOT%{_datadir}/%{name}-%{version}
 install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/%{name}-%{version}/rulesets
 cp -pr rulesets/* $RPM_BUILD_ROOT%{_datadir}/%{name}-%{version}/rulesets
 
@@ -123,28 +122,29 @@
 cp -pr docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 
-# manual
-install -d -m 755 $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
-cp -p LICENSE.txt $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(0644,root,root,0755)
-%doc LICENSE.txt
+%doc LICENSE.txt etc/changelog.txt etc/fr_docs etc/readme.txt
+%doc etc/pmdProperties.rtf
 %{_javadir}/*.jar
 %{_datadir}/%{name}-%{version}
-
-%files manual
-%defattr(0644,root,root,0755)
-%doc %{_docdir}/%{name}-%{version}
+%config(noreplace) %{_sysconfdir}/pmd-nicerhtml.xsl
 
 %files javadoc
 %defattr(0644,root,root,0755)
 %{_javadocdir}/*
 
 %changelog
+* Wed Jan 14 2009 Jerry James <loganjerry at gmail.com> - 0:4.2.4-1
+- Upgrade to 4.2.4
+- Drop unnecessary scripts/files in etc
+- Add more documentation files
+- Drop useless manual subpackage; it's really small, and contains files that
+  should be docs for the main package
+
 * Wed Jul  9 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0:3.6-1.4
 - fix license tag
 - drop disttag


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pmd/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	13 Mar 2007 23:10:32 -0000	1.2
+++ sources	14 Jan 2009 23:39:06 -0000	1.3
@@ -1 +1 @@
-e6539a1bba0c35b4fd76e46a33b8c219  pmd-src.tar.gz
+b030b3a265b612d980a339996d52f723  pmd-src-4.2.4.zip



From georgiou at fedoraproject.org  Wed Jan 14 23:54:10 2009
From: georgiou at fedoraproject.org (Kostas Georgiou)
Date: Wed, 14 Jan 2009 23:54:10 +0000 (UTC)
Subject: rpms/ganglia/F-10 gmetad-bof-dos.patch, NONE, 1.1 ganglia.spec, 1.21,
	1.22
Message-ID: <20090114235410.5889470124@cvs1.fedora.phx.redhat.com>

Author: georgiou

Update of /cvs/extras/rpms/ganglia/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30778

Modified Files:
	ganglia.spec 
Added Files:
	gmetad-bof-dos.patch 
Log Message:
Fix gmetad buffer overflow


gmetad-bof-dos.patch:

--- NEW FILE gmetad-bof-dos.patch ---
--- gmetad/server.c.orig	2009-01-09 00:30:10.000000000 +0800
+++ gmetad/server.c	2009-01-09 00:42:52.000000000 +0800
@@ -11,6 +11,7 @@
 #include "dtd.h"
 #include "gmetad.h"
 #include "my_inet_ntop.h"
+#include <stdlib.h>
 
 extern g_tcp_socket *server_socket;
 extern pthread_mutex_t  server_socket_mutex;
@@ -377,7 +378,7 @@
 process_path (client_t *client, char *path, datum_t *myroot, datum_t *key)
 {
    char *p, *q, *pathend;
-   char element[256];
+   char *element;
    int rc, len;
    datum_t *found;
    datum_t findkey;
@@ -419,6 +420,8 @@
          if (!q) q=pathend;
       
          len = q-p;
+         /* +1 not needed as q-p is already accounting for that */
+         element = malloc(len);
          strncpy(element, p, len);
          element[len] = '\0';
       
@@ -435,10 +438,13 @@
                rc = process_path(client, q, found, &findkey);
                
                datum_free(found);
+               free(element);
             }
          else
             {
-               rc = process_path(client, 0, myroot, NULL);
+               /* element not found */
+               free(element);
+               return 1;
             }
       }
    if (rc) return 1;
@@ -600,8 +606,8 @@
                if (process_request(&client, request))
                   {
                      err_msg("Got a malformed path request from %s", remote_ip);
-                     /* Send them the entire tree to discourage attacks. */
-                     strcpy(request, "/");
+                     close(client.fd);
+                     continue;
                   }
             }
          else


Index: ganglia.spec
===================================================================
RCS file: /cvs/extras/rpms/ganglia/F-10/ganglia.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- ganglia.spec	24 Oct 2008 14:22:34 -0000	1.21
+++ ganglia.spec	14 Jan 2009 23:53:39 -0000	1.22
@@ -1,6 +1,6 @@
 Name:               ganglia
 Version:            3.1.1
-Release:            1%{?svnrev:.r%{svnrev}}%{?dist}
+Release:            2%{?svnrev:.r%{svnrev}}%{?dist}
 Summary:            Ganglia Distributed Monitoring System
 
 Group:              Applications/Internet
@@ -9,6 +9,7 @@
 Source0:            http://dl.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.gz
 #Source0:            http://www.ganglia.info/snapshots/3.1.x/%{name}-%{version}.%{svnrev}.tar.gz
 Patch0:             diskusage-fix.patch
+Patch1:             gmetad-bof-dos.patch
 Buildroot:          %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:      rrdtool-devel, apr-devel >= 1
@@ -89,6 +90,7 @@
 %prep
 %setup -q -n %{name}-%{version}%{?svnrev:.%{svnrev}}
 %patch0 -p0
+%patch1 -p0
 ## Hey, those shouldn't be executable...
 chmod -x lib/*.{h,x}
 
@@ -264,11 +266,15 @@
 %defattr(-,root,root,-)
 %doc web/AUTHORS web/COPYING
 %config(noreplace) %{_sysconfdir}/%{name}/conf.php
-%config(noreplace) %{_sysconfdir}/%{name}/private_clusters
+%attr(0640,root,apache) %config(noreplace) %{_sysconfdir}/%{name}/private_clusters
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/%{name}.conf
 %{_datadir}/%{name}
 
 %changelog
+* Wed Jan 14 2009 Kostas Georgiou <k.georgiou at imperial.ac.uk> - 3.1.1-2
+- Fix for gmetad server buffer overflow
+- The private_clusters file should not be readable by everyone
+
 * Fri Oct 24 2008 Jarod Wilson <jarod at redhat.com> 3.1.1-1
 - Update to 3.1.1
 



From kkofler at fedoraproject.org  Wed Jan 14 23:57:55 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Wed, 14 Jan 2009 23:57:55 +0000 (UTC)
Subject: rpms/libmal/devel libmal.spec,1.10,1.11
Message-ID: <20090114235755.42CAF70124@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/libmal/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31212/devel

Modified Files:
	libmal.spec 
Log Message:
- package new file %{_bindir}/malsync


Index: libmal.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libmal/devel/libmal.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- libmal.spec	14 Jan 2009 23:38:33 -0000	1.10
+++ libmal.spec	14 Jan 2009 23:57:24 -0000	1.11
@@ -61,6 +61,7 @@
 %doc ChangeLog README
 #empties
 #doc AUTHORS NEWS TODO
+%{_bindir}/malsync
 %{_libdir}/lib*.so.*
 
 %files devel
@@ -74,6 +75,7 @@
 - update to 0.44 (for kdepim 4.2)
 - drop libmal-0.31-pi12.patch (fixed upstream)
 - rebase 64bit patch
+- package new file %%{_bindir}/malsync
 
 * Fri Feb 08 2008 Rex Dieter <rdieter at fedoraproject.org> 0.31-8 
 - respin (gcc43)



From georgiou at fedoraproject.org  Thu Jan 15 00:06:57 2009
From: georgiou at fedoraproject.org (Kostas Georgiou)
Date: Thu, 15 Jan 2009 00:06:57 +0000 (UTC)
Subject: rpms/ganglia/F-9 gmetad-bof-dos.patch, NONE, 1.1 ganglia.spec, 1.13,
	1.14
Message-ID: <20090115000657.5B7CE7012D@cvs1.fedora.phx.redhat.com>

Author: georgiou

Update of /cvs/extras/rpms/ganglia/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32555

Modified Files:
	ganglia.spec 
Added Files:
	gmetad-bof-dos.patch 
Log Message:
Fix gmetad buffer overflow


gmetad-bof-dos.patch:

--- NEW FILE gmetad-bof-dos.patch ---
--- gmetad/server.c.orig	2009-01-09 00:30:10.000000000 +0800
+++ gmetad/server.c	2009-01-09 00:42:52.000000000 +0800
@@ -11,6 +11,7 @@
 #include "dtd.h"
 #include "gmetad.h"
 #include "my_inet_ntop.h"
+#include <stdlib.h>
 
 extern g_tcp_socket *server_socket;
 extern pthread_mutex_t  server_socket_mutex;
@@ -377,7 +378,7 @@
 process_path (client_t *client, char *path, datum_t *myroot, datum_t *key)
 {
    char *p, *q, *pathend;
-   char element[256];
+   char *element;
    int rc, len;
    datum_t *found;
    datum_t findkey;
@@ -419,6 +420,8 @@
          if (!q) q=pathend;
       
          len = q-p;
+         /* +1 not needed as q-p is already accounting for that */
+         element = malloc(len);
          strncpy(element, p, len);
          element[len] = '\0';
       
@@ -435,10 +438,13 @@
                rc = process_path(client, q, found, &findkey);
                
                datum_free(found);
+               free(element);
             }
          else
             {
-               rc = process_path(client, 0, myroot, NULL);
+               /* element not found */
+               free(element);
+               return 1;
             }
       }
    if (rc) return 1;
@@ -600,8 +606,8 @@
                if (process_request(&client, request))
                   {
                      err_msg("Got a malformed path request from %s", remote_ip);
-                     /* Send them the entire tree to discourage attacks. */
-                     strcpy(request, "/");
+                     close(client.fd);
+                     continue;
                   }
             }
          else


Index: ganglia.spec
===================================================================
RCS file: /cvs/extras/rpms/ganglia/F-9/ganglia.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- ganglia.spec	1 Jul 2008 11:36:19 -0000	1.13
+++ ganglia.spec	15 Jan 2009 00:06:26 -0000	1.14
@@ -1,12 +1,13 @@
 Name:               ganglia
 Version:            3.0.7
-Release:            2%{?dist}
+Release:            3%{?dist}
 Summary:            Ganglia Distributed Monitoring System
 
 Group:              Applications/Internet
 License:            BSD
 URL:                http://ganglia.sourceforge.net/
 Source0:            http://dl.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.gz
+Patch0:             gmetad-bof-dos.patch
 Buildroot:          %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:      rrdtool-devel
@@ -70,6 +71,7 @@
 
 %prep 
 %setup -q
+%patch0 -p0
 ## Hey, those shouldn't be executable...
 chmod -x lib/*.{h,x}
 
@@ -205,6 +207,9 @@
 %{_datadir}/%{name}
 
 %changelog
+* Wed Jan 14 2009 Kostas Georgiou <k.georgiou at imperial.ac.uk> - 3.0.7-3
+- Fix for gmetad server buffer overflow 
+
 * Tue Jul  1 2008 Kostas Georgiou <k.georgiou at imperial.ac.uk> 3.0.7-2
 - Rebuild for new rrdtool release
 



From jgu at fedoraproject.org  Thu Jan 15 00:08:59 2009
From: jgu at fedoraproject.org (Jonathan G. Underwood)
Date: Thu, 15 Jan 2009 00:08:59 +0000 (UTC)
Subject: rpms/shorewall/devel shorewall.spec,1.66,1.67
Message-ID: <20090115000859.193E47012D@cvs1.fedora.phx.redhat.com>

Author: jgu

Update of /cvs/extras/rpms/shorewall/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv301

Modified Files:
	shorewall.spec 
Log Message:
* Thu Jan 15 2009 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 4.2.4-2
- Fix up dependencies between sub-packages
- No longer attempt to own all files in /var/lib/shorewall* but rather clean
  them up on package removal



Index: shorewall.spec
===================================================================
RCS file: /cvs/extras/rpms/shorewall/devel/shorewall.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- shorewall.spec	11 Jan 2009 23:41:38 -0000	1.66
+++ shorewall.spec	15 Jan 2009 00:08:28 -0000	1.67
@@ -11,7 +11,7 @@
 
 Name:           shorewall
 Version:	%{major_ver}
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	An iptables front end for firewall configuration
 Group:		Applications/System
 License:	GPLv2+
@@ -73,7 +73,7 @@
 Summary:	Perl-based compiler for Shoreline Firewall 
 Group: 	 	Applications/System
 Version:	%{perl_ver}
-Requires:	shorewall-common = %{version}-%{release}
+Requires:	shorewall-common = %{common_ver}-%{release}
 Requires:	perl
 
 %description perl
@@ -84,7 +84,7 @@
 Summary:	Shell-based compiler for Shoreline Firewall 
 Group: 	 	Applications/System
 Version:	%{shell_ver}
-Requires:	shorewall-common = %{version}-%{release}
+Requires:	shorewall-common = %{common_ver}-%{release}
 
 %description shell
 Shorewall-shell is a part of Shorewall that allows running Shorewall
@@ -161,10 +161,6 @@
 ./install.sh
 popd
 
-# Create %ghost files
-install -d $RPM_BUILD_ROOT/%{_localstatedir}/lib/shorewall
-touch $RPM_BUILD_ROOT/%{_localstatedir}/lib/shorewall/{chains,nat,proxyarp,restarted,zones,restore-base,restore-tail,state,.modules,.modulesdir}
-
 #### Build shorewall-perl
 pushd shorewall-perl-%{perl_ver}
 ./install.sh -n
@@ -202,6 +198,7 @@
 if [ $1 = 0 ]; then
    /sbin/service shorewall stop >/dev/null 2>&1
    /sbin/chkconfig --del shorewall
+   rm -f /var/lib/shorewall/*
 fi
 
 %post -n shorewall6
@@ -213,6 +210,7 @@
 if [ $1 = 0 ]; then
    /sbin/service shorewall6 stop >/dev/null 2>&1
    /sbin/chkconfig --del shorewall6
+   rm -f /var/lib/shorewall6/*
 fi
 
 %post lite
@@ -224,6 +222,7 @@
 if [ $1 = 0 ]; then
    /sbin/service shorewall stop >/dev/null 2>&1
    /sbin/chkconfig --del shorewall-lite
+   rm -f /var/lib/shorewall-lite/*
 fi
 
 %post -n shorewall6-lite
@@ -235,6 +234,7 @@
 if [ $1 = 0 ]; then
    /sbin/service shorewall6-lite stop >/dev/null 2>&1
    /sbin/chkconfig --del shorewall6-lite
+   rm -f /var/lib/shorewall6-lite/*
 fi
 
 %files
@@ -261,10 +261,7 @@
 %{_datadir}/shorewall/configfiles
 %{_datadir}/shorewall/functions
 %{_datadir}/shorewall/lib.*
-
 %dir %{_localstatedir}/lib/shorewall
-%ghost %{_localstatedir}/lib/shorewall/*
-%ghost %{_localstatedir}/lib/shorewall/.*
 
 # Man files - can't use /man5/* here as shorewall-lite also has man5 pages
 %{_mandir}/man5/shorewall-tunnels.5.gz
@@ -372,7 +369,6 @@
 %{_mandir}/man5/shorewall6-zones.5.gz
 %{_mandir}/man5/shorewall6.conf.5.gz
 %{_mandir}/man8/shorewall6.8.gz
-
 %attr(0755,root,root) %{_datadir}/shorewall6/wait4ifup
 %{_datadir}/shorewall6/action.*
 %{_datadir}/shorewall6/actions.std
@@ -383,6 +379,7 @@
 %{_datadir}/shorewall6/macro.Ping
 %{_datadir}/shorewall6/modules
 %{_datadir}/shorewall6/version
+%dir %{_localstatedir}/lib/shorewall
 
 %files -n shorewall6-lite
 %defattr(0644,root,root,0755)
@@ -392,11 +389,10 @@
 %config(noreplace) %{_sysconfdir}/shorewall6-lite/shorewall6-lite.conf
 %attr(0755,root,root) %{_initrddir}/shorewall6-lite
 %{_sysconfdir}/shorewall6-lite/Makefile
-
+%dir %{_localstatedir}/lib/shorewall
 %{_mandir}/man5/shorewall6-lite-vardir.5.gz
 %{_mandir}/man5/shorewall6-lite.conf.5.gz
 %{_mandir}/man8/shorewall6-lite.8.gz
-
 %{_datadir}/shorewall6-lite/configpath
 %{_datadir}/shorewall6-lite/functions
 %{_datadir}/shorewall6-lite/lib.*
@@ -406,6 +402,11 @@
 %attr(0755,root,root) %{_datadir}/shorewall6-lite/wait4ifup
 
 %changelog
+* Thu Jan 15 2009 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 4.2.4-2
+- Fix up dependencies between sub-packages
+- No longer attempt to own all files in /var/lib/shorewall* but rather clean
+  them up on package removal
+
 * Sun Jan 11 2009 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 4.2.4-1
 - Update to version 4.2.4 which adds IPV6 support and two new sub-packages
   (shorewall6 and shorewall6-lite) 



From jgu at fedoraproject.org  Thu Jan 15 00:11:29 2009
From: jgu at fedoraproject.org (Jonathan G. Underwood)
Date: Thu, 15 Jan 2009 00:11:29 +0000 (UTC)
Subject: rpms/shorewall/F-10 shorewall.spec,1.66,1.67
Message-ID: <20090115001129.EF6527012D@cvs1.fedora.phx.redhat.com>

Author: jgu

Update of /cvs/extras/rpms/shorewall/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv556

Modified Files:
	shorewall.spec 
Log Message:
* Thu Jan 15 2009 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 4.2.4-2
- Fix up dependencies between sub-packages
- No longer attempt to own all files in /var/lib/shorewall* but rather clean
  them up on package removal



Index: shorewall.spec
===================================================================
RCS file: /cvs/extras/rpms/shorewall/F-10/shorewall.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- shorewall.spec	11 Jan 2009 23:43:12 -0000	1.66
+++ shorewall.spec	15 Jan 2009 00:10:59 -0000	1.67
@@ -11,7 +11,7 @@
 
 Name:           shorewall
 Version:	%{major_ver}
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	An iptables front end for firewall configuration
 Group:		Applications/System
 License:	GPLv2+
@@ -73,7 +73,7 @@
 Summary:	Perl-based compiler for Shoreline Firewall 
 Group: 	 	Applications/System
 Version:	%{perl_ver}
-Requires:	shorewall-common = %{version}-%{release}
+Requires:	shorewall-common = %{common_ver}-%{release}
 Requires:	perl
 
 %description perl
@@ -84,7 +84,7 @@
 Summary:	Shell-based compiler for Shoreline Firewall 
 Group: 	 	Applications/System
 Version:	%{shell_ver}
-Requires:	shorewall-common = %{version}-%{release}
+Requires:	shorewall-common = %{common_ver}-%{release}
 
 %description shell
 Shorewall-shell is a part of Shorewall that allows running Shorewall
@@ -161,10 +161,6 @@
 ./install.sh
 popd
 
-# Create %ghost files
-install -d $RPM_BUILD_ROOT/%{_localstatedir}/lib/shorewall
-touch $RPM_BUILD_ROOT/%{_localstatedir}/lib/shorewall/{chains,nat,proxyarp,restarted,zones,restore-base,restore-tail,state,.modules,.modulesdir}
-
 #### Build shorewall-perl
 pushd shorewall-perl-%{perl_ver}
 ./install.sh -n
@@ -202,6 +198,7 @@
 if [ $1 = 0 ]; then
    /sbin/service shorewall stop >/dev/null 2>&1
    /sbin/chkconfig --del shorewall
+   rm -f /var/lib/shorewall/*
 fi
 
 %post -n shorewall6
@@ -213,6 +210,7 @@
 if [ $1 = 0 ]; then
    /sbin/service shorewall6 stop >/dev/null 2>&1
    /sbin/chkconfig --del shorewall6
+   rm -f /var/lib/shorewall6/*
 fi
 
 %post lite
@@ -224,6 +222,7 @@
 if [ $1 = 0 ]; then
    /sbin/service shorewall stop >/dev/null 2>&1
    /sbin/chkconfig --del shorewall-lite
+   rm -f /var/lib/shorewall-lite/*
 fi
 
 %post -n shorewall6-lite
@@ -235,6 +234,7 @@
 if [ $1 = 0 ]; then
    /sbin/service shorewall6-lite stop >/dev/null 2>&1
    /sbin/chkconfig --del shorewall6-lite
+   rm -f /var/lib/shorewall6-lite/*
 fi
 
 %files
@@ -261,10 +261,7 @@
 %{_datadir}/shorewall/configfiles
 %{_datadir}/shorewall/functions
 %{_datadir}/shorewall/lib.*
-
 %dir %{_localstatedir}/lib/shorewall
-%ghost %{_localstatedir}/lib/shorewall/*
-%ghost %{_localstatedir}/lib/shorewall/.*
 
 # Man files - can't use /man5/* here as shorewall-lite also has man5 pages
 %{_mandir}/man5/shorewall-tunnels.5.gz
@@ -372,7 +369,6 @@
 %{_mandir}/man5/shorewall6-zones.5.gz
 %{_mandir}/man5/shorewall6.conf.5.gz
 %{_mandir}/man8/shorewall6.8.gz
-
 %attr(0755,root,root) %{_datadir}/shorewall6/wait4ifup
 %{_datadir}/shorewall6/action.*
 %{_datadir}/shorewall6/actions.std
@@ -383,6 +379,7 @@
 %{_datadir}/shorewall6/macro.Ping
 %{_datadir}/shorewall6/modules
 %{_datadir}/shorewall6/version
+%dir %{_localstatedir}/lib/shorewall
 
 %files -n shorewall6-lite
 %defattr(0644,root,root,0755)
@@ -392,11 +389,10 @@
 %config(noreplace) %{_sysconfdir}/shorewall6-lite/shorewall6-lite.conf
 %attr(0755,root,root) %{_initrddir}/shorewall6-lite
 %{_sysconfdir}/shorewall6-lite/Makefile
-
+%dir %{_localstatedir}/lib/shorewall
 %{_mandir}/man5/shorewall6-lite-vardir.5.gz
 %{_mandir}/man5/shorewall6-lite.conf.5.gz
 %{_mandir}/man8/shorewall6-lite.8.gz
-
 %{_datadir}/shorewall6-lite/configpath
 %{_datadir}/shorewall6-lite/functions
 %{_datadir}/shorewall6-lite/lib.*
@@ -406,6 +402,11 @@
 %attr(0755,root,root) %{_datadir}/shorewall6-lite/wait4ifup
 
 %changelog
+* Thu Jan 15 2009 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 4.2.4-2
+- Fix up dependencies between sub-packages
+- No longer attempt to own all files in /var/lib/shorewall* but rather clean
+  them up on package removal
+
 * Sun Jan 11 2009 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 4.2.4-1
 - Update to version 4.2.4 which adds IPV6 support and two new sub-packages
   (shorewall6 and shorewall6-lite) 



From nim at fedoraproject.org  Thu Jan 15 00:21:22 2009
From: nim at fedoraproject.org (Nicolas Mailhot)
Date: Thu, 15 Jan 2009 00:21:22 +0000 (UTC)
Subject: rpms/fontpackages/devel .cvsignore, 1.4, 1.5 fontpackages.spec, 1.4,
	1.5 import.log, 1.4, 1.5 sources, 1.4, 1.5
Message-ID: <20090115002122.3D5E57012D@cvs1.fedora.phx.redhat.com>

Author: nim

Update of /cvs/extras/rpms/fontpackages/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1253/devel

Modified Files:
	.cvsignore fontpackages.spec import.log sources 
Log Message:
1.14


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fontpackages/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	22 Dec 2008 12:31:30 -0000	1.4
+++ .cvsignore	15 Jan 2009 00:20:51 -0000	1.5
@@ -1 +1 @@
-fontpackages-1.13.tar.bz2
+fontpackages-1.14.tar.bz2


Index: fontpackages.spec
===================================================================
RCS file: /cvs/extras/rpms/fontpackages/devel/fontpackages.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- fontpackages.spec	22 Dec 2008 12:31:30 -0000	1.4
+++ fontpackages.spec	15 Jan 2009 00:20:51 -0000	1.5
@@ -3,7 +3,7 @@
 %define rpmmacrodir     %{_sysconfdir}/rpm/
 
 Name:    fontpackages
-Version: 1.13
+Version: 1.14
 Release: 1%{?dist}
 Summary: Common directory and macro definitions used by font packages
 
@@ -97,26 +97,34 @@
 
 
 %changelog
+* Wed Jan 14 2009 Nicolas Mailhot <nim at fedoraproject dot org>
+- 1.13-1
+??? Update for subpackage naming changes requested by FPC
+
 * Mon Dec 22 2008 Nicolas Mailhot <nim at fedoraproject dot org>
 - 1.13-1
 ??? Add another directory to avoid depending on unowned stuff
 ??? use it to put the fontconfig examples in a better place
+
 * Sun Dec 21 2008 Nicolas Mailhot <nim at fedoraproject dot org>
 - 1.12-2
 ??? Change homepage
+
 * Fri Dec 19 2008 Nicolas Mailhot <nim at fedoraproject dot org>
 - 1.12-1
 ??? Add another macro to allow building fontconfig without cycling
+
 * Wed Dec 10 2008 Nicolas Mailhot <nim at fedoraproject dot org>
 - 1.11-1
 ??? Add actual fedorahosted references
+
 * Sun Nov 23 2008 Nicolas Mailhot <nim at fedoraproject dot org>
 - 1.10-1
 ??? renamed to ???fontpackages???
+
 * Fri Nov 14 2008 Nicolas Mailhot <nim at fedoraproject dot org>
 - 1.9-1
 ??? fix and complete fontconfig doc
-* Fri Nov 14 2008 Nicolas Mailhot <nim at fedoraproject dot org>
 - 1.8-1
 ??? simplify multi spec template: codify general case
 - 1.7-1


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/fontpackages/devel/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- import.log	22 Dec 2008 12:31:30 -0000	1.4
+++ import.log	15 Jan 2009 00:20:51 -0000	1.5
@@ -2,3 +2,4 @@
 fontpackages-1_12-1_fc11:HEAD:fontpackages-1.12-1.fc11.src.rpm:1229726060
 fontpackages-1_12-2_fc11:HEAD:fontpackages-1.12-2.fc11.src.rpm:1229863050
 fontpackages-1_13-1_fc11:HEAD:fontpackages-1.13-1.fc11.src.rpm:1229949018
+fontpackages-1_14-1_fc11:HEAD:fontpackages-1.14-1.fc11.src.rpm:1231978787


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fontpackages/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	22 Dec 2008 12:31:30 -0000	1.4
+++ sources	15 Jan 2009 00:20:51 -0000	1.5
@@ -1 +1 @@
-8d7eb82ee9fafc3f0826da58b9bb537f  fontpackages-1.13.tar.bz2
+a90a6bbc2937c847fb32cad0bac41726  fontpackages-1.14.tar.bz2



From mjakubicek at fedoraproject.org  Thu Jan 15 00:25:41 2009
From: mjakubicek at fedoraproject.org (=?utf-8?b?TWlsb8WhIEpha3Viw63EjWVr?=)
Date: Thu, 15 Jan 2009 00:25:41 +0000 (UTC)
Subject: rpms/boinc-client/devel boinc-rsa.patch, NONE, 1.1 boinc-client.spec,
	1.20, 1.21
Message-ID: <20090115002541.1801C7012D@cvs1.fedora.phx.redhat.com>

Author: mjakubicek

Update of /cvs/pkgs/rpms/boinc-client/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1525

Modified Files:
	boinc-client.spec 
Added Files:
	boinc-rsa.patch 
Log Message:
- Fix security bug BZ#479664



boinc-rsa.patch:

--- NEW FILE boinc-rsa.patch ---
--- boinc_core_release_6_4_5/lib/crypt.cpp (revision 16069)
+++ boinc_core_release_6_4_5/lib/crypt.cpp (revision 16883)
@@ -244,5 +244,5 @@
 //
 int encrypt_private(R_RSA_PRIVATE_KEY& key, DATA_BLOCK& in, DATA_BLOCK& out) {
-    int n, modulus_len;
+    int n, modulus_len, retval;
 
     modulus_len = (key.bits+7)/8;
@@ -253,5 +253,9 @@
     RSA* rp = RSA_new();
     private_to_openssl(key, rp);
-    RSA_private_encrypt(n, in.data, out.data, rp, RSA_PKCS1_PADDING);
+    retval = RSA_private_encrypt(n, in.data, out.data, rp, RSA_PKCS1_PADDING);
+    if (retval < 0) {
+        RSA_free(rp);
+        return ERR_CRYPTO;
+    }
     out.len = RSA_size(rp);
     RSA_free(rp);
@@ -260,8 +264,14 @@
 
 int decrypt_public(R_RSA_PUBLIC_KEY& key, DATA_BLOCK& in, DATA_BLOCK& out) {
+    int retval;
     RSA* rp = RSA_new();
     public_to_openssl(key, rp);
-    RSA_public_decrypt(in.len, in.data, out.data, rp, RSA_PKCS1_PADDING);
+    retval = RSA_public_decrypt(in.len, in.data, out.data, rp, RSA_PKCS1_PADDING);
+    if (retval < 0) {
+        RSA_free(rp);
+        return ERR_CRYPTO;
+    }
     out.len = RSA_size(rp);
+    RSA_free(rp);
     return 0;
 }
--- boinc_core_release_6_4_5/lib/error_numbers.h (revision 15762)
+++ boinc_core_release_6_4_5/lib/error_numbers.h (revision 16883)
@@ -186,4 +186,5 @@
 #define ERR_SYMLINK         -229
 #define ERR_DB_CONN_LOST    -230
+#define ERR_CRYPTO          -231
 
 // PLEASE: add a text description of your error to 
--- boinc_core_release_6_4_5/lib/str_util.cpp (revision 16069)
+++ boinc_core_release_6_4_5/lib/str_util.cpp (revision 16883)
@@ -736,4 +736,5 @@
         case ERR_SYMLINK: return "symlink() failed";
         case ERR_DB_CONN_LOST: return "DB connection lost during enumeration";
+        case ERR_CRYPTO: return "encryption error";
         case 404: return "HTTP file not found";
         case 407: return "HTTP proxy authentication failure";


Index: boinc-client.spec
===================================================================
RCS file: /cvs/pkgs/rpms/boinc-client/devel/boinc-client.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- boinc-client.spec	1 Jan 2009 22:35:38 -0000	1.20
+++ boinc-client.spec	15 Jan 2009 00:25:10 -0000	1.21
@@ -4,7 +4,7 @@
 Summary:	The BOINC client core
 Name:		boinc-client
 Version:	6.4.5
-Release:	1.%{snap}svn%{?dist}
+Release:	2.%{snap}svn%{?dist}
 License:	LGPLv2+
 Group:		Applications/Engineering
 URL:		http://boinc.berkeley.edu/
@@ -26,6 +26,8 @@
 #Remove -fomit-frame-pointer and -ffast-math gcc flags:
 #Reported in upstream bugtracker: http://boinc.berkeley.edu/trac/ticket/647
 Patch1:		boinc-gccflags.patch
+#Fix security bug BZ#479664
+Patch2:		boinc-rsa.patch
 #Change locales filenames from "BOINC Manager.mo" into "BOINC-Manager.mo"
 #so that we can use the find_lang macro.
 #Reported in upstream bugtracker: http://boinc.berkeley.edu/trac/ticket/722
@@ -94,6 +96,7 @@
 %prep
 %setup -q -n boinc_core_release_%{version_}
 %patch1 -p1
+%patch2 -p1
 %patch3 -p1
 
 %build
@@ -269,6 +272,9 @@
 %{_includedir}/boinc/*
 
 %changelog
+* Thu Jan 15 2009 Milos Jakubicek <xjakub at fi.muni.cz> - 6.4.5-2.20081217svn
+- Fix security bug BZ#479664
+
 * Wed Dec 17 2008 Milos Jakubicek <xjakub at fi.muni.cz> - 6.4.5-1.20081217svn
 - Update to 6.4.5
 - Updated boinc-gccflags.patch and boinc-locales.patch



From jgu at fedoraproject.org  Thu Jan 15 00:26:39 2009
From: jgu at fedoraproject.org (Jonathan G. Underwood)
Date: Thu, 15 Jan 2009 00:26:39 +0000 (UTC)
Subject: rpms/shorewall/devel .cvsignore, 1.45, 1.46 shorewall.spec, 1.67,
	1.68 sources, 1.45, 1.46
Message-ID: <20090115002639.9A6827012D@cvs1.fedora.phx.redhat.com>

Author: jgu

Update of /cvs/extras/rpms/shorewall/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1731

Modified Files:
	.cvsignore shorewall.spec sources 
Log Message:
* Thu Jan 15 2009 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 4.2.4-3
- Update shorewall-perl to 4.2.4.6



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/shorewall/devel/.cvsignore,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- .cvsignore	11 Jan 2009 23:41:37 -0000	1.45
+++ .cvsignore	15 Jan 2009 00:26:09 -0000	1.46
@@ -2,5 +2,5 @@
 shorewall6-lite-4.2.4.1.tar.bz2
 shorewall-common-4.2.4.tar.bz2
 shorewall-lite-4.2.4.tar.bz2
-shorewall-perl-4.2.4.5.tar.bz2
+shorewall-perl-4.2.4.6.tar.bz2
 shorewall-shell-4.2.4.tar.bz2


Index: shorewall.spec
===================================================================
RCS file: /cvs/extras/rpms/shorewall/devel/shorewall.spec,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- shorewall.spec	15 Jan 2009 00:08:28 -0000	1.67
+++ shorewall.spec	15 Jan 2009 00:26:09 -0000	1.68
@@ -11,7 +11,7 @@
 
 Name:           shorewall
 Version:	%{major_ver}
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	An iptables front end for firewall configuration
 Group:		Applications/System
 License:	GPLv2+
@@ -402,6 +402,9 @@
 %attr(0755,root,root) %{_datadir}/shorewall6-lite/wait4ifup
 
 %changelog
+* Thu Jan 15 2009 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 4.2.4-3
+- Update shorewall-perl to 4.2.4.6
+
 * Thu Jan 15 2009 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 4.2.4-2
 - Fix up dependencies between sub-packages
 - No longer attempt to own all files in /var/lib/shorewall* but rather clean


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/shorewall/devel/sources,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- sources	11 Jan 2009 23:41:38 -0000	1.45
+++ sources	15 Jan 2009 00:26:09 -0000	1.46
@@ -2,5 +2,5 @@
 9f40f99dc4db2aea61ecd3a1040321e1  shorewall6-lite-4.2.4.1.tar.bz2
 888130a12280f7bf9022009153ac63cd  shorewall-common-4.2.4.tar.bz2
 15405aa9d2bc804dd7c3d555b1798848  shorewall-lite-4.2.4.tar.bz2
-58eaf858b8517c6ca79c5f8431b20401  shorewall-perl-4.2.4.5.tar.bz2
+cebd27bed5cebc44edc23571fee231e9  shorewall-perl-4.2.4.6.tar.bz2
 95a645963e541aef5a39c707f67874b5  shorewall-shell-4.2.4.tar.bz2



From jgu at fedoraproject.org  Thu Jan 15 00:28:25 2009
From: jgu at fedoraproject.org (Jonathan G. Underwood)
Date: Thu, 15 Jan 2009 00:28:25 +0000 (UTC)
Subject: rpms/shorewall/F-10 shorewall.spec,1.67,1.68 sources,1.45,1.46
Message-ID: <20090115002825.A979A7012D@cvs1.fedora.phx.redhat.com>

Author: jgu

Update of /cvs/extras/rpms/shorewall/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2006

Modified Files:
	shorewall.spec sources 
Log Message:
* Thu Jan 15 2009 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 4.2.4-3
- Update shorewall-perl to 4.2.4.6



Index: shorewall.spec
===================================================================
RCS file: /cvs/extras/rpms/shorewall/F-10/shorewall.spec,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- shorewall.spec	15 Jan 2009 00:10:59 -0000	1.67
+++ shorewall.spec	15 Jan 2009 00:27:55 -0000	1.68
@@ -11,7 +11,7 @@
 
 Name:           shorewall
 Version:	%{major_ver}
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	An iptables front end for firewall configuration
 Group:		Applications/System
 License:	GPLv2+
@@ -402,6 +402,9 @@
 %attr(0755,root,root) %{_datadir}/shorewall6-lite/wait4ifup
 
 %changelog
+* Thu Jan 15 2009 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 4.2.4-3
+- Update shorewall-perl to 4.2.4.6
+
 * Thu Jan 15 2009 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 4.2.4-2
 - Fix up dependencies between sub-packages
 - No longer attempt to own all files in /var/lib/shorewall* but rather clean


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/shorewall/F-10/sources,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- sources	11 Jan 2009 23:43:12 -0000	1.45
+++ sources	15 Jan 2009 00:27:55 -0000	1.46
@@ -2,5 +2,5 @@
 9f40f99dc4db2aea61ecd3a1040321e1  shorewall6-lite-4.2.4.1.tar.bz2
 888130a12280f7bf9022009153ac63cd  shorewall-common-4.2.4.tar.bz2
 15405aa9d2bc804dd7c3d555b1798848  shorewall-lite-4.2.4.tar.bz2
-58eaf858b8517c6ca79c5f8431b20401  shorewall-perl-4.2.4.5.tar.bz2
+cebd27bed5cebc44edc23571fee231e9  shorewall-perl-4.2.4.6.tar.bz2
 95a645963e541aef5a39c707f67874b5  shorewall-shell-4.2.4.tar.bz2



From nim at fedoraproject.org  Thu Jan 15 00:28:42 2009
From: nim at fedoraproject.org (Nicolas Mailhot)
Date: Thu, 15 Jan 2009 00:28:42 +0000 (UTC)
Subject: rpms/bitstream-vera-fonts/devel bitstream-vera-fonts.spec, 1.10,
	1.11 import.log, 1.1, 1.2
Message-ID: <20090115002842.9F80F7012D@cvs1.fedora.phx.redhat.com>

Author: nim

Update of /cvs/extras/rpms/bitstream-vera-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2084/devel

Modified Files:
	bitstream-vera-fonts.spec import.log 
Log Message:
Update for new FPC naming rules


Index: bitstream-vera-fonts.spec
===================================================================
RCS file: /cvs/extras/rpms/bitstream-vera-fonts/devel/bitstream-vera-fonts.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- bitstream-vera-fonts.spec	17 Dec 2008 19:15:19 -0000	1.10
+++ bitstream-vera-fonts.spec	15 Jan 2009 00:28:12 -0000	1.11
@@ -9,7 +9,7 @@
 
 Name:    %{fontname}-fonts
 Version: 1.10
-Release: 12%{?dist}
+Release: 13%{?dist}
 Summary: Bitstream Vera fonts
 
 Group:     User Interface/X
@@ -30,7 +30,7 @@
 Group:   User Interface/X
 
 Obsoletes: bitstream-vera-fonts < 1.10-9
-Requires:  %{name}-sans, %{name}-serif, %{name}-sans-mono
+Requires:  %{fontname}-sans-fonts, %{fontname}-serif-fonts, %{fontname}-sans-mono-fonts
 
 %description compat
 This package only exists to help transition pre 1.10-9 Bitstream Vera users to
@@ -39,7 +39,7 @@
 
 
 %package common
-Summary:  Bitstream Vera, common files (documentation???)
+Summary:  Common files of the Bitstream Vera font set
 Group:    User Interface/X
 Requires: fontpackages-filesystem
 
@@ -49,12 +49,14 @@
 This package consists of files used by other %{name} packages.
 
 
-%package  sans
-Summary:  Bitstream Vera, variable-width sans-serif font faces
+%package -n %{fontname}-sans-fonts
+Summary:  Variable-width sans-serif Bitstream Vera fonts
 Group:    User Interface/X
 Requires: %{name}-common = %{version}-%{release}
 
-%description sans
+Obsoletes: %{name}-sans < 1.10-13
+
+%description -n %{fontname}-sans-fonts
 %common_desc
 
 This package consists of the Bitstream Vera sans-serif variable-width font
@@ -63,12 +65,14 @@
 %_font_pkg -n sans Vera.ttf VeraBd.ttf VeraIt.ttf VeraBI.ttf
 
 
-%package  serif
-Summary:  Bitstream Vera, variable-width serif font faces
+%package -n %{fontname}-serif-fonts
+Summary:  Variable-width serif Bitstream Vera fonts
 Group:    User Interface/X
 Requires: %{name}-common = %{version}-%{release}
 
-%description serif
+Obsoletes: %{name}-serif < 1.10-13
+
+%description -n %{fontname}-serif-fonts
 %common_desc
 
 This package consists of the Bitstream Vera serif variable-width font faces.
@@ -76,12 +80,14 @@
 %_font_pkg -n serif VeraSe*ttf
 
 
-%package  sans-mono
-Summary:  Bitstream Vera, monospace sans-serif font faces
+%package -n %{fontname}-sans-mono-fonts
+Summary:  Monospace sans-serif Bitstream Vera fonts
 Group:    User Interface/X
 Requires: %{name}-common = %{version}-%{release}
 
-%description sans-mono
+Obsoletes: %{name}-sans-mono < 1.10-13
+
+%description -n %{fontname}-sans-mono-fonts
 %common_desc
 
 This package consists of the Bitstream Vera sans-serif monospace font faces.


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/bitstream-vera-fonts/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	17 Dec 2008 19:15:19 -0000	1.1
+++ import.log	15 Jan 2009 00:28:12 -0000	1.2
@@ -1 +1,2 @@
 bitstream-vera-fonts-1_10-12_fc11:HEAD:bitstream-vera-fonts-1.10-12.fc11.src.rpm:1229541266
+bitstream-vera-fonts-1_10-13_fc11:HEAD:bitstream-vera-fonts-1.10-13.fc11.src.rpm:1231979242



From jgu at fedoraproject.org  Thu Jan 15 00:37:22 2009
From: jgu at fedoraproject.org (Jonathan G. Underwood)
Date: Thu, 15 Jan 2009 00:37:22 +0000 (UTC)
Subject: rpms/shorewall/devel shorewall.spec,1.68,1.69
Message-ID: <20090115003722.CC3BF7012D@cvs1.fedora.phx.redhat.com>

Author: jgu

Update of /cvs/extras/rpms/shorewall/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3625

Modified Files:
	shorewall.spec 
Log Message:
* Thu Jan 15 2009 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 4.2.4-4
- Really update shorewall-perl to 4.2.4.6



Index: shorewall.spec
===================================================================
RCS file: /cvs/extras/rpms/shorewall/devel/shorewall.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- shorewall.spec	15 Jan 2009 00:26:09 -0000	1.68
+++ shorewall.spec	15 Jan 2009 00:36:52 -0000	1.69
@@ -3,7 +3,7 @@
 
 %define major_ver 4.2.4
 %define common_ver %{major_ver}
-%define perl_ver %{major_ver}.5
+%define perl_ver %{major_ver}.6
 %define lite_ver %{major_ver}
 %define shell_ver %{major_ver}
 %define shorewall6_ver %{major_ver}.1
@@ -11,7 +11,7 @@
 
 Name:           shorewall
 Version:	%{major_ver}
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	An iptables front end for firewall configuration
 Group:		Applications/System
 License:	GPLv2+
@@ -402,6 +402,9 @@
 %attr(0755,root,root) %{_datadir}/shorewall6-lite/wait4ifup
 
 %changelog
+* Thu Jan 15 2009 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 4.2.4-4
+- Really update shorewall-perl to 4.2.4.6
+
 * Thu Jan 15 2009 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 4.2.4-3
 - Update shorewall-perl to 4.2.4.6
 



From jgu at fedoraproject.org  Thu Jan 15 00:38:48 2009
From: jgu at fedoraproject.org (Jonathan G. Underwood)
Date: Thu, 15 Jan 2009 00:38:48 +0000 (UTC)
Subject: rpms/shorewall/F-10 shorewall.spec,1.68,1.69
Message-ID: <20090115003848.2CE947012D@cvs1.fedora.phx.redhat.com>

Author: jgu

Update of /cvs/extras/rpms/shorewall/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3811

Modified Files:
	shorewall.spec 
Log Message:
* Thu Jan 15 2009 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 4.2.4-4
- Really update shorewall-perl to 4.2.4.6



Index: shorewall.spec
===================================================================
RCS file: /cvs/extras/rpms/shorewall/F-10/shorewall.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- shorewall.spec	15 Jan 2009 00:27:55 -0000	1.68
+++ shorewall.spec	15 Jan 2009 00:38:17 -0000	1.69
@@ -3,7 +3,7 @@
 
 %define major_ver 4.2.4
 %define common_ver %{major_ver}
-%define perl_ver %{major_ver}.5
+%define perl_ver %{major_ver}.6
 %define lite_ver %{major_ver}
 %define shell_ver %{major_ver}
 %define shorewall6_ver %{major_ver}.1
@@ -11,7 +11,7 @@
 
 Name:           shorewall
 Version:	%{major_ver}
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	An iptables front end for firewall configuration
 Group:		Applications/System
 License:	GPLv2+
@@ -402,6 +402,9 @@
 %attr(0755,root,root) %{_datadir}/shorewall6-lite/wait4ifup
 
 %changelog
+* Thu Jan 15 2009 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 4.2.4-4
+- Really update shorewall-perl to 4.2.4.6
+
 * Thu Jan 15 2009 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 4.2.4-3
 - Update shorewall-perl to 4.2.4.6
 



From rdieter at fedoraproject.org  Thu Jan 15 00:44:44 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu, 15 Jan 2009 00:44:44 +0000 (UTC)
Subject: rpms/kdeaccessibility/devel kdeaccessibility.spec,1.70,1.71
Message-ID: <20090115004444.604A07012D@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdeaccessibility/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4308

Modified Files:
	kdeaccessibility.spec 
Log Message:
include cmake output worth investigating



Index: kdeaccessibility.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeaccessibility/devel/kdeaccessibility.spec,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- kdeaccessibility.spec	9 Jan 2009 18:58:44 -0000	1.70
+++ kdeaccessibility.spec	15 Jan 2009 00:44:13 -0000	1.71
@@ -18,12 +18,19 @@
 %endif
 BuildRequires: kdelibs4-devel >= %{version}
 BuildRequires: plasma-devel >= %{version}
+## cmake output to check on
+#-- The KTTSD Epos plugin will be built but the pos executable was not found.
+#-- The KTTSD FreeTTS plugin will be built but the freetts.jar file was not found.
+#-- The KTTSD Hadifix plugin will be built but the txt2pho executable was not found.
+#-- The KTTSD Hadifix plugin will be built but the mbrola executable was not found.
 
 Requires(post): /sbin/ldconfig xdg-utils
 Requires(postun): /sbin/ldconfig xdg-utils
 Requires: kdelibs4 >= %{version}
 
 Obsoletes: kdeaccessibility-devel < 1:3.5.8 
+
+#noarch ?  -- Rex
 Provides: mono-icon-theme = %{version}-%{release}
 
 %description



From dcantrel at fedoraproject.org  Thu Jan 15 00:57:05 2009
From: dcantrel at fedoraproject.org (David Cantrell)
Date: Thu, 15 Jan 2009 00:57:05 +0000 (UTC)
Subject: rpms/anaconda/devel .cvsignore, 1.597, 1.598 anaconda.spec, 1.741, 
	1.742 sources, 1.732, 1.733
Message-ID: <20090115005705.F186B7012D@cvs1.fedora.phx.redhat.com>

Author: dcantrel

Update of /cvs/pkgs/rpms/anaconda/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5230

Modified Files:
	.cvsignore anaconda.spec sources 
Log Message:
* Wed Jan 14 2009 David Cantrell <dcantrell at redhat.com> - 11.5.0.8-1
- Fix D-Bus usage in get_connection in loader (jkeating)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/devel/.cvsignore,v
retrieving revision 1.597
retrieving revision 1.598
diff -u -r1.597 -r1.598
--- .cvsignore	14 Jan 2009 05:03:54 -0000	1.597
+++ .cvsignore	15 Jan 2009 00:56:34 -0000	1.598
@@ -1,2 +1 @@
-anaconda-11.5.0.6.tar.bz2
-anaconda-11.5.0.7.tar.bz2
+anaconda-11.5.0.8.tar.bz2


Index: anaconda.spec
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/devel/anaconda.spec,v
retrieving revision 1.741
retrieving revision 1.742
diff -u -r1.741 -r1.742
--- anaconda.spec	14 Jan 2009 05:03:54 -0000	1.741
+++ anaconda.spec	15 Jan 2009 00:56:34 -0000	1.742
@@ -2,7 +2,7 @@
 
 Summary: Graphical system installer
 Name:    anaconda
-Version: 11.5.0.7
+Version: 11.5.0.8
 Release: 1
 License: GPLv2+
 Group:   Applications/System
@@ -204,6 +204,9 @@
 %endif
 
 %changelog
+* Wed Jan 14 2009 David Cantrell <dcantrell at redhat.com> - 11.5.0.8-1
+- Fix D-Bus usage in get_connection in loader (jkeating)
+
 * Wed Jan 14 2009 Chris Lumens <clumens at redhat.com> - 11.5.0.7-1
 - How to get raw pages from the wiki has changed again. (clumens)
 - Make sure the 'anaconda' file gets the right detected type (alsadi,


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/devel/sources,v
retrieving revision 1.732
retrieving revision 1.733
diff -u -r1.732 -r1.733
--- sources	14 Jan 2009 05:03:54 -0000	1.732
+++ sources	15 Jan 2009 00:56:34 -0000	1.733
@@ -1 +1 @@
-0d5c8ec5b01555611e75ed0d3f75b963  anaconda-11.5.0.7.tar.bz2
+9030acfac51fc12c3673d6e9a0f90e5d  anaconda-11.5.0.8.tar.bz2



From mjakubicek at fedoraproject.org  Thu Jan 15 00:59:32 2009
From: mjakubicek at fedoraproject.org (=?utf-8?b?TWlsb8WhIEpha3Viw63EjWVr?=)
Date: Thu, 15 Jan 2009 00:59:32 +0000 (UTC)
Subject: rpms/boinc-client/F-10 boinc-rsa.patch, NONE, 1.1 boinc-client.spec,
	1.19, 1.20
Message-ID: <20090115005932.CF0917012D@cvs1.fedora.phx.redhat.com>

Author: mjakubicek

Update of /cvs/pkgs/rpms/boinc-client/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5472

Modified Files:
	boinc-client.spec 
Added Files:
	boinc-rsa.patch 
Log Message:
- Fix security bug BZ#479664



boinc-rsa.patch:

--- NEW FILE boinc-rsa.patch ---
--- boinc_core_release_6_4_5/lib/crypt.cpp (revision 16069)
+++ boinc_core_release_6_4_5/lib/crypt.cpp (revision 16883)
@@ -244,5 +244,5 @@
 //
 int encrypt_private(R_RSA_PRIVATE_KEY& key, DATA_BLOCK& in, DATA_BLOCK& out) {
-    int n, modulus_len;
+    int n, modulus_len, retval;
 
     modulus_len = (key.bits+7)/8;
@@ -253,5 +253,9 @@
     RSA* rp = RSA_new();
     private_to_openssl(key, rp);
-    RSA_private_encrypt(n, in.data, out.data, rp, RSA_PKCS1_PADDING);
+    retval = RSA_private_encrypt(n, in.data, out.data, rp, RSA_PKCS1_PADDING);
+    if (retval < 0) {
+        RSA_free(rp);
+        return ERR_CRYPTO;
+    }
     out.len = RSA_size(rp);
     RSA_free(rp);
@@ -260,8 +264,14 @@
 
 int decrypt_public(R_RSA_PUBLIC_KEY& key, DATA_BLOCK& in, DATA_BLOCK& out) {
+    int retval;
     RSA* rp = RSA_new();
     public_to_openssl(key, rp);
-    RSA_public_decrypt(in.len, in.data, out.data, rp, RSA_PKCS1_PADDING);
+    retval = RSA_public_decrypt(in.len, in.data, out.data, rp, RSA_PKCS1_PADDING);
+    if (retval < 0) {
+        RSA_free(rp);
+        return ERR_CRYPTO;
+    }
     out.len = RSA_size(rp);
+    RSA_free(rp);
     return 0;
 }
--- boinc_core_release_6_4_5/lib/error_numbers.h (revision 15762)
+++ boinc_core_release_6_4_5/lib/error_numbers.h (revision 16883)
@@ -186,4 +186,5 @@
 #define ERR_SYMLINK         -229
 #define ERR_DB_CONN_LOST    -230
+#define ERR_CRYPTO          -231
 
 // PLEASE: add a text description of your error to 
--- boinc_core_release_6_4_5/lib/str_util.cpp (revision 16069)
+++ boinc_core_release_6_4_5/lib/str_util.cpp (revision 16883)
@@ -736,4 +736,5 @@
         case ERR_SYMLINK: return "symlink() failed";
         case ERR_DB_CONN_LOST: return "DB connection lost during enumeration";
+        case ERR_CRYPTO: return "encryption error";
         case 404: return "HTTP file not found";
         case 407: return "HTTP proxy authentication failure";


Index: boinc-client.spec
===================================================================
RCS file: /cvs/pkgs/rpms/boinc-client/F-10/boinc-client.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- boinc-client.spec	13 Dec 2008 14:25:36 -0000	1.19
+++ boinc-client.spec	15 Jan 2009 00:59:02 -0000	1.20
@@ -1,9 +1,9 @@
-%define snap 20080818
-%define version_ 6_2_15
+%define snap 20081217
+%define version_ 6_4_5
 
 Summary:	The BOINC client core
 Name:		boinc-client
-Version:	6.2.15
+Version:	6.4.5
 Release:	2.%{snap}svn%{?dist}
 License:	LGPLv2+
 Group:		Applications/Engineering
@@ -21,16 +21,13 @@
 Source1:	boinc-client-init-d
 Source2:	boinc-client-logrotate-d
 Source3:	boinc-manager.desktop
-Source4:	boinc.1
-Source5:	boinc_client.1
-Source6:	boinc_cmd.1
-Source7:	boincmgr.1
 Source8:	trim
 Source9:	unicode
-Source10:	boinc-client
 #Remove -fomit-frame-pointer and -ffast-math gcc flags:
 #Reported in upstream bugtracker: http://boinc.berkeley.edu/trac/ticket/647
 Patch1:		boinc-gccflags.patch
+#Fix security bug BZ#479664
+Patch2:		boinc-rsa.patch
 #Change locales filenames from "BOINC Manager.mo" into "BOINC-Manager.mo"
 #so that we can use the find_lang macro.
 #Reported in upstream bugtracker: http://boinc.berkeley.edu/trac/ticket/722
@@ -53,6 +50,7 @@
 BuildRequires:  mysql-devel
 BuildRequires:  libXmu-devel
 BuildRequires:  libjpeg-devel
+BuildRequires:	docbook2X
 
 %description
 The Berkeley Open Infrastructure for Network Computing (BOINC) is an open-
@@ -98,6 +96,7 @@
 %prep
 %setup -q -n boinc_core_release_%{version_}
 %patch1 -p1
+%patch2 -p1
 %patch3 -p1
 
 %build
@@ -111,10 +110,17 @@
 %define boinc_platform ppc64-linux-gnu
 %endif
 
+#quick fix to make build & install to work, filed in upstream's bugtracker under
+#http://boinc.berkeley.edu/trac/ticket/811
+sed -i "s/boincmgr.16x16.png boincmgr.32x32.png boincmgr.48x48.png//" clientgui/res/Makefile.in
+echo "install:" >> samples/example_app/Makefile
+
+%define confflags --disable-static --enable-unicode STRIP=: DOCBOOK2X_MAN=/usr/bin/db2x_docbook2man
+
 %if %{defined boinc_platform}
-%configure --disable-static --enable-unicode --with-boinc-platform=%{boinc_platform} STRIP=:
+%configure %{confflags} --with-boinc-platform=%{boinc_platform}
 %else
-%configure --disable-static --enable-unicode STRIP=:
+%configure %{confflags}
 %endif
 
 
@@ -148,11 +154,14 @@
 pushd $RPM_BUILD_ROOT%{_bindir}
   ln -s boinc_client boinc
   mv boinc_gui boincmgr
+  mv boinc_cmd boinccmd
 popd
 
 rm $RPM_BUILD_ROOT%{_bindir}/ca-bundle.crt
 #because it's already included in curl
 
+# own init script and logrotate configuration file
+rm -f $RPM_BUILD_ROOT%{_sysconfdir}/init.d/%{name}
 install -p -m755 %{SOURCE1} $RPM_BUILD_ROOT%{_initrddir}/%{name}
 install -p -m644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/%{name}
 
@@ -164,12 +173,6 @@
 install -p -m644 sea/boincmgr.48x48.png \
   $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/boincmgr.png
 
-# man page
-install -p -m644 %{SOURCE4} $RPM_BUILD_ROOT%{_mandir}/man1
-install -p -m644 %{SOURCE5} $RPM_BUILD_ROOT%{_mandir}/man1
-install -p -m644 %{SOURCE6} $RPM_BUILD_ROOT%{_mandir}/man1
-install -p -m644 %{SOURCE7} $RPM_BUILD_ROOT%{_mandir}/man1
-
 desktop-file-install %{?_remove_encoding} --vendor fedora \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
   %{SOURCE3}
@@ -183,8 +186,7 @@
 %find_lang BOINC-Manager
 
 # bash-completion
-
-install -Dp -m644 %{SOURCE10} $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d/boinc-client
+install -Dp -m644 client/scripts/boinc.bash $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d/boinc-client
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -239,14 +241,13 @@
 %doc checkin_notes_2002
 %{_bindir}/boinc
 %{_bindir}/boinc_client
-%{_bindir}/boinc_cmd
+%{_bindir}/boinccmd
 %{_bindir}/crypt_prog
 %{_bindir}/switcher
 %{_initrddir}/%{name}
+%{_sysconfdir}/sysconfig/%{name}
+%{_mandir}/man1/boinccmd.1.gz
 %{_mandir}/man1/boinc.1.gz
-%{_mandir}/man1/boinc_client.1.gz
-%{_mandir}/man1/boinc_cmd.1.gz
-%{_mandir}/man1/boincmgr.1.gz
 %defattr(-,boinc,boinc,-)
 %{_localstatedir}/lib/boinc/
 
@@ -257,6 +258,7 @@
 %{_datadir}/icons/hicolor/16x16/apps/boincmgr.png
 %{_datadir}/icons/hicolor/32x32/apps/boincmgr.png
 %{_datadir}/icons/hicolor/48x48/apps/boincmgr.png
+%{_mandir}/man1/boincmgr.1.gz
 
 %files devel
 %defattr(-,root,root,-)
@@ -266,10 +268,23 @@
 %{_libdir}/libsched.a
 %{_libdir}/libboinc_graphics2.a
 
-%dir %{_includedir}/BOINC
-%{_includedir}/BOINC/*
+%dir %{_includedir}/boinc
+%{_includedir}/boinc/*
 
 %changelog
+* Thu Jan 15 2009 Milos Jakubicek <xjakub at fi.muni.cz> - 6.4.5-2.20081217svn
+- Fix security bug BZ#479664
+
+* Wed Dec 17 2008 Milos Jakubicek <xjakub at fi.muni.cz> - 6.4.5-1.20081217svn
+- Update to 6.4.5
+- Updated boinc-gccflags.patch and boinc-locales.patch
+- Not trimming doc/ subdirectory
+- Bash completion now provided by the source tarball,
+  not packaged as separate sources anymore.
+- Supplied example /etc/sysconfig configuration file
+- Added BR: docbook2X for autogenerating manpages, not packaged as separate
+  sources anymore.
+
 * Sat Dec 13 2008 Milos Jakubicek <xjakub at fi.muni.cz> - 6.2.15-2.20080818svn
 - Fix usage of $BOINCDIR in the init script
 



From mjakubicek at fedoraproject.org  Thu Jan 15 01:01:09 2009
From: mjakubicek at fedoraproject.org (=?utf-8?b?TWlsb8WhIEpha3Viw63EjWVr?=)
Date: Thu, 15 Jan 2009 01:01:09 +0000 (UTC)
Subject: rpms/boinc-client/F-9 boinc-rsa.patch, NONE, 1.1 boinc-client.spec, 
	1.14, 1.15
Message-ID: <20090115010109.264527012D@cvs1.fedora.phx.redhat.com>

Author: mjakubicek

Update of /cvs/pkgs/rpms/boinc-client/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5661

Modified Files:
	boinc-client.spec 
Added Files:
	boinc-rsa.patch 
Log Message:
- Fix security bug BZ#479664



boinc-rsa.patch:

--- NEW FILE boinc-rsa.patch ---
--- boinc_core_release_6_4_5/lib/crypt.cpp (revision 16069)
+++ boinc_core_release_6_4_5/lib/crypt.cpp (revision 16883)
@@ -244,5 +244,5 @@
 //
 int encrypt_private(R_RSA_PRIVATE_KEY& key, DATA_BLOCK& in, DATA_BLOCK& out) {
-    int n, modulus_len;
+    int n, modulus_len, retval;
 
     modulus_len = (key.bits+7)/8;
@@ -253,5 +253,9 @@
     RSA* rp = RSA_new();
     private_to_openssl(key, rp);
-    RSA_private_encrypt(n, in.data, out.data, rp, RSA_PKCS1_PADDING);
+    retval = RSA_private_encrypt(n, in.data, out.data, rp, RSA_PKCS1_PADDING);
+    if (retval < 0) {
+        RSA_free(rp);
+        return ERR_CRYPTO;
+    }
     out.len = RSA_size(rp);
     RSA_free(rp);
@@ -260,8 +264,14 @@
 
 int decrypt_public(R_RSA_PUBLIC_KEY& key, DATA_BLOCK& in, DATA_BLOCK& out) {
+    int retval;
     RSA* rp = RSA_new();
     public_to_openssl(key, rp);
-    RSA_public_decrypt(in.len, in.data, out.data, rp, RSA_PKCS1_PADDING);
+    retval = RSA_public_decrypt(in.len, in.data, out.data, rp, RSA_PKCS1_PADDING);
+    if (retval < 0) {
+        RSA_free(rp);
+        return ERR_CRYPTO;
+    }
     out.len = RSA_size(rp);
+    RSA_free(rp);
     return 0;
 }
--- boinc_core_release_6_4_5/lib/error_numbers.h (revision 15762)
+++ boinc_core_release_6_4_5/lib/error_numbers.h (revision 16883)
@@ -186,4 +186,5 @@
 #define ERR_SYMLINK         -229
 #define ERR_DB_CONN_LOST    -230
+#define ERR_CRYPTO          -231
 
 // PLEASE: add a text description of your error to 
--- boinc_core_release_6_4_5/lib/str_util.cpp (revision 16069)
+++ boinc_core_release_6_4_5/lib/str_util.cpp (revision 16883)
@@ -736,4 +736,5 @@
         case ERR_SYMLINK: return "symlink() failed";
         case ERR_DB_CONN_LOST: return "DB connection lost during enumeration";
+        case ERR_CRYPTO: return "encryption error";
         case 404: return "HTTP file not found";
         case 407: return "HTTP proxy authentication failure";


Index: boinc-client.spec
===================================================================
RCS file: /cvs/pkgs/rpms/boinc-client/F-9/boinc-client.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- boinc-client.spec	13 Dec 2008 14:52:48 -0000	1.14
+++ boinc-client.spec	15 Jan 2009 01:00:38 -0000	1.15
@@ -1,9 +1,9 @@
-%define snap 20080818
-%define version_ 6_2_15
+%define snap 20081217
+%define version_ 6_4_5
 
 Summary:	The BOINC client core
 Name:		boinc-client
-Version:	6.2.15
+Version:	6.4.5
 Release:	2.%{snap}svn%{?dist}
 License:	LGPLv2+
 Group:		Applications/Engineering
@@ -21,16 +21,13 @@
 Source1:	boinc-client-init-d
 Source2:	boinc-client-logrotate-d
 Source3:	boinc-manager.desktop
-Source4:	boinc.1
-Source5:	boinc_client.1
-Source6:	boinc_cmd.1
-Source7:	boincmgr.1
 Source8:	trim
 Source9:	unicode
-Source10:	boinc-client
 #Remove -fomit-frame-pointer and -ffast-math gcc flags:
 #Reported in upstream bugtracker: http://boinc.berkeley.edu/trac/ticket/647
 Patch1:		boinc-gccflags.patch
+#Fix security bug BZ#479664
+Patch2:		boinc-rsa.patch
 #Change locales filenames from "BOINC Manager.mo" into "BOINC-Manager.mo"
 #so that we can use the find_lang macro.
 #Reported in upstream bugtracker: http://boinc.berkeley.edu/trac/ticket/722
@@ -53,6 +50,7 @@
 BuildRequires:  mysql-devel
 BuildRequires:  libXmu-devel
 BuildRequires:  libjpeg-devel
+BuildRequires:	docbook2X
 
 %description
 The Berkeley Open Infrastructure for Network Computing (BOINC) is an open-
@@ -98,6 +96,7 @@
 %prep
 %setup -q -n boinc_core_release_%{version_}
 %patch1 -p1
+%patch2 -p1
 %patch3 -p1
 
 %build
@@ -111,10 +110,17 @@
 %define boinc_platform ppc64-linux-gnu
 %endif
 
+#quick fix to make build & install to work, filed in upstream's bugtracker under
+#http://boinc.berkeley.edu/trac/ticket/811
+sed -i "s/boincmgr.16x16.png boincmgr.32x32.png boincmgr.48x48.png//" clientgui/res/Makefile.in
+echo "install:" >> samples/example_app/Makefile
+
+%define confflags --disable-static --enable-unicode STRIP=: DOCBOOK2X_MAN=/usr/bin/db2x_docbook2man
+
 %if %{defined boinc_platform}
-%configure --disable-static --enable-unicode --with-boinc-platform=%{boinc_platform} STRIP=:
+%configure %{confflags} --with-boinc-platform=%{boinc_platform}
 %else
-%configure --disable-static --enable-unicode STRIP=:
+%configure %{confflags}
 %endif
 
 
@@ -148,11 +154,14 @@
 pushd $RPM_BUILD_ROOT%{_bindir}
   ln -s boinc_client boinc
   mv boinc_gui boincmgr
+  mv boinc_cmd boinccmd
 popd
 
 rm $RPM_BUILD_ROOT%{_bindir}/ca-bundle.crt
 #because it's already included in curl
 
+# own init script and logrotate configuration file
+rm -f $RPM_BUILD_ROOT%{_sysconfdir}/init.d/%{name}
 install -p -m755 %{SOURCE1} $RPM_BUILD_ROOT%{_initrddir}/%{name}
 install -p -m644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/%{name}
 
@@ -164,12 +173,6 @@
 install -p -m644 sea/boincmgr.48x48.png \
   $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/boincmgr.png
 
-# man page
-install -p -m644 %{SOURCE4} $RPM_BUILD_ROOT%{_mandir}/man1
-install -p -m644 %{SOURCE5} $RPM_BUILD_ROOT%{_mandir}/man1
-install -p -m644 %{SOURCE6} $RPM_BUILD_ROOT%{_mandir}/man1
-install -p -m644 %{SOURCE7} $RPM_BUILD_ROOT%{_mandir}/man1
-
 desktop-file-install %{?_remove_encoding} --vendor fedora \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
   %{SOURCE3}
@@ -183,8 +186,7 @@
 %find_lang BOINC-Manager
 
 # bash-completion
-
-install -Dp -m644 %{SOURCE10} $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d/boinc-client
+install -Dp -m644 client/scripts/boinc.bash $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d/boinc-client
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -239,14 +241,13 @@
 %doc checkin_notes_2002
 %{_bindir}/boinc
 %{_bindir}/boinc_client
-%{_bindir}/boinc_cmd
+%{_bindir}/boinccmd
 %{_bindir}/crypt_prog
 %{_bindir}/switcher
 %{_initrddir}/%{name}
+%{_sysconfdir}/sysconfig/%{name}
+%{_mandir}/man1/boinccmd.1.gz
 %{_mandir}/man1/boinc.1.gz
-%{_mandir}/man1/boinc_client.1.gz
-%{_mandir}/man1/boinc_cmd.1.gz
-%{_mandir}/man1/boincmgr.1.gz
 %defattr(-,boinc,boinc,-)
 %{_localstatedir}/lib/boinc/
 
@@ -257,6 +258,7 @@
 %{_datadir}/icons/hicolor/16x16/apps/boincmgr.png
 %{_datadir}/icons/hicolor/32x32/apps/boincmgr.png
 %{_datadir}/icons/hicolor/48x48/apps/boincmgr.png
+%{_mandir}/man1/boincmgr.1.gz
 
 %files devel
 %defattr(-,root,root,-)
@@ -266,10 +268,23 @@
 %{_libdir}/libsched.a
 %{_libdir}/libboinc_graphics2.a
 
-%dir %{_includedir}/BOINC
-%{_includedir}/BOINC/*
+%dir %{_includedir}/boinc
+%{_includedir}/boinc/*
 
 %changelog
+* Thu Jan 15 2009 Milos Jakubicek <xjakub at fi.muni.cz> - 6.4.5-2.20081217svn
+- Fix security bug BZ#479664
+
+* Wed Dec 17 2008 Milos Jakubicek <xjakub at fi.muni.cz> - 6.4.5-1.20081217svn
+- Update to 6.4.5
+- Updated boinc-gccflags.patch and boinc-locales.patch
+- Not trimming doc/ subdirectory
+- Bash completion now provided by the source tarball,
+  not packaged as separate sources anymore.
+- Supplied example /etc/sysconfig configuration file
+- Added BR: docbook2X for autogenerating manpages, not packaged as separate
+  sources anymore.
+
 * Sat Dec 13 2008 Milos Jakubicek <xjakub at fi.muni.cz> - 6.2.15-2.20080818svn
 - Fix usage of $BOINCDIR in the init script
 



From mjakubicek at fedoraproject.org  Thu Jan 15 01:13:30 2009
From: mjakubicek at fedoraproject.org (=?utf-8?b?TWlsb8WhIEpha3Viw63EjWVr?=)
Date: Thu, 15 Jan 2009 01:13:30 +0000 (UTC)
Subject: rpms/boinc-client/F-9 .cvsignore, 1.3, 1.4 sources, 1.3,
	1.4 boinc-client, 1.1, NONE boinc.1, 1.1, NONE boinc_client.1,
	1.1, NONE boinc_cmd.1, 1.1, NONE boincmgr.1, 1.1, NONE
Message-ID: <20090115011330.CAB6F70141@cvs1.fedora.phx.redhat.com>

Author: mjakubicek

Update of /cvs/pkgs/rpms/boinc-client/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7219/F-9

Modified Files:
	.cvsignore sources 
Removed Files:
	boinc-client boinc.1 boinc_client.1 boinc_cmd.1 boincmgr.1 
Log Message:
- Update to 6.4.5 from devel




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/boinc-client/F-9/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	27 Aug 2008 08:29:55 -0000	1.3
+++ .cvsignore	15 Jan 2009 01:13:00 -0000	1.4
@@ -1 +1 @@
-boinc-6.2.15.tar.bz2
+boinc-6.4.5.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/boinc-client/F-9/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	27 Aug 2008 08:29:56 -0000	1.3
+++ sources	15 Jan 2009 01:13:00 -0000	1.4
@@ -1 +1 @@
-5da6b42595a0c9155c71dce49fec2dbe  boinc-6.2.15.tar.bz2
+98433ea90755d0579dcc778da99b9fa0  boinc-6.4.5.tar.bz2


--- boinc-client DELETED ---


--- boinc.1 DELETED ---


--- boinc_client.1 DELETED ---


--- boinc_cmd.1 DELETED ---


--- boincmgr.1 DELETED ---



From mjakubicek at fedoraproject.org  Thu Jan 15 01:13:30 2009
From: mjakubicek at fedoraproject.org (=?utf-8?b?TWlsb8WhIEpha3Viw63EjWVr?=)
Date: Thu, 15 Jan 2009 01:13:30 +0000 (UTC)
Subject: rpms/boinc-client/F-10 .cvsignore, 1.3, 1.4 sources, 1.3,
	1.4 boinc-client, 1.1, NONE boinc.1, 1.1, NONE boinc_client.1,
	1.1, NONE boinc_cmd.1, 1.1, NONE boincmgr.1, 1.1, NONE
Message-ID: <20090115011330.C55C57012D@cvs1.fedora.phx.redhat.com>

Author: mjakubicek

Update of /cvs/pkgs/rpms/boinc-client/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7219/F-10

Modified Files:
	.cvsignore sources 
Removed Files:
	boinc-client boinc.1 boinc_client.1 boinc_cmd.1 boincmgr.1 
Log Message:
- Update to 6.4.5 from devel




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/boinc-client/F-10/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	26 Aug 2008 20:27:10 -0000	1.3
+++ .cvsignore	15 Jan 2009 01:12:59 -0000	1.4
@@ -1 +1 @@
-boinc-6.2.15.tar.bz2
+boinc-6.4.5.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/boinc-client/F-10/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	26 Aug 2008 20:27:10 -0000	1.3
+++ sources	15 Jan 2009 01:12:59 -0000	1.4
@@ -1 +1 @@
-5da6b42595a0c9155c71dce49fec2dbe  boinc-6.2.15.tar.bz2
+98433ea90755d0579dcc778da99b9fa0  boinc-6.4.5.tar.bz2


--- boinc-client DELETED ---


--- boinc.1 DELETED ---


--- boinc_client.1 DELETED ---


--- boinc_cmd.1 DELETED ---


--- boincmgr.1 DELETED ---



From rdieter at fedoraproject.org  Thu Jan 15 01:23:06 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu, 15 Jan 2009 01:23:06 +0000 (UTC)
Subject: rpms/kdeadmin/devel kdeadmin.spec,1.120,1.121
Message-ID: <20090115012306.92F427012D@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdeadmin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7983

Modified Files:
	kdeadmin.spec 
Log Message:
* Wed Jan 14 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.1.96-2
- include system-config-printer-kde



Index: kdeadmin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeadmin/devel/kdeadmin.spec,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -r1.120 -r1.121
--- kdeadmin.spec	7 Jan 2009 14:58:59 -0000	1.120
+++ kdeadmin.spec	15 Jan 2009 01:22:34 -0000	1.121
@@ -1,7 +1,7 @@
 Name:           kdeadmin
 Epoch:          7
 Version:        4.1.96
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        K Desktop Environment - Administrative tools
 
 Group:          User Interface/Desktops
@@ -15,15 +15,15 @@
 
 BuildRequires:  kdelibs4-devel >= %{version}
 BuildRequires:  kdepimlibs-devel >= %{version}
-BuildRequires:  openldap-devel
 BuildRequires:  python-devel
+BuildRequires:  PyKDE4-devel >= %{version}
+BuildRequires:  system-config-printer-libs
 
 Requires(post): /sbin/ldconfig xdg-utils
 Requires(postun): /sbin/ldconfig xdg-utils
 Requires: kdelibs4 >= %{version}
 Requires: kdepimlibs >= %{version}
 
-
 %description
 The %{name} package includes administrative tools including:
 * kcron: systemsettings module for the cron task scheduler
@@ -43,6 +43,15 @@
 
 It is based upon the "Smart Package Manager".
 
+%package -n system-config-printer-kde
+Summary: A printer administration tool for KDE 
+Group: System Environment/Base
+Requires: PyKDE4 >= %{version}
+Requires: system-config-printer-libs
+%description -n system-config-printer-kde
+A printer administration tool for KDE that allows the user to configure
+a CUPS print server.
+
 
 %prep
 %setup -q
@@ -61,7 +70,7 @@
 %install
 rm -rf %{buildroot}
 
-make install DESTDIR=%{buildroot} -C %{_target_platform}
+make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
 # remove broken .pc file which has no business to be in a non-devel pkg anyway
 rm -rf %{buildroot}%{_libdir}/pkgconfig
@@ -100,8 +109,10 @@
 %{_kde4_docdir}/HTML/en/kcron/
 %{_kde4_docdir}/HTML/en/ksystemlog/
 %{_kde4_docdir}/HTML/en/kuser/
-%{_kde4_iconsdir}/hicolor/*/*/*
-%exclude %{_kde4_iconsdir}/hicolor/*/*/kpackage*
+%{_kde4_iconsdir}/hicolor/*/*/knetworkconf.*
+%{_kde4_iconsdir}/hicolor/*/*/ksystemlog.*
+%{_kde4_iconsdir}/hicolor/*/*/kuser.*
+%{_kde4_iconsdir}/hicolor/*/*/network*
 %{_kde4_libdir}/kde4/kcm_cron.so
 %{_kde4_libdir}/kde4/kcm_knetworkconfmodule.so
 
@@ -114,8 +125,17 @@
 %{_kde4_docdir}/HTML/en/kpackage/
 %{_kde4_iconsdir}/hicolor/*/*/kpackage*
 
+%files -n system-config-printer-kde
+%defattr(-,root,root,-)
+%{_kde4_bindir}/system-config-printer-kde
+%{_kde4_datadir}/applications/kde4/system-config-printer-kde.desktop
+%{_kde4_appsdir}/system-config-printer-kde/
+
 
 %changelog
+* Wed Jan 14 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.1.96-2
+- include system-config-printer-kde
+
 * Wed Jan 07 2009 Than Ngo <than at redhat.com> - 4.1.96-1
 - 4.2rc1
 



From mjakubicek at fedoraproject.org  Thu Jan 15 01:24:27 2009
From: mjakubicek at fedoraproject.org (=?utf-8?b?TWlsb8WhIEpha3Viw63EjWVr?=)
Date: Thu, 15 Jan 2009 01:24:27 +0000 (UTC)
Subject: rpms/boinc-client/F-10 boinc-gccflags.patch, 1.2,
	1.3 boinc-locales.patch, 1.1, 1.2 trim, 1.1, 1.2
Message-ID: <20090115012427.AD87A7012D@cvs1.fedora.phx.redhat.com>

Author: mjakubicek

Update of /cvs/pkgs/rpms/boinc-client/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8072/F-10

Modified Files:
	boinc-gccflags.patch boinc-locales.patch trim 
Log Message:
-Update boinc-locales.patch, boinc-gccflags.patch and trim script from devel



boinc-gccflags.patch:

Index: boinc-gccflags.patch
===================================================================
RCS file: /cvs/pkgs/rpms/boinc-client/F-10/boinc-gccflags.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- boinc-gccflags.patch	26 Aug 2008 20:27:10 -0000	1.2
+++ boinc-gccflags.patch	15 Jan 2009 01:23:57 -0000	1.3
@@ -1,7 +1,7 @@
---- boinc_core_release_6_2_15/client/Makefile.am.orig	2008-08-04 19:25:20.000000000 +0200
-+++ boinc_core_release_6_2_15/client/Makefile.am	2008-08-04 19:25:35.000000000 +0200
-@@ -61,7 +61,7 @@
-     work_fetch.C
+--- boinc_core_release_6_4_5/client/Makefile.am.orig	2008-12-17 19:25:20.000000000 +0200
++++ boinc_core_release_6_4_5/client/Makefile.am	2008-12-17 19:25:35.000000000 +0200
+@@ -65,7 +65,7 @@
+     work_fetch.cpp
  
  boinc_client_DEPENDENCIES =
 -boinc_client_CPPFLAGS = -O3 -fomit-frame-pointer -fforce-addr -ffast-math $(AM_CPPFLAGS)
@@ -9,10 +9,10 @@
  boinc_client_LDFLAGS = -static-libgcc
  boinc_client_LDADD = $(LIBBOINC) $(PTHREAD_LIBS)
  
---- boinc_core_release_6_2_15/client/Makefile.in.orig	2008-08-04 19:25:24.000000000 +0200
-+++ boinc_core_release_6_2_15/client/Makefile.in	2008-08-04 19:25:51.000000000 +0200
-@@ -367,7 +367,7 @@
-     work_fetch.C
+--- boinc_core_release_6_4_5/client/Makefile.in.orig	2008-12-17 19:25:24.000000000 +0200
++++ boinc_core_release_6_4_5/client/Makefile.in	2008-12-17 19:25:51.000000000 +0200
+@@ -373,7 +373,7 @@
+     work_fetch.cpp
  
  boinc_client_DEPENDENCIES = 
 -boinc_client_CPPFLAGS = -O3 -fomit-frame-pointer -fforce-addr -ffast-math $(AM_CPPFLAGS)

boinc-locales.patch:

Index: boinc-locales.patch
===================================================================
RCS file: /cvs/pkgs/rpms/boinc-client/F-10/boinc-locales.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- boinc-locales.patch	17 May 2008 11:06:15 -0000	1.1
+++ boinc-locales.patch	15 Jan 2009 01:23:57 -0000	1.2
@@ -1,11 +1,11 @@
---- boinc_core_release_5_10_45_orig/clientgui/BOINCGUIApp.cpp	2008-05-17 12:45:13.000000000 +0200
-+++ boinc_core_release_5_10_45/clientgui/BOINCGUIApp.cpp	2008-05-17 12:45:34.000000000 +0200
-@@ -258,7 +258,7 @@
-         );
-     }
-     m_pLocale->AddCatalogLookupPathPrefix(wxT("locale"));
--    m_pLocale->AddCatalog(wxT("BOINC Manager"));
-+    m_pLocale->AddCatalog(wxT("BOINC-Manager"));
- 
-     InitSupportedLanguages();
- 
+--- boinc_core_release_6_4_5/clientgui/BOINCGUIApp.cpp.orig	2008-12-17 23:33:16.000000000 +0100
++++ boinc_core_release_6_4_5/clientgui/BOINCGUIApp.cpp	2008-12-17 23:33:19.000000000 +0100
+@@ -329,7 +329,7 @@
+         );
+     }
+     m_pLocale->AddCatalogLookupPathPrefix(wxT("locale"));
+-    m_pLocale->AddCatalog(wxT("BOINC Manager"));
++    m_pLocale->AddCatalog(wxT("BOINC-Manager"));
+ 
+     InitSupportedLanguages();
+ 


Index: trim
===================================================================
RCS file: /cvs/pkgs/rpms/boinc-client/F-10/trim,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- trim	25 Mar 2008 20:13:30 -0000	1.1
+++ trim	15 Jan 2009 01:23:57 -0000	1.2
@@ -9,7 +9,7 @@
 
 echo "Trimming directories..."
 
-DIRS="win_build doc html openssl client/os2 client/win clientgui/mac clientlib clienttray curl/include curl/mswin curl/patches lib/mac mac_build mac_installer zip/zip/macos zip/zip/win32 zip/unzip/macos zip/unzip/win32 zlib RSAEuro stripchart"
+DIRS="win_build html openssl client/os2 client/win clientgui/mac clientlib clienttray curl/include curl/mswin curl/patches lib/mac mac_build mac_installer zip/zip/macos zip/zip/win32 zip/unzip/macos zip/unzip/win32 zlib RSAEuro stripchart coprocs/CUDA/mswin"
 
 for DIR in $DIRS; do
 	/bin/rm -rf $1/$DIR;



From mjakubicek at fedoraproject.org  Thu Jan 15 01:24:28 2009
From: mjakubicek at fedoraproject.org (=?utf-8?b?TWlsb8WhIEpha3Viw63EjWVr?=)
Date: Thu, 15 Jan 2009 01:24:28 +0000 (UTC)
Subject: rpms/boinc-client/F-9 boinc-gccflags.patch, 1.2,
	1.3 boinc-locales.patch, 1.1, 1.2 trim, 1.1, 1.2
Message-ID: <20090115012428.1AFB37012D@cvs1.fedora.phx.redhat.com>

Author: mjakubicek

Update of /cvs/pkgs/rpms/boinc-client/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8072/F-9

Modified Files:
	boinc-gccflags.patch boinc-locales.patch trim 
Log Message:
-Update boinc-locales.patch, boinc-gccflags.patch and trim script from devel



boinc-gccflags.patch:

Index: boinc-gccflags.patch
===================================================================
RCS file: /cvs/pkgs/rpms/boinc-client/F-9/boinc-gccflags.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- boinc-gccflags.patch	27 Aug 2008 08:29:56 -0000	1.2
+++ boinc-gccflags.patch	15 Jan 2009 01:23:57 -0000	1.3
@@ -1,7 +1,7 @@
---- boinc_core_release_6_2_15/client/Makefile.am.orig	2008-08-04 19:25:20.000000000 +0200
-+++ boinc_core_release_6_2_15/client/Makefile.am	2008-08-04 19:25:35.000000000 +0200
-@@ -61,7 +61,7 @@
-     work_fetch.C
+--- boinc_core_release_6_4_5/client/Makefile.am.orig	2008-12-17 19:25:20.000000000 +0200
++++ boinc_core_release_6_4_5/client/Makefile.am	2008-12-17 19:25:35.000000000 +0200
+@@ -65,7 +65,7 @@
+     work_fetch.cpp
  
  boinc_client_DEPENDENCIES =
 -boinc_client_CPPFLAGS = -O3 -fomit-frame-pointer -fforce-addr -ffast-math $(AM_CPPFLAGS)
@@ -9,10 +9,10 @@
  boinc_client_LDFLAGS = -static-libgcc
  boinc_client_LDADD = $(LIBBOINC) $(PTHREAD_LIBS)
  
---- boinc_core_release_6_2_15/client/Makefile.in.orig	2008-08-04 19:25:24.000000000 +0200
-+++ boinc_core_release_6_2_15/client/Makefile.in	2008-08-04 19:25:51.000000000 +0200
-@@ -367,7 +367,7 @@
-     work_fetch.C
+--- boinc_core_release_6_4_5/client/Makefile.in.orig	2008-12-17 19:25:24.000000000 +0200
++++ boinc_core_release_6_4_5/client/Makefile.in	2008-12-17 19:25:51.000000000 +0200
+@@ -373,7 +373,7 @@
+     work_fetch.cpp
  
  boinc_client_DEPENDENCIES = 
 -boinc_client_CPPFLAGS = -O3 -fomit-frame-pointer -fforce-addr -ffast-math $(AM_CPPFLAGS)

boinc-locales.patch:

Index: boinc-locales.patch
===================================================================
RCS file: /cvs/pkgs/rpms/boinc-client/F-9/boinc-locales.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- boinc-locales.patch	17 May 2008 11:05:56 -0000	1.1
+++ boinc-locales.patch	15 Jan 2009 01:23:57 -0000	1.2
@@ -1,11 +1,11 @@
---- boinc_core_release_5_10_45_orig/clientgui/BOINCGUIApp.cpp	2008-05-17 12:45:13.000000000 +0200
-+++ boinc_core_release_5_10_45/clientgui/BOINCGUIApp.cpp	2008-05-17 12:45:34.000000000 +0200
-@@ -258,7 +258,7 @@
-         );
-     }
-     m_pLocale->AddCatalogLookupPathPrefix(wxT("locale"));
--    m_pLocale->AddCatalog(wxT("BOINC Manager"));
-+    m_pLocale->AddCatalog(wxT("BOINC-Manager"));
- 
-     InitSupportedLanguages();
- 
+--- boinc_core_release_6_4_5/clientgui/BOINCGUIApp.cpp.orig	2008-12-17 23:33:16.000000000 +0100
++++ boinc_core_release_6_4_5/clientgui/BOINCGUIApp.cpp	2008-12-17 23:33:19.000000000 +0100
+@@ -329,7 +329,7 @@
+         );
+     }
+     m_pLocale->AddCatalogLookupPathPrefix(wxT("locale"));
+-    m_pLocale->AddCatalog(wxT("BOINC Manager"));
++    m_pLocale->AddCatalog(wxT("BOINC-Manager"));
+ 
+     InitSupportedLanguages();
+ 


Index: trim
===================================================================
RCS file: /cvs/pkgs/rpms/boinc-client/F-9/trim,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- trim	25 Mar 2008 20:13:30 -0000	1.1
+++ trim	15 Jan 2009 01:23:57 -0000	1.2
@@ -9,7 +9,7 @@
 
 echo "Trimming directories..."
 
-DIRS="win_build doc html openssl client/os2 client/win clientgui/mac clientlib clienttray curl/include curl/mswin curl/patches lib/mac mac_build mac_installer zip/zip/macos zip/zip/win32 zip/unzip/macos zip/unzip/win32 zlib RSAEuro stripchart"
+DIRS="win_build html openssl client/os2 client/win clientgui/mac clientlib clienttray curl/include curl/mswin curl/patches lib/mac mac_build mac_installer zip/zip/macos zip/zip/win32 zip/unzip/macos zip/unzip/win32 zlib RSAEuro stripchart coprocs/CUDA/mswin"
 
 for DIR in $DIRS; do
 	/bin/rm -rf $1/$DIR;



From rdieter at fedoraproject.org  Thu Jan 15 01:34:05 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu, 15 Jan 2009 01:34:05 +0000 (UTC)
Subject: rpms/kdeutils/devel kdeutils.spec,1.155,1.156
Message-ID: <20090115013405.0F10A7012D@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdeutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8787

Modified Files:
	kdeutils.spec 
Log Message:
* Wed Jan 14 2009 Rex Dieter <rdieter at fedoraproject.org> 4.1.96-2
- (Build)Req: system-config-printer-libs



Index: kdeutils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeutils/devel/kdeutils.spec,v
retrieving revision 1.155
retrieving revision 1.156
diff -u -r1.155 -r1.156
--- kdeutils.spec	9 Jan 2009 23:55:48 -0000	1.155
+++ kdeutils.spec	15 Jan 2009 01:33:34 -0000	1.156
@@ -11,7 +11,7 @@
 Name:           kdeutils
 Epoch:          6
 Version:        4.1.96
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        K Desktop Environment - Utilities
 
 Group:          Applications/System
@@ -31,20 +31,17 @@
 BuildRequires:  gmp-devel
 BuildRequires:  libarchive-devel
 BuildRequires:  libzip-devel
-BuildRequires:  openldap-devel
-BuildRequires:  python-devel
 BuildRequires:  qimageblitz-devel
 
 Requires(post): /sbin/ldconfig xdg-utils
 Requires(postun): /sbin/ldconfig xdg-utils
 Requires: kdelibs4 >= %{version}
 %if 0%{?printer_applet}
-# not strictly required, but nice for sanity -- Rex
 BuildRequires:  PyKDE4-devel >= %{version}
-BuildRequires:  system-config-printer
-Requires: PyKDE4
+BuildRequires:  system-config-printer-libs
+Requires: PyKDE4 >= %{version}
 Requires: hal-cups-utils
-Requires: system-config-printer
+Requires: system-config-printer-libs
 %endif
 
 Provides:       okteta = 0.1.0-1
@@ -197,6 +194,9 @@
 
 
 %changelog
+* Wed Jan 14 2009 Rex Dieter <rdieter at fedoraproject.org> 4.1.96-2
+- (Build)Req: system-config-printer-libs
+
 * Wed Jan 07 2009 Than Ngo <than at redhat.com> - 4.1.96-1
 - 4.2rc1
 



From nsantos at fedoraproject.org  Thu Jan 15 01:39:40 2009
From: nsantos at fedoraproject.org (Nuno Santos)
Date: Thu, 15 Jan 2009 01:39:40 +0000 (UTC)
Subject: rpms/qpidc/F-10 qpidc.spec,1.57,1.58
Message-ID: <20090115013940.4F6167012D@cvs1.fedora.phx.redhat.com>

Author: nsantos

Update of /cvs/extras/rpms/qpidc/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9956

Modified Files:
	qpidc.spec 
Log Message:
Missing header files in specfile


Index: qpidc.spec
===================================================================
RCS file: /cvs/extras/rpms/qpidc/F-10/qpidc.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- qpidc.spec	14 Jan 2009 23:35:45 -0000	1.57
+++ qpidc.spec	15 Jan 2009 01:39:09 -0000	1.58
@@ -245,6 +245,7 @@
 %_includedir/qpid/*.h
 %_includedir/qpid/amqp_0_10
 %_includedir/qpid/client
+%_includedir/qpid/console
 %_includedir/qpid/framing
 %_includedir/qpid/sys
 %_includedir/qpid/log



From pkgdb at fedoraproject.org  Thu Jan 15 01:50:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 15 Jan 2009 01:50:03 +0000
Subject: [pkgdb] aircrack-ng: ramxx has requested watchbugzilla
Message-ID: <20090115015004.0719C208203@bastion.fedora.phx.redhat.com>

ramxx has requested the watchbugzilla acl on aircrack-ng (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/aircrack-ng



From pkgdb at fedoraproject.org  Thu Jan 15 01:50:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 15 Jan 2009 01:50:09 +0000
Subject: [pkgdb] aircrack-ng: ramxx has requested watchcommits
Message-ID: <20090115015009.1B9A9208456@bastion.fedora.phx.redhat.com>

ramxx has requested the watchcommits acl on aircrack-ng (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/aircrack-ng



From ianweller at fedoraproject.org  Thu Jan 15 01:58:31 2009
From: ianweller at fedoraproject.org (Ian Weller)
Date: Thu, 15 Jan 2009 01:58:31 +0000 (UTC)
Subject: rpms/gwibber/F-10 gwibber.spec,1.8,1.9
Message-ID: <20090115015832.116527012D@cvs1.fedora.phx.redhat.com>

Author: ianweller

Update of /cvs/pkgs/rpms/gwibber/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11165/F-10

Modified Files:
	gwibber.spec 
Log Message:
add python-imaging to requires


Index: gwibber.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gwibber/F-10/gwibber.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- gwibber.spec	21 Dec 2008 16:42:55 -0000	1.8
+++ gwibber.spec	15 Jan 2009 01:58:00 -0000	1.9
@@ -4,7 +4,7 @@
 
 Name:           gwibber
 Version:        0.7.2
-Release:        3.%{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
@@ -18,7 +18,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 mx python-feedparser pyxdg
+Requires:       python pygtk2 dbus-python gnome-python2-gconf PyXML pywebkitgtk mx python-feedparser pyxdg python-imaging
 Requires:       python-simplejson >= 1.9.1
 BuildRequires:  python-devel desktop-file-utils
 BuildArch:      noarch
@@ -59,6 +59,9 @@
 
 
 %changelog
+* Wed Jan 14 2009 Ian Weller <ianweller at gmail.com> 0.7.2-4.165bzr
+- Add python-imaging to Requires
+
 * Sun Dec 21 2008 Ian Weller <ianweller at gmail.com> 0.7.2-3.165bzr
 - Update upstream
 



From ianweller at fedoraproject.org  Thu Jan 15 01:58:31 2009
From: ianweller at fedoraproject.org (Ian Weller)
Date: Thu, 15 Jan 2009 01:58:31 +0000 (UTC)
Subject: rpms/gwibber/F-9 gwibber.spec,1.8,1.9
Message-ID: <20090115015832.161D670142@cvs1.fedora.phx.redhat.com>

Author: ianweller

Update of /cvs/pkgs/rpms/gwibber/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11165/F-9

Modified Files:
	gwibber.spec 
Log Message:
add python-imaging to requires


Index: gwibber.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gwibber/F-9/gwibber.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- gwibber.spec	21 Dec 2008 16:44:17 -0000	1.8
+++ gwibber.spec	15 Jan 2009 01:58:01 -0000	1.9
@@ -4,7 +4,7 @@
 
 Name:           gwibber
 Version:        0.7.2
-Release:        3.%{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
@@ -18,7 +18,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 mx python-feedparser pyxdg
+Requires:       python pygtk2 dbus-python gnome-python2-gconf PyXML pywebkitgtk mx python-feedparser pyxdg python-imaging
 Requires:       python-simplejson >= 1.9.1
 BuildRequires:  python-devel desktop-file-utils
 BuildArch:      noarch
@@ -59,6 +59,9 @@
 
 
 %changelog
+* Wed Jan 14 2009 Ian Weller <ianweller at gmail.com> 0.7.2-4.165bzr
+- Add python-imaging to Requires
+
 * Sun Dec 21 2008 Ian Weller <ianweller at gmail.com> 0.7.2-3.165bzr
 - Update upstream
 



From ianweller at fedoraproject.org  Thu Jan 15 01:58:31 2009
From: ianweller at fedoraproject.org (Ian Weller)
Date: Thu, 15 Jan 2009 01:58:31 +0000 (UTC)
Subject: rpms/gwibber/devel gwibber.spec,1.9,1.10
Message-ID: <20090115015832.1D48470143@cvs1.fedora.phx.redhat.com>

Author: ianweller

Update of /cvs/pkgs/rpms/gwibber/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11165/devel

Modified Files:
	gwibber.spec 
Log Message:
add python-imaging to requires


Index: gwibber.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gwibber/devel/gwibber.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- gwibber.spec	21 Dec 2008 16:37:42 -0000	1.9
+++ gwibber.spec	15 Jan 2009 01:58:01 -0000	1.10
@@ -4,7 +4,7 @@
 
 Name:           gwibber
 Version:        0.7.2
-Release:        3.%{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
@@ -18,7 +18,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 mx python-feedparser pyxdg
+Requires:       python pygtk2 dbus-python gnome-python2-gconf PyXML pywebkitgtk mx python-feedparser pyxdg python-imaging
 Requires:       python-simplejson >= 1.9.1
 BuildRequires:  python-devel desktop-file-utils
 BuildArch:      noarch
@@ -59,6 +59,9 @@
 
 
 %changelog
+* Wed Jan 14 2009 Ian Weller <ianweller at gmail.com> 0.7.2-4.165bzr
+- Add python-imaging to Requires
+
 * Sun Dec 21 2008 Ian Weller <ianweller at gmail.com> 0.7.2-3.165bzr
 - Update upstream
 



From davej at fedoraproject.org  Thu Jan 15 02:04:04 2009
From: davej at fedoraproject.org (Dave Jones)
Date: Thu, 15 Jan 2009 02:04:04 +0000 (UTC)
Subject: rpms/kernel/devel config-generic, 1.220, 1.221 kernel.spec, 1.1216, 
	1.1217
Message-ID: <20090115020404.125697012D@cvs1.fedora.phx.redhat.com>

Author: davej

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11732

Modified Files:
	config-generic kernel.spec 
Log Message:
Test RODATA and NX during bootup.


Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-generic,v
retrieving revision 1.220
retrieving revision 1.221
diff -u -r1.220 -r1.221
--- config-generic	14 Jan 2009 02:23:45 -0000	1.220
+++ config-generic	15 Jan 2009 02:03:33 -0000	1.221
@@ -3308,8 +3308,8 @@
 CONFIG_DEBUG_DEVRES=y
 # CONFIG_ENABLE_WARN_DEPRECATED is not set
 
-# CONFIG_DEBUG_RODATA_TEST is not set
-# CONFIG_DEBUG_NX_TEST is not set
+CONFIG_DEBUG_RODATA_TEST=y
+CONFIG_DEBUG_NX_TEST=y
 CONFIG_DEBUG_BOOT_PARAMS=y
 
 #


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1216
retrieving revision 1.1217
diff -u -r1.1216 -r1.1217
--- kernel.spec	14 Jan 2009 05:27:56 -0000	1.1216
+++ kernel.spec	15 Jan 2009 02:03:33 -0000	1.1217
@@ -1738,6 +1738,9 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Wed Jan 14 2009 Dave Jones <davej at redhat.com>
+- Test RODATA and NX during bootup.
+
 * Tue Jan 13 2009 Kyle McMartin <kyle at redhat.com>
 - Stop wasting so much disk space with a static module_ref array.
 



From bojan at fedoraproject.org  Thu Jan 15 03:11:12 2009
From: bojan at fedoraproject.org (Bojan Smojver)
Date: Thu, 15 Jan 2009 03:11:12 +0000 (UTC)
Subject: rpms/tcpreplay/devel .cvsignore, 1.14, 1.15 sources, 1.15,
	1.16 tcpreplay.spec, 1.18, 1.19
Message-ID: <20090115031112.88A8E7012D@cvs1.fedora.phx.redhat.com>

Author: bojan

Update of /cvs/pkgs/rpms/tcpreplay/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17521

Modified Files:
	.cvsignore sources tcpreplay.spec 
Log Message:
Bump up to 3.4.0.
Use libdnet.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/tcpreplay/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	22 Jun 2008 22:07:12 -0000	1.14
+++ .cvsignore	15 Jan 2009 03:10:41 -0000	1.15
@@ -1 +1 @@
-tcpreplay-3.3.2.tar.gz
+tcpreplay-3.4.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tcpreplay/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	22 Jun 2008 22:07:12 -0000	1.15
+++ sources	15 Jan 2009 03:10:41 -0000	1.16
@@ -1 +1 @@
-d6bda50e505dcd2c4a9bf45c124c5d69  tcpreplay-3.3.2.tar.gz
+7c6bd87d293db7a7dfcda352197f874e  tcpreplay-3.4.0.tar.gz


Index: tcpreplay.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tcpreplay/devel/tcpreplay.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- tcpreplay.spec	22 Jun 2008 22:07:12 -0000	1.18
+++ tcpreplay.spec	15 Jan 2009 03:10:41 -0000	1.19
@@ -6,7 +6,7 @@
 %endif
 
 Name:           tcpreplay
-Version:        3.3.2
+Version:        3.4.0
 Release:        1%{?dist}
 Summary:        Replay captured network traffic
 
@@ -17,6 +17,9 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  %{pcapdep} >= 0.8.0, tcpdump
+%if 0%{?rhel}
+BuildRequires:  libdnet-devel
+%endif
 Requires:       /usr/sbin/tcpdump
 
 %description
@@ -62,6 +65,10 @@
 %{_bindir}/*
 
 %changelog
+* Thu Jan 15 2009 Bojan Smojver <bojan at rexursive com> - 3.4.0-1
+- bump up to 3.4.0
+- add libdnet-devel to BR
+
 * Mon Jun 23 2008 Bojan Smojver <bojan at rexursive com> - 3.3.2-1
 - bump up to 3.3.2
 



From bojan at fedoraproject.org  Thu Jan 15 03:13:57 2009
From: bojan at fedoraproject.org (Bojan Smojver)
Date: Thu, 15 Jan 2009 03:13:57 +0000 (UTC)
Subject: rpms/tcpreplay/F-10 sources,1.15,1.16 tcpreplay.spec,1.18,1.19
Message-ID: <20090115031357.494687012D@cvs1.fedora.phx.redhat.com>

Author: bojan

Update of /cvs/pkgs/rpms/tcpreplay/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18485

Modified Files:
	sources tcpreplay.spec 
Log Message:
Bump up to 3.4.0.
Use libdnet.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tcpreplay/F-10/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	22 Jun 2008 22:07:12 -0000	1.15
+++ sources	15 Jan 2009 03:13:27 -0000	1.16
@@ -1 +1 @@
-d6bda50e505dcd2c4a9bf45c124c5d69  tcpreplay-3.3.2.tar.gz
+7c6bd87d293db7a7dfcda352197f874e  tcpreplay-3.4.0.tar.gz


Index: tcpreplay.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tcpreplay/F-10/tcpreplay.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- tcpreplay.spec	22 Jun 2008 22:07:12 -0000	1.18
+++ tcpreplay.spec	15 Jan 2009 03:13:27 -0000	1.19
@@ -6,7 +6,7 @@
 %endif
 
 Name:           tcpreplay
-Version:        3.3.2
+Version:        3.4.0
 Release:        1%{?dist}
 Summary:        Replay captured network traffic
 
@@ -17,6 +17,9 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  %{pcapdep} >= 0.8.0, tcpdump
+%if 0%{?rhel}
+BuildRequires:  libdnet-devel
+%endif
 Requires:       /usr/sbin/tcpdump
 
 %description
@@ -62,6 +65,10 @@
 %{_bindir}/*
 
 %changelog
+* Thu Jan 15 2009 Bojan Smojver <bojan at rexursive com> - 3.4.0-1
+- bump up to 3.4.0
+- add libdnet-devel to BR
+
 * Mon Jun 23 2008 Bojan Smojver <bojan at rexursive com> - 3.3.2-1
 - bump up to 3.3.2
 



From ianweller at fedoraproject.org  Thu Jan 15 03:13:29 2009
From: ianweller at fedoraproject.org (Ian Weller)
Date: Thu, 15 Jan 2009 03:13:29 +0000 (UTC)
Subject: rpms/ezstream/devel import.log, NONE, 1.1 ezstream.spec, 1.1,
	1.2 ezstream-stop-weird-installs.patch, 1.1, NONE
Message-ID: <20090115031329.5553D7012D@cvs1.fedora.phx.redhat.com>

Author: ianweller

Update of /cvs/pkgs/rpms/ezstream/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18416/devel

Modified Files:
	ezstream.spec 
Added Files:
	import.log 
Removed Files:
	ezstream-stop-weird-installs.patch 
Log Message:
importing ezstream-0.5.3-2 in devel


--- NEW FILE import.log ---
ezstream-0_5_3-2_fc10:HEAD:ezstream-0.5.3-2.fc10.src.rpm:1231989152


Index: ezstream.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ezstream/devel/ezstream.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ezstream.spec	12 Apr 2008 23:50:53 -0000	1.1
+++ ezstream.spec	15 Jan 2009 03:12:59 -0000	1.2
@@ -1,14 +1,12 @@
 Name:           ezstream
 Version:        0.5.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Command line source client for Icecast media streaming servers
 
 Group:          Applications/Multimedia
 License:        GPLv2
 URL:            http://www.icecast.org/ezstream.php
 Source0:        http://downloads.xiph.org/releases/ezstream/ezstream-%{version}.tar.gz
-# Patch0 gets rid of the unnecessary installation of documentation that we do ourselves anyway.
-Patch0:         ezstream-stop-weird-installs.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libogg-devel libvorbis-devel taglib-devel libshout-devel libxml2-devel
@@ -30,9 +28,13 @@
 formats when the optional TagLib support has been compiled in (which they are
 for this package).
 
+
 %prep
 %setup -q
-%patch0 -p1 -b .stop_weird_inst
+mkdir __examples
+cp -a examples __examples/examples
+rm -f __examples/examples/Makefile*
+chmod a-x __examples/examples/*
 
 
 %build
@@ -43,8 +45,7 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
-# spurious executable doc
-chmod a-x examples/*
+rm -rf $RPM_BUILD_ROOT%{_docdir} $RPM_BUILD_ROOT%{_datadir}/examples
 
 
 %clean
@@ -54,16 +55,15 @@
 %files
 %defattr(-,root,root,-)
 %{_bindir}/ezstream
-# Why are we specifying each example instead of just adding the directory?
-# If we do that, we get the Makefile stuff too, which is silly.
-%doc COPYING NEWS README examples/ezstream_metadata.xml examples/ezstream_mp3.xml
-%doc examples/ezstream_reencode_mp3.xml examples/ezstream_reencode_theora.xml
-%doc examples/ezstream_reencode_vorbis.xml examples/ezstream_stdin_vorbis.xml
-%doc examples/ezstream_vorbis.xml examples/meta.sh examples/play.sh
-%doc %{_mandir}/man1/ezstream.1.gz
-
+%doc COPYING NEWS README __examples/examples
+%{_mandir}/man1/ezstream.1.gz
 
 
 %changelog
+* Wed Jan 14 2009 Ian Weller <ianweller at gmail.com> 0.5.3-2
+- Remove doc declaration from the man page
+- Move examples into examples/ within the docdir
+- Remove need for patch and put commands in the right parts
+
 * Sat Apr 05 2008 Ian Weller <ianweller at gmail.com> 0.5.3-1
 - Initial package build.


--- ezstream-stop-weird-installs.patch DELETED ---



From bojan at fedoraproject.org  Thu Jan 15 03:14:45 2009
From: bojan at fedoraproject.org (Bojan Smojver)
Date: Thu, 15 Jan 2009 03:14:45 +0000 (UTC)
Subject: rpms/tcpreplay/F-9 sources,1.13,1.14 tcpreplay.spec,1.15,1.16
Message-ID: <20090115031445.D9D0C7012D@cvs1.fedora.phx.redhat.com>

Author: bojan

Update of /cvs/pkgs/rpms/tcpreplay/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18710

Modified Files:
	sources tcpreplay.spec 
Log Message:
Bump up to 3.4.0.
Use libdnet.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tcpreplay/F-9/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	22 Jun 2008 22:35:31 -0000	1.13
+++ sources	15 Jan 2009 03:14:15 -0000	1.14
@@ -1 +1 @@
-d6bda50e505dcd2c4a9bf45c124c5d69  tcpreplay-3.3.2.tar.gz
+7c6bd87d293db7a7dfcda352197f874e  tcpreplay-3.4.0.tar.gz


Index: tcpreplay.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tcpreplay/F-9/tcpreplay.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- tcpreplay.spec	22 Jun 2008 22:35:31 -0000	1.15
+++ tcpreplay.spec	15 Jan 2009 03:14:15 -0000	1.16
@@ -6,7 +6,7 @@
 %endif
 
 Name:           tcpreplay
-Version:        3.3.2
+Version:        3.4.0
 Release:        1%{?dist}
 Summary:        Replay captured network traffic
 
@@ -17,6 +17,9 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  %{pcapdep} >= 0.8.0, tcpdump
+%if 0%{?rhel}
+BuildRequires:  libdnet-devel
+%endif
 Requires:       /usr/sbin/tcpdump
 
 %description
@@ -62,6 +65,10 @@
 %{_bindir}/*
 
 %changelog
+* Thu Jan 15 2009 Bojan Smojver <bojan at rexursive com> - 3.4.0-1
+- bump up to 3.4.0
+- add libdnet-devel to BR
+
 * Mon Jun 23 2008 Bojan Smojver <bojan at rexursive com> - 3.3.2-1
 - bump up to 3.3.2
 



From rdieter at fedoraproject.org  Thu Jan 15 03:21:46 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu, 15 Jan 2009 03:21:46 +0000 (UTC)
Subject: rpms/kdepim/devel kdepim.spec,1.202,1.203
Message-ID: <20090115032146.BEB1A7012D@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdepim/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19607

Modified Files:
	kdepim.spec 
Log Message:
* Thu Jan 15 2009 Rex Dieter <rdieter at fedoraproject.org> 4.1.96-3
- move libkpilot_*.so -devel -> main pkg



Index: kdepim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdepim/devel/kdepim.spec,v
retrieving revision 1.202
retrieving revision 1.203
diff -u -r1.202 -r1.203
--- kdepim.spec	14 Jan 2009 23:04:42 -0000	1.202
+++ kdepim.spec	15 Jan 2009 03:21:16 -0000	1.203
@@ -6,7 +6,7 @@
 Summary: PIM (Personal Information Manager) applications
 Epoch:   6
 Version: 4.1.96
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 License: GPLv2
 Group:   Applications/Productivity
@@ -146,6 +146,9 @@
 %doc README README.Kolab
 %doc COPYING
 %{_kde4_bindir}/*
+%if 0%{?_with_pilot_link:1}
+%{_kde4_libdir}/libkpilot_*.so
+%endif
 %{_kde4_libdir}/kde4/*.so
 %{_kde4_libdir}/strigi/*.so
 %{_kde4_datadir}/applications/kde4/*
@@ -170,10 +173,16 @@
 %defattr(-,root,root,-)
 %{_kde4_includedir}/*
 %{_kde4_libdir}/lib*.so
+%if 0%{?_with_pilot_link:1}
+%exclude %{_kde4_libdir}/libkpilot_*.so
+%endif
 %{_kde4_libdir}/kde4/plugins/designer/*
 
 
 %changelog
+* Thu Jan 15 2009 Rex Dieter <rdieter at fedoraproject.org> 4.1.96-3
+- move libkpilot_*.so -devel -> main pkg
+
 * Thu Jan 15 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.96-2
 - reenable BR pilot-link-devel, add missing BR libmal-devel (for KPilot)
 



From wtogami at fedoraproject.org  Thu Jan 15 03:21:50 2009
From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=)
Date: Thu, 15 Jan 2009 03:21:50 +0000 (UTC)
Subject: rpms/gstreamer-plugins-good/F-10 gstreamer-plugins-good.spec, 1.78, 
	1.79
Message-ID: <20090115032150.310277012D@cvs1.fedora.phx.redhat.com>

Author: wtogami

Update of /cvs/pkgs/rpms/gstreamer-plugins-good/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19564

Modified Files:
	gstreamer-plugins-good.spec 
Log Message:
- Bug #477877 Fix multilib conflict in -devel
- Bug #478449 Fix ladspa on lib64 
- Bug #470000 Fix thread/memleak due to ref-loop



Index: gstreamer-plugins-good.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamer-plugins-good/F-10/gstreamer-plugins-good.spec,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- gstreamer-plugins-good.spec	14 Jan 2009 00:07:36 -0000	1.78
+++ gstreamer-plugins-good.spec	15 Jan 2009 03:21:19 -0000	1.79
@@ -6,7 +6,7 @@
 
 Name: 		%{gstreamer}-plugins-good
 Version: 	0.10.11
-Release:  	2%{?dist}
+Release:  	4%{?dist}
 Summary: 	GStreamer plug-ins with good code and licensing
 
 Group: 		Applications/Multimedia
@@ -19,6 +19,8 @@
 Patch0: gst-plugins-good-0.10.9-libv4l.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=556986
 Patch1: gst-plugins-good-0.10.11-pulse-hang-bz556986.patch
+# https://bugzilla.redhat.com/show_bug.cgi?id=470000
+Patch2: pulseprobe-fix.patch
 
 Requires: 	%{gstreamer} >= %{_gst}
 Requires(pre): GConf2 
@@ -82,7 +84,7 @@
 good quality and under the LGPL license.
 
 %package devel
-Summary:        Documentation for GStreamer Good Plug-ins
+Summary:        Dummy package to make gstreamer-plugins-good multilib
 Group:          Development/Libraries
 
 Requires:       %{name} = %{version}-%{release}
@@ -98,24 +100,32 @@
 GStreamer Good Plug-ins is a collection of well-supported plug-ins of
 good quality and under the LGPL license.
 
-This package contains documentation for the GStreamer Good Plug-ins.
+This is a dummy package to make gstreamer-plugins-good multilib.
 
 %prep
 %setup -q -n gst-plugins-good-%{version}
 %patch0 -p0 -b .libv4l
 %patch1 -p0 -b .pulse-hang
+%patch2 -p1 -b .pulseprobe-fix
 
 %build
 
 %configure \
   --with-package-name='Fedora gstreamer-plugins-good package' \
   --with-package-origin='http://download.fedora.redhat.com/fedora' \
-  --enable-gtk-doc \
+  --disable-gtk-doc \
   --enable-experimental \
   --enable-ladspa \
   --disable-esd --disable-libcaca --disable-aalib \
   --with-default-visualizer=autoaudiosink
 
+# https://bugzilla.redhat.com/show_bug.cgi?id=478449
+# ladspa looks in the wrong directory for libraries
+%if %{_lib} == "lib64"
+sed -i 's^:/usr/lib/ladspa:^:/usr/lib64/ladspa:^' ext/ladspa/load.c
+sed -i 's^:/usr/lib/ladspa:^:/usr/lib64/ladspa:^' ext/ladspa/search.c
+%endif
+
 make %{?_smp_mflags}
 pushd ext/ladspa
 make %{?_smp_mflags}
@@ -229,7 +239,6 @@
 
 %files devel
 %defattr(-, root, root)
-%doc %{_datadir}/gtk-doc/html/gst-plugins-good-plugins-%{majorminor}
 
 %pre
 if [ "$1" -gt 1 ]; then
@@ -248,10 +257,17 @@
 gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/gstreamer-%{majorminor}.schemas > /dev/null || :
 
 %changelog
-* Tue Jan 13 2009 - Bastien Nocera <bnocera at redhat.com> - 0.10.11-2
+* Wed Jan 14 2009 Warren Togami <wtogami at redhat.com> 0.10.11-4
+- Bug #477877 Fix multilib conflict in -devel
+- Bug #478449 Fix ladspa on lib64 
+
+* Wed Jan 14 2009 Lennart Poettering <lpoetter at redhat.com> 0.10.11-3
+- Bug #470000 Fix thread/memleak due to ref-loop
+
+* Tue Jan 13 2009 Bastien Nocera <bnocera at redhat.com> - 0.10.11-2
 - Avoid pulsesink hang when PulseAudio disappears
 
-* Sat Oct 25 2008 - Bastien Nocera <bnocera at redhat.com> - 0.10.11-1
+* Sat Oct 25 2008 Bastien Nocera <bnocera at redhat.com> - 0.10.11-1
 - Update to 0.10.11
 - Update libv4l patch
 



From wtogami at fedoraproject.org  Thu Jan 15 03:23:33 2009
From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=)
Date: Thu, 15 Jan 2009 03:23:33 +0000 (UTC)
Subject: rpms/gstreamer-plugins-good/F-10 pulseprobe-fix.patch,NONE,1.1
Message-ID: <20090115032333.2B9FF7012D@cvs1.fedora.phx.redhat.com>

Author: wtogami

Update of /cvs/pkgs/rpms/gstreamer-plugins-good/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19996

Added Files:
	pulseprobe-fix.patch 
Log Message:
add patch


pulseprobe-fix.patch:

--- NEW FILE pulseprobe-fix.patch ---
--- gst-plugins-good-0.10.11.old/ext/pulse/pulseprobe.c	2008-10-11 01:13:34.000000000 +0200
+++ gst-plugins-good-0.10.11/ext/pulse/pulseprobe.c	2009-01-14 14:38:33.000000000 +0100
@@ -263,7 +263,7 @@
   GstPulseProbe *c = NULL;
 
   c = g_new (GstPulseProbe, 1);
-  c->object = g_object_ref (object);
+  c->object = object; /* We don't inc the ref counter here to avoid a ref loop */
   c->server = g_strdup (server);
   c->enumerate_sinks = sinks;
   c->enumerate_sources = sources;
@@ -293,8 +293,6 @@
   g_list_foreach (c->devices, (GFunc) g_free, NULL);
   g_list_free (c->devices);
 
-  g_object_unref (c->object);
-
   g_free (c);
 }
 



From bojan at fedoraproject.org  Thu Jan 15 03:23:45 2009
From: bojan at fedoraproject.org (Bojan Smojver)
Date: Thu, 15 Jan 2009 03:23:45 +0000 (UTC)
Subject: rpms/tcpreplay/devel tcpreplay.spec,1.19,1.20
Message-ID: <20090115032345.E57F47012D@cvs1.fedora.phx.redhat.com>

Author: bojan

Update of /cvs/pkgs/rpms/tcpreplay/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19919

Modified Files:
	tcpreplay.spec 
Log Message:
Correct libdnet BR logic.


Index: tcpreplay.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tcpreplay/devel/tcpreplay.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- tcpreplay.spec	15 Jan 2009 03:10:41 -0000	1.19
+++ tcpreplay.spec	15 Jan 2009 03:23:15 -0000	1.20
@@ -7,7 +7,7 @@
 
 Name:           tcpreplay
 Version:        3.4.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Replay captured network traffic
 
 Group:          Applications/Internet
@@ -17,7 +17,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  %{pcapdep} >= 0.8.0, tcpdump
-%if 0%{?rhel}
+%if ! 0%{?rhel}
 BuildRequires:  libdnet-devel
 %endif
 Requires:       /usr/sbin/tcpdump
@@ -65,6 +65,9 @@
 %{_bindir}/*
 
 %changelog
+* Thu Jan 15 2009 Bojan Smojver <bojan at rexursive com> - 3.4.0-2
+- correct libdnet BR logic
+
 * Thu Jan 15 2009 Bojan Smojver <bojan at rexursive com> - 3.4.0-1
 - bump up to 3.4.0
 - add libdnet-devel to BR



From bojan at fedoraproject.org  Thu Jan 15 03:23:51 2009
From: bojan at fedoraproject.org (Bojan Smojver)
Date: Thu, 15 Jan 2009 03:23:51 +0000 (UTC)
Subject: rpms/tcpreplay/F-9 tcpreplay.spec,1.16,1.17
Message-ID: <20090115032351.D77A67012D@cvs1.fedora.phx.redhat.com>

Author: bojan

Update of /cvs/pkgs/rpms/tcpreplay/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19946

Modified Files:
	tcpreplay.spec 
Log Message:
Correct libdnet BR logic.


Index: tcpreplay.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tcpreplay/F-9/tcpreplay.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- tcpreplay.spec	15 Jan 2009 03:14:15 -0000	1.16
+++ tcpreplay.spec	15 Jan 2009 03:23:21 -0000	1.17
@@ -7,7 +7,7 @@
 
 Name:           tcpreplay
 Version:        3.4.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Replay captured network traffic
 
 Group:          Applications/Internet
@@ -17,7 +17,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  %{pcapdep} >= 0.8.0, tcpdump
-%if 0%{?rhel}
+%if ! 0%{?rhel}
 BuildRequires:  libdnet-devel
 %endif
 Requires:       /usr/sbin/tcpdump
@@ -65,6 +65,9 @@
 %{_bindir}/*
 
 %changelog
+* Thu Jan 15 2009 Bojan Smojver <bojan at rexursive com> - 3.4.0-2
+- correct libdnet BR logic
+
 * Thu Jan 15 2009 Bojan Smojver <bojan at rexursive com> - 3.4.0-1
 - bump up to 3.4.0
 - add libdnet-devel to BR



From bojan at fedoraproject.org  Thu Jan 15 03:23:52 2009
From: bojan at fedoraproject.org (Bojan Smojver)
Date: Thu, 15 Jan 2009 03:23:52 +0000 (UTC)
Subject: rpms/tcpreplay/F-10 tcpreplay.spec,1.19,1.20
Message-ID: <20090115032352.BF0C97012D@cvs1.fedora.phx.redhat.com>

Author: bojan

Update of /cvs/pkgs/rpms/tcpreplay/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19966

Modified Files:
	tcpreplay.spec 
Log Message:
Correct libdnet BR logic.


Index: tcpreplay.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tcpreplay/F-10/tcpreplay.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- tcpreplay.spec	15 Jan 2009 03:13:27 -0000	1.19
+++ tcpreplay.spec	15 Jan 2009 03:23:22 -0000	1.20
@@ -7,7 +7,7 @@
 
 Name:           tcpreplay
 Version:        3.4.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Replay captured network traffic
 
 Group:          Applications/Internet
@@ -17,7 +17,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  %{pcapdep} >= 0.8.0, tcpdump
-%if 0%{?rhel}
+%if ! 0%{?rhel}
 BuildRequires:  libdnet-devel
 %endif
 Requires:       /usr/sbin/tcpdump
@@ -65,6 +65,9 @@
 %{_bindir}/*
 
 %changelog
+* Thu Jan 15 2009 Bojan Smojver <bojan at rexursive com> - 3.4.0-2
+- correct libdnet BR logic
+
 * Thu Jan 15 2009 Bojan Smojver <bojan at rexursive com> - 3.4.0-1
 - bump up to 3.4.0
 - add libdnet-devel to BR



From wtogami at fedoraproject.org  Thu Jan 15 03:27:21 2009
From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=)
Date: Thu, 15 Jan 2009 03:27:21 +0000 (UTC)
Subject: rpms/gstreamer-plugins-good/devel gstreamer-plugins-good.spec, 1.79,
	1.80
Message-ID: <20090115032721.2CA8F7012D@cvs1.fedora.phx.redhat.com>

Author: wtogami

Update of /cvs/pkgs/rpms/gstreamer-plugins-good/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20575

Modified Files:
	gstreamer-plugins-good.spec 
Log Message:
- Bug #477877 Fix multilib conflict in -devel
- Bug #478449 Fix ladspa on lib64 



Index: gstreamer-plugins-good.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamer-plugins-good/devel/gstreamer-plugins-good.spec,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- gstreamer-plugins-good.spec	14 Jan 2009 14:57:34 -0000	1.79
+++ gstreamer-plugins-good.spec	15 Jan 2009 03:26:50 -0000	1.80
@@ -6,7 +6,7 @@
 
 Name: 		%{gstreamer}-plugins-good
 Version: 	0.10.11
-Release:  	3%{?dist}
+Release:  	4%{?dist}
 Summary: 	GStreamer plug-ins with good code and licensing
 
 Group: 		Applications/Multimedia
@@ -84,7 +84,7 @@
 good quality and under the LGPL license.
 
 %package devel
-Summary:        Documentation for GStreamer Good Plug-ins
+Summary:        Dummy package to make gstreamer-plugins-good multilib
 Group:          Development/Libraries
 
 Requires:       %{name} = %{version}-%{release}
@@ -100,7 +100,7 @@
 GStreamer Good Plug-ins is a collection of well-supported plug-ins of
 good quality and under the LGPL license.
 
-This package contains documentation for the GStreamer Good Plug-ins.
+This is a dummy package to make gstreamer-plugins-good multilib.
 
 %prep
 %setup -q -n gst-plugins-good-%{version}
@@ -113,12 +113,19 @@
 %configure \
   --with-package-name='Fedora gstreamer-plugins-good package' \
   --with-package-origin='http://download.fedora.redhat.com/fedora' \
-  --enable-gtk-doc \
+  --disable-gtk-doc \
   --enable-experimental \
   --enable-ladspa \
   --disable-esd --disable-libcaca --disable-aalib \
   --with-default-visualizer=autoaudiosink
 
+# https://bugzilla.redhat.com/show_bug.cgi?id=478449
+# ladspa looks in the wrong directory for libraries
+%if %{_lib} == "lib64"
+sed -i 's^:/usr/lib/ladspa:^:/usr/lib64/ladspa:^' ext/ladspa/load.c
+sed -i 's^:/usr/lib/ladspa:^:/usr/lib64/ladspa:^' ext/ladspa/search.c
+%endif
+
 make %{?_smp_mflags}
 pushd ext/ladspa
 make %{?_smp_mflags}
@@ -232,7 +239,6 @@
 
 %files devel
 %defattr(-, root, root)
-%doc %{_datadir}/gtk-doc/html/gst-plugins-good-plugins-%{majorminor}
 
 %pre
 if [ "$1" -gt 1 ]; then
@@ -251,13 +257,17 @@
 gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/gstreamer-%{majorminor}.schemas > /dev/null || :
 
 %changelog
-* Wed Jan 14 2009 - Lennart Poettering <lpoetter at redhat.com> 0.10.11-3
-- Fix thread/memleak due to ref-loop
+* Wed Jan 14 2009 Warren Togami <wtogami at redhat.com> 0.10.11-4
+- Bug #477877 Fix multilib conflict in -devel
+- Bug #478449 Fix ladspa on lib64 
+
+* Wed Jan 14 2009 Lennart Poettering <lpoetter at redhat.com> 0.10.11-3
+- Bug #470000 Fix thread/memleak due to ref-loop
 
-* Tue Jan 13 2009 - Bastien Nocera <bnocera at redhat.com> - 0.10.11-2
+* Tue Jan 13 2009 Bastien Nocera <bnocera at redhat.com> - 0.10.11-2
 - Avoid pulsesink hang when PulseAudio disappears
 
-* Sat Oct 25 2008 - Bastien Nocera <bnocera at redhat.com> - 0.10.11-1
+* Sat Oct 25 2008 Bastien Nocera <bnocera at redhat.com> - 0.10.11-1
 - Update to 0.10.11
 - Update libv4l patch
 



From ianweller at fedoraproject.org  Thu Jan 15 03:34:20 2009
From: ianweller at fedoraproject.org (Ian Weller)
Date: Thu, 15 Jan 2009 03:34:20 +0000 (UTC)
Subject: rpms/ezstream/F-10 import.log, NONE, 1.1 ezstream.spec, 1.1,
	1.2 ezstream-stop-weird-installs.patch, 1.1, NONE
Message-ID: <20090115033420.0D7AC7012D@cvs1.fedora.phx.redhat.com>

Author: ianweller

Update of /cvs/pkgs/rpms/ezstream/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21292/F-10

Modified Files:
	ezstream.spec 
Added Files:
	import.log 
Removed Files:
	ezstream-stop-weird-installs.patch 
Log Message:
importing ezstream-0.5.3-2 in F-10


--- NEW FILE import.log ---
ezstream-0_5_3-2_fc10:F-10:ezstream-0.5.3-2.fc10.src.rpm:1231989229


Index: ezstream.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ezstream/F-10/ezstream.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ezstream.spec	12 Apr 2008 23:50:53 -0000	1.1
+++ ezstream.spec	15 Jan 2009 03:33:49 -0000	1.2
@@ -1,14 +1,12 @@
 Name:           ezstream
 Version:        0.5.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Command line source client for Icecast media streaming servers
 
 Group:          Applications/Multimedia
 License:        GPLv2
 URL:            http://www.icecast.org/ezstream.php
 Source0:        http://downloads.xiph.org/releases/ezstream/ezstream-%{version}.tar.gz
-# Patch0 gets rid of the unnecessary installation of documentation that we do ourselves anyway.
-Patch0:         ezstream-stop-weird-installs.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libogg-devel libvorbis-devel taglib-devel libshout-devel libxml2-devel
@@ -30,9 +28,13 @@
 formats when the optional TagLib support has been compiled in (which they are
 for this package).
 
+
 %prep
 %setup -q
-%patch0 -p1 -b .stop_weird_inst
+mkdir __examples
+cp -a examples __examples/examples
+rm -f __examples/examples/Makefile*
+chmod a-x __examples/examples/*
 
 
 %build
@@ -43,8 +45,7 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
-# spurious executable doc
-chmod a-x examples/*
+rm -rf $RPM_BUILD_ROOT%{_docdir} $RPM_BUILD_ROOT%{_datadir}/examples
 
 
 %clean
@@ -54,16 +55,15 @@
 %files
 %defattr(-,root,root,-)
 %{_bindir}/ezstream
-# Why are we specifying each example instead of just adding the directory?
-# If we do that, we get the Makefile stuff too, which is silly.
-%doc COPYING NEWS README examples/ezstream_metadata.xml examples/ezstream_mp3.xml
-%doc examples/ezstream_reencode_mp3.xml examples/ezstream_reencode_theora.xml
-%doc examples/ezstream_reencode_vorbis.xml examples/ezstream_stdin_vorbis.xml
-%doc examples/ezstream_vorbis.xml examples/meta.sh examples/play.sh
-%doc %{_mandir}/man1/ezstream.1.gz
-
+%doc COPYING NEWS README __examples/examples
+%{_mandir}/man1/ezstream.1.gz
 
 
 %changelog
+* Wed Jan 14 2009 Ian Weller <ianweller at gmail.com> 0.5.3-2
+- Remove doc declaration from the man page
+- Move examples into examples/ within the docdir
+- Remove need for patch and put commands in the right parts
+
 * Sat Apr 05 2008 Ian Weller <ianweller at gmail.com> 0.5.3-1
 - Initial package build.


--- ezstream-stop-weird-installs.patch DELETED ---



From ianweller at fedoraproject.org  Thu Jan 15 03:35:45 2009
From: ianweller at fedoraproject.org (Ian Weller)
Date: Thu, 15 Jan 2009 03:35:45 +0000 (UTC)
Subject: rpms/ezstream/F-9 import.log, NONE, 1.1 ezstream.spec, 1.1,
	1.2 ezstream-stop-weird-installs.patch, 1.1, NONE
Message-ID: <20090115033545.11B437012D@cvs1.fedora.phx.redhat.com>

Author: ianweller

Update of /cvs/pkgs/rpms/ezstream/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21641/F-9

Modified Files:
	ezstream.spec 
Added Files:
	import.log 
Removed Files:
	ezstream-stop-weird-installs.patch 
Log Message:
importing ezstream-0.5.3-2 in F-9


--- NEW FILE import.log ---
ezstream-0_5_3-2_fc10:F-9:ezstream-0.5.3-2.fc10.src.rpm:1231990482


Index: ezstream.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ezstream/F-9/ezstream.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ezstream.spec	17 May 2008 17:17:30 -0000	1.1
+++ ezstream.spec	15 Jan 2009 03:35:14 -0000	1.2
@@ -1,14 +1,12 @@
 Name:           ezstream
 Version:        0.5.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Command line source client for Icecast media streaming servers
 
 Group:          Applications/Multimedia
 License:        GPLv2
 URL:            http://www.icecast.org/ezstream.php
 Source0:        http://downloads.xiph.org/releases/ezstream/ezstream-%{version}.tar.gz
-# Patch0 gets rid of the unnecessary installation of documentation that we do ourselves anyway.
-Patch0:         ezstream-stop-weird-installs.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libogg-devel libvorbis-devel taglib-devel libshout-devel libxml2-devel
@@ -30,9 +28,13 @@
 formats when the optional TagLib support has been compiled in (which they are
 for this package).
 
+
 %prep
 %setup -q
-%patch0 -p1 -b .stop_weird_inst
+mkdir __examples
+cp -a examples __examples/examples
+rm -f __examples/examples/Makefile*
+chmod a-x __examples/examples/*
 
 
 %build
@@ -43,8 +45,7 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
-# spurious executable doc
-chmod a-x examples/*
+rm -rf $RPM_BUILD_ROOT%{_docdir} $RPM_BUILD_ROOT%{_datadir}/examples
 
 
 %clean
@@ -54,16 +55,15 @@
 %files
 %defattr(-,root,root,-)
 %{_bindir}/ezstream
-# Why are we specifying each example instead of just adding the directory?
-# If we do that, we get the Makefile stuff too, which is silly.
-%doc COPYING NEWS README examples/ezstream_metadata.xml examples/ezstream_mp3.xml
-%doc examples/ezstream_reencode_mp3.xml examples/ezstream_reencode_theora.xml
-%doc examples/ezstream_reencode_vorbis.xml examples/ezstream_stdin_vorbis.xml
-%doc examples/ezstream_vorbis.xml examples/meta.sh examples/play.sh
-%doc %{_mandir}/man1/ezstream.1.gz
-
+%doc COPYING NEWS README __examples/examples
+%{_mandir}/man1/ezstream.1.gz
 
 
 %changelog
+* Wed Jan 14 2009 Ian Weller <ianweller at gmail.com> 0.5.3-2
+- Remove doc declaration from the man page
+- Move examples into examples/ within the docdir
+- Remove need for patch and put commands in the right parts
+
 * Sat Apr 05 2008 Ian Weller <ianweller at gmail.com> 0.5.3-1
 - Initial package build.


--- ezstream-stop-weird-installs.patch DELETED ---



From pkgdb at fedoraproject.org  Thu Jan 15 03:37:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 15 Jan 2009 03:37:10 +0000
Subject: [pkgdb] libuninameslist: roozbeh has requested watchbugzilla
Message-ID: <20090115033710.C7DE12081FF@bastion.fedora.phx.redhat.com>

roozbeh has requested the watchbugzilla acl on libuninameslist (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libuninameslist



From pkgdb at fedoraproject.org  Thu Jan 15 03:37:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 15 Jan 2009 03:37:12 +0000
Subject: [pkgdb] libuninameslist: roozbeh has requested commit
Message-ID: <20090115033712.ACE002082B9@bastion.fedora.phx.redhat.com>

roozbeh has requested the commit acl on libuninameslist (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libuninameslist



From pkgdb at fedoraproject.org  Thu Jan 15 03:37:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 15 Jan 2009 03:37:25 +0000
Subject: [pkgdb] libuninameslist: roozbeh has requested watchbugzilla
Message-ID: <20090115033725.D2DFC2081FF@bastion.fedora.phx.redhat.com>

roozbeh has requested the watchbugzilla acl on libuninameslist (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libuninameslist



From pkgdb at fedoraproject.org  Thu Jan 15 03:37:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 15 Jan 2009 03:37:28 +0000
Subject: [pkgdb] libuninameslist: roozbeh has requested commit
Message-ID: <20090115033728.73305208468@bastion.fedora.phx.redhat.com>

roozbeh has requested the commit acl on libuninameslist (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libuninameslist



From iankent at fedoraproject.org  Thu Jan 15 03:47:47 2009
From: iankent at fedoraproject.org (Ian Kent)
Date: Thu, 15 Jan 2009 03:47:47 +0000 (UTC)
Subject: rpms/autofs/devel autofs-5.0.4-fix-ldap-detection.patch, NONE,
	1.1 autofs-5.0.4-fix-negative-cache-non-existent-key.patch, NONE,
	1.1 autofs-5.0.4-fix-select-fd-limit.patch, NONE,
	1.1 autofs-5.0.4-make-hash-table-scale-to-thousands-of-entries.patch, 
	NONE, 1.1 autofs-5.0.4-use-CLOEXEC-flag.patch, NONE,
	1.1 autofs.spec, 1.261, 1.262
Message-ID: <20090115034747.95E197012D@cvs1.fedora.phx.redhat.com>

Author: iankent

Update of /cvs/pkgs/rpms/autofs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23379

Modified Files:
	autofs.spec 
Added Files:
	autofs-5.0.4-fix-ldap-detection.patch 
	autofs-5.0.4-fix-negative-cache-non-existent-key.patch 
	autofs-5.0.4-fix-select-fd-limit.patch 
	autofs-5.0.4-make-hash-table-scale-to-thousands-of-entries.patch 
	autofs-5.0.4-use-CLOEXEC-flag.patch 
Log Message:
* Thu Jan 15 2009 Ian Kent <kent at redhat.com> - 5.0.4-5
- fix negative caching of non-existent keys.
- fix ldap library detection in configure.
- use CLOEXEC flag functionality if present.
- fix select(2) fd limit.
- make hash table scale to thousands of entries.


autofs-5.0.4-fix-ldap-detection.patch:

--- NEW FILE autofs-5.0.4-fix-ldap-detection.patch ---
autofs-5.0.4 - fix ldap detection

From: Guillaume Rousse <Guillaume.Rousse at inria.fr>

The test for LDAP library wrongly use LDFLAGS to add -lldap to the gcc
call. However, when strict linker ordering is in effect, it doesn't work
correctly. As described in autoconf documentation, additional libs
should be added through LIBS variable instead.
---

 aclocal.m4 |   20 ++++++++++----------
 configure  |   20 ++++++++++----------
 2 files changed, 20 insertions(+), 20 deletions(-)


diff --git a/aclocal.m4 b/aclocal.m4
index bb0ab21..ab11112 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -246,9 +246,9 @@ dnl --------------------------------------------------------------------------
 AC_DEFUN([AF_CHECK_FUNC_LDAP_CREATE_PAGE_CONTROL],
 [AC_MSG_CHECKING(for ldap_create_page_control in -lldap)
 
-# save current ldflags
-af_check_ldap_create_page_control_save_ldflags="$LDFLAGS"
-LDFLAGS="$LDFLAGS -lldap"
+# save current libs
+af_check_ldap_create_page_control_save_libs="$LIBS"
+LIBS="$LIBS -lldap"
 
 AC_TRY_LINK(
   [ #include <ldap.h> ],
@@ -267,8 +267,8 @@ if test "$af_have_ldap_create_page_control" = "yes"; then
         [Define to 1 if you have the `ldap_create_page_control' function.])
 fi
 
-# restore ldflags
-LDFLAGS="$af_check_ldap_create_page_control_save_ldflags"
+# restore libs
+LIBS="$af_check_ldap_create_page_control_save_libs"
 ])
 
 dnl --------------------------------------------------------------------------
@@ -279,9 +279,9 @@ dnl --------------------------------------------------------------------------
 AC_DEFUN([AF_CHECK_FUNC_LDAP_PARSE_PAGE_CONTROL],
 [AC_MSG_CHECKING(for ldap_parse_page_control in -lldap)
 
-# save current ldflags
-af_check_ldap_parse_page_control_save_ldflags="$LDFLAGS"
-LDFLAGS="$LDFLAGS -lldap"
+# save current libs
+af_check_ldap_parse_page_control_save_libs="$LIBS"
+LIBS="$LIBS -lldap"
 
 AC_TRY_LINK(
   [ #include <ldap.h> ],
@@ -300,7 +300,7 @@ if test "$af_have_ldap_create_page_control" = "yes"; then
         [Define to 1 if you have the `ldap_parse_page_control' function.])
 fi
 
-# restore ldflags
-LDFLAGS="$af_check_ldap_parse_page_control_save_ldflags"
+# restore libs
+LIBS="$af_check_ldap_parse_page_control_save_libs"
 ])
 
diff --git a/configure b/configure
index ed17660..afa692c 100755
--- a/configure
+++ b/configure
@@ -4608,9 +4608,9 @@ _ACEOF
 	{ echo "$as_me:$LINENO: checking for ldap_create_page_control in -lldap" >&5
 echo $ECHO_N "checking for ldap_create_page_control in -lldap... $ECHO_C" >&6; }
 
-# save current ldflags
-af_check_ldap_create_page_control_save_ldflags="$LDFLAGS"
-LDFLAGS="$LDFLAGS -lldap"
+# save current libs
+af_check_ldap_create_page_control_save_libs="$LIBS"
+LIBS="$LIBS -lldap"
 
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -4672,15 +4672,15 @@ _ACEOF
 
 fi
 
-# restore ldflags
-LDFLAGS="$af_check_ldap_create_page_control_save_ldflags"
+# restore libs
+LIBS="$af_check_ldap_create_page_control_save_libs"
 
 	{ echo "$as_me:$LINENO: checking for ldap_parse_page_control in -lldap" >&5
 echo $ECHO_N "checking for ldap_parse_page_control in -lldap... $ECHO_C" >&6; }
 
-# save current ldflags
-af_check_ldap_parse_page_control_save_ldflags="$LDFLAGS"
-LDFLAGS="$LDFLAGS -lldap"
+# save current libs
+af_check_ldap_parse_page_control_save_libs="$LIBS"
+LIBS="$LIBS -lldap"
 
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -4742,8 +4742,8 @@ _ACEOF
 
 fi
 
-# restore ldflags
-LDFLAGS="$af_check_ldap_parse_page_control_save_ldflags"
+# restore libs
+LIBS="$af_check_ldap_parse_page_control_save_libs"
 
 fi
 

autofs-5.0.4-fix-negative-cache-non-existent-key.patch:

--- NEW FILE autofs-5.0.4-fix-negative-cache-non-existent-key.patch ---
autofs-5.0.4 - fix negative cache non-existent key

From: Ian Kent <raven at themaw.net>

autofs was not recording map entries that don't exist for negative
caching. This was causing unwanted network map lookups.
---

 CHANGELOG                |    1 +
 daemon/lookup.c          |   48 ++++++++++++++++++++++++++++++++++++++++++++--
 modules/lookup_file.c    |   20 ++++++++++++-------
 modules/lookup_hosts.c   |   21 ++++++++++++++++----
 modules/lookup_ldap.c    |   20 ++++++++++++-------
 modules/lookup_nisplus.c |   19 ++++++++++++------
 modules/lookup_program.c |   35 ++++++++++++++++++++++++++--------
 modules/lookup_yp.c      |   19 ++++++++++++------
 8 files changed, 143 insertions(+), 40 deletions(-)


diff --git a/CHANGELOG b/CHANGELOG
index 88ca579..bd35b00 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,7 @@
 -----------------------
 - fix dumb libxml2 check
 - fix nested submount expire deadlock.
+- fix negative caching for non-existent map keys.
 
 4/11/2008 autofs-5.0.4
 -----------------------
diff --git a/daemon/lookup.c b/daemon/lookup.c
index 803df4f..0cf6e3f 100644
--- a/daemon/lookup.c
+++ b/daemon/lookup.c
@@ -804,6 +804,45 @@ static enum nsswitch_status lookup_map_name(struct nss_source *this,
 	return result;
 }
 
+static void update_negative_cache(struct autofs_point *ap, struct map_source *source, const char *name)
+{
+	struct master_mapent *entry = ap->entry;
+	struct map_source *map;
+	struct mapent *me;
+
+	/* Have we recorded the lookup fail for negative caching? */
+	me = lookup_source_mapent(ap, name, LKP_DISTINCT);
+	if (me)
+		/*
+		 *  Already exists in the cache, the mount fail updates
+		 *  will update negative timeout status.
+		 */
+		cache_unlock(me->mc);
+	else {
+		/* Notify only once after fail */
+		error(ap->logopt, "key \"%s\" not found in map.", name);
+
+		/* Doesn't exist in any source, just add it somewhere */
+		if (source)
+			map = source;
+		else
+			map = entry->maps;
+		if (map) {
+			time_t now = time(NULL);
+			int rv = CHE_FAIL;
+
+			cache_writelock(map->mc);
+			rv = cache_update(map->mc, map, name, NULL, now);
+			if (rv != CHE_FAIL) {
+				me = cache_lookup_distinct(map->mc, name);
+				me->status = now + ap->negative_timeout;
+			}
+			cache_unlock(map->mc);
+		}
+	}
+	return;
+}
+
 int lookup_nss_mount(struct autofs_point *ap, struct map_source *source, const char *name, int name_len)
 {
 	struct master_mapent *entry = ap->entry;
@@ -907,8 +946,13 @@ int lookup_nss_mount(struct autofs_point *ap, struct map_source *source, const c
 		send_map_update_request(ap);
 	pthread_cleanup_pop(1);
 
-	if (result == NSS_STATUS_NOTFOUND)
-		error(ap->logopt, "key \"%s\" not found in map.", name);
+	/*
+	 * The last source lookup will return NSS_STATUS_NOTFOUND if the
+	 * map exits and the key has not been found but the map may also
+	 * not exist in which case the key is also not found.
+	 */
+	if (result == NSS_STATUS_NOTFOUND || result == NSS_STATUS_UNAVAIL)
+		update_negative_cache(ap, source, name);
 
 	return !result;
 }
diff --git a/modules/lookup_file.c b/modules/lookup_file.c
index 807ceab..9e34b72 100644
--- a/modules/lookup_file.c
+++ b/modules/lookup_file.c
@@ -1069,14 +1069,20 @@ int lookup_mount(struct autofs_point *ap, const char *name, int name_len, void *
 	if (key_len > KEY_MAX_LEN)
 		return NSS_STATUS_NOTFOUND;
 
-	/* Check if we recorded a mount fail for this key */
-	cache_readlock(mc);
-	me = cache_lookup_distinct(mc, key);
-	if (me && me->status >= time(NULL)) {
-		cache_unlock(mc);
-		return NSS_STATUS_UNAVAIL;
+	/* Check if we recorded a mount fail for this key anywhere */
+	me = lookup_source_mapent(ap, key, LKP_DISTINCT);
+	if (me) {
+		if (me->status >= time(NULL)) {
+			cache_unlock(me->mc);
+			return NSS_STATUS_NOTFOUND;
+		}
+
+		/* Negative timeout expired for non-existent entry. */
+		if (!me->mapent)
+			cache_delete(me->mc, key);
+
+		cache_unlock(me->mc);
 	}
-	cache_unlock(mc);
 
 	/*
 	 * We can't check the direct mount map as if it's not in
diff --git a/modules/lookup_hosts.c b/modules/lookup_hosts.c
index bf24d7f..f8d4269 100644
--- a/modules/lookup_hosts.c
+++ b/modules/lookup_hosts.c
@@ -136,12 +136,25 @@ int lookup_mount(struct autofs_point *ap, const char *name, int name_len, void *
 
 	mc = source->mc;
 
+	/* Check if we recorded a mount fail for this key anywhere */
+	me = lookup_source_mapent(ap, name, LKP_DISTINCT);
+	if (me) {
+		if (me->status >= time(NULL)) {
+			cache_unlock(me->mc);
+			return NSS_STATUS_NOTFOUND;
+		}
+
+		if (!me->mapent) {
+			cache_delete(me->mc, name);
+			me = NULL;
+		}
+
+		cache_unlock(me->mc);
+	}
+
 	cache_readlock(mc);
 	me = cache_lookup_distinct(mc, name);
-	if (me && me->status >= time(NULL)) {
-		cache_unlock(mc);
-		return NSS_STATUS_NOTFOUND;
-	} else if (!me) {
+	if (!me) {
 		cache_unlock(mc);
 		/*
 		 * We haven't read the list of hosts into the
diff --git a/modules/lookup_ldap.c b/modules/lookup_ldap.c
index 31c2c13..42c3235 100644
--- a/modules/lookup_ldap.c
+++ b/modules/lookup_ldap.c
@@ -2709,14 +2709,20 @@ int lookup_mount(struct autofs_point *ap, const char *name, int name_len, void *
 	if (key_len > KEY_MAX_LEN)
 		return NSS_STATUS_NOTFOUND;
 
-	/* Check if we recorded a mount fail for this key */
-	cache_readlock(mc);
-	me = cache_lookup_distinct(mc, key);
-	if (me && me->status >= time(NULL)) {
-		cache_unlock(mc);
-		return NSS_STATUS_NOTFOUND;
+	/* Check if we recorded a mount fail for this key anywhere */
+	me = lookup_source_mapent(ap, key, LKP_DISTINCT);
+	if (me) {
+		if (me->status >= time(NULL)) {
+			cache_unlock(me->mc);
+			return NSS_STATUS_NOTFOUND;
+		}
+
+		/* Negative timeout expired for non-existent entry. */
+		if (!me->mapent)
+			cache_delete(me->mc, key);
+
+		cache_unlock(me->mc);
 	}
-	cache_unlock(mc);
 
         /*
 	 * We can't check the direct mount map as if it's not in
diff --git a/modules/lookup_nisplus.c b/modules/lookup_nisplus.c
index 755556d..f15465f 100644
--- a/modules/lookup_nisplus.c
+++ b/modules/lookup_nisplus.c
@@ -493,13 +493,20 @@ int lookup_mount(struct autofs_point *ap, const char *name, int name_len, void *
 	if (key_len > KEY_MAX_LEN)
 		return NSS_STATUS_NOTFOUND;
 
-	cache_readlock(mc);
-	me = cache_lookup_distinct(mc, key);
-	if (me && me->status >= time(NULL)) {
-		cache_unlock(mc);
-		return NSS_STATUS_NOTFOUND;
+	/* Check if we recorded a mount fail for this key anywhere */
+	me = lookup_source_mapent(ap, key, LKP_DISTINCT);
+	if (me) {
+		if (me->status >= time(NULL)) {
+			cache_unlock(me->mc);
+			return NSS_STATUS_NOTFOUND;
+		}
+
+		/* Negative timeout expired for non-existent entry. */
+		if (!me->mapent)
+			cache_delete(me->mc, key);
+
+		cache_unlock(me->mc);
 	}
-	cache_unlock(mc);
 
 	/*
 	 * We can't check the direct mount map as if it's not in
diff --git a/modules/lookup_program.c b/modules/lookup_program.c
index daf874d..bf32d3b 100644
--- a/modules/lookup_program.c
+++ b/modules/lookup_program.c
@@ -131,13 +131,25 @@ int lookup_mount(struct autofs_point *ap, const char *name, int name_len, void *
 
 	mc = source->mc;
 
+	/* Check if we recorded a mount fail for this key anywhere */
+	me = lookup_source_mapent(ap, name, LKP_DISTINCT);
+	if (me) {
+		if (me->status >= time(NULL)) {
+			cache_unlock(me->mc);
+			return NSS_STATUS_NOTFOUND;
+		}
+
+		/* Negative timeout expired for non-existent entry. */
+		if (!me->mapent)
+			cache_delete(me->mc, name);
+
+		cache_unlock(me->mc);
+	}
+
 	/* Catch installed direct offset triggers */
-	cache_readlock(mc);
+	cache_writelock(mc);
 	me = cache_lookup_distinct(mc, name);
-	if (me && me->status >= time(NULL)) {
-		cache_unlock(mc);
-		return NSS_STATUS_NOTFOUND;
-	} else if (!me) {
+	if (!me) {
 		cache_unlock(mc);
 		/*
 		 * If there's a '/' in the name and the offset is not in
@@ -149,8 +161,6 @@ int lookup_mount(struct autofs_point *ap, const char *name, int name_len, void *
 			return NSS_STATUS_NOTFOUND;
 		}
 	} else {
-		cache_unlock(mc);
-
 		/* Otherwise we found a valid offset so try mount it */
 		debug(ap->logopt, MODPREFIX "%s -> %s", name, me->mapent);
 
@@ -163,19 +173,28 @@ int lookup_mount(struct autofs_point *ap, const char *name, int name_len, void *
 		 */
 		if (strchr(name, '/') ||
 		    me->age + ap->negative_timeout > time(NULL)) {
+			char *ent = NULL;
+
+			if (me->mapent) {
+				ent = alloca(strlen(me->mapent) + 1);
+				strcpy(ent, me->mapent);
+			}
+			cache_unlock(mc);
 			master_source_current_wait(ap->entry);
 			ap->entry->current = source;
 			ret = ctxt->parse->parse_mount(ap, name,
-				 name_len, me->mapent, ctxt->parse->context);
+				 name_len, ent, ctxt->parse->context);
 			goto out_free;
 		} else {
 			if (me->multi) {
+				cache_unlock(mc);
 				warn(ap->logopt, MODPREFIX
 				     "unexpected lookup for active multi-mount"
 				     " key %s, returning fail", name);
 				return NSS_STATUS_UNAVAIL;
 			}
 			cache_delete(mc, name);
+			cache_unlock(mc);
 		}
 	}
 
diff --git a/modules/lookup_yp.c b/modules/lookup_yp.c
index 8b6408b..1b62f57 100644
--- a/modules/lookup_yp.c
+++ b/modules/lookup_yp.c
@@ -603,13 +603,20 @@ int lookup_mount(struct autofs_point *ap, const char *name, int name_len, void *
 	if (key_len > KEY_MAX_LEN)
 		return NSS_STATUS_NOTFOUND;
 
-	cache_readlock(mc);
-	me = cache_lookup_distinct(mc, key);
-	if (me && me->status >= time(NULL)) {
-		cache_unlock(mc);
-		return NSS_STATUS_NOTFOUND;
+	/* Check if we recorded a mount fail for this key anywhere */
+	me = lookup_source_mapent(ap, key, LKP_DISTINCT);
+	if (me) {
+		if (me->status >= time(NULL)) {
+			cache_unlock(me->mc);
+			return NSS_STATUS_NOTFOUND;
+		}
+
+		/* Negative timeout expired for non-existent entry. */
+		if (!me->mapent)
+			cache_delete(me->mc, key);
+
+		cache_unlock(me->mc);
 	}
-	cache_unlock(mc);
 
 	 /*
 	  * We can't check the direct mount map as if it's not in

autofs-5.0.4-fix-select-fd-limit.patch:

--- NEW FILE autofs-5.0.4-fix-select-fd-limit.patch ---
autofs-5.0.4 - fix select fd limit

From: Ian Kent <raven at themaw.net>

Using a large number of direct mounts causes autofs to hang. This is
because select(2) is limited to 1024 file handles (usually). To resolve
this we need to convert calls to select(2) to use poll(2).
---

 CHANGELOG                |    1 +
 daemon/spawn.c           |   19 ++++++------
 lib/rpc_subs.c           |   32 ++++++++++++++------
 modules/lookup_program.c |   74 +++++++++++++++++++++++++++-------------------
 4 files changed, 78 insertions(+), 48 deletions(-)


diff --git a/CHANGELOG b/CHANGELOG
index 43f3205..0fb7db5 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -4,6 +4,7 @@
 - fix nested submount expire deadlock.
 - fix negative caching for non-existent map keys.
 - use CLOEXEC flag.
+- fix select(2) fd limit.
 
 4/11/2008 autofs-5.0.4
 -----------------------
diff --git a/daemon/spawn.c b/daemon/spawn.c
index 4ddf46f..e02d926 100644
--- a/daemon/spawn.c
+++ b/daemon/spawn.c
@@ -21,6 +21,7 @@
 #include <sys/types.h>
 #include <dirent.h>
 #include <time.h>
+#include <poll.h>
 #include <sys/wait.h>
 #include <sys/stat.h>
 #include <sys/mount.h>
@@ -89,21 +90,21 @@ void reset_signals(void)
 
 static int timed_read(int pipe, char *buf, size_t len, int time)
 {
-	struct timeval timeout = { 0, 0 };
-	struct timeval *tout = NULL;
-	fd_set wset, rset;
+	struct pollfd pfd[1];
+	int timeout = time;
 	int ret;
 
-	FD_ZERO(&rset);
-	FD_SET(pipe, &rset);
-	wset = rset;
+	pfd[0].fd = pipe;
+	pfd[0].events = POLLIN;
 
 	if (time != -1) {
-		timeout.tv_sec = time;
-		tout = &timeout;
+		if (time >= (INT_MAX - 1)/1000)
+			timeout = INT_MAX - 1;
+		else
+			timeout = time * 1000;
 	}
 
-	ret = select(pipe + 1, &rset, &wset, NULL, tout);
+	ret = poll(pfd, 1, timeout);
 	if (ret <= 0) {
 		if (ret == 0)
 			ret = -ETIMEDOUT;
diff --git a/lib/rpc_subs.c b/lib/rpc_subs.c
index 9ac3657..7b347a7 100644
--- a/lib/rpc_subs.c
+++ b/lib/rpc_subs.c
@@ -31,6 +31,7 @@
 #include <sys/ioctl.h>
 #include <ctype.h>
 #include <pthread.h>
+#include <poll.h>
 
 #include "mount.h"
 #include "rpc_subs.h"
@@ -197,14 +198,15 @@ void rpc_destroy_udp_client(struct conn_info *info)
 /*
  *  Perform a non-blocking connect on the socket fd.
  *
- *  tout contains the timeout.  It will be modified to contain the time
- *  remaining (i.e. time provided - time elasped).
+ *  The input struct timeval always has tv_nsec set to zero,
+ *  we only ever use tv_sec for timeouts.
  */
 static int connect_nb(int fd, struct sockaddr_in *addr, struct timeval *tout)
 {
+	struct pollfd pfd[1];
+	int timeout = tout->tv_sec;
 	int flags, ret;
 	socklen_t len;
-	fd_set wset, rset;
 
 	flags = fcntl(fd, F_GETFL, 0);
 	if (flags < 0)
@@ -229,12 +231,10 @@ static int connect_nb(int fd, struct sockaddr_in *addr, struct timeval *tout)
 	if (ret == 0)
 		goto done;
 
-	/* now wait */
-	FD_ZERO(&rset);
-	FD_SET(fd, &rset);
-	wset = rset;
+	pfd[0].fd = fd;
+	pfd[0].events = POLLOUT;
 
-	ret = select(fd + 1, &rset, &wset, NULL, tout);
+	ret = poll(pfd, 1, timeout);
 	if (ret <= 0) {
 		if (ret == 0)
 			ret = -ETIMEDOUT;
@@ -243,13 +243,27 @@ static int connect_nb(int fd, struct sockaddr_in *addr, struct timeval *tout)
 		goto done;
 	}
 
-	if (FD_ISSET(fd, &rset) || FD_ISSET(fd, &wset)) {
+	if (pfd[0].revents) {
 		int status;
 
 		len = sizeof(ret);
 		status = getsockopt(fd, SOL_SOCKET, SO_ERROR, &ret, &len);
 		if (status < 0) {
+			char buf[MAX_ERR_BUF + 1];
+			char *estr = strerror_r(errno, buf, MAX_ERR_BUF);
+
+			/*
+			 * We assume getsockopt amounts to a read on the
+			 * descriptor and gives us the errno we need for
+			 * the POLLERR revent case.
+			 */
 			ret = -errno;
+
+			/* Unexpected case, log it so we know we got caught */
+			if (pfd[0].revents & POLLNVAL)
+				logerr("unexpected poll(2) error on connect:"
+				       " %s", estr);
+
 			goto done;
 		}
 
diff --git a/modules/lookup_program.c b/modules/lookup_program.c
index 6f4e2a3..f62d3ef 100644
--- a/modules/lookup_program.c
+++ b/modules/lookup_program.c
@@ -24,6 +24,7 @@
 #include <sys/times.h>
 #include <sys/types.h>
 #include <sys/wait.h>
+#include <poll.h>
 
 #define MODULE_LOOKUP
 #include "automount.h"
@@ -113,14 +114,12 @@ int lookup_mount(struct autofs_point *ap, const char *name, int name_len, void *
 	char errbuf[1024], *errp;
 	char ch;
 	int pipefd[2], epipefd[2];
+	struct pollfd pfd[2];
 	pid_t f;
-	int files_left;
 	int status;
-	fd_set readfds, ourfds;
 	enum state { st_space, st_map, st_done } state;
 	int quoted = 0;
 	int ret = 1;
-	int max_fd;
 	int distance;
 	int alloci = 1;
 
@@ -253,30 +252,39 @@ int lookup_mount(struct autofs_point *ap, const char *name, int name_len, void *
 	errp = errbuf;
 	state = st_space;
 
-	FD_ZERO(&ourfds);
-	FD_SET(pipefd[0], &ourfds);
-	FD_SET(epipefd[0], &ourfds);
+	pfd[0].fd = pipefd[0];
+	pfd[0].events = POLLIN;
+	pfd[1].fd = epipefd[0];
+	pfd[1].events = POLLIN;
 
-	max_fd = pipefd[0] > epipefd[0] ? pipefd[0] : epipefd[0];
+	while (1) {
+		int bytes;
 
-	files_left = 2;
+		if (poll(pfd, 2, -1) < 0 && errno != EINTR)
+			break;
+
+		if (pfd[0].fd == -1 && pfd[1].fd == -1)
+			break;
 
-	while (files_left != 0) {
-		readfds = ourfds;
-		if (select(max_fd + 1, &readfds, NULL, NULL, NULL) < 0 && errno != EINTR)
+		if ((pfd[0].revents & (POLLIN|POLLHUP)) == POLLHUP &&
+		    (pfd[1].revents & (POLLIN|POLLHUP)) == POLLHUP)
 			break;
 
 		/* Parse maps from stdout */
-		if (FD_ISSET(pipefd[0], &readfds)) {
-			if (read(pipefd[0], &ch, 1) < 1) {
-				FD_CLR(pipefd[0], &ourfds);
-				files_left--;
+		if (pfd[0].revents) {
+cont:
+			bytes = read(pipefd[0], &ch, 1);
+			if (bytes == 0)
+				goto next;
+			else if (bytes < 0) {
+				pfd[0].fd = -1;
 				state = st_done;
+				goto next;
 			}
 
 			if (!quoted && ch == '\\') {
 				quoted = 1;
-				continue;
+				goto cont;
 			}
 
 			switch (state) {
@@ -333,26 +341,32 @@ int lookup_mount(struct autofs_point *ap, const char *name, int name_len, void *
 				/* Eat characters till there's no more output */
 				break;
 			}
+			goto cont;
 		}
 		quoted = 0;
-
+next:
 		/* Deal with stderr */
-		if (FD_ISSET(epipefd[0], &readfds)) {
-			if (read(epipefd[0], &ch, 1) < 1) {
-				FD_CLR(epipefd[0], &ourfds);
-				files_left--;
-			} else if (ch == '\n') {
-				*errp = '\0';
-				if (errbuf[0])
-					logmsg(">> %s", errbuf);
-				errp = errbuf;
-			} else {
-				if (errp >= &errbuf[1023]) {
+		if (pfd[1].revents) {
+			while (1) {
+				bytes = read(epipefd[0], &ch, 1);
+				if (bytes == 0)
+					break;
+				else if (bytes < 0) {
+					pfd[1].fd = -1;
+					break;
+				} else if (ch == '\n') {
 					*errp = '\0';
-					logmsg(">> %s", errbuf);
+					if (errbuf[0])
+						logmsg(">> %s", errbuf);
 					errp = errbuf;
+				} else {
+					if (errp >= &errbuf[1023]) {
+						*errp = '\0';
+						logmsg(">> %s", errbuf);
+						errp = errbuf;
+					}
+					*(errp++) = ch;
 				}
-				*(errp++) = ch;
 			}
 		}
 	}

autofs-5.0.4-make-hash-table-scale-to-thousands-of-entries.patch:

--- NEW FILE autofs-5.0.4-make-hash-table-scale-to-thousands-of-entries.patch ---
autofs-5.0.4 - make hash table scale to thousands of entries

From: Valerie Aurora Henson <vaurora at redhat.com>

Originally written by Paul Wankadia <junyer at google.com>.

The autofs cache lookup performs poorly for large maps.

The additive hashing algorithm used by autofs results in a clustering
of hash values around the average hash chain size. It is biased toward
a small range of hash indexes which becomes worse as the hash table size
increases.

Simple testing shows that the "One-at-a-time" hash function (implemented
by this patch) gives a much better distribution of hash indexes as table
size increases.

The only change made to the original patch is to make the hash table size
configurable with a default somewhat larger than it is currently.
---

 CHANGELOG                      |    2 ++
 include/automount.h            |    2 +-
 include/defaults.h             |    3 +++
 lib/cache.c                    |   47 +++++++++++++++++++++++-----------------
 lib/defaults.c                 |   16 +++++++++++++-
 redhat/autofs.sysconfig.in     |    6 +++++
 samples/autofs.conf.default.in |    6 +++++
 7 files changed, 60 insertions(+), 22 deletions(-)


diff --git a/CHANGELOG b/CHANGELOG
index 0fb7db5..912c088 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -5,6 +5,8 @@
 - fix negative caching for non-existent map keys.
 - use CLOEXEC flag.
 - fix select(2) fd limit.
+- make hash table scale to thousands of entries (Paul Wankadia,
+  Valerie Aurora Henson).
 
 4/11/2008 autofs-5.0.4
 -----------------------
diff --git a/include/automount.h b/include/automount.h
index a55ddbc..fa24885 100644
--- a/include/automount.h
+++ b/include/automount.h
@@ -128,7 +128,7 @@ struct autofs_point;
 #define CHE_DUPLICATE	0x0020
 #define CHE_UNAVAIL	0x0040
 
-#define HASHSIZE		77
+#define NULL_MAP_HASHSIZE	64
 #define NEGATIVE_TIMEOUT	10
 #define UMOUNT_RETRIES		8
 #define EXPIRE_RETRIES		3
diff --git a/include/defaults.h b/include/defaults.h
index 12534ec..9a2430f 100644
--- a/include/defaults.h
+++ b/include/defaults.h
@@ -40,6 +40,8 @@
 #define DEFAULT_APPEND_OPTIONS		1
 #define DEFAULT_AUTH_CONF_FILE		AUTOFS_MAP_DIR "/autofs_ldap_auth.conf"
 
+#define DEFAULT_MAP_HASH_TABLE_SIZE	1024
+
 struct ldap_schema;
 struct ldap_searchdn;
 
@@ -62,6 +64,7 @@ void defaults_free_searchdns(struct ldap_searchdn *);
 unsigned int defaults_get_append_options(void);
 unsigned int defaults_get_umount_wait(void);
 const char *defaults_get_auth_conf_file(void);
+unsigned int defaults_get_map_hash_table_size(void);
 
 #endif
 
diff --git a/lib/cache.c b/lib/cache.c
index 4a00367..edb3192 100644
--- a/lib/cache.c
+++ b/lib/cache.c
@@ -190,7 +190,7 @@ struct mapent_cache *cache_init(struct autofs_point *ap, struct map_source *map)
 	if (!mc)
 		return NULL;
 
-	mc->size = HASHSIZE;
+	mc->size = defaults_get_map_hash_table_size();
 
 	mc->hash = malloc(mc->size * sizeof(struct entry *));
 	if (!mc->hash) {
@@ -241,7 +241,7 @@ struct mapent_cache *cache_init_null_cache(struct master *master)
 	if (!mc)
 		return NULL;
 
-	mc->size = HASHSIZE;
+	mc->size = NULL_MAP_HASHSIZE;
 
 	mc->hash = malloc(mc->size * sizeof(struct entry *));
 	if (!mc->hash) {
@@ -279,29 +279,36 @@ struct mapent_cache *cache_init_null_cache(struct master *master)
 	return mc;
 }
 
-static unsigned int hash(const char *key)
+static u_int32_t hash(const char *key, unsigned int size)
 {
-	unsigned long hashval;
+	u_int32_t hashval;
 	char *s = (char *) key;
 
-	for (hashval = 0; *s != '\0';)
-		hashval += *s++;
+	for (hashval = 0; *s != '\0';) {
+		hashval += (unsigned char) *s++;
+		hashval += (hashval << 10);
+		hashval ^= (hashval >> 6);
+	}
+
+	hashval += (hashval << 3);
+	hashval ^= (hashval >> 11);
+	hashval += (hashval << 15);
 
-	return hashval % HASHSIZE;
+	return hashval % size;
 }
 
-static unsigned int ino_hash(dev_t dev, ino_t ino)
+static u_int32_t ino_hash(dev_t dev, ino_t ino, unsigned int size)
 {
-	unsigned long hashval;
+	u_int32_t hashval;
 
 	hashval = dev + ino;
 
-	return hashval % HASHSIZE;
+	return hashval % size;
 }
 
 int cache_set_ino_index(struct mapent_cache *mc, const char *key, dev_t dev, ino_t ino)
 {
-	unsigned int ino_index = ino_hash(dev, ino);
+	u_int32_t ino_index = ino_hash(dev, ino, mc->size);
 	struct mapent *me;
 
 	me = cache_lookup_distinct(mc, key);
@@ -323,10 +330,10 @@ struct mapent *cache_lookup_ino(struct mapent_cache *mc, dev_t dev, ino_t ino)
 {
 	struct mapent *me = NULL;
 	struct list_head *head, *p;
-	unsigned int ino_index;
+	u_int32_t ino_index;
 
 	ino_index_lock(mc);
-	ino_index = ino_hash(dev, ino);
+	ino_index = ino_hash(dev, ino, mc->size);
 	head = &mc->ino_index[ino_index];
 
 	list_for_each(p, head) {
@@ -369,7 +376,7 @@ struct mapent *cache_lookup_first(struct mapent_cache *mc)
 struct mapent *cache_lookup_next(struct mapent_cache *mc, struct mapent *me)
 {
 	struct mapent *this;
-	unsigned long hashval;
+	u_int32_t hashval;
 	unsigned int i;
 
 	if (!me)
@@ -385,7 +392,7 @@ struct mapent *cache_lookup_next(struct mapent_cache *mc, struct mapent *me)
 		return this;
 	}
 
-	hashval = hash(me->key) + 1;
+	hashval = hash(me->key, mc->size) + 1;
 	if (hashval < mc->size) {
 		for (i = (unsigned int) hashval; i < mc->size; i++) {
 			this = mc->hash[i];
@@ -433,7 +440,7 @@ struct mapent *cache_lookup(struct mapent_cache *mc, const char *key)
 	if (!key)
 		return NULL;
 
-	for (me = mc->hash[hash(key)]; me != NULL; me = me->next) {
+	for (me = mc->hash[hash(key, mc->size)]; me != NULL; me = me->next) {
 		if (strcmp(key, me->key) == 0)
 			goto done;
 	}
@@ -446,7 +453,7 @@ struct mapent *cache_lookup(struct mapent_cache *mc, const char *key)
 			goto done;
 		}
 
-		for (me = mc->hash[hash("*")]; me != NULL; me = me->next)
+		for (me = mc->hash[hash("*", mc->size)]; me != NULL; me = me->next)
 			if (strcmp("*", me->key) == 0)
 				goto done;
 	}
@@ -462,7 +469,7 @@ struct mapent *cache_lookup_distinct(struct mapent_cache *mc, const char *key)
 	if (!key)
 		return NULL;
 
-	for (me = mc->hash[hash(key)]; me != NULL; me = me->next) {
+	for (me = mc->hash[hash(key, mc->size)]; me != NULL; me = me->next) {
 		if (strcmp(key, me->key) == 0)
 			return me;
 	}
@@ -530,7 +537,7 @@ int cache_add(struct mapent_cache *mc, struct map_source *ms, const char *key, c
 {
 	struct mapent *me, *existing = NULL;
 	char *pkey, *pent;
-	unsigned int hashval = hash(key);
+	u_int32_t hashval = hash(key, mc->size);
 	int status;
 
 	me = (struct mapent *) malloc(sizeof(struct mapent));
@@ -750,7 +757,7 @@ int cache_update(struct mapent_cache *mc, struct map_source *ms, const char *key
 int cache_delete(struct mapent_cache *mc, const char *key)
 {
 	struct mapent *me = NULL, *pred;
-	unsigned int hashval = hash(key);
+	u_int32_t hashval = hash(key, mc->size);
 	int status, ret = CHE_OK;
 	char *this;
 
diff --git a/lib/defaults.c b/lib/defaults.c
index ff653e3..0d39716 100644
--- a/lib/defaults.c
+++ b/lib/defaults.c
@@ -49,6 +49,8 @@
 #define ENV_UMOUNT_WAIT			"UMOUNT_WAIT"
 #define ENV_AUTH_CONF_FILE		"AUTH_CONF_FILE"
 
+#define ENV_MAP_HASH_TABLE_SIZE		"MAP_HASH_TABLE_SIZE"
+
 static const char *default_master_map_name = DEFAULT_MASTER_MAP_NAME;
 static const char *default_auth_conf_file  = DEFAULT_AUTH_CONF_FILE;
 
@@ -323,7 +325,8 @@ unsigned int defaults_read_config(unsigned int to_syslog)
 		    check_set_config_value(key, ENV_NAME_VALUE_ATTR, value, to_syslog) ||
 		    check_set_config_value(key, ENV_APPEND_OPTIONS, value, to_syslog) ||
 		    check_set_config_value(key, ENV_UMOUNT_WAIT, value, to_syslog) ||
-		    check_set_config_value(key, ENV_AUTH_CONF_FILE, value, to_syslog))
+		    check_set_config_value(key, ENV_AUTH_CONF_FILE, value, to_syslog) ||
+		    check_set_config_value(key, ENV_MAP_HASH_TABLE_SIZE, value, to_syslog))
 			;
 	}
 
@@ -672,3 +675,14 @@ const char *defaults_get_auth_conf_file(void)
 	return (const char *) cf;
 }
 
+unsigned int defaults_get_map_hash_table_size(void)
+{
+	long size;
+
+	size = get_env_number(ENV_MAP_HASH_TABLE_SIZE);
+	if (size < 0)
+		size = DEFAULT_MAP_HASH_TABLE_SIZE;
+
+	return (unsigned int) size;
+}
+
diff --git a/redhat/autofs.sysconfig.in b/redhat/autofs.sysconfig.in
index 8256888..fe36f45 100644
--- a/redhat/autofs.sysconfig.in
+++ b/redhat/autofs.sysconfig.in
@@ -89,6 +89,12 @@ BROWSE_MODE="no"
 #
 #AUTH_CONF_FILE="@@autofsmapdir@@/autofs_ldap_auth.conf"
 #
+# MAP_HASH_TABLE_SIZE - set the map cache hash table size.
+# 			Should be a power of 2 with a ratio roughly
+# 			between 1:10 and 1:20 for each map.
+#
+#MAP_HASH_TABLE_SIZE=1024
+#
 # General global options
 #
 # If the kernel supports using the autofs miscellanous device
diff --git a/samples/autofs.conf.default.in b/samples/autofs.conf.default.in
index 844a6f3..4496738 100644
--- a/samples/autofs.conf.default.in
+++ b/samples/autofs.conf.default.in
@@ -89,6 +89,12 @@ BROWSE_MODE="no"
 #
 #AUTH_CONF_FILE="@@autofsmapdir@@/autofs_ldap_auth.conf"
 #
+# MAP_HASH_TABLE_SIZE - set the map cache hash table size.
+# 			Should be a power of 2 with a ratio roughly
+# 			between 1:10 and 1:20 for each map.
+#
+#MAP_HASH_TABLE_SIZE=1024
+#
 # General global options
 #
 # If the kernel supports using the autofs miscellanous device

autofs-5.0.4-use-CLOEXEC-flag.patch:

--- NEW FILE autofs-5.0.4-use-CLOEXEC-flag.patch ---
autofs-5.0.4 - use CLOEXEC flag

From: Ian Kent <raven at themaw.net>

Update autofs to use the new CLOEXEC flag if present.
This allows us to set close on exec atomically flag when opening files,
hopefully avoiding selinux complaining about leaked file handles.
---

 CHANGELOG                 |    1 
 daemon/automount.c        |   42 ++++--------------
 daemon/direct.c           |    2 -
 daemon/flag.c             |    8 ++-
 daemon/indirect.c         |    2 -
 daemon/lookup.c           |    1 
 daemon/module.c           |    2 -
 daemon/spawn.c            |   11 +----
 include/automount.h       |  106 +++++++++++++++++++++++++++++++++++++++++++++
 include/state.h           |    1 
 lib/cache.c               |    2 -
 lib/defaults.c            |    7 ++-
 lib/dev-ioctl-lib.c       |   17 +------
 lib/log.c                 |    2 -
 lib/macros.c              |    1 
 lib/mounts.c              |    2 -
 lib/nss_parse.y           |   13 +-----
 lib/parse_subs.c          |    1 
 lib/rpc_subs.c            |   21 ++-------
 modules/cyrus-sasl.c      |    1 
 modules/lookup_file.c     |   40 +++--------------
 modules/lookup_hesiod.c   |    1 
 modules/lookup_hosts.c    |    1 
 modules/lookup_ldap.c     |    1 
 modules/lookup_multi.c    |    1 
 modules/lookup_nisplus.c  |    1 
 modules/lookup_program.c  |    5 +-
 modules/lookup_userhome.c |    1 
 modules/lookup_yp.c       |    1 
 modules/mount_afs.c       |    2 -
 modules/mount_autofs.c    |    2 -
 modules/mount_bind.c      |    2 -
 modules/mount_changer.c   |   10 ----
 modules/mount_ext2.c      |    2 -
 modules/mount_generic.c   |    2 -
 modules/mount_nfs.c       |    2 -
 modules/parse_hesiod.c    |    1 
 modules/parse_sun.c       |    2 -
 modules/replicated.c      |   13 +-----
 39 files changed, 149 insertions(+), 184 deletions(-)


diff --git a/CHANGELOG b/CHANGELOG
index bd35b00..43f3205 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -3,6 +3,7 @@
 - fix dumb libxml2 check
 - fix nested submount expire deadlock.
 - fix negative caching for non-existent map keys.
+- use CLOEXEC flag.
 
 4/11/2008 autofs-5.0.4
 -----------------------
diff --git a/daemon/automount.c b/daemon/automount.c
index 6f078c1..e120f50 100644
--- a/daemon/automount.c
+++ b/daemon/automount.c
@@ -20,13 +20,11 @@
  * ----------------------------------------------------------------------- */
 
 #include <dirent.h>
-#include <fcntl.h>
 #include <getopt.h>
 #include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <unistd.h>
 #include <sys/ioctl.h>
 #include <ctype.h>
 #include <sys/types.h>
@@ -68,6 +66,9 @@ static pthread_t state_mach_thid;
 /* Pre-calculated kernel packet length */
 static size_t kpkt_len;
 
+/* Does kernel know about SOCK_CLOEXEC and friends */
+static int cloexec_works = 0;
+
 /* Attribute to create detached thread */
 pthread_attr_t thread_attr;
 
@@ -671,7 +672,7 @@ static char *automount_path_to_fifo(unsigned logopt, const char *path)
 static int create_logpri_fifo(struct autofs_point *ap)
 {
 	int ret = -1;
-	int fd, cl_flags;
+	int fd;
 	char *fifo_name;
 	char buf[MAX_ERR_BUF];
 
@@ -697,7 +698,7 @@ static int create_logpri_fifo(struct autofs_point *ap)
 		goto out_free;
 	}
 
-	fd = open(fifo_name, O_RDWR|O_NONBLOCK);
+	fd = open_fd(fifo_name, O_RDWR|O_NONBLOCK);
 	if (fd < 0) {
 		char *estr = strerror_r(errno, buf, MAX_ERR_BUF);
 		crit(ap->logopt,
@@ -707,11 +708,6 @@ static int create_logpri_fifo(struct autofs_point *ap)
 		goto out_free;
 	}
 
-	if ((cl_flags = fcntl(fd, F_GETFD, 0)) != -1) {
-		cl_flags |= FD_CLOEXEC;
-		fcntl(fd, F_SETFD, cl_flags);
-	}
-
 	ap->logpri_fifo = fd;
 
 out_free:
@@ -963,7 +959,7 @@ int do_expire(struct autofs_point *ap, const char *name, int namelen)
 
 static int autofs_init_ap(struct autofs_point *ap)
 {
-	int pipefd[2], cl_flags;
+	int pipefd[2];
 
 	if ((ap->state != ST_INIT)) {
 		/* This can happen if an autofs process is already running*/
@@ -974,7 +970,7 @@ static int autofs_init_ap(struct autofs_point *ap)
 	ap->pipefd = ap->kpipefd = ap->ioctlfd = -1;
 
 	/* Pipe for kernel communications */
-	if (pipe(pipefd) < 0) {
+	if (open_pipe(pipefd) < 0) {
 		crit(ap->logopt,
 		     "failed to create commumication pipe for autofs path %s",
 		     ap->path);
@@ -984,18 +980,8 @@ static int autofs_init_ap(struct autofs_point *ap)
 	ap->pipefd = pipefd[0];
 	ap->kpipefd = pipefd[1];
 
-	if ((cl_flags = fcntl(ap->pipefd, F_GETFD, 0)) != -1) {
-		cl_flags |= FD_CLOEXEC;
-		fcntl(ap->pipefd, F_SETFD, cl_flags);
-	}
-
-	if ((cl_flags = fcntl(ap->kpipefd, F_GETFD, 0)) != -1) {
-		cl_flags |= FD_CLOEXEC;
-		fcntl(ap->kpipefd, F_SETFD, cl_flags);
-	}
-
 	/* Pipe state changes from signal handler to main loop */
-	if (pipe(ap->state_pipe) < 0) {
+	if (open_pipe(ap->state_pipe) < 0) {
 		crit(ap->logopt,
 		     "failed create state pipe for autofs path %s", ap->path);
 		close(ap->pipefd);
@@ -1003,16 +989,6 @@ static int autofs_init_ap(struct autofs_point *ap)
 		return -1;
 	}
 
-	if ((cl_flags = fcntl(ap->state_pipe[0], F_GETFD, 0)) != -1) {
-		cl_flags |= FD_CLOEXEC;
-		fcntl(ap->state_pipe[0], F_SETFD, cl_flags);
-	}
-
-	if ((cl_flags = fcntl(ap->state_pipe[1], F_GETFD, 0)) != -1) {
-		cl_flags |= FD_CLOEXEC;
-		fcntl(ap->state_pipe[1], F_SETFD, cl_flags);
-	}
-
 	if (create_logpri_fifo(ap) < 0) {
 		logmsg("could not create FIFO for path %s\n", ap->path);
 		logmsg("dynamic log level changes not available for %s", ap->path);
@@ -1080,7 +1056,7 @@ static void become_daemon(unsigned foreground, unsigned daemon_check)
 		exit(0);
 	}
 
-	if (pipe(start_pipefd) < 0) {
+	if (open_pipe(start_pipefd) < 0) {
 		fprintf(stderr, "%s: failed to create start_pipefd.\n",
 			program);
 		exit(0);
diff --git a/daemon/direct.c b/daemon/direct.c
index 98fcc07..c0243c4 100644
--- a/daemon/direct.c
+++ b/daemon/direct.c
@@ -21,12 +21,10 @@
 
 #include <dirent.h>
 #include <libgen.h>
-#include <fcntl.h>
 #include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <unistd.h>
 #include <sys/ioctl.h>
 #include <sys/types.h>
 #include <sys/wait.h>
diff --git a/daemon/flag.c b/daemon/flag.c
index d8ca61b..e43cece 100644
--- a/daemon/flag.c
+++ b/daemon/flag.c
@@ -21,15 +21,15 @@
 #include <sys/time.h>
 #include <sys/types.h>
 #include <sys/stat.h>
-#include <fcntl.h>
 #include <time.h>
-#include <unistd.h>
 #include <string.h>
 #include <alloca.h>
 #include <stdio.h>
 #include <signal.h>
 #include <errno.h>
 
+#include "automount.h"
+
 #define MAX_PIDSIZE	20
 #define FLAG_FILE	AUTOFS_FLAG_DIR "/autofs-running"
 
@@ -129,7 +129,7 @@ int aquire_flag_file(void)
 	while (!we_created_flagfile) {
 		int errsv, i, j;
 
-		i = open(linkf, O_WRONLY|O_CREAT, 0);
+		i = open_fd_mode(linkf, O_WRONLY|O_CREAT, 0);
 		if (i < 0) {
 			release_flag_file();
 			return 0;
@@ -146,7 +146,7 @@ int aquire_flag_file(void)
 			return 0;
 		}
 
-		fd = open(FLAG_FILE, O_RDWR);
+		fd = open_fd(FLAG_FILE, O_RDWR);
 		if (fd < 0) {
 			/* Maybe the file was just deleted? */
 			if (errno == ENOENT)
diff --git a/daemon/indirect.c b/daemon/indirect.c
index 1232810..9d3745c 100644
--- a/daemon/indirect.c
+++ b/daemon/indirect.c
@@ -21,12 +21,10 @@
 
 #include <dirent.h>
 #include <libgen.h>
-#include <fcntl.h>
 #include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <unistd.h>
 #include <sys/ioctl.h>
 #include <sys/types.h>
 #include <sys/wait.h>
diff --git a/daemon/lookup.c b/daemon/lookup.c
index 0cf6e3f..741d846 100644
--- a/daemon/lookup.c
+++ b/daemon/lookup.c
@@ -22,7 +22,6 @@
 #include <stdio.h>
 #include <string.h>
 #include <sys/stat.h>
-#include <unistd.h>
 #include "automount.h"
 #include "nsswitch.h"
 
diff --git a/daemon/module.c b/daemon/module.c
index 36eca00..e593d75 100644
--- a/daemon/module.c
+++ b/daemon/module.c
@@ -31,7 +31,7 @@ int load_autofs4_module(void)
 	 * is an older version we will catch it at mount
 	 * time.
 	 */
-	fp = fopen("/proc/filesystems", "r");
+	fp = open_fopen_r("/proc/filesystems");
 	if (!fp) {
 		logerr("cannot open /proc/filesystems\n");
 		return 0;
diff --git a/daemon/spawn.c b/daemon/spawn.c
index 17f92f4..4ddf46f 100644
--- a/daemon/spawn.c
+++ b/daemon/spawn.c
@@ -13,7 +13,6 @@
  *
  * ----------------------------------------------------------------------- */
 
-#include <fcntl.h>
 #include <signal.h>
 #include <stdarg.h>
 #include <stdio.h>
@@ -21,7 +20,6 @@
 #include <string.h>
 #include <sys/types.h>
 #include <dirent.h>
-#include <unistd.h>
 #include <time.h>
 #include <sys/wait.h>
 #include <sys/stat.h>
@@ -125,7 +123,7 @@ static int do_spawn(unsigned logopt, unsigned int wait,
 	int ret, status, pipefd[2];
 	char errbuf[ERRBUFSIZ + 1], *p, *sp;
 	int errp, errn;
-	int flags, cancel_state;
+	int cancel_state;
 	unsigned int use_lock = options & SPAWN_OPT_LOCK;
 	unsigned int use_access = options & SPAWN_OPT_ACCESS;
 	sigset_t allsigs, tmpsig, oldsig;
@@ -133,7 +131,7 @@ static int do_spawn(unsigned logopt, unsigned int wait,
 	pid_t euid = 0;
 	gid_t egid = 0;
 
-	if (pipe(pipefd))
+	if (open_pipe(pipefd))
 		return -1;
 
 	pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &cancel_state);
@@ -213,11 +211,6 @@ static int do_spawn(unsigned logopt, unsigned int wait,
 			return -1;
 		}
 
-		if ((flags = fcntl(pipefd[0], F_GETFD, 0)) != -1) {
-			flags |= FD_CLOEXEC;
-			fcntl(pipefd[0], F_SETFD, flags);
-		}
-
 		errp = 0;
 		do {
 			errn = timed_read(pipefd[0],
diff --git a/include/automount.h b/include/automount.h
index 1ba0d3c..a55ddbc 100644
--- a/include/automount.h
+++ b/include/automount.h
@@ -17,6 +17,8 @@
 #include <pthread.h>
 #include <sched.h>
 #include <errno.h>
+#include <unistd.h>
+#include <fcntl.h>
 #include "config.h"
 #include "list.h"
 
@@ -475,5 +477,109 @@ int alarm_start_handler(void);
 int alarm_add(struct autofs_point *ap, time_t seconds);
 void alarm_delete(struct autofs_point *ap);
 
+/*
+ * Use CLOEXEC flag for open(), pipe(), fopen() (read-only case) and
+ * socket() if possible.
+ */
+static int cloexec_works;
+
+static inline void check_cloexec(int fd)
+{
+	if (cloexec_works == 0) {
+		int fl = fcntl(fd, F_GETFD);
+		cloexec_works = (fl & FD_CLOEXEC) ? 1 : -1;
+	}
+	if (cloexec_works > 0)
+		return;
+	fcntl(fd, F_SETFD, FD_CLOEXEC);
+	return;
+}
+
+static inline int open_fd(const char *path, int flags)
+{
+	int fd;
+
+#if defined(O_CLOEXEC) && defined(SOCK_CLOEXEC)
+	if (cloexec_works != -1)
+		flags |= O_CLOEXEC;
+#endif
+	fd = open(path, flags);
+	if (fd == -1)
+		return -1;
+	check_cloexec(fd);
+	return fd;
+}
+
+static inline int open_fd_mode(const char *path, int flags, int mode)
+{
+	int fd;
+
+#if defined(O_CLOEXEC) && defined(SOCK_CLOEXEC)
+	if (cloexec_works != -1)
+		flags |= O_CLOEXEC;
+#endif
+	fd = open(path, flags, mode);
+	if (fd == -1)
+		return -1;
+	check_cloexec(fd);
+	return fd;
+}
+
+static inline int open_pipe(int pipefd[2])
+{
+	int ret;
+
+#if defined(O_CLOEXEC) && defined(SOCK_CLOEXEC) && defined(__have_pipe2)
+	if (cloexec_works != -1) {
+		ret = pipe2(pipefd, O_CLOEXEC);
+		if (ret != -1)
+			return 0;
+		if (errno != EINVAL)
+			return -1;
+	}
+#endif
+	ret = pipe(pipefd);
+	if (ret == -1)
+		return -1;
+	check_cloexec(pipefd[0]);
+	check_cloexec(pipefd[1]);
+	return 0;
+}
+
+static inline int open_sock(int domain, int type, int protocol)
+{
+	int fd;
+
+#ifdef SOCK_CLOEXEC
+	if (cloexec_works != -1)
+		type |= SOCK_CLOEXEC;
+#endif
+	fd = socket(domain, type, protocol);
+	if (fd == -1)
+		return -1;
+	check_cloexec(fd);
+	return fd;
+}
+
+static inline FILE *open_fopen_r(const char *path)
+{
+	FILE *f;
+
+#if defined(O_CLOEXEC) && defined(SOCK_CLOEXEC)
+	if (cloexec_exec != -1) {
+		f = fopen(path, "re");
+		if (f != NULL) {
+			check_cloexec(fileno(f));
+			return f;
+		}
+	}
+#endif
+	f = fopen(path, "r");
+	if (f == NULL)
+		return NULL;
+	check_cloexec(fileno(f));
+	return f;
+}
+
 #endif
 
diff --git a/include/state.h b/include/state.h
index d7349d9..b44a353 100644
--- a/include/state.h
+++ b/include/state.h
@@ -20,7 +20,6 @@
 #ifndef STATE_H
 #define STATE_H
 
-#include <unistd.h>
 #include <string.h>
 #include <stdlib.h>
 #include <signal.h>
diff --git a/lib/cache.c b/lib/cache.c
index ce47e04..4a00367 100644
--- a/lib/cache.c
+++ b/lib/cache.c
@@ -17,10 +17,8 @@
 #include <malloc.h>
 #include <stdlib.h>
 #include <string.h>
-#include <unistd.h>
 #include <ctype.h>
 #include <stdio.h>
-#include <fcntl.h>
 #include <sys/param.h>
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/lib/defaults.c b/lib/defaults.c
index 21d76d2..ff653e3 100644
--- a/lib/defaults.c
+++ b/lib/defaults.c
@@ -21,6 +21,7 @@
 #include "defaults.h"
 #include "lookup_ldap.h"
 #include "log.h"
+#include "automount.h"
 
 #define DEFAULTS_CONFIG_FILE		AUTOFS_CONF_DIR "/autofs"
 #define MAX_LINE_LEN			256
@@ -255,7 +256,7 @@ struct list_head *defaults_get_uris(void)
 	char *res;
 	struct list_head *list;
 
-	f = fopen(DEFAULTS_CONFIG_FILE, "r");
+	f = open_fopen_r(DEFAULTS_CONFIG_FILE);
 	if (!f)
 		return NULL;
 
@@ -298,7 +299,7 @@ unsigned int defaults_read_config(unsigned int to_syslog)
 	char buf[MAX_LINE_LEN];
 	char *res;
 
-	f = fopen(DEFAULTS_CONFIG_FILE, "r");
+	f = open_fopen_r(DEFAULTS_CONFIG_FILE);
 	if (!f)
 		return 0;
 
@@ -544,7 +545,7 @@ struct ldap_searchdn *defaults_get_searchdns(void)
 	char *res;
 	struct ldap_searchdn *sdn, *last;
 
-	f = fopen(DEFAULTS_CONFIG_FILE, "r");
+	f = open_fopen_r(DEFAULTS_CONFIG_FILE);
 	if (!f)
 		return NULL;
 
diff --git a/lib/dev-ioctl-lib.c b/lib/dev-ioctl-lib.c
index 57af785..056a0a9 100644
--- a/lib/dev-ioctl-lib.c
+++ b/lib/dev-ioctl-lib.c
@@ -121,17 +121,12 @@ void init_ioctl_ctl(void)
 	if (ctl.ops)
 		return;
 
-	devfd = open(CONTROL_DEVICE, O_RDONLY);
+	devfd = open_fd(CONTROL_DEVICE, O_RDONLY);
 	if (devfd == -1)
 		ctl.ops = &ioctl_ops;
 	else {
 		struct autofs_dev_ioctl param;
 
-		int cl_flags = fcntl(devfd, F_GETFD, 0);
-		if (cl_flags != -1) {
-			cl_flags |= FD_CLOEXEC;
-			fcntl(devfd, F_SETFD, cl_flags);
-		}
 		/*
 		 * Check compile version against kernel.
 		 * Selinux may allow us to open the device but not
@@ -378,20 +373,14 @@ static int ioctl_open(unsigned int logopt,
 		      int *ioctlfd, dev_t devid, const char *path)
 {
 	struct statfs sfs;
-	int save_errno, fd, cl_flags;
+	int save_errno, fd;
 
 	*ioctlfd = -1;
 
-	fd = open(path, O_RDONLY);
+	fd = open_fd(path, O_RDONLY);
 	if (fd == -1)
 		return -1;
 
-	cl_flags = fcntl(fd, F_GETFD, 0);
-	if (cl_flags != -1) {
-		cl_flags |= FD_CLOEXEC;
-		fcntl(fd, F_SETFD, cl_flags);
-	}
-
 	if (fstatfs(fd, &sfs) == -1) {
 		save_errno = errno;
 		goto err;
diff --git a/lib/log.c b/lib/log.c
index 65e8ad2..46220fd 100644
--- a/lib/log.c
+++ b/lib/log.c
@@ -20,8 +20,6 @@
 
 #include <stdarg.h>
 #include <stdio.h>
-#include <unistd.h>
-#include <fcntl.h>
 #include <stdlib.h>
 #include <string.h>
 
diff --git a/lib/macros.c b/lib/macros.c
index fa6db8e..85f9cd3 100644
--- a/lib/macros.c
+++ b/lib/macros.c
@@ -14,7 +14,6 @@
  * ----------------------------------------------------------------------- */
 
 #include <malloc.h>
-#include <unistd.h>
 #include <stdlib.h>
 #include <string.h>
 #include <limits.h>
diff --git a/lib/mounts.c b/lib/mounts.c
index 6d0a69c..ce4691b 100644
--- a/lib/mounts.c
+++ b/lib/mounts.c
@@ -14,13 +14,11 @@
 
 #include <stdlib.h>
 #include <string.h>
-#include <unistd.h>
 #include <mntent.h>
 #include <limits.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/ioctl.h>
-#include <fcntl.h>
 #include <sys/mount.h>
 #include <stdio.h>
 #include <dirent.h>
diff --git a/lib/nss_parse.y b/lib/nss_parse.y
index fa6958a..3bda6b3 100644
--- a/lib/nss_parse.y
+++ b/lib/nss_parse.y
@@ -22,8 +22,6 @@
 #include <stdlib.h>
 #include <string.h>
 #include <memory.h>
-#include <unistd.h>
-#include <fcntl.h>
 #include <limits.h>
 
 #include "automount.h"
@@ -164,9 +162,9 @@ static void parse_close_nsswitch(void *arg)
 int nsswitch_parse(struct list_head *list)
 {
 	FILE *nsswitch;
-	int fd, cl_flags, status;
+	int status;
 
-	nsswitch = fopen(NSSWITCH_FILE, "r");
+	nsswitch = open_fopen_r(NSSWITCH_FILE);
 	if (!nsswitch) {
 		logerr("couldn't open %s\n", NSSWITCH_FILE);
 		return 1;
@@ -174,13 +172,6 @@ int nsswitch_parse(struct list_head *list)
 
 	pthread_cleanup_push(parse_close_nsswitch, nsswitch);
 
-	fd = fileno(nsswitch);
-
-	if ((cl_flags = fcntl(fd, F_GETFD, 0)) != -1) {
-		cl_flags |= FD_CLOEXEC;
-		fcntl(fd, F_SETFD, cl_flags);
-	}
-
 	parse_mutex_lock();
 	pthread_cleanup_push(parse_mutex_unlock, NULL);
 
diff --git a/lib/parse_subs.c b/lib/parse_subs.c
index 3a04dd6..8a032e8 100644
--- a/lib/parse_subs.c
+++ b/lib/parse_subs.c
@@ -18,7 +18,6 @@
 #include <stdlib.h>
 #include <string.h>
 #include <ctype.h>
-#include <unistd.h>
 #include "automount.h"
 
 /*
diff --git a/lib/rpc_subs.c b/lib/rpc_subs.c
index 6be86c6..9ac3657 100644
--- a/lib/rpc_subs.c
+++ b/lib/rpc_subs.c
@@ -21,13 +21,11 @@
 #include <rpc/rpc.h>
 #include <rpc/pmap_prot.h>
 
-#include <unistd.h>
 #include <sys/socket.h>
 #include <netdb.h>
 #include <net/if.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
-#include <sys/fcntl.h>
 #include <rpcsvc/ypclnt.h>
 #include <errno.h>
 #include <sys/ioctl.h>
@@ -36,6 +34,7 @@
 
 #include "mount.h"
 #include "rpc_subs.h"
+#include "automount.h"
 
 /* #define STANDALONE */
 #ifdef STANDALONE
@@ -59,7 +58,7 @@ inline void dump_core(void);
  */
 static CLIENT *create_udp_client(struct conn_info *info)
 {
-	int fd, cl_flags, ret, ghn_errno;
+	int fd, ret, ghn_errno;
 	CLIENT *client;
 	struct sockaddr_in laddr, raddr;
 	struct hostent hp;
@@ -115,15 +114,10 @@ got_addr:
 		 * layer, it would bind to a reserved port, which has been shown
 		 * to exhaust the reserved port range in some situations.
 		 */
-		fd = socket(PF_INET, SOCK_DGRAM, IPPROTO_UDP);
+		fd = open_sock(PF_INET, SOCK_DGRAM, IPPROTO_UDP);
 		if (fd < 0)
 			return NULL;
 
-		if ((cl_flags = fcntl(fd, F_GETFD, 0)) != -1) {
-			cl_flags |= FD_CLOEXEC;
-			fcntl(fd, F_SETFD, cl_flags);
-		}
-
 		laddr.sin_family = AF_INET;
 		laddr.sin_port = 0;
 		laddr.sin_addr.s_addr = htonl(INADDR_ANY);
@@ -274,7 +268,7 @@ done:
  */
 static CLIENT *create_tcp_client(struct conn_info *info)
 {
-	int fd, cl_flags, ghn_errno;
+	int fd, ghn_errno;
 	CLIENT *client;
 	struct sockaddr_in addr;
 	struct hostent hp;
@@ -324,15 +318,10 @@ got_addr:
 	addr.sin_port = htons(info->port);
 
 	if (!info->client) {
-		fd = socket(PF_INET, SOCK_STREAM, info->proto->p_proto);
+		fd = open_sock(PF_INET, SOCK_STREAM, info->proto->p_proto);
 		if (fd < 0)
 			return NULL;
 
-		if ((cl_flags = fcntl(fd, F_GETFD, 0)) != -1) {
-			cl_flags |= FD_CLOEXEC;
-			fcntl(fd, F_SETFD, cl_flags);
-		}
-
 		ret = connect_nb(fd, &addr, &info->timeout);
 		if (ret < 0)
 			goto out_close;
diff --git a/modules/cyrus-sasl.c b/modules/cyrus-sasl.c
index 902d9aa..286af15 100644
--- a/modules/cyrus-sasl.c
+++ b/modules/cyrus-sasl.c
@@ -51,7 +51,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <unistd.h>
 #include <ldap.h>
 #include <sasl/sasl.h>
 
diff --git a/modules/lookup_file.c b/modules/lookup_file.c
index 9e34b72..95b9f6f 100644
--- a/modules/lookup_file.c
+++ b/modules/lookup_file.c
@@ -17,8 +17,6 @@
 #include <malloc.h>
 #include <stdlib.h>
 #include <string.h>
-#include <unistd.h>
-#include <fcntl.h>
 #include <time.h>
 #include <ctype.h>
 #include <signal.h>
@@ -395,7 +393,7 @@ int lookup_read_master(struct master *master, time_t age, void *context)
 	char *ent;
 	struct stat st;
 	FILE *f;
-	int fd, cl_flags;
+	int fd;
 	unsigned int path_len, ent_len;
 	int entry, cur_state;
 
@@ -422,7 +420,7 @@ int lookup_read_master(struct master *master, time_t age, void *context)
 		return NSS_STATUS_UNAVAIL;
 	}
 
-	f = fopen(ctxt->mapname, "r");
+	f = open_fopen_r(ctxt->mapname);
 	if (!f) {
 		error(logopt,
 		      MODPREFIX "could not open master map file %s",
@@ -432,11 +430,6 @@ int lookup_read_master(struct master *master, time_t age, void *context)
 
 	fd = fileno(f);
 
-	if ((cl_flags = fcntl(fd, F_GETFD, 0)) != -1) {
-		cl_flags |= FD_CLOEXEC;
-		fcntl(fd, F_SETFD, cl_flags);
-	}
-
 	while(1) {
 		entry = read_one(logopt, f, path, &path_len, ent, &ent_len);
 		if (!entry) {
@@ -651,7 +644,7 @@ int lookup_read_map(struct autofs_point *ap, time_t age, void *context)
 	char *mapent;
 	struct stat st;
 	FILE *f;
-	int fd, cl_flags;
+	int fd;
 	unsigned int k_len, m_len;
 	int entry;
 
@@ -684,7 +677,7 @@ int lookup_read_map(struct autofs_point *ap, time_t age, void *context)
 		return NSS_STATUS_UNAVAIL;
 	}
 
-	f = fopen(ctxt->mapname, "r");
+	f = open_fopen_r(ctxt->mapname);
 	if (!f) {
 		error(ap->logopt,
 		      MODPREFIX "could not open map file %s", ctxt->mapname);
@@ -693,11 +686,6 @@ int lookup_read_map(struct autofs_point *ap, time_t age, void *context)
 
 	fd = fileno(f);
 
-	if ((cl_flags = fcntl(fd, F_GETFD, 0)) != -1) {
-		cl_flags |= FD_CLOEXEC;
-		fcntl(fd, F_SETFD, cl_flags);
-	}
-
 	while(1) {
 		entry = read_one(ap->logopt, f, key, &k_len, mapent, &m_len);
 		if (!entry) {
@@ -784,7 +772,6 @@ static int lookup_one(struct autofs_point *ap,
 	char mapent[MAPENT_MAX_LEN + 1];
 	time_t age = time(NULL);
 	FILE *f;
-	int fd, cl_flags;
 	unsigned int k_len, m_len;
 	int entry, ret;
 
@@ -794,20 +781,13 @@ static int lookup_one(struct autofs_point *ap,
 
 	mc = source->mc;
 
-	f = fopen(ctxt->mapname, "r");
+	f = open_fopen_r(ctxt->mapname);
 	if (!f) {
 		error(ap->logopt,
 		      MODPREFIX "could not open map file %s", ctxt->mapname);
 		return CHE_FAIL;
 	}
 
-	fd = fileno(f);
-
-	if ((cl_flags = fcntl(fd, F_GETFD, 0)) != -1) {
-		cl_flags |= FD_CLOEXEC;
-		fcntl(fd, F_SETFD, cl_flags);
-	}
-
 	while(1) {
 		entry = read_one(ap->logopt, f, mkey, &k_len, mapent, &m_len);
 		if (entry) {
@@ -897,7 +877,6 @@ static int lookup_wild(struct autofs_point *ap, struct lookup_context *ctxt)
 	char mapent[MAPENT_MAX_LEN + 1];
 	time_t age = time(NULL);
 	FILE *f;
-	int fd, cl_flags;
 	unsigned int k_len, m_len;
 	int entry, ret;
 
@@ -907,20 +886,13 @@ static int lookup_wild(struct autofs_point *ap, struct lookup_context *ctxt)
 
 	mc = source->mc;
 
-	f = fopen(ctxt->mapname, "r");
+	f = open_fopen_r(ctxt->mapname);
 	if (!f) {
 		error(ap->logopt,
 		      MODPREFIX "could not open map file %s", ctxt->mapname);
 		return CHE_FAIL;
 	}
 
-	fd = fileno(f);
-
-	if ((cl_flags = fcntl(fd, F_GETFD, 0)) != -1) {
-		cl_flags |= FD_CLOEXEC;
-		fcntl(fd, F_SETFD, cl_flags);
-	}
-
 	while(1) {
 		entry = read_one(ap->logopt, f, mkey, &k_len, mapent, &m_len);
 		if (entry) {
diff --git a/modules/lookup_hesiod.c b/modules/lookup_hesiod.c
index 737a47e..0a2ee44 100644
--- a/modules/lookup_hesiod.c
+++ b/modules/lookup_hesiod.c
@@ -10,7 +10,6 @@
 #include <ctype.h>
 #include <limits.h>
 #include <string.h>
-#include <unistd.h>
 #include <stdlib.h>
 #include <netinet/in.h>
 #include <arpa/nameser.h>
diff --git a/modules/lookup_hosts.c b/modules/lookup_hosts.c
index f8d4269..93b975a 100644
--- a/modules/lookup_hosts.c
+++ b/modules/lookup_hosts.c
@@ -15,7 +15,6 @@
 
 #include <stdio.h>
 #include <malloc.h>
-#include <unistd.h>
 #include <sys/param.h>
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/modules/lookup_ldap.c b/modules/lookup_ldap.c
index 42c3235..6ba80eb 100644
--- a/modules/lookup_ldap.c
+++ b/modules/lookup_ldap.c
@@ -21,7 +21,6 @@
 #include <sys/stat.h>
 #include <ctype.h>
 #include <string.h>
-#include <unistd.h>
 #include <stdlib.h>
 #include <time.h>
 #include <signal.h>
diff --git a/modules/lookup_multi.c b/modules/lookup_multi.c
index 601d48e..1bf2e0a 100644
--- a/modules/lookup_multi.c
+++ b/modules/lookup_multi.c
@@ -18,7 +18,6 @@
 #include <malloc.h>
 #include <stdio.h>
 #include <string.h>
-#include <unistd.h>
 #include <sys/stat.h>
 
 #define MODULE_LOOKUP
diff --git a/modules/lookup_nisplus.c b/modules/lookup_nisplus.c
index f15465f..4c3ce60 100644
--- a/modules/lookup_nisplus.c
+++ b/modules/lookup_nisplus.c
@@ -6,7 +6,6 @@
 
 #include <stdio.h>
 #include <malloc.h>
-#include <unistd.h>
 #include <sys/param.h>
 #include <sys/types.h>
 #include <signal.h>
diff --git a/modules/lookup_program.c b/modules/lookup_program.c
index bf32d3b..6f4e2a3 100644
--- a/modules/lookup_program.c
+++ b/modules/lookup_program.c
@@ -18,7 +18,6 @@
 #include <malloc.h>
 #include <stdio.h>
 #include <string.h>
-#include <unistd.h>
 #include <signal.h>
 #include <sys/param.h>
 #include <sys/stat.h>
@@ -212,12 +211,12 @@ int lookup_mount(struct autofs_point *ap, const char *name, int name_len, void *
 	 * want to send stderr to the syslog, and we don't use spawnl()
 	 * because we need the pipe hooks
 	 */
-	if (pipe(pipefd)) {
+	if (open_pipe(pipefd)) {
 		char *estr = strerror_r(errno, buf, MAX_ERR_BUF);
 		logerr(MODPREFIX "pipe: %s", estr);
 		goto out_free;
 	}
-	if (pipe(epipefd)) {
+	if (open_pipe(epipefd)) {
 		close(pipefd[0]);
 		close(pipefd[1]);
 		goto out_free;
diff --git a/modules/lookup_userhome.c b/modules/lookup_userhome.c
index 680ddaf..fb3caaa 100644
--- a/modules/lookup_userhome.c
+++ b/modules/lookup_userhome.c
@@ -16,7 +16,6 @@
 #include <stdio.h>
 #include <malloc.h>
 #include <pwd.h>
-#include <unistd.h>
 #include <string.h>
 #include <sys/param.h>
 #include <sys/types.h>
diff --git a/modules/lookup_yp.c b/modules/lookup_yp.c
index 1b62f57..ce438e8 100644
--- a/modules/lookup_yp.c
+++ b/modules/lookup_yp.c
@@ -16,7 +16,6 @@
 
 #include <stdio.h>
 #include <malloc.h>
-#include <unistd.h>
 #include <time.h>
 #include <signal.h>
 #include <ctype.h>
diff --git a/modules/mount_afs.c b/modules/mount_afs.c
index 96a1367..50628ce 100644
--- a/modules/mount_afs.c
+++ b/modules/mount_afs.c
@@ -9,8 +9,6 @@
 
 #include <stdio.h>
 #include <malloc.h>
-#include <fcntl.h>
-#include <unistd.h>
 #include <string.h>
 #include <sys/param.h>
 #include <sys/types.h>
diff --git a/modules/mount_autofs.c b/modules/mount_autofs.c
index eb63d8e..82a5ef3 100644
--- a/modules/mount_autofs.c
+++ b/modules/mount_autofs.c
@@ -16,8 +16,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <malloc.h>
-#include <fcntl.h>
-#include <unistd.h>
 #include <string.h>
 #include <signal.h>
 #include <alloca.h>
diff --git a/modules/mount_bind.c b/modules/mount_bind.c
index 022d183..361f0c2 100644
--- a/modules/mount_bind.c
+++ b/modules/mount_bind.c
@@ -15,8 +15,6 @@
 
 #include <stdio.h>
 #include <malloc.h>
-#include <fcntl.h>
-#include <unistd.h>
 #include <string.h>
 #include <stdlib.h>
 #include <sys/param.h>
diff --git a/modules/mount_changer.c b/modules/mount_changer.c
index 43b8355..92bb72b 100644
--- a/modules/mount_changer.c
+++ b/modules/mount_changer.c
@@ -19,8 +19,6 @@
 
 #include <stdio.h>
 #include <malloc.h>
-#include <fcntl.h>
-#include <unistd.h>
 #include <string.h>
 #include <sys/param.h>
 #include <sys/types.h>
@@ -145,25 +143,19 @@ int swapCD(const char *device, const char *slotName)
 {
 	int fd;			/* file descriptor for CD-ROM device */
 	int status;		/* return status for system calls */
-	int cl_flags;
 	int slot = -1;
 	int total_slots_available;
 
 	slot = atoi(slotName) - 1;
 
 	/* open device */
-	fd = open(device, O_RDONLY | O_NONBLOCK);
+	fd = open_fd(device, O_RDONLY | O_NONBLOCK);
 	if (fd < 0) {
 		logerr(MODPREFIX "Opening device %s failed : %s",
 		      device, strerror(errno));
 		return 1;
 	}
 
-	if ((cl_flags = fcntl(fd, F_GETFD, 0)) != -1) {
-		cl_flags |= FD_CLOEXEC;
-		fcntl(fd, F_SETFD, cl_flags);
-	}
-
 	/* Check CD player status */
 	total_slots_available = ioctl(fd, CDROM_CHANGER_NSLOTS);
 	if (total_slots_available <= 1) {
diff --git a/modules/mount_ext2.c b/modules/mount_ext2.c
index 4c5b271..192ec04 100644
--- a/modules/mount_ext2.c
+++ b/modules/mount_ext2.c
@@ -15,8 +15,6 @@
 
 #include <stdio.h>
 #include <malloc.h>
-#include <fcntl.h>
-#include <unistd.h>
 #include <string.h>
 #include <stdlib.h>
 #include <sys/param.h>
diff --git a/modules/mount_generic.c b/modules/mount_generic.c
index f094d07..6d7b4b3 100644
--- a/modules/mount_generic.c
+++ b/modules/mount_generic.c
@@ -15,8 +15,6 @@
 
 #include <stdio.h>
 #include <malloc.h>
-#include <fcntl.h>
-#include <unistd.h>
 #include <string.h>
 #include <stdlib.h>
 #include <sys/param.h>
diff --git a/modules/mount_nfs.c b/modules/mount_nfs.c
index c747078..20732f8 100644
--- a/modules/mount_nfs.c
+++ b/modules/mount_nfs.c
@@ -17,8 +17,6 @@
 #include <stdio.h>
 #include <malloc.h>
 #include <netdb.h>
-#include <fcntl.h>
-#include <unistd.h>
 #include <stdlib.h>
 #include <string.h>
 #include <sys/param.h>
diff --git a/modules/parse_hesiod.c b/modules/parse_hesiod.c
index ff1f0a5..d5bb0f4 100644
--- a/modules/parse_hesiod.c
+++ b/modules/parse_hesiod.c
@@ -7,7 +7,6 @@
 #include <sys/types.h>
 #include <ctype.h>
 #include <string.h>
-#include <unistd.h>
 #include <stdlib.h>
 #include <netinet/in.h>
 #include <arpa/nameser.h>
diff --git a/modules/parse_sun.c b/modules/parse_sun.c
index 2c4f8b2..72e51e2 100644
--- a/modules/parse_sun.c
+++ b/modules/parse_sun.c
@@ -18,8 +18,6 @@
 #include <stdio.h>
 #include <malloc.h>
 #include <netdb.h>
-#include <fcntl.h>
-#include <unistd.h>
 #include <stdlib.h>
 #include <string.h>
 #include <ctype.h>
diff --git a/modules/replicated.c b/modules/replicated.c
index b435f4b..63829a2 100644
--- a/modules/replicated.c
+++ b/modules/replicated.c
@@ -52,8 +52,6 @@
 #include <net/if.h>
 #include <netinet/in.h>
 #include <netdb.h>
-#include <unistd.h>
-#include <fcntl.h>
 
 #include "rpc_subs.h"
 #include "replicated.h"
@@ -82,7 +80,7 @@ void seed_random(void)
 	int fd;
 	unsigned int seed;
 
-	fd = open("/dev/urandom", O_RDONLY);
+	fd = open_fd("/dev/urandom", O_RDONLY);
 	if (fd < 0) {
 		srandom(time(NULL));
 		return;
@@ -145,7 +143,7 @@ static unsigned int get_proximity(const char *host_addr, int addr_len)
 	char tmp[20], buf[MAX_ERR_BUF], *ptr;
 	struct ifconf ifc;
 	struct ifreq *ifr, nmptr;
-	int sock, cl_flags, ret, i;
+	int sock, ret, i;
 	uint32_t mask, ha, ia;
 
 	memcpy(tmp, host_addr, addr_len);
@@ -153,18 +151,13 @@ static unsigned int get_proximity(const char *host_addr, int addr_len)
 
 	ha = ntohl((uint32_t) hst_addr->s_addr);
 
-	sock = socket(AF_INET, SOCK_DGRAM, 0);
+	sock = open_sock(AF_INET, SOCK_DGRAM, 0);
 	if (sock < 0) {
 		char *estr = strerror_r(errno, buf, MAX_ERR_BUF);
 		logerr("socket creation failed: %s", estr);
 		return PROXIMITY_ERROR;
 	}
 
-	if ((cl_flags = fcntl(sock, F_GETFD, 0)) != -1) {
-		cl_flags |= FD_CLOEXEC;
-		fcntl(sock, F_SETFD, cl_flags);
-	}
-
 	if (!alloc_ifreq(&ifc, sock)) {
 		close(sock);
 		return PROXIMITY_ERROR;


Index: autofs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/autofs/devel/autofs.spec,v
retrieving revision 1.261
retrieving revision 1.262
diff -u -r1.261 -r1.262
--- autofs.spec	3 Dec 2008 05:15:25 -0000	1.261
+++ autofs.spec	15 Jan 2009 03:47:47 -0000	1.262
@@ -4,7 +4,7 @@
 Summary: A tool for automatically mounting and unmounting filesystems
 Name: autofs
 Version: 5.0.4
-Release: 4
+Release: 5
 Epoch: 1
 License: GPLv2+
 Group: System Environment/Daemons
@@ -12,6 +12,11 @@
 Source: ftp://ftp.kernel.org/pub/linux/daemons/autofs/v5/autofs-%{version}.tar.bz2
 Patch1: autofs-5.0.4-fix-dumb-libxml2-check.patch
 Patch2: autofs-5.0.4-expire-specific-submount-only.patch
+Patch3: autofs-5.0.4-fix-negative-cache-non-existent-key.patch
+Patch4: autofs-5.0.4-fix-ldap-detection.patch
+Patch5: autofs-5.0.4-use-CLOEXEC-flag.patch
+Patch6: autofs-5.0.4-fix-select-fd-limit.patch
+Patch7: autofs-5.0.4-make-hash-table-scale-to-thousands-of-entries.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
@@ -55,6 +60,11 @@
 echo %{version}-%{release} > .version
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
+%patch7 -p1
 
 %build
 #CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=/usr --libdir=%{_libdir}
@@ -107,6 +117,13 @@
 %{_libdir}/autofs/
 
 %changelog
+* Thu Jan 15 2009 Ian Kent <kent at redhat.com> - 5.0.4-5
+- fix negative caching of non-existent keys.
+- fix ldap library detection in configure.
+- use CLOEXEC flag functionality if present.
+- fix select(2) fd limit.
+- make hash table scale to thousands of entries.
+
 * Wed Dec 3 2008 Ian Kent <kent at redhat.com> - 5.0.4-4
 - fix nested submount expire deadlock.
 



From pkgdb at fedoraproject.org  Thu Jan 15 03:48:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 15 Jan 2009 03:48:48 +0000
Subject: [pkgdb] libuninameslist had acl change status
Message-ID: <20090115034848.4B3902081FF@bastion.fedora.phx.redhat.com>

kevin has set the commit acl on libuninameslist (Fedora devel) to Approved for roozbeh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libuninameslist



From pkgdb at fedoraproject.org  Thu Jan 15 03:48:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 15 Jan 2009 03:48:52 +0000
Subject: [pkgdb] libuninameslist had acl change status
Message-ID: <20090115034852.686162082B9@bastion.fedora.phx.redhat.com>

kevin has set the watchbugzilla acl on libuninameslist (Fedora devel) to Approved for roozbeh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libuninameslist



From pkgdb at fedoraproject.org  Thu Jan 15 03:49:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 15 Jan 2009 03:49:10 +0000
Subject: [pkgdb] libuninameslist had acl change status
Message-ID: <20090115034911.283092081FC@bastion.fedora.phx.redhat.com>

kevin has set the watchbugzilla acl on libuninameslist (Fedora 10) to Approved for roozbeh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libuninameslist



From pkgdb at fedoraproject.org  Thu Jan 15 03:49:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 15 Jan 2009 03:49:12 +0000
Subject: [pkgdb] libuninameslist had acl change status
Message-ID: <20090115034912.9036B208456@bastion.fedora.phx.redhat.com>

kevin has set the commit acl on libuninameslist (Fedora 10) to Approved for roozbeh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libuninameslist



From tmz at fedoraproject.org  Thu Jan 15 04:02:07 2009
From: tmz at fedoraproject.org (Todd M. Zullinger)
Date: Thu, 15 Jan 2009 04:02:07 +0000 (UTC)
Subject: rpms/libgpod/devel
	0001-Use-var-run-hald-as-mount-dir-for-hal-callout.patch, NONE,
	1.1 libgpod.spec, 1.20, 1.21
Message-ID: <20090115040207.C56437012D@cvs1.fedora.phx.redhat.com>

Author: tmz

Update of /cvs/pkgs/rpms/libgpod/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24909

Modified Files:
	libgpod.spec 
Added Files:
	0001-Use-var-run-hald-as-mount-dir-for-hal-callout.patch 
Log Message:
* Wed Jan 14 2009 Todd Zullinger <tmz at pobox.com> - 0.6.0-10
- Fix path to hal callout (this should help setup the SysInfoExtended
  file automagically)
- Use /var/run/hald as mount dir for hal callout
- Require hal
- Require main package for the -doc subpackage


0001-Use-var-run-hald-as-mount-dir-for-hal-callout.patch:

--- NEW FILE 0001-Use-var-run-hald-as-mount-dir-for-hal-callout.patch ---
>From e8633211edb36d633864a6ee82ad4655984fa732 Mon Sep 17 00:00:00 2001
From: Todd Zullinger <tmz at pobox.com>
Date: Sun, 4 Jan 2009 21:32:14 -0500
Subject: [PATCH] Use /var/run/hald as mount dir for hal callout

This is preferred over /tmp by SELinux.
---
 tools/hal-callout.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/tools/hal-callout.c b/tools/hal-callout.c
index e7313fe..4d6044b 100644
--- a/tools/hal-callout.c
+++ b/tools/hal-callout.c
@@ -52,7 +52,7 @@ static char *mount_ipod (const char *dev_path)
         if (fstype == NULL) {
                 return NULL;
         }
-        filename = g_build_filename (g_get_tmp_dir (), "ipodXXXXXX", NULL);
+        filename = g_build_filename ("/var/run/hald", "ipodXXXXXX", NULL);
         if (filename == NULL) {
                 return NULL;
         }
-- 
1.6.1



Index: libgpod.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libgpod/devel/libgpod.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- libgpod.spec	29 Nov 2008 16:48:01 -0000	1.20
+++ libgpod.spec	15 Jan 2009 04:01:37 -0000	1.21
@@ -3,7 +3,7 @@
 Summary: Library to access the contents of an iPod
 Name: libgpod
 Version: 0.6.0
-Release: 9%{?dist}
+Release: 10%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 URL: http://www.gtkpod.org/libgpod.html
@@ -12,6 +12,8 @@
 Patch1: libgpod-0.6.0-ipod-touch-typos.patch
 Patch2: libgpod-0.6.0-spl-tracklen.patch
 Patch3: libgpod-0.6.0-sg3_utils-1.26.patch
+# See http://www.redhat.com/archives/fedora-selinux-list/2009-January/msg00005.html
+Patch4: 0001-Use-var-run-hald-as-mount-dir-for-hal-callout.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: docbook-style-xsl
 BuildRequires: glib2-devel
@@ -25,6 +27,7 @@
 Buildrequires: python-mutagen
 Buildrequires: sg3_utils-devel
 Buildrequires: swig
+Requires: hal
 
 %description
 Libgpod is a library to access the contents of an iPod. It supports playlists,
@@ -51,6 +54,7 @@
 Summary: API documentation for the libgpod library
 Group: Documentation
 License: GFDL
+Requires: %{name} = %{version}-%{release}
 Requires: gtk-doc
 
 %description doc
@@ -77,13 +81,14 @@
 %patch1 -p0 -b .ipod-touch-typos
 %patch2 -p0 -b .spl-tracklen
 %patch3 -p1 -b .sg3_utils
+%patch4 -p1 -b .selinux
 
 # remove execute perms on the python examples as they'll be installed in %doc
 %{__chmod} -x bindings/python/examples/*.py
 
 
 %build
-%configure
+%configure --with-hal-callouts-dir=%{_libdir}/hal/scripts
 %{__make} %{?_smp_mflags}
 
 # add gdk-pixbuf-2.0 to the pkg-config file requirements
@@ -112,7 +117,7 @@
 %doc AUTHORS ChangeLog COPYING NEWS README*
 %{_bindir}/*
 %{_libdir}/*.so.*
-%{_libdir}/hal/*
+%{_libdir}/hal/scripts/*
 %{_datadir}/hal/fdi/policy/20thirdparty/*.fdi
 
 
@@ -139,6 +144,13 @@
 
 
 %changelog
+* Wed Jan 14 2009 Todd Zullinger <tmz at pobox.com> - 0.6.0-10
+- Fix path to hal callout (this should help setup the SysInfoExtended
+  file automagically)
+- Use /var/run/hald as mount dir for hal callout
+- Require hal
+- Require main package for the -doc subpackage
+
 * Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 0.6.0-9
 - Rebuild for Python 2.6
 



From tmz at fedoraproject.org  Thu Jan 15 04:10:37 2009
From: tmz at fedoraproject.org (Todd M. Zullinger)
Date: Thu, 15 Jan 2009 04:10:37 +0000 (UTC)
Subject: rpms/libgpod/F-10
	0001-Use-var-run-hald-as-mount-dir-for-hal-callout.patch, NONE,
	1.1 libgpod.spec, 1.19, 1.20
Message-ID: <20090115041037.CBC887012D@cvs1.fedora.phx.redhat.com>

Author: tmz

Update of /cvs/extras/rpms/libgpod/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25821

Modified Files:
	libgpod.spec 
Added Files:
	0001-Use-var-run-hald-as-mount-dir-for-hal-callout.patch 
Log Message:
* Wed Jan 14 2009 Todd Zullinger <tmz at pobox.com> - 0.6.0-9
- Fix path to hal callout (this should help setup the SysInfoExtended
  file automagically)
- Use /var/run/hald as mount dir for hal callout
- Require hal
- Require main package for the -doc subpackage


0001-Use-var-run-hald-as-mount-dir-for-hal-callout.patch:

--- NEW FILE 0001-Use-var-run-hald-as-mount-dir-for-hal-callout.patch ---
>From e8633211edb36d633864a6ee82ad4655984fa732 Mon Sep 17 00:00:00 2001
From: Todd Zullinger <tmz at pobox.com>
Date: Sun, 4 Jan 2009 21:32:14 -0500
Subject: [PATCH] Use /var/run/hald as mount dir for hal callout

This is preferred over /tmp by SELinux.
---
 tools/hal-callout.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/tools/hal-callout.c b/tools/hal-callout.c
index e7313fe..4d6044b 100644
--- a/tools/hal-callout.c
+++ b/tools/hal-callout.c
@@ -52,7 +52,7 @@ static char *mount_ipod (const char *dev_path)
         if (fstype == NULL) {
                 return NULL;
         }
-        filename = g_build_filename (g_get_tmp_dir (), "ipodXXXXXX", NULL);
+        filename = g_build_filename ("/var/run/hald", "ipodXXXXXX", NULL);
         if (filename == NULL) {
                 return NULL;
         }
-- 
1.6.1



Index: libgpod.spec
===================================================================
RCS file: /cvs/extras/rpms/libgpod/F-10/libgpod.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- libgpod.spec	2 Oct 2008 21:22:20 -0000	1.19
+++ libgpod.spec	15 Jan 2009 04:10:06 -0000	1.20
@@ -3,7 +3,7 @@
 Summary: Library to access the contents of an iPod
 Name: libgpod
 Version: 0.6.0
-Release: 8%{?dist}
+Release: 9%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 URL: http://www.gtkpod.org/libgpod.html
@@ -12,6 +12,8 @@
 Patch1: libgpod-0.6.0-ipod-touch-typos.patch
 Patch2: libgpod-0.6.0-spl-tracklen.patch
 Patch3: libgpod-0.6.0-sg3_utils-1.26.patch
+# See http://www.redhat.com/archives/fedora-selinux-list/2009-January/msg00005.html
+Patch4: 0001-Use-var-run-hald-as-mount-dir-for-hal-callout.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: docbook-style-xsl
 BuildRequires: glib2-devel
@@ -25,6 +27,7 @@
 Buildrequires: python-mutagen
 Buildrequires: sg3_utils-devel
 Buildrequires: swig
+Requires: hal
 
 %description
 Libgpod is a library to access the contents of an iPod. It supports playlists,
@@ -51,6 +54,7 @@
 Summary: API documentation for the libgpod library
 Group: Documentation
 License: GFDL
+Requires: %{name} = %{version}-%{release}
 Requires: gtk-doc
 
 %description doc
@@ -77,13 +81,14 @@
 %patch1 -p0 -b .ipod-touch-typos
 %patch2 -p0 -b .spl-tracklen
 %patch3 -p1 -b .sg3_utils
+%patch4 -p1 -b .selinux
 
 # remove execute perms on the python examples as they'll be installed in %doc
 %{__chmod} -x bindings/python/examples/*.py
 
 
 %build
-%configure
+%configure --with-hal-callouts-dir=%{_libdir}/hal/scripts
 %{__make} %{?_smp_mflags}
 
 # add gdk-pixbuf-2.0 to the pkg-config file requirements
@@ -112,7 +117,7 @@
 %doc AUTHORS ChangeLog COPYING NEWS README*
 %{_bindir}/*
 %{_libdir}/*.so.*
-%{_libdir}/hal/*
+%{_libdir}/hal/scripts/*
 %{_datadir}/hal/fdi/policy/20thirdparty/*.fdi
 
 
@@ -139,6 +144,13 @@
 
 
 %changelog
+* Wed Jan 14 2009 Todd Zullinger <tmz at pobox.com> - 0.6.0-9
+- Fix path to hal callout (this should help setup the SysInfoExtended
+  file automagically)
+- Use /var/run/hald as mount dir for hal callout
+- Require hal
+- Require main package for the -doc subpackage
+
 * Thu Oct 02 2008 Todd Zullinger <tmz at pobox.com> - 0.6.0-8
 - The -devel package should require gtk2-devel as well
 - Add gdk-pixbuf-2.0 to the pkg-config file requirements



From tmz at fedoraproject.org  Thu Jan 15 04:11:57 2009
From: tmz at fedoraproject.org (Todd M. Zullinger)
Date: Thu, 15 Jan 2009 04:11:57 +0000 (UTC)
Subject: rpms/libgpod/F-9
	0001-Use-var-run-hald-as-mount-dir-for-hal-callout.patch, NONE,
	1.1 libgpod.spec, 1.15, 1.16
Message-ID: <20090115041157.0E76D70142@cvs1.fedora.phx.redhat.com>

Author: tmz

Update of /cvs/extras/rpms/libgpod/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26043

Modified Files:
	libgpod.spec 
Added Files:
	0001-Use-var-run-hald-as-mount-dir-for-hal-callout.patch 
Log Message:
* Wed Jan 14 2009 Todd Zullinger <tmz at pobox.com> - 0.6.0-5
- Fix path to hal callout (this should help setup the SysInfoExtended
  file automagically)
- Use /var/run/hald as mount dir for hal callout
- Require hal for the callout and .fdi directories
- Require main package for the -doc subpackage
- Require glib2-devel and gtk2-devel for the -devel subpackage (#446442)
- Add gdk-pixbuf-2.0 to the pkg-config file requirements


0001-Use-var-run-hald-as-mount-dir-for-hal-callout.patch:

--- NEW FILE 0001-Use-var-run-hald-as-mount-dir-for-hal-callout.patch ---
>From e8633211edb36d633864a6ee82ad4655984fa732 Mon Sep 17 00:00:00 2001
From: Todd Zullinger <tmz at pobox.com>
Date: Sun, 4 Jan 2009 21:32:14 -0500
Subject: [PATCH] Use /var/run/hald as mount dir for hal callout

This is preferred over /tmp by SELinux.
---
 tools/hal-callout.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/tools/hal-callout.c b/tools/hal-callout.c
index e7313fe..4d6044b 100644
--- a/tools/hal-callout.c
+++ b/tools/hal-callout.c
@@ -52,7 +52,7 @@ static char *mount_ipod (const char *dev_path)
         if (fstype == NULL) {
                 return NULL;
         }
-        filename = g_build_filename (g_get_tmp_dir (), "ipodXXXXXX", NULL);
+        filename = g_build_filename ("/var/run/hald", "ipodXXXXXX", NULL);
         if (filename == NULL) {
                 return NULL;
         }
-- 
1.6.1



Index: libgpod.spec
===================================================================
RCS file: /cvs/extras/rpms/libgpod/F-9/libgpod.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- libgpod.spec	12 Feb 2008 08:34:06 -0000	1.15
+++ libgpod.spec	15 Jan 2009 04:11:26 -0000	1.16
@@ -3,7 +3,7 @@
 Summary: Library to access the contents of an iPod
 Name: libgpod
 Version: 0.6.0
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 URL: http://www.gtkpod.org/libgpod.html
@@ -11,6 +11,8 @@
 Patch0: libgpod-0.6.0-photoremove.patch
 Patch1: libgpod-0.6.0-ipod-touch-typos.patch
 Patch2: libgpod-0.6.0-spl-tracklen.patch
+# See http://www.redhat.com/archives/fedora-selinux-list/2009-January/msg00005.html
+Patch3: 0001-Use-var-run-hald-as-mount-dir-for-hal-callout.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: docbook-style-xsl
 BuildRequires: glib2-devel
@@ -24,6 +26,7 @@
 Buildrequires: python-mutagen
 Buildrequires: sg3_utils-devel
 Buildrequires: swig
+Requires: hal
 
 %description
 Libgpod is a library to access the contents of an iPod. It supports playlists,
@@ -34,6 +37,8 @@
 Summary: Development files for the libgpod library
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
+Requires: glib2-devel
+Requires: gtk2-devel
 Requires: pkgconfig
 
 %description devel
@@ -48,6 +53,7 @@
 Summary: API documentation for the libgpod library
 Group: Documentation
 License: GFDL
+Requires: %{name} = %{version}-%{release}
 Requires: gtk-doc
 
 %description doc
@@ -73,15 +79,19 @@
 %patch0 -p0 -b .photoremove
 %patch1 -p0 -b .ipod-touch-typos
 %patch2 -p0 -b .spl-tracklen
+%patch3 -p1 -b .selinux
 
 # remove execute perms on the python examples as they'll be installed in %doc
 %{__chmod} -x bindings/python/examples/*.py
 
 
 %build
-%configure
+%configure --with-hal-callouts-dir=%{_libdir}/hal/scripts
 %{__make} %{?_smp_mflags}
 
+# add gdk-pixbuf-2.0 to the pkg-config file requirements
+%{__sed} -i -e 's/^Requires:.*/& gdk-pixbuf-2.0/' libgpod-1.0.pc
+
 
 %install
 %{__rm} -rf %{buildroot}
@@ -105,7 +115,7 @@
 %doc AUTHORS ChangeLog COPYING NEWS README*
 %{_bindir}/*
 %{_libdir}/*.so.*
-%{_libdir}/hal/*
+%{_libdir}/hal/scripts/*
 %{_datadir}/hal/fdi/policy/20thirdparty/*.fdi
 
 
@@ -132,6 +142,15 @@
 
 
 %changelog
+* Wed Jan 14 2009 Todd Zullinger <tmz at pobox.com> - 0.6.0-5
+- Fix path to hal callout (this should help setup the SysInfoExtended
+  file automagically)
+- Use /var/run/hald as mount dir for hal callout
+- Require hal for the callout and .fdi directories
+- Require main package for the -doc subpackage
+- Require glib2-devel and gtk2-devel for the -devel subpackage (#446442)
+- Add gdk-pixbuf-2.0 to the pkg-config file requirements
+
 * Tue Feb 12 2008 Todd Zullinger <tmz at pobox.com> - 0.6.0-4
 - rebuild for gcc 4.3
 



From iankent at fedoraproject.org  Thu Jan 15 04:31:40 2009
From: iankent at fedoraproject.org (Ian Kent)
Date: Thu, 15 Jan 2009 04:31:40 +0000 (UTC)
Subject: rpms/autofs/devel autofs-5.0.4-use-CLOEXEC-flag.patch,1.1,1.2
Message-ID: <20090115043140.110C97012D@cvs1.fedora.phx.redhat.com>

Author: iankent

Update of /cvs/pkgs/rpms/autofs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28661

Modified Files:
	autofs-5.0.4-use-CLOEXEC-flag.patch 
Log Message:
- fix typo in CLOEXEC patch again?


autofs-5.0.4-use-CLOEXEC-flag.patch:

Index: autofs-5.0.4-use-CLOEXEC-flag.patch
===================================================================
RCS file: /cvs/pkgs/rpms/autofs/devel/autofs-5.0.4-use-CLOEXEC-flag.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- autofs-5.0.4-use-CLOEXEC-flag.patch	15 Jan 2009 03:47:47 -0000	1.1
+++ autofs-5.0.4-use-CLOEXEC-flag.patch	15 Jan 2009 04:31:39 -0000	1.2
@@ -438,7 +438,7 @@
 +	FILE *f;
 +
 +#if defined(O_CLOEXEC) && defined(SOCK_CLOEXEC)
-+	if (cloexec_exec != -1) {
++	if (cloexec_works != -1) {
 +		f = fopen(path, "re");
 +		if (f != NULL) {
 +			check_cloexec(fileno(f));



From matt at fedoraproject.org  Thu Jan 15 04:54:30 2009
From: matt at fedoraproject.org (Matthew Farrellee)
Date: Thu, 15 Jan 2009 04:54:30 +0000 (UTC)
Subject: rpms/condor/F-9 chkconfig_off.patch,NONE,1.1 condor.spec,1.16,1.17
Message-ID: <20090115045430.AD3F27012D@cvs1.fedora.phx.redhat.com>

Author: matt

Update of /cvs/pkgs/rpms/condor/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31622

Modified Files:
	condor.spec 
Added Files:
	chkconfig_off.patch 
Log Message:
7.2.0-3, turns init script off by default again

chkconfig_off.patch:

--- NEW FILE chkconfig_off.patch ---
diff -ru condor-7.2.0/src/condor_examples/condor.init condor-7.2.0mf/src/condor_examples/condor.init
--- condor-7.2.0/src/condor_examples/condor.init	2008-12-19 14:10:08.000000000 -0600
+++ condor-7.2.0mf/src/condor_examples/condor.init	2009-01-13 19:31:15.000000000 -0600
@@ -2,7 +2,7 @@
 #
 # condor	This script allows for starting and stopping Condor.
 #
-# chkconfig: 2345 90 10
+# chkconfig: - 90 10
 # description: Condor is a high throughput computing batch processing
 # 	       platform.
 # processname: condor_master


Index: condor.spec
===================================================================
RCS file: /cvs/pkgs/rpms/condor/F-9/condor.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- condor.spec	8 Jan 2009 15:50:26 -0000	1.16
+++ condor.spec	15 Jan 2009 04:54:00 -0000	1.17
@@ -1,7 +1,7 @@
 Summary: Condor: High Throughput Computing
 Name: condor
 Version: 7.2.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: ASL 2.0
 Group: Applications/System
 URL: http://www.cs.wisc.edu/condor/
@@ -25,6 +25,7 @@
 Patch0: condor_config.generic.patch
 Patch1: stdsoap2.h.patch.patch
 Patch2: DetectGCC.patch
+Patch3: chkconfig_off.patch
 
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
@@ -113,6 +114,7 @@
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 # fix errant execute permissions
 find src -perm /a+x -type f -name "*.[Cch]" -exec chmod a-x {} \;
@@ -569,6 +571,9 @@
 
 
 %changelog
+* Mon Jan 14 2009  <matt at redhat> - 7.2.0-3
+- Fixed regression: initscript was on by default, now off again
+
 * Thu Jan  8 2009  <matt at redhat> - 7.2.0-2
 - (Re)added CONDOR_DEVELOPERS=NONE to the default condor_config.local
 - Added missing Obsoletes for condor-static (thanks Michael Schwendt)



From matt at fedoraproject.org  Thu Jan 15 04:59:44 2009
From: matt at fedoraproject.org (Matthew Farrellee)
Date: Thu, 15 Jan 2009 04:59:44 +0000 (UTC)
Subject: rpms/condor/F-10 chkconfig_off.patch, NONE, 1.1 condor.spec, 1.11,
	1.12
Message-ID: <20090115045944.CEF977012D@cvs1.fedora.phx.redhat.com>

Author: matt

Update of /cvs/pkgs/rpms/condor/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32246

Modified Files:
	condor.spec 
Added Files:
	chkconfig_off.patch 
Log Message:
7.2.0-3, turns init script off by default again

chkconfig_off.patch:

--- NEW FILE chkconfig_off.patch ---
diff -ru condor-7.2.0/src/condor_examples/condor.init condor-7.2.0mf/src/condor_examples/condor.init
--- condor-7.2.0/src/condor_examples/condor.init	2008-12-19 14:10:08.000000000 -0600
+++ condor-7.2.0mf/src/condor_examples/condor.init	2009-01-13 19:31:15.000000000 -0600
@@ -2,7 +2,7 @@
 #
 # condor	This script allows for starting and stopping Condor.
 #
-# chkconfig: 2345 90 10
+# chkconfig: - 90 10
 # description: Condor is a high throughput computing batch processing
 # 	       platform.
 # processname: condor_master


Index: condor.spec
===================================================================
RCS file: /cvs/pkgs/rpms/condor/F-10/condor.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- condor.spec	8 Jan 2009 15:52:15 -0000	1.11
+++ condor.spec	15 Jan 2009 04:59:14 -0000	1.12
@@ -1,7 +1,7 @@
 Summary: Condor: High Throughput Computing
 Name: condor
 Version: 7.2.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: ASL 2.0
 Group: Applications/System
 URL: http://www.cs.wisc.edu/condor/
@@ -25,6 +25,7 @@
 Patch0: condor_config.generic.patch
 Patch1: stdsoap2.h.patch.patch
 Patch2: DetectGCC.patch
+Patch3: chkconfig_off.patch
 
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
@@ -113,6 +114,7 @@
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 # fix errant execute permissions
 find src -perm /a+x -type f -name "*.[Cch]" -exec chmod a-x {} \;
@@ -569,6 +571,9 @@
 
 
 %changelog
+* Mon Jan 14 2009  <matt at redhat> - 7.2.0-3
+- Fixed regression: initscript was on by default, now off again
+
 * Thu Jan  8 2009  <matt at redhat> - 7.2.0-2
 - (Re)added CONDOR_DEVELOPERS=NONE to the default condor_config.local
 - Added missing Obsoletes for condor-static (thanks Michael Schwendt)



From matt at fedoraproject.org  Thu Jan 15 05:01:36 2009
From: matt at fedoraproject.org (Matthew Farrellee)
Date: Thu, 15 Jan 2009 05:01:36 +0000 (UTC)
Subject: rpms/condor/devel chkconfig_off.patch, NONE, 1.1 condor.spec, 1.11,
	1.12
Message-ID: <20090115050136.490727012D@cvs1.fedora.phx.redhat.com>

Author: matt

Update of /cvs/pkgs/rpms/condor/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32563

Modified Files:
	condor.spec 
Added Files:
	chkconfig_off.patch 
Log Message:
7.2.0-3, turns init script off by default again

chkconfig_off.patch:

--- NEW FILE chkconfig_off.patch ---
diff -ru condor-7.2.0/src/condor_examples/condor.init condor-7.2.0mf/src/condor_examples/condor.init
--- condor-7.2.0/src/condor_examples/condor.init	2008-12-19 14:10:08.000000000 -0600
+++ condor-7.2.0mf/src/condor_examples/condor.init	2009-01-13 19:31:15.000000000 -0600
@@ -2,7 +2,7 @@
 #
 # condor	This script allows for starting and stopping Condor.
 #
-# chkconfig: 2345 90 10
+# chkconfig: - 90 10
 # description: Condor is a high throughput computing batch processing
 # 	       platform.
 # processname: condor_master


Index: condor.spec
===================================================================
RCS file: /cvs/pkgs/rpms/condor/devel/condor.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- condor.spec	8 Jan 2009 15:53:54 -0000	1.11
+++ condor.spec	15 Jan 2009 05:01:05 -0000	1.12
@@ -1,7 +1,7 @@
 Summary: Condor: High Throughput Computing
 Name: condor
 Version: 7.2.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: ASL 2.0
 Group: Applications/System
 URL: http://www.cs.wisc.edu/condor/
@@ -25,6 +25,7 @@
 Patch0: condor_config.generic.patch
 Patch1: stdsoap2.h.patch.patch
 Patch2: DetectGCC.patch
+Patch3: chkconfig_off.patch
 
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
@@ -113,6 +114,7 @@
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 # fix errant execute permissions
 find src -perm /a+x -type f -name "*.[Cch]" -exec chmod a-x {} \;
@@ -569,6 +571,9 @@
 
 
 %changelog
+* Mon Jan 14 2009  <matt at redhat> - 7.2.0-3
+- Fixed regression: initscript was on by default, now off again
+
 * Thu Jan  8 2009  <matt at redhat> - 7.2.0-2
 - (Re)added CONDOR_DEVELOPERS=NONE to the default condor_config.local
 - Added missing Obsoletes for condor-static (thanks Michael Schwendt)



From mtasaka at fedoraproject.org  Thu Jan 15 05:16:13 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Thu, 15 Jan 2009 05:16:13 +0000 (UTC)
Subject: rpms/cairo-dock/devel .cvsignore, 1.98, 1.99 cairo-dock.spec, 1.130,
	1.131 sources, 1.98, 1.99
Message-ID: <20090115051613.AA7687012D@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/cairo-dock/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2280

Modified Files:
	.cvsignore cairo-dock.spec sources 
Log Message:
* Thu Jan 15 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
- rev 1485



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cairo-dock/devel/.cvsignore,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -r1.98 -r1.99
--- .cvsignore	14 Jan 2009 05:26:39 -0000	1.98
+++ .cvsignore	15 Jan 2009 05:15:43 -0000	1.99
@@ -1 +1 @@
-cairo-dock-sources-svn1483_trunk.tar.bz2
+cairo-dock-sources-svn1484_trunk.tar.bz2


Index: cairo-dock.spec
===================================================================
RCS file: /cvs/extras/rpms/cairo-dock/devel/cairo-dock.spec,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -r1.130 -r1.131
--- cairo-dock.spec	14 Jan 2009 05:26:39 -0000	1.130
+++ cairo-dock.spec	15 Jan 2009 05:15:43 -0000	1.131
@@ -11,7 +11,7 @@
 %undefine		betaver		
 %define		build_webkit	1
 %define		build_xfce	1
-%define		tarballver	svn1483_trunk
+%define		tarballver	svn1484_trunk
 
 %define		fedora_main_rel	3
 
@@ -47,7 +47,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
-Patch0:		cairo-dock-rev1481-compile.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	automake
@@ -221,11 +220,12 @@
 # source code fix
 
 # Cairo-Penguin
-## Need ask
+## The following directories are also removed from the tarball
 cd Cairo-Penguin
 %{__sed} -i.icon \
 	-e '/The_Simpsons/d' \
 	-e '/Mario/d' \
+	-e '/Wanda/d' \
 	data/themes/Makefile.am
 %{__sed} -i.icon2 -e '$s|\\$||' data/themes/Makefile.am
 cd ..
@@ -236,6 +236,11 @@
 	configure.ac
 cd ..
 
+# illusion
+sed -i.po2 \
+	-e 's|^ICON_EFFECTS_PACKAGE|ILLUSION_PACKAGE|' \
+	configure.ac
+
 # mail: license conflict
 %{__rm} -rf mail/
 %if 0%{?released} < 1
@@ -247,9 +252,6 @@
 	Makefile.am
 %endif
 
-# illusion
-%patch0 -p1 -b .po
-
 # stacks: directory fix
 %if 0%{?released} < 1
 %{__sed} -i.dir -e '/stacksdatadir/s|pluginsdir|pluginsdatadir|' \
@@ -637,8 +639,13 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
-* Wed Jan 14 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
-- rev 1483
+* Thu Jan 15 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- rev 1485
+
+* Thu Jan 15 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- rev 1485
+- Trademarked icons under plug-ins/Cairo-Penguin/data/themes are
+  removed.
 
 * Thu Dec 25 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
 - rev 1451


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cairo-dock/devel/sources,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -r1.98 -r1.99
--- sources	14 Jan 2009 05:26:39 -0000	1.98
+++ sources	15 Jan 2009 05:15:43 -0000	1.99
@@ -1 +1 @@
-47a69764d639bb8087c0b7f1ba0005c6  cairo-dock-sources-svn1483_trunk.tar.bz2
+bd46efc450092532e05bc923cd05add9  cairo-dock-sources-svn1484_trunk.tar.bz2



From mtasaka at fedoraproject.org  Thu Jan 15 05:18:39 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Thu, 15 Jan 2009 05:18:39 +0000 (UTC)
Subject: rpms/cairo-dock/devel cairo-dock.spec,1.131,1.132
Message-ID: <20090115051839.322C57012D@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/cairo-dock/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2609

Modified Files:
	cairo-dock.spec 
Log Message:
current is 1484


Index: cairo-dock.spec
===================================================================
RCS file: /cvs/extras/rpms/cairo-dock/devel/cairo-dock.spec,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -r1.131 -r1.132
--- cairo-dock.spec	15 Jan 2009 05:15:43 -0000	1.131
+++ cairo-dock.spec	15 Jan 2009 05:18:08 -0000	1.132
@@ -640,10 +640,10 @@
 
 %changelog
 * Thu Jan 15 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
-- rev 1485
+- rev 1484
 
 * Thu Jan 15 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
-- rev 1485
+- rev 1484
 - Trademarked icons under plug-ins/Cairo-Penguin/data/themes are
   removed.
 



From mtasaka at fedoraproject.org  Thu Jan 15 06:21:39 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Thu, 15 Jan 2009 06:21:39 +0000 (UTC)
Subject: rpms/cairo-dock/devel cairo-dock.spec,1.132,1.133
Message-ID: <20090115062140.0D0897012D@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/cairo-dock/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10056

Modified Files:
	cairo-dock.spec 
Log Message:
Also have to remove from plug-ins/configure.ac


Index: cairo-dock.spec
===================================================================
RCS file: /cvs/extras/rpms/cairo-dock/devel/cairo-dock.spec,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -r1.132 -r1.133
--- cairo-dock.spec	15 Jan 2009 05:18:08 -0000	1.132
+++ cairo-dock.spec	15 Jan 2009 06:21:08 -0000	1.133
@@ -221,14 +221,13 @@
 
 # Cairo-Penguin
 ## The following directories are also removed from the tarball
-cd Cairo-Penguin
 %{__sed} -i.icon \
 	-e '/The_Simpsons/d' \
 	-e '/Mario/d' \
 	-e '/Wanda/d' \
-	data/themes/Makefile.am
-%{__sed} -i.icon2 -e '$s|\\$||' data/themes/Makefile.am
-cd ..
+	Cairo-Penguin/data/themes/Makefile.am \
+	configure.ac
+%{__sed} -i.icon2 -e '$s|\\$||' Cairo-Penguin/data/themes/Makefile.am
 
 # drop-indicator
 cd drop-indicator



From mtasaka at fedoraproject.org  Thu Jan 15 06:36:15 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Thu, 15 Jan 2009 06:36:15 +0000 (UTC)
Subject: rpms/cairo-dock/devel cairo-dock.spec,1.133,1.134
Message-ID: <20090115063615.2FD107012D@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/cairo-dock/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11773

Modified Files:
	cairo-dock.spec 
Log Message:
mustn't also destroy icon-effect...


Index: cairo-dock.spec
===================================================================
RCS file: /cvs/extras/rpms/cairo-dock/devel/cairo-dock.spec,v
retrieving revision 1.133
retrieving revision 1.134
diff -u -r1.133 -r1.134
--- cairo-dock.spec	15 Jan 2009 06:21:08 -0000	1.133
+++ cairo-dock.spec	15 Jan 2009 06:35:44 -0000	1.134
@@ -237,7 +237,7 @@
 
 # illusion
 sed -i.po2 \
-	-e 's|^ICON_EFFECTS_PACKAGE|ILLUSION_PACKAGE|' \
+	-e 's|^ICON_EFFECTS_PACKAGE=cd-illusion|ILLUSION_PACKAGE=cd-illusion|' \
 	configure.ac
 
 # mail: license conflict



From kyle at fedoraproject.org  Thu Jan 15 07:39:10 2009
From: kyle at fedoraproject.org (Kyle McMartin)
Date: Thu, 15 Jan 2009 07:39:10 +0000 (UTC)
Subject: rpms/kernel/devel linux-2.6-debug-taint-vm.patch,1.22,1.23
Message-ID: <20090115073910.6047A7012D@cvs1.fedora.phx.redhat.com>

Author: kyle

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19511

Modified Files:
	linux-2.6-debug-taint-vm.patch 
Log Message:
update debug-taint-vm patch

linux-2.6-debug-taint-vm.patch:

Index: linux-2.6-debug-taint-vm.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-debug-taint-vm.patch,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- linux-2.6-debug-taint-vm.patch	8 Dec 2008 16:27:32 -0000	1.22
+++ linux-2.6-debug-taint-vm.patch	15 Jan 2009 07:38:39 -0000	1.23
@@ -1,8 +1,8 @@
 diff --git a/kernel/panic.c b/kernel/panic.c
-index 4d50883..f4a6faa 100644
+index 2a2ff36..361d852 100644
 --- a/kernel/panic.c
 +++ b/kernel/panic.c
-@@ -193,6 +193,7 @@ const char *print_tainted(void)
+@@ -194,6 +194,7 @@ const char *print_tainted(void)
  		snprintf(buf, sizeof(buf), "Not tainted");
  	return(buf);
  }
@@ -10,7 +10,7 @@
  
  int test_taint(unsigned flag)
  {
-@@ -328,8 +329,8 @@ void warn_on_slowpath(const char *file, int line)
+@@ -334,8 +335,8 @@ void warn_slowpath(const char *file, int line, const char *fmt, ...)
  	sprint_symbol(function, caller);
  
  	printk(KERN_WARNING "------------[ cut here ]------------\n");
@@ -18,28 +18,28 @@
 -		line, function);
 +	printk(KERN_WARNING "WARNING: at %s:%d %s() (%s)\n", file,
 +		line, function, print_tainted());
- 	print_modules();
- 	dump_stack();
- 	print_oops_end_marker();
+ 	board = dmi_get_system_info(DMI_PRODUCT_NAME);
+ 	if (board)
+ 		printk(KERN_WARNING "Hardware name: %s\n", board);
 diff --git a/mm/page_alloc.c b/mm/page_alloc.c
-index d8ac014..1d035f0 100644
+index 5675b30..ae3e7ff 100644
 --- a/mm/page_alloc.c
 +++ b/mm/page_alloc.c
-@@ -224,10 +224,10 @@ static inline int bad_range(struct zone *zone, struct page *page)
- static void bad_page(struct page *page)
- {
- 	printk(KERN_EMERG "Bad page state in process '%s'\n" KERN_EMERG
--		"page:%p flags:0x%0*lx mapping:%p mapcount:%d count:%d\n",
-+		"page:%p flags:0x%0*lx mapping:%p mapcount:%d count:%d (%s)\n",
- 		current->comm, page, (int)(2*sizeof(unsigned long)),
- 		(unsigned long)page->flags, page->mapping,
--		page_mapcount(page), page_count(page));
-+		page_mapcount(page), page_count(page), print_tainted());
+@@ -250,9 +250,10 @@ static void bad_page(struct page *page)
+ 	printk(KERN_ALERT "BUG: Bad page state in process %s  pfn:%05lx\n",
+ 		current->comm, page_to_pfn(page));
+ 	printk(KERN_ALERT
+-		"page:%p flags:%p count:%d mapcount:%d mapping:%p index:%lx\n",
++		"page:%p flags:%p count:%d mapcount:%d mapping:%p ",
+ 		page, (void *)page->flags, page_count(page),
+-		page_mapcount(page), page->mapping, page->index);
++		page_mapcount(page), page->mapping);
++	printk(KERN_CONT "index:%lx (%s)\n", page->index, print_tainted());
  
- 	printk(KERN_EMERG "Trying to fix it up, but a reboot is needed\n"
- 		KERN_EMERG "Backtrace:\n");
+ 	dump_stack();
+ out:
 diff --git a/mm/slab.c b/mm/slab.c
-index 0918751..0977a03 100644
+index ddc41f3..bf54397 100644
 --- a/mm/slab.c
 +++ b/mm/slab.c
 @@ -1858,8 +1858,8 @@ static void check_poison_obj(struct kmem_cache *cachep, void *objp)
@@ -53,7 +53,7 @@
  				print_objinfo(cachep, objp, 0);
  			}
  			/* Hexdump the affected line */
-@@ -2928,8 +2928,8 @@ static void check_slabp(struct kmem_cache *cachep, struct slab *slabp)
+@@ -2930,8 +2930,8 @@ static void check_slabp(struct kmem_cache *cachep, struct slab *slabp)
  	if (entries != cachep->num - slabp->inuse) {
  bad:
  		printk(KERN_ERR "slab: Internal list corruption detected in "
@@ -65,10 +65,10 @@
  		     i < sizeof(*slabp) + cachep->num * sizeof(kmem_bufctl_t);
  		     i++) {
 diff --git a/mm/slub.c b/mm/slub.c
-index 749588a..0ef64f1 100644
+index 6392ae5..4f6acce 100644
 --- a/mm/slub.c
 +++ b/mm/slub.c
-@@ -430,7 +430,7 @@ static void slab_bug(struct kmem_cache *s, char *fmt, ...)
+@@ -435,7 +435,7 @@ static void slab_bug(struct kmem_cache *s, char *fmt, ...)
  	va_end(args);
  	printk(KERN_ERR "========================================"
  			"=====================================\n");



From kyle at fedoraproject.org  Thu Jan 15 07:39:31 2009
From: kyle at fedoraproject.org (Kyle McMartin)
Date: Thu, 15 Jan 2009 07:39:31 +0000 (UTC)
Subject: rpms/kernel/devel linux-2.6-hdpvr.patch,1.2,1.3
Message-ID: <20090115073931.61F817012D@cvs1.fedora.phx.redhat.com>

Author: kyle

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19658

Modified Files:
	linux-2.6-hdpvr.patch 
Log Message:
update hdpvr patch

linux-2.6-hdpvr.patch:

Index: linux-2.6-hdpvr.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-hdpvr.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- linux-2.6-hdpvr.patch	8 Dec 2008 18:59:39 -0000	1.2
+++ linux-2.6-hdpvr.patch	15 Jan 2009 07:39:31 -0000	1.3
@@ -1,8 +1,8 @@
 diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig
-index 47102c2..0e279dd 100644
+index 19cf3b8..4f29e1a 100644
 --- a/drivers/media/video/Kconfig
 +++ b/drivers/media/video/Kconfig
-@@ -781,6 +781,8 @@ source "drivers/media/video/gspca/Kconfig"
+@@ -817,6 +817,8 @@ source "drivers/media/video/gspca/Kconfig"
  
  source "drivers/media/video/pvrusb2/Kconfig"
  
@@ -12,10 +12,10 @@
  
  source "drivers/media/video/usbvision/Kconfig"
 diff --git a/drivers/media/video/Makefile b/drivers/media/video/Makefile
-index 16962f3..4331a50 100644
+index 72f6d03..35ff442 100644
 --- a/drivers/media/video/Makefile
 +++ b/drivers/media/video/Makefile
-@@ -115,6 +115,8 @@ obj-$(CONFIG_USB_PWC)           += pwc/
+@@ -122,6 +122,8 @@ obj-$(CONFIG_USB_PWC)           += pwc/
  obj-$(CONFIG_USB_ZC0301)        += zc0301/
  obj-$(CONFIG_USB_GSPCA)         += gspca/
  
@@ -885,7 +885,7 @@
 +}
 diff --git a/drivers/media/video/hdpvr/hdpvr-video.c b/drivers/media/video/hdpvr/hdpvr-video.c
 new file mode 100644
-index 0000000..2378099
+index 0000000..0297f91
 --- /dev/null
 +++ b/drivers/media/video/hdpvr/hdpvr-video.c
 @@ -0,0 +1,1258 @@
@@ -1214,7 +1214,7 @@
 + * video 4 linux 2 file operations
 + */
 +
-+static int hdpvr_open(struct inode *inode, struct file *file)
++static int hdpvr_open(struct file *file)
 +{
 +	struct hdpvr_device *dev;
 +	struct hdpvr_fh *fh;
@@ -1253,7 +1253,7 @@
 +	return retval;
 +}
 +
-+
++#if 0
 +static void hdpvr_draw_down(struct hdpvr_device *dev)
 +{
 +	hdpvr_trace("status = %d", dev->status);
@@ -1279,8 +1279,9 @@
 +
 +	return 0;
 +}
++#endif
 +
-+static int hdpvr_release(struct inode *inode, struct file *file)
++static int hdpvr_release(struct file *file)
 +{
 +	struct hdpvr_fh		*fh  = (struct hdpvr_fh *)file->private_data;
 +	struct hdpvr_device	*dev = fh->dev;
@@ -1455,7 +1456,7 @@
 +}
 +
 +
-+static int hdpvr_ioctl(struct inode *inode, struct file *filp, unsigned int cmd,
++static long hdpvr_ioctl(struct file *filp, unsigned int cmd,
 +		unsigned long arg)
 +{
 +	struct hdpvr_fh *fh = (struct hdpvr_fh *)filp->private_data;
@@ -1490,21 +1491,20 @@
 +		break;
 +	}
 +	default:
-+		res = video_ioctl2(inode, filp, cmd, arg);
++		res = video_ioctl2(filp, cmd, arg);
 +	}
 +	mutex_unlock(&dev->io_mutex);
 +	return res;
 +}
 +
-+static const struct file_operations hdpvr_fops = {
++static const struct v4l2_file_operations hdpvr_fops = {
 +	.owner		= THIS_MODULE,
 +	.open		= hdpvr_open,
 +	.release	= hdpvr_release,
-+	.flush		= hdpvr_flush,
++/*	.flush		= hdpvr_flush,	*/
 +	.read		= hdpvr_read,
 +	.poll		= hdpvr_poll,
 +	.ioctl		= hdpvr_ioctl,
-+	.compat_ioctl	= v4l_compat_ioctl32,
 +};
 +
 +/*=======================================================================*/
@@ -2478,18 +2478,10 @@
 +void print_bytes(char *string, unsigned char *buf, size_t len);
 +#endif
 diff --git a/drivers/media/video/v4l2-common.c b/drivers/media/video/v4l2-common.c
-index 846763d..34eca15 100644
+index b8f2be8..0e8bd98 100644
 --- a/drivers/media/video/v4l2-common.c
 +++ b/drivers/media/video/v4l2-common.c
-@@ -374,6 +374,7 @@ const char *v4l2_ctrl_get_name(u32 id)
- 	case V4L2_CID_CONTRAST: 	return "Contrast";
- 	case V4L2_CID_SATURATION: 	return "Saturation";
- 	case V4L2_CID_HUE: 		return "Hue";
-+	case V4L2_CID_SHARPNESS: 	return "Sharpness";
- 
- 	/* MPEG controls */
- 	case V4L2_CID_MPEG_CLASS: 		return "MPEG Encoder Controls";
-@@ -480,6 +481,7 @@ int v4l2_ctrl_query_fill(struct v4l2_queryctrl *qctrl, s32 min, s32 max, s32 ste
+@@ -547,6 +547,7 @@ int v4l2_ctrl_query_fill(struct v4l2_queryctrl *qctrl, s32 min, s32 max, s32 ste
  	case V4L2_CID_CONTRAST:
  	case V4L2_CID_SATURATION:
  	case V4L2_CID_HUE:
@@ -2497,7 +2489,7 @@
  		qctrl->flags |= V4L2_CTRL_FLAG_SLIDER;
  		break;
  	}
-@@ -518,6 +520,8 @@ int v4l2_ctrl_query_fill_std(struct v4l2_queryctrl *qctrl)
+@@ -585,6 +586,8 @@ int v4l2_ctrl_query_fill_std(struct v4l2_queryctrl *qctrl)
  		return v4l2_ctrl_query_fill(qctrl, 0, 127, 1, 64);
  	case V4L2_CID_HUE:
  		return v4l2_ctrl_query_fill(qctrl, -128, 127, 1, 0);



From kyle at fedoraproject.org  Thu Jan 15 07:41:35 2009
From: kyle at fedoraproject.org (Kyle McMartin)
Date: Thu, 15 Jan 2009 07:41:35 +0000 (UTC)
Subject: rpms/kernel/devel use-per_cpu-module-references.patch, NONE,
	1.1 kernel.spec, 1.1217,
	1.1218 kzalloc-mod_ref-instead-of-wasting-space.patch, 1.2, NONE
Message-ID: <20090115074135.4D6B97012D@cvs1.fedora.phx.redhat.com>

Author: kyle

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19889

Modified Files:
	kernel.spec 
Added Files:
	use-per_cpu-module-references.patch 
Removed Files:
	kzalloc-mod_ref-instead-of-wasting-space.patch 
Log Message:
* Thu Jan 15 2009 Kyle McMartin <kyle at redhat.com>
- New version of module_ref patch, uses per_cpu instead.
- Fix linux-2.6-hdpvr.patch up and re-enable.
    Nuke .flush, was useless, convert to v4l2_file_operations, fix ioctl ret
- Fix linux-2.6-debug-taint-vm.patch and re-enable.


use-per_cpu-module-references.patch:

--- NEW FILE use-per_cpu-module-references.patch ---
diff --git a/include/linux/module.h b/include/linux/module.h
index 4f7ea12..61f97a2 100644
--- a/include/linux/module.h
+++ b/include/linux/module.h
@@ -219,11 +219,6 @@ void *__symbol_get_gpl(const char *symbol);
 
 #endif
 
-struct module_ref
-{
-	local_t count;
-} ____cacheline_aligned;
-
 enum module_state
 {
 	MODULE_STATE_LIVE,
@@ -345,7 +340,7 @@ struct module
 	void (*exit)(void);
 
 	/* Reference counts */
-	struct module_ref ref[NR_CPUS];
+	local_t *ref;	/* percpu */
 #endif
 };
 #ifndef MODULE_ARCH_INIT
@@ -400,8 +395,9 @@ void symbol_put_addr(void *addr);
 static inline void __module_get(struct module *module)
 {
 	if (module) {
+		int cpu = get_cpu();
 		BUG_ON(module_refcount(module) == 0);
-		local_inc(&module->ref[get_cpu()].count);
+		local_inc(per_cpu_ptr(module->ref, cpu));
 		put_cpu();
 	}
 }
@@ -412,9 +408,9 @@ static inline int try_module_get(struct module *module)
 
 	if (module) {
 		unsigned int cpu = get_cpu();
-		if (likely(module_is_live(module)))
-			local_inc(&module->ref[cpu].count);
-		else
+		if (likely(module_is_live(module))) {
+			local_inc(per_cpu_ptr(module->ref, cpu));
+		} else
 			ret = 0;
 		put_cpu();
 	}
diff --git a/kernel/module.c b/kernel/module.c
index c9332c9..e504f49 100644
--- a/kernel/module.c
+++ b/kernel/module.c
@@ -571,17 +571,19 @@ static char last_unloaded_module[MODULE_NAME_LEN+1];
 
 #ifdef CONFIG_MODULE_UNLOAD
 /* Init the unload section of the module. */
-static void module_unload_init(struct module *mod)
+static int module_unload_init(struct module *mod)
 {
-	unsigned int i;
+	mod->ref = percpu_alloc(sizeof(*mod->ref), GFP_KERNEL);
+	if (!mod->ref)
+		return -ENOMEM;
 
 	INIT_LIST_HEAD(&mod->modules_which_use_me);
-	for (i = 0; i < NR_CPUS; i++)
-		local_set(&mod->ref[i].count, 0);
 	/* Hold reference count during initialization. */
-	local_set(&mod->ref[raw_smp_processor_id()].count, 1);
+	local_set(per_cpu_ptr(mod->ref, raw_smp_processor_id()), 1);
 	/* Backwards compatibility macros put refcount during init. */
 	mod->waiter = current;
+
+	return 0;
 }
 
 /* modules using other modules */
@@ -661,6 +663,8 @@ static void module_unload_free(struct module *mod)
 			}
 		}
 	}
+
+	percpu_free(mod->ref);
 }
 
 #ifdef CONFIG_MODULE_FORCE_UNLOAD
@@ -717,10 +721,12 @@ static int try_stop_module(struct module *mod, int flags, int *forced)
 
 unsigned int module_refcount(struct module *mod)
 {
-	unsigned int i, total = 0;
+	unsigned int cpu, total = 0;
+
+	for_each_possible_cpu(cpu) {
+		total += local_read(per_cpu_ptr(mod->ref, cpu));
+	}
 
-	for (i = 0; i < NR_CPUS; i++)
-		total += local_read(&mod->ref[i].count);
 	return total;
 }
 EXPORT_SYMBOL(module_refcount);
@@ -894,7 +900,8 @@ void module_put(struct module *module)
 {
 	if (module) {
 		unsigned int cpu = get_cpu();
-		local_dec(&module->ref[cpu].count);
+
+		local_dec(per_cpu_ptr(module->ref, cpu));
 		/* Maybe they're waiting for us to drop reference? */
 		if (unlikely(!module_is_live(module)))
 			wake_up_process(module->waiter);
@@ -919,8 +926,9 @@ static inline int use_module(struct module *a, struct module *b)
 	return strong_try_module_get(b) == 0;
 }
 
-static inline void module_unload_init(struct module *mod)
+static inline int module_unload_init(struct module *mod)
 {
+	return 0;
 }
 #endif /* CONFIG_MODULE_UNLOAD */
 
@@ -2071,7 +2079,9 @@ static noinline struct module *load_module(void __user *umod,
 	mod = (void *)sechdrs[modindex].sh_addr;
 
 	/* Now we've moved module, initialize linked lists, etc. */
-	module_unload_init(mod);
+	err = module_unload_init(mod);
+	if (err < 0)
+		goto free_unload;
 
 	/* add kobject, so we can reference it. */
 	err = mod_sysfs_init(mod);


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1217
retrieving revision 1.1218
diff -u -r1.1217 -r1.1218
--- kernel.spec	15 Jan 2009 02:03:33 -0000	1.1217
+++ kernel.spec	15 Jan 2009 07:41:04 -0000	1.1218
@@ -659,7 +659,7 @@
 # silence the ACPI blacklist code
 Patch2802: linux-2.6-silence-acpi-blacklist.patch
 
-Patch9000: kzalloc-mod_ref-instead-of-wasting-space.patch
+Patch9000: use-per_cpu-module-references.patch
 Patch9001: revert-fix-modules_install-via-nfs.patch
 
 %endif
@@ -1066,7 +1066,7 @@
 # Various low-impact patches to aid debugging.
 ApplyPatch linux-2.6-debug-sizeof-structs.patch
 ApplyPatch linux-2.6-debug-nmi-timeout.patch
-#ApplyPatch linux-2.6-debug-taint-vm.patch
+ApplyPatch linux-2.6-debug-taint-vm.patch
 ApplyPatch linux-2.6-debug-spinlock-taint.patch
 ApplyPatch linux-2.6-debug-vm-would-have-oomkilled.patch
 ApplyPatch linux-2.6-debug-always-inline-kzalloc.patch
@@ -1131,7 +1131,7 @@
 # http://www.lirc.org/
 ApplyPatch linux-2.6.27-lirc.patch
 # http://hg.jannau.net/hdpvr/
-#ApplyPatch linux-2.6-hdpvr.patch
+ApplyPatch linux-2.6-hdpvr.patch
 
 # Fix the return code CD accesses when the CDROM drive door is closed
 # but the drive isn't yet ready.
@@ -1162,7 +1162,7 @@
 # revert 8b249b6856f16f09b0e5b79ce5f4d435e439b9d6
 ApplyPatch revert-fix-modules_install-via-nfs.patch
 
-ApplyPatch kzalloc-mod_ref-instead-of-wasting-space.patch
+ApplyPatch use-per_cpu-module-references.patch
 # END OF PATCH APPLICATIONS
 
 %endif
@@ -1738,6 +1738,12 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Thu Jan 15 2009 Kyle McMartin <kyle at redhat.com>
+- New version of module_ref patch, uses per_cpu instead.
+- Fix linux-2.6-hdpvr.patch up and re-enable.
+    Nuke .flush, was useless, convert to v4l2_file_operations, fix ioctl ret
+- Fix linux-2.6-debug-taint-vm.patch and re-enable.
+
 * Wed Jan 14 2009 Dave Jones <davej at redhat.com>
 - Test RODATA and NX during bootup.
 


--- kzalloc-mod_ref-instead-of-wasting-space.patch DELETED ---



From pbrobinson at fedoraproject.org  Thu Jan 15 08:53:35 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Thu, 15 Jan 2009 08:53:35 +0000 (UTC)
Subject: rpms/ekiga/devel .cvsignore, 1.17, 1.18 ekiga.spec, 1.69,
	1.70 sources, 1.19, 1.20
Message-ID: <20090115085335.E65607012D@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/ekiga/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29859

Modified Files:
	.cvsignore ekiga.spec sources 
Log Message:
- Regen Makefile.in using autoreconf due to patch


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ekiga/devel/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- .cvsignore	14 Jan 2009 08:56:53 -0000	1.17
+++ .cvsignore	15 Jan 2009 08:53:05 -0000	1.18
@@ -1,2 +1 @@
 ekiga-3.1.0.tar.bz2
-ekiga.desktop


Index: ekiga.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ekiga/devel/ekiga.spec,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- ekiga.spec	14 Jan 2009 08:56:53 -0000	1.69
+++ ekiga.spec	15 Jan 2009 08:53:05 -0000	1.70
@@ -1,10 +1,9 @@
 Summary:	A Gnome based SIP/H323 teleconferencing application
 Name:		ekiga
 Version:	3.1.0
-Release:	7%{?dist}
+Release:	8%{?dist}
 URL:		http://www.ekiga.org/
 Source0:	ftp://ftp.gnome.org/pub/gnome/sources/ekiga/3.1/%{name}-%{version}.tar.bz2
-Source1:	ekiga.desktop
 Patch0:		ekiga-fix-desktop-in.patch
 License:	GPLv2+
 Group:		Applications/Communications
@@ -38,6 +37,8 @@
 BuildRequires:	SDL-devel
 #BuildRequires:	gstreamer-devel
 #BuildRequires:	gstreamer-plugins-base-devel
+#Temp until the next beta
+BuildRequires:	autoconf
 
 Requires(pre):	GConf2
 Requires(post):	GConf2
@@ -54,6 +55,7 @@
 %patch0 -p1 -b .fix-desktop-in
 
 %build
+autoreconf
 CXXFLAGS="$RPM_OPT_FLAGS -DLDAP_DEPRECATED=1 -fPIC"
 %configure --disable-scrollkeeper --enable-xcap
 make %{?_smp_mflags}
@@ -66,10 +68,6 @@
 
 rm -rf $RPM_BUILD_ROOT/var/scrollkeeper
 
-# Temporarily remove the desktop.in.in file and replace with the real thing
-rm -rf $RPM_BUILD_ROOT%{_datadir}/applications/ekiga.desktop.in.in
-cp %{SOURCE1}  $RPM_BUILD_ROOT%{_datadir}/applications/ekiga.desktop
-
 # Replace identical images in the help by links.
 # This reduces the RPM size by several megabytes.
 helpdir=$RPM_BUILD_ROOT%{_datadir}/gnome/help/%{name}
@@ -141,6 +139,9 @@
 %{_sysconfdir}/gconf/schemas/ekiga.schemas
 
 %changelog
+* Thu Jan 15 2009 Peter Robinson <pbrobinson at gmail.com> - 3.1.0-8
+- Regen Makefile.in using autoreconf due to patch
+
 * Wed Jan 14 2009 Peter Robinson <pbrobinson at gmail.com> - 3.1.0-7
 - Another fix
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ekiga/devel/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources	14 Jan 2009 08:56:53 -0000	1.19
+++ sources	15 Jan 2009 08:53:05 -0000	1.20
@@ -1,2 +1 @@
 ec8690ff84b364d2df5b2443a01ba529  ekiga-3.1.0.tar.bz2
-d13f57c9df3344a90697d88490adbf20  ekiga.desktop



From pbrobinson at fedoraproject.org  Thu Jan 15 09:08:29 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Thu, 15 Jan 2009 09:08:29 +0000 (UTC)
Subject: rpms/ekiga/devel ekiga.spec,1.70,1.71
Message-ID: <20090115090829.156237012D@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/ekiga/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32748

Modified Files:
	ekiga.spec 
Log Message:
- Add other buildreq for Makefile regen


Index: ekiga.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ekiga/devel/ekiga.spec,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- ekiga.spec	15 Jan 2009 08:53:05 -0000	1.70
+++ ekiga.spec	15 Jan 2009 09:07:58 -0000	1.71
@@ -1,7 +1,7 @@
 Summary:	A Gnome based SIP/H323 teleconferencing application
 Name:		ekiga
 Version:	3.1.0
-Release:	8%{?dist}
+Release:	9%{?dist}
 URL:		http://www.ekiga.org/
 Source0:	ftp://ftp.gnome.org/pub/gnome/sources/ekiga/3.1/%{name}-%{version}.tar.bz2
 Patch0:		ekiga-fix-desktop-in.patch
@@ -39,6 +39,9 @@
 #BuildRequires:	gstreamer-plugins-base-devel
 #Temp until the next beta
 BuildRequires:	autoconf
+BuildRequires:	libtool
+BuildRequires:	automake
+
 
 Requires(pre):	GConf2
 Requires(post):	GConf2
@@ -139,6 +142,9 @@
 %{_sysconfdir}/gconf/schemas/ekiga.schemas
 
 %changelog
+* Thu Jan 15 2009 Peter Robinson <pbrobinson at gmail.com> - 3.1.0-9
+- Add other buildreq for Makefile regen
+
 * Thu Jan 15 2009 Peter Robinson <pbrobinson at gmail.com> - 3.1.0-8
 - Regen Makefile.in using autoreconf due to patch
 



From tmraz at fedoraproject.org  Thu Jan 15 09:10:25 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Thu, 15 Jan 2009 09:10:25 +0000 (UTC)
Subject: rpms/openssl/devel openssl-0.9.8j-bad-mime.patch, NONE,
	1.1 openssl-0.9.8j-ca-dir.patch, NONE,
	1.1 openssl-0.9.8j-eap-fast.patch, NONE,
	1.1 openssl-0.9.8j-enginesdir.patch, NONE,
	1.1 openssl-0.9.8j-env-nozlib.patch, NONE,
	1.1 openssl-0.9.8j-evp-nonfips.patch, NONE,
	1.1 openssl-0.9.8j-fipscheck-hmac.patch, NONE,
	1.1 openssl-0.9.8j-kernel-fipsmode.patch, NONE,
	1.1 openssl-0.9.8j-nocanister.patch, NONE,
	1.1 openssl-0.9.8j-readme-warning.patch, NONE,
	1.1 openssl-0.9.8j-redhat.patch, NONE,
	1.1 openssl-0.9.8j-shlib-version.patch, NONE,
	1.1 openssl-0.9.8j-soversion.patch, NONE,
	1.1 openssl-0.9.8j-use-fipscheck.patch, NONE,
	1.1 openssl-0.9.8j-version-add-engines.patch, NONE,
	1.1 .cvsignore, 1.16, 1.17 openssl.spec, 1.113, 1.114 sources,
	1.18, 1.19 openssl-0.9.7-beta5-version-add-engines.patch, 1.1,
	NONE openssl-0.9.7f-ca-dir.patch, 1.1,
	NONE openssl-0.9.8g-bn-mul-bug.patch, 1.1,
	NONE openssl-0.9.8g-cve-2008-0891.patch, 1.1,
	NONE openssl-0.9.8g-cve-2008-1671.patch, 1.1,
	NONE openssl-0.9.8g-redhat.patch, 1.1,
	NONE openssl-0.9.8g-shlib-version.patch, 1.1,
	NONE openssl-0.9.8g-soversion.patch, 1.1,
	NONE openssl-0.9.8g-speed-bug.patch, 1.1, NONE
Message-ID: <20090115091026.0642B7012D@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/openssl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv750

Modified Files:
	.cvsignore openssl.spec sources 
Added Files:
	openssl-0.9.8j-bad-mime.patch openssl-0.9.8j-ca-dir.patch 
	openssl-0.9.8j-eap-fast.patch openssl-0.9.8j-enginesdir.patch 
	openssl-0.9.8j-env-nozlib.patch 
	openssl-0.9.8j-evp-nonfips.patch 
	openssl-0.9.8j-fipscheck-hmac.patch 
	openssl-0.9.8j-kernel-fipsmode.patch 
	openssl-0.9.8j-nocanister.patch 
	openssl-0.9.8j-readme-warning.patch 
	openssl-0.9.8j-redhat.patch openssl-0.9.8j-shlib-version.patch 
	openssl-0.9.8j-soversion.patch 
	openssl-0.9.8j-use-fipscheck.patch 
	openssl-0.9.8j-version-add-engines.patch 
Removed Files:
	openssl-0.9.7-beta5-version-add-engines.patch 
	openssl-0.9.7f-ca-dir.patch openssl-0.9.8g-bn-mul-bug.patch 
	openssl-0.9.8g-cve-2008-0891.patch 
	openssl-0.9.8g-cve-2008-1671.patch openssl-0.9.8g-redhat.patch 
	openssl-0.9.8g-shlib-version.patch 
	openssl-0.9.8g-soversion.patch openssl-0.9.8g-speed-bug.patch 
Log Message:
* Thu Jan 15 2009 Tomas Mraz <tmraz at redhat.com> 0.9.8j-1
- new upstream version with necessary soname bump (#455753)
- temporarily provide symlink to old soname to make it possible to rebuild
  the dependent packages in rawhide
- add eap-fast support (#428181)
- add possibility to disable zlib by setting 
- add fips mode support for testing purposes
- do not null dereference on some invalid smime files
- add buildrequires pkgconfig (#479493)


openssl-0.9.8j-bad-mime.patch:

--- NEW FILE openssl-0.9.8j-bad-mime.patch ---
diff -up openssl-0.9.8j/crypto/asn1/asn_mime.c.bad-mime openssl-0.9.8j/crypto/asn1/asn_mime.c
--- openssl-0.9.8j/crypto/asn1/asn_mime.c.bad-mime	2008-08-05 17:56:11.000000000 +0200
+++ openssl-0.9.8j/crypto/asn1/asn_mime.c	2009-01-14 22:08:34.000000000 +0100
@@ -792,6 +792,10 @@ static int mime_hdr_addparam(MIME_HEADER
 static int mime_hdr_cmp(const MIME_HEADER * const *a,
 			const MIME_HEADER * const *b)
 {
+	if ((*a)->name == NULL || (*b)->name == NULL)
+		return (*a)->name - (*b)->name < 0 ? -1 :
+			(*a)->name - (*b)->name > 0 ? 1 : 0;
+
 	return(strcmp((*a)->name, (*b)->name));
 }
 

openssl-0.9.8j-ca-dir.patch:

--- NEW FILE openssl-0.9.8j-ca-dir.patch ---
diff -up openssl-0.9.8j/apps/openssl.cnf.ca-dir openssl-0.9.8j/apps/openssl.cnf
--- openssl-0.9.8j/apps/openssl.cnf.ca-dir	2009-01-13 23:20:10.000000000 +0100
+++ openssl-0.9.8j/apps/openssl.cnf	2009-01-13 23:20:10.000000000 +0100
@@ -34,7 +34,7 @@ default_ca	= CA_default		# The default c
 ####################################################################
 [ CA_default ]
 
-dir		= ./demoCA		# Where everything is kept
+dir		= ../../CA		# Where everything is kept
 certs		= $dir/certs		# Where the issued certs are kept
 crl_dir		= $dir/crl		# Where the issued crl are kept
 database	= $dir/index.txt	# database index file.
diff -up openssl-0.9.8j/apps/CA.sh.ca-dir openssl-0.9.8j/apps/CA.sh
--- openssl-0.9.8j/apps/CA.sh.ca-dir	2005-07-04 23:44:22.000000000 +0200
+++ openssl-0.9.8j/apps/CA.sh	2009-01-13 23:20:10.000000000 +0100
@@ -39,7 +39,7 @@ CA="$OPENSSL ca $SSLEAY_CONFIG"
 VERIFY="$OPENSSL verify"
 X509="$OPENSSL x509"
 
-CATOP=./demoCA
+CATOP=../../CA
 CAKEY=./cakey.pem
 CAREQ=./careq.pem
 CACERT=./cacert.pem
diff -up openssl-0.9.8j/apps/CA.pl.in.ca-dir openssl-0.9.8j/apps/CA.pl.in
--- openssl-0.9.8j/apps/CA.pl.in.ca-dir	2006-04-28 02:28:51.000000000 +0200
+++ openssl-0.9.8j/apps/CA.pl.in	2009-01-13 23:20:10.000000000 +0100
@@ -53,7 +53,7 @@ $VERIFY="$openssl verify";
 $X509="$openssl x509";
 $PKCS12="$openssl pkcs12";
 
-$CATOP="./demoCA";
+$CATOP="../../CA";
 $CAKEY="cakey.pem";
 $CAREQ="careq.pem";
 $CACERT="cacert.pem";

openssl-0.9.8j-eap-fast.patch:

--- NEW FILE openssl-0.9.8j-eap-fast.patch ---
diff -up openssl-0.9.8j/ssl/t1_lib.c.eap-fast openssl-0.9.8j/ssl/t1_lib.c
--- openssl-0.9.8j/ssl/t1_lib.c.eap-fast	2009-01-14 16:39:41.000000000 +0100
+++ openssl-0.9.8j/ssl/t1_lib.c	2009-01-14 21:35:38.000000000 +0100
@@ -106,6 +106,12 @@ int tls1_new(SSL *s)
 
 void tls1_free(SSL *s)
 	{
+#ifndef OPENSSL_NO_TLSEXT
+	if (s && s->tlsext_session_ticket)
+		{
+		OPENSSL_free(s->tlsext_session_ticket);
+		}
+#endif /* OPENSSL_NO_TLSEXT */
 	ssl3_free(s);
 	}
 
@@ -180,8 +186,23 @@ unsigned char *ssl_add_clienthello_tlsex
 		int ticklen;
 		if (s->session && s->session->tlsext_tick)
 			ticklen = s->session->tlsext_ticklen;
+		else if (s->session && s->tlsext_session_ticket &&
+			 s->tlsext_session_ticket->data)
+			{
+			ticklen = s->tlsext_session_ticket->length;
+			s->session->tlsext_tick = OPENSSL_malloc(ticklen);
+			if (!s->session->tlsext_tick)
+				return NULL;
+			memcpy(s->session->tlsext_tick,
+			       s->tlsext_session_ticket->data,
+			       ticklen);
+			s->session->tlsext_ticklen = ticklen;
+			}
 		else
 			ticklen = 0;
+		if (ticklen == 0 && s->tlsext_session_ticket &&
+		    s->tlsext_session_ticket->data == NULL)
+			goto skip_ext;
 		/* Check for enough room 2 for extension type, 2 for len
  		 * rest for ticket
   		 */
@@ -195,6 +216,7 @@ unsigned char *ssl_add_clienthello_tlsex
 			ret += ticklen;
 			}
 		}
+		skip_ext:
 
 	if (s->tlsext_status_type == TLSEXT_STATUSTYPE_ocsp)
 		{
@@ -417,6 +439,15 @@ int ssl_parse_clienthello_tlsext(SSL *s,
 				}
 
 			}
+		else if (type == TLSEXT_TYPE_session_ticket) 
+			{ 
+			if (s->tls_session_ticket_ext_cb && 
+			    !s->tls_session_ticket_ext_cb(s, data, size, s->tls_session_ticket_ext_cb_arg)) 
+				{ 
+				*al = TLS1_AD_INTERNAL_ERROR; 
+				return 0; 
+				} 
+			} 
 		else if (type == TLSEXT_TYPE_status_request
 						&& s->ctx->tlsext_status_cb)
 			{
@@ -563,6 +594,12 @@ int ssl_parse_serverhello_tlsext(SSL *s,
 			}
 		else if (type == TLSEXT_TYPE_session_ticket)
 			{
+			if (s->tls_session_ticket_ext_cb &&
+			    !s->tls_session_ticket_ext_cb(s, data, size, s->tls_session_ticket_ext_cb_arg))
+				{
+				*al = TLS1_AD_INTERNAL_ERROR;
+				return 0;
+				}
 			if ((SSL_get_options(s) & SSL_OP_NO_TICKET)
 				|| (size > 0))
 				{
@@ -786,6 +823,15 @@ int tls1_process_ticket(SSL *s, unsigned
 				s->tlsext_ticket_expected = 1;
 				return 0;	/* Cache miss */
 				}
+			if (s->tls_session_secret_cb)
+				{
+				/* Indicate cache miss here and instead of
+				 * generating the session from ticket now,
+				 * trigger abbreviated handshake based on
+				 * external mechanism to calculate the master
+				 * secret later. */
+				return 0;
+				}
 			return tls_decrypt_ticket(s, p, size, session_id, len,
 									ret);
 			}
diff -up openssl-0.9.8j/ssl/s3_clnt.c.eap-fast openssl-0.9.8j/ssl/s3_clnt.c
--- openssl-0.9.8j/ssl/s3_clnt.c.eap-fast	2009-01-07 11:48:23.000000000 +0100
+++ openssl-0.9.8j/ssl/s3_clnt.c	2009-01-14 21:13:47.000000000 +0100
@@ -759,6 +759,23 @@ int ssl3_get_server_hello(SSL *s)
 		goto f_err;
 		}
 
+#ifndef OPENSSL_NO_TLSEXT
+	/* check if we want to resume the session based on external pre-shared secret */
+	if (s->version >= TLS1_VERSION && s->tls_session_secret_cb)
+		{
+		SSL_CIPHER *pref_cipher=NULL;
+		s->session->master_key_length=sizeof(s->session->master_key);
+		if (s->tls_session_secret_cb(s, s->session->master_key,
+					     &s->session->master_key_length,
+					     NULL, &pref_cipher,
+					     s->tls_session_secret_cb_arg))
+			{
+			s->session->cipher = pref_cipher ?
+				pref_cipher : ssl_get_cipher_by_char(s, p+j);
+			}
+		}
+#endif /* OPENSSL_NO_TLSEXT */
+
 	if (j != 0 && j == s->session->session_id_length
 	    && memcmp(p,s->session->session_id,j) == 0)
 	    {
@@ -2701,11 +2718,8 @@ static int ssl3_check_finished(SSL *s)
 	{
 	int ok;
 	long n;
-	/* If we have no ticket or session ID is non-zero length (a match of
-	 * a non-zero session length would never reach here) it cannot be a
-	 * resumed session.
-	 */
-	if (!s->session->tlsext_tick || s->session->session_id_length)
+	/* If we have no ticket it cannot be a resumed session. */
+	if (!s->session->tlsext_tick)
 		return 1;
 	/* this function is called when we really expect a Certificate
 	 * message, so permit appropriate message length */
diff -up openssl-0.9.8j/ssl/ssl_sess.c.eap-fast openssl-0.9.8j/ssl/ssl_sess.c
--- openssl-0.9.8j/ssl/ssl_sess.c.eap-fast	2008-06-04 20:35:27.000000000 +0200
+++ openssl-0.9.8j/ssl/ssl_sess.c	2009-01-14 21:13:47.000000000 +0100
@@ -707,6 +707,61 @@ long SSL_CTX_get_timeout(const SSL_CTX *
 	return(s->session_timeout);
 	}
 
+#ifndef OPENSSL_NO_TLSEXT
+int SSL_set_session_secret_cb(SSL *s, int (*tls_session_secret_cb)(SSL *s, void *secret, int *secret_len,
+	STACK_OF(SSL_CIPHER) *peer_ciphers, SSL_CIPHER **cipher, void *arg), void *arg)
+	{
+	if (s == NULL) return(0);
+	s->tls_session_secret_cb = tls_session_secret_cb;
+	s->tls_session_secret_cb_arg = arg;
+	return(1);
+	}
+
+int SSL_set_session_ticket_ext_cb(SSL *s, tls_session_ticket_ext_cb_fn cb,
+				  void *arg)
+	{
+	if (s == NULL) return(0);
+	s->tls_session_ticket_ext_cb = cb;
+	s->tls_session_ticket_ext_cb_arg = arg;
+	return(1);
+	}
+
+int SSL_set_session_ticket_ext(SSL *s, void *ext_data, int ext_len)
+	{
+	if (s->version >= TLS1_VERSION)
+		{
+		if (s->tlsext_session_ticket)
+			{
+			OPENSSL_free(s->tlsext_session_ticket);
+			s->tlsext_session_ticket = NULL;
+			}
+
+		s->tlsext_session_ticket = OPENSSL_malloc(sizeof(TLS_SESSION_TICKET_EXT) + ext_len);
+		if (!s->tlsext_session_ticket)
+			{
+			SSLerr(SSL_F_SSL_SET_SESSION_TICKET_EXT, ERR_R_MALLOC_FAILURE);
+			return 0;
+			}
+
+		if (ext_data)
+			{
+			s->tlsext_session_ticket->length = ext_len;
+			s->tlsext_session_ticket->data = s->tlsext_session_ticket + 1;
+			memcpy(s->tlsext_session_ticket->data, ext_data, ext_len);
+			}
+		else
+			{
+			s->tlsext_session_ticket->length = 0;
+			s->tlsext_session_ticket->data = NULL;
+			}
+
+		return 1;
+		}
+
+	return 0;
+	}
+#endif /* OPENSSL_NO_TLSEXT */
+
 typedef struct timeout_param_st
 	{
 	SSL_CTX *ctx;
diff -up openssl-0.9.8j/ssl/s3_srvr.c.eap-fast openssl-0.9.8j/ssl/s3_srvr.c
--- openssl-0.9.8j/ssl/s3_srvr.c.eap-fast	2009-01-07 11:48:23.000000000 +0100
+++ openssl-0.9.8j/ssl/s3_srvr.c	2009-01-14 21:22:37.000000000 +0100
@@ -965,6 +965,59 @@ int ssl3_get_client_hello(SSL *s)
 			SSLerr(SSL_F_SSL3_GET_CLIENT_HELLO,SSL_R_CLIENTHELLO_TLSEXT);
 			goto err;
 		}
+
+	/* Check if we want to use external pre-shared secret for this
+	 * handshake for not reused session only. We need to generate
+	 * server_random before calling tls_session_secret_cb in order to allow
+	 * SessionTicket processing to use it in key derivation. */
+	{
+		unsigned long Time;
+		unsigned char *pos;
+		Time=(unsigned long)time(NULL);			/* Time */
+		pos=s->s3->server_random;
+		l2n(Time,pos);
+		if (RAND_pseudo_bytes(pos,SSL3_RANDOM_SIZE-4) <= 0)
+			{
+			al=SSL_AD_INTERNAL_ERROR;
+			goto f_err;
+			}
+	}
+
+	if (!s->hit && s->version >= TLS1_VERSION && s->tls_session_secret_cb)
+		{
+		SSL_CIPHER *pref_cipher=NULL;
+
+		s->session->master_key_length=sizeof(s->session->master_key);
+		if(s->tls_session_secret_cb(s, s->session->master_key, &s->session->master_key_length,
+			ciphers, &pref_cipher, s->tls_session_secret_cb_arg))
+			{
+			s->hit=1;
+			s->session->ciphers=ciphers;
+			s->session->verify_result=X509_V_OK;
+
+			ciphers=NULL;
+
+			/* check if some cipher was preferred by call back */
+			pref_cipher=pref_cipher ? pref_cipher : ssl3_choose_cipher(s, s->session->ciphers, SSL_get_ciphers(s));
+			if (pref_cipher == NULL)
+				{
+				al=SSL_AD_HANDSHAKE_FAILURE;
+				SSLerr(SSL_F_SSL3_GET_CLIENT_HELLO,SSL_R_NO_SHARED_CIPHER);
+				goto f_err;
+				}
+
+			s->session->cipher=pref_cipher;
+
+			if (s->cipher_list)
+				sk_SSL_CIPHER_free(s->cipher_list);
+
+			if (s->cipher_list_by_id)
+				sk_SSL_CIPHER_free(s->cipher_list_by_id);
+
+			s->cipher_list = sk_SSL_CIPHER_dup(s->session->ciphers);
+			s->cipher_list_by_id = sk_SSL_CIPHER_dup(s->session->ciphers);
+			}
+		}
 #endif
 	/* Worst case, we will use the NULL compression, but if we have other
 	 * options, we will now look for them.  We have i-1 compression
@@ -1103,16 +1156,22 @@ int ssl3_send_server_hello(SSL *s)
 	unsigned char *buf;
 	unsigned char *p,*d;
 	int i,sl;
-	unsigned long l,Time;
+	unsigned long l;
+#ifdef OPENSSL_NO_TLSEXT
+	unsigned long Time;
+#endif
 
 	if (s->state == SSL3_ST_SW_SRVR_HELLO_A)
 		{
 		buf=(unsigned char *)s->init_buf->data;
+#ifdef OPENSSL_NO_TLSEXT
 		p=s->s3->server_random;
+		/* Generate server_random if it was not needed previously */
 		Time=(unsigned long)time(NULL);			/* Time */
 		l2n(Time,p);
 		if (RAND_pseudo_bytes(p,SSL3_RANDOM_SIZE-4) <= 0)
 			return -1;
+#endif
 		/* Do the message type and length last */
 		d=p= &(buf[4]);
 
diff -up openssl-0.9.8j/ssl/tls1.h.eap-fast openssl-0.9.8j/ssl/tls1.h
--- openssl-0.9.8j/ssl/tls1.h.eap-fast	2009-01-14 16:39:41.000000000 +0100
+++ openssl-0.9.8j/ssl/tls1.h	2009-01-14 21:13:47.000000000 +0100
@@ -398,6 +398,13 @@ SSL_CTX_callback_ctrl(ssl,SSL_CTRL_SET_T
 #define TLS_MD_MASTER_SECRET_CONST    "\x6d\x61\x73\x74\x65\x72\x20\x73\x65\x63\x72\x65\x74"  /*master secret*/
 #endif
 
+/* TLS Session Ticket extension struct */
+struct tls_session_ticket_ext_st
+	{
+	unsigned short length;
+	void *data;
+	};
+
 #ifdef  __cplusplus
 }
 #endif
diff -up openssl-0.9.8j/ssl/ssl_err.c.eap-fast openssl-0.9.8j/ssl/ssl_err.c
--- openssl-0.9.8j/ssl/ssl_err.c.eap-fast	2008-08-13 21:44:44.000000000 +0200
+++ openssl-0.9.8j/ssl/ssl_err.c	2009-01-14 21:13:47.000000000 +0100
@@ -253,6 +253,7 @@ static ERR_STRING_DATA SSL_str_functs[]=
 {ERR_FUNC(SSL_F_TLS1_ENC),	"TLS1_ENC"},
 {ERR_FUNC(SSL_F_TLS1_SETUP_KEY_BLOCK),	"TLS1_SETUP_KEY_BLOCK"},
 {ERR_FUNC(SSL_F_WRITE_PENDING),	"WRITE_PENDING"},
+{ERR_FUNC(SSL_F_SSL_SET_SESSION_TICKET_EXT), "SSL_set_session_ticket_ext"},
 {0,NULL}
 	};
 
diff -up openssl-0.9.8j/ssl/ssl.h.eap-fast openssl-0.9.8j/ssl/ssl.h
--- openssl-0.9.8j/ssl/ssl.h.eap-fast	2009-01-14 16:39:41.000000000 +0100
+++ openssl-0.9.8j/ssl/ssl.h	2009-01-14 21:26:45.000000000 +0100
@@ -344,6 +344,7 @@ extern "C" {
  * 'struct ssl_st *' function parameters used to prototype callbacks
  * in SSL_CTX. */
 typedef struct ssl_st *ssl_crock_st;
+typedef struct tls_session_ticket_ext_st TLS_SESSION_TICKET_EXT;
 
 /* used to hold info on the particular ciphers used */
 typedef struct ssl_cipher_st
@@ -362,6 +363,9 @@ typedef struct ssl_cipher_st
 
 DECLARE_STACK_OF(SSL_CIPHER)
 
+typedef int (*tls_session_ticket_ext_cb_fn)(SSL *s, const unsigned char *data, int len, void *arg);
+typedef int (*tls_session_secret_cb_fn)(SSL *s, void *secret, int *secret_len, STACK_OF(SSL_CIPHER) *peer_ciphers, SSL_CIPHER **cipher, void *arg);
+
 /* Used to hold functions for SSLv2 or SSLv3/TLSv1 functions */
 typedef struct ssl_method_st
 	{
@@ -1034,6 +1038,18 @@ struct ssl_st
 
 	/* RFC4507 session ticket expected to be received or sent */
 	int tlsext_ticket_expected;
+
+	/* TLS Session Ticket extension override */ 
+	TLS_SESSION_TICKET_EXT *tlsext_session_ticket; 
+
+	/* TLS Session Ticket extension callback */ 
+	tls_session_ticket_ext_cb_fn tls_session_ticket_ext_cb; 
+	void *tls_session_ticket_ext_cb_arg; 
+
+	/* TLS pre-shared secret session resumption */ 
+	tls_session_secret_cb_fn tls_session_secret_cb; 
+	void *tls_session_secret_cb_arg; 
+
 	SSL_CTX * initial_ctx; /* initial ctx, used to store sessions */
 #define session_ctx initial_ctx
 #else
@@ -1624,6 +1640,15 @@ void *SSL_COMP_get_compression_methods(v
 int SSL_COMP_add_compression_method(int id,void *cm);
 #endif
 
+/* TLS extensions functions */
+int SSL_set_session_ticket_ext(SSL *s, void *ext_data, int ext_len);
+
+int SSL_set_session_ticket_ext_cb(SSL *s, tls_session_ticket_ext_cb_fn cb,
+				  void *arg);
+
+/* Pre-shared secret session resumption functions */
+int SSL_set_session_secret_cb(SSL *s, tls_session_secret_cb_fn tls_session_secret_cb, void *arg);
+
 /* BEGIN ERROR CODES */
 /* The following lines are auto generated by the script mkerr.pl. Any changes
  * made after this point may be overwritten when the script is next run.
@@ -1816,6 +1841,7 @@ void ERR_load_SSL_strings(void);
 #define SSL_F_TLS1_ENC					 210
 #define SSL_F_TLS1_SETUP_KEY_BLOCK			 211
 #define SSL_F_WRITE_PENDING				 212
+#define SSL_F_SSL_SET_SESSION_TICKET_EXT		 213
 
 /* Reason codes. */
 #define SSL_R_APP_DATA_IN_HANDSHAKE			 100

openssl-0.9.8j-enginesdir.patch:

--- NEW FILE openssl-0.9.8j-enginesdir.patch ---
diff -up openssl-0.9.8j/Configure.enginesdir openssl-0.9.8j/Configure
--- openssl-0.9.8j/Configure.enginesdir	2009-01-13 23:17:40.000000000 +0100
+++ openssl-0.9.8j/Configure	2009-01-13 23:17:40.000000000 +0100
@@ -577,6 +577,7 @@ my $idx_arflags = $idx++;
 
 my $prefix="";
 my $openssldir="";
+my $enginesdir="";
 my $exe_ext="";
 my $install_prefix="";
 my $fipslibdir="/usr/local/ssl/fips-1.0/lib/";
@@ -815,6 +816,10 @@ PROCESS_ARGS:
 				{
 				$openssldir=$1;
 				}
+			elsif (/^--enginesdir=(.*)$/)
+				{
+				$enginesdir=$1;
+				}
 			elsif (/^--install.prefix=(.*)$/)
 				{
 				$install_prefix=$1;
@@ -1080,7 +1085,7 @@ chop $prefix if $prefix =~ /.\/$/;
 
 $openssldir=$prefix . "/ssl" if $openssldir eq "";
 $openssldir=$prefix . "/" . $openssldir if $openssldir !~ /(^\/|^[a-zA-Z]:[\\\/])/;
-
+$enginesdir="$prefix/lib/engines" if $enginesdir eq "";
 
 print "IsMK1MF=$IsMK1MF\n";
 
@@ -1635,7 +1640,7 @@ while (<IN>)
 	if	(/^#define\s+OPENSSLDIR/)
 		{ print OUT "#define OPENSSLDIR \"$openssldir\"\n"; }
 	elsif	(/^#define\s+ENGINESDIR/)
-		{ print OUT "#define ENGINESDIR \"$prefix/lib/engines\"\n"; }
+		{ print OUT "#define ENGINESDIR \"$enginesdir\"\n"; }
 	elsif	(/^#((define)|(undef))\s+OPENSSL_EXPORT_VAR_AS_FUNCTION/)
 		{ printf OUT "#undef OPENSSL_EXPORT_VAR_AS_FUNCTION\n"
 			if $export_var_as_fn;

openssl-0.9.8j-env-nozlib.patch:

--- NEW FILE openssl-0.9.8j-env-nozlib.patch ---
Do not implicitly load the zlib support if OPENSSL_NO_DEFAULT_ZLIB is set.
diff -up openssl-0.9.8j/ssl/ssl_ciph.c.env-nozlib openssl-0.9.8j/ssl/ssl_ciph.c
--- openssl-0.9.8j/ssl/ssl_ciph.c.env-nozlib	2009-01-05 15:43:07.000000000 +0100
+++ openssl-0.9.8j/ssl/ssl_ciph.c	2009-01-14 17:47:46.000000000 +0100
@@ -287,7 +287,7 @@ static void load_builtin_compressions(vo
 
 			MemCheck_off();
 			ssl_comp_methods=sk_SSL_COMP_new(sk_comp_cmp);
-			if (ssl_comp_methods != NULL)
+			if (ssl_comp_methods != NULL && getenv("OPENSSL_NO_DEFAULT_ZLIB") == NULL)
 				{
 				comp=(SSL_COMP *)OPENSSL_malloc(sizeof(SSL_COMP));
 				if (comp != NULL)

openssl-0.9.8j-evp-nonfips.patch:

--- NEW FILE openssl-0.9.8j-evp-nonfips.patch ---
diff -up openssl-0.9.8j/crypto/evp/c_alld.c.evp-nonfips openssl-0.9.8j/crypto/evp/c_alld.c
--- openssl-0.9.8j/crypto/evp/c_alld.c.evp-nonfips	2005-04-30 23:51:40.000000000 +0200
+++ openssl-0.9.8j/crypto/evp/c_alld.c	2009-01-14 17:51:41.000000000 +0100
@@ -64,6 +64,11 @@
 
 void OpenSSL_add_all_digests(void)
 	{
+#ifdef OPENSSL_FIPS
+	OPENSSL_init();
+	if (!FIPS_mode())
+		{
+#endif
 #ifndef OPENSSL_NO_MD2
 	EVP_add_digest(EVP_md2());
 #endif
@@ -111,4 +116,32 @@ void OpenSSL_add_all_digests(void)
 	EVP_add_digest(EVP_sha384());
 	EVP_add_digest(EVP_sha512());
 #endif
+#ifdef OPENSSL_FIPS
+		}
+	else
+		{
+#ifndef OPENSSL_NO_SHA
+	EVP_add_digest(EVP_sha1());
+	EVP_add_digest_alias(SN_sha1,"ssl3-sha1");
+	EVP_add_digest_alias(SN_sha1WithRSAEncryption,SN_sha1WithRSA);
+#ifndef OPENSSL_NO_DSA
+	EVP_add_digest(EVP_dss1());
+	EVP_add_digest_alias(SN_dsaWithSHA1,SN_dsaWithSHA1_2);
+	EVP_add_digest_alias(SN_dsaWithSHA1,"DSS1");
+	EVP_add_digest_alias(SN_dsaWithSHA1,"dss1");
+#endif
+#ifndef OPENSSL_NO_ECDSA
+	EVP_add_digest(EVP_ecdsa());
+#endif
+#endif
+#ifndef OPENSSL_NO_SHA256
+	EVP_add_digest(EVP_sha224());
+	EVP_add_digest(EVP_sha256());
+#endif
+#ifndef OPENSSL_NO_SHA512
+	EVP_add_digest(EVP_sha384());
+	EVP_add_digest(EVP_sha512());
+#endif
+		}
+#endif
 	}
diff -up openssl-0.9.8j/crypto/evp/c_allc.c.evp-nonfips openssl-0.9.8j/crypto/evp/c_allc.c
--- openssl-0.9.8j/crypto/evp/c_allc.c.evp-nonfips	2007-04-24 01:50:04.000000000 +0200
+++ openssl-0.9.8j/crypto/evp/c_allc.c	2009-01-14 17:51:41.000000000 +0100
@@ -65,6 +65,11 @@
 void OpenSSL_add_all_ciphers(void)
 	{
 
+#ifdef OPENSSL_FIPS
+	OPENSSL_init();
+	if(!FIPS_mode()) 
+		{
+#endif
 #ifndef OPENSSL_NO_DES
 	EVP_add_cipher(EVP_des_cfb());
 	EVP_add_cipher(EVP_des_cfb1());
@@ -219,6 +224,63 @@ void OpenSSL_add_all_ciphers(void)
 	EVP_add_cipher_alias(SN_camellia_256_cbc,"CAMELLIA256");
 	EVP_add_cipher_alias(SN_camellia_256_cbc,"camellia256");
 #endif
+#ifdef OPENSSL_FIPS
+		}
+	else
+		{
+#ifndef OPENSSL_NO_DES
+	EVP_add_cipher(EVP_des_ede_cfb());
+	EVP_add_cipher(EVP_des_ede3_cfb());
+
+	EVP_add_cipher(EVP_des_ede_ofb());
+	EVP_add_cipher(EVP_des_ede3_ofb());
+
+	EVP_add_cipher(EVP_des_ede_cbc());
+	EVP_add_cipher(EVP_des_ede3_cbc());
+	EVP_add_cipher_alias(SN_des_ede3_cbc,"DES3");
+	EVP_add_cipher_alias(SN_des_ede3_cbc,"des3");
+
+	EVP_add_cipher(EVP_des_ede());
+	EVP_add_cipher(EVP_des_ede3());
+#endif
+
+#ifndef OPENSSL_NO_AES
+	EVP_add_cipher(EVP_aes_128_ecb());
+	EVP_add_cipher(EVP_aes_128_cbc());
+	EVP_add_cipher(EVP_aes_128_cfb());
+	EVP_add_cipher(EVP_aes_128_cfb1());
+	EVP_add_cipher(EVP_aes_128_cfb8());
+	EVP_add_cipher(EVP_aes_128_ofb());
+#if 0
+	EVP_add_cipher(EVP_aes_128_ctr());
+#endif
+	EVP_add_cipher_alias(SN_aes_128_cbc,"AES128");
+	EVP_add_cipher_alias(SN_aes_128_cbc,"aes128");
+	EVP_add_cipher(EVP_aes_192_ecb());
+	EVP_add_cipher(EVP_aes_192_cbc());
+	EVP_add_cipher(EVP_aes_192_cfb());
+	EVP_add_cipher(EVP_aes_192_cfb1());
+	EVP_add_cipher(EVP_aes_192_cfb8());
+	EVP_add_cipher(EVP_aes_192_ofb());
+#if 0
+	EVP_add_cipher(EVP_aes_192_ctr());
+#endif
+	EVP_add_cipher_alias(SN_aes_192_cbc,"AES192");
+	EVP_add_cipher_alias(SN_aes_192_cbc,"aes192");
+	EVP_add_cipher(EVP_aes_256_ecb());
+	EVP_add_cipher(EVP_aes_256_cbc());
+	EVP_add_cipher(EVP_aes_256_cfb());
+	EVP_add_cipher(EVP_aes_256_cfb1());
+	EVP_add_cipher(EVP_aes_256_cfb8());
+	EVP_add_cipher(EVP_aes_256_ofb());
+#if 0
+	EVP_add_cipher(EVP_aes_256_ctr());
+#endif
+	EVP_add_cipher_alias(SN_aes_256_cbc,"AES256");
+	EVP_add_cipher_alias(SN_aes_256_cbc,"aes256");
+#endif
+		}
+#endif
 
 	PKCS12_PBE_add();
 	PKCS5_PBE_add();

openssl-0.9.8j-fipscheck-hmac.patch:

--- NEW FILE openssl-0.9.8j-fipscheck-hmac.patch ---
Produce fipscheck compatible HMAC-SHA256 with the fips_standalone_sha1 binary.
We use the binary just during the OpenSSL build to checksum the libcrypto.
diff -up openssl-0.9.8j/fips/sha/Makefile.fipscheck-hmac openssl-0.9.8j/fips/sha/Makefile
--- openssl-0.9.8j/fips/sha/Makefile.fipscheck-hmac	2008-10-26 19:42:05.000000000 +0100
+++ openssl-0.9.8j/fips/sha/Makefile	2009-01-14 16:39:41.000000000 +0100
@@ -46,7 +46,7 @@ lib:	$(LIBOBJ)
 	@echo $(LIBOBJ) > lib
 
 ../fips_standalone_sha1$(EXE_EXT): fips_standalone_sha1.o
-	FIPS_SHA_ASM=""; for i in $(SHA1_ASM_OBJ) sha1dgst.o ; do FIPS_SHA_ASM="$$FIPS_SHA_ASM ../../crypto/sha/$$i" ; done; \
+	FIPS_SHA_ASM=""; for i in $(SHA1_ASM_OBJ) sha256.o ; do FIPS_SHA_ASM="$$FIPS_SHA_ASM ../../crypto/sha/$$i" ; done; \
 	$(CC) -o $@ $(CFLAGS) fips_standalone_sha1.o $$FIPS_SHA_ASM
 
 files:
diff -up openssl-0.9.8j/fips/sha/fips_standalone_sha1.c.fipscheck-hmac openssl-0.9.8j/fips/sha/fips_standalone_sha1.c
--- openssl-0.9.8j/fips/sha/fips_standalone_sha1.c.fipscheck-hmac	2008-09-16 12:12:23.000000000 +0200
+++ openssl-0.9.8j/fips/sha/fips_standalone_sha1.c	2009-01-14 17:07:56.000000000 +0100
@@ -62,7 +62,7 @@ void OPENSSL_cleanse(void *p,size_t len)
 
 #ifdef OPENSSL_FIPS
 
-static void hmac_init(SHA_CTX *md_ctx,SHA_CTX *o_ctx,
+static void hmac_init(SHA256_CTX *md_ctx,SHA256_CTX *o_ctx,
 		      const char *key)
     {
     int len=strlen(key);
@@ -72,10 +72,10 @@ static void hmac_init(SHA_CTX *md_ctx,SH
 
     if (len > SHA_CBLOCK)
 	{
-	SHA1_Init(md_ctx);
-	SHA1_Update(md_ctx,key,len);
-	SHA1_Final(keymd,md_ctx);
-	len=20;
+	SHA256_Init(md_ctx);
+	SHA256_Update(md_ctx,key,len);
+	SHA256_Final(keymd,md_ctx);
+	len=SHA256_DIGEST_LENGTH;
 	}
     else
 	memcpy(keymd,key,len);
@@ -83,22 +83,22 @@ static void hmac_init(SHA_CTX *md_ctx,SH
 
     for(i=0 ; i < HMAC_MAX_MD_CBLOCK ; i++)
 	pad[i]=0x36^keymd[i];
-    SHA1_Init(md_ctx);
-    SHA1_Update(md_ctx,pad,SHA_CBLOCK);
+    SHA256_Init(md_ctx);
+    SHA256_Update(md_ctx,pad,SHA256_CBLOCK);
 
     for(i=0 ; i < HMAC_MAX_MD_CBLOCK ; i++)
 	pad[i]=0x5c^keymd[i];
-    SHA1_Init(o_ctx);
-    SHA1_Update(o_ctx,pad,SHA_CBLOCK);
+    SHA256_Init(o_ctx);
+    SHA256_Update(o_ctx,pad,SHA256_CBLOCK);
     }
 
-static void hmac_final(unsigned char *md,SHA_CTX *md_ctx,SHA_CTX *o_ctx)
+static void hmac_final(unsigned char *md,SHA256_CTX *md_ctx,SHA256_CTX *o_ctx)
     {
-    unsigned char buf[20];
+    unsigned char buf[SHA256_DIGEST_LENGTH];
 
-    SHA1_Final(buf,md_ctx);
-    SHA1_Update(o_ctx,buf,sizeof buf);
-    SHA1_Final(md,o_ctx);
+    SHA256_Final(buf,md_ctx);
+    SHA256_Update(o_ctx,buf,sizeof buf);
+    SHA256_Final(md,o_ctx);
     }
 
 #endif
@@ -106,7 +106,7 @@ static void hmac_final(unsigned char *md
 int main(int argc,char **argv)
     {
 #ifdef OPENSSL_FIPS
-    static char key[]="etaonrishdlcupfm";
+    static char key[]="orboDeJITITejsirpADONivirpUkvarP";
     int n,binary=0;
 
     if(argc < 2)
@@ -125,8 +125,8 @@ int main(int argc,char **argv)
     for(; n < argc ; ++n)
 	{
 	FILE *f=fopen(argv[n],"rb");
-	SHA_CTX md_ctx,o_ctx;
-	unsigned char md[20];
+	SHA256_CTX md_ctx,o_ctx;
+	unsigned char md[SHA256_DIGEST_LENGTH];
 	int i;
 
 	if(!f)
@@ -139,7 +139,7 @@ int main(int argc,char **argv)
 	for( ; ; )
 	    {
 	    char buf[1024];
-	    int l=fread(buf,1,sizeof buf,f);
+	    size_t l=fread(buf,1,sizeof buf,f);
 
 	    if(l == 0)
 		{
@@ -151,18 +151,18 @@ int main(int argc,char **argv)
 		else
 		    break;
 		}
-	    SHA1_Update(&md_ctx,buf,l);
+	    SHA256_Update(&md_ctx,buf,l);
 	    }
 	hmac_final(md,&md_ctx,&o_ctx);
 
 	if (binary)
 	    {
-	    fwrite(md,20,1,stdout);
+	    fwrite(md,SHA256_DIGEST_LENGTH,1,stdout);
 	    break;	/* ... for single(!) file */
 	    }
 
-	printf("HMAC-SHA1(%s)= ",argv[n]);
-	for(i=0 ; i < 20 ; ++i)
+/*	printf("HMAC-SHA1(%s)= ",argv[n]); */
+	for(i=0 ; i < SHA256_DIGEST_LENGTH ; ++i)
 	    printf("%02x",md[i]);
 	printf("\n");
 	}

openssl-0.9.8j-kernel-fipsmode.patch:

--- NEW FILE openssl-0.9.8j-kernel-fipsmode.patch ---
diff -up openssl-0.9.8j/crypto/o_init.c.fipsmode openssl-0.9.8j/crypto/o_init.c
--- openssl-0.9.8j/crypto/o_init.c.fipsmode	2008-11-05 19:36:36.000000000 +0100
+++ openssl-0.9.8j/crypto/o_init.c	2009-01-14 17:57:39.000000000 +0100
@@ -59,6 +59,45 @@
 #include <e_os.h>
 #include <openssl/err.h>
 
+#ifdef OPENSSL_FIPS
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <unistd.h>
+#include <errno.h>
+#include <stdlib.h>
+#include <openssl/fips.h>
+#include <openssl/evp.h>
+#include <openssl/rand.h>
+
+#define FIPS_MODE_SWITCH_FILE "/proc/sys/crypto/fips_enabled"
+
+static void init_fips_mode(void)
+	{
+	char buf[2] = "0";
+	int fd;
+	
+	if (getenv("OPENSSL_FORCE_FIPS_MODE") != NULL)
+		{
+		buf[0] = '1';
+		}
+	else if ((fd = open(FIPS_MODE_SWITCH_FILE, O_RDONLY)) >= 0)
+		{
+		while (read(fd, buf, sizeof(buf)) < 0 && errno == EINTR);
+		close(fd);
+		}
+	/* Failure reading the fips mode switch file means just not
+	 * switching into FIPS mode. We would break too many things
+	 * otherwise. 
+	 */
+	
+	if (buf[0] == '1')
+		{
+		FIPS_mode_set(1);
+		}
+	}
+#endif
+
 /* Perform any essential OpenSSL initialization operations.
  * Currently only sets FIPS callbacks
  */
@@ -73,11 +112,10 @@ void OPENSSL_init(void)
 #ifdef CRYPTO_MDEBUG
 		CRYPTO_malloc_debug_init();
 #endif
-#ifdef OPENSSL_ENGINE
+		init_fips_mode();
 		int_EVP_MD_init_engine_callbacks();
 		int_EVP_CIPHER_init_engine_callbacks();
 		int_RAND_init_engine_callbacks();
-#endif
 		done = 1;
 		}
 #endif

openssl-0.9.8j-nocanister.patch:

--- NEW FILE openssl-0.9.8j-nocanister.patch ---
Do not create a fipscanister.o, add the objects directly.
diff -up openssl-0.9.8j/fips/Makefile.nocanister openssl-0.9.8j/fips/Makefile
--- openssl-0.9.8j/fips/Makefile.nocanister	2009-01-13 18:26:15.000000000 +0100
+++ openssl-0.9.8j/fips/Makefile	2009-01-13 21:43:43.000000000 +0100
@@ -142,8 +142,24 @@ lib:	$(LIB)
 	if [ "$(FIPSCANISTERINTERNAL)" = "n" -a -n "$(FIPSCANLOC)" ]; then $(AR) ../$(FIPSCANLIB).a $(FIPSCANLOC); fi
 	@touch lib
 
-$(LIB):	$(FIPSLIBDIR)fipscanister.o
-	$(AR) $(LIB) $(FIPSLIBDIR)fipscanister.o
+$(LIB):	$(LIBOBJ) $(FIPS_OBJ_LISTS)
+	FIPS_ASM=""; \
+	list="$(BN_ASM)"; for i in $$list; do FIPS_ASM="$$FIPS_ASM ../crypto/bn/$$i" ; done; \
+	list="$(AES_ASM_OBJ)"; for i in $$list; do FIPS_ASM="$$FIPS_ASM ../crypto/aes/$$i" ; done; \
+	list="$(DES_ENC)"; for i in $$list; do FIPS_ASM="$$FIPS_ASM ../crypto/des/$$i" ; done; \
+	list="$(SHA1_ASM_OBJ)"; for i in $$list; do FIPS_ASM="$$FIPS_ASM ../crypto/sha/$$i" ; done; \
+	if [ -n "$(CPUID_OBJ)" ]; then \
+		CPUID=../crypto/$(CPUID_OBJ) ; \
+	else \
+		CPUID="" ; \
+	fi ; \
+	objs="$(LIBOBJ) $(FIPS_EX_OBJ) $$CPUID $$FIPS_ASM"; \
+	for i in $(FIPS_OBJ_LISTS); do \
+		dir=`dirname $$i`; script="s|^|$$dir/|;s| | $$dir/|g"; \
+		objs="$$objs `sed "$$script" $$i`"; \
+	done; \
+	objs="$$objs" ; \
+	$(AR) $(LIB) $$objs 
 	$(RANLIB) $(LIB) || echo Never mind.
 
 $(FIPSCANLIB):	$(FIPSCANLOC)

openssl-0.9.8j-readme-warning.patch:

--- NEW FILE openssl-0.9.8j-readme-warning.patch ---
diff -up openssl-0.9.8j/README.warning openssl-0.9.8j/README
--- openssl-0.9.8j/README.warning	2009-01-07 11:50:53.000000000 +0100
+++ openssl-0.9.8j/README	2009-01-14 17:43:02.000000000 +0100
@@ -5,6 +5,31 @@
  Copyright (c) 1995-1998 Eric A. Young, Tim J. Hudson
  All rights reserved.
 
+ WARNING
+ -------
+
+ This version of OpenSSL is built in a way that supports operation in
+ the so called FIPS mode. Note though that the library as we build it
+ is not FIPS validated and the FIPS mode is present for testing purposes
+ only.
+ 
+ This version also contains a few differences from the upstream code
+ some of which are:
+   * The FIPS integrity verification check is implemented differently
+     from the upstream FIPS validated OpenSSL module. It verifies
+     HMAC-SHA256 checksum of the whole libcrypto shared library.
+   * The module respects the kernel FIPS flag /proc/sys/crypto/fips and
+     tries to initialize the FIPS mode if it is set to 1 aborting if the
+     FIPS mode could not be initialized. It is also possible to force the
+     OpenSSL library to FIPS mode especially for debugging purposes by
+     setting the environment variable OPENSSL_FORCE_FIPS_MODE.
+   * If the environment variable OPENSSL_NO_DEFAULT_ZLIB is set the module
+     will not automatically load the built in compression method ZLIB
+     when initialized. Applications can still explicitely ask for ZLIB
+     compression method.
+   * There is added a support for EAP-FAST through TLS extension. This code
+     is backported from OpenSSL upstream development branch.
+
  DESCRIPTION
  -----------
 

openssl-0.9.8j-redhat.patch:

--- NEW FILE openssl-0.9.8j-redhat.patch ---
diff -up openssl-0.9.8j/Configure.redhat openssl-0.9.8j/Configure
--- openssl-0.9.8j/Configure.redhat	2008-12-29 01:18:23.000000000 +0100
+++ openssl-0.9.8j/Configure	2009-01-13 14:03:54.000000000 +0100
@@ -320,28 +320,28 @@ my %table=(
 ####
 # *-generic* is endian-neutral target, but ./config is free to
 # throw in -D[BL]_ENDIAN, whichever appropriate...
-"linux-generic32","gcc:-DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-"linux-ppc",	"gcc:-DB_ENDIAN -DTERMIO -O3 -Wall::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_RISC1 DES_UNROLL::linux_ppc32.o::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"linux-generic32","gcc:-DTERMIO -Wall \$(RPM_OPT_FLAGS)::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${no_asm}:dlfcn:linux-shared:-fPIC:\$(RPM_OPT_FLAGS):.so.\$(SHLIB_SONAMEVER)",
+"linux-ppc",	"gcc:-DB_ENDIAN -DTERMIO -Wall \$(RPM_OPT_FLAGS)::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_RISC1 DES_UNROLL::linux_ppc32.o::::::::::dlfcn:linux-shared:-fPIC:\$(RPM_OPT_FLAGS):.so.\$(SHLIB_SONAMEVER)",
 #### IA-32 targets...
 "linux-ia32-icc",	"icc:-DL_ENDIAN -DTERMIO -O2 -no_cpprt::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-KPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-"linux-elf",	"gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"linux-elf",	"gcc:-DL_ENDIAN -DTERMIO -Wall \$(RPM_OPT_FLAGS)::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC:\$(RPM_OPT_FLAGS):.so.\$(SHLIB_SONAMEVER)",
 "linux-aout",	"gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -march=i486 -Wall::(unknown):::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_out_asm}",
 ####
-"linux-generic64","gcc:-DTERMIO -O3 -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-"linux-ppc64",	"gcc:-m64 -DB_ENDIAN -DTERMIO -O3 -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_RISC1 DES_UNROLL::linux_ppc64.o::::::::::dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-"linux-ia64",	"gcc:-DL_ENDIAN -DTERMIO -O3 -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK:${ia64_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"linux-generic64","gcc:-DTERMIO -Wall \$(RPM_OPT_FLAGS)::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${no_asm}:dlfcn:linux-shared:-fPIC:\$(RPM_OPT_FLAGS):.so.\$(SHLIB_SONAMEVER)",
+"linux-ppc64",	"gcc:-DB_ENDIAN -DTERMIO -Wall \$(RPM_OPT_FLAGS)::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_RISC1 DES_UNROLL::linux_ppc64.o::::::::::dlfcn:linux-shared:-fPIC:\$(RPM_OPT_FLAGS):.so.\$(SHLIB_SONAMEVER)",
+"linux-ia64",	"gcc:-DL_ENDIAN -DTERMIO -Wall \$(RPM_OPT_FLAGS)::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK:${ia64_asm}:dlfcn:linux-shared:-fPIC:\$(RPM_OPT_FLAGS):.so.\$(SHLIB_SONAMEVER)",
 "linux-ia64-ecc","ecc:-DL_ENDIAN -DTERMIO -O2 -Wall -no_cpprt::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK:${ia64_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 "linux-ia64-icc","icc:-DL_ENDIAN -DTERMIO -O2 -Wall -no_cpprt::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK:${ia64_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-"linux-x86_64",	"gcc:-m64 -DL_ENDIAN -DTERMIO -O3 -Wall -DMD32_REG_T=int::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK BF_PTR2 DES_INT DES_UNROLL:${x86_64_asm}:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"linux-x86_64",	"gcc:-DL_ENDIAN -DTERMIO -Wall -DMD32_REG_T=int \$(RPM_OPT_FLAGS)::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK BF_PTR2 DES_INT DES_UNROLL:${x86_64_asm}:dlfcn:linux-shared:-fPIC:\$(RPM_OPT_FLAGS):.so.\$(SHLIB_SONAMEVER)",
 #### SPARC Linux setups
 # Ray Miller <ray.miller at computing-services.oxford.ac.uk> has patiently
 # assisted with debugging of following two configs.
-"linux-sparcv8","gcc:-mv8 -DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall -DBN_DIV2W::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::sparcv8.o:des_enc-sparc.o fcrypt_b.o:::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"linux-sparcv8","gcc:-DB_ENDIAN -DTERMIO -Wall -DBN_DIV2W \$(RPM_OPT_FLAGS)::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::sparcv8.o:des_enc-sparc.o fcrypt_b.o:::::::::dlfcn:linux-shared:-fPIC:\$(RPM_OPT_FLAGS):.so.\$(SHLIB_SONAMEVER)",
 # it's a real mess with -mcpu=ultrasparc option under Linux, but
 # -Wa,-Av8plus should do the trick no matter what.
-"linux-sparcv9","gcc:-m32 -mcpu=ultrasparc -DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall -Wa,-Av8plus -DBN_DIV2W::-D_REENTRANT:ULTRASPARC:-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::sparcv8plus.o:des_enc-sparc.o fcrypt_b.o:::::::::dlfcn:linux-shared:-fPIC:-m32:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"linux-sparcv9","gcc:-DB_ENDIAN -DTERMIO -Wall -Wa,-Av8plus -DBN_DIV2W \$(RPM_OPT_FLAGS)::-D_REENTRANT:ULTRASPARC:-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::sparcv8plus.o:des_enc-sparc.o fcrypt_b.o:::::::::dlfcn:linux-shared:-fPIC:\$(RPM_OPT_FLAGS):.so.\$(SHLIB_SONAMEVER)",
 # GCC 3.1 is a requirement
-"linux64-sparcv9","gcc:-m64 -mcpu=ultrasparc -DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT:ULTRASPARC:-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::::::::::::dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"linux64-sparcv9","gcc:-DB_ENDIAN -DTERMIO -Wall \$(RPM_OPT_FLAGS)::-D_REENTRANT:ULTRASPARC:-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::::::::::::dlfcn:linux-shared:-fPIC:\$(RPM_OPT_FLAGS):.so.\$(SHLIB_SONAMEVER)",
 #### Alpha Linux with GNU C and Compaq C setups
 # Special notes:
 # - linux-alpha+bwx-gcc is ment to be used from ./config only. If you
@@ -355,8 +355,8 @@ my %table=(
 #
 #					<appro at fy.chalmers.se>
 #
-"linux-alpha-gcc","gcc:-O3 -DL_ENDIAN -DTERMIO::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_RISC1 DES_UNROLL:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-"linux-alpha+bwx-gcc","gcc:-O3 -DL_ENDIAN -DTERMIO::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_RISC1 DES_UNROLL:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"linux-alpha-gcc","gcc:-DL_ENDIAN -DTERMIO -mcpu=ev5 \$(RPM_OPT_FLAGS)::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_RISC1 DES_UNROLL:${no_asm}:dlfcn:linux-shared:-fPIC:\$(RPM_OPT_FLAGS):.so.\$(SHLIB_SONAMEVER)",
+"linux-alpha+bwx-gcc","gcc:-DL_ENDIAN -DTERMIO -mcpu=ev5 \$(RPM_OPT_FLAGS)::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_RISC1 DES_UNROLL:${no_asm}:dlfcn:linux-shared:-fPIC:\$(RPM_OPT_FLAGS):.so.\$(SHLIB_SONAMEVER)",
 "linux-alpha-ccc","ccc:-fast -readonly_strings -DL_ENDIAN -DTERMIO::-D_REENTRANT:::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL:${no_asm}",
 "linux-alpha+bwx-ccc","ccc:-fast -readonly_strings -DL_ENDIAN -DTERMIO::-D_REENTRANT:::SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL:${no_asm}",
 

openssl-0.9.8j-shlib-version.patch:

--- NEW FILE openssl-0.9.8j-shlib-version.patch ---
diff -up openssl-0.9.8j/crypto/opensslv.h.shlib-version openssl-0.9.8j/crypto/opensslv.h
--- openssl-0.9.8j/crypto/opensslv.h.shlib-version	2007-12-13 17:57:40.000000000 +0100
+++ openssl-0.9.8j/crypto/opensslv.h	2008-01-25 17:10:13.000000000 +0100
@@ -83,7 +83,7 @@
  * should only keep the versions that are binary compatible with the current.
  */
 #define SHLIB_VERSION_HISTORY ""
-#define SHLIB_VERSION_NUMBER "0.9.8"
+#define SHLIB_VERSION_NUMBER "0.9.8j"
 
 
 #endif /* HEADER_OPENSSLV_H */

openssl-0.9.8j-soversion.patch:

--- NEW FILE openssl-0.9.8j-soversion.patch ---
Define and use a soname -- because we have to care about binary
compatibility, we have to increment the soname in order to allow
this version to co-exist with another versions and have everything
work right.

diff -up openssl-0.9.8j/Configure.soversion openssl-0.9.8j/Configure
--- openssl-0.9.8j/Configure.soversion	2007-12-03 14:41:19.000000000 +0100
+++ openssl-0.9.8j/Configure	2007-12-03 14:41:19.000000000 +0100
@@ -1371,7 +1371,7 @@ while (<IN>)
 	elsif ($shared_extension ne "" && $shared_extension =~ /^\.s([ol])\.[^\.]*\.[^\.]*$/)
 		{
 		my $sotmp = $1;
-		s/^SHARED_LIBS_LINK_EXTS=.*/SHARED_LIBS_LINK_EXTS=.s$sotmp.\$(SHLIB_MAJOR) .s$sotmp/;
+		s/^SHARED_LIBS_LINK_EXTS=.*/SHARED_LIBS_LINK_EXTS=.s$sotmp.\$(SHLIB_SONAMEVER) .s$sotmp/;
 		}
 	elsif ($shared_extension ne "" && $shared_extension =~ /^\.[^\.]*\.[^\.]*\.dylib$/)
 		{
diff -up openssl-0.9.8j/Makefile.org.soversion openssl-0.9.8j/Makefile.org
--- openssl-0.9.8j/Makefile.org.soversion	2007-12-03 14:41:19.000000000 +0100
+++ openssl-0.9.8j/Makefile.org	2007-12-03 14:41:19.000000000 +0100
@@ -10,6 +10,7 @@ SHLIB_VERSION_HISTORY=
 SHLIB_MAJOR=
 SHLIB_MINOR=
 SHLIB_EXT=
+SHLIB_SONAMEVER=8
 PLATFORM=dist
 OPTIONS=
 CONFIGURE_ARGS=
@@ -277,10 +278,9 @@ clean-shared:
 link-shared:
 	@ set -e; for i in ${SHLIBDIRS}; do \
 		$(MAKE) -f $(HERE)/Makefile.shared -e $(BUILDENV) \
-			LIBNAME=$$i LIBVERSION=${SHLIB_MAJOR}.${SHLIB_MINOR} \
+			LIBNAME=$$i LIBVERSION=${SHLIB_SONAMEVER} \
 			LIBCOMPATVERSIONS=";${SHLIB_VERSION_HISTORY}" \
 			symlink.$(SHLIB_TARGET); \
-		libs="$$libs -l$$i"; \
 	done
 
 build-shared: do_$(SHLIB_TARGET) link-shared
@@ -291,7 +291,7 @@ do_$(SHLIB_TARGET):
 			libs="$(LIBKRB5) $$libs"; \
 		fi; \
 		$(CLEARENV) && $(MAKE) -f Makefile.shared -e $(BUILDENV) \
-			LIBNAME=$$i LIBVERSION=${SHLIB_MAJOR}.${SHLIB_MINOR} \
+			LIBNAME=$$i LIBVERSION=${SHLIB_SONAMEVER} \
 			LIBCOMPATVERSIONS=";${SHLIB_VERSION_HISTORY}" \
 			LIBDEPS="$$libs $(EX_LIBS)" \
 			link_a.$(SHLIB_TARGET); \

openssl-0.9.8j-use-fipscheck.patch:

--- NEW FILE openssl-0.9.8j-use-fipscheck.patch ---
Use fipscheck compatible way of verification of the integrity of the libcrypto
shared library.
diff -up openssl-0.9.8j/test/Makefile.use-fipscheck openssl-0.9.8j/test/Makefile
--- openssl-0.9.8j/test/Makefile.use-fipscheck	2008-12-13 13:22:47.000000000 +0100
+++ openssl-0.9.8j/test/Makefile	2009-01-13 22:49:25.000000000 +0100
@@ -402,8 +402,7 @@ FIPS_BUILD_CMD=shlib_target=; if [ -n "$
 	if [ "$(FIPSCANLIB)" = "libfips" ]; then \
 		LIBRARIES="-L$(TOP) -lfips"; \
 	elif [ -n "$(FIPSCANLIB)" ]; then \
-		FIPSLD_CC=$(CC); CC=$(TOP)/fips/fipsld; export CC FIPSLD_CC; \
-		LIBRARIES="$${FIPSLIBDIR:-$(TOP)/fips/}fipscanister.o"; \
+		LIBRARIES="$(LIBCRYPTO)"; \
 	fi; \
 	$(MAKE) -f $(TOP)/Makefile.shared -e \
 		CC=$${CC} APPNAME=$$target$(EXE_EXT) OBJECTS="$$target.o" \
@@ -414,9 +413,6 @@ FIPS_CRYPTO_BUILD_CMD=shlib_target=; if 
 		shlib_target="$(SHLIB_TARGET)"; \
 	fi; \
 	LIBRARIES="$(LIBSSL) $(LIBCRYPTO) $(LIBKRB5)"; \
-	if [ -z "$(SHARED_LIBS)" -a -n "$(FIPSCANLIB)" ] ; then \
-		FIPSLD_CC=$(CC); CC=$(TOP)/fips/fipsld; export CC FIPSLD_CC; \
-	fi; \
 	[ "$(FIPSCANLIB)" = "libfips" ] && LIBRARIES="$$LIBRARIES -lfips"; \
 	$(MAKE) -f $(TOP)/Makefile.shared -e \
 		CC=$${CC} APPNAME=$$target$(EXE_EXT) OBJECTS="$$target.o" \
diff -up openssl-0.9.8j/Makefile.org.use-fipscheck openssl-0.9.8j/Makefile.org
--- openssl-0.9.8j/Makefile.org.use-fipscheck	2009-01-13 22:35:48.000000000 +0100
+++ openssl-0.9.8j/Makefile.org	2009-01-13 22:35:49.000000000 +0100
@@ -357,10 +357,6 @@ libcrypto$(SHLIB_EXT): libcrypto.a $(SHA
 			$(MAKE) SHLIBDIRS='crypto' SHLIBDEPS='-lfips' build-shared; \
 			$(AR) libcrypto.a fips/fipscanister.o ; \
 		else \
-			if [ "$(FIPSCANLIB)" = "libcrypto" ]; then \
-				FIPSLD_CC=$(CC); CC=fips/fipsld; \
-				export CC FIPSLD_CC; \
-			fi; \
 			$(MAKE) -e SHLIBDIRS='crypto' build-shared; \
 		fi \
 	else \
@@ -381,9 +377,8 @@ libssl$(SHLIB_EXT): libcrypto$(SHLIB_EXT
 fips/fipscanister.o:	build_fips
 libfips$(SHLIB_EXT):		fips/fipscanister.o
 	@if [ "$(SHLIB_TARGET)" != "" ]; then \
-		FIPSLD_CC=$(CC); CC=fips/fipsld; export CC FIPSLD_CC; \
 		$(MAKE) -f Makefile.shared -e $(BUILDENV) \
-			CC=$${CC} LIBNAME=fips THIS=$@ \
+			CC=$(CC) LIBNAME=fips THIS=$@ \
 			LIBEXTRAS=fips/fipscanister.o \
 			LIBDEPS="$(EX_LIBS)" \
 			LIBVERSION=${SHLIB_MAJOR}.${SHLIB_MINOR} \
@@ -469,7 +464,7 @@ openssl.pc: Makefile
 	    echo 'Description: Secure Sockets Layer and cryptography libraries and tools'; \
 	    echo 'Version: '$(VERSION); \
 	    echo 'Requires: '; \
-	    echo 'Libs: -L$${libdir} -lssl -lcrypto $(EX_LIBS)'; \
+	    echo 'Libs: -L$${libdir} -lssl -lcrypto $(EX_LIBS)';\
 	    echo 'Cflags: -I$${includedir} $(KRB5_INCLUDES)' ) > openssl.pc
 
 Makefile: Makefile.org Configure config
diff -up openssl-0.9.8j/fips/fips.c.use-fipscheck openssl-0.9.8j/fips/fips.c
--- openssl-0.9.8j/fips/fips.c.use-fipscheck	2008-09-16 12:12:09.000000000 +0200
+++ openssl-0.9.8j/fips/fips.c	2009-01-13 22:35:49.000000000 +0100
@@ -47,6 +47,7 @@
  *
  */
 
+#define _GNU_SOURCE
 
 #include <openssl/rand.h>
 #include <openssl/fips_rand.h>
@@ -56,6 +57,9 @@
 #include <openssl/rsa.h>
 #include <string.h>
 #include <limits.h>
+#include <dlfcn.h>
+#include <stdio.h>
+#include <stdlib.h>
 #include "fips_locl.h"
 
 #ifdef OPENSSL_FIPS
@@ -165,6 +169,7 @@ int FIPS_selftest()
 	&& FIPS_selftest_dsa();
     }
 
+#if 0
 extern const void         *FIPS_text_start(),  *FIPS_text_end();
 extern const unsigned char FIPS_rodata_start[], FIPS_rodata_end[];
 unsigned char              FIPS_signature [20] = { 0 };
@@ -243,6 +248,206 @@ int FIPS_check_incore_fingerprint(void)
 
     return 1;
     }
+#else
+/* we implement what libfipscheck does ourselves */
+
+static int
+get_library_path(const char *libname, const char *symbolname, char *path, size_t pathlen)
+{
+	Dl_info info;
+	void *dl, *sym;
+	int rv = -1;
+
+        dl = dlopen(libname, RTLD_NODELETE|RTLD_NOLOAD|RTLD_LAZY);
+        if (dl == NULL) {
+	        return -1;
+        }       
+
+	sym = dlsym(dl, symbolname);
+
+	if (sym != NULL && dladdr(sym, &info)) {
+		strncpy(path, info.dli_fname, pathlen-1);
+		path[pathlen-1] = '\0';
+		rv = 0;
+	}
+
+	dlclose(dl);	
+	
+	return rv;
+}
+
+static const char conv[] = "0123456789abcdef";
+
+static char *
+bin2hex(void *buf, size_t len)
+{
+	char *hex, *p;
+	unsigned char *src = buf;
+	
+	hex = malloc(len * 2 + 1);
+	if (hex == NULL)
+		return NULL;
+
+	p = hex;
+
+	while (len > 0) {
+		unsigned c;
+
+		c = *src;
+		src++;
+
+		*p = conv[c >> 4];
+		++p;
+		*p = conv[c & 0x0f];
+		++p;
+		--len;
+	}
+	*p = '\0';
+	return hex;
+}
+
+#define HMAC_PREFIX "." 
+#define HMAC_SUFFIX ".hmac" 
+#define READ_BUFFER_LENGTH 16384
+
+static char *
+make_hmac_path(const char *origpath)
+{
+	char *path, *p;
+	const char *fn;
+
+	path = malloc(sizeof(HMAC_PREFIX) + sizeof(HMAC_SUFFIX) + strlen(origpath));
+	if(path == NULL) {
+		return NULL;
+	}
+
+	fn = strrchr(origpath, '/');
+	if (fn == NULL) {
+		fn = origpath;
+	} else {
+		++fn;
+	}
+
+	strncpy(path, origpath, fn-origpath);
+	p = path + (fn - origpath);
+	p = stpcpy(p, HMAC_PREFIX);
+	p = stpcpy(p, fn);
+	p = stpcpy(p, HMAC_SUFFIX);
+
+	return path;
+}
+
+static const char hmackey[] = "orboDeJITITejsirpADONivirpUkvarP";
+
+static int
+compute_file_hmac(const char *path, void **buf, size_t *hmaclen)
+{
+	FILE *f = NULL;
+	int rv = -1;
+	unsigned char rbuf[READ_BUFFER_LENGTH];
+	size_t len;
+	unsigned int hlen;
+	HMAC_CTX c;
+
+	HMAC_CTX_init(&c);
+
+	f = fopen(path, "r");
+
+	if (f == NULL) {
+		goto end;
+	}
+
+	HMAC_Init(&c, hmackey, sizeof(hmackey)-1, EVP_sha256());
+
+	while ((len=fread(rbuf, 1, sizeof(rbuf), f)) != 0) {
+		HMAC_Update(&c, rbuf, len);
+	}
+
+	len = sizeof(rbuf);
+	/* reuse rbuf for hmac */
+	HMAC_Final(&c, rbuf, &hlen);
+
+	*buf = malloc(hlen);
+	if (*buf == NULL) {
+		goto end;
+	}
+
+	*hmaclen = hlen;
+
+	memcpy(*buf, rbuf, hlen);
+
+	rv = 0;
+end:
+	HMAC_CTX_cleanup(&c);
+
+	if (f)
+		fclose(f);
+
+	return rv;
+}
+
+static int
+FIPSCHECK_verify(const char *libname, const char *symbolname)
+{
+	char path[PATH_MAX+1];
+	int rv;
+	FILE *hf;
+	char *hmacpath, *p;
+	char *hmac = NULL;
+	size_t n;
+	
+	rv = get_library_path(libname, symbolname, path, sizeof(path));
+
+	if (rv < 0)
+		return 0;
+
+	hmacpath = make_hmac_path(path);
+
+	hf = fopen(hmacpath, "r");
+	if (hf == NULL) {
+		free(hmacpath);
+		return 0;
+	}
+
+	if (getline(&hmac, &n, hf) > 0) {
+		void *buf;
+		size_t hmaclen;
+		char *hex;
+
+		if ((p=strchr(hmac, '\n')) != NULL)
+			*p = '\0';
+
+		if (compute_file_hmac(path, &buf, &hmaclen) < 0) {
+			rv = -4;
+			goto end;
+		}
+
+		if ((hex=bin2hex(buf, hmaclen)) == NULL) {
+			free(buf);
+			rv = -5;
+			goto end;
+		}
+
+		if (strcmp(hex, hmac) != 0) {
+			rv = -1;
+		}
+		free(buf);
+		free(hex);
+	}
+
+end:
+	free(hmac);
+	free(hmacpath);
+	fclose(hf);
+
+	if (rv < 0)
+		return 0;
+
+	/* check successful */
+	return 1;	
+}
+
+#endif
 
 int FIPS_mode_set(int onoff)
     {
@@ -280,16 +485,9 @@ int FIPS_mode_set(int onoff)
 	    }
 #endif
 
-	if(fips_signature_witness() != FIPS_signature)
-	    {
-	    FIPSerr(FIPS_F_FIPS_MODE_SET,FIPS_R_CONTRADICTING_EVIDENCE);
-	    fips_selftest_fail = 1;
-	    ret = 0;
-	    goto end;
-	    }
-
-	if(!FIPS_check_incore_fingerprint())
+	if(!FIPSCHECK_verify("libcrypto.so.0.9.8e","FIPS_mode_set"))
 	    {
+	    FIPSerr(FIPS_F_FIPS_MODE_SET,FIPS_R_FINGERPRINT_DOES_NOT_MATCH);
 	    fips_selftest_fail = 1;
 	    ret = 0;
 	    goto end;
@@ -405,11 +603,13 @@ int fips_clear_owning_thread(void)
 	return ret;
 	}
 
+#if 0
 unsigned char *fips_signature_witness(void)
 	{
 	extern unsigned char FIPS_signature[];
 	return FIPS_signature;
 	}
+#endif
 
 /* Generalized public key test routine. Signs and verifies the data
  * supplied in tbs using mesage digest md and setting option digest
diff -up openssl-0.9.8j/fips/Makefile.use-fipscheck openssl-0.9.8j/fips/Makefile
--- openssl-0.9.8j/fips/Makefile.use-fipscheck	2009-01-13 22:35:49.000000000 +0100
+++ openssl-0.9.8j/fips/Makefile	2009-01-13 22:36:15.000000000 +0100
@@ -62,9 +62,9 @@ testapps:
 
 all:
 	@if [ -z "$(FIPSLIBDIR)" ]; then \
-		$(MAKE) -e subdirs lib fips_premain_dso$(EXE_EXT); \
+		$(MAKE) -e subdirs lib; \
 	else \
-		$(MAKE) -e lib fips_premain_dso$(EXE_EXT) fips_standalone_sha1$(EXE_EXT); \
+		$(MAKE) -e lib; \
 	fi
 
 # Idea behind fipscanister.o is to "seize" the sequestered code between
@@ -109,7 +109,6 @@ fipscanister.o: fips_start.o $(LIBOBJ) $
 		HP-UX|OSF1|SunOS) set -x; /usr/ccs/bin/ld -r -o $@ $$objs ;; \
 		*) set -x; $(CC) $$cflags -r -o $@ $$objs ;; \
 	esac fi
-	./fips_standalone_sha1 fipscanister.o > fipscanister.o.sha1
 
 # If another exception is immediately required, assign approprite
 # site-specific ld command to FIPS_SITE_LD environment variable.
@@ -171,7 +170,7 @@ $(FIPSCANLIB):	$(FIPSCANLOC)
 	$(RANLIB) ../$(FIPSCANLIB).a || echo Never mind.
 	@touch lib
 
-shared:	lib subdirs fips_premain_dso$(EXE_EXT)
+shared:	lib subdirs
 
 libs:
 	@target=lib; $(RECURSIVE_MAKE)
@@ -195,10 +194,6 @@ install:
 	chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \
 	done;
 	@target=install; $(RECURSIVE_MAKE)
-	@cp -p -f fipscanister.o fipscanister.o.sha1 fips_premain.c \
-		fips_premain.c.sha1 \
-		$(INSTALL_PREFIX)$(INSTALLTOP)/lib/; \
-	chmod 0444 $(INSTALL_PREFIX)$(INSTALLTOP)/lib/fips*
 
 lint:
 	@target=lint; $(RECURSIVE_MAKE)
diff -up openssl-0.9.8j/fips/fips_locl.h.use-fipscheck openssl-0.9.8j/fips/fips_locl.h
--- openssl-0.9.8j/fips/fips_locl.h.use-fipscheck	2008-09-16 12:12:10.000000000 +0200
+++ openssl-0.9.8j/fips/fips_locl.h	2009-01-13 22:35:49.000000000 +0100
@@ -63,7 +63,9 @@ int fips_is_owning_thread(void);
 int fips_set_owning_thread(void);
 void fips_set_selftest_fail(void);
 int fips_clear_owning_thread(void);
+#if 0
 unsigned char *fips_signature_witness(void);
+#endif
 
 #define FIPS_MAX_CIPHER_TEST_SIZE	16
 

openssl-0.9.8j-version-add-engines.patch:

--- NEW FILE openssl-0.9.8j-version-add-engines.patch ---
diff -up openssl-0.9.8j/apps/version.c.version-add-engines openssl-0.9.8j/apps/version.c
--- openssl-0.9.8j/apps/version.c.version-add-engines	2008-10-20 14:53:33.000000000 +0200
+++ openssl-0.9.8j/apps/version.c	2009-01-13 23:22:03.000000000 +0100
@@ -131,6 +131,7 @@
 #ifndef OPENSSL_NO_BF
 # include <openssl/blowfish.h>
 #endif
+#include <openssl/engine.h>
 
 #undef PROG
 #define PROG	version_main
@@ -140,7 +141,7 @@ int MAIN(int, char **);
 int MAIN(int argc, char **argv)
 	{
 	int i,ret=0;
-	int cflags=0,version=0,date=0,options=0,platform=0,dir=0;
+	int cflags=0,version=0,date=0,options=0,platform=0,dir=0,engines=0;
 
 	apps_startup();
 
@@ -164,7 +165,7 @@ int MAIN(int argc, char **argv)
 		else if (strcmp(argv[i],"-d") == 0)
 			dir=1;
 		else if (strcmp(argv[i],"-a") == 0)
-			date=version=cflags=options=platform=dir=1;
+			date=version=cflags=options=platform=dir=engines=1;
 		else
 			{
 			BIO_printf(bio_err,"usage:version -[avbofpd]\n");
@@ -211,6 +212,18 @@ int MAIN(int argc, char **argv)
 		}
 	if (cflags)  printf("%s\n",SSLeay_version(SSLEAY_CFLAGS));
 	if (dir)  printf("%s\n",SSLeay_version(SSLEAY_DIR));
+	if (engines)
+		{
+		ENGINE *e;
+		printf("engines:  ");
+		e = ENGINE_get_first();
+		while (e)
+			{
+			printf("%s ", ENGINE_get_id(e));
+			e = ENGINE_get_next(e);
+			}
+		printf("\n");
+		}
 end:
 	apps_shutdown();
 	OPENSSL_EXIT(ret);


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/openssl/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore	3 Dec 2007 14:24:08 -0000	1.16
+++ .cvsignore	15 Jan 2009 09:10:25 -0000	1.17
@@ -1 +1 @@
-openssl-0.9.8g-usa.tar.bz2
+openssl-0.9.8j-usa.tar.bz2


Index: openssl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openssl/devel/openssl.spec,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -r1.113 -r1.114
--- openssl.spec	10 Aug 2008 20:36:12 -0000	1.113
+++ openssl.spec	15 Jan 2009 09:10:25 -0000	1.114
@@ -7,7 +7,8 @@
 # 0.9.7ef soversion = 5
 # 0.9.8ab soversion = 6
 # 0.9.8g soversion = 7
-%define soversion 7
+# 0.9.8j + EAP-FAST soversion = 8
+%define soversion 8
 
 # Number of threads to spawn when testing some threading fixes.
 %define thread_test_threads %{?threads:%{threads}}%{!?threads:1}
@@ -19,10 +20,10 @@
 # Arches for which we don't build subpackages.
 %define optimize_arches i686
 
-Summary: The OpenSSL toolkit
+Summary: A general purpose cryptography library with TLS implementation
 Name: openssl
-Version: 0.9.8g
-Release: 11%{?dist}
+Version: 0.9.8j
+Release: 1%{?dist}
 # We remove certain patented algorithms from the openssl source tarball
 # with the hobble-openssl script which is included below.
 Source: openssl-%{version}-usa.tar.bz2
@@ -33,14 +34,14 @@
 Source9: opensslconf-new.h
 Source10: opensslconf-new-warning.h
 # Build changes
-Patch0: openssl-0.9.8g-redhat.patch
+Patch0: openssl-0.9.8j-redhat.patch
 Patch1: openssl-0.9.8a-defaults.patch
 Patch2: openssl-0.9.8a-link-krb5.patch
-Patch3: openssl-0.9.8g-soversion.patch
-Patch4: openssl-0.9.8a-enginesdir.patch
+Patch3: openssl-0.9.8j-soversion.patch
+Patch4: openssl-0.9.8j-enginesdir.patch
 Patch5: openssl-0.9.8a-no-rpath.patch
 Patch6: openssl-0.9.8b-test-use-localhost.patch
-Patch7: openssl-0.9.8g-shlib-version.patch
+Patch7: openssl-0.9.8j-shlib-version.patch
 # Bug fixes
 Patch21: openssl-0.9.8b-aliasing-bug.patch
 Patch22: openssl-0.9.8b-x509-name-cmp.patch
@@ -48,16 +49,21 @@
 Patch24: openssl-0.9.8g-no-extssl.patch
 # Functionality changes
 Patch32: openssl-0.9.8g-ia64.patch
-Patch33: openssl-0.9.7f-ca-dir.patch
+Patch33: openssl-0.9.8j-ca-dir.patch
 Patch34: openssl-0.9.6-x509.patch
-Patch35: openssl-0.9.7-beta5-version-add-engines.patch
+Patch35: openssl-0.9.8j-version-add-engines.patch
 Patch38: openssl-0.9.8a-reuse-cipher-change.patch
 Patch39: openssl-0.9.8g-ipv6-apps.patch
+Patch40: openssl-0.9.8j-nocanister.patch
+Patch41: openssl-0.9.8j-use-fipscheck.patch
+Patch42: openssl-0.9.8j-fipscheck-hmac.patch
+Patch43: openssl-0.9.8j-evp-nonfips.patch
+Patch44: openssl-0.9.8j-kernel-fipsmode.patch
+Patch45: openssl-0.9.8j-env-nozlib.patch
+Patch46: openssl-0.9.8j-eap-fast.patch
+Patch47: openssl-0.9.8j-readme-warning.patch
+Patch48: openssl-0.9.8j-bad-mime.patch
 # Backported fixes including security fixes
-Patch50: openssl-0.9.8g-speed-bug.patch
-Patch51: openssl-0.9.8g-bn-mul-bug.patch
-Patch52: openssl-0.9.8g-cve-2008-0891.patch
-Patch53: openssl-0.9.8g-cve-2008-1671.patch
 
 License: OpenSSL
 Group: System Environment/Libraries
@@ -65,8 +71,18 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: mktemp, krb5-devel, perl, sed, zlib-devel, /usr/bin/cmp
 BuildRequires: /usr/bin/rename
+BuildRequires: pkgconfig
 Requires: mktemp, ca-certificates >= 2008-5
 
+# Temporary hack
+Requires(post): /sbin/ldconfig
+Requires(postun): /sbin/ldconfig
+%ifarch ppc64 s390x sparc64 x86_64
+Provides: libcrypto.so.7()(64bit) libssl.so.7()(64bit)
+%else
+Provides: libcrypto.so.7 libssl.so.7
+%endif
+
 %description
 The OpenSSL toolkit provides support for secure communications between
 machines. OpenSSL includes a certificate management tool and shared
@@ -116,15 +132,20 @@
 %patch24 -p1 -b .no-extssl
 
 %patch32 -p1 -b .ia64
-#patch33 is applied after make test
+%patch33 -p1 -b .ca-dir
 %patch34 -p1 -b .x509
 %patch35 -p1 -b .version-add-engines
 %patch38 -p1 -b .cipher-change
 %patch39 -p1 -b .ipv6-apps
-%patch50 -p1 -b .speed-bug
-%patch51 -p1 -b .bn-mul-bug
-%patch52 -p0 -b .srvname-crash
-%patch53 -p0 -b .srv-kex-crash
+%patch40 -p1 -b .nocanister
+%patch41 -p1 -b .use-fipscheck
+%patch42 -p1 -b .fipscheck-hmac
+%patch43 -p1 -b .evp-nonfips
+%patch44 -p1 -b .fipsmode
+%patch45 -p1 -b .env-nozlib
+%patch46 -p1 -b .eap-fast
+%patch47 -p1 -b .warning
+%patch48 -p1 -b .bad-mime
 
 # Modify the various perl scripts to reference perl in the right location.
 perl util/perlpath.pl `dirname %{__perl}`
@@ -170,21 +191,26 @@
 ./Configure \
 	--prefix=%{_prefix} --openssldir=%{_sysconfdir}/pki/tls ${sslflags} \
 	zlib enable-camellia enable-seed enable-tlsext enable-rfc3779 \
-	no-idea no-mdc2 no-rc5 no-ec no-ecdh no-ecdsa shared \
+	enable-cms no-idea no-mdc2 no-rc5 no-ec no-ecdh no-ecdsa shared \
 	--with-krb5-flavor=MIT --enginesdir=%{_libdir}/openssl/engines \
 	-I%{_prefix}/kerberos/include -L%{_prefix}/kerberos/%{_lib} \
-	${sslarch}
+	${sslarch} fipscanisterbuild
 
 # Add -Wa,--noexecstack here so that libcrypto's assembler modules will be
 # marked as not requiring an executable stack.
 RPM_OPT_FLAGS="$RPM_OPT_FLAGS -Wa,--noexecstack"
 make depend
-make all build-shared
+make all
 
 # Generate hashes for the included certs.
-make rehash build-shared
+make rehash
 
+%check
 # Verify that what was compiled actually works.
+
+# We must revert patch33 before tests otherwise they will fail
+patch -p1 -R < %{PATCH33}
+
 LD_LIBRARY_PATH=`pwd`${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}}
 export LD_LIBRARY_PATH
 make -C test apps tests
@@ -199,18 +225,21 @@
 	-lpthread -lz -ldl
 ./openssl-thread-test --threads %{thread_test_threads}
 
-# Patch33 must be patched after tests otherwise they will fail
-patch -p1 -b -z .ca-dir < %{PATCH33}
+# Add generation of HMAC checksum of the final stripped library
+%define __spec_install_post \
+    %{?__debug_package:%{__debug_install_post}} \
+    %{__arch_install_post} \
+    %{__os_install_post} \
+    fips/fips_standalone_sha1 $RPM_BUILD_ROOT/%{_lib}/libcrypto.so.%{version} >$RPM_BUILD_ROOT/%{_lib}/.libcrypto.so.%{version}.hmac \
+    ln -sf .libcrypto.so.%{version}.hmac $RPM_BUILD_ROOT/%{_lib}/.libcrypto.so.%{soversion}.hmac \
+%{nil}
 
-if ! iconv -f UTF-8 -t ASCII//TRANSLIT CHANGES >/dev/null 2>&1 ; then
-	iconv -f ISO-8859-1 -t UTF-8 -o CHANGES.utf8 CHANGES && \
-		mv -f CHANGES.utf8 CHANGES
-fi
 %install
 [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
 # Install OpenSSL.
 install -d $RPM_BUILD_ROOT/{%{_lib},%{_bindir},%{_includedir},%{_libdir},%{_mandir},%{_libdir}/openssl}
-make INSTALL_PREFIX=$RPM_BUILD_ROOT install build-shared
+make INSTALL_PREFIX=$RPM_BUILD_ROOT install
+make INSTALL_PREFIX=$RPM_BUILD_ROOT install_docs
 # OpenSSL install doesn't use correct _libdir
 mv $RPM_BUILD_ROOT/usr/lib/lib*.so.%{soversion} $RPM_BUILD_ROOT/%{_lib}/
 mv $RPM_BUILD_ROOT/usr/lib/engines $RPM_BUILD_ROOT/%{_libdir}/openssl
@@ -222,6 +251,8 @@
 	chmod 755 ${lib}
 	ln -s -f ../../%{_lib}/`basename ${lib}` $RPM_BUILD_ROOT%{_libdir}/`basename ${lib} .%{version}`
 	ln -s -f `basename ${lib}` $RPM_BUILD_ROOT/%{_lib}/`basename ${lib} .%{version}`.%{soversion}
+# temporary hack
+	ln -s -f `basename ${lib}` $RPM_BUILD_ROOT/%{_lib}/`basename ${lib} .%{version}`.7
 	rm -f $RPM_BUILD_ROOT%{_libdir}/`basename ${lib} .%{version}`.%{soversion}
 done
 
@@ -313,8 +344,10 @@
 rm -rf $RPM_BUILD_ROOT/%{_sysconfdir}/pki/tls/misc/*.pl
 %endif
 
-# Remove fips fingerprint script 
+# Remove unused files from upstream fips support
 rm -rf $RPM_BUILD_ROOT/%{_bindir}/openssl_fips_fingerprint
+rm -rf $RPM_BUILD_ROOT/%{_libdir}/fips_premain.*
+rm -rf $RPM_BUILD_ROOT/%{_libdir}/fipscanister.*
 
 %clean
 [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
@@ -322,7 +355,7 @@
 %files 
 %defattr(-,root,root)
 %doc FAQ LICENSE CHANGES NEWS INSTALL README
-%doc doc/README doc/c-indentation.el doc/openssl.txt
+%doc doc/c-indentation.el doc/openssl.txt
 %doc doc/openssl_button.html doc/openssl_button.gif
 %doc doc/ssleay.txt
 %dir %{_sysconfdir}/pki/tls
@@ -341,6 +374,9 @@
 %attr(0755,root,root) %{_bindir}/openssl
 %attr(0755,root,root) /%{_lib}/*.so.%{version}
 %attr(0755,root,root) /%{_lib}/*.so.%{soversion}
+%attr(0644,root,root) /%{_lib}/.libcrypto.so.*.hmac
+# temporary hack
+%attr(0755,root,root) /%{_lib}/*.so.7
 %attr(0755,root,root) %{_libdir}/openssl
 %attr(0644,root,root) %{_mandir}/man1*/[ABD-Zabcd-z]*
 %attr(0644,root,root) %{_mandir}/man5*/*
@@ -363,11 +399,23 @@
 %{_sysconfdir}/pki/tls/misc/*.pl
 %endif
 
-%post -p /sbin/ldconfig
+%post 
+/sbin/ldconfig -X
 
-%postun -p /sbin/ldconfig
+%postun
+/sbin/ldconfig -X
 
 %changelog
+* Thu Jan 15 2009 Tomas Mraz <tmraz at redhat.com> 0.9.8j-1
+- new upstream version with necessary soname bump (#455753)
+- temporarily provide symlink to old soname to make it possible to rebuild
+  the dependent packages in rawhide
+- add eap-fast support (#428181)
+- add possibility to disable zlib by setting 
+- add fips mode support for testing purposes
+- do not null dereference on some invalid smime files
+- add buildrequires pkgconfig (#479493)
+
 * Sun Aug 10 2008 Tomas Mraz <tmraz at redhat.com> 0.9.8g-11
 - do not add tls extensions to server hello for SSLv3 either
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/openssl/devel/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources	3 Dec 2007 14:24:08 -0000	1.18
+++ sources	15 Jan 2009 09:10:25 -0000	1.19
@@ -1 +1 @@
-3208630e1965e9b801a21831995ad537  openssl-0.9.8g-usa.tar.bz2
+573353d8cb4330b71e9985cea4785d61  openssl-0.9.8j-usa.tar.bz2


--- openssl-0.9.7-beta5-version-add-engines.patch DELETED ---


--- openssl-0.9.7f-ca-dir.patch DELETED ---


--- openssl-0.9.8g-bn-mul-bug.patch DELETED ---


--- openssl-0.9.8g-cve-2008-0891.patch DELETED ---


--- openssl-0.9.8g-cve-2008-1671.patch DELETED ---


--- openssl-0.9.8g-redhat.patch DELETED ---


--- openssl-0.9.8g-shlib-version.patch DELETED ---


--- openssl-0.9.8g-soversion.patch DELETED ---


--- openssl-0.9.8g-speed-bug.patch DELETED ---



From sergiopr at fedoraproject.org  Thu Jan 15 09:10:26 2009
From: sergiopr at fedoraproject.org (Sergio Pascual)
Date: Thu, 15 Jan 2009 09:10:26 +0000 (UTC)
Subject: rpms/trac-xmlrpc-plugin/devel .cvsignore, 1.2, 1.3 sources, 1.2,
	1.3 trac-xmlrpc-plugin.spec, 1.2, 1.3
Message-ID: <20090115091026.7736A7012D@cvs1.fedora.phx.redhat.com>

Author: sergiopr

Update of /cvs/pkgs/rpms/trac-xmlrpc-plugin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv679

Modified Files:
	.cvsignore sources trac-xmlrpc-plugin.spec 
Log Message:
* Thu Jan 15 2009 Sergio Pascual <sergio.pasra at gmail.com> - 1.0.0-0.1.r3074
- Source code from vcs, rebased to trunk for trac 0.11 (bz #480101)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/trac-xmlrpc-plugin/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	18 Dec 2007 15:43:26 -0000	1.2
+++ .cvsignore	15 Jan 2009 09:09:56 -0000	1.3
@@ -1 +1 @@
-xmlrpcplugin-r2892.tar.bz2
+xmlrpcplugin-r3074.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/trac-xmlrpc-plugin/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	18 Dec 2007 15:43:26 -0000	1.2
+++ sources	15 Jan 2009 09:09:56 -0000	1.3
@@ -1 +1 @@
-d0c2e58bb5e411f8aa8f408564dbf487  xmlrpcplugin-r2892.tar.bz2
+0987b7a1153a32cacbc88d2a2bf89245  xmlrpcplugin-r3074.tar.bz2


Index: trac-xmlrpc-plugin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/trac-xmlrpc-plugin/devel/trac-xmlrpc-plugin.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- trac-xmlrpc-plugin.spec	29 Nov 2008 17:21:23 -0000	1.2
+++ trac-xmlrpc-plugin.spec	15 Jan 2009 09:09:56 -0000	1.3
@@ -1,12 +1,12 @@
 # sitelib for noarch packages, sitearch for others (remove the unneeded one)
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
-%define svnrev 2892
+%define svnrev 3074
 %define upname xmlrpcplugin
 
 Name: trac-xmlrpc-plugin
-Version: 0.1
-Release: 0.4.r%{svnrev}%{?dist}
+Version: 1.0.0
+Release: 0.1.r%{svnrev}%{?dist}
 Summary: Allows Trac plugins to export their interface via XML-RPC
 
 Group: Applications/Internet
@@ -16,7 +16,7 @@
 # The source for this package was pulled from upstream's vcs.  Use the
 # following commands to generate the tarball:
 Source0: %{upname}-r%{svnrev}.tar.bz2
-# svn export -r %{svnrev} http://trac-hacks.org/svn/xmlrpcplugin/0.10 xmlrpcplugin
+# svn export -r %{svnrev} http://trac-hacks.org/svn/xmlrpcplugin/trunk xmlrpcplugin
 #  tar -cjvf xmlrpcplugin-r%{svnrev}.tar.bz2 xmlrpcplugin
 BuildRoot:  %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
@@ -49,6 +49,9 @@
 %{python_sitelib}/*
 
 %changelog
+* Thu Jan 15 2009 Sergio Pascual <sergio.pasra at gmail.com> - 1.0.0-0.1.r3074
+- Source code from vcs, rebased to trunk for trac 0.11 (bz #480101)
+
 * Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 0.1-0.4.r2892
 - Rebuild for Python 2.6
 



From mcepl at fedoraproject.org  Thu Jan 15 09:32:53 2009
From: mcepl at fedoraproject.org (Matej Cepl)
Date: Thu, 15 Jan 2009 09:32:53 +0000 (UTC)
Subject: rpms/epiphany/F-10 epiphany.spec,1.220,1.221
Message-ID: <20090115093253.EF8D37012D@cvs1.fedora.phx.redhat.com>

Author: mcepl

Update of /cvs/extras/rpms/epiphany/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3655

Modified Files:
	epiphany.spec 
Log Message:
Really fix bug 479921


Index: epiphany.spec
===================================================================
RCS file: /cvs/extras/rpms/epiphany/F-10/epiphany.spec,v
retrieving revision 1.220
retrieving revision 1.221
diff -u -r1.220 -r1.221
--- epiphany.spec	14 Jan 2009 14:38:22 -0000	1.220
+++ epiphany.spec	15 Jan 2009 09:32:23 -0000	1.221
@@ -8,7 +8,7 @@
 Summary: GNOME web browser based on the Mozilla rendering engine
 Name: epiphany
 Version: 2.24.2.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 %define major_version 2.24
 Provides: epiphany(abi) = %{major_version}
 License: GPLv2+ and GFDL
@@ -182,9 +182,9 @@
 rm -rf $RPM_BUILD_ROOT/%{_datadir}/icons/LowContrastLargePrint
 
 # directories for plugins and extensions
-mkdir -p $RPM_BUILD_ROOT%{_libdir}/epiphany/%{version}/{plugins,extensions}
-ln -sf %{version}/plugins $RPM_BUILD_ROOT%{_libdir}/epiphany/plugins
-ln -sf %{version}/extensions $RPM_BUILD_ROOT%{_libdir}/epiphany/extensions
+mkdir -p $RPM_BUILD_ROOT%{_libdir}/epiphany/%{major_version}/{plugins,extensions}
+ln -sf %{major_version}/plugins $RPM_BUILD_ROOT%{_libdir}/epiphany/plugins
+ln -sf %{major_version}/extensions $RPM_BUILD_ROOT%{_libdir}/epiphany/extensions
 
 %post
 update-desktop-database -q %{_datadir}/applications
@@ -249,11 +249,6 @@
 %{_datadir}/icons/HighContrastLargePrint/48x48/apps/gnome-web-browser.png
 %{_datadir}/icons/HighContrastLargePrintInverse/48x48/apps/gnome-web-browser.png
 %{_datadir}/dbus-1/services/org.gnome.Epiphany.service
-#%{_libdir}/epiphany/plugins
-#%{_libdir}/epiphany/extensions
-#%{_libdir}/epiphany/%{version}
-#%{_libdir}/epiphany/%{version}/plugins
-#%{_libdir}/epiphany/%{version}/extensions
 
 %files devel
 %defattr(-, root, root)



From mcepl at fedoraproject.org  Thu Jan 15 09:40:49 2009
From: mcepl at fedoraproject.org (Matej Cepl)
Date: Thu, 15 Jan 2009 09:40:49 +0000 (UTC)
Subject: rpms/epiphany/devel epiphany.spec,1.212,1.213
Message-ID: <20090115094049.5BEAF7012D@cvs1.fedora.phx.redhat.com>

Author: mcepl

Update of /cvs/extras/rpms/epiphany/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4605

Modified Files:
	epiphany.spec 
Log Message:
Really fix bug 479921


Index: epiphany.spec
===================================================================
RCS file: /cvs/extras/rpms/epiphany/devel/epiphany.spec,v
retrieving revision 1.212
retrieving revision 1.213
diff -u -r1.212 -r1.213
--- epiphany.spec	14 Jan 2009 14:36:57 -0000	1.212
+++ epiphany.spec	15 Jan 2009 09:40:18 -0000	1.213
@@ -8,7 +8,7 @@
 Summary: Web browser for GNOME
 Name: epiphany
 Version: 2.24.2.1
-Release: 5%{?dist}
+Release: 6%{?dist}
 %define major_version 2.24
 Provides: epiphany(abi) = %{major_version}
 License: GPLv2+ and GFDL
@@ -178,9 +178,9 @@
 rm -rf $RPM_BUILD_ROOT/%{_datadir}/icons/LowContrastLargePrint
 
 # directories for plugins and extensions
-mkdir -p $RPM_BUILD_ROOT%{_libdir}/epiphany/%{version}/{plugins,extensions}
-ln -sf %{version}/plugins $RPM_BUILD_ROOT%{_libdir}/epiphany/plugins
-ln -sf %{version}/extensions $RPM_BUILD_ROOT%{_libdir}/epiphany/extensions
+mkdir -p $RPM_BUILD_ROOT%{_libdir}/epiphany/%{major_version}/{plugins,extensions}
+ln -sf %{major_version}/plugins $RPM_BUILD_ROOT%{_libdir}/epiphany/plugins
+ln -sf %{major_version}/extensions $RPM_BUILD_ROOT%{_libdir}/epiphany/extensions
 
 %post
 update-desktop-database -q %{_datadir}/applications



From jskala at fedoraproject.org  Thu Jan 15 09:42:18 2009
From: jskala at fedoraproject.org (Jiri Skala)
Date: Thu, 15 Jan 2009 09:42:18 +0000 (UTC)
Subject: rpms/netatalk/F-10 netatalk.spec,1.46,1.47
Message-ID: <20090115094218.243647012D@cvs1.fedora.phx.redhat.com>

Author: jskala

Update of /cvs/extras/rpms/netatalk/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4847

Modified Files:
	netatalk.spec 
Log Message:
* Wed Jan 07 2009 Jiri Skala <jskala at redhat.com> - 4:2.0.3-22
- #473939 - BuildRequires updated quota -> quota-devel



Index: netatalk.spec
===================================================================
RCS file: /cvs/extras/rpms/netatalk/F-10/netatalk.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- netatalk.spec	13 Oct 2008 07:46:56 -0000	1.46
+++ netatalk.spec	15 Jan 2009 09:41:47 -0000	1.47
@@ -1,7 +1,7 @@
 Summary: AppleTalk networking programs
 Name:    netatalk
 Version: 2.0.3
-Release: 21%{?dist}
+Release: 22%{?dist}
 Epoch:   4
 License: GPLv2+
 Group:   System Environment/Daemons
@@ -24,7 +24,7 @@
 Requires(preun): /sbin/chkconfig
 Requires(preun): /sbin/service
 Requires(postun): /sbin/service /sbin/ldconfig
-BuildRequires: cracklib-devel openssl-devel pam quota libtool automake autoconf db4-devel pam-devel tcp_wrappers-devel
+BuildRequires: cracklib-devel openssl-devel pam quota-devel libtool automake autoconf db4-devel pam-devel tcp_wrappers-devel
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -192,6 +192,9 @@
 %{_mandir}/man*/netatalk-config.1*
 
 %changelog
+* Wed Jan 07 2009 Jiri Skala <jskala at redhat.com> - 4:2.0.3-22
+- #473939 - BuildRequires updated quota -> quota-devel
+
 * Mon Oct 13 2008 Jiri Skala <jskala at redhat.com> - 4:2.0.3-21
 - fix #465050 - FTBFS netatalk-2.0.3-19 - regenerated patches
 



From jskala at fedoraproject.org  Thu Jan 15 09:50:34 2009
From: jskala at fedoraproject.org (Jiri Skala)
Date: Thu, 15 Jan 2009 09:50:34 +0000 (UTC)
Subject: rpms/netatalk/devel netatalk.spec,1.46,1.47
Message-ID: <20090115095034.51DA17012D@cvs1.fedora.phx.redhat.com>

Author: jskala

Update of /cvs/extras/rpms/netatalk/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5926

Modified Files:
	netatalk.spec 
Log Message:
* Wed Dec 03 2008 Jiri Skala <jskala at redhat.com> -4:2.0.3-22
- fix #473939 netatalk-2.0.3-21.fc10 disable quota



Index: netatalk.spec
===================================================================
RCS file: /cvs/extras/rpms/netatalk/devel/netatalk.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- netatalk.spec	13 Oct 2008 07:46:56 -0000	1.46
+++ netatalk.spec	15 Jan 2009 09:50:03 -0000	1.47
@@ -1,7 +1,7 @@
 Summary: AppleTalk networking programs
 Name:    netatalk
 Version: 2.0.3
-Release: 21%{?dist}
+Release: 22%{?dist}
 Epoch:   4
 License: GPLv2+
 Group:   System Environment/Daemons
@@ -24,7 +24,7 @@
 Requires(preun): /sbin/chkconfig
 Requires(preun): /sbin/service
 Requires(postun): /sbin/service /sbin/ldconfig
-BuildRequires: cracklib-devel openssl-devel pam quota libtool automake autoconf db4-devel pam-devel tcp_wrappers-devel
+BuildRequires: cracklib-devel openssl-devel pam quota-devel libtool automake autoconf db4-devel pam-devel tcp_wrappers-devel
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -192,6 +192,9 @@
 %{_mandir}/man*/netatalk-config.1*
 
 %changelog
+* Wed Dec 03 2008 Jiri Skala <jskala at redhat.com> -4:2.0.3-22
+- fix #473939 netatalk-2.0.3-21.fc10 disable quota
+
 * Mon Oct 13 2008 Jiri Skala <jskala at redhat.com> - 4:2.0.3-21
 - fix #465050 - FTBFS netatalk-2.0.3-19 - regenerated patches
 



From twaugh at fedoraproject.org  Thu Jan 15 09:57:00 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Thu, 15 Jan 2009 09:57:00 +0000 (UTC)
Subject: rpms/foomatic/F-10 .cvsignore, 1.68, 1.69 foomatic.spec, 1.208,
	1.209 sources, 1.70, 1.71 foomatic-ppd-filenames.patch, 1.1, NONE
Message-ID: <20090115095700.C2D797012D@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/foomatic/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7312

Modified Files:
	.cvsignore foomatic.spec sources 
Removed Files:
	foomatic-ppd-filenames.patch 
Log Message:
Sync to devel.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/foomatic/F-10/.cvsignore,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- .cvsignore	4 Sep 2008 09:48:44 -0000	1.68
+++ .cvsignore	15 Jan 2009 09:56:30 -0000	1.69
@@ -62,3 +62,7 @@
 foomatic-filters-3.0-20080904.tar.gz
 foomatic-db-3.0-20080904.tar.gz
 foomatic-db-hpijs-20080904.tar.gz
+foomatic-db-engine-3.0-20090110.tar.gz
+foomatic-db-3.0-20090110.tar.gz
+foomatic-db-hpijs-20090110.tar.gz
+foomatic-filters-3.0-20090110.tar.gz


Index: foomatic.spec
===================================================================
RCS file: /cvs/pkgs/rpms/foomatic/F-10/foomatic.spec,v
retrieving revision 1.208
retrieving revision 1.209
diff -u -r1.208 -r1.209
--- foomatic.spec	2 Oct 2008 16:40:00 -0000	1.208
+++ foomatic.spec	15 Jan 2009 09:56:30 -0000	1.209
@@ -1,12 +1,12 @@
-%define dbver 20080904
-%define enginever 3.0-20080904
-%define filtersver 20080904
-%define hpijsver 20080904
+%define dbver 20090110
+%define enginever 3.0-20090110
+%define filtersver 20090110
+%define hpijsver 20090110
 
-Summary: Foomatic printer database.
+Summary: Database of printers and printer drivers
 Name:		foomatic
 Version:	3.0.2
-Release:    67%{?dist}
+Release:    70%{?dist}
 License:	GPLv2+
 Group: System Environment/Libraries
 
@@ -32,8 +32,6 @@
 
 Patch18: foomatic-sigpipe.patch
 
-Patch19: foomatic-ppd-filenames.patch
-
 Url:		http://www.linuxprinting.org
 BuildRequires:	perl >= 3:5.8.1
 BuildRequires:  perl(ExtUtils::MakeMaker)
@@ -42,7 +40,7 @@
 BuildRequires:	autoconf, automake
 Requires:	perl >= 3:5.8.1
 Requires:	%(eval `perl -V:version`; echo "perl(:MODULE_COMPAT_$version)")
-BuildRoot:	%_tmppath/%name-%version-%release-root
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Provides:	perl(Foomatic::GrovePath)
 # For 'rm' and '/sbin/service' in post
 PreReq: fileutils initscripts
@@ -78,7 +76,6 @@
 %patch1 -p1 -b .libdir
 %patch5 -p1 -b .fontpath
 %patch18 -p1 -b .sigpipe
-%patch19 -p1 -b .ppd-filenames
 ./make_configure
 popd
 
@@ -96,8 +93,8 @@
 
 cd db/source
 
-# For gutenprint printers, use gutenprint-ijs-simplified.5.0.
-perl -pi -e 's,>gutenprint<,>gutenprint-ijs-simplified.5.0<,' printer/*.xml
+# For gutenprint printers, use gutenprint-ijs-simplified.5.2.
+perl -pi -e 's,>gutenprint<,>gutenprint-ijs-simplified.5.2<,' printer/*.xml
 
 # Remove references to foo2zjs, foo2oak, foo2hp and foo2qpdl (bug #208851).
 # Also foo2lava, foo2kyo, foo2xqx (bug #438319).
@@ -235,6 +232,23 @@
 %{_var}/cache/foomatic
 
 %changelog
+* Mon Jan 12 2009 Tim Waugh <twaugh at redhat.com> 3.0.2-70
+- Major gutenprint version is 5.2.
+
+* Sat Jan 10 2009 Tim Waugh <twaugh at redhat.com> 3.0.2-69
+- Updated db-hpijs to 20090110.
+- Updated db to 20090110.
+- Updated filters to 3.0-20090110.
+- Updated db-engine to 3.0-20090110.
+
+* Thu Dec  3 2008 Tim Waugh <twaugh at redhat.com> 3.0.2-68
+- Updated db-hpijs to 20081124.
+- Updated db to 20081124.
+- Updated filters to 3.0-20081124.
+- Updated db-engine to 3.0-20081124.
+- Better build root.
+- Fixed summary.
+
 * Thu Oct  2 2008 Tim Waugh <twaugh at redhat.com> 3.0.2-67
 - Rebuilt (bug #465298).
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/foomatic/F-10/sources,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- sources	4 Sep 2008 09:48:44 -0000	1.70
+++ sources	15 Jan 2009 09:56:30 -0000	1.71
@@ -1,4 +1,4 @@
-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
+cfd3335798141fa5892693b39c71f71c  foomatic-db-engine-3.0-20090110.tar.gz
+8948e38765cb108221cfb3d1c9af0dd0  foomatic-db-3.0-20090110.tar.gz
+aa6b0fd89f33fcef91a3a7081b44fc36  foomatic-db-hpijs-20090110.tar.gz
+0d8702e00187a54d5cfd4cdfbab682e1  foomatic-filters-3.0-20090110.tar.gz


--- foomatic-ppd-filenames.patch DELETED ---



From jwrdegoede at fedoraproject.org  Thu Jan 15 10:03:45 2009
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Thu, 15 Jan 2009 10:03:45 +0000 (UTC)
Subject: rpms/freecol/devel .cvsignore, 1.5, 1.6 freecol.sh, 1.2,
	1.3 freecol.spec, 1.8, 1.9 sources, 1.5, 1.6
Message-ID: <20090115100345.81AE07012D@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/freecol/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8103

Modified Files:
	.cvsignore freecol.sh freecol.spec sources 
Log Message:
* Thu Jan 15 2009 Hans de Goede <hdegoede at redhat.com> 0.8.0-1
- New upstream release 0.8.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/freecol/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	27 Dec 2008 13:40:09 -0000	1.5
+++ .cvsignore	15 Jan 2009 10:03:14 -0000	1.6
@@ -1 +1 @@
-freecol-0.7.4-src-clean.tar.gz
+freecol-0.8.0-src-clean.tar.gz


Index: freecol.sh
===================================================================
RCS file: /cvs/extras/rpms/freecol/devel/freecol.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- freecol.sh	14 Mar 2008 12:17:06 -0000	1.2
+++ freecol.sh	15 Jan 2009 10:03:15 -0000	1.3
@@ -16,10 +16,4 @@
 MAIN_CLASS="net.sf.freecol.FreeCol"
 set_options "-Xmx256M"
 
-# so that FreeCol.log doesn't get dropped in the cwd
-# I would rather use ~/.freecol, but freecol itself uses ~/freecol for
-# savegames so we use that here too
-mkdir -p ~/freecol
-cd ~/freecol
-
 run --freecol-data /usr/share/freecol/data "$@"


Index: freecol.spec
===================================================================
RCS file: /cvs/extras/rpms/freecol/devel/freecol.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- freecol.spec	27 Dec 2008 13:40:09 -0000	1.8
+++ freecol.spec	15 Jan 2009 10:03:15 -0000	1.9
@@ -8,8 +8,8 @@
 %define fontname shadowedblack
 
 Name:           freecol
-Version:        0.7.4
-Release:        4%{?dist}
+Version:        0.8.0
+Release:        1%{?dist}
 Summary:        Turn-based multi-player strategy game
 Group:          Amusements/Games
 License:        GPL+
@@ -22,8 +22,6 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  ant ant-nodeps xml-commons-apis xml-commons-resolver tetex-tex4ht
 BuildRequires:  higlayout ImageMagick desktop-file-utils fontpackages-devel
-# needed by netpbm-tools, which is required by latex2html
-BuildRequires:  xorg-x11-server-utils
 # Doesn't run with gcj, so better build it with icedtea/openjdk too
 BuildRequires:  java-1.6.0-openjdk-devel
 BuildArch:      noarch
@@ -86,7 +84,6 @@
 install -p -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/%{name}
 
 cp -a data $RPM_BUILD_ROOT%{_datadir}/%{name}
-(cd $RPM_BUILD_ROOT%{_datadir}/%{name}/data/audio && ln -s sfx music)
 
 mkdir -p $RPM_BUILD_ROOT%{_fontdir}
 mv $RPM_BUILD_ROOT%{_datadir}/%{name}/data/fonts/ShadowedBlack.ttf \
@@ -148,6 +145,9 @@
 
 
 %changelog
+* Thu Jan 15 2009 Hans de Goede <hdegoede at redhat.com> 0.8.0-1
+- New upstream release 0.8.0
+
 * Sat Dec 27 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 0.7.4-4
 - Drop unclearly licensed Plakat-Fraktur font (and stop using it)
 - Put ShadowedBlack font in its own shadowedblack-fonts subpackage (rh 477388)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/freecol/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	27 Dec 2008 13:40:09 -0000	1.5
+++ sources	15 Jan 2009 10:03:15 -0000	1.6
@@ -1 +1 @@
-f0ea11a76d772947e72debc8f25d8b67  freecol-0.7.4-src-clean.tar.gz
+4dea50045993f59e21e3196e274fc5bd  freecol-0.8.0-src-clean.tar.gz



From jskala at fedoraproject.org  Thu Jan 15 10:09:09 2009
From: jskala at fedoraproject.org (Jiri Skala)
Date: Thu, 15 Jan 2009 10:09:09 +0000 (UTC)
Subject: rpms/netatalk/F-9 netatalk-2.0.3-fpsyncdir.patch, NONE,
	1.1 netatalk-2.0.3-no-verb-chkpoint.patch, NONE,
	1.1 netatalk.spec, 1.44, 1.45
Message-ID: <20090115100909.150027012D@cvs1.fedora.phx.redhat.com>

Author: jskala

Update of /cvs/extras/rpms/netatalk/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8819

Modified Files:
	netatalk.spec 
Added Files:
	netatalk-2.0.3-fpsyncdir.patch 
	netatalk-2.0.3-no-verb-chkpoint.patch 
Log Message:
* Thu Jan 15 2009 Jiri Skala <jskala at redhat.com> - 4:2.0.3-20
- fix #453072 -  netatalk should use dbd cnid by default
- fix #453073 -  netatalk: add FPSyncDir patch for Time Machine
- fix #453074 -  netatalk should be built with cnid transactions


netatalk-2.0.3-fpsyncdir.patch:

--- NEW FILE netatalk-2.0.3-fpsyncdir.patch ---
--- netatalk/include/atalk/afp.h	2008-05-14 15:30:52.000000000 +0200
+++ netatalk.syncdir/include/atalk/afp.h	2008-05-14 15:45:40.000000000 +0200
@@ -201,4 +201,7 @@
 #define AFP_ENUMERATE_EXT2      68
 #define AFP_ZZZ                 122
 
+/* version 3.2 */
+#define AFP_FPSYNCDIR		78
+
 #endif
--- netatalk/etc/afpd/switch.c	2008-05-14 15:30:52.000000000 +0200
+++ netatalk.syncdir/etc/afpd/switch.c	2008-05-14 15:36:00.000000000 +0200
@@ -152,7 +152,7 @@
     NULL, NULL, NULL, NULL,
     NULL, NULL, NULL, NULL,					/*  64 -  71 */
     NULL, NULL, NULL, NULL,
-    NULL, NULL, NULL, NULL,					/*  72 -  79 */
+    NULL, NULL, afp_syncdir, NULL,				/*  72 -  79 */
     NULL, NULL, NULL, NULL,
     NULL, NULL, NULL, NULL,					/*  80 -  87 */
     NULL, NULL, NULL, NULL,
--- netatalk/etc/afpd/auth.c	2008-05-14 15:30:52.000000000 +0200
+++ netatalk.syncdir/etc/afpd/auth.c	2008-05-14 15:39:10.000000000 +0200
@@ -76,7 +76,8 @@
             { "AFP2.2",	22 },
 #ifdef AFP3x
             { "AFPX03", 30 },
-            { "AFP3.1", 31 }
+            { "AFP3.1", 31 },
+            { "AFP3.2", 32 }
 #endif            
         };
 
@@ -186,6 +187,7 @@
     else {
         afp_switch = postauth_switch;
         switch (afp_version) {
+        case 32:
         case 31:
 	    uam_afpserver_action(AFP_ENUMERATE_EXT2, UAM_AFPSERVER_POSTAUTH, afp_enumerate_ext2, NULL); 
         case 30:
--- netatalk/etc/afpd/directory.h	2008-05-14 15:30:52.000000000 +0200
+++ netatalk.syncdir/etc/afpd/directory.h	2008-05-14 15:36:39.000000000 +0200
@@ -219,6 +219,7 @@
 extern int      afp_closedir __P((AFPObj *, char *, int, char *, int *));
 extern int	afp_mapid __P((AFPObj *, char *, int, char *, int *));
 extern int	afp_mapname __P((AFPObj *, char *, int, char *, int *));
+extern int      afp_syncdir __P((AFPObj *, char *, int, char *, int *));
 
 /* from enumerate.c */
 extern int	afp_enumerate __P((AFPObj *, char *, unsigned int, char *, unsigned int *));
--- netatalk/etc/afpd/directory.c	2008-05-14 15:30:52.000000000 +0200
+++ netatalk.syncdir/etc/afpd/directory.c	2008-05-14 15:36:36.000000000 +0200
@@ -2271,6 +2271,53 @@
     return err;
 }
 
+
+int afp_syncdir(obj, ibuf, ibuflen, rbuf, rbuflen )
+AFPObj  *obj;
+char    *ibuf, *rbuf;
+int     ibuflen, *rbuflen;
+{
+    DIR                  *dp;
+    int                  dfd;
+    struct vol           *vol;
+    struct dir           *dir;
+    u_int32_t            did;
+    u_int16_t            vid;
+
+    *rbuflen = 0;
+    ibuf += 2;
+
+    memcpy( &vid, ibuf, sizeof( vid ));
+    ibuf += sizeof( vid );
+    if (NULL == (vol = getvolbyvid( vid )) ) {
+        return( AFPERR_PARAM );
+    }
+
+    memcpy( &did, ibuf, sizeof( did ));
+    ibuf += sizeof( did );
+    if (NULL == ( dir = dirlookup( vol, did )) ) {
+        return afp_errno; /* was AFPERR_NOOBJ */
+    }
+
+    if (NULL == ( dp = opendir( "." )) ) {
+        switch( errno ) {
+        case ENOENT :
+            return( AFPERR_NOOBJ );
+        case EACCES :
+            return( AFPERR_ACCESS );
+        default :
+            return( AFPERR_PARAM );
+        }
+    }
+
+    dfd = dirfd( dp );
+    if ( fsync ( dfd ) < 0 ) {
+        LOG(log_error, logtype_afpd, "syncdir(%s): ddir(%d) %s", dir->d_u_name, dfd, strerror(errno) );
+    }
+   
+    return ( AFP_OK );
+}
+
 int afp_createdir(obj, ibuf, ibuflen, rbuf, rbuflen )
 AFPObj  *obj;
 char	*ibuf, *rbuf;

netatalk-2.0.3-no-verb-chkpoint.patch:

--- NEW FILE netatalk-2.0.3-no-verb-chkpoint.patch ---
diff -ur netatalk-2.0.3~/bin/cnid/cnid_index.c netatalk-2.0.3/bin/cnid/cnid_index.c
--- netatalk-2.0.3~/bin/cnid/cnid_index.c	2008-06-27 00:21:38.000000000 -0400
+++ netatalk-2.0.3/bin/cnid/cnid_index.c	2008-06-27 00:22:37.000000000 -0400
@@ -352,7 +352,6 @@
     if (db_errlog != NULL)
         db_env->set_errfile(db_env, db_errlog); 
     db_env->set_verbose(db_env, DB_VERB_RECOVERY, 1);
-    db_env->set_verbose(db_env, DB_VERB_CHKPOINT, 1);
     if ((ret = (db_env->open)(db_env, ".", DBOPTIONS | DB_PRIVATE | DB_RECOVER, 0))) {
         LOG(log_error, logtype_cnid, "error opening DB environment: %s", 
             db_strerror(ret));
Only in netatalk-2.0.3/bin/cnid: cnid_index.c~
diff -ur netatalk-2.0.3~/etc/cnid_dbd/dbif.c netatalk-2.0.3/etc/cnid_dbd/dbif.c
--- netatalk-2.0.3~/etc/cnid_dbd/dbif.c	2008-06-27 00:21:38.000000000 -0400
+++ netatalk-2.0.3/etc/cnid_dbd/dbif.c	2008-06-27 00:22:23.000000000 -0400
@@ -163,7 +163,6 @@
     if (db_errlog != NULL)
         db_env->set_errfile(db_env, db_errlog); 
     db_env->set_verbose(db_env, DB_VERB_RECOVERY, 1);
-    db_env->set_verbose(db_env, DB_VERB_CHKPOINT, 1);
     if ((ret = (db_env->open)(db_env, ".", DBOPTIONS | DB_PRIVATE | DB_RECOVER, 0))) {
         LOG(log_error, logtype_cnid, "error opening DB environment: %s", 
             db_strerror(ret));
Only in netatalk-2.0.3/etc/cnid_dbd: dbif.c~


Index: netatalk.spec
===================================================================
RCS file: /cvs/extras/rpms/netatalk/F-9/netatalk.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- netatalk.spec	6 Mar 2008 15:40:16 -0000	1.44
+++ netatalk.spec	15 Jan 2009 10:08:38 -0000	1.45
@@ -1,7 +1,7 @@
 Summary: AppleTalk networking programs
 Name:    netatalk
 Version: 2.0.3
-Release: 19%{?dist}
+Release: 20%{?dist}
 Epoch:   4
 License: GPL
 Group:   System Environment/Daemons
@@ -21,6 +21,8 @@
 Patch7:  netatalk-2.0.3-maxsrv.patch
 Patch8:  netatalk-2.0.3-log_stderr.patch
 Patch9:  netatalk-2.0.3-multiarch.patch
+Patch10: netatalk-2.0.3-fpsyncdir.patch
+Patch11: netatalk-2.0.3-no-verb-chkpoint.patch
 Url:	 http://netatalk.sourceforge.net/
 Requires: pam
 Requires(post): /sbin/chkconfig /sbin/ldconfig
@@ -58,6 +60,8 @@
 %patch7  -p1 -b .maxsrv
 %patch8  -p1 -b .log_stderr
 %patch9  -p1 -b .multiarch
+%patch10 -p1 -b .fpsyncdir
+%patch11 -p1 -b .no-verb-chkpoint
 
 ln -s ./NEWS ChangeLog
 
@@ -90,7 +94,9 @@
         --enable-krbV-uam \
         --enable-overwrite \
         --with-gnu-ld \
-	--enable-redhat
+	--enable-redhat \
+	--with-cnid-dbd-txn \
+	--with-cnid-default-backend=dbd
 
 # Grrrr. Fix broken libtool/autoFOO Makefiles.
 if [ "%{_lib}" != lib ]; then
@@ -198,6 +204,11 @@
 %{_mandir}/man*/netatalk-config.1*
 
 %changelog
+* Thu Jan 15 2009 Jiri Skala <jskala at redhat.com> - 4:2.0.3-20
+- fix #453072 -  netatalk should use dbd cnid by default
+- fix #453073 -  netatalk: add FPSyncDir patch for Time Machine
+- fix #453074 -  netatalk should be built with cnid transactions
+
 * Thu Mar 06 2008 Martin Nagy <mnagy at redhat.com> - 4:2.0.3-19
 - fix chmod o+x (#225085)
 - increase the maximum number of cnid_dbd processes to 512 (#232805)



From tmraz at fedoraproject.org  Thu Jan 15 10:12:46 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Thu, 15 Jan 2009 10:12:46 +0000 (UTC)
Subject: rpms/ipsec-tools/devel ipsec-tools.spec,1.61,1.62
Message-ID: <20090115101246.AB2D77012D@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/ipsec-tools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9240

Modified Files:
	ipsec-tools.spec 
Log Message:
* Thu Jan 15 2009 Tomas Mraz <tmraz at redhat.com> - 0.7.1-7
- rebuild with new openssl



Index: ipsec-tools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ipsec-tools/devel/ipsec-tools.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- ipsec-tools.spec	10 Nov 2008 12:03:31 -0000	1.61
+++ ipsec-tools.spec	15 Jan 2009 10:12:16 -0000	1.62
@@ -1,6 +1,6 @@
 Name: ipsec-tools
 Version: 0.7.1
-Release: 6%{?dist}
+Release: 7%{?dist}
 Summary: Tools for configuring and using IPSEC
 License: BSD
 Group: System Environment/Base
@@ -124,6 +124,9 @@
 %config(noreplace) /etc/racoon/racoon.conf
 
 %changelog
+* Thu Jan 15 2009 Tomas Mraz <tmraz at redhat.com> - 0.7.1-7
+- rebuild with new openssl
+
 * Mon Nov 10 2008 Tomas Mraz <tmraz at redhat.com> - 0.7.1-6
 - fix patch porting error in the dpd-fixes patch (#470575)
 



From tmraz at fedoraproject.org  Thu Jan 15 10:22:25 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Thu, 15 Jan 2009 10:22:25 +0000 (UTC)
Subject: rpms/opensc/devel opensc.spec,1.39,1.40
Message-ID: <20090115102225.E8C3870141@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/opensc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10607

Modified Files:
	opensc.spec 
Log Message:
* Thu Jan 15 2009 Tomas Mraz <tmraz at redhat.com> - 0.11.6-2
- Add explicit requires for pcsc-lite-libs. Dlopen libpcsclite with the full
  soname.



Index: opensc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/opensc/devel/opensc.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- opensc.spec	2 Sep 2008 14:32:04 -0000	1.39
+++ opensc.spec	15 Jan 2009 10:21:55 -0000	1.40
@@ -2,7 +2,7 @@
 
 Name:           opensc
 Version:        0.11.6
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Smart card library and applications
 
 Group:          System Environment/Libraries
@@ -20,6 +20,8 @@
 BuildRequires:  openssl-devel >= 0.9.7a
 BuildRequires:  libtool-ltdl-devel
 BuildRequires:  libtool
+BuildRequires:  pkgconfig
+Requires:	pcsc-lite-libs
 
 %description
 OpenSC is a package for for accessing smart card devices.  Basic
@@ -68,6 +70,7 @@
   --enable-pcsc \
   --enable-openct \
   --enable-doc \
+  --with-pcsc-provider=%{_libdir}/libpcsclite.so.1 \
   --with-plugindir=%{plugindir} \
   --with-pin-entry=%{_bindir}/pinentry
 make %{?_smp_mflags}
@@ -149,6 +152,10 @@
 
 
 %changelog
+* Thu Jan 15 2009 Tomas Mraz <tmraz at redhat.com> - 0.11.6-2
+- Add explicit requires for pcsc-lite-libs. Dlopen libpcsclite with the full
+  soname.
+
 * Tue Sep  2 2008 Tomas Mraz <tmraz at redhat.com> - 0.11.6-1
 - Update to latest upstream, fixes CVE-2008-2235
 



From rjones at fedoraproject.org  Thu Jan 15 10:31:41 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Thu, 15 Jan 2009 10:31:41 +0000 (UTC)
Subject: rpms/ocaml-ssl/devel .cvsignore, 1.2, 1.3 ocaml-ssl.spec, 1.11,
	1.12 sources, 1.2, 1.3
Message-ID: <20090115103141.6BD957012D@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/ocaml-ssl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12348

Modified Files:
	.cvsignore ocaml-ssl.spec sources 
Log Message:
* Thu Jan 15 2009 Richard W.M. Jones <rjones at redhat.com> - 0.4.3-1
- New upstream version 0.4.3.
- Force rebuild against new OpenSSL 0.9.8j.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-ssl/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	25 Jul 2007 18:36:49 -0000	1.2
+++ .cvsignore	15 Jan 2009 10:31:11 -0000	1.3
@@ -1 +1 @@
-ocaml-ssl-0.4.2.tar.gz
+ocaml-ssl-0.4.3.tar.gz


Index: ocaml-ssl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-ssl/devel/ocaml-ssl.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ocaml-ssl.spec	4 Dec 2008 18:02:21 -0000	1.11
+++ ocaml-ssl.spec	15 Jan 2009 10:31:11 -0000	1.12
@@ -2,18 +2,19 @@
 %define debug_package %{nil}
 
 Name:           ocaml-ssl
-Version:        0.4.2
-Release:        12%{?dist}
+Version:        0.4.3
+Release:        1%{?dist}
 Summary:        SSL bindings for OCaml
 
 Group:          Development/Libraries
 License:        LGPLv2+ with exceptions
-URL:            http://savonet.sourceforge.net/wiki/Savonet
+URL:            http://savonet.sourceforge.net/
 Source0:        http://downloads.sourceforge.net/savonet/ocaml-ssl-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  ocaml >= 3.10.1
-BuildRequires:  ocaml-findlib-devel, openssl-devel
+BuildRequires:  ocaml-findlib-devel
+BuildRequires:  openssl-devel >= 0.9.8j-1
 BuildRequires:  gawk
 Requires:       openssl
 
@@ -86,6 +87,10 @@
 
 
 %changelog
+* Thu Jan 15 2009 Richard W.M. Jones <rjones at redhat.com> - 0.4.3-1
+- New upstream version 0.4.3.
+- Force rebuild against new OpenSSL 0.9.8j.
+
 * Wed Nov 26 2008 Richard W.M. Jones <rjones at redhat.com> - 0.4.2-12
 - Rebuild for OCaml 3.11.0+rc1.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-ssl/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	25 Jul 2007 18:36:49 -0000	1.2
+++ sources	15 Jan 2009 10:31:11 -0000	1.3
@@ -1 +1 @@
-b6ee4283472ad2b5010aff3038567701  ocaml-ssl-0.4.2.tar.gz
+7a9fb5adf16ca411389fc07ed7ddaa66  ocaml-ssl-0.4.3.tar.gz



From tmraz at fedoraproject.org  Thu Jan 15 10:52:38 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Thu, 15 Jan 2009 10:52:38 +0000 (UTC)
Subject: rpms/openssh/devel openssh.spec,1.133,1.134 sshd.pam,1.2,1.3
Message-ID: <20090115105238.5E1377012D@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/openssh/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14447

Modified Files:
	openssh.spec sshd.pam 
Log Message:
* Thu Jan 15 2009 Tomas Mraz <tmraz at redhat.com> - 5.1p1-5
- remove obsolete --with-rsh (#478298)
- add pam_sepermit to allow blocking confined users in permissive mode
  (#471746)
- move system-auth after pam_selinux in the session stack



Index: openssh.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openssh/devel/openssh.spec,v
retrieving revision 1.133
retrieving revision 1.134
diff -u -r1.133 -r1.134
--- openssh.spec	11 Dec 2008 21:48:41 -0000	1.133
+++ openssh.spec	15 Jan 2009 10:52:07 -0000	1.134
@@ -63,7 +63,7 @@
 Summary: An open source implementation of SSH protocol versions 1 and 2
 Name: openssh
 Version: 5.1p1
-Release: 4%{?dist}%{?rescue_rel}
+Release: 5%{?dist}%{?rescue_rel}
 URL: http://www.openssh.com/portable.html
 #Source0: ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-%{version}.tar.gz
 #Source1: ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-%{version}.tar.gz.asc
@@ -264,7 +264,6 @@
 	--libexecdir=%{_libexecdir}/openssh \
 	--datadir=%{_datadir}/openssh \
 	--with-tcp-wrappers \
-	--with-rsh=%{_bindir}/rsh \
 	--with-default-path=/usr/local/bin:/bin:/usr/bin \
 	--with-superuser-path=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin \
 	--with-privsep-path=%{_var}/empty/sshd \
@@ -479,6 +478,12 @@
 %endif
 
 %changelog
+* Thu Jan 15 2009 Tomas Mraz <tmraz at redhat.com> - 5.1p1-5
+- remove obsolete --with-rsh (#478298)
+- add pam_sepermit to allow blocking confined users in permissive mode
+  (#471746)
+- move system-auth after pam_selinux in the session stack
+
 * Thu Dec 11 2008 Tomas Mraz <tmraz at redhat.com> - 5.1p1-4
 - set FD_CLOEXEC on channel sockets (#475866)
 - adjust summary


Index: sshd.pam
===================================================================
RCS file: /cvs/pkgs/rpms/openssh/devel/sshd.pam,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sshd.pam	19 May 2008 16:53:29 -0000	1.2
+++ sshd.pam	15 Jan 2009 10:52:07 -0000	1.3
@@ -1,12 +1,13 @@
 #%PAM-1.0
+auth	   required	pam_sepermit.so
 auth       include      system-auth
 account    required     pam_nologin.so
 account    include      system-auth
 password   include      system-auth
 # pam_selinux.so close should be the first session rule
 session    required     pam_selinux.so close
-session    include      system-auth
 session    required     pam_loginuid.so
 # pam_selinux.so open should only be followed by sessions to be executed in the user context
 session    required     pam_selinux.so open env_params
 session    optional     pam_keyinit.so force revoke
+session    include      system-auth



From tmraz at fedoraproject.org  Thu Jan 15 11:32:00 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Thu, 15 Jan 2009 11:32:00 +0000 (UTC)
Subject: rpms/afflib/devel afflib.spec,1.21,1.22
Message-ID: <20090115113200.D3BB27012D@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/afflib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20220

Modified Files:
	afflib.spec 
Log Message:
* Thu Jan 15 2009 Tomas Mraz <tmraz at redhat.com> - 3.3.4-5
- rebuild with new openssl



Index: afflib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/afflib/devel/afflib.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- afflib.spec	3 Oct 2008 09:11:41 -0000	1.21
+++ afflib.spec	15 Jan 2009 11:31:29 -0000	1.22
@@ -2,7 +2,7 @@
 
 Name:           afflib
 Version:        3.3.4
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Library to support the Advanced Forensic Format
 
 Group:          System Environment/Libraries
@@ -122,6 +122,9 @@
 
 
 %changelog
+* Thu Jan 15 2009 Tomas Mraz <tmraz at redhat.com> - 3.3.4-5
+- rebuild with new openssl
+
 * Fri Oct  3 2008 kwizart < kwizart at gmail.com > - 3.3.4-4
 - Fix release mismatch
 



From tmraz at fedoraproject.org  Thu Jan 15 11:34:02 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Thu, 15 Jan 2009 11:34:02 +0000 (UTC)
Subject: rpms/aimage/devel aimage.spec,1.3,1.4
Message-ID: <20090115113402.CBF1E7012D@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/aimage/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20723

Modified Files:
	aimage.spec 
Log Message:
* Thu Jan 15 2009 Tomas Mraz <tmraz at redhat.com> - 3.2.0-2
- rebuild with new openssl



Index: aimage.spec
===================================================================
RCS file: /cvs/pkgs/rpms/aimage/devel/aimage.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- aimage.spec	23 Sep 2008 14:40:21 -0000	1.3
+++ aimage.spec	15 Jan 2009 11:33:32 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           aimage
 Version:        3.2.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Advanced Disk Imager
 
 Group:          Applications/System
@@ -42,6 +42,9 @@
 
 
 %changelog
+* Thu Jan 15 2009 Tomas Mraz <tmraz at redhat.com> - 3.2.0-2
+- rebuild with new openssl
+
 * Tue Sep 23 2008 kwizart < kwizart at gmail.com > - 3.2.0-1
 - Update to 3.2.0
 



From denis at fedoraproject.org  Thu Jan 15 12:04:29 2009
From: denis at fedoraproject.org (Denis Leroy)
Date: Thu, 15 Jan 2009 12:04:29 +0000 (UTC)
Subject: rpms/libxml++/devel .cvsignore, 1.10, 1.11 libxml++.spec, 1.24,
	1.25 sources, 1.10, 1.11
Message-ID: <20090115120429.DD9037012D@cvs1.fedora.phx.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/libxml++/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25559

Modified Files:
	.cvsignore libxml++.spec sources 
Log Message:
Update to 2.24.2 (memleak fixes), Fixed Gnome FTP URL


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libxml++/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	6 Aug 2008 00:00:06 -0000	1.10
+++ .cvsignore	15 Jan 2009 12:03:59 -0000	1.11
@@ -1 +1 @@
-libxml++-2.23.2.tar.bz2
+libxml++-2.24.2.tar.bz2


Index: libxml++.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libxml++/devel/libxml++.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- libxml++.spec	29 Aug 2008 18:27:55 -0000	1.24
+++ libxml++.spec	15 Jan 2009 12:03:59 -0000	1.25
@@ -1,15 +1,17 @@
 Name:           libxml++
-Version:        2.23.2
-Release:        2%{?dist}
+Version:        2.24.2
+Release:        1%{?dist}
 Summary:        C++ wrapper for the libxml2 XML parser library
 
 Group:          System Environment/Libraries
 License:        LGPLv2+
 URL:            http://libxmlplusplus.sourceforge.net/
-Source:         http://ftp.gnome.org/pub/GNOME/sources/libxml++/%{version}/libxml++-%{version}.tar.bz2
+Source:         http://ftp.gnome.org/pub/GNOME/sources/libxml++/2.24/libxml++-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  libxml2-devel >= 2.6.1, doxygen, glibmm24-devel >= 2.4.0
+BuildRequires:  libxml2-devel >= 2.6.1
+BuildRequires:  glibmm24-devel >= 2.4.0
+BuildRequires:  doxygen, graphviz
 
 %description
 libxml++ is a C++ wrapper for the libxml2 XML parser library. It's original
@@ -83,6 +85,10 @@
 
 
 %changelog
+* Thu Jan 15 2009 Denis Leroy <denis at poolshark.org> - 2.24.2-1
+- Update to 2.24.2 (memleak fixes)
+- Fixed Gnome FTP URL
+
 * Fri Aug 29 2008 Michael Schwendt <mschwendt at fedoraproject.org> - 2.23.2-2
 - Include unowned directories
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libxml++/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	6 Aug 2008 00:00:06 -0000	1.10
+++ sources	15 Jan 2009 12:03:59 -0000	1.11
@@ -1 +1 @@
-161bb2d92af614e9d78f79ec42d4954a  libxml++-2.23.2.tar.bz2
+ec98c0975cc21d62c3e9e71f3beffde2  libxml++-2.24.2.tar.bz2



From kwizart at fedoraproject.org  Thu Jan 15 12:11:22 2009
From: kwizart at fedoraproject.org (Chauvet Nicolas)
Date: Thu, 15 Jan 2009 12:11:22 +0000 (UTC)
Subject: rpms/libewf/devel libewf.spec, 1.10, 1.11 sources, 1.7,
	1.8 .cvsignore, 1.6, 1.7
Message-ID: <20090115121122.97DAF7012D@cvs1.fedora.phx.redhat.com>

Author: kwizart

Update of /cvs/pkgs/rpms/libewf/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26367

Modified Files:
	libewf.spec sources .cvsignore 
Log Message:
Update mount_ewf



Index: libewf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libewf/devel/libewf.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- libewf.spec	27 Dec 2008 22:30:47 -0000	1.10
+++ libewf.spec	15 Jan 2009 12:10:52 -0000	1.11
@@ -1,13 +1,13 @@
 Name:           libewf
 Version:        20080501
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Library for the Expert Witness Compression Format (EWF)
 
 Group:          System Environment/Libraries
 License:        BSD
 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
+Source1:        http://downloads.sourceforge.net/libewf/mount_ewf-20090113.py
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  e2fsprogs-devel
@@ -105,6 +105,9 @@
 %{_mandir}/man3/*.gz
 
 %changelog
+* Thu Jan 15 2009 kwizart < kwizart at gmail.com > - 20080501-5
+- Update mount_ewf to 20090113
+
 * Sat Dec 27 2008 kwizart < kwizart at gmail.com > - 20080501-4
 - Fix for python2.6
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libewf/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	15 Sep 2008 16:13:36 -0000	1.7
+++ sources	15 Jan 2009 12:10:52 -0000	1.8
@@ -1,2 +1,2 @@
 be28a11d32ca72c328b081d38849d5bd  libewf-20080501.tar.gz
-4339cd5e658c968e17c45ada949f9116  mount_ewf-20080910.py
+f560fb58f7dc8281edd3cd7559e15c86  mount_ewf-20090113.py


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libewf/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	15 Sep 2008 16:13:36 -0000	1.6
+++ .cvsignore	15 Jan 2009 12:10:52 -0000	1.7
@@ -1,2 +1,2 @@
 libewf-20080501.tar.gz
-mount_ewf-20080910.py
+mount_ewf-20090113.py



From twaugh at fedoraproject.org  Thu Jan 15 12:15:15 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Thu, 15 Jan 2009 12:15:15 +0000 (UTC)
Subject: rpms/foomatic/devel .cvsignore, 1.70,
	1.71 foomatic-filters-libdir.patch, 1.6, 1.7 foomatic.spec,
	1.212, 1.213 sources, 1.72, 1.73 foomatic-2.0.2-fontpath.patch,
	1.4, NONE foomatic-sigpipe.patch, 1.1, NONE
Message-ID: <20090115121515.684237012D@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/foomatic/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26861

Modified Files:
	.cvsignore foomatic-filters-libdir.patch foomatic.spec sources 
Removed Files:
	foomatic-2.0.2-fontpath.patch foomatic-sigpipe.patch 
Log Message:
* Thu Jan 15 2009 Tim Waugh <twaugh at redhat.com> 4.0.0-1
- 4.0.0.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/foomatic/devel/.cvsignore,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- .cvsignore	10 Jan 2009 12:38:45 -0000	1.70
+++ .cvsignore	15 Jan 2009 12:14:44 -0000	1.71
@@ -70,3 +70,6 @@
 foomatic-db-3.0-20090110.tar.gz
 foomatic-db-hpijs-20090110.tar.gz
 foomatic-filters-3.0-20090110.tar.gz
+foomatic-db-4.0-20090115.tar.gz
+foomatic-db-engine-4.0.0.tar.gz
+foomatic-filters-4.0.0.tar.gz

foomatic-filters-libdir.patch:

Index: foomatic-filters-libdir.patch
===================================================================
RCS file: /cvs/pkgs/rpms/foomatic/devel/foomatic-filters-libdir.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- foomatic-filters-libdir.patch	2 Sep 2008 12:18:15 -0000	1.6
+++ foomatic-filters-libdir.patch	15 Jan 2009 12:14:44 -0000	1.7
@@ -1,29 +1,12 @@
-diff -up foomatic-filters-3.0-20080710/configure.ac.libdir foomatic-filters-3.0-20080710/configure.ac
---- foomatic-filters-3.0-20080710/configure.ac.libdir	2008-07-10 08:20:16.000000000 +0100
-+++ foomatic-filters-3.0-20080710/configure.ac	2008-09-02 13:13:36.000000000 +0100
-@@ -13,7 +13,7 @@ AC_PROG_LN_S
- AC_PROG_MAKE_SET
+diff -up foomatic-filters-4.0.0/configure.ac.libdir foomatic-filters-4.0.0/configure.ac
+--- foomatic-filters-4.0.0/configure.ac.libdir	2009-01-14 19:23:15.000000000 +0000
++++ foomatic-filters-4.0.0/configure.ac	2009-01-15 10:57:55.000000000 +0000
+@@ -43,7 +43,7 @@ AC_CHECK_FUNCS([dup2 getcwd gethostname 
+ 
  
  ETCSEARCHPATH=${prefix}/etc:/usr/etc:/usr/local/etc
--LIBSEARCHPATH=${prefix}/lib:/usr/lib:/usr/local/lib:${prefix}/libexec:/usr/libexec:/usr/local/libexec
-+LIBSEARCHPATH=$libdir:/usr/local/lib:${prefix}/libexec:/usr/libexec:/usr/local/libexec
+-LIBSEARCHPATH=${prefix}/lib:${prefix}/lib64:/usr/lib:/usr/lib64:/usr/local/lib:${prefix}/libexec:/usr/libexec:/usr/local/libexec
++LIBSEARCHPATH=${libdir}:/usr/lib:/usr/lib64:/usr/local/lib:${prefix}/libexec:/usr/libexec:/usr/local/libexec
  
- dnl Get the operating system and version number...
  uname=`uname`
-@@ -47,13 +47,13 @@ dnl Check for /usr/lib/cups/backend
- AC_PATH_DIR(CUPS_BACKENDS,cups/backend,/usr/lib/cups/backend,$LIBSEARCHPATH)
- 
- dnl Check for /usr/lib/ppr
--AC_PATH_DIR(PPR,ppr,/usr/lib/ppr,$LIBSEARCHPATH)
-+AC_PATH_DIR(PPR,ppr,$libdir/ppr,$LIBSEARCHPATH)
- 
- dnl Check for /usr/lib/ppr/interfaces
--AC_PATH_DIR(PPR_INTERFACES,ppr/interfaces,/usr/lib/ppr/interfaces,$LIBSEARCHPATH)
-+AC_PATH_DIR(PPR_INTERFACES,ppr/interfaces,$libdir/ppr/interfaces,$LIBSEARCHPATH)
- 
- dnl Check for /usr/lib/ppr/lib
--AC_PATH_DIR(PPR_LIB,ppr/lib,/usr/lib/ppr/lib,$LIBSEARCHPATH)
-+AC_PATH_DIR(PPR_LIB,ppr/lib,$libdir/ppr/lib,$LIBSEARCHPATH)
- 
- AC_ARG_ENABLE(file-converter-check, [  --enable-file-converter-check  check whether a file converter is installed [default=yes]],
- [if eval "test x${enableval} = xno"; then
+ uversion=`uname -r | sed -e '1,$s/[[^0-9]]//g'`


Index: foomatic.spec
===================================================================
RCS file: /cvs/pkgs/rpms/foomatic/devel/foomatic.spec,v
retrieving revision 1.212
retrieving revision 1.213
diff -u -r1.212 -r1.213
--- foomatic.spec	12 Jan 2009 18:51:45 -0000	1.212
+++ foomatic.spec	15 Jan 2009 12:14:44 -0000	1.213
@@ -1,12 +1,13 @@
-%define dbver 20090110
-%define enginever 3.0-20090110
-%define filtersver 20090110
+%define dbver_rel 4.0
+%define dbver_snap 20090115
+%define enginever 4.0.0
+%define filtersver 4.0.0
 %define hpijsver 20090110
 
 Summary: Database of printers and printer drivers
 Name:		foomatic
-Version:	3.0.2
-Release:    70%{?dist}
+Version:	%{enginever}
+Release:    1%{?dist}
 License:	GPLv2+
 Group: System Environment/Libraries
 
@@ -16,22 +17,17 @@
 # tar cjf foomatic-1.9-$NOW.tar.bz2 foomatic
 Source0: http://www.openprinting.org/download/foomatic/foomatic-db-engine-%{enginever}.tar.gz
 
-Source1: http://www.linuxprinting.org/download/foomatic/foomatic-filters-3.0-%{filtersver}.tar.gz
-Source2: http://www.linuxprinting.org/download/foomatic/foomatic-db-3.0-%{dbver}.tar.gz
+Source1: http://www.linuxprinting.org/download/foomatic/foomatic-filters-%{filtersver}.tar.gz
+Source2: http://www.linuxprinting.org/download/foomatic/foomatic-db-%{dbver_rel}-%{dbver_snap}.tar.gz
 Source3: http://www.linuxprinting.org/download/foomatic/foomatic-db-hpijs-%{hpijsver}.tar.gz
 
 # Use libdir.
 Patch1: foomatic-filters-libdir.patch
 Patch2: foomatic-db-engine-libdir.patch
 
-# Set GS_FONTPATH in gs wrapper (bug #81410).
-Patch5: foomatic-2.0.2-fontpath.patch
-
 # Handle non-UTF-8 encodings in imported PPD files.
 Patch15: foomatic-bad-utf8.patch
 
-Patch18: foomatic-sigpipe.patch
-
 Url:		http://www.linuxprinting.org
 BuildRequires:	perl >= 3:5.8.1
 BuildRequires:  perl(ExtUtils::MakeMaker)
@@ -72,24 +68,20 @@
 %prep
 %setup -q -c -a 1 -a 2 -a 3
 
-pushd foomatic-filters-3.0-%{filtersver}
+pushd foomatic-filters-%{filtersver}
 %patch1 -p1 -b .libdir
-%patch5 -p1 -b .fontpath
-%patch18 -p1 -b .sigpipe
-./make_configure
 popd
 
 pushd foomatic-db-engine-%{enginever}
 chmod a+x mkinstalldirs
 %patch2 -p1 -b .libdir
 %patch15 -p1
-./make_configure
 popd
 
 pushd foomatic-db-hpijs-%{hpijsver}
 popd
 
-pushd foomatic-db-%{dbver}
+pushd foomatic-db-%{dbver_snap}
 
 cd db/source
 
@@ -121,7 +113,7 @@
 export CUPS_FILTERS=/usr/lib/cups/filter    # /usr/lib NOT libdir
 export CUPS_PPDS=%{_datadir}/cups/model
 
-pushd foomatic-filters-3.0-%{filtersver}
+pushd foomatic-filters-%{filtersver}
 %configure
 make PREFIX=%{_prefix} CFLAGS="$RPM_OPT_FLAGS"
 popd
@@ -131,7 +123,7 @@
 make PREFIX=%{_prefix} CFLAGS="$RPM_OPT_FLAGS"
 popd
 
-pushd foomatic-db-%{dbver}
+pushd foomatic-db-%{dbver_snap}
 %configure
 make PREFIX=%{_prefix} CFLAGS="$RPM_OPT_FLAGS"
 popd
@@ -144,7 +136,7 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 
-pushd foomatic-filters-3.0-%{filtersver}
+pushd foomatic-filters-%{filtersver}
 eval `perl '-V:installvendorlib' '-V:installvendorarch'`
 mkdir -p $RPM_BUILD_ROOT/$installvendorlib
 export INSTALLSITELIB=$RPM_BUILD_ROOT/$installvendorlib
@@ -152,7 +144,7 @@
 make	DESTDIR=%buildroot PREFIX=%{_prefix} \
 	INSTALLSITELIB=$RPM_BUILD_ROOT/$installvendorlib \
 	INSTALLSITEARCH=$RPM_BUILD_ROOT/$installvendorarch \
-	install
+	install-main install-cups
 popd
 
 pushd foomatic-db-engine-%{enginever}
@@ -162,7 +154,7 @@
 	install
 popd
 
-pushd foomatic-db-%{dbver}
+pushd foomatic-db-%{dbver_snap}
 make	DESTDIR=%buildroot PREFIX=%{_prefix} \
 	INSTALLSITELIB=$RPM_BUILD_ROOT/$installvendorlib \
 	INSTALLSITEARCH=$RPM_BUILD_ROOT/$installvendorarch \
@@ -232,6 +224,9 @@
 %{_var}/cache/foomatic
 
 %changelog
+* Thu Jan 15 2009 Tim Waugh <twaugh at redhat.com> 4.0.0-1
+- 4.0.0.
+
 * Mon Jan 12 2009 Tim Waugh <twaugh at redhat.com> 3.0.2-70
 - Major gutenprint version is 5.2.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/foomatic/devel/sources,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- sources	10 Jan 2009 12:38:46 -0000	1.72
+++ sources	15 Jan 2009 12:14:44 -0000	1.73
@@ -1,4 +1,4 @@
-cfd3335798141fa5892693b39c71f71c  foomatic-db-engine-3.0-20090110.tar.gz
-8948e38765cb108221cfb3d1c9af0dd0  foomatic-db-3.0-20090110.tar.gz
 aa6b0fd89f33fcef91a3a7081b44fc36  foomatic-db-hpijs-20090110.tar.gz
-0d8702e00187a54d5cfd4cdfbab682e1  foomatic-filters-3.0-20090110.tar.gz
+a349bc055d92a47bfbd8b7812beba690  foomatic-db-4.0-20090115.tar.gz
+7e2281ef8b96557afd0cd87400176805  foomatic-db-engine-4.0.0.tar.gz
+1c77a8c86a8fb19012cd79f735564ea2  foomatic-filters-4.0.0.tar.gz


--- foomatic-2.0.2-fontpath.patch DELETED ---


--- foomatic-sigpipe.patch DELETED ---



From caolanm at fedoraproject.org  Thu Jan 15 12:15:55 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Thu, 15 Jan 2009 12:15:55 +0000 (UTC)
Subject: rpms/openoffice.org/devel
	openoffice.org-3.0.1.ooo95702.wizardsdocinfo.patch, NONE,
	1.1 openoffice.org.spec, 1.1755, 1.1756
Message-ID: <20090115121555.5FB807012D@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27017

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-3.0.1.ooo95702.wizardsdocinfo.patch 
Log Message:
Resolves: rhbz#480117 openoffice.org-3.0.1.ooo95702.wizardsdocinfo.patch

openoffice.org-3.0.1.ooo95702.wizardsdocinfo.patch:

--- NEW FILE openoffice.org-3.0.1.ooo95702.wizardsdocinfo.patch ---
diff -ru wizards.orig/com/sun/star/wizards/common/Desktop.java wizards/com/sun/star/wizards/common/Desktop.java
--- openoffice.org.orig/wizards/com/sun/star/wizards/common/Desktop.java	2009-01-15 10:26:05.000000000 +0000
+++ openoffice.org/wizards/com/sun/star/wizards/common/Desktop.java	2009-01-15 10:50:33.000000000 +0000
@@ -28,9 +28,6 @@
  *
  ************************************************************************/package com.sun.star.wizards.common;
 
-import java.util.Date;
-
-import com.sun.star.awt.XToolkit;
 import com.sun.star.beans.PropertyValue;
 import com.sun.star.frame.XDesktop;
 import com.sun.star.frame.XFrame;
diff -ru wizards.orig/com/sun/star/wizards/common/FileAccess.java wizards/com/sun/star/wizards/common/FileAccess.java
--- openoffice.org.orig/wizards/com/sun/star/wizards/common/FileAccess.java	2009-01-15 10:26:05.000000000 +0000
+++ openoffice.org/wizards/com/sun/star/wizards/common/FileAccess.java	2009-01-15 10:51:48.000000000 +0000
@@ -49,6 +49,7 @@
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.uno.XInterface;
 import com.sun.star.util.DateTime;
+import com.sun.star.beans.PropertyValue;
 
 /**
  * This class delivers static convenience methods
@@ -75,9 +76,7 @@
         // As there are several conventions about the look of Url  (e.g. with " " or with "%20") you cannot make a
         // simple String comparison to find out, if a path is already in "ResultPath"
         String[] PathList = JavaTools.ArrayoutofString(ResultPath, ";");
-        boolean badd = false;
         int MaxIndex = PathList.length - 1;
-        int iPos;
         String CompCurPath;
         //  sAddPath.replace(null, (char) 47);
         String CompAddPath = JavaTools.replaceSubString(sAddPath, "", "/");
@@ -568,8 +567,8 @@
             java.util.Vector TitleVector = null;
             java.util.Vector NameVector = null;
             
-            XInterface xDocInterface = (XInterface) xMSF.createInstance("com.sun.star.document.StandaloneDocumentInfo");
-            com.sun.star.document.XStandaloneDocumentInfo xDocInfo = (com.sun.star.document.XStandaloneDocumentInfo) UnoRuntime.queryInterface(com.sun.star.document.XStandaloneDocumentInfo.class, xDocInterface);
+            XInterface xDocInterface = (XInterface) xMSF.createInstance("com.sun.star.document.DocumentProperties");
+            com.sun.star.document.XDocumentProperties xDocInfo = (com.sun.star.document.XDocumentProperties) UnoRuntime.queryInterface(com.sun.star.document.XDocumentProperties.class, xDocInterface);
 
             XInterface xInterface = (XInterface) xMSF.createInstance("com.sun.star.ucb.SimpleFileAccess");
             com.sun.star.ucb.XSimpleFileAccess xSimpleFileAccess = (com.sun.star.ucb.XSimpleFileAccess) UnoRuntime.queryInterface(com.sun.star.ucb.XSimpleFileAccess.class, xInterface);
@@ -582,12 +581,13 @@
             FilterName = FilterName == null || FilterName.equals("") ? null : FilterName + "-"; 
             
             String fileName = "";
+            PropertyValue[] noArgs = { };
             for (int i = 0; i < nameList.length; i++) {
                 fileName = getFilename( nameList[i] );
                 
                 if (FilterName == null || fileName.startsWith(FilterName)) {
                     
-                    xDocInfo.loadFromURL(nameList[i]);
+                    xDocInfo.loadFromMedium(nameList[i], noArgs);
                     NameVector.addElement(nameList[i]);
                     TitleVector.addElement(com.sun.star.uno.AnyConverter.toString(Helper.getUnoPropertyValue(xDocInterface, "Title")));
                     
@@ -673,10 +673,10 @@
         String sTitle = "";
         try
         {
-            XInterface xDocInterface = (XInterface) xMSF.createInstance("com.sun.star.document.StandaloneDocumentInfo");
-            com.sun.star.document.XStandaloneDocumentInfo xDocInfo = (com.sun.star.document.XStandaloneDocumentInfo) UnoRuntime.queryInterface(com.sun.star.document.XStandaloneDocumentInfo.class, xDocInterface);
-
-            xDocInfo.loadFromURL(_sFile);
+            XInterface xDocInterface = (XInterface) xMSF.createInstance("com.sun.star.document.DocumentProperties");
+            com.sun.star.document.XDocumentProperties xDocInfo = (com.sun.star.document.XDocumentProperties) UnoRuntime.queryInterface(com.sun.star.document.XDocumentProperties.class, xDocInterface);
+            PropertyValue[] noArgs = { };
+            xDocInfo.loadFromMedium(_sFile, noArgs);
             sTitle = com.sun.star.uno.AnyConverter.toString(Helper.getUnoPropertyValue(xDocInterface, "Title"));
         }
         catch (Exception e)
diff -ru wizards.orig/com/sun/star/wizards/common/Helper.java wizards/com/sun/star/wizards/common/Helper.java
--- openoffice.org.orig/wizards/com/sun/star/wizards/common/Helper.java	2009-01-15 10:26:05.000000000 +0000
+++ openoffice.org/wizards/com/sun/star/wizards/common/Helper.java	2009-01-15 10:52:25.000000000 +0000
@@ -35,10 +35,8 @@
 import com.sun.star.beans.Property;
 import com.sun.star.beans.PropertyValue;
 import com.sun.star.beans.XPropertySet;
-import com.sun.star.i18n.NumberFormatIndex;
 import com.sun.star.lang.Locale;
 import com.sun.star.lang.XMultiServiceFactory;
-import com.sun.star.uno.Any;
 import com.sun.star.uno.AnyConverter;
 import com.sun.star.uno.RuntimeException;
 import com.sun.star.uno.UnoRuntime;
diff -ru wizards.orig/com/sun/star/wizards/web/data/CGDocument.java wizards/com/sun/star/wizards/web/data/CGDocument.java
--- openoffice.org.orig/wizards/com/sun/star/wizards/web/data/CGDocument.java	2009-01-15 10:26:05.000000000 +0000
+++ openoffice.org/wizards/com/sun/star/wizards/web/data/CGDocument.java	2009-01-15 10:46:13.000000000 +0000
@@ -38,7 +38,7 @@
 import com.sun.star.document.MacroExecMode;
 import com.sun.star.document.UpdateDocMode;
 import com.sun.star.document.XDocumentInfoSupplier;
-import com.sun.star.document.XStandaloneDocumentInfo;
+import com.sun.star.document.XDocumentProperties;
 import com.sun.star.frame.XComponentLoader;
 import com.sun.star.frame.XDesktop;
 import com.sun.star.lang.XComponent;
@@ -174,9 +174,10 @@
         
         //first get the info object which is a DocumentInfo service.
         Object info = null;
-        if (isSODocument) {//for SO documents, use StandaloneDocumentInfo service.
-            info = xmsf.createInstance("com.sun.star.document.StandaloneDocumentInfo");
-            ((XStandaloneDocumentInfo)UnoRuntime.queryInterface(XStandaloneDocumentInfo.class, info)).loadFromURL(cp_URL);
+        if (isSODocument) {//for SO documents
+            PropertyValue[] noArgs = { };
+            info = xmsf.createInstance("com.sun.star.document.DocumentProperties");
+            ((XDocumentProperties)UnoRuntime.queryInterface(XDocumentProperties.class, info)).loadFromMedium(cp_URL, noArgs);
         }
         
         task.advance(true); //3
diff -ru wizards.orig/source/euro/AutoPilotRun.xba wizards/source/euro/AutoPilotRun.xba
--- openoffice.org.orig/wizards/source/euro/AutoPilotRun.xba	2009-01-15 10:26:05.000000000 +0000
+++ openoffice.org/wizards/source/euro/AutoPilotRun.xba	2009-01-15 11:46:57.000000000 +0000
@@ -17,7 +17,6 @@
 Public Password as String
 Public DocIndex as Integer
 Public oPathSettings as Object
-Public oDocInfo as Object
 Public oUcb as Object
 Public TotDocCount as Integer
 Public sTotDocCount as String
@@ -30,7 +29,6 @@
 	BasicLibraries.LoadLibrary(&quot;Tools&quot;)
 	BasicLibraries.LoadLibrary(&quot;ImportWizard&quot;)
 	If InitResources(&quot;Euro Converter&quot;, &quot;eur&quot;) Then
-		oDocInfo = CreateUnoService(&quot;com.sun.star.document.StandaloneDocumentInfo&quot;)
 		oUcb = createUnoService(&quot;com.sun.star.ucb.SimpleFileAccess&quot;)
 		oLocale = GetStarOfficeLocale()
 		InitializeConverter(oLocale, 2)
@@ -303,7 +301,7 @@
 	If bIsValid Then
 		If DialogModel.optSingleFile.State = 1 Then
 			If bCheckFileType Then
-				sLocMimeType = GetRealFileContent(oDocInfo, sPath)
+				sLocMimeType = GetRealFileContent(sPath)
 				If DialogModel.chkTextDocuments.State = 1 Then
 					If (Instr(1, sLocMimeType, &quot;text&quot;) = 0) And (Instr(1, sLocMimeType, &quot;calc&quot;) = 0) Then
 						Msgbox(sMsgFileInvalid, 48, sMsgDLGTITLE)
@@ -408,4 +406,4 @@
 	DialogModel.cmdGoOn.Label =  sGOON
 	DialogModel.cmdCancel.Label = sCANCEL
 End Sub
-</script:module>
\ No newline at end of file
+</script:module>
diff -ru wizards.orig/source/importwizard/FilesModul.xba wizards/source/importwizard/FilesModul.xba
--- openoffice.org.orig/wizards/source/importwizard/FilesModul.xba	2009-01-15 10:26:05.000000000 +0000
+++ openoffice.org/wizards/source/importwizard/FilesModul.xba	2009-01-15 12:06:26.000000000 +0000
@@ -41,7 +41,6 @@
 Dim XMLTemplateContentString as String
 Dim ApplIndex as Integer
 Dim bAssignFileName as Boolean
-	oDocInfo = CreateUnoService(&quot;com.sun.star.document.StandaloneDocumentInfo&quot;)
 	bInterruptSearch = False
 	For i = 0 To MaxCollectIndex
 		SearchDir = PathCollection(i,0)
@@ -71,7 +70,7 @@
 						CurFileContent = &quot;&quot;
 						CurFileName = NewList(n,0)													
 						If (FieldInList(NewList(n,1), XMLTemplateList())) Then
-							CurFileContent = GetRealFileContent(oDocInfo, CurFileName)
+							CurFileContent = GetRealFileContent(CurFileName)
 							t = SearchArrayforPartString(CurFileContent, XMLTemplateContentList())
 						 	bAssignFileName = (t &gt; -1)
 						 	If bAssignFileName Then
@@ -822,4 +821,4 @@
 	End If				
 	ConcatComment = sComment
 End Function
-</script:module>
\ No newline at end of file
+</script:module>
diff -ru wizards.orig/source/tools/UCB.xba wizards/source/tools/UCB.xba
--- openoffice.org.orig/wizards/source/tools/UCB.xba	2009-01-15 10:26:05.000000000 +0000
+++ openoffice.org/wizards/source/tools/UCB.xba	2009-01-15 12:05:38.000000000 +0000
@@ -9,6 +9,7 @@
 Dim DirIndex As Integer
 Dim iDirCount as Integer
 Public bInterruptSearch as Boolean
+Public NoArgs()as New com.sun.star.beans.PropertyValue
 
 Sub Main()
 Dim LocsfileContent(0) as String
@@ -64,7 +65,7 @@
 						End If
 					Else
 						If bcheckFileType Then
-							RealFileContent  = GetRealFileContent(oDocInfo, FileName)
+							RealFileContent = GetRealFileContent(FileName)
 						Else
 							RealFileContent = GetFileNameExtension(FileName)
 						End If
@@ -146,11 +147,11 @@
 Function RetrieveDocTitle(oDocInfo as Object, sFileName as String) As String
 Dim sDocTitle as String
 	On Local Error Goto NOFILE
-	oDocInfo.Read(sFileName)
+	oDocInfo.loadFromMedium(sFileName, NoArgs())
 	sDocTitle = oDocInfo.Title
 	NOFILE:
 	If Err &lt;&gt; 0 Then
-		GetRealFileContent = &quot;&quot;
+		RetrieveDocTitle = &quot;&quot;
 		RESUME CLR_ERROR
 	End If
 	CLR_ERROR:
@@ -163,10 +164,10 @@
 
 &apos; Retrieves The Filecontent of a Document by extracting the content
 &apos; from the Header of the document
-Function GetRealFileContent(oDocInfo as Object, FileName as String) As String
+Function GetRealFileContent(FileName as String) As String
 	On Local Error Goto NOFILE
-	oDocInfo.Read(FileName)
-	GetRealFileContent = oDocInfo.MIMEType
+	oTypeDetect = createUnoService(&quot;com.sun.star.document.TypeDetection&quot;)
+	GetRealFileContent = oTypeDetect.queryTypeByURL(FileName)
 	NOFILE:
 	If Err &lt;&gt; 0 Then
 		GetRealFileContent = &quot;&quot;
@@ -290,4 +291,4 @@
 	End If
 GOON:
 End Function
-</script:module>
\ No newline at end of file
+</script:module>


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1755
retrieving revision 1.1756
diff -u -r1.1755 -r1.1756
--- openoffice.org.spec	14 Jan 2009 23:13:54 -0000	1.1755
+++ openoffice.org.spec	15 Jan 2009 12:15:24 -0000	1.1756
@@ -136,6 +136,7 @@
 Patch63: openoffice.org-3.0.1.ooo97488.sw.ww8toc.patch
 Patch64: openoffice.org-3.0.1.ooo98024.vcl.emboldenoverlap.patch
 Patch65: openoffice.org-3.0.1.oooXXXXX.fpicker.allformatsonsave.patch
+Patch66: openoffice.org-3.0.1.ooo95702.wizardsdocinfo.patch
 
 %define instdir %{_libdir}
 %define baseinstdir %{instdir}/openoffice.org
@@ -1419,6 +1420,7 @@
 %patch63 -p1 -b .ooo97488.sw.ww8toc.patch
 %patch64 -p1 -b .ooo98024.vcl.emboldenoverlap.patch
 %patch65 -p1 -b .oooXXXXX.fpicker.allformatsonsave.patch
+%patch66 -p1 -b .ooo95702.wizardsdocinfo.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -3828,11 +3830,12 @@
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
-* Wed Jan 14 2009 Caol??n McNamara <caolanm at redhat.com> - 1:3.0.1-15.2
+* Tue Jan 15 2009 Caol??n McNamara <caolanm at redhat.com> - 1:3.0.1-15.2
 - Resolves: rhbz#479624 add
   openoffice.org-3.0.1.ooo98024.vcl.emboldenoverlap.patch
 - add hyphen-uk, hyphen-pt dependency
 - Resolves: rhbz#479163 openoffice.org-3.0.1.oooXXXXX.fpicker.allformatsonsave.patch
+- Resolves: rhbz#480117 openoffice.org-3.0.1.ooo95702.wizardsdocinfo.patch
 
 * Mon Jan 12 2009 Caol??n McNamara <caolanm at redhat.com> - 1:3.0.1-15.1
 - next milestone



From tmraz at fedoraproject.org  Thu Jan 15 12:19:56 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Thu, 15 Jan 2009 12:19:56 +0000 (UTC)
Subject: rpms/afflib/devel afflib.spec,1.22,1.23
Message-ID: <20090115121956.C65B27012D@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/afflib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27672

Modified Files:
	afflib.spec 
Log Message:
* Thu Jan 15 2009 Tomas Mraz <tmraz at redhat.com> - 3.3.4-5
- rebuild with new openssl
- call libtoolize to refresh libtool



Index: afflib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/afflib/devel/afflib.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- afflib.spec	15 Jan 2009 11:31:29 -0000	1.22
+++ afflib.spec	15 Jan 2009 12:19:26 -0000	1.23
@@ -68,6 +68,7 @@
 
 # Autoreconf
 autoreconf
+libtoolize
 
 
 %build
@@ -124,6 +125,7 @@
 %changelog
 * Thu Jan 15 2009 Tomas Mraz <tmraz at redhat.com> - 3.3.4-5
 - rebuild with new openssl
+- call libtoolize to refresh libtool
 
 * Fri Oct  3 2008 kwizart < kwizart at gmail.com > - 3.3.4-4
 - Fix release mismatch



From tmraz at fedoraproject.org  Thu Jan 15 12:22:55 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Thu, 15 Jan 2009 12:22:55 +0000 (UTC)
Subject: rpms/alpine/devel alpine.spec,1.15,1.16
Message-ID: <20090115122255.9D8E87012D@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/alpine/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28122

Modified Files:
	alpine.spec 
Log Message:
* Thu Jan 15 2009 Tomas Mraz <tmraz at redhat.com> 2.00-3
- rebuild with new openssl



Index: alpine.spec
===================================================================
RCS file: /cvs/pkgs/rpms/alpine/devel/alpine.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- alpine.spec	26 Nov 2008 21:00:44 -0000	1.15
+++ alpine.spec	15 Jan 2009 12:22:25 -0000	1.16
@@ -3,7 +3,7 @@
 Summary: powerful, easy to use console email client
 Name: alpine
 Version: 2.00 
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 License: ASL 2.0
 Group: Applications/Internet
@@ -111,6 +111,9 @@
 
 
 %changelog
+* Thu Jan 15 2009 Tomas Mraz <tmraz at redhat.com> 2.00-3
+- rebuild with new openssl
+
 * Wed Nov 26 2008 Joshua Daniel Franklin <joshuadfranklin at yahoo.com> 2.00-2
 - Fix package Summary text to not include package name
 - http://www.redhat.com/archives/fedora-devel-list/2008-November/msg01484.html



From denis at fedoraproject.org  Thu Jan 15 12:27:29 2009
From: denis at fedoraproject.org (Denis Leroy)
Date: Thu, 15 Jan 2009 12:27:29 +0000 (UTC)
Subject: rpms/libxml++/F-10 .cvsignore, 1.10, 1.11 libxml++.spec, 1.24,
	1.25 sources, 1.10, 1.11
Message-ID: <20090115122729.69CE27012D@cvs1.fedora.phx.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/libxml++/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29434

Modified Files:
	.cvsignore libxml++.spec sources 
Log Message:
Update to 2.24.2 (memleak fixes). Fixed Gnome FTP URL


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libxml++/F-10/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	6 Aug 2008 00:00:06 -0000	1.10
+++ .cvsignore	15 Jan 2009 12:26:58 -0000	1.11
@@ -1 +1 @@
-libxml++-2.23.2.tar.bz2
+libxml++-2.24.2.tar.bz2


Index: libxml++.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libxml++/F-10/libxml++.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- libxml++.spec	29 Aug 2008 18:27:55 -0000	1.24
+++ libxml++.spec	15 Jan 2009 12:26:59 -0000	1.25
@@ -1,15 +1,17 @@
 Name:           libxml++
-Version:        2.23.2
-Release:        2%{?dist}
+Version:        2.24.2
+Release:        1%{?dist}
 Summary:        C++ wrapper for the libxml2 XML parser library
 
 Group:          System Environment/Libraries
 License:        LGPLv2+
 URL:            http://libxmlplusplus.sourceforge.net/
-Source:         http://ftp.gnome.org/pub/GNOME/sources/libxml++/%{version}/libxml++-%{version}.tar.bz2
+Source:         http://ftp.gnome.org/pub/GNOME/sources/libxml++/2.24/libxml++-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  libxml2-devel >= 2.6.1, doxygen, glibmm24-devel >= 2.4.0
+BuildRequires:  libxml2-devel >= 2.6.1
+BuildRequires:  glibmm24-devel >= 2.4.0
+BuildRequires:  doxygen, graphviz
 
 %description
 libxml++ is a C++ wrapper for the libxml2 XML parser library. It's original
@@ -83,6 +85,10 @@
 
 
 %changelog
+* Thu Jan 15 2009 Denis Leroy <denis at poolshark.org> - 2.24.2-1
+- Update to 2.24.2 (memleak fixes)
+- Fixed Gnome FTP URL
+
 * Fri Aug 29 2008 Michael Schwendt <mschwendt at fedoraproject.org> - 2.23.2-2
 - Include unowned directories
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libxml++/F-10/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	6 Aug 2008 00:00:06 -0000	1.10
+++ sources	15 Jan 2009 12:26:59 -0000	1.11
@@ -1 +1 @@
-161bb2d92af614e9d78f79ec42d4954a  libxml++-2.23.2.tar.bz2
+ec98c0975cc21d62c3e9e71f3beffde2  libxml++-2.24.2.tar.bz2



From mtasaka at fedoraproject.org  Thu Jan 15 12:32:11 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Thu, 15 Jan 2009 12:32:11 +0000 (UTC)
Subject: rpms/ochusha/devel ochusha.spec,1.92,1.93
Message-ID: <20090115123211.41D707012D@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/ochusha/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30098

Modified Files:
	ochusha.spec 
Log Message:
* Thu Jan 15 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
- F-11: rebuild against new openssl



Index: ochusha.spec
===================================================================
RCS file: /cvs/extras/rpms/ochusha/devel/ochusha.spec,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -r1.92 -r1.93
--- ochusha.spec	6 Jan 2009 05:48:04 -0000	1.92
+++ ochusha.spec	15 Jan 2009 12:31:40 -0000	1.93
@@ -33,7 +33,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
@@ -217,6 +217,9 @@
 %{_datadir}/icons/hicolor/48x48/apps/*.png
 
 %changelog
+* Thu Jan 15 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- F-11: rebuild against new openssl
+
 * Tue Jan  6 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
 - Use latest CVS
 



From tmraz at fedoraproject.org  Thu Jan 15 12:36:27 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Thu, 15 Jan 2009 12:36:27 +0000 (UTC)
Subject: rpms/amanda/devel amanda.spec,1.55,1.56
Message-ID: <20090115123627.D7A597012D@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/amanda/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30744

Modified Files:
	amanda.spec 
Log Message:
* Thu Jan 15 2009 Tomas Mraz <tmraz at redhat.com> 2.6.0p2-5
- rebuild with new openssl



Index: amanda.spec
===================================================================
RCS file: /cvs/pkgs/rpms/amanda/devel/amanda.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- amanda.spec	20 Nov 2008 12:00:29 -0000	1.55
+++ amanda.spec	15 Jan 2009 12:35:57 -0000	1.56
@@ -7,7 +7,7 @@
 Summary: A network-capable tape backup solution
 Name: amanda
 Version: 2.6.0p2
-Release: 4%{?dist}
+Release: 5%{?dist}
 Source: http://downloads.sourceforge.net/amanda/amanda-%{version}.tar.gz
 #Source: http://www.zmanda.com/downloads/community/community-builds/amanda-%{version}.tar.gz
 Source1: amanda.crontab
@@ -373,6 +373,9 @@
 %{_libdir}/libamandad.so
 
 %changelog
+* Thu Jan 15 2009 Tomas Mraz <tmraz at redhat.com> 2.6.0p2-5
+- rebuild with new openssl
+
 * Thu Nov 20 2008 Daniel Novotny <dnovotny at redhat.com> 2.6.0p2-4
   .usernameupdate extension changed to .rpmsave (#472349)
 



From tmraz at fedoraproject.org  Thu Jan 15 12:38:06 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Thu, 15 Jan 2009 12:38:06 +0000 (UTC)
Subject: rpms/apcupsd/devel apcupsd.spec,1.27,1.28
Message-ID: <20090115123806.30CD27012D@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/apcupsd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31039

Modified Files:
	apcupsd.spec 
Log Message:
* Thu Jan 15 2009 Tomas Mraz <tmraz at redhat.com> - 3.14.4-3
- rebuild with new openssl



Index: apcupsd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/apcupsd/devel/apcupsd.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- apcupsd.spec	6 Jun 2008 09:52:12 -0000	1.27
+++ apcupsd.spec	15 Jan 2009 12:37:35 -0000	1.28
@@ -1,6 +1,6 @@
 Name:         apcupsd
 Version:      3.14.4
-Release:      2%{?dist}
+Release:      3%{?dist}
 Summary:      APC UPS Power Control Daemon for Linux
 
 Group:        System Environment/Daemons
@@ -171,6 +171,9 @@
 
 
 %changelog
+* Thu Jan 15 2009 Tomas Mraz <tmraz at redhat.com> - 3.14.4-3
+- rebuild with new openssl
+
 * Fri Jun 06 2008 Tomas Smetana <tsmetana at redhat.com> - 3.14.4-2
 - drop useless build requirements
 - fix #448637 - hosts.conf and multimon.conf should be in apcupsd-cgi



From tmraz at fedoraproject.org  Thu Jan 15 12:49:27 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Thu, 15 Jan 2009 12:49:27 +0000 (UTC)
Subject: rpms/asterisk/devel asterisk.spec,1.47,1.48
Message-ID: <20090115124927.4E32C7012D@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/asterisk/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32448

Modified Files:
	asterisk.spec 
Log Message:
* Thu Jan 15 2009 Tomas Mraz <tmraz at redhat.com> - 1.6.1-0.13.beta4
- rebuild with new openssl



Index: asterisk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/devel/asterisk.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- asterisk.spec	5 Jan 2009 02:26:17 -0000	1.47
+++ asterisk.spec	15 Jan 2009 12:48:56 -0000	1.48
@@ -3,7 +3,7 @@
 Summary: The Open Source PBX
 Name: asterisk
 Version: 1.6.1
-Release: 0.12.%{?beta:beta%{beta}}%{?dist}
+Release: 0.13.%{?beta:beta%{beta}}%{?dist}
 License: GPLv2
 Group: Applications/Internet
 URL: http://www.asterisk.org/
@@ -1080,6 +1080,9 @@
 %{_libdir}/asterisk/modules/app_voicemail_plain.so
 
 %changelog
+* Thu Jan 15 2009 Tomas Mraz <tmraz at redhat.com> - 1.6.1-0.13.beta4
+- rebuild with new openssl
+
 * Sun Jan  4 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6.1-0.12.beta4
 - Fedora Directory Server compatibility patch/subpackage.
 



From twaugh at fedoraproject.org  Thu Jan 15 12:56:48 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Thu, 15 Jan 2009 12:56:48 +0000 (UTC)
Subject: rpms/system-config-printer/devel
	system-config-printer-1.1.2.tar.bz2.sig, NONE, 1.1 .cvsignore,
	1.194, 1.195 sources, 1.200, 1.201 system-config-printer.spec,
	1.240, 1.241 system-config-printer-1.1.1.tar.bz2.sig, 1.1, NONE
Message-ID: <20090115125648.D788A70141@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-serv956

Modified Files:
	.cvsignore sources system-config-printer.spec 
Added Files:
	system-config-printer-1.1.2.tar.bz2.sig 
Removed Files:
	system-config-printer-1.1.1.tar.bz2.sig 
Log Message:
* Thu Jan 15 2009 Tim Waugh <twaugh at redhat.com> 1.1.2-1
- 1.1.2.
- Requires gnome-python2-gnomekeyring.



--- NEW FILE system-config-printer-1.1.2.tar.bz2.sig ---
??

Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/devel/.cvsignore,v
retrieving revision 1.194
retrieving revision 1.195
diff -u -r1.194 -r1.195
--- .cvsignore	8 Jan 2009 18:04:55 -0000	1.194
+++ .cvsignore	15 Jan 2009 12:56:18 -0000	1.195
@@ -193,3 +193,4 @@
 system-config-printer-1.1.0.tar.bz2
 system-config-printer-1.1.1.tar.bz2
 pycups-1.9.45.tar.bz2
+system-config-printer-1.1.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/devel/sources,v
retrieving revision 1.200
retrieving revision 1.201
diff -u -r1.200 -r1.201
--- sources	8 Jan 2009 18:04:56 -0000	1.200
+++ sources	15 Jan 2009 12:56:18 -0000	1.201
@@ -1,3 +1,3 @@
 ac8f98a40b0fc4b6ab4470f10489887a  pysmbc-1.0.6.tar.bz2
-95ad721f3d274557144ddcf5e458a9e4  system-config-printer-1.1.1.tar.bz2
 ff634a6751f8a859ed26751bf03abef0  pycups-1.9.45.tar.bz2
+9f71b7791259b456430bc1a0c7491365  system-config-printer-1.1.2.tar.bz2


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/devel/system-config-printer.spec,v
retrieving revision 1.240
retrieving revision 1.241
diff -u -r1.240 -r1.241
--- system-config-printer.spec	8 Jan 2009 18:04:56 -0000	1.240
+++ system-config-printer.spec	15 Jan 2009 12:56:18 -0000	1.241
@@ -6,8 +6,8 @@
 
 Summary: A printer administration tool
 Name: system-config-printer
-Version: 1.1.1
-Release: 2%{?dist}
+Version: 1.1.2
+Release: 1%{?dist}
 License: GPLv2+
 URL: http://cyberelk.net/tim/software/system-config-printer/
 Group: System Environment/Base
@@ -35,6 +35,7 @@
 Requires: gnome-python2-gnome
 Requires: notification-daemon
 Requires: notify-python
+Requires: gnome-python2-gnomekeyring
 
 Obsoletes: system-config-printer-gui <= 0.6.152
 Provides: system-config-printer-gui = 0.6.152
@@ -122,6 +123,7 @@
 %{_datadir}/%{name}/glade.py*
 %{_datadir}/%{name}/GroupsPane.py*
 %{_datadir}/%{name}/GroupsPaneModel.py*
+%{_datadir}/%{name}/gtkinklevel.py*
 %{_datadir}/%{name}/HIG.py*
 %{_datadir}/%{name}/installpackage.py*
 %{_datadir}/%{name}/jobviewer.py*
@@ -159,6 +161,10 @@
 exit 0
 
 %changelog
+* Thu Jan 15 2009 Tim Waugh <twaugh at redhat.com> 1.1.2-1
+- 1.1.2.
+- Requires gnome-python2-gnomekeyring.
+
 * Thu Jan  8 2009 Tim Waugh <twaugh at redhat.com> 1.1.1-2
 - Updated pycups to 1.9.45.
 


--- system-config-printer-1.1.1.tar.bz2.sig DELETED ---



From tmraz at fedoraproject.org  Thu Jan 15 12:57:16 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Thu, 15 Jan 2009 12:57:16 +0000 (UTC)
Subject: rpms/authd/devel authd.spec,1.52,1.53
Message-ID: <20090115125716.7377470142@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/authd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1032

Modified Files:
	authd.spec 
Log Message:
* Thu Jan 15 2009 Tomas Mraz <tmraz at redhat.com> - 1.4.3-22
- rebuild with new openssl



Index: authd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/authd/devel/authd.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- authd.spec	23 Jul 2008 15:17:59 -0000	1.52
+++ authd.spec	15 Jan 2009 12:56:46 -0000	1.53
@@ -1,7 +1,7 @@
 Summary: A RFC 1413 ident protocol daemon
 Name: authd
 Version: 1.4.3
-Release: 21%{?dist}
+Release: 22%{?dist}
 License: GPLv2+
 Group: System Environment/Daemons
 URL: https://fedorahosted.org/authd/
@@ -73,6 +73,9 @@
 %{_sbindir}/in.authd
 
 %changelog
+* Thu Jan 15 2009 Tomas Mraz <tmraz at redhat.com> - 1.4.3-22
+- rebuild with new openssl
+
 * Wed Jul 23 2008 Roman Rakus <rrakus at redhat.com> - 1.4.3-21
 - Corrected config directive for ident.key to noreplace
 - Fixed some typos in specfile



From rakesh at fedoraproject.org  Thu Jan 15 13:07:53 2009
From: rakesh at fedoraproject.org (Rakesh Pandit)
Date: Thu, 15 Jan 2009 13:07:53 +0000 (UTC)
Subject: rpms/fakechroot/devel fakechroot.spec,1.6,1.7
Message-ID: <20090115130754.01F007012D@cvs1.fedora.phx.redhat.com>

Author: rakesh

Update of /cvs/pkgs/rpms/fakechroot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3042

Modified Files:
	fakechroot.spec 
Log Message:
Fixed URL.



Index: fakechroot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fakechroot/devel/fakechroot.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- fakechroot.spec	5 Oct 2008 10:36:51 -0000	1.6
+++ fakechroot.spec	15 Jan 2009 13:07:23 -0000	1.7
@@ -1,10 +1,10 @@
 Summary: Gives a fake chroot environment
 Name: fakechroot
 Version: 2.8
-Release: 15%{?dist}
+Release: 16%{?dist}
 License: LGPLv2+
 Group: Development/Tools
-URL: http://packages.debian.org/unstable/utils/fakechroot.html
+URL: http://fakechroot.alioth.debian.org/
 Source0: http://ftp.debian.org/debian/pool/main/f/fakechroot/%{name}_%{version}.orig.tar.gz
 Patch0: fakechroot-2.8-initsocketlen.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
@@ -55,6 +55,9 @@
 %{_mandir}/man1/fakechroot.1.gz
 
 %changelog
+* Thu Jan 15 2009 Rakesh Pandit <rakesh at fedoraproject.org> 2.8-16
+- Fixed URL
+
 * Sun Oct  5 2008 Axel Thimm <Axel.Thimm at ATrpms.net> - 2.8-15
 - Fix getpeername/getsockname socklen initialization.
 



From tmraz at fedoraproject.org  Thu Jan 15 13:12:07 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Thu, 15 Jan 2009 13:12:07 +0000 (UTC)
Subject: rpms/balsa/devel balsa.spec,1.44,1.45
Message-ID: <20090115131207.5D5D17012D@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/balsa/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3594

Modified Files:
	balsa.spec 
Log Message:
* Thu Jan 15 2009 Tomas Mraz <tmraz at redhat.com> - 2.3.26-4
- rebuild with new openssl



Index: balsa.spec
===================================================================
RCS file: /cvs/pkgs/rpms/balsa/devel/balsa.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- balsa.spec	18 Dec 2008 21:31:53 -0000	1.44
+++ balsa.spec	15 Jan 2009 13:11:36 -0000	1.45
@@ -2,7 +2,7 @@
 
 Name:           balsa
 Version:        2.3.26
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Mail Client
 
 Group:          Applications/Internet
@@ -106,6 +106,9 @@
 
 
 %changelog
+* Thu Jan 15 2009 Tomas Mraz <tmraz at redhat.com> - 2.3.26-4
+- rebuild with new openssl
+
 * Thu Dec 18 2008 Pawel Salek <pawsa at theochem.kth.se> - 2.3.26-3
 - Port to gmime-2.4 using http://bugzilla.gnome.org/537507 
 



From tmraz at fedoraproject.org  Thu Jan 15 13:13:00 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Thu, 15 Jan 2009 13:13:00 +0000 (UTC)
Subject: rpms/bes/devel bes.spec,1.10,1.11
Message-ID: <20090115131300.981C07012D@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/bes/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3794

Modified Files:
	bes.spec 
Log Message:
* Thu Jan 15 2009 Tomas Mraz <tmraz at redhat.com> 3.6.2-2
- rebuild with new openssl



Index: bes.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bes/devel/bes.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- bes.spec	10 Sep 2008 16:54:52 -0000	1.10
+++ bes.spec	15 Jan 2009 13:12:30 -0000	1.11
@@ -6,7 +6,7 @@
 
 Name:           bes
 Version:        3.6.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Back-end server software framework for OPeNDAP
 
 Group:          System Environment/Libraries
@@ -155,6 +155,9 @@
 %doc __distribution_docs/api-html/
 
 %changelog
+* Thu Jan 15 2009 Tomas Mraz <tmraz at redhat.com> 3.6.2-2
+- rebuild with new openssl
+
 * Fri Sep  5 2008 Patrice Dumas <pertusus at free.fr> 3.6.2-1
 - update to 3.6.2
 



From limb at fedoraproject.org  Thu Jan 15 13:21:54 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Thu, 15 Jan 2009 13:21:54 +0000 (UTC)
Subject: rpms/drupal/F-10 .cvsignore, 1.15, 1.16 drupal.spec, 1.19,
	1.20 sources, 1.16, 1.17
Message-ID: <20090115132154.A79107012D@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/drupal/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4868/F-10

Modified Files:
	.cvsignore drupal.spec sources 
Log Message:
DRUPAL-SA-CORE-2009-001




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/drupal/F-10/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	22 Oct 2008 20:21:03 -0000	1.15
+++ .cvsignore	15 Jan 2009 13:21:24 -0000	1.16
@@ -1 +1 @@
-drupal-6.6.tar.gz
+drupal-6.9.tar.gz


Index: drupal.spec
===================================================================
RCS file: /cvs/pkgs/rpms/drupal/F-10/drupal.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- drupal.spec	11 Dec 2008 13:10:47 -0000	1.19
+++ drupal.spec	15 Jan 2009 13:21:24 -0000	1.20
@@ -1,6 +1,6 @@
 %define drupaldir %{_datadir}/drupal
 Name: drupal
-Version:  6.7
+Version:  6.9
 Release:  1%{?dist}
 Summary: An open-source content-management platform
 
@@ -72,6 +72,9 @@
 %dir %attr(775,root,apache) %{_localstatedir}/lib/drupal/
 
 %changelog
+* Thu Jan 15 2009 Jon Ciesla <limb at jcomserv.net> - 6.9-1
+- Upgrade to 6.9, DRUPAL-SA-CORE-2009-001.
+
 * Thu Dec 11 2008 Jon Ciesla <limb at jcomserv.net> - 6.7-1
 - Upgrade to 6.7, SA-2008-073.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/drupal/F-10/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources	11 Dec 2008 13:10:47 -0000	1.16
+++ sources	15 Jan 2009 13:21:24 -0000	1.17
@@ -1 +1 @@
-c9e8e5a9892538d355c62bd17b95b3a9  drupal-6.7.tar.gz
+5c682a4709f4632febbe7617a784a01a  drupal-6.9.tar.gz



From limb at fedoraproject.org  Thu Jan 15 13:21:55 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Thu, 15 Jan 2009 13:21:55 +0000 (UTC)
Subject: rpms/drupal/F-9 drupal.spec,1.19,1.20 sources,1.16,1.17
Message-ID: <20090115132155.38E777012D@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/drupal/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4868/F-9

Modified Files:
	drupal.spec sources 
Log Message:
DRUPAL-SA-CORE-2009-001




Index: drupal.spec
===================================================================
RCS file: /cvs/pkgs/rpms/drupal/F-9/drupal.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- drupal.spec	11 Dec 2008 13:10:47 -0000	1.19
+++ drupal.spec	15 Jan 2009 13:21:24 -0000	1.20
@@ -1,6 +1,6 @@
 %define drupaldir %{_datadir}/drupal
 Name: drupal
-Version:  6.7
+Version:  6.9
 Release:  1%{?dist}
 Summary: An open-source content-management platform
 
@@ -72,6 +72,9 @@
 %dir %attr(775,root,apache) %{_localstatedir}/lib/drupal/
 
 %changelog
+* Thu Jan 15 2009 Jon Ciesla <limb at jcomserv.net> - 6.9-1
+- Upgrade to 6.9, DRUPAL-SA-CORE-2009-001.
+
 * Thu Dec 11 2008 Jon Ciesla <limb at jcomserv.net> - 6.7-1
 - Upgrade to 6.7, SA-2008-073.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/drupal/F-9/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources	11 Dec 2008 13:10:47 -0000	1.16
+++ sources	15 Jan 2009 13:21:24 -0000	1.17
@@ -1 +1 @@
-c9e8e5a9892538d355c62bd17b95b3a9  drupal-6.7.tar.gz
+5c682a4709f4632febbe7617a784a01a  drupal-6.9.tar.gz



From tmraz at fedoraproject.org  Thu Jan 15 13:23:25 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Thu, 15 Jan 2009 13:23:25 +0000 (UTC)
Subject: rpms/bigloo/devel bigloo.spec,1.29,1.30
Message-ID: <20090115132325.DB75C7012D@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/bigloo/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5225

Modified Files:
	bigloo.spec 
Log Message:
* Thu Jan 15 2009 Tomas Mraz <tmraz at redhat.com> - 3.1b-4
- rebuild with new openssl



Index: bigloo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bigloo/devel/bigloo.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- bigloo.spec	1 Oct 2008 17:16:31 -0000	1.29
+++ bigloo.spec	15 Jan 2009 13:22:55 -0000	1.30
@@ -2,7 +2,7 @@
 
 Name:		bigloo
 Version: 	3.1b
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary: 	Bigloo is compiler for the Scheme programming language
 
 Group:		Development/Languages
@@ -226,6 +226,9 @@
 
 
 %changelog
+* Thu Jan 15 2009 Tomas Mraz <tmraz at redhat.com> - 3.1b-4
+- rebuild with new openssl
+
 * Tue Sep 30 2008 Gerard Milmeister <gemi at bluewin.ch> - 3.1b-3
 - add BR openssl-devel
 - add missing Req. gmp-devel



From rakesh at fedoraproject.org  Thu Jan 15 13:29:02 2009
From: rakesh at fedoraproject.org (Rakesh Pandit)
Date: Thu, 15 Jan 2009 13:29:02 +0000 (UTC)
Subject: rpms/fakechroot/F-10 fakechroot.spec,1.6,1.7
Message-ID: <20090115132902.7066A7012D@cvs1.fedora.phx.redhat.com>

Author: rakesh

Update of /cvs/pkgs/rpms/fakechroot/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6046

Modified Files:
	fakechroot.spec 
Log Message:
Fixed URL.



Index: fakechroot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fakechroot/F-10/fakechroot.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- fakechroot.spec	5 Oct 2008 10:36:51 -0000	1.6
+++ fakechroot.spec	15 Jan 2009 13:28:31 -0000	1.7
@@ -1,10 +1,10 @@
 Summary: Gives a fake chroot environment
 Name: fakechroot
 Version: 2.8
-Release: 15%{?dist}
+Release: 16%{?dist}
 License: LGPLv2+
 Group: Development/Tools
-URL: http://packages.debian.org/unstable/utils/fakechroot.html
+URL: http://fakechroot.alioth.debian.org/
 Source0: http://ftp.debian.org/debian/pool/main/f/fakechroot/%{name}_%{version}.orig.tar.gz
 Patch0: fakechroot-2.8-initsocketlen.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
@@ -55,6 +55,9 @@
 %{_mandir}/man1/fakechroot.1.gz
 
 %changelog
+* Thu Jan 15 2009 Rakesh Pandit <rakesh at fedoraproject.org> - 2.8-16
+- Fixed URL.
+
 * Sun Oct  5 2008 Axel Thimm <Axel.Thimm at ATrpms.net> - 2.8-15
 - Fix getpeername/getsockname socklen initialization.
 



From tmraz at fedoraproject.org  Thu Jan 15 13:29:05 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Thu, 15 Jan 2009 13:29:05 +0000 (UTC)
Subject: rpms/bip/devel bip.spec,1.5,1.6
Message-ID: <20090115132905.9B6EB7012D@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/bip/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6300

Modified Files:
	bip.spec 
Log Message:
* Thu Jan 15 2009 Tomas Mraz <tmraz at redhat.com> - 0.7.5-3
- rebuild with new openssl



Index: bip.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bip/devel/bip.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- bip.spec	29 Nov 2008 18:07:57 -0000	1.5
+++ bip.spec	15 Jan 2009 13:28:35 -0000	1.6
@@ -1,6 +1,6 @@
 Name:    bip
 Version: 0.7.5
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: IRC Bouncer
 Group:   Applications/Internet
 License: GPLv2+
@@ -83,6 +83,9 @@
 %attr(-,bip,bip) %dir %{_localstatedir}/log/bip
 
 %changelog
+* Thu Jan 15 2009 Tomas Mraz <tmraz at redhat.com> - 0.7.5-3
+- rebuild with new openssl
+
 * Sat Nov 29 2008 Lorenzo Villani <lvillani at binaryhelix.net> - 0.7.5-2
 - rebuilt
 



From limb at fedoraproject.org  Thu Jan 15 13:32:24 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Thu, 15 Jan 2009 13:32:24 +0000 (UTC)
Subject: rpms/drupal/EL-4 drupal.spec,1.13,1.14 sources,1.13,1.14
Message-ID: <20090115133224.799E57012D@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/drupal/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7057/EL-4

Modified Files:
	drupal.spec sources 
Log Message:
SA-CORE-2009-001



Index: drupal.spec
===================================================================
RCS file: /cvs/pkgs/rpms/drupal/EL-4/drupal.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- drupal.spec	11 Dec 2008 13:26:37 -0000	1.13
+++ drupal.spec	15 Jan 2009 13:31:54 -0000	1.14
@@ -1,6 +1,6 @@
 %define drupaldir %{_datadir}/drupal
 Name: drupal
-Version:  5.13
+Version:  5.15
 Release:  1%{?dist}
 Summary: An open-source content-management platform
 
@@ -71,6 +71,9 @@
 %dir %attr(775,root,apache) %{_localstatedir}/lib/drupal/
 
 %changelog
+* Thu Jan 16 2009 Jon Ciesla <limb at jcomserv.net> - 5.15-1
+- Upgrade to 5.15, DRUPAL-SA-CORE-2009-001.
+
 * Thu Dec 11 2008 Jon Ciesla <limb at jcomserv.net> - 5.13-1
 - Upgrade to 5.13, SA-2008-073.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/drupal/EL-4/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	11 Dec 2008 13:26:37 -0000	1.13
+++ sources	15 Jan 2009 13:31:54 -0000	1.14
@@ -1 +1 @@
-ceb0122cb27fd503fd24d1bacd967c2a  drupal-5.13.tar.gz
+4c3c71bcf17bdbbe8c4e8dacbb1d0072  drupal-5.15.tar.gz



From limb at fedoraproject.org  Thu Jan 15 13:32:24 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Thu, 15 Jan 2009 13:32:24 +0000 (UTC)
Subject: rpms/drupal/EL-5 .cvsignore, 1.1, 1.2 drupal.spec, 1.13,
	1.14 sources, 1.13, 1.14
Message-ID: <20090115133224.B5BCE7012D@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/drupal/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7057/EL-5

Modified Files:
	.cvsignore drupal.spec sources 
Log Message:
SA-CORE-2009-001



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/drupal/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	23 Jul 2007 21:18:10 -0000	1.1
+++ .cvsignore	15 Jan 2009 13:31:54 -0000	1.2
@@ -0,0 +1 @@
+drupal-5.15.tar.gz


Index: drupal.spec
===================================================================
RCS file: /cvs/pkgs/rpms/drupal/EL-5/drupal.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- drupal.spec	11 Dec 2008 13:26:37 -0000	1.13
+++ drupal.spec	15 Jan 2009 13:31:54 -0000	1.14
@@ -1,6 +1,6 @@
 %define drupaldir %{_datadir}/drupal
 Name: drupal
-Version:  5.13
+Version:  5.15
 Release:  1%{?dist}
 Summary: An open-source content-management platform
 
@@ -71,6 +71,9 @@
 %dir %attr(775,root,apache) %{_localstatedir}/lib/drupal/
 
 %changelog
+* Thu Jan 16 2009 Jon Ciesla <limb at jcomserv.net> - 5.15-1
+- Upgrade to 5.15, DRUPAL-SA-CORE-2009-001.
+
 * Thu Dec 11 2008 Jon Ciesla <limb at jcomserv.net> - 5.13-1
 - Upgrade to 5.13, SA-2008-073.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/drupal/EL-5/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	11 Dec 2008 13:26:37 -0000	1.13
+++ sources	15 Jan 2009 13:31:54 -0000	1.14
@@ -1 +1 @@
-ceb0122cb27fd503fd24d1bacd967c2a  drupal-5.13.tar.gz
+4c3c71bcf17bdbbe8c4e8dacbb1d0072  drupal-5.15.tar.gz



From rakesh at fedoraproject.org  Thu Jan 15 13:38:56 2009
From: rakesh at fedoraproject.org (Rakesh Pandit)
Date: Thu, 15 Jan 2009 13:38:56 +0000 (UTC)
Subject: rpms/fakechroot/F-9 fakechroot.spec,1.5,1.6
Message-ID: <20090115133856.2F7337012D@cvs1.fedora.phx.redhat.com>

Author: rakesh

Update of /cvs/pkgs/rpms/fakechroot/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8040

Modified Files:
	fakechroot.spec 
Log Message:
Fixed URL.



Index: fakechroot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fakechroot/F-9/fakechroot.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- fakechroot.spec	5 Oct 2008 10:36:50 -0000	1.5
+++ fakechroot.spec	15 Jan 2009 13:38:25 -0000	1.6
@@ -1,10 +1,10 @@
 Summary: Gives a fake chroot environment
 Name: fakechroot
 Version: 2.8
-Release: 15%{?dist}
+Release: 16%{?dist}
 License: LGPLv2+
 Group: Development/Tools
-URL: http://packages.debian.org/unstable/utils/fakechroot.html
+URL: http://fakechroot.alioth.debian.org/
 Source0: http://ftp.debian.org/debian/pool/main/f/fakechroot/%{name}_%{version}.orig.tar.gz
 Patch0: fakechroot-2.8-initsocketlen.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
@@ -55,6 +55,9 @@
 %{_mandir}/man1/fakechroot.1.gz
 
 %changelog
+* Thu Jan 15 2009 Rakesh Pandit <rakesh at fedoraproject.org> - 2.8.16
+- Fixed URL
+
 * Sun Oct  5 2008 Axel Thimm <Axel.Thimm at ATrpms.net> - 2.8-15
 - Fix getpeername/getsockname socklen initialization.
 



From kvolny at fedoraproject.org  Thu Jan 15 13:58:36 2009
From: kvolny at fedoraproject.org (=?utf-8?q?Karel_Voln=C3=BD?=)
Date: Thu, 15 Jan 2009 13:58:36 +0000 (UTC)
Subject: rpms/qmmp/EL-5 qmmp-0.2.3-qt42.patch,NONE,1.1 qmmp.spec,1.8,1.9
Message-ID: <20090115135836.EC8E97012D@cvs1.fedora.phx.redhat.com>

Author: kvolny

Update of /cvs/pkgs/rpms/qmmp/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10287

Modified Files:
	qmmp.spec 
Added Files:
	qmmp-0.2.3-qt42.patch 
Log Message:
* Thu Jan 15 2009 Karel Volny <kvolny at redhat.com> 0.2.3-2
- version for EPEL
- adjusted BuildRequires to match EPEL
- disabled FLAC, the older version is not compatible
- patched for using qt4-4.2 (thanks to Ilya Kotov)



qmmp-0.2.3-qt42.patch:

--- NEW FILE qmmp-0.2.3-qt42.patch ---
--- qmmp-0.2.3/src/plugins/General/notifier/settingsdialog.ui~	2008-07-22 13:08:53.000000000 +0200
+++ qmmp-0.2.3/src/plugins/General/notifier/settingsdialog.ui	2009-01-08 15:59:31.000000000 +0100
@@ -217,18 +217,6 @@
      <property name="spacing" >
       <number>6</number>
      </property>
-     <property name="leftMargin" >
-      <number>0</number>
-     </property>
-     <property name="topMargin" >
-      <number>0</number>
-     </property>
-     <property name="rightMargin" >
-      <number>0</number>
-     </property>
-     <property name="bottomMargin" >
-      <number>0</number>
-     </property>
      <item>
       <spacer>
        <property name="orientation" >
--- qmmp-0.2.3/src/plugins/General/statusicon/settingsdialog.ui~	2008-07-22 13:08:58.000000000 +0200
+++ qmmp-0.2.3/src/plugins/General/statusicon/settingsdialog.ui	2009-01-08 16:00:02.000000000 +0100
@@ -58,18 +58,6 @@
      <property name="spacing" >
       <number>6</number>
      </property>
-     <property name="leftMargin" >
-      <number>0</number>
-     </property>
-     <property name="topMargin" >
-      <number>0</number>
-     </property>
-     <property name="rightMargin" >
-      <number>0</number>
-     </property>
-     <property name="bottomMargin" >
-      <number>0</number>
-     </property>
      <item>
       <spacer>
        <property name="orientation" >
--- qmmp-0.2.3/src/ui/forms/aboutdialog.ui~	2008-07-22 13:10:39.000000000 +0200
+++ qmmp-0.2.3/src/ui/forms/aboutdialog.ui	2009-01-08 16:10:44.000000000 +0100
@@ -16,18 +16,6 @@
    <property name="spacing" >
     <number>6</number>
    </property>
-   <property name="leftMargin" >
-    <number>9</number>
-   </property>
-   <property name="topMargin" >
-    <number>9</number>
-   </property>
-   <property name="rightMargin" >
-    <number>9</number>
-   </property>
-   <property name="bottomMargin" >
-    <number>9</number>
-   </property>
    <item>
     <widget class="QLabel" name="pixmapLabel" >
      <property name="text" >
@@ -51,24 +39,6 @@
        <string>About</string>
       </attribute>
       <layout class="QGridLayout" >
-       <property name="leftMargin" >
-        <number>9</number>
-       </property>
-       <property name="topMargin" >
-        <number>9</number>
-       </property>
-       <property name="rightMargin" >
-        <number>9</number>
-       </property>
-       <property name="bottomMargin" >
-        <number>9</number>
-       </property>
-       <property name="horizontalSpacing" >
-        <number>6</number>
-       </property>
-       <property name="verticalSpacing" >
-        <number>6</number>
-       </property>
        <item row="0" column="0" >
         <widget class="QTextEdit" name="aboutTextEdit" >
          <property name="readOnly" >
@@ -83,24 +53,6 @@
        <string>Authors</string>
       </attribute>
       <layout class="QGridLayout" >
-       <property name="leftMargin" >
-        <number>9</number>
-       </property>
-       <property name="topMargin" >
-        <number>9</number>
-       </property>
-       <property name="rightMargin" >
-        <number>9</number>
-       </property>
-       <property name="bottomMargin" >
-        <number>9</number>
-       </property>
-       <property name="horizontalSpacing" >
-        <number>6</number>
-       </property>
-       <property name="verticalSpacing" >
-        <number>6</number>
-       </property>
        <item row="0" column="0" >
         <widget class="QTextEdit" name="authorsTextEdit" >
          <property name="readOnly" >
@@ -132,18 +84,6 @@
        <property name="spacing" >
         <number>6</number>
        </property>
-       <property name="leftMargin" >
-        <number>9</number>
-       </property>
-       <property name="topMargin" >
-        <number>9</number>
-       </property>
-       <property name="rightMargin" >
-        <number>9</number>
-       </property>
-       <property name="bottomMargin" >
-        <number>9</number>
-       </property>
        <item>
         <widget class="QTextEdit" name="thanksToTextEdit" >
          <property name="readOnly" >
@@ -158,24 +98,6 @@
        <string>License Agreement</string>
       </attribute>
       <layout class="QGridLayout" >
-       <property name="leftMargin" >
-        <number>9</number>
-       </property>
-       <property name="topMargin" >
-        <number>9</number>
-       </property>
-       <property name="rightMargin" >
-        <number>9</number>
-       </property>
-       <property name="bottomMargin" >
-        <number>9</number>
-       </property>
-       <property name="horizontalSpacing" >
-        <number>6</number>
-       </property>
-       <property name="verticalSpacing" >
-        <number>6</number>
-       </property>
        <item row="0" column="0" >
         <widget class="QTextEdit" name="licenseTextEdit" >
          <property name="readOnly" >
--- qmmp-0.2.3/src/ui/forms/addurldialog.ui~	2008-07-22 13:10:39.000000000 +0200
+++ qmmp-0.2.3/src/ui/forms/addurldialog.ui	2009-01-08 16:25:59.000000000 +0100
@@ -13,18 +13,6 @@
    <string>Enter URL to add</string>
   </property>
   <layout class="QGridLayout" >
-   <property name="leftMargin" >
-    <number>5</number>
-   </property>
-   <property name="topMargin" >
-    <number>5</number>
-   </property>
-   <property name="rightMargin" >
-    <number>5</number>
-   </property>
-   <property name="bottomMargin" >
-    <number>5</number>
-   </property>
    <item row="0" column="0" colspan="3" >
     <widget class="QComboBox" name="urlComboBox" >
      <property name="editable" >
--- qmmp-0.2.3/src/ui/forms/configdialog.ui~	2008-12-02 20:53:08.000000000 +0100
+++ qmmp-0.2.3/src/ui/forms/configdialog.ui	2009-01-08 16:37:00.000000000 +0100
@@ -143,18 +143,6 @@
          <property name="spacing" >
           <number>6</number>
          </property>
-         <property name="leftMargin" >
-          <number>9</number>
-         </property>
-         <property name="topMargin" >
-          <number>5</number>
-         </property>
-         <property name="rightMargin" >
-          <number>0</number>
-         </property>
-         <property name="bottomMargin" >
-          <number>0</number>
-         </property>
          <item>
           <widget class="QGroupBox" name="groupBox" >
            <property name="title" >
@@ -280,15 +268,6 @@
        </widget>
        <widget class="QWidget" name="page" >
         <layout class="QVBoxLayout" >
-         <property name="topMargin" >
-          <number>5</number>
-         </property>
-         <property name="rightMargin" >
-          <number>0</number>
-         </property>
-         <property name="bottomMargin" >
-          <number>0</number>
-         </property>
          <item>
           <widget class="QGroupBox" name="groupBox_3" >
            <property name="title" >
@@ -378,18 +357,6 @@
        </widget>
        <widget class="QWidget" name="widget" >
         <layout class="QGridLayout" >
-         <property name="leftMargin" >
-          <number>9</number>
-         </property>
-         <property name="topMargin" >
-          <number>5</number>
-         </property>
-         <property name="rightMargin" >
-          <number>0</number>
-         </property>
-         <property name="bottomMargin" >
-          <number>0</number>
-         </property>
          <property name="spacing" >
           <number>6</number>
          </property>
@@ -537,18 +504,6 @@
        </widget>
        <widget class="QWidget" name="page_2" >
         <layout class="QVBoxLayout" >
-         <property name="leftMargin" >
-          <number>9</number>
-         </property>
-         <property name="topMargin" >
-          <number>5</number>
-         </property>
-         <property name="rightMargin" >
-          <number>0</number>
-         </property>
-         <property name="bottomMargin" >
-          <number>0</number>
-         </property>
          <item>
           <widget class="QGroupBox" name="groupBox_6" >
            <property name="title" >
@@ -637,18 +592,6 @@
        </widget>
        <widget class="QWidget" name="network" >
         <layout class="QVBoxLayout" >
-         <property name="leftMargin" >
-          <number>9</number>
-         </property>
-         <property name="topMargin" >
-          <number>5</number>
-         </property>
-         <property name="rightMargin" >
-          <number>0</number>
-         </property>
-         <property name="bottomMargin" >
-          <number>0</number>
-         </property>
          <item>
           <widget class="QGroupBox" name="groupBox_5" >
            <property name="title" >
--- qmmp-0.2.3/src/plugins/Input/vorbis/detailsdialog.ui~	2008-07-22 13:07:35.000000000 +0200
+++ qmmp-0.2.3/src/plugins/Input/vorbis/detailsdialog.ui	2009-01-08 16:49:06.000000000 +0100
@@ -42,24 +42,6 @@
       <string>Ogg Vorbis Info</string>
      </property>
      <layout class="QGridLayout" >
-      <property name="leftMargin" >
-       <number>8</number>
-      </property>
-      <property name="topMargin" >
-       <number>8</number>
-      </property>
-      <property name="rightMargin" >
-       <number>8</number>
-      </property>
-      <property name="bottomMargin" >
-       <number>8</number>
-      </property>
-      <property name="horizontalSpacing" >
-       <number>6</number>
-      </property>
-      <property name="verticalSpacing" >
-       <number>6</number>
-      </property>
       <item row="2" column="1" >
        <widget class="QLabel" name="fileSizeLabel" >
         <property name="text" >
@@ -146,24 +128,6 @@
          <set>Qt::AlignHCenter</set>
         </property>
         <layout class="QGridLayout" >
-         <property name="leftMargin" >
-          <number>8</number>
-         </property>
-         <property name="topMargin" >
-          <number>8</number>
-         </property>
-         <property name="rightMargin" >
-          <number>8</number>
-         </property>
-         <property name="bottomMargin" >
-          <number>8</number>
-         </property>
-         <property name="horizontalSpacing" >
-          <number>6</number>
-         </property>
-         <property name="verticalSpacing" >
-          <number>6</number>
-         </property>
          <item row="1" column="1" >
           <widget class="QLabel" name="maximumLabel" >
            <property name="text" >
@@ -246,24 +210,6 @@
       <string>Ogg Vorbis Tag</string>
      </property>
      <layout class="QGridLayout" >
-      <property name="leftMargin" >
-       <number>8</number>
-      </property>
-      <property name="topMargin" >
-       <number>8</number>
-      </property>
-      <property name="rightMargin" >
-       <number>8</number>
-      </property>
-      <property name="bottomMargin" >
-       <number>8</number>
-      </property>
-      <property name="horizontalSpacing" >
-       <number>6</number>
-      </property>
-      <property name="verticalSpacing" >
-       <number>6</number>
-      </property>
       <item row="6" column="1" >
        <widget class="QPushButton" name="saveButton" >
         <property name="enabled" >
--- qmmp-0.2.3/src/plugins/Input/mpc/detailsdialog.ui~	2008-07-22 13:07:13.000000000 +0200
+++ qmmp-0.2.3/src/plugins/Input/mpc/detailsdialog.ui	2009-01-08 16:55:13.000000000 +0100
@@ -42,24 +42,6 @@
       <string>Musepack Info</string>
      </property>
      <layout class="QGridLayout" >
-      <property name="leftMargin" >
-       <number>8</number>
-      </property>
-      <property name="topMargin" >
-       <number>8</number>
-      </property>
-      <property name="rightMargin" >
-       <number>8</number>
-      </property>
-      <property name="bottomMargin" >
-       <number>8</number>
-      </property>
-      <property name="horizontalSpacing" >
-       <number>6</number>
-      </property>
-      <property name="verticalSpacing" >
-       <number>6</number>
-      </property>
       <item row="6" column="0" >
        <spacer>
         <property name="orientation" >
--- qmmp-0.2.3/src/plugins/Input/wavpack/detailsdialog.ui~	2008-07-22 13:08:04.000000000 +0200
+++ qmmp-0.2.3/src/plugins/Input/wavpack/detailsdialog.ui	2009-01-08 16:59:29.000000000 +0100
@@ -198,24 +198,6 @@
       <string>APE Tag</string>
      </property>
      <layout class="QGridLayout" >
-      <property name="leftMargin" >
-       <number>8</number>
-      </property>
-      <property name="topMargin" >
-       <number>8</number>
-      </property>
-      <property name="rightMargin" >
-       <number>8</number>
-      </property>
-      <property name="bottomMargin" >
-       <number>8</number>
-      </property>
-      <property name="horizontalSpacing" >
-       <number>6</number>
-      </property>
-      <property name="verticalSpacing" >
-       <number>6</number>
-      </property>
       <item row="6" column="1" >
        <widget class="QPushButton" name="saveButton" >
         <property name="enabled" >
--- qmmp-0.2.3/src/plugins/Output/alsa/settingsdialog.ui~	2008-07-22 13:08:09.000000000 +0200
+++ qmmp-0.2.3/src/plugins/Output/alsa/settingsdialog.ui	2009-01-08 17:11:23.000000000 +0100
@@ -13,24 +13,6 @@
    <string>ALSA Plugin Settings</string>
   </property>
   <layout class="QGridLayout" >
-   <property name="leftMargin" >
-    <number>9</number>
-   </property>
-   <property name="topMargin" >
-    <number>9</number>
-   </property>
-   <property name="rightMargin" >
-    <number>9</number>
-   </property>
-   <property name="bottomMargin" >
-    <number>9</number>
-   </property>
-   <property name="horizontalSpacing" >
-    <number>6</number>
-   </property>
-   <property name="verticalSpacing" >
-    <number>6</number>
-   </property>
    <item row="0" column="0" colspan="3" >
     <widget class="QTabWidget" name="tabWidget" >
      <property name="currentIndex" >
@@ -44,18 +26,6 @@
        <property name="spacing" >
         <number>6</number>
        </property>
-       <property name="leftMargin" >
-        <number>9</number>
-       </property>
-       <property name="topMargin" >
-        <number>9</number>
-       </property>
-       <property name="rightMargin" >
-        <number>9</number>
-       </property>
-       <property name="bottomMargin" >
-        <number>9</number>
-       </property>
        <item>
         <widget class="QGroupBox" name="groupBox" >
          <property name="title" >
@@ -79,24 +49,6 @@
           <string>Mixer</string>
          </property>
          <layout class="QGridLayout" >
-          <property name="leftMargin" >
-           <number>9</number>
-          </property>
-          <property name="topMargin" >
-           <number>9</number>
-          </property>
-          <property name="rightMargin" >
-           <number>9</number>
-          </property>
-          <property name="bottomMargin" >
-           <number>9</number>
-          </property>
-          <property name="horizontalSpacing" >
-           <number>6</number>
-          </property>
-          <property name="verticalSpacing" >
-           <number>6</number>
-          </property>
           <item row="0" column="1" >
            <widget class="QComboBox" name="mixerCardComboBox" />
           </item>
@@ -136,18 +88,6 @@
        <property name="spacing" >
         <number>6</number>
        </property>
-       <property name="leftMargin" >
-        <number>9</number>
-       </property>
-       <property name="topMargin" >
-        <number>9</number>
-       </property>
-       <property name="rightMargin" >
-        <number>9</number>
-       </property>
-       <property name="bottomMargin" >
-        <number>9</number>
-       </property>
        <item>
         <widget class="QGroupBox" name="groupBox_3" >
          <property name="title" >
--- qmmp-0.2.3/src/plugins/Output/oss/settingsdialog.ui~	2008-07-22 13:08:14.000000000 +0200
+++ qmmp-0.2.3/src/plugins/Output/oss/settingsdialog.ui	2009-01-08 17:19:23.000000000 +0100
@@ -13,24 +13,6 @@
    <string>OSS Plugin Settings</string>
   </property>
   <layout class="QGridLayout" >
-   <property name="leftMargin" >
-    <number>9</number>
-   </property>
-   <property name="topMargin" >
-    <number>9</number>
-   </property>
-   <property name="rightMargin" >
-    <number>9</number>
-   </property>
-   <property name="bottomMargin" >
-    <number>9</number>
-   </property>
-   <property name="horizontalSpacing" >
-    <number>6</number>
-   </property>
-   <property name="verticalSpacing" >
-    <number>6</number>
-   </property>
    <item row="0" column="0" colspan="3" >
     <widget class="QTabWidget" name="tabWidget" >
      <property name="currentIndex" >
@@ -44,18 +26,6 @@
        <property name="spacing" >
         <number>6</number>
        </property>
-       <property name="leftMargin" >
-        <number>9</number>
-       </property>
-       <property name="topMargin" >
-        <number>9</number>
-       </property>
-       <property name="rightMargin" >
-        <number>9</number>
-       </property>
-       <property name="bottomMargin" >
-        <number>9</number>
-       </property>
        <item>
         <widget class="QGroupBox" name="groupBox" >
          <property name="title" >
@@ -78,24 +48,6 @@
           <string>Mixer device</string>
          </property>
          <layout class="QGridLayout" >
-          <property name="leftMargin" >
-           <number>9</number>
-          </property>
-          <property name="topMargin" >
-           <number>9</number>
-          </property>
-          <property name="rightMargin" >
-           <number>9</number>
-          </property>
-          <property name="bottomMargin" >
-           <number>9</number>
-          </property>
-          <property name="horizontalSpacing" >
-           <number>6</number>
-          </property>
-          <property name="verticalSpacing" >
-           <number>6</number>
-          </property>
           <item row="0" column="0" >
            <widget class="QLineEdit" name="lineEdit_2" >
             <property name="text" >
@@ -116,42 +68,12 @@
        <property name="spacing" >
         <number>6</number>
        </property>
-       <property name="leftMargin" >
-        <number>9</number>
-       </property>
-       <property name="topMargin" >
-        <number>9</number>
-       </property>
-       <property name="rightMargin" >
-        <number>9</number>
-       </property>
-       <property name="bottomMargin" >
-        <number>9</number>
-       </property>
        <item>
         <widget class="QGroupBox" name="groupBox_3" >
          <property name="title" >
           <string>Soundcard</string>
          </property>
          <layout class="QGridLayout" >
-          <property name="leftMargin" >
-           <number>9</number>
-          </property>
-          <property name="topMargin" >
-           <number>9</number>
-          </property>
-          <property name="rightMargin" >
-           <number>9</number>
-          </property>
-          <property name="bottomMargin" >
-           <number>9</number>
-          </property>
-          <property name="horizontalSpacing" >
-           <number>6</number>
-          </property>
-          <property name="verticalSpacing" >
-           <number>6</number>
-          </property>
           <item row="3" column="1" >
            <spacer>
             <property name="orientation" >
--- qmmp-0.2.3/src/plugins/FileDialogs/QmmpFileDialog/qmmpfiledialog.cpp~	2008-07-22 13:08:35.000000000 +0200
+++ qmmp-0.2.3/src/plugins/FileDialogs/QmmpFileDialog/qmmpfiledialog.cpp	2009-01-08 17:38:09.000000000 +0100
@@ -19,6 +19,7 @@
 ***************************************************************************/
 
 #include <QtPlugin>
+#include <QLocale>
 #include <QTranslator>
 #include <QMessageBox>
 
--- qmmp-0.2.3/src/plugins/General/scrobbler/CMakeLists.txt~	2008-09-02 20:29:12.000000000 +0200
+++ qmmp-0.2.3/src/plugins/General/scrobbler/CMakeLists.txt	2009-01-13 20:37:58.000000000 +0100
@@ -33,12 +33,16 @@
 link_directories(${CMAKE_CURRENT_BINARY_DIR}/../../../qmmpui)
 
 SET(libscrobbler_SRCS
+    md5.cpp
+    qcryptographichash.cpp
     settingsdialog.cpp
     scrobbler.cpp
     scrobblerfactory.cpp
 )
 
 SET(libscrobbler_MOC_HDRS
+    md5.h
+    qcryptographichash.h
     settingsdialog.h
     scrobblerfactory.h
     scrobbler.h
--- qmmp-0.2.3/src/plugins/General/scrobbler/md5.cpp~	1970-01-01 01:00:00.000000000 +0100
+++ qmmp-0.2.3/src/plugins/General/scrobbler/md5.cpp	2009-01-13 20:28:45.000000000 +0100
@@ -0,0 +1,244 @@
+/*
+ * This code implements the MD5 message-digest algorithm.
+ * The algorithm is due to Ron Rivest.  This code was
+ * written by Colin Plumb in 1993, no copyright is claimed.
+ * This code is in the public domain; do with it what you wish.
+ *
+ * Equivalent code is available from RSA Data Security, Inc.
+ * This code has been tested against that, and is equivalent,
+ * except that you don't need to include two pages of legalese
+ * with every copy.
+ *
+ * To compute the message digest of a chunk of bytes, declare an
+ * MD5Context structure, pass it to MD5Init, call MD5Update as
+ * needed on buffers full of bytes, and then call MD5Final, which
+ * will fill a supplied 16-byte array with the digest.
+ *
+ * Changed so as no longer to depend on Colin Plumb's `usual.h' header
+ * definitions; now uses stuff from dpkg's config.h.
+ *  - Ian Jackson <ian at chiark.greenend.org.uk>.
+ * Still in the public domain.
+ */
+
+#include <string.h>		/* for memcpy() */
+#ifndef _WIN32_WCE
+#include <sys/types.h>		/* for stupid systems */
+#else
+#include <types.h>
+#endif
+
+#include "md5.h"
+
+//QT_BEGIN_NAMESPACE
+
+static void
+byteSwap(UWORD32 *buf, unsigned words)
+{
+        const quint32 byteOrderTest = 0x1;
+        if (((char *)&byteOrderTest)[0] == 0) {
+            md5byte *p = (md5byte *)buf;
+
+            do {
+                *buf++ = (UWORD32)((unsigned)p[3] << 8 | p[2]) << 16 |
+                    ((unsigned)p[1] << 8 | p[0]);
+                p += 4;
+            } while (--words);
+        }
+}
+
+/*
+ * Start MD5 accumulation.  Set bit count to 0 and buffer to mysterious
+ * initialization constants.
+ */
+static void MD5Init(struct MD5Context *ctx)
+{
+	ctx->buf[0] = 0x67452301;
+	ctx->buf[1] = 0xefcdab89;
+	ctx->buf[2] = 0x98badcfe;
+	ctx->buf[3] = 0x10325476;
+
+	ctx->bytes[0] = 0;
+	ctx->bytes[1] = 0;
+}
+
+/*
+ * Update context to reflect the concatenation of another buffer full
+ * of bytes.
+ */
+static void MD5Update(struct MD5Context *ctx, md5byte const *buf, unsigned len)
+{
+	UWORD32 t;
+
+	/* Update byte count */
+
+	t = ctx->bytes[0];
+	if ((ctx->bytes[0] = t + len) < t)
+		ctx->bytes[1]++;	/* Carry from low to high */
+
+	t = 64 - (t & 0x3f);	/* Space available in ctx->in (at least 1) */
+	if (t > len) {
+		memcpy((md5byte *)ctx->in + 64 - t, buf, len);
+		return;
+	}
+	/* First chunk is an odd size */
+	memcpy((md5byte *)ctx->in + 64 - t, buf, t);
+	byteSwap(ctx->in, 16);
+	MD5Transform(ctx->buf, ctx->in);
+	buf += t;
+	len -= t;
+
+	/* Process data in 64-byte chunks */
+	while (len >= 64) {
+		memcpy(ctx->in, buf, 64);
+		byteSwap(ctx->in, 16);
+		MD5Transform(ctx->buf, ctx->in);
+		buf += 64;
+		len -= 64;
+	}
+
+	/* Handle any remaining bytes of data. */
+	memcpy(ctx->in, buf, len);
+}
+
+/*
+ * Final wrapup - pad to 64-byte boundary with the bit pattern 
+ * 1 0* (64-bit count of bits processed, MSB-first)
+ */
+static void
+MD5Final(struct MD5Context *ctx, md5byte digest[16])
+{
+	int count = ctx->bytes[0] & 0x3f;	/* Number of bytes in ctx->in */
+	md5byte *p = (md5byte *)ctx->in + count;
+
+	/* Set the first char of padding to 0x80.  There is always room. */
+	*p++ = 0x80;
+
+	/* Bytes of padding needed to make 56 bytes (-8..55) */
+	count = 56 - 1 - count;
+
+	if (count < 0) {	/* Padding forces an extra block */
+		memset(p, 0, count + 8);
+		byteSwap(ctx->in, 16);
+		MD5Transform(ctx->buf, ctx->in);
+		p = (md5byte *)ctx->in;
+		count = 56;
+	}
+	memset(p, 0, count);
+	byteSwap(ctx->in, 14);
+
+	/* Append length in bits and transform */
+	ctx->in[14] = ctx->bytes[0] << 3;
+	ctx->in[15] = ctx->bytes[1] << 3 | ctx->bytes[0] >> 29;
+	MD5Transform(ctx->buf, ctx->in);
+
+	byteSwap(ctx->buf, 4);
+	memcpy(digest, ctx->buf, 16);
+	memset(ctx, 0, sizeof(ctx));	/* In case it's sensitive */
+}
+
+#ifndef ASM_MD5
+
+/* The four core functions - F1 is optimized somewhat */
+
+/* #define F1(x, y, z) (x & y | ~x & z) */
+#define F1(x, y, z) (z ^ (x & (y ^ z)))
+#define F2(x, y, z) F1(z, x, y)
+#define F3(x, y, z) (x ^ y ^ z)
+#define F4(x, y, z) (y ^ (x | ~z))
+
+/* This is the central step in the MD5 algorithm. */
+#define MD5STEP(f,w,x,y,z,in,s) \
+	 (w += f(x,y,z) + in, w = (w<<s | w>>(32-s)) + x)
+
+/*
+ * The core of the MD5 algorithm, this alters an existing MD5 hash to
+ * reflect the addition of 16 longwords of new data.  MD5Update blocks
+ * the data and converts bytes into longwords for this routine.
+ */
+static void
+MD5Transform(UWORD32 buf[4], UWORD32 const in[16])
+{
+	register UWORD32 a, b, c, d;
+
+	a = buf[0];
+	b = buf[1];
+	c = buf[2];
+	d = buf[3];
+
+	MD5STEP(F1, a, b, c, d, in[0] + 0xd76aa478, 7);
+	MD5STEP(F1, d, a, b, c, in[1] + 0xe8c7b756, 12);
+	MD5STEP(F1, c, d, a, b, in[2] + 0x242070db, 17);
+	MD5STEP(F1, b, c, d, a, in[3] + 0xc1bdceee, 22);
+	MD5STEP(F1, a, b, c, d, in[4] + 0xf57c0faf, 7);
+	MD5STEP(F1, d, a, b, c, in[5] + 0x4787c62a, 12);
+	MD5STEP(F1, c, d, a, b, in[6] + 0xa8304613, 17);
+	MD5STEP(F1, b, c, d, a, in[7] + 0xfd469501, 22);
+	MD5STEP(F1, a, b, c, d, in[8] + 0x698098d8, 7);
+	MD5STEP(F1, d, a, b, c, in[9] + 0x8b44f7af, 12);
+	MD5STEP(F1, c, d, a, b, in[10] + 0xffff5bb1, 17);
+	MD5STEP(F1, b, c, d, a, in[11] + 0x895cd7be, 22);
+	MD5STEP(F1, a, b, c, d, in[12] + 0x6b901122, 7);
+	MD5STEP(F1, d, a, b, c, in[13] + 0xfd987193, 12);
+	MD5STEP(F1, c, d, a, b, in[14] + 0xa679438e, 17);
+	MD5STEP(F1, b, c, d, a, in[15] + 0x49b40821, 22);
+
+	MD5STEP(F2, a, b, c, d, in[1] + 0xf61e2562, 5);
+	MD5STEP(F2, d, a, b, c, in[6] + 0xc040b340, 9);
+	MD5STEP(F2, c, d, a, b, in[11] + 0x265e5a51, 14);
+	MD5STEP(F2, b, c, d, a, in[0] + 0xe9b6c7aa, 20);
+	MD5STEP(F2, a, b, c, d, in[5] + 0xd62f105d, 5);
+	MD5STEP(F2, d, a, b, c, in[10] + 0x02441453, 9);
+	MD5STEP(F2, c, d, a, b, in[15] + 0xd8a1e681, 14);
+	MD5STEP(F2, b, c, d, a, in[4] + 0xe7d3fbc8, 20);
+	MD5STEP(F2, a, b, c, d, in[9] + 0x21e1cde6, 5);
+	MD5STEP(F2, d, a, b, c, in[14] + 0xc33707d6, 9);
+	MD5STEP(F2, c, d, a, b, in[3] + 0xf4d50d87, 14);
+	MD5STEP(F2, b, c, d, a, in[8] + 0x455a14ed, 20);
+	MD5STEP(F2, a, b, c, d, in[13] + 0xa9e3e905, 5);
+	MD5STEP(F2, d, a, b, c, in[2] + 0xfcefa3f8, 9);
+	MD5STEP(F2, c, d, a, b, in[7] + 0x676f02d9, 14);
+	MD5STEP(F2, b, c, d, a, in[12] + 0x8d2a4c8a, 20);
+
+	MD5STEP(F3, a, b, c, d, in[5] + 0xfffa3942, 4);
+	MD5STEP(F3, d, a, b, c, in[8] + 0x8771f681, 11);
+	MD5STEP(F3, c, d, a, b, in[11] + 0x6d9d6122, 16);
+	MD5STEP(F3, b, c, d, a, in[14] + 0xfde5380c, 23);
+	MD5STEP(F3, a, b, c, d, in[1] + 0xa4beea44, 4);
+	MD5STEP(F3, d, a, b, c, in[4] + 0x4bdecfa9, 11);
+	MD5STEP(F3, c, d, a, b, in[7] + 0xf6bb4b60, 16);
+	MD5STEP(F3, b, c, d, a, in[10] + 0xbebfbc70, 23);
+	MD5STEP(F3, a, b, c, d, in[13] + 0x289b7ec6, 4);
+	MD5STEP(F3, d, a, b, c, in[0] + 0xeaa127fa, 11);
+	MD5STEP(F3, c, d, a, b, in[3] + 0xd4ef3085, 16);
+	MD5STEP(F3, b, c, d, a, in[6] + 0x04881d05, 23);
+	MD5STEP(F3, a, b, c, d, in[9] + 0xd9d4d039, 4);
+	MD5STEP(F3, d, a, b, c, in[12] + 0xe6db99e5, 11);
+	MD5STEP(F3, c, d, a, b, in[15] + 0x1fa27cf8, 16);
+	MD5STEP(F3, b, c, d, a, in[2] + 0xc4ac5665, 23);
+
+	MD5STEP(F4, a, b, c, d, in[0] + 0xf4292244, 6);
+	MD5STEP(F4, d, a, b, c, in[7] + 0x432aff97, 10);
+	MD5STEP(F4, c, d, a, b, in[14] + 0xab9423a7, 15);
+	MD5STEP(F4, b, c, d, a, in[5] + 0xfc93a039, 21);
+	MD5STEP(F4, a, b, c, d, in[12] + 0x655b59c3, 6);
+	MD5STEP(F4, d, a, b, c, in[3] + 0x8f0ccc92, 10);
+	MD5STEP(F4, c, d, a, b, in[10] + 0xffeff47d, 15);
+	MD5STEP(F4, b, c, d, a, in[1] + 0x85845dd1, 21);
+	MD5STEP(F4, a, b, c, d, in[8] + 0x6fa87e4f, 6);
+	MD5STEP(F4, d, a, b, c, in[15] + 0xfe2ce6e0, 10);
+	MD5STEP(F4, c, d, a, b, in[6] + 0xa3014314, 15);
+	MD5STEP(F4, b, c, d, a, in[13] + 0x4e0811a1, 21);
+	MD5STEP(F4, a, b, c, d, in[4] + 0xf7537e82, 6);
+	MD5STEP(F4, d, a, b, c, in[11] + 0xbd3af235, 10);
+	MD5STEP(F4, c, d, a, b, in[2] + 0x2ad7d2bb, 15);
+	MD5STEP(F4, b, c, d, a, in[9] + 0xeb86d391, 21);
+
+	buf[0] += a;
+	buf[1] += b;
+	buf[2] += c;
+	buf[3] += d;
+}
+
+#endif
+
+//QT_END_NAMESPACE
--- qmmp-0.2.3/src/plugins/General/scrobbler/md5.h~	1970-01-01 01:00:00.000000000 +0100
+++ qmmp-0.2.3/src/plugins/General/scrobbler/md5.h	2009-01-13 20:26:40.000000000 +0100
@@ -0,0 +1,48 @@
+/*
+ * This is the header file for the MD5 message-digest algorithm.
+ * The algorithm is due to Ron Rivest.  This code was
+ * written by Colin Plumb in 1993, no copyright is claimed.
+ * This code is in the public domain; do with it what you wish.
+ *
+ * Equivalent code is available from RSA Data Security, Inc.
+ * This code has been tested against that, and is equivalent,
+ * except that you don't need to include two pages of legalese
+ * with every copy.
+ *
+ * To compute the message digest of a chunk of bytes, declare an
+ * MD5Context structure, pass it to MD5Init, call MD5Update as
+ * needed on buffers full of bytes, and then call MD5Final, which
+ * will fill a supplied 16-byte array with the digest.
+ *
+ * Changed so as no longer to depend on Colin Plumb's `usual.h'
+ * header definitions; now uses stuff from dpkg's config.h
+ *  - Ian Jackson <ian at chiark.greenend.org.uk>.
+ * Still in the public domain.
+ */
+
+#ifndef MD5_H
+#define MD5_H
+
+#include <QtGlobal>
+#include <QByteArray>
+#include <QString>
+
+//QT_BEGIN_NAMESPACE
+
+typedef unsigned char md5byte;
+typedef quint32 UWORD32;
+
+struct MD5Context {
+	UWORD32 buf[4];
+	UWORD32 bytes[2];
+	UWORD32 in[16];
+};
+
+static void MD5Init(struct MD5Context *context);
+static void MD5Update(struct MD5Context *context, md5byte const *buf, unsigned len);
+static void MD5Final(struct MD5Context *context, unsigned char digest[16]);
+static void MD5Transform(UWORD32 buf[4], UWORD32 const in[16]);
+
+//QT_END_NAMESPACE
+
+#endif /* !MD5_H */
--- qmmp-0.2.3/src/plugins/General/scrobbler/qcryptographichash.cpp~	1970-01-01 01:00:00.000000000 +0100
+++ qmmp-0.2.3/src/plugins/General/scrobbler/qcryptographichash.cpp	2009-01-13 20:31:01.000000000 +0100
@@ -0,0 +1,184 @@
+/****************************************************************************
+**
+** Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info at nokia.com)
+**
+** This file is part of the QtCore module of the Qt Toolkit.
+**
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License versions 2.0 or 3.0 as published by the Free
+** Software Foundation and appearing in the file LICENSE.GPL included in
+** the packaging of this file.  Please review the following information
+** to ensure GNU General Public Licensing requirements will be met:
+** http://www.fsf.org/licensing/licenses/info/GPLv2.html and
+** http://www.gnu.org/copyleft/gpl.html.  In addition, as a special
+** exception, Nokia gives you certain additional rights. These rights
+** are described in the Nokia Qt GPL Exception version 1.3, included in
+** the file GPL_EXCEPTION.txt in this package.
+**
+** Qt for Windows(R) Licensees
+** As a special exception, Nokia, as the sole copyright holder for Qt
+** Designer, grants users of the Qt/Eclipse Integration plug-in the
+** right for the Qt/Eclipse Integration to link to functionality
+** provided by Qt Designer and its related libraries.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales at nokia.com.
+**
+****************************************************************************/
+
+#include "qcryptographichash.h"
+
+#include "md5.h"
+#include "md5.cpp"
+
+class QCryptographicHashPrivate
+{
+public:
+    QCryptographicHash::Algorithm method;
+    union {
+        MD5Context md5Context;
+        //md4_context md4Context;
+        //Sha1State sha1Context;
+    };
+    QByteArray result;
+};
+
+/*!
+  \class QCryptographicHash
+
+  \brief The QCryptographicHash class provides a way to generate cryptographic hashes.
+
+  \since 4.3
+
+  \ingroup tools
+  \reentrant
+
+  QCryptographicHash can be used to generate cryptographic hashes of binary or text data.
+
+  Currently MD4, MD5, and SHA1 are supported.
+*/
+
+/*!
+  \enum QCryptographicHash::Algorithm
+
+  \value Md4 Generate an MD4 hash sum
+  \value Md5 Generate an MD5 hash sum
+  \value Sha1 Generate an SHA1 hash sum
+*/
+
+/*!
+  Constructs an object that can be used to create a cryptographic hash from data using \a method.
+*/
+QCryptographicHash::QCryptographicHash(Algorithm method)
+    : d(new QCryptographicHashPrivate)
+{
+    d->method = method;
+    reset();
+}
+
+/*!
+  Destroys the object.
+*/
+QCryptographicHash::~QCryptographicHash()
+{
+    delete d;
+}
+
+/*!
+  Resets the object.
+*/
+void QCryptographicHash::reset()
+{
+    switch (d->method) {
+    /*case Md4:
+        md4_init(&d->md4Context);
+        break;*/
+    case Md5:
+        MD5Init(&d->md5Context);
+        break;
+    /*case Sha1:
+        sha1InitState(&d->sha1Context);
+        break;*/
+    }
+    d->result.clear();
+}
+
+/*!
+    Adds the first \a length chars of \a data to the cryptographic
+    hash.
+*/
+void QCryptographicHash::addData(const char *data, int length)
+{
+    switch (d->method) {
+    /*case Md4:
+        md4_update(&d->md4Context, (const unsigned char *)data, length);
+        break;*/
+    case Md5:
+        MD5Update(&d->md5Context, (const unsigned char *)data, length);
+        break;
+    /*case Sha1:
+        sha1Update(&d->sha1Context, (const unsigned char *)data, length);
+        break;*/
+    }    
+    d->result.clear();
+}
+
+/*!
+  /overload
+*/
+void QCryptographicHash::addData(const QByteArray &data)
+{
+    addData(data.constData(), data.length());
+}
+
+/*!
+  Returns the final hash value.
+
+  \sa QByteArray::toHex()
+*/
+QByteArray QCryptographicHash::result() const
+{
+    if (!d->result.isEmpty()) 
+        return d->result;
+
+    switch (d->method) {
+    /*case Md4: {
+        md4_context copy = d->md4Context;
+        d->result.resize(MD4_RESULTLEN);
+        md4_final(&copy, (unsigned char *)d->result.data());
+        break;
+    }*/
+    case Md5: {
+        MD5Context copy = d->md5Context;
+        d->result.resize(16);
+        MD5Final(&copy, (unsigned char *)d->result.data());
+        break;
+    }
+    /*case Sha1: {
+        Sha1State copy = d->sha1Context;
+        d->result.resize(20);
+        sha1FinalizeState(&copy);
+        sha1ToHash(&copy, (unsigned char *)d->result.data());
+    }*/
+    }
+    return d->result;
+}
+
+/*!
+  Returns the hash of \a data using \a method.
+*/
+QByteArray QCryptographicHash::hash(const QByteArray &data, Algorithm method)
+{
+    QCryptographicHash hash(method);
+    hash.addData(data);
+    return hash.result();
+}
+
--- qmmp-0.2.3/src/plugins/General/scrobbler/qcryptographichash.h~	1970-01-01 01:00:00.000000000 +0100
+++ qmmp-0.2.3/src/plugins/General/scrobbler/qcryptographichash.h	2009-01-13 20:19:38.000000000 +0100
@@ -0,0 +1,69 @@
+/****************************************************************************
+**
+** Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info at nokia.com)
+**
+** This file is part of the QtCore module of the Qt Toolkit.
+**
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License versions 2.0 or 3.0 as published by the Free
+** Software Foundation and appearing in the file LICENSE.GPL included in
+** the packaging of this file.  Please review the following information
+** to ensure GNU General Public Licensing requirements will be met:
+** http://www.fsf.org/licensing/licenses/info/GPLv2.html and
+** http://www.gnu.org/copyleft/gpl.html.  In addition, as a special
+** exception, Nokia gives you certain additional rights. These rights
+** are described in the Nokia Qt GPL Exception version 1.3, included in
+** the file GPL_EXCEPTION.txt in this package.
+**
+** Qt for Windows(R) Licensees
+** As a special exception, Nokia, as the sole copyright holder for Qt
+** Designer, grants users of the Qt/Eclipse Integration plug-in the
+** right for the Qt/Eclipse Integration to link to functionality
+** provided by Qt Designer and its related libraries.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales at nokia.com.
+**
+****************************************************************************/
+
+#ifndef QCRYPTOGRAPHICSHASH_H
+#define QCRYPTOGRAPHICSHASH_H
+
+#include <QByteArray>
+
+class QCryptographicHashPrivate;
+
+class Q_CORE_EXPORT QCryptographicHash
+{
+public:
+    enum Algorithm {
+        Md4,
+        Md5,
+        Sha1
+    };
+
+    QCryptographicHash(Algorithm method);
+    ~QCryptographicHash();
+
+    void reset();
+
+    void addData(const char *data, int length);
+    void addData(const QByteArray &data);
+
+    QByteArray result() const;
+
+    static QByteArray hash(const QByteArray &data, Algorithm method);
+private:
+    Q_DISABLE_COPY(QCryptographicHash)
+    QCryptographicHashPrivate *d;
+};
+
+#endif
--- qmmp-0.2.3/src/plugins/General/scrobbler/scrobbler.cpp~	2008-07-22 13:09:02.000000000 +0200
+++ qmmp-0.2.3/src/plugins/General/scrobbler/scrobbler.cpp	2009-01-14 14:25:22.000000000 +0100
@@ -21,7 +21,7 @@
 #include <QMenu>
 #include <QHttp>
 #include <QByteArray>
-#include <QCryptographicHash>
+#include "qcryptographichash.h"
 #include <QUrl>
 #include <QTime>
 #include <QSettings>
@@ -60,7 +60,7 @@
     }
 
     m_disabled = m_login.isEmpty() || m_passw.isEmpty();
-    m_passw = QString(QCryptographicHash::hash(m_passw.toAscii(), QCryptographicHash::Md5).toHex());
+    m_passw = QString(toHex(QCryptographicHash::hash(m_passw.toAscii(), QCryptographicHash::Md5)));
     connect(m_http, SIGNAL(requestFinished (int, bool)), SLOT(processResponse(int, bool)));
     connect(m_http, SIGNAL(readyRead (const QHttpResponseHeader&)),
             SLOT(readResponse(const QHttpResponseHeader&)));
@@ -215,7 +215,7 @@
     qDebug("Scrobbler: current time stamp %ld",ts);
     QString auth_tmp = QString("%1%2").arg(m_passw).arg(ts);
     QByteArray auth = QCryptographicHash::hash(auth_tmp.toAscii (), QCryptographicHash::Md5);
-    auth = auth.toHex();
+    auth = toHex(auth);
 
     QString url = QString("%1?hs=true&p=%2&c=%3&v=%4&u=%5&t=%6&a=%7")
                   .arg("/")
@@ -270,3 +270,24 @@
 {
     return !m_submitUrl.isEmpty() && !m_session.isEmpty();
 }
+
+QByteArray Scrobbler::toHex(QByteArray input) const
+{
+    QByteArray hex;
+    hex.resize(input.size() * 2);
+    char *hexData = hex.data();
+    const uchar *data = (const uchar *)input.constData();
+    for (int i = 0; i < input.size(); ++i) {
+        int j = (data[i] >> 4) & 0xf;
+        if (j <= 9)
+            hexData[i*2] = (j + '0');
+         else
+            hexData[i*2] = (j + 'a' - 10);
+        j = data[i] & 0xf;
+        if (j <= 9)
+            hexData[i*2+1] = (j + '0');
+         else
+            hexData[i*2+1] = (j + 'a' - 10);
+    }
+    return hex;
+}
--- qmmp-0.2.3/src/plugins/General/scrobbler/scrobbler.h~	2008-07-22 13:09:02.000000000 +0200
+++ qmmp-0.2.3/src/plugins/General/scrobbler/scrobbler.h	2009-01-14 14:21:18.000000000 +0100
@@ -52,6 +52,7 @@
     void handshake();
     void submit();
     bool isReady();
+    QByteArray toHex(QByteArray input) const;
     time_t m_start_ts;
     SongInfo m_song;
     QHttp *m_http;
--- qmmp-0.2.3/src/plugins/General/scrobbler/scrobbler.pro~	2008-07-22 13:09:02.000000000 +0200
+++ qmmp-0.2.3/src/plugins/General/scrobbler/scrobbler.pro	2009-01-13 20:18:33.000000000 +0100
@@ -31,10 +31,14 @@
 
 HEADERS += scrobblerfactory.h \
            scrobbler.h \
- settingsdialog.h
+           settingsdialog.h \
+           md5.h \
+           qcryptographichash.h
 SOURCES += scrobblerfactory.cpp \
            scrobbler.cpp \
- settingsdialog.cpp
+           settingsdialog.cpp \
+           md5.cpp \
+           qcryptographichash.cpp
 QT += network
 
 


Index: qmmp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qmmp/EL-5/qmmp.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- qmmp.spec	5 Dec 2008 13:31:18 -0000	1.8
+++ qmmp.spec	15 Jan 2009 13:58:04 -0000	1.9
@@ -1,6 +1,6 @@
 Name:		qmmp
 Version:	0.2.3
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Qt-based multimedia player
 
 Group:		Applications/Multimedia
@@ -10,16 +10,16 @@
 Source2:	qmmp-filter-provides.sh
 %define		_use_internal_dependency_generator 0
 %define		__find_provides %{SOURCE2}
+Patch:		qmmp-0.2.3-qt42.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root
 
-BuildRequires:	cmake flac-devel >= 1.1.3
-BuildRequires:	jack-audio-connection-kit-devel >= 0.102.5
+BuildRequires:	cmake jack-audio-connection-kit-devel >= 0.102.5
 BuildRequires:	libmpcdec-devel >= 1.2.2 libvorbis-devel libogg-devel
 BuildRequires:	libsamplerate-devel alsa-lib-devel taglib-devel
-BuildRequires:	qt-devel >= 4.2 desktop-file-utils
+BuildRequires:	qt4-devel >= 4.2 desktop-file-utils
 BuildRequires:	libsndfile-devel wavpack-devel pulseaudio-libs-devel
-BuildRequires:	libmodplug-devel libcurl-devel openssl-devel
+BuildRequires:	libmodplug-devel curl-devel
 
 Requires(post):	/sbin/ldconfig
 Requires(pre):	/sbin/ldconfig
@@ -36,7 +36,6 @@
 	* Winamp and xmms skins support
 	* plugins support
 	* Ogg Vorbis support
-	* native FLAC support
 	* Musepack support
 	* WavePack support
 	* ModPlug support
@@ -56,10 +55,13 @@
 
 %prep
 %setup -q
+%patch -p1
 
 %build
+export QTDIR="%{_libdir}/qt4/"
 %cmake \
 	-D USE_FFMPEG:BOOL=FALSE \
+	-D USE_FLAC:BOOL=FALSE \
 	-D USE_MAD:BOOL=FALSE \
 	-D CMAKE_INSTALL_PREFIX=%{_prefix} \
 	-D LIB_DIR=%{_lib} \
@@ -105,6 +107,12 @@
 
 
 %changelog
+* Thu Jan 15 2009 Karel Volny <kvolny at redhat.com> 0.2.3-2
+- version for EPEL
+- adjusted BuildRequires to match EPEL
+- disabled FLAC, the older version is not compatible
+- patched for using qt4-4.2 (thanks to Ilya Kotov)
+
 * Fri Dec 05 2008 Karel Volny <kvolny at redhat.com> 0.2.3-1
 - new version
 - added %%{?_smp_mflags} to make, as parallel build was fixed



From tmraz at fedoraproject.org  Thu Jan 15 14:05:58 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Thu, 15 Jan 2009 14:05:58 +0000 (UTC)
Subject: rpms/bro/devel bro.spec,1.2,1.3
Message-ID: <20090115140558.6F66A7012D@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/bro/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12144

Modified Files:
	bro.spec 
Log Message:
* Thu Jan 15 2009 Tomas Mraz <tmraz at redhat.com> - 1.4-0.3.20080804svn
- rebuild with new openssl



Index: bro.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bro/devel/bro.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- bro.spec	26 Aug 2008 12:48:42 -0000	1.2
+++ bro.spec	15 Jan 2009 14:05:27 -0000	1.3
@@ -3,7 +3,7 @@
 Summary: Open-source, Unix-based Network Intrusion Detection System
 Name: bro
 Version: 1.4
-Release: 0.2.%{snapshot}svn%{?dist}
+Release: 0.3.%{snapshot}svn%{?dist}
 License: BSD
 Group: Applications/Internet
 URL: http://bro-ids.org
@@ -115,6 +115,8 @@
 %{_localstatedir}/lib/bro
 
 %changelog
+* Thu Jan 15 2009 Tomas Mraz <tmraz at redhat.com> - 1.4-0.3.20080804svn
+- rebuild with new openssl
 
 * Tue Aug 26 2008 Daniel Kopecek <dkopecek at redhat.com> - 1.4-0.2.20080804svn
 - Added patch to prevent collision with the internal



From tmraz at fedoraproject.org  Thu Jan 15 14:06:32 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Thu, 15 Jan 2009 14:06:32 +0000 (UTC)
Subject: rpms/bunny/devel bunny.spec,1.1,1.2
Message-ID: <20090115140632.6A1A47012D@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/bunny/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12226

Modified Files:
	bunny.spec 
Log Message:
* Thu Jan 15 2009 Tomas Mraz <tmraz at redhat.com> 0.93-6
- rebuild with new openssl



Index: bunny.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bunny/devel/bunny.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- bunny.spec	29 Oct 2008 18:14:52 -0000	1.1
+++ bunny.spec	15 Jan 2009 14:06:02 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           bunny
 Version:        0.93
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Instrumented C code security fuzzer
 
 Group:          Development/Tools
@@ -66,6 +66,9 @@
 
 
 %changelog
+* Thu Jan 15 2009 Tomas Mraz <tmraz at redhat.com> 0.93-6
+- rebuild with new openssl
+
 * Wed Oct 29 2008 Rakesh Pandit <rakesh at fedoraproject.org> 0.93-5
 - Included ExcludeArch Bug numbers for ppc, ppc64 and ia64
 



From caolanm at fedoraproject.org  Thu Jan 15 14:10:05 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Thu, 15 Jan 2009 14:10:05 +0000 (UTC)
Subject: rpms/mythes-sk/devel mythes-sk.spec,1.6,1.7
Message-ID: <20090115141005.56BF57012D@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/mythes-sk/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12916

Modified Files:
	mythes-sk.spec 
Log Message:
spelling of thesaurus


Index: mythes-sk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mythes-sk/devel/mythes-sk.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- mythes-sk.spec	5 Jan 2009 13:39:19 -0000	1.6
+++ mythes-sk.spec	15 Jan 2009 14:09:34 -0000	1.7
@@ -1,5 +1,5 @@
 Name: mythes-sk
-Summary: Slovak thesarus
+Summary: Slovak thesaurus
 %define upstreamid 20090102
 Version: 0.%{upstreamid}
 Release: 1%{?dist}
@@ -12,7 +12,7 @@
 BuildArch: noarch
 
 %description
-Slovak thesarus.
+Slovak thesaurus.
 
 %prep
 %setup -q -c



From kvolny at fedoraproject.org  Thu Jan 15 14:11:01 2009
From: kvolny at fedoraproject.org (=?utf-8?q?Karel_Voln=C3=BD?=)
Date: Thu, 15 Jan 2009 14:11:01 +0000 (UTC)
Subject: comps comps-el5.xml.in, 1.21, 1.22 comps-f10.xml.in, 1.205,
	1.206 comps-f11.xml.in, 1.59, 1.60
Message-ID: <20090115141101.E5E4A7012D@cvs1.fedora.phx.redhat.com>

Author: kvolny

Update of /cvs/pkgs/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13028

Modified Files:
	comps-el5.xml.in comps-f10.xml.in comps-f11.xml.in 
Log Message:
added qmmp



Index: comps-el5.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-el5.xml.in,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- comps-el5.xml.in	19 Nov 2008 15:49:57 -0000	1.21
+++ comps-el5.xml.in	15 Jan 2009 14:10:31 -0000	1.22
@@ -327,6 +327,7 @@
       <packagereq type="optional">akode</packagereq>
       <packagereq type="optional">amarok</packagereq>
       <packagereq type="optional">ushare</packagereq>
+      <packagereq type="optional">qmmp</packagereq>
     </packagelist>
   </group>
   <group>


Index: comps-f10.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f10.xml.in,v
retrieving revision 1.205
retrieving revision 1.206
diff -u -r1.205 -r1.206
--- comps-f10.xml.in	14 Jan 2009 01:04:04 -0000	1.205
+++ comps-f10.xml.in	15 Jan 2009 14:10:31 -0000	1.206
@@ -4116,6 +4116,7 @@
       <packagereq type="optional">pulseaudio-module-lirc</packagereq>
       <packagereq type="optional">pulseaudio-module-zeroconf</packagereq>
       <packagereq type="optional">pyvnc2swf</packagereq>
+      <packagereq type="optional">qmmp</packagereq>
       <packagereq type="optional">quodlibet</packagereq>
       <packagereq type="optional">rakarrack</packagereq>
       <packagereq type="optional">regionset</packagereq>


Index: comps-f11.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f11.xml.in,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- comps-f11.xml.in	14 Jan 2009 04:23:36 -0000	1.59
+++ comps-f11.xml.in	15 Jan 2009 14:10:31 -0000	1.60
@@ -4236,6 +4236,7 @@
       <packagereq type="optional">pulseaudio-module-lirc</packagereq>
       <packagereq type="optional">pulseaudio-module-zeroconf</packagereq>
       <packagereq type="optional">pyvnc2swf</packagereq>
+      <packagereq type="optional">qmmp</packagereq>
       <packagereq type="optional">quodlibet</packagereq>
       <packagereq type="optional">rakarrack</packagereq>
       <packagereq type="optional">regionset</packagereq>



From caolanm at fedoraproject.org  Thu Jan 15 14:11:28 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Thu, 15 Jan 2009 14:11:28 +0000 (UTC)
Subject: rpms/mythes-ga/devel mythes-ga.spec,1.1,1.2
Message-ID: <20090115141128.91CDB7012D@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/mythes-ga/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13138

Modified Files:
	mythes-ga.spec 
Log Message:
spelling of thesaurus


Index: mythes-ga.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mythes-ga/devel/mythes-ga.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mythes-ga.spec	14 Dec 2008 15:08:46 -0000	1.1
+++ mythes-ga.spec	15 Jan 2009 14:10:58 -0000	1.2
@@ -1,5 +1,5 @@
 Name: mythes-ga
-Summary: Irish thesarus
+Summary: Irish thesaurus
 %define upstreamid 20071001
 Version: 0.%{upstreamid}
 Release: 1%{?dist}
@@ -12,7 +12,7 @@
 BuildArch: noarch
 
 %description
-German thesarus.
+German thesaurus.
 
 %prep
 %setup -q -c



From tmraz at fedoraproject.org  Thu Jan 15 14:12:19 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Thu, 15 Jan 2009 14:12:19 +0000 (UTC)
Subject: rpms/cfengine/devel cfengine.spec,1.37,1.38
Message-ID: <20090115141219.E4FFF7012D@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/cfengine/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13345

Modified Files:
	cfengine.spec 
Log Message:
* Thu Jan 15 2009 Tomas Mraz <tmraz at redhat.com> 2.2.8-3
- rebuild with new openssl



Index: cfengine.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cfengine/devel/cfengine.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- cfengine.spec	27 Sep 2008 16:01:31 -0000	1.37
+++ cfengine.spec	15 Jan 2009 14:11:49 -0000	1.38
@@ -1,7 +1,7 @@
 Summary: A systems administration tool for networks
 Name: cfengine
 Version: 2.2.8
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+
 Group: Applications/System
 Source0: ftp://ftp.iu.hio.no/pub/cfengine/cfengine-2.2.8.tar.gz
@@ -130,6 +130,9 @@
 
 
 %changelog
+* Thu Jan 15 2009 Tomas Mraz <tmraz at redhat.com> 2.2.8-3
+- rebuild with new openssl
+
 * Sat Sep 27 2008 Jeff Sheltren <jeff at osuosl.org> 2.2.8-2
 - Patch configure to detect db-4.7 (#461942)
 



From rjones at fedoraproject.org  Thu Jan 15 14:12:59 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Thu, 15 Jan 2009 14:12:59 +0000 (UTC)
Subject: rpms/ocaml-preludeml/devel import.log, NONE,
	1.1 ocaml-preludeml.spec, 
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090115141259.388907012D@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/ocaml-preludeml/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13578/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log ocaml-preludeml.spec 
Log Message:
Initial import.



--- NEW FILE import.log ---
ocaml-preludeml-0_1-0_10_20090113_fc11:HEAD:ocaml-preludeml-0.1-0.10.20090113.fc11.src.rpm:1232028477


--- NEW FILE ocaml-preludeml.spec ---
%define opt %(test -x %{_bindir}/ocamlopt && echo 1 || echo 0)
%define debug_package %{nil}

# There are no official releases, so we just use git dates.
# This software is much more stable than the "0.1" version
# number might indicate.
%define gitdate 20090113

Name:           ocaml-preludeml
Version:        0.1
Release:        0.10.%{gitdate}%{?dist}
Summary:        OCaml utility functions

Group:          Development/Libraries
License:        MIT
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

# To recreate the source tarball, do:
#   git clone git://github.com/kig/preludeml.git
#   tar --exclude .git -cf /tmp/preludeml-%{gitdate}.tar preludeml
#   bzip2 /tmp/preludeml-%{gitdate}.tar
URL:            http://github.com/kig/preludeml/tree/master
Source0:        preludeml-%{gitdate}.tar.bz2

BuildRequires:  ocaml >= 3.10.0
BuildRequires:  ocaml-findlib-devel
BuildRequires:  ocaml-pcre-devel
BuildRequires:  ocaml-ocamlnet-devel
BuildRequires:  ocaml-omake
BuildRequires:  ocaml-ounit-devel
BuildRequires:  ruby

%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
Prelude.ml is a collection of utility functions for OCaml programs.
Of particular interest are high level parallel combinators, which make
multicore parallelization of OCaml programs easy.


%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 preludeml


%build
omake

# Create a META file.
cat >META <<_EOF_
version = "%{version}"
requires = "pcre,unix,netstring,bigarray"
description = "OCaml utility functions"
archive(byte) = "prelude.cmo"
archive(native) = "prelude.cmxa"
_EOF_


%check
# The tests fail in various delightful ways:
# - i386 & ppc fail on 1 test (out of several hundred).  Probably a
#   64 bit assumption in the code or in the test somewhere.
# - ppc64 runs out of memory during the test.
omake test ||:


%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

ocamlfind install preludeml \
  META \
  src/prelude.ml \
  src/prelude.cmi \
  src/prelude.cmo \
  src/prelude.cmx \
  src/prelude.a \
  src/prelude.cmxa


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc LICENSE
%{_libdir}/ocaml/preludeml
%if %opt
%exclude %{_libdir}/ocaml/preludeml/*.a
%exclude %{_libdir}/ocaml/preludeml/*.cmx
%exclude %{_libdir}/ocaml/preludeml/*.cmxa
%endif
%exclude %{_libdir}/ocaml/preludeml/*.ml


%files devel
%defattr(-,root,root,-)
%doc LICENSE README TESTING
%if %opt
%{_libdir}/ocaml/preludeml/*.a
%{_libdir}/ocaml/preludeml/*.cmx
%{_libdir}/ocaml/preludeml/*.cmxa
%endif
%{_libdir}/ocaml/preludeml/*.ml


%changelog
* Tue Jan 13 2009 Richard W.M. Jones <rjones at redhat.com> - 0.1-0.10.20090113
- Tests require ounit & ruby.

* Tue Jan 13 2009 Richard W.M. Jones <rjones at redhat.com> - 0.1-0.4.20090113
- New upstream version 20090113, resolving licensing issues.
- Use omake to build.
- Added a check section to run automated tests.

* Sat Dec 20 2008 Richard W.M. Jones <rjones at redhat.com> - 0.1-0.2.20080922
- Fix the META file.

* Sat Dec 20 2008 Richard W.M. Jones <rjones at redhat.com> - 0.1-0.1.20080922
- Initial RPM release.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-preludeml/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	14 Jan 2009 21:25:03 -0000	1.1
+++ .cvsignore	15 Jan 2009 14:12:28 -0000	1.2
@@ -0,0 +1 @@
+preludeml-20090113.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-preludeml/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	14 Jan 2009 21:25:03 -0000	1.1
+++ sources	15 Jan 2009 14:12:28 -0000	1.2
@@ -0,0 +1 @@
+117903e9d545d3854e8d81f98e4ecc44  preludeml-20090113.tar.bz2



From rjones at fedoraproject.org  Thu Jan 15 14:13:39 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Thu, 15 Jan 2009 14:13:39 +0000 (UTC)
Subject: rpms/ocaml-preludeml/F-10 import.log, NONE, 1.1 ocaml-preludeml.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090115141339.A72057012D@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/ocaml-preludeml/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13832/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	import.log ocaml-preludeml.spec 
Log Message:
Initial import.



--- NEW FILE import.log ---
ocaml-preludeml-0_1-0_10_20090113_fc11:F-10:ocaml-preludeml-0.1-0.10.20090113.fc11.src.rpm:1232028494


--- NEW FILE ocaml-preludeml.spec ---
%define opt %(test -x %{_bindir}/ocamlopt && echo 1 || echo 0)
%define debug_package %{nil}

# There are no official releases, so we just use git dates.
# This software is much more stable than the "0.1" version
# number might indicate.
%define gitdate 20090113

Name:           ocaml-preludeml
Version:        0.1
Release:        0.10.%{gitdate}%{?dist}
Summary:        OCaml utility functions

Group:          Development/Libraries
License:        MIT
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

# To recreate the source tarball, do:
#   git clone git://github.com/kig/preludeml.git
#   tar --exclude .git -cf /tmp/preludeml-%{gitdate}.tar preludeml
#   bzip2 /tmp/preludeml-%{gitdate}.tar
URL:            http://github.com/kig/preludeml/tree/master
Source0:        preludeml-%{gitdate}.tar.bz2

BuildRequires:  ocaml >= 3.10.0
BuildRequires:  ocaml-findlib-devel
BuildRequires:  ocaml-pcre-devel
BuildRequires:  ocaml-ocamlnet-devel
BuildRequires:  ocaml-omake
BuildRequires:  ocaml-ounit-devel
BuildRequires:  ruby

%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
Prelude.ml is a collection of utility functions for OCaml programs.
Of particular interest are high level parallel combinators, which make
multicore parallelization of OCaml programs easy.


%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 preludeml


%build
omake

# Create a META file.
cat >META <<_EOF_
version = "%{version}"
requires = "pcre,unix,netstring,bigarray"
description = "OCaml utility functions"
archive(byte) = "prelude.cmo"
archive(native) = "prelude.cmxa"
_EOF_


%check
# The tests fail in various delightful ways:
# - i386 & ppc fail on 1 test (out of several hundred).  Probably a
#   64 bit assumption in the code or in the test somewhere.
# - ppc64 runs out of memory during the test.
omake test ||:


%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

ocamlfind install preludeml \
  META \
  src/prelude.ml \
  src/prelude.cmi \
  src/prelude.cmo \
  src/prelude.cmx \
  src/prelude.a \
  src/prelude.cmxa


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc LICENSE
%{_libdir}/ocaml/preludeml
%if %opt
%exclude %{_libdir}/ocaml/preludeml/*.a
%exclude %{_libdir}/ocaml/preludeml/*.cmx
%exclude %{_libdir}/ocaml/preludeml/*.cmxa
%endif
%exclude %{_libdir}/ocaml/preludeml/*.ml


%files devel
%defattr(-,root,root,-)
%doc LICENSE README TESTING
%if %opt
%{_libdir}/ocaml/preludeml/*.a
%{_libdir}/ocaml/preludeml/*.cmx
%{_libdir}/ocaml/preludeml/*.cmxa
%endif
%{_libdir}/ocaml/preludeml/*.ml


%changelog
* Tue Jan 13 2009 Richard W.M. Jones <rjones at redhat.com> - 0.1-0.10.20090113
- Tests require ounit & ruby.

* Tue Jan 13 2009 Richard W.M. Jones <rjones at redhat.com> - 0.1-0.4.20090113
- New upstream version 20090113, resolving licensing issues.
- Use omake to build.
- Added a check section to run automated tests.

* Sat Dec 20 2008 Richard W.M. Jones <rjones at redhat.com> - 0.1-0.2.20080922
- Fix the META file.

* Sat Dec 20 2008 Richard W.M. Jones <rjones at redhat.com> - 0.1-0.1.20080922
- Initial RPM release.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-preludeml/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	14 Jan 2009 21:25:03 -0000	1.1
+++ .cvsignore	15 Jan 2009 14:13:09 -0000	1.2
@@ -0,0 +1 @@
+preludeml-20090113.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-preludeml/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	14 Jan 2009 21:25:03 -0000	1.1
+++ sources	15 Jan 2009 14:13:09 -0000	1.2
@@ -0,0 +1 @@
+117903e9d545d3854e8d81f98e4ecc44  preludeml-20090113.tar.bz2



From caolanm at fedoraproject.org  Thu Jan 15 14:15:21 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Thu, 15 Jan 2009 14:15:21 +0000 (UTC)
Subject: rpms/mythes-de/devel mythes-de.spec,1.15,1.16
Message-ID: <20090115141521.1469E7012D@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/mythes-de/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14205

Modified Files:
	mythes-de.spec 
Log Message:
spelling of thesaurus


Index: mythes-de.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mythes-de/devel/mythes-de.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- mythes-de.spec	23 Dec 2008 15:41:19 -0000	1.15
+++ mythes-de.spec	15 Jan 2009 14:14:47 -0000	1.16
@@ -1,5 +1,5 @@
 Name: mythes-de
-Summary: German thesarus
+Summary: German thesaurus
 %define upstreamid 20081223
 Version: 0.%{upstreamid}
 Release: 1%{?dist}
@@ -12,7 +12,7 @@
 BuildArch: noarch
 
 %description
-German thesarus.
+German thesaurus.
 
 %prep
 %setup -q -c



From caolanm at fedoraproject.org  Thu Jan 15 14:17:29 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Thu, 15 Jan 2009 14:17:29 +0000 (UTC)
Subject: rpms/mythes-cs/devel mythes-cs.spec,1.1,1.2
Message-ID: <20090115141729.3032F7012D@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/mythes-cs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14598

Modified Files:
	mythes-cs.spec 
Log Message:
fix spelling of thesaurus


Index: mythes-cs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mythes-cs/devel/mythes-cs.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mythes-cs.spec	30 Nov 2007 07:48:49 -0000	1.1
+++ mythes-cs.spec	15 Jan 2009 14:16:58 -0000	1.2
@@ -1,5 +1,5 @@
 Name: mythes-cs
-Summary: Czech thesarus
+Summary: Czech thesaurus
 %define upstreamid 20070926
 Version: 0.%{upstreamid}
 Release: 1%{?dist}
@@ -12,7 +12,7 @@
 BuildArch: noarch
 
 %description
-Czech thesarus.
+Czech thesaurus.
 
 %prep
 %setup -q -c



From denis at fedoraproject.org  Thu Jan 15 14:17:36 2009
From: denis at fedoraproject.org (Denis Leroy)
Date: Thu, 15 Jan 2009 14:17:36 +0000 (UTC)
Subject: rpms/gstreamermm/F-10 .cvsignore, 1.4, 1.5 gstreamermm.spec, 1.4,
	1.5 sources, 1.4, 1.5
Message-ID: <20090115141736.BC5277012D@cvs1.fedora.phx.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/gstreamermm/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14627

Modified Files:
	.cvsignore gstreamermm.spec sources 
Log Message:
Update to upstream 0.9.8


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamermm/F-10/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	10 Oct 2008 08:17:19 -0000	1.4
+++ .cvsignore	15 Jan 2009 14:17:06 -0000	1.5
@@ -1 +1 @@
-gstreamermm-0.9.7.tar.bz2
+gstreamermm-0.9.8.tar.bz2


Index: gstreamermm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamermm/F-10/gstreamermm.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gstreamermm.spec	10 Oct 2008 08:17:19 -0000	1.4
+++ gstreamermm.spec	15 Jan 2009 14:17:06 -0000	1.5
@@ -1,5 +1,5 @@
 Name:           gstreamermm
-Version:        0.9.7
+Version:        0.9.8
 Release:        1%{?dist}
 
 Summary:        C++ wrapper for GStreamer library
@@ -43,6 +43,7 @@
 
 %build
 %configure --enable-shared --disable-examples --enable-docs --disable-dependency-tracking
+sed -i -e 's! -shared ! -Wl,--as-needed\0!g' libtool
 make %{?_smp_mflags}
 
 
@@ -84,6 +85,9 @@
 
 
 %changelog
+* Fri Dec 26 2008 Denis Leroy <denis at poolshark.org> - 0.9.8-1
+- Update to upstream 0.9.8
+
 * Fri Oct 10 2008 Denis Leroy <denis at poolshark.org> - 0.9.7-1
 - Update to upstream 0.9.7
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamermm/F-10/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	10 Oct 2008 08:17:19 -0000	1.4
+++ sources	15 Jan 2009 14:17:06 -0000	1.5
@@ -1 +1 @@
-b2f393fc1794aeaca21006e24f7d2b75  gstreamermm-0.9.7.tar.bz2
+a25a59d6e68e303a741b95de0b3f99eb  gstreamermm-0.9.8.tar.bz2



From caolanm at fedoraproject.org  Thu Jan 15 14:19:13 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Thu, 15 Jan 2009 14:19:13 +0000 (UTC)
Subject: rpms/mythes-en/devel mythes-en.spec,1.1,1.2
Message-ID: <20090115141913.A5E297012D@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/mythes-en/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15006

Modified Files:
	mythes-en.spec 
Log Message:
spelling of thesaurus


Index: mythes-en.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mythes-en/devel/mythes-en.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mythes-en.spec	30 Nov 2007 08:17:48 -0000	1.1
+++ mythes-en.spec	15 Jan 2009 14:18:43 -0000	1.2
@@ -1,5 +1,5 @@
 Name: mythes-en
-Summary: English thesarus
+Summary: English thesaurus
 Version: 3.0
 Release: 1%{?dist}
 Source0: http://wordnet.princeton.edu/3.0/WordNet-%{version}.tar.bz2
@@ -12,7 +12,7 @@
 BuildArch: noarch
 
 %description
-English thesarus.
+English thesaurus.
 
 %prep
 %setup -q -n WordNet-%{version}



From tmraz at fedoraproject.org  Thu Jan 15 14:19:24 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Thu, 15 Jan 2009 14:19:24 +0000 (UTC)
Subject: rpms/chntpw/devel chntpw.spec,1.3,1.4
Message-ID: <20090115141924.785B17012D@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/chntpw/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15061

Modified Files:
	chntpw.spec 
Log Message:
* Thu Jan 15 2009 Tomas Mraz <tmraz at redhat.com> - 0.99.6-6
- rebuild with new openssl



Index: chntpw.spec
===================================================================
RCS file: /cvs/pkgs/rpms/chntpw/devel/chntpw.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- chntpw.spec	13 Oct 2008 04:56:33 -0000	1.3
+++ chntpw.spec	15 Jan 2009 14:18:53 -0000	1.4
@@ -1,7 +1,7 @@
 Name:           chntpw
 # Version is taken from HISTORY.txt
 Version:        0.99.6
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Change passwords in Windows SAM files
 Group:          Applications/Engineering
 License:        GPLv2
@@ -63,6 +63,9 @@
 
 
 %changelog
+* Thu Jan 15 2009 Tomas Mraz <tmraz at redhat.com> - 0.99.6-6
+- rebuild with new openssl
+
 * Sun Oct 11 2008 Conrad Meyer <konrad at tylerc.org> - 0.99.6-5
 - Bump because force-tag was removed. Please add it back.
 



From caolanm at fedoraproject.org  Thu Jan 15 14:20:42 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Thu, 15 Jan 2009 14:20:42 +0000 (UTC)
Subject: rpms/hunspell-no/devel hunspell-no.spec,1.2,1.3
Message-ID: <20090115142042.D6F127012D@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/hunspell-no/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15426

Modified Files:
	hunspell-no.spec 
Log Message:
fix spelling of thesaurus


Index: hunspell-no.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-no/devel/hunspell-no.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- hunspell-no.spec	27 Nov 2008 12:22:43 -0000	1.2
+++ hunspell-no.spec	15 Jan 2009 14:20:12 -0000	1.3
@@ -45,18 +45,18 @@
 Nynorsk hyphenation rules
 
 %package -n mythes-nb
-Summary: Bokmaal thesarus
+Summary: Bokmaal thesaurus
 Group: Applications/Text
 
 %description -n mythes-nb
-Bokmaal thesarus.
+Bokmaal thesaurus.
 
 %package -n mythes-nn
-Summary: Nynorsk thesarus
+Summary: Nynorsk thesaurus 
 Group: Applications/Text
 
 %description -n mythes-nn
-Nynorsk thesarus.
+Nynorsk thesaurus.
 
 %prep
 %setup -q -c



From caolanm at fedoraproject.org  Thu Jan 15 14:21:27 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Thu, 15 Jan 2009 14:21:27 +0000 (UTC)
Subject: rpms/mythes-pl/devel mythes-pl.spec,1.2,1.3
Message-ID: <20090115142127.00FFF7012D@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/mythes-pl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15614

Modified Files:
	mythes-pl.spec 
Log Message:
spelling of thesaurus


Index: mythes-pl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mythes-pl/devel/mythes-pl.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mythes-pl.spec	13 May 2008 17:48:24 -0000	1.2
+++ mythes-pl.spec	15 Jan 2009 14:20:56 -0000	1.3
@@ -1,5 +1,5 @@
 Name: mythes-pl
-Summary: Polish thesarus
+Summary: Polish thesaurus
 Version: 1.5
 Release: 1%{?dist}
 Source: http://downloads.sourceforge.net/synonimy/OOo2-Thesaurus-%{version}.zip
@@ -11,7 +11,7 @@
 BuildArch: noarch
 
 %description
-Polish thesarus.
+Polish thesaurus.
 
 %prep
 %setup -q -c



From kyle at fedoraproject.org  Thu Jan 15 14:22:43 2009
From: kyle at fedoraproject.org (Kyle McMartin)
Date: Thu, 15 Jan 2009 14:22:43 +0000 (UTC)
Subject: rpms/kernel/devel config-generic, 1.221,
	1.222 use-per_cpu-module-references.patch, 1.1, 1.2
Message-ID: <20090115142243.EFDF87012D@cvs1.fedora.phx.redhat.com>

Author: kyle

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15776

Modified Files:
	config-generic use-per_cpu-module-references.patch 
Log Message:
CONFIG_DEBUG_NX_TEST can only be a module due to exception_table games.


Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-generic,v
retrieving revision 1.221
retrieving revision 1.222
diff -u -r1.221 -r1.222
--- config-generic	15 Jan 2009 02:03:33 -0000	1.221
+++ config-generic	15 Jan 2009 14:22:13 -0000	1.222
@@ -3309,7 +3309,7 @@
 # CONFIG_ENABLE_WARN_DEPRECATED is not set
 
 CONFIG_DEBUG_RODATA_TEST=y
-CONFIG_DEBUG_NX_TEST=y
+CONFIG_DEBUG_NX_TEST=m
 CONFIG_DEBUG_BOOT_PARAMS=y
 
 #

use-per_cpu-module-references.patch:

Index: use-per_cpu-module-references.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/use-per_cpu-module-references.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- use-per_cpu-module-references.patch	15 Jan 2009 07:41:04 -0000	1.1
+++ use-per_cpu-module-references.patch	15 Jan 2009 14:22:13 -0000	1.2
@@ -48,7 +48,7 @@
  		put_cpu();
  	}
 diff --git a/kernel/module.c b/kernel/module.c
-index c9332c9..e504f49 100644
+index e8b51d4..b03a1b5 100644
 --- a/kernel/module.c
 +++ b/kernel/module.c
 @@ -571,17 +571,19 @@ static char last_unloaded_module[MODULE_NAME_LEN+1];
@@ -85,7 +85,7 @@
  }
  
  #ifdef CONFIG_MODULE_FORCE_UNLOAD
-@@ -717,10 +721,12 @@ static int try_stop_module(struct module *mod, int flags, int *forced)
+@@ -717,10 +721,14 @@ static int try_stop_module(struct module *mod, int flags, int *forced)
  
  unsigned int module_refcount(struct module *mod)
  {
@@ -93,7 +93,9 @@
 +	unsigned int cpu, total = 0;
 +
 +	for_each_possible_cpu(cpu) {
-+		total += local_read(per_cpu_ptr(mod->ref, cpu));
++		local_t *ref = per_cpu_ptr(mod->ref, cpu);
++		if (ref)
++			total += local_read(ref);
 +	}
  
 -	for (i = 0; i < NR_CPUS; i++)
@@ -101,7 +103,7 @@
  	return total;
  }
  EXPORT_SYMBOL(module_refcount);
-@@ -894,7 +900,8 @@ void module_put(struct module *module)
+@@ -894,7 +902,8 @@ void module_put(struct module *module)
  {
  	if (module) {
  		unsigned int cpu = get_cpu();
@@ -111,7 +113,7 @@
  		/* Maybe they're waiting for us to drop reference? */
  		if (unlikely(!module_is_live(module)))
  			wake_up_process(module->waiter);
-@@ -919,8 +926,9 @@ static inline int use_module(struct module *a, struct module *b)
+@@ -919,8 +928,9 @@ static inline int use_module(struct module *a, struct module *b)
  	return strong_try_module_get(b) == 0;
  }
  
@@ -122,7 +124,7 @@
  }
  #endif /* CONFIG_MODULE_UNLOAD */
  
-@@ -2071,7 +2079,9 @@ static noinline struct module *load_module(void __user *umod,
+@@ -2071,7 +2081,9 @@ static noinline struct module *load_module(void __user *umod,
  	mod = (void *)sechdrs[modindex].sh_addr;
  
  	/* Now we've moved module, initialize linked lists, etc. */



From denis at fedoraproject.org  Thu Jan 15 14:25:04 2009
From: denis at fedoraproject.org (Denis Leroy)
Date: Thu, 15 Jan 2009 14:25:04 +0000 (UTC)
Subject: rpms/gstreamermm/F-10 gstreamermm.spec,1.5,1.6
Message-ID: <20090115142505.058047012D@cvs1.fedora.phx.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/gstreamermm/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16157

Modified Files:
	gstreamermm.spec 
Log Message:
Added m4 BR


Index: gstreamermm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamermm/F-10/gstreamermm.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- gstreamermm.spec	15 Jan 2009 14:17:06 -0000	1.5
+++ gstreamermm.spec	15 Jan 2009 14:24:34 -0000	1.6
@@ -14,7 +14,7 @@
 BuildRequires: gstreamer-devel >= 0.10.20
 BuildRequires: gstreamer-plugins-base-devel >= 0.10.20
 BuildRequires: libxml++-devel >= 2.14.0
-BuildRequires: doxygen graphviz
+BuildRequires: m4 doxygen graphviz
 
 
 %description



From denis at fedoraproject.org  Thu Jan 15 14:27:10 2009
From: denis at fedoraproject.org (Denis Leroy)
Date: Thu, 15 Jan 2009 14:27:10 +0000 (UTC)
Subject: rpms/cluttermm/devel .cvsignore, 1.3, 1.4 cluttermm.spec, 1.3,
	1.4 sources, 1.3, 1.4
Message-ID: <20090115142710.794E97012D@cvs1.fedora.phx.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/cluttermm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16591

Modified Files:
	.cvsignore cluttermm.spec sources 
Log Message:
Update to upstream 0.7.4, soname bump to 2


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cluttermm/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	7 Sep 2008 21:17:32 -0000	1.3
+++ .cvsignore	15 Jan 2009 14:26:39 -0000	1.4
@@ -1 +1 @@
-cluttermm-0.7.3.tar.bz2
+cluttermm-0.7.4.tar.bz2


Index: cluttermm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cluttermm/devel/cluttermm.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- cluttermm.spec	15 Sep 2008 09:33:56 -0000	1.3
+++ cluttermm.spec	15 Jan 2009 14:26:40 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           cluttermm
-Version:        0.7.3
-Release:        2%{?dist}
+Version:        0.7.4
+Release:        1%{?dist}
 
 Summary:        C++ wrapper for clutter library
 
@@ -80,6 +80,9 @@
 
 
 %changelog
+* Thu Jan 15 2009 Denis Leroy <denis at poolshark.org> - 0.7.4-1
+- Update to upstream 0.7.4
+
 * Mon Sep 15 2008 Denis Leroy <denis at poolshark.org> - 0.7.3-2
 - Fixed devel requires
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cluttermm/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	7 Sep 2008 21:17:32 -0000	1.3
+++ sources	15 Jan 2009 14:26:40 -0000	1.4
@@ -1 +1 @@
-4084298f0650b095f49e0f9b8355914a  cluttermm-0.7.3.tar.bz2
+088d2f2119815a35fde441dcfbc943ff  cluttermm-0.7.4.tar.bz2



From jskala at fedoraproject.org  Thu Jan 15 14:37:12 2009
From: jskala at fedoraproject.org (Jiri Skala)
Date: Thu, 15 Jan 2009 14:37:12 +0000 (UTC)
Subject: rpms/tftp/devel tftp-0.49-chk_retcodes.patch, NONE, 1.1 tftp.spec, 
	1.47, 1.48
Message-ID: <20090115143712.280DB7012D@cvs1.fedora.phx.redhat.com>

Author: jskala

Update of /cvs/extras/rpms/tftp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18677

Modified Files:
	tftp.spec 
Added Files:
	tftp-0.49-chk_retcodes.patch 
Log Message:
* Thu Jan 15 2009 Jiri Skala <jskala at redhat.com> - 0.49-2
- #473487 - unchecked return values


tftp-0.49-chk_retcodes.patch:

--- NEW FILE tftp-0.49-chk_retcodes.patch ---
diff -up tftp-hpa-0.49/tftpd/tftpd.c.chk_retcodes tftp-hpa-0.49/tftpd/tftpd.c
--- tftp-hpa-0.49/tftpd/tftpd.c.chk_retcodes	2009-01-15 15:28:50.000000000 +0100
+++ tftp-hpa-0.49/tftpd/tftpd.c	2009-01-15 15:31:36.000000000 +0100
@@ -932,7 +932,10 @@ int main(int argc, char **argv)
             exit(EX_OSERR);
         }
 #ifdef __CYGWIN__
-        chdir("/");             /* Cygwin chroot() bug workaround */
+				if (chdir("/") < 0) {			/* Cygwin chroot() bug workaround */
+					syslog(LOG_ERR, "chroot: %m");
+					exit(EX_OSERR);
+				}
 #endif
     }
 #ifdef HAVE_SETREGID


Index: tftp.spec
===================================================================
RCS file: /cvs/extras/rpms/tftp/devel/tftp.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- tftp.spec	25 Nov 2008 16:55:31 -0000	1.47
+++ tftp.spec	15 Jan 2009 14:36:41 -0000	1.48
@@ -1,7 +1,7 @@
 Summary: The client for the Trivial File Transfer Protocol (TFTP)
 Name: tftp
 Version: 0.49
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: BSD
 Group: Applications/Internet
 Source0: http://www.kernel.org/pub/software/network/tftp/tftp-hpa-%{version}.tar.bz2
@@ -10,6 +10,7 @@
 Patch0: tftp-0.40-remap.patch
 Patch2: tftp-hpa-0.39-tzfix.patch
 Patch3: tftp-0.42-tftpboot.patch
+Patch4: tftp-0.49-chk_retcodes.patch
 
 BuildRequires: tcp_wrappers-devel readline-devel
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -41,6 +42,7 @@
 %patch0 -p1 -b .zero
 %patch2 -p1 -b .tzfix
 %patch3 -p1 -b .tftpboot
+%patch4 -p1 -b .chk_retcodes
 
 %build
 
@@ -86,6 +88,9 @@
 %{_mandir}/man8/*
 
 %changelog
+* Thu Jan 15 2009 Jiri Skala <jskala at redhat.com> - 0.49-2
+- #473487 - unchecked return values
+
 * Tue Nov 25 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.49-1
 - update to 0.49
 



From mbarnes at fedoraproject.org  Thu Jan 15 14:43:11 2009
From: mbarnes at fedoraproject.org (Matthew Barnes)
Date: Thu, 15 Jan 2009 14:43:11 +0000 (UTC)
Subject: rpms/evolution-exchange/F-10 evolution-exchange.spec,1.47,1.48
Message-ID: <20090115144311.32CDB7012D@cvs1.fedora.phx.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/evolution-exchange/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19478

Modified Files:
	evolution-exchange.spec 
Log Message:

* Thu Jan 15 2009 Matthew Barnes <mbarnes at redhat.com> - 2.24.3-2.fc10
- Rebuild against the correct evolution-data-server.
- Bump eds_version to 2.24.3.



Index: evolution-exchange.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-exchange/F-10/evolution-exchange.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- evolution-exchange.spec	12 Jan 2009 19:49:08 -0000	1.47
+++ evolution-exchange.spec	15 Jan 2009 14:42:40 -0000	1.48
@@ -1,5 +1,5 @@
 %define evo_version 2.24.1
-%define eds_version 2.24.1
+%define eds_version 2.24.3
 %define intltool_version 0.35.5
 %define libsoup_version 2.3.0
 
@@ -23,7 +23,7 @@
 
 Name: evolution-exchange
 Version: 2.24.3
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2
 Group: Applications/Productivity
 Summary: Evolution plugin to interact with MS Exchange Server
@@ -156,7 +156,11 @@
 %{_sysconfdir}/gconf/schemas/apps_exchange_addressbook-%{evo_major}.schemas
 
 %changelog
-* Mon Jan 22 2009 Matthew Barnes <mbarnes at redhat.com> - 2.24.3-1.fc10
+* Thu Jan 15 2009 Matthew Barnes <mbarnes at redhat.com> - 2.24.3-2.fc10
+- Rebuild against the correct evolution-data-server.
+- Bump eds_version to 2.24.3.
+
+* Mon Jan 12 2009 Matthew Barnes <mbarnes at redhat.com> - 2.24.3-1.fc10
 - Update to 2.24.3
 
 * Mon Nov 24 2008 Matthew Barnes <mbarnes at redhat.com> - 2.24.2-1.fc10



From tmraz at fedoraproject.org  Thu Jan 15 14:44:06 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Thu, 15 Jan 2009 14:44:06 +0000 (UTC)
Subject: rpms/clustermon/devel clustermon.spec,1.7,1.8
Message-ID: <20090115144406.587417012D@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/clustermon/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19648

Modified Files:
	clustermon.spec 
Log Message:
* Thu Jan 15 2009 Tomas Mraz <tmraz at redhat.com> 0.15.0-7
- rebuild with new openssl



Index: clustermon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/clustermon/devel/clustermon.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- clustermon.spec	15 Oct 2008 20:24:38 -0000	1.7
+++ clustermon.spec	15 Jan 2009 14:43:36 -0000	1.8
@@ -17,7 +17,7 @@
 
 Name: clustermon
 Version: 0.15.0
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: GPLv2
 URL: http://sources.redhat.com/cluster/conga
 
@@ -182,6 +182,9 @@
 
 
 %changelog
+* Thu Jan 15 2009 Tomas Mraz <tmraz at redhat.com> 0.15.0-7
+- rebuild with new openssl
+
 * Wed Oct 15 2008 Ryan McCabe <rmccabe at redhat.com> 0.15.0-6
 - Don't make failing to update the cluster version a fatal error when trying to set a new configuration file.
 



From tmraz at fedoraproject.org  Thu Jan 15 14:45:59 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Thu, 15 Jan 2009 14:45:59 +0000 (UTC)
Subject: rpms/compat-erlang/devel compat-erlang.spec,1.11,1.12
Message-ID: <20090115144559.EB8897012D@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/compat-erlang/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20063

Modified Files:
	compat-erlang.spec 
Log Message:
* Thu Jan 15 2009 Tomas Mraz <tmraz at redhat.com> - R10B-12.11
- rebuild with new openssl



Index: compat-erlang.spec
===================================================================
RCS file: /cvs/pkgs/rpms/compat-erlang/devel/compat-erlang.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- compat-erlang.spec	15 Jul 2008 14:51:47 -0000	1.11
+++ compat-erlang.spec	15 Jan 2009 14:45:29 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           compat-erlang
 Version:        R10B
-Release:        12.10%{?dist}
+Release:        12.11%{?dist}
 Summary:        General-purpose programming language and runtime environment
 
 Group:          Development/Languages
@@ -97,6 +97,9 @@
 
 
 %changelog
+* Thu Jan 15 2009 Tomas Mraz <tmraz at redhat.com> - R10B-12.11
+- rebuild with new openssl
+
 * Tue Jul 15 2008 Tom "spot" Callaway <tcallawa at redhat.com> - R10B-12.10
 - fix license tag
 



From jwilson at fedoraproject.org  Thu Jan 15 15:11:50 2009
From: jwilson at fedoraproject.org (Jarod Wilson)
Date: Thu, 15 Jan 2009 15:11:50 +0000 (UTC)
Subject: rpms/libraw1394/devel .cvsignore, 1.11, 1.12 libraw1394.spec, 1.50, 
	1.51 sources, 1.12, 1.13 libraw1394-2.0.0-git-update.patch, 1.1,
	NONE libraw1394-use-errno-ENOSYS-in-unimplemented-functions.patch,
	1.1, NONE libraw1394-work-without-write-on-local-node-dev.patch,
	1.1, NONE
Message-ID: <20090115151150.8CA587012D@cvs1.fedora.phx.redhat.com>

Author: jwilson

Update of /cvs/pkgs/rpms/libraw1394/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23711

Modified Files:
	.cvsignore libraw1394.spec sources 
Removed Files:
	libraw1394-2.0.0-git-update.patch 
	libraw1394-use-errno-ENOSYS-in-unimplemented-functions.patch 
	libraw1394-work-without-write-on-local-node-dev.patch 
Log Message:
* Thu Jan 15 2009 Jarod Wilson <jarod at redhat.com> - 2.0.1-1
- Update to libraw1394 v2.0.1 release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libraw1394/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	18 Jul 2008 20:51:15 -0000	1.11
+++ .cvsignore	15 Jan 2009 15:11:20 -0000	1.12
@@ -4,3 +4,4 @@
 libraw1394-1.3.0.tar.gz
 libraw1394-2.0.0-20080430_git.tar.bz2
 libraw1394-2.0.0.tar.gz
+libraw1394-2.0.1.tar.gz


Index: libraw1394.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libraw1394/devel/libraw1394.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- libraw1394.spec	13 Jan 2009 15:10:26 -0000	1.50
+++ libraw1394.spec	15 Jan 2009 15:11:20 -0000	1.51
@@ -1,13 +1,10 @@
 Summary:        Library providing low-level IEEE-1394 access
 Name:           libraw1394
-Version:        2.0.0
-Release:        6%{?dist}
+Version:        2.0.1
+Release:        1%{?dist}
 License:        LGPLv2+
 Group:          System Environment/Libraries
 Source:         http://www.linux1394.org/dl/libraw1394-%{version}.tar.gz
-Patch0:         libraw1394-2.0.0-git-update.patch
-Patch1:         libraw1394-use-errno-ENOSYS-in-unimplemented-functions.patch
-Patch2:         libraw1394-work-without-write-on-local-node-dev.patch
 URL:            http://www.linux1394.org/
 ExcludeArch:    s390 s390x
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -30,9 +27,6 @@
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
 
 %build
 %configure --disable-static
@@ -71,6 +65,9 @@
 
 
 %changelog
+* Thu Jan 15 2009 Jarod Wilson <jarod at redhat.com> - 2.0.1-1
+- Update to libraw1394 v2.0.1 release
+
 * Tue Jan 13 2009 Jarod Wilson <jarod at redhat.com> - 2.0.0-6
 - Set errno = ENOSYS for all unimplemented functions
 - Make dvgrab and friends work w/o requiring r/w on the local fw node (#441073)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libraw1394/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	18 Jul 2008 20:51:15 -0000	1.12
+++ sources	15 Jan 2009 15:11:20 -0000	1.13
@@ -1 +1 @@
-f037629cc02509d4f24f6170bd656694  libraw1394-2.0.0.tar.gz
+c2c2ead417f0cb4e65bb3513325e73a9  libraw1394-2.0.1.tar.gz


--- libraw1394-2.0.0-git-update.patch DELETED ---


--- libraw1394-use-errno-ENOSYS-in-unimplemented-functions.patch DELETED ---


--- libraw1394-work-without-write-on-local-node-dev.patch DELETED ---



From kyle at fedoraproject.org  Thu Jan 15 15:14:50 2009
From: kyle at fedoraproject.org (Kyle McMartin)
Date: Thu, 15 Jan 2009 15:14:50 +0000 (UTC)
Subject: rpms/kernel/devel patch-2.6.29-rc1-git5.bz2.sign, NONE,
	1.1 .cvsignore, 
	1.992, 1.993 kernel.spec, 1.1218, 1.1219 sources, 1.954,
	1.955 upstream, 1.866, 1.867 patch-2.6.29-rc1-git4.bz2.sign, 1.1, NONE
Message-ID: <20090115151450.EA3087012D@cvs1.fedora.phx.redhat.com>

Author: kyle

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24168

Modified Files:
	.cvsignore kernel.spec sources upstream 
Added Files:
	patch-2.6.29-rc1-git5.bz2.sign 
Removed Files:
	patch-2.6.29-rc1-git4.bz2.sign 
Log Message:
* Thu Jan 15 2009 Kyle McMartin <kyle at redhat.com>
- 2.6.29-rc1-git5
- Fix module_ref patch, need to test before dereferencing possible
  (as opposed to online) percpu data.



--- NEW FILE patch-2.6.29-rc1-git5.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBJbyW7yGugalF9Dw4RAo5HAJ92MBcB1m+02uBGpNg9gpbZwmPwyQCgjU3h
3lCTzJU0YvOOtEOc+IUiLa0=
=hZNB
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.992
retrieving revision 1.993
diff -u -r1.992 -r1.993
--- .cvsignore	14 Jan 2009 00:47:50 -0000	1.992
+++ .cvsignore	15 Jan 2009 15:14:20 -0000	1.993
@@ -6,4 +6,4 @@
 linux-2.6.28.tar.bz2
 patch-2.6.28-git14.bz2
 patch-2.6.29-rc1.bz2
-patch-2.6.29-rc1-git4.bz2
+patch-2.6.29-rc1-git5.bz2


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1218
retrieving revision 1.1219
diff -u -r1.1218 -r1.1219
--- kernel.spec	15 Jan 2009 07:41:04 -0000	1.1218
+++ kernel.spec	15 Jan 2009 15:14:20 -0000	1.1219
@@ -58,7 +58,7 @@
 # The rc snapshot level
 %define rcrev 1
 # The git snapshot level
-%define gitrev 4
+%define gitrev 5
 # Set rpm version accordingly
 %define rpmversion 2.6.%{upstream_sublevel}
 %endif
@@ -1739,6 +1739,11 @@
 
 %changelog
 * Thu Jan 15 2009 Kyle McMartin <kyle at redhat.com>
+- 2.6.29-rc1-git5
+- Fix module_ref patch, need to test before dereferencing possible
+  (as opposed to online) percpu data.
+
+* Thu Jan 15 2009 Kyle McMartin <kyle at redhat.com>
 - New version of module_ref patch, uses per_cpu instead.
 - Fix linux-2.6-hdpvr.patch up and re-enable.
     Nuke .flush, was useless, convert to v4l2_file_operations, fix ioctl ret


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v
retrieving revision 1.954
retrieving revision 1.955
diff -u -r1.954 -r1.955
--- sources	14 Jan 2009 00:47:50 -0000	1.954
+++ sources	15 Jan 2009 15:14:20 -0000	1.955
@@ -1,3 +1,3 @@
 d351e44709c9810b85e29b877f50968a  linux-2.6.28.tar.bz2
 c7280469ffd1edd4b50bac92de172d46  patch-2.6.29-rc1.bz2
-3ebb40941bd64fd79c0c62a043c1806d  patch-2.6.29-rc1-git4.bz2
+759a3df181fa9d24fa3cf6e18ce2207c  patch-2.6.29-rc1-git5.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v
retrieving revision 1.866
retrieving revision 1.867
diff -u -r1.866 -r1.867
--- upstream	14 Jan 2009 00:47:50 -0000	1.866
+++ upstream	15 Jan 2009 15:14:20 -0000	1.867
@@ -1,3 +1,3 @@
 linux-2.6.28.tar.bz2
 patch-2.6.29-rc1.bz2
-patch-2.6.29-rc1-git4.bz2
+patch-2.6.29-rc1-git5.bz2


--- patch-2.6.29-rc1-git4.bz2.sign DELETED ---



From jwilson at fedoraproject.org  Thu Jan 15 15:18:33 2009
From: jwilson at fedoraproject.org (Jarod Wilson)
Date: Thu, 15 Jan 2009 15:18:33 +0000 (UTC)
Subject: rpms/libraw1394/F-10 libraw1394.spec, 1.50, 1.51 sources, 1.12,
	1.13 libraw1394-2.0.0-git-update.patch, 1.1,
	NONE libraw1394-use-errno-ENOSYS-in-unimplemented-functions.patch,
	1.1, NONE libraw1394-work-without-write-on-local-node-dev.patch,
	1.1, NONE
Message-ID: <20090115151833.E6F3B7012D@cvs1.fedora.phx.redhat.com>

Author: jwilson

Update of /cvs/pkgs/rpms/libraw1394/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24622

Modified Files:
	libraw1394.spec sources 
Removed Files:
	libraw1394-2.0.0-git-update.patch 
	libraw1394-use-errno-ENOSYS-in-unimplemented-functions.patch 
	libraw1394-work-without-write-on-local-node-dev.patch 
Log Message:
* Thu Jan 15 2009 Jarod Wilson <jarod at redhat.com> - 2.0.1-1
- Update to libraw1394 v2.0.1 release



Index: libraw1394.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libraw1394/F-10/libraw1394.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- libraw1394.spec	14 Jan 2009 21:48:29 -0000	1.50
+++ libraw1394.spec	15 Jan 2009 15:18:03 -0000	1.51
@@ -1,13 +1,10 @@
 Summary:        Library providing low-level IEEE-1394 access
 Name:           libraw1394
-Version:        2.0.0
-Release:        6%{?dist}
+Version:        2.0.1
+Release:        1%{?dist}
 License:        LGPLv2+
 Group:          System Environment/Libraries
 Source:         http://www.linux1394.org/dl/libraw1394-%{version}.tar.gz
-Patch0:         libraw1394-2.0.0-git-update.patch
-Patch1:         libraw1394-use-errno-ENOSYS-in-unimplemented-functions.patch
-Patch2:         libraw1394-work-without-write-on-local-node-dev.patch
 URL:            http://www.linux1394.org/
 ExcludeArch:    s390 s390x
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -30,9 +27,6 @@
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
 
 %build
 %configure --disable-static
@@ -71,6 +65,9 @@
 
 
 %changelog
+* Thu Jan 15 2009 Jarod Wilson <jarod at redhat.com> - 2.0.1-1
+- Update to libraw1394 v2.0.1 release
+
 * Tue Jan 13 2009 Jarod Wilson <jarod at redhat.com> - 2.0.0-6
 - Set errno = ENOSYS for all unimplemented functions
 - Make dvgrab and friends work w/o requiring r/w on the local fw node (#441073)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libraw1394/F-10/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	18 Jul 2008 20:51:15 -0000	1.12
+++ sources	15 Jan 2009 15:18:03 -0000	1.13
@@ -1 +1 @@
-f037629cc02509d4f24f6170bd656694  libraw1394-2.0.0.tar.gz
+c2c2ead417f0cb4e65bb3513325e73a9  libraw1394-2.0.1.tar.gz


--- libraw1394-2.0.0-git-update.patch DELETED ---


--- libraw1394-use-errno-ENOSYS-in-unimplemented-functions.patch DELETED ---


--- libraw1394-work-without-write-on-local-node-dev.patch DELETED ---



From limb at fedoraproject.org  Thu Jan 15 15:32:34 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Thu, 15 Jan 2009 15:32:34 +0000 (UTC)
Subject: rpms/gnotime/devel gnotime.spec,1.29,1.30
Message-ID: <20090115153234.7F95470141@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/gnotime/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26415

Modified Files:
	gnotime.spec 
Log Message:
Fixed Description column text, BZ 480087.



Index: gnotime.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnotime/devel/gnotime.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- gnotime.spec	4 Apr 2008 14:24:19 -0000	1.29
+++ gnotime.spec	15 Jan 2009 15:32:04 -0000	1.30
@@ -1,12 +1,13 @@
 Name:           gnotime
 Version:        2.3.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Tracks and reports time spent
 
 Group:          Applications/Productivity
 License:        GPLv2+
 URL:            http://gttr.sourceforge.net/
 Source0:        http://downloads.sf.net/gttr/%{name}-%{version}.tar.gz
+Patch0:         gnotime-2.3.0-description-column.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gtkhtml3-devel
@@ -37,6 +38,8 @@
 %prep
 %setup -q
 
+%patch0 -p0
+
 sed -i 's/\(Icon=.*\)\.png/\1/' gnotime.desktop.in
 
 %build
@@ -107,6 +110,9 @@
 %{_sysconfdir}/gconf/schemas/*
 
 %changelog
+* Thu Jan 15 2009 Jon Ciesla <limb at jcomserv.net> - 2.3.0-2
+- Fixed Description column text, BZ 480087.
+
 * Tue Feb 19 2008 Jon Ciesla <limb at jcomserv.net> - 2.3.0-1
 - Upgrade to 2.3.0.
 - Updated guile version dep to 1.8.



From jwilson at fedoraproject.org  Thu Jan 15 15:33:56 2009
From: jwilson at fedoraproject.org (Jarod Wilson)
Date: Thu, 15 Jan 2009 15:33:56 +0000 (UTC)
Subject: rpms/libiec61883/devel libiec61883-1.2.0-installtests.patch, NONE, 
	1.1 .cvsignore, 1.3, 1.4 libiec61883.spec, 1.15, 1.16 sources,
	1.3, 1.4 libiec61883-1.1.0-installtests.patch, 1.1, NONE
Message-ID: <20090115153356.651257012D@cvs1.fedora.phx.redhat.com>

Author: jwilson

Update of /cvs/pkgs/rpms/libiec61883/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27251

Modified Files:
	.cvsignore libiec61883.spec sources 
Added Files:
	libiec61883-1.2.0-installtests.patch 
Removed Files:
	libiec61883-1.1.0-installtests.patch 
Log Message:
* Thu Jan 15 2009 Jarod Wilson <jarod at redhat.com> 1.2.0-1
- Update to libiec61883 v1.2.0 release
- Rework installtests patch to not require reautoconf
- Make iso channel allocation work w/o local fw node r/w


libiec61883-1.2.0-installtests.patch:

--- NEW FILE libiec61883-1.2.0-installtests.patch ---
diff -Naurp libiec61883-1.2.0.orig/examples/Makefile.am libiec61883-1.2.0/examples/Makefile.am
--- libiec61883-1.2.0.orig/examples/Makefile.am	2006-09-24 15:34:12.000000000 -0400
+++ libiec61883-1.2.0/examples/Makefile.am	2009-01-15 10:29:02.265594991 -0500
@@ -1,6 +1,6 @@
 
-noinst_PROGRAMS = test-amdtp test-dv test-mpeg2 test-plugs
-bin_PROGRAMS = plugreport plugctl
+noinst_PROGRAMS =
+bin_PROGRAMS = plugreport plugctl test-amdtp test-dv test-mpeg2 test-plugs
 man_MANS = plugreport.1 plugctl.1
 EXTRA_DIST = plugreport.1 plugctl.1
 
diff -Naurp libiec61883-1.2.0.orig/examples/Makefile.in libiec61883-1.2.0/examples/Makefile.in
--- libiec61883-1.2.0.orig/examples/Makefile.in	2009-01-15 01:33:33.000000000 -0500
+++ libiec61883-1.2.0/examples/Makefile.in	2009-01-15 10:28:57.088402078 -0500
@@ -32,9 +32,10 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-noinst_PROGRAMS = test-amdtp$(EXEEXT) test-dv$(EXEEXT) \
+noinst_PROGRAMS =
+bin_PROGRAMS = plugreport$(EXEEXT) plugctl$(EXEEXT) \
+	test-amdtp$(EXEEXT) test-dv$(EXEEXT) \
 	test-mpeg2$(EXEEXT) test-plugs$(EXEEXT)
-bin_PROGRAMS = plugreport$(EXEEXT) plugctl$(EXEEXT)
 subdir = examples
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libiec61883/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	25 Oct 2006 17:18:29 -0000	1.3
+++ .cvsignore	15 Jan 2009 15:33:26 -0000	1.4
@@ -1,2 +1,3 @@
 libiec61883-1.0.0.tar.gz
 libiec61883-1.1.0.tar.gz
+libiec61883-1.2.0.tar.gz


Index: libiec61883.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libiec61883/devel/libiec61883.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- libiec61883.spec	22 Jul 2008 19:24:01 -0000	1.15
+++ libiec61883.spec	15 Jan 2009 15:33:26 -0000	1.16
@@ -1,18 +1,18 @@
 Summary:        Streaming library for IEEE1394
 Name:           libiec61883
-Version:        1.1.0
-Release:        5%{?dist}
+Version:        1.2.0
+Release:        1%{?dist}
 License:        LGPLv2+
 Group:          System Environment/Libraries
 Source:         http://linux1394.org/dl/%{name}-%{version}.tar.gz
-Patch:          libiec61883-1.1.0-installtests.patch
+Patch0:         libiec61883-1.2.0-installtests.patch
+Patch1:         libiec61883-channel-allocation-without-local-node-rw.patch
 URL:            http://linux1394.org
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 ExcludeArch:    s390 s390x
 
 # Works only with newer libraw1394 versions
 BuildRequires:  libraw1394-devel >= 1.2.1
-BuildRequires:  autoconf, automake, libtool
 Requires:       libraw1394 >= 1.2.1
 
 %description
@@ -42,10 +42,10 @@
 
 %prep
 %setup -q
-%patch -p1 -b .installtests
+%patch0 -p1
+%patch1 -p1
 
 %build
-autoreconf
 export CFLAGS="$RPM_OPT_FLAGS"
 %configure
 make %{?_smp_mflags}
@@ -81,32 +81,37 @@
 %{_mandir}/man1/*.1*
 
 %changelog
+* Thu Jan 15 2009 Jarod Wilson <jarod at redhat.com> 1.2.0-1
+- Update to libiec61883 v1.2.0 release
+- Rework installtests patch to not require reautoconf
+- Make iso channel allocation work w/o local fw node r/w
+
 * Tue Jul 22 2008 Jarod Wilson <jwilson at redhat.com> 1.1.0-5
 - Bump and rebuild for libraw1394 v2.0.0
 
-* Thu Feb 14 2008 Jarod Wilson <jwilson at redhat.com> - 1.1.0-4
+* Thu Feb 14 2008 Jarod Wilson <jwilson at redhat.com> 1.1.0-4
 - Bump and rebuild with gcc 4.3
 
-* Wed Dec 19 2007 Jarod Wilson <jwilson at redhat.com> - 1.1.0-3
+* Wed Dec 19 2007 Jarod Wilson <jwilson at redhat.com> 1.1.0-3
 - Fix license and group tags (#411201)
 - Clean up spacing and macro/var inconsistency
 
-* Mon Mar 26 2007 Jarod Wilson <jwilson at redhat.com> - 1.1.0-2
+* Mon Mar 26 2007 Jarod Wilson <jwilson at redhat.com> 1.1.0-2
 - Own created directories (#233865)
 
-* Wed Oct 25 2006 Jarod Wilson <jwilson at redhat.com> - 1.1.0-1
+* Wed Oct 25 2006 Jarod Wilson <jwilson at redhat.com> 1.1.0-1
 - Update to 1.1.0 release
 
-* Wed Oct 11 2006 Jarod Wilson <jwilson at redhat.com> - 1.0.0-11
+* Wed Oct 11 2006 Jarod Wilson <jwilson at redhat.com> 1.0.0-11
 - Use %%dist tag
 
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.0.0-10.fc5.2.1
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> 1.0.0-10.fc5.2.1
 - rebuild
 
-* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.0.0-10.fc5.2
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> 1.0.0-10.fc5.2
 - bump again for double-long bug on ppc(64)
 
-* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.0.0-10.fc5.1
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> 1.0.0-10.fc5.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 
 * Fri Dec 30 2005 Jarod Wilson <jarod at wilsonet.com> 1.0.0-10


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libiec61883/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	25 Oct 2006 17:18:29 -0000	1.3
+++ sources	15 Jan 2009 15:33:26 -0000	1.4
@@ -1 +1,2 @@
 08f46840912ae2032499186228842a32  libiec61883-1.1.0.tar.gz
+8af39fff74988073c3ad53fbab147da9  libiec61883-1.2.0.tar.gz


--- libiec61883-1.1.0-installtests.patch DELETED ---



From limb at fedoraproject.org  Thu Jan 15 15:35:08 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Thu, 15 Jan 2009 15:35:08 +0000 (UTC)
Subject: rpms/gnotime/devel gnotime-2.3.0-description-column.patch,NONE,1.1
Message-ID: <20090115153508.12EAA7012D@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/gnotime/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27649

Added Files:
	gnotime-2.3.0-description-column.patch 
Log Message:
Oops.


gnotime-2.3.0-description-column.patch:

--- NEW FILE gnotime-2.3.0-description-column.patch ---
--- src/projects-tree.c.orig	2009-01-15 09:07:52.000000000 -0600
+++ src/projects-tree.c	2009-01-15 09:07:52.000000000 -0600
@@ -269 +269 @@
-	priv->column_definitions[9].model_column = TITLE_COLUMN;
+	priv->column_definitions[9].model_column = DESCRIPTION_COLUMN;



From jwilson at fedoraproject.org  Thu Jan 15 15:40:05 2009
From: jwilson at fedoraproject.org (Jarod Wilson)
Date: Thu, 15 Jan 2009 15:40:05 +0000 (UTC)
Subject: rpms/libiec61883/devel
	libiec61883-channel-allocation-without-local-node-rw.patch, NONE,
	1.1 libiec61883.spec, 1.16, 1.17 sources, 1.4, 1.5
Message-ID: <20090115154005.EAB197012D@cvs1.fedora.phx.redhat.com>

Author: jwilson

Update of /cvs/pkgs/rpms/libiec61883/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28287

Modified Files:
	libiec61883.spec sources 
Added Files:
	libiec61883-channel-allocation-without-local-node-rw.patch 
Log Message:
oops, forgot to cvs add patch.

libiec61883-channel-allocation-without-local-node-rw.patch:

--- NEW FILE libiec61883-channel-allocation-without-local-node-rw.patch ---
Date: Thu, 15 Jan 2009 15:41:16 +0100 (CET)
From: Stefan Richter <stefanr at s5r6.in-berlin.de>
Subject: [PATCH libiec61883] cmp: replace open-coded channel allocation by
	raw1394_channel_modify
To: Dan Dennedy <dan at dennedy.org>
Cc: linux1394-devel at lists.sourceforge.net

On 15 Jan, Dan Dennedy wrote:
> On Thu, Jan 1, 2009 at 5:13 AM, Stefan Richter
> <stefanr at s5r6.in-berlin.de> wrote:
>> input plug register on the local node?  AFAICT neither dvgrab nor kino
>> use raw1394_channel_modify and raw1394_bandwidth_modify, not even
>> through libiec61883.)
> 
> dvgrab indirectly uses channel_modify when you use its -guid option to
> establish a point-to-point connection.
> 

Hmm.

$ dvgrab -guid 0x008088030960484b
libiec61883 error: Failed to get channels available.
Established connection over channel 63
[...proceeds with capture...]


--------------------------------- 8< ---------------------------------

cmp: replace open-coded channel allocation by raw1394_channel_modify

The benefit is that it works on kernel 2.6.30 firewire-core without
write permission to the IRM's device file (provided that libraw1394 is
extended for 2.6.30 ioctls too, otherwise it still needs access to the
IRM's file).

If I read the code correctly, iec61883_cmp_normalize_output doesn't care
whether the channel was already allocated by somebody else; it only
cares that the channel is allocated.  That's what the new code does too.
---
 src/cmp.c |   56 +++++++++---------------------------------------------
 1 file changed, 10 insertions(+), 46 deletions(-)

Index: libiec61883-1.2.0/src/cmp.c
===================================================================
--- libiec61883-1.2.0.orig/src/cmp.c
+++ libiec61883-1.2.0/src/cmp.c
@@ -973,55 +973,19 @@ iec61883_cmp_normalize_output (raw1394ha
 
 	DEBUG ("iec61883_cmp_normalize_output: node %d\n", (int) node & 0x3f);
 
-	// Check for plugs on output
+	/* Check for plugs on output */
 	result = iec61883_get_oMPR (handle, node, &ompr);
 	if (result < 0)
 		return result;
 	
-	// locate an ouput plug that has a connection
-	for (oplug = 0; oplug < ompr.n_plugs; oplug++) {
-		if (iec61883_get_oPCRX (handle, node, &opcr, oplug) == 0) {
-			if (opcr.online && (opcr.n_p2p_connections > 0 || 
-				                opcr.bcast_connection == 1)) {
+	/* Locate an ouptut plug that has a connection,
+	 * make sure the plug's channel is allocated with IRM */
+	for (oplug = 0; oplug < ompr.n_plugs; oplug++)
+		if (iec61883_get_oPCRX (handle, node, &opcr, oplug) == 0
+		    && opcr.online
+		    && (opcr.n_p2p_connections > 0 || opcr.bcast_connection == 1)
+		    && raw1394_channel_modify (handle, opcr.channel, RAW1394_MODIFY_ALLOC) < 0)
+			DEBUG ("Channel %d already allocated, or can't reach IRM", opcr.channel);
 
-				// Make sure the plug's channel is allocated with IRM
-				quadlet_t buffer;
-				nodeaddr_t addr = CSR_REGISTER_BASE;
-				unsigned int c = opcr.channel;
-				quadlet_t compare, swap = 0;
-				quadlet_t new;
-				
-				if (c > 31 && c < 64) {
-					addr += CSR_CHANNELS_AVAILABLE_LO;
-					c -= 32;
-				} else if (c < 64)
-					addr += CSR_CHANNELS_AVAILABLE_HI;
-				else
-					FAIL ("Invalid channel");
-				c = 31 - c;
-
-				result = iec61883_cooked_read (handle, raw1394_get_irm_id (handle), addr, 
-					sizeof (quadlet_t), &buffer);
-				if (result < 0)
-					FAIL ("Failed to get channels available.");
-				
-				buffer = ntohl (buffer);
-				DEBUG ("channels available before: 0x%08x", buffer);
-
-				if ((buffer & (1 << c)) != 0) {
-					swap = htonl (buffer & ~(1 << c));
-					compare = htonl (buffer);
-
-					result = raw1394_lock (handle, raw1394_get_irm_id (handle), addr,
-							   EXTCODE_COMPARE_SWAP, swap, compare, &new);
-					if ( (result < 0) || (new != compare) ) {
-						FAIL ("Failed to modify channel %d", opcr.channel);
-					}
-					DEBUG ("channels available after: 0x%08x", ntohl (swap));
-				}
-			}
-		}
-	}
-		
-	return result;
+	return 0;
 }

-- 
Stefan Richter
-=====-==--= ---= -====
http://arcgraph.de/sr/


Index: libiec61883.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libiec61883/devel/libiec61883.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- libiec61883.spec	15 Jan 2009 15:33:26 -0000	1.16
+++ libiec61883.spec	15 Jan 2009 15:39:35 -0000	1.17
@@ -83,7 +83,7 @@
 %changelog
 * Thu Jan 15 2009 Jarod Wilson <jarod at redhat.com> 1.2.0-1
 - Update to libiec61883 v1.2.0 release
-- Rework installtests patch to not require reautoconf
+- Rework installtests patch to not require autoreconf
 - Make iso channel allocation work w/o local fw node r/w
 
 * Tue Jul 22 2008 Jarod Wilson <jwilson at redhat.com> 1.1.0-5


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libiec61883/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	15 Jan 2009 15:33:26 -0000	1.4
+++ sources	15 Jan 2009 15:39:35 -0000	1.5
@@ -1,2 +1 @@
-08f46840912ae2032499186228842a32  libiec61883-1.1.0.tar.gz
 8af39fff74988073c3ad53fbab147da9  libiec61883-1.2.0.tar.gz



From limb at fedoraproject.org  Thu Jan 15 15:57:25 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Thu, 15 Jan 2009 15:57:25 +0000 (UTC)
Subject: rpms/gnotime/F-10 gnotime-2.3.0-description-column.patch, NONE,
	1.1 gnotime.spec, 1.29, 1.30
Message-ID: <20090115155725.2B8867012D@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/gnotime/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30342

Modified Files:
	gnotime.spec 
Added Files:
	gnotime-2.3.0-description-column.patch 
Log Message:
Fixed Description column text, BZ 480087.


gnotime-2.3.0-description-column.patch:

--- NEW FILE gnotime-2.3.0-description-column.patch ---
--- src/projects-tree.c.orig	2009-01-15 09:07:52.000000000 -0600
+++ src/projects-tree.c	2009-01-15 09:07:52.000000000 -0600
@@ -269 +269 @@
-	priv->column_definitions[9].model_column = TITLE_COLUMN;
+	priv->column_definitions[9].model_column = DESCRIPTION_COLUMN;


Index: gnotime.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnotime/F-10/gnotime.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- gnotime.spec	4 Apr 2008 14:24:19 -0000	1.29
+++ gnotime.spec	15 Jan 2009 15:56:54 -0000	1.30
@@ -1,12 +1,13 @@
 Name:           gnotime
 Version:        2.3.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Tracks and reports time spent
 
 Group:          Applications/Productivity
 License:        GPLv2+
 URL:            http://gttr.sourceforge.net/
 Source0:        http://downloads.sf.net/gttr/%{name}-%{version}.tar.gz
+Patch0:         gnotime-2.3.0-description-column.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gtkhtml3-devel
@@ -37,6 +38,8 @@
 %prep
 %setup -q
 
+%patch0 -p0
+
 sed -i 's/\(Icon=.*\)\.png/\1/' gnotime.desktop.in
 
 %build
@@ -107,6 +110,9 @@
 %{_sysconfdir}/gconf/schemas/*
 
 %changelog
+* Thu Jan 15 2009 Jon Ciesla <limb at jcomserv.net> - 2.3.0-2
+- Fixed Description column text, BZ 480087.
+
 * Tue Feb 19 2008 Jon Ciesla <limb at jcomserv.net> - 2.3.0-1
 - Upgrade to 2.3.0.
 - Updated guile version dep to 1.8.



From ruben at fedoraproject.org  Thu Jan 15 16:01:07 2009
From: ruben at fedoraproject.org (Ruben Kerkhof)
Date: Thu, 15 Jan 2009 16:01:07 +0000 (UTC)
Subject: rpms/Pound/devel .cvsignore, 1.21, 1.22 Pound.spec, 1.27,
	1.28 sources, 1.21, 1.22
Message-ID: <20090115160107.E027C7012D@cvs1.fedora.phx.redhat.com>

Author: ruben

Update of /cvs/pkgs/rpms/Pound/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31013

Modified Files:
	.cvsignore Pound.spec sources 
Log Message:
* Thu Jan 15 2009 Ruben Kerkhof <ruben at rubenkerkhof.com> 2.4.4-1
- upstream released new version



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/Pound/devel/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- .cvsignore	13 Oct 2008 11:28:50 -0000	1.21
+++ .cvsignore	15 Jan 2009 16:00:37 -0000	1.22
@@ -1 +1 @@
-Pound-2.4.3.tgz
+Pound-2.4.4.tgz


Index: Pound.spec
===================================================================
RCS file: /cvs/pkgs/rpms/Pound/devel/Pound.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- Pound.spec	13 Oct 2008 11:28:50 -0000	1.27
+++ Pound.spec	15 Jan 2009 16:00:37 -0000	1.28
@@ -3,7 +3,7 @@
 %define pound_home   %{_localstatedir}/lib/pound
 
 Name:        Pound
-Version:     2.4.3
+Version:     2.4.4
 Release:     1%{?dist}
 Summary:     Reverse proxy and load balancer
 
@@ -116,6 +116,9 @@
 %attr(-,%{pound_user},%{pound_group}) %dir %{pound_home}
 
 %changelog
+* Thu Jan 15 2009 Ruben Kerkhof <ruben at rubenkerkhof.com> 2.4.4-1
+- upstream released new version
+
 * Mon Oct 13 2008 Ruben Kerkhof <ruben at rubenkerkhof.com> 2.4.3-1
 - Upstream released new version
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/Pound/devel/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sources	13 Oct 2008 11:28:50 -0000	1.21
+++ sources	15 Jan 2009 16:00:37 -0000	1.22
@@ -1 +1 @@
-2de4c2ac1023b420b74a1bc08fb93b8a  Pound-2.4.3.tgz
+013144a9fef3302d3691617aedc0d438  Pound-2.4.4.tgz



From jwilson at fedoraproject.org  Thu Jan 15 16:04:09 2009
From: jwilson at fedoraproject.org (Jarod Wilson)
Date: Thu, 15 Jan 2009 16:04:09 +0000 (UTC)
Subject: rpms/libiec61883/F-10 libiec61883-1.2.0-installtests.patch, NONE,
	1.1 libiec61883-channel-allocation-without-local-node-rw.patch,
	NONE, 1.1 libiec61883.spec, 1.15, 1.16 sources, 1.3,
	1.4 libiec61883-1.1.0-installtests.patch, 1.1, NONE
Message-ID: <20090115160410.021487012D@cvs1.fedora.phx.redhat.com>

Author: jwilson

Update of /cvs/pkgs/rpms/libiec61883/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31678

Modified Files:
	libiec61883.spec sources 
Added Files:
	libiec61883-1.2.0-installtests.patch 
	libiec61883-channel-allocation-without-local-node-rw.patch 
Removed Files:
	libiec61883-1.1.0-installtests.patch 
Log Message:
* Thu Jan 15 2009 Jarod Wilson <jarod at redhat.com> 1.2.0-1
- Update to libiec61883 v1.2.0 release
- Rework installtests patch to not require autoreconf
- Make iso channel allocation work w/o local fw node r/w


libiec61883-1.2.0-installtests.patch:

--- NEW FILE libiec61883-1.2.0-installtests.patch ---
diff -Naurp libiec61883-1.2.0.orig/examples/Makefile.am libiec61883-1.2.0/examples/Makefile.am
--- libiec61883-1.2.0.orig/examples/Makefile.am	2006-09-24 15:34:12.000000000 -0400
+++ libiec61883-1.2.0/examples/Makefile.am	2009-01-15 10:29:02.265594991 -0500
@@ -1,6 +1,6 @@
 
-noinst_PROGRAMS = test-amdtp test-dv test-mpeg2 test-plugs
-bin_PROGRAMS = plugreport plugctl
+noinst_PROGRAMS =
+bin_PROGRAMS = plugreport plugctl test-amdtp test-dv test-mpeg2 test-plugs
 man_MANS = plugreport.1 plugctl.1
 EXTRA_DIST = plugreport.1 plugctl.1
 
diff -Naurp libiec61883-1.2.0.orig/examples/Makefile.in libiec61883-1.2.0/examples/Makefile.in
--- libiec61883-1.2.0.orig/examples/Makefile.in	2009-01-15 01:33:33.000000000 -0500
+++ libiec61883-1.2.0/examples/Makefile.in	2009-01-15 10:28:57.088402078 -0500
@@ -32,9 +32,10 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-noinst_PROGRAMS = test-amdtp$(EXEEXT) test-dv$(EXEEXT) \
+noinst_PROGRAMS =
+bin_PROGRAMS = plugreport$(EXEEXT) plugctl$(EXEEXT) \
+	test-amdtp$(EXEEXT) test-dv$(EXEEXT) \
 	test-mpeg2$(EXEEXT) test-plugs$(EXEEXT)
-bin_PROGRAMS = plugreport$(EXEEXT) plugctl$(EXEEXT)
 subdir = examples
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4

libiec61883-channel-allocation-without-local-node-rw.patch:

--- NEW FILE libiec61883-channel-allocation-without-local-node-rw.patch ---
Date: Thu, 15 Jan 2009 15:41:16 +0100 (CET)
From: Stefan Richter <stefanr at s5r6.in-berlin.de>
Subject: [PATCH libiec61883] cmp: replace open-coded channel allocation by
	raw1394_channel_modify
To: Dan Dennedy <dan at dennedy.org>
Cc: linux1394-devel at lists.sourceforge.net

On 15 Jan, Dan Dennedy wrote:
> On Thu, Jan 1, 2009 at 5:13 AM, Stefan Richter
> <stefanr at s5r6.in-berlin.de> wrote:
>> input plug register on the local node?  AFAICT neither dvgrab nor kino
>> use raw1394_channel_modify and raw1394_bandwidth_modify, not even
>> through libiec61883.)
> 
> dvgrab indirectly uses channel_modify when you use its -guid option to
> establish a point-to-point connection.
> 

Hmm.

$ dvgrab -guid 0x008088030960484b
libiec61883 error: Failed to get channels available.
Established connection over channel 63
[...proceeds with capture...]


--------------------------------- 8< ---------------------------------

cmp: replace open-coded channel allocation by raw1394_channel_modify

The benefit is that it works on kernel 2.6.30 firewire-core without
write permission to the IRM's device file (provided that libraw1394 is
extended for 2.6.30 ioctls too, otherwise it still needs access to the
IRM's file).

If I read the code correctly, iec61883_cmp_normalize_output doesn't care
whether the channel was already allocated by somebody else; it only
cares that the channel is allocated.  That's what the new code does too.
---
 src/cmp.c |   56 +++++++++---------------------------------------------
 1 file changed, 10 insertions(+), 46 deletions(-)

Index: libiec61883-1.2.0/src/cmp.c
===================================================================
--- libiec61883-1.2.0.orig/src/cmp.c
+++ libiec61883-1.2.0/src/cmp.c
@@ -973,55 +973,19 @@ iec61883_cmp_normalize_output (raw1394ha
 
 	DEBUG ("iec61883_cmp_normalize_output: node %d\n", (int) node & 0x3f);
 
-	// Check for plugs on output
+	/* Check for plugs on output */
 	result = iec61883_get_oMPR (handle, node, &ompr);
 	if (result < 0)
 		return result;
 	
-	// locate an ouput plug that has a connection
-	for (oplug = 0; oplug < ompr.n_plugs; oplug++) {
-		if (iec61883_get_oPCRX (handle, node, &opcr, oplug) == 0) {
-			if (opcr.online && (opcr.n_p2p_connections > 0 || 
-				                opcr.bcast_connection == 1)) {
+	/* Locate an ouptut plug that has a connection,
+	 * make sure the plug's channel is allocated with IRM */
+	for (oplug = 0; oplug < ompr.n_plugs; oplug++)
+		if (iec61883_get_oPCRX (handle, node, &opcr, oplug) == 0
+		    && opcr.online
+		    && (opcr.n_p2p_connections > 0 || opcr.bcast_connection == 1)
+		    && raw1394_channel_modify (handle, opcr.channel, RAW1394_MODIFY_ALLOC) < 0)
+			DEBUG ("Channel %d already allocated, or can't reach IRM", opcr.channel);
 
-				// Make sure the plug's channel is allocated with IRM
-				quadlet_t buffer;
-				nodeaddr_t addr = CSR_REGISTER_BASE;
-				unsigned int c = opcr.channel;
-				quadlet_t compare, swap = 0;
-				quadlet_t new;
-				
-				if (c > 31 && c < 64) {
-					addr += CSR_CHANNELS_AVAILABLE_LO;
-					c -= 32;
-				} else if (c < 64)
-					addr += CSR_CHANNELS_AVAILABLE_HI;
-				else
-					FAIL ("Invalid channel");
-				c = 31 - c;
-
-				result = iec61883_cooked_read (handle, raw1394_get_irm_id (handle), addr, 
-					sizeof (quadlet_t), &buffer);
-				if (result < 0)
-					FAIL ("Failed to get channels available.");
-				
-				buffer = ntohl (buffer);
-				DEBUG ("channels available before: 0x%08x", buffer);
-
-				if ((buffer & (1 << c)) != 0) {
-					swap = htonl (buffer & ~(1 << c));
-					compare = htonl (buffer);
-
-					result = raw1394_lock (handle, raw1394_get_irm_id (handle), addr,
-							   EXTCODE_COMPARE_SWAP, swap, compare, &new);
-					if ( (result < 0) || (new != compare) ) {
-						FAIL ("Failed to modify channel %d", opcr.channel);
-					}
-					DEBUG ("channels available after: 0x%08x", ntohl (swap));
-				}
-			}
-		}
-	}
-		
-	return result;
+	return 0;
 }

-- 
Stefan Richter
-=====-==--= ---= -====
http://arcgraph.de/sr/


Index: libiec61883.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libiec61883/F-10/libiec61883.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- libiec61883.spec	22 Jul 2008 19:24:01 -0000	1.15
+++ libiec61883.spec	15 Jan 2009 16:03:39 -0000	1.16
@@ -1,18 +1,18 @@
 Summary:        Streaming library for IEEE1394
 Name:           libiec61883
-Version:        1.1.0
-Release:        5%{?dist}
+Version:        1.2.0
+Release:        1%{?dist}
 License:        LGPLv2+
 Group:          System Environment/Libraries
 Source:         http://linux1394.org/dl/%{name}-%{version}.tar.gz
-Patch:          libiec61883-1.1.0-installtests.patch
+Patch0:         libiec61883-1.2.0-installtests.patch
+Patch1:         libiec61883-channel-allocation-without-local-node-rw.patch
 URL:            http://linux1394.org
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 ExcludeArch:    s390 s390x
 
 # Works only with newer libraw1394 versions
 BuildRequires:  libraw1394-devel >= 1.2.1
-BuildRequires:  autoconf, automake, libtool
 Requires:       libraw1394 >= 1.2.1
 
 %description
@@ -42,10 +42,10 @@
 
 %prep
 %setup -q
-%patch -p1 -b .installtests
+%patch0 -p1
+%patch1 -p1
 
 %build
-autoreconf
 export CFLAGS="$RPM_OPT_FLAGS"
 %configure
 make %{?_smp_mflags}
@@ -81,32 +81,37 @@
 %{_mandir}/man1/*.1*
 
 %changelog
+* Thu Jan 15 2009 Jarod Wilson <jarod at redhat.com> 1.2.0-1
+- Update to libiec61883 v1.2.0 release
+- Rework installtests patch to not require autoreconf
+- Make iso channel allocation work w/o local fw node r/w
+
 * Tue Jul 22 2008 Jarod Wilson <jwilson at redhat.com> 1.1.0-5
 - Bump and rebuild for libraw1394 v2.0.0
 
-* Thu Feb 14 2008 Jarod Wilson <jwilson at redhat.com> - 1.1.0-4
+* Thu Feb 14 2008 Jarod Wilson <jwilson at redhat.com> 1.1.0-4
 - Bump and rebuild with gcc 4.3
 
-* Wed Dec 19 2007 Jarod Wilson <jwilson at redhat.com> - 1.1.0-3
+* Wed Dec 19 2007 Jarod Wilson <jwilson at redhat.com> 1.1.0-3
 - Fix license and group tags (#411201)
 - Clean up spacing and macro/var inconsistency
 
-* Mon Mar 26 2007 Jarod Wilson <jwilson at redhat.com> - 1.1.0-2
+* Mon Mar 26 2007 Jarod Wilson <jwilson at redhat.com> 1.1.0-2
 - Own created directories (#233865)
 
-* Wed Oct 25 2006 Jarod Wilson <jwilson at redhat.com> - 1.1.0-1
+* Wed Oct 25 2006 Jarod Wilson <jwilson at redhat.com> 1.1.0-1
 - Update to 1.1.0 release
 
-* Wed Oct 11 2006 Jarod Wilson <jwilson at redhat.com> - 1.0.0-11
+* Wed Oct 11 2006 Jarod Wilson <jwilson at redhat.com> 1.0.0-11
 - Use %%dist tag
 
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.0.0-10.fc5.2.1
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> 1.0.0-10.fc5.2.1
 - rebuild
 
-* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.0.0-10.fc5.2
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> 1.0.0-10.fc5.2
 - bump again for double-long bug on ppc(64)
 
-* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.0.0-10.fc5.1
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> 1.0.0-10.fc5.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 
 * Fri Dec 30 2005 Jarod Wilson <jarod at wilsonet.com> 1.0.0-10


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libiec61883/F-10/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	25 Oct 2006 17:18:29 -0000	1.3
+++ sources	15 Jan 2009 16:03:39 -0000	1.4
@@ -1 +1 @@
-08f46840912ae2032499186228842a32  libiec61883-1.1.0.tar.gz
+8af39fff74988073c3ad53fbab147da9  libiec61883-1.2.0.tar.gz


--- libiec61883-1.1.0-installtests.patch DELETED ---



From pkgdb at fedoraproject.org  Thu Jan 15 16:07:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 15 Jan 2009 16:07:05 +0000
Subject: [pkgdb] koffice: ltvrdy has requested watchbugzilla
Message-ID: <20090115160706.40C3C208457@bastion.fedora.phx.redhat.com>

ltvrdy has requested the watchbugzilla acl on koffice (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/koffice



From pkgdb at fedoraproject.org  Thu Jan 15 16:07:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 15 Jan 2009 16:07:09 +0000
Subject: [pkgdb] koffice: ltvrdy has requested watchcommits
Message-ID: <20090115160710.0D9BF208468@bastion.fedora.phx.redhat.com>

ltvrdy has requested the watchcommits acl on koffice (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/koffice



From pkgdb at fedoraproject.org  Thu Jan 15 16:07:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 15 Jan 2009 16:07:13 +0000
Subject: [pkgdb] koffice: ltvrdy has requested commit
Message-ID: <20090115160714.3D045208469@bastion.fedora.phx.redhat.com>

ltvrdy has requested the commit acl on koffice (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/koffice



From nsantos at fedoraproject.org  Thu Jan 15 16:08:37 2009
From: nsantos at fedoraproject.org (Nuno Santos)
Date: Thu, 15 Jan 2009 16:08:37 +0000 (UTC)
Subject: rpms/amqp/F-9 .cvsignore, 1.11, 1.12 amqp.spec, 1.15, 1.16 sources, 
	1.14, 1.15
Message-ID: <20090115160837.A22347012D@cvs1.fedora.phx.redhat.com>

Author: nsantos

Update of /cvs/extras/rpms/amqp/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32742

Modified Files:
	.cvsignore amqp.spec sources 
Log Message:
Rebased to svn rev 734452


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/amqp/F-9/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	23 Dec 2008 15:49:21 -0000	1.11
+++ .cvsignore	15 Jan 2009 16:08:07 -0000	1.12
@@ -1 +1 @@
-amqp-1.0.728142.tar.gz
+amqp-1.0.734452.tar.gz


Index: amqp.spec
===================================================================
RCS file: /cvs/extras/rpms/amqp/F-9/amqp.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- amqp.spec	23 Dec 2008 16:24:47 -0000	1.15
+++ amqp.spec	15 Jan 2009 16:08:07 -0000	1.16
@@ -1,6 +1,6 @@
 Name:           amqp
-Version:        1.0.728142
-Release:        2%{?dist}
+Version:        1.0.734452
+Release:        1%{?dist}
 Epoch:          0
 Summary:        The AMQP specification
 
@@ -39,6 +39,9 @@
 
 
 %changelog
+* Thu Jan 15 2009 Nuno Santos <nsantos at redhat.com> - 0:1.0.734452-1
+- Rebased to svn rev 734452
+
 * Tue Dec 23 2008 Nuno Santos <nsantos at redhat.com> - 0:1.0.728142-2
 - Rebased to svn rev 728142
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/amqp/F-9/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	23 Dec 2008 15:49:21 -0000	1.14
+++ sources	15 Jan 2009 16:08:07 -0000	1.15
@@ -1 +1 @@
-c5981e60692fe413c430a46433793e65  amqp-1.0.728142.tar.gz
+201602662e6a756afe2167b9650d787b  amqp-1.0.734452.tar.gz



From pkgdb at fedoraproject.org  Thu Jan 15 16:10:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 15 Jan 2009 16:10:55 +0000
Subject: [pkgdb] koffice had acl change status
Message-ID: <20090115161055.7A1E12082B9@bastion.fedora.phx.redhat.com>

rdieter has set the watchbugzilla acl on koffice (Fedora devel) to Approved for ltvrdy

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/koffice



From pkgdb at fedoraproject.org  Thu Jan 15 16:10:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 15 Jan 2009 16:10:56 +0000
Subject: [pkgdb] koffice had acl change status
Message-ID: <20090115161056.D5966208471@bastion.fedora.phx.redhat.com>

rdieter has set the watchcommits acl on koffice (Fedora devel) to Approved for ltvrdy

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/koffice



From pkgdb at fedoraproject.org  Thu Jan 15 16:11:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 15 Jan 2009 16:11:00 +0000
Subject: [pkgdb] koffice had acl change status
Message-ID: <20090115161100.DF518208479@bastion.fedora.phx.redhat.com>

rdieter has set the commit acl on koffice (Fedora devel) to Approved for ltvrdy

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/koffice



From nsantos at fedoraproject.org  Thu Jan 15 16:15:12 2009
From: nsantos at fedoraproject.org (Nuno Santos)
Date: Thu, 15 Jan 2009 16:15:12 +0000 (UTC)
Subject: rpms/amqp/devel .cvsignore, 1.11, 1.12 amqp.spec, 1.16, 1.17 sources,
	1.14, 1.15
Message-ID: <20090115161512.74B477012D@cvs1.fedora.phx.redhat.com>

Author: nsantos

Update of /cvs/extras/rpms/amqp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1340

Modified Files:
	.cvsignore amqp.spec sources 
Log Message:
Rebased to svn rev 734452


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/amqp/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	23 Dec 2008 15:40:04 -0000	1.11
+++ .cvsignore	15 Jan 2009 16:14:42 -0000	1.12
@@ -1 +1 @@
-amqp-1.0.728142.tar.gz
+amqp-1.0.734452.tar.gz


Index: amqp.spec
===================================================================
RCS file: /cvs/extras/rpms/amqp/devel/amqp.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- amqp.spec	23 Dec 2008 16:06:50 -0000	1.16
+++ amqp.spec	15 Jan 2009 16:14:42 -0000	1.17
@@ -1,6 +1,6 @@
 Name:           amqp
-Version:        1.0.728142
-Release:        2%{?dist}
+Version:        1.0.734452
+Release:        1%{?dist}
 Epoch:          0
 Summary:        The AMQP specification
 
@@ -39,6 +39,9 @@
 
 
 %changelog
+* Thu Jan 15 2009 Nuno Santos <nsantos at redhat.com> - 0:1.0.734452-1
+- Rebased to svn rev 734452
+
 * Tue Dec 23 2008 Nuno Santos <nsantos at redhat.com> - 0:1.0.728142-2
 - Rebased to svn rev 728142
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/amqp/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	23 Dec 2008 15:40:04 -0000	1.14
+++ sources	15 Jan 2009 16:14:42 -0000	1.15
@@ -1 +1 @@
-c5981e60692fe413c430a46433793e65  amqp-1.0.728142.tar.gz
+201602662e6a756afe2167b9650d787b  amqp-1.0.734452.tar.gz



From pkgdb at fedoraproject.org  Thu Jan 15 16:15:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 15 Jan 2009 16:15:31 +0000
Subject: [pkgdb] cas was added for astokes
Message-ID: <20090115161531.5ACCB208207@bastion.fedora.phx.redhat.com>

spot has added Package cas with summary automated core analysis tool
spot has approved Package cas
spot has added a Fedora devel branch for cas with an owner of astokes
spot has approved cas in Fedora devel
spot has approved Package cas
spot has set commit to Approved for provenpackager on cas (Fedora devel)
spot has set build to Approved for provenpackager on cas (Fedora devel)
spot has set checkout to Approved for provenpackager on cas (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cas



From pkgdb at fedoraproject.org  Thu Jan 15 16:15:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 15 Jan 2009 16:15:33 +0000
Subject: [pkgdb] cas (Fedora, 10) updated by spot
Message-ID: <20090115161533.832AA208457@bastion.fedora.phx.redhat.com>

spot added a Fedora 10 branch for cas
spot has set commit to Approved for provenpackager on cas (Fedora 10)
spot has set build to Approved for provenpackager on cas (Fedora 10)
spot has set checkout to Approved for provenpackager on cas (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cas



From pkgdb at fedoraproject.org  Thu Jan 15 16:15:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 15 Jan 2009 16:15:33 +0000
Subject: [pkgdb] cas (Fedora, 9) updated by spot
Message-ID: <20090115161533.8E41620846C@bastion.fedora.phx.redhat.com>

spot added a Fedora 9 branch for cas
spot has set commit to Approved for provenpackager on cas (Fedora 9)
spot has set build to Approved for provenpackager on cas (Fedora 9)
spot has set checkout to Approved for provenpackager on cas (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cas



From pkgdb at fedoraproject.org  Thu Jan 15 16:15:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 15 Jan 2009 16:15:33 +0000
Subject: [pkgdb] cas (Fedora EPEL, 5) updated by spot
Message-ID: <20090115161533.918E3208470@bastion.fedora.phx.redhat.com>

spot added a Fedora EPEL 5 branch for cas
spot has set commit to Approved for provenpackager on cas (Fedora EPEL 5)
spot has set build to Approved for provenpackager on cas (Fedora EPEL 5)
spot has set checkout to Approved for provenpackager on cas (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cas



From pkgdb at fedoraproject.org  Thu Jan 15 16:15:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 15 Jan 2009 16:15:33 +0000
Subject: [pkgdb] cas (Fedora EPEL, 4) updated by spot
Message-ID: <20090115161533.A712F208473@bastion.fedora.phx.redhat.com>

spot added a Fedora EPEL 4 branch for cas
spot has set commit to Approved for provenpackager on cas (Fedora EPEL 4)
spot has set build to Approved for provenpackager on cas (Fedora EPEL 4)
spot has set checkout to Approved for provenpackager on cas (Fedora EPEL 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cas



From spot at fedoraproject.org  Thu Jan 15 16:15:45 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Thu, 15 Jan 2009 16:15:45 +0000 (UTC)
Subject: rpms/cas - New directory
Message-ID: <20090115161545.29ED27012D@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/cas
In directory cvs1.fedora.phx.redhat.com:/home/fedora/spot/cvs/CVSROOT/admin/tmpcvsrG1715/rpms/cas

Log Message:
Directory /cvs/pkgs/rpms/cas added to the repository




From spot at fedoraproject.org  Thu Jan 15 16:15:45 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Thu, 15 Jan 2009 16:15:45 +0000 (UTC)
Subject: rpms/cas/devel - New directory
Message-ID: <20090115161545.6EBAA70142@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/cas/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/spot/cvs/CVSROOT/admin/tmpcvsrG1715/rpms/cas/devel

Log Message:
Directory /cvs/pkgs/rpms/cas/devel added to the repository




From spot at fedoraproject.org  Thu Jan 15 16:16:01 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Thu, 15 Jan 2009 16:16:01 +0000 (UTC)
Subject: rpms/cas Makefile,NONE,1.1
Message-ID: <20090115161601.688727012D@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/cas
In directory cvs1.fedora.phx.redhat.com:/home/fedora/spot/cvs/CVSROOT/admin/tmpcvsrG1715/rpms/cas

Added Files:
	Makefile 
Log Message:
Setup of module cas


--- NEW FILE Makefile ---
# Top level Makefile for module cas
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout 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  Thu Jan 15 16:16:01 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Thu, 15 Jan 2009 16:16:01 +0000 (UTC)
Subject: rpms/cas/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <20090115161601.A27CA7012D@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/cas/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/spot/cvs/CVSROOT/admin/tmpcvsrG1715/rpms/cas/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module cas


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: cas
# $Id: Makefile,v 1.1 2009/01/15 16:16:01 spot Exp $
NAME := cas
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From nsantos at fedoraproject.org  Thu Jan 15 16:20:44 2009
From: nsantos at fedoraproject.org (Nuno Santos)
Date: Thu, 15 Jan 2009 16:20:44 +0000 (UTC)
Subject: rpms/python-qpid/devel .cvsignore, 1.10, 1.11 python-qpid.spec, 1.19,
	1.20 sources, 1.14, 1.15
Message-ID: <20090115162044.7B8A37012D@cvs1.fedora.phx.redhat.com>

Author: nsantos

Update of /cvs/extras/rpms/python-qpid/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2538

Modified Files:
	.cvsignore python-qpid.spec sources 
Log Message:
Rebased to svn rev 734452


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-qpid/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	23 Dec 2008 15:55:15 -0000	1.10
+++ .cvsignore	15 Jan 2009 16:20:13 -0000	1.11
@@ -1 +1 @@
-python-qpid-0.4.728142.tar.gz
+python-qpid-0.4.734452.tar.gz


Index: python-qpid.spec
===================================================================
RCS file: /cvs/extras/rpms/python-qpid/devel/python-qpid.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- python-qpid.spec	8 Jan 2009 17:44:03 -0000	1.19
+++ python-qpid.spec	15 Jan 2009 16:20:14 -0000	1.20
@@ -1,6 +1,6 @@
 Name:           python-qpid
-Version:        0.4.728142
-Release:        3%{?dist}
+Version:        0.4.734452
+Release:        1%{?dist}
 Summary:        Python language client for AMQP
 
 Group:          Development/Python
@@ -16,7 +16,7 @@
 BuildRequires:  python-devel
 
 Requires:       python
-Requires:       amqp >= 1.0.728142
+Requires:       amqp >= 1.0.734452
 
 %description
 The Apache Qpid project's Python language client for AMQP.
@@ -32,6 +32,7 @@
 chmod 0644 LICENSE.txt
 echo "\n" > cpp_failing_0-8.txt
 echo 'amqp_spec = "%{_datadir}/amqp/amqp.0-10-qpid-errata.xml"' > qpid_config.py
+find examples/ -type f -exec chmod -c 644 {} ';'
 
 %build
 #empty
@@ -69,11 +70,15 @@
 %{python_sitelib}/qmf
 %{_bindir}/python-qpid-tests
 %{_bindir}/qpid-*
-%doc LICENSE.txt NOTICE.txt README.txt doc/test-requirements.txt
+%doc LICENSE.txt NOTICE.txt README.txt doc/test-requirements.txt examples/
 
 
 
 %changelog
+* Wed Jan 14 2009 Nuno Santos <nsantos at redhat.com> - 0.4.734452-1
+- Rebased to svn rev 734452
+- BZ 478467: include examples
+
 * Thu Jan  8 2009 Nuno Santos <nsantos at redhat.com> - 0.4.728142-3
 - BZ 479212: add qmf dirs
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-qpid/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	23 Dec 2008 15:55:15 -0000	1.14
+++ sources	15 Jan 2009 16:20:14 -0000	1.15
@@ -1 +1 @@
-8d66db177502bc8ebcf86b426779f74e  python-qpid-0.4.728142.tar.gz
+cb50d8ba6012bbc674c2d87860d4838d  python-qpid-0.4.734452.tar.gz



From nsantos at fedoraproject.org  Thu Jan 15 16:26:45 2009
From: nsantos at fedoraproject.org (Nuno Santos)
Date: Thu, 15 Jan 2009 16:26:45 +0000 (UTC)
Subject: rpms/ruby-qpid/devel .cvsignore, 1.5, 1.6 ruby-qpid.spec, 1.6,
	1.7 sources, 1.5, 1.6
Message-ID: <20090115162645.C18CF7012D@cvs1.fedora.phx.redhat.com>

Author: nsantos

Update of /cvs/extras/rpms/ruby-qpid/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3776

Modified Files:
	.cvsignore ruby-qpid.spec sources 
Log Message:
Rebased to svn rev 734452


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ruby-qpid/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	23 Dec 2008 16:40:25 -0000	1.5
+++ .cvsignore	15 Jan 2009 16:26:15 -0000	1.6
@@ -1 +1 @@
-ruby-qpid-0.4.728142.tar.gz
+ruby-qpid-0.4.734452.tar.gz


Index: ruby-qpid.spec
===================================================================
RCS file: /cvs/extras/rpms/ruby-qpid/devel/ruby-qpid.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ruby-qpid.spec	23 Dec 2008 16:40:25 -0000	1.6
+++ ruby-qpid.spec	15 Jan 2009 16:26:15 -0000	1.7
@@ -1,5 +1,5 @@
 Name:           ruby-qpid
-Version:	0.4.728142
+Version:	0.4.734452
 Release:        1%{?dist}
 Summary:        Ruby language client for AMQP
 
@@ -18,7 +18,7 @@
 
 Requires:       ruby
 Requires:       ruby(abi) = 1.8
-Requires:       amqp >= 1.0.728142
+Requires:       amqp >= 1.0.734452
 
 Provides:       ruby(qpid) = %{version}
 
@@ -51,6 +51,9 @@
 %doc LICENSE.txt NOTICE.txt
 
 %changelog
+* Wed Jan 14 2009 Nuno Santos <nsantos at redhat.com> - 0.4.734452-1
+- Rebased to svn rev 734452
+
 * Tue Dec 23 2008 Nuno Santos <nsantos at redhat.com> - 0.4.728142-1
 - Rebased to svn rev 728142
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ruby-qpid/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	23 Dec 2008 16:40:25 -0000	1.5
+++ sources	15 Jan 2009 16:26:15 -0000	1.6
@@ -1 +1 @@
-ab08d2532283b4987498af12c9b5104c  ruby-qpid-0.4.728142.tar.gz
+4a8ef6ba2a2c4b50d100c950ce236e68  ruby-qpid-0.4.734452.tar.gz



From mcepl at fedoraproject.org  Thu Jan 15 16:31:42 2009
From: mcepl at fedoraproject.org (Matej Cepl)
Date: Thu, 15 Jan 2009 16:31:42 +0000 (UTC)
Subject: rpms/jbrout/devel jbrout-install.sh, NONE, 1.1 .cvsignore, 1.2,
	1.3 jbrout-Makefile, 1.1, 1.2 jbrout-usr_bin, 1.1,
	1.2 jbrout.desktop, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20090115163142.5AE597012D@cvs1.fedora.phx.redhat.com>

Author: mcepl

Update of /cvs/extras/rpms/jbrout/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4606

Modified Files:
	.cvsignore jbrout-Makefile jbrout-usr_bin jbrout.desktop 
	sources 
Added Files:
	jbrout-install.sh 
Log Message:
New upstream release -- substantial change


--- NEW FILE jbrout-install.sh ---
#!/bin/sh
set -x
DESTDIR=$1

install -m a+rx,u+w -d $DESTDIR/usr/share/jbrout/
cp -r plugins libs jbrout data $DESTDIR/usr/share/jbrout/
find po |while read NAME ; do \
	if [ -d $NAME ] ; then \
		install -m a+rx,u+w -d $DESTDIR/usr/share/locale/$NAME ;\
	elif [ $NAME == *.mo ] ; then \
		install -p -m a+r,u+w $NAME "$DESTDIR/usr/share/jbrout/locale/$NAME" ;\
	fi ;\
done
chmod -R a+rX,u+w plugins $DESTDIR/usr/share/
install -p -m a+r,u+w -t $DESTDIR/usr/share/jbrout/ *.py
install -p -m a+r,u+w -t $DESTDIR/usr/share/jbrout/ data/gpl.txt
install -p -m a+r,u+w -t $DESTDIR/usr/share/jbrout/ data/jbrout.glade
chmod +x $DESTDIR/usr/share/jbrout/jbrout.py



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jbrout/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	27 Jun 2008 18:20:06 -0000	1.2
+++ .cvsignore	15 Jan 2009 16:31:11 -0000	1.3
@@ -1 +1 @@
-jbrout-0.2.201.sources.tar.gz
+jbrout_0.3.159.tar.gz


Index: jbrout-Makefile
===================================================================
RCS file: /cvs/extras/rpms/jbrout/devel/jbrout-Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- jbrout-Makefile	27 Jun 2008 18:20:06 -0000	1.1
+++ jbrout-Makefile	15 Jan 2009 16:31:11 -0000	1.2
@@ -3,18 +3,7 @@
 all: build
 
 install:
-	install -m a+rx,u+w -d $(DESTDIR)/usr/share/jbrout/
-	cp -r plugins gfx libs $(DESTDIR)/usr/share/jbrout/
-	find po \
-		-type d -exec install -m a+rx,u+w \
-			-d $(DESTDIR)/usr/share/locale/{} \; \
-		-o -name \*.mo -exec \
-			install -p -m a+r,u+w {} $(DESTDIR)/usr/share/jbrout/po/{} \;
-	chmod -R a+rX,u+w plugins $(DESTDIR)/usr/share/
-	install -p -m a+r,u+w -t $(DESTDIR)/usr/share/jbrout/ *.py
-	install -p -m a+r,u+w -t $(DESTDIR)/usr/share/jbrout/ gpl.txt
-	install -p -m a+r,u+w -t $(DESTDIR)/usr/share/jbrout/ jbrout.glade
-	chmod +x $(DESTDIR)/usr/share/jbrout/jbrout.py
+	./install-script $(DESTDIR)
 
 build:
-	/bin/true
+	find po -name \*.po -exec msgfmt -vc '{}' \;


Index: jbrout-usr_bin
===================================================================
RCS file: /cvs/extras/rpms/jbrout/devel/jbrout-usr_bin,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- jbrout-usr_bin	27 Jun 2008 18:20:06 -0000	1.1
+++ jbrout-usr_bin	15 Jan 2009 16:31:11 -0000	1.2
@@ -7,4 +7,5 @@
     exit 1
 fi
 
+cd $(dirname $APPPATH)
 "$PYTHON" "$APPPATH" "$@"


Index: jbrout.desktop
===================================================================
RCS file: /cvs/extras/rpms/jbrout/devel/jbrout.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- jbrout.desktop	27 Jun 2008 18:20:06 -0000	1.1
+++ jbrout.desktop	15 Jan 2009 16:31:11 -0000	1.2
@@ -5,7 +5,7 @@
 GenericName[cs]=Spr??vce fotografick?? sb??rky
 Type=Application
 Exec=/usr/bin/jbrout
-Icon=/usr/share/jbrout/gfx/jbrout.ico
+Icon=/usr/share/jbrout/data/gfx/jbrout.png
 Terminal=false
 StartupNotify=true
 Categories=GNOME;GTK;Graphics;Viewer;RasterGraphics;Photography;


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jbrout/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	27 Jun 2008 18:20:06 -0000	1.2
+++ sources	15 Jan 2009 16:31:11 -0000	1.3
@@ -1 +1 @@
-202e2a11517f33d4459e8ef95ee6c559  jbrout-0.2.201.sources.tar.gz
+b78c1be437b91adfa70a59c16a094d30  jbrout_0.3.159.tar.gz



From nsantos at fedoraproject.org  Thu Jan 15 16:35:43 2009
From: nsantos at fedoraproject.org (Nuno Santos)
Date: Thu, 15 Jan 2009 16:35:43 +0000 (UTC)
Subject: rpms/qpidc/devel .cvsignore, 1.14, 1.15 qpidc.spec, 1.61,
	1.62 sources, 1.31, 1.32
Message-ID: <20090115163543.F0DE17012D@cvs1.fedora.phx.redhat.com>

Author: nsantos

Update of /cvs/extras/rpms/qpidc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5762

Modified Files:
	.cvsignore qpidc.spec sources 
Log Message:
Rebased to svn rev 734452


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/qpidc/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	23 Dec 2008 18:02:44 -0000	1.14
+++ .cvsignore	15 Jan 2009 16:35:13 -0000	1.15
@@ -1 +1 @@
-qpidc-0.4.728142.tar.gz
+qpidc-0.4.734452.tar.gz


Index: qpidc.spec
===================================================================
RCS file: /cvs/extras/rpms/qpidc/devel/qpidc.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- qpidc.spec	13 Jan 2009 15:49:12 -0000	1.61
+++ qpidc.spec	15 Jan 2009 16:35:13 -0000	1.62
@@ -6,7 +6,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           qpidc
-Version:        0.4.728142
+Version:        0.4.734452
 Release:        1%{?dist}
 Summary:        Libraries for Qpid C++ client applications
 Group:          System Environment/Libraries
@@ -222,7 +222,7 @@
 rm -f %{buildroot}%_libdir/qpid/client/*.la
 rm -f %{buildroot}%_libdir/qpid/daemon/*.la
 # remove examples, are being packages separately in the rhm-docs package
-rm -fr %{buildroot}/usr/share/qpidc/examples
+#rm -fr %{buildroot}/usr/share/qpidc/examples
 
 %clean
 rm -rf %{buildroot}
@@ -247,6 +247,7 @@
 %_includedir/qpid/*.h
 %_includedir/qpid/amqp_0_10
 %_includedir/qpid/client
+%_includedir/qpid/console
 %_includedir/qpid/framing
 %_includedir/qpid/sys
 %_includedir/qpid/log
@@ -255,6 +256,7 @@
 %_includedir/qmf
 %_libdir/libqpidcommon.so
 %_libdir/libqpidclient.so
+%_datadir/qpidc/examples
 %doc docs/api/html
 
 %files -n qpidd
@@ -368,6 +370,9 @@
 %postun -n qmf -p /sbin/ldconfig
 
 %changelog
+* Thu Jan 15 2009 Nuno Santos <nsantos at redhat.com> - 0.4.734452-1
+- Rebased to svn rev 734452
+
 * Tue Dec 23 2008 Nuno Santos <nsantos at redhat.com> - 0.4.728142-1
 - Rebased to svn rev 728142
 - Re-enable cluster, now using corosync


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/qpidc/devel/sources,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- sources	9 Jan 2009 21:56:45 -0000	1.31
+++ sources	15 Jan 2009 16:35:13 -0000	1.32
@@ -1 +1 @@
-7b2d0d857b1bfbfbb7afaf8a926c271c  qpidc-0.4.728142.tar.gz
+2b11da88553b325b1c6cfdb3031f077c  qpidc-0.4.734452.tar.gz



From mcepl at fedoraproject.org  Thu Jan 15 16:35:56 2009
From: mcepl at fedoraproject.org (Matej Cepl)
Date: Thu, 15 Jan 2009 16:35:56 +0000 (UTC)
Subject: rpms/jbrout/devel jbrout.spec,1.2,1.3
Message-ID: <20090115163556.4AA267012D@cvs1.fedora.phx.redhat.com>

Author: mcepl

Update of /cvs/extras/rpms/jbrout/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5915

Modified Files:
	jbrout.spec 
Log Message:
Real new spec file


Index: jbrout.spec
===================================================================
RCS file: /cvs/extras/rpms/jbrout/devel/jbrout.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- jbrout.spec	1 Dec 2008 15:00:33 -0000	1.2
+++ jbrout.spec	15 Jan 2009 16:35:25 -0000	1.3
@@ -1,18 +1,20 @@
 Name:           jbrout
-Version:        0.2.201
-Release:        3%{?dist}
+Version:        0.3.159
+Release:        1%{?dist}
 Summary:        Photo manager, written in python/pygtk
 Group:          Applications/Multimedia
 License:        GPLv2
 URL:            http://jbrout.python-hosting.com/wiki
-Source0:        http://jbrout.free.fr/download/sources/jbrout-%{version}.sources.tar.gz
+Source0:        http://jbrout.free.fr/download/sources/jbrout_%{version}.tar.gz
+#Source0:        jbrout.tar.bz2
 Source1:        jbrout-Makefile
 Source2:        jbrout.desktop
 Source3:        jbrout-usr_bin
+Source4:        jbrout-install.sh
 BuildArch:      noarch
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
-Requires:       python >= 2.4, python-lxml, pygtk2 >= 2.6, python-imaging, fbida, jhead
-BuildRequires:  gettext, desktop-file-utils, 
+Requires:       python >= 2.4, python-lxml, pygtk2 >= 2.6, python-imaging, pyexiv2 >= 0.1.2
+BuildRequires:  gettext, desktop-file-utils,
 
 %description
 jBrout is able to :
@@ -36,8 +38,10 @@
 
 %prep
 %setup -q -n jbrout
+
+cd jbrout/
 TEMPFILE=$(mktemp %{_tmppath}/jbrout-build.XXXXXX)
-find libs plugins -type f \
+find libs plugins jbrout data -type f -a ! -name \*.png \
    | while read FILE ; do \
       cat $FILE | tr -d '\r' >$TEMPFILE
       mv $TEMPFILE $FILE
@@ -47,21 +51,24 @@
       chmod -x $FILE
    done
 unset TEMPFILE
-sed -i -e '1d' trackertag.py
-chmod -x SciTE.properties
+#sed -i -e '1d' trackertag.py
+#chmod -x SciTE.properties
 install -p %{SOURCE1} Makefile
-install -p %{SOURCE2} .
+install -p -m a+rx,u+w %{SOURCE4} install-script
 
 %build
+cd jbrout
+make DESTDIR=$RPM_BUILD_ROOT
 
 %install
 rm -rf $RPM_BUILD_ROOT
+cd jbrout
 make DESTDIR=$RPM_BUILD_ROOT install
 install -m a+rx,u+w -d $RPM_BUILD_ROOT%{_bindir}
 install -m a+rx,u+w %{SOURCE3} $RPM_BUILD_ROOT%{_bindir}/jbrout
 install -m a+rx,u+w -d $RPM_BUILD_ROOT%{_datadir}/applications/
 install -p -m a+rx,u+w -t $RPM_BUILD_ROOT%{_datadir}/applications/ \
-      jbrout.desktop
+      %{SOURCE2}
 desktop-file-install \
      --dir $RPM_BUILD_ROOT%{_datadir}/applications \
      --add-category=X-Fedora \
@@ -74,7 +81,7 @@
 %files
 %defattr(-,root,root,-)
 %{_bindir}/jbrout
-%doc readme.txt SciTE.properties
+%doc
 %{_datadir}/jbrout/
 %exclude %{_datadir}/jbrout/plugins/*/po/*/LC_MESSAGES/plugin.mo
 %lang(fr) %{_datadir}/jbrout/plugins/*/po/fr/LC_MESSAGES/plugin.mo
@@ -82,8 +89,15 @@
 %{_datadir}/applications/jbrout.desktop
 
 %changelog
-* Mon Dec 01 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 0.2.201-3
-- Rebuild for Python 2.6
+* Thu Jan 15 2009 Mat??j Cepl <mcepl at redhat.com> 0.3.159-1
+- New upstream release and this should go to Fedora.
+
+* Sun Jan 11 2009 Mat??j Cepl <mcepl at redhat.com> 0.3.151-0.5
+- Fixed building and installing lang files.
+
+* Thu Jan 01 2009 Mat??j Cepl <mcepl at redhat.com> 0.3.131-0.1.f10only
+- Testing build of the new upstream release (because of broken upgrade
+  build).
 
 * Thu Jun 26 2008 Mat??j Cepl <mcepl at redhat.com> 0.2.201-2
 - Fixing packaging bugs mentioned in the package review.



From gemi at fedoraproject.org  Thu Jan 15 16:40:38 2009
From: gemi at fedoraproject.org (=?utf-8?q?G=C3=A9rard_Milmeister?=)
Date: Thu, 15 Jan 2009 16:40:38 +0000 (UTC)
Subject: rpms/curry/devel curry.spec,1.9,1.10
Message-ID: <20090115164038.725D47012D@cvs1.fedora.phx.redhat.com>

Author: gemi

Update of /cvs/pkgs/rpms/curry/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6733

Modified Files:
	curry.spec 
Log Message:
added alpha to excludearch


Index: curry.spec
===================================================================
RCS file: /cvs/pkgs/rpms/curry/devel/curry.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- curry.spec	19 Feb 2008 03:29:04 -0000	1.9
+++ curry.spec	15 Jan 2009 16:40:07 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           curry
 Version:        0.9.11
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        M??nster Curry compiler
 
 Group:          Development/Languages
@@ -11,7 +11,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  ghc >= 6.4
 Requires:	gcc
-ExcludeArch:    ppc64
+ExcludeArch:    ppc64 alpha
 
 %description
 The M??nster Curry compiler is a native code compiler for the
@@ -47,6 +47,9 @@
 
 
 %changelog
+* Thu Jan 15 2009 Gerard Milmeister <gemi at bluewin.ch> - 0.9.11-5
+- added alpha to excludearch
+
 * Mon Feb 18 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.9.11-4
 - Autorebuild for GCC 4.3
 



From mcepl at fedoraproject.org  Thu Jan 15 16:46:22 2009
From: mcepl at fedoraproject.org (Matej Cepl)
Date: Thu, 15 Jan 2009 16:46:22 +0000 (UTC)
Subject: rpms/jbrout/F-10 jbrout-install.sh, NONE, 1.1 .cvsignore, 1.2,
	1.3 jbrout-Makefile, 1.1, 1.2 jbrout-usr_bin, 1.1,
	1.2 jbrout.desktop, 1.1, 1.2 jbrout.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20090115164622.AAC797012D@cvs1.fedora.phx.redhat.com>

Author: mcepl

Update of /cvs/extras/rpms/jbrout/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7503

Modified Files:
	.cvsignore jbrout-Makefile jbrout-usr_bin jbrout.desktop 
	jbrout.spec sources 
Added Files:
	jbrout-install.sh 
Log Message:
New upstream release -- substantial change


--- NEW FILE jbrout-install.sh ---
#!/bin/sh
set -x
DESTDIR=$1

install -m a+rx,u+w -d $DESTDIR/usr/share/jbrout/
cp -r plugins libs jbrout data $DESTDIR/usr/share/jbrout/
find po |while read NAME ; do \
	if [ -d $NAME ] ; then \
		install -m a+rx,u+w -d $DESTDIR/usr/share/locale/$NAME ;\
	elif [ $NAME == *.mo ] ; then \
		install -p -m a+r,u+w $NAME "$DESTDIR/usr/share/jbrout/locale/$NAME" ;\
	fi ;\
done
chmod -R a+rX,u+w plugins $DESTDIR/usr/share/
install -p -m a+r,u+w -t $DESTDIR/usr/share/jbrout/ *.py
install -p -m a+r,u+w -t $DESTDIR/usr/share/jbrout/ data/gpl.txt
install -p -m a+r,u+w -t $DESTDIR/usr/share/jbrout/ data/jbrout.glade
chmod +x $DESTDIR/usr/share/jbrout/jbrout.py



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jbrout/F-10/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	27 Jun 2008 18:20:06 -0000	1.2
+++ .cvsignore	15 Jan 2009 16:45:52 -0000	1.3
@@ -1 +1 @@
-jbrout-0.2.201.sources.tar.gz
+jbrout_0.3.159.tar.gz


Index: jbrout-Makefile
===================================================================
RCS file: /cvs/extras/rpms/jbrout/F-10/jbrout-Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- jbrout-Makefile	27 Jun 2008 18:20:06 -0000	1.1
+++ jbrout-Makefile	15 Jan 2009 16:45:52 -0000	1.2
@@ -3,18 +3,7 @@
 all: build
 
 install:
-	install -m a+rx,u+w -d $(DESTDIR)/usr/share/jbrout/
-	cp -r plugins gfx libs $(DESTDIR)/usr/share/jbrout/
-	find po \
-		-type d -exec install -m a+rx,u+w \
-			-d $(DESTDIR)/usr/share/locale/{} \; \
-		-o -name \*.mo -exec \
-			install -p -m a+r,u+w {} $(DESTDIR)/usr/share/jbrout/po/{} \;
-	chmod -R a+rX,u+w plugins $(DESTDIR)/usr/share/
-	install -p -m a+r,u+w -t $(DESTDIR)/usr/share/jbrout/ *.py
-	install -p -m a+r,u+w -t $(DESTDIR)/usr/share/jbrout/ gpl.txt
-	install -p -m a+r,u+w -t $(DESTDIR)/usr/share/jbrout/ jbrout.glade
-	chmod +x $(DESTDIR)/usr/share/jbrout/jbrout.py
+	./install-script $(DESTDIR)
 
 build:
-	/bin/true
+	find po -name \*.po -exec msgfmt -vc '{}' \;


Index: jbrout-usr_bin
===================================================================
RCS file: /cvs/extras/rpms/jbrout/F-10/jbrout-usr_bin,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- jbrout-usr_bin	27 Jun 2008 18:20:06 -0000	1.1
+++ jbrout-usr_bin	15 Jan 2009 16:45:52 -0000	1.2
@@ -7,4 +7,5 @@
     exit 1
 fi
 
+cd $(dirname $APPPATH)
 "$PYTHON" "$APPPATH" "$@"


Index: jbrout.desktop
===================================================================
RCS file: /cvs/extras/rpms/jbrout/F-10/jbrout.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- jbrout.desktop	27 Jun 2008 18:20:06 -0000	1.1
+++ jbrout.desktop	15 Jan 2009 16:45:52 -0000	1.2
@@ -5,7 +5,7 @@
 GenericName[cs]=Spr??vce fotografick?? sb??rky
 Type=Application
 Exec=/usr/bin/jbrout
-Icon=/usr/share/jbrout/gfx/jbrout.ico
+Icon=/usr/share/jbrout/data/gfx/jbrout.png
 Terminal=false
 StartupNotify=true
 Categories=GNOME;GTK;Graphics;Viewer;RasterGraphics;Photography;


Index: jbrout.spec
===================================================================
RCS file: /cvs/extras/rpms/jbrout/F-10/jbrout.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- jbrout.spec	27 Jun 2008 18:20:06 -0000	1.1
+++ jbrout.spec	15 Jan 2009 16:45:52 -0000	1.2
@@ -1,18 +1,20 @@
 Name:           jbrout
-Version:        0.2.201
-Release:        2%{?dist}
+Version:        0.3.159
+Release:        1%{?dist}
 Summary:        Photo manager, written in python/pygtk
 Group:          Applications/Multimedia
 License:        GPLv2
 URL:            http://jbrout.python-hosting.com/wiki
-Source0:        http://jbrout.free.fr/download/sources/jbrout-%{version}.sources.tar.gz
+Source0:        http://jbrout.free.fr/download/sources/jbrout_%{version}.tar.gz
+#Source0:        jbrout.tar.bz2
 Source1:        jbrout-Makefile
 Source2:        jbrout.desktop
 Source3:        jbrout-usr_bin
+Source4:        jbrout-install.sh
 BuildArch:      noarch
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
-Requires:       python >= 2.4, python-lxml, pygtk2 >= 2.6, python-imaging, fbida, jhead
-BuildRequires:  gettext, desktop-file-utils, 
+Requires:       python >= 2.4, python-lxml, pygtk2 >= 2.6, python-imaging, pyexiv2 >= 0.1.2
+BuildRequires:  gettext, desktop-file-utils,
 
 %description
 jBrout is able to :
@@ -36,8 +38,10 @@
 
 %prep
 %setup -q -n jbrout
+
+cd jbrout/
 TEMPFILE=$(mktemp %{_tmppath}/jbrout-build.XXXXXX)
-find libs plugins -type f \
+find libs plugins jbrout data -type f -a ! -name \*.png \
    | while read FILE ; do \
       cat $FILE | tr -d '\r' >$TEMPFILE
       mv $TEMPFILE $FILE
@@ -47,21 +51,24 @@
       chmod -x $FILE
    done
 unset TEMPFILE
-sed -i -e '1d' trackertag.py
-chmod -x SciTE.properties
+#sed -i -e '1d' trackertag.py
+#chmod -x SciTE.properties
 install -p %{SOURCE1} Makefile
-install -p %{SOURCE2} .
+install -p -m a+rx,u+w %{SOURCE4} install-script
 
 %build
+cd jbrout
+make DESTDIR=$RPM_BUILD_ROOT
 
 %install
 rm -rf $RPM_BUILD_ROOT
+cd jbrout
 make DESTDIR=$RPM_BUILD_ROOT install
 install -m a+rx,u+w -d $RPM_BUILD_ROOT%{_bindir}
 install -m a+rx,u+w %{SOURCE3} $RPM_BUILD_ROOT%{_bindir}/jbrout
 install -m a+rx,u+w -d $RPM_BUILD_ROOT%{_datadir}/applications/
 install -p -m a+rx,u+w -t $RPM_BUILD_ROOT%{_datadir}/applications/ \
-      jbrout.desktop
+      %{SOURCE2}
 desktop-file-install \
      --dir $RPM_BUILD_ROOT%{_datadir}/applications \
      --add-category=X-Fedora \
@@ -74,7 +81,7 @@
 %files
 %defattr(-,root,root,-)
 %{_bindir}/jbrout
-%doc readme.txt SciTE.properties
+%doc
 %{_datadir}/jbrout/
 %exclude %{_datadir}/jbrout/plugins/*/po/*/LC_MESSAGES/plugin.mo
 %lang(fr) %{_datadir}/jbrout/plugins/*/po/fr/LC_MESSAGES/plugin.mo
@@ -82,6 +89,16 @@
 %{_datadir}/applications/jbrout.desktop
 
 %changelog
+* Thu Jan 15 2009 Mat??j Cepl <mcepl at redhat.com> 0.3.159-1
+- New upstream release and this should go to Fedora.
+
+* Sun Jan 11 2009 Mat??j Cepl <mcepl at redhat.com> 0.3.151-0.5
+- Fixed building and installing lang files.
+
+* Thu Jan 01 2009 Mat??j Cepl <mcepl at redhat.com> 0.3.131-0.1.f10only
+- Testing build of the new upstream release (because of broken upgrade
+  build).
+
 * Thu Jun 26 2008 Mat??j Cepl <mcepl at redhat.com> 0.2.201-2
 - Fixing packaging bugs mentioned in the package review.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jbrout/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	27 Jun 2008 18:20:06 -0000	1.2
+++ sources	15 Jan 2009 16:45:52 -0000	1.3
@@ -1 +1 @@
-202e2a11517f33d4459e8ef95ee6c559  jbrout-0.2.201.sources.tar.gz
+b78c1be437b91adfa70a59c16a094d30  jbrout_0.3.159.tar.gz



From spot at fedoraproject.org  Thu Jan 15 17:18:49 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Thu, 15 Jan 2009 17:18:49 +0000 (UTC)
Subject: rpms/physfs/devel physfs.spec,1.7,1.8
Message-ID: <20090115171849.30C567012D@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/extras/rpms/physfs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11791

Modified Files:
	physfs.spec 
Log Message:
drop tex docs, static lib


Index: physfs.spec
===================================================================
RCS file: /cvs/extras/rpms/physfs/devel/physfs.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- physfs.spec	20 Feb 2008 01:45:29 -0000	1.7
+++ physfs.spec	15 Jan 2009 17:18:18 -0000	1.8
@@ -1,6 +1,6 @@
 Name:		physfs
 Version:	1.0.1
-Release:	8%{?dist}
+Release:	9%{?dist}
 License:	zlib
 Group:		System Environment/Libraries
 Summary:	Library to provide abstract access to various archives
@@ -63,6 +63,9 @@
 touch -r LICENSE docs/html/*
 touch -r LICENSE docs/latex/*
 
+# Get rid of static library.
+rm -rf $RPM_BUILD_ROOT%{_libdir}/*.a
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -78,13 +81,16 @@
 
 %files devel
 %defattr(-,root,root,-)
-%doc docs/html/ docs/latex/
+%doc docs/html/
 %{_includedir}/physfs.h
-%{_libdir}/*.a
 %{_libdir}/*.so
 %{_mandir}/man3/*
 
 %changelog
+* Thu Jan 15 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 1.0.1-9
+- do not package the tex docs, the html docs are fine
+- drop static lib to see if anyone misses it
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1.0.1-8
 - Autorebuild for GCC 4.3
 



From markmc at fedoraproject.org  Thu Jan 15 17:25:15 2009
From: markmc at fedoraproject.org (Mark McLoughlin)
Date: Thu, 15 Jan 2009 17:25:15 +0000 (UTC)
Subject: rpms/kvm/devel kvm.spec,1.81,1.82 sources,1.41,1.42
Message-ID: <20090115172515.35DF57012D@cvs1.fedora.phx.redhat.com>

Author: markmc

Update of /cvs/pkgs/rpms/kvm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12598

Modified Files:
	kvm.spec sources 
Log Message:
* Thu Jan 15 2009 Mark McLoughlin <markmc at redhat.com> - 83-1
- Update to kvm-83
- Change how we delete pre-built blobs now that qemu/pc-bios has
  patch queue dirs; add a check to make sure we've zapped them all



Index: kvm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kvm/devel/kvm.spec,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- kvm.spec	6 Jan 2009 16:58:22 -0000	1.81
+++ kvm.spec	15 Jan 2009 17:24:44 -0000	1.82
@@ -1,7 +1,7 @@
 Summary: Kernel-based Virtual Machine
 Name: kvm
-Version: 81
-Release: 2%{?dist}
+Version: 83
+Release: 1%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: Development/Tools
 URL: http://%{name}.sf.net
@@ -16,6 +16,8 @@
 BuildRequires: dev86
 BuildRequires: iasl
 BuildRequires: zlib-devel
+# to check for binary blobs
+BuildRequires: file
 # TLS / x509 auth in VNC server
 BuildRequires: gnutls-devel
 # for the docs
@@ -39,11 +41,17 @@
 
 %prep
 %setup -q
+
 %patch0 -p1
+
+# "configure --kerneldir" looks for this
+echo "%{name}-%{version}" > $(pwd)/kernel/.kernelrelease
+
 # 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/*
-echo "%{name}-%{version}" > $(pwd)/kernel/.kernelrelease
+rm -f qemu/pc-bios/*.{bin,x,dtb} qemu/pc-bios/openbios-*
+find qemu/pc-bios -exec file {} \; | grep '\(data\|BIOS\|executable\)' && \
+    echo "Found some binary blobs in qemu/pc-bios!" && exit 1
 
 %build
 # systems like rhel build system does not have a recent enough linker so 
@@ -164,6 +172,11 @@
 
 
 %changelog
+* Thu Jan 15 2009 Mark McLoughlin <markmc at redhat.com> - 83-1
+- Update to kvm-83
+- Change how we delete pre-built blobs now that qemu/pc-bios has
+  patch queue dirs; add a check to make sure we've zapped them all
+
 * Tue Jan  6 2009 Daniel P. Berrange <berrange at redhat.com> - 81-2
 - Explicitly install newly built BIOS blobs (rhbz #478855)
 - List all files explicitly so they don't silently go missing


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kvm/devel/sources,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- sources	22 Dec 2008 16:55:46 -0000	1.41
+++ sources	15 Jan 2009 17:24:44 -0000	1.42
@@ -1 +1 @@
-499f1856d30aa72ef872becaea684f49  kvm-81.tar.gz
+dfb3cc36029d84e83c5006c600337754  kvm-83.tar.gz



From markmc at fedoraproject.org  Thu Jan 15 17:31:12 2009
From: markmc at fedoraproject.org (Mark McLoughlin)
Date: Thu, 15 Jan 2009 17:31:12 +0000 (UTC)
Subject: rpms/kvm/devel .cvsignore,1.41,1.42
Message-ID: <20090115173112.E8D767012D@cvs1.fedora.phx.redhat.com>

Author: markmc

Update of /cvs/pkgs/rpms/kvm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13365

Modified Files:
	.cvsignore 
Log Message:
update .cvsignore



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kvm/devel/.cvsignore,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- .cvsignore	22 Dec 2008 16:55:46 -0000	1.41
+++ .cvsignore	15 Jan 2009 17:30:42 -0000	1.42
@@ -1 +1 @@
-kvm-81.tar.gz
+kvm-83.tar.gz



From rvinyard at fedoraproject.org  Thu Jan 15 17:58:15 2009
From: rvinyard at fedoraproject.org (Rick L. Vinyard, Jr.)
Date: Thu, 15 Jan 2009 17:58:15 +0000 (UTC)
Subject: rpms/papyrus/devel .cvsignore, 1.11, 1.12 papyrus.spec, 1.17,
	1.18 sources, 1.11, 1.12
Message-ID: <20090115175815.085B37012D@cvs1.fedora.phx.redhat.com>

Author: rvinyard

Update of /cvs/pkgs/rpms/papyrus/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17475

Modified Files:
	.cvsignore papyrus.spec sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/papyrus/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	14 Jan 2009 17:02:21 -0000	1.11
+++ .cvsignore	15 Jan 2009 17:57:44 -0000	1.12
@@ -1 +1 @@
-papyrus-0.8.0.tar.bz2
+papyrus-0.8.1.tar.bz2


Index: papyrus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/papyrus/devel/papyrus.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- papyrus.spec	14 Jan 2009 17:02:21 -0000	1.17
+++ papyrus.spec	15 Jan 2009 17:57:44 -0000	1.18
@@ -1,11 +1,11 @@
 Summary:          Cairo based C++ scenegraph library
 Name:             papyrus
-Version:          0.8.0
+Version:          0.8.1
 Release:          1%{?dist}
 License:          GPLv3
 URL:              http://libpapyrus.sourceforge.net/
 Group:            System Environment/Libraries
-Source:           http://download.sourceforge.net/libpapyrus/papyrus-0.8.0.tar.bz2
+Source:           http://download.sourceforge.net/libpapyrus/papyrus-0.8.1.tar.bz2
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:    gtkmm24-devel >= 2.10
 BuildRequires:    cairomm-devel >= 1.2
@@ -111,7 +111,7 @@
 %{_includedir}/papyrus-0.8/papyrus.h
 %{_includedir}/papyrus-0.8/papyrus/
 %{_bindir}/papyrus-demo
-%{_datadir}/papyrus-0.8.0/
+%{_datadir}/papyrus-0.8.1/
 %doc ChangeLog
 #%doc doc/reference/papyrus/html
 
@@ -141,11 +141,14 @@
 %{_includedir}/papyrus-0.8/papyrus-gtkmm.h
 %{_includedir}/papyrus-0.8/papyrus-gtkmm/
 %{_bindir}/papyrus-gtkmm-demo
-%{_datadir}/papyrus-gtkmm-0.8.0/
+%{_datadir}/papyrus-gtkmm-0.8.1/
 %doc %{_datadir}/gtk-doc/html/papyrus-gtkmm/
 
 
 %changelog
+* Thu Jan 15 2009 Rick L Vinyard Jr <rvinyard at cs.nmsu.edu> - 0.8.1-1
+- New release fixes pkgconfig files
+
 * Tue Jan 13 2009 Rick L Vinyard Jr <rvinyard at cs.nmsu.edu> - 0.8.0-1
 - New release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/papyrus/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	14 Jan 2009 17:02:21 -0000	1.11
+++ sources	15 Jan 2009 17:57:44 -0000	1.12
@@ -1 +1 @@
-ebaf2cb1240ba692b819d391b2baf3cc  papyrus-0.8.0.tar.bz2
+60fb24cbd6387d6b1f9b33bc6ce969a4  papyrus-0.8.1.tar.bz2



From rvinyard at fedoraproject.org  Thu Jan 15 17:58:21 2009
From: rvinyard at fedoraproject.org (Rick L. Vinyard, Jr.)
Date: Thu, 15 Jan 2009 17:58:21 +0000 (UTC)
Subject: rpms/papyrus/F-10 .cvsignore, 1.11, 1.12 papyrus.spec, 1.20,
	1.21 sources, 1.11, 1.12
Message-ID: <20090115175821.6F6247012D@cvs1.fedora.phx.redhat.com>

Author: rvinyard

Update of /cvs/pkgs/rpms/papyrus/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17515

Modified Files:
	.cvsignore papyrus.spec sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/papyrus/F-10/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	14 Jan 2009 17:02:19 -0000	1.11
+++ .cvsignore	15 Jan 2009 17:57:51 -0000	1.12
@@ -1 +1 @@
-papyrus-0.8.0.tar.bz2
+papyrus-0.8.1.tar.bz2


Index: papyrus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/papyrus/F-10/papyrus.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- papyrus.spec	14 Jan 2009 17:02:19 -0000	1.20
+++ papyrus.spec	15 Jan 2009 17:57:51 -0000	1.21
@@ -1,11 +1,11 @@
 Summary:          Cairo based C++ scenegraph library
 Name:             papyrus
-Version:          0.8.0
+Version:          0.8.1
 Release:          1%{?dist}
 License:          GPLv3
 URL:              http://libpapyrus.sourceforge.net/
 Group:            System Environment/Libraries
-Source:           http://download.sourceforge.net/libpapyrus/papyrus-0.8.0.tar.bz2
+Source:           http://download.sourceforge.net/libpapyrus/papyrus-0.8.1.tar.bz2
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:    gtkmm24-devel >= 2.10
 BuildRequires:    cairomm-devel >= 1.2
@@ -111,7 +111,7 @@
 %{_includedir}/papyrus-0.8/papyrus.h
 %{_includedir}/papyrus-0.8/papyrus/
 %{_bindir}/papyrus-demo
-%{_datadir}/papyrus-0.8.0/
+%{_datadir}/papyrus-0.8.1/
 %doc ChangeLog
 #%doc doc/reference/papyrus/html
 
@@ -141,11 +141,14 @@
 %{_includedir}/papyrus-0.8/papyrus-gtkmm.h
 %{_includedir}/papyrus-0.8/papyrus-gtkmm/
 %{_bindir}/papyrus-gtkmm-demo
-%{_datadir}/papyrus-gtkmm-0.8.0/
+%{_datadir}/papyrus-gtkmm-0.8.1/
 %doc %{_datadir}/gtk-doc/html/papyrus-gtkmm/
 
 
 %changelog
+* Thu Jan 15 2009 Rick L Vinyard Jr <rvinyard at cs.nmsu.edu> - 0.8.1-1
+- New release fixes pkgconfig files
+
 * Tue Jan 13 2009 Rick L Vinyard Jr <rvinyard at cs.nmsu.edu> - 0.8.0-1
 - New release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/papyrus/F-10/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	14 Jan 2009 17:02:19 -0000	1.11
+++ sources	15 Jan 2009 17:57:51 -0000	1.12
@@ -1 +1 @@
-ebaf2cb1240ba692b819d391b2baf3cc  papyrus-0.8.0.tar.bz2
+60fb24cbd6387d6b1f9b33bc6ce969a4  papyrus-0.8.1.tar.bz2



From nsantos at fedoraproject.org  Thu Jan 15 18:15:10 2009
From: nsantos at fedoraproject.org (Nuno Santos)
Date: Thu, 15 Jan 2009 18:15:10 +0000 (UTC)
Subject: rpms/qpidc/devel sources,1.32,1.33
Message-ID: <20090115181510.673F67012D@cvs1.fedora.phx.redhat.com>

Author: nsantos

Update of /cvs/extras/rpms/qpidc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20066

Modified Files:
	sources 
Log Message:
regenerated tarball on rawhide


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/qpidc/devel/sources,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- sources	15 Jan 2009 16:35:13 -0000	1.32
+++ sources	15 Jan 2009 18:14:40 -0000	1.33
@@ -1 +1 @@
-2b11da88553b325b1c6cfdb3031f077c  qpidc-0.4.734452.tar.gz
+9c53fd669111b86f895c7be870a3486e  qpidc-0.4.734452.tar.gz



From tmraz at fedoraproject.org  Thu Jan 15 18:23:49 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Thu, 15 Jan 2009 18:23:49 +0000 (UTC)
Subject: rpms/condor/devel condor.spec,1.12,1.13
Message-ID: <20090115182350.079087012D@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/condor/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21098

Modified Files:
	condor.spec 
Log Message:
* Thu Jan 15 2009 Tomas Mraz <tmraz at redhat.com> - 7.2.0-4
- rebuild with new openssl



Index: condor.spec
===================================================================
RCS file: /cvs/pkgs/rpms/condor/devel/condor.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- condor.spec	15 Jan 2009 05:01:05 -0000	1.12
+++ condor.spec	15 Jan 2009 18:23:19 -0000	1.13
@@ -1,7 +1,7 @@
 Summary: Condor: High Throughput Computing
 Name: condor
 Version: 7.2.0
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: ASL 2.0
 Group: Applications/System
 URL: http://www.cs.wisc.edu/condor/
@@ -571,7 +571,10 @@
 
 
 %changelog
-* Mon Jan 14 2009  <matt at redhat> - 7.2.0-3
+* Thu Jan 15 2009 Tomas Mraz <tmraz at redhat.com> - 7.2.0-4
+- rebuild with new openssl
+
+* Wed Jan 14 2009  <matt at redhat> - 7.2.0-3
 - Fixed regression: initscript was on by default, now off again
 
 * Thu Jan  8 2009  <matt at redhat> - 7.2.0-2



From tmraz at fedoraproject.org  Thu Jan 15 18:25:06 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Thu, 15 Jan 2009 18:25:06 +0000 (UTC)
Subject: rpms/cone/devel cone.spec,1.26,1.27
Message-ID: <20090115182506.34F5E7012D@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/cone/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21398

Modified Files:
	cone.spec 
Log Message:
* Thu Jan 15 2009 Tomas Mraz <tmraz at redhat.com> 0.75-2
- rebuild with new openssl



Index: cone.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cone/devel/cone.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- cone.spec	10 Jul 2008 17:53:29 -0000	1.26
+++ cone.spec	15 Jan 2009 18:24:35 -0000	1.27
@@ -3,7 +3,7 @@
 Summary:        CONE mail reader
 Name:           cone
 Version:        0.75
-Release:        1%{?dist}
+Release:        2%{?dist}
 
 URL:            http://www.courier-mta.org/cone/
 Source0:        http://dl.sf.net/courier/%{name}-%{version}.tar.bz2
@@ -104,6 +104,9 @@
 %doc cone/html
 
 %changelog
+* Thu Jan 15 2009 Tomas Mraz <tmraz at redhat.com> 0.75-2
+- rebuild with new openssl
+
 * Thu Jul 10 2008 Steven Pritchard <steve at kspei.com> 0.75-1
 - Update to 0.75.
 



From rvinyard at fedoraproject.org  Thu Jan 15 18:29:05 2009
From: rvinyard at fedoraproject.org (Rick L. Vinyard, Jr.)
Date: Thu, 15 Jan 2009 18:29:05 +0000 (UTC)
Subject: rpms/conexus/devel .cvsignore, 1.9, 1.10 conexus.spec, 1.14,
	1.15 sources, 1.9, 1.10
Message-ID: <20090115182905.B7F8D7012D@cvs1.fedora.phx.redhat.com>

Author: rvinyard

Update of /cvs/pkgs/rpms/conexus/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22005

Modified Files:
	.cvsignore conexus.spec sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/conexus/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	4 Mar 2008 04:52:00 -0000	1.9
+++ .cvsignore	15 Jan 2009 18:28:35 -0000	1.10
@@ -1,2 +1 @@
-conexus-0.5.3.tar.bz2
-conexus.patch
+conexus-0.5.98.tar.bz2


Index: conexus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/conexus/devel/conexus.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- conexus.spec	18 Dec 2008 13:25:47 -0000	1.14
+++ conexus.spec	15 Jan 2009 18:28:35 -0000	1.15
@@ -1,45 +1,142 @@
-Summary:          C++ network and serial communication library
+Summary:          C++ I/O communication library
 Name:             conexus
-Version:          0.5.3
-Release:          6%{?dist}
-License:          LGPLv2
+Version:          0.5.98
+Release:          1%{?dist}
+License:          GPLv3
 URL:              http://conexus.sourceforge.net
 Group:            System Environment/Libraries
-Source:           http://download.sourceforge.net/conexus/conexus-0.5.3.tar.bz2
-Patch0:           conexus.patch
+Source:           http://download.sourceforge.net/conexus/conexus-0.5.98.tar.bz2
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:    glibmm24-devel >= 2.6.0 boost-devel >= 1.32.0 cppunit-devel >= 1.11 popt-devel pkgconfig m4
+BuildRequires:    glibmm24-devel >= 2.6.0
+BuildRequires:    cppunit-devel >= 1.11
+BuildRequires:    libcap-devel
+BuildRequires:    popt-devel
+BuildRequires:    boost-devel
+BuildRequires:    pkgconfig
+BuildRequires:    m4
+BuildRequires:    nspr-devel >= 4.6 nss-devel >= 3.11
+BuildRequires:    hal-devel >= 0.5.2
+BuildRequires:    gtkmm24-devel >= 2.6
+BuildRequires:    papyrus-gtkmm-devel >= 0.8
+BuildRequires:    papyrus-extras-devel >= 0.8
+BuildRequires:    openssl-devel >= 0.9.8
 
 %description
 Conexus is a generalized C++ I/O library that includes support for BSD
-sockets, serial/tty, packet capture (via pcap), et. al. conexus utilizes
+sockets, serial/tty, packet capture, et. al. Conexus utilizes
 sigc++ for object communication.
 
 %package          devel
 Summary:          Headers for developing programs that will use conexus
 Group:            Development/Libraries
 Requires:         conexus = %{version}-%{release}
-Requires:         glibmm24-devel >= 2.6.0 boost-devel >= 1.32.0 pkgconfig
+Requires:         glibmm24-devel >= 2.6.0
+Requires:         pkgconfig
+Requires:         libcap-devel
 
 %description    devel
 This package contains the libraries and header files needed for
 developing conexus applications.
 
+%package          gtkmm
+Summary:          Gtkmm UI widgets for the conexus communication library
+Group:            System Environment/Libraries
+Requires:         conexus = %{version}-%{release}
+Provides:         conexusmm = %{version}
+Obsoletes:        conexusmm < 0.5.1
+
+%description    gtkmm
+This package contains gtkmm widgets associated with the conexus library.
+
+%package          gtkmm-devel
+Summary:          Headers for developing programs that will use conexus-gtkmm
+Group:            Development/Libraries
+Requires:         conexus-gtkmm = %{version}-%{release}
+Requires:         conexus-devel = %{version}-%{release}
+Requires:         hal-devel >= 0.5.2
+Requires:         gtkmm24-devel >= 2.6
+Requires:         papyrus-devel >= 0.7
+Provides:         conexusmm-devel = %{version}
+Obsoletes:        conexusmm-devel < 0.5.1
+
+%description    gtkmm-devel
+This package contains the libraries and header files needed for
+developing conexus-gtkmm applications.
+
+%package          ssl
+Summary:          OpenSSL endpoints for the conexus communication library
+Group:            System Environment/Libraries
+Requires:         conexus = %{version}-%{release}
+
+%description    ssl
+This package contains OpenSSL based endpoints for the conexus library.
+
+%package          ssl-devel
+Summary:          Headers for developing programs that will use conexus-ssl
+Group:            Development/Libraries
+Requires:         conexus-ssl = %{version}-%{release}
+Requires:         conexus-devel = %{version}-%{release}
+Requires:         openssl-devel >= 0.9.8
+
+%description    ssl-devel
+This package contains the libraries and header files needed for
+developing conexus-ssl applications.
+
+%package          nspr
+Summary:          NSPR endpoints for the conexus communication library
+Group:            System Environment/Libraries
+Requires:         conexus = %{version}-%{release}
+
+%description    nspr
+This package contains NSPR based endpoints for the conexus library.
+
+%package          nspr-devel
+Summary:          Headers for developing programs that will use conexus-nspr
+Group:            Development/Libraries
+Requires:         conexus-nspr = %{version}-%{release}
+Requires:         conexus-devel = %{version}-%{release}
+Requires:         nspr-devel >= 4.6
+
+%description    nspr-devel
+This package contains the libraries and header files needed for
+developing conexus-nspr applications.
+
+%package          nss
+Summary:          NSS endpoints for the conexus communication library
+Group:            System Environment/Libraries
+Requires:         conexus = %{version}-%{release}
+
+%description    nss
+This package contains NSS based endpoints for the conexus library.
+
+%package          nss-devel
+Summary:          Headers for developing programs that will use conexus-nss
+Group:            Development/Libraries
+Requires:         conexus-nss = %{version}-%{release}
+Requires:         conexus-nspr-devel = %{version}-%{release}
+Requires:         nss-devel >= 3.11
+
+%description    nss-devel
+This package contains the libraries and header files needed for
+developing conexus-nspr applications.
+
 %prep
 %setup -q
-%patch0 -p1
 
 %build
-%configure --enable-static=no
+%configure --enable-static=no --enable-gtkmm --enable-demos
 %{__make} %{?_smp_mflags}
 
-
 %install
 %{__rm} -rf %{buildroot}
 
 %{__make} DESTDIR=%{buildroot} INSTALL="%{__install} -p" install
 find %{buildroot} -type f -name "*.la" -exec rm -f {} ';'
 
+# Fix documentation installation and put conexus-gtkmm docs under gtk-doc
+%{__mkdir} -p %{buildroot}%{_datadir}/gtk-doc/html/conexus-gtkmm/
+%{__install} --mode=0664 -t %{buildroot}%{_datadir}/gtk-doc/html/conexus-gtkmm/ doc/reference/conexus-gtkmm/html/* 
+
 %clean
 %{__rm} -rf %{buildroot}
 
@@ -47,22 +144,100 @@
 
 %postun -p /sbin/ldconfig
 
+%post gtkmm -p /sbin/ldconfig
+
+%postun gtkmm -p /sbin/ldconfig
+
+%post ssl -p /sbin/ldconfig
+
+%postun ssl -p /sbin/ldconfig
+
+%post nspr -p /sbin/ldconfig
+
+%postun nspr -p /sbin/ldconfig
+
+%post nss -p /sbin/ldconfig
+
+%postun nss -p /sbin/ldconfig
+
 %files
 %defattr(-,root,root,-)
-%{_libdir}/lib*conexus*.so.*
-%doc AUTHORS COPYING
+%{_libdir}/libconexus.so.*
+%doc AUTHORS README COPYING
 
 %files devel
 %defattr(-,root,root,-)
-%{_libdir}/*conexus*.so
-%{_libdir}/pkgconfig/conexus*.pc
-%{_includedir}/conexus-0.5/
-%doc ChangeLog docs/reference
+%{_libdir}/libconexus.so
+%{_libdir}/pkgconfig/conexus-1.0.pc
+%{_includedir}/conexus-0.5/conexus.h
+%{_includedir}/conexus-0.5/conexus/
+%doc ChangeLog
+%doc doc/reference/conexus/html/
 
+%files gtkmm
+%defattr(-,root,root,-)
+%{_libdir}/libconexus-gtkmm.so.*
+%doc AUTHORS README COPYING
+
+%files gtkmm-devel
+%defattr(-,root,root,-)
+%{_libdir}/libconexus-gtkmm.so
+%{_libdir}/pkgconfig/conexus-gtkmm-1.0.pc
+%{_includedir}/conexus-0.5/conexus-gtkmm.h
+%{_includedir}/conexus-0.5/conexus-gtkmm/
+%{_bindir}/conexus-gtkmm-demo
+%{_datadir}/conexus-0.5.98/
+%doc ChangeLog 
+%doc %{_datadir}/gtk-doc/html/conexus-gtkmm/
+
+%files ssl
+%defattr(-,root,root,-)
+%{_libdir}/libconexus-ssl.so.*
+
+%files ssl-devel
+%defattr(-,root,root,-)
+%{_libdir}/libconexus-ssl.so
+%{_libdir}/pkgconfig/conexus-ssl-1.0.pc
+%{_includedir}/conexus-0.5/conexus-ssl.h
+%{_includedir}/conexus-0.5/conexus-ssl/
+%doc ChangeLog 
+%doc doc/reference/conexus-ssl/html/
+
+%files nspr
+%defattr(-,root,root,-)
+%{_libdir}/libconexus-nspr.so.*
+
+%files nspr-devel
+%defattr(-,root,root,-)
+%{_libdir}/libconexus-nspr.so
+%{_libdir}/pkgconfig/conexus-nspr-1.0.pc
+%{_includedir}/conexus-0.5/conexus-nspr.h
+%{_includedir}/conexus-0.5/conexus-nspr/
+%doc ChangeLog 
+%doc doc/reference/conexus-nspr/html/
+
+%files nss
+%defattr(-,root,root,-)
+%{_libdir}/libconexus-nss.so.*
+
+%files nss-devel
+%defattr(-,root,root,-)
+%{_libdir}/libconexus-nss.so
+%{_libdir}/pkgconfig/conexus-nss-1.0.pc
+%{_includedir}/conexus-0.5/conexus-nss.h
+%{_includedir}/conexus-0.5/conexus-nss/
+%doc ChangeLog 
+%doc doc/reference/conexus-nss/html/
 
 %changelog
-* Thu Dec 18 2008 Petr Machata <pmachata at redhat.com> - 0.5.3-6
-- Rebuild for new boost
+* Tue Jan 06 2009 Rick L Vinyard Jr <rvinyard at cs.nmsu.edu> - 0.5.98-1
+- New release
+- Removed pcap reference from description
+- Removed cstring patch - upstream fixed
+- Added libcap requires
+- Added gtkmm, ssl, nspr and nss subpackages
+- Changed papyrus-devel to requires to papyrus-gtkmm-devel
+- Added papyrus-extras-devel requires
 
 * Sun Sep 21 2008 Ville Skytt?? <ville.skytta at iki.fi> - 0.5.3-5
 - Fix Patch0:/%%patch mismatch.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/conexus/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	4 Mar 2008 04:52:00 -0000	1.9
+++ sources	15 Jan 2009 18:28:35 -0000	1.10
@@ -1,2 +1 @@
-bde0c8fe11be8079407098137f346f0c  conexus-0.5.3.tar.bz2
-0184eaf7e5decd0d4eaba34803cdedde  conexus.patch
+750abc123de2b1bd956c84a318a20484  conexus-0.5.98.tar.bz2



From rvinyard at fedoraproject.org  Thu Jan 15 18:29:13 2009
From: rvinyard at fedoraproject.org (Rick L. Vinyard, Jr.)
Date: Thu, 15 Jan 2009 18:29:13 +0000 (UTC)
Subject: rpms/conexus/F-10 .cvsignore, 1.9, 1.10 conexus.spec, 1.13,
	1.14 sources, 1.9, 1.10
Message-ID: <20090115182913.152317012D@cvs1.fedora.phx.redhat.com>

Author: rvinyard

Update of /cvs/pkgs/rpms/conexus/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22034

Modified Files:
	.cvsignore conexus.spec sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/conexus/F-10/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	4 Mar 2008 04:52:00 -0000	1.9
+++ .cvsignore	15 Jan 2009 18:28:42 -0000	1.10
@@ -1,2 +1 @@
-conexus-0.5.3.tar.bz2
-conexus.patch
+conexus-0.5.98.tar.bz2


Index: conexus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/conexus/F-10/conexus.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- conexus.spec	21 Sep 2008 08:27:19 -0000	1.13
+++ conexus.spec	15 Jan 2009 18:28:42 -0000	1.14
@@ -1,45 +1,142 @@
-Summary:          C++ network and serial communication library
+Summary:          C++ I/O communication library
 Name:             conexus
-Version:          0.5.3
-Release:          5%{?dist}
-License:          LGPLv2
+Version:          0.5.98
+Release:          1%{?dist}
+License:          GPLv3
 URL:              http://conexus.sourceforge.net
 Group:            System Environment/Libraries
-Source:           http://download.sourceforge.net/conexus/conexus-0.5.3.tar.bz2
-Patch0:           conexus.patch
+Source:           http://download.sourceforge.net/conexus/conexus-0.5.98.tar.bz2
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:    glibmm24-devel >= 2.6.0 boost-devel >= 1.32.0 cppunit-devel >= 1.11 popt-devel pkgconfig m4
+BuildRequires:    glibmm24-devel >= 2.6.0
+BuildRequires:    cppunit-devel >= 1.11
+BuildRequires:    libcap-devel
+BuildRequires:    popt-devel
+BuildRequires:    boost-devel
+BuildRequires:    pkgconfig
+BuildRequires:    m4
+BuildRequires:    nspr-devel >= 4.6 nss-devel >= 3.11
+BuildRequires:    hal-devel >= 0.5.2
+BuildRequires:    gtkmm24-devel >= 2.6
+BuildRequires:    papyrus-gtkmm-devel >= 0.8
+BuildRequires:    papyrus-extras-devel >= 0.8
+BuildRequires:    openssl-devel >= 0.9.8
 
 %description
 Conexus is a generalized C++ I/O library that includes support for BSD
-sockets, serial/tty, packet capture (via pcap), et. al. conexus utilizes
+sockets, serial/tty, packet capture, et. al. Conexus utilizes
 sigc++ for object communication.
 
 %package          devel
 Summary:          Headers for developing programs that will use conexus
 Group:            Development/Libraries
 Requires:         conexus = %{version}-%{release}
-Requires:         glibmm24-devel >= 2.6.0 boost-devel >= 1.32.0 pkgconfig
+Requires:         glibmm24-devel >= 2.6.0
+Requires:         pkgconfig
+Requires:         libcap-devel
 
 %description    devel
 This package contains the libraries and header files needed for
 developing conexus applications.
 
+%package          gtkmm
+Summary:          Gtkmm UI widgets for the conexus communication library
+Group:            System Environment/Libraries
+Requires:         conexus = %{version}-%{release}
+Provides:         conexusmm = %{version}
+Obsoletes:        conexusmm < 0.5.1
+
+%description    gtkmm
+This package contains gtkmm widgets associated with the conexus library.
+
+%package          gtkmm-devel
+Summary:          Headers for developing programs that will use conexus-gtkmm
+Group:            Development/Libraries
+Requires:         conexus-gtkmm = %{version}-%{release}
+Requires:         conexus-devel = %{version}-%{release}
+Requires:         hal-devel >= 0.5.2
+Requires:         gtkmm24-devel >= 2.6
+Requires:         papyrus-devel >= 0.7
+Provides:         conexusmm-devel = %{version}
+Obsoletes:        conexusmm-devel < 0.5.1
+
+%description    gtkmm-devel
+This package contains the libraries and header files needed for
+developing conexus-gtkmm applications.
+
+%package          ssl
+Summary:          OpenSSL endpoints for the conexus communication library
+Group:            System Environment/Libraries
+Requires:         conexus = %{version}-%{release}
+
+%description    ssl
+This package contains OpenSSL based endpoints for the conexus library.
+
+%package          ssl-devel
+Summary:          Headers for developing programs that will use conexus-ssl
+Group:            Development/Libraries
+Requires:         conexus-ssl = %{version}-%{release}
+Requires:         conexus-devel = %{version}-%{release}
+Requires:         openssl-devel >= 0.9.8
+
+%description    ssl-devel
+This package contains the libraries and header files needed for
+developing conexus-ssl applications.
+
+%package          nspr
+Summary:          NSPR endpoints for the conexus communication library
+Group:            System Environment/Libraries
+Requires:         conexus = %{version}-%{release}
+
+%description    nspr
+This package contains NSPR based endpoints for the conexus library.
+
+%package          nspr-devel
+Summary:          Headers for developing programs that will use conexus-nspr
+Group:            Development/Libraries
+Requires:         conexus-nspr = %{version}-%{release}
+Requires:         conexus-devel = %{version}-%{release}
+Requires:         nspr-devel >= 4.6
+
+%description    nspr-devel
+This package contains the libraries and header files needed for
+developing conexus-nspr applications.
+
+%package          nss
+Summary:          NSS endpoints for the conexus communication library
+Group:            System Environment/Libraries
+Requires:         conexus = %{version}-%{release}
+
+%description    nss
+This package contains NSS based endpoints for the conexus library.
+
+%package          nss-devel
+Summary:          Headers for developing programs that will use conexus-nss
+Group:            Development/Libraries
+Requires:         conexus-nss = %{version}-%{release}
+Requires:         conexus-nspr-devel = %{version}-%{release}
+Requires:         nss-devel >= 3.11
+
+%description    nss-devel
+This package contains the libraries and header files needed for
+developing conexus-nspr applications.
+
 %prep
 %setup -q
-%patch0 -p1
 
 %build
-%configure --enable-static=no
+%configure --enable-static=no --enable-gtkmm --enable-demos
 %{__make} %{?_smp_mflags}
 
-
 %install
 %{__rm} -rf %{buildroot}
 
 %{__make} DESTDIR=%{buildroot} INSTALL="%{__install} -p" install
 find %{buildroot} -type f -name "*.la" -exec rm -f {} ';'
 
+# Fix documentation installation and put conexus-gtkmm docs under gtk-doc
+%{__mkdir} -p %{buildroot}%{_datadir}/gtk-doc/html/conexus-gtkmm/
+%{__install} --mode=0664 -t %{buildroot}%{_datadir}/gtk-doc/html/conexus-gtkmm/ doc/reference/conexus-gtkmm/html/* 
+
 %clean
 %{__rm} -rf %{buildroot}
 
@@ -47,20 +144,101 @@
 
 %postun -p /sbin/ldconfig
 
+%post gtkmm -p /sbin/ldconfig
+
+%postun gtkmm -p /sbin/ldconfig
+
+%post ssl -p /sbin/ldconfig
+
+%postun ssl -p /sbin/ldconfig
+
+%post nspr -p /sbin/ldconfig
+
+%postun nspr -p /sbin/ldconfig
+
+%post nss -p /sbin/ldconfig
+
+%postun nss -p /sbin/ldconfig
+
 %files
 %defattr(-,root,root,-)
-%{_libdir}/lib*conexus*.so.*
-%doc AUTHORS COPYING
+%{_libdir}/libconexus.so.*
+%doc AUTHORS README COPYING
 
 %files devel
 %defattr(-,root,root,-)
-%{_libdir}/*conexus*.so
-%{_libdir}/pkgconfig/conexus*.pc
-%{_includedir}/conexus-0.5/
-%doc ChangeLog docs/reference
+%{_libdir}/libconexus.so
+%{_libdir}/pkgconfig/conexus-1.0.pc
+%{_includedir}/conexus-0.5/conexus.h
+%{_includedir}/conexus-0.5/conexus/
+%doc ChangeLog
+%doc doc/reference/conexus/html/
 
+%files gtkmm
+%defattr(-,root,root,-)
+%{_libdir}/libconexus-gtkmm.so.*
+%doc AUTHORS README COPYING
+
+%files gtkmm-devel
+%defattr(-,root,root,-)
+%{_libdir}/libconexus-gtkmm.so
+%{_libdir}/pkgconfig/conexus-gtkmm-1.0.pc
+%{_includedir}/conexus-0.5/conexus-gtkmm.h
+%{_includedir}/conexus-0.5/conexus-gtkmm/
+%{_bindir}/conexus-gtkmm-demo
+%{_datadir}/conexus-0.5.98/
+%doc ChangeLog 
+%doc %{_datadir}/gtk-doc/html/conexus-gtkmm/
+
+%files ssl
+%defattr(-,root,root,-)
+%{_libdir}/libconexus-ssl.so.*
+
+%files ssl-devel
+%defattr(-,root,root,-)
+%{_libdir}/libconexus-ssl.so
+%{_libdir}/pkgconfig/conexus-ssl-1.0.pc
+%{_includedir}/conexus-0.5/conexus-ssl.h
+%{_includedir}/conexus-0.5/conexus-ssl/
+%doc ChangeLog 
+%doc doc/reference/conexus-ssl/html/
+
+%files nspr
+%defattr(-,root,root,-)
+%{_libdir}/libconexus-nspr.so.*
+
+%files nspr-devel
+%defattr(-,root,root,-)
+%{_libdir}/libconexus-nspr.so
+%{_libdir}/pkgconfig/conexus-nspr-1.0.pc
+%{_includedir}/conexus-0.5/conexus-nspr.h
+%{_includedir}/conexus-0.5/conexus-nspr/
+%doc ChangeLog 
+%doc doc/reference/conexus-nspr/html/
+
+%files nss
+%defattr(-,root,root,-)
+%{_libdir}/libconexus-nss.so.*
+
+%files nss-devel
+%defattr(-,root,root,-)
+%{_libdir}/libconexus-nss.so
+%{_libdir}/pkgconfig/conexus-nss-1.0.pc
+%{_includedir}/conexus-0.5/conexus-nss.h
+%{_includedir}/conexus-0.5/conexus-nss/
+%doc ChangeLog 
+%doc doc/reference/conexus-nss/html/
 
 %changelog
+* Tue Jan 06 2009 Rick L Vinyard Jr <rvinyard at cs.nmsu.edu> - 0.5.98-1
+- New release
+- Removed pcap reference from description
+- Removed cstring patch - upstream fixed
+- Added libcap requires
+- Added gtkmm, ssl, nspr and nss subpackages
+- Changed papyrus-devel to requires to papyrus-gtkmm-devel
+- Added papyrus-extras-devel requires
+
 * Sun Sep 21 2008 Ville Skytt?? <ville.skytta at iki.fi> - 0.5.3-5
 - Fix Patch0:/%%patch mismatch.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/conexus/F-10/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	4 Mar 2008 04:52:00 -0000	1.9
+++ sources	15 Jan 2009 18:28:42 -0000	1.10
@@ -1,2 +1 @@
-bde0c8fe11be8079407098137f346f0c  conexus-0.5.3.tar.bz2
-0184eaf7e5decd0d4eaba34803cdedde  conexus.patch
+750abc123de2b1bd956c84a318a20484  conexus-0.5.98.tar.bz2



From astokes at fedoraproject.org  Thu Jan 15 18:32:45 2009
From: astokes at fedoraproject.org (Adam Stokes)
Date: Thu, 15 Jan 2009 18:32:45 +0000 (UTC)
Subject: rpms/cas/devel cas.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090115183245.6C8DF7012D@cvs1.fedora.phx.redhat.com>

Author: astokes

Update of /cvs/pkgs/rpms/cas/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22751/devel

Modified Files:
	.cvsignore sources 
Added Files:
	cas.spec import.log 
Log Message:
initial commit



--- NEW FILE cas.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

Name: cas
Summary: Tool to analyze and configure core file environment
Version: 0.13
Release: 118%{?dist}
Source0: https://fedorahosted.org/releases/c/a/cas/%{name}-%{version}.tar.gz
License: GPLv3+
Group: Development/Libraries
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
BuildArch: noarch
Url: http://fedorahosted.org/cas
BuildRequires: python-devel
Requires: crash

%description
CAS provides a user the ability to configure an environment for core analysis
quickly. All the hassles of matching kernel versions and machine architecture 
types to core dumps are automatically detected and processed. 

%prep
%setup -q

%build
%{__python} setup.py build

%install
rm -rf ${RPM_BUILD_ROOT}
%{__python} setup.py install -O1 --skip-build --root ${RPM_BUILD_ROOT}

%clean
rm -rf ${RPM_BUILD_ROOT}

%files
%defattr(-,root,root,-)
%config(noreplace) %{_sysconfdir}/cas.conf
%{_bindir}/cas
%{_bindir}/cas-admin
%{python_sitelib}/*
%{_mandir}/man1/cas.1.gz
%{_mandir}/man1/cas-admin.1.gz
%doc LICENSE README PKG-INFO

%changelog
* Wed Jan 7 2009 Adam Stokes <ajs at redhat dot com> - 0.13-116
- support for extracting kernel modules
- support for analyzing x86 cores on x86_64 system
- consistent macro usage in spec

* Mon Dec 29 2008 Adam Stokes <ajs at redhat dot com> - 0.13-114
- changed license to gplv3 or later
- removed source requirements as these are handled by python manifest
- removed python requirement
- updated description

* Fri Dec 19 2008 Adam Stokes <ajs at redhat dot com> - 0.13-113
- rpmlint verified
- manually set version/release in spec
- license tag fix
- added full path to upstream source release

* Mon Dec 15 2008 Adam Stokes <ajs at redhat dot com> - 0.13-94
- no replace on config file
- cas now processes locally and remotely via func

* Wed Aug 20 2008 Adam Stokes <ajs at redhat dot com> - 0.13
- Updated build and spec

* Mon Feb 10 2008 Scott Dodson <sdodson at redhat dot com> - 0.11
- Minor changes to permissions

* Mon Dec 10 2007 Adam Stokes <astokes at redhat dot com> - 0.9.1
- splitting off grabcore to be a download/extract only service
- core of the work to be done specifically by their intended
  modules
  
* Fri Dec 7 2007 Adam Stokes <astokes at redhat dot com> - 0.9
- release bump
- decompression module added

* Tue Nov 13 2007 Adam Stokes <astokes at redhat dot com> - 0.8
- threading added
- better exception handling
- bug fixes
- added initscripts, service capabilities

* Mon Oct 22 2007 Adam Stokes <astokes at redhat dot com> - 0.1
- initial build


--- NEW FILE import.log ---
cas-0_13-118:HEAD:cas-0.13-118.src.rpm:1232044307


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cas/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	15 Jan 2009 16:16:01 -0000	1.1
+++ .cvsignore	15 Jan 2009 18:32:15 -0000	1.2
@@ -0,0 +1 @@
+cas-0.13.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cas/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	15 Jan 2009 16:16:01 -0000	1.1
+++ sources	15 Jan 2009 18:32:15 -0000	1.2
@@ -0,0 +1 @@
+8ac633c1c5ba6f38756fcb31a96513d6  cas-0.13.tar.gz



From wtogami at fedoraproject.org  Thu Jan 15 18:33:03 2009
From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=)
Date: Thu, 15 Jan 2009 18:33:03 +0000 (UTC)
Subject: rpms/ltsp/F-10 .cvsignore, 1.21, 1.22 ltsp.spec, 1.27, 1.28 sources,
	1.25, 1.26
Message-ID: <20090115183303.A968B7012D@cvs1.fedora.phx.redhat.com>

Author: wtogami

Update of /cvs/pkgs/rpms/ltsp/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22829

Modified Files:
	.cvsignore ltsp.spec sources 
Log Message:
More bug fixes



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ltsp/F-10/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- .cvsignore	30 Dec 2008 00:24:40 -0000	1.21
+++ .cvsignore	15 Jan 2009 18:32:33 -0000	1.22
@@ -1 +1 @@
-ltsp-5.1.44.tar.bz2
+ltsp-5.1.48.tar.bz2


Index: ltsp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ltsp/F-10/ltsp.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- ltsp.spec	30 Dec 2008 00:24:40 -0000	1.27
+++ ltsp.spec	15 Jan 2009 18:32:33 -0000	1.28
@@ -1,6 +1,6 @@
 Name:           ltsp
-Version:        5.1.44
-%define _datestamp .20081224.19
+Version:        5.1.48
+%define _datestamp .20090115.13
 #Release:        2%{_datestamp}%{?dist}
 Release:        1%{?dist}
 Summary:        Linux Terminal Server Project Server and Client
@@ -417,6 +417,9 @@
 %endif
 
 %changelog
+* Thu Jan 15 2009 Warren Togami <wtogami at redhat.com> - 5.1.48-1
+- More bug fixes
+
 * Mon Dec 29 2008 Warren Togami <wtogami at redhat.com> - 5.1.44-1
 - More bug fixes
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ltsp/F-10/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- sources	30 Dec 2008 00:24:40 -0000	1.25
+++ sources	15 Jan 2009 18:32:33 -0000	1.26
@@ -1 +1 @@
-bbf30387acf5143ec6086ccb5cf457a1  ltsp-5.1.44.tar.bz2
+036db37af33c64ef60d23d0c50868424  ltsp-5.1.48.tar.bz2



From astokes at fedoraproject.org  Thu Jan 15 18:35:14 2009
From: astokes at fedoraproject.org (Adam Stokes)
Date: Thu, 15 Jan 2009 18:35:14 +0000 (UTC)
Subject: rpms/cas/F-9 cas.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090115183514.1E8D17012D@cvs1.fedora.phx.redhat.com>

Author: astokes

Update of /cvs/pkgs/rpms/cas/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23208/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	cas.spec import.log 
Log Message:
initial import



--- NEW FILE cas.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

Name: cas
Summary: Tool to analyze and configure core file environment
Version: 0.13
Release: 118%{?dist}
Source0: https://fedorahosted.org/releases/c/a/cas/%{name}-%{version}.tar.gz
License: GPLv3+
Group: Development/Libraries
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
BuildArch: noarch
Url: http://fedorahosted.org/cas
BuildRequires: python-devel
Requires: crash

%description
CAS provides a user the ability to configure an environment for core analysis
quickly. All the hassles of matching kernel versions and machine architecture 
types to core dumps are automatically detected and processed. 

%prep
%setup -q

%build
%{__python} setup.py build

%install
rm -rf ${RPM_BUILD_ROOT}
%{__python} setup.py install -O1 --skip-build --root ${RPM_BUILD_ROOT}

%clean
rm -rf ${RPM_BUILD_ROOT}

%files
%defattr(-,root,root,-)
%config(noreplace) %{_sysconfdir}/cas.conf
%{_bindir}/cas
%{_bindir}/cas-admin
%{python_sitelib}/*
%{_mandir}/man1/cas.1.gz
%{_mandir}/man1/cas-admin.1.gz
%doc LICENSE README PKG-INFO

%changelog
* Wed Jan 7 2009 Adam Stokes <ajs at redhat dot com> - 0.13-116
- support for extracting kernel modules
- support for analyzing x86 cores on x86_64 system
- consistent macro usage in spec

* Mon Dec 29 2008 Adam Stokes <ajs at redhat dot com> - 0.13-114
- changed license to gplv3 or later
- removed source requirements as these are handled by python manifest
- removed python requirement
- updated description

* Fri Dec 19 2008 Adam Stokes <ajs at redhat dot com> - 0.13-113
- rpmlint verified
- manually set version/release in spec
- license tag fix
- added full path to upstream source release

* Mon Dec 15 2008 Adam Stokes <ajs at redhat dot com> - 0.13-94
- no replace on config file
- cas now processes locally and remotely via func

* Wed Aug 20 2008 Adam Stokes <ajs at redhat dot com> - 0.13
- Updated build and spec

* Mon Feb 10 2008 Scott Dodson <sdodson at redhat dot com> - 0.11
- Minor changes to permissions

* Mon Dec 10 2007 Adam Stokes <astokes at redhat dot com> - 0.9.1
- splitting off grabcore to be a download/extract only service
- core of the work to be done specifically by their intended
  modules
  
* Fri Dec 7 2007 Adam Stokes <astokes at redhat dot com> - 0.9
- release bump
- decompression module added

* Tue Nov 13 2007 Adam Stokes <astokes at redhat dot com> - 0.8
- threading added
- better exception handling
- bug fixes
- added initscripts, service capabilities

* Mon Oct 22 2007 Adam Stokes <astokes at redhat dot com> - 0.1
- initial build


--- NEW FILE import.log ---
cas-0_13-118:F-9:cas-0.13-118.src.rpm:1232044446


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cas/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	15 Jan 2009 16:16:01 -0000	1.1
+++ .cvsignore	15 Jan 2009 18:34:43 -0000	1.2
@@ -0,0 +1 @@
+cas-0.13.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cas/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	15 Jan 2009 16:16:01 -0000	1.1
+++ sources	15 Jan 2009 18:34:43 -0000	1.2
@@ -0,0 +1 @@
+8ac633c1c5ba6f38756fcb31a96513d6  cas-0.13.tar.gz



From astokes at fedoraproject.org  Thu Jan 15 18:36:40 2009
From: astokes at fedoraproject.org (Adam Stokes)
Date: Thu, 15 Jan 2009 18:36:40 +0000 (UTC)
Subject: rpms/cas/F-10 cas.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090115183640.2A4C37012D@cvs1.fedora.phx.redhat.com>

Author: astokes

Update of /cvs/pkgs/rpms/cas/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23612/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	cas.spec import.log 
Log Message:
initial import



--- NEW FILE cas.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

Name: cas
Summary: Tool to analyze and configure core file environment
Version: 0.13
Release: 118%{?dist}
Source0: https://fedorahosted.org/releases/c/a/cas/%{name}-%{version}.tar.gz
License: GPLv3+
Group: Development/Libraries
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
BuildArch: noarch
Url: http://fedorahosted.org/cas
BuildRequires: python-devel
Requires: crash

%description
CAS provides a user the ability to configure an environment for core analysis
quickly. All the hassles of matching kernel versions and machine architecture 
types to core dumps are automatically detected and processed. 

%prep
%setup -q

%build
%{__python} setup.py build

%install
rm -rf ${RPM_BUILD_ROOT}
%{__python} setup.py install -O1 --skip-build --root ${RPM_BUILD_ROOT}

%clean
rm -rf ${RPM_BUILD_ROOT}

%files
%defattr(-,root,root,-)
%config(noreplace) %{_sysconfdir}/cas.conf
%{_bindir}/cas
%{_bindir}/cas-admin
%{python_sitelib}/*
%{_mandir}/man1/cas.1.gz
%{_mandir}/man1/cas-admin.1.gz
%doc LICENSE README PKG-INFO

%changelog
* Wed Jan 7 2009 Adam Stokes <ajs at redhat dot com> - 0.13-116
- support for extracting kernel modules
- support for analyzing x86 cores on x86_64 system
- consistent macro usage in spec

* Mon Dec 29 2008 Adam Stokes <ajs at redhat dot com> - 0.13-114
- changed license to gplv3 or later
- removed source requirements as these are handled by python manifest
- removed python requirement
- updated description

* Fri Dec 19 2008 Adam Stokes <ajs at redhat dot com> - 0.13-113
- rpmlint verified
- manually set version/release in spec
- license tag fix
- added full path to upstream source release

* Mon Dec 15 2008 Adam Stokes <ajs at redhat dot com> - 0.13-94
- no replace on config file
- cas now processes locally and remotely via func

* Wed Aug 20 2008 Adam Stokes <ajs at redhat dot com> - 0.13
- Updated build and spec

* Mon Feb 10 2008 Scott Dodson <sdodson at redhat dot com> - 0.11
- Minor changes to permissions

* Mon Dec 10 2007 Adam Stokes <astokes at redhat dot com> - 0.9.1
- splitting off grabcore to be a download/extract only service
- core of the work to be done specifically by their intended
  modules
  
* Fri Dec 7 2007 Adam Stokes <astokes at redhat dot com> - 0.9
- release bump
- decompression module added

* Tue Nov 13 2007 Adam Stokes <astokes at redhat dot com> - 0.8
- threading added
- better exception handling
- bug fixes
- added initscripts, service capabilities

* Mon Oct 22 2007 Adam Stokes <astokes at redhat dot com> - 0.1
- initial build


--- NEW FILE import.log ---
cas-0_13-118:F-10:cas-0.13-118.src.rpm:1232044544


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cas/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	15 Jan 2009 16:16:01 -0000	1.1
+++ .cvsignore	15 Jan 2009 18:36:09 -0000	1.2
@@ -0,0 +1 @@
+cas-0.13.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cas/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	15 Jan 2009 16:16:01 -0000	1.1
+++ sources	15 Jan 2009 18:36:09 -0000	1.2
@@ -0,0 +1 @@
+8ac633c1c5ba6f38756fcb31a96513d6  cas-0.13.tar.gz



From s4504kr at fedoraproject.org  Thu Jan 15 18:40:22 2009
From: s4504kr at fedoraproject.org (Jochen Schmitt)
Date: Thu, 15 Jan 2009 18:40:22 +0000 (UTC)
Subject: rpms/highlight/devel .cvsignore, 1.21, 1.22 highlight.spec, 1.37,
	1.38 sources, 1.22, 1.23
Message-ID: <20090115184022.76D317012D@cvs1.fedora.phx.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/highlight/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24823

Modified Files:
	.cvsignore highlight.spec sources 
Log Message:
New upstream release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/highlight/devel/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- .cvsignore	3 Nov 2008 18:55:15 -0000	1.21
+++ .cvsignore	15 Jan 2009 18:39:51 -0000	1.22
@@ -1 +1 @@
-highlight-2.6.14.tar.gz
+highlight-2.7.tar.gz


Index: highlight.spec
===================================================================
RCS file: /cvs/extras/rpms/highlight/devel/highlight.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- highlight.spec	3 Nov 2008 18:55:15 -0000	1.37
+++ highlight.spec	15 Jan 2009 18:39:52 -0000	1.38
@@ -1,6 +1,6 @@
 Name:		highlight
 Summary:	Universal source code to formatted text converter
-Version:	2.6.14
+Version:	2.7
 Release:	1%{?dist}
 
 Group:		Development/Tools
@@ -70,6 +70,9 @@
 %doc ChangeLog AUTHORS README* COPYING TODO examples/
 
 %changelog
+* Thu Jan 15 2009 Jochen Schmitt <Jochen herr-schmitt de> 2.7-1
+- New upstream release
+
 * Mon Nov  3 2008 Jochen Schmitt <Jochen herr-schmitt de> 2.6.14-1
 - New upstream release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/highlight/devel/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- sources	3 Nov 2008 18:55:15 -0000	1.22
+++ sources	15 Jan 2009 18:39:52 -0000	1.23
@@ -1 +1 @@
-09bb5bb1d9d9dba215a9d56e02213452  highlight-2.6.14.tar.gz
+3ea4e71fd07cd517386d4dab9bd748e5  highlight-2.7.tar.gz



From astokes at fedoraproject.org  Thu Jan 15 18:45:02 2009
From: astokes at fedoraproject.org (Adam Stokes)
Date: Thu, 15 Jan 2009 18:45:02 +0000 (UTC)
Subject: rpms/cas/EL-5 cas.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090115184502.9FBA67012D@cvs1.fedora.phx.redhat.com>

Author: astokes

Update of /cvs/pkgs/rpms/cas/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25529/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	cas.spec import.log 
Log Message:
intial import



--- NEW FILE cas.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

Name: cas
Summary: Tool to analyze and configure core file environment
Version: 0.13
Release: 118%{?dist}
Source0: https://fedorahosted.org/releases/c/a/cas/%{name}-%{version}.tar.gz
License: GPLv3+
Group: Development/Libraries
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
BuildArch: noarch
Url: http://fedorahosted.org/cas
BuildRequires: python-devel
Requires: crash

%description
CAS provides a user the ability to configure an environment for core analysis
quickly. All the hassles of matching kernel versions and machine architecture 
types to core dumps are automatically detected and processed. 

%prep
%setup -q

%build
%{__python} setup.py build

%install
rm -rf ${RPM_BUILD_ROOT}
%{__python} setup.py install -O1 --skip-build --root ${RPM_BUILD_ROOT}

%clean
rm -rf ${RPM_BUILD_ROOT}

%files
%defattr(-,root,root,-)
%config(noreplace) %{_sysconfdir}/cas.conf
%{_bindir}/cas
%{_bindir}/cas-admin
%{python_sitelib}/*
%{_mandir}/man1/cas.1.gz
%{_mandir}/man1/cas-admin.1.gz
%doc LICENSE README PKG-INFO

%changelog
* Wed Jan 7 2009 Adam Stokes <ajs at redhat dot com> - 0.13-116
- support for extracting kernel modules
- support for analyzing x86 cores on x86_64 system
- consistent macro usage in spec

* Mon Dec 29 2008 Adam Stokes <ajs at redhat dot com> - 0.13-114
- changed license to gplv3 or later
- removed source requirements as these are handled by python manifest
- removed python requirement
- updated description

* Fri Dec 19 2008 Adam Stokes <ajs at redhat dot com> - 0.13-113
- rpmlint verified
- manually set version/release in spec
- license tag fix
- added full path to upstream source release

* Mon Dec 15 2008 Adam Stokes <ajs at redhat dot com> - 0.13-94
- no replace on config file
- cas now processes locally and remotely via func

* Wed Aug 20 2008 Adam Stokes <ajs at redhat dot com> - 0.13
- Updated build and spec

* Mon Feb 10 2008 Scott Dodson <sdodson at redhat dot com> - 0.11
- Minor changes to permissions

* Mon Dec 10 2007 Adam Stokes <astokes at redhat dot com> - 0.9.1
- splitting off grabcore to be a download/extract only service
- core of the work to be done specifically by their intended
  modules
  
* Fri Dec 7 2007 Adam Stokes <astokes at redhat dot com> - 0.9
- release bump
- decompression module added

* Tue Nov 13 2007 Adam Stokes <astokes at redhat dot com> - 0.8
- threading added
- better exception handling
- bug fixes
- added initscripts, service capabilities

* Mon Oct 22 2007 Adam Stokes <astokes at redhat dot com> - 0.1
- initial build


--- NEW FILE import.log ---
cas-0_13-118:EL-5:cas-0.13-118.src.rpm:1232045038


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cas/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	15 Jan 2009 16:16:01 -0000	1.1
+++ .cvsignore	15 Jan 2009 18:44:32 -0000	1.2
@@ -0,0 +1 @@
+cas-0.13.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cas/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	15 Jan 2009 16:16:01 -0000	1.1
+++ sources	15 Jan 2009 18:44:32 -0000	1.2
@@ -0,0 +1 @@
+8ac633c1c5ba6f38756fcb31a96513d6  cas-0.13.tar.gz



From tmraz at fedoraproject.org  Thu Jan 15 18:45:32 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Thu, 15 Jan 2009 18:45:32 +0000 (UTC)
Subject: rpms/conserver/devel conserver.spec,1.10,1.11
Message-ID: <20090115184532.6C0437012D@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/conserver/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25612

Modified Files:
	conserver.spec 
Log Message:
* Thu Jan 15 2009 Tomas Mraz <tmraz at redhat.com> 8.1.16-6
- rebuild with new openssl



Index: conserver.spec
===================================================================
RCS file: /cvs/pkgs/rpms/conserver/devel/conserver.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- conserver.spec	13 Feb 2008 16:13:04 -0000	1.10
+++ conserver.spec	15 Jan 2009 18:45:02 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           conserver
 Version:        8.1.16
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Serial console server daemon/client
 
 Group:          System Environment/Daemons
@@ -117,6 +117,9 @@
 %{_mandir}/man1/console.1.gz
 
 %changelog
+* Thu Jan 15 2009 Tomas Mraz <tmraz at redhat.com> 8.1.16-6
+- rebuild with new openssl
+
 * Wed Feb 13 2008 Patrick "Jima" Laughton <jima at beer.tclug.org> 8.1.16-5
 - Bump-n-build for GCC 4.3
 



From astokes at fedoraproject.org  Thu Jan 15 18:46:19 2009
From: astokes at fedoraproject.org (Adam Stokes)
Date: Thu, 15 Jan 2009 18:46:19 +0000 (UTC)
Subject: rpms/cas/EL-4 cas.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090115184619.61ACB7012D@cvs1.fedora.phx.redhat.com>

Author: astokes

Update of /cvs/pkgs/rpms/cas/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25895/EL-4

Modified Files:
	.cvsignore sources 
Added Files:
	cas.spec import.log 
Log Message:
intial import



--- NEW FILE cas.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

Name: cas
Summary: Tool to analyze and configure core file environment
Version: 0.13
Release: 118%{?dist}
Source0: https://fedorahosted.org/releases/c/a/cas/%{name}-%{version}.tar.gz
License: GPLv3+
Group: Development/Libraries
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
BuildArch: noarch
Url: http://fedorahosted.org/cas
BuildRequires: python-devel
Requires: crash

%description
CAS provides a user the ability to configure an environment for core analysis
quickly. All the hassles of matching kernel versions and machine architecture 
types to core dumps are automatically detected and processed. 

%prep
%setup -q

%build
%{__python} setup.py build

%install
rm -rf ${RPM_BUILD_ROOT}
%{__python} setup.py install -O1 --skip-build --root ${RPM_BUILD_ROOT}

%clean
rm -rf ${RPM_BUILD_ROOT}

%files
%defattr(-,root,root,-)
%config(noreplace) %{_sysconfdir}/cas.conf
%{_bindir}/cas
%{_bindir}/cas-admin
%{python_sitelib}/*
%{_mandir}/man1/cas.1.gz
%{_mandir}/man1/cas-admin.1.gz
%doc LICENSE README PKG-INFO

%changelog
* Wed Jan 7 2009 Adam Stokes <ajs at redhat dot com> - 0.13-116
- support for extracting kernel modules
- support for analyzing x86 cores on x86_64 system
- consistent macro usage in spec

* Mon Dec 29 2008 Adam Stokes <ajs at redhat dot com> - 0.13-114
- changed license to gplv3 or later
- removed source requirements as these are handled by python manifest
- removed python requirement
- updated description

* Fri Dec 19 2008 Adam Stokes <ajs at redhat dot com> - 0.13-113
- rpmlint verified
- manually set version/release in spec
- license tag fix
- added full path to upstream source release

* Mon Dec 15 2008 Adam Stokes <ajs at redhat dot com> - 0.13-94
- no replace on config file
- cas now processes locally and remotely via func

* Wed Aug 20 2008 Adam Stokes <ajs at redhat dot com> - 0.13
- Updated build and spec

* Mon Feb 10 2008 Scott Dodson <sdodson at redhat dot com> - 0.11
- Minor changes to permissions

* Mon Dec 10 2007 Adam Stokes <astokes at redhat dot com> - 0.9.1
- splitting off grabcore to be a download/extract only service
- core of the work to be done specifically by their intended
  modules
  
* Fri Dec 7 2007 Adam Stokes <astokes at redhat dot com> - 0.9
- release bump
- decompression module added

* Tue Nov 13 2007 Adam Stokes <astokes at redhat dot com> - 0.8
- threading added
- better exception handling
- bug fixes
- added initscripts, service capabilities

* Mon Oct 22 2007 Adam Stokes <astokes at redhat dot com> - 0.1
- initial build


--- NEW FILE import.log ---
cas-0_13-118:EL-4:cas-0.13-118.src.rpm:1232045126


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cas/EL-4/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	15 Jan 2009 16:16:01 -0000	1.1
+++ .cvsignore	15 Jan 2009 18:45:49 -0000	1.2
@@ -0,0 +1 @@
+cas-0.13.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cas/EL-4/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	15 Jan 2009 16:16:01 -0000	1.1
+++ sources	15 Jan 2009 18:45:49 -0000	1.2
@@ -0,0 +1 @@
+8ac633c1c5ba6f38756fcb31a96513d6  cas-0.13.tar.gz



From linville at fedoraproject.org  Thu Jan 15 18:51:11 2009
From: linville at fedoraproject.org (John W. Linville)
Date: Thu, 15 Jan 2009 18:51:11 +0000 (UTC)
Subject: rpms/kernel/F-10 iwlwifi-intel-bug-1822.patch, NONE, 1.1 kernel.spec,
	1.1213, 1.1214
Message-ID: <20090115185111.EBBA67012D@cvs1.fedora.phx.redhat.com>

Author: linville

Update of /cvs/pkgs/rpms/kernel/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26684

Modified Files:
	kernel.spec 
Added Files:
	iwlwifi-intel-bug-1822.patch 
Log Message:
iwlwifi: avoid rs_get_rate warnings

iwlwifi-intel-bug-1822.patch:

--- NEW FILE iwlwifi-intel-bug-1822.patch ---
diff -up linux-2.6.28.noarch/drivers/net/wireless/iwlwifi/iwl-3945-rs.c.orig linux-2.6.28.noarch/drivers/net/wireless/iwlwifi/iwl-3945-rs.c
--- linux-2.6.28.noarch/drivers/net/wireless/iwlwifi/iwl-3945-rs.c.orig	2009-01-15 13:30:23.000000000 -0500
+++ linux-2.6.28.noarch/drivers/net/wireless/iwlwifi/iwl-3945-rs.c	2009-01-15 13:39:16.000000000 -0500
@@ -665,6 +665,12 @@ static void rs_get_rate(void *priv_r, st
 	}
 
 	rate_mask = sta->supp_rates[sband->band];
+
+	if (!rate_mask) {
+		sel->rate_idx = rate_lowest_index(sband, NULL);
+		return;
+	}
+
 	index = min(rs_sta->last_txrate_idx & 0xffff, IWL_RATE_COUNT - 1);
 
 	if (sband->band == IEEE80211_BAND_5GHZ)
diff -up linux-2.6.28.noarch/drivers/net/wireless/iwlwifi/iwl-agn-rs.c.orig linux-2.6.28.noarch/drivers/net/wireless/iwlwifi/iwl-agn-rs.c
--- linux-2.6.28.noarch/drivers/net/wireless/iwlwifi/iwl-agn-rs.c.orig	2009-01-15 13:30:23.000000000 -0500
+++ linux-2.6.28.noarch/drivers/net/wireless/iwlwifi/iwl-agn-rs.c	2009-01-15 13:37:37.000000000 -0500
@@ -775,7 +775,7 @@ static void rs_tx_status(void *priv_r, s
 	int status;
 	u8 retries;
 	int rs_index, index = 0;
-	struct iwl_lq_sta *lq_sta;
+	struct iwl_lq_sta *lq_sta = priv_sta;
 	struct iwl_link_quality_cmd *table;
 	struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data;
 	struct iwl_priv *priv = (struct iwl_priv *)priv_r;
@@ -792,6 +792,12 @@ static void rs_tx_status(void *priv_r, s
 
 	IWL_DEBUG_RATE_LIMIT("get frame ack response, update rate scale window\n");
 
+	/* user changed channel to different band return lowest rate
+	 * in band
+	 */
+	if (lq_sta && lq_sta->band != priv->band)
+		return;
+
 	if (!ieee80211_is_data(fc) || is_multicast_ether_addr(hdr->addr1))
 		return;
 
@@ -805,8 +811,6 @@ static void rs_tx_status(void *priv_r, s
 	if (retries > 15)
 		retries = 15;
 
-	lq_sta = (struct iwl_lq_sta *)priv_sta;
-
 	if ((priv->iw_mode == NL80211_IFTYPE_ADHOC) &&
 	    !lq_sta->ibss_sta_added)
 		goto out;
@@ -2113,10 +2117,17 @@ static void rs_get_rate(void *priv_r, st
 	struct ieee80211_conf *conf = &priv->hw->conf;
 	struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data;
 	__le16 fc;
-	struct iwl_lq_sta *lq_sta;
+	struct iwl_lq_sta *lq_sta = priv_sta;
 
 	IWL_DEBUG_RATE_LIMIT("rate scale calculate new rate for skb\n");
 
+	/* user changed channel to different band return lowest rate
+	 * in band
+	 */
+	if (lq_sta && lq_sta->band != priv->band) {
+		sel->rate_idx = rate_lowest_index(sband, NULL);
+		return;
+	}
 	/* Send management frames and broadcast/multicast data using lowest
 	 * rate. */
 	fc = hdr->frame_control;
@@ -2126,7 +2137,6 @@ static void rs_get_rate(void *priv_r, st
 		return;
 	}
 
-	lq_sta = (struct iwl_lq_sta *)priv_sta;
 	i = lq_sta->last_txrate_idx;
 
 	if ((priv->iw_mode == NL80211_IFTYPE_ADHOC) &&


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/kernel.spec,v
retrieving revision 1.1213
retrieving revision 1.1214
diff -u -r1.1213 -r1.1214
--- kernel.spec	14 Jan 2009 08:42:00 -0000	1.1213
+++ kernel.spec	15 Jan 2009 18:50:41 -0000	1.1214
@@ -630,6 +630,7 @@
 
 Patch680: linux-2.6-iwlwifi-use-GFP_KERNEL-to-allocate-Rx-SKB-memory.patch
 Patch681: linux-2.6-ath5k-ignore-the-return-value-of-ath5k_hw_noise_floor_calibration.patch
+Patch682: iwlwifi-intel-bug-1822.patch
 
 Patch690: linux-2.6-at76.patch
 
@@ -1153,6 +1154,9 @@
 # iwlwifi: use GFP_KERNEL to allocate Rx SKB memory
 ApplyPatch linux-2.6-iwlwifi-use-GFP_KERNEL-to-allocate-Rx-SKB-memory.patch
 
+# iwlwifi: avoid rs_get_rate warnings
+ApplyPatch iwlwifi-intel-bug-1822.patch
+
 # ath5k: ignore the return value of ath5k_hw_noise_floor_calibration
 ApplyPatch linux-2.6-ath5k-ignore-the-return-value-of-ath5k_hw_noise_floor_calibration.patch
 
@@ -1779,6 +1783,9 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Tue Jan 14 2009 John W. Linville <linville at redhat.com>
+- iwlwifi: avoid rs_get_rate warnings
+
 * Wed Jan 14 2009 Hans de Goede <hdegoede at redhat.com>
 - Rebase gspca git patch and re-enable
 - Add gscpa-stv06xx (qc-usb replacement) driver from its own git tree



From behdad at fedoraproject.org  Thu Jan 15 19:06:47 2009
From: behdad at fedoraproject.org (Behdad Esfahbod)
Date: Thu, 15 Jan 2009 19:06:47 +0000 (UTC)
Subject: rpms/freetype/devel .cvsignore, 1.20, 1.21 freetype.spec, 1.66,
	1.67 sources, 1.20, 1.21
Message-ID: <20090115190647.CFF437012D@cvs1.fedora.phx.redhat.com>

Author: behdad

Update of /cvs/pkgs/rpms/freetype/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28447

Modified Files:
	.cvsignore freetype.spec sources 
Log Message:
* Thu Jan 15 2009 Behdad Esfahbod <besfahbo at redhat.com> 2.3.8-1
- Update to 2.3.8
- Remove freetype-autohinter-ligature.patch



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/freetype/devel/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- .cvsignore	14 Aug 2008 15:41:06 -0000	1.20
+++ .cvsignore	15 Jan 2009 19:06:17 -0000	1.21
@@ -1,3 +1,3 @@
-freetype-2.3.7.tar.bz2
-freetype-doc-2.3.7.tar.bz2
-ft2demos-2.3.7.tar.bz2
+freetype-2.3.8.tar.bz2
+freetype-doc-2.3.8.tar.bz2
+ft2demos-2.3.8.tar.bz2


Index: freetype.spec
===================================================================
RCS file: /cvs/pkgs/rpms/freetype/devel/freetype.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- freetype.spec	9 Dec 2008 21:04:45 -0000	1.66
+++ freetype.spec	15 Jan 2009 19:06:17 -0000	1.67
@@ -10,8 +10,8 @@
 
 Summary: A free and portable font rendering engine
 Name: freetype
-Version: 2.3.7
-Release: 3%{?dist}
+Version: 2.3.8
+Release: 1%{?dist}
 License: FTL or GPLv2+
 Group: System Environment/Libraries
 URL: http://www.freetype.org
@@ -33,9 +33,6 @@
 # Fix crash https://bugs.freedesktop.org/show_bug.cgi?id=6841
 Patch89:  freetype-2.2.1-memcpy-fix.patch
 
-# Upstream patches
-Patch101: freetype-autohinter-ligature.patch
-
 Buildroot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
 
 BuildRequires: libX11-devel
@@ -96,8 +93,6 @@
 %patch88 -p1 -b .multilib
 %patch89 -p1 -b .memcpy
 
-%patch101 -p0 -b .autohinter-ligature
-
 %build
 
 %configure --disable-static
@@ -224,6 +219,10 @@
 %doc docs/tutorial
 
 %changelog
+* Thu Jan 15 2009 Behdad Esfahbod <besfahbo at redhat.com> 2.3.8-1
+- Update to 2.3.8
+- Remove freetype-autohinter-ligature.patch
+
 * Tue Dec 09 2008 Behdad Esfahbod <besfahbo at redhat.com> 2.3.7-3
 - Add full source URL to Source lines.
 - Add docs to main and devel package.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/freetype/devel/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources	14 Aug 2008 15:41:06 -0000	1.20
+++ sources	15 Jan 2009 19:06:17 -0000	1.21
@@ -1,3 +1,3 @@
-83306194817ebdea554133b4232a34aa  freetype-2.3.7.tar.bz2
-2ba135e6a126ed86e9b462167511ced8  freetype-doc-2.3.7.tar.bz2
-cf2cc0d0d4788548556c360c25fbe011  ft2demos-2.3.7.tar.bz2
+6cf31a08826715a0d16ae366da9c7d3b  freetype-2.3.8.tar.bz2
+de1cc7cf098e11fba5898efdab1bc23d  freetype-doc-2.3.8.tar.bz2
+6582649a8b877ec8d9893a9d834f7ab6  ft2demos-2.3.8.tar.bz2



From cassmodiah at fedoraproject.org  Thu Jan 15 19:10:42 2009
From: cassmodiah at fedoraproject.org (Simon Wesp)
Date: Thu, 15 Jan 2009 19:10:42 +0000 (UTC)
Subject: rpms/nopaste/devel import.log, NONE, 1.1 nopaste-2835, NONE,
	1.1 nopaste.spec, NONE, 1.1
Message-ID: <20090115191043.0396E7012D@cvs1.fedora.phx.redhat.com>

Author: cassmodiah

Update of /cvs/pkgs/rpms/nopaste/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29763/devel

Added Files:
	import.log nopaste-2835 nopaste.spec 
Log Message:



--- NEW FILE import.log ---
nopaste-2835-2_fc10:HEAD:nopaste-2835-2.fc10.src.rpm:1232046696


--- NEW FILE nopaste-2835 ---
#!/usr/bin/ruby -w
#
# nopaste -- quick script in the spirit of eatpaste, to generate nopaste urls.
# See http://www.rafb.net/paste/ for more information.
#
# Copyright 2005,2007 Aron Griffis <agriffis n01se.net>
# Released under the GNU General Public License v2
#

require 'cgi'
require 'net/http'
require 'optparse'
require 'ostruct'
require 'uri'

class CmdLine
  def self.parse(args)
    options = OpenStruct.new
    options.lang = 'Plain Text'

    opts = OptionParser.new do |opts|
      opts.banner = "Usage: nopaste [options]"
      opts.separator ""
      opts.separator "Options:"

      opts.on("-l", "--language LANG", 
              "set language (defaults to \"Plain Text\")") do |x|
        options.lang = x
      end

      opts.on("-d", "--description DESCRIPTION", 
              "set description (defaults to \"stdin\" or filename)") do |x|
        options.desc = x
      end

      opts.on("-n", "--nick NICK", 
              "set nick (defaults to your username)") do |x|
        options.nick = x
      end

      opts.on("-t", "--txturl",
              "return url for the plain text file") do
        options.txturl = true
      end

      opts.on("-x", "--xcut", 
              "nopaste from X selection (using xclip or xcut)") do
        options.xcut = true 
      end

      opts.on("--debug",
              "enable debug output") do
        options.debug = true
      end

      opts.on_tail("--help", "show this help") do
        puts opts
        exit 
      end

      opts.on_tail("--version", "show version information") do 
        puts "nopaste " + $version
        exit
      end
    end

    opts.parse!(args)
    options
  end
end

def e(s)
  return $zero+" error: "+s
end

def nopaste(nick, desc, text, lang = "Plain Text")
  cxn = Net::HTTP::Proxy($proxy.host, $proxy.port, $proxy_user, $proxy_pass
                        ).start($url.host, $url.port) { |cxn|
    response = cxn.request_post($url.path, 
      [ "cvt_tabs=No",
        "lang=#{CGI::escape(lang)}",
        "nick=#{CGI::escape(nick)}",
        "desc=#{CGI::escape(desc)}",
        "text=#{CGI::escape(text)}" ].join('&'),
      { 'Content-Type' => 'application/x-www-form-urlencoded' })

    if $options.debug
      STDERR.puts response.inspect
      response.each_header {|k,v| STDERR.printf "%s: %s\n", k, v}
      STDERR.puts response.body
    end

    case response
    when Net::HTTPRedirection
      if response['location'] =~ /toofast.html/
        return e("rafb.net says you're pasting too fast.  Try again in 10 seconds")
      else
        u = $url.merge(response['location'])
        u.path = u.path.sub(/html$/, 'txt') if $options.txturl
        return u
      end
    when Net::HTTPSuccess
      # strange
      return e("rafb.net sent an unexpected HTML response")
    else
      return e("rafb.net says #{response.code} #{response.message}")
    end
  }
end

$proxy = URI.parse(ENV['http_proxy'] || '')
$proxy_user, $proxy_pass = nil, nil
$proxy_user, $proxy_pass = $proxy.userinfo.split(/:/) if $proxy.userinfo
$url = URI.parse("http://www.rafb.net/paste/paste.php")
$version = '$Revision: 2835 $'.split(' ')[1]
$zero = $0.sub(/.*\//, '')
$options = CmdLine.parse(ARGV)
urls = []

if $options.desc.to_s.empty?
  if $options.xcut
    $options.desc = 'xcut'
  elsif ARGV.empty?
    $options.desc = 'stdin'
  else
    $options.desc = ARGV[0]
  end
end

if $options.nick.to_s.empty?
  $options.nick = ENV['USER'] || 'unknown'
end

begin
  if $options.xcut
    buf = %x{xclip -o 2>/dev/null || xcut -p 2>/dev/null}
    urls << nopaste($options.nick, $options.desc, buf, $options.lang)
  elsif ARGV.empty?
    urls << nopaste($options.nick, $options.desc, gets(nil), $options.lang)
  end

  urls << nopaste($options.nick, $options.desc, gets(nil), $options.lang) until ARGV.empty?
  begin
    IO.popen("xclip 2>/dev/null", "w") {|p| p.print urls.map {|u| u.to_s}.join(' ') }
  rescue Errno::EPIPE
    begin
      IO.popen("xcut 2>/dev/null", "w") {|p| p.print urls.map {|u| u.to_s}.join(' ') }
    rescue Errno::EPIPE
    end
  end

rescue
  puts urls # whatever we've accumulated already
  puts e("something bad happened, stack trace follows")
  raise
end

puts urls
exit 1 if urls.join("\n") =~ /^(?!http:)/


--- NEW FILE nopaste.spec ---
Name:           nopaste
Version:        2835
Release:        2%{?dist}
Summary:        Command-line interface to rafb.net/paste

Group:          Applications/Internet
License:        GPLv2
URL:            http://n01se.net/agriffis/nopaste
Source0:        http://agriffis.n01se.net/%{name}/%{name}-%{version}
BuildArch:      noarch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)


%description
This is a simple script to facilitate sharing text through 
http://rafb.net/paste/. Like most UNIX utilities, it can take 
stdin or files on the command-line. Additionally nopaste can 
use the X cut buffer for input, designed to be used with a 
window-manager key binding or panel launcher.
The resulting URLs are printed to stdout and additionally 
placed in the X cut buffer for quick pasting. 


%prep
%build
%install
rm -rf %{buildroot}
mkdir -p %{buildroot}%{_bindir}
install -pm755 %{SOURCE0} \
        %{buildroot}%{_bindir}/%{name}


%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%{_bindir}/%{name}


%changelog
* Sat Jan 10 2009 Simon Wesp <cassmodiah at fedoraproject.org> - 2835-2
- Correct License to GPLv2
- Remove doc in files-section

* Sat Nov 29 2008 Philipp Baum <phil at linuxeinsteiger.net> - 2835-1
- Initial Package Release




From cassmodiah at fedoraproject.org  Thu Jan 15 19:11:56 2009
From: cassmodiah at fedoraproject.org (Simon Wesp)
Date: Thu, 15 Jan 2009 19:11:56 +0000 (UTC)
Subject: rpms/nopaste/F-10 import.log, NONE, 1.1 nopaste-2835, NONE,
	1.1 nopaste.spec, NONE, 1.1
Message-ID: <20090115191156.1D3DB7012D@cvs1.fedora.phx.redhat.com>

Author: cassmodiah

Update of /cvs/pkgs/rpms/nopaste/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30098/F-10

Added Files:
	import.log nopaste-2835 nopaste.spec 
Log Message:



--- NEW FILE import.log ---
nopaste-2835-2_fc10:F-10:nopaste-2835-2.fc10.src.rpm:1232046767


--- NEW FILE nopaste-2835 ---
#!/usr/bin/ruby -w
#
# nopaste -- quick script in the spirit of eatpaste, to generate nopaste urls.
# See http://www.rafb.net/paste/ for more information.
#
# Copyright 2005,2007 Aron Griffis <agriffis n01se.net>
# Released under the GNU General Public License v2
#

require 'cgi'
require 'net/http'
require 'optparse'
require 'ostruct'
require 'uri'

class CmdLine
  def self.parse(args)
    options = OpenStruct.new
    options.lang = 'Plain Text'

    opts = OptionParser.new do |opts|
      opts.banner = "Usage: nopaste [options]"
      opts.separator ""
      opts.separator "Options:"

      opts.on("-l", "--language LANG", 
              "set language (defaults to \"Plain Text\")") do |x|
        options.lang = x
      end

      opts.on("-d", "--description DESCRIPTION", 
              "set description (defaults to \"stdin\" or filename)") do |x|
        options.desc = x
      end

      opts.on("-n", "--nick NICK", 
              "set nick (defaults to your username)") do |x|
        options.nick = x
      end

      opts.on("-t", "--txturl",
              "return url for the plain text file") do
        options.txturl = true
      end

      opts.on("-x", "--xcut", 
              "nopaste from X selection (using xclip or xcut)") do
        options.xcut = true 
      end

      opts.on("--debug",
              "enable debug output") do
        options.debug = true
      end

      opts.on_tail("--help", "show this help") do
        puts opts
        exit 
      end

      opts.on_tail("--version", "show version information") do 
        puts "nopaste " + $version
        exit
      end
    end

    opts.parse!(args)
    options
  end
end

def e(s)
  return $zero+" error: "+s
end

def nopaste(nick, desc, text, lang = "Plain Text")
  cxn = Net::HTTP::Proxy($proxy.host, $proxy.port, $proxy_user, $proxy_pass
                        ).start($url.host, $url.port) { |cxn|
    response = cxn.request_post($url.path, 
      [ "cvt_tabs=No",
        "lang=#{CGI::escape(lang)}",
        "nick=#{CGI::escape(nick)}",
        "desc=#{CGI::escape(desc)}",
        "text=#{CGI::escape(text)}" ].join('&'),
      { 'Content-Type' => 'application/x-www-form-urlencoded' })

    if $options.debug
      STDERR.puts response.inspect
      response.each_header {|k,v| STDERR.printf "%s: %s\n", k, v}
      STDERR.puts response.body
    end

    case response
    when Net::HTTPRedirection
      if response['location'] =~ /toofast.html/
        return e("rafb.net says you're pasting too fast.  Try again in 10 seconds")
      else
        u = $url.merge(response['location'])
        u.path = u.path.sub(/html$/, 'txt') if $options.txturl
        return u
      end
    when Net::HTTPSuccess
      # strange
      return e("rafb.net sent an unexpected HTML response")
    else
      return e("rafb.net says #{response.code} #{response.message}")
    end
  }
end

$proxy = URI.parse(ENV['http_proxy'] || '')
$proxy_user, $proxy_pass = nil, nil
$proxy_user, $proxy_pass = $proxy.userinfo.split(/:/) if $proxy.userinfo
$url = URI.parse("http://www.rafb.net/paste/paste.php")
$version = '$Revision: 2835 $'.split(' ')[1]
$zero = $0.sub(/.*\//, '')
$options = CmdLine.parse(ARGV)
urls = []

if $options.desc.to_s.empty?
  if $options.xcut
    $options.desc = 'xcut'
  elsif ARGV.empty?
    $options.desc = 'stdin'
  else
    $options.desc = ARGV[0]
  end
end

if $options.nick.to_s.empty?
  $options.nick = ENV['USER'] || 'unknown'
end

begin
  if $options.xcut
    buf = %x{xclip -o 2>/dev/null || xcut -p 2>/dev/null}
    urls << nopaste($options.nick, $options.desc, buf, $options.lang)
  elsif ARGV.empty?
    urls << nopaste($options.nick, $options.desc, gets(nil), $options.lang)
  end

  urls << nopaste($options.nick, $options.desc, gets(nil), $options.lang) until ARGV.empty?
  begin
    IO.popen("xclip 2>/dev/null", "w") {|p| p.print urls.map {|u| u.to_s}.join(' ') }
  rescue Errno::EPIPE
    begin
      IO.popen("xcut 2>/dev/null", "w") {|p| p.print urls.map {|u| u.to_s}.join(' ') }
    rescue Errno::EPIPE
    end
  end

rescue
  puts urls # whatever we've accumulated already
  puts e("something bad happened, stack trace follows")
  raise
end

puts urls
exit 1 if urls.join("\n") =~ /^(?!http:)/


--- NEW FILE nopaste.spec ---
Name:           nopaste
Version:        2835
Release:        2%{?dist}
Summary:        Command-line interface to rafb.net/paste

Group:          Applications/Internet
License:        GPLv2
URL:            http://n01se.net/agriffis/nopaste
Source0:        http://agriffis.n01se.net/%{name}/%{name}-%{version}
BuildArch:      noarch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)


%description
This is a simple script to facilitate sharing text through 
http://rafb.net/paste/. Like most UNIX utilities, it can take 
stdin or files on the command-line. Additionally nopaste can 
use the X cut buffer for input, designed to be used with a 
window-manager key binding or panel launcher.
The resulting URLs are printed to stdout and additionally 
placed in the X cut buffer for quick pasting. 


%prep
%build
%install
rm -rf %{buildroot}
mkdir -p %{buildroot}%{_bindir}
install -pm755 %{SOURCE0} \
        %{buildroot}%{_bindir}/%{name}


%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%{_bindir}/%{name}


%changelog
* Sat Jan 10 2009 Simon Wesp <cassmodiah at fedoraproject.org> - 2835-2
- Correct License to GPLv2
- Remove doc in files-section

* Sat Nov 29 2008 Philipp Baum <phil at linuxeinsteiger.net> - 2835-1
- Initial Package Release




From cassmodiah at fedoraproject.org  Thu Jan 15 19:13:40 2009
From: cassmodiah at fedoraproject.org (Simon Wesp)
Date: Thu, 15 Jan 2009 19:13:40 +0000 (UTC)
Subject: rpms/nopaste/F-9 import.log, NONE, 1.1 nopaste-2835, NONE,
	1.1 nopaste.spec, NONE, 1.1
Message-ID: <20090115191340.7069D7012D@cvs1.fedora.phx.redhat.com>

Author: cassmodiah

Update of /cvs/pkgs/rpms/nopaste/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30442/F-9

Added Files:
	import.log nopaste-2835 nopaste.spec 
Log Message:



--- NEW FILE import.log ---
nopaste-2835-2_fc10:F-9:nopaste-2835-2.fc10.src.rpm:1232046837


--- NEW FILE nopaste-2835 ---
#!/usr/bin/ruby -w
#
# nopaste -- quick script in the spirit of eatpaste, to generate nopaste urls.
# See http://www.rafb.net/paste/ for more information.
#
# Copyright 2005,2007 Aron Griffis <agriffis n01se.net>
# Released under the GNU General Public License v2
#

require 'cgi'
require 'net/http'
require 'optparse'
require 'ostruct'
require 'uri'

class CmdLine
  def self.parse(args)
    options = OpenStruct.new
    options.lang = 'Plain Text'

    opts = OptionParser.new do |opts|
      opts.banner = "Usage: nopaste [options]"
      opts.separator ""
      opts.separator "Options:"

      opts.on("-l", "--language LANG", 
              "set language (defaults to \"Plain Text\")") do |x|
        options.lang = x
      end

      opts.on("-d", "--description DESCRIPTION", 
              "set description (defaults to \"stdin\" or filename)") do |x|
        options.desc = x
      end

      opts.on("-n", "--nick NICK", 
              "set nick (defaults to your username)") do |x|
        options.nick = x
      end

      opts.on("-t", "--txturl",
              "return url for the plain text file") do
        options.txturl = true
      end

      opts.on("-x", "--xcut", 
              "nopaste from X selection (using xclip or xcut)") do
        options.xcut = true 
      end

      opts.on("--debug",
              "enable debug output") do
        options.debug = true
      end

      opts.on_tail("--help", "show this help") do
        puts opts
        exit 
      end

      opts.on_tail("--version", "show version information") do 
        puts "nopaste " + $version
        exit
      end
    end

    opts.parse!(args)
    options
  end
end

def e(s)
  return $zero+" error: "+s
end

def nopaste(nick, desc, text, lang = "Plain Text")
  cxn = Net::HTTP::Proxy($proxy.host, $proxy.port, $proxy_user, $proxy_pass
                        ).start($url.host, $url.port) { |cxn|
    response = cxn.request_post($url.path, 
      [ "cvt_tabs=No",
        "lang=#{CGI::escape(lang)}",
        "nick=#{CGI::escape(nick)}",
        "desc=#{CGI::escape(desc)}",
        "text=#{CGI::escape(text)}" ].join('&'),
      { 'Content-Type' => 'application/x-www-form-urlencoded' })

    if $options.debug
      STDERR.puts response.inspect
      response.each_header {|k,v| STDERR.printf "%s: %s\n", k, v}
      STDERR.puts response.body
    end

    case response
    when Net::HTTPRedirection
      if response['location'] =~ /toofast.html/
        return e("rafb.net says you're pasting too fast.  Try again in 10 seconds")
      else
        u = $url.merge(response['location'])
        u.path = u.path.sub(/html$/, 'txt') if $options.txturl
        return u
      end
    when Net::HTTPSuccess
      # strange
      return e("rafb.net sent an unexpected HTML response")
    else
      return e("rafb.net says #{response.code} #{response.message}")
    end
  }
end

$proxy = URI.parse(ENV['http_proxy'] || '')
$proxy_user, $proxy_pass = nil, nil
$proxy_user, $proxy_pass = $proxy.userinfo.split(/:/) if $proxy.userinfo
$url = URI.parse("http://www.rafb.net/paste/paste.php")
$version = '$Revision: 2835 $'.split(' ')[1]
$zero = $0.sub(/.*\//, '')
$options = CmdLine.parse(ARGV)
urls = []

if $options.desc.to_s.empty?
  if $options.xcut
    $options.desc = 'xcut'
  elsif ARGV.empty?
    $options.desc = 'stdin'
  else
    $options.desc = ARGV[0]
  end
end

if $options.nick.to_s.empty?
  $options.nick = ENV['USER'] || 'unknown'
end

begin
  if $options.xcut
    buf = %x{xclip -o 2>/dev/null || xcut -p 2>/dev/null}
    urls << nopaste($options.nick, $options.desc, buf, $options.lang)
  elsif ARGV.empty?
    urls << nopaste($options.nick, $options.desc, gets(nil), $options.lang)
  end

  urls << nopaste($options.nick, $options.desc, gets(nil), $options.lang) until ARGV.empty?
  begin
    IO.popen("xclip 2>/dev/null", "w") {|p| p.print urls.map {|u| u.to_s}.join(' ') }
  rescue Errno::EPIPE
    begin
      IO.popen("xcut 2>/dev/null", "w") {|p| p.print urls.map {|u| u.to_s}.join(' ') }
    rescue Errno::EPIPE
    end
  end

rescue
  puts urls # whatever we've accumulated already
  puts e("something bad happened, stack trace follows")
  raise
end

puts urls
exit 1 if urls.join("\n") =~ /^(?!http:)/


--- NEW FILE nopaste.spec ---
Name:           nopaste
Version:        2835
Release:        2%{?dist}
Summary:        Command-line interface to rafb.net/paste

Group:          Applications/Internet
License:        GPLv2
URL:            http://n01se.net/agriffis/nopaste
Source0:        http://agriffis.n01se.net/%{name}/%{name}-%{version}
BuildArch:      noarch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)


%description
This is a simple script to facilitate sharing text through 
http://rafb.net/paste/. Like most UNIX utilities, it can take 
stdin or files on the command-line. Additionally nopaste can 
use the X cut buffer for input, designed to be used with a 
window-manager key binding or panel launcher.
The resulting URLs are printed to stdout and additionally 
placed in the X cut buffer for quick pasting. 


%prep
%build
%install
rm -rf %{buildroot}
mkdir -p %{buildroot}%{_bindir}
install -pm755 %{SOURCE0} \
        %{buildroot}%{_bindir}/%{name}


%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%{_bindir}/%{name}


%changelog
* Sat Jan 10 2009 Simon Wesp <cassmodiah at fedoraproject.org> - 2835-2
- Correct License to GPLv2
- Remove doc in files-section

* Sat Nov 29 2008 Philipp Baum <phil at linuxeinsteiger.net> - 2835-1
- Initial Package Release




From spot at fedoraproject.org  Thu Jan 15 19:14:45 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Thu, 15 Jan 2009 19:14:45 +0000 (UTC)
Subject: rpms/silkscreen-fonts/devel
	silkscreen-fonts-expanded-fontconfig.conf, 
	NONE, 1.1 silkscreen-fonts-fontconfig.conf, NONE,
	1.1 silkscreen-fonts.spec, 1.1, 1.2
Message-ID: <20090115191445.A68F57012D@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/silkscreen-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30655

Modified Files:
	silkscreen-fonts.spec 
Added Files:
	silkscreen-fonts-expanded-fontconfig.conf 
	silkscreen-fonts-fontconfig.conf 
Log Message:
compliance with new font packaging guidelines


--- NEW FILE silkscreen-fonts-expanded-fontconfig.conf ---
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
<fontconfig>
  <alias>
    <family>sans-serif</family>
    <prefer>
      <family>Silkscreen Expanded</family>
    </prefer>
  </alias>
  <alias>
    <family>Silkscreen Expanded</family>
    <default>
      <family>sans-serif</family>
    </default>
  </alias>
</fontconfig>



--- NEW FILE silkscreen-fonts-fontconfig.conf ---
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
<fontconfig>
  <alias>
    <family>sans-serif</family>
    <prefer>
      <family>Silkscreen</family>
    </prefer>
  </alias>
  <alias>
    <family>Silkscreen</family>
    <default>
      <family>sans-serif</family>
    </default>
  </alias>
</fontconfig>



Index: silkscreen-fonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/silkscreen-fonts/devel/silkscreen-fonts.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- silkscreen-fonts.spec	28 Jan 2008 17:37:42 -0000	1.1
+++ silkscreen-fonts.spec	15 Jan 2009 19:14:15 -0000	1.2
@@ -1,27 +1,56 @@
 %define fontname silkscreen
-%define fontdir %{_datadir}/fonts/%{fontname}
-%define fontconfdir %{_sysconfdir}/fonts/conf.d
+%define fontconf 60-%{fontname}
+
+%define common_desc \
+Silkscreen is a four member type family for your Web graphics created by Jason \
+Kottke. Silkscreen is best used in places where extremely small graphical \
+display type is needed. The primary use is for navigational items (nav bars, \
+menus, etc), but it works well wherever small type is needed. In order to \
+preserve the proper spacing and letterforms, Silkscreen should be used at 8pt. \
+multiples (8pt., 16pt., 24pt., etc.) with anti-aliasing turned off. \
 
 Name:		%{fontname}-fonts
 Summary: 	Silkscreen four member type family
 Version:	1.0
-Release:	1%{?dist}
+Release:	2%{?dist}
 # License attribution confirmed by author and Open Font Library
 # http://openfontlibrary.org/media/files/jkottke/218
 License:	OFL
 Group:		User Interface/X
 Source0:	http://www.kottke.org/plus/type/silkscreen/download/silkscreen.tar.gz
+Source1:	%{name}-fontconfig.conf
+Source2:	%{name}-expanded-fontconfig.conf
 URL:		http://www.kottke.org/plus/type/silkscreen/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:	noarch
+BuildRequires:	fontpackages-devel
+Requires:	%{name}-common = %{version}-%{release}
 
 %description
-Silkscreen is a four member type family for your Web graphics created by Jason 
-Kottke. Silkscreen is best used in places where extremely small graphical 
-display type is needed. The primary use is for navigational items (nav bars, 
-menus, etc), but it works well wherever small type is needed. In order to 
-preserve the proper spacing and letterforms, Silkscreen should be used at 8pt. 
-multiples (8pt., 16pt., 24pt., etc.) with anti-aliasing turned off.
+%common_desc
+
+%package common
+Summary:	Common files for Silkscreen fonts (documentation...)
+Group:		User Interface/X
+Requires:	fontpackages-filesystem
+
+%description common
+%common_desc
+
+This package consists of files used by other Silkscreen packages.
+
+%package -n %{fontname}-expanded-fonts
+Summary:	Expanded Silkscreen font family
+Group:		User Interface/X
+Requires:	%{name}-common = %{version}-%{release}
+
+%description -n %{fontname}-expanded-fonts
+%common_desc
+
+This font family has a slightly expanded spacing between the letters in 
+comparison to the normal Silkscreen font family.
+
+%_font_pkg -n expanded -f %{fontconf}-expanded.conf slkscre*.ttf
 
 %prep
 %setup -q -c -n %{name}
@@ -29,31 +58,30 @@
 %build
 
 %install
-rm -rf $RPM_BUILD_ROOT
-install -m 0755 -d $RPM_BUILD_ROOT%{fontdir}
-install -m 0644 -p *.ttf $RPM_BUILD_ROOT%{fontdir}
+rm -rf %{buildroot}
+install -m 0755 -d %{buildroot}%{_fontdir}
+install -m 0644 -p *.ttf %{buildroot}%{_fontdir}
+install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} %{buildroot}%{_fontconfig_confdir}
+install -m 0644 -p %{SOURCE1} %{buildroot}%{_fontconfig_templatedir}/%{fontconf}.conf
+install -m 0644 -p %{SOURCE2} %{buildroot}%{_fontconfig_templatedir}/%{fontconf}-expanded.conf
+
+for fontconf in %{fontconf}.conf %{fontconf}-expanded.conf ; do
+	ln -s %{_fontconfig_templatedir}/$fontconf %{buildroot}%{_fontconfig_confdir}/$fontconf
+done
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
-%post
-if [ -x %{_bindir}/fc-cache ]; then
-	%{_bindir}/fc-cache -f %{fontdir} || :
-fi
-
-%postun
-if [ "$1" = "0" ]; then
-	if [ -x %{_bindir}/fc-cache ]; then
-		%{_bindir}/fc-cache -f %{fontdir} || :
-	fi
-fi
+%_font_pkg -f %{fontconf}.conf slkscr.ttf slkscrb.ttf
 
-%files
+%files common
 %defattr(0644,root,root,0755)
 %doc readme.txt
-%dir %{fontdir}
-%{fontdir}/*.ttf 
+%dir %{_fontdir}
 
 %changelog
+* Thu Jan 15 2009 Tom "spot" Callaway <tcallawa at redhat.com> 1.0-2
+- rework package for new font guidelines
+
 * Tue Dec 11 2007 Tom "spot" Callaway <tcallawa at redhat.com> 1.0-1
 - Initial package for Fedora



From cassmodiah at fedoraproject.org  Thu Jan 15 19:15:08 2009
From: cassmodiah at fedoraproject.org (Simon Wesp)
Date: Thu, 15 Jan 2009 19:15:08 +0000 (UTC)
Subject: rpms/nopaste/EL-4 import.log, NONE, 1.1 nopaste-2835, NONE,
	1.1 nopaste.spec, NONE, 1.1
Message-ID: <20090115191508.CAA857012D@cvs1.fedora.phx.redhat.com>

Author: cassmodiah

Update of /cvs/pkgs/rpms/nopaste/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30863/EL-4

Added Files:
	import.log nopaste-2835 nopaste.spec 
Log Message:



--- NEW FILE import.log ---
nopaste-2835-2_fc10:EL-4:nopaste-2835-2.fc10.src.rpm:1232046952


--- NEW FILE nopaste-2835 ---
#!/usr/bin/ruby -w
#
# nopaste -- quick script in the spirit of eatpaste, to generate nopaste urls.
# See http://www.rafb.net/paste/ for more information.
#
# Copyright 2005,2007 Aron Griffis <agriffis n01se.net>
# Released under the GNU General Public License v2
#

require 'cgi'
require 'net/http'
require 'optparse'
require 'ostruct'
require 'uri'

class CmdLine
  def self.parse(args)
    options = OpenStruct.new
    options.lang = 'Plain Text'

    opts = OptionParser.new do |opts|
      opts.banner = "Usage: nopaste [options]"
      opts.separator ""
      opts.separator "Options:"

      opts.on("-l", "--language LANG", 
              "set language (defaults to \"Plain Text\")") do |x|
        options.lang = x
      end

      opts.on("-d", "--description DESCRIPTION", 
              "set description (defaults to \"stdin\" or filename)") do |x|
        options.desc = x
      end

      opts.on("-n", "--nick NICK", 
              "set nick (defaults to your username)") do |x|
        options.nick = x
      end

      opts.on("-t", "--txturl",
              "return url for the plain text file") do
        options.txturl = true
      end

      opts.on("-x", "--xcut", 
              "nopaste from X selection (using xclip or xcut)") do
        options.xcut = true 
      end

      opts.on("--debug",
              "enable debug output") do
        options.debug = true
      end

      opts.on_tail("--help", "show this help") do
        puts opts
        exit 
      end

      opts.on_tail("--version", "show version information") do 
        puts "nopaste " + $version
        exit
      end
    end

    opts.parse!(args)
    options
  end
end

def e(s)
  return $zero+" error: "+s
end

def nopaste(nick, desc, text, lang = "Plain Text")
  cxn = Net::HTTP::Proxy($proxy.host, $proxy.port, $proxy_user, $proxy_pass
                        ).start($url.host, $url.port) { |cxn|
    response = cxn.request_post($url.path, 
      [ "cvt_tabs=No",
        "lang=#{CGI::escape(lang)}",
        "nick=#{CGI::escape(nick)}",
        "desc=#{CGI::escape(desc)}",
        "text=#{CGI::escape(text)}" ].join('&'),
      { 'Content-Type' => 'application/x-www-form-urlencoded' })

    if $options.debug
      STDERR.puts response.inspect
      response.each_header {|k,v| STDERR.printf "%s: %s\n", k, v}
      STDERR.puts response.body
    end

    case response
    when Net::HTTPRedirection
      if response['location'] =~ /toofast.html/
        return e("rafb.net says you're pasting too fast.  Try again in 10 seconds")
      else
        u = $url.merge(response['location'])
        u.path = u.path.sub(/html$/, 'txt') if $options.txturl
        return u
      end
    when Net::HTTPSuccess
      # strange
      return e("rafb.net sent an unexpected HTML response")
    else
      return e("rafb.net says #{response.code} #{response.message}")
    end
  }
end

$proxy = URI.parse(ENV['http_proxy'] || '')
$proxy_user, $proxy_pass = nil, nil
$proxy_user, $proxy_pass = $proxy.userinfo.split(/:/) if $proxy.userinfo
$url = URI.parse("http://www.rafb.net/paste/paste.php")
$version = '$Revision: 2835 $'.split(' ')[1]
$zero = $0.sub(/.*\//, '')
$options = CmdLine.parse(ARGV)
urls = []

if $options.desc.to_s.empty?
  if $options.xcut
    $options.desc = 'xcut'
  elsif ARGV.empty?
    $options.desc = 'stdin'
  else
    $options.desc = ARGV[0]
  end
end

if $options.nick.to_s.empty?
  $options.nick = ENV['USER'] || 'unknown'
end

begin
  if $options.xcut
    buf = %x{xclip -o 2>/dev/null || xcut -p 2>/dev/null}
    urls << nopaste($options.nick, $options.desc, buf, $options.lang)
  elsif ARGV.empty?
    urls << nopaste($options.nick, $options.desc, gets(nil), $options.lang)
  end

  urls << nopaste($options.nick, $options.desc, gets(nil), $options.lang) until ARGV.empty?
  begin
    IO.popen("xclip 2>/dev/null", "w") {|p| p.print urls.map {|u| u.to_s}.join(' ') }
  rescue Errno::EPIPE
    begin
      IO.popen("xcut 2>/dev/null", "w") {|p| p.print urls.map {|u| u.to_s}.join(' ') }
    rescue Errno::EPIPE
    end
  end

rescue
  puts urls # whatever we've accumulated already
  puts e("something bad happened, stack trace follows")
  raise
end

puts urls
exit 1 if urls.join("\n") =~ /^(?!http:)/


--- NEW FILE nopaste.spec ---
Name:           nopaste
Version:        2835
Release:        2%{?dist}
Summary:        Command-line interface to rafb.net/paste

Group:          Applications/Internet
License:        GPLv2
URL:            http://n01se.net/agriffis/nopaste
Source0:        http://agriffis.n01se.net/%{name}/%{name}-%{version}
BuildArch:      noarch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)


%description
This is a simple script to facilitate sharing text through 
http://rafb.net/paste/. Like most UNIX utilities, it can take 
stdin or files on the command-line. Additionally nopaste can 
use the X cut buffer for input, designed to be used with a 
window-manager key binding or panel launcher.
The resulting URLs are printed to stdout and additionally 
placed in the X cut buffer for quick pasting. 


%prep
%build
%install
rm -rf %{buildroot}
mkdir -p %{buildroot}%{_bindir}
install -pm755 %{SOURCE0} \
        %{buildroot}%{_bindir}/%{name}


%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%{_bindir}/%{name}


%changelog
* Sat Jan 10 2009 Simon Wesp <cassmodiah at fedoraproject.org> - 2835-2
- Correct License to GPLv2
- Remove doc in files-section

* Sat Nov 29 2008 Philipp Baum <phil at linuxeinsteiger.net> - 2835-1
- Initial Package Release




From cassmodiah at fedoraproject.org  Thu Jan 15 19:17:10 2009
From: cassmodiah at fedoraproject.org (Simon Wesp)
Date: Thu, 15 Jan 2009 19:17:10 +0000 (UTC)
Subject: rpms/nopaste/EL-5 import.log, NONE, 1.1 nopaste-2835, NONE,
	1.1 nopaste.spec, NONE, 1.1
Message-ID: <20090115191710.1B3B97012D@cvs1.fedora.phx.redhat.com>

Author: cassmodiah

Update of /cvs/pkgs/rpms/nopaste/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31280/EL-5

Added Files:
	import.log nopaste-2835 nopaste.spec 
Log Message:



--- NEW FILE import.log ---
nopaste-2835-2_fc10:EL-5:nopaste-2835-2.fc10.src.rpm:1232047030


--- NEW FILE nopaste-2835 ---
#!/usr/bin/ruby -w
#
# nopaste -- quick script in the spirit of eatpaste, to generate nopaste urls.
# See http://www.rafb.net/paste/ for more information.
#
# Copyright 2005,2007 Aron Griffis <agriffis n01se.net>
# Released under the GNU General Public License v2
#

require 'cgi'
require 'net/http'
require 'optparse'
require 'ostruct'
require 'uri'

class CmdLine
  def self.parse(args)
    options = OpenStruct.new
    options.lang = 'Plain Text'

    opts = OptionParser.new do |opts|
      opts.banner = "Usage: nopaste [options]"
      opts.separator ""
      opts.separator "Options:"

      opts.on("-l", "--language LANG", 
              "set language (defaults to \"Plain Text\")") do |x|
        options.lang = x
      end

      opts.on("-d", "--description DESCRIPTION", 
              "set description (defaults to \"stdin\" or filename)") do |x|
        options.desc = x
      end

      opts.on("-n", "--nick NICK", 
              "set nick (defaults to your username)") do |x|
        options.nick = x
      end

      opts.on("-t", "--txturl",
              "return url for the plain text file") do
        options.txturl = true
      end

      opts.on("-x", "--xcut", 
              "nopaste from X selection (using xclip or xcut)") do
        options.xcut = true 
      end

      opts.on("--debug",
              "enable debug output") do
        options.debug = true
      end

      opts.on_tail("--help", "show this help") do
        puts opts
        exit 
      end

      opts.on_tail("--version", "show version information") do 
        puts "nopaste " + $version
        exit
      end
    end

    opts.parse!(args)
    options
  end
end

def e(s)
  return $zero+" error: "+s
end

def nopaste(nick, desc, text, lang = "Plain Text")
  cxn = Net::HTTP::Proxy($proxy.host, $proxy.port, $proxy_user, $proxy_pass
                        ).start($url.host, $url.port) { |cxn|
    response = cxn.request_post($url.path, 
      [ "cvt_tabs=No",
        "lang=#{CGI::escape(lang)}",
        "nick=#{CGI::escape(nick)}",
        "desc=#{CGI::escape(desc)}",
        "text=#{CGI::escape(text)}" ].join('&'),
      { 'Content-Type' => 'application/x-www-form-urlencoded' })

    if $options.debug
      STDERR.puts response.inspect
      response.each_header {|k,v| STDERR.printf "%s: %s\n", k, v}
      STDERR.puts response.body
    end

    case response
    when Net::HTTPRedirection
      if response['location'] =~ /toofast.html/
        return e("rafb.net says you're pasting too fast.  Try again in 10 seconds")
      else
        u = $url.merge(response['location'])
        u.path = u.path.sub(/html$/, 'txt') if $options.txturl
        return u
      end
    when Net::HTTPSuccess
      # strange
      return e("rafb.net sent an unexpected HTML response")
    else
      return e("rafb.net says #{response.code} #{response.message}")
    end
  }
end

$proxy = URI.parse(ENV['http_proxy'] || '')
$proxy_user, $proxy_pass = nil, nil
$proxy_user, $proxy_pass = $proxy.userinfo.split(/:/) if $proxy.userinfo
$url = URI.parse("http://www.rafb.net/paste/paste.php")
$version = '$Revision: 2835 $'.split(' ')[1]
$zero = $0.sub(/.*\//, '')
$options = CmdLine.parse(ARGV)
urls = []

if $options.desc.to_s.empty?
  if $options.xcut
    $options.desc = 'xcut'
  elsif ARGV.empty?
    $options.desc = 'stdin'
  else
    $options.desc = ARGV[0]
  end
end

if $options.nick.to_s.empty?
  $options.nick = ENV['USER'] || 'unknown'
end

begin
  if $options.xcut
    buf = %x{xclip -o 2>/dev/null || xcut -p 2>/dev/null}
    urls << nopaste($options.nick, $options.desc, buf, $options.lang)
  elsif ARGV.empty?
    urls << nopaste($options.nick, $options.desc, gets(nil), $options.lang)
  end

  urls << nopaste($options.nick, $options.desc, gets(nil), $options.lang) until ARGV.empty?
  begin
    IO.popen("xclip 2>/dev/null", "w") {|p| p.print urls.map {|u| u.to_s}.join(' ') }
  rescue Errno::EPIPE
    begin
      IO.popen("xcut 2>/dev/null", "w") {|p| p.print urls.map {|u| u.to_s}.join(' ') }
    rescue Errno::EPIPE
    end
  end

rescue
  puts urls # whatever we've accumulated already
  puts e("something bad happened, stack trace follows")
  raise
end

puts urls
exit 1 if urls.join("\n") =~ /^(?!http:)/


--- NEW FILE nopaste.spec ---
Name:           nopaste
Version:        2835
Release:        2%{?dist}
Summary:        Command-line interface to rafb.net/paste

Group:          Applications/Internet
License:        GPLv2
URL:            http://n01se.net/agriffis/nopaste
Source0:        http://agriffis.n01se.net/%{name}/%{name}-%{version}
BuildArch:      noarch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)


%description
This is a simple script to facilitate sharing text through 
http://rafb.net/paste/. Like most UNIX utilities, it can take 
stdin or files on the command-line. Additionally nopaste can 
use the X cut buffer for input, designed to be used with a 
window-manager key binding or panel launcher.
The resulting URLs are printed to stdout and additionally 
placed in the X cut buffer for quick pasting. 


%prep
%build
%install
rm -rf %{buildroot}
mkdir -p %{buildroot}%{_bindir}
install -pm755 %{SOURCE0} \
        %{buildroot}%{_bindir}/%{name}


%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%{_bindir}/%{name}


%changelog
* Sat Jan 10 2009 Simon Wesp <cassmodiah at fedoraproject.org> - 2835-2
- Correct License to GPLv2
- Remove doc in files-section

* Sat Nov 29 2008 Philipp Baum <phil at linuxeinsteiger.net> - 2835-1
- Initial Package Release




From tmraz at fedoraproject.org  Thu Jan 15 19:21:42 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Thu, 15 Jan 2009 19:21:42 +0000 (UTC)
Subject: rpms/cpqarrayd/devel cpqarrayd.spec,1.5,1.6
Message-ID: <20090115192142.B83127012D@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/cpqarrayd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31971

Modified Files:
	cpqarrayd.spec 
Log Message:
* Thu Jan 15 2009 Tomas Mraz <tmraz at redhat.com> - 2.3-8
- rebuild with new openssl



Index: cpqarrayd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cpqarrayd/devel/cpqarrayd.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- cpqarrayd.spec	24 Nov 2008 12:31:09 -0000	1.5
+++ cpqarrayd.spec	15 Jan 2009 19:21:12 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           cpqarrayd
 Version:        2.3        
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Software for monitoring HP(Compaq) arraycontrollers
 Group:          System Environment/Base
 License:        GPLv2+
@@ -70,6 +70,9 @@
 %doc %_mandir/man1/cpqarrayd*
 
 %changelog
+* Thu Jan 15 2009 Tomas Mraz <tmraz at redhat.com> - 2.3-8
+- rebuild with new openssl
+
 * Mon Nov 24 2008 David Juran <djuran at redhat.com> - 2.3-7
 - Summary updated
 



From tmraz at fedoraproject.org  Thu Jan 15 19:22:43 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Thu, 15 Jan 2009 19:22:43 +0000 (UTC)
Subject: rpms/ctorrent/devel ctorrent.spec,1.8,1.9
Message-ID: <20090115192243.724C27012D@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/ctorrent/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32189

Modified Files:
	ctorrent.spec 
Log Message:
* Thu Jan 15 2009 Tomas Mraz <tmraz at redhat.com> - 1.3.4-7.dnh3.2
- rebuild with new openssl



Index: ctorrent.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ctorrent/devel/ctorrent.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ctorrent.spec	19 Feb 2008 20:35:24 -0000	1.8
+++ ctorrent.spec	15 Jan 2009 19:22:13 -0000	1.9
@@ -2,7 +2,7 @@
 
 Name: ctorrent
 Version: 1.3.4
-Release: 6.%{dnh}%{?dist}
+Release: 7.%{dnh}%{?dist}
 Summary: BitTorrent Client written in C
 Group: Applications/Internet
 License: GPLv2+
@@ -35,6 +35,9 @@
 %doc AUTHORS COPYING ChangeLog NEWS README README-DNH.TXT UserGuide
 
 %changelog
+* Thu Jan 15 2009 Tomas Mraz <tmraz at redhat.com> - 1.3.4-7.dnh3.2
+- rebuild with new openssl
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1.3.4-6.dnh3.2
 - Autorebuild for GCC 4.3
 



From pkgdb at fedoraproject.org  Thu Jan 15 19:36:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 15 Jan 2009 19:36:10 +0000
Subject: [pkgdb] NetworkManager-pptp: sinisad has requested watchbugzilla
Message-ID: <20090115193610.BF98F2082B9@bastion.fedora.phx.redhat.com>

sinisad has requested the watchbugzilla acl on NetworkManager-pptp (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/NetworkManager-pptp



From pkgdb at fedoraproject.org  Thu Jan 15 19:36:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 15 Jan 2009 19:36:12 +0000
Subject: [pkgdb] NetworkManager-pptp: sinisad has requested watchcommits
Message-ID: <20090115193612.4F568208468@bastion.fedora.phx.redhat.com>

sinisad has requested the watchcommits acl on NetworkManager-pptp (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/NetworkManager-pptp



From eponyme at fedoraproject.org  Thu Jan 15 19:36:12 2009
From: eponyme at fedoraproject.org (Nicoleau Fabien)
Date: Thu, 15 Jan 2009 19:36:12 +0000 (UTC)
Subject: rpms/perl-WWW-Curl/devel import.log, NONE, 1.1 perl-WWW-Curl.spec, 
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090115193612.39FD97012D@cvs1.fedora.phx.redhat.com>

Author: eponyme

Update of /cvs/pkgs/rpms/perl-WWW-Curl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1294/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-WWW-Curl.spec 
Log Message:
New package



--- NEW FILE import.log ---
perl-WWW-Curl-4_05-4_fc10:HEAD:perl-WWW-Curl-4.05-4.fc10.src.rpm:1232048116


--- NEW FILE perl-WWW-Curl.spec ---
Name:           perl-WWW-Curl
Version:        4.05
Release:        4%{?dist}
Summary:        Perl extension interface for libcurl
License:        MPLv1.1 or MIT
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/WWW-Curl/
Source0:        http://www.cpan.org/authors/id/S/SZ/SZBALINT/WWW-Curl-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  perl >= 1:5.6.1
BuildRequires:  perl(ExtUtils::MakeMaker)
BuildRequires:  perl(Test::Base)
BuildRequires:  libcurl-devel
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
WWW::Curl is a Perl extension interface for libcurl.

%prep
%setup -q -n WWW-Curl-%{version}


%build
%{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS"
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT

make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT

find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
find $RPM_BUILD_ROOT -type f -name '*.bs' -size 0 -exec rm -f {} \;
find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;

%{_fixperms} $RPM_BUILD_ROOT/*

%check
# These tests require network
%{?!_with_network_tests: rm t/01basic.t }
%{?!_with_network_tests: rm t/02callbacks.t }
%{?!_with_network_tests: rm t/04abort-test.t }
%{?!_with_network_tests: rm t/05progress.t }
%{?!_with_network_tests: rm t/09times.t }
%{?!_with_network_tests: rm t/14duphandle.t }
%{?!_with_network_tests: rm t/15duphandle-callback.t }
%{?!_with_network_tests: rm t/18twinhandles.t }
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Changes LICENSE README
%{perl_vendorarch}/auto/*
%{perl_vendorarch}/WWW*
%{_mandir}/man3/*

%changelog
* Wed Jan 14 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> - 4.05-4
- Licence update
* Wed Jan 14 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> - 4.05-3
- README.Win32 file removed
* Wed Jan 14 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> - 4.05-2
- Timestamp preserved
- changelog format fix
- README.Win32 file removed
* Thu Dec 11 2008 Nicoleau Fabien <nicoleau.fabien at gmail.com> - 4.05-1
- Initial build with cpan2spec


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-WWW-Curl/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	14 Jan 2009 21:17:46 -0000	1.1
+++ .cvsignore	15 Jan 2009 19:35:41 -0000	1.2
@@ -0,0 +1 @@
+WWW-Curl-4.05.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-WWW-Curl/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	14 Jan 2009 21:17:46 -0000	1.1
+++ sources	15 Jan 2009 19:35:41 -0000	1.2
@@ -0,0 +1 @@
+a49d09edc7491d9d8abec3ef79799853  WWW-Curl-4.05.tar.gz



From eponyme at fedoraproject.org  Thu Jan 15 19:39:29 2009
From: eponyme at fedoraproject.org (Nicoleau Fabien)
Date: Thu, 15 Jan 2009 19:39:29 +0000 (UTC)
Subject: rpms/perl-WWW-Curl/F-10 import.log, NONE, 1.1 perl-WWW-Curl.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090115193929.223807012D@cvs1.fedora.phx.redhat.com>

Author: eponyme

Update of /cvs/pkgs/rpms/perl-WWW-Curl/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1819/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-WWW-Curl.spec 
Log Message:
New package



--- NEW FILE import.log ---
perl-WWW-Curl-4_05-4_fc10:F-10:perl-WWW-Curl-4.05-4.fc10.src.rpm:1232048225


--- NEW FILE perl-WWW-Curl.spec ---
Name:           perl-WWW-Curl
Version:        4.05
Release:        4%{?dist}
Summary:        Perl extension interface for libcurl
License:        MPLv1.1 or MIT
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/WWW-Curl/
Source0:        http://www.cpan.org/authors/id/S/SZ/SZBALINT/WWW-Curl-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  perl >= 1:5.6.1
BuildRequires:  perl(ExtUtils::MakeMaker)
BuildRequires:  perl(Test::Base)
BuildRequires:  libcurl-devel
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
WWW::Curl is a Perl extension interface for libcurl.

%prep
%setup -q -n WWW-Curl-%{version}


%build
%{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS"
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT

make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT

find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
find $RPM_BUILD_ROOT -type f -name '*.bs' -size 0 -exec rm -f {} \;
find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;

%{_fixperms} $RPM_BUILD_ROOT/*

%check
# These tests require network
%{?!_with_network_tests: rm t/01basic.t }
%{?!_with_network_tests: rm t/02callbacks.t }
%{?!_with_network_tests: rm t/04abort-test.t }
%{?!_with_network_tests: rm t/05progress.t }
%{?!_with_network_tests: rm t/09times.t }
%{?!_with_network_tests: rm t/14duphandle.t }
%{?!_with_network_tests: rm t/15duphandle-callback.t }
%{?!_with_network_tests: rm t/18twinhandles.t }
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Changes LICENSE README
%{perl_vendorarch}/auto/*
%{perl_vendorarch}/WWW*
%{_mandir}/man3/*

%changelog
* Wed Jan 14 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> - 4.05-4
- Licence update
* Wed Jan 14 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> - 4.05-3
- README.Win32 file removed
* Wed Jan 14 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> - 4.05-2
- Timestamp preserved
- changelog format fix
- README.Win32 file removed
* Thu Dec 11 2008 Nicoleau Fabien <nicoleau.fabien at gmail.com> - 4.05-1
- Initial build with cpan2spec


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-WWW-Curl/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	14 Jan 2009 21:17:46 -0000	1.1
+++ .cvsignore	15 Jan 2009 19:38:58 -0000	1.2
@@ -0,0 +1 @@
+WWW-Curl-4.05.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-WWW-Curl/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	14 Jan 2009 21:17:46 -0000	1.1
+++ sources	15 Jan 2009 19:38:58 -0000	1.2
@@ -0,0 +1 @@
+a49d09edc7491d9d8abec3ef79799853  WWW-Curl-4.05.tar.gz



From tmraz at fedoraproject.org  Thu Jan 15 19:40:20 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Thu, 15 Jan 2009 19:40:20 +0000 (UTC)
Subject: rpms/dar/devel dar.spec,1.13,1.14
Message-ID: <20090115194020.D1D1970141@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/dar/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2058

Modified Files:
	dar.spec 
Log Message:
* Thu Jan 15 2009 Tomas Mraz <tmraz at redhat.com> 2.3.8-2
- rebuild with new openssl



Index: dar.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dar/devel/dar.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- dar.spec	4 Aug 2008 17:25:50 -0000	1.13
+++ dar.spec	15 Jan 2009 19:39:50 -0000	1.14
@@ -14,7 +14,7 @@
 #
 Name:           dar
 Version:        2.3.8
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Software for making/restoring incremental CD/DVD backups
 
 Group:          Applications/Archiving
@@ -197,6 +197,9 @@
 %endif
 
 %changelog
+* Thu Jan 15 2009 Tomas Mraz <tmraz at redhat.com> 2.3.8-2
+- rebuild with new openssl
+
 * Mon Aug 04 2008 Marcin Garski <mgarski[AT]post.pl> 2.3.8-1
 - Update to 2.3.8 (#434519, #438953)
 - Own dar's include directory



From tmraz at fedoraproject.org  Thu Jan 15 19:40:50 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Thu, 15 Jan 2009 19:40:50 +0000 (UTC)
Subject: rpms/dclib/devel dclib.spec,1.18,1.19
Message-ID: <20090115194050.B55EB7012D@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/dclib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2596

Modified Files:
	dclib.spec 
Log Message:
* Thu Jan 15 2009 Tomas Mraz <tmraz at redhat.com> - 0.3.1-5
- rebuild with new openssl



Index: dclib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dclib/devel/dclib.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- dclib.spec	9 Feb 2008 02:16:20 -0000	1.18
+++ dclib.spec	15 Jan 2009 19:40:20 -0000	1.19
@@ -1,6 +1,6 @@
 Name:           dclib
 Version:        0.3.11
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Direct Connect file sharing library
 
 Group:          Applications/Internet
@@ -70,6 +70,9 @@
 
 
 %changelog
+* Thu Jan 15 2009 Tomas Mraz <tmraz at redhat.com> - 0.3.1-5
+- rebuild with new openssl
+
 * Fri Feb  8 2008 Luke Macken <lmacken at redhat.com> - 0.3.1-4
 - Rebuild for gcc 4.3
 



From eponyme at fedoraproject.org  Thu Jan 15 19:41:10 2009
From: eponyme at fedoraproject.org (Nicoleau Fabien)
Date: Thu, 15 Jan 2009 19:41:10 +0000 (UTC)
Subject: rpms/perl-WWW-Curl/F-9 import.log, NONE, 1.1 perl-WWW-Curl.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090115194110.6443A7012D@cvs1.fedora.phx.redhat.com>

Author: eponyme

Update of /cvs/pkgs/rpms/perl-WWW-Curl/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2870/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-WWW-Curl.spec 
Log Message:
New package



--- NEW FILE import.log ---
perl-WWW-Curl-4_05-4_fc10:F-9:perl-WWW-Curl-4.05-4.fc10.src.rpm:1232048415


--- NEW FILE perl-WWW-Curl.spec ---
Name:           perl-WWW-Curl
Version:        4.05
Release:        4%{?dist}
Summary:        Perl extension interface for libcurl
License:        MPLv1.1 or MIT
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/WWW-Curl/
Source0:        http://www.cpan.org/authors/id/S/SZ/SZBALINT/WWW-Curl-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  perl >= 1:5.6.1
BuildRequires:  perl(ExtUtils::MakeMaker)
BuildRequires:  perl(Test::Base)
BuildRequires:  libcurl-devel
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
WWW::Curl is a Perl extension interface for libcurl.

%prep
%setup -q -n WWW-Curl-%{version}


%build
%{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS"
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT

make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT

find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
find $RPM_BUILD_ROOT -type f -name '*.bs' -size 0 -exec rm -f {} \;
find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;

%{_fixperms} $RPM_BUILD_ROOT/*

%check
# These tests require network
%{?!_with_network_tests: rm t/01basic.t }
%{?!_with_network_tests: rm t/02callbacks.t }
%{?!_with_network_tests: rm t/04abort-test.t }
%{?!_with_network_tests: rm t/05progress.t }
%{?!_with_network_tests: rm t/09times.t }
%{?!_with_network_tests: rm t/14duphandle.t }
%{?!_with_network_tests: rm t/15duphandle-callback.t }
%{?!_with_network_tests: rm t/18twinhandles.t }
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Changes LICENSE README
%{perl_vendorarch}/auto/*
%{perl_vendorarch}/WWW*
%{_mandir}/man3/*

%changelog
* Wed Jan 14 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> - 4.05-4
- Licence update
* Wed Jan 14 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> - 4.05-3
- README.Win32 file removed
* Wed Jan 14 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> - 4.05-2
- Timestamp preserved
- changelog format fix
- README.Win32 file removed
* Thu Dec 11 2008 Nicoleau Fabien <nicoleau.fabien at gmail.com> - 4.05-1
- Initial build with cpan2spec


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-WWW-Curl/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	14 Jan 2009 21:17:46 -0000	1.1
+++ .cvsignore	15 Jan 2009 19:40:40 -0000	1.2
@@ -0,0 +1 @@
+WWW-Curl-4.05.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-WWW-Curl/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	14 Jan 2009 21:17:46 -0000	1.1
+++ sources	15 Jan 2009 19:40:40 -0000	1.2
@@ -0,0 +1 @@
+a49d09edc7491d9d8abec3ef79799853  WWW-Curl-4.05.tar.gz



From nsantos at fedoraproject.org  Thu Jan 15 19:53:15 2009
From: nsantos at fedoraproject.org (Nuno Santos)
Date: Thu, 15 Jan 2009 19:53:15 +0000 (UTC)
Subject: rpms/python-qpid/F-9 .cvsignore, 1.11, 1.12 python-qpid.spec, 1.15, 
	1.16 sources, 1.15, 1.16
Message-ID: <20090115195315.7A0D57012D@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-serv4339

Modified Files:
	.cvsignore python-qpid.spec sources 
Log Message:
Rebased to svn rev 734452


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-qpid/F-9/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	23 Dec 2008 16:08:45 -0000	1.11
+++ .cvsignore	15 Jan 2009 19:52:45 -0000	1.12
@@ -1 +1 @@
-python-qpid-0.4.728142.tar.gz
+python-qpid-0.4.734452.tar.gz


Index: python-qpid.spec
===================================================================
RCS file: /cvs/extras/rpms/python-qpid/F-9/python-qpid.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- python-qpid.spec	8 Jan 2009 17:53:13 -0000	1.15
+++ python-qpid.spec	15 Jan 2009 19:52:45 -0000	1.16
@@ -1,6 +1,6 @@
 Name:           python-qpid
-Version:        0.4.728142
-Release:        3%{?dist}
+Version:        0.4.734452
+Release:        1%{?dist}
 Summary:        Python language client for AMQP
 
 Group:          Development/Python
@@ -16,7 +16,7 @@
 BuildRequires:  python-devel
 
 Requires:       python
-Requires:       amqp >= 1.0.728142
+Requires:       amqp >= 1.0.734452
 
 %description
 The Apache Qpid project's Python language client for AMQP.
@@ -32,6 +32,7 @@
 chmod 0644 LICENSE.txt
 echo "\n" > cpp_failing_0-8.txt
 echo 'amqp_spec = "%{_datadir}/amqp/amqp.0-10-qpid-errata.xml"' > qpid_config.py
+find examples/ -type f -exec chmod -c 644 {} ';'
 
 %build
 #empty
@@ -69,11 +70,15 @@
 %{python_sitelib}/qmf
 %{_bindir}/python-qpid-tests
 %{_bindir}/qpid-*
-%doc LICENSE.txt NOTICE.txt README.txt doc/test-requirements.txt
+%doc LICENSE.txt NOTICE.txt README.txt doc/test-requirements.txt examples/
 
 
 
 %changelog
+* Wed Jan 14 2009 Nuno Santos <nsantos at redhat.com> - 0.4.734452-1
+- Rebased to svn rev 734452
+- BZ 478467: include examples
+
 * Thu Jan  8 2009 Nuno Santos <nsantos at redhat.com> - 0.4.728142-3
 - BZ 479212: add qmf dirs
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-qpid/F-9/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	23 Dec 2008 16:08:45 -0000	1.15
+++ sources	15 Jan 2009 19:52:45 -0000	1.16
@@ -1 +1 @@
-8d66db177502bc8ebcf86b426779f74e  python-qpid-0.4.728142.tar.gz
+cb50d8ba6012bbc674c2d87860d4838d  python-qpid-0.4.734452.tar.gz



From nsantos at fedoraproject.org  Thu Jan 15 19:58:19 2009
From: nsantos at fedoraproject.org (Nuno Santos)
Date: Thu, 15 Jan 2009 19:58:19 +0000 (UTC)
Subject: rpms/ruby-qpid/F-9 .cvsignore, 1.5, 1.6 ruby-qpid.spec, 1.4,
	1.5 sources, 1.5, 1.6
Message-ID: <20090115195819.6A5CF7012D@cvs1.fedora.phx.redhat.com>

Author: nsantos

Update of /cvs/extras/rpms/ruby-qpid/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4912

Modified Files:
	.cvsignore ruby-qpid.spec sources 
Log Message:
Rebased to svn rev 734452


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ruby-qpid/F-9/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	23 Dec 2008 16:49:04 -0000	1.5
+++ .cvsignore	15 Jan 2009 19:57:48 -0000	1.6
@@ -1 +1 @@
-ruby-qpid-0.4.728142.tar.gz
+ruby-qpid-0.4.734452.tar.gz


Index: ruby-qpid.spec
===================================================================
RCS file: /cvs/extras/rpms/ruby-qpid/F-9/ruby-qpid.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ruby-qpid.spec	23 Dec 2008 16:49:04 -0000	1.4
+++ ruby-qpid.spec	15 Jan 2009 19:57:49 -0000	1.5
@@ -1,5 +1,5 @@
 Name:           ruby-qpid
-Version:	0.4.728142
+Version:	0.4.734452
 Release:        1%{?dist}
 Summary:        Ruby language client for AMQP
 
@@ -18,7 +18,7 @@
 
 Requires:       ruby
 Requires:       ruby(abi) = 1.8
-Requires:       amqp >= 1.0.728142
+Requires:       amqp >= 1.0.734452
 
 Provides:       ruby(qpid) = %{version}
 
@@ -51,6 +51,9 @@
 %doc LICENSE.txt NOTICE.txt
 
 %changelog
+* Wed Jan 14 2009 Nuno Santos <nsantos at redhat.com> - 0.4.734452-1
+- Rebased to svn rev 734452
+
 * Tue Dec 23 2008 Nuno Santos <nsantos at redhat.com> - 0.4.728142-1
 - Rebased to svn rev 728142
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ruby-qpid/F-9/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	23 Dec 2008 16:49:04 -0000	1.5
+++ sources	15 Jan 2009 19:57:49 -0000	1.6
@@ -1 +1 @@
-ab08d2532283b4987498af12c9b5104c  ruby-qpid-0.4.728142.tar.gz
+4a8ef6ba2a2c4b50d100c950ce236e68  ruby-qpid-0.4.734452.tar.gz



From nsantos at fedoraproject.org  Thu Jan 15 20:04:18 2009
From: nsantos at fedoraproject.org (Nuno Santos)
Date: Thu, 15 Jan 2009 20:04:18 +0000 (UTC)
Subject: rpms/qpidc/F-9 .cvsignore, 1.14, 1.15 qpidc.spec, 1.43, 1.44 sources,
	1.28, 1.29
Message-ID: <20090115200418.A5DE27012D@cvs1.fedora.phx.redhat.com>

Author: nsantos

Update of /cvs/extras/rpms/qpidc/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5608

Modified Files:
	.cvsignore qpidc.spec sources 
Log Message:
Rebased to svn rev 734452


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/qpidc/F-9/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	23 Dec 2008 20:54:23 -0000	1.14
+++ .cvsignore	15 Jan 2009 20:03:48 -0000	1.15
@@ -1 +1 @@
-qpidc-0.4.728142.tar.gz
+qpidc-0.4.734452.tar.gz


Index: qpidc.spec
===================================================================
RCS file: /cvs/extras/rpms/qpidc/F-9/qpidc.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- qpidc.spec	23 Dec 2008 20:54:23 -0000	1.43
+++ qpidc.spec	15 Jan 2009 20:03:48 -0000	1.44
@@ -6,7 +6,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           qpidc
-Version:        0.4.728142
+Version:        0.4.734452
 Release:        1%{?dist}
 Summary:        Libraries for Qpid C++ client applications
 Group:          System Environment/Libraries
@@ -222,7 +222,7 @@
 rm -f %{buildroot}%_libdir/qpid/client/*.la
 rm -f %{buildroot}%_libdir/qpid/daemon/*.la
 # remove examples, are being packages separately in the rhm-docs package
-rm -fr %{buildroot}/usr/share/qpidc/examples
+#rm -fr %{buildroot}/usr/share/qpidc/examples
 
 %clean
 rm -rf %{buildroot}
@@ -245,6 +245,7 @@
 %_includedir/qpid/*.h
 %_includedir/qpid/amqp_0_10
 %_includedir/qpid/client
+%_includedir/qpid/console
 %_includedir/qpid/framing
 %_includedir/qpid/sys
 %_includedir/qpid/log
@@ -253,6 +254,7 @@
 %_includedir/qmf
 %_libdir/libqpidcommon.so
 %_libdir/libqpidclient.so
+%_datadir/qpidc/examples
 %doc docs/api/html
 
 %files -n qpidd
@@ -366,6 +368,9 @@
 %postun -n qmf -p /sbin/ldconfig
 
 %changelog
+* Thu Jan 15 2009 Nuno Santos <nsantos at redhat.com> - 0.4.734452-1
+- Rebased to svn rev 734452
+
 * Tue Dec 23 2008 Nuno Santos <nsantos at redhat.com> - 0.4.728142-1
 - Rebased to svn rev 728142
 - Re-enable cluster


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/qpidc/F-9/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- sources	23 Dec 2008 20:54:23 -0000	1.28
+++ sources	15 Jan 2009 20:03:48 -0000	1.29
@@ -1 +1 @@
-cc0a9f74d2c94a8c843c60415a869fc5  qpidc-0.4.728142.tar.gz
+2b11da88553b325b1c6cfdb3031f077c  qpidc-0.4.734452.tar.gz



From pkgdb at fedoraproject.org  Thu Jan 15 20:08:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 15 Jan 2009 20:08:07 +0000
Subject: [pkgdb] libsigsegv (Fedora EPEL, 4) updated by kevin
Message-ID: <20090115200807.B2D72208456@bastion.fedora.phx.redhat.com>

kevin added a Fedora EPEL 4 branch for libsigsegv
kevin has set commit to Approved for provenpackager on libsigsegv (Fedora EPEL 4)
kevin has set build to Approved for provenpackager on libsigsegv (Fedora EPEL 4)
kevin has set checkout to Approved for provenpackager on libsigsegv (Fedora EPEL 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libsigsegv



From pkgdb at fedoraproject.org  Thu Jan 15 20:13:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 15 Jan 2009 20:13:24 +0000
Subject: [pkgdb] zapplet was added for ke4qqq
Message-ID: <20090115201324.75751208203@bastion.fedora.phx.redhat.com>

kevin has added Package zapplet with summary Zenoss Tray monitoring applet
kevin has approved Package zapplet
kevin has added a Fedora devel branch for zapplet with an owner of ke4qqq
kevin has approved zapplet in Fedora devel
kevin has approved Package zapplet
kevin has set commit to Approved for provenpackager on zapplet (Fedora devel)
kevin has set build to Approved for provenpackager on zapplet (Fedora devel)
kevin has set checkout to Approved for provenpackager on zapplet (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/zapplet



From pkgdb at fedoraproject.org  Thu Jan 15 20:13:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 15 Jan 2009 20:13:25 +0000
Subject: [pkgdb] zapplet (Fedora, 9) updated by kevin
Message-ID: <20090115201326.2BA0E208457@bastion.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for zapplet
kevin has set commit to Approved for provenpackager on zapplet (Fedora 9)
kevin has set build to Approved for provenpackager on zapplet (Fedora 9)
kevin has set checkout to Approved for provenpackager on zapplet (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/zapplet



From kevin at fedoraproject.org  Thu Jan 15 20:13:41 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 15 Jan 2009 20:13:41 +0000 (UTC)
Subject: rpms/zapplet - New directory
Message-ID: <20090115201341.272567012D@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/zapplet
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsCV7333/rpms/zapplet

Log Message:
Directory /cvs/pkgs/rpms/zapplet added to the repository




From kevin at fedoraproject.org  Thu Jan 15 20:13:41 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 15 Jan 2009 20:13:41 +0000 (UTC)
Subject: rpms/zapplet/devel - New directory
Message-ID: <20090115201341.742D77012D@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/zapplet/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsCV7333/rpms/zapplet/devel

Log Message:
Directory /cvs/pkgs/rpms/zapplet/devel added to the repository




From pkgdb at fedoraproject.org  Thu Jan 15 20:13:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 15 Jan 2009 20:13:25 +0000
Subject: [pkgdb] zapplet (Fedora, 10) updated by kevin
Message-ID: <20090115201326.40709208469@bastion.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for zapplet
kevin has set commit to Approved for provenpackager on zapplet (Fedora 10)
kevin has set build to Approved for provenpackager on zapplet (Fedora 10)
kevin has set checkout to Approved for provenpackager on zapplet (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/zapplet



From kevin at fedoraproject.org  Thu Jan 15 20:13:55 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 15 Jan 2009 20:13:55 +0000 (UTC)
Subject: rpms/zapplet Makefile,NONE,1.1
Message-ID: <20090115201355.80CF87012D@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/zapplet
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsCV7333/rpms/zapplet

Added Files:
	Makefile 
Log Message:
Setup of module zapplet


--- NEW FILE Makefile ---
# Top level Makefile for module zapplet
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Jan 15 20:13:55 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 15 Jan 2009 20:13:55 +0000 (UTC)
Subject: rpms/zapplet/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <20090115201355.BC4C37012D@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/zapplet/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsCV7333/rpms/zapplet/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module zapplet


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: zapplet
# $Id: Makefile,v 1.1 2009/01/15 20:13:55 kevin Exp $
NAME := zapplet
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Jan 15 20:16:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 15 Jan 2009 20:16:50 +0000
Subject: [pkgdb] ncmpcpp was added for mnowak
Message-ID: <20090115201650.5D958208203@bastion.fedora.phx.redhat.com>

kevin has added Package ncmpcpp with summary Clone of ncmpc with new features and written in C++
kevin has approved Package ncmpcpp
kevin has added a Fedora devel branch for ncmpcpp with an owner of mnowak
kevin has approved ncmpcpp in Fedora devel
kevin has approved Package ncmpcpp
kevin has set commit to Approved for provenpackager on ncmpcpp (Fedora devel)
kevin has set build to Approved for provenpackager on ncmpcpp (Fedora devel)
kevin has set checkout to Approved for provenpackager on ncmpcpp (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ncmpcpp



From pkgdb at fedoraproject.org  Thu Jan 15 20:16:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 15 Jan 2009 20:16:52 +0000
Subject: [pkgdb] ncmpcpp (Fedora, 10) updated by kevin
Message-ID: <20090115201654.6F62D208469@bastion.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for ncmpcpp
kevin has set commit to Approved for provenpackager on ncmpcpp (Fedora 10)
kevin has set build to Approved for provenpackager on ncmpcpp (Fedora 10)
kevin has set checkout to Approved for provenpackager on ncmpcpp (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ncmpcpp



From pkgdb at fedoraproject.org  Thu Jan 15 20:16:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 15 Jan 2009 20:16:52 +0000
Subject: [pkgdb] ncmpcpp (Fedora, 9) updated by kevin
Message-ID: <20090115201653.04C0A208468@bastion.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for ncmpcpp
kevin has set commit to Approved for provenpackager on ncmpcpp (Fedora 9)
kevin has set build to Approved for provenpackager on ncmpcpp (Fedora 9)
kevin has set checkout to Approved for provenpackager on ncmpcpp (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ncmpcpp



From kevin at fedoraproject.org  Thu Jan 15 20:17:17 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 15 Jan 2009 20:17:17 +0000 (UTC)
Subject: rpms/ncmpcpp - New directory
Message-ID: <20090115201717.25A997012D@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/ncmpcpp
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsUR7762/rpms/ncmpcpp

Log Message:
Directory /cvs/pkgs/rpms/ncmpcpp added to the repository




From kevin at fedoraproject.org  Thu Jan 15 20:17:17 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 15 Jan 2009 20:17:17 +0000 (UTC)
Subject: rpms/ncmpcpp/devel - New directory
Message-ID: <20090115201717.671E27012D@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/ncmpcpp/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsUR7762/rpms/ncmpcpp/devel

Log Message:
Directory /cvs/pkgs/rpms/ncmpcpp/devel added to the repository




From kevin at fedoraproject.org  Thu Jan 15 20:17:34 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 15 Jan 2009 20:17:34 +0000 (UTC)
Subject: rpms/ncmpcpp Makefile,NONE,1.1
Message-ID: <20090115201734.9891E7012D@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/ncmpcpp
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsUR7762/rpms/ncmpcpp

Added Files:
	Makefile 
Log Message:
Setup of module ncmpcpp


--- NEW FILE Makefile ---
# Top level Makefile for module ncmpcpp
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Jan 15 20:17:34 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 15 Jan 2009 20:17:34 +0000 (UTC)
Subject: rpms/ncmpcpp/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <20090115201734.D6CF27012D@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/ncmpcpp/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsUR7762/rpms/ncmpcpp/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module ncmpcpp


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: ncmpcpp
# $Id: Makefile,v 1.1 2009/01/15 20:17:34 kevin Exp $
NAME := ncmpcpp
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Jan 15 20:19:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 15 Jan 2009 20:19:23 +0000
Subject: [pkgdb] shcov was added for fab
Message-ID: <20090115201923.E2825208456@bastion.fedora.phx.redhat.com>

kevin has added Package shcov with summary A gcov and lcov coverage test tool for bourne shell / bash scripts
kevin has approved Package shcov
kevin has added a Fedora devel branch for shcov with an owner of fab
kevin has approved shcov in Fedora devel
kevin has approved Package shcov
kevin has set commit to Approved for provenpackager on shcov (Fedora devel)
kevin has set build to Approved for provenpackager on shcov (Fedora devel)
kevin has set checkout to Approved for provenpackager on shcov (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/shcov



From pkgdb at fedoraproject.org  Thu Jan 15 20:19:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 15 Jan 2009 20:19:27 +0000
Subject: [pkgdb] shcov (Fedora, 9) updated by kevin
Message-ID: <20090115201927.C890E208457@bastion.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for shcov
kevin has set commit to Approved for provenpackager on shcov (Fedora 9)
kevin has set build to Approved for provenpackager on shcov (Fedora 9)
kevin has set checkout to Approved for provenpackager on shcov (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/shcov



From pkgdb at fedoraproject.org  Thu Jan 15 20:19:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 15 Jan 2009 20:19:27 +0000
Subject: [pkgdb] shcov (Fedora, 10) updated by kevin
Message-ID: <20090115201930.B3A32208469@bastion.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for shcov
kevin has set commit to Approved for provenpackager on shcov (Fedora 10)
kevin has set build to Approved for provenpackager on shcov (Fedora 10)
kevin has set checkout to Approved for provenpackager on shcov (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/shcov



From kevin at fedoraproject.org  Thu Jan 15 20:19:41 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 15 Jan 2009 20:19:41 +0000 (UTC)
Subject: rpms/shcov - New directory
Message-ID: <20090115201941.2072C7012D@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/shcov
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsHx8128/rpms/shcov

Log Message:
Directory /cvs/pkgs/rpms/shcov added to the repository




From kevin at fedoraproject.org  Thu Jan 15 20:19:41 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 15 Jan 2009 20:19:41 +0000 (UTC)
Subject: rpms/shcov/devel - New directory
Message-ID: <20090115201941.5A9A47012D@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/shcov/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsHx8128/rpms/shcov/devel

Log Message:
Directory /cvs/pkgs/rpms/shcov/devel added to the repository




From kevin at fedoraproject.org  Thu Jan 15 20:19:55 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 15 Jan 2009 20:19:55 +0000 (UTC)
Subject: rpms/shcov Makefile,NONE,1.1
Message-ID: <20090115201955.AA0D47012D@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/shcov
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsHx8128/rpms/shcov

Added Files:
	Makefile 
Log Message:
Setup of module shcov


--- NEW FILE Makefile ---
# Top level Makefile for module shcov
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Jan 15 20:19:56 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 15 Jan 2009 20:19:56 +0000 (UTC)
Subject: rpms/shcov/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <20090115201956.10DFE7012D@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/shcov/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsHx8128/rpms/shcov/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module shcov


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: shcov
# $Id: Makefile,v 1.1 2009/01/15 20:19:55 kevin Exp $
NAME := shcov
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From rdieter at fedoraproject.org  Thu Jan 15 20:20:32 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu, 15 Jan 2009 20:20:32 +0000 (UTC)
Subject: rpms/kdebindings/devel kdebindings.spec,1.165,1.166
Message-ID: <20090115202032.BE0457012D@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdebindings/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8105

Modified Files:
	kdebindings.spec 
Log Message:
* Thu Jan 15 2009 Rex Dieter <rdieter at fedoraproject.org> 4.1.96-4
- update %%description/%%summaries for new (sub)pkgs
- use versioned Provides/Requires all over
- BR: akonadi-devel kdegraphics-devel
- don't package kde-plasma-ruby-* (cmake error "rbuic4 not found")

* Thu Jan 15 2009 Ben Boeckel <MathStuf at gmail.com> 4.1.96-3
- Fixed QtRuby version
- Moved QtRuby tools to QtRuby-devel

* Wed Jan 14 2009 Ben Boeckel <MathStuf at gmail.com> 4.1.96-2
- Split out Ruby bindings and Kross modules



Index: kdebindings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebindings/devel/kdebindings.spec,v
retrieving revision 1.165
retrieving revision 1.166
diff -u -r1.165 -r1.166
--- kdebindings.spec	9 Jan 2009 14:21:21 -0000	1.165
+++ kdebindings.spec	15 Jan 2009 20:20:02 -0000	1.166
@@ -6,6 +6,7 @@
 
 # define to enable these optional bits
 #define csharp 1
+#define falcon 1
 #define php 1
 %define ruby 1
 %define smoke 1
@@ -14,15 +15,15 @@
 %define devel 1
 %endif
 
-%{!?ruby_sitelib: %define ruby_sitelib %(ruby -rrbconfig -e 'puts Config::CONFIG["sitelibdir"]')}
-%{!?ruby_sitearch: %define ruby_sitearch %(ruby -rrbconfig -e 'puts Config::CONFIG["sitearchdir"]')}
+%global ruby_sitelib %(ruby -rrbconfig -e 'puts Config::CONFIG["sitelibdir"]')
+%global ruby_sitearch %(ruby -rrbconfig -e 'puts Config::CONFIG["sitearchdir"]')
 %global python_ver %(%{__python} -c "import sys ; print sys.version[:3]")
 %global python_sitelib  %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")
 %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")
 
 Name: kdebindings
 Version: 4.1.96
-Release: 1%{?dist}
+Release: 4%{?dist}
 Summary: KDE bindings to non-C++ languages
 
 Group: User Interface/Desktops
@@ -35,20 +36,21 @@
 Patch100: kdebindings-4.1.96-akonadi.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+BuildRequires:  akonadi-devel >= 1.1.0
 BuildRequires:  plasma-devel >= %{version}
+# okular bindings
+BuildRequires:  kdegraphics-devel >= %{version}
+BuildRequires:  kdelibs4-devel >= %{version}
 BuildRequires:  kdepimlibs-devel >= %{version}
-BuildRequires:  soprano-devel >= 2.1.64
 %{?csharp:BuildRequires:  mono-core}
 BuildRequires:  python-devel
 %{?ruby:BuildRequires:  ruby-devel ruby}
-BuildRequires:  giflib-devel
-BuildRequires:  pcre-devel
 BuildRequires:  PyQt4-devel >= 4.4.2
 %if 0%{?fedora} > 8
 BuildRequires:  qscintilla-devel >= 2.2
 %endif
+BuildRequires:  soprano-devel
 
-# FIXME/TODO: are there other explicit Requires?
 Requires: kdelibs4 >= %{version}
 
 %{!?devel:Obsoletes: kdebindings-devel < %{version}-%{release}}
@@ -81,6 +83,75 @@
 %description devel
 Header files for developing applications using %{name}.
 
+%if 0%{?ruby}
+%package -n korundum
+Group:    Development/Languages
+Summary:  Ruby bindings for KDE4
+Requires: kdelibs4 >= %{version}
+Requires: QtRuby = %{version}-%{release}
+Provides: korundum4 = %{version}-%{release}
+%description -n korundum
+%{summary}.
+
+%package -n korundum-devel
+Group:    Development/Languages
+Summary:  Development files for korundum 
+Requires: QtRuby-devel
+Requires: korundum = %{version}-%{release}
+Provides: korundum4-devel = %{version}-%{release}
+%description -n korundum-devel
+%{summary}.
+
+%package -n QtRuby
+Group:    Development/Languages
+Summary:  Ruby bindings for Qt4
+Requires: qt4 >= %{_qt4_version} 
+Provides: QtRuby4 = %{version}-%{release}
+%description -n QtRuby
+%{summary}.
+
+%package -n QtRuby-devel
+Group:    Development/Languages
+Summary:  Development files for QtRuby 
+Requires: QtRuby = %{version}-%{release}
+Provides: QtRuby4-devel = %{version}-%{release}
+%description -n QtRuby-devel
+%{summary}.
+
+%package -n kde-plasma-ruby-digitalclock
+Group:    User Interface/Desktops
+Summary:  Digital clock plasmoid written in Ruby
+Requires: korundum = %{version}-%{release}
+%description -n kde-plasma-ruby-digitalclock
+%{summary}.
+
+%package -n kde-plasma-ruby-analogclock
+Group:    User Interface/Desktops
+Summary:  Analog clock plasmoid written in Ruby
+Requires: korundum = %{version}-%{release}
+%description -n kde-plasma-ruby-analogclock
+%{summary}.
+%endif
+
+%package -n kross-python
+Group:    Development/Languages
+Summary:  Kross plugin for python
+Requires: kdelibs4 >= %{version}
+Provides: kross(python) = ^{version]-%{release}
+%description -n kross-python
+Python plugin for the Kross archtecture in KDE4.
+
+%if 0%{?ruby}
+%package -n kross-ruby
+Group:    Development/Languages
+Summary:  Kross plugin for ruby
+Requires: ruby
+Requires: kdelibs4 >= %{version}
+Provides: kross(ruby) = %{version}-%{release}
+%description -n kross-ruby
+Ruby plugin for the Kross archtecture in KDE4.
+%endif
+
 
 %prep
 %setup -q
@@ -107,7 +178,6 @@
 
 %install
 rm -rf %{buildroot}
-mkdir -p %{buildroot}
 make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
 
@@ -124,19 +194,17 @@
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING NEWS README
 %if 0%{?smoke}
-%{_kde4_libdir}/lib*.so.*
+%{_kde4_libdir}/libsmoke*.so.*
+%endif
+
+%if 0%{?devel}
+%files devel
+%defattr(-,root,root,-)
+%if 0%{?smoke}
+%{_includedir}/smoke.h
+%{_includedir}/smoke/
+%{_kde4_libdir}/libsmoke*.so
 %endif
-# unversioned library
-%{_kde4_libdir}/kde4/krosspython.so
-%if 0%{?ruby}
-%{_kde4_bindir}/*
-%{_kde4_libdir}/libqtruby4shared.so
-%{_kde4_libdir}/kde4/krossruby.so
-%{_kde4_libdir}/kde4/krubypluginfactory.so
-%{ruby_sitelib}/*
-%{ruby_sitearch}/*.so
-%{_kde4_datadir}/applications/kde4/dbpedia_references.desktop
-%{_kde4_appsdir}/dbpedia_references/
 %endif
 
 %files -n PyKDE4
@@ -151,22 +219,96 @@
 #doc %{_kde4_docdir}/HTML/en/pykde4/
 %{_kde4_datadir}/sip/PyKDE4/
 
-%if 0%{?devel}
-%files devel
-%defattr(-,root,root,-)
-%if 0%{?smoke}
-%{_includedir}/smoke.h
-%{_includedir}/smoke/
-%{_kde4_libdir}/lib*.so
-%endif
 %if 0%{?ruby}
+%files -n korundum
+%defattr(-,root,root,-)
+%{_kde4_bindir}/krubyapplication
+%{ruby_sitelib}/KDE/
+%{ruby_sitelib}/akonadi/
+%{ruby_sitelib}/khtml/
+%{ruby_sitelib}/ktexteditor/
+%{ruby_sitelib}/okular/
+%{ruby_sitelib}/solid/
+%{ruby_sitelib}/soprano/
+%{ruby_sitearch}/akonadi.so
+%{ruby_sitearch}/khtml.so
+%{ruby_sitearch}/korundum4.so
+%{ruby_sitearch}/ktexteditor.so
+%{ruby_sitearch}/okular.so
+%{ruby_sitearch}/plasma_applet.so
+%{ruby_sitearch}/solid.so
+%{ruby_sitearch}/soprano.so
+%{_kde4_libdir}/kde4/krubypluginfactory.so
+%{_kde4_datadir}/applications/kde4/dbpedia_references.desktop
+%{_kde4_appsdir}/dbpedia_references/
+
+%files -n korundum-devel
+%defattr(-,root,root,-)
+%{_kde4_bindir}/rbkconfig_compiler4
 %{_includedir}/qtruby/
 %exclude %{_kde4_libdir}/libqtruby4shared.so
+
+%files -n QtRuby
+%defattr(-,root,root,-)
+%{ruby_sitelib}/Qt/
+%{ruby_sitelib}/Qt*.rb
+%{ruby_sitelib}/qtscript/
+%{ruby_sitelib}/qttest/
+%{ruby_sitelib}/qtuitools/
+%{ruby_sitelib}/qtwebkit/
+%{ruby_sitearch}/qt*.so
+%{_kde4_libdir}/libqtruby4shared.so.2
+%{_kde4_libdir}/libqtruby4shared.so.2.0.0
+
+%files -n QtRuby-devel
+%defattr(-,root,root,-)
+%{_kde4_bindir}/rbqtapi
+%{_kde4_bindir}/rbrcc
+%{_kde4_bindir}/rbuic4
+%{_kde4_libdir}/libqtruby4shared.so
+%endif
+
+%files -n kross-python
+%defattr(-,root,root,-)
+# unversioned library
+%{_kde4_libdir}/kde4/krosspython.so
+
+%if 0%{?ruby}
+%files -n kross-ruby
+%defattr(-,root,root,-)
+%{_kde4_libdir}/kde4/krossruby.so
+
+## wtf?  -- Rex
+#-- rbuic4 not found, ruby-clock will not created
+#-- rbuic4 not found, ruby-digital-clock will not created
+%if 0
+%files -n kde-plasma-ruby-analogclock
+%defattr(-,root,root,-)
+%{_kde4_sharedir}/kde4/apps/plasma_applet_ruby_clock/
+%{_kde4_sharedir}/kde4/services/plasma-applet-ruby-analogclock.desktop
+
+%files -n kde-plasma-ruby-digitalclock
+%defattr(-,root,root,-)
+%{_kde4_sharedir}/kde4/apps/plasma_ruby_digital_clock/
+%{_kde4_sharedir}/kde4/services/plasma-ruby-digital-clock-default.desktop
 %endif
 %endif
 
 
 %changelog
+* Thu Jan 15 2009 Rex Dieter <rdieter at fedoraproject.org> 4.1.96-4
+- update %%description/%%summaries for new (sub)pkgs
+- use versioned Provides/Requires all over
+- BR: akonadi-devel kdegraphics-devel
+- don't package kde-plasma-ruby-* (cmake error "rbuic4 not found")
+
+* Thu Jan 15 2009 Ben Boeckel <MathStuf at gmail.com> 4.1.96-3
+- Fixed QtRuby version
+- Moved QtRuby tools to QtRuby-devel
+
+* Wed Jan 14 2009 Ben Boeckel <MathStuf at gmail.com> 4.1.96-2
+- Split out Ruby bindings and Kross modules
+
 * Wed Jan 07 2009 Than Ngo <than at redhat.com> - 4.1.96-1
 - 4.2rc1
 



From pkgdb at fedoraproject.org  Thu Jan 15 20:21:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 15 Jan 2009 20:21:00 +0000
Subject: [pkgdb] jpcap was added for dignan
Message-ID: <20090115202100.BA0F42082B9@bastion.fedora.phx.redhat.com>

kevin has added Package jpcap with summary Packet capturing library for Java
kevin has approved Package jpcap
kevin has added a Fedora devel branch for jpcap with an owner of dignan
kevin has approved jpcap in Fedora devel
kevin has approved Package jpcap
kevin has set commit to Approved for provenpackager on jpcap (Fedora devel)
kevin has set build to Approved for provenpackager on jpcap (Fedora devel)
kevin has set checkout to Approved for provenpackager on jpcap (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/jpcap



From pkgdb at fedoraproject.org  Thu Jan 15 20:21:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 15 Jan 2009 20:21:02 +0000
Subject: [pkgdb] jpcap (Fedora, 9) updated by kevin
Message-ID: <20090115202102.DFF13208457@bastion.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for jpcap
kevin has set commit to Approved for provenpackager on jpcap (Fedora 9)
kevin has set build to Approved for provenpackager on jpcap (Fedora 9)
kevin has set checkout to Approved for provenpackager on jpcap (Fedora 9)
kevin approved watchbugzilla on jpcap (Fedora 9) for mtasaka
kevin approved watchcommits on jpcap (Fedora 9) for mtasaka

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/jpcap



From pkgdb at fedoraproject.org  Thu Jan 15 20:21:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 15 Jan 2009 20:21:02 +0000
Subject: [pkgdb] jpcap (Fedora, 10) updated by kevin
Message-ID: <20090115202103.0A0A020846E@bastion.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for jpcap
kevin has set commit to Approved for provenpackager on jpcap (Fedora 10)
kevin has set build to Approved for provenpackager on jpcap (Fedora 10)
kevin has set checkout to Approved for provenpackager on jpcap (Fedora 10)
kevin approved watchbugzilla on jpcap (Fedora 10) for mtasaka
kevin approved watchcommits on jpcap (Fedora 10) for mtasaka

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/jpcap



From pkgdb at fedoraproject.org  Thu Jan 15 20:21:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 15 Jan 2009 20:21:02 +0000
Subject: [pkgdb] jpcap (Fedora, devel) updated by kevin
Message-ID: <20090115202103.1EC2F208471@bastion.fedora.phx.redhat.com>

kevin approved watchbugzilla on jpcap (Fedora devel) for mtasaka
kevin approved watchcommits on jpcap (Fedora devel) for mtasaka

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/jpcap



From kevin at fedoraproject.org  Thu Jan 15 20:21:17 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 15 Jan 2009 20:21:17 +0000 (UTC)
Subject: rpms/jpcap - New directory
Message-ID: <20090115202117.21DB77012D@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/jpcap
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsjw8494/rpms/jpcap

Log Message:
Directory /cvs/pkgs/rpms/jpcap added to the repository




From kevin at fedoraproject.org  Thu Jan 15 20:21:17 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 15 Jan 2009 20:21:17 +0000 (UTC)
Subject: rpms/jpcap/devel - New directory
Message-ID: <20090115202117.551C37012D@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/jpcap/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsjw8494/rpms/jpcap/devel

Log Message:
Directory /cvs/pkgs/rpms/jpcap/devel added to the repository




From kevin at fedoraproject.org  Thu Jan 15 20:21:31 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 15 Jan 2009 20:21:31 +0000 (UTC)
Subject: rpms/jpcap Makefile,NONE,1.1
Message-ID: <20090115202131.C40657012D@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/jpcap
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsjw8494/rpms/jpcap

Added Files:
	Makefile 
Log Message:
Setup of module jpcap


--- NEW FILE Makefile ---
# Top level Makefile for module jpcap
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Jan 15 20:21:32 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 15 Jan 2009 20:21:32 +0000 (UTC)
Subject: rpms/jpcap/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <20090115202132.102A27012D@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/jpcap/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsjw8494/rpms/jpcap/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module jpcap


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: jpcap
# $Id: Makefile,v 1.1 2009/01/15 20:21:31 kevin Exp $
NAME := jpcap
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Jan 15 20:25:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 15 Jan 2009 20:25:07 +0000
Subject: [pkgdb] gfan was added for konradm
Message-ID: <20090115202507.B48D8208457@bastion.fedora.phx.redhat.com>

kevin has added Package gfan with summary Software for Computing Gr?bner Fans and Tropical Varieties
kevin has approved Package gfan
kevin has added a Fedora devel branch for gfan with an owner of konradm
kevin has approved gfan in Fedora devel
kevin has approved Package gfan
kevin has set commit to Approved for provenpackager on gfan (Fedora devel)
kevin has set build to Approved for provenpackager on gfan (Fedora devel)
kevin has set checkout to Approved for provenpackager on gfan (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gfan



From pkgdb at fedoraproject.org  Thu Jan 15 20:25:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 15 Jan 2009 20:25:08 +0000
Subject: [pkgdb] gfan (Fedora, 10) updated by kevin
Message-ID: <20090115202509.AF1D8208470@bastion.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for gfan
kevin has set commit to Approved for provenpackager on gfan (Fedora 10)
kevin has set build to Approved for provenpackager on gfan (Fedora 10)
kevin has set checkout to Approved for provenpackager on gfan (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gfan



From pkgdb at fedoraproject.org  Thu Jan 15 20:25:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 15 Jan 2009 20:25:08 +0000
Subject: [pkgdb] gfan (Fedora, 9) updated by kevin
Message-ID: <20090115202509.836EC208469@bastion.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for gfan
kevin has set commit to Approved for provenpackager on gfan (Fedora 9)
kevin has set build to Approved for provenpackager on gfan (Fedora 9)
kevin has set checkout to Approved for provenpackager on gfan (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gfan



From kevin at fedoraproject.org  Thu Jan 15 20:25:23 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 15 Jan 2009 20:25:23 +0000 (UTC)
Subject: rpms/gfan - New directory
Message-ID: <20090115202523.269B77012D@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/gfan
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsZa9059/rpms/gfan

Log Message:
Directory /cvs/pkgs/rpms/gfan added to the repository




From kevin at fedoraproject.org  Thu Jan 15 20:25:23 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 15 Jan 2009 20:25:23 +0000 (UTC)
Subject: rpms/gfan/devel - New directory
Message-ID: <20090115202523.5C6B47012D@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/gfan/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsZa9059/rpms/gfan/devel

Log Message:
Directory /cvs/pkgs/rpms/gfan/devel added to the repository




From kevin at fedoraproject.org  Thu Jan 15 20:25:40 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 15 Jan 2009 20:25:40 +0000 (UTC)
Subject: rpms/gfan Makefile,NONE,1.1
Message-ID: <20090115202540.19C147012D@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/gfan
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsZa9059/rpms/gfan

Added Files:
	Makefile 
Log Message:
Setup of module gfan


--- NEW FILE Makefile ---
# Top level Makefile for module gfan
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Jan 15 20:25:40 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 15 Jan 2009 20:25:40 +0000 (UTC)
Subject: rpms/gfan/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <20090115202540.59FCE7012D@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/gfan/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsZa9059/rpms/gfan/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module gfan


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: gfan
# $Id: Makefile,v 1.1 2009/01/15 20:25:40 kevin Exp $
NAME := gfan
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Jan 15 20:26:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 15 Jan 2009 20:26:36 +0000
Subject: [pkgdb] google-droid-fonts was added for nim
Message-ID: <20090115202636.3A1F52081FF@bastion.fedora.phx.redhat.com>

kevin has added Package google-droid-fonts with summary General-purpose fonts released by Google as part of Android
kevin has approved Package google-droid-fonts
kevin has added a Fedora devel branch for google-droid-fonts with an owner of nim
kevin has approved google-droid-fonts in Fedora devel
kevin has approved Package google-droid-fonts
kevin has set commit to Approved for provenpackager on google-droid-fonts (Fedora devel)
kevin has set build to Approved for provenpackager on google-droid-fonts (Fedora devel)
kevin has set checkout to Approved for provenpackager on google-droid-fonts (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/google-droid-fonts



From pkgdb at fedoraproject.org  Thu Jan 15 20:26:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 15 Jan 2009 20:26:39 +0000
Subject: [pkgdb] google-droid-fonts (Fedora, 9) updated by kevin
Message-ID: <20090115202639.2B88D208456@bastion.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for google-droid-fonts
kevin has set commit to Approved for provenpackager on google-droid-fonts (Fedora 9)
kevin has set build to Approved for provenpackager on google-droid-fonts (Fedora 9)
kevin has set checkout to Approved for provenpackager on google-droid-fonts (Fedora 9)
kevin approved watchbugzilla on google-droid-fonts (Fedora 9) for fonts-sig
kevin approved watchcommits on google-droid-fonts (Fedora 9) for fonts-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/google-droid-fonts



From pkgdb at fedoraproject.org  Thu Jan 15 20:26:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 15 Jan 2009 20:26:39 +0000
Subject: [pkgdb] google-droid-fonts (Fedora, devel) updated by kevin
Message-ID: <20090115202639.47FEE208468@bastion.fedora.phx.redhat.com>

kevin approved watchbugzilla on google-droid-fonts (Fedora devel) for fonts-sig
kevin approved watchcommits on google-droid-fonts (Fedora devel) for fonts-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/google-droid-fonts



From pkgdb at fedoraproject.org  Thu Jan 15 20:26:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 15 Jan 2009 20:26:39 +0000
Subject: [pkgdb] google-droid-fonts (Fedora, 10) updated by kevin
Message-ID: <20090115202639.5A6DA20846E@bastion.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for google-droid-fonts
kevin has set commit to Approved for provenpackager on google-droid-fonts (Fedora 10)
kevin has set build to Approved for provenpackager on google-droid-fonts (Fedora 10)
kevin has set checkout to Approved for provenpackager on google-droid-fonts (Fedora 10)
kevin approved watchbugzilla on google-droid-fonts (Fedora 10) for fonts-sig
kevin approved watchcommits on google-droid-fonts (Fedora 10) for fonts-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/google-droid-fonts



From kevin at fedoraproject.org  Thu Jan 15 20:26:52 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 15 Jan 2009 20:26:52 +0000 (UTC)
Subject: rpms/google-droid-fonts - New directory
Message-ID: <20090115202652.2109A7012D@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/google-droid-fonts
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsNU9439/rpms/google-droid-fonts

Log Message:
Directory /cvs/pkgs/rpms/google-droid-fonts added to the repository




From kevin at fedoraproject.org  Thu Jan 15 20:26:52 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 15 Jan 2009 20:26:52 +0000 (UTC)
Subject: rpms/google-droid-fonts/devel - New directory
Message-ID: <20090115202652.684C17012D@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/google-droid-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsNU9439/rpms/google-droid-fonts/devel

Log Message:
Directory /cvs/pkgs/rpms/google-droid-fonts/devel added to the repository




From pkgdb at fedoraproject.org  Thu Jan 15 20:27:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 15 Jan 2009 20:27:05 +0000
Subject: [pkgdb] ethtool: robert has requested watchbugzilla
Message-ID: <20090115202705.6F340208478@bastion.fedora.phx.redhat.com>

robert has requested the watchbugzilla acl on ethtool (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ethtool



From kevin at fedoraproject.org  Thu Jan 15 20:27:08 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 15 Jan 2009 20:27:08 +0000 (UTC)
Subject: rpms/google-droid-fonts Makefile,NONE,1.1
Message-ID: <20090115202708.AB5727012D@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/google-droid-fonts
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsNU9439/rpms/google-droid-fonts

Added Files:
	Makefile 
Log Message:
Setup of module google-droid-fonts


--- NEW FILE Makefile ---
# Top level Makefile for module google-droid-fonts
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Thu Jan 15 20:27:08 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 15 Jan 2009 20:27:08 +0000 (UTC)
Subject: rpms/google-droid-fonts/devel .cvsignore, NONE, 1.1 Makefile, NONE, 
	1.1 sources, NONE, 1.1
Message-ID: <20090115202708.F3D147012D@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/google-droid-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsNU9439/rpms/google-droid-fonts/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module google-droid-fonts


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: google-droid-fonts
# $Id: Makefile,v 1.1 2009/01/15 20:27:08 kevin Exp $
NAME := google-droid-fonts
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Thu Jan 15 20:27:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 15 Jan 2009 20:27:08 +0000
Subject: [pkgdb] ethtool: robert has requested watchcommits
Message-ID: <20090115202708.32D9220847A@bastion.fedora.phx.redhat.com>

robert has requested the watchcommits acl on ethtool (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ethtool



From pkgdb at fedoraproject.org  Thu Jan 15 20:27:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 15 Jan 2009 20:27:12 +0000
Subject: [pkgdb] ethtool: robert has requested commit
Message-ID: <20090115202714.B40A82081FF@bastion.fedora.phx.redhat.com>

robert has requested the commit acl on ethtool (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ethtool



From pkgdb at fedoraproject.org  Thu Jan 15 20:27:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 15 Jan 2009 20:27:14 +0000
Subject: [pkgdb] ethtool: robert has requested approveacls
Message-ID: <20090115202715.5D88B208488@bastion.fedora.phx.redhat.com>

robert has requested the approveacls acl on ethtool (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ethtool



From pkgdb at fedoraproject.org  Thu Jan 15 20:27:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 15 Jan 2009 20:27:21 +0000
Subject: [pkgdb] ethtool: robert has requested watchbugzilla
Message-ID: <20090115202721.5658120846E@bastion.fedora.phx.redhat.com>

robert has requested the watchbugzilla acl on ethtool (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ethtool



From pkgdb at fedoraproject.org  Thu Jan 15 20:27:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 15 Jan 2009 20:27:24 +0000
Subject: [pkgdb] ethtool: robert has requested watchcommits
Message-ID: <20090115202724.87AB8208473@bastion.fedora.phx.redhat.com>

robert has requested the watchcommits acl on ethtool (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ethtool



From pkgdb at fedoraproject.org  Thu Jan 15 20:27:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 15 Jan 2009 20:27:24 +0000
Subject: [pkgdb] ethtool: robert has requested watchbugzilla
Message-ID: <20090115202724.A69CF208481@bastion.fedora.phx.redhat.com>

robert has requested the watchbugzilla acl on ethtool (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ethtool



From pkgdb at fedoraproject.org  Thu Jan 15 20:27:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 15 Jan 2009 20:27:28 +0000
Subject: [pkgdb] ethtool: robert has requested commit
Message-ID: <20090115202728.539C9208457@bastion.fedora.phx.redhat.com>

robert has requested the commit acl on ethtool (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ethtool



From pkgdb at fedoraproject.org  Thu Jan 15 20:27:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 15 Jan 2009 20:27:30 +0000
Subject: [pkgdb] ethtool: robert has requested watchcommits
Message-ID: <20090115202731.150F7208484@bastion.fedora.phx.redhat.com>

robert has requested the watchcommits acl on ethtool (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ethtool



From pkgdb at fedoraproject.org  Thu Jan 15 20:27:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 15 Jan 2009 20:27:33 +0000
Subject: [pkgdb] ethtool: robert has requested approveacls
Message-ID: <20090115202733.903B0208479@bastion.fedora.phx.redhat.com>

robert has requested the approveacls acl on ethtool (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ethtool



From pkgdb at fedoraproject.org  Thu Jan 15 20:27:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 15 Jan 2009 20:27:37 +0000
Subject: [pkgdb] ethtool: robert has requested commit
Message-ID: <20090115202737.A8F6A208489@bastion.fedora.phx.redhat.com>

robert has requested the commit acl on ethtool (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ethtool



From pkgdb at fedoraproject.org  Thu Jan 15 20:27:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 15 Jan 2009 20:27:40 +0000
Subject: [pkgdb] ethtool: robert has requested approveacls
Message-ID: <20090115202740.1BB17208470@bastion.fedora.phx.redhat.com>

robert has requested the approveacls acl on ethtool (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ethtool



From tmraz at fedoraproject.org  Thu Jan 15 20:28:54 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Thu, 15 Jan 2009 20:28:54 +0000 (UTC)
Subject: rpms/dhcp/devel dhcp.spec,1.238,1.239
Message-ID: <20090115202854.737A07012D@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/dhcp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9819

Modified Files:
	dhcp.spec 
Log Message:
* Thu Jan 15 2009 Tomas Mraz <tmraz at redhat.com> - 12:4.1.0-5
- rebuild with new openssl



Index: dhcp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dhcp/devel/dhcp.spec,v
retrieving revision 1.238
retrieving revision 1.239
diff -u -r1.238 -r1.239
--- dhcp.spec	13 Jan 2009 14:45:31 -0000	1.238
+++ dhcp.spec	15 Jan 2009 20:28:23 -0000	1.239
@@ -12,7 +12,7 @@
 Summary:  Dynamic host configuration protocol software
 Name:     dhcp
 Version:  4.1.0
-Release:  4%{?dist}
+Release:  5%{?dist}
 # NEVER CHANGE THE EPOCH on this package.  The previous maintainer (prior to
 # dcantrell maintaining the package) made incorrect use of the epoch and
 # that's why it is at 12 now.  It should have never been used, but it was.
@@ -407,6 +407,9 @@
 %attr(0644,root,root) %{_mandir}/man3/omapi.3.gz
 
 %changelog
+* Thu Jan 15 2009 Tomas Mraz <tmraz at redhat.com> - 12:4.1.0-5
+- rebuild with new openssl
+
 * Tue Jan 13 2009 David Cantrell <dcantrell at redhat.com> - 12:4.1.0-4
 - Updated LSB init script header to reference /etc/dhcp/dhcpd.conf (#479012)
 



From pkgdb at fedoraproject.org  Thu Jan 15 20:28:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 15 Jan 2009 20:28:58 +0000
Subject: [pkgdb] ethtool had acl change status
Message-ID: <20090115202858.58865208469@bastion.fedora.phx.redhat.com>

tibbs has set the watchbugzilla acl on ethtool (Fedora devel) to Approved for robert

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ethtool



From pkgdb at fedoraproject.org  Thu Jan 15 20:29:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 15 Jan 2009 20:29:05 +0000
Subject: [pkgdb] ethtool had acl change status
Message-ID: <20090115202905.8C229208473@bastion.fedora.phx.redhat.com>

tibbs has set the watchcommits acl on ethtool (Fedora devel) to Approved for robert

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ethtool



From pkgdb at fedoraproject.org  Thu Jan 15 20:29:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 15 Jan 2009 20:29:08 +0000
Subject: [pkgdb] ethtool had acl change status
Message-ID: <20090115202909.5B8DB208472@bastion.fedora.phx.redhat.com>

tibbs has set the commit acl on ethtool (Fedora devel) to Approved for robert

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ethtool



From pkgdb at fedoraproject.org  Thu Jan 15 20:29:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 15 Jan 2009 20:29:10 +0000
Subject: [pkgdb] ethtool had acl change status
Message-ID: <20090115202910.EE87720847A@bastion.fedora.phx.redhat.com>

tibbs has set the approveacls acl on ethtool (Fedora devel) to Approved for robert

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ethtool



From pkgdb at fedoraproject.org  Thu Jan 15 20:29:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 15 Jan 2009 20:29:14 +0000
Subject: [pkgdb] ethtool had acl change status
Message-ID: <20090115202914.BB38E20847B@bastion.fedora.phx.redhat.com>

tibbs has set the watchbugzilla acl on ethtool (Fedora 9) to Approved for robert

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ethtool



From pkgdb at fedoraproject.org  Thu Jan 15 20:29:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 15 Jan 2009 20:29:18 +0000
Subject: [pkgdb] ethtool had acl change status
Message-ID: <20090115202918.7659D208482@bastion.fedora.phx.redhat.com>

tibbs has set the commit acl on ethtool (Fedora 9) to Approved for robert

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ethtool



From pkgdb at fedoraproject.org  Thu Jan 15 20:29:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 15 Jan 2009 20:29:19 +0000
Subject: [pkgdb] ethtool had acl change status
Message-ID: <20090115202919.63E7D208480@bastion.fedora.phx.redhat.com>

tibbs has set the approveacls acl on ethtool (Fedora 9) to Approved for robert

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ethtool



From pkgdb at fedoraproject.org  Thu Jan 15 20:29:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 15 Jan 2009 20:29:20 +0000
Subject: [pkgdb] ethtool had acl change status
Message-ID: <20090115202920.8A569208487@bastion.fedora.phx.redhat.com>

tibbs has set the watchcommits acl on ethtool (Fedora 9) to Approved for robert

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ethtool



From pkgdb at fedoraproject.org  Thu Jan 15 20:29:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 15 Jan 2009 20:29:24 +0000
Subject: [pkgdb] ethtool had acl change status
Message-ID: <20090115202924.B3F0620848C@bastion.fedora.phx.redhat.com>

tibbs has set the watchbugzilla acl on ethtool (Fedora 10) to Approved for robert

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ethtool



From pkgdb at fedoraproject.org  Thu Jan 15 20:29:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 15 Jan 2009 20:29:26 +0000
Subject: [pkgdb] ethtool had acl change status
Message-ID: <20090115202926.10B1C208490@bastion.fedora.phx.redhat.com>

tibbs has set the watchcommits acl on ethtool (Fedora 10) to Approved for robert

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ethtool



From pkgdb at fedoraproject.org  Thu Jan 15 20:29:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 15 Jan 2009 20:29:27 +0000
Subject: [pkgdb] ethtool had acl change status
Message-ID: <20090115202927.6F145208494@bastion.fedora.phx.redhat.com>

tibbs has set the commit acl on ethtool (Fedora 10) to Approved for robert

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ethtool



From pkgdb at fedoraproject.org  Thu Jan 15 20:29:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 15 Jan 2009 20:29:30 +0000
Subject: [pkgdb] ethtool had acl change status
Message-ID: <20090115202930.2D1412084B6@bastion.fedora.phx.redhat.com>

tibbs has set the approveacls acl on ethtool (Fedora 10) to Approved for robert

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ethtool



From tmraz at fedoraproject.org  Thu Jan 15 20:29:43 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Thu, 15 Jan 2009 20:29:43 +0000 (UTC)
Subject: rpms/dillo/devel dillo.spec,1.19,1.20
Message-ID: <20090115202943.DC9B67012D@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/dillo/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10050

Modified Files:
	dillo.spec 
Log Message:
* Thu Jan 15 2009 Tomas Mraz <tmraz at redhat.com> - 0.8.6-8
- rebuild with new openssl



Index: dillo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dillo/devel/dillo.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- dillo.spec	11 Feb 2008 16:09:43 -0000	1.19
+++ dillo.spec	15 Jan 2009 20:29:13 -0000	1.20
@@ -1,6 +1,6 @@
 Name:           dillo
 Version:        0.8.6
-Release:        7%{?dist}
+Release:        8%{?dist}
 
 Summary:        Very small and fast GUI web browser
 
@@ -106,6 +106,9 @@
 %{_libdir}/%{name}
 
 %changelog
+* Thu Jan 15 2009 Tomas Mraz <tmraz at redhat.com> - 0.8.6-8
+- rebuild with new openssl
+
 * Mon Feb 11 2008 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> - 0.8.6-7
 - Rebuilt for gcc43
 



From pkgdb at fedoraproject.org  Thu Jan 15 20:32:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 15 Jan 2009 20:32:03 +0000
Subject: [pkgdb] sugar-distance was added for fab
Message-ID: <20090115203203.74764208471@bastion.fedora.phx.redhat.com>

kevin has added Package sugar-distance with summary Distance measurement for Sugar
kevin has approved Package sugar-distance
kevin has added a Fedora devel branch for sugar-distance with an owner of fab
kevin has approved sugar-distance in Fedora devel
kevin has approved Package sugar-distance
kevin has set commit to Approved for provenpackager on sugar-distance (Fedora devel)
kevin has set build to Approved for provenpackager on sugar-distance (Fedora devel)
kevin has set checkout to Approved for provenpackager on sugar-distance (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-distance



From pkgdb at fedoraproject.org  Thu Jan 15 20:32:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 15 Jan 2009 20:32:05 +0000
Subject: [pkgdb] sugar-distance (Fedora, 10) updated by kevin
Message-ID: <20090115203206.916D6208482@bastion.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for sugar-distance
kevin has set commit to Approved for provenpackager on sugar-distance (Fedora 10)
kevin has set build to Approved for provenpackager on sugar-distance (Fedora 10)
kevin has set checkout to Approved for provenpackager on sugar-distance (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-distance



From kevin at fedoraproject.org  Thu Jan 15 20:32:20 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 15 Jan 2009 20:32:20 +0000 (UTC)
Subject: rpms/sugar-distance - New directory
Message-ID: <20090115203220.374087012D@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/sugar-distance
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsR10493/rpms/sugar-distance

Log Message:
Directory /cvs/pkgs/rpms/sugar-distance added to the repository




From kevin at fedoraproject.org  Thu Jan 15 20:32:20 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 15 Jan 2009 20:32:20 +0000 (UTC)
Subject: rpms/sugar-distance/devel - New directory
Message-ID: <20090115203220.7FC897012D@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/sugar-distance/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsR10493/rpms/sugar-distance/devel

Log Message:
Directory /cvs/pkgs/rpms/sugar-distance/devel added to the repository




From kevin at fedoraproject.org  Thu Jan 15 20:32:41 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 15 Jan 2009 20:32:41 +0000 (UTC)
Subject: rpms/sugar-distance Makefile,NONE,1.1
Message-ID: <20090115203241.CD4147012D@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/sugar-distance
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsR10493/rpms/sugar-distance

Added Files:
	Makefile 
Log Message:
Setup of module sugar-distance


--- NEW FILE Makefile ---
# Top level Makefile for module sugar-distance
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Jan 15 20:32:42 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 15 Jan 2009 20:32:42 +0000 (UTC)
Subject: rpms/sugar-distance/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090115203242.1BFF27012D@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/sugar-distance/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsR10493/rpms/sugar-distance/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module sugar-distance


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: sugar-distance
# $Id: Makefile,v 1.1 2009/01/15 20:32:41 kevin Exp $
NAME := sugar-distance
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From tmraz at fedoraproject.org  Thu Jan 15 20:37:08 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Thu, 15 Jan 2009 20:37:08 +0000 (UTC)
Subject: rpms/distcache/devel distcache.spec,1.22,1.23
Message-ID: <20090115203708.3BA917012D@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/distcache/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11023

Modified Files:
	distcache.spec 
Log Message:
* Thu Jan 15 2009 Tomas Mraz <tmraz at redhat.com> 1.4.5-18
- rebuild with new openssl



Index: distcache.spec
===================================================================
RCS file: /cvs/pkgs/rpms/distcache/devel/distcache.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- distcache.spec	13 Feb 2008 15:28:23 -0000	1.22
+++ distcache.spec	15 Jan 2009 20:36:37 -0000	1.23
@@ -2,7 +2,7 @@
 Summary: Distributed SSL session cache
 Name: distcache
 Version: 1.4.5
-Release: 17
+Release: 18
 License: LGPLv2
 Group: System Environment/Daemons
 URL: http://www.distcache.org/
@@ -102,6 +102,9 @@
 %{_mandir}/man2/*
 
 %changelog
+* Thu Jan 15 2009 Tomas Mraz <tmraz at redhat.com> 1.4.5-18
+- rebuild with new openssl
+
 * Wed Feb 13 2008 Joe Orton <jorton at redhat.com> 1.4.5-17
 - fix libnal build
 



From spot at fedoraproject.org  Thu Jan 15 20:37:15 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Thu, 15 Jan 2009 20:37:15 +0000 (UTC)
Subject: rpms/tiresias-fonts/devel tiresias-fonts-info-fontconfig.conf, NONE,
	1.1 tiresias-fonts-info-z-fontconfig.conf, NONE,
	1.1 tiresias-fonts-key-v2-fontconfig.conf, NONE,
	1.1 tiresias-fonts-lp-fontconfig.conf, NONE,
	1.1 tiresias-fonts-pc-fontconfig.conf, NONE,
	1.1 tiresias-fonts-pc-z-fontconfig.conf, NONE,
	1.1 tiresias-fonts-sign-fontconfig.conf, NONE,
	1.1 tiresias-fonts-sign-z-fontconfig.conf, NONE,
	1.1 tiresias-fonts.spec, 1.1, 1.2
Message-ID: <20090115203715.F101B7012D@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/tiresias-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11081

Modified Files:
	tiresias-fonts.spec 
Added Files:
	tiresias-fonts-info-fontconfig.conf 
	tiresias-fonts-info-z-fontconfig.conf 
	tiresias-fonts-key-v2-fontconfig.conf 
	tiresias-fonts-lp-fontconfig.conf 
	tiresias-fonts-pc-fontconfig.conf 
	tiresias-fonts-pc-z-fontconfig.conf 
	tiresias-fonts-sign-fontconfig.conf 
	tiresias-fonts-sign-z-fontconfig.conf 
Log Message:
convert package to new guidelines


--- NEW FILE tiresias-fonts-info-fontconfig.conf ---
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
<fontconfig>
  <alias>
    <family>sans-serif</family>
    <prefer>
      <family>Infofont</family>
    </prefer>
  </alias>
  <alias>
    <family>Infofont</family>
    <default>
      <family>sans-serif</family>
    </default>
  </alias>
  <alias binding="same">
    <family>Infofont Z</family>
    <accept>
      <family>Infofont</family>
    </accept>
  </alias>
</fontconfig>


--- NEW FILE tiresias-fonts-info-z-fontconfig.conf ---
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
<fontconfig>
  <alias>
    <family>sans-serif</family>
    <prefer>
      <family>Infofont Z</family>
    </prefer>
  </alias>
  <alias>
    <family>Infofont Z</family>
    <default>
      <family>sans-serif</family>
    </default>
  </alias>
  <alias binding="same">
    <family>Infofont</family>
    <accept>
      <family>Infofont Z</family>
    </accept>
  </alias>
</fontconfig>


--- NEW FILE tiresias-fonts-key-v2-fontconfig.conf ---
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
<fontconfig>
  <alias>
    <family>sans-serif</family>
    <prefer>
      <family>Keyfont V2</family>
    </prefer>
  </alias>
  <alias>
    <family>Keyfont V2</family>
    <default>
      <family>sans-serif</family>
    </default>
  </alias>
</fontconfig>


--- NEW FILE tiresias-fonts-lp-fontconfig.conf ---
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
<fontconfig>
  <alias>
    <family>serif</family>
    <prefer>
      <family>LPfont</family>
    </prefer>
  </alias>
  <alias>
    <family>LPfont</family>
    <default>
      <family>serif</family>
    </default>
  </alias>
</fontconfig>


--- NEW FILE tiresias-fonts-pc-fontconfig.conf ---
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
<fontconfig>
  <alias>
    <family>sans-serif</family>
    <prefer>
      <family>PCfont</family>
    </prefer>
  </alias>
  <alias>
    <family>PCfont</family>
    <default>
      <family>sans-serif</family>
    </default>
  </alias>
  <alias binding="same">
    <family>PCfont Z</family>
    <accept>
      <family>PCfont</family>
    </accept>
  </alias>
</fontconfig>


--- NEW FILE tiresias-fonts-pc-z-fontconfig.conf ---
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
<fontconfig>
  <alias>
    <family>sans-serif</family>
    <prefer>
      <family>PCfont Z</family>
    </prefer>
  </alias>
  <alias>
    <family>PCfont Z</family>
    <default>
      <family>sans-serif</family>
    </default>
  </alias>
  <alias binding="same">
    <family>PCfont</family>
    <accept>
      <family>PCfont Z</family>
    </accept>
  </alias>
</fontconfig>


--- NEW FILE tiresias-fonts-sign-fontconfig.conf ---
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
<fontconfig>
  <alias>
    <family>sans-serif</family>
    <prefer>
      <family>Signfont</family>
    </prefer>
  </alias>
  <alias>
    <family>Signfont</family>
    <default>
      <family>sans-serif</family>
    </default>
  </alias>
  <alias binding="same">
    <family>Signfont Z</family>
    <accept>
      <family>Signfont</family>
    </accept>
  </alias>
</fontconfig>


--- NEW FILE tiresias-fonts-sign-z-fontconfig.conf ---
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
<fontconfig>
  <alias>
    <family>sans-serif</family>
    <prefer>
      <family>Signfont Z</family>
    </prefer>
  </alias>
  <alias>
    <family>Signfont Z</family>
    <default>
      <family>sans-serif</family>
    </default>
  </alias>
  <alias binding="same">
    <family>Signfont</family>
    <accept>
      <family>Signfont Z</family>
    </accept>
  </alias>
</fontconfig>


Index: tiresias-fonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tiresias-fonts/devel/tiresias-fonts.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tiresias-fonts.spec	7 Jan 2008 22:39:39 -0000	1.1
+++ tiresias-fonts.spec	15 Jan 2009 20:36:45 -0000	1.2
@@ -1,11 +1,17 @@
 %define fontname tiresias
-%define fontdir %{_datadir}/fonts/%{fontname}
-%define fontconfdir %{_sysconfdir}/fonts/conf.d
+%define fontconf 60-%{fontname}.conf
+
+%define common_desc \
+The Tiresias family of fonts has been designed for use in multiple environments \
+to help improve legibility, especially for individuals with visual impairment. \
+It includes specialized fonts for information labels, control labels (for key \
+tops), large print publications, computer systems, television subtitling, and \
+signs.
 
 Name:		%{fontname}-fonts
 Summary: 	Low vision fonts
 Version:	1.0
-Release:	2%{?dist}
+Release:	3%{?dist}
 License:	GPLv3+
 Group:		User Interface/X
 Source0:	http://www.tiresias.org/fonts/infofont.zip
@@ -13,16 +19,148 @@
 Source2:	http://www.tiresias.org/fonts/lpfont.zip
 Source3:	http://www.tiresias.org/fonts/pcfont.zip
 Source4:	http://www.tiresias.org/fonts/signfont.zip
+Source5:	%{name}-info-fontconfig.conf
+Source6:	%{name}-info-z-fontconfig.conf
+Source7:	%{name}-key-v2-fontconfig.conf
+Source8:	%{name}-lp-fontconfig.conf
+Source9:	%{name}-pc-fontconfig.conf
+Source10:	%{name}-pc-z-fontconfig.conf
+Source11:	%{name}-sign-fontconfig.conf
+Source12:	%{name}-sign-z-fontconfig.conf
 URL:		http://www.tiresias.org/fonts/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires:	fontpackages-devel
 BuildArch:	noarch
 
 %description
-The Tiresias family of fonts has been designed for use in multiple environments 
-to help improve legibility, especially for individuals with visual impairment.
-It includes specialized fonts for information labels, control labels (for key
-tops), large print publications, computer systems, television subtitling, and 
-signs.
+%common_desc
+
+%package common
+Summary:	Common files for Tiresias fonts (documentation...)
+Group:		User Interface/X
+Requires:	fontpackages-filesystem
+
+%description common
+%common_desc
+
+This package consists of files used by other Tiresias packages.
+
+%package -n %{fontname}-info-fonts
+Summary:	Specialized fonts for info terminals for the visually impaired
+Group:		User Interface/X
+Requires:	%{name}-common = %{version}-%{release}
+
+%description -n %{fontname}-info-fonts
+%common_desc
+
+The Infofont family is specialized for use in informational labels on public 
+terminals such as ATMs using large characters. The only	difference between the
+Infofont and the Infofont Z families is whether the zero is crossed out or not.
+In the Infofont family, the zero is _not_ crossed out, which may lead to some
+confusion.
+
+%_font_pkg -n info -f %{fontconf}-infofont.conf "Tiresias*Infofont*.ttf"
+
+%package -n %{fontname}-info-z-fonts
+Summary:	Specialized fonts for info terminals for the visually impaired
+Group:		User Interface/X
+Requires:	%{name}-common = %{version}-%{release}
+
+%description -n %{fontname}-info-z-fonts
+%common_desc
+
+The Infofont Z family is specialized for use in informational labels on public
+terminals such as ATMs using large characters. The only difference between the
+Infofont Z and the Infofont families is whether the zero is crossed out or not.
+In the Infofont	Z family, the zero is crossed out.
+
+%_font_pkg -n info-z -f %{fontconf}-infofont-z.conf "TIRESIAS*INFOFONTZ*.ttf"
+
+%package -n %{fontname}-key-v2-fonts
+Summary:	Specialized fonts for labeling keycaps for the visually impaired
+Group:		User Interface/X
+Requires:	%{name}-common = %{version}-%{release}
+
+%description -n %{fontname}-key-v2-fonts
+%common_desc
+
+The Keyfont V2 family is specialized for use in labeling keycaps.
+
+%_font_pkg -n key-v2 -f %{fontconf}-keyfont-v2.conf "TIREKV__.ttf"
+
+%package -n %{fontname}-lp-fonts
+Summary:	Specialized font for large print publications
+Group:		User Interface/X
+Requires:	%{name}-common = %{version}-%{release}
+
+%description -n %{fontname}-lp-fonts
+%common_desc
+
+The LPfont family is specialized for use in large print publications.
+
+%_font_pkg -n lp -f %{fontconf}-lpfont.conf "Tiresias*LPfont*.ttf"
+
+%package -n %{fontname}-pc-fonts
+Summary:	Specialized fonts for use on PCs for the visually impaired
+Group:		User Interface/X
+Requires:	%{name}-common = %{version}-%{release}
+
+%description -n	%{fontname}-pc-fonts
+%common_desc
+
+The PCfont family is specialized for people with poor vision to use on PC 
+screens using large characters. The only difference between the PCfont and 
+the PCfont Z families is whether the zero is crossed out or not. In the 
+PCfont family, the zero is _not_ crossed out, which may lead to some
+confusion.
+
+%_font_pkg -n pc -f %{fontconf}-pcfont.conf "Tiresias*PCfont*.ttf"
+
+%package -n %{fontname}-pc-z-fonts
+Summary:	Specialized fonts for use on PCs for the visually impaired
+Group:		User Interface/X
+Requires:	%{name}-common = %{version}-%{release}
+
+%description -n %{fontname}-pc-z-fonts
+%common_desc
+
+The PCfont family is specialized for people with poor vision to use on PC
+screens using large characters.	The only difference between the PCfont and 
+the PCfont Z families is whether the zero is crossed out or not. In the
+PCfont Z family, the zero is crossed out.
+
+%_font_pkg -n pc-z -f %{fontconf}-pcfont-z.conf "TIRESIAS*PCFONTZ*.ttf"
+
+%package -n %{fontname}-sign-fonts
+Summary:	Specialized fonts for preparing signs for the visually impaired
+Group:		User Interface/X
+Requires:	%{name}-common = %{version}-%{release}
+
+%description -n %{fontname}-sign-fonts
+%common_desc
+
+The Signfont family is specialized for preparing signs for the visually 
+impaired, using large characters. The only difference between the Signfont and 
+the Signfont Z families is whether the zero is crossed out or not. In the
+Signfont family, the zero is _not_ crossed out, which may lead to some
+confusion.
+
+%_font_pkg -n sign -f %{fontconf}-signfont.conf "Tiresias*Signfont*.ttf"
+
+%package -n %{fontname}-sign-z-fonts
+Summary:	Specialized fonts for preparing signs for the visually impaired
+Group:		User Interface/X
+Requires:	%{name}-common = %{version}-%{release}
+
+%description -n	%{fontname}-sign-z-fonts
+%common_desc
+
+The Signfont family is specialized for preparing signs for the visually 
+impaired, using	large characters. The only difference between the Signfont and 
+the Signfont Z families is whether the zero is crossed out or not. In the 
+Signfont Z family, the zero is crossed out.
+
+%_font_pkg -n sign-z -f %{fontconf}-signfont-z.conf "TIRESIAS*SIGNFONTZ*.ttf"
 
 %prep
 %setup -q -c -n %{name}
@@ -40,32 +178,36 @@
 %build
 
 %install
-rm -rf $RPM_BUILD_ROOT
-install -m 0755 -d $RPM_BUILD_ROOT%{fontdir}
-install -m 0644 -p *.ttf $RPM_BUILD_ROOT%{fontdir}
+rm -rf %{buildroot}
+install -m 0755 -d %{buildroot}%{_fontdir}
+install -m 0644 -p *.ttf %{buildroot}%{_fontdir}
+install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} %{buildroot}%{_fontconfig_confdir}
+install -m 0644 -p %{SOURCE5} %{buildroot}%{_fontconfig_templatedir}/%{fontconf}-infofont.conf
+install -m 0644 -p %{SOURCE6} %{buildroot}%{_fontconfig_templatedir}/%{fontconf}-infofont-z.conf
+install -m 0644 -p %{SOURCE7} %{buildroot}%{_fontconfig_templatedir}/%{fontconf}-keyfont-v2.conf
+install -m 0644 -p %{SOURCE8} %{buildroot}%{_fontconfig_templatedir}/%{fontconf}-lpfont.conf
+install -m 0644 -p %{SOURCE9} %{buildroot}%{_fontconfig_templatedir}/%{fontconf}-pcfont.conf
+install -m 0644 -p %{SOURCE10} %{buildroot}%{_fontconfig_templatedir}/%{fontconf}-pcfont-z.conf
+install -m 0644 -p %{SOURCE11} %{buildroot}%{_fontconfig_templatedir}/%{fontconf}-signfont.conf
+install -m 0644 -p %{SOURCE12} %{buildroot}%{_fontconfig_templatedir}/%{fontconf}-signfont-z.conf
+
+for fontconf in %{fontconf}-infofont.conf %{fontconf}-infofont-z.conf %{fontconf}-keyfont-v2.conf %{fontconf}-lpfont.conf\
+		%{fontconf}-pcfont.conf %{fontconf}-pcfont-z.conf %{fontconf}-signfont.conf %{fontconf}-signfont-z.conf; do
+	ln -s %{_fontconfig_templatedir}/$fontconf %{buildroot}%{_fontconfig_confdir}/$fontconf
+done
 
 %clean
-rm -rf $RPM_BUILD_ROOT
-
-%post
-if [ -x %{_bindir}/fc-cache ]; then
-	%{_bindir}/fc-cache -f %{fontdir} || :
-fi
-
-%postun
-if [ "$1" = "0" ]; then
-	if [ -x %{_bindir}/fc-cache ]; then
-		%{_bindir}/fc-cache -f %{fontdir} || :
-	fi
-fi
+rm -rf %{buildroot}
 
-%files
+%files common
 %defattr(0644,root,root,0755)
 %doc COPYING/copying.doc COPYING/gpl.txt
-%dir %{fontdir}
-%{fontdir}/*.ttf 
+%dir %{_fontdir}
 
 %changelog
+* Thu Jan 15 2009 Tom "spot" Callaway <tcallawa at redhat.com> 1.0-3
+- rework to meet new font packaging guidelines
+
 * Wed Jan  2 2008 Tom "spot" Callaway <tcallawa at redhat.com> 1.0-2
 - font versions didn't change, but sha1sums did
 



From pkgdb at fedoraproject.org  Thu Jan 15 20:37:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 15 Jan 2009 20:37:25 +0000
Subject: [pkgdb] sugar-implode was added for fab
Message-ID: <20090115203726.21F432082B9@bastion.fedora.phx.redhat.com>

kevin has added Package sugar-implode with summary Implode for Sugar
kevin has approved Package sugar-implode
kevin has added a Fedora devel branch for sugar-implode with an owner of fab
kevin has approved sugar-implode in Fedora devel
kevin has approved Package sugar-implode
kevin has set commit to Approved for provenpackager on sugar-implode (Fedora devel)
kevin has set build to Approved for provenpackager on sugar-implode (Fedora devel)
kevin has set checkout to Approved for provenpackager on sugar-implode (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-implode



From pkgdb at fedoraproject.org  Thu Jan 15 20:37:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 15 Jan 2009 20:37:27 +0000
Subject: [pkgdb] sugar-implode (Fedora, 10) updated by kevin
Message-ID: <20090115203728.C8050208468@bastion.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for sugar-implode
kevin has set commit to Approved for provenpackager on sugar-implode (Fedora 10)
kevin has set build to Approved for provenpackager on sugar-implode (Fedora 10)
kevin has set checkout to Approved for provenpackager on sugar-implode (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-implode



From kevin at fedoraproject.org  Thu Jan 15 20:37:45 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 15 Jan 2009 20:37:45 +0000 (UTC)
Subject: rpms/sugar-implode - New directory
Message-ID: <20090115203745.2D1B77012D@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/sugar-implode
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsk11391/rpms/sugar-implode

Log Message:
Directory /cvs/pkgs/rpms/sugar-implode added to the repository




From kevin at fedoraproject.org  Thu Jan 15 20:37:45 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 15 Jan 2009 20:37:45 +0000 (UTC)
Subject: rpms/sugar-implode/devel - New directory
Message-ID: <20090115203745.779A37012D@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/sugar-implode/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsk11391/rpms/sugar-implode/devel

Log Message:
Directory /cvs/pkgs/rpms/sugar-implode/devel added to the repository




From kevin at fedoraproject.org  Thu Jan 15 20:38:07 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 15 Jan 2009 20:38:07 +0000 (UTC)
Subject: rpms/sugar-implode Makefile,NONE,1.1
Message-ID: <20090115203807.6BF597012D@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/sugar-implode
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsk11391/rpms/sugar-implode

Added Files:
	Makefile 
Log Message:
Setup of module sugar-implode


--- NEW FILE Makefile ---
# Top level Makefile for module sugar-implode
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Jan 15 20:38:07 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 15 Jan 2009 20:38:07 +0000 (UTC)
Subject: rpms/sugar-implode/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090115203807.D5E3D7012D@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/sugar-implode/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsk11391/rpms/sugar-implode/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module sugar-implode


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: sugar-implode
# $Id: Makefile,v 1.1 2009/01/15 20:38:07 kevin Exp $
NAME := sugar-implode
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Jan 15 20:41:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 15 Jan 2009 20:41:08 +0000
Subject: [pkgdb] python-py was added for thm
Message-ID: <20090115204108.D2AE02082B9@bastion.fedora.phx.redhat.com>

kevin has added Package python-py with summary Innovative python library containing py.test, greenlets and other niceties
kevin has approved Package python-py
kevin has added a Fedora devel branch for python-py with an owner of thm
kevin has approved python-py in Fedora devel
kevin has approved Package python-py
kevin has set commit to Approved for provenpackager on python-py (Fedora devel)
kevin has set build to Approved for provenpackager on python-py (Fedora devel)
kevin has set checkout to Approved for provenpackager on python-py (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-py



From pkgdb at fedoraproject.org  Thu Jan 15 20:41:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 15 Jan 2009 20:41:11 +0000
Subject: [pkgdb] python-py (Fedora, 9) updated by kevin
Message-ID: <20090115204111.B3273208457@bastion.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for python-py
kevin has set commit to Approved for provenpackager on python-py (Fedora 9)
kevin has set build to Approved for provenpackager on python-py (Fedora 9)
kevin has set checkout to Approved for provenpackager on python-py (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-py



From pkgdb at fedoraproject.org  Thu Jan 15 20:41:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 15 Jan 2009 20:41:11 +0000
Subject: [pkgdb] python-py (Fedora, 10) updated by kevin
Message-ID: <20090115204111.C2854208469@bastion.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for python-py
kevin has set commit to Approved for provenpackager on python-py (Fedora 10)
kevin has set build to Approved for provenpackager on python-py (Fedora 10)
kevin has set checkout to Approved for provenpackager on python-py (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-py



From kevin at fedoraproject.org  Thu Jan 15 20:41:25 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 15 Jan 2009 20:41:25 +0000 (UTC)
Subject: rpms/python-py - New directory
Message-ID: <20090115204125.2FA3B70142@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/python-py
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsH11913/rpms/python-py

Log Message:
Directory /cvs/pkgs/rpms/python-py added to the repository




From kevin at fedoraproject.org  Thu Jan 15 20:41:25 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 15 Jan 2009 20:41:25 +0000 (UTC)
Subject: rpms/python-py/devel - New directory
Message-ID: <20090115204125.7B43970142@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/python-py/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsH11913/rpms/python-py/devel

Log Message:
Directory /cvs/pkgs/rpms/python-py/devel added to the repository




From kevin at fedoraproject.org  Thu Jan 15 20:41:44 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 15 Jan 2009 20:41:44 +0000 (UTC)
Subject: rpms/python-py Makefile,NONE,1.1
Message-ID: <20090115204144.9F98170141@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/python-py
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsH11913/rpms/python-py

Added Files:
	Makefile 
Log Message:
Setup of module python-py


--- NEW FILE Makefile ---
# Top level Makefile for module python-py
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Jan 15 20:41:44 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 15 Jan 2009 20:41:44 +0000 (UTC)
Subject: rpms/python-py/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090115204144.E8B7370141@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/python-py/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsH11913/rpms/python-py/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module python-py


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: python-py
# $Id: Makefile,v 1.1 2009/01/15 20:41:44 kevin Exp $
NAME := python-py
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out 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  Thu Jan 15 20:42:10 2009
From: s4504kr at fedoraproject.org (Jochen Schmitt)
Date: Thu, 15 Jan 2009 20:42:10 +0000 (UTC)
Subject: rpms/suck/devel suck.spec,1.19,1.20
Message-ID: <20090115204210.7754870141@cvs1.fedora.phx.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/suck/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12076

Modified Files:
	suck.spec 
Log Message:
Rebuild for new openssl package


Index: suck.spec
===================================================================
RCS file: /cvs/extras/rpms/suck/devel/suck.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- suck.spec	13 Jul 2008 17:51:31 -0000	1.19
+++ suck.spec	15 Jan 2009 20:41:40 -0000	1.20
@@ -1,7 +1,7 @@
 Name: suck
 Summary: Download news from remote NNTP server
 Version: 4.3.2
-Release: 23%{?dist}
+Release: 24%{?dist}
 Source: http://www.sucknews.org/%{name}-%{version}.tar.gz
 Source1: active-ignore
 Source2: suck-4.3.2.site
@@ -89,6 +89,9 @@
 %dir %{_sysconfdir}/news/suck.d/
 
 %changelog
+* Thu Jan 15 2009 Jochen Schmitt <Jochen herr-schmitt de> 4.3.2-24
+- Rebuild for new openssl package
+
 * Thu Jul 10 2008 Jochen Schmitt <Jochen herr-schmitt de> 4.3.2-23
 - Build agains dynamic inn libraries
 



From pkgdb at fedoraproject.org  Thu Jan 15 20:42:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 15 Jan 2009 20:42:56 +0000
Subject: [pkgdb] xwxapt was added for dp67
Message-ID: <20090115204256.AC2C9208457@bastion.fedora.phx.redhat.com>

kevin has added Package xwxapt with summary An application for decoding and saving weather images
kevin has approved Package xwxapt
kevin has added a Fedora devel branch for xwxapt with an owner of dp67
kevin has approved xwxapt in Fedora devel
kevin has approved Package xwxapt
kevin has set commit to Approved for provenpackager on xwxapt (Fedora devel)
kevin has set build to Approved for provenpackager on xwxapt (Fedora devel)
kevin has set checkout to Approved for provenpackager on xwxapt (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/xwxapt



From pkgdb at fedoraproject.org  Thu Jan 15 20:42:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 15 Jan 2009 20:42:58 +0000
Subject: [pkgdb] xwxapt (Fedora, 9) updated by kevin
Message-ID: <20090115204301.22085208467@bastion.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for xwxapt
kevin has set commit to Approved for provenpackager on xwxapt (Fedora 9)
kevin has set build to Approved for provenpackager on xwxapt (Fedora 9)
kevin has set checkout to Approved for provenpackager on xwxapt (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/xwxapt



From pkgdb at fedoraproject.org  Thu Jan 15 20:42:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 15 Jan 2009 20:42:58 +0000
Subject: [pkgdb] xwxapt (Fedora, 10) updated by kevin
Message-ID: <20090115204302.5177220846E@bastion.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for xwxapt
kevin has set commit to Approved for provenpackager on xwxapt (Fedora 10)
kevin has set build to Approved for provenpackager on xwxapt (Fedora 10)
kevin has set checkout to Approved for provenpackager on xwxapt (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/xwxapt



From kevin at fedoraproject.org  Thu Jan 15 20:43:16 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 15 Jan 2009 20:43:16 +0000 (UTC)
Subject: rpms/xwxapt/devel - New directory
Message-ID: <20090115204316.6331870141@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/xwxapt/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsy13111/rpms/xwxapt/devel

Log Message:
Directory /cvs/pkgs/rpms/xwxapt/devel added to the repository




From kevin at fedoraproject.org  Thu Jan 15 20:43:16 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 15 Jan 2009 20:43:16 +0000 (UTC)
Subject: rpms/xwxapt - New directory
Message-ID: <20090115204316.30BCE7012D@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/xwxapt
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsy13111/rpms/xwxapt

Log Message:
Directory /cvs/pkgs/rpms/xwxapt added to the repository




From kevin at fedoraproject.org  Thu Jan 15 20:43:32 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 15 Jan 2009 20:43:32 +0000 (UTC)
Subject: rpms/xwxapt Makefile,NONE,1.1
Message-ID: <20090115204332.2C1127012D@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/xwxapt
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsy13111/rpms/xwxapt

Added Files:
	Makefile 
Log Message:
Setup of module xwxapt


--- NEW FILE Makefile ---
# Top level Makefile for module xwxapt
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Jan 15 20:43:32 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 15 Jan 2009 20:43:32 +0000 (UTC)
Subject: rpms/xwxapt/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <20090115204332.661777012D@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/xwxapt/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsy13111/rpms/xwxapt/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module xwxapt


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: xwxapt
# $Id: Makefile,v 1.1 2009/01/15 20:43:32 kevin Exp $
NAME := xwxapt
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Jan 15 20:45:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 15 Jan 2009 20:45:16 +0000
Subject: [pkgdb] wxapt was added for dp67
Message-ID: <20090115204517.0FEB9208457@bastion.fedora.phx.redhat.com>

kevin has added Package wxapt with summary A command line tool for decoding weather images transmitted by satellites
kevin has approved Package wxapt
kevin has added a Fedora devel branch for wxapt with an owner of dp67
kevin has approved wxapt in Fedora devel
kevin has approved Package wxapt
kevin has set commit to Approved for provenpackager on wxapt (Fedora devel)
kevin has set build to Approved for provenpackager on wxapt (Fedora devel)
kevin has set checkout to Approved for provenpackager on wxapt (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/wxapt



From pkgdb at fedoraproject.org  Thu Jan 15 20:45:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 15 Jan 2009 20:45:18 +0000
Subject: [pkgdb] wxapt (Fedora, 9) updated by kevin
Message-ID: <20090115204518.58887208467@bastion.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for wxapt
kevin has set commit to Approved for provenpackager on wxapt (Fedora 9)
kevin has set build to Approved for provenpackager on wxapt (Fedora 9)
kevin has set checkout to Approved for provenpackager on wxapt (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/wxapt



From pkgdb at fedoraproject.org  Thu Jan 15 20:45:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 15 Jan 2009 20:45:18 +0000
Subject: [pkgdb] wxapt (Fedora, 10) updated by kevin
Message-ID: <20090115204518.648A120846C@bastion.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for wxapt
kevin has set commit to Approved for provenpackager on wxapt (Fedora 10)
kevin has set build to Approved for provenpackager on wxapt (Fedora 10)
kevin has set checkout to Approved for provenpackager on wxapt (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/wxapt



From kevin at fedoraproject.org  Thu Jan 15 20:45:35 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 15 Jan 2009 20:45:35 +0000 (UTC)
Subject: rpms/wxapt - New directory
Message-ID: <20090115204535.3F0B27012D@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/wxapt
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsx13616/rpms/wxapt

Log Message:
Directory /cvs/pkgs/rpms/wxapt added to the repository




From kevin at fedoraproject.org  Thu Jan 15 20:45:35 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 15 Jan 2009 20:45:35 +0000 (UTC)
Subject: rpms/wxapt/devel - New directory
Message-ID: <20090115204535.A73557012D@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/wxapt/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsx13616/rpms/wxapt/devel

Log Message:
Directory /cvs/pkgs/rpms/wxapt/devel added to the repository




From kevin at fedoraproject.org  Thu Jan 15 20:45:58 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 15 Jan 2009 20:45:58 +0000 (UTC)
Subject: rpms/wxapt/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <20090115204558.A4CCA70141@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/wxapt/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsx13616/rpms/wxapt/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module wxapt


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: wxapt
# $Id: Makefile,v 1.1 2009/01/15 20:45:58 kevin Exp $
NAME := wxapt
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out 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 Jan 15 20:45:58 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 15 Jan 2009 20:45:58 +0000 (UTC)
Subject: rpms/wxapt Makefile,NONE,1.1
Message-ID: <20090115204558.428457012D@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/wxapt
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsx13616/rpms/wxapt

Added Files:
	Makefile 
Log Message:
Setup of module wxapt


--- NEW FILE Makefile ---
# Top level Makefile for module wxapt
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout 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 Jan 15 20:46:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 15 Jan 2009 20:46:25 +0000
Subject: [pkgdb] rubygem-restr (Fedora, 9) updated by kevin
Message-ID: <20090115204625.46633208457@bastion.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for rubygem-restr
kevin has set commit to Approved for provenpackager on rubygem-restr (Fedora 9)
kevin has set build to Approved for provenpackager on rubygem-restr (Fedora 9)
kevin has set checkout to Approved for provenpackager on rubygem-restr (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rubygem-restr



From pkgdb at fedoraproject.org  Thu Jan 15 20:46:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 15 Jan 2009 20:46:23 +0000
Subject: [pkgdb] rubygem-restr was added for kanarip
Message-ID: <20090115204623.534D32082B9@bastion.fedora.phx.redhat.com>

kevin has added Package rubygem-restr with summary Simple client for RESTful web services
kevin has approved Package rubygem-restr
kevin has added a Fedora devel branch for rubygem-restr with an owner of kanarip
kevin has approved rubygem-restr in Fedora devel
kevin has approved Package rubygem-restr
kevin has set commit to Approved for provenpackager on rubygem-restr (Fedora devel)
kevin has set build to Approved for provenpackager on rubygem-restr (Fedora devel)
kevin has set checkout to Approved for provenpackager on rubygem-restr (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rubygem-restr



From pkgdb at fedoraproject.org  Thu Jan 15 20:46:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 15 Jan 2009 20:46:25 +0000
Subject: [pkgdb] rubygem-restr (Fedora, 10) updated by kevin
Message-ID: <20090115204625.67D8C20846C@bastion.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for rubygem-restr
kevin has set commit to Approved for provenpackager on rubygem-restr (Fedora 10)
kevin has set build to Approved for provenpackager on rubygem-restr (Fedora 10)
kevin has set checkout to Approved for provenpackager on rubygem-restr (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rubygem-restr



From pkgdb at fedoraproject.org  Thu Jan 15 20:46:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 15 Jan 2009 20:46:25 +0000
Subject: [pkgdb] rubygem-restr (Fedora EPEL, 4) updated by kevin
Message-ID: <20090115204626.34A0B208471@bastion.fedora.phx.redhat.com>

kevin added a Fedora EPEL 4 branch for rubygem-restr
kevin has set commit to Approved for provenpackager on rubygem-restr (Fedora EPEL 4)
kevin has set build to Approved for provenpackager on rubygem-restr (Fedora EPEL 4)
kevin has set checkout to Approved for provenpackager on rubygem-restr (Fedora EPEL 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rubygem-restr



From pkgdb at fedoraproject.org  Thu Jan 15 20:46:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 15 Jan 2009 20:46:25 +0000
Subject: [pkgdb] rubygem-restr (Fedora EPEL, 5) updated by kevin
Message-ID: <20090115204626.40A98208474@bastion.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for rubygem-restr
kevin has set commit to Approved for provenpackager on rubygem-restr (Fedora EPEL 5)
kevin has set build to Approved for provenpackager on rubygem-restr (Fedora EPEL 5)
kevin has set checkout to Approved for provenpackager on rubygem-restr (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rubygem-restr



From kevin at fedoraproject.org  Thu Jan 15 20:46:45 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 15 Jan 2009 20:46:45 +0000 (UTC)
Subject: rpms/rubygem-restr - New directory
Message-ID: <20090115204645.2FC167012D@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/rubygem-restr
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsK13919/rpms/rubygem-restr

Log Message:
Directory /cvs/pkgs/rpms/rubygem-restr added to the repository




From kevin at fedoraproject.org  Thu Jan 15 20:46:45 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 15 Jan 2009 20:46:45 +0000 (UTC)
Subject: rpms/rubygem-restr/devel - New directory
Message-ID: <20090115204645.80C6E7012D@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/rubygem-restr/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsK13919/rpms/rubygem-restr/devel

Log Message:
Directory /cvs/pkgs/rpms/rubygem-restr/devel added to the repository




From kevin at fedoraproject.org  Thu Jan 15 20:47:03 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 15 Jan 2009 20:47:03 +0000 (UTC)
Subject: rpms/rubygem-restr Makefile,NONE,1.1
Message-ID: <20090115204703.ADFD27012D@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/rubygem-restr
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsK13919/rpms/rubygem-restr

Added Files:
	Makefile 
Log Message:
Setup of module rubygem-restr


--- NEW FILE Makefile ---
# Top level Makefile for module rubygem-restr
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Jan 15 20:47:04 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 15 Jan 2009 20:47:04 +0000 (UTC)
Subject: rpms/rubygem-restr/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090115204704.027A770143@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/rubygem-restr/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsK13919/rpms/rubygem-restr/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module rubygem-restr


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: rubygem-restr
# $Id: Makefile,v 1.1 2009/01/15 20:47:03 kevin Exp $
NAME := rubygem-restr
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out 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  Thu Jan 15 20:47:17 2009
From: s4504kr at fedoraproject.org (Jochen Schmitt)
Date: Thu, 15 Jan 2009 20:47:17 +0000 (UTC)
Subject: rpms/aplus-fsf/devel aplus-fsf.spec,1.31,1.32
Message-ID: <20090115204717.135A47012D@cvs1.fedora.phx.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/aplus-fsf/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13934

Modified Files:
	aplus-fsf.spec 
Log Message:
Rebuild for new openssl package


Index: aplus-fsf.spec
===================================================================
RCS file: /cvs/extras/rpms/aplus-fsf/devel/aplus-fsf.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- aplus-fsf.spec	7 Jan 2009 20:01:52 -0000	1.31
+++ aplus-fsf.spec	15 Jan 2009 20:46:46 -0000	1.32
@@ -14,7 +14,7 @@
 
 Name: %name
 Version: 4.22.4
-Release: 8%{?dist}
+Release: 9%{?dist}
 License: GPLv2
 
 Summary: Advanced APL interpreter with s interface
@@ -170,6 +170,9 @@
 %{_lispstart}/aplus-fsf-init.el
 
 %Changelog
+* Thu Jan 15 2009 Jochen Schmitt <Jochen herr-schmitt de> 4.22.4-9
+- Rebuild for new openssl package
+
 * Wed Jan  7 2009 Jochen Schmitt <Jochen herr-schmitt de> 4.22.4-8
 - Reorganization of apl fonts
 



From pkgdb at fedoraproject.org  Thu Jan 15 20:47:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 15 Jan 2009 20:47:55 +0000
Subject: [pkgdb] perl-MooseX-Types-DateTime was added for cweyl
Message-ID: <20090115204755.E57DD2081FF@bastion.fedora.phx.redhat.com>

kevin has added Package perl-MooseX-Types-DateTime with summary DateTime related constraints and coercions for Moose
kevin has approved Package perl-MooseX-Types-DateTime
kevin has added a Fedora devel branch for perl-MooseX-Types-DateTime with an owner of cweyl
kevin has approved perl-MooseX-Types-DateTime in Fedora devel
kevin has approved Package perl-MooseX-Types-DateTime
kevin has set commit to Approved for provenpackager on perl-MooseX-Types-DateTime (Fedora devel)
kevin has set build to Approved for provenpackager on perl-MooseX-Types-DateTime (Fedora devel)
kevin has set checkout to Approved for provenpackager on perl-MooseX-Types-DateTime (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-MooseX-Types-DateTime



From pkgdb at fedoraproject.org  Thu Jan 15 20:47:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 15 Jan 2009 20:47:57 +0000
Subject: [pkgdb] perl-MooseX-Types-DateTime (Fedora, 9) updated by kevin
Message-ID: <20090115204757.C818F208456@bastion.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for perl-MooseX-Types-DateTime
kevin has set commit to Approved for provenpackager on perl-MooseX-Types-DateTime (Fedora 9)
kevin has set build to Approved for provenpackager on perl-MooseX-Types-DateTime (Fedora 9)
kevin has set checkout to Approved for provenpackager on perl-MooseX-Types-DateTime (Fedora 9)
kevin approved watchbugzilla on perl-MooseX-Types-DateTime (Fedora 9) for perl-sig
kevin approved watchcommits on perl-MooseX-Types-DateTime (Fedora 9) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-MooseX-Types-DateTime



From pkgdb at fedoraproject.org  Thu Jan 15 20:47:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 15 Jan 2009 20:47:57 +0000
Subject: [pkgdb] perl-MooseX-Types-DateTime (Fedora, 10) updated by kevin
Message-ID: <20090115204757.DBD84208468@bastion.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for perl-MooseX-Types-DateTime
kevin has set commit to Approved for provenpackager on perl-MooseX-Types-DateTime (Fedora 10)
kevin has set build to Approved for provenpackager on perl-MooseX-Types-DateTime (Fedora 10)
kevin has set checkout to Approved for provenpackager on perl-MooseX-Types-DateTime (Fedora 10)
kevin approved watchbugzilla on perl-MooseX-Types-DateTime (Fedora 10) for perl-sig
kevin approved watchcommits on perl-MooseX-Types-DateTime (Fedora 10) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-MooseX-Types-DateTime



From kevin at fedoraproject.org  Thu Jan 15 20:48:12 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 15 Jan 2009 20:48:12 +0000 (UTC)
Subject: rpms/perl-MooseX-Types-DateTime/devel - New directory
Message-ID: <20090115204812.61DC270143@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-MooseX-Types-DateTime/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsh14393/rpms/perl-MooseX-Types-DateTime/devel

Log Message:
Directory /cvs/pkgs/rpms/perl-MooseX-Types-DateTime/devel added to the repository




From kevin at fedoraproject.org  Thu Jan 15 20:48:12 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 15 Jan 2009 20:48:12 +0000 (UTC)
Subject: rpms/perl-MooseX-Types-DateTime - New directory
Message-ID: <20090115204812.263167012D@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-MooseX-Types-DateTime
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsh14393/rpms/perl-MooseX-Types-DateTime

Log Message:
Directory /cvs/pkgs/rpms/perl-MooseX-Types-DateTime added to the repository




From pkgdb at fedoraproject.org  Thu Jan 15 20:47:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 15 Jan 2009 20:47:57 +0000
Subject: [pkgdb] perl-MooseX-Types-DateTime (Fedora, devel) updated by kevin
Message-ID: <20090115204758.2782D20846E@bastion.fedora.phx.redhat.com>

kevin approved watchbugzilla on perl-MooseX-Types-DateTime (Fedora devel) for perl-sig
kevin approved watchcommits on perl-MooseX-Types-DateTime (Fedora devel) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-MooseX-Types-DateTime



From kevin at fedoraproject.org  Thu Jan 15 20:48:29 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 15 Jan 2009 20:48:29 +0000 (UTC)
Subject: rpms/perl-MooseX-Types-DateTime Makefile,NONE,1.1
Message-ID: <20090115204829.88FF67012D@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-MooseX-Types-DateTime
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsh14393/rpms/perl-MooseX-Types-DateTime

Added Files:
	Makefile 
Log Message:
Setup of module perl-MooseX-Types-DateTime


--- NEW FILE Makefile ---
# Top level Makefile for module perl-MooseX-Types-DateTime
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Jan 15 20:48:29 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 15 Jan 2009 20:48:29 +0000 (UTC)
Subject: rpms/perl-MooseX-Types-DateTime/devel .cvsignore, NONE, 1.1 Makefile,
	NONE, 1.1 sources, NONE, 1.1
Message-ID: <20090115204829.DC4FE7012D@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-MooseX-Types-DateTime/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsh14393/rpms/perl-MooseX-Types-DateTime/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-MooseX-Types-DateTime


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: perl-MooseX-Types-DateTime
# $Id: Makefile,v 1.1 2009/01/15 20:48:29 kevin Exp $
NAME := perl-MooseX-Types-DateTime
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From rakesh at fedoraproject.org  Thu Jan 15 20:52:46 2009
From: rakesh at fedoraproject.org (Rakesh Pandit)
Date: Thu, 15 Jan 2009 20:52:46 +0000 (UTC)
Subject: rpms/dayplanner/devel import.log, NONE, 1.1 .cvsignore, 1.3,
	1.4 dayplanner.spec, 1.6, 1.7 sources, 1.3, 1.4
Message-ID: <20090115205246.5F0127012D@cvs1.fedora.phx.redhat.com>

Author: rakesh

Update of /cvs/pkgs/rpms/dayplanner/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13091/devel

Modified Files:
	.cvsignore dayplanner.spec sources 
Added Files:
	import.log 
Log Message:
Updated to 0.9.2



--- NEW FILE import.log ---
dayplanner-0_9_2-1_fc10:HEAD:dayplanner-0.9.2-1.fc10.src.rpm:1232008961


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/dayplanner/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	19 Jul 2008 00:25:10 -0000	1.3
+++ .cvsignore	15 Jan 2009 20:52:15 -0000	1.4
@@ -1 +1 @@
-dayplanner-0.9.1.tar.bz2
+dayplanner-0.9.2.tar.bz2


Index: dayplanner.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dayplanner/devel/dayplanner.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- dayplanner.spec	24 Jul 2008 21:06:51 -0000	1.6
+++ dayplanner.spec	15 Jan 2009 20:52:15 -0000	1.7
@@ -2,8 +2,8 @@
 %{?_with_holidayparser: %{expand: %%global include_holidayparser 1}}
 
 Name:           dayplanner
-Version:        0.9.1
-Release:        3%{?dist}
+Version:        0.9.2
+Release:        1%{?dist}
 Summary:        An easy and clean Day Planner
 Summary(pl):    Prosty i elegancki organizer
 Summary(de):    Ein einfacher und klarer Tagesplaner
@@ -144,6 +144,9 @@
 %{_datadir}/icons/hicolor/*x*/apps/%{name}.png
 
 %changelog
+* Fri Jan 16 2009 Rakesh Pandit <rakesh at fedoraproject.org> - 0.9.2-1
+- Updated to 0.9.2
+
 * Sat Jul 19 2008 Christoph Wickert <fedora christoph-wickert de> - 0.9.1-3
 - Filter out all dayplanner related Requires and Provides
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dayplanner/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	19 Jul 2008 00:25:10 -0000	1.3
+++ sources	15 Jan 2009 20:52:15 -0000	1.4
@@ -1 +1 @@
-6a785c44e3fcd211dda7997b2920475d  dayplanner-0.9.1.tar.bz2
+358a3e7c9e17f640de9cc5554f563b5b  dayplanner-0.9.2.tar.bz2



From s4504kr at fedoraproject.org  Thu Jan 15 20:52:53 2009
From: s4504kr at fedoraproject.org (Jochen Schmitt)
Date: Thu, 15 Jan 2009 20:52:53 +0000 (UTC)
Subject: rpms/blender/devel blender.spec,1.98,1.99
Message-ID: <20090115205253.437547012D@cvs1.fedora.phx.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/blender/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14895

Modified Files:
	blender.spec 
Log Message:
Rebuild for new openssl package


Index: blender.spec
===================================================================
RCS file: /cvs/extras/rpms/blender/devel/blender.spec,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -r1.98 -r1.99
--- blender.spec	11 Jan 2009 21:03:27 -0000	1.98
+++ blender.spec	15 Jan 2009 20:52:23 -0000	1.99
@@ -5,7 +5,7 @@
 
 Name:           blender
 Version:        2.48a
-Release: 	10%{?dist}
+Release: 	11%{?dist}
 
 Summary:        3D modeling, animation, rendering and post-production
 
@@ -195,6 +195,9 @@
 %{_datadir}/mime/packages/blender.xml
 
 %changelog
+* Thu Jan 15 2009 Jochen Schmitt <Jochen herr-schmitt de> 2.48a-11
+- Rebuild for new openssl package
+
 * Sun Jan 11 2009 Jochen Schmitt <Jochen herr-schmitt de> 2.48a-10
 - Create symlink to DajaVu-Sans
 



From s4504kr at fedoraproject.org  Thu Jan 15 20:56:35 2009
From: s4504kr at fedoraproject.org (Jochen Schmitt)
Date: Thu, 15 Jan 2009 20:56:35 +0000 (UTC)
Subject: rpms/aplus-fsf/devel aplus-fsf.spec,1.32,1.33
Message-ID: <20090115205635.627617012D@cvs1.fedora.phx.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/aplus-fsf/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15518

Modified Files:
	aplus-fsf.spec 
Log Message:
Remove wrong -n flag on subpackage name


Index: aplus-fsf.spec
===================================================================
RCS file: /cvs/extras/rpms/aplus-fsf/devel/aplus-fsf.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- aplus-fsf.spec	15 Jan 2009 20:46:46 -0000	1.32
+++ aplus-fsf.spec	15 Jan 2009 20:56:05 -0000	1.33
@@ -14,7 +14,7 @@
 
 Name: %name
 Version: 4.22.4
-Release: 9%{?dist}
+Release: 10%{?dist}
 License: GPLv2
 
 Summary: Advanced APL interpreter with s interface
@@ -144,7 +144,7 @@
 
 %postun -p /sbin/ldconfig
 
-%_font_pkg -n fonts *.TTF
+%_font_pkg fonts *.TTF
 
 %files
 %defattr(-,root,root,-)
@@ -170,8 +170,9 @@
 %{_lispstart}/aplus-fsf-init.el
 
 %Changelog
-* Thu Jan 15 2009 Jochen Schmitt <Jochen herr-schmitt de> 4.22.4-9
+* Thu Jan 15 2009 Jochen Schmitt <Jochen herr-schmitt de> 4.22.4-10
 - Rebuild for new openssl package
+- Remove wrong '-n' flag on subpackage name
 
 * Wed Jan  7 2009 Jochen Schmitt <Jochen herr-schmitt de> 4.22.4-8
 - Reorganization of apl fonts



From dwalsh at fedoraproject.org  Thu Jan 15 20:57:15 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Thu, 15 Jan 2009 20:57:15 +0000 (UTC)
Subject: rpms/libsemanage/devel libsemanage-rhat.patch, 1.46,
	1.47 libsemanage.spec, 1.172, 1.173
Message-ID: <20090115205715.671EC7012D@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/libsemanage/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15625

Modified Files:
	libsemanage-rhat.patch libsemanage.spec 
Log Message:
* Thu Jan 15 2009 Dan Walsh <dwalsh at redhat.com> - 2.0.31-2
- Fix link to only link on sandbox


libsemanage-rhat.patch:

Index: libsemanage-rhat.patch
===================================================================
RCS file: /cvs/extras/rpms/libsemanage/devel/libsemanage-rhat.patch,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- libsemanage-rhat.patch	13 Jan 2009 13:14:25 -0000	1.46
+++ libsemanage-rhat.patch	15 Jan 2009 20:56:44 -0000	1.47
@@ -1,7 +1,7 @@
-diff --exclude-from=exclude -N -u -r nsalibsemanage/src/genhomedircon.c libsemanage-2.0.30/src/genhomedircon.c
+diff --exclude-from=exclude -N -u -r nsalibsemanage/src/genhomedircon.c libsemanage-2.0.31/src/genhomedircon.c
 --- nsalibsemanage/src/genhomedircon.c	2008-08-28 09:34:24.000000000 -0400
-+++ libsemanage-2.0.30/src/genhomedircon.c	2009-01-12 10:29:24.000000000 -0500
-@@ -794,6 +792,12 @@
++++ libsemanage-2.0.31/src/genhomedircon.c	2009-01-15 15:53:31.000000000 -0500
+@@ -794,6 +794,12 @@
  			 * /root */
  			continue;
  		}
@@ -14,12 +14,34 @@
  		if (push_user_entry(&head, name, seuname,
  				    prefix, pwent->pw_dir) != STATUS_SUCCESS) {
  			*errors = STATUS_ERR;
-diff --exclude-from=exclude -N -u -r nsalibsemanage/src/semanage.conf libsemanage-2.0.30/src/semanage.conf
+diff --exclude-from=exclude -N -u -r nsalibsemanage/src/semanage.conf libsemanage-2.0.31/src/semanage.conf
 --- nsalibsemanage/src/semanage.conf	2008-08-28 09:34:24.000000000 -0400
-+++ libsemanage-2.0.30/src/semanage.conf	2009-01-12 10:29:24.000000000 -0500
++++ libsemanage-2.0.31/src/semanage.conf	2009-01-15 15:53:31.000000000 -0500
 @@ -35,4 +35,4 @@
  # given in <sepol/policydb.h>.  Change this setting if a different
  # version is necessary.
  #policy-version = 19
 -
 +expand-check=0
+diff --exclude-from=exclude -N -u -r nsalibsemanage/src/semanage_store.c libsemanage-2.0.31/src/semanage_store.c
+--- nsalibsemanage/src/semanage_store.c	2009-01-13 08:45:35.000000000 -0500
++++ libsemanage-2.0.31/src/semanage_store.c	2009-01-15 15:53:46.000000000 -0500
+@@ -440,8 +440,6 @@
+ 	char tmp[PATH_MAX];
+ 	char buf[4192];
+ 
+-	if (link(src,dst) == 0) return 0;
+-
+ 	n = snprintf(tmp, PATH_MAX, "%s.tmp", dst);
+ 	if (n < 0 || n >= PATH_MAX)
+ 		return -1;
+@@ -509,7 +507,8 @@
+ 				goto cleanup;
+ 			}
+ 		} else if (S_ISREG(sb.st_mode)) {
+-			if (semanage_copy_file(path, path2, sb.st_mode) == -1) {
++			if ((link(path,path2) == -1) && 
++			     (semanage_copy_file(path, path2, sb.st_mode) == -1)) {
+ 				goto cleanup;
+ 			}
+ 		}


Index: libsemanage.spec
===================================================================
RCS file: /cvs/extras/rpms/libsemanage/devel/libsemanage.spec,v
retrieving revision 1.172
retrieving revision 1.173
diff -u -r1.172 -r1.173
--- libsemanage.spec	13 Jan 2009 13:14:25 -0000	1.172
+++ libsemanage.spec	15 Jan 2009 20:56:45 -0000	1.173
@@ -3,7 +3,7 @@
 Summary: SELinux binary policy manipulation library 
 Name: libsemanage
 Version: 2.0.31
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 Source: http://www.nsa.gov/selinux/archives/libsemanage-%{version}.tgz
@@ -90,6 +90,9 @@
 %{_libdir}/python*/site-packages/*
 
 %changelog
+* Thu Jan 15 2009 Dan Walsh <dwalsh at redhat.com> - 2.0.31-2
+- Fix link to only link on sandbox
+
 * Mon Jan 12 2009 Dan Walsh <dwalsh at redhat.com> - 2.0.31-1
 - Update to upstream
 	* Policy module compression (bzip) support from Dan Walsh.



From pkgdb at fedoraproject.org  Thu Jan 15 20:57:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 15 Jan 2009 20:57:20 +0000
Subject: [pkgdb] kdebindings: mathstuf has requested watchbugzilla
Message-ID: <20090115205720.A9DFB208457@bastion.fedora.phx.redhat.com>

mathstuf 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  Thu Jan 15 20:57:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 15 Jan 2009 20:57:22 +0000
Subject: [pkgdb] kdebindings: mathstuf has requested watchcommits
Message-ID: <20090115205723.7F0D320846E@bastion.fedora.phx.redhat.com>

mathstuf 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  Thu Jan 15 20:57:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 15 Jan 2009 20:57:27 +0000
Subject: [pkgdb] kdebindings: mathstuf has requested commit
Message-ID: <20090115205727.5E8AA208474@bastion.fedora.phx.redhat.com>

mathstuf 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  Thu Jan 15 20:58:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 15 Jan 2009 20:58:16 +0000
Subject: [pkgdb] kdebindings had acl change status
Message-ID: <20090115205816.C9133208456@bastion.fedora.phx.redhat.com>

rdieter has set the watchbugzilla acl on kdebindings (Fedora devel) to Approved for mathstuf

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdebindings



From pkgdb at fedoraproject.org  Thu Jan 15 20:58:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 15 Jan 2009 20:58:18 +0000
Subject: [pkgdb] kdebindings had acl change status
Message-ID: <20090115205818.3E23420846E@bastion.fedora.phx.redhat.com>

rdieter has set the watchcommits acl on kdebindings (Fedora devel) to Approved for mathstuf

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdebindings



From pkgdb at fedoraproject.org  Thu Jan 15 20:58:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 15 Jan 2009 20:58:20 +0000
Subject: [pkgdb] kdebindings had acl change status
Message-ID: <20090115205820.23F31208474@bastion.fedora.phx.redhat.com>

rdieter has set the commit acl on kdebindings (Fedora devel) to Approved for mathstuf

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kdebindings



From s4504kr at fedoraproject.org  Thu Jan 15 20:59:19 2009
From: s4504kr at fedoraproject.org (Jochen Schmitt)
Date: Thu, 15 Jan 2009 20:59:19 +0000 (UTC)
Subject: rpms/aplus-fsf/devel aplus-fsf.spec,1.33,1.34
Message-ID: <20090115205919.4F3167012D@cvs1.fedora.phx.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/aplus-fsf/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16285

Modified Files:
	aplus-fsf.spec 
Log Message:
Remove wrong -n flag on subpackage name


Index: aplus-fsf.spec
===================================================================
RCS file: /cvs/extras/rpms/aplus-fsf/devel/aplus-fsf.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- aplus-fsf.spec	15 Jan 2009 20:56:05 -0000	1.33
+++ aplus-fsf.spec	15 Jan 2009 20:58:48 -0000	1.34
@@ -144,7 +144,7 @@
 
 %postun -p /sbin/ldconfig
 
-%_font_pkg fonts *.TTF
+%_font_pkg -n fonts *.TTF
 
 %files
 %defattr(-,root,root,-)



From tmraz at fedoraproject.org  Thu Jan 15 20:59:54 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Thu, 15 Jan 2009 20:59:54 +0000 (UTC)
Subject: rpms/dkim-milter/devel dkim-milter.spec,1.3,1.4
Message-ID: <20090115205954.33AC87012D@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/dkim-milter/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16452

Modified Files:
	dkim-milter.spec 
Log Message:
* Thu Jan 15 2009 Tomas Mraz <tmraz at redhat.com> - 2.7.2-3
- rebuild with new openssl



Index: dkim-milter.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dkim-milter/devel/dkim-milter.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- dkim-milter.spec	11 Dec 2008 07:39:09 -0000	1.3
+++ dkim-milter.spec	15 Jan 2009 20:59:23 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           dkim-milter
 Version:        2.7.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        DomainKeys Identified Mail sender authentication sendmail milter
 Group:          System Environment/Daemons
 License:        Sendmail
@@ -124,6 +124,9 @@
 %{_mandir}/*/*
 
 %changelog
+* Thu Jan 15 2009 Tomas Mraz <tmraz at redhat.com> - 2.7.2-3
+- rebuild with new openssl
+
 * Wed Dec 10 2008 Jim Radford <radford at blackbean.org> - 2.7.2-2
 - updated to 2.7.2
 



From rakesh at fedoraproject.org  Thu Jan 15 21:01:27 2009
From: rakesh at fedoraproject.org (Rakesh Pandit)
Date: Thu, 15 Jan 2009 21:01:27 +0000 (UTC)
Subject: rpms/dayplanner/F-9 import.log, NONE, 1.1 .cvsignore, 1.3,
	1.4 dayplanner.spec, 1.5, 1.6 sources, 1.3, 1.4
Message-ID: <20090115210127.32FB57012D@cvs1.fedora.phx.redhat.com>

Author: rakesh

Update of /cvs/pkgs/rpms/dayplanner/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16873/F-9

Modified Files:
	.cvsignore dayplanner.spec sources 
Added Files:
	import.log 
Log Message:
Updated to 0.9.2



--- NEW FILE import.log ---
dayplanner-0_9_2-1_fc10:F-9:dayplanner-0.9.2-1.fc10.src.rpm:1232009935


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/dayplanner/F-9/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	19 Jul 2008 01:26:53 -0000	1.3
+++ .cvsignore	15 Jan 2009 21:00:56 -0000	1.4
@@ -1 +1 @@
-dayplanner-0.9.1.tar.bz2
+dayplanner-0.9.2.tar.bz2


Index: dayplanner.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dayplanner/F-9/dayplanner.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- dayplanner.spec	24 Jul 2008 21:07:07 -0000	1.5
+++ dayplanner.spec	15 Jan 2009 21:00:56 -0000	1.6
@@ -2,8 +2,8 @@
 %{?_with_holidayparser: %{expand: %%global include_holidayparser 1}}
 
 Name:           dayplanner
-Version:        0.9.1
-Release:        3%{?dist}
+Version:        0.9.2
+Release:        1%{?dist}
 Summary:        An easy and clean Day Planner
 Summary(pl):    Prosty i elegancki organizer
 Summary(de):    Ein einfacher und klarer Tagesplaner
@@ -144,6 +144,9 @@
 %{_datadir}/icons/hicolor/*x*/apps/%{name}.png
 
 %changelog
+* Fri Jan 16 2009 Rakesh Pandit <rakesh at fedoraproject.org> - 0.9.2-1
+- Updated to 0.9.2
+
 * Sat Jul 19 2008 Christoph Wickert <fedora christoph-wickert de> - 0.9.1-3
 - Filter out all dayplanner related Requires and Provides
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dayplanner/F-9/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	19 Jul 2008 01:26:53 -0000	1.3
+++ sources	15 Jan 2009 21:00:56 -0000	1.4
@@ -1 +1 @@
-6a785c44e3fcd211dda7997b2920475d  dayplanner-0.9.1.tar.bz2
+358a3e7c9e17f640de9cc5554f563b5b  dayplanner-0.9.2.tar.bz2



From rakesh at fedoraproject.org  Thu Jan 15 21:01:38 2009
From: rakesh at fedoraproject.org (Rakesh Pandit)
Date: Thu, 15 Jan 2009 21:01:38 +0000 (UTC)
Subject: rpms/dayplanner/F-10 import.log, NONE, 1.1 .cvsignore, 1.3,
	1.4 dayplanner.spec, 1.6, 1.7 sources, 1.3, 1.4
Message-ID: <20090115210138.8E4CD7012D@cvs1.fedora.phx.redhat.com>

Author: rakesh

Update of /cvs/pkgs/rpms/dayplanner/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16790/F-10

Modified Files:
	.cvsignore dayplanner.spec sources 
Added Files:
	import.log 
Log Message:
Updated to 0.9.2



--- NEW FILE import.log ---
dayplanner-0_9_2-1_fc10:F-10:dayplanner-0.9.2-1.fc10.src.rpm:1232009925


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/dayplanner/F-10/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	19 Jul 2008 00:25:10 -0000	1.3
+++ .cvsignore	15 Jan 2009 21:01:08 -0000	1.4
@@ -1 +1 @@
-dayplanner-0.9.1.tar.bz2
+dayplanner-0.9.2.tar.bz2


Index: dayplanner.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dayplanner/F-10/dayplanner.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- dayplanner.spec	24 Jul 2008 21:06:51 -0000	1.6
+++ dayplanner.spec	15 Jan 2009 21:01:08 -0000	1.7
@@ -2,8 +2,8 @@
 %{?_with_holidayparser: %{expand: %%global include_holidayparser 1}}
 
 Name:           dayplanner
-Version:        0.9.1
-Release:        3%{?dist}
+Version:        0.9.2
+Release:        1%{?dist}
 Summary:        An easy and clean Day Planner
 Summary(pl):    Prosty i elegancki organizer
 Summary(de):    Ein einfacher und klarer Tagesplaner
@@ -144,6 +144,9 @@
 %{_datadir}/icons/hicolor/*x*/apps/%{name}.png
 
 %changelog
+* Fri Jan 16 2009 Rakesh Pandit <rakesh at fedoraproject.org> - 0.9.2-1
+- Updated to 0.9.2
+
 * Sat Jul 19 2008 Christoph Wickert <fedora christoph-wickert de> - 0.9.1-3
 - Filter out all dayplanner related Requires and Provides
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dayplanner/F-10/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	19 Jul 2008 00:25:10 -0000	1.3
+++ sources	15 Jan 2009 21:01:08 -0000	1.4
@@ -1 +1 @@
-6a785c44e3fcd211dda7997b2920475d  dayplanner-0.9.1.tar.bz2
+358a3e7c9e17f640de9cc5554f563b5b  dayplanner-0.9.2.tar.bz2



From arozansk at fedoraproject.org  Thu Jan 15 21:03:23 2009
From: arozansk at fedoraproject.org (Aristeu Sergio Rozanski Filho)
Date: Thu, 15 Jan 2009 21:03:23 +0000 (UTC)
Subject: rpms/linuxwacom/devel linuxwacom-0.8.2.1-fix_build.patch, NONE,
	1.1 .cvsignore, 1.14,
	1.15 linuxwacom-0.7.8.3-sdk-me-harder.patch, 1.3,
	1.4 linuxwacom.spec, 1.67, 1.68 sources, 1.14,
	1.15 linuxwacom-0.7.6.3-delibcwrap.patch, 1.2,
	NONE linuxwacom-0.8.0.3-build-fixes.patch, 1.1,
	NONE linuxwacom-0.8.0.3-nocrash-removal.patch, 1.1,
	NONE linuxwacom-disable_stack_protector.patch, 1.2,
	NONE linuxwacom-dont_call_devproc_again_in_uninit.patch, 1.1, NONE
Message-ID: <20090115210323.9FB647012D@cvs1.fedora.phx.redhat.com>

Author: arozansk

Update of /cvs/pkgs/rpms/linuxwacom/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17413

Modified Files:
	.cvsignore linuxwacom-0.7.8.3-sdk-me-harder.patch 
	linuxwacom.spec sources 
Added Files:
	linuxwacom-0.8.2.1-fix_build.patch 
Removed Files:
	linuxwacom-0.7.6.3-delibcwrap.patch 
	linuxwacom-0.8.0.3-build-fixes.patch 
	linuxwacom-0.8.0.3-nocrash-removal.patch 
	linuxwacom-disable_stack_protector.patch 
	linuxwacom-dont_call_devproc_again_in_uninit.patch 
Log Message:
* new production release



linuxwacom-0.8.2.1-fix_build.patch:

--- NEW FILE linuxwacom-0.8.2.1-fix_build.patch ---
---
 src/xdrv/wcmConfig.c |    2 +-
 src/xdrv/xf86Wacom.h |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

--- linuxwacom-0.8.2-1.orig/src/xdrv/xf86Wacom.h	2009-01-15 14:57:45.000000000 -0500
+++ linuxwacom-0.8.2-1/src/xdrv/xf86Wacom.h	2009-01-15 14:59:33.000000000 -0500
@@ -23,7 +23,7 @@
 /****************************************************************************/
 
 #include "../include/xdrv-config.h"
-#ifdef WCM_XORG_XSERVER_1_6
+#ifdef WCM_XORG
    #include <xorg-server.h>
    #include <xorgVersion.h>
 #else
--- linuxwacom-0.8.2-1.orig/src/xdrv/wcmConfig.c	2008-12-30 16:46:01.000000000 -0500
+++ linuxwacom-0.8.2-1/src/xdrv/wcmConfig.c	2009-01-15 15:11:13.000000000 -0500
@@ -994,7 +994,7 @@ static XF86ModuleVersionInfo xf86WcmVers
 	MODULEVENDORSTRING,
 	MODINFOSTRING1,
 	MODINFOSTRING2,
-#ifdef WCM_XORG_XSERVER_1_6
+#ifdef WCM_XORG
 	XORG_VERSION_CURRENT,
 #else
 	XF86_VERSION_CURRENT,


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/linuxwacom/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	1 Oct 2008 15:07:10 -0000	1.14
+++ .cvsignore	15 Jan 2009 21:02:53 -0000	1.15
@@ -1,3 +1,4 @@
 linuxwacom-0.7.9-8.tar.bz2
 linuxwacom-0.8.1-4.tar.bz2
 linuxwacom-0.8.0-3.tar.bz2
+linuxwacom-0.8.2-1.tar.bz2

linuxwacom-0.7.8.3-sdk-me-harder.patch:

Index: linuxwacom-0.7.8.3-sdk-me-harder.patch
===================================================================
RCS file: /cvs/pkgs/rpms/linuxwacom/devel/linuxwacom-0.7.8.3-sdk-me-harder.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- linuxwacom-0.7.8.3-sdk-me-harder.patch	1 Oct 2008 14:49:20 -0000	1.3
+++ linuxwacom-0.7.8.3-sdk-me-harder.patch	15 Jan 2009 21:02:53 -0000	1.4
@@ -3,8 +3,8 @@
  src/xdrv/Makefile.am |    2 +-
  2 files changed, 4 insertions(+), 1 deletion(-)
 
---- linuxwacom-0.8.0-1.orig/src/xdrv/Makefile.am	2008-05-09 16:54:11.000000000 -0400
-+++ linuxwacom-0.8.0-1/src/xdrv/Makefile.am	2008-05-12 13:33:42.000000000 -0400
+--- linuxwacom-0.8.2-1.orig/src/xdrv/Makefile.am	2009-01-15 10:50:54.000000000 -0500
++++ linuxwacom-0.8.2-1/src/xdrv/Makefile.am	2009-01-15 10:51:04.000000000 -0500
 @@ -15,7 +15,7 @@ EXTRA_DIST = xf86Wacom.c wcmXCommand.c x
  		../include/Xwacom.h
  
@@ -14,11 +14,11 @@
  endif
  
  if WCM_ENV_XFREE86
---- linuxwacom-0.8.0-1.orig/configure.in	2008-05-09 16:54:11.000000000 -0400
-+++ linuxwacom-0.8.0-1/configure.in	2008-05-12 13:32:58.000000000 -0400
-@@ -589,6 +589,9 @@ if test "$WCM_ENV_XFREE86" != yes; then
+--- linuxwacom-0.8.2-1.orig/configure.in	2009-01-15 10:50:54.000000000 -0500
++++ linuxwacom-0.8.2-1/configure.in	2009-01-15 10:51:04.000000000 -0500
+@@ -646,6 +646,9 @@ if test -f $WCM_XLIB_DIR/libxf86config.a
+ 	fi
  fi
- AM_CONDITIONAL(WCM_ENV_XORGSDK, [test "$WCM_ENV_XORGSDK" = yes])
  
 +PKG_CHECK_MODULES(XORG, [xorg-server])
 +AC_SUBST([XORG_CFLAGS])


Index: linuxwacom.spec
===================================================================
RCS file: /cvs/pkgs/rpms/linuxwacom/devel/linuxwacom.spec,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- linuxwacom.spec	6 Jan 2009 01:02:10 -0000	1.67
+++ linuxwacom.spec	15 Jan 2009 21:02:53 -0000	1.68
@@ -1,9 +1,9 @@
-%define tarname		%{name}-0.8.0-3
+%define tarname		%{name}-0.8.2-1
 
 # Upstream's versioning is goofy.  Note the mapping from tarname to version.
 Name:		linuxwacom
-Version:	0.8.0.3
-Release:	7%{?dist}
+Version:	0.8.2.1
+Release:	1%{?dist}
 Summary:	Wacom Drivers from Linux Wacom Project
 
 Group:		User Interface/X Hardware Support
@@ -12,16 +12,13 @@
 Source0:	http://prdownloads.sourceforge.net/linuxwacom/%{tarname}.tar.bz2
 Source1:	60-wacom.rules
 Source2:	10-linuxwacom.fdi
-Patch1:		linuxwacom-0.7.6.3-delibcwrap.patch
-Patch3:		linuxwacom-0.7.8.3-sdk-me-harder.patch
-Patch4:		linuxwacom-0.7.9.7-fix_build.patch
-Patch5:		linuxwacom-dont_call_devproc_again_in_uninit.patch
-Patch6:		linuxwacom-0.8.0.3-build-fixes.patch
-Patch7:		linuxwacom-0.8.0.3-nocrash-removal.patch
+Patch1:		linuxwacom-0.7.8.3-sdk-me-harder.patch
+Patch2:		linuxwacom-0.7.9.7-fix_build.patch
+Patch3:		linuxwacom-0.8.2.1-fix_build.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}
 BuildRequires:	libX11-devel libXi-devel ncurses-devel
-BuildRequires:  xorg-x11-server-sdk >= 1.5.99.1
+BuildRequires:  xorg-x11-server-devel >= 1.5.99.1
 BuildRequires:  autoconf automake libtool xorg-x11-server-Xorg
 Requires:	xorg-x11-server-Xorg >= 1.5.99.1, udev >= 030-21
 ExclusiveArch:  %{ix86} x86_64 alpha ia64 ppc ppc64 sparcv9 sparc64
@@ -44,12 +41,9 @@
 %prep
 %setup -q -n %{tarname}
 
-#patch1 -p1 -b .delibcwrap
-%patch3 -p1 -b .sdk
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1 -b .buildfixes
-%patch7 -p1 -b .nocrash-removal
+%patch1 -p1 -b .sdk
+%patch2 -p1
+%patch3 -p1
 
 %build
 
@@ -111,6 +105,9 @@
 %{_libdir}/libwacomcfg*.so
 
 %changelog
+* Thu Jan 15 2009 Aristeu Rozanski <aris at redhat.com> 0.8.1.2-1
+- new production release
+
 * Tue Jan 06 2009 Peter Hutterer <peter.hutterer at redhat.com> 0.8.0.3-7
 - linuxwacom-0.8.0.3-nocrash-removal.patch: don't free the device's private,
   it causes a SIGABRT on device removal and the server does it anyway.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/linuxwacom/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	1 Oct 2008 15:07:10 -0000	1.14
+++ sources	15 Jan 2009 21:02:53 -0000	1.15
@@ -1,3 +1 @@
-8cb221a7ac21d92fa4ddcc3a709ce22c  linuxwacom-0.7.9-8.tar.bz2
-ea919f0b6448e22ff9aac98ac45c6eea  linuxwacom-0.8.1-4.tar.bz2
-629698976f9eb7d861802b22669c5aee  linuxwacom-0.8.0-3.tar.bz2
+c06a12b029b7ad8c879e08042d5c4a46  linuxwacom-0.8.2-1.tar.bz2


--- linuxwacom-0.7.6.3-delibcwrap.patch DELETED ---


--- linuxwacom-0.8.0.3-build-fixes.patch DELETED ---


--- linuxwacom-0.8.0.3-nocrash-removal.patch DELETED ---


--- linuxwacom-disable_stack_protector.patch DELETED ---


--- linuxwacom-dont_call_devproc_again_in_uninit.patch DELETED ---



From rdieter at fedoraproject.org  Thu Jan 15 21:07:47 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu, 15 Jan 2009 21:07:47 +0000 (UTC)
Subject: rpms/kdebindings/devel kdebindings.spec,1.166,1.167
Message-ID: <20090115210747.CF4877012D@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdebindings/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18039

Modified Files:
	kdebindings.spec 
Log Message:
* Thu Jan 15 2009 Rex Dieter <rdieter at fedoraproject.org> 4.1.96-5
- toggle for QtRuby/kde-plasma-ruby bootstrap



Index: kdebindings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebindings/devel/kdebindings.spec,v
retrieving revision 1.166
retrieving revision 1.167
diff -u -r1.166 -r1.167
--- kdebindings.spec	15 Jan 2009 20:20:02 -0000	1.166
+++ kdebindings.spec	15 Jan 2009 21:07:17 -0000	1.167
@@ -10,6 +10,9 @@
 #define php 1
 %define ruby 1
 %define smoke 1
+# define to build kde-plasma-ruby bits, needs QtRuby-devel bootstrap
+# FIXME/TODO: ping upstream so it uses the just-built rbuic4
+#define kde_plasma_ruby 1
 
 %if 0%{?ruby}%{?smoke}
 %define devel 1
@@ -23,7 +26,7 @@
 
 Name: kdebindings
 Version: 4.1.96
-Release: 4%{?dist}
+Release: 5%{?dist}
 Summary: KDE bindings to non-C++ languages
 
 Group: User Interface/Desktops
@@ -50,6 +53,9 @@
 BuildRequires:  qscintilla-devel >= 2.2
 %endif
 BuildRequires:  soprano-devel
+%if 0%{?kde_plasma_ruby}
+BuildRequires:  QtRuby-devel
+%endif
 
 Requires: kdelibs4 >= %{version}
 
@@ -278,10 +284,7 @@
 %defattr(-,root,root,-)
 %{_kde4_libdir}/kde4/krossruby.so
 
-## wtf?  -- Rex
-#-- rbuic4 not found, ruby-clock will not created
-#-- rbuic4 not found, ruby-digital-clock will not created
-%if 0
+%if 0%{?kde_plasma_ruby}
 %files -n kde-plasma-ruby-analogclock
 %defattr(-,root,root,-)
 %{_kde4_sharedir}/kde4/apps/plasma_applet_ruby_clock/
@@ -296,6 +299,9 @@
 
 
 %changelog
+* Thu Jan 15 2009 Rex Dieter <rdieter at fedoraproject.org> 4.1.96-5
+- toggle for QtRuby/kde-plasma-ruby bootstrap
+
 * Thu Jan 15 2009 Rex Dieter <rdieter at fedoraproject.org> 4.1.96-4
 - update %%description/%%summaries for new (sub)pkgs
 - use versioned Provides/Requires all over



From nsantos at fedoraproject.org  Thu Jan 15 21:11:22 2009
From: nsantos at fedoraproject.org (Nuno Santos)
Date: Thu, 15 Jan 2009 21:11:22 +0000 (UTC)
Subject: rpms/rhm/devel .cvsignore, 1.9, 1.10 rhm.spec, 1.32, 1.33 sources, 
	1.14, 1.15
Message-ID: <20090115211122.BAC4B7012D@cvs1.fedora.phx.redhat.com>

Author: nsantos

Update of /cvs/extras/rpms/rhm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18609

Modified Files:
	.cvsignore rhm.spec sources 
Log Message:
Rebased to svn rev 3045/734452


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rhm/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	23 Dec 2008 21:43:52 -0000	1.9
+++ .cvsignore	15 Jan 2009 21:10:52 -0000	1.10
@@ -1 +1 @@
-rhm-0.4.3030.tar.gz
+rhm-0.4.3045.tar.gz


Index: rhm.spec
===================================================================
RCS file: /cvs/extras/rpms/rhm/devel/rhm.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- rhm.spec	5 Jan 2009 16:31:45 -0000	1.32
+++ rhm.spec	15 Jan 2009 21:10:52 -0000	1.33
@@ -2,13 +2,13 @@
 # Spec file for Red Hat Messaging package rhm.
 #
 
-%define svnrev 3030
+%define svnrev 3045
 # built against qpidc svn rev:
-%define svnrev_qpid 728142
+%define svnrev_qpid 734452
 
 Name:           rhm
 Version:        0.4.%{svnrev}
-Release:        2%{?dist}
+Release:        1%{?dist}
 Summary:        Red Hat persistence extension to the Qpid messaging system
 Group:          System Environment/Libraries
 License:        LGPLv2+
@@ -65,6 +65,9 @@
 
 
 %changelog
+* Thu Jan 15 2009 Nuno Santos <nsantos at redhat.com> - 0.4.3045-1
+- Rebased to svn rev 3045/734452
+
 * Tue Dec 23 2008 Nuno Santos <nsantos at redhat.com> - 0.4.3030-1
 - Rebased to svn rev 3030/728142
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rhm/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	23 Dec 2008 21:43:52 -0000	1.14
+++ sources	15 Jan 2009 21:10:52 -0000	1.15
@@ -1 +1 @@
-045d5263a9eec612cd147b9c8268b76c  rhm-0.4.3030.tar.gz
+2076788ff9c648d87be489fbcee0d5d7  rhm-0.4.3045.tar.gz



From tmraz at fedoraproject.org  Thu Jan 15 21:14:48 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Thu, 15 Jan 2009 21:14:48 +0000 (UTC)
Subject: rpms/distcache/devel distcache.spec,1.23,1.24
Message-ID: <20090115211448.204927012D@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/distcache/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19850

Modified Files:
	distcache.spec 
Log Message:
* Thu Jan 15 2009 Tomas Mraz <tmraz at redhat.com> 1.4.5-18
- rebuild with new openssl
- have to run autoreconf in the ssl subdir due to new libtool



Index: distcache.spec
===================================================================
RCS file: /cvs/pkgs/rpms/distcache/devel/distcache.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- distcache.spec	15 Jan 2009 20:36:37 -0000	1.23
+++ distcache.spec	15 Jan 2009 21:14:17 -0000	1.24
@@ -42,6 +42,9 @@
 %build
 libtoolize --force --copy && aclocal && autoconf
 automake -aic --gnu || : automake ate my hamster
+pushd ssl
+autoreconf -i || : let it fail too
+popd
 %configure --enable-shared --disable-static
 make %{?_smp_mflags}
 
@@ -104,6 +107,7 @@
 %changelog
 * Thu Jan 15 2009 Tomas Mraz <tmraz at redhat.com> 1.4.5-18
 - rebuild with new openssl
+- have to run autoreconf in the ssl subdir due to new libtool
 
 * Wed Feb 13 2008 Joe Orton <jorton at redhat.com> 1.4.5-17
 - fix libnal build



From tmraz at fedoraproject.org  Thu Jan 15 21:16:57 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Thu, 15 Jan 2009 21:16:57 +0000 (UTC)
Subject: rpms/dnsperf/devel dnsperf.spec,1.2,1.3
Message-ID: <20090115211657.54EE77012D@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/dnsperf/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20209

Modified Files:
	dnsperf.spec 
Log Message:
* Thu Jan 15 2009 Tomas Mraz <tmraz at redhat.com> - 1.0.1.0-6
- rebuild with new openssl



Index: dnsperf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dnsperf/devel/dnsperf.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- dnsperf.spec	10 Nov 2008 16:40:19 -0000	1.2
+++ dnsperf.spec	15 Jan 2009 21:16:27 -0000	1.3
@@ -1,7 +1,7 @@
 Summary: Benchmarking authorative and recursing DNS servers
 Name: dnsperf
 Version: 1.0.1.0
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: MIT
 Url: http://www.nominum.com/services/measurement_tools.php
 Source: ftp://ftp.nominum.com/pub/nominum/dnsperf/%{version}/dnsperf-src-%{version}-1.tar.gz
@@ -41,6 +41,9 @@
 %{_mandir}/*/*
 
 %changelog
+* Thu Jan 15 2009 Tomas Mraz <tmraz at redhat.com> - 1.0.1.0-6
+- rebuild with new openssl
+
 * Mon Nov 10 2008 Adam Tkac <atkac redhat com> - 1.0.1.0-5
 - rebuild against new bind-libs
 



From tmraz at fedoraproject.org  Thu Jan 15 21:24:17 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Thu, 15 Jan 2009 21:24:17 +0000 (UTC)
Subject: rpms/dnsperf/devel dnsperf.spec,1.3,1.4
Message-ID: <20090115212417.0A15B7012D@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/dnsperf/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21108

Modified Files:
	dnsperf.spec 
Log Message:
* Thu Jan 15 2009 Tomas Mraz <tmraz at redhat.com> - 1.0.1.0-6
- rebuild with new openssl
- seems to require libxml2-devel to build now



Index: dnsperf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dnsperf/devel/dnsperf.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- dnsperf.spec	15 Jan 2009 21:16:27 -0000	1.3
+++ dnsperf.spec	15 Jan 2009 21:23:46 -0000	1.4
@@ -8,7 +8,7 @@
 Group: Applications/Internet
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: bind-devel >= 9.3.0, libcap-devel, bzip2, openssl-devel
-BuildRequires: krb5-devel
+BuildRequires: krb5-devel, libxml2-devel
 Requires: gnuplot pcapy python-dns
 
 %description
@@ -43,6 +43,7 @@
 %changelog
 * Thu Jan 15 2009 Tomas Mraz <tmraz at redhat.com> - 1.0.1.0-6
 - rebuild with new openssl
+- seems to require libxml2-devel to build now
 
 * Mon Nov 10 2008 Adam Tkac <atkac redhat com> - 1.0.1.0-5
 - rebuild against new bind-libs



From rakesh at fedoraproject.org  Thu Jan 15 21:33:15 2009
From: rakesh at fedoraproject.org (Rakesh Pandit)
Date: Thu, 15 Jan 2009 21:33:15 +0000 (UTC)
Subject: rpms/enet/F-9 import.log, NONE, 1.1 .cvsignore, 1.2, 1.3 enet.spec, 
	1.2, 1.3 sources, 1.3, 1.4
Message-ID: <20090115213315.CC1AA7012D@cvs1.fedora.phx.redhat.com>

Author: rakesh

Update of /cvs/pkgs/rpms/enet/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22571/F-9

Modified Files:
	.cvsignore enet.spec sources 
Added Files:
	import.log 
Log Message:
Updated to 1.2, fixed docs



--- NEW FILE import.log ---
enet-1_2-1_fc10:F-9:enet-1.2-1.fc10.src.rpm:1232011503


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/enet/F-9/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	9 Oct 2007 06:14:45 -0000	1.2
+++ .cvsignore	15 Jan 2009 21:32:45 -0000	1.3
@@ -1 +1 @@
-enet-1.1.tar.gz
+enet-1.2.tar.gz


Index: enet.spec
===================================================================
RCS file: /cvs/pkgs/rpms/enet/F-9/enet.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- enet.spec	19 Feb 2008 08:19:58 -0000	1.2
+++ enet.spec	15 Jan 2009 21:32:45 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           enet
-Version:        1.1
-Release:        3%{?dist}
+Version:        1.2
+Release:        1%{?dist}
 Summary:        Thin, simple and robust network layer on top of UDP
 Group:          System Environment/Libraries
 License:        MIT
@@ -66,12 +66,15 @@
 
 %files devel
 %defattr(-,root,root,-)
-%doc docs/html tutorial.txt design.txt
+%doc docs/*.dox
 %{_includedir}/%{name}
 %{_libdir}/lib%{name}.so
 
 
 %changelog
+* Fri Jan 16 2009 Rakesh Pandit <rakesh at fedoraproject.org> 1.2-1
+- Updated to 1.2
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1.1-3
 - Autorebuild for GCC 4.3
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/enet/F-9/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	9 Oct 2007 06:14:45 -0000	1.3
+++ sources	15 Jan 2009 21:32:45 -0000	1.4
@@ -1 +1 @@
-54f8c1335fc96b18836bc8b5fa721752  enet-1.1.tar.gz
+e0d9f468d8c6f6bfd07083b3b40f5e69  enet-1.2.tar.gz



From rakesh at fedoraproject.org  Thu Jan 15 21:33:28 2009
From: rakesh at fedoraproject.org (Rakesh Pandit)
Date: Thu, 15 Jan 2009 21:33:28 +0000 (UTC)
Subject: rpms/enet/F-10 import.log, NONE, 1.1 .cvsignore, 1.2, 1.3 enet.spec,
	1.2, 1.3 sources, 1.3, 1.4
Message-ID: <20090115213328.EAE477012D@cvs1.fedora.phx.redhat.com>

Author: rakesh

Update of /cvs/pkgs/rpms/enet/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22550/F-10

Modified Files:
	.cvsignore enet.spec sources 
Added Files:
	import.log 
Log Message:
Updated to 1.2 and fixed docs.



--- NEW FILE import.log ---
enet-1_2-1_fc10:F-10:enet-1.2-1.fc10.src.rpm:1232011493


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/enet/F-10/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	9 Oct 2007 06:14:45 -0000	1.2
+++ .cvsignore	15 Jan 2009 21:32:58 -0000	1.3
@@ -1 +1 @@
-enet-1.1.tar.gz
+enet-1.2.tar.gz


Index: enet.spec
===================================================================
RCS file: /cvs/pkgs/rpms/enet/F-10/enet.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- enet.spec	19 Feb 2008 08:19:58 -0000	1.2
+++ enet.spec	15 Jan 2009 21:32:58 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           enet
-Version:        1.1
-Release:        3%{?dist}
+Version:        1.2
+Release:        1%{?dist}
 Summary:        Thin, simple and robust network layer on top of UDP
 Group:          System Environment/Libraries
 License:        MIT
@@ -66,12 +66,15 @@
 
 %files devel
 %defattr(-,root,root,-)
-%doc docs/html tutorial.txt design.txt
+%doc docs/*.dox
 %{_includedir}/%{name}
 %{_libdir}/lib%{name}.so
 
 
 %changelog
+* Fri Jan 16 2009 Rakesh Pandit <rakesh at fedoraproject.org> 1.2-1
+- Updated to 1.2
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1.1-3
 - Autorebuild for GCC 4.3
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/enet/F-10/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	9 Oct 2007 06:14:45 -0000	1.3
+++ sources	15 Jan 2009 21:32:58 -0000	1.4
@@ -1 +1 @@
-54f8c1335fc96b18836bc8b5fa721752  enet-1.1.tar.gz
+e0d9f468d8c6f6bfd07083b3b40f5e69  enet-1.2.tar.gz



From rakesh at fedoraproject.org  Thu Jan 15 21:33:41 2009
From: rakesh at fedoraproject.org (Rakesh Pandit)
Date: Thu, 15 Jan 2009 21:33:41 +0000 (UTC)
Subject: rpms/enet/devel import.log, NONE, 1.1 .cvsignore, 1.2, 1.3 enet.spec,
	1.2, 1.3 sources, 1.3, 1.4
Message-ID: <20090115213341.4B5A77012D@cvs1.fedora.phx.redhat.com>

Author: rakesh

Update of /cvs/pkgs/rpms/enet/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22527/devel

Modified Files:
	.cvsignore enet.spec sources 
Added Files:
	import.log 
Log Message:
Updated to 1.2 and fixed docs.



--- NEW FILE import.log ---
enet-1_2-1_fc10:HEAD:enet-1.2-1.fc10.src.rpm:1232011456


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/enet/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	9 Oct 2007 06:14:45 -0000	1.2
+++ .cvsignore	15 Jan 2009 21:33:10 -0000	1.3
@@ -1 +1 @@
-enet-1.1.tar.gz
+enet-1.2.tar.gz


Index: enet.spec
===================================================================
RCS file: /cvs/pkgs/rpms/enet/devel/enet.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- enet.spec	19 Feb 2008 08:19:58 -0000	1.2
+++ enet.spec	15 Jan 2009 21:33:10 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           enet
-Version:        1.1
-Release:        3%{?dist}
+Version:        1.2
+Release:        1%{?dist}
 Summary:        Thin, simple and robust network layer on top of UDP
 Group:          System Environment/Libraries
 License:        MIT
@@ -66,12 +66,15 @@
 
 %files devel
 %defattr(-,root,root,-)
-%doc docs/html tutorial.txt design.txt
+%doc docs/*.dox
 %{_includedir}/%{name}
 %{_libdir}/lib%{name}.so
 
 
 %changelog
+* Fri Jan 16 2009 Rakesh Pandit <rakesh at fedoraproject.org> 1.2-1
+- Updated to 1.2
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1.1-3
 - Autorebuild for GCC 4.3
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/enet/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	9 Oct 2007 06:14:45 -0000	1.3
+++ sources	15 Jan 2009 21:33:11 -0000	1.4
@@ -1 +1 @@
-54f8c1335fc96b18836bc8b5fa721752  enet-1.1.tar.gz
+e0d9f468d8c6f6bfd07083b3b40f5e69  enet-1.2.tar.gz



From kaitlin at fedoraproject.org  Thu Jan 15 21:37:17 2009
From: kaitlin at fedoraproject.org (Kaitlin Rupert)
Date: Thu, 15 Jan 2009 21:37:17 +0000 (UTC)
Subject: rpms/libvirt-cim/devel .cvsignore, 1.9, 1.10 libvirt-cim.spec, 1.21,
	1.22 sources, 1.11, 1.12
Message-ID: <20090115213717.1AE107012D@cvs1.fedora.phx.redhat.com>

Author: kaitlin

Update of /cvs/pkgs/rpms/libvirt-cim/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23381

Modified Files:
	.cvsignore libvirt-cim.spec sources 
Log Message:
Updated to latest upstream source.




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt-cim/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	7 Oct 2008 15:11:01 -0000	1.9
+++ .cvsignore	15 Jan 2009 21:36:46 -0000	1.10
@@ -4,3 +4,4 @@
 libvirt-cim-0.5.tar.gz
 libvirt-cim-0.5.1.tar.gz
 libvirt-cim-0.5.2.tar.gz
+libvirt-cim-0.5.3.tar.gz


Index: libvirt-cim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt-cim/devel/libvirt-cim.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- libvirt-cim.spec	6 Oct 2008 21:17:51 -0000	1.21
+++ libvirt-cim.spec	15 Jan 2009 21:36:46 -0000	1.22
@@ -2,7 +2,7 @@
 
 Summary: A CIM provider for libvirt
 Name: libvirt-cim
-Version: 0.5.2
+Version: 0.5.3
 Release: 1%{?dist}
 License: LGPLv2+
 Group: Development/Libraries
@@ -92,7 +92,7 @@
 
 %files 
 %defattr(-, root, root)
-%{_sysconfdir}/libvirt/cim
+/etc/libvirt/cim
 
 %doc README COPYING doc/CodingStyle doc/SubmittingPatches
 #%doc base_schema/README.DMTF
@@ -109,6 +109,9 @@
 /etc/ld.so.conf.d/libvirt-cim.conf
 
 %changelog
+* Thu Jan 15 2009 Kaitlin Rupert <kaitlin at us.ibm.com> - 0.5.3-1
+- Updated to latest upstream source
+
 * Mon Oct 06 2008 Kaitlin Rupert <kaitlin at us.ibm.com> - 0.5.2-1
 - Updated to latest upstream source
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt-cim/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	7 Oct 2008 14:57:43 -0000	1.11
+++ sources	15 Jan 2009 21:36:46 -0000	1.12
@@ -4,3 +4,4 @@
 2dbe3753cc661baaf43c7b462bda4d01  libvirt-cim-0.5.tar.gz
 24dd6b86a9e9b060107694d7ac982c77  libvirt-cim-0.5.1.tar.gz
 f0d8962114b77e380c35af0f21a86f3f  libvirt-cim-0.5.2.tar.gz
+a60d1516af3105cf4bb60ee1f7ccc4ad  libvirt-cim-0.5.3.tar.gz



From kaitlin at fedoraproject.org  Thu Jan 15 21:49:13 2009
From: kaitlin at fedoraproject.org (Kaitlin Rupert)
Date: Thu, 15 Jan 2009 21:49:13 +0000 (UTC)
Subject: rpms/libvirt-cim/F-10 .cvsignore, 1.10, 1.11 libvirt-cim.spec, 1.21,
	1.22 sources, 1.12, 1.13
Message-ID: <20090115214913.75B3B7012D@cvs1.fedora.phx.redhat.com>

Author: kaitlin

Update of /cvs/pkgs/rpms/libvirt-cim/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25987

Modified Files:
	.cvsignore libvirt-cim.spec sources 
Log Message:
Updated to latest upstream source




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt-cim/F-10/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	17 Oct 2008 15:38:19 -0000	1.10
+++ .cvsignore	15 Jan 2009 21:48:42 -0000	1.11
@@ -1 +1,2 @@
 libvirt-cim-0.5.2.tar.gz
+libvirt-cim-0.5.3.tar.gz


Index: libvirt-cim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt-cim/F-10/libvirt-cim.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- libvirt-cim.spec	6 Oct 2008 21:17:51 -0000	1.21
+++ libvirt-cim.spec	15 Jan 2009 21:48:43 -0000	1.22
@@ -2,7 +2,7 @@
 
 Summary: A CIM provider for libvirt
 Name: libvirt-cim
-Version: 0.5.2
+Version: 0.5.3
 Release: 1%{?dist}
 License: LGPLv2+
 Group: Development/Libraries
@@ -92,7 +92,7 @@
 
 %files 
 %defattr(-, root, root)
-%{_sysconfdir}/libvirt/cim
+/etc/libvirt/cim
 
 %doc README COPYING doc/CodingStyle doc/SubmittingPatches
 #%doc base_schema/README.DMTF
@@ -109,6 +109,9 @@
 /etc/ld.so.conf.d/libvirt-cim.conf
 
 %changelog
+* Thu Jan 15 2009 Kaitlin Rupert <kaitlin at us.ibm.com> - 0.5.3-1
+- Updated to latest upstream source
+
 * Mon Oct 06 2008 Kaitlin Rupert <kaitlin at us.ibm.com> - 0.5.2-1
 - Updated to latest upstream source
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt-cim/F-10/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	17 Oct 2008 15:38:19 -0000	1.12
+++ sources	15 Jan 2009 21:48:43 -0000	1.13
@@ -1 +1,2 @@
 f0d8962114b77e380c35af0f21a86f3f  libvirt-cim-0.5.2.tar.gz
+a60d1516af3105cf4bb60ee1f7ccc4ad  libvirt-cim-0.5.3.tar.gz



From rakesh at fedoraproject.org  Thu Jan 15 21:55:45 2009
From: rakesh at fedoraproject.org (Rakesh Pandit)
Date: Thu, 15 Jan 2009 21:55:45 +0000 (UTC)
Subject: rpms/gflags/devel .cvsignore, 1.2, 1.3 gflags.spec, 1.2,
	1.3 import.log, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20090115215545.A2E7C7012D@cvs1.fedora.phx.redhat.com>

Author: rakesh

Update of /cvs/pkgs/rpms/gflags/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26657/devel

Modified Files:
	.cvsignore gflags.spec import.log sources 
Log Message:
Updated to 1.0.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gflags/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	29 Sep 2008 08:05:21 -0000	1.2
+++ .cvsignore	15 Jan 2009 21:55:15 -0000	1.3
@@ -1 +1 @@
-gflags-0.9.tar.gz
+gflags-1.0.tar.gz


Index: gflags.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gflags/devel/gflags.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gflags.spec	29 Nov 2008 16:37:01 -0000	1.2
+++ gflags.spec	15 Jan 2009 21:55:15 -0000	1.3
@@ -1,8 +1,8 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           gflags
-Version:        0.9
-Release:        7%{?dist}
+Version:        1.0
+Release:        1%{?dist}
 Summary:        Library for commandline flag processing
 
 Group:          Development/Tools
@@ -88,10 +88,15 @@
 %defattr(-,root,root,-)
 %doc doc/designstyle.css doc/gflags.html
 %{_libdir}/libgflags.so
+%dir %{_includedir}/%{name}
+%{_includedir}/%{name}/*.h
 %dir %{_includedir}/google
 %{_includedir}/google/*.h
 
 %changelog
+* Fri Jan 16 2009 Rakesh Pandit <rakesh at fedoraproject.org> - 1.0-1
+- Updated to 1.0.
+
 * Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 0.9-7
 - Rebuild for Python 2.6
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/gflags/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	29 Sep 2008 08:05:21 -0000	1.1
+++ import.log	15 Jan 2009 21:55:15 -0000	1.2
@@ -1 +1,2 @@
 gflags-0_9-6_fc10:HEAD:gflags-0.9-6.fc10.src.rpm:1222674675
+gflags-1_0-1_fc10:HEAD:gflags-1.0-1.fc10.src.rpm:1232013079


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gflags/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	29 Sep 2008 08:05:21 -0000	1.2
+++ sources	15 Jan 2009 21:55:15 -0000	1.3
@@ -1 +1 @@
-bd4871398e9019b241d89cc21fb62def  gflags-0.9.tar.gz
+20125f5248f32214a5af20f67f115377  gflags-1.0.tar.gz



From rakesh at fedoraproject.org  Thu Jan 15 21:57:43 2009
From: rakesh at fedoraproject.org (Rakesh Pandit)
Date: Thu, 15 Jan 2009 21:57:43 +0000 (UTC)
Subject: rpms/gflags/F-10 .cvsignore, 1.2, 1.3 gflags.spec, 1.1,
	1.2 import.log, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20090115215743.982A37012D@cvs1.fedora.phx.redhat.com>

Author: rakesh

Update of /cvs/pkgs/rpms/gflags/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27032/F-10

Modified Files:
	.cvsignore gflags.spec import.log sources 
Log Message:
Updated to 1.0.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gflags/F-10/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	29 Sep 2008 08:05:21 -0000	1.2
+++ .cvsignore	15 Jan 2009 21:57:13 -0000	1.3
@@ -1 +1 @@
-gflags-0.9.tar.gz
+gflags-1.0.tar.gz


Index: gflags.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gflags/F-10/gflags.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gflags.spec	29 Sep 2008 08:05:21 -0000	1.1
+++ gflags.spec	15 Jan 2009 21:57:13 -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:           gflags
-Version:        0.9
-Release:        6%{?dist}
+Version:        1.0
+Release:        1%{?dist}
 Summary:        Library for commandline flag processing
 
 Group:          Development/Tools
@@ -88,10 +88,15 @@
 %defattr(-,root,root,-)
 %doc doc/designstyle.css doc/gflags.html
 %{_libdir}/libgflags.so
+%dir %{_includedir}/%{name}
+%{_includedir}/%{name}/*.h
 %dir %{_includedir}/google
 %{_includedir}/google/*.h
 
 %changelog
+* Fri Jan 16 2009 Rakesh Pandit <rakesh at fedoraproject.org> 1.0-1
+- Updated to 1.0
+
 * Thu Sep 04 2008 Rakesh Pandit <rakesh at fedoraproject.org> 0.9-6
 - fixed for F-8 provide eggs for non setuptools package
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/gflags/F-10/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	29 Sep 2008 08:05:21 -0000	1.1
+++ import.log	15 Jan 2009 21:57:13 -0000	1.2
@@ -1 +1,2 @@
 gflags-0_9-6_fc10:HEAD:gflags-0.9-6.fc10.src.rpm:1222674675
+gflags-1_0-1_fc10:F-10:gflags-1.0-1.fc10.src.rpm:1232013379


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gflags/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	29 Sep 2008 08:05:21 -0000	1.2
+++ sources	15 Jan 2009 21:57:13 -0000	1.3
@@ -1 +1 @@
-bd4871398e9019b241d89cc21fb62def  gflags-0.9.tar.gz
+20125f5248f32214a5af20f67f115377  gflags-1.0.tar.gz



From rakesh at fedoraproject.org  Thu Jan 15 22:10:53 2009
From: rakesh at fedoraproject.org (Rakesh Pandit)
Date: Thu, 15 Jan 2009 22:10:53 +0000 (UTC)
Subject: rpms/gflags/F-9 .cvsignore, 1.2, 1.3 gflags.spec, 1.1,
	1.2 import.log, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20090115221054.2B4E87012D@cvs1.fedora.phx.redhat.com>

Author: rakesh

Update of /cvs/pkgs/rpms/gflags/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27512/F-9

Modified Files:
	.cvsignore gflags.spec import.log sources 
Log Message:
Updated to 1.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gflags/F-9/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	29 Sep 2008 08:05:34 -0000	1.2
+++ .cvsignore	15 Jan 2009 22:10:22 -0000	1.3
@@ -1 +1 @@
-gflags-0.9.tar.gz
+gflags-1.0.tar.gz


Index: gflags.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gflags/F-9/gflags.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gflags.spec	29 Sep 2008 08:05:34 -0000	1.1
+++ gflags.spec	15 Jan 2009 22:10:22 -0000	1.2
@@ -1,8 +1,8 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           gflags
-Version:        0.9
-Release:        6%{?dist}
+Version:        1.0
+Release:        1%{?dist}
 Summary:        Library for commandline flag processing
 
 Group:          Development/Tools
@@ -88,10 +88,15 @@
 %defattr(-,root,root,-)
 %doc doc/designstyle.css doc/gflags.html
 %{_libdir}/libgflags.so
+%dir %{_includedir}/%{name}
+%{_includedir}/%{name}/*.h
 %dir %{_includedir}/google
 %{_includedir}/google/*.h
 
 %changelog
+* Fri Jan 16 2009 Rakesh Pandit <rakesh at fedoraproject.org> 1.0-1
+- Updated to 1.0
+
 * Thu Sep 04 2008 Rakesh Pandit <rakesh at fedoraproject.org> 0.9-6
 - fixed for F-8 provide eggs for non setuptools package
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/gflags/F-9/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	29 Sep 2008 08:05:34 -0000	1.1
+++ import.log	15 Jan 2009 22:10:22 -0000	1.2
@@ -1 +1,2 @@
 gflags-0_9-6_fc10:F-9:gflags-0.9-6.fc10.src.rpm:1222674687
+gflags-1_0-1_fc10:F-9:gflags-1.0-1.fc10.src.rpm:1232013530


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gflags/F-9/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	29 Sep 2008 08:05:34 -0000	1.2
+++ sources	15 Jan 2009 22:10:22 -0000	1.3
@@ -1 +1 @@
-bd4871398e9019b241d89cc21fb62def  gflags-0.9.tar.gz
+20125f5248f32214a5af20f67f115377  gflags-1.0.tar.gz



From rakesh at fedoraproject.org  Thu Jan 15 22:21:02 2009
From: rakesh at fedoraproject.org (Rakesh Pandit)
Date: Thu, 15 Jan 2009 22:21:02 +0000 (UTC)
Subject: rpms/ginac/F-10 import.log, NONE, 1.1 .cvsignore, 1.10,
	1.11 ginac.spec, 1.18, 1.19 sources, 1.10, 1.11
Message-ID: <20090115222102.8BE4C7012D@cvs1.fedora.phx.redhat.com>

Author: rakesh

Update of /cvs/pkgs/rpms/ginac/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30550/F-10

Modified Files:
	.cvsignore ginac.spec sources 
Added Files:
	import.log 
Log Message:
Updated to 1.4.4



--- NEW FILE import.log ---
ginac-1_4_4-1_fc10:F-10:ginac-1.4.4-1.fc10.src.rpm:1232014798


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ginac/F-10/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	30 Apr 2008 13:20:43 -0000	1.10
+++ .cvsignore	15 Jan 2009 22:20:31 -0000	1.11
@@ -1 +1 @@
-ginac-1.4.3.tar.bz2
+ginac-1.4.4.tar.bz2


Index: ginac.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ginac/F-10/ginac.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- ginac.spec	30 Apr 2008 13:20:43 -0000	1.18
+++ ginac.spec	15 Jan 2009 22:20:31 -0000	1.19
@@ -1,5 +1,5 @@
 Name:           ginac
-Version:        1.4.3
+Version:        1.4.4
 Release:        1%{?dist}
 Summary:        C++ library for symbolic calculations
 
@@ -99,6 +99,9 @@
 %{_mandir}/man?/*
 
 %changelog
+* Fri Jan 16 2009 Rakesh Pandit <rakesh at fedoraproject.org> 1.4.4-1
+- Updated to 1.4.4
+
 * Tue Apr 29 2008 Quentin Spencer <qspencer at users.sf.net> 1.4.3-1
 - Update to 1.4.3. Remove old patch.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ginac/F-10/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	30 Apr 2008 13:20:43 -0000	1.10
+++ sources	15 Jan 2009 22:20:31 -0000	1.11
@@ -1 +1 @@
-abad55c4ae27d5d65f525fabefaddd05  ginac-1.4.3.tar.bz2
+60d38b352258473e3cc4de75c0d6f88e  ginac-1.4.4.tar.bz2



From rakesh at fedoraproject.org  Thu Jan 15 22:21:13 2009
From: rakesh at fedoraproject.org (Rakesh Pandit)
Date: Thu, 15 Jan 2009 22:21:13 +0000 (UTC)
Subject: rpms/ginac/devel import.log, NONE, 1.1 .cvsignore, 1.10,
	1.11 ginac.spec, 1.18, 1.19 sources, 1.10, 1.11
Message-ID: <20090115222113.C0C257012D@cvs1.fedora.phx.redhat.com>

Author: rakesh

Update of /cvs/pkgs/rpms/ginac/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30502/devel

Modified Files:
	.cvsignore ginac.spec sources 
Added Files:
	import.log 
Log Message:
Updated to 1.4.4



--- NEW FILE import.log ---
ginac-1_4_4-1_fc10:HEAD:ginac-1.4.4-1.fc10.src.rpm:1232014772


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ginac/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	30 Apr 2008 13:20:43 -0000	1.10
+++ .cvsignore	15 Jan 2009 22:20:43 -0000	1.11
@@ -1 +1 @@
-ginac-1.4.3.tar.bz2
+ginac-1.4.4.tar.bz2


Index: ginac.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ginac/devel/ginac.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- ginac.spec	30 Apr 2008 13:20:43 -0000	1.18
+++ ginac.spec	15 Jan 2009 22:20:43 -0000	1.19
@@ -1,5 +1,5 @@
 Name:           ginac
-Version:        1.4.3
+Version:        1.4.4
 Release:        1%{?dist}
 Summary:        C++ library for symbolic calculations
 
@@ -99,6 +99,9 @@
 %{_mandir}/man?/*
 
 %changelog
+* Fri Jan 16 2009 Rakesh Pandit <rakesh at fedoraproject.org> 1.4.4-1
+- Updated to 1.4.4
+
 * Tue Apr 29 2008 Quentin Spencer <qspencer at users.sf.net> 1.4.3-1
 - Update to 1.4.3. Remove old patch.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ginac/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	30 Apr 2008 13:20:43 -0000	1.10
+++ sources	15 Jan 2009 22:20:43 -0000	1.11
@@ -1 +1 @@
-abad55c4ae27d5d65f525fabefaddd05  ginac-1.4.3.tar.bz2
+60d38b352258473e3cc4de75c0d6f88e  ginac-1.4.4.tar.bz2



From nim at fedoraproject.org  Thu Jan 15 22:21:18 2009
From: nim at fedoraproject.org (Nicolas Mailhot)
Date: Thu, 15 Jan 2009 22:21:18 +0000 (UTC)
Subject: rpms/fontpackages/devel .cvsignore, 1.5, 1.6 fontpackages.spec, 1.5,
	1.6 import.log, 1.5, 1.6 sources, 1.5, 1.6
Message-ID: <20090115222118.8A2C57012D@cvs1.fedora.phx.redhat.com>

Author: nim

Update of /cvs/extras/rpms/fontpackages/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30804/devel

Modified Files:
	.cvsignore fontpackages.spec import.log sources 
Log Message:
1.15


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fontpackages/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	15 Jan 2009 00:20:51 -0000	1.5
+++ .cvsignore	15 Jan 2009 22:20:48 -0000	1.6
@@ -1 +1 @@
-fontpackages-1.14.tar.bz2
+fontpackages-1.15.tar.bz2


Index: fontpackages.spec
===================================================================
RCS file: /cvs/extras/rpms/fontpackages/devel/fontpackages.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- fontpackages.spec	15 Jan 2009 00:20:51 -0000	1.5
+++ fontpackages.spec	15 Jan 2009 22:20:48 -0000	1.6
@@ -3,7 +3,7 @@
 %define rpmmacrodir     %{_sysconfdir}/rpm/
 
 Name:    fontpackages
-Version: 1.14
+Version: 1.15
 Release: 1%{?dist}
 Summary: Common directory and macro definitions used by font packages
 
@@ -97,8 +97,12 @@
 
 
 %changelog
+* Thu Jan 15 2009 Nicolas Mailhot <nim at fedoraproject dot org>
+- 1.15-1
+??? lua-ize the main macro
+
 * Wed Jan 14 2009 Nicolas Mailhot <nim at fedoraproject dot org>
-- 1.13-1
+- 1.14-1
 ??? Update for subpackage naming changes requested by FPC
 
 * Mon Dec 22 2008 Nicolas Mailhot <nim at fedoraproject dot org>


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/fontpackages/devel/import.log,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- import.log	15 Jan 2009 00:20:51 -0000	1.5
+++ import.log	15 Jan 2009 22:20:48 -0000	1.6
@@ -3,3 +3,4 @@
 fontpackages-1_12-2_fc11:HEAD:fontpackages-1.12-2.fc11.src.rpm:1229863050
 fontpackages-1_13-1_fc11:HEAD:fontpackages-1.13-1.fc11.src.rpm:1229949018
 fontpackages-1_14-1_fc11:HEAD:fontpackages-1.14-1.fc11.src.rpm:1231978787
+fontpackages-1_15-1_fc11:HEAD:fontpackages-1.15-1.fc11.src.rpm:1232058014


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fontpackages/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	15 Jan 2009 00:20:51 -0000	1.5
+++ sources	15 Jan 2009 22:20:48 -0000	1.6
@@ -1 +1 @@
-a90a6bbc2937c847fb32cad0bac41726  fontpackages-1.14.tar.bz2
+69359230ae56bc40320bbe3df61f71d4  fontpackages-1.15.tar.bz2



From rakesh at fedoraproject.org  Thu Jan 15 22:21:24 2009
From: rakesh at fedoraproject.org (Rakesh Pandit)
Date: Thu, 15 Jan 2009 22:21:24 +0000 (UTC)
Subject: rpms/ginac/F-9 import.log, NONE, 1.1 .cvsignore, 1.9,
	1.10 ginac.spec, 
	1.17, 1.18 sources, 1.9, 1.10 ginac-build-gcc43.patch, 1.1, NONE
Message-ID: <20090115222124.E345E7012D@cvs1.fedora.phx.redhat.com>

Author: rakesh

Update of /cvs/pkgs/rpms/ginac/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30728/F-9

Modified Files:
	.cvsignore ginac.spec sources 
Added Files:
	import.log 
Removed Files:
	ginac-build-gcc43.patch 
Log Message:
Updated to 1.4.4



--- NEW FILE import.log ---
ginac-1_4_4-1_fc10:F-9:ginac-1.4.4-1.fc10.src.rpm:1232014823


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ginac/F-9/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	3 Jan 2008 16:53:43 -0000	1.9
+++ .cvsignore	15 Jan 2009 22:20:54 -0000	1.10
@@ -1 +1 @@
-ginac-1.4.1.tar.bz2
+ginac-1.4.4.tar.bz2


Index: ginac.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ginac/F-9/ginac.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- ginac.spec	2 Mar 2008 11:27:55 -0000	1.17
+++ ginac.spec	15 Jan 2009 22:20:54 -0000	1.18
@@ -1,13 +1,12 @@
 Name:           ginac
-Version:        1.4.1
-Release:        4%{?dist}
+Version:        1.4.4
+Release:        1%{?dist}
 Summary:        C++ library for symbolic calculations
 
 Group:          System Environment/Libraries
 License:        GPLv2+
 URL:            http://www.ginac.de/
 Source0:        http://www.ginac.de/%{name}-%{version}.tar.bz2
-Patch0:         %{name}-build-gcc43.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires(post): /sbin/install-info
@@ -55,7 +54,6 @@
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
 %configure --disable-dependency-tracking --disable-static
@@ -101,6 +99,12 @@
 %{_mandir}/man?/*
 
 %changelog
+* Fri Jan 16 2009 Rakesh Pandit <rakesh at fedoraproject.org> 1.4.4-1
+- Updated to 1.4.4
+
+* Tue Apr 29 2008 Quentin Spencer <qspencer at users.sf.net> 1.4.3-1
+- Update to 1.4.3. Remove old patch.
+
 * Sun Mar  2 2008 Alex Lancaster <alexlan[AT]fedoraproject org> - 1.4.1-4
 - Patch for building with GCC 4.3 (this has been applied upstream and so
   can be dropped in the next release of ginac).


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ginac/F-9/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	3 Jan 2008 16:53:43 -0000	1.9
+++ sources	15 Jan 2009 22:20:54 -0000	1.10
@@ -1 +1 @@
-37356db3fe520498f2857e3ed6daec82  ginac-1.4.1.tar.bz2
+60d38b352258473e3cc4de75c0d6f88e  ginac-1.4.4.tar.bz2


--- ginac-build-gcc43.patch DELETED ---



From bskeggs at fedoraproject.org  Thu Jan 15 22:22:41 2009
From: bskeggs at fedoraproject.org (Ben Skeggs)
Date: Thu, 15 Jan 2009 22:22:41 +0000 (UTC)
Subject: rpms/kernel/F-10 drm-nouveau.patch,1.4,1.5
Message-ID: <20090115222241.B28F57012D@cvs1.fedora.phx.redhat.com>

Author: bskeggs

Update of /cvs/pkgs/rpms/kernel/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31287

Modified Files:
	drm-nouveau.patch 
Log Message:
missing include in nouveau patch

drm-nouveau.patch:

Index: drm-nouveau.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/drm-nouveau.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- drm-nouveau.patch	13 Jan 2009 23:32:59 -0000	1.4
+++ drm-nouveau.patch	15 Jan 2009 22:22:41 -0000	1.5
@@ -1,4 +1,4 @@
-From 5df129a266643714f0f5718ca972b7d959512072 Mon Sep 17 00:00:00 2001
+From a1d9ea66c8a7234e1d04c703e37323e2a625a7df Mon Sep 17 00:00:00 2001
 From: Ben Skeggs <skeggsb at gmail.com>
 Date: Tue, 13 Jan 2009 14:24:46 +1000
 Subject: [PATCH] drm: import nouveau driver
@@ -22,7 +22,7 @@
  drivers/gpu/drm/nouveau/nouveau_notifier.c |  165 +
  drivers/gpu/drm/nouveau/nouveau_object.c   | 1174 +++
  drivers/gpu/drm/nouveau/nouveau_reg.h      |  593 ++
- drivers/gpu/drm/nouveau/nouveau_sgdma.c    |  341 +
+ drivers/gpu/drm/nouveau/nouveau_sgdma.c    |  342 +
  drivers/gpu/drm/nouveau/nouveau_state.c    |  867 +++
  drivers/gpu/drm/nouveau/nouveau_swmthd.c   |  191 +
  drivers/gpu/drm/nouveau/nouveau_swmthd.h   |   33 +
@@ -48,7 +48,7 @@
  include/drm/Kbuild                         |    2 +
  include/drm/drmP.h                         |    2 +
  include/drm/nouveau_drm.h                  |  184 +
- 44 files changed, 25287 insertions(+), 2 deletions(-)
+ 44 files changed, 25288 insertions(+), 2 deletions(-)
  create mode 100644 drivers/gpu/drm/nouveau/Makefile
  create mode 100644 drivers/gpu/drm/nouveau/nouveau_bo.c
  create mode 100644 drivers/gpu/drm/nouveau/nouveau_dma.c
@@ -5908,12 +5908,13 @@
 +#define NV40_RAMFC_UNK_50                                        0x50
 diff --git a/drivers/gpu/drm/nouveau/nouveau_sgdma.c b/drivers/gpu/drm/nouveau/nouveau_sgdma.c
 new file mode 100644
-index 0000000..788e8ff
+index 0000000..7cc9c6a
 --- /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)



From mclasen at fedoraproject.org  Thu Jan 15 22:23:38 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Thu, 15 Jan 2009 22:23:38 +0000 (UTC)
Subject: rpms/gnome-terminal/F-10 .cvsignore, 1.54, 1.55 gnome-terminal.spec,
	1.111, 1.112 sources, 1.56, 1.57
Message-ID: <20090115222338.1B1647012D@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-terminal/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31344

Modified Files:
	.cvsignore gnome-terminal.spec sources 
Log Message:
2.24.3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-terminal/F-10/.cvsignore,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- .cvsignore	20 Oct 2008 18:48:08 -0000	1.54
+++ .cvsignore	15 Jan 2009 22:23:07 -0000	1.55
@@ -1 +1 @@
-gnome-terminal-2.24.1.tar.bz2
+gnome-terminal-2.24.3.tar.bz2


Index: gnome-terminal.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-terminal/F-10/gnome-terminal.spec,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -r1.111 -r1.112
--- gnome-terminal.spec	1 Jan 2009 22:58:11 -0000	1.111
+++ gnome-terminal.spec	15 Jan 2009 22:23:07 -0000	1.112
@@ -10,8 +10,8 @@
 
 Summary: Terminal emulator for GNOME
 Name: gnome-terminal
-Version: 2.24.2
-Release: 3%{?dist}
+Version: 2.24.3
+Release: 1%{?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
@@ -42,8 +42,6 @@
 BuildRequires: scrollkeeper 
 BuildRequires: gettext
 BuildRequires: gnome-doc-utils
-# For intltool:
-BuildRequires: perl(XML::Parser)
 BuildRequires: intltool
 
 
@@ -135,6 +133,9 @@
 %{_libdir}/bonobo/servers/gnome-terminal.server
 
 %changelog
+* Thu Jan 15 2009 Matthias Clasen <mclasen at redhat.com> - 2.24.3-1
+- Update to 2.24.3
+
 * Thu Jan  1 2009 Matthias Clasen <mclasen at redhat.com> - 2.24.2-3
 - Restore tab switching configurability
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-terminal/F-10/sources,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- sources	25 Nov 2008 06:47:18 -0000	1.56
+++ sources	15 Jan 2009 22:23:07 -0000	1.57
@@ -1 +1 @@
-c864ee43335db306e344df41e0090d4f  gnome-terminal-2.24.2.tar.bz2
+03f099985da576d774075e30430d29da  gnome-terminal-2.24.3.tar.bz2



From nsantos at fedoraproject.org  Thu Jan 15 22:29:08 2009
From: nsantos at fedoraproject.org (Nuno Santos)
Date: Thu, 15 Jan 2009 22:29:08 +0000 (UTC)
Subject: rpms/rhm/F-10 .cvsignore, 1.10, 1.11 rhm.spec, 1.33, 1.34 sources, 
	1.15, 1.16
Message-ID: <20090115222908.0F0FD7012D@cvs1.fedora.phx.redhat.com>

Author: nsantos

Update of /cvs/extras/rpms/rhm/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31948

Modified Files:
	.cvsignore rhm.spec sources 
Log Message:
Rebased to svn rev 3045/734452


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rhm/F-10/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	23 Dec 2008 21:04:48 -0000	1.10
+++ .cvsignore	15 Jan 2009 22:28:37 -0000	1.11
@@ -1 +1 @@
-rhm-0.4.3030.tar.gz
+rhm-0.4.3045.tar.gz


Index: rhm.spec
===================================================================
RCS file: /cvs/extras/rpms/rhm/F-10/rhm.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- rhm.spec	5 Jan 2009 16:00:34 -0000	1.33
+++ rhm.spec	15 Jan 2009 22:28:37 -0000	1.34
@@ -2,13 +2,13 @@
 # Spec file for Red Hat Messaging package rhm.
 #
 
-%define svnrev 3030
+%define svnrev 3045
 # built against qpidc svn rev:
-%define svnrev_qpid 728142
+%define svnrev_qpid 734452
 
 Name:           rhm
 Version:        0.4.%{svnrev}
-Release:        2%{?dist}
+Release:        1%{?dist}
 Summary:        Red Hat persistence extension to the Qpid messaging system
 Group:          System Environment/Libraries
 License:        LGPLv2+
@@ -65,6 +65,9 @@
 
 
 %changelog
+* Thu Jan 15 2009 Nuno Santos <nsantos at redhat.com> - 0.4.3045-1
+- Rebased to svn rev 3045/734452
+
 * Tue Dec 23 2008 Nuno Santos <nsantos at redhat.com> - 0.4.3030-1
 - Rebased to svn rev 3030/728142
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rhm/F-10/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	23 Dec 2008 21:04:48 -0000	1.15
+++ sources	15 Jan 2009 22:28:37 -0000	1.16
@@ -1 +1 @@
-045d5263a9eec612cd147b9c8268b76c  rhm-0.4.3030.tar.gz
+2076788ff9c648d87be489fbcee0d5d7  rhm-0.4.3045.tar.gz



From nsantos at fedoraproject.org  Thu Jan 15 22:44:39 2009
From: nsantos at fedoraproject.org (Nuno Santos)
Date: Thu, 15 Jan 2009 22:44:39 +0000 (UTC)
Subject: rpms/rhm/F-9 .cvsignore, 1.10, 1.11 rhm.spec, 1.28, 1.29 sources,
	1.15, 1.16
Message-ID: <20090115224440.0286A7012D@cvs1.fedora.phx.redhat.com>

Author: nsantos

Update of /cvs/extras/rpms/rhm/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1174

Modified Files:
	.cvsignore rhm.spec sources 
Log Message:
Rebased to svn rev 3045/734452


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rhm/F-9/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	23 Dec 2008 21:42:18 -0000	1.10
+++ .cvsignore	15 Jan 2009 22:44:08 -0000	1.11
@@ -1 +1 @@
-rhm-0.4.3030.tar.gz
+rhm-0.4.3045.tar.gz


Index: rhm.spec
===================================================================
RCS file: /cvs/extras/rpms/rhm/F-9/rhm.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- rhm.spec	5 Jan 2009 16:16:03 -0000	1.28
+++ rhm.spec	15 Jan 2009 22:44:08 -0000	1.29
@@ -2,13 +2,13 @@
 # Spec file for Red Hat Messaging package rhm.
 #
 
-%define svnrev 3030
+%define svnrev 3045
 # built against qpidc svn rev:
-%define svnrev_qpid 728142
+%define svnrev_qpid 734452
 
 Name:           rhm
 Version:        0.4.%{svnrev}
-Release:        2%{?dist}
+Release:        1%{?dist}
 Summary:        Red Hat persistence extension to the Qpid messaging system
 Group:          System Environment/Libraries
 License:        LGPLv2+
@@ -65,6 +65,9 @@
 
 
 %changelog
+* Thu Jan 15 2009 Nuno Santos <nsantos at redhat.com> - 0.4.3045-1
+- Rebased to svn rev 3045/734452
+
 * Tue Dec 23 2008 Nuno Santos <nsantos at redhat.com> - 0.4.3030-1
 - Rebased to svn rev 3030/728142
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rhm/F-9/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	23 Dec 2008 21:42:18 -0000	1.15
+++ sources	15 Jan 2009 22:44:08 -0000	1.16
@@ -1 +1 @@
-045d5263a9eec612cd147b9c8268b76c  rhm-0.4.3030.tar.gz
+2076788ff9c648d87be489fbcee0d5d7  rhm-0.4.3045.tar.gz



From roozbeh at fedoraproject.org  Thu Jan 15 22:46:36 2009
From: roozbeh at fedoraproject.org (Roozbeh Pournader)
Date: Thu, 15 Jan 2009 22:46:36 +0000 (UTC)
Subject: rpms/libuninameslist/devel .cvsignore, 1.3, 1.4 libuninameslist.spec,
	1.12, 1.13 sources, 1.3, 1.4
Message-ID: <20090115224636.D72497012D@cvs1.fedora.phx.redhat.com>

Author: roozbeh

Update of /cvs/pkgs/rpms/libuninameslist/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1537

Modified Files:
	.cvsignore libuninameslist.spec sources 
Log Message:
* Thu Jan 15 2009 Roozbeh Pournader <roozbeh at gmail.com> - 20080409-1
- Update to upstream 20080409: Unicode 5.1 support
- Change package versioning scheme
- Update summary and description
- Add DistTag
- Remove copy of GPL from RPM: the only file it applies to is not shipped


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libuninameslist/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	21 Sep 2006 04:57:35 -0000	1.3
+++ .cvsignore	15 Jan 2009 22:46:06 -0000	1.4
@@ -1 +1 @@
-libuninameslist_src-20060907.tgz
+libuninameslist-20080409.tar.bz2


Index: libuninameslist.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libuninameslist/devel/libuninameslist.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- libuninameslist.spec	10 Feb 2008 18:21:21 -0000	1.12
+++ libuninameslist.spec	15 Jan 2009 22:46:06 -0000	1.13
@@ -1,19 +1,18 @@
 Name:           libuninameslist
-Version:        0.0
-Release:        8.20060907
+Version:        20080409
+Release:        1%{?dist}
 
-Summary:        Library that provides Unicode names and annotations
+Summary:        A library providing Unicode character names and annotations
 
 Group:          System Environment/Libraries
 License:        BSD
 URL:            http://libuninameslist.sourceforge.net
-Source0:        http://dl.sf.net/libuninameslist/libuninameslist_src-20060907.tgz
+Source0:        http://dl.sf.net/libuninameslist/libuninameslist-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
 libuninameslist provides applications with access to Unicode name and
-annotation data from the official Unicode databases. The information
-is current as of Unicode 4.0.
+annotation data from the official Unicode Character Database.
 
 %package        devel
 Summary:        Header files and static libraries for %{name}
@@ -50,7 +49,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc COPYING LICENSE
+%doc LICENSE
 %{_libdir}/*.so.*
 
 %files devel
@@ -61,6 +60,13 @@
 
 
 %changelog
+* Thu Jan 15 2009 Roozbeh Pournader <roozbeh at gmail.com> - 20080409-1
+- Update to upstream 20080409: Unicode 5.1 support
+- Change package versioning scheme
+- Update summary and description
+- Add DistTag
+- Remove copy of GPL from RPM: the only file it applies to is not shipped
+
 * Sun Feb 10 2008 Kevin Fenzi <kevin at tummy.com> - 0.0-8.20060907
 - Rebuild for gcc43
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libuninameslist/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	21 Sep 2006 04:57:35 -0000	1.3
+++ sources	15 Jan 2009 22:46:06 -0000	1.4
@@ -1 +1 @@
-e5090105b9f09e76838a0af3220b371d  libuninameslist_src-20060907.tgz
+bcf7d9d7975278d11338b69d1248a072  libuninameslist-20080409.tar.bz2



From nim at fedoraproject.org  Thu Jan 15 22:55:10 2009
From: nim at fedoraproject.org (Nicolas Mailhot)
Date: Thu, 15 Jan 2009 22:55:10 +0000 (UTC)
Subject: rpms/dejavu-fonts/devel dejavu-fonts.spec, 1.92, 1.93 import.log,
	1.9, 1.10
Message-ID: <20090115225510.430407012D@cvs1.fedora.phx.redhat.com>

Author: nim

Update of /cvs/extras/rpms/dejavu-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3088/devel

Modified Files:
	dejavu-fonts.spec import.log 
Log Message:
update for new naming guidelines


Index: dejavu-fonts.spec
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/devel/dejavu-fonts.spec,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -r1.92 -r1.93
--- dejavu-fonts.spec	21 Dec 2008 17:18:48 -0000	1.92
+++ dejavu-fonts.spec	15 Jan 2009 22:54:37 -0000	1.93
@@ -28,12 +28,12 @@
 
 Name:    %{fontname}-fonts
 Version: 2.28
-Release: 1%{?alphatag}%{?dist}
+Release: 2%{?alphatag}%{?dist}
 Summary: DejaVu fonts
 
 Group:     User Interface/X
 License:   Bitstream Vera and Public Domain
-URL:       http://%{fontname}.sf.net/
+URL:       http://%{name}.org/
 Source0:   %{?!alphatag:http://downloads.sourceforge.net/%{fontname}}%{?alphatag:%{fontname}.sourceforge.net/snapshots}/%{archivename}.tar.bz2
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
@@ -44,7 +44,7 @@
 BuildRequires: %{Blocks} %{UnicodeData}
 
 BuildArch:     noarch
-BuildRequires: fontpackages-devel
+BuildRequires: fontpackages-devel > 1.13
 
 %description
 %common_desc
@@ -57,7 +57,9 @@
 Obsoletes: dejavu-fonts < 2.26-3
 Obsoletes: dejavu-fonts-experimental < 2.26-3
 
-Requires: %{name}-sans, %{name}-serif, %{name}-sans-mono
+Requires: %{fontname}-sans-fonts
+Requires: %{fontname}-sans-mono-fonts
+Requires: %{fontname}-serif-fonts
 
 %description compat
 %compat_desc
@@ -69,14 +71,16 @@
 
 Obsoletes: dejavu-lgc-fonts < 2.26-3
 
-Requires: %{name}-lgc-sans, %{name}-lgc-serif, %{name}-lgc-sans-mono
+Requires: %{fontname}-lgc-sans-fonts
+Requires: %{fontname}-lgc-sans-mono-fonts
+Requires: %{fontname}-lgc-serif-fonts
 
 %description lgc-compat
 %compat_desc
 
 
 %package common
-Summary:  Common files for Dejavu fonts (documentation???)
+Summary:  Common files for the Dejavu font set
 Group:    User Interface/X
 Requires: fontpackages-filesystem
 
@@ -88,7 +92,7 @@
 This package consists of files used by other DejaVu packages.
 
 
-%package sans
+%package -n %{fontname}-sans-fonts
 Summary:  Variable-width sans-serif font faces
 Group:    User Interface/X
 Requires: %{name}-common = %{version}-%{release}
@@ -96,7 +100,10 @@
 Conflicts: dejavu-fonts < 2.26-3
 Conflicts: dejavu-fonts-experimental < 2.26-3
 
-%description sans
+Obsoletes: %{name}-sans < 2.28-2
+Provides:  %{name}-sans = %{version}-%{release}
+
+%description -n %{fontname}-sans-fonts
 %common_desc
 
 This package consists of the DejaVu sans-serif variable-width font faces, in
@@ -105,7 +112,7 @@
 %_font_pkg -n sans -f *-%{fontname}-sans.conf DejaVuSans.ttf DejaVuSans-*.ttf DejaVuSansCondensed*.ttf
 
 
-%package serif
+%package -n %{fontname}-serif-fonts
 Summary:  Variable-width serif font faces
 Group:    User Interface/X
 Requires: %{name}-common = %{version}-%{release}
@@ -113,7 +120,10 @@
 Conflicts: dejavu-fonts < 2.26-3
 Conflicts: dejavu-fonts-experimental < 2.26-3
 
-%description serif
+Obsoletes: %{name}-serif < 2.28-2
+Provides:  %{name}-serif = %{version}-%{release}
+
+%description -n %{fontname}-serif-fonts
 %common_desc
 
 This package consists of the DejaVu serif variable-width font faces, in their
@@ -122,7 +132,7 @@
 %_font_pkg -n serif -f *-%{fontname}-serif.conf DejaVuSerif.ttf DejaVuSerif-*.ttf DejaVuSerifCondensed*.ttf
 
 
-%package sans-mono
+%package -n %{fontname}-sans-mono-fonts
 Summary:  Monospace sans-serif font faces
 Group:    User Interface/X
 Requires: %{name}-common = %{version}-%{release}
@@ -130,7 +140,10 @@
 Conflicts: dejavu-fonts < 2.26-3
 Conflicts: dejavu-fonts-experimental < 2.26-3
 
-%description sans-mono
+Obsoletes: %{name}-sans-mono < 2.28-2
+Provides:  %{name}-sans-mono = %{version}-%{release}
+
+%description -n %{fontname}-sans-mono-fonts
 %common_desc
 
 This package consists of the DejaVu sans-serif monospace font faces, in their
@@ -139,14 +152,16 @@
 %_font_pkg -n sans-mono -f *-%{fontname}-sans-mono.conf DejaVuSansMono*.ttf
 
 
-%package lgc-sans
+%package -n %{fontname}-lgc-sans-fonts
 Summary:  Variable-width sans-serif font faces, Latin-Greek-Cyrillic subset
 Group:    User Interface/X
 Requires: %{name}-common = %{version}-%{release}
 
 Conflicts: dejavu-lgc-fonts < 2.26-3
 
-%description lgc-sans
+Obsoletes: %{name}-lgc-sans < 2.28-2
+
+%description -n %{fontname}-lgc-sans-fonts
 %common_desc
 
 This package consists of the DejaVu sans-serif variable-width font faces, with
@@ -155,14 +170,16 @@
 %_font_pkg -n lgc-sans -f *-%{fontname}-lgc-sans.conf DejaVuLGCSans.ttf DejaVuLGCSans-*.ttf DejaVuLGCSansCondensed*.ttf
 
 
-%package lgc-serif
+%package -n %{fontname}-lgc-serif-fonts
 Summary:  Variable-width serif font faces, Latin-Greek-Cyrillic subset
 Group:    User Interface/X
 Requires: %{name}-common = %{version}-%{release}
 
 Conflicts: dejavu-lgc-fonts < 2.26-3
 
-%description lgc-serif
+Obsoletes: %{name}-lgc-sans < 2.28-2
+
+%description -n %{fontname}-lgc-serif-fonts
 %common_desc
 
 This package consists of the DejaVu serif variable-width font faces, with
@@ -171,14 +188,16 @@
 %_font_pkg -n lgc-serif -f *-%{fontname}-lgc-serif.conf DejaVuLGCSerif.ttf DejaVuLGCSerif-*.ttf DejaVuLGCSerifCondensed*.ttf
 
 
-%package lgc-sans-mono
+%package -n %{fontname}-lgc-sans-mono-fonts
 Summary:  Monospace sans-serif font faces, Latin-Greek-Cyrillic subset
 Group:    User Interface/X
 Requires: %{name}-common = %{version}-%{release}
 
 Conflicts: dejavu-lgc-fonts < 2.26-3
 
-%description lgc-sans-mono
+Obsoletes: %{name}-lgc-sans-mono < 2.28-2
+
+%description -n %{fontname}-lgc-sans-mono-fonts
 %common_desc
 
 This package consists of the DejaVu sans-serif monospace font faces, with
@@ -237,6 +256,12 @@
 
 
 %changelog
+* Thu Jan 15 2009 Nicolas Mailhot <nim at fedoraproject dot org>
+- 2.28-2
+??? Update URL
+??? update for new naming guidelines
+??? warning: provides for the old names will be dropped before F11 beta
+
 * Sun Dec 21 2008 <nicolas.mailhot at laposte.net>
 - 2.28-1
 ??? Update to latest release


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/devel/import.log,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- import.log	21 Dec 2008 17:18:48 -0000	1.9
+++ import.log	15 Jan 2009 22:54:38 -0000	1.10
@@ -7,3 +7,4 @@
 dejavu-fonts-2_26-6_fc11:HEAD:dejavu-fonts-2.26-6.fc11.src.rpm:1226221359
 dejavu-fonts-2_27-7_fc11:HEAD:dejavu-fonts-2.27-7.fc11.src.rpm:1229544635
 dejavu-fonts-2_28-1_fc11:HEAD:dejavu-fonts-2.28-1.fc11.src.rpm:1229879833
+dejavu-fonts-2_28-2_fc11:HEAD:dejavu-fonts-2.28-2.fc11.src.rpm:1232060001



From nim at fedoraproject.org  Thu Jan 15 23:02:48 2009
From: nim at fedoraproject.org (Nicolas Mailhot)
Date: Thu, 15 Jan 2009 23:02:48 +0000 (UTC)
Subject: comps comps-f11.xml.in,1.60,1.61
Message-ID: <20090115230248.96F857012D@cvs1.fedora.phx.redhat.com>

Author: nim

Update of /cvs/extras/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3925

Modified Files:
	comps-f11.xml.in 
Log Message:
New vera and dejavu package naming


Index: comps-f11.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-f11.xml.in,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- comps-f11.xml.in	15 Jan 2009 14:10:31 -0000	1.60
+++ comps-f11.xml.in	15 Jan 2009 23:02:17 -0000	1.61
@@ -92,8 +92,8 @@
       <packagereq type="conditional" requires="kdelibs">kde-l10n-Arabic</packagereq>
       <packagereq type="conditional" requires="moodle">moodle-ar</packagereq>
       <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-ar</packagereq>
-      <packagereq type="default">dejavu-fonts-sans</packagereq>
-      <packagereq type="default">dejavu-fonts-sans-mono</packagereq>
+      <packagereq type="default">dejavu-sans-fonts</packagereq>
+      <packagereq type="default">dejavu-sans-mono-fonts</packagereq>
       <packagereq type="default">kacst-fonts</packagereq>
       <packagereq type="default">paktype-fonts</packagereq>
       <packagereq type="optional">m17n-db-arabic</packagereq>
@@ -109,7 +109,7 @@
     <uservisible>false</uservisible>
     <langonly>hy</langonly>
     <packagelist>
-      <packagereq type="mandatory">dejavu-fonts-sans</packagereq>
+      <packagereq type="mandatory">dejavu-sans-fonts</packagereq>
       <packagereq type="conditional" requires="hunspell">hunspell-hy</packagereq>
       <packagereq type="conditional" requires="moodle">moodle-hy</packagereq>
       <packagereq type="optional">m17n-db-armenian</packagereq>
@@ -1467,9 +1467,9 @@
     <packagelist>
       <packagereq type="default">abyssinica-fonts</packagereq>
       <packagereq type="default">cjkunifonts-uming</packagereq>
-      <packagereq type="default">dejavu-fonts-sans</packagereq>
-      <packagereq type="default">dejavu-fonts-sans-mono</packagereq>
-      <packagereq type="default">dejavu-fonts-serif</packagereq>
+      <packagereq type="default">dejavu-sans-fonts</packagereq>
+      <packagereq type="default">dejavu-sans-mono-fonts</packagereq>
+      <packagereq type="default">dejavu-serif-fonts</packagereq>
       <packagereq type="default">jomolhari-fonts</packagereq>
       <packagereq type="default">kacst-fonts</packagereq>
       <packagereq type="default">khmeros-fonts-base</packagereq>
@@ -1498,14 +1498,16 @@
       <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">bitstream-vera-sans-fonts</packagereq>
+      <packagereq type="optional">bitstream-vera-sans-mono-fonts</packagereq>
+      <packagereq type="optional">bitstream-vera-serif-fonts</packagereq>
       <packagereq type="optional">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-fonts-lgc-sans</packagereq>
-      <packagereq type="optional">dejavu-fonts-lgc-sans-mono</packagereq>
-      <packagereq type="optional">dejavu-fonts-lgc-serif</packagereq>
+      <packagereq type="optional">dejavu-lgc-sans-fonts</packagereq>
+      <packagereq type="optional">dejavu-lgc-sans-mono-fonts</packagereq>
+      <packagereq type="optional">dejavu-lgc-serif-fonts</packagereq>
       <packagereq type="optional">doulos-fonts</packagereq>
       <packagereq type="optional">dustin-dustismo-fonts</packagereq>
       <packagereq type="optional">ecolier-court-fonts</packagereq>
@@ -1959,10 +1961,10 @@
     <uservisible>false</uservisible>
     <langonly>ka</langonly>
     <packagelist>
-      <packagereq type="mandatory">dejavu-fonts-sans</packagereq>
+      <packagereq type="mandatory">dejavu-sans-fonts</packagereq>
       <packagereq type="conditional" requires="moodle">moodle-ka</packagereq>
-      <packagereq type="default">dejavu-fonts-sans-mono</packagereq>
-      <packagereq type="default">dejavu-fonts-serif</packagereq>
+      <packagereq type="default">dejavu-sans-mono-fonts</packagereq>
+      <packagereq type="default">dejavu-serif-fonts</packagereq>
     </packagelist>
   </group>
   <group>
@@ -2502,7 +2504,7 @@
     <uservisible>false</uservisible>
     <langonly>he</langonly>
     <packagelist>
-      <packagereq type="mandatory">dejavu-fonts-sans</packagereq>
+      <packagereq type="mandatory">dejavu-sans-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>
@@ -2722,7 +2724,7 @@
     <uservisible>false</uservisible>
     <langonly>iu</langonly>
     <packagelist>
-      <packagereq type="mandatory">dejavu-fonts-sans</packagereq>
+      <packagereq type="mandatory">dejavu-sans-fonts</packagereq>
     </packagelist>
   </group>
   <group>
@@ -3246,7 +3248,7 @@
     <uservisible>false</uservisible>
     <langonly>lo</langonly>
     <packagelist>
-      <packagereq type="mandatory">dejavu-fonts-sans</packagereq>
+      <packagereq type="mandatory">dejavu-sans-fonts</packagereq>
       <packagereq type="conditional" requires="moodle">moodle-lo</packagereq>
       <packagereq type="optional">m17n-db-lao</packagereq>
     </packagelist>
@@ -4607,9 +4609,9 @@
     <uservisible>false</uservisible>
     <langonly>tg</langonly>
     <packagelist>
-      <packagereq type="mandatory">dejavu-fonts-sans</packagereq>
-      <packagereq type="default">dejavu-fonts-sans-mono</packagereq>
-      <packagereq type="default">dejavu-fonts-serif</packagereq>
+      <packagereq type="mandatory">dejavu-sans-fonts</packagereq>
+      <packagereq type="default">dejavu-sans-mono-fonts</packagereq>
+      <packagereq type="default">dejavu-serif-fonts</packagereq>
     </packagelist>
   </group>
   <group>
@@ -4843,8 +4845,8 @@
       <packagereq type="mandatory">paktype-fonts</packagereq>
       <packagereq type="conditional" requires="hunspell">hunspell-ur</packagereq>
       <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-ur</packagereq>
-      <packagereq type="default">dejavu-fonts-sans</packagereq>
-      <packagereq type="default">dejavu-fonts-sans-mono</packagereq>
+      <packagereq type="default">dejavu-sans-fonts</packagereq>
+      <packagereq type="default">dejavu-sans-mono-fonts</packagereq>
       <packagereq type="default">nafees-web-naskh-fonts</packagereq>
       <packagereq type="optional">kacst-fonts</packagereq>
     </packagelist>
@@ -4869,9 +4871,9 @@
     <uservisible>false</uservisible>
     <langonly>ve</langonly>
     <packagelist>
-      <packagereq type="mandatory">dejavu-fonts-sans</packagereq>
-      <packagereq type="mandatory">dejavu-fonts-sans-mono</packagereq>
-      <packagereq type="mandatory">dejavu-fonts-serif</packagereq>
+      <packagereq type="mandatory">dejavu-sans-fonts</packagereq>
+      <packagereq type="mandatory">dejavu-sans-mono-fonts</packagereq>
+      <packagereq type="mandatory">dejavu-serif-fonts</packagereq>
       <packagereq type="conditional" requires="hunspell">hunspell-ve</packagereq>
       <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-ve_ZA</packagereq>
     </packagelist>



From caolanm at fedoraproject.org  Thu Jan 15 23:05:49 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Thu, 15 Jan 2009 23:05:49 +0000 (UTC)
Subject: rpms/openoffice.org/devel workspace.fwk99.patch, NONE,
	1.1 openoffice.org.spec, 1.1756,
	1.1757 openoffice.org-3.0.1.ooo95702.wizardsdocinfo.patch, 1.1, NONE
Message-ID: <20090115230549.80CE07012D@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4308

Modified Files:
	openoffice.org.spec 
Added Files:
	workspace.fwk99.patch 
Removed Files:
	openoffice.org-3.0.1.ooo95702.wizardsdocinfo.patch 
Log Message:
upstream workspace name

workspace.fwk99.patch:

--- NEW FILE workspace.fwk99.patch ---
diff -ru wizards.orig/com/sun/star/wizards/common/Desktop.java wizards/com/sun/star/wizards/common/Desktop.java
--- openoffice.org.orig/wizards/com/sun/star/wizards/common/Desktop.java	2009-01-15 10:26:05.000000000 +0000
+++ openoffice.org/wizards/com/sun/star/wizards/common/Desktop.java	2009-01-15 10:50:33.000000000 +0000
@@ -28,9 +28,6 @@
  *
  ************************************************************************/package com.sun.star.wizards.common;
 
-import java.util.Date;
-
-import com.sun.star.awt.XToolkit;
 import com.sun.star.beans.PropertyValue;
 import com.sun.star.frame.XDesktop;
 import com.sun.star.frame.XFrame;
diff -ru wizards.orig/com/sun/star/wizards/common/FileAccess.java wizards/com/sun/star/wizards/common/FileAccess.java
--- openoffice.org.orig/wizards/com/sun/star/wizards/common/FileAccess.java	2009-01-15 10:26:05.000000000 +0000
+++ openoffice.org/wizards/com/sun/star/wizards/common/FileAccess.java	2009-01-15 10:51:48.000000000 +0000
@@ -49,6 +49,7 @@
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.uno.XInterface;
 import com.sun.star.util.DateTime;
+import com.sun.star.beans.PropertyValue;
 
 /**
  * This class delivers static convenience methods
@@ -75,9 +76,7 @@
         // As there are several conventions about the look of Url  (e.g. with " " or with "%20") you cannot make a
         // simple String comparison to find out, if a path is already in "ResultPath"
         String[] PathList = JavaTools.ArrayoutofString(ResultPath, ";");
-        boolean badd = false;
         int MaxIndex = PathList.length - 1;
-        int iPos;
         String CompCurPath;
         //  sAddPath.replace(null, (char) 47);
         String CompAddPath = JavaTools.replaceSubString(sAddPath, "", "/");
@@ -568,8 +567,8 @@
             java.util.Vector TitleVector = null;
             java.util.Vector NameVector = null;
             
-            XInterface xDocInterface = (XInterface) xMSF.createInstance("com.sun.star.document.StandaloneDocumentInfo");
-            com.sun.star.document.XStandaloneDocumentInfo xDocInfo = (com.sun.star.document.XStandaloneDocumentInfo) UnoRuntime.queryInterface(com.sun.star.document.XStandaloneDocumentInfo.class, xDocInterface);
+            XInterface xDocInterface = (XInterface) xMSF.createInstance("com.sun.star.document.DocumentProperties");
+            com.sun.star.document.XDocumentProperties xDocInfo = (com.sun.star.document.XDocumentProperties) UnoRuntime.queryInterface(com.sun.star.document.XDocumentProperties.class, xDocInterface);
 
             XInterface xInterface = (XInterface) xMSF.createInstance("com.sun.star.ucb.SimpleFileAccess");
             com.sun.star.ucb.XSimpleFileAccess xSimpleFileAccess = (com.sun.star.ucb.XSimpleFileAccess) UnoRuntime.queryInterface(com.sun.star.ucb.XSimpleFileAccess.class, xInterface);
@@ -582,12 +581,13 @@
             FilterName = FilterName == null || FilterName.equals("") ? null : FilterName + "-"; 
             
             String fileName = "";
+            PropertyValue[] noArgs = { };
             for (int i = 0; i < nameList.length; i++) {
                 fileName = getFilename( nameList[i] );
                 
                 if (FilterName == null || fileName.startsWith(FilterName)) {
                     
-                    xDocInfo.loadFromURL(nameList[i]);
+                    xDocInfo.loadFromMedium(nameList[i], noArgs);
                     NameVector.addElement(nameList[i]);
                     TitleVector.addElement(com.sun.star.uno.AnyConverter.toString(Helper.getUnoPropertyValue(xDocInterface, "Title")));
                     
@@ -673,10 +673,10 @@
         String sTitle = "";
         try
         {
-            XInterface xDocInterface = (XInterface) xMSF.createInstance("com.sun.star.document.StandaloneDocumentInfo");
-            com.sun.star.document.XStandaloneDocumentInfo xDocInfo = (com.sun.star.document.XStandaloneDocumentInfo) UnoRuntime.queryInterface(com.sun.star.document.XStandaloneDocumentInfo.class, xDocInterface);
-
-            xDocInfo.loadFromURL(_sFile);
+            XInterface xDocInterface = (XInterface) xMSF.createInstance("com.sun.star.document.DocumentProperties");
+            com.sun.star.document.XDocumentProperties xDocInfo = (com.sun.star.document.XDocumentProperties) UnoRuntime.queryInterface(com.sun.star.document.XDocumentProperties.class, xDocInterface);
+            PropertyValue[] noArgs = { };
+            xDocInfo.loadFromMedium(_sFile, noArgs);
             sTitle = com.sun.star.uno.AnyConverter.toString(Helper.getUnoPropertyValue(xDocInterface, "Title"));
         }
         catch (Exception e)
diff -ru wizards.orig/com/sun/star/wizards/common/Helper.java wizards/com/sun/star/wizards/common/Helper.java
--- openoffice.org.orig/wizards/com/sun/star/wizards/common/Helper.java	2009-01-15 10:26:05.000000000 +0000
+++ openoffice.org/wizards/com/sun/star/wizards/common/Helper.java	2009-01-15 10:52:25.000000000 +0000
@@ -35,10 +35,8 @@
 import com.sun.star.beans.Property;
 import com.sun.star.beans.PropertyValue;
 import com.sun.star.beans.XPropertySet;
-import com.sun.star.i18n.NumberFormatIndex;
 import com.sun.star.lang.Locale;
 import com.sun.star.lang.XMultiServiceFactory;
-import com.sun.star.uno.Any;
 import com.sun.star.uno.AnyConverter;
 import com.sun.star.uno.RuntimeException;
 import com.sun.star.uno.UnoRuntime;
diff -ru wizards.orig/com/sun/star/wizards/web/data/CGDocument.java wizards/com/sun/star/wizards/web/data/CGDocument.java
--- openoffice.org.orig/wizards/com/sun/star/wizards/web/data/CGDocument.java	2009-01-15 10:26:05.000000000 +0000
+++ openoffice.org/wizards/com/sun/star/wizards/web/data/CGDocument.java	2009-01-15 10:46:13.000000000 +0000
@@ -38,7 +38,7 @@
 import com.sun.star.document.MacroExecMode;
 import com.sun.star.document.UpdateDocMode;
 import com.sun.star.document.XDocumentInfoSupplier;
-import com.sun.star.document.XStandaloneDocumentInfo;
+import com.sun.star.document.XDocumentProperties;
 import com.sun.star.frame.XComponentLoader;
 import com.sun.star.frame.XDesktop;
 import com.sun.star.lang.XComponent;
@@ -174,9 +174,10 @@
         
         //first get the info object which is a DocumentInfo service.
         Object info = null;
-        if (isSODocument) {//for SO documents, use StandaloneDocumentInfo service.
-            info = xmsf.createInstance("com.sun.star.document.StandaloneDocumentInfo");
-            ((XStandaloneDocumentInfo)UnoRuntime.queryInterface(XStandaloneDocumentInfo.class, info)).loadFromURL(cp_URL);
+        if (isSODocument) {//for SO documents
+            PropertyValue[] noArgs = { };
+            info = xmsf.createInstance("com.sun.star.document.DocumentProperties");
+            ((XDocumentProperties)UnoRuntime.queryInterface(XDocumentProperties.class, info)).loadFromMedium(cp_URL, noArgs);
         }
         
         task.advance(true); //3
diff -ru wizards.orig/source/euro/AutoPilotRun.xba wizards/source/euro/AutoPilotRun.xba
--- openoffice.org.orig/wizards/source/euro/AutoPilotRun.xba	2009-01-15 10:26:05.000000000 +0000
+++ openoffice.org/wizards/source/euro/AutoPilotRun.xba	2009-01-15 11:46:57.000000000 +0000
@@ -17,7 +17,6 @@
 Public Password as String
 Public DocIndex as Integer
 Public oPathSettings as Object
-Public oDocInfo as Object
 Public oUcb as Object
 Public TotDocCount as Integer
 Public sTotDocCount as String
@@ -30,7 +29,6 @@
 	BasicLibraries.LoadLibrary(&quot;Tools&quot;)
 	BasicLibraries.LoadLibrary(&quot;ImportWizard&quot;)
 	If InitResources(&quot;Euro Converter&quot;, &quot;eur&quot;) Then
-		oDocInfo = CreateUnoService(&quot;com.sun.star.document.StandaloneDocumentInfo&quot;)
 		oUcb = createUnoService(&quot;com.sun.star.ucb.SimpleFileAccess&quot;)
 		oLocale = GetStarOfficeLocale()
 		InitializeConverter(oLocale, 2)
@@ -303,7 +301,7 @@
 	If bIsValid Then
 		If DialogModel.optSingleFile.State = 1 Then
 			If bCheckFileType Then
-				sLocMimeType = GetRealFileContent(oDocInfo, sPath)
+				sLocMimeType = GetRealFileContent(sPath)
 				If DialogModel.chkTextDocuments.State = 1 Then
 					If (Instr(1, sLocMimeType, &quot;text&quot;) = 0) And (Instr(1, sLocMimeType, &quot;calc&quot;) = 0) Then
 						Msgbox(sMsgFileInvalid, 48, sMsgDLGTITLE)
@@ -408,4 +406,4 @@
 	DialogModel.cmdGoOn.Label =  sGOON
 	DialogModel.cmdCancel.Label = sCANCEL
 End Sub
-</script:module>
\ No newline at end of file
+</script:module>
diff -ru wizards.orig/source/importwizard/FilesModul.xba wizards/source/importwizard/FilesModul.xba
--- openoffice.org.orig/wizards/source/importwizard/FilesModul.xba	2009-01-15 10:26:05.000000000 +0000
+++ openoffice.org/wizards/source/importwizard/FilesModul.xba	2009-01-15 12:06:26.000000000 +0000
@@ -41,7 +41,6 @@
 Dim XMLTemplateContentString as String
 Dim ApplIndex as Integer
 Dim bAssignFileName as Boolean
-	oDocInfo = CreateUnoService(&quot;com.sun.star.document.StandaloneDocumentInfo&quot;)
 	bInterruptSearch = False
 	For i = 0 To MaxCollectIndex
 		SearchDir = PathCollection(i,0)
@@ -71,7 +70,7 @@
 						CurFileContent = &quot;&quot;
 						CurFileName = NewList(n,0)													
 						If (FieldInList(NewList(n,1), XMLTemplateList())) Then
-							CurFileContent = GetRealFileContent(oDocInfo, CurFileName)
+							CurFileContent = GetRealFileContent(CurFileName)
 							t = SearchArrayforPartString(CurFileContent, XMLTemplateContentList())
 						 	bAssignFileName = (t &gt; -1)
 						 	If bAssignFileName Then
@@ -822,4 +821,4 @@
 	End If				
 	ConcatComment = sComment
 End Function
-</script:module>
\ No newline at end of file
+</script:module>
diff -ru wizards.orig/source/tools/UCB.xba wizards/source/tools/UCB.xba
--- openoffice.org.orig/wizards/source/tools/UCB.xba	2009-01-15 10:26:05.000000000 +0000
+++ openoffice.org/wizards/source/tools/UCB.xba	2009-01-15 12:05:38.000000000 +0000
@@ -9,6 +9,7 @@
 Dim DirIndex As Integer
 Dim iDirCount as Integer
 Public bInterruptSearch as Boolean
+Public NoArgs()as New com.sun.star.beans.PropertyValue
 
 Sub Main()
 Dim LocsfileContent(0) as String
@@ -64,7 +65,7 @@
 						End If
 					Else
 						If bcheckFileType Then
-							RealFileContent  = GetRealFileContent(oDocInfo, FileName)
+							RealFileContent = GetRealFileContent(FileName)
 						Else
 							RealFileContent = GetFileNameExtension(FileName)
 						End If
@@ -146,11 +147,11 @@
 Function RetrieveDocTitle(oDocInfo as Object, sFileName as String) As String
 Dim sDocTitle as String
 	On Local Error Goto NOFILE
-	oDocInfo.Read(sFileName)
+	oDocInfo.loadFromMedium(sFileName, NoArgs())
 	sDocTitle = oDocInfo.Title
 	NOFILE:
 	If Err &lt;&gt; 0 Then
-		GetRealFileContent = &quot;&quot;
+		RetrieveDocTitle = &quot;&quot;
 		RESUME CLR_ERROR
 	End If
 	CLR_ERROR:
@@ -163,10 +164,10 @@
 
 &apos; Retrieves The Filecontent of a Document by extracting the content
 &apos; from the Header of the document
-Function GetRealFileContent(oDocInfo as Object, FileName as String) As String
+Function GetRealFileContent(FileName as String) As String
 	On Local Error Goto NOFILE
-	oDocInfo.Read(FileName)
-	GetRealFileContent = oDocInfo.MIMEType
+	oTypeDetect = createUnoService(&quot;com.sun.star.document.TypeDetection&quot;)
+	GetRealFileContent = oTypeDetect.queryTypeByURL(FileName)
 	NOFILE:
 	If Err &lt;&gt; 0 Then
 		GetRealFileContent = &quot;&quot;
@@ -290,4 +291,4 @@
 	End If
 GOON:
 End Function
-</script:module>
\ No newline at end of file
+</script:module>


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1756
retrieving revision 1.1757
diff -u -r1.1756 -r1.1757
--- openoffice.org.spec	15 Jan 2009 12:15:24 -0000	1.1756
+++ openoffice.org.spec	15 Jan 2009 23:05:18 -0000	1.1757
@@ -136,7 +136,7 @@
 Patch63: openoffice.org-3.0.1.ooo97488.sw.ww8toc.patch
 Patch64: openoffice.org-3.0.1.ooo98024.vcl.emboldenoverlap.patch
 Patch65: openoffice.org-3.0.1.oooXXXXX.fpicker.allformatsonsave.patch
-Patch66: openoffice.org-3.0.1.ooo95702.wizardsdocinfo.patch
+Patch66: workspace.fwk99.patch
 
 %define instdir %{_libdir}
 %define baseinstdir %{instdir}/openoffice.org
@@ -1420,7 +1420,7 @@
 %patch63 -p1 -b .ooo97488.sw.ww8toc.patch
 %patch64 -p1 -b .ooo98024.vcl.emboldenoverlap.patch
 %patch65 -p1 -b .oooXXXXX.fpicker.allformatsonsave.patch
-%patch66 -p1 -b .ooo95702.wizardsdocinfo.patch
+%patch66 -p1 -b .workspace.fwk99.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -3835,7 +3835,7 @@
   openoffice.org-3.0.1.ooo98024.vcl.emboldenoverlap.patch
 - add hyphen-uk, hyphen-pt dependency
 - Resolves: rhbz#479163 openoffice.org-3.0.1.oooXXXXX.fpicker.allformatsonsave.patch
-- Resolves: rhbz#480117 openoffice.org-3.0.1.ooo95702.wizardsdocinfo.patch
+- Resolves: rhbz#480117 workspace.fwk99.patch
 
 * Mon Jan 12 2009 Caol??n McNamara <caolanm at redhat.com> - 1:3.0.1-15.1
 - next milestone


--- openoffice.org-3.0.1.ooo95702.wizardsdocinfo.patch DELETED ---



From mclasen at fedoraproject.org  Thu Jan 15 23:12:46 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Thu, 15 Jan 2009 23:12:46 +0000 (UTC)
Subject: rpms/gnome-user-docs/F-10 .cvsignore, 1.24,
	1.25 gnome-user-docs.spec, 1.36, 1.37 sources, 1.24, 1.25
Message-ID: <20090115231246.6F9487012D@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-user-docs/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4958

Modified Files:
	.cvsignore gnome-user-docs.spec sources 
Log Message:
2.24.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-user-docs/F-10/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- .cvsignore	22 Sep 2008 17:14:14 -0000	1.24
+++ .cvsignore	15 Jan 2009 23:12:15 -0000	1.25
@@ -1 +1 @@
-gnome-user-docs-2.24.0.tar.bz2
+gnome-user-docs-2.24.2.tar.bz2


Index: gnome-user-docs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-user-docs/F-10/gnome-user-docs.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- gnome-user-docs.spec	22 Sep 2008 17:14:14 -0000	1.36
+++ gnome-user-docs.spec	15 Jan 2009 23:12:16 -0000	1.37
@@ -1,6 +1,6 @@
 Summary:        GNOME User Documentation
 Name:           gnome-user-docs
-Version:        2.24.0
+Version:        2.24.2
 Release:	1%{?dist}
 License:        GFDL
 Source:         http://download.gnome.org/sources/gnome-user-docs/2.24/gnome-user-docs-%{version}.tar.bz2 
@@ -53,6 +53,9 @@
 %dir %{_datadir}/omf/gnome-access-guide
 
 %changelog
+* Thu Jan 15 2009 Matthias Clasen <mclasen at redhat.com> - 2.24.2-1
+- Update to 2.24.2
+
 * Mon Sep 22 2008 Matthias Clasen <mclasen at redhat.com> - 2.24.0-1
 - Update to 2.24.0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-user-docs/F-10/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- sources	22 Sep 2008 17:14:14 -0000	1.24
+++ sources	15 Jan 2009 23:12:16 -0000	1.25
@@ -1 +1 @@
-f4a6ad3fe827f4b189b86345daf96e08  gnome-user-docs-2.24.0.tar.bz2
+c387144f39c05152bb0771ae2b07a4d8  gnome-user-docs-2.24.2.tar.bz2



From mclasen at fedoraproject.org  Thu Jan 15 23:15:59 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Thu, 15 Jan 2009 23:15:59 +0000 (UTC)
Subject: rpms/gucharmap/devel .cvsignore, 1.17, 1.18 gucharmap.spec, 1.30,
	1.31 sources, 1.17, 1.18
Message-ID: <20090115231559.8D7787012D@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gucharmap/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5293

Modified Files:
	.cvsignore gucharmap.spec sources 
Log Message:
2.24.3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gucharmap/devel/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- .cvsignore	20 Oct 2008 18:51:27 -0000	1.17
+++ .cvsignore	15 Jan 2009 23:15:28 -0000	1.18
@@ -1 +1 @@
-gucharmap-2.24.1.tar.bz2
+gucharmap-2.24.3.tar.bz2


Index: gucharmap.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gucharmap/devel/gucharmap.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- gucharmap.spec	20 Oct 2008 18:51:27 -0000	1.30
+++ gucharmap.spec	15 Jan 2009 23:15:28 -0000	1.31
@@ -3,7 +3,7 @@
 %define desktop_file_utils_version 0.9
 
 Name:           gucharmap
-Version:        2.24.1
+Version:        2.24.3
 Release:        1%{?dist}
 Summary:        Unicode character picker and font browser
 
@@ -22,7 +22,6 @@
 BuildRequires: desktop-file-utils >= %{desktop_file_utils_version} 
 BuildRequires: scrollkeeper
 BuildRequires: gettext
-BuildRequires: perl(XML::Parser)
 BuildRequires: intltool
 
 Requires(post):scrollkeeper
@@ -145,6 +144,9 @@
 
 
 %changelog
+* Thu Jan 15 2009 Matthias Clasen <mclasen at redhat.com> - 2.24.3-1
+- Update to 2.24.3
+
 * Mon Oct 20 2008 Matthias Clasen <mclasen at redhat.com> - 2.24.1-1
 - Update to 2.24.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gucharmap/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources	20 Oct 2008 18:51:27 -0000	1.17
+++ sources	15 Jan 2009 23:15:29 -0000	1.18
@@ -1 +1 @@
-3b97112ba85a212b4208ec0a29fd3080  gucharmap-2.24.1.tar.bz2
+7e02c06f3b8d375e059073af378bf093  gucharmap-2.24.3.tar.bz2



From konradm at fedoraproject.org  Thu Jan 15 23:24:21 2009
From: konradm at fedoraproject.org (Conrad Meyer)
Date: Thu, 15 Jan 2009 23:24:21 +0000 (UTC)
Subject: rpms/gfan/devel gfan-0.3-respect-destdir.diff, NONE, 1.1 gfan.spec, 
	NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1,
	1.2
Message-ID: <20090115232421.1796D7012D@cvs1.fedora.phx.redhat.com>

Author: konradm

Update of /cvs/pkgs/rpms/gfan/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6717/devel

Modified Files:
	.cvsignore sources 
Added Files:
	gfan-0.3-respect-destdir.diff gfan.spec import.log 
Log Message:
Import.


gfan-0.3-respect-destdir.diff:

--- NEW FILE gfan-0.3-respect-destdir.diff ---
--- Makefile.orig	2008-12-06 20:00:35.000000000 -0800
+++ Makefile	2008-12-06 20:02:51.000000000 -0800
@@ -166,15 +166,15 @@
 
 OBJECTS = $(CATSOBJECTS) $(APPOBJECTS)
 
 all: $(MAIN)
 
-$(BINDIR): $(PREFIX)
-	$(MKDIR) $(BINDIR)
+$(DESTDIR)$(BINDIR): $(DESTDIR)$(PREFIX)
+	$(MKDIR) $(DESTDIR)$(BINDIR)
 
-$(PREFIX):
-	$(MKDIR) $(PREFIX)
+$(DESTDIR)$(PREFIX):
+	$(MKDIR) -p $(DESTDIR)$(PREFIX)
 
 default: $(OBJECTS) $(ADDITIONALOBJECTS) $(EXECS)
 
 $(MAIN): $(OBJECTS)
 	$(CCLINKER) $(OBJECTS) $(ADDITIONALLINKOPTIONS) $(GPROFFLAG) -o $(MAIN)
@@ -262,14 +262,14 @@
 	tar -c $(RELEASEDIR) > $(RELEASEDIR).tar  
 	gzip $(RELEASEDIR).tar
 
 clean:
 	/bin/rm -f *.o $(EXECS) $(MAIN)
-install: $(BINDIR)
-	cp $(EXECS) $(BINDIR)
+install: $(DESTDIR)$(BINDIR)
+	cp $(EXECS) $(DESTDIR)$(BINDIR)
 #	cp $(EXECS) /usr/local/bin
-	./gfan installlinks --path $(BINDIR)/
+	./gfan installlinks --path $(DESTDIR)$(BINDIR)/
 .c.o:
 	$(CC) $(CFLAGS) -c $<
 .cc.o:
 	$(CCC) -c $<
 .cpp.o:


--- NEW FILE gfan.spec ---
Name:           gfan
Version:        0.3
Release:        3%{?dist}
Summary:        Software for Computing Gr??bner Fans and Tropical Varieties
Group:          Applications/Engineering
License:        GPL+
URL:            http://www.math.tu-berlin.de/%7Ejensen/software/gfan/gfan.html
Source0:        http://www.math.tu-berlin.de/%7Ejensen/software/gfan/gfan%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# Respect DESTDIR
Patch0:         gfan-0.3-respect-destdir.diff

BuildRequires:  cddlib-devel
BuildRequires:  gmp-devel
BuildRequires:  texlive-latex


%description
The software computes all marked reduced Gr??bner bases of an ideal.
Their union is a universal Gr??bner basis. Gfan contains algorithms for
computing this complex for general ideals and specialized algorithms
for tropical curves, tropical hypersurfaces and tropical varieties of
prime ideals. In addition to the above core functions the package
contains many tools which are useful in the study of Gr??bner bases,
initial ideals and tropical geometry. Among these are an interactive
traversal program for Gr??bner fans and programs for graphical renderings.



%prep
%setup -q -n %{name}%{version}
# manual is non-free
rm doc/ -rf

# Use native fedora optflags, prefix, and bindir
sed -i -e 's|^OPTFLAGS.*$||' \
  -e 's|^PREFIX.*$|PREFIX = %{_prefix}|' \
  -e 's|^BINDIR.*$|BINDIR = %{_bindir}|' Makefile

# respect DESTDIR
%patch0


%build
export OPTFLAGS="%{optflags} -DGMPRATIONAL"
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_libexecdir}/%{name}
mv $RPM_BUILD_ROOT%{_bindir}/gfan_* $RPM_BUILD_ROOT%{_libexecdir}/%{name}/
pushd $RPM_BUILD_ROOT%{_libexecdir}/%{name}/
  for symlink in gfan_*; do
    rm $symlink
#   ln -s %{_bindir}/%{name} $symlink
    ln -s ../../bin/%{name} $symlink
  done
popd


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc COPYING examples LICENSE
%{_bindir}/%{name}
%{_libexecdir}/%{name}


%changelog
* Tue Dec 30 2008 Conrad Meyer <konrad at tylerc.org> - 0.3-3
- Fix License tag.
- Fix build section.
- Remove doc/ in prep stage as it is non-free.

* Fri Dec 12 2008 Conrad Meyer <konrad at tylerc.org> - 0.3-2
- BR texlive-latex.

* Sat Dec 6 2008 Conrad Meyer <konrad at tylerc.org> - 0.3-1
- Initial package.


--- NEW FILE import.log ---
gfan-0_3-3_fc9:HEAD:gfan-0.3-3.fc9.src.rpm:1232061584


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gfan/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	15 Jan 2009 20:25:40 -0000	1.1
+++ .cvsignore	15 Jan 2009 23:23:49 -0000	1.2
@@ -0,0 +1 @@
+gfan0.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gfan/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	15 Jan 2009 20:25:40 -0000	1.1
+++ sources	15 Jan 2009 23:23:50 -0000	1.2
@@ -0,0 +1 @@
+e4b5abe3714930b1789752fe79026b9d  gfan0.3.tar.gz



From stalwart at fedoraproject.org  Thu Jan 15 23:26:07 2009
From: stalwart at fedoraproject.org (Pavel Shevchuk)
Date: Thu, 15 Jan 2009 23:26:07 +0000 (UTC)
Subject: rpms/edje/devel edje.spec,1.6,1.7
Message-ID: <20090115232607.C21D57012D@cvs1.fedora.phx.redhat.com>

Author: stalwart

Update of /cvs/pkgs/rpms/edje/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7404

Modified Files:
	edje.spec 
Log Message:
Include inkscape2edc



Index: edje.spec
===================================================================
RCS file: /cvs/pkgs/rpms/edje/devel/edje.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- edje.spec	29 Nov 2008 22:22:49 -0000	1.6
+++ edje.spec	15 Jan 2009 23:25:37 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           edje
 Version:        0.9.9.050
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A graphical layout and animation library
 
 Group:          System Environment/Libraries
@@ -73,12 +73,16 @@
 %files devel
 %defattr(-,root,root,-)
 %doc doc/html
+%{_bindir}/inkscape2edc
 %{_mandir}/man3/*
 %{_includedir}/*
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Fri Jan 16 2009 Pavel "Stalwart" Shevchuk <stlwrt at gmail.com> - 0.9.9.050-2
+- Include inkscape2edc
+
 * Sat Nov 29 2008 Pavel "Stalwart" Shevchuk <stlwrt at gmail.com> - 0.9.9.050-1
 - New upstream snapshot
 



From mclasen at fedoraproject.org  Thu Jan 15 23:33:07 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Thu, 15 Jan 2009 23:33:07 +0000 (UTC)
Subject: rpms/gucharmap/F-10 gucharmap.spec,1.31,1.32 sources,1.18,1.19
Message-ID: <20090115233307.45FBF7012D@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gucharmap/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8070

Modified Files:
	gucharmap.spec sources 
Log Message:
2.24.3



Index: gucharmap.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gucharmap/F-10/gucharmap.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- gucharmap.spec	25 Nov 2008 03:21:48 -0000	1.31
+++ gucharmap.spec	15 Jan 2009 23:32:36 -0000	1.32
@@ -3,7 +3,7 @@
 %define desktop_file_utils_version 0.9
 
 Name:           gucharmap
-Version:        2.24.2
+Version:        2.24.3
 Release:        1%{?dist}
 Summary:        Unicode character picker and font browser
 
@@ -22,7 +22,6 @@
 BuildRequires: desktop-file-utils >= %{desktop_file_utils_version} 
 BuildRequires: scrollkeeper
 BuildRequires: gettext
-BuildRequires: perl(XML::Parser)
 BuildRequires: intltool
 
 Requires(post):scrollkeeper
@@ -145,8 +144,8 @@
 
 
 %changelog
-* Mon Nov 24 2008 Matthias Clasen <mclasen at redhat.com> - 2.24.2-1
-- Update to 2.24.2
+* Thu Jan 15 2009 Matthias Clasen <mclasen at redhat.com> - 2.24.3-1
+- Update to 2.24.3
 
 * Mon Oct 20 2008 Matthias Clasen <mclasen at redhat.com> - 2.24.1-1
 - Update to 2.24.1


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gucharmap/F-10/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources	25 Nov 2008 03:21:48 -0000	1.18
+++ sources	15 Jan 2009 23:32:36 -0000	1.19
@@ -1 +1 @@
-8e1c82736e122fe509e98a9b3059e2d6  gucharmap-2.24.2.tar.bz2
+7e02c06f3b8d375e059073af378bf093  gucharmap-2.24.3.tar.bz2



From nim at fedoraproject.org  Thu Jan 15 23:44:02 2009
From: nim at fedoraproject.org (Nicolas Mailhot)
Date: Thu, 15 Jan 2009 23:44:02 +0000 (UTC)
Subject: rpms/bitstream-vera-fonts/devel bitstream-vera-fonts.spec, 1.11,
	1.12 import.log, 1.2, 1.3
Message-ID: <20090115234402.A32447012D@cvs1.fedora.phx.redhat.com>

Author: nim

Update of /cvs/extras/rpms/bitstream-vera-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9217/devel

Modified Files:
	bitstream-vera-fonts.spec import.log 
Log Message:
build with fontpackages 1.15


Index: bitstream-vera-fonts.spec
===================================================================
RCS file: /cvs/extras/rpms/bitstream-vera-fonts/devel/bitstream-vera-fonts.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- bitstream-vera-fonts.spec	15 Jan 2009 00:28:12 -0000	1.11
+++ bitstream-vera-fonts.spec	15 Jan 2009 23:43:32 -0000	1.12
@@ -9,7 +9,7 @@
 
 Name:    %{fontname}-fonts
 Version: 1.10
-Release: 13%{?dist}
+Release: 14%{?dist}
 Summary: Bitstream Vera fonts
 
 Group:     User Interface/X
@@ -122,6 +122,11 @@
 
 
 %changelog
+* Thu Jan 15 2009 Nicolas Mailhot <nim at fedoraproject dot org>
+- 1.10-14
+??? update for new naming guidelines
+??? build with new fontpackages (1.15)
+
 * Sun Nov 23 2008 <nicolas.mailhot at laposte.net>
 - 1.10-12
 ??? ???rpm-fonts??? renamed to ???fontpackages???


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/bitstream-vera-fonts/devel/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	15 Jan 2009 00:28:12 -0000	1.2
+++ import.log	15 Jan 2009 23:43:32 -0000	1.3
@@ -1,2 +1,3 @@
 bitstream-vera-fonts-1_10-12_fc11:HEAD:bitstream-vera-fonts-1.10-12.fc11.src.rpm:1229541266
 bitstream-vera-fonts-1_10-13_fc11:HEAD:bitstream-vera-fonts-1.10-13.fc11.src.rpm:1231979242
+bitstream-vera-fonts-1_10-14_fc11:HEAD:bitstream-vera-fonts-1.10-14.fc11.src.rpm:1232062969



From stalwart at fedoraproject.org  Thu Jan 15 23:46:50 2009
From: stalwart at fedoraproject.org (Pavel Shevchuk)
Date: Thu, 15 Jan 2009 23:46:50 +0000 (UTC)
Subject: rpms/edje/devel edje.spec,1.7,1.8
Message-ID: <20090115234651.069987012D@cvs1.fedora.phx.redhat.com>

Author: stalwart

Update of /cvs/pkgs/rpms/edje/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9543

Modified Files:
	edje.spec 
Log Message:
Include inkscape in deps



Index: edje.spec
===================================================================
RCS file: /cvs/pkgs/rpms/edje/devel/edje.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- edje.spec	15 Jan 2009 23:25:37 -0000	1.7
+++ edje.spec	15 Jan 2009 23:46:20 -0000	1.8
@@ -10,7 +10,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  evas-devel eet-devel embryo-devel ecore-devel 
-BuildRequires:  chrpath pkgconfig doxygen
+BuildRequires:  chrpath pkgconfig doxygen inkscape
 
 %description
 A graphical layout and animation library for animated resizable, compressed and
@@ -22,7 +22,7 @@
 Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
 Requires:       evas-devel ecore-devel embryo-devel eet-devel 
-Requires:       zlib-devel pth-devel pkgconfig
+Requires:       zlib-devel pth-devel pkgconfig inkscape
 
 %description    devel
 The %{name}-devel package contains libraries and header files for



From mclasen at fedoraproject.org  Thu Jan 15 23:51:33 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Thu, 15 Jan 2009 23:51:33 +0000 (UTC)
Subject: rpms/gcalctool/F-10 .cvsignore, 1.51, 1.52 gcalctool.spec, 1.77,
	1.78 sources, 1.52, 1.53
Message-ID: <20090115235133.65F877012D@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gcalctool/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10638

Modified Files:
	.cvsignore gcalctool.spec sources 
Log Message:
5.24.3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gcalctool/F-10/.cvsignore,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- .cvsignore	25 Nov 2008 00:29:15 -0000	1.51
+++ .cvsignore	15 Jan 2009 23:51:03 -0000	1.52
@@ -1 +1 @@
-gcalctool-5.24.2.tar.bz2
+gcalctool-5.24.3.tar.bz2


Index: gcalctool.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gcalctool/F-10/gcalctool.spec,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- gcalctool.spec	25 Nov 2008 00:29:15 -0000	1.77
+++ gcalctool.spec	15 Jan 2009 23:51:03 -0000	1.78
@@ -1,5 +1,5 @@
 Name:           gcalctool
-Version:        5.24.2
+Version:        5.24.3
 Release:        1%{?dist}
 Summary:        A desktop calculator
 
@@ -100,6 +100,9 @@
 
 
 %changelog
+* Thu Jan 15 2009 Matthias Clasen <mclasen at redhat.com> - 5.24.3-1
+- Update to 5.24.3
+
 * Mon Nov 24 2008 Matthias Clasen <mclasen at redhat.com> - 5.24.2-1
 - Update to 5.24.2
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gcalctool/F-10/sources,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- sources	25 Nov 2008 00:29:15 -0000	1.52
+++ sources	15 Jan 2009 23:51:03 -0000	1.53
@@ -1 +1 @@
-a784f13120115cf94cf88f87d32baf9c  gcalctool-5.24.2.tar.bz2
+39c3ff95960fc7588cfc0d0ab5bc1f9f  gcalctool-5.24.3.tar.bz2



From konradm at fedoraproject.org  Thu Jan 15 23:51:36 2009
From: konradm at fedoraproject.org (Conrad Meyer)
Date: Thu, 15 Jan 2009 23:51:36 +0000 (UTC)
Subject: rpms/gfan/F-10 gfan-0.3-respect-destdir.diff, NONE, 1.1 gfan.spec, 
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090115235136.CE22D7012D@cvs1.fedora.phx.redhat.com>

Author: konradm

Update of /cvs/pkgs/rpms/gfan/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10693

Modified Files:
	.cvsignore sources 
Added Files:
	gfan-0.3-respect-destdir.diff gfan.spec 
Log Message:
Import.

gfan-0.3-respect-destdir.diff:

--- NEW FILE gfan-0.3-respect-destdir.diff ---
--- Makefile.orig	2008-12-06 20:00:35.000000000 -0800
+++ Makefile	2008-12-06 20:02:51.000000000 -0800
@@ -166,15 +166,15 @@
 
 OBJECTS = $(CATSOBJECTS) $(APPOBJECTS)
 
 all: $(MAIN)
 
-$(BINDIR): $(PREFIX)
-	$(MKDIR) $(BINDIR)
+$(DESTDIR)$(BINDIR): $(DESTDIR)$(PREFIX)
+	$(MKDIR) $(DESTDIR)$(BINDIR)
 
-$(PREFIX):
-	$(MKDIR) $(PREFIX)
+$(DESTDIR)$(PREFIX):
+	$(MKDIR) -p $(DESTDIR)$(PREFIX)
 
 default: $(OBJECTS) $(ADDITIONALOBJECTS) $(EXECS)
 
 $(MAIN): $(OBJECTS)
 	$(CCLINKER) $(OBJECTS) $(ADDITIONALLINKOPTIONS) $(GPROFFLAG) -o $(MAIN)
@@ -262,14 +262,14 @@
 	tar -c $(RELEASEDIR) > $(RELEASEDIR).tar  
 	gzip $(RELEASEDIR).tar
 
 clean:
 	/bin/rm -f *.o $(EXECS) $(MAIN)
-install: $(BINDIR)
-	cp $(EXECS) $(BINDIR)
+install: $(DESTDIR)$(BINDIR)
+	cp $(EXECS) $(DESTDIR)$(BINDIR)
 #	cp $(EXECS) /usr/local/bin
-	./gfan installlinks --path $(BINDIR)/
+	./gfan installlinks --path $(DESTDIR)$(BINDIR)/
 .c.o:
 	$(CC) $(CFLAGS) -c $<
 .cc.o:
 	$(CCC) -c $<
 .cpp.o:


--- NEW FILE gfan.spec ---
Name:           gfan
Version:        0.3
Release:        3%{?dist}
Summary:        Software for Computing Gr??bner Fans and Tropical Varieties
Group:          Applications/Engineering
License:        GPL+
URL:            http://www.math.tu-berlin.de/%7Ejensen/software/gfan/gfan.html
Source0:        http://www.math.tu-berlin.de/%7Ejensen/software/gfan/gfan%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# Respect DESTDIR
Patch0:         gfan-0.3-respect-destdir.diff

BuildRequires:  cddlib-devel
BuildRequires:  gmp-devel
BuildRequires:  texlive-latex


%description
The software computes all marked reduced Gr??bner bases of an ideal.
Their union is a universal Gr??bner basis. Gfan contains algorithms for
computing this complex for general ideals and specialized algorithms
for tropical curves, tropical hypersurfaces and tropical varieties of
prime ideals. In addition to the above core functions the package
contains many tools which are useful in the study of Gr??bner bases,
initial ideals and tropical geometry. Among these are an interactive
traversal program for Gr??bner fans and programs for graphical renderings.



%prep
%setup -q -n %{name}%{version}
# manual is non-free
rm doc/ -rf

# Use native fedora optflags, prefix, and bindir
sed -i -e 's|^OPTFLAGS.*$||' \
  -e 's|^PREFIX.*$|PREFIX = %{_prefix}|' \
  -e 's|^BINDIR.*$|BINDIR = %{_bindir}|' Makefile

# respect DESTDIR
%patch0


%build
export OPTFLAGS="%{optflags} -DGMPRATIONAL"
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_libexecdir}/%{name}
mv $RPM_BUILD_ROOT%{_bindir}/gfan_* $RPM_BUILD_ROOT%{_libexecdir}/%{name}/
pushd $RPM_BUILD_ROOT%{_libexecdir}/%{name}/
  for symlink in gfan_*; do
    rm $symlink
#   ln -s %{_bindir}/%{name} $symlink
    ln -s ../../bin/%{name} $symlink
  done
popd


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc COPYING examples LICENSE
%{_bindir}/%{name}
%{_libexecdir}/%{name}


%changelog
* Tue Dec 30 2008 Conrad Meyer <konrad at tylerc.org> - 0.3-3
- Fix License tag.
- Fix build section.
- Remove doc/ in prep stage as it is non-free.

* Fri Dec 12 2008 Conrad Meyer <konrad at tylerc.org> - 0.3-2
- BR texlive-latex.

* Sat Dec 6 2008 Conrad Meyer <konrad at tylerc.org> - 0.3-1
- Initial package.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gfan/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	15 Jan 2009 20:25:40 -0000	1.1
+++ .cvsignore	15 Jan 2009 23:51:06 -0000	1.2
@@ -0,0 +1 @@
+gfan0.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gfan/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	15 Jan 2009 20:25:40 -0000	1.1
+++ sources	15 Jan 2009 23:51:06 -0000	1.2
@@ -0,0 +1 @@
+e4b5abe3714930b1789752fe79026b9d  gfan0.3.tar.gz



From konradm at fedoraproject.org  Thu Jan 15 23:59:30 2009
From: konradm at fedoraproject.org (Conrad Meyer)
Date: Thu, 15 Jan 2009 23:59:30 +0000 (UTC)
Subject: rpms/gfan/F-9 gfan-0.3-respect-destdir.diff, NONE, 1.1 gfan.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090115235930.85278700B2@cvs1.fedora.phx.redhat.com>

Author: konradm

Update of /cvs/pkgs/rpms/gfan/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11567

Modified Files:
	.cvsignore sources 
Added Files:
	gfan-0.3-respect-destdir.diff gfan.spec 
Log Message:
Import.

gfan-0.3-respect-destdir.diff:

--- NEW FILE gfan-0.3-respect-destdir.diff ---
--- Makefile.orig	2008-12-06 20:00:35.000000000 -0800
+++ Makefile	2008-12-06 20:02:51.000000000 -0800
@@ -166,15 +166,15 @@
 
 OBJECTS = $(CATSOBJECTS) $(APPOBJECTS)
 
 all: $(MAIN)
 
-$(BINDIR): $(PREFIX)
-	$(MKDIR) $(BINDIR)
+$(DESTDIR)$(BINDIR): $(DESTDIR)$(PREFIX)
+	$(MKDIR) $(DESTDIR)$(BINDIR)
 
-$(PREFIX):
-	$(MKDIR) $(PREFIX)
+$(DESTDIR)$(PREFIX):
+	$(MKDIR) -p $(DESTDIR)$(PREFIX)
 
 default: $(OBJECTS) $(ADDITIONALOBJECTS) $(EXECS)
 
 $(MAIN): $(OBJECTS)
 	$(CCLINKER) $(OBJECTS) $(ADDITIONALLINKOPTIONS) $(GPROFFLAG) -o $(MAIN)
@@ -262,14 +262,14 @@
 	tar -c $(RELEASEDIR) > $(RELEASEDIR).tar  
 	gzip $(RELEASEDIR).tar
 
 clean:
 	/bin/rm -f *.o $(EXECS) $(MAIN)
-install: $(BINDIR)
-	cp $(EXECS) $(BINDIR)
+install: $(DESTDIR)$(BINDIR)
+	cp $(EXECS) $(DESTDIR)$(BINDIR)
 #	cp $(EXECS) /usr/local/bin
-	./gfan installlinks --path $(BINDIR)/
+	./gfan installlinks --path $(DESTDIR)$(BINDIR)/
 .c.o:
 	$(CC) $(CFLAGS) -c $<
 .cc.o:
 	$(CCC) -c $<
 .cpp.o:


--- NEW FILE gfan.spec ---
Name:           gfan
Version:        0.3
Release:        3%{?dist}
Summary:        Software for Computing Gr??bner Fans and Tropical Varieties
Group:          Applications/Engineering
License:        GPL+
URL:            http://www.math.tu-berlin.de/%7Ejensen/software/gfan/gfan.html
Source0:        http://www.math.tu-berlin.de/%7Ejensen/software/gfan/gfan%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# Respect DESTDIR
Patch0:         gfan-0.3-respect-destdir.diff

BuildRequires:  cddlib-devel
BuildRequires:  gmp-devel
BuildRequires:  texlive-latex


%description
The software computes all marked reduced Gr??bner bases of an ideal.
Their union is a universal Gr??bner basis. Gfan contains algorithms for
computing this complex for general ideals and specialized algorithms
for tropical curves, tropical hypersurfaces and tropical varieties of
prime ideals. In addition to the above core functions the package
contains many tools which are useful in the study of Gr??bner bases,
initial ideals and tropical geometry. Among these are an interactive
traversal program for Gr??bner fans and programs for graphical renderings.



%prep
%setup -q -n %{name}%{version}
# manual is non-free
rm doc/ -rf

# Use native fedora optflags, prefix, and bindir
sed -i -e 's|^OPTFLAGS.*$||' \
  -e 's|^PREFIX.*$|PREFIX = %{_prefix}|' \
  -e 's|^BINDIR.*$|BINDIR = %{_bindir}|' Makefile

# respect DESTDIR
%patch0


%build
export OPTFLAGS="%{optflags} -DGMPRATIONAL"
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_libexecdir}/%{name}
mv $RPM_BUILD_ROOT%{_bindir}/gfan_* $RPM_BUILD_ROOT%{_libexecdir}/%{name}/
pushd $RPM_BUILD_ROOT%{_libexecdir}/%{name}/
  for symlink in gfan_*; do
    rm $symlink
#   ln -s %{_bindir}/%{name} $symlink
    ln -s ../../bin/%{name} $symlink
  done
popd


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc COPYING examples LICENSE
%{_bindir}/%{name}
%{_libexecdir}/%{name}


%changelog
* Tue Dec 30 2008 Conrad Meyer <konrad at tylerc.org> - 0.3-3
- Fix License tag.
- Fix build section.
- Remove doc/ in prep stage as it is non-free.

* Fri Dec 12 2008 Conrad Meyer <konrad at tylerc.org> - 0.3-2
- BR texlive-latex.

* Sat Dec 6 2008 Conrad Meyer <konrad at tylerc.org> - 0.3-1
- Initial package.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gfan/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	15 Jan 2009 20:25:40 -0000	1.1
+++ .cvsignore	15 Jan 2009 23:59:00 -0000	1.2
@@ -0,0 +1 @@
+gfan0.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gfan/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	15 Jan 2009 20:25:40 -0000	1.1
+++ sources	15 Jan 2009 23:59:00 -0000	1.2
@@ -0,0 +1 @@
+e4b5abe3714930b1789752fe79026b9d  gfan0.3.tar.gz



From stalwart at fedoraproject.org  Fri Jan 16 00:12:19 2009
From: stalwart at fedoraproject.org (Pavel Shevchuk)
Date: Fri, 16 Jan 2009 00:12:19 +0000 (UTC)
Subject: rpms/edje/devel edje.spec,1.8,1.9
Message-ID: <20090116001219.2519B70127@cvs1.fedora.phx.redhat.com>

Author: stalwart

Update of /cvs/pkgs/rpms/edje/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12750

Modified Files:
	edje.spec 
Log Message:
require inkscape



Index: edje.spec
===================================================================
RCS file: /cvs/pkgs/rpms/edje/devel/edje.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- edje.spec	15 Jan 2009 23:46:20 -0000	1.8
+++ edje.spec	16 Jan 2009 00:11:48 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           edje
 Version:        0.9.9.050
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A graphical layout and animation library
 
 Group:          System Environment/Libraries
@@ -80,6 +80,9 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Fri Jan 16 2009 Pavel "Stalwart" Shevchuk <stlwrt at gmail.com> - 0.9.9.050-3
+- edje-devel now depends on inkscape
+
 * Fri Jan 16 2009 Pavel "Stalwart" Shevchuk <stlwrt at gmail.com> - 0.9.9.050-2
 - Include inkscape2edc
 



From lmacken at fedoraproject.org  Fri Jan 16 00:27:06 2009
From: lmacken at fedoraproject.org (Luke Macken)
Date: Fri, 16 Jan 2009 00:27:06 +0000 (UTC)
Subject: rpms/liveusb-creator/devel .cvsignore, 1.5, 1.6 liveusb-creator.spec,
	1.9, 1.10 sources, 1.8, 1.9
Message-ID: <20090116002706.13CB070127@cvs1.fedora.phx.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/liveusb-creator/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16055

Modified Files:
	.cvsignore liveusb-creator.spec sources 
Log Message:
Update to 3.3


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/liveusb-creator/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	3 Jan 2009 00:04:42 -0000	1.5
+++ .cvsignore	16 Jan 2009 00:26:35 -0000	1.6
@@ -1 +1 @@
-liveusb-creator-3.2.tar.bz2
+liveusb-creator-3.3.tar.bz2


Index: liveusb-creator.spec
===================================================================
RCS file: /cvs/pkgs/rpms/liveusb-creator/devel/liveusb-creator.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- liveusb-creator.spec	3 Jan 2009 00:04:42 -0000	1.9
+++ liveusb-creator.spec	16 Jan 2009 00:26:35 -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:           liveusb-creator
-Version:        3.2
+Version:        3.3
 Release:        1%{?dist}
 Summary:        A liveusb creator
 
@@ -64,6 +64,9 @@
 %config(noreplace) %{_sysconfdir}/security/console.apps/%{name}
 
 %changelog
+* Fri Jan 15 2009 Luke Macken <lmacken at redhat.com> 3.3-1
+- Update to 3.3
+
 * Fri Jan 02 2009 Luke Macken <lmacken at redhat.com> 3.2-1
 - Fixed some syslinux-related issues (#167)
 - Fixed some windows-related logging problems (#337)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/liveusb-creator/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	3 Jan 2009 00:04:42 -0000	1.8
+++ sources	16 Jan 2009 00:26:35 -0000	1.9
@@ -1 +1 @@
-cc1d39369c769dff0167a148d1a7d11c  liveusb-creator-3.2.tar.bz2
+59d7dea71ab528f9301978c75e839b7f  liveusb-creator-3.3.tar.bz2



From lmacken at fedoraproject.org  Fri Jan 16 00:33:01 2009
From: lmacken at fedoraproject.org (Luke Macken)
Date: Fri, 16 Jan 2009 00:33:01 +0000 (UTC)
Subject: rpms/liveusb-creator/F-10 .cvsignore, 1.5, 1.6 liveusb-creator.spec,
	1.8, 1.9 sources, 1.7, 1.8
Message-ID: <20090116003301.598B570127@cvs1.fedora.phx.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/liveusb-creator/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17221

Modified Files:
	.cvsignore liveusb-creator.spec sources 
Log Message:
Update to 3.3


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/liveusb-creator/F-10/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	3 Jan 2009 00:05:52 -0000	1.5
+++ .cvsignore	16 Jan 2009 00:32:30 -0000	1.6
@@ -1 +1 @@
-liveusb-creator-3.2.tar.bz2
+liveusb-creator-3.3.tar.bz2


Index: liveusb-creator.spec
===================================================================
RCS file: /cvs/pkgs/rpms/liveusb-creator/F-10/liveusb-creator.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- liveusb-creator.spec	3 Jan 2009 00:05:52 -0000	1.8
+++ liveusb-creator.spec	16 Jan 2009 00:32:30 -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:           liveusb-creator
-Version:        3.2
+Version:        3.3
 Release:        1%{?dist}
 Summary:        A liveusb creator
 
@@ -64,6 +64,9 @@
 %config(noreplace) %{_sysconfdir}/security/console.apps/%{name}
 
 %changelog
+* Fri Jan 15 2009 Luke Macken <lmacken at redhat.com> 3.3-1
+- Update to 3.3
+
 * Fri Jan 02 2009 Luke Macken <lmacken at redhat.com> 3.2-1
 - Fixed some syslinux-related issues (#167)
 - Fixed some windows-related logging problems (#337)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/liveusb-creator/F-10/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	3 Jan 2009 00:05:52 -0000	1.7
+++ sources	16 Jan 2009 00:32:30 -0000	1.8
@@ -1 +1 @@
-cc1d39369c769dff0167a148d1a7d11c  liveusb-creator-3.2.tar.bz2
+59d7dea71ab528f9301978c75e839b7f  liveusb-creator-3.3.tar.bz2



From lmacken at fedoraproject.org  Fri Jan 16 00:34:07 2009
From: lmacken at fedoraproject.org (Luke Macken)
Date: Fri, 16 Jan 2009 00:34:07 +0000 (UTC)
Subject: rpms/liveusb-creator/F-9 .cvsignore, 1.4, 1.5 liveusb-creator.spec, 
	1.5, 1.6 sources, 1.5, 1.6
Message-ID: <20090116003407.8F62370127@cvs1.fedora.phx.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/liveusb-creator/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17405

Modified Files:
	.cvsignore liveusb-creator.spec sources 
Log Message:
Update to 3.3


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/liveusb-creator/F-9/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	3 Jan 2009 00:06:57 -0000	1.4
+++ .cvsignore	16 Jan 2009 00:33:37 -0000	1.5
@@ -1 +1 @@
-liveusb-creator-3.2.tar.bz2
+liveusb-creator-3.3.tar.bz2


Index: liveusb-creator.spec
===================================================================
RCS file: /cvs/pkgs/rpms/liveusb-creator/F-9/liveusb-creator.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- liveusb-creator.spec	3 Jan 2009 00:06:57 -0000	1.5
+++ liveusb-creator.spec	16 Jan 2009 00:33:37 -0000	1.6
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           liveusb-creator
-Version:        3.2
+Version:        3.3
 Release:        1%{?dist}
 Summary:        A liveusb creator
 
@@ -64,6 +64,9 @@
 %config(noreplace) %{_sysconfdir}/security/console.apps/%{name}
 
 %changelog
+* Fri Jan 15 2009 Luke Macken <lmacken at redhat.com> 3.3-1
+- Update to 3.3
+
 * Fri Jan 02 2009 Luke Macken <lmacken at redhat.com> 3.2-1
 - Fixed some syslinux-related issues (#167)
 - Fixed some windows-related logging problems (#337)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/liveusb-creator/F-9/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	3 Jan 2009 00:06:57 -0000	1.5
+++ sources	16 Jan 2009 00:33:37 -0000	1.6
@@ -1 +1 @@
-cc1d39369c769dff0167a148d1a7d11c  liveusb-creator-3.2.tar.bz2
+59d7dea71ab528f9301978c75e839b7f  liveusb-creator-3.3.tar.bz2



From stalwart at fedoraproject.org  Fri Jan 16 00:46:32 2009
From: stalwart at fedoraproject.org (Pavel Shevchuk)
Date: Fri, 16 Jan 2009 00:46:32 +0000 (UTC)
Subject: rpms/edje/F-10 edje.spec,1.6,1.7
Message-ID: <20090116004632.9133770127@cvs1.fedora.phx.redhat.com>

Author: stalwart

Update of /cvs/pkgs/rpms/edje/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18276/F-10

Modified Files:
	edje.spec 
Log Message:
Fix inkscape thingie on F-10 and F-9



Index: edje.spec
===================================================================
RCS file: /cvs/pkgs/rpms/edje/F-10/edje.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- edje.spec	29 Nov 2008 22:22:48 -0000	1.6
+++ edje.spec	16 Jan 2009 00:46:02 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           edje
 Version:        0.9.9.050
-Release:        1%{?dist}
+Release:        3%{?dist}
 Summary:        A graphical layout and animation library
 
 Group:          System Environment/Libraries
@@ -10,7 +10,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  evas-devel eet-devel embryo-devel ecore-devel 
-BuildRequires:  chrpath pkgconfig doxygen
+BuildRequires:  chrpath pkgconfig doxygen inkscape
 
 %description
 A graphical layout and animation library for animated resizable, compressed and
@@ -22,7 +22,7 @@
 Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
 Requires:       evas-devel ecore-devel embryo-devel eet-devel 
-Requires:       zlib-devel pth-devel pkgconfig
+Requires:       zlib-devel pth-devel pkgconfig inkscape
 
 %description    devel
 The %{name}-devel package contains libraries and header files for
@@ -73,12 +73,19 @@
 %files devel
 %defattr(-,root,root,-)
 %doc doc/html
+%{_bindir}/inkscape2edc
 %{_mandir}/man3/*
 %{_includedir}/*
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Fri Jan 16 2009 Pavel "Stalwart" Shevchuk <stlwrt at gmail.com> - 0.9.9.050-3
+- edje-devel now depends on inkscape
+
+* Fri Jan 16 2009 Pavel "Stalwart" Shevchuk <stlwrt at gmail.com> - 0.9.9.050-2
+- Include inkscape2edc
+
 * Sat Nov 29 2008 Pavel "Stalwart" Shevchuk <stlwrt at gmail.com> - 0.9.9.050-1
 - New upstream snapshot
 



From stalwart at fedoraproject.org  Fri Jan 16 00:46:32 2009
From: stalwart at fedoraproject.org (Pavel Shevchuk)
Date: Fri, 16 Jan 2009 00:46:32 +0000 (UTC)
Subject: rpms/edje/F-9 edje.spec,1.6,1.7
Message-ID: <20090116004632.AB64370127@cvs1.fedora.phx.redhat.com>

Author: stalwart

Update of /cvs/pkgs/rpms/edje/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18276/F-9

Modified Files:
	edje.spec 
Log Message:
Fix inkscape thingie on F-10 and F-9



Index: edje.spec
===================================================================
RCS file: /cvs/pkgs/rpms/edje/F-9/edje.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- edje.spec	29 Nov 2008 22:22:49 -0000	1.6
+++ edje.spec	16 Jan 2009 00:46:02 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           edje
 Version:        0.9.9.050
-Release:        1%{?dist}
+Release:        3%{?dist}
 Summary:        A graphical layout and animation library
 
 Group:          System Environment/Libraries
@@ -10,7 +10,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  evas-devel eet-devel embryo-devel ecore-devel 
-BuildRequires:  chrpath pkgconfig doxygen
+BuildRequires:  chrpath pkgconfig doxygen inkscape
 
 %description
 A graphical layout and animation library for animated resizable, compressed and
@@ -22,7 +22,7 @@
 Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
 Requires:       evas-devel ecore-devel embryo-devel eet-devel 
-Requires:       zlib-devel pth-devel pkgconfig
+Requires:       zlib-devel pth-devel pkgconfig inkscape
 
 %description    devel
 The %{name}-devel package contains libraries and header files for
@@ -73,12 +73,19 @@
 %files devel
 %defattr(-,root,root,-)
 %doc doc/html
+%{_bindir}/inkscape2edc
 %{_mandir}/man3/*
 %{_includedir}/*
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Fri Jan 16 2009 Pavel "Stalwart" Shevchuk <stlwrt at gmail.com> - 0.9.9.050-3
+- edje-devel now depends on inkscape
+
+* Fri Jan 16 2009 Pavel "Stalwart" Shevchuk <stlwrt at gmail.com> - 0.9.9.050-2
+- Include inkscape2edc
+
 * Sat Nov 29 2008 Pavel "Stalwart" Shevchuk <stlwrt at gmail.com> - 0.9.9.050-1
 - New upstream snapshot
 



From tgl at fedoraproject.org  Fri Jan 16 00:53:23 2009
From: tgl at fedoraproject.org (Tom Lane)
Date: Fri, 16 Jan 2009 00:53:23 +0000 (UTC)
Subject: rpms/mysql/devel mysql-plugin-bug.patch,1.1,1.2
Message-ID: <20090116005323.AB9A570127@cvs1.fedora.phx.redhat.com>

Author: tgl

Update of /cvs/pkgs/rpms/mysql/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19729

Modified Files:
	mysql-plugin-bug.patch 
Log Message:
Update status of patched-around problem, add link to upstream bug report.

mysql-plugin-bug.patch:

Index: mysql-plugin-bug.patch
===================================================================
RCS file: /cvs/pkgs/rpms/mysql/devel/mysql-plugin-bug.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mysql-plugin-bug.patch	14 Jan 2009 17:10:05 -0000	1.1
+++ mysql-plugin-bug.patch	16 Jan 2009 00:52:53 -0000	1.2
@@ -1,5 +1,10 @@
-The plugins stuff has got obscure problems on PPC64 ... figure it out
-another day ...
+The plugin_load test fails on PPC64 (maybe not always, but at least in the
+several tries I've made so far).  It doesn't fail on x86, x86_64, or ppc,
+at least not in a similarly small number of tries.  My best theory at the
+moment is that the test itself is wrong.  Reported upstream at
+http://bugs.mysql.com/bug.php?id=42144
+
+For the moment, just disable this test.
 
 
 diff -Naur mysql-5.1.30.orig/mysql-test/t/disabled.def mysql-5.1.30/mysql-test/t/disabled.def



From tgl at fedoraproject.org  Fri Jan 16 00:56:41 2009
From: tgl at fedoraproject.org (Tom Lane)
Date: Fri, 16 Jan 2009 00:56:41 +0000 (UTC)
Subject: rpms/mysql/devel mysql.spec,1.110,1.111
Message-ID: <20090116005641.C9DB070127@cvs1.fedora.phx.redhat.com>

Author: tgl

Update of /cvs/pkgs/rpms/mysql/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20046

Modified Files:
	mysql.spec 
Log Message:
Remove no-longer-accepted configure arguments; add CFLAGS/LDFLAGS to
link test so that it works when CFLAGS is different from platform
default (eg ppc64 vs ppc)


Index: mysql.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mysql/devel/mysql.spec,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -r1.110 -r1.111
--- mysql.spec	14 Jan 2009 17:10:05 -0000	1.110
+++ mysql.spec	16 Jan 2009 00:56:11 -0000	1.111
@@ -197,15 +197,12 @@
 	--with-ssl=/usr \
 	--without-debug \
 	--enable-shared \
-	--with-bench \
 	--with-embedded-server \
 	--localstatedir=/var/lib/mysql \
 	--with-unix-socket-path=/var/lib/mysql/mysql.sock \
 	--with-mysqld-user="mysql" \
 	--with-extra-charsets=all \
 	--with-big-tables \
-	--with-innodb \
-	--with-ndbcluster \
 	--enable-local-infile \
 	--enable-largefile \
 	--enable-thread-safe-client \
@@ -222,12 +219,13 @@
 mkdir libmysqld/work
 cd libmysqld/work
 ar -x ../libmysqld.a
-gcc -shared -Wl,-soname,libmysqld.so.0 -o libmysqld.so.0.0.1 *.o \
+gcc $CFLAGS $LDFLAGS -shared -Wl,-soname,libmysqld.so.0 -o libmysqld.so.0.0.1 \
+	*.o \
 	-lpthread -lcrypt -lnsl -lssl -lcrypto -lz -lrt -lstdc++ -lm -lc
 # this is to check that we built a complete library
 cp %{SOURCE9} .
 ln -s libmysqld.so.0.0.1 libmysqld.so.0
-gcc -I../../include mysql-embedded-check.c libmysqld.so.0
+gcc -I../../include $CFLAGS mysql-embedded-check.c libmysqld.so.0
 LD_LIBRARY_PATH=. ldd ./a.out
 cd ../..
 



From mclasen at fedoraproject.org  Fri Jan 16 01:03:16 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Fri, 16 Jan 2009 01:03:16 +0000 (UTC)
Subject: rpms/gnome-session/F-10 .cvsignore, 1.67, 1.68 gnome-session.spec, 
	1.214, 1.215 sources, 1.71, 1.72
Message-ID: <20090116010316.2386570127@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-session/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20436

Modified Files:
	.cvsignore gnome-session.spec sources 
Log Message:
2.24.3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-session/F-10/.cvsignore,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- .cvsignore	25 Nov 2008 19:51:53 -0000	1.67
+++ .cvsignore	16 Jan 2009 01:02:45 -0000	1.68
@@ -1 +1 @@
-gnome-session-2.24.2.tar.bz2
+gnome-session-2.24.3.tar.bz2


Index: gnome-session.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-session/F-10/gnome-session.spec,v
retrieving revision 1.214
retrieving revision 1.215
diff -u -r1.214 -r1.215
--- gnome-session.spec	25 Nov 2008 19:51:53 -0000	1.214
+++ gnome-session.spec	16 Jan 2009 01:02:45 -0000	1.215
@@ -11,7 +11,7 @@
 
 Summary: GNOME session manager
 Name: gnome-session
-Version: 2.24.2
+Version: 2.24.3
 Release: 1%{?dist}
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/gnome-session/2.24/%{name}-%{version}.tar.bz2
@@ -180,6 +180,9 @@
 
 
 %changelog
+* Thu Jan 15 2009 Matthias Clasen  <mclasen at redhat.com> - 2.24.3-1
+- Update to 2.24.3
+
 * Tue Nov 25 2008 Matthias Clasen  <mclasen at redhat.com> - 2.24.2-1
 - Update to 2.24.2
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-session/F-10/sources,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- sources	25 Nov 2008 19:51:53 -0000	1.71
+++ sources	16 Jan 2009 01:02:45 -0000	1.72
@@ -1 +1 @@
-13e882a8c73bebb5403c207da0455156  gnome-session-2.24.2.tar.bz2
+5daf3307ec791953436484696b263093  gnome-session-2.24.3.tar.bz2



From mclasen at fedoraproject.org  Fri Jan 16 01:06:51 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Fri, 16 Jan 2009 01:06:51 +0000 (UTC)
Subject: rpms/gnome-themes/F-10 .cvsignore, 1.67, 1.68 gnome-themes.spec,
	1.119, 1.120 sources, 1.72, 1.73
Message-ID: <20090116010651.0E03D70127@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-themes/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20883

Modified Files:
	.cvsignore gnome-themes.spec sources 
Log Message:
2.24.3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-themes/F-10/.cvsignore,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- .cvsignore	20 Oct 2008 16:31:26 -0000	1.67
+++ .cvsignore	16 Jan 2009 01:06:20 -0000	1.68
@@ -1 +1 @@
-gnome-themes-2.24.1.tar.bz2
+gnome-themes-2.24.3.tar.bz2


Index: gnome-themes.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-themes/F-10/gnome-themes.spec,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -r1.119 -r1.120
--- gnome-themes.spec	20 Oct 2008 16:31:26 -0000	1.119
+++ gnome-themes.spec	16 Jan 2009 01:06:20 -0000	1.120
@@ -1,6 +1,6 @@
 Summary: Themes collection for GNOME
 Name: gnome-themes
-Version: 2.24.1
+Version: 2.24.3
 Release: 1%{?dist}
 URL: http://download.gnome.org/sources/gnome-themes/
 Source: http://download.gnome.org/sources/gnome-themes/2.24/%{name}-%{version}.tar.bz2
@@ -94,6 +94,9 @@
 %doc AUTHORS COPYING NEWS README
 
 %changelog
+* Thu Jan 15 2009 Matthias Clasen <mclasen at redhat.com> - 2.24.3-1
+- Update to 2.24.3
+
 * Mon Oct 20 2008 Matthias Clasen <mclasen at redhat.com> - 2.24.1-1
 - Update to 2.24.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-themes/F-10/sources,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- sources	20 Oct 2008 16:31:26 -0000	1.72
+++ sources	16 Jan 2009 01:06:20 -0000	1.73
@@ -1 +1 @@
-9469a4ed1231ab54847983944bcd7d57  gnome-themes-2.24.1.tar.bz2
+c986db988da6ca6dcf1032c1c9736e29  gnome-themes-2.24.3.tar.bz2



From mclasen at fedoraproject.org  Fri Jan 16 01:30:40 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Fri, 16 Jan 2009 01:30:40 +0000 (UTC)
Subject: rpms/file-roller/F-10 .cvsignore, 1.80, 1.81 file-roller.spec, 1.134,
	1.135 sources, 1.80, 1.81
Message-ID: <20090116013040.6546670127@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/file-roller/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22948

Modified Files:
	.cvsignore file-roller.spec sources 
Log Message:
2.24.3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/file-roller/F-10/.cvsignore,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- .cvsignore	25 Nov 2008 00:52:33 -0000	1.80
+++ .cvsignore	16 Jan 2009 01:30:09 -0000	1.81
@@ -1 +1 @@
-file-roller-2.24.2.tar.bz2
+file-roller-2.24.3.tar.bz2


Index: file-roller.spec
===================================================================
RCS file: /cvs/pkgs/rpms/file-roller/F-10/file-roller.spec,v
retrieving revision 1.134
retrieving revision 1.135
diff -u -r1.134 -r1.135
--- file-roller.spec	25 Nov 2008 00:52:33 -0000	1.134
+++ file-roller.spec	16 Jan 2009 01:30:09 -0000	1.135
@@ -10,7 +10,7 @@
 
 Summary:	File Roller is a tool for viewing and creating archives
 Name:		file-roller
-Version:	2.24.2
+Version:	2.24.3
 Release: 	1%{?dist}
 License:	GPLv2+
 Group:		Applications/Archiving
@@ -128,6 +128,9 @@
 %{_datadir}/icons/hicolor/scalable/apps/file-roller.svg
 
 %changelog
+* Thu Jan 15 2009 Matthias Clasen <mclasen at redhat.com> - 2.24.3-1
+- Update to 2.24.3
+
 * Mon Nov 24 2008 Matthias Clasen <mclasen at redhat.com> - 2.24.2-1
 - Update to 2.24.2
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/file-roller/F-10/sources,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- sources	25 Nov 2008 00:52:33 -0000	1.80
+++ sources	16 Jan 2009 01:30:09 -0000	1.81
@@ -1 +1 @@
-886c5201e8609aadd69798aa745ada4a  file-roller-2.24.2.tar.bz2
+20264b13cd27c6542c8289256d768c9c  file-roller-2.24.3.tar.bz2



From mclasen at fedoraproject.org  Fri Jan 16 01:38:58 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Fri, 16 Jan 2009 01:38:58 +0000 (UTC)
Subject: rpms/eog/F-10 .cvsignore, 1.72, 1.73 eog.spec, 1.125, 1.126 sources,
	1.72, 1.73
Message-ID: <20090116013858.F17C070127@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/eog/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23451

Modified Files:
	.cvsignore eog.spec sources 
Log Message:

2.24.3.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/eog/F-10/.cvsignore,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- .cvsignore	25 Nov 2008 02:14:45 -0000	1.72
+++ .cvsignore	16 Jan 2009 01:38:28 -0000	1.73
@@ -1 +1 @@
-eog-2.24.2.tar.bz2
+eog-2.24.3.1.tar.bz2


Index: eog.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eog/F-10/eog.spec,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -r1.125 -r1.126
--- eog.spec	25 Nov 2008 02:14:45 -0000	1.125
+++ eog.spec	16 Jan 2009 01:38:28 -0000	1.126
@@ -13,7 +13,7 @@
 
 Summary: Eye of GNOME image viewer
 Name:    eog
-Version: 2.24.2
+Version: 2.24.3.1
 Release: 1%{?dist}
 URL: http://www.gnome.org
 Source: http://download.gnome.org/sources/eog/2.24/%{name}-%{version}.tar.bz2
@@ -172,6 +172,9 @@
 %{_datadir}/gtk-doc/html/eog
 
 %changelog
+* Thu Jan 15 2009 Matthias Clasen <mclasen at redhat.com> - 2.24.3.1-1
+- Update to 2.24.3.1
+
 * Mon Nov 24 2008 Matthias Clasen <mclasen at redhat.com> - 2.24.2-1
 - Update to 2.24.2
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eog/F-10/sources,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- sources	25 Nov 2008 02:14:45 -0000	1.72
+++ sources	16 Jan 2009 01:38:28 -0000	1.73
@@ -1 +1 @@
-219896d7b33016bc9b0485937e737d9f  eog-2.24.2.tar.bz2
+8c303bc4e10f88c7bbd18ecf539731fe  eog-2.24.3.1.tar.bz2



From rakesh at fedoraproject.org  Fri Jan 16 01:54:16 2009
From: rakesh at fedoraproject.org (Rakesh Pandit)
Date: Fri, 16 Jan 2009 01:54:16 +0000 (UTC)
Subject: rpms/nebula/devel .cvsignore, 1.2, 1.3 import.log, 1.1,
	1.2 nebula.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20090116015416.4628B70127@cvs1.fedora.phx.redhat.com>

Author: rakesh

Update of /cvs/pkgs/rpms/nebula/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25136/devel

Modified Files:
	.cvsignore import.log nebula.spec sources 
Log Message:
Updated to 0.2.3.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/nebula/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2008 04:25:17 -0000	1.2
+++ .cvsignore	16 Jan 2009 01:53:45 -0000	1.3
@@ -1 +1 @@
-nebula-0.2.2.tar.gz
+nebula-0.2.3.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/nebula/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	8 Nov 2008 04:25:17 -0000	1.1
+++ import.log	16 Jan 2009 01:53:45 -0000	1.2
@@ -1 +1,2 @@
 nebula-0_2_2-5_fc10:HEAD:nebula-0.2.2-5.fc10.src.rpm:1226137792
+nebula-0_2_3-1_fc10:HEAD:nebula-0.2.3-1.fc10.src.rpm:1232027577


Index: nebula.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nebula/devel/nebula.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nebula.spec	8 Nov 2008 04:25:17 -0000	1.1
+++ nebula.spec	16 Jan 2009 01:53:45 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           nebula
-Version:        0.2.2
-Release:        5%{?dist}
+Version:        0.2.3
+Release:        1%{?dist}
 Summary:        Intrusion signature generator
 
 Group:          Applications/System
@@ -37,6 +37,9 @@
 %{_bindir}/nebulaclient
 
 %changelog
+* Fri Jan 16 2009 Rakesh Pandit <rakesh at fedoraproject.org> - 0.2.3-6
+- Updated to 0.2.3
+
 * Fri Nov 07 2008 Rakesh Pandit <rakesh at fedoraproject.org> - 0.2.2-5
 - fixed Buildrequires
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nebula/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2008 04:25:17 -0000	1.2
+++ sources	16 Jan 2009 01:53:45 -0000	1.3
@@ -1 +1 @@
-9d388753e6bf14c9811a92a586ce8cfa  nebula-0.2.2.tar.gz
+06eabd66634e7969203465fb94900f18  nebula-0.2.3.tar.gz



From pgordon at fedoraproject.org  Fri Jan 16 02:00:05 2009
From: pgordon at fedoraproject.org (Peter Gordon)
Date: Fri, 16 Jan 2009 02:00:05 +0000 (UTC)
Subject: rpms/WebKit/F-9 .cvsignore, 1.8, 1.9 WebKit.spec, 1.13, 1.14 sources,
	1.8, 1.9
Message-ID: <20090116020005.9934C70127@cvs1.fedora.phx.redhat.com>

Author: pgordon

Update of /cvs/pkgs/rpms/WebKit/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25859/F-9

Modified Files:
	.cvsignore WebKit.spec sources 
Log Message:
Update to SVN 37790 - lots of nice bugfixes, especially for CJK/Unicode font handling (#448693) and GIMP help browser crashes (476246).


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/WebKit/F-9/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	6 Jul 2008 06:00:35 -0000	1.8
+++ .cvsignore	16 Jan 2009 01:59:34 -0000	1.9
@@ -1 +1 @@
-WebKit-r34655.tar.bz2
+WebKit-r37790.tar.bz2


Index: WebKit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/WebKit/F-9/WebKit.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- WebKit.spec	18 Jul 2008 23:23:08 -0000	1.13
+++ WebKit.spec	16 Jan 2009 01:59:34 -0000	1.14
@@ -3,28 +3,35 @@
 	cp -p %1  %{buildroot}%{_docdir}/%{name}-%{version}/$(echo '%1' | sed -e 's!/!.!g') \
 	echo %%{_docdir}/%{name}-%{version}/$(echo '%1' | sed -e 's!/!.!g') >> docfiles.list
 
-%define		svn_revision	34655
+%define		svn_revision	37790
 
-## Optional build modifications (for the GTK+ port only)
+## Optional build modifications...
 ## --with debug: Enable more verbose debugging. Makes runtime a bit slower.
+##	Also disables the optimized memory allocator.
 ##	(Default: No)
 ##
-## --with html5video: HTML5 video element support using Gstreamer
+## --with html5video: Enable HTML5 video element support using Gstreamer.
 ##	(Default: No) 
 ##
-## --with pango: Use Pango instead of freetype2 as the font renderer
+## --with jit: Enable JIT ("just-in-time") JavaScript compiling support.
+## 	Only supported on ix86 at this time, according to upstream.
+##	(Default: No)
+##	
+## --with pango: Use Pango instead of freetype2 as the font renderer.
+##	CJK support is functional only with the freetype2 backend.
 ##	(Default: No - use freetype2)
 ##
 ## --with svg: Experimental SVG support (filters)
 ##	(Default: No) 
 %bcond_with 	debug
 %bcond_with 	html5video
+%bcond_with 	jit
 %bcond_with 	pango
 %bcond_with 	svg
 
 Name:		WebKit
 Version:	1.0.0
-Release:	0.12.svn%{svn_revision}%{?dist}
+Release:	0.13.svn%{svn_revision}%{?dist}
 Summary:	Web content engine library
 
 Group:		Development/Libraries
@@ -108,15 +115,14 @@
 ## We don't like pre-built binaries, especially ones for other OSes. =)
 rm -r WebKitLibraries/{*.a,win/}
 
-## Fix permissions for the debuginfo generation.
-chmod a-x WebCore/dom/Clipboard.cpp
-
 ## Don't call configure automatically
 sed -i.conf -e '$d' autogen.sh
 ./autogen.sh
+
 %configure							\
 %{?with_debug:		--enable-debug			}	\
 %{?with_html5video:	--enable-video			}	\
+%{?with_jit:		--enable-jit			}	\
 %{?with_pango:		--with-font-backend=pango	}	\
 %{?with_svg:		--enable-svg-filters		}
 	
@@ -174,9 +180,18 @@
 
 %files	doc -f docfiles.list
 %defattr(-,root,root,-)
+%dir %{_docdir}
 
 
 %changelog
+* Wed Jan 14 2009 Peter Gordon <peter at thecodergeek.com> - 1.0.0-0.13.svn37790
+- Update to new upstream snapshot (SVN 37790).
+- Fixes GIMP help browser crash (#476246).
+- Default to freetype font backend for improved CJK/Unicode support. (#448693)
+- Add some notes to the build options comments block.
+- Add a build-time conditional for jit
+- Fix ownership of %%_docdir in the doc subpackage (#473619).
+
 * Fri Jul 18 2008 Peter Gordon <peter at thecodergeek.com> 1.0.0-0.12.svn34655
 - Remove Qt subpackage stuff, in preparation for Qt 4.4 bump; thanks to Rex
   Dieter/Ngo Than and crew.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/WebKit/F-9/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	6 Jul 2008 06:00:35 -0000	1.8
+++ sources	16 Jan 2009 01:59:34 -0000	1.9
@@ -1 +1 @@
-0c4dcb3f69d9bd63817005a11a797425  WebKit-r34655.tar.bz2
+49873486eeace6611a5fa138845a9abb  WebKit-r37790.tar.bz2



From mclasen at fedoraproject.org  Fri Jan 16 02:01:23 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Fri, 16 Jan 2009 02:01:23 +0000 (UTC)
Subject: rpms/gedit/F-10 .cvsignore, 1.82, 1.83 gedit.spec, 1.173,
	1.174 sources, 1.84, 1.85
Message-ID: <20090116020123.AF82370127@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gedit/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25997

Modified Files:
	.cvsignore gedit.spec sources 
Log Message:
2.24.3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gedit/F-10/.cvsignore,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -r1.82 -r1.83
--- .cvsignore	25 Nov 2008 05:46:46 -0000	1.82
+++ .cvsignore	16 Jan 2009 02:00:53 -0000	1.83
@@ -1 +1 @@
-gedit-2.24.2.tar.bz2
+gedit-2.24.3.tar.bz2


Index: gedit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gedit/F-10/gedit.spec,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -r1.173 -r1.174
--- gedit.spec	25 Nov 2008 05:46:46 -0000	1.173
+++ gedit.spec	16 Jan 2009 02:00:53 -0000	1.174
@@ -17,7 +17,7 @@
 
 Summary:	gEdit is a small but powerful text editor for GNOME
 Name:		gedit
-Version: 	2.24.2
+Version: 	2.24.3
 Release: 	1%{?dist}
 Epoch:		1
 License:	GPLv2+ and GFDL
@@ -218,6 +218,9 @@
 
 
 %changelog
+* Thu Jan 15 2009 Matthias Clasen <mclasen at redhat.com> - 1:2.24.3-1
+- Update to 2.24.3
+
 * Tue Nov 25 2008 Matthias Clasen <mclasen at redhat.com> - 1:2.24.2-1
 - Update to 2.24.2
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gedit/F-10/sources,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -r1.84 -r1.85
--- sources	25 Nov 2008 05:46:46 -0000	1.84
+++ sources	16 Jan 2009 02:00:53 -0000	1.85
@@ -1 +1 @@
-04bcf226edc5de3a4ac759e97e0e2e6e  gedit-2.24.2.tar.bz2
+48ed6c5c156791cffc219a7d7390da57  gedit-2.24.3.tar.bz2



From mclasen at fedoraproject.org  Fri Jan 16 02:02:53 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Fri, 16 Jan 2009 02:02:53 +0000 (UTC)
Subject: rpms/zenity/F-10 .cvsignore, 1.28, 1.29 sources, 1.29,
	1.30 zenity.spec, 1.49, 1.50
Message-ID: <20090116020253.52B0570127@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/zenity/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26091

Modified Files:
	.cvsignore sources zenity.spec 
Log Message:
2.24.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/zenity/F-10/.cvsignore,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- .cvsignore	23 Sep 2008 14:57:23 -0000	1.28
+++ .cvsignore	16 Jan 2009 02:02:23 -0000	1.29
@@ -1 +1 @@
-zenity-2.24.0.tar.bz2
+zenity-2.24.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/zenity/F-10/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- sources	24 Oct 2008 18:07:02 -0000	1.29
+++ sources	16 Jan 2009 02:02:23 -0000	1.30
@@ -1,4 +1 @@
-aa4486482210856848fa7d6634fc126a  zenity-2.24.0.tar.bz2
-
-
-
+a7ade5ff47716f4328d5e0547596dfb6  zenity-2.24.1.tar.bz2


Index: zenity.spec
===================================================================
RCS file: /cvs/pkgs/rpms/zenity/F-10/zenity.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- zenity.spec	9 Oct 2008 04:06:20 -0000	1.49
+++ zenity.spec	16 Jan 2009 02:02:23 -0000	1.50
@@ -1,6 +1,6 @@
 Name:		zenity
-Version:	2.24.0
-Release:	2%{?dist}
+Version:	2.24.1
+Release:	1%{?dist}
 Summary:	Display dialog boxes from shell scripts
 Group:		Applications/System
 License:	LGPLv2+
@@ -18,7 +18,6 @@
 BuildRequires: scrollkeeper
 BuildRequires: which
 BuildRequires: gettext
-BuildRequires: perl(XML::Parser)
 BuildRequires: intltool
 # for /usr/share/gnome/help, we should require yelp
 # but we don't to avoid forcing firefox and libbeagle on live cds
@@ -91,6 +90,9 @@
 
 
 %changelog
+* Thu Jan 15 2009 Matthias Clasen <mclasen at redhat.com> - 2.24.1-1
+- 2.24.1
+
 * Thu Oct  9 2008 Matthias Clasen <mclasen at redhat.com> - 2.24.0-2
 - Save some space
 



From mebrown at fedoraproject.org  Fri Jan 16 02:11:37 2009
From: mebrown at fedoraproject.org (Michael E Brown)
Date: Fri, 16 Jan 2009 02:11:37 +0000 (UTC)
Subject: rpms/libsmbios/devel .cvsignore, 1.11, 1.12 libsmbios.spec, 1.14,
	1.15 sources, 1.11, 1.12
Message-ID: <20090116021137.3A6D470127@cvs1.fedora.phx.redhat.com>

Author: mebrown

Update of /cvs/extras/rpms/libsmbios/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26860

Modified Files:
	.cvsignore libsmbios.spec sources 
Log Message:
* Thu Jan 15 2009 Michael E Brown <michael_e_brown at dell.com> - 2.2.7-1
- change source to bz2 format
- Update to latest upstream release. Many changes in the new release:
  - python interface
  - libsmbios_c interface almost fully implemented
  - libsmbios c++ interface deprecated



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libsmbios/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	14 Feb 2008 05:39:38 -0000	1.11
+++ .cvsignore	16 Jan 2009 02:11:06 -0000	1.12
@@ -1 +1 @@
-libsmbios-2.0.1.tar.gz
+libsmbios-2.2.7.tar.bz2


Index: libsmbios.spec
===================================================================
RCS file: /cvs/extras/rpms/libsmbios/devel/libsmbios.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- libsmbios.spec	26 Jul 2008 15:29:27 -0000	1.14
+++ libsmbios.spec	16 Jan 2009 02:11:06 -0000	1.15
@@ -1,159 +1,327 @@
+# pkg/libsmbios.spec.  Generated from libsmbios.spec.in by configure.
+
 # these are all substituted by autoconf
 %define major 2
-%define minor 0
-%define sub 1
-%define extralevel %{nil}
-%define release_name libsmbios
-%define release_version %{major}.%{minor}.%{sub}%{extralevel}
+%define minor 2
+%define micro 7
+%define extra %{nil}
+%define lang_dom  libsmbios2-2.2
+%define release_version %{major}.%{minor}.%{micro}%{extra}
+
+# required by suse build system
+# norootforbuild
+
+%define run_unit_tests 1
+%{?_without_unit_tests: %define run_unit_tests 0}
+%{?_with_unit_tests:    %define run_unit_tests 1}
+
+# some distros already have fdupes macro. If not, we just set it to something innocuous
+%{?!fdupes: %define fdupes /usr/sbin/hardlink -c -v}
+
+%define ctypes_BR python-ctypes
+%define cppunit_BR cppunit-devel
+%define fdupes_BR hardlink
+# Some variable definitions so that we can be compatible between SUSE Build service and Fedora build system
+# SUSE: fedora_version  suse_version rhel_version centos_version sles_version
+# Fedora: fedora dist fc8 fc9
+
+# suse/sles
+%if 0%{?suse_version}
+%if 0%{?suse_version} >= 1020
+    # suse never added python-ctypes provides to python 2.5 :(
+    %define ctypes_BR %{nil}
+%endif
+%if 0%{?suse_version} > 1020
+    %define fdupes_BR fdupes
+%else
+    %define fdupes_BR %{nil}
+    %define fdupes echo fdupes disabled
+%endif
+%endif
+
+# rhel
+%if 0%{?rhel_version}
+%if 0%{?rhel_version} < 500
+    %define fdupes echo fdupes disabled
+    %define fdupes_BR %{nil}
+    # dont yet have rhel4 cppunit
+    %define cppunit_BR %{nil}
+%endif
+%endif
+
+# per fedora and suse python packaging guidelines
+# suse: will define py_sitedir for us
+# fedora: use the !? code below to define when it isnt already
+%{!?py_sitedir: %define py_sitedir %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
-Name: %{release_name}
+Name: libsmbios2
 Version: %{release_version}
-Release: 2%{?dist}.1
+Release: 1%{?dist}
 License: GPLv2+ or OSL 2.1
+Summary: Libsmbios C/C++ shared libraries
 Group: System Environment/Libraries
-Source: http://linux.dell.com/libsmbios/download/%{name}/%{name}-%{version}/%{name}-%{version}.tar.gz
+Source: http://linux.dell.com/libsmbios/download/libsmbios/libsmbios-%{version}/libsmbios-%{version}.tar.bz2
 URL: http://linux.dell.com/libsmbios/main
-Summary: Libsmbios shared libraries
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Provides: libsmbios-libs = %{version}-%{release}
-BuildRequires: libxml2-devel
+BuildRequires: strace libxml2-devel python-devel gcc-c++ gettext valgrind doxygen %{cppunit_BR} %{fdupes_BR}
+Provides: libsmbios-libs = 0:%{version}-%{release}
+# uncomment for official fedora
+#Obsoletes: libsmbios-libs < 2.0.0
+Obsoletes: libsmbios < 0:%{version}-%{release}
+Provides: libsmbios = 0:%{version}-%{release}
 
 # libsmbios only ever makes sense on intel compatible arches
 # no DMI tables on ppc, s390, etc.
 ExclusiveArch: x86_64 ia64 %{ix86}
 
-#EPEL4/5 dont have cppunit/cppunit-devel, so skip build tests
-# everything else should be able to pull in cppunit to run unit tests
-# during build. Doesnt affect binaries produced, so doesnt affect
-# build reproducability.
-%if %(test "%{dist}" != ".el4" -a "%{dist}" != ".el5" && echo 1 || echo 0)
-BuildRequires: cppunit-devel
-%endif
+%description
+Libsmbios is a library and utilities that can be used by client programs to get
+information from standard BIOS tables, such as the SMBIOS table.
 
-# no doxygen native for suse
-%if %(test ! -e /etc/SuSE-release && echo 1 || echo 0)
-BuildRequires: doxygen
-%endif
+This package provides the C-based libsmbios library, with a C interface.
 
+This package also has a C++-based library, with a C++ interface. It is not
+actively maintained, but provided for backwards compatibility. New programs
+should use the libsmbios C interface.
 
-%description
-Libsmbios is a library and utilities that can be used by client programs 
-to get information from standard BIOS tables, such as the SMBIOS table.
+
+%package -n python-smbios
+Summary: Python interface to Libsmbios C library
+Group: System Environment/Libraries
+Requires: libsmbios2 = %{version}-%{release}
+Requires: python %{ctypes_BR}
+
+%description -n python-smbios
+This package provides a Python interface to libsmbios
 
 %package -n smbios-utils
-Summary: The "supported" sample binaries that use libsmbios
+Summary: meta-package that pulls in all smbios utilities (binary executables and python scripts)
 Group: Applications/System
-Requires: libsmbios = %{version}-%{release}
+Requires: smbios-utils-bin smbios-utils-python
 Obsoletes: libsmbios-bin < 0:2.0.0
 Provides: libsmbios-bin = %{version}-%{release}
 Obsoletes: libsmbios-unsupported-bin < 0:2.0.0
 Provides: libsmbios-unsupported-bin = %{version}-%{release}
-Obsoletes: libsmbios-libs < 0:2.0.0
-Provides: libsmbios-libs = %{version}-%{release}
 
-%package devel
+%description -n smbios-utils
+This is a meta-package that pulls in the binary libsmbios executables as well
+as the python executables.
+
+%package -n smbios-utils-bin
+Summary: Binary utilities that use libsmbios
+Group: Applications/System
+Requires: libsmbios2 = %{version}-%{release}
+
+%description -n smbios-utils-bin
+Get BIOS information, such as System product name, product id, service tag and
+asset tag. 
+
+%package -n smbios-utils-python
+Summary: Python executables that use libsmbios
+Group: Applications/System
+Requires: python-smbios = %{version}-%{release}
+
+%description -n smbios-utils-python
+Get BIOS information, such as System product name, product id, service tag and
+asset tag. Set service and asset tags on Dell machines. Manipulate wireless
+cards/bluetooth on Dell laptops. Set BIOS password on select Dell systems.
+Update BIOS on select Dell systems. Set LCD brightness on select Dell laptops.
+
+%package -n libsmbios2-devel
 Summary: Development headers and archives
 Group: Development/Libraries
 Requires: libsmbios = %{version}-%{release}
+Provides: libsmbios-devel = %{version}-%{release}
+Obsoletes: libsmbios-devel < %{version}-%{release}
 
-%description devel
-Libsmbios is a library and utilities that can be used by client programs 
-to get information from standard BIOS tables, such as the SMBIOS table.
-
-This package contains the headers and .a files necessary to compile new 
-client programs against libsmbios.
+%description -n libsmbios2-devel
+Libsmbios is a library and utilities that can be used by client programs to get
+information from standard BIOS tables, such as the SMBIOS table.
 
-%description -n smbios-utils
-Libsmbios is a library and utilities that can be used by client programs 
-to get information from standard BIOS tables, such as the SMBIOS table.
+This package contains the headers and .a files necessary to compile new client
+programs against libsmbios.
 
-This package contains some sample binaries that use libsmbios.
 
 %prep
-%setup -q 
+%setup -q -n libsmbios-%{version}
 find . -type d -exec chmod -f 755 {} \;
-find doc include libraries bin-unsupported build bin-supported cppunit -type f -exec chmod -f 644 {} \;
-chmod 755 cppunit/*.sh
+find doc src -type f -exec chmod -f 644 {} \;
+chmod 755 src/cppunit/*.sh
 
 %build
-export EXTRA_CXXFLAGS="%{optflags}" 
-export EXTRA_CFLAGS="%{optflags}" 
-export RELEASE_MAJOR=%{major} 
-export RELEASE_MINOR=%{minor} 
-export RELEASE_SUBLEVEL=%{sub} 
-export RELEASE_EXTRALEVEL=%{extralevel}
-%configure
-mkdir -p doc/full/html 
-make -e %{?_smp_mflags} 
-[ ! -d /usr/include/cppunit ] || make -e check
+# this line lets us build an RPM directly from a git tarball
+[ -e ./configure ] || ./autogen.sh
+
+mkdir _build
+cd _build
+echo '../configure "$@"' > configure
+chmod +x ./configure
+
+%configure RELEASE_MAJOR=%{major} RELEASE_MINOR=%{minor} RELEASE_MICRO=%{micro} RELEASE_EXTRA=%{extra} CFLAGS="%{optflags}" CXXFLAGS="%{optflags}"
+mkdir -p out/libsmbios_c
+mkdir -p out/libsmbios_c++
+make -e %{?_smp_mflags} 2>&1 | tee build.log
+
+echo \%doc _build/build.log > buildlogs.txt
+
+%check
+runtest() {
+    mkdir _$1$2
+%if 0%{?run_unit_tests}
+    pushd _$1$2
+    ../configure
+    make -e $1 CFLAGS="$CFLAGS -DDEBUG_OUTPUT_ALL" 2>&1 | tee $1$2.log
+    #make -e $1 2>&1 | tee $1$2.log
+    popd
+    echo \%doc _$1$2/$1$2.log >> _build/buildlogs.txt
+%endif
+}
+
+if [ -d /usr/include/cppunit ]; then
+   # run this first since it is slightly faster than valgrind
+    VALGRIND="strace -f" runtest check strace > /dev/null || echo FAILED strace check
+fi
+
+if [ -e /usr/bin/valgrind -a -d /usr/include/cppunit ]; then
+    runtest valgrind > /dev/null || echo FAILED valgrind check
+fi
+
+if [ -d /usr/include/cppunit ]; then
+    runtest check > /dev/null || echo FAILED check
+fi
+
+if [ ! -d /usr/include/cppunit ]; then
+    echo "Unit tests skipped due to missing cppunit."
+fi
 
 %install
 rm -rf %{buildroot}
+mkdir %{buildroot}
 
+cd _build
+TOPDIR=..
 make install DESTDIR=%{buildroot} INSTALL="%{__install} -p"
 mkdir -p %{buildroot}/usr/include
-cp -a include/smbios %{buildroot}/usr/include/
+cp -a $TOPDIR/src/include/*  %{buildroot}/usr/include/
 rm -f %{buildroot}/%{_libdir}/lib*.la
-find %{buildroot}/usr/include -exec touch -r configure.ac {} \;
-find doc/full -exec touch -r configure.ac {} \;
+find %{buildroot}/usr/include -exec touch -r $TOPDIR/configure.ac {} \;
 
 # backwards compatible:
-ln -s /usr/sbin/dellWirelessCtl %{buildroot}/usr/bin/dellWirelessCtl
+ln -s ../sbin/dellWirelessCtl %{buildroot}/usr/bin/dellWirelessCtl
+ln -s smbios-sys-info %{buildroot}%{_sbindir}/getSystemId
+ln -s smbios-wireless-ctl %{buildroot}%{_sbindir}/dellWirelessCtl
+ln -s smbios-lcd-brightness %{buildroot}%{_sbindir}/dellLcdBrightness
+ln -s smbios-rbu-bios-update %{buildroot}%{_sbindir}/dellBiosUpdate
+
+%find_lang %{lang_dom}
+
+# hardlink files to save some space.
+%fdupes $RPM_BUILD_ROOT
 
 %clean
 rm -rf %{buildroot}
 
-%post -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
+%post   -n libsmbios2   -p /sbin/ldconfig
+%postun -n libsmbios2   -p /sbin/ldconfig
 
-%files
+%files -n libsmbios2 -f _build/%{lang_dom}.lang
 %defattr(-,root,root,-)
-%doc COPYING-GPL COPYING-OSL README
+%{_libdir}/libsmbios_c.so.*
 %{_libdir}/libsmbios.so.*
 
-%files devel
+%files -n python-smbios
+%defattr(-,root,root,-)
+%doc COPYING-GPL COPYING-OSL README
+%{py_sitedir}/*
+
+%files -n libsmbios2-devel -f _build/buildlogs.txt
 %defattr(-,root,root,-)
-%doc COPYING-GPL COPYING-OSL README bin-unsupported/getopts_LICENSE.txt
+%doc COPYING-GPL COPYING-OSL README src/bin/getopts_LICENSE.txt src/include/smbios/config/boost_LICENSE_1_0_txt
 /usr/include/smbios
+/usr/include/smbios_c
 %{_libdir}/libsmbios.a
 %{_libdir}/libsmbios.so
-%doc doc/full/html
+%{_libdir}/libsmbios_c.a
+%{_libdir}/libsmbios_c.so
+%doc _build/out/libsmbios_c++
+%doc _build/out/libsmbios_c
 
 %files -n smbios-utils
+# opensuse 11.1 enforces non-empty file list :(
 %defattr(-,root,root,-)
 %doc COPYING-GPL COPYING-OSL README
-%doc bin-unsupported/getopts_LICENSE.txt include/smbios/config/boost_LICENSE_1_0_txt
-%{_sbindir}/assetTag
-%{_sbindir}/dellBiosUpdate
-%{_sbindir}/getSystemId
-%{_sbindir}/propertyTag
-%{_sbindir}/serviceTag
-%{_sbindir}/verifySmiPassword
-%{_sbindir}/wakeupCtl
-%{_sbindir}/dellLcdBrightness
+# no other files. 
 
-# used by HAL in old location, so keep it around until HAL is updated.
+%files -n smbios-utils-bin
+%defattr(-,root,root,-)
+%doc COPYING-GPL COPYING-OSL README
+%doc src/bin/getopts_LICENSE.txt src/include/smbios/config/boost_LICENSE_1_0_txt
+%doc doc/pkgheader.sh
+
+# legacy C++
+%{_sbindir}/dellBiosUpdate-compat
+%{_sbindir}/dellLEDCtl
+%ifnarch ia64
+%{_sbindir}/dellMediaDirectCtl
+%endif
+
+# new C utilities
+%{_sbindir}/smbios-state-byte-ctl
+%{_sbindir}/smbios-get-ut-data
+%{_sbindir}/smbios-upflag-ctl
+%{_sbindir}/smbios-sys-info-lite
+
+
+%files -n smbios-utils-python
+%defattr(-,root,root,-)
+%doc COPYING-GPL COPYING-OSL README
+%doc src/bin/getopts_LICENSE.txt src/include/smbios/config/boost_LICENSE_1_0_txt
+%doc doc/pkgheader.sh
+%dir %{_sysconfdir}/libsmbios
+%config(noreplace) %{_sysconfdir}/libsmbios/*
+
+# YUM Plugin
+%config(noreplace) %{_sysconfdir}/yum/pluginconf.d/dellsysidplugin2.conf
+%{_exec_prefix}/lib/yum-plugins/*
+# SUSE build has anal directory ownership check. RPM which owns all dirs *must*
+# be installed at buildtime.
+%if 0%{?suse_version} >= 1100
+%dir %{_sysconfdir}/yum
+%dir %{_sysconfdir}/yum/pluginconf.d/
+%dir %{_exec_prefix}/lib/yum-plugins/
+%endif
+
+# python utilities
+%{_sbindir}/smbios-sys-info
+%{_sbindir}/smbios-token-ctl
+%{_sbindir}/smbios-passwd
+%{_sbindir}/smbios-wakeup-ctl
+%{_sbindir}/smbios-wireless-ctl
+%{_sbindir}/smbios-rbu-bios-update
+%{_sbindir}/smbios-lcd-brightness
+
+# symlinks: backwards compat
+%{_sbindir}/dellLcdBrightness
+%{_sbindir}/getSystemId
 %{_sbindir}/dellWirelessCtl
+%{_sbindir}/dellBiosUpdate
+# used by HAL in old location, so keep it around until HAL is updated.
 %{_bindir}/dellWirelessCtl
 
-# community supported stuff...
-# may or may not work
-%{_sbindir}/dellLEDCtl
-%{_sbindir}/activateCmosToken
-%{_sbindir}/ascii2enUS_scancode
-%{_sbindir}/createUnitTestFiles
-%{_sbindir}/disable_console_redir
-%{_sbindir}/dumpCmos
-%{_sbindir}/getPasswordFormat
-%{_sbindir}/isCmosTokenActive
-%{_sbindir}/probes
-%{_sbindir}/smitest
-%{_sbindir}/stateByteCtl
-%{_sbindir}/upBootCtl
-%{_sbindir}/dumpSmbios
+# data files
+%{_datadir}/smbios-utils
 
-# ./ChangeLog is appended by configure
 %changelog
+* Thu Jan 15 2009 Michael E Brown <michael_e_brown at dell.com> - 2.2.7-1
+- change source to bz2 format
+- Update to latest upstream release. Many changes in the new release:
+  - python interface
+  - libsmbios_c interface almost fully implemented
+  - libsmbios c++ interface deprecated
+
+* Tue Oct 28 2008 Michael E Brown <michael_e_brown at dell.com> - 2.2.0-1
+- Spec updates
+
 * Mon Apr 21 2008 Michael E Brown <michael_e_brown at dell.com> - 2.0.1-2.1
 - obsolete libsmbios-libs as well
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libsmbios/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	14 Feb 2008 05:39:38 -0000	1.11
+++ sources	16 Jan 2009 02:11:06 -0000	1.12
@@ -1 +1 @@
-48a3e0238e57773da1150392805343ff  libsmbios-2.0.1.tar.gz
+6a016ca6223fd98bda04fca514bb63d4  libsmbios-2.2.7.tar.bz2



From ausil at fedoraproject.org  Fri Jan 16 02:27:40 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Fri, 16 Jan 2009 02:27:40 +0000 (UTC)
Subject: rpms/pyOpenSSL/devel pyOpenSSL.spec,1.30,1.31
Message-ID: <20090116022740.3AE4270127@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/pyOpenSSL/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28312

Modified Files:
	pyOpenSSL.spec 
Log Message:
rebuild against new openssl



Index: pyOpenSSL.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pyOpenSSL/devel/pyOpenSSL.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- pyOpenSSL.spec	29 Nov 2008 18:16:52 -0000	1.30
+++ pyOpenSSL.spec	16 Jan 2009 02:27:09 -0000	1.31
@@ -3,7 +3,7 @@
 Summary: Python wrapper module around the OpenSSL library
 Name: pyOpenSSL
 Version: 0.7
-Release: 3%{?dist}
+Release: 4%{?dist}
 Source0: http://pyopenssl.sf.net/%{name}-%{version}.tar.gz
 Patch0: pyOpenSSL-0.7-openssl.patch
 Patch2: pyOpenSSL-elinks.patch
@@ -53,6 +53,9 @@
 %{python_sitearch}/%{name}*.egg-info
 
 %changelog
+* Thu Jan 15 2009 Dennis Gilmore <dennis at ausil.us> - 0.7-4
+- rebuild against now openssl
+
 * Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 0.7-3
 - Rebuild for Python 2.6
 



From dp67 at fedoraproject.org  Fri Jan 16 02:43:11 2009
From: dp67 at fedoraproject.org (Randy Berry)
Date: Fri, 16 Jan 2009 02:43:11 +0000 (UTC)
Subject: rpms/xwxapt/devel import.log, NONE, 1.1 xwxapt.desktop, NONE,
	1.1 xwxapt.png, NONE, 1.1 xwxapt.sh.in, NONE, 1.1 xwxapt.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090116024311.3168E70127@cvs1.fedora.phx.redhat.com>

Author: dp67

Update of /cvs/pkgs/rpms/xwxapt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29316/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log xwxapt.desktop xwxapt.png xwxapt.sh.in xwxapt.spec 
Log Message:

Imoprt xwxapt source



--- NEW FILE import.log ---
xwxapt-1_2-1_fc10:HEAD:xwxapt-1.2-1.fc10.src.rpm:1232073671


--- NEW FILE xwxapt.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=xwxapt
GenericName=xwxapt
Comment=GTK+ graphical application for decoding and saving weather images
Exec=xwxapt
Icon=xwxapt.png
Terminal=false
Type=Application
Categories=HamRadio;
Version=1.0


--- NEW FILE xwxapt.sh.in ---
#!/bin/sh
#Wrapper script for xwxapt to ensure that user configuration is present
xwxaptbin="/usr/libexec/xwxapt-bin"
#check if user configuration is present
if [ ! -e ~/xwxapt/xwxaptrc ]
then
echo "Creating user configuration file"
mkdir ~/xwxapt
mkdir ~/xwxapt/images
mkdir ~/xwxapt/record
cp /usr/share/xwxapt/xwxaptrc ~/xwxapt/xwxaptrc
fi
#launch xwxapt
echo "Configuration can be found in the xwxapt/xwxaptrc file in your users home directory"
$xwxaptbin


--- NEW FILE xwxapt.spec ---
Name:           xwxapt
Version:        1.2
Release:        1%{?dist}
Summary:        GTK+ graphical application for decoding and saving weather images

Group:          Applications/Communications
License:        GPLv2+
URL:            http://5b4az.chronos.org.uk/pages/apt.html
Source0:        http://5b4az.chronos.org.uk/pkg/apt/xwxapt/%{name}-%{version}.tar.gz
#add .desktop file
Source1:        %{name}.desktop
#temporary Icon
Source2:        %{name}.png
#Wrapper script for user config
Source3:        %{name}.sh.in
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  automake, autoconf, gtk2-devel, desktop-file-utils
#Requires:       

%description
xwxapt is a GTK+ graphical version of wxapt. It uses the same decoding
engine as wxapt but it displays APT images at half-size as they are
received, storing the full-sized files when reception is completed. 

It also displays some status information (audio level, sync level,
sync status etc) and text messages as it runs.

%prep
%setup -qn %{name}


%build
./autogen.sh
%configure
make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" 


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

#install default user configuration file
install -p -D -m 0644 $RPM_BUILD_DIR/%{name}/xwxapt/xwxaptrc $RPM_BUILD_ROOT%{_datadir}/%{name}/xwxaptrc

#move original binary to libexecdir
mkdir -p $RPM_BUILD_ROOT%{_libexecdir}/
mv $RPM_BUILD_ROOT%{_bindir}/%{name} $RPM_BUILD_ROOT%{_libexecdir}/%{name}-bin

#install wrapper script 
install -p -D -m 0755 %{SOURCE3} $RPM_BUILD_ROOT%{_bindir}/xwxapt


# no upstream .desktop or icon yet so we'll use a temporary one
mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/pixmaps/
cp %{SOURCE2} ${RPM_BUILD_ROOT}%{_datadir}/pixmaps/%{name}.png
desktop-file-install  \
        --dir=${RPM_BUILD_ROOT}%{_datadir}/applications %{SOURCE1}
# --vendor="fedora" obsolete per new guidelines

%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc AUTHORS README
%doc doc/xwxapt.html
%{_bindir}/*
%{_libexecdir}/*
%{_datadir}/%{name}
%{_datadir}/pixmaps/%{name}.png
%{_datadir}/applications/*%{name}.desktop



%changelog
* Wed Jan 14 2009 Randall J. Berry 'Dp67' <dp67 at fedoraproject.org> 1.2-1
- Upstream upgrade to 1.2
- Mock build f9/f10/devel
- check rpmlint 3 packages and 1 specfiles checked; 0 errors, 0 warnings.
- submit for review


* Mon Jan 12 2009 Randall J. Berry 'Dp67' <dp67 at fedoraproject.org> 1.1-2
- Mock build f9/f10/devel
- check rpmlint


* Sun Sep 21 2008 Randall J. Berry 'Dp67' <dp67 at fedoraproject.org> 1.1-1
- Upstream upgrade to 1.1
- Build test for f9

* Sun Mar 02 2008 Sindre Pedersen Bjordal <sindrepb at fedoraproject.org> - 0.9-1
- Initial build


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xwxapt/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	15 Jan 2009 20:43:32 -0000	1.1
+++ .cvsignore	16 Jan 2009 02:42:40 -0000	1.2
@@ -0,0 +1 @@
+xwxapt-1.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xwxapt/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	15 Jan 2009 20:43:32 -0000	1.1
+++ sources	16 Jan 2009 02:42:40 -0000	1.2
@@ -0,0 +1 @@
+c2ffcd25fc79a64266e52c558d96521f  xwxapt-1.2.tar.gz



From cchance at fedoraproject.org  Fri Jan 16 02:43:25 2009
From: cchance at fedoraproject.org (Caius Chance)
Date: Fri, 16 Jan 2009 02:43:25 +0000 (UTC)
Subject: rpms/baekmuk-ttf-fonts/devel 65-baekmuk-ttf-batang.conf, NONE,
	1.1 65-baekmuk-ttf-dotum.conf, NONE,
	1.1 65-baekmuk-ttf-gulim.conf, NONE,
	1.1 65-baekmuk-ttf-hline.conf, NONE, 1.1 baekmuk-ttf-fonts.spec,
	1.6, 1.7
Message-ID: <20090116024325.425D270127@cvs1.fedora.phx.redhat.com>

Author: cchance

Update of /cvs/pkgs/rpms/baekmuk-ttf-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29418

Modified Files:
	baekmuk-ttf-fonts.spec 
Added Files:
	65-baekmuk-ttf-batang.conf 65-baekmuk-ttf-dotum.conf 
	65-baekmuk-ttf-gulim.conf 65-baekmuk-ttf-hline.conf 
Log Message:
* Fri Jan 16 2009 Caius Chance <cchance at redhat.com> - 2.2-11.fc11
- Resolves: rhbz#477332 (Include macro _font_pkg and created fontconfig .conf files.)




--- NEW FILE 65-baekmuk-ttf-batang.conf ---
<?xml version="1.0"?>
<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
<fontconfig>
<!--
  Serif faces
 -->
	<alias>
		<family>Baekmuk Batang</family>
		<default>
            <family>serif</family>
        </default>
	</alias>
	<alias>
		<family>serif</family>
		<prefer>
			<family>Baekmuk Batang</family>
		</prefer>
	</alias>
</fontconfig>


--- NEW FILE 65-baekmuk-ttf-dotum.conf ---
<?xml version="1.0"?>
<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
<fontconfig>
<!--
  Sans-serif faces
 -->
	<alias>
		<family>Baekmuk Dotum</family>
		<default>
            <family>sans-serif</family>
        </default>
	</alias>
	<alias>
		<family>sans-serif</family>
		<prefer>
			<family>Baekmuk Dotum</family>
		</prefer>
	</alias>
</fontconfig>


--- NEW FILE 65-baekmuk-ttf-gulim.conf ---
<?xml version="1.0"?>
<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
<fontconfig>
<!--
  monospace faces
 -->
	<alias>
		<family>Baekmuk Gulim</family>
		<default>
            <family>monospace</family>
        </default>
	</alias>
	<alias>
		<family>monospace</family>
		<prefer>
			<family>Baekmuk Gulim</family>
		</prefer>
	</alias>
</fontconfig>


--- NEW FILE 65-baekmuk-ttf-hline.conf ---
<?xml version="1.0"?>
<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
<fontconfig>
<!--
  this conf file is intended empty
 -->
</fontconfig>


Index: baekmuk-ttf-fonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/baekmuk-ttf-fonts/devel/baekmuk-ttf-fonts.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- baekmuk-ttf-fonts.spec	9 Jan 2009 00:05:40 -0000	1.6
+++ baekmuk-ttf-fonts.spec	16 Jan 2009 02:42:55 -0000	1.7
@@ -1,24 +1,27 @@
 %define fontname    baekmuk-ttf
-%define fontconf    <65>-%{fontname}
-%define archivename %{name}-%{version}
+%define archivename %{fontname}-%{version}
 %define common_desc \
 This package provides the free Korean TrueType fonts.
 
-%define fontdir      %{_datadir}/fonts/%{fontname}
-%define cidmapdir      %{_datadir}/ghostscript/conf.d
+%define fontdir        %{_datadir}/fonts/%{fontname}
+%define gsdir          %{_datadir}/ghostscript/conf.d
 %define catalogue      %{_sysconfdir}/X11/fontpath.d
 
 Name:           %{fontname}-fonts
 Version:        2.2
-Release:        10%{?dist}
+Release:        11%{?dist}
 Summary:        Free Korean TrueType fonts
 
 Group:          User Interface/X
 License:        Baekmuk
 URL:            http://kldp.net/projects/baekmuk/
-Source0:        http://kldp.net/frs/download.php/1429/%{fontname}-%{version}.tar.gz
+Source0:        http://kldp.net/frs/download.php/1429/%{archivename}.tar.gz
 Source1:        FAPIcidfmap.ko
 Source2:        cidfmap.ko
+Source3:        65-baekmuk-ttf-batang.conf
+Source4:        65-baekmuk-ttf-dotum.conf
+Source5:        65-baekmuk-ttf-gulim.conf
+Source6:        65-baekmuk-ttf-hline.conf
 
 Obsoletes:      fonts-korean
 
@@ -41,80 +44,133 @@
 
 This package contains some common files for Baekmuk Korean TrueType fonts.
 
-%define mk_pkg()\
-%package %1\
-Summary:        Korean Baekmuk TrueType %2 typeface\
-License:        Baekmuk\
-Group:          User Interface/X\
-Obsoletes:      ttfonts-ko < 1.0.11-33 fonts-korean < 2.2-6\
-Requires:       fontpackages-filesystem, %{name}-common\
-\
-%description %1\
-%common_desc\
-\
-This package contains the Korean TrueType font %2 typeface.\
-\
-%post %1\
-if [ -x %{_bindir}/fc-cache ]; then\
-  %{_bindir}/fc-cache %{_datadir}/fonts\
-fi\
-\
-%postun %1\
-if [ "$1" = "0" ]; then\
-  if [ -x %{_bindir}/fc-cache ]; then\
-    %{_bindir}/fc-cache %{_datadir}/fonts\
-  fi\
-fi\
-\
-%files %1\
-%defattr(-,root,root,-)\
-%dir %{fontdir}-%1\
-%{fontdir}-%1/*.ttf\
-%verify(not md5 size mtime) %{fontdir}-%1/fonts.dir\
-%verify(not md5 size mtime) %{fontdir}-%1/fonts.scale\
-%{catalogue}/%{name}-%1
-
-%mk_pkg batang Batang
-%mk_pkg dotum  Dotum
-%mk_pkg gulim  Gulim
-%mk_pkg hline  Headline
+%package batang
+Summary:        Korean Baekmuk TrueType Batang typeface
+License:        Baekmuk
+Group:          User Interface/X
+Obsoletes:      ttfonts-ko < 1.0.11-33 fonts-korean < 2.2-6
+Requires:       fontpackages-filesystem, %{name}-common
+
+%description batang
+%common_desc
+
+This package contains the Korean TrueType font Batang typeface.
+
+%_font_pkg -n batang -f *-%{fontname}-batang*.conf batang.ttf
+
+%verify(not md5 size mtime) %{fontdir}/fonts.dir
+%verify(not md5 size mtime) %{fontdir}/fonts.scale
+%verify(not md5 size mtime) %{catalogue}/%{fontname}
+
+%package dotum
+Summary:        Korean Baekmuk TrueType Dotum typeface
+License:        Baekmuk
+Group:          User Interface/X
+Obsoletes:      ttfonts-ko < 1.0.11-33 fonts-korean < 2.2-6
+Requires:       fontpackages-filesystem, %{name}-common
+
+%description dotum
+%common_desc
+
+This package contains the Korean TrueType font Dotum typeface.
+
+%_font_pkg -n dotum -f *-%{fontname}-dotum*.conf dotum.ttf
+
+%verify(not md5 size mtime) %{fontdir}/fonts.dir
+%verify(not md5 size mtime) %{fontdir}/fonts.scale
+%verify(not md5 size mtime) %{catalogue}/%{fontname}
+
+%package gulim
+Summary:        Korean Baekmuk TrueType Gulim typeface
+License:        Baekmuk
+Group:          User Interface/X
+Obsoletes:      ttfonts-ko < 1.0.11-33 fonts-korean < 2.2-6
+Requires:       fontpackages-filesystem, %{name}-common
+
+%description gulim
+%common_desc
+
+This package contains the Korean TrueType font Gulim typeface.
+
+%_font_pkg -n gulim -f *-%{fontname}-gulim*.conf gulim.ttf
+
+%verify(not md5 size mtime) %{fontdir}/fonts.dir
+%verify(not md5 size mtime) %{fontdir}/fonts.scale
+%verify(not md5 size mtime) %{catalogue}/%{fontname}
+
+%package hline
+Summary:        Korean Baekmuk TrueType Headline typeface
+License:        Baekmuk
+Group:          User Interface/X
+Obsoletes:      ttfonts-ko < 1.0.11-33 fonts-korean < 2.2-6
+Requires:       fontpackages-filesystem, %{name}-common
+
+%description hline
+%common_desc
+
+This package contains the Korean TrueType font Headline typeface.
+
+%_font_pkg -n hline -f *-%{fontname}-hline*.conf hline.ttf
+
+%verify(not md5 size mtime) %{fontdir}/fonts.dir
+%verify(not md5 size mtime) %{fontdir}/fonts.scale
+%verify(not md5 size mtime) %{catalogue}/%{fontname}
 
 %prep
-%setup -q -n %{fontname}-%{version}
+%setup -q -n %{archivename}
 
 %build
 %{nil}
 
 %install
-rm -rf %{buildroot}
-
-# for catalogue
-install -d %{buildroot}%{catalogue}
+%__rm -rf %{buildroot}
 
+# font
+%__install -d -m 0755 %{buildroot}%{fontdir}
 for i in batang dotum gulim hline; do
-  install -d %{buildroot}%{fontdir}-$i
-  install -p -m 0644 ttf/$i.ttf %{buildroot}%{fontdir}-$i
-  ln -sf ../../..%{fontdir}-$i %{buildroot}%{catalogue}/%{name}-$i
-  %{_bindir}/ttmkfdir -d %{buildroot}%{fontdir}-$i -o %{buildroot}%{fontdir}-$i/fonts.scale
-  mkfontdir %{buildroot}%{fontdir}-$i
+  %__install -p -m 0644 ttf/$i.ttf %{buildroot}%{fontdir}
+done
+
+# fontconfig conf
+%__install -m 0755 -d %{buildroot}%{_fontconfig_templatedir}
+%__install -m 0755 -d %{buildroot}%{_fontconfig_confdir}
+cd ../
+for fconf in `ls *-%{fontname}-*.conf`
+do
+    %__install -m 0644 $fconf %{buildroot}%{_fontconfig_templatedir}/
+    %__ln_s %{_fontconfig_templatedir}/$fconf \
+        %{buildroot}%{_fontconfig_confdir}/$fconf
 done
+cd -
 
-# for ghostscript
-install -d %{buildroot}%{cidmapdir}
-install -p -m 0644 %{SOURCE1} %{buildroot}%{cidmapdir}/
-install -p -m 0644 %{SOURCE2} %{buildroot}%{cidmapdir}/
+# fonts.{scale,dir}
+%{_bindir}/ttmkfdir -d %{buildroot}%{fontdir} \
+  -o %{buildroot}%{fontdir}/fonts.scale
+%{_bindir}/mkfontdir %{buildroot}%{fontdir}
+
+# ghostscript
+%__install -d -m 0755 %{buildroot}%{gsdir}
+%__install -p -m 0644 %{SOURCE1} %{buildroot}%{gsdir}/
+%__install -p -m 0644 %{SOURCE2} %{buildroot}%{gsdir}/
+
+# catalogue
+%__install -d %{buildroot}%{catalogue}
+%__ln_s %{fontdir} %{buildroot}%{catalogue}/%{fontname}
 
 # convert Korean copyright file to utf8
-iconv -f EUC-KR -t UTF-8 COPYRIGHT.ks > COPYRIGHT.ko
+%{_bindir}/iconv -f EUC-KR -t UTF-8 COPYRIGHT.ks > COPYRIGHT.ko
 
 %clean
-rm -rf %{buildroot}
+%__rm -rf %{buildroot}
 
 %files common
 %doc COPYRIGHT COPYRIGHT.ko README
-%{cidmapdir}/
+%{gsdir}/
 
 %changelog
+* Fri Jan 16 2009 Caius Chance <cchance at redhat.com> - 2.2-11.fc11
+- Resolves: rhbz#477332 (Include macro _font_pkg and created fontconfig .conf files.)
+
 * Fri Jan 09 2009 Caius Chance <cchance at redhat.com> - 2.2-10.fc11
 - Resolves: rhbz#477332 (Convert to new font packaging guidelines.)
 



From cweyl at fedoraproject.org  Fri Jan 16 02:45:56 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Fri, 16 Jan 2009 02:45:56 +0000 (UTC)
Subject: rpms/perl-MooseX-Types-DateTime/devel import.log, NONE,
	1.1 perl-MooseX-Types-DateTime.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090116024556.20A9570127@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-MooseX-Types-DateTime/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29825/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-MooseX-Types-DateTime.spec 
Log Message:
initial import


--- NEW FILE import.log ---
perl-MooseX-Types-DateTime-0_03-3_fc10:HEAD:perl-MooseX-Types-DateTime-0.03-3.fc10.src.rpm:1232073913


--- NEW FILE perl-MooseX-Types-DateTime.spec ---
Name:       perl-MooseX-Types-DateTime 
Version:    0.03 
Release:    3%{?dist}
# see, e.g., lib/MooseX/Types/DateTime.pm
License:    GPL+ or Artistic 
Group:      Development/Libraries
Summary:    DateTime related constraints and coercions for Moose
Source:     http://search.cpan.org/CPAN/authors/id/N/NU/NUFFIN/MooseX-Types-DateTime-%{version}.tar.gz 
Url:        http://search.cpan.org/dist/MooseX-Types-DateTime
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(DateTime) >= 0.4302
BuildRequires: perl(DateTime::Format::DateParse) >= 0.04
BuildRequires: perl(DateTime::Format::Flexible) >= 0.05
BuildRequires: perl(DateTime::Format::Natural) >= 0.71
# stupid versions... grr
#BuildRequires: perl(DateTime::Locale) >= 0.4001
BuildRequires: perl(DateTime::Locale)
BuildRequires: perl(DateTime::TimeZone) >= 0.7701
BuildRequires: perl(DateTimeX::Easy) >= 0.082
BuildRequires: perl(Moose) >= 0.41
BuildRequires: perl(MooseX::Types) >= 0.04
BuildRequires: perl(namespace::clean) >= 0.08
BuildRequires: perl(Test::More)
BuildRequires: perl(Test::Exception) >= 0.27
BuildRequires: perl(Test::use::ok) >= 0.02
BuildRequires: perl(Time::Duration::Parse) >= 0.06
# optional tests
BuildRequires: perl(DateTime::Format::DateManip)


%description
This module packages several type constraints (Moose::Util::TypeConstraints)
and coercions designed to work with the DateTime suite of objects.


%prep
%setup -q -n MooseX-Types-DateTime-%{version}

find . -type f -exec chmod -c -x {} +

%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 
%{perl_vendorlib}/*
%{_mandir}/man3/*.3*

%changelog
* Thu Jan 15 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.03-3
- add DateTime::Format::DateManip as a br

* Sat Dec 06 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.03-2
- touchup for submission

* Sat Oct 11 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.03-1
- initial RPM packaging
- generated with cpan2dist (CPANPLUS::Dist::RPM version 0.0.1)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-MooseX-Types-DateTime/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	15 Jan 2009 20:48:29 -0000	1.1
+++ .cvsignore	16 Jan 2009 02:45:25 -0000	1.2
@@ -0,0 +1 @@
+MooseX-Types-DateTime-0.03.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-MooseX-Types-DateTime/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	15 Jan 2009 20:48:29 -0000	1.1
+++ sources	16 Jan 2009 02:45:25 -0000	1.2
@@ -0,0 +1 @@
+a270e7d20c23ef23ee782563187d93c5  MooseX-Types-DateTime-0.03.tar.gz



From cweyl at fedoraproject.org  Fri Jan 16 02:46:52 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Fri, 16 Jan 2009 02:46:52 +0000 (UTC)
Subject: rpms/perl-MooseX-Types-DateTime/F-10 import.log, NONE,
	1.1 perl-MooseX-Types-DateTime.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090116024652.E4BA870127@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-MooseX-Types-DateTime/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30177/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-MooseX-Types-DateTime.spec 
Log Message:
initial import


--- NEW FILE import.log ---
perl-MooseX-Types-DateTime-0_03-3_fc10:F-10:perl-MooseX-Types-DateTime-0.03-3.fc10.src.rpm:1232073970


--- NEW FILE perl-MooseX-Types-DateTime.spec ---
Name:       perl-MooseX-Types-DateTime 
Version:    0.03 
Release:    3%{?dist}
# see, e.g., lib/MooseX/Types/DateTime.pm
License:    GPL+ or Artistic 
Group:      Development/Libraries
Summary:    DateTime related constraints and coercions for Moose
Source:     http://search.cpan.org/CPAN/authors/id/N/NU/NUFFIN/MooseX-Types-DateTime-%{version}.tar.gz 
Url:        http://search.cpan.org/dist/MooseX-Types-DateTime
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(DateTime) >= 0.4302
BuildRequires: perl(DateTime::Format::DateParse) >= 0.04
BuildRequires: perl(DateTime::Format::Flexible) >= 0.05
BuildRequires: perl(DateTime::Format::Natural) >= 0.71
# stupid versions... grr
#BuildRequires: perl(DateTime::Locale) >= 0.4001
BuildRequires: perl(DateTime::Locale)
BuildRequires: perl(DateTime::TimeZone) >= 0.7701
BuildRequires: perl(DateTimeX::Easy) >= 0.082
BuildRequires: perl(Moose) >= 0.41
BuildRequires: perl(MooseX::Types) >= 0.04
BuildRequires: perl(namespace::clean) >= 0.08
BuildRequires: perl(Test::More)
BuildRequires: perl(Test::Exception) >= 0.27
BuildRequires: perl(Test::use::ok) >= 0.02
BuildRequires: perl(Time::Duration::Parse) >= 0.06
# optional tests
BuildRequires: perl(DateTime::Format::DateManip)


%description
This module packages several type constraints (Moose::Util::TypeConstraints)
and coercions designed to work with the DateTime suite of objects.


%prep
%setup -q -n MooseX-Types-DateTime-%{version}

find . -type f -exec chmod -c -x {} +

%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 
%{perl_vendorlib}/*
%{_mandir}/man3/*.3*

%changelog
* Thu Jan 15 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.03-3
- add DateTime::Format::DateManip as a br

* Sat Dec 06 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.03-2
- touchup for submission

* Sat Oct 11 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.03-1
- initial RPM packaging
- generated with cpan2dist (CPANPLUS::Dist::RPM version 0.0.1)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-MooseX-Types-DateTime/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	15 Jan 2009 20:48:29 -0000	1.1
+++ .cvsignore	16 Jan 2009 02:46:22 -0000	1.2
@@ -0,0 +1 @@
+MooseX-Types-DateTime-0.03.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-MooseX-Types-DateTime/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	15 Jan 2009 20:48:29 -0000	1.1
+++ sources	16 Jan 2009 02:46:22 -0000	1.2
@@ -0,0 +1 @@
+a270e7d20c23ef23ee782563187d93c5  MooseX-Types-DateTime-0.03.tar.gz



From cweyl at fedoraproject.org  Fri Jan 16 02:47:47 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Fri, 16 Jan 2009 02:47:47 +0000 (UTC)
Subject: rpms/perl-MooseX-Types-DateTime/F-9 import.log, NONE,
	1.1 perl-MooseX-Types-DateTime.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090116024747.9827370127@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-MooseX-Types-DateTime/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30448/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-MooseX-Types-DateTime.spec 
Log Message:
initial import


--- NEW FILE import.log ---
perl-MooseX-Types-DateTime-0_03-3_fc10:F-9:perl-MooseX-Types-DateTime-0.03-3.fc10.src.rpm:1232074026


--- NEW FILE perl-MooseX-Types-DateTime.spec ---
Name:       perl-MooseX-Types-DateTime 
Version:    0.03 
Release:    3%{?dist}
# see, e.g., lib/MooseX/Types/DateTime.pm
License:    GPL+ or Artistic 
Group:      Development/Libraries
Summary:    DateTime related constraints and coercions for Moose
Source:     http://search.cpan.org/CPAN/authors/id/N/NU/NUFFIN/MooseX-Types-DateTime-%{version}.tar.gz 
Url:        http://search.cpan.org/dist/MooseX-Types-DateTime
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(DateTime) >= 0.4302
BuildRequires: perl(DateTime::Format::DateParse) >= 0.04
BuildRequires: perl(DateTime::Format::Flexible) >= 0.05
BuildRequires: perl(DateTime::Format::Natural) >= 0.71
# stupid versions... grr
#BuildRequires: perl(DateTime::Locale) >= 0.4001
BuildRequires: perl(DateTime::Locale)
BuildRequires: perl(DateTime::TimeZone) >= 0.7701
BuildRequires: perl(DateTimeX::Easy) >= 0.082
BuildRequires: perl(Moose) >= 0.41
BuildRequires: perl(MooseX::Types) >= 0.04
BuildRequires: perl(namespace::clean) >= 0.08
BuildRequires: perl(Test::More)
BuildRequires: perl(Test::Exception) >= 0.27
BuildRequires: perl(Test::use::ok) >= 0.02
BuildRequires: perl(Time::Duration::Parse) >= 0.06
# optional tests
BuildRequires: perl(DateTime::Format::DateManip)


%description
This module packages several type constraints (Moose::Util::TypeConstraints)
and coercions designed to work with the DateTime suite of objects.


%prep
%setup -q -n MooseX-Types-DateTime-%{version}

find . -type f -exec chmod -c -x {} +

%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 
%{perl_vendorlib}/*
%{_mandir}/man3/*.3*

%changelog
* Thu Jan 15 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.03-3
- add DateTime::Format::DateManip as a br

* Sat Dec 06 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.03-2
- touchup for submission

* Sat Oct 11 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.03-1
- initial RPM packaging
- generated with cpan2dist (CPANPLUS::Dist::RPM version 0.0.1)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-MooseX-Types-DateTime/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	15 Jan 2009 20:48:29 -0000	1.1
+++ .cvsignore	16 Jan 2009 02:47:17 -0000	1.2
@@ -0,0 +1 @@
+MooseX-Types-DateTime-0.03.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-MooseX-Types-DateTime/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	15 Jan 2009 20:48:29 -0000	1.1
+++ sources	16 Jan 2009 02:47:17 -0000	1.2
@@ -0,0 +1 @@
+a270e7d20c23ef23ee782563187d93c5  MooseX-Types-DateTime-0.03.tar.gz



From rakesh at fedoraproject.org  Fri Jan 16 02:52:09 2009
From: rakesh at fedoraproject.org (Rakesh Pandit)
Date: Fri, 16 Jan 2009 02:52:09 +0000 (UTC)
Subject: rpms/nebula/F-10 .cvsignore, 1.2, 1.3 import.log, 1.1,
	1.2 nebula.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20090116025209.CF53F70127@cvs1.fedora.phx.redhat.com>

Author: rakesh

Update of /cvs/pkgs/rpms/nebula/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30900/F-10

Modified Files:
	.cvsignore import.log nebula.spec sources 
Log Message:
Update to 0.2.3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/nebula/F-10/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2008 04:26:13 -0000	1.2
+++ .cvsignore	16 Jan 2009 02:51:39 -0000	1.3
@@ -1 +1 @@
-nebula-0.2.2.tar.gz
+nebula-0.2.3.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/nebula/F-10/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	8 Nov 2008 04:26:13 -0000	1.1
+++ import.log	16 Jan 2009 02:51:39 -0000	1.2
@@ -1 +1,2 @@
 nebula-0_2_2-5_fc10:F-10:nebula-0.2.2-5.fc10.src.rpm:1226137891
+nebula-0_2_3-1_fc10:F-10:nebula-0.2.3-1.fc10.src.rpm:1232028490


Index: nebula.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nebula/F-10/nebula.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nebula.spec	8 Nov 2008 04:26:13 -0000	1.1
+++ nebula.spec	16 Jan 2009 02:51:39 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           nebula
-Version:        0.2.2
-Release:        5%{?dist}
+Version:        0.2.3
+Release:        1%{?dist}
 Summary:        Intrusion signature generator
 
 Group:          Applications/System
@@ -37,6 +37,9 @@
 %{_bindir}/nebulaclient
 
 %changelog
+* Fri Jan 16 2009 Rakesh Pandit <rakesh at fedoraproject.org> - 0.2.3-6
+- Updated to 0.2.3
+
 * Fri Nov 07 2008 Rakesh Pandit <rakesh at fedoraproject.org> - 0.2.2-5
 - fixed Buildrequires
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nebula/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2008 04:26:13 -0000	1.2
+++ sources	16 Jan 2009 02:51:39 -0000	1.3
@@ -1 +1 @@
-9d388753e6bf14c9811a92a586ce8cfa  nebula-0.2.2.tar.gz
+06eabd66634e7969203465fb94900f18  nebula-0.2.3.tar.gz



From rakesh at fedoraproject.org  Fri Jan 16 02:52:22 2009
From: rakesh at fedoraproject.org (Rakesh Pandit)
Date: Fri, 16 Jan 2009 02:52:22 +0000 (UTC)
Subject: rpms/nebula/F-9 .cvsignore, 1.2, 1.3 import.log, 1.1,
	1.2 nebula.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20090116025222.B747270127@cvs1.fedora.phx.redhat.com>

Author: rakesh

Update of /cvs/pkgs/rpms/nebula/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30882/F-9

Modified Files:
	.cvsignore import.log nebula.spec sources 
Log Message:
Update to 0.2.3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/nebula/F-9/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2008 04:26:03 -0000	1.2
+++ .cvsignore	16 Jan 2009 02:51:52 -0000	1.3
@@ -1 +1 @@
-nebula-0.2.2.tar.gz
+nebula-0.2.3.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/nebula/F-9/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	8 Nov 2008 04:26:03 -0000	1.1
+++ import.log	16 Jan 2009 02:51:52 -0000	1.2
@@ -1 +1,2 @@
 nebula-0_2_2-5_fc10:F-9:nebula-0.2.2-5.fc10.src.rpm:1226137860
+nebula-0_2_3-1_fc10:F-9:nebula-0.2.3-1.fc10.src.rpm:1232028476


Index: nebula.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nebula/F-9/nebula.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nebula.spec	8 Nov 2008 04:26:03 -0000	1.1
+++ nebula.spec	16 Jan 2009 02:51:52 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           nebula
-Version:        0.2.2
-Release:        5%{?dist}
+Version:        0.2.3
+Release:        1%{?dist}
 Summary:        Intrusion signature generator
 
 Group:          Applications/System
@@ -37,6 +37,9 @@
 %{_bindir}/nebulaclient
 
 %changelog
+* Fri Jan 16 2009 Rakesh Pandit <rakesh at fedoraproject.org> - 0.2.3-6
+- Updated to 0.2.3
+
 * Fri Nov 07 2008 Rakesh Pandit <rakesh at fedoraproject.org> - 0.2.2-5
 - fixed Buildrequires
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nebula/F-9/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2008 04:26:03 -0000	1.2
+++ sources	16 Jan 2009 02:51:52 -0000	1.3
@@ -1 +1 @@
-9d388753e6bf14c9811a92a586ce8cfa  nebula-0.2.2.tar.gz
+06eabd66634e7969203465fb94900f18  nebula-0.2.3.tar.gz



From petersen at fedoraproject.org  Fri Jan 16 02:52:49 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Fri, 16 Jan 2009 02:52:49 +0000 (UTC)
Subject: rpms/darcs/devel .cvsignore, 1.13, 1.14 darcs.spec, 1.41,
	1.42 sources, 1.13, 1.14
Message-ID: <20090116025249.A3BD470127@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/darcs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30980

Modified Files:
	.cvsignore darcs.spec sources 
Log Message:
- update to 2.2.0
- update install targets




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/darcs/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	10 Dec 2008 05:08:23 -0000	1.13
+++ .cvsignore	16 Jan 2009 02:52:19 -0000	1.14
@@ -1 +1 @@
-darcs-2.1.2.tar.gz
+darcs-2.2.0.tar.gz


Index: darcs.spec
===================================================================
RCS file: /cvs/extras/rpms/darcs/devel/darcs.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- darcs.spec	10 Dec 2008 05:08:23 -0000	1.41
+++ darcs.spec	16 Jan 2009 02:52:19 -0000	1.42
@@ -1,7 +1,7 @@
 #%%define alphatag rc2
 
 Name:           darcs
-Version:        2.1.2
+Version:        2.2.0
 Release:        1%{?alphatag:.%{alphatag}}%{?dist}
 Summary:        David's advanced revision control system
 
@@ -74,7 +74,7 @@
 
 
 %build
-%{__autoconf}
+#%%{__autoconf}
 %configure --libexecdir=%{_localstatedir}/www
 make all
 
@@ -92,7 +92,7 @@
     iconv --from-code ISO8859-1 --to-code UTF-8 --output $textfile $textfile.old
     rm -fv $textfile.old
 done 
-make DESTDIR=$RPM_BUILD_ROOT installbin installserver installdocs
+make DESTDIR=$RPM_BUILD_ROOT install installserver install-html
 
 
 %clean
@@ -125,8 +125,11 @@
 %{_datadir}/darcs
 
 
-
 %changelog
+* Fri Jan 16 2009 Jens Petersen <petersen at redhat.com> - 2.2.0-1
+- update to 2.2.0
+- update install targets
+
 * Wed Dec 10 2008 Jens Petersen <petersen at redhat.com> - 2.1.2-1
 - update to 2.1.2
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/darcs/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	10 Dec 2008 05:08:23 -0000	1.13
+++ sources	16 Jan 2009 02:52:19 -0000	1.14
@@ -1 +1 @@
-f0b5e4c5f52b0f79a594f6a4e7cd673c  darcs-2.1.2.tar.gz
+8f0a5eba5971e7cf324c63664cde59e2  darcs-2.2.0.tar.gz



From rakesh at fedoraproject.org  Fri Jan 16 02:57:56 2009
From: rakesh at fedoraproject.org (Rakesh Pandit)
Date: Fri, 16 Jan 2009 02:57:56 +0000 (UTC)
Subject: rpms/python-durus/devel import.log, NONE, 1.1 .cvsignore, 1.9,
	1.10 python-durus.spec, 1.20, 1.21 sources, 1.9, 1.10
Message-ID: <20090116025756.A6E9070127@cvs1.fedora.phx.redhat.com>

Author: rakesh

Update of /cvs/pkgs/rpms/python-durus/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32297/devel

Modified Files:
	.cvsignore python-durus.spec sources 
Added Files:
	import.log 
Log Message:
Updated to 3.8



--- NEW FILE import.log ---
python-durus-3_8-1_fc10:HEAD:python-durus-3.8-1.fc10.src.rpm:1232031414


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-durus/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	17 Aug 2006 17:29:37 -0000	1.9
+++ .cvsignore	16 Jan 2009 02:57:26 -0000	1.10
@@ -1 +1 @@
-Durus-3.5.tar.gz
+Durus-3.8.tar.gz


Index: python-durus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-durus/devel/python-durus.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- python-durus.spec	30 Nov 2008 00:53:24 -0000	1.20
+++ python-durus.spec	16 Jan 2009 02:57:26 -0000	1.21
@@ -3,8 +3,8 @@
 %define srcname Durus
 
 Name:           python-durus
-Version:        3.5
-Release:        8%{?dist}
+Version:        3.8
+Release:        1%{?dist}
 Summary:        A Python Object Database
 
 Group:          Development/Libraries
@@ -54,6 +54,9 @@
 %{_bindir}/durus
 
 %changelog
+* Fri Jan 16 2009 Rakesh Pandit <rakesh at fedoraproject.org> - 3.8-1
+- Updated to 3.8
+
 * Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 3.5-8
 - Fix locations for Python 2.6
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-durus/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	17 Aug 2006 17:29:37 -0000	1.9
+++ sources	16 Jan 2009 02:57:26 -0000	1.10
@@ -1 +1 @@
-d110e05a75df8b0b79919d577441f33d  Durus-3.5.tar.gz
+75018ffc6682d09e5e0cdad065efa00a  Durus-3.8.tar.gz



From dp67 at fedoraproject.org  Fri Jan 16 02:59:55 2009
From: dp67 at fedoraproject.org (Randy Berry)
Date: Fri, 16 Jan 2009 02:59:55 +0000 (UTC)
Subject: rpms/xwxapt/F-10 xwxapt.desktop, NONE, 1.1 xwxapt.png, NONE,
	1.1 xwxapt.sh.in, NONE, 1.1 xwxapt.spec, NONE, 1.1
Message-ID: <20090116025955.38DC970127@cvs1.fedora.phx.redhat.com>

Author: dp67

Update of /cvs/pkgs/rpms/xwxapt/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32575

Added Files:
	xwxapt.desktop xwxapt.png xwxapt.sh.in xwxapt.spec 
Log Message:

F-10 build



--- NEW FILE xwxapt.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=xwxapt
GenericName=xwxapt
Comment=GTK+ graphical application for decoding and saving weather images
Exec=xwxapt
Icon=xwxapt.png
Terminal=false
Type=Application
Categories=HamRadio;
Version=1.0


--- NEW FILE xwxapt.sh.in ---
#!/bin/sh
#Wrapper script for xwxapt to ensure that user configuration is present
xwxaptbin="/usr/libexec/xwxapt-bin"
#check if user configuration is present
if [ ! -e ~/xwxapt/xwxaptrc ]
then
echo "Creating user configuration file"
mkdir ~/xwxapt
mkdir ~/xwxapt/images
mkdir ~/xwxapt/record
cp /usr/share/xwxapt/xwxaptrc ~/xwxapt/xwxaptrc
fi
#launch xwxapt
echo "Configuration can be found in the xwxapt/xwxaptrc file in your users home directory"
$xwxaptbin


--- NEW FILE xwxapt.spec ---
Name:           xwxapt
Version:        1.2
Release:        1%{?dist}
Summary:        GTK+ graphical application for decoding and saving weather images

Group:          Applications/Communications
License:        GPLv2+
URL:            http://5b4az.chronos.org.uk/pages/apt.html
Source0:        http://5b4az.chronos.org.uk/pkg/apt/xwxapt/%{name}-%{version}.tar.gz
#add .desktop file
Source1:        %{name}.desktop
#temporary Icon
Source2:        %{name}.png
#Wrapper script for user config
Source3:        %{name}.sh.in
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  automake, autoconf, gtk2-devel, desktop-file-utils
#Requires:       

%description
xwxapt is a GTK+ graphical version of wxapt. It uses the same decoding
engine as wxapt but it displays APT images at half-size as they are
received, storing the full-sized files when reception is completed. 

It also displays some status information (audio level, sync level,
sync status etc) and text messages as it runs.

%prep
%setup -qn %{name}


%build
./autogen.sh
%configure
make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" 


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

#install default user configuration file
install -p -D -m 0644 $RPM_BUILD_DIR/%{name}/xwxapt/xwxaptrc $RPM_BUILD_ROOT%{_datadir}/%{name}/xwxaptrc

#move original binary to libexecdir
mkdir -p $RPM_BUILD_ROOT%{_libexecdir}/
mv $RPM_BUILD_ROOT%{_bindir}/%{name} $RPM_BUILD_ROOT%{_libexecdir}/%{name}-bin

#install wrapper script 
install -p -D -m 0755 %{SOURCE3} $RPM_BUILD_ROOT%{_bindir}/xwxapt


# no upstream .desktop or icon yet so we'll use a temporary one
mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/pixmaps/
cp %{SOURCE2} ${RPM_BUILD_ROOT}%{_datadir}/pixmaps/%{name}.png
desktop-file-install  \
        --dir=${RPM_BUILD_ROOT}%{_datadir}/applications %{SOURCE1}
# --vendor="fedora" obsolete per new guidelines

%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc AUTHORS README
%doc doc/xwxapt.html
%{_bindir}/*
%{_libexecdir}/*
%{_datadir}/%{name}
%{_datadir}/pixmaps/%{name}.png
%{_datadir}/applications/*%{name}.desktop



%changelog
* Wed Jan 14 2009 Randall J. Berry 'Dp67' <dp67 at fedoraproject.org> 1.2-1
- Upstream upgrade to 1.2
- Mock build f9/f10/devel
- check rpmlint 3 packages and 1 specfiles checked; 0 errors, 0 warnings.
- submit for review


* Mon Jan 12 2009 Randall J. Berry 'Dp67' <dp67 at fedoraproject.org> 1.1-2
- Mock build f9/f10/devel
- check rpmlint


* Sun Sep 21 2008 Randall J. Berry 'Dp67' <dp67 at fedoraproject.org> 1.1-1
- Upstream upgrade to 1.1
- Build test for f9

* Sun Mar 02 2008 Sindre Pedersen Bjordal <sindrepb at fedoraproject.org> - 0.9-1
- Initial build



From dp67 at fedoraproject.org  Fri Jan 16 03:07:45 2009
From: dp67 at fedoraproject.org (Randy Berry)
Date: Fri, 16 Jan 2009 03:07:45 +0000 (UTC)
Subject: rpms/xwxapt/F-10 sources,1.1,1.2
Message-ID: <20090116030745.75CE470127@cvs1.fedora.phx.redhat.com>

Author: dp67

Update of /cvs/pkgs/rpms/xwxapt/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv766

Modified Files:
	sources 
Log Message:

Build 2



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xwxapt/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	15 Jan 2009 20:43:32 -0000	1.1
+++ sources	16 Jan 2009 03:07:15 -0000	1.2
@@ -0,0 +1 @@
+c2ffcd25fc79a64266e52c558d96521f  xwxapt-1.2.tar.gz



From dp67 at fedoraproject.org  Fri Jan 16 03:12:24 2009
From: dp67 at fedoraproject.org (Randy Berry)
Date: Fri, 16 Jan 2009 03:12:24 +0000 (UTC)
Subject: rpms/wxapt/devel import.log, NONE, 1.1 wxapt.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090116031224.8E92470127@cvs1.fedora.phx.redhat.com>

Author: dp67

Update of /cvs/pkgs/rpms/wxapt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1182/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log wxapt.spec 
Log Message:

import wxapt-1.3-3 source



--- NEW FILE import.log ---
wxapt-1_3-2_fc10:HEAD:wxapt-1.3-2.fc10.src.rpm:1232075409


--- NEW FILE wxapt.spec ---
Name:           wxapt
Version:        1.3
Release:        2%{?dist}
Summary:        Console application for decoding and saving weather images

Group:          Applications/Communications
License:        GPLv2+
URL:            http://5b4az.chronos.org.uk/pages/apt.html
Source0:        http://5b4az.chronos.org.uk/pkg/apt/wxapt/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  ncurses-devel
#Requires:       

%description
wxapt is a console application for decoding and saving weather images
transmitted in the APT format of NOAA and METEOR satellites.

%prep
%setup -qn %{name}


%build
make CFLAGS="%{optflags}" %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
#skip make install and do manual install, it's just one file
install -D -m 0755 wxapt $RPM_BUILD_ROOT%{_bindir}/%{name}
#skip .desktop file as this is a command line application

%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc AUTHORS README
%{_bindir}/*


%changelog
* Wed Jan 14 2009 Randall J. Berry 'Dp67' <dp67 at fedoraproject.org> 1.3-2
- mock build F9/10/devel
- rpmlint 3 packages and 1 specfiles checked; 0 errors, 0 warnings.
- Submit for review

* Sun Sep 21 2008 Randall J. Berry 'Dp67' <dp67 at fedoraproject.org> 1.3-1
- Build test for f9

* Sun Mar 02 2008 Sindre Pedersen Bjordal <sindrepb at fedoraproject.org> - 1.3-1
- Initial build


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/wxapt/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	15 Jan 2009 20:45:58 -0000	1.1
+++ .cvsignore	16 Jan 2009 03:11:54 -0000	1.2
@@ -0,0 +1 @@
+wxapt-1.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/wxapt/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	15 Jan 2009 20:45:58 -0000	1.1
+++ sources	16 Jan 2009 03:11:54 -0000	1.2
@@ -0,0 +1 @@
+04bc342743af558cd7f95c62ce4a84bc  wxapt-1.3.tar.gz



From mclasen at fedoraproject.org  Fri Jan 16 03:13:27 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Fri, 16 Jan 2009 03:13:27 +0000 (UTC)
Subject: rpms/libgtop2/F-10 .cvsignore, 1.47, 1.48 libgtop2.spec, 1.68,
	1.69 sources, 1.47, 1.48
Message-ID: <20090116031327.98B0D70127@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/libgtop2/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1377

Modified Files:
	.cvsignore libgtop2.spec sources 
Log Message:
2.24.3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libgtop2/F-10/.cvsignore,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- .cvsignore	23 Sep 2008 15:48:43 -0000	1.47
+++ .cvsignore	16 Jan 2009 03:12:57 -0000	1.48
@@ -1 +1 @@
-libgtop-2.24.0.tar.bz2
+libgtop-2.24.3.tar.bz2


Index: libgtop2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libgtop2/F-10/libgtop2.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- libgtop2.spec	10 Nov 2008 02:14:38 -0000	1.68
+++ libgtop2.spec	16 Jan 2009 03:12:57 -0000	1.69
@@ -6,8 +6,8 @@
 
 Name:		libgtop2
 Summary:        libgtop library (version 2)
-Version: 	2.24.0
-Release: 	2%{?dist}
+Version: 	2.24.3
+Release: 	1%{?dist}
 License: 	GPLv2+
 URL:            http://download.gnome.org/sources/libgtop/2.24
 Group:          System Environment/Libraries
@@ -21,8 +21,6 @@
 BuildRequires:  automake 
 BuildRequires:  gtk-doc
 
-Patch0: read-cpuinfo-completely.patch
-
 %description
 libgtop is a library for portably obtaining information about processes, 
 such as their PID, memory usage, etc.
@@ -41,7 +39,6 @@
 
 %prep
 %setup -q -n libgtop-%{version}
-%patch0 -p1 -b .read-cpuinfo-completely
 
 %build
 %configure --disable-gtk-doc --disable-static
@@ -78,6 +75,9 @@
 %exclude %{_datadir}/info
 
 %changelog
+* Thu Jan 15 2009 Matthias Clasen <mclasen at redhat.com> - 2.24.3-1
+- Update to 2.24.3
+
 * Sun Nov  9 2008 Matthias Clasen <mclasen at redhat.com> - 2.24.0-2
 - Read /proc/cpuinfo completely (#467455)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libgtop2/F-10/sources,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- sources	23 Sep 2008 15:48:43 -0000	1.47
+++ sources	16 Jan 2009 03:12:57 -0000	1.48
@@ -1 +1 @@
-f0e3584b9157d3425184a9e21e3ac482  libgtop-2.24.0.tar.bz2
+051de81fd37d33e7abee828fd4c12cba  libgtop-2.24.3.tar.bz2



From orion at fedoraproject.org  Fri Jan 16 03:14:56 2009
From: orion at fedoraproject.org (Orion Poplawski)
Date: Fri, 16 Jan 2009 03:14:56 +0000 (UTC)
Subject: rpms/gridengine/devel bootstrap,1.1,1.2 gridengine.spec,1.9,1.10
Message-ID: <20090116031456.8998E70127@cvs1.fedora.phx.redhat.com>

Author: orion

Update of /cvs/pkgs/rpms/gridengine/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1608

Modified Files:
	bootstrap gridengine.spec 
Log Message:
* Thu Jan 15 2008 - Orion Poplawski <orion at cora.nwra.com> - 6.2u1-2
- Rebuild with openssl-0.9.8j



Index: bootstrap
===================================================================
RCS file: /cvs/pkgs/rpms/gridengine/devel/bootstrap,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- bootstrap	8 Feb 2008 21:57:23 -0000	1.1
+++ bootstrap	16 Jan 2009 03:14:26 -0000	1.2
@@ -9,3 +9,4 @@
 binary_path             /usr/share/gridengine/bin
 qmaster_spool_dir       /var/spool/gridengine/default/qmaster
 security_mode           none
+scheduler_threads       1


Index: gridengine.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gridengine/devel/gridengine.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- gridengine.spec	18 Dec 2008 23:37:14 -0000	1.9
+++ gridengine.spec	16 Jan 2009 03:14:26 -0000	1.10
@@ -6,7 +6,7 @@
 
 Name:    gridengine
 Version: 6.2u1
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: Grid Engine - Distributed Computing Management software
 
 Group:   Applications/System
@@ -524,6 +524,9 @@
 
 
 %changelog
+* Thu Jan 15 2008 - Orion Poplawski <orion at cora.nwra.com> - 6.2u1-2
+- Rebuild with openssl-0.9.8j
+
 * Thu Dec 18 2008 - Orion Poplawski <orion at cora.nwra.com> - 6.2u1-1
 - Update to 6.2u1
 



From mclasen at fedoraproject.org  Fri Jan 16 03:16:29 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Fri, 16 Jan 2009 03:16:29 +0000 (UTC)
Subject: rpms/gtksourceview2/F-10 .cvsignore, 1.19, 1.20 gtksourceview2.spec,
	1.21, 1.22 sources, 1.19, 1.20
Message-ID: <20090116031629.3E44970127@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gtksourceview2/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1814

Modified Files:
	.cvsignore gtksourceview2.spec sources 
Log Message:
2.4.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gtksourceview2/F-10/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- .cvsignore	22 Sep 2008 03:17:50 -0000	1.19
+++ .cvsignore	16 Jan 2009 03:15:58 -0000	1.20
@@ -1 +1 @@
-gtksourceview-2.4.0.tar.bz2
+gtksourceview-2.4.2.tar.bz2


Index: gtksourceview2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtksourceview2/F-10/gtksourceview2.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- gtksourceview2.spec	22 Sep 2008 03:17:50 -0000	1.21
+++ gtksourceview2.spec	16 Jan 2009 03:15:58 -0000	1.22
@@ -5,7 +5,7 @@
 
 Summary: A library for viewing source files
 Name: gtksourceview2
-Version: 2.4.0
+Version: 2.4.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
+* Thu Jan 15 2009 Matthias Clasen <mclasen at redhat.com> - 2.4.2-1
+- Update to 2.4.2
+
 * Sun Sep 21 2008 Matthias Clasen <mclasen at redhat.com> - 2.4.0-1
 - Update to 2.4.0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gtksourceview2/F-10/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources	22 Sep 2008 03:17:50 -0000	1.19
+++ sources	16 Jan 2009 03:15:58 -0000	1.20
@@ -1 +1 @@
-e27588c897cd3a49d81b85466aec817f  gtksourceview-2.4.0.tar.bz2
+aece5dcb1e2e7ca1855f95eb48f30443  gtksourceview-2.4.2.tar.bz2



From orion at fedoraproject.org  Fri Jan 16 03:17:23 2009
From: orion at fedoraproject.org (Orion Poplawski)
Date: Fri, 16 Jan 2009 03:17:23 +0000 (UTC)
Subject: rpms/gridengine/devel gridengine.spec,1.10,1.11
Message-ID: <20090116031723.20BFD70127@cvs1.fedora.phx.redhat.com>

Author: orion

Update of /cvs/pkgs/rpms/gridengine/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1882

Modified Files:
	gridengine.spec 
Log Message:
Happy New Year!



Index: gridengine.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gridengine/devel/gridengine.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- gridengine.spec	16 Jan 2009 03:14:26 -0000	1.10
+++ gridengine.spec	16 Jan 2009 03:16:52 -0000	1.11
@@ -524,7 +524,7 @@
 
 
 %changelog
-* Thu Jan 15 2008 - Orion Poplawski <orion at cora.nwra.com> - 6.2u1-2
+* Thu Jan 15 2009 - Orion Poplawski <orion at cora.nwra.com> - 6.2u1-2
 - Rebuild with openssl-0.9.8j
 
 * Thu Dec 18 2008 - Orion Poplawski <orion at cora.nwra.com> - 6.2u1-1



From dp67 at fedoraproject.org  Fri Jan 16 03:27:52 2009
From: dp67 at fedoraproject.org (Randy Berry)
Date: Fri, 16 Jan 2009 03:27:52 +0000 (UTC)
Subject: rpms/xwxapt/F-9 xwxapt.desktop, NONE, 1.1 xwxapt.png, NONE,
	1.1 xwxapt.sh.in, NONE, 1.1 xwxapt.spec, NONE, 1.1 sources, 1.1, 1.2
Message-ID: <20090116032752.C19D370127@cvs1.fedora.phx.redhat.com>

Author: dp67

Update of /cvs/pkgs/rpms/xwxapt/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3328

Modified Files:
	sources 
Added Files:
	xwxapt.desktop xwxapt.png xwxapt.sh.in xwxapt.spec 
Log Message:

First build for xwxapt F-9



--- NEW FILE xwxapt.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=xwxapt
GenericName=xwxapt
Comment=GTK+ graphical application for decoding and saving weather images
Exec=xwxapt
Icon=xwxapt.png
Terminal=false
Type=Application
Categories=HamRadio;
Version=1.0


--- NEW FILE xwxapt.sh.in ---
#!/bin/sh
#Wrapper script for xwxapt to ensure that user configuration is present
xwxaptbin="/usr/libexec/xwxapt-bin"
#check if user configuration is present
if [ ! -e ~/xwxapt/xwxaptrc ]
then
echo "Creating user configuration file"
mkdir ~/xwxapt
mkdir ~/xwxapt/images
mkdir ~/xwxapt/record
cp /usr/share/xwxapt/xwxaptrc ~/xwxapt/xwxaptrc
fi
#launch xwxapt
echo "Configuration can be found in the xwxapt/xwxaptrc file in your users home directory"
$xwxaptbin


--- NEW FILE xwxapt.spec ---
Name:           xwxapt
Version:        1.2
Release:        1%{?dist}
Summary:        GTK+ graphical application for decoding and saving weather images

Group:          Applications/Communications
License:        GPLv2+
URL:            http://5b4az.chronos.org.uk/pages/apt.html
Source0:        http://5b4az.chronos.org.uk/pkg/apt/xwxapt/%{name}-%{version}.tar.gz
#add .desktop file
Source1:        %{name}.desktop
#temporary Icon
Source2:        %{name}.png
#Wrapper script for user config
Source3:        %{name}.sh.in
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  automake, autoconf, gtk2-devel, desktop-file-utils
#Requires:       

%description
xwxapt is a GTK+ graphical version of wxapt. It uses the same decoding
engine as wxapt but it displays APT images at half-size as they are
received, storing the full-sized files when reception is completed. 

It also displays some status information (audio level, sync level,
sync status etc) and text messages as it runs.

%prep
%setup -qn %{name}


%build
./autogen.sh
%configure
make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" 


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

#install default user configuration file
install -p -D -m 0644 $RPM_BUILD_DIR/%{name}/xwxapt/xwxaptrc $RPM_BUILD_ROOT%{_datadir}/%{name}/xwxaptrc

#move original binary to libexecdir
mkdir -p $RPM_BUILD_ROOT%{_libexecdir}/
mv $RPM_BUILD_ROOT%{_bindir}/%{name} $RPM_BUILD_ROOT%{_libexecdir}/%{name}-bin

#install wrapper script 
install -p -D -m 0755 %{SOURCE3} $RPM_BUILD_ROOT%{_bindir}/xwxapt


# no upstream .desktop or icon yet so we'll use a temporary one
mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/pixmaps/
cp %{SOURCE2} ${RPM_BUILD_ROOT}%{_datadir}/pixmaps/%{name}.png
desktop-file-install  \
        --dir=${RPM_BUILD_ROOT}%{_datadir}/applications %{SOURCE1}
# --vendor="fedora" obsolete per new guidelines

%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc AUTHORS README
%doc doc/xwxapt.html
%{_bindir}/*
%{_libexecdir}/*
%{_datadir}/%{name}
%{_datadir}/pixmaps/%{name}.png
%{_datadir}/applications/*%{name}.desktop



%changelog
* Wed Jan 14 2009 Randall J. Berry 'Dp67' <dp67 at fedoraproject.org> 1.2-1
- Upstream upgrade to 1.2
- Mock build f9/f10/devel
- check rpmlint 3 packages and 1 specfiles checked; 0 errors, 0 warnings.
- submit for review


* Mon Jan 12 2009 Randall J. Berry 'Dp67' <dp67 at fedoraproject.org> 1.1-2
- Mock build f9/f10/devel
- check rpmlint


* Sun Sep 21 2008 Randall J. Berry 'Dp67' <dp67 at fedoraproject.org> 1.1-1
- Upstream upgrade to 1.1
- Build test for f9

* Sun Mar 02 2008 Sindre Pedersen Bjordal <sindrepb at fedoraproject.org> - 0.9-1
- Initial build


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xwxapt/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	15 Jan 2009 20:43:32 -0000	1.1
+++ sources	16 Jan 2009 03:27:22 -0000	1.2
@@ -0,0 +1 @@
+c2ffcd25fc79a64266e52c558d96521f  xwxapt-1.2.tar.gz



From mclasen at fedoraproject.org  Fri Jan 16 03:31:17 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Fri, 16 Jan 2009 03:31:17 +0000 (UTC)
Subject: rpms/cheese/F-10 .cvsignore, 1.20, 1.21 cheese.spec, 1.40,
	1.41 sources, 1.20, 1.21
Message-ID: <20090116033117.8A6CA70127@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/cheese/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3561

Modified Files:
	.cvsignore cheese.spec sources 
Log Message:
2.24.3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cheese/F-10/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- .cvsignore	25 Nov 2008 18:11:07 -0000	1.20
+++ .cvsignore	16 Jan 2009 03:30:47 -0000	1.21
@@ -1 +1 @@
-cheese-2.24.2.tar.bz2
+cheese-2.24.3.tar.bz2


Index: cheese.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cheese/F-10/cheese.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- cheese.spec	25 Nov 2008 18:11:08 -0000	1.40
+++ cheese.spec	16 Jan 2009 03:30:47 -0000	1.41
@@ -1,5 +1,5 @@
 Name:           cheese
-Version:        2.24.2
+Version:        2.24.3
 Release:        1%{?dist}
 Summary:        A webcam application for snapshots and movies
 
@@ -126,6 +126,9 @@
 %{_datadir}/dbus-1/services/org.gnome.Cheese.service
 
 %changelog
+* Thu Jan 15 2009 Matthias Clasen  <mclasen at redhat.com> 2.24.3-1
+- Update to 2.24.3
+
 * Tue Nov 25 2008 Matthias Clasen  <mclasen at redhat.com> 2.24.2-1
 - Update to 2.24.2
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cheese/F-10/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources	25 Nov 2008 18:11:08 -0000	1.20
+++ sources	16 Jan 2009 03:30:47 -0000	1.21
@@ -1 +1 @@
-82de87c881c45e6ef965b71fdad21bda  cheese-2.24.2.tar.bz2
+833d580c2dd2f1b9a0702b6e5c864e2a  cheese-2.24.3.tar.bz2



From mclasen at fedoraproject.org  Fri Jan 16 03:42:40 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Fri, 16 Jan 2009 03:42:40 +0000 (UTC)
Subject: rpms/orca/F-10 .cvsignore, 1.42, 1.43 orca.spec, 1.68, 1.69 sources,
	1.43, 1.44
Message-ID: <20090116034240.E7D9670127@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/orca/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4293

Modified Files:
	.cvsignore orca.spec sources 
Log Message:
2.24.3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/orca/F-10/.cvsignore,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- .cvsignore	25 Nov 2008 17:25:34 -0000	1.42
+++ .cvsignore	16 Jan 2009 03:42:10 -0000	1.43
@@ -1 +1 @@
-orca-2.24.2.tar.bz2
+orca-2.24.3.tar.bz2


Index: orca.spec
===================================================================
RCS file: /cvs/pkgs/rpms/orca/F-10/orca.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- orca.spec	25 Nov 2008 17:25:34 -0000	1.68
+++ orca.spec	16 Jan 2009 03:42:10 -0000	1.69
@@ -17,7 +17,7 @@
 %define control_center_version 2.16.0-5
 
 Name:		orca
-Version:	2.24.2
+Version:	2.24.3
 Release: 	1%{?dist}
 Summary:	Flexible, extensible, and powerful assistive technology
 
@@ -107,6 +107,9 @@
 
 
 %changelog
+* Thu Jan 15 2008 Matthias Clasen <mclasen at redhat.com> - 2.24.3-1
+- Update to 2.24.3
+
 * Tue Nov 25 2008 Matthias Clasen <mclasen at redhat.com> - 2.24.2-1
 - Update to 2.24.2
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/orca/F-10/sources,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- sources	25 Nov 2008 17:25:34 -0000	1.43
+++ sources	16 Jan 2009 03:42:10 -0000	1.44
@@ -1 +1 @@
-2235902841d39b46168c30a160f7afe2  orca-2.24.2.tar.bz2
+81db050e727bff5b1408bad9c3ed205e  orca-2.24.3.tar.bz2



From dp67 at fedoraproject.org  Fri Jan 16 03:51:08 2009
From: dp67 at fedoraproject.org (Randy Berry)
Date: Fri, 16 Jan 2009 03:51:08 +0000 (UTC)
Subject: rpms/wxapt/devel wxapt.makefile.patch, NONE, 1.1 import.log, 1.1,
	1.2 wxapt.spec, 1.1, 1.2
Message-ID: <20090116035109.052EC70127@cvs1.fedora.phx.redhat.com>

Author: dp67

Update of /cvs/pkgs/rpms/wxapt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4730/devel

Modified Files:
	import.log wxapt.spec 
Added Files:
	wxapt.makefile.patch 
Log Message:

Import wxapt-1.3-3



wxapt.makefile.patch:

--- NEW FILE wxapt.makefile.patch ---
diff -up wxapt/Makefile.orig wxapt/Makefile
--- wxapt/Makefile.orig	2007-11-23 02:18:31.000000000 -0500
+++ wxapt/Makefile	2009-01-14 10:29:28.000000000 -0500
@@ -2,10 +2,12 @@
 
 SHELL   = /bin/sh
 PROJECT = wxapt
-BINDIR  = /usr/local/bin
-DOCDIR  = /usr/local/share/doc/
+BINDIR  = /usr/bin
+DOCDIR  = /usr/share/doc/
 CC      = gcc -Wall -O2 -march=native
 
+DESTDIR= 
+
 objects = image.o sound.o wxapt.o
 
 $(PROJECT) : $(objects)
@@ -14,13 +16,10 @@ $(PROJECT) : $(objects)
 $(objects) : $(PROJECT).h
 
 install : $(PROJECT)
-	install -m 755 --strip $(PROJECT) $(BINDIR)
-	install -m 644 doc/$(PROJECT).html $(DOCDIR)
-
+	install -D -m 755 $(PROJECT) $(DESTDIR)$(BINDIR)/$(PROJECT)
 uninstall :
-	rm $(BINDIR)/$(PROJECT)
-	rm $(DOCDIR)/$(PROJECT).html
-
+	rm $(DESTDIR)$(BINDIR)/$(PROJECT)
+	rm $(DESTDIR)$(DOCDIR)/$(PROJECT).html
 clean :
 	rm -f *.o *~
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/wxapt/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	16 Jan 2009 03:11:54 -0000	1.1
+++ import.log	16 Jan 2009 03:50:38 -0000	1.2
@@ -1 +1,2 @@
 wxapt-1_3-2_fc10:HEAD:wxapt-1.3-2.fc10.src.rpm:1232075409
+wxapt-1_3-3_fc10:HEAD:wxapt-1.3-3.fc10.src.rpm:1232077758


Index: wxapt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wxapt/devel/wxapt.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- wxapt.spec	16 Jan 2009 03:11:54 -0000	1.1
+++ wxapt.spec	16 Jan 2009 03:50:38 -0000	1.2
@@ -1,16 +1,19 @@
 Name:           wxapt
 Version:        1.3
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Console application for decoding and saving weather images
 
 Group:          Applications/Communications
 License:        GPLv2+
 URL:            http://5b4az.chronos.org.uk/pages/apt.html
 Source0:        http://5b4az.chronos.org.uk/pkg/apt/wxapt/%{name}-%{version}.tar.gz
+Patch0:		wxapt.makefile.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  ncurses-devel
-#Requires:       
+#Requires:   
+#ExcludeArch:	PPC
+#ExcludeArch:	PPC64    
 
 %description
 wxapt is a console application for decoding and saving weather images
@@ -18,7 +21,9 @@
 
 %prep
 %setup -qn %{name}
-
+%patch0 -p1 -b makefile.patch
+#fix CFLAG from upstream
+sed -i -e 's/-march=native//g' Makefile
 
 %build
 make CFLAGS="%{optflags}" %{?_smp_mflags}
@@ -40,6 +45,10 @@
 
 
 %changelog
+* Wed Jan 14 2009 Randall J. Berry 'Dp67' <dp67 at fedoraproject.org> 1.3-3
+- Makefile patch change dir from /usr/local to /usr
+- Build for ppc and ppc64 previously failed
+
 * Wed Jan 14 2009 Randall J. Berry 'Dp67' <dp67 at fedoraproject.org> 1.3-2
 - mock build F9/10/devel
 - rpmlint 3 packages and 1 specfiles checked; 0 errors, 0 warnings.



From mclasen at fedoraproject.org  Fri Jan 16 03:53:47 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Fri, 16 Jan 2009 03:53:47 +0000 (UTC)
Subject: rpms/orca/F-10 orca.spec,1.69,1.70
Message-ID: <20090116035347.90E7270127@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/orca/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4479

Modified Files:
	orca.spec 
Log Message:
2.24.3



Index: orca.spec
===================================================================
RCS file: /cvs/pkgs/rpms/orca/F-10/orca.spec,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- orca.spec	16 Jan 2009 03:42:10 -0000	1.69
+++ orca.spec	16 Jan 2009 03:53:17 -0000	1.70
@@ -107,7 +107,7 @@
 
 
 %changelog
-* Thu Jan 15 2008 Matthias Clasen <mclasen at redhat.com> - 2.24.3-1
+* Thu Jan 15 2009 Matthias Clasen <mclasen at redhat.com> - 2.24.3-1
 - Update to 2.24.3
 
 * Tue Nov 25 2008 Matthias Clasen <mclasen at redhat.com> - 2.24.2-1



From dp67 at fedoraproject.org  Fri Jan 16 04:00:49 2009
From: dp67 at fedoraproject.org (Randy Berry)
Date: Fri, 16 Jan 2009 04:00:49 +0000 (UTC)
Subject: rpms/wxapt/F-9 wxapt.makefile.patch, NONE, 1.1 wxapt.spec, NONE,
	1.1 sources, 1.1, 1.2
Message-ID: <20090116040049.182C570127@cvs1.fedora.phx.redhat.com>

Author: dp67

Update of /cvs/pkgs/rpms/wxapt/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6012

Modified Files:
	sources 
Added Files:
	wxapt.makefile.patch wxapt.spec 
Log Message:

Second build f-9


wxapt.makefile.patch:

--- NEW FILE wxapt.makefile.patch ---
diff -up wxapt/Makefile.orig wxapt/Makefile
--- wxapt/Makefile.orig	2007-11-23 02:18:31.000000000 -0500
+++ wxapt/Makefile	2009-01-14 10:29:28.000000000 -0500
@@ -2,10 +2,12 @@
 
 SHELL   = /bin/sh
 PROJECT = wxapt
-BINDIR  = /usr/local/bin
-DOCDIR  = /usr/local/share/doc/
+BINDIR  = /usr/bin
+DOCDIR  = /usr/share/doc/
 CC      = gcc -Wall -O2 -march=native
 
+DESTDIR= 
+
 objects = image.o sound.o wxapt.o
 
 $(PROJECT) : $(objects)
@@ -14,13 +16,10 @@ $(PROJECT) : $(objects)
 $(objects) : $(PROJECT).h
 
 install : $(PROJECT)
-	install -m 755 --strip $(PROJECT) $(BINDIR)
-	install -m 644 doc/$(PROJECT).html $(DOCDIR)
-
+	install -D -m 755 $(PROJECT) $(DESTDIR)$(BINDIR)/$(PROJECT)
 uninstall :
-	rm $(BINDIR)/$(PROJECT)
-	rm $(DOCDIR)/$(PROJECT).html
-
+	rm $(DESTDIR)$(BINDIR)/$(PROJECT)
+	rm $(DESTDIR)$(DOCDIR)/$(PROJECT).html
 clean :
 	rm -f *.o *~
 


--- NEW FILE wxapt.spec ---
Name:           wxapt
Version:        1.3
Release:        3%{?dist}
Summary:        Console application for decoding and saving weather images

Group:          Applications/Communications
License:        GPLv2+
URL:            http://5b4az.chronos.org.uk/pages/apt.html
Source0:        http://5b4az.chronos.org.uk/pkg/apt/wxapt/%{name}-%{version}.tar.gz
Patch0:		wxapt.makefile.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  ncurses-devel
#Requires:   
#ExcludeArch:	PPC
#ExcludeArch:	PPC64    

%description
wxapt is a console application for decoding and saving weather images
transmitted in the APT format of NOAA and METEOR satellites.

%prep
%setup -qn %{name}
%patch0 -p1 -b makefile.patch
#fix CFLAG from upstream
sed -i -e 's/-march=native//g' Makefile

%build
make CFLAGS="%{optflags}" %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
#skip make install and do manual install, it's just one file
install -D -m 0755 wxapt $RPM_BUILD_ROOT%{_bindir}/%{name}
#skip .desktop file as this is a command line application

%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc AUTHORS README
%{_bindir}/*


%changelog
* Wed Jan 14 2009 Randall J. Berry 'Dp67' <dp67 at fedoraproject.org> 1.3-3
- Makefile patch change dir from /usr/local to /usr
- Build for ppc and ppc64 previously failed

* Wed Jan 14 2009 Randall J. Berry 'Dp67' <dp67 at fedoraproject.org> 1.3-2
- mock build F9/10/devel
- rpmlint 3 packages and 1 specfiles checked; 0 errors, 0 warnings.
- Submit for review

* Sun Sep 21 2008 Randall J. Berry 'Dp67' <dp67 at fedoraproject.org> 1.3-1
- Build test for f9

* Sun Mar 02 2008 Sindre Pedersen Bjordal <sindrepb at fedoraproject.org> - 1.3-1
- Initial build


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/wxapt/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	15 Jan 2009 20:45:58 -0000	1.1
+++ sources	16 Jan 2009 04:00:18 -0000	1.2
@@ -0,0 +1 @@
+04bc342743af558cd7f95c62ce4a84bc  wxapt-1.3.tar.gz



From dp67 at fedoraproject.org  Fri Jan 16 04:04:04 2009
From: dp67 at fedoraproject.org (Randy Berry)
Date: Fri, 16 Jan 2009 04:04:04 +0000 (UTC)
Subject: rpms/wxapt/F-10 wxapt.makefile.patch, NONE, 1.1 wxapt.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090116040404.B51B270127@cvs1.fedora.phx.redhat.com>

Author: dp67

Update of /cvs/pkgs/rpms/wxapt/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6372

Modified Files:
	.cvsignore sources 
Added Files:
	wxapt.makefile.patch wxapt.spec 
Log Message:

Second build F10


wxapt.makefile.patch:

--- NEW FILE wxapt.makefile.patch ---
diff -up wxapt/Makefile.orig wxapt/Makefile
--- wxapt/Makefile.orig	2007-11-23 02:18:31.000000000 -0500
+++ wxapt/Makefile	2009-01-14 10:29:28.000000000 -0500
@@ -2,10 +2,12 @@
 
 SHELL   = /bin/sh
 PROJECT = wxapt
-BINDIR  = /usr/local/bin
-DOCDIR  = /usr/local/share/doc/
+BINDIR  = /usr/bin
+DOCDIR  = /usr/share/doc/
 CC      = gcc -Wall -O2 -march=native
 
+DESTDIR= 
+
 objects = image.o sound.o wxapt.o
 
 $(PROJECT) : $(objects)
@@ -14,13 +16,10 @@ $(PROJECT) : $(objects)
 $(objects) : $(PROJECT).h
 
 install : $(PROJECT)
-	install -m 755 --strip $(PROJECT) $(BINDIR)
-	install -m 644 doc/$(PROJECT).html $(DOCDIR)
-
+	install -D -m 755 $(PROJECT) $(DESTDIR)$(BINDIR)/$(PROJECT)
 uninstall :
-	rm $(BINDIR)/$(PROJECT)
-	rm $(DOCDIR)/$(PROJECT).html
-
+	rm $(DESTDIR)$(BINDIR)/$(PROJECT)
+	rm $(DESTDIR)$(DOCDIR)/$(PROJECT).html
 clean :
 	rm -f *.o *~
 


--- NEW FILE wxapt.spec ---
Name:           wxapt
Version:        1.3
Release:        3%{?dist}
Summary:        Console application for decoding and saving weather images

Group:          Applications/Communications
License:        GPLv2+
URL:            http://5b4az.chronos.org.uk/pages/apt.html
Source0:        http://5b4az.chronos.org.uk/pkg/apt/wxapt/%{name}-%{version}.tar.gz
Patch0:		wxapt.makefile.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  ncurses-devel
#Requires:   
#ExcludeArch:	PPC
#ExcludeArch:	PPC64    

%description
wxapt is a console application for decoding and saving weather images
transmitted in the APT format of NOAA and METEOR satellites.

%prep
%setup -qn %{name}
%patch0 -p1 -b makefile.patch
#fix CFLAG from upstream
sed -i -e 's/-march=native//g' Makefile

%build
make CFLAGS="%{optflags}" %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
#skip make install and do manual install, it's just one file
install -D -m 0755 wxapt $RPM_BUILD_ROOT%{_bindir}/%{name}
#skip .desktop file as this is a command line application

%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc AUTHORS README
%{_bindir}/*


%changelog
* Wed Jan 14 2009 Randall J. Berry 'Dp67' <dp67 at fedoraproject.org> 1.3-3
- Makefile patch change dir from /usr/local to /usr
- Build for ppc and ppc64 previously failed

* Wed Jan 14 2009 Randall J. Berry 'Dp67' <dp67 at fedoraproject.org> 1.3-2
- mock build F9/10/devel
- rpmlint 3 packages and 1 specfiles checked; 0 errors, 0 warnings.
- Submit for review

* Sun Sep 21 2008 Randall J. Berry 'Dp67' <dp67 at fedoraproject.org> 1.3-1
- Build test for f9

* Sun Mar 02 2008 Sindre Pedersen Bjordal <sindrepb at fedoraproject.org> - 1.3-1
- Initial build


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/wxapt/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	15 Jan 2009 20:45:58 -0000	1.1
+++ .cvsignore	16 Jan 2009 04:03:34 -0000	1.2
@@ -0,0 +1 @@
+wxapt-1.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/wxapt/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	15 Jan 2009 20:45:58 -0000	1.1
+++ sources	16 Jan 2009 04:03:34 -0000	1.2
@@ -0,0 +1 @@
+04bc342743af558cd7f95c62ce4a84bc  wxapt-1.3.tar.gz



From cchance at fedoraproject.org  Fri Jan 16 04:19:12 2009
From: cchance at fedoraproject.org (Caius Chance)
Date: Fri, 16 Jan 2009 04:19:12 +0000 (UTC)
Subject: rpms/baekmuk-ttf-fonts/devel baekmuk-ttf-fonts.spec,1.7,1.8
Message-ID: <20090116041912.C4FBD70127@cvs1.fedora.phx.redhat.com>

Author: cchance

Update of /cvs/pkgs/rpms/baekmuk-ttf-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7496

Modified Files:
	baekmuk-ttf-fonts.spec 
Log Message:
* Fri Jan 16 2009 Caius Chance <cchance at redhat.com> - 2.2-12.fc11
- Resolves: rhbz#477332 (Repatched buildsys error.)




Index: baekmuk-ttf-fonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/baekmuk-ttf-fonts/devel/baekmuk-ttf-fonts.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- baekmuk-ttf-fonts.spec	16 Jan 2009 02:42:55 -0000	1.7
+++ baekmuk-ttf-fonts.spec	16 Jan 2009 04:18:42 -0000	1.8
@@ -9,7 +9,7 @@
 
 Name:           %{fontname}-fonts
 Version:        2.2
-Release:        11%{?dist}
+Release:        12%{?dist}
 Summary:        Free Korean TrueType fonts
 
 Group:          User Interface/X
@@ -135,11 +135,11 @@
 %__install -m 0755 -d %{buildroot}%{_fontconfig_templatedir}
 %__install -m 0755 -d %{buildroot}%{_fontconfig_confdir}
 cd ../
-for fconf in `ls *-%{fontname}-*.conf`
+for fconf in %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE6}
 do
     %__install -m 0644 $fconf %{buildroot}%{_fontconfig_templatedir}/
-    %__ln_s %{_fontconfig_templatedir}/$fconf \
-        %{buildroot}%{_fontconfig_confdir}/$fconf
+    %__ln_s %{_fontconfig_templatedir}/`basename $fconf` \
+        %{buildroot}%{_fontconfig_confdir}/`basename $fconf`
 done
 cd -
 
@@ -168,11 +168,14 @@
 %{gsdir}/
 
 %changelog
+* Fri Jan 16 2009 Caius Chance <cchance at redhat.com> - 2.2-12.fc11
+- Resolves: rhbz#477332 (Repatched buildsys error.)
+
 * Fri Jan 16 2009 Caius Chance <cchance at redhat.com> - 2.2-11.fc11
-- Resolves: rhbz#477332 (Include macro _font_pkg and created fontconfig .conf files.)
+- Resolves: rhbz#477332 (Included macro _font_pkg and created fontconfig .conf files.)
 
 * Fri Jan 09 2009 Caius Chance <cchance at redhat.com> - 2.2-10.fc11
-- Resolves: rhbz#477332 (Convert to new font packaging guidelines.)
+- Resolves: rhbz#477332 (Converted to new font packaging guidelines.)
 
 * Mon Jun 30 2008 Caius Chance <cchance at redhat.com> - 2.2-9.fc10
 - Refine obsoletes tag version-release specific.



From mclasen at fedoraproject.org  Fri Jan 16 04:28:00 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Fri, 16 Jan 2009 04:28:00 +0000 (UTC)
Subject: rpms/mousetweaks/F-10 .cvsignore, 1.13, 1.14 mousetweaks.spec, 1.18,
	1.19 sources, 1.13, 1.14
Message-ID: <20090116042800.424F270127@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/mousetweaks/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8795

Modified Files:
	.cvsignore mousetweaks.spec sources 
Log Message:
2.24.3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mousetweaks/F-10/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	25 Nov 2008 16:06:45 -0000	1.13
+++ .cvsignore	16 Jan 2009 04:27:29 -0000	1.14
@@ -1 +1 @@
-mousetweaks-2.24.2.tar.bz2
+mousetweaks-2.24.3.tar.bz2


Index: mousetweaks.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mousetweaks/F-10/mousetweaks.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- mousetweaks.spec	25 Nov 2008 16:06:45 -0000	1.18
+++ mousetweaks.spec	16 Jan 2009 04:27:29 -0000	1.19
@@ -1,5 +1,5 @@
 Name:		mousetweaks
-Version:	2.24.2
+Version:	2.24.3
 Release:	1%{?dist}
 Summary:	Mouse accessibility support for the GNOME desktop
 Group:		User Interface/Desktops
@@ -109,6 +109,9 @@
 %doc %{_mandir}/man1/*
 
 %changelog
+* Thu Jan 15 2009 Matthias Clasen <mclasen at redhat.com> - 2.24.3-1
+- Update to 2.24.3
+
 * Tue Nov 25 2008 Matthias Clasen <mclasen at redhat.com> - 2.24.2-1
 - Update to 2.24.2
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mousetweaks/F-10/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	25 Nov 2008 16:06:45 -0000	1.13
+++ sources	16 Jan 2009 04:27:29 -0000	1.14
@@ -1 +1 @@
-1361c2171ca2025adf60c54ea211287c  mousetweaks-2.24.2.tar.bz2
+de428acfdbf671007c23d0a18f0a9f96  mousetweaks-2.24.3.tar.bz2



From rakesh at fedoraproject.org  Fri Jan 16 04:43:14 2009
From: rakesh at fedoraproject.org (Rakesh Pandit)
Date: Fri, 16 Jan 2009 04:43:14 +0000 (UTC)
Subject: rpms/python-durus/F-10 import.log, NONE, 1.1 .cvsignore, 1.9,
	1.10 python-durus.spec, 1.18, 1.19 sources, 1.9, 1.10
Message-ID: <20090116044314.2E20070127@cvs1.fedora.phx.redhat.com>

Author: rakesh

Update of /cvs/pkgs/rpms/python-durus/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10492/F-10

Modified Files:
	.cvsignore python-durus.spec sources 
Added Files:
	import.log 
Log Message:
Updated to 3.8



--- NEW FILE import.log ---
python-durus-3_8-1_fc10:F-10:python-durus-3.8-1.fc10.src.rpm:1232037741


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-durus/F-10/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	17 Aug 2006 17:29:37 -0000	1.9
+++ .cvsignore	16 Jan 2009 04:42:43 -0000	1.10
@@ -1 +1 @@
-Durus-3.5.tar.gz
+Durus-3.8.tar.gz


Index: python-durus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-durus/F-10/python-durus.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- python-durus.spec	16 Sep 2008 19:48:59 -0000	1.18
+++ python-durus.spec	16 Jan 2009 04:42:43 -0000	1.19
@@ -3,8 +3,8 @@
 %define srcname Durus
 
 Name:           python-durus
-Version:        3.5
-Release:        6%{?dist}
+Version:        3.8
+Release:        1%{?dist}
 Summary:        A Python Object Database
 
 Group:          Development/Libraries
@@ -54,6 +54,9 @@
 %{_bindir}/durus
 
 %changelog
+* Fri Jan 16 2009 Rakesh Pandit <rakesh at fedoraproject.org> - 3.8-1
+- Updated to 3.8
+
 * Tue Sep 16 2008 Matt Domsch <mdomsch at fedoraproject.org> - 3.5-6
 - fix FTBFS BZ#434427
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-durus/F-10/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	17 Aug 2006 17:29:37 -0000	1.9
+++ sources	16 Jan 2009 04:42:43 -0000	1.10
@@ -1 +1 @@
-d110e05a75df8b0b79919d577441f33d  Durus-3.5.tar.gz
+75018ffc6682d09e5e0cdad065efa00a  Durus-3.8.tar.gz



From mclasen at fedoraproject.org  Fri Jan 16 05:01:25 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Fri, 16 Jan 2009 05:01:25 +0000 (UTC)
Subject: rpms/gnome-games/F-10 .cvsignore, 1.88, 1.89 gnome-games.spec, 1.188,
	1.189 sources, 1.93, 1.94
Message-ID: <20090116050125.9745570127@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-games/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13227

Modified Files:
	.cvsignore gnome-games.spec sources 
Log Message:
2.24.3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-games/F-10/.cvsignore,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -r1.88 -r1.89
--- .cvsignore	25 Nov 2008 02:06:36 -0000	1.88
+++ .cvsignore	16 Jan 2009 05:00:55 -0000	1.89
@@ -1 +1 @@
-gnome-games-2.24.2.tar.bz2
+gnome-games-2.24.3.tar.bz2


Index: gnome-games.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-games/F-10/gnome-games.spec,v
retrieving revision 1.188
retrieving revision 1.189
diff -u -r1.188 -r1.189
--- gnome-games.spec	25 Nov 2008 02:06:36 -0000	1.188
+++ gnome-games.spec	16 Jan 2009 05:00:55 -0000	1.189
@@ -43,7 +43,7 @@
 
 Summary: GNOME games
 Name: gnome-games
-Version: 2.24.2
+Version: 2.24.3
 Release: 1%{?dist}
 Epoch: 1
 License: GPLv2+ and GFDL
@@ -360,6 +360,9 @@
 %{_datadir}/omf/*
 
 %changelog
+* Thu Jan 15 2009 Matthias Clasen <mclasen at redhat.com> - 1:2.24.3-1
+- Update to 2.24.3
+
 * Mon Nov 24 2008 Matthias Clasen <mclasen at redhat.com> - 1:2.24.2-1
 - Update to 2.24.2
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-games/F-10/sources,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -r1.93 -r1.94
--- sources	25 Nov 2008 02:06:36 -0000	1.93
+++ sources	16 Jan 2009 05:00:55 -0000	1.94
@@ -1 +1 @@
-ed86a6fe212fc6b6175f1ac2baca8abb  gnome-games-2.24.2.tar.bz2
+e416e2922fe119c41ec224fab97f7909  gnome-games-2.24.3.tar.bz2



From dp67 at fedoraproject.org  Fri Jan 16 05:02:20 2009
From: dp67 at fedoraproject.org (Randy Berry)
Date: Fri, 16 Jan 2009 05:02:20 +0000 (UTC)
Subject: rpms/xwxapt/F-10 .cvsignore,1.1,1.2
Message-ID: <20090116050220.94CC270127@cvs1.fedora.phx.redhat.com>

Author: dp67

Update of /cvs/pkgs/rpms/xwxapt/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13313

Modified Files:
	.cvsignore 
Log Message:

Another try for F-10



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xwxapt/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	15 Jan 2009 20:43:32 -0000	1.1
+++ .cvsignore	16 Jan 2009 05:01:50 -0000	1.2
@@ -0,0 +1 @@
+xwxapt-1.2.tar.gz



From mclasen at fedoraproject.org  Fri Jan 16 05:06:16 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Fri, 16 Jan 2009 05:06:16 +0000 (UTC)
Subject: rpms/gnome-system-monitor/devel .cvsignore, 1.72,
	1.73 gnome-system-monitor.spec, 1.131, 1.132 sources, 1.72, 1.73
Message-ID: <20090116050616.6449470127@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-system-monitor/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13895

Modified Files:
	.cvsignore gnome-system-monitor.spec sources 
Log Message:
2.24.3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-system-monitor/devel/.cvsignore,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- .cvsignore	21 Oct 2008 02:15:29 -0000	1.72
+++ .cvsignore	16 Jan 2009 05:05:46 -0000	1.73
@@ -1 +1 @@
-gnome-system-monitor-2.24.1.tar.bz2
+gnome-system-monitor-2.24.3.tar.bz2


Index: gnome-system-monitor.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-system-monitor/devel/gnome-system-monitor.spec,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -r1.131 -r1.132
--- gnome-system-monitor.spec	23 Nov 2008 08:21:41 -0000	1.131
+++ gnome-system-monitor.spec	16 Jan 2009 05:05:46 -0000	1.132
@@ -12,8 +12,8 @@
 
 Summary: Process and resource monitor
 Name: gnome-system-monitor
-Version: 2.24.1
-Release: 2%{?dist}
+Version: 2.24.3
+Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/System
 URL: http://www.gnome.org/
@@ -145,6 +145,9 @@
 
 
 %changelog
+* Fri Jan 16 2009 Matthias Clasen <mclasen at redhat.com> - 2.24.3-1
+- Update to 2.24.3
+
 * Sun Nov 23 2008 Matthias Clasen <mclasen at redhat.com> - 2.24.1-2
 - Improve description
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-system-monitor/devel/sources,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- sources	21 Oct 2008 02:15:29 -0000	1.72
+++ sources	16 Jan 2009 05:05:46 -0000	1.73
@@ -1 +1 @@
-f28977135e37a78442f5df05b796480c  gnome-system-monitor-2.24.1.tar.bz2
+be4bdef29897ff786aff38a86ea42ac0  gnome-system-monitor-2.24.3.tar.bz2



From mclasen at fedoraproject.org  Fri Jan 16 05:13:36 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Fri, 16 Jan 2009 05:13:36 +0000 (UTC)
Subject: rpms/gnome-system-monitor/F-10 gnome-system-monitor.spec, 1.130,
	1.131 sources, 1.72, 1.73
Message-ID: <20090116051336.DAE7670127@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-system-monitor/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14449

Modified Files:
	gnome-system-monitor.spec sources 
Log Message:
2.24.3



Index: gnome-system-monitor.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-system-monitor/F-10/gnome-system-monitor.spec,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -r1.130 -r1.131
--- gnome-system-monitor.spec	21 Oct 2008 02:15:29 -0000	1.130
+++ gnome-system-monitor.spec	16 Jan 2009 05:13:06 -0000	1.131
@@ -10,9 +10,9 @@
 %define polkit_version 0.7
 %define polkit_gnome_version 0.7
 
-Summary: Simple process monitor
+Summary: Process and resource monitor
 Name: gnome-system-monitor
-Version: 2.24.1
+Version: 2.24.3
 Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/System
@@ -56,7 +56,9 @@
 Requires(postun): scrollkeeper
 
 %description
-gnome-system-monitor is a simple process and system monitor.
+gnome-system-monitor allows to graphically view and manipulate the running 
+processes on your system. It also provides an overview of available resources 
+such as CPU and memory.
 
 %prep
 %setup -q
@@ -143,6 +145,12 @@
 
 
 %changelog
+* Fri Jan 16 2009 Matthias Clasen <mclasen at redhat.com> - 2.24.3-1
+- Update to 2.24.3
+
+* Sun Nov 23 2008 Matthias Clasen <mclasen at redhat.com> - 2.24.1-2
+- Improve description
+
 * Mon Oct 20 2008 Matthias Clasen <mclasen at redhat.com> - 2.24.1-1
 - Update to 2.24.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-system-monitor/F-10/sources,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- sources	21 Oct 2008 02:15:29 -0000	1.72
+++ sources	16 Jan 2009 05:13:06 -0000	1.73
@@ -1 +1 @@
-f28977135e37a78442f5df05b796480c  gnome-system-monitor-2.24.1.tar.bz2
+be4bdef29897ff786aff38a86ea42ac0  gnome-system-monitor-2.24.3.tar.bz2



From deji at fedoraproject.org  Fri Jan 16 05:14:15 2009
From: deji at fedoraproject.org (Deji Akingunola)
Date: Fri, 16 Jan 2009 05:14:15 +0000 (UTC)
Subject: rpms/suitesparse/devel suitesparse.spec,1.10,1.11
Message-ID: <20090116051415.BBAB570127@cvs1.fedora.phx.redhat.com>

Author: deji

Update of /cvs/pkgs/rpms/suitesparse/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14559

Modified Files:
	suitesparse.spec 
Log Message:
* Fri Jan 16 2009 Deji Akingunola <dakingun at gmail.com> - 3.2.0-5
- More fixes for the undefined symbol issue (BZ #475411)



Index: suitesparse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/suitesparse/devel/suitesparse.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- suitesparse.spec	21 Dec 2008 04:00:02 -0000	1.10
+++ suitesparse.spec	16 Jan 2009 05:13:45 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           suitesparse
 Version:        3.2.0
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        A collection of sparse matrix libraries
 
 Group:          System Environment/Libraries
@@ -108,7 +108,7 @@
   popd
   pushd ../Lib
     gcc -shared -Wl,-soname,libamd.so.%{amd_version_major} -o \
-        libamd.so.%{amd_version} ../AMD/Lib/*.o
+        libamd.so.%{amd_version} ../AMD/Lib/*.o -lm
     ln -sf libamd.so.%{amd_version} libamd.so.%{amd_version_major}
     ln -sf libamd.so.%{amd_version} libamd.so
     cp -p ../AMD/Lib/*.a ./
@@ -139,7 +139,7 @@
   popd
   pushd ../Lib
     gcc -shared -Wl,-soname,libcamd.so.%{camd_version_major} -o \
-        libcamd.so.%{camd_version} ../CAMD/Lib/*.o
+        libcamd.so.%{camd_version} ../CAMD/Lib/*.o -lm
     ln -sf libcamd.so.%{camd_version} libcamd.so.%{camd_version_major}
     ln -sf libcamd.so.%{camd_version} libcamd.so
     cp -p ../CAMD/Lib/*.a ./
@@ -155,7 +155,7 @@
   popd
   pushd ../Lib
     gcc -shared -Wl,-soname,libccolamd.so.%{ccolamd_version_major} -o \
-        libccolamd.so.%{ccolamd_version} ../CCOLAMD/Lib/*.o
+        libccolamd.so.%{ccolamd_version} ../CCOLAMD/Lib/*.o -lm
     ln -sf libccolamd.so.%{ccolamd_version} libccolamd.so.%{ccolamd_version_major}
     ln -sf libccolamd.so.%{ccolamd_version} libccolamd.so
     cp -p ../CCOLAMD/Lib/*.a ./
@@ -170,7 +170,7 @@
   popd
   pushd ../Lib
     gcc -shared -Wl,-soname,libcolamd.so.%{colamd_version_major} -o \
-        libcolamd.so.%{colamd_version} ../COLAMD/Lib/*.o
+        libcolamd.so.%{colamd_version} ../COLAMD/Lib/*.o -lm
     ln -sf libcolamd.so.%{colamd_version} libcolamd.so.%{colamd_version_major}
     ln -sf libcolamd.so.%{colamd_version} libcolamd.so
     cp -p ../COLAMD/Lib/*.a ./
@@ -191,7 +191,7 @@
   pushd ../Lib
     gcc -shared -Wl,-soname,libcholmod.so.%{cholmod_version_major} -o \
         libcholmod.so.%{cholmod_version} ../CHOLMOD/Lib/*.o \
-        -L%{_libdir}/atlas -lcblas -lclapack libamd.so.%{amd_version_major} \
+        -L%{_libdir}/atlas -lcblas -llapack libamd.so.%{amd_version_major} \
         libcamd.so.%{camd_version_major} libcolamd.so.%{colamd_version_major} \
         libccolamd.so.%{ccolamd_version_major} -lm
     ln -sf libcholmod.so.%{cholmod_version} libcholmod.so.%{cholmod_version_major}
@@ -216,7 +216,7 @@
   popd
   pushd ../Lib
     gcc -shared -Wl,-soname,libcsparse.so.%{csparse_version_major} -o \
-        libcsparse.so.%{csparse_version} ../CSparse/Source/*.o
+        libcsparse.so.%{csparse_version} ../CSparse/Source/*.o -lm
     ln -sf libcsparse.so.%{csparse_version} libcsparse.so.%{csparse_version_major}
     ln -sf libcsparse.so.%{csparse_version} libcsparse.so
     cp -p ../CSparse/Source/*.a ./
@@ -232,7 +232,7 @@
   popd
   pushd ../Lib
     gcc -shared -Wl,-soname,libcxsparse.so.%{cxsparse_version_major} -o \
-        libcxsparse.so.%{cxsparse_version} ../CXSparse/Lib/*.o
+        libcxsparse.so.%{cxsparse_version} ../CXSparse/Lib/*.o -lm
     ln -sf libcxsparse.so.%{cxsparse_version} libcxsparse.so.%{cxsparse_version_major}
     ln -sf libcxsparse.so.%{cxsparse_version} libcxsparse.so
     cp -p ../CXSparse/Lib/*.a ./
@@ -283,7 +283,7 @@
   pushd ../Lib
     gcc -shared -Wl,-soname,libumfpack.so.%{umfpack_version_major} -o \
         libumfpack.so.%{umfpack_version} ../UMFPACK/Lib/*.o \
-        -L%{_libdir}/atlas -lcblas libamd.so.%{amd_version_major} -lm
+        -L%{_libdir}/atlas -lcblas -llapack libamd.so.%{amd_version_major} -lm
     ln -sf libumfpack.so.%{umfpack_version} libumfpack.so.%{umfpack_version_major}
     ln -sf libumfpack.so.%{umfpack_version} libumfpack.so
     cp -p ../UMFPACK/Lib/*.a ./
@@ -298,9 +298,10 @@
     make CFLAGS="$RPM_OPT_FLAGS -DNPARTITION -fPIC"
   popd
   pushd ../Lib
-    gcc -shared -Wl,-soname,libspqr.so.%{spqr_version_major} -o \
+    g++ -shared -Wl,-soname,libspqr.so.%{spqr_version_major} -o \
         libspqr.so.%{spqr_version} ../SPQR/Lib/*.o \
-        -L%{_libdir}/atlas -lcblas -lclapack -lm
+        -L%{_libdir}/atlas -lcblas -llapack \
+        libcholmod.so.%{cholmod_version_major} -lm
     ln -sf libspqr.so.%{spqr_version} libspqr.so.%{spqr_version_major}
     ln -sf libspqr.so.%{spqr_version} libspqr.so
     cp -p ../SPQR/Lib/*.a ./
@@ -352,6 +353,9 @@
 %{_libdir}/lib*.a
 
 %changelog
+* Fri Jan 16 2009 Deji Akingunola <dakingun at gmail.com> - 3.2.0-5
+- More fixes for the undefined symbol issue (BZ #475411)
+
 * Sat Dec 20 2008 Deji Akingunola <dakingun at gmail.com> - 3.2.0-4
 - Also build SPQR
 - Further fixes for BZ #475411



From deji at fedoraproject.org  Fri Jan 16 05:21:55 2009
From: deji at fedoraproject.org (Deji Akingunola)
Date: Fri, 16 Jan 2009 05:21:55 +0000 (UTC)
Subject: rpms/gegl/F-10 .cvsignore, 1.7, 1.8 gegl.spec, 1.8, 1.9 sources, 1.7,
	1.8 gegl-missing_header.patch, 1.1, NONE
Message-ID: <20090116052155.96CC970127@cvs1.fedora.phx.redhat.com>

Author: deji

Update of /cvs/pkgs/rpms/gegl/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15319

Modified Files:
	.cvsignore gegl.spec sources 
Removed Files:
	gegl-missing_header.patch 
Log Message:
* Fri Jan 16 2009 Deji Akingunola <dakingun at gmail.com> - 0.0.22-1
- Update to version 0.0.22



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gegl/F-10/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	7 Oct 2008 14:32:06 -0000	1.7
+++ .cvsignore	16 Jan 2009 05:21:25 -0000	1.8
@@ -1 +1 @@
-gegl-0.0.20.tar.bz2
+gegl-0.0.22.tar.bz2


Index: gegl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gegl/F-10/gegl.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- gegl.spec	7 Oct 2008 14:32:06 -0000	1.8
+++ gegl.spec	16 Jan 2009 05:21:25 -0000	1.9
@@ -1,17 +1,16 @@
 Summary:	A graph based image processing framework
 Name:		gegl
-Version:	0.0.20
+Version:	0.0.22
 Release:	1%{?dist}
 # The binary is under the GPL, while the libs are under LGPL
 License:	LGPLv3+ and GPLv3+
 Group:		System Environment/Libraries
 URL:		http://www.gegl.org/
 Source0:	ftp://ftp.gtk.org/pub/gegl/0.0/%{name}-%{version}.tar.bz2
-Patch0:		gegl-missing_header.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	babl-devel gtk2-devel ruby
 BuildRequires:	libpng-devel libjpeg-devel librsvg2-devel libopenraw-devel
-BuildRequires:	perl-devel SDL-devel OpenEXR-devel lua-devel
+BuildRequires:	perl-devel SDL-devel OpenEXR-devel lua-devel libspiro-devel
 BuildRequires:	asciidoc enscript w3m graphviz pkgconfig
 
 %description
@@ -32,7 +31,6 @@
 
 %prep
 %setup -q
-%patch0 -p0
 chmod -x operations/external/ff-load.c operations/common/perlin/perlin.*
 
 %build
@@ -76,6 +74,9 @@
 %endif
 
 %changelog
+* Fri Jan 16 2009 Deji Akingunola <dakingun at gmail.com> - 0.0.22-1
+- Update to version 0.0.22
+
 * Tue Oct 07 2008 Deji Akingunola <dakingun at gmail.com> - 0.0.20-1
 - Update to latest release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gegl/F-10/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	7 Oct 2008 14:32:06 -0000	1.7
+++ sources	16 Jan 2009 05:21:25 -0000	1.8
@@ -1 +1 @@
-2e1f97ec8abd9a4a21f458b43799bff2  gegl-0.0.20.tar.bz2
+e2196c2016d16a4479e157f8fdee4162  gegl-0.0.22.tar.bz2


--- gegl-missing_header.patch DELETED ---



From mtasaka at fedoraproject.org  Fri Jan 16 05:26:29 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Fri, 16 Jan 2009 05:26:29 +0000 (UTC)
Subject: rpms/cairo-dock/devel .cvsignore, 1.99, 1.100 cairo-dock.spec, 1.134,
	1.135 sources, 1.99, 1.100
Message-ID: <20090116052629.B6FF370127@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/cairo-dock/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15872

Modified Files:
	.cvsignore cairo-dock.spec sources 
Log Message:
rev 1485


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cairo-dock/devel/.cvsignore,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -r1.99 -r1.100
--- .cvsignore	15 Jan 2009 05:15:43 -0000	1.99
+++ .cvsignore	16 Jan 2009 05:25:59 -0000	1.100
@@ -1 +1 @@
-cairo-dock-sources-svn1484_trunk.tar.bz2
+cairo-dock-sources-svn1485_trunk.tar.bz2


Index: cairo-dock.spec
===================================================================
RCS file: /cvs/extras/rpms/cairo-dock/devel/cairo-dock.spec,v
retrieving revision 1.134
retrieving revision 1.135
diff -u -r1.134 -r1.135
--- cairo-dock.spec	15 Jan 2009 06:35:44 -0000	1.134
+++ cairo-dock.spec	16 Jan 2009 05:25:59 -0000	1.135
@@ -11,7 +11,7 @@
 %undefine		betaver		
 %define		build_webkit	1
 %define		build_xfce	1
-%define		tarballver	svn1484_trunk
+%define		tarballver	svn1485_trunk
 
 %define		fedora_main_rel	3
 
@@ -638,8 +638,8 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
-* Thu Jan 15 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
-- rev 1484
+* Fri Jan 16 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- rev 1485
 
 * Thu Jan 15 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
 - rev 1484


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cairo-dock/devel/sources,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -r1.99 -r1.100
--- sources	15 Jan 2009 05:15:43 -0000	1.99
+++ sources	16 Jan 2009 05:25:59 -0000	1.100
@@ -1 +1 @@
-bd46efc450092532e05bc923cd05add9  cairo-dock-sources-svn1484_trunk.tar.bz2
+0e9aeeab1dc211acfd269fb2650eda2c  cairo-dock-sources-svn1485_trunk.tar.bz2



From deji at fedoraproject.org  Fri Jan 16 05:29:25 2009
From: deji at fedoraproject.org (Deji Akingunola)
Date: Fri, 16 Jan 2009 05:29:25 +0000 (UTC)
Subject: rpms/gegl/F-10 gegl.spec,1.9,1.10
Message-ID: <20090116052925.46AE670127@cvs1.fedora.phx.redhat.com>

Author: deji

Update of /cvs/pkgs/rpms/gegl/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16576

Modified Files:
	gegl.spec 
Log Message:
libspiro is not in F10 yet



Index: gegl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gegl/F-10/gegl.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- gegl.spec	16 Jan 2009 05:21:25 -0000	1.9
+++ gegl.spec	16 Jan 2009 05:28:54 -0000	1.10
@@ -10,7 +10,7 @@
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	babl-devel gtk2-devel ruby
 BuildRequires:	libpng-devel libjpeg-devel librsvg2-devel libopenraw-devel
-BuildRequires:	perl-devel SDL-devel OpenEXR-devel lua-devel libspiro-devel
+BuildRequires:	perl-devel SDL-devel OpenEXR-devel lua-devel
 BuildRequires:	asciidoc enscript w3m graphviz pkgconfig
 
 %description



From mclasen at fedoraproject.org  Fri Jan 16 05:38:09 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Fri, 16 Jan 2009 05:38:09 +0000 (UTC)
Subject: rpms/gnome-desktop/F-10 .cvsignore, 1.74, 1.75 gnome-desktop.spec, 
	1.184, 1.185 sources, 1.74, 1.75
Message-ID: <20090116053809.E04C970127@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-desktop/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17716

Modified Files:
	.cvsignore gnome-desktop.spec sources 
Log Message:
2.24.3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-desktop/F-10/.cvsignore,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- .cvsignore	25 Nov 2008 19:35:54 -0000	1.74
+++ .cvsignore	16 Jan 2009 05:37:39 -0000	1.75
@@ -1 +1 @@
-gnome-desktop-2.24.2.tar.bz2
+gnome-desktop-2.24.3.tar.bz2


Index: gnome-desktop.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-desktop/F-10/gnome-desktop.spec,v
retrieving revision 1.184
retrieving revision 1.185
diff -u -r1.184 -r1.185
--- gnome-desktop.spec	25 Nov 2008 19:35:54 -0000	1.184
+++ gnome-desktop.spec	16 Jan 2009 05:37:39 -0000	1.185
@@ -11,7 +11,7 @@
 
 Summary: Package containing code shared among gnome-panel, gnome-session, nautilus, etc
 Name: gnome-desktop
-Version: 2.24.2
+Version: 2.24.3
 Release: 1%{?dist}
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/gnome-desktop/2.24/%{name}-%{version}.tar.bz2
@@ -129,6 +129,9 @@
 %doc %{_datadir}/gtk-doc/html/gnome-desktop/
 
 %changelog
+* Fri Jan 16 2009 Matthias Clasen <mclasen at redhat.com> - 2.24.3-1
+- Update to 2.24.3
+
 * Tue Nov 25 2008 Matthias Clasen <mclasen at redhat.com> - 2.24.2-1
 - Update to 2.24.2
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-desktop/F-10/sources,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- sources	25 Nov 2008 19:35:54 -0000	1.74
+++ sources	16 Jan 2009 05:37:39 -0000	1.75
@@ -1 +1 @@
-57fd1002efdb8c24f72255cfe1bc497e  gnome-desktop-2.24.2.tar.bz2
+27579963a56d1d35a22e30c21666a500  gnome-desktop-2.24.3.tar.bz2



From behdad at fedoraproject.org  Fri Jan 16 05:45:26 2009
From: behdad at fedoraproject.org (Behdad Esfahbod)
Date: Fri, 16 Jan 2009 05:45:26 +0000 (UTC)
Subject: rpms/fontconfig/devel .cvsignore, 1.30, 1.31 fontconfig.spec, 1.109,
	1.110 sources, 1.31, 1.32
Message-ID: <20090116054526.9E3D370127@cvs1.fedora.phx.redhat.com>

Author: behdad

Update of /cvs/pkgs/rpms/fontconfig/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18376

Modified Files:
	.cvsignore fontconfig.spec sources 
Log Message:
* Fri Jan 16 2008 Behdad Esfahbod <besfahbo at redhat.com> - 2.6.90-1.git.63.g6bb4b9a
- Update to 2.6.90-1.git.63.g6bb4b9a



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fontconfig/devel/.cvsignore,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- .cvsignore	1 Jun 2008 03:48:56 -0000	1.30
+++ .cvsignore	16 Jan 2009 05:44:55 -0000	1.31
@@ -1 +1 @@
-fontconfig-2.6.0.tar.gz
+fontconfig-2.6.90.tar.gz


Index: fontconfig.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fontconfig/devel/fontconfig.spec,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -r1.109 -r1.110
--- fontconfig.spec	20 Oct 2008 22:58:41 -0000	1.109
+++ fontconfig.spec	16 Jan 2009 05:44:55 -0000	1.110
@@ -2,8 +2,8 @@
 
 Summary: Font configuration and customization library
 Name: fontconfig
-Version: 2.6.0
-Release: 3%{?dist}
+Version: 2.6.90
+Release: 1.git.63.g6bb4b9a%{?dist}
 License: MIT
 Group: System Environment/Libraries
 Source: http://fontconfig.org/release/fontconfig-%{version}.tar.gz
@@ -132,6 +132,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Fri Jan 16 2008 Behdad Esfahbod <besfahbo at redhat.com> - 2.6.90-1.git.63.g6bb4b9a
+- Update to 2.6.90-1.git.63.g6bb4b9a
+
 * Mon Oct 20 2008 Behdad Esfahbod <besfahbo at redhat.com> - 2.6.0-3
 - Add fontconfig-2.6.0-indic.patch
 - Resolves: #464470


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fontconfig/devel/sources,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- sources	1 Jun 2008 03:48:56 -0000	1.31
+++ sources	16 Jan 2009 05:44:55 -0000	1.32
@@ -1 +1 @@
-ab54ec1d4ddd836313fdbc0cd5299d6d  fontconfig-2.6.0.tar.gz
+c907dd0ebec0e95ddae1f5f65b1ada4e  fontconfig-2.6.90.tar.gz



From behdad at fedoraproject.org  Fri Jan 16 05:46:51 2009
From: behdad at fedoraproject.org (Behdad Esfahbod)
Date: Fri, 16 Jan 2009 05:46:51 +0000 (UTC)
Subject: rpms/fontconfig/devel fontconfig.spec,1.110,1.111
Message-ID: <20090116054651.4528570127@cvs1.fedora.phx.redhat.com>

Author: behdad

Update of /cvs/pkgs/rpms/fontconfig/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18569

Modified Files:
	fontconfig.spec 
Log Message:
* Fri Jan 16 2009 Behdad Esfahbod <besfahbo at redhat.com> - 2.6.90-1.git.63.g6bb4b9a
- Update to 2.6.90-1.git.63.g6bb4b9a



Index: fontconfig.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fontconfig/devel/fontconfig.spec,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -r1.110 -r1.111
--- fontconfig.spec	16 Jan 2009 05:44:55 -0000	1.110
+++ fontconfig.spec	16 Jan 2009 05:46:20 -0000	1.111
@@ -132,7 +132,7 @@
 %{_mandir}/man3/*
 
 %changelog
-* Fri Jan 16 2008 Behdad Esfahbod <besfahbo at redhat.com> - 2.6.90-1.git.63.g6bb4b9a
+* Fri Jan 16 2009 Behdad Esfahbod <besfahbo at redhat.com> - 2.6.90-1.git.63.g6bb4b9a
 - Update to 2.6.90-1.git.63.g6bb4b9a
 
 * Mon Oct 20 2008 Behdad Esfahbod <besfahbo at redhat.com> - 2.6.0-3



From mclasen at fedoraproject.org  Fri Jan 16 05:49:36 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Fri, 16 Jan 2009 05:49:36 +0000 (UTC)
Subject: rpms/gnome-panel/F-10 .cvsignore, 1.87, 1.88 gnome-panel.spec, 1.332,
	1.333 sources, 1.90, 1.91
Message-ID: <20090116054936.2596370127@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-panel/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19016

Modified Files:
	.cvsignore gnome-panel.spec sources 
Log Message:
2.24.3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-panel/F-10/.cvsignore,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -r1.87 -r1.88
--- .cvsignore	25 Nov 2008 19:41:54 -0000	1.87
+++ .cvsignore	16 Jan 2009 05:49:05 -0000	1.88
@@ -1 +1 @@
-gnome-panel-2.24.2.tar.bz2
+gnome-panel-2.24.3.tar.bz2


Index: gnome-panel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-panel/F-10/gnome-panel.spec,v
retrieving revision 1.332
retrieving revision 1.333
diff -u -r1.332 -r1.333
--- gnome-panel.spec	25 Nov 2008 19:41:54 -0000	1.332
+++ gnome-panel.spec	16 Jan 2009 05:49:05 -0000	1.333
@@ -22,7 +22,7 @@
 
 Summary: GNOME panel
 Name: gnome-panel
-Version: 2.24.2
+Version: 2.24.3
 Release: 1%{?dist}
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/gnome-panel/2.24/%{name}-%{version}.tar.bz2
@@ -371,7 +371,10 @@
 %{_datadir}/gtk-doc/html/*
 
 %changelog
-* Tue Nov 25 2008 MAtthias Clasen <mclasen at redhat.com> - 2.24.2-1
+* Fri Jan 16 2009 Matthias Clasen <mclasen at redhat.com> - 2.24.3-1
+- Update to 2.24.3
+
+* Tue Nov 25 2008 Matthias Clasen <mclasen at redhat.com> - 2.24.2-1
 - Update to 2.24.2
 
 * Sun Nov  9 2008 Ray Strode <rstrode at redhat.com> - 2.24.1-4


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-panel/F-10/sources,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -r1.90 -r1.91
--- sources	25 Nov 2008 19:41:54 -0000	1.90
+++ sources	16 Jan 2009 05:49:05 -0000	1.91
@@ -1 +1 @@
-a8c9df673e12e72694b55c665bb739dc  gnome-panel-2.24.2.tar.bz2
+7a1ae8f3489c67708e2520823808649f  gnome-panel-2.24.3.tar.bz2



From mclasen at fedoraproject.org  Fri Jan 16 05:53:38 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Fri, 16 Jan 2009 05:53:38 +0000 (UTC)
Subject: rpms/gnome-applets/F-10 .cvsignore, 1.72, 1.73 gnome-applets.spec, 
	1.309, 1.310 sources, 1.79, 1.80
Message-ID: <20090116055338.7C2CA70127@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-applets/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19575

Modified Files:
	.cvsignore gnome-applets.spec sources 
Log Message:
2.24.3.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-applets/F-10/.cvsignore,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- .cvsignore	25 Nov 2008 06:14:47 -0000	1.72
+++ .cvsignore	16 Jan 2009 05:53:07 -0000	1.73
@@ -1 +1 @@
-gnome-applets-2.24.2.tar.bz2
+gnome-applets-2.24.3.1.tar.bz2


Index: gnome-applets.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-applets/F-10/gnome-applets.spec,v
retrieving revision 1.309
retrieving revision 1.310
diff -u -r1.309 -r1.310
--- gnome-applets.spec	25 Nov 2008 06:26:39 -0000	1.309
+++ gnome-applets.spec	16 Jan 2009 05:53:07 -0000	1.310
@@ -34,8 +34,8 @@
 
 Summary:        Small applications for the GNOME panel
 Name:		gnome-applets
-Version:	2.24.2
-Release: 	2%{?dist}
+Version:	2.24.3.1
+Release: 	1%{?dist}
 Epoch:          1
 License:	GPLv2+ and GFDL
 Group:          User Interface/Desktops
@@ -338,6 +338,9 @@
 %{_datadir}/PolicyKit/policy/org.gnome.cpufreqselector.policy
 
 %changelog
+* Fri Jan 16 2009 Matthias Clasen <mclasen at redhat.com> - 1:2.24.3.1-1
+- Update to 2.24.3.1
+
 * Tue Nov 25 2008 Matthias Clasen <mclasen at redhat.com> - 1:2.24.2-2
 - Update to 2.24.2
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-applets/F-10/sources,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- sources	25 Nov 2008 06:14:47 -0000	1.79
+++ sources	16 Jan 2009 05:53:07 -0000	1.80
@@ -1,2 +1,2 @@
-7bdfde8fd9035c41fd6d42490663c7ba  gnome-applets-2.24.2.tar.bz2
+9d60394e9feedb754838e5087ddaee97  gnome-applets-2.24.3.1.tar.bz2
 ccd89d3a58076214e2f34216388c9621  gnome-applets-2.9.3.1-modemlights.tar.bz2



From behdad at fedoraproject.org  Fri Jan 16 05:53:51 2009
From: behdad at fedoraproject.org (Behdad Esfahbod)
Date: Fri, 16 Jan 2009 05:53:51 +0000 (UTC)
Subject: rpms/fontconfig/devel fontconfig.spec, 1.111,
	1.112 fontconfig-2.6.0-indic.patch, 1.1, NONE
Message-ID: <20090116055351.7431570127@cvs1.fedora.phx.redhat.com>

Author: behdad

Update of /cvs/pkgs/rpms/fontconfig/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19537

Modified Files:
	fontconfig.spec 
Removed Files:
	fontconfig-2.6.0-indic.patch 
Log Message:
* Fri Jan 16 2009 Behdad Esfahbod <besfahbo at redhat.com> - 2.6.90-2.git.63.g6bb4b9a
- Update to 2.6.90-1.git.63.g6bb4b9a
- Remove upstreamed patch




Index: fontconfig.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fontconfig/devel/fontconfig.spec,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -r1.111 -r1.112
--- fontconfig.spec	16 Jan 2009 05:46:20 -0000	1.111
+++ fontconfig.spec	16 Jan 2009 05:53:21 -0000	1.112
@@ -3,7 +3,7 @@
 Summary: Font configuration and customization library
 Name: fontconfig
 Version: 2.6.90
-Release: 1.git.63.g6bb4b9a%{?dist}
+Release: 2.git.63.g6bb4b9a%{?dist}
 License: MIT
 Group: System Environment/Libraries
 Source: http://fontconfig.org/release/fontconfig-%{version}.tar.gz
@@ -23,8 +23,6 @@
 # reference the new path in %%configure
 Conflicts: fonts-xorg-base, fonts-xorg-syriac
 
-Patch0: fontconfig-2.6.0-indic.patch
-
 %description
 Fontconfig is designed to locate fonts within the
 system and select them according to requirements specified by 
@@ -46,7 +44,6 @@
 
 %prep
 %setup -q
-%patch0 -p0 -b .indic
 
 %build
 
@@ -132,8 +129,9 @@
 %{_mandir}/man3/*
 
 %changelog
-* Fri Jan 16 2009 Behdad Esfahbod <besfahbo at redhat.com> - 2.6.90-1.git.63.g6bb4b9a
+* Fri Jan 16 2009 Behdad Esfahbod <besfahbo at redhat.com> - 2.6.90-2.git.63.g6bb4b9a
 - Update to 2.6.90-1.git.63.g6bb4b9a
+- Remove upstreamed patch
 
 * Mon Oct 20 2008 Behdad Esfahbod <besfahbo at redhat.com> - 2.6.0-3
 - Add fontconfig-2.6.0-indic.patch


--- fontconfig-2.6.0-indic.patch DELETED ---



From behdad at fedoraproject.org  Fri Jan 16 05:58:41 2009
From: behdad at fedoraproject.org (Behdad Esfahbod)
Date: Fri, 16 Jan 2009 05:58:41 +0000 (UTC)
Subject: rpms/fontconfig/devel fontconfig.spec,1.112,1.113
Message-ID: <20090116055841.213C870142@cvs1.fedora.phx.redhat.com>

Author: behdad

Update of /cvs/pkgs/rpms/fontconfig/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20144

Modified Files:
	fontconfig.spec 
Log Message:
* Fri Jan 16 2009 Behdad Esfahbod <besfahbo at redhat.com> -
* 2.6.90-3.git.63.g6bb4b9a
- Install fc-scan and fc-query




Index: fontconfig.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fontconfig/devel/fontconfig.spec,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -r1.112 -r1.113
--- fontconfig.spec	16 Jan 2009 05:53:21 -0000	1.112
+++ fontconfig.spec	16 Jan 2009 05:58:10 -0000	1.113
@@ -3,7 +3,7 @@
 Summary: Font configuration and customization library
 Name: fontconfig
 Version: 2.6.90
-Release: 2.git.63.g6bb4b9a%{?dist}
+Release: 3.git.63.g6bb4b9a%{?dist}
 License: MIT
 Group: System Environment/Libraries
 Source: http://fontconfig.org/release/fontconfig-%{version}.tar.gz
@@ -105,9 +105,11 @@
 %doc fontconfig-user.txt fontconfig-user.html
 %{_libdir}/libfontconfig.so.*
 %{_bindir}/fc-cache
+%{_bindir}/fc-cat
 %{_bindir}/fc-list
 %{_bindir}/fc-match
-%{_bindir}/fc-cat
+%{_bindir}/fc-query
+%{_bindir}/fc-scan
 %dir %{_sysconfdir}/fonts/conf.avail
 %dir %{_datadir}/fonts
 %{_sysconfdir}/fonts/fonts.dtd
@@ -129,6 +131,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Fri Jan 16 2009 Behdad Esfahbod <besfahbo at redhat.com> - 2.6.90-3.git.63.g6bb4b9a
+- Install fc-scan and fc-query
+
 * Fri Jan 16 2009 Behdad Esfahbod <besfahbo at redhat.com> - 2.6.90-2.git.63.g6bb4b9a
 - Update to 2.6.90-1.git.63.g6bb4b9a
 - Remove upstreamed patch



From mclasen at fedoraproject.org  Fri Jan 16 06:03:40 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Fri, 16 Jan 2009 06:03:40 +0000 (UTC)
Subject: rpms/epiphany/F-10 .cvsignore, 1.77, 1.78 epiphany.spec, 1.221,
	1.222 sources, 1.82, 1.83
Message-ID: <20090116060340.8B75970127@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/epiphany/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21246

Modified Files:
	.cvsignore epiphany.spec sources 
Log Message:
2.24.3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/epiphany/F-10/.cvsignore,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- .cvsignore	5 Jan 2009 19:37:24 -0000	1.77
+++ .cvsignore	16 Jan 2009 06:03:10 -0000	1.78
@@ -1 +1 @@
-epiphany-2.24.2.1.tar.bz2
+epiphany-2.24.3.tar.bz2


Index: epiphany.spec
===================================================================
RCS file: /cvs/pkgs/rpms/epiphany/F-10/epiphany.spec,v
retrieving revision 1.221
retrieving revision 1.222
diff -u -r1.221 -r1.222
--- epiphany.spec	15 Jan 2009 09:32:23 -0000	1.221
+++ epiphany.spec	16 Jan 2009 06:03:10 -0000	1.222
@@ -7,8 +7,8 @@
 
 Summary: GNOME web browser based on the Mozilla rendering engine
 Name: epiphany
-Version: 2.24.2.1
-Release: 3%{?dist}
+Version: 2.24.3
+Release: 1%{?dist}
 %define major_version 2.24
 Provides: epiphany(abi) = %{major_version}
 License: GPLv2+ and GFDL
@@ -259,6 +259,9 @@
 %{_datadir}/pygtk/2.0/defs/epiphany.defs
 
 %changelog
+* Fri Jan 16 2009 Matthias Clasen <mclasen at redhat.com> 2.24.3-1
+- Update to 2.24.3
+
 * Wed Jan 14 2009 Mat??j Cepl <mcepl at redhat.com> 2.24.2.1-2
 - Make epiphany own directories for plugins and extensions
   (#479921).


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/epiphany/F-10/sources,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -r1.82 -r1.83
--- sources	5 Jan 2009 19:37:24 -0000	1.82
+++ sources	16 Jan 2009 06:03:10 -0000	1.83
@@ -1 +1 @@
-c4993233792e83b00df11feae950e201  epiphany-2.24.2.1.tar.bz2
+af51614c7b78f8b8c68e9ece3d8f4d8f  epiphany-2.24.3.tar.bz2



From rakesh at fedoraproject.org  Fri Jan 16 06:09:56 2009
From: rakesh at fedoraproject.org (Rakesh Pandit)
Date: Fri, 16 Jan 2009 06:09:56 +0000 (UTC)
Subject: rpms/taskcoach/devel import.log, NONE, 1.1 .cvsignore, 1.3,
	1.4 sources, 1.3, 1.4 taskcoach.spec, 1.6, 1.7
Message-ID: <20090116060956.354EA70127@cvs1.fedora.phx.redhat.com>

Author: rakesh

Update of /cvs/pkgs/rpms/taskcoach/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22116/devel

Modified Files:
	.cvsignore sources taskcoach.spec 
Added Files:
	import.log 
Log Message:
Updated to 0.71.5



--- NEW FILE import.log ---
taskcoach-0_71_5-1_fc10:HEAD:taskcoach-0.71.5-1.fc10.src.rpm:1232042892


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/taskcoach/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	6 Mar 2008 14:55:04 -0000	1.3
+++ .cvsignore	16 Jan 2009 06:09:25 -0000	1.4
@@ -1 +1 @@
-TaskCoach-0.69.1.tar.gz
+TaskCoach-0.71.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/taskcoach/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	6 Mar 2008 14:55:04 -0000	1.3
+++ sources	16 Jan 2009 06:09:25 -0000	1.4
@@ -1 +1 @@
-8f6ab0b81ac4e6911946d46d6b711921  TaskCoach-0.69.1.tar.gz
+4265b00ae37f84507f8a1c69aa32a908  TaskCoach-0.71.5.tar.gz


Index: taskcoach.spec
===================================================================
RCS file: /cvs/pkgs/rpms/taskcoach/devel/taskcoach.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- taskcoach.spec	29 Nov 2008 17:21:18 -0000	1.6
+++ taskcoach.spec	16 Jan 2009 06:09:25 -0000	1.7
@@ -2,8 +2,8 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           taskcoach
-Version:        0.69.1
-Release:        3%{?dist}
+Version:        0.71.5
+Release:        1%{?dist}
 Summary:        Your friendly task manager
 Summary(pl):    Tw??j przyjazny menad??er zada??
 Group:          Applications/Productivity
@@ -87,6 +87,9 @@
 %exclude %{python_sitelib}/buildlib/
 
 %changelog
+* Fri Jan 16 2009 Rakesh Pandit <rakesh at fedoraproject.org> - 0.71.5-1
+- Updated to 0.71.5
+
 * Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 0.69.1-3
 - Rebuild for Python 2.6
 



From rakesh at fedoraproject.org  Fri Jan 16 06:18:27 2009
From: rakesh at fedoraproject.org (Rakesh Pandit)
Date: Fri, 16 Jan 2009 06:18:27 +0000 (UTC)
Subject: rpms/taskcoach/F-10 import.log, NONE, 1.1 .cvsignore, 1.3,
	1.4 sources, 1.3, 1.4 taskcoach.spec, 1.5, 1.6
Message-ID: <20090116061827.C00AF70127@cvs1.fedora.phx.redhat.com>

Author: rakesh

Update of /cvs/pkgs/rpms/taskcoach/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23665/F-10

Modified Files:
	.cvsignore sources taskcoach.spec 
Added Files:
	import.log 
Log Message:
Updated to 0.71.5



--- NEW FILE import.log ---
taskcoach-0_71_5-1_fc10:F-10:taskcoach-0.71.5-1.fc10.src.rpm:1232043402


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/taskcoach/F-10/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	6 Mar 2008 14:55:04 -0000	1.3
+++ .cvsignore	16 Jan 2009 06:17:57 -0000	1.4
@@ -1 +1 @@
-TaskCoach-0.69.1.tar.gz
+TaskCoach-0.71.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/taskcoach/F-10/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	6 Mar 2008 14:55:04 -0000	1.3
+++ sources	16 Jan 2009 06:17:57 -0000	1.4
@@ -1 +1 @@
-8f6ab0b81ac4e6911946d46d6b711921  TaskCoach-0.69.1.tar.gz
+4265b00ae37f84507f8a1c69aa32a908  TaskCoach-0.71.5.tar.gz


Index: taskcoach.spec
===================================================================
RCS file: /cvs/pkgs/rpms/taskcoach/F-10/taskcoach.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- taskcoach.spec	6 Mar 2008 16:02:15 -0000	1.5
+++ taskcoach.spec	16 Jan 2009 06:17:57 -0000	1.6
@@ -2,8 +2,8 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           taskcoach
-Version:        0.69.1
-Release:        2%{?dist}
+Version:        0.71.5
+Release:        1%{?dist}
 Summary:        Your friendly task manager
 Summary(pl):    Tw??j przyjazny menad??er zada??
 Group:          Applications/Productivity
@@ -87,6 +87,9 @@
 %exclude %{python_sitelib}/buildlib/
 
 %changelog
+* Fri Jan 16 2009 Rakesh Pandit <rakesh at fedoraproject.org> 0.71.5-1
+- Updated to 0.71.5
+
 * Thu Mar 06 2008 Krzysztof Kurzawski <kurzawax at gmail.com> 0.69.1-2
 - Increase release
 



From rakesh at fedoraproject.org  Fri Jan 16 06:18:39 2009
From: rakesh at fedoraproject.org (Rakesh Pandit)
Date: Fri, 16 Jan 2009 06:18:39 +0000 (UTC)
Subject: rpms/taskcoach/F-9 import.log, NONE, 1.1 .cvsignore, 1.3,
	1.4 sources, 1.3, 1.4 taskcoach.spec, 1.5, 1.6
Message-ID: <20090116061839.631E570127@cvs1.fedora.phx.redhat.com>

Author: rakesh

Update of /cvs/pkgs/rpms/taskcoach/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23776/F-9

Modified Files:
	.cvsignore sources taskcoach.spec 
Added Files:
	import.log 
Log Message:
Updated to 0.71.5.



--- NEW FILE import.log ---
taskcoach-0_71_5-1_fc10:F-9:taskcoach-0.71.5-1.fc10.src.rpm:1232043419


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/taskcoach/F-9/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	6 Mar 2008 14:55:04 -0000	1.3
+++ .cvsignore	16 Jan 2009 06:18:09 -0000	1.4
@@ -1 +1 @@
-TaskCoach-0.69.1.tar.gz
+TaskCoach-0.71.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/taskcoach/F-9/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	6 Mar 2008 14:55:04 -0000	1.3
+++ sources	16 Jan 2009 06:18:09 -0000	1.4
@@ -1 +1 @@
-8f6ab0b81ac4e6911946d46d6b711921  TaskCoach-0.69.1.tar.gz
+4265b00ae37f84507f8a1c69aa32a908  TaskCoach-0.71.5.tar.gz


Index: taskcoach.spec
===================================================================
RCS file: /cvs/pkgs/rpms/taskcoach/F-9/taskcoach.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- taskcoach.spec	6 Mar 2008 16:02:15 -0000	1.5
+++ taskcoach.spec	16 Jan 2009 06:18:09 -0000	1.6
@@ -2,8 +2,8 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           taskcoach
-Version:        0.69.1
-Release:        2%{?dist}
+Version:        0.71.5
+Release:        1%{?dist}
 Summary:        Your friendly task manager
 Summary(pl):    Tw??j przyjazny menad??er zada??
 Group:          Applications/Productivity
@@ -87,6 +87,9 @@
 %exclude %{python_sitelib}/buildlib/
 
 %changelog
+* Fri Jan 16 2009 Rakesh Pandit <rakesh at fedoraproject.org> 0.71.5-1
+- Updated to 0.71.5
+
 * Thu Mar 06 2008 Krzysztof Kurzawski <kurzawax at gmail.com> 0.69.1-2
 - Increase release
 



From whot at fedoraproject.org  Fri Jan 16 06:33:20 2009
From: whot at fedoraproject.org (Peter Hutterer)
Date: Fri, 16 Jan 2009 06:33:20 +0000 (UTC)
Subject: rpms/xorg-x11-apps/devel .cvsignore, 1.10, 1.11 sources, 1.10,
	1.11 xorg-x11-apps.spec, 1.29, 1.30
Message-ID: <20090116063320.A6D1D70127@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-serv25984

Modified Files:
	.cvsignore sources xorg-x11-apps.spec 
Log Message:
* Fri Jan 16 2009 Peter Hutterer <peter.hutterer at redhat.com> 7.3-6
- xinput 1.4.0




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-apps/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	8 Sep 2008 18:52:38 -0000	1.10
+++ .cvsignore	16 Jan 2009 06:32:48 -0000	1.11
@@ -15,4 +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
+xinput-1.4.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-apps/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	8 Sep 2008 18:52:38 -0000	1.10
+++ sources	16 Jan 2009 06:32:50 -0000	1.11
@@ -15,4 +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
+ef43538bb3b445d2d69d5adbf76c149e  xinput-1.4.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.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- xorg-x11-apps.spec	8 Sep 2008 18:52:38 -0000	1.29
+++ xorg-x11-apps.spec	16 Jan 2009 06:32:50 -0000	1.30
@@ -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: 5%{?dist}
+Release: 6%{?dist}
 License: MIT
 Group: User Interface/X
 URL: http://www.x.org
@@ -31,7 +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
+Source17: ftp://ftp.x.org/pub/individual/app/xinput-1.4.0.tar.bz2
 
 Patch0: x11perf-1.4.1-x11perf-datadir-cleanups.patch
 Patch1: luit-1.0.1-locale.alias-datadir.patch
@@ -58,7 +58,7 @@
 BuildRequires: libXcursor-devel
 BuildRequires: libpng-devel
 BuildRequires: libXfixes-devel
-BuildRequires: libXi-devel
+BuildRequires: libXi-devel >= 1.2
 
 Requires(pre): xorg-x11-filesystem >= 0.99.2-3
 
@@ -179,6 +179,9 @@
 %{_mandir}/man1/xwud.1*
 
 %changelog
+* Fri Jan 16 2009 Peter Hutterer <peter.hutterer at redhat.com> 7.3-6
+- xinput 1.4.0
+
 * Tue Sep 9 2008 Peter Hutterer <peter.hutterer at redhat.com> 7.3-5
 - Add xinput tool.
 



From jfearn at fedoraproject.org  Fri Jan 16 06:42:15 2009
From: jfearn at fedoraproject.org (Jeff Fearn)
Date: Fri, 16 Jan 2009 06:42:15 +0000 (UTC)
Subject: rpms/publican/devel .cvsignore, 1.9, 1.10 publican.spec, 1.17,
	1.18 sources, 1.10, 1.11
Message-ID: <20090116064215.D414B70127@cvs1.fedora.phx.redhat.com>

Author: jfearn

Update of /cvs/pkgs/rpms/publican/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26550

Modified Files:
	.cvsignore publican.spec sources 
Log Message:
new version



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/publican/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	1 Dec 2008 05:02:23 -0000	1.9
+++ .cvsignore	16 Jan 2009 06:41:45 -0000	1.10
@@ -1 +1 @@
-publican-0.39.tgz
+publican-0.40.tgz


Index: publican.spec
===================================================================
RCS file: /cvs/pkgs/rpms/publican/devel/publican.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- publican.spec	1 Dec 2008 05:02:24 -0000	1.17
+++ publican.spec	16 Jan 2009 06:41:45 -0000	1.18
@@ -5,7 +5,7 @@
 
 Name:		publican	
 Summary:	Common files and scripts for publishing with DocBook XML
-Version:	0.39
+Version:	0.40
 Release:	0%{?dist}
 License:	GPLv2+ and GFDL
 # The following directories are licensed under the GFDL:
@@ -27,7 +27,8 @@
 BuildRequires:	desktop-file-utils
 BuildRequires:	perl-XML-TreeBuilder >= 3.09-11
 # FOP is required to build the font metrics.
-BuildRequires:	fop saxon ImageMagick
+#BuildRequires:	fop saxon
+BuildRequires: ImageMagick saxon
 #BuildRequires:	xslthl
 # *&%^*&^ decided to rename font packages and change font paths.
 # No actual real changes.
@@ -83,7 +84,7 @@
 
 %build
 %{__make} docs
-./fop-fonts --dist=%{?dist}
+#./fop-fonts --dist=%{?dist}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -139,13 +140,28 @@
 %{_bindir}/xlf2pot
 %{_bindir}/xmlClean
 
-
 %files doc
 %doc docs/*
 %{_datadir}/applications/%{my_vendor}-%{name}.desktop
 %doc fdl.txt
 
 %changelog
+* Mon Jan 5 2009 Jeff Fearn <jfearn at redhat.com> 0.40
+- Fix DRAFT mode in web docs.
+- Fix TOC CSS spacing.
+- Fix missing syntax highlighting templates. BZ #474077
+- Added appendix to user guide for Makefile parameters. BZ #476913
+- Fix multiple authors in revhistory. Patch by: Paul W. Frields. BZ #478552
+- Add LICENSE override for RPMs. BZ #477720
+- Fix empty change log. BZ #477728
+- Fix spec file location. BZ #477704
+- Added newline after country. BZ #477573
+- Fix minimum font size breaking TOC. BZ #476884
+- Fix missing font-metric files. BZ #479592
+- Updated redhat brand license. BZ #478405
+- Update jboss brand license. BZ #478416
+- Ship PDF with Indic web packages.
+
 * Mon Dec 1 2008 Jeff Fearn <jfearn at redhat.com> 0.39
 - Disable make.graphic.viewport. BZ #467368
 - Add missing XEP namespace. BZ #467256


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/publican/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	1 Dec 2008 05:02:24 -0000	1.10
+++ sources	16 Jan 2009 06:41:45 -0000	1.11
@@ -1 +1 @@
-28bee288c544679c538a212d1c4f18a4  publican-0.39.tgz
+7f51def0740d27198220f0db3fb5f05e  publican-0.40.tgz



From jfearn at fedoraproject.org  Fri Jan 16 06:42:50 2009
From: jfearn at fedoraproject.org (Jeff Fearn)
Date: Fri, 16 Jan 2009 06:42:50 +0000 (UTC)
Subject: rpms/publican-fedora/devel .cvsignore, 1.8, 1.9 publican-fedora.spec,
	1.7, 1.8 sources, 1.8, 1.9
Message-ID: <20090116064250.4303D70127@cvs1.fedora.phx.redhat.com>

Author: jfearn

Update of /cvs/pkgs/rpms/publican-fedora/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26636

Modified Files:
	.cvsignore publican-fedora.spec sources 
Log Message:
new version



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/publican-fedora/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	1 Dec 2008 05:06:02 -0000	1.8
+++ .cvsignore	16 Jan 2009 06:42:19 -0000	1.9
@@ -1 +1 @@
-publican-fedora-0.16.tgz
+publican-fedora-0.17.tgz


Index: publican-fedora.spec
===================================================================
RCS file: /cvs/pkgs/rpms/publican-fedora/devel/publican-fedora.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- publican-fedora.spec	1 Dec 2008 05:06:02 -0000	1.7
+++ publican-fedora.spec	16 Jan 2009 06:42:19 -0000	1.8
@@ -2,7 +2,7 @@
 
 Name:		publican-%{brand}
 Summary:	Publican documentation template files for %{brand}
-Version:	0.16
+Version:	0.17
 Release:	0%{?dist}
 License:	Open Publication 
 Group:		Development/Libraries
@@ -49,7 +49,11 @@
 %{_datadir}/publican/xsl/%{brand}
 
 %changelog
+* Mon Jan 5 2009 Jeff Fearn <jfearn at redhat.com> 0.17
+- Add LICENSE override for RPMs. BZ #477720
+
 * Mon Dec 1 2008 Jeff Fearn <jfearn at redhat.com> 0.16
+- resave title_logo.png. BZ #474075
 - Add override for PROD_URL
 
 * Tue Sep 9 2008 Jeff Fearn <jfearn at redhat.com> 0.15


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/publican-fedora/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	1 Dec 2008 05:06:02 -0000	1.8
+++ sources	16 Jan 2009 06:42:20 -0000	1.9
@@ -1 +1 @@
-224e840a0ae9dcf1910aefabe94f699e  publican-fedora-0.16.tgz
+90739ea3aeb86d28566c6057b265af53  publican-fedora-0.17.tgz



From jfearn at fedoraproject.org  Fri Jan 16 06:49:37 2009
From: jfearn at fedoraproject.org (Jeff Fearn)
Date: Fri, 16 Jan 2009 06:49:37 +0000 (UTC)
Subject: rpms/publican-fedora/F-10 publican-fedora.spec, 1.7, 1.8 sources,
	1.8, 1.9
Message-ID: <20090116064937.39BD970127@cvs1.fedora.phx.redhat.com>

Author: jfearn

Update of /cvs/pkgs/rpms/publican-fedora/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27523

Modified Files:
	publican-fedora.spec sources 
Log Message:
new version


Index: publican-fedora.spec
===================================================================
RCS file: /cvs/pkgs/rpms/publican-fedora/F-10/publican-fedora.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- publican-fedora.spec	1 Dec 2008 05:17:03 -0000	1.7
+++ publican-fedora.spec	16 Jan 2009 06:49:06 -0000	1.8
@@ -2,7 +2,7 @@
 
 Name:		publican-%{brand}
 Summary:	Publican documentation template files for %{brand}
-Version:	0.16
+Version:	0.17
 Release:	0%{?dist}
 License:	Open Publication 
 Group:		Development/Libraries
@@ -49,7 +49,11 @@
 %{_datadir}/publican/xsl/%{brand}
 
 %changelog
+* Mon Jan 5 2009 Jeff Fearn <jfearn at redhat.com> 0.17
+- Add LICENSE override for RPMs. BZ #477720
+
 * Mon Dec 1 2008 Jeff Fearn <jfearn at redhat.com> 0.16
+- resave title_logo.png. BZ #474075
 - Add override for PROD_URL
 
 * Tue Sep 9 2008 Jeff Fearn <jfearn at redhat.com> 0.15


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/publican-fedora/F-10/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	1 Dec 2008 05:17:03 -0000	1.8
+++ sources	16 Jan 2009 06:49:06 -0000	1.9
@@ -1 +1 @@
-224e840a0ae9dcf1910aefabe94f699e  publican-fedora-0.16.tgz
+90739ea3aeb86d28566c6057b265af53  publican-fedora-0.17.tgz



From jfearn at fedoraproject.org  Fri Jan 16 06:54:08 2009
From: jfearn at fedoraproject.org (Jeff Fearn)
Date: Fri, 16 Jan 2009 06:54:08 +0000 (UTC)
Subject: rpms/publican/F-10 publican.spec,1.17,1.18 sources,1.10,1.11
Message-ID: <20090116065408.2E53570127@cvs1.fedora.phx.redhat.com>

Author: jfearn

Update of /cvs/pkgs/rpms/publican/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27943

Modified Files:
	publican.spec sources 
Log Message:
new version


Index: publican.spec
===================================================================
RCS file: /cvs/pkgs/rpms/publican/F-10/publican.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- publican.spec	1 Dec 2008 05:17:13 -0000	1.17
+++ publican.spec	16 Jan 2009 06:53:37 -0000	1.18
@@ -5,7 +5,7 @@
 
 Name:		publican	
 Summary:	Common files and scripts for publishing with DocBook XML
-Version:	0.39
+Version:	0.40
 Release:	0%{?dist}
 License:	GPLv2+ and GFDL
 # The following directories are licensed under the GFDL:
@@ -27,7 +27,8 @@
 BuildRequires:	desktop-file-utils
 BuildRequires:	perl-XML-TreeBuilder >= 3.09-11
 # FOP is required to build the font metrics.
-BuildRequires:	fop saxon ImageMagick
+#BuildRequires:	fop saxon
+BuildRequires: ImageMagick saxon
 #BuildRequires:	xslthl
 # *&%^*&^ decided to rename font packages and change font paths.
 # No actual real changes.
@@ -83,7 +84,7 @@
 
 %build
 %{__make} docs
-./fop-fonts --dist=%{?dist}
+#./fop-fonts --dist=%{?dist}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -139,13 +140,28 @@
 %{_bindir}/xlf2pot
 %{_bindir}/xmlClean
 
-
 %files doc
 %doc docs/*
 %{_datadir}/applications/%{my_vendor}-%{name}.desktop
 %doc fdl.txt
 
 %changelog
+* Mon Jan 5 2009 Jeff Fearn <jfearn at redhat.com> 0.40
+- Fix DRAFT mode in web docs.
+- Fix TOC CSS spacing.
+- Fix missing syntax highlighting templates. BZ #474077
+- Added appendix to user guide for Makefile parameters. BZ #476913
+- Fix multiple authors in revhistory. Patch by: Paul W. Frields. BZ #478552
+- Add LICENSE override for RPMs. BZ #477720
+- Fix empty change log. BZ #477728
+- Fix spec file location. BZ #477704
+- Added newline after country. BZ #477573
+- Fix minimum font size breaking TOC. BZ #476884
+- Fix missing font-metric files. BZ #479592
+- Updated redhat brand license. BZ #478405
+- Update jboss brand license. BZ #478416
+- Ship PDF with Indic web packages.
+
 * Mon Dec 1 2008 Jeff Fearn <jfearn at redhat.com> 0.39
 - Disable make.graphic.viewport. BZ #467368
 - Add missing XEP namespace. BZ #467256


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/publican/F-10/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	1 Dec 2008 05:17:13 -0000	1.10
+++ sources	16 Jan 2009 06:53:37 -0000	1.11
@@ -1 +1 @@
-28bee288c544679c538a212d1c4f18a4  publican-0.39.tgz
+7f51def0740d27198220f0db3fb5f05e  publican-0.40.tgz



From jfearn at fedoraproject.org  Fri Jan 16 06:54:26 2009
From: jfearn at fedoraproject.org (Jeff Fearn)
Date: Fri, 16 Jan 2009 06:54:26 +0000 (UTC)
Subject: rpms/publican/F-9 publican.spec,1.11,1.12 sources,1.10,1.11
Message-ID: <20090116065426.565BD70127@cvs1.fedora.phx.redhat.com>

Author: jfearn

Update of /cvs/pkgs/rpms/publican/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27983

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.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- publican.spec	1 Dec 2008 05:24:54 -0000	1.11
+++ publican.spec	16 Jan 2009 06:53:55 -0000	1.12
@@ -5,7 +5,7 @@
 
 Name:		publican	
 Summary:	Common files and scripts for publishing with DocBook XML
-Version:	0.39
+Version:	0.40
 Release:	0%{?dist}
 License:	GPLv2+ and GFDL
 # The following directories are licensed under the GFDL:
@@ -27,7 +27,8 @@
 BuildRequires:	desktop-file-utils
 BuildRequires:	perl-XML-TreeBuilder >= 3.09-11
 # FOP is required to build the font metrics.
-BuildRequires:	fop saxon ImageMagick
+#BuildRequires:	fop saxon
+BuildRequires: ImageMagick saxon
 #BuildRequires:	xslthl
 # *&%^*&^ decided to rename font packages and change font paths.
 # No actual real changes.
@@ -83,7 +84,7 @@
 
 %build
 %{__make} docs
-./fop-fonts --dist=%{?dist}
+#./fop-fonts --dist=%{?dist}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -139,13 +140,28 @@
 %{_bindir}/xlf2pot
 %{_bindir}/xmlClean
 
-
 %files doc
 %doc docs/*
 %{_datadir}/applications/%{my_vendor}-%{name}.desktop
 %doc fdl.txt
 
 %changelog
+* Mon Jan 5 2009 Jeff Fearn <jfearn at redhat.com> 0.40
+- Fix DRAFT mode in web docs.
+- Fix TOC CSS spacing.
+- Fix missing syntax highlighting templates. BZ #474077
+- Added appendix to user guide for Makefile parameters. BZ #476913
+- Fix multiple authors in revhistory. Patch by: Paul W. Frields. BZ #478552
+- Add LICENSE override for RPMs. BZ #477720
+- Fix empty change log. BZ #477728
+- Fix spec file location. BZ #477704
+- Added newline after country. BZ #477573
+- Fix minimum font size breaking TOC. BZ #476884
+- Fix missing font-metric files. BZ #479592
+- Updated redhat brand license. BZ #478405
+- Update jboss brand license. BZ #478416
+- Ship PDF with Indic web packages.
+
 * Mon Dec 1 2008 Jeff Fearn <jfearn at redhat.com> 0.39
 - Disable make.graphic.viewport. BZ #467368
 - Add missing XEP namespace. BZ #467256


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/publican/F-9/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	1 Dec 2008 05:24:54 -0000	1.10
+++ sources	16 Jan 2009 06:53:56 -0000	1.11
@@ -1 +1 @@
-28bee288c544679c538a212d1c4f18a4  publican-0.39.tgz
+7f51def0740d27198220f0db3fb5f05e  publican-0.40.tgz



From rakesh at fedoraproject.org  Fri Jan 16 06:55:00 2009
From: rakesh at fedoraproject.org (Rakesh Pandit)
Date: Fri, 16 Jan 2009 06:55:00 +0000 (UTC)
Subject: rpms/zile/devel .cvsignore, 1.5, 1.6 import.log, 1.1, 1.2 sources,
	1.5, 1.6 zile.spec, 1.9, 1.10
Message-ID: <20090116065500.25D1070127@cvs1.fedora.phx.redhat.com>

Author: rakesh

Update of /cvs/pkgs/rpms/zile/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27384/devel

Modified Files:
	.cvsignore import.log sources zile.spec 
Log Message:
Updated to 2.3.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/zile/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	14 Aug 2008 05:37:16 -0000	1.5
+++ .cvsignore	16 Jan 2009 06:54:29 -0000	1.6
@@ -1 +1 @@
-zile-2.2.61.tar.gz
+zile-2.3.0.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/zile/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	14 Aug 2008 05:37:16 -0000	1.1
+++ import.log	16 Jan 2009 06:54:29 -0000	1.2
@@ -1 +1,2 @@
 zile-2_2_61-2_fc9:HEAD:zile-2.2.61-2.fc9.src.rpm:1218691536
+zile-2_3_0-1_fc10:HEAD:zile-2.3.0-1.fc10.src.rpm:1232045193


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/zile/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	14 Aug 2008 05:37:16 -0000	1.5
+++ sources	16 Jan 2009 06:54:29 -0000	1.6
@@ -1 +1 @@
-d7a205b4acc263773b37cb7d5daafd65  zile-2.2.61.tar.gz
+c35fd88c9045eaffb83aa46abe7e9d27  zile-2.3.0.tar.gz


Index: zile.spec
===================================================================
RCS file: /cvs/pkgs/rpms/zile/devel/zile.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- zile.spec	14 Aug 2008 05:37:16 -0000	1.9
+++ zile.spec	16 Jan 2009 06:54:29 -0000	1.10
@@ -1,7 +1,7 @@
 Summary: Zile Is Lossy Emacs
 Name: zile
-Version: 2.2.61
-Release: 2%{?dist}
+Version: 2.3.0
+Release: 1%{?dist}
 License: GPLv3+
 Group: Applications/Editors
 URL: http://www.gnu.org/software/%{name}/
@@ -50,6 +50,9 @@
 %{_datadir}/%{name}/
 
 %changelog
+* Fri Jan 16 2009 Rakesh Pandit <rakesh at fedoraproject.org> - 2.3.0-1
+- Updated to 2.3.0
+
 * Thu Aug 14 2008 Rakesh Pandit <rakesh at fedoraproject.org> - 2.2.61-2
 - Fixed License, Required field & macro inconsistency
 - Latest release 2.2.61



From rakesh at fedoraproject.org  Fri Jan 16 06:55:20 2009
From: rakesh at fedoraproject.org (Rakesh Pandit)
Date: Fri, 16 Jan 2009 06:55:20 +0000 (UTC)
Subject: rpms/zile/F-9 .cvsignore, 1.5, 1.6 import.log, 1.1, 1.2 sources, 1.5,
	1.6 zile.spec, 1.8, 1.9
Message-ID: <20090116065520.BB8E770127@cvs1.fedora.phx.redhat.com>

Author: rakesh

Update of /cvs/pkgs/rpms/zile/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27421/F-9

Modified Files:
	.cvsignore import.log sources zile.spec 
Log Message:
Updated to 2.3.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/zile/F-9/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	14 Aug 2008 05:42:45 -0000	1.5
+++ .cvsignore	16 Jan 2009 06:54:50 -0000	1.6
@@ -1 +1 @@
-zile-2.2.61.tar.gz
+zile-2.3.0.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/zile/F-9/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	14 Aug 2008 05:42:45 -0000	1.1
+++ import.log	16 Jan 2009 06:54:50 -0000	1.2
@@ -1 +1,2 @@
 zile-2_2_61-2_fc9:F-9:zile-2.2.61-2.fc9.src.rpm:1218691749
+zile-2_3_0-1_fc10:F-9:zile-2.3.0-1.fc10.src.rpm:1232045211


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/zile/F-9/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	14 Aug 2008 05:42:45 -0000	1.5
+++ sources	16 Jan 2009 06:54:50 -0000	1.6
@@ -1 +1 @@
-d7a205b4acc263773b37cb7d5daafd65  zile-2.2.61.tar.gz
+c35fd88c9045eaffb83aa46abe7e9d27  zile-2.3.0.tar.gz


Index: zile.spec
===================================================================
RCS file: /cvs/pkgs/rpms/zile/F-9/zile.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- zile.spec	14 Aug 2008 05:42:45 -0000	1.8
+++ zile.spec	16 Jan 2009 06:54:50 -0000	1.9
@@ -1,7 +1,7 @@
 Summary: Zile Is Lossy Emacs
 Name: zile
-Version: 2.2.61
-Release: 2%{?dist}
+Version: 2.3.0
+Release: 1%{?dist}
 License: GPLv3+
 Group: Applications/Editors
 URL: http://www.gnu.org/software/%{name}/
@@ -50,6 +50,9 @@
 %{_datadir}/%{name}/
 
 %changelog
+* Fri Jan 16 2009 Rakesh Pandit <rakesh at fedoraproject.org> - 2.3.0-1
+- Updated to 2.3.0
+
 * Thu Aug 14 2008 Rakesh Pandit <rakesh at fedoraproject.org> - 2.2.61-2
 - Fixed License, Required field & macro inconsistency
 - Latest release 2.2.61



From rakesh at fedoraproject.org  Fri Jan 16 06:56:08 2009
From: rakesh at fedoraproject.org (Rakesh Pandit)
Date: Fri, 16 Jan 2009 06:56:08 +0000 (UTC)
Subject: rpms/zile/F-10 .cvsignore, 1.5, 1.6 import.log, 1.1, 1.2 sources,
	1.5, 1.6 zile.spec, 1.9, 1.10
Message-ID: <20090116065608.219AA70127@cvs1.fedora.phx.redhat.com>

Author: rakesh

Update of /cvs/pkgs/rpms/zile/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28430/F-10

Modified Files:
	.cvsignore import.log sources zile.spec 
Log Message:
Updated to 2.3.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/zile/F-10/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	14 Aug 2008 05:37:16 -0000	1.5
+++ .cvsignore	16 Jan 2009 06:55:37 -0000	1.6
@@ -1 +1 @@
-zile-2.2.61.tar.gz
+zile-2.3.0.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/zile/F-10/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	14 Aug 2008 05:37:16 -0000	1.1
+++ import.log	16 Jan 2009 06:55:37 -0000	1.2
@@ -1 +1,2 @@
 zile-2_2_61-2_fc9:HEAD:zile-2.2.61-2.fc9.src.rpm:1218691536
+zile-2_3_0-1_fc10:F-10:zile-2.3.0-1.fc10.src.rpm:1232045720


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/zile/F-10/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	14 Aug 2008 05:37:16 -0000	1.5
+++ sources	16 Jan 2009 06:55:37 -0000	1.6
@@ -1 +1 @@
-d7a205b4acc263773b37cb7d5daafd65  zile-2.2.61.tar.gz
+c35fd88c9045eaffb83aa46abe7e9d27  zile-2.3.0.tar.gz


Index: zile.spec
===================================================================
RCS file: /cvs/pkgs/rpms/zile/F-10/zile.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- zile.spec	14 Aug 2008 05:37:16 -0000	1.9
+++ zile.spec	16 Jan 2009 06:55:37 -0000	1.10
@@ -1,7 +1,7 @@
 Summary: Zile Is Lossy Emacs
 Name: zile
-Version: 2.2.61
-Release: 2%{?dist}
+Version: 2.3.0
+Release: 1%{?dist}
 License: GPLv3+
 Group: Applications/Editors
 URL: http://www.gnu.org/software/%{name}/
@@ -50,6 +50,9 @@
 %{_datadir}/%{name}/
 
 %changelog
+* Fri Jan 16 2009 Rakesh Pandit <rakesh at fedoraproject.org> - 2.3.0-1
+- Updated to 2.3.0
+
 * Thu Aug 14 2008 Rakesh Pandit <rakesh at fedoraproject.org> - 2.2.61-2
 - Fixed License, Required field & macro inconsistency
 - Latest release 2.2.61



From jfearn at fedoraproject.org  Fri Jan 16 06:58:50 2009
From: jfearn at fedoraproject.org (Jeff Fearn)
Date: Fri, 16 Jan 2009 06:58:50 +0000 (UTC)
Subject: rpms/publican-fedora/F-9 publican-fedora.spec, 1.7, 1.8 sources, 1.8,
	1.9
Message-ID: <20090116065850.093A070127@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-serv28951

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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- publican-fedora.spec	1 Dec 2008 05:24:43 -0000	1.7
+++ publican-fedora.spec	16 Jan 2009 06:58:19 -0000	1.8
@@ -2,7 +2,7 @@
 
 Name:		publican-%{brand}
 Summary:	Publican documentation template files for %{brand}
-Version:	0.16
+Version:	0.17
 Release:	0%{?dist}
 License:	Open Publication 
 Group:		Development/Libraries
@@ -49,7 +49,11 @@
 %{_datadir}/publican/xsl/%{brand}
 
 %changelog
+* Mon Jan 5 2009 Jeff Fearn <jfearn at redhat.com> 0.17
+- Add LICENSE override for RPMs. BZ #477720
+
 * Mon Dec 1 2008 Jeff Fearn <jfearn at redhat.com> 0.16
+- resave title_logo.png. BZ #474075
 - Add override for PROD_URL
 
 * Tue Sep 9 2008 Jeff Fearn <jfearn at redhat.com> 0.15


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/publican-fedora/F-9/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	1 Dec 2008 05:24:43 -0000	1.8
+++ sources	16 Jan 2009 06:58:19 -0000	1.9
@@ -1 +1 @@
-224e840a0ae9dcf1910aefabe94f699e  publican-fedora-0.16.tgz
+90739ea3aeb86d28566c6057b265af53  publican-fedora-0.17.tgz



From jfearn at fedoraproject.org  Fri Jan 16 07:04:16 2009
From: jfearn at fedoraproject.org (Jeff Fearn)
Date: Fri, 16 Jan 2009 07:04:16 +0000 (UTC)
Subject: rpms/publican/devel publican.spec,1.18,1.19
Message-ID: <20090116070416.5CEED70127@cvs1.fedora.phx.redhat.com>

Author: jfearn

Update of /cvs/pkgs/rpms/publican/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30178

Modified Files:
	publican.spec 
Log Message:
test if fop fixes GTK error


Index: publican.spec
===================================================================
RCS file: /cvs/pkgs/rpms/publican/devel/publican.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- publican.spec	16 Jan 2009 06:41:45 -0000	1.18
+++ publican.spec	16 Jan 2009 07:03:46 -0000	1.19
@@ -27,7 +27,7 @@
 BuildRequires:	desktop-file-utils
 BuildRequires:	perl-XML-TreeBuilder >= 3.09-11
 # FOP is required to build the font metrics.
-#BuildRequires:	fop saxon
+BuildRequires:	fop
 BuildRequires: ImageMagick saxon
 #BuildRequires:	xslthl
 # *&%^*&^ decided to rename font packages and change font paths.



From jfearn at fedoraproject.org  Fri Jan 16 07:22:49 2009
From: jfearn at fedoraproject.org (Jeff Fearn)
Date: Fri, 16 Jan 2009 07:22:49 +0000 (UTC)
Subject: rpms/publican/F-10 publican.spec,1.18,1.19
Message-ID: <20090116072249.6693270127@cvs1.fedora.phx.redhat.com>

Author: jfearn

Update of /cvs/pkgs/rpms/publican/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31540

Modified Files:
	publican.spec 
Log Message:
need fop for GTK settings ...


Index: publican.spec
===================================================================
RCS file: /cvs/pkgs/rpms/publican/F-10/publican.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- publican.spec	16 Jan 2009 06:53:37 -0000	1.18
+++ publican.spec	16 Jan 2009 07:22:19 -0000	1.19
@@ -27,7 +27,7 @@
 BuildRequires:	desktop-file-utils
 BuildRequires:	perl-XML-TreeBuilder >= 3.09-11
 # FOP is required to build the font metrics.
-#BuildRequires:	fop saxon
+BuildRequires:	fop
 BuildRequires: ImageMagick saxon
 #BuildRequires:	xslthl
 # *&%^*&^ decided to rename font packages and change font paths.



From tmraz at fedoraproject.org  Fri Jan 16 07:23:43 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 16 Jan 2009 07:23:43 +0000 (UTC)
Subject: rpms/dnssec-tools/devel dnssec-tools.spec,1.19,1.20
Message-ID: <20090116072343.1197C70127@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/dnssec-tools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31696

Modified Files:
	dnssec-tools.spec 
Log Message:
* Thu Jan 15 2009 Tomas Mraz <tmraz at redhat.com> - 1.4.1-4
- rebuild with new openssl



Index: dnssec-tools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dnssec-tools/devel/dnssec-tools.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- dnssec-tools.spec	1 Dec 2008 14:53:47 -0000	1.19
+++ dnssec-tools.spec	16 Jan 2009 07:23:12 -0000	1.20
@@ -1,7 +1,7 @@
 Summary: A suite of tools for managing dnssec aware DNS usage
 Name: dnssec-tools
 Version: 1.4.1
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: BSD
 Group: System Environment/Base
 URL: http://www.dnssec-tools.org/
@@ -282,6 +282,9 @@
 %{_mandir}/man3/val_freeaddrinfo.3.gz
 
 %changelog
+* Thu Jan 15 2009 Tomas Mraz <tmraz at redhat.com> - 1.4.1-4
+- rebuild with new openssl
+
 * Mon Dec  1 2008 Wes Hardaker <wjhns174 at hardakers.net> - 1.4.1-3
 - Added package directories we own, left out ones we don't.
 



From jfearn at fedoraproject.org  Fri Jan 16 07:24:10 2009
From: jfearn at fedoraproject.org (Jeff Fearn)
Date: Fri, 16 Jan 2009 07:24:10 +0000 (UTC)
Subject: rpms/publican/F-9 publican.spec,1.12,1.13
Message-ID: <20090116072410.EC7E470127@cvs1.fedora.phx.redhat.com>

Author: jfearn

Update of /cvs/pkgs/rpms/publican/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31759

Modified Files:
	publican.spec 
Log Message:
need tha fop


Index: publican.spec
===================================================================
RCS file: /cvs/pkgs/rpms/publican/F-9/publican.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- publican.spec	16 Jan 2009 06:53:55 -0000	1.12
+++ publican.spec	16 Jan 2009 07:23:40 -0000	1.13
@@ -27,7 +27,7 @@
 BuildRequires:	desktop-file-utils
 BuildRequires:	perl-XML-TreeBuilder >= 3.09-11
 # FOP is required to build the font metrics.
-#BuildRequires:	fop saxon
+BuildRequires:	fop
 BuildRequires: ImageMagick saxon
 #BuildRequires:	xslthl
 # *&%^*&^ decided to rename font packages and change font paths.



From tmraz at fedoraproject.org  Fri Jan 16 07:41:50 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 16 Jan 2009 07:41:50 +0000 (UTC)
Subject: rpms/echoping/devel echoping.spec,1.5,1.6
Message-ID: <20090116074150.7675270127@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/echoping/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv991

Modified Files:
	echoping.spec 
Log Message:
* Thu Jan 15 2009 Tomas Mraz <tmraz at redhat.com> 6.0.2-3
- rebuild with new openssl



Index: echoping.spec
===================================================================
RCS file: /cvs/pkgs/rpms/echoping/devel/echoping.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- echoping.spec	17 Jul 2008 14:36:50 -0000	1.5
+++ echoping.spec	16 Jan 2009 07:41:20 -0000	1.6
@@ -1,7 +1,7 @@
 Summary:       TCP "echo" performance test
 Name:          echoping
 Version:       6.0.2
-Release:       2%{?dist}
+Release:       3%{?dist}
 License:       GPLv2+
 Group:         Applications/Internet
 Source0:       http://downloads.sourceforge.net/echoping/echoping-%{version}.tar.gz
@@ -117,6 +117,9 @@
 %{_libdir}/echoping/*.so
 
 %changelog
+* Thu Jan 15 2009 Tomas Mraz <tmraz at redhat.com> 6.0.2-3
+- rebuild with new openssl
+
 * Thu Jul 17 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 6.0.2-2
 - fix license tag
 



From tmraz at fedoraproject.org  Fri Jan 16 07:43:12 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 16 Jan 2009 07:43:12 +0000 (UTC)
Subject: rpms/ecore/devel ecore.spec,1.13,1.14
Message-ID: <20090116074312.7547F70127@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/ecore/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1216

Modified Files:
	ecore.spec 
Log Message:
* Thu Jan 15 2009 Tomas Mraz <tmraz at redhat.com> - 0.9.9.050-4
- rebuild with new openssl



Index: ecore.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ecore/devel/ecore.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- ecore.spec	17 Dec 2008 18:37:57 -0000	1.13
+++ ecore.spec	16 Jan 2009 07:42:42 -0000	1.14
@@ -1,6 +1,6 @@
 Name:           ecore
 Version:        0.9.9.050
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Event/X abstraction layer
 
 Group:          System Environment/Libraries
@@ -86,6 +86,9 @@
 
 
 %changelog
+* Thu Jan 15 2009 Tomas Mraz <tmraz at redhat.com> - 0.9.9.050-4
+- rebuild with new openssl
+
 * Wed Dec 17 2008 Pavel "Stalwart" Shevchuk <stlwrt at gmail.com> - 0.9.9.050-3
 - rebuilt
 



From tmraz at fedoraproject.org  Fri Jan 16 08:12:50 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 16 Jan 2009 08:12:50 +0000 (UTC)
Subject: rpms/ecryptfs-utils/devel ecryptfs-utils.spec,1.34,1.35
Message-ID: <20090116081250.34F9F70127@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/ecryptfs-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4072

Modified Files:
	ecryptfs-utils.spec 
Log Message:
* Thu Jan 15 2009 Tomas Mraz <tmraz at redhat.com> 68-1
- rebuild with new openssl



Index: ecryptfs-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ecryptfs-utils/devel/ecryptfs-utils.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- ecryptfs-utils.spec	12 Jan 2009 16:57:50 -0000	1.34
+++ ecryptfs-utils.spec	16 Jan 2009 08:12:19 -0000	1.35
@@ -3,7 +3,7 @@
 
 Name: ecryptfs-utils
 Version: 68
-Release: 0%{?dist}
+Release: 1%{?dist}
 Summary: The eCryptfs mount helper and support libraries
 Group: System Environment/Base
 License: GPLv2+
@@ -128,6 +128,9 @@
 %{python_sitearch}/ecryptfs-utils/_libecryptfs.so
 
 %changelog
+* Thu Jan 15 2009 Tomas Mraz <tmraz at redhat.com> 68-1
+- rebuild with new openssl
+
 * Mon Jan 12 2009 Michal Hlavinka <mhlavink at redhat.com> 68-0
 - updated to 68
 - fix #478464 - /usr/bin/ecryptfs-setup-private errors out



From tmraz at fedoraproject.org  Fri Jan 16 08:15:16 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 16 Jan 2009 08:15:16 +0000 (UTC)
Subject: rpms/efreet/devel efreet.spec,1.3,1.4
Message-ID: <20090116081516.A838F70127@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/efreet/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4309

Modified Files:
	efreet.spec 
Log Message:
* Fri Jan 16 2009 Tomas Mraz <tmraz at redhat.com> - 0.5.0.050-2
- rebuild with new openssl



Index: efreet.spec
===================================================================
RCS file: /cvs/pkgs/rpms/efreet/devel/efreet.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- efreet.spec	29 Nov 2008 22:02:01 -0000	1.3
+++ efreet.spec	16 Jan 2009 08:14:46 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           efreet
 Version:        0.5.0.050
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Implementation of several specifications from freedesktop.org
 
 Group:          System Environment/Libraries
@@ -74,6 +74,9 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Fri Jan 16 2009 Tomas Mraz <tmraz at redhat.com> - 0.5.0.050-2
+- rebuild with new openssl
+
 * Sat Nov 29 2008 Pavel "Stalwart" Shevchuk <stlwrt at gmail.com> - 0.5.0.050-1
 - New upstream snapshot
 



From tmraz at fedoraproject.org  Fri Jan 16 08:59:28 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 16 Jan 2009 08:59:28 +0000 (UTC)
Subject: rpms/ejabberd/devel ejabberd.spec,1.31,1.32
Message-ID: <20090116085928.5B81370127@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/ejabberd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7295

Modified Files:
	ejabberd.spec 
Log Message:
* Fri Jan 16 2009 Tomas Mraz <tmraz at redhat.com> 2.0.2-4
- rebuild with new openssl



Index: ejabberd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ejabberd/devel/ejabberd.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- ejabberd.spec	2 Oct 2008 05:28:56 -0000	1.31
+++ ejabberd.spec	16 Jan 2009 08:58:57 -0000	1.32
@@ -1,6 +1,6 @@
 Name:           ejabberd
 Version:        2.0.2
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        A distributed, fault-tolerant Jabber/XMPP server
 
 Group:          Applications/Internet
@@ -211,6 +211,9 @@
 %endif
 
 %changelog
+* Fri Jan 16 2009 Tomas Mraz <tmraz at redhat.com> 2.0.2-4
+- rebuild with new openssl
+
 * Thu Oct  2 2008 Peter Lemenkov <lemenkov at gmail.com> 2.0.2-3
 - Fixed broken ejabberdctl (BZ# 465196)
 



From tmraz at fedoraproject.org  Fri Jan 16 09:00:05 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 16 Jan 2009 09:00:05 +0000 (UTC)
Subject: rpms/ekg/devel ekg.spec,1.12,1.13
Message-ID: <20090116090005.E4B9B70127@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/ekg/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7367

Modified Files:
	ekg.spec 
Log Message:
* Fri Jan 16 2009 Tomas Mraz <tmraz at redhat.com> - 1.8-0.3.rc1
- rebuild with new openssl



Index: ekg.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ekg/devel/ekg.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- ekg.spec	6 Dec 2008 14:04:39 -0000	1.12
+++ ekg.spec	16 Jan 2009 08:59:35 -0000	1.13
@@ -1,6 +1,6 @@
 Name:		ekg
 Version:	1.8
-Release:	0.2.rc1%{?dist}
+Release:	0.3.rc1%{?dist}
 Summary:	A client compatible with Gadu-Gadu
 Summary(de):	Ein Cliente kompatibel mit Gadu-Gadu
 Summary(es):	Un cliente compatible con Gadu-Gadu
@@ -140,6 +140,9 @@
 %lang(pl) %{_mandir}/pl/man1/*
 
 %changelog
+* Fri Jan 16 2009 Tomas Mraz <tmraz at redhat.com> - 1.8-0.3.rc1
+- rebuild with new openssl
+
 * Sun Nov 30 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 1.8-0.2.rc1
 - Rebuild for Python 2.6
 



From pgordon at fedoraproject.org  Fri Jan 16 09:04:05 2009
From: pgordon at fedoraproject.org (Peter Gordon)
Date: Fri, 16 Jan 2009 09:04:05 +0000 (UTC)
Subject: rpms/rb_libtorrent/devel rb_libtorrent.spec,1.19,1.20
Message-ID: <20090116090405.6ED5170127@cvs1.fedora.phx.redhat.com>

Author: pgordon

Update of /cvs/pkgs/rpms/rb_libtorrent/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7764

Modified Files:
	rb_libtorrent.spec 
Log Message:
Bump and rebuild for the recent OpenSSL soname bump


Index: rb_libtorrent.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rb_libtorrent/devel/rb_libtorrent.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- rb_libtorrent.spec	6 Jan 2009 01:25:28 -0000	1.19
+++ rb_libtorrent.spec	16 Jan 2009 09:03:35 -0000	1.20
@@ -3,7 +3,7 @@
 
 Name:		rb_libtorrent
 Version:	0.14.1
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	A C++ BitTorrent library aiming to be the best alternative
 
 Group:		System Environment/Libraries
@@ -197,6 +197,9 @@
 
 
 %changelog
+* Fri Jan 16 2009 Peter Gordon <peter at thecodergeek.com> - 0.14.1-2
+- Rebuild for the soname bump in openssl-0.9.8j
+
 * Mon Jan 05 2009 Peter Gordon <peter at thecodergeek.com> - 0.14.1-1
 - Update to new upstream release (0.14.1)
 - Add asio-devel as runtime dependency for the devel subpackage (#478589)



From tmraz at fedoraproject.org  Fri Jan 16 09:31:56 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 16 Jan 2009 09:31:56 +0000 (UTC)
Subject: rpms/ekiga/devel ekiga.spec,1.71,1.72
Message-ID: <20090116093156.436AB70127@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/ekiga/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10053

Modified Files:
	ekiga.spec 
Log Message:
* Fri Jan 16 2009 Tomas Mraz <tmraz at redhat.com> - 3.1.0-10
- rebuild with new openssl
- add libtoolize call to replace libtool with current version



Index: ekiga.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ekiga/devel/ekiga.spec,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- ekiga.spec	15 Jan 2009 09:07:58 -0000	1.71
+++ ekiga.spec	16 Jan 2009 09:31:25 -0000	1.72
@@ -1,7 +1,7 @@
 Summary:	A Gnome based SIP/H323 teleconferencing application
 Name:		ekiga
 Version:	3.1.0
-Release:	9%{?dist}
+Release:	10%{?dist}
 URL:		http://www.ekiga.org/
 Source0:	ftp://ftp.gnome.org/pub/gnome/sources/ekiga/3.1/%{name}-%{version}.tar.bz2
 Patch0:		ekiga-fix-desktop-in.patch
@@ -59,6 +59,7 @@
 
 %build
 autoreconf
+libtoolize
 CXXFLAGS="$RPM_OPT_FLAGS -DLDAP_DEPRECATED=1 -fPIC"
 %configure --disable-scrollkeeper --enable-xcap
 make %{?_smp_mflags}
@@ -142,6 +143,10 @@
 %{_sysconfdir}/gconf/schemas/ekiga.schemas
 
 %changelog
+* Fri Jan 16 2009 Tomas Mraz <tmraz at redhat.com> - 3.1.0-10
+- rebuild with new openssl
+- add libtoolize call to replace libtool with current version
+
 * Thu Jan 15 2009 Peter Robinson <pbrobinson at gmail.com> - 3.1.0-9
 - Add other buildreq for Makefile regen
 



From tmraz at fedoraproject.org  Fri Jan 16 09:33:27 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 16 Jan 2009 09:33:27 +0000 (UTC)
Subject: rpms/ekg2/devel ekg2.spec,1.20,1.21
Message-ID: <20090116093327.2A75D70127@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/ekg2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10240

Modified Files:
	ekg2.spec 
Log Message:
* Fri Jan 16 2009 Tomas Mraz <tmraz at redhat.com> - 0.2-0.7.rc1
- rebuild with new openssl



Index: ekg2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ekg2/devel/ekg2.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- ekg2.spec	6 Dec 2008 22:15:46 -0000	1.20
+++ ekg2.spec	16 Jan 2009 09:32:56 -0000	1.21
@@ -5,7 +5,7 @@
 Summary(pl):	Wieloprotoko??owy komunikator internetowy
 Name:		ekg2
 Version:	0.2
-Release:	0.6.rc1%{?dist}.1
+Release:	0.7.rc1%{?dist}
 License:	GPLv2
 Group:		Applications/Internet
 Source0:	http://pl.ekg2.org/%{name}-%{version}-rc1.tar.gz
@@ -374,6 +374,9 @@
 %{_datadir}/%{name}/plugins/xosd
 
 %changelog
+* Fri Jan 16 2009 Tomas Mraz <tmraz at redhat.com> - 0.2-0.7.rc1
+- rebuild with new openssl
+
 * Sat Dec 06 2008 Karol Trzcionka <karlikt at gmail.com> - 0.2-0.6.rc1.1
 - Fix ruby building
 



From rakesh at fedoraproject.org  Fri Jan 16 09:47:40 2009
From: rakesh at fedoraproject.org (Rakesh Pandit)
Date: Fri, 16 Jan 2009 09:47:40 +0000 (UTC)
Subject: rpms/cln/devel cln.spec,1.26,1.27
Message-ID: <20090116094740.9E3AC70127@cvs1.fedora.phx.redhat.com>

Author: rakesh

Update of /cvs/pkgs/rpms/cln/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11726

Modified Files:
	cln.spec 
Log Message:
- Bump to solve dependency for ginac-devel



Index: cln.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cln/devel/cln.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- cln.spec	30 Apr 2008 13:17:52 -0000	1.26
+++ cln.spec	16 Jan 2009 09:47:10 -0000	1.27
@@ -1,6 +1,6 @@
 Name:           cln
 Version:        1.2.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Class Library for Numbers
 
 Group:          System Environment/Libraries
@@ -75,6 +75,9 @@
 %exclude %{_libdir}/*.la
 
 %changelog
+* Fri Jan 16 2009 Rakesh Pandit <rakesh at fedoraproject.org> 1.2.2-2
+- Bump to solve dependency for ginac-devel
+
 * Tue Apr 29 2008 Quentin Spencer <qspencer at users.sf.net> 1.2.2-1
 - Update to 1.2.2.
 



From tmraz at fedoraproject.org  Fri Jan 16 09:48:55 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 16 Jan 2009 09:48:55 +0000 (UTC)
Subject: rpms/elinks/devel elinks.spec,1.61,1.62
Message-ID: <20090116094855.7E63B70127@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/elinks/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11952

Modified Files:
	elinks.spec 
Log Message:
* Fri Jan 16 2009 Tomas Mraz <tmraz at redhat.com> 0.12-0.8.pre2
- rebuild with new openssl



Index: elinks.spec
===================================================================
RCS file: /cvs/pkgs/rpms/elinks/devel/elinks.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- elinks.spec	14 Jan 2009 11:16:11 -0000	1.61
+++ elinks.spec	16 Jan 2009 09:48:25 -0000	1.62
@@ -1,7 +1,7 @@
 Name:      elinks
 Summary:   A text-mode Web browser
 Version:   0.12
-Release:   0.7.pre2%{?dist}
+Release:   0.8.pre2%{?dist}
 License:   GPLv2
 URL:       http://elinks.or.cz
 Group:     Applications/Internet
@@ -90,6 +90,9 @@
 %{_mandir}/man5/*
 
 %changelog
+* Fri Jan 16 2009 Tomas Mraz <tmraz at redhat.com> 0.12-0.8.pre2
+- rebuild with new openssl
+
 * Wed Jan 14 2009 Ondrej Vasik <ovasik at redhat.com> 0.12.0.7.pre2
 - versioned obsoletes and provides for links
 



From tmraz at fedoraproject.org  Fri Jan 16 09:49:30 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 16 Jan 2009 09:49:30 +0000 (UTC)
Subject: rpms/engine_pkcs11/devel engine_pkcs11.spec,1.4,1.5
Message-ID: <20090116094930.4870970127@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/engine_pkcs11/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12004

Modified Files:
	engine_pkcs11.spec 
Log Message:
* Fri Jan 16 2009 Tomas Mraz <tmraz at redhat.com> - 0.1.4-3
- rebuild with new openssl



Index: engine_pkcs11.spec
===================================================================
RCS file: /cvs/pkgs/rpms/engine_pkcs11/devel/engine_pkcs11.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- engine_pkcs11.spec	19 Feb 2008 15:22:02 -0000	1.4
+++ engine_pkcs11.spec	16 Jan 2009 09:49:00 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           engine_pkcs11
 Version:        0.1.4
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A PKCS#11 engine for use with OpenSSL
 
 Group:          Development/Libraries
@@ -45,6 +45,9 @@
 
 
 %changelog
+* Fri Jan 16 2009 Tomas Mraz <tmraz at redhat.com> - 0.1.4-3
+- rebuild with new openssl
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.1.4-2
 - Autorebuild for GCC 4.3
 



From caolanm at fedoraproject.org  Fri Jan 16 10:05:47 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Fri, 16 Jan 2009 10:05:47 +0000 (UTC)
Subject: rpms/openoffice.org/devel openoffice.org.spec, 1.1757,
	1.1758 workspace.vcl98.patch, 1.3,
	1.4 openoffice.org-3.0.1.ooo98024.vcl.emboldenoverlap.patch, 1.1, NONE
Message-ID: <20090116100547.5E05570127@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13017

Modified Files:
	openoffice.org.spec workspace.vcl98.patch 
Removed Files:
	openoffice.org-3.0.1.ooo98024.vcl.emboldenoverlap.patch 
Log Message:
consolidate patch into upstream workspace


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1757
retrieving revision 1.1758
diff -u -r1.1757 -r1.1758
--- openoffice.org.spec	15 Jan 2009 23:05:18 -0000	1.1757
+++ openoffice.org.spec	16 Jan 2009 10:05:16 -0000	1.1758
@@ -134,9 +134,8 @@
 Patch61: openoffice.org-3.0.1.oooXXXXX.extensions.npapi.patch
 Patch62: openoffice.org-3.0.1.ooo97975.bridges.mainalreadyexited.patch
 Patch63: openoffice.org-3.0.1.ooo97488.sw.ww8toc.patch
-Patch64: openoffice.org-3.0.1.ooo98024.vcl.emboldenoverlap.patch
-Patch65: openoffice.org-3.0.1.oooXXXXX.fpicker.allformatsonsave.patch
-Patch66: workspace.fwk99.patch
+Patch64: openoffice.org-3.0.1.oooXXXXX.fpicker.allformatsonsave.patch
+Patch65: workspace.fwk99.patch
 
 %define instdir %{_libdir}
 %define baseinstdir %{instdir}/openoffice.org
@@ -1418,9 +1417,8 @@
 %patch61 -p1 -b .oooXXXXX.extensions.npapi.patch
 %patch62 -p1 -b .ooo97975.bridges.mainalreadyexited.patch
 %patch63 -p1 -b .ooo97488.sw.ww8toc.patch
-%patch64 -p1 -b .ooo98024.vcl.emboldenoverlap.patch
-%patch65 -p1 -b .oooXXXXX.fpicker.allformatsonsave.patch
-%patch66 -p1 -b .workspace.fwk99.patch
+%patch64 -p1 -b .oooXXXXX.fpicker.allformatsonsave.patch
+%patch65 -p1 -b .workspace.fwk99.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -3830,7 +3828,7 @@
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
-* Tue Jan 15 2009 Caol??n McNamara <caolanm at redhat.com> - 1:3.0.1-15.2
+* Fri Jan 16 2009 Caol??n McNamara <caolanm at redhat.com> - 1:3.0.1-15.2
 - Resolves: rhbz#479624 add
   openoffice.org-3.0.1.ooo98024.vcl.emboldenoverlap.patch
 - add hyphen-uk, hyphen-pt dependency

workspace.vcl98.patch:

Index: workspace.vcl98.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/workspace.vcl98.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- workspace.vcl98.patch	7 Jan 2009 12:23:10 -0000	1.3
+++ workspace.vcl98.patch	16 Jan 2009 10:05:16 -0000	1.4
@@ -124,3 +124,61 @@
      }
      static const char* pEnv = getenv( "SAL_GTK_USE_PIXMAPPAINT" );
      if( pEnv && *pEnv )
+Index: source/glyphs/gcach_ftyp.cxx
+===================================================================
+RCS file: /cvs/gsl/vcl/source/glyphs/gcach_ftyp.cxx,v
+retrieving revision 1.150.2.1
+diff -u -r1.150.2.1 gcach_ftyp.cxx
+--- openoffice.org.orig/vcl/source/glyphs/gcach_ftyp.cxx	26 Aug 2008 12:26:31 -0000	1.150.2.1
++++ openoffice.org/vcl/source/glyphs/gcach_ftyp.cxx	13 Jan 2009 10:05:32 -0000
+@@ -1241,6 +1269,22 @@
+     return nGlyphIndex;
+ }
+ 
++static int lcl_GetCharWidth(FT_FaceRec_* pFaceFT, double fStretch, int nGlyphFlags)
++{
++    int nCharWidth = pFaceFT->glyph->metrics.horiAdvance;
++
++    if( nGlyphFlags & GF_ROTMASK ) {  // for bVertical rotated glyphs
++        const FT_Size_Metrics& rMetrics = pFaceFT->size->metrics;
++#if (FTVERSION < 2000)
++        nCharWidth = (int)((rMetrics.height - rMetrics.descender) * fStretch);
++#else
++        nCharWidth = (int)((rMetrics.height + rMetrics.descender) * fStretch);
++#endif
++    }
++
++    return (nCharWidth + 32) >> 6;
++}
++
+ // -----------------------------------------------------------------------
+ 
+ void FreetypeServerFont::InitGlyphData( int nGlyphIndex, GlyphData& rGD ) const
+@@ -1282,20 +1327,17 @@
+         return;
+     }
+ 
++    bool bOriginallyZeroWidth = false;
+     if( mbArtBold && pFTEmbolden )
++    {
++        if (lcl_GetCharWidth(maFaceFT, mfStretch, nGlyphFlags) == 0)
++            bOriginallyZeroWidth = true;
+         (*pFTEmbolden)( maFaceFT->glyph );
++    }
+ 
+-    int nCharWidth = maFaceFT->glyph->metrics.horiAdvance;
++    int nCharWidth = !bOriginallyZeroWidth ? lcl_GetCharWidth(maFaceFT, mfStretch, nGlyphFlags) : 0;
+ 
+-    if( nGlyphFlags & GF_ROTMASK ) {  // for bVertical rotated glyphs
+-        const FT_Size_Metrics& rMetrics = maFaceFT->size->metrics;
+-#if (FTVERSION < 2000)
+-        nCharWidth = (int)((rMetrics.height - rMetrics.descender) * mfStretch);
+-#else
+-        nCharWidth = (int)((rMetrics.height + rMetrics.descender) * mfStretch);
+-#endif
+-    }
+-    rGD.SetCharWidth( (nCharWidth + 32) >> 6 );
++    rGD.SetCharWidth( nCharWidth );
+ 
+     FT_Glyph pGlyphFT;
+     rc = FT_Get_Glyph( maFaceFT->glyph, &pGlyphFT );


--- openoffice.org-3.0.1.ooo98024.vcl.emboldenoverlap.patch DELETED ---



From tmraz at fedoraproject.org  Fri Jan 16 10:08:23 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 16 Jan 2009 10:08:23 +0000 (UTC)
Subject: rpms/enlightenment/devel enlightenment.spec,1.4,1.5
Message-ID: <20090116100823.B426370127@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/enlightenment/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13879

Modified Files:
	enlightenment.spec 
Log Message:
* Fri Jan 16 2009 Tomas Mraz <tmraz at redhat.com> - 0.16.999.050-2
- rebuild with new openssl



Index: enlightenment.spec
===================================================================
RCS file: /cvs/pkgs/rpms/enlightenment/devel/enlightenment.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- enlightenment.spec	29 Nov 2008 22:48:42 -0000	1.4
+++ enlightenment.spec	16 Jan 2009 10:07:53 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           enlightenment
 Version:        0.16.999.050
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Highly optimized and extensible desktop shell
 
 Group:          User Interface/Desktops
@@ -93,6 +93,9 @@
 
 
 %changelog
+* Fri Jan 16 2009 Tomas Mraz <tmraz at redhat.com> - 0.16.999.050-2
+- rebuild with new openssl
+
 * Sun Nov 30 2008 Pavel "Stalwart" Shevchuk - 0.16.999.050-1
 - New upstream snapshot
 



From tmraz at fedoraproject.org  Fri Jan 16 10:08:45 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 16 Jan 2009 10:08:45 +0000 (UTC)
Subject: rpms/epic/devel epic.spec,1.30,1.31
Message-ID: <20090116100845.B65D570127@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/epic/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13920

Modified Files:
	epic.spec 
Log Message:
* Fri Jan 16 2009 Tomas Mraz <tmraz at redhat.com> - 4:2.10-2
- rebuild with new openssl



Index: epic.spec
===================================================================
RCS file: /cvs/pkgs/rpms/epic/devel/epic.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- epic.spec	25 Nov 2008 11:55:36 -0000	1.30
+++ epic.spec	16 Jan 2009 10:08:15 -0000	1.31
@@ -1,7 +1,7 @@
 Summary: An ircII chat client
 Name: epic
 Version: 2.10
-Release: 1%{?dist}
+Release: 2%{?dist}
 Epoch: 4
 # The entire source code is Freely redistributable without restriction except some
 # files (notably, glob.c, and compat.c) may contain some source covered by BSD
@@ -81,6 +81,9 @@
 %{_datadir}/epic/help/*
 
 %changelog
+* Fri Jan 16 2009 Tomas Mraz <tmraz at redhat.com> - 4:2.10-2
+- rebuild with new openssl
+
 * Tue Nov 25 2008 Vitezslav Crhonek <vcrhonek at redhat.com> - 4:2.10-1
 - Update to upstream epic4-2.10
 



From kkofler at fedoraproject.org  Fri Jan 16 10:13:21 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Fri, 16 Jan 2009 10:13:21 +0000 (UTC)
Subject: rpms/qt/devel qt.spec,1.220,1.221
Message-ID: <20090116101322.0370770127@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/qt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14446/devel

Modified Files:
	qt.spec 
Log Message:
* Fri Jan 16 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.4.3-11
- rebuild for new OpenSSL


Index: qt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qt/devel/qt.spec,v
retrieving revision 1.220
retrieving revision 1.221
diff -u -r1.220 -r1.221
--- qt.spec	12 Jan 2009 20:15:44 -0000	1.220
+++ qt.spec	16 Jan 2009 10:12:51 -0000	1.221
@@ -9,7 +9,7 @@
 Name:    qt4
 %endif
 Version: 4.4.3
-Release: 10%{?dist}
+Release: 11%{?dist}
 
 # GPLv2 exceptions(see GPL_EXCEPTIONS*.txt)
 License: GPLv3 with exceptions or GPLv2 with exceptions
@@ -731,6 +731,9 @@
 
 
 %changelog
+* Fri Jan 16 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.4.3-11
+- rebuild for new OpenSSL
+
 * Mon Jan 12 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.4.3-10
 - drop qt-x11-opensource-src-4.3.4-no-hardcoded-font-aliases.patch (#447298),
   in favor of qt-copy's 0263-fix-fontconfig-handling.diff



From kkofler at fedoraproject.org  Fri Jan 16 10:15:13 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Fri, 16 Jan 2009 10:15:13 +0000 (UTC)
Subject: rpms/redland/devel redland.spec,1.12,1.13
Message-ID: <20090116101513.2533B70127@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/redland/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14634/devel

Modified Files:
	redland.spec 
Log Message:
* Fri Jan 16 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 1.0.7-4
- rebuild for new OpenSSL


Index: redland.spec
===================================================================
RCS file: /cvs/pkgs/rpms/redland/devel/redland.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- redland.spec	23 Nov 2008 13:56:16 -0000	1.12
+++ redland.spec	16 Jan 2009 10:14:42 -0000	1.13
@@ -1,6 +1,6 @@
 Name:           redland
 Version:        1.0.7
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        RDF Application Framework
 
 Group:          System Environment/Libraries
@@ -101,6 +101,9 @@
 %postun -p /sbin/ldconfig
 
 %changelog
+* Fri Jan 16 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 1.0.7-4
+- rebuild for new OpenSSL
+
 * Sun Nov 23 2008 Thomas Vander Stichele <thomas at apestaart dot org>
 - 1.0.7-3
 - updated summary



From tmraz at fedoraproject.org  Fri Jan 16 10:16:47 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 16 Jan 2009 10:16:47 +0000 (UTC)
Subject: rpms/epsilon/devel epsilon.spec,1.3,1.4
Message-ID: <20090116101647.C7ADA70127@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/epsilon/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14868

Modified Files:
	epsilon.spec 
Log Message:
* Fri Jan 16 2009 Tomas Mraz <tmraz at redhat.com> - 0.3.0.012-6
- rebuild with new openssl



Index: epsilon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/epsilon/devel/epsilon.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- epsilon.spec	28 Aug 2008 20:58:26 -0000	1.3
+++ epsilon.spec	16 Jan 2009 10:16:17 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           epsilon
 Version:        0.3.0.012
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Small, display independent, and quick thumbnailing library
 
 Group:          System Environment/Libraries
@@ -84,6 +84,9 @@
 
 
 %changelog
+* Fri Jan 16 2009 Tomas Mraz <tmraz at redhat.com> - 0.3.0.012-6
+- rebuild with new openssl
+
 * Thu Aug 28 2008 Michael Schwendt <mschwendt at fedoraproject.org> - 0.3.0.012-5
 - include unowned directory
 



From kkofler at fedoraproject.org  Fri Jan 16 10:17:09 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Fri, 16 Jan 2009 10:17:09 +0000 (UTC)
Subject: rpms/xchat/devel xchat.spec,1.98,1.99
Message-ID: <20090116101709.23BA170127@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/xchat/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14913/devel

Modified Files:
	xchat.spec 
Log Message:
* Fri Jan 16 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 1:2.8.6-5
- rebuild for new OpenSSL


Index: xchat.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xchat/devel/xchat.spec,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -r1.98 -r1.99
--- xchat.spec	1 Dec 2008 05:03:55 -0000	1.98
+++ xchat.spec	16 Jan 2009 10:16:38 -0000	1.99
@@ -4,7 +4,7 @@
 Summary:   A popular and easy to use graphical IRC (chat) client
 Name:      xchat
 Version:   2.8.6
-Release:   4%{?dist}
+Release:   5%{?dist}
 Epoch:     1
 Group:     Applications/Internet
 License:   GPLv2+
@@ -164,6 +164,9 @@
 %{_libdir}/xchat/plugins/tcl.so
 
 %changelog
+* Fri Jan 16 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 1:2.8.6-5
+- rebuild for new OpenSSL
+
 * Sun Nov 30 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 1:2.8.6-4
 - Rebuild for Python 2.6
 



From caolanm at fedoraproject.org  Fri Jan 16 10:18:41 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Fri, 16 Jan 2009 10:18:41 +0000 (UTC)
Subject: rpms/openoffice.org/devel workspace.configuretoplevel.patch, NONE, 
	1.1 openoffice.org.spec, 1.1758, 1.1759 workspace.vcl98.patch, 1.4, 
	1.5 openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch, 1.4,
	NONE
	openoffice.org-3.0.1.ooo97428.config_office.xinerama-on-x86_64.patch, 
	1.2, NONE
Message-ID: <20090116101841.6AA0A70127@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15218

Modified Files:
	openoffice.org.spec workspace.vcl98.patch 
Added Files:
	workspace.configuretoplevel.patch 
Removed Files:
	openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch 
	openoffice.org-3.0.1.ooo97428.config_office.xinerama-on-x86_64.patch 
Log Message:
consolidate patches

workspace.configuretoplevel.patch:

--- NEW FILE workspace.configuretoplevel.patch ---
diff -up OOO300_m9/config_office/configure.in.orig OOO300_m9.old3/config_office/configure.in
--- OOO300_m9/config_office/configure.in.orig	2008-12-18 10:51:57.000000000 +0100
+++ OOO300_m9/config_office/configure.in	2008-12-18 10:52:26.000000000 +0100
@@ -4348,7 +4348,10 @@
 fi
 AC_SUBST(XINC)
 if test "$x_libraries" = "default_x_libraries"; then
-   XLIB="/usr/lib"
+   XLIB=`$PKG_CONFIG --variable=libdir x11`
+   if test "x$XLIB" = x; then
+         XLIB="/usr/lib"
+   fi
 else
    XLIB="$x_libraries"
 fi


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1758
retrieving revision 1.1759
diff -u -r1.1758 -r1.1759
--- openoffice.org.spec	16 Jan 2009 10:05:16 -0000	1.1758
+++ openoffice.org.spec	16 Jan 2009 10:18:10 -0000	1.1759
@@ -101,41 +101,39 @@
 Patch28: workspace.mba31issues01.patch
 Patch29: openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch
 Patch30: openoffice.org-3.0.0.ooo88341.sc.verticalboxes.patch
-Patch31: openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch
-Patch32: openoffice.org-3.0.0.ooo87970.vcl.samenamesubs.patch
-Patch33: openoffice.org-3.0.0.ooo48400.svx.fixspelling.patch
-Patch34: workspace.locales31.patch
-Patch35: workspace.fpicker8.patch
-Patch36: workspace.cmcfixes49.patch
-Patch37: openoffice.org-3.0.0.ooo91924.svx.consistentordering.patch
-Patch38: workspace.cmcfixes50.patch
-Patch39: openoffice.org-3.0.0.ooo93515.vcl.jrb-frames.patch
-Patch40: workspace.vcl94.patch
-Patch41: workspace.vcl95.patch
-Patch42: openoffice.org-3.0.0.ooo94938.unopkg.handleexception.patch
-Patch43: workspace.mhu17.patch
-Patch44: openoffice.org-3.0.0.ooo95018.sal.fdwarnings.patch
-Patch45: openoffice.org-3.0.0.ooo95318.system-showicons.patch
-Patch46: workspace.vcl96.patch
-Patch47: workspace.hb12.patch
-Patch48: workspace.fwk92.patch
-Patch49: openoffice.org-3.0.0.ooo95834.dontset-nonfunctional-forward.patch
-Patch50: workspace.sb101.patch
-Patch51: workspace.sw31bf02.patch
-Patch52: workspace.cmcfixes51.patch
-Patch53: openoffice.org-3.0.0.ooo96279.swext.mediawiki.proxies.patch
-Patch54: openoffice.org-3.0.0.ooo96391.sw.prefsalwaysmodified.patch
-Patch55: workspace.tkr16.patch
-Patch56: openoffice.org-3.0.1.ooo97088.sd.accel-fallback.patch
-Patch57: workspace.transogl03.patch
-Patch58: workspace.vcl97.patch
-Patch59: workspace.vcl98.patch
-Patch60: openoffice.org-3.0.1.ooo97428.config_office.xinerama-on-x86_64.patch
-Patch61: openoffice.org-3.0.1.oooXXXXX.extensions.npapi.patch
-Patch62: openoffice.org-3.0.1.ooo97975.bridges.mainalreadyexited.patch
-Patch63: openoffice.org-3.0.1.ooo97488.sw.ww8toc.patch
-Patch64: openoffice.org-3.0.1.oooXXXXX.fpicker.allformatsonsave.patch
-Patch65: workspace.fwk99.patch
+Patch31: openoffice.org-3.0.0.ooo87970.vcl.samenamesubs.patch
+Patch32: openoffice.org-3.0.0.ooo48400.svx.fixspelling.patch
+Patch33: workspace.locales31.patch
+Patch34: workspace.fpicker8.patch
+Patch35: workspace.cmcfixes49.patch
+Patch36: openoffice.org-3.0.0.ooo91924.svx.consistentordering.patch
+Patch37: workspace.cmcfixes50.patch
+Patch38: workspace.vcl94.patch
+Patch39: workspace.vcl95.patch
+Patch40: openoffice.org-3.0.0.ooo94938.unopkg.handleexception.patch
+Patch41: workspace.mhu17.patch
+Patch42: openoffice.org-3.0.0.ooo95018.sal.fdwarnings.patch
+Patch43: openoffice.org-3.0.0.ooo95318.system-showicons.patch
+Patch44: workspace.vcl96.patch
+Patch45: workspace.hb12.patch
+Patch46: workspace.fwk92.patch
+Patch47: openoffice.org-3.0.0.ooo95834.dontset-nonfunctional-forward.patch
+Patch48: workspace.sb101.patch
+Patch49: workspace.sw31bf02.patch
+Patch50: workspace.cmcfixes51.patch
+Patch51: openoffice.org-3.0.0.ooo96279.swext.mediawiki.proxies.patch
+Patch52: openoffice.org-3.0.0.ooo96391.sw.prefsalwaysmodified.patch
+Patch53: workspace.tkr16.patch
+Patch54: openoffice.org-3.0.1.ooo97088.sd.accel-fallback.patch
+Patch55: workspace.transogl03.patch
+Patch56: workspace.vcl97.patch
+Patch57: workspace.vcl98.patch
+Patch58: workspace.configuretoplevel.patch
+Patch59: openoffice.org-3.0.1.oooXXXXX.extensions.npapi.patch
+Patch60: openoffice.org-3.0.1.ooo97975.bridges.mainalreadyexited.patch
+Patch61: openoffice.org-3.0.1.ooo97488.sw.ww8toc.patch
+Patch62: openoffice.org-3.0.1.oooXXXXX.fpicker.allformatsonsave.patch
+Patch63: workspace.fwk99.patch
 
 %define instdir %{_libdir}
 %define baseinstdir %{instdir}/openoffice.org
@@ -1384,41 +1382,39 @@
 %patch28 -p1 -b .workspace.mba31issues01.patch
 %patch29 -p1 -b .ooo64508.vcl.honourfontconfighinting.patch
 %patch30 -p1 -b .ooo88341.sc.verticalboxes.patch
-%patch31 -p1 -b .gccXXXXX.solenv.javaregistration.patch
-%patch32 -p1 -b .ooo87970.vcl.samenamesubs.patch
-%patch33 -p1 -b .ooo48400.svx.fixspelling.patch
-%patch34 -p1 -b .workspace.locales31.patch
-%patch35 -p1 -b .workspace.fpicker8.patch
-%patch36 -p0 -b .workspace.cmcfixes49.patch
-%patch37 -p1 -b .ooo91924.svx.consistentordering.patch
-%patch38 -p1 -b .workspace.cmcfixes50.patch
-%patch39 -p1 -b .ooo93515.vcl.jrb-frames.patch
-%patch40 -p1 -b .workspace.vcl94.patch
-%patch41 -p1 -b .workspace.vcl95.patch
-%patch42 -p1 -b .ooo94938.unopkg.handleexception.patch
-%patch43 -p1 -b .workspace.mhu17.patch
-%patch44 -p1 -b .ooo95018.sal.fdwarnings.patch
-%patch45 -p1 -b .ooo95318.system-showicons.patch
-%patch46 -p1 -b .workspace.vcl96.patch
-%patch47 -p1 -b .workspace.hb12.patch
-%patch48 -p1 -b .workspace.fwk92.patch
-%patch49 -p1 -b .ooo95834.dontset-nonfunctional-forward.patch
-%patch50 -p1 -b .workspace.sb101.patch
-%patch51 -p1 -b .workspace.sw31bf02.patch
-%patch52 -p1 -b .workspace.cmcfixes51.patch
-%patch53 -p1 -b .ooo96279.swext.mediawiki.proxies.patch
-%patch54 -p1 -b .ooo96391.sw.prefsalwaysmodified.patch
-%patch55 -p1 -b .workspace.tkr16.patch
-%patch56 -p1
-%patch57 -p0 -b .workspace.transogl03.patch
-%patch58 -p1 -b .workspace.vcl97.patch
-%patch59 -p1 -b .workspace.vcl98.patch
-%patch60 -p1 -b .ooo97428.config_office.xinerama-on-x86_64.patch
-%patch61 -p1 -b .oooXXXXX.extensions.npapi.patch
-%patch62 -p1 -b .ooo97975.bridges.mainalreadyexited.patch
-%patch63 -p1 -b .ooo97488.sw.ww8toc.patch
-%patch64 -p1 -b .oooXXXXX.fpicker.allformatsonsave.patch
-%patch65 -p1 -b .workspace.fwk99.patch
+%patch31 -p1 -b .ooo87970.vcl.samenamesubs.patch
+%patch32 -p1 -b .ooo48400.svx.fixspelling.patch
+%patch33 -p1 -b .workspace.locales31.patch
+%patch34 -p1 -b .workspace.fpicker8.patch
+%patch35 -p0 -b .workspace.cmcfixes49.patch
+%patch36 -p1 -b .ooo91924.svx.consistentordering.patch
+%patch37 -p1 -b .workspace.cmcfixes50.patch
+%patch38 -p1 -b .workspace.vcl94.patch
+%patch39 -p1 -b .workspace.vcl95.patch
+%patch40 -p1 -b .ooo94938.unopkg.handleexception.patch
+%patch41 -p1 -b .workspace.mhu17.patch
+%patch42 -p1 -b .ooo95018.sal.fdwarnings.patch
+%patch43 -p1 -b .ooo95318.system-showicons.patch
+%patch44 -p1 -b .workspace.vcl96.patch
+%patch45 -p1 -b .workspace.hb12.patch
+%patch46 -p1 -b .workspace.fwk92.patch
+%patch47 -p1 -b .ooo95834.dontset-nonfunctional-forward.patch
+%patch48 -p1 -b .workspace.sb101.patch
+%patch49 -p1 -b .workspace.sw31bf02.patch
+%patch50 -p1 -b .workspace.cmcfixes51.patch
+%patch51 -p1 -b .ooo96279.swext.mediawiki.proxies.patch
+%patch52 -p1 -b .ooo96391.sw.prefsalwaysmodified.patch
+%patch53 -p1 -b .workspace.tkr16.patch
+%patch54 -p1
+%patch55 -p0 -b .workspace.transogl03.patch
+%patch56 -p1 -b .workspace.vcl97.patch
+%patch57 -p1 -b .workspace.vcl98.patch
+%patch58 -p1 -b .workspace.configuretoplevel.patch
+%patch59 -p1 -b .oooXXXXX.extensions.npapi.patch
+%patch60 -p1 -b .ooo97975.bridges.mainalreadyexited.patch
+%patch61 -p1 -b .ooo97488.sw.ww8toc.patch
+%patch62 -p1 -b .oooXXXXX.fpicker.allformatsonsave.patch
+%patch63 -p1 -b .workspace.fwk99.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`

workspace.vcl98.patch:

Index: workspace.vcl98.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/workspace.vcl98.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- workspace.vcl98.patch	16 Jan 2009 10:05:16 -0000	1.4
+++ workspace.vcl98.patch	16 Jan 2009 10:18:11 -0000	1.5
@@ -182,3 +182,144 @@
  
      FT_Glyph pGlyphFT;
      rc = FT_Get_Glyph( maFaceFT->glyph, &pGlyphFT );
+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
+@@ -788,6 +791,7 @@
+         {
+             eType = GDK_WINDOW_TYPE_HINT_UTILITY;
+             gtk_window_set_skip_taskbar_hint( GTK_WINDOW(m_pWindow), true );
++            lcl_set_accept_focus( GTK_WINDOW(m_pWindow), FALSE, true );
+         }
+         else if( (nStyle & SAL_FRAME_STYLE_OWNERDRAWDECORATION) )
+         {
+@@ -817,11 +821,22 @@
+ 
+     InitCommon();
+ 
++    if (eWinType == GTK_WINDOW_TOPLEVEL)
++        gdk_x11_window_set_user_time(GTK_WIDGET(m_pWindow)->window, safe_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 );
+-        if( (nStyle & SAL_FRAME_STYLE_OWNERDRAWDECORATION) )
++        if( 
++             ( 
++               ( (nStyle & SAL_FRAME_STYLE_OWNERDRAWDECORATION) ) || 
++               ( (nStyle & SAL_FRAME_STYLE_TOOLWINDOW ) )
++             ) &&
++             getDisplay()->getWMAdaptor()->getWindowManagerName().EqualsAscii("Metacity")
++          )
++          {
+             lcl_set_accept_focus( GTK_WINDOW(m_pWindow), FALSE, false );
++          }
+     }
+     
+ }
+@@ -1275,7 +1290,34 @@
+                  */
+                  m_pParent->grabPointer( TRUE, TRUE );
+             }
++
++            //For these floating windows we don't want the main window to lose focus, and metacity has...
++            // metacity-2.24.0/src/core/window.c
++            //
++            //  if ((focus_window != NULL) && XSERVER_TIME_IS_BEFORE (compare, focus_window->net_wm_user_time))
++            //  	"compare" window focus prevented by other activity
++            //
++            //  where "compare" is this window
++
++            //  which leads to...
++
++            // /* This happens for error dialogs or alerts; these need to remain on
++            // * top, but it would be confusing to have its ancestor remain
++            // * focused.
++            // */
++            // if (meta_window_is_ancestor_of_transient (focus_window, window))
++            //          "The focus window %s is an ancestor of the newly mapped "
++            //         "window %s which isn't being focused.  Unfocusing the "
++            //          "ancestor.\n",
++            //
++            // i.e. having a time < that of the toplevel frame means that the toplevel frame gets unfocused.
++            // awesome.
++
++            if( m_pParent && ( ( (m_nStyle & SAL_FRAME_STYLE_OWNERDRAWDECORATION) ) || ( (m_nStyle & SAL_FRAME_STYLE_TOOLWINDOW ) ) ) )
++                gdk_x11_window_set_user_time(GTK_WIDGET(m_pWindow)->window, safe_gdk_x11_get_server_time (GTK_WIDGET (m_pWindow)->window));
++
+             gtk_widget_show( m_pWindow );
++
+             if( isFloatGrabWindow() )
+             {
+                 m_nFloats++;
+@@ -1961,7 +2004,8 @@
+             if( ! (nFlags & SAL_FRAME_TOTOP_GRABFOCUS_ONLY) )
+                 gtk_window_present( GTK_WINDOW(m_pWindow) );
+             else
+-                gdk_window_focus( m_pWindow->window, GDK_CURRENT_TIME );
++                gdk_window_focus( m_pWindow->window, safe_gdk_x11_get_server_time (GTK_WIDGET (m_pWindow)->window) );
++
+             /*  need to do an XSetInputFocus here because
+              *  gdk_window_focus will ask a EWMH compliant WM to put the focus
+              *  to our window - which it of course won't since our input hint
+@@ -3586,3 +3654,22 @@
+ 
+     return FALSE;
+ }
++
++guint32 GtkSalFrame::safe_gdk_x11_get_server_time(GdkWindow *window)
++{
++    static bool bSyncing = getenv("SAL_SYNCHRONIZE");
++
++    Display *pDisplay = NULL;
++    if (!bSyncing)
++    {
++        pDisplay = GDK_DISPLAY_XDISPLAY( getGdkDisplay() );
++        XSynchronize(pDisplay, true);
++    }
++
++    guint32 nRet = gdk_x11_get_server_time(window);
++
++    if (!bSyncing)
++        XSynchronize(pDisplay, false);
++
++    return nRet;
++}
+Index: unx/inc/plugins/gtk/gtkframe.hxx
+===================================================================
+RCS file: /cvs/gsl/vcl/unx/inc/plugins/gtk/gtkframe.hxx,v
+retrieving revision 1.35
+diff -u -r1.35 gtkframe.hxx
+--- openoffice.org.orig/vcl/unx/inc/plugins/gtk/gtkframe.hxx	30 May 2008 08:59:06 -0000	1.35
++++ openoffice.org/vcl/unx/inc/plugins/gtk/gtkframe.hxx	22 Dec 2008 15:52:53 -0000
+@@ -290,6 +290,7 @@
+     void updateScreenNumber();
+     
+     void moveToScreen( int nScreen );
++    guint32 safe_gdk_x11_get_server_time(GdkWindow *window);
+ 
+     virtual ~GtkSalFrame();
+ 


--- openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch DELETED ---


--- openoffice.org-3.0.1.ooo97428.config_office.xinerama-on-x86_64.patch DELETED ---



From kkofler at fedoraproject.org  Fri Jan 16 10:19:57 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Fri, 16 Jan 2009 10:19:57 +0000 (UTC)
Subject: rpms/kdebase3/devel kdebase3.spec,1.75,1.76
Message-ID: <20090116101957.CABD670127@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdebase3/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15354/devel

Modified Files:
	kdebase3.spec 
Log Message:
* Fri Jan 16 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 3.5.10-5
- rebuild for new OpenSSL


Index: kdebase3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase3/devel/kdebase3.spec,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- kdebase3.spec	22 Dec 2008 16:31:39 -0000	1.75
+++ kdebase3.spec	16 Jan 2009 10:19:27 -0000	1.76
@@ -14,7 +14,7 @@
 %define _with_samba --with-samba
 
 Version: 3.5.10
-Release: 4%{?dist}
+Release: 5%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdebase3
@@ -864,6 +864,9 @@
 
 
 %changelog
+* Fri Jan 16 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 3.5.10-5
+- rebuild for new OpenSSL
+
 * Mon Dec 22 2008 Rex Dieter <rdieter at fedoraproject.org> - 3.5.10-4
 - omit (nonfunctional) kdesu (F9+)
 



From kkofler at fedoraproject.org  Fri Jan 16 10:23:45 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Fri, 16 Jan 2009 10:23:45 +0000 (UTC)
Subject: rpms/kdelibs/devel kdelibs.spec,1.416,1.417
Message-ID: <20090116102346.025F770127@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdelibs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15680/devel

Modified Files:
	kdelibs.spec 
Log Message:
* Fri Jan 16 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.1.96-8
- rebuild for new OpenSSL


Index: kdelibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.416
retrieving revision 1.417
diff -u -r1.416 -r1.417
--- kdelibs.spec	12 Jan 2009 20:35:51 -0000	1.416
+++ kdelibs.spec	16 Jan 2009 10:23:15 -0000	1.417
@@ -1,6 +1,6 @@
 Summary: K Desktop Environment 4 - Libraries
 Version: 4.1.96
-Release: 7%{?dist}
+Release: 8%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs
@@ -371,6 +371,9 @@
 
 
 %changelog
+* Fri Jan 16 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.1.96-8
+- rebuild for new OpenSSL
+
 * Mon Jan 12 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.1.96-7
 - Slight speedup to profile.d/kde.sh (#465370)
 - (Build)Req: strigi(-devel) >= 0.6.3



From tmraz at fedoraproject.org  Fri Jan 16 10:24:45 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 16 Jan 2009 10:24:45 +0000 (UTC)
Subject: rpms/erlang/devel erlang.spec,1.34,1.35
Message-ID: <20090116102445.5304C70127@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/erlang/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15759

Modified Files:
	erlang.spec 
Log Message:
* Fri Jan 16 2009 Tomas Mraz <tmraz at redhat.com> - R12B-4.4
- rebuild with new openssl



Index: erlang.spec
===================================================================
RCS file: /cvs/pkgs/rpms/erlang/devel/erlang.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- erlang.spec	25 Oct 2008 23:08:02 -0000	1.34
+++ erlang.spec	16 Jan 2009 10:24:15 -0000	1.35
@@ -3,7 +3,7 @@
 
 Name:           erlang
 Version:        %{ver}
-Release:        %{rel}.3%{?dist}
+Release:        %{rel}.4%{?dist}
 Summary:        General-purpose programming language and runtime environment
 
 Group:          Development/Languages
@@ -119,6 +119,9 @@
 
 
 %changelog
+* Fri Jan 16 2009 Tomas Mraz <tmraz at redhat.com> - R12B-4.4
+- rebuild with new openssl
+
 * Sat Oct 25 2008 Gerard Milmeister <gemi at bluewin.ch> - R12B-4.1
 - new release R12B-4
 



From tmraz at fedoraproject.org  Fri Jan 16 10:25:53 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 16 Jan 2009 10:25:53 +0000 (UTC)
Subject: rpms/esmtp/devel esmtp.spec,1.15,1.16
Message-ID: <20090116102553.007B670127@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/esmtp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16006

Modified Files:
	esmtp.spec 
Log Message:
* Fri Jan 16 2009 Tomas Mraz <tmraz at redhat.com> 1.0-3
- rebuild with new openssl



Index: esmtp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/esmtp/devel/esmtp.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- esmtp.spec	24 Nov 2008 14:43:06 -0000	1.15
+++ esmtp.spec	16 Jan 2009 10:25:22 -0000	1.16
@@ -2,7 +2,7 @@
 Summary(de):    Benutzerkonfigurierbarer nur versendender Mail Transfer Agent (MTA)
 Name:           esmtp
 Version:        1.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Source:         http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
 Source1:        esmtp-0.4.1-mutt
 # esmtp system config file configuring procmail as mda, for the local-delivery
@@ -109,6 +109,9 @@
 %config(noreplace) %{_sysconfdir}/esmtprc
 
 %changelog
+* Fri Jan 16 2009 Tomas Mraz <tmraz at redhat.com> 1.0-3
+- rebuild with new openssl
+
 * Mon Nov 24 2008 Patrice Dumas <pertusus at free.fr> 1.0-2
 - update to 1.0
 - add a subpackage with local delivery enabled and dependency on procmail



From kkofler at fedoraproject.org  Fri Jan 16 10:26:29 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Fri, 16 Jan 2009 10:26:29 +0000 (UTC)
Subject: rpms/kdenetwork/devel kdenetwork.spec,1.167,1.168
Message-ID: <20090116102629.254CF70127@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdenetwork/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16066/devel

Modified Files:
	kdenetwork.spec 
Log Message:
* Fri Jan 16 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.96-3
- rebuild for new OpenSSL


Index: kdenetwork.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdenetwork/devel/kdenetwork.spec,v
retrieving revision 1.167
retrieving revision 1.168
diff -u -r1.167 -r1.168
--- kdenetwork.spec	12 Jan 2009 18:01:36 -0000	1.167
+++ kdenetwork.spec	16 Jan 2009 10:25:58 -0000	1.168
@@ -2,7 +2,7 @@
 Name: kdenetwork
 Epoch: 7
 Version: 4.1.96
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 License: GPLv2
 Group: Applications/Internet
@@ -162,6 +162,9 @@
 
 
 %changelog
+* Fri Jan 16 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.96-3
+- rebuild for new OpenSSL
+
 * Mon Jan 12 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.96-2
 - build against system libgadu (trivial patch backported from 4.3)
 



From tmraz at fedoraproject.org  Fri Jan 16 10:37:36 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 16 Jan 2009 10:37:36 +0000 (UTC)
Subject: rpms/ettercap/devel ettercap.spec,1.17,1.18
Message-ID: <20090116103736.2BFF170127@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/ettercap/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17040

Modified Files:
	ettercap.spec 
Log Message:
* Fri Jan 16 2009 Tomas Mraz <tmraz at redhat.com> - 0.7.3-28
- rebuild with new openssl



Index: ettercap.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ettercap/devel/ettercap.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- ettercap.spec	4 Dec 2008 23:41:18 -0000	1.17
+++ ettercap.spec	16 Jan 2009 10:37:05 -0000	1.18
@@ -1,6 +1,6 @@
 Name: ettercap
 Version: 0.7.3
-Release: 27%{?dist}
+Release: 28%{?dist}
 Summary: Network traffic sniffer/analyser, NCURSES interface version
 Group: Applications/Internet
 License: GPLv2+
@@ -190,6 +190,9 @@
 %{_datadir}/icons/hicolor/32x32/apps/ettercap.png
 
 %changelog
+* Fri Jan 16 2009 Tomas Mraz <tmraz at redhat.com> - 0.7.3-28
+- rebuild with new openssl
+
 * Thu Dec 04 2008 Caol??n McNamara <caolanm at redhat.com> - 0.7.3-27
 - rebuild for dependencies
 



From caolanm at fedoraproject.org  Fri Jan 16 10:58:29 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Fri, 16 Jan 2009 10:58:29 +0000 (UTC)
Subject: rpms/icu/devel .cvsignore, 1.14, 1.15 icu.spec, 1.84, 1.85 sources, 
	1.15, 1.16
Message-ID: <20090116105829.6964D70127@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/icu/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18910

Modified Files:
	.cvsignore icu.spec sources 
Log Message:
4.0.1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/icu/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	29 Dec 2008 16:40:14 -0000	1.14
+++ .cvsignore	16 Jan 2009 10:57:59 -0000	1.15
@@ -1,2 +1,3 @@
 icu4c-4_0-src.tgz
 icu-config
+icu4c-4_0_1-src.tgz


Index: icu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/icu/devel/icu.spec,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -r1.84 -r1.85
--- icu.spec	29 Dec 2008 17:04:11 -0000	1.84
+++ icu.spec	16 Jan 2009 10:57:59 -0000	1.85
@@ -1,11 +1,11 @@
 Name:      icu
-Version:   4.0
-Release:   6%{?dist}
+Version:   4.0.1
+Release:   1%{?dist}
 Summary:   International Components for Unicode
 Group:     Development/Tools
 License:   MIT
 URL:       http://www.icu-project.org/
-Source0:   http://download.icu-project.org/files/icu4c/4.0/icu4c-4_0-src.tgz
+Source0:   http://download.icu-project.org/files/icu4c/%{version}/icu4c-4_0_1-src.tgz
 Source1:   icu-config
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: doxygen, autoconf
@@ -134,6 +134,9 @@
 %doc source/__docs/%{name}/html/*
 
 %changelog
+* Fri Jan 16 2009 Caolan McNamara <caolanm at redhat.com> - 4.0.1-1
+- 4.0.1 release
+
 * Mon Dec 29 2008 Caolan McNamara <caolanm at redhat.com> - 4.0-6
 - Resolves rhbz#225896 clean up low hanging rpmlint warnings
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/icu/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	29 Dec 2008 16:40:14 -0000	1.15
+++ sources	16 Jan 2009 10:57:59 -0000	1.16
@@ -1,2 +1,2 @@
-29ab09d84b72a74953cbb4d3d5759e14  icu4c-4_0-src.tgz
 89354abfe0d663d6b7b9274c6cd35238  icu-config
+2f6ecca935948f7db92d925d88d0d078  icu4c-4_0_1-src.tgz



From twaugh at fedoraproject.org  Fri Jan 16 11:09:59 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Fri, 16 Jan 2009 11:09:59 +0000 (UTC)
Subject: rpms/system-config-printer/F-10
	system-config-printer-1.0.13.tar.bz2.sig, NONE, 1.1 .cvsignore,
	1.191, 1.192 sources, 1.198, 1.199 system-config-printer.spec,
	1.235, 1.236 system-config-printer-1.0.12.tar.bz2.sig, 1.1,
	NONE system-config-printer-1.0.x.patch, 1.13, NONE
Message-ID: <20090116110959.B96BB70127@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/system-config-printer/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20732

Modified Files:
	.cvsignore sources system-config-printer.spec 
Added Files:
	system-config-printer-1.0.13.tar.bz2.sig 
Removed Files:
	system-config-printer-1.0.12.tar.bz2.sig 
	system-config-printer-1.0.x.patch 
Log Message:
* Fri Jan 16 2009 Tim Waugh <twaugh at redhat.com> 1.0.13-1
- Updated to 1.0.13:
  - Cope with there being no system D-Bus (bug #479534).
  - Enable/set-accepting new classes as well as new printers (trac #132).
  - Added accessibility relations for screen readers (trac #136).
  - Fixed downloadable driver traceback (Ubuntu #316828).
  - Avoid traceback with raw queues (bug #480277).



--- NEW FILE system-config-printer-1.0.13.tar.bz2.sig ---
?>

Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/F-10/.cvsignore,v
retrieving revision 1.191
retrieving revision 1.192
diff -u -r1.191 -r1.192
--- .cvsignore	8 Jan 2009 18:35:57 -0000	1.191
+++ .cvsignore	16 Jan 2009 11:09:27 -0000	1.192
@@ -190,3 +190,4 @@
 pycups-1.9.44.tar.bz2
 system-config-printer-1.0.12.tar.bz2
 pycups-1.9.45.tar.bz2
+system-config-printer-1.0.13.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/F-10/sources,v
retrieving revision 1.198
retrieving revision 1.199
diff -u -r1.198 -r1.199
--- sources	8 Jan 2009 18:35:57 -0000	1.198
+++ sources	16 Jan 2009 11:09:27 -0000	1.199
@@ -1,3 +1,3 @@
 ac8f98a40b0fc4b6ab4470f10489887a  pysmbc-1.0.6.tar.bz2
-5ba48202a4416d55dde55b4eb0d64ec2  system-config-printer-1.0.12.tar.bz2
 ff634a6751f8a859ed26751bf03abef0  pycups-1.9.45.tar.bz2
+a624bd0d42a88d5c562e6c5937f8f900  system-config-printer-1.0.13.tar.bz2


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/F-10/system-config-printer.spec,v
retrieving revision 1.235
retrieving revision 1.236
diff -u -r1.235 -r1.236
--- system-config-printer.spec	8 Jan 2009 18:49:02 -0000	1.235
+++ system-config-printer.spec	16 Jan 2009 11:09:28 -0000	1.236
@@ -6,8 +6,8 @@
 
 Summary: A printer administration tool
 Name: system-config-printer
-Version: 1.0.12
-Release: 8%{?dist}
+Version: 1.0.13
+Release: 1%{?dist}
 License: GPLv2+
 URL: http://cyberelk.net/tim/software/system-config-printer/
 Group: System Environment/Base
@@ -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
 
-Patch0: system-config-printer-1.0.x.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
-%patch0 -p1 -b .1.0.x
 
 %build
 %configure
@@ -152,6 +149,14 @@
 exit 0
 
 %changelog
+* Fri Jan 16 2009 Tim Waugh <twaugh at redhat.com> 1.0.13-1
+- Updated to 1.0.13:
+  - Cope with there being no system D-Bus (bug #479534).
+  - Enable/set-accepting new classes as well as new printers (trac #132).
+  - Added accessibility relations for screen readers (trac #136).
+  - Fixed downloadable driver traceback (Ubuntu #316828).
+  - Avoid traceback with raw queues (bug #480277).
+
 * Thu Jan  8 2009 Tim Waugh <twaugh at redhat.com> 1.0.12-8
 - Updated pycups to 1.9.45.
 - Updated patch for 1.0.x changes:


--- system-config-printer-1.0.12.tar.bz2.sig DELETED ---


--- system-config-printer-1.0.x.patch DELETED ---



From wolfy at fedoraproject.org  Fri Jan 16 11:14:48 2009
From: wolfy at fedoraproject.org (Manuel Wolfshant)
Date: Fri, 16 Jan 2009 11:14:48 +0000 (UTC)
Subject: rpms/ssmtp/devel ssmtp.spec,1.21,1.22
Message-ID: <20090116111448.1A33670127@cvs1.fedora.phx.redhat.com>

Author: wolfy

Update of /cvs/pkgs/rpms/ssmtp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21313

Modified Files:
	ssmtp.spec 
Log Message:
rebuild for newer OpenSSL


Index: ssmtp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ssmtp/devel/ssmtp.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- ssmtp.spec	26 Dec 2008 15:08:03 -0000	1.21
+++ ssmtp.spec	16 Jan 2009 11:14:16 -0000	1.22
@@ -1,6 +1,6 @@
 Name:		ssmtp
 Version:	2.61
-Release:	11.8%{?dist}
+Release:	11.8%{?dist}.1
 Summary:	Extremely simple MTA to get mail off the system to a Mailhub
 Group:		Applications/Internet
 License:	GPLv2+
@@ -129,6 +129,9 @@
 
 
 %changelog
+* Fri Jan 16 2009 Manuel "lonely wolf" Wolfshant <wolfy at nobugconsulting.ro> 2.61-11.8.1
+- rebuild for newer openssl
+
 * Fri Dec 26 2008 Manuel "lonely wolf" Wolfshant <wolfy at nobugconsulting.ro> 2.61-11.8
 - integrate patch adding support for aliases; initial version received from Tako 
   Schotanus <tako at codejive.org>, who adapted it from "eatnumber1"



From twaugh at fedoraproject.org  Fri Jan 16 11:18:07 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Fri, 16 Jan 2009 11:18:07 +0000 (UTC)
Subject: rpms/system-config-printer/F-9
	system-config-printer-1.0.13.tar.bz2.sig, NONE, 1.1 .cvsignore,
	1.174, 1.175 sources, 1.181, 1.182 system-config-printer.spec,
	1.209, 1.210 system-config-printer-1.0.12.tar.bz2.sig, 1.1,
	NONE system-config-printer-1.0.x.patch, 1.10, NONE
Message-ID: <20090116111807.CC9D670127@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/system-config-printer/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21594

Modified Files:
	.cvsignore sources system-config-printer.spec 
Added Files:
	system-config-printer-1.0.13.tar.bz2.sig 
Removed Files:
	system-config-printer-1.0.12.tar.bz2.sig 
	system-config-printer-1.0.x.patch 
Log Message:
* Fri Jan 16 2009 Tim Waugh <twaugh at redhat.com> 1.0.13-1
- Updated to 1.0.13:
  - Cope with there being no system D-Bus (bug #479534).
  - Enable/set-accepting new classes as well as new printers (trac #132).
  - Added accessibility relations for screen readers (trac #136).
  - Fixed downloadable driver traceback (Ubuntu #316828).
  - Avoid traceback with raw queues (bug #480277).



--- NEW FILE system-config-printer-1.0.13.tar.bz2.sig ---
?>

Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/F-9/.cvsignore,v
retrieving revision 1.174
retrieving revision 1.175
diff -u -r1.174 -r1.175
--- .cvsignore	8 Jan 2009 18:36:05 -0000	1.174
+++ .cvsignore	16 Jan 2009 11:17:36 -0000	1.175
@@ -173,3 +173,4 @@
 pycups-1.9.44.tar.bz2
 system-config-printer-1.0.12.tar.bz2
 pycups-1.9.45.tar.bz2
+system-config-printer-1.0.13.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/F-9/sources,v
retrieving revision 1.181
retrieving revision 1.182
diff -u -r1.181 -r1.182
--- sources	8 Jan 2009 18:36:05 -0000	1.181
+++ sources	16 Jan 2009 11:17:36 -0000	1.182
@@ -1,3 +1,3 @@
 ac8f98a40b0fc4b6ab4470f10489887a  pysmbc-1.0.6.tar.bz2
-5ba48202a4416d55dde55b4eb0d64ec2  system-config-printer-1.0.12.tar.bz2
 ff634a6751f8a859ed26751bf03abef0  pycups-1.9.45.tar.bz2
+a624bd0d42a88d5c562e6c5937f8f900  system-config-printer-1.0.13.tar.bz2


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/F-9/system-config-printer.spec,v
retrieving revision 1.209
retrieving revision 1.210
diff -u -r1.209 -r1.210
--- system-config-printer.spec	8 Jan 2009 18:56:16 -0000	1.209
+++ system-config-printer.spec	16 Jan 2009 11:17:37 -0000	1.210
@@ -6,8 +6,8 @@
 
 Summary: A printer administration tool
 Name: system-config-printer
-Version: 1.0.12
-Release: 8%{?dist}
+Version: 1.0.13
+Release: 1%{?dist}
 License: GPLv2+
 URL: http://cyberelk.net/tim/software/system-config-printer/
 Group: System Environment/Base
@@ -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
 
-Patch0: system-config-printer-1.0.x.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
-%patch0 -p1 -b .1.0.x
 
 %build
 %configure
@@ -152,6 +149,14 @@
 exit 0
 
 %changelog
+* Fri Jan 16 2009 Tim Waugh <twaugh at redhat.com> 1.0.13-1
+- Updated to 1.0.13:
+  - Cope with there being no system D-Bus (bug #479534).
+  - Enable/set-accepting new classes as well as new printers (trac #132).
+  - Added accessibility relations for screen readers (trac #136).
+  - Fixed downloadable driver traceback (Ubuntu #316828).
+  - Avoid traceback with raw queues (bug #480277).
+
 * Thu Jan  8 2009 Tim Waugh <twaugh at redhat.com> 1.0.12-8
 - Updated pycups to 1.9.45.
 - Updated patch for 1.0.x changes:


--- system-config-printer-1.0.12.tar.bz2.sig DELETED ---


--- system-config-printer-1.0.x.patch DELETED ---



From thm at fedoraproject.org  Fri Jan 16 11:23:12 2009
From: thm at fedoraproject.org (Thomas Moschny)
Date: Fri, 16 Jan 2009 11:23:12 +0000 (UTC)
Subject: rpms/python-py/devel import.log, NONE,
	1.1 py-0.9.2-fix-test-cache.patch, NONE,
	1.1 py-0.9.2-svn15.patch, NONE, 1.1 python-py.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090116112312.4E5FE70127@cvs1.fedora.phx.redhat.com>

Author: thm

Update of /cvs/pkgs/rpms/python-py/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22391/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log py-0.9.2-fix-test-cache.patch py-0.9.2-svn15.patch 
	python-py.spec 
Log Message:
Initial import.


--- NEW FILE import.log ---
python-py-0_9_2-6_fc10:HEAD:python-py-0.9.2-6.fc10.src.rpm:1232104910

py-0.9.2-fix-test-cache.patch:

--- NEW FILE py-0.9.2-fix-test-cache.patch ---
Index: trunk/py/misc/cache.py
===================================================================
--- trunk/py/misc/cache.py	(revision 58575)
+++ trunk/py/misc/cache.py	(revision 58576)
@@ -107,9 +107,6 @@
     # time function to use for measuring build-times
     _time = gettime
 
-    def __init__(self, maxentries=64):
-        super(BuildcostAccessCache, self).__init__(maxentries)
-
     def build(self, key, builder, *args, **kwargs):
         start = self._time()
         val = builder(*args, **kwargs)
Index: trunk/py/misc/testing/test_cache.py
===================================================================
--- trunk/py/misc/testing/test_cache.py	(revision 58575)
+++ trunk/py/misc/testing/test_cache.py	(revision 58576)
@@ -27,6 +27,12 @@
 
     def test_cache_works_somewhat_simple(self):
         cache = BuildcostAccessCache()
+        # the default ._time() call used by
+        # BuildcostAccessCache.build can 
+        # result into time()-time() == 0 which makes the below
+        # test fail randomly.  Let's rather use incrementing
+        # numbers instead. 
+        cache._time = py.std.itertools.count().next
         for x in range(cache.maxentries):
             y = cache.getorbuild(x, lambda: x)
             assert x == y

py-0.9.2-svn15.patch:

--- NEW FILE py-0.9.2-svn15.patch ---
Index: py/path/svn/wccommand.py
===================================================================
--- py/path/svn/wccommand.py	(Revision 60276)
+++ py/path/svn/wccommand.py	(Revision 60277)
@@ -389,6 +389,8 @@
             except py.process.cmdexec.Error, e:
                 if e.err.find('Path is not a working copy directory') != -1:
                     raise py.error.ENOENT(self, e.err)
+                elif e.err.find("is not under version control") != -1:
+                    raise py.error.ENOENT(self, e.err)
                 raise
             # XXX SVN 1.3 has output on stderr instead of stdout (while it does
             # return 0!), so a bit nasty, but we assume no output is output
Index: py/path/svn/testing/test_wccommand.py
===================================================================
--- py/path/svn/testing/test_wccommand.py	(Revision 60276)
+++ py/path/svn/testing/test_wccommand.py	(Revision 60277)
@@ -366,22 +366,21 @@
     def test_commit_nonrecursive(self):
         root = self.root
         somedir = root.join('sampledir')
-        somefile = somedir.join('otherfile')
-        somefile.write('foo')
+        somedir.mkdir("subsubdir")
         somedir.propset('foo', 'bar')
         status = somedir.status()
         assert len(status.prop_modified) == 1
-        assert len(status.modified) == 1
+        assert len(status.added) == 1
 
         somedir.commit('non-recursive commit', rec=0)
         status = somedir.status()
         assert len(status.prop_modified) == 0
-        assert len(status.modified) == 1
+        assert len(status.added) == 1
 
         somedir.commit('recursive commit')
         status = somedir.status()
         assert len(status.prop_modified) == 0
-        assert len(status.modified) == 0
+        assert len(status.added) == 0
 
     def test_commit_return_value(self):
         root = self.root


--- NEW FILE python-py.spec ---
%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}

Name:           python-py
Version:        0.9.2
Release:        6%{?dist}
Summary:        Innovative python library containing py.test, greenlets and other niceties
Group:          Development/Languages
License:        MIT and LGPLv2+ and Public Domain and BSD and Python
#               - main package: MIT, except:
#                 - test/rsession/webdata/json.py: LPGLv2+
#                 - doc/style.css: Public Domain
#                 - test/web/post_multipart.py: Python 
#                   (see http://code.activestate.com/help/terms)
#                 - compat/textwrap.py: Python
#                 - compat/subprocess.py: Python
#                 - compat/doctest.py: Public Domain
#                 - compat/optparse.py: BSD
#               Note that all but the doctest compat files are removed
#               in the prep stage.
URL:            http://codespeak.net/py/dist/
Source:         http://pypi.python.org/packages/source/p/py/py-%{version}.tar.gz
# r58576 from trunk
Patch0:         py-0.9.2-fix-test-cache.patch
# r60277 from trunk
Patch1:         py-0.9.2-svn15.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  python-devel
BuildRequires:  python-setuptools-devel
# needed by the testsuite
BuildRequires:  subversion
BuildRequires:  python-docutils

%define doctarget %{buildroot}%{_docdir}/%{name}-%{version}

%ifarch ppc ppc64
# until the greenlet issue can be fixed
%define debug_package %{nil}
%endif


%description
The py lib aims at supporting a decent development process addressing
deployment, versioning, testing and documentation perspectives.


%prep
%setup -q -n py-%{version}
%patch0 -p1 -b .test-cache
%patch1 -p0 -b .svn

# remove the compatibility modules, and use system modules instead
for module in doctest optparse textwrap subprocess ; do
    rm py/compat/$module.py
    echo "from $module import *" > py/compat/system_$module.py
    sed -i py/__init__.py -e "s,compat/$module.py,compat/system_$module.py,"
done


%build
CFLAGS="$RPM_OPT_FLAGS" %{__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_sitearch} \( -name '*.py' -o -name 'py.*' \) \
   -exec sed -i '1{/^#!/d}' {} \; \
   -exec chmod u=rw,go=r {} \;

# move and cleanup docs
mkdir -p %{doctarget}
mv %{buildroot}%{python_sitearch}/py/LICENSE %{doctarget}
mv %{buildroot}%{python_sitearch}/py/doc/* %{doctarget}
rm %{doctarget}/*.py*
rmdir %{buildroot}%{python_sitearch}/py/doc
mv %{buildroot}%{python_sitearch}/py/apigen/todo.txt %{doctarget}/todo_apigen.txt
mv %{buildroot}%{python_sitearch}/py/apigen/todo-apigen.txt %{doctarget}/todo-apigen_apigen.txt
mv %{buildroot}%{python_sitearch}/py/compat/LICENSE %{doctarget}/LICENSE_compat
mv %{buildroot}%{python_sitearch}/py/execnet/NOTES %{doctarget}/NOTES_execnet
mv %{buildroot}%{python_sitearch}/py/path/gateway/TODO.txt %{doctarget}/TODO_path_gateway.txt
mv %{buildroot}%{python_sitearch}/py/path/svn/quoting.txt %{doctarget}/quoting_path_svn.txt
mv %{buildroot}%{python_sitearch}/py/c-extension/greenlet/README.txt %{doctarget}/RADME_greenlet.txt

# remove (most) files only used by the testsuite
find %{buildroot}%{python_sitearch} -type d -name testing -prune -exec rm -r {} \;
find %{buildroot}%{python_sitearch} -name 'conftest.py*' -exec rm {} \;
rm -r %{buildroot}%{python_sitearch}/py/io/test

# remove this and that
rm %{buildroot}%{python_sitearch}/py/env.cmd
rm -r %{buildroot}%{python_sitearch}/py/bin
rm %{buildroot}%{python_sitearch}/py/c-extension/greenlet/*.h
rm %{buildroot}%{python_sitearch}/py/c-extension/greenlet/*.c
rm %{buildroot}%{python_sitearch}/py/c-extension/greenlet/setup.*
rm %{buildroot}%{python_sitearch}/py/c-extension/greenlet/test_*

%ifarch ppc ppc64
cp -p py/c-extension/greenlet/dummy_greenlet.py \
   %{buildroot}%{python_sitearch}/py/c-extension/greenlet/greenlet.py
rm %{buildroot}%{python_sitearch}/py/c-extension/greenlet/greenlet.so
cat << \EOF > %{doctarget}/README.greenlet.fedora
The native py.magic.greenlet code has been replaced by
dummy_greenlet.py on ppc and ppc64 for this package because it
reproducibly segfaults.
%endif


%check

# on ppc, use dummy greenlets also for the tests
%ifarch ppc ppc64
cp -p py/c-extension/greenlet/dummy_greenlet.py \
   py/c-extension/greenlet/greenlet.py
rm py/c-extension/greenlet/*.{c,h}
%endif

# see pylib issue67
rm py/doc/apigen.txt
sed -i '/apigen/d' py/doc/index.txt

PYTHONPATH=$(pwd)/py %{__python} py/bin/py.test py


%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%{_bindir}/py.*
%{python_sitearch}/*
%{_docdir}/%{name}-%{version}


%changelog
* Wed Jan 14 2009 Thomas Moschny <thomas.moschny at gmx.de> - 0.9.2-6
- Use system doctest module again, as this wasn't the real cause of
  the test failure. Instead, remove the failing test for now.

* Fri Dec 12 2008 Thomas Moschny <thomas.moschny at gmx.de> - 0.9.2-5
- Add patch from trunk fixing a subversion 1.5 problem (pylib
  issue66).
- Don't replace doctest compat module (pylib issue67).

* Fri Nov 21 2008 Thomas Moschny <thomas.moschny at gmx.de> - 0.9.2-4
- Use dummy_greenlet on ppc and ppc64.

* Tue Oct  7 2008 Thomas Moschny <thomas.moschny at gmx.de> - 0.9.2-3
- Replace compat modules by stubs using the system modules instead.
- Add patch from trunk fixing a timing issue in the tests.

* Tue Sep 30 2008 Thomas Moschny <thomas.moschny at gmx.de> - 0.9.2-2
- Update license information.
- Fix the tests.

* Sun Sep  7 2008 Thomas Moschny <thomas.moschny at gmx.de> - 0.9.2-1
- Update to 0.9.2.
- Upstream now uses setuptools and installs to %%{python_sitearch}.
- Remove %%{srcname} macro.
- More detailed information about licenses.

* Wed Aug 21 2008 Thomas Moschny <thomas.moschny at gmx.de> - 0.9.1-1
- New package.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-py/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	15 Jan 2009 20:41:44 -0000	1.1
+++ .cvsignore	16 Jan 2009 11:22:40 -0000	1.2
@@ -0,0 +1 @@
+py-0.9.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-py/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	15 Jan 2009 20:41:44 -0000	1.1
+++ sources	16 Jan 2009 11:22:40 -0000	1.2
@@ -0,0 +1 @@
+2c996d78867f6ad64dc5aabf1185aaf7  py-0.9.2.tar.gz



From wolfy at fedoraproject.org  Fri Jan 16 11:26:12 2009
From: wolfy at fedoraproject.org (Manuel Wolfshant)
Date: Fri, 16 Jan 2009 11:26:12 +0000 (UTC)
Subject: rpms/pam_mysql/devel pam_mysql.spec,1.20,1.21
Message-ID: <20090116112612.2125170127@cvs1.fedora.phx.redhat.com>

Author: wolfy

Update of /cvs/pkgs/rpms/pam_mysql/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22823

Modified Files:
	pam_mysql.spec 
Log Message:
rebuild for newer OpenSSL



Index: pam_mysql.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pam_mysql/devel/pam_mysql.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- pam_mysql.spec	4 Oct 2008 13:11:50 -0000	1.20
+++ pam_mysql.spec	16 Jan 2009 11:25:41 -0000	1.21
@@ -1,7 +1,7 @@
 Summary:	PAM module for auth UNIX users using MySQL data base
 Name:		pam_mysql
 Version:	0.7
-Release:	0.6.rc1%{?dist}
+Release:	0.6.rc1%{?dist}.1
 Epoch:		1
 License:	GPLv2+
 Group:		System Environment/Base
@@ -49,6 +49,9 @@
 /%{_lib}/security/pam_mysql.so
 
 %changelog
+* Fri Jan 16 2009 Manuel "lonely wolf" Wolfshant <wolfy at nobugconsulting.ro> 0.7-0.6.rc1.1
+- rebuild for newer openssl
+
 * Fri Oct 3 2008 Paul P. Komkoff Jr <i at stingr.net> - 0.7-0.6.rc1
 - Fix bz#465186 (credits go to: Philippe Troin)
 



From wolfy at fedoraproject.org  Fri Jan 16 11:27:10 2009
From: wolfy at fedoraproject.org (Manuel Wolfshant)
Date: Fri, 16 Jan 2009 11:27:10 +0000 (UTC)
Subject: rpms/pam_ssh/devel pam_ssh.spec,1.19,1.20
Message-ID: <20090116112710.C321F70127@cvs1.fedora.phx.redhat.com>

Author: wolfy

Update of /cvs/pkgs/rpms/pam_ssh/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22922

Modified Files:
	pam_ssh.spec 
Log Message:
rebuild for newer OpenSSL


Index: pam_ssh.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pam_ssh/devel/pam_ssh.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- pam_ssh.spec	19 Feb 2008 18:25:04 -0000	1.19
+++ pam_ssh.spec	16 Jan 2009 11:26:40 -0000	1.20
@@ -1,6 +1,6 @@
 Name: pam_ssh
 Version: 1.92
-Release: 8%{?dist}
+Release: 8%{?dist}.1
 Summary: PAM module for use with SSH keys and ssh-agent
 Source: http://downloads.sourceforge.net/pam-ssh/pam_ssh-%{version}.tar.bz2
 URL: http://sourceforge.net/projects/pam-ssh/
@@ -64,6 +64,9 @@
 %dir %{_localstatedir}/run/pam_ssh
 
 %changelog
+* Fri Jan 16 2009 Manuel "lonely wolf" Wolfshant <wolfy at nobugconsulting.ro> 1.92-8.1
+- rebuild for newer openssl
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1.92-8
 - Autorebuild for GCC 4.3
 



From tmraz at fedoraproject.org  Fri Jan 16 11:46:14 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 16 Jan 2009 11:46:14 +0000 (UTC)
Subject: rpms/evolution-data-server/devel evolution-data-server.spec, 1.243, 
	1.244
Message-ID: <20090116114614.E873870127@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/evolution-data-server/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25394

Modified Files:
	evolution-data-server.spec 
Log Message:
* Fri Jan 16 2009 Tomas Mraz <tmraz at redhat.com> - 2.25.4-2.fc11
- rebuild with new openssl



Index: evolution-data-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-data-server/devel/evolution-data-server.spec,v
retrieving revision 1.243
retrieving revision 1.244
diff -u -r1.243 -r1.244
--- evolution-data-server.spec	6 Jan 2009 01:53:33 -0000	1.243
+++ evolution-data-server.spec	16 Jan 2009 11:45:43 -0000	1.244
@@ -30,7 +30,7 @@
 
 Name: evolution-data-server
 Version: 2.25.4
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: LGPLv2
 Group: System Environment/Libraries
 Summary: Backend data server for Evolution
@@ -380,6 +380,9 @@
 %{_datadir}/gtk-doc/html/libedataserverui
 
 %changelog
+* Fri Jan 16 2009 Tomas Mraz <tmraz at redhat.com> - 2.25.4-2.fc11
+- rebuild with new openssl
+
 * Mon Jan 05 2009 Matthew Barnes <mbarnes at redhat.com> - 2.25.4-1.fc11
 - Update to 2.25.4
 



From tmraz at fedoraproject.org  Fri Jan 16 11:46:38 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 16 Jan 2009 11:46:38 +0000 (UTC)
Subject: rpms/evolution-exchange/devel evolution-exchange.spec,1.50,1.51
Message-ID: <20090116114638.58A7E70127@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/evolution-exchange/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25461

Modified Files:
	evolution-exchange.spec 
Log Message:
* Fri Jan 16 2009 Tomas Mraz <tmraz at redhat.com> - 2.25.4-2.fc11
- rebuild with new openssl



Index: evolution-exchange.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-exchange/devel/evolution-exchange.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- evolution-exchange.spec	6 Jan 2009 16:28:33 -0000	1.50
+++ evolution-exchange.spec	16 Jan 2009 11:46:08 -0000	1.51
@@ -23,7 +23,7 @@
 
 Name: evolution-exchange
 Version: 2.25.4
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2
 Group: Applications/Productivity
 Summary: Evolution plugin to interact with MS Exchange Server
@@ -159,6 +159,9 @@
 %{_sysconfdir}/gconf/schemas/apps_exchange_addressbook-%{evo_major}.schemas
 
 %changelog
+* Fri Jan 16 2009 Tomas Mraz <tmraz at redhat.com> - 2.25.4-2.fc11
+- rebuild with new openssl
+
 * Tue Jan 06 2009 Matthew Barnes <mbarnes at redhat.com> - 2.25.4-1.fc11
 - Update to 2.25.4
 



From dtardon at fedoraproject.org  Fri Jan 16 11:55:52 2009
From: dtardon at fedoraproject.org (David Tardon)
Date: Fri, 16 Jan 2009 11:55:52 +0000 (UTC)
Subject: rpms/openoffice.org/F-10
	openoffice.org-3.1.0.ooo98137.filter.redeclared-variables.patch,
	NONE, 1.1 openoffice.org.spec, 1.1710, 1.1711
Message-ID: <20090116115552.C80B970127@cvs1.fedora.phx.redhat.com>

Author: dtardon

Update of /cvs/extras/rpms/openoffice.org/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26273

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-3.1.0.ooo98137.filter.redeclared-variables.patch 
Log Message:
Resolves: rhbz#480121 add openoffice.org-3.1.0.ooo98137.filter.redeclared-variables.patch

openoffice.org-3.1.0.ooo98137.filter.redeclared-variables.patch:

--- NEW FILE openoffice.org-3.1.0.ooo98137.filter.redeclared-variables.patch ---
diff -up ./filter/source/xslt/odf2xhtml/export/xhtml/body.xsl.xhtml ./filter/source/xslt/odf2xhtml/export/xhtml/body.xsl
--- ./filter/source/xslt/odf2xhtml/export/xhtml/body.xsl.xhtml	2009-01-16 10:41:31.000000000 +0100
+++ ./filter/source/xslt/odf2xhtml/export/xhtml/body.xsl	2009-01-16 10:48:01.000000000 +0100
@@ -462,7 +462,7 @@
 	<xsl:template name="create-heading">
 		<xsl:param name="globalData"/>
 
-		<xsl:variable name="headingNumber">
+		<xsl:variable name="headerNumber">
 			<xsl:choose>
 			<xsl:when test="@text:outline-level &lt; 6">
 				<xsl:value-of select="@text:outline-level"/>
@@ -470,7 +470,7 @@
 			<xsl:otherwise>6</xsl:otherwise>
 			</xsl:choose>
 		</xsl:variable>
-		<xsl:variable name="headertyp" select="concat('h', $headingNumber)"/>
+		<xsl:variable name="headertyp" select="concat('h', $headerNumber)"/>
 		<xsl:element name="{$headertyp}">
 			<!-- outline style 'text:min-label-width' is interpreted as a CSS 'margin-right' attribute
 			NOTE: Should be handled as CSS style in style header -->
@@ -865,7 +865,6 @@
 		<xsl:param name="listLevel" select="1"/>
 		<xsl:param name="listRestart" select="false()"/>
 		<xsl:param name="itemLabel" select="''"/>
-		<xsl:param name="listStyle"/>
 		<xsl:param name="listStyleName" select="@text:style-name"/>
 
 		<!-- To choose list type - get the list style, with the same 'text:style-name' and same 'text:level' -->


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/extras/rpms/openoffice.org/F-10/openoffice.org.spec,v
retrieving revision 1.1710
retrieving revision 1.1711
diff -u -r1.1710 -r1.1711
--- openoffice.org.spec	13 Jan 2009 10:19:34 -0000	1.1710
+++ openoffice.org.spec	16 Jan 2009 11:55:22 -0000	1.1711
@@ -133,6 +133,7 @@
 Patch60: openoffice.org-3.0.1.oooXXXXX.extensions.npapi.patch
 Patch61: openoffice.org-3.0.1.ooo97975.bridges.mainalreadyexited.patch
 Patch62: openoffice.org-3.0.1.ooo98024.vcl.emboldenoverlap.patch
+Patch63: openoffice.org-3.1.0.ooo98137.filter.redeclared-variables.patch
 
 %define instdir %{_libdir}
 %define baseinstdir %{instdir}/openoffice.org
@@ -1390,6 +1391,7 @@
 %patch60 -p1 -b .oooXXXXX.extensions.npapi.patch
 %patch61 -p1 -b .ooo97975.bridges.mainalreadyexited.patch
 %patch62 -p1 -b .ooo98024.vcl.emboldenoverlap.patch
+%patch63 -p1 -b .ooo98137.filter.redeclared-variables.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -3759,6 +3761,8 @@
 * Tue Jan 13 2009 Caol??n McNamara <caolanm at redhat.com> - 1:3.0.1-15.2
 - Resolves: rhbz#479624 add
   openoffice.org-3.0.1.ooo98024.vcl.emboldenoverlap.patch
+- Resolves: rhbz#480121 add
+  openoffice.org-3.1.0.ooo98137.filter.redeclared-variables.patch
 
 * Mon Jan 12 2009 Caol??n McNamara <caolanm at redhat.com> - 1:3.0.1-15.1
 - Resolves: rhbz#470302 g_file_input_stream_query_info doesn't do anything 



From mmahut at fedoraproject.org  Fri Jan 16 12:10:43 2009
From: mmahut at fedoraproject.org (Marek Mahut)
Date: Fri, 16 Jan 2009 12:10:43 +0000 (UTC)
Subject: rpms/btrfs-progs/devel btrfs-progs.spec,1.6,1.7
Message-ID: <20090116121043.140AF70141@cvs1.fedora.phx.redhat.com>

Author: mmahut

Update of /cvs/pkgs/rpms/btrfs-progs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27593

Modified Files:
	btrfs-progs.spec 
Log Message:
Bug 480219 -  btrfs-convert is missing



Index: btrfs-progs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/btrfs-progs/devel/btrfs-progs.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- btrfs-progs.spec	12 Jan 2009 21:05:22 -0000	1.6
+++ btrfs-progs.spec	16 Jan 2009 12:10:12 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           btrfs-progs
 Version:        0.17
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Userspace programs for btrfs
 
 Group:          System Environment/Base
@@ -22,6 +22,7 @@
 
 %build
 make CFLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags}
+make CFLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags} convert
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -40,9 +41,13 @@
 %{_root_sbindir}/btrfs-image
 %{_root_sbindir}/btrfs-show
 %{_root_sbindir}/btrfs-vol
+%{_root_sbindir}/btrfs-convert
 %{_root_sbindir}/btrfstune
 
 %changelog
+* Fri Jan 16 2009 Marek Mahut <mmahut at fedoraproject.org> 0.17-3
+- RHBZ#480219 btrfs-convert is missing
+
 * Mon Jan 12 2009 Josef Bacik <josef at toxicpanda.com> 0.17-2
 - fixed wrong sources upload
 



From than at fedoraproject.org  Fri Jan 16 12:14:44 2009
From: than at fedoraproject.org (Than Ngo)
Date: Fri, 16 Jan 2009 12:14:44 +0000 (UTC)
Subject: rpms/kdelibs/devel kdelibs.spec, 1.417,
	1.418 kdelibs-4.1.85-plasma-default-wallpaper.patch, 1.1, NONE
Message-ID: <20090116121444.EED3E70127@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdelibs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28717

Modified Files:
	kdelibs.spec 
Removed Files:
	kdelibs-4.1.85-plasma-default-wallpaper.patch 
Log Message:
- drop kdelibs-4.1.85-plasma-default-wallpaper.patch, it's not needed
  since new plasma allows to define default wallpaper, new kde-setting
  is required




Index: kdelibs.spec
===================================================================
RCS file: /cvs/extras/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.417
retrieving revision 1.418
diff -u -r1.417 -r1.418
--- kdelibs.spec	16 Jan 2009 10:23:15 -0000	1.417
+++ kdelibs.spec	16 Jan 2009 12:14:14 -0000	1.418
@@ -1,6 +1,6 @@
 Summary: K Desktop Environment 4 - Libraries
 Version: 4.1.96
-Release: 8%{?dist}
+Release: 9%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs
@@ -76,8 +76,6 @@
 # kstandarddirs changes: search /etc/kde, find /usr/libexec/kde4
 Patch18: kdelibs-4.1.72-kstandarddirs.patch
 Patch20: kdelibs-4.1.70-cmake.patch
-# allows to define a default wallpaper via plasmarc:wallpaper
-Patch21: kdelibs-4.1.85-plasma-default-wallpaper.patch
 Patch22: kdelibs-4.1.96-cmake.patch
 
 # upstream
@@ -205,7 +203,6 @@
 %patch14 -p1 -b .libexecdir
 %patch18 -p1 -b .kstandarddirs
 %patch20 -p1 -b .xxcmake
-%patch21 -p1 -b .plasma-default-wallpaper
 %patch22 -p1 -b .kdepimlibs-cmake
 
 # upstream patches
@@ -371,6 +368,11 @@
 
 
 %changelog
+* Fri Jan 16 2009 Than Ngo <than at redhat.com> - 4.1.96-9
+- drop kdelibs-4.1.85-plasma-default-wallpaper.patch, it's not needed
+  since new plasma allows to define default wallpaper, new kde-setting
+  is required
+
 * Fri Jan 16 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.1.96-8
 - rebuild for new OpenSSL
 


--- kdelibs-4.1.85-plasma-default-wallpaper.patch DELETED ---



From rhughes at fedoraproject.org  Fri Jan 16 12:17:23 2009
From: rhughes at fedoraproject.org (Richard Hughes)
Date: Fri, 16 Jan 2009 12:17:23 +0000 (UTC)
Subject: rpms/gnome-power-manager/F-10 .cvsignore, 1.51,
	1.52 gnome-power-manager.spec, 1.136, 1.137 sources, 1.51, 1.52
Message-ID: <20090116121723.5F4B170127@cvs1.fedora.phx.redhat.com>

Author: rhughes

Update of /cvs/pkgs/rpms/gnome-power-manager/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28999

Modified Files:
	.cvsignore gnome-power-manager.spec sources 
Log Message:
* Fri Jan 16 2009 Richard Hughes  <rhughes at redhat.com> - 2.24.3-1
- Update to 2.24.3
- Duplicate button presses should now be detected in all circumstances



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-power-manager/F-10/.cvsignore,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- .cvsignore	17 Nov 2008 10:47:51 -0000	1.51
+++ .cvsignore	16 Jan 2009 12:16:52 -0000	1.52
@@ -1 +1 @@
-gnome-power-manager-2.24.2.tar.gz
+gnome-power-manager-2.24.3.tar.gz


Index: gnome-power-manager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-power-manager/F-10/gnome-power-manager.spec,v
retrieving revision 1.136
retrieving revision 1.137
diff -u -r1.136 -r1.137
--- gnome-power-manager.spec	17 Nov 2008 10:47:51 -0000	1.136
+++ gnome-power-manager.spec	16 Jan 2009 12:16:52 -0000	1.137
@@ -4,8 +4,8 @@
 
 Summary: GNOME Power Manager
 Name: gnome-power-manager
-Version: 2.24.2
-Release: 2%{?dist}
+Version: 2.24.3
+Release: 1%{?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
@@ -158,6 +158,10 @@
 %{_datadir}/gnome-2.0/ui/GNOME_InhibitApplet.xml
 
 %changelog
+* Fri Jan 16 2009 Richard Hughes  <rhughes at redhat.com> - 2.24.3-1
+- Update to 2.24.3
+- Duplicate button presses should now be detected in all circumstances
+
 * Mon Nov 17 2008 Richard Hughes  <rhughes at redhat.com> - 2.24.2-2
 - Upload correct tarball...
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-power-manager/F-10/sources,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- sources	17 Nov 2008 10:47:51 -0000	1.51
+++ sources	16 Jan 2009 12:16:52 -0000	1.52
@@ -1 +1 @@
-277f73a84668bbeb57c5c7fc77052522  gnome-power-manager-2.24.2.tar.gz
+41a90793bbcf42a056a4de43e9e502c8  gnome-power-manager-2.24.3.tar.gz



From tmraz at fedoraproject.org  Fri Jan 16 12:20:37 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 16 Jan 2009 12:20:37 +0000 (UTC)
Subject: rpms/fedora-ds-base/devel fedora-ds-base.spec,1.25,1.26
Message-ID: <20090116122037.E0DBF70127@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/fedora-ds-base/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29419

Modified Files:
	fedora-ds-base.spec 
Log Message:
* Fri Jan 16 2009 Tomas Mraz <tmraz at redhat.com> - 1.1.3-8
- rebuild with new openssl



Index: fedora-ds-base.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-ds-base/devel/fedora-ds-base.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- fedora-ds-base.spec	30 Oct 2008 21:53:43 -0000	1.25
+++ fedora-ds-base.spec	16 Jan 2009 12:20:07 -0000	1.26
@@ -5,7 +5,7 @@
 Summary:          Fedora Directory Server (base)
 Name:             fedora-ds-base
 Version:          1.1.3
-Release:          7%{?dist}
+Release:          8%{?dist}
 License:          GPLv2 with exceptions
 URL:              http://directory.fedoraproject.org/
 Group:            System Environment/Daemons
@@ -161,6 +161,9 @@
 %{_libdir}/%{pkgname}/*.so
 
 %changelog
+* Fri Jan 16 2009 Tomas Mraz <tmraz at redhat.com> - 1.1.3-8
+- rebuild with new openssl
+
 * Mon Oct 30 2008 Noriko Hosoi <nhosoi at redhat.com> - 1.1.3-7
 - added db4-utils to Requires for verify-db.pl
 



From mmahut at fedoraproject.org  Fri Jan 16 12:21:39 2009
From: mmahut at fedoraproject.org (Marek Mahut)
Date: Fri, 16 Jan 2009 12:21:39 +0000 (UTC)
Subject: rpms/btrfs-progs/devel btrfs-progs.spec,1.7,1.8
Message-ID: <20090116122139.3532670127@cvs1.fedora.phx.redhat.com>

Author: mmahut

Update of /cvs/pkgs/rpms/btrfs-progs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29609

Modified Files:
	btrfs-progs.spec 
Log Message:
missing libacl-devel for convert



Index: btrfs-progs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/btrfs-progs/devel/btrfs-progs.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- btrfs-progs.spec	16 Jan 2009 12:10:12 -0000	1.7
+++ btrfs-progs.spec	16 Jan 2009 12:21:08 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           btrfs-progs
 Version:        0.17
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Userspace programs for btrfs
 
 Group:          System Environment/Base
@@ -9,7 +9,7 @@
 Source0:        http://www.kernel.org/pub/linux/kernel/people/mason/btrfs/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  e2fsprogs-devel, zlib-devel
+BuildRequires:  e2fsprogs-devel, zlib-devel, libacl-devel
 
 %define _root_sbindir /sbin
 
@@ -45,7 +45,7 @@
 %{_root_sbindir}/btrfstune
 
 %changelog
-* Fri Jan 16 2009 Marek Mahut <mmahut at fedoraproject.org> 0.17-3
+* Fri Jan 16 2009 Marek Mahut <mmahut at fedoraproject.org> 0.17-4
 - RHBZ#480219 btrfs-convert is missing
 
 * Mon Jan 12 2009 Josef Bacik <josef at toxicpanda.com> 0.17-2



From tmraz at fedoraproject.org  Fri Jan 16 12:37:54 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 16 Jan 2009 12:37:54 +0000 (UTC)
Subject: rpms/fetchmail/devel fetchmail.spec,1.62,1.63
Message-ID: <20090116123754.55C7570127@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/fetchmail/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31309

Modified Files:
	fetchmail.spec 
Log Message:
* Fri Jan 16 2009 Tomas Mraz <tmraz at redhat.com> - 6.3.9-2
- rebuild with new openssl



Index: fetchmail.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fetchmail/devel/fetchmail.spec,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- fetchmail.spec	3 Dec 2008 14:01:12 -0000	1.62
+++ fetchmail.spec	16 Jan 2009 12:37:23 -0000	1.63
@@ -4,7 +4,7 @@
 Summary: A remote mail retrieval and forwarding utility
 Name: fetchmail
 Version: 6.3.9
-Release: 1%{?dist}
+Release: 2%{?dist}
 Requires: procmail
 Source0: http://download.berlios.de/fetchmail/fetchmail-%{version}.tar.bz2
 Source1: http://download.berlios.de/fetchmail/fetchmail-%{version}.tar.bz2.asc
@@ -85,6 +85,9 @@
 %endif
 
 %changelog
+* Fri Jan 16 2009 Tomas Mraz <tmraz at redhat.com> - 6.3.9-2
+- rebuild with new openssl
+
 * Wed Dec  3 2008 Vitezslav Crhonek <vcrhonek at redhat.com> - 6.3.9-1
 - Update to fetchmail-6.3.9
 



From tmraz at fedoraproject.org  Fri Jan 16 13:03:12 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 16 Jan 2009 13:03:12 +0000 (UTC)
Subject: rpms/openssl/devel openssl.spec,1.114,1.115
Message-ID: <20090116130312.6E05870127@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/openssl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1701

Modified Files:
	openssl.spec 
Log Message:
* Fri Jan 16 2009 Tomas Mraz <tmraz at redhat.com> 0.9.8j-2
- try to ensure the temporary symlinks exist



Index: openssl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openssl/devel/openssl.spec,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -r1.114 -r1.115
--- openssl.spec	15 Jan 2009 09:10:25 -0000	1.114
+++ openssl.spec	16 Jan 2009 13:02:42 -0000	1.115
@@ -23,7 +23,7 @@
 Summary: A general purpose cryptography library with TLS implementation
 Name: openssl
 Version: 0.9.8j
-Release: 1%{?dist}
+Release: 2%{?dist}
 # We remove certain patented algorithms from the openssl source tarball
 # with the hobble-openssl script which is included below.
 Source: openssl-%{version}-usa.tar.bz2
@@ -400,12 +400,21 @@
 %endif
 
 %post 
+if [ ! -h /%{_lib}/libcrypto.so.7 ] ; then
+    ln -s libcrypto.so.%{version} /%{_lib}/libcrypto.so.7 || :
+fi
+if [ ! -h /%{_lib}/libssl.so.7 ] ; then
+    ln -s libssl.so.%{version} /%{_lib}/libssl.so.7 || :
+fi
 /sbin/ldconfig -X
 
 %postun
 /sbin/ldconfig -X
 
 %changelog
+* Fri Jan 16 2009 Tomas Mraz <tmraz at redhat.com> 0.9.8j-2
+- try to ensure the temporary symlinks exist
+
 * Thu Jan 15 2009 Tomas Mraz <tmraz at redhat.com> 0.9.8j-1
 - new upstream version with necessary soname bump (#455753)
 - temporarily provide symlink to old soname to make it possible to rebuild



From rdieter at fedoraproject.org  Fri Jan 16 13:06:45 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 16 Jan 2009 13:06:45 +0000 (UTC)
Subject: rpms/libsigsegv/EL-4 sigsegv-wrapper.h, NONE, 1.1 .cvsignore, 1.5, 
	1.6 libsigsegv.spec, 1.5, 1.6 sources, 1.5, 1.6
Message-ID: <20090116130645.8A52470127@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/libsigsegv/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2206

Modified Files:
	.cvsignore libsigsegv.spec sources 
Added Files:
	sigsegv-wrapper.h 
Log Message:
sync w/EL-5 branch



--- NEW FILE sigsegv-wrapper.h ---
/* This file is here to prevent a file conflict on multiarch systems.  A
 * conflict will occur because sigsegv.h has arch-specific definitions.
 *
 * DO NOT INCLUDE THE NEW FILE DIRECTLY -- ALWAYS INCLUDE THIS ONE INSTEAD. */

#if defined(__x86_64__)
#include "sigsegv-x86_64.h"
#elif defined(__i386__)
#include "sigsegv-i386.h"
#elif defined(__powerpc64__)
#include "sigsegv-ppc64.h"
#elif defined(__powerpc__)
#include "sigsegv-ppc.h"
#elif defined(__s390x__)
#include "sigsegv-s390x.h"
#elif defined(__s390__)
#include "sigsegv-s390.h"
#elif defined(__sparc64__)
#include "sigsegv-sparc64.h"
#elif defined(__sparc__)
#include "sigsegv-sparc.h"
#else
#error "This libsigsegv-devel package does not work your architecture?"
#endif


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libsigsegv/EL-4/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	20 Jul 2006 11:35:44 -0000	1.5
+++ .cvsignore	16 Jan 2009 13:06:15 -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/EL-4/libsigsegv.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- libsigsegv.spec	20 Jul 2006 11:35:44 -0000	1.5
+++ libsigsegv.spec	16 Jan 2009 13:06:15 -0000	1.6
@@ -1,32 +1,43 @@
 
+%define multilib_arches i386 x86_64 ppc ppc64 s390 s390x sparc sparc64
+
 Summary: Library for handling page faults in user mode
 Name:    libsigsegv
 Version: 2.4
-Release: 1%{?dist}
+Release: 6%{?dist}
 
-License: GPL
+License: GPLv2+
 URL:     http://libsigsegv.sourceforge.net/
-Source:  http://ftp.gnu.org/gnu/libsigsegv/libsigsegv-%{version}.tar.gz
+Source0: http://ftp.gnu.org/gnu/libsigsegv/libsigsegv-%{version}.tar.gz
 Group:   System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Source1: sigsegv-wrapper.h
+
 %description
 This is a library for handling page faults in user mode. A page fault
 occurs when a program tries to access to a region of memory that is
 currently not available. Catching and handling a page fault is a useful
 technique for implementing:
-  - pageable virtual memory,
-  - memory-mapped access to persistent databases,
-  - generational garbage collectors,
-  - stack overflow handlers,
-  - distributed shared memory,
+  - pageable virtual memory
+  - memory-mapped access to persistent databases
+  - generational garbage collectors
+  - stack overflow handlers
+  - distributed shared memory
 
 %package devel
 Summary: Development libraries and header files for %{name} 
 Group:   Development/Libraries
 Requires: %{name} = %{version}-%{release}
 %description devel
-Libraries and header files for %{name} development.
+%{summary}.
+
+%package static
+Summary: Static libraries for %{name}
+Group:   Development/Libraries
+Requires: %{name}-devel = %{version}-%{release}
+%description static
+%{summary}.
 
 
 %prep
@@ -42,14 +53,21 @@
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot} 
+
+make install DESTDIR=%{buildroot}
 
-make install DESTDIR=$RPM_BUILD_ROOT
+%ifarch %{multilib_arches}
+# hack to allow parallel installation on 32-bit and 64-bit
+  mv  %{buildroot}%{_includedir}/sigsegv.h \
+      %{buildroot}%{_includedir}/sigsegv-%{_arch}.h
+  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
 
 
@@ -59,22 +77,41 @@
 
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot} 
 
 
 %files
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc AUTHORS ChangeLog NEWS README
 %{_libdir}/lib*.so.*
 
 %files devel
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %{_libdir}/lib*.so
+%{_includedir}/*.h
+
+%files static
+%defattr(-,root,root,-)
 %{_libdir}/lib*.a
-%{_includedir}/*
 
 
 %changelog
+* Fri Feb 22 2008 Rex Dieter <rdieter at fedoraproject.org> 2.4-6
+- multiarch conflicts (#342391)
+- -static subpkg
+
+* Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 2.4-5
+- Autorebuild for GCC 4.3
+
+* Wed Aug 22 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 2.4-4
+- respin (ppc32)
+
+* Sat Aug 11 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 2.4-3
+- License: GPLv2+
+
+* Tue Aug 29 2006 Rex Dieter <rexdieter[AT]users.sf.net> 2.4-2
+- fc6 respin
+
 * Thu Jul 20 2006 Rex Dieter <rexdieter[AT]users.sf.net> 2.4-1
 - 2.4
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libsigsegv/EL-4/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	20 Jul 2006 11:35:44 -0000	1.5
+++ sources	16 Jan 2009 13:06:15 -0000	1.6
@@ -1,2 +1 @@
-81b3c50e18a29be0bc08173e74860d05  libsigsegv-2.3.tar.gz
 df0fe5f87a01e0b4b53b2cdfa8a730e1  libsigsegv-2.4.tar.gz



From tmraz at fedoraproject.org  Fri Jan 16 13:13:59 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 16 Jan 2009 13:13:59 +0000 (UTC)
Subject: rpms/fontmatrix/devel fontmatrix.spec,1.11,1.12
Message-ID: <20090116131359.7F9B770127@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/fontmatrix/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3772

Modified Files:
	fontmatrix.spec 
Log Message:
* Fri Jan 16 2009 Tomas Mraz <tmraz at redhat.com> - 0.4.2-3
- rebuild with new openssl



Index: fontmatrix.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fontmatrix/devel/fontmatrix.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- fontmatrix.spec	10 Jun 2008 07:32:22 -0000	1.11
+++ fontmatrix.spec	16 Jan 2009 13:13:29 -0000	1.12
@@ -2,7 +2,7 @@
 Name: fontmatrix
 Summary: A fonts manager
 Version: 0.4.2
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+
 Group: User Interface/X
 ##### svn checkout HOWTO #####
@@ -70,6 +70,9 @@
 
 
 %changelog
+* Fri Jan 16 2009 Tomas Mraz <tmraz at redhat.com> - 0.4.2-3
+- rebuild with new openssl
+
 * Tue Jun 10 2008 Parag <pnemade at redhat.com> - 0.4.2-2
 - Resolves: rh#449406:FTBFS fontmatrix-0.4.2-1.fc9
 



From pkgdb at fedoraproject.org  Fri Jan 16 13:14:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 16 Jan 2009 13:14:02 +0000
Subject: [pkgdb] openjpeg: oliver has requested commit
Message-ID: <20090116131402.DCDE9208456@bastion.fedora.phx.redhat.com>

oliver has requested the commit acl on openjpeg (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/openjpeg



From pkgdb at fedoraproject.org  Fri Jan 16 13:14:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 16 Jan 2009 13:14:11 +0000
Subject: [pkgdb] openjpeg: oliver has requested commit
Message-ID: <20090116131411.3040A208467@bastion.fedora.phx.redhat.com>

oliver has requested the commit acl on openjpeg (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/openjpeg



From pkgdb at fedoraproject.org  Fri Jan 16 13:14:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 16 Jan 2009 13:14:15 +0000
Subject: [pkgdb] openjpeg: oliver has requested commit
Message-ID: <20090116131415.AE0EE208468@bastion.fedora.phx.redhat.com>

oliver has requested the commit acl on openjpeg (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/openjpeg



From pkgdb at fedoraproject.org  Fri Jan 16 13:14:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 16 Jan 2009 13:14:19 +0000
Subject: [pkgdb] openjpeg: oliver has requested commit
Message-ID: <20090116131419.A7575208470@bastion.fedora.phx.redhat.com>

oliver has requested the commit acl on openjpeg (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/openjpeg



From mlichvar at fedoraproject.org  Fri Jan 16 13:23:32 2009
From: mlichvar at fedoraproject.org (Miroslav Lichvar)
Date: Fri, 16 Jan 2009 13:23:32 +0000 (UTC)
Subject: rpms/ntp/devel ntp.spec,1.85,1.86
Message-ID: <20090116132332.8102270127@cvs1.fedora.phx.redhat.com>

Author: mlichvar

Update of /cvs/pkgs/rpms/ntp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4907

Modified Files:
	ntp.spec 
Log Message:
- rebuild for new openssl



Index: ntp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ntp/devel/ntp.spec,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -r1.85 -r1.86
--- ntp.spec	14 Jan 2009 17:46:22 -0000	1.85
+++ ntp.spec	16 Jan 2009 13:23:02 -0000	1.86
@@ -1,7 +1,7 @@
 Summary: The NTP daemon and utilities
 Name: ntp
 Version: 4.2.4p6
-Release: 1%{?dist}
+Release: 2%{?dist}
 # primary license (COPYRIGHT) : MIT
 # ElectricFence/ (not used) : GPLv2
 # kernel/sys/ppsclock.h (not used) : BSD with advertising
@@ -319,6 +319,9 @@
 %{_mandir}/man8/ntpdate.8*
 
 %changelog
+* Fri Jan 16 2009 Miroslav Lichvar <mlichvar at redhat.com> 4.2.4p6-2
+- rebuild for new openssl
+
 * Wed Jan 14 2009 Miroslav Lichvar <mlichvar at redhat.com> 4.2.4p6-1
 - update to 4.2.4p6 (CVE-2009-0021)
 - include dhclient script (David Cantrell)



From varekova at fedoraproject.org  Fri Jan 16 13:25:07 2009
From: varekova at fedoraproject.org (Ivana Varekova)
Date: Fri, 16 Jan 2009 13:25:07 +0000 (UTC)
Subject: rpms/man-pages/devel .cvsignore, 1.56, 1.57 man-pages.spec, 1.108, 
	1.109 sources, 1.55, 1.56
Message-ID: <20090116132507.C32DF70127@cvs1.fedora.phx.redhat.com>

Author: varekova

Update of /cvs/pkgs/rpms/man-pages/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5139

Modified Files:
	.cvsignore man-pages.spec sources 
Log Message:
update to 3.16



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/man-pages/devel/.cvsignore,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- .cvsignore	8 Dec 2008 14:03:45 -0000	1.56
+++ .cvsignore	16 Jan 2009 13:24:37 -0000	1.57
@@ -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.15.tar.bz2
+man-pages-3.16.tar.bz2


Index: man-pages.spec
===================================================================
RCS file: /cvs/pkgs/rpms/man-pages/devel/man-pages.spec,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -r1.108 -r1.109
--- man-pages.spec	8 Dec 2008 14:03:45 -0000	1.108
+++ man-pages.spec	16 Jan 2009 13:24:37 -0000	1.109
@@ -3,7 +3,7 @@
 
 Summary: Man (manual) pages from the Linux Documentation Project
 Name: man-pages
-Version: 3.15
+Version: 3.16
 Release: 1%{?dist}
 License: GPLv2+ and GPL+ and BSD and MIT and Copyright only and IEEE
 Group: Documentation
@@ -119,6 +119,9 @@
 %lang(en) %{_mandir}/en/man*
 
 %changelog
+* Fri Jan 16 2009 Ivana Varekova <varekova at redhat.com> - 3.16-1
+- update to 3.16
+
 * Mon Dec  8 2008 Ivana Varekova <varekova at redhat.com> - 3.15-1
 - update to 3.15
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/man-pages/devel/sources,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- sources	8 Dec 2008 14:03:45 -0000	1.55
+++ sources	16 Jan 2009 13:24:37 -0000	1.56
@@ -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
-334f3ba3d903ff3dd12e33595b114961  man-pages-3.15.tar.bz2
+d0bd9e9d1260a6e640f485e93c472a11  man-pages-3.16.tar.bz2



From thm at fedoraproject.org  Fri Jan 16 13:26:18 2009
From: thm at fedoraproject.org (Thomas Moschny)
Date: Fri, 16 Jan 2009 13:26:18 +0000 (UTC)
Subject: rpms/python-py/F-10 import.log, NONE,
	1.1 py-0.9.2-fix-test-cache.patch, NONE,
	1.1 py-0.9.2-svn15.patch, NONE, 1.1 python-py.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090116132618.B1BC470127@cvs1.fedora.phx.redhat.com>

Author: thm

Update of /cvs/pkgs/rpms/python-py/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5358/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	import.log py-0.9.2-fix-test-cache.patch py-0.9.2-svn15.patch 
	python-py.spec 
Log Message:
Initial import.


--- NEW FILE import.log ---
python-py-0_9_2-6_fc10:F-10:python-py-0.9.2-6.fc10.src.rpm:1232112139

py-0.9.2-fix-test-cache.patch:

--- NEW FILE py-0.9.2-fix-test-cache.patch ---
Index: trunk/py/misc/cache.py
===================================================================
--- trunk/py/misc/cache.py	(revision 58575)
+++ trunk/py/misc/cache.py	(revision 58576)
@@ -107,9 +107,6 @@
     # time function to use for measuring build-times
     _time = gettime
 
-    def __init__(self, maxentries=64):
-        super(BuildcostAccessCache, self).__init__(maxentries)
-
     def build(self, key, builder, *args, **kwargs):
         start = self._time()
         val = builder(*args, **kwargs)
Index: trunk/py/misc/testing/test_cache.py
===================================================================
--- trunk/py/misc/testing/test_cache.py	(revision 58575)
+++ trunk/py/misc/testing/test_cache.py	(revision 58576)
@@ -27,6 +27,12 @@
 
     def test_cache_works_somewhat_simple(self):
         cache = BuildcostAccessCache()
+        # the default ._time() call used by
+        # BuildcostAccessCache.build can 
+        # result into time()-time() == 0 which makes the below
+        # test fail randomly.  Let's rather use incrementing
+        # numbers instead. 
+        cache._time = py.std.itertools.count().next
         for x in range(cache.maxentries):
             y = cache.getorbuild(x, lambda: x)
             assert x == y

py-0.9.2-svn15.patch:

--- NEW FILE py-0.9.2-svn15.patch ---
Index: py/path/svn/wccommand.py
===================================================================
--- py/path/svn/wccommand.py	(Revision 60276)
+++ py/path/svn/wccommand.py	(Revision 60277)
@@ -389,6 +389,8 @@
             except py.process.cmdexec.Error, e:
                 if e.err.find('Path is not a working copy directory') != -1:
                     raise py.error.ENOENT(self, e.err)
+                elif e.err.find("is not under version control") != -1:
+                    raise py.error.ENOENT(self, e.err)
                 raise
             # XXX SVN 1.3 has output on stderr instead of stdout (while it does
             # return 0!), so a bit nasty, but we assume no output is output
Index: py/path/svn/testing/test_wccommand.py
===================================================================
--- py/path/svn/testing/test_wccommand.py	(Revision 60276)
+++ py/path/svn/testing/test_wccommand.py	(Revision 60277)
@@ -366,22 +366,21 @@
     def test_commit_nonrecursive(self):
         root = self.root
         somedir = root.join('sampledir')
-        somefile = somedir.join('otherfile')
-        somefile.write('foo')
+        somedir.mkdir("subsubdir")
         somedir.propset('foo', 'bar')
         status = somedir.status()
         assert len(status.prop_modified) == 1
-        assert len(status.modified) == 1
+        assert len(status.added) == 1
 
         somedir.commit('non-recursive commit', rec=0)
         status = somedir.status()
         assert len(status.prop_modified) == 0
-        assert len(status.modified) == 1
+        assert len(status.added) == 1
 
         somedir.commit('recursive commit')
         status = somedir.status()
         assert len(status.prop_modified) == 0
-        assert len(status.modified) == 0
+        assert len(status.added) == 0
 
     def test_commit_return_value(self):
         root = self.root


--- NEW FILE python-py.spec ---
%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}

Name:           python-py
Version:        0.9.2
Release:        6%{?dist}
Summary:        Innovative python library containing py.test, greenlets and other niceties
Group:          Development/Languages
License:        MIT and LGPLv2+ and Public Domain and BSD and Python
#               - main package: MIT, except:
#                 - test/rsession/webdata/json.py: LPGLv2+
#                 - doc/style.css: Public Domain
#                 - test/web/post_multipart.py: Python 
#                   (see http://code.activestate.com/help/terms)
#                 - compat/textwrap.py: Python
#                 - compat/subprocess.py: Python
#                 - compat/doctest.py: Public Domain
#                 - compat/optparse.py: BSD
#               Note that all but the doctest compat files are removed
#               in the prep stage.
URL:            http://codespeak.net/py/dist/
Source:         http://pypi.python.org/packages/source/p/py/py-%{version}.tar.gz
# r58576 from trunk
Patch0:         py-0.9.2-fix-test-cache.patch
# r60277 from trunk
Patch1:         py-0.9.2-svn15.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  python-devel
BuildRequires:  python-setuptools-devel
# needed by the testsuite
BuildRequires:  subversion
BuildRequires:  python-docutils

%define doctarget %{buildroot}%{_docdir}/%{name}-%{version}

%ifarch ppc ppc64
# until the greenlet issue can be fixed
%define debug_package %{nil}
%endif


%description
The py lib aims at supporting a decent development process addressing
deployment, versioning, testing and documentation perspectives.


%prep
%setup -q -n py-%{version}
%patch0 -p1 -b .test-cache
%patch1 -p0 -b .svn

# remove the compatibility modules, and use system modules instead
for module in doctest optparse textwrap subprocess ; do
    rm py/compat/$module.py
    echo "from $module import *" > py/compat/system_$module.py
    sed -i py/__init__.py -e "s,compat/$module.py,compat/system_$module.py,"
done


%build
CFLAGS="$RPM_OPT_FLAGS" %{__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_sitearch} \( -name '*.py' -o -name 'py.*' \) \
   -exec sed -i '1{/^#!/d}' {} \; \
   -exec chmod u=rw,go=r {} \;

# move and cleanup docs
mkdir -p %{doctarget}
mv %{buildroot}%{python_sitearch}/py/LICENSE %{doctarget}
mv %{buildroot}%{python_sitearch}/py/doc/* %{doctarget}
rm %{doctarget}/*.py*
rmdir %{buildroot}%{python_sitearch}/py/doc
mv %{buildroot}%{python_sitearch}/py/apigen/todo.txt %{doctarget}/todo_apigen.txt
mv %{buildroot}%{python_sitearch}/py/apigen/todo-apigen.txt %{doctarget}/todo-apigen_apigen.txt
mv %{buildroot}%{python_sitearch}/py/compat/LICENSE %{doctarget}/LICENSE_compat
mv %{buildroot}%{python_sitearch}/py/execnet/NOTES %{doctarget}/NOTES_execnet
mv %{buildroot}%{python_sitearch}/py/path/gateway/TODO.txt %{doctarget}/TODO_path_gateway.txt
mv %{buildroot}%{python_sitearch}/py/path/svn/quoting.txt %{doctarget}/quoting_path_svn.txt
mv %{buildroot}%{python_sitearch}/py/c-extension/greenlet/README.txt %{doctarget}/RADME_greenlet.txt

# remove (most) files only used by the testsuite
find %{buildroot}%{python_sitearch} -type d -name testing -prune -exec rm -r {} \;
find %{buildroot}%{python_sitearch} -name 'conftest.py*' -exec rm {} \;
rm -r %{buildroot}%{python_sitearch}/py/io/test

# remove this and that
rm %{buildroot}%{python_sitearch}/py/env.cmd
rm -r %{buildroot}%{python_sitearch}/py/bin
rm %{buildroot}%{python_sitearch}/py/c-extension/greenlet/*.h
rm %{buildroot}%{python_sitearch}/py/c-extension/greenlet/*.c
rm %{buildroot}%{python_sitearch}/py/c-extension/greenlet/setup.*
rm %{buildroot}%{python_sitearch}/py/c-extension/greenlet/test_*

%ifarch ppc ppc64
cp -p py/c-extension/greenlet/dummy_greenlet.py \
   %{buildroot}%{python_sitearch}/py/c-extension/greenlet/greenlet.py
rm %{buildroot}%{python_sitearch}/py/c-extension/greenlet/greenlet.so
cat << \EOF > %{doctarget}/README.greenlet.fedora
The native py.magic.greenlet code has been replaced by
dummy_greenlet.py on ppc and ppc64 for this package because it
reproducibly segfaults.
%endif


%check

# on ppc, use dummy greenlets also for the tests
%ifarch ppc ppc64
cp -p py/c-extension/greenlet/dummy_greenlet.py \
   py/c-extension/greenlet/greenlet.py
rm py/c-extension/greenlet/*.{c,h}
%endif

# see pylib issue67
rm py/doc/apigen.txt
sed -i '/apigen/d' py/doc/index.txt

PYTHONPATH=$(pwd)/py %{__python} py/bin/py.test py


%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%{_bindir}/py.*
%{python_sitearch}/*
%{_docdir}/%{name}-%{version}


%changelog
* Wed Jan 14 2009 Thomas Moschny <thomas.moschny at gmx.de> - 0.9.2-6
- Use system doctest module again, as this wasn't the real cause of
  the test failure. Instead, remove the failing test for now.

* Fri Dec 12 2008 Thomas Moschny <thomas.moschny at gmx.de> - 0.9.2-5
- Add patch from trunk fixing a subversion 1.5 problem (pylib
  issue66).
- Don't replace doctest compat module (pylib issue67).

* Fri Nov 21 2008 Thomas Moschny <thomas.moschny at gmx.de> - 0.9.2-4
- Use dummy_greenlet on ppc and ppc64.

* Tue Oct  7 2008 Thomas Moschny <thomas.moschny at gmx.de> - 0.9.2-3
- Replace compat modules by stubs using the system modules instead.
- Add patch from trunk fixing a timing issue in the tests.

* Tue Sep 30 2008 Thomas Moschny <thomas.moschny at gmx.de> - 0.9.2-2
- Update license information.
- Fix the tests.

* Sun Sep  7 2008 Thomas Moschny <thomas.moschny at gmx.de> - 0.9.2-1
- Update to 0.9.2.
- Upstream now uses setuptools and installs to %%{python_sitearch}.
- Remove %%{srcname} macro.
- More detailed information about licenses.

* Wed Aug 21 2008 Thomas Moschny <thomas.moschny at gmx.de> - 0.9.1-1
- New package.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-py/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	15 Jan 2009 20:41:44 -0000	1.1
+++ .cvsignore	16 Jan 2009 13:25:48 -0000	1.2
@@ -0,0 +1 @@
+py-0.9.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-py/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	15 Jan 2009 20:41:44 -0000	1.1
+++ sources	16 Jan 2009 13:25:48 -0000	1.2
@@ -0,0 +1 @@
+2c996d78867f6ad64dc5aabf1185aaf7  py-0.9.2.tar.gz



From thm at fedoraproject.org  Fri Jan 16 13:38:09 2009
From: thm at fedoraproject.org (Thomas Moschny)
Date: Fri, 16 Jan 2009 13:38:09 +0000 (UTC)
Subject: rpms/python-py/F-9 import.log, NONE,
	1.1 py-0.9.2-fix-test-cache.patch, 
	NONE, 1.1 py-0.9.2-svn15.patch, NONE, 1.1 python-py.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090116133809.9707570127@cvs1.fedora.phx.redhat.com>

Author: thm

Update of /cvs/pkgs/rpms/python-py/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6771/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	import.log py-0.9.2-fix-test-cache.patch py-0.9.2-svn15.patch 
	python-py.spec 
Log Message:
Initial import.


--- NEW FILE import.log ---
python-py-0_9_2-6_fc10:F-9:python-py-0.9.2-6.fc10.src.rpm:1232113018

py-0.9.2-fix-test-cache.patch:

--- NEW FILE py-0.9.2-fix-test-cache.patch ---
Index: trunk/py/misc/cache.py
===================================================================
--- trunk/py/misc/cache.py	(revision 58575)
+++ trunk/py/misc/cache.py	(revision 58576)
@@ -107,9 +107,6 @@
     # time function to use for measuring build-times
     _time = gettime
 
-    def __init__(self, maxentries=64):
-        super(BuildcostAccessCache, self).__init__(maxentries)
-
     def build(self, key, builder, *args, **kwargs):
         start = self._time()
         val = builder(*args, **kwargs)
Index: trunk/py/misc/testing/test_cache.py
===================================================================
--- trunk/py/misc/testing/test_cache.py	(revision 58575)
+++ trunk/py/misc/testing/test_cache.py	(revision 58576)
@@ -27,6 +27,12 @@
 
     def test_cache_works_somewhat_simple(self):
         cache = BuildcostAccessCache()
+        # the default ._time() call used by
+        # BuildcostAccessCache.build can 
+        # result into time()-time() == 0 which makes the below
+        # test fail randomly.  Let's rather use incrementing
+        # numbers instead. 
+        cache._time = py.std.itertools.count().next
         for x in range(cache.maxentries):
             y = cache.getorbuild(x, lambda: x)
             assert x == y

py-0.9.2-svn15.patch:

--- NEW FILE py-0.9.2-svn15.patch ---
Index: py/path/svn/wccommand.py
===================================================================
--- py/path/svn/wccommand.py	(Revision 60276)
+++ py/path/svn/wccommand.py	(Revision 60277)
@@ -389,6 +389,8 @@
             except py.process.cmdexec.Error, e:
                 if e.err.find('Path is not a working copy directory') != -1:
                     raise py.error.ENOENT(self, e.err)
+                elif e.err.find("is not under version control") != -1:
+                    raise py.error.ENOENT(self, e.err)
                 raise
             # XXX SVN 1.3 has output on stderr instead of stdout (while it does
             # return 0!), so a bit nasty, but we assume no output is output
Index: py/path/svn/testing/test_wccommand.py
===================================================================
--- py/path/svn/testing/test_wccommand.py	(Revision 60276)
+++ py/path/svn/testing/test_wccommand.py	(Revision 60277)
@@ -366,22 +366,21 @@
     def test_commit_nonrecursive(self):
         root = self.root
         somedir = root.join('sampledir')
-        somefile = somedir.join('otherfile')
-        somefile.write('foo')
+        somedir.mkdir("subsubdir")
         somedir.propset('foo', 'bar')
         status = somedir.status()
         assert len(status.prop_modified) == 1
-        assert len(status.modified) == 1
+        assert len(status.added) == 1
 
         somedir.commit('non-recursive commit', rec=0)
         status = somedir.status()
         assert len(status.prop_modified) == 0
-        assert len(status.modified) == 1
+        assert len(status.added) == 1
 
         somedir.commit('recursive commit')
         status = somedir.status()
         assert len(status.prop_modified) == 0
-        assert len(status.modified) == 0
+        assert len(status.added) == 0
 
     def test_commit_return_value(self):
         root = self.root


--- NEW FILE python-py.spec ---
%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}

Name:           python-py
Version:        0.9.2
Release:        6%{?dist}
Summary:        Innovative python library containing py.test, greenlets and other niceties
Group:          Development/Languages
License:        MIT and LGPLv2+ and Public Domain and BSD and Python
#               - main package: MIT, except:
#                 - test/rsession/webdata/json.py: LPGLv2+
#                 - doc/style.css: Public Domain
#                 - test/web/post_multipart.py: Python 
#                   (see http://code.activestate.com/help/terms)
#                 - compat/textwrap.py: Python
#                 - compat/subprocess.py: Python
#                 - compat/doctest.py: Public Domain
#                 - compat/optparse.py: BSD
#               Note that all but the doctest compat files are removed
#               in the prep stage.
URL:            http://codespeak.net/py/dist/
Source:         http://pypi.python.org/packages/source/p/py/py-%{version}.tar.gz
# r58576 from trunk
Patch0:         py-0.9.2-fix-test-cache.patch
# r60277 from trunk
Patch1:         py-0.9.2-svn15.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  python-devel
BuildRequires:  python-setuptools-devel
# needed by the testsuite
BuildRequires:  subversion
BuildRequires:  python-docutils

%define doctarget %{buildroot}%{_docdir}/%{name}-%{version}

%ifarch ppc ppc64
# until the greenlet issue can be fixed
%define debug_package %{nil}
%endif


%description
The py lib aims at supporting a decent development process addressing
deployment, versioning, testing and documentation perspectives.


%prep
%setup -q -n py-%{version}
%patch0 -p1 -b .test-cache
%patch1 -p0 -b .svn

# remove the compatibility modules, and use system modules instead
for module in doctest optparse textwrap subprocess ; do
    rm py/compat/$module.py
    echo "from $module import *" > py/compat/system_$module.py
    sed -i py/__init__.py -e "s,compat/$module.py,compat/system_$module.py,"
done


%build
CFLAGS="$RPM_OPT_FLAGS" %{__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_sitearch} \( -name '*.py' -o -name 'py.*' \) \
   -exec sed -i '1{/^#!/d}' {} \; \
   -exec chmod u=rw,go=r {} \;

# move and cleanup docs
mkdir -p %{doctarget}
mv %{buildroot}%{python_sitearch}/py/LICENSE %{doctarget}
mv %{buildroot}%{python_sitearch}/py/doc/* %{doctarget}
rm %{doctarget}/*.py*
rmdir %{buildroot}%{python_sitearch}/py/doc
mv %{buildroot}%{python_sitearch}/py/apigen/todo.txt %{doctarget}/todo_apigen.txt
mv %{buildroot}%{python_sitearch}/py/apigen/todo-apigen.txt %{doctarget}/todo-apigen_apigen.txt
mv %{buildroot}%{python_sitearch}/py/compat/LICENSE %{doctarget}/LICENSE_compat
mv %{buildroot}%{python_sitearch}/py/execnet/NOTES %{doctarget}/NOTES_execnet
mv %{buildroot}%{python_sitearch}/py/path/gateway/TODO.txt %{doctarget}/TODO_path_gateway.txt
mv %{buildroot}%{python_sitearch}/py/path/svn/quoting.txt %{doctarget}/quoting_path_svn.txt
mv %{buildroot}%{python_sitearch}/py/c-extension/greenlet/README.txt %{doctarget}/RADME_greenlet.txt

# remove (most) files only used by the testsuite
find %{buildroot}%{python_sitearch} -type d -name testing -prune -exec rm -r {} \;
find %{buildroot}%{python_sitearch} -name 'conftest.py*' -exec rm {} \;
rm -r %{buildroot}%{python_sitearch}/py/io/test

# remove this and that
rm %{buildroot}%{python_sitearch}/py/env.cmd
rm -r %{buildroot}%{python_sitearch}/py/bin
rm %{buildroot}%{python_sitearch}/py/c-extension/greenlet/*.h
rm %{buildroot}%{python_sitearch}/py/c-extension/greenlet/*.c
rm %{buildroot}%{python_sitearch}/py/c-extension/greenlet/setup.*
rm %{buildroot}%{python_sitearch}/py/c-extension/greenlet/test_*

%ifarch ppc ppc64
cp -p py/c-extension/greenlet/dummy_greenlet.py \
   %{buildroot}%{python_sitearch}/py/c-extension/greenlet/greenlet.py
rm %{buildroot}%{python_sitearch}/py/c-extension/greenlet/greenlet.so
cat << \EOF > %{doctarget}/README.greenlet.fedora
The native py.magic.greenlet code has been replaced by
dummy_greenlet.py on ppc and ppc64 for this package because it
reproducibly segfaults.
%endif


%check

# on ppc, use dummy greenlets also for the tests
%ifarch ppc ppc64
cp -p py/c-extension/greenlet/dummy_greenlet.py \
   py/c-extension/greenlet/greenlet.py
rm py/c-extension/greenlet/*.{c,h}
%endif

# see pylib issue67
rm py/doc/apigen.txt
sed -i '/apigen/d' py/doc/index.txt

PYTHONPATH=$(pwd)/py %{__python} py/bin/py.test py


%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%{_bindir}/py.*
%{python_sitearch}/*
%{_docdir}/%{name}-%{version}


%changelog
* Wed Jan 14 2009 Thomas Moschny <thomas.moschny at gmx.de> - 0.9.2-6
- Use system doctest module again, as this wasn't the real cause of
  the test failure. Instead, remove the failing test for now.

* Fri Dec 12 2008 Thomas Moschny <thomas.moschny at gmx.de> - 0.9.2-5
- Add patch from trunk fixing a subversion 1.5 problem (pylib
  issue66).
- Don't replace doctest compat module (pylib issue67).

* Fri Nov 21 2008 Thomas Moschny <thomas.moschny at gmx.de> - 0.9.2-4
- Use dummy_greenlet on ppc and ppc64.

* Tue Oct  7 2008 Thomas Moschny <thomas.moschny at gmx.de> - 0.9.2-3
- Replace compat modules by stubs using the system modules instead.
- Add patch from trunk fixing a timing issue in the tests.

* Tue Sep 30 2008 Thomas Moschny <thomas.moschny at gmx.de> - 0.9.2-2
- Update license information.
- Fix the tests.

* Sun Sep  7 2008 Thomas Moschny <thomas.moschny at gmx.de> - 0.9.2-1
- Update to 0.9.2.
- Upstream now uses setuptools and installs to %%{python_sitearch}.
- Remove %%{srcname} macro.
- More detailed information about licenses.

* Wed Aug 21 2008 Thomas Moschny <thomas.moschny at gmx.de> - 0.9.1-1
- New package.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-py/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	15 Jan 2009 20:41:44 -0000	1.1
+++ .cvsignore	16 Jan 2009 13:37:39 -0000	1.2
@@ -0,0 +1 @@
+py-0.9.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-py/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	15 Jan 2009 20:41:44 -0000	1.1
+++ sources	16 Jan 2009 13:37:39 -0000	1.2
@@ -0,0 +1 @@
+2c996d78867f6ad64dc5aabf1185aaf7  py-0.9.2.tar.gz



From mbarnes at fedoraproject.org  Fri Jan 16 13:49:04 2009
From: mbarnes at fedoraproject.org (Matthew Barnes)
Date: Fri, 16 Jan 2009 13:49:04 +0000 (UTC)
Subject: rpms/pycairo/devel .cvsignore, 1.9, 1.10 pycairo.spec, 1.22,
	1.23 sources, 1.9, 1.10
Message-ID: <20090116134904.F210270127@cvs1.fedora.phx.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/pycairo/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8931

Modified Files:
	.cvsignore pycairo.spec sources 
Log Message:

* Fri Jan 16 2009 Matthew Barnes <mbarnes at redhat.com> - 1.8.2-1
- Update to 1.8.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pycairo/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	16 Dec 2008 23:55:06 -0000	1.9
+++ .cvsignore	16 Jan 2009 13:48:34 -0000	1.10
@@ -1 +1 @@
-pycairo-1.8.0.tar.gz
+pycairo-1.8.2.tar.gz


Index: pycairo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pycairo/devel/pycairo.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- pycairo.spec	16 Dec 2008 23:55:06 -0000	1.22
+++ pycairo.spec	16 Jan 2009 13:48:34 -0000	1.23
@@ -1,11 +1,11 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
-%define cairo_version 1.4.12
+%define cairo_version 1.8.2
 
 ### Abstract ###
 
 Name: pycairo
-Version: 1.8.0
+Version: 1.8.2
 Release: 1%{?dist}
 License: MPLv1.1 or LGPLv2
 Group: Development/Languages
@@ -62,6 +62,9 @@
 %{_libdir}/pkgconfig/pycairo.pc
 
 %changelog
+* Fri Jan 16 2009 Matthew Barnes <mbarnes at redhat.com> - 1.8.2-1
+- Update to 1.8.2
+
 * Tue Dec 16 2008 Matthew Barnes <mbarnes at redhat.com> - 1.8.0-1
 - Update to 1.8.0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pycairo/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	16 Dec 2008 23:55:06 -0000	1.9
+++ sources	16 Jan 2009 13:48:34 -0000	1.10
@@ -1 +1 @@
-847f5377c32228a656819f5bd18eb6b4  pycairo-1.8.0.tar.gz
+bbfc0c2fef08dfb0c5b8baa5f0b67a87  pycairo-1.8.2.tar.gz



From tmraz at fedoraproject.org  Fri Jan 16 14:02:21 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 16 Jan 2009 14:02:21 +0000 (UTC)
Subject: rpms/fuse-encfs/devel fuse-encfs.spec,1.25,1.26
Message-ID: <20090116140221.A7F2770127@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/fuse-encfs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10998

Modified Files:
	fuse-encfs.spec 
Log Message:
* Fri Jan 16 2009 Tomas Mraz <tmraz at redhat.com> 1.5-4
- rebuild with new openssl



Index: fuse-encfs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fuse-encfs/devel/fuse-encfs.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- fuse-encfs.spec	30 Dec 2008 11:58:13 -0000	1.25
+++ fuse-encfs.spec	16 Jan 2009 14:01:51 -0000	1.26
@@ -1,6 +1,6 @@
 Name:		fuse-encfs
 Version:	1.5
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	Encrypted pass-thru filesystem in userspace
 License:	GPLv3+
 Group:		System Environment/Kernel
@@ -52,6 +52,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Fri Jan 16 2009 Tomas Mraz <tmraz at redhat.com> 1.5-4
+- rebuild with new openssl
+
 * Tue Dec 30 2008 Peter Lemenkov <lemenkov at gmail.com> 1.5-3
 - Fixed URL
 



From tmraz at fedoraproject.org  Fri Jan 16 14:04:44 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 16 Jan 2009 14:04:44 +0000 (UTC)
Subject: rpms/g2ipmsg/devel g2ipmsg.spec,1.1,1.2
Message-ID: <20090116140444.739AE70127@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/g2ipmsg/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11344

Modified Files:
	g2ipmsg.spec 
Log Message:
* Fri Jan 16 2009 Tomas Mraz <tmraz at redhat.com> - 0.9.6-3
- rebuild with new openssl



Index: g2ipmsg.spec
===================================================================
RCS file: /cvs/pkgs/rpms/g2ipmsg/devel/g2ipmsg.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- g2ipmsg.spec	1 Nov 2008 19:21:55 -0000	1.1
+++ g2ipmsg.spec	16 Jan 2009 14:04:14 -0000	1.2
@@ -1,7 +1,7 @@
 Summary: IP Messenger for GNOME 2
 Name: g2ipmsg
 Version: 0.9.6
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: BSD
 Group: Applications/Internet
 URL: http://www.ipmsg.org/
@@ -89,6 +89,9 @@
 
 
 %changelog
+* Fri Jan 16 2009 Tomas Mraz <tmraz at redhat.com> - 0.9.6-3
+- rebuild with new openssl
+
 * Tue Oct 28 2008 ZC Miao <hellwolf.misty at gmail.com> - 0.9.6-2
 - Fix Release TAG
 - add Source url reference



From kyle at fedoraproject.org  Fri Jan 16 14:10:14 2009
From: kyle at fedoraproject.org (Kyle McMartin)
Date: Fri, 16 Jan 2009 14:10:14 +0000 (UTC)
Subject: rpms/kernel/F-10 patch-2.6.28.1-rc1.bz2.sign, NONE, 1.1 .cvsignore, 
	1.961, 1.962 kernel.spec, 1.1214, 1.1215 sources, 1.923, 1.924
	linux-2.6-ath5k-ignore-the-return-value-of-ath5k_hw_noise_floor_calibration.patch,
	1.1,
	NONE linux-2.6-iwlwifi-use-GFP_KERNEL-to-allocate-Rx-SKB-memory.patch,
	1.1, NONE
Message-ID: <20090116141014.9A4AF70127@cvs1.fedora.phx.redhat.com>

Author: kyle

Update of /cvs/pkgs/rpms/kernel/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12103

Modified Files:
	.cvsignore kernel.spec sources 
Added Files:
	patch-2.6.28.1-rc1.bz2.sign 
Removed Files:
	linux-2.6-ath5k-ignore-the-return-value-of-ath5k_hw_noise_floor_calibration.patch 
	linux-2.6-iwlwifi-use-GFP_KERNEL-to-allocate-Rx-SKB-memory.patch 
Log Message:
* Thu Jan 15 2009 Kyle McMartin <kyle at redhat.com>
- 2.6.28.1-rc1
- linux-2.6-iwlwifi-use-GFP_KERNEL-to-allocate-Rx-SKB-memory.patch: merged
- linux-2.6-ath5k-ignore-the-return-value-of-ath5k_hw_noise_floor_calibration.patch: merged



--- NEW FILE patch-2.6.28.1-rc1.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBJb5XEyGugalF9Dw4RAopAAJ9Ac7AbOO6fUFRHReFDsG+ef7M2TgCfSb7U
6gdp6PK3jgVff1kFClXu768=
=9HUu
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/.cvsignore,v
retrieving revision 1.961
retrieving revision 1.962
diff -u -r1.961 -r1.962
--- .cvsignore	12 Jan 2009 19:51:27 -0000	1.961
+++ .cvsignore	16 Jan 2009 14:09:43 -0000	1.962
@@ -4,3 +4,4 @@
 temp-*
 kernel-2.6.28
 linux-2.6.28.tar.bz2
+patch-2.6.28.1-rc1.bz2


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/kernel.spec,v
retrieving revision 1.1214
retrieving revision 1.1215
diff -u -r1.1214 -r1.1215
--- kernel.spec	15 Jan 2009 18:50:41 -0000	1.1214
+++ kernel.spec	16 Jan 2009 14:09:43 -0000	1.1215
@@ -36,9 +36,9 @@
 %if 0%{?released_kernel}
 
 # Do we have a -stable update to apply?
-%define stable_update 0
+%define stable_update 1
 # Is it a -stable RC?
-%define stable_rc 0
+%define stable_rc 1
 # Set rpm version accordingly
 %if 0%{?stable_update}
 %define stablerev .%{stable_update}
@@ -628,8 +628,6 @@
 
 Patch670: linux-2.6-ata-quirk.patch
 
-Patch680: linux-2.6-iwlwifi-use-GFP_KERNEL-to-allocate-Rx-SKB-memory.patch
-Patch681: linux-2.6-ath5k-ignore-the-return-value-of-ath5k_hw_noise_floor_calibration.patch
 Patch682: iwlwifi-intel-bug-1822.patch
 
 Patch690: linux-2.6-at76.patch
@@ -1151,15 +1149,9 @@
 # ia64 ata quirk
 ApplyPatch linux-2.6-ata-quirk.patch
 
-# iwlwifi: use GFP_KERNEL to allocate Rx SKB memory
-ApplyPatch linux-2.6-iwlwifi-use-GFP_KERNEL-to-allocate-Rx-SKB-memory.patch
-
 # iwlwifi: avoid rs_get_rate warnings
 ApplyPatch iwlwifi-intel-bug-1822.patch
 
-# ath5k: ignore the return value of ath5k_hw_noise_floor_calibration
-ApplyPatch linux-2.6-ath5k-ignore-the-return-value-of-ath5k_hw_noise_floor_calibration.patch
-
 # Add misc wireless bits from upstream wireless tree
 ApplyPatch linux-2.6-at76.patch
 
@@ -1506,7 +1498,8 @@
 
 %if %{with_doc}
 # Make the HTML and man pages.
-make %{?_smp_mflags} htmldocs mandocs || %{doc_build_fail}
+make %{?_smp_mflags} htmldocs || %{doc_build_fail} || exit 1
+make %{?_smp_mflags}  mandocs || %{doc_build_fail} || exit 1
 
 # sometimes non-world-readable files sneak into the kernel source tree
 chmod -R a=rX Documentation
@@ -1783,7 +1776,17 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
-* Tue Jan 14 2009 John W. Linville <linville at redhat.com>
+* Thu Jan 15 2009 Kyle McMartin <kyle at redhat.com>
+- 2.6.28.1-rc1
+- linux-2.6-iwlwifi-use-GFP_KERNEL-to-allocate-Rx-SKB-memory.patch: merged
+- linux-2.6-ath5k-ignore-the-return-value-of-ath5k_hw_noise_floor_calibration.patch: merged
+- spec: split htmldocs and mandocs into seperate make invocations so we can
+  hopefully catch a htmldocs failure without going through mandocs.
+
+* Thu Jan 15 2009 Ben Skeggs <bskeggs at redhat.com>
+- nouveau: fix missing header
+
+* Thu Jan 15 2009 John W. Linville <linville at redhat.com>
 - iwlwifi: avoid rs_get_rate warnings
 
 * Wed Jan 14 2009 Hans de Goede <hdegoede at redhat.com>


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/sources,v
retrieving revision 1.923
retrieving revision 1.924
diff -u -r1.923 -r1.924
--- sources	12 Jan 2009 19:51:31 -0000	1.923
+++ sources	16 Jan 2009 14:09:44 -0000	1.924
@@ -1 +1,2 @@
 d351e44709c9810b85e29b877f50968a  linux-2.6.28.tar.bz2
+14f372e6665310ae43b3a950dae31e6d  patch-2.6.28.1-rc1.bz2


--- linux-2.6-ath5k-ignore-the-return-value-of-ath5k_hw_noise_floor_calibration.patch DELETED ---


--- linux-2.6-iwlwifi-use-GFP_KERNEL-to-allocate-Rx-SKB-memory.patch DELETED ---



From than at fedoraproject.org  Fri Jan 16 14:11:30 2009
From: than at fedoraproject.org (Than Ngo)
Date: Fri, 16 Jan 2009 14:11:30 +0000 (UTC)
Subject: rpms/kdelibs/devel kdelibs-4.1.96-AllowExternalPaths.patch, NONE,
	1.1 kdelibs.spec, 1.418, 1.419
Message-ID: <20090116141130.D2D6570127@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdelibs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12217

Modified Files:
	kdelibs.spec 
Added Files:
	kdelibs-4.1.96-AllowExternalPaths.patch 
Log Message:
backport fix from trunk to allow symlinks in wallpaper theme



kdelibs-4.1.96-AllowExternalPaths.patch:

--- NEW FILE kdelibs-4.1.96-AllowExternalPaths.patch ---
diff -up kdelibs-4.1.96/plasma/package.cpp.orig kdelibs-4.1.96/plasma/package.cpp
--- kdelibs-4.1.96/plasma/package.cpp.orig	2009-01-06 18:27:56.000000000 +0100
+++ kdelibs-4.1.96/plasma/package.cpp	2009-01-16 14:42:39.000000000 +0100
@@ -139,6 +139,10 @@ QString Package::filePath(const char *fi
     }
 
     if (QFile::exists(path)) {
+        if (d->structure->allowExternalPaths()) {
+            return path;
+        }
+
         // ensure that we don't return files outside of our base path
         // due to symlink or ../ games
         QDir dir(path);
@@ -171,6 +175,10 @@ QStringList Package::entryList(const cha
     QDir dir(d->basePath + d->structure->contentsPrefix() + path);
 
     if (dir.exists()) {
+        if (d->structure->allowExternalPaths()) {
+            return dir.entryList(QDir::Files | QDir::Readable);
+        }
+
         // ensure that we don't return files outside of our base path
         // due to symlink or ../ games
         QString canonicalized = dir.canonicalPath();
diff -up kdelibs-4.1.96/plasma/packagestructure.cpp.orig kdelibs-4.1.96/plasma/packagestructure.cpp
--- kdelibs-4.1.96/plasma/packagestructure.cpp.orig	2009-01-16 14:41:56.000000000 +0100
+++ kdelibs-4.1.96/plasma/packagestructure.cpp	2009-01-16 14:42:39.000000000 +0100
@@ -58,17 +58,19 @@ class ContentStructure
         QString path;
         QString name;
         QStringList mimetypes;
-        bool directory;
-        bool required;
+        bool directory : 1;
+        bool required : 1;
 };
 
 class PackageStructurePrivate
 {
 public:
     PackageStructurePrivate()
-        : metadata(0)
+        : metadata(0),
+          externalPaths(false)
     {
     }
+
     ~PackageStructurePrivate()
     {
         delete metadata;
@@ -76,6 +78,8 @@ public:
 
     void createPackageMetadata(const QString &path);
 
+    static QHash<QString, PackageStructure::Ptr> structures;
+
     QString type;
     QString path;
     QString contentsPrefix;
@@ -83,8 +87,8 @@ public:
     QString servicePrefix;
     QMap<QByteArray, ContentStructure> contents;
     QStringList mimetypes;
-    static QHash<QString, PackageStructure::Ptr> structures;
     PackageMetadata *metadata;
+    bool externalPaths;
  };
 
 QHash<QString, PackageStructure::Ptr> PackageStructurePrivate::structures;
@@ -487,6 +491,16 @@ PackageMetadata PackageStructure::metada
     return *d->metadata;
 }
 
+bool PackageStructure::allowExternalPaths() const
+{
+    return d->externalPaths;
+}
+
+void PackageStructure::setAllowExternalPaths(bool allow)
+{
+    d->externalPaths = allow;
+}
+
 } // Plasma namespace
 
 #include "packagestructure.moc"
diff -up kdelibs-4.1.96/plasma/packagestructure.h.orig kdelibs-4.1.96/plasma/packagestructure.h
--- kdelibs-4.1.96/plasma/packagestructure.h.orig	2009-01-16 14:19:12.000000000 +0100
+++ kdelibs-4.1.96/plasma/packagestructure.h	2009-01-16 14:42:39.000000000 +0100
@@ -278,6 +278,12 @@ public:
       */
     virtual PackageMetadata metadata();
 
+    /**
+     * @return true if paths/symlinks outside the package itself should be followed.
+     * By default this is set to false for security reasons.
+     */
+    bool allowExternalPaths() const;
+
 Q_SIGNALS:
     /**
      * Emitted when the new widget browser process completes.
@@ -286,6 +292,13 @@ Q_SIGNALS:
 
 protected:
     /**
+     * Sets whether or not external paths/symlinks can be followed by a package
+     * @arg allow true if paths/symlinks outside of the package should be followed,
+     *             false if they should be rejected.
+     */
+    void setAllowExternalPaths(bool allow);
+
+    /**
      * Sets the prefix that all the contents in this package should
      * appear under. This defaults to "contents/" and is added automatically
      * between the base path and the entries as defined by the package


Index: kdelibs.spec
===================================================================
RCS file: /cvs/extras/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.418
retrieving revision 1.419
diff -u -r1.418 -r1.419
--- kdelibs.spec	16 Jan 2009 12:14:14 -0000	1.418
+++ kdelibs.spec	16 Jan 2009 14:11:00 -0000	1.419
@@ -79,7 +79,10 @@
 Patch22: kdelibs-4.1.96-cmake.patch
 
 # upstream
+# 4.2 branch
 Patch100: kdelibs-4.1.96-crash.patch
+# 4.3 branch
+Patch101: kdelibs-4.1.96-AllowExternalPaths.patch
 
 BuildRequires: qt4-devel >= 4.4.0
 Requires: qt4 >= %{_qt4_version}
@@ -207,6 +210,7 @@
 
 # upstream patches
 %patch100 -p1 -b .crash
+%patch101 -p1 -b .AllowExternalPaths
 
 %build
 
@@ -372,6 +376,7 @@
 - drop kdelibs-4.1.85-plasma-default-wallpaper.patch, it's not needed
   since new plasma allows to define default wallpaper, new kde-setting
   is required
+- backport fix from trunk to allow symlinks in wallpaper theme
 
 * Fri Jan 16 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.1.96-8
 - rebuild for new OpenSSL



From kyle at fedoraproject.org  Fri Jan 16 14:14:01 2009
From: kyle at fedoraproject.org (Kyle McMartin)
Date: Fri, 16 Jan 2009 14:14:01 +0000 (UTC)
Subject: rpms/kernel/F-10 patch-2.6.28.1-rc2.bz2.sign, NONE, 1.1 .cvsignore, 
	1.962, 1.963 kernel.spec, 1.1215, 1.1216 sources, 1.924,
	1.925 upstream, 1.835, 1.836 patch-2.6.28.1-rc1.bz2.sign, 1.1, NONE
Message-ID: <20090116141401.4F52B70127@cvs1.fedora.phx.redhat.com>

Author: kyle

Update of /cvs/pkgs/rpms/kernel/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12619

Modified Files:
	.cvsignore kernel.spec sources upstream 
Added Files:
	patch-2.6.28.1-rc2.bz2.sign 
Removed Files:
	patch-2.6.28.1-rc1.bz2.sign 
Log Message:
* Fri Jan 16 2009 Kyle McMartin <kyle at redhat.com>
- 2.6.28.1-rc2



--- NEW FILE patch-2.6.28.1-rc2.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBJb6ZnyGugalF9Dw4RArosAJ9TZryFV4TpaqS28lHGpUDUtAV38ACaA+wE
ZnvQPRoJFqKISbFbo1p398E=
=51CP
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/.cvsignore,v
retrieving revision 1.962
retrieving revision 1.963
diff -u -r1.962 -r1.963
--- .cvsignore	16 Jan 2009 14:09:43 -0000	1.962
+++ .cvsignore	16 Jan 2009 14:13:30 -0000	1.963
@@ -4,4 +4,4 @@
 temp-*
 kernel-2.6.28
 linux-2.6.28.tar.bz2
-patch-2.6.28.1-rc1.bz2
+patch-2.6.28.1-rc2.bz2


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/kernel.spec,v
retrieving revision 1.1215
retrieving revision 1.1216
diff -u -r1.1215 -r1.1216
--- kernel.spec	16 Jan 2009 14:09:43 -0000	1.1215
+++ kernel.spec	16 Jan 2009 14:13:30 -0000	1.1216
@@ -38,7 +38,7 @@
 # Do we have a -stable update to apply?
 %define stable_update 1
 # Is it a -stable RC?
-%define stable_rc 1
+%define stable_rc 2
 # Set rpm version accordingly
 %if 0%{?stable_update}
 %define stablerev .%{stable_update}
@@ -1776,6 +1776,9 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Fri Jan 16 2009 Kyle McMartin <kyle at redhat.com>
+- 2.6.28.1-rc2
+
 * Thu Jan 15 2009 Kyle McMartin <kyle at redhat.com>
 - 2.6.28.1-rc1
 - linux-2.6-iwlwifi-use-GFP_KERNEL-to-allocate-Rx-SKB-memory.patch: merged


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/sources,v
retrieving revision 1.924
retrieving revision 1.925
diff -u -r1.924 -r1.925
--- sources	16 Jan 2009 14:09:44 -0000	1.924
+++ sources	16 Jan 2009 14:13:30 -0000	1.925
@@ -1,2 +1,2 @@
 d351e44709c9810b85e29b877f50968a  linux-2.6.28.tar.bz2
-14f372e6665310ae43b3a950dae31e6d  patch-2.6.28.1-rc1.bz2
+c44fbfbbe4ca3c07a8bb18c71abfe551  patch-2.6.28.1-rc2.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/upstream,v
retrieving revision 1.835
retrieving revision 1.836
diff -u -r1.835 -r1.836
--- upstream	12 Jan 2009 19:51:31 -0000	1.835
+++ upstream	16 Jan 2009 14:13:30 -0000	1.836
@@ -1 +1,2 @@
 linux-2.6.28.tar.bz2
+patch-2.6.28.1-rc2.bz2


--- patch-2.6.28.1-rc1.bz2.sign DELETED ---



From than at fedoraproject.org  Fri Jan 16 14:18:55 2009
From: than at fedoraproject.org (Than Ngo)
Date: Fri, 16 Jan 2009 14:18:55 +0000 (UTC)
Subject: rpms/kdebase-workspace/devel
	kdebase-workspace-4.1.96-AllowExternalPaths.patch, NONE,
	1.1 kdebase-workspace.spec, 1.167, 1.168
Message-ID: <20090116141855.AFC9B70141@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdebase-workspace/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13836

Modified Files:
	kdebase-workspace.spec 
Added Files:
	kdebase-workspace-4.1.96-AllowExternalPaths.patch 
Log Message:
backport fix from trunk to allow symlinks in wallpaper theme


kdebase-workspace-4.1.96-AllowExternalPaths.patch:

--- NEW FILE kdebase-workspace-4.1.96-AllowExternalPaths.patch ---
diff -up kdebase-workspace-4.1.96/plasma/wallpapers/image/backgroundpackage.cpp.orig kdebase-workspace-4.1.96/plasma/wallpapers/image/backgroundpackage.cpp
--- kdebase-workspace-4.1.96/plasma/wallpapers/image/backgroundpackage.cpp.orig	2009-01-16 14:57:51.000000000 +0100
+++ kdebase-workspace-4.1.96/plasma/wallpapers/image/backgroundpackage.cpp	2009-01-16 14:58:43.000000000 +0100
@@ -157,6 +157,7 @@ BackgroundPackageStructure::BackgroundPa
 
     addDirectoryDefinition("images", "images", i18n("Images"));
     addFileDefinition("screenshot", "screenshot.png", i18n("Screenshot"));
+    setAllowExternalPaths(true);
 }
 
 


Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebase-workspace/devel/kdebase-workspace.spec,v
retrieving revision 1.167
retrieving revision 1.168
diff -u -r1.167 -r1.168
--- kdebase-workspace.spec	14 Jan 2009 17:50:10 -0000	1.167
+++ kdebase-workspace.spec	16 Jan 2009 14:18:25 -0000	1.168
@@ -4,7 +4,7 @@
 Name: kdebase-workspace
 Version: 4.1.96
 
-Release: 3%{?dist}
+Release: 4%{?dist}
 Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdebase-workspace-%{version}.tar.bz2
 License: GPLv2
 Group: User Interface/Desktops
@@ -25,6 +25,8 @@
 Patch10: kdebase-workspace-4.1.2-ldap.patch
 
 # upstream patches:
+# trunk
+Patch100: kdebase-workspace-4.1.96-AllowExternalPaths.patch
 
 # FIXME: "inconsistent naming System Monitor vs KSysGuard" http://bugs.kde.org/162151
 
@@ -170,7 +172,7 @@
 %patch10 -p1 -b .ldap
 
 # upstream patches
-
+%patch100 -p1 -b .AllowExternalPaths
 
 %build
 
@@ -296,6 +298,9 @@
 
 
 %changelog
+* Fri Jan 16 2009 Than Ngo <than at redhat.com> - 4.1.96-4
+- backport fix from trunk to allow symlinks in wallpaper theme
+
 * Wed Jan 14 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.1.96-3
 - BR: google-gadgets-devel > 0.10.5
 



From than at fedoraproject.org  Fri Jan 16 14:32:17 2009
From: than at fedoraproject.org (Than Ngo)
Date: Fri, 16 Jan 2009 14:32:17 +0000 (UTC)
Subject: rpms/kde-settings/devel .cvsignore, 1.46, 1.47 kde-settings.spec,
	1.63, 1.64 sources, 1.46, 1.47
Message-ID: <20090116143217.99F8B70141@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kde-settings/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15030

Modified Files:
	.cvsignore kde-settings.spec sources 
Log Message:
wallpaper theme for new plasma in 4.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kde-settings/devel/.cvsignore,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- .cvsignore	31 Oct 2008 15:30:14 -0000	1.46
+++ .cvsignore	16 Jan 2009 14:31:47 -0000	1.47
@@ -1 +1,2 @@
 kde-settings-20081031svn.tar.bz2
+kde-settings-20090116svn.tar.bz2


Index: kde-settings.spec
===================================================================
RCS file: /cvs/extras/rpms/kde-settings/devel/kde-settings.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- kde-settings.spec	31 Oct 2008 15:30:14 -0000	1.63
+++ kde-settings.spec	16 Jan 2009 14:31:47 -0000	1.64
@@ -3,12 +3,12 @@
 # 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 20081031svn
+%define rel 20090116svn
 
 Summary: Config files for kde
 Name:    kde-settings
 Version: 4.1
-Release: 4.%{rel}%{?dist}
+Release: 5.%{rel}%{?dist}
 
 Group:   System Environment/Base
 License: Public Domain
@@ -157,6 +157,9 @@
 
 
 %changelog
+* Fri Jan 16 2009 Than Ngo <than at redhat.com> - 4.1-5
+- wallpaper theme for new plasma in 4.2
+
 * Fri Oct 31 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1-4
 - KPackageKit: [CheckUpdate] autoUpdate=0 (#469375)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kde-settings/devel/sources,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- sources	31 Oct 2008 15:30:14 -0000	1.46
+++ sources	16 Jan 2009 14:31:47 -0000	1.47
@@ -1 +1 @@
-39cf518718eaa92d14197551aef440b5  kde-settings-20081031svn.tar.bz2
+3e10d8fa6905b6ae9851668a5d640b97  kde-settings-20090116svn.tar.bz2



From jwilson at fedoraproject.org  Fri Jan 16 14:53:39 2009
From: jwilson at fedoraproject.org (Jarod Wilson)
Date: Fri, 16 Jan 2009 14:53:39 +0000 (UTC)
Subject: rpms/rrdtool/devel .cvsignore, 1.31, 1.32 rrdtool.spec, 1.75,
	1.76 sources, 1.34, 1.35
Message-ID: <20090116145339.A34EE70127@cvs1.fedora.phx.redhat.com>

Author: jwilson

Update of /cvs/pkgs/rpms/rrdtool/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17536

Modified Files:
	.cvsignore rrdtool.spec sources 
Log Message:
* Fri Jan 16 2009 Jarod Wilson <jarod at redhat.com> 1.3.5-2
- dejavu font package names changed again...

* Tue Dec 16 2008 Jarod Wilson <jarod at redhat.com> 1.3.5-1
- Update to rrdtool 1.3.5




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rrdtool/devel/.cvsignore,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- .cvsignore	6 Oct 2008 13:55:24 -0000	1.31
+++ .cvsignore	16 Jan 2009 14:53:09 -0000	1.32
@@ -1,3 +1,4 @@
 php4-r1190.tar.gz
 rrdtool-1.3.3.tar.gz
 rrdtool-1.3.4.tar.gz
+rrdtool-1.3.5.tar.gz


Index: rrdtool.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rrdtool/devel/rrdtool.spec,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- rrdtool.spec	4 Dec 2008 18:13:46 -0000	1.75
+++ rrdtool.spec	16 Jan 2009 14:53:09 -0000	1.76
@@ -8,16 +8,15 @@
 
 Summary: Round Robin Database Tool to store and display time-series data
 Name: rrdtool
-Version: 1.3.4
-Release: 5%{?dist}
+Version: 1.3.5
+Release: 2%{?dist}
 License: GPLv2+ with exceptions
 Group: Applications/Databases
 URL: http://oss.oetiker.ch/rrdtool/
 Source0: http://oss.oetiker.ch/%{name}/pub/%{name}-%{version}.tar.gz
 Source1: php4-%{svnrev}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires: dejavu-fonts-lgc-sans, dejavu-fonts-lgc-sans-mono
-Requires: dejavu-fonts-lgc-serif
+Requires: dejavu-fonts-lgc-compat
 BuildRequires: gcc-c++, openssl-devel, freetype-devel
 BuildRequires: libpng-devel, zlib-devel, intltool >= 0.35.0
 BuildRequires: cairo-devel >= 1.4.6, pango-devel >= 1.17
@@ -326,6 +325,12 @@
 %endif
 
 %changelog
+* Fri Jan 16 2009 Jarod Wilson <jarod at redhat.com> 1.3.5-2
+- dejavu font package names changed again...
+
+* Tue Dec 16 2008 Jarod Wilson <jarod at redhat.com> 1.3.5-1
+- Update to rrdtool 1.3.5
+
 * Thu Dec 04 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 1.3.4-5
 - Rebuild for Python 2.6
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rrdtool/devel/sources,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- sources	6 Oct 2008 13:55:25 -0000	1.34
+++ sources	16 Jan 2009 14:53:09 -0000	1.35
@@ -1,2 +1,2 @@
 28074a9c368af013462631959ab90558  php4-r1190.tar.gz
-7db3bffc3f3b24e828a88fe02165266f  rrdtool-1.3.4.tar.gz
+3f14381e64c2037f40af16380be9e9f3  rrdtool-1.3.5.tar.gz



From jcollie at fedoraproject.org  Fri Jan 16 14:53:50 2009
From: jcollie at fedoraproject.org (Jeffrey C. Ollie)
Date: Fri, 16 Jan 2009 14:53:50 +0000 (UTC)
Subject: rpms/zabbix/devel zabbix-1.6.2-cpustats.patch, NONE, 1.1 .cvsignore,
	1.14, 1.15 sources, 1.15, 1.16 zabbix.spec, 1.30,
	1.31 zabbix-1.5.4-ifoutoctets.patch, 1.1,
	NONE zabbix-1.6-cpustats.patch, 1.1, NONE
Message-ID: <20090116145350.729CF70127@cvs1.fedora.phx.redhat.com>

Author: jcollie

Update of /cvs/pkgs/rpms/zabbix/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17569

Modified Files:
	.cvsignore sources zabbix.spec 
Added Files:
	zabbix-1.6.2-cpustats.patch 
Removed Files:
	zabbix-1.5.4-ifoutoctets.patch zabbix-1.6-cpustats.patch 
Log Message:
* Fri Jan 16 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6.2-1
- Update to 1.6.2: http://www.zabbix.com/rn1.6.2.php


zabbix-1.6.2-cpustats.patch:

--- NEW FILE zabbix-1.6.2-cpustats.patch ---
diff --git a/src/libs/zbxsysinfo/linux/cpu.c b/src/libs/zbxsysinfo/linux/cpu.c
index 67dd157..cdf4952 100644
--- a/src/libs/zbxsysinfo/linux/cpu.c
+++ b/src/libs/zbxsysinfo/linux/cpu.c
@@ -125,6 +125,36 @@ int	SYSTEM_CPU_UTIL(const char *cmd, const char *param, unsigned flags, AGENT_RE
 		else if (ZBX_AVG5 == mode) 	SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].system5)
 		else if (ZBX_AVG15 == mode)	SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].system15)
 	}
+	else if( 0 == strcmp(type,"interrupt"))
+	{
+		if (ZBX_AVG1 == mode) 		SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].interrupt1)
+		else if (ZBX_AVG5 == mode) 	SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].interrupt5)
+		else if (ZBX_AVG15 == mode)	SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].interrupt15)
+	}
+	else if( 0 == strcmp(type,"wait"))
+	{
+		if(ZBX_AVG1 == mode) 		SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].iowait1)
+		else if(ZBX_AVG5 == mode) 	SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].iowait5)
+		else if(ZBX_AVG15 == mode)	SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].iowait15)
+	}
+	else if( 0 == strcmp(type,"irq"))
+	{
+		if(ZBX_AVG1 == mode) 		SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].irq1)
+		else if(ZBX_AVG5 == mode) 	SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].irq5)
+		else if(ZBX_AVG15 == mode)	SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].irq15)
+	}
+	else if( 0 == strcmp(type,"softirq"))
+	{
+		if(ZBX_AVG1 == mode) 		SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].softirq1)
+		else if(ZBX_AVG5 == mode) 	SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].softirq5)
+		else if(ZBX_AVG5 == mode)	SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].softirq15)
+	}
+	else if( 0 == strcmp(type,"steal"))
+	{
+		if(ZBX_AVG1 == mode) 		SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].steal1)
+		else if(ZBX_AVG1 == mode) 	SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].steal5)
+		else if(ZBX_AVG1 == mode)	SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].steal15)
+	}
 	else
 		return SYSINFO_RET_FAIL;
 
diff --git a/src/zabbix_agent/cpustat.c b/src/zabbix_agent/cpustat.c
index 2dd2103..cccf1d2 100644
--- a/src/zabbix_agent/cpustat.c
+++ b/src/zabbix_agent/cpustat.c
@@ -184,7 +184,10 @@ static int	get_cpustat(
 		zbx_uint64_t *cpu_nice,
 		zbx_uint64_t *cpu_idle,
 		zbx_uint64_t *cpu_interrupt,
-		zbx_uint64_t *cpu_iowait
+		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)
@@ -235,6 +238,9 @@ static int	get_cpustat(
 	*cpu_user = *cpu_system = *cpu_nice = *cpu_idle = -1;
 	*cpu_interrupt	= 0;
 	*cpu_iowait	= 0;
+	*cpu_irq	= 0;
+	*cpu_softirq	= 0;
+	*cpu_steal	= 0;
 
 	zbx_snprintf(cpu_name, sizeof(cpu_name), "cpu%c ", cpuid > 0 ? '0' + (cpuid - 1) : ' ');
 
@@ -242,7 +248,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);
@@ -389,7 +396,10 @@ static void	apply_cpustat(
 	zbx_uint64_t cpu_nice,
 	zbx_uint64_t cpu_idle,
 	zbx_uint64_t cpu_interrupt,
-	zbx_uint64_t cpu_iowait
+	zbx_uint64_t cpu_iowait,
+	zbx_uint64_t cpu_irq,
+	zbx_uint64_t cpu_softirq,
+	zbx_uint64_t cpu_steal
 	)
 {
 	register int	i	= 0;
@@ -401,6 +411,9 @@ static void	apply_cpustat(
 			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
@@ -418,8 +431,11 @@ static void	apply_cpustat(
 		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 + cpu_iowait;
+		all = cpu_user + cpu_system + cpu_nice + cpu_idle + cpu_interrupt + cpu_iowait + cpu_irq + cpu_softirq + cpu_steal;
 		break;
 	}
 
@@ -440,8 +456,11 @@ static void	apply_cpustat(
 			idle ## t	= curr_cpu->h_idle[i];						\
 			interrupt ## t	= curr_cpu->h_interrupt[i];					\
 			iowait ## t	= curr_cpu->h_iowait[i];					\
+			irq ## t	= curr_cpu->h_irq[i];						\
+			softirq ## t	= curr_cpu->h_softirq[i];					\
+			steal ## t	= curr_cpu->h_steal[i];						\
 			all ## t	= user ## t + system ## t + nice ## t + idle ## t +		\
-						interrupt ## t + iowait ## t;				\
+						interrupt ## t + iowait ## t + irq ## t + softirq ## t + steal ## t; \
 		}
 
 		SAVE_CPU_CLOCK_FOR(1);
@@ -483,6 +502,18 @@ static void	apply_cpustat(
 	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 */
@@ -602,14 +633,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, cpu_iowait;
+	zbx_uint64_t cpu_user, cpu_nice, cpu_system, cpu_idle, cpu_interrupt, cpu_iowait, cpu_irq, cpu_softirq, cpu_steal;
 
 	for ( i = 0; i <= pcpus->count; i++ )
 	{
-		if(0 != get_cpustat(i, &now, &cpu_user, &cpu_system, &cpu_nice, &cpu_idle, &cpu_interrupt, &cpu_iowait))
+		if(0 != get_cpustat(i, &now, &cpu_user, &cpu_system, &cpu_nice, &cpu_idle, &cpu_interrupt, &cpu_iowait, &cpu_irq, &cpu_softirq, &cpu_steal))
 			continue;
 
-		apply_cpustat(pcpus, i, now, cpu_user, cpu_system, cpu_nice, cpu_idle, cpu_interrupt, cpu_iowait);
+		apply_cpustat(pcpus, i, now, cpu_user, cpu_system, cpu_nice, cpu_idle, cpu_interrupt, cpu_iowait, cpu_irq, cpu_softirq, cpu_steal);
 	}
 
 #endif /* _WINDOWS */
diff --git a/src/zabbix_agent/cpustat.h b/src/zabbix_agent/cpustat.h
index 9551707..412e0d3 100644
--- a/src/zabbix_agent/cpustat.h
+++ b/src/zabbix_agent/cpustat.h
@@ -72,6 +72,9 @@
 		zbx_uint64_t	h_idle[MAX_CPU_HISTORY];
 		zbx_uint64_t	h_interrupt[MAX_CPU_HISTORY];
 		zbx_uint64_t	h_iowait[MAX_CPU_HISTORY];
+		zbx_uint64_t	h_irq[MAX_CPU_HISTORY];
+		zbx_uint64_t	h_softirq[MAX_CPU_HISTORY];
+		zbx_uint64_t	h_steal[MAX_CPU_HISTORY];
 
 		/* public */
 		double	user1;
@@ -92,6 +95,15 @@
 		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: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/zabbix/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	5 Nov 2008 18:39:07 -0000	1.14
+++ .cvsignore	16 Jan 2009 14:53:20 -0000	1.15
@@ -1 +1 @@
-zabbix-1.6.1.tar.gz
+zabbix-1.6.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/zabbix/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	5 Nov 2008 18:39:07 -0000	1.15
+++ sources	16 Jan 2009 14:53:20 -0000	1.16
@@ -1 +1 @@
-26a6f8d643b28ca245804ea699924d80  zabbix-1.6.1.tar.gz
+33da3661868a04042c596a819896446f  zabbix-1.6.2.tar.gz


Index: zabbix.spec
===================================================================
RCS file: /cvs/pkgs/rpms/zabbix/devel/zabbix.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- zabbix.spec	4 Dec 2008 16:27:21 -0000	1.30
+++ zabbix.spec	16 Jan 2009 14:53:20 -0000	1.31
@@ -1,5 +1,5 @@
 Name:           zabbix
-Version:        1.6.1
+Version:        1.6.2
 Release:        1%{?dist}
 Summary:        Open-source monitoring solution for your IT infrastructure
 
@@ -13,8 +13,7 @@
 Source4:        zabbix-proxy.init
 Source5:        zabbix-logrotate.in
 
-Patch0:         zabbix-1.6-cpustats.patch
-Patch1:		zabbix-1.5.4-ifoutoctets.patch
+Patch0:         zabbix-1.6.2-cpustats.patch
 
 Buildroot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -198,7 +197,6 @@
 %prep
 %setup0 -q
 %patch0 -p1 -b .cpustats
-%patch1 -p1 -b .ifoutoctets
 
 chmod -R a+rX .
 
@@ -465,6 +463,9 @@
 %defattr(-,root,root,-)
 
 %changelog
+* Fri Jan 16 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6.2-1
+- Update to 1.6.2: http://www.zabbix.com/rn1.6.2.php
+
 * Thu Dec  4 2008 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6.1-1
 - Fix BZ#474593 by adding a requires.
 


--- zabbix-1.5.4-ifoutoctets.patch DELETED ---


--- zabbix-1.6-cpustats.patch DELETED ---



From tmraz at fedoraproject.org  Fri Jan 16 15:06:39 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 16 Jan 2009 15:06:39 +0000 (UTC)
Subject: rpms/gftp/devel gftp.spec,1.32,1.33
Message-ID: <20090116150639.5FCE970127@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/gftp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18876

Modified Files:
	gftp.spec 
Log Message:
* Fri Jan 16 2009 Tomas Mraz <tmraz at redhat.com> - 2:2.0.18-5
- rebuild with new openssl



Index: gftp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gftp/devel/gftp.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- gftp.spec	27 Oct 2008 13:55:25 -0000	1.32
+++ gftp.spec	16 Jan 2009 15:06:08 -0000	1.33
@@ -1,7 +1,7 @@
 Summary: A multi-threaded FTP client for the X Window System
 Name: gftp
 Version: 2.0.18
-Release: 4%{?dist}
+Release: 5%{?dist}
 Epoch: 2
 License: GPLv2+
 Group: Applications/Internet
@@ -82,6 +82,9 @@
 %{_mandir}/man1/gftp.1.gz
 
 %changelog
+* Fri Jan 16 2009 Tomas Mraz <tmraz at redhat.com> - 2:2.0.18-5
+- rebuild with new openssl
+
 * Mon Oct 27 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 2:2.0.18-4
 - fix bookmarks (bz 463006)
 



From tmraz at fedoraproject.org  Fri Jan 16 15:07:32 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 16 Jan 2009 15:07:32 +0000 (UTC)
Subject: rpms/gg2/devel gg2.spec,1.10,1.11
Message-ID: <20090116150732.23B9F70127@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/gg2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19005

Modified Files:
	gg2.spec 
Log Message:
* Fri Jan 16 2009 Tomas Mraz <tmraz at redhat.com> 2.3.0-10
- rebuild with new openssl



Index: gg2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gg2/devel/gg2.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- gg2.spec	18 Mar 2008 17:34:26 -0000	1.10
+++ gg2.spec	16 Jan 2009 15:07:01 -0000	1.11
@@ -1,6 +1,6 @@
 Name: gg2
 Version: 2.3.0
-Release: 9%{?dist}
+Release: 10%{?dist}
 Summary: GNU Gadu 2 - free talking
 Summary(es): GNU Gadu 2 - charlar libremente
 Summary(pl): GNU Gadu 2 - wolne gadanie
@@ -360,6 +360,9 @@
 %{_libdir}/pkgconfig/gg2_core.pc
 
 %changelog
+* Fri Jan 16 2009 Tomas Mraz <tmraz at redhat.com> 2.3.0-10
+- rebuild with new openssl
+
 * Tue Mar 18 2008 Tom "spot" Callaway <tcallawa at redhat.com> 2.3.0-9
 - add Requires for versioned perl (libperl.so)
 



From tmraz at fedoraproject.org  Fri Jan 16 15:17:06 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 16 Jan 2009 15:17:06 +0000 (UTC)
Subject: rpms/git/devel git.spec,1.76,1.77
Message-ID: <20090116151706.E5BA970127@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/git/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20531

Modified Files:
	git.spec 
Log Message:
* Fri Jan 16 2009 Tomas Mraz <tmraz at redhat.com> 1.6.1-2
- rebuild with new openssl



Index: git.spec
===================================================================
RCS file: /cvs/pkgs/rpms/git/devel/git.spec,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- git.spec	3 Jan 2009 16:36:21 -0000	1.76
+++ git.spec	16 Jan 2009 15:16:36 -0000	1.77
@@ -1,7 +1,7 @@
 # Pass --without docs to rpmbuild if you don't want the documentation
 Name:           git
 Version:        1.6.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Core git tools
 License:        GPLv2
 Group:          Development/Tools
@@ -273,6 +273,9 @@
 # No files for you!
 
 %changelog
+* Fri Jan 16 2009 Tomas Mraz <tmraz at redhat.com> 1.6.1-2
+- rebuild with new openssl
+
 * Sat Jan 03 2009 Todd Zullinger <tmz at pobox.com> 1.6.1-1
 - Install git-* commands in %%{_libexecdir}/git-core, the upstream default
 - Remove libcurl from Requires, rpm will pick this up automatically



From tmraz at fedoraproject.org  Fri Jan 16 15:17:27 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 16 Jan 2009 15:17:27 +0000 (UTC)
Subject: rpms/ghasher/devel ghasher.spec,1.16,1.17
Message-ID: <20090116151727.A07E770127@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/ghasher/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20709

Modified Files:
	ghasher.spec 
Log Message:
* Fri Jan 16 2009 Tomas Mraz <tmraz at redhat.com> - 1.2.1-6
- rebuild with new openssl



Index: ghasher.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ghasher/devel/ghasher.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- ghasher.spec	19 Feb 2008 01:10:54 -0000	1.16
+++ ghasher.spec	16 Jan 2009 15:16:57 -0000	1.17
@@ -1,6 +1,6 @@
 Name:           ghasher
 Version:        1.2.1
-Release:        5%{?dist}
+Release:        6%{?dist}
 
 Summary:        GUI hasher for GTK+ 2
 Group:          Applications/File
@@ -51,6 +51,9 @@
 %{_datadir}/pixmaps/*
 
 %changelog
+* Fri Jan 16 2009 Tomas Mraz <tmraz at redhat.com> - 1.2.1-6
+- rebuild with new openssl
+
 * Mon Feb 18 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1.2.1-5
 - Autorebuild for GCC 4.3
 



From jcollie at fedoraproject.org  Fri Jan 16 15:29:21 2009
From: jcollie at fedoraproject.org (Jeffrey C. Ollie)
Date: Fri, 16 Jan 2009 15:29:21 +0000 (UTC)
Subject: rpms/zabbix/F-10 zabbix-1.6.2-cpustats.patch, NONE, 1.1 .cvsignore, 
	1.14, 1.15 sources, 1.15, 1.16 zabbix.spec, 1.29,
	1.30 zabbix-1.5.4-ifoutoctets.patch, 1.1,
	NONE zabbix-1.6-cpustats.patch, 1.1, NONE
Message-ID: <20090116152921.132E270127@cvs1.fedora.phx.redhat.com>

Author: jcollie

Update of /cvs/pkgs/rpms/zabbix/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21911

Modified Files:
	.cvsignore sources zabbix.spec 
Added Files:
	zabbix-1.6.2-cpustats.patch 
Removed Files:
	zabbix-1.5.4-ifoutoctets.patch zabbix-1.6-cpustats.patch 
Log Message:
* Fri Jan 16 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6.2-1
- Update to 1.6.2: http://www.zabbix.com/rn1.6.2.php


zabbix-1.6.2-cpustats.patch:

--- NEW FILE zabbix-1.6.2-cpustats.patch ---
diff --git a/src/libs/zbxsysinfo/linux/cpu.c b/src/libs/zbxsysinfo/linux/cpu.c
index 67dd157..cdf4952 100644
--- a/src/libs/zbxsysinfo/linux/cpu.c
+++ b/src/libs/zbxsysinfo/linux/cpu.c
@@ -125,6 +125,36 @@ int	SYSTEM_CPU_UTIL(const char *cmd, const char *param, unsigned flags, AGENT_RE
 		else if (ZBX_AVG5 == mode) 	SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].system5)
 		else if (ZBX_AVG15 == mode)	SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].system15)
 	}
+	else if( 0 == strcmp(type,"interrupt"))
+	{
+		if (ZBX_AVG1 == mode) 		SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].interrupt1)
+		else if (ZBX_AVG5 == mode) 	SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].interrupt5)
+		else if (ZBX_AVG15 == mode)	SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].interrupt15)
+	}
+	else if( 0 == strcmp(type,"wait"))
+	{
+		if(ZBX_AVG1 == mode) 		SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].iowait1)
+		else if(ZBX_AVG5 == mode) 	SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].iowait5)
+		else if(ZBX_AVG15 == mode)	SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].iowait15)
+	}
+	else if( 0 == strcmp(type,"irq"))
+	{
+		if(ZBX_AVG1 == mode) 		SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].irq1)
+		else if(ZBX_AVG5 == mode) 	SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].irq5)
+		else if(ZBX_AVG15 == mode)	SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].irq15)
+	}
+	else if( 0 == strcmp(type,"softirq"))
+	{
+		if(ZBX_AVG1 == mode) 		SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].softirq1)
+		else if(ZBX_AVG5 == mode) 	SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].softirq5)
+		else if(ZBX_AVG5 == mode)	SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].softirq15)
+	}
+	else if( 0 == strcmp(type,"steal"))
+	{
+		if(ZBX_AVG1 == mode) 		SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].steal1)
+		else if(ZBX_AVG1 == mode) 	SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].steal5)
+		else if(ZBX_AVG1 == mode)	SET_DBL_RESULT(result, collector->cpus.cpu[cpu_num].steal15)
+	}
 	else
 		return SYSINFO_RET_FAIL;
 
diff --git a/src/zabbix_agent/cpustat.c b/src/zabbix_agent/cpustat.c
index 2dd2103..cccf1d2 100644
--- a/src/zabbix_agent/cpustat.c
+++ b/src/zabbix_agent/cpustat.c
@@ -184,7 +184,10 @@ static int	get_cpustat(
 		zbx_uint64_t *cpu_nice,
 		zbx_uint64_t *cpu_idle,
 		zbx_uint64_t *cpu_interrupt,
-		zbx_uint64_t *cpu_iowait
+		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)
@@ -235,6 +238,9 @@ static int	get_cpustat(
 	*cpu_user = *cpu_system = *cpu_nice = *cpu_idle = -1;
 	*cpu_interrupt	= 0;
 	*cpu_iowait	= 0;
+	*cpu_irq	= 0;
+	*cpu_softirq	= 0;
+	*cpu_steal	= 0;
 
 	zbx_snprintf(cpu_name, sizeof(cpu_name), "cpu%c ", cpuid > 0 ? '0' + (cpuid - 1) : ' ');
 
@@ -242,7 +248,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);
@@ -389,7 +396,10 @@ static void	apply_cpustat(
 	zbx_uint64_t cpu_nice,
 	zbx_uint64_t cpu_idle,
 	zbx_uint64_t cpu_interrupt,
-	zbx_uint64_t cpu_iowait
+	zbx_uint64_t cpu_iowait,
+	zbx_uint64_t cpu_irq,
+	zbx_uint64_t cpu_softirq,
+	zbx_uint64_t cpu_steal
 	)
 {
 	register int	i	= 0;
@@ -401,6 +411,9 @@ static void	apply_cpustat(
 			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
@@ -418,8 +431,11 @@ static void	apply_cpustat(
 		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 + cpu_iowait;
+		all = cpu_user + cpu_system + cpu_nice + cpu_idle + cpu_interrupt + cpu_iowait + cpu_irq + cpu_softirq + cpu_steal;
 		break;
 	}
 
@@ -440,8 +456,11 @@ static void	apply_cpustat(
 			idle ## t	= curr_cpu->h_idle[i];						\
 			interrupt ## t	= curr_cpu->h_interrupt[i];					\
 			iowait ## t	= curr_cpu->h_iowait[i];					\
+			irq ## t	= curr_cpu->h_irq[i];						\
+			softirq ## t	= curr_cpu->h_softirq[i];					\
+			steal ## t	= curr_cpu->h_steal[i];						\
 			all ## t	= user ## t + system ## t + nice ## t + idle ## t +		\
-						interrupt ## t + iowait ## t;				\
+						interrupt ## t + iowait ## t + irq ## t + softirq ## t + steal ## t; \
 		}
 
 		SAVE_CPU_CLOCK_FOR(1);
@@ -483,6 +502,18 @@ static void	apply_cpustat(
 	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 */
@@ -602,14 +633,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, cpu_iowait;
+	zbx_uint64_t cpu_user, cpu_nice, cpu_system, cpu_idle, cpu_interrupt, cpu_iowait, cpu_irq, cpu_softirq, cpu_steal;
 
 	for ( i = 0; i <= pcpus->count; i++ )
 	{
-		if(0 != get_cpustat(i, &now, &cpu_user, &cpu_system, &cpu_nice, &cpu_idle, &cpu_interrupt, &cpu_iowait))
+		if(0 != get_cpustat(i, &now, &cpu_user, &cpu_system, &cpu_nice, &cpu_idle, &cpu_interrupt, &cpu_iowait, &cpu_irq, &cpu_softirq, &cpu_steal))
 			continue;
 
-		apply_cpustat(pcpus, i, now, cpu_user, cpu_system, cpu_nice, cpu_idle, cpu_interrupt, cpu_iowait);
+		apply_cpustat(pcpus, i, now, cpu_user, cpu_system, cpu_nice, cpu_idle, cpu_interrupt, cpu_iowait, cpu_irq, cpu_softirq, cpu_steal);
 	}
 
 #endif /* _WINDOWS */
diff --git a/src/zabbix_agent/cpustat.h b/src/zabbix_agent/cpustat.h
index 9551707..412e0d3 100644
--- a/src/zabbix_agent/cpustat.h
+++ b/src/zabbix_agent/cpustat.h
@@ -72,6 +72,9 @@
 		zbx_uint64_t	h_idle[MAX_CPU_HISTORY];
 		zbx_uint64_t	h_interrupt[MAX_CPU_HISTORY];
 		zbx_uint64_t	h_iowait[MAX_CPU_HISTORY];
+		zbx_uint64_t	h_irq[MAX_CPU_HISTORY];
+		zbx_uint64_t	h_softirq[MAX_CPU_HISTORY];
+		zbx_uint64_t	h_steal[MAX_CPU_HISTORY];
 
 		/* public */
 		double	user1;
@@ -92,6 +95,15 @@
 		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: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/zabbix/F-10/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	5 Nov 2008 18:39:07 -0000	1.14
+++ .cvsignore	16 Jan 2009 15:28:50 -0000	1.15
@@ -1 +1 @@
-zabbix-1.6.1.tar.gz
+zabbix-1.6.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/zabbix/F-10/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	5 Nov 2008 18:39:07 -0000	1.15
+++ sources	16 Jan 2009 15:28:50 -0000	1.16
@@ -1 +1 @@
-26a6f8d643b28ca245804ea699924d80  zabbix-1.6.1.tar.gz
+33da3661868a04042c596a819896446f  zabbix-1.6.2.tar.gz


Index: zabbix.spec
===================================================================
RCS file: /cvs/pkgs/rpms/zabbix/F-10/zabbix.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- zabbix.spec	5 Nov 2008 18:39:07 -0000	1.29
+++ zabbix.spec	16 Jan 2009 15:28:50 -0000	1.30
@@ -1,5 +1,5 @@
 Name:           zabbix
-Version:        1.6.1
+Version:        1.6.2
 Release:        1%{?dist}
 Summary:        Open-source monitoring solution for your IT infrastructure
 
@@ -13,8 +13,7 @@
 Source4:        zabbix-proxy.init
 Source5:        zabbix-logrotate.in
 
-Patch0:         zabbix-1.6-cpustats.patch
-Patch1:		zabbix-1.5.4-ifoutoctets.patch
+Patch0:         zabbix-1.6.2-cpustats.patch
 
 Buildroot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -159,6 +158,7 @@
 Requires:        php
 Requires:	 php-gd
 Requires:	 php-bcmath
+Requires:        zabbix = %{version}-%{release}
 Requires:	 zabbix-web-database = %{version}-%{release}
 
 %description web
@@ -197,7 +197,6 @@
 %prep
 %setup0 -q
 %patch0 -p1 -b .cpustats
-%patch1 -p1 -b .ifoutoctets
 
 chmod -R a+rX .
 
@@ -464,6 +463,12 @@
 %defattr(-,root,root,-)
 
 %changelog
+* Fri Jan 16 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6.2-1
+- Update to 1.6.2: http://www.zabbix.com/rn1.6.2.php
+
+* Thu Dec  4 2008 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6.1-1
+- Fix BZ#474593 by adding a requires.
+
 * Wed Nov  5 2008 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6.1-1
 - Update to 1.6.1
 


--- zabbix-1.5.4-ifoutoctets.patch DELETED ---


--- zabbix-1.6-cpustats.patch DELETED ---



From tmraz at fedoraproject.org  Fri Jan 16 15:34:01 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 16 Jan 2009 15:34:01 +0000 (UTC)
Subject: rpms/python/devel python.spec,1.140,1.141
Message-ID: <20090116153401.C3FC970127@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/python/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22402

Modified Files:
	python.spec 
Log Message:
* Fri Jan 16 2009 Tomas Mraz <tmraz at redhat.com> - 2.6-4
- rebuild with new openssl



Index: python.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python/devel/python.spec,v
retrieving revision 1.140
retrieving revision 1.141
diff -u -r1.140 -r1.141
--- python.spec	6 Jan 2009 20:05:07 -0000	1.140
+++ python.spec	16 Jan 2009 15:33:31 -0000	1.141
@@ -22,7 +22,7 @@
 Summary: An interpreted, interactive, object-oriented programming language
 Name: %{python}
 Version: 2.6
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: Python
 Group: Development/Languages
 Provides: python-abi = %{pybasever}
@@ -524,6 +524,9 @@
 %{_libdir}/python%{pybasever}/lib-dynload/_testcapimodule.so
 
 %changelog
+* Fri Jan 16 2009 Tomas Mraz <tmraz at redhat.com> - 2.6-4
+- rebuild with new openssl
+
 * Tue Jan  6 2009 James Antill <james.antill at redhat.com> - 2.6-3
 - Fix distutils generated rpms.
 - Resolves: bug#236535



From spot at fedoraproject.org  Fri Jan 16 15:34:44 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Fri, 16 Jan 2009 15:34:44 +0000 (UTC)
Subject: rpms/audio-entropyd/devel audio-entropyd, 1.2,
	1.3 audio-entropyd.spec, 1.12, 1.13
Message-ID: <20090116153444.23EAD70127@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/audio-entropyd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22490

Modified Files:
	audio-entropyd audio-entropyd.spec 
Log Message:
initscript no longer on by default


Index: audio-entropyd
===================================================================
RCS file: /cvs/pkgs/rpms/audio-entropyd/devel/audio-entropyd,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- audio-entropyd	29 Sep 2008 15:30:28 -0000	1.2
+++ audio-entropyd	16 Jan 2009 15:34:13 -0000	1.3
@@ -2,7 +2,7 @@
 #
 # audio-entropyd:       Starts the Audio Entropy Daemon
 #
-# chkconfig: 345 98 02
+# chkconfig: - 98 02
 # description: This is a daemon which runs on client machines to generate entropy
 #              from the system soundcard (if present and active).
 # processname: audio-entropyd


Index: audio-entropyd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/audio-entropyd/devel/audio-entropyd.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- audio-entropyd.spec	29 Sep 2008 15:30:28 -0000	1.12
+++ audio-entropyd.spec	16 Jan 2009 15:34:13 -0000	1.13
@@ -1,6 +1,6 @@
 Name:           audio-entropyd
 Version:        1.0.5
-Release:        1%{?dist}
+Release:        2%{?dist}
 License:        GPLv2
 Group:          System Environment/Daemons
 Summary:        Generate entropy from audio output
@@ -56,6 +56,9 @@
 %config(noreplace) %{_sysconfdir}/sysconfig/audio-entropyd
 
 %changelog
+* Fri Jan 16 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 1.0.5-2
+- initscript no longer on by default (bz 441273)
+
 * 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



From caolanm at fedoraproject.org  Fri Jan 16 15:35:06 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Fri, 16 Jan 2009 15:35:06 +0000 (UTC)
Subject: rpms/openoffice.org/devel
	openoffice.org-3.1.0.ooo98137.filter.redeclared-variables.patch,
	NONE, 1.1 openoffice.org.spec, 1.1759, 1.1760
Message-ID: <20090116153506.88EFB70127@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22626

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-3.1.0.ooo98137.filter.redeclared-variables.patch 
Log Message:
Resolves: rhbz#480121 merge in F-10 patch to F-11

openoffice.org-3.1.0.ooo98137.filter.redeclared-variables.patch:

--- NEW FILE openoffice.org-3.1.0.ooo98137.filter.redeclared-variables.patch ---
diff -up ./filter/source/xslt/odf2xhtml/export/xhtml/body.xsl.xhtml ./filter/source/xslt/odf2xhtml/export/xhtml/body.xsl
--- ./filter/source/xslt/odf2xhtml/export/xhtml/body.xsl.xhtml	2009-01-16 10:41:31.000000000 +0100
+++ ./filter/source/xslt/odf2xhtml/export/xhtml/body.xsl	2009-01-16 10:48:01.000000000 +0100
@@ -462,7 +462,7 @@
 	<xsl:template name="create-heading">
 		<xsl:param name="globalData"/>
 
-		<xsl:variable name="headingNumber">
+		<xsl:variable name="headerNumber">
 			<xsl:choose>
 			<xsl:when test="@text:outline-level &lt; 6">
 				<xsl:value-of select="@text:outline-level"/>
@@ -470,7 +470,7 @@
 			<xsl:otherwise>6</xsl:otherwise>
 			</xsl:choose>
 		</xsl:variable>
-		<xsl:variable name="headertyp" select="concat('h', $headingNumber)"/>
+		<xsl:variable name="headertyp" select="concat('h', $headerNumber)"/>
 		<xsl:element name="{$headertyp}">
 			<!-- outline style 'text:min-label-width' is interpreted as a CSS 'margin-right' attribute
 			NOTE: Should be handled as CSS style in style header -->
@@ -865,7 +865,6 @@
 		<xsl:param name="listLevel" select="1"/>
 		<xsl:param name="listRestart" select="false()"/>
 		<xsl:param name="itemLabel" select="''"/>
-		<xsl:param name="listStyle"/>
 		<xsl:param name="listStyleName" select="@text:style-name"/>
 
 		<!-- To choose list type - get the list style, with the same 'text:style-name' and same 'text:level' -->


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1759
retrieving revision 1.1760
diff -u -r1.1759 -r1.1760
--- openoffice.org.spec	16 Jan 2009 10:18:10 -0000	1.1759
+++ openoffice.org.spec	16 Jan 2009 15:34:36 -0000	1.1760
@@ -134,6 +134,7 @@
 Patch61: openoffice.org-3.0.1.ooo97488.sw.ww8toc.patch
 Patch62: openoffice.org-3.0.1.oooXXXXX.fpicker.allformatsonsave.patch
 Patch63: workspace.fwk99.patch
+Patch64: openoffice.org-3.1.0.ooo98137.filter.redeclared-variables.patch
 
 %define instdir %{_libdir}
 %define baseinstdir %{instdir}/openoffice.org
@@ -1415,6 +1416,7 @@
 %patch61 -p1 -b .ooo97488.sw.ww8toc.patch
 %patch62 -p1 -b .oooXXXXX.fpicker.allformatsonsave.patch
 %patch63 -p1 -b .workspace.fwk99.patch
+%patch64 -p1 -b .ooo98137.filter.redeclared-variables.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -3828,8 +3830,11 @@
 - Resolves: rhbz#479624 add
   openoffice.org-3.0.1.ooo98024.vcl.emboldenoverlap.patch
 - add hyphen-uk, hyphen-pt dependency
-- Resolves: rhbz#479163 openoffice.org-3.0.1.oooXXXXX.fpicker.allformatsonsave.patch
+- Resolves: rhbz#479163 add
+  openoffice.org-3.0.1.oooXXXXX.fpicker.allformatsonsave.patch
 - Resolves: rhbz#480117 workspace.fwk99.patch
+- Resolves: rhbz#480121 add
+  openoffice.org-3.1.0.ooo98137.filter.redeclared-variables.patch
 
 * Mon Jan 12 2009 Caol??n McNamara <caolanm at redhat.com> - 1:3.0.1-15.1
 - next milestone



From tmraz at fedoraproject.org  Fri Jan 16 15:35:37 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 16 Jan 2009 15:35:37 +0000 (UTC)
Subject: rpms/python-ldap/devel python-ldap.spec,1.25,1.26
Message-ID: <20090116153537.597BC70127@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/python-ldap/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22840

Modified Files:
	python-ldap.spec 
Log Message:
* Fri Jan 16 2009 Tomas Mraz <tmraz at redhat.com> - 0:2.3.5-3
- rebuild with new openssl



Index: python-ldap.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-ldap/devel/python-ldap.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- python-ldap.spec	29 Nov 2008 15:36:06 -0000	1.25
+++ python-ldap.spec	16 Jan 2009 15:35:07 -0000	1.26
@@ -6,7 +6,7 @@
 
 Name: python-ldap
 Version: 2.3.5
-Release: 2%{?dist}
+Release: 3%{?dist}
 Epoch: 0
 License: Python
 Group: System Environment/Libraries
@@ -69,6 +69,9 @@
 %{python_sitearch}/python_ldap-%{version}-*.egg-info/
 
 %changelog
+* Fri Jan 16 2009 Tomas Mraz <tmraz at redhat.com> - 0:2.3.5-3
+- rebuild with new openssl
+
 * Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 0:2.3.5-2
 - Rebuild for Python 2.6
 



From josef at fedoraproject.org  Fri Jan 16 15:38:54 2009
From: josef at fedoraproject.org (Josef Bacik)
Date: Fri, 16 Jan 2009 15:38:54 +0000 (UTC)
Subject: rpms/btrfs-progs/F-10 .cvsignore, 1.2, 1.3 btrfs-progs.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <20090116153854.3DEC570127@cvs1.fedora.phx.redhat.com>

Author: josef

Update of /cvs/pkgs/rpms/btrfs-progs/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23270

Modified Files:
	.cvsignore btrfs-progs.spec sources 
Log Message:
update to upstream and turn on the conver stuff



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/btrfs-progs/F-10/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	30 Jun 2008 19:37:31 -0000	1.2
+++ .cvsignore	16 Jan 2009 15:38:23 -0000	1.3
@@ -1 +1 @@
-btrfs-progs-0.15.tar.bz2
+btrfs-progs-0.17.tar.gz


Index: btrfs-progs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/btrfs-progs/F-10/btrfs-progs.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- btrfs-progs.spec	30 Jun 2008 19:37:31 -0000	1.1
+++ btrfs-progs.spec	16 Jan 2009 15:38:23 -0000	1.2
@@ -1,5 +1,5 @@
 Name:           btrfs-progs
-Version:        0.15
+Version:        0.17
 Release:        4%{?dist}
 Summary:        Userspace programs for btrfs
 
@@ -9,7 +9,7 @@
 Source0:        http://www.kernel.org/pub/linux/kernel/people/mason/btrfs/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  e2fsprogs-devel
+BuildRequires:  e2fsprogs-devel, zlib-devel, libacl-devel
 
 %define _root_sbindir /sbin
 
@@ -22,6 +22,7 @@
 
 %build
 make CFLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags}
+make CFLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags} convert
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -36,11 +37,29 @@
 %{_root_sbindir}/btrfsctl
 %{_root_sbindir}/btrfsck
 %{_root_sbindir}/mkfs.btrfs
-%{_root_sbindir}/debug-tree
+%{_root_sbindir}/btrfs-debug-tree
+%{_root_sbindir}/btrfs-image
 %{_root_sbindir}/btrfs-show
 %{_root_sbindir}/btrfs-vol
+%{_root_sbindir}/btrfs-convert
+%{_root_sbindir}/btrfstune
 
 %changelog
+* Fri Jan 16 2009 Marek Mahut <mmahut at fedoraproject.org> 0.17-4
+- RHBZ#480219 btrfs-convert is missing
+
+* Mon Jan 12 2009 Josef Bacik <josef at toxicpanda.com> 0.17-2
+- fixed wrong sources upload
+
+* Mon Jan 12 2009 Josef Bacik <josef at toxicpanda.com> 0.17
+- Upstream release 0.17
+
+* Sat Jan 10 2009 Kyle McMartin <kyle at redhat.com> 0.16.git1-1
+- Upstream git sync from -g72359e8 (needed for kernel...)
+
+* Sat Jan 10 2009 Marek Mahut <mmahut at fedoraproject.org> 0.16-1
+- Upstream release 0.16
+
 * Mon Jun 25 2008 Josef Bacik <josef at toxicpanda.com> 0.15-4
 -use fedoras normal CFLAGS
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/btrfs-progs/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	30 Jun 2008 19:37:31 -0000	1.2
+++ sources	16 Jan 2009 15:38:23 -0000	1.3
@@ -1 +1 @@
-fabd80e8a9ea2d035491815ebefb6930  btrfs-progs-0.15.tar.bz2
+ea28f7173e39c2110cff85932529b47d  btrfs-progs-0.17.tar.gz



From josef at fedoraproject.org  Fri Jan 16 15:44:57 2009
From: josef at fedoraproject.org (Josef Bacik)
Date: Fri, 16 Jan 2009 15:44:57 +0000 (UTC)
Subject: rpms/btrfs-progs/F-10 .cvsignore, 1.3, 1.4 btrfs-progs.spec, 1.2,
	1.3 sources, 1.3, 1.4
Message-ID: <20090116154457.6294870127@cvs1.fedora.phx.redhat.com>

Author: josef

Update of /cvs/pkgs/rpms/btrfs-progs/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23822

Modified Files:
	.cvsignore btrfs-progs.spec sources 
Log Message:
rrr, i didn't update the sources in F-10.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/btrfs-progs/F-10/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	16 Jan 2009 15:38:23 -0000	1.3
+++ .cvsignore	16 Jan 2009 15:44:26 -0000	1.4
@@ -1 +1 @@
-btrfs-progs-0.17.tar.gz
+btrfs-progs-0.17.tar.bz2


Index: btrfs-progs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/btrfs-progs/F-10/btrfs-progs.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- btrfs-progs.spec	16 Jan 2009 15:38:23 -0000	1.2
+++ btrfs-progs.spec	16 Jan 2009 15:44:26 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           btrfs-progs
 Version:        0.17
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Userspace programs for btrfs
 
 Group:          System Environment/Base
@@ -45,6 +45,9 @@
 %{_root_sbindir}/btrfstune
 
 %changelog
+* Fri Jan 16 2009 Josef Bacik <josef at toxicpanda.com> 0.17-5
+* fix the sources for F10
+
 * Fri Jan 16 2009 Marek Mahut <mmahut at fedoraproject.org> 0.17-4
 - RHBZ#480219 btrfs-convert is missing
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/btrfs-progs/F-10/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	16 Jan 2009 15:38:23 -0000	1.3
+++ sources	16 Jan 2009 15:44:26 -0000	1.4
@@ -1 +1 @@
-ea28f7173e39c2110cff85932529b47d  btrfs-progs-0.17.tar.gz
+88d1fde8ecf237fc210510911ba06786  btrfs-progs-0.17.tar.bz2



From mzazrive at fedoraproject.org  Fri Jan 16 15:51:33 2009
From: mzazrive at fedoraproject.org (Milan Zazrivec)
Date: Fri, 16 Jan 2009 15:51:33 +0000 (UTC)
Subject: rpms/perl-DDL-Oracle/devel import.log, NONE,
	1.1 perl-DDL-Oracle.spec, 
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090116155133.4B45A70127@cvs1.fedora.phx.redhat.com>

Author: mzazrive

Update of /cvs/pkgs/rpms/perl-DDL-Oracle/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25212/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-DDL-Oracle.spec 
Log Message:
initial import of perl-DDL-Oracle-1.11-1



--- NEW FILE import.log ---
perl-DDL-Oracle-1_11-1:HEAD:perl-DDL-Oracle-1.11-1.src.rpm:1232121016


--- NEW FILE perl-DDL-Oracle.spec ---
Name: perl-DDL-Oracle
Summary: DDL generator for Oracle databases 
Group: Development/Tools
Version: 1.11
Release: 1%{?dist}
License: GPL+ or Artistic
Source0: http://search.cpan.org/CPAN/authors/id/R/RV/RVSUTHERL/DDL-Oracle-%{version}.tar.gz
URL: http://search.cpan.org/~rvsutherl/DDL-Oracle-1.11
BuildArch: noarch
BuildRoot: %{_tmppath}/%{name}-%{version}-build

Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
BuildRequires: perl(ExtUtils::MakeMaker)

%define prefix %{buildroot}%{_prefix}

%description
A Perl tool to reverse engineer the DDL of Oracle objects from Oracle.

%prep
%setup -q -n DDL-Oracle-%{version}

%build
%{__perl} Makefile.PL PREFIX=%{prefix} INSTALLDIRS=vendor
make OPTIMIZE="${RPM_OPT_FLAGS}"

%install
rm -rf %{buildroot}
make install
mkdir -p %{buildroot}%{_datadir}/%{name}
cp -p README* %{buildroot}%{_datadir}/%{name}
find %{buildroot} -name "perllocal.pod" -exec rm -f {} ';'
find %{buildroot}%{perl_vendorarch} -name ".packlist" -exec rm -f {} ';'

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%dir %attr(0755,root,root) %{_datadir}/%{name}
%dir %attr(0755,root,root) %{perl_vendorlib}/DDL
%attr(0644,root,root) %{perl_vendorlib}/DDL/Oracle.pm
%attr(0755,root,root) %{perl_vendorlib}/DDL/*.pl
%attr(0644,root,root) %{_datadir}/%{name}/README*
%attr(0644,root,root) %{_mandir}/man3/DDL*

%changelog
* Tue Jan 13 2009 Milan Zazrivec <mzazrivec at redhat.com> 1.11-1
- initial packaging


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-DDL-Oracle/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	14 Jan 2009 21:33:05 -0000	1.1
+++ .cvsignore	16 Jan 2009 15:51:02 -0000	1.2
@@ -0,0 +1 @@
+DDL-Oracle-1.11.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-DDL-Oracle/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	14 Jan 2009 21:33:05 -0000	1.1
+++ sources	16 Jan 2009 15:51:02 -0000	1.2
@@ -0,0 +1 @@
+94b43a139feb903609e1e15326e982ae  DDL-Oracle-1.11.tar.gz



From tmraz at fedoraproject.org  Fri Jan 16 15:53:07 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 16 Jan 2009 15:53:07 +0000 (UTC)
Subject: rpms/gkrellm/devel gkrellm.spec,1.19,1.20
Message-ID: <20090116155307.1CB4370127@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/gkrellm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25477

Modified Files:
	gkrellm.spec 
Log Message:
* Fri Jan 16 2009 Tomas Mraz <tmraz at redhat.com> 2.3.2-2
- rebuild with new openssl



Index: gkrellm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gkrellm/devel/gkrellm.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- gkrellm.spec	23 Oct 2008 18:42:37 -0000	1.19
+++ gkrellm.spec	16 Jan 2009 15:52:36 -0000	1.20
@@ -1,6 +1,6 @@
 Name:           gkrellm
 Version:        2.3.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Multiple stacked system monitors in one process
 Group:          Applications/System
 License:        GPLv3+
@@ -168,6 +168,9 @@
 
 
 %changelog
+* Fri Jan 16 2009 Tomas Mraz <tmraz at redhat.com> 2.3.2-2
+- rebuild with new openssl
+
 * Thu Oct 23 2008 Hans de Goede <hdegoede at redhat.com> 2.3.2-1
 - New upstream release 2.3.2
 - Drop upstreamed memleak patch



From mzazrive at fedoraproject.org  Fri Jan 16 15:54:06 2009
From: mzazrive at fedoraproject.org (Milan Zazrivec)
Date: Fri, 16 Jan 2009 15:54:06 +0000 (UTC)
Subject: rpms/perl-DDL-Oracle/F-10 import.log, NONE, 1.1 perl-DDL-Oracle.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090116155406.D70D770127@cvs1.fedora.phx.redhat.com>

Author: mzazrive

Update of /cvs/pkgs/rpms/perl-DDL-Oracle/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25766/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-DDL-Oracle.spec 
Log Message:
initial import of perl-DDL-Oracle-1.11-1



--- NEW FILE import.log ---
perl-DDL-Oracle-1_11-1:F-10:perl-DDL-Oracle-1.11-1.src.rpm:1232121181


--- NEW FILE perl-DDL-Oracle.spec ---
Name: perl-DDL-Oracle
Summary: DDL generator for Oracle databases 
Group: Development/Tools
Version: 1.11
Release: 1%{?dist}
License: GPL+ or Artistic
Source0: http://search.cpan.org/CPAN/authors/id/R/RV/RVSUTHERL/DDL-Oracle-%{version}.tar.gz
URL: http://search.cpan.org/~rvsutherl/DDL-Oracle-1.11
BuildArch: noarch
BuildRoot: %{_tmppath}/%{name}-%{version}-build

Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
BuildRequires: perl(ExtUtils::MakeMaker)

%define prefix %{buildroot}%{_prefix}

%description
A Perl tool to reverse engineer the DDL of Oracle objects from Oracle.

%prep
%setup -q -n DDL-Oracle-%{version}

%build
%{__perl} Makefile.PL PREFIX=%{prefix} INSTALLDIRS=vendor
make OPTIMIZE="${RPM_OPT_FLAGS}"

%install
rm -rf %{buildroot}
make install
mkdir -p %{buildroot}%{_datadir}/%{name}
cp -p README* %{buildroot}%{_datadir}/%{name}
find %{buildroot} -name "perllocal.pod" -exec rm -f {} ';'
find %{buildroot}%{perl_vendorarch} -name ".packlist" -exec rm -f {} ';'

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%dir %attr(0755,root,root) %{_datadir}/%{name}
%dir %attr(0755,root,root) %{perl_vendorlib}/DDL
%attr(0644,root,root) %{perl_vendorlib}/DDL/Oracle.pm
%attr(0755,root,root) %{perl_vendorlib}/DDL/*.pl
%attr(0644,root,root) %{_datadir}/%{name}/README*
%attr(0644,root,root) %{_mandir}/man3/DDL*

%changelog
* Tue Jan 13 2009 Milan Zazrivec <mzazrivec at redhat.com> 1.11-1
- initial packaging


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-DDL-Oracle/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	14 Jan 2009 21:33:05 -0000	1.1
+++ .cvsignore	16 Jan 2009 15:53:36 -0000	1.2
@@ -0,0 +1 @@
+DDL-Oracle-1.11.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-DDL-Oracle/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	14 Jan 2009 21:33:05 -0000	1.1
+++ sources	16 Jan 2009 15:53:36 -0000	1.2
@@ -0,0 +1 @@
+94b43a139feb903609e1e15326e982ae  DDL-Oracle-1.11.tar.gz



From tmraz at fedoraproject.org  Fri Jan 16 15:54:40 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 16 Jan 2009 15:54:40 +0000 (UTC)
Subject: rpms/globalplatform/devel globalplatform.spec,1.1,1.2
Message-ID: <20090116155440.46EE570127@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/globalplatform/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25890

Modified Files:
	globalplatform.spec 
Log Message:
* Fri Jan 16 2009 Tomas Mraz <tmraz at redhat.com> 5.0.0-6
- rebuild with new openssl



Index: globalplatform.spec
===================================================================
RCS file: /cvs/pkgs/rpms/globalplatform/devel/globalplatform.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- globalplatform.spec	4 Dec 2008 01:06:17 -0000	1.1
+++ globalplatform.spec	16 Jan 2009 15:54:10 -0000	1.2
@@ -1,6 +1,6 @@
 Name: globalplatform
 Version: 5.0.0
-Release: 5%{?dist}
+Release: 6%{?dist}
 Summary: Library for access to OP 2.0.1 and GP 2.1.1 conforming smart cards
 Group: System Environment/Libraries
 License: LGPLv3+
@@ -76,6 +76,9 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Fri Jan 16 2009 Tomas Mraz <tmraz at redhat.com> 5.0.0-6
+- rebuild with new openssl
+
 * Wed Dec  3 2008 Fran??ois Kooman <fkooman at tuxed net> 5.0.0-5
 - make it build with libtool 2.2 (rawhide)
 



From mzazrive at fedoraproject.org  Fri Jan 16 15:56:40 2009
From: mzazrive at fedoraproject.org (Milan Zazrivec)
Date: Fri, 16 Jan 2009 15:56:40 +0000 (UTC)
Subject: rpms/perl-DDL-Oracle/F-9 import.log, NONE, 1.1 perl-DDL-Oracle.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090116155640.BB6A370127@cvs1.fedora.phx.redhat.com>

Author: mzazrive

Update of /cvs/pkgs/rpms/perl-DDL-Oracle/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26365/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-DDL-Oracle.spec 
Log Message:
initial import of perl-DDL-Oracle-1.11-1



--- NEW FILE import.log ---
perl-DDL-Oracle-1_11-1:F-9:perl-DDL-Oracle-1.11-1.src.rpm:1232121339


--- NEW FILE perl-DDL-Oracle.spec ---
Name: perl-DDL-Oracle
Summary: DDL generator for Oracle databases 
Group: Development/Tools
Version: 1.11
Release: 1%{?dist}
License: GPL+ or Artistic
Source0: http://search.cpan.org/CPAN/authors/id/R/RV/RVSUTHERL/DDL-Oracle-%{version}.tar.gz
URL: http://search.cpan.org/~rvsutherl/DDL-Oracle-1.11
BuildArch: noarch
BuildRoot: %{_tmppath}/%{name}-%{version}-build

Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
BuildRequires: perl(ExtUtils::MakeMaker)

%define prefix %{buildroot}%{_prefix}

%description
A Perl tool to reverse engineer the DDL of Oracle objects from Oracle.

%prep
%setup -q -n DDL-Oracle-%{version}

%build
%{__perl} Makefile.PL PREFIX=%{prefix} INSTALLDIRS=vendor
make OPTIMIZE="${RPM_OPT_FLAGS}"

%install
rm -rf %{buildroot}
make install
mkdir -p %{buildroot}%{_datadir}/%{name}
cp -p README* %{buildroot}%{_datadir}/%{name}
find %{buildroot} -name "perllocal.pod" -exec rm -f {} ';'
find %{buildroot}%{perl_vendorarch} -name ".packlist" -exec rm -f {} ';'

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%dir %attr(0755,root,root) %{_datadir}/%{name}
%dir %attr(0755,root,root) %{perl_vendorlib}/DDL
%attr(0644,root,root) %{perl_vendorlib}/DDL/Oracle.pm
%attr(0755,root,root) %{perl_vendorlib}/DDL/*.pl
%attr(0644,root,root) %{_datadir}/%{name}/README*
%attr(0644,root,root) %{_mandir}/man3/DDL*

%changelog
* Tue Jan 13 2009 Milan Zazrivec <mzazrivec at redhat.com> 1.11-1
- initial packaging


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-DDL-Oracle/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	14 Jan 2009 21:33:05 -0000	1.1
+++ .cvsignore	16 Jan 2009 15:56:10 -0000	1.2
@@ -0,0 +1 @@
+DDL-Oracle-1.11.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-DDL-Oracle/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	14 Jan 2009 21:33:05 -0000	1.1
+++ sources	16 Jan 2009 15:56:10 -0000	1.2
@@ -0,0 +1 @@
+94b43a139feb903609e1e15326e982ae  DDL-Oracle-1.11.tar.gz



From mzazrive at fedoraproject.org  Fri Jan 16 15:59:10 2009
From: mzazrive at fedoraproject.org (Milan Zazrivec)
Date: Fri, 16 Jan 2009 15:59:10 +0000 (UTC)
Subject: rpms/perl-DDL-Oracle/EL-5 import.log, NONE, 1.1 perl-DDL-Oracle.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090116155910.D793170127@cvs1.fedora.phx.redhat.com>

Author: mzazrive

Update of /cvs/pkgs/rpms/perl-DDL-Oracle/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26875/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-DDL-Oracle.spec 
Log Message:
cvs import of perl-DDL-Oracle-1.11-1



--- NEW FILE import.log ---
perl-DDL-Oracle-1_11-1:EL-5:perl-DDL-Oracle-1.11-1.src.rpm:1232121487


--- NEW FILE perl-DDL-Oracle.spec ---
Name: perl-DDL-Oracle
Summary: DDL generator for Oracle databases 
Group: Development/Tools
Version: 1.11
Release: 1%{?dist}
License: GPL+ or Artistic
Source0: http://search.cpan.org/CPAN/authors/id/R/RV/RVSUTHERL/DDL-Oracle-%{version}.tar.gz
URL: http://search.cpan.org/~rvsutherl/DDL-Oracle-1.11
BuildArch: noarch
BuildRoot: %{_tmppath}/%{name}-%{version}-build

Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
BuildRequires: perl(ExtUtils::MakeMaker)

%define prefix %{buildroot}%{_prefix}

%description
A Perl tool to reverse engineer the DDL of Oracle objects from Oracle.

%prep
%setup -q -n DDL-Oracle-%{version}

%build
%{__perl} Makefile.PL PREFIX=%{prefix} INSTALLDIRS=vendor
make OPTIMIZE="${RPM_OPT_FLAGS}"

%install
rm -rf %{buildroot}
make install
mkdir -p %{buildroot}%{_datadir}/%{name}
cp -p README* %{buildroot}%{_datadir}/%{name}
find %{buildroot} -name "perllocal.pod" -exec rm -f {} ';'
find %{buildroot}%{perl_vendorarch} -name ".packlist" -exec rm -f {} ';'

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%dir %attr(0755,root,root) %{_datadir}/%{name}
%dir %attr(0755,root,root) %{perl_vendorlib}/DDL
%attr(0644,root,root) %{perl_vendorlib}/DDL/Oracle.pm
%attr(0755,root,root) %{perl_vendorlib}/DDL/*.pl
%attr(0644,root,root) %{_datadir}/%{name}/README*
%attr(0644,root,root) %{_mandir}/man3/DDL*

%changelog
* Tue Jan 13 2009 Milan Zazrivec <mzazrivec at redhat.com> 1.11-1
- initial packaging


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-DDL-Oracle/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	14 Jan 2009 21:33:05 -0000	1.1
+++ .cvsignore	16 Jan 2009 15:58:40 -0000	1.2
@@ -0,0 +1 @@
+DDL-Oracle-1.11.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-DDL-Oracle/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	14 Jan 2009 21:33:05 -0000	1.1
+++ sources	16 Jan 2009 15:58:40 -0000	1.2
@@ -0,0 +1 @@
+94b43a139feb903609e1e15326e982ae  DDL-Oracle-1.11.tar.gz



From tmraz at fedoraproject.org  Fri Jan 16 16:00:27 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 16 Jan 2009 16:00:27 +0000 (UTC)
Subject: rpms/gnome-vfs2/devel gnome-vfs2.spec,1.186,1.187
Message-ID: <20090116160027.A9E7570127@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/gnome-vfs2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27161

Modified Files:
	gnome-vfs2.spec 
Log Message:
* Fri Jan 16 2009 Tomas Mraz <tmraz at redhat.com> - 2.24.0-4
- rebuild with new openssl



Index: gnome-vfs2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-vfs2/devel/gnome-vfs2.spec,v
retrieving revision 1.186
retrieving revision 1.187
diff -u -r1.186 -r1.187
--- gnome-vfs2.spec	26 Sep 2008 03:10:00 -0000	1.186
+++ gnome-vfs2.spec	16 Jan 2009 15:59:57 -0000	1.187
@@ -14,7 +14,7 @@
 Summary: The GNOME virtual file-system libraries
 Name: gnome-vfs2
 Version: 2.24.0
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: LGPLv2+ and GPLv2+
 # the daemon and the library are LGPLv2+
 # the modules are LGPLv2+ and GPLv2+ 
@@ -239,6 +239,9 @@
 %config %{_sysconfdir}/gnome-vfs-2.0/modules/smb-module.conf
 
 %changelog
+* Fri Jan 16 2009 Tomas Mraz <tmraz at redhat.com> - 2.24.0-4
+- rebuild with new openssl
+
 * Thu Sep 25 2008 Matthias Clasen  <mclasen at redhat.com> - 2.24.0-3
 - Save some space
 



From tmraz at fedoraproject.org  Fri Jan 16 16:00:57 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 16 Jan 2009 16:00:57 +0000 (UTC)
Subject: rpms/gnubiff/devel gnubiff.spec,1.17,1.18
Message-ID: <20090116160057.05B7770127@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/gnubiff/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27249

Modified Files:
	gnubiff.spec 
Log Message:
* Fri Jan 16 2009 Tomas Mraz <tmraz at redhat.com> - 2.2.10-2
- rebuild with new openssl



Index: gnubiff.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnubiff/devel/gnubiff.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- gnubiff.spec	30 Nov 2008 14:17:23 -0000	1.17
+++ gnubiff.spec	16 Jan 2009 16:00:26 -0000	1.18
@@ -1,7 +1,7 @@
 Summary:	A mail notification program
 Name:		gnubiff
 Version:	2.2.10
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GPLv2+
 Group:		Applications/Internet
 URL:		http://gnubiff.sourceforge.net/
@@ -78,6 +78,9 @@
 %{_datadir}/%{name}/*
 
 %changelog
+* Fri Jan 16 2009 Tomas Mraz <tmraz at redhat.com> - 2.2.10-2
+- rebuild with new openssl
+
 * Thu Nov 27 2008 Debarshi Ray <rishi at fedoraproject.org> - 2.2.10-1
 - Version bump to 2.2.10. Closes Red Hat Bugzilla bug #464012.
 - Added 'Requires: sox'.



From kvolny at fedoraproject.org  Fri Jan 16 16:07:57 2009
From: kvolny at fedoraproject.org (=?utf-8?q?Karel_Voln=C3=BD?=)
Date: Fri, 16 Jan 2009 16:07:57 +0000 (UTC)
Subject: rpms/vodovod/devel vodovod.spec,1.2,1.3
Message-ID: <20090116160757.90D5570127@cvs1.fedora.phx.redhat.com>

Author: kvolny

Update of /cvs/pkgs/rpms/vodovod/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28103

Modified Files:
	vodovod.spec 
Log Message:
fix bug #477480



Index: vodovod.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vodovod/devel/vodovod.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- vodovod.spec	11 Dec 2008 16:28:43 -0000	1.2
+++ vodovod.spec	16 Jan 2009 16:07:27 -0000	1.3
@@ -1,18 +1,19 @@
 Name:		vodovod
 Version:	1.10r19
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	A pipe connecting game
 
 Group:		Amusements/Games
 License:	GPLv2+
 URL:		http://home.gna.org/vodovod/
-#Source:		http://download.gna.org/vodovod/%{name}-%{version}-src.tar.gz
+#Source:	http://download.gna.org/vodovod/%{name}-%{version}-src.tar.gz
 Source:		%{name}-%{version}-src.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	desktop-file-utils SDL-devel SDL_image-devel SDL_mixer-devel
 BuildRequires:	SDL_ttf-devel gettext ImageMagick
 
+Requires:	dejavu-fonts-sans-mono
 Requires(post): coreutils
 Requires(postun): coreutils
 
@@ -30,6 +31,10 @@
 %prep
 #%setup -q -n %{name}-%{version}-src
 %setup -q -n %{name}
+# replace the bundled font usage with the one provided by font package
+rm data/font1.ttf
+sed -i -e "s|data/font1.ttf|../fonts/dejavu/DejaVuSansMono.ttf|" \
+	allmenus.cpp main.cpp game.cpp
 
 
 %build
@@ -95,6 +100,9 @@
 
 
 %changelog
+* Thu Jan 15 2009 Karel Volny <kvolny at redhat.com> 1.10r19-2
+- Use dejavu-fonts-sans-mono instead of bundling the font file (bug #477480)
+
 * Thu Dec 11 2008 Karel Volny <kvolny at redhat.com> 1.10r19-1
 - Added coreutils to post(un) (fixes bug #475921)
 - New version requires SDL_ttf-devel



From anyremote at fedoraproject.org  Fri Jan 16 16:08:12 2009
From: anyremote at fedoraproject.org (Mikhail Fedotov)
Date: Fri, 16 Jan 2009 16:08:12 +0000 (UTC)
Subject: rpms/anyremote/F-9 .cvsignore, 1.13, 1.14 anyremote.spec, 1.12,
	1.13 import.log, 1.7, 1.8 sources, 1.13, 1.14
Message-ID: <20090116160812.0791570127@cvs1.fedora.phx.redhat.com>

Author: anyremote

Update of /cvs/pkgs/rpms/anyremote/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28313/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.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	11 Jan 2009 18:47:58 -0000	1.13
+++ .cvsignore	16 Jan 2009 16:07:41 -0000	1.14
@@ -1 +1 @@
-anyremote-4.14.tar.gz
+anyremote-4.15.tar.gz


Index: anyremote.spec
===================================================================
RCS file: /cvs/pkgs/rpms/anyremote/F-9/anyremote.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- anyremote.spec	11 Jan 2009 18:47:59 -0000	1.12
+++ anyremote.spec	16 Jan 2009 16:07:41 -0000	1.13
@@ -1,6 +1,6 @@
 Summary: Remote control through bluetooth or IR connection
 Name: anyremote
-Version: 4.14
+Version: 4.15
 Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/System
@@ -60,8 +60,12 @@
 
 %changelog
 
+* Fri Jan 16 2009 Mikhail Fedotov <anyremote at mail.ru> - 4.15-1
+- Fixed crash issue in case of anyremote was runned without X.
+  Fix hang in Load() command in case of empty file.
+
 * Sat Jan 10 2009 Mikhail Fedotov <anyremote at mail.ru> - 4.14-1
-- Small corrections in configuration files. Configuration file for AlsaPlayer, 
+- Small corrections in configuration files. Configuration files for AlsaPlayer, 
   Digikam (thanks to Marcus Hardt) and GPicView were added. 
   Syntax of Emulate() command was extended.
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/anyremote/F-9/import.log,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- import.log	11 Jan 2009 18:47:59 -0000	1.7
+++ import.log	16 Jan 2009 16:07:41 -0000	1.8
@@ -5,3 +5,4 @@
 anyremote-4_12-1_fc9:F-9:anyremote-4.12-1.fc9.src.rpm:1226867280
 anyremote-4_13-1_fc10:F-9:anyremote-4.13-1.fc10.src.rpm:1228852843
 anyremote-4_14-1_fc10:F-9:anyremote-4.14-1.fc10.src.rpm:1231699592
+anyremote-4_15-1_fc10:F-9:anyremote-4.15-1.fc10.src.rpm:1232122037


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/anyremote/F-9/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	11 Jan 2009 18:47:59 -0000	1.13
+++ sources	16 Jan 2009 16:07:41 -0000	1.14
@@ -1 +1 @@
-14002849e48b1ee223687132845754bf  anyremote-4.14.tar.gz
+4bac900dafab2ffba006dcdab63cfc2b  anyremote-4.15.tar.gz



From anyremote at fedoraproject.org  Fri Jan 16 16:09:00 2009
From: anyremote at fedoraproject.org (Mikhail Fedotov)
Date: Fri, 16 Jan 2009 16:09:00 +0000 (UTC)
Subject: rpms/anyremote/F-10 .cvsignore, 1.13, 1.14 anyremote.spec, 1.13,
	1.14 import.log, 1.7, 1.8 sources, 1.13, 1.14
Message-ID: <20090116160900.809BD70127@cvs1.fedora.phx.redhat.com>

Author: anyremote

Update of /cvs/pkgs/rpms/anyremote/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28439/F-10

Modified Files:
	.cvsignore anyremote.spec import.log sources 
Log Message:
build


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/anyremote/F-10/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	11 Jan 2009 18:48:03 -0000	1.13
+++ .cvsignore	16 Jan 2009 16:08:30 -0000	1.14
@@ -1 +1 @@
-anyremote-4.14.tar.gz
+anyremote-4.15.tar.gz


Index: anyremote.spec
===================================================================
RCS file: /cvs/pkgs/rpms/anyremote/F-10/anyremote.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- anyremote.spec	11 Jan 2009 18:48:03 -0000	1.13
+++ anyremote.spec	16 Jan 2009 16:08:30 -0000	1.14
@@ -1,6 +1,6 @@
 Summary: Remote control through bluetooth or IR connection
 Name: anyremote
-Version: 4.14
+Version: 4.15
 Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/System
@@ -60,8 +60,12 @@
 
 %changelog
 
+* Fri Jan 16 2009 Mikhail Fedotov <anyremote at mail.ru> - 4.15-1
+- Fixed crash issue in case of anyremote was runned without X.
+  Fix hang in Load() command in case of empty file.
+
 * Sat Jan 10 2009 Mikhail Fedotov <anyremote at mail.ru> - 4.14-1
-- Small corrections in configuration files. Configuration file for AlsaPlayer, 
+- Small corrections in configuration files. Configuration files for AlsaPlayer, 
   Digikam (thanks to Marcus Hardt) and GPicView were added. 
   Syntax of Emulate() command was extended.
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/anyremote/F-10/import.log,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- import.log	11 Jan 2009 18:48:03 -0000	1.7
+++ import.log	16 Jan 2009 16:08:30 -0000	1.8
@@ -5,3 +5,4 @@
 anyremote-4_12-1_fc9:F-10:anyremote-4.12-1.fc9.src.rpm:1226867304
 anyremote-4_13-1_fc10:F-10:anyremote-4.13-1.fc10.src.rpm:1228852860
 anyremote-4_14-1_fc10:F-10:anyremote-4.14-1.fc10.src.rpm:1231699601
+anyremote-4_15-1_fc10:F-10:anyremote-4.15-1.fc10.src.rpm:1232122053


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/anyremote/F-10/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	11 Jan 2009 18:48:03 -0000	1.13
+++ sources	16 Jan 2009 16:08:30 -0000	1.14
@@ -1 +1 @@
-14002849e48b1ee223687132845754bf  anyremote-4.14.tar.gz
+4bac900dafab2ffba006dcdab63cfc2b  anyremote-4.15.tar.gz



From anyremote at fedoraproject.org  Fri Jan 16 16:09:02 2009
From: anyremote at fedoraproject.org (Mikhail Fedotov)
Date: Fri, 16 Jan 2009 16:09:02 +0000 (UTC)
Subject: rpms/anyremote/devel .cvsignore, 1.13, 1.14 anyremote.spec, 1.13,
	1.14 import.log, 1.7, 1.8 sources, 1.13, 1.14
Message-ID: <20090116160902.84C3E70127@cvs1.fedora.phx.redhat.com>

Author: anyremote

Update of /cvs/pkgs/rpms/anyremote/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28467/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.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	11 Jan 2009 18:48:06 -0000	1.13
+++ .cvsignore	16 Jan 2009 16:08:32 -0000	1.14
@@ -1 +1 @@
-anyremote-4.14.tar.gz
+anyremote-4.15.tar.gz


Index: anyremote.spec
===================================================================
RCS file: /cvs/pkgs/rpms/anyremote/devel/anyremote.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- anyremote.spec	11 Jan 2009 18:48:06 -0000	1.13
+++ anyremote.spec	16 Jan 2009 16:08:32 -0000	1.14
@@ -1,6 +1,6 @@
 Summary: Remote control through bluetooth or IR connection
 Name: anyremote
-Version: 4.14
+Version: 4.15
 Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/System
@@ -60,8 +60,12 @@
 
 %changelog
 
+* Fri Jan 16 2009 Mikhail Fedotov <anyremote at mail.ru> - 4.15-1
+- Fixed crash issue in case of anyremote was runned without X.
+  Fix hang in Load() command in case of empty file.
+
 * Sat Jan 10 2009 Mikhail Fedotov <anyremote at mail.ru> - 4.14-1
-- Small corrections in configuration files. Configuration file for AlsaPlayer, 
+- Small corrections in configuration files. Configuration files for AlsaPlayer, 
   Digikam (thanks to Marcus Hardt) and GPicView were added. 
   Syntax of Emulate() command was extended.
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/anyremote/devel/import.log,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- import.log	11 Jan 2009 18:48:06 -0000	1.7
+++ import.log	16 Jan 2009 16:08:32 -0000	1.8
@@ -5,3 +5,4 @@
 anyremote-4_12-1_fc9:HEAD:anyremote-4.12-1.fc9.src.rpm:1226867310
 anyremote-4_13-1_fc10:HEAD:anyremote-4.13-1.fc10.src.rpm:1228852868
 anyremote-4_14-1_fc10:HEAD:anyremote-4.14-1.fc10.src.rpm:1231699613
+anyremote-4_15-1_fc10:HEAD:anyremote-4.15-1.fc10.src.rpm:1232122047


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/anyremote/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	11 Jan 2009 18:48:06 -0000	1.13
+++ sources	16 Jan 2009 16:08:32 -0000	1.14
@@ -1 +1 @@
-14002849e48b1ee223687132845754bf  anyremote-4.14.tar.gz
+4bac900dafab2ffba006dcdab63cfc2b  anyremote-4.15.tar.gz



From tmraz at fedoraproject.org  Fri Jan 16 16:11:37 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 16 Jan 2009 16:11:37 +0000 (UTC)
Subject: rpms/openssl/devel openssl.spec,1.115,1.116
Message-ID: <20090116161137.9916A70127@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/openssl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28922

Modified Files:
	openssl.spec 
Log Message:
* Fri Jan 16 2009 Tomas Mraz <tmraz at redhat.com> 0.9.8j-3
- even more robust test for the temporary symlinks



Index: openssl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openssl/devel/openssl.spec,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -r1.115 -r1.116
--- openssl.spec	16 Jan 2009 13:02:42 -0000	1.115
+++ openssl.spec	16 Jan 2009 16:11:07 -0000	1.116
@@ -23,7 +23,7 @@
 Summary: A general purpose cryptography library with TLS implementation
 Name: openssl
 Version: 0.9.8j
-Release: 2%{?dist}
+Release: 3%{?dist}
 # We remove certain patented algorithms from the openssl source tarball
 # with the hobble-openssl script which is included below.
 Source: openssl-%{version}-usa.tar.bz2
@@ -75,7 +75,7 @@
 Requires: mktemp, ca-certificates >= 2008-5
 
 # Temporary hack
-Requires(post): /sbin/ldconfig
+Requires(post): /sbin/ldconfig coreutils
 Requires(postun): /sbin/ldconfig
 %ifarch ppc64 s390x sparc64 x86_64
 Provides: libcrypto.so.7()(64bit) libssl.so.7()(64bit)
@@ -400,11 +400,11 @@
 %endif
 
 %post 
-if [ ! -h /%{_lib}/libcrypto.so.7 ] ; then
-    ln -s libcrypto.so.%{version} /%{_lib}/libcrypto.so.7 || :
+if [ "$(readlink /%{_lib}/libcrypto.so.7)" != libcrypto.so.%{version} ] ; then
+    ln -sf libcrypto.so.%{version} /%{_lib}/libcrypto.so.7 || :
 fi
-if [ ! -h /%{_lib}/libssl.so.7 ] ; then
-    ln -s libssl.so.%{version} /%{_lib}/libssl.so.7 || :
+if [ "$(readlink /%{_lib}/libssl.so.7)" != libssl.so.%{version} ] ; then
+    ln -sf libssl.so.%{version} /%{_lib}/libssl.so.7 || :
 fi
 /sbin/ldconfig -X
 
@@ -412,6 +412,9 @@
 /sbin/ldconfig -X
 
 %changelog
+* Fri Jan 16 2009 Tomas Mraz <tmraz at redhat.com> 0.9.8j-3
+- even more robust test for the temporary symlinks
+
 * Fri Jan 16 2009 Tomas Mraz <tmraz at redhat.com> 0.9.8j-2
 - try to ensure the temporary symlinks exist
 



From tmraz at fedoraproject.org  Fri Jan 16 16:15:51 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 16 Jan 2009 16:15:51 +0000 (UTC)
Subject: rpms/gq/devel gq.spec,1.10,1.11
Message-ID: <20090116161551.65E9670127@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/gq/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29611

Modified Files:
	gq.spec 
Log Message:
* Fri Jan 16 2009 Tomas Mraz <tmraz at redhat.com> - 1.3.4-3
- rebuild with new openssl



Index: gq.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gq/devel/gq.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- gq.spec	1 Sep 2008 20:10:14 -0000	1.10
+++ gq.spec	16 Jan 2009 16:15:21 -0000	1.11
@@ -1,7 +1,7 @@
 Summary: Graphical LDAP directory browser and editor
 Name:    gq
 Version: 1.3.4
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+
 Group:   Applications/Internet
 URL:     http://www.gq-project.org/
@@ -89,6 +89,9 @@
 %dir %{_datadir}/%{name}
 
 %changelog
+* Fri Jan 16 2009 Tomas Mraz <tmraz at redhat.com> - 1.3.4-3
+- rebuild with new openssl
+
 * Mon Sep  1 2008 Terje R??sten <terje.rosten at ntnu.no> - 1.3.4-2
 - adapt to new rpm patch macro policy
 



From tmraz at fedoraproject.org  Fri Jan 16 16:17:30 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 16 Jan 2009 16:17:30 +0000 (UTC)
Subject: rpms/gsoap/devel gsoap.spec,1.10,1.11
Message-ID: <20090116161730.DAF6F70141@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/gsoap/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29978

Modified Files:
	gsoap.spec 
Log Message:
* Fri Jan 16 2009 Tomas Mraz <tmraz at redhat.com> - 2.7.12-2
- rebuild with new openssl



Index: gsoap.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gsoap/devel/gsoap.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- gsoap.spec	7 Jan 2009 05:54:41 -0000	1.10
+++ gsoap.spec	16 Jan 2009 16:17:00 -0000	1.11
@@ -1,7 +1,7 @@
 Summary: Generator Tools for Coding SOAP/XML Web Services in C and C++
 Name: gsoap
 Version: 2.7.12
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Group: Development/Tools
 URL: http://gsoap2.sourceforge.net
@@ -249,6 +249,9 @@
 
 
 %changelog
+* Fri Jan 16 2009 Tomas Mraz <tmraz at redhat.com> - 2.7.12-2
+- rebuild with new openssl
+
 * Wed Dec 24 2008  <matt at redhat> - 2.7.12-1
 - Updated to gsoap 2.7.12:
 -  Numerous bug fixes - xml:lang, maxOccurs="unbounded", SSL, xmlns="", ...



From nalin at fedoraproject.org  Fri Jan 16 16:18:27 2009
From: nalin at fedoraproject.org (Nalin Dahyabhai)
Date: Fri, 16 Jan 2009 16:18:27 +0000 (UTC)
Subject: devel/krb5 krb5.spec,1.176,1.177
Message-ID: <20090116161827.0883770127@cvs1.fedora.phx.redhat.com>

Author: nalin

Update of /cvs/pkgs/devel/krb5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30241

Modified Files:
	krb5.spec 
Log Message:
rebuild


Index: krb5.spec
===================================================================
RCS file: /cvs/pkgs/devel/krb5/krb5.spec,v
retrieving revision 1.176
retrieving revision 1.177
diff -u -r1.176 -r1.177
--- krb5.spec	4 Sep 2008 15:13:51 -0000	1.176
+++ krb5.spec	16 Jan 2009 16:17:56 -0000	1.177
@@ -16,7 +16,7 @@
 Summary: The Kerberos network authentication system.
 Name: krb5
 Version: 1.6.3
-Release: 16%{?dist}
+Release: 17%{?dist}
 # Maybe we should explode from the now-available-to-everybody tarball instead?
 # http://web.mit.edu/kerberos/dist/krb5/1.6/krb5-1.6.2-signed.tar
 Source0: krb5-%{version}.tar.gz
@@ -232,6 +232,9 @@
 certificate.
 
 %changelog
+* Fri Jan 16 2008  Nalin Dahyabhai <nalin at redhat.com> 1.6.3-17
+- rebuild
+
 * 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



From nalin at fedoraproject.org  Fri Jan 16 16:19:33 2009
From: nalin at fedoraproject.org (Nalin Dahyabhai)
Date: Fri, 16 Jan 2009 16:19:33 +0000 (UTC)
Subject: devel/krb5 krb5.spec,1.177,1.178
Message-ID: <20090116161933.3B29570127@cvs1.fedora.phx.redhat.com>

Author: nalin

Update of /cvs/pkgs/devel/krb5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31056

Modified Files:
	krb5.spec 
Log Message:
aargh, what year is it?


Index: krb5.spec
===================================================================
RCS file: /cvs/pkgs/devel/krb5/krb5.spec,v
retrieving revision 1.177
retrieving revision 1.178
diff -u -r1.177 -r1.178
--- krb5.spec	16 Jan 2009 16:17:56 -0000	1.177
+++ krb5.spec	16 Jan 2009 16:19:02 -0000	1.178
@@ -232,7 +232,7 @@
 certificate.
 
 %changelog
-* Fri Jan 16 2008  Nalin Dahyabhai <nalin at redhat.com> 1.6.3-17
+* Fri Jan 16 2009 Nalin Dahyabhai <nalin at redhat.com> 1.6.3-17
 - rebuild
 
 * Thu Sep  4 2008 Nalin Dahyabhai <nalin at redhat.com>



From clumens at fedoraproject.org  Fri Jan 16 16:37:58 2009
From: clumens at fedoraproject.org (Christopher Edward Lumens)
Date: Fri, 16 Jan 2009 16:37:58 +0000 (UTC)
Subject: rpms/firstboot/devel .cvsignore, 1.97, 1.98 firstboot.spec, 1.131, 
	1.132 sources, 1.127, 1.128
Message-ID: <20090116163759.04A1D70127@cvs1.fedora.phx.redhat.com>

Author: clumens

Update of /cvs/pkgs/rpms/firstboot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv640

Modified Files:
	.cvsignore firstboot.spec sources 
Log Message:
New version.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/firstboot/devel/.cvsignore,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -r1.97 -r1.98
--- .cvsignore	16 Dec 2008 20:38:11 -0000	1.97
+++ .cvsignore	16 Jan 2009 16:37:28 -0000	1.98
@@ -69,3 +69,4 @@
 firstboot-1.102.tar.bz2
 firstboot-1.103.tar.bz2
 firstboot-1.104.tar.bz2
+firstboot-1.105.tar.bz2


Index: firstboot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/firstboot/devel/firstboot.spec,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -r1.131 -r1.132
--- firstboot.spec	16 Dec 2008 20:38:11 -0000	1.131
+++ firstboot.spec	16 Jan 2009 16:37:28 -0000	1.132
@@ -3,7 +3,7 @@
 Summary: Initial system configuration utility
 Name: firstboot
 URL: http://fedoraproject.org/wiki/FirstBoot
-Version: 1.104
+Version: 1.105
 Release: 1%{?dist}
 # This is a Red Hat maintained package which is specific to
 # our distribution.  Thus the source is only available from
@@ -71,6 +71,9 @@
 %{_datadir}/firstboot/themes/default/*
 
 %changelog
+* Fri Jan 16 2009 Chris Lumens <clumens at redhat.com> 1.105-1
+- Fix a typo in starting up X.
+
 * Tue Dec 16 2008 Chris Lumens <clumens at redhat.com> 1.104-1
 - Let X tell us when it's ready to run (ajax).
 - Add a Requires: for authconfig-gtk (#474733).


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/firstboot/devel/sources,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -r1.127 -r1.128
--- sources	16 Dec 2008 20:38:11 -0000	1.127
+++ sources	16 Jan 2009 16:37:28 -0000	1.128
@@ -1 +1 @@
-5bc66c156e3a1c5e9e2dd95f6d954646  firstboot-1.104.tar.bz2
+43cd2046c00370f2d2cc792324e8ae64  firstboot-1.105.tar.bz2



From kwade at fedoraproject.org  Fri Jan 16 16:49:15 2009
From: kwade at fedoraproject.org (Karsten Wade)
Date: Fri, 16 Jan 2009 16:49:15 +0000 (UTC)
Subject: CVSROOT avail,1.54,1.55
Message-ID: <20090116164915.7202F70141@cvs1.fedora.phx.redhat.com>

Author: kwade

Update of /cvs/fedora/CVSROOT
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2159

Modified Files:
	avail 
Log Message:
adding Diego to TQSG perms


Index: avail
===================================================================
RCS file: /cvs/fedora/CVSROOT/avail,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- avail	22 Dec 2008 19:11:55 -0000	1.54
+++ avail	16 Jan 2009 16:49:14 -0000	1.55
@@ -26,7 +26,7 @@
 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
-avail | sarahs,aalam,ccheng | web/html/docs/translation-quick-start-guide
+avail | sarahs,aalam,ccheng,diegobz | web/html/docs/translation-quick-start-guide
 avail | riel | web/html/docs/virtualisation
 avail | harald | web/html/docs/udev
 avail | eitch,mdomsch | web/html/download



From victorv at fedoraproject.org  Fri Jan 16 16:53:06 2009
From: victorv at fedoraproject.org (Victor G. Vasilyev)
Date: Fri, 16 Jan 2009 16:53:06 +0000 (UTC)
Subject: rpms/netbeans/devel netbeans-6.5-00-copy-build.patch, NONE,
	1.1 netbeans-6.5-10-ant-external-build.patch, NONE,
	1.1 netbeans-6.5-20-ant-build.patch, NONE,
	1.1 netbeans-6.5-30-parse-project-xml.patch, NONE,
	1.1 netbeans-6.5-40-build-xml.patch, NONE,
	1.1 netbeans-6.5-50-ide-launcher.patch, NONE,
	1.1 netbeans-6.5-60-small-ide-config.patch, NONE,
	1.1 netbeans-6.5-70-updatecenters.patch, NONE,
	1.1 netbeans-6.5-80-nosvnkit.patch, NONE, 1.1 .cvsignore, 1.2,
	1.3 netbeans.spec, 1.7, 1.8 sources, 1.2,
	1.3 netbeans-6.1-00-copy-build.patch, 1.1,
	NONE netbeans-6.1-10-ant-external-build.patch, 1.1,
	NONE netbeans-6.1-20-ant-build.patch, 1.1,
	NONE netbeans-6.1-30-parse-project-xml.patch, 1.1,
	NONE netbeans-6.1-40-build-xml.patch, 1.1,
	NONE netbeans-6.1-50-ide-launcher.patch, 1.3,
	NONE netbeans-6.1-60-small-ide-config.patch, 1.2,
	NONE netbeans-6.1-70-updatecenters.patch, 1.1, NONE
Message-ID: <20090116165306.8FF4F70127@cvs1.fedora.phx.redhat.com>

Author: victorv

Update of /cvs/pkgs/rpms/netbeans/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2663

Modified Files:
	.cvsignore netbeans.spec sources 
Added Files:
	netbeans-6.5-00-copy-build.patch 
	netbeans-6.5-10-ant-external-build.patch 
	netbeans-6.5-20-ant-build.patch 
	netbeans-6.5-30-parse-project-xml.patch 
	netbeans-6.5-40-build-xml.patch 
	netbeans-6.5-50-ide-launcher.patch 
	netbeans-6.5-60-small-ide-config.patch 
	netbeans-6.5-70-updatecenters.patch 
	netbeans-6.5-80-nosvnkit.patch 
Removed Files:
	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-6.1-70-updatecenters.patch 
Log Message:
Version 6.5 https://bugzilla.redhat.com/show_bug.cgi?id=473075


netbeans-6.5-00-copy-build.patch:

--- NEW FILE netbeans-6.5-00-copy-build.patch ---
diff -Nur netbeans-6.5/javahelp/nbproject/project.properties netbeans-6.5.new/javahelp/nbproject/project.properties
--- netbeans-6.5/javahelp/nbproject/project.properties	2008-11-10 00:13:36.000000000 +0300
+++ netbeans-6.5.new/javahelp/nbproject/project.properties	2008-12-23 16:52:25.000000000 +0300
@@ -38,7 +38,7 @@
 # made subject to such option by the copyright holder.
 
 is.autoload=true
-release.external/jh-2.0_05.jar=modules/ext/jh-2.0_05.jar
+#release.external/jh-2.0_05.jar=modules/ext/jh-2.0_05.jar
 
 javac.compilerargs=-Xlint:unchecked
 javac.source=1.5
diff -Nur netbeans-6.5/junit/nbproject/project.properties netbeans-6.5.new/junit/nbproject/project.properties
--- netbeans-6.5/junit/nbproject/project.properties	2008-11-10 00:13:42.000000000 +0300
+++ netbeans-6.5.new/junit/nbproject/project.properties	2008-12-23 16:36:31.000000000 +0300
@@ -42,11 +42,11 @@
 javadoc.arch=${basedir}/arch.xml
 javadoc.apichanges=${basedir}/apichanges.xml
 
-release.external/junit-3.8.2.jar=modules/ext/junit-3.8.2.jar
-release.external/junit-3.8.2-api.zip=docs/junit-3.8.2-api.zip
-release.external/junit-4.5-api.zip=docs/junit-4.5-api.zip
-release.external/junit-4.5-src.jar=docs/junit-4.5-src.jar
-release.external/Ant-1.7.1-binary-patch-72080.jar=ant/patches/72080.jar
+#release.external/junit-3.8.2.jar=modules/ext/junit-3.8.2.jar
+#release.external/junit-3.8.2-api.zip=docs/junit-3.8.2-api.zip
+#release.external/junit-4.5-api.zip=docs/junit-4.5-api.zip
+#release.external/junit-4.5-src.jar=docs/junit-4.5-src.jar
+#release.external/Ant-1.7.1-binary-patch-72080.jar=ant/patches/72080.jar
 
 # XXX AntBridge.createMainClassPath probably would not find this anyway:
 jnlp.verify.excludes=ant/patches/72080.jar
diff -Nur netbeans-6.5/libs.cglib/nbproject/project.properties netbeans-6.5.new/libs.cglib/nbproject/project.properties
--- netbeans-6.5/libs.cglib/nbproject/project.properties	2008-11-10 00:13:46.000000000 +0300
+++ netbeans-6.5.new/libs.cglib/nbproject/project.properties	2008-12-23 16:59:26.000000000 +0300
@@ -39,7 +39,7 @@
 
 is.autoload=true
 
-release.external/cglib-2.2.jar=modules/ext/cglib-2.2.jar
+#release.external/cglib-2.2.jar=modules/ext/cglib-2.2.jar
 
 sigtest.gen.fail.on.error=false
 
diff -Nur netbeans-6.5/libs.commons_logging/nbproject/project.properties netbeans-6.5.new/libs.commons_logging/nbproject/project.properties
--- netbeans-6.5/libs.commons_logging/nbproject/project.properties	2008-11-10 00:13:46.000000000 +0300
+++ netbeans-6.5.new/libs.commons_logging/nbproject/project.properties	2008-12-23 16:31:31.000000000 +0300
@@ -38,4 +38,4 @@
 # made subject to such option by the copyright holder.
 
 is.autoload=true
-release.external/commons-logging-1.1.jar=modules/ext/commons-logging-1.1.jar
+#release.external/commons-logging-1.1.jar=modules/ext/commons-logging-1.1.jar
diff -Nur netbeans-6.5/libs.commons_net/nbproject/project.properties netbeans-6.5.new/libs.commons_net/nbproject/project.properties
--- netbeans-6.5/libs.commons_net/nbproject/project.properties	2008-11-10 00:13:46.000000000 +0300
+++ netbeans-6.5.new/libs.commons_net/nbproject/project.properties	2008-12-23 16:57:30.000000000 +0300
@@ -38,4 +38,4 @@
 # made subject to such option by the copyright holder.
 
 is.autoload=true
-release.external/commons-net-1.4.1.jar=modules/ext/commons-net-1.4.1.jar
+#release.external/commons-net-1.4.1.jar=modules/ext/commons-net-1.4.1.jar
diff -Nur netbeans-6.5/libs.freemarker/nbproject/project.properties netbeans-6.5.new/libs.freemarker/nbproject/project.properties
--- netbeans-6.5/libs.freemarker/nbproject/project.properties	2008-11-10 00:13:46.000000000 +0300
+++ netbeans-6.5.new/libs.freemarker/nbproject/project.properties	2008-12-23 17:00:01.000000000 +0300
@@ -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 netbeans-6.5/libs.ini4j/nbproject/project.properties netbeans-6.5.new/libs.ini4j/nbproject/project.properties
--- netbeans-6.5/libs.ini4j/nbproject/project.properties	2008-11-10 00:13:46.000000000 +0300
+++ netbeans-6.5.new/libs.ini4j/nbproject/project.properties	2008-12-23 16:38:00.000000000 +0300
@@ -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 netbeans-6.5/libs.jakarta_oro/nbproject/project.properties netbeans-6.5.new/libs.jakarta_oro/nbproject/project.properties
--- netbeans-6.5/libs.jakarta_oro/nbproject/project.properties	2008-11-10 00:13:46.000000000 +0300
+++ netbeans-6.5.new/libs.jakarta_oro/nbproject/project.properties	2008-12-23 17:10:01.000000000 +0300
@@ -38,4 +38,4 @@
 # made subject to such option by the copyright holder.
 
 is.autoload=true
-release.external/jakarta-oro-2.0.8.jar=modules/ext/jakarta-oro-2.0.8.jar
+#release.external/jakarta-oro-2.0.8.jar=modules/ext/jakarta-oro-2.0.8.jar
diff -Nur netbeans-6.5/libs.javacapi/nbproject/project.properties netbeans-6.5.new/libs.javacapi/nbproject/project.properties
--- netbeans-6.5/libs.javacapi/nbproject/project.properties	2008-11-10 00:13:46.000000000 +0300
+++ netbeans-6.5.new/libs.javacapi/nbproject/project.properties	2008-12-23 16:53:21.000000000 +0300
@@ -44,6 +44,6 @@
 nbm.homepage=http://jackpot.netbeans.org/
 nbm.module.author=Petr Hrebejk, Sun Microsystems, Inc.
 spec.version.base=0.7.1
-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 netbeans-6.5/libs.javacimpl/nbproject/project.properties netbeans-6.5.new/libs.javacimpl/nbproject/project.properties
--- netbeans-6.5/libs.javacimpl/nbproject/project.properties	2008-11-10 00:13:46.000000000 +0300
+++ netbeans-6.5.new/libs.javacimpl/nbproject/project.properties	2008-12-23 16:48:03.000000000 +0300
@@ -41,7 +41,7 @@
 nbm.homepage=http://jackpot.netbeans.org/
 nbm.module.author=Petr Hrebejk, Sun Microsystems, Inc.
 spec.version.base=0.9.1
-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 netbeans-6.5/libs.jaxb/nbproject/project.properties netbeans-6.5.new/libs.jaxb/nbproject/project.properties
--- netbeans-6.5/libs.jaxb/nbproject/project.properties	2008-11-10 00:13:46.000000000 +0300
+++ netbeans-6.5.new/libs.jaxb/nbproject/project.properties	2008-12-23 16:50:48.000000000 +0300
@@ -44,10 +44,10 @@
     modules/ext/jaxb/jaxb-xjc.jar,\
     modules/ext/jaxb/api/jsr173_api.jar
 
-release.external/activation.jar=modules/ext/jaxb/activation.jar
-release.external/jaxb-api.jar=modules/ext/jaxb/api/jaxb-api.jar
-release.external/jaxb-impl.jar=modules/ext/jaxb/jaxb-impl.jar
-release.external/jaxb-xjc.jar=modules/ext/jaxb/jaxb-xjc.jar
-release.external/jsr173_api.jar=modules/ext/jaxb/api/jsr173_api.jar
+#release.external/activation.jar=modules/ext/jaxb/activation.jar
+#release.external/jaxb-api.jar=modules/ext/jaxb/api/jaxb-api.jar
+#release.external/jaxb-impl.jar=modules/ext/jaxb/jaxb-impl.jar
+#release.external/jaxb-xjc.jar=modules/ext/jaxb/jaxb-xjc.jar
+#release.external/jsr173_api.jar=modules/ext/jaxb/api/jsr173_api.jar
 
 sigtest.gen.fail.on.error=false
diff -Nur netbeans-6.5/libs.jna/nbproject/project.properties netbeans-6.5.new/libs.jna/nbproject/project.properties
--- netbeans-6.5/libs.jna/nbproject/project.properties	2008-11-10 00:13:46.000000000 +0300
+++ netbeans-6.5.new/libs.jna/nbproject/project.properties	2008-12-23 16:44:21.000000000 +0300
@@ -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 netbeans-6.5/libs.jsch/nbproject/project.properties netbeans-6.5.new/libs.jsch/nbproject/project.properties
--- netbeans-6.5/libs.jsch/nbproject/project.properties	2008-11-10 00:13:46.000000000 +0300
+++ netbeans-6.5.new/libs.jsch/nbproject/project.properties	2008-12-23 16:34:47.000000000 +0300
@@ -38,4 +38,4 @@
 # made subject to such option by the copyright holder.
 
 is.autoload=true
-release.external/jsch-0.1.39.jar=modules/ext/jsch-0.1.39.jar
+#release.external/jsch-0.1.39.jar=modules/ext/jsch-0.1.39.jar
diff -Nur netbeans-6.5/libs.jsr223/nbproject/project.properties netbeans-6.5.new/libs.jsr223/nbproject/project.properties
--- netbeans-6.5/libs.jsr223/nbproject/project.properties	2008-11-10 00:13:46.000000000 +0300
+++ netbeans-6.5.new/libs.jsr223/nbproject/project.properties	2008-12-23 16:46:08.000000000 +0300
@@ -39,4 +39,4 @@
 
 is.autoload=true
 javadoc.arch=${basedir}/arch.xml
-release.external/jsr223-api.jar=modules/ext/script-api.jar
+#release.external/jsr223-api.jar=modules/ext/script-api.jar
diff -Nur netbeans-6.5/libs.junit4/nbproject/project.properties netbeans-6.5.new/libs.junit4/nbproject/project.properties
--- netbeans-6.5/libs.junit4/nbproject/project.properties	2008-11-10 00:13:46.000000000 +0300
+++ netbeans-6.5.new/libs.junit4/nbproject/project.properties	2008-12-23 16:46:43.000000000 +0300
@@ -38,7 +38,7 @@
 # made subject to such option by the copyright holder.
 
 is.autoload=true
-release.external/junit-4.5.jar=modules/ext/junit-4.5.jar
+#release.external/junit-4.5.jar=modules/ext/junit-4.5.jar
 
 
 sigtest.skip.check=true
diff -Nur netbeans-6.5/libs.lucene/nbproject/project.properties netbeans-6.5.new/libs.lucene/nbproject/project.properties
--- netbeans-6.5/libs.lucene/nbproject/project.properties	2008-11-10 00:13:46.000000000 +0300
+++ netbeans-6.5.new/libs.lucene/nbproject/project.properties	2008-12-23 16:43:27.000000000 +0300
@@ -38,4 +38,4 @@
 # made subject to such option by the copyright holder.
 
 is.autoload=true
-release.external/lucene-core-2.3.2.jar=modules/ext/lucene-core-2.3.2.jar
+#release.external/lucene-core-2.3.2.jar=modules/ext/lucene-core-2.3.2.jar
diff -Nur netbeans-6.5/libs.svnClientAdapter/nbproject/project.properties netbeans-6.5.new/libs.svnClientAdapter/nbproject/project.properties
--- netbeans-6.5/libs.svnClientAdapter/nbproject/project.properties	2008-11-10 00:13:46.000000000 +0300
+++ netbeans-6.5.new/libs.svnClientAdapter/nbproject/project.properties	2008-12-23 16:58:21.000000000 +0300
@@ -40,8 +40,8 @@
 is.autoload=true
 
 javac.source=1.5
-release.external/svnClientAdapter-1.4.0.jar=modules/ext/svnClientAdapter-1.4.0.jar
-release.external/svnjavahl-1.5.0.jar=modules/ext/svnjavahl-1.5.0.jar
+#release.external/svnClientAdapter-1.4.0.jar=modules/ext/svnClientAdapter-1.4.0.jar
+#release.external/svnjavahl-1.5.0.jar=modules/ext/svnjavahl-1.5.0.jar
 
 # Hidden class found: org.tigris.subversion.svnclientadapter.commandline.CommandLine$CmdArguments in method protected byte[] org.tigris.subversion.svnclientadapter.commandline.SvnCommandLine.execBytes(org.tigris.subversion.svnclientadapter.commandline.CommandLine$CmdArguments,boolean) throws java.lang.Exception in class org.tigris.subversion.svnclientadapter.commandline.SvnCommandLine
 # Hidden class found: org.tigris.subversion.svnclientadapter.commandline.CommandLine$CmdArguments in method protected java.lang.String org.tigris.subversion.svnclientadapter.commandline.SvnAdminCommandLine.execString(org.tigris.subversion.svnclientadapter.commandline.CommandLine$CmdArguments,boolean) throws java.lang.Exception in class org.tigris.subversion.svnclientadapter.commandline.SvnAdminCommandLine
diff -Nur netbeans-6.5/libs.xerces/nbproject/project.properties netbeans-6.5.new/libs.xerces/nbproject/project.properties
--- netbeans-6.5/libs.xerces/nbproject/project.properties	2008-11-10 00:13:46.000000000 +0300
+++ netbeans-6.5.new/libs.xerces/nbproject/project.properties	2008-12-23 16:39:21.000000000 +0300
@@ -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 netbeans-6.5/o.apache.xml.resolver/nbproject/project.properties netbeans-6.5.new/o.apache.xml.resolver/nbproject/project.properties
--- netbeans-6.5/o.apache.xml.resolver/nbproject/project.properties	2008-11-10 00:13:58.000000000 +0300
+++ netbeans-6.5.new/o.apache.xml.resolver/nbproject/project.properties	2008-12-23 16:11:54.000000000 +0300
@@ -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 netbeans-6.5/o.jdesktop.beansbinding/nbproject/project.properties netbeans-6.5.new/o.jdesktop.beansbinding/nbproject/project.properties
--- netbeans-6.5/o.jdesktop.beansbinding/nbproject/project.properties	2008-11-10 00:13:58.000000000 +0300
+++ netbeans-6.5.new/o.jdesktop.beansbinding/nbproject/project.properties	2008-12-23 16:55:39.000000000 +0300
@@ -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 netbeans-6.5/o.jdesktop.layout/nbproject/project.properties netbeans-6.5.new/o.jdesktop.layout/nbproject/project.properties
--- netbeans-6.5/o.jdesktop.layout/nbproject/project.properties	2008-11-10 00:13:58.000000000 +0300
+++ netbeans-6.5.new/o.jdesktop.layout/nbproject/project.properties	2008-12-23 16:54:55.000000000 +0300
@@ -38,7 +38,7 @@
 # made subject to such option by the copyright holder.
 
 is.autoload=true
-release.external/swing-layout-1.0.3.jar=modules/ext/swing-layout-1.0.3.jar
-release.external/swing-layout-1.0.3-doc.zip=docs/swing-layout-1.0.3-doc.zip
-release.external/swing-layout-1.0.3-src.zip=docs/swing-layout-1.0.3-src.zip
+#release.external/swing-layout-1.0.3.jar=modules/ext/swing-layout-1.0.3.jar
+#release.external/swing-layout-1.0.3-doc.zip=docs/swing-layout-1.0.3-doc.zip
+#release.external/swing-layout-1.0.3-src.zip=docs/swing-layout-1.0.3-src.zip
 jnlp.indirect.jars=docs/swing-layout-1.0.3-doc.zip, docs/swing-layout-1.0.3-src.zip

netbeans-6.5-10-ant-external-build.patch:

--- NEW FILE netbeans-6.5-10-ant-external-build.patch ---
diff -Nur netbeans-6.5/o.apache.tools.ant.module/external/build.xml netbeans-6.5.new/o.apache.tools.ant.module/external/build.xml
--- netbeans-6.5/o.apache.tools.ant.module/external/build.xml	2008-12-22 21:07:31.000000000 +0300
+++ netbeans-6.5.new/o.apache.tools.ant.module/external/build.xml	2008-12-22 21:31:12.000000000 +0300
@@ -42,7 +42,7 @@
 -->
 <project name="o.apache.tools.ant.module/external" default="unzip" basedir=".">
     <target name="unzip">
-        <unzip src="ant-libs-1.7.1.zip" dest="lib"/>
+        <!-- <unzip src="ant-libs-1.7.1.zip" dest="lib"/> -->
     </target>
     <target name="clean">
         <delete dir="lib"/>

netbeans-6.5-20-ant-build.patch:

--- NEW FILE netbeans-6.5-20-ant-build.patch ---
diff -Nur netbeans-6.5/o.apache.tools.ant.module/build.xml netbeans-6.5.new/o.apache.tools.ant.module/build.xml
--- netbeans-6.5/o.apache.tools.ant.module/build.xml	2008-11-10 00:13:56.000000000 +0300
+++ netbeans-6.5.new/o.apache.tools.ant.module/build.xml	2008-12-22 21:41:15.000000000 +0300
@@ -75,21 +75,6 @@
     </target>
 
     <target name="netbeans-extra" depends="jar-bridge">
-        <mkdir dir="${cluster}/ant/lib"/>
-        <copy todir="${cluster}/ant/lib">
-            <fileset dir="external/lib"/>
-        </copy>
-        <unzip dest="${cluster}/ant">
-            <fileset dir="external">
-                <include name="ant-misc-*.zip"/>
-            </fileset>
-        </unzip>
-        <chmod perm="ugo+x">
-            <fileset dir="${cluster}/ant/bin">
-                <exclude name="*.cmd"/>
-                <exclude name="*.bat"/>
-            </fileset>
-        </chmod>
     </target>
 
     <target name="test-build" depends="jar-bridge,projectized-common.test-build"/>

netbeans-6.5-30-parse-project-xml.patch:

--- NEW FILE netbeans-6.5-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.5-40-build-xml.patch:

--- NEW FILE netbeans-6.5-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.5-50-ide-launcher.patch:

--- NEW FILE netbeans-6.5-50-ide-launcher.patch ---
diff -Nur netbeans-ide-launcher/ide/launcher/unix/netbeans netbeans-ide-launcher.new/ide/launcher/unix/netbeans
--- netbeans-ide-launcher/ide/launcher/unix/netbeans	2008-06-30 17:47:50.000000000 +0400
+++ netbeans-ide-launcher.new/ide/launcher/unix/netbeans	2008-10-22 15:58:13.000000000 +0400
@@ -38,6 +38,17 @@
 # Version 2 license, then the option applies only if the new code is
 # made subject to such option by the copyright holder.
 
+# The Startup Notification Protocol Specification established by freedesktop.org
+# recommends to unset the DESKTOP_STARTUP_ID environment variable to avoid
+# possible reuse by some process started later by this process, e.g. when a browser
+# will be started after clicking a hyperlink in the NetBeans.
+if [ ! -z $DESKTOP_STARTUP_ID ] ; then
+    # Save a value for later using in the NB_DESKTOP_STARTUP_ID
+    NB_DESKTOP_STARTUP_ID=$DESKTOP_STARTUP_ID; export NB_DESKTOP_STARTUP_ID
+
+    unset DESKTOP_STARTUP_ID
+fi
+
 #
 # resolve symlinks
 #
@@ -54,16 +65,18 @@
     fi
 done
 
-progdir=`dirname "$PRG"`
+#progdir=`dirname "$PRG"`
+# Patch for Debian/Ubuntu/Fedora where launcher is in /usr/bin
+progdir=/usr/share/netbeans/6.5/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 "$@"
@@ -199,7 +212,6 @@
             --branding nb \
             --clusters '"$netbeans_clusters"' \
             -J-Dnetbeans.importclass=org.netbeans.upgrade.AutoUpgrade \
-            -J-Dnetbeans.accept_license_class=org.netbeans.license.AcceptLicense \
             ${netbeans_default_options} \
             '"$@"'
         ;;

netbeans-6.5-60-small-ide-config.patch:

--- NEW FILE netbeans-6.5-60-small-ide-config.patch ---
diff -Nur netbeans-6.5/form.kit/nbproject/project.xml netbeans-6.5.new/form.kit/nbproject/project.xml
--- netbeans-6.5/form.kit/nbproject/project.xml	2008-11-10 00:13:08.000000000 +0300
+++ netbeans-6.5.new/form.kit/nbproject/project.xml	2008-12-22 21:44:02.000000000 +0300
@@ -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,24 +26,24 @@
                         <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>
                         <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.5/ide.kit/nbproject/project.xml netbeans-6.5.new/ide.kit/nbproject/project.xml
--- netbeans-6.5/ide.kit/nbproject/project.xml	2008-11-10 00:13:12.000000000 +0300
+++ netbeans-6.5.new/ide.kit/nbproject/project.xml	2008-12-22 22:03:19.000000000 +0300
@@ -123,13 +123,13 @@
                         <specification-version>1.11</specification-version>
                     </run-dependency>
                 </dependency>
-                <dependency>
+                <!--dependency>
                     <code-name-base>org.netbeans.modules.httpserver</code-name-base>
                     <run-dependency>
                         <release-version>2</release-version>
                         <specification-version>2.7</specification-version>
                     </run-dependency>
-                </dependency>
+                </dependency-->
                 <dependency>
                     <code-name-base>org.netbeans.modules.jumpto</code-name-base>
                     <run-dependency>
diff -Nur netbeans-6.5/java.kit/nbproject/project.xml netbeans-6.5.new/java.kit/nbproject/project.xml
--- netbeans-6.5/java.kit/nbproject/project.xml	2008-11-10 00:13:34.000000000 +0300
+++ netbeans-6.5.new/java.kit/nbproject/project.xml	2008-12-22 22:07:56.000000000 +0300
@@ -75,13 +75,13 @@
                         <specification-version>1.9</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>
@@ -184,19 +184,19 @@
                         <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>
                         <specification-version>1.1</specification-version>
                     </run-dependency>
-                </dependency>
-                <dependency>
+                </dependency-->
+                <!--dependency>
                     <code-name-base>org.netbeans.modules.websvc.jaxws21api</code-name-base>
                     <run-dependency>
                         <release-version>1</release-version>
                     </run-dependency>
-                </dependency>
+                </dependency-->
             </module-dependencies>
             <public-packages/>
         </data>
diff -Nur netbeans-6.5/nbbuild/cluster.properties netbeans-6.5.new/nbbuild/cluster.properties
--- netbeans-6.5/nbbuild/cluster.properties	2008-11-10 00:13:54.000000000 +0300
+++ netbeans-6.5.new/nbbuild/cluster.properties	2008-12-25 18:50:37.000000000 +0300
@@ -49,7 +49,6 @@
 clusters.config.basic.list=\
         ${clusters.config.platform.list},\
         nb.cluster.ide,\
-        nb.cluster.websvccommon,\
         nb.cluster.java,\
         nb.cluster.apisupport,\
         nb.cluster.nb
@@ -117,7 +116,6 @@
         nb.cluster.platform,\
         nb.cluster.harness,\
         nb.cluster.ide,\
-        nb.cluster.websvccommon,\
         nb.cluster.java
 # XXX nb.cluster.profiler
 
@@ -248,16 +246,6 @@
         api.xml,\
         classfile,\
         core.ide,\
-        db,\
-        db.core,\
-        db.dataview, \
-        db.drivers,\
-        db.kit,\
-        db.metadata.model,\
-        db.mysql,\
-        db.sql.editor,\
-        db.sql.visualeditor,\
-        dbapi,\
         defaults,\
         diff,\
         editor,\
@@ -285,7 +273,6 @@
         extbrowser,\
         glassfish.common,\
         gototest,\
-        httpserver,\
         ide.kit,\
         image,\
         jumpto,\
@@ -304,7 +291,6 @@
         libs.freemarker,\
         libs.ini4j,\
         libs.jakarta_oro,\
-        libs.jaxb,\
         libs.jsch,\
         libs.lucene,\
         libs.svnClientAdapter,\
@@ -327,7 +313,6 @@
         refactoring.api,\
         schema2beans,\
         server,\
-        servletapi,\
         spi.debugger.ui,\
         spi.editor.hints,\
         spi.navigator,\
@@ -345,7 +330,6 @@
         versioning,\
         versioning.system.cvss,\
         versioning.util,\
-        web.flyingsaucer,\
         xml,\
         xml.axi,\
         xml.catalog,\
@@ -360,14 +344,12 @@
         xml.tools,\
         xml.wsdl.model,\
         xml.xam,\
-        xml.xdm,\
-        xsl
+        xml.xdm
 
 nb.cluster.java.dir=java2
 nb.cluster.java.depends=\
         nb.cluster.ide,\
-        nb.cluster.platform,\
-        nb.cluster.websvccommon
+        nb.cluster.platform
 nb.cluster.java=\
         ant.browsetask,\
         ant.debugger,\
@@ -377,28 +359,18 @@
         api.debugger.jpda,\
         api.java,\
         beans,\
-        dbschema,\
         debugger.jpda,\
         debugger.jpda.ant,\
         debugger.jpda.projects,\
         debugger.jpda.ui,\
-        derby,\
         form,\
-        form.j2ee,\
         form.kit,\
-        hibernate,\
-        hibernatelib,\
         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,\
@@ -423,21 +395,14 @@
         javadoc,\
         javawebstart,\
         junit,\
-        libs.cglib,\
         libs.javacapi,\
         libs.javacimpl,\
-        libs.springframework,\
         o.apache.tools.ant.module,\
         o.jdesktop.beansbinding,\
         projectimport.eclipse.core,\
         projectimport.eclipse.j2se,\
         refactoring.java,\
-        spring.beans,\
         swingapp,\
-        websvc.jaxws21,\
-        websvc.jaxws21api,\
-        websvc.saas.codegen.java,\
-        xml.jaxb,\
         xml.tools.java
 
 nb.cluster.xml.dir=xml2

netbeans-6.5-70-updatecenters.patch:

--- NEW FILE netbeans-6.5-70-updatecenters.patch ---
diff -Nur netbeans-6.5/updatecenters/src/org/netbeans/modules/updatecenters/resources/Bundle.properties netbeans-6.5.new/updatecenters/src/org/netbeans/modules/updatecenters/resources/Bundle.properties
--- netbeans-6.5/updatecenters/src/org/netbeans/modules/updatecenters/resources/Bundle.properties	2008-11-10 00:14:36.000000000 +0300
+++ netbeans-6.5.new/updatecenters/src/org/netbeans/modules/updatecenters/resources/Bundle.properties	2008-12-22 22:29:21.000000000 +0300
@@ -51,9 +51,12 @@
 Services/AutoupdateType/beta-update-provider.instance=NetBeans Beta
 Services/AutoupdateType/thirdparty-update-provider.instance=3rd Party Plugins
 Services/AutoupdateType/pluginportal-update-provider.instance=Plugin Portal
+Services/AutoupdateType/standard-update-provider-fedora.instance=NetBeans for Fedora
 #NOI18N
 URL_Standard=http://updates.netbeans.org/netbeans/updates/6.5/uc/final/stable/catalog.xml.gz?{$netbeans.hash.code}
 URL_Beta=http://updates.netbeans.org/netbeans/updates/6.5/uc/final/beta/catalog.xml.gz?{$netbeans.hash.code}
 URL_ThirdParty=http://updates.netbeans.org/netbeans/updates/6.5/uc/final/thirdparty/catalog.xml.gz?{$netbeans.hash.code}
 URL_PluginPortal=http://plugins.netbeans.org/nbpluginportal/updates/6.5/catalog.xml.gz
+URL_Standard_Fedora=http://updates.netbeans.org/netbeans/updates/6.5/uc/final/fedora/catalog.xml.gz?{$netbeans.hash.code}
+
 
diff -Nur netbeans-6.5/updatecenters/src/org/netbeans/modules/updatecenters/resources/mf-layer.xml netbeans-6.5.new/updatecenters/src/org/netbeans/modules/updatecenters/resources/mf-layer.xml
--- netbeans-6.5/updatecenters/src/org/netbeans/modules/updatecenters/resources/mf-layer.xml	2008-11-10 00:14:36.000000000 +0300
+++ netbeans-6.5.new/updatecenters/src/org/netbeans/modules/updatecenters/resources/mf-layer.xml	2008-12-25 16:41:02.000000000 +0300
@@ -53,7 +53,7 @@
         <attr name="SystemFileSystem.icon" urlvalue="nbresloc:/org/netbeans/modules/updatecenters/resources/updateAction.gif"/>
         <attr name="url_key" stringvalue="URL_Standard"/>
         <attr name="category" stringvalue="STANDARD"/>
-        <attr name="enabled" boolvalue="true"/>
+        <attr name="enabled" boolvalue="false"/>
         <attr name="instanceOf" stringvalue="org.netbeans.spi.autoupdate.UpdateProvider"/>
         <attr name="instanceCreate" methodvalue="org.netbeans.modules.autoupdate.updateprovider.AutoupdateCatalogFactory.createUpdateProvider"/>        
       </file>
@@ -88,6 +88,16 @@
         <attr name="instanceCreate" methodvalue="org.netbeans.modules.autoupdate.updateprovider.AutoupdateCatalogFactory.createUpdateProvider"/>
       </file>
       
+      <file name="standard-update-provider-fedora.instance">
+        <attr name="SystemFileSystem.localizingBundle" stringvalue="org.netbeans.modules.updatecenters.resources.Bundle"/>
+        <attr name="SystemFileSystem.icon" urlvalue="nbresloc:/org/netbeans/modules/updatecenters/resources/updateAction.gif"/>
+        <attr name="url_key" stringvalue="URL_Standard_Fedora"/>
+        <attr name="category" stringvalue="STANDARD"/>
+        <attr name="enabled" boolvalue="true"/>
+        <attr name="instanceOf" stringvalue="org.netbeans.spi.autoupdate.UpdateProvider"/>
+        <attr name="instanceCreate" methodvalue="org.netbeans.modules.autoupdate.updateprovider.AutoupdateCatalogFactory.createUpdateProvider"/>        
+      </file>
+    
    </folder>
     
   </folder> <!-- Services -->

netbeans-6.5-80-nosvnkit.patch:

--- NEW FILE netbeans-6.5-80-nosvnkit.patch ---
diff -Nur netbeans-6.5/libs.svnClientAdapter/src/org/netbeans/libs/svnclientadapter/SvnClientAdapterFactory.java netbeans-6.5.new/libs.svnClientAdapter/src/org/netbeans/libs/svnclientadapter/SvnClientAdapterFactory.java
--- netbeans-6.5/libs.svnClientAdapter/src/org/netbeans/libs/svnclientadapter/SvnClientAdapterFactory.java	2008-11-10 00:13:46.000000000 +0300
+++ netbeans-6.5.new/libs.svnClientAdapter/src/org/netbeans/libs/svnclientadapter/SvnClientAdapterFactory.java	2008-12-23 19:02:11.000000000 +0300
@@ -44,7 +44,6 @@
 import org.tigris.subversion.svnclientadapter.ISVNClientAdapter;
 import org.tigris.subversion.svnclientadapter.SVNClientException;
 import org.tigris.subversion.svnclientadapter.javahl.JhlClientAdapterFactory;
-import org.tigris.subversion.svnclientadapter.svnkit.SvnKitClientAdapterFactory;
 
 /**
  *
@@ -85,8 +84,7 @@
                 return JhlClientAdapterFactory.isAvailable();
             }
             case svnkit: {
-                SvnKitClientAdapterFactory.setup();
-                return SvnKitClientAdapterFactory.isAvailable();
+                return false;
             }
         }
         return false;
@@ -98,7 +96,7 @@
                 return JhlClientAdapterFactory.createSVNClient(JhlClientAdapterFactory.JAVAHL_CLIENT);
             }
             case svnkit: {
-                return SvnKitClientAdapterFactory.createSVNClient(SvnKitClientAdapterFactory.SVNKIT_CLIENT); //provider.createClient();
+                return null;
             }
         }
         return null;


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/netbeans/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	10 Sep 2008 00:38:06 -0000	1.2
+++ .cvsignore	16 Jan 2009 16:53:05 -0000	1.3
@@ -1,2 +1 @@
-netbeans-6.1-200805300101-basic_cluster-src.zip
-netbeans-ide-launcher.zip
+netbeans-6.5-200811100001-base-src-linux.tar.gz


Index: netbeans.spec
===================================================================
RCS file: /cvs/pkgs/rpms/netbeans/devel/netbeans.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- netbeans.spec	25 Nov 2008 16:44:00 -0000	1.7
+++ netbeans.spec	16 Jan 2009 16:53:06 -0000	1.8
@@ -5,22 +5,22 @@
 
 %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_ver           6.5
+%define nb_alt_priority  650
+%define nb_release_time  200811100001
 %define nb_home          %{_datadir}/%{nb_}
 %define nb_dir           %{nb_home}/%{nb_ver}
 
-%define nb_platform_ver  8
+%define nb_platform_ver  9
 %define nb_platform      platform%{nb_platform_ver}
 %define nb_platform_dir  %{nb_home}/%{nb_platform}
-%define nb_platform_pkg  %{nb_}-%{nb_platform}
+%define nb_platform_pkg  %{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_harness_pkg   %{nb_platform_pkg}-%{nb_harness}
 
-%define nb_ide_ver       9
+%define nb_ide_ver       10
 %define nb_ide           ide%{nb_ide_ver}
 %define nb_ide_dir       %{nb_home}/%{nb_ide}
 %define nb_ide_pkg       %{nb_}-%{nb_ide}
@@ -50,11 +50,7 @@
 # %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 cluster base
 
 %define nb_icon         %{nb_nb_dir}/netbeans.png
 %define nb_launcher     %{nb_bin_dir}/netbeans
@@ -73,7 +69,8 @@
 
 # Used xml resolver
 %define xml_resolver netbeans-resolver
-%define xml_resolver_ver %{nb_ver}
+# %define xml_resolver_ver %{nb_ver}
+%define xml_resolver_ver 6.1
 %define xml_resolver_jar %{_javadir}/%{xml_resolver}-%{xml_resolver_ver}.jar
 
 # Used svn client adapter
@@ -83,18 +80,16 @@
 
 Name:           %{nb_}
 Version:        %{nb_ver}
-Release:        10%{?dist}
+Release:        1%{?dist}
 Summary:        Integrated Development Environment (IDE)
 Group:          Development/Tools
 License:        GPLv2 with exceptions or CDDL
 Vendor:         netbeans.org
 URL:            http://www.netbeans.org
-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}
+Source0: http://nbi.netbeans.org/files/documents/210/2387/%{nb_}-%{nb_ver}-%{nb_release_time}-%{cluster}-src-linux.tar.gz
+Source1: %{name}-ide.desktop-template
+%define nb_desktop_template %{SOURCE1}
 
 Patch0: %{name}-%{version}-00-copy-build.patch
 Patch1: %{name}-%{version}-10-ant-external-build.patch
@@ -108,6 +103,8 @@
 Patch6: %{name}-%{version}-60-small-ide-config.patch
 # https://bugzilla.redhat.com/show_bug.cgi?id=466179
 Patch7: %{name}-%{version}-70-updatecenters.patch
+# avoiding use svnkit
+Patch8: %{name}-%{version}-80-nosvnkit.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
@@ -118,24 +115,27 @@
 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: junit >= 3.8.2
+BuildRequires: junit4 >= 4.5
 BuildRequires: swing-layout >= 0:1.0
 BuildRequires: javahelp2 >= 2.0.05
 BuildRequires: %{nb_platform_pkg} >= %{version}
-BuildRequires: lucene >= 0:2.3.0
+BuildRequires: lucene >= 2.3.1
 BuildRequires: unzip
 BuildRequires: desktop-file-utils
-BuildRequires: netbeans-javaparser >= %{version}
+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: jsch >= 0.1.39
 BuildRequires: %{xml_resolver} >= %{xml_resolver_ver}
 BuildRequires: ini4j >= 0.3.2-4
-BuildRequires: netbeans-svnclientadapter >= %{version}
+BuildRequires: netbeans-svnclientadapter >= %{svnclientadapter_ver}
+BuildRequires: subversion-javahl >= 1.5.0
 BuildRequires: jakarta-commons-logging >= 1.0.4
+BuildRequires: jakarta-oro >= 2.0.8
+BuildRequires: %{nb_harness_pkg}    >= %{version}
 
 Requires: jpackage-utils
 Requires: java >= 1:1.6.0
@@ -144,9 +144,9 @@
 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
+Requires: lucene >= 2.3.1
+Requires: junit >= 3.8.2
+Requires: junit4 >= 4.5
 
 %description
 NetBeans IDE is an Integrated Development Environment (IDE) for Java/JavaFX, 
@@ -181,13 +181,15 @@
 Requires: jpackage-utils
 Requires: java >= 1:1.6.0
 Requires: %{nb_platform_pkg} >= %{version}
-Requires: jsch >= 0.1.24
+Requires: jsch >= 0.1.39
 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}
+Requires: subversion-javahl >= 1.5.0
 Requires: jakarta-commons-logging >= 1.0.4
+Requires: jakarta-oro >= 2.0.8
 Provides: libnb-%{nb_ide} = %{version}
 
 %description %{nb_ide}
@@ -215,10 +217,10 @@
 Common libraries for the NetBeans Java IDE.
 
 %prep
-%setup -q -c
-%setup -q -T -D -a 1
+%setup -q
 
 find . -type f \( -iname "*.jar" -o -iname "*.zip" \) -print0 | xargs -t -0 %{__rm} -f
+find . -type f \( -iname "binaries-list" \) | xargs -t %{__rm} -f
 
 # Generate stub jar file, so there is something in jsr223  module.
 %{__mkdir_p} libs.jsr223/src/javax/script
@@ -248,6 +250,7 @@
 %patch5 -p1 -b .sav
 %patch6 -p1 -b .sav
 %patch7 -p1 -b .sav
+%patch8 -p1 -b .sav
 
 %build
 
@@ -256,26 +259,30 @@
 
 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 %{_javadir}/jsch.jar ${IDE_EXT_DIR}/jsch-0.1.39.jar
 %{__ln_s} -f %{xml_resolver_jar} ${IDE_EXT_DIR}/resolver-1.2.jar
 %{__ln_s} -f %{_javadir}/ini4j.jar  ${IDE_EXT_DIR}/ini4j-0.2.6.jar
 # 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 %{svnclientadapter_jar} ${IDE_EXT_DIR}/svnClientAdapter-1.4.0.jar
+%{__ln_s} -f %{_javadir}/svn-javahl.jar  ${IDE_EXT_DIR}/svnjavahl-1.5.0.jar
 %{__ln_s} -f %{_javadir}/xerces-j2.jar  ${IDE_EXT_DIR}/xerces-2.8.0.jar
-%{__ln_s} -f %{_javadir}/lucene.jar  ${IDE_EXT_DIR}/lucene-core-2.2.0.jar
+%{__ln_s} -f %{_javadir}/lucene.jar  ${IDE_EXT_DIR}/lucene-core-2.3.2.jar
 %{__ln_s} -f %{_javadir}/commons-logging.jar ${IDE_EXT_DIR}/commons-logging-1.0.4.jar
+%{__ln_s} -f %{_javadir}/jakarta-oro.jar ${IDE_EXT_DIR}/jakarta-oro-2.0.8.jar
 
 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}/netbeans-javaparser-api-%{version}.jar ${JAVA_EXT_DIR}/javac-api-nb-7.0-b07.jar
+%{__ln_s} -f %{_javadir}/netbeans-javaparser-impl-%{version}.jar ${JAVA_EXT_DIR}/javac-impl-nb-7.0-b07.jar
 %{__ln_s} -f %{_javadir}/appframework.jar ${JAVA_EXT_DIR}/appframework-1.0.3.jar
 %{__ln_s} -f %{_javadir}/beansbinding.jar ${JAVA_EXT_DIR}/beansbinding-1.2.1.jar
-%{__ln_s} -f %{_javadir}/junit4.jar ${JAVA_EXT_DIR}/junit-4.1.jar
+%{__ln_s} -f %{_javadir}/junit4.jar ${JAVA_EXT_DIR}/junit-4.5.jar
 %{__ln_s} -f %{_javadir}/junit.jar ${JAVA_EXT_DIR}/junit-3.8.2.jar
 
+%{__ln_s} -f %{nb_harness_dir} nbbuild/netbeans/harness
+
 %{ant_nb_opt} \
     -Do.n.core.dir=%{nb_platform_dir} \
     -Dnb.cluster.platform-is-built=true \
@@ -295,21 +302,23 @@
 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}/jsch-0.1.39.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}/svnClientAdapter-1.4.0.jar
+%{__rm} -f ${IDE_EXT_DIR}/svnjavahl-1.5.0.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}/lucene-core-2.3.2.jar
 %{__rm} -f ${IDE_EXT_DIR}/commons-logging-1.0.4.jar
+%{__rm} -f ${IDE_EXT_DIR}/jakarta-oro-2.0.8.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-4.5.jar
 %{__rm} -f ${JAVA_EXT_DIR}/junit-3.8.2.jar
 
 # clean up the stub jar
@@ -332,36 +341,41 @@
 
 # Install apisupport
 install_package %{buildroot}%{nb_apisupport_dir} nbbuild/netbeans/%{nb_apisupport}/*
+%noautoupdate %{buildroot}%{nb_apisupport_dir}
 
 # Install ide
 install_package %{buildroot}%{nb_ide_dir} nbbuild/netbeans/%{nb_ide}/*
+%noautoupdate %{buildroot}%{nb_ide_dir}
 
 # linking the ide to the external JARs
 IDE_EXT_DIR=%{buildroot}%{nb_ide_dir}/modules/ext
-%{__ln_s} -f %{_javadir}/jsch.jar ${IDE_EXT_DIR}/jsch-0.1.24.jar
+%{__ln_s} -f %{_javadir}/jsch.jar ${IDE_EXT_DIR}/jsch-0.1.39.jar
 %{__ln_s} -f %{xml_resolver_jar} ${IDE_EXT_DIR}/resolver-1.2.jar
 %{__ln_s} -f %{_javadir}/ini4j.jar  ${IDE_EXT_DIR}/ini4j-0.2.6.jar
 # 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 %{svnclientadapter_jar} ${IDE_EXT_DIR}/svnClientAdapter-1.4.0.jar
+%{__ln_s} -f %{_javadir}/svn-javahl.jar  ${IDE_EXT_DIR}/svnjavahl-1.5.0.jar
 %{__ln_s} -f %{_javadir}/xerces-j2.jar  ${IDE_EXT_DIR}/xerces-2.8.0.jar
-%{__ln_s} -f %{_javadir}/lucene.jar  ${IDE_EXT_DIR}/lucene-core-2.2.0.jar
+%{__ln_s} -f %{_javadir}/lucene.jar  ${IDE_EXT_DIR}/lucene-core-2.3.2.jar
 %{__ln_s} -f %{_javadir}/commons-logging.jar ${IDE_EXT_DIR}/commons-logging-1.0.4.jar
+%{__ln_s} -f %{_javadir}/jakarta-oro.jar ${IDE_EXT_DIR}/jakarta-oro-2.0.8.jar
 
 # 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
+%noautoupdate %{buildroot}%{nb_java_dir}
 
 # 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}/netbeans-javaparser-api-%{version}.jar ${JAVA_EXT_DIR}/javac-api-nb-7.0-b07.jar
+%{__ln_s} -f %{_javadir}/netbeans-javaparser-impl-%{version}.jar ${JAVA_EXT_DIR}/javac-impl-nb-7.0-b07.jar
 %{__ln_s} -f %{_javadir}/appframework.jar ${JAVA_EXT_DIR}/appframework-1.0.3.jar
 %{__ln_s} -f %{_javadir}/beansbinding.jar ${JAVA_EXT_DIR}/beansbinding-1.2.1.jar
-%{__ln_s} -f %{_javadir}/junit4.jar ${JAVA_EXT_DIR}/junit-4.1.jar
+%{__ln_s} -f %{_javadir}/junit4.jar ${JAVA_EXT_DIR}/junit-4.5.jar
 %{__ln_s} -f %{_javadir}/junit.jar ${JAVA_EXT_DIR}/junit-3.8.2.jar
 
 JAVA_ANT_DIR=%{buildroot}%{nb_java_dir}/ant
@@ -386,9 +400,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/nbX.X config
 echo -n "%{nb_distro_id}" > %{buildroot}%{nb_nb_config_dir}/productid
+%noautoupdate %{buildroot}%{nb_nb_dir}
 
 # Links to nbX.X components
 %{__ln_s} ../%{nb_harness}    %{buildroot}%{nb_dir}/%{nb_harness}
@@ -409,31 +423,11 @@
 
 %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,-)
@@ -447,24 +441,44 @@
 %doc %{nb_dir}/README.html
 %{nb_dir}/netbeans.css
 %dir %{_datadir}/applications/%{nb_org}/
+%{nb_nb_dir}/.noautoupdate
 %{_datadir}/applications/%{nb_org}/%{nb_desktop}
 
 %files %{nb_apisupport}
 %defattr(-,root,root,-)
 %{nb_apisupport_dir}/
+%{nb_apisupport_dir}/.noautoupdate
 %doc nbbuild/standard-nbm-license.txt
 
 %files %{nb_ide}
 %defattr(-,root,root,-)
 %{nb_ide_dir}/
+%{nb_ide_dir}/.noautoupdate
 %doc nbbuild/standard-nbm-license.txt
 
 %files %{nb_java}
 %defattr(-,root,root,-)
 %{nb_java_dir}/
+%{nb_java_dir}/.noautoupdate
 %doc nbbuild/standard-nbm-license.txt
 
 %changelog
+* Tue Dec 09 2008 Victor Vasilyev <victor.vasilyev at sun.com> 6.5-1
+- Bootstrapping of the spec for IDE of the NetBeans 6.5
+- Removing of all binaries-list files
+- New dependency on jakarta-oro-2.0.8.jar is added
+- The Distribution tag is removed
+- jsch 0.1.24 -> 0.1.39
+- lucene 2.2.0 -> 2.3.1 (2.3.2)
+- netbeans-javaparser 6.1 -> 6.5
+- junit4 4.1 -> 4.5
+- netbeans-platform9 -> netbeans-platform
+- netbeans-platform9-harness -> netbeans-platform-harness
+- BR netbeans-platform-harness
+- svnClientAdapter 0.9.23 -> 1.4.0
+- B(R) subversion-javahl >= 1.5.0
+- Creation of the .noautoupdate files is  moved to the install section
+
 * Tue Nov 25 2008 Victor G. Vasilyev <victor.vasilyev at sun.com> 6.1-10
 - Explicit dependencies on the jakarta-commons-logging package are added (#472825).
 - Summary is fixed according to the request of the Richard Hughes <hughsient at gmail.com>.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/netbeans/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	10 Sep 2008 00:38:06 -0000	1.2
+++ sources	16 Jan 2009 16:53:06 -0000	1.3
@@ -1,2 +1 @@
-a7ea855f475fa3a982f094a45c155ab4  netbeans-6.1-200805300101-basic_cluster-src.zip
-71d0c9c582c4ae420ba1f2358da6df06  netbeans-ide-launcher.zip
+836d358b43f76c01cca10b943e7cd718  netbeans-6.5-200811100001-base-src-linux.tar.gz


--- netbeans-6.1-00-copy-build.patch DELETED ---


--- netbeans-6.1-10-ant-external-build.patch DELETED ---


--- netbeans-6.1-20-ant-build.patch DELETED ---


--- netbeans-6.1-30-parse-project-xml.patch DELETED ---


--- netbeans-6.1-40-build-xml.patch DELETED ---


--- netbeans-6.1-50-ide-launcher.patch DELETED ---


--- netbeans-6.1-60-small-ide-config.patch DELETED ---


--- netbeans-6.1-70-updatecenters.patch DELETED ---



From pkgdb at fedoraproject.org  Fri Jan 16 17:05:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 16 Jan 2009 17:05:15 +0000
Subject: [pkgdb] goocanvas: denis has requested commit
Message-ID: <20090116170515.831C4208203@bastion.fedora.phx.redhat.com>

denis has requested the commit acl on goocanvas (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/goocanvas



From pkgdb at fedoraproject.org  Fri Jan 16 17:05:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 16 Jan 2009 17:05:33 +0000
Subject: [pkgdb] goocanvas: denis has requested commit
Message-ID: <20090116170534.59DD6208203@bastion.fedora.phx.redhat.com>

denis has requested the commit acl on goocanvas (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/goocanvas



From tmraz at fedoraproject.org  Fri Jan 16 17:05:57 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 16 Jan 2009 17:05:57 +0000 (UTC)
Subject: rpms/gyachi/devel gyachi.spec,1.39,1.40
Message-ID: <20090116170557.0A9DA70127@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/gyachi/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3937

Modified Files:
	gyachi.spec 
Log Message:
* Fri Jan 16 2009 Tomas Mraz <tmraz at redhat.com> - 1.1.61-2
- rebuild with new openssl



Index: gyachi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gyachi/devel/gyachi.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- gyachi.spec	3 Jan 2009 15:43:25 -0000	1.39
+++ gyachi.spec	16 Jan 2009 17:05:26 -0000	1.40
@@ -27,7 +27,7 @@
 
 Name:		gyachi
 Version:	1.1.61
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	A Yahoo! chat client with Webcam and voice support
 
 Group:		Applications/Internet
@@ -391,6 +391,9 @@
 
 
 %changelog
+* Fri Jan 16 2009 Tomas Mraz <tmraz at redhat.com> - 1.1.61-2
+- rebuild with new openssl
+
 * Sat Jan 03 2009 Gregory D Hosler <ghosler at users.sourceforge.net> - 1.1.61.1
 - Add fix for segfault in file transfer.
 



From tmraz at fedoraproject.org  Fri Jan 16 17:06:42 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 16 Jan 2009 17:06:42 +0000 (UTC)
Subject: rpms/heartbeat/devel heartbeat.spec,1.26,1.27
Message-ID: <20090116170642.F29DE70127@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/heartbeat/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4017

Modified Files:
	heartbeat.spec 
Log Message:
* Fri Jan 16 2009 Tomas Mraz <tmraz at redhat.com> - 2.1.4-3
- rebuild with new openssl



Index: heartbeat.spec
===================================================================
RCS file: /cvs/pkgs/rpms/heartbeat/devel/heartbeat.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- heartbeat.spec	4 Dec 2008 17:56:34 -0000	1.26
+++ heartbeat.spec	16 Jan 2009 17:06:12 -0000	1.27
@@ -6,7 +6,7 @@
 Summary:          Heartbeat subsystem for High-Availability Linux
 Name:             heartbeat
 Version:          2.1.4
-Release:          2%{?dist}
+Release:          3%{?dist}
 License:          GPLv2 and LGPLv2+
 URL:              http://linux-ha.org/
 Group:            System Environment/Daemons
@@ -341,6 +341,9 @@
 %{_bindir}/hb_gui
 
 %changelog
+* Fri Jan 16 2009 Tomas Mraz <tmraz at redhat.com> - 2.1.4-3
+- rebuild with new openssl
+
 * Thu Dec 04 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 2.1.4-2
 - Rebuild for Python 2.6
 



From thm at fedoraproject.org  Fri Jan 16 17:16:21 2009
From: thm at fedoraproject.org (Thomas Moschny)
Date: Fri, 16 Jan 2009 17:16:21 +0000 (UTC)
Subject: rpms/waf/devel waf-1.5.2-book.patch, NONE,
	1.1 waf-1.5.2-libdir.patch, 
	NONE, 1.1 waf-1.5.2-stylesheet.patch, NONE, 1.1 .cvsignore, 1.7,
	1.8 import.log, 1.2, 1.3 sources, 1.7, 1.8 waf.spec, 1.9,
	1.10 waf-1.4.4-libdir.patch, 1.1, NONE
Message-ID: <20090116171621.C089B70127@cvs1.fedora.phx.redhat.com>

Author: thm

Update of /cvs/pkgs/rpms/waf/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5009/devel

Modified Files:
	.cvsignore import.log sources waf.spec 
Added Files:
	waf-1.5.2-book.patch waf-1.5.2-libdir.patch 
	waf-1.5.2-stylesheet.patch 
Removed Files:
	waf-1.4.4-libdir.patch 
Log Message:
Update to 1.5.2.

waf-1.5.2-book.patch:

--- NEW FILE waf-1.5.2-book.patch ---
Index: doc/book/c_builds.xml
===================================================================
--- doc/book/c_builds.xml	(revision 5461)
+++ doc/book/c_builds.xml	(revision 5462)
@@ -67,20 +67,20 @@
 	main.source = 'main.c'
 	main.target = 'test_c_program'
 	main.includes = '.'
-	main.uselib_local = 'teststaticlib' <co id="uselib-co" linkends="b4"/>
+	main.uselib_local = 'teststaticlib' <co id="uselib2-co" linkends="b4"/>
 			</programlisting>
 
 			<calloutlist>
 				<callout arearefs="lib-co" id="b1">
 					<para>A static library</para>
 				</callout>
-				<callout arearefs="lib-co" id="b2">
+				<callout arearefs="uselib-co" id="b2">
 					<para>Include paths to export for use with uselib_local (include paths are not added automatically). These folders are taken relatively to the current target.</para>
 				</callout>
 				<callout arearefs="prog-co" id="b3">
 					<para>A program using the static library declared previously</para>
 				</callout>
-				<callout arearefs="uselib-co" id="b4">
+				<callout arearefs="uselib2-co" id="b4">
 					<para>A list of references to existing libraries declared in the project (either a python list or a string containing the names space-separated)</para>
 				</callout>
 			</calloutlist>

waf-1.5.2-libdir.patch:

--- NEW FILE waf-1.5.2-libdir.patch ---
diff -up waf-1.5.2/waf-light.orig waf-1.5.2/waf-light
--- waf-1.5.2/waf-light.orig	2008-12-22 00:31:57.000000000 +0100
+++ waf-1.5.2/waf-light	2009-01-16 17:13:00.000000000 +0100
@@ -102,7 +102,7 @@ def find_lib():
 		if w: return w
 		err("waf-light requires wafadmin -> export WAFDIR=/folder")
 
-	dir = "/lib/waf-%s-%s/" % (VERSION, REVISION)
+	dir = "/share/waf/"
 	for i in [INSTALL,'/usr','/usr/local','/opt']:
 		w = test(i+dir)
 		if w: return w
diff -up waf-1.5.2/wscript.orig waf-1.5.2/wscript
--- waf-1.5.2/wscript.orig	2008-12-22 00:31:57.000000000 +0100
+++ waf-1.5.2/wscript	2009-01-16 17:13:00.000000000 +0100
@@ -318,7 +318,7 @@ def build(bld):
 		if val != True and val != "y": sys.exit(1)
 		create_waf()
 
-	dir = os.path.join('lib', 'waf-%s-%s' % (VERSION, REVISION), 'wafadmin')
+	dir = os.path.join('share', 'waf', 'wafadmin')
 
 	wafadmin = bld.new_task_gen('py')
 	wafadmin.find_sources_in_dirs('wafadmin', exts=['.py'])

waf-1.5.2-stylesheet.patch:

--- NEW FILE waf-1.5.2-stylesheet.patch ---
diff -up waf-1.5.2/doc/book/wscript.orig waf-1.5.2/doc/book/wscript
--- waf-1.5.2/doc/book/wscript.orig	2008-12-22 00:30:46.000000000 +0100
+++ waf-1.5.2/doc/book/wscript	2009-01-16 17:35:02.000000000 +0100
@@ -87,8 +87,8 @@ def build(bld):
 	obj.source = 'waf.xml'
 
 	obj.type = 'html'
-	obj.stylesheet='/usr/share/xml/docbook/stylesheet/nwalsh/current/html/chunk.xsl'
-	#obj.stylesheet='/usr/share/sgml/docbook/xsl-stylesheets/html/chunk.xsl'
+	#obj.stylesheet='/usr/share/xml/docbook/stylesheet/nwalsh/current/html/chunk.xsl'
+	obj.stylesheet='/usr/share/sgml/docbook/xsl-stylesheets/html/chunk.xsl'
 	#obj.stylesheet = '/home/tnagy/docbook-xsl-snapshot/html/chunk.xsl'
 
 	#obj.type = 'pdf'


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/waf/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	31 Aug 2008 20:49:53 -0000	1.7
+++ .cvsignore	16 Jan 2009 17:15:51 -0000	1.8
@@ -1 +1 @@
-waf-1.4.4.tar.bz2
+waf-1.5.2.tar.bz2


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/waf/devel/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	31 Aug 2008 20:49:53 -0000	1.2
+++ import.log	16 Jan 2009 17:15:51 -0000	1.3
@@ -1,2 +1,3 @@
 waf-1_4_3-1_fc9:HEAD:waf-1.4.3-1.fc9.src.rpm:1214694119
 waf-1_4_4-1_fc9:HEAD:waf-1.4.4-1.fc9.src.rpm:1220215604
+waf-1_5_2-1_fc10:HEAD:waf-1.5.2-1.fc10.src.rpm:1232126058


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/waf/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	31 Aug 2008 20:49:53 -0000	1.7
+++ sources	16 Jan 2009 17:15:51 -0000	1.8
@@ -1 +1 @@
-6a809e446497b710592579772c8b22bd  waf-1.4.4.tar.bz2
+7b84bb61b447ec13021b883cf86e4770  waf-1.5.2.tar.bz2


Index: waf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/waf/devel/waf.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- waf.spec	1 Dec 2008 15:00:54 -0000	1.9
+++ waf.spec	16 Jan 2009 17:15:51 -0000	1.10
@@ -1,29 +1,34 @@
 Name:           waf
-Version:        1.4.4
-Release:        2%{?dist}
+Version:        1.5.2
+Release:        1%{?dist}
 Summary:        A Python-based build system
-
 Group:          Development/Tools
 # The entire source code is BSD apart from pproc.py (taken from Python 2.5)
 License:        BSD and Python
 URL:            http://code.google.com/p/waf/
-Source0:        http://waf.googlecode.com/files/waf-%{version}.tar.bz2
+Source:         http://waf.googlecode.com/files/waf-%{version}.tar.bz2
 # use _datadir instead of /usr/lib
-Patch0:         waf-1.4.4-libdir.patch
-
+Patch0:         waf-1.5.2-libdir.patch
+Patch1:         waf-1.5.2-stylesheet.patch
+# r5462 from trunk
+Patch2:         waf-1.5.2-book.patch
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildArch:      noarch
-
 BuildRequires:  python-devel
+# for building the documentation
+BuildRequires:  /usr/bin/xsltproc
+BuildRequires:  docbook-style-xsl
 # Seems like automatic ABI dependency is not detected since the files are
 # going to a non-standard location
-Requires:   python-abi %(%{__python} -c "import sys ; print \"=\", sys.version[:3]")
+Requires:       python-abi %(%{__python} -c "import sys ; print \"=\", sys.version[:3]")
+
 
 # the demo suite contains a perl module, which draws in unwanted
 # provides and requires
 %define __perl_provides %{nil}
 %define __perl_requires %{nil}
 
+
 %description
 Waf is a Python-based framework for configuring, compiling and
 installing applications. It is a replacement for other tools such as
@@ -33,25 +38,28 @@
 %prep
 %setup -q
 %patch0 -p1 -b .libdir
+%patch1 -p1 -b .stylesheet
+%patch2 -p0 -b .book
 
 
 %build
 ./waf-light configure --prefix=%{_prefix}
 ./waf-light --make-waf --strip
 
+(cd doc/book ; ../../waf configure && ../../waf)
+
 
 %install
-%{__rm} -rf $RPM_BUILD_ROOT
+%{__rm} -rf %{buildroot}
 
-# the install target wants an acknowledgement
-echo y | ./waf install --destdir=$RPM_BUILD_ROOT
+./waf install --yes --destdir=%{buildroot}
 
 # remove shebangs from all scripts in wafadmin
-find $RPM_BUILD_ROOT%{_datadir}/waf/wafadmin -name '*.py' \
+find %{buildroot}%{_datadir}/waf/wafadmin -name '*.py' \
      -exec %{__sed} -i '1{/^#!/d}' {} \;
 
 # fix waf script shebang line
-%{__sed} -i "1c#! /usr/bin/python" $RPM_BUILD_ROOT%{_bindir}/waf
+%{__sed} -i "1c#! /usr/bin/python" %{buildroot}%{_bindir}/waf
 
 # fix EOL
 %{__sed} -i 's|\r$||g' utils/amtool.py
@@ -62,25 +70,37 @@
 # remove zero-length files
 %{__rm} demos/gnome/src/hello.h
 %{__rm} demos/simple_scenarios/local_tool/uh.coin
+%{__rm} doc/book/build/default/waf.html
 
 # bash completion
 %{__install} -D -p -m 0644 utils/waf-completion.bash \
   %{buildroot}%{_sysconfdir}/bash_completion.d//waf-completion.bash
 
+# basically giving it a better name
+%{__mv} doc/book/build/default doc/html
+
 
 %clean
-%{__rm} -rf $RPM_BUILD_ROOT
+%{__rm} -rf %{buildroot}
 
 
 %files
 %defattr(-,root,root,-)
-%doc README TODO ChangeLog demos doc/waf.pdf utils
+%doc README TODO ChangeLog demos utils
+%doc doc/html
 %{_bindir}/waf
 %{_datadir}/waf
 %{_sysconfdir}/bash_completion.d
 
 
 %changelog
+* Fri Jan 16 2009 Thomas Moschny <thomas.moschny at gmx.de> - 1.5.2-1
+- Update to 1.5.2.
+- Generate html documentation (though without highlighting).
+
+* Fri Dec 19 2008 Thomas Moschny <thomas.moschny at gmx.de> - 1.5.1-1
+- Update to 1.5.1.
+
 * Mon Dec 01 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 1.4.4-2
 - Rebuild for Python 2.6
 


--- waf-1.4.4-libdir.patch DELETED ---



From mnagy at fedoraproject.org  Fri Jan 16 17:23:12 2009
From: mnagy at fedoraproject.org (Martin Nagy)
Date: Fri, 16 Jan 2009 17:23:12 +0000 (UTC)
Subject: rpms/vsftpd/devel vsftpd-2.1.0-build_ssl.patch, NONE,
	1.1 vsftpd-2.1.0-configuration.patch, NONE,
	1.1 vsftpd-2.1.0-filter.patch, NONE, 1.1 vsftpd-2.1.0-libs.patch,
	NONE, 1.1 vsftpd-2.1.0-pam_hostname.patch, NONE,
	1.1 vsftpd-2.1.0-tcp_wrappers.patch, NONE,
	1.1 vsftpd-2.1.0-userlist_log.patch, NONE,
	1.1 vsftpd-2.1.0-warnings.patch, NONE, 1.1 .cvsignore, 1.14,
	1.15 sources, 1.14, 1.15 vsftpd.spec, 1.83,
	1.84 vsftpd-1.0.1-missingok.patch, 1.1,
	NONE vsftpd-1.1.3-rh.patch, 1.4,
	NONE vsftpd-1.2.1-conffile.patch, 1.1,
	NONE vsftpd-1.2.1-nonrootconf.patch, 1.3,
	NONE vsftpd-1.5.1-libs.patch, 1.1,
	NONE vsftpd-2.0.1-build_ssl.patch, 1.2,
	NONE vsftpd-2.0.1-dir.patch, 1.1,
	NONE vsftpd-2.0.1-server_args.patch, 1.1,
	NONE vsftpd-2.0.1-tcp_wrappers.patch, 1.1,
	NONE vsftpd-2.0.2-signal.patch, 1.1,
	NONE vsftpd-2.0.3-background.patch, 1.1,
	NONE vsftpd-2.0.3-daemonize_fds.patch, 1.2,
	NONE vsftpd-2.0.3-pam_hostname.patch, 1.1,
	NONE vsftpd-2.0.4-filter.patch, 1.2,
	NONE vsftpd-2.0.5-add_ipv6_option.patch, 1.1,
	NONE vsftpd-2.0.5-bind_denied.patch, 1.2,
	NONE vsftpd-2.0.5-correct_comments.patch, 1.2,
	NONE vsftpd-2.0.5-default_ipv6.patch, 1.1,
	NONE vsftpd-2.0.5-fix_unique.patch, 1.1,
	NONE vsftpd-2.0.5-man.patch, 1.1,
	NONE vsftpd-2.0.5-pam_end.patch, 1.1,
	NONE vsftpd-2.0.5-pasv_dot.patch, 1.1,
	NONE vsftpd-2.0.5-uname_size.patch, 1.1,
	NONE vsftpd-2.0.5-underscore_uname.patch, 1.1,
	NONE vsftpd-2.0.5-write_race.patch, 1.2,
	NONE vsftpd-2.0.6-listen.patch, 1.1,
	NONE vsftpd-2.0.6-userlist_log.patch, 1.1, NONE
Message-ID: <20090116172312.94C7D70127@cvs1.fedora.phx.redhat.com>

Author: mnagy

Update of /cvs/extras/rpms/vsftpd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6538

Modified Files:
	.cvsignore sources vsftpd.spec 
Added Files:
	vsftpd-2.1.0-build_ssl.patch vsftpd-2.1.0-configuration.patch 
	vsftpd-2.1.0-filter.patch vsftpd-2.1.0-libs.patch 
	vsftpd-2.1.0-pam_hostname.patch 
	vsftpd-2.1.0-tcp_wrappers.patch 
	vsftpd-2.1.0-userlist_log.patch vsftpd-2.1.0-warnings.patch 
Removed Files:
	vsftpd-1.0.1-missingok.patch vsftpd-1.1.3-rh.patch 
	vsftpd-1.2.1-conffile.patch vsftpd-1.2.1-nonrootconf.patch 
	vsftpd-1.5.1-libs.patch vsftpd-2.0.1-build_ssl.patch 
	vsftpd-2.0.1-dir.patch vsftpd-2.0.1-server_args.patch 
	vsftpd-2.0.1-tcp_wrappers.patch vsftpd-2.0.2-signal.patch 
	vsftpd-2.0.3-background.patch vsftpd-2.0.3-daemonize_fds.patch 
	vsftpd-2.0.3-pam_hostname.patch vsftpd-2.0.4-filter.patch 
	vsftpd-2.0.5-add_ipv6_option.patch 
	vsftpd-2.0.5-bind_denied.patch 
	vsftpd-2.0.5-correct_comments.patch 
	vsftpd-2.0.5-default_ipv6.patch vsftpd-2.0.5-fix_unique.patch 
	vsftpd-2.0.5-man.patch vsftpd-2.0.5-pam_end.patch 
	vsftpd-2.0.5-pasv_dot.patch vsftpd-2.0.5-uname_size.patch 
	vsftpd-2.0.5-underscore_uname.patch 
	vsftpd-2.0.5-write_race.patch vsftpd-2.0.6-listen.patch 
	vsftpd-2.0.6-userlist_log.patch 
Log Message:
* Fri Jan 16 2009 Martin Nagy <mnagy at redhat.com> - 2.1.0-0.1.pre3
- update to latest upstream release
- cleanup the spec file
- drop patches fixed upstream:
    vsftpd-1.0.1-missingok.patch
    vsftpd-1.2.1-nonrootconf.patch
    vsftpd-2.0.1-tcp_wrappers.patch
    vsftpd-2.0.2-signal.patch
    vsftpd-2.0.3-daemonize_fds.patch
    vsftpd-2.0.5-correct_comments.patch
    vsftpd-2.0.5-pasv_dot.patch
    vsftpd-2.0.5-write_race.patch
    vsftpd-2.0.5-fix_unique.patch
    vsftpd-2.0.5-uname_size.patch
    vsftpd-2.0.5-bind_denied.patch
    vsftpd-2.0.5-pam_end.patch
    vsftpd-2.0.5-underscore_uname.patch
    vsftpd-2.0.6-listen.patch
- join all configuration patches into one:
    vsftpd-1.1.3-rh.patch
    vsftpd-1.2.1-conffile.patch
    vsftpd-2.0.1-dir.patch
    vsftpd-2.0.1-server_args.patch
    vsftpd-2.0.3-background.patch
    vsftpd-2.0.5-default_ipv6.patch
    vsftpd-2.0.5-add_ipv6_option.patch
    vsftpd-2.0.5-man.patch


vsftpd-2.1.0-build_ssl.patch:

--- NEW FILE vsftpd-2.1.0-build_ssl.patch ---
diff -up vsftpd-2.1.0/builddefs.h.build_ssl vsftpd-2.1.0/builddefs.h
--- vsftpd-2.1.0/builddefs.h.build_ssl	2009-01-08 18:49:33.000000000 +0100
+++ vsftpd-2.1.0/builddefs.h	2009-01-08 18:49:41.000000000 +0100
@@ -3,7 +3,7 @@
 
 #undef VSF_BUILD_TCPWRAPPERS
 #define VSF_BUILD_PAM
-#undef VSF_BUILD_SSL
+#define VSF_BUILD_SSL
 
 #endif /* VSF_BUILDDEFS_H */
 

vsftpd-2.1.0-configuration.patch:

--- NEW FILE vsftpd-2.1.0-configuration.patch ---
diff -up vsftpd-2.1.0/defs.h.configuration vsftpd-2.1.0/defs.h
--- vsftpd-2.1.0/defs.h.configuration	2009-01-08 18:01:13.000000000 +0100
+++ vsftpd-2.1.0/defs.h	2009-01-08 18:01:23.000000000 +0100
@@ -1,7 +1,7 @@
 #ifndef VSF_DEFS_H
 #define VSF_DEFS_H
 
-#define VSFTP_DEFAULT_CONFIG    "/etc/vsftpd.conf"
+#define VSFTP_DEFAULT_CONFIG    "/etc/vsftpd/vsftpd.conf"
 
 #define VSFTP_COMMAND_FD        0
 
diff -up vsftpd-2.1.0/EXAMPLE/INTERNET_SITE_NOINETD/README.configuration vsftpd-2.1.0/EXAMPLE/INTERNET_SITE_NOINETD/README
--- vsftpd-2.1.0/EXAMPLE/INTERNET_SITE_NOINETD/README.configuration	2009-01-08 18:17:07.000000000 +0100
+++ vsftpd-2.1.0/EXAMPLE/INTERNET_SITE_NOINETD/README	2009-01-08 18:15:07.000000000 +0100
@@ -17,7 +17,7 @@ even per-connect-IP configurability.
 
 To use this example config:
 
-1) Copy the vsftpd.conf file in this directory to /etc/vsftpd.conf.
+1) Copy the vsftpd.conf file in this directory to /etc/vsftpd/vsftpd.conf.
 
 2) Start up vsftpd, e.g.
 vsftpd &
@@ -51,5 +51,5 @@ in the vsftpd.conf:
 listen_address=192.168.1.2
 
 And launch vsftpd with a specific config file like this:
-vsftpd /etc/vsftpd.conf.site1 &
+vsftpd /etc/vsftpd/vsftpd.conf.site1 &
 
diff -up vsftpd-2.1.0/EXAMPLE/INTERNET_SITE/README.configuration vsftpd-2.1.0/EXAMPLE/INTERNET_SITE/README
--- vsftpd-2.1.0/EXAMPLE/INTERNET_SITE/README.configuration	2009-01-08 18:15:29.000000000 +0100
+++ vsftpd-2.1.0/EXAMPLE/INTERNET_SITE/README	2009-01-08 18:16:13.000000000 +0100
@@ -41,13 +41,13 @@ no_access               = 192.168.1.3
 As an example of how to ban certain sites from connecting, 192.168.1.3 will
 be denied access.
 
-banner_fail             = /etc/vsftpd.busy_banner
+banner_fail             = /etc/vsftpd/busy_banner
 
 This is the file to display to users if the connection is refused for whatever
 reason (too many users, IP banned).
 
 Example of how to populate it:
-echo "421 Server busy, please try later." > /etc/vsftpd.busy_banner
+echo "421 Server busy, please try later." > /etc/vsftpd/busy_banner
 
 log_on_success          += PID HOST DURATION
 log_on_failure          += HOST
@@ -62,7 +62,7 @@ Step 2) Set up your vsftpd configuration
 
 An example file is supplied. Install it like this:
 
-cp vsftpd.conf /etc
+cp vsftpd.conf /etc/vsftpd
 
 Let's example the contents of the file:
 
diff -up vsftpd-2.1.0/EXAMPLE/PER_IP_CONFIG/README.configuration vsftpd-2.1.0/EXAMPLE/PER_IP_CONFIG/README
--- vsftpd-2.1.0/EXAMPLE/PER_IP_CONFIG/README.configuration	2009-01-08 18:19:14.000000000 +0100
+++ vsftpd-2.1.0/EXAMPLE/PER_IP_CONFIG/README	2009-01-08 18:19:35.000000000 +0100
@@ -20,12 +20,12 @@ directory: hosts.allow. It lives at /etc
 
 Let's have a look at the example:
 
-vsftpd: 192.168.1.3: setenv VSFTPD_LOAD_CONF /etc/vsftpd_tcp_wrap.conf
+vsftpd: 192.168.1.3: setenv VSFTPD_LOAD_CONF /etc/vsftpd/tcp_wrap.conf
 vsftpd: 192.168.1.4: DENY
 
 The first line:
 If a client connects from 192.168.1.3, then vsftpd will apply the vsftpd
-config file /etc/vsftpd_tcp_wrap.conf to the session! These settings are
+config file /etc/vsftpd/tcp_wrap.conf to the session! These settings are
 applied ON TOP of the default vsftpd.conf.
 This is obviously very powerful. You might use this to apply different
 access restrictions for some IPs (e.g. the ability to upload).
diff -up vsftpd-2.1.0/EXAMPLE/VIRTUAL_USERS/README.configuration vsftpd-2.1.0/EXAMPLE/VIRTUAL_USERS/README
--- vsftpd-2.1.0/EXAMPLE/VIRTUAL_USERS/README.configuration	2009-01-08 18:18:04.000000000 +0100
+++ vsftpd-2.1.0/EXAMPLE/VIRTUAL_USERS/README	2009-01-08 18:18:53.000000000 +0100
@@ -15,7 +15,7 @@ See example file "logins.txt" - this spe
 "fred" with password "bar".
 Whilst logged in as root, create the actual database file like this:
 
-db_load -T -t hash -f logins.txt /etc/vsftpd_login.db
+db_load -T -t hash -f logins.txt /etc/vsftpd/login.db
 (Requires the Berkeley db program installed).
 NOTE: Many systems have multiple versions of "db" installed, so you may
 need to use e.g. db3_load for correct operation. This is known to affect
@@ -23,10 +23,10 @@ some Debian systems. The core issue is t
 database to be a specific db version (often db3, whereas db4 may be installed
 on your system).
 
-This will create /etc/vsftpd_login.db. Obviously, you may want to make sure
+This will create /etc/vsftpd/login.db. Obviously, you may want to make sure
 the permissions are restricted:
 
-chmod 600 /etc/vsftpd_login.db
+chmod 600 /etc/vsftpd/login.db
 
 For more information on maintaing your login database, look around for
 documentation on "Berkeley DB", e.g.
@@ -37,8 +37,8 @@ Step 2) Create a PAM file which uses you
 
 See the example file vsftpd.pam. It contains two lines:
 
-auth required /lib/security/pam_userdb.so db=/etc/vsftpd_login
-account required /lib/security/pam_userdb.so db=/etc/vsftpd_login
+auth required /lib/security/pam_userdb.so db=/etc/vsftpd/login
+account required /lib/security/pam_userdb.so db=/etc/vsftpd/login
 
 This tells PAM to authenticate users using our new database. Copy this PAM
 file to the PAM directory - typically /etc/pam.d/
@@ -108,9 +108,9 @@ pasv_max_port=30999
 These put a port range on passive FTP incoming requests - very useful if
 you are configuring a firewall.
 
-Copy the example vsftpd.conf file to /etc:
+Copy the example vsftpd.conf file to /etc/vsftpd:
 
-cp vsftpd.conf /etc/
+cp vsftpd.conf /etc/vsftpd/
 
 
 Step 5) Start up vsftpd.
diff -up vsftpd-2.1.0/FAQ.configuration vsftpd-2.1.0/FAQ
--- vsftpd-2.1.0/FAQ.configuration	2009-01-08 17:58:39.000000000 +0100
+++ vsftpd-2.1.0/FAQ	2009-01-08 18:01:04.000000000 +0100
@@ -34,7 +34,7 @@ needs this user to run bits of itself wi
 Q) Help! Local users cannot log in.
 A) There are various possible problems.
 A1) By default, vsftpd disables any logins other than anonymous logins. Put
-local_enable=YES in your /etc/vsftpd.conf to allow local users to log in.
+local_enable=YES in your /etc/vsftpd/vsftpd.conf to allow local users to log in.
 A2) vsftpd tries to link with PAM. (Run "ldd vsftpd" and look for libpam to
 find out whether this has happened or not). If vsftpd links with PAM, then
 you will need to have a PAM file installed for the vsftpd service. There is
@@ -46,12 +46,12 @@ system have a "shadow.h" file in the inc
 A4) If you are not using PAM, then vsftpd will do its own check for a valid
 user shell in /etc/shells. You may need to disable this if you use an invalid
 shell to disable logins other than FTP logins. Put check_shell=NO in your
-/etc/vsftpd.conf.
+/etc/vsftpd/vsftpd.conf.
 
 Q) Help! Uploads or other write commands give me "500 Unknown command.".
 A) By default, write commands, including uploads and new directories, are
 disabled. This is a security measure. To enable writes, put write_enable=YES
-in your /etc/vsftpd.conf.
+in your /etc/vsftpd/vsftpd.conf.
 
 Q) Help! What are the security implications referred to in the
 "chroot_local_user" option?
@@ -87,7 +87,7 @@ A2) Alternatively, run as many copies as
 mode. Use "listen_address=x.x.x.x" to set the virtual IP.
 
 Q) Help! Does vsftpd support virtual users?
-A) Yes, via PAM integration. Set "guest_enable=YES" in /etc/vsftpd.conf. This
+A) Yes, via PAM integration. Set "guest_enable=YES" in /etc/vsftpd/vsftpd.conf. This
 has the effect of mapping every non-anonymous successful login to the local
 username specified in "guest_username". Then, use PAM and (e.g.) its pam_userdb
 module to provide authentication against an external (i.e. non-/etc/passwd)
diff -up vsftpd-2.1.0/INSTALL.configuration vsftpd-2.1.0/INSTALL
--- vsftpd-2.1.0/INSTALL.configuration	2009-01-08 18:01:36.000000000 +0100
+++ vsftpd-2.1.0/INSTALL	2009-01-08 18:03:30.000000000 +0100
@@ -56,14 +56,14 @@ cp vsftpd.8 /usr/local/man/man8
 
 "make install" doesn't copy the sample config file. It is recommended you
 do this:
-cp vsftpd.conf /etc
+cp vsftpd.conf /etc/vsftpd
 
 Step 4) Smoke test (without an inetd).
 
 vsftpd can run standalone or via an inetd (such as inetd or xinetd). You will
 typically get more control running vsftpd from an inetd. But first we will run
 it without, so we can check things are going well so far.
-Edit /etc/vsftpd.conf, and add this line at the bottom:
+Edit /etc/vsftpd/vsftpd.conf, and add this line at the bottom:
 
 listen=YES
 
@@ -135,11 +135,11 @@ cp RedHat/vsftpd.pam /etc/pam.d/ftp
 Step 7) Customize your configuration
 
 As well as the above three pre-requisites, you are recommended to install a
-config file. The default location for the config file is /etc/vsftpd.conf.
+config file. The default location for the config file is /etc/vsftpd/vsftpd.conf.
 There is a sample vsftpd.conf in the distribution tarball. You probably want
-to copy that to /etc/vsftpd.conf as a basis for modification, i.e.:
+to copy that to /etc/vsftpd/vsftpd.conf as a basis for modification, i.e.:
 
-cp vsftpd.conf /etc
+cp vsftpd.conf /etc/vsftpd
 
 The default configuration allows neither local user logins nor anonymous
 uploads. You may wish to change these defaults.
diff -up vsftpd-2.1.0/README.configuration vsftpd-2.1.0/README
--- vsftpd-2.1.0/README.configuration	2009-01-08 18:13:37.000000000 +0100
+++ vsftpd-2.1.0/README	2009-01-08 18:14:21.000000000 +0100
@@ -37,3 +37,8 @@ All configuration options are documented
 Various example configurations are discussed in the EXAMPLE directory.
 Frequently asked questions are tackled in the FAQ file.
 
+Important Note
+==============
+The location of configuration files was changed to /etc/vsftpd/. If you want
+to migrate your old conf files from /etc (files vsftpd.xxxx.rpmsave) use
+/etc/vsfptd/vsftpd_conf_migrate.sh
diff -up vsftpd-2.1.0/tunables.c.configuration vsftpd-2.1.0/tunables.c
--- vsftpd-2.1.0/tunables.c.configuration	2009-01-08 18:20:05.000000000 +0100
+++ vsftpd-2.1.0/tunables.c	2009-01-08 18:22:13.000000000 +0100
@@ -184,7 +184,7 @@ tunables_load_defaults()
   tunable_listen_ipv6 = 0;
   tunable_dual_log_enable = 0;
   tunable_syslog_enable = 0;
-  tunable_background = 0;
+  tunable_background = 1;
   tunable_virtual_use_local_privs = 0;
   tunable_session_support = 0;
   tunable_download_enable = 1;
@@ -250,11 +250,11 @@ tunables_load_defaults()
   install_str_setting(".message", &tunable_message_file);
   install_str_setting("nobody", &tunable_nopriv_user);
   install_str_setting(0, &tunable_ftpd_banner);
-  install_str_setting("/etc/vsftpd.banned_emails", &tunable_banned_email_file);
-  install_str_setting("/etc/vsftpd.chroot_list", &tunable_chroot_list_file);
+  install_str_setting("/etc/vsftpd/banned_emails", &tunable_banned_email_file);
+  install_str_setting("/etc/vsftpd/chroot_list", &tunable_chroot_list_file);
   install_str_setting("ftp", &tunable_pam_service_name);
   install_str_setting("ftp", &tunable_guest_username);
-  install_str_setting("/etc/vsftpd.user_list", &tunable_userlist_file);
+  install_str_setting("/etc/vsftpd/user_list", &tunable_userlist_file);
   install_str_setting(0, &tunable_anon_root);
   install_str_setting(0, &tunable_local_root);
   install_str_setting(0, &tunable_banner_file);
@@ -267,7 +267,7 @@ tunables_load_defaults()
   install_str_setting(0, &tunable_hide_file);
   install_str_setting(0, &tunable_deny_file);
   install_str_setting(0, &tunable_user_sub_token);
-  install_str_setting("/etc/vsftpd.email_passwords",
+  install_str_setting("/etc/vsftpd/email_passwords",
                       &tunable_email_password_file);
   install_str_setting("/usr/share/ssl/certs/vsftpd.pem",
                       &tunable_rsa_cert_file);
diff -up vsftpd-2.1.0/vsftpd.8.configuration vsftpd-2.1.0/vsftpd.8
--- vsftpd-2.1.0/vsftpd.8.configuration	2009-01-08 18:03:47.000000000 +0100
+++ vsftpd-2.1.0/vsftpd.8	2009-01-08 18:04:02.000000000 +0100
@@ -21,7 +21,7 @@ itself will listen on the network. This 
 recommended. It is activated by setting
 .Pa listen=YES
 in
-.Pa /etc/vsftpd.conf .
+.Pa /etc/vsftpd/vsftpd.conf .
 Direct execution of the
 .Nm vsftpd
 binary will then launch the FTP service ready for immediate client connections.
@@ -30,6 +30,6 @@ An optional
 .Op configuration file
 may be given on the command line. This file must be owned as root if running as
 root. The default configuration file is
-.Pa /etc/vsftpd.conf .
+.Pa /etc/vsftpd/vsftpd.conf .
 .Sh SEE ALSO
 .Xr vsftpd.conf 5
diff -up vsftpd-2.1.0/vsftpd.conf.5.configuration vsftpd-2.1.0/vsftpd.conf.5
--- vsftpd-2.1.0/vsftpd.conf.5.configuration	2009-01-08 18:04:53.000000000 +0100
+++ vsftpd-2.1.0/vsftpd.conf.5	2009-01-08 18:29:33.000000000 +0100
@@ -4,7 +4,7 @@ vsftpd.conf \- config file for vsftpd
 .SH DESCRIPTION
 vsftpd.conf may be used to control various aspects of vsftpd's behaviour. By
 default, vsftpd looks for this file at the location
-.BR /etc/vsftpd.conf .
+.BR /etc/vsftpd/vsftpd.conf .
 However, you may override this by specifying a command line argument to
 vsftpd. The command line argument is the pathname of the configuration file
 for vsftpd. This behaviour is useful because you may wish to use an advanced
@@ -110,7 +110,7 @@ When enabled, and vsftpd is started in "
 the listener process. i.e. control will immediately be returned to the shell
 which launched vsftpd.
 
-Default: NO
+Default: YES
 .TP
 .B check_shell
 Note! This option only has an effect for non-PAM builds of vsftpd. If disabled,
@@ -138,7 +138,7 @@ chroot() jail in their home directory up
 different if chroot_local_user is set to YES. In this case, the list becomes
 a list of users which are NOT to be placed in a chroot() jail.
 By default, the file containing this list is
-/etc/vsftpd.chroot_list, but you may override this with the
+/etc/vsftpd/chroot_list, but you may override this with the
 .BR chroot_list_file
 setting.
 
@@ -177,7 +177,7 @@ Default: NO
 .B deny_email_enable
 If activated, you may provide a list of anonymous password e-mail responses
 which cause login to be denied. By default, the file containing this list is
-/etc/vsftpd.banned_emails, but you may override this with the
+/etc/vsftpd/banned_emails, but you may override this with the
 .BR banned_email_file
 setting.
 
@@ -430,7 +430,7 @@ anonymous logins are prevented unless th
 file specified by the
 .BR email_password_file
 setting. The file format is one password per line, no extra whitespace. The
-default filename is /etc/vsftpd.email_passwords.
+default filename is /etc/vsftpd/email_passwords.
 
 Default: NO
 .TP
@@ -761,7 +761,7 @@ passwords which are not permitted. This 
 .BR deny_email_enable
 is enabled.
 
-Default: /etc/vsftpd.banned_emails
+Default: /etc/vsftpd/banned_emails
 .TP
 .B banner_file
 This option is the name of a file containing text to display when someone
@@ -798,7 +798,7 @@ is enabled. If the option
 is enabled, then the list file becomes a list of users to NOT place in a
 chroot() jail.
 
-Default: /etc/vsftpd.chroot_list
+Default: /etvsftpd.confc/vsftpd.chroot_list
 .TP
 .B cmds_allowed
 This options specifies a comma separated list of allowed FTP commands (post
@@ -859,7 +859,7 @@ This option can be used to provide an al
 .BR secure_email_list_enable
 setting.
 
-Default: /etc/vsftpd.email_passwords
+Default: /etc/vsftpd/email_passwords
 .TP
 .B ftp_username
 This is the name of the user we use for handling anonymous FTP. The home
@@ -982,10 +982,10 @@ the manual page, on a per-user basis. Us
 with an example. If you set
 .BR user_config_dir
 to be
-.BR /etc/vsftpd_user_conf
+.BR /etc/vsftpd/user_conf
 and then log on as the user "chris", then vsftpd will apply the settings in
 the file
-.BR /etc/vsftpd_user_conf/chris
+.BR /etc/vsftpd/user_conf/chris
 for the duration of the session. The format of this file is as detailed in
 this manual page! PLEASE NOTE that not all settings are effective on a
 per-user basis. For example, many settings only prior to the user's session
@@ -1021,7 +1021,7 @@ This option is the name of the file load
 .BR userlist_enable
 option is active.
 
-Default: /etc/vsftpd.user_list
+Default: /etc/vsftpd/user_list
 .TP
 .B vsftpd_log_file
 This option is the name of the file to which we write the vsftpd style
diff -up vsftpd-2.1.0/vsftpd.conf.configuration vsftpd-2.1.0/vsftpd.conf
--- vsftpd-2.1.0/vsftpd.conf.configuration	2009-01-08 17:54:33.000000000 +0100
+++ vsftpd-2.1.0/vsftpd.conf	2009-01-08 18:20:55.000000000 +0100
@@ -1,4 +1,4 @@
-# Example config file /etc/vsftpd.conf
+# Example config file /etc/vsftpd/vsftpd.conf
 #
 # The default compiled in settings are fairly paranoid. This sample file
 # loosens things up a bit, to make the ftp daemon more usable.
@@ -87,14 +87,14 @@ connect_from_port_20=YES
 # useful for combatting certain DoS attacks.
 #deny_email_enable=YES
 # (default follows)
-#banned_email_file=/etc/vsftpd.banned_emails
+#banned_email_file=/etc/vsftpd/banned_emails
 #
 # You may specify an explicit list of local users to chroot() to their home
 # directory. If chroot_local_user is YES, then this list becomes a list of
 # users to NOT chroot().
 #chroot_list_enable=YES
 # (default follows)
-#chroot_list_file=/etc/vsftpd.chroot_list
+#chroot_list_file=/etc/vsftpd/chroot_list
 #
 # You may activate the "-R" option to the builtin ls. This is disabled by
 # default to avoid remote users being able to cause excessive I/O on large
@@ -111,3 +111,7 @@ listen=YES
 # sockets, you must run two copies of vsftpd whith two configuration files.
 # Make sure, that one of the listen options is commented !!
 #listen_ipv6=YES
+
+pam_service_name=vsftpd
+userlist_enable=YES
+tcp_wrappers=YES

vsftpd-2.1.0-filter.patch:

--- NEW FILE vsftpd-2.1.0-filter.patch ---
diff -up vsftpd-2.1.0/ls.c.filter vsftpd-2.1.0/ls.c
--- vsftpd-2.1.0/ls.c.filter	2008-02-02 02:30:41.000000000 +0100
+++ vsftpd-2.1.0/ls.c	2009-01-08 19:31:15.000000000 +0100
@@ -239,9 +239,31 @@ vsf_filename_passes_filter(const struct 
   int ret = 0;
   char last_token = 0;
   int must_match_at_current_pos = 1;
+  
+  
   str_copy(&filter_remain_str, p_filter_str);
-  str_copy(&name_remain_str, p_filename_str);
-
+  
+  if (!str_isempty (&filter_remain_str) && !str_isempty(p_filename_str)) {
+    if (str_get_char_at(p_filter_str, 0) == '/') {
+      if (str_get_char_at(p_filename_str, 0) != '/') {
+        str_getcwd (&name_remain_str);
+     
+        if (str_getlen(&name_remain_str) > 1) /* cwd != root dir */
+          str_append_char (&name_remain_str, '/');
+          
+        str_append_str (&name_remain_str, p_filename_str);
+      }
+      else
+       str_copy (&name_remain_str, p_filename_str);
+    } else {
+      if (str_get_char_at(p_filter_str, 0) != '{')
+        str_basename (&name_remain_str, p_filename_str);
+      else
+        str_copy (&name_remain_str, p_filename_str);
+    }
+  } else
+    str_copy(&name_remain_str, p_filename_str);
+  
   while (!str_isempty(&filter_remain_str))
   {
     static struct mystr s_match_needed_str;
diff -up vsftpd-2.1.0/str.c.filter vsftpd-2.1.0/str.c
--- vsftpd-2.1.0/str.c.filter	2008-12-17 06:54:16.000000000 +0100
+++ vsftpd-2.1.0/str.c	2009-01-08 19:31:15.000000000 +0100
@@ -680,3 +680,14 @@ str_replace_unprintable(struct mystr* p_
   }
 }
 
+void
+str_basename (struct mystr* d_str, const struct mystr* path)
+{
+  static struct mystr tmp;
+
+  str_copy (&tmp, path);
+  str_split_char_reverse(&tmp, d_str, '/');
+
+  if (str_isempty(d_str))
+   str_copy (d_str, path);
+}
diff -up vsftpd-2.1.0/str.h.filter vsftpd-2.1.0/str.h
--- vsftpd-2.1.0/str.h.filter	2008-12-17 06:53:23.000000000 +0100
+++ vsftpd-2.1.0/str.h	2009-01-08 19:32:14.000000000 +0100
@@ -100,6 +100,7 @@ void str_replace_unprintable(struct myst
 int str_atoi(const struct mystr* p_str);
 filesize_t str_a_to_filesize_t(const struct mystr* p_str);
 unsigned int str_octal_to_uint(const struct mystr* p_str);
+void str_basename (struct mystr* d_str, const struct mystr* path);
 
 /* PURPOSE: Extract a line of text (delimited by \n or EOF) from a string
  * buffer, starting at character position 'p_pos'. The extracted line will

vsftpd-2.1.0-libs.patch:

--- NEW FILE vsftpd-2.1.0-libs.patch ---
diff -up vsftpd-2.1.0/Makefile.libs vsftpd-2.1.0/Makefile
--- vsftpd-2.1.0/Makefile.libs	2009-01-08 18:55:39.000000000 +0100
+++ vsftpd-2.1.0/Makefile	2009-01-08 18:55:57.000000000 +0100
@@ -5,7 +5,7 @@ IFLAGS  = -idirafter dummyinc
 #CFLAGS = -g
 CFLAGS	=	-O2 -Wall -W -Wshadow #-pedantic -Werror -Wconversion
 
-LIBS	=	`./vsf_findlibs.sh`
+LIBS	=	-lwrap -lnsl -lpam -lcap -ldl
 LINK	=	-Wl,-s
 
 OBJS	=	main.o utility.o prelogin.o ftpcmdio.o postlogin.o privsock.o \

vsftpd-2.1.0-pam_hostname.patch:

--- NEW FILE vsftpd-2.1.0-pam_hostname.patch ---
diff -up vsftpd-2.1.0/sysdeputil.c.pam_hostname vsftpd-2.1.0/sysdeputil.c
--- vsftpd-2.1.0/sysdeputil.c.pam_hostname	2008-12-17 22:40:56.000000000 +0100
+++ vsftpd-2.1.0/sysdeputil.c	2009-01-15 15:38:14.000000000 +0100
@@ -16,6 +16,10 @@
 #include "tunables.h"
 #include "builddefs.h"
 
+/* For gethostbyaddr, inet_addr */
+#include <netdb.h>
+#include <arpa/inet.h>
+
 /* For Linux, this adds nothing :-) */
 #include "port/porting_junk.h"
 
@@ -296,6 +300,10 @@ vsf_sysdep_check_auth(const struct mystr
                       const struct mystr* p_remote_host)
 {
   int retval;
+#ifdef PAM_RHOST
+  struct sockaddr_in sin;
+  struct hostent *host;
+#endif
   struct pam_conv the_conv =
   {
     &pam_conv_func,
@@ -314,7 +322,12 @@ vsf_sysdep_check_auth(const struct mystr
     return 0;
   }
 #ifdef PAM_RHOST
-  retval = pam_set_item(s_pamh, PAM_RHOST, str_getbuf(p_remote_host));
+  sin.sin_addr.s_addr = inet_addr(str_getbuf(p_remote_host));
+  host = gethostbyaddr((char*)&sin.sin_addr.s_addr,sizeof(struct in_addr),AF_INET);
+  if (host != (struct hostent*)0)
+    retval = pam_set_item(s_pamh, PAM_RHOST, host->h_name);
+  else
+    retval = pam_set_item(s_pamh, PAM_RHOST, str_getbuf(p_remote_host));
   if (retval != PAM_SUCCESS)
   {
     (void) pam_end(s_pamh, retval);
@@ -516,7 +529,7 @@ vsf_sysdep_has_capabilities(void)
   }
   return s_runtime_has_caps;
 }
-  
+
   #ifndef VSF_SYSDEP_HAVE_LIBCAP
 static int
 do_checkcap(void)
@@ -1038,7 +1051,7 @@ vsf_sysutil_recv_fd(const int sock_fd)
   msg.msg_flags = 0;
   /* In case something goes wrong, set the fd to -1 before the syscall */
   p_fd = (int*)CMSG_DATA(CMSG_FIRSTHDR(&msg));
-  *p_fd = -1;  
+  *p_fd = -1;
   retval = recvmsg(sock_fd, &msg, 0);
   if (retval != 1)
   {

vsftpd-2.1.0-tcp_wrappers.patch:

--- NEW FILE vsftpd-2.1.0-tcp_wrappers.patch ---
diff -up vsftpd-2.1.0/builddefs.h.tcp_wrappers vsftpd-2.1.0/builddefs.h
--- vsftpd-2.1.0/builddefs.h.tcp_wrappers	2009-01-08 18:52:46.000000000 +0100
+++ vsftpd-2.1.0/builddefs.h	2009-01-08 18:52:56.000000000 +0100
@@ -1,7 +1,7 @@
 #ifndef VSF_BUILDDEFS_H
 #define VSF_BUILDDEFS_H
 
-#undef VSF_BUILD_TCPWRAPPERS
+#define VSF_BUILD_TCPWRAPPERS
 #define VSF_BUILD_PAM
 #define VSF_BUILD_SSL
 

vsftpd-2.1.0-userlist_log.patch:

--- NEW FILE vsftpd-2.1.0-userlist_log.patch ---
diff -up vsftpd-2.1.0/logging.c.userlist_log vsftpd-2.1.0/logging.c
--- vsftpd-2.1.0/logging.c.userlist_log	2008-12-17 20:56:45.000000000 +0100
+++ vsftpd-2.1.0/logging.c	2009-01-08 19:33:29.000000000 +0100
@@ -95,6 +95,13 @@ vsf_log_line(struct vsf_session* p_sess,
   vsf_log_common(p_sess, 1, what, p_str);
 }
 
+void
+vsf_log_failed_line(struct vsf_session* p_sess, enum EVSFLogEntryType what,
+             struct mystr* p_str)
+{
+  vsf_log_common(p_sess, 0, what, p_str);
+}
+
 int
 vsf_log_entry_pending(struct vsf_session* p_sess)
 {
diff -up vsftpd-2.1.0/logging.h.userlist_log vsftpd-2.1.0/logging.h
--- vsftpd-2.1.0/logging.h.userlist_log	2008-07-30 03:29:21.000000000 +0200
+++ vsftpd-2.1.0/logging.h	2009-01-08 19:33:29.000000000 +0100
@@ -80,5 +80,16 @@ void vsf_log_do_log(struct vsf_session* 
 void vsf_log_line(struct vsf_session* p_sess, enum EVSFLogEntryType what,
                   struct mystr* p_str);
 
+/* vsf_log_failed_line()
+ * PURPOSE
+ * Same as vsf_log_line(), except that it logs the line as failed operation.
+ * PARAMETERS
+ * p_sess       - the current session object
+ * what         - the type of operation to log
+ * p_str        - the string to log
+ */
+void vsf_log_failed_line(struct vsf_session* p_sess, enum EVSFLogEntryType what,
+                  struct mystr* p_str);
+
 #endif /* VSF_LOGGING_H */
 
diff -up vsftpd-2.1.0/parseconf.c.userlist_log vsftpd-2.1.0/parseconf.c
--- vsftpd-2.1.0/parseconf.c.userlist_log	2008-12-18 07:21:41.000000000 +0100
+++ vsftpd-2.1.0/parseconf.c	2009-01-08 19:33:29.000000000 +0100
@@ -96,6 +96,7 @@ parseconf_bool_array[] =
   { "mdtm_write", &tunable_mdtm_write },
   { "lock_upload_files", &tunable_lock_upload_files },
   { "pasv_addr_resolve", &tunable_pasv_addr_resolve },
+  { "userlist_log", &tunable_userlist_log },
   { "debug_ssl", &tunable_debug_ssl },
   { "require_cert", &tunable_require_cert },
   { "validate_cert", &tunable_validate_cert },
diff -up vsftpd-2.1.0/prelogin.c.userlist_log vsftpd-2.1.0/prelogin.c
--- vsftpd-2.1.0/prelogin.c.userlist_log	2008-12-04 05:03:27.000000000 +0100
+++ vsftpd-2.1.0/prelogin.c	2009-01-08 19:33:29.000000000 +0100
@@ -216,6 +216,20 @@ handle_user_command(struct vsf_session* 
         (!located && !tunable_userlist_deny))
     {
       vsf_cmdio_write(p_sess, FTP_LOGINERR, "Permission denied.");
+      if (tunable_userlist_log)
+      {
+        struct mystr str_log_line = INIT_MYSTR;
+        if (tunable_userlist_deny)
+        {
+          str_alloc_text(&str_log_line, "User is in the deny user list.");
+        }
+        else
+        {
+          str_alloc_text(&str_log_line, "User is not in the allow user list.");
+        }
+        vsf_log_failed_line(p_sess, kVSFLogEntryLogin, &str_log_line);
+        str_free(&str_log_line);
+      }
       str_empty(&p_sess->user_str);
       return;
     }
diff -up vsftpd-2.1.0/tunables.c.userlist_log vsftpd-2.1.0/tunables.c
--- vsftpd-2.1.0/tunables.c.userlist_log	2009-01-08 19:33:28.000000000 +0100
+++ vsftpd-2.1.0/tunables.c	2009-01-08 19:35:00.000000000 +0100
@@ -72,6 +72,7 @@ int tunable_force_anon_data_ssl;
 int tunable_mdtm_write;
 int tunable_lock_upload_files;
 int tunable_pasv_addr_resolve;
+int tunable_userlist_log;
 int tunable_debug_ssl;
 int tunable_require_cert;
 int tunable_validate_cert;
@@ -206,6 +207,7 @@ tunables_load_defaults()
   tunable_mdtm_write = 1;
   tunable_lock_upload_files = 1;
   tunable_pasv_addr_resolve = 0;
+  tunable_userlist_log = 0;
   tunable_debug_ssl = 0;
   tunable_require_cert = 0;
   tunable_validate_cert = 0;
diff -up vsftpd-2.1.0/tunables.h.userlist_log vsftpd-2.1.0/tunables.h
--- vsftpd-2.1.0/tunables.h.userlist_log	2008-12-17 06:47:11.000000000 +0100
+++ vsftpd-2.1.0/tunables.h	2009-01-08 19:33:29.000000000 +0100
@@ -73,6 +73,7 @@ extern int tunable_force_anon_data_ssl; 
 extern int tunable_mdtm_write;                /* Allow MDTM to set timestamps */
 extern int tunable_lock_upload_files;         /* Lock uploading files */
 extern int tunable_pasv_addr_resolve;         /* DNS resolve pasv_addr */
+extern int tunable_userlist_log;              /* Log every failed login attempt */
 extern int tunable_debug_ssl;                 /* Verbose SSL logging */
 extern int tunable_require_cert;              /* SSL client cert required */
 extern int tunable_validate_cert;             /* SSL certs must be valid */
diff -up vsftpd-2.1.0/vsftpd.conf.5.userlist_log vsftpd-2.1.0/vsftpd.conf.5
--- vsftpd-2.1.0/vsftpd.conf.5.userlist_log	2009-01-08 19:33:28.000000000 +0100
+++ vsftpd-2.1.0/vsftpd.conf.5	2009-01-08 19:33:29.000000000 +0100
@@ -585,6 +585,14 @@ Self-signed certs do not constitute OK v
 
 Default: NO
 .TP
+.B userlist_log
+This option is examined if
+.BR userlist_enable
+is activated. If enabled, every login denial based on the user list will be
+logged.
+
+Default: NO
+.TP
 .B virtual_use_local_privs
 If enabled, virtual users will use the same privileges as local users. By
 default, virtual users will use the same privileges as anonymous users, which

vsftpd-2.1.0-warnings.patch:

--- NEW FILE vsftpd-2.1.0-warnings.patch ---
diff -up vsftpd-2.1.0/ptracesandbox.c.warnings vsftpd-2.1.0/ptracesandbox.c
--- vsftpd-2.1.0/ptracesandbox.c.warnings	2009-01-15 15:31:26.000000000 +0100
+++ vsftpd-2.1.0/ptracesandbox.c	2009-01-15 15:32:56.000000000 +0100
@@ -1146,6 +1146,7 @@ int
 ptrace_sandbox_run_processes(struct pt_sandbox* p_sandbox)
 {
   (void) p_sandbox;
+  return -1;
 }
 
 void
diff -up vsftpd-2.1.0/sysdeputil.c.warnings vsftpd-2.1.0/sysdeputil.c


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/vsftpd/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	9 Sep 2008 03:53:37 -0000	1.14
+++ .cvsignore	16 Jan 2009 17:23:11 -0000	1.15
@@ -1 +1 @@
-vsftpd-2.0.7.tar.gz
+vsftpd-2.1.0pre3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/vsftpd/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	9 Sep 2008 03:53:37 -0000	1.14
+++ sources	16 Jan 2009 17:23:11 -0000	1.15
@@ -1 +1 @@
-3e39cb7b0bee306ad7df8e3552e15297  vsftpd-2.0.7.tar.gz
+6e968036b3575253f384e06f7b4ddd57  vsftpd-2.1.0pre3.tar.gz


Index: vsftpd.spec
===================================================================
RCS file: /cvs/extras/rpms/vsftpd/devel/vsftpd.spec,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- vsftpd.spec	9 Sep 2008 03:53:37 -0000	1.83
+++ vsftpd.spec	16 Jan 2009 17:23:12 -0000	1.84
@@ -1,115 +1,86 @@
 %{!?tcp_wrappers:%define tcp_wrappers 1}
 
-Summary: Very Secure Ftp Daemon
 Name: vsftpd
-Version: 2.0.7
-Release: 1%{?dist}
+Version: 2.1.0
+Release: 0.1.pre3%{?dist}
+Summary: Very Secure Ftp Daemon
+
+Group: System Environment/Daemons
 # 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
+Source0: ftp://vsftpd.beasts.org/users/cevans/%{name}-%{version}pre3.tar.gz
 Source1: vsftpd.xinetd
 Source2: vsftpd.pam
 Source3: vsftpd.ftpusers
 Source4: vsftpd.user_list
 Source5: vsftpd.init
 Source6: vsftpd_conf_migrate.sh
-Patch1: vsftpd-1.1.3-rh.patch
-Patch2: vsftpd-1.0.1-missingok.patch
-Patch3: vsftpd-2.0.1-tcp_wrappers.patch
-Patch4: vsftpd-1.5.1-libs.patch
-Patch5: vsftpd-2.0.2-signal.patch
-Patch6: vsftpd-1.2.1-conffile.patch
-Patch7: vsftpd-2.0.1-build_ssl.patch
-Patch8: vsftpd-2.0.1-server_args.patch
-Patch9: vsftpd-2.0.1-dir.patch
-Patch11: vsftpd-1.2.1-nonrootconf.patch
-Patch13: vsftpd-2.0.3-background.patch
-Patch14: vsftpd-2.0.3-daemonize_fds.patch
-Patch17: vsftpd-2.0.3-pam_hostname.patch
-Patch18: vsftpd-close-std-fds.patch
-Patch19: vsftpd-2.0.5-default_ipv6.patch
-Patch20: vsftpd-2.0.5-add_ipv6_option.patch
-Patch21: vsftpd-2.0.5-correct_comments.patch
-Patch22: vsftpd-2.0.5-man.patch
-Patch23: vsftpd-2.0.4-filter.patch
-Patch26: vsftpd-2.0.5-bind_denied.patch
-Patch29: vsftpd-2.0.5-pasv_dot.patch
-Patch30: vsftpd-2.0.5-pam_end.patch
-Patch31: vsftpd-2.0.5-write_race.patch
-Patch32: vsftpd-2.0.5-fix_unique.patch
-Patch34: vsftpd-2.0.5-underscore_uname.patch
-Patch35: vsftpd-2.0.5-uname_size.patch
-Patch36: vsftpd-2.0.5-greedy.patch
-Patch37: vsftpd-2.0.6-userlist_log.patch
-Patch38: vsftpd-2.0.6-listen.patch
 
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-%if %{tcp_wrappers}
-BuildRequires: tcp_wrappers-devel
-%endif
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
 BuildRequires: pam-devel
-Requires: /%{_lib}/security/pam_loginuid.so
 BuildRequires: libcap-devel
 BuildRequires: openssl-devel
-Requires: libcap
-# for -fpie
-BuildRequires: gcc > 3.2.3-13, binutils > 2.14.90.0.4-24, glibc-devel >= 2.3.2-45
+%if %{tcp_wrappers}
+BuildRequires: tcp_wrappers-devel
+%endif
+
 Requires: logrotate
 Requires (preun): /sbin/chkconfig
 Requires (preun): /sbin/service
 Requires (post): /sbin/chkconfig
-#Obsoletes: anonftp
-#Provides: ftpserver
+
+# Build patches
+Patch1: vsftpd-2.1.0-libs.patch
+Patch2: vsftpd-2.1.0-build_ssl.patch
+Patch3: vsftpd-2.1.0-tcp_wrappers.patch
+
+# Use /etc/vsftpd/ instead of /etc/
+Patch4: vsftpd-2.1.0-configuration.patch
+
+# These need review
+Patch5: vsftpd-2.1.0-pam_hostname.patch
+Patch6: vsftpd-close-std-fds.patch
+Patch7: vsftpd-2.1.0-filter.patch
+Patch8: vsftpd-2.0.5-greedy.patch
+Patch9: vsftpd-2.1.0-userlist_log.patch
+
+# Sent upstream on 2009-01-16 via email
+Patch10: vsftpd-2.1.0-warnings.patch
+
 
 %description
 vsftpd is a Very Secure FTP daemon. It was written completely from
 scratch.
 
+
 %prep
 %setup -q -n %{name}-%{version}
-%patch1 -p1 -b .rh
-%patch2 -p1 -b .mok
+cp %{SOURCE1} .
+
+%patch1 -p1 -b .libs
+%patch2 -p1 -b .build_ssl
 %if %{tcp_wrappers}
 %patch3 -p1 -b .tcp_wrappers
 %endif
-%patch4 -p1 -b .libs
-cp %{SOURCE1} .
-%patch5 -p1 -b .signal
-%patch6 -p1
-%patch7 -p1 -b .build_ssl
-%patch8 -p1 -b .server_args
-%patch9 -p1 -b .dir
-%patch11 -p1 -b .nonrootconf
-%patch13 -p1 -b .background
-%patch14 -p1 -b .fds
-%patch17 -p1 -b .old-pam
-%patch18 -p1 -b .close-fds
-%patch19 -p1 -b .ipv6
-%patch20 -p1 -b .ipv6opt
-%patch21 -p1 -b .comments
-%patch22 -p1 -b .manp
-%patch23 -p1 -b .filter
-%patch26 -p1 -b .bind_denied
-%patch29 -p1 -b .pasv_dot
-%patch30 -p1 -b .pam_end
-%patch31 -p1 -b .write_race
-%patch32 -p1 -b .fix_unique
-%patch34 -p1 -b .underscore_uname
-%patch35 -p1 -b .uname_size
-%patch36 -p1 -b .greedy
-%patch37 -p1 -b .userlist_log
-%patch38 -p1 -b .listen
+%patch4 -p1 -b .configuration
+%patch5 -p1 -b .pam_hostname
+%patch6 -p1 -b .close_fds
+%patch7 -p1 -b .filter
+%patch8 -p1 -b .greedy
+%patch9 -p1 -b .userlist_log
+%patch10 -p1 -b .warnings
+
 
 %build
 %ifarch s390x sparcv9 sparc64
-make CFLAGS="$RPM_OPT_FLAGS -fPIE -pipe" \
+make CFLAGS="$RPM_OPT_FLAGS -fPIE -pipe -Wextra -Werror" \
 %else
-make CFLAGS="$RPM_OPT_FLAGS -fpie -pipe" \
+make CFLAGS="$RPM_OPT_FLAGS -fpie -pipe -Wextra -Werror" \
 %endif
-	LINK="-pie -lssl" \
-	%{?_smp_mflags}
+        LINK="-pie -lssl" %{?_smp_mflags}
+
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -130,13 +101,16 @@
                             
 mkdir -p $RPM_BUILD_ROOT/%{_var}/ftp/pub
 
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+
 %post
 /sbin/chkconfig --add vsftpd
 #/usr/sbin/usermod -d /var/ftp ftp >/dev/null 2>&1 || :
 
+
 %preun
 if [ $1 = 0 ]; then
  /sbin/service vsftpd stop > /dev/null 2>&1
@@ -145,10 +119,9 @@
   
 
 %files
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %{_sbindir}/vsftpd
 %{_sysconfdir}/rc.d/init.d/vsftpd
-#%config(noreplace) /etc/vsftpd.*
 %dir %{_sysconfdir}/vsftpd
 %config(noreplace) %{_sysconfdir}/vsftpd/*
 %config(noreplace) %{_sysconfdir}/pam.d/vsftpd
@@ -158,7 +131,36 @@
 %{_mandir}/man8/vsftpd.*
 %{_var}/ftp
 
+
 %changelog
+* Fri Jan 16 2009 Martin Nagy <mnagy at redhat.com> - 2.1.0-0.1.pre3
+- update to latest upstream release
+- cleanup the spec file
+- drop patches fixed upstream:
+    vsftpd-1.0.1-missingok.patch
+    vsftpd-1.2.1-nonrootconf.patch
+    vsftpd-2.0.1-tcp_wrappers.patch
+    vsftpd-2.0.2-signal.patch
+    vsftpd-2.0.3-daemonize_fds.patch
+    vsftpd-2.0.5-correct_comments.patch
+    vsftpd-2.0.5-pasv_dot.patch
+    vsftpd-2.0.5-write_race.patch
+    vsftpd-2.0.5-fix_unique.patch
+    vsftpd-2.0.5-uname_size.patch
+    vsftpd-2.0.5-bind_denied.patch
+    vsftpd-2.0.5-pam_end.patch
+    vsftpd-2.0.5-underscore_uname.patch
+    vsftpd-2.0.6-listen.patch
+- join all configuration patches into one:
+    vsftpd-1.1.3-rh.patch
+    vsftpd-1.2.1-conffile.patch
+    vsftpd-2.0.1-dir.patch
+    vsftpd-2.0.1-server_args.patch
+    vsftpd-2.0.3-background.patch
+    vsftpd-2.0.5-default_ipv6.patch
+    vsftpd-2.0.5-add_ipv6_option.patch
+    vsftpd-2.0.5-man.patch
+
 * Mon Sep  8 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 2.0.7-1
 - fix license tag
 - update to 2.0.7
@@ -250,10 +252,10 @@
 * Tue Aug 22 2006 Maros Barabas <mbarabas at redhat.com> - 2.0.5-7
 - correct paths of configuration files on man pages
 
-* Tue Aug 15 2006 Maros Barabas	<mbarabas at redhat.com> - 2.0.5-6
+* Tue Aug 15 2006 Maros Barabas <mbarabas at redhat.com> - 2.0.5-6
 - correct comments
 
-* Tue Aug 08 2006 Maros Barabas	<mbarabas at redhat.com> - 2.0.5-5
+* Tue Aug 08 2006 Maros Barabas <mbarabas at redhat.com> - 2.0.5-5
 - option to change listening to IPv6 protocol
 
 * Thu Aug 01 2006 Maros Barabas <mbarabas at redhat.com> - 2.0.5-4


--- vsftpd-1.0.1-missingok.patch DELETED ---


--- vsftpd-1.1.3-rh.patch DELETED ---


--- vsftpd-1.2.1-conffile.patch DELETED ---


--- vsftpd-1.2.1-nonrootconf.patch DELETED ---


--- vsftpd-1.5.1-libs.patch DELETED ---


--- vsftpd-2.0.1-build_ssl.patch DELETED ---


--- vsftpd-2.0.1-dir.patch DELETED ---


--- vsftpd-2.0.1-server_args.patch DELETED ---


--- vsftpd-2.0.1-tcp_wrappers.patch DELETED ---


--- vsftpd-2.0.2-signal.patch DELETED ---


--- vsftpd-2.0.3-background.patch DELETED ---


--- vsftpd-2.0.3-daemonize_fds.patch DELETED ---


--- vsftpd-2.0.3-pam_hostname.patch DELETED ---


--- vsftpd-2.0.4-filter.patch DELETED ---


--- vsftpd-2.0.5-add_ipv6_option.patch DELETED ---


--- vsftpd-2.0.5-bind_denied.patch DELETED ---


--- vsftpd-2.0.5-correct_comments.patch DELETED ---


--- vsftpd-2.0.5-default_ipv6.patch DELETED ---


--- vsftpd-2.0.5-fix_unique.patch DELETED ---


--- vsftpd-2.0.5-man.patch DELETED ---


--- vsftpd-2.0.5-pam_end.patch DELETED ---


--- vsftpd-2.0.5-pasv_dot.patch DELETED ---


--- vsftpd-2.0.5-uname_size.patch DELETED ---


--- vsftpd-2.0.5-underscore_uname.patch DELETED ---


--- vsftpd-2.0.5-write_race.patch DELETED ---


--- vsftpd-2.0.6-listen.patch DELETED ---


--- vsftpd-2.0.6-userlist_log.patch DELETED ---



From tmraz at fedoraproject.org  Fri Jan 16 17:48:00 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 16 Jan 2009 17:48:00 +0000 (UTC)
Subject: rpms/hedgewars/devel hedgewars.spec,1.15,1.16
Message-ID: <20090116174800.B7C7D70127@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/hedgewars/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8885

Modified Files:
	hedgewars.spec 
Log Message:
* Fri Jan 16 2009 Tomas Mraz <tmraz at redhat.com> 0.9.8-2
- rebuild with new openssl



Index: hedgewars.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hedgewars/devel/hedgewars.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- hedgewars.spec	11 Jan 2009 11:02:58 -0000	1.15
+++ hedgewars.spec	16 Jan 2009 17:47:30 -0000	1.16
@@ -1,6 +1,6 @@
 Name:           hedgewars
 Version:        0.9.8
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        2D tankbattle game with the tanks replaced by hedgehogs
 Group:          Amusements/Games
 License:        GPL+
@@ -83,6 +83,9 @@
 
 
 %changelog
+* Fri Jan 16 2009 Tomas Mraz <tmraz at redhat.com> 0.9.8-2
+- rebuild with new openssl
+
 * Sat Jan 10 2009 Hans de Goede <hdegoede at redhat.com> 0.9.8-1
 - New upstream release 0.9.8
 



From tmraz at fedoraproject.org  Fri Jan 16 17:48:40 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 16 Jan 2009 17:48:40 +0000 (UTC)
Subject: rpms/hfsplus-tools/devel hfsplus-tools.spec,1.7,1.8
Message-ID: <20090116174840.4907570127@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/hfsplus-tools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8959

Modified Files:
	hfsplus-tools.spec 
Log Message:
* Fri Jan 16 2009 Tomas Mraz <tmraz at redhat.com> - 332.14-8
- rebuild with new openssl



Index: hfsplus-tools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hfsplus-tools/devel/hfsplus-tools.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- hfsplus-tools.spec	10 Sep 2008 17:58:34 -0000	1.7
+++ hfsplus-tools.spec	16 Jan 2009 17:48:10 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           hfsplus-tools
 Version:        332.14 
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Tools to create/check Apple HFS+ filesystems
 
 Group:          System Environment/Base
@@ -110,6 +110,9 @@
 
 
 %changelog
+* Fri Jan 16 2009 Tomas Mraz <tmraz at redhat.com> - 332.14-8
+- rebuild with new openssl
+
 * 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".



From rdieter at fedoraproject.org  Fri Jan 16 17:49:11 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 16 Jan 2009 17:49:11 +0000 (UTC)
Subject: rpms/amarok/F-8 amarok-1.4.10-mtp-fix.patch, NONE, 1.1 amarok.spec, 
	1.98, 1.99
Message-ID: <20090116174911.2843870127@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/amarok/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8922

Modified Files:
	amarok.spec 
Added Files:
	amarok-1.4.10-mtp-fix.patch 
Log Message:
For exterprising folks who still want amarok1 to work

* Fri Jan 16 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.4.10-2
- mtp-fix patch (thanks oget)


amarok-1.4.10-mtp-fix.patch:

--- NEW FILE amarok-1.4.10-mtp-fix.patch ---
--- amarok-1.4.10/amarok/src/mediadevice/mtp/mtpmediadevice.cpp~	2008-08-13 17:21:51.000000000 -0400
+++ amarok-1.4.10/amarok/src/mediadevice/mtp/mtpmediadevice.cpp	2009-01-16 12:11:49.000000000 -0500
@@ -296,9 +296,10 @@ MediaItem
 
     m_critical_mutex.lock();
     debug() << "Sending track... " << bundle.url().path().utf8() << endl;
+    trackmeta->parent_id = parent_id;
     int ret = LIBMTP_Send_Track_From_File(
         m_device, bundle.url().path().utf8(), trackmeta,
-        progressCallback, this, parent_id
+        progressCallback, this
     );
     m_critical_mutex.unlock();
 
@@ -529,7 +530,8 @@ LIBMTP_album_t
         for( MtpMediaItem *it = dynamic_cast<MtpMediaItem*>(items->first()); it; it = dynamic_cast<MtpMediaItem*>(items->next()) )
             album_object->tracks[i++] = it->track()->id();
         album_object->no_tracks = items->count();
-        ret = LIBMTP_Create_New_Album( m_device, album_object, 0 );
+	album_object->parent_id = 0;
+        ret = LIBMTP_Create_New_Album( m_device, album_object);
         if( ret != 0 )
         {
             debug() << "creating album failed : " << ret << endl;
@@ -610,7 +610,7 @@ MtpMediaDevice::createFolder( const char
 {
     debug() << "Creating new folder '" << name << "' as a child of "<< parent_id << endl;
     char *name_copy = qstrdup( name );
-    uint32_t new_folder_id = LIBMTP_Create_Folder( m_device, name_copy, parent_id );
+    uint32_t new_folder_id = LIBMTP_Create_Folder( m_device, name_copy, parent_id,0 );
     delete(name_copy);
     debug() << "New folder ID: " << new_folder_id << endl;
     if( new_folder_id == 0 )
@@ -913,7 +915,8 @@ MtpMediaDevice::playlistFromItem( MtpMed
     if( item->playlist()->id() == 0 )
     {
         debug() << "creating new playlist : " << metadata->name << endl;
-        int ret = LIBMTP_Create_New_Playlist( m_device, metadata, 0 );
+	metadata->parent_id = 0;
+        int ret = LIBMTP_Create_New_Playlist( m_device, metadata);
         if( ret == 0 )
         {
             item->playlist()->setId( metadata->playlist_id );


Index: amarok.spec
===================================================================
RCS file: /cvs/pkgs/rpms/amarok/F-8/amarok.spec,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -r1.98 -r1.99
--- amarok.spec	14 Aug 2008 02:51:18 -0000	1.98
+++ amarok.spec	16 Jan 2009 17:48:40 -0000	1.99
@@ -7,8 +7,11 @@
 %endif
 
 %if 0%{?fedora} > 6 
-# suffix for kde3 -devel packages
-%define kde3 3
+%define kdelibs3 kdelibs3
+%define kdebase3 kdebase3
+%else
+%define kdelibs3 kdelibs
+%define kdebase3 kdebase
 %endif
 
 %if 0%{?fedora} > 6
@@ -31,7 +34,7 @@
 Name:       amarok
 Summary:    Media player
 Version:    1.4.10
-Release:    1%{?dist}
+Release:    2%{?dist}
 
 Group: 	    Applications/Multimedia
 License:    GPLv2+
@@ -42,15 +45,17 @@
 Patch1:     amarok-1.4.8-gcc43.patch
 # Use xdg-open to start the selected browser
 Patch2:     amarok-1.4.7-xdg.patch
+# compat with newer libmtp-0.3, kudos to oget
+Patch3:     amarok-1.4.10-mtp-fix.patch
 
 BuildRequires:  alsa-lib-devel
 BuildRequires:  desktop-file-utils
 BuildRequires:  esound-devel
 BuildRequires:  gettext
 %{?_with_helix:BuildRequires:  HelixPlayer}
-BuildRequires:  kdelibs%{?kde3}-devel
+BuildRequires:  %{kdelibs3}-devel
 %if 0%{?konq}
-BuildRequires:  kdebase%{?kde3}-devel
+BuildRequires:  %{kdebase3}-devel
 %else
 Obsoletes: %{name}-konqueror < %{version}-%{release}
 %endif
@@ -77,8 +82,6 @@
 BuildRequires:  SDL-devel
 BuildRequires:  taglib-devel
 BuildRequires:  xine-lib-devel
-# not used anymore, in favor of libvisual ? -- Rex
-#%{?fedora:BuildRequires:  xmms-devel}
 
 # For dir ownership and some default plugins (lyrics), -ruby subpkg?  -- Rex
 Requires:  ruby
@@ -143,6 +146,10 @@
 
 %patch1 -p1 -b .gcc43
 %patch2 -p1 -b .xdg
+%if 0%{?fedora} > 9
+#if "%(pkg-config --modversion libmtp)" >= "0.3.0"
+%patch3 -p1 -b .mtp-fix
+%endif
 
 
 %build
@@ -177,8 +184,7 @@
 # desktop files
 desktop-file-install  --vendor "" \
         --dir $RPM_BUILD_ROOT%{_datadir}/applications/kde \
-        --delete-original \
-        $RPM_BUILD_ROOT%{_datadir}/applications/kde/%{name}.desktop
+        $RPM_BUILD_ROOT%{_datadir}/applications/kde/amarok.desktop
 
 # unpackaged files
 rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la
@@ -304,6 +310,9 @@
 
 
 %changelog
+* Fri Jan 16 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.4.10-2
+- mtp-fix patch (thanks oget)
+
 * Wed Aug 13 2008 Rex Dieter <rdieter at fedoraproject.org> - 1.4.10-1
 - amarok-1.4.10
 



From thm at fedoraproject.org  Fri Jan 16 17:55:23 2009
From: thm at fedoraproject.org (Thomas Moschny)
Date: Fri, 16 Jan 2009 17:55:23 +0000 (UTC)
Subject: rpms/waf/devel .cvsignore, 1.8, 1.9 import.log, 1.3, 1.4 sources,
	1.8, 1.9 waf.spec, 1.10, 1.11 waf-1.5.2-book.patch, 1.1,
	NONE waf-1.5.2-stylesheet.patch, 1.1, NONE
Message-ID: <20090116175523.5707B70127@cvs1.fedora.phx.redhat.com>

Author: thm

Update of /cvs/pkgs/rpms/waf/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10535/devel

Modified Files:
	.cvsignore import.log sources waf.spec 
Removed Files:
	waf-1.5.2-book.patch waf-1.5.2-stylesheet.patch 
Log Message:
Remove documentation ("The Waf Book"), bad license.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/waf/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	16 Jan 2009 17:15:51 -0000	1.8
+++ .cvsignore	16 Jan 2009 17:54:52 -0000	1.9
@@ -1 +1 @@
-waf-1.5.2.tar.bz2
+waf-1.5.2.stripped.tar.bz2


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/waf/devel/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- import.log	16 Jan 2009 17:15:51 -0000	1.3
+++ import.log	16 Jan 2009 17:54:52 -0000	1.4
@@ -1,3 +1,4 @@
 waf-1_4_3-1_fc9:HEAD:waf-1.4.3-1.fc9.src.rpm:1214694119
 waf-1_4_4-1_fc9:HEAD:waf-1.4.4-1.fc9.src.rpm:1220215604
 waf-1_5_2-1_fc10:HEAD:waf-1.5.2-1.fc10.src.rpm:1232126058
+waf-1_5_2-2_fc10:HEAD:waf-1.5.2-2.fc10.src.rpm:1232128440


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/waf/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	16 Jan 2009 17:15:51 -0000	1.8
+++ sources	16 Jan 2009 17:54:52 -0000	1.9
@@ -1 +1 @@
-7b84bb61b447ec13021b883cf86e4770  waf-1.5.2.tar.bz2
+f389fe7cb4ac72f4bbc2248aa130dbb6  waf-1.5.2.stripped.tar.bz2


Index: waf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/waf/devel/waf.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- waf.spec	16 Jan 2009 17:15:51 -0000	1.10
+++ waf.spec	16 Jan 2009 17:54:52 -0000	1.11
@@ -1,23 +1,21 @@
 Name:           waf
 Version:        1.5.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A Python-based build system
 Group:          Development/Tools
 # The entire source code is BSD apart from pproc.py (taken from Python 2.5)
 License:        BSD and Python
 URL:            http://code.google.com/p/waf/
-Source:         http://waf.googlecode.com/files/waf-%{version}.tar.bz2
+# Original tarfile can be found at
+# http://waf.googlecode.com/files/waf-%{version}.tar.bz2
+# We remove doc/book, as this is under CC-BY-NC-ND, which is not
+# allowed in Fedora.
+Source:         waf-%{version}.stripped.tar.bz2
 # use _datadir instead of /usr/lib
 Patch0:         waf-1.5.2-libdir.patch
-Patch1:         waf-1.5.2-stylesheet.patch
-# r5462 from trunk
-Patch2:         waf-1.5.2-book.patch
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildArch:      noarch
 BuildRequires:  python-devel
-# for building the documentation
-BuildRequires:  /usr/bin/xsltproc
-BuildRequires:  docbook-style-xsl
 # Seems like automatic ABI dependency is not detected since the files are
 # going to a non-standard location
 Requires:       python-abi %(%{__python} -c "import sys ; print \"=\", sys.version[:3]")
@@ -38,16 +36,12 @@
 %prep
 %setup -q
 %patch0 -p1 -b .libdir
-%patch1 -p1 -b .stylesheet
-%patch2 -p0 -b .book
 
 
 %build
 ./waf-light configure --prefix=%{_prefix}
 ./waf-light --make-waf --strip
 
-(cd doc/book ; ../../waf configure && ../../waf)
-
 
 %install
 %{__rm} -rf %{buildroot}
@@ -70,15 +64,11 @@
 # remove zero-length files
 %{__rm} demos/gnome/src/hello.h
 %{__rm} demos/simple_scenarios/local_tool/uh.coin
-%{__rm} doc/book/build/default/waf.html
 
 # bash completion
 %{__install} -D -p -m 0644 utils/waf-completion.bash \
   %{buildroot}%{_sysconfdir}/bash_completion.d//waf-completion.bash
 
-# basically giving it a better name
-%{__mv} doc/book/build/default doc/html
-
 
 %clean
 %{__rm} -rf %{buildroot}
@@ -87,13 +77,16 @@
 %files
 %defattr(-,root,root,-)
 %doc README TODO ChangeLog demos utils
-%doc doc/html
 %{_bindir}/waf
 %{_datadir}/waf
 %{_sysconfdir}/bash_completion.d
 
 
 %changelog
+* Fri Jan 16 2009 Thomas Moschny <thomas.moschny at gmx.de> - 1.5.2-2
+- Remove the documentation again, as it is under CC-BY-NC-ND. Also
+  remove it from the tarfile.
+
 * Fri Jan 16 2009 Thomas Moschny <thomas.moschny at gmx.de> - 1.5.2-1
 - Update to 1.5.2.
 - Generate html documentation (though without highlighting).


--- waf-1.5.2-book.patch DELETED ---


--- waf-1.5.2-stylesheet.patch DELETED ---



From tmraz at fedoraproject.org  Fri Jan 16 17:59:03 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 16 Jan 2009 17:59:03 +0000 (UTC)
Subject: rpms/hplip/devel hplip.spec,1.196,1.197
Message-ID: <20090116175903.BEAB670127@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/hplip/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11011

Modified Files:
	hplip.spec 
Log Message:
* Fri Jan 16 2009 Tomas Mraz <tmraz at redhat.com> 2.8.12-6
- rebuild with new openssl



Index: hplip.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/devel/hplip.spec,v
retrieving revision 1.196
retrieving revision 1.197
diff -u -r1.196 -r1.197
--- hplip.spec	13 Jan 2009 17:52:21 -0000	1.196
+++ hplip.spec	16 Jan 2009 17:58:33 -0000	1.197
@@ -1,7 +1,7 @@
 Summary: HP Linux Imaging and Printing Project
 Name: hplip
 Version: 2.8.12
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPLv2+ and MIT
 Group: System Environment/Daemons
 Conflicts: system-config-printer < 0.6.132
@@ -326,6 +326,9 @@
 exit 0
 
 %changelog
+* Fri Jan 16 2009 Tomas Mraz <tmraz at redhat.com> 2.8.12-6
+- rebuild with new openssl
+
 * Tue Jan 13 2009 Tim Waugh <twaugh at redhat.com> 2.8.12-5
 - Fixed Quit menu item in device manager (bug #479751).
 



From tmraz at fedoraproject.org  Fri Jan 16 18:00:00 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 16 Jan 2009 18:00:00 +0000 (UTC)
Subject: rpms/htdig/devel htdig.spec,1.47,1.48
Message-ID: <20090116180000.5FA0670127@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/htdig/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11178

Modified Files:
	htdig.spec 
Log Message:
* Fri Jan 16 2009 Tomas Mraz <tmraz at redhat.com> 4:3.2.0-0.4.b6
- rebuild with new openssl



Index: htdig.spec
===================================================================
RCS file: /cvs/pkgs/rpms/htdig/devel/htdig.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- htdig.spec	29 Jul 2008 13:04:14 -0000	1.47
+++ htdig.spec	16 Jan 2009 17:59:30 -0000	1.48
@@ -5,7 +5,7 @@
 Summary: ht://Dig - Web search engine
 Name: htdig
 Version: 3.2.0
-Release: 0.3.b6%{?dist}
+Release: 0.4.b6%{?dist}
 Epoch: 4
 License: GPLv2
 Group: Applications/Internet
@@ -153,6 +153,9 @@
 %endif
 
 %changelog
+* Fri Jan 16 2009 Tomas Mraz <tmraz at redhat.com> 4:3.2.0-0.4.b6
+- rebuild with new openssl
+
 * Tue Jul 29 2008 Adam Tkac <atkac redhat com> 4:3.2.0-0.3.b6
 - removed unneded patches
   - htdig-3.2.0b3-glibc222.patch and htdig-3.2.0b4-h_hash.patch



From cassmodiah at fedoraproject.org  Fri Jan 16 18:09:23 2009
From: cassmodiah at fedoraproject.org (Simon Wesp)
Date: Fri, 16 Jan 2009 18:09:23 +0000 (UTC)
Subject: rpms/bam/devel .cvsignore, 1.2, 1.3 bam.spec, 1.1, 1.2 import.log,
	1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20090116180923.B195170127@cvs1.fedora.phx.redhat.com>

Author: cassmodiah

Update of /cvs/pkgs/rpms/bam/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12298/devel

Modified Files:
	.cvsignore bam.spec import.log sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bam/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2008 14:21:04 -0000	1.2
+++ .cvsignore	16 Jan 2009 18:08:53 -0000	1.3
@@ -1 +1 @@
-bam.zip
+bam-0.2.0.tar.gz


Index: bam.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bam/devel/bam.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- bam.spec	8 Nov 2008 14:21:04 -0000	1.1
+++ bam.spec	16 Jan 2009 18:08:53 -0000	1.2
@@ -1,15 +1,13 @@
 Name:           bam
-Version:        0.0.0.4.3
-# bam is not versioned
-# the first two numbers are for an uncomplicated update of bam, if it will be versioned
-# the last three numbers figure the teeworlds version number
+Version:        0.2.0
+
 Release:        1%{?dist}
 Summary:        A build-system
 
 Group:          Amusements/Games
 License:        Teeworlds and MIT
 URL:            http://www.teeworlds.com
-Source0:        http://www.teeworlds.com/files/%{name}.zip
+Source0:        http://www.teeworlds.com/files/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 
@@ -19,7 +17,7 @@
 
 
 %prep
-%setup -q -n %{name}
+%setup -q 
 
 
 %build
@@ -44,6 +42,9 @@
 
 
 %changelog
+* Fri Jan 16 2009 Simon Wesp <cassmodiah at fedoraproject.org> 0.2.0-1
+- Update to 0.2.0
+
 * Sat Nov 01 2008 Simon Wesp <cassmodiah at fedoraproject.org> 0.0.0.4.3-1
 - Honor optflags
 - Select a 'better' code for version


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/bam/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	8 Nov 2008 14:21:04 -0000	1.1
+++ import.log	16 Jan 2009 18:08:53 -0000	1.2
@@ -1 +1,2 @@
 bam-0_0_0_4_3-1_fc10:HEAD:bam-0.0.0.4.3-1.fc10.src.rpm:1226154008
+bam-0_2_0-1_fc10:HEAD:bam-0.2.0-1.fc10.src.rpm:1232129331


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bam/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2008 14:21:04 -0000	1.2
+++ sources	16 Jan 2009 18:08:53 -0000	1.3
@@ -1 +1 @@
-dd1937ce711927299a1b09edffa319ca  bam.zip
+d4efe74591a73c1cec8b34d76ffd1049  bam-0.2.0.tar.gz



From rdieter at fedoraproject.org  Fri Jan 16 18:09:57 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 16 Jan 2009 18:09:57 +0000 (UTC)
Subject: rpms/gnupg2/F-10 .cvsignore, 1.27, 1.28 gnupg2.spec, 1.87,
	1.88 sources, 1.29, 1.30 gnupg-1.9.16-testverbose.patch, 1.1,
	NONE gnupg2-2.0.9-gcc43.patch, 1.1, NONE
Message-ID: <20090116180957.BF57270127@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/gnupg2/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12411

Modified Files:
	.cvsignore gnupg2.spec sources 
Removed Files:
	gnupg-1.9.16-testverbose.patch gnupg2-2.0.9-gcc43.patch 
Log Message:
* Tue Jan 13 2009 Rex Dieter <rdieter at fedoraproject.org> 2.0.10-1
- gnupg-2.0.10



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnupg2/F-10/.cvsignore,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- .cvsignore	26 Mar 2008 17:15:26 -0000	1.27
+++ .cvsignore	16 Jan 2009 18:09:27 -0000	1.28
@@ -1,2 +1,2 @@
-gnupg-2.0.9.tar.bz2
-gnupg-2.0.9.tar.bz2.sig
+gnupg-2.0.10.tar.bz2
+gnupg-2.0.10.tar.bz2.sig


Index: gnupg2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnupg2/F-10/gnupg2.spec,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -r1.87 -r1.88
--- gnupg2.spec	5 Aug 2008 00:56:00 -0000	1.87
+++ gnupg2.spec	16 Jan 2009 18:09:27 -0000	1.88
@@ -1,8 +1,8 @@
 
 Summary: Utility for secure communication and data storage
 Name:    gnupg2
-Version: 2.0.9
-Release: 3%{?dist}
+Version: 2.0.10
+Release: 1%{?dist}
 
 License: GPLv3+
 Group:   Applications/System
@@ -11,21 +11,15 @@
 URL:     http://www.gnupg.org/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Patch1: gnupg-1.9.16-testverbose.patch
-
-# Patch from upstream to fix curl 7.18.1+ and gcc4.3+ compile error
-# http://lists.gnupg.org/pipermail/gnupg-devel/2008-April/024344.html
-Patch2: gnupg2-2.0.9-gcc43.patch
-
 BuildRequires: bzip2-devel
 BuildRequires: curl-devel
 BuildRequires: docbook-utils
 BuildRequires: gettext
 BuildRequires: libassuan-devel >= 1.0.4
 # libgcrypt-devel >= 1.4.0 is preferred, see http://bugzilla.redhat.com/435320
-#BuildRequires:  libgcrypt-devel >= 1.4.0
-#Requires(hint): libgcrypt >= 1.4.0
-BuildRequires: libgcrypt-devel => 1.2.2
+BuildRequires:  libgcrypt-devel >= 1.4
+#Requires(hint): libgcrypt >= 1.4
+#BuildRequires: libgcrypt-devel => 1.2.2
 BuildRequires: libgpg-error-devel => 1.4
 BuildRequires: libksba-devel >= 1.0.2
 BuildRequires: libusb-devel
@@ -72,9 +66,6 @@
 %prep
 %setup -q -n gnupg-%{version}%{?pre}
 
-#patch1 -p1 -b .testverbose
-%patch2 -p1 -b .gcc43
-
 # pcsc-lite library major: 0 in 1.2.0, 1 in 1.2.9+ (dlopen()'d in pcsc-wrapper)
 # Note: this is just the name of the default shared lib to load in scdaemon,
 # it can use other implementations too (including non-pcsc ones).
@@ -102,7 +93,8 @@
 rm -rf %{buildroot}
 
 make install DESTDIR=%{buildroot} \
-  INSTALL="install -p"
+  INSTALL="install -p" \
+  docdir=%{_docdir}/%{name}-%{version}
 
 %find_lang %{name}
 
@@ -110,11 +102,15 @@
 mkdir -p %{buildroot}%{_sysconfdir}/gnupg
 touch %{buildroot}%{_sysconfdir}/gnupg/gpgconf.conf
 
+# more docs
+install -m644 -p AUTHORS COPYING ChangeLog NEWS THANKS TODO \
+  %{buildroot}%{_docdir}/%{name}-%{version}/
+
 ## Unpackaged files
 # file conflicts with gnupg-1.x
-# shouldn't gnupg2 be providing these now (maybe only f9+)? -- Rex
+# shouldn't gnupg2 be providing these now (maybe only f11+)? -- Rex
 rm -f %{buildroot}%{_bindir}/{gpgsplit,gpg-zip} 
-rm -f %{buildroot}%{_datadir}/gnupg/{FAQ,faq.html}
+rm -f %{buildroot}%{_mandir}/man1/gpg-zip.1*
 
 # info dir
 rm -f %{buildroot}%{_infodir}/dir
@@ -138,7 +134,8 @@
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING ChangeLog NEWS README THANKS TODO
+#doc AUTHORS COPYING ChangeLog NEWS README THANKS TODO
+%{_docdir}/%{name}-%{version}/
 %dir %{_sysconfdir}/gnupg
 %ghost %config(noreplace) %{_sysconfdir}/gnupg/gpgconf.conf
 #docs say to install suid root, but we won't, for now.
@@ -168,6 +165,9 @@
 
 
 %changelog
+* Tue Jan 13 2009 Rex Dieter <rdieter at fedoraproject.org> 2.0.10-1
+- gnupg-2.0.10
+
 * Mon Aug 04 2008 Rex Dieter <rdieter at fedoraproject.org> 2.0.9-3
 - workaround rpm quirks 
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnupg2/F-10/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- sources	26 Mar 2008 17:15:26 -0000	1.29
+++ sources	16 Jan 2009 18:09:27 -0000	1.30
@@ -1,2 +1,2 @@
-b41f3f6716a74c46a609a71853e85c7b  gnupg-2.0.9.tar.bz2
-29a90f2bdd27d79b7e9a0885f119832a  gnupg-2.0.9.tar.bz2.sig
+1cb778dd555f87685a8fde2f7113725e  gnupg-2.0.10.tar.bz2
+bf002a27b578b229adae914769272b27  gnupg-2.0.10.tar.bz2.sig


--- gnupg-1.9.16-testverbose.patch DELETED ---


--- gnupg2-2.0.9-gcc43.patch DELETED ---



From rdieter at fedoraproject.org  Fri Jan 16 18:11:07 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 16 Jan 2009 18:11:07 +0000 (UTC)
Subject: rpms/gnupg2/F-9 .cvsignore, 1.27, 1.28 gnupg2.spec, 1.86,
	1.87 sources, 1.29, 1.30 gnupg-1.9.16-testverbose.patch, 1.1,
	NONE gnupg2-2.0.9-gcc43.patch, 1.1, NONE
Message-ID: <20090116181107.01AA770127@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/gnupg2/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12695

Modified Files:
	.cvsignore gnupg2.spec sources 
Removed Files:
	gnupg-1.9.16-testverbose.patch gnupg2-2.0.9-gcc43.patch 
Log Message:
* Tue Jan 13 2009 Rex Dieter <rdieter at fedoraproject.org> 2.0.10-1
- gnupg-2.0.10



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnupg2/F-9/.cvsignore,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- .cvsignore	26 Mar 2008 17:15:26 -0000	1.27
+++ .cvsignore	16 Jan 2009 18:10:36 -0000	1.28
@@ -1,2 +1,2 @@
-gnupg-2.0.9.tar.bz2
-gnupg-2.0.9.tar.bz2.sig
+gnupg-2.0.10.tar.bz2
+gnupg-2.0.10.tar.bz2.sig


Index: gnupg2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnupg2/F-9/gnupg2.spec,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -r1.86 -r1.87
--- gnupg2.spec	24 May 2008 18:18:54 -0000	1.86
+++ gnupg2.spec	16 Jan 2009 18:10:36 -0000	1.87
@@ -1,8 +1,8 @@
 
 Summary: Utility for secure communication and data storage
 Name:    gnupg2
-Version: 2.0.9
-Release: 2%{?dist}
+Version: 2.0.10
+Release: 1%{?dist}
 
 License: GPLv3+
 Group:   Applications/System
@@ -11,21 +11,15 @@
 URL:     http://www.gnupg.org/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Patch1: gnupg-1.9.16-testverbose.patch
-
-# Patch from upstream to fix curl 7.18.1+ and gcc4.3+ compile error
-# http://lists.gnupg.org/pipermail/gnupg-devel/2008-April/024344.html
-Patch2: gnupg2-2.0.9-gcc43.patch
-
 BuildRequires: bzip2-devel
 BuildRequires: curl-devel
 BuildRequires: docbook-utils
 BuildRequires: gettext
 BuildRequires: libassuan-devel >= 1.0.4
 # libgcrypt-devel >= 1.4.0 is preferred, see http://bugzilla.redhat.com/435320
-#BuildRequires:  libgcrypt-devel >= 1.4.0
-#Requires(hint): libgcrypt >= 1.4.0
-BuildRequires: libgcrypt-devel => 1.2.2
+BuildRequires:  libgcrypt-devel >= 1.4
+#Requires(hint): libgcrypt >= 1.4
+#BuildRequires: libgcrypt-devel => 1.2.2
 BuildRequires: libgpg-error-devel => 1.4
 BuildRequires: libksba-devel >= 1.0.2
 BuildRequires: libusb-devel
@@ -72,13 +66,10 @@
 %prep
 %setup -q -n gnupg-%{version}%{?pre}
 
-#patch1 -p1 -b .testverbose
-%patch2 -p1 -b .gcc43
-
 # pcsc-lite library major: 0 in 1.2.0, 1 in 1.2.9+ (dlopen()'d in pcsc-wrapper)
 # Note: this is just the name of the default shared lib to load in scdaemon,
 # it can use other implementations too (including non-pcsc ones).
-%if "%{?pcsclib}" == "%{nil}"
+%if "x%{?pcsclib}" == "x%{nil}"
 %global pcsclib %(basename $(ls -1 %{_libdir}/libpcsclite.so.? 2>/dev/null ) 2>/dev/null )
 %endif
 
@@ -102,7 +93,8 @@
 rm -rf %{buildroot}
 
 make install DESTDIR=%{buildroot} \
-  INSTALL="install -p"
+  INSTALL="install -p" \
+  docdir=%{_docdir}/%{name}-%{version}
 
 %find_lang %{name}
 
@@ -110,11 +102,15 @@
 mkdir -p %{buildroot}%{_sysconfdir}/gnupg
 touch %{buildroot}%{_sysconfdir}/gnupg/gpgconf.conf
 
+# more docs
+install -m644 -p AUTHORS COPYING ChangeLog NEWS THANKS TODO \
+  %{buildroot}%{_docdir}/%{name}-%{version}/
+
 ## Unpackaged files
 # file conflicts with gnupg-1.x
-# shouldn't gnupg2 be providing these now (maybe only f9+)? -- Rex
+# shouldn't gnupg2 be providing these now (maybe only f11+)? -- Rex
 rm -f %{buildroot}%{_bindir}/{gpgsplit,gpg-zip} 
-rm -f %{buildroot}%{_datadir}/gnupg/{FAQ,faq.html}
+rm -f %{buildroot}%{_mandir}/man1/gpg-zip.1*
 
 # info dir
 rm -f %{buildroot}%{_infodir}/dir
@@ -138,7 +134,8 @@
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING ChangeLog NEWS README THANKS TODO
+#doc AUTHORS COPYING ChangeLog NEWS README THANKS TODO
+%{_docdir}/%{name}-%{version}/
 %dir %{_sysconfdir}/gnupg
 %ghost %config(noreplace) %{_sysconfdir}/gnupg/gpgconf.conf
 #docs say to install suid root, but we won't, for now.
@@ -168,6 +165,12 @@
 
 
 %changelog
+* Tue Jan 13 2009 Rex Dieter <rdieter at fedoraproject.org> 2.0.10-1
+- gnupg-2.0.10
+
+* Mon Aug 04 2008 Rex Dieter <rdieter at fedoraproject.org> 2.0.9-3
+- workaround rpm quirks 
+
 * Sat May 24 2008 Tom "spot" Callaway <tcallawa at redhat.com> 2.0.9-2
 - Patch from upstream to fix curl 7.18.1+ and gcc4.3+ compile error
 
@@ -178,7 +181,7 @@
 - gnupg2-2.0.9
 - drop Provides: openpgp
 - versioned Provides: gpg
-- own /etc/gnupg
+- own %%_sysconfdir/gnupg
 
 * Fri Feb 08 2008 Rex Dieter <rdieter at fedoraproject.org> 2.0.8-3 
 - respin (gcc43)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnupg2/F-9/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- sources	26 Mar 2008 17:15:26 -0000	1.29
+++ sources	16 Jan 2009 18:10:36 -0000	1.30
@@ -1,2 +1,2 @@
-b41f3f6716a74c46a609a71853e85c7b  gnupg-2.0.9.tar.bz2
-29a90f2bdd27d79b7e9a0885f119832a  gnupg-2.0.9.tar.bz2.sig
+1cb778dd555f87685a8fde2f7113725e  gnupg-2.0.10.tar.bz2
+bf002a27b578b229adae914769272b27  gnupg-2.0.10.tar.bz2.sig


--- gnupg-1.9.16-testverbose.patch DELETED ---


--- gnupg2-2.0.9-gcc43.patch DELETED ---



From cassmodiah at fedoraproject.org  Fri Jan 16 18:12:59 2009
From: cassmodiah at fedoraproject.org (Simon Wesp)
Date: Fri, 16 Jan 2009 18:12:59 +0000 (UTC)
Subject: rpms/bam/F-10 .cvsignore, 1.2, 1.3 bam.spec, 1.1, 1.2 import.log,
	1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20090116181259.5565970127@cvs1.fedora.phx.redhat.com>

Author: cassmodiah

Update of /cvs/pkgs/rpms/bam/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12854/F-10

Modified Files:
	.cvsignore bam.spec import.log sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bam/F-10/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2008 14:14:47 -0000	1.2
+++ .cvsignore	16 Jan 2009 18:12:28 -0000	1.3
@@ -1 +1 @@
-bam.zip
+bam-0.2.0.tar.gz


Index: bam.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bam/F-10/bam.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- bam.spec	8 Nov 2008 14:14:47 -0000	1.1
+++ bam.spec	16 Jan 2009 18:12:28 -0000	1.2
@@ -1,15 +1,13 @@
 Name:           bam
-Version:        0.0.0.4.3
-# bam is not versioned
-# the first two numbers are for an uncomplicated update of bam, if it will be versioned
-# the last three numbers figure the teeworlds version number
+Version:        0.2.0
+
 Release:        1%{?dist}
 Summary:        A build-system
 
 Group:          Amusements/Games
 License:        Teeworlds and MIT
 URL:            http://www.teeworlds.com
-Source0:        http://www.teeworlds.com/files/%{name}.zip
+Source0:        http://www.teeworlds.com/files/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 
@@ -19,7 +17,7 @@
 
 
 %prep
-%setup -q -n %{name}
+%setup -q 
 
 
 %build
@@ -44,6 +42,9 @@
 
 
 %changelog
+* Fri Jan 16 2009 Simon Wesp <cassmodiah at fedoraproject.org> 0.2.0-1
+- Update to 0.2.0
+
 * Sat Nov 01 2008 Simon Wesp <cassmodiah at fedoraproject.org> 0.0.0.4.3-1
 - Honor optflags
 - Select a 'better' code for version


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/bam/F-10/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	8 Nov 2008 14:14:47 -0000	1.1
+++ import.log	16 Jan 2009 18:12:28 -0000	1.2
@@ -1 +1,2 @@
 bam-0_0_0_4_3-1_fc10:F-10:bam-0.0.0.4.3-1.fc10.src.rpm:1226153660
+bam-0_2_0-1_fc10:F-10:bam-0.2.0-1.fc10.src.rpm:1232129524


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bam/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2008 14:14:47 -0000	1.2
+++ sources	16 Jan 2009 18:12:28 -0000	1.3
@@ -1 +1 @@
-dd1937ce711927299a1b09edffa319ca  bam.zip
+d4efe74591a73c1cec8b34d76ffd1049  bam-0.2.0.tar.gz



From mnagy at fedoraproject.org  Fri Jan 16 18:14:14 2009
From: mnagy at fedoraproject.org (Martin Nagy)
Date: Fri, 16 Jan 2009 18:14:14 +0000 (UTC)
Subject: rpms/vsftpd/devel vsftpd-2.1.0-disable_ptrace.patch, NONE,
	1.1 vsftpd-2.1.0-warnings.patch, 1.1, 1.2 vsftpd.spec, 1.84, 1.85
Message-ID: <20090116181414.6133170127@cvs1.fedora.phx.redhat.com>

Author: mnagy

Update of /cvs/extras/rpms/vsftpd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13373

Modified Files:
	vsftpd-2.1.0-warnings.patch vsftpd.spec 
Added Files:
	vsftpd-2.1.0-disable_ptrace.patch 
Log Message:
* Fri Jan 16 2009 Martin Nagy <mnagy at redhat.com> - 2.1.0-0.2.pre3
- disable ptrace sandbox to fix build on i386


vsftpd-2.1.0-disable_ptrace.patch:

--- NEW FILE vsftpd-2.1.0-disable_ptrace.patch ---
diff -up vsftpd-2.1.0/ptracesandbox.c.disable_ptrace vsftpd-2.1.0/ptracesandbox.c
--- vsftpd-2.1.0/ptracesandbox.c.disable_ptrace	2009-01-16 19:04:48.000000000 +0100
+++ vsftpd-2.1.0/ptracesandbox.c	2009-01-16 19:04:56.000000000 +0100
@@ -14,7 +14,7 @@
 
 #include "ptracesandbox.h"
 
-#if defined(__linux__) && defined(__i386__)
+#if defined(__linux__) && defined(__i386__) && 0
 
 #include <sys/mman.h>
 #include <sys/prctl.h>

vsftpd-2.1.0-warnings.patch:

Index: vsftpd-2.1.0-warnings.patch
===================================================================
RCS file: /cvs/extras/rpms/vsftpd/devel/vsftpd-2.1.0-warnings.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- vsftpd-2.1.0-warnings.patch	16 Jan 2009 17:23:12 -0000	1.1
+++ vsftpd-2.1.0-warnings.patch	16 Jan 2009 18:14:14 -0000	1.2
@@ -1,7 +1,27 @@
 diff -up vsftpd-2.1.0/ptracesandbox.c.warnings vsftpd-2.1.0/ptracesandbox.c
---- vsftpd-2.1.0/ptracesandbox.c.warnings	2009-01-15 15:31:26.000000000 +0100
-+++ vsftpd-2.1.0/ptracesandbox.c	2009-01-15 15:32:56.000000000 +0100
-@@ -1146,6 +1146,7 @@ int
+--- vsftpd-2.1.0/ptracesandbox.c.warnings	2009-01-09 07:20:00.000000000 +0100
++++ vsftpd-2.1.0/ptracesandbox.c	2009-01-16 19:01:27.000000000 +0100
+@@ -20,6 +20,7 @@
+ #include <sys/prctl.h>
+ #include <sys/ptrace.h>
+ #include <sys/types.h>
++#include <sys/user.h>
+ #include <sys/wait.h>
+ #include <err.h>
+ #include <errno.h>
+@@ -31,10 +32,10 @@
+ #include <syslog.h>
+ 
+ #include <asm/unistd.h>
+-#include <asm/user.h>
+ 
+ /* For the socketcall() multiplex args. */
+ #include <linux/net.h>
++#include <linux/socket.h>
+ 
+ #ifndef PTRACE_SETOPTIONS
+   #define PTRACE_SETOPTIONS 0x4200
+@@ -1146,6 +1147,7 @@ int
  ptrace_sandbox_run_processes(struct pt_sandbox* p_sandbox)
  {
    (void) p_sandbox;
@@ -9,4 +29,3 @@
  }
  
  void
-diff -up vsftpd-2.1.0/sysdeputil.c.warnings vsftpd-2.1.0/sysdeputil.c


Index: vsftpd.spec
===================================================================
RCS file: /cvs/extras/rpms/vsftpd/devel/vsftpd.spec,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -r1.84 -r1.85
--- vsftpd.spec	16 Jan 2009 17:23:12 -0000	1.84
+++ vsftpd.spec	16 Jan 2009 18:14:14 -0000	1.85
@@ -2,7 +2,7 @@
 
 Name: vsftpd
 Version: 2.1.0
-Release: 0.1.pre3%{?dist}
+Release: 0.2.pre3%{?dist}
 Summary: Very Secure Ftp Daemon
 
 Group: System Environment/Daemons
@@ -49,6 +49,8 @@
 # Sent upstream on 2009-01-16 via email
 Patch10: vsftpd-2.1.0-warnings.patch
 
+Patch11: vsftpd-2.1.0-disable_ptrace.patch
+
 
 %description
 vsftpd is a Very Secure FTP daemon. It was written completely from
@@ -71,6 +73,7 @@
 %patch8 -p1 -b .greedy
 %patch9 -p1 -b .userlist_log
 %patch10 -p1 -b .warnings
+%patch11 -p1 -b .disable_ptrace
 
 
 %build
@@ -133,6 +136,9 @@
 
 
 %changelog
+* Fri Jan 16 2009 Martin Nagy <mnagy at redhat.com> - 2.1.0-0.2.pre3
+- disable ptrace sandbox to fix build on i386
+
 * Fri Jan 16 2009 Martin Nagy <mnagy at redhat.com> - 2.1.0-0.1.pre3
 - update to latest upstream release
 - cleanup the spec file



From ke4qqq at fedoraproject.org  Fri Jan 16 18:16:18 2009
From: ke4qqq at fedoraproject.org (David Nalley)
Date: Fri, 16 Jan 2009 18:16:18 +0000 (UTC)
Subject: rpms/zapplet/devel README.fedora, NONE, 1.1 import.log, NONE,
	1.1 zapplet.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090116181618.DD34070127@cvs1.fedora.phx.redhat.com>

Author: ke4qqq

Update of /cvs/pkgs/rpms/zapplet/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13661/devel

Modified Files:
	.cvsignore sources 
Added Files:
	README.fedora import.log zapplet.spec 
Log Message:
Initial commit



--- NEW FILE README.fedora ---
To have Zapplet start on login use the following command as root: 
'cp /usr/share/applications/zapplet.desktop  /etc/xdg/autostart/zapplet.desktop'


--- NEW FILE import.log ---
zapplet-0_1-3:HEAD:zapplet-0.1-3.src.rpm:1232129636


--- NEW FILE zapplet.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
Name:           zapplet
Version:        0.1
Release:        3 
Summary:        Zenoss Tray Applet
Group:          Applications/Communications
License:        GPLv2+
URL:            http://zapplet.sourceforge.net
Source0:        http://downloads.sourceforge.net/zapplet/zapplet-%{version}.tar.gz
Source1:        http://ke4qqq.fedorapeople.org/zapplet/README.fedora
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  python
BuildRequires:  python-setuptools-devel 
BuildRequires:  desktop-file-utils
Requires:       pygtk2 
BuildArch:      noarch

%description
Zapplet is a tray applet for monitoring aspects of Zenoss from the desktop. 

%prep
%setup -q -n zapplet-%{version}
cp %{SOURCE1} ./README.fedora
%build
CFLAGS="%{optflags}" %{__python} setup.py build

%install
rm -rf %{buildroot}
%{__python} setup.py install -O1 --skip-build --root %{buildroot}

desktop-file-install --add-category="Network" --dir=%{buildroot}%{_datadir}/applications zapplet.desktop
rm -rf %{buildroot}%{_sysconfdir}/xdg/autostart/zapplet.desktop

%clean 
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%{python_sitelib}/*
%{_bindir}/%{name} 
%{_datadir}/applications/zapplet.desktop
%doc README.fedora
%changelog
* Sun Dec 28 2008 David Nalley <david at gnsa.us> 0.1-3
- Made changes suggested by Brian Pepple
* Sat Dec 27 2008 David Nalley <david at gnsa.us> 0.1-2
- Making corrections suggested by Fabian Affolter
* Sun Dec 14 2008 David Nalley <david at gnsa.us> 0.1-1
- Initial packaging efforts



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/zapplet/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	15 Jan 2009 20:13:55 -0000	1.1
+++ .cvsignore	16 Jan 2009 18:15:48 -0000	1.2
@@ -0,0 +1 @@
+zapplet-0.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/zapplet/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	15 Jan 2009 20:13:55 -0000	1.1
+++ sources	16 Jan 2009 18:15:48 -0000	1.2
@@ -0,0 +1 @@
+d12db237f805d6711d8d720080e06eaa  zapplet-0.1.tar.gz



From tmraz at fedoraproject.org  Fri Jan 16 18:19:38 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 16 Jan 2009 18:19:38 +0000 (UTC)
Subject: rpms/htmldoc/devel htmldoc.spec,1.11,1.12
Message-ID: <20090116181938.A25FF70127@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/htmldoc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14287

Modified Files:
	htmldoc.spec 
Log Message:
* Fri Jan 16 2009 Tomas Mraz <tmraz at redhat.com> - 1.8.27-8
- rebuild with new openssl



Index: htmldoc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/htmldoc/devel/htmldoc.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- htmldoc.spec	23 Nov 2008 01:03:21 -0000	1.11
+++ htmldoc.spec	16 Jan 2009 18:19:08 -0000	1.12
@@ -1,6 +1,6 @@
 Name:		htmldoc
 Version:	1.8.27
-Release:	7%{?dist}
+Release:	8%{?dist}
 Summary:	Converter from HTML into indexed HTML, PostScript, or PDF
 
 Group:		Applications/Publishing
@@ -117,6 +117,9 @@
 
 
 %changelog
+* Fri Jan 16 2009 Tomas Mraz <tmraz at redhat.com> - 1.8.27-8
+- rebuild with new openssl
+
 * Sat Aug 30 2008 Adam Goode <adam at spicenitz.org> - 1.8.27-7
 - RPM 4.6 fix for patch tag
 



From tmraz at fedoraproject.org  Fri Jan 16 18:21:04 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 16 Jan 2009 18:21:04 +0000 (UTC)
Subject: rpms/httpd/devel httpd.spec,1.130,1.131
Message-ID: <20090116182104.717DC70127@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/httpd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14467

Modified Files:
	httpd.spec 
Log Message:
* Fri Jan 16 2009 Tomas Mraz <tmraz at redhat.com> 2.2.11-5
- rebuild with new openssl



Index: httpd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/httpd/devel/httpd.spec,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -r1.130 -r1.131
--- httpd.spec	27 Dec 2008 14:39:47 -0000	1.130
+++ httpd.spec	16 Jan 2009 18:20:34 -0000	1.131
@@ -7,7 +7,7 @@
 Summary: Apache HTTP Server
 Name: httpd
 Version: 2.2.11
-Release: 4
+Release: 5
 URL: http://httpd.apache.org/
 Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz
 Source1: index.html
@@ -482,6 +482,9 @@
 %{_libdir}/httpd/build/*.sh
 
 %changelog
+* Fri Jan 16 2009 Tomas Mraz <tmraz at redhat.com> 2.2.11-5
+- rebuild with new openssl
+
 * Sat Dec 27 2008 Robert Scheck <robert at fedoraproject.org> 2.2.11-4
 - Made default configuration using /var/run/httpd for pid file
 



From ke4qqq at fedoraproject.org  Fri Jan 16 18:22:29 2009
From: ke4qqq at fedoraproject.org (David Nalley)
Date: Fri, 16 Jan 2009 18:22:29 +0000 (UTC)
Subject: rpms/zapplet/F-9 README.fedora, NONE, 1.1 import.log, NONE,
	1.1 zapplet.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090116182229.48BC170127@cvs1.fedora.phx.redhat.com>

Author: ke4qqq

Update of /cvs/pkgs/rpms/zapplet/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14139/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	README.fedora import.log zapplet.spec 
Log Message:
* Fri Jan 16 2009 David Nalley <david at gnsa.us> 
- Initial upload



--- NEW FILE README.fedora ---
To have Zapplet start on login use the following command as root: 
'cp /usr/share/applications/zapplet.desktop  /etc/xdg/autostart/zapplet.desktop'


--- NEW FILE import.log ---
zapplet-0_1-3:F-9:zapplet-0.1-3.src.rpm:1232129796


--- NEW FILE zapplet.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
Name:           zapplet
Version:        0.1
Release:        3 
Summary:        Zenoss Tray Applet
Group:          Applications/Communications
License:        GPLv2+
URL:            http://zapplet.sourceforge.net
Source0:        http://downloads.sourceforge.net/zapplet/zapplet-%{version}.tar.gz
Source1:        http://ke4qqq.fedorapeople.org/zapplet/README.fedora
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  python
BuildRequires:  python-setuptools-devel 
BuildRequires:  desktop-file-utils
Requires:       pygtk2 
BuildArch:      noarch

%description
Zapplet is a tray applet for monitoring aspects of Zenoss from the desktop. 

%prep
%setup -q -n zapplet-%{version}
cp %{SOURCE1} ./README.fedora
%build
CFLAGS="%{optflags}" %{__python} setup.py build

%install
rm -rf %{buildroot}
%{__python} setup.py install -O1 --skip-build --root %{buildroot}

desktop-file-install --add-category="Network" --dir=%{buildroot}%{_datadir}/applications zapplet.desktop
rm -rf %{buildroot}%{_sysconfdir}/xdg/autostart/zapplet.desktop

%clean 
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%{python_sitelib}/*
%{_bindir}/%{name} 
%{_datadir}/applications/zapplet.desktop
%doc README.fedora
%changelog
* Sun Dec 28 2008 David Nalley <david at gnsa.us> 0.1-3
- Made changes suggested by Brian Pepple
* Sat Dec 27 2008 David Nalley <david at gnsa.us> 0.1-2
- Making corrections suggested by Fabian Affolter
* Sun Dec 14 2008 David Nalley <david at gnsa.us> 0.1-1
- Initial packaging efforts



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/zapplet/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	15 Jan 2009 20:13:55 -0000	1.1
+++ .cvsignore	16 Jan 2009 18:21:58 -0000	1.2
@@ -0,0 +1 @@
+zapplet-0.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/zapplet/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	15 Jan 2009 20:13:55 -0000	1.1
+++ sources	16 Jan 2009 18:21:58 -0000	1.2
@@ -0,0 +1 @@
+d12db237f805d6711d8d720080e06eaa  zapplet-0.1.tar.gz



From mclasen at fedoraproject.org  Fri Jan 16 18:32:56 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Fri, 16 Jan 2009 18:32:56 +0000 (UTC)
Subject: rpms/gnome-panel/devel gnome-panel.spec, 1.338,
	1.339 preferred-apps.patch, 1.9, 1.10
Message-ID: <20090116183256.E2D1970127@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-panel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17256

Modified Files:
	gnome-panel.spec preferred-apps.patch 
Log Message:
fix smart launchers



Index: gnome-panel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-panel/devel/gnome-panel.spec,v
retrieving revision 1.338
retrieving revision 1.339
diff -u -r1.338 -r1.339
--- gnome-panel.spec	18 Dec 2008 17:45:41 -0000	1.338
+++ gnome-panel.spec	16 Jan 2009 18:32:26 -0000	1.339
@@ -23,7 +23,7 @@
 Summary: GNOME panel
 Name: gnome-panel
 Version: 2.25.3
-Release: 3%{?dist}
+Release: 4%{?dist}
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/gnome-panel/2.25/%{name}-%{version}.tar.bz2
 
@@ -373,6 +373,9 @@
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Fri Jan 16 2009 Matthias Clasen <mclasen at redhat.com> - 2.25.3-3
+- Fix the 'smart launcher' patch
+
 * Thu Dec 18 2008 - Bastien Nocera <bnocera at redhat.com> - 2.25.3-3
 - Remove the mixer from the default panel config as well
 - Update search and preferred apps patches

preferred-apps.patch:

Index: preferred-apps.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-panel/devel/preferred-apps.patch,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- preferred-apps.patch	18 Dec 2008 17:45:42 -0000	1.9
+++ preferred-apps.patch	16 Jan 2009 18:32:26 -0000	1.10
@@ -1,33 +1,6 @@
-Index: gnome-panel/panel-run-dialog.c
-===================================================================
---- gnome-panel/panel-run-dialog.c	(revision 11419)
-+++ gnome-panel/panel-run-dialog.c	(working copy)
-@@ -789,7 +789,7 @@
- 	return list;
- }
- 
--static GSList *
-+GSList *
- get_all_applications (void)
- {
- 	GMenuTree          *tree;
-Index: gnome-panel/panel-run-dialog.h
-===================================================================
---- gnome-panel/panel-run-dialog.h	(revision 11419)
-+++ gnome-panel/panel-run-dialog.h	(working copy)
-@@ -32,6 +32,8 @@
- void panel_run_dialog_present           (GdkScreen  *screen,
- 					 guint32    activate_time);
- 
-+GSList *get_all_applications           (void);
-+
- G_END_DECLS
- 
- #endif /* __PANEL_RUN_DIALOG_H__ */
-Index: gnome-panel/launcher.c
-===================================================================
---- gnome-panel/launcher.c	(revision 11419)
-+++ gnome-panel/launcher.c	(working copy)
+diff -up gnome-panel-2.25.3/gnome-panel/launcher.c.preferred-apps gnome-panel-2.25.3/gnome-panel/launcher.c
+--- gnome-panel-2.25.3/gnome-panel/launcher.c.preferred-apps	2009-01-16 13:27:30.000000000 -0500
++++ gnome-panel-2.25.3/gnome-panel/launcher.c	2009-01-16 13:31:07.000000000 -0500
 @@ -21,6 +21,7 @@
  #include <glib/gi18n.h>
  #include <gio/gio.h>
@@ -44,7 +17,7 @@
  
  static GdkScreen *
  launcher_get_screen (Launcher *launcher)
-@@ -1110,3 +1112,173 @@
+@@ -1215,3 +1217,178 @@ panel_launcher_set_dnd_enabled (Launcher
  	} else
  		gtk_drag_source_unset (launcher->button);
  }
@@ -198,6 +171,11 @@
 +
 +	client = panel_gconf_get_client ();
 +
++	gconf_client_add_dir (client,
++			      "desktop/gnome/url-handlers",
++			      GCONF_CLIENT_PRELOAD_NONE,
++			      NULL);
++
 +	for (i = 0; keys[i]; i++) {
 +                dirname = g_build_filename (g_get_user_data_dir (), 
 +					    "applications", NULL);
@@ -218,10 +196,9 @@
 +					 filename, g_free, NULL);
 +	}
 +}
-Index: gnome-panel/launcher.h
-===================================================================
---- gnome-panel/launcher.h	(revision 11419)
-+++ gnome-panel/launcher.h	(working copy)
+diff -up gnome-panel-2.25.3/gnome-panel/launcher.h.preferred-apps gnome-panel-2.25.3/gnome-panel/launcher.h
+--- gnome-panel-2.25.3/gnome-panel/launcher.h.preferred-apps	2009-01-16 13:27:30.000000000 -0500
++++ gnome-panel-2.25.3/gnome-panel/launcher.h	2009-01-16 13:27:30.000000000 -0500
 @@ -14,6 +14,8 @@
  #include "applet.h"
  #include "panel-widget.h"
@@ -231,7 +208,7 @@
  G_BEGIN_DECLS
  
  typedef struct {
-@@ -70,6 +72,7 @@
+@@ -71,6 +73,7 @@ void            launcher_properties_dest
  void            panel_launcher_set_dnd_enabled  (Launcher *launcher,
  						 gboolean  dnd_enabled);
  
@@ -239,10 +216,9 @@
  
  G_END_DECLS
  
-Index: gnome-panel/main.c
-===================================================================
---- gnome-panel/main.c	(revision 11419)
-+++ gnome-panel/main.c	(working copy)
+diff -up gnome-panel-2.25.3/gnome-panel/main.c.preferred-apps gnome-panel-2.25.3/gnome-panel/main.c
+--- gnome-panel-2.25.3/gnome-panel/main.c.preferred-apps	2008-12-09 07:32:37.000000000 -0500
++++ gnome-panel-2.25.3/gnome-panel/main.c	2009-01-16 13:27:30.000000000 -0500
 @@ -27,6 +27,7 @@
  #include "panel-action-protocol.h"
  #include "panel-lockdown.h"
@@ -251,7 +227,7 @@
  #include "xstuff.h"
  
  #include "nothing.cP"
-@@ -86,6 +87,7 @@
+@@ -86,6 +87,7 @@ main (int argc, char **argv)
  			      GCONF_CLIENT_PRELOAD_NONE,
  			      NULL);
  
@@ -259,3 +235,27 @@
  	panel_global_config_load ();
  	panel_lockdown_init ();
  	panel_profile_load ();
+diff -up gnome-panel-2.25.3/gnome-panel/panel-run-dialog.c.preferred-apps gnome-panel-2.25.3/gnome-panel/panel-run-dialog.c
+--- gnome-panel-2.25.3/gnome-panel/panel-run-dialog.c.preferred-apps	2008-12-11 12:03:03.000000000 -0500
++++ gnome-panel-2.25.3/gnome-panel/panel-run-dialog.c	2009-01-16 13:27:30.000000000 -0500
+@@ -789,7 +789,7 @@ get_all_applications_from_dir (GMenuTree
+ 	return list;
+ }
+ 
+-static GSList *
++GSList *
+ get_all_applications (void)
+ {
+ 	GMenuTree          *tree;
+diff -up gnome-panel-2.25.3/gnome-panel/panel-run-dialog.h.preferred-apps gnome-panel-2.25.3/gnome-panel/panel-run-dialog.h
+--- gnome-panel-2.25.3/gnome-panel/panel-run-dialog.h.preferred-apps	2008-11-08 19:27:01.000000000 -0500
++++ gnome-panel-2.25.3/gnome-panel/panel-run-dialog.h	2009-01-16 13:27:30.000000000 -0500
+@@ -32,6 +32,8 @@ G_BEGIN_DECLS
+ void panel_run_dialog_present           (GdkScreen  *screen,
+ 					 guint32    activate_time);
+ 
++GSList *get_all_applications           (void);
++
+ G_END_DECLS
+ 
+ #endif /* __PANEL_RUN_DIALOG_H__ */



From jakub at fedoraproject.org  Fri Jan 16 18:34:39 2009
From: jakub at fedoraproject.org (Jakub Jelinek)
Date: Fri, 16 Jan 2009 18:34:39 +0000 (UTC)
Subject: rpms/gcc/devel fastjar-0.97-segfault.patch, NONE, 1.1 gcc.spec, NONE,
	1.1 gcc44-build-id.patch, NONE,
	1.1 gcc44-c++-builtin-redecl.patch, NONE, 1.1 gcc44-hack.patch,
	NONE, 1.1 gcc44-i386-libgomp.patch, NONE,
	1.1 gcc44-ia64-libunwind.patch, NONE,
	1.1 gcc44-java-debug-iface-type.patch, NONE,
	1.1 gcc44-java-nomulti.patch, NONE,
	1.1 gcc44-libgomp-omp_h-multilib.patch, NONE,
	1.1 gcc44-libtool-no-rpath.patch, NONE,
	1.1 gcc44-ppc32-retaddr.patch, NONE, 1.1 gcc44-pr27898.patch,
	NONE, 1.1 gcc44-pr32139.patch, NONE, 1.1 gcc44-pr33763.patch,
	NONE, 1.1 gcc44-rh330771.patch, NONE, 1.1 gcc44-rh341221.patch,
	NONE, 1.1 gcc44-sparc-config-detection.patch, NONE,
	1.1 import.log, NONE, 1.1 .cvsignore, 1.246, 1.247 sources,
	1.249, 1.250 gcc43-aes.patch, 1.1,
	NONE gcc43-altivec-tests.patch, 1.2, NONE gcc43-build-id.patch,
	1.2, NONE gcc43-c++-builtin-redecl.patch, 1.1,
	NONE gcc43-i386-libgomp.patch, 1.1,
	NONE gcc43-ia64-libunwind.patch, 1.2,
	NONE gcc43-java-debug-iface-type.patch, 1.1,
	NONE gcc43-java-nomulti.patch, 1.1,
	NONE gcc43-libgomp-omp_h-multilib.patch, 1.1,
	NONE gcc43-libtool-no-rpath.patch, 1.1,
	NONE gcc43-ppc32-retaddr.patch, 1.1,
	NONE gcc43-ppc64-ia64-GNU-stack.patch, 1.1,
	NONE gcc43-pr27898.patch, 1.1, NONE gcc43-pr29609-2.patch, 1.1,
	NONE gcc43-pr29609-3.patch, 1.2, NONE gcc43-pr29609.patch, 1.1,
	NONE gcc43-pr32139.patch, 1.2, NONE gcc43-pr33763.patch, 1.1,
	NONE gcc43-pr34037.patch, 1.1, NONE gcc43-pr36741-revert.patch,
	1.1, NONE gcc43-pr37189.patch, 1.1, NONE gcc43-pr37738.patch,
	1.1, NONE gcc43-pr37858.patch, 1.1, NONE gcc43-pr37870.patch,
	1.1, NONE gcc43-pr37879.patch, 1.1, NONE gcc43-pr37924.patch,
	1.1, NONE gcc43-rh251682.patch, 1.1, NONE gcc43-rh330771.patch,
	1.2, NONE gcc43-rh341221.patch, 1.1,
	NONE gcc43-sparc-config-detection.patch, 1.1,
	NONE gcc43-x86_64-va_start.patch, 1.1, NONE gcc43.spec, 1.48, NONE
Message-ID: <20090116183439.2337270127@cvs1.fedora.phx.redhat.com>

Author: jakub

Update of /cvs/pkgs/rpms/gcc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17885/devel

Modified Files:
	.cvsignore sources 
Added Files:
	fastjar-0.97-segfault.patch gcc.spec gcc44-build-id.patch 
	gcc44-c++-builtin-redecl.patch gcc44-hack.patch 
	gcc44-i386-libgomp.patch gcc44-ia64-libunwind.patch 
	gcc44-java-debug-iface-type.patch gcc44-java-nomulti.patch 
	gcc44-libgomp-omp_h-multilib.patch 
	gcc44-libtool-no-rpath.patch gcc44-ppc32-retaddr.patch 
	gcc44-pr27898.patch gcc44-pr32139.patch gcc44-pr33763.patch 
	gcc44-rh330771.patch gcc44-rh341221.patch 
	gcc44-sparc-config-detection.patch import.log 
Removed Files:
	gcc43-aes.patch gcc43-altivec-tests.patch gcc43-build-id.patch 
	gcc43-c++-builtin-redecl.patch gcc43-i386-libgomp.patch 
	gcc43-ia64-libunwind.patch gcc43-java-debug-iface-type.patch 
	gcc43-java-nomulti.patch gcc43-libgomp-omp_h-multilib.patch 
	gcc43-libtool-no-rpath.patch gcc43-ppc32-retaddr.patch 
	gcc43-ppc64-ia64-GNU-stack.patch gcc43-pr27898.patch 
	gcc43-pr29609-2.patch gcc43-pr29609-3.patch 
	gcc43-pr29609.patch gcc43-pr32139.patch gcc43-pr33763.patch 
	gcc43-pr34037.patch gcc43-pr36741-revert.patch 
	gcc43-pr37189.patch gcc43-pr37738.patch gcc43-pr37858.patch 
	gcc43-pr37870.patch gcc43-pr37879.patch gcc43-pr37924.patch 
	gcc43-rh251682.patch gcc43-rh330771.patch gcc43-rh341221.patch 
	gcc43-sparc-config-detection.patch gcc43-x86_64-va_start.patch 
	gcc43.spec 
Log Message:
4.4.0-0.3


fastjar-0.97-segfault.patch:

--- NEW FILE fastjar-0.97-segfault.patch ---
2009-01-14  Jakub Jelinek  <jakub at redhat.com>

	* jartool.c (make_manifest): Initialize current_time before
	calling unix2dostime on it.

--- fastjar-0.97/jartool.c.jj	2008-10-15 18:35:37.000000000 +0200
+++ fastjar-0.97/jartool.c	2009-01-14 15:40:50.000000000 +0100
@@ -820,6 +820,10 @@ int make_manifest(int jfd, const char *m
   int mod_time; /* file modification time */
   struct zipentry *ze;
 
+  current_time = time(NULL);
+  if(current_time == (time_t)-1)
+    exit_on_error("time");
+
   mod_time = unix2dostime(&current_time);  
   
   /* If we are creating a new manifest, create a META-INF directory entry */
@@ -828,10 +832,6 @@ int make_manifest(int jfd, const char *m
 
     memset((file_header + 12), '\0', 16); /*clear mod time, crc, size fields*/
   
-    current_time = time(NULL);
-    if(current_time == (time_t)-1)
-      exit_on_error("time");
-
     PACK_UB2(file_header, LOC_EXTRA, 0);
     PACK_UB2(file_header, LOC_COMP, 0);
     PACK_UB2(file_header, LOC_FNLEN, nlen);


--- NEW FILE gcc.spec ---
%define DATE 20090115
%define SVNREV 141601
%define gcc_version 4.4.0
# 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 0.3
%define _unpackaged_files_terminate_build 0
%define multilib_64_archs sparc64 ppc64 s390x x86_64
%define include_gappletviewer 1
%ifarch %{ix86} x86_64 ia64 ppc alpha
%define build_ada 1
%else
%define build_ada 0
%endif
%define build_java 1
# If you don't have already a usable gcc-java and libgcj for your arch,
# do on some arch which has it rpmbuild -bc --with java_tar gcc41.spec
# which creates libjava-classes-%{version}-%{release}.tar.bz2
# With this then on the new arch do rpmbuild -ba -v --with java_bootstrap gcc41.spec
%define bootstrap_java %{?_with_java_bootstrap:%{build_java}}%{!?_with_java_bootstrap:0}
%define build_java_tar %{?_with_java_tar:%{build_java}}%{!?_with_java_tar:0}
%ifarch s390x
%define multilib_32_arch s390
%endif
%ifarch sparc64
%define multilib_32_arch sparcv9
%endif
%ifarch ppc64
%define multilib_32_arch ppc
%endif
%ifarch x86_64
%define multilib_32_arch i386
%endif
Summary: Various compilers (C, C++, Objective-C, Java, ...)
Name: gcc
Version: %{gcc_version}
Release: %{gcc_release}
# libgcc, libgfortran, libmudflap and crtstuff have an exception which allows
# linking it into any kind of programs or shared libraries without
# 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
Source3: protoize.1
%define fastjar_ver 0.97
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)
# Need binutils with -pie support >= 2.14.90.0.4-4
# Need binutils which can omit dot symbols and overlap .opd on ppc64 >= 2.15.91.0.2-4
# Need binutils which handle -msecure-plt on ppc >= 2.16.91.0.2-2
# Need binutils which support .weakref >= 2.16.91.0.3-1
# Need binutils which support --hash-style=gnu >= 2.17.50.0.2-7
# Need binutils which support mffgpr and mftgpr >= 2.17.50.0.2-8
# Need binutils which support --build-id >= 2.17.50.0.17-3
BuildRequires: binutils >= 2.17.50.0.17-3
BuildRequires: zlib-devel, gettext, dejagnu, bison, flex, texinfo, sharutils
%if %{build_java}
BuildRequires: /usr/share/java/eclipse-ecj.jar, zip, unzip
%if %{bootstrap_java}
Source10: libjava-classes-%{version}-%{release}.tar.bz2
%else
BuildRequires: gcc-java, libgcj
%endif
%endif
# Make sure pthread.h doesn't contain __thread tokens
# Make sure glibc supports stack protector
# Make sure glibc supports DT_GNU_HASH
BuildRequires: glibc-devel >= 2.4.90-13
BuildRequires: elfutils-devel >= 0.72
%ifarch ppc ppc64 s390 s390x sparc sparcv9 alpha
# Make sure glibc supports TFmode long double
BuildRequires: glibc >= 2.3.90-35
%endif
%ifarch %{multilib_64_archs} 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
%if %{build_ada}
# Ada requires Ada to build
BuildRequires: gcc-gnat >= 3.1, libgnat >= 3.1
%endif
%ifarch ia64
BuildRequires: libunwind >= 0.98
%endif
Requires: cpp = %{version}-%{release}
# Need .eh_frame ld optimizations
# Need proper visibility support
# Need -pie support
# Need --as-needed/--no-as-needed support
# On ppc64, need omit dot symbols support and --non-overlapping-opd
# Need binutils that owns /usr/bin/c++filt
# Need binutils that support .weakref
# Need binutils that supports --hash-style=gnu
# Need binutils that support mffgpr/mftgpr
# Need binutils that support --build-id
Requires: binutils >= 2.17.50.0.17-3
# Make sure gdb will understand DW_FORM_strp
Conflicts: gdb < 5.1-2
Requires: glibc-devel >= 2.2.90-12
%ifarch ppc ppc64 s390 s390x sparc sparcv9 alpha
# Make sure glibc supports TFmode long double
Requires: glibc >= 2.3.90-35
%endif
Requires: libgcc >= %{version}-%{release}
Requires: libgomp = %{version}-%{release}
%if !%{build_ada}
Obsoletes: gcc-gnat < %{version}-%{release}
Obsoletes: libgnat < %{version}-%{release}
%endif
Prereq: /sbin/install-info
AutoReq: true

Patch0: gcc44-hack.patch
Patch1: gcc44-build-id.patch
Patch2: gcc44-c++-builtin-redecl.patch
Patch3: gcc44-ia64-libunwind.patch
Patch4: gcc44-java-nomulti.patch
Patch5: gcc44-ppc32-retaddr.patch
Patch7: gcc44-pr27898.patch
Patch8: gcc44-pr32139.patch
Patch9: gcc44-pr33763.patch
Patch10: gcc44-rh330771.patch
Patch11: gcc44-rh341221.patch
Patch12: gcc44-java-debug-iface-type.patch
Patch13: gcc44-i386-libgomp.patch
Patch15: gcc44-sparc-config-detection.patch
Patch16: gcc44-libgomp-omp_h-multilib.patch
Patch20: gcc44-libtool-no-rpath.patch

Patch1000: fastjar-0.97-segfault.patch

# On ARM EABI systems, we do want -gnueabi to be part of the
# target triple.
%ifnarch %{arm}
%define _gnu %{nil}
%endif
%ifarch sparcv9
%define gcc_target_platform sparc64-%{_vendor}-%{_target_os}
%endif
%ifarch ppc
%define gcc_target_platform ppc64-%{_vendor}-%{_target_os}
%endif
%ifnarch sparcv9 ppc
%define gcc_target_platform %{_target_platform}
%endif

%description
The gcc package contains the GNU Compiler Collection version 4.4.
You'll need this package in order to compile C code.

%package -n libgcc
Summary: GCC version 4.4 shared support library
Group: System Environment/Libraries
Autoreq: false

%description -n libgcc
This package contains GCC shared support library which is needed
e.g. for exception handling support.

%package c++
Summary: C++ support for GCC
Group: Development/Languages
Requires: gcc = %{version}-%{release}
Requires: libstdc++ = %{version}-%{release}
Requires: libstdc++-devel = %{version}-%{release}
Autoreq: true

%description c++
This package adds C++ support to the GNU Compiler Collection.
It includes support for most of the current C++ specification,
including templates and exception handling.

%package -n libstdc++
Summary: GNU Standard C++ Library
Group: System Environment/Libraries
Autoreq: true

%description -n libstdc++
The libstdc++ package contains a rewritten standard compliant GCC Standard
C++ Library.

%package -n libstdc++-devel
Summary: Header files and libraries for C++ development
Group: Development/Libraries
Requires: libstdc++ = %{version}-%{release}, %{_prefix}/%{_lib}/libstdc++.so.6
Autoreq: true

%description -n libstdc++-devel
This is the GNU implementation of the standard C++ libraries.  This
package includes the header files and libraries needed for C++
development. This includes rewritten implementation of STL.

%package objc
Summary: Objective-C support for GCC
Group: Development/Languages
Requires: gcc = %{version}-%{release}
Requires: libobjc = %{version}-%{release}
Autoreq: true

%description objc
gcc-objc provides Objective-C support for the GCC.
Mainly used on systems running NeXTSTEP, Objective-C is an
object-oriented derivative of the C language.

%package objc++
Summary: Objective-C++ support for GCC
Group: Development/Languages
Requires: gcc-c++ = %{version}-%{release}, gcc-objc = %{version}-%{release}
Autoreq: true

%description objc++
gcc-objc++ package provides Objective-C++ support for the GCC.

%package -n libobjc
Summary: Objective-C runtime
Group: System Environment/Libraries
Autoreq: true

%description -n libobjc
This package contains Objective-C shared library which is needed to run
Objective-C dynamically linked programs.

%package gfortran
Summary: Fortran support
Group: Development/Languages
Requires: gcc = %{version}-%{release}
Requires: libgfortran = %{version}-%{release}
BuildRequires: gmp-devel >= 4.1.2-8, mpfr-devel >= 2.2.1
Prereq: /sbin/install-info
Autoreq: true

%description gfortran
The gcc-gfortran package provides support for compiling Fortran
programs with the GNU Compiler Collection.

%package -n libgfortran
Summary: Fortran runtime
Group: System Environment/Libraries
Autoreq: true

%description -n libgfortran
This package contains Fortran shared library which is needed to run
Fortran dynamically linked programs.

%package -n libgomp
Summary: GCC OpenMP v3.0 shared support library
Group: System Environment/Libraries
Prereq: /sbin/install-info

%description -n libgomp
This package contains GCC shared support library which is needed
for OpenMP v3.0 support.

%package -n libmudflap
Summary: GCC mudflap shared support library
Group: System Environment/Libraries

%description -n libmudflap
This package contains GCC shared support library which is needed
for mudflap support.

%package -n libmudflap-devel
Summary: GCC mudflap support
Group: Development/Libraries
Requires: libmudflap = %{version}-%{release}
Requires: gcc = %{version}-%{release}

%description -n libmudflap-devel
This package contains headers and static libraries for building
mudflap-instrumented programs.

To instrument a non-threaded program, add -fmudflap
option to GCC and when linking add -lmudflap, for threaded programs
also add -fmudflapth and -lmudflapth.

%package java
Summary: Java support for GCC
Group: Development/Languages
Requires: gcc = %{version}-%{release}
Requires: libgcj = %{version}-%{release}
Requires: libgcj-devel = %{version}-%{release}
Requires: /usr/share/java/eclipse-ecj.jar
Prereq: /sbin/install-info
Autoreq: true

%description java
This package adds support for compiling Java(tm) programs and
bytecode into native code.

%package -n libgcj
Summary: Java runtime library for gcc
Group: System Environment/Libraries
Prereq: /sbin/install-info
Requires: zip >= 2.1
Requires: gtk2 >= 2.4.0
Requires: glib2 >= 2.4.0
Requires: libart_lgpl >= 2.1.0
%if %{build_java}
BuildRequires: gtk2-devel >= 2.4.0
BuildRequires: glib2-devel >= 2.4.0
BuildRequires: xulrunner-devel
BuildRequires: libart_lgpl-devel >= 2.1.0
BuildRequires: alsa-lib-devel
BuildRequires: libXtst-devel
BuildRequires: libXt-devel
%endif
Autoreq: true

%description -n libgcj
The Java(tm) runtime library. You will need this package to run your Java
programs compiled using the Java compiler from GNU Compiler Collection (gcj).

%package -n libgcj-devel
Summary: Libraries for Java development using GCC
Group: Development/Languages
Requires: libgcj = %{version}-%{release}, %{_prefix}/%{_lib}/libgcj.so.10
Requires: zlib-devel, %{_prefix}/%{_lib}/libz.so
Requires: /bin/awk
Autoreq: false
Autoprov: false

%description -n libgcj-devel
The Java(tm) static libraries and C header files. You will need this
package to compile your Java programs using the GCC Java compiler (gcj).

%package -n libgcj-src
Summary: Java library sources from GCC4 preview
Group: System Environment/Libraries
Requires: libgcj = %{version}-%{release}
Autoreq: true

%description -n libgcj-src
The Java(tm) runtime library sources for use in Eclipse.

%package -n cpp
Summary: The C Preprocessor
Group: Development/Languages
Prereq: /sbin/install-info
Autoreq: true

%description -n cpp
Cpp is the GNU C-Compatible Compiler Preprocessor.
Cpp is a macro processor which is used automatically
by the C compiler to transform your program before actual
compilation. It is called a macro processor because it allows
you to define macros, abbreviations for longer
constructs.

The C preprocessor provides four separate functionalities: the
inclusion of header files (files of declarations that can be
substituted into your program); macro expansion (you can define macros,
and the C preprocessor will replace the macros with their definitions
throughout the program); conditional compilation (using special
preprocessing directives, you can include or exclude parts of the
program according to various conditions); and line control (if you use
a program to combine or rearrange source files into an intermediate
file which is then compiled, you can use line control to inform the
compiler about where each source line originated).

You should install this package if you are a C programmer and you use
macros.

%package gnat
Summary: Ada 95 support for GCC
Group: Development/Languages
Requires: gcc = %{version}-%{release}
Requires: libgnat = %{version}-%{release}, libgnat-devel = %{version}-%{release}
Prereq: /sbin/install-info
Autoreq: true

%description gnat
GNAT is a GNU Ada 95 front-end to GCC. This package includes development tools,
the documents and Ada 95 compiler.

%package -n libgnat
Summary: GNU Ada 95 runtime shared libraries
Group: System Environment/Libraries
Autoreq: true

%description -n libgnat
GNAT is a GNU Ada 95 front-end to GCC. This package includes shared libraries,
which are required to run programs compiled with the GNAT.

%package -n libgnat-devel
Summary: GNU Ada 95 libraries
Group: System Environment/Libraries
Autoreq: true

%description -n libgnat-devel
GNAT is a GNU Ada 95 front-end to GCC. This package includes libraries,
which are required to compile with the GNAT.

%prep
%setup -q -n gcc-%{version}-%{DATE}
%patch0 -p0 -b .hack~
%patch1 -p0 -b .build-id~
%patch2 -p0 -b .c++-builtin-redecl~
%patch3 -p0 -b .ia64-libunwind~
%patch4 -p0 -b .java-nomulti~
%patch5 -p0 -b .ppc32-retaddr~
%patch7 -p0 -b .pr27898~
%patch8 -p0 -b .pr32139~
%patch9 -p0 -b .pr33763~
%patch10 -p0 -b .rh330771~
%patch11 -p0 -b .rh341221~
%patch12 -p0 -b .java-debug-iface-type~
%patch13 -p0 -b .i386-libgomp~
%patch15 -p0 -b .sparc-config-detection~
%patch16 -p0 -b .libgomp-omp_h-multilib~
%patch20 -p0 -b .libtool-no-rpath~

# This testcase doesn't compile.
rm libjava/testsuite/libjava.lang/PR35020*

tar xzf %{SOURCE4}

%patch1000 -p0 -b .fastjar-0.97-segfault~

%if %{bootstrap_java}
tar xjf %{SOURCE10}
%endif

sed -i -e 's/4\.4\.1/4.4.0/' gcc/BASE-VER
echo 'Red Hat %{version}-%{gcc_release}' > gcc/DEV-PHASE

cp -a libstdc++-v3/config/cpu/i{4,3}86/atomicity.h

# Hack to avoid building multilib libjava
perl -pi -e 's/^all: all-redirect/ifeq (\$(MULTISUBDIR),)\nall: all-redirect\nelse\nall:\n\techo Multilib libjava build disabled\nendif/' libjava/Makefile.in
perl -pi -e 's/^install: install-redirect/ifeq (\$(MULTISUBDIR),)\ninstall: install-redirect\nelse\ninstall:\n\techo Multilib libjava install disabled\nendif/' libjava/Makefile.in
perl -pi -e 's/^check: check-redirect/ifeq (\$(MULTISUBDIR),)\ncheck: check-redirect\nelse\ncheck:\n\techo Multilib libjava check disabled\nendif/' libjava/Makefile.in
perl -pi -e 's/^all: all-recursive/ifeq (\$(MULTISUBDIR),)\nall: all-recursive\nelse\nall:\n\techo Multilib libjava build disabled\nendif/' libjava/Makefile.in
perl -pi -e 's/^install: install-recursive/ifeq (\$(MULTISUBDIR),)\ninstall: install-recursive\nelse\ninstall:\n\techo Multilib libjava install disabled\nendif/' libjava/Makefile.in
perl -pi -e 's/^check: check-recursive/ifeq (\$(MULTISUBDIR),)\ncheck: check-recursive\nelse\ncheck:\n\techo Multilib libjava check disabled\nendif/' libjava/Makefile.in

./contrib/gcc_update --touch

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
  mv libstdc++-v3/config/abi/post/powerpc64-linux-gnu/{,64/}baseline_symbols.txt
  mv libstdc++-v3/config/abi/post/powerpc64-linux-gnu/{32/,}baseline_symbols.txt
  rm -rf libstdc++-v3/config/abi/post/powerpc64-linux-gnu/32
fi
%endif
%ifarch sparc
if [ -d libstdc++-v3/config/abi/post/sparc64-linux-gnu ]; then
  mkdir -p libstdc++-v3/config/abi/post/sparc64-linux-gnu/64
  mv libstdc++-v3/config/abi/post/sparc64-linux-gnu/{,64/}baseline_symbols.txt
  mv libstdc++-v3/config/abi/post/sparc64-linux-gnu/{32/,}baseline_symbols.txt
  rm -rf libstdc++-v3/config/abi/post/sparc64-linux-gnu/32
fi
%endif

%build

%if %{build_java}
# gjar isn't usable, so even when GCC source tree no longer includes
# fastjar, build it anyway.
mkdir fastjar-%{fastjar_ver}/obj-%{gcc_target_platform}
cd fastjar-%{fastjar_ver}/obj-%{gcc_target_platform}
../configure CFLAGS="$RPM_OPT_FLAGS" --prefix=%{_prefix} --mandir=%{_mandir} --infodir=%{_infodir}
make %{?_smp_mflags}
export PATH=`pwd`${PATH:+:$PATH}
cd ../../
%endif

rm -fr obj-%{gcc_target_platform}
mkdir obj-%{gcc_target_platform}
cd obj-%{gcc_target_platform}

%if %{build_java}
%if !%{bootstrap_java}
# If we don't have gjavah in $PATH, try to build it with the old gij
mkdir java_hacks
cd java_hacks
cp -a ../../libjava/classpath/tools/external external
mkdir -p gnu/classpath/tools
cp -a ../../libjava/classpath/tools/gnu/classpath/tools/{common,javah,getopt} gnu/classpath/tools/
cp -a ../../libjava/classpath/tools/resource/gnu/classpath/tools/common/Messages.properties gnu/classpath/tools/common
cp -a ../../libjava/classpath/tools/resource/gnu/classpath/tools/getopt/Messages.properties gnu/classpath/tools/getopt
cd external/asm; for i in `find . -name \*.java`; do gcj --encoding ISO-8859-1 -C $i -I.; done; cd ../..
for i in `find gnu -name \*.java`; do gcj -C $i -I. -Iexternal/asm/; done
gcj -findirect-dispatch -O2 -fmain=gnu.classpath.tools.javah.Main -I. -Iexternal/asm/ `find . -name \*.class` -o gjavah.real
cat > gjavah <<EOF
#!/bin/sh
export CLASSPATH=`pwd`${CLASSPATH:+:$CLASSPATH}
exec `pwd`/gjavah.real "\$@"
EOF
chmod +x `pwd`/gjavah
cat > ecj1 <<EOF
#!/bin/sh
exec gij -cp /usr/share/java/eclipse-ecj.jar org.eclipse.jdt.internal.compiler.batch.GCCMain "\$@"
EOF
chmod +x `pwd`/ecj1
export PATH=`pwd`${PATH:+:$PATH}
cd ..
%endif
%endif

CC=gcc
OPT_FLAGS=`echo $RPM_OPT_FLAGS|sed -e 's/\(-Wp,\)\?-D_FORTIFY_SOURCE=[12]//g'`
OPT_FLAGS=`echo $OPT_FLAGS|sed -e 's/-m64//g;s/-m32//g;s/-m31//g'`
%ifarch sparc
OPT_FLAGS=`echo $OPT_FLAGS|sed -e 's/-mcpu=ultrasparc/-mtune=ultrasparc/g;s/-mcpu=v[78]//g'`
%endif
%ifarch %{ix86}
OPT_FLAGS=`echo $OPT_FLAGS|sed -e 's/-march=i386//g'`
%endif
%ifarch sparc64
cat > gcc64 <<"EOF"
#!/bin/sh
exec /usr/bin/gcc -m64 "$@"
EOF
chmod +x gcc64
CC=`pwd`/gcc64
%endif
%ifarch ppc64
if gcc -m64 -xc -S /dev/null -o - > /dev/null 2>&1; then
  cat > gcc64 <<"EOF"
#!/bin/sh
exec /usr/bin/gcc -m64 "$@"
EOF
  chmod +x gcc64
  CC=`pwd`/gcc64
fi
%endif
OPT_FLAGS=`echo "$OPT_FLAGS" | sed -e 's/[[:blank:]]\+/ /g'`
case "$OPT_FLAGS" in
  *-fasynchronous-unwind-tables*)
    sed -i -e 's/-fno-exceptions /-fno-exceptions -fno-asynchronous-unwind-tables/' \
      ../gcc/Makefile.in
    ;;
esac
CC="$CC" CFLAGS="$OPT_FLAGS" CXXFLAGS="`echo $OPT_FLAGS | sed 's/ -Wall / /g'`" XCFLAGS="$OPT_FLAGS" TCFLAGS="$OPT_FLAGS" \
	GCJFLAGS="$OPT_FLAGS" \
	../configure --prefix=%{_prefix} --mandir=%{_mandir} --infodir=%{_infodir} \
	--with-bugurl=http://bugzilla.redhat.com/bugzilla --enable-bootstrap \
	--enable-shared --enable-threads=posix --enable-checking=release \
	--with-system-zlib --enable-__cxa_atexit --disable-libunwind-exceptions \
%if !%{build_ada}
	--enable-languages=c,c++,objc,obj-c++,java,fortran \
%else
	--enable-languages=c,c++,objc,obj-c++,java,fortran,ada \
%endif
%if !%{build_java}
	--disable-libgcj \
%else
	--enable-java-awt=gtk --disable-dssi --enable-plugin \
	--with-java-home=%{_prefix}/lib/jvm/java-1.5.0-gcj-1.5.0.0/jre \
	--enable-libgcj-multifile \
%if !%{bootstrap_java}
	--enable-java-maintainer-mode \
%endif
	--with-ecj-jar=/usr/share/java/eclipse-ecj.jar \
	--disable-libjava-multilib \
%endif
%ifarch %{arm}
	--disable-sjlj-exceptions \
%endif
%ifarch ppc ppc64
	--enable-secureplt \
%endif
%ifarch sparc sparcv9 sparc64 ppc ppc64 s390 s390x alpha
	--with-long-double-128 \
%endif
%ifarch sparc
	--disable-linux-futex \
%endif
%ifarch sparc64
	--with-cpu=ultrasparc \
%endif
%ifarch sparc sparcv9
	--host=%{gcc_target_platform} --build=%{gcc_target_platform} --target=%{gcc_target_platform} --with-cpu=v7
%endif
%ifarch ppc
	--build=%{gcc_target_platform} --target=%{gcc_target_platform} --with-cpu=default32
%endif
%ifarch %{ix86} x86_64
	--with-cpu=generic \
%endif
%ifarch s390 s390x
	--with-tune=z9-109 \
%endif
%ifnarch sparc sparcv9 ppc
	--build=%{gcc_target_platform}
%endif

#GCJFLAGS="$OPT_FLAGS" make %{?_smp_mflags} BOOT_CFLAGS="$OPT_FLAGS" bootstrap
GCJFLAGS="$OPT_FLAGS" make %{?_smp_mflags} BOOT_CFLAGS="$OPT_FLAGS" profiledbootstrap

# run the tests.
make %{?_smp_mflags} -k check ALT_CC_UNDER_TEST=gcc ALT_CXX_UNDER_TEST=g++ RUNTESTFLAGS="--target_board=unix/'{,-fstack-protector/--param=ssp-buffer-size=4}'" || :
echo ====================TESTING=========================
( ../contrib/test_summary || : ) 2>&1 | sed -n '/^cat.*EOF/,/^EOF/{/^cat.*EOF/d;/^EOF/d;/^LAST_UPDATED:/d;p;}'
echo ====================TESTING END=====================
mkdir testlogs-%{_target_platform}-%{version}-%{release}
for i in `find . -name \*.log | grep -F testsuite/ | grep -v 'config.log\|acats\|ada'`; do
  ln $i testlogs-%{_target_platform}-%{version}-%{release}/ || :
done
tar cf - testlogs-%{_target_platform}-%{version}-%{release} | bzip2 -9c \
  | uuencode testlogs-%{_target_platform}.tar.bz2 || :
rm -rf testlogs-%{_target_platform}-%{version}-%{release}

# Make protoize
make -C gcc CC="./xgcc -B ./ -O2" proto

# Make generated man pages even if Pod::Man is not new enough
perl -pi -e 's/head3/head2/' ../contrib/texi2pod.pl
for i in ../gcc/doc/*.texi; do
  cp -a $i $i.orig; sed 's/ftable/table/' $i.orig > $i
done
make -C gcc generated-manpages
for i in ../gcc/doc/*.texi; do mv -f $i.orig $i; done

# Copy various doc files here and there
cd ..
mkdir -p rpm.doc/gfortran rpm.doc/objc
mkdir -p rpm.doc/boehm-gc rpm.doc/fastjar rpm.doc/libffi rpm.doc/libjava
mkdir -p rpm.doc/changelogs/{gcc/cp,gcc/java,gcc/ada,libstdc++-v3,libobjc,libmudflap,libgomp}
sed -e 's, at VERSION@,%{gcc_version},' %{SOURCE2} > rpm.doc/README.libgcjwebplugin.so

for i in {gcc,gcc/cp,gcc/java,gcc/ada,libstdc++-v3,libobjc,libmudflap,libgomp}/ChangeLog*; do
	cp -p $i rpm.doc/changelogs/$i
done

(cd gcc/fortran; for i in ChangeLog*; do
	cp -p $i ../../rpm.doc/gfortran/$i
done)
(cd libgfortran; for i in ChangeLog*; do
	cp -p $i ../rpm.doc/gfortran/$i.libgfortran
done)
(cd gcc/objc; for i in README*; do
	cp -p $i ../../rpm.doc/objc/$i.objc
done)
(cd libobjc; for i in README*; do
	cp -p $i ../rpm.doc/objc/$i.libobjc
done)
(cd boehm-gc; for i in ChangeLog*; do
	cp -p $i ../rpm.doc/boehm-gc/$i.gc
done)
(cd fastjar-%{fastjar_ver}; for i in ChangeLog* README*; do
	cp -p $i ../rpm.doc/fastjar/$i.fastjar
done)
(cd libffi; for i in ChangeLog* README* LICENSE; do
	cp -p $i ../rpm.doc/libffi/$i.libffi
done)
(cd libjava; for i in ChangeLog* README*; do
	cp -p $i ../rpm.doc/libjava/$i.libjava
done)
cp -p libjava/LIBGCJ_LICENSE rpm.doc/libjava/

rm -f rpm.doc/changelogs/gcc/ChangeLog.[1-9]
find rpm.doc -name \*ChangeLog\* | xargs bzip2 -9

%if %{build_java_tar}
find libjava -name \*.h -type f | xargs grep -l '// DO NOT EDIT THIS FILE - it is machine generated' > libjava-classes.list
find libjava -name \*.class -type f >> libjava-classes.list
find libjava/testsuite -name \*.jar -type f >> libjava-classes.list
tar cf - -T libjava-classes.list | bzip2 -9 > $RPM_SOURCE_DIR/libjava-classes-%{version}-%{release}.tar.bz2
%endif

%install
rm -fr $RPM_BUILD_ROOT

perl -pi -e \
  's~href="l(ibstdc|atest)~href="http://gcc.gnu.org/onlinedocs/libstdc++/l\1~' \
  libstdc++-v3/doc/html/api.html

cd obj-%{gcc_target_platform}

%if %{build_java}
export PATH=`pwd`/../fastjar-%{fastjar_ver}/obj-%{gcc_target_platform}${PATH:+:$PATH}
%if !%{bootstrap_java}
export PATH=`pwd`/java_hacks${PATH:+:$PATH}
%endif
%endif

TARGET_PLATFORM=%{gcc_target_platform}

# There are some MP bugs in libstdc++ Makefiles
make -C %{gcc_target_platform}/libstdc++-v3

make prefix=$RPM_BUILD_ROOT%{_prefix} mandir=$RPM_BUILD_ROOT%{_mandir} \
  infodir=$RPM_BUILD_ROOT%{_infodir} install
%if %{build_java}
make DESTDIR=$RPM_BUILD_ROOT -C %{gcc_target_platform}/libjava install-src.zip
%endif
%if %{build_ada}
chmod 644 $RPM_BUILD_ROOT%{_infodir}/gnat*
%endif

FULLPATH=$RPM_BUILD_ROOT%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}
FULLEPATH=$RPM_BUILD_ROOT%{_prefix}/libexec/gcc/%{gcc_target_platform}/%{gcc_version}

# fix some things
ln -sf gcc $RPM_BUILD_ROOT%{_prefix}/bin/cc
mkdir -p $RPM_BUILD_ROOT/lib
ln -sf ..%{_prefix}/bin/cpp $RPM_BUILD_ROOT/lib/cpp
ln -sf gfortran $RPM_BUILD_ROOT%{_prefix}/bin/f95
rm -f $RPM_BUILD_ROOT%{_infodir}/dir
gzip -9 $RPM_BUILD_ROOT%{_infodir}/*.info*
ln -sf gcc $RPM_BUILD_ROOT%{_prefix}/bin/gnatgcc

cxxconfig="`find %{gcc_target_platform}/libstdc++-v3/include -name c++config.h`"
for i in `find %{gcc_target_platform}/[36]*/libstdc++-v3/include -name c++config.h 2>/dev/null`; do
  if ! diff -up $cxxconfig $i; then
    cat > $RPM_BUILD_ROOT%{_prefix}/include/c++/%{gcc_version}/%{gcc_target_platform}/bits/c++config.h <<EOF
#ifndef _CPP_CPPCONFIG_WRAPPER
#define _CPP_CPPCONFIG_WRAPPER 1
#include <bits/wordsize.h>
#if __WORDSIZE == 32
%ifarch %{multilib_64_archs}
`cat $(find %{gcc_target_platform}/32/libstdc++-v3/include -name c++config.h)`
%else
`cat $(find %{gcc_target_platform}/libstdc++-v3/include -name c++config.h)`
%endif
#else
%ifarch %{multilib_64_archs}
`cat $(find %{gcc_target_platform}/libstdc++-v3/include -name c++config.h)`
%else
`cat $(find %{gcc_target_platform}/64/libstdc++-v3/include -name c++config.h)`
%endif
#endif
#endif
EOF
    break
  fi
done

# Nuke bits/stdc++.h.gch dirs
# 1) there is no bits/stdc++.h header installed, so when gch file can't be
#    used, compilation fails
# 2) sometimes it is hard to match the exact options used for building
#    libstdc++-v3 or they aren't desirable
# 3) there are multilib issues, conflicts etc. with this
# 4) it is huge
# People can always precompile on their own whatever they want, but
# shipping this for everybody is unnecessary.
rm -rf $RPM_BUILD_ROOT%{_prefix}/include/c++/%{gcc_version}/%{gcc_target_platform}/bits/stdc++.h.gch

%ifarch sparcv9 sparc64
ln -f $RPM_BUILD_ROOT%{_prefix}/bin/%{gcc_target_platform}-gcc \
  $RPM_BUILD_ROOT%{_prefix}/bin/sparc-%{_vendor}-%{_target_os}-gcc
%endif
%ifarch ppc ppc64
ln -f $RPM_BUILD_ROOT%{_prefix}/bin/%{gcc_target_platform}-gcc \
  $RPM_BUILD_ROOT%{_prefix}/bin/ppc-%{_vendor}-%{_target_os}-gcc
%endif

%ifarch sparcv9 ppc
FULLLPATH=$FULLPATH/lib32
%endif
%ifarch sparc64 ppc64
FULLLPATH=$FULLPATH/lib64
%endif
if [ -n "$FULLLPATH" ]; then
  mkdir -p $FULLLPATH
else
  FULLLPATH=$FULLPATH
fi

find $RPM_BUILD_ROOT -name \*.la | xargs rm -f
%if %{build_java}
# gcj -static doesn't work properly anyway, unless using --whole-archive
# and saving 35MB is not bad.
find $RPM_BUILD_ROOT -name libgcj.a -o -name libgtkpeer.a \
		     -o -name libgjsmalsa.a -o -name libgcj-tools.a -o -name libjvm.a \
		     -o -name libgij.a -o -name libgcj_bc.a -o -name libjavamath.a \
  | xargs rm -f

mv $RPM_BUILD_ROOT%{_prefix}/lib/libgcj.spec $FULLPATH/
sed -i -e 's/lib: /&%%{static:%%eJava programs cannot be linked statically}/' \
  $FULLPATH/libgcj.spec
%endif

mkdir -p $RPM_BUILD_ROOT/%{_lib}
mv -f $RPM_BUILD_ROOT%{_prefix}/%{_lib}/libgcc_s.so.1 $RPM_BUILD_ROOT/%{_lib}/libgcc_s-%{gcc_version}-%{DATE}.so.1
chmod 755 $RPM_BUILD_ROOT/%{_lib}/libgcc_s-%{gcc_version}-%{DATE}.so.1
ln -sf libgcc_s-%{gcc_version}-%{DATE}.so.1 $RPM_BUILD_ROOT/%{_lib}/libgcc_s.so.1
ln -sf /%{_lib}/libgcc_s.so.1 $FULLPATH/libgcc_s.so
%ifarch sparcv9 ppc
ln -sf /lib64/libgcc_s.so.1 $FULLPATH/64/libgcc_s.so
%endif
%ifarch %{multilib_64_archs}
ln -sf /lib/libgcc_s.so.1 $FULLPATH/32/libgcc_s.so
%endif

mv -f $RPM_BUILD_ROOT%{_prefix}/%{_lib}/libgomp.spec $FULLPATH/

%if %{build_ada}
mv -f $FULLPATH/adalib/libgnarl-*.so $RPM_BUILD_ROOT%{_prefix}/%{_lib}/
mv -f $FULLPATH/adalib/libgnat-*.so $RPM_BUILD_ROOT%{_prefix}/%{_lib}/
rm -f $FULLPATH/adalib/libgnarl.so* $FULLPATH/adalib/libgnat.so*
%endif

mkdir -p $RPM_BUILD_ROOT%{_prefix}/libexec/getconf
if gcc/xgcc -B gcc/ -E -dD -xc /dev/null | grep __LONG_MAX__.*2147483647; then
  ln -sf POSIX_V6_ILP32_OFF32 $RPM_BUILD_ROOT%{_prefix}/libexec/getconf/default
else
  ln -sf POSIX_V6_LP64_OFF64 $RPM_BUILD_ROOT%{_prefix}/libexec/getconf/default
fi

%if %{build_java}
pushd ../fastjar-%{fastjar_ver}/obj-%{gcc_target_platform}
make install DESTDIR=$RPM_BUILD_ROOT
popd

if [ "%{_lib}" != "lib" ]; then
  mkdir -p $RPM_BUILD_ROOT%{_prefix}/%{_lib}/pkgconfig
  sed '/^libdir/s/lib$/%{_lib}/' $RPM_BUILD_ROOT%{_prefix}/lib/pkgconfig/libgcj-*.pc \
    > $RPM_BUILD_ROOT%{_prefix}/%{_lib}/pkgconfig/`basename $RPM_BUILD_ROOT%{_prefix}/lib/pkgconfig/libgcj-*.pc`
fi
%endif

pushd $FULLPATH
if [ "%{_lib}" = "lib" ]; then
ln -sf ../../../libobjc.so.2 libobjc.so
ln -sf ../../../libstdc++.so.6.* libstdc++.so
ln -sf ../../../libgfortran.so.3.* libgfortran.so
ln -sf ../../../libgomp.so.1.* libgomp.so
ln -sf ../../../libmudflap.so.0.* libmudflap.so
ln -sf ../../../libmudflapth.so.0.* libmudflapth.so
%if %{build_java}
ln -sf ../../../libgcj.so.10.* libgcj.so
ln -sf ../../../libgcj-tools.so.10.* libgcj-tools.so
ln -sf ../../../libgij.so.10.* libgij.so
%endif
else
ln -sf ../../../../%{_lib}/libobjc.so.2 libobjc.so
ln -sf ../../../../%{_lib}/libstdc++.so.6.* libstdc++.so
ln -sf ../../../../%{_lib}/libgfortran.so.3.* libgfortran.so
ln -sf ../../../../%{_lib}/libgomp.so.1.* libgomp.so
ln -sf ../../../../%{_lib}/libmudflap.so.0.* libmudflap.so
ln -sf ../../../../%{_lib}/libmudflapth.so.0.* libmudflapth.so
%if %{build_java}
ln -sf ../../../../%{_lib}/libgcj.so.10.* libgcj.so
ln -sf ../../../../%{_lib}/libgcj-tools.so.10.* libgcj-tools.so
ln -sf ../../../../%{_lib}/libgij.so.10.* libgij.so
%endif
fi
%if %{build_java}
mv -f $RPM_BUILD_ROOT%{_prefix}/%{_lib}/libgcj_bc.so $FULLLPATH/
%endif
mv -f $RPM_BUILD_ROOT%{_prefix}/%{_lib}/libstdc++.*a $FULLLPATH/
mv -f $RPM_BUILD_ROOT%{_prefix}/%{_lib}/libsupc++.*a .
mv -f $RPM_BUILD_ROOT%{_prefix}/%{_lib}/libgfortran.*a .
mv -f $RPM_BUILD_ROOT%{_prefix}/%{_lib}/libobjc.*a .
mv -f $RPM_BUILD_ROOT%{_prefix}/%{_lib}/libgomp.*a .
mv -f $RPM_BUILD_ROOT%{_prefix}/%{_lib}/libmudflap{,th}.*a $FULLLPATH/

%if %{build_ada}
%ifarch sparcv9 ppc
rm -rf $FULLPATH/64/ada{include,lib}
%endif
%ifarch %{multilib_64_archs}
rm -rf $FULLPATH/32/ada{include,lib}
%endif
if [ "$FULLPATH" != "$FULLLPATH" ]; then
mv -f $FULLPATH/ada{include,lib} $FULLLPATH/
pushd $FULLLPATH/adalib
if [ "%{_lib}" = "lib" ]; then
ln -sf ../../../../../libgnarl-*.so libgnarl.so
ln -sf ../../../../../libgnarl-*.so libgnarl-4.4.so
ln -sf ../../../../../libgnat-*.so libgnat.so
ln -sf ../../../../../libgnat-*.so libgnat-4.4.so
else
ln -sf ../../../../../../%{_lib}/libgnarl-*.so libgnarl.so
ln -sf ../../../../../../%{_lib}/libgnarl-*.so libgnarl-4.4.so
ln -sf ../../../../../../%{_lib}/libgnat-*.so libgnat.so
ln -sf ../../../../../../%{_lib}/libgnat-*.so libgnat-4.4.so
fi
popd
else
pushd $FULLPATH/adalib
if [ "%{_lib}" = "lib" ]; then
ln -sf ../../../../libgnarl-*.so libgnarl.so
ln -sf ../../../../libgnarl-*.so libgnarl-4.4.so
ln -sf ../../../../libgnat-*.so libgnat.so
ln -sf ../../../../libgnat-*.so libgnat-4.4.so
else
ln -sf ../../../../../%{_lib}/libgnarl-*.so libgnarl.so
ln -sf ../../../../../%{_lib}/libgnarl-*.so libgnarl-4.4.so
ln -sf ../../../../../%{_lib}/libgnat-*.so libgnat.so
ln -sf ../../../../../%{_lib}/libgnat-*.so libgnat-4.4.so
fi
popd
fi
%endif

%ifarch sparcv9 ppc
ln -sf ../../../../../lib64/libobjc.so.2 64/libobjc.so
ln -sf ../`echo ../../../../lib/libstdc++.so.6.* | sed s~/lib/~/lib64/~` 64/libstdc++.so
ln -sf ../`echo ../../../../lib/libgfortran.so.3.* | sed s~/lib/~/lib64/~` 64/libgfortran.so
ln -sf ../`echo ../../../../lib/libgomp.so.1.* | sed s~/lib/~/lib64/~` 64/libgomp.so
rm -f libmudflap.so libmudflapth.so
echo 'INPUT ( %{_prefix}/lib/'`echo ../../../../lib/libmudflap.so.0.* | sed 's,^.*libm,libm,'`' )' > libmudflap.so
echo 'INPUT ( %{_prefix}/lib/'`echo ../../../../lib/libmudflapth.so.0.* | sed 's,^.*libm,libm,'`' )' > libmudflapth.so
echo 'INPUT ( %{_prefix}/lib64/'`echo ../../../../lib/libmudflap.so.0.* | sed 's,^.*libm,libm,'`' )' > 64/libmudflap.so
echo 'INPUT ( %{_prefix}/lib64/'`echo ../../../../lib/libmudflapth.so.0.* | sed 's,^.*libm,libm,'`' )' > 64/libmudflapth.so
%if %{build_java}
ln -sf ../`echo ../../../../lib/libgcj.so.10.* | sed s~/lib/~/lib64/~` 64/libgcj.so
ln -sf ../`echo ../../../../lib/libgcj-tools.so.10.* | sed s~/lib/~/lib64/~` 64/libgcj-tools.so
ln -sf ../`echo ../../../../lib/libgij.so.10.* | sed s~/lib/~/lib64/~` 64/libgij.so
ln -sf lib32/libgcj_bc.so libgcj_bc.so
ln -sf ../lib64/libgcj_bc.so 64/libgcj_bc.so
%endif
mv -f $RPM_BUILD_ROOT%{_prefix}/lib64/libsupc++.*a 64/
mv -f $RPM_BUILD_ROOT%{_prefix}/lib64/libgfortran.*a 64/
mv -f $RPM_BUILD_ROOT%{_prefix}/lib64/libobjc.*a 64/
mv -f $RPM_BUILD_ROOT%{_prefix}/lib64/libgomp.*a 64/
ln -sf lib32/libstdc++.a libstdc++.a
ln -sf ../lib64/libstdc++.a 64/libstdc++.a
ln -sf lib32/libmudflap.a libmudflap.a
ln -sf ../lib64/libmudflap.a 64/libmudflap.a
ln -sf lib32/libmudflapth.a libmudflapth.a
ln -sf ../lib64/libmudflapth.a 64/libmudflapth.a
%if %{build_ada}
ln -sf lib32/adainclude adainclude
ln -sf ../lib64/adainclude 64/adainclude
ln -sf lib32/adalib adalib
ln -sf ../lib64/adalib 64/adalib
%endif
%endif
%ifarch %{multilib_64_archs}
mkdir -p 32
ln -sf ../../../../libobjc.so.2 32/libobjc.so
ln -sf ../`echo ../../../../lib64/libstdc++.so.6.* | sed s~/../lib64/~/~` 32/libstdc++.so
ln -sf ../`echo ../../../../lib64/libgfortran.so.3.* | sed s~/../lib64/~/~` 32/libgfortran.so
ln -sf ../`echo ../../../../lib64/libgomp.so.1.* | sed s~/../lib64/~/~` 32/libgomp.so
rm -f libmudflap.so libmudflapth.so
echo 'INPUT ( %{_prefix}/lib64/'`echo ../../../../lib64/libmudflap.so.0.* | sed 's,^.*libm,libm,'`' )' > libmudflap.so
echo 'INPUT ( %{_prefix}/lib64/'`echo ../../../../lib64/libmudflapth.so.0.* | sed 's,^.*libm,libm,'`' )' > libmudflapth.so
echo 'INPUT ( %{_prefix}/lib/'`echo ../../../../lib64/libmudflap.so.0.* | sed 's,^.*libm,libm,'`' )' > 32/libmudflap.so
echo 'INPUT ( %{_prefix}/lib/'`echo ../../../../lib64/libmudflapth.so.0.* | sed 's,^.*libm,libm,'`' )' > 32/libmudflapth.so
%if %{build_java}
ln -sf ../`echo ../../../../lib64/libgcj.so.10.* | sed s~/../lib64/~/~` 32/libgcj.so
ln -sf ../`echo ../../../../lib64/libgcj-tools.so.10.* | sed s~/../lib64/~/~` 32/libgcj-tools.so
ln -sf ../`echo ../../../../lib64/libgij.so.10.* | sed s~/../lib64/~/~` 32/libgij.so
%endif
mv -f $RPM_BUILD_ROOT%{_prefix}/lib/libsupc++.*a 32/
mv -f $RPM_BUILD_ROOT%{_prefix}/lib/libgfortran.*a 32/
mv -f $RPM_BUILD_ROOT%{_prefix}/lib/libobjc.*a 32/
mv -f $RPM_BUILD_ROOT%{_prefix}/lib/libgomp.*a 32/
%endif
%ifarch sparc64 ppc64
ln -sf ../lib32/libstdc++.a 32/libstdc++.a
ln -sf lib64/libstdc++.a libstdc++.a
ln -sf ../lib32/libmudflap.a 32/libmudflap.a
ln -sf lib64/libmudflap.a libmudflap.a
ln -sf ../lib32/libmudflapth.a 32/libmudflapth.a
ln -sf lib64/libmudflapth.a libmudflapth.a
%if %{build_java}
ln -sf ../lib32/libgcj_bc.so 32/libgcj_bc.so
ln -sf lib64/libgcj_bc.so libgcj_bc.so
%endif
%if %{build_ada}
ln -sf ../lib32/adainclude 32/adainclude
ln -sf lib64/adainclude adainclude
ln -sf ../lib32/adalib 32/adalib
ln -sf lib64/adalib adalib
%endif
%else
%ifarch %{multilib_64_archs}
ln -sf ../../../%{multilib_32_arch}-%{_vendor}-%{_target_os}/%{gcc_version}/libstdc++.a 32/libstdc++.a
ln -sf ../../../%{multilib_32_arch}-%{_vendor}-%{_target_os}/%{gcc_version}/libmudflap.a 32/libmudflap.a
ln -sf ../../../%{multilib_32_arch}-%{_vendor}-%{_target_os}/%{gcc_version}/libmudflapth.a 32/libmudflapth.a
%if %{build_java}
ln -sf ../../../%{multilib_32_arch}-%{_vendor}-%{_target_os}/%{gcc_version}/libgcj_bc.so 32/libgcj_bc.so
%endif
%if %{build_ada}
ln -sf ../../../%{multilib_32_arch}-%{_vendor}-%{_target_os}/%{gcc_version}/adainclude 32/adainclude
ln -sf ../../../%{multilib_32_arch}-%{_vendor}-%{_target_os}/%{gcc_version}/adalib 32/adalib
%endif
%endif
%endif

# Strip debug info from Fortran/ObjC/Java static libraries
strip -g `find . \( -name libgfortran.a -o -name libobjc.a -o -name libgomp.a \
		    -o -name libmudflap.a -o -name libmudflapth.a \
		    -o -name libgcc.a -o -name libgcov.a \) -a -type f`
popd
chmod 755 $RPM_BUILD_ROOT%{_prefix}/%{_lib}/libgfortran.so.3.*
chmod 755 $RPM_BUILD_ROOT%{_prefix}/%{_lib}/libgomp.so.1.*
chmod 755 $RPM_BUILD_ROOT%{_prefix}/%{_lib}/libmudflap{,th}.so.0.*
chmod 755 $RPM_BUILD_ROOT%{_prefix}/%{_lib}/libobjc.so.2.*

%if %{build_ada}
chmod 755 $RPM_BUILD_ROOT%{_prefix}/%{_lib}/libgnarl*so*
chmod 755 $RPM_BUILD_ROOT%{_prefix}/%{_lib}/libgnat*so*
%endif

mv $FULLPATH/include-fixed/syslimits.h $FULLPATH/include/syslimits.h
mv $FULLPATH/include-fixed/limits.h $FULLPATH/include/limits.h
for h in `find $FULLPATH/include -name \*.h`; do
  if grep -q 'It has been auto-edited by fixincludes from' $h; then
    rh=`grep -A2 'It has been auto-edited by fixincludes from' $h | tail -1 | sed 's|^.*"\(.*\)".*$|\1|'`
    diff -up $rh $h || :
    rm -f $h
  fi
done

cat > $RPM_BUILD_ROOT%{_prefix}/bin/c89 <<"EOF"
#!/bin/sh
fl="-std=c89"
for opt; do
  case "$opt" in
    -ansi|-std=c89|-std=iso9899:1990) fl="";;
    -std=*) echo "`basename $0` called with non ANSI/ISO C option $opt" >&2
	    exit 1;;
  esac
done
exec gcc $fl ${1+"$@"}
EOF
cat > $RPM_BUILD_ROOT%{_prefix}/bin/c99 <<"EOF"
#!/bin/sh
fl="-std=c99"
for opt; do
  case "$opt" in
    -std=c99|-std=iso9899:1999) fl="";;
    -std=*) echo "`basename $0` called with non ISO C99 option $opt" >&2
	    exit 1;;
  esac
done
exec gcc $fl ${1+"$@"}
EOF
chmod 755 $RPM_BUILD_ROOT%{_prefix}/bin/c?9

mkdir -p $RPM_BUILD_ROOT%{_prefix}/sbin
gcc -static -Os %{SOURCE1} -o $RPM_BUILD_ROOT%{_prefix}/sbin/libgcc_post_upgrade
strip $RPM_BUILD_ROOT%{_prefix}/sbin/libgcc_post_upgrade

cd ..
%find_lang %{name}
%find_lang cpplib

# Remove binaries we will not be including, so that they don't end up in
# gcc-debuginfo
rm -f $RPM_BUILD_ROOT%{_prefix}/%{_lib}/{libffi*,libiberty.a}
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
rm -f $RPM_BUILD_ROOT%{_prefix}/lib/lib*.so*
rm -f $RPM_BUILD_ROOT%{_prefix}/lib/lib*.a
%else
%ifarch sparcv9 ppc
rm -f $RPM_BUILD_ROOT%{_prefix}/lib64/lib*.so*
rm -f $RPM_BUILD_ROOT%{_prefix}/lib64/lib*.a
%endif
%endif

%if %{build_java}
mkdir -p $RPM_BUILD_ROOT%{_prefix}/share/java/gcj-endorsed \
	 $RPM_BUILD_ROOT%{_prefix}/%{_lib}/gcj-%{version}/classmap.db.d
chmod 755 $RPM_BUILD_ROOT%{_prefix}/share/java/gcj-endorsed \
	  $RPM_BUILD_ROOT%{_prefix}/%{_lib}/gcj-%{version} \
	  $RPM_BUILD_ROOT%{_prefix}/%{_lib}/gcj-%{version}/classmap.db.d
touch $RPM_BUILD_ROOT%{_prefix}/%{_lib}/gcj-%{version}/classmap.db
%endif

install -m644 %{SOURCE3} $RPM_BUILD_ROOT%{_mandir}/man1/protoize.1
echo '.so man1/protoize.1' > $RPM_BUILD_ROOT%{_mandir}/man1/unprotoize.1
chmod 644 $RPM_BUILD_ROOT%{_mandir}/man1/unprotoize.1

%clean
rm -rf $RPM_BUILD_ROOT

%post
/sbin/install-info \
  --info-dir=%{_infodir} %{_infodir}/gcc.info.gz || :

%preun
if [ $1 = 0 ]; then
  /sbin/install-info --delete \
    --info-dir=%{_infodir} %{_infodir}/gcc.info.gz || :
fi

%post -n cpp
/sbin/install-info \
  --info-dir=%{_infodir} %{_infodir}/cpp.info.gz || :

%preun -n cpp
if [ $1 = 0 ]; then
  /sbin/install-info --delete \
    --info-dir=%{_infodir} %{_infodir}/cpp.info.gz || :
fi

%post gfortran
/sbin/install-info \
  --info-dir=%{_infodir} %{_infodir}/gfortran.info.gz || :

%preun gfortran
if [ $1 = 0 ]; then
  /sbin/install-info --delete \
    --info-dir=%{_infodir} %{_infodir}/gfortran.info.gz || :
fi

%post java
/sbin/install-info \
  --info-dir=%{_infodir} %{_infodir}/gcj.info.gz || :

%preun java
if [ $1 = 0 ]; then
  /sbin/install-info --delete \
    --info-dir=%{_infodir} %{_infodir}/gcj.info.gz || :
fi

%post gnat
/sbin/install-info \
  --info-dir=%{_infodir} %{_infodir}/gnat_rm.info.gz || :
/sbin/install-info \
  --info-dir=%{_infodir} %{_infodir}/gnat_ugn_unw.info.gz || :
/sbin/install-info \
  --info-dir=%{_infodir} %{_infodir}/gnat-style.info.gz || :

%preun gnat
if [ $1 = 0 ]; then
  /sbin/install-info --delete \
    --info-dir=%{_infodir} %{_infodir}/gnat_rm.info.gz || :
  /sbin/install-info --delete \
    --info-dir=%{_infodir} %{_infodir}/gnat_ugn_unw.info.gz || :
  /sbin/install-info --delete \
    --info-dir=%{_infodir} %{_infodir}/gnat-style.info.gz || :
fi

# Because glibc Prereq's libgcc and /sbin/ldconfig
# comes from glibc, it might not exist yet when
# libgcc is installed
%post -n libgcc -p %{_prefix}/sbin/libgcc_post_upgrade

%post -n libstdc++ -p /sbin/ldconfig

%postun -n libstdc++ -p /sbin/ldconfig

%post -n libobjc -p /sbin/ldconfig

%postun -n libobjc -p /sbin/ldconfig

%post -n libgcj
/sbin/ldconfig
/sbin/install-info \
  --info-dir=%{_infodir} %{_infodir}/cp-tools.info.gz || :
/sbin/install-info \
  --info-dir=%{_infodir} %{_infodir}/fastjar.info.gz || :

%preun -n libgcj
if [ $1 = 0 ]; then
  /sbin/install-info --delete \
    --info-dir=%{_infodir} %{_infodir}/cp-tools.info.gz || :
  /sbin/install-info --delete \
    --info-dir=%{_infodir} %{_infodir}/fastjar.info.gz || :
fi

%postun -n libgcj -p /sbin/ldconfig

%post -n libgfortran -p /sbin/ldconfig

%postun -n libgfortran -p /sbin/ldconfig

%post -n libgnat -p /sbin/ldconfig

%postun -n libgnat -p /sbin/ldconfig

%post -n libgomp
/sbin/ldconfig
/sbin/install-info \
  --info-dir=%{_infodir} %{_infodir}/libgomp.info.gz || :

%preun -n libgomp
if [ $1 = 0 ]; then
  /sbin/install-info --delete \
    --info-dir=%{_infodir} %{_infodir}/libgomp.info.gz || :
fi

%postun -n libgomp -p /sbin/ldconfig

%post -n libmudflap -p /sbin/ldconfig

%postun -n libmudflap -p /sbin/ldconfig

%files -f %{name}.lang
%defattr(-,root,root)
%{_prefix}/bin/cc
%{_prefix}/bin/c89
%{_prefix}/bin/c99
%{_prefix}/bin/gcc
%{_prefix}/bin/gcov
%{_prefix}/bin/protoize
%{_prefix}/bin/unprotoize
%ifarch ppc
%{_prefix}/bin/%{_target_platform}-gcc
%endif
%ifarch sparc64 sparcv9
%{_prefix}/bin/sparc-%{_vendor}-%{_target_os}-gcc
%endif
%ifarch ppc64
%{_prefix}/bin/ppc-%{_vendor}-%{_target_os}-gcc
%endif
%{_prefix}/bin/%{gcc_target_platform}-gcc
%{_mandir}/man1/gcc.1*
%{_mandir}/man1/gcov.1*
%{_mandir}/man1/protoize.1*
%{_mandir}/man1/unprotoize.1*
%{_infodir}/gcc*
%dir %{_prefix}/lib/gcc
%dir %{_prefix}/lib/gcc/%{gcc_target_platform}
%dir %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}
%dir %{_prefix}/libexec/gcc
%dir %{_prefix}/libexec/gcc/%{gcc_target_platform}
%dir %{_prefix}/libexec/gcc/%{gcc_target_platform}/%{gcc_version}
%dir %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/include
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/SYSCALLS.c.X
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/include/stddef.h
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/include/stdarg.h
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/include/stdfix.h
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/include/varargs.h
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/include/float.h
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/include/limits.h
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/include/stdbool.h
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/include/iso646.h
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/include/syslimits.h
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/include/unwind.h
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/include/omp.h
%ifarch %{ix86} x86_64
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/include/mmintrin.h
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/include/xmmintrin.h
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/include/emmintrin.h
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/include/pmmintrin.h
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/include/tmmintrin.h
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/include/ammintrin.h
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/include/smmintrin.h
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/include/nmmintrin.h
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/include/bmmintrin.h
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/include/wmmintrin.h
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/include/immintrin.h
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/include/avxintrin.h
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/include/x86intrin.h
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/include/mmintrin-common.h
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/include/mm_malloc.h
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/include/mm3dnow.h
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/include/cpuid.h
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/include/cross-stdarg.h
%endif
%ifarch ia64
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/include/ia64intrin.h
%endif
%ifarch ppc ppc64
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/include/ppc-asm.h
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/include/altivec.h
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/include/spe.h
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/include/paired.h
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/include/ppu_intrinsics.h
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/include/si2vmx.h
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/include/spu2vmx.h
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/include/vec_types.h
%endif
%{_prefix}/libexec/gcc/%{gcc_target_platform}/%{gcc_version}/collect2
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/crt*.o
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/libgcc.a
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/libgcov.a
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/libgcc_eh.a
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/libgcc_s.so
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/libgomp.spec
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/libgomp.a
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/libgomp.so
%ifarch sparcv9 ppc
%dir %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/64
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/64/crt*.o
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/64/libgcc.a
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/64/libgcov.a
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/64/libgcc_eh.a
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/64/libgcc_s.so
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/64/libgomp.a
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/64/libgomp.so
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/64/libmudflap.a
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/64/libmudflapth.a
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/64/libmudflap.so
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/64/libmudflapth.so
%endif
%ifarch %{multilib_64_archs}
%dir %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/32
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/32/crt*.o
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/32/libgcc.a
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/32/libgcov.a
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/32/libgcc_eh.a
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/32/libgcc_s.so
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/32/libgomp.a
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/32/libgomp.so
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/32/libmudflap.a
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/32/libmudflapth.a
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/32/libmudflap.so
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/32/libmudflapth.so
%endif
%ifarch sparcv9 sparc64 ppc ppc64
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/libmudflap.a
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/libmudflapth.a
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/libmudflap.so
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/libmudflapth.so
%endif
%dir %{_prefix}/libexec/getconf
%{_prefix}/libexec/getconf/default
%doc gcc/README* rpm.doc/changelogs/gcc/ChangeLog* gcc/COPYING*

%files -n cpp -f cpplib.lang
%defattr(-,root,root)
/lib/cpp
%{_prefix}/bin/cpp
%{_mandir}/man1/cpp.1*
%{_infodir}/cpp*
%dir %{_prefix}/libexec/gcc
%dir %{_prefix}/libexec/gcc/%{gcc_target_platform}
%dir %{_prefix}/libexec/gcc/%{gcc_target_platform}/%{gcc_version}
%{_prefix}/libexec/gcc/%{gcc_target_platform}/%{gcc_version}/cc1

%files -n libgcc
%defattr(-,root,root)
/%{_lib}/libgcc_s-%{gcc_version}-%{DATE}.so.1
/%{_lib}/libgcc_s.so.1
%{_prefix}/sbin/libgcc_post_upgrade
%doc gcc/COPYING.LIB

%files c++
%defattr(-,root,root)
%{_prefix}/bin/%{gcc_target_platform}-*++
%{_prefix}/bin/g++
%{_prefix}/bin/c++
%{_mandir}/man1/g++.1*
%dir %{_prefix}/lib/gcc
%dir %{_prefix}/lib/gcc/%{gcc_target_platform}
%dir %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}
%dir %{_prefix}/libexec/gcc
%dir %{_prefix}/libexec/gcc/%{gcc_target_platform}
%dir %{_prefix}/libexec/gcc/%{gcc_target_platform}/%{gcc_version}
%{_prefix}/libexec/gcc/%{gcc_target_platform}/%{gcc_version}/cc1plus
%ifarch sparcv9 ppc
%dir %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/64
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/64/libstdc++.so
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/64/libstdc++.a
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/64/libsupc++.a
%endif
%ifarch %{multilib_64_archs}
%dir %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/32
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/32/libstdc++.so
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/32/libstdc++.a
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/32/libsupc++.a
%endif
%ifarch sparcv9 ppc %{multilib_64_archs}
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/libstdc++.so
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/libsupc++.a
%endif
%ifarch sparcv9 sparc64 ppc ppc64
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/libstdc++.a
%endif
%doc rpm.doc/changelogs/gcc/cp/ChangeLog*

%files -n libstdc++
%defattr(-,root,root)
%{_prefix}/%{_lib}/libstdc++.so.6*

%files -n libstdc++-devel
%defattr(-,root,root)
%dir %{_prefix}/include/c++
%dir %{_prefix}/include/c++/%{gcc_version}
%{_prefix}/include/c++/%{gcc_version}/[^gjos]*
%{_prefix}/include/c++/%{gcc_version}/os*
%{_prefix}/include/c++/%{gcc_version}/s[^u]*
%dir %{_prefix}/lib/gcc
%dir %{_prefix}/lib/gcc/%{gcc_target_platform}
%dir %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}
%ifarch sparcv9 ppc
%dir %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/lib32
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/lib32/libstdc++.a
%endif
%ifarch sparc64 ppc64
%dir %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/lib64
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/lib64/libstdc++.a
%endif
%ifnarch sparcv9 sparc64 ppc ppc64
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/libstdc++.a
%endif
%ifnarch sparcv9 ppc %{multilib_64_archs}
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/libstdc++.so
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/libsupc++.a
%endif
%doc rpm.doc/changelogs/libstdc++-v3/ChangeLog* libstdc++-v3/README* libstdc++-v3/doc/html/

%files objc
%defattr(-,root,root)
%dir %{_prefix}/lib/gcc
%dir %{_prefix}/lib/gcc/%{gcc_target_platform}
%dir %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}
%dir %{_prefix}/libexec/gcc
%dir %{_prefix}/libexec/gcc/%{gcc_target_platform}
%dir %{_prefix}/libexec/gcc/%{gcc_target_platform}/%{gcc_version}
%dir %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/include
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/include/objc
%{_prefix}/libexec/gcc/%{gcc_target_platform}/%{gcc_version}/cc1obj
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/libobjc.a
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/libobjc.so
%ifarch sparcv9 ppc
%dir %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/64
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/64/libobjc.a
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/64/libobjc.so
%endif
%ifarch %{multilib_64_archs}
%dir %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/32
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/32/libobjc.a
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/32/libobjc.so
%endif
%doc rpm.doc/objc/*
%doc libobjc/THREADS* rpm.doc/changelogs/libobjc/ChangeLog*

%files objc++
%defattr(-,root,root)
%dir %{_prefix}/libexec/gcc
%dir %{_prefix}/libexec/gcc/%{gcc_target_platform}
%dir %{_prefix}/libexec/gcc/%{gcc_target_platform}/%{gcc_version}
%{_prefix}/libexec/gcc/%{gcc_target_platform}/%{gcc_version}/cc1objplus

%files -n libobjc
%defattr(-,root,root)
%{_prefix}/%{_lib}/libobjc.so.2*

%files gfortran
%defattr(-,root,root)
%{_prefix}/bin/gfortran
%{_prefix}/bin/f95
%{_mandir}/man1/gfortran.1*
%{_infodir}/gfortran*
%dir %{_prefix}/lib/gcc
%dir %{_prefix}/lib/gcc/%{gcc_target_platform}
%dir %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}
%dir %{_prefix}/libexec/gcc
%dir %{_prefix}/libexec/gcc/%{gcc_target_platform}
%dir %{_prefix}/libexec/gcc/%{gcc_target_platform}/%{gcc_version}
%dir %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/finclude
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/finclude/omp_lib.h
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/finclude/omp_lib.f90
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/finclude/omp_lib.mod
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/finclude/omp_lib_kinds.mod
%{_prefix}/libexec/gcc/%{gcc_target_platform}/%{gcc_version}/f951
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/libgfortranbegin.a
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/libgfortran.a
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/libgfortran.so
%ifarch sparcv9 ppc
%dir %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/64
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/64/libgfortranbegin.a
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/64/libgfortran.a
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/64/libgfortran.so
%endif
%ifarch %{multilib_64_archs}
%dir %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/32
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/32/libgfortranbegin.a
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/32/libgfortran.a
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/32/libgfortran.so
%endif
%doc rpm.doc/gfortran/*

%files -n libgfortran
%defattr(-,root,root)
%{_prefix}/%{_lib}/libgfortran.so.3*

%if %{build_java}
%files java
%defattr(-,root,root)
%{_prefix}/bin/gcj
%{_prefix}/bin/gjavah
%{_prefix}/bin/gcjh
%{_prefix}/bin/jcf-dump
%{_mandir}/man1/gcj.1*
%{_mandir}/man1/jcf-dump.1*
%{_mandir}/man1/gjavah.1*
%{_mandir}/man1/gcjh.1*
%{_infodir}/gcj*
%dir %{_prefix}/libexec/gcc
%dir %{_prefix}/libexec/gcc/%{gcc_target_platform}
%dir %{_prefix}/libexec/gcc/%{gcc_target_platform}/%{gcc_version}
%dir %{_prefix}/lib/gcc
%dir %{_prefix}/lib/gcc/%{gcc_target_platform}
%dir %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}
%{_prefix}/libexec/gcc/%{gcc_target_platform}/%{gcc_version}/jc1
%{_prefix}/libexec/gcc/%{gcc_target_platform}/%{gcc_version}/ecj1
%{_prefix}/libexec/gcc/%{gcc_target_platform}/%{gcc_version}/jvgenmain
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/libgcj.so
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/libgcj-tools.so
%ifarch sparcv9 sparc64 ppc ppc64
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/libgcj_bc.so
%endif
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/libgij.so
%ifarch sparcv9 ppc
%dir %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/64
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/64/libgcj.so
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/64/libgcj-tools.so
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/64/libgcj_bc.so
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/64/libgij.so
%endif
%ifarch %{multilib_64_archs}
%dir %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/32
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/32/libgcj.so
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/32/libgcj-tools.so
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/32/libgcj_bc.so
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/32/libgij.so
%endif
%doc rpm.doc/changelogs/gcc/java/ChangeLog*

%files -n libgcj
%defattr(-,root,root)
%{_prefix}/bin/jv-convert
%{_prefix}/bin/gij
%{_prefix}/bin/gjar
%{_prefix}/bin/fastjar
%{_prefix}/bin/grepjar
%{_prefix}/bin/grmic
%{_prefix}/bin/grmid
%{_prefix}/bin/grmiregistry
%{_prefix}/bin/gtnameserv
%{_prefix}/bin/gkeytool
%{_prefix}/bin/gorbd
%{_prefix}/bin/gserialver
%{_prefix}/bin/gcj-dbtool
%if %{include_gappletviewer}
%{_prefix}/bin/gappletviewer
%{_mandir}/man1/gappletviewer.1*
%endif
%{_prefix}/bin/gjarsigner
%{_mandir}/man1/fastjar.1*
%{_mandir}/man1/grepjar.1*
%{_mandir}/man1/gjar.1*
%{_mandir}/man1/gjarsigner.1*
%{_mandir}/man1/jv-convert.1*
%{_mandir}/man1/gij.1*
%{_mandir}/man1/grmic.1*
%{_mandir}/man1/grmiregistry.1*
%{_mandir}/man1/gcj-dbtool.1*
%{_mandir}/man1/gkeytool.1*
%{_mandir}/man1/gorbd.1*
%{_mandir}/man1/grmid.1*
%{_mandir}/man1/gserialver.1*
%{_mandir}/man1/gtnameserv.1*
%{_infodir}/fastjar.info*
%{_infodir}/cp-tools.info*
%{_prefix}/%{_lib}/libgcj.so.*
%{_prefix}/%{_lib}/libgcj-tools.so.*
%{_prefix}/%{_lib}/libgcj_bc.so.*
%{_prefix}/%{_lib}/libgij.so.*
%dir %{_prefix}/%{_lib}/gcj-%{version}
%{_prefix}/%{_lib}/gcj-%{version}/libgtkpeer.so
%{_prefix}/%{_lib}/gcj-%{version}/libgjsmalsa.so
%{_prefix}/%{_lib}/gcj-%{version}/libjawt.so
%if %{include_gappletviewer}
%{_prefix}/%{_lib}/gcj-%{version}/libgcjwebplugin.so
%endif
%{_prefix}/%{_lib}/gcj-%{version}/libjvm.so
%{_prefix}/%{_lib}/gcj-%{version}/libjavamath.so
%dir %{_prefix}/share/java
%{_prefix}/share/java/[^sl]*
%{_prefix}/share/java/libgcj-%{version}.jar
%dir %{_prefix}/%{_lib}/security
%config(noreplace) %{_prefix}/%{_lib}/security/classpath.security
%{_prefix}/%{_lib}/logging.properties
%dir %{_prefix}/%{_lib}/gcj-%{version}/classmap.db.d
%attr(0644,root,root) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) %{_prefix}/%{_lib}/gcj-%{version}/classmap.db
%if %{include_gappletviewer}
%doc rpm.doc/README.libgcjwebplugin.so
%endif

%files -n libgcj-devel
%defattr(-,root,root)
%{_prefix}/bin/addr2name.awk
%dir %{_prefix}/lib/gcc
%dir %{_prefix}/lib/gcc/%{gcc_target_platform}
%dir %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}
%dir %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/include
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/include/gcj
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/include/jawt.h
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/include/jawt_md.h
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/include/jni.h
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/include/jni_md.h
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/include/jvmpi.h
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/libgcj.spec
%ifarch sparcv9 ppc
%dir %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/lib32
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/lib32/libgcj_bc.so
%endif
%ifarch sparc64 ppc64
%dir %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/lib64
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/lib64/libgcj_bc.so
%endif
%ifnarch sparcv9 sparc64 ppc ppc64
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/libgcj_bc.so
%endif
%dir %{_prefix}/include/c++
%dir %{_prefix}/include/c++/%{gcc_version}
%{_prefix}/include/c++/%{gcc_version}/[gj]*
%{_prefix}/include/c++/%{gcc_version}/org
%{_prefix}/include/c++/%{gcc_version}/sun
%{_prefix}/%{_lib}/pkgconfig/libgcj-*.pc
%doc rpm.doc/boehm-gc/* rpm.doc/fastjar/* rpm.doc/libffi/*
%doc rpm.doc/libjava/*

%files -n libgcj-src
%defattr(-,root,root)
%dir %{_prefix}/share/java
%{_prefix}/share/java/src*.zip
%{_prefix}/share/java/libgcj-tools-%{version}.jar
%endif

%if %{build_ada}
%files gnat
%defattr(-,root,root)
%{_prefix}/bin/gnat*
%{_infodir}/gnat*
%dir %{_prefix}/lib/gcc
%dir %{_prefix}/lib/gcc/%{gcc_target_platform}
%dir %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}
%dir %{_prefix}/libexec/gcc
%dir %{_prefix}/libexec/gcc/%{gcc_target_platform}
%dir %{_prefix}/libexec/gcc/%{gcc_target_platform}/%{gcc_version}
%ifarch sparcv9 ppc
%dir %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/64
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/64/adainclude
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/64/adalib
%endif
%ifarch %{multilib_64_archs}
%dir %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/32
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/32/adainclude
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/32/adalib
%endif
%ifarch sparcv9 sparc64 ppc ppc64
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/adainclude
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/adalib
%endif
%{_prefix}/libexec/gcc/%{gcc_target_platform}/%{gcc_version}/gnat1
%doc rpm.doc/changelogs/gcc/ada/ChangeLog*

%files -n libgnat
%defattr(-,root,root)
%{_prefix}/%{_lib}/libgnat-*.so
%{_prefix}/%{_lib}/libgnarl-*.so

%files -n libgnat-devel
%defattr(-,root,root)
%dir %{_prefix}/lib/gcc
%dir %{_prefix}/lib/gcc/%{gcc_target_platform}
%dir %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}
%ifarch sparcv9 ppc
%dir %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/lib32
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/lib32/adainclude
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/lib32/adalib
%endif
%ifarch sparc64 ppc64
%dir %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/lib64
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/lib64/adainclude
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/lib64/adalib
%endif
%ifnarch sparcv9 sparc64 ppc ppc64
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/adainclude
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/adalib
%endif
%endif

%files -n libgomp
%defattr(-,root,root)
%{_prefix}/%{_lib}/libgomp.so.1*
%{_infodir}/libgomp.info*
%doc rpm.doc/changelogs/libgomp/ChangeLog*

%files -n libmudflap
%defattr(-,root,root)
%{_prefix}/%{_lib}/libmudflap.so.0*
%{_prefix}/%{_lib}/libmudflapth.so.0*

%files -n libmudflap-devel
%defattr(-,root,root)
%dir %{_prefix}/lib/gcc
%dir %{_prefix}/lib/gcc/%{gcc_target_platform}
%dir %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}
%dir %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/include
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/include/mf-runtime.h
%ifarch sparcv9 ppc
%dir %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/lib32
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/lib32/libmudflap.a
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/lib32/libmudflapth.a
%endif
%ifarch sparc64 ppc64
%dir %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/lib64
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/lib64/libmudflap.a
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/lib64/libmudflapth.a
%endif
%ifnarch sparcv9 sparc64 ppc ppc64
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/libmudflap.a
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/libmudflapth.a
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/libmudflap.so
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/libmudflapth.so
%endif
%doc rpm.doc/changelogs/libmudflap/ChangeLog*

%changelog
* Fri Jan 16 2009 Jakub Jelinek <jakub at redhat.com> 4.4.0-0.3
- initial 4.4 package, using newly created redhat/gcc-4_4-branch

gcc44-build-id.patch:

--- NEW FILE gcc44-build-id.patch ---
2007-07-22  Roland McGrath  <roland at redhat.com>

	* config/rs6000/sysv4.h (LINK_EH_SPEC): Add --build-id for
	non-relocatable link.
	* config/linux.h (LINK_EH_SPEC): Likewise.
	* config/alpha/elf.h (LINK_EH_SPEC): Likewise.
	* config/ia64/linux.h (LINK_EH_SPEC): Likewise.

--- gcc/config/rs6000/sysv4.h.~1~
+++ gcc/config/rs6000/sysv4.h
@@ -906,7 +906,7 @@ extern int fixuplabelno;
   %{!dynamic-linker:-dynamic-linker " LINUX_DYNAMIC_LINKER "}}}"
 
 #if defined(HAVE_LD_EH_FRAME_HDR)
-# define LINK_EH_SPEC "%{!static:--eh-frame-hdr} "
+# define LINK_EH_SPEC "%{!static:--eh-frame-hdr} %{!r:--build-id} "
 #endif
 
 #define CPP_OS_LINUX_SPEC "-D__unix__ -D__gnu_linux__ -D__linux__ \
--- gcc/config/linux.h.~1~
+++ gcc/config/linux.h
@@ -85,7 +85,7 @@ Boston, MA 02110-1301, USA.  */
     } while (0)
 
 #if defined(HAVE_LD_EH_FRAME_HDR)
-#define LINK_EH_SPEC "%{!static:--eh-frame-hdr} "
+#define LINK_EH_SPEC "%{!static:--eh-frame-hdr} %{!r:--build-id} "
 #endif
 
 /* Define this so we can compile MS code for use with WINE.  */
--- gcc/config/alpha/elf.h.~1~
+++ gcc/config/alpha/elf.h
@@ -421,7 +421,7 @@ extern int alpha_this_gpdisp_sequence_nu
    I imagine that other systems will catch up.  In the meantime, it
    doesn't harm to make sure that the data exists to be used later.  */
 #if defined(HAVE_LD_EH_FRAME_HDR)
-#define LINK_EH_SPEC "%{!static:--eh-frame-hdr} "
+#define LINK_EH_SPEC "%{!static:--eh-frame-hdr} %{!r:--build-id} "
 #endif
 
 /* A C statement (sans semicolon) to output to the stdio stream STREAM
--- gcc/config/ia64/linux.h.~1~
+++ gcc/config/ia64/linux.h
@@ -56,7 +56,7 @@ do {						\
    Signalize that because we have fde-glibc, we don't need all C shared libs
    linked against -lgcc_s.  */
 #undef LINK_EH_SPEC
-#define LINK_EH_SPEC ""
+#define LINK_EH_SPEC "%{!r:--build-id} "
 
 #define MD_UNWIND_SUPPORT "config/ia64/linux-unwind.h"
 

gcc44-c++-builtin-redecl.patch:

--- NEW FILE gcc44-c++-builtin-redecl.patch ---
2007-10-02  Jakub Jelinek  <jakub at redhat.com>

	* decl.c (duplicate_decls): When redeclaring a builtin function,
	keep the merged decl builtin whenever types match, even if new
	decl defines a function.

	* gcc.dg/builtins-65.c: New test.
	* g++.dg/ext/builtin10.C: New test.

--- gcc/cp/decl.c.jj	2007-10-01 22:11:09.000000000 +0200
+++ gcc/cp/decl.c	2007-10-02 11:39:46.000000000 +0200
@@ -1988,23 +1988,21 @@ duplicate_decls (tree newdecl, tree oldd
 	  DECL_ARGUMENTS (olddecl) = DECL_ARGUMENTS (newdecl);
 	  DECL_RESULT (olddecl) = DECL_RESULT (newdecl);
 	}
+      /* If redeclaring a builtin function, it stays built in.  */
+      if (types_match && DECL_BUILT_IN (olddecl))
+	{
+	  DECL_BUILT_IN_CLASS (newdecl) = DECL_BUILT_IN_CLASS (olddecl);
+	  DECL_FUNCTION_CODE (newdecl) = DECL_FUNCTION_CODE (olddecl);
+	  /* If we're keeping the built-in definition, keep the rtl,
+	     regardless of declaration matches.  */
+	  COPY_DECL_RTL (olddecl, newdecl);
+	}
       if (new_defines_function)
 	/* If defining a function declared with other language
 	   linkage, use the previously declared language linkage.  */
 	SET_DECL_LANGUAGE (newdecl, DECL_LANGUAGE (olddecl));
       else if (types_match)
 	{
-	  /* If redeclaring a builtin function, and not a definition,
-	     it stays built in.  */
-	  if (DECL_BUILT_IN (olddecl))
-	    {
-	      DECL_BUILT_IN_CLASS (newdecl) = DECL_BUILT_IN_CLASS (olddecl);
-	      DECL_FUNCTION_CODE (newdecl) = DECL_FUNCTION_CODE (olddecl);
-	      /* If we're keeping the built-in definition, keep the rtl,
-		 regardless of declaration matches.  */
-	      COPY_DECL_RTL (olddecl, newdecl);
-	    }
-
 	  DECL_RESULT (newdecl) = DECL_RESULT (olddecl);
 	  /* Don't clear out the arguments if we're redefining a function.  */
 	  if (DECL_ARGUMENTS (olddecl))
--- gcc/testsuite/gcc.dg/builtins-65.c.jj	2007-10-02 11:23:51.000000000 +0200
+++ gcc/testsuite/gcc.dg/builtins-65.c	2007-10-02 11:24:12.000000000 +0200
@@ -0,0 +1,25 @@
+/* { dg-do compile } */
+/* { dg-options "-O2" } */
+
+typedef __SIZE_TYPE__ size_t;
+extern void __chk_fail (void);
+extern int snprintf (char *, size_t, const char *, ...);
+extern inline __attribute__((gnu_inline, always_inline)) int snprintf (char *a, size_t b, const char *fmt, ...)
+{
+  if (__builtin_object_size (a, 0) != -1UL && __builtin_object_size (a, 0) < b)
+    __chk_fail ();
+  return __builtin_snprintf (a, b, fmt, __builtin_va_arg_pack ());
+}
+extern int snprintf (char *, size_t, const char *, ...) __asm ("mysnprintf");
+
+char buf[10];
+
+int
+main (void)
+{
+  snprintf (buf, 10, "%d%d\n", 10, 10);
+  return 0;
+}
+
+/* { dg-final { scan-assembler "mysnprintf" } } */
+/* { dg-final { scan-assembler-not "__chk_fail" } } */
--- gcc/testsuite/g++.dg/ext/builtin10.C.jj	2007-10-02 11:19:45.000000000 +0200
+++ gcc/testsuite/g++.dg/ext/builtin10.C	2007-10-02 11:23:26.000000000 +0200
@@ -0,0 +1,27 @@
+// { dg-do compile }
+// { dg-options "-O2" }
+
+typedef __SIZE_TYPE__ size_t;
+extern "C" {
+extern void __chk_fail (void);
+extern int snprintf (char *, size_t, const char *, ...);
+extern inline __attribute__((gnu_inline, always_inline)) int snprintf (char *a, size_t b, const char *fmt, ...)
+{
+  if (__builtin_object_size (a, 0) != -1UL && __builtin_object_size (a, 0) < b)
+    __chk_fail ();
+  return __builtin_snprintf (a, b, fmt, __builtin_va_arg_pack ());
+}
+extern int snprintf (char *, size_t, const char *, ...) __asm ("mysnprintf");
+}
+
+char buf[10];
+
+int
+main (void)
+{
+  snprintf (buf, 10, "%d%d\n", 10, 10);
+  return 0;
+}
+
+// { dg-final { scan-assembler "mysnprintf" } }
+// { dg-final { scan-assembler-not "__chk_fail" } }

gcc44-hack.patch:

--- NEW FILE gcc44-hack.patch ---
--- libada/Makefile.in.jj	2009-01-14 12:07:35.000000000 +0100
+++ libada/Makefile.in	2009-01-15 14:25:33.000000000 +0100
@@ -66,17 +66,39 @@ target_noncanonical:=@target_noncanonica
 version := $(shell cat $(srcdir)/../gcc/BASE-VER)
 libsubdir := $(libdir)/gcc/$(target_noncanonical)/$(version)$(MULTISUBDIR)
 
+DEFAULTMULTIFLAGS :=
+ifeq ($(MULTISUBDIR),)
+targ:=$(subst -, ,$(target))
+arch:=$(word 1,$(targ))
+ifeq ($(words $(targ)),2)
+osys:=$(word 2,$(targ))
+else
+osys:=$(word 3,$(targ))
+endif
+ifeq ($(strip $(filter-out i%86 x86_64 powerpc% ppc% s390% sparc% linux%, $(arch) $(osys))),)
+ifeq ($(shell $(CC) $(CFLAGS) -print-multi-os-directory),../lib64)
+DEFAULTMULTIFLAGS := -m64
+else
+ifeq ($(strip $(filter-out s390%, $(arch))),)
+DEFAULTMULTIFLAGS := -m31
+else
+DEFAULTMULTIFLAGS := -m32
+endif
+endif
+endif
+endif
+
 # exeext should not be used because it's the *host* exeext.  We're building
 # a *target* library, aren't we?!?  Likewise for CC.  Still, provide bogus
 # definitions just in case something slips through the safety net provided
 # by recursive make invocations in gcc/ada/Makefile.in
 LIBADA_FLAGS_TO_PASS = \
         "MAKEOVERRIDES=" \
-        "LDFLAGS=$(LDFLAGS)" \
+        "LDFLAGS=$(strip $(LDFLAGS) $(DEFAULTMULTIFLAGS))" \
         "LN_S=$(LN_S)" \
         "SHELL=$(SHELL)" \
-        "GNATLIBFLAGS=$(GNATLIBFLAGS) $(MULTIFLAGS)" \
-        "GNATLIBCFLAGS=$(GNATLIBCFLAGS) $(MULTIFLAGS)" \
+        "GNATLIBFLAGS=$(strip $(GNATLIBFLAGS) $(MULTIFLAGS) $(DEFAULTMULTIFLAGS))" \
+        "GNATLIBCFLAGS=$(strip $(GNATLIBCFLAGS) $(MULTIFLAGS) $(DEFAULTMULTIFLAGS))" \
         "TARGET_LIBGCC2_CFLAGS=$(TARGET_LIBGCC2_CFLAGS)" \
         "THREAD_KIND=$(THREAD_KIND)" \
         "TRACE=$(TRACE)" \
@@ -87,7 +109,7 @@ LIBADA_FLAGS_TO_PASS = \
         "exeext=.exeext.should.not.be.used " \
 	'CC=the.host.compiler.should.not.be.needed' \
 	"GCC_FOR_TARGET=$(CC)" \
-        "CFLAGS=$(CFLAGS) $(WARN_CFLAGS)"
+        "CFLAGS=$(strip $(CFLAGS) $(DEFAULTMULTIFLAGS) $(WARN_CFLAGS))"
 
 # Rules to build gnatlib.
 .PHONY: gnatlib gnatlib-plain gnatlib-sjlj gnatlib-zcx gnatlib-shared oscons
--- libjava/classpath/native/plugin/gcjwebplugin.cc.jj	2009-01-14 12:08:34.000000000 +0100
+++ libjava/classpath/native/plugin/gcjwebplugin.cc	2009-01-15 21:20:17.000000000 +0100
@@ -45,7 +45,7 @@ exception statement from your version. *
 
 // Netscape plugin API includes.
 #include <npapi.h>
-#include <npupp.h>
+#include <npfunctions.h>
 
 // GLib includes.
 #include <glib.h>
@@ -827,7 +827,7 @@ GCJ_URLNotify (NPP instance, const char*
   PLUGIN_DEBUG ("GCJ_URLNotify return");
 }
 
-jref
+void *
 GCJ_GetJavaClass (void)
 {
   PLUGIN_DEBUG ("GCJ_GetJavaClass");
@@ -1669,17 +1669,17 @@ NP_Initialize (NPNetscapeFuncs* browserT
   // Return to the browser the plugin functions that we implement.
   pluginTable->version = (NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR;
   pluginTable->size = sizeof (NPPluginFuncs);
-  pluginTable->newp = NewNPP_NewProc (GCJ_New);
-  pluginTable->destroy = NewNPP_DestroyProc (GCJ_Destroy);
-  pluginTable->setwindow = NewNPP_SetWindowProc (GCJ_SetWindow);
-  pluginTable->newstream = NewNPP_NewStreamProc (GCJ_NewStream);
-  pluginTable->destroystream = NewNPP_DestroyStreamProc (GCJ_DestroyStream);
-  pluginTable->asfile = NewNPP_StreamAsFileProc (GCJ_StreamAsFile);
-  pluginTable->writeready = NewNPP_WriteReadyProc (GCJ_WriteReady);
-  pluginTable->write = NewNPP_WriteProc (GCJ_Write);
-  pluginTable->print = NewNPP_PrintProc (GCJ_Print);
-  pluginTable->urlnotify = NewNPP_URLNotifyProc (GCJ_URLNotify);
-  pluginTable->getvalue = NewNPP_GetValueProc (GCJ_GetValue);
+  pluginTable->newp = (NPP_NewProcPtr) (GCJ_New);
+  pluginTable->destroy = (NPP_DestroyProcPtr) (GCJ_Destroy);
+  pluginTable->setwindow = (NPP_SetWindowProcPtr) (GCJ_SetWindow);
+  pluginTable->newstream = (NPP_NewStreamProcPtr) (GCJ_NewStream);
+  pluginTable->destroystream = (NPP_DestroyStreamProcPtr) (GCJ_DestroyStream);
+  pluginTable->asfile = (NPP_StreamAsFileProcPtr) (GCJ_StreamAsFile);
+  pluginTable->writeready = (NPP_WriteReadyProcPtr) (GCJ_WriteReady);
+  pluginTable->write = (NPP_WriteProcPtr) (GCJ_Write);
+  pluginTable->print = (NPP_PrintProcPtr) (GCJ_Print);
+  pluginTable->urlnotify = (NPP_URLNotifyProcPtr) (GCJ_URLNotify);
+  pluginTable->getvalue = (NPP_GetValueProcPtr) (GCJ_GetValue);
   
   initialized = true;
 
--- gcc/ada/make.adb	2008-11-07 23:00:32.000000000 +0100
+++ gcc/ada/make.adb	2009-01-16 17:55:02.000000000 +0100
@@ -8039,6 +8039,7 @@ package body Make is
              or else Argv (2 .. Argv'Last) = "pg"
              or else (Argv (2) = 'm' and then Argv'Last > 2)
              or else (Argv (2) = 'f' and then Argv'Last > 2)
+             or else (Argv'Last >= 8 and then Argv (2 .. 8) = "-param=")
          then
             Add_Switch (Argv, Compiler, And_Save => And_Save);
             Add_Switch (Argv, Linker, And_Save => And_Save);

gcc44-i386-libgomp.patch:

--- NEW FILE gcc44-i386-libgomp.patch ---
Build i386.rpm libgomp and libsupc++.a(guard.o) as i486+, pre-i486
hardware isn't supported because NPTL doesn't support it anyway.

--- libgomp/configure.tgt.jj	2008-01-10 20:53:48.000000000 +0100
+++ libgomp/configure.tgt	2008-03-27 12:44:51.000000000 +0100
@@ -44,14 +44,14 @@ if test $enable_linux_futex = yes; then
 	;;
 
     # Note that bare i386 is not included here.  We need cmpxchg.
-    i[456]86-*-linux*)
+    i[3456]86-*-linux*)
 	config_path="linux/x86 linux posix"
 	case " ${CC} ${CFLAGS} " in
 	  *" -m64 "*)
 	    ;;
 	  *)
 	    if test -z "$with_arch"; then
-	      XCFLAGS="${XCFLAGS} -march=i486 -mtune=${target_cpu}"
+	      XCFLAGS="${XCFLAGS} -march=i486 -mtune=generic"
 	    fi
 	esac
 	;;
@@ -63,7 +63,7 @@ if test $enable_linux_futex = yes; then
 	config_path="linux/x86 linux posix"
 	case " ${CC} ${CFLAGS} " in
 	  *" -m32 "*)
-	    XCFLAGS="${XCFLAGS} -march=i486 -mtune=i686"
+	    XCFLAGS="${XCFLAGS} -march=i486 -mtune=generic"
 	    ;;
 	esac
 	;;
--- libstdc++-v3/libsupc++/guard.cc.jj	2008-03-01 00:58:24.000000000 +0100
+++ libstdc++-v3/libsupc++/guard.cc	2008-03-27 14:08:44.000000000 +0100
@@ -35,6 +35,27 @@
 #include <new>
 #include <ext/atomicity.h>
 #include <ext/concurrence.h>
+#if defined __i386__ && !defined _GLIBCXX_ATOMIC_BUILTINS_4
+# define _GLIBCXX_ATOMIC_BUILTINS_4 1
+# define __sync_val_compare_and_swap(a, b, c) \
+  ({								\
+     typedef char sltast[sizeof (*a) == sizeof (int) ? 1 : -1];	\
+     int sltas;							\
+     __asm __volatile ("lock; cmpxchgl %3, (%1)"		\
+		       : "=a" (sltas)				\
+		       : "r" (a), "0" (b), "r" (c) : "memory");	\
+     sltas;							\
+   })
+# define __sync_lock_test_and_set(a, b) \
+  ({								\
+     typedef char sltast[sizeof (*a) == sizeof (int) ? 1 : -1];	\
+     int sltas;							\
+     __asm __volatile ("xchgl (%1), %0"				\
+		       : "=r" (sltas)				\
+		       : "r" (a), "0" (b) : "memory");		\
+     sltas;							\
+   })
+#endif
 #if defined(__GTHREADS) && defined(__GTHREAD_HAS_COND) \
     && defined(_GLIBCXX_ATOMIC_BUILTINS_4) && defined(_GLIBCXX_HAVE_LINUX_FUTEX)
 # include <climits>

gcc44-ia64-libunwind.patch:

--- NEW FILE gcc44-ia64-libunwind.patch ---
2004-11-27  Jakub Jelinek  <jakub at redhat.com>

	* config.gcc (ia64*-*-linux*): If native and libelf is installed,
	use ia64/t-glibc-no-libunwind instead of the other t-*unwind*
	fragments.
	* config/ia64/t-glibc-no-libunwind: New file.
	* config/ia64/change-symver.c: New file.
	* config/ia64/unwind-ia64.c: If USE_SYMVER_GLOBAL and SHARED,
	define _Unwind_* to __symverglobal_Unwind_*.
	(alias): Undefine.
	(symverglobal): Define.  Use it on _Unwind_*.
	* config/ia64/mkmap-symver-multi.awk: New file.
	* config/ia64/libgcc-ia64-no-libunwind.ver: New file.

--- gcc/config.gcc.jj	2004-10-04 08:55:44.000000000 -0400
+++ gcc/config.gcc	2004-11-13 05:23:50.000000000 -0500
@@ -1185,9 +1185,16 @@ ia64*-*-freebsd*)
 	;;
 ia64*-*-linux*)
 	tm_file="${tm_file} dbxelf.h elfos.h svr4.h linux.h ia64/sysv4.h ia64/linux.h"
-	tmake_file="${tmake_file} ia64/t-ia64 t-libunwind ia64/t-glibc"
-	if test x$with_system_libunwind != xyes ; then
-		tmake_file="${tmake_file} t-libunwind-elf ia64/t-glibc-libunwind"
+	tmake_file="${tmake_file} ia64/t-ia64"
+	if test x${target} = x${host} && test x${target} = x${build} \
+	   && grep gelf_getverdef /usr/include/gelf.h > /dev/null 2>&1 \
+	   && test -f /usr/lib/libelf.so; then
+		tmake_file="${tmake_file} ia64/t-glibc-no-libunwind"
+	else
+		tmake_file="${tmake_file} t-libunwind ia64/t-glibc"
+		if test x$with_system_libunwind != xyes ; then
+			tmake_file="${tmake_file} t-libunwind-elf ia64/t-glibc-libunwind"
+		fi
 	fi
 	target_cpu_default="MASK_GNU_AS|MASK_GNU_LD"
 	extra_parts="crtbegin.o crtend.o crtbeginS.o crtendS.o crtfastmath.o"
--- gcc/config/ia64/t-glibc-no-libunwind.jj	2004-02-18 10:27:36.000000000 -0500
+++ gcc/config/ia64/t-glibc-no-libunwind	2004-11-15 09:56:33.000000000 -0500
@@ -0,0 +1,30 @@
+# Don't use system libunwind library on IA-64 GLIBC based system,
+# but make _Unwind_* symbols unversioned, so that created programs
+# are usable even when libgcc_s uses libunwind.
+LIB2ADDEH += $(srcdir)/config/ia64/fde-glibc.c
+SHLIB_MAPFILES += $(srcdir)/config/ia64/libgcc-ia64-no-libunwind.ver
+SHLIB_MKMAP = $(srcdir)/config/ia64/mkmap-symver-multi.awk
+
+SHLIB_LINK = $(GCC_FOR_TARGET) $(LIBGCC2_CFLAGS) -shared -nodefaultlibs \
+	-Wl,--soname=$(SHLIB_SONAME) \
+	-Wl,--version-script=$(SHLIB_MAP) \
+	-o $(SHLIB_DIR)/$(SHLIB_SONAME).tmp @multilib_flags@ $(SHLIB_OBJS) -lc && \
+	rm -f $(SHLIB_DIR)/$(SHLIB_SOLINK) && \
+	if [ -f $(SHLIB_DIR)/$(SHLIB_SONAME) ]; then \
+	  mv -f $(SHLIB_DIR)/$(SHLIB_SONAME) \
+		$(SHLIB_DIR)/$(SHLIB_SONAME).backup; \
+	else true; fi && \
+	gcc -O2 -o $(SHLIB_DIR)/$(SHLIB_SONAME).tweak \
+	  $$(gcc_srcdir)/config/ia64/change-symver.c -lelf && \
+	$(SHLIB_DIR)/$(SHLIB_SONAME).tweak $(SHLIB_DIR)/$(SHLIB_SONAME).tmp \
+	GCC_3.4.2 _GLOBAL_ \
+	_Unwind_GetGR _Unwind_RaiseException _Unwind_GetRegionStart _Unwind_SetIP \
+	_Unwind_GetIP _Unwind_GetLanguageSpecificData _Unwind_Resume \
+	_Unwind_DeleteException _Unwind_SetGR _Unwind_ForcedUnwind \
+	_Unwind_Backtrace _Unwind_FindEnclosingFunction _Unwind_GetCFA \
+	_Unwind_Resume_or_Rethrow _Unwind_GetBSP && \
+	rm -f $(SHLIB_DIR)/$(SHLIB_SONAME).tweak && \
+	mv $(SHLIB_DIR)/$(SHLIB_SONAME).tmp $(SHLIB_DIR)/$(SHLIB_SONAME) && \
+	$(LN_S) $(SHLIB_SONAME) $(SHLIB_DIR)/$(SHLIB_SOLINK)
+
+TARGET_LIBGCC2_CFLAGS += -DUSE_SYMVER_GLOBAL
--- gcc/config/ia64/change-symver.c.jj	2004-02-18 10:27:36.000000000 -0500
+++ gcc/config/ia64/change-symver.c	2004-11-13 05:23:50.000000000 -0500
@@ -0,0 +1,211 @@
+#define _GNU_SOURCE 1
+#define _FILE_OFFSET_BITS 64
+#include <endian.h>
+#include <errno.h>
+#include <error.h>
+#include <fcntl.h>
+#include <fnmatch.h>
+#include <gelf.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+int
+compute_veridx (const char *name, Elf *elf, Elf_Data *verd, GElf_Shdr *verd_shdr)
+{
+  if (strcmp (name, "_GLOBAL_") == 0)
+    return 1;
+
+  int cnt;
+  size_t offset = 0;
+  for (cnt = verd_shdr->sh_info; --cnt >= 0; )
+    {
+      GElf_Verdef defmem;
+      GElf_Verdef *def;
+      GElf_Verdaux auxmem;
+      GElf_Verdaux *aux;
+      unsigned int auxoffset;
+
+      /* Get the data at the next offset.  */
+      def = gelf_getverdef (verd, offset, &defmem);
+      if (def == NULL)
+	break;
+
+      auxoffset = offset + def->vd_aux;
+      aux = gelf_getverdaux (verd, auxoffset, &auxmem);
+      if (aux == NULL)
+	break;
+
+      if (strcmp (name, elf_strptr (elf, verd_shdr->sh_link,
+		  aux->vda_name)) == 0)
+	return def->vd_ndx;
+
+      /* Find the next offset.  */
+      offset += def->vd_next;
+    }
+
+  return -1;
+}
+
+int
+main (int argc, char **argv)
+{
+  if (argc < 4)
+    error (1, 0, "Usage: change_symver library from_symver to_symver symbol...\nExample: change_symver libfoo.so FOO_1.0 *global* bar baz");
+
+  const char *fname = argv[1];
+
+  /* Open the file.  */
+  int fd;
+  fd = open (fname, O_RDWR);
+  if (fd == -1)
+    error (1, errno, fname);
+
+  elf_version (EV_CURRENT);
+
+  /* Now get the ELF descriptor.  */
+  Elf *elf = elf_begin (fd, ELF_C_READ_MMAP, NULL);
+  if (elf == NULL || elf_kind (elf) != ELF_K_ELF)
+    error (1, 0, "Couldn't open %s: %s", fname, elf_errmsg (-1));
+
+  size_t shstrndx;
+  /* Get the section header string table index.  */
+  if (elf_getshstrndx (elf, &shstrndx) < 0)
+    error (1, 0, "cannot get shstrndx from %s", fname);
+
+  GElf_Ehdr ehdr_mem;
+  GElf_Ehdr *ehdr;
+
+  /* We need the ELF header in a few places.  */
+  ehdr = gelf_getehdr (elf, &ehdr_mem);
+  if (ehdr == NULL)
+    error (1, 0, "couldn't get ELF headers %s: %s", fname, elf_errmsg (-1));
+
+  Elf_Scn *scn = NULL;
+  GElf_Shdr shdr_mem, verd_shdr, ver_shdr, dynsym_shdr;
+  Elf_Data *ver = NULL, *verd = NULL, *dynsym = NULL;
+
+  while ((scn = elf_nextscn (elf, scn)) != NULL)
+    {
+      GElf_Shdr *shdr = gelf_getshdr (scn, &shdr_mem);
+
+      if (shdr == NULL)
+	error (1, 0, "couldn't get shdr from %s", fname);
+
+      if ((shdr->sh_flags & SHF_ALLOC) != 0)
+	{
+	  const char *name = elf_strptr (elf, shstrndx, shdr->sh_name);
+	  Elf_Data **p;
+
+	  if (strcmp (name, ".gnu.version") == 0)
+	    {
+	      p = &ver;
+	      ver_shdr = *shdr;
+	    }
+	  else if (strcmp (name, ".gnu.version_d") == 0)
+	    {
+	      p = &verd;
+	      verd_shdr = *shdr;
+	    }
+	  else if (strcmp (name, ".dynsym") == 0)
+	    {
+	      p = &dynsym;
+	      dynsym_shdr = *shdr;
+	    }
+	  else
+	    continue;
+
+	  if (*p != NULL)
+	    error (1, 0, "Two %s sections in %s", name, fname);
+	  *p = elf_getdata (scn, NULL);
+	  if (*p == NULL || elf_getdata (scn, *p) != NULL)
+	    error (1, 0, "No data or non-contiguous data in %s section in %s",
+		   name, fname);
+	}
+    }
+
+  if (ver == NULL || verd == NULL || dynsym == NULL)
+    error (1, 0, "Couldn't find one of the needed sections in %s", fname);
+
+  int from_idx = compute_veridx (argv[2], elf, verd, &verd_shdr);
+  if (from_idx == -1)
+    error (1, 0, "Could not find symbol version %s in %s", argv[2], fname);
+
+  int to_idx = compute_veridx (argv[3], elf, verd, &verd_shdr);
+  if (to_idx == -1)
+    error (1, 0, "Could not find symbol version %s in %s", argv[3], fname);
+
+  if (dynsym_shdr.sh_entsize != gelf_fsize (elf, ELF_T_SYM, 1, ehdr->e_version)
+      || dynsym_shdr.sh_size % dynsym_shdr.sh_entsize
+      || ver_shdr.sh_entsize != 2
+      || (ver_shdr.sh_size & 1)
+      || dynsym_shdr.sh_size / dynsym_shdr.sh_entsize != ver_shdr.sh_size / 2)
+    error (1, 0, "Unexpected sh_size or sh_entsize in %s", fname);
+
+  size_t nentries = ver_shdr.sh_size / 2;
+  size_t cnt;
+  GElf_Versym array[nentries];
+  for (cnt = 0; cnt < nentries; ++cnt)
+    {
+      GElf_Versym vsymmem;
+      GElf_Versym *vsym;
+
+      vsym = gelf_getversym (ver, cnt, &vsymmem);
+      if (vsym == NULL)
+	error (1, 0, "gelt_getversym failed in %s: %s", fname, elf_errmsg (-1));
+
+      array[cnt] = *vsym;
+      if (*vsym != from_idx)
+	continue;
+
+      GElf_Sym sym_mem;
+      GElf_Sym *sym;
+      sym = gelf_getsym (dynsym, cnt, &sym_mem);
+      if (sym == NULL)
+	error (1, 0, "gelt_getsym failed in %s: %s", fname, elf_errmsg (-1));
+
+      const char *name = elf_strptr (elf, dynsym_shdr.sh_link, sym->st_name);
+
+      int argn;
+      for (argn = 4; argn < argc; ++argn)
+	if (fnmatch (argv[argn], name, 0) == 0)
+	  {
+	    array[cnt] = to_idx;
+	    break;
+	  }
+    }
+
+  if (sizeof (array[0]) != 2)
+    abort ();
+
+#if __BYTE_ORDER == __LITTLE_ENDIAN
+  if (ehdr->e_ident[EI_DATA] == ELFDATA2LSB)
+    ;
+  else if (ehdr->e_ident[EI_DATA] == ELFDATA2MSB)
+#elif __BYTE_ORDER == __BIG_ENDIAN
+  if (ehdr->e_ident[EI_DATA] == ELFDATA2MSB)
+    ;
+  else if (ehdr->e_ident[EI_DATA] == ELFDATA2LSB)
+#else
+# error Unsupported endianity
+#endif
+    {
+      for (cnt = 0; cnt < nentries; ++cnt)
+	array[cnt] = ((array[cnt] & 0xff) << 8) | ((array[cnt] & 0xff00) >> 8);
+    }
+  else
+    error (1, 0, "Unknown EI_DATA %d in %s", ehdr->e_ident[EI_DATA], fname);
+
+  if (elf_end (elf) != 0)
+    error (1, 0, "couldn't close %s: %s", fname, elf_errmsg (-1));
+
+  if (lseek (fd, ver_shdr.sh_offset, SEEK_SET) != (off_t) ver_shdr.sh_offset)
+    error (1, 0, "failed to seek to %zd in %s", (size_t) ver_shdr.sh_offset,
+	   fname);
+
+  if (write (fd, array, 2 * nentries) != (ssize_t) (2 * nentries))
+    error (1, 0, "failed to write .gnu.version section into %s", fname);
+
+  close (fd);
+  return 0;
+}
--- gcc/config/ia64/unwind-ia64.c.jj	2004-10-04 08:55:57.000000000 -0400
+++ gcc/config/ia64/unwind-ia64.c	2004-11-15 09:07:45.000000000 -0500
@@ -51,6 +51,51 @@
 #define UNW_FLAG_UHANDLER(x)	((x) & 0x0000000200000000L)
 #define UNW_LENGTH(x)		((x) & 0x00000000ffffffffL)
 
+#if defined (USE_SYMVER_GLOBAL) && defined (SHARED)
+extern _Unwind_Reason_Code __symverglobal_Unwind_Backtrace
+  (_Unwind_Trace_Fn, void *);
+extern void __symverglobal_Unwind_DeleteException
+  (struct _Unwind_Exception *);
+extern void * __symverglobal_Unwind_FindEnclosingFunction (void *);
+extern _Unwind_Reason_Code __symverglobal_Unwind_ForcedUnwind
+  (struct _Unwind_Exception *, _Unwind_Stop_Fn, void *);
+extern _Unwind_Word __symverglobal_Unwind_GetCFA
+  (struct _Unwind_Context *);
+extern _Unwind_Word __symverglobal_Unwind_GetBSP
+  (struct _Unwind_Context *);
+extern _Unwind_Word __symverglobal_Unwind_GetGR
+  (struct _Unwind_Context *, int );
+extern _Unwind_Ptr __symverglobal_Unwind_GetIP (struct _Unwind_Context *);
+extern void *__symverglobal_Unwind_GetLanguageSpecificData
+  (struct _Unwind_Context *);
+extern _Unwind_Ptr __symverglobal_Unwind_GetRegionStart
+  (struct _Unwind_Context *);
+extern _Unwind_Reason_Code __symverglobal_Unwind_RaiseException
+  (struct _Unwind_Exception *);
+extern void __symverglobal_Unwind_Resume (struct _Unwind_Exception *);
+extern _Unwind_Reason_Code __symverglobal_Unwind_Resume_or_Rethrow
+   (struct _Unwind_Exception *);
+extern void __symverglobal_Unwind_SetGR
+  (struct _Unwind_Context *, int, _Unwind_Word);
+extern void __symverglobal_Unwind_SetIP
+  (struct _Unwind_Context *, _Unwind_Ptr);
+#define _Unwind_Backtrace __symverglobal_Unwind_Backtrace
+#define _Unwind_DeleteException __symverglobal_Unwind_DeleteException
+#define _Unwind_FindEnclosingFunction __symverglobal_Unwind_FindEnclosingFunction
+#define _Unwind_ForcedUnwind __symverglobal_Unwind_ForcedUnwind
+#define _Unwind_GetBSP __symverglobal_Unwind_GetBSP
+#define _Unwind_GetCFA __symverglobal_Unwind_GetCFA
+#define _Unwind_GetGR __symverglobal_Unwind_GetGR
+#define _Unwind_GetIP __symverglobal_Unwind_GetIP
+#define _Unwind_GetLanguageSpecificData __symverglobal_Unwind_GetLanguageSpecificData
+#define _Unwind_GetRegionStart __symverglobal_Unwind_GetRegionStart
+#define _Unwind_RaiseException __symverglobal_Unwind_RaiseException
+#define _Unwind_Resume __symverglobal_Unwind_Resume
+#define _Unwind_Resume_or_Rethrow __symverglobal_Unwind_Resume_or_Rethrow
+#define _Unwind_SetGR __symverglobal_Unwind_SetGR
+#define _Unwind_SetIP __symverglobal_Unwind_SetIP
+#endif
+
 enum unw_application_register
 {
   UNW_AR_BSP,
@@ -2402,4 +2447,44 @@ alias (_Unwind_SetGR);
 alias (_Unwind_SetIP);
 #endif
 
+#if defined (USE_SYMVER_GLOBAL) && defined (SHARED)
+#undef alias
+#define symverglobal(name, version) \
+__typeof (__symverglobal##name) __symverlocal##name		\
+  __attribute__ ((alias ("__symverglobal" #name)));		\
+__asm__ (".symver __symverglobal" #name"," #name "@@GCC_3.4.2");\
+__asm__ (".symver __symverlocal" #name"," #name "@" #version)
+
+#undef _Unwind_Backtrace
+#undef _Unwind_DeleteException
+#undef _Unwind_FindEnclosingFunction
+#undef _Unwind_ForcedUnwind
+#undef _Unwind_GetBSP
+#undef _Unwind_GetCFA
+#undef _Unwind_GetGR
+#undef _Unwind_GetIP
+#undef _Unwind_GetLanguageSpecificData
+#undef _Unwind_GetRegionStart
+#undef _Unwind_RaiseException
+#undef _Unwind_Resume
+#undef _Unwind_Resume_or_Rethrow
+#undef _Unwind_SetGR
+#undef _Unwind_SetIP
+symverglobal (_Unwind_Backtrace, GCC_3.3);
+symverglobal (_Unwind_DeleteException, GCC_3.0);
+symverglobal (_Unwind_FindEnclosingFunction, GCC_3.3);
+symverglobal (_Unwind_ForcedUnwind, GCC_3.0);
+symverglobal (_Unwind_GetBSP, GCC_3.3.2);
+symverglobal (_Unwind_GetCFA, GCC_3.3);
+symverglobal (_Unwind_GetGR, GCC_3.0);
+symverglobal (_Unwind_GetIP, GCC_3.0);
+symverglobal (_Unwind_GetLanguageSpecificData, GCC_3.0);
+symverglobal (_Unwind_GetRegionStart, GCC_3.0);
+symverglobal (_Unwind_RaiseException, GCC_3.0);
+symverglobal (_Unwind_Resume, GCC_3.0);
+symverglobal (_Unwind_Resume_or_Rethrow, GCC_3.3);
+symverglobal (_Unwind_SetGR, GCC_3.0);
+symverglobal (_Unwind_SetIP, GCC_3.0);
+#endif
+
 #endif
--- gcc/config/ia64/mkmap-symver-multi.awk.jj	2004-02-18 10:27:36.000000000 -0500
+++ gcc/config/ia64/mkmap-symver-multi.awk	2004-11-15 09:46:50.000000000 -0500
@@ -0,0 +1,133 @@
+# Generate an ELF symbol version map a-la Solaris and GNU ld.
+#	Contributed by Richard Henderson <rth at cygnus.com>
+#
+# This file is part of GCC.
+#
+# GCC 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.
+#
+# GCC is distributed in the hope that 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 GCC; see the file COPYING.  If not, write to the Free
+# Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301, USA.
+
+BEGIN {
+  state = "nm";
+  sawsymbol = 0;
+}
+
+# Remove comment and blank lines.
+/^ *#/ || /^ *$/ {
+  next;
+}
+
+# We begin with nm input.  Collect the set of symbols that are present
+# so that we can not emit them into the final version script -- Solaris
+# complains at us if we do.
+
+state == "nm" && /^%%/ {
+  state = "ver";
+  next;
+}
+
+state == "nm" && ($1 == "U" || $2 == "U") {
+  next;
+}
+
+state == "nm" && NF == 3 {
+  if ($3 ~ /^[^@]*@GCC_[0-9.]*$/) {
+    def[$3] = 1
+    tl=$3
+    sub(/^.*@/,"",tl)
+    ver[$3] = tl
+  } else {
+    sub(/@@?GCC_[0-9.]*$/,"",$3)
+    def[$3] = 1;
+  }
+  sawsymbol = 1;
+  next;
+}
+
+state == "nm" {
+  next;
+}
+
+# Now we process a simplified variant of the Solaris symbol version
+# script.  We have one symbol per line, no semicolons, simple markers
+# for beginning and ending each section, and %inherit markers for
+# describing version inheritence.  A symbol may appear in more than
+# one symbol version, and the last seen takes effect.
+
+NF == 3 && $1 == "%inherit" {
+  inherit[$2] = $3;
+  next;
+}
+
+NF == 2 && $2 == "{" {
+  libs[$1] = 1;
+  thislib = $1;
+  next;
+}
+
+$1 == "}" {
+  thislib = "";
+  next;
+}
+
+{
+  ver[$1] = thislib;
+  next;
+}
+
+END {
+  if (!sawsymbol)
+    {
+      print "No symbols seen -- broken or mis-installed nm?" | "cat 1>&2";
+      exit 1;
+    }
+  for (l in libs)
+    output(l);
+}
+
+function output(lib) {
+  if (done[lib])
+    return;
+  done[lib] = 1;
+  if (inherit[lib])
+    output(inherit[lib]);
+
+  empty=1
+  for (sym in ver)
+    if ((ver[sym] == lib) && (sym in def))
+      {
+	if (empty)
+	  {
+	    printf("%s {\n", lib);
+	    printf("  global:\n");
+	    empty = 0;
+	  }
+	symp = sym;
+	sub(/@GCC_[0-9.]*$/,"",symp);
+	printf("\t%s;\n", symp);
+	if (dotsyms)
+	  printf("\t.%s;\n", symp);
+      }
+
+  if (empty)
+    {
+      for (l in libs)
+	if (inherit[l] == lib)
+	  inherit[l] = inherit[lib];
+    }
+  else if (inherit[lib])
+    printf("} %s;\n", inherit[lib]);
+  else
+    printf ("\n  local:\n\t*;\n};\n");
+}
--- gcc/config/ia64/libgcc-ia64-no-libunwind.ver.jj	2004-02-18 10:27:36.000000000 -0500
+++ gcc/config/ia64/libgcc-ia64-no-libunwind.ver	2004-11-15 09:19:56.000000000 -0500
@@ -0,0 +1,17 @@
+GCC_3.4.2 {
+  _Unwind_GetGR
+  _Unwind_RaiseException
+  _Unwind_GetRegionStart
+  _Unwind_SetIP
+  _Unwind_GetIP
+  _Unwind_GetLanguageSpecificData
+  _Unwind_Resume
+  _Unwind_DeleteException
+  _Unwind_SetGR
+  _Unwind_ForcedUnwind
+  _Unwind_Backtrace
+  _Unwind_FindEnclosingFunction
+  _Unwind_GetCFA
+  _Unwind_Resume_or_Rethrow
+  _Unwind_GetBSP
+}

gcc44-java-debug-iface-type.patch:

--- NEW FILE gcc44-java-debug-iface-type.patch ---
2008-01-25  Jakub Jelinek  <jakub at redhat.com>

	* lang.c (java_classify_record): Revert 2007-12-20 change.

--- gcc/java/lang.c	2007-12-27 09:09:49.000000000 +0100
+++ gcc/java/lang.c	2008-01-25 17:43:57.000000000 +0100
@@ -965,9 +965,7 @@ java_classify_record (tree type)
   if (! CLASS_P (type))
     return RECORD_IS_STRUCT;
 
-  /* ??? GDB does not support DW_TAG_interface_type as of December,
-     2007.  Re-enable this at a later time.  */
-  if (0 && CLASS_INTERFACE (TYPE_NAME (type)))
+  if (CLASS_INTERFACE (TYPE_NAME (type)))
     return RECORD_IS_INTERFACE;
 
   return RECORD_IS_CLASS;

gcc44-java-nomulti.patch:

--- NEW FILE gcc44-java-nomulti.patch ---
--- libjava/configure.ac.jj	2007-12-07 17:55:50.000000000 +0100
+++ libjava/configure.ac	2007-12-07 18:36:56.000000000 +0100
@@ -82,6 +82,13 @@ AC_ARG_ENABLE(java-maintainer-mode,
 	[allow rebuilding of .class and .h files]))
 AM_CONDITIONAL(JAVA_MAINTAINER_MODE, test "$enable_java_maintainer_mode" = yes)
 
+AC_ARG_ENABLE(libjava-multilib,
+	AS_HELP_STRING([--enable-libjava-multilib], [build libjava as multilib]))
+if test "$enable_libjava_multilib" = no; then
+  multilib=no
+  ac_configure_args="$ac_configure_args --disable-multilib"
+fi
+
 # It may not be safe to run linking tests in AC_PROG_CC/AC_PROG_CXX.
 GCC_NO_EXECUTABLES
 
--- libjava/configure.jj	2007-12-07 17:55:50.000000000 +0100
+++ libjava/configure	2007-12-07 18:39:58.000000000 +0100
@@ -1021,6 +1021,8 @@ Optional Features:
                           default=yes
   --enable-java-maintainer-mode
                           allow rebuilding of .class and .h files
+  --enable-libjava-multilib
+                          build libjava as multilib
   --disable-dependency-tracking  speeds up one-time build
   --enable-dependency-tracking   do not reject slow dependency extractors
   --enable-maintainer-mode  enable make rules and dependencies not useful
@@ -1973,6 +1975,16 @@ else
 fi
 
 
+# Check whether --enable-libjava-multilib was given.
+if test "${enable_libjava_multilib+set}" = set; then
+  enableval=$enable_libjava_multilib;
+fi
+
+if test "$enable_libjava_multilib" = no; then
+  multilib=no
+  ac_configure_args="$ac_configure_args --disable-multilib"
+fi
+
 # It may not be safe to run linking tests in AC_PROG_CC/AC_PROG_CXX.
 
 

gcc44-libgomp-omp_h-multilib.patch:

--- NEW FILE gcc44-libgomp-omp_h-multilib.patch ---
2008-06-09  Jakub Jelinek  <jakub at redhat.com>

	* omp.h.in (omp_nest_lock_t): Fix up for Linux multilibs.

--- libgomp/omp.h.in.jj	2008-06-09 13:34:05.000000000 +0200
+++ libgomp/omp.h.in	2008-06-09 13:34:48.000000000 +0200
@@ -42,8 +42,8 @@ typedef struct
 
 typedef struct
 {
-  unsigned char _x[@OMP_NEST_LOCK_SIZE@] 
-    __attribute__((__aligned__(@OMP_NEST_LOCK_ALIGN@)));
+  unsigned char _x[8 + sizeof (void *)] 
+    __attribute__((__aligned__(sizeof (void *))));
 } omp_nest_lock_t;
 #endif
 

gcc44-libtool-no-rpath.patch:

--- NEW FILE gcc44-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

gcc44-ppc32-retaddr.patch:

--- NEW FILE gcc44-ppc32-retaddr.patch ---
2005-11-28  Jakub Jelinek  <jakub at redhat.com>

	* config/rs6000/rs6000.c (rs6000_return_addr): If COUNT == 0,
	read word RETURN_ADDRESS_OFFSET bytes above arg_pointer_rtx
	instead of doing an extran indirection from frame_pointer_rtx.

	* gcc.dg/20051128-1.c: New test.

--- gcc/config/rs6000/rs6000.c.jj	2005-11-26 14:38:01.000000000 +0100
+++ gcc/config/rs6000/rs6000.c	2005-11-28 20:32:18.000000000 +0100
@@ -13166,17 +13166,22 @@ rs6000_return_addr (int count, rtx frame
      don't try to be too clever here.  */
   if (count != 0 || (DEFAULT_ABI != ABI_AIX && flag_pic))
     {
+      rtx x;
       cfun->machine->ra_needs_full_frame = 1;
 
-      return
-	gen_rtx_MEM
-	  (Pmode,
-	   memory_address
-	   (Pmode,
-	    plus_constant (copy_to_reg
-			   (gen_rtx_MEM (Pmode,
-					 memory_address (Pmode, frame))),
-			   RETURN_ADDRESS_OFFSET)));
+      if (count == 0)
+	{
+	  gcc_assert (frame == frame_pointer_rtx);
+	  x = arg_pointer_rtx;
+	}
+      else
+	{
+	  x = memory_address (Pmode, frame);
+	  x = copy_to_reg (gen_rtx_MEM (Pmode, x));
+	}
+
+      x = plus_constant (x, RETURN_ADDRESS_OFFSET);
+      return gen_rtx_MEM (Pmode, memory_address (Pmode, x));
     }
 
   cfun->machine->ra_need_lr = 1;
--- gcc/testsuite/gcc.dg/20051128-1.c.jj	2005-10-10 11:21:41.096999000 +0200
+++ gcc/testsuite/gcc.dg/20051128-1.c	2005-11-28 12:30:57.000000000 +0100
@@ -0,0 +1,41 @@
+/* { dg-do run } */
+/* { dg-options "-O2 -fpic" } */
+
+extern void exit (int);
+extern void abort (void);
+
+int b;
+
+struct A
+{
+  void *pad[147];
+  void *ra, *h;
+  long o;
+};
+
+void
+__attribute__((noinline))
+foo (struct A *a, void *x)
+{
+  __builtin_memset (a, 0, sizeof (a));
+  if (!b)
+    exit (0);
+}
+
+void
+__attribute__((noinline))
+bar (void)
+{
+  struct A a;
+
+  __builtin_unwind_init ();
+  foo (&a, __builtin_return_address (0));
+}
+
+int
+main (void)
+{
+  bar ();
+  abort ();
+  return 0;
+}

gcc44-pr27898.patch:

--- NEW FILE gcc44-pr27898.patch ---
2006-08-18  Jakub Jelinek  <jakub at redhat.com>

	PR c/27898
	* gcc.dg/pr27898.c: New test.

--- gcc/testsuite/gcc.dg/pr27898.c.jj	2006-08-18 09:19:33.000000000 +0200
+++ gcc/testsuite/gcc.dg/pr27898.c	2006-08-18 09:19:27.000000000 +0200
@@ -0,0 +1,8 @@
+/* PR c/27898 */
+/* { dg-do compile } */
+/* { dg-options "--combine" } */
+/* { dg-additional-sources "pr27898.c" } */
+
+union u { struct { int i; }; };
+
+extern int foo (union u *);

gcc44-pr32139.patch:

--- NEW FILE gcc44-pr32139.patch ---
2007-06-01  Jakub Jelinek  <jakub at redhat.com>

	PR tree-optimization/32139
	* gcc.c-torture/compile/20070531-1.c: New test.

--- gcc/testsuite/gcc.c-torture/compile/20070531-1.c.jj	2007-05-31 13:47:22.000000000 +0200
+++ gcc/testsuite/gcc.c-torture/compile/20070531-1.c	2007-06-01 10:57:15.000000000 +0200
@@ -0,0 +1,11 @@
+/* PR tree-optimization/32139 */
+int foo (void);
+int bar (void) __attribute__ ((const));
+
+int
+test (int x)
+{
+  int a = (x == 10000 ? foo : bar) ();
+  int b = (x == 10000 ? foo : bar) ();
+  return a + b;
+}

gcc44-pr33763.patch:

--- NEW FILE gcc44-pr33763.patch ---
2007-11-06  Jakub Jelinek  <jakub at redhat.com>

	PR tree-optimization/33763
	* gcc.dg/pr33763.c: New test.
	* g++.dg/opt/inline13.C: New test.

2007-11-06  Jan Hubicka  <jh at suse.cz>

	PR tree-optimization/33763
	* tree-inline.c (expand_call_inline): Silently ignore always_inline
	attribute for redefined extern inline functions.

--- gcc/tree-inline.c.jj	2007-11-06 09:29:04.000000000 +0100
+++ gcc/tree-inline.c	2007-11-06 16:19:12.000000000 +0100
@@ -3157,6 +3157,12 @@ expand_call_inline (basic_block bb, gimp
 	goto egress;
 
       if (lookup_attribute ("always_inline", DECL_ATTRIBUTES (fn))
+	/* For extern inline functions that get redefined we always
+	   silently ignored alway_inline flag. Better behaviour would
+	   be to be able to keep both bodies and use extern inline body
+	   for inlining, but we can't do that because frontends overwrite
+	   the body.  */
+	  && !cg_edge->callee->local.redefined_extern_inline
 	  /* Avoid warnings during early inline pass. */
 	  && cgraph_global_info_ready)
 	{
--- gcc/testsuite/gcc.dg/pr33763.c.jj	2007-11-06 16:19:12.000000000 +0100
+++ gcc/testsuite/gcc.dg/pr33763.c	2007-11-06 16:19:12.000000000 +0100
@@ -0,0 +1,60 @@
+/* PR tree-optimization/33763 */
+/* { dg-do compile } */
+/* { dg-options "-O2" } */
+
+typedef struct
+{
+  void *a;
+  void *b;
+} T;
+extern void *foo (const char *, const char *);
+extern void *bar (void *, const char *, T);
+extern int baz (const char *, int);
+
+extern inline __attribute__ ((always_inline, gnu_inline)) int
+baz (const char *x, int y)
+{
+  return 2;
+}
+
+int
+baz (const char *x, int y)
+{
+  return 1;
+}
+
+int xa, xb;
+
+static void *
+inl (const char *x, const char *y)
+{
+  T t = { &xa, &xb };
+  int *f = (int *) __builtin_malloc (sizeof (int));
+  const char *z;
+  int o = 0;
+  void *r = 0;
+
+  for (z = y; *z; z++)
+    {
+      if (*z == 'r')
+	o |= 1;
+      if (*z == 'w')
+	o |= 2;
+    }
+  if (o == 1)
+    *f = baz (x, 0);
+  if (o == 2)
+    *f = baz (x, 1);
+  if (o == 3)
+    *f = baz (x, 2);
+
+  if (o && *f > 0)
+    r = bar (f, "w", t);
+  return r;
+}
+
+void *
+foo (const char *x, const char *y)
+{
+  return inl (x, y);
+}
--- gcc/testsuite/g++.dg/opt/inline13.C.jj	2007-11-06 16:20:20.000000000 +0100
+++ gcc/testsuite/g++.dg/opt/inline13.C	2007-11-06 16:21:30.000000000 +0100
@@ -0,0 +1,60 @@
+// PR tree-optimization/33763
+// { dg-do compile }
+// { dg-options "-O2" }
+
+typedef struct
+{
+  void *a;
+  void *b;
+} T;
+extern void *foo (const char *, const char *);
+extern void *bar (void *, const char *, T);
+extern int baz (const char *, int);
+
+extern inline __attribute__ ((always_inline, gnu_inline)) int
+baz (const char *x, int y)
+{
+  return 2;
+}
+
+int
+baz (const char *x, int y)
+{
+  return 1;
+}
+
+int xa, xb;
+
+static void *
+inl (const char *x, const char *y)
+{
+  T t = { &xa, &xb };
+  int *f = (int *) __builtin_malloc (sizeof (int));
+  const char *z;
+  int o = 0;
+  void *r = 0;
+
+  for (z = y; *z; z++)
+    {
+      if (*z == 'r')
+	o |= 1;
+      if (*z == 'w')
+	o |= 2;
+    }
+  if (o == 1)
+    *f = baz (x, 0);
+  if (o == 2)
+    *f = baz (x, 1);
+  if (o == 3)
+    *f = baz (x, 2);
+
+  if (o && *f > 0)
+    r = bar (f, "w", t);
+  return r;
+}
+
+void *
+foo (const char *x, const char *y)
+{
+  return inl (x, y);
+}

gcc44-rh330771.patch:

--- NEW FILE gcc44-rh330771.patch ---
2007-10-16  Jakub Jelinek  <jakub at redhat.com>

	* Makefile.am (libgcj_tools_la_LIBADD): Add.
	* Makefile.in: Regenerated.

--- libjava/Makefile.am.jj	2007-03-17 09:20:30.000000000 +0100
+++ libjava/Makefile.am	2007-10-16 15:45:14.000000000 +0200
@@ -277,6 +277,8 @@ EXTRA_libgcj_la_SOURCES = java/lang/Obje
 
 libgcj_tools_la_SOURCES = classpath/tools/tools.zip
 libgcj_tools_la_GCJFLAGS = $(AM_GCJFLAGS) -findirect-dispatch -fno-indirect-classes  -fsource-filename=$(here)/classpath/tools/all-classes.lst
+## See jv_convert_LDADD.
+libgcj_tools_la_LIBADD = -L$(here)/.libs libgcj.la
 libgcj_tools_la_LDFLAGS = -rpath $(toolexeclibdir) \
  -version-info `grep -v '^\#' $(srcdir)/libtool-version` \
  $(LIBGCJ_LD_SYMBOLIC_FUNCTIONS)
--- libjava/Makefile.in.jj	2007-07-04 21:11:11.000000000 +0200
+++ libjava/Makefile.in	2007-10-16 15:56:07.000000000 +0200
@@ -153,7 +153,6 @@ am__objects_1 = gnu/gcj/xlib/lib_gnu_awt
 am_lib_gnu_awt_xlib_la_OBJECTS = $(am__objects_1)
 lib_gnu_awt_xlib_la_OBJECTS = $(am_lib_gnu_awt_xlib_la_OBJECTS)
 @XLIB_AWT_TRUE at am_lib_gnu_awt_xlib_la_rpath = -rpath $(toolexeclibdir)
-libgcj_tools_la_LIBADD =
 am_libgcj_tools_la_OBJECTS = classpath/tools/libgcj_tools_la-tools.lo
 libgcj_tools_la_OBJECTS = $(am_libgcj_tools_la_OBJECTS)
 @INTERPRETER_TRUE at am__DEPENDENCIES_1 = gnu/classpath/jdwp.lo \
@@ -941,6 +940,7 @@ libgcj_la_LINK = $(LIBLINK)
 EXTRA_libgcj_la_SOURCES = java/lang/Object.java
 libgcj_tools_la_SOURCES = classpath/tools/tools.zip
 libgcj_tools_la_GCJFLAGS = $(AM_GCJFLAGS) -findirect-dispatch -fno-indirect-classes  -fsource-filename=$(here)/classpath/tools/all-classes.lst
+libgcj_tools_la_LIBADD = -L$(here)/.libs libgcj.la
 libgcj_tools_la_LDFLAGS = -rpath $(toolexeclibdir) \
  -version-info `grep -v '^\#' $(srcdir)/libtool-version` \
  $(LIBGCJ_LD_SYMBOLIC_FUNCTIONS)

gcc44-rh341221.patch:

--- NEW FILE gcc44-rh341221.patch ---
2007-10-21  Jakub Jelinek  <jakub at redhat.com>

	* doc/Makefile.am (POD2MAN): Set date from cp-tools.texinfo
	timestamp rather than from current date.
	* doc/Makefile.in: Regenerated.

--- libjava/classpath/doc/Makefile.am.jj	2007-12-07 17:55:00.000000000 +0100
+++ libjava/classpath/doc/Makefile.am	2007-12-07 18:55:28.000000000 +0100
@@ -31,7 +31,7 @@ TOOLS_MANFILES = \
 	gtnameserv.1 \
 	gjdoc.1
 
-POD2MAN = pod2man --center="GNU" --release="$(VERSION)"
+POD2MAN = pod2man --center="GNU" --release="$(VERSION)" --date="$(shell ls --time-style=+%F -l $(srcdir)/cp-tools.texinfo | awk '{print $$6}')"
 TEXI2POD = perl $(srcdir)/texi2pod.pl
 STAMP = echo timestamp >
 
--- libjava/classpath/doc/Makefile.in.jj	2007-12-07 17:55:00.000000000 +0100
+++ libjava/classpath/doc/Makefile.in	2007-12-07 18:55:43.000000000 +0100
@@ -382,7 +382,7 @@ TOOLS_MANFILES = \
 	gtnameserv.1 \
 	gjdoc.1
 
-POD2MAN = pod2man --center="GNU" --release="$(VERSION)"
+POD2MAN = pod2man --center="GNU" --release="$(VERSION)" --date="$(shell ls --time-style=+%F -l $(srcdir)/cp-tools.texinfo | awk '{print $$6}')"
 TEXI2POD = perl $(srcdir)/texi2pod.pl
 STAMP = echo timestamp >
 @GENINSRC_FALSE at STAMP_GENINSRC = 

gcc44-sparc-config-detection.patch:

--- NEW FILE gcc44-sparc-config-detection.patch ---
--- gcc/config.gcc.jj	2008-04-24 15:42:46.000000000 -0500
+++ gcc/config.gcc	2008-04-24 15:44:51.000000000 -0500
@@ -2175,7 +2175,7 @@ sparc-*-elf*)
 	tmake_file="sparc/t-elf sparc/t-crtfm"
 	extra_parts="crti.o crtn.o crtbegin.o crtend.o"
 	;;
-sparc-*-linux*)		# SPARC's running GNU/Linux, libc6
+sparc-*-linux* | sparcv9*-*-linux*)		# SPARC's running GNU/Linux, libc6
 	tm_file="${tm_file} dbxelf.h elfos.h svr4.h sparc/sysv4.h linux.h"
 	extra_options="${extra_options} sparc/long-double-switch.opt"
 	tmake_file="${tmake_file} sparc/t-linux"
@@ -2287,7 +2287,7 @@ sparc64-*-freebsd*|ultrasparc-*-freebsd*
 		*) echo "$with_cpu not supported for freebsd target"; exit 1 ;;
 	esac
 	;;
-sparc64-*-linux*)		# 64-bit SPARC's running GNU/Linux
+sparc64*-*-linux*)		# 64-bit SPARC's running GNU/Linux
 	tm_file="sparc/biarch64.h ${tm_file} dbxelf.h elfos.h svr4.h sparc/sysv4.h linux.h sparc/linux64.h"
 	extra_options="${extra_options} sparc/long-double-switch.opt"
 	tmake_file="${tmake_file} sparc/t-linux sparc/t-linux64 sparc/t-crtfm"
--- libgcc/config.host.jj	2008-04-24 15:46:19.000000000 -0500
+++ libgcc/config.host	2008-04-24 15:46:49.000000000 -0500
@@ -572,7 +572,7 @@ sparc64-*-openbsd*)
 	;;
 sparc-*-elf*)
 	;;
-sparc-*-linux*)		# SPARC's running GNU/Linux, libc6
+sparc-*-linux* | sparcv9*-*-linux*)		# SPARC's running GNU/Linux, libc6
 	extra_parts="$extra_parts crtfastmath.o"
 	tmake_file="${tmake_file} sparc/t-crtfm"
 	;;
@@ -590,7 +590,7 @@ sparc-wrs-vxworks)
 	;;
 sparc64-*-freebsd*|ultrasparc-*-freebsd*)
 	;;
-sparc64-*-linux*)		# 64-bit SPARC's running GNU/Linux
+sparc64*-*-linux*)		# 64-bit SPARC's running GNU/Linux
 	extra_parts="$extra_parts crtfastmath.o"
 	tmake_file="${tmake_file} sparc/t-crtfm"
 	;;


--- NEW FILE import.log ---
gcc-4_4_0-0_3:HEAD:gcc-4.4.0-0.3.src.rpm:1232130841


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/devel/.cvsignore,v
retrieving revision 1.246
retrieving revision 1.247
diff -u -r1.246 -r1.247
--- .cvsignore	5 Nov 2008 10:15:48 -0000	1.246
+++ .cvsignore	16 Jan 2009 18:34:37 -0000	1.247
@@ -1,2 +1,2 @@
-gcc-4.3.2-20081105.tar.bz2
-fastjar-0.95.tar.gz
+fastjar-0.97.tar.gz
+gcc-4.4.0-20090115.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/devel/sources,v
retrieving revision 1.249
retrieving revision 1.250
diff -u -r1.249 -r1.250
--- sources	5 Nov 2008 10:15:48 -0000	1.249
+++ sources	16 Jan 2009 18:34:38 -0000	1.250
@@ -1,2 +1,2 @@
-eb9ce8c6f929283bc91c93a6087e8ced  gcc-4.3.2-20081105.tar.bz2
-92a70f9e56223b653bce0f58f90cf950  fastjar-0.95.tar.gz
+2659f09c2e43ef8b7d4406321753f1b2  fastjar-0.97.tar.gz
+0fafcb0d23d420c978ab253702094ada  gcc-4.4.0-20090115.tar.bz2


--- gcc43-aes.patch DELETED ---


--- gcc43-altivec-tests.patch DELETED ---


--- gcc43-build-id.patch DELETED ---


--- gcc43-c++-builtin-redecl.patch DELETED ---


--- gcc43-i386-libgomp.patch DELETED ---


--- gcc43-ia64-libunwind.patch DELETED ---


--- gcc43-java-debug-iface-type.patch DELETED ---


--- gcc43-java-nomulti.patch DELETED ---


--- gcc43-libgomp-omp_h-multilib.patch DELETED ---


--- gcc43-libtool-no-rpath.patch DELETED ---


--- gcc43-ppc32-retaddr.patch DELETED ---


--- gcc43-ppc64-ia64-GNU-stack.patch DELETED ---


--- gcc43-pr27898.patch DELETED ---


--- gcc43-pr29609-2.patch DELETED ---


--- gcc43-pr29609-3.patch DELETED ---


--- gcc43-pr29609.patch DELETED ---


--- gcc43-pr32139.patch DELETED ---


--- gcc43-pr33763.patch DELETED ---


--- gcc43-pr34037.patch DELETED ---


--- gcc43-pr36741-revert.patch DELETED ---


--- gcc43-pr37189.patch DELETED ---


--- gcc43-pr37738.patch DELETED ---


--- gcc43-pr37858.patch DELETED ---


--- gcc43-pr37870.patch DELETED ---


--- gcc43-pr37879.patch DELETED ---


--- gcc43-pr37924.patch DELETED ---


--- gcc43-rh251682.patch DELETED ---


--- gcc43-rh330771.patch DELETED ---


--- gcc43-rh341221.patch DELETED ---


--- gcc43-sparc-config-detection.patch DELETED ---


--- gcc43-x86_64-va_start.patch DELETED ---


--- gcc43.spec DELETED ---



From cassmodiah at fedoraproject.org  Fri Jan 16 18:36:50 2009
From: cassmodiah at fedoraproject.org (Simon Wesp)
Date: Fri, 16 Jan 2009 18:36:50 +0000 (UTC)
Subject: rpms/bam/F-9 .cvsignore, 1.2, 1.3 bam.spec, 1.1, 1.2 import.log, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <20090116183650.7B69270127@cvs1.fedora.phx.redhat.com>

Author: cassmodiah

Update of /cvs/pkgs/rpms/bam/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13347/F-9

Modified Files:
	.cvsignore bam.spec import.log sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bam/F-9/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2008 14:17:08 -0000	1.2
+++ .cvsignore	16 Jan 2009 18:36:20 -0000	1.3
@@ -1 +1 @@
-bam.zip
+bam-0.2.0.tar.gz


Index: bam.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bam/F-9/bam.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- bam.spec	8 Nov 2008 14:17:08 -0000	1.1
+++ bam.spec	16 Jan 2009 18:36:20 -0000	1.2
@@ -1,15 +1,13 @@
 Name:           bam
-Version:        0.0.0.4.3
-# bam is not versioned
-# the first two numbers are for an uncomplicated update of bam, if it will be versioned
-# the last three numbers figure the teeworlds version number
+Version:        0.2.0
+
 Release:        1%{?dist}
 Summary:        A build-system
 
 Group:          Amusements/Games
 License:        Teeworlds and MIT
 URL:            http://www.teeworlds.com
-Source0:        http://www.teeworlds.com/files/%{name}.zip
+Source0:        http://www.teeworlds.com/files/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 
@@ -19,7 +17,7 @@
 
 
 %prep
-%setup -q -n %{name}
+%setup -q 
 
 
 %build
@@ -44,6 +42,9 @@
 
 
 %changelog
+* Fri Jan 16 2009 Simon Wesp <cassmodiah at fedoraproject.org> 0.2.0-1
+- Update to 0.2.0
+
 * Sat Nov 01 2008 Simon Wesp <cassmodiah at fedoraproject.org> 0.0.0.4.3-1
 - Honor optflags
 - Select a 'better' code for version


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/bam/F-9/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	8 Nov 2008 14:17:08 -0000	1.1
+++ import.log	16 Jan 2009 18:36:20 -0000	1.2
@@ -1 +1,2 @@
 bam-0_0_0_4_3-1_fc10:F-9:bam-0.0.0.4.3-1.fc10.src.rpm:1226153757
+bam-0_2_0-1_fc10:F-9:bam-0.2.0-1.fc10.src.rpm:1232129704


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bam/F-9/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2008 14:17:08 -0000	1.2
+++ sources	16 Jan 2009 18:36:20 -0000	1.3
@@ -1 +1 @@
-dd1937ce711927299a1b09edffa319ca  bam.zip
+d4efe74591a73c1cec8b34d76ffd1049  bam-0.2.0.tar.gz



From mclasen at fedoraproject.org  Fri Jan 16 18:40:57 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Fri, 16 Jan 2009 18:40:57 +0000 (UTC)
Subject: rpms/gnome-panel/devel gnome-panel.spec,1.339,1.340
Message-ID: <20090116184057.4C70070127@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-panel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18472

Modified Files:
	gnome-panel.spec 
Log Message:
fix spec



Index: gnome-panel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-panel/devel/gnome-panel.spec,v
retrieving revision 1.339
retrieving revision 1.340
diff -u -r1.339 -r1.340
--- gnome-panel.spec	16 Jan 2009 18:32:26 -0000	1.339
+++ gnome-panel.spec	16 Jan 2009 18:40:26 -0000	1.340
@@ -165,7 +165,7 @@
 %patch7 -p1 -b .about-this-computer
 %patch8 -p1 -b .launcher-desktop-files
 %patch9 -p1 -b .desktop-file-monitoring
-%patch10 -p0 -b .preferred-apps
+%patch10 -p1 -b .preferred-apps
 %patch11 -p1 -b .applet-error
 %patch24 -p1 -b .allow-spurious-view-done-signals
 #%patch25 -p1 -b .smoother-slide-in



From nim at fedoraproject.org  Fri Jan 16 18:52:20 2009
From: nim at fedoraproject.org (Nicolas Mailhot)
Date: Fri, 16 Jan 2009 18:52:20 +0000 (UTC)
Subject: rpms/fontpackages/F-10 .cvsignore, 1.2, 1.3 fontpackages.spec, 1.1, 
	1.2 import.log, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20090116185220.458E370142@cvs1.fedora.phx.redhat.com>

Author: nim

Update of /cvs/extras/rpms/fontpackages/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19640/F-10

Modified Files:
	.cvsignore fontpackages.spec import.log sources 
Log Message:
Import 1.15 to use FPC and FESCO approved package naming by default


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fontpackages/F-10/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	15 Dec 2008 22:20:35 -0000	1.2
+++ .cvsignore	16 Jan 2009 18:51:49 -0000	1.3
@@ -1 +1 @@
-fontpackages-1.11.tar.bz2
+fontpackages-1.15.tar.bz2


Index: fontpackages.spec
===================================================================
RCS file: /cvs/extras/rpms/fontpackages/F-10/fontpackages.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- fontpackages.spec	15 Dec 2008 22:20:35 -0000	1.1
+++ fontpackages.spec	16 Jan 2009 18:51:49 -0000	1.2
@@ -1,8 +1,9 @@
 %define spectemplatedir %{_sysconfdir}/rpmdevtools/
+%define ftcgtemplatedir %{_datadir}/fontconfig/templates/
 %define rpmmacrodir     %{_sysconfdir}/rpm/
 
 Name:    fontpackages
-Version: 1.11
+Version: 1.15
 Release: 1%{?dist}
 Summary: Common directory and macro definitions used by font packages
 
@@ -10,8 +11,7 @@
 # Mostly means the scriptlets inserted via this package do not change the
 # license of the packages they're inserted in
 License:   LGPLv3+
-# Or git://git.fedorahosted.org/fontpackages.git
-URL:       http://fedoraproject.org/wiki/Category:Fonts_SIG
+URL:       http://fedoraproject.org/wiki/fontpackages/
 Source0:   http://fedorahosted.org/releases/f/o/%{name}/%{name}-%{version}.tar.bz2
 BuildArch: noarch
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
@@ -53,22 +53,27 @@
 rm -fr %{buildroot}
 
 # Pull macros out of macros.fonts and emulate them during install
-for dir in fontbasedir fontconfig_confdir fontconfig_templatedir ; do
+for dir in fontbasedir        fontconfig_masterdir \
+           fontconfig_confdir fontconfig_templatedir ; do
   export _${dir}=$(rpm --eval $(%{__grep} -E "^%_${dir}\b" \
     macros/macros.fonts | %{__awk} '{ print $2 }'))
 done
 
 install -m 0755 -d %{buildroot}${_fontbasedir} \
+                   %{buildroot}${_fontconfig_masterdir} \
                    %{buildroot}${_fontconfig_confdir} \
                    %{buildroot}${_fontconfig_templatedir} \
                    %{buildroot}%{spectemplatedir} \
-                   %{buildroot}%{rpmmacrodir}
-install -m 0644 -p spec-templates/*.spec %{buildroot}%{spectemplatedir}
-install -m 0644 -p macros/macros*   %{buildroot}%{rpmmacrodir}
+                   %{buildroot}%{rpmmacrodir} \
+                   %{buildroot}%{_datadir}/fontconfig/templates
+install -m 0644 -p spec-templates/*.spec  %{buildroot}%{spectemplatedir}
+install -m 0644 -p fontconfig-templates/* %{buildroot}%{ftcgtemplatedir}
+install -m 0644 -p macros/macros*         %{buildroot}%{rpmmacrodir}
 
 cat <<EOF > %{name}-%{version}.files
 %defattr(0644,root,root,0755)
 %dir ${_fontbasedir}
+%dir ${_fontconfig_masterdir}
 %dir ${_fontconfig_confdir}
 %dir ${_fontconfig_templatedir}
 EOF
@@ -78,26 +83,52 @@
 
 
 %files filesystem -f %{name}-%{version}.files
+%defattr(0644,root,root,0755)
+%dir %{_datadir}/fontconfig
 
 
 %files devel
 %defattr(0644,root,root,0755)
-%doc license.txt readme.txt fontconfig-templates/
+%doc license.txt readme.txt
 %config(noreplace) %{spectemplatedir}/*.spec
 %config(noreplace) %{rpmmacrodir}/macros*
+%dir %{ftcgtemplatedir}
+%{ftcgtemplatedir}/*
 
 
 %changelog
+* Thu Jan 15 2009 Nicolas Mailhot <nim at fedoraproject dot org>
+- 1.15-1
+??? lua-ize the main macro
+
+* Wed Jan 14 2009 Nicolas Mailhot <nim at fedoraproject dot org>
+- 1.14-1
+??? Update for subpackage naming changes requested by FPC
+
+* Mon Dec 22 2008 Nicolas Mailhot <nim at fedoraproject dot org>
+- 1.13-1
+??? Add another directory to avoid depending on unowned stuff
+??? use it to put the fontconfig examples in a better place
+
+* Sun Dec 21 2008 Nicolas Mailhot <nim at fedoraproject dot org>
+- 1.12-2
+??? Change homepage
+
+* Fri Dec 19 2008 Nicolas Mailhot <nim at fedoraproject dot org>
+- 1.12-1
+??? Add another macro to allow building fontconfig without cycling
+
 * Wed Dec 10 2008 Nicolas Mailhot <nim at fedoraproject dot org>
 - 1.11-1
 ??? Add actual fedorahosted references
+
 * Sun Nov 23 2008 Nicolas Mailhot <nim at fedoraproject dot org>
 - 1.10-1
 ??? renamed to ???fontpackages???
+
 * Fri Nov 14 2008 Nicolas Mailhot <nim at fedoraproject dot org>
 - 1.9-1
 ??? fix and complete fontconfig doc
-* Fri Nov 14 2008 Nicolas Mailhot <nim at fedoraproject dot org>
 - 1.8-1
 ??? simplify multi spec template: codify general case
 - 1.7-1


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/fontpackages/F-10/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	15 Dec 2008 22:20:35 -0000	1.1
+++ import.log	16 Jan 2009 18:51:49 -0000	1.2
@@ -1 +1,2 @@
 fontpackages-1_11-1_fc11:F-10:fontpackages-1.11-1.fc11.src.rpm:1229379612
+fontpackages-1_15-1_fc11:F-10:fontpackages-1.15-1.fc11.src.rpm:1232131877


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fontpackages/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	15 Dec 2008 22:20:35 -0000	1.2
+++ sources	16 Jan 2009 18:51:49 -0000	1.3
@@ -1 +1 @@
-362046a39434fe95ea9c9ab4ea4880ba  fontpackages-1.11.tar.bz2
+69359230ae56bc40320bbe3df61f71d4  fontpackages-1.15.tar.bz2



From nim at fedoraproject.org  Fri Jan 16 18:53:05 2009
From: nim at fedoraproject.org (Nicolas Mailhot)
Date: Fri, 16 Jan 2009 18:53:05 +0000 (UTC)
Subject: rpms/fontpackages/F-9 .cvsignore, 1.2, 1.3 fontpackages.spec, 1.1, 
	1.2 import.log, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20090116185305.4B87E70141@cvs1.fedora.phx.redhat.com>

Author: nim

Update of /cvs/extras/rpms/fontpackages/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19834/F-9

Modified Files:
	.cvsignore fontpackages.spec import.log sources 
Log Message:
Import 1.15 to use FPC and FESCO approved package naming by default


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fontpackages/F-9/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	15 Dec 2008 22:33:49 -0000	1.2
+++ .cvsignore	16 Jan 2009 18:52:34 -0000	1.3
@@ -1 +1 @@
-fontpackages-1.11.tar.bz2
+fontpackages-1.15.tar.bz2


Index: fontpackages.spec
===================================================================
RCS file: /cvs/extras/rpms/fontpackages/F-9/fontpackages.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- fontpackages.spec	15 Dec 2008 22:33:49 -0000	1.1
+++ fontpackages.spec	16 Jan 2009 18:52:34 -0000	1.2
@@ -1,8 +1,9 @@
 %define spectemplatedir %{_sysconfdir}/rpmdevtools/
+%define ftcgtemplatedir %{_datadir}/fontconfig/templates/
 %define rpmmacrodir     %{_sysconfdir}/rpm/
 
 Name:    fontpackages
-Version: 1.11
+Version: 1.15
 Release: 1%{?dist}
 Summary: Common directory and macro definitions used by font packages
 
@@ -10,8 +11,7 @@
 # Mostly means the scriptlets inserted via this package do not change the
 # license of the packages they're inserted in
 License:   LGPLv3+
-# Or git://git.fedorahosted.org/fontpackages.git
-URL:       http://fedoraproject.org/wiki/Category:Fonts_SIG
+URL:       http://fedoraproject.org/wiki/fontpackages/
 Source0:   http://fedorahosted.org/releases/f/o/%{name}/%{name}-%{version}.tar.bz2
 BuildArch: noarch
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
@@ -53,22 +53,27 @@
 rm -fr %{buildroot}
 
 # Pull macros out of macros.fonts and emulate them during install
-for dir in fontbasedir fontconfig_confdir fontconfig_templatedir ; do
+for dir in fontbasedir        fontconfig_masterdir \
+           fontconfig_confdir fontconfig_templatedir ; do
   export _${dir}=$(rpm --eval $(%{__grep} -E "^%_${dir}\b" \
     macros/macros.fonts | %{__awk} '{ print $2 }'))
 done
 
 install -m 0755 -d %{buildroot}${_fontbasedir} \
+                   %{buildroot}${_fontconfig_masterdir} \
                    %{buildroot}${_fontconfig_confdir} \
                    %{buildroot}${_fontconfig_templatedir} \
                    %{buildroot}%{spectemplatedir} \
-                   %{buildroot}%{rpmmacrodir}
-install -m 0644 -p spec-templates/*.spec %{buildroot}%{spectemplatedir}
-install -m 0644 -p macros/macros*   %{buildroot}%{rpmmacrodir}
+                   %{buildroot}%{rpmmacrodir} \
+                   %{buildroot}%{_datadir}/fontconfig/templates
+install -m 0644 -p spec-templates/*.spec  %{buildroot}%{spectemplatedir}
+install -m 0644 -p fontconfig-templates/* %{buildroot}%{ftcgtemplatedir}
+install -m 0644 -p macros/macros*         %{buildroot}%{rpmmacrodir}
 
 cat <<EOF > %{name}-%{version}.files
 %defattr(0644,root,root,0755)
 %dir ${_fontbasedir}
+%dir ${_fontconfig_masterdir}
 %dir ${_fontconfig_confdir}
 %dir ${_fontconfig_templatedir}
 EOF
@@ -78,26 +83,52 @@
 
 
 %files filesystem -f %{name}-%{version}.files
+%defattr(0644,root,root,0755)
+%dir %{_datadir}/fontconfig
 
 
 %files devel
 %defattr(0644,root,root,0755)
-%doc license.txt readme.txt fontconfig-templates/
+%doc license.txt readme.txt
 %config(noreplace) %{spectemplatedir}/*.spec
 %config(noreplace) %{rpmmacrodir}/macros*
+%dir %{ftcgtemplatedir}
+%{ftcgtemplatedir}/*
 
 
 %changelog
+* Thu Jan 15 2009 Nicolas Mailhot <nim at fedoraproject dot org>
+- 1.15-1
+??? lua-ize the main macro
+
+* Wed Jan 14 2009 Nicolas Mailhot <nim at fedoraproject dot org>
+- 1.14-1
+??? Update for subpackage naming changes requested by FPC
+
+* Mon Dec 22 2008 Nicolas Mailhot <nim at fedoraproject dot org>
+- 1.13-1
+??? Add another directory to avoid depending on unowned stuff
+??? use it to put the fontconfig examples in a better place
+
+* Sun Dec 21 2008 Nicolas Mailhot <nim at fedoraproject dot org>
+- 1.12-2
+??? Change homepage
+
+* Fri Dec 19 2008 Nicolas Mailhot <nim at fedoraproject dot org>
+- 1.12-1
+??? Add another macro to allow building fontconfig without cycling
+
 * Wed Dec 10 2008 Nicolas Mailhot <nim at fedoraproject dot org>
 - 1.11-1
 ??? Add actual fedorahosted references
+
 * Sun Nov 23 2008 Nicolas Mailhot <nim at fedoraproject dot org>
 - 1.10-1
 ??? renamed to ???fontpackages???
+
 * Fri Nov 14 2008 Nicolas Mailhot <nim at fedoraproject dot org>
 - 1.9-1
 ??? fix and complete fontconfig doc
-* Fri Nov 14 2008 Nicolas Mailhot <nim at fedoraproject dot org>
 - 1.8-1
 ??? simplify multi spec template: codify general case
 - 1.7-1


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/fontpackages/F-9/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	15 Dec 2008 22:33:49 -0000	1.1
+++ import.log	16 Jan 2009 18:52:34 -0000	1.2
@@ -1 +1,2 @@
 fontpackages-1_11-1_fc11:F-9:fontpackages-1.11-1.fc11.src.rpm:1229380405
+fontpackages-1_15-1_fc11:F-9:fontpackages-1.15-1.fc11.src.rpm:1232131899


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fontpackages/F-9/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	15 Dec 2008 22:33:49 -0000	1.2
+++ sources	16 Jan 2009 18:52:34 -0000	1.3
@@ -1 +1 @@
-362046a39434fe95ea9c9ab4ea4880ba  fontpackages-1.11.tar.bz2
+69359230ae56bc40320bbe3df61f71d4  fontpackages-1.15.tar.bz2



From cebbert at fedoraproject.org  Fri Jan 16 19:23:53 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Fri, 16 Jan 2009 19:23:53 +0000 (UTC)
Subject: rpms/kernel/F-9
	linux-2.6-alsa-hda-sigmatel-add-missing-terminators.patch, NONE,
	1.1.2.1 patch-2.6.27.11.bz2.sign, NONE, 1.1.2.1 .cvsignore,
	1.837, 1.837.2.1 kernel.spec, 1.891,
	1.891.2.1 linux-2.6-upstream-reverts.patch, 1.15,
	1.15.2.1 sources, 1.798, 1.798.2.1 upstream, 1.717,
	1.717.2.1 linux-2.6-iwlagn-downgrade-BUG_ON-in-interrupt.patch,
	1.1, NONE patch-2.6.27.10.bz2.sign, 1.1, NONE
Message-ID: <20090116192353.AFD0870142@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22813

Modified Files:
      Tag: private-fedora-9-2_6_27-branch
	.cvsignore kernel.spec linux-2.6-upstream-reverts.patch 
	sources upstream 
Added Files:
      Tag: private-fedora-9-2_6_27-branch
	linux-2.6-alsa-hda-sigmatel-add-missing-terminators.patch 
	patch-2.6.27.11.bz2.sign 
Removed Files:
      Tag: private-fedora-9-2_6_27-branch
	linux-2.6-iwlagn-downgrade-BUG_ON-in-interrupt.patch 
	patch-2.6.27.10.bz2.sign 
Log Message:
Linux 2.6.27.11
  Dropped patches:
    linux-2.6-iwlagn-downgrade-BUG_ON-in-interrupt.patch
  Reverted -stable patches:
    alsa-hda-add-missing-terminators-in-patch_sigmatel.c.patch
  Added patches:
    linux-2.6-alsa-hda-sigmatel-add-missing-terminators.patch

linux-2.6-alsa-hda-sigmatel-add-missing-terminators.patch:

--- NEW FILE linux-2.6-alsa-hda-sigmatel-add-missing-terminators.patch ---
From: Herton Ronaldo Krzesinski <herton at mandriva.com.br>
Date: Tue, 23 Dec 2008 18:53:00 +0000 (-0200)
Subject: ALSA: hda - Add missing terminators in patch_sigmatel.c
X-Git-Tag: v2.6.28~3^2
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=574f3c4f5c55e99ea60f71fd98cc54931d4b2eae

ALSA: hda - Add missing terminators in patch_sigmatel.c

Signed-off-by: Herton Ronaldo Krzesinski <herton at mandriva.com.br>
Cc: stable at kernel.org
Signed-off-by: Takashi Iwai <tiwai at suse.de>
---

diff --git a/sound/pci/hda/patch_sigmatel.c b/sound/pci/hda/patch_sigmatel.c
index 596ceab..b77f330 100644
--- a/sound/pci/hda/patch_sigmatel.c
+++ b/sound/pci/hda/patch_sigmatel.c
@@ -859,6 +859,7 @@ static struct hda_verb stac92hd83xxx_core_init[] = {
 
 	/* power state controls amps */
 	{ 0x01, AC_VERB_SET_EAPD, 1 << 2},
+	{}
 };
 
 static struct hda_verb stac92hd71bxx_core_init[] = {
@@ -870,6 +871,7 @@ static struct hda_verb stac92hd71bxx_core_init[] = {
 	{ 0x0a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
 	{ 0x0d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
 	{ 0x0f, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+	{}
 };
 
 #define HD_DISABLE_PORTF 2
@@ -1667,6 +1669,7 @@ static struct snd_pci_quirk stac92hd83xxx_cfg_tbl[] = {
 	/* SigmaTel reference board */
 	SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x2668,
 		      "DFI LanParty", STAC_92HD71BXX_REF),
+	{} /* terminator */
 };
 
 static unsigned int ref92hd71bxx_pin_configs[11] = {


--- NEW FILE patch-2.6.27.11.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBJbiX7yGugalF9Dw4RAkpDAJ4zICxaaY03/YsTYzzCqO2bseFtTwCfZoCj
zZ7bJBb/HWsipsF+gAGKtb0=
=ir7B
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/.cvsignore,v
retrieving revision 1.837
retrieving revision 1.837.2.1
diff -u -r1.837 -r1.837.2.1
--- .cvsignore	18 Dec 2008 22:04:28 -0000	1.837
+++ .cvsignore	16 Jan 2009 19:23:22 -0000	1.837.2.1
@@ -4,4 +4,4 @@
 temp-*
 kernel-2.6.27
 linux-2.6.27.tar.bz2
-patch-2.6.27.10.bz2
+patch-2.6.27.11.bz2


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/kernel.spec,v
retrieving revision 1.891
retrieving revision 1.891.2.1
diff -u -r1.891 -r1.891.2.1
--- kernel.spec	12 Jan 2009 03:30:33 -0000	1.891
+++ kernel.spec	16 Jan 2009 19:23:22 -0000	1.891.2.1
@@ -36,7 +36,7 @@
 %if 0%{?released_kernel}
 
 # Do we have a -stable update to apply?
-%define stable_update 10
+%define stable_update 11
 # Is it a -stable RC?
 %define stable_rc 0
 # Set rpm version accordingly
@@ -651,6 +651,7 @@
 Patch414: linux-2.6.27.9-alsa-hda-mark-dell-studio-1535-quirk.patch
 Patch415: linux-2.6-alsa-backport-beep-switch.patch
 Patch416: linux-2.6-defaults-alsa-hda-beep-off.patch
+Patch417: linux-2.6-alsa-hda-sigmatel-add-missing-terminators.patch
 
 # filesystem patches
 Patch421: linux-2.6-squashfs.patch
@@ -679,7 +680,6 @@
 Patch678: linux-2.6-libata-sata_nv-disable-swncq.patch
 
 # wireless
-Patch681: linux-2.6-iwlagn-downgrade-BUG_ON-in-interrupt.patch
 Patch682: linux-2.6-iwl3945-ibss-tsf-fix.patch
 Patch684: linux-2.6-iwlwifi-use-GFP_KERNEL-to-allocate-Rx-SKB-memory.patch
 Patch685: linux-2.6-wireless-ath9k-dma-fixes.patch
@@ -1210,6 +1210,7 @@
 ApplyPatch linux-2.6.27.9-alsa-hda-mark-dell-studio-1535-quirk.patch
 ApplyPatch linux-2.6-alsa-backport-beep-switch.patch
 ApplyPatch linux-2.6-defaults-alsa-hda-beep-off.patch
+ApplyPatch linux-2.6-alsa-hda-sigmatel-add-missing-terminators.patch
 
 # block/bio
 #
@@ -1257,8 +1258,6 @@
 # disable swncq on sata_nv
 ApplyPatch linux-2.6-libata-sata_nv-disable-swncq.patch
 
-# make jarod's iwl4965 not panic near N APs, hopefully
-ApplyPatch linux-2.6-iwlagn-downgrade-BUG_ON-in-interrupt.patch
 # iwl3945 fix for stable ad-hoc mode connections (#459401)
 ApplyPatch linux-2.6-iwl3945-ibss-tsf-fix.patch
 # iwlwifi: use GFP_KERNEL to allocate Rx SKB memory
@@ -1924,6 +1923,15 @@
 %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 Jan 16 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.27.11-78
+- Linux 2.6.27.11
+  Dropped patches:
+    linux-2.6-iwlagn-downgrade-BUG_ON-in-interrupt.patch
+  Reverted -stable patches:
+    alsa-hda-add-missing-terminators-in-patch_sigmatel.c.patch
+  Added patches:
+    linux-2.6-alsa-hda-sigmatel-add-missing-terminators.patch
+
 * Sun Jan 11 2009 Dave Jones <davej at redhat.com>
 - Don't use MAXSMP on x86-64
 

linux-2.6-upstream-reverts.patch:

Index: linux-2.6-upstream-reverts.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/linux-2.6-upstream-reverts.patch,v
retrieving revision 1.15
retrieving revision 1.15.2.1
diff -u -r1.15 -r1.15.2.1
--- linux-2.6-upstream-reverts.patch	9 Nov 2008 22:29:17 -0000	1.15
+++ linux-2.6-upstream-reverts.patch	16 Jan 2009 19:23:22 -0000	1.15.2.1
@@ -382,3 +382,30 @@
  	int gap_count;
  	bool beta_repeaters_present;
  
+From 574f3c4f5c55e99ea60f71fd98cc54931d4b2eae Mon Sep 17 00:00:00 2001
+From: Herton Ronaldo Krzesinski <herton at mandriva.com.br>
+Date: Tue, 23 Dec 2008 16:53:00 -0200
+Subject: ALSA: hda - Add missing terminators in patch_sigmatel.c
+
+From: Herton Ronaldo Krzesinski <herton at mandriva.com.br>
+
+commit 574f3c4f5c55e99ea60f71fd98cc54931d4b2eae upstream.
+
+Signed-off-by: Herton Ronaldo Krzesinski <herton at mandriva.com.br>
+Signed-off-by: Takashi Iwai <tiwai at suse.de>
+Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
+
+---
+ sound/pci/hda/patch_sigmatel.c |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/sound/pci/hda/patch_sigmatel.c
++++ b/sound/pci/hda/patch_sigmatel.c
+@@ -638,6 +638,7 @@ static struct hda_verb stac92hd71bxx_cor
+ 	{ 0x0a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+ 	{ 0x0d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+ 	{ 0x0f, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
++	{}
+ };
+ 
+ #define HD_DISABLE_PORTF 3


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/sources,v
retrieving revision 1.798
retrieving revision 1.798.2.1
diff -u -r1.798 -r1.798.2.1
--- sources	18 Dec 2008 22:04:28 -0000	1.798
+++ sources	16 Jan 2009 19:23:22 -0000	1.798.2.1
@@ -1,2 +1,2 @@
 b3e78977aa79d3754cb7f8143d7ddabd  linux-2.6.27.tar.bz2
-82691ff96bff9b4fa19f91b69a9695f9  patch-2.6.27.10.bz2
+89e88096f5cee9334eb0d7a47d46191c  patch-2.6.27.11.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/upstream,v
retrieving revision 1.717
retrieving revision 1.717.2.1
diff -u -r1.717 -r1.717.2.1
--- upstream	18 Dec 2008 22:04:28 -0000	1.717
+++ upstream	16 Jan 2009 19:23:22 -0000	1.717.2.1
@@ -1,2 +1,2 @@
 linux-2.6.27.tar.bz2
-patch-2.6.27.10.bz2
+patch-2.6.27.11.bz2


--- linux-2.6-iwlagn-downgrade-BUG_ON-in-interrupt.patch DELETED ---


--- patch-2.6.27.10.bz2.sign DELETED ---



From mclasen at fedoraproject.org  Fri Jan 16 19:26:35 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Fri, 16 Jan 2009 19:26:35 +0000 (UTC)
Subject: rpms/gnome-panel/devel gnome-panel.spec, 1.340,
	1.341 preferred-apps.patch, 1.10, 1.11
Message-ID: <20090116192635.F12F870127@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-panel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23820

Modified Files:
	gnome-panel.spec preferred-apps.patch 
Log Message:
no more www.s.com 



Index: gnome-panel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-panel/devel/gnome-panel.spec,v
retrieving revision 1.340
retrieving revision 1.341
diff -u -r1.340 -r1.341
--- gnome-panel.spec	16 Jan 2009 18:40:26 -0000	1.340
+++ gnome-panel.spec	16 Jan 2009 19:26:05 -0000	1.341
@@ -23,7 +23,7 @@
 Summary: GNOME panel
 Name: gnome-panel
 Version: 2.25.3
-Release: 4%{?dist}
+Release: 5%{?dist}
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/gnome-panel/2.25/%{name}-%{version}.tar.bz2
 
@@ -373,6 +373,9 @@
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Fri Jan 16 2009 Matthias Clasen <mclasen at redhat.com> - 2.25.3-4
+- And don't write %s into desktop files
+
 * Fri Jan 16 2009 Matthias Clasen <mclasen at redhat.com> - 2.25.3-3
 - Fix the 'smart launcher' patch
 

preferred-apps.patch:

Index: preferred-apps.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-panel/devel/preferred-apps.patch,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- preferred-apps.patch	16 Jan 2009 18:32:26 -0000	1.10
+++ preferred-apps.patch	16 Jan 2009 19:26:05 -0000	1.11
@@ -1,6 +1,6 @@
 diff -up gnome-panel-2.25.3/gnome-panel/launcher.c.preferred-apps gnome-panel-2.25.3/gnome-panel/launcher.c
---- gnome-panel-2.25.3/gnome-panel/launcher.c.preferred-apps	2009-01-16 13:27:30.000000000 -0500
-+++ gnome-panel-2.25.3/gnome-panel/launcher.c	2009-01-16 13:31:07.000000000 -0500
+--- gnome-panel-2.25.3/gnome-panel/launcher.c.preferred-apps	2009-01-16 14:15:17.000000000 -0500
++++ gnome-panel-2.25.3/gnome-panel/launcher.c	2009-01-16 14:24:06.000000000 -0500
 @@ -21,6 +21,7 @@
  #include <glib/gi18n.h>
  #include <gio/gio.h>
@@ -17,7 +17,7 @@
  
  static GdkScreen *
  launcher_get_screen (Launcher *launcher)
-@@ -1215,3 +1217,178 @@ panel_launcher_set_dnd_enabled (Launcher
+@@ -1215,3 +1217,189 @@ panel_launcher_set_dnd_enabled (Launcher
  	} else
  		gtk_drag_source_unset (launcher->button);
  }
@@ -93,6 +93,17 @@
 +			g_key_file_set_string (key_file, "Desktop Entry", "GenericName", "Web Browser");
 +			g_key_file_set_string (key_file, "Desktop Entry", "Comment", "Browse the Web");
 +			g_key_file_set_string (key_file, "Desktop Entry", "Icon", "redhat-web-browser.png");
++			if (strstr (exec, "%s")) {
++				gchar *exec2, *s;
++
++				exec2 = g_strdup (exec);
++				s = strstr (exec2, "%s");
++				s[1] = 'u';
++
++				g_key_file_set_string (key_file, "Desktop Entry", "Exec", exec2);
++				g_free (exec2);
++				
++			}
 +		}
 +		else if (strstr (key, "mailto")) {
 +			g_key_file_set_string (key_file, "Desktop Entry", "Name", "Preferred Mail Reader");
@@ -172,7 +183,7 @@
 +	client = panel_gconf_get_client ();
 +
 +	gconf_client_add_dir (client,
-+			      "desktop/gnome/url-handlers",
++			      "/desktop/gnome/url-handlers",
 +			      GCONF_CLIENT_PRELOAD_NONE,
 +			      NULL);
 +
@@ -197,8 +208,8 @@
 +	}
 +}
 diff -up gnome-panel-2.25.3/gnome-panel/launcher.h.preferred-apps gnome-panel-2.25.3/gnome-panel/launcher.h
---- gnome-panel-2.25.3/gnome-panel/launcher.h.preferred-apps	2009-01-16 13:27:30.000000000 -0500
-+++ gnome-panel-2.25.3/gnome-panel/launcher.h	2009-01-16 13:27:30.000000000 -0500
+--- gnome-panel-2.25.3/gnome-panel/launcher.h.preferred-apps	2009-01-16 14:15:17.000000000 -0500
++++ gnome-panel-2.25.3/gnome-panel/launcher.h	2009-01-16 14:15:17.000000000 -0500
 @@ -14,6 +14,8 @@
  #include "applet.h"
  #include "panel-widget.h"
@@ -218,7 +229,7 @@
  
 diff -up gnome-panel-2.25.3/gnome-panel/main.c.preferred-apps gnome-panel-2.25.3/gnome-panel/main.c
 --- gnome-panel-2.25.3/gnome-panel/main.c.preferred-apps	2008-12-09 07:32:37.000000000 -0500
-+++ gnome-panel-2.25.3/gnome-panel/main.c	2009-01-16 13:27:30.000000000 -0500
++++ gnome-panel-2.25.3/gnome-panel/main.c	2009-01-16 14:15:17.000000000 -0500
 @@ -27,6 +27,7 @@
  #include "panel-action-protocol.h"
  #include "panel-lockdown.h"
@@ -237,7 +248,7 @@
  	panel_profile_load ();
 diff -up gnome-panel-2.25.3/gnome-panel/panel-run-dialog.c.preferred-apps gnome-panel-2.25.3/gnome-panel/panel-run-dialog.c
 --- gnome-panel-2.25.3/gnome-panel/panel-run-dialog.c.preferred-apps	2008-12-11 12:03:03.000000000 -0500
-+++ gnome-panel-2.25.3/gnome-panel/panel-run-dialog.c	2009-01-16 13:27:30.000000000 -0500
++++ gnome-panel-2.25.3/gnome-panel/panel-run-dialog.c	2009-01-16 14:15:17.000000000 -0500
 @@ -789,7 +789,7 @@ get_all_applications_from_dir (GMenuTree
  	return list;
  }
@@ -249,7 +260,7 @@
  	GMenuTree          *tree;
 diff -up gnome-panel-2.25.3/gnome-panel/panel-run-dialog.h.preferred-apps gnome-panel-2.25.3/gnome-panel/panel-run-dialog.h
 --- gnome-panel-2.25.3/gnome-panel/panel-run-dialog.h.preferred-apps	2008-11-08 19:27:01.000000000 -0500
-+++ gnome-panel-2.25.3/gnome-panel/panel-run-dialog.h	2009-01-16 13:27:30.000000000 -0500
++++ gnome-panel-2.25.3/gnome-panel/panel-run-dialog.h	2009-01-16 14:15:17.000000000 -0500
 @@ -32,6 +32,8 @@ G_BEGIN_DECLS
  void panel_run_dialog_present           (GdkScreen  *screen,
  					 guint32    activate_time);



From cebbert at fedoraproject.org  Fri Jan 16 19:48:49 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Fri, 16 Jan 2009 19:48:49 +0000 (UTC)
Subject: rpms/kernel/F-9 linux-2.6.27.9-ext4-cap-check-delay.patch, NONE,
	1.1.2.1 kernel.spec, 1.891.2.1, 1.891.2.2
Message-ID: <20090116194849.A4B5670127@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25832

Modified Files:
      Tag: private-fedora-9-2_6_27-branch
	kernel.spec 
Added Files:
      Tag: private-fedora-9-2_6_27-branch
	linux-2.6.27.9-ext4-cap-check-delay.patch 
Log Message:
ext4 - delay capable() checks in space accounting (F10#478299)

linux-2.6.27.9-ext4-cap-check-delay.patch:

--- NEW FILE linux-2.6.27.9-ext4-cap-check-delay.patch ---
Safer version of upstream commit a996031c87e093017c0763326a08896a3a4817f4

Delay capable() checks to avoid (most) AVC denials when checking free blocks
(Bug 478299 -  AVC denials on kernel 2.6.27.9-159.fc10.x86_64)

Signed-off-by: Eric Sandeen <sandeen at redhat.com>
---

Index: linux-2.6.27.noarch/fs/ext4/balloc.c
===================================================================
--- linux-2.6.27.noarch.orig/fs/ext4/balloc.c	2009-01-06 14:49:05.625574969 -0600
+++ linux-2.6.27.noarch/fs/ext4/balloc.c	2009-01-06 14:49:19.181637281 -0600
@@ -1612,15 +1612,15 @@ out:
 ext4_fsblk_t ext4_has_free_blocks(struct ext4_sb_info *sbi,
 						ext4_fsblk_t nblocks)
 {
-	ext4_fsblk_t free_blocks;
-	ext4_fsblk_t root_blocks = 0;
+	ext4_fsblk_t free_blocks, root_blocks;
 
 	free_blocks = percpu_counter_read_positive(&sbi->s_freeblocks_counter);
+	root_blocks = ext4_r_blocks_count(sbi->s_es);
 
-	if (!capable(CAP_SYS_RESOURCE) &&
-		sbi->s_resuid != current->fsuid &&
-		(sbi->s_resgid == 0 || !in_group_p(sbi->s_resgid)))
-		root_blocks = ext4_r_blocks_count(sbi->s_es);
+	if (sbi->s_resuid == current->fsuid ||
+	    ((sbi->s_resgid != 0) && in_group_p(sbi->s_resgid)) ||
+	    capable(CAP_SYS_RESOURCE))
+		root_blocks = 0;
 #ifdef CONFIG_SMP
 	if (free_blocks - root_blocks < FBC_BATCH)
 		free_blocks =


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/kernel.spec,v
retrieving revision 1.891.2.1
retrieving revision 1.891.2.2
diff -u -r1.891.2.1 -r1.891.2.2
--- kernel.spec	16 Jan 2009 19:23:22 -0000	1.891.2.1
+++ kernel.spec	16 Jan 2009 19:48:19 -0000	1.891.2.2
@@ -733,6 +733,7 @@
 Patch2600: linux-2.6-merge-efifb-imacfb.patch
 
 Patch2902: linux-2.6.27-ext4-rename-ext4dev-to-ext4.patch
+Patch2903: linux-2.6.27.9-ext4-cap-check-delay.patch
 
 # Add better support for DMI-based autoloading
 Patch3110: linux-2.6-dmi-autoload.patch
@@ -1308,6 +1309,7 @@
 
 # Filesystem patches
 ApplyPatch linux-2.6.27-ext4-rename-ext4dev-to-ext4.patch
+ApplyPatch linux-2.6.27.9-ext4-cap-check-delay.patch
 
 # linux1394 git patches
 ApplyPatch linux-2.6-firewire-git-update.patch
@@ -1923,7 +1925,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 Jan 16 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.27.11-78
+* Fri Jan 16 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.27.11-78.2.2
+- ext4 - delay capable() checks in space accounting (F10#478299)
+
+* Fri Jan 16 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.27.11-78.2.1
 - Linux 2.6.27.11
   Dropped patches:
     linux-2.6-iwlagn-downgrade-BUG_ON-in-interrupt.patch



From sandeen at fedoraproject.org  Fri Jan 16 19:58:25 2009
From: sandeen at fedoraproject.org (Eric Sandeen)
Date: Fri, 16 Jan 2009 19:58:25 +0000 (UTC)
Subject: rpms/guilt/devel .cvsignore, 1.3, 1.4 guilt.spec, 1.3, 1.4 sources, 
	1.3, 1.4 ecryptfs-new-git-regression-fixes.patch, 1.1, NONE
Message-ID: <20090116195825.DC63070127@cvs1.fedora.phx.redhat.com>

Author: sandeen

Update of /cvs/pkgs/rpms/guilt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27411

Modified Files:
	.cvsignore guilt.spec sources 
Removed Files:
	ecryptfs-new-git-regression-fixes.patch 
Log Message:
* Fri Jan 16 2009 Eric Sandeen <sandeen at redhat.com> 0.32
- New upstream version, supports newer git (1.6)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/guilt/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	11 Apr 2008 18:44:03 -0000	1.3
+++ .cvsignore	16 Jan 2009 19:57:55 -0000	1.4
@@ -1 +1 @@
-guilt-0.30.tar.bz2
+guilt-0.32.tar.bz2


Index: guilt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/guilt/devel/guilt.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- guilt.spec	3 Jun 2008 15:27:17 -0000	1.3
+++ guilt.spec	16 Jan 2009 19:57:55 -0000	1.4
@@ -1,6 +1,6 @@
 Name:		guilt
-Version:	0.30
-Release:	2%{?dist}
+Version:	0.32
+Release:	1%{?dist}
 Summary:	Scripts to manage quilt-like patches on top of git
 
 Group:		Development/Tools
@@ -13,8 +13,6 @@
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	asciidoc, xmlto, git-core
 
-Patch0:		ecryptfs-new-git-regression-fixes.patch
-
 %description
 Guilt allows one to use quilt functionality on top of a Git repository.
 Changes are maintained as patches which are committed into Git.  Commits can
@@ -26,8 +24,6 @@
 %prep
 %setup -q
 
-%patch0 -p1
-
 %build
 make %{?_smp_mflags}
 
@@ -50,6 +46,9 @@
 %{_mandir}/man7/guilt*.7*
 
 %changelog
+* Fri Jan 16 2009 Eric Sandeen <sandeen at redhat.com> 0.32
+- New upstream version, supports newer git (1.6)
+
 * Tue Jun 02 2008 Eric Sandeen <sandeen at redhat.com> 0.30-2
 - Fix regression test output for new versions of git (#440169)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/guilt/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	11 Apr 2008 18:44:03 -0000	1.3
+++ sources	16 Jan 2009 19:57:55 -0000	1.4
@@ -1 +1 @@
-5c46ae257becfc5dea3048d3fbe2adb2  guilt-0.30.tar.bz2
+79dd2d270fae2fb157312f6949888249  guilt-0.32.tar.bz2


--- ecryptfs-new-git-regression-fixes.patch DELETED ---



From pkgdb at fedoraproject.org  Fri Jan 16 20:23:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 16 Jan 2009 20:23:36 +0000
Subject: [pkgdb] kpackagekit had acl change status
Message-ID: <20090116202336.B1D3C208457@bastion.fedora.phx.redhat.com>

tuxbrewr has set the commit acl on kpackagekit (Fedora devel) to Awaiting Review for balajig8

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kpackagekit



From pkgdb at fedoraproject.org  Fri Jan 16 20:23:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 16 Jan 2009 20:23:45 +0000
Subject: [pkgdb] kpackagekit had acl change status
Message-ID: <20090116202345.F062320846C@bastion.fedora.phx.redhat.com>

tuxbrewr has set the commit acl on kpackagekit (Fedora 9) to Awaiting Review for balajig8

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kpackagekit



From pkgdb at fedoraproject.org  Fri Jan 16 20:23:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 16 Jan 2009 20:23:52 +0000
Subject: [pkgdb] kpackagekit had acl change status
Message-ID: <20090116202352.E61C1208467@bastion.fedora.phx.redhat.com>

tuxbrewr has set the commit acl on kpackagekit (Fedora 10) to Awaiting Review for balajig8

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kpackagekit



From sandeen at fedoraproject.org  Fri Jan 16 20:24:04 2009
From: sandeen at fedoraproject.org (Eric Sandeen)
Date: Fri, 16 Jan 2009 20:24:04 +0000 (UTC)
Subject: rpms/guilt/devel guilt-0.32-fix-regression-test.patch, NONE,
	1.1 guilt.spec, 1.4, 1.5
Message-ID: <20090116202404.5F8EE70127@cvs1.fedora.phx.redhat.com>

Author: sandeen

Update of /cvs/pkgs/rpms/guilt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29452

Modified Files:
	guilt.spec 
Added Files:
	guilt-0.32-fix-regression-test.patch 
Log Message:
* Fri Jan 16 2009 Eric Sandeen <sandeen at redhat.com> 0.32-2
- New upstream version, supports newer git (1.6)
- Fix minor regression test problem


guilt-0.32-fix-regression-test.patch:

--- NEW FILE guilt-0.32-fix-regression-test.patch ---
Index: guilt-0.32/regression/t-030.out
===================================================================
--- guilt-0.32.orig/regression/t-030.out	2009-01-16 14:14:26.000000000 -0600
+++ guilt-0.32/regression/t-030.out	2009-01-16 14:16:20.353575541 -0600
@@ -1,6 +1,6 @@
 % setup_repo
 % guilt-commit
-Usage: guilt-commit -n <num> | -a | --all
+Usage: guilt commit -n <num> | -a | --all
 % list_files
 d .git/patches
 d .git/patches/master
@@ -60,7 +60,7 @@ Patch applied.
 Applying patch..mode
 Patch applied.
 % guilt-commit
-Usage: guilt-commit -n <num> | -a | --all
+Usage: guilt commit -n <num> | -a | --all
 % list_files
 d .git/patches
 d .git/patches/master
Index: guilt-0.32/regression/scaffold
===================================================================
--- guilt-0.32.orig/regression/scaffold	2009-01-16 13:36:50.000000000 -0600
+++ guilt-0.32/regression/scaffold	2009-01-16 14:18:59.013575047 -0600
@@ -27,6 +27,7 @@ function replace_path
 {
 	sed -e "s,$PWD,PATH,g" \
 	    -e "s,$REG_DIR/\.\./,,g" \
+	    -e "s,Usage: guilt-,Usage: guilt ,g" \
 	    -e "s,\.\.\. initial, initial,g" \
 	    -e "s,^Already on branch,Already on,g"
 }


Index: guilt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/guilt/devel/guilt.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- guilt.spec	16 Jan 2009 19:57:55 -0000	1.4
+++ guilt.spec	16 Jan 2009 20:23:33 -0000	1.5
@@ -1,6 +1,6 @@
 Name:		guilt
 Version:	0.32
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Scripts to manage quilt-like patches on top of git
 
 Group:		Development/Tools
@@ -13,6 +13,8 @@
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	asciidoc, xmlto, git-core
 
+Patch0:		guilt-0.32-fix-regression-test.patch
+
 %description
 Guilt allows one to use quilt functionality on top of a Git repository.
 Changes are maintained as patches which are committed into Git.  Commits can
@@ -23,6 +25,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 make %{?_smp_mflags}
@@ -46,8 +49,9 @@
 %{_mandir}/man7/guilt*.7*
 
 %changelog
-* Fri Jan 16 2009 Eric Sandeen <sandeen at redhat.com> 0.32
+* Fri Jan 16 2009 Eric Sandeen <sandeen at redhat.com> 0.32-2
 - New upstream version, supports newer git (1.6)
+- Fix minor regression test problem
 
 * Tue Jun 02 2008 Eric Sandeen <sandeen at redhat.com> 0.30-2
 - Fix regression test output for new versions of git (#440169)



From kyle at fedoraproject.org  Fri Jan 16 20:25:06 2009
From: kyle at fedoraproject.org (Kyle McMartin)
Date: Fri, 16 Jan 2009 20:25:06 +0000 (UTC)
Subject: rpms/kernel/devel patch-2.6.29-rc1-git6.bz2.sign, NONE,
	1.1 .cvsignore, 
	1.993, 1.994 config-generic, 1.222, 1.223 kernel.spec, 1.1219,
	1.1220 sources, 1.955, 1.956 upstream, 1.867,
	1.868 linux-2.6-net-silence-noisy-printks.patch, 1.4,
	NONE patch-2.6.29-rc1-git5.bz2.sign, 1.1, NONE
Message-ID: <20090116202506.E301E70127@cvs1.fedora.phx.redhat.com>

Author: kyle

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29642

Modified Files:
	.cvsignore config-generic kernel.spec sources upstream 
Added Files:
	patch-2.6.29-rc1-git6.bz2.sign 
Removed Files:
	linux-2.6-net-silence-noisy-printks.patch 
	patch-2.6.29-rc1-git5.bz2.sign 
Log Message:
* Fri Jan 16 2009 Kyle McMartin <kyle at redhat.com>
- 2.6.29-rc1-git6
- linux-2.6-net-silence-noisy-printks.patch: merged



--- NEW FILE patch-2.6.29-rc1-git6.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBJcHgryGugalF9Dw4RAonkAJ9fMVY+T/fyR7tGJUNJe3/bwlzr/gCfQ909
WNc5VM/uTRs96NaFF4+/pas=
=lBxH
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.993
retrieving revision 1.994
diff -u -r1.993 -r1.994
--- .cvsignore	15 Jan 2009 15:14:20 -0000	1.993
+++ .cvsignore	16 Jan 2009 20:24:36 -0000	1.994
@@ -6,4 +6,4 @@
 linux-2.6.28.tar.bz2
 patch-2.6.28-git14.bz2
 patch-2.6.29-rc1.bz2
-patch-2.6.29-rc1-git5.bz2
+patch-2.6.29-rc1-git6.bz2


Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-generic,v
retrieving revision 1.222
retrieving revision 1.223
diff -u -r1.222 -r1.223
--- config-generic	15 Jan 2009 14:22:13 -0000	1.222
+++ config-generic	16 Jan 2009 20:24:36 -0000	1.223
@@ -1964,6 +1964,7 @@
 CONFIG_SENSORS_ADS7828=m
 CONFIG_SENSORS_ADT7470=m
 CONFIG_SENSORS_ADT7473=m
+CONFIG_SENSORS_ADT7475=m
 CONFIG_SENSORS_APPLESMC=m
 CONFIG_SENSORS_ASB100=m
 CONFIG_SENSORS_ATXP1=m


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1219
retrieving revision 1.1220
diff -u -r1.1219 -r1.1220
--- kernel.spec	15 Jan 2009 15:14:20 -0000	1.1219
+++ kernel.spec	16 Jan 2009 20:24:36 -0000	1.1220
@@ -58,7 +58,7 @@
 # The rc snapshot level
 %define rcrev 1
 # The git snapshot level
-%define gitrev 5
+%define gitrev 6
 # Set rpm version accordingly
 %define rpmversion 2.6.%{upstream_sublevel}
 %endif
@@ -612,7 +612,6 @@
 Patch390: linux-2.6-defaults-acpi-video.patch
 Patch391: linux-2.6-acpi-video-dos.patch
 Patch400: linux-2.6-scsi-cpqarray-set-master.patch
-Patch430: linux-2.6-net-silence-noisy-printks.patch
 Patch450: linux-2.6-input-kill-stupid-messages.patch
 Patch460: linux-2.6-serial-460800.patch
 Patch510: linux-2.6-silence-noise.patch
@@ -1093,8 +1092,6 @@
 # ALSA
 
 # Networking
-# Disable easy to trigger printk's.
-ApplyPatch linux-2.6-net-silence-noisy-printks.patch
 
 # Misc fixes
 # The input layer spews crap no-one cares about.
@@ -1738,6 +1735,10 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Fri Jan 16 2009 Kyle McMartin <kyle at redhat.com>
+- 2.6.29-rc1-git6
+- linux-2.6-net-silence-noisy-printks.patch: merged
+
 * Thu Jan 15 2009 Kyle McMartin <kyle at redhat.com>
 - 2.6.29-rc1-git5
 - Fix module_ref patch, need to test before dereferencing possible


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v
retrieving revision 1.955
retrieving revision 1.956
diff -u -r1.955 -r1.956
--- sources	15 Jan 2009 15:14:20 -0000	1.955
+++ sources	16 Jan 2009 20:24:36 -0000	1.956
@@ -1,3 +1,3 @@
 d351e44709c9810b85e29b877f50968a  linux-2.6.28.tar.bz2
 c7280469ffd1edd4b50bac92de172d46  patch-2.6.29-rc1.bz2
-759a3df181fa9d24fa3cf6e18ce2207c  patch-2.6.29-rc1-git5.bz2
+bfde031ce5890a89d9fdad66f61c97a7  patch-2.6.29-rc1-git6.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v
retrieving revision 1.867
retrieving revision 1.868
diff -u -r1.867 -r1.868
--- upstream	15 Jan 2009 15:14:20 -0000	1.867
+++ upstream	16 Jan 2009 20:24:36 -0000	1.868
@@ -1,3 +1,3 @@
 linux-2.6.28.tar.bz2
 patch-2.6.29-rc1.bz2
-patch-2.6.29-rc1-git5.bz2
+patch-2.6.29-rc1-git6.bz2


--- linux-2.6-net-silence-noisy-printks.patch DELETED ---


--- patch-2.6.29-rc1-git5.bz2.sign DELETED ---



From sandeen at fedoraproject.org  Fri Jan 16 20:32:17 2009
From: sandeen at fedoraproject.org (Eric Sandeen)
Date: Fri, 16 Jan 2009 20:32:17 +0000 (UTC)
Subject: rpms/guilt/F-10 .cvsignore, 1.3, 1.4 guilt.spec, 1.3, 1.4 sources,
	1.3, 1.4
Message-ID: <20090116203217.3851F70127@cvs1.fedora.phx.redhat.com>

Author: sandeen

Update of /cvs/pkgs/rpms/guilt/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30973

Modified Files:
	.cvsignore guilt.spec sources 
Log Message:
* Fri Jan 16 2009 Eric Sandeen <sandeen at redhat.com> 0.32-2
- New upstream version, supports newer git (1.6)
- Fix minor regression test problem



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/guilt/F-10/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	11 Apr 2008 18:44:03 -0000	1.3
+++ .cvsignore	16 Jan 2009 20:31:46 -0000	1.4
@@ -1 +1 @@
-guilt-0.30.tar.bz2
+guilt-0.32.tar.bz2


Index: guilt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/guilt/F-10/guilt.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- guilt.spec	3 Jun 2008 15:27:17 -0000	1.3
+++ guilt.spec	16 Jan 2009 20:31:47 -0000	1.4
@@ -1,5 +1,5 @@
 Name:		guilt
-Version:	0.30
+Version:	0.32
 Release:	2%{?dist}
 Summary:	Scripts to manage quilt-like patches on top of git
 
@@ -13,7 +13,7 @@
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	asciidoc, xmlto, git-core
 
-Patch0:		ecryptfs-new-git-regression-fixes.patch
+Patch0:		guilt-0.32-fix-regression-test.patch
 
 %description
 Guilt allows one to use quilt functionality on top of a Git repository.
@@ -25,7 +25,6 @@
 
 %prep
 %setup -q
-
 %patch0 -p1
 
 %build
@@ -50,6 +49,10 @@
 %{_mandir}/man7/guilt*.7*
 
 %changelog
+* Fri Jan 16 2009 Eric Sandeen <sandeen at redhat.com> 0.32-2
+- New upstream version, supports newer git (1.6)
+- Fix minor regression test problem
+
 * Tue Jun 02 2008 Eric Sandeen <sandeen at redhat.com> 0.30-2
 - Fix regression test output for new versions of git (#440169)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/guilt/F-10/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	11 Apr 2008 18:44:03 -0000	1.3
+++ sources	16 Jan 2009 20:31:47 -0000	1.4
@@ -1 +1 @@
-5c46ae257becfc5dea3048d3fbe2adb2  guilt-0.30.tar.bz2
+79dd2d270fae2fb157312f6949888249  guilt-0.32.tar.bz2



From sandeen at fedoraproject.org  Fri Jan 16 20:36:39 2009
From: sandeen at fedoraproject.org (Eric Sandeen)
Date: Fri, 16 Jan 2009 20:36:39 +0000 (UTC)
Subject: rpms/guilt/F-10 guilt-0.32-fix-regression-test.patch,NONE,1.1
Message-ID: <20090116203639.5FA0470127@cvs1.fedora.phx.redhat.com>

Author: sandeen

Update of /cvs/pkgs/rpms/guilt/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31402

Added Files:
	guilt-0.32-fix-regression-test.patch 
Log Message:
Actually cvs add the new patch


guilt-0.32-fix-regression-test.patch:

--- NEW FILE guilt-0.32-fix-regression-test.patch ---
Index: guilt-0.32/regression/t-030.out
===================================================================
--- guilt-0.32.orig/regression/t-030.out	2009-01-16 14:14:26.000000000 -0600
+++ guilt-0.32/regression/t-030.out	2009-01-16 14:16:20.353575541 -0600
@@ -1,6 +1,6 @@
 % setup_repo
 % guilt-commit
-Usage: guilt-commit -n <num> | -a | --all
+Usage: guilt commit -n <num> | -a | --all
 % list_files
 d .git/patches
 d .git/patches/master
@@ -60,7 +60,7 @@ Patch applied.
 Applying patch..mode
 Patch applied.
 % guilt-commit
-Usage: guilt-commit -n <num> | -a | --all
+Usage: guilt commit -n <num> | -a | --all
 % list_files
 d .git/patches
 d .git/patches/master
Index: guilt-0.32/regression/scaffold
===================================================================
--- guilt-0.32.orig/regression/scaffold	2009-01-16 13:36:50.000000000 -0600
+++ guilt-0.32/regression/scaffold	2009-01-16 14:18:59.013575047 -0600
@@ -27,6 +27,7 @@ function replace_path
 {
 	sed -e "s,$PWD,PATH,g" \
 	    -e "s,$REG_DIR/\.\./,,g" \
+	    -e "s,Usage: guilt-,Usage: guilt ,g" \
 	    -e "s,\.\.\. initial, initial,g" \
 	    -e "s,^Already on branch,Already on,g"
 }



From pkgdb at fedoraproject.org  Fri Jan 16 20:41:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 16 Jan 2009 20:41:52 +0000
Subject: [pkgdb] abyssinica-fonts ownership updated
Message-ID: <20090116204155.17578208457@bastion.fedora.phx.redhat.com>

Package abyssinica-fonts in Fedora devel is now owned by nim

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/abyssinica-fonts



From steve at fedoraproject.org  Fri Jan 16 21:10:05 2009
From: steve at fedoraproject.org (Steven Pritchard)
Date: Fri, 16 Jan 2009 21:10:05 +0000 (UTC)
Subject: rpms/cpanspec/devel .cvsignore, 1.21, 1.22 cpanspec.spec, 1.26,
	1.27 sources, 1.21, 1.22
Message-ID: <20090116211006.02DCC70127@cvs1.fedora.phx.redhat.com>

Author: steve

Update of /cvs/pkgs/rpms/cpanspec/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2214

Modified Files:
	.cvsignore cpanspec.spec sources 
Log Message:
Update to 1.78.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cpanspec/devel/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- .cvsignore	16 Jun 2008 19:30:18 -0000	1.21
+++ .cvsignore	16 Jan 2009 21:09:35 -0000	1.22
@@ -1 +1 @@
-cpanspec-1.77.tar.gz
+cpanspec-1.78.tar.gz


Index: cpanspec.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cpanspec/devel/cpanspec.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- cpanspec.spec	16 Jun 2008 19:30:18 -0000	1.26
+++ cpanspec.spec	16 Jan 2009 21:09:35 -0000	1.27
@@ -1,5 +1,5 @@
 Name:           cpanspec
-Version:        1.77
+Version:        1.78
 Release:        1%{?dist}
 Summary:        RPM spec file generation utility
 License:        GPL+ or Artistic
@@ -53,6 +53,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Fri Jan 16 2009 Steven Pritchard <steve at kspei.com> 1.78-1
+- Update to 1.78.
+
 * Mon Jun 16 2008 Steven Pritchard <steve at kspei.com> 1.77-1
 - Update to 1.77.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cpanspec/devel/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sources	16 Jun 2008 19:30:18 -0000	1.21
+++ sources	16 Jan 2009 21:09:35 -0000	1.22
@@ -1 +1 @@
-89cea6ee4671989aebdbbd8e6a685319  cpanspec-1.77.tar.gz
+d2cb7aba4aface3cc24064baba7b2675  cpanspec-1.78.tar.gz



From dwalsh at fedoraproject.org  Fri Jan 16 21:12:29 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Fri, 16 Jan 2009 21:12:29 +0000 (UTC)
Subject: rpms/selinux-policy/devel modules-mls.conf, 1.41,
	1.42 policy-20090105.patch, 1.5, 1.6 selinux-policy.spec, 1.765, 1.766
Message-ID: <20090116211229.88EF370127@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2640

Modified Files:
	modules-mls.conf policy-20090105.patch selinux-policy.spec 
Log Message:
* Thu Jan 15 2009 Dan Walsh <dwalsh at redhat.com> 3.6.2-5
- Define openoffice as an x_domain



View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.41 -r 1.42 modules-mls.conf
Index: modules-mls.conf
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/modules-mls.conf,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- modules-mls.conf	2 Dec 2008 19:59:35 -0000	1.41
+++ modules-mls.conf	16 Jan 2009 21:11:58 -0000	1.42
@@ -11,29 +11,334 @@
 # as individual loadable modules.
 #
 
-# Layer: kernel
-# Module: terminal
+# Layer: admin
+# Module: acct
+#
+# Berkeley process accounting
+# 
+acct = base
+
+# Layer: admin
+# Module: alsa
+#
+# Ainit ALSA configuration tool
+# 
+alsa = base
+
+# Layer: apps
+# Module: ada
+#
+# ada executable
+# 
+ada = module
+
+# Layer: modules
+# Module: awstats
+#
+# awstats executable
+# 
+awstats = module
+
+# Layer: admin
+# Module: amanda
+#
+# Automated backup program.
+# 
+amanda = module
+
+# Layer: services
+# Module: afs
+#
+# Andrew Filesystem server
+# 
+afs = module
+
+# Layer: services
+# Module: amavis
+#
+# Anti-virus
+# 
+amavis = module
+
+# Layer: admin
+# Module: anaconda
+#
+# Policy for the Anaconda installer.
+# 
+anaconda = base
+
+# Layer: services
+# Module: apache
+#
+# Apache web server
+# 
+apache = module
+
+# Layer: services
+# Module: apm
+#
+# Advanced power management daemon
+# 
+apm = base
+
+# Layer: system
+# Module: application
 # Required in base
 #
-# Policy for terminals.
+# Defines attributs and interfaces for all user applications
 # 
-terminal = base
+application = base
+
+# Layer: services
+# Module: arpwatch
+#
+# Ethernet activity monitor.
+# 
+arpwatch = module
+
+# Layer: services
+# Module: audioentropy
+#
+# Generate entropy from audio input
+# 
+audioentropy = module
+
+# Layer: system
+# Module: authlogin
+#
+# Common policy for authentication and user login.
+# 
+authlogin = base
+
+# Layer: services
+# Module: automount
+#
+# Filesystem automounter service.
+# 
+automount = module
+
+# Layer: services
+# Module: avahi
+#
+# mDNS/DNS-SD daemon implementing Apple ZeroConf architecture
+# 
+avahi = module
+
+# Layer: services
+# Module: bind
+#
+# Berkeley internet name domain DNS server.
+# 
+bind = module
+
+# Layer: services
+# Module: dnsmasq
+#
+# A lightweight DHCP and caching DNS server.
+# 
+dnsmasq = module
+
+# Layer: services
+# Module: bluetooth
+#
+# Bluetooth tools and system services.
+# 
+bluetooth = module
 
 # Layer: kernel
-# Module: kernel
+# Module: ubac
+#
+# 
+# 
+ubac = base
+
+#
+# Layer: kernel
+# Module: bootloader
+#
+# Policy for the kernel modules, kernel image, and bootloader.
+# 
+bootloader = base
+
+
+# Layer: services
+# Module: canna
+#
+# Canna - kana-kanji conversion server
+# 
+canna = module
+
+# Layer: services
+# Module: ccs
+#
+# policy for ccs
+# 
+ccs = module
+
+# Layer: apps
+# Module: calamaris
+#
+#
+# Squid log analysis
+# 
+calamaris = module
+
+# Layer: apps
+# Module: cdrecord
+#
+# Policy for cdrecord
+# 
+cdrecord = module
+
+# Layer: admin
+# Module: certwatch
+#
+# Digital Certificate Tracking
[...1871 lines suppressed...]
+# Layer: role
+# Module: logadm
 #
-# Policy for tzdata-update
+# Minimally prived root role for managing logging system
 # 
-tzdata = base
+logadm = module
 
-# Layer: admin
-# Module: amtu
+# Layer: role
+# Module: webadm
 #
-# Abstract Machine Test Utility (AMTU)
+# Minimally prived root role for managing apache
 # 
-amtu = module
+webadm = module
 
+#
 # Layer: services
-# Module: prelude
+# Module: exim
 #
+# exim mail server 
 # 
+exim = module
+
+
+# Layer: services
+# Module: kismet
+#
+# Wireless sniffing and monitoring
 # 
-prelude = module
+kismet = module
 
-# Layer: role
-# Module: secadm
+# Layer: services
+# Module: munin
 #
-# Root role used to manage selinux 
+# Munin
 # 
-secadm = module
+munin = module
 
-# Layer: role
-# Module: auditadm
+# Layer: services
+# Module: bitlbee
+#
+# An IRC to other chat networks  gateway
+# 
+bitlbee = module
+
+# Layer: services
+# Module: soundserver
 #
-# Root role used to manage audit system
+# sound server for network audio server programs, nasd, yiff, etc</summary>
 # 
-auditadm = module
+soundserver = module
 
 # Layer:role
 # Module: staff
 #
 # admin account 
 # 
-staff = base
+staff = module
 
 # Layer:role
 # Module: sysadm
@@ -1105,9 +1636,40 @@
 # Layer: role
 # Module: unprivuser
 #
-# user account 
+# Minimally privs guest account on tty logins
+# 
+unprivuser = module
+
+# Layer: services
+# Module: prelude
+#
+prelude = module
+
+# Layer: services
+# Module: pads
+#
+pads = module
+
+# Layer: services
+# Module: kerneloops
+#
+# program  to  collect  and  submit  kernel oopses to kerneloops.org
+# 
+kerneloops = module
+
+# Layer: apps
+# Module: openoffice
+#
+# openoffice executable
 # 
-unprivuser = base
+openoffice = module
+
+# Layer: apps
+# Module: podsleuth
+#
+# Podsleuth probes, identifies, and exposes properties and metadata bound to iPods.
+# 
+podsleuth = module
 
 # Layer: role
 # Module: guest
@@ -1130,41 +1692,33 @@
 # 
 courier = module
 
-# Layer: services
-# Module: rpcbind
-#
-#  universal addresses to RPC program number mapper
-# 
-rpcbind = module
-
-
 # Layer: apps
-# Module: wm
+# Module: livecd
 #
-# X windows window manager
+# livecd creator
 # 
-#wm = module
+livecd = module
 
 # Layer: services
-# Module: virt
+# Module: snort
 #
-# Virtualization libraries
+# Snort network intrusion detection system
 # 
-virt = module
+snort = module
 
-# Layer: apps
-# Module: qemu
+# Layer: services
+# Module: memcached
 #
-# Virtualization emulator 
+#  high-performance memory object caching system
 # 
-qemu = module
+memcached = module
 
 # Layer: system
-# Module: brctl
+# Module: netlabel
 #
-# Utilities for configuring the linux ethernet bridge
+# Basic netlabel types and interfaces.
 # 
-brctl = base
+netlabel = module
 
 # Layer: services
 # Module: zosremote
@@ -1173,9 +1727,21 @@
 # 
 zosremote = module
 
-# Layer: kernel
-# Module: ubac
+# Layer: services
+# Module: pki
+#
+# 
+pki = module
+
+# Layer: services
+# Module: pingd
+#
+# 
+pingd = module
+
+# Layer: services
+# Module: milter
 #
 # 
 # 
-ubac = base
+milter = module

policy-20090105.patch:

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.5 -r 1.6 policy-20090105.patch
Index: policy-20090105.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-20090105.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- policy-20090105.patch	13 Jan 2009 16:22:47 -0000	1.5
+++ policy-20090105.patch	16 Jan 2009 21:11:58 -0000	1.6
@@ -1138,7 +1138,7 @@
  		java_domtrans_unconfined(rpm_script_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/sudo.if serefpolicy-3.6.2/policy/modules/admin/sudo.if
 --- nsaserefpolicy/policy/modules/admin/sudo.if	2008-11-11 16:13:49.000000000 -0500
-+++ serefpolicy-3.6.2/policy/modules/admin/sudo.if	2009-01-05 17:54:58.000000000 -0500
++++ serefpolicy-3.6.2/policy/modules/admin/sudo.if	2009-01-13 15:12:44.000000000 -0500
 @@ -51,7 +51,7 @@
  	#
  
@@ -1202,7 +1202,7 @@
  	logging_send_syslog_msg($1_sudo_t)
  
  	miscfiles_read_localization($1_sudo_t)
-@@ -114,6 +120,31 @@
+@@ -114,6 +120,35 @@
  	userdom_manage_user_tmp_files($1_sudo_t)
  	userdom_manage_user_tmp_symlinks($1_sudo_t)
  	userdom_use_user_terminals($1_sudo_t)
@@ -1233,6 +1233,10 @@
 +	userdom_use_user_terminals($1_sudo_t)
 +	term_relabel_all_user_ttys($1_sudo_t)
 +	term_relabel_all_user_ptys($1_sudo_t)
++	
++	optional_policy(`
++		dbus_system_bus_client($1_sudo_t)
++	')
  ')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/tmpreaper.te serefpolicy-3.6.2/policy/modules/admin/tmpreaper.te
 --- nsaserefpolicy/policy/modules/admin/tmpreaper.te	2008-11-11 16:13:49.000000000 -0500
@@ -2929,8 +2933,8 @@
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/openoffice.if serefpolicy-3.6.2/policy/modules/apps/openoffice.if
 --- nsaserefpolicy/policy/modules/apps/openoffice.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.2/policy/modules/apps/openoffice.if	2009-01-05 17:54:58.000000000 -0500
-@@ -0,0 +1,89 @@
++++ serefpolicy-3.6.2/policy/modules/apps/openoffice.if	2009-01-15 08:48:06.000000000 -0500
+@@ -0,0 +1,92 @@
 +## <summary>Openoffice</summary>
 +
 +#######################################
@@ -3019,6 +3023,9 @@
 +
 +	allow $3 $1_openoffice_t:process { signal sigkill };
 +	allow $1_openoffice_t $3:unix_stream_socket connectto;
++	optional_policy(`	
++		xserver_common_x_domain_template($1, $1_openoffice_t)
++	')
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/openoffice.te serefpolicy-3.6.2/policy/modules/apps/openoffice.te
 --- nsaserefpolicy/policy/modules/apps/openoffice.te	1969-12-31 19:00:00.000000000 -0500
@@ -3084,7 +3091,7 @@
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/podsleuth.te serefpolicy-3.6.2/policy/modules/apps/podsleuth.te
 --- nsaserefpolicy/policy/modules/apps/podsleuth.te	2009-01-05 15:39:38.000000000 -0500
-+++ serefpolicy-3.6.2/policy/modules/apps/podsleuth.te	2009-01-05 17:54:58.000000000 -0500
++++ serefpolicy-3.6.2/policy/modules/apps/podsleuth.te	2009-01-15 11:07:09.000000000 -0500
 @@ -11,21 +11,58 @@
  application_domain(podsleuth_t, podsleuth_exec_t)
  role system_r types podsleuth_t;
@@ -3102,7 +3109,7 @@
 -
 -allow podsleuth_t self:process { signal getsched execheap execmem };
 +allow podsleuth_t self:capability { sys_admin sys_rawio };
-+allow podsleuth_t self:process { ptrace signal getsched execheap execmem };
++allow podsleuth_t self:process { ptrace signal getsched execheap execmem execstack };
  allow podsleuth_t self:fifo_file rw_file_perms;
  allow podsleuth_t self:unix_stream_socket create_stream_socket_perms;
 +allow podsleuth_t self:sem create_sem_perms;
@@ -3992,7 +3999,7 @@
 +xserver_user_x_domain_template(user, wm_t, wm_tmpfs_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corecommands.fc serefpolicy-3.6.2/policy/modules/kernel/corecommands.fc
 --- nsaserefpolicy/policy/modules/kernel/corecommands.fc	2009-01-05 15:39:38.000000000 -0500
-+++ serefpolicy-3.6.2/policy/modules/kernel/corecommands.fc	2009-01-05 17:54:58.000000000 -0500
++++ serefpolicy-3.6.2/policy/modules/kernel/corecommands.fc	2009-01-16 09:03:35.000000000 -0500
 @@ -130,6 +130,8 @@
  /opt/vmware/workstation/lib/lib/wrapper-gtk24\.sh -- gen_context(system_u:object_r:bin_t,s0)
  ')
@@ -4002,7 +4009,15 @@
  #
  # /usr
  #
-@@ -223,14 +225,15 @@
+@@ -203,6 +205,7 @@
+ /usr/share/hal/device-manager/hal-device-manager -- gen_context(system_u:object_r:bin_t,s0)
+ /usr/share/hal/scripts(/.*)?		gen_context(system_u:object_r:bin_t,s0)
+ /usr/share/mc/extfs/.*		--	gen_context(system_u:object_r:bin_t,s0)
++/usr/share/Modules/init(/.*)?		gen_context(system_u:object_r:bin_t,s0)
+ /usr/share/printconf/util/print\.py --	gen_context(system_u:object_r:bin_t,s0)
+ /usr/share/selinux/devel/policygentool -- gen_context(system_u:object_r:bin_t,s0)
+ /usr/share/turboprint/lib(/.*)?	--	gen_context(system_u:object_r:bin_t,s0)
+@@ -223,14 +226,15 @@
  /usr/lib64/.*/program(/.*)?		gen_context(system_u:object_r:bin_t,s0)
  /usr/lib/bluetooth(/.*)?	--	gen_context(system_u:object_r:bin_t,s0)
  /usr/lib64/bluetooth(/.*)?	--	gen_context(system_u:object_r:bin_t,s0)
@@ -4020,7 +4035,7 @@
  /usr/share/fedora-usermgmt/wrapper --	gen_context(system_u:object_r:bin_t,s0)
  /usr/share/hplip/[^/]*		--	gen_context(system_u:object_r:bin_t,s0)
  /usr/share/hwbrowser/hwbrowser --	gen_context(system_u:object_r:bin_t,s0)
-@@ -293,3 +296,8 @@
+@@ -293,3 +297,8 @@
  ifdef(`distro_suse',`
  /var/lib/samba/bin/.+			gen_context(system_u:object_r:bin_t,s0)
  ')
@@ -7478,7 +7493,7 @@
 +gen_user(xguest_u, user, xguest_r, s0, s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/afs.fc serefpolicy-3.6.2/policy/modules/services/afs.fc
 --- nsaserefpolicy/policy/modules/services/afs.fc	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.6.2/policy/modules/services/afs.fc	2009-01-05 17:54:59.000000000 -0500
++++ serefpolicy-3.6.2/policy/modules/services/afs.fc	2009-01-16 16:06:26.000000000 -0500
 @@ -1,3 +1,6 @@
 +/etc/rc\.d/init\.d/openafs-client	--	gen_context(system_u:object_r:afs_script_exec_t,s0)
 +/etc/rc\.d/init\.d/afs	--	gen_context(system_u:object_r:afs_script_exec_t,s0)
@@ -7502,7 +7517,7 @@
 +/var/cache/afs(/.*)?		gen_context(system_u:object_r:afs_cache_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/afs.if serefpolicy-3.6.2/policy/modules/services/afs.if
 --- nsaserefpolicy/policy/modules/services/afs.if	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.6.2/policy/modules/services/afs.if	2009-01-05 17:54:59.000000000 -0500
++++ serefpolicy-3.6.2/policy/modules/services/afs.if	2009-01-16 16:06:26.000000000 -0500
 @@ -1 +1,110 @@
  ## <summary>Andrew Filesystem server</summary>
 +
@@ -7616,7 +7631,7 @@
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/afs.te serefpolicy-3.6.2/policy/modules/services/afs.te
 --- nsaserefpolicy/policy/modules/services/afs.te	2009-01-05 15:39:43.000000000 -0500
-+++ serefpolicy-3.6.2/policy/modules/services/afs.te	2009-01-05 17:54:59.000000000 -0500
++++ serefpolicy-3.6.2/policy/modules/services/afs.te	2009-01-16 16:06:26.000000000 -0500
 @@ -6,6 +6,16 @@
  # Declarations
  #
@@ -7683,7 +7698,7 @@
 +permissive afs_t;
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.fc serefpolicy-3.6.2/policy/modules/services/apache.fc
 --- nsaserefpolicy/policy/modules/services/apache.fc	2008-11-11 16:13:46.000000000 -0500
-+++ serefpolicy-3.6.2/policy/modules/services/apache.fc	2009-01-05 17:54:59.000000000 -0500
++++ serefpolicy-3.6.2/policy/modules/services/apache.fc	2009-01-16 16:06:26.000000000 -0500
 @@ -1,12 +1,13 @@
 -HOME_DIR/((www)|(web)|(public_html))(/.+)? gen_context(system_u:object_r:httpd_user_content_t,s0)
 +HOME_DIR/((www)|(web)|(public_html)|(public_git))(/.+)? gen_context(system_u:object_r:httpd_user_content_t,s0)
@@ -7768,7 +7783,7 @@
 +/var/www/html/[^/]*/cgi-bin(/.*)?	gen_context(system_u:object_r:httpd_sys_script_exec_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.if serefpolicy-3.6.2/policy/modules/services/apache.if
 --- nsaserefpolicy/policy/modules/services/apache.if	2008-11-11 16:13:47.000000000 -0500
-+++ serefpolicy-3.6.2/policy/modules/services/apache.if	2009-01-05 17:54:59.000000000 -0500
++++ serefpolicy-3.6.2/policy/modules/services/apache.if	2009-01-16 16:06:26.000000000 -0500
 @@ -13,21 +13,16 @@
  #
  template(`apache_content_template',`
@@ -8302,7 +8317,7 @@
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.te serefpolicy-3.6.2/policy/modules/services/apache.te
 --- nsaserefpolicy/policy/modules/services/apache.te	2008-11-11 16:13:46.000000000 -0500
-+++ serefpolicy-3.6.2/policy/modules/services/apache.te	2009-01-13 09:27:31.000000000 -0500
++++ serefpolicy-3.6.2/policy/modules/services/apache.te	2009-01-16 16:06:26.000000000 -0500
 @@ -19,6 +19,8 @@
  # Declarations
  #
@@ -8975,7 +8990,7 @@
 +typealias httpd_var_run_t         alias httpd_fastcgi_var_run_t;
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/automount.te serefpolicy-3.6.2/policy/modules/services/automount.te
 --- nsaserefpolicy/policy/modules/services/automount.te	2009-01-05 15:39:43.000000000 -0500
-+++ serefpolicy-3.6.2/policy/modules/services/automount.te	2009-01-05 17:54:59.000000000 -0500
++++ serefpolicy-3.6.2/policy/modules/services/automount.te	2009-01-16 16:06:26.000000000 -0500
 @@ -71,6 +71,7 @@
  files_mounton_all_mountpoints(automount_t)
  files_mount_all_file_type_fs(automount_t)
@@ -9011,7 +9026,7 @@
  ')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/avahi.if serefpolicy-3.6.2/policy/modules/services/avahi.if
 --- nsaserefpolicy/policy/modules/services/avahi.if	2008-11-19 11:51:44.000000000 -0500
-+++ serefpolicy-3.6.2/policy/modules/services/avahi.if	2009-01-05 17:54:59.000000000 -0500
++++ serefpolicy-3.6.2/policy/modules/services/avahi.if	2009-01-16 16:06:26.000000000 -0500
 @@ -21,6 +21,25 @@
  
  ########################################
@@ -9065,7 +9080,7 @@
  ## </summary>
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/avahi.te serefpolicy-3.6.2/policy/modules/services/avahi.te
 --- nsaserefpolicy/policy/modules/services/avahi.te	2009-01-05 15:39:43.000000000 -0500
-+++ serefpolicy-3.6.2/policy/modules/services/avahi.te	2009-01-05 17:54:59.000000000 -0500
++++ serefpolicy-3.6.2/policy/modules/services/avahi.te	2009-01-16 16:06:26.000000000 -0500
 @@ -33,6 +33,7 @@
  allow avahi_t self:tcp_socket create_stream_socket_perms;
  allow avahi_t self:udp_socket create_socket_perms;
@@ -9084,7 +9099,7 @@
  optional_policy(`
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bind.fc serefpolicy-3.6.2/policy/modules/services/bind.fc
 --- nsaserefpolicy/policy/modules/services/bind.fc	2009-01-05 15:39:43.000000000 -0500
-+++ serefpolicy-3.6.2/policy/modules/services/bind.fc	2009-01-07 15:44:12.000000000 -0500
++++ serefpolicy-3.6.2/policy/modules/services/bind.fc	2009-01-16 16:06:26.000000000 -0500
 @@ -1,17 +1,22 @@
  /etc/rc\.d/init\.d/named --	gen_context(system_u:object_r:named_initrc_exec_t,s0)
[...1707 lines suppressed...]
@@ -20529,7 +20649,7 @@
  allow tor_t self:netlink_route_socket r_netlink_socket_perms;
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ulogd.fc serefpolicy-3.6.2/policy/modules/services/ulogd.fc
 --- nsaserefpolicy/policy/modules/services/ulogd.fc	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.2/policy/modules/services/ulogd.fc	2009-01-05 17:54:59.000000000 -0500
++++ serefpolicy-3.6.2/policy/modules/services/ulogd.fc	2009-01-16 16:06:27.000000000 -0500
 @@ -0,0 +1,10 @@
 +
 +/etc/rc\.d/init\.d/ulogd                --              gen_context(system_u:object_r:ulogd_initrc_exec_t,s0)
@@ -20543,7 +20663,7 @@
 +/var/log/ulogd(/.*)?					gen_context(system_u:object_r:ulogd_var_log_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ulogd.if serefpolicy-3.6.2/policy/modules/services/ulogd.if
 --- nsaserefpolicy/policy/modules/services/ulogd.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.2/policy/modules/services/ulogd.if	2009-01-05 17:54:59.000000000 -0500
++++ serefpolicy-3.6.2/policy/modules/services/ulogd.if	2009-01-16 16:06:27.000000000 -0500
 @@ -0,0 +1,127 @@
 +## <summary>policy for ulogd</summary>
 +
@@ -20674,7 +20794,7 @@
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ulogd.te serefpolicy-3.6.2/policy/modules/services/ulogd.te
 --- nsaserefpolicy/policy/modules/services/ulogd.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.2/policy/modules/services/ulogd.te	2009-01-05 17:54:59.000000000 -0500
++++ serefpolicy-3.6.2/policy/modules/services/ulogd.te	2009-01-16 16:06:27.000000000 -0500
 @@ -0,0 +1,51 @@
 +policy_module(ulogd,1.0.0)
 +
@@ -20729,7 +20849,7 @@
 +permissive ulogd_t;
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/uucp.fc serefpolicy-3.6.2/policy/modules/services/uucp.fc
 --- nsaserefpolicy/policy/modules/services/uucp.fc	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.6.2/policy/modules/services/uucp.fc	2009-01-13 09:34:09.000000000 -0500
++++ serefpolicy-3.6.2/policy/modules/services/uucp.fc	2009-01-16 16:06:27.000000000 -0500
 @@ -7,3 +7,5 @@
  /var/spool/uucppublic(/.*)?	gen_context(system_u:object_r:uucpd_spool_t,s0)
  
@@ -20738,7 +20858,7 @@
 +/var/lock/uucp(/.*)?		gen_context(system_u:object_r:uucpd_lock_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/uucp.te serefpolicy-3.6.2/policy/modules/services/uucp.te
 --- nsaserefpolicy/policy/modules/services/uucp.te	2009-01-05 15:39:43.000000000 -0500
-+++ serefpolicy-3.6.2/policy/modules/services/uucp.te	2009-01-13 09:35:13.000000000 -0500
++++ serefpolicy-3.6.2/policy/modules/services/uucp.te	2009-01-16 16:06:27.000000000 -0500
 @@ -10,6 +10,9 @@
  inetd_tcp_service_domain(uucpd_t, uucpd_exec_t)
  role system_r types uucpd_t;
@@ -20770,7 +20890,7 @@
  optional_policy(`
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/virt.te serefpolicy-3.6.2/policy/modules/services/virt.te
 --- nsaserefpolicy/policy/modules/services/virt.te	2009-01-05 15:39:43.000000000 -0500
-+++ serefpolicy-3.6.2/policy/modules/services/virt.te	2009-01-05 17:54:59.000000000 -0500
++++ serefpolicy-3.6.2/policy/modules/services/virt.te	2009-01-16 16:06:27.000000000 -0500
 @@ -96,7 +96,7 @@
  corenet_tcp_sendrecv_all_nodes(virtd_t)
  corenet_tcp_sendrecv_all_ports(virtd_t)
@@ -20812,7 +20932,7 @@
  optional_policy(`
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/w3c.te serefpolicy-3.6.2/policy/modules/services/w3c.te
 --- nsaserefpolicy/policy/modules/services/w3c.te	2008-08-25 09:12:31.000000000 -0400
-+++ serefpolicy-3.6.2/policy/modules/services/w3c.te	2009-01-05 17:54:59.000000000 -0500
++++ serefpolicy-3.6.2/policy/modules/services/w3c.te	2009-01-16 16:06:27.000000000 -0500
 @@ -8,11 +8,18 @@
  
  apache_content_template(w3c_validator)
@@ -20834,7 +20954,7 @@
  corenet_tcp_connect_http_port(httpd_w3c_validator_script_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.fc serefpolicy-3.6.2/policy/modules/services/xserver.fc
 --- nsaserefpolicy/policy/modules/services/xserver.fc	2009-01-05 15:39:43.000000000 -0500
-+++ serefpolicy-3.6.2/policy/modules/services/xserver.fc	2009-01-05 17:54:59.000000000 -0500
++++ serefpolicy-3.6.2/policy/modules/services/xserver.fc	2009-01-16 16:06:27.000000000 -0500
 @@ -3,11 +3,14 @@
  #
  HOME_DIR/\.fonts\.conf	--	gen_context(system_u:object_r:user_fonts_config_t,s0)
@@ -20901,7 +21021,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.6.2/policy/modules/services/xserver.if
 --- nsaserefpolicy/policy/modules/services/xserver.if	2009-01-05 15:39:43.000000000 -0500
-+++ serefpolicy-3.6.2/policy/modules/services/xserver.if	2009-01-12 14:24:38.000000000 -0500
++++ serefpolicy-3.6.2/policy/modules/services/xserver.if	2009-01-16 16:06:27.000000000 -0500
 @@ -156,7 +156,7 @@
  	allow $1 xserver_t:process signal;
  
@@ -21309,7 +21429,7 @@
  ##	display.
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.te serefpolicy-3.6.2/policy/modules/services/xserver.te
 --- nsaserefpolicy/policy/modules/services/xserver.te	2009-01-05 15:39:43.000000000 -0500
-+++ serefpolicy-3.6.2/policy/modules/services/xserver.te	2009-01-05 17:54:59.000000000 -0500
++++ serefpolicy-3.6.2/policy/modules/services/xserver.te	2009-01-16 16:06:27.000000000 -0500
 @@ -34,6 +34,13 @@
  
  ## <desc>
@@ -21680,7 +21800,7 @@
  
  optional_policy(`
 +	polkit_domtrans_auth(xdm_t)
-+	polkit_read_lib(xdm_t)
++	polkit_read_reload(xdm_t)
 +')
 +
 +# On crash gdm execs gdb to dump stack
@@ -21849,13 +21969,13 @@
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/zosremote.fc serefpolicy-3.6.2/policy/modules/services/zosremote.fc
 --- nsaserefpolicy/policy/modules/services/zosremote.fc	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.2/policy/modules/services/zosremote.fc	2009-01-05 17:54:59.000000000 -0500
++++ serefpolicy-3.6.2/policy/modules/services/zosremote.fc	2009-01-16 16:06:27.000000000 -0500
 @@ -0,0 +1,2 @@
 +
 +/sbin/audispd-zos-remote	--	gen_context(system_u:object_r:zos_remote_exec_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/zosremote.if serefpolicy-3.6.2/policy/modules/services/zosremote.if
 --- nsaserefpolicy/policy/modules/services/zosremote.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.2/policy/modules/services/zosremote.if	2009-01-05 17:54:59.000000000 -0500
++++ serefpolicy-3.6.2/policy/modules/services/zosremote.if	2009-01-16 16:06:27.000000000 -0500
 @@ -0,0 +1,46 @@
 +## <summary>policy for z/OS Remote-services Audit dispatcher plugin</summary>
 +
@@ -21905,7 +22025,7 @@
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/zosremote.te serefpolicy-3.6.2/policy/modules/services/zosremote.te
 --- nsaserefpolicy/policy/modules/services/zosremote.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.2/policy/modules/services/zosremote.te	2009-01-05 17:54:59.000000000 -0500
++++ serefpolicy-3.6.2/policy/modules/services/zosremote.te	2009-01-16 16:06:27.000000000 -0500
 @@ -0,0 +1,33 @@
 +policy_module(zosremote,1.0.0)
 +
@@ -21987,7 +22107,7 @@
 +/var/cache/coolkey(/.*)?	gen_context(system_u:object_r:auth_cache_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/authlogin.if serefpolicy-3.6.2/policy/modules/system/authlogin.if
 --- nsaserefpolicy/policy/modules/system/authlogin.if	2008-11-11 16:13:48.000000000 -0500
-+++ serefpolicy-3.6.2/policy/modules/system/authlogin.if	2009-01-05 17:54:59.000000000 -0500
++++ serefpolicy-3.6.2/policy/modules/system/authlogin.if	2009-01-16 10:23:40.000000000 -0500
 @@ -43,6 +43,7 @@
  interface(`auth_login_pgm_domain',`
  	gen_require(`
@@ -23439,7 +23559,7 @@
  ########################################
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/logging.te serefpolicy-3.6.2/policy/modules/system/logging.te
 --- nsaserefpolicy/policy/modules/system/logging.te	2009-01-05 15:39:43.000000000 -0500
-+++ serefpolicy-3.6.2/policy/modules/system/logging.te	2009-01-05 17:54:59.000000000 -0500
++++ serefpolicy-3.6.2/policy/modules/system/logging.te	2009-01-16 14:54:05.000000000 -0500
 @@ -126,7 +126,7 @@
  allow auditd_t self:process { signal_perms setpgid setsched };
  allow auditd_t self:file rw_file_perms;
@@ -23463,14 +23583,22 @@
  #
  
 -allow audisp_t self:capability sys_nice;
-+allow audisp_t self:capability { dac_override sys_nice };
- allow audisp_t self:process setsched;
+-allow audisp_t self:process setsched;
 -allow audisp_t self:fifo_file rw_file_perms;
++allow audisp_t self:capability { dac_override sys_nice };
++allow audisp_t self:process { signal_perms setsched };
 +allow audisp_t self:fifo_file rw_fifo_file_perms;
  allow audisp_t self:unix_stream_socket create_stream_socket_perms;
  allow audisp_t self:unix_dgram_socket create_socket_perms;
  
-@@ -231,9 +233,12 @@
+@@ -226,20 +228,32 @@
+ manage_sock_files_pattern(audisp_t, audisp_var_run_t, audisp_var_run_t)
+ files_pid_filetrans(audisp_t, audisp_var_run_t, sock_file)
+ 
+-corecmd_search_bin(audisp_t)
++corecmd_exec_bin(audisp_t)
++corecmd_exec_shell(audisp_t)
+ 
  domain_use_interactive_fds(audisp_t)
  
  files_read_etc_files(audisp_t)
@@ -23483,7 +23611,21 @@
  logging_send_syslog_msg(audisp_t)
  
  miscfiles_read_localization(audisp_t)
-@@ -253,11 +258,16 @@
+ 
+ sysnet_dns_name_resolve(audisp_t)
+ 
++optional_policy(`
++	dbus_system_bus_client(audisp_t)
++
++	optional_policy(`
++		setroubleshoot_dbus_chat(audisp_t)
++	')
++')
++
+ ########################################
+ #
+ # Audit remote logger local policy
+@@ -253,11 +267,16 @@
  corenet_tcp_sendrecv_all_nodes(audisp_remote_t)
  corenet_tcp_connect_audit_port(audisp_remote_t)
  corenet_sendrecv_audit_client_packets(audisp_remote_t)
@@ -23500,7 +23642,7 @@
  miscfiles_read_localization(audisp_remote_t)
  
  sysnet_dns_name_resolve(audisp_remote_t)
-@@ -337,7 +347,7 @@
+@@ -337,7 +356,7 @@
  allow syslogd_t self:unix_dgram_socket create_socket_perms;
  allow syslogd_t self:unix_stream_socket create_stream_socket_perms;
  allow syslogd_t self:unix_dgram_socket sendto;


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.765
retrieving revision 1.766
diff -u -r1.765 -r1.766
--- selinux-policy.spec	13 Jan 2009 16:22:47 -0000	1.765
+++ selinux-policy.spec	16 Jan 2009 21:11:58 -0000	1.766
@@ -20,7 +20,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.6.2
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -445,6 +445,9 @@
 %endif
 
 %changelog
+* Thu Jan 15 2009 Dan Walsh <dwalsh at redhat.com> 3.6.2-5
+- Define openoffice as an x_domain
+
 * Mon Jan 12 2009 Dan Walsh <dwalsh at redhat.com> 3.6.2-4
 - Fixes for reading xserver_tmp_t
 



From pfj at fedoraproject.org  Fri Jan 16 21:14:02 2009
From: pfj at fedoraproject.org (Paul F. Johnson)
Date: Fri, 16 Jan 2009 21:14:02 +0000 (UTC)
Subject: rpms/libgdiplus/F-10 .cvsignore, 1.17, 1.18 import.log, 1.4,
	1.5 libgdiplus.spec, 1.33, 1.34 sources, 1.20, 1.21
Message-ID: <20090116211402.EF69170127@cvs1.fedora.phx.redhat.com>

Author: pfj

Update of /cvs/pkgs/rpms/libgdiplus/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3028/F-10

Modified Files:
	.cvsignore import.log libgdiplus.spec sources 
Log Message:

Bump to 2.2 release 



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libgdiplus/F-10/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- .cvsignore	26 Aug 2008 09:56:17 -0000	1.17
+++ .cvsignore	16 Jan 2009 21:13:32 -0000	1.18
@@ -1 +1 @@
-libgdiplus-2.0.tar.bz2
+libgdiplus-2.2.tar.bz2


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/libgdiplus/F-10/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- import.log	2 Oct 2008 23:34:28 -0000	1.4
+++ import.log	16 Jan 2009 21:13:32 -0000	1.5
@@ -2,3 +2,4 @@
 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
 libgdiplus-2_0-4_fc10:HEAD:libgdiplus-2.0-4.fc10.src.rpm:1222990439
+libgdiplus-2_2-1_fc11:F-10:libgdiplus-2.2-1.fc11.src.rpm:1232140376


Index: libgdiplus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libgdiplus/F-10/libgdiplus.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- libgdiplus.spec	2 Oct 2008 23:34:28 -0000	1.33
+++ libgdiplus.spec	16 Jan 2009 21:13:32 -0000	1.34
@@ -1,12 +1,12 @@
 Name:           libgdiplus
-Version:        2.0
-Release:        4%{?dist}
+Version:        2.2
+Release:        1%{?dist}
 Summary:        libgdiplus: An Open Source implementation of the GDI+ API
 
 Group:          System Environment/Libraries
 License:        MIT
 URL:            http://www.mono-project.com/
-Source0:        %{name}-%{version}.tar.bz2
+Source0:        http://ftp.novell.com/pub/mono/sources-stable/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  freetype-devel glib2-devel libjpeg-devel libtiff-devel
@@ -35,13 +35,13 @@
 make %{?_smp_mflags} 
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
+rm -rf %{buildroot}
+make install DESTDIR=%{buildroot}
 
-rm $RPM_BUILD_ROOT%{_libdir}/*.la
+rm %{buildroot}%{_libdir}/*.la
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 %post -p /sbin/ldconfig
 
@@ -59,6 +59,13 @@
 %{_libdir}/lib*.so
 
 %changelog
+* Fri Jan 16 2009 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.2-1
+- Update to 2.2
+- Multitude of fixes over 2.0 release
+
+* Sat Oct 18 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.0-5
+- fix the long standing symlink problem
+
 * Fri Oct 03 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.0-4
 - Bump to RC4
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libgdiplus/F-10/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources	2 Oct 2008 23:34:28 -0000	1.20
+++ sources	16 Jan 2009 21:13:32 -0000	1.21
@@ -1 +1 @@
-dc732fb2d996b54405c27645cb8642d9  libgdiplus-2.0.tar.bz2
+4af9c8171e75f1408c3628a8f7937d9f  libgdiplus-2.2.tar.bz2



From nim at fedoraproject.org  Fri Jan 16 21:14:13 2009
From: nim at fedoraproject.org (Nicolas Mailhot)
Date: Fri, 16 Jan 2009 21:14:13 +0000 (UTC)
Subject: rpms/ecolier-court-fonts/devel ecolier-court-fonts.spec, 1.3,
	1.4 import.log, 1.3, 1.4
Message-ID: <20090116211413.D029870127@cvs1.fedora.phx.redhat.com>

Author: nim

Update of /cvs/extras/rpms/ecolier-court-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3100/devel

Modified Files:
	ecolier-court-fonts.spec import.log 
Log Message:
update for new naming guidelines


Index: ecolier-court-fonts.spec
===================================================================
RCS file: /cvs/extras/rpms/ecolier-court-fonts/devel/ecolier-court-fonts.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ecolier-court-fonts.spec	17 Dec 2008 20:00:39 -0000	1.3
+++ ecolier-court-fonts.spec	16 Jan 2009 21:13:43 -0000	1.4
@@ -11,8 +11,8 @@
 
 Name:    %{fontname}-fonts
 Version: 20070702
-Release: 5%{?dist}
-Summary: ??colier court cursive fonts
+Release: 6%{?dist}
+Summary: Schoolchildren cursive fonts
 
 Group:     User Interface/X
 License:   OFL
@@ -37,7 +37,7 @@
 
 
 %package common
-Summary:  ??colier court, common files (documentation???)
+Summary:  Common files of the ??colier Court font set
 Group:    User Interface/X
 Requires: fontpackages-filesystem
 
@@ -47,16 +47,16 @@
 This package consists of files used by other %{name} packages.
 
 
-%package  lignes
-Summary:  ??colier lignes court fantasy font
+%package -n %{fontname}-lignes-fonts
+Summary:  Schoolchildren cursive fonts with lines
 Group:    User Interface/X
 Requires: %{name}-common = %{version}-%{release}
 
-%description lignes
+%description -n %{fontname}-lignes-fonts
 %common_desc
 
-The ?? lignes ?? (lines) font variant includes the Seyes lining commonly used by
-schoolchildren notepads.
+The ?? lignes ?? (lines) ??colier court font variant includes the Seyes lining
+commonly used by schoolchildren notepads.
 
 %_font_pkg -n lignes -f %{fontconf}.conf ec_cour.ttf
 
@@ -91,10 +91,10 @@
 install -m 0644 -p %{SOURCE5} \
         %{buildroot}%{_fontconfig_templatedir}/%{fontconf}-lignes.conf
 
-for fontconf in %{fontconf}.conf \
-                %{fontconf}-lignes.conf ; do
-  ln -s %{_fontconfig_templatedir}/$fontconf \
-        %{buildroot}%{_fontconfig_confdir}/$fontconf
+for fconf in %{fontconf}.conf \
+             %{fontconf}-lignes.conf ; do
+  ln -s %{_fontconfig_templatedir}/$fconf \
+        %{buildroot}%{_fontconfig_confdir}/$fconf
 done
 
 %clean
@@ -109,6 +109,10 @@
 
 
 %changelog
+* Fri Jan 16 2009 <nicolas.mailhot at laposte.net>
+- 20070702-6
+??? Convert to new naming guidelines
+
 * Wed Dec 17 2008 <nicolas.mailhot at laposte.net>
 - 20070702-5
 ??? Workaround RHEL5 rpm unicode bug to fix koji build


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/ecolier-court-fonts/devel/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- import.log	17 Dec 2008 20:00:39 -0000	1.3
+++ import.log	16 Jan 2009 21:13:43 -0000	1.4
@@ -1,3 +1,4 @@
 ecolier-court-fonts-20070702-1_fc10:HEAD:ecolier-court-fonts-20070702-1.fc10.src.rpm:1216485467
 ecolier-court-fonts-20070702-4_fc11:HEAD:ecolier-court-fonts-20070702-4.fc11.src.rpm:1229541673
 ecolier-court-fonts-20070702-5_fc11:HEAD:ecolier-court-fonts-20070702-5.fc11.src.rpm:1229543899
+ecolier-court-fonts-20070702-6_fc11:HEAD:ecolier-court-fonts-20070702-6.fc11.src.rpm:1232140382



From steve at fedoraproject.org  Fri Jan 16 21:14:28 2009
From: steve at fedoraproject.org (Steven Pritchard)
Date: Fri, 16 Jan 2009 21:14:28 +0000 (UTC)
Subject: rpms/cpanspec/F-10 .cvsignore, 1.21, 1.22 cpanspec.spec, 1.26,
	1.27 sources, 1.21, 1.22
Message-ID: <20090116211428.1B5A970127@cvs1.fedora.phx.redhat.com>

Author: steve

Update of /cvs/pkgs/rpms/cpanspec/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3136

Modified Files:
	.cvsignore cpanspec.spec sources 
Log Message:
Update to 1.78.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cpanspec/F-10/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- .cvsignore	16 Jun 2008 19:30:18 -0000	1.21
+++ .cvsignore	16 Jan 2009 21:13:57 -0000	1.22
@@ -1 +1 @@
-cpanspec-1.77.tar.gz
+cpanspec-1.78.tar.gz


Index: cpanspec.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cpanspec/F-10/cpanspec.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- cpanspec.spec	16 Jun 2008 19:30:18 -0000	1.26
+++ cpanspec.spec	16 Jan 2009 21:13:57 -0000	1.27
@@ -1,5 +1,5 @@
 Name:           cpanspec
-Version:        1.77
+Version:        1.78
 Release:        1%{?dist}
 Summary:        RPM spec file generation utility
 License:        GPL+ or Artistic
@@ -53,6 +53,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Fri Jan 16 2009 Steven Pritchard <steve at kspei.com> 1.78-1
+- Update to 1.78.
+
 * Mon Jun 16 2008 Steven Pritchard <steve at kspei.com> 1.77-1
 - Update to 1.77.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cpanspec/F-10/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sources	16 Jun 2008 19:30:18 -0000	1.21
+++ sources	16 Jan 2009 21:13:57 -0000	1.22
@@ -1 +1 @@
-89cea6ee4671989aebdbbd8e6a685319  cpanspec-1.77.tar.gz
+d2cb7aba4aface3cc24064baba7b2675  cpanspec-1.78.tar.gz



From steve at fedoraproject.org  Fri Jan 16 21:15:36 2009
From: steve at fedoraproject.org (Steven Pritchard)
Date: Fri, 16 Jan 2009 21:15:36 +0000 (UTC)
Subject: rpms/cpanspec/F-9 .cvsignore, 1.21, 1.22 cpanspec.spec, 1.24,
	1.25 sources, 1.21, 1.22
Message-ID: <20090116211536.A489A70127@cvs1.fedora.phx.redhat.com>

Author: steve

Update of /cvs/pkgs/rpms/cpanspec/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3614

Modified Files:
	.cvsignore cpanspec.spec sources 
Log Message:
Update to 1.78.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cpanspec/F-9/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- .cvsignore	16 Jun 2008 19:31:23 -0000	1.21
+++ .cvsignore	16 Jan 2009 21:15:06 -0000	1.22
@@ -1 +1 @@
-cpanspec-1.77.tar.gz
+cpanspec-1.78.tar.gz


Index: cpanspec.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cpanspec/F-9/cpanspec.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- cpanspec.spec	16 Jun 2008 19:31:23 -0000	1.24
+++ cpanspec.spec	16 Jan 2009 21:15:06 -0000	1.25
@@ -1,5 +1,5 @@
 Name:           cpanspec
-Version:        1.77
+Version:        1.78
 Release:        1%{?dist}
 Summary:        RPM spec file generation utility
 License:        GPL+ or Artistic
@@ -53,6 +53,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Fri Jan 16 2009 Steven Pritchard <steve at kspei.com> 1.78-1
+- Update to 1.78.
+
 * Mon Jun 16 2008 Steven Pritchard <steve at kspei.com> 1.77-1
 - Update to 1.77.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cpanspec/F-9/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sources	16 Jun 2008 19:31:23 -0000	1.21
+++ sources	16 Jan 2009 21:15:06 -0000	1.22
@@ -1 +1 @@
-89cea6ee4671989aebdbbd8e6a685319  cpanspec-1.77.tar.gz
+d2cb7aba4aface3cc24064baba7b2675  cpanspec-1.78.tar.gz



From pfj at fedoraproject.org  Fri Jan 16 21:18:07 2009
From: pfj at fedoraproject.org (Paul F. Johnson)
Date: Fri, 16 Jan 2009 21:18:07 +0000 (UTC)
Subject: rpms/mono/F-10 mono-2.2-ppc-threading.patch, NONE,
	1.1 mono-2.2-uselibdir.patch, NONE, 1.1 mono-22-libdir.patch,
	NONE, 1.1 mono-22-libgdiwinform.patch, NONE, 1.1 .cvsignore,
	1.22, 1.23 import.log, 1.11, 1.12 mono-libdir-126.patch, 1.2,
	1.3 mono.spec, 1.85, 1.86 sources, 1.26,
	1.27 mono-2.0-BinarySerialization.patch, 1.1,
	NONE mono-2.0-DataTable.patch, 1.1,
	NONE mono-2.0-StringReplace.patch, 1.1,
	NONE mono-2.0-mimeicon.patch, 1.1, NONE mono-2.0-pcfiles.patch,
	1.3, NONE mono-2.0-ppc-threading.patch, 1.1,
	NONE mono-2.0-tablelayout.patch, 1.1,
	NONE mono-2.0-uselibdir.patch, 1.1,
	NONE mono-big-integer-CVE-2007-5197.patch, 1.1,
	NONE mono-mcs-config.patch, 1.3, NONE
Message-ID: <20090116211807.C282A70127@cvs1.fedora.phx.redhat.com>

Author: pfj

Update of /cvs/pkgs/rpms/mono/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4071/F-10

Modified Files:
	.cvsignore import.log mono-libdir-126.patch mono.spec sources 
Added Files:
	mono-2.2-ppc-threading.patch mono-2.2-uselibdir.patch 
	mono-22-libdir.patch mono-22-libgdiwinform.patch 
Removed Files:
	mono-2.0-BinarySerialization.patch mono-2.0-DataTable.patch 
	mono-2.0-StringReplace.patch mono-2.0-mimeicon.patch 
	mono-2.0-pcfiles.patch mono-2.0-ppc-threading.patch 
	mono-2.0-tablelayout.patch mono-2.0-uselibdir.patch 
	mono-big-integer-CVE-2007-5197.patch mono-mcs-config.patch 
Log Message:

Bump to 2.2 release
Add fix for System.WinForms so that libgdiplus-devel isn't needed
Massive number of fixes
It's all good!!! 


mono-2.2-ppc-threading.patch:

--- NEW FILE mono-2.2-ppc-threading.patch ---
--- mono-2.2/mono/mini/main.c	2008-11-18 19:00:26.000000000 +0000
+++ mono-2.2/mono/mini/main-new.c	2008-11-18 19:16:11.000000000 +0000
@@ -26,10 +26,14 @@
 }
 
 #else
-
+#include <sched.h>
 int
 main (int argc, char* argv[])
 {
+#ifdef __powerpc__
+  unsigned long mask = 1;
+  sched_setaffinity(0, sizeof(mask), &mask);
+#endif
 	mono_build_date = build_date;
 	return mono_main (argc, argv);
 }

mono-2.2-uselibdir.patch:

--- NEW FILE mono-2.2-uselibdir.patch ---
--- mono-2.0/mcs/class/Microsoft.Build.Utilities/Mono.XBuild.Utilities/MonoLocationHelper.cs	2008-08-03 07:58:47.000000000 +0100
+++ mono-2.0/mcs/class/Microsoft.Build.Utilities/Mono.XBuild.Utilities/MonoLocationHelper-new.cs	2008-08-03 08:06:47.000000000 +0100
@@ -53,10 +53,10 @@
 			//xbuildDir = Path.Combine (t2.FullName, "xbuild");
 			// /usr/local/lib
 			t3 = t2.Parent;
+			libDir = t3.FullName;
 			// /usr/local
 			t4 = t3.Parent;
 			binDir = Path.Combine (t4.FullName, "bin");
-			libDir = Path.Combine (t4.FullName, "lib");
 		}
 	
 		internal static string GetBinDir ()


mono-22-libdir.patch:

--- NEW FILE mono-22-libdir.patch ---
--- mono-1.2.6/mcs/build/config-default.make	2007-11-08 22:08:59.000000000 +0000
+++ mono-1.2.6/mcs/build/config-default-new.make	2007-12-14 22:25:20.000000000 +0000
@@ -17,7 +17,7 @@
 CFLAGS = -g -O2
 prefix = /usr/local
 exec_prefix = $(prefix)
-mono_libdir = $(exec_prefix)/lib
+mono_libdir = $(libdir)
 sysconfdir = $(prefix)/etc
 #RUNTIME = mono
 RUNTIME = false
--- mono-1.2.6/configure.in	2007-11-08 22:07:57.000000000 +0000
+++ mono-1.2.6/configure-new.in	2007-12-14 22:56:17.000000000 +0000
@@ -2182,7 +2182,7 @@
     echo "prefix=$prefix" > $srcdir/$mcsdir/build/config.make
     echo "exec_prefix=$exec_prefix" >> $srcdir/$mcsdir/build/config.make
     echo "sysconfdir=$sysconfdir" >> $srcdir/$mcsdir/build/config.make
-    echo 'mono_libdir=${exec_prefix}/lib' >> $srcdir/$mcsdir/build/config.make
+    echo 'mono_libdir=@libdir@' >> $srcdir/$mcsdir/build/config.make
     echo 'MCS_FLAGS = $(PLATFORM_DEBUG_FLAGS)' >> $srcdir/$mcsdir/build/config.make
     echo 'IL_FLAGS = /debug' >> $srcdir/$mcsdir/build/config.make
     echo "RUNTIME = $mono_build_root/runtime/mono-wrapper" >> $srcdir/$mcsdir/build/config.make
@@ -2215,7 +2215,7 @@
     if test x$cross_compiling = xno && test x$enable_olive_build != xno; then
       echo "prefix=$prefix" > $srcdir/$olivedir/build/config.make
       echo "exec_prefix=$exec_prefix" >> $srcdir/$olivedir/build/config.make
-      echo 'mono_libdir=${exec_prefix}/lib' >> $srcdir/$olivedir/build/config.make
+      echo 'mono_libdir=@libdir@' >> $srcdir/$olivedir/build/config.make
       echo 'MCS_FLAGS = $(PLATFORM_DEBUG_FLAGS)' >> $srcdir/$olivedir/build/config.make
       echo "RUNTIME = $mono_build_root/runtime/mono-wrapper" >> $srcdir/$olivedir/build/config.make
       echo "MONO_VERSION = $myver" >> $srcdir/$olivedir/build/config.make
--- mono-2.2/data/cecil.pc.in	2008-11-18 21:10:32.000000000 +0000
+++ mono-2.2/data/cecil.pc-new.in	2008-11-18 21:12:20.000000000 +0000
@@ -1,4 +1,4 @@
-assemblies_dir=@prefix@/lib/mono
+assemblies_dir=@libdir@/mono
 Libraries=${assemblies_dir}/gac/Mono.Cecil/0.6.9.0__0738eb9f132ed756/Mono.Cecil.dll
 
 Name: Mono Internal -- Do not use.
--- mono-2.2/data/mint.pc.in	2008-11-18 21:10:32.000000000 +0000
+++ mono-2.2/data/mint.pc-new.in	2008-11-18 21:12:55.000000000 +0000
@@ -1,6 +1,6 @@
 prefix=${pcfiledir}/../..
 exec_prefix=${pcfiledir}/../..
-libdir=${prefix}/lib
+libdir=@libdir@
 includedir=${prefix}/include/mono- at API_VER@
 
 
--- mono-2.2/data/mono-cairo.pc.in	2008-11-18 21:10:32.000000000 +0000
+++ mono-2.2/data/mono-cairo.pc-new.in	2008-11-18 21:13:30.000000000 +0000
@@ -1,6 +1,6 @@
 prefix=${pcfiledir}/../..
 exec_prefix=${pcfiledir}/../..
-libdir=${prefix}/@reloc_libdir@
+libdir=@libdir@
 includedir=${prefix}/include
 
 Name: Mono.Cairo

--- mono-2.2/data/mono-lineeditor.pc.in	2008-11-11 04:56:15.000000000 +0000
+++ mono-2.2/data/mono-lineeditor.pc-new.in	2008-11-18 21:14:18.000000000 +0000
@@ -1,5 +1,5 @@
 prefix=${pcfiledir}/../..
-assemblies_dir=${prefix}/lib/mono-source-libs
+assemblies_dir=@libdir@/mono-source-libs
 Sources=${assemblies_dir}/getline.cs
 
 Name: Mono.Terminal.LineEditor
--- mono-2.2/data/mono-nunit.pc.in	2008-11-11 04:56:15.000000000 +0000
+++ mono-2.2/data/mono-nunit.pc-new.in	2008-11-18 21:14:34.000000000 +0000
@@ -1,6 +1,6 @@
 prefix=${pcfiledir}/../..
 exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
+libdir=@libdir@
 
 
 Name: Mono NUnit
--- mono-2.2/data/mono-options.pc.in	2008-11-11 04:56:15.000000000 +0000
+++ mono-2.2/data/mono-options.pc-new.in	2008-11-18 21:14:49.000000000 +0000
@@ -1,5 +1,5 @@
 prefix=${pcfiledir}/../..
-assemblies_dir=${prefix}/lib/mono-source-libs
+assemblies_dir=@libdir@/mono-source-libs
 Sources=${assemblies_dir}/Options.cs
 
 Name: Mono.Options
--- mono-2.2/data/smcs.pc.in	2008-11-18 21:10:32.000000000 +0000
+++ mono-2.2/data/smcs.pc-new.in	2008-11-18 21:17:54.000000000 +0000
@@ -1,4 +1,4 @@
-assemblies_dir=@prefix@/lib/mono
+assemblies_dir=@libdir@/mono
 Libraries=${assemblies_dir}/2.1/smcs.exe
 
 Name: Mono Internal -- Do not use.

--- mono-2.2/data/monodoc.pc.in	2008-11-13 23:22:27.000000000 +0000
+++ mono-2.2/data/monodoc.pc-new.in	2008-11-26 12:39:50.000000000 +0000
@@ -1,9 +1,9 @@
 prefix=@prefix@
 exec_prefix=@exec_prefix@
-libdir=@prefix@/lib
+libdir=@libdir@
 sourcesdir=${libdir}/monodoc/sources
 
 Name: Monodoc
 Description: Monodoc - Mono Documentation Tools
 Version: @VERSION@
-Libs: /r:${prefix}/lib/mono/monodoc/monodoc.dll 
+Libs: /r:${libdir}/mono/monodoc/monodoc.dll 
--- mono-2.2/data/mono.pc.in	2008-09-10 17:12:13.000000000 +0100
+++ mono-2.2/data/mono.pc-new.in	2008-11-26 12:47:07.000000000 +0000
@@ -1,6 +1,6 @@
 prefix=${pcfiledir}/../..
 exec_prefix=${pcfiledir}/../..
-libdir=${prefix}/@reloc_libdir@
+libdir=@libdir@
 includedir=${prefix}/include/mono- at API_VER@
 sysconfdir=@sysconfdir@

--- mono-2.2/scripts/Makefile.am	2008-11-18 19:19:30.000000000 +0000
+++ mono-2.2/scripts/Makefile-new.am	2008-11-18 21:00:50.000000000 +0000
@@ -174,7 +174,7 @@
 endif
 else
 plat_bindir = $(bindir)
-mono_instdir = $(prefix)/lib/mono
+mono_instdir = $(libdir)/mono
 endif
 
 

mono-22-libgdiwinform.patch:

--- NEW FILE mono-22-libgdiwinform.patch ---
--- mono-2.2/data/config.in	2008-11-30 19:34:24.000000000 +0000
+++ mono-2.2/data/config-new.in	2008-12-02 23:57:51.000000000 +0000
@@ -15,6 +15,7 @@
 	<dllmap dll="i:msvcrt.dll" target="@LIBC@" os="!windows"/>
 	<dllmap dll="sqlite" target="@SQLITE@" os="!windows"/>
 	<dllmap dll="sqlite3" target="@SQLITE3@" os="!windows"/>
+	<dllmap dll="gdiplus.dll" target="libgdiplus.so.0" os="linux"/>
 	<dllmap dll="libX11" target="@X11@" os="!windows" />
 	<dllmap dll="libcairo-2.dll" target="libcairo.so.2" os="!windows"/>
 	<dllmap dll="i:kernel32.dll">


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mono/F-10/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- .cvsignore	25 Oct 2008 08:35:58 -0000	1.22
+++ .cvsignore	16 Jan 2009 21:17:36 -0000	1.23
@@ -1 +1 @@
-mono-2.0.1.tar.bz2
+mono-2.2.tar.bz2


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/mono/F-10/import.log,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- import.log	2 Nov 2008 21:03:08 -0000	1.11
+++ import.log	16 Jan 2009 21:17:36 -0000	1.12
@@ -9,3 +9,4 @@
 mono-2_0-11_1_fc10:HEAD:mono-2.0-11.1.fc10.src.rpm:1224372920
 mono-2_0_1-12_fc10:HEAD:mono-2.0.1-12.fc10.src.rpm:1224923536
 mono-2_0_1-13_fc10:HEAD:mono-2.0.1-13.fc10.src.rpm:1225659728
+mono-2_2-1_fc11:F-10:mono-2.2-1.fc11.src.rpm:1232140558

mono-libdir-126.patch:

Index: mono-libdir-126.patch
===================================================================
RCS file: /cvs/pkgs/rpms/mono/F-10/mono-libdir-126.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mono-libdir-126.patch	14 Aug 2008 13:06:25 -0000	1.2
+++ mono-libdir-126.patch	16 Jan 2009 21:17:37 -0000	1.3
@@ -1,32 +1,3 @@
- 
-Index: mono-1.1.16/scripts/Makefile.am
-===================================================================
---- mono-1.1.16.orig/scripts/Makefile.am
-+++ mono-1.1.16/scripts/Makefile.am
-@@ -80,7 +80,7 @@ plat_bindir = $(shell cygpath -m $(libdi
- mono_instdir = $(shell cygpath -m $(libdir))/mono
- else
- plat_bindir = $(bindir)
--mono_instdir = $(prefix)/lib/mono
-+mono_instdir = $(libdir)/mono
- endif
- 
- REWRITE_COMMON = sed \
-Index: mono-1.1.16/scripts/mono-nunit.pc.in
-===================================================================
---- mono-1.1.16.orig/scripts/mono-nunit.pc.in
-+++ mono-1.1.16/scripts/mono-nunit.pc.in
-@@ -1,6 +1,6 @@
- prefix=${pcfiledir}/../..
- exec_prefix=${prefix}
--libdir=${exec_prefix}/lib
-+libdir=${exec_prefix}/@reloc_libdir@
- 
- 
- Name: Mono NUnit
-
-
-
 Index: mono-1.1.16/mcs/tools/cilc/res-Makefile
 ===================================================================
 --- mono-1.1.16.orig/mcs/tools/cilc/res-Makefile


Index: mono.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mono/F-10/mono.spec,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -r1.85 -r1.86
--- mono.spec	2 Nov 2008 21:03:08 -0000	1.85
+++ mono.spec	16 Jan 2009 21:17:37 -0000	1.86
@@ -1,12 +1,12 @@
 Name:		mono
-Version:        2.0.1
-Release:        13%{?dist}
+Version:        2.2
+Release:        1%{?dist}
 Summary:        A .NET runtime environment
 
 Group:          Development/Languages
 License:        MIT
-URL:            http://go-mono.com/sources-stable/%{name}-%{version}.tar.bz2
-Source0:        %{name}-%{version}.tar.bz2
+URL:		http://ftp.novell.com/pub/mono/sources-stable/
+Source0:        http://ftp.novell.com/pub/mono/sources-stable/%{name}-%{version}.tar.bz2
 Source1:	monodir.c
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -14,40 +14,34 @@
 BuildRequires:  glib2-devel
 BuildRequires:  pkgconfig
 BuildRequires:  libicu-devel
-BuildRequires:  libgdiplus-devel >= 2.0
+BuildRequires:  libgdiplus-devel >= 2.2
 BuildRequires:  zlib-devel
 %ifarch ia64
 BuildRequires:  libunwind
 BuildRequires:  libunwind-devel
 %endif
 # Required for mono-libdir.patch
-BuildRequires: automake libtool
+BuildRequires: automake libtool gettext-devel
+Obsoletes:     monodoc, monodoc-devel
 
 # Yes, mono actually depends on itself, because
 # we deleted the bootstrapping binaries. If you
 # need to bootstrap mono, comment out this BuildRequires
 # and don't delete the binaries in %%prep.
+
 BuildRequires: mono-core
 
 # JIT only availible on these:
-ExclusiveArch: %ix86 x86_64 ppc ia64 armv4l sparc alpha s390 s390x
-# Disabled due to strange build failure:
-# s390 s390x
-
-Patch2: mono-2.0-ppc-threading.patch
-Patch3: mono-libdir-126.patch
-Patch4: mono-1.2.3-use-monodir.patch
-Patch5: mono-big-integer-CVE-2007-5197.patch
-Patch8: mono-mcs-config.patch
-Patch7: mono-2.0-pcfiles.patch
-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
-Patch12: mono-2.0-mimeicon.patch
-Patch13: mono-2.0-BinarySerialization.patch
-Patch14: mono-2.0-DataTable.patch
-Patch15: mono-2.0-StringReplace.patch
+ExclusiveArch: %ix86 x86_64 ia64 armv4l sparc alpha s390 s390x ppc
+
+Patch0: mono-2.2-ppc-threading.patch
+Patch1: mono-libdir-126.patch
+Patch2: mono-1.2.3-use-monodir.patch
+Patch3: mono-2.2-uselibdir.patch
+Patch4: mono-2.0-monoservice.patch
+Patch5: mono-2.0-metadata-makefile.patch
+Patch6: mono-22-libgdiwinform.patch
+Patch7: mono-22-libdir.patch
 
 %description
 The Mono runtime implements a JIT engine for the ECMA CLI
@@ -111,8 +105,6 @@
 This package contains assemblies to support I18N applications for
 non-latin alphabets.
 
-# The above seems safe
-
 %package jscript
 Summary:        JScript .NET support for Mono
 Group:          Development/Languages
@@ -137,7 +129,7 @@
 %package winforms
 Summary:        Windows Forms implementation for Mono
 Group:          Development/Languages
-Requires:       mono-core = %{version}-%{release}, libgdiplus-devel
+Requires:       mono-core = %{version}-%{release}
 
 %description winforms
 This package provides a fully managed implementation of
@@ -212,7 +204,6 @@
 This package contains the ADO.NET Data provider for the Firebird
 database.
 
-# This uses the upstream package name, don't know why its not mono-data-*
 %package -n ibm-data-db2
 Summary:        IBM DB2 database connectivity for Mono
 Group:          Development/Languages
@@ -222,7 +213,6 @@
 This package contains the ADO.NET Data provider for the IBM DB2
 Universal database.
 
-# This uses the upstream package name, don't know why its not mono-data-*
 %package -n bytefx-data-mysql
 Summary:        MySQL database connectivity for Mono
 Group:          Development/Languages
@@ -233,6 +223,23 @@
 no longer maintained. MySQL AB now provides MySQL Connector/Net
 which is fully managed and actively maintained.
 
+%package -n monodoc
+Summary:	The mono documentation system
+Group:		Documentation
+Requires:	mono-core = %{version}-%{release}
+
+%description -n monodoc
+monodoc is the documentation package for the mono .NET environment
+
+%package -n monodoc-devel
+Summary: .pc file for monodoc
+Group: Documentation
+Requires: monodoc = %{version}-%{release} pkgconfig
+Requires: mono-core = %{version}-%{release}
+
+%description -n monodoc-devel
+Development file for monodoc
+
 %define monodir %{_libdir}/mono
 %define gac_dll(dll)  %{monodir}/gac/%{1} \
   %{monodir}/?.0/%{1}.dll \
@@ -252,23 +259,19 @@
 
 %prep
 %setup -q
-sed -i -e 's!@@LIBDIR@@!%{_libdir}!' %{PATCH8}
-%patch8 -p1 -b .config
-sed -i -e 's!%{_libdir}!@@LIBDIR@@!' %{PATCH8}
-%patch2 -p1 -b .ppc-threading
-%patch3 -p1 -b .libdir
-%patch4 -p1 -b .use-monodir
-%patch6 -p1 -b .use-libdir
+
+%patch0 -p1 -b .ppc-threading
+%patch1 -p1 -b .libdir
+%patch2 -p1 -b .usemonodir
+%patch3 -p1 -b .uselibdir
+%patch4 -p1 -b .monoservice
+%patch5 -p1 -b .metadata-makefile
+%patch6 -p1 -b .libgdiplus
 sed -i -e 's!@libdir@!%{_libdir}!' %{PATCH7}
-%patch7 -p1 -b .pc-patches
+%patch7 -p1 -b .libdir-22
 sed -i -e 's!%{_libdir}!@libdir@!' %{PATCH7}
-%patch9 -p1 -b .monoservice
-%patch10 -p1 -b .metadata
-%patch11 -p1 -b .tablelayout
-%patch12 -p1 -b .mimeicon
-%patch13 -p1 -b .serialisation
-%patch14 -p1 -b .datatable
-%patch15 -p1 -b .stringreplace
+sed -i -e 's!$(prefix)/lib/!%{_libdir}/!' docs/Makefile.{am,in}
+
 autoreconf -f -i -s
 
 # Add undeclared Arg
@@ -283,7 +286,6 @@
 %else
 export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
 %endif
-#autoreconf -f -i -s
 
 gcc -o monodir %{SOURCE1} -DMONODIR=\"%{_libdir}/mono\"
 
@@ -292,36 +294,35 @@
 
 
 %install
-%{__rm} -rf $RPM_BUILD_ROOT
-make DESTDIR=$RPM_BUILD_ROOT install
-install monodir $RPM_BUILD_ROOT%{_bindir}
+%{__rm} -rf %{buildroot}
+make DESTDIR=%{buildroot} install
+install monodir %{buildroot}%{_bindir}
 
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/*.la
+%{__rm} %{buildroot}%{_libdir}/*.la
 
 # We put these inside rpm
-%{__rm} $RPM_BUILD_ROOT%{_bindir}/mono-find-provides
-%{__rm} $RPM_BUILD_ROOT%{_bindir}/mono-find-requires
+%{__rm} %{buildroot}%{_bindir}/mono-find-provides
+%{__rm} %{buildroot}%{_bindir}/mono-find-requires
 
 # This was removed upstream:
-%{__rm} -fr $RPM_BUILD_ROOT%{monodir}/gac/Mono.Security.Win32/[12]*
-%{__rm} -rf $RPM_BUILD_ROOT%{monodir}/1.0/Mono.Security.Win32.dll
-%{__rm} -rf $RPM_BUILD_ROOT%{monodir}/2.0/Mono.Security.Win32.dll
-%{__rm} $RPM_BUILD_ROOT%{_datadir}/libgc-mono/README*
-%{__rm} $RPM_BUILD_ROOT%{_datadir}/libgc-mono/barrett_diagram
-%{__rm} $RPM_BUILD_ROOT%{_datadir}/libgc-mono/*.html
-%{__rm} $RPM_BUILD_ROOT%{_datadir}/libgc-mono/gc.man
-%{__rm} $RPM_BUILD_ROOT/%_bindir/jay
-%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/jay
-%{__rm} $RPM_BUILD_ROOT%{_mandir}/man1/jay.1
-%{__rm} $RPM_BUILD_ROOT%{_mandir}/man1/monostyle.1
-%{__rm} $RPM_BUILD_ROOT%{_mandir}/man1/oldmono.1
-%{__rm} $RPM_BUILD_ROOT%{_mandir}/man1/mint.1
-%{__rm} $RPM_BUILD_ROOT%{monodir}/1.0/CorCompare.exe
-%{__rm} $RPM_BUILD_ROOT%{monodir}/1.0/browsercaps-updater.exe*
-#%{__rm} $RPM_BUILD_ROOT%{monodir}/1.0/mono-api-diff.exe
-#%{__rm} $RPM_BUILD_ROOT%{monodir}/*/mono-api-info.exe
-%{__rm} $RPM_BUILD_ROOT/%_bindir/smcs
-%{__rm} $RPM_BUILD_ROOT/%_libdir/pkgconfig/smcs.pc
+%{__rm} -fr %{buildroot}%{monodir}/gac/Mono.Security.Win32/[12]*
+%{__rm} -rf %{buildroot}%{monodir}/1.0/Mono.Security.Win32.dll
+%{__rm} -rf %{buildroot}%{monodir}/2.0/Mono.Security.Win32.dll
+%{__rm} %{buildroot}%{_datadir}/libgc-mono/README*
+%{__rm} %{buildroot}%{_datadir}/libgc-mono/barrett_diagram
+%{__rm} %{buildroot}%{_datadir}/libgc-mono/*.html
+%{__rm} %{buildroot}%{_datadir}/libgc-mono/gc.man
+%{__rm} %{buildroot}/%_bindir/jay
+%{__rm} -r %{buildroot}%{_datadir}/jay
+%{__rm} %{buildroot}%{_mandir}/man1/jay.1
+%{__rm} %{buildroot}%{_mandir}/man1/monostyle.1
+%{__rm} %{buildroot}%{_mandir}/man1/oldmono.1
+%{__rm} %{buildroot}%{_mandir}/man1/mint.1
+%{__rm} %{buildroot}%{monodir}/1.0/browsercaps-updater.exe*
+%{__rm} %{buildroot}/%_bindir/smcs
+%{__rm} %{buildroot}/%_libdir/pkgconfig/smcs.pc
+
+%find_lang mcs
 
 %post -p /sbin/ldconfig
 
@@ -332,15 +333,18 @@
 %postun devel -p /sbin/ldconfig
 
 %clean
-%{__rm} -rf $RPM_BUILD_ROOT
+%{__rm} -rf %{buildroot}
 
-%files core
+%files core -f mcs.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING.LIB ChangeLog NEWS README
 %{_bindir}/mono
 %{_bindir}/monodir
 %{_bindir}/mono-api-*
-%{monodir}/1.0/mono-api-diff*
+%mono_bin csharp
+%{_bindir}/gacutil1
+%mono_bin mod
+%mono_bin mono-cil-strip
 %{monodir}/?.0/mono-api-info*
 %{_bindir}/mono-test-install
 %{_bindir}/gacutil2
@@ -356,13 +360,15 @@
 %mono_bin sn
 %mono_bin installvst
 %mono_bin monolinker
-%{monodir}/1.0/transform.exe
 %{monodir}/?.0/installutil.*
 %{monodir}/3.5/System.Web.Extensions*
 %{monodir}/2.0/System.Xml.Linq.dll
 %{_bindir}/mkbundle2
 %{_libdir}/libmono.so.*
 %{_libdir}/libmono-profiler-logging.so.*
+%{_libdir}/mono/1.0/CorCompare.exe
+%{_libdir}/mono/1.0/mono-api-diff.exe
+%{_libdir}/mono/1.0/transform.exe
 %{_mandir}/man1/certmgr.1.gz
 %{_mandir}/man1/chktrust.1.gz
 %{_mandir}/man1/gacutil.1.gz
@@ -371,11 +377,14 @@
 %{_mandir}/man1/mozroots.1.gz
 %{_mandir}/man1/setreg.1.gz
 %{_mandir}/man1/sn.1.gz
-%{_mandir}/man1/vbnc.1.gz
 %{_mandir}/man1/monolinker.1.gz
 %{_mandir}/man1/resgen.1.gz
 %{_mandir}/man1/mconfig.1.gz
 %{_mandir}/man5/mono-config.5.gz
+%{_mandir}/man1/csharp.1.gz
+%{_mandir}/man1/mono-cil-strip.1.gz
+%{_mandir}/man1/monoburg.1.gz
+%{_mandir}/man1/vbnc.1.gz
 %{_libdir}/libMonoPosixHelper.so
 %dir %{monodir}
 %dir %{monodir}/1.0
@@ -403,6 +412,13 @@
 %gac_dll System.Security
 %gac_dll System.Xml
 %gac_dll System.Core
+%gac_dll Mono.CSharp
+%gac_dll Mono.Management
+%gac_dll Mono.Simd
+%gac_dll System.ComponentModel.DataAnnotations
+%gac_dll System.IdentityModel.Selectors
+%gac_dll System.IdentityModel
+%gac_dll System.Runtime.Serialization
 %gac_dll cscompmgd
 %gac_dll CustomMarshalers
 %gac_dll OpenSystem.C
@@ -418,7 +434,7 @@
 %config (noreplace) %{_sysconfdir}/mono/2.0/machine.config
 %config (noreplace) %{_sysconfdir}/mono/mconfig/config.xml
 %config (noreplace) %{_sysconfdir}/mono/2.0/settings.map
-
+%{_libdir}/mono-source-libs/
 
 %files devel
 %defattr(-,root,root,-)
@@ -476,7 +492,6 @@
 %{_mandir}/man1/secutil.1.gz
 %{_mandir}/man1/sgen.1.gz
 %{_mandir}/man1/signcode.1.gz
-%{_mandir}/man1/monoburg.*
 %gac_dll PEAPI
 %gac_dll Microsoft.Build.Engine
 %gac_dll Microsoft.Build.Framework
@@ -499,6 +514,9 @@
 %{_libdir}/pkgconfig/mono.pc
 %{_libdir}/pkgconfig/cecil.pc
 %{_libdir}/pkgconfig/dotnet35.pc
+%{_libdir}/pkgconfig/mono-lineeditor.pc
+%{_libdir}/pkgconfig/mono-options.pc
+%{_libdir}/pkgconfig/wcf.pc
 %{_includedir}/mono-1.0
 %{_datadir}/mono-1.0/mono/cil/cil-opcodes.xml
 %dir %{_datadir}/mono-1.0
@@ -508,7 +526,6 @@
 
 %files nunit
 %defattr(-,root,root,-)
-%doc mcs/nunit20/license.rtf mcs/nunit20/README
 %mono_bin_1 nunit-console nunit-console
 %mono_bin_2 nunit-console2 nunit-console
 %gac_dll nunit.core
@@ -541,6 +558,7 @@
 %gac_dll System.Management
 %gac_dll System.Messaging
 %gac_dll System.ServiceProcess
+%gac_dll System.ServiceModel
 %gac_dll System.Configuration.Install
 %gac_dll Microsoft.Vsa
 
@@ -559,6 +577,11 @@
 %gac_dll System.Runtime.Remoting
 %gac_dll System.Web
 %gac_dll System.Runtime.Serialization.Formatters.Soap
+%{monodir}/compat-2.0/System.Web.Extensions*dll
+%gac_dll System.ServiceModel.Web
+%gac_dll System.Web.Abstractions
+%gac_dll System.Web.DynamicData
+%gac_dll System.Web.Routing
 %gac_dll System.Web.Services
 %gac_dll System.Web.Extensions.Design
 %gac_dll System.Web.Extensions
@@ -625,7 +648,32 @@
 %defattr(-,root,root,-)
 %gac_dll IBM.Data.DB2
 
+%files -n monodoc
+%defattr(-, root, root)
+%{_libdir}/mono/gac/monodoc
+%{_libdir}/monodoc/*
+%{_libdir}/mono/monodoc/monodoc.dll
+%mono_bin mdoc
+%{_bindir}/mdoc-*
+%{_bindir}/mdass*
+%{_bindir}/mdval*
+%{_bindir}/mod
+%{_bindir}/monodoc*
+%{_mandir}/man1/md*
+%{_mandir}/man1/monodoc*
+%{_mandir}/man5/mdoc*
+
+%files -n monodoc-devel
+%defattr (-, root, root)
+%{_libdir}/pkgconfig/monodoc.pc
+
 %changelog
+* Fri Jan 16 2009 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.2-1
+- Bump to 2.2 release
+- Huge number of changes since 2.01
+- Fix now included so winforms no longer has circular dep
+- Obsoletes monodoc
+
 * Sun Nov 02 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.0.13
 - Add in mono-api-diff and mono-api-info
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mono/F-10/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- sources	25 Oct 2008 08:35:58 -0000	1.26
+++ sources	16 Jan 2009 21:17:37 -0000	1.27
@@ -1 +1 @@
-60ab4d1d1990826578891e90cd560fa0  mono-2.0.1.tar.bz2
+a311545a0003f1a599297d57e4e27916  mono-2.2.tar.bz2


--- mono-2.0-BinarySerialization.patch DELETED ---


--- mono-2.0-DataTable.patch DELETED ---


--- mono-2.0-StringReplace.patch DELETED ---


--- mono-2.0-mimeicon.patch DELETED ---


--- mono-2.0-pcfiles.patch DELETED ---


--- mono-2.0-ppc-threading.patch DELETED ---


--- mono-2.0-tablelayout.patch DELETED ---


--- mono-2.0-uselibdir.patch DELETED ---


--- mono-big-integer-CVE-2007-5197.patch DELETED ---


--- mono-mcs-config.patch DELETED ---



From pfj at fedoraproject.org  Fri Jan 16 21:21:23 2009
From: pfj at fedoraproject.org (Paul F. Johnson)
Date: Fri, 16 Jan 2009 21:21:23 +0000 (UTC)
Subject: rpms/mod_mono/F-10 .cvsignore, 1.7, 1.8 import.log, 1.5,
	1.6 mod_mono-2.0-varrun.patch, 1.1, 1.2 mod_mono.spec, 1.14,
	1.15 sources, 1.7, 1.8
Message-ID: <20090116212123.984DF70127@cvs1.fedora.phx.redhat.com>

Author: pfj

Update of /cvs/pkgs/rpms/mod_mono/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4594/F-10

Modified Files:
	.cvsignore import.log mod_mono-2.0-varrun.patch mod_mono.spec 
	sources 
Log Message:

Bump to 2.2 release 



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mod_mono/F-10/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	26 Aug 2008 12:08:49 -0000	1.7
+++ .cvsignore	16 Jan 2009 21:20:52 -0000	1.8
@@ -1 +1 @@
-mod_mono-2.0.tar.bz2
+mod_mono-2.2.tar.bz2


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/mod_mono/F-10/import.log,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- import.log	11 Oct 2008 21:36:07 -0000	1.5
+++ import.log	16 Jan 2009 21:20:53 -0000	1.6
@@ -3,3 +3,4 @@
 mod_mono-2_0-4_fc10:HEAD:mod_mono-2.0-4.fc10.src.rpm:1222992078
 mod_mono-2_0-5_fc10:HEAD:mod_mono-2.0-5.fc10.src.rpm:1223678042
 mod_mono-2_0-6_fc10:HEAD:mod_mono-2.0-6.fc10.src.rpm:1223760866
+mod_mono-2_2-1_fc11:F-10:mod_mono-2.2-1.fc11.src.rpm:1232140733

mod_mono-2.0-varrun.patch:

Index: mod_mono-2.0-varrun.patch
===================================================================
RCS file: /cvs/pkgs/rpms/mod_mono/F-10/mod_mono-2.0-varrun.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mod_mono-2.0-varrun.patch	11 Oct 2008 21:36:07 -0000	1.1
+++ mod_mono-2.0-varrun.patch	16 Jan 2009 21:20:53 -0000	1.2
@@ -5,15 +5,15 @@
  
  #define MODMONO_SERVER_PATH 	MONO_PREFIX "/bin/mod-mono-server"
 -#define WAPIDIR				"/tmp"
-+#define WAPIDIR				"/var/run"
++#define WAPIDIR				"/var/run/mod_mono"
  #define DOCUMENT_ROOT		NULL
  #define APPCONFIG_FILE		NULL
  #define APPCONFIG_DIR		NULL
 -#define SOCKET_FILE		"/tmp/mod_mono_server"
-+#define SOCKET_FILE		"/var/run/mod_mono_server"
++#define SOCKET_FILE		"/var/run/mod_mono/mod_mono_server"
  #define LISTEN_ADDRESS		"127.0.0.1"
 -#define DASHBOARD_FILE "/tmp/mod_mono_dashboard"
-+#define DASHBOARD_FILE "/var/run/mod_mono_dashboard"
++#define DASHBOARD_FILE "/var/run/mod_mono/mod_mono_dashboard"
  
  #ifndef DEFAULT_RESTART_REQUESTS
  #define DEFAULT_RESTART_REQUESTS 10000


Index: mod_mono.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mod_mono/F-10/mod_mono.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- mod_mono.spec	11 Oct 2008 21:36:07 -0000	1.14
+++ mod_mono.spec	16 Jan 2009 21:20:53 -0000	1.15
@@ -1,10 +1,10 @@
 Name: mod_mono
-Version: 2.0
-Release: 6%{?dist}
+Version: 2.2
+Release: 1%{?dist}
 License: MIT
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 URL: http://ftp.novell.com/pub/mono/sources-stable
-Source0: http://ftp.novell.com/pub/mono/sources/%{name}/%{name}-%{version}.tar.bz2
+Source0:  http://ftp.novell.com/pub/mono/sources-stable/%{name}-%{version}.tar.bz2
 BuildRequires: mono-devel >= 2.0, xsp-devel >= 2.0, pkgconfig, httpd-devel apr-devel
 Patch0: mod_mono-2.0-varrun.patch
 Requires: httpd >= 2.2, mono-core, xsp
@@ -20,12 +20,12 @@
 that is installed along with XSP
  
 %prep
-%setup -q
+%setup -q 
 %patch0 -p1 -b .varrun
 
 %build
 %configure --disable-static
-make %{?_smp_mflags}
+make %{?_smp_mflags} 
 
 %install
 rm -rf %{buildroot}
@@ -35,6 +35,8 @@
 mv %{buildroot}%{_sysconfdir}/httpd/conf/mod_mono* %{buildroot}%{_sysconfdir}/httpd/conf.d/
 rm -rf %{buildroot}%{_sysconfdir}/httpd/conf
 
+mkdir -p %{buildroot}/var/run/mod_mono
+
 %post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
@@ -47,9 +49,14 @@
 %doc AUTHORS ChangeLog COPYING NEWS README INSTALL
 %{_libdir}/httpd/modules/mod_mono.so*
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/mod_mono.conf
+%attr(0755,apache,apache) /var/run/mod_mono
 %{_mandir}/man8/mod_mono.8*
 
 %changelog
+* Fri Jan 16 2009 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.2-1
+- Bump to 2.2 release
+- Fix var run patch
+
 * Sat Oct 11 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.0-6
 - use var run instead of tmp
 - added additional Requires


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mod_mono/F-10/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	26 Aug 2008 12:08:49 -0000	1.7
+++ sources	16 Jan 2009 21:20:53 -0000	1.8
@@ -1 +1 @@
-d0e318acc6ca60c4683171043a917304  mod_mono-2.0.tar.bz2
+76903b4b51481d721e76ce39f58d3841  mod_mono-2.2.tar.bz2



From pfj at fedoraproject.org  Fri Jan 16 21:25:17 2009
From: pfj at fedoraproject.org (Paul F. Johnson)
Date: Fri, 16 Jan 2009 21:25:17 +0000 (UTC)
Subject: rpms/mono-basic/F-10 .cvsignore, 1.4, 1.5 import.log, 1.3,
	1.4 mono-basic.patch, 1.1, 1.2 mono-basic.spec, 1.10,
	1.11 sources, 1.6, 1.7
Message-ID: <20090116212517.70E9B70127@cvs1.fedora.phx.redhat.com>

Author: pfj

Update of /cvs/pkgs/rpms/mono-basic/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5239/F-10

Modified Files:
	.cvsignore import.log mono-basic.patch mono-basic.spec sources 
Log Message:

Bump to 2.2 release 



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mono-basic/F-10/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	26 Aug 2008 12:11:38 -0000	1.4
+++ .cvsignore	16 Jan 2009 21:24:46 -0000	1.5
@@ -1 +1 @@
-mono-basic-2.0.tar.bz2
+mono-basic-2.2.tar.bz2


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/mono-basic/F-10/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- import.log	2 Oct 2008 23:55:04 -0000	1.3
+++ import.log	16 Jan 2009 21:24:46 -0000	1.4
@@ -1,3 +1,4 @@
 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
 mono-basic-2_0-4_fc10:HEAD:mono-basic-2.0-4.fc10.src.rpm:1222991671
+mono-basic-2_2-1_fc11:F-10:mono-basic-2.2-1.fc11.src.rpm:1232140996

mono-basic.patch:

Index: mono-basic.patch
===================================================================
RCS file: /cvs/pkgs/rpms/mono-basic/F-10/mono-basic.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mono-basic.patch	8 Jan 2008 09:06:51 -0000	1.1
+++ mono-basic.patch	16 Jan 2009 21:24:46 -0000	1.2
@@ -1,14 +1,3 @@
---- mono-basic-1.2.6/configure	2007-11-08 23:57:52.000000000 +0000
-+++ mono-basic-1.2.6/configure-new	2007-12-20 11:29:06.000000000 +0000
-@@ -18,7 +18,7 @@
- 
- echo "prefix=$prefix" > build/config.make
- echo "exec_prefix=\${prefix}" >> build/config.make
--echo "mono_libdir=\${exec_prefix}/lib" >> build/config.make
-+echo "mono_libdir=\@@LIBDIR@@" >> build/config.make
- echo "MCS_FLAGS=-debug+" >> build/config.make
- echo "RUNTIME=mono" >> build/config.make
- echo "MONO_BASIC_VERSION=$VERSION" >> build/config.make
 --- mono-basic-1.2.6/build/config-default.make	2007-04-20 18:25:48.000000000 +0100
 +++ mono-basic-1.2.6/build/config-default-new.make	2007-12-20 11:29:58.000000000 +0000
 @@ -15,7 +15,7 @@
@@ -25,4 +14,4 @@
 @@ -1,2 +1,2 @@
  #!/bin/sh
 -exec mono --debug $MONO_OPTIONS @prefix@/lib/mono/2.0/vbnc.exe "$@"
-+exec mono --debug $MONO_OPTIONS @@LIBDIR@@/mono/2.0/vbnc.exe "$@"
++exec mono --debug $MONO_OPTIONS @libdir@/mono/2.0/vbnc.exe "$@"


Index: mono-basic.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mono-basic/F-10/mono-basic.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- mono-basic.spec	2 Oct 2008 23:55:04 -0000	1.10
+++ mono-basic.spec	16 Jan 2009 21:24:46 -0000	1.11
@@ -1,22 +1,26 @@
 %define debug_package %{nil}
 
 Name:		mono-basic
-Version:	2.0
-Release:	4%{?dist}
+Version:	2.2
+Release:	1%{?dist}
 Summary:        VisualBasic.NET support for mono
 Group:          Development/Languages
 License:        LGPLv2+
 Patch0:		mono-basic.patch
-URL:            http://www.mono-project.com/
-Source0:        %{name}-%{version}.tar.bz2	
+URL:            http://ftp.novell.com/pub/mono/sources-stable
+Source0:        http://ftp.novell.com/pub/mono/sources-stable/%{name}-%{version}.tar.bz2	
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # Yeah, so this guy isn't self-hosting.
+%ifarch !ppc
 BuildRequires:	mono-basic pkgconfig
-BuildRequires:  mono-devel >= 2.0
+%else
+BuildRequires:	pkgconfig
+%endif
+BuildRequires:  mono-devel >= 2.2
 Requires: 	mono-winforms
 
-ExclusiveArch: %ix86 x86_64 ppc ia64 armv4l sparc alpha
+ExclusiveArch: %ix86 x86_64 ia64 armv4l sparc alpha ppc
 
 %description
 This package contains the Visual Basic .NET compiler and language
@@ -32,11 +36,12 @@
 Development files for mono-basic
 
 %prep
-%setup -q
-sed -i -e 's!@@LIBDIR@@!%{_libdir}!' %{PATCH0}
+%setup -q 
 sed -i -e 's!@libdir@!%{_libdir}!' %{PATCH0}
 %patch0 -p1 -b .original
-sed -i -e 's!%{_libdir}!@@LIBDIR@@!' %{PATCH0} 
+sed -i -e 's!%{_libdir}!@libdir@!' %{PATCH0} 
+sed -i -e 's!$(prefix)/lib/!%{_libdir}/!' build/config-default.make
+sed -i -e 's!${exec_prefix}/lib!%{_libdir}!' configure
 # Get rid of bootstrap binary bits
 
 %build
@@ -74,6 +79,9 @@
 %{_libdir}/pkgconfig/mono-basic.pc
 
 %changelog
+* Fri Jan 16 2009 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.2-1
+- bump to 2.2 release
+
 * Fri Oct 03 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.0-4
 - bump to RC4
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mono-basic/F-10/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	10 Sep 2008 19:33:09 -0000	1.6
+++ sources	16 Jan 2009 21:24:46 -0000	1.7
@@ -1 +1 @@
-781dfff7be75b0ddd5d007c805dc6bc7  mono-basic-2.0.tar.bz2
+167af5330610245e8a14bf451067d452  mono-basic-2.2.tar.bz2



From nim at fedoraproject.org  Fri Jan 16 21:28:02 2009
From: nim at fedoraproject.org (Nicolas Mailhot)
Date: Fri, 16 Jan 2009 21:28:02 +0000 (UTC)
Subject: rpms/stix-fonts/devel import.log,1.2,1.3 stix-fonts.spec,1.5,1.6
Message-ID: <20090116212802.D246D70142@cvs1.fedora.phx.redhat.com>

Author: nim

Update of /cvs/extras/rpms/stix-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5947/devel

Modified Files:
	import.log stix-fonts.spec 
Log Message:
update for new naming guidelines


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/stix-fonts/devel/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	17 Dec 2008 19:58:52 -0000	1.2
+++ import.log	16 Jan 2009 21:27:32 -0000	1.3
@@ -1,2 +1,3 @@
 stix-fonts-0_9-7_fc10:HEAD:stix-fonts-0.9-7.fc10.src.rpm:1215809789
 stix-fonts-0_9-9_fc11:HEAD:stix-fonts-0.9-9.fc11.src.rpm:1229543904
+stix-fonts-0_9-10_fc11:HEAD:stix-fonts-0.9-10.fc11.src.rpm:1232141192


Index: stix-fonts.spec
===================================================================
RCS file: /cvs/extras/rpms/stix-fonts/devel/stix-fonts.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- stix-fonts.spec	17 Dec 2008 19:58:52 -0000	1.5
+++ stix-fonts.spec	16 Jan 2009 21:27:32 -0000	1.6
@@ -11,7 +11,7 @@
 
 Name:    %{fontname}-fonts
 Version: 0.9
-Release: 9%{?dist}
+Release: 10%{?dist}
 Summary: STIX scientific and engineering fonts
 
 Group:     User Interface/X
@@ -37,12 +37,14 @@
 use.
 
 
-%package  pua
+%package -n %{fontname}-pua-fonts
 Summary:  STIX scientific and engineering fonts, PUA glyphs
 Group:    User Interface/X
 Requires: %{name} = %{version}-%{release}
 
-%description pua
+Obsoletes: %{name}-pua < 0.9-10
+
+%description -n %{fontname}-pua-fonts
 %common_desc
 
 This package includes fonts containing glyphs called out from the Unicode
@@ -54,12 +56,14 @@
 %_font_pkg -n pua -f %{fontconf}-pua.conf STIXNonUni*otf
 
 
-%package  integrals
+%package -n %{fontname}-integrals-fonts
 Summary:  STIX scientific and engineering fonts, additional integral glyphs
 Group:    User Interface/X
 Requires: %{name} = %{version}-%{release}
 
-%description integrals
+Obsoletes: %{name}-integrals < 0.9-10
+
+%description -n %{fontname}-integrals-fonts
 %common_desc
 
 This package includes fonts containing additional integrals of various size
@@ -68,12 +72,14 @@
 %_font_pkg -n integrals -f %{fontconf}-integrals.conf STIXInt*.otf
 
 
-%package  sizes
+%package -n %{fontname}-sizes-fonts
 Summary:  STIX scientific and engineering fonts, additional glyph sizes
 Group:    User Interface/X
 Requires: %{name} = %{version}-%{release}
 
-%description sizes
+Obsoletes: %{name}-sizes < 0.9-10
+
+%description -n %{fontname}-sizes-fonts
 %common_desc
 
 This package includes fonts containing glyphs in additional sizes (Mostly
@@ -82,12 +88,14 @@
 %_font_pkg -n sizes -f %{fontconf}-sizes.conf STIXSiz*.otf
 
 
-%package  variants
+%package -n %{fontname}-variants-fonts
 Summary:  STIX scientific and engineering fonts, additional glyph variants
 Group:    User Interface/X
 Requires: %{name} = %{version}-%{release}
 
-%description variants
+Obsoletes: %{name}-variants < 0.9-10
+
+%description -n %{fontname}-variants-fonts
 %common_desc
 
 This package includes fonts containing alternative variants of some glyphs.
@@ -129,13 +137,13 @@
 install -m 0644 -p %{SOURCE6} \
         %{buildroot}%{_fontconfig_templatedir}/%{fontconf}-variants.conf
 
-for fontconf in %{fontconf}.conf \
-                %{fontconf}-pua.conf \
-                %{fontconf}-integrals.conf \
-                %{fontconf}-sizes.conf \
-                %{fontconf}-variants.conf ; do
-  ln -s %{_fontconfig_templatedir}/$fontconf \
-        %{buildroot}%{_fontconfig_confdir}/$fontconf
+for fconf in %{fontconf}.conf \
+             %{fontconf}-pua.conf \
+             %{fontconf}-integrals.conf \
+             %{fontconf}-sizes.conf \
+             %{fontconf}-variants.conf ; do
+  ln -s %{_fontconfig_templatedir}/$fconf \
+        %{buildroot}%{_fontconfig_confdir}/$fconf
 done
 
 
@@ -150,6 +158,10 @@
 
 
 %changelog
+* Fri Jan 16 2009 <nicolas.mailhot at laposte.net>
+- 0.9-10
+??? Convert to new naming guidelines
+
 * Sun Nov 23 2008 <nicolas.mailhot at laposte.net>
 - 0.9-9
 ??? ???rpm-fonts??? renamed to ???fontpackages???



From jjohnstn at fedoraproject.org  Fri Jan 16 21:28:08 2009
From: jjohnstn at fedoraproject.org (Jeff Johnston)
Date: Fri, 16 Jan 2009 21:28:08 +0000 (UTC)
Subject: rpms/eclipse-cdt/F-10 .cvsignore, 1.41, 1.42 eclipse-cdt.spec, 1.116,
	1.117 sources, 1.50, 1.51
Message-ID: <20090116212808.2F4D570127@cvs1.fedora.phx.redhat.com>

Author: jjohnstn

Update of /cvs/extras/rpms/eclipse-cdt/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5874

Modified Files:
	.cvsignore eclipse-cdt.spec sources 
Log Message:

* Fri Jan 16 2009 Jeff Johnston <jjohnstn at redhat.com> 5.0.1-2
- Rebase libhover to 0.1.1 and autotools to 1.0.2.
- Remove patch for 472731 which is already part of rebased autotools sources.




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/eclipse-cdt/F-10/.cvsignore,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- .cvsignore	28 Nov 2008 21:30:05 -0000	1.41
+++ .cvsignore	16 Jan 2009 21:27:37 -0000	1.42
@@ -20,3 +20,5 @@
 eclipse-cdt-fetched-src-autotools-20081106.tar.gz
 eclipse-cdt-fetched-src-libhover-20081106.tar.gz
 eclipse-cdt-fetched-src-CDT_5_0_1.tar.bz2
+eclipse-cdt-fetched-src-autotools-R1_0_2.tar.gz
+eclipse-cdt-fetched-src-libhover-R0_1_1.tar.gz


Index: eclipse-cdt.spec
===================================================================
RCS file: /cvs/extras/rpms/eclipse-cdt/F-10/eclipse-cdt.spec,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -r1.116 -r1.117
--- eclipse-cdt.spec	28 Nov 2008 21:30:05 -0000	1.116
+++ eclipse-cdt.spec	16 Jan 2009 21:27:37 -0000	1.117
@@ -20,7 +20,7 @@
 Summary:        Eclipse C/C++ Development Tools (CDT) plugin
 Name:           eclipse-cdt
 Version:        %{majmin}.%{micro}
-Release:        1%{?dist}
+Release:        2%{?dist}
 License:        EPL and CPL
 Group:          Development/Tools
 URL:            http://www.eclipse.org/cdt
@@ -34,9 +34,9 @@
 Source0: %{name}-fetched-src-CDT_5_0_1.tar.bz2
 Source4: fetch-cdt.sh
 
-Source1: http://sources.redhat.com/eclipse/autotools/eclipse-cdt-fetched-src-autotools-20081106.tar.gz
+Source1: http://sources.redhat.com/eclipse/autotools/eclipse-cdt-fetched-src-autotools-R1_0_2.tar.gz
 
-Source2: http://sources.redhat.com/eclipse/autotools/eclipse-cdt-fetched-src-libhover-20081106.tar.gz
+Source2: http://sources.redhat.com/eclipse/autotools/eclipse-cdt-fetched-src-libhover-R0_1_1.tar.gz
 
 ## The following tarball was generated thusly:
 ##
@@ -97,10 +97,6 @@
 # the .cproject file.  This patch prevents the problem.
 Patch16: %{name}-managedConfigurations-fix.patch
 
-# Patch to autotools project detector code to not assume that ManagedProject
-# exists if project has Managed Nature.
-Patch17: %{name}-bug472731.patch
-
 BuildRequires: eclipse-pde
 BuildRequires: eclipse-mylyn >= 3.0
 %if %{gcj_support}
@@ -231,7 +227,6 @@
 mkdir autotools
 pushd autotools
 tar -xzf %{SOURCE1}
-%patch17
 popd
 
 ## Libhover stuff
@@ -575,6 +570,10 @@
 %endif
 
 %changelog
+* Fri Jan 16 2009 Jeff Johnston <jjohnstn at redhat.com> 5.0.1-2
+- Rebase libhover to 0.1.1 and autotools to 1.0.2.
+- Remove patch for 472731 which is already part of rebased autotools sources.
+
 * Fri Nov 28 2008 Jeff Johnston <jjohnstn at redhat.com> 5.0.1-1
 - Rebase to CDT 5.0.1.
 - Fix bug in autotools project type detection.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/eclipse-cdt/F-10/sources,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- sources	28 Nov 2008 21:30:05 -0000	1.50
+++ sources	16 Jan 2009 21:27:37 -0000	1.51
@@ -1,5 +1,5 @@
 5c470fb0777d27541edbfa31443d91f7  eclipse-cdt-cppunit-20061102.tar.gz
 2d4ae0a2131ba1efc896d981072cc091  eclipse-cdt-target_filter.gif.gz
-7bdfc7cfe88e694903225a858d3442c3  eclipse-cdt-fetched-src-autotools-20081106.tar.gz
-621bd568fed245c8368819692a066be9  eclipse-cdt-fetched-src-libhover-20081106.tar.gz
 f0db116442be6f461611739308535175  eclipse-cdt-fetched-src-CDT_5_0_1.tar.bz2
+80967f045be67d65396ce424ef093719  eclipse-cdt-fetched-src-autotools-R1_0_2.tar.gz
+23c3498e551936980269c83a0051d6b1  eclipse-cdt-fetched-src-libhover-R0_1_1.tar.gz



From pfj at fedoraproject.org  Fri Jan 16 21:29:04 2009
From: pfj at fedoraproject.org (Paul F. Johnson)
Date: Fri, 16 Jan 2009 21:29:04 +0000 (UTC)
Subject: rpms/xsp/F-10 .cvsignore, 1.13, 1.14 import.log, 1.3, 1.4 sources, 
	1.15, 1.16 xsp.spec, 1.25, 1.26 xsp-2.0-configure.patch, 1.1,
	NONE xsp-makes.patch, 1.1, NONE xsp-test-makefile.patch, 1.2, NONE
Message-ID: <20090116212904.C9D4270127@cvs1.fedora.phx.redhat.com>

Author: pfj

Update of /cvs/pkgs/rpms/xsp/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6809/F-10

Modified Files:
	.cvsignore import.log sources xsp.spec 
Removed Files:
	xsp-2.0-configure.patch xsp-makes.patch 
	xsp-test-makefile.patch 
Log Message:

Update to released 2.2 



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xsp/F-10/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	26 Aug 2008 17:44:00 -0000	1.13
+++ .cvsignore	16 Jan 2009 21:28:34 -0000	1.14
@@ -1 +1 @@
-xsp-2.0.tar.bz2
+xsp-2.2.tar.bz2


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/xsp/F-10/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- import.log	3 Oct 2008 00:00:22 -0000	1.3
+++ import.log	16 Jan 2009 21:28:34 -0000	1.4
@@ -1,3 +1,4 @@
 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
 xsp-2_0-4_fc10:HEAD:xsp-2.0-4.fc10.src.rpm:1222991981
+xsp-2_2-1_fc11:F-10:xsp-2.2-1.fc11.src.rpm:1232141271


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xsp/F-10/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	3 Oct 2008 00:00:22 -0000	1.15
+++ sources	16 Jan 2009 21:28:34 -0000	1.16
@@ -1 +1 @@
-098037c10354174c4d4bab5f1a0fd7f6  xsp-2.0.tar.bz2
+09b2c0db8e486efea8d2abda74d93f23  xsp-2.2.tar.bz2


Index: xsp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xsp/F-10/xsp.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- xsp.spec	3 Oct 2008 00:00:22 -0000	1.25
+++ xsp.spec	16 Jan 2009 21:28:34 -0000	1.26
@@ -1,14 +1,12 @@
 Name:     	xsp
-Version: 	2.0
-Release:	4%{?dist}
+Version: 	2.2
+Release:	1%{?dist}
 License:	MIT
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 URL:		http://www.mono-project.com/ASP.NET
-Source0:	http://www.go-mono.com/sources/%{name}/%{name}-%{version}.tar.bz2
-Patch0: xsp-2.0-configure.patch
-Patch1: xsp-makes.patch
-Patch2: xsp-test-makefile.patch
-BuildRequires:	mono-web, mono-data, mono-devel >= 2.0, pkgconfig, autoconf automake mono-data-sqlite mono-nunit-devel
+Source0:	%{name}-%{version}.tar.bz2
+BuildRequires:	mono-web-devel, mono-data, mono-devel >= 2.0, pkgconfig, autoconf automake mono-data-sqlite mono-nunit-devel
+BuildRequires:	mono-jscript, mono-data-oracle
 Requires:	mono-core >= 2.0
 Summary:	A small web server that hosts ASP.NET
 Group:		System Environment/Daemons
@@ -18,7 +16,7 @@
 
 %description
 
-XSP is a standalone web server written in C#  that can be used to run ASP.NET 
+XSP is a standalone web server written in C# that can be used to run ASP.NET 
 applications as well as a set of pages, controls and web services that you can 
 use to experience ASP.NET.
 	  
@@ -40,9 +38,18 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .config
-%patch1 -p1 -b .makes
-%patch2 -p1 -b .test-make
+find . -name Makefile.in -or -name Makefile.am -or -name \*.pc.in \
+       -or -name \*.make -or -name \*.in \
+       | while read f ;
+         do
+
+	   sed -i -e 's!@prefix@/lib!%{_libdir}!' "$f"
+           sed -i -e 's!$(prefix)/lib!%{_libdir}!' "$f" 
+	   sed -i -e 's!$prefix/lib!%{_libdir}!' "$f"
+           sed -i -e 's!${exec_prefix}/lib!%{_libdir}!' "$f" 
+	   sed -i -e 's!$libdir!%{_libdir}!' "$f" ;
+         done
+
 autoreconf
 
 %build
@@ -50,11 +57,11 @@
 make
 
 %install
-rm -rf ${RPM_BUILD_ROOT}
-make DESTDIR=${RPM_BUILD_ROOT} install
+rm -rf %{buildroot}
+make DESTDIR=%{buildroot} install
 
 %clean
-rm -rf ${RPM_BUILD_ROOT}
+rm -rf %{buildroot}
 
 %files
 %defattr(-, root, root,-)
@@ -89,6 +96,9 @@
 %{_libdir}/xsp/test
 
 %changelog
+* Fri Jan 16 2009 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.2-1
+- Update to release version
+
 * Fri Oct 03 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.0-4
 - bump to RC 4
 


--- xsp-2.0-configure.patch DELETED ---


--- xsp-makes.patch DELETED ---


--- xsp-test-makefile.patch DELETED ---



From dwalsh at fedoraproject.org  Fri Jan 16 21:31:52 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Fri, 16 Jan 2009 21:31:52 +0000 (UTC)
Subject: rpms/setroubleshoot/devel .cvsignore, 1.88, 1.89 setroubleshoot.spec,
	1.109, 1.110 sources, 1.99, 1.100
Message-ID: <20090116213152.CAC9E70127@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/setroubleshoot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7434

Modified Files:
	.cvsignore setroubleshoot.spec sources 
Log Message:
* Fri Jan 16 2009 Dan Walsh <dwalsh at redhat.com> - 2.1.1-1
- Switch to C Based applet
- Use dbus for messaging.  Only run setroubleshoot when 



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/setroubleshoot/devel/.cvsignore,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -r1.88 -r1.89
--- .cvsignore	15 Oct 2008 21:33:06 -0000	1.88
+++ .cvsignore	16 Jan 2009 21:31:22 -0000	1.89
@@ -4,3 +4,4 @@
 setroubleshoot-2.0.10.tar.gz
 setroubleshoot-2.0.11.tar.gz
 setroubleshoot-2.0.12.tar.gz
+setroubleshoot-2.1.1.tar.gz


Index: setroubleshoot.spec
===================================================================
RCS file: /cvs/extras/rpms/setroubleshoot/devel/setroubleshoot.spec,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -r1.109 -r1.110
--- setroubleshoot.spec	29 Nov 2008 17:21:11 -0000	1.109
+++ setroubleshoot.spec	16 Jan 2009 21:31:22 -0000	1.110
@@ -1,27 +1,25 @@
 Summary: Helps troubleshoot SELinux problems
 Name: setroubleshoot
-Version: 2.0.12
-Release: 2%{?dist}
+Version: 2.1.1
+Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/System
 URL: https://fedorahosted.org/setroubleshoot
 Source0: %{name}-%{version}.tar.gz
-Source1: setroubleshoot.init
 Source2: setroubleshoot.logrotate
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildArch: noarch
 BuildRequires: perl-XML-Parser
 Requires: %{name}-server = %{version}-%{release} 
 Requires: %{name}-plugins >= 2.0.4
 Requires: pygtk2 >= 2.9.2
-Requires: gnome-python2-gnome, gnome-python2-canvas 
+Requires: gnome-python2-gnome, gnome-python2-canvas
 BuildRequires: desktop-file-utils
 Requires: gnome-python2-gtkhtml2
 Requires: dbus
 Requires: dbus-python
 Requires: libxml2-python
-Requires(post):   /usr/bin/update-desktop-database
-Requires(post):   dbus
+Requires(post): /usr/bin/update-desktop-database
+Requires(post): dbus
 Requires(postun): /usr/bin/update-desktop-database
 Requires(postun): dbus
 Requires: notify-python
@@ -60,6 +58,7 @@
 to user preference. The same tools can be run on existing log files.
 
 %files
+%defattr(-,root,root,-)
 %{pkgguidir}
 %{_sysconfdir}/xdg/autostart/*
 %{_datadir}/applications/*.desktop
@@ -70,6 +69,7 @@
 %{pkgpythondir}/email_dialog.py*
 %{pkgpythondir}/gui_utils.py*
 %{pkgpythondir}/run_cmd.py*
+%{_bindir}/seapplet
 
 %post
 /usr/bin/update-desktop-database %{_datadir}/applications
@@ -92,7 +92,6 @@
 %install 
 rm -rf %{buildroot}
 make DESTDIR=%{buildroot} install
-%{__install} -D -m755 %{SOURCE1} %{buildroot}/etc/rc.d/init.d/%{name}
 %{__install} -D -m644 %{SOURCE2} %{buildroot}%{_sysconfdir}/logrotate.d/%{name}
 desktop-file-install --vendor="" --dir=%{buildroot}%{_datadir}/applications %{buildroot}/%{_datadir}/applications/%{name}.desktop
 touch %{buildroot}%{pkgdatabase}
@@ -108,16 +107,15 @@
 Requires: audit-libs-python >= 1.2.6-3
 Requires: libselinux >= 1.30.15-1
 Requires: pygobject2
-Requires: dbus-python
+Requires: dbus-python 
 Requires: libxml2-python
 Requires: libselinux-python
-Requires: audit-libs-python
+Requires: rpm-python
 
 BuildRequires: intltool gettext python
 
 Requires(post):   /sbin/chkconfig
 Requires(post):   /sbin/service
-
 Requires(preun):  /sbin/chkconfig
 Requires(preun):  /sbin/service
 
@@ -132,23 +130,26 @@
     chown root:root %{pkgdatabase} >/dev/null 2>&1
     chmod 600 %{pkgdatabase} >/dev/null 2>&1
 fi
-/sbin/chkconfig --add %{name}
-/sbin/service %{name} condrestart >/dev/null 2>&1 || :
+/sbin/service auditd reload >/dev/null 2>&1 || :
 
-%preun server
+%postun server
 if [ $1 = 0 ]; then
-    /sbin/service %{name} stop >/dev/null 2>&1
-    /sbin/chkconfig --del %{name} || :
+   /sbin/service auditd reload >/dev/null 2>&1 || :
 fi
 
+%triggerun server -- %{name}-server < 2.1.1
+/sbin/service %{name} stop >/dev/null 2>&1 || :
+chkconfig --del %{name}  || :
+
 %clean 
 rm -rf %{buildroot}
 
 %files server -f %{name}.lang 
 %defattr(-,root,root,-)
 %doc %{pkgdocdir}
-%{_bindir}/*
-%{_sbindir}/*
+%{_bindir}/sealert
+%{_sbindir}/sedispatch
+%{_sbindir}/setroubleshootd
 %dir %attr(0755,root,root) %{pkgconfigdir}
 %dir %attr(0755,root,root) %{pkgpythondir}
 %{pkgpythondir}/Plugin.py*
@@ -173,28 +174,32 @@
 %config %{pkgconfigdir}/%{name}.cfg
 %dir %{pkglogdir}
 %config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
-%config %{_sysconfdir}/dbus-1/system.d/setroubleshootd.conf
+%config %{_sysconfdir}/dbus-1/system.d/org.fedoraproject.Setroubleshootd.conf
 %dir %{pkgrundir}
 %dir %{pkgvardatadir}
 %ghost %attr(0600,root,root) %{pkgdatabase}
 %ghost %attr(0644,root,root) %{pkgvardatadir}/email_alert_recipients
 %{_mandir}/man8/sealert.8.gz
-%attr(0755,root,root) /etc/rc.d/init.d/%{name}
+/etc/audisp/plugins.d/sedispatch.conf
 
 %changelog
+* Fri Jan 16 2009 Dan Walsh <dwalsh at redhat.com> - 2.1.1-1
+- Switch to C Based applet
+- Use dbus for messaging.  Only run setroubleshoot when 
+
 * Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 2.0.12-2
 - Rebuild for Python 2.6
 
 * Wed Oct 15 2008 Dan Walsh <dwalsh at redhat.com> - 2.0.12-1
 - Update to upstream
   - 2008-10-06  Dan Walsh <dwalsh at redhat.com>
-	- remove .png from desktop files
+  - remove .png from desktop files
 
 * 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
+    - 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
@@ -210,14 +215,14 @@
 - 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
-	- separate the fix command into it's own section in formatted alerts
-	- add UI for running the fix command, enable only if there is a single selection
-	  and the selected alert has a fix command
-	- add a config parameters 'run_fix_cmd_enable' to control if fix commands
-	  can be run, defaults to False
-	- Resolve bug #431380: prevent notify popups while setroubleshoot is open
+  - 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
+    - separate the fix command into it's own section in formatted alerts
+    - add UI for running the fix command, enable only if there is a single selection
+      and the selected alert has a fix command
+      - add a config parameters 'run_fix_cmd_enable' to control if fix commands
+      can be run, defaults to False
+      - Resolve bug #431380: prevent notify popups while setroubleshoot is open
 
 * Wed Feb  6 2008 John Dennis <jdennis at redhat.com> - 2.0.5-1
 	- allow sealert -l lookup to accept * wildcard


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/setroubleshoot/devel/sources,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -r1.99 -r1.100
--- sources	15 Oct 2008 21:33:06 -0000	1.99
+++ sources	16 Jan 2009 21:31:22 -0000	1.100
@@ -1 +1 @@
-ac759999f07a51a29746503854890195  setroubleshoot-2.0.12.tar.gz
+f98fc013d1d371bbf043f9ba832b97f6  setroubleshoot-2.1.1.tar.gz



From pfj at fedoraproject.org  Fri Jan 16 21:31:56 2009
From: pfj at fedoraproject.org (Paul F. Johnson)
Date: Fri, 16 Jan 2009 21:31:56 +0000 (UTC)
Subject: rpms/mono-debugger/F-10 monodebugger-2.2-configure.patch, NONE,
	1.1 monodebugger-2.2-makefiles.patch, NONE, 1.1 .cvsignore, 1.6,
	1.7 import.log, 1.3, 1.4 mono-debugger.spec, 1.16, 1.17 sources,
	1.6, 1.7 md-2.0-buildmakefile.patch, 1.1,
	NONE md-2.0-gacutil.patch, 1.3,
	NONE mono-debugger-2.0-use-system-cecil.patch, 1.1,
	NONE monodebug-configure.patch, 1.5, NONE
Message-ID: <20090116213156.466CE70127@cvs1.fedora.phx.redhat.com>

Author: pfj

Update of /cvs/pkgs/rpms/mono-debugger/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7356/F-10

Modified Files:
	.cvsignore import.log mono-debugger.spec sources 
Added Files:
	monodebugger-2.2-configure.patch 
	monodebugger-2.2-makefiles.patch 
Removed Files:
	md-2.0-buildmakefile.patch md-2.0-gacutil.patch 
	mono-debugger-2.0-use-system-cecil.patch 
	monodebug-configure.patch 
Log Message:

Update to 2.2 release 


monodebugger-2.2-configure.patch:

--- NEW FILE monodebugger-2.2-configure.patch ---
--- mono-debugger-2.2/configure.in	2008-11-17 16:45:58.000000000 +0000
+++ mono-debugger-2.2/configure-new.in	2008-11-26 12:15:58.000000000 +0000
@@ -163,7 +163,7 @@
    AC_SUBST(WRAPPER_CFLAGS)
    AC_SUBST(WRAPPER_LIBS)
 
-   GACUTIL_FLAGS='/package $(PACKAGE) /gacdir $(prefix)/lib /root $(DESTDIR)$(prefix)/lib'
+   GACUTIL_FLAGS='/package $(PACKAGE) /gacdir $(libdir) /root $(DESTDIR)$(libdir)'
    AC_PATH_PROG(GACUTIL, gacutil, no)
    if test "x$GACUTIL" = "xno" ; then
       AC_MSG_ERROR([No gacutil tool found])
--- mono-debugger-2.2/mono-debugger.pc.in	2008-08-12 17:19:50.000000000 +0100
+++ mono-debugger-2.2/mono-debugger.pc-new.in	2008-11-26 12:16:26.000000000 +0000
@@ -1,9 +1,9 @@
 prefix=@prefix@
 exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
+libdir=@libdir@
 
 
 Name: Mono.Debugger
 Description: Debugging API for Mono
 Version: @VERSION@
-Libs: -r:${prefix}/lib/mono/mono-debugger/Mono.Debugger.dll
+Libs: -r:${libdir}/mono/mono-debugger/Mono.Debugger.dll

monodebugger-2.2-makefiles.patch:

--- NEW FILE monodebugger-2.2-makefiles.patch ---
--- mono-debugger-2.2/build/Makefile.am	2008-11-13 23:09:27.000000000 +0000
+++ mono-debugger-2.2/build/Makefile-new.am	2008-11-26 12:19:57.000000000 +0000
@@ -1,4 +1,4 @@
-twodir = $(prefix)/lib/mono/2.0
+twodir = $(libdir)/mono/2.0
 
 bin_SCRIPTS = mdb
 
--- mono-debugger-2.2/doc/Makefile.am	2008-08-12 17:19:48.000000000 +0100
+++ mono-debugger-2.2/doc/Makefile-new.am	2008-11-26 12:21:07.000000000 +0000
@@ -1,15 +1,15 @@
 EXTRA_DIST = FAQ.txt \
 	     symbol-lookups.txt debugger.source
 
-sourcesdir = @mono_prefix@/lib/monodoc/sources
+sourcesdir = $(libdir)/monodoc/sources
 
 sources_DATA = debugger.tree debugger.zip debugger.source
 
 debugger.tree debugger.zip: $(srcdir)/api/*/*.xml
-	mono --debug @monodoc_prefix@/lib/monodoc/assembler.exe --ecma $(srcdir)/api -o debugger
+	mono --debug $(libdir)/monodoc/assembler.exe --ecma $(srcdir)/api -o debugger
 
 update:
-	monodocer -assembly:@prefix@/lib/mono/mono-debugger/Mono.Debugger.dll -path:./api -delete -includenonpublic
+	monodocer -assembly:$(libdir)/mono/mono-debugger/Mono.Debugger.dll -path:./api -delete -includenonpublic
 
 dist-hook:
 	find . -name '*.xml' > files


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mono-debugger/F-10/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	26 Aug 2008 12:15:56 -0000	1.6
+++ .cvsignore	16 Jan 2009 21:31:25 -0000	1.7
@@ -1 +1 @@
-mono-debugger-2.0.tar.bz2
+mono-debugger-2.2.tar.bz2


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/mono-debugger/F-10/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- import.log	26 Aug 2008 23:17:30 -0000	1.3
+++ import.log	16 Jan 2009 21:31:25 -0000	1.4
@@ -1,3 +1,4 @@
 mono-debugger-2_0-3_fc10:HEAD:mono-debugger-2.0-3.fc10.src.rpm:1219752908
 mono-debugger-2_0-4_fc10:HEAD:mono-debugger-2.0-4.fc10.src.rpm:1219791256
 mono-debugger-2_0-5_fc10:HEAD:mono-debugger-2.0-5.fc10.src.rpm:1219792595
+mono-debugger-2_2-1_fc11:F-10:mono-debugger-2.2-1.fc11.src.rpm:1232141443


Index: mono-debugger.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mono-debugger/F-10/mono-debugger.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- mono-debugger.spec	26 Aug 2008 23:17:30 -0000	1.16
+++ mono-debugger.spec	16 Jan 2009 21:31:25 -0000	1.17
@@ -1,19 +1,17 @@
 Summary: A debugger for Mono
 Name: mono-debugger
-Version: 2.0
-Release: 5%{?dist}
+Version: 2.2
+Release: 1%{?dist}
 License: MIT
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 URL: http://www.go-mono.com/sources-stable/
-Source0: http://www.go-mono.com/sources-stable/%{name}/%{name}-%{version}.tar.bz2
-Patch0: mono-debugger-2.0-use-system-cecil.patch
-Patch1: md-2.0-gacutil.patch
-Patch2: monodebug-configure.patch
-Patch3: md-2.0-buildmakefile.patch
+Source0: %{name}-%{version}.tar.bz2
+Patch0: monodebugger-2.2-configure.patch
+Patch1: monodebugger-2.2-makefiles.patch
 BuildRequires: readline-devel ncurses-devel libtool
-BuildRequires: mono-devel >= 2.0 mono-nunit
-BuildRequires: mono-nunit-devel autoconf automake
-Requires: mono-core >= 2.0
+BuildRequires: mono-devel >= 2.2 mono-nunit
+BuildRequires: mono-nunit-devel autoconf automake xsp-devel
+Requires: mono-core >= 2.2
 Group: Development/Tools
 ExclusiveArch: %ix86 x86_64 ia64 armv4l sparc alpha
 
@@ -35,24 +33,27 @@
 Development package for mono-debugger
 
 %prep
-%setup -q
+%setup -q 
 rm -rf build/*.dll
-%patch0 -p1 -b .use-system-cecil
-# bit of sed magic...
-sed -i -e 's!@libdir@!%{_libdir}!' %{PATCH1}
-sed -i -e 's!@libdir@!%{_libdir}!' %{PATCH2}
-sed -i -e 's!@libdir@!%{_libdir}!' %{PATCH3}
-%patch1 -p1 -b .original
-%patch2 -p1 -b .configure
-%patch3 -p1 -b .libdir
-sed -i -e 's!%{_libdir}!@libdir@!' %{PATCH1}
-sed -i -e 's!%{_libdir}!@libdir@!' %{PATCH2}
-sed -i -e 's!%{_libdir}!@libdir@!' %{PATCH3}
+# bit of sed magic... - let's see if this works
+#sed -i -e 's!@libdir@!%{_libdir}!' %{PATCH0}
+#sed -i -e 's!@libdir@!%{_libdir}!' %{PATCH1}
+#%patch0 -p1 -b .configure
+#%patch1 -p1 -b .makefiles
+#sed -i -e 's!%{_libdir}!@libdir@!' %{PATCH0}
+#sed -i -e 's!%{_libdir}!@libdir@!' %{PATCH1}
+
+find . -name Makefile.in -or -name Makefile.am -or -name \*.pc.in \
+       | while read f ;
+         do
+           sed -i -e 's!$(prefix)/lib!%{_libdir}!' "$f" 
+           sed -i -e 's!${exec_prefix}/lib!%{_libdir}!' "$f" ;
+         done
 
 # Copy something that we know got built from source.
 # This doesn't end up in the package, though.
 cp %{_libdir}/mono/gac/Mono.Cecil/*/Mono.Cecil.dll build/
-
+autoreconf -f -i -s
 
 %build
 %configure --disable-static --disable-dependency-tracking
@@ -85,6 +86,20 @@
 %{_libdir}/pkgconfig/mono-debugger.pc
 
 %changelog
+* Fri Jan 16 2009 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.2-1
+- bump to 2.2 release
+
+* Fri Oct 03 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.0-8
+- bump to RC4
+- now requires xsp-devel
+
+* Wed Sep 10 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.0-7
+- another configure patch
+- rebuild against Mono 2.0 RC 1
+
+* Wed Aug 27 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.0-6
+- argh!!!! fixed the configure patch file
+
 * Wed Aug 27 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.0-5
 - more patches and actually apply the damned things
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mono-debugger/F-10/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	26 Aug 2008 12:15:56 -0000	1.6
+++ sources	16 Jan 2009 21:31:25 -0000	1.7
@@ -1 +1 @@
-062c8051cce0b32d32a08f5059e884b0  mono-debugger-2.0.tar.bz2
+77dea7ca844e27654c87a33fed8b0a29  mono-debugger-2.2.tar.bz2


--- md-2.0-buildmakefile.patch DELETED ---


--- md-2.0-gacutil.patch DELETED ---


--- mono-debugger-2.0-use-system-cecil.patch DELETED ---


--- monodebug-configure.patch DELETED ---



From jjohnstn at fedoraproject.org  Fri Jan 16 21:32:25 2009
From: jjohnstn at fedoraproject.org (Jeff Johnston)
Date: Fri, 16 Jan 2009 21:32:25 +0000 (UTC)
Subject: rpms/eclipse-cdt/devel .cvsignore, 1.41, 1.42 eclipse-cdt.spec,
	1.116, 
	1.117 sources, 1.50, 1.51 eclipse-cdt-bug472731.patch, 1.1, NONE
Message-ID: <20090116213225.1390C70127@cvs1.fedora.phx.redhat.com>

Author: jjohnstn

Update of /cvs/extras/rpms/eclipse-cdt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7556

Modified Files:
	.cvsignore eclipse-cdt.spec sources 
Removed Files:
	eclipse-cdt-bug472731.patch 
Log Message:

* Fri Jan 16 2009 Jeff Johnston <jjohnstn at redhat.com> 5.0.1-2
- Rebase libhover to 0.1.1 and autotools to 1.0.2.
- Remove patch for 472731 which is already part of rebased autotools sources.




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/eclipse-cdt/devel/.cvsignore,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- .cvsignore	28 Nov 2008 21:40:05 -0000	1.41
+++ .cvsignore	16 Jan 2009 21:31:54 -0000	1.42
@@ -20,3 +20,5 @@
 eclipse-cdt-fetched-src-autotools-20081106.tar.gz
 eclipse-cdt-fetched-src-libhover-20081106.tar.gz
 eclipse-cdt-fetched-src-CDT_5_0_1.tar.bz2
+eclipse-cdt-fetched-src-autotools-R1_0_2.tar.gz
+eclipse-cdt-fetched-src-libhover-R0_1_1.tar.gz


Index: eclipse-cdt.spec
===================================================================
RCS file: /cvs/extras/rpms/eclipse-cdt/devel/eclipse-cdt.spec,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -r1.116 -r1.117
--- eclipse-cdt.spec	28 Nov 2008 21:40:05 -0000	1.116
+++ eclipse-cdt.spec	16 Jan 2009 21:31:54 -0000	1.117
@@ -20,7 +20,7 @@
 Summary:        Eclipse C/C++ Development Tools (CDT) plugin
 Name:           eclipse-cdt
 Version:        %{majmin}.%{micro}
-Release:        1%{?dist}
+Release:        2%{?dist}
 License:        EPL and CPL
 Group:          Development/Tools
 URL:            http://www.eclipse.org/cdt
@@ -34,9 +34,9 @@
 Source0: %{name}-fetched-src-CDT_5_0_1.tar.bz2
 Source4: fetch-cdt.sh
 
-Source1: http://sources.redhat.com/eclipse/autotools/eclipse-cdt-fetched-src-autotools-20081106.tar.gz
+Source1: http://sources.redhat.com/eclipse/autotools/eclipse-cdt-fetched-src-autotools-R1_0_2.tar.gz
 
-Source2: http://sources.redhat.com/eclipse/autotools/eclipse-cdt-fetched-src-libhover-20081106.tar.gz
+Source2: http://sources.redhat.com/eclipse/autotools/eclipse-cdt-fetched-src-libhover-R0_1_1.tar.gz
 
 ## The following tarball was generated thusly:
 ##
@@ -97,10 +97,6 @@
 # the .cproject file.  This patch prevents the problem.
 Patch16: %{name}-managedConfigurations-fix.patch
 
-# Patch to autotools project detector code to not assume that ManagedProject
-# exists if project has Managed Nature.
-Patch17: %{name}-bug472731.patch
-
 BuildRequires: eclipse-pde
 BuildRequires: eclipse-mylyn >= 3.0
 %if %{gcj_support}
@@ -231,7 +227,6 @@
 mkdir autotools
 pushd autotools
 tar -xzf %{SOURCE1}
-%patch17
 popd
 
 ## Libhover stuff
@@ -575,6 +570,10 @@
 %endif
 
 %changelog
+* Fri Jan 16 2009 Jeff Johnston <jjohnstn at redhat.com> 5.0.1-2
+- Rebase libhover to 0.1.1 and autotools to 1.0.2.
+- Remove patch for 472731 which is already part of rebased autotools sources.
+
 * Fri Nov 28 2008 Jeff Johnston <jjohnstn at redhat.com> 5.0.1-1
 - Rebase to CDT 5.0.1.
 - Fix bug in autotools project type detection.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/eclipse-cdt/devel/sources,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- sources	28 Nov 2008 21:40:05 -0000	1.50
+++ sources	16 Jan 2009 21:31:54 -0000	1.51
@@ -1,5 +1,5 @@
 5c470fb0777d27541edbfa31443d91f7  eclipse-cdt-cppunit-20061102.tar.gz
 2d4ae0a2131ba1efc896d981072cc091  eclipse-cdt-target_filter.gif.gz
-7bdfc7cfe88e694903225a858d3442c3  eclipse-cdt-fetched-src-autotools-20081106.tar.gz
-621bd568fed245c8368819692a066be9  eclipse-cdt-fetched-src-libhover-20081106.tar.gz
 f0db116442be6f461611739308535175  eclipse-cdt-fetched-src-CDT_5_0_1.tar.bz2
+80967f045be67d65396ce424ef093719  eclipse-cdt-fetched-src-autotools-R1_0_2.tar.gz
+23c3498e551936980269c83a0051d6b1  eclipse-cdt-fetched-src-libhover-R0_1_1.tar.gz


--- eclipse-cdt-bug472731.patch DELETED ---



From dwalsh at fedoraproject.org  Fri Jan 16 21:33:29 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Fri, 16 Jan 2009 21:33:29 +0000 (UTC)
Subject: rpms/selinux-policy/devel modules-mls.conf,1.42,1.43
Message-ID: <20090116213329.535CB70127@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7842

Modified Files:
	modules-mls.conf 
Log Message:
* Thu Jan 15 2009 Dan Walsh <dwalsh at redhat.com> 3.6.2-5
- Define openoffice as an x_domain



Index: modules-mls.conf
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/modules-mls.conf,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- modules-mls.conf	16 Jan 2009 21:11:58 -0000	1.42
+++ modules-mls.conf	16 Jan 2009 21:32:59 -0000	1.43
@@ -1327,7 +1327,7 @@
 #
 # X windows window manager
 # 
-wm = module
+#wm = module
 
 # Layer: admin
 # Module: tzdata



From cebbert at fedoraproject.org  Fri Jan 16 21:34:55 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Fri, 16 Jan 2009 21:34:55 +0000 (UTC)
Subject: rpms/kernel/devel patch-2.6.29-rc2.bz2.sign, NONE, 1.1 .cvsignore, 
	1.994, 1.995 config-generic, 1.223, 1.224 config-x86-generic,
	1.60, 1.61 config-x86_64-generic, 1.63, 1.64 kernel.spec, 1.1220,
	1.1221 sources, 1.956, 1.957 upstream, 1.868,
	1.869 patch-2.6.29-rc1-git2.bz2.sign, 1.1,
	NONE patch-2.6.29-rc1-git6.bz2.sign, 1.1,
	NONE patch-2.6.29-rc1.bz2.sign, 1.1, NONE
Message-ID: <20090116213455.B6DC970127@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8263

Modified Files:
	.cvsignore config-generic config-x86-generic 
	config-x86_64-generic kernel.spec sources upstream 
Added Files:
	patch-2.6.29-rc2.bz2.sign 
Removed Files:
	patch-2.6.29-rc1-git2.bz2.sign patch-2.6.29-rc1-git6.bz2.sign 
	patch-2.6.29-rc1.bz2.sign 
Log Message:
2.6.29-rc2


--- NEW FILE patch-2.6.29-rc2.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBJcPg3yGugalF9Dw4RApeaAKCIrCPCvlFVzm7L6ckfL8tVUQOzgQCbBC1f
+SsDw6InPlhS41n2UhDdReU=
=UbVD
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.994
retrieving revision 1.995
diff -u -r1.994 -r1.995
--- .cvsignore	16 Jan 2009 20:24:36 -0000	1.994
+++ .cvsignore	16 Jan 2009 21:34:24 -0000	1.995
@@ -4,6 +4,4 @@
 temp-*
 kernel-2.6.28
 linux-2.6.28.tar.bz2
-patch-2.6.28-git14.bz2
-patch-2.6.29-rc1.bz2
-patch-2.6.29-rc1-git6.bz2
+patch-2.6.29-rc2.bz2


Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-generic,v
retrieving revision 1.223
retrieving revision 1.224
diff -u -r1.223 -r1.224
--- config-generic	16 Jan 2009 20:24:36 -0000	1.223
+++ config-generic	16 Jan 2009 21:34:24 -0000	1.224
@@ -3768,7 +3768,6 @@
 CONFIG_ACPI_CUSTOM_DSDT_INITRD=y
 
 #FIXME: x86 generic?
-CONFIG_THINKPAD_ACPI_HOTKEY_POLL=y
 CONFIG_LEDS_CLEVO_MAIL=m
 CONFIG_I8K=m
 CONFIG_ACER_WMI=m


Index: config-x86-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-x86-generic,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- config-x86-generic	13 Jan 2009 21:22:54 -0000	1.60
+++ config-x86-generic	16 Jan 2009 21:34:24 -0000	1.61
@@ -374,6 +374,8 @@
 
 CONFIG_THINKPAD_ACPI=m
 # CONFIG_THINKPAD_ACPI_DEBUG is not set
+# CONFIG_THINKPAD_ACPI_DEBUGFACILITIES is not set
+CONFIG_THINKPAD_ACPI_HOTKEY_POLL=y
 CONFIG_THINKPAD_ACPI_BAY=y
 CONFIG_THINKPAD_ACPI_VIDEO=y
 


Index: config-x86_64-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-x86_64-generic,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- config-x86_64-generic	13 Jan 2009 21:22:54 -0000	1.63
+++ config-x86_64-generic	16 Jan 2009 21:34:24 -0000	1.64
@@ -110,6 +110,8 @@
 
 CONFIG_THINKPAD_ACPI=m
 # CONFIG_THINKPAD_ACPI_DEBUG is not set
+# CONFIG_THINKPAD_ACPI_DEBUGFACILITIES is not set
+CONFIG_THINKPAD_ACPI_HOTKEY_POLL=y
 CONFIG_THINKPAD_ACPI_BAY=y
 CONFIG_THINKPAD_ACPI_VIDEO=y
 


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1220
retrieving revision 1.1221
diff -u -r1.1220 -r1.1221
--- kernel.spec	16 Jan 2009 20:24:36 -0000	1.1220
+++ kernel.spec	16 Jan 2009 21:34:24 -0000	1.1221
@@ -56,9 +56,9 @@
 # The next upstream release sublevel (base_sublevel+1)
 %define upstream_sublevel %(echo $((%{base_sublevel} + 1)))
 # The rc snapshot level
-%define rcrev 1
+%define rcrev 2
 # The git snapshot level
-%define gitrev 6
+%define gitrev 0
 # Set rpm version accordingly
 %define rpmversion 2.6.%{upstream_sublevel}
 %endif
@@ -1735,6 +1735,9 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Fri Jan 16 2009 Chuck Ebbert <cebbert at redhat.com>
+- 2.6.29-rc2
+
 * Fri Jan 16 2009 Kyle McMartin <kyle at redhat.com>
 - 2.6.29-rc1-git6
 - linux-2.6-net-silence-noisy-printks.patch: merged


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v
retrieving revision 1.956
retrieving revision 1.957
diff -u -r1.956 -r1.957
--- sources	16 Jan 2009 20:24:36 -0000	1.956
+++ sources	16 Jan 2009 21:34:25 -0000	1.957
@@ -1,3 +1,2 @@
 d351e44709c9810b85e29b877f50968a  linux-2.6.28.tar.bz2
-c7280469ffd1edd4b50bac92de172d46  patch-2.6.29-rc1.bz2
-bfde031ce5890a89d9fdad66f61c97a7  patch-2.6.29-rc1-git6.bz2
+c8b4ae394659c8723aae2f1bafcb55dc  patch-2.6.29-rc2.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v
retrieving revision 1.868
retrieving revision 1.869
diff -u -r1.868 -r1.869
--- upstream	16 Jan 2009 20:24:36 -0000	1.868
+++ upstream	16 Jan 2009 21:34:25 -0000	1.869
@@ -1,3 +1,2 @@
 linux-2.6.28.tar.bz2
-patch-2.6.29-rc1.bz2
-patch-2.6.29-rc1-git6.bz2
+patch-2.6.29-rc2.bz2


--- patch-2.6.29-rc1-git2.bz2.sign DELETED ---


--- patch-2.6.29-rc1-git6.bz2.sign DELETED ---


--- patch-2.6.29-rc1.bz2.sign DELETED ---



From steve at fedoraproject.org  Fri Jan 16 21:39:51 2009
From: steve at fedoraproject.org (Steven Pritchard)
Date: Fri, 16 Jan 2009 21:39:51 +0000 (UTC)
Subject: rpms/perl-DateTime-Set/devel .cvsignore, 1.2,
	1.3 perl-DateTime-Set.spec, 1.6, 1.7 sources, 1.2, 1.3
Message-ID: <20090116213951.2BB6470127@cvs1.fedora.phx.redhat.com>

Author: steve

Update of /cvs/pkgs/rpms/perl-DateTime-Set/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8697

Modified Files:
	.cvsignore perl-DateTime-Set.spec sources 
Log Message:
Update to 0.26.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-DateTime-Set/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	7 Jul 2006 17:34:58 -0000	1.2
+++ .cvsignore	16 Jan 2009 21:39:20 -0000	1.3
@@ -1 +1 @@
-DateTime-Set-0.25.tar.gz
+DateTime-Set-0.26.tar.gz


Index: perl-DateTime-Set.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-DateTime-Set/devel/perl-DateTime-Set.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- perl-DateTime-Set.spec	5 Mar 2008 19:23:26 -0000	1.6
+++ perl-DateTime-Set.spec	16 Jan 2009 21:39:20 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           perl-DateTime-Set
-Version:        0.25
-Release:        6%{?dist}
+Version:        0.26
+Release:        1%{?dist}
 Summary:        Datetime sets and set math
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -61,6 +61,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Fri Jan 16 2009 Steven Pritchard <steve at kspei.com> 0.26-1
+- Update to 0.26.
+
 * Wed Mar 05 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.25-6
 - rebuild for new perl
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-DateTime-Set/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	7 Jul 2006 17:34:58 -0000	1.2
+++ sources	16 Jan 2009 21:39:20 -0000	1.3
@@ -1 +1 @@
-777f0d8c2f6c6092cd7a70bf7e701831  DateTime-Set-0.25.tar.gz
+0d7cd562d04a32c9c05562012dc35a2d  DateTime-Set-0.26.tar.gz



From ke4qqq at fedoraproject.org  Fri Jan 16 21:45:09 2009
From: ke4qqq at fedoraproject.org (David Nalley)
Date: Fri, 16 Jan 2009 21:45:09 +0000 (UTC)
Subject: rpms/zapplet/F-9 zapplet.spec,1.1,1.2
Message-ID: <20090116214509.4148E70127@cvs1.fedora.phx.redhat.com>

Author: ke4qqq

Update of /cvs/pkgs/rpms/zapplet/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9153

Modified Files:
	zapplet.spec 
Log Message:
* Fri Jan 16 2009 David Nalley <david at gnsa.us>
- added dist tag per jds2001's suggestions



Index: zapplet.spec
===================================================================
RCS file: /cvs/pkgs/rpms/zapplet/F-9/zapplet.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- zapplet.spec	16 Jan 2009 18:21:58 -0000	1.1
+++ zapplet.spec	16 Jan 2009 21:44:38 -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:           zapplet
 Version:        0.1
-Release:        3 
+Release:        3%{dist} 
 Summary:        Zenoss Tray Applet
 Group:          Applications/Communications
 License:        GPLv2+



From pkgdb at fedoraproject.org  Fri Jan 16 22:09:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 16 Jan 2009 22:09:57 +0000
Subject: [pkgdb] tcl: wart has requested watchcommits
Message-ID: <20090116220958.02AD5208207@bastion.fedora.phx.redhat.com>

wart has requested the watchcommits acl on tcl (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/tcl



From pkgdb at fedoraproject.org  Fri Jan 16 22:10:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 16 Jan 2009 22:10:01 +0000
Subject: [pkgdb] tcl: wart has requested watchbugzilla
Message-ID: <20090116221001.7BC04208457@bastion.fedora.phx.redhat.com>

wart has requested the watchbugzilla acl on tcl (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/tcl



From pkgdb at fedoraproject.org  Fri Jan 16 22:10:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 16 Jan 2009 22:10:05 +0000
Subject: [pkgdb] tcl: wart has requested watchcommits
Message-ID: <20090116221005.D9591208469@bastion.fedora.phx.redhat.com>

wart has requested the watchcommits acl on tcl (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/tcl



From pkgdb at fedoraproject.org  Fri Jan 16 22:10:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 16 Jan 2009 22:10:14 +0000
Subject: [pkgdb] tcl: wart has requested watchbugzilla
Message-ID: <20090116221015.01EC720846E@bastion.fedora.phx.redhat.com>

wart has requested the watchbugzilla acl on tcl (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/tcl



From pkgdb at fedoraproject.org  Fri Jan 16 22:10:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 16 Jan 2009 22:10:22 +0000
Subject: [pkgdb] tcl: wart has requested watchcommits
Message-ID: <20090116221024.E1971208475@bastion.fedora.phx.redhat.com>

wart has requested the watchcommits acl on tcl (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/tcl



From pkgdb at fedoraproject.org  Fri Jan 16 22:10:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 16 Jan 2009 22:10:16 +0000
Subject: [pkgdb] tcl: wart has requested watchbugzilla
Message-ID: <20090116221017.39831208472@bastion.fedora.phx.redhat.com>

wart has requested the watchbugzilla acl on tcl (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/tcl



From nim at fedoraproject.org  Fri Jan 16 22:11:10 2009
From: nim at fedoraproject.org (Nicolas Mailhot)
Date: Fri, 16 Jan 2009 22:11:10 +0000 (UTC)
Subject: rpms/google-droid-fonts/devel NOTICE, NONE, 1.1 README.txt, NONE,
	1.1 google-droid-fonts-sans-fontconfig.conf, NONE,
	1.1 google-droid-fonts-sans-mono-fontconfig.conf, NONE,
	1.1 google-droid-fonts-serif-fontconfig.conf, NONE,
	1.1 google-droid-fonts.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090116221110.721F170127@cvs1.fedora.phx.redhat.com>

Author: nim

Update of /cvs/extras/rpms/google-droid-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12735/devel

Modified Files:
	.cvsignore sources 
Added Files:
	NOTICE README.txt google-droid-fonts-sans-fontconfig.conf 
	google-droid-fonts-sans-mono-fontconfig.conf 
	google-droid-fonts-serif-fontconfig.conf 
	google-droid-fonts.spec import.log 
Log Message:
initial import


--- NEW FILE NOTICE ---

   Copyright (c) 2005-2008, The Android Open Source Project

   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.

   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.


                                 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



--- NEW FILE README.txt ---
Copyright (C) 2008 The Android Open Source Project

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.

##########

This directory contains the fonts for the platform. They are licensed
under the Apache 2 license.


--- NEW FILE google-droid-fonts-sans-fontconfig.conf ---
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
<fontconfig>
  <alias>
    <family>sans-serif</family>
    <prefer>
      <family>Droid Sans</family>
    </prefer>
  </alias>
  <alias>
    <family>Droid Sans</family>
    <default>
      <family>sans-serif</family>
    </default>
  </alias>
  <match target="scan">
    <test name="family">
      <string>Droid Sans Fallback</string>
    </test>
    <edit name="family">
      <string>Droid Sans</string>
    </edit>
  </match>
</fontconfig>


--- NEW FILE google-droid-fonts-sans-mono-fontconfig.conf ---
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
<fontconfig>
  <alias>
    <family>monospace</family>
    <prefer>
      <family>Droid Sans Mono</family>
    </prefer>
  </alias>
  <alias>
    <family>Droid Sans Mono</family>
    <default>
      <family>monospace</family>
    </default>
  </alias>
</fontconfig>


--- NEW FILE google-droid-fonts-serif-fontconfig.conf ---
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
<fontconfig>
  <alias>
    <family>serif</family>
    <prefer>
      <family>Droid Serif</family>
    </prefer>
  </alias>
  <alias>
    <family>Droid Serif</family>
    <default>
      <family>serif</family>
    </default>
  </alias>
</fontconfig>


--- NEW FILE google-droid-fonts.spec ---
%define fontname google-droid

%define download_root http://android.git.kernel.org/?p=platform/frameworks/base.git;a=blob_plain;f=data/fonts

%define common_desc \
The Droid typeface family was designed in the fall of 2006 by Ascender???s \
Steve Matteson, as a commission from Google to create a set of system fonts \
for its Android platform. The goal was to provide optimal quality and comfort \
on a mobile handset when rendered in application menus, web browsers and for \
other screen text.

Name:    %{fontname}-fonts
# The font files all have the same version except for sans fallback which I'm going to ignore here
Version: 1.0.112
Release: 2%{?dist}
Summary: General-purpose fonts released by Google as part of Android

Group:     User Interface/X
License:   ASL 2.0
URL:       http://android.git.kernel.org/?p=platform/frameworks/base.git;a=tree;f=data/fonts
Source1:   %{download_root}/DroidSans.ttf
Source2:   %{download_root}/DroidSans-Bold.ttf
Source3:   %{download_root}/DroidSansFallback.ttf
Source4:   %{download_root}/DroidSansMono.ttf
Source5:   %{download_root}/DroidSerif-Regular.ttf
Source6:   %{download_root}/DroidSerif-Bold.ttf
Source7:   %{download_root}/DroidSerif-Italic.ttf
Source8:   %{download_root}/DroidSerif-BoldItalic.ttf
Source9:   %{download_root}/NOTICE
Source10:  %{download_root}/README.txt
Source11:  %{name}-sans-fontconfig.conf
Source12:  %{name}-sans-mono-fontconfig.conf
Source13:  %{name}-serif-fontconfig.conf
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

BuildArch:     noarch
BuildRequires: fontpackages-devel

%description
%common_desc


%package common
Summary:  Common files of the Droid font set
Group:    User Interface/X
Requires: fontpackages-filesystem

%description common
%common_desc

This package consists of files used by other %{name} packages.

%package -n %{fontname}-sans-fonts
Summary:  A humanist sans serif typeface
Group:    User Interface/X
Requires: %{name}-common = %{version}-%{release}

%description -n %{fontname}-sans-fonts
%common_desc

Droid Sans is a humanist sans serif typeface designed for user interfaces and
electronic communication.

%_font_pkg -n sans -f ??-%{fontname}-sans.conf DroidSans.ttf DroidSans-Bold.ttf DroidSansFallback.ttf


%package -n %{fontname}-sans-mono-fonts
Summary:  A humanist monospace sans serif typeface
Group:    User Interface/X
Requires: %{name}-common = %{version}-%{release}

%description -n %{fontname}-sans-mono-fonts
%common_desc

Droid Sans Mono is a humanist monospace sans serif typeface designed for user
interfaces and electronic communication.

%_font_pkg -n sans-mono -f ??-%{fontname}-sans-mono.conf DroidSansMono.ttf


%package -n %{fontname}-serif-fonts
Summary:  A serif typeface
Group:    User Interface/X
Requires: %{name}-common = %{version}-%{release}

%description -n %{fontname}-serif-fonts
%common_desc

Droid Serif is a contemporary serif typeface family designed for comfortable
reading on screen. Droid Serif is slightly condensed to maximize the amount of
text displayed on small screens. Vertical stress and open forms contribute to
its readability while its proportion and overall design complement its
companion Droid Sans.

%_font_pkg -n serif -f ??-%{fontname}-serif.conf DroidSerif*ttf


%prep
%setup -q -c -T
install -m 0644 -p %{SOURCE9}  notice.txt
install -m 0644 -p %{SOURCE10} readme.txt


%build


%install
rm -fr %{buildroot}

install -m 0755 -d %{buildroot}%{_fontdir}

install -m 0644 -p  %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} \
                    %{SOURCE6} %{SOURCE7} %{SOURCE8} %{buildroot}%{_fontdir}

install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} \
                   %{buildroot}%{_fontconfig_confdir}

install -m 0644 -p %{SOURCE11} \
        %{buildroot}%{_fontconfig_templatedir}/65-%{fontname}-sans.conf
install -m 0644 -p %{SOURCE12} \
        %{buildroot}%{_fontconfig_templatedir}/60-%{fontname}-sans-mono.conf
install -m 0644 -p %{SOURCE13} \
        %{buildroot}%{_fontconfig_templatedir}/59-%{fontname}-serif.conf

for fontconf in 59-%{fontname}-sans.conf \
                59-%{fontname}-sans-mono.conf \
                59-%{fontname}-serif.conf ; do
  ln -s %{_fontconfig_templatedir}/$fontconf \
        %{buildroot}%{_fontconfig_confdir}/$fontconf
done


%clean
rm -fr %{buildroot}


%files common
%defattr(0644,root,root,0755)
%doc *.txt

%dir %{_fontdir}


%changelog
* Fri Jan 16 2009 <nicolas.mailhot at laposte.net>
- 1.0.112-2
??? Convert to new naming guidelines
??? Do strange stuff with Sans Fallback (CJK users please check)

* Tue Dec  9 2008 <nicolas.mailhot at laposte.net>
- 1.0.112-1
?? Licensing bit clarified in bug #472635
?? Fedora submission

* Sun Nov 23 2008 <nicolas.mailhot at laposte.net>
- 1.0.107-1
?? Initial built using ???fontpackages???



--- NEW FILE import.log ---
google-droid-fonts-1_0_112-2_fc11:HEAD:google-droid-fonts-1.0.112-2.fc11.src.rpm:1232143809


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/google-droid-fonts/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	15 Jan 2009 20:27:08 -0000	1.1
+++ .cvsignore	16 Jan 2009 22:10:39 -0000	1.2
@@ -0,0 +1,8 @@
+DroidSans-Bold.ttf
+DroidSans.ttf
+DroidSansFallback.ttf
+DroidSansMono.ttf
+DroidSerif-Bold.ttf
+DroidSerif-BoldItalic.ttf
+DroidSerif-Italic.ttf
+DroidSerif-Regular.ttf


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/google-droid-fonts/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	15 Jan 2009 20:27:08 -0000	1.1
+++ sources	16 Jan 2009 22:10:40 -0000	1.2
@@ -0,0 +1,8 @@
+2afdf28d5cdd079b41968cdabf1b469e  DroidSans-Bold.ttf
+6f28ad369fa0f2661cc2de7a7be9977e  DroidSans.ttf
+4caeadd734f4be9973163bdf02ea6cf5  DroidSansFallback.ttf
+3922dfe38a36da7d6edfb1fe77b276fb  DroidSansMono.ttf
+849a92990a80cbb665bfc74fd03743bd  DroidSerif-Bold.ttf
+a062025df92affc1331a05b7c07793fc  DroidSerif-BoldItalic.ttf
+a2e7305a0ba8bb7091124f4cd1485fc9  DroidSerif-Italic.ttf
+bfb2f44a7c1deba39f7f4d39bff18eeb  DroidSerif-Regular.ttf



From mtruch at fedoraproject.org  Fri Jan 16 22:11:33 2009
From: mtruch at fedoraproject.org (Matthew D Truch)
Date: Fri, 16 Jan 2009 22:11:33 +0000 (UTC)
Subject: rpms/getdata/devel getdata-0.5.0.tar.bz2.sig, NONE, 1.1 .cvsignore, 
	1.4, 1.5 getdata.spec, 1.4, 1.5 sources, 1.4,
	1.5 getdata-0.4.2.tar.bz2.sig, 1.1, NONE
Message-ID: <20090116221133.9BAAC70127@cvs1.fedora.phx.redhat.com>

Author: mtruch

Update of /cvs/extras/rpms/getdata/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12779

Modified Files:
	.cvsignore getdata.spec sources 
Added Files:
	getdata-0.5.0.tar.bz2.sig 
Removed Files:
	getdata-0.4.2.tar.bz2.sig 
Log Message:
Update to upstream 0.5.0 release.



--- NEW FILE getdata-0.5.0.tar.bz2.sig ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)

iD4DBQBJcNdKHjxAJ9xPubwRAvi3AJdxgtb4I9+Kohshi6F8DWzLjBTvAJ4kBZnV
NRRLYqfDhvXM1X7WhsweFQ==
=58T5
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/getdata/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	18 Nov 2008 17:09:22 -0000	1.4
+++ .cvsignore	16 Jan 2009 22:11:03 -0000	1.5
@@ -1 +1 @@
-getdata-0.4.2.tar.bz2
+getdata-0.5.0.tar.bz2


Index: getdata.spec
===================================================================
RCS file: /cvs/extras/rpms/getdata/devel/getdata.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- getdata.spec	18 Nov 2008 17:09:23 -0000	1.4
+++ getdata.spec	16 Jan 2009 22:11:03 -0000	1.5
@@ -1,5 +1,5 @@
 Name:           getdata
-Version:        0.4.2
+Version:        0.5.0
 Release:        1%{?dist}
 Summary:        Library for reading and writing dirfile data
 
@@ -9,7 +9,7 @@
 Source0:        http://dl.sf.net/sourceforge/%{name}/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:     gcc-gfortran
+BuildRequires:     gcc-gfortran zlib-devel libtool-ltdl-devel bzip2-devel
 Requires(post):    /sbin/ldconfig
 Requires(postun):  /sbin/ldconfig
 
@@ -29,12 +29,32 @@
 Headers required when building a program against the GetData library.
 Includes C++ and FORTRAN (77 & 95) bindings. 
 
+%package gzip
+Group:  Development/Libraries
+Summary: Enables getdata read ability of gzip compressed dirfiles
+Requires: %{name} = %{version}-%{release}
+
+%description gzip
+Enables getdata to read dirfiles that are encoded (compressed) with gzip.
+Fields must be fully compressed with gzip, not actively being written to.
+Does not yet allow writing of gzip encoded dirfiles.  
+
+%package bzip2
+Group:  Development/Libraries
+Summary: Enables getdata read ability of bzip2 compressed dirfiles
+Requires: %{name} = %{version}-%{release}
+
+%description bzip2
+Enables getdata to read dirfiles that are encoded (compressed) with bzip2.
+Fields must be fully compressed with bzip2, not actively being written to.
+Does not yet allow writing of bzip2 encoded dirfiles.
+
 %prep
 %setup -q
 
 %build
 # FIXME: FFLAGS/FCFLAGS are not being honored; looking into it with upstream.
-%configure --disable-static
+%configure --disable-static --enable-modules --enable-debug
 make %{?_smp_mflags}
 
 %check
@@ -46,6 +66,8 @@
 make DESTDIR=%{buildroot} SUID_ROOT="" install
 # Remove .la files.  
 rm -f %{buildroot}/%{_libdir}/lib*.la
+# Remove simple docs, as we install them ourselves (along with others)
+rm -f %{buildroot}/%{_datadir}/doc/%{name}/*
 
 %clean
 rm -rf %{buildroot}
@@ -62,14 +84,30 @@
 %{_mandir}/man5/*
 
 %files devel
-%defattr(-,root,root)
-%doc README.cxx README.f77 README.f95
-%{_libdir}/lib*getdata*.so
+%defattr(-,root,root,-)
+%doc doc/README.cxx doc/README.f77 doc/README.f95 doc/unclean_database_recovery.txt
+%{_libdir}/libgetdata.so
+%{_libdir}/libf*getdata.so
+%{_libdir}/libgetdata++.so
 %{_includedir}/*
 %{_mandir}/man3/*
 %{_libdir}/pkgconfig/getdata.pc
 
+%files gzip
+%defattr(-,root,root,-)
+%{_libdir}/libgetdatagzip*.so
+
+%files bzip2
+%defattr(-,root,root,-)
+%{_libdir}/libgetdatabzip2*.so
+
 %changelog
+* Fri Jan 16 2009 Matthew Truch <matt at truch.net> - 0.5.0-1
+- Upstream 0.5.0
+-   Includes bugfixes.
+-   New gzip and bzip2 encoded dirfile read ability.
+-   Uses ltdl dynamic module loading for gzip and bzip2 modules.
+
 * Tue Nov 18 2008 Matthew Truch <matt at truch.net> - 0.4.2-1
 - Upstream 0.4.2.
 -   Includes several bugfixes, especially to the legacy interface.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/getdata/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	18 Nov 2008 17:09:23 -0000	1.4
+++ sources	16 Jan 2009 22:11:03 -0000	1.5
@@ -1 +1 @@
-f930006c80e93060a798187661487286  getdata-0.4.2.tar.bz2
+465709d1f5fcce5f3bedc26ed83a5a2f  getdata-0.5.0.tar.bz2


--- getdata-0.4.2.tar.bz2.sig DELETED ---



From jjames at fedoraproject.org  Fri Jan 16 22:22:40 2009
From: jjames at fedoraproject.org (Jerry James)
Date: Fri, 16 Jan 2009 22:22:40 +0000 (UTC)
Subject: rpms/gcl/F-10 gcl-2.6.8-alloca.patch, NONE, 1.1 gcl-2.6.8-bfd.patch,
	NONE, 1.1 gcl-2.6.8-debuginfo.patch, NONE,
	1.1 gcl-2.6.8-elisp.patch, NONE, 1.1 gcl-2.6.8-extension.patch,
	NONE, 1.1 gcl-2.6.8-fd-leak.patch, NONE,
	1.1 gcl-2.6.8-getcwd.patch, NONE,
	1.1 gcl-2.6.8-infrastructure.patch, NONE,
	1.1 gcl-2.6.8-latex.patch, NONE, 1.1 gcl-2.6.8-loginname.patch,
	NONE, 1.1 gcl-2.6.8-rename.patch, NONE,
	1.1 gcl-2.6.8-selinux.patch, NONE,
	1.1 gcl-2.6.8-sigprocmask-linux.patch, NONE,
	1.1 gcl-2.6.8-texinfo.patch, NONE,
	1.1 gcl-2.6.8-unrandomize.patch, NONE, 1.1 gcl.el, NONE,
	1.1 .cvsignore, 1.2, 1.3 gcl.spec, 1.27, 1.28 sources, 1.3,
	1.4 gcl-bash.patch, 1.2, NONE gcl-pers.patch, 1.1, NONE
Message-ID: <20090116222240.A01FF70127@cvs1.fedora.phx.redhat.com>

Author: jjames

Update of /cvs/pkgs/rpms/gcl/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13855

Modified Files:
	.cvsignore gcl.spec sources 
Added Files:
	gcl-2.6.8-alloca.patch gcl-2.6.8-bfd.patch 
	gcl-2.6.8-debuginfo.patch gcl-2.6.8-elisp.patch 
	gcl-2.6.8-extension.patch gcl-2.6.8-fd-leak.patch 
	gcl-2.6.8-getcwd.patch gcl-2.6.8-infrastructure.patch 
	gcl-2.6.8-latex.patch gcl-2.6.8-loginname.patch 
	gcl-2.6.8-rename.patch gcl-2.6.8-selinux.patch 
	gcl-2.6.8-sigprocmask-linux.patch gcl-2.6.8-texinfo.patch 
	gcl-2.6.8-unrandomize.patch gcl.el 
Removed Files:
	gcl-bash.patch gcl-pers.patch 
Log Message:
* Fri Jan  9 2009 Jerry James <loganjerry at gmail.com> - 2.6.8-0.1.20080902cvs
- Update from CVS to fix many build problems
- Fix SELinux and BFD problems that blocked the build
- Add patches to address various build and runtime problems
- Drop old patches that are obsoleted by the update from CVS
- Split out emacs and xemacs subpackages


gcl-2.6.8-alloca.patch:

--- NEW FILE gcl-2.6.8-alloca.patch ---
diff -dur gcl-2.6.8.ORIG/acconfig.h gcl-2.6.8/acconfig.h
--- gcl-2.6.8.ORIG/acconfig.h	2008-07-30 22:58:25.000000000 -0600
+++ gcl-2.6.8/acconfig.h	2008-12-29 16:06:08.000000000 -0700
@@ -53,11 +53,10 @@
 #undef HAVE_ALLOCA 
 #endif
 
-
 /* define if need alloca.h */
-#undef NEED_ALLOCA_H
+#undef HAVE_ALLOCA_H
 
-#ifdef NEED_ALLOCA_H
+#ifdef HAVE_ALLOCA_H
 #include <alloca.h>
 #endif
 
diff -dur gcl-2.6.8.ORIG/configure gcl-2.6.8/configure
--- gcl-2.6.8.ORIG/configure	2008-12-29 16:05:13.000000000 -0700
+++ gcl-2.6.8/configure	2008-12-29 16:06:55.000000000 -0700
@@ -645,6 +645,7 @@
 NIFLAGS
 FINAL_CFLAGS
 BROKEN_O4_OPT
+ALLOCA
 NOTIFY
 TCL_LIBS
 TCL_DL_LIBS
@@ -13784,10 +13785,12 @@
 
 # alloca
 
-{ $as_echo "$as_me:$LINENO: checking for alloca" >&5
-$as_echo_n "checking for alloca... " >&6; }
-if test "$cross_compiling" = yes; then
-  gcl_ok=no
+# The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
+# for constant arguments.  Useless!
+{ $as_echo "$as_me:$LINENO: checking for working alloca.h" >&5
+$as_echo_n "checking for working alloca.h... " >&6; }
+if test "${ac_cv_working_alloca_h+set}" = set; then
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -13795,16 +13798,17 @@
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-
+#include <alloca.h>
 int
 main ()
 {
-exit(alloca(500) != NULL ? 0 : 1);
+char *p = (char *) alloca (2 * sizeof (int));
+			  if (p) return 0;
   ;
   return 0;
 }
 _ACEOF
-rm -f conftest$ac_exeext
+rm -f conftest.$ac_objext conftest$ac_exeext
 if { (ac_try="$ac_link"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -13812,44 +13816,141 @@
 esac
 eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 $as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>&5
+  (eval "$ac_link") 2>conftest.er1
   ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
+  ac_cv_working_alloca_h=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_working_alloca_h=no
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_working_alloca_h" >&5
+$as_echo "$ac_cv_working_alloca_h" >&6; }
+if test $ac_cv_working_alloca_h = yes; then
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_ALLOCA_H 1
+_ACEOF
+
+fi
+
+{ $as_echo "$as_me:$LINENO: checking for alloca" >&5
+$as_echo_n "checking for alloca... " >&6; }
+if test "${ac_cv_func_alloca_works+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#ifdef __GNUC__
+# define alloca __builtin_alloca
+#else
+# ifdef _MSC_VER
+#  include <malloc.h>
+#  define alloca _alloca
+# else
+#  ifdef HAVE_ALLOCA_H
+#   include <alloca.h>
+#  else
+#   ifdef _AIX
+ #pragma alloca
+#   else
+#    ifndef alloca /* predefined by HP cc +Olibcalls */
+char *alloca ();
+#    endif
+#   endif
+#  endif
+# endif
+#endif
+
+int
+main ()
+{
+char *p = (char *) alloca (1);
+				    if (p) return 0;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 $as_echo "$ac_try_echo") >&5
-  (eval "$ac_try") 2>&5
+  (eval "$ac_link") 2>conftest.er1
   ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  :
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
+  ac_cv_func_alloca_works=yes
 else
-  $as_echo "$as_me: program exited with status $ac_status" >&5
-$as_echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-( exit $ac_status )
-gcl_ok=yes
+	ac_cv_func_alloca_works=no
 fi
+
 rm -rf conftest.dSYM
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
 fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_alloca_works" >&5
+$as_echo "$ac_cv_func_alloca_works" >&6; }
 
+if test $ac_cv_func_alloca_works = yes; then
 
-if test $gcl_ok = yes ; then
-    { $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
-    cat >>confdefs.h <<\_ACEOF
+cat >>confdefs.h <<\_ACEOF
 #define HAVE_ALLOCA 1
 _ACEOF
 
 else
-  if test "$cross_compiling" = yes; then
-  gcl_ok=no
+  # The SVR3 libPW and SVR4 libucb both contain incompatible functions
+# that cause trouble.  Some versions do not even contain alloca or
+# contain a buggy version.  If you still want to use their alloca,
+# use ar to extract alloca.o from them instead of compiling alloca.c.
+
+ALLOCA=\${LIBOBJDIR}alloca.$ac_objext
+
+cat >>confdefs.h <<\_ACEOF
+#define C_ALLOCA 1
+_ACEOF
+
+
+{ $as_echo "$as_me:$LINENO: checking whether \`alloca.c' needs Cray hooks" >&5
+$as_echo_n "checking whether \`alloca.c' needs Cray hooks... " >&6; }
+if test "${ac_cv_os_cray+set}" = set; then
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -13857,17 +13958,163 @@
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
+#if defined CRAY && ! defined CRAY2
+webecray
+#else
+wenotbecray
+#endif
 
-  #include <alloca.h>
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "webecray" >/dev/null 2>&1; then
+  ac_cv_os_cray=yes
+else
+  ac_cv_os_cray=no
+fi
+rm -f conftest*
+
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_os_cray" >&5
+$as_echo "$ac_cv_os_cray" >&6; }
+if test $ac_cv_os_cray = yes; then
+  for ac_func in _getb67 GETB67 getb67; do
+    as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+$as_echo_n "checking for $ac_func... " >&6; }
+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+#define $ac_func innocuous_$ac_func
+
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char $ac_func (); below.
+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+    <limits.h> exists even on freestanding compilers.  */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+
+#undef $ac_func
+
+/* 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 $ac_func ();
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined __stub_$ac_func || defined __stub___$ac_func
+choke me
+#endif
 
 int
 main ()
 {
-exit(alloca(500) != NULL ? 0 : 1);
+return $ac_func ();
   ;
   return 0;
 }
 _ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
+  eval "$as_ac_var=yes"
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	eval "$as_ac_var=no"
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+fi
+ac_res=`eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+as_val=`eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
+
+cat >>confdefs.h <<_ACEOF
+#define CRAY_STACKSEG_END $ac_func
+_ACEOF
+
+    break
+fi
+
+  done
+fi
+
+{ $as_echo "$as_me:$LINENO: checking stack direction for C alloca" >&5
+$as_echo_n "checking stack direction for C alloca... " >&6; }
+if test "${ac_cv_c_stack_direction+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  if test "$cross_compiling" = yes; then
+  ac_cv_c_stack_direction=0
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+int
+find_stack_direction ()
+{
+  static char *addr = 0;
+  auto char dummy;
+  if (addr == 0)
+    {
+      addr = &dummy;
+      return find_stack_direction ();
+    }
+  else
+    return (&dummy > addr) ? 1 : -1;
+}
+
+int
+main ()
+{
+  return find_stack_direction () < 0;
+}
+_ACEOF
 rm -f conftest$ac_exeext
 if { (ac_try="$ac_link"
 case "(($ac_try" in
@@ -13890,43 +14137,30 @@
   ac_status=$?
   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  :
+  ac_cv_c_stack_direction=1
 else
   $as_echo "$as_me: program exited with status $ac_status" >&5
 $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 ( exit $ac_status )
-gcl_ok=yes
+ac_cv_c_stack_direction=-1
 fi
 rm -rf conftest.dSYM
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
 
- if test $gcl_ok = yes ; then
-    { $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
-    cat >>confdefs.h <<\_ACEOF
-#define HAVE_ALLOCA 1
-_ACEOF
-
-    cat >>confdefs.h <<\_ACEOF
-#define NEED_ALLOCA_H 1
-_ACEOF
-
- fi
 fi
-if test $gcl_ok = no ; then     { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; } ; fi
-
-
-
-
-
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_stack_direction" >&5
+$as_echo "$ac_cv_c_stack_direction" >&6; }
 
+cat >>confdefs.h <<_ACEOF
+#define STACK_DIRECTION $ac_cv_c_stack_direction
+_ACEOF
 
 
+fi
 
 
 # dlopen etc
diff -dur gcl-2.6.8.ORIG/configure.in gcl-2.6.8/configure.in
--- gcl-2.6.8.ORIG/configure.in	2008-12-29 16:05:13.000000000 -0700
+++ gcl-2.6.8/configure.in	2008-12-29 16:06:43.000000000 -0700
@@ -1852,33 +1852,7 @@
 
 # alloca
 
-AC_MSG_CHECKING([for alloca])
-AC_RUN_IFELSE([AC_LANG_PROGRAM([],[[exit(alloca(500) != NULL ? 0 : 1);]])],
-  ,gcl_ok=yes, gcl_ok=no,gcl_ok=no)
-if test $gcl_ok = yes ; then
-    AC_MSG_RESULT(yes)
-    AC_DEFINE(HAVE_ALLOCA)
-else
-  AC_RUN_IFELSE([AC_LANG_PROGRAM([[
-  #include <alloca.h>
-  ]],[[exit(alloca(500) != NULL ? 0 : 1);]])],
-  ,gcl_ok=yes, gcl_ok=no,gcl_ok=no)
- if test $gcl_ok = yes ; then
-    AC_MSG_RESULT(yes)
-    AC_DEFINE(HAVE_ALLOCA)
-    AC_DEFINE(NEED_ALLOCA_H)
- fi
-fi
-if test $gcl_ok = no ; then     AC_MSG_RESULT(no) ; fi
-
-
-
-
-
-
-
-
-
+AC_FUNC_ALLOCA
 
 # dlopen etc
 # idea make it so you do something dlopen(libX.so,RTLD_GLOBAL)
diff -dur gcl-2.6.8.ORIG/h/gclincl.h.in gcl-2.6.8/h/gclincl.h.in
--- gcl-2.6.8.ORIG/h/gclincl.h.in	2008-12-29 16:05:13.000000000 -0700
+++ gcl-2.6.8/h/gclincl.h.in	2008-12-29 16:06:55.000000000 -0700
@@ -54,11 +54,10 @@
 #undef HAVE_ALLOCA 
 #endif
 
-
 /* define if need alloca.h */
-#undef NEED_ALLOCA_H
+#undef HAVE_ALLOCA_H
 
-#ifdef NEED_ALLOCA_H
+#ifdef HAVE_ALLOCA_H
 #include <alloca.h>
 #endif
 
@@ -259,6 +258,21 @@
 #undef HAVE_MALLOC_MALLOC_H
 #undef HAVE_OBJC_MALLOC_H
 
+/* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP
+   systems. This function is required for `alloca.c' support on those systems.
+   */
+#undef CRAY_STACKSEG_END
+
+/* Define to 1 if using `alloca.c'. */
+#undef C_ALLOCA
+
+/* Define to 1 if you have `alloca', as a function or macro. */
+#undef HAVE_ALLOCA
+
+/* Define to 1 if you have <alloca.h> and it should be used (not on Ultrix).
+   */
+#undef HAVE_ALLOCA_H
+
 /* Define to 1 if you have the <asm/sigcontext.h> header file. */
 #undef HAVE_ASM_SIGCONTEXT_H
 
@@ -343,6 +357,14 @@
 /* The size of `long', as computed by sizeof. */
 #undef SIZEOF_LONG
 
+/* If using the C implementation of alloca, define if you know the
+   direction of stack growth for your system; otherwise it will be
+   automatically deduced at runtime.
+	STACK_DIRECTION > 0 => grows toward higher addresses
+	STACK_DIRECTION < 0 => grows toward lower addresses
+	STACK_DIRECTION = 0 => direction of growth unknown */
+#undef STACK_DIRECTION
+
 /* Define to 1 if you have the ANSI C header files. */
 #undef STDC_HEADERS
 

gcl-2.6.8-bfd.patch:

--- NEW FILE gcl-2.6.8-bfd.patch ---
diff -dur gcl-2.6.8.ORIG/acconfig.h gcl-2.6.8/acconfig.h
--- gcl-2.6.8.ORIG/acconfig.h	2008-12-29 16:24:30.000000000 -0700
+++ gcl-2.6.8/acconfig.h	2008-12-29 17:58:20.000000000 -0700
@@ -142,6 +142,7 @@
 /* bfd support */
 #undef HAVE_LIBBFD
 #undef NEED_CONST
+#undef HAVE_OUTPUT_BFD
 #define HAVE_BFD_BOOLEAN
 
 #ifdef HAVE_BFD_BOOLEAN
diff -dur gcl-2.6.8.ORIG/configure gcl-2.6.8/configure
--- gcl-2.6.8.ORIG/configure	2008-12-29 16:48:36.000000000 -0700
+++ gcl-2.6.8/configure	2008-12-29 17:58:49.000000000 -0700
@@ -683,6 +683,7 @@
 LIBIBERTY
 LIBBFD
 BUILD_BFD
+HAVE_OUTPUT_BFD
 X_EXTRA_LIBS
 X_LIBS
 X_PRE_LIBS
@@ -9023,6 +9024,120 @@
 
 
 
+#
+# Newer BFD libraries need a dummy output bfd
+#
+	{ $as_echo "$as_me:$LINENO: checking for struct bfd_link_info.output_bfd" >&5
+$as_echo_n "checking for struct bfd_link_info.output_bfd... " >&6; }
+if test "${ac_cv_member_struct_bfd_link_info_output_bfd+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+#include <bfd.h>
+#include <bfdlink.h>
+
+
+int
+main ()
+{
+static struct bfd_link_info ac_aggr;
+if (ac_aggr.output_bfd)
+return 0;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_cv_member_struct_bfd_link_info_output_bfd=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+#include <bfd.h>
+#include <bfdlink.h>
+
+
+int
+main ()
+{
+static struct bfd_link_info ac_aggr;
+if (sizeof ac_aggr.output_bfd)
+return 0;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_cv_member_struct_bfd_link_info_output_bfd=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_member_struct_bfd_link_info_output_bfd=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_member_struct_bfd_link_info_output_bfd" >&5
+$as_echo "$ac_cv_member_struct_bfd_link_info_output_bfd" >&6; }
+if test "x$ac_cv_member_struct_bfd_link_info_output_bfd" = x""yes; then
+  cat >>confdefs.h <<\_ACEOF
+#define HAVE_OUTPUT_BFD 1
+_ACEOF
+
+fi
+
+
 
 #
 # FIXME: Need to workaround mingw before this point -- CM
diff -dur gcl-2.6.8.ORIG/configure.in gcl-2.6.8/configure.in
--- gcl-2.6.8.ORIG/configure.in	2008-12-29 16:48:36.000000000 -0700
+++ gcl-2.6.8/configure.in	2008-12-29 17:58:20.000000000 -0700
@@ -893,6 +893,15 @@
 		AC_MSG_RESULT(no),
 		AC_MSG_RESULT(no))
 
+#
+# Newer BFD libraries need a dummy output bfd
+#
+	AC_CHECK_MEMBER([struct bfd_link_info.output_bfd],
+		[AC_DEFINE(HAVE_OUTPUT_BFD)], [], [
+#include <bfd.h>
+#include <bfdlink.h>
+		])
+	AC_SUBST(HAVE_OUTPUT_BFD)
 
 #
 # FIXME: Need to workaround mingw before this point -- CM
diff -dur gcl-2.6.8.ORIG/h/gclincl.h.in gcl-2.6.8/h/gclincl.h.in
--- gcl-2.6.8.ORIG/h/gclincl.h.in	2008-12-29 16:24:30.000000000 -0700
+++ gcl-2.6.8/h/gclincl.h.in	2008-12-29 17:58:50.000000000 -0700
@@ -143,6 +143,7 @@
 /* bfd support */
 #undef HAVE_LIBBFD
 #undef NEED_CONST
+#undef HAVE_OUTPUT_BFD
 #define HAVE_BFD_BOOLEAN
 
 #ifdef HAVE_BFD_BOOLEAN
diff -dur gcl-2.6.8.ORIG/o/sfasli.c gcl-2.6.8/o/sfasli.c
--- gcl-2.6.8.ORIG/o/sfasli.c	2005-01-15 09:26:43.000000000 -0700
+++ gcl-2.6.8/o/sfasli.c	2008-12-29 17:58:20.000000000 -0700
@@ -32,6 +32,9 @@
   int u,v;
   unsigned long pa;
   asymbol **q;
+#ifdef HAVE_OUTPUT_BFD
+  const char **bfd_targets;
+#endif
 
   bfd_init();
   if (!(bself=bfd_openr(kcl_self,0)))
@@ -40,6 +43,11 @@
     FEerror("I'm not an object",0);
 /*    if (link_info.hash) */
 /*      bfd_link_hash_table_free(bself,link_info.hash); */
+#ifdef HAVE_OUTPUT_BFD
+  bfd_targets = bfd_target_list();
+  link_info.output_bfd = bfd_openw("/dev/null", bfd_targets[0]);
+  free(bfd_targets);
+#endif
   if (!(link_info.hash = bfd_link_hash_table_create (bself)))
     FEerror("Cannot make hash table",0);
   if (!bfd_link_add_symbols(bself,&link_info))
diff -dur gcl-2.6.8.ORIG/o/unexelf.c gcl-2.6.8/o/unexelf.c
--- gcl-2.6.8.ORIG/o/unexelf.c	2004-05-03 15:35:58.000000000 -0600
+++ gcl-2.6.8/o/unexelf.c	2008-12-29 17:58:20.000000000 -0700
@@ -1,5 +1,13 @@
-/* Foundation; either version 2, or (at your option)
-any later version.
+/* Copyright (C) 1985, 1986, 1987, 1988, 1990, 1992, 1999, 2000, 2001,
+                 2002, 2003, 2004, 2005, 2006, 2007, 2008
+                 Free Software Foundation, Inc.
+
+This file is part of GNU Emacs.
+
+GNU Emacs 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.
 
 GNU Emacs is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -7,10 +15,9 @@
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.
+along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
+/*
 In other words, you are welcome to use, share and improve this program.
 You are forbidden to forbid anyone else to use, share and improve
 what you give them.   Help stamp out software-hoarding!  */
@@ -82,224 +89,224 @@
 temacs:
 
            **** SECTION HEADER TABLE ****
-[No]    Type    Flags   Addr         Offset       Size          Name
-        Link    Info    Adralgn      Entsize
+ [No]    Type    Flags   Addr         Offset       Size          Name
+         Link    Info    Adralgn      Entsize
 
-[1]     1       2       0x80480d4    0xd4         0x13          .interp
-        0       0       0x1          0
+ [1]     1       2       0x80480d4    0xd4         0x13          .interp
+         0       0       0x1          0
 
-[2]     5       2       0x80480e8    0xe8         0x388         .hash
-        3       0       0x4          0x4
+ [2]     5       2       0x80480e8    0xe8         0x388         .hash
+         3       0       0x4          0x4
 
-[3]     11      2       0x8048470    0x470        0x7f0         .dynsym
-        4       1       0x4          0x10
+ [3]     11      2       0x8048470    0x470        0x7f0         .dynsym
+         4       1       0x4          0x10
 
-[4]     3       2       0x8048c60    0xc60        0x3ad         .dynstr
-        0       0       0x1          0
+ [4]     3       2       0x8048c60    0xc60        0x3ad         .dynstr
+         0       0       0x1          0
 
-[5]     9       2       0x8049010    0x1010       0x338         .rel.plt
-        3       7       0x4          0x8
+ [5]     9       2       0x8049010    0x1010       0x338         .rel.plt
+         3       7       0x4          0x8
 
-[6]     1       6       0x8049348    0x1348       0x3           .init
-        0       0       0x4          0
+ [6]     1       6       0x8049348    0x1348       0x3           .init
+         0       0       0x4          0
 
-[7]     1       6       0x804934c    0x134c       0x680         .plt
-        0       0       0x4          0x4
+ [7]     1       6       0x804934c    0x134c       0x680         .plt
+         0       0       0x4          0x4
 
-[8]     1       6       0x80499cc    0x19cc       0x3c56f       .text
-        0       0       0x4          0
+ [8]     1       6       0x80499cc    0x19cc       0x3c56f       .text
+         0       0       0x4          0
 
-[9]     1       6       0x8085f3c    0x3df3c      0x3           .fini
-        0       0       0x4          0
+ [9]     1       6       0x8085f3c    0x3df3c      0x3           .fini
+         0       0       0x4          0
 
-[10]    1       2       0x8085f40    0x3df40      0x69c         .rodata
-        0       0       0x4          0
+ [10]    1       2       0x8085f40    0x3df40      0x69c         .rodata
+         0       0       0x4          0
 
-[11]    1       2       0x80865dc    0x3e5dc      0xd51         .rodata1
-        0       0       0x4          0
+ [11]    1       2       0x80865dc    0x3e5dc      0xd51         .rodata1
+         0       0       0x4          0
 
-[12]    1       3       0x8088330    0x3f330      0x20afc       .data
-        0       0       0x4          0
+ [12]    1       3       0x8088330    0x3f330      0x20afc       .data
+         0       0       0x4          0
 
-[13]    1       3       0x80a8e2c    0x5fe2c      0x89d         .data1
-        0       0       0x4          0
+ [13]    1       3       0x80a8e2c    0x5fe2c      0x89d         .data1
+         0       0       0x4          0
 
-[14]    1       3       0x80a96cc    0x606cc      0x1a8         .got
-        0       0       0x4          0x4
+ [14]    1       3       0x80a96cc    0x606cc      0x1a8         .got
+         0       0       0x4          0x4
 
-[15]    6       3       0x80a9874    0x60874      0x80          .dynamic
-        4       0       0x4          0x8
+ [15]    6       3       0x80a9874    0x60874      0x80          .dynamic
+         4       0       0x4          0x8
 
-[16]    8       3       0x80a98f4    0x608f4      0x449c        .bss
-        0       0       0x4          0
+ [16]    8       3       0x80a98f4    0x608f4      0x449c        .bss
+         0       0       0x4          0
 
-[17]    2       0       0            0x608f4      0x9b90        .symtab
-        18      371     0x4          0x10
+ [17]    2       0       0            0x608f4      0x9b90        .symtab
+         18      371     0x4          0x10
 
-[18]    3       0       0            0x6a484      0x8526        .strtab
-        0       0       0x1          0
+ [18]    3       0       0            0x6a484      0x8526        .strtab
+         0       0       0x1          0
 
-[19]    3       0       0            0x729aa      0x93          .shstrtab
-        0       0       0x1          0
+ [19]    3       0       0            0x729aa      0x93          .shstrtab
+         0       0       0x1          0
 
-[20]    1       0       0            0x72a3d      0x68b7        .comment
-        0       0       0x1          0
+ [20]    1       0       0            0x72a3d      0x68b7        .comment
+         0       0       0x1          0
 
-raid:/nfs/raid/src/dist-18.56/src> dump -h xemacs
+ raid:/nfs/raid/src/dist-18.56/src> dump -h xemacs
 
-xemacs:
+ xemacs:
 
-           **** SECTION HEADER TABLE ****
-[No]    Type    Flags   Addr         Offset       Size          Name
-        Link    Info    Adralgn      Entsize
+            **** SECTION HEADER TABLE ****
+ [No]    Type    Flags   Addr         Offset       Size          Name
+         Link    Info    Adralgn      Entsize
 
-[1]     1       2       0x80480d4    0xd4         0x13          .interp
-        0       0       0x1          0
+ [1]     1       2       0x80480d4    0xd4         0x13          .interp
+         0       0       0x1          0
 
-[2]     5       2       0x80480e8    0xe8         0x388         .hash
-        3       0       0x4          0x4
+ [2]     5       2       0x80480e8    0xe8         0x388         .hash
+         3       0       0x4          0x4
 
-[3]     11      2       0x8048470    0x470        0x7f0         .dynsym
-        4       1       0x4          0x10
+ [3]     11      2       0x8048470    0x470        0x7f0         .dynsym
+         4       1       0x4          0x10
 
-[4]     3       2       0x8048c60    0xc60        0x3ad         .dynstr
-        0       0       0x1          0
+ [4]     3       2       0x8048c60    0xc60        0x3ad         .dynstr
+         0       0       0x1          0
 
-[5]     9       2       0x8049010    0x1010       0x338         .rel.plt
-        3       7       0x4          0x8
+ [5]     9       2       0x8049010    0x1010       0x338         .rel.plt
+         3       7       0x4          0x8
 
-[6]     1       6       0x8049348    0x1348       0x3           .init
-        0       0       0x4          0
+ [6]     1       6       0x8049348    0x1348       0x3           .init
+         0       0       0x4          0
 
-[7]     1       6       0x804934c    0x134c       0x680         .plt
-        0       0       0x4          0x4
+ [7]     1       6       0x804934c    0x134c       0x680         .plt
+         0       0       0x4          0x4
 
-[8]     1       6       0x80499cc    0x19cc       0x3c56f       .text
-        0       0       0x4          0
+ [8]     1       6       0x80499cc    0x19cc       0x3c56f       .text
+         0       0       0x4          0
 
-[9]     1       6       0x8085f3c    0x3df3c      0x3           .fini
-        0       0       0x4          0
+ [9]     1       6       0x8085f3c    0x3df3c      0x3           .fini
+         0       0       0x4          0
 
-[10]    1       2       0x8085f40    0x3df40      0x69c         .rodata
-        0       0       0x4          0
+ [10]    1       2       0x8085f40    0x3df40      0x69c         .rodata
+         0       0       0x4          0
 
-[11]    1       2       0x80865dc    0x3e5dc      0xd51         .rodata1
-        0       0       0x4          0
+ [11]    1       2       0x80865dc    0x3e5dc      0xd51         .rodata1
+         0       0       0x4          0
 
-[12]    1       3       0x8088330    0x3f330      0x20afc       .data
-        0       0       0x4          0
+ [12]    1       3       0x8088330    0x3f330      0x20afc       .data
+         0       0       0x4          0
 
-[13]    1       3       0x80a8e2c    0x5fe2c      0x89d         .data1
-        0       0       0x4          0
+ [13]    1       3       0x80a8e2c    0x5fe2c      0x89d         .data1
+         0       0       0x4          0
 
-[14]    1       3       0x80a96cc    0x606cc      0x1a8         .got
-        0       0       0x4          0x4
+ [14]    1       3       0x80a96cc    0x606cc      0x1a8         .got
+         0       0       0x4          0x4
 
-[15]    6       3       0x80a9874    0x60874      0x80          .dynamic
-        4       0       0x4          0x8
+ [15]    6       3       0x80a9874    0x60874      0x80          .dynamic
+         4       0       0x4          0x8
 
-[16]    8       3       0x80c6800    0x7d800      0             .bss
-        0       0       0x4          0
+ [16]    8       3       0x80c6800    0x7d800      0             .bss
+         0       0       0x4          0
 
-[17]    2       0       0            0x7d800      0x9b90        .symtab
-        18      371     0x4          0x10
+ [17]    2       0       0            0x7d800      0x9b90        .symtab
+         18      371     0x4          0x10
 
-[18]    3       0       0            0x87390      0x8526        .strtab
-        0       0       0x1          0
+ [18]    3       0       0            0x87390      0x8526        .strtab
+         0       0       0x1          0
 
-[19]    3       0       0            0x8f8b6      0x93          .shstrtab
-        0       0       0x1          0
+ [19]    3       0       0            0x8f8b6      0x93          .shstrtab
+         0       0       0x1          0
 
-[20]    1       0       0            0x8f949      0x68b7        .comment
-        0       0       0x1          0
+ [20]    1       0       0            0x8f949      0x68b7        .comment
+         0       0       0x1          0
 
-[21]    1       3       0x80a98f4    0x608f4      0x1cf0c       .data
-        0       0       0x4          0
+ [21]    1       3       0x80a98f4    0x608f4      0x1cf0c       .data
+         0       0       0x4          0
 
- * This is an example of how the file header is changed.  "Shoff" is
- * the section header offset within the file.  Since that table is
- * after the new .data section, it is moved.  "Shnum" is the number of
- * sections, which we increment.
- *
- * "Phoff" is the file offset to the program header.  "Phentsize" and
- * "Shentsz" are the program and section header entries sizes respectively.
- * These can be larger than the apparent struct sizes.
+  * This is an example of how the file header is changed.  "Shoff" is
+  * the section header offset within the file.  Since that table is
+  * after the new .data section, it is moved.  "Shnum" is the number of
+  * sections, which we increment.
+  *
+  * "Phoff" is the file offset to the program header.  "Phentsize" and
+  * "Shentsz" are the program and section header entries sizes respectively.
+  * These can be larger than the apparent struct sizes.
 
-raid:/nfs/raid/src/dist-18.56/src> dump -f temacs
+ raid:/nfs/raid/src/dist-18.56/src> dump -f temacs
 
-temacs:
+ temacs:
 
-                    **** ELF HEADER ****
-Class        Data       Type         Machine     Version
-Entry        Phoff      Shoff        Flags       Ehsize
-Phentsize    Phnum      Shentsz      Shnum       Shstrndx
+                     **** ELF HEADER ****
+ Class        Data       Type         Machine     Version
+ Entry        Phoff      Shoff        Flags       Ehsize
+ Phentsize    Phnum      Shentsz      Shnum       Shstrndx
 
-1            1          2            3           1
-0x80499cc    0x34       0x792f4      0           0x34
-0x20         5          0x28         21          19
+ 1            1          2            3           1
+ 0x80499cc    0x34       0x792f4      0           0x34
+ 0x20         5          0x28         21          19
 
-raid:/nfs/raid/src/dist-18.56/src> dump -f xemacs
+ raid:/nfs/raid/src/dist-18.56/src> dump -f xemacs
 
-xemacs:
+ xemacs:
 
-                    **** ELF HEADER ****
-Class        Data       Type         Machine     Version
-Entry        Phoff      Shoff        Flags       Ehsize
-Phentsize    Phnum      Shentsz      Shnum       Shstrndx
+                     **** ELF HEADER ****
+ Class        Data       Type         Machine     Version
+ Entry        Phoff      Shoff        Flags       Ehsize
+ Phentsize    Phnum      Shentsz      Shnum       Shstrndx
 
-1            1          2            3           1
-0x80499cc    0x34       0x96200      0           0x34
-0x20         5          0x28         22          19
+ 1            1          2            3           1
+ 0x80499cc    0x34       0x96200      0           0x34
+ 0x20         5          0x28         22          19
 
- * These are the program headers.  "Offset" is the file offset to the
- * segment.  "Vaddr" is the memory load address.  "Filesz" is the
- * segment size as it appears in the file, and "Memsz" is the size in
- * memory.  Below, the third segment is the code and the fourth is the
- * data: the difference between Filesz and Memsz is .bss
+  * These are the program headers.  "Offset" is the file offset to the
+  * segment.  "Vaddr" is the memory load address.  "Filesz" is the
+  * segment size as it appears in the file, and "Memsz" is the size in
+  * memory.  Below, the third segment is the code and the fourth is the
+  * data: the difference between Filesz and Memsz is .bss
 
-raid:/nfs/raid/src/dist-18.56/src> dump -o temacs
+ raid:/nfs/raid/src/dist-18.56/src> dump -o temacs
 
-temacs:
- ***** PROGRAM EXECUTION HEADER *****
-Type        Offset      Vaddr       Paddr
-Filesz      Memsz       Flags       Align
+ temacs:
+  ***** PROGRAM EXECUTION HEADER *****
+ Type        Offset      Vaddr       Paddr
+ Filesz      Memsz       Flags       Align
 
-6           0x34        0x8048034   0
-0xa0        0xa0        5           0
+ 6           0x34        0x8048034   0
+ 0xa0        0xa0        5           0
 
-3           0xd4        0           0
-0x13        0           4           0
+ 3           0xd4        0           0
+ 0x13        0           4           0
 
-1           0x34        0x8048034   0
-0x3f2f9     0x3f2f9     5           0x1000
+ 1           0x34        0x8048034   0
+ 0x3f2f9     0x3f2f9     5           0x1000
 
-1           0x3f330     0x8088330   0
-0x215c4     0x25a60     7           0x1000
+ 1           0x3f330     0x8088330   0
+ 0x215c4     0x25a60     7           0x1000
 
-2           0x60874     0x80a9874   0
-0x80        0           7           0
+ 2           0x60874     0x80a9874   0
+ 0x80        0           7           0
 
-raid:/nfs/raid/src/dist-18.56/src> dump -o xemacs
+ raid:/nfs/raid/src/dist-18.56/src> dump -o xemacs
 
-xemacs:
- ***** PROGRAM EXECUTION HEADER *****
-Type        Offset      Vaddr       Paddr
-Filesz      Memsz       Flags       Align
+ xemacs:
+  ***** PROGRAM EXECUTION HEADER *****
+ Type        Offset      Vaddr       Paddr
+ Filesz      Memsz       Flags       Align
 
-6           0x34        0x8048034   0
-0xa0        0xa0        5           0
+ 6           0x34        0x8048034   0
+ 0xa0        0xa0        5           0
 
-3           0xd4        0           0
-0x13        0           4           0
+ 3           0xd4        0           0
+ 0x13        0           4           0
 
-1           0x34        0x8048034   0
-0x3f2f9     0x3f2f9     5           0x1000
+ 1           0x34        0x8048034   0
+ 0x3f2f9     0x3f2f9     5           0x1000
 
-1           0x3f330     0x8088330   0
-0x3e4d0     0x3e4d0     7           0x1000
+ 1           0x3f330     0x8088330   0
+ 0x3e4d0     0x3e4d0     7           0x1000
 
-2           0x60874     0x80a9874   0
-0x80        0           7           0
+ 2           0x60874     0x80a9874   0
+ 0x80        0           7           0
 
 
  */
@@ -329,71 +336,71 @@
  * The above example now should look like:
 
            **** SECTION HEADER TABLE ****
-[No]    Type    Flags   Addr         Offset       Size          Name
-        Link    Info    Adralgn      Entsize
+ [No]    Type    Flags   Addr         Offset       Size          Name
+         Link    Info    Adralgn      Entsize
 
-[1]     1       2       0x80480d4    0xd4         0x13          .interp
-        0       0       0x1          0
+ [1]     1       2       0x80480d4    0xd4         0x13          .interp
+         0       0       0x1          0
 
-[2]     5       2       0x80480e8    0xe8         0x388         .hash
-        3       0       0x4          0x4
+ [2]     5       2       0x80480e8    0xe8         0x388         .hash
+         3       0       0x4          0x4
 
-[3]     11      2       0x8048470    0x470        0x7f0         .dynsym
-        4       1       0x4          0x10
+ [3]     11      2       0x8048470    0x470        0x7f0         .dynsym
+         4       1       0x4          0x10
 
-[4]     3       2       0x8048c60    0xc60        0x3ad         .dynstr
-        0       0       0x1          0
+ [4]     3       2       0x8048c60    0xc60        0x3ad         .dynstr
+         0       0       0x1          0
 
-[5]     9       2       0x8049010    0x1010       0x338         .rel.plt
-        3       7       0x4          0x8
+ [5]     9       2       0x8049010    0x1010       0x338         .rel.plt
+         3       7       0x4          0x8
 
-[6]     1       6       0x8049348    0x1348       0x3           .init
-        0       0       0x4          0
+ [6]     1       6       0x8049348    0x1348       0x3           .init
+         0       0       0x4          0
 
-[7]     1       6       0x804934c    0x134c       0x680         .plt
-        0       0       0x4          0x4
+ [7]     1       6       0x804934c    0x134c       0x680         .plt
+         0       0       0x4          0x4
 
-[8]     1       6       0x80499cc    0x19cc       0x3c56f       .text
-        0       0       0x4          0
+ [8]     1       6       0x80499cc    0x19cc       0x3c56f       .text
+         0       0       0x4          0
 
-[9]     1       6       0x8085f3c    0x3df3c      0x3           .fini
-        0       0       0x4          0
+ [9]     1       6       0x8085f3c    0x3df3c      0x3           .fini
+         0       0       0x4          0
 
-[10]    1       2       0x8085f40    0x3df40      0x69c         .rodata
-        0       0       0x4          0
+ [10]    1       2       0x8085f40    0x3df40      0x69c         .rodata
+         0       0       0x4          0
 
-[11]    1       2       0x80865dc    0x3e5dc      0xd51         .rodata1
-        0       0       0x4          0
+ [11]    1       2       0x80865dc    0x3e5dc      0xd51         .rodata1
+         0       0       0x4          0
 
-[12]    1       3       0x8088330    0x3f330      0x20afc       .data
-        0       0       0x4          0
+ [12]    1       3       0x8088330    0x3f330      0x20afc       .data
+         0       0       0x4          0
 
-[13]    1       3       0x80a8e2c    0x5fe2c      0x89d         .data1
-        0       0       0x4          0
+ [13]    1       3       0x80a8e2c    0x5fe2c      0x89d         .data1
+         0       0       0x4          0
 
-[14]    1       3       0x80a96cc    0x606cc      0x1a8         .got
-        0       0       0x4          0x4
+ [14]    1       3       0x80a96cc    0x606cc      0x1a8         .got
+         0       0       0x4          0x4
 
-[15]    6       3       0x80a9874    0x60874      0x80          .dynamic
-        4       0       0x4          0x8
+ [15]    6       3       0x80a9874    0x60874      0x80          .dynamic
+         4       0       0x4          0x8
 
-[16]    1       3       0x80a98f4    0x608f4      0x1cf0c       .data
-        0       0       0x4          0
+ [16]    1       3       0x80a98f4    0x608f4      0x1cf0c       .data
+         0       0       0x4          0
 
-[17]    8       3       0x80c6800    0x7d800      0             .bss
-        0       0       0x4          0
+ [17]    8       3       0x80c6800    0x7d800      0             .bss
+         0       0       0x4          0
 
-[18]    2       0       0            0x7d800      0x9b90        .symtab
-        19      371     0x4          0x10
+ [18]    2       0       0            0x7d800      0x9b90        .symtab
+         19      371     0x4          0x10
 
-[19]    3       0       0            0x87390      0x8526        .strtab
-        0       0       0x1          0
+ [19]    3       0       0            0x87390      0x8526        .strtab
+         0       0       0x1          0
 
-[20]    3       0       0            0x8f8b6      0x93          .shstrtab
-        0       0       0x1          0
+ [20]    3       0       0            0x8f8b6      0x93          .shstrtab
+         0       0       0x1          0
 
-[21]    1       0       0            0x8f949      0x68b7        .comment
-        0       0       0x1          0
+ [21]    1       0       0            0x8f949      0x68b7        .comment
+         0       0       0x1          0
 
  */
 
@@ -402,17 +409,16 @@
 
 #ifndef emacs
 #define fatal(a, b...) fprintf (stderr, a, ##b), exit (1)
+#include <string.h>
 #else
 #include "config.h"
-extern void fatal (char *, ...);
+extern void fatal (const char *msgid, ...);
 #endif
 
 #include <sys/types.h>
 #include <stdio.h>
-#include <stdlib.h>
 #include <sys/stat.h>
 #include <memory.h>
-#include <string.h>
 #include <errno.h>
 #include <unistd.h>
 #include <fcntl.h>
@@ -420,10 +426,10 @@
 #include <elf.h>
 #endif
 #include <sys/mman.h>
-#if defined (__sony_news) && defined (_SYSTYPE_SYSV)
+#if defined (_SYSTYPE_SYSV)
 #include <sys/elf_mips.h>
 #include <sym.h>
-#endif /* __sony_news && _SYSTYPE_SYSV */
+#endif /* _SYSTYPE_SYSV */
 #if __sgi
 #include <syms.h> /* for HDRR declaration */
 #endif /* __sgi */
@@ -470,7 +476,7 @@
 	long cbFdOffset;
 	long cbRfdOffset;
 	long cbExtOffset;
-} HDRR, *pHDRR; 
+} HDRR, *pHDRR;
 #define cbHDRR sizeof(HDRR)
 #define hdrNil ((pHDRR)0)
 #endif
@@ -479,7 +485,7 @@
 /*
  * NetBSD does not have normal-looking user-land ELF support.
  */
-# ifdef __alpha__
+# if defined __alpha__ || defined __sparc_v9__
 #  define ELFSIZE	64
 # else
 #  define ELFSIZE	32
@@ -488,6 +494,9 @@
 
 # ifndef PT_LOAD
 #  define PT_LOAD	Elf_pt_load
+#  if 0						/* was in pkgsrc patches for 20.7 */
+#   define SHT_PROGBITS Elf_sht_progbits
+#  endif
 #  define SHT_SYMTAB	Elf_sht_symtab
 #  define SHT_DYNSYM	Elf_sht_dynsym
 #  define SHT_NULL	Elf_sht_null
@@ -498,13 +507,18 @@
 #  define SHN_UNDEF	Elf_eshn_undefined
 #  define SHN_ABS	Elf_eshn_absolute
 #  define SHN_COMMON	Elf_eshn_common
-# endif
+# endif /* !PT_LOAD */
 
 # ifdef __alpha__
 #  include <sys/exec_ecoff.h>
 #  define HDRR		struct ecoff_symhdr
 #  define pHDRR		HDRR *
-# endif
+# endif /* __alpha__ */
+
+#ifdef __mips__			/* was in pkgsrc patches for 20.7 */
+# define SHT_MIPS_DEBUG	DT_MIPS_FLAGS
+# define HDRR		struct Elf_Shdr
+#endif /* __mips__ */
 #endif /* __NetBSD__ */
 
 #ifdef __OpenBSD__
@@ -636,7 +650,7 @@
 {
   int new_file, old_file, new_file_size;
 
-  /* Pointers to the base of the image of the two files. */
+  /* Pointers to the base of the image of the two files.  */
   caddr_t old_base, new_base;
 
 #if MAP_ANON == 0
@@ -651,7 +665,7 @@
   ElfW(Phdr) *old_program_h, *new_program_h;
   ElfW(Shdr) *old_section_h, *new_section_h;
 
-  /* Point to the section name table in the old file */
+  /* Point to the section name table in the old file.  */
   char *old_section_names;
 
   ElfW(Addr) old_bss_addr, new_bss_addr;
@@ -660,7 +674,7 @@
   ElfW(Addr) new_data2_addr;
 
   int n, nn;
-  int old_bss_index, old_sbss_index;
+  int old_bss_index, old_sbss_index, old_plt_index;
   int old_data_index, new_data2_index;
   int old_mdebug_index;
   struct stat stat_buf;
@@ -710,8 +724,7 @@
 				   old_name, old_file_h, old_section_h, 1);
 
   /* Find the old .bss section.  Figure out parameters of the new
-   * data2 and bss sections.
-   */
+     data2 and bss sections.  */
 
   old_bss_index = find_section (".bss", old_section_names,
 				old_name, old_file_h, old_section_h, 0);
@@ -719,15 +732,34 @@
   old_sbss_index = find_section (".sbss", old_section_names,
 				 old_name, old_file_h, old_section_h, 1);
   if (old_sbss_index != -1)
-    if (OLD_SECTION_H (old_sbss_index).sh_type == SHT_PROGBITS)
+    if (OLD_SECTION_H (old_sbss_index).sh_type != SHT_NOBITS)
       old_sbss_index = -1;
 
-  if (old_sbss_index == -1)
+  /* PowerPC64 has .plt in the BSS section.  */
+  old_plt_index = find_section (".plt", old_section_names,
+				old_name, old_file_h, old_section_h, 1);
+  if (old_plt_index != -1)
+    if (OLD_SECTION_H (old_plt_index).sh_type != SHT_NOBITS)
+      old_plt_index = -1;
+
+  if (old_sbss_index == -1 && old_plt_index == -1)
     {
       old_bss_addr = OLD_SECTION_H (old_bss_index).sh_addr;
       old_bss_size = OLD_SECTION_H (old_bss_index).sh_size;
       new_data2_index = old_bss_index;
     }
+  else if (old_plt_index != -1
+	   && (old_sbss_index == -1
+	       || (OLD_SECTION_H (old_sbss_index).sh_addr
+		   > OLD_SECTION_H (old_plt_index).sh_addr)))
+    {
+      old_bss_addr = OLD_SECTION_H (old_plt_index).sh_addr;
+      old_bss_size = OLD_SECTION_H (old_bss_index).sh_size
+	+ OLD_SECTION_H (old_plt_index).sh_size;
+      if (old_sbss_index != -1)
+	old_bss_size += OLD_SECTION_H (old_sbss_index).sh_size;
+      new_data2_index = old_plt_index;
+    }
   else
     {
       old_bss_addr = OLD_SECTION_H (old_sbss_index).sh_addr;
@@ -789,8 +821,7 @@
     ((byte *) new_base + old_file_h->e_shoff + new_data2_size);
 
   /* Make our new file, program and section headers as copies of the
-   * originals.
-   */
+     originals.  */
 
   memcpy (new_file_h, old_file_h, old_file_h->e_ehsize);
   memcpy (new_program_h, old_program_h,
@@ -800,8 +831,7 @@
   PATCH_INDEX (new_file_h->e_shstrndx);
 
   /* Fix up file header.  We'll add one section.  Section header is
-   * further away now.
-   */
+     further away now.  */
 
   new_file_h->e_shoff += new_data2_size;
   new_file_h->e_shnum += 1;
@@ -814,12 +844,11 @@
 #endif
 
   /* Fix up a new program header.  Extend the writable data segment so
-   * that the bss area is covered too. Find that segment by looking
-   * for a segment that ends just before the .bss area.  Make sure
-   * that no segments are above the new .data2.  Put a loop at the end
-   * to adjust the offset and address of any segment that is above
-   * data2, just in case we decide to allow this later.
-   */
+     that the bss area is covered too. Find that segment by looking
+     for a segment that ends just before the .bss area.  Make sure
+     that no segments are above the new .data2.  Put a loop at the end
+     to adjust the offset and address of any segment that is above
+     data2, just in case we decide to allow this later.  */
 
   for (n = new_file_h->e_phnum - 1; n >= 0; n--)
     {
@@ -869,11 +898,10 @@
 #endif
 
   /* Fix up section headers based on new .data2 section.  Any section
-   * whose offset or virtual address is after the new .data2 section
-   * gets its value adjusted.  .bss size becomes zero and new address
-   * is set.  data2 section header gets added by copying the existing
-   * .data header and modifying the offset, address and size.
-   */
+     whose offset or virtual address is after the new .data2 section
+     gets its value adjusted.  .bss size becomes zero and new address
+     is set.  data2 section header gets added by copying the existing
+     .data header and modifying the offset, address and size.  */
   for (old_data_index = 1; old_data_index < (int) old_file_h->e_shnum;
        old_data_index++)
     if (!strcmp (old_section_names + OLD_SECTION_H (old_data_index).sh_name,
@@ -916,11 +944,11 @@
 
       memcpy (&NEW_SECTION_H (nn), &OLD_SECTION_H (n),
 	      old_file_h->e_shentsize);
-      
+
       if (n == old_bss_index
 	  /* The new bss and sbss section's size is zero, and its file offset
 	     and virtual address should be off by NEW_DATA2_SIZE.  */
-	  || n == old_sbss_index
+	  || n == old_sbss_index || n == old_plt_index
 	  )
 	{
 	  /* NN should be `old_s?bss_index + 1' at this point. */
@@ -977,11 +1005,11 @@
       if (NEW_SECTION_H (nn).sh_type != SHT_SYMTAB
 	  && NEW_SECTION_H (nn).sh_type != SHT_DYNSYM)
 	PATCH_INDEX (NEW_SECTION_H (nn).sh_info);
-      
+
       if (old_sbss_index != -1)
 	if (!strcmp (old_section_names + NEW_SECTION_H (nn).sh_name, ".sbss"))
 	  {
-	    NEW_SECTION_H (nn).sh_offset = 
+	    NEW_SECTION_H (nn).sh_offset =
 	      round_up (NEW_SECTION_H (nn).sh_offset,
 			NEW_SECTION_H (nn).sh_addralign);
 	    NEW_SECTION_H (nn).sh_type = SHT_PROGBITS;
@@ -1002,11 +1030,35 @@
 		      ".lit4")
 	  || !strcmp ((old_section_names + NEW_SECTION_H (n).sh_name),
 		      ".lit8")
+	  /* The conditional bit below was in Oliva's original code
+	     (1999-08-25) and seems to have been dropped by mistake
+	     subsequently.  It prevents a crash at startup under X in
+	     `IRIX64 6.5 6.5.17m', whether compiled on that relase or
+	     an earlier one.  It causes no trouble on the other ELF
+	     platforms I could test (Irix 6.5.15m, Solaris 8, Debian
+	     Potato x86, Debian Woody SPARC); however, it's reported
+	     to cause crashes under some version of GNU/Linux.  It's
+	     not yet clear what's changed in that Irix version to
+	     cause the problem, or why the fix sometimes fails under
+	     GNU/Linux.  There's probably no good reason to have
+	     something Irix-specific here, but this will have to do
+	     for now.  IRIX6_5 is the most specific macro we have to
+	     test.  -- fx 2002-10-01
+
+	     The issue _looks_ as though it's gone away on 6.5.18m,
+	     but maybe it's still lurking, to be triggered by some
+	     change in the binary.  It appears to concern the dynamic
+	     loader, but I never got anywhere with an SGI support call
+	     seeking clues.  -- fx 2002-11-29.  */
+#ifdef IRIX6_5
+	  || !strcmp ((old_section_names + NEW_SECTION_H (n).sh_name),
+		      ".got")
+#endif
 	  || !strcmp ((old_section_names + NEW_SECTION_H (n).sh_name),
 		      ".sdata1")
 	  || !strcmp ((old_section_names + NEW_SECTION_H (n).sh_name),
 		      ".data1")
-	  || !strcmp (old_section_names + NEW_SECTION_H (nn).sh_name,
+	  || !strcmp ((old_section_names + NEW_SECTION_H (n).sh_name),
 		      ".sbss"))
 	src = (caddr_t) OLD_SECTION_H (n).sh_addr;
       else
@@ -1036,12 +1088,12 @@
 	}
 #endif /* __alpha__ */
 
-#if defined (__sony_news) && defined (_SYSTYPE_SYSV)
+#if defined (_SYSTYPE_SYSV)
       if (NEW_SECTION_H (nn).sh_type == SHT_MIPS_DEBUG
-	  && old_mdebug_index != -1) 
+	  && old_mdebug_index != -1)
         {
-	  int diff = NEW_SECTION_H(nn).sh_offset 
-	 	- OLD_SECTION_H(old_mdebug_index).sh_offset;
+	  int diff = NEW_SECTION_H(nn).sh_offset
+		- OLD_SECTION_H(old_mdebug_index).sh_offset;
 	  HDRR *phdr = (HDRR *)(NEW_SECTION_H (nn).sh_offset + new_base);
 
 	  if (diff)
@@ -1059,10 +1111,10 @@
 	      phdr->cbExtOffset  += diff;
 	    }
 	}
-#endif /* __sony_news && _SYSTYPE_SYSV */
+#endif /* _SYSTYPE_SYSV */
 
 #if __sgi
-      /* Adjust  the HDRR offsets in .mdebug and copy the 
+      /* Adjust  the HDRR offsets in .mdebug and copy the
 	 line data if it's in its usual 'hole' in the object.
 	 Makes the new file debuggable with dbx.
 	 patches up two problems: the absolute file offsets
@@ -1164,54 +1216,68 @@
   for (n = new_file_h->e_shnum - 1; n; n--)
     {
       ElfW(Shdr) section = NEW_SECTION_H (n);
-      switch (section.sh_type) {
-      default:
-	break;
-      case SHT_REL:
-      case SHT_RELA:
-	/* This code handles two different size structs, but there should
-	   be no harm in that provided that r_offset is always the first
-	   member.  */
-	nn = section.sh_info;
-	if (nn && (!strcmp (old_section_names + NEW_SECTION_H (nn).sh_name, ".data")
-	    || !strcmp ((old_section_names + NEW_SECTION_H (nn).sh_name),
-			".sdata")
-	    || !strcmp ((old_section_names + NEW_SECTION_H (nn).sh_name),
-			".lit4")
-	    || !strcmp ((old_section_names + NEW_SECTION_H (nn).sh_name),
-			".lit8")
-	    || !strcmp ((old_section_names + NEW_SECTION_H (nn).sh_name),
-			".sdata1")
-	    || !strcmp ((old_section_names + NEW_SECTION_H (nn).sh_name),
-			".data1")))
-	  {
-	    ElfW(Addr) offset = NEW_SECTION_H (nn).sh_addr -
-	      NEW_SECTION_H (nn).sh_offset;
-	    caddr_t reloc = old_base + section.sh_offset, end;
-	    for (end = reloc + section.sh_size; reloc < end;
-		 reloc += section.sh_entsize)
-	      {
-		ElfW(Addr) addr = ((ElfW(Rel) *) reloc)->r_offset - offset;
+
+      /* Cause a compilation error if anyone uses n instead of nn below.  */
+      struct {int a;} n;
+      (void)n.a;		/* Prevent `unused variable' warnings.  */
+
+      switch (section.sh_type)
+	{
+	default:
+	  break;
+	case SHT_REL:
+	case SHT_RELA:
+	  /* This code handles two different size structs, but there should
+	     be no harm in that provided that r_offset is always the first
+	     member.  */
+	  nn = section.sh_info;
+	  if (!strcmp (old_section_names + NEW_SECTION_H (nn).sh_name, ".data")
+	      || !strcmp ((old_section_names + NEW_SECTION_H (nn).sh_name),
+			  ".sdata")
+	      || !strcmp ((old_section_names + NEW_SECTION_H (nn).sh_name),
+			  ".lit4")
+	      || !strcmp ((old_section_names + NEW_SECTION_H (nn).sh_name),
+			  ".lit8")
+#ifdef IRIX6_5			/* see above */
+	      || !strcmp ((old_section_names + NEW_SECTION_H (nn).sh_name),
+			  ".got")
+#endif
+	      || !strcmp ((old_section_names + NEW_SECTION_H (nn).sh_name),
+			  ".sdata1")
+	      || !strcmp ((old_section_names + NEW_SECTION_H (nn).sh_name),
+			  ".data1"))
+	    {
+	      ElfW(Addr) offset = (NEW_SECTION_H (nn).sh_addr
+				   - NEW_SECTION_H (nn).sh_offset);
+	      caddr_t reloc = old_base + section.sh_offset, end;
+	      for (end = reloc + section.sh_size; reloc < end;
+		   reloc += section.sh_entsize)
+		{
+		  ElfW(Addr) addr = ((ElfW(Rel) *) reloc)->r_offset - offset;
 #ifdef __alpha__
-		/* The Alpha ELF binutils currently have a bug that
-		   sometimes results in relocs that contain all
-		   zeroes.  Work around this for now...  */
-		if (((ElfW(Rel) *) reloc)->r_offset == 0)
+		  /* The Alpha ELF binutils currently have a bug that
+		     sometimes results in relocs that contain all
+		     zeroes.  Work around this for now...  */
+		  if (((ElfW(Rel) *) reloc)->r_offset == 0)
 		    continue;
 #endif
-		memcpy (new_base + addr, old_base + addr, sizeof(ElfW(Addr)));
-	      }
-	  }
-	break;
-      }
+		  memcpy (new_base + addr, old_base + addr, sizeof(ElfW(Addr)));
+		}
+	    }
+	  break;
+	}
     }
 
   /* Write out new_file, and free the buffers.  */
 
   if (write (new_file, new_base, new_file_size) != new_file_size)
+#ifndef emacs
+    fatal ("Didn't write %d bytes: errno %d\n",
+	   new_file_size, errno);
+#else
     fatal ("Didn't write %d bytes to %s: errno %d\n",
 	   new_file_size, new_base, errno);
-
+#endif
   munmap (old_base, old_file_size);
   munmap (new_base, new_file_size);
 
@@ -1236,12 +1302,12 @@
   if (chmod (new_name, stat_buf.st_mode) == -1)
     fatal ("Can't chmod (%s): errno %d\n", new_name, errno);
 }
-/* All of the above is from the emacs-20.7 file.  This comment and the
+/* All of the above is from the emacs-22.2 file.  This comment and the
    following are added for gcl.  Also we changed the above (near "for
    gcl") we make the NEW_SECTION_H executable since it will have code
    in it.  NEW_SECTION_H (nn).sh_flags |= SHF_EXECINSTR;
    
-   Partly synchronized with Emacs HEAD of 2004-04-12 by Magnus Henoch.
+   Synchronized with Emacs 22.2 on 2008-11-07 by Jerry James.
    The files themselves are no longer mmap'ed, but memory is allocated
    with mmap, and everything is written to the new file at the end.
 */

gcl-2.6.8-debuginfo.patch:

--- NEW FILE gcl-2.6.8-debuginfo.patch ---
diff -dur gcl-2.6.8.ORIG/o/makefile gcl-2.6.8/o/makefile
--- gcl-2.6.8.ORIG/o/makefile	2006-10-18 11:08:56.000000000 -0600
+++ gcl-2.6.8/o/makefile	2009-01-07 16:10:38.000000000 -0700
@@ -27,7 +27,6 @@
 %.o: %.d $(DECL)
 	$(DPP) $*
 	$(CC) -c $(CFLAGS) $(DEFS) $*.c $(AUX_INFO)
-	rm $*.c
 
 CPP=
 %.ini: %.c grab_defs plt.h

gcl-2.6.8-elisp.patch:

--- NEW FILE gcl-2.6.8-elisp.patch ---
diff -dur gcl-2.6.8.ORIG/elisp/ansi-doc.el gcl-2.6.8/elisp/ansi-doc.el
--- gcl-2.6.8.ORIG/elisp/ansi-doc.el	1999-12-06 15:43:59.000000000 -0700
+++ gcl-2.6.8/elisp/ansi-doc.el	2008-12-29 21:15:15.000000000 -0700
@@ -9,6 +9,8 @@
 ;; xdvi.   You may gzip the .dvi files and it will unzip them into tmp
 ;; as needed.
 
+(eval-and-compile
+  (require 'cl))
 
 (defvar ansi-doc-dir "/usr/local/doc/dpANS2")
 (defvar ansi-doc-alist nil)
@@ -55,38 +57,28 @@
 or topic.   If there are several pieces of documentation then go through
 them successively.   Requires copying the "
   (interactive )
-  (let (x tem name lis first chap tmp-chap)
-    (or ansi-doc-alist
-	(progn
-	  (create-index-el-from-index-idx )
-	  (load (concat ansi-doc-dir "/index.el"))))
-    (setq name (completing-read "Doc on: " ansi-doc-alist nil t))
-    (progn  (setq ans nil)   (setq lis ansi-doc-alist)
-	    (while lis
-	      (cond ((equal (car  (car lis)) name)
-		     (setq ans (append ans (cdr  (cdr (car lis)))))))
-	      (setq lis (cdr lis)))
-	    )	    
-    (setq tem ans)
-    (if (cdr tem) (setq first "First") (setq first ""))
-    (while tem
-      (setq x (car tem))
-      (setq chap (concat ansi-doc-dir
-		  (downcase (format "/chap-%s.dvi"  (car x)))))
-      (setq chap (maybe-gzip-to-tmp chap))
-      (message "%s Doc in Chapter %s page %s) %s .." first (car x) (cdr x))
-      (if (cdr tem) (setq first "Next") (setq next "Final"))
-      (shell-command (concat "xdvi  -expert -xoffset .2 -yoffset -.2 "
-			     " -paper 7.2x8.5 "
-			     " -display "
-			     (or x-display-name ":0")
-			     "  -geometry -2-2 +" (+ (cdr x) 2)" "
-			     chap
-			     ))
-      (setq tem (cdr tem))
-
-      )
-    )
-  (message nil)
-  
-  )
+  (unless ansi-doc-alist
+    (create-index-el-from-index-idx )
+    (load (concat ansi-doc-dir "/index.el")))
+  (let* ((name (completing-read "Doc on: " ansi-doc-alist nil t))
+	 (tem (mapcan #'(lambda (elem)
+			  (and (equal name (car elem)) (cddr elem)))
+		      ansi-doc-alist))
+	 (first (if (cdr tem) "First" "")))
+    (dolist (x tem)
+      (message "%s Doc in Chapter %s page %s) .." first (car x) (cdr x))
+      (let ((chap (maybe-gzip-to-tmp
+		   (concat ansi-doc-dir
+			   (downcase (format "/chap-%s.dvi"  (car x)))))))
+	(setq first (if (cdr tem) "Next" "Final"))
+	(shell-command (concat "xdvi  -expert -xoffset .2 -yoffset -.2 "
+			       " -paper 7.2x8.5 "
+			       " -display "
+			       (or
+				(if (featurep 'xemacs)
+				    (console-connection (selected-console))
+				  x-display-name)
+				":0")
+			       "  -geometry -2-2 +" (+ (cdr x) 2)" "
+			       chap)))))
+  (message nil))
diff -dur gcl-2.6.8.ORIG/elisp/dbl.el gcl-2.6.8/elisp/dbl.el
--- gcl-2.6.8.ORIG/elisp/dbl.el	2001-05-06 09:59:23.000000000 -0600
+++ gcl-2.6.8/elisp/dbl.el	2008-12-29 21:15:15.000000000 -0700
@@ -97,29 +97,35 @@
 ;(define-key ctl-x-map "&" 'send-dbl-command)
 
 ;;Of course you may use `def-dbl' with any other dbl command, including
-;;user defined ones.   
+;;user defined ones.
 
-(defmacro def-dbl (name key &optional doc)
+(defmacro def-dbl (name keys &optional doc)
+  (unless (consp keys)
+    (setq keys (list keys)))
   (let* ((fun (intern (format "dbl-%s" (read name))))
-	 )
-    (list 'progn
- 	  (list 'defun fun '(arg)
-		(or doc "")
-		'(interactive "p")
-		(list 'dbl-call name 'arg))
-	  (list 'define-key 'dbl-mode-map key  (list 'quote fun)))))
+	 (keydefs (mapcar #'(lambda (key) `(define-key dbl-mode-map ,key
+					    (quote ,fun)))
+		   keys)))
+    `(progn
+      (defun ,fun (arg)
+	,(or doc "")
+	(interactive "p")
+	(dbl-call ,name arg))
+      , at keydefs)))
 
-(def-dbl ":step %p"   "\M-s" "Step one source line with display")
-(def-dbl ":step %p"   "\C-c\C-s" "Step one source line with display")
-(def-dbl ":stepi %p"  "\C-c\t" "Step one instruction with display")
-(def-dbl ":next %p"   "\M-n" "Step one source line (skip functions)")
-(def-dbl ":next %p"   "\C-c\C-n" "Step one source line (skip functions)")
+(def-dbl ":step %p"  ("\M-s" "\C-c\C-s") "Step one source line with display")
+(def-dbl ":stepi %p" "\C-c\t" "Step one instruction with display")
+(def-dbl ":next %p"  ("\M-n" "\C-c\C-n") "Step one source line (skip functions)")
 (def-dbl ":r"   "\M-c" "Continue with display")
 
 (def-dbl ":finish" "\C-c\C-f" "Finish executing current function")
 (def-dbl ":up %p"     "\C-cu"   "Go up N stack frames (numeric arg) with display")
 (def-dbl ":down %p"   "\C-cd"   "Go down N stack frames (numeric arg) with display")
 
+(defvar dbl-last-frame nil)
+(defvar dbl-last-frame-displayed-p t)
+(defvar dbl-delete-prompt-marker nil)
+
 
 (defun dbl-mode ()
   "Major mode for interacting with an inferior Lisp or Maxima process.
@@ -227,7 +233,7 @@
 
 
 (defun dbl (p)
- 
+
  "Makes a dbl buffer, suitable for running an inferior
   gcl.  You are prompted for a name for the buffer.  After the shell
   starts you should start up your lisp program (eg gcl).  The bufferd
@@ -235,16 +241,13 @@
   debug loop with (si::dbl) or :dbl in a debug loop.  "
 
   (interactive "p")
-  
-  (let ( tem
-	(dir default-directory)
-	;; important for winnt version of emacs
+
+  (let (;; important for winnt version of emacs
 	(binary-process-input t)
 	(binary-process-output nil)
-	switches
 	(name (concat "dbl" (if (equal p 1) "" p) ""))
 	)
-    
+
     (switch-to-buffer (concat "*" name "*"))
     (or (bolp) (newline))
     (insert "Current directory is " default-directory "\n")
@@ -291,15 +294,6 @@
 ;; It records the filename and line number, and maybe displays that file.
 (defun dbl-filter (proc string)
   (let ((inhibit-quit t))
-    (set-buffer (process-buffer proc))
-    (goto-char (point-max))
-    (insert string)
-    (goto-char (point-max))
-    ))
-
-
-(defun dbl-filter (proc string)
-  (let ((inhibit-quit t))
     (if dbl-filter-accumulator
 	(dbl-filter-accumulate-marker proc
 				      (concat dbl-filter-accumulator string))
@@ -314,14 +308,13 @@
 	  (let ((end (string-match "\n" string)))
 	    (if end
               (progn
-		(setq me string)
 		(cond ((string-match
 			"\032\032\\([A-Za-z]?:?[^:]*\\):\\([0-9]*\\):[^\n]+\n"
 			string)
 		       (setq dbl-last-frame
 			      (cons
 			      (match-string 1 string)
-			      (string-to-int  (match-string 2 string))))
+			      (string-to-number (match-string 2 string))))
 		       
 		       (cond ((equal (cdr dbl-last-frame)  0)
 			      ;(message "got 0")
@@ -358,8 +351,7 @@
 (defun dbl-filter-insert (proc string)
   (let (moving
 	output-after-point 
-	(old-buffer (current-buffer))
-	start)
+	(old-buffer (current-buffer)))
     (set-buffer (process-buffer proc))
     ;; test to see if we will move the point.   We want that the
     ;; window-point of the buffer, should be equal to process-mark. 
@@ -370,7 +362,6 @@
 	(save-excursion
 	  ;; Insert the text, moving the process-marker.
 	  (goto-char (process-mark proc))
-	  (setq start (point))
 	  (insert string)
 	  (set-marker (process-mark proc) (point))
 	 ; (setq bill (cons (list 'hi (process-mark proc) (marker-position (process-mark proc)) (point)) bill))
@@ -488,19 +479,22 @@
   (interactive)
   (save-excursion
     (end-of-line)
-    (cond ((get-buffer-process (current-buffer))
-	   (cond
-	    ((save-excursion
-	       (beginning-of-line)
-		(get-text-property (point) 'file-line)))
-	    ((progn (end-of-line) (re-search-backward " \\([^: ]+\\):\\([0-9]+\\)" 300 nil))
-	     (setq file (buffer-substring (match-beginning 1) (match-end 1)))
-	     (setq line (buffer-substring (match-beginning 2) (match-end 2)))
-	     (setq line (read line))
-	     (and (integerp line)
-		  (setq file (search-path file 'dbl-dirs))
-		  (list file line)))))
-	  (t (list (buffer-file-name) (+ 1 (count-lines (point))))))))
+    (cond
+     ((get-buffer-process (current-buffer))
+      (cond
+       ((progn
+	  (beginning-of-line)
+	  (get-text-property (point) 'file-line)))
+       ((progn (end-of-line) (re-search-backward " \\([^: ]+\\):\\([0-9]+\\)" 300 nil))
+	(let ((file (buffer-substring (match-beginning 1) (match-end 1)))
+	      (line (buffer-substring (match-beginning 2) (match-end 2))))
+	  (setq line (read line))
+	  (and (integerp line)
+	       (setq file (search-path file 'dbl-dirs))
+	       (list file line))))))
+     (t (list (buffer-file-name)
+	      (+ 1 (if (featurep 'xemacs) (line-number)
+		     (line-number-at-pos))))))))
 
 (defun dbl-find-and-display-line ()
   (interactive)
@@ -554,8 +548,8 @@
   (goto-char (point-max))
   (setq dbl-delete-prompt-marker (point-marker))
   (dbl-set-buffer)
-  (send-string (get-buffer-process current-dbl-buffer)
-	       (concat command "\n"))))
+  (process-send-string (get-buffer-process current-dbl-buffer)
+		       (concat command "\n"))))
 
 (defun dbl-subtitute-% (command n)
   (let* (result
@@ -566,8 +560,8 @@
 	   (cond (in-dbl (setq file-line (dbl-find-line)))
 		 (t (setq file-line
 			  (list (buffer-file-name)
-				(+ 1 (count-lines
-							 (point)))))))))
+				(+ 1 (if (featurep 'xemacs) (line-number)
+				       (line-number-at-pos)))))))))
     (while (and command (string-match "\\([^%]*\\)%\\([adeflp]\\)" command))
       (let ((letter (string-to-char (substring command (match-beginning 2))))
 	    subst)
@@ -620,8 +614,8 @@
 	     (if (get-buffer-process (current-buffer))
 		 (setq current-dbl-buffer (current-buffer)))
 	     (message name)
-	     (send-string (get-buffer-process current-dbl-buffer)
-			  (concat name "\n"))
+	     (process-send-string (get-buffer-process current-dbl-buffer)
+				  (concat name "\n"))
 	     (other-window 1)
 	     )))
 	(t
@@ -632,20 +626,21 @@
 		       (1+ (count-lines 1 (point))))))
 	   (and    downcase-filenames-for-dbl
 		   (setq file-name (downcase file-name)))
-	   (send-string (get-buffer-process current-dbl-buffer)
-			(concat "break " file-name ":" line "\n"))))))
+	   (process-send-string (get-buffer-process current-dbl-buffer)
+				(concat "break " file-name ":" line "\n"))))))
 	
 	
 (defun dbl-read-address()
   "Return a string containing the core-address found in the buffer at point."
   (save-excursion
-   (let ((pt (dot)) found begin)
-     (setq found (if (search-backward "0x" (- pt 7) t)(dot)))
-     (cond (found (forward-char 2)(setq result
-			(buffer-substring found
-				 (progn (re-search-forward "[^0-9a-f]")
-					(forward-char -1)
-					(dot)))))
+   (let* ((pt (dot))
+	  (found (if (search-backward "0x" (- pt 7) t) (dot)))
+	  begin)
+     (cond (found (forward-char 2)
+		  (buffer-substring found
+				    (progn (re-search-forward "[^0-9a-f]")
+					   (forward-char -1)
+					   (dot))))
 	   (t (setq begin (progn (re-search-backward "[^0-9]") (forward-char 1)
 				 (dot)))
 	      (forward-char 1)
@@ -680,6 +675,6 @@
 	  (t (setq comm addr)))
     (switch-to-buffer current-dbl-buffer)
     (goto-char (dot-max))
-    (insert-string comm)))
+    (insert comm)))
 
 (provide 'dbl)
diff -dur gcl-2.6.8.ORIG/elisp/doc-to-texi.el gcl-2.6.8/elisp/doc-to-texi.el
--- gcl-2.6.8.ORIG/elisp/doc-to-texi.el	1999-12-06 15:43:59.000000000 -0700
+++ gcl-2.6.8/elisp/doc-to-texi.el	2008-12-29 21:15:15.000000000 -0700
@@ -51,7 +51,7 @@
 	   (let ((fun (get-match 1))
 		 (type (get-match 2))
 		 (package (get-match 3))
-		 args body)
+		 body)
 	     (goto-char (match-end 0))
 	     (setq body (buffer-substring (point) (- end 1)))
 	     (delete-region beg end )
@@ -78,22 +78,22 @@
 			  (?d .  "{Declaration}"))))))
       (if u (replace-match u)))))
 
-(setq b-alist '((?n . "number.texi")
-		(?s . "sequence.texi")
-		(?c . "character.texi")
-		(?l . "list.texi")
-		(?i . "io.texi")
-		(?a . "internal.texi")
-		(?f . "form.texi")
-		(?C . "compile.texi")
-		(?S . "symbol.texi")
-		(?t . "system.texi")
-		(?d . "structure.texi")
-		(?I . "iteration.texi")
-		(?u . "user-interface.texi")
-		(?d . "doc.texi")
-		(?b . "type.texi")
-		))
+(defvar b-alist '((?n . "number.texi")
+		  (?s . "sequence.texi")
+		  (?c . "character.texi")
+		  (?l . "list.texi")
+		  (?i . "io.texi")
+		  (?a . "internal.texi")
+		  (?f . "form.texi")
+		  (?C . "compile.texi")
+		  (?S . "symbol.texi")
+		  (?t . "system.texi")
+		  (?d . "structure.texi")
+		  (?I . "iteration.texi")
+		  (?u . "user-interface.texi")
+		  (?d . "doc.texi")
+		  (?b . "type.texi")
+		  ))
 (defun try1 ()
   (interactive)
   (while (re-search-forward "\n at def" nil t)
@@ -114,7 +114,7 @@
       
 
       
-(setq xall	  (mapcar 'cdr  b-alist))
+(defvar xall	  (mapcar 'cdr  b-alist))
 
 ;(let ((all xall)) (while all (set-buffer (car all))  (write-file (car all)) (setq all (cdr all))))
 ;(let ((all xall)) (while all   (find-file (car all)) (setq all (cdr all))))	
diff -dur gcl-2.6.8.ORIG/elisp/gcl.el gcl-2.6.8/elisp/gcl.el
--- gcl-2.6.8.ORIG/elisp/gcl.el	2004-06-25 16:40:23.000000000 -0600
+++ gcl-2.6.8/elisp/gcl.el	2008-12-29 21:15:15.000000000 -0700
@@ -14,6 +14,7 @@
 ;; M-p complete the current input by looking back through the buffer to see what was last typed
 ;;        using this prompt and this beginning.   Useful in shell, in lisp, in gdb,...
 
+(require 'inf-lisp)
 
 (setq lisp-mode-hook  'remote-lisp)
 
@@ -23,6 +24,9 @@
 ;(global-set-key "p" 'lisp-complete)
 (global-set-key "p" 'smart-complete)
 
+(defvar lisp-package nil)
+(defvar lisp-process nil)
+
 (defun remote-lisp (&rest l)
   (and (boundp 'lisp-mode-map)
        lisp-mode-map
@@ -158,12 +162,12 @@
 	))
     
 
-    (send-string this-lisp-process
-		 (concat ";;end of form" "\n" telnet-new-line))
+    (process-send-string this-lisp-process
+			 (concat ";;end of form" "\n" telnet-new-line))
     (cond (arg
 	   (if (numberp arg) (setq arg "compile"))
-	   (send-string this-lisp-process (concat "(" arg "'" fun ")"
-						  telnet-new-line))))
+	   (process-send-string this-lisp-process (concat "(" arg "'" fun ")"
+							  telnet-new-line))))
     (and time-to-throw-away
 	 (string-match "telnet"(buffer-name (process-buffer proc)))
 	 (dump-output proc time-to-throw-away))
@@ -194,7 +198,7 @@
 
 (defun my-send-region (proc beg end)
   (cond ((or (string-match "telnet" (process-name proc)))
-	 (send-region proc beg end))
+	 (process-send-region proc beg end))
 	(t
 	 (let ((package (get-buffer-package)))
 	   (save-excursion
@@ -213,7 +217,7 @@
 		 (write-region (point-min) (point-max) tmp-lisp-file nil nil)))
 	   (write-region beg end tmp-lisp-file t nil)
 	   (message "sending ..")
-	   (send-string
+	   (process-send-string
 	    proc
 	    (concat "(lisp::let ((*load-verbose* nil)) (#+sdebug si::nload #-sdebug load \""
 		    tmp-lisp-file
@@ -268,9 +272,9 @@
 		       (prog2 (other-window 1)
 			      (get-buffer-process (current-buffer))
 			      (other-window 1)))))
-	(send-string current-lisp-process "(macroexpand '")
-	(send-region current-lisp-process  beg (point) )
-	(send-string current-lisp-process ")\n")))))
+	(process-send-string current-lisp-process "(macroexpand '")
+	(process-send-region current-lisp-process  beg (point) )
+	(process-send-string current-lisp-process ")\n")))))
 
 (defun delete-comment-char (arg) 
   (while (and (> arg 0) (looking-at comment-start)) (delete-char 1) 
@@ -333,8 +337,8 @@
  (interactive "P") 
  (save-excursion 
    (let ((beg (dot)) 
-	 (ok t)(end (mark)))
-          (comment-region1 beg end arg))))
+	 (end (mark)))
+     (comment-region1 beg end arg))))
 
 (defun comment-region1 (beg end arg)
   (let ((ok t))
@@ -347,7 +351,7 @@
 	   (while ok 
 	     (cond (arg 
 		    (delete-comment-char arg)) 
-		   (t   (insert-string comment-start)))
+		   (t   (insert comment-start)))
 	     (if (< end (dot)) (setq ok nil)
 	       (if  (search-forward "\n" end t) nil (setq ok nil))) )
 	 (widen))))
@@ -363,13 +367,13 @@
 	     (current-lisp-process (or  proc lisp-process)))
 	(other-window 1)
 	(message "Tracing: %s" (buffer-substring (point) end))
-	(send-string current-lisp-process "(trace ")
-	(send-region current-lisp-process (point) end)
-	(send-string current-lisp-process ")\n")))))
+	(process-send-string current-lisp-process "(trace ")
+	(process-send-region current-lisp-process (point) end)
+	(process-send-string current-lisp-process ")\n")))))
 
 (defun gcl-mode ()
   (interactive)
   (lisp-mode)
   )
 
-(provide 'gcl)
\ No newline at end of file
+(provide 'gcl)
diff -dur gcl-2.6.8.ORIG/elisp/man1-to-texi.el gcl-2.6.8/elisp/man1-to-texi.el
--- gcl-2.6.8.ORIG/elisp/man1-to-texi.el	1999-12-06 15:43:59.000000000 -0700
+++ gcl-2.6.8/elisp/man1-to-texi.el	2008-12-29 21:15:15.000000000 -0700
@@ -106,6 +106,8 @@
 ;	End of indented unfilled display.
 ; 
 
+(require 'makeinfo)
+
 (defun do-replace (lis &optional not-in-string)
   (let (x case-fold-search)
     (while lis
@@ -285,15 +287,14 @@
     (while (< i (length vec)) (setq tot (+ (aref vec i) tot)) (setq i (+ i 1)))
     (setq surplus (/ (- 70 tot) (+ 1 (length (car items)))))
     (while items
-      (setq tem (car items))
-      (setq i 0)
-      (let (ans x)
+      (let ((tem (car items)))
+	(setq i 0)
 	(insert "")
-	(while tem
-	  (insert (tex-center (car tem) (+ (aref vec i) surplus) 'left
-			      (real-length (car tem))))
-	  (setq tem (cdr tem)) (setq i (+ i 1)))
-	(insert "\n"))
+	(dolist (elem tem)
+	  (insert (tex-center elem (+ (aref vec i) surplus) 'left
+			      (real-length elem)))
+	  (setq i (+ i 1))))
+      (insert "\n")
       (setq items (cdr items)))
     )
   )
@@ -330,22 +331,7 @@
 	(insert "@w{" ) (end-of-line) (insert "}")
 	    (forward-line 1) (beginning-of-line))))
 
-(defun add-keywords ()
-  (let ((tem tk-control-options)x lis l y)
-    (while tem
-      (setq l (car tem))
-      (setq tem (cdr tem))
-      (setq x (symbol-name (car l )))
-      (setq lis (car (cdr l)))
-      (while lis
-	(cond ((atom lis) (setq lis nil))
-	      (t (setq y (symbol-name (car lis)))
-		 (do-replace (list (list (concat x  " "y "")
-					 (concat x " :"y "")
-					 )))))
-	(setq lis (cdr lis))))))
-
-(setq tk-control-options
+(defvar tk-control-options
       '((after fixnum) 
 	(exit fixnum) 
 	(lower window) 
@@ -375,7 +361,22 @@
 	(update (idletasks)) 
 	))
 
-(setq tk-widget-options
+(defun add-keywords ()
+  (let ((tem tk-control-options)x lis l y)
+    (while tem
+      (setq l (car tem))
+      (setq tem (cdr tem))
+      (setq x (symbol-name (car l )))
+      (setq lis (car (cdr l)))
+      (while lis
+	(cond ((atom lis) (setq lis nil))
+	      (t (setq y (symbol-name (car lis)))
+		 (do-replace (list (list (concat x  " "y "")
+					 (concat x " :"y "")
+					 )))))
+	(setq lis (cdr lis))))))
+
+(defvar tk-widget-options
       '(
 	(button (activate configure deactivate flash invoke)) 
 	(listbox ( configure curselection delete get insert nearest
@@ -404,7 +405,7 @@
 	(toplevel ( configure)) 
 	))
 
-(setq manual-sections
+(defvar manual-sections
       '(after bind button canvas checkbutton destroy  entry exit focus foo frame grab label lbSingSel listbox lower menu menubar menubutton message option options pack-old pack place radiobutton raise scale scrollbar selection send text tk tkerror tkvars tkwait toplevel update winfo wm))
 
 ;(setq widgets (sort (mapcar 'car tk-widget-options) 'string-lessp))
diff -dur gcl-2.6.8.ORIG/elisp/smart-complete.el gcl-2.6.8/elisp/smart-complete.el
--- gcl-2.6.8.ORIG/elisp/smart-complete.el	2001-12-18 13:36:35.000000000 -0700
+++ gcl-2.6.8/elisp/smart-complete.el	2008-12-29 21:15:15.000000000 -0700
@@ -85,8 +85,7 @@
 	(pat (concat (regexp-for-this-prompt prompt)
 		     "\\(" (regexp-quote str) "\\)" ))
 	offered (not-yet t)
-	)
-    (setq bill pat)
+	at this)
     (while (and  not-yet
 		 (re-search-backward pat nil t))
       (goto-char (match-beginning 1))
diff -dur gcl-2.6.8.ORIG/elisp/sshell.el gcl-2.6.8/elisp/sshell.el
--- gcl-2.6.8.ORIG/elisp/sshell.el	2000-10-27 16:09:40.000000000 -0600
+++ gcl-2.6.8/elisp/sshell.el	2008-12-29 21:15:15.000000000 -0700
@@ -119,9 +119,9 @@
 	 (ff
 	  (save-excursion
 	    (skip-chars-backward "[a-z---_0-9$/A-Z~#.]")
-	    (buffer-substring (setq beg (point)) p))))
-    (setq dir (or (file-name-directory ff) default-directory))
-    (setq file (file-name-nondirectory ff))
+	    (buffer-substring (setq beg (point)) p)))
+	 (dir (or (file-name-directory ff) default-directory))
+	 (file (file-name-nondirectory ff)))
     (cond ((and (setq tem (file-name-completion (or file "") dir))
 		(not (equal tem file)))
 	   (cond ((eq tem t))
@@ -181,7 +181,7 @@
 
 (defun make-sshell (name program &optional startfile &rest switches)
   (let ((buffer (get-buffer-create (concat "*" name "*")))
-	proc status size)
+	proc status)
     (setq proc (get-buffer-process buffer))
     (if proc (setq status (process-status proc)))
     (save-excursion
@@ -376,4 +376,4 @@
 	       (point)))
 (require 'smart-complete)
 
-(provide 'sshell)
\ No newline at end of file
+(provide 'sshell)

gcl-2.6.8-extension.patch:

--- NEW FILE gcl-2.6.8-extension.patch ---
diff -dur gcl-2.6.8.ORIG/acconfig.h gcl-2.6.8/acconfig.h
--- gcl-2.6.8.ORIG/acconfig.h	2008-12-29 16:11:21.000000000 -0700
+++ gcl-2.6.8/acconfig.h	2008-12-29 16:17:50.000000000 -0700
@@ -1,3 +1,6 @@
+/* Whether compiling on a glibc-based system */
+#undef _GNU_SOURCE
+
 /* define where the heap could begin.   Normally should
 be the smallest value returned by sbrk().   Underestimating
 by 10-20 megabytes is not a problem. */
@@ -157,7 +160,6 @@
 
 #ifdef IN_NUM_CO
 #ifdef HAVE_ISNORMAL
-#define _GNU_SOURCE
 #include <math.h>
 #define ISNORMAL(a) isnormal(a)
 #else
@@ -178,7 +180,6 @@
 
 #ifdef NEED_ISFINITE
 #ifdef HAVE_ISFINITE
-#define _GNU_SOURCE
 #include <math.h>
 #define ISFINITE(a) isfinite(a)
 #else
diff -dur gcl-2.6.8.ORIG/configure gcl-2.6.8/configure
--- gcl-2.6.8.ORIG/configure	2008-12-29 16:11:21.000000000 -0700
+++ gcl-2.6.8/configure	2008-12-29 16:19:59.000000000 -0700
@@ -691,9 +691,9 @@
 GMPDIR
 GMP
 MAKEINFO
+AWK
 EGREP
 GREP
-AWK
 CPP
 OBJEXT
 EXEEXT
@@ -3524,6 +3524,7 @@
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
+
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -3761,187 +3762,6 @@
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
-
-
-# can only test for numbers -- CM
-# if test "${GCC}" -eq "yes" ; then
-#if [[ "${GCC}" = "yes" ]] ; then
-# Allog for environment variable overrides on compiler selection -- CM
-#GCC=$CC
-#else
-#GCC=""
-#fi
-# subst GCC not only under 386-linux, but where available -- CM
-
-if test "$GCC" = "yes" ; then
-   TCFLAGS="-Wall -DVOL=volatile -fsigned-char"
-else
-   TCFLAGS="-DVOL=volatile -fsigned-char"
-fi
-if test "$GCC" = "yes" ; then
-	TCFLAGS="$TCFLAGS -pipe"
-	case $use in
-	     *mingw*)
-	        echo "WARNING: Remove -fno-zero-initialized-in-bss from makedefs if gcc less than 3.3.1."
-	        echo "         It is ptherwise needed for the Unexec stuff to work."
-		TCFLAGS="$TCFLAGS -fno-zero-initialized-in-bss -mms-bitfields";;
-        esac
-fi
-#if test -f /proc/sys/kernel/exec-shield ; then
-#	exec_stat=`cat /proc/sys/kernel/exec-shield`
-#	if test "$exec_stat" != "0" ; then
-#		# CFLAGS here to hopefully cover the DBEGIN routine below
-#		CFLAGS="$CFLAGS -Wa,--execstack"
-#	fi
-#fi
-
-TO3FLAGS=""
-TO2FLAGS=""
-
-#TFPFLAG="-fomit-frame-pointer"
-# FIXME -- remove when mingw compiler issues are fixed
-case "$use" in
-  *mingw*)
-	TFPFLAG="";;
-   m68k*)#FIXME gcc 4.x bug workaround
-	TFPFLAG="";;
-  *)
-	TFPFLAG="-fomit-frame-pointer";;
-esac
-
-for ac_prog in gawk nawk awk
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_AWK+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$AWK"; then
-  ac_cv_prog_AWK="$AWK" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_AWK="$ac_prog"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-AWK=$ac_cv_prog_AWK
-if test -n "$AWK"; then
-  { $as_echo "$as_me:$LINENO: result: $AWK" >&5
-$as_echo "$AWK" >&6; }
-else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$AWK" && break
-done
-
-
-# Work around system/gprof mips/hppa hang
-case $use in
-  mips*) enable_gprof="no";;
-  hppa*) enable_gprof="no";;
-esac
-
-if test "$enable_gprof" = "yes" ; then
-        TCFLAGS="$TCFLAGS -pg";
-        TLIBS="$TLIBS -pg";
-	TFPFLAG=""
-	cat >>confdefs.h <<\_ACEOF
-#define GCL_GPROF 1
-_ACEOF
-
-	{ $as_echo "$as_me:$LINENO: checking for text start" >&5
-$as_echo_n "checking for text start... " >&6; }
-	echo 'int main () {return(0);}' >foo.c
-	$CC foo.c -o foo
-	GCL_GPROF_START=`nm foo | $AWK  '/  *T  *__*start$/ {print $NF}'`
-	rm -f foo.c foo
-	{ $as_echo "$as_me:$LINENO: result: $GCL_GPROF_START" >&5
-$as_echo "$GCL_GPROF_START" >&6; }
-	cat >>confdefs.h <<_ACEOF
-#define GCL_GPROF_START $GCL_GPROF_START
-_ACEOF
-
-	case "$use" in
-	  arm*)
-	#FIXME report and remove this when done
-		{ $as_echo "$as_me:$LINENO: result: Reducing optimization on profiling arm build to workaround gcc bug" >&5
-$as_echo "Reducing optimization on profiling arm build to workaround gcc bug" >&6; }
-		enable_debug=yes;;
-	esac
-fi
-
-if test "$enable_debug" = "yes" ; then
-	TCFLAGS="$TCFLAGS -g"
-	# for subconfigurations
-	CFLAGS="$CFLAGS -g"
-else
-# FIXME -- remove when mingw compiler issues are fixed
-	case "$use" in
-	  *mingw*)
-		TO3FLAGS="-O3 $TFPFLAG";;
-	  *)
-		TO3FLAGS="-O3 $TFPFLAG";;
-	esac
-#	TO3FLAGS="-O3 $TFPFLAG"
-	TO2FLAGS="-O"
-fi
-
-# gcc on ppc cannot compile our new_init.c with full opts --CM
-TONIFLAGS=""
-case $use in
-     *linux)
-	case $use in
-#		amd64*) # stack-boundary option does not work
-#			TCFLAGS="$TCFLAGS -m64 -mpreferred-stack-boundary=8";;
-		alpha*)
-			TCFLAGS="$TCFLAGS -mieee";;
-#		m68k*)
-#			TCFLAGS="$TCFLAGS -ffloat-store";;
-		hppa*)
-			TCFLAGS="$TCFLAGS -ffunction-sections"
-			if test "$enable_debug" != "yes" ; then TO3FLAGS="-O $TFPFLAG" ; fi
-			if test "$enable_debug" != "yes" ; then TO2FLAGS="-O" ; fi
-			;;
-		arm*)
-			TCFLAGS="$TCFLAGS -mlong-calls -fdollars-in-identifiers -g "
-			if test "$enable_debug" != "yes" ; then TO3FLAGS="-O2" ; fi
-			if test "$enable_debug" != "yes" ; then TO2FLAGS="-O" ; fi
-			;;
-		powerpc*)
-			if $CC -v 2>&1 | grep -q "gcc version 3.2" ; then
-			   echo Reducing optimization for buggy gcc-3.2
-			   if test "$enable_debug" != "yes" ; then TONIFLAGS="-O $TFPFLAG" ; fi
-			fi;
-			echo Probing for longcall
-			if ! $CC -v 2>&1 | $AWK '/^gcc version / {split($3,A,".");if (A[1]+0>3 || (A[1]+0>=3 && A[2]+0>=3)) exit 1;}'; then
-			   echo Enabling longcall on gcc 3.3 or later
-			   TCFLAGS="$TCFLAGS -mlongcall"
-			   echo Reducing optimization for buggy gcc 3.3 or later
-			   if test "$enable_debug" != "yes" ; then TONIFLAGS="-O $TFPFLAG" ; fi
-			fi;;
-	esac;;
-esac
-if test "$enable_pic" = "yes" ; then
-	TCFLAGS="$TCFLAGS -fPIC"
-fi
-
 { $as_echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
 $as_echo_n "checking for grep that handles long lines and -e... " >&6; }
 if test "${ac_cv_path_GREP+set}" = set; then
@@ -4076,85 +3896,6 @@
  EGREP="$ac_cv_path_EGREP"
 
 
-for ac_prog in makeinfo
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_MAKEINFO+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$MAKEINFO"; then
-  ac_cv_prog_MAKEINFO="$MAKEINFO" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_MAKEINFO="$ac_prog"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-MAKEINFO=$ac_cv_prog_MAKEINFO
-if test -n "$MAKEINFO"; then
-  { $as_echo "$as_me:$LINENO: result: $MAKEINFO" >&5
-$as_echo "$MAKEINFO" >&6; }
-else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$MAKEINFO" && break
-done
-test -n "$MAKEINFO" || MAKEINFO=""false""
-
-
-
-# Step 1: set the variable "system" to hold the name and version number
-# for the system.  This can usually be done via the "uname" command, but
-# there are a few systems, like Next, where this doesn't work.
-
-{ $as_echo "$as_me:$LINENO: checking system version (for dynamic loading)" >&5
-$as_echo_n "checking system version (for dynamic loading)... " >&6; }
-if machine=`uname -m` ; then true; else machine=unknown ; fi
-
-if test -f /usr/lib/NextStep/software_version; then
-    system=NEXTSTEP-`${AWK} '/3/,/3/' /usr/lib/NextStep/software_version`
-else
-    system=`uname -s`-`uname -r`
-    if test "$?" -ne 0 ; then
-	{ $as_echo "$as_me:$LINENO: result: unknown (can't find uname command)" >&5
-$as_echo "unknown (can't find uname command)" >&6; }
-	system=unknown
-    else
-	# Special check for weird MP-RAS system (uname returns weird
-	# results, and the version is kept in special file).
-
-	if test -r /etc/.relid -a "X`uname -n`" = "X`uname -s`" ; then
-	    system="MP-RAS-`${AWK} '{print $3}' '/etc/.relid'`"
-	fi
-	if test "`uname -s`" = "AIX" ; then
-	    system=AIX-`uname -v`.`uname -r`
-	fi
-	{ $as_echo "$as_me:$LINENO: result: $system" >&5
-$as_echo "$system" >&6; }
-    fi
-fi
-
-if test "$use" = "powerpc-macosx" ; then
-
-
 { $as_echo "$as_me:$LINENO: checking for ANSI C header files" >&5
 $as_echo_n "checking for ANSI C header files... " >&6; }
 if test "${ac_cv_header_stdc+set}" = set; then
@@ -4406,7 +4147,1483 @@
 done
 
 
-if test "${ac_cv_header_malloc_malloc_h+set}" = set; then
+
+  if test "${ac_cv_header_minix_config_h+set}" = set; then
+  { $as_echo "$as_me:$LINENO: checking for minix/config.h" >&5
+$as_echo_n "checking for minix/config.h... " >&6; }
+if test "${ac_cv_header_minix_config_h+set}" = set; then
+  $as_echo_n "(cached) " >&6
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_minix_config_h" >&5
+$as_echo "$ac_cv_header_minix_config_h" >&6; }
+else
+  # Is the header compilable?
+{ $as_echo "$as_me:$LINENO: checking minix/config.h usability" >&5
+$as_echo_n "checking minix/config.h usability... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+#include <minix/config.h>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_header_compiler=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_header_compiler=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
+
+# Is the header present?
+{ $as_echo "$as_me:$LINENO: checking minix/config.h presence" >&5
+$as_echo_n "checking minix/config.h presence... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <minix/config.h>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
+  ac_header_preproc=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  ac_header_preproc=no
+fi
+
+rm -f conftest.err conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
+
+# So?  What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+  yes:no: )
+    { $as_echo "$as_me:$LINENO: WARNING: minix/config.h: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: minix/config.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: minix/config.h: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: minix/config.h: proceeding with the compiler's result" >&2;}
+    ac_header_preproc=yes
+    ;;
+  no:yes:* )
+    { $as_echo "$as_me:$LINENO: WARNING: minix/config.h: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: minix/config.h: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: minix/config.h:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: minix/config.h:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: minix/config.h: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: minix/config.h: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: minix/config.h:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: minix/config.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: minix/config.h: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: minix/config.h: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: minix/config.h: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: minix/config.h: in the future, the compiler will take precedence" >&2;}
+
+    ;;
+esac
+{ $as_echo "$as_me:$LINENO: checking for minix/config.h" >&5
+$as_echo_n "checking for minix/config.h... " >&6; }
+if test "${ac_cv_header_minix_config_h+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  ac_cv_header_minix_config_h=$ac_header_preproc
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_minix_config_h" >&5
+$as_echo "$ac_cv_header_minix_config_h" >&6; }
+
+fi
+if test "x$ac_cv_header_minix_config_h" = x""yes; then
+  MINIX=yes
+else
+  MINIX=
+fi
+
+
+  if test "$MINIX" = yes; then
+
+cat >>confdefs.h <<\_ACEOF
+#define _POSIX_SOURCE 1
+_ACEOF
+
+
+cat >>confdefs.h <<\_ACEOF
+#define _POSIX_1_SOURCE 2
+_ACEOF
+
+
+cat >>confdefs.h <<\_ACEOF
+#define _MINIX 1
+_ACEOF
+
+  fi
+
+
+
+  { $as_echo "$as_me:$LINENO: checking whether it is safe to define __EXTENSIONS__" >&5
+$as_echo_n "checking whether it is safe to define __EXTENSIONS__... " >&6; }
+if test "${ac_cv_safe_to_define___extensions__+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+#	  define __EXTENSIONS__ 1
+	  $ac_includes_default
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_cv_safe_to_define___extensions__=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_safe_to_define___extensions__=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_safe_to_define___extensions__" >&5
+$as_echo "$ac_cv_safe_to_define___extensions__" >&6; }
+  test $ac_cv_safe_to_define___extensions__ = yes &&
+    cat >>confdefs.h <<\_ACEOF
+#define __EXTENSIONS__ 1
+_ACEOF
+
+  cat >>confdefs.h <<\_ACEOF
+#define _ALL_SOURCE 1
+_ACEOF
+
+  cat >>confdefs.h <<\_ACEOF
+#define _GNU_SOURCE 1
+_ACEOF
+
+  cat >>confdefs.h <<\_ACEOF
+#define _POSIX_PTHREAD_SEMANTICS 1
+_ACEOF
+
+  cat >>confdefs.h <<\_ACEOF
+#define _TANDEM_SOURCE 1
+_ACEOF
+
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
+set dummy ${ac_tool_prefix}gcc; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_CC+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_CC="${ac_tool_prefix}gcc"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+  { $as_echo "$as_me:$LINENO: result: $CC" >&5
+$as_echo "$CC" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_CC"; then
+  ac_ct_CC=$CC
+  # Extract the first word of "gcc", so it can be a program name with args.
+set dummy gcc; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_CC"; then
+  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_ac_ct_CC="gcc"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_CC=$ac_cv_prog_ac_ct_CC
+if test -n "$ac_ct_CC"; then
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+$as_echo "$ac_ct_CC" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_CC" = x; then
+    CC=""
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    CC=$ac_ct_CC
+  fi
+else
+  CC="$ac_cv_prog_CC"
+fi
+
+if test -z "$CC"; then
+          if test -n "$ac_tool_prefix"; then
+    # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
+set dummy ${ac_tool_prefix}cc; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_CC+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_CC="${ac_tool_prefix}cc"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+  { $as_echo "$as_me:$LINENO: result: $CC" >&5
+$as_echo "$CC" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  fi
+fi
+if test -z "$CC"; then
+  # Extract the first word of "cc", so it can be a program name with args.
+set dummy cc; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_CC+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+  ac_prog_rejected=no
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
+       ac_prog_rejected=yes
+       continue
+     fi
+    ac_cv_prog_CC="cc"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+if test $ac_prog_rejected = yes; then
+  # We found a bogon in the path, so make sure we never use it.
+  set dummy $ac_cv_prog_CC
+  shift
+  if test $# != 0; then
+    # We chose a different compiler from the bogus one.
+    # However, it has the same basename, so the bogon will be chosen
+    # first if we set CC to just the basename; use the full file name.
+    shift
+    ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
+  fi
+fi
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+  { $as_echo "$as_me:$LINENO: result: $CC" >&5
+$as_echo "$CC" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$CC"; then
+  if test -n "$ac_tool_prefix"; then
+  for ac_prog in cl.exe
+  do
+    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_CC+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+  { $as_echo "$as_me:$LINENO: result: $CC" >&5
+$as_echo "$CC" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+    test -n "$CC" && break
+  done
+fi
+if test -z "$CC"; then
+  ac_ct_CC=$CC
+  for ac_prog in cl.exe
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_CC"; then
+  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_ac_ct_CC="$ac_prog"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_CC=$ac_cv_prog_ac_ct_CC
+if test -n "$ac_ct_CC"; then
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+$as_echo "$ac_ct_CC" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  test -n "$ac_ct_CC" && break
+done
+
+  if test "x$ac_ct_CC" = x; then
+    CC=""
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    CC=$ac_ct_CC
+  fi
+fi
+
+fi
+
+
+test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
+See \`config.log' for more details." >&5
+$as_echo "$as_me: error: no acceptable C compiler found in \$PATH
+See \`config.log' for more details." >&2;}
+   { (exit 1); exit 1; }; }; }
+
+# Provide some information about the compiler.
+$as_echo "$as_me:$LINENO: checking for C compiler version" >&5
+set X $ac_compile
+ac_compiler=$2
+{ (ac_try="$ac_compiler --version >&5"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compiler --version >&5") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }
+{ (ac_try="$ac_compiler -v >&5"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compiler -v >&5") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }
+{ (ac_try="$ac_compiler -V >&5"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compiler -V >&5") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }
+
+{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
+$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
+if test "${ac_cv_c_compiler_gnu+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+int
+main ()
+{
+#ifndef __GNUC__
+       choke me
+#endif
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_compiler_gnu=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_compiler_gnu=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ac_cv_c_compiler_gnu=$ac_compiler_gnu
+
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
+$as_echo "$ac_cv_c_compiler_gnu" >&6; }
+if test $ac_compiler_gnu = yes; then
+  GCC=yes
+else
+  GCC=
+fi
+ac_test_CFLAGS=${CFLAGS+set}
+ac_save_CFLAGS=$CFLAGS
+{ $as_echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
+$as_echo_n "checking whether $CC accepts -g... " >&6; }
+if test "${ac_cv_prog_cc_g+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  ac_save_c_werror_flag=$ac_c_werror_flag
+   ac_c_werror_flag=yes
+   ac_cv_prog_cc_g=no
+   CFLAGS="-g"
+   cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_cv_prog_cc_g=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	CFLAGS=""
+      cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  :
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_c_werror_flag=$ac_save_c_werror_flag
+	 CFLAGS="-g"
+	 cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_cv_prog_cc_g=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+   ac_c_werror_flag=$ac_save_c_werror_flag
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
+$as_echo "$ac_cv_prog_cc_g" >&6; }
+if test "$ac_test_CFLAGS" = set; then
+  CFLAGS=$ac_save_CFLAGS
+elif test $ac_cv_prog_cc_g = yes; then
+  if test "$GCC" = yes; then
+    CFLAGS="-g -O2"
+  else
+    CFLAGS="-g"
+  fi
+else
+  if test "$GCC" = yes; then
+    CFLAGS="-O2"
+  else
+    CFLAGS=
+  fi
+fi
+{ $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
+$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
+if test "${ac_cv_prog_cc_c89+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  ac_cv_prog_cc_c89=no
+ac_save_CC=$CC
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <stdarg.h>
+#include <stdio.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+/* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
+struct buf { int x; };
+FILE * (*rcsopen) (struct buf *, struct stat *, int);
+static char *e (p, i)
+     char **p;
+     int i;
+{
+  return p[i];
+}
+static char *f (char * (*g) (char **, int), char **p, ...)
+{
+  char *s;
+  va_list v;
+  va_start (v,p);
+  s = g (p, va_arg (v,int));
+  va_end (v);
+  return s;
+}
+
+/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
+   function prototypes and stuff, but not '\xHH' hex character constants.
+   These don't provoke an error unfortunately, instead are silently treated
+   as 'x'.  The following induces an error, until -std is added to get
+   proper ANSI mode.  Curiously '\x00'!='x' always comes out true, for an
+   array size at least.  It's necessary to write '\x00'==0 to get something
+   that's true only with -std.  */
+int osf4_cc_array ['\x00' == 0 ? 1 : -1];
+
+/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
+   inside strings and character constants.  */
+#define FOO(x) 'x'
+int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
+
+int test (int i, double x);
+struct s1 {int (*f) (int a);};
+struct s2 {int (*f) (double a);};
+int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
+int argc;
+char **argv;
+int
+main ()
+{
+return f (e, argv, 0) != argv[0]  ||  f (e, argv, 1) != argv[1];
+  ;
+  return 0;
+}
+_ACEOF
+for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
+	-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
+do
+  CC="$ac_save_CC $ac_arg"
+  rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_cv_prog_cc_c89=$ac_arg
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
+fi
+
+rm -f core conftest.err conftest.$ac_objext
+  test "x$ac_cv_prog_cc_c89" != "xno" && break
+done
+rm -f conftest.$ac_ext
+CC=$ac_save_CC
+
+fi
+# AC_CACHE_VAL
+case "x$ac_cv_prog_cc_c89" in
+  x)
+    { $as_echo "$as_me:$LINENO: result: none needed" >&5
+$as_echo "none needed" >&6; } ;;
+  xno)
+    { $as_echo "$as_me:$LINENO: result: unsupported" >&5
+$as_echo "unsupported" >&6; } ;;
+  *)
+    CC="$CC $ac_cv_prog_cc_c89"
+    { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
+$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
+esac
+
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+{ $as_echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
+$as_echo_n "checking how to run the C preprocessor... " >&6; }
+# On Suns, sometimes $CPP names a directory.
+if test -n "$CPP" && test -d "$CPP"; then
+  CPP=
+fi
+if test -z "$CPP"; then
+  if test "${ac_cv_prog_CPP+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+      # Double quotes because CPP needs to be expanded
+    for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
+    do
+      ac_preproc_ok=false
+for ac_c_preproc_warn_flag in '' yes
+do
+  # Use a header file that comes with gcc, so configuring glibc
+  # with a fresh cross-compiler works.
+  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+  # <limits.h> exists even on freestanding compilers.
+  # On the NeXT, cc -E runs the code through the compiler's parser,
+  # not just through cpp. "Syntax error" is here to catch this case.
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+		     Syntax error
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
+  :
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  # Broken: fails on valid input.
+continue
+fi
+
+rm -f conftest.err conftest.$ac_ext
+
+  # OK, works on sane cases.  Now check whether nonexistent headers
+  # can be detected and how.
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <ac_nonexistent.h>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
+  # Broken: success on invalid input.
+continue
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  # Passes both tests.
+ac_preproc_ok=:
+break
+fi
+
+rm -f conftest.err conftest.$ac_ext
+
+done
+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+rm -f conftest.err conftest.$ac_ext
+if $ac_preproc_ok; then
+  break
+fi
+
+    done
+    ac_cv_prog_CPP=$CPP
+
+fi
+  CPP=$ac_cv_prog_CPP
+else
+  ac_cv_prog_CPP=$CPP
+fi
+{ $as_echo "$as_me:$LINENO: result: $CPP" >&5
+$as_echo "$CPP" >&6; }
+ac_preproc_ok=false
+for ac_c_preproc_warn_flag in '' yes
+do
+  # Use a header file that comes with gcc, so configuring glibc
+  # with a fresh cross-compiler works.
+  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+  # <limits.h> exists even on freestanding compilers.
+  # On the NeXT, cc -E runs the code through the compiler's parser,
+  # not just through cpp. "Syntax error" is here to catch this case.
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+		     Syntax error
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
+  :
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  # Broken: fails on valid input.
+continue
+fi
+
+rm -f conftest.err conftest.$ac_ext
+
+  # OK, works on sane cases.  Now check whether nonexistent headers
+  # can be detected and how.
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <ac_nonexistent.h>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
+  # Broken: success on invalid input.
+continue
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  # Passes both tests.
+ac_preproc_ok=:
+break
+fi
+
+rm -f conftest.err conftest.$ac_ext
+
+done
+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+rm -f conftest.err conftest.$ac_ext
+if $ac_preproc_ok; then
+  :
+else
+  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
+See \`config.log' for more details." >&5
+$as_echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
+See \`config.log' for more details." >&2;}
+   { (exit 1); exit 1; }; }; }
+fi
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+
+
+# can only test for numbers -- CM
+# if test "${GCC}" -eq "yes" ; then
+#if [[ "${GCC}" = "yes" ]] ; then
+# Allog for environment variable overrides on compiler selection -- CM
+#GCC=$CC
+#else
+#GCC=""
+#fi
+# subst GCC not only under 386-linux, but where available -- CM
+
+if test "$GCC" = "yes" ; then
+   TCFLAGS="-Wall -DVOL=volatile -fsigned-char"
+else
+   TCFLAGS="-DVOL=volatile -fsigned-char"
+fi
+if test "$GCC" = "yes" ; then
+	TCFLAGS="$TCFLAGS -pipe"
+	case $use in
+	     *mingw*)
+	        echo "WARNING: Remove -fno-zero-initialized-in-bss from makedefs if gcc less than 3.3.1."
+	        echo "         It is ptherwise needed for the Unexec stuff to work."
+		TCFLAGS="$TCFLAGS -fno-zero-initialized-in-bss -mms-bitfields";;
+        esac
+fi
+#if test -f /proc/sys/kernel/exec-shield ; then
+#	exec_stat=`cat /proc/sys/kernel/exec-shield`
+#	if test "$exec_stat" != "0" ; then
+#		# CFLAGS here to hopefully cover the DBEGIN routine below
+#		CFLAGS="$CFLAGS -Wa,--execstack"
+#	fi
+#fi
+
+TO3FLAGS=""
+TO2FLAGS=""
+
+#TFPFLAG="-fomit-frame-pointer"
+# FIXME -- remove when mingw compiler issues are fixed
+case "$use" in
+  *mingw*)
+	TFPFLAG="";;
+   m68k*)#FIXME gcc 4.x bug workaround
+	TFPFLAG="";;
+  *)
+	TFPFLAG="-fomit-frame-pointer";;
+esac
+
+for ac_prog in gawk nawk awk
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_AWK+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$AWK"; then
+  ac_cv_prog_AWK="$AWK" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_AWK="$ac_prog"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+AWK=$ac_cv_prog_AWK
+if test -n "$AWK"; then
+  { $as_echo "$as_me:$LINENO: result: $AWK" >&5
+$as_echo "$AWK" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  test -n "$AWK" && break
+done
+
+
+# Work around system/gprof mips/hppa hang
+case $use in
+  mips*) enable_gprof="no";;
+  hppa*) enable_gprof="no";;
+esac
+
+if test "$enable_gprof" = "yes" ; then
+        TCFLAGS="$TCFLAGS -pg";
+        TLIBS="$TLIBS -pg";
+	TFPFLAG=""
+	cat >>confdefs.h <<\_ACEOF
+#define GCL_GPROF 1
+_ACEOF
+
+	{ $as_echo "$as_me:$LINENO: checking for text start" >&5
+$as_echo_n "checking for text start... " >&6; }
+	echo 'int main () {return(0);}' >foo.c
+	$CC foo.c -o foo
+	GCL_GPROF_START=`nm foo | $AWK  '/  *T  *__*start$/ {print $NF}'`
+	rm -f foo.c foo
+	{ $as_echo "$as_me:$LINENO: result: $GCL_GPROF_START" >&5
+$as_echo "$GCL_GPROF_START" >&6; }
+	cat >>confdefs.h <<_ACEOF
+#define GCL_GPROF_START $GCL_GPROF_START
+_ACEOF
+
+	case "$use" in
+	  arm*)
+	#FIXME report and remove this when done
+		{ $as_echo "$as_me:$LINENO: result: Reducing optimization on profiling arm build to workaround gcc bug" >&5
+$as_echo "Reducing optimization on profiling arm build to workaround gcc bug" >&6; }
+		enable_debug=yes;;
+	esac
+fi
+
+if test "$enable_debug" = "yes" ; then
+	TCFLAGS="$TCFLAGS -g"
+	# for subconfigurations
+	CFLAGS="$CFLAGS -g"
+else
+# FIXME -- remove when mingw compiler issues are fixed
+	case "$use" in
+	  *mingw*)
+		TO3FLAGS="-O3 $TFPFLAG";;
+	  *)
+		TO3FLAGS="-O3 $TFPFLAG";;
+	esac
+#	TO3FLAGS="-O3 $TFPFLAG"
+	TO2FLAGS="-O"
+fi
+
+# gcc on ppc cannot compile our new_init.c with full opts --CM
+TONIFLAGS=""
+case $use in
+     *linux)
+	case $use in
+#		amd64*) # stack-boundary option does not work
+#			TCFLAGS="$TCFLAGS -m64 -mpreferred-stack-boundary=8";;
+		alpha*)
+			TCFLAGS="$TCFLAGS -mieee";;
+#		m68k*)
+#			TCFLAGS="$TCFLAGS -ffloat-store";;
+		hppa*)
+			TCFLAGS="$TCFLAGS -ffunction-sections"
+			if test "$enable_debug" != "yes" ; then TO3FLAGS="-O $TFPFLAG" ; fi
+			if test "$enable_debug" != "yes" ; then TO2FLAGS="-O" ; fi
+			;;
+		arm*)
+			TCFLAGS="$TCFLAGS -mlong-calls -fdollars-in-identifiers -g "
+			if test "$enable_debug" != "yes" ; then TO3FLAGS="-O2" ; fi
+			if test "$enable_debug" != "yes" ; then TO2FLAGS="-O" ; fi
+			;;
+		powerpc*)
+			if $CC -v 2>&1 | grep -q "gcc version 3.2" ; then
+			   echo Reducing optimization for buggy gcc-3.2
+			   if test "$enable_debug" != "yes" ; then TONIFLAGS="-O $TFPFLAG" ; fi
+			fi;
+			echo Probing for longcall
+			if ! $CC -v 2>&1 | $AWK '/^gcc version / {split($3,A,".");if (A[1]+0>3 || (A[1]+0>=3 && A[2]+0>=3)) exit 1;}'; then
+			   echo Enabling longcall on gcc 3.3 or later
+			   TCFLAGS="$TCFLAGS -mlongcall"
+			   echo Reducing optimization for buggy gcc 3.3 or later
+			   if test "$enable_debug" != "yes" ; then TONIFLAGS="-O $TFPFLAG" ; fi
+			fi;;
+	esac;;
+esac
+if test "$enable_pic" = "yes" ; then
+	TCFLAGS="$TCFLAGS -fPIC"
+fi
+
+{ $as_echo "$as_me:$LINENO: checking for egrep" >&5
+$as_echo_n "checking for egrep... " >&6; }
+if test "${ac_cv_path_EGREP+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
+   then ac_cv_path_EGREP="$GREP -E"
+   else
+     if test -z "$EGREP"; then
+  ac_path_EGREP_found=false
+  # Loop through the user's path and test for each of PROGNAME-LIST
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_prog in egrep; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
+      { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
+# Check for GNU ac_path_EGREP and select it if it is found.
+  # Check for GNU $ac_path_EGREP
+case `"$ac_path_EGREP" --version 2>&1` in
+*GNU*)
+  ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
+*)
+  ac_count=0
+  $as_echo_n 0123456789 >"conftest.in"
+  while :
+  do
+    cat "conftest.in" "conftest.in" >"conftest.tmp"
+    mv "conftest.tmp" "conftest.in"
+    cp "conftest.in" "conftest.nl"
+    $as_echo 'EGREP' >> "conftest.nl"
+    "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
+    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+    ac_count=`expr $ac_count + 1`
+    if test $ac_count -gt ${ac_path_EGREP_max-0}; then
+      # Best one so far, save it but keep looking for a better one
+      ac_cv_path_EGREP="$ac_path_EGREP"
+      ac_path_EGREP_max=$ac_count
+    fi
+    # 10*(2^10) chars as input seems more than enough
+    test $ac_count -gt 10 && break
+  done
+  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+esac
+
+      $ac_path_EGREP_found && break 3
+    done
+  done
+done
+IFS=$as_save_IFS
+  if test -z "$ac_cv_path_EGREP"; then
+    { { $as_echo "$as_me:$LINENO: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
+$as_echo "$as_me: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
+   { (exit 1); exit 1; }; }
+  fi
+else
+  ac_cv_path_EGREP=$EGREP
+fi
+
+   fi
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
+$as_echo "$ac_cv_path_EGREP" >&6; }
+ EGREP="$ac_cv_path_EGREP"
+
+
+for ac_prog in makeinfo
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_MAKEINFO+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$MAKEINFO"; then
+  ac_cv_prog_MAKEINFO="$MAKEINFO" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_MAKEINFO="$ac_prog"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+MAKEINFO=$ac_cv_prog_MAKEINFO
+if test -n "$MAKEINFO"; then
+  { $as_echo "$as_me:$LINENO: result: $MAKEINFO" >&5
+$as_echo "$MAKEINFO" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  test -n "$MAKEINFO" && break
+done
+test -n "$MAKEINFO" || MAKEINFO=""false""
+
+
+
+# Step 1: set the variable "system" to hold the name and version number
+# for the system.  This can usually be done via the "uname" command, but
+# there are a few systems, like Next, where this doesn't work.
+
+{ $as_echo "$as_me:$LINENO: checking system version (for dynamic loading)" >&5
+$as_echo_n "checking system version (for dynamic loading)... " >&6; }
+if machine=`uname -m` ; then true; else machine=unknown ; fi
+
+if test -f /usr/lib/NextStep/software_version; then
+    system=NEXTSTEP-`${AWK} '/3/,/3/' /usr/lib/NextStep/software_version`
+else
+    system=`uname -s`-`uname -r`
+    if test "$?" -ne 0 ; then
+	{ $as_echo "$as_me:$LINENO: result: unknown (can't find uname command)" >&5
+$as_echo "unknown (can't find uname command)" >&6; }
+	system=unknown
+    else
+	# Special check for weird MP-RAS system (uname returns weird
+	# results, and the version is kept in special file).
+
+	if test -r /etc/.relid -a "X`uname -n`" = "X`uname -s`" ; then
+	    system="MP-RAS-`${AWK} '{print $3}' '/etc/.relid'`"
+	fi
+	if test "`uname -s`" = "AIX" ; then
+	    system=AIX-`uname -v`.`uname -r`
+	fi
+	{ $as_echo "$as_me:$LINENO: result: $system" >&5
+$as_echo "$system" >&6; }
+    fi
+fi
+
+if test "$use" = "powerpc-macosx" ; then
+   if test "${ac_cv_header_malloc_malloc_h+set}" = set; then
   { $as_echo "$as_me:$LINENO: checking for malloc/malloc.h" >&5
 $as_echo_n "checking for malloc/malloc.h... " >&6; }
 if test "${ac_cv_header_malloc_malloc_h+set}" = set; then
@@ -11349,7 +12566,6 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-		#define _GNU_SOURCE
 		#include <math.h>
 
 int
@@ -11488,7 +12704,6 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-		#define _GNU_SOURCE
 		#include <math.h>
 
 int
diff -dur gcl-2.6.8.ORIG/configure.in gcl-2.6.8/configure.in
--- gcl-2.6.8.ORIG/configure.in	2008-12-29 16:11:21.000000000 -0700
+++ gcl-2.6.8/configure.in	2008-12-29 16:19:46.000000000 -0700
@@ -442,6 +442,7 @@
 	LDFLAGS=" "
 fi
 
+AC_USE_SYSTEM_EXTENSIONS
 AC_PROG_CC
 AC_PROG_CPP
 AC_SUBST(CC)
@@ -1339,7 +1340,6 @@
 #
 AC_MSG_CHECKING([for isnormal])
 AC_RUN_IFELSE([AC_LANG_PROGRAM([[
-		#define _GNU_SOURCE
 		#include <math.h>
 		]],[[
 		float f;
@@ -1367,7 +1367,6 @@
 
 AC_MSG_CHECKING([for isfinite])
 AC_RUN_IFELSE([AC_LANG_PROGRAM([[
-		#define _GNU_SOURCE
 		#include <math.h>
 		]],[[
 		float f;
diff -dur gcl-2.6.8.ORIG/h/gclincl.h.in gcl-2.6.8/h/gclincl.h.in
--- gcl-2.6.8.ORIG/h/gclincl.h.in	2008-12-29 16:11:21.000000000 -0700
+++ gcl-2.6.8/h/gclincl.h.in	2008-12-29 16:19:33.000000000 -0700
@@ -1,4 +1,7 @@
 /* h/gclincl.h.in.  Generated from configure.in by autoheader.  */
+/* Whether compiling on a glibc-based system */
+#undef _GNU_SOURCE
+
 /* define where the heap could begin.   Normally should
 be the smallest value returned by sbrk().   Underestimating
 by 10-20 megabytes is not a problem. */
@@ -158,7 +161,6 @@
 
 #ifdef IN_NUM_CO
 #ifdef HAVE_ISNORMAL
-#define _GNU_SOURCE
 #include <math.h>
 #define ISNORMAL(a) isnormal(a)
 #else
@@ -179,7 +181,6 @@
 
 #ifdef NEED_ISFINITE
 #ifdef HAVE_ISFINITE
-#define _GNU_SOURCE
 #include <math.h>
 #define ISFINITE(a) isfinite(a)
 #else
@@ -368,5 +369,37 @@
 /* Define to 1 if you have the ANSI C header files. */
 #undef STDC_HEADERS
 
+/* Enable extensions on AIX 3, Interix.  */
+#ifndef _ALL_SOURCE
+# undef _ALL_SOURCE
+#endif
+/* Enable GNU extensions on systems that have them.  */
+#ifndef _GNU_SOURCE
+# undef _GNU_SOURCE
+#endif
+/* Enable threading extensions on Solaris.  */
+#ifndef _POSIX_PTHREAD_SEMANTICS
+# undef _POSIX_PTHREAD_SEMANTICS
+#endif
+/* Enable extensions on HP NonStop.  */
+#ifndef _TANDEM_SOURCE
+# undef _TANDEM_SOURCE
+#endif
+/* Enable general extensions on Solaris.  */
+#ifndef __EXTENSIONS__
+# undef __EXTENSIONS__
+#endif
+
+
 /* Define to 1 if the X Window System is missing or not being used. */
 #undef X_DISPLAY_MISSING
+
+/* Define to 1 if on MINIX. */
+#undef _MINIX
+
+/* Define to 2 if the system does not provide POSIX.1 features except with
+   this defined. */
+#undef _POSIX_1_SOURCE
+
+/* Define to 1 if you need to in order for `stat' and other things to work. */
+#undef _POSIX_SOURCE

gcl-2.6.8-fd-leak.patch:

--- NEW FILE gcl-2.6.8-fd-leak.patch ---
diff -dur gcl-2.6.8.ORIG/o/run_process.c gcl-2.6.8/o/run_process.c
--- gcl-2.6.8.ORIG/o/run_process.c	2006-09-15 11:45:18.000000000 -0600
+++ gcl-2.6.8/o/run_process.c	2008-12-29 17:22:10.000000000 -0700
@@ -526,10 +526,10 @@
   fdout = ostream->sm.sm_int0;
   if (fork() == 0)
     { /* the child --- replace standard in and out with descriptors given */
-      close(0);
-      dup(fdin);
-      close(1);
-      dup(fdout);
+      dup2(fdin, 0);
+      dup2(fdout, 1);
+      close(fdin);
+      close(fdout);
       fprintf(stderr, "\n***** Spawning process %s ", pname);
       if (execvp(pname, argv) == -1)
 	{

gcl-2.6.8-getcwd.patch:

--- NEW FILE gcl-2.6.8-getcwd.patch ---
diff -dur gcl-2.6.8.ORIG/o/unixfsys.c gcl-2.6.8/o/unixfsys.c
--- gcl-2.6.8.ORIG/o/unixfsys.c	2008-12-29 17:34:57.000000000 -0700
+++ gcl-2.6.8/o/unixfsys.c	2008-12-29 17:39:10.000000000 -0700
@@ -149,18 +149,6 @@
 #define MAXPATHLEN 512
 #endif
 
-
-#ifdef HAVE_GETCWD
-char *
-getwd(char *buffer)
-{
-#ifndef _WIN32    
-	char *getcwd(char *, size_t);
-#endif
-	return(getcwd(buffer, MAXPATHLEN));
-}
-#endif
-
 #ifdef DGUX
 
 
@@ -278,6 +266,8 @@
         if ( 0 == current_directory_length ) { 
            FEerror ( "truename could not determine the current directory.", 1, "" ); 
         } 
+#elif defined(HAVE_GETCWD)
+	getcwd(current_directory, MAXPATHLEN);
 #else 
         getwd(current_directory); 
 #endif 
@@ -361,6 +351,8 @@
                     FEerror ( "truename could not determine the current directory.", 1, "" ); 
                 } 
                 p = directory; 
+#elif defined(HAVE_GETCWD)
+		p = getcwd(directory, MAXPATHLEN);
 #else 
 		p = getwd(directory);
 #endif                

gcl-2.6.8-infrastructure.patch:

--- NEW FILE gcl-2.6.8-infrastructure.patch ---
diff -dur gcl-2.6.8.ORIG/config.guess gcl-2.6.8/config.guess
--- gcl-2.6.8.ORIG/config.guess	2005-08-11 09:02:25.000000000 -0600
+++ gcl-2.6.8/config.guess	2008-12-29 21:48:11.000000000 -0700
@@ -1,9 +1,10 @@
 #! /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 Free Software Foundation, Inc.
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
+#   Free Software Foundation, Inc.
 
-timestamp='2005-04-22'
+timestamp='2008-12-19'
 
 # 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
@@ -17,13 +18,15 @@
 #
 # 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.
+# 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.
@@ -53,8 +56,8 @@
 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.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
+2002, 2003, 2004, 2005, 2006, 2007, 2008 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."
@@ -66,11 +69,11 @@
 while test $# -gt 0 ; do
   case $1 in
     --time-stamp | --time* | -t )
-       echo "$timestamp" ; exit 0 ;;
+       echo "$timestamp" ; exit ;;
     --version | -v )
-       echo "$version" ; exit 0 ;;
+       echo "$version" ; exit ;;
     --help | --h* | -h )
-       echo "$usage"; exit 0 ;;
+       echo "$usage"; exit ;;
     -- )     # Stop option processing
        shift; break ;;
     - )	# Use stdin as input.
@@ -104,7 +107,7 @@
 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 -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$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 ; } ;
@@ -123,7 +126,7 @@
 	;;
  ,,*)   CC_FOR_BUILD=$CC ;;
  ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
-esac ;'
+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)
@@ -158,6 +161,7 @@
 	    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
@@ -196,55 +200,23 @@
 	# contains redundant information, the shorter form:
 	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
 	echo "${machine}-${os}${release}"
-	exit 0 ;;
-    amd64:OpenBSD:*:*)
-	echo x86_64-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    amiga:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    cats:OpenBSD:*:*)
-	echo arm-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    hp300:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    luna88k:OpenBSD:*:*)
-    	echo m88k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    mac68k:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    macppc:OpenBSD:*:*)
-	echo powerpc-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    mvme68k:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    mvme88k:OpenBSD:*:*)
-	echo m88k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    mvmeppc:OpenBSD:*:*)
-	echo powerpc-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    sgi:OpenBSD:*:*)
-	echo mips64-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    sun3:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     *:OpenBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
+	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 0 ;;
+	exit ;;
+    *:SolidBSD:*:*)
+	echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
+	exit ;;
     macppc:MirBSD:*:*)
-	echo powerppc-unknown-mirbsd${UNAME_RELEASE}
-	exit 0 ;;
+	echo powerpc-unknown-mirbsd${UNAME_RELEASE}
+	exit ;;
     *:MirBSD:*:*)
 	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     alpha:OSF1:*:*)
 	case $UNAME_RELEASE in
 	*4.0)
@@ -297,40 +269,43 @@
 	# 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 0 ;;
+	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 0 ;;
+	exit ;;
     21064:Windows_NT:50:3)
 	echo alpha-dec-winnt3.5
-	exit 0 ;;
+	exit ;;
     Amiga*:UNIX_System_V:4.0:*)
 	echo m68k-unknown-sysv4
-	exit 0;;
+	exit ;;
     *:[Aa]miga[Oo][Ss]:*:*)
 	echo ${UNAME_MACHINE}-unknown-amigaos
-	exit 0 ;;
+	exit ;;
     *:[Mm]orph[Oo][Ss]:*:*)
 	echo ${UNAME_MACHINE}-unknown-morphos
-	exit 0 ;;
+	exit ;;
     *:OS/390:*:*)
 	echo i370-ibm-openedition
-	exit 0 ;;
+	exit ;;
     *:z/VM:*:*)
 	echo s390-ibm-zvmoe
-	exit 0 ;;
+	exit ;;
     *:OS400:*:*)
         echo powerpc-ibm-os400
-	exit 0 ;;
+	exit ;;
     arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
 	echo arm-acorn-riscix${UNAME_RELEASE}
-	exit 0;;
+	exit ;;
+    arm:riscos:*:*|arm:RISCOS:*:*)
+	echo arm-unknown-riscos
[...38960 lines suppressed...]
 		IFS="$save_ifs"
+		eval cmd=\"$cmd\"
 		$show "$cmd"
 		$run eval "$cmd"
-		if test $? != 0 && test "$rmforce" != yes; then
+		if test "$?" -ne 0 && test "$rmforce" != yes; then
 		  exit_status=1
 		fi
 	      done
 	      IFS="$save_ifs"
 	    fi
 	    # FIXME: should reinstall the best remaining shared library.
-	  fi
+	    ;;
+	  esac
 	fi
 	;;
 
       *.lo)
 	# Possibly a libtool object, so verify it.
-	if (sed -e '2q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
+	if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
 
-          # Read the .lo file
-          . $dir/$name
+	  # Read the .lo file
+	  . $dir/$name
 
 	  # Add PIC object to the list of files to remove.
-          if test -n "$pic_object" \
-             && test "$pic_object" != none; then
+	  if test -n "$pic_object" \
+	     && test "$pic_object" != none; then
 	    rmfiles="$rmfiles $dir/$pic_object"
-          fi
+	  fi
 
 	  # Add non-PIC object to the list of files to remove.
-          if test -n "$non_pic_object" \
-             && test "$non_pic_object" != none; then
+	  if test -n "$non_pic_object" \
+	     && test "$non_pic_object" != none; then
 	    rmfiles="$rmfiles $dir/$non_pic_object"
-          fi
+	  fi
 	fi
 	;;
 
       *)
-	# Do a test to see if this is a libtool program.
-	if test $mode = clean &&
-	   (sed -e '4q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
-	  relink_command=
-	  . $dir/$file
+	if test "$mode" = clean ; then
+	  noexename=$name
+	  case $file in
+	  *.exe)
+	    file=`$echo $file|${SED} 's,.exe$,,'`
+	    noexename=`$echo $name|${SED} 's,.exe$,,'`
+	    # $file with .exe has already been added to rmfiles,
+	    # add $file without .exe
+	    rmfiles="$rmfiles $file"
+	    ;;
+	  esac
+	  # Do a test to see if this is a libtool program.
+	  if (${SED} -e '4q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
+	    relink_command=
+	    . $dir/$noexename
 
-	  rmfiles="$rmfiles $objdir/$name $objdir/${name}S.${objext}"
-	  if test "$fast_install" = yes && test -n "$relink_command"; then
-	    rmfiles="$rmfiles $objdir/lt-$name"
+	    # note $name still contains .exe if it was in $file originally
+	    # as does the version of $file that was added into $rmfiles
+	    rmfiles="$rmfiles $objdir/$name $objdir/${name}S.${objext}"
+	    if test "$fast_install" = yes && test -n "$relink_command"; then
+	      rmfiles="$rmfiles $objdir/lt-$name"
+	    fi
+	    if test "X$noexename" != "X$name" ; then
+	      rmfiles="$rmfiles $objdir/lt-${noexename}.c"
+	    fi
 	  fi
 	fi
 	;;
@@ -5226,6 +6700,7 @@
       $show "$rm $rmfiles"
       $run $rm $rmfiles || exit_status=1
     done
+    objdir="$origobjdir"
 
     # Try to remove the ${objdir}s in the directories where we deleted files
     for dir in $rmdirs; do
@@ -5241,20 +6716,20 @@
   "")
     $echo "$modename: you must specify a MODE" 1>&2
     $echo "$generic_help" 1>&2
-    exit 1
+    exit $EXIT_FAILURE
     ;;
   esac
 
   if test -z "$exec_cmd"; then
     $echo "$modename: invalid operation mode \`$mode'" 1>&2
     $echo "$generic_help" 1>&2
-    exit 1
+    exit $EXIT_FAILURE
   fi
 fi # test -z "$show_help"
 
 if test -n "$exec_cmd"; then
   eval exec $exec_cmd
-  exit 1
+  exit $EXIT_FAILURE
 fi
 
 # We need to display help for each of the modes.
@@ -5287,8 +6762,10 @@
       uninstall       remove libraries from an installed directory
 
 MODE-ARGS vary depending on the MODE.  Try \`$modename --help --mode=MODE' for
-a more detailed description of MODE."
-  exit 0
+a more detailed description of MODE.
+
+Report bugs to <bug-libtool at gnu.org>."
+  exit $EXIT_SUCCESS
   ;;
 
 clean)
@@ -5389,9 +6866,9 @@
   -dlpreopen FILE   link in FILE and add its symbols to lt_preloaded_symbols
   -export-dynamic   allow symbols from OUTPUT-FILE to be resolved with dlsym(3)
   -export-symbols SYMFILE
-		    try to export only the symbols listed in SYMFILE
+                    try to export only the symbols listed in SYMFILE
   -export-symbols-regex REGEX
-		    try to export only the symbols matching REGEX
+                    try to export only the symbols matching REGEX
   -LLIBDIR          search LIBDIR for required installed libraries
   -lNAME            OUTPUT-FILE requires the installed library libNAME
   -module           build a library that can dlopened
@@ -5400,12 +6877,16 @@
   -no-undefined     declare that a library does not refer to external symbols
   -o OUTPUT-FILE    create OUTPUT-FILE from the specified objects
   -objectlist FILE  Use a list of object files found in FILE to specify objects
+  -precious-files-regex REGEX
+                    don't remove output files matching REGEX
   -release RELEASE  specify package release information
   -rpath LIBDIR     the created library will eventually be installed in LIBDIR
   -R[ ]LIBDIR       add LIBDIR to the runtime path of programs and libraries
-  -static           do not do any dynamic linking of libtool libraries
+  -static           do not do any dynamic linking of uninstalled libtool libraries
+  -static-libtool-libs
+                    do not do any dynamic linking of libtool libraries
   -version-info CURRENT[:REVISION[:AGE]]
-		    specify library version info [each variable defaults to 0]
+                    specify library version info [each variable defaults to 0]
 
 All other options (arguments beginning with \`-') are ignored.
 
@@ -5441,14 +6922,14 @@
 *)
   $echo "$modename: invalid operation mode \`$mode'" 1>&2
   $echo "$help" 1>&2
-  exit 1
+  exit $EXIT_FAILURE
   ;;
 esac
 
-echo
+$echo
 $echo "Try \`$modename --help' for more information about other modes."
 
-exit 0
+exit $?
 
 # The TAGs below are defined such that we never get into a situation
 # in which we disable both kinds of libraries.  Given conflicting
@@ -5461,14 +6942,13 @@
 # If a disable-shared tag is given, we'll fallback to a static-only
 # configuration.  But we'll never go from static-only to shared-only.
 
-### BEGIN LIBTOOL TAG CONFIG: disable-shared
-build_libtool_libs=no
-build_old_libs=yes
-### END LIBTOOL TAG CONFIG: disable-shared
+# ### BEGIN LIBTOOL TAG CONFIG: disable-shared
+disable_libs=shared
+# ### END LIBTOOL TAG CONFIG: disable-shared
 
-### BEGIN LIBTOOL TAG CONFIG: disable-static
-build_old_libs=`case $build_libtool_libs in yes) echo no;; *) echo yes;; esac`
-### END LIBTOOL TAG CONFIG: disable-static
+# ### BEGIN LIBTOOL TAG CONFIG: disable-static
+disable_libs=static
+# ### END LIBTOOL TAG CONFIG: disable-static
 
 # Local Variables:
 # mode:shell-script

gcl-2.6.8-latex.patch:

--- NEW FILE gcl-2.6.8-latex.patch ---
diff -dur gcl-2.6.8.ORIG/xgcl-2/dwdoc.tex gcl-2.6.8/xgcl-2/dwdoc.tex
--- gcl-2.6.8.ORIG/xgcl-2/dwdoc.tex	2008-12-29 20:09:33.000000000 -0700
+++ gcl-2.6.8/xgcl-2/dwdoc.tex	2008-12-29 20:09:01.000000000 -0700
@@ -1,19 +1,16 @@
 % dwdoc.tex          Gordon S. Novak Jr.
 % 08 Oct 92; 08 Oct 93; 16 Nov 94; 05 Jan 95; 25 Jan 06; 26 Jan 06
 
-\documentstyle[12pt]{article}
-\setlength{\oddsidemargin}{0 in}
-\setlength{\textwidth}{6.5 in}
-\setlength{\textheight}{9.0 in}
+\documentclass[12pt]{article}
+\usepackage[margin=1in]{geometry}
 \setlength{\parskip}{0.1 in}
 \setlength{\parindent}{0.0 in}
-\setlength{\topmargin}{-0.4in}
 \hyphenpenalty=9990
 
 \begin{document}
 
 \Large
-\begin{center} {\bf Interface from GCL to X Windows} \\  \end{center}
+\begin{center} \textbf{Interface from GCL to X Windows} \\  \end{center}
 
 \normalsize
 
@@ -42,508 +39,512 @@
 \item Hiep Huu Nguyen has written (and adapted from X Consortium software)
 an interface between GCL and Xlib, the X library in C.
 Xlib functions can be called directly if desired, but most users will find
-the {\tt dwindow} functions easier to use.  There is little documentation
+the \texttt{dwindow} functions easier to use.  There is little documentation
 of these functions, but the Xlib documentation can be consulted, and
-the {\tt dwindow} functions can be examined as examples.
+the \texttt{dwindow} functions can be examined as examples.
 
-\item The {\tt dwindow} functions described in this document, which call
+\item The \texttt{dwindow} functions described in this document, which call
 the Xlib functions and provide an easier interface for Lisp programs.
 
 \item It is possible to make an interactive graphical interface
 within a web page; this is described in a section below.
 \end{enumerate}
 The source file for the interface (written in GLISP) is
-{\tt dwindow.lsp}; this file is compiled into a file in plain Lisp,
-{\tt dwtrans.lsp}.  {\tt dwtrans.lsp} is compiled as part of XGCL.
+\texttt{dwindow.lsp}; this file is compiled into a file in plain Lisp,
+\texttt{dwtrans.lsp}.  \texttt{dwtrans.lsp} is compiled as part of XGCL.
 
 The functions in this package use the convention that the coordinate
-{\tt (0 0)} is the lower-left corner of a window, with positive {\tt y}
+\texttt{(0 0)} is the lower-left corner of a window, with positive \texttt{y}
 being upward.  This is different from the convention used by
-X, which assumes that {\tt (0 0)} is the upper left corner and
-that positive {\tt y} is downward.
+X, which assumes that \texttt{(0 0)} is the upper left corner and
+that positive \texttt{y} is downward.
 
 In the descriptions below, some function arguments are shown with a type,
-e.g. {\tt arg:type}, to indicate the expected type of the argument.
-The type {\tt vector} is a list {\tt (x y)} of integers.  The argument
-{\tt w} that is used with many functions is of type {\tt window}
-({\tt window} is a Lisp data structure used by the {\tt dwindow} functions).
+e.g. \texttt{arg:type}, to indicate the expected type of the argument.
+The type \texttt{vector} is a list \texttt{(x y)} of integers.  The argument
+\texttt{w} that is used with many functions is of type \texttt{window}
+(\texttt{window} is a Lisp data structure used by the \texttt{dwindow}
+functions).
 
-Both the Xlib and {\tt dwindow} functions are in the package {\tt xlib:}.
-In order to use these functions, the Lisp command {\tt (use-package 'xlib)}
-should be used to import the {\tt dwindow} symbols.
+Both the Xlib and \texttt{dwindow} functions are in the package \texttt{xlib:}.
+In order to use these functions, the Lisp command \texttt{(use-package 'xlib)}
+should be used to import the \texttt{dwindow} symbols.
 
 
 \section{Examples and Utilities}
 
-\subsection{{\tt dwtest}}
+\subsection{\texttt{dwtest}}
 
-The file {\tt dwtest.lsp} contains example functions that illustrate
-the use of the {\tt dwindow} package.  The function call {\tt (wtesta)}
-creates a small window for testing.  {\tt (wtestb)} through
-{\tt (wtestk)} perform drawing and mouse interaction tests using the
+The file \texttt{dwtest.lsp} contains example functions that illustrate
+the use of the \texttt{dwindow} package.  The function call \texttt{(wtesta)}
+creates a small window for testing.  \texttt{(wtestb)} through
+\texttt{(wtestk)} perform drawing and mouse interaction tests using the
 window.  These functions may be consulted as examples of the use of
-commonly used {\tt dwindow} functions.
+commonly used \texttt{dwindow} functions.
 
-\subsection{{\tt pcalc}}
+\subsection{\texttt{pcalc}}
 
-The file {\tt pcalc.lsp} implements
-a pocket calculator as a {\tt picmenu}; its entry is {\tt (pcalc)}.
+The file \texttt{pcalc.lsp} implements
+a pocket calculator as a \texttt{picmenu}; its entry is \texttt{(pcalc)}.
 
-\subsection{{\tt draw}}
+\subsection{\texttt{draw}}
 
-The file {\tt drawtrans.lsp} contains an interactive drawing program;
-its entry is {\tt (draw 'foo)} where {\tt foo} is the name of the drawing.
-The file {\tt ice-cream.lsp} can be loaded, followed by
-{\tt (draw 'ice-cream)} to examine an example drawing.
-{\tt draw} can produce a Lisp program or a set of \LaTeX \  commands to
-recreate the drawing; use {\tt origin to zero} before making a program.
-{\tt (draw-out file names)} will write definitions of drawings in the
-list {\tt names} to the file {\tt file}.
+The file \texttt{drawtrans.lsp} contains an interactive drawing program; its
+entry is \texttt{(draw 'foo)} where \texttt{foo} is the name of the drawing.
+The file \texttt{ice-cream.lsp} can be loaded, followed by
+\texttt{(draw 'ice-cream)} to examine an example drawing.
+\texttt{draw} can produce a Lisp program or a set of \LaTeX \  commands to
+recreate the drawing; use \texttt{origin to zero} before making a program.
+\texttt{(draw-out file names)} will write definitions of drawings in the
+list \texttt{names} to the file \texttt{file}.
 
-\subsection{{\tt editors}}
+\subsection{\texttt{editors}}
 
-The file {\tt editorstrans.lsp} contains some interactive editing programs;
-it is a translation of the file {\tt editors.lsp} .
-One useful editor is the color editor; after entering {\tt (wtesta)}
-(in file {\tt dwtest.lsp}), enter {\tt (edit-color myw)} to edit a
-color.  The result is an {\tt rgb} list as used in {\tt window-set-color}.
+The file \texttt{editorstrans.lsp} contains some interactive editing programs;
+it is a translation of the file \texttt{editors.lsp}.
+One useful editor is the color editor; after entering \texttt{(wtesta)}
+(in file \texttt{dwtest.lsp}), enter \texttt{(edit-color myw)} to edit a
+color.  The result is an \texttt{rgb} list as used in
+\texttt{window-set-color}.
 
 A simple line editor and an Emacs-like text editor are described in sections
 \ref{texted}  and \ref{emacsed} below.
 
 \section{Menus}
 
-The function {\tt menu} provides an easy interface to make a pop-up menu,
+The function \texttt{menu} provides an easy interface to make a pop-up menu,
 get a selection from it, and destroy it: \\
 
 \vspace{-0.2in}
-{\tt \hspace*{0.5in} (menu items \&optional title)} \\
+\texttt{\hspace*{0.5in} (menu items \&optional title)} \\
 
 \vspace{-0.1in}
-Example: {\tt (menu '(red white blue))}
+Example: \texttt{(menu '(red white blue))}
 
 This simple call is all that is needed in most cases.
 More sophisticated menu features are described below.
 
-The {\tt items} in a menu is a list; each item may be a symbol, a {\tt cons}
-of a symbol or string and the corresponding value, or a {\tt cons} of a
-function name and the corresponding value.  In the latter case, the function
-is expected to draw the corresponding menu item.
+The \texttt{items} in a menu is a list; each item may be a symbol, a
+\texttt{cons} of a symbol or string and the corresponding value, or a
+\texttt{cons} of a function name and the corresponding value.  In the latter
+case, the function is expected to draw the corresponding menu item.
 
 If a function name is specified as the first element of a menu item, the
-drawing function should have arguments {\tt (fn w x y)}, where {\tt w}
-is the window and {\tt x} and {\tt y} are the lower-left corner of the
+drawing function should have arguments \texttt{(fn w x y)}, where \texttt{w}
+is the window and \texttt{x} and \texttt{y} are the lower-left corner of the
 drawing area.  The property list of the function name should have the
-property {\tt display-size}, which should be a list {\tt (width height)}
+property \texttt{display-size}, which should be a list \texttt{(width height)}
 in pixels of the displayed symbol.
 
 Menus can be associated with a particular window; if no window is specified,
 the menu is associated with the window where the mouse cursor is located
 when the menu is initialized (which might not be a Lisp user's window).  If a
-menu is associated with a user window, it may be {\em permanent} (left
-displayed after a selection is made) and may be {\em flat} (drawn directly
+menu is associated with a user window, it may be \emph{permanent} (left
+displayed after a selection is made) and may be \emph{flat} (drawn directly
 on the containing window, rather than having its own window).
 
-A menu can be created by {\tt menu-create} : \\
+A menu can be created by \texttt{menu-create} : \\
 
 \vspace{-0.1in}
-{\tt \hspace*{0.5in}
+\texttt{\hspace*{0.5in}
  (menu-create items \&optional title w:window x y perm flat font)} \\
 
 \vspace{-0.1in}
-{\tt title}, if specified, is displayed over the menu.
-{\tt w} is an existing {\tt window}; if specified, the menu is put
-within this window at the {\tt x y} offsets specified (adjusted if necessary
-to keep the menu inside the window).  If no {\tt w}
-is specified, or if {\tt x} is {\tt nil}, the menu is put where the cursor
+\texttt{title}, if specified, is displayed over the menu.
+\texttt{w} is an existing \texttt{window}; if specified, the menu is put
+within this window at the \texttt{x y} offsets specified (adjusted if necessary
+to keep the menu inside the window).  If no \texttt{w} is
+specified, or if \texttt{x} is \texttt{nil}, the menu is put where the cursor
 is the first time the menu is displayed.
-{\tt perm} is non-{\tt nil} if the menu is to be permanent, {\em i.e.}, is to
-be left displayed after a selection has been made.
-{\tt flat} is non-{\tt nil} if the menu is to be drawn directly on the
+\texttt{perm} is non-\texttt{nil} if the menu is to be permanent, \emph{i.e.},
+is to be left displayed after a selection has been made.
+\texttt{flat} is non-\texttt{nil} if the menu is to be drawn directly on the
 containing window.
-{\tt font} is a symbol or string that names the font to be used; the
-default is a {\tt 9x15} typewriter font.
+\texttt{font} is a symbol or string that names the font to be used; the
+default is a \texttt{9x15} typewriter font.
 
-The menu is returned as the value of {\tt menu-create}.  Such a menu can
-be saved; selections can be made from a menu {\tt m} as follows: \\
+The menu is returned as the value of \texttt{menu-create}.  Such a menu can
+be saved; selections can be made from a menu \texttt{m} as follows: \\
 
 \vspace{-0.1in}
-{\tt \hspace*{0.5in} (menu-select m \&optional inside)} \ \ \ \ \ or
-{\tt \hspace*{0.5in} (menu-select! m)} \\
+\texttt{\hspace*{0.5in} (menu-select m \&optional inside)} \ \ \ \ \ or
+\texttt{\hspace*{0.5in} (menu-select! m)} \\
 
 \vspace{-0.1in}
-{\tt menu-select} will return {\tt nil} if the mouse is clicked outside the
-menu, or is moved outside after it has been inside (or if {\tt inside} is
-not {\tt nil}), provided that the menu is contained within a user-created
+\texttt{menu-select} will return \texttt{nil} if the mouse is clicked outside
+the menu, or is moved outside after it has been inside (or if \texttt{inside}
+is not \texttt{nil}), provided that the menu is contained within a user-created
 window.
-{\tt menu-select!} requires that a choice be made.
+\texttt{menu-select!} requires that a choice be made.
 
 In order to avoid wasting storage, unused menus should be destroyed:
-{\tt (menu-destroy m)}.  The simple {\tt menu} function destroys its
+\texttt{(menu-destroy m)}.  The simple \texttt{menu} function destroys its
 menu after it is used.
 
-{\tt \hspace*{0.5in} (menu-size m)} \\
-{\tt \hspace*{0.5in} (menu-moveto-xy m x y)} \\
-{\tt \hspace*{0.5in} (menu-reposition m)} \
+\texttt{\hspace*{0.5in} (menu-size m)} \\
+\texttt{\hspace*{0.5in} (menu-moveto-xy m x y)} \\
+\texttt{\hspace*{0.5in} (menu-reposition m)} \
 
-{\tt menu-reposition} will reposition a {\tt flat} menu within its parent
+\texttt{menu-reposition} will reposition a \texttt{flat} menu within its parent
 window by allowing the user to position a ghost box using the mouse.
-{\tt menu-size} returns the size of the menu as a vector, {\tt (x y)}.
-{\tt menu-moveto-xy} adjusts the offsets to move a {\tt flat} menu to
+\texttt{menu-size} returns the size of the menu as a vector, \texttt{(x y)}.
+\texttt{menu-moveto-xy} adjusts the offsets to move a \texttt{flat} menu to
 the specified position within its parent window.  These functions and
-{\tt menu-destroy} work for picmenus and barmenus as well.
+\texttt{menu-destroy} work for picmenus and barmenus as well.
 
-{\tt \hspace*{0.5in} (menu-item-position m name \&optional location)} \\
+\texttt{\hspace*{0.5in} (menu-item-position m name \&optional location)} \\
 
 \vspace{-0.1in}
-{\tt menu-item-position} returns a vector {\tt (x y)} that gives the
-coordinates of the menu item whose name is {\tt name}.  {\tt location}
-may be {\tt center}, {\tt left}, {\tt right}, {\tt top}, or {\tt bottom};
-the default is the lower-left corner of the menu item.  {\tt center}
-specifies the center of the box containing the menu item; the other
-{\tt location} values are at the center of the specified edge of the box.
+\texttt{menu-item-position} returns a vector \texttt{(x y)} that gives the
+coordinates of the menu item whose name is \texttt{name}.  \texttt{location}
+may be \texttt{center}, \texttt{left}, \texttt{right}, \texttt{top}, or
+\texttt{bottom}; the default is the lower-left corner of the menu item.
+\texttt{center} specifies the center of the box containing the menu item; the
+other \texttt{location} values are at the center of the specified edge of the
+box.
 
 \subsection{Picmenus}
 
-A {\tt picmenu} (picture menu) is analogous to a menu, but involves a
+A \texttt{picmenu} (picture menu) is analogous to a menu, but involves a
 user-defined picture containing sensitive spots or ``buttons''.
-The test function {\tt (wteste)} shows an example of a {\tt picmenu}.
-A {\tt picmenu} is created by: \\
+The test function \texttt{(wteste)} shows an example of a \texttt{picmenu}.
+A \texttt{picmenu} is created by: \\
 
 \vspace{-0.1in}
-{\tt \hspace*{0.5in} (picmenu-create buttons width height drawfn \\
+\texttt{\hspace*{0.5in} (picmenu-create buttons width height drawfn \\
 \hspace*{1.5in} \&optional title dotflg w:window x y perm flat font boxflg)} \\
 
 \vspace{-0.1in}
 
 If a picmenu is to be used more than once, the common parts can be made
-into a {\tt picmenu-spec} and reused:
+into a \texttt{picmenu-spec} and reused:
 
 \vspace{-0.1in}
-{\tt \hspace*{0.5in} (picmenu-create-spec buttons width height drawfn \\
+\texttt{\hspace*{0.5in} (picmenu-create-spec buttons width height drawfn \\
 \hspace*{1.5in} \&optional dotflg font)} \\
 
 \vspace{-0.1in}
-{\tt \hspace*{0.5in} (picmenu-create-from-spec spec:picmenu-spec \\
+\texttt{\hspace*{0.5in} (picmenu-create-from-spec spec:picmenu-spec \\
 \hspace*{1.5in} \&optional title w:window x y perm flat boxflg)} \\
 
 \vspace{-0.1in}
-{\tt width} and {\tt height} are the size of the area occupied by the
-picture.  {\tt (drawfn w x y)} should draw the picture at the offset
-{\tt x y}.  Note that the {\tt draw} utility can be used to
-make the drawing function, including {\tt picmenu} buttons.
-{\tt dotflg} is non-{\tt nil} if it is desired that small boxes be
+\texttt{width} and \texttt{height} are the size of the area occupied by the
+picture.  \texttt{(drawfn w x y)} should draw the picture at the offset
+\texttt{x y}.  Note that the \texttt{draw} utility can be used to
+make the drawing function, including \texttt{picmenu} buttons.
+\texttt{dotflg} is non-\texttt{nil} if it is desired that small boxes be
 automatically added to the sensitive points when the picture is drawn.
-{\tt boxflg} is non-{\tt nil} if a box is to be drawn around the picmenu
+\texttt{boxflg} is non-\texttt{nil} if a box is to be drawn around the picmenu
 when the picture is drawn (this is only needed for flat
-picmenus).  If {\tt perm} is non-nil, the drawing program is not called when
+picmenus).  If \texttt{perm} is non-nil, the drawing program is not called when
 a selection is to be made, so that an external program must draw the
-{\tt picmenu}; this avoids the need to redraw a complex picture.
+\texttt{picmenu}; this avoids the need to redraw a complex picture.
 The remaining arguments are as described for menus.
 
-Each of the {\tt buttons} in a picmenu is a list: \\
+Each of the \texttt{buttons} in a picmenu is a list: \\
 
 \vspace{-0.1in}
-{\tt \hspace*{0.5in} (buttonname offset size highlightfn unhighlightfn)} \\
+\texttt{\hspace*{0.5in} (buttonname offset size highlightfn unhighlightfn)} \\
 
 \vspace{-0.1in}
-{\tt buttonname} is the name of the button; it is the value returned when that
-button is selected.
-{\tt offset} is a vector {\tt (x y)} that gives the offset of the center
+\texttt{buttonname} is the name of the button; it is the value returned when
+that button is selected.
+\texttt{offset} is a vector \texttt{(x y)} that gives the offset of the center
 of the button from the lower-left corner of the picture.
 The remainder of the button list may be omitted.
-{\tt size} is an optional list {\tt (width height)} that gives the size of the
-sensitive area of the button; the default size is {\tt (12\ 12)}.
-{\tt (highlightfn w x y)} and {\tt (unhighlightfn w x y)} (where {\tt (x y)}
-is the center of the button in the coordinates of {\tt w}) are optional
-functions to highlight the button area when the cursor is moved into it and
-unhighlight the button when the cursor is moved out; the default is to
-display a box of the specified {\tt size}.
+\texttt{size} is an optional list \texttt{(width height)} that gives the size
+of the sensitive area of the button; the default size is \texttt{(12\ 12)}.
+\texttt{(highlightfn w x y)} and \texttt{(unhighlightfn w x y)} (where
+\texttt{(x y)} is the center of the button in the coordinates of \texttt{w})
+are optional functions to highlight the button area when the cursor is moved
+into it and unhighlight the button when the cursor is moved out; the default
+is to display a box of the specified \texttt{size}.
 
-{\tt \hspace*{0.5in} (picmenu-select m \&optional inside)} \\
-If the {\tt picmenu} is not {\tt flat}, its window should be destroyed
-following the selection using {\tt menu-destroy}.
+\texttt{\hspace*{0.5in} (picmenu-select m \&optional inside)} \\
+If the \texttt{picmenu} is not \texttt{flat}, its window should be destroyed
+following the selection using \texttt{menu-destroy}.
 
-{\tt \hspace*{0.5in} (picmenu-item-position m name \&optional location)} \\
+\texttt{\hspace*{0.5in} (picmenu-item-position m name \&optional location)} \\
 
 \vspace{-0.1in}
-{\tt \hspace*{0.5in} (picmenu-delete-named-button m name:symbol)} \\
-This deletes a button from a displayed {\tt picmenu}.  The set of
-deleted buttons is reset to {\tt nil} when the picmenu is drawn.
+\texttt{\hspace*{0.5in} (picmenu-delete-named-button m name:symbol)} \\
+This deletes a button from a displayed \texttt{picmenu}.  The set of
+deleted buttons is reset to \texttt{nil} when the picmenu is drawn.
 
 \subsection{Barmenus}
 
-A {\tt barmenu} displays a bar graph whose size can be adjusted using
+A \texttt{barmenu} displays a bar graph whose size can be adjusted using
 the mouse.
 
-{\tt \hspace*{0.5in} 
+\texttt{\hspace*{0.5in} 
 (barmenu-create maxval initval barwidth \\
 \hspace*{1.5in} \&optional title horizontal subtrackfn subtrackparms \\
 \hspace*{1.5in} parentw x y perm flat color)}
 
-A value is selected by: {\tt (barmenu-select m:barmenu \&optional inside)} \\
-If the {\tt barmenu} is not {\tt flat}, its window should be destroyed
-following the selection using {\tt menu-destroy}.
+A value is selected by: \texttt{(barmenu-select m:barmenu \&optional inside)} \\
+If the \texttt{barmenu} is not \texttt{flat}, its window should be destroyed
+following the selection using \texttt{menu-destroy}.
 
 The user must first click the mouse in the bar area; then
 the size of the displayed bar is adjusted as the user moves the mouse
-pointer.  In addition, the {\tt subtrackfn} is called with arguments
-of the size of the bar followed by the {\tt subtrackparms}; this can
+pointer.  In addition, the \texttt{subtrackfn} is called with arguments
+of the size of the bar followed by the \texttt{subtrackparms}; this can
 be used, for example, to display a numeric value in addition to the
 bar size.
 
 
 \subsection{Menu Sets and Menu Conns}
 
-A {\tt menu-set} is a set of multiple menus, picmenus, or barmenus
+A \texttt{menu-set} is a set of multiple menus, picmenus, or barmenus
 that are simultaneously active within the same window.  Menu-sets
-can be used to implement graphical user interfaces.  A {\tt menu-conns}
+can be used to implement graphical user interfaces.  A \texttt{menu-conns}
 is a menu-set that includes connections between menus; this can be
 used to implement interfaces that allow the user to construct a network
 from components.
 
-The source file for menu-sets is the GLISP file {\tt menu-set.lsp};
-this file is translated as part of the file {\tt drawtrans.lsp} in
+The source file for menu-sets is the GLISP file \texttt{menu-set.lsp};
+this file is translated as part of the file \texttt{drawtrans.lsp} in
 plain Lisp.  Examples of the use of menu sets are given at the top
-of the file {\tt menu-set.lsp}.  In the following descriptions,
-{\tt ms} is a {\tt menu-set} and {\tt mc} is a {\tt menu-conns}.
+of the file \texttt{menu-set.lsp}.  In the following descriptions,
+\texttt{ms} is a \texttt{menu-set} and \texttt{mc} is a \texttt{menu-conns}.
 
-{\tt \hspace*{0.5in} (menu-set-create w)} creates a menu set to be displayed
-in the window {\tt w}.
+\texttt{\hspace*{0.5in} (menu-set-create w)} creates a menu set to be displayed
+in the window \texttt{w}.
 
-{\tt \hspace*{0.5in} (menu-set-name symbol)} makes a {\tt gensym} name that
-begins with {\tt symbol}.
+\texttt{\hspace*{0.5in} (menu-set-name symbol)} makes a \texttt{gensym} name
+that begins with \texttt{symbol}.
 
-{\tt \hspace*{0.5in} (menu-set-add-menu ms name:symbol sym title items} \\
-\hspace*{1.5in} {\tt \&optional offset:vector)}
+\texttt{\hspace*{0.5in} (menu-set-add-menu ms name:symbol sym title items} \\
+\hspace*{1.5in} \texttt{\&optional offset:vector)}
 
-This function adds a menu to a menu-set.  {\tt sym} is arbitrary
+This function adds a menu to a menu-set.  \texttt{sym} is arbitrary
 information that is saved with the menu.
 
-{\tt \hspace*{0.5in} (menu-set-add-picmenu ms name sym title spec:picmenu-spec} \\
-\hspace*{1.5in} {\tt \&optional offset:vector nobox)}
+\texttt{\hspace*{0.5in} (menu-set-add-picmenu ms name sym title spec:picmenu-spec} \\
+\hspace*{1.5in} \texttt{\&optional offset:vector nobox)}
 
-{\tt \hspace*{0.5in} (menu-set-add-component ms name \&optional offset:vector)}
+\texttt{\hspace*{0.5in} (menu-set-add-component ms name \&optional offset:vector)}
 
-This adds a component that has a {\tt picmenu-spec} defined on the
-property list of {\tt name}.
+This adds a component that has a \texttt{picmenu-spec} defined on the
+property list of \texttt{name}.
 
-{\tt \hspace*{0.5in} (menu-set-add-barmenu ms name sym barmenu title} \\
-\hspace*{1.5in} {\tt \&optional offset:vector)}
+\texttt{\hspace*{0.5in} (menu-set-add-barmenu ms name sym barmenu title} \\
+\hspace*{1.5in} \texttt{\&optional offset:vector)}
 
-{\tt \hspace*{0.5in} (menu-set-draw ms)} draws all the menus.
+\texttt{\hspace*{0.5in} (menu-set-draw ms)} draws all the menus.
 
-{\tt \hspace*{0.5in} (menu-set-select ms \&optional redraw enabled)}
+\texttt{\hspace*{0.5in} (menu-set-select ms \&optional redraw enabled)}
 
-{\tt menu-set-select} gets a selection from a menu-set.  If {\tt redraw}
-is non-{\tt nil}, the menu-set is drawn.  {\tt enabled} may be a list
+\texttt{menu-set-select} gets a selection from a menu-set.  If \texttt{redraw}
+is non-\texttt{nil}, the menu-set is drawn.  \texttt{enabled} may be a list
 of names of menus that are enabled for selection.  The result is
-{\tt (selection menu-name)}, or {\tt ((x y) BACKGROUND button)}
+\texttt{(selection menu-name)}, or \texttt{((x y) BACKGROUND button)}
 for a click outside any menu.
 
 
-{\tt \hspace*{0.5in} (menu-conns-create ms)} creates a {\tt menu-conns}
-from a {\tt menu-set}.
+\texttt{\hspace*{0.5in} (menu-conns-create ms)} creates a \texttt{menu-conns}
+from a \texttt{menu-set}.
 
-{\tt \hspace*{0.5in} (menu-conns-add-conn mc)}
+\texttt{\hspace*{0.5in} (menu-conns-add-conn mc)}
 
 This function allows the user to select two ports from menus of the
-{\tt menu-conns}.  It then draws a line between the ports and adds the
-connection to the {\tt connections} of the {\tt menu-conns}.
+\texttt{menu-conns}.  It then draws a line between the ports and adds the
+connection to the \texttt{connections} of the \texttt{menu-conns}.
 
-{\tt \hspace*{0.5in} (menu-conns-move mc)}
+\texttt{\hspace*{0.5in} (menu-conns-move mc)}
 
 This function allows the user to select a menu and move it.
-The {\tt menu-set} and connections are redrawn afterwards.
+The \texttt{menu-set} and connections are redrawn afterwards.
 
-{\tt \hspace*{0.5in} (menu-conns-find-conn mc pt:vector)} \\
-This finds the connection selected by the point {\tt pt}, if any.
+\texttt{\hspace*{0.5in} (menu-conns-find-conn mc pt:vector)} \\
+This finds the connection selected by the point \texttt{pt}, if any.
 This is useful to allow the user to delete a connection:
 
-{\tt \hspace*{0.5in} (menu-conns-delete-conn mc conn)}
+\texttt{\hspace*{0.5in} (menu-conns-delete-conn mc conn)}
 
-{\tt \hspace*{0.5in} (menu-conns-find-conns mc menuname port)} \\
-This returns all the connections from the specified {\tt port} (selection)
-of the menu whose name is {\tt menuname}.
+\texttt{\hspace*{0.5in} (menu-conns-find-conns mc menuname port)} \\
+This returns all the connections from the specified \texttt{port} (selection)
+of the menu whose name is \texttt{menuname}.
 
 
 \section{Windows}
 
-{\tt \hspace*{0.5in} (window-create width height \&optional title parentw
+\texttt{\hspace*{0.5in} (window-create width height \&optional title parentw
  x y font)} \\
 
 \vspace{-0.1in}
-{\tt window-create} makes a new window of the specified {\tt width} and
-{\tt height}.  {\tt title}, if specified, becomes the displayed title
-of the window.  If {\tt parentw} is specified, it should be the
-{\tt window-parent} property of an existing window, which becomes the parent
-window of the new window.  {\tt x} and {\tt y} are the offset of the
-new window from the parent window.  {\tt font} is the font to be used
+\texttt{window-create} makes a new window of the specified \texttt{width} and
+\texttt{height}.  \texttt{title}, if specified, becomes the displayed title
+of the window.  If \texttt{parentw} is specified, it should be the
+\texttt{window-parent} property of an existing window, which becomes the parent
+window of the new window.  \texttt{x} and \texttt{y} are the offset of the
+new window from the parent window.  \texttt{font} is the font to be used
 for printing in the window; the default is given by
-{\tt *window-default-font-name*}, initially {\tt courier-bold-12}.
+\texttt{*window-default-font-name*}, initially \texttt{courier-bold-12}.
 
-{\tt \hspace*{0.5in} (window-open w)} causes a window to be displayed
+\texttt{\hspace*{0.5in} (window-open w)} causes a window to be displayed
 on the screen.
 
-{\tt \hspace*{0.5in} (window-close w)} removes the window from the display;
+\texttt{\hspace*{0.5in} (window-close w)} removes the window from the display;
 it can be re-opened.
 
-{\tt \hspace*{0.5in} (window-destroy w)}
+\texttt{\hspace*{0.5in} (window-destroy w)}
 
-{\tt \hspace*{0.5in} (window-moveto-xy w x y)}
+\texttt{\hspace*{0.5in} (window-moveto-xy w x y)}
 
-{\tt \hspace*{0.5in} (window-geometry w)} queries X for the window geometry.
+\texttt{\hspace*{0.5in} (window-geometry w)} queries X for the window geometry.
 The result is a list, \linebreak
-{\tt (x y width height border-width)} .
+\texttt{(x y width height border-width)} .
 
-{\tt \hspace*{0.5in} (window-size w)} returns a list {\tt (width height)} .
+\texttt{\hspace*{0.5in} (window-size w)} returns a list
+\texttt{(width height)} .
 
 \vspace{-0.1in}
 Note that the width and height are cached within the structure so that no call
 to X is needed to examine them.  However, if the window is resized, it is
-necessary to call {\tt (window-reset-geometry\ w)} to reset the local
+necessary to call \texttt{(window-reset-geometry\ w)} to reset the local
 parameters to their correct values.
 
 % ; Paint in window with mouse \\   % these are not really working...
-% {\tt \hspace*{0.5in} (window-paint w)} \\
+% \texttt{\hspace*{0.5in} (window-paint w)} \\
 %
-% {\tt \hspace*{0.5in} (window-move w)} \\
+% \texttt{\hspace*{0.5in} (window-move w)} \\
 %
-% {\tt \hspace*{0.5in} (dowindowcom w)} \\
+% \texttt{\hspace*{0.5in} (dowindowcom w)} \\
 
-The following functions provide access to the parts of the {\tt window} data
+The following functions provide access to the parts of the \texttt{window} data
 structure; most applications will not need to use them. \\
 
 \vspace{-0.1in}
-{\tt \hspace*{0.5in} (window-gcontext        w)} \\
-{\tt \hspace*{0.5in} (window-parent          w)} \\
-{\tt \hspace*{0.5in} (window-drawable-height w)} \\
-{\tt \hspace*{0.5in} (window-drawable-width  w)} \\
-{\tt \hspace*{0.5in} (window-label           w)} \\
-{\tt \hspace*{0.5in} (window-font            w)} \\
-{\tt \hspace*{0.5in} (window-screen-height)} \\
+\texttt{\hspace*{0.5in} (window-gcontext        w)} \\
+\texttt{\hspace*{0.5in} (window-parent          w)} \\
+\texttt{\hspace*{0.5in} (window-drawable-height w)} \\
+\texttt{\hspace*{0.5in} (window-drawable-width  w)} \\
+\texttt{\hspace*{0.5in} (window-label           w)} \\
+\texttt{\hspace*{0.5in} (window-font            w)} \\
+\texttt{\hspace*{0.5in} (window-screen-height)} \\
 
 
 \section{Drawing Functions}
 
-{\tt \hspace*{0.5in} (window-clear w)} clears the window to the background
+\texttt{\hspace*{0.5in} (window-clear w)} clears the window to the background
 color.
 
-{\tt \hspace*{0.5in} (window-force-output \&optional w)}
+\texttt{\hspace*{0.5in} (window-force-output \&optional w)}
 
 \vspace{-0.1in}
 Communication between the running program and X windows is done through a
 stream; actual drawing on the display is done asynchronously.
-{\tt window-force-output} causes the current drawing commands, if any,
+\texttt{window-force-output} causes the current drawing commands, if any,
 to be sent to X.  Without this, commands may be left in the stream buffer and
-may appear not to have been executed.  The argument {\tt w} is not used.
+may appear not to have been executed.  The argument \texttt{w} is not used.
 
-In all of the drawing functions, the {\tt linewidth} argument is optional
-and defaults to {\tt 1}.
+In all of the drawing functions, the \texttt{linewidth} argument is optional
+and defaults to \texttt{1}.
 
 \vspace{0.1in}
-{\tt \hspace*{0.5in} (window-draw-line w from:vector to:vector linewidth)} \\
-{\tt \hspace*{0.5in}
+\texttt{\hspace*{0.5in} (window-draw-line w from:vector to:vector linewidth)} \\
+\texttt{\hspace*{0.5in}
  (window-draw-line-xy w x1 y1 x2 y2 \&optional linewidth op)} \\
- \hspace*{1.0in} {\tt op} may be {\tt xor} or {\tt erase}.
+ \hspace*{1.0in} \texttt{op} may be \texttt{xor} or \texttt{erase}.
 
 \vspace{0.1in}
-{\tt \hspace*{0.5in}
+\texttt{\hspace*{0.5in}
  (window-draw-arrow-xy w x1 y1 x2 y2 \&optional linewidth size)} \\
-{\tt \hspace*{0.5in}
+\texttt{\hspace*{0.5in}
  (window-draw-arrow2-xy w x1 y1 x2 y2 \&optional linewidth size)} \\
-{\tt \hspace*{0.5in}
+\texttt{\hspace*{0.5in}
  (window-draw-arrowhead-xy w x1 y1 x2 y2 \&optional linewidth size)}
 
 \vspace{-0.1in}
 These draw a line with an arrowhead at the second point, a line with an
 arrowhead at both points, or an arrowhead alone at the second point,
-respectively.  {\tt size} is the arrowhead size; the default is
-{\tt (+ 20 (* linewidth 5))}.
+respectively.  \texttt{size} is the arrowhead size; the default is
+\texttt{(+ 20 (* linewidth 5))}.
 
 \vspace{0.1in}
-{\tt \hspace*{0.5in} (window-draw-box-xy w x y width height linewidth)} \\
-{\tt \hspace*{0.5in} (window-xor-box-xy w x y width height linewidth)} \\
-{\tt \hspace*{0.5in} (window-draw-box w offset:vector size:vector linewidth)} \\
-{\tt \hspace*{0.5in} (window-draw-box-corners w x1 y1 x2 y2 linewidth)} \\
- \hspace*{1.0in} where {\tt (x1 y1)} and {\tt (x2 y2)} are opposite corners. \\
-{\tt \hspace*{0.5in} (window-draw-rcbox-xy w x y width height radius linewidth)} \\
+\texttt{\hspace*{0.5in} (window-draw-box-xy w x y width height linewidth)} \\
+\texttt{\hspace*{0.5in} (window-xor-box-xy w x y width height linewidth)} \\
+\texttt{\hspace*{0.5in} (window-draw-box w offset:vector size:vector linewidth)} \\
+\texttt{\hspace*{0.5in} (window-draw-box-corners w x1 y1 x2 y2 linewidth)} \\
+ \hspace*{1.0in} where \texttt{(x1 y1)} and \texttt{(x2 y2)} are opposite corners. \\
+\texttt{\hspace*{0.5in} (window-draw-rcbox-xy w x y width height radius linewidth)} \\
  \hspace*{1.0in} draws a box with rounded corners.
 
-{\tt \hspace*{0.5in} (window-draw-arc-xy w x y radiusx radiusy anglea angleb linewidth)}
+\texttt{\hspace*{0.5in} (window-draw-arc-xy w x y radiusx radiusy anglea angleb linewidth)}
 
 \vspace{-0.1in}
-{\tt anglea} is the angle, in degrees, at which the arc is started.
-{\tt angleb} is the angle, in degrees, that specifies the amount of arc
+\texttt{anglea} is the angle, in degrees, at which the arc is started.
+\texttt{angleb} is the angle, in degrees, that specifies the amount of arc
 to be drawn, counterclockwise from the starting position.
 
 \vspace{0.1in}
-{\tt \hspace*{0.5in} (window-draw-circle-xy w x y radius linewidth)} \\
-{\tt \hspace*{0.5in} (window-draw-circle w center:vector radius linewidth)} \\
-{\tt \hspace*{0.5in} (window-draw-ellipse-xy w x y radiusx radiusy linewidth)} \\
-{\tt \hspace*{0.5in} (window-draw-dot-xy w x y)}
+\texttt{\hspace*{0.5in} (window-draw-circle-xy w x y radius linewidth)} \\
+\texttt{\hspace*{0.5in} (window-draw-circle w center:vector radius linewidth)} \\
+\texttt{\hspace*{0.5in} (window-draw-ellipse-xy w x y radiusx radiusy linewidth)} \\
+\texttt{\hspace*{0.5in} (window-draw-dot-xy w x y)}
 
 \vspace{0.1in}
-{\tt \hspace*{0.5in} (window-erase-area-xy w left bottom width height)} \\
-{\tt \hspace*{0.5in} (window-erase-area w offset:vector size:vector)} \\
-{\tt \hspace*{0.5in} (window-copy-area-xy w fromx fromy	tox toy width height)} \\
-{\tt \hspace*{0.5in} (window-invert-area w offset:vector size:vector)} \\
-{\tt \hspace*{0.5in} (window-invert-area-xy w left bottom width height)}
+\texttt{\hspace*{0.5in} (window-erase-area-xy w left bottom width height)} \\
+\texttt{\hspace*{0.5in} (window-erase-area w offset:vector size:vector)} \\
+\texttt{\hspace*{0.5in} (window-copy-area-xy w fromx fromy	tox toy width height)} \\
+\texttt{\hspace*{0.5in} (window-invert-area w offset:vector size:vector)} \\
+\texttt{\hspace*{0.5in} (window-invert-area-xy w left bottom width height)}
 
 \vspace{0.1in}
-{\tt \hspace*{0.5in} (window-printat-xy w s x y)} \\
-{\tt \hspace*{0.5in} (window-printat w s at:vector)} \\
-{\tt \hspace*{0.5in} (window-prettyprintat-xy w s x y)} \\
-{\tt \hspace*{0.5in} (window-prettyprintat w s at:vector)} \\
+\texttt{\hspace*{0.5in} (window-printat-xy w s x y)} \\
+\texttt{\hspace*{0.5in} (window-printat w s at:vector)} \\
+\texttt{\hspace*{0.5in} (window-prettyprintat-xy w s x y)} \\
+\texttt{\hspace*{0.5in} (window-prettyprintat w s at:vector)} \\
 
 \vspace{-0.1in}
-The argument {\tt s} is printed at the specified position.
-{\tt s} is stringified if necessary.
+The argument \texttt{s} is printed at the specified position.
+\texttt{s} is stringified if necessary.
 Currently, the pretty-print versions are the same as the plain versions.
 
 \vspace{0.1in}
-{\tt \hspace*{0.5in} (window-draw-border w)} draws a border just
+\texttt{\hspace*{0.5in} (window-draw-border w)} draws a border just
 inside a window.
 
 \section{Fonts, Operations, Colors}
 
-{\tt \hspace*{0.5in} (window-set-font w font)}
+\texttt{\hspace*{0.5in} (window-set-font w font)}
 
 \vspace{-0.1in}
-The font symbols that are currently defined are {\tt courier-bold-12},
-{\tt 8x10}, and {\tt 9x15} .  The global variable {\tt *window-fonts*}
+The font symbols that are currently defined are \texttt{courier-bold-12},
+\texttt{8x10}, and \texttt{9x15} .  The global variable \texttt{*window-fonts*}
 contains correspondences between font symbols and font strings.
 A font string may also be specified instead of a font symbol.
 
-{\tt \hspace*{0.5in} (window-string-width w s)} \\
-{\tt \hspace*{0.5in} (window-string-extents w s)} \\
-These give the width and the vertical size {\tt (ascent descent)} in pixels
-of the specified string {\tt s} using the font of the specified window.
-{\tt s} is stringified if necessary.
+\texttt{\hspace*{0.5in} (window-string-width w s)} \\
+\texttt{\hspace*{0.5in} (window-string-extents w s)} \\
+These give the width and the vertical size \texttt{(ascent descent)} in pixels
+of the specified string \texttt{s} using the font of the specified window.
+\texttt{s} is stringified if necessary.
 
 Operations on a window other than direct drawing are performed by
 setting a condition for the window, performing the operation, and then
-unsetting the condition with {\tt window-unset}.  {\tt window-reset}
+unsetting the condition with \texttt{window-unset}.  \texttt{window-reset}
 will reset a window to its ``standard'' setting; it is useful primarily
 for cases in which a program bug causes window settings to be in an
 undesired state.
 
 \vspace{-0.1in}
-{\tt \hspace*{0.5in} (window-set-xor w)} \\
-{\tt \hspace*{0.5in} (window-set-erase w)} \\
-{\tt \hspace*{0.5in} (window-set-copy w)} \\
-{\tt \hspace*{0.5in} (window-set-invert w)} \\
-{\tt \hspace*{0.5in} (window-unset w)} \\
-{\tt \hspace*{0.5in} (window-reset w)} \\
+\texttt{\hspace*{0.5in} (window-set-xor w)} \\
+\texttt{\hspace*{0.5in} (window-set-erase w)} \\
+\texttt{\hspace*{0.5in} (window-set-copy w)} \\
+\texttt{\hspace*{0.5in} (window-set-invert w)} \\
+\texttt{\hspace*{0.5in} (window-unset w)} \\
+\texttt{\hspace*{0.5in} (window-reset w)} \\
 
-{\tt \hspace*{0.5in} (window-set-line-width w width)} \\
-{\tt \hspace*{0.5in} (window-set-line-attr w width \&optional line-style cap-style join-style)} \\
-{\tt \hspace*{0.5in} (window-std-line-attr w)} \\
+\texttt{\hspace*{0.5in} (window-set-line-width w width)} \\
+\texttt{\hspace*{0.5in} (window-set-line-attr w width \&optional line-style cap-style join-style)} \\
+\texttt{\hspace*{0.5in} (window-std-line-attr w)} \\
 
-{\tt \hspace*{0.5in} (window-foreground w)} \\
-{\tt \hspace*{0.5in} (window-set-foreground w fg-color)} \\
-{\tt \hspace*{0.5in} (window-background w)} \\
-{\tt \hspace*{0.5in} (window-set-background w bg-color)} \\
+\texttt{\hspace*{0.5in} (window-foreground w)} \\
+\texttt{\hspace*{0.5in} (window-set-foreground w fg-color)} \\
+\texttt{\hspace*{0.5in} (window-background w)} \\
+\texttt{\hspace*{0.5in} (window-set-background w bg-color)} \\
 
 
 \subsection{Color}
@@ -551,58 +552,58 @@
 The color of the foreground (things that are drawn, such as lines or
 characters) is set by:
 
-{\tt \hspace*{0.5in} (window-set-color w rgb \&optional background)} \\
+\texttt{\hspace*{0.5in} (window-set-color w rgb \&optional background)} \\
 
-{\tt rgb} is a list {\tt (red green blue)} of 16-bit unsigned integers in
-the range {\tt 0} to {\tt 65535}.  {\tt background} is non-{\tt nil}
-to set the background color rather than the foreground color.
+\texttt{rgb} is a list \texttt{(red green blue)} of 16-bit unsigned integers in
+the range \texttt{0} to \texttt{65535}.  \texttt{background} is
+non-\texttt{nil} to set the background color rather than the foreground color.
 
 Colors are a scarce resource; there is only a finite number of
 available colors, such as 256 colors.  If you only use a small, fixed set
 of colors, the finite set of colors will not be a problem.  However,
 if you create a lot of colors that are used only briefly, it will be
 necessary to release them after they are no longer needed.
-{\tt window-set-color} will leave the global variable {\tt *window-xcolor*}
-set to an integer value that denotes an X color; this value should be
-saved and used as the argument to {\tt window-free-color} to release
-the color after it is no longer needed.
+\texttt{window-set-color} will leave the global variable
+\texttt{*window-xcolor*} set to an integer value that denotes an X color; this
+value should be saved and used as the argument to \texttt{window-free-color}
+to release the color after it is no longer needed.
 
-{\tt \hspace*{0.5in} (window-free-color w \&optional xcolor)} \\
+\texttt{\hspace*{0.5in} (window-free-color w \&optional xcolor)} \\
 
-{\tt window-free-color} frees either the last color used, as given by
-{\tt *window-xcolor*}, or the specified color.
+\texttt{window-free-color} frees either the last color used, as given by
+\texttt{*window-xcolor*}, or the specified color.
 
 
 \subsection{Character Input} \label{texted}
 
 Characters can be input within a window by the call:
 
-{\tt \hspace*{0.5in} (window-input-string w str x y \&optional size)} \\
+\texttt{\hspace*{0.5in} (window-input-string w str x y \&optional size)} \\
 
-{\tt window-input-string} will print the initial string {\tt str},
-if non-{\tt nil},
-at the specified position in the window; {\tt str}, if not modified
+\texttt{window-input-string} will print the initial string \texttt{str},
+if non-\texttt{nil},
+at the specified position in the window; \texttt{str}, if not modified
 by the user, will also be the initial part of the result.  A caret
 is displayed showing the location of the next input character.
 Characters are echoed as they are typed; backspacing erases characters,
-including those from the initial string {\tt str}.  An area of width
-{\tt size} (default 100) is erased to the right of the initial caret.
+including those from the initial string \texttt{str}.  An area of width
+\texttt{size} (default 100) is erased to the right of the initial caret.
 
 
 \subsection{Emacs-like Editing} \label{emacsed}
 
-{\tt window-edit} allows editing of text using an Emacs-subset editor.
+\texttt{window-edit} allows editing of text using an Emacs-subset editor.
 Only a few simple Emacs commands are implemented.
 \begin{verbatim}
    (window-edit w x y width height &optional strings boxflg scroll endp)
 \end{verbatim}
-{\tt x y width height} specify the offset and size of the editing
+\texttt{x y width height} specify the offset and size of the editing
 area; it is a good idea to draw a box around this area first.
-{\tt strings} is an initial list of strings; the return value is a list
+\texttt{strings} is an initial list of strings; the return value is a list
 of strings.
-{\tt scroll} is number of lines to scroll down before displaying text,
-          or {\tt T} to have one line only and terminate on return.
-{\tt endp} is {\tt T} to begin editing at the end of the first line.
+\texttt{scroll} is number of lines to scroll down before displaying text,
+          or \texttt{T} to have one line only and terminate on return.
+\texttt{endp} is \texttt{T} to begin editing at the end of the first line.
 Example:
 \begin{verbatim}
   (window-draw-box-xy myw 48 48 204 204)
@@ -612,130 +613,132 @@
 
 \section{Mouse Interaction}
 
-{\tt \hspace*{0.5in} (window-get-point w)} \\
-{\tt \hspace*{0.5in} (window-get-crosshairs w)} \\
-{\tt \hspace*{0.5in} (window-get-cross w)} \\
-These functions  get a point position by mouse click; they return {\tt (x y)} .
+\texttt{\hspace*{0.5in} (window-get-point w)} \\
+\texttt{\hspace*{0.5in} (window-get-crosshairs w)} \\
+\texttt{\hspace*{0.5in} (window-get-cross w)} \\
+These functions  get a point position by mouse click; they return
+\texttt{(x y)}.
 
 The following function gets a point position by mouse click.  It returns
-{\tt (button (x y))} where {\tt button} is {\tt 1} for the left button,
-{\tt 2} for middle, {\tt 3} for right.
+\texttt{(button (x y))} where \texttt{button} is \texttt{1} for the left
+button, \texttt{2} for middle, \texttt{3} for right.
 
-{\tt \hspace*{0.5in} (window-get-click w)} \\
+\texttt{\hspace*{0.5in} (window-get-click w)} \\
 
 The following function gets a point position by mouse click within a specified
-region.  It returns {\tt (button (x y))} or {\tt NIL} if the mouse leaves
-the region.  If {\tt boxflg} is {\tt t}, a box will be drawn outside the
+region.  It returns \texttt{(button (x y))} or \texttt{NIL} if the mouse leaves
+the region.  If \texttt{boxflg} is \texttt{t}, a box will be drawn outside the
 region while the mouse is being tracked.
 
-{\tt \hspace*{0.5in} (window-track-mouse-in-region w x y sizex sizey \&optional boxflg)} \\
+\texttt{\hspace*{0.5in} (window-track-mouse-in-region w x y sizex sizey \&optional boxflg)} \\
 
 
 The following functions get a point position indicated by drawing a line
 from a specified origin position to the cursor position; they return
-{\tt (x y)} at the cursor position when a mouse button is clicked.
-The {\tt latex} version restricts the slope of the line to be a slope that
-\LaTeX \ can draw; if {\tt flg} is non-{\tt nil}, the slope is restricted
-to be a \LaTeX \ {\tt vector} slope.
+\texttt{(x y)} at the cursor position when a mouse button is clicked.
+The \texttt{latex} version restricts the slope of the line to be a slope that
+\LaTeX \ can draw; if \texttt{flg} is non-\texttt{nil}, the slope is restricted
+to be a \LaTeX \ \texttt{vector} slope.
 
-{\tt \hspace*{0.5in} (window-get-line-position w orgx orgy)} \\
-{\tt \hspace*{0.5in} (window-get-latex-position w orgx orgy flg)} \\
+\texttt{\hspace*{0.5in} (window-get-line-position w orgx orgy)} \\
+\texttt{\hspace*{0.5in} (window-get-latex-position w orgx orgy flg)} \\
 
-The following function gets a position by moving a ``ghost'' icon,
-defined by the icon drawing function {\tt fn}.  This allows exact positioning
+The following function gets a position by moving a ``ghost'' icon, defined
+by the icon drawing function \texttt{fn}.  This allows exact positioning
 of an object by the user.
 
-{\tt \hspace*{0.5in} (window-get-icon-position w fn args \&optional (dx 0)
+\texttt{\hspace*{0.5in} (window-get-icon-position w fn args \&optional (dx 0)
  (dy 0))} \\
 
 \vspace{-0.15in}
-The function {\tt fn} has arguments {\tt (fn w x y . args)} , where {\tt x}
-and {\tt y} are the offset within the window {\tt w} at which the icon is
-to be drawn, and {\tt args} is a list of arbitrary arguments, e.g., the size
-of the icon, that are passed through to the drawing function.
-The icon is drawn in {\tt xor} mode, so it must be drawn using
+The function \texttt{fn} has arguments \texttt{(fn w x y . args)} , where
+\texttt{x} and \texttt{y} are the offset within the window \texttt{w} at which
+the icon is to be drawn, and \texttt{args} is a list of arbitrary arguments,
+e.g., the size of the icon, that are passed through to the drawing function.
+The icon is drawn in \texttt{xor} mode, so it must be drawn using
 only ``plain'' drawing functions, without resetting window attributes.
-The returned value is {\tt (x y)} at the cursor position when a button
-is clicked.  {\tt dx} and {\tt dy}, if specified, are offsets of {\tt x}
-and {\tt y} from the cursor position.
+The returned value is \texttt{(x y)} at the cursor position when a button
+is clicked.  \texttt{dx} and \texttt{dy}, if specified, are offsets of
+\texttt{x} and \texttt{y} from the cursor position.
 
 The following function gets a position by moving a ``ghost'' box icon.
 
-{\tt \hspace*{0.5in} (window-get-box-position w width height \&optional (dx 0) (dy 0))} \\
+\texttt{\hspace*{0.5in} (window-get-box-position w width height \&optional (dx 0) (dy 0))} \\
 
 \vspace{-0.15in}
 By default, the lower-left corner of the box is placed at the cursor position;
-{\tt dx} and {\tt dy} may be used to offset the box from the cursor, e.g.,
-to move the box by a different corner.  The returned value is {\tt (x y)}
-at the cursor position when a button is clicked.
+\texttt{dx} and \texttt{dy} may be used to offset the box from the cursor,
+e.g., to move the box by a different corner.  The returned value is
+\texttt{(x y)} at the cursor position when a button is clicked.
 
 The following function gets coordinates of a box of arbitrary size and
 position.
 
-{\tt \hspace*{0.5in} (window-get-region w)} \\
+\texttt{\hspace*{0.5in} (window-get-region w)} \\
 
 \vspace{-0.15in}
 The user first clicks for one corner of the box, moves the
 mouse and clicks again for the opposite corner, then moves the box into
 the desired position. The returned value is \linebreak
-{\tt ((x y) (width height))},
-where {\tt (x y)} is the lower-left corner of the box.
+\texttt{((x y) (width height))},
+where \texttt{(x y)} is the lower-left corner of the box.
 
 The following function gets the size of a box by mouse selection,
-echoing the size in pixels below the box.  {\tt offsety}
-should be at least {\tt 30} to leave room to display the size of the box.
+echoing the size in pixels below the box.  \texttt{offsety}
+should be at least \texttt{30} to leave room to display the size of the box.
 
-{\tt \hspace*{0.5in} (window-get-box-size w offsetx offsety)} \\
+\texttt{\hspace*{0.5in} (window-get-box-size w offsetx offsety)} \\
 
 
 The following function adjusts one side of a box.
 
-{\tt \hspace*{0.5in} (window-adjust-box-side w x y width height side)} \\
+\texttt{\hspace*{0.5in} (window-adjust-box-side w x y width height side)} \\
 
 \vspace{-0.15in}
-{\tt side} specifies the side of the box to be adjusted: {\tt left},
-{\tt right}, {\tt top}, or {\tt bottom}.  The result is
-{\tt ((x y) (width height))} for the resulting box.
+\texttt{side} specifies the side of the box to be adjusted: \texttt{left},
+\texttt{right}, \texttt{top}, or \texttt{bottom}.  The result is
+\texttt{((x y) (width height))} for the resulting box.
 
-{\tt \hspace*{0.5in} (window-get-circle w \&optional center:vector)} \\
-{\tt \hspace*{0.5in} (window-get-ellipse w \&optional center:vector)} \\
+\texttt{\hspace*{0.5in} (window-get-circle w \&optional center:vector)} \\
+\texttt{\hspace*{0.5in} (window-get-ellipse w \&optional center:vector)} \\
 These functions interactively get a circle or ellipse.  For an ellipse,
 a circle is gotten first for the horizontal size; then the vertical
 size of the ellipse is adjusted.
-{\tt window-get-circle} returns {\tt ((x y) radius)}.
-{\tt window-get-ellipse} returns {\tt ((x y) (xradius yradius))}.
+\texttt{window-get-circle} returns \texttt{((x y) radius)}.
+\texttt{window-get-ellipse} returns \texttt{((x y) (xradius yradius))}.
 
-% {\tt \hspace*{0.5in} (window-sync w)} will clear the event queue of any
+% \texttt{\hspace*{0.5in} (window-sync w)} will clear the event queue of any
 % previous motion events.
 
-{\tt window-track-mouse} is the basic function for following the mouse
+\texttt{window-track-mouse} is the basic function for following the mouse
 and performing some action as it moves.  This function is used in
 the implementation of menus and the mouse-interaction functions described in
 this section.
 
-{\tt \hspace*{0.5in} (window-track-mouse w fn \&optional outflg)}
+\texttt{\hspace*{0.5in} (window-track-mouse w fn \&optional outflg)}
           
 \vspace{-0.05in}
 Each time the mouse position changes or a mouse button is pressed,
-the function {\tt fn} is called with
-arguments {\tt (x y code)} where {\tt x} and {\tt y} are the cursor
-position, {\tt code} is a button code ({\tt 0} if no button, {\tt 1} for
-the left button, {\tt 2} for the middle button, or {\tt 3} for the right
-button).  {\tt window-track-mouse} continues to track the mouse until {\tt fn}
-returns a value other than {\tt nil}, at which time {\tt window-track-mouse}
-returns that value.  Usually, it is a good idea for {\tt fn} to return a
-value other than {\tt nil} upon a mouse click.  If the argument {\tt outflg}
-is non-{\tt nil}, the function {\tt fn} will be called for button clicks
-outside the window {\tt w}; note, however, that such clicks will not be
-seen if the containing window intercepts them, so that this feature will
-work only if the window {\tt w} is inside another Lisp user window.
+the function \texttt{fn} is called with arguments
+\texttt{(x y code)} where \texttt{x} and \texttt{y} are the cursor position,
+\texttt{code} is a button code (\texttt{0} if no button, \texttt{1} for
+the left button, \texttt{2} for the middle button, or \texttt{3} for the right
+button).  \texttt{window-track-mouse} continues to track the mouse until
+\texttt{fn} returns a value other than \texttt{nil}, at which time
+\texttt{window-track-mouse} returns that value.  Usually, it is a good idea
+for \texttt{fn} to return a value other than \texttt{nil} upon a mouse click.
+If the argument \texttt{outflg} is non-\texttt{nil}, the function \texttt{fn}
+will be called for button clicks outside the window \texttt{w}; note, however,
+that such clicks will not be seen if the containing window intercepts them, so
+that this feature will work only if the window \texttt{w} is inside another
+Lisp user window.
 
 
 \section{Miscellaneous Functions}
 
-{\tt \hspace*{0.5in} (stringify x)} makes its argument into a string.
+\texttt{\hspace*{0.5in} (stringify x)} makes its argument into a string.
 
-{\tt \hspace*{0.5in} (window-destroy-selected-window)} waits 3 seconds,
+\texttt{\hspace*{0.5in} (window-destroy-selected-window)} waits 3 seconds,
 then destroys the window containing the mouse cursor.  This function
 should be used with care; it can destroy a non-user window, causing
 processes associated with the window to be destroyed.  It is useful
@@ -746,7 +749,7 @@
 \section{Examples}
 
 Several interactive programs using this software for their graphical
-interface can be found at {\tt http://www.cs.utexas.edu/users/novak/}
+interface can be found at \texttt{http://www.cs.utexas.edu/users/novak/}
 under the heading Software Demos.
 
 
@@ -756,31 +759,31 @@
 a web page.  There are two approaches, either using an X server on
 the computer of the person viewing the web page, or using WeirdX, a
 Java program that emulates an X server.  Details can be found at:
-{\tt http://www.cs.utexas.edu/users/novak/dwindow.html} 
+\texttt{http://www.cs.utexas.edu/users/novak/dwindow.html} 
 
 
 \section{Files}
 
 \begin{tabular}{ll}
-{\tt dec.copyright}  & Copyright and license for DEC/MIT files \\
-{\tt draw.lsp}       & GLISP source code for interactive drawing utility \\
-{\tt drawtrans.lsp}  & {\tt draw.lsp} translated into plain Lisp \\
-{\tt draw-gates.lsp} & Code to draw {\tt nand} gates etc. \\
-{\tt dwdoc.tex}      & \LaTeX \ source for this document \\
-{\tt dwexports.lsp}  & exported symbols \\
-{\tt dwimportsb.lsp} & imported symbols \\
-{\tt dwindow.lsp}    & GLISP source code for {\tt dwindow} functions \\
-{\tt dwtest.lsp}     & Examples of use of {\tt dwindow} functions \\
-{\tt dwtrans.lsp}    & {\tt dwindow.lsp} translated into plain Lisp \\
-{\tt editors.lsp}    & Editors for colors etc. \\
-{\tt editorstrans.lsp}    & translation of {\tt editors.lsp} \\
-{\tt gnu.license}    & GNU General Public License \\
-{\tt ice-cream.lsp}  & Drawing of an ice cream cone made with {\tt draw} \\
-{\tt lispserver.lsp} & Example web demo: a Lisp server \\
-{\tt lispservertrans.lsp}    & translation of {\tt lispserver.lsp} \\
-{\tt menu-set.lsp}   & GLISP source code for menu-set functions \\
-{\tt menu-settrans.lsp}   & translation of {\tt menu-set.lsp} \\
-{\tt pcalc.lsp}      & Pocket calculator implemented as a {\tt picmenu} \\
+\texttt{dec.copyright}  & Copyright and license for DEC/MIT files \\
+\texttt{draw.lsp}       & GLISP source code for interactive drawing utility \\
+\texttt{drawtrans.lsp}  & \texttt{draw.lsp} translated into plain Lisp \\
+\texttt{draw-gates.lsp} & Code to draw \texttt{nand} gates etc. \\
+\texttt{dwdoc.tex}      & \LaTeX \ source for this document \\
+\texttt{dwexports.lsp}  & exported symbols \\
+\texttt{dwimportsb.lsp} & imported symbols \\
+\texttt{dwindow.lsp}    & GLISP source code for \texttt{dwindow} functions \\
+\texttt{dwtest.lsp}     & Examples of use of \texttt{dwindow} functions \\
+\texttt{dwtrans.lsp}    & \texttt{dwindow.lsp} translated into plain Lisp \\
+\texttt{editors.lsp}    & Editors for colors etc. \\
+\texttt{editorstrans.lsp}    & translation of \texttt{editors.lsp} \\
+\texttt{gnu.license}    & GNU General Public License \\
+\texttt{ice-cream.lsp}  & Drawing of an ice cream cone made with \texttt{draw} \\
+\texttt{lispserver.lsp} & Example web demo: a Lisp server \\
+\texttt{lispservertrans.lsp}    & translation of \texttt{lispserver.lsp} \\
+\texttt{menu-set.lsp}   & GLISP source code for menu-set functions \\
+\texttt{menu-settrans.lsp}   & translation of \texttt{menu-set.lsp} \\
+\texttt{pcalc.lsp}      & Pocket calculator implemented as a \texttt{picmenu} \\
 \end{tabular}
 
 

gcl-2.6.8-loginname.patch:

--- NEW FILE gcl-2.6.8-loginname.patch ---
diff -dur gcl-2.6.8.ORIG/o/unixfsys.c gcl-2.6.8/o/unixfsys.c
--- gcl-2.6.8.ORIG/o/unixfsys.c	2008-12-29 17:42:18.000000000 -0700
+++ gcl-2.6.8/o/unixfsys.c	2008-12-29 17:51:35.000000000 -0700
@@ -214,7 +214,7 @@
     
 #ifndef NO_PWD_H  
   if(namestring->st.st_self[0]=='~')
-    {char name[20];
+    {char name[LOGIN_NAME_MAX];
      int n;
      char *q = namestring->st.st_self;
 #ifndef __STDC__
@@ -224,8 +224,7 @@
 
      struct passwd *pwent;
      int m=0;
-     q=namestring->st.st_self;
-     for (n=0; n< namestring->st.st_fillp; n++)
+     for (n=1; n< namestring->st.st_fillp; n++)
        if (q[n]=='/') break;
      bcopy(q+1,name,n-1);
      name[n-1]= 0;

gcl-2.6.8-rename.patch:

--- NEW FILE gcl-2.6.8-rename.patch ---
diff -dur gcl-2.6.8.ORIG/o/unixfsys.c gcl-2.6.8/o/unixfsys.c
--- gcl-2.6.8.ORIG/o/unixfsys.c	2007-04-06 08:41:09.000000000 -0600
+++ gcl-2.6.8/o/unixfsys.c	2008-12-29 17:34:10.000000000 -0700
@@ -448,11 +448,17 @@
 backup_fopen(char *filename, char *option)
 {
 	char backupfilename[MAXPATHLEN];
+#ifndef HAVE_RENAME
 	char command[MAXPATHLEN * 2];
+#endif
 
 	strcat(strcpy(backupfilename, filename), ".BAK");
+#ifdef HAVE_RENAME
+	rename(filename, backupfilename);
+#else
 	sprintf(command, "mv %s %s", filename, backupfilename);
 	system(command);
+#endif
 	return(fopen(filename, option));
 }
 
@@ -477,6 +483,9 @@
 {
 	char filename[MAXPATHLEN];
 	char newfilename[MAXPATHLEN];
+#ifndef HAVE_RENAME
+	char command[MAXPATHLEN * 2];
+#endif
 
 	check_arg(2);
 	check_type_or_pathname_string_symbol_stream(&vs_base[0]);

gcl-2.6.8-selinux.patch:

--- NEW FILE gcl-2.6.8-selinux.patch ---
diff -durN gcl-2.6.8.ORIG/clcs/makefile gcl-2.6.8/clcs/makefile
--- gcl-2.6.8.ORIG/clcs/makefile	2005-05-06 15:56:55.000000000 -0600
+++ gcl-2.6.8/clcs/makefile	2009-01-09 17:43:02.000000000 -0700
@@ -9,6 +9,9 @@
 
 saved_clcs_gcl: ../unixport/saved_pcl_gcl
 	echo '(load "package.lisp")(load "myload.lisp")(si::save-system "$@")' | $< $(<D)/
+	if [ -x /usr/sbin/selinuxenabled ] && /usr/sbin/selinuxenabled; then \
+		chcon -t gcl_exec_t $@; \
+	fi
 
 %.h %.data %.c : %.lisp saved_clcs_gcl
 	cp ../h/cmpinclude.h .
@@ -31,6 +34,9 @@
 
 saved_full_gcl: ${LISP}
 	echo '(load "package.lisp")(load "loading.lisp")(jamie-load-clcs :compiled)(system::save-system "saved_full_gcl")' | ${LISP}
+	if [ -x /usr/sbin/selinuxenabled ] && /usr/sbin/selinuxenabled; then \
+		chcon -t gcl_exec_t $@; \
+	fi
 
 clean:
 	rm -f *.o *.fn saved_full_gcl$(EXE) saved_full_gcl cmpinclude.h *.c *.h *.data saved_clcs_gcl
diff -durN gcl-2.6.8.ORIG/makefile gcl-2.6.8/makefile
--- gcl-2.6.8.ORIG/makefile	2007-11-30 09:59:33.000000000 -0700
+++ gcl-2.6.8/makefile	2009-01-09 17:43:02.000000000 -0700
@@ -187,6 +187,9 @@
 	if gcc --version | grep -i mingw >/dev/null 2>&1 ; then if grep -i oncrpc makedefs >/dev/null 2>&1 ; then cp /mingw/bin/oncrpc.dll $(DESTDIR)$(INSTALL_LIB_DIR)/$(PORTDIR); fi ; fi
 	cd $(DESTDIR)$(INSTALL_LIB_DIR)/$(PORTDIR) && \
 		mv $(FLISP)$(EXE) temp$(EXE) && \
+		if [ -x /usr/sbin/selinuxenabled ] && /usr/sbin/selinuxenabled; then \
+			chcon -t gcl_exec_t temp$(EXE); \
+		fi && \
 		echo '(reset-sys-paths "$(INSTALL_LIB_DIR)/")(si::save-system "$(FLISP)$(EXE)")' | ./temp$(EXE) && \
 		rm -f temp$(EXE)
 	if [ -e "unixport/rsym$(EXE)" ] ; then cp unixport/rsym$(EXE) $(DESTDIR)$(INSTALL_LIB_DIR)/unixport/ ; fi
diff -durN gcl-2.6.8.ORIG/selinux/gcl.fc gcl-2.6.8/selinux/gcl.fc
--- gcl-2.6.8.ORIG/selinux/gcl.fc	1969-12-31 17:00:00.000000000 -0700
+++ gcl-2.6.8/selinux/gcl.fc	2009-01-09 17:43:02.000000000 -0700
@@ -0,0 +1,2 @@
+/usr/lib64/gcl-[^/]+/unixport/saved_.*	--	gen_context(system_u:object_r:gcl_exec_t,s0)
+/usr/lib/gcl-[^/]+/unixport/saved_.*	--	gen_context(system_u:object_r:gcl_exec_t,s0)
diff -durN gcl-2.6.8.ORIG/selinux/gcl.if gcl-2.6.8/selinux/gcl.if
--- gcl-2.6.8.ORIG/selinux/gcl.if	1969-12-31 17:00:00.000000000 -0700
+++ gcl-2.6.8/selinux/gcl.if	2009-01-09 17:43:02.000000000 -0700
@@ -0,0 +1,146 @@
+
+## <summary>policy for gcl</summary>
+
+########################################
+## <summary>
+##	Execute a domain transition to run gcl.
+## </summary>
+## <param name="domain">
+## <summary>
+##	Domain allowed to transition.
+## </summary>
+## </param>
+#
+interface(`gcl_domtrans',`
+	gen_require(`
+		type gcl_t;
+                type gcl_exec_t;
+	')
+
+	domtrans_pattern($1,gcl_exec_t,gcl_t)
+')
+
+
+########################################
+## <summary>
+##	Do not audit attempts to read, 
+##	gcl tmp files
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain to not audit.
+##	</summary>
+## </param>
+#
+interface(`gcl_dontaudit_read_tmp_files',`
+	gen_require(`
+		type gcl_tmp_t;
+	')
+
+	dontaudit $1 gcl_tmp_t:file read_file_perms;
+')
+
+########################################
+## <summary>
+##	Allow domain to read, gcl tmp files
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain to not audit.
+##	</summary>
+## </param>
+#
+interface(`gcl_read_tmp_files',`
+	gen_require(`
+		type gcl_tmp_t;
+	')
+
+	allow $1 gcl_tmp_t:file read_file_perms;
+')
+
+########################################
+## <summary>
+##	Allow domain to manage gcl tmp files
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain to not audit.
+##	</summary>
+## </param>
+#
+interface(`gcl_manage_tmp',`
+	gen_require(`
+		type gcl_tmp_t;
+	')
+
+         manage_dirs_pattern($1,gcl_tmp_t,gcl_tmp_t)
+         manage_files_pattern($1,gcl_tmp_t,gcl_tmp_t)
+         manage_lnk_files_pattern($1,gcl_tmp_t,gcl_tmp_t)
+')
+
+########################################
+## <summary>
+##	Execute gcl in the gcl domain, and
+##	allow the specified role the gcl domain.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain allowed access
+##	</summary>
+## </param>
+## <param name="role">
+##	<summary>
+##	The role to be allowed the gcl domain.
+##	</summary>
+## </param>
+## <param name="terminal">
+##	<summary>
+##	The type of the role's terminal.
+##	</summary>
+## </param>
+#
+interface(`gcl_run',`
+	gen_require(`
+		type gcl_t;
+	')
+
+	gcl_domtrans($1)
+	role $2 types gcl_t;
+	dontaudit gcl_t $3:chr_file rw_term_perms;
+')
+
+
+########################################
+## <summary>
+##	All of the rules required to administrate 
+##	an gcl environment
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain allowed access.
+##	</summary>
+## </param>
+## <param name="role">
+##	<summary>
+##	The role to be allowed to manage the gcl domain.
+##	</summary>
+## </param>
+## <param name="terminal">
+##	<summary>
+##	The type of the user terminal.
+##	</summary>
+## </param>
+## <rolecap/>
+#
+interface(`gcl_admin',`
+	gen_require(`
+		type gcl_t;
+	')
+
+	allow $1 gcl_t:process { ptrace signal_perms getattr };
+	read_files_pattern($1, gcl_t, gcl_t)
+	        
+
+	gcl_manage_tmp($1)
+
+')
diff -durN gcl-2.6.8.ORIG/selinux/gcl.te gcl-2.6.8/selinux/gcl.te
--- gcl-2.6.8.ORIG/selinux/gcl.te	1969-12-31 17:00:00.000000000 -0700
+++ gcl-2.6.8/selinux/gcl.te	2009-01-09 17:43:07.000000000 -0700
@@ -0,0 +1,50 @@
+policy_module(gcl,1.0.0)
+
+########################################
+#
+# Declarations
+#
+
+type gcl_t;
+type gcl_exec_t;
+application_domain(gcl_t, gcl_exec_t)
+role system_r types gcl_t;
+
+########################################
+#
+# gcl local policy
+#
+
+## internal communication is often done using fifo and unix sockets.
+allow gcl_t self:fifo_file rw_file_perms;
+allow gcl_t self:unix_stream_socket create_stream_socket_perms;
+
+libs_use_ld_so(gcl_t)
+libs_use_shared_libs(gcl_t)
+
+miscfiles_read_localization(gcl_t)
+
+## The GCL memory management and executable dumping routines manipulate memory
+## in various (usually forbidden) ways.
+allow gcl_t self:memprotect mmap_zero;
+allow gcl_t self:process { execmem execheap };
+
+unconfined_domain(gcl_t)
+
+optional_policy(`
+	gen_require(`
+		type unconfined_t;
+		type unconfined_devpts_t;
+		type unconfined_execmem_t;  # Remove this later; see below
+		type unconfined_tty_device_t;
+		role unconfined_r;
+	')
+
+	gcl_run(unconfined_t, unconfined_r, { unconfined_tty_device_t unconfined_devpts_t })
+	allow gcl_t gcl_exec_t:file execmod;
+
+	# Some versions of selinux-policy-targeted, released between November
+	# 2008 and early January 2009, give /usr/bin/gcl type execmem_exec_t.
+	# Remove this once those versions are dead and buried.
+	allow unconfined_execmem_t gcl_exec_t:file execmod;
+')
diff -durN gcl-2.6.8.ORIG/unixport/makefile gcl-2.6.8/unixport/makefile
--- gcl-2.6.8.ORIG/unixport/makefile	2006-08-23 12:14:22.000000000 -0600
+++ gcl-2.6.8/unixport/makefile	2009-01-09 17:43:02.000000000 -0700
@@ -118,6 +118,9 @@
 	cp init_$*.lsp foo
 	echo " (in-package \"USER\")(system:save-system \"$@\")" >>foo
 	$(PORTDIR)/raw_$*$(EXE) $(PORTDIR)/ -libdir $(GCLDIR)/ < foo
+	if [ -x /usr/sbin/selinuxenabled ] && /usr/sbin/selinuxenabled; then \
+		chcon -t gcl_exec_t $@; \
+	fi
 
 $(RSYM): $(SPECIAL_RSYM) $(HDIR)/mdefs.h
 	$(CC) $(CFLAGS) -I$(HDIR) -I$(ODIR) -o $(RSYM) $(SPECIAL_RSYM)
@@ -157,6 +160,9 @@
 	$(CC) -o raw_$*$(EXE) $(filter %.o,$^) \
 		-L. $(EXTRA_LD_LIBS) $(LD_LIBS_PRE) -l$* $(LD_LIBS_POST)
 endif
+	if [ -x /usr/sbin/selinuxenabled ] && /usr/sbin/selinuxenabled; then \
+		chcon -t gcl_exec_t raw_$*$(EXE); \
+	fi
 #	diff map_$* map_$*.old >/dev/null || (cp map_$* map_$*.old && rm -f $@ && $(MAKE) $@)
 #	cp map_$*.old map_$*
 

gcl-2.6.8-sigprocmask-linux.patch:

--- NEW FILE gcl-2.6.8-sigprocmask-linux.patch ---
diff -dur gcl-2.6.8.ORIG/h/linux.h gcl-2.6.8/h/linux.h
--- gcl-2.6.8.ORIG/h/linux.h	2008-08-01 10:51:43.000000000 -0600
+++ gcl-2.6.8/h/linux.h	2008-12-29 17:14:05.000000000 -0700
@@ -85,13 +85,7 @@
 #define SV_ONSTACK 0
 #endif
 
-/* unblock signals m and n, and set val to signal_mask(m) | signal_mask(n)
-   if they were set */
-#define SIG_UNBLOCK_SIGNALS(val,m,n) \
-    current_mask = sigblock(0);  \
-    sigsetmask(~(sigmask(m)) & ~(sigmask(n)) & current_mask); \
-    result = (current_mask & sigmask(m) ? signal_mask(m) : 0) \
-      | (current_mask & sigmask(n) ? signal_mask(n) : 0);
+#define HAVE_SIGPROCMASK
 
 #define RUN_PROCESS
 

gcl-2.6.8-texinfo.patch:

--- NEW FILE gcl-2.6.8-texinfo.patch ---
diff -dur gcl-2.6.8.ORIG/info/gcl-si.texi gcl-2.6.8/info/gcl-si.texi
--- gcl-2.6.8.ORIG/info/gcl-si.texi	2005-04-30 22:12:37.000000000 -0600
+++ gcl-2.6.8/info/gcl-si.texi	2008-12-29 21:09:53.000000000 -0700
@@ -10,6 +10,7 @@
 
 @c @smallbook
 @setfilename gcl-si.info
+ at settitle GCL SI Manual
 @synindex vr fn
 
 @c to update the menus do: 
diff -dur gcl-2.6.8.ORIG/info/gcl-tk.texi gcl-2.6.8/info/gcl-tk.texi
--- gcl-2.6.8.ORIG/info/gcl-tk.texi	2002-02-19 12:21:19.000000000 -0700
+++ gcl-2.6.8/info/gcl-tk.texi	2008-12-29 21:09:53.000000000 -0700
@@ -2,6 +2,7 @@
 @c -*-texinfo-*-
 @c @smallbook
 @setfilename gcl-tk.info
+ at settitle GCL TK Manual
 
 @c to update the menus do: 
 @c (texinfo-multiple-files-update "gcl-tk.texi" t t)

gcl-2.6.8-unrandomize.patch:

--- NEW FILE gcl-2.6.8-unrandomize.patch ---
diff -dur gcl-2.6.8.ORIG/configure gcl-2.6.8/configure
--- gcl-2.6.8.ORIG/configure	2008-12-29 16:24:30.000000000 -0700
+++ gcl-2.6.8/configure	2008-12-29 16:45:51.000000000 -0700
@@ -9880,9 +9880,11 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
+		    #define CAN_UNRANDOMIZE_SBRK 1
+		    #include "h/unrandomize.h"
 		    void gprof_cleanup() {}
 		    int main(int argc,char *argv[],char *envp[]) {
-	            #include "h/unrandomize.h"
+		    UNRANDOMIZE_SBRK;
 		    return 0;}
 _ACEOF
 rm -f conftest$ac_exeext
@@ -9947,12 +9949,11 @@
 /* end confdefs.h.  */
 
 		    #include <stdio.h>
+		    #include "h/unrandomize.h"
 	            void gprof_cleanup() {}
 		    int main(int argc,char * argv[],char * envp[]) {
 			FILE *f;
-			#ifdef CAN_UNRANDOMIZE_SBRK
-			#include "h/unrandomize.h"
-			#endif
+			UNRANDOMIZE_SBRK;
 			if (!(f=fopen("conftest1","w"))) return -1;
 			fprintf(f,"%u",sbrk(0));
 			return 0;}
@@ -10009,12 +10010,11 @@
 /* end confdefs.h.  */
 
 		    #include <stdio.h>
+		    #include "h/unrandomize.h"
                     void gprof_cleanup() {}
 		    int main(int argc,char * argv[],char * envp[]) {
 			FILE *f;
-			#ifdef CAN_UNRANDOMIZE_SBRK
-			#include "h/unrandomize.h"
-			#endif
+			UNRANDOMIZE_SBRK;
 			if (!(f=fopen("conftest1","w"))) return -1;
 			fprintf(f,"%u",sbrk(0));
 			return 0;}
@@ -10165,6 +10165,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
+#include "h/unrandomize.h"
 
 void gprof_cleanup() {}
 int
@@ -10173,9 +10174,7 @@
   char *b,*b1;
   FILE *fp;
 
-#ifdef CAN_UNRANDOMIZE_SBRK
-#include "h/unrandomize.h"
-#endif
+  UNRANDOMIZE_SBRK;
   b = (void *) malloc(1000);
   fp = fopen("conftest1","w");
 
diff -dur gcl-2.6.8.ORIG/configure.in gcl-2.6.8/configure.in
--- gcl-2.6.8.ORIG/configure.in	2008-12-29 16:24:30.000000000 -0700
+++ gcl-2.6.8/configure.in	2008-12-29 16:37:26.000000000 -0700
@@ -1087,9 +1087,11 @@
 
 	AC_MSG_CHECKING([for personality(ADDR_NO_RANDOMIZE) support])
 	AC_RUN_IFELSE([AC_LANG_SOURCE([[
+		    #define CAN_UNRANDOMIZE_SBRK 1
+		    #include "h/unrandomize.h"
 		    void gprof_cleanup() {}
 		    int main(int argc,char *argv[],char *envp[]) {
-	            #include "h/unrandomize.h"
+		    UNRANDOMIZE_SBRK;
 		    return 0;}]])],CAN_UNRANDOMIZE_SBRK=1,CAN_UNRANDOMIZE_SBRK=0,CAN_UNRANDOMIZE_SBRK=0)
 
 	if test "$CAN_UNRANDOMIZE_SBRK" != 0 ; then
@@ -1102,12 +1104,11 @@
 	AC_MSG_CHECKING([that sbrk is (now) non-random])
 	AC_RUN_IFELSE([AC_LANG_SOURCE([[
 		    #include <stdio.h>
+		    #include "h/unrandomize.h"
 	            void gprof_cleanup() {}
 		    int main(int argc,char * argv[],char * envp[]) {
 			FILE *f;
-			#ifdef CAN_UNRANDOMIZE_SBRK
-			#include "h/unrandomize.h"
-			#endif
+			UNRANDOMIZE_SBRK;
 			if (!(f=fopen("conftest1","w"))) return -1;
 			fprintf(f,"%u",sbrk(0));
 			return 0;}]])],SBRK=`cat conftest1`,SBRK=0,SBRK=0)
@@ -1116,12 +1117,11 @@
 	fi
 	AC_RUN_IFELSE([AC_LANG_SOURCE([[
 		    #include <stdio.h>
+		    #include "h/unrandomize.h"
                     void gprof_cleanup() {}
 		    int main(int argc,char * argv[],char * envp[]) {
 			FILE *f;
-			#ifdef CAN_UNRANDOMIZE_SBRK
-			#include "h/unrandomize.h"
-			#endif
+			UNRANDOMIZE_SBRK;
 			if (!(f=fopen("conftest1","w"))) return -1;
 			fprintf(f,"%u",sbrk(0));
 			return 0;}]])],SBRK1=`cat conftest1`,SBRK1=0,SBRK1=0)
@@ -1163,6 +1163,7 @@
 AC_RUN_IFELSE([AC_LANG_SOURCE([[
 #include <stdio.h>
 #include <stdlib.h>
+#include "h/unrandomize.h"
 
 void gprof_cleanup() {}
 int
@@ -1171,9 +1172,7 @@
   char *b,*b1;
   FILE *fp;
 
-#ifdef CAN_UNRANDOMIZE_SBRK
-#include "h/unrandomize.h"
-#endif
+  UNRANDOMIZE_SBRK;
   b = (void *) malloc(1000);
   fp = fopen("conftest1","w");
 
diff -dur gcl-2.6.8.ORIG/h/unrandomize.h gcl-2.6.8/h/unrandomize.h
--- gcl-2.6.8.ORIG/h/unrandomize.h	2008-08-20 19:13:58.000000000 -0600
+++ gcl-2.6.8/h/unrandomize.h	2008-12-29 16:42:15.000000000 -0700
@@ -1,25 +1,33 @@
+#include <stdlib.h>
 #include <sys/personality.h>
 #include <syscall.h>
 #include <unistd.h>
 #include <alloca.h>
 
-{
+#ifdef CAN_UNRANDOMIZE_SBRK
+# ifdef GCL_GPROF
+#  define GPROF_CLEANUP gprof_cleanup()
+# else
+#  define GPROF_CLEANUP
+# endif
 
-  long pers = personality(0xffffffffUL);
-  if (!(pers & ADDR_NO_RANDOMIZE) && !getenv("GCL_UNRANDOMIZE"))
-    if (personality(pers | ADDR_NO_RANDOMIZE) != -1 && personality(0xffffffffUL) & ADDR_NO_RANDOMIZE) {
-      int i;
-      char **n;
-      for (i=0;envp[i];i++);
-      n=alloca((i+2)*sizeof(*n));
-      n[i+1]=0;
-      n[i--]="GCL_UNRANDOMIZE=t";
-      for (;i>=0;i--)
-	n[i]=envp[i];
-#ifdef GCL_GPROF
-      gprof_cleanup();
+#define UNRANDOMIZE_SBRK do						\
+{									\
+  long pers = personality(0xffffffffUL);				\
+  if (!(pers & ADDR_NO_RANDOMIZE) && !getenv("GCL_UNRANDOMIZE"))	\
+    if (personality(pers | ADDR_NO_RANDOMIZE) != -1 && personality(0xffffffffUL) & ADDR_NO_RANDOMIZE) { \
+      int i;								\
+      char **n;								\
+      for (i=0;envp[i];i++);						\
+      n=alloca((i+2)*sizeof(*n));					\
+      n[i+1]=0;								\
+      n[i--]="GCL_UNRANDOMIZE=t";					\
+      for (;i>=0;i--)							\
+	n[i]=envp[i];							\
+      GPROF_CLEANUP;							\
+      execve(*argv,argv,n);						\
+    }									\
+ } while(0)
+#else
+# define UNRANDOMIZE_SBRK
 #endif
-      execve(*argv,argv,n);    
-    }
-
-}
diff -dur gcl-2.6.8.ORIG/o/main.c gcl-2.6.8/o/main.c
--- gcl-2.6.8.ORIG/o/main.c	2008-07-31 13:12:59.000000000 -0600
+++ gcl-2.6.8/o/main.c	2008-12-29 16:43:14.000000000 -0700
@@ -51,6 +51,7 @@
 #include <signal.h>
 #endif
 #include "page.h"
+#include "unrandomize.h"
 
 bool saving_system ;
 
@@ -125,9 +126,7 @@
 #endif
 #endif
 
-#ifdef CAN_UNRANDOMIZE_SBRK
-#include "unrandomize.h"
-#endif
+	UNRANDOMIZE_SBRK;
 
 #if defined(DARWIN)
 	{


--- NEW FILE gcl.el ---
(add-to-list 'load-path "%LISP_DIR%/gcl")
(autoload 'run "gcl" "Run GCL." t)
(autoload 'gcl-mode "gcl" "GCL mode." t)
(autoload 'dbl "dbl" "GCL debugger." t)


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gcl/F-10/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	7 Apr 2005 16:50:14 -0000	1.2
+++ .cvsignore	16 Jan 2009 22:22:38 -0000	1.3
@@ -1 +1 @@
-gcl-2.6.6.tar.gz
+gcl-2.6.8.tar.bz2


Index: gcl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gcl/F-10/gcl.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- gcl.spec	21 Jul 2008 15:15:49 -0000	1.27
+++ gcl.spec	16 Jan 2009 22:22:39 -0000	1.28
@@ -1,106 +1,324 @@
+# -fstack-protector leads to segfaults because GCL uses its own conflicting
+# stack protection scheme.
+%define __global_cflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2
+
+# Prerelease of 2.6.8
+%define alphatag 20080902cvs
+
+# If the emacs-el package has installed a pkgconfig file, use that to determine
+# install locations and Emacs version at build time, otherwise set defaults.
+%if %($(pkg-config emacs) ; echo $?)
+%define emacs_version 22.2
+%define emacs_lispdir %{_datadir}/emacs/site-lisp
+%else
+%define emacs_version %(pkg-config emacs --modversion)
+%define emacs_lispdir %(pkg-config emacs --variable sitepkglispdir)
+%endif
+
+# If the xemacs-devel package has installed a pkgconfig file, use that to
+# determine install locations and Emacs version at build time, otherwise set
+# defaults.
+%if %($(pkg-config xemacs) ; echo $?)
+%define xemacs_version 21.5
+%define xemacs_lispdir %{_datadir}/xemacs/site-packages/lisp
+%else
+%define xemacs_version %(pkg-config xemacs --modversion)
+%define xemacs_lispdir %(pkg-config xemacs --variable sitepkglispdir)
+%endif
+
 Name:           gcl
-Version:        2.6.7
-Release:        19%{?dist}
+Version:        2.6.8
+Release:        0.1.%{alphatag}%{?dist}
 Summary:        GNU Common Lisp
 
 Group:          Development/Languages
 License:        GPL+ and LGPLv2+
-URL:            http://www.gnu.org/software/gcl
-Source:         ftp://ftp.gnu.org/pub/gnu/gcl/gcl-2.6.7.tar.gz
-Patch0:		gcl-pers.patch
-Patch1:		gcl-bash.patch
+URL:            http://www.gnu.org/software/gcl/
+# The source for this package was pulled from upstream's CVS repository.  Use
+# the following commands to generate the tarball:
+#   cvs -d:pserver:anonymous at cvs.savannah.gnu.org:/sources/gcl export \
+#     -r Version_2_6_8pre -D 2008-09-02 -d gcl-2.6.8 gcl
+#   tar -cjvf gcl-2.6.8.tar.bz2 gcl-2.6.8
+Source0:        gcl-%{version}.tar.bz2
+Source1:        gcl.el
+# This patch was last sent upstream on 29 Dec 2008.  It makes GCL use the
+# sigprocmask API instead of the deprecated sigblock API.
+Patch0:         gcl-2.6.8-sigprocmask-linux.patch
+# This patch was last sent upstream on 29 Dec 2008.  It fixes a file descriptor
+# leak, as well as combining 4 system calls into only 2 on an exec().
+Patch1:         gcl-2.6.8-fd-leak.patch
+# This patch was last sent upstream on 29 Dec 2008.  It updates one source file
+# from LaTeX 2.09 to LaTeX 2e, thereby eliminating LaTeX warnings about running
+# in compatibility mode.
+Patch2:         gcl-2.6.8-latex.patch
+# This patch was last sent upstream on 29 Dec 2008.  It eliminates a few minor
+# texinfo warnings.
+Patch3:         gcl-2.6.8-texinfo.patch
+# This patch was last sent upstream on 29 Dec 2008.  It fixes a large number of
+# compile- and run-time problems with the Emacs interface code.
+Patch4:         gcl-2.6.8-elisp.patch
+# This patch was last sent upstream on 09 Jan 2009.  It adds support for
+# compiling and running on an SELinux-enabled host.
+Patch5:         gcl-2.6.8-selinux.patch
+# This patch was last sent upstream on 29 Dec 2008.  It uses the rename()
+# system call when it is available to avoid spawning a subshell and suffering a
+# context switch just to rename a file.
+Patch6:         gcl-2.6.8-rename.patch
+# This patch was last sent upstream on 29 Dec 2008.  It eliminates a
+# compilation problem due to the fact that, at high optimization levels,
+# getcwd() is an inline function.
+Patch7:         gcl-2.6.8-getcwd.patch
+# This patch was last sent upstream on 29 Dec 2008.  It fixes a potential
+# buffer overflow when accessing files whose names start with a tilde (i.e.,
+# user home directories).
+Patch8:         gcl-2.6.8-loginname.patch
+# This patch was last sent upstream on 29 Dec 2008.  It updates the autoconf
+# and libtool files to newer versions.  By itself, this patch accomplishes
+# little of interest.  However, some of the later patches change configure.in.
+# Without this patch, autoconf appears to run successfully, but generates a
+# configure script that contains invalid shell script syntax.
+Patch9:         gcl-2.6.8-infrastructure.patch
+# This patch was last sent upstream on 29 Dec 2008.  It simplifies the handling
+# of alloca() detection in the configure script.
+Patch10:        gcl-2.6.8-alloca.patch
+# This patch was last sent upstream on 29 Dec 2008.  It rationalizes the
+# handling of system extensions.  For example, on glibc-based systems, some
+# functionality is available only when _GNU_SOURCE is defined.
+Patch11:        gcl-2.6.8-extension.patch
+# This patch was last sent upstream on 29 Dec 2008.  It fixes a compilation
+# error on newer GCC systems due to an include inside a function.  This affects
+# the "unrandomize" sbrk() functionality, hence the name of the patch.
+Patch12:        gcl-2.6.8-unrandomize.patch
+# This patch was last sent upstream on 29 Dec 2008.  It fixes compilation with
+# a system BFD library that comes from a newer binutils distribution.  It also
+# updates o/unexelf.c from Emacs 22.2, the last version of Emacs released under
+# the GPL version 2.
+Patch13:        gcl-2.6.8-bfd.patch
+# This is a Fedora-specific patch.  Do not delete C files produced from D files
+# so they can be pulled into the debuginfo package.
+Patch14:        gcl-2.6.8-debuginfo.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires:  libSM-devel
+BuildRequires:  libXext-devel
+BuildRequires:  libXaw-devel
 BuildRequires:  readline-devel
-BuildRequires:  ncurses-devel
 BuildRequires:  binutils-devel
-BuildRequires:	tk-devel
-BuildRequires:	tcl-devel
+BuildRequires:  tk-devel
+BuildRequires:  tcl-devel
 BuildRequires:  gmp-devel
-BuildRequires:	tetex
+BuildRequires:  texlive, texlive-latex
 BuildRequires:  texinfo
+BuildRequires:  emacs, emacs-el
+BuildRequires:  xemacs, xemacs-devel, xemacs-packages-extra
+BuildRequires:  selinux-policy
 Requires(post): /sbin/install-info, policycoreutils
 Requires(postun): /sbin/install-info, policycoreutils
-ExcludeArch:	ppc ppc64 x86_64
 
 
 %description
-GCL is a Common Lisp currently compliant with the ANSI standard. Lisp
+GCL is a Common Lisp currently compliant with the ANSI standard.  Lisp
 compilation produces native code through the intermediary of the
 system's C compiler, from which GCL derives efficient performance and
 facile portability. Currently uses TCL/Tk as GUI.
 
 
+%package emacs
+Group:          Development/Languages
+Summary:        Emacs mode for interacting with GCL
+Requires:       %{name} = %{version}-%{release}, emacs(bin) >= %{emacs_version}
+
+%description emacs
+Emacs mode for interacting with GCL
+
+%package emacs-el
+Group:          Development/Languages
+Summary:        Source for Emacs mode for interacting with GCL
+Requires:       %{name}-emacs = %{version}-%{release}
+
+%description emacs-el
+Source Elisp code for Emacs mode for interacting with GCL
+
+
+%package xemacs
+Group:          Development/Languages
+Summary:        XEmacs mode for interacting with GCL
+Requires:       %{name} = %{version}-%{release}
+Requires:       xemacs(bin) >= %{xemacs_version}, xemacs-packages-extra
+
+%description xemacs
+XEmacs mode for interacting with GCL
+
+%package xemacs-el
+Group:          Development/Languages
+Summary:        Source for XEmacs mode for interacting with GCL
+Requires:       %{name}-xemacs = %{version}-%{release}
+
+%description xemacs-el
+Source Elisp code for XEmacs mode for interacting with GCL
+
+
 %prep
 %setup -q
 %patch0 -p1
 %patch1 -p1
-sed -i "s|-lreadline|-lreadline -lncurses|" configure
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
+%patch7 -p1
+%patch8 -p1
+%patch9 -p1
+%patch10 -p1
+%patch11 -p1
+%patch12 -p1
+%patch13 -p1
+%patch14 -p1
+
+# Don't let the configure script add compiler flags we don't want
+sed -i -e 's/-fomit-frame-pointer//' -e 's/-O3/-O2/g' configure
+
+# Fix a path in the launch script
+sed -i -e 's|/usr/lib/tk|%{_datadir}/tk|' debian/gcl.sh
+
+# The archive is so full of spurious executable bits that we just remove them
+# all here, then add back the ones that should exist
+find . -type f -perm /0111 | xargs chmod a-x
+chmod a+x add-defs add-defs1 config.guess config.sub configure install.sh
+chmod a+x ltconfig bin/info bin/info1 gcl-tk/gcltksrv.in gcl-tk/ngcltksrv
+chmod a+x mp/gcclab o/egrep-def utils/replace xbin/*
 
 
 %build
-%configure --enable-readline --enable-ansi --enable-tclconfig=%{_libdir} --enable-tkconfig=%{_libdir}
-perl -pi -e 's|/usr/lib/tk|%{_datadir}/tk|' debian/gcl.sh makedefc makedefs
-perl -pi -e 's|/usr/lib/tcl|%{_datadir}/tcl|' debian/gcl.sh makedefc makedefs
-# %{?_smp_mflags} breaks the build
+%configure --enable-readline --enable-ansi --enable-dynsysgmp --enable-xgcl \
+  --enable-tclconfig=%{_libdir} --enable-tkconfig=%{_libdir} \
+  --disable-statsysbfd --enable-dynsysbfd
+# FIXME: %%{?_smp_mflags} breaks the build
 make 
 
+# dwdoc needs one extra LaTeX run to resolve references
+cd xgcl-2
+pdflatex dwdoc.tex
+
+# Build the SELinux policy
+cd ../selinux
+make -f %{_datadir}/selinux/devel/Makefile
+
 
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
+
+# Get rid of the parts that we don't want
 rm -f $RPM_BUILD_ROOT%{_infodir}/dir
 rm -rf $RPM_BUILD_ROOT%{_datadir}/doc
 rm -rf $RPM_BUILD_ROOT%{_datadir}/emacs
 rm -rf $RPM_BUILD_ROOT%{_prefix}/lib/gcl-*/info
+
+# Install the man page
 mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
-cp -f man/man1/* $RPM_BUILD_ROOT%{_mandir}/man1
+cp -pf man/man1/* $RPM_BUILD_ROOT%{_mandir}/man1
+
+# Install the HTML documentation
 mkdir -p html
-cp -fr info/gcl-si info/gcl-tk html 
-chmod 644 ChangeLog* COPYING* 
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/gcl
-chmod 644 elisp/*
-cp -fr elisp/* $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/gcl
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/site-start.d
-cat > $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/site-start.d/gcl.el <<EOF
-(add-to-list 'load-path "%{_datadir}/emacs/site-lisp/gcl")
-(autoload 'run "gcl" "Run GCL." t)
-(autoload 'gcl-mode "gcl" "GCL mode." t)
-EOF
-find $RPM_BUILD_ROOT%{_prefix}/lib/gcl* -name '*.l*sp' | xargs chmod 0644
+cp -pfr info/gcl-si info/gcl-tk html
+
+# Install and compile the Emacs code
+mkdir -p $RPM_BUILD_ROOT%{emacs_lispdir}/gcl
+cp -pfr elisp/* $RPM_BUILD_ROOT%{emacs_lispdir}/gcl
+rm -f $RPM_BUILD_ROOT%{emacs_lispdir}/gcl/makefile
+rm -f $RPM_BUILD_ROOT%{emacs_lispdir}/gcl/readme
+mkdir -p $RPM_BUILD_ROOT%{emacs_lispdir}/site-start.d
+sed -e "s|%LISP_DIR%|%{emacs_lispdir}|" %{SOURCE1} > $RPM_BUILD_ROOT%{emacs_lispdir}/site-start.d/gcl.el
+pushd $RPM_BUILD_ROOT%{emacs_lispdir}/gcl
+emacs -batch -no-site-file --eval "(push \"`pwd`\" load-path)" \
+  -f batch-byte-compile *.el
+popd
+
+# Install and compile the XEmacs code
+mkdir -p $RPM_BUILD_ROOT%{xemacs_lispdir}/gcl
+cp -fr elisp/* $RPM_BUILD_ROOT%{xemacs_lispdir}/gcl
+rm -f $RPM_BUILD_ROOT%{xemacs_lispdir}/gcl/makefile
+rm -f $RPM_BUILD_ROOT%{xemacs_lispdir}/gcl/readme
+mkdir -p $RPM_BUILD_ROOT%{xemacs_lispdir}/site-start.d
+sed -e "s|%LISP_DIR%|%{xemacs_lispdir}|" %{SOURCE1} > $RPM_BUILD_ROOT%{xemacs_lispdir}/site-start.d/gcl.el
+pushd $RPM_BUILD_ROOT%{xemacs_lispdir}/gcl
+xemacs -batch -no-site-file -eval "(push \"`pwd`\" load-path)" \
+  -f batch-byte-compile *.el
+popd
+
+# Save the policy file away for later installation
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/selinux/packages/gcl
+cp -p selinux/gcl.pp $RPM_BUILD_ROOT%{_datadir}/selinux/packages/gcl
+
+# The image has garbage strings containing RPM_BUILD_ROOT
 export QA_SKIP_BUILD_ROOT=1
 
 
 %clean
 rm -rf $RPM_BUILD_ROOT
+rm -f /tmp/gazonk_* /tmp/gcl_*
 
 
 %post
+/sbin/install-info %{_infodir}/%{name}.info %{_infodir}/dir 2>/dev/null || :
 /sbin/install-info %{_infodir}/%{name}-si.info %{_infodir}/dir 2>/dev/null || :
 /sbin/install-info %{_infodir}/%{name}-tk.info %{_infodir}/dir 2>/dev/null || :
-/usr/sbin/semanage fcontext -a -t textrel_shlib_t "%{_prefix}/lib/gcl-%{version}/unixport/saved_ansi_gcl" 2>/dev/null || :
-/sbin/restorecon "%{_prefix}/lib/gcl-%{version}/unixport/saved_ansi_gcl" 2> /dev/null || :
+/usr/sbin/semodule -i %{_datadir}/selinux/packages/gcl/gcl.pp || :
+/sbin/fixfiles -R gcl restore || :
 
 
 %postun
 if [ $1 = 0 ]; then
+    /sbin/install-info --delete %{_infodir}/%{name}.info %{_infodir}/dir 2>/dev/null || :
     /sbin/install-info --delete %{_infodir}/%{name}-si.info %{_infodir}/dir 2>/dev/null || :
     /sbin/install-info --delete %{_infodir}/%{name}-tk.info %{_infodir}/dir 2>/dev/null || :
-    /usr/sbin/semanage fcontext -d -t textrel_shlib_t "%{_prefix}/lib/gcl-%{version}/unixport/saved_ansi_gcl" 2>/dev/null || :
+    /usr/sbin/semodule -r gcl || :
 fi
 
 
 %files
 %defattr(-,root,root,-)
-%{_bindir}/*
+%{_bindir}/gcl
 %{_prefix}/lib/gcl*
 %{_infodir}/*
 %{_mandir}/man*/*
-%{_datadir}/emacs/site-lisp/gcl
-%{_datadir}/emacs/site-lisp/site-start.d/*
-%doc COPYING* readme RELEASE* ChangeLog doc/*
+%{_datadir}/selinux/packages/gcl
+%doc COPYING* readme readme.xgcl RELEASE* ChangeLog* faq doc
+%doc gcl*.jpg gcl.ico gcl.png
 %doc --parent html
 
+%files emacs
+%defattr(-,root,root,-)
+%doc elisp/readme
+%dir %{emacs_lispdir}/gcl
+%{emacs_lispdir}/gcl/*.elc
+%{emacs_lispdir}/site-start.d/*
+
+%files emacs-el
+%defattr(-,root,root,-)
+%{emacs_lispdir}/gcl/*.el
+
+%files xemacs
+%defattr(-,root,root,-)
+%doc elisp/readme
+%dir %{xemacs_lispdir}/gcl
+%{xemacs_lispdir}/gcl/*.elc
+%{xemacs_lispdir}/site-start.d/*
+
+%files xemacs-el
+%defattr(-,root,root,-)
+%{xemacs_lispdir}/gcl/*.el
+
+
 %changelog
+* Fri Jan  9 2009 Jerry James <loganjerry at gmail.com> - 2.6.8-0.1.20080902cvs
+- Update from CVS to fix many build problems
+- Fix SELinux and BFD problems that blocked the build
+- Add patches to address various build and runtime problems
+- Drop old patches that are obsoleted by the update from CVS
+- Split out emacs and xemacs subpackages
+
 * Mon Jul 21 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 2.6.7-19
 - fix license tag
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gcl/F-10/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	9 Sep 2005 19:45:04 -0000	1.3
+++ sources	16 Jan 2009 22:22:39 -0000	1.4
@@ -1 +1 @@
-c0f42e1f391162e5ac90912a70e8ecc3  gcl-2.6.7.tar.gz
+6f0453b7f1fb102322cfa69bf2a7275a  gcl-2.6.8.tar.bz2


--- gcl-bash.patch DELETED ---


--- gcl-pers.patch DELETED ---



From jjames at fedoraproject.org  Fri Jan 16 22:25:17 2009
From: jjames at fedoraproject.org (Jerry James)
Date: Fri, 16 Jan 2009 22:25:17 +0000 (UTC)
Subject: rpms/gcl/F-9 gcl-2.6.8-alloca.patch, NONE, 1.1 gcl-2.6.8-bfd.patch, 
	NONE, 1.1 gcl-2.6.8-debuginfo.patch, NONE,
	1.1 gcl-2.6.8-elisp.patch, NONE, 1.1 gcl-2.6.8-extension.patch,
	NONE, 1.1 gcl-2.6.8-fd-leak.patch, NONE,
	1.1 gcl-2.6.8-getcwd.patch, NONE,
	1.1 gcl-2.6.8-infrastructure.patch, NONE,
	1.1 gcl-2.6.8-latex.patch, NONE, 1.1 gcl-2.6.8-loginname.patch,
	NONE, 1.1 gcl-2.6.8-rename.patch, NONE,
	1.1 gcl-2.6.8-selinux.patch, NONE,
	1.1 gcl-2.6.8-sigprocmask-linux.patch, NONE,
	1.1 gcl-2.6.8-texinfo.patch, NONE,
	1.1 gcl-2.6.8-unrandomize.patch, NONE, 1.1 gcl.el, NONE,
	1.1 .cvsignore, 1.2, 1.3 gcl.spec, 1.26, 1.27 sources, 1.3,
	1.4 gcl-bash.patch, 1.2, NONE gcl-pers.patch, 1.1, NONE
Message-ID: <20090116222517.D22E470127@cvs1.fedora.phx.redhat.com>

Author: jjames

Update of /cvs/pkgs/rpms/gcl/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14262

Modified Files:
	.cvsignore gcl.spec sources 
Added Files:
	gcl-2.6.8-alloca.patch gcl-2.6.8-bfd.patch 
	gcl-2.6.8-debuginfo.patch gcl-2.6.8-elisp.patch 
	gcl-2.6.8-extension.patch gcl-2.6.8-fd-leak.patch 
	gcl-2.6.8-getcwd.patch gcl-2.6.8-infrastructure.patch 
	gcl-2.6.8-latex.patch gcl-2.6.8-loginname.patch 
	gcl-2.6.8-rename.patch gcl-2.6.8-selinux.patch 
	gcl-2.6.8-sigprocmask-linux.patch gcl-2.6.8-texinfo.patch 
	gcl-2.6.8-unrandomize.patch gcl.el 
Removed Files:
	gcl-bash.patch gcl-pers.patch 
Log Message:
* Fri Jan  9 2009 Jerry James <loganjerry at gmail.com> - 2.6.8-0.1.20080902cvs
- Update from CVS to fix many build problems
- Fix SELinux and BFD problems that blocked the build
- Add patches to address various build and runtime problems
- Drop old patches that are obsoleted by the update from CVS
- Split out emacs and xemacs subpackages


gcl-2.6.8-alloca.patch:

--- NEW FILE gcl-2.6.8-alloca.patch ---
diff -dur gcl-2.6.8.ORIG/acconfig.h gcl-2.6.8/acconfig.h
--- gcl-2.6.8.ORIG/acconfig.h	2008-07-30 22:58:25.000000000 -0600
+++ gcl-2.6.8/acconfig.h	2008-12-29 16:06:08.000000000 -0700
@@ -53,11 +53,10 @@
 #undef HAVE_ALLOCA 
 #endif
 
-
 /* define if need alloca.h */
-#undef NEED_ALLOCA_H
+#undef HAVE_ALLOCA_H
 
-#ifdef NEED_ALLOCA_H
+#ifdef HAVE_ALLOCA_H
 #include <alloca.h>
 #endif
 
diff -dur gcl-2.6.8.ORIG/configure gcl-2.6.8/configure
--- gcl-2.6.8.ORIG/configure	2008-12-29 16:05:13.000000000 -0700
+++ gcl-2.6.8/configure	2008-12-29 16:06:55.000000000 -0700
@@ -645,6 +645,7 @@
 NIFLAGS
 FINAL_CFLAGS
 BROKEN_O4_OPT
+ALLOCA
 NOTIFY
 TCL_LIBS
 TCL_DL_LIBS
@@ -13784,10 +13785,12 @@
 
 # alloca
 
-{ $as_echo "$as_me:$LINENO: checking for alloca" >&5
-$as_echo_n "checking for alloca... " >&6; }
-if test "$cross_compiling" = yes; then
-  gcl_ok=no
+# The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
+# for constant arguments.  Useless!
+{ $as_echo "$as_me:$LINENO: checking for working alloca.h" >&5
+$as_echo_n "checking for working alloca.h... " >&6; }
+if test "${ac_cv_working_alloca_h+set}" = set; then
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -13795,16 +13798,17 @@
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-
+#include <alloca.h>
 int
 main ()
 {
-exit(alloca(500) != NULL ? 0 : 1);
+char *p = (char *) alloca (2 * sizeof (int));
+			  if (p) return 0;
   ;
   return 0;
 }
 _ACEOF
-rm -f conftest$ac_exeext
+rm -f conftest.$ac_objext conftest$ac_exeext
 if { (ac_try="$ac_link"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -13812,44 +13816,141 @@
 esac
 eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 $as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>&5
+  (eval "$ac_link") 2>conftest.er1
   ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
+  ac_cv_working_alloca_h=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_working_alloca_h=no
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_working_alloca_h" >&5
+$as_echo "$ac_cv_working_alloca_h" >&6; }
+if test $ac_cv_working_alloca_h = yes; then
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_ALLOCA_H 1
+_ACEOF
+
+fi
+
+{ $as_echo "$as_me:$LINENO: checking for alloca" >&5
+$as_echo_n "checking for alloca... " >&6; }
+if test "${ac_cv_func_alloca_works+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#ifdef __GNUC__
+# define alloca __builtin_alloca
+#else
+# ifdef _MSC_VER
+#  include <malloc.h>
+#  define alloca _alloca
+# else
+#  ifdef HAVE_ALLOCA_H
+#   include <alloca.h>
+#  else
+#   ifdef _AIX
+ #pragma alloca
+#   else
+#    ifndef alloca /* predefined by HP cc +Olibcalls */
+char *alloca ();
+#    endif
+#   endif
+#  endif
+# endif
+#endif
+
+int
+main ()
+{
+char *p = (char *) alloca (1);
+				    if (p) return 0;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 $as_echo "$ac_try_echo") >&5
-  (eval "$ac_try") 2>&5
+  (eval "$ac_link") 2>conftest.er1
   ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  :
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
+  ac_cv_func_alloca_works=yes
 else
-  $as_echo "$as_me: program exited with status $ac_status" >&5
-$as_echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-( exit $ac_status )
-gcl_ok=yes
+	ac_cv_func_alloca_works=no
 fi
+
 rm -rf conftest.dSYM
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
 fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_alloca_works" >&5
+$as_echo "$ac_cv_func_alloca_works" >&6; }
 
+if test $ac_cv_func_alloca_works = yes; then
 
-if test $gcl_ok = yes ; then
-    { $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
-    cat >>confdefs.h <<\_ACEOF
+cat >>confdefs.h <<\_ACEOF
 #define HAVE_ALLOCA 1
 _ACEOF
 
 else
-  if test "$cross_compiling" = yes; then
-  gcl_ok=no
+  # The SVR3 libPW and SVR4 libucb both contain incompatible functions
+# that cause trouble.  Some versions do not even contain alloca or
+# contain a buggy version.  If you still want to use their alloca,
+# use ar to extract alloca.o from them instead of compiling alloca.c.
+
+ALLOCA=\${LIBOBJDIR}alloca.$ac_objext
+
+cat >>confdefs.h <<\_ACEOF
+#define C_ALLOCA 1
+_ACEOF
+
+
+{ $as_echo "$as_me:$LINENO: checking whether \`alloca.c' needs Cray hooks" >&5
+$as_echo_n "checking whether \`alloca.c' needs Cray hooks... " >&6; }
+if test "${ac_cv_os_cray+set}" = set; then
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -13857,17 +13958,163 @@
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
+#if defined CRAY && ! defined CRAY2
+webecray
+#else
+wenotbecray
+#endif
 
-  #include <alloca.h>
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "webecray" >/dev/null 2>&1; then
+  ac_cv_os_cray=yes
+else
+  ac_cv_os_cray=no
+fi
+rm -f conftest*
+
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_os_cray" >&5
+$as_echo "$ac_cv_os_cray" >&6; }
+if test $ac_cv_os_cray = yes; then
+  for ac_func in _getb67 GETB67 getb67; do
+    as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+$as_echo_n "checking for $ac_func... " >&6; }
+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+#define $ac_func innocuous_$ac_func
+
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char $ac_func (); below.
+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+    <limits.h> exists even on freestanding compilers.  */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+
+#undef $ac_func
+
+/* 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 $ac_func ();
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined __stub_$ac_func || defined __stub___$ac_func
+choke me
+#endif
 
 int
 main ()
 {
-exit(alloca(500) != NULL ? 0 : 1);
+return $ac_func ();
   ;
   return 0;
 }
 _ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
+  eval "$as_ac_var=yes"
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	eval "$as_ac_var=no"
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+fi
+ac_res=`eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+as_val=`eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
+
+cat >>confdefs.h <<_ACEOF
+#define CRAY_STACKSEG_END $ac_func
+_ACEOF
+
+    break
+fi
+
+  done
+fi
+
+{ $as_echo "$as_me:$LINENO: checking stack direction for C alloca" >&5
+$as_echo_n "checking stack direction for C alloca... " >&6; }
+if test "${ac_cv_c_stack_direction+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  if test "$cross_compiling" = yes; then
+  ac_cv_c_stack_direction=0
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+int
+find_stack_direction ()
+{
+  static char *addr = 0;
+  auto char dummy;
+  if (addr == 0)
+    {
+      addr = &dummy;
+      return find_stack_direction ();
+    }
+  else
+    return (&dummy > addr) ? 1 : -1;
+}
+
+int
+main ()
+{
+  return find_stack_direction () < 0;
+}
+_ACEOF
 rm -f conftest$ac_exeext
 if { (ac_try="$ac_link"
 case "(($ac_try" in
@@ -13890,43 +14137,30 @@
   ac_status=$?
   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  :
+  ac_cv_c_stack_direction=1
 else
   $as_echo "$as_me: program exited with status $ac_status" >&5
 $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 ( exit $ac_status )
-gcl_ok=yes
+ac_cv_c_stack_direction=-1
 fi
 rm -rf conftest.dSYM
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
 
- if test $gcl_ok = yes ; then
-    { $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
-    cat >>confdefs.h <<\_ACEOF
-#define HAVE_ALLOCA 1
-_ACEOF
-
-    cat >>confdefs.h <<\_ACEOF
-#define NEED_ALLOCA_H 1
-_ACEOF
-
- fi
 fi
-if test $gcl_ok = no ; then     { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; } ; fi
-
-
-
-
-
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_stack_direction" >&5
+$as_echo "$ac_cv_c_stack_direction" >&6; }
 
+cat >>confdefs.h <<_ACEOF
+#define STACK_DIRECTION $ac_cv_c_stack_direction
+_ACEOF
 
 
+fi
 
 
 # dlopen etc
diff -dur gcl-2.6.8.ORIG/configure.in gcl-2.6.8/configure.in
--- gcl-2.6.8.ORIG/configure.in	2008-12-29 16:05:13.000000000 -0700
+++ gcl-2.6.8/configure.in	2008-12-29 16:06:43.000000000 -0700
@@ -1852,33 +1852,7 @@
 
 # alloca
 
-AC_MSG_CHECKING([for alloca])
-AC_RUN_IFELSE([AC_LANG_PROGRAM([],[[exit(alloca(500) != NULL ? 0 : 1);]])],
-  ,gcl_ok=yes, gcl_ok=no,gcl_ok=no)
-if test $gcl_ok = yes ; then
-    AC_MSG_RESULT(yes)
-    AC_DEFINE(HAVE_ALLOCA)
-else
-  AC_RUN_IFELSE([AC_LANG_PROGRAM([[
-  #include <alloca.h>
-  ]],[[exit(alloca(500) != NULL ? 0 : 1);]])],
-  ,gcl_ok=yes, gcl_ok=no,gcl_ok=no)
- if test $gcl_ok = yes ; then
-    AC_MSG_RESULT(yes)
-    AC_DEFINE(HAVE_ALLOCA)
-    AC_DEFINE(NEED_ALLOCA_H)
- fi
-fi
-if test $gcl_ok = no ; then     AC_MSG_RESULT(no) ; fi
-
-
-
-
-
-
-
-
-
+AC_FUNC_ALLOCA
 
 # dlopen etc
 # idea make it so you do something dlopen(libX.so,RTLD_GLOBAL)
diff -dur gcl-2.6.8.ORIG/h/gclincl.h.in gcl-2.6.8/h/gclincl.h.in
--- gcl-2.6.8.ORIG/h/gclincl.h.in	2008-12-29 16:05:13.000000000 -0700
+++ gcl-2.6.8/h/gclincl.h.in	2008-12-29 16:06:55.000000000 -0700
@@ -54,11 +54,10 @@
 #undef HAVE_ALLOCA 
 #endif
 
-
 /* define if need alloca.h */
-#undef NEED_ALLOCA_H
+#undef HAVE_ALLOCA_H
 
-#ifdef NEED_ALLOCA_H
+#ifdef HAVE_ALLOCA_H
 #include <alloca.h>
 #endif
 
@@ -259,6 +258,21 @@
 #undef HAVE_MALLOC_MALLOC_H
 #undef HAVE_OBJC_MALLOC_H
 
+/* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP
+   systems. This function is required for `alloca.c' support on those systems.
+   */
+#undef CRAY_STACKSEG_END
+
+/* Define to 1 if using `alloca.c'. */
+#undef C_ALLOCA
+
+/* Define to 1 if you have `alloca', as a function or macro. */
+#undef HAVE_ALLOCA
+
+/* Define to 1 if you have <alloca.h> and it should be used (not on Ultrix).
+   */
+#undef HAVE_ALLOCA_H
+
 /* Define to 1 if you have the <asm/sigcontext.h> header file. */
 #undef HAVE_ASM_SIGCONTEXT_H
 
@@ -343,6 +357,14 @@
 /* The size of `long', as computed by sizeof. */
 #undef SIZEOF_LONG
 
+/* If using the C implementation of alloca, define if you know the
+   direction of stack growth for your system; otherwise it will be
+   automatically deduced at runtime.
+	STACK_DIRECTION > 0 => grows toward higher addresses
+	STACK_DIRECTION < 0 => grows toward lower addresses
+	STACK_DIRECTION = 0 => direction of growth unknown */
+#undef STACK_DIRECTION
+
 /* Define to 1 if you have the ANSI C header files. */
 #undef STDC_HEADERS
 

gcl-2.6.8-bfd.patch:

--- NEW FILE gcl-2.6.8-bfd.patch ---
diff -dur gcl-2.6.8.ORIG/acconfig.h gcl-2.6.8/acconfig.h
--- gcl-2.6.8.ORIG/acconfig.h	2008-12-29 16:24:30.000000000 -0700
+++ gcl-2.6.8/acconfig.h	2008-12-29 17:58:20.000000000 -0700
@@ -142,6 +142,7 @@
 /* bfd support */
 #undef HAVE_LIBBFD
 #undef NEED_CONST
+#undef HAVE_OUTPUT_BFD
 #define HAVE_BFD_BOOLEAN
 
 #ifdef HAVE_BFD_BOOLEAN
diff -dur gcl-2.6.8.ORIG/configure gcl-2.6.8/configure
--- gcl-2.6.8.ORIG/configure	2008-12-29 16:48:36.000000000 -0700
+++ gcl-2.6.8/configure	2008-12-29 17:58:49.000000000 -0700
@@ -683,6 +683,7 @@
 LIBIBERTY
 LIBBFD
 BUILD_BFD
+HAVE_OUTPUT_BFD
 X_EXTRA_LIBS
 X_LIBS
 X_PRE_LIBS
@@ -9023,6 +9024,120 @@
 
 
 
+#
+# Newer BFD libraries need a dummy output bfd
+#
+	{ $as_echo "$as_me:$LINENO: checking for struct bfd_link_info.output_bfd" >&5
+$as_echo_n "checking for struct bfd_link_info.output_bfd... " >&6; }
+if test "${ac_cv_member_struct_bfd_link_info_output_bfd+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+#include <bfd.h>
+#include <bfdlink.h>
+
+
+int
+main ()
+{
+static struct bfd_link_info ac_aggr;
+if (ac_aggr.output_bfd)
+return 0;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_cv_member_struct_bfd_link_info_output_bfd=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+#include <bfd.h>
+#include <bfdlink.h>
+
+
+int
+main ()
+{
+static struct bfd_link_info ac_aggr;
+if (sizeof ac_aggr.output_bfd)
+return 0;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_cv_member_struct_bfd_link_info_output_bfd=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_member_struct_bfd_link_info_output_bfd=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_member_struct_bfd_link_info_output_bfd" >&5
+$as_echo "$ac_cv_member_struct_bfd_link_info_output_bfd" >&6; }
+if test "x$ac_cv_member_struct_bfd_link_info_output_bfd" = x""yes; then
+  cat >>confdefs.h <<\_ACEOF
+#define HAVE_OUTPUT_BFD 1
+_ACEOF
+
+fi
+
+
 
 #
 # FIXME: Need to workaround mingw before this point -- CM
diff -dur gcl-2.6.8.ORIG/configure.in gcl-2.6.8/configure.in
--- gcl-2.6.8.ORIG/configure.in	2008-12-29 16:48:36.000000000 -0700
+++ gcl-2.6.8/configure.in	2008-12-29 17:58:20.000000000 -0700
@@ -893,6 +893,15 @@
 		AC_MSG_RESULT(no),
 		AC_MSG_RESULT(no))
 
+#
+# Newer BFD libraries need a dummy output bfd
+#
+	AC_CHECK_MEMBER([struct bfd_link_info.output_bfd],
+		[AC_DEFINE(HAVE_OUTPUT_BFD)], [], [
+#include <bfd.h>
+#include <bfdlink.h>
+		])
+	AC_SUBST(HAVE_OUTPUT_BFD)
 
 #
 # FIXME: Need to workaround mingw before this point -- CM
diff -dur gcl-2.6.8.ORIG/h/gclincl.h.in gcl-2.6.8/h/gclincl.h.in
--- gcl-2.6.8.ORIG/h/gclincl.h.in	2008-12-29 16:24:30.000000000 -0700
+++ gcl-2.6.8/h/gclincl.h.in	2008-12-29 17:58:50.000000000 -0700
@@ -143,6 +143,7 @@
 /* bfd support */
 #undef HAVE_LIBBFD
 #undef NEED_CONST
+#undef HAVE_OUTPUT_BFD
 #define HAVE_BFD_BOOLEAN
 
 #ifdef HAVE_BFD_BOOLEAN
diff -dur gcl-2.6.8.ORIG/o/sfasli.c gcl-2.6.8/o/sfasli.c
--- gcl-2.6.8.ORIG/o/sfasli.c	2005-01-15 09:26:43.000000000 -0700
+++ gcl-2.6.8/o/sfasli.c	2008-12-29 17:58:20.000000000 -0700
@@ -32,6 +32,9 @@
   int u,v;
   unsigned long pa;
   asymbol **q;
+#ifdef HAVE_OUTPUT_BFD
+  const char **bfd_targets;
+#endif
 
   bfd_init();
   if (!(bself=bfd_openr(kcl_self,0)))
@@ -40,6 +43,11 @@
     FEerror("I'm not an object",0);
 /*    if (link_info.hash) */
 /*      bfd_link_hash_table_free(bself,link_info.hash); */
+#ifdef HAVE_OUTPUT_BFD
+  bfd_targets = bfd_target_list();
+  link_info.output_bfd = bfd_openw("/dev/null", bfd_targets[0]);
+  free(bfd_targets);
+#endif
   if (!(link_info.hash = bfd_link_hash_table_create (bself)))
     FEerror("Cannot make hash table",0);
   if (!bfd_link_add_symbols(bself,&link_info))
diff -dur gcl-2.6.8.ORIG/o/unexelf.c gcl-2.6.8/o/unexelf.c
--- gcl-2.6.8.ORIG/o/unexelf.c	2004-05-03 15:35:58.000000000 -0600
+++ gcl-2.6.8/o/unexelf.c	2008-12-29 17:58:20.000000000 -0700
@@ -1,5 +1,13 @@
-/* Foundation; either version 2, or (at your option)
-any later version.
+/* Copyright (C) 1985, 1986, 1987, 1988, 1990, 1992, 1999, 2000, 2001,
+                 2002, 2003, 2004, 2005, 2006, 2007, 2008
+                 Free Software Foundation, Inc.
+
+This file is part of GNU Emacs.
+
+GNU Emacs 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.
 
 GNU Emacs is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -7,10 +15,9 @@
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.
+along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
+/*
 In other words, you are welcome to use, share and improve this program.
 You are forbidden to forbid anyone else to use, share and improve
 what you give them.   Help stamp out software-hoarding!  */
@@ -82,224 +89,224 @@
 temacs:
 
            **** SECTION HEADER TABLE ****
-[No]    Type    Flags   Addr         Offset       Size          Name
-        Link    Info    Adralgn      Entsize
+ [No]    Type    Flags   Addr         Offset       Size          Name
+         Link    Info    Adralgn      Entsize
 
-[1]     1       2       0x80480d4    0xd4         0x13          .interp
-        0       0       0x1          0
+ [1]     1       2       0x80480d4    0xd4         0x13          .interp
+         0       0       0x1          0
 
-[2]     5       2       0x80480e8    0xe8         0x388         .hash
-        3       0       0x4          0x4
+ [2]     5       2       0x80480e8    0xe8         0x388         .hash
+         3       0       0x4          0x4
 
-[3]     11      2       0x8048470    0x470        0x7f0         .dynsym
-        4       1       0x4          0x10
+ [3]     11      2       0x8048470    0x470        0x7f0         .dynsym
+         4       1       0x4          0x10
 
-[4]     3       2       0x8048c60    0xc60        0x3ad         .dynstr
-        0       0       0x1          0
+ [4]     3       2       0x8048c60    0xc60        0x3ad         .dynstr
+         0       0       0x1          0
 
-[5]     9       2       0x8049010    0x1010       0x338         .rel.plt
-        3       7       0x4          0x8
+ [5]     9       2       0x8049010    0x1010       0x338         .rel.plt
+         3       7       0x4          0x8
 
-[6]     1       6       0x8049348    0x1348       0x3           .init
-        0       0       0x4          0
+ [6]     1       6       0x8049348    0x1348       0x3           .init
+         0       0       0x4          0
 
-[7]     1       6       0x804934c    0x134c       0x680         .plt
-        0       0       0x4          0x4
+ [7]     1       6       0x804934c    0x134c       0x680         .plt
+         0       0       0x4          0x4
 
-[8]     1       6       0x80499cc    0x19cc       0x3c56f       .text
-        0       0       0x4          0
+ [8]     1       6       0x80499cc    0x19cc       0x3c56f       .text
+         0       0       0x4          0
 
-[9]     1       6       0x8085f3c    0x3df3c      0x3           .fini
-        0       0       0x4          0
+ [9]     1       6       0x8085f3c    0x3df3c      0x3           .fini
+         0       0       0x4          0
 
-[10]    1       2       0x8085f40    0x3df40      0x69c         .rodata
-        0       0       0x4          0
+ [10]    1       2       0x8085f40    0x3df40      0x69c         .rodata
+         0       0       0x4          0
 
-[11]    1       2       0x80865dc    0x3e5dc      0xd51         .rodata1
-        0       0       0x4          0
+ [11]    1       2       0x80865dc    0x3e5dc      0xd51         .rodata1
+         0       0       0x4          0
 
-[12]    1       3       0x8088330    0x3f330      0x20afc       .data
-        0       0       0x4          0
+ [12]    1       3       0x8088330    0x3f330      0x20afc       .data
+         0       0       0x4          0
 
-[13]    1       3       0x80a8e2c    0x5fe2c      0x89d         .data1
-        0       0       0x4          0
+ [13]    1       3       0x80a8e2c    0x5fe2c      0x89d         .data1
+         0       0       0x4          0
 
-[14]    1       3       0x80a96cc    0x606cc      0x1a8         .got
-        0       0       0x4          0x4
+ [14]    1       3       0x80a96cc    0x606cc      0x1a8         .got
+         0       0       0x4          0x4
 
-[15]    6       3       0x80a9874    0x60874      0x80          .dynamic
-        4       0       0x4          0x8
+ [15]    6       3       0x80a9874    0x60874      0x80          .dynamic
+         4       0       0x4          0x8
 
-[16]    8       3       0x80a98f4    0x608f4      0x449c        .bss
-        0       0       0x4          0
+ [16]    8       3       0x80a98f4    0x608f4      0x449c        .bss
+         0       0       0x4          0
 
-[17]    2       0       0            0x608f4      0x9b90        .symtab
-        18      371     0x4          0x10
+ [17]    2       0       0            0x608f4      0x9b90        .symtab
+         18      371     0x4          0x10
 
-[18]    3       0       0            0x6a484      0x8526        .strtab
-        0       0       0x1          0
+ [18]    3       0       0            0x6a484      0x8526        .strtab
+         0       0       0x1          0
 
-[19]    3       0       0            0x729aa      0x93          .shstrtab
-        0       0       0x1          0
+ [19]    3       0       0            0x729aa      0x93          .shstrtab
+         0       0       0x1          0
 
-[20]    1       0       0            0x72a3d      0x68b7        .comment
-        0       0       0x1          0
+ [20]    1       0       0            0x72a3d      0x68b7        .comment
+         0       0       0x1          0
 
-raid:/nfs/raid/src/dist-18.56/src> dump -h xemacs
+ raid:/nfs/raid/src/dist-18.56/src> dump -h xemacs
 
-xemacs:
+ xemacs:
 
-           **** SECTION HEADER TABLE ****
-[No]    Type    Flags   Addr         Offset       Size          Name
-        Link    Info    Adralgn      Entsize
+            **** SECTION HEADER TABLE ****
+ [No]    Type    Flags   Addr         Offset       Size          Name
+         Link    Info    Adralgn      Entsize
 
-[1]     1       2       0x80480d4    0xd4         0x13          .interp
-        0       0       0x1          0
+ [1]     1       2       0x80480d4    0xd4         0x13          .interp
+         0       0       0x1          0
 
-[2]     5       2       0x80480e8    0xe8         0x388         .hash
-        3       0       0x4          0x4
+ [2]     5       2       0x80480e8    0xe8         0x388         .hash
+         3       0       0x4          0x4
 
-[3]     11      2       0x8048470    0x470        0x7f0         .dynsym
-        4       1       0x4          0x10
+ [3]     11      2       0x8048470    0x470        0x7f0         .dynsym
+         4       1       0x4          0x10
 
-[4]     3       2       0x8048c60    0xc60        0x3ad         .dynstr
-        0       0       0x1          0
+ [4]     3       2       0x8048c60    0xc60        0x3ad         .dynstr
+         0       0       0x1          0
 
-[5]     9       2       0x8049010    0x1010       0x338         .rel.plt
-        3       7       0x4          0x8
+ [5]     9       2       0x8049010    0x1010       0x338         .rel.plt
+         3       7       0x4          0x8
 
-[6]     1       6       0x8049348    0x1348       0x3           .init
-        0       0       0x4          0
+ [6]     1       6       0x8049348    0x1348       0x3           .init
+         0       0       0x4          0
 
-[7]     1       6       0x804934c    0x134c       0x680         .plt
-        0       0       0x4          0x4
+ [7]     1       6       0x804934c    0x134c       0x680         .plt
+         0       0       0x4          0x4
 
-[8]     1       6       0x80499cc    0x19cc       0x3c56f       .text
-        0       0       0x4          0
+ [8]     1       6       0x80499cc    0x19cc       0x3c56f       .text
+         0       0       0x4          0
 
-[9]     1       6       0x8085f3c    0x3df3c      0x3           .fini
-        0       0       0x4          0
+ [9]     1       6       0x8085f3c    0x3df3c      0x3           .fini
+         0       0       0x4          0
 
-[10]    1       2       0x8085f40    0x3df40      0x69c         .rodata
-        0       0       0x4          0
+ [10]    1       2       0x8085f40    0x3df40      0x69c         .rodata
+         0       0       0x4          0
 
-[11]    1       2       0x80865dc    0x3e5dc      0xd51         .rodata1
-        0       0       0x4          0
+ [11]    1       2       0x80865dc    0x3e5dc      0xd51         .rodata1
+         0       0       0x4          0
 
-[12]    1       3       0x8088330    0x3f330      0x20afc       .data
-        0       0       0x4          0
+ [12]    1       3       0x8088330    0x3f330      0x20afc       .data
+         0       0       0x4          0
 
-[13]    1       3       0x80a8e2c    0x5fe2c      0x89d         .data1
-        0       0       0x4          0
+ [13]    1       3       0x80a8e2c    0x5fe2c      0x89d         .data1
+         0       0       0x4          0
 
-[14]    1       3       0x80a96cc    0x606cc      0x1a8         .got
-        0       0       0x4          0x4
+ [14]    1       3       0x80a96cc    0x606cc      0x1a8         .got
+         0       0       0x4          0x4
 
-[15]    6       3       0x80a9874    0x60874      0x80          .dynamic
-        4       0       0x4          0x8
+ [15]    6       3       0x80a9874    0x60874      0x80          .dynamic
+         4       0       0x4          0x8
 
-[16]    8       3       0x80c6800    0x7d800      0             .bss
-        0       0       0x4          0
+ [16]    8       3       0x80c6800    0x7d800      0             .bss
+         0       0       0x4          0
 
-[17]    2       0       0            0x7d800      0x9b90        .symtab
-        18      371     0x4          0x10
+ [17]    2       0       0            0x7d800      0x9b90        .symtab
+         18      371     0x4          0x10
 
-[18]    3       0       0            0x87390      0x8526        .strtab
-        0       0       0x1          0
+ [18]    3       0       0            0x87390      0x8526        .strtab
+         0       0       0x1          0
 
-[19]    3       0       0            0x8f8b6      0x93          .shstrtab
-        0       0       0x1          0
+ [19]    3       0       0            0x8f8b6      0x93          .shstrtab
+         0       0       0x1          0
 
-[20]    1       0       0            0x8f949      0x68b7        .comment
-        0       0       0x1          0
+ [20]    1       0       0            0x8f949      0x68b7        .comment
+         0       0       0x1          0
 
-[21]    1       3       0x80a98f4    0x608f4      0x1cf0c       .data
-        0       0       0x4          0
+ [21]    1       3       0x80a98f4    0x608f4      0x1cf0c       .data
+         0       0       0x4          0
 
- * This is an example of how the file header is changed.  "Shoff" is
- * the section header offset within the file.  Since that table is
- * after the new .data section, it is moved.  "Shnum" is the number of
- * sections, which we increment.
- *
- * "Phoff" is the file offset to the program header.  "Phentsize" and
- * "Shentsz" are the program and section header entries sizes respectively.
- * These can be larger than the apparent struct sizes.
+  * This is an example of how the file header is changed.  "Shoff" is
+  * the section header offset within the file.  Since that table is
+  * after the new .data section, it is moved.  "Shnum" is the number of
+  * sections, which we increment.
+  *
+  * "Phoff" is the file offset to the program header.  "Phentsize" and
+  * "Shentsz" are the program and section header entries sizes respectively.
+  * These can be larger than the apparent struct sizes.
 
-raid:/nfs/raid/src/dist-18.56/src> dump -f temacs
+ raid:/nfs/raid/src/dist-18.56/src> dump -f temacs
 
-temacs:
+ temacs:
 
-                    **** ELF HEADER ****
-Class        Data       Type         Machine     Version
-Entry        Phoff      Shoff        Flags       Ehsize
-Phentsize    Phnum      Shentsz      Shnum       Shstrndx
+                     **** ELF HEADER ****
+ Class        Data       Type         Machine     Version
+ Entry        Phoff      Shoff        Flags       Ehsize
+ Phentsize    Phnum      Shentsz      Shnum       Shstrndx
 
-1            1          2            3           1
-0x80499cc    0x34       0x792f4      0           0x34
-0x20         5          0x28         21          19
+ 1            1          2            3           1
+ 0x80499cc    0x34       0x792f4      0           0x34
+ 0x20         5          0x28         21          19
 
-raid:/nfs/raid/src/dist-18.56/src> dump -f xemacs
+ raid:/nfs/raid/src/dist-18.56/src> dump -f xemacs
 
-xemacs:
+ xemacs:
 
-                    **** ELF HEADER ****
-Class        Data       Type         Machine     Version
-Entry        Phoff      Shoff        Flags       Ehsize
-Phentsize    Phnum      Shentsz      Shnum       Shstrndx
+                     **** ELF HEADER ****
+ Class        Data       Type         Machine     Version
+ Entry        Phoff      Shoff        Flags       Ehsize
+ Phentsize    Phnum      Shentsz      Shnum       Shstrndx
 
-1            1          2            3           1
-0x80499cc    0x34       0x96200      0           0x34
-0x20         5          0x28         22          19
+ 1            1          2            3           1
+ 0x80499cc    0x34       0x96200      0           0x34
+ 0x20         5          0x28         22          19
 
- * These are the program headers.  "Offset" is the file offset to the
- * segment.  "Vaddr" is the memory load address.  "Filesz" is the
- * segment size as it appears in the file, and "Memsz" is the size in
- * memory.  Below, the third segment is the code and the fourth is the
- * data: the difference between Filesz and Memsz is .bss
+  * These are the program headers.  "Offset" is the file offset to the
+  * segment.  "Vaddr" is the memory load address.  "Filesz" is the
+  * segment size as it appears in the file, and "Memsz" is the size in
+  * memory.  Below, the third segment is the code and the fourth is the
+  * data: the difference between Filesz and Memsz is .bss
 
-raid:/nfs/raid/src/dist-18.56/src> dump -o temacs
+ raid:/nfs/raid/src/dist-18.56/src> dump -o temacs
 
-temacs:
- ***** PROGRAM EXECUTION HEADER *****
-Type        Offset      Vaddr       Paddr
-Filesz      Memsz       Flags       Align
+ temacs:
+  ***** PROGRAM EXECUTION HEADER *****
+ Type        Offset      Vaddr       Paddr
+ Filesz      Memsz       Flags       Align
 
-6           0x34        0x8048034   0
-0xa0        0xa0        5           0
+ 6           0x34        0x8048034   0
+ 0xa0        0xa0        5           0
 
-3           0xd4        0           0
-0x13        0           4           0
+ 3           0xd4        0           0
+ 0x13        0           4           0
 
-1           0x34        0x8048034   0
-0x3f2f9     0x3f2f9     5           0x1000
+ 1           0x34        0x8048034   0
+ 0x3f2f9     0x3f2f9     5           0x1000
 
-1           0x3f330     0x8088330   0
-0x215c4     0x25a60     7           0x1000
+ 1           0x3f330     0x8088330   0
+ 0x215c4     0x25a60     7           0x1000
 
-2           0x60874     0x80a9874   0
-0x80        0           7           0
+ 2           0x60874     0x80a9874   0
+ 0x80        0           7           0
 
-raid:/nfs/raid/src/dist-18.56/src> dump -o xemacs
+ raid:/nfs/raid/src/dist-18.56/src> dump -o xemacs
 
-xemacs:
- ***** PROGRAM EXECUTION HEADER *****
-Type        Offset      Vaddr       Paddr
-Filesz      Memsz       Flags       Align
+ xemacs:
+  ***** PROGRAM EXECUTION HEADER *****
+ Type        Offset      Vaddr       Paddr
+ Filesz      Memsz       Flags       Align
 
-6           0x34        0x8048034   0
-0xa0        0xa0        5           0
+ 6           0x34        0x8048034   0
+ 0xa0        0xa0        5           0
 
-3           0xd4        0           0
-0x13        0           4           0
+ 3           0xd4        0           0
+ 0x13        0           4           0
 
-1           0x34        0x8048034   0
-0x3f2f9     0x3f2f9     5           0x1000
+ 1           0x34        0x8048034   0
+ 0x3f2f9     0x3f2f9     5           0x1000
 
-1           0x3f330     0x8088330   0
-0x3e4d0     0x3e4d0     7           0x1000
+ 1           0x3f330     0x8088330   0
+ 0x3e4d0     0x3e4d0     7           0x1000
 
-2           0x60874     0x80a9874   0
-0x80        0           7           0
+ 2           0x60874     0x80a9874   0
+ 0x80        0           7           0
 
 
  */
@@ -329,71 +336,71 @@
  * The above example now should look like:
 
            **** SECTION HEADER TABLE ****
-[No]    Type    Flags   Addr         Offset       Size          Name
-        Link    Info    Adralgn      Entsize
+ [No]    Type    Flags   Addr         Offset       Size          Name
+         Link    Info    Adralgn      Entsize
 
-[1]     1       2       0x80480d4    0xd4         0x13          .interp
-        0       0       0x1          0
+ [1]     1       2       0x80480d4    0xd4         0x13          .interp
+         0       0       0x1          0
 
-[2]     5       2       0x80480e8    0xe8         0x388         .hash
-        3       0       0x4          0x4
+ [2]     5       2       0x80480e8    0xe8         0x388         .hash
+         3       0       0x4          0x4
 
-[3]     11      2       0x8048470    0x470        0x7f0         .dynsym
-        4       1       0x4          0x10
+ [3]     11      2       0x8048470    0x470        0x7f0         .dynsym
+         4       1       0x4          0x10
 
-[4]     3       2       0x8048c60    0xc60        0x3ad         .dynstr
-        0       0       0x1          0
+ [4]     3       2       0x8048c60    0xc60        0x3ad         .dynstr
+         0       0       0x1          0
 
-[5]     9       2       0x8049010    0x1010       0x338         .rel.plt
-        3       7       0x4          0x8
+ [5]     9       2       0x8049010    0x1010       0x338         .rel.plt
+         3       7       0x4          0x8
 
-[6]     1       6       0x8049348    0x1348       0x3           .init
-        0       0       0x4          0
+ [6]     1       6       0x8049348    0x1348       0x3           .init
+         0       0       0x4          0
 
-[7]     1       6       0x804934c    0x134c       0x680         .plt
-        0       0       0x4          0x4
+ [7]     1       6       0x804934c    0x134c       0x680         .plt
+         0       0       0x4          0x4
 
-[8]     1       6       0x80499cc    0x19cc       0x3c56f       .text
-        0       0       0x4          0
+ [8]     1       6       0x80499cc    0x19cc       0x3c56f       .text
+         0       0       0x4          0
 
-[9]     1       6       0x8085f3c    0x3df3c      0x3           .fini
-        0       0       0x4          0
+ [9]     1       6       0x8085f3c    0x3df3c      0x3           .fini
+         0       0       0x4          0
 
-[10]    1       2       0x8085f40    0x3df40      0x69c         .rodata
-        0       0       0x4          0
+ [10]    1       2       0x8085f40    0x3df40      0x69c         .rodata
+         0       0       0x4          0
 
-[11]    1       2       0x80865dc    0x3e5dc      0xd51         .rodata1
-        0       0       0x4          0
+ [11]    1       2       0x80865dc    0x3e5dc      0xd51         .rodata1
+         0       0       0x4          0
 
-[12]    1       3       0x8088330    0x3f330      0x20afc       .data
-        0       0       0x4          0
+ [12]    1       3       0x8088330    0x3f330      0x20afc       .data
+         0       0       0x4          0
 
-[13]    1       3       0x80a8e2c    0x5fe2c      0x89d         .data1
-        0       0       0x4          0
+ [13]    1       3       0x80a8e2c    0x5fe2c      0x89d         .data1
+         0       0       0x4          0
 
-[14]    1       3       0x80a96cc    0x606cc      0x1a8         .got
-        0       0       0x4          0x4
+ [14]    1       3       0x80a96cc    0x606cc      0x1a8         .got
+         0       0       0x4          0x4
 
-[15]    6       3       0x80a9874    0x60874      0x80          .dynamic
-        4       0       0x4          0x8
+ [15]    6       3       0x80a9874    0x60874      0x80          .dynamic
+         4       0       0x4          0x8
 
-[16]    1       3       0x80a98f4    0x608f4      0x1cf0c       .data
-        0       0       0x4          0
+ [16]    1       3       0x80a98f4    0x608f4      0x1cf0c       .data
+         0       0       0x4          0
 
-[17]    8       3       0x80c6800    0x7d800      0             .bss
-        0       0       0x4          0
+ [17]    8       3       0x80c6800    0x7d800      0             .bss
+         0       0       0x4          0
 
-[18]    2       0       0            0x7d800      0x9b90        .symtab
-        19      371     0x4          0x10
+ [18]    2       0       0            0x7d800      0x9b90        .symtab
+         19      371     0x4          0x10
 
-[19]    3       0       0            0x87390      0x8526        .strtab
-        0       0       0x1          0
+ [19]    3       0       0            0x87390      0x8526        .strtab
+         0       0       0x1          0
 
-[20]    3       0       0            0x8f8b6      0x93          .shstrtab
-        0       0       0x1          0
+ [20]    3       0       0            0x8f8b6      0x93          .shstrtab
+         0       0       0x1          0
 
-[21]    1       0       0            0x8f949      0x68b7        .comment
-        0       0       0x1          0
+ [21]    1       0       0            0x8f949      0x68b7        .comment
+         0       0       0x1          0
 
  */
 
@@ -402,17 +409,16 @@
 
 #ifndef emacs
 #define fatal(a, b...) fprintf (stderr, a, ##b), exit (1)
+#include <string.h>
 #else
 #include "config.h"
-extern void fatal (char *, ...);
+extern void fatal (const char *msgid, ...);
 #endif
 
 #include <sys/types.h>
 #include <stdio.h>
-#include <stdlib.h>
 #include <sys/stat.h>
 #include <memory.h>
-#include <string.h>
 #include <errno.h>
 #include <unistd.h>
 #include <fcntl.h>
@@ -420,10 +426,10 @@
 #include <elf.h>
 #endif
 #include <sys/mman.h>
-#if defined (__sony_news) && defined (_SYSTYPE_SYSV)
+#if defined (_SYSTYPE_SYSV)
 #include <sys/elf_mips.h>
 #include <sym.h>
-#endif /* __sony_news && _SYSTYPE_SYSV */
+#endif /* _SYSTYPE_SYSV */
 #if __sgi
 #include <syms.h> /* for HDRR declaration */
 #endif /* __sgi */
@@ -470,7 +476,7 @@
 	long cbFdOffset;
 	long cbRfdOffset;
 	long cbExtOffset;
-} HDRR, *pHDRR; 
+} HDRR, *pHDRR;
 #define cbHDRR sizeof(HDRR)
 #define hdrNil ((pHDRR)0)
 #endif
@@ -479,7 +485,7 @@
 /*
  * NetBSD does not have normal-looking user-land ELF support.
  */
-# ifdef __alpha__
+# if defined __alpha__ || defined __sparc_v9__
 #  define ELFSIZE	64
 # else
 #  define ELFSIZE	32
@@ -488,6 +494,9 @@
 
 # ifndef PT_LOAD
 #  define PT_LOAD	Elf_pt_load
+#  if 0						/* was in pkgsrc patches for 20.7 */
+#   define SHT_PROGBITS Elf_sht_progbits
+#  endif
 #  define SHT_SYMTAB	Elf_sht_symtab
 #  define SHT_DYNSYM	Elf_sht_dynsym
 #  define SHT_NULL	Elf_sht_null
@@ -498,13 +507,18 @@
 #  define SHN_UNDEF	Elf_eshn_undefined
 #  define SHN_ABS	Elf_eshn_absolute
 #  define SHN_COMMON	Elf_eshn_common
-# endif
+# endif /* !PT_LOAD */
 
 # ifdef __alpha__
 #  include <sys/exec_ecoff.h>
 #  define HDRR		struct ecoff_symhdr
 #  define pHDRR		HDRR *
-# endif
+# endif /* __alpha__ */
+
+#ifdef __mips__			/* was in pkgsrc patches for 20.7 */
+# define SHT_MIPS_DEBUG	DT_MIPS_FLAGS
+# define HDRR		struct Elf_Shdr
+#endif /* __mips__ */
 #endif /* __NetBSD__ */
 
 #ifdef __OpenBSD__
@@ -636,7 +650,7 @@
 {
   int new_file, old_file, new_file_size;
 
-  /* Pointers to the base of the image of the two files. */
+  /* Pointers to the base of the image of the two files.  */
   caddr_t old_base, new_base;
 
 #if MAP_ANON == 0
@@ -651,7 +665,7 @@
   ElfW(Phdr) *old_program_h, *new_program_h;
   ElfW(Shdr) *old_section_h, *new_section_h;
 
-  /* Point to the section name table in the old file */
+  /* Point to the section name table in the old file.  */
   char *old_section_names;
 
   ElfW(Addr) old_bss_addr, new_bss_addr;
@@ -660,7 +674,7 @@
   ElfW(Addr) new_data2_addr;
 
   int n, nn;
-  int old_bss_index, old_sbss_index;
+  int old_bss_index, old_sbss_index, old_plt_index;
   int old_data_index, new_data2_index;
   int old_mdebug_index;
   struct stat stat_buf;
@@ -710,8 +724,7 @@
 				   old_name, old_file_h, old_section_h, 1);
 
   /* Find the old .bss section.  Figure out parameters of the new
-   * data2 and bss sections.
-   */
+     data2 and bss sections.  */
 
   old_bss_index = find_section (".bss", old_section_names,
 				old_name, old_file_h, old_section_h, 0);
@@ -719,15 +732,34 @@
   old_sbss_index = find_section (".sbss", old_section_names,
 				 old_name, old_file_h, old_section_h, 1);
   if (old_sbss_index != -1)
-    if (OLD_SECTION_H (old_sbss_index).sh_type == SHT_PROGBITS)
+    if (OLD_SECTION_H (old_sbss_index).sh_type != SHT_NOBITS)
       old_sbss_index = -1;
 
-  if (old_sbss_index == -1)
+  /* PowerPC64 has .plt in the BSS section.  */
+  old_plt_index = find_section (".plt", old_section_names,
+				old_name, old_file_h, old_section_h, 1);
+  if (old_plt_index != -1)
+    if (OLD_SECTION_H (old_plt_index).sh_type != SHT_NOBITS)
+      old_plt_index = -1;
+
+  if (old_sbss_index == -1 && old_plt_index == -1)
     {
       old_bss_addr = OLD_SECTION_H (old_bss_index).sh_addr;
       old_bss_size = OLD_SECTION_H (old_bss_index).sh_size;
       new_data2_index = old_bss_index;
     }
+  else if (old_plt_index != -1
+	   && (old_sbss_index == -1
+	       || (OLD_SECTION_H (old_sbss_index).sh_addr
+		   > OLD_SECTION_H (old_plt_index).sh_addr)))
+    {
+      old_bss_addr = OLD_SECTION_H (old_plt_index).sh_addr;
+      old_bss_size = OLD_SECTION_H (old_bss_index).sh_size
+	+ OLD_SECTION_H (old_plt_index).sh_size;
+      if (old_sbss_index != -1)
+	old_bss_size += OLD_SECTION_H (old_sbss_index).sh_size;
+      new_data2_index = old_plt_index;
+    }
   else
     {
       old_bss_addr = OLD_SECTION_H (old_sbss_index).sh_addr;
@@ -789,8 +821,7 @@
     ((byte *) new_base + old_file_h->e_shoff + new_data2_size);
 
   /* Make our new file, program and section headers as copies of the
-   * originals.
-   */
+     originals.  */
 
   memcpy (new_file_h, old_file_h, old_file_h->e_ehsize);
   memcpy (new_program_h, old_program_h,
@@ -800,8 +831,7 @@
   PATCH_INDEX (new_file_h->e_shstrndx);
 
   /* Fix up file header.  We'll add one section.  Section header is
-   * further away now.
-   */
+     further away now.  */
 
   new_file_h->e_shoff += new_data2_size;
   new_file_h->e_shnum += 1;
@@ -814,12 +844,11 @@
 #endif
 
   /* Fix up a new program header.  Extend the writable data segment so
-   * that the bss area is covered too. Find that segment by looking
-   * for a segment that ends just before the .bss area.  Make sure
-   * that no segments are above the new .data2.  Put a loop at the end
-   * to adjust the offset and address of any segment that is above
-   * data2, just in case we decide to allow this later.
-   */
+     that the bss area is covered too. Find that segment by looking
+     for a segment that ends just before the .bss area.  Make sure
+     that no segments are above the new .data2.  Put a loop at the end
+     to adjust the offset and address of any segment that is above
+     data2, just in case we decide to allow this later.  */
 
   for (n = new_file_h->e_phnum - 1; n >= 0; n--)
     {
@@ -869,11 +898,10 @@
 #endif
 
   /* Fix up section headers based on new .data2 section.  Any section
-   * whose offset or virtual address is after the new .data2 section
-   * gets its value adjusted.  .bss size becomes zero and new address
-   * is set.  data2 section header gets added by copying the existing
-   * .data header and modifying the offset, address and size.
-   */
+     whose offset or virtual address is after the new .data2 section
+     gets its value adjusted.  .bss size becomes zero and new address
+     is set.  data2 section header gets added by copying the existing
+     .data header and modifying the offset, address and size.  */
   for (old_data_index = 1; old_data_index < (int) old_file_h->e_shnum;
        old_data_index++)
     if (!strcmp (old_section_names + OLD_SECTION_H (old_data_index).sh_name,
@@ -916,11 +944,11 @@
 
       memcpy (&NEW_SECTION_H (nn), &OLD_SECTION_H (n),
 	      old_file_h->e_shentsize);
-      
+
       if (n == old_bss_index
 	  /* The new bss and sbss section's size is zero, and its file offset
 	     and virtual address should be off by NEW_DATA2_SIZE.  */
-	  || n == old_sbss_index
+	  || n == old_sbss_index || n == old_plt_index
 	  )
 	{
 	  /* NN should be `old_s?bss_index + 1' at this point. */
@@ -977,11 +1005,11 @@
       if (NEW_SECTION_H (nn).sh_type != SHT_SYMTAB
 	  && NEW_SECTION_H (nn).sh_type != SHT_DYNSYM)
 	PATCH_INDEX (NEW_SECTION_H (nn).sh_info);
-      
+
       if (old_sbss_index != -1)
 	if (!strcmp (old_section_names + NEW_SECTION_H (nn).sh_name, ".sbss"))
 	  {
-	    NEW_SECTION_H (nn).sh_offset = 
+	    NEW_SECTION_H (nn).sh_offset =
 	      round_up (NEW_SECTION_H (nn).sh_offset,
 			NEW_SECTION_H (nn).sh_addralign);
 	    NEW_SECTION_H (nn).sh_type = SHT_PROGBITS;
@@ -1002,11 +1030,35 @@
 		      ".lit4")
 	  || !strcmp ((old_section_names + NEW_SECTION_H (n).sh_name),
 		      ".lit8")
+	  /* The conditional bit below was in Oliva's original code
+	     (1999-08-25) and seems to have been dropped by mistake
+	     subsequently.  It prevents a crash at startup under X in
+	     `IRIX64 6.5 6.5.17m', whether compiled on that relase or
+	     an earlier one.  It causes no trouble on the other ELF
+	     platforms I could test (Irix 6.5.15m, Solaris 8, Debian
+	     Potato x86, Debian Woody SPARC); however, it's reported
+	     to cause crashes under some version of GNU/Linux.  It's
+	     not yet clear what's changed in that Irix version to
+	     cause the problem, or why the fix sometimes fails under
+	     GNU/Linux.  There's probably no good reason to have
+	     something Irix-specific here, but this will have to do
+	     for now.  IRIX6_5 is the most specific macro we have to
+	     test.  -- fx 2002-10-01
+
+	     The issue _looks_ as though it's gone away on 6.5.18m,
+	     but maybe it's still lurking, to be triggered by some
+	     change in the binary.  It appears to concern the dynamic
+	     loader, but I never got anywhere with an SGI support call
+	     seeking clues.  -- fx 2002-11-29.  */
+#ifdef IRIX6_5
+	  || !strcmp ((old_section_names + NEW_SECTION_H (n).sh_name),
+		      ".got")
+#endif
 	  || !strcmp ((old_section_names + NEW_SECTION_H (n).sh_name),
 		      ".sdata1")
 	  || !strcmp ((old_section_names + NEW_SECTION_H (n).sh_name),
 		      ".data1")
-	  || !strcmp (old_section_names + NEW_SECTION_H (nn).sh_name,
+	  || !strcmp ((old_section_names + NEW_SECTION_H (n).sh_name),
 		      ".sbss"))
 	src = (caddr_t) OLD_SECTION_H (n).sh_addr;
       else
@@ -1036,12 +1088,12 @@
 	}
 #endif /* __alpha__ */
 
-#if defined (__sony_news) && defined (_SYSTYPE_SYSV)
+#if defined (_SYSTYPE_SYSV)
       if (NEW_SECTION_H (nn).sh_type == SHT_MIPS_DEBUG
-	  && old_mdebug_index != -1) 
+	  && old_mdebug_index != -1)
         {
-	  int diff = NEW_SECTION_H(nn).sh_offset 
-	 	- OLD_SECTION_H(old_mdebug_index).sh_offset;
+	  int diff = NEW_SECTION_H(nn).sh_offset
+		- OLD_SECTION_H(old_mdebug_index).sh_offset;
 	  HDRR *phdr = (HDRR *)(NEW_SECTION_H (nn).sh_offset + new_base);
 
 	  if (diff)
@@ -1059,10 +1111,10 @@
 	      phdr->cbExtOffset  += diff;
 	    }
 	}
-#endif /* __sony_news && _SYSTYPE_SYSV */
+#endif /* _SYSTYPE_SYSV */
 
 #if __sgi
-      /* Adjust  the HDRR offsets in .mdebug and copy the 
+      /* Adjust  the HDRR offsets in .mdebug and copy the
 	 line data if it's in its usual 'hole' in the object.
 	 Makes the new file debuggable with dbx.
 	 patches up two problems: the absolute file offsets
@@ -1164,54 +1216,68 @@
   for (n = new_file_h->e_shnum - 1; n; n--)
     {
       ElfW(Shdr) section = NEW_SECTION_H (n);
-      switch (section.sh_type) {
-      default:
-	break;
-      case SHT_REL:
-      case SHT_RELA:
-	/* This code handles two different size structs, but there should
-	   be no harm in that provided that r_offset is always the first
-	   member.  */
-	nn = section.sh_info;
-	if (nn && (!strcmp (old_section_names + NEW_SECTION_H (nn).sh_name, ".data")
-	    || !strcmp ((old_section_names + NEW_SECTION_H (nn).sh_name),
-			".sdata")
-	    || !strcmp ((old_section_names + NEW_SECTION_H (nn).sh_name),
-			".lit4")
-	    || !strcmp ((old_section_names + NEW_SECTION_H (nn).sh_name),
-			".lit8")
-	    || !strcmp ((old_section_names + NEW_SECTION_H (nn).sh_name),
-			".sdata1")
-	    || !strcmp ((old_section_names + NEW_SECTION_H (nn).sh_name),
-			".data1")))
-	  {
-	    ElfW(Addr) offset = NEW_SECTION_H (nn).sh_addr -
-	      NEW_SECTION_H (nn).sh_offset;
-	    caddr_t reloc = old_base + section.sh_offset, end;
-	    for (end = reloc + section.sh_size; reloc < end;
-		 reloc += section.sh_entsize)
-	      {
-		ElfW(Addr) addr = ((ElfW(Rel) *) reloc)->r_offset - offset;
+
+      /* Cause a compilation error if anyone uses n instead of nn below.  */
+      struct {int a;} n;
+      (void)n.a;		/* Prevent `unused variable' warnings.  */
+
+      switch (section.sh_type)
+	{
+	default:
+	  break;
+	case SHT_REL:
+	case SHT_RELA:
+	  /* This code handles two different size structs, but there should
+	     be no harm in that provided that r_offset is always the first
+	     member.  */
+	  nn = section.sh_info;
+	  if (!strcmp (old_section_names + NEW_SECTION_H (nn).sh_name, ".data")
+	      || !strcmp ((old_section_names + NEW_SECTION_H (nn).sh_name),
+			  ".sdata")
+	      || !strcmp ((old_section_names + NEW_SECTION_H (nn).sh_name),
+			  ".lit4")
+	      || !strcmp ((old_section_names + NEW_SECTION_H (nn).sh_name),
+			  ".lit8")
+#ifdef IRIX6_5			/* see above */
+	      || !strcmp ((old_section_names + NEW_SECTION_H (nn).sh_name),
+			  ".got")
+#endif
+	      || !strcmp ((old_section_names + NEW_SECTION_H (nn).sh_name),
+			  ".sdata1")
+	      || !strcmp ((old_section_names + NEW_SECTION_H (nn).sh_name),
+			  ".data1"))
+	    {
+	      ElfW(Addr) offset = (NEW_SECTION_H (nn).sh_addr
+				   - NEW_SECTION_H (nn).sh_offset);
+	      caddr_t reloc = old_base + section.sh_offset, end;
+	      for (end = reloc + section.sh_size; reloc < end;
+		   reloc += section.sh_entsize)
+		{
+		  ElfW(Addr) addr = ((ElfW(Rel) *) reloc)->r_offset - offset;
 #ifdef __alpha__
-		/* The Alpha ELF binutils currently have a bug that
-		   sometimes results in relocs that contain all
-		   zeroes.  Work around this for now...  */
-		if (((ElfW(Rel) *) reloc)->r_offset == 0)
+		  /* The Alpha ELF binutils currently have a bug that
+		     sometimes results in relocs that contain all
+		     zeroes.  Work around this for now...  */
+		  if (((ElfW(Rel) *) reloc)->r_offset == 0)
 		    continue;
 #endif
-		memcpy (new_base + addr, old_base + addr, sizeof(ElfW(Addr)));
-	      }
-	  }
-	break;
-      }
+		  memcpy (new_base + addr, old_base + addr, sizeof(ElfW(Addr)));
+		}
+	    }
+	  break;
+	}
     }
 
   /* Write out new_file, and free the buffers.  */
 
   if (write (new_file, new_base, new_file_size) != new_file_size)
+#ifndef emacs
+    fatal ("Didn't write %d bytes: errno %d\n",
+	   new_file_size, errno);
+#else
     fatal ("Didn't write %d bytes to %s: errno %d\n",
 	   new_file_size, new_base, errno);
-
+#endif
   munmap (old_base, old_file_size);
   munmap (new_base, new_file_size);
 
@@ -1236,12 +1302,12 @@
   if (chmod (new_name, stat_buf.st_mode) == -1)
     fatal ("Can't chmod (%s): errno %d\n", new_name, errno);
 }
-/* All of the above is from the emacs-20.7 file.  This comment and the
+/* All of the above is from the emacs-22.2 file.  This comment and the
    following are added for gcl.  Also we changed the above (near "for
    gcl") we make the NEW_SECTION_H executable since it will have code
    in it.  NEW_SECTION_H (nn).sh_flags |= SHF_EXECINSTR;
    
-   Partly synchronized with Emacs HEAD of 2004-04-12 by Magnus Henoch.
+   Synchronized with Emacs 22.2 on 2008-11-07 by Jerry James.
    The files themselves are no longer mmap'ed, but memory is allocated
    with mmap, and everything is written to the new file at the end.
 */

gcl-2.6.8-debuginfo.patch:

--- NEW FILE gcl-2.6.8-debuginfo.patch ---
diff -dur gcl-2.6.8.ORIG/o/makefile gcl-2.6.8/o/makefile
--- gcl-2.6.8.ORIG/o/makefile	2006-10-18 11:08:56.000000000 -0600
+++ gcl-2.6.8/o/makefile	2009-01-07 16:10:38.000000000 -0700
@@ -27,7 +27,6 @@
 %.o: %.d $(DECL)
 	$(DPP) $*
 	$(CC) -c $(CFLAGS) $(DEFS) $*.c $(AUX_INFO)
-	rm $*.c
 
 CPP=
 %.ini: %.c grab_defs plt.h

gcl-2.6.8-elisp.patch:

--- NEW FILE gcl-2.6.8-elisp.patch ---
diff -dur gcl-2.6.8.ORIG/elisp/ansi-doc.el gcl-2.6.8/elisp/ansi-doc.el
--- gcl-2.6.8.ORIG/elisp/ansi-doc.el	1999-12-06 15:43:59.000000000 -0700
+++ gcl-2.6.8/elisp/ansi-doc.el	2008-12-29 21:15:15.000000000 -0700
@@ -9,6 +9,8 @@
 ;; xdvi.   You may gzip the .dvi files and it will unzip them into tmp
 ;; as needed.
 
+(eval-and-compile
+  (require 'cl))
 
 (defvar ansi-doc-dir "/usr/local/doc/dpANS2")
 (defvar ansi-doc-alist nil)
@@ -55,38 +57,28 @@
 or topic.   If there are several pieces of documentation then go through
 them successively.   Requires copying the "
   (interactive )
-  (let (x tem name lis first chap tmp-chap)
-    (or ansi-doc-alist
-	(progn
-	  (create-index-el-from-index-idx )
-	  (load (concat ansi-doc-dir "/index.el"))))
-    (setq name (completing-read "Doc on: " ansi-doc-alist nil t))
-    (progn  (setq ans nil)   (setq lis ansi-doc-alist)
-	    (while lis
-	      (cond ((equal (car  (car lis)) name)
-		     (setq ans (append ans (cdr  (cdr (car lis)))))))
-	      (setq lis (cdr lis)))
-	    )	    
-    (setq tem ans)
-    (if (cdr tem) (setq first "First") (setq first ""))
-    (while tem
-      (setq x (car tem))
-      (setq chap (concat ansi-doc-dir
-		  (downcase (format "/chap-%s.dvi"  (car x)))))
-      (setq chap (maybe-gzip-to-tmp chap))
-      (message "%s Doc in Chapter %s page %s) %s .." first (car x) (cdr x))
-      (if (cdr tem) (setq first "Next") (setq next "Final"))
-      (shell-command (concat "xdvi  -expert -xoffset .2 -yoffset -.2 "
-			     " -paper 7.2x8.5 "
-			     " -display "
-			     (or x-display-name ":0")
-			     "  -geometry -2-2 +" (+ (cdr x) 2)" "
-			     chap
-			     ))
-      (setq tem (cdr tem))
-
-      )
-    )
-  (message nil)
-  
-  )
+  (unless ansi-doc-alist
+    (create-index-el-from-index-idx )
+    (load (concat ansi-doc-dir "/index.el")))
+  (let* ((name (completing-read "Doc on: " ansi-doc-alist nil t))
+	 (tem (mapcan #'(lambda (elem)
+			  (and (equal name (car elem)) (cddr elem)))
+		      ansi-doc-alist))
+	 (first (if (cdr tem) "First" "")))
+    (dolist (x tem)
+      (message "%s Doc in Chapter %s page %s) .." first (car x) (cdr x))
+      (let ((chap (maybe-gzip-to-tmp
+		   (concat ansi-doc-dir
+			   (downcase (format "/chap-%s.dvi"  (car x)))))))
+	(setq first (if (cdr tem) "Next" "Final"))
+	(shell-command (concat "xdvi  -expert -xoffset .2 -yoffset -.2 "
+			       " -paper 7.2x8.5 "
+			       " -display "
+			       (or
+				(if (featurep 'xemacs)
+				    (console-connection (selected-console))
+				  x-display-name)
+				":0")
+			       "  -geometry -2-2 +" (+ (cdr x) 2)" "
+			       chap)))))
+  (message nil))
diff -dur gcl-2.6.8.ORIG/elisp/dbl.el gcl-2.6.8/elisp/dbl.el
--- gcl-2.6.8.ORIG/elisp/dbl.el	2001-05-06 09:59:23.000000000 -0600
+++ gcl-2.6.8/elisp/dbl.el	2008-12-29 21:15:15.000000000 -0700
@@ -97,29 +97,35 @@
 ;(define-key ctl-x-map "&" 'send-dbl-command)
 
 ;;Of course you may use `def-dbl' with any other dbl command, including
-;;user defined ones.   
+;;user defined ones.
 
-(defmacro def-dbl (name key &optional doc)
+(defmacro def-dbl (name keys &optional doc)
+  (unless (consp keys)
+    (setq keys (list keys)))
   (let* ((fun (intern (format "dbl-%s" (read name))))
-	 )
-    (list 'progn
- 	  (list 'defun fun '(arg)
-		(or doc "")
-		'(interactive "p")
-		(list 'dbl-call name 'arg))
-	  (list 'define-key 'dbl-mode-map key  (list 'quote fun)))))
+	 (keydefs (mapcar #'(lambda (key) `(define-key dbl-mode-map ,key
+					    (quote ,fun)))
+		   keys)))
+    `(progn
+      (defun ,fun (arg)
+	,(or doc "")
+	(interactive "p")
+	(dbl-call ,name arg))
+      , at keydefs)))
 
-(def-dbl ":step %p"   "\M-s" "Step one source line with display")
-(def-dbl ":step %p"   "\C-c\C-s" "Step one source line with display")
-(def-dbl ":stepi %p"  "\C-c\t" "Step one instruction with display")
-(def-dbl ":next %p"   "\M-n" "Step one source line (skip functions)")
-(def-dbl ":next %p"   "\C-c\C-n" "Step one source line (skip functions)")
+(def-dbl ":step %p"  ("\M-s" "\C-c\C-s") "Step one source line with display")
+(def-dbl ":stepi %p" "\C-c\t" "Step one instruction with display")
+(def-dbl ":next %p"  ("\M-n" "\C-c\C-n") "Step one source line (skip functions)")
 (def-dbl ":r"   "\M-c" "Continue with display")
 
 (def-dbl ":finish" "\C-c\C-f" "Finish executing current function")
 (def-dbl ":up %p"     "\C-cu"   "Go up N stack frames (numeric arg) with display")
 (def-dbl ":down %p"   "\C-cd"   "Go down N stack frames (numeric arg) with display")
 
+(defvar dbl-last-frame nil)
+(defvar dbl-last-frame-displayed-p t)
+(defvar dbl-delete-prompt-marker nil)
+
 
 (defun dbl-mode ()
   "Major mode for interacting with an inferior Lisp or Maxima process.
@@ -227,7 +233,7 @@
 
 
 (defun dbl (p)
- 
+
  "Makes a dbl buffer, suitable for running an inferior
   gcl.  You are prompted for a name for the buffer.  After the shell
   starts you should start up your lisp program (eg gcl).  The bufferd
@@ -235,16 +241,13 @@
   debug loop with (si::dbl) or :dbl in a debug loop.  "
 
   (interactive "p")
-  
-  (let ( tem
-	(dir default-directory)
-	;; important for winnt version of emacs
+
+  (let (;; important for winnt version of emacs
 	(binary-process-input t)
 	(binary-process-output nil)
-	switches
 	(name (concat "dbl" (if (equal p 1) "" p) ""))
 	)
-    
+
     (switch-to-buffer (concat "*" name "*"))
     (or (bolp) (newline))
     (insert "Current directory is " default-directory "\n")
@@ -291,15 +294,6 @@
 ;; It records the filename and line number, and maybe displays that file.
 (defun dbl-filter (proc string)
   (let ((inhibit-quit t))
-    (set-buffer (process-buffer proc))
-    (goto-char (point-max))
-    (insert string)
-    (goto-char (point-max))
-    ))
-
-
-(defun dbl-filter (proc string)
-  (let ((inhibit-quit t))
     (if dbl-filter-accumulator
 	(dbl-filter-accumulate-marker proc
 				      (concat dbl-filter-accumulator string))
@@ -314,14 +308,13 @@
 	  (let ((end (string-match "\n" string)))
 	    (if end
               (progn
-		(setq me string)
 		(cond ((string-match
 			"\032\032\\([A-Za-z]?:?[^:]*\\):\\([0-9]*\\):[^\n]+\n"
 			string)
 		       (setq dbl-last-frame
 			      (cons
 			      (match-string 1 string)
-			      (string-to-int  (match-string 2 string))))
+			      (string-to-number (match-string 2 string))))
 		       
 		       (cond ((equal (cdr dbl-last-frame)  0)
 			      ;(message "got 0")
@@ -358,8 +351,7 @@
 (defun dbl-filter-insert (proc string)
   (let (moving
 	output-after-point 
-	(old-buffer (current-buffer))
-	start)
+	(old-buffer (current-buffer)))
     (set-buffer (process-buffer proc))
     ;; test to see if we will move the point.   We want that the
     ;; window-point of the buffer, should be equal to process-mark. 
@@ -370,7 +362,6 @@
 	(save-excursion
 	  ;; Insert the text, moving the process-marker.
 	  (goto-char (process-mark proc))
-	  (setq start (point))
 	  (insert string)
 	  (set-marker (process-mark proc) (point))
 	 ; (setq bill (cons (list 'hi (process-mark proc) (marker-position (process-mark proc)) (point)) bill))
@@ -488,19 +479,22 @@
   (interactive)
   (save-excursion
     (end-of-line)
-    (cond ((get-buffer-process (current-buffer))
-	   (cond
-	    ((save-excursion
-	       (beginning-of-line)
-		(get-text-property (point) 'file-line)))
-	    ((progn (end-of-line) (re-search-backward " \\([^: ]+\\):\\([0-9]+\\)" 300 nil))
-	     (setq file (buffer-substring (match-beginning 1) (match-end 1)))
-	     (setq line (buffer-substring (match-beginning 2) (match-end 2)))
-	     (setq line (read line))
-	     (and (integerp line)
-		  (setq file (search-path file 'dbl-dirs))
-		  (list file line)))))
-	  (t (list (buffer-file-name) (+ 1 (count-lines (point))))))))
+    (cond
+     ((get-buffer-process (current-buffer))
+      (cond
+       ((progn
+	  (beginning-of-line)
+	  (get-text-property (point) 'file-line)))
+       ((progn (end-of-line) (re-search-backward " \\([^: ]+\\):\\([0-9]+\\)" 300 nil))
+	(let ((file (buffer-substring (match-beginning 1) (match-end 1)))
+	      (line (buffer-substring (match-beginning 2) (match-end 2))))
+	  (setq line (read line))
+	  (and (integerp line)
+	       (setq file (search-path file 'dbl-dirs))
+	       (list file line))))))
+     (t (list (buffer-file-name)
+	      (+ 1 (if (featurep 'xemacs) (line-number)
+		     (line-number-at-pos))))))))
 
 (defun dbl-find-and-display-line ()
   (interactive)
@@ -554,8 +548,8 @@
   (goto-char (point-max))
   (setq dbl-delete-prompt-marker (point-marker))
   (dbl-set-buffer)
-  (send-string (get-buffer-process current-dbl-buffer)
-	       (concat command "\n"))))
+  (process-send-string (get-buffer-process current-dbl-buffer)
+		       (concat command "\n"))))
 
 (defun dbl-subtitute-% (command n)
   (let* (result
@@ -566,8 +560,8 @@
 	   (cond (in-dbl (setq file-line (dbl-find-line)))
 		 (t (setq file-line
 			  (list (buffer-file-name)
-				(+ 1 (count-lines
-							 (point)))))))))
+				(+ 1 (if (featurep 'xemacs) (line-number)
+				       (line-number-at-pos)))))))))
     (while (and command (string-match "\\([^%]*\\)%\\([adeflp]\\)" command))
       (let ((letter (string-to-char (substring command (match-beginning 2))))
 	    subst)
@@ -620,8 +614,8 @@
 	     (if (get-buffer-process (current-buffer))
 		 (setq current-dbl-buffer (current-buffer)))
 	     (message name)
-	     (send-string (get-buffer-process current-dbl-buffer)
-			  (concat name "\n"))
+	     (process-send-string (get-buffer-process current-dbl-buffer)
+				  (concat name "\n"))
 	     (other-window 1)
 	     )))
 	(t
@@ -632,20 +626,21 @@
 		       (1+ (count-lines 1 (point))))))
 	   (and    downcase-filenames-for-dbl
 		   (setq file-name (downcase file-name)))
-	   (send-string (get-buffer-process current-dbl-buffer)
-			(concat "break " file-name ":" line "\n"))))))
+	   (process-send-string (get-buffer-process current-dbl-buffer)
+				(concat "break " file-name ":" line "\n"))))))
 	
 	
 (defun dbl-read-address()
   "Return a string containing the core-address found in the buffer at point."
   (save-excursion
-   (let ((pt (dot)) found begin)
-     (setq found (if (search-backward "0x" (- pt 7) t)(dot)))
-     (cond (found (forward-char 2)(setq result
-			(buffer-substring found
-				 (progn (re-search-forward "[^0-9a-f]")
-					(forward-char -1)
-					(dot)))))
+   (let* ((pt (dot))
+	  (found (if (search-backward "0x" (- pt 7) t) (dot)))
+	  begin)
+     (cond (found (forward-char 2)
+		  (buffer-substring found
+				    (progn (re-search-forward "[^0-9a-f]")
+					   (forward-char -1)
+					   (dot))))
 	   (t (setq begin (progn (re-search-backward "[^0-9]") (forward-char 1)
 				 (dot)))
 	      (forward-char 1)
@@ -680,6 +675,6 @@
 	  (t (setq comm addr)))
     (switch-to-buffer current-dbl-buffer)
     (goto-char (dot-max))
-    (insert-string comm)))
+    (insert comm)))
 
 (provide 'dbl)
diff -dur gcl-2.6.8.ORIG/elisp/doc-to-texi.el gcl-2.6.8/elisp/doc-to-texi.el
--- gcl-2.6.8.ORIG/elisp/doc-to-texi.el	1999-12-06 15:43:59.000000000 -0700
+++ gcl-2.6.8/elisp/doc-to-texi.el	2008-12-29 21:15:15.000000000 -0700
@@ -51,7 +51,7 @@
 	   (let ((fun (get-match 1))
 		 (type (get-match 2))
 		 (package (get-match 3))
-		 args body)
+		 body)
 	     (goto-char (match-end 0))
 	     (setq body (buffer-substring (point) (- end 1)))
 	     (delete-region beg end )
@@ -78,22 +78,22 @@
 			  (?d .  "{Declaration}"))))))
       (if u (replace-match u)))))
 
-(setq b-alist '((?n . "number.texi")
-		(?s . "sequence.texi")
-		(?c . "character.texi")
-		(?l . "list.texi")
-		(?i . "io.texi")
-		(?a . "internal.texi")
-		(?f . "form.texi")
-		(?C . "compile.texi")
-		(?S . "symbol.texi")
-		(?t . "system.texi")
-		(?d . "structure.texi")
-		(?I . "iteration.texi")
-		(?u . "user-interface.texi")
-		(?d . "doc.texi")
-		(?b . "type.texi")
-		))
+(defvar b-alist '((?n . "number.texi")
+		  (?s . "sequence.texi")
+		  (?c . "character.texi")
+		  (?l . "list.texi")
+		  (?i . "io.texi")
+		  (?a . "internal.texi")
+		  (?f . "form.texi")
+		  (?C . "compile.texi")
+		  (?S . "symbol.texi")
+		  (?t . "system.texi")
+		  (?d . "structure.texi")
+		  (?I . "iteration.texi")
+		  (?u . "user-interface.texi")
+		  (?d . "doc.texi")
+		  (?b . "type.texi")
+		  ))
 (defun try1 ()
   (interactive)
   (while (re-search-forward "\n at def" nil t)
@@ -114,7 +114,7 @@
       
 
       
-(setq xall	  (mapcar 'cdr  b-alist))
+(defvar xall	  (mapcar 'cdr  b-alist))
 
 ;(let ((all xall)) (while all (set-buffer (car all))  (write-file (car all)) (setq all (cdr all))))
 ;(let ((all xall)) (while all   (find-file (car all)) (setq all (cdr all))))	
diff -dur gcl-2.6.8.ORIG/elisp/gcl.el gcl-2.6.8/elisp/gcl.el
--- gcl-2.6.8.ORIG/elisp/gcl.el	2004-06-25 16:40:23.000000000 -0600
+++ gcl-2.6.8/elisp/gcl.el	2008-12-29 21:15:15.000000000 -0700
@@ -14,6 +14,7 @@
 ;; M-p complete the current input by looking back through the buffer to see what was last typed
 ;;        using this prompt and this beginning.   Useful in shell, in lisp, in gdb,...
 
+(require 'inf-lisp)
 
 (setq lisp-mode-hook  'remote-lisp)
 
@@ -23,6 +24,9 @@
 ;(global-set-key "p" 'lisp-complete)
 (global-set-key "p" 'smart-complete)
 
+(defvar lisp-package nil)
+(defvar lisp-process nil)
+
 (defun remote-lisp (&rest l)
   (and (boundp 'lisp-mode-map)
        lisp-mode-map
@@ -158,12 +162,12 @@
 	))
     
 
-    (send-string this-lisp-process
-		 (concat ";;end of form" "\n" telnet-new-line))
+    (process-send-string this-lisp-process
+			 (concat ";;end of form" "\n" telnet-new-line))
     (cond (arg
 	   (if (numberp arg) (setq arg "compile"))
-	   (send-string this-lisp-process (concat "(" arg "'" fun ")"
-						  telnet-new-line))))
+	   (process-send-string this-lisp-process (concat "(" arg "'" fun ")"
+							  telnet-new-line))))
     (and time-to-throw-away
 	 (string-match "telnet"(buffer-name (process-buffer proc)))
 	 (dump-output proc time-to-throw-away))
@@ -194,7 +198,7 @@
 
 (defun my-send-region (proc beg end)
   (cond ((or (string-match "telnet" (process-name proc)))
-	 (send-region proc beg end))
+	 (process-send-region proc beg end))
 	(t
 	 (let ((package (get-buffer-package)))
 	   (save-excursion
@@ -213,7 +217,7 @@
 		 (write-region (point-min) (point-max) tmp-lisp-file nil nil)))
 	   (write-region beg end tmp-lisp-file t nil)
 	   (message "sending ..")
-	   (send-string
+	   (process-send-string
 	    proc
 	    (concat "(lisp::let ((*load-verbose* nil)) (#+sdebug si::nload #-sdebug load \""
 		    tmp-lisp-file
@@ -268,9 +272,9 @@
 		       (prog2 (other-window 1)
 			      (get-buffer-process (current-buffer))
 			      (other-window 1)))))
-	(send-string current-lisp-process "(macroexpand '")
-	(send-region current-lisp-process  beg (point) )
-	(send-string current-lisp-process ")\n")))))
+	(process-send-string current-lisp-process "(macroexpand '")
+	(process-send-region current-lisp-process  beg (point) )
+	(process-send-string current-lisp-process ")\n")))))
 
 (defun delete-comment-char (arg) 
   (while (and (> arg 0) (looking-at comment-start)) (delete-char 1) 
@@ -333,8 +337,8 @@
  (interactive "P") 
  (save-excursion 
    (let ((beg (dot)) 
-	 (ok t)(end (mark)))
-          (comment-region1 beg end arg))))
+	 (end (mark)))
+     (comment-region1 beg end arg))))
 
 (defun comment-region1 (beg end arg)
   (let ((ok t))
@@ -347,7 +351,7 @@
 	   (while ok 
 	     (cond (arg 
 		    (delete-comment-char arg)) 
-		   (t   (insert-string comment-start)))
+		   (t   (insert comment-start)))
 	     (if (< end (dot)) (setq ok nil)
 	       (if  (search-forward "\n" end t) nil (setq ok nil))) )
 	 (widen))))
@@ -363,13 +367,13 @@
 	     (current-lisp-process (or  proc lisp-process)))
 	(other-window 1)
 	(message "Tracing: %s" (buffer-substring (point) end))
-	(send-string current-lisp-process "(trace ")
-	(send-region current-lisp-process (point) end)
-	(send-string current-lisp-process ")\n")))))
+	(process-send-string current-lisp-process "(trace ")
+	(process-send-region current-lisp-process (point) end)
+	(process-send-string current-lisp-process ")\n")))))
 
 (defun gcl-mode ()
   (interactive)
   (lisp-mode)
   )
 
-(provide 'gcl)
\ No newline at end of file
+(provide 'gcl)
diff -dur gcl-2.6.8.ORIG/elisp/man1-to-texi.el gcl-2.6.8/elisp/man1-to-texi.el
--- gcl-2.6.8.ORIG/elisp/man1-to-texi.el	1999-12-06 15:43:59.000000000 -0700
+++ gcl-2.6.8/elisp/man1-to-texi.el	2008-12-29 21:15:15.000000000 -0700
@@ -106,6 +106,8 @@
 ;	End of indented unfilled display.
 ; 
 
+(require 'makeinfo)
+
 (defun do-replace (lis &optional not-in-string)
   (let (x case-fold-search)
     (while lis
@@ -285,15 +287,14 @@
     (while (< i (length vec)) (setq tot (+ (aref vec i) tot)) (setq i (+ i 1)))
     (setq surplus (/ (- 70 tot) (+ 1 (length (car items)))))
     (while items
-      (setq tem (car items))
-      (setq i 0)
-      (let (ans x)
+      (let ((tem (car items)))
+	(setq i 0)
 	(insert "")
-	(while tem
-	  (insert (tex-center (car tem) (+ (aref vec i) surplus) 'left
-			      (real-length (car tem))))
-	  (setq tem (cdr tem)) (setq i (+ i 1)))
-	(insert "\n"))
+	(dolist (elem tem)
+	  (insert (tex-center elem (+ (aref vec i) surplus) 'left
+			      (real-length elem)))
+	  (setq i (+ i 1))))
+      (insert "\n")
       (setq items (cdr items)))
     )
   )
@@ -330,22 +331,7 @@
 	(insert "@w{" ) (end-of-line) (insert "}")
 	    (forward-line 1) (beginning-of-line))))
 
-(defun add-keywords ()
-  (let ((tem tk-control-options)x lis l y)
-    (while tem
-      (setq l (car tem))
-      (setq tem (cdr tem))
-      (setq x (symbol-name (car l )))
-      (setq lis (car (cdr l)))
-      (while lis
-	(cond ((atom lis) (setq lis nil))
-	      (t (setq y (symbol-name (car lis)))
-		 (do-replace (list (list (concat x  " "y "")
-					 (concat x " :"y "")
-					 )))))
-	(setq lis (cdr lis))))))
-
-(setq tk-control-options
+(defvar tk-control-options
       '((after fixnum) 
 	(exit fixnum) 
 	(lower window) 
@@ -375,7 +361,22 @@
 	(update (idletasks)) 
 	))
 
-(setq tk-widget-options
+(defun add-keywords ()
+  (let ((tem tk-control-options)x lis l y)
+    (while tem
+      (setq l (car tem))
+      (setq tem (cdr tem))
+      (setq x (symbol-name (car l )))
+      (setq lis (car (cdr l)))
+      (while lis
+	(cond ((atom lis) (setq lis nil))
+	      (t (setq y (symbol-name (car lis)))
+		 (do-replace (list (list (concat x  " "y "")
+					 (concat x " :"y "")
+					 )))))
+	(setq lis (cdr lis))))))
+
+(defvar tk-widget-options
       '(
 	(button (activate configure deactivate flash invoke)) 
 	(listbox ( configure curselection delete get insert nearest
@@ -404,7 +405,7 @@
 	(toplevel ( configure)) 
 	))
 
-(setq manual-sections
+(defvar manual-sections
       '(after bind button canvas checkbutton destroy  entry exit focus foo frame grab label lbSingSel listbox lower menu menubar menubutton message option options pack-old pack place radiobutton raise scale scrollbar selection send text tk tkerror tkvars tkwait toplevel update winfo wm))
 
 ;(setq widgets (sort (mapcar 'car tk-widget-options) 'string-lessp))
diff -dur gcl-2.6.8.ORIG/elisp/smart-complete.el gcl-2.6.8/elisp/smart-complete.el
--- gcl-2.6.8.ORIG/elisp/smart-complete.el	2001-12-18 13:36:35.000000000 -0700
+++ gcl-2.6.8/elisp/smart-complete.el	2008-12-29 21:15:15.000000000 -0700
@@ -85,8 +85,7 @@
 	(pat (concat (regexp-for-this-prompt prompt)
 		     "\\(" (regexp-quote str) "\\)" ))
 	offered (not-yet t)
-	)
-    (setq bill pat)
+	at this)
     (while (and  not-yet
 		 (re-search-backward pat nil t))
       (goto-char (match-beginning 1))
diff -dur gcl-2.6.8.ORIG/elisp/sshell.el gcl-2.6.8/elisp/sshell.el
--- gcl-2.6.8.ORIG/elisp/sshell.el	2000-10-27 16:09:40.000000000 -0600
+++ gcl-2.6.8/elisp/sshell.el	2008-12-29 21:15:15.000000000 -0700
@@ -119,9 +119,9 @@
 	 (ff
 	  (save-excursion
 	    (skip-chars-backward "[a-z---_0-9$/A-Z~#.]")
-	    (buffer-substring (setq beg (point)) p))))
-    (setq dir (or (file-name-directory ff) default-directory))
-    (setq file (file-name-nondirectory ff))
+	    (buffer-substring (setq beg (point)) p)))
+	 (dir (or (file-name-directory ff) default-directory))
+	 (file (file-name-nondirectory ff)))
     (cond ((and (setq tem (file-name-completion (or file "") dir))
 		(not (equal tem file)))
 	   (cond ((eq tem t))
@@ -181,7 +181,7 @@
 
 (defun make-sshell (name program &optional startfile &rest switches)
   (let ((buffer (get-buffer-create (concat "*" name "*")))
-	proc status size)
+	proc status)
     (setq proc (get-buffer-process buffer))
     (if proc (setq status (process-status proc)))
     (save-excursion
@@ -376,4 +376,4 @@
 	       (point)))
 (require 'smart-complete)
 
-(provide 'sshell)
\ No newline at end of file
+(provide 'sshell)

gcl-2.6.8-extension.patch:

--- NEW FILE gcl-2.6.8-extension.patch ---
diff -dur gcl-2.6.8.ORIG/acconfig.h gcl-2.6.8/acconfig.h
--- gcl-2.6.8.ORIG/acconfig.h	2008-12-29 16:11:21.000000000 -0700
+++ gcl-2.6.8/acconfig.h	2008-12-29 16:17:50.000000000 -0700
@@ -1,3 +1,6 @@
+/* Whether compiling on a glibc-based system */
+#undef _GNU_SOURCE
+
 /* define where the heap could begin.   Normally should
 be the smallest value returned by sbrk().   Underestimating
 by 10-20 megabytes is not a problem. */
@@ -157,7 +160,6 @@
 
 #ifdef IN_NUM_CO
 #ifdef HAVE_ISNORMAL
-#define _GNU_SOURCE
 #include <math.h>
 #define ISNORMAL(a) isnormal(a)
 #else
@@ -178,7 +180,6 @@
 
 #ifdef NEED_ISFINITE
 #ifdef HAVE_ISFINITE
-#define _GNU_SOURCE
 #include <math.h>
 #define ISFINITE(a) isfinite(a)
 #else
diff -dur gcl-2.6.8.ORIG/configure gcl-2.6.8/configure
--- gcl-2.6.8.ORIG/configure	2008-12-29 16:11:21.000000000 -0700
+++ gcl-2.6.8/configure	2008-12-29 16:19:59.000000000 -0700
@@ -691,9 +691,9 @@
 GMPDIR
 GMP
 MAKEINFO
+AWK
 EGREP
 GREP
-AWK
 CPP
 OBJEXT
 EXEEXT
@@ -3524,6 +3524,7 @@
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
+
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -3761,187 +3762,6 @@
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
-
-
-# can only test for numbers -- CM
-# if test "${GCC}" -eq "yes" ; then
-#if [[ "${GCC}" = "yes" ]] ; then
-# Allog for environment variable overrides on compiler selection -- CM
-#GCC=$CC
-#else
-#GCC=""
-#fi
-# subst GCC not only under 386-linux, but where available -- CM
-
-if test "$GCC" = "yes" ; then
-   TCFLAGS="-Wall -DVOL=volatile -fsigned-char"
-else
-   TCFLAGS="-DVOL=volatile -fsigned-char"
-fi
-if test "$GCC" = "yes" ; then
-	TCFLAGS="$TCFLAGS -pipe"
-	case $use in
-	     *mingw*)
-	        echo "WARNING: Remove -fno-zero-initialized-in-bss from makedefs if gcc less than 3.3.1."
-	        echo "         It is ptherwise needed for the Unexec stuff to work."
-		TCFLAGS="$TCFLAGS -fno-zero-initialized-in-bss -mms-bitfields";;
-        esac
-fi
-#if test -f /proc/sys/kernel/exec-shield ; then
-#	exec_stat=`cat /proc/sys/kernel/exec-shield`
-#	if test "$exec_stat" != "0" ; then
-#		# CFLAGS here to hopefully cover the DBEGIN routine below
-#		CFLAGS="$CFLAGS -Wa,--execstack"
-#	fi
-#fi
-
-TO3FLAGS=""
-TO2FLAGS=""
-
-#TFPFLAG="-fomit-frame-pointer"
-# FIXME -- remove when mingw compiler issues are fixed
-case "$use" in
-  *mingw*)
-	TFPFLAG="";;
-   m68k*)#FIXME gcc 4.x bug workaround
-	TFPFLAG="";;
-  *)
-	TFPFLAG="-fomit-frame-pointer";;
-esac
-
-for ac_prog in gawk nawk awk
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_AWK+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$AWK"; then
-  ac_cv_prog_AWK="$AWK" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_AWK="$ac_prog"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-AWK=$ac_cv_prog_AWK
-if test -n "$AWK"; then
-  { $as_echo "$as_me:$LINENO: result: $AWK" >&5
-$as_echo "$AWK" >&6; }
-else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$AWK" && break
-done
-
-
-# Work around system/gprof mips/hppa hang
-case $use in
-  mips*) enable_gprof="no";;
-  hppa*) enable_gprof="no";;
-esac
-
-if test "$enable_gprof" = "yes" ; then
-        TCFLAGS="$TCFLAGS -pg";
-        TLIBS="$TLIBS -pg";
-	TFPFLAG=""
-	cat >>confdefs.h <<\_ACEOF
-#define GCL_GPROF 1
-_ACEOF
-
-	{ $as_echo "$as_me:$LINENO: checking for text start" >&5
-$as_echo_n "checking for text start... " >&6; }
-	echo 'int main () {return(0);}' >foo.c
-	$CC foo.c -o foo
-	GCL_GPROF_START=`nm foo | $AWK  '/  *T  *__*start$/ {print $NF}'`
-	rm -f foo.c foo
-	{ $as_echo "$as_me:$LINENO: result: $GCL_GPROF_START" >&5
-$as_echo "$GCL_GPROF_START" >&6; }
-	cat >>confdefs.h <<_ACEOF
-#define GCL_GPROF_START $GCL_GPROF_START
-_ACEOF
-
-	case "$use" in
-	  arm*)
-	#FIXME report and remove this when done
-		{ $as_echo "$as_me:$LINENO: result: Reducing optimization on profiling arm build to workaround gcc bug" >&5
-$as_echo "Reducing optimization on profiling arm build to workaround gcc bug" >&6; }
-		enable_debug=yes;;
-	esac
-fi
-
-if test "$enable_debug" = "yes" ; then
-	TCFLAGS="$TCFLAGS -g"
-	# for subconfigurations
-	CFLAGS="$CFLAGS -g"
-else
-# FIXME -- remove when mingw compiler issues are fixed
-	case "$use" in
-	  *mingw*)
-		TO3FLAGS="-O3 $TFPFLAG";;
-	  *)
-		TO3FLAGS="-O3 $TFPFLAG";;
-	esac
-#	TO3FLAGS="-O3 $TFPFLAG"
-	TO2FLAGS="-O"
-fi
-
-# gcc on ppc cannot compile our new_init.c with full opts --CM
-TONIFLAGS=""
-case $use in
-     *linux)
-	case $use in
-#		amd64*) # stack-boundary option does not work
-#			TCFLAGS="$TCFLAGS -m64 -mpreferred-stack-boundary=8";;
-		alpha*)
-			TCFLAGS="$TCFLAGS -mieee";;
-#		m68k*)
-#			TCFLAGS="$TCFLAGS -ffloat-store";;
-		hppa*)
-			TCFLAGS="$TCFLAGS -ffunction-sections"
-			if test "$enable_debug" != "yes" ; then TO3FLAGS="-O $TFPFLAG" ; fi
-			if test "$enable_debug" != "yes" ; then TO2FLAGS="-O" ; fi
-			;;
-		arm*)
-			TCFLAGS="$TCFLAGS -mlong-calls -fdollars-in-identifiers -g "
-			if test "$enable_debug" != "yes" ; then TO3FLAGS="-O2" ; fi
-			if test "$enable_debug" != "yes" ; then TO2FLAGS="-O" ; fi
-			;;
-		powerpc*)
-			if $CC -v 2>&1 | grep -q "gcc version 3.2" ; then
-			   echo Reducing optimization for buggy gcc-3.2
-			   if test "$enable_debug" != "yes" ; then TONIFLAGS="-O $TFPFLAG" ; fi
-			fi;
-			echo Probing for longcall
-			if ! $CC -v 2>&1 | $AWK '/^gcc version / {split($3,A,".");if (A[1]+0>3 || (A[1]+0>=3 && A[2]+0>=3)) exit 1;}'; then
-			   echo Enabling longcall on gcc 3.3 or later
-			   TCFLAGS="$TCFLAGS -mlongcall"
-			   echo Reducing optimization for buggy gcc 3.3 or later
-			   if test "$enable_debug" != "yes" ; then TONIFLAGS="-O $TFPFLAG" ; fi
-			fi;;
-	esac;;
-esac
-if test "$enable_pic" = "yes" ; then
-	TCFLAGS="$TCFLAGS -fPIC"
-fi
-
 { $as_echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
 $as_echo_n "checking for grep that handles long lines and -e... " >&6; }
 if test "${ac_cv_path_GREP+set}" = set; then
@@ -4076,85 +3896,6 @@
  EGREP="$ac_cv_path_EGREP"
 
 
-for ac_prog in makeinfo
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_MAKEINFO+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$MAKEINFO"; then
-  ac_cv_prog_MAKEINFO="$MAKEINFO" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_MAKEINFO="$ac_prog"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-MAKEINFO=$ac_cv_prog_MAKEINFO
-if test -n "$MAKEINFO"; then
-  { $as_echo "$as_me:$LINENO: result: $MAKEINFO" >&5
-$as_echo "$MAKEINFO" >&6; }
-else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$MAKEINFO" && break
-done
-test -n "$MAKEINFO" || MAKEINFO=""false""
-
-
-
-# Step 1: set the variable "system" to hold the name and version number
-# for the system.  This can usually be done via the "uname" command, but
-# there are a few systems, like Next, where this doesn't work.
-
-{ $as_echo "$as_me:$LINENO: checking system version (for dynamic loading)" >&5
-$as_echo_n "checking system version (for dynamic loading)... " >&6; }
-if machine=`uname -m` ; then true; else machine=unknown ; fi
-
-if test -f /usr/lib/NextStep/software_version; then
-    system=NEXTSTEP-`${AWK} '/3/,/3/' /usr/lib/NextStep/software_version`
-else
-    system=`uname -s`-`uname -r`
-    if test "$?" -ne 0 ; then
-	{ $as_echo "$as_me:$LINENO: result: unknown (can't find uname command)" >&5
-$as_echo "unknown (can't find uname command)" >&6; }
-	system=unknown
-    else
-	# Special check for weird MP-RAS system (uname returns weird
-	# results, and the version is kept in special file).
-
-	if test -r /etc/.relid -a "X`uname -n`" = "X`uname -s`" ; then
-	    system="MP-RAS-`${AWK} '{print $3}' '/etc/.relid'`"
-	fi
-	if test "`uname -s`" = "AIX" ; then
-	    system=AIX-`uname -v`.`uname -r`
-	fi
-	{ $as_echo "$as_me:$LINENO: result: $system" >&5
-$as_echo "$system" >&6; }
-    fi
-fi
-
-if test "$use" = "powerpc-macosx" ; then
-
-
 { $as_echo "$as_me:$LINENO: checking for ANSI C header files" >&5
 $as_echo_n "checking for ANSI C header files... " >&6; }
 if test "${ac_cv_header_stdc+set}" = set; then
@@ -4406,7 +4147,1483 @@
 done
 
 
-if test "${ac_cv_header_malloc_malloc_h+set}" = set; then
+
+  if test "${ac_cv_header_minix_config_h+set}" = set; then
+  { $as_echo "$as_me:$LINENO: checking for minix/config.h" >&5
+$as_echo_n "checking for minix/config.h... " >&6; }
+if test "${ac_cv_header_minix_config_h+set}" = set; then
+  $as_echo_n "(cached) " >&6
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_minix_config_h" >&5
+$as_echo "$ac_cv_header_minix_config_h" >&6; }
+else
+  # Is the header compilable?
+{ $as_echo "$as_me:$LINENO: checking minix/config.h usability" >&5
+$as_echo_n "checking minix/config.h usability... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+#include <minix/config.h>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_header_compiler=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_header_compiler=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
+
+# Is the header present?
+{ $as_echo "$as_me:$LINENO: checking minix/config.h presence" >&5
+$as_echo_n "checking minix/config.h presence... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <minix/config.h>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
+  ac_header_preproc=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  ac_header_preproc=no
+fi
+
+rm -f conftest.err conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
+
+# So?  What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+  yes:no: )
+    { $as_echo "$as_me:$LINENO: WARNING: minix/config.h: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: minix/config.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: minix/config.h: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: minix/config.h: proceeding with the compiler's result" >&2;}
+    ac_header_preproc=yes
+    ;;
+  no:yes:* )
+    { $as_echo "$as_me:$LINENO: WARNING: minix/config.h: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: minix/config.h: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: minix/config.h:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: minix/config.h:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: minix/config.h: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: minix/config.h: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: minix/config.h:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: minix/config.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: minix/config.h: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: minix/config.h: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: minix/config.h: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: minix/config.h: in the future, the compiler will take precedence" >&2;}
+
+    ;;
+esac
+{ $as_echo "$as_me:$LINENO: checking for minix/config.h" >&5
+$as_echo_n "checking for minix/config.h... " >&6; }
+if test "${ac_cv_header_minix_config_h+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  ac_cv_header_minix_config_h=$ac_header_preproc
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_minix_config_h" >&5
+$as_echo "$ac_cv_header_minix_config_h" >&6; }
+
+fi
+if test "x$ac_cv_header_minix_config_h" = x""yes; then
+  MINIX=yes
+else
+  MINIX=
+fi
+
+
+  if test "$MINIX" = yes; then
+
+cat >>confdefs.h <<\_ACEOF
+#define _POSIX_SOURCE 1
+_ACEOF
+
+
+cat >>confdefs.h <<\_ACEOF
+#define _POSIX_1_SOURCE 2
+_ACEOF
+
+
+cat >>confdefs.h <<\_ACEOF
+#define _MINIX 1
+_ACEOF
+
+  fi
+
+
+
+  { $as_echo "$as_me:$LINENO: checking whether it is safe to define __EXTENSIONS__" >&5
+$as_echo_n "checking whether it is safe to define __EXTENSIONS__... " >&6; }
+if test "${ac_cv_safe_to_define___extensions__+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+#	  define __EXTENSIONS__ 1
+	  $ac_includes_default
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_cv_safe_to_define___extensions__=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_safe_to_define___extensions__=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_safe_to_define___extensions__" >&5
+$as_echo "$ac_cv_safe_to_define___extensions__" >&6; }
+  test $ac_cv_safe_to_define___extensions__ = yes &&
+    cat >>confdefs.h <<\_ACEOF
+#define __EXTENSIONS__ 1
+_ACEOF
+
+  cat >>confdefs.h <<\_ACEOF
+#define _ALL_SOURCE 1
+_ACEOF
+
+  cat >>confdefs.h <<\_ACEOF
+#define _GNU_SOURCE 1
+_ACEOF
+
+  cat >>confdefs.h <<\_ACEOF
+#define _POSIX_PTHREAD_SEMANTICS 1
+_ACEOF
+
+  cat >>confdefs.h <<\_ACEOF
+#define _TANDEM_SOURCE 1
+_ACEOF
+
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
+set dummy ${ac_tool_prefix}gcc; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_CC+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_CC="${ac_tool_prefix}gcc"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+  { $as_echo "$as_me:$LINENO: result: $CC" >&5
+$as_echo "$CC" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_CC"; then
+  ac_ct_CC=$CC
+  # Extract the first word of "gcc", so it can be a program name with args.
+set dummy gcc; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_CC"; then
+  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_ac_ct_CC="gcc"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_CC=$ac_cv_prog_ac_ct_CC
+if test -n "$ac_ct_CC"; then
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+$as_echo "$ac_ct_CC" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_CC" = x; then
+    CC=""
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    CC=$ac_ct_CC
+  fi
+else
+  CC="$ac_cv_prog_CC"
+fi
+
+if test -z "$CC"; then
+          if test -n "$ac_tool_prefix"; then
+    # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
+set dummy ${ac_tool_prefix}cc; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_CC+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_CC="${ac_tool_prefix}cc"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+  { $as_echo "$as_me:$LINENO: result: $CC" >&5
+$as_echo "$CC" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  fi
+fi
+if test -z "$CC"; then
+  # Extract the first word of "cc", so it can be a program name with args.
+set dummy cc; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_CC+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+  ac_prog_rejected=no
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
+       ac_prog_rejected=yes
+       continue
+     fi
+    ac_cv_prog_CC="cc"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+if test $ac_prog_rejected = yes; then
+  # We found a bogon in the path, so make sure we never use it.
+  set dummy $ac_cv_prog_CC
+  shift
+  if test $# != 0; then
+    # We chose a different compiler from the bogus one.
+    # However, it has the same basename, so the bogon will be chosen
+    # first if we set CC to just the basename; use the full file name.
+    shift
+    ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
+  fi
+fi
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+  { $as_echo "$as_me:$LINENO: result: $CC" >&5
+$as_echo "$CC" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$CC"; then
+  if test -n "$ac_tool_prefix"; then
+  for ac_prog in cl.exe
+  do
+    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_CC+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+  { $as_echo "$as_me:$LINENO: result: $CC" >&5
+$as_echo "$CC" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+    test -n "$CC" && break
+  done
+fi
+if test -z "$CC"; then
+  ac_ct_CC=$CC
+  for ac_prog in cl.exe
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_CC"; then
+  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_ac_ct_CC="$ac_prog"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_CC=$ac_cv_prog_ac_ct_CC
+if test -n "$ac_ct_CC"; then
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+$as_echo "$ac_ct_CC" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  test -n "$ac_ct_CC" && break
+done
+
+  if test "x$ac_ct_CC" = x; then
+    CC=""
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    CC=$ac_ct_CC
+  fi
+fi
+
+fi
+
+
+test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
+See \`config.log' for more details." >&5
+$as_echo "$as_me: error: no acceptable C compiler found in \$PATH
+See \`config.log' for more details." >&2;}
+   { (exit 1); exit 1; }; }; }
+
+# Provide some information about the compiler.
+$as_echo "$as_me:$LINENO: checking for C compiler version" >&5
+set X $ac_compile
+ac_compiler=$2
+{ (ac_try="$ac_compiler --version >&5"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compiler --version >&5") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }
+{ (ac_try="$ac_compiler -v >&5"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compiler -v >&5") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }
+{ (ac_try="$ac_compiler -V >&5"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compiler -V >&5") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }
+
+{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
+$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
+if test "${ac_cv_c_compiler_gnu+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+int
+main ()
+{
+#ifndef __GNUC__
+       choke me
+#endif
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_compiler_gnu=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_compiler_gnu=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ac_cv_c_compiler_gnu=$ac_compiler_gnu
+
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
+$as_echo "$ac_cv_c_compiler_gnu" >&6; }
+if test $ac_compiler_gnu = yes; then
+  GCC=yes
+else
+  GCC=
+fi
+ac_test_CFLAGS=${CFLAGS+set}
+ac_save_CFLAGS=$CFLAGS
+{ $as_echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
+$as_echo_n "checking whether $CC accepts -g... " >&6; }
+if test "${ac_cv_prog_cc_g+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  ac_save_c_werror_flag=$ac_c_werror_flag
+   ac_c_werror_flag=yes
+   ac_cv_prog_cc_g=no
+   CFLAGS="-g"
+   cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_cv_prog_cc_g=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	CFLAGS=""
+      cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  :
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_c_werror_flag=$ac_save_c_werror_flag
+	 CFLAGS="-g"
+	 cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_cv_prog_cc_g=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+   ac_c_werror_flag=$ac_save_c_werror_flag
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
+$as_echo "$ac_cv_prog_cc_g" >&6; }
+if test "$ac_test_CFLAGS" = set; then
+  CFLAGS=$ac_save_CFLAGS
+elif test $ac_cv_prog_cc_g = yes; then
+  if test "$GCC" = yes; then
+    CFLAGS="-g -O2"
+  else
+    CFLAGS="-g"
+  fi
+else
+  if test "$GCC" = yes; then
+    CFLAGS="-O2"
+  else
+    CFLAGS=
+  fi
+fi
+{ $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
+$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
+if test "${ac_cv_prog_cc_c89+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  ac_cv_prog_cc_c89=no
+ac_save_CC=$CC
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <stdarg.h>
+#include <stdio.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+/* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
+struct buf { int x; };
+FILE * (*rcsopen) (struct buf *, struct stat *, int);
+static char *e (p, i)
+     char **p;
+     int i;
+{
+  return p[i];
+}
+static char *f (char * (*g) (char **, int), char **p, ...)
+{
+  char *s;
+  va_list v;
+  va_start (v,p);
+  s = g (p, va_arg (v,int));
+  va_end (v);
+  return s;
+}
+
+/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
+   function prototypes and stuff, but not '\xHH' hex character constants.
+   These don't provoke an error unfortunately, instead are silently treated
+   as 'x'.  The following induces an error, until -std is added to get
+   proper ANSI mode.  Curiously '\x00'!='x' always comes out true, for an
+   array size at least.  It's necessary to write '\x00'==0 to get something
+   that's true only with -std.  */
+int osf4_cc_array ['\x00' == 0 ? 1 : -1];
+
+/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
+   inside strings and character constants.  */
+#define FOO(x) 'x'
+int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
+
+int test (int i, double x);
+struct s1 {int (*f) (int a);};
+struct s2 {int (*f) (double a);};
+int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
+int argc;
+char **argv;
+int
+main ()
+{
+return f (e, argv, 0) != argv[0]  ||  f (e, argv, 1) != argv[1];
+  ;
+  return 0;
+}
+_ACEOF
+for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
+	-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
+do
+  CC="$ac_save_CC $ac_arg"
+  rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_cv_prog_cc_c89=$ac_arg
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
+fi
+
+rm -f core conftest.err conftest.$ac_objext
+  test "x$ac_cv_prog_cc_c89" != "xno" && break
+done
+rm -f conftest.$ac_ext
+CC=$ac_save_CC
+
+fi
+# AC_CACHE_VAL
+case "x$ac_cv_prog_cc_c89" in
+  x)
+    { $as_echo "$as_me:$LINENO: result: none needed" >&5
+$as_echo "none needed" >&6; } ;;
+  xno)
+    { $as_echo "$as_me:$LINENO: result: unsupported" >&5
+$as_echo "unsupported" >&6; } ;;
+  *)
+    CC="$CC $ac_cv_prog_cc_c89"
+    { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
+$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
+esac
+
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+{ $as_echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
+$as_echo_n "checking how to run the C preprocessor... " >&6; }
+# On Suns, sometimes $CPP names a directory.
+if test -n "$CPP" && test -d "$CPP"; then
+  CPP=
+fi
+if test -z "$CPP"; then
+  if test "${ac_cv_prog_CPP+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+      # Double quotes because CPP needs to be expanded
+    for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
+    do
+      ac_preproc_ok=false
+for ac_c_preproc_warn_flag in '' yes
+do
+  # Use a header file that comes with gcc, so configuring glibc
+  # with a fresh cross-compiler works.
+  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+  # <limits.h> exists even on freestanding compilers.
+  # On the NeXT, cc -E runs the code through the compiler's parser,
+  # not just through cpp. "Syntax error" is here to catch this case.
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+		     Syntax error
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
+  :
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  # Broken: fails on valid input.
+continue
+fi
+
+rm -f conftest.err conftest.$ac_ext
+
+  # OK, works on sane cases.  Now check whether nonexistent headers
+  # can be detected and how.
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <ac_nonexistent.h>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
+  # Broken: success on invalid input.
+continue
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  # Passes both tests.
+ac_preproc_ok=:
+break
+fi
+
+rm -f conftest.err conftest.$ac_ext
+
+done
+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+rm -f conftest.err conftest.$ac_ext
+if $ac_preproc_ok; then
+  break
+fi
+
+    done
+    ac_cv_prog_CPP=$CPP
+
+fi
+  CPP=$ac_cv_prog_CPP
+else
+  ac_cv_prog_CPP=$CPP
+fi
+{ $as_echo "$as_me:$LINENO: result: $CPP" >&5
+$as_echo "$CPP" >&6; }
+ac_preproc_ok=false
+for ac_c_preproc_warn_flag in '' yes
+do
+  # Use a header file that comes with gcc, so configuring glibc
+  # with a fresh cross-compiler works.
+  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+  # <limits.h> exists even on freestanding compilers.
+  # On the NeXT, cc -E runs the code through the compiler's parser,
+  # not just through cpp. "Syntax error" is here to catch this case.
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+		     Syntax error
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
+  :
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  # Broken: fails on valid input.
+continue
+fi
+
+rm -f conftest.err conftest.$ac_ext
+
+  # OK, works on sane cases.  Now check whether nonexistent headers
+  # can be detected and how.
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <ac_nonexistent.h>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
+  # Broken: success on invalid input.
+continue
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  # Passes both tests.
+ac_preproc_ok=:
+break
+fi
+
+rm -f conftest.err conftest.$ac_ext
+
+done
+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+rm -f conftest.err conftest.$ac_ext
+if $ac_preproc_ok; then
+  :
+else
+  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
+See \`config.log' for more details." >&5
+$as_echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
+See \`config.log' for more details." >&2;}
+   { (exit 1); exit 1; }; }; }
+fi
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+
+
+# can only test for numbers -- CM
+# if test "${GCC}" -eq "yes" ; then
+#if [[ "${GCC}" = "yes" ]] ; then
+# Allog for environment variable overrides on compiler selection -- CM
+#GCC=$CC
+#else
+#GCC=""
+#fi
+# subst GCC not only under 386-linux, but where available -- CM
+
+if test "$GCC" = "yes" ; then
+   TCFLAGS="-Wall -DVOL=volatile -fsigned-char"
+else
+   TCFLAGS="-DVOL=volatile -fsigned-char"
+fi
+if test "$GCC" = "yes" ; then
+	TCFLAGS="$TCFLAGS -pipe"
+	case $use in
+	     *mingw*)
+	        echo "WARNING: Remove -fno-zero-initialized-in-bss from makedefs if gcc less than 3.3.1."
+	        echo "         It is ptherwise needed for the Unexec stuff to work."
+		TCFLAGS="$TCFLAGS -fno-zero-initialized-in-bss -mms-bitfields";;
+        esac
+fi
+#if test -f /proc/sys/kernel/exec-shield ; then
+#	exec_stat=`cat /proc/sys/kernel/exec-shield`
+#	if test "$exec_stat" != "0" ; then
+#		# CFLAGS here to hopefully cover the DBEGIN routine below
+#		CFLAGS="$CFLAGS -Wa,--execstack"
+#	fi
+#fi
+
+TO3FLAGS=""
+TO2FLAGS=""
+
+#TFPFLAG="-fomit-frame-pointer"
+# FIXME -- remove when mingw compiler issues are fixed
+case "$use" in
+  *mingw*)
+	TFPFLAG="";;
+   m68k*)#FIXME gcc 4.x bug workaround
+	TFPFLAG="";;
+  *)
+	TFPFLAG="-fomit-frame-pointer";;
+esac
+
+for ac_prog in gawk nawk awk
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_AWK+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$AWK"; then
+  ac_cv_prog_AWK="$AWK" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_AWK="$ac_prog"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+AWK=$ac_cv_prog_AWK
+if test -n "$AWK"; then
+  { $as_echo "$as_me:$LINENO: result: $AWK" >&5
+$as_echo "$AWK" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  test -n "$AWK" && break
+done
+
+
+# Work around system/gprof mips/hppa hang
+case $use in
+  mips*) enable_gprof="no";;
+  hppa*) enable_gprof="no";;
+esac
+
+if test "$enable_gprof" = "yes" ; then
+        TCFLAGS="$TCFLAGS -pg";
+        TLIBS="$TLIBS -pg";
+	TFPFLAG=""
+	cat >>confdefs.h <<\_ACEOF
+#define GCL_GPROF 1
+_ACEOF
+
+	{ $as_echo "$as_me:$LINENO: checking for text start" >&5
+$as_echo_n "checking for text start... " >&6; }
+	echo 'int main () {return(0);}' >foo.c
+	$CC foo.c -o foo
+	GCL_GPROF_START=`nm foo | $AWK  '/  *T  *__*start$/ {print $NF}'`
+	rm -f foo.c foo
+	{ $as_echo "$as_me:$LINENO: result: $GCL_GPROF_START" >&5
+$as_echo "$GCL_GPROF_START" >&6; }
+	cat >>confdefs.h <<_ACEOF
+#define GCL_GPROF_START $GCL_GPROF_START
+_ACEOF
+
+	case "$use" in
+	  arm*)
+	#FIXME report and remove this when done
+		{ $as_echo "$as_me:$LINENO: result: Reducing optimization on profiling arm build to workaround gcc bug" >&5
+$as_echo "Reducing optimization on profiling arm build to workaround gcc bug" >&6; }
+		enable_debug=yes;;
+	esac
+fi
+
+if test "$enable_debug" = "yes" ; then
+	TCFLAGS="$TCFLAGS -g"
+	# for subconfigurations
+	CFLAGS="$CFLAGS -g"
+else
+# FIXME -- remove when mingw compiler issues are fixed
+	case "$use" in
+	  *mingw*)
+		TO3FLAGS="-O3 $TFPFLAG";;
+	  *)
+		TO3FLAGS="-O3 $TFPFLAG";;
+	esac
+#	TO3FLAGS="-O3 $TFPFLAG"
+	TO2FLAGS="-O"
+fi
+
+# gcc on ppc cannot compile our new_init.c with full opts --CM
+TONIFLAGS=""
+case $use in
+     *linux)
+	case $use in
+#		amd64*) # stack-boundary option does not work
+#			TCFLAGS="$TCFLAGS -m64 -mpreferred-stack-boundary=8";;
+		alpha*)
+			TCFLAGS="$TCFLAGS -mieee";;
+#		m68k*)
+#			TCFLAGS="$TCFLAGS -ffloat-store";;
+		hppa*)
+			TCFLAGS="$TCFLAGS -ffunction-sections"
+			if test "$enable_debug" != "yes" ; then TO3FLAGS="-O $TFPFLAG" ; fi
+			if test "$enable_debug" != "yes" ; then TO2FLAGS="-O" ; fi
+			;;
+		arm*)
+			TCFLAGS="$TCFLAGS -mlong-calls -fdollars-in-identifiers -g "
+			if test "$enable_debug" != "yes" ; then TO3FLAGS="-O2" ; fi
+			if test "$enable_debug" != "yes" ; then TO2FLAGS="-O" ; fi
+			;;
+		powerpc*)
+			if $CC -v 2>&1 | grep -q "gcc version 3.2" ; then
+			   echo Reducing optimization for buggy gcc-3.2
+			   if test "$enable_debug" != "yes" ; then TONIFLAGS="-O $TFPFLAG" ; fi
+			fi;
+			echo Probing for longcall
+			if ! $CC -v 2>&1 | $AWK '/^gcc version / {split($3,A,".");if (A[1]+0>3 || (A[1]+0>=3 && A[2]+0>=3)) exit 1;}'; then
+			   echo Enabling longcall on gcc 3.3 or later
+			   TCFLAGS="$TCFLAGS -mlongcall"
+			   echo Reducing optimization for buggy gcc 3.3 or later
+			   if test "$enable_debug" != "yes" ; then TONIFLAGS="-O $TFPFLAG" ; fi
+			fi;;
+	esac;;
+esac
+if test "$enable_pic" = "yes" ; then
+	TCFLAGS="$TCFLAGS -fPIC"
+fi
+
+{ $as_echo "$as_me:$LINENO: checking for egrep" >&5
+$as_echo_n "checking for egrep... " >&6; }
+if test "${ac_cv_path_EGREP+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
+   then ac_cv_path_EGREP="$GREP -E"
+   else
+     if test -z "$EGREP"; then
+  ac_path_EGREP_found=false
+  # Loop through the user's path and test for each of PROGNAME-LIST
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_prog in egrep; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
+      { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
+# Check for GNU ac_path_EGREP and select it if it is found.
+  # Check for GNU $ac_path_EGREP
+case `"$ac_path_EGREP" --version 2>&1` in
+*GNU*)
+  ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
+*)
+  ac_count=0
+  $as_echo_n 0123456789 >"conftest.in"
+  while :
+  do
+    cat "conftest.in" "conftest.in" >"conftest.tmp"
+    mv "conftest.tmp" "conftest.in"
+    cp "conftest.in" "conftest.nl"
+    $as_echo 'EGREP' >> "conftest.nl"
+    "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
+    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+    ac_count=`expr $ac_count + 1`
+    if test $ac_count -gt ${ac_path_EGREP_max-0}; then
+      # Best one so far, save it but keep looking for a better one
+      ac_cv_path_EGREP="$ac_path_EGREP"
+      ac_path_EGREP_max=$ac_count
+    fi
+    # 10*(2^10) chars as input seems more than enough
+    test $ac_count -gt 10 && break
+  done
+  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+esac
+
+      $ac_path_EGREP_found && break 3
+    done
+  done
+done
+IFS=$as_save_IFS
+  if test -z "$ac_cv_path_EGREP"; then
+    { { $as_echo "$as_me:$LINENO: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
+$as_echo "$as_me: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
+   { (exit 1); exit 1; }; }
+  fi
+else
+  ac_cv_path_EGREP=$EGREP
+fi
+
+   fi
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
+$as_echo "$ac_cv_path_EGREP" >&6; }
+ EGREP="$ac_cv_path_EGREP"
+
+
+for ac_prog in makeinfo
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_MAKEINFO+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$MAKEINFO"; then
+  ac_cv_prog_MAKEINFO="$MAKEINFO" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_MAKEINFO="$ac_prog"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+MAKEINFO=$ac_cv_prog_MAKEINFO
+if test -n "$MAKEINFO"; then
+  { $as_echo "$as_me:$LINENO: result: $MAKEINFO" >&5
+$as_echo "$MAKEINFO" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  test -n "$MAKEINFO" && break
+done
+test -n "$MAKEINFO" || MAKEINFO=""false""
+
+
+
+# Step 1: set the variable "system" to hold the name and version number
+# for the system.  This can usually be done via the "uname" command, but
+# there are a few systems, like Next, where this doesn't work.
+
+{ $as_echo "$as_me:$LINENO: checking system version (for dynamic loading)" >&5
+$as_echo_n "checking system version (for dynamic loading)... " >&6; }
+if machine=`uname -m` ; then true; else machine=unknown ; fi
+
+if test -f /usr/lib/NextStep/software_version; then
+    system=NEXTSTEP-`${AWK} '/3/,/3/' /usr/lib/NextStep/software_version`
+else
+    system=`uname -s`-`uname -r`
+    if test "$?" -ne 0 ; then
+	{ $as_echo "$as_me:$LINENO: result: unknown (can't find uname command)" >&5
+$as_echo "unknown (can't find uname command)" >&6; }
+	system=unknown
+    else
+	# Special check for weird MP-RAS system (uname returns weird
+	# results, and the version is kept in special file).
+
+	if test -r /etc/.relid -a "X`uname -n`" = "X`uname -s`" ; then
+	    system="MP-RAS-`${AWK} '{print $3}' '/etc/.relid'`"
+	fi
+	if test "`uname -s`" = "AIX" ; then
+	    system=AIX-`uname -v`.`uname -r`
+	fi
+	{ $as_echo "$as_me:$LINENO: result: $system" >&5
+$as_echo "$system" >&6; }
+    fi
+fi
+
+if test "$use" = "powerpc-macosx" ; then
+   if test "${ac_cv_header_malloc_malloc_h+set}" = set; then
   { $as_echo "$as_me:$LINENO: checking for malloc/malloc.h" >&5
 $as_echo_n "checking for malloc/malloc.h... " >&6; }
 if test "${ac_cv_header_malloc_malloc_h+set}" = set; then
@@ -11349,7 +12566,6 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-		#define _GNU_SOURCE
 		#include <math.h>
 
 int
@@ -11488,7 +12704,6 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-		#define _GNU_SOURCE
 		#include <math.h>
 
 int
diff -dur gcl-2.6.8.ORIG/configure.in gcl-2.6.8/configure.in
--- gcl-2.6.8.ORIG/configure.in	2008-12-29 16:11:21.000000000 -0700
+++ gcl-2.6.8/configure.in	2008-12-29 16:19:46.000000000 -0700
@@ -442,6 +442,7 @@
 	LDFLAGS=" "
 fi
 
+AC_USE_SYSTEM_EXTENSIONS
 AC_PROG_CC
 AC_PROG_CPP
 AC_SUBST(CC)
@@ -1339,7 +1340,6 @@
 #
 AC_MSG_CHECKING([for isnormal])
 AC_RUN_IFELSE([AC_LANG_PROGRAM([[
-		#define _GNU_SOURCE
 		#include <math.h>
 		]],[[
 		float f;
@@ -1367,7 +1367,6 @@
 
 AC_MSG_CHECKING([for isfinite])
 AC_RUN_IFELSE([AC_LANG_PROGRAM([[
-		#define _GNU_SOURCE
 		#include <math.h>
 		]],[[
 		float f;
diff -dur gcl-2.6.8.ORIG/h/gclincl.h.in gcl-2.6.8/h/gclincl.h.in
--- gcl-2.6.8.ORIG/h/gclincl.h.in	2008-12-29 16:11:21.000000000 -0700
+++ gcl-2.6.8/h/gclincl.h.in	2008-12-29 16:19:33.000000000 -0700
@@ -1,4 +1,7 @@
 /* h/gclincl.h.in.  Generated from configure.in by autoheader.  */
+/* Whether compiling on a glibc-based system */
+#undef _GNU_SOURCE
+
 /* define where the heap could begin.   Normally should
 be the smallest value returned by sbrk().   Underestimating
 by 10-20 megabytes is not a problem. */
@@ -158,7 +161,6 @@
 
 #ifdef IN_NUM_CO
 #ifdef HAVE_ISNORMAL
-#define _GNU_SOURCE
 #include <math.h>
 #define ISNORMAL(a) isnormal(a)
 #else
@@ -179,7 +181,6 @@
 
 #ifdef NEED_ISFINITE
 #ifdef HAVE_ISFINITE
-#define _GNU_SOURCE
 #include <math.h>
 #define ISFINITE(a) isfinite(a)
 #else
@@ -368,5 +369,37 @@
 /* Define to 1 if you have the ANSI C header files. */
 #undef STDC_HEADERS
 
+/* Enable extensions on AIX 3, Interix.  */
+#ifndef _ALL_SOURCE
+# undef _ALL_SOURCE
+#endif
+/* Enable GNU extensions on systems that have them.  */
+#ifndef _GNU_SOURCE
+# undef _GNU_SOURCE
+#endif
+/* Enable threading extensions on Solaris.  */
+#ifndef _POSIX_PTHREAD_SEMANTICS
+# undef _POSIX_PTHREAD_SEMANTICS
+#endif
+/* Enable extensions on HP NonStop.  */
+#ifndef _TANDEM_SOURCE
+# undef _TANDEM_SOURCE
+#endif
+/* Enable general extensions on Solaris.  */
+#ifndef __EXTENSIONS__
+# undef __EXTENSIONS__
+#endif
+
+
 /* Define to 1 if the X Window System is missing or not being used. */
 #undef X_DISPLAY_MISSING
+
+/* Define to 1 if on MINIX. */
+#undef _MINIX
+
+/* Define to 2 if the system does not provide POSIX.1 features except with
+   this defined. */
+#undef _POSIX_1_SOURCE
+
+/* Define to 1 if you need to in order for `stat' and other things to work. */
+#undef _POSIX_SOURCE

gcl-2.6.8-fd-leak.patch:

--- NEW FILE gcl-2.6.8-fd-leak.patch ---
diff -dur gcl-2.6.8.ORIG/o/run_process.c gcl-2.6.8/o/run_process.c
--- gcl-2.6.8.ORIG/o/run_process.c	2006-09-15 11:45:18.000000000 -0600
+++ gcl-2.6.8/o/run_process.c	2008-12-29 17:22:10.000000000 -0700
@@ -526,10 +526,10 @@
   fdout = ostream->sm.sm_int0;
   if (fork() == 0)
     { /* the child --- replace standard in and out with descriptors given */
-      close(0);
-      dup(fdin);
-      close(1);
-      dup(fdout);
+      dup2(fdin, 0);
+      dup2(fdout, 1);
+      close(fdin);
+      close(fdout);
       fprintf(stderr, "\n***** Spawning process %s ", pname);
       if (execvp(pname, argv) == -1)
 	{

gcl-2.6.8-getcwd.patch:

--- NEW FILE gcl-2.6.8-getcwd.patch ---
diff -dur gcl-2.6.8.ORIG/o/unixfsys.c gcl-2.6.8/o/unixfsys.c
--- gcl-2.6.8.ORIG/o/unixfsys.c	2008-12-29 17:34:57.000000000 -0700
+++ gcl-2.6.8/o/unixfsys.c	2008-12-29 17:39:10.000000000 -0700
@@ -149,18 +149,6 @@
 #define MAXPATHLEN 512
 #endif
 
-
-#ifdef HAVE_GETCWD
-char *
-getwd(char *buffer)
-{
-#ifndef _WIN32    
-	char *getcwd(char *, size_t);
-#endif
-	return(getcwd(buffer, MAXPATHLEN));
-}
-#endif
-
 #ifdef DGUX
 
 
@@ -278,6 +266,8 @@
         if ( 0 == current_directory_length ) { 
            FEerror ( "truename could not determine the current directory.", 1, "" ); 
         } 
+#elif defined(HAVE_GETCWD)
+	getcwd(current_directory, MAXPATHLEN);
 #else 
         getwd(current_directory); 
 #endif 
@@ -361,6 +351,8 @@
                     FEerror ( "truename could not determine the current directory.", 1, "" ); 
                 } 
                 p = directory; 
+#elif defined(HAVE_GETCWD)
+		p = getcwd(directory, MAXPATHLEN);
 #else 
 		p = getwd(directory);
 #endif                

gcl-2.6.8-infrastructure.patch:

--- NEW FILE gcl-2.6.8-infrastructure.patch ---
diff -dur gcl-2.6.8.ORIG/config.guess gcl-2.6.8/config.guess
--- gcl-2.6.8.ORIG/config.guess	2005-08-11 09:02:25.000000000 -0600
+++ gcl-2.6.8/config.guess	2008-12-29 21:48:11.000000000 -0700
@@ -1,9 +1,10 @@
 #! /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 Free Software Foundation, Inc.
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
+#   Free Software Foundation, Inc.
 
-timestamp='2005-04-22'
+timestamp='2008-12-19'
 
 # 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
@@ -17,13 +18,15 @@
 #
 # 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.
+# 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.
@@ -53,8 +56,8 @@
 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.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
+2002, 2003, 2004, 2005, 2006, 2007, 2008 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."
@@ -66,11 +69,11 @@
 while test $# -gt 0 ; do
   case $1 in
     --time-stamp | --time* | -t )
-       echo "$timestamp" ; exit 0 ;;
+       echo "$timestamp" ; exit ;;
     --version | -v )
-       echo "$version" ; exit 0 ;;
+       echo "$version" ; exit ;;
     --help | --h* | -h )
-       echo "$usage"; exit 0 ;;
+       echo "$usage"; exit ;;
     -- )     # Stop option processing
        shift; break ;;
     - )	# Use stdin as input.
@@ -104,7 +107,7 @@
 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 -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$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 ; } ;
@@ -123,7 +126,7 @@
 	;;
  ,,*)   CC_FOR_BUILD=$CC ;;
  ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
-esac ;'
+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)
@@ -158,6 +161,7 @@
 	    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
@@ -196,55 +200,23 @@
 	# contains redundant information, the shorter form:
 	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
 	echo "${machine}-${os}${release}"
-	exit 0 ;;
-    amd64:OpenBSD:*:*)
-	echo x86_64-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    amiga:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    cats:OpenBSD:*:*)
-	echo arm-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    hp300:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    luna88k:OpenBSD:*:*)
-    	echo m88k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    mac68k:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    macppc:OpenBSD:*:*)
-	echo powerpc-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    mvme68k:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    mvme88k:OpenBSD:*:*)
-	echo m88k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    mvmeppc:OpenBSD:*:*)
-	echo powerpc-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    sgi:OpenBSD:*:*)
-	echo mips64-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    sun3:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     *:OpenBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
+	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 0 ;;
+	exit ;;
+    *:SolidBSD:*:*)
+	echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
+	exit ;;
     macppc:MirBSD:*:*)
-	echo powerppc-unknown-mirbsd${UNAME_RELEASE}
-	exit 0 ;;
+	echo powerpc-unknown-mirbsd${UNAME_RELEASE}
+	exit ;;
     *:MirBSD:*:*)
 	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     alpha:OSF1:*:*)
 	case $UNAME_RELEASE in
 	*4.0)
@@ -297,40 +269,43 @@
 	# 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 0 ;;
+	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 0 ;;
+	exit ;;
     21064:Windows_NT:50:3)
 	echo alpha-dec-winnt3.5
-	exit 0 ;;
+	exit ;;
     Amiga*:UNIX_System_V:4.0:*)
 	echo m68k-unknown-sysv4
-	exit 0;;
+	exit ;;
     *:[Aa]miga[Oo][Ss]:*:*)
 	echo ${UNAME_MACHINE}-unknown-amigaos
-	exit 0 ;;
+	exit ;;
     *:[Mm]orph[Oo][Ss]:*:*)
 	echo ${UNAME_MACHINE}-unknown-morphos
-	exit 0 ;;
+	exit ;;
     *:OS/390:*:*)
 	echo i370-ibm-openedition
-	exit 0 ;;
+	exit ;;
     *:z/VM:*:*)
 	echo s390-ibm-zvmoe
-	exit 0 ;;
+	exit ;;
     *:OS400:*:*)
         echo powerpc-ibm-os400
-	exit 0 ;;
+	exit ;;
     arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
 	echo arm-acorn-riscix${UNAME_RELEASE}
-	exit 0;;
+	exit ;;
+    arm:riscos:*:*|arm:RISCOS:*:*)
+	echo arm-unknown-riscos
[...38960 lines suppressed...]
 		IFS="$save_ifs"
+		eval cmd=\"$cmd\"
 		$show "$cmd"
 		$run eval "$cmd"
-		if test $? != 0 && test "$rmforce" != yes; then
+		if test "$?" -ne 0 && test "$rmforce" != yes; then
 		  exit_status=1
 		fi
 	      done
 	      IFS="$save_ifs"
 	    fi
 	    # FIXME: should reinstall the best remaining shared library.
-	  fi
+	    ;;
+	  esac
 	fi
 	;;
 
       *.lo)
 	# Possibly a libtool object, so verify it.
-	if (sed -e '2q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
+	if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
 
-          # Read the .lo file
-          . $dir/$name
+	  # Read the .lo file
+	  . $dir/$name
 
 	  # Add PIC object to the list of files to remove.
-          if test -n "$pic_object" \
-             && test "$pic_object" != none; then
+	  if test -n "$pic_object" \
+	     && test "$pic_object" != none; then
 	    rmfiles="$rmfiles $dir/$pic_object"
-          fi
+	  fi
 
 	  # Add non-PIC object to the list of files to remove.
-          if test -n "$non_pic_object" \
-             && test "$non_pic_object" != none; then
+	  if test -n "$non_pic_object" \
+	     && test "$non_pic_object" != none; then
 	    rmfiles="$rmfiles $dir/$non_pic_object"
-          fi
+	  fi
 	fi
 	;;
 
       *)
-	# Do a test to see if this is a libtool program.
-	if test $mode = clean &&
-	   (sed -e '4q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
-	  relink_command=
-	  . $dir/$file
+	if test "$mode" = clean ; then
+	  noexename=$name
+	  case $file in
+	  *.exe)
+	    file=`$echo $file|${SED} 's,.exe$,,'`
+	    noexename=`$echo $name|${SED} 's,.exe$,,'`
+	    # $file with .exe has already been added to rmfiles,
+	    # add $file without .exe
+	    rmfiles="$rmfiles $file"
+	    ;;
+	  esac
+	  # Do a test to see if this is a libtool program.
+	  if (${SED} -e '4q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
+	    relink_command=
+	    . $dir/$noexename
 
-	  rmfiles="$rmfiles $objdir/$name $objdir/${name}S.${objext}"
-	  if test "$fast_install" = yes && test -n "$relink_command"; then
-	    rmfiles="$rmfiles $objdir/lt-$name"
+	    # note $name still contains .exe if it was in $file originally
+	    # as does the version of $file that was added into $rmfiles
+	    rmfiles="$rmfiles $objdir/$name $objdir/${name}S.${objext}"
+	    if test "$fast_install" = yes && test -n "$relink_command"; then
+	      rmfiles="$rmfiles $objdir/lt-$name"
+	    fi
+	    if test "X$noexename" != "X$name" ; then
+	      rmfiles="$rmfiles $objdir/lt-${noexename}.c"
+	    fi
 	  fi
 	fi
 	;;
@@ -5226,6 +6700,7 @@
       $show "$rm $rmfiles"
       $run $rm $rmfiles || exit_status=1
     done
+    objdir="$origobjdir"
 
     # Try to remove the ${objdir}s in the directories where we deleted files
     for dir in $rmdirs; do
@@ -5241,20 +6716,20 @@
   "")
     $echo "$modename: you must specify a MODE" 1>&2
     $echo "$generic_help" 1>&2
-    exit 1
+    exit $EXIT_FAILURE
     ;;
   esac
 
   if test -z "$exec_cmd"; then
     $echo "$modename: invalid operation mode \`$mode'" 1>&2
     $echo "$generic_help" 1>&2
-    exit 1
+    exit $EXIT_FAILURE
   fi
 fi # test -z "$show_help"
 
 if test -n "$exec_cmd"; then
   eval exec $exec_cmd
-  exit 1
+  exit $EXIT_FAILURE
 fi
 
 # We need to display help for each of the modes.
@@ -5287,8 +6762,10 @@
       uninstall       remove libraries from an installed directory
 
 MODE-ARGS vary depending on the MODE.  Try \`$modename --help --mode=MODE' for
-a more detailed description of MODE."
-  exit 0
+a more detailed description of MODE.
+
+Report bugs to <bug-libtool at gnu.org>."
+  exit $EXIT_SUCCESS
   ;;
 
 clean)
@@ -5389,9 +6866,9 @@
   -dlpreopen FILE   link in FILE and add its symbols to lt_preloaded_symbols
   -export-dynamic   allow symbols from OUTPUT-FILE to be resolved with dlsym(3)
   -export-symbols SYMFILE
-		    try to export only the symbols listed in SYMFILE
+                    try to export only the symbols listed in SYMFILE
   -export-symbols-regex REGEX
-		    try to export only the symbols matching REGEX
+                    try to export only the symbols matching REGEX
   -LLIBDIR          search LIBDIR for required installed libraries
   -lNAME            OUTPUT-FILE requires the installed library libNAME
   -module           build a library that can dlopened
@@ -5400,12 +6877,16 @@
   -no-undefined     declare that a library does not refer to external symbols
   -o OUTPUT-FILE    create OUTPUT-FILE from the specified objects
   -objectlist FILE  Use a list of object files found in FILE to specify objects
+  -precious-files-regex REGEX
+                    don't remove output files matching REGEX
   -release RELEASE  specify package release information
   -rpath LIBDIR     the created library will eventually be installed in LIBDIR
   -R[ ]LIBDIR       add LIBDIR to the runtime path of programs and libraries
-  -static           do not do any dynamic linking of libtool libraries
+  -static           do not do any dynamic linking of uninstalled libtool libraries
+  -static-libtool-libs
+                    do not do any dynamic linking of libtool libraries
   -version-info CURRENT[:REVISION[:AGE]]
-		    specify library version info [each variable defaults to 0]
+                    specify library version info [each variable defaults to 0]
 
 All other options (arguments beginning with \`-') are ignored.
 
@@ -5441,14 +6922,14 @@
 *)
   $echo "$modename: invalid operation mode \`$mode'" 1>&2
   $echo "$help" 1>&2
-  exit 1
+  exit $EXIT_FAILURE
   ;;
 esac
 
-echo
+$echo
 $echo "Try \`$modename --help' for more information about other modes."
 
-exit 0
+exit $?
 
 # The TAGs below are defined such that we never get into a situation
 # in which we disable both kinds of libraries.  Given conflicting
@@ -5461,14 +6942,13 @@
 # If a disable-shared tag is given, we'll fallback to a static-only
 # configuration.  But we'll never go from static-only to shared-only.
 
-### BEGIN LIBTOOL TAG CONFIG: disable-shared
-build_libtool_libs=no
-build_old_libs=yes
-### END LIBTOOL TAG CONFIG: disable-shared
+# ### BEGIN LIBTOOL TAG CONFIG: disable-shared
+disable_libs=shared
+# ### END LIBTOOL TAG CONFIG: disable-shared
 
-### BEGIN LIBTOOL TAG CONFIG: disable-static
-build_old_libs=`case $build_libtool_libs in yes) echo no;; *) echo yes;; esac`
-### END LIBTOOL TAG CONFIG: disable-static
+# ### BEGIN LIBTOOL TAG CONFIG: disable-static
+disable_libs=static
+# ### END LIBTOOL TAG CONFIG: disable-static
 
 # Local Variables:
 # mode:shell-script

gcl-2.6.8-latex.patch:

--- NEW FILE gcl-2.6.8-latex.patch ---
diff -dur gcl-2.6.8.ORIG/xgcl-2/dwdoc.tex gcl-2.6.8/xgcl-2/dwdoc.tex
--- gcl-2.6.8.ORIG/xgcl-2/dwdoc.tex	2008-12-29 20:09:33.000000000 -0700
+++ gcl-2.6.8/xgcl-2/dwdoc.tex	2008-12-29 20:09:01.000000000 -0700
@@ -1,19 +1,16 @@
 % dwdoc.tex          Gordon S. Novak Jr.
 % 08 Oct 92; 08 Oct 93; 16 Nov 94; 05 Jan 95; 25 Jan 06; 26 Jan 06
 
-\documentstyle[12pt]{article}
-\setlength{\oddsidemargin}{0 in}
-\setlength{\textwidth}{6.5 in}
-\setlength{\textheight}{9.0 in}
+\documentclass[12pt]{article}
+\usepackage[margin=1in]{geometry}
 \setlength{\parskip}{0.1 in}
 \setlength{\parindent}{0.0 in}
-\setlength{\topmargin}{-0.4in}
 \hyphenpenalty=9990
 
 \begin{document}
 
 \Large
-\begin{center} {\bf Interface from GCL to X Windows} \\  \end{center}
+\begin{center} \textbf{Interface from GCL to X Windows} \\  \end{center}
 
 \normalsize
 
@@ -42,508 +39,512 @@
 \item Hiep Huu Nguyen has written (and adapted from X Consortium software)
 an interface between GCL and Xlib, the X library in C.
 Xlib functions can be called directly if desired, but most users will find
-the {\tt dwindow} functions easier to use.  There is little documentation
+the \texttt{dwindow} functions easier to use.  There is little documentation
 of these functions, but the Xlib documentation can be consulted, and
-the {\tt dwindow} functions can be examined as examples.
+the \texttt{dwindow} functions can be examined as examples.
 
-\item The {\tt dwindow} functions described in this document, which call
+\item The \texttt{dwindow} functions described in this document, which call
 the Xlib functions and provide an easier interface for Lisp programs.
 
 \item It is possible to make an interactive graphical interface
 within a web page; this is described in a section below.
 \end{enumerate}
 The source file for the interface (written in GLISP) is
-{\tt dwindow.lsp}; this file is compiled into a file in plain Lisp,
-{\tt dwtrans.lsp}.  {\tt dwtrans.lsp} is compiled as part of XGCL.
+\texttt{dwindow.lsp}; this file is compiled into a file in plain Lisp,
+\texttt{dwtrans.lsp}.  \texttt{dwtrans.lsp} is compiled as part of XGCL.
 
 The functions in this package use the convention that the coordinate
-{\tt (0 0)} is the lower-left corner of a window, with positive {\tt y}
+\texttt{(0 0)} is the lower-left corner of a window, with positive \texttt{y}
 being upward.  This is different from the convention used by
-X, which assumes that {\tt (0 0)} is the upper left corner and
-that positive {\tt y} is downward.
+X, which assumes that \texttt{(0 0)} is the upper left corner and
+that positive \texttt{y} is downward.
 
 In the descriptions below, some function arguments are shown with a type,
-e.g. {\tt arg:type}, to indicate the expected type of the argument.
-The type {\tt vector} is a list {\tt (x y)} of integers.  The argument
-{\tt w} that is used with many functions is of type {\tt window}
-({\tt window} is a Lisp data structure used by the {\tt dwindow} functions).
+e.g. \texttt{arg:type}, to indicate the expected type of the argument.
+The type \texttt{vector} is a list \texttt{(x y)} of integers.  The argument
+\texttt{w} that is used with many functions is of type \texttt{window}
+(\texttt{window} is a Lisp data structure used by the \texttt{dwindow}
+functions).
 
-Both the Xlib and {\tt dwindow} functions are in the package {\tt xlib:}.
-In order to use these functions, the Lisp command {\tt (use-package 'xlib)}
-should be used to import the {\tt dwindow} symbols.
+Both the Xlib and \texttt{dwindow} functions are in the package \texttt{xlib:}.
+In order to use these functions, the Lisp command \texttt{(use-package 'xlib)}
+should be used to import the \texttt{dwindow} symbols.
 
 
 \section{Examples and Utilities}
 
-\subsection{{\tt dwtest}}
+\subsection{\texttt{dwtest}}
 
-The file {\tt dwtest.lsp} contains example functions that illustrate
-the use of the {\tt dwindow} package.  The function call {\tt (wtesta)}
-creates a small window for testing.  {\tt (wtestb)} through
-{\tt (wtestk)} perform drawing and mouse interaction tests using the
+The file \texttt{dwtest.lsp} contains example functions that illustrate
+the use of the \texttt{dwindow} package.  The function call \texttt{(wtesta)}
+creates a small window for testing.  \texttt{(wtestb)} through
+\texttt{(wtestk)} perform drawing and mouse interaction tests using the
 window.  These functions may be consulted as examples of the use of
-commonly used {\tt dwindow} functions.
+commonly used \texttt{dwindow} functions.
 
-\subsection{{\tt pcalc}}
+\subsection{\texttt{pcalc}}
 
-The file {\tt pcalc.lsp} implements
-a pocket calculator as a {\tt picmenu}; its entry is {\tt (pcalc)}.
+The file \texttt{pcalc.lsp} implements
+a pocket calculator as a \texttt{picmenu}; its entry is \texttt{(pcalc)}.
 
-\subsection{{\tt draw}}
+\subsection{\texttt{draw}}
 
-The file {\tt drawtrans.lsp} contains an interactive drawing program;
-its entry is {\tt (draw 'foo)} where {\tt foo} is the name of the drawing.
-The file {\tt ice-cream.lsp} can be loaded, followed by
-{\tt (draw 'ice-cream)} to examine an example drawing.
-{\tt draw} can produce a Lisp program or a set of \LaTeX \  commands to
-recreate the drawing; use {\tt origin to zero} before making a program.
-{\tt (draw-out file names)} will write definitions of drawings in the
-list {\tt names} to the file {\tt file}.
+The file \texttt{drawtrans.lsp} contains an interactive drawing program; its
+entry is \texttt{(draw 'foo)} where \texttt{foo} is the name of the drawing.
+The file \texttt{ice-cream.lsp} can be loaded, followed by
+\texttt{(draw 'ice-cream)} to examine an example drawing.
+\texttt{draw} can produce a Lisp program or a set of \LaTeX \  commands to
+recreate the drawing; use \texttt{origin to zero} before making a program.
+\texttt{(draw-out file names)} will write definitions of drawings in the
+list \texttt{names} to the file \texttt{file}.
 
-\subsection{{\tt editors}}
+\subsection{\texttt{editors}}
 
-The file {\tt editorstrans.lsp} contains some interactive editing programs;
-it is a translation of the file {\tt editors.lsp} .
-One useful editor is the color editor; after entering {\tt (wtesta)}
-(in file {\tt dwtest.lsp}), enter {\tt (edit-color myw)} to edit a
-color.  The result is an {\tt rgb} list as used in {\tt window-set-color}.
+The file \texttt{editorstrans.lsp} contains some interactive editing programs;
+it is a translation of the file \texttt{editors.lsp}.
+One useful editor is the color editor; after entering \texttt{(wtesta)}
+(in file \texttt{dwtest.lsp}), enter \texttt{(edit-color myw)} to edit a
+color.  The result is an \texttt{rgb} list as used in
+\texttt{window-set-color}.
 
 A simple line editor and an Emacs-like text editor are described in sections
 \ref{texted}  and \ref{emacsed} below.
 
 \section{Menus}
 
-The function {\tt menu} provides an easy interface to make a pop-up menu,
+The function \texttt{menu} provides an easy interface to make a pop-up menu,
 get a selection from it, and destroy it: \\
 
 \vspace{-0.2in}
-{\tt \hspace*{0.5in} (menu items \&optional title)} \\
+\texttt{\hspace*{0.5in} (menu items \&optional title)} \\
 
 \vspace{-0.1in}
-Example: {\tt (menu '(red white blue))}
+Example: \texttt{(menu '(red white blue))}
 
 This simple call is all that is needed in most cases.
 More sophisticated menu features are described below.
 
-The {\tt items} in a menu is a list; each item may be a symbol, a {\tt cons}
-of a symbol or string and the corresponding value, or a {\tt cons} of a
-function name and the corresponding value.  In the latter case, the function
-is expected to draw the corresponding menu item.
+The \texttt{items} in a menu is a list; each item may be a symbol, a
+\texttt{cons} of a symbol or string and the corresponding value, or a
+\texttt{cons} of a function name and the corresponding value.  In the latter
+case, the function is expected to draw the corresponding menu item.
 
 If a function name is specified as the first element of a menu item, the
-drawing function should have arguments {\tt (fn w x y)}, where {\tt w}
-is the window and {\tt x} and {\tt y} are the lower-left corner of the
+drawing function should have arguments \texttt{(fn w x y)}, where \texttt{w}
+is the window and \texttt{x} and \texttt{y} are the lower-left corner of the
 drawing area.  The property list of the function name should have the
-property {\tt display-size}, which should be a list {\tt (width height)}
+property \texttt{display-size}, which should be a list \texttt{(width height)}
 in pixels of the displayed symbol.
 
 Menus can be associated with a particular window; if no window is specified,
 the menu is associated with the window where the mouse cursor is located
 when the menu is initialized (which might not be a Lisp user's window).  If a
-menu is associated with a user window, it may be {\em permanent} (left
-displayed after a selection is made) and may be {\em flat} (drawn directly
+menu is associated with a user window, it may be \emph{permanent} (left
+displayed after a selection is made) and may be \emph{flat} (drawn directly
 on the containing window, rather than having its own window).
 
-A menu can be created by {\tt menu-create} : \\
+A menu can be created by \texttt{menu-create} : \\
 
 \vspace{-0.1in}
-{\tt \hspace*{0.5in}
+\texttt{\hspace*{0.5in}
  (menu-create items \&optional title w:window x y perm flat font)} \\
 
 \vspace{-0.1in}
-{\tt title}, if specified, is displayed over the menu.
-{\tt w} is an existing {\tt window}; if specified, the menu is put
-within this window at the {\tt x y} offsets specified (adjusted if necessary
-to keep the menu inside the window).  If no {\tt w}
-is specified, or if {\tt x} is {\tt nil}, the menu is put where the cursor
+\texttt{title}, if specified, is displayed over the menu.
+\texttt{w} is an existing \texttt{window}; if specified, the menu is put
+within this window at the \texttt{x y} offsets specified (adjusted if necessary
+to keep the menu inside the window).  If no \texttt{w} is
+specified, or if \texttt{x} is \texttt{nil}, the menu is put where the cursor
 is the first time the menu is displayed.
-{\tt perm} is non-{\tt nil} if the menu is to be permanent, {\em i.e.}, is to
-be left displayed after a selection has been made.
-{\tt flat} is non-{\tt nil} if the menu is to be drawn directly on the
+\texttt{perm} is non-\texttt{nil} if the menu is to be permanent, \emph{i.e.},
+is to be left displayed after a selection has been made.
+\texttt{flat} is non-\texttt{nil} if the menu is to be drawn directly on the
 containing window.
-{\tt font} is a symbol or string that names the font to be used; the
-default is a {\tt 9x15} typewriter font.
+\texttt{font} is a symbol or string that names the font to be used; the
+default is a \texttt{9x15} typewriter font.
 
-The menu is returned as the value of {\tt menu-create}.  Such a menu can
-be saved; selections can be made from a menu {\tt m} as follows: \\
+The menu is returned as the value of \texttt{menu-create}.  Such a menu can
+be saved; selections can be made from a menu \texttt{m} as follows: \\
 
 \vspace{-0.1in}
-{\tt \hspace*{0.5in} (menu-select m \&optional inside)} \ \ \ \ \ or
-{\tt \hspace*{0.5in} (menu-select! m)} \\
+\texttt{\hspace*{0.5in} (menu-select m \&optional inside)} \ \ \ \ \ or
+\texttt{\hspace*{0.5in} (menu-select! m)} \\
 
 \vspace{-0.1in}
-{\tt menu-select} will return {\tt nil} if the mouse is clicked outside the
-menu, or is moved outside after it has been inside (or if {\tt inside} is
-not {\tt nil}), provided that the menu is contained within a user-created
+\texttt{menu-select} will return \texttt{nil} if the mouse is clicked outside
+the menu, or is moved outside after it has been inside (or if \texttt{inside}
+is not \texttt{nil}), provided that the menu is contained within a user-created
 window.
-{\tt menu-select!} requires that a choice be made.
+\texttt{menu-select!} requires that a choice be made.
 
 In order to avoid wasting storage, unused menus should be destroyed:
-{\tt (menu-destroy m)}.  The simple {\tt menu} function destroys its
+\texttt{(menu-destroy m)}.  The simple \texttt{menu} function destroys its
 menu after it is used.
 
-{\tt \hspace*{0.5in} (menu-size m)} \\
-{\tt \hspace*{0.5in} (menu-moveto-xy m x y)} \\
-{\tt \hspace*{0.5in} (menu-reposition m)} \
+\texttt{\hspace*{0.5in} (menu-size m)} \\
+\texttt{\hspace*{0.5in} (menu-moveto-xy m x y)} \\
+\texttt{\hspace*{0.5in} (menu-reposition m)} \
 
-{\tt menu-reposition} will reposition a {\tt flat} menu within its parent
+\texttt{menu-reposition} will reposition a \texttt{flat} menu within its parent
 window by allowing the user to position a ghost box using the mouse.
-{\tt menu-size} returns the size of the menu as a vector, {\tt (x y)}.
-{\tt menu-moveto-xy} adjusts the offsets to move a {\tt flat} menu to
+\texttt{menu-size} returns the size of the menu as a vector, \texttt{(x y)}.
+\texttt{menu-moveto-xy} adjusts the offsets to move a \texttt{flat} menu to
 the specified position within its parent window.  These functions and
-{\tt menu-destroy} work for picmenus and barmenus as well.
+\texttt{menu-destroy} work for picmenus and barmenus as well.
 
-{\tt \hspace*{0.5in} (menu-item-position m name \&optional location)} \\
+\texttt{\hspace*{0.5in} (menu-item-position m name \&optional location)} \\
 
 \vspace{-0.1in}
-{\tt menu-item-position} returns a vector {\tt (x y)} that gives the
-coordinates of the menu item whose name is {\tt name}.  {\tt location}
-may be {\tt center}, {\tt left}, {\tt right}, {\tt top}, or {\tt bottom};
-the default is the lower-left corner of the menu item.  {\tt center}
-specifies the center of the box containing the menu item; the other
-{\tt location} values are at the center of the specified edge of the box.
+\texttt{menu-item-position} returns a vector \texttt{(x y)} that gives the
+coordinates of the menu item whose name is \texttt{name}.  \texttt{location}
+may be \texttt{center}, \texttt{left}, \texttt{right}, \texttt{top}, or
+\texttt{bottom}; the default is the lower-left corner of the menu item.
+\texttt{center} specifies the center of the box containing the menu item; the
+other \texttt{location} values are at the center of the specified edge of the
+box.
 
 \subsection{Picmenus}
 
-A {\tt picmenu} (picture menu) is analogous to a menu, but involves a
+A \texttt{picmenu} (picture menu) is analogous to a menu, but involves a
 user-defined picture containing sensitive spots or ``buttons''.
-The test function {\tt (wteste)} shows an example of a {\tt picmenu}.
-A {\tt picmenu} is created by: \\
+The test function \texttt{(wteste)} shows an example of a \texttt{picmenu}.
+A \texttt{picmenu} is created by: \\
 
 \vspace{-0.1in}
-{\tt \hspace*{0.5in} (picmenu-create buttons width height drawfn \\
+\texttt{\hspace*{0.5in} (picmenu-create buttons width height drawfn \\
 \hspace*{1.5in} \&optional title dotflg w:window x y perm flat font boxflg)} \\
 
 \vspace{-0.1in}
 
 If a picmenu is to be used more than once, the common parts can be made
-into a {\tt picmenu-spec} and reused:
+into a \texttt{picmenu-spec} and reused:
 
 \vspace{-0.1in}
-{\tt \hspace*{0.5in} (picmenu-create-spec buttons width height drawfn \\
+\texttt{\hspace*{0.5in} (picmenu-create-spec buttons width height drawfn \\
 \hspace*{1.5in} \&optional dotflg font)} \\
 
 \vspace{-0.1in}
-{\tt \hspace*{0.5in} (picmenu-create-from-spec spec:picmenu-spec \\
+\texttt{\hspace*{0.5in} (picmenu-create-from-spec spec:picmenu-spec \\
 \hspace*{1.5in} \&optional title w:window x y perm flat boxflg)} \\
 
 \vspace{-0.1in}
-{\tt width} and {\tt height} are the size of the area occupied by the
-picture.  {\tt (drawfn w x y)} should draw the picture at the offset
-{\tt x y}.  Note that the {\tt draw} utility can be used to
-make the drawing function, including {\tt picmenu} buttons.
-{\tt dotflg} is non-{\tt nil} if it is desired that small boxes be
+\texttt{width} and \texttt{height} are the size of the area occupied by the
+picture.  \texttt{(drawfn w x y)} should draw the picture at the offset
+\texttt{x y}.  Note that the \texttt{draw} utility can be used to
+make the drawing function, including \texttt{picmenu} buttons.
+\texttt{dotflg} is non-\texttt{nil} if it is desired that small boxes be
 automatically added to the sensitive points when the picture is drawn.
-{\tt boxflg} is non-{\tt nil} if a box is to be drawn around the picmenu
+\texttt{boxflg} is non-\texttt{nil} if a box is to be drawn around the picmenu
 when the picture is drawn (this is only needed for flat
-picmenus).  If {\tt perm} is non-nil, the drawing program is not called when
+picmenus).  If \texttt{perm} is non-nil, the drawing program is not called when
 a selection is to be made, so that an external program must draw the
-{\tt picmenu}; this avoids the need to redraw a complex picture.
+\texttt{picmenu}; this avoids the need to redraw a complex picture.
 The remaining arguments are as described for menus.
 
-Each of the {\tt buttons} in a picmenu is a list: \\
+Each of the \texttt{buttons} in a picmenu is a list: \\
 
 \vspace{-0.1in}
-{\tt \hspace*{0.5in} (buttonname offset size highlightfn unhighlightfn)} \\
+\texttt{\hspace*{0.5in} (buttonname offset size highlightfn unhighlightfn)} \\
 
 \vspace{-0.1in}
-{\tt buttonname} is the name of the button; it is the value returned when that
-button is selected.
-{\tt offset} is a vector {\tt (x y)} that gives the offset of the center
+\texttt{buttonname} is the name of the button; it is the value returned when
+that button is selected.
+\texttt{offset} is a vector \texttt{(x y)} that gives the offset of the center
 of the button from the lower-left corner of the picture.
 The remainder of the button list may be omitted.
-{\tt size} is an optional list {\tt (width height)} that gives the size of the
-sensitive area of the button; the default size is {\tt (12\ 12)}.
-{\tt (highlightfn w x y)} and {\tt (unhighlightfn w x y)} (where {\tt (x y)}
-is the center of the button in the coordinates of {\tt w}) are optional
-functions to highlight the button area when the cursor is moved into it and
-unhighlight the button when the cursor is moved out; the default is to
-display a box of the specified {\tt size}.
+\texttt{size} is an optional list \texttt{(width height)} that gives the size
+of the sensitive area of the button; the default size is \texttt{(12\ 12)}.
+\texttt{(highlightfn w x y)} and \texttt{(unhighlightfn w x y)} (where
+\texttt{(x y)} is the center of the button in the coordinates of \texttt{w})
+are optional functions to highlight the button area when the cursor is moved
+into it and unhighlight the button when the cursor is moved out; the default
+is to display a box of the specified \texttt{size}.
 
-{\tt \hspace*{0.5in} (picmenu-select m \&optional inside)} \\
-If the {\tt picmenu} is not {\tt flat}, its window should be destroyed
-following the selection using {\tt menu-destroy}.
+\texttt{\hspace*{0.5in} (picmenu-select m \&optional inside)} \\
+If the \texttt{picmenu} is not \texttt{flat}, its window should be destroyed
+following the selection using \texttt{menu-destroy}.
 
-{\tt \hspace*{0.5in} (picmenu-item-position m name \&optional location)} \\
+\texttt{\hspace*{0.5in} (picmenu-item-position m name \&optional location)} \\
 
 \vspace{-0.1in}
-{\tt \hspace*{0.5in} (picmenu-delete-named-button m name:symbol)} \\
-This deletes a button from a displayed {\tt picmenu}.  The set of
-deleted buttons is reset to {\tt nil} when the picmenu is drawn.
+\texttt{\hspace*{0.5in} (picmenu-delete-named-button m name:symbol)} \\
+This deletes a button from a displayed \texttt{picmenu}.  The set of
+deleted buttons is reset to \texttt{nil} when the picmenu is drawn.
 
 \subsection{Barmenus}
 
-A {\tt barmenu} displays a bar graph whose size can be adjusted using
+A \texttt{barmenu} displays a bar graph whose size can be adjusted using
 the mouse.
 
-{\tt \hspace*{0.5in} 
+\texttt{\hspace*{0.5in} 
 (barmenu-create maxval initval barwidth \\
 \hspace*{1.5in} \&optional title horizontal subtrackfn subtrackparms \\
 \hspace*{1.5in} parentw x y perm flat color)}
 
-A value is selected by: {\tt (barmenu-select m:barmenu \&optional inside)} \\
-If the {\tt barmenu} is not {\tt flat}, its window should be destroyed
-following the selection using {\tt menu-destroy}.
+A value is selected by: \texttt{(barmenu-select m:barmenu \&optional inside)} \\
+If the \texttt{barmenu} is not \texttt{flat}, its window should be destroyed
+following the selection using \texttt{menu-destroy}.
 
 The user must first click the mouse in the bar area; then
 the size of the displayed bar is adjusted as the user moves the mouse
-pointer.  In addition, the {\tt subtrackfn} is called with arguments
-of the size of the bar followed by the {\tt subtrackparms}; this can
+pointer.  In addition, the \texttt{subtrackfn} is called with arguments
+of the size of the bar followed by the \texttt{subtrackparms}; this can
 be used, for example, to display a numeric value in addition to the
 bar size.
 
 
 \subsection{Menu Sets and Menu Conns}
 
-A {\tt menu-set} is a set of multiple menus, picmenus, or barmenus
+A \texttt{menu-set} is a set of multiple menus, picmenus, or barmenus
 that are simultaneously active within the same window.  Menu-sets
-can be used to implement graphical user interfaces.  A {\tt menu-conns}
+can be used to implement graphical user interfaces.  A \texttt{menu-conns}
 is a menu-set that includes connections between menus; this can be
 used to implement interfaces that allow the user to construct a network
 from components.
 
-The source file for menu-sets is the GLISP file {\tt menu-set.lsp};
-this file is translated as part of the file {\tt drawtrans.lsp} in
+The source file for menu-sets is the GLISP file \texttt{menu-set.lsp};
+this file is translated as part of the file \texttt{drawtrans.lsp} in
 plain Lisp.  Examples of the use of menu sets are given at the top
-of the file {\tt menu-set.lsp}.  In the following descriptions,
-{\tt ms} is a {\tt menu-set} and {\tt mc} is a {\tt menu-conns}.
+of the file \texttt{menu-set.lsp}.  In the following descriptions,
+\texttt{ms} is a \texttt{menu-set} and \texttt{mc} is a \texttt{menu-conns}.
 
-{\tt \hspace*{0.5in} (menu-set-create w)} creates a menu set to be displayed
-in the window {\tt w}.
+\texttt{\hspace*{0.5in} (menu-set-create w)} creates a menu set to be displayed
+in the window \texttt{w}.
 
-{\tt \hspace*{0.5in} (menu-set-name symbol)} makes a {\tt gensym} name that
-begins with {\tt symbol}.
+\texttt{\hspace*{0.5in} (menu-set-name symbol)} makes a \texttt{gensym} name
+that begins with \texttt{symbol}.
 
-{\tt \hspace*{0.5in} (menu-set-add-menu ms name:symbol sym title items} \\
-\hspace*{1.5in} {\tt \&optional offset:vector)}
+\texttt{\hspace*{0.5in} (menu-set-add-menu ms name:symbol sym title items} \\
+\hspace*{1.5in} \texttt{\&optional offset:vector)}
 
-This function adds a menu to a menu-set.  {\tt sym} is arbitrary
+This function adds a menu to a menu-set.  \texttt{sym} is arbitrary
 information that is saved with the menu.
 
-{\tt \hspace*{0.5in} (menu-set-add-picmenu ms name sym title spec:picmenu-spec} \\
-\hspace*{1.5in} {\tt \&optional offset:vector nobox)}
+\texttt{\hspace*{0.5in} (menu-set-add-picmenu ms name sym title spec:picmenu-spec} \\
+\hspace*{1.5in} \texttt{\&optional offset:vector nobox)}
 
-{\tt \hspace*{0.5in} (menu-set-add-component ms name \&optional offset:vector)}
+\texttt{\hspace*{0.5in} (menu-set-add-component ms name \&optional offset:vector)}
 
-This adds a component that has a {\tt picmenu-spec} defined on the
-property list of {\tt name}.
+This adds a component that has a \texttt{picmenu-spec} defined on the
+property list of \texttt{name}.
 
-{\tt \hspace*{0.5in} (menu-set-add-barmenu ms name sym barmenu title} \\
-\hspace*{1.5in} {\tt \&optional offset:vector)}
+\texttt{\hspace*{0.5in} (menu-set-add-barmenu ms name sym barmenu title} \\
+\hspace*{1.5in} \texttt{\&optional offset:vector)}
 
-{\tt \hspace*{0.5in} (menu-set-draw ms)} draws all the menus.
+\texttt{\hspace*{0.5in} (menu-set-draw ms)} draws all the menus.
 
-{\tt \hspace*{0.5in} (menu-set-select ms \&optional redraw enabled)}
+\texttt{\hspace*{0.5in} (menu-set-select ms \&optional redraw enabled)}
 
-{\tt menu-set-select} gets a selection from a menu-set.  If {\tt redraw}
-is non-{\tt nil}, the menu-set is drawn.  {\tt enabled} may be a list
+\texttt{menu-set-select} gets a selection from a menu-set.  If \texttt{redraw}
+is non-\texttt{nil}, the menu-set is drawn.  \texttt{enabled} may be a list
 of names of menus that are enabled for selection.  The result is
-{\tt (selection menu-name)}, or {\tt ((x y) BACKGROUND button)}
+\texttt{(selection menu-name)}, or \texttt{((x y) BACKGROUND button)}
 for a click outside any menu.
 
 
-{\tt \hspace*{0.5in} (menu-conns-create ms)} creates a {\tt menu-conns}
-from a {\tt menu-set}.
+\texttt{\hspace*{0.5in} (menu-conns-create ms)} creates a \texttt{menu-conns}
+from a \texttt{menu-set}.
 
-{\tt \hspace*{0.5in} (menu-conns-add-conn mc)}
+\texttt{\hspace*{0.5in} (menu-conns-add-conn mc)}
 
 This function allows the user to select two ports from menus of the
-{\tt menu-conns}.  It then draws a line between the ports and adds the
-connection to the {\tt connections} of the {\tt menu-conns}.
+\texttt{menu-conns}.  It then draws a line between the ports and adds the
+connection to the \texttt{connections} of the \texttt{menu-conns}.
 
-{\tt \hspace*{0.5in} (menu-conns-move mc)}
+\texttt{\hspace*{0.5in} (menu-conns-move mc)}
 
 This function allows the user to select a menu and move it.
-The {\tt menu-set} and connections are redrawn afterwards.
+The \texttt{menu-set} and connections are redrawn afterwards.
 
-{\tt \hspace*{0.5in} (menu-conns-find-conn mc pt:vector)} \\
-This finds the connection selected by the point {\tt pt}, if any.
+\texttt{\hspace*{0.5in} (menu-conns-find-conn mc pt:vector)} \\
+This finds the connection selected by the point \texttt{pt}, if any.
 This is useful to allow the user to delete a connection:
 
-{\tt \hspace*{0.5in} (menu-conns-delete-conn mc conn)}
+\texttt{\hspace*{0.5in} (menu-conns-delete-conn mc conn)}
 
-{\tt \hspace*{0.5in} (menu-conns-find-conns mc menuname port)} \\
-This returns all the connections from the specified {\tt port} (selection)
-of the menu whose name is {\tt menuname}.
+\texttt{\hspace*{0.5in} (menu-conns-find-conns mc menuname port)} \\
+This returns all the connections from the specified \texttt{port} (selection)
+of the menu whose name is \texttt{menuname}.
 
 
 \section{Windows}
 
-{\tt \hspace*{0.5in} (window-create width height \&optional title parentw
+\texttt{\hspace*{0.5in} (window-create width height \&optional title parentw
  x y font)} \\
 
 \vspace{-0.1in}
-{\tt window-create} makes a new window of the specified {\tt width} and
-{\tt height}.  {\tt title}, if specified, becomes the displayed title
-of the window.  If {\tt parentw} is specified, it should be the
-{\tt window-parent} property of an existing window, which becomes the parent
-window of the new window.  {\tt x} and {\tt y} are the offset of the
-new window from the parent window.  {\tt font} is the font to be used
+\texttt{window-create} makes a new window of the specified \texttt{width} and
+\texttt{height}.  \texttt{title}, if specified, becomes the displayed title
+of the window.  If \texttt{parentw} is specified, it should be the
+\texttt{window-parent} property of an existing window, which becomes the parent
+window of the new window.  \texttt{x} and \texttt{y} are the offset of the
+new window from the parent window.  \texttt{font} is the font to be used
 for printing in the window; the default is given by
-{\tt *window-default-font-name*}, initially {\tt courier-bold-12}.
+\texttt{*window-default-font-name*}, initially \texttt{courier-bold-12}.
 
-{\tt \hspace*{0.5in} (window-open w)} causes a window to be displayed
+\texttt{\hspace*{0.5in} (window-open w)} causes a window to be displayed
 on the screen.
 
-{\tt \hspace*{0.5in} (window-close w)} removes the window from the display;
+\texttt{\hspace*{0.5in} (window-close w)} removes the window from the display;
 it can be re-opened.
 
-{\tt \hspace*{0.5in} (window-destroy w)}
+\texttt{\hspace*{0.5in} (window-destroy w)}
 
-{\tt \hspace*{0.5in} (window-moveto-xy w x y)}
+\texttt{\hspace*{0.5in} (window-moveto-xy w x y)}
 
-{\tt \hspace*{0.5in} (window-geometry w)} queries X for the window geometry.
+\texttt{\hspace*{0.5in} (window-geometry w)} queries X for the window geometry.
 The result is a list, \linebreak
-{\tt (x y width height border-width)} .
+\texttt{(x y width height border-width)} .
 
-{\tt \hspace*{0.5in} (window-size w)} returns a list {\tt (width height)} .
+\texttt{\hspace*{0.5in} (window-size w)} returns a list
+\texttt{(width height)} .
 
 \vspace{-0.1in}
 Note that the width and height are cached within the structure so that no call
 to X is needed to examine them.  However, if the window is resized, it is
-necessary to call {\tt (window-reset-geometry\ w)} to reset the local
+necessary to call \texttt{(window-reset-geometry\ w)} to reset the local
 parameters to their correct values.
 
 % ; Paint in window with mouse \\   % these are not really working...
-% {\tt \hspace*{0.5in} (window-paint w)} \\
+% \texttt{\hspace*{0.5in} (window-paint w)} \\
 %
-% {\tt \hspace*{0.5in} (window-move w)} \\
+% \texttt{\hspace*{0.5in} (window-move w)} \\
 %
-% {\tt \hspace*{0.5in} (dowindowcom w)} \\
+% \texttt{\hspace*{0.5in} (dowindowcom w)} \\
 
-The following functions provide access to the parts of the {\tt window} data
+The following functions provide access to the parts of the \texttt{window} data
 structure; most applications will not need to use them. \\
 
 \vspace{-0.1in}
-{\tt \hspace*{0.5in} (window-gcontext        w)} \\
-{\tt \hspace*{0.5in} (window-parent          w)} \\
-{\tt \hspace*{0.5in} (window-drawable-height w)} \\
-{\tt \hspace*{0.5in} (window-drawable-width  w)} \\
-{\tt \hspace*{0.5in} (window-label           w)} \\
-{\tt \hspace*{0.5in} (window-font            w)} \\
-{\tt \hspace*{0.5in} (window-screen-height)} \\
+\texttt{\hspace*{0.5in} (window-gcontext        w)} \\
+\texttt{\hspace*{0.5in} (window-parent          w)} \\
+\texttt{\hspace*{0.5in} (window-drawable-height w)} \\
+\texttt{\hspace*{0.5in} (window-drawable-width  w)} \\
+\texttt{\hspace*{0.5in} (window-label           w)} \\
+\texttt{\hspace*{0.5in} (window-font            w)} \\
+\texttt{\hspace*{0.5in} (window-screen-height)} \\
 
 
 \section{Drawing Functions}
 
-{\tt \hspace*{0.5in} (window-clear w)} clears the window to the background
+\texttt{\hspace*{0.5in} (window-clear w)} clears the window to the background
 color.
 
-{\tt \hspace*{0.5in} (window-force-output \&optional w)}
+\texttt{\hspace*{0.5in} (window-force-output \&optional w)}
 
 \vspace{-0.1in}
 Communication between the running program and X windows is done through a
 stream; actual drawing on the display is done asynchronously.
-{\tt window-force-output} causes the current drawing commands, if any,
+\texttt{window-force-output} causes the current drawing commands, if any,
 to be sent to X.  Without this, commands may be left in the stream buffer and
-may appear not to have been executed.  The argument {\tt w} is not used.
+may appear not to have been executed.  The argument \texttt{w} is not used.
 
-In all of the drawing functions, the {\tt linewidth} argument is optional
-and defaults to {\tt 1}.
+In all of the drawing functions, the \texttt{linewidth} argument is optional
+and defaults to \texttt{1}.
 
 \vspace{0.1in}
-{\tt \hspace*{0.5in} (window-draw-line w from:vector to:vector linewidth)} \\
-{\tt \hspace*{0.5in}
+\texttt{\hspace*{0.5in} (window-draw-line w from:vector to:vector linewidth)} \\
+\texttt{\hspace*{0.5in}
  (window-draw-line-xy w x1 y1 x2 y2 \&optional linewidth op)} \\
- \hspace*{1.0in} {\tt op} may be {\tt xor} or {\tt erase}.
+ \hspace*{1.0in} \texttt{op} may be \texttt{xor} or \texttt{erase}.
 
 \vspace{0.1in}
-{\tt \hspace*{0.5in}
+\texttt{\hspace*{0.5in}
  (window-draw-arrow-xy w x1 y1 x2 y2 \&optional linewidth size)} \\
-{\tt \hspace*{0.5in}
+\texttt{\hspace*{0.5in}
  (window-draw-arrow2-xy w x1 y1 x2 y2 \&optional linewidth size)} \\
-{\tt \hspace*{0.5in}
+\texttt{\hspace*{0.5in}
  (window-draw-arrowhead-xy w x1 y1 x2 y2 \&optional linewidth size)}
 
 \vspace{-0.1in}
 These draw a line with an arrowhead at the second point, a line with an
 arrowhead at both points, or an arrowhead alone at the second point,
-respectively.  {\tt size} is the arrowhead size; the default is
-{\tt (+ 20 (* linewidth 5))}.
+respectively.  \texttt{size} is the arrowhead size; the default is
+\texttt{(+ 20 (* linewidth 5))}.
 
 \vspace{0.1in}
-{\tt \hspace*{0.5in} (window-draw-box-xy w x y width height linewidth)} \\
-{\tt \hspace*{0.5in} (window-xor-box-xy w x y width height linewidth)} \\
-{\tt \hspace*{0.5in} (window-draw-box w offset:vector size:vector linewidth)} \\
-{\tt \hspace*{0.5in} (window-draw-box-corners w x1 y1 x2 y2 linewidth)} \\
- \hspace*{1.0in} where {\tt (x1 y1)} and {\tt (x2 y2)} are opposite corners. \\
-{\tt \hspace*{0.5in} (window-draw-rcbox-xy w x y width height radius linewidth)} \\
+\texttt{\hspace*{0.5in} (window-draw-box-xy w x y width height linewidth)} \\
+\texttt{\hspace*{0.5in} (window-xor-box-xy w x y width height linewidth)} \\
+\texttt{\hspace*{0.5in} (window-draw-box w offset:vector size:vector linewidth)} \\
+\texttt{\hspace*{0.5in} (window-draw-box-corners w x1 y1 x2 y2 linewidth)} \\
+ \hspace*{1.0in} where \texttt{(x1 y1)} and \texttt{(x2 y2)} are opposite corners. \\
+\texttt{\hspace*{0.5in} (window-draw-rcbox-xy w x y width height radius linewidth)} \\
  \hspace*{1.0in} draws a box with rounded corners.
 
-{\tt \hspace*{0.5in} (window-draw-arc-xy w x y radiusx radiusy anglea angleb linewidth)}
+\texttt{\hspace*{0.5in} (window-draw-arc-xy w x y radiusx radiusy anglea angleb linewidth)}
 
 \vspace{-0.1in}
-{\tt anglea} is the angle, in degrees, at which the arc is started.
-{\tt angleb} is the angle, in degrees, that specifies the amount of arc
+\texttt{anglea} is the angle, in degrees, at which the arc is started.
+\texttt{angleb} is the angle, in degrees, that specifies the amount of arc
 to be drawn, counterclockwise from the starting position.
 
 \vspace{0.1in}
-{\tt \hspace*{0.5in} (window-draw-circle-xy w x y radius linewidth)} \\
-{\tt \hspace*{0.5in} (window-draw-circle w center:vector radius linewidth)} \\
-{\tt \hspace*{0.5in} (window-draw-ellipse-xy w x y radiusx radiusy linewidth)} \\
-{\tt \hspace*{0.5in} (window-draw-dot-xy w x y)}
+\texttt{\hspace*{0.5in} (window-draw-circle-xy w x y radius linewidth)} \\
+\texttt{\hspace*{0.5in} (window-draw-circle w center:vector radius linewidth)} \\
+\texttt{\hspace*{0.5in} (window-draw-ellipse-xy w x y radiusx radiusy linewidth)} \\
+\texttt{\hspace*{0.5in} (window-draw-dot-xy w x y)}
 
 \vspace{0.1in}
-{\tt \hspace*{0.5in} (window-erase-area-xy w left bottom width height)} \\
-{\tt \hspace*{0.5in} (window-erase-area w offset:vector size:vector)} \\
-{\tt \hspace*{0.5in} (window-copy-area-xy w fromx fromy	tox toy width height)} \\
-{\tt \hspace*{0.5in} (window-invert-area w offset:vector size:vector)} \\
-{\tt \hspace*{0.5in} (window-invert-area-xy w left bottom width height)}
+\texttt{\hspace*{0.5in} (window-erase-area-xy w left bottom width height)} \\
+\texttt{\hspace*{0.5in} (window-erase-area w offset:vector size:vector)} \\
+\texttt{\hspace*{0.5in} (window-copy-area-xy w fromx fromy	tox toy width height)} \\
+\texttt{\hspace*{0.5in} (window-invert-area w offset:vector size:vector)} \\
+\texttt{\hspace*{0.5in} (window-invert-area-xy w left bottom width height)}
 
 \vspace{0.1in}
-{\tt \hspace*{0.5in} (window-printat-xy w s x y)} \\
-{\tt \hspace*{0.5in} (window-printat w s at:vector)} \\
-{\tt \hspace*{0.5in} (window-prettyprintat-xy w s x y)} \\
-{\tt \hspace*{0.5in} (window-prettyprintat w s at:vector)} \\
+\texttt{\hspace*{0.5in} (window-printat-xy w s x y)} \\
+\texttt{\hspace*{0.5in} (window-printat w s at:vector)} \\
+\texttt{\hspace*{0.5in} (window-prettyprintat-xy w s x y)} \\
+\texttt{\hspace*{0.5in} (window-prettyprintat w s at:vector)} \\
 
 \vspace{-0.1in}
-The argument {\tt s} is printed at the specified position.
-{\tt s} is stringified if necessary.
+The argument \texttt{s} is printed at the specified position.
+\texttt{s} is stringified if necessary.
 Currently, the pretty-print versions are the same as the plain versions.
 
 \vspace{0.1in}
-{\tt \hspace*{0.5in} (window-draw-border w)} draws a border just
+\texttt{\hspace*{0.5in} (window-draw-border w)} draws a border just
 inside a window.
 
 \section{Fonts, Operations, Colors}
 
-{\tt \hspace*{0.5in} (window-set-font w font)}
+\texttt{\hspace*{0.5in} (window-set-font w font)}
 
 \vspace{-0.1in}
-The font symbols that are currently defined are {\tt courier-bold-12},
-{\tt 8x10}, and {\tt 9x15} .  The global variable {\tt *window-fonts*}
+The font symbols that are currently defined are \texttt{courier-bold-12},
+\texttt{8x10}, and \texttt{9x15} .  The global variable \texttt{*window-fonts*}
 contains correspondences between font symbols and font strings.
 A font string may also be specified instead of a font symbol.
 
-{\tt \hspace*{0.5in} (window-string-width w s)} \\
-{\tt \hspace*{0.5in} (window-string-extents w s)} \\
-These give the width and the vertical size {\tt (ascent descent)} in pixels
-of the specified string {\tt s} using the font of the specified window.
-{\tt s} is stringified if necessary.
+\texttt{\hspace*{0.5in} (window-string-width w s)} \\
+\texttt{\hspace*{0.5in} (window-string-extents w s)} \\
+These give the width and the vertical size \texttt{(ascent descent)} in pixels
+of the specified string \texttt{s} using the font of the specified window.
+\texttt{s} is stringified if necessary.
 
 Operations on a window other than direct drawing are performed by
 setting a condition for the window, performing the operation, and then
-unsetting the condition with {\tt window-unset}.  {\tt window-reset}
+unsetting the condition with \texttt{window-unset}.  \texttt{window-reset}
 will reset a window to its ``standard'' setting; it is useful primarily
 for cases in which a program bug causes window settings to be in an
 undesired state.
 
 \vspace{-0.1in}
-{\tt \hspace*{0.5in} (window-set-xor w)} \\
-{\tt \hspace*{0.5in} (window-set-erase w)} \\
-{\tt \hspace*{0.5in} (window-set-copy w)} \\
-{\tt \hspace*{0.5in} (window-set-invert w)} \\
-{\tt \hspace*{0.5in} (window-unset w)} \\
-{\tt \hspace*{0.5in} (window-reset w)} \\
+\texttt{\hspace*{0.5in} (window-set-xor w)} \\
+\texttt{\hspace*{0.5in} (window-set-erase w)} \\
+\texttt{\hspace*{0.5in} (window-set-copy w)} \\
+\texttt{\hspace*{0.5in} (window-set-invert w)} \\
+\texttt{\hspace*{0.5in} (window-unset w)} \\
+\texttt{\hspace*{0.5in} (window-reset w)} \\
 
-{\tt \hspace*{0.5in} (window-set-line-width w width)} \\
-{\tt \hspace*{0.5in} (window-set-line-attr w width \&optional line-style cap-style join-style)} \\
-{\tt \hspace*{0.5in} (window-std-line-attr w)} \\
+\texttt{\hspace*{0.5in} (window-set-line-width w width)} \\
+\texttt{\hspace*{0.5in} (window-set-line-attr w width \&optional line-style cap-style join-style)} \\
+\texttt{\hspace*{0.5in} (window-std-line-attr w)} \\
 
-{\tt \hspace*{0.5in} (window-foreground w)} \\
-{\tt \hspace*{0.5in} (window-set-foreground w fg-color)} \\
-{\tt \hspace*{0.5in} (window-background w)} \\
-{\tt \hspace*{0.5in} (window-set-background w bg-color)} \\
+\texttt{\hspace*{0.5in} (window-foreground w)} \\
+\texttt{\hspace*{0.5in} (window-set-foreground w fg-color)} \\
+\texttt{\hspace*{0.5in} (window-background w)} \\
+\texttt{\hspace*{0.5in} (window-set-background w bg-color)} \\
 
 
 \subsection{Color}
@@ -551,58 +552,58 @@
 The color of the foreground (things that are drawn, such as lines or
 characters) is set by:
 
-{\tt \hspace*{0.5in} (window-set-color w rgb \&optional background)} \\
+\texttt{\hspace*{0.5in} (window-set-color w rgb \&optional background)} \\
 
-{\tt rgb} is a list {\tt (red green blue)} of 16-bit unsigned integers in
-the range {\tt 0} to {\tt 65535}.  {\tt background} is non-{\tt nil}
-to set the background color rather than the foreground color.
+\texttt{rgb} is a list \texttt{(red green blue)} of 16-bit unsigned integers in
+the range \texttt{0} to \texttt{65535}.  \texttt{background} is
+non-\texttt{nil} to set the background color rather than the foreground color.
 
 Colors are a scarce resource; there is only a finite number of
 available colors, such as 256 colors.  If you only use a small, fixed set
 of colors, the finite set of colors will not be a problem.  However,
 if you create a lot of colors that are used only briefly, it will be
 necessary to release them after they are no longer needed.
-{\tt window-set-color} will leave the global variable {\tt *window-xcolor*}
-set to an integer value that denotes an X color; this value should be
-saved and used as the argument to {\tt window-free-color} to release
-the color after it is no longer needed.
+\texttt{window-set-color} will leave the global variable
+\texttt{*window-xcolor*} set to an integer value that denotes an X color; this
+value should be saved and used as the argument to \texttt{window-free-color}
+to release the color after it is no longer needed.
 
-{\tt \hspace*{0.5in} (window-free-color w \&optional xcolor)} \\
+\texttt{\hspace*{0.5in} (window-free-color w \&optional xcolor)} \\
 
-{\tt window-free-color} frees either the last color used, as given by
-{\tt *window-xcolor*}, or the specified color.
+\texttt{window-free-color} frees either the last color used, as given by
+\texttt{*window-xcolor*}, or the specified color.
 
 
 \subsection{Character Input} \label{texted}
 
 Characters can be input within a window by the call:
 
-{\tt \hspace*{0.5in} (window-input-string w str x y \&optional size)} \\
+\texttt{\hspace*{0.5in} (window-input-string w str x y \&optional size)} \\
 
-{\tt window-input-string} will print the initial string {\tt str},
-if non-{\tt nil},
-at the specified position in the window; {\tt str}, if not modified
+\texttt{window-input-string} will print the initial string \texttt{str},
+if non-\texttt{nil},
+at the specified position in the window; \texttt{str}, if not modified
 by the user, will also be the initial part of the result.  A caret
 is displayed showing the location of the next input character.
 Characters are echoed as they are typed; backspacing erases characters,
-including those from the initial string {\tt str}.  An area of width
-{\tt size} (default 100) is erased to the right of the initial caret.
+including those from the initial string \texttt{str}.  An area of width
+\texttt{size} (default 100) is erased to the right of the initial caret.
 
 
 \subsection{Emacs-like Editing} \label{emacsed}
 
-{\tt window-edit} allows editing of text using an Emacs-subset editor.
+\texttt{window-edit} allows editing of text using an Emacs-subset editor.
 Only a few simple Emacs commands are implemented.
 \begin{verbatim}
    (window-edit w x y width height &optional strings boxflg scroll endp)
 \end{verbatim}
-{\tt x y width height} specify the offset and size of the editing
+\texttt{x y width height} specify the offset and size of the editing
 area; it is a good idea to draw a box around this area first.
-{\tt strings} is an initial list of strings; the return value is a list
+\texttt{strings} is an initial list of strings; the return value is a list
 of strings.
-{\tt scroll} is number of lines to scroll down before displaying text,
-          or {\tt T} to have one line only and terminate on return.
-{\tt endp} is {\tt T} to begin editing at the end of the first line.
+\texttt{scroll} is number of lines to scroll down before displaying text,
+          or \texttt{T} to have one line only and terminate on return.
+\texttt{endp} is \texttt{T} to begin editing at the end of the first line.
 Example:
 \begin{verbatim}
   (window-draw-box-xy myw 48 48 204 204)
@@ -612,130 +613,132 @@
 
 \section{Mouse Interaction}
 
-{\tt \hspace*{0.5in} (window-get-point w)} \\
-{\tt \hspace*{0.5in} (window-get-crosshairs w)} \\
-{\tt \hspace*{0.5in} (window-get-cross w)} \\
-These functions  get a point position by mouse click; they return {\tt (x y)} .
+\texttt{\hspace*{0.5in} (window-get-point w)} \\
+\texttt{\hspace*{0.5in} (window-get-crosshairs w)} \\
+\texttt{\hspace*{0.5in} (window-get-cross w)} \\
+These functions  get a point position by mouse click; they return
+\texttt{(x y)}.
 
 The following function gets a point position by mouse click.  It returns
-{\tt (button (x y))} where {\tt button} is {\tt 1} for the left button,
-{\tt 2} for middle, {\tt 3} for right.
+\texttt{(button (x y))} where \texttt{button} is \texttt{1} for the left
+button, \texttt{2} for middle, \texttt{3} for right.
 
-{\tt \hspace*{0.5in} (window-get-click w)} \\
+\texttt{\hspace*{0.5in} (window-get-click w)} \\
 
 The following function gets a point position by mouse click within a specified
-region.  It returns {\tt (button (x y))} or {\tt NIL} if the mouse leaves
-the region.  If {\tt boxflg} is {\tt t}, a box will be drawn outside the
+region.  It returns \texttt{(button (x y))} or \texttt{NIL} if the mouse leaves
+the region.  If \texttt{boxflg} is \texttt{t}, a box will be drawn outside the
 region while the mouse is being tracked.
 
-{\tt \hspace*{0.5in} (window-track-mouse-in-region w x y sizex sizey \&optional boxflg)} \\
+\texttt{\hspace*{0.5in} (window-track-mouse-in-region w x y sizex sizey \&optional boxflg)} \\
 
 
 The following functions get a point position indicated by drawing a line
 from a specified origin position to the cursor position; they return
-{\tt (x y)} at the cursor position when a mouse button is clicked.
-The {\tt latex} version restricts the slope of the line to be a slope that
-\LaTeX \ can draw; if {\tt flg} is non-{\tt nil}, the slope is restricted
-to be a \LaTeX \ {\tt vector} slope.
+\texttt{(x y)} at the cursor position when a mouse button is clicked.
+The \texttt{latex} version restricts the slope of the line to be a slope that
+\LaTeX \ can draw; if \texttt{flg} is non-\texttt{nil}, the slope is restricted
+to be a \LaTeX \ \texttt{vector} slope.
 
-{\tt \hspace*{0.5in} (window-get-line-position w orgx orgy)} \\
-{\tt \hspace*{0.5in} (window-get-latex-position w orgx orgy flg)} \\
+\texttt{\hspace*{0.5in} (window-get-line-position w orgx orgy)} \\
+\texttt{\hspace*{0.5in} (window-get-latex-position w orgx orgy flg)} \\
 
-The following function gets a position by moving a ``ghost'' icon,
-defined by the icon drawing function {\tt fn}.  This allows exact positioning
+The following function gets a position by moving a ``ghost'' icon, defined
+by the icon drawing function \texttt{fn}.  This allows exact positioning
 of an object by the user.
 
-{\tt \hspace*{0.5in} (window-get-icon-position w fn args \&optional (dx 0)
+\texttt{\hspace*{0.5in} (window-get-icon-position w fn args \&optional (dx 0)
  (dy 0))} \\
 
 \vspace{-0.15in}
-The function {\tt fn} has arguments {\tt (fn w x y . args)} , where {\tt x}
-and {\tt y} are the offset within the window {\tt w} at which the icon is
-to be drawn, and {\tt args} is a list of arbitrary arguments, e.g., the size
-of the icon, that are passed through to the drawing function.
-The icon is drawn in {\tt xor} mode, so it must be drawn using
+The function \texttt{fn} has arguments \texttt{(fn w x y . args)} , where
+\texttt{x} and \texttt{y} are the offset within the window \texttt{w} at which
+the icon is to be drawn, and \texttt{args} is a list of arbitrary arguments,
+e.g., the size of the icon, that are passed through to the drawing function.
+The icon is drawn in \texttt{xor} mode, so it must be drawn using
 only ``plain'' drawing functions, without resetting window attributes.
-The returned value is {\tt (x y)} at the cursor position when a button
-is clicked.  {\tt dx} and {\tt dy}, if specified, are offsets of {\tt x}
-and {\tt y} from the cursor position.
+The returned value is \texttt{(x y)} at the cursor position when a button
+is clicked.  \texttt{dx} and \texttt{dy}, if specified, are offsets of
+\texttt{x} and \texttt{y} from the cursor position.
 
 The following function gets a position by moving a ``ghost'' box icon.
 
-{\tt \hspace*{0.5in} (window-get-box-position w width height \&optional (dx 0) (dy 0))} \\
+\texttt{\hspace*{0.5in} (window-get-box-position w width height \&optional (dx 0) (dy 0))} \\
 
 \vspace{-0.15in}
 By default, the lower-left corner of the box is placed at the cursor position;
-{\tt dx} and {\tt dy} may be used to offset the box from the cursor, e.g.,
-to move the box by a different corner.  The returned value is {\tt (x y)}
-at the cursor position when a button is clicked.
+\texttt{dx} and \texttt{dy} may be used to offset the box from the cursor,
+e.g., to move the box by a different corner.  The returned value is
+\texttt{(x y)} at the cursor position when a button is clicked.
 
 The following function gets coordinates of a box of arbitrary size and
 position.
 
-{\tt \hspace*{0.5in} (window-get-region w)} \\
+\texttt{\hspace*{0.5in} (window-get-region w)} \\
 
 \vspace{-0.15in}
 The user first clicks for one corner of the box, moves the
 mouse and clicks again for the opposite corner, then moves the box into
 the desired position. The returned value is \linebreak
-{\tt ((x y) (width height))},
-where {\tt (x y)} is the lower-left corner of the box.
+\texttt{((x y) (width height))},
+where \texttt{(x y)} is the lower-left corner of the box.
 
 The following function gets the size of a box by mouse selection,
-echoing the size in pixels below the box.  {\tt offsety}
-should be at least {\tt 30} to leave room to display the size of the box.
+echoing the size in pixels below the box.  \texttt{offsety}
+should be at least \texttt{30} to leave room to display the size of the box.
 
-{\tt \hspace*{0.5in} (window-get-box-size w offsetx offsety)} \\
+\texttt{\hspace*{0.5in} (window-get-box-size w offsetx offsety)} \\
 
 
 The following function adjusts one side of a box.
 
-{\tt \hspace*{0.5in} (window-adjust-box-side w x y width height side)} \\
+\texttt{\hspace*{0.5in} (window-adjust-box-side w x y width height side)} \\
 
 \vspace{-0.15in}
-{\tt side} specifies the side of the box to be adjusted: {\tt left},
-{\tt right}, {\tt top}, or {\tt bottom}.  The result is
-{\tt ((x y) (width height))} for the resulting box.
+\texttt{side} specifies the side of the box to be adjusted: \texttt{left},
+\texttt{right}, \texttt{top}, or \texttt{bottom}.  The result is
+\texttt{((x y) (width height))} for the resulting box.
 
-{\tt \hspace*{0.5in} (window-get-circle w \&optional center:vector)} \\
-{\tt \hspace*{0.5in} (window-get-ellipse w \&optional center:vector)} \\
+\texttt{\hspace*{0.5in} (window-get-circle w \&optional center:vector)} \\
+\texttt{\hspace*{0.5in} (window-get-ellipse w \&optional center:vector)} \\
 These functions interactively get a circle or ellipse.  For an ellipse,
 a circle is gotten first for the horizontal size; then the vertical
 size of the ellipse is adjusted.
-{\tt window-get-circle} returns {\tt ((x y) radius)}.
-{\tt window-get-ellipse} returns {\tt ((x y) (xradius yradius))}.
+\texttt{window-get-circle} returns \texttt{((x y) radius)}.
+\texttt{window-get-ellipse} returns \texttt{((x y) (xradius yradius))}.
 
-% {\tt \hspace*{0.5in} (window-sync w)} will clear the event queue of any
+% \texttt{\hspace*{0.5in} (window-sync w)} will clear the event queue of any
 % previous motion events.
 
-{\tt window-track-mouse} is the basic function for following the mouse
+\texttt{window-track-mouse} is the basic function for following the mouse
 and performing some action as it moves.  This function is used in
 the implementation of menus and the mouse-interaction functions described in
 this section.
 
-{\tt \hspace*{0.5in} (window-track-mouse w fn \&optional outflg)}
+\texttt{\hspace*{0.5in} (window-track-mouse w fn \&optional outflg)}
           
 \vspace{-0.05in}
 Each time the mouse position changes or a mouse button is pressed,
-the function {\tt fn} is called with
-arguments {\tt (x y code)} where {\tt x} and {\tt y} are the cursor
-position, {\tt code} is a button code ({\tt 0} if no button, {\tt 1} for
-the left button, {\tt 2} for the middle button, or {\tt 3} for the right
-button).  {\tt window-track-mouse} continues to track the mouse until {\tt fn}
-returns a value other than {\tt nil}, at which time {\tt window-track-mouse}
-returns that value.  Usually, it is a good idea for {\tt fn} to return a
-value other than {\tt nil} upon a mouse click.  If the argument {\tt outflg}
-is non-{\tt nil}, the function {\tt fn} will be called for button clicks
-outside the window {\tt w}; note, however, that such clicks will not be
-seen if the containing window intercepts them, so that this feature will
-work only if the window {\tt w} is inside another Lisp user window.
+the function \texttt{fn} is called with arguments
+\texttt{(x y code)} where \texttt{x} and \texttt{y} are the cursor position,
+\texttt{code} is a button code (\texttt{0} if no button, \texttt{1} for
+the left button, \texttt{2} for the middle button, or \texttt{3} for the right
+button).  \texttt{window-track-mouse} continues to track the mouse until
+\texttt{fn} returns a value other than \texttt{nil}, at which time
+\texttt{window-track-mouse} returns that value.  Usually, it is a good idea
+for \texttt{fn} to return a value other than \texttt{nil} upon a mouse click.
+If the argument \texttt{outflg} is non-\texttt{nil}, the function \texttt{fn}
+will be called for button clicks outside the window \texttt{w}; note, however,
+that such clicks will not be seen if the containing window intercepts them, so
+that this feature will work only if the window \texttt{w} is inside another
+Lisp user window.
 
 
 \section{Miscellaneous Functions}
 
-{\tt \hspace*{0.5in} (stringify x)} makes its argument into a string.
+\texttt{\hspace*{0.5in} (stringify x)} makes its argument into a string.
 
-{\tt \hspace*{0.5in} (window-destroy-selected-window)} waits 3 seconds,
+\texttt{\hspace*{0.5in} (window-destroy-selected-window)} waits 3 seconds,
 then destroys the window containing the mouse cursor.  This function
 should be used with care; it can destroy a non-user window, causing
 processes associated with the window to be destroyed.  It is useful
@@ -746,7 +749,7 @@
 \section{Examples}
 
 Several interactive programs using this software for their graphical
-interface can be found at {\tt http://www.cs.utexas.edu/users/novak/}
+interface can be found at \texttt{http://www.cs.utexas.edu/users/novak/}
 under the heading Software Demos.
 
 
@@ -756,31 +759,31 @@
 a web page.  There are two approaches, either using an X server on
 the computer of the person viewing the web page, or using WeirdX, a
 Java program that emulates an X server.  Details can be found at:
-{\tt http://www.cs.utexas.edu/users/novak/dwindow.html} 
+\texttt{http://www.cs.utexas.edu/users/novak/dwindow.html} 
 
 
 \section{Files}
 
 \begin{tabular}{ll}
-{\tt dec.copyright}  & Copyright and license for DEC/MIT files \\
-{\tt draw.lsp}       & GLISP source code for interactive drawing utility \\
-{\tt drawtrans.lsp}  & {\tt draw.lsp} translated into plain Lisp \\
-{\tt draw-gates.lsp} & Code to draw {\tt nand} gates etc. \\
-{\tt dwdoc.tex}      & \LaTeX \ source for this document \\
-{\tt dwexports.lsp}  & exported symbols \\
-{\tt dwimportsb.lsp} & imported symbols \\
-{\tt dwindow.lsp}    & GLISP source code for {\tt dwindow} functions \\
-{\tt dwtest.lsp}     & Examples of use of {\tt dwindow} functions \\
-{\tt dwtrans.lsp}    & {\tt dwindow.lsp} translated into plain Lisp \\
-{\tt editors.lsp}    & Editors for colors etc. \\
-{\tt editorstrans.lsp}    & translation of {\tt editors.lsp} \\
-{\tt gnu.license}    & GNU General Public License \\
-{\tt ice-cream.lsp}  & Drawing of an ice cream cone made with {\tt draw} \\
-{\tt lispserver.lsp} & Example web demo: a Lisp server \\
-{\tt lispservertrans.lsp}    & translation of {\tt lispserver.lsp} \\
-{\tt menu-set.lsp}   & GLISP source code for menu-set functions \\
-{\tt menu-settrans.lsp}   & translation of {\tt menu-set.lsp} \\
-{\tt pcalc.lsp}      & Pocket calculator implemented as a {\tt picmenu} \\
+\texttt{dec.copyright}  & Copyright and license for DEC/MIT files \\
+\texttt{draw.lsp}       & GLISP source code for interactive drawing utility \\
+\texttt{drawtrans.lsp}  & \texttt{draw.lsp} translated into plain Lisp \\
+\texttt{draw-gates.lsp} & Code to draw \texttt{nand} gates etc. \\
+\texttt{dwdoc.tex}      & \LaTeX \ source for this document \\
+\texttt{dwexports.lsp}  & exported symbols \\
+\texttt{dwimportsb.lsp} & imported symbols \\
+\texttt{dwindow.lsp}    & GLISP source code for \texttt{dwindow} functions \\
+\texttt{dwtest.lsp}     & Examples of use of \texttt{dwindow} functions \\
+\texttt{dwtrans.lsp}    & \texttt{dwindow.lsp} translated into plain Lisp \\
+\texttt{editors.lsp}    & Editors for colors etc. \\
+\texttt{editorstrans.lsp}    & translation of \texttt{editors.lsp} \\
+\texttt{gnu.license}    & GNU General Public License \\
+\texttt{ice-cream.lsp}  & Drawing of an ice cream cone made with \texttt{draw} \\
+\texttt{lispserver.lsp} & Example web demo: a Lisp server \\
+\texttt{lispservertrans.lsp}    & translation of \texttt{lispserver.lsp} \\
+\texttt{menu-set.lsp}   & GLISP source code for menu-set functions \\
+\texttt{menu-settrans.lsp}   & translation of \texttt{menu-set.lsp} \\
+\texttt{pcalc.lsp}      & Pocket calculator implemented as a \texttt{picmenu} \\
 \end{tabular}
 
 

gcl-2.6.8-loginname.patch:

--- NEW FILE gcl-2.6.8-loginname.patch ---
diff -dur gcl-2.6.8.ORIG/o/unixfsys.c gcl-2.6.8/o/unixfsys.c
--- gcl-2.6.8.ORIG/o/unixfsys.c	2008-12-29 17:42:18.000000000 -0700
+++ gcl-2.6.8/o/unixfsys.c	2008-12-29 17:51:35.000000000 -0700
@@ -214,7 +214,7 @@
     
 #ifndef NO_PWD_H  
   if(namestring->st.st_self[0]=='~')
-    {char name[20];
+    {char name[LOGIN_NAME_MAX];
      int n;
      char *q = namestring->st.st_self;
 #ifndef __STDC__
@@ -224,8 +224,7 @@
 
      struct passwd *pwent;
      int m=0;
-     q=namestring->st.st_self;
-     for (n=0; n< namestring->st.st_fillp; n++)
+     for (n=1; n< namestring->st.st_fillp; n++)
        if (q[n]=='/') break;
      bcopy(q+1,name,n-1);
      name[n-1]= 0;

gcl-2.6.8-rename.patch:

--- NEW FILE gcl-2.6.8-rename.patch ---
diff -dur gcl-2.6.8.ORIG/o/unixfsys.c gcl-2.6.8/o/unixfsys.c
--- gcl-2.6.8.ORIG/o/unixfsys.c	2007-04-06 08:41:09.000000000 -0600
+++ gcl-2.6.8/o/unixfsys.c	2008-12-29 17:34:10.000000000 -0700
@@ -448,11 +448,17 @@
 backup_fopen(char *filename, char *option)
 {
 	char backupfilename[MAXPATHLEN];
+#ifndef HAVE_RENAME
 	char command[MAXPATHLEN * 2];
+#endif
 
 	strcat(strcpy(backupfilename, filename), ".BAK");
+#ifdef HAVE_RENAME
+	rename(filename, backupfilename);
+#else
 	sprintf(command, "mv %s %s", filename, backupfilename);
 	system(command);
+#endif
 	return(fopen(filename, option));
 }
 
@@ -477,6 +483,9 @@
 {
 	char filename[MAXPATHLEN];
 	char newfilename[MAXPATHLEN];
+#ifndef HAVE_RENAME
+	char command[MAXPATHLEN * 2];
+#endif
 
 	check_arg(2);
 	check_type_or_pathname_string_symbol_stream(&vs_base[0]);

gcl-2.6.8-selinux.patch:

--- NEW FILE gcl-2.6.8-selinux.patch ---
diff -durN gcl-2.6.8.ORIG/clcs/makefile gcl-2.6.8/clcs/makefile
--- gcl-2.6.8.ORIG/clcs/makefile	2005-05-06 15:56:55.000000000 -0600
+++ gcl-2.6.8/clcs/makefile	2009-01-09 17:43:02.000000000 -0700
@@ -9,6 +9,9 @@
 
 saved_clcs_gcl: ../unixport/saved_pcl_gcl
 	echo '(load "package.lisp")(load "myload.lisp")(si::save-system "$@")' | $< $(<D)/
+	if [ -x /usr/sbin/selinuxenabled ] && /usr/sbin/selinuxenabled; then \
+		chcon -t gcl_exec_t $@; \
+	fi
 
 %.h %.data %.c : %.lisp saved_clcs_gcl
 	cp ../h/cmpinclude.h .
@@ -31,6 +34,9 @@
 
 saved_full_gcl: ${LISP}
 	echo '(load "package.lisp")(load "loading.lisp")(jamie-load-clcs :compiled)(system::save-system "saved_full_gcl")' | ${LISP}
+	if [ -x /usr/sbin/selinuxenabled ] && /usr/sbin/selinuxenabled; then \
+		chcon -t gcl_exec_t $@; \
+	fi
 
 clean:
 	rm -f *.o *.fn saved_full_gcl$(EXE) saved_full_gcl cmpinclude.h *.c *.h *.data saved_clcs_gcl
diff -durN gcl-2.6.8.ORIG/makefile gcl-2.6.8/makefile
--- gcl-2.6.8.ORIG/makefile	2007-11-30 09:59:33.000000000 -0700
+++ gcl-2.6.8/makefile	2009-01-09 17:43:02.000000000 -0700
@@ -187,6 +187,9 @@
 	if gcc --version | grep -i mingw >/dev/null 2>&1 ; then if grep -i oncrpc makedefs >/dev/null 2>&1 ; then cp /mingw/bin/oncrpc.dll $(DESTDIR)$(INSTALL_LIB_DIR)/$(PORTDIR); fi ; fi
 	cd $(DESTDIR)$(INSTALL_LIB_DIR)/$(PORTDIR) && \
 		mv $(FLISP)$(EXE) temp$(EXE) && \
+		if [ -x /usr/sbin/selinuxenabled ] && /usr/sbin/selinuxenabled; then \
+			chcon -t gcl_exec_t temp$(EXE); \
+		fi && \
 		echo '(reset-sys-paths "$(INSTALL_LIB_DIR)/")(si::save-system "$(FLISP)$(EXE)")' | ./temp$(EXE) && \
 		rm -f temp$(EXE)
 	if [ -e "unixport/rsym$(EXE)" ] ; then cp unixport/rsym$(EXE) $(DESTDIR)$(INSTALL_LIB_DIR)/unixport/ ; fi
diff -durN gcl-2.6.8.ORIG/selinux/gcl.fc gcl-2.6.8/selinux/gcl.fc
--- gcl-2.6.8.ORIG/selinux/gcl.fc	1969-12-31 17:00:00.000000000 -0700
+++ gcl-2.6.8/selinux/gcl.fc	2009-01-09 17:43:02.000000000 -0700
@@ -0,0 +1,2 @@
+/usr/lib64/gcl-[^/]+/unixport/saved_.*	--	gen_context(system_u:object_r:gcl_exec_t,s0)
+/usr/lib/gcl-[^/]+/unixport/saved_.*	--	gen_context(system_u:object_r:gcl_exec_t,s0)
diff -durN gcl-2.6.8.ORIG/selinux/gcl.if gcl-2.6.8/selinux/gcl.if
--- gcl-2.6.8.ORIG/selinux/gcl.if	1969-12-31 17:00:00.000000000 -0700
+++ gcl-2.6.8/selinux/gcl.if	2009-01-09 17:43:02.000000000 -0700
@@ -0,0 +1,146 @@
+
+## <summary>policy for gcl</summary>
+
+########################################
+## <summary>
+##	Execute a domain transition to run gcl.
+## </summary>
+## <param name="domain">
+## <summary>
+##	Domain allowed to transition.
+## </summary>
+## </param>
+#
+interface(`gcl_domtrans',`
+	gen_require(`
+		type gcl_t;
+                type gcl_exec_t;
+	')
+
+	domtrans_pattern($1,gcl_exec_t,gcl_t)
+')
+
+
+########################################
+## <summary>
+##	Do not audit attempts to read, 
+##	gcl tmp files
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain to not audit.
+##	</summary>
+## </param>
+#
+interface(`gcl_dontaudit_read_tmp_files',`
+	gen_require(`
+		type gcl_tmp_t;
+	')
+
+	dontaudit $1 gcl_tmp_t:file read_file_perms;
+')
+
+########################################
+## <summary>
+##	Allow domain to read, gcl tmp files
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain to not audit.
+##	</summary>
+## </param>
+#
+interface(`gcl_read_tmp_files',`
+	gen_require(`
+		type gcl_tmp_t;
+	')
+
+	allow $1 gcl_tmp_t:file read_file_perms;
+')
+
+########################################
+## <summary>
+##	Allow domain to manage gcl tmp files
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain to not audit.
+##	</summary>
+## </param>
+#
+interface(`gcl_manage_tmp',`
+	gen_require(`
+		type gcl_tmp_t;
+	')
+
+         manage_dirs_pattern($1,gcl_tmp_t,gcl_tmp_t)
+         manage_files_pattern($1,gcl_tmp_t,gcl_tmp_t)
+         manage_lnk_files_pattern($1,gcl_tmp_t,gcl_tmp_t)
+')
+
+########################################
+## <summary>
+##	Execute gcl in the gcl domain, and
+##	allow the specified role the gcl domain.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain allowed access
+##	</summary>
+## </param>
+## <param name="role">
+##	<summary>
+##	The role to be allowed the gcl domain.
+##	</summary>
+## </param>
+## <param name="terminal">
+##	<summary>
+##	The type of the role's terminal.
+##	</summary>
+## </param>
+#
+interface(`gcl_run',`
+	gen_require(`
+		type gcl_t;
+	')
+
+	gcl_domtrans($1)
+	role $2 types gcl_t;
+	dontaudit gcl_t $3:chr_file rw_term_perms;
+')
+
+
+########################################
+## <summary>
+##	All of the rules required to administrate 
+##	an gcl environment
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain allowed access.
+##	</summary>
+## </param>
+## <param name="role">
+##	<summary>
+##	The role to be allowed to manage the gcl domain.
+##	</summary>
+## </param>
+## <param name="terminal">
+##	<summary>
+##	The type of the user terminal.
+##	</summary>
+## </param>
+## <rolecap/>
+#
+interface(`gcl_admin',`
+	gen_require(`
+		type gcl_t;
+	')
+
+	allow $1 gcl_t:process { ptrace signal_perms getattr };
+	read_files_pattern($1, gcl_t, gcl_t)
+	        
+
+	gcl_manage_tmp($1)
+
+')
diff -durN gcl-2.6.8.ORIG/selinux/gcl.te gcl-2.6.8/selinux/gcl.te
--- gcl-2.6.8.ORIG/selinux/gcl.te	1969-12-31 17:00:00.000000000 -0700
+++ gcl-2.6.8/selinux/gcl.te	2009-01-09 17:43:07.000000000 -0700
@@ -0,0 +1,50 @@
+policy_module(gcl,1.0.0)
+
+########################################
+#
+# Declarations
+#
+
+type gcl_t;
+type gcl_exec_t;
+application_domain(gcl_t, gcl_exec_t)
+role system_r types gcl_t;
+
+########################################
+#
+# gcl local policy
+#
+
+## internal communication is often done using fifo and unix sockets.
+allow gcl_t self:fifo_file rw_file_perms;
+allow gcl_t self:unix_stream_socket create_stream_socket_perms;
+
+libs_use_ld_so(gcl_t)
+libs_use_shared_libs(gcl_t)
+
+miscfiles_read_localization(gcl_t)
+
+## The GCL memory management and executable dumping routines manipulate memory
+## in various (usually forbidden) ways.
+allow gcl_t self:memprotect mmap_zero;
+allow gcl_t self:process { execmem execheap };
+
+unconfined_domain(gcl_t)
+
+optional_policy(`
+	gen_require(`
+		type unconfined_t;
+		type unconfined_devpts_t;
+		type unconfined_execmem_t;  # Remove this later; see below
+		type unconfined_tty_device_t;
+		role unconfined_r;
+	')
+
+	gcl_run(unconfined_t, unconfined_r, { unconfined_tty_device_t unconfined_devpts_t })
+	allow gcl_t gcl_exec_t:file execmod;
+
+	# Some versions of selinux-policy-targeted, released between November
+	# 2008 and early January 2009, give /usr/bin/gcl type execmem_exec_t.
+	# Remove this once those versions are dead and buried.
+	allow unconfined_execmem_t gcl_exec_t:file execmod;
+')
diff -durN gcl-2.6.8.ORIG/unixport/makefile gcl-2.6.8/unixport/makefile
--- gcl-2.6.8.ORIG/unixport/makefile	2006-08-23 12:14:22.000000000 -0600
+++ gcl-2.6.8/unixport/makefile	2009-01-09 17:43:02.000000000 -0700
@@ -118,6 +118,9 @@
 	cp init_$*.lsp foo
 	echo " (in-package \"USER\")(system:save-system \"$@\")" >>foo
 	$(PORTDIR)/raw_$*$(EXE) $(PORTDIR)/ -libdir $(GCLDIR)/ < foo
+	if [ -x /usr/sbin/selinuxenabled ] && /usr/sbin/selinuxenabled; then \
+		chcon -t gcl_exec_t $@; \
+	fi
 
 $(RSYM): $(SPECIAL_RSYM) $(HDIR)/mdefs.h
 	$(CC) $(CFLAGS) -I$(HDIR) -I$(ODIR) -o $(RSYM) $(SPECIAL_RSYM)
@@ -157,6 +160,9 @@
 	$(CC) -o raw_$*$(EXE) $(filter %.o,$^) \
 		-L. $(EXTRA_LD_LIBS) $(LD_LIBS_PRE) -l$* $(LD_LIBS_POST)
 endif
+	if [ -x /usr/sbin/selinuxenabled ] && /usr/sbin/selinuxenabled; then \
+		chcon -t gcl_exec_t raw_$*$(EXE); \
+	fi
 #	diff map_$* map_$*.old >/dev/null || (cp map_$* map_$*.old && rm -f $@ && $(MAKE) $@)
 #	cp map_$*.old map_$*
 

gcl-2.6.8-sigprocmask-linux.patch:

--- NEW FILE gcl-2.6.8-sigprocmask-linux.patch ---
diff -dur gcl-2.6.8.ORIG/h/linux.h gcl-2.6.8/h/linux.h
--- gcl-2.6.8.ORIG/h/linux.h	2008-08-01 10:51:43.000000000 -0600
+++ gcl-2.6.8/h/linux.h	2008-12-29 17:14:05.000000000 -0700
@@ -85,13 +85,7 @@
 #define SV_ONSTACK 0
 #endif
 
-/* unblock signals m and n, and set val to signal_mask(m) | signal_mask(n)
-   if they were set */
-#define SIG_UNBLOCK_SIGNALS(val,m,n) \
-    current_mask = sigblock(0);  \
-    sigsetmask(~(sigmask(m)) & ~(sigmask(n)) & current_mask); \
-    result = (current_mask & sigmask(m) ? signal_mask(m) : 0) \
-      | (current_mask & sigmask(n) ? signal_mask(n) : 0);
+#define HAVE_SIGPROCMASK
 
 #define RUN_PROCESS
 

gcl-2.6.8-texinfo.patch:

--- NEW FILE gcl-2.6.8-texinfo.patch ---
diff -dur gcl-2.6.8.ORIG/info/gcl-si.texi gcl-2.6.8/info/gcl-si.texi
--- gcl-2.6.8.ORIG/info/gcl-si.texi	2005-04-30 22:12:37.000000000 -0600
+++ gcl-2.6.8/info/gcl-si.texi	2008-12-29 21:09:53.000000000 -0700
@@ -10,6 +10,7 @@
 
 @c @smallbook
 @setfilename gcl-si.info
+ at settitle GCL SI Manual
 @synindex vr fn
 
 @c to update the menus do: 
diff -dur gcl-2.6.8.ORIG/info/gcl-tk.texi gcl-2.6.8/info/gcl-tk.texi
--- gcl-2.6.8.ORIG/info/gcl-tk.texi	2002-02-19 12:21:19.000000000 -0700
+++ gcl-2.6.8/info/gcl-tk.texi	2008-12-29 21:09:53.000000000 -0700
@@ -2,6 +2,7 @@
 @c -*-texinfo-*-
 @c @smallbook
 @setfilename gcl-tk.info
+ at settitle GCL TK Manual
 
 @c to update the menus do: 
 @c (texinfo-multiple-files-update "gcl-tk.texi" t t)

gcl-2.6.8-unrandomize.patch:

--- NEW FILE gcl-2.6.8-unrandomize.patch ---
diff -dur gcl-2.6.8.ORIG/configure gcl-2.6.8/configure
--- gcl-2.6.8.ORIG/configure	2008-12-29 16:24:30.000000000 -0700
+++ gcl-2.6.8/configure	2008-12-29 16:45:51.000000000 -0700
@@ -9880,9 +9880,11 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
+		    #define CAN_UNRANDOMIZE_SBRK 1
+		    #include "h/unrandomize.h"
 		    void gprof_cleanup() {}
 		    int main(int argc,char *argv[],char *envp[]) {
-	            #include "h/unrandomize.h"
+		    UNRANDOMIZE_SBRK;
 		    return 0;}
 _ACEOF
 rm -f conftest$ac_exeext
@@ -9947,12 +9949,11 @@
 /* end confdefs.h.  */
 
 		    #include <stdio.h>
+		    #include "h/unrandomize.h"
 	            void gprof_cleanup() {}
 		    int main(int argc,char * argv[],char * envp[]) {
 			FILE *f;
-			#ifdef CAN_UNRANDOMIZE_SBRK
-			#include "h/unrandomize.h"
-			#endif
+			UNRANDOMIZE_SBRK;
 			if (!(f=fopen("conftest1","w"))) return -1;
 			fprintf(f,"%u",sbrk(0));
 			return 0;}
@@ -10009,12 +10010,11 @@
 /* end confdefs.h.  */
 
 		    #include <stdio.h>
+		    #include "h/unrandomize.h"
                     void gprof_cleanup() {}
 		    int main(int argc,char * argv[],char * envp[]) {
 			FILE *f;
-			#ifdef CAN_UNRANDOMIZE_SBRK
-			#include "h/unrandomize.h"
-			#endif
+			UNRANDOMIZE_SBRK;
 			if (!(f=fopen("conftest1","w"))) return -1;
 			fprintf(f,"%u",sbrk(0));
 			return 0;}
@@ -10165,6 +10165,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
+#include "h/unrandomize.h"
 
 void gprof_cleanup() {}
 int
@@ -10173,9 +10174,7 @@
   char *b,*b1;
   FILE *fp;
 
-#ifdef CAN_UNRANDOMIZE_SBRK
-#include "h/unrandomize.h"
-#endif
+  UNRANDOMIZE_SBRK;
   b = (void *) malloc(1000);
   fp = fopen("conftest1","w");
 
diff -dur gcl-2.6.8.ORIG/configure.in gcl-2.6.8/configure.in
--- gcl-2.6.8.ORIG/configure.in	2008-12-29 16:24:30.000000000 -0700
+++ gcl-2.6.8/configure.in	2008-12-29 16:37:26.000000000 -0700
@@ -1087,9 +1087,11 @@
 
 	AC_MSG_CHECKING([for personality(ADDR_NO_RANDOMIZE) support])
 	AC_RUN_IFELSE([AC_LANG_SOURCE([[
+		    #define CAN_UNRANDOMIZE_SBRK 1
+		    #include "h/unrandomize.h"
 		    void gprof_cleanup() {}
 		    int main(int argc,char *argv[],char *envp[]) {
-	            #include "h/unrandomize.h"
+		    UNRANDOMIZE_SBRK;
 		    return 0;}]])],CAN_UNRANDOMIZE_SBRK=1,CAN_UNRANDOMIZE_SBRK=0,CAN_UNRANDOMIZE_SBRK=0)
 
 	if test "$CAN_UNRANDOMIZE_SBRK" != 0 ; then
@@ -1102,12 +1104,11 @@
 	AC_MSG_CHECKING([that sbrk is (now) non-random])
 	AC_RUN_IFELSE([AC_LANG_SOURCE([[
 		    #include <stdio.h>
+		    #include "h/unrandomize.h"
 	            void gprof_cleanup() {}
 		    int main(int argc,char * argv[],char * envp[]) {
 			FILE *f;
-			#ifdef CAN_UNRANDOMIZE_SBRK
-			#include "h/unrandomize.h"
-			#endif
+			UNRANDOMIZE_SBRK;
 			if (!(f=fopen("conftest1","w"))) return -1;
 			fprintf(f,"%u",sbrk(0));
 			return 0;}]])],SBRK=`cat conftest1`,SBRK=0,SBRK=0)
@@ -1116,12 +1117,11 @@
 	fi
 	AC_RUN_IFELSE([AC_LANG_SOURCE([[
 		    #include <stdio.h>
+		    #include "h/unrandomize.h"
                     void gprof_cleanup() {}
 		    int main(int argc,char * argv[],char * envp[]) {
 			FILE *f;
-			#ifdef CAN_UNRANDOMIZE_SBRK
-			#include "h/unrandomize.h"
-			#endif
+			UNRANDOMIZE_SBRK;
 			if (!(f=fopen("conftest1","w"))) return -1;
 			fprintf(f,"%u",sbrk(0));
 			return 0;}]])],SBRK1=`cat conftest1`,SBRK1=0,SBRK1=0)
@@ -1163,6 +1163,7 @@
 AC_RUN_IFELSE([AC_LANG_SOURCE([[
 #include <stdio.h>
 #include <stdlib.h>
+#include "h/unrandomize.h"
 
 void gprof_cleanup() {}
 int
@@ -1171,9 +1172,7 @@
   char *b,*b1;
   FILE *fp;
 
-#ifdef CAN_UNRANDOMIZE_SBRK
-#include "h/unrandomize.h"
-#endif
+  UNRANDOMIZE_SBRK;
   b = (void *) malloc(1000);
   fp = fopen("conftest1","w");
 
diff -dur gcl-2.6.8.ORIG/h/unrandomize.h gcl-2.6.8/h/unrandomize.h
--- gcl-2.6.8.ORIG/h/unrandomize.h	2008-08-20 19:13:58.000000000 -0600
+++ gcl-2.6.8/h/unrandomize.h	2008-12-29 16:42:15.000000000 -0700
@@ -1,25 +1,33 @@
+#include <stdlib.h>
 #include <sys/personality.h>
 #include <syscall.h>
 #include <unistd.h>
 #include <alloca.h>
 
-{
+#ifdef CAN_UNRANDOMIZE_SBRK
+# ifdef GCL_GPROF
+#  define GPROF_CLEANUP gprof_cleanup()
+# else
+#  define GPROF_CLEANUP
+# endif
 
-  long pers = personality(0xffffffffUL);
-  if (!(pers & ADDR_NO_RANDOMIZE) && !getenv("GCL_UNRANDOMIZE"))
-    if (personality(pers | ADDR_NO_RANDOMIZE) != -1 && personality(0xffffffffUL) & ADDR_NO_RANDOMIZE) {
-      int i;
-      char **n;
-      for (i=0;envp[i];i++);
-      n=alloca((i+2)*sizeof(*n));
-      n[i+1]=0;
-      n[i--]="GCL_UNRANDOMIZE=t";
-      for (;i>=0;i--)
-	n[i]=envp[i];
-#ifdef GCL_GPROF
-      gprof_cleanup();
+#define UNRANDOMIZE_SBRK do						\
+{									\
+  long pers = personality(0xffffffffUL);				\
+  if (!(pers & ADDR_NO_RANDOMIZE) && !getenv("GCL_UNRANDOMIZE"))	\
+    if (personality(pers | ADDR_NO_RANDOMIZE) != -1 && personality(0xffffffffUL) & ADDR_NO_RANDOMIZE) { \
+      int i;								\
+      char **n;								\
+      for (i=0;envp[i];i++);						\
+      n=alloca((i+2)*sizeof(*n));					\
+      n[i+1]=0;								\
+      n[i--]="GCL_UNRANDOMIZE=t";					\
+      for (;i>=0;i--)							\
+	n[i]=envp[i];							\
+      GPROF_CLEANUP;							\
+      execve(*argv,argv,n);						\
+    }									\
+ } while(0)
+#else
+# define UNRANDOMIZE_SBRK
 #endif
-      execve(*argv,argv,n);    
-    }
-
-}
diff -dur gcl-2.6.8.ORIG/o/main.c gcl-2.6.8/o/main.c
--- gcl-2.6.8.ORIG/o/main.c	2008-07-31 13:12:59.000000000 -0600
+++ gcl-2.6.8/o/main.c	2008-12-29 16:43:14.000000000 -0700
@@ -51,6 +51,7 @@
 #include <signal.h>
 #endif
 #include "page.h"
+#include "unrandomize.h"
 
 bool saving_system ;
 
@@ -125,9 +126,7 @@
 #endif
 #endif
 
-#ifdef CAN_UNRANDOMIZE_SBRK
-#include "unrandomize.h"
-#endif
+	UNRANDOMIZE_SBRK;
 
 #if defined(DARWIN)
 	{


--- NEW FILE gcl.el ---
(add-to-list 'load-path "%LISP_DIR%/gcl")
(autoload 'run "gcl" "Run GCL." t)
(autoload 'gcl-mode "gcl" "GCL mode." t)
(autoload 'dbl "dbl" "GCL debugger." t)


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gcl/F-9/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	7 Apr 2005 16:50:14 -0000	1.2
+++ .cvsignore	16 Jan 2009 22:25:16 -0000	1.3
@@ -1 +1 @@
-gcl-2.6.6.tar.gz
+gcl-2.6.8.tar.bz2


Index: gcl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gcl/F-9/gcl.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- gcl.spec	19 Feb 2008 03:32:40 -0000	1.26
+++ gcl.spec	16 Jan 2009 22:25:17 -0000	1.27
@@ -1,107 +1,327 @@
+# -fstack-protector leads to segfaults because GCL uses its own conflicting
+# stack protection scheme.
+%define __global_cflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2
+
+# Prerelease of 2.6.8
+%define alphatag 20080902cvs
+
+# If the emacs-el package has installed a pkgconfig file, use that to determine
+# install locations and Emacs version at build time, otherwise set defaults.
+%if %($(pkg-config emacs) ; echo $?)
+%define emacs_version 22.2
+%define emacs_lispdir %{_datadir}/emacs/site-lisp
+%else
+%define emacs_version %(pkg-config emacs --modversion)
+%define emacs_lispdir %(pkg-config emacs --variable sitepkglispdir)
+%endif
+
+# If the xemacs-devel package has installed a pkgconfig file, use that to
+# determine install locations and Emacs version at build time, otherwise set
+# defaults.
+%if %($(pkg-config xemacs) ; echo $?)
+%define xemacs_version 21.5
+%define xemacs_lispdir %{_datadir}/xemacs/site-packages/lisp
+%else
+%define xemacs_version %(pkg-config xemacs --modversion)
+%define xemacs_lispdir %(pkg-config xemacs --variable sitepkglispdir)
+%endif
+
 Name:           gcl
-Version:        2.6.7
-Release:        18%{?dist}
+Version:        2.6.8
+Release:        0.1.%{alphatag}%{?dist}
 Summary:        GNU Common Lisp
 
 Group:          Development/Languages
-License:        GPL, LGPL
-URL:            http://www.gnu.org/software/gcl
-Source:         ftp://ftp.gnu.org/pub/gnu/gcl/gcl-2.6.7.tar.gz
-Patch0:		gcl-pers.patch
-Patch1:		gcl-bash.patch
+License:        GPL+ and LGPLv2+
+URL:            http://www.gnu.org/software/gcl/
+# The source for this package was pulled from upstream's CVS repository.  Use
+# the following commands to generate the tarball:
+#   cvs -d:pserver:anonymous at cvs.savannah.gnu.org:/sources/gcl export \
+#     -r Version_2_6_8pre -D 2008-09-02 -d gcl-2.6.8 gcl
+#   tar -cjvf gcl-2.6.8.tar.bz2 gcl-2.6.8
+Source0:        gcl-%{version}.tar.bz2
+Source1:        gcl.el
+# This patch was last sent upstream on 29 Dec 2008.  It makes GCL use the
+# sigprocmask API instead of the deprecated sigblock API.
+Patch0:         gcl-2.6.8-sigprocmask-linux.patch
+# This patch was last sent upstream on 29 Dec 2008.  It fixes a file descriptor
+# leak, as well as combining 4 system calls into only 2 on an exec().
+Patch1:         gcl-2.6.8-fd-leak.patch
+# This patch was last sent upstream on 29 Dec 2008.  It updates one source file
+# from LaTeX 2.09 to LaTeX 2e, thereby eliminating LaTeX warnings about running
+# in compatibility mode.
+Patch2:         gcl-2.6.8-latex.patch
+# This patch was last sent upstream on 29 Dec 2008.  It eliminates a few minor
+# texinfo warnings.
+Patch3:         gcl-2.6.8-texinfo.patch
+# This patch was last sent upstream on 29 Dec 2008.  It fixes a large number of
+# compile- and run-time problems with the Emacs interface code.
+Patch4:         gcl-2.6.8-elisp.patch
+# This patch was last sent upstream on 09 Jan 2009.  It adds support for
+# compiling and running on an SELinux-enabled host.
+Patch5:         gcl-2.6.8-selinux.patch
+# This patch was last sent upstream on 29 Dec 2008.  It uses the rename()
+# system call when it is available to avoid spawning a subshell and suffering a
+# context switch just to rename a file.
+Patch6:         gcl-2.6.8-rename.patch
+# This patch was last sent upstream on 29 Dec 2008.  It eliminates a
+# compilation problem due to the fact that, at high optimization levels,
+# getcwd() is an inline function.
+Patch7:         gcl-2.6.8-getcwd.patch
+# This patch was last sent upstream on 29 Dec 2008.  It fixes a potential
+# buffer overflow when accessing files whose names start with a tilde (i.e.,
+# user home directories).
+Patch8:         gcl-2.6.8-loginname.patch
+# This patch was last sent upstream on 29 Dec 2008.  It updates the autoconf
+# and libtool files to newer versions.  By itself, this patch accomplishes
+# little of interest.  However, some of the later patches change configure.in.
+# Without this patch, autoconf appears to run successfully, but generates a
+# configure script that contains invalid shell script syntax.
+Patch9:         gcl-2.6.8-infrastructure.patch
+# This patch was last sent upstream on 29 Dec 2008.  It simplifies the handling
+# of alloca() detection in the configure script.
+Patch10:        gcl-2.6.8-alloca.patch
+# This patch was last sent upstream on 29 Dec 2008.  It rationalizes the
+# handling of system extensions.  For example, on glibc-based systems, some
+# functionality is available only when _GNU_SOURCE is defined.
+Patch11:        gcl-2.6.8-extension.patch
+# This patch was last sent upstream on 29 Dec 2008.  It fixes a compilation
+# error on newer GCC systems due to an include inside a function.  This affects
+# the "unrandomize" sbrk() functionality, hence the name of the patch.
+Patch12:        gcl-2.6.8-unrandomize.patch
+# This patch was last sent upstream on 29 Dec 2008.  It fixes compilation with
+# a system BFD library that comes from a newer binutils distribution.  It also
+# updates o/unexelf.c from Emacs 22.2, the last version of Emacs released under
+# the GPL version 2.
+Patch13:        gcl-2.6.8-bfd.patch
+# This is a Fedora-specific patch.  Do not delete C files produced from D files
+# so they can be pulled into the debuginfo package.
+Patch14:        gcl-2.6.8-debuginfo.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires:  libSM-devel
+BuildRequires:  libXext-devel
+BuildRequires:  libXaw-devel
 BuildRequires:  readline-devel
-BuildRequires:  ncurses-devel
 BuildRequires:  binutils-devel
-BuildRequires:	tk-devel
-BuildRequires:	tcl-devel
+BuildRequires:  tk-devel
+BuildRequires:  tcl-devel
 BuildRequires:  gmp-devel
-BuildRequires:	tetex
+BuildRequires:  texlive, texlive-latex
 BuildRequires:  texinfo
+BuildRequires:  emacs, emacs-el
+BuildRequires:  xemacs, xemacs-devel, xemacs-packages-extra
+BuildRequires:  selinux-policy
 Requires(post): /sbin/install-info, policycoreutils
 Requires(postun): /sbin/install-info, policycoreutils
-ExcludeArch:	ppc ppc64 x86_64
 
 
 %description
-GCL is a Common Lisp currently compliant with the ANSI standard. Lisp
+GCL is a Common Lisp currently compliant with the ANSI standard.  Lisp
 compilation produces native code through the intermediary of the
 system's C compiler, from which GCL derives efficient performance and
 facile portability. Currently uses TCL/Tk as GUI.
 
 
+%package emacs
+Group:          Development/Languages
+Summary:        Emacs mode for interacting with GCL
+Requires:       %{name} = %{version}-%{release}, emacs(bin) >= %{emacs_version}
+
+%description emacs
+Emacs mode for interacting with GCL
+
+%package emacs-el
+Group:          Development/Languages
+Summary:        Source for Emacs mode for interacting with GCL
+Requires:       %{name}-emacs = %{version}-%{release}
+
+%description emacs-el
+Source Elisp code for Emacs mode for interacting with GCL
+
+
+%package xemacs
+Group:          Development/Languages
+Summary:        XEmacs mode for interacting with GCL
+Requires:       %{name} = %{version}-%{release}
+Requires:       xemacs(bin) >= %{xemacs_version}, xemacs-packages-extra
+
+%description xemacs
+XEmacs mode for interacting with GCL
+
+%package xemacs-el
+Group:          Development/Languages
+Summary:        Source for XEmacs mode for interacting with GCL
+Requires:       %{name}-xemacs = %{version}-%{release}
+
+%description xemacs-el
+Source Elisp code for XEmacs mode for interacting with GCL
+
+
 %prep
 %setup -q
 %patch0 -p1
 %patch1 -p1
-sed -i "s|-lreadline|-lreadline -lncurses|" configure
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
+%patch7 -p1
+%patch8 -p1
+%patch9 -p1
+%patch10 -p1
+%patch11 -p1
+%patch12 -p1
+%patch13 -p1
+%patch14 -p1
+
+# Don't let the configure script add compiler flags we don't want
+sed -i -e 's/-fomit-frame-pointer//' -e 's/-O3/-O2/g' configure
+
+# Fix a path in the launch script
+sed -i -e 's|/usr/lib/tk|%{_datadir}/tk|' debian/gcl.sh
+
+# The archive is so full of spurious executable bits that we just remove them
+# all here, then add back the ones that should exist
+find . -type f -perm /0111 | xargs chmod a-x
+chmod a+x add-defs add-defs1 config.guess config.sub configure install.sh
+chmod a+x ltconfig bin/info bin/info1 gcl-tk/gcltksrv.in gcl-tk/ngcltksrv
+chmod a+x mp/gcclab o/egrep-def utils/replace xbin/*
 
 
 %build
-%configure --enable-readline --enable-ansi --enable-tclconfig=%{_libdir} --enable-tkconfig=%{_libdir}
-perl -pi -e 's|/usr/lib/tk|%{_datadir}/tk|' debian/gcl.sh makedefc makedefs
-perl -pi -e 's|/usr/lib/tcl|%{_datadir}/tcl|' debian/gcl.sh makedefc makedefs
-# %{?_smp_mflags} breaks the build
+%configure --enable-readline --enable-ansi --enable-dynsysgmp --enable-xgcl \
+  --enable-tclconfig=%{_libdir} --enable-tkconfig=%{_libdir} \
+  --disable-statsysbfd --enable-dynsysbfd
+# FIXME: %%{?_smp_mflags} breaks the build
 make 
 
+# dwdoc needs one extra LaTeX run to resolve references
+cd xgcl-2
+pdflatex dwdoc.tex
+
+# Build the SELinux policy
+cd ../selinux
+make -f %{_datadir}/selinux/devel/Makefile
+
 
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
+
+# Get rid of the parts that we don't want
 rm -f $RPM_BUILD_ROOT%{_infodir}/dir
 rm -rf $RPM_BUILD_ROOT%{_datadir}/doc
 rm -rf $RPM_BUILD_ROOT%{_datadir}/emacs
 rm -rf $RPM_BUILD_ROOT%{_prefix}/lib/gcl-*/info
+
+# Install the man page
 mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
-cp -f man/man1/* $RPM_BUILD_ROOT%{_mandir}/man1
+cp -pf man/man1/* $RPM_BUILD_ROOT%{_mandir}/man1
+
+# Install the HTML documentation
 mkdir -p html
-cp -fr info/gcl-si info/gcl-tk html 
-chmod 644 ChangeLog* COPYING* 
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/gcl
-chmod 644 elisp/*
-cp -fr elisp/* $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/gcl
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/site-start.d
-cat > $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/site-start.d/gcl.el <<EOF
-(add-to-list 'load-path "%{_datadir}/emacs/site-lisp/gcl")
-(autoload 'run "gcl" "Run GCL." t)
-(autoload 'gcl-mode "gcl" "GCL mode." t)
-EOF
-find $RPM_BUILD_ROOT%{_prefix}/lib/gcl* -name '*.l*sp' | xargs chmod 0644
+cp -pfr info/gcl-si info/gcl-tk html
+
+# Install and compile the Emacs code
+mkdir -p $RPM_BUILD_ROOT%{emacs_lispdir}/gcl
+cp -pfr elisp/* $RPM_BUILD_ROOT%{emacs_lispdir}/gcl
+rm -f $RPM_BUILD_ROOT%{emacs_lispdir}/gcl/makefile
+rm -f $RPM_BUILD_ROOT%{emacs_lispdir}/gcl/readme
+mkdir -p $RPM_BUILD_ROOT%{emacs_lispdir}/site-start.d
+sed -e "s|%LISP_DIR%|%{emacs_lispdir}|" %{SOURCE1} > $RPM_BUILD_ROOT%{emacs_lispdir}/site-start.d/gcl.el
+pushd $RPM_BUILD_ROOT%{emacs_lispdir}/gcl
+emacs -batch -no-site-file --eval "(push \"`pwd`\" load-path)" \
+  -f batch-byte-compile *.el
+popd
+
+# Install and compile the XEmacs code
+mkdir -p $RPM_BUILD_ROOT%{xemacs_lispdir}/gcl
+cp -fr elisp/* $RPM_BUILD_ROOT%{xemacs_lispdir}/gcl
+rm -f $RPM_BUILD_ROOT%{xemacs_lispdir}/gcl/makefile
+rm -f $RPM_BUILD_ROOT%{xemacs_lispdir}/gcl/readme
+mkdir -p $RPM_BUILD_ROOT%{xemacs_lispdir}/site-start.d
+sed -e "s|%LISP_DIR%|%{xemacs_lispdir}|" %{SOURCE1} > $RPM_BUILD_ROOT%{xemacs_lispdir}/site-start.d/gcl.el
+pushd $RPM_BUILD_ROOT%{xemacs_lispdir}/gcl
+xemacs -batch -no-site-file -eval "(push \"`pwd`\" load-path)" \
+  -f batch-byte-compile *.el
+popd
+
+# Save the policy file away for later installation
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/selinux/packages/gcl
+cp -p selinux/gcl.pp $RPM_BUILD_ROOT%{_datadir}/selinux/packages/gcl
+
+# The image has garbage strings containing RPM_BUILD_ROOT
 export QA_SKIP_BUILD_ROOT=1
 
 
 %clean
 rm -rf $RPM_BUILD_ROOT
+rm -f /tmp/gazonk_* /tmp/gcl_*
 
 
 %post
+/sbin/install-info %{_infodir}/%{name}.info %{_infodir}/dir 2>/dev/null || :
 /sbin/install-info %{_infodir}/%{name}-si.info %{_infodir}/dir 2>/dev/null || :
 /sbin/install-info %{_infodir}/%{name}-tk.info %{_infodir}/dir 2>/dev/null || :
-/usr/sbin/semanage fcontext -a -t textrel_shlib_t "%{_prefix}/lib/gcl-%{version}/unixport/saved_ansi_gcl" 2>/dev/null || :
-/sbin/restorecon "%{_prefix}/lib/gcl-%{version}/unixport/saved_ansi_gcl" 2> /dev/null || :
+/usr/sbin/semodule -i %{_datadir}/selinux/packages/gcl/gcl.pp || :
+/sbin/fixfiles -R gcl restore || :
 
 
 %postun
 if [ $1 = 0 ]; then
+    /sbin/install-info --delete %{_infodir}/%{name}.info %{_infodir}/dir 2>/dev/null || :
     /sbin/install-info --delete %{_infodir}/%{name}-si.info %{_infodir}/dir 2>/dev/null || :
     /sbin/install-info --delete %{_infodir}/%{name}-tk.info %{_infodir}/dir 2>/dev/null || :
-    /usr/sbin/semanage fcontext -d -t textrel_shlib_t "%{_prefix}/lib/gcl-%{version}/unixport/saved_ansi_gcl" 2>/dev/null || :
+    /usr/sbin/semodule -r gcl || :
 fi
 
 
 %files
 %defattr(-,root,root,-)
-%{_bindir}/*
+%{_bindir}/gcl
 %{_prefix}/lib/gcl*
 %{_infodir}/*
 %{_mandir}/man*/*
-%{_datadir}/emacs/site-lisp/gcl
-%{_datadir}/emacs/site-lisp/site-start.d/*
-%doc COPYING* readme RELEASE* ChangeLog doc/*
+%{_datadir}/selinux/packages/gcl
+%doc COPYING* readme readme.xgcl RELEASE* ChangeLog* faq doc
+%doc gcl*.jpg gcl.ico gcl.png
 %doc --parent html
 
+%files emacs
+%defattr(-,root,root,-)
+%doc elisp/readme
+%dir %{emacs_lispdir}/gcl
+%{emacs_lispdir}/gcl/*.elc
+%{emacs_lispdir}/site-start.d/*
+
+%files emacs-el
+%defattr(-,root,root,-)
+%{emacs_lispdir}/gcl/*.el
+
+%files xemacs
+%defattr(-,root,root,-)
+%doc elisp/readme
+%dir %{xemacs_lispdir}/gcl
+%{xemacs_lispdir}/gcl/*.elc
+%{xemacs_lispdir}/site-start.d/*
+
+%files xemacs-el
+%defattr(-,root,root,-)
+%{xemacs_lispdir}/gcl/*.el
+
 
 %changelog
+* Fri Jan  9 2009 Jerry James <loganjerry at gmail.com> - 2.6.8-0.1.20080902cvs
+- Update from CVS to fix many build problems
+- Fix SELinux and BFD problems that blocked the build
+- Add patches to address various build and runtime problems
+- Drop old patches that are obsoleted by the update from CVS
+- Split out emacs and xemacs subpackages
+
+* Mon Jul 21 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 2.6.7-19
+- fix license tag
+
 * Mon Feb 18 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 2.6.7-18
 - Autorebuild for GCC 4.3
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gcl/F-9/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	9 Sep 2005 19:45:04 -0000	1.3
+++ sources	16 Jan 2009 22:25:17 -0000	1.4
@@ -1 +1 @@
-c0f42e1f391162e5ac90912a70e8ecc3  gcl-2.6.7.tar.gz
+6f0453b7f1fb102322cfa69bf2a7275a  gcl-2.6.8.tar.bz2


--- gcl-bash.patch DELETED ---


--- gcl-pers.patch DELETED ---



From mtruch at fedoraproject.org  Fri Jan 16 22:26:33 2009
From: mtruch at fedoraproject.org (Matthew D Truch)
Date: Fri, 16 Jan 2009 22:26:33 +0000 (UTC)
Subject: rpms/getdata/F-10 getdata-0.5.0.tar.bz2.sig, NONE, 1.1 .cvsignore,
	1.4, 1.5 getdata.spec, 1.4, 1.5 sources, 1.4,
	1.5 getdata-0.4.2.tar.bz2.sig, 1.1, NONE
Message-ID: <20090116222633.49D2770127@cvs1.fedora.phx.redhat.com>

Author: mtruch

Update of /cvs/extras/rpms/getdata/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14383

Modified Files:
	.cvsignore getdata.spec sources 
Added Files:
	getdata-0.5.0.tar.bz2.sig 
Removed Files:
	getdata-0.4.2.tar.bz2.sig 
Log Message:
Upstream 0.5.0



--- NEW FILE getdata-0.5.0.tar.bz2.sig ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)

iD4DBQBJcNdKHjxAJ9xPubwRAvi3AJdxgtb4I9+Kohshi6F8DWzLjBTvAJ4kBZnV
NRRLYqfDhvXM1X7WhsweFQ==
=58T5
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/getdata/F-10/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	18 Nov 2008 17:12:35 -0000	1.4
+++ .cvsignore	16 Jan 2009 22:26:02 -0000	1.5
@@ -1 +1 @@
-getdata-0.4.2.tar.bz2
+getdata-0.5.0.tar.bz2


Index: getdata.spec
===================================================================
RCS file: /cvs/extras/rpms/getdata/F-10/getdata.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- getdata.spec	18 Nov 2008 17:12:35 -0000	1.4
+++ getdata.spec	16 Jan 2009 22:26:02 -0000	1.5
@@ -1,5 +1,5 @@
 Name:           getdata
-Version:        0.4.2
+Version:        0.5.0
 Release:        1%{?dist}
 Summary:        Library for reading and writing dirfile data
 
@@ -9,7 +9,7 @@
 Source0:        http://dl.sf.net/sourceforge/%{name}/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:     gcc-gfortran
+BuildRequires:     gcc-gfortran zlib-devel libtool-ltdl-devel bzip2-devel
 Requires(post):    /sbin/ldconfig
 Requires(postun):  /sbin/ldconfig
 
@@ -29,12 +29,32 @@
 Headers required when building a program against the GetData library.
 Includes C++ and FORTRAN (77 & 95) bindings. 
 
+%package gzip
+Group:  Development/Libraries
+Summary: Enables getdata read ability of gzip compressed dirfiles
+Requires: %{name} = %{version}-%{release}
+
+%description gzip
+Enables getdata to read dirfiles that are encoded (compressed) with gzip.
+Fields must be fully compressed with gzip, not actively being written to.
+Does not yet allow writing of gzip encoded dirfiles.
+
+%package bzip2
+Group:  Development/Libraries
+Summary: Enables getdata read ability of bzip2 compressed dirfiles
+Requires: %{name} = %{version}-%{release}
+
+%description bzip2
+Enables getdata to read dirfiles that are encoded (compressed) with bzip2.
+Fields must be fully compressed with bzip2, not actively being written to.
+Does not yet allow writing of bzip2 encoded dirfiles.
+
 %prep
 %setup -q
 
 %build
 # FIXME: FFLAGS/FCFLAGS are not being honored; looking into it with upstream.
-%configure --disable-static
+%configure --disable-static --enable-modules --enable-debug
 make %{?_smp_mflags}
 
 %check
@@ -46,6 +66,8 @@
 make DESTDIR=%{buildroot} SUID_ROOT="" install
 # Remove .la files.  
 rm -f %{buildroot}/%{_libdir}/lib*.la
+# Remove simple docs, as we install them ourselves (along with others)
+rm -f %{buildroot}/%{_datadir}/doc/%{name}/*
 
 %clean
 rm -rf %{buildroot}
@@ -62,14 +84,30 @@
 %{_mandir}/man5/*
 
 %files devel
-%defattr(-,root,root)
-%doc README.cxx README.f77 README.f95
-%{_libdir}/lib*getdata*.so
+%defattr(-,root,root,-)
+%doc doc/README.cxx doc/README.f77 doc/README.f95 doc/unclean_database_recovery.txt
+%{_libdir}/libgetdata.so
+%{_libdir}/libf*getdata.so
+%{_libdir}/libgetdata++.so
 %{_includedir}/*
 %{_mandir}/man3/*
 %{_libdir}/pkgconfig/getdata.pc
 
+%files gzip
+%defattr(-,root,root,-)
+%{_libdir}/libgetdatagzip*.so
+
+%files bzip2
+%defattr(-,root,root,-)
+%{_libdir}/libgetdatabzip2*.so
+
 %changelog
+* Fri Jan 16 2009 Matthew Truch <matt at truch.net> - 0.5.0-1
+- Upstream 0.5.0
+-   Includes bugfixes.
+-   New gzip and bzip2 encoded dirfile read ability.
+-   Uses ltdl dynamic module loading for gzip and bzip2 modules.
+
 * Tue Nov 18 2008 Matthew Truch <matt at truch.net> - 0.4.2-1
 - Upstream 0.4.2 bugfix release.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/getdata/F-10/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	18 Nov 2008 17:12:35 -0000	1.4
+++ sources	16 Jan 2009 22:26:02 -0000	1.5
@@ -1 +1 @@
-f930006c80e93060a798187661487286  getdata-0.4.2.tar.bz2
+465709d1f5fcce5f3bedc26ed83a5a2f  getdata-0.5.0.tar.bz2


--- getdata-0.4.2.tar.bz2.sig DELETED ---



From sergiopr at fedoraproject.org  Fri Jan 16 22:29:29 2009
From: sergiopr at fedoraproject.org (Sergio Pascual)
Date: Fri, 16 Jan 2009 22:29:29 +0000 (UTC)
Subject: rpms/trac-xmlrpc-plugin/devel trac-xmlrpc-plugin.spec,1.3,1.4
Message-ID: <20090116222929.875D770142@cvs1.fedora.phx.redhat.com>

Author: sergiopr

Update of /cvs/pkgs/rpms/trac-xmlrpc-plugin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14918

Modified Files:
	trac-xmlrpc-plugin.spec 
Log Message:
* Fri Jan 16 2009 Sergio Pascual <sergio.pasra at gmail.com> - 1.0.0-0.2.r3074
- Adding version to Requires: trac



Index: trac-xmlrpc-plugin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/trac-xmlrpc-plugin/devel/trac-xmlrpc-plugin.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- trac-xmlrpc-plugin.spec	15 Jan 2009 09:09:56 -0000	1.3
+++ trac-xmlrpc-plugin.spec	16 Jan 2009 22:28:58 -0000	1.4
@@ -6,7 +6,7 @@
 
 Name: trac-xmlrpc-plugin
 Version: 1.0.0
-Release: 0.1.r%{svnrev}%{?dist}
+Release: 0.2.r%{svnrev}%{?dist}
 Summary: Allows Trac plugins to export their interface via XML-RPC
 
 Group: Applications/Internet
@@ -23,7 +23,7 @@
 BuildArch: noarch
 BuildRequires: python-devel
 BuildRequires: python-setuptools
-Requires: trac, python-setuptools
+Requires: trac >= 0.11, python-setuptools
 
 %description
 This plugin allows Trac plugins to export select parts of their 
@@ -49,6 +49,9 @@
 %{python_sitelib}/*
 
 %changelog
+* Fri Jan 16 2009 Sergio Pascual <sergio.pasra at gmail.com> - 1.0.0-0.2.r3074
+- Adding version to Requires: trac
+
 * Thu Jan 15 2009 Sergio Pascual <sergio.pasra at gmail.com> - 1.0.0-0.1.r3074
 - Source code from vcs, rebased to trunk for trac 0.11 (bz #480101)
 



From nim at fedoraproject.org  Fri Jan 16 22:29:51 2009
From: nim at fedoraproject.org (Nicolas Mailhot)
Date: Fri, 16 Jan 2009 22:29:51 +0000 (UTC)
Subject: rpms/google-droid-fonts/devel google-droid-fonts.spec, 1.1,
	1.2 import.log, 1.1, 1.2
Message-ID: <20090116222951.E493E70142@cvs1.fedora.phx.redhat.com>

Author: nim

Update of /cvs/extras/rpms/google-droid-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15059/devel

Modified Files:
	google-droid-fonts.spec import.log 
Log Message:
workaround rhel5 rpm bug


Index: google-droid-fonts.spec
===================================================================
RCS file: /cvs/extras/rpms/google-droid-fonts/devel/google-droid-fonts.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- google-droid-fonts.spec	16 Jan 2009 22:10:40 -0000	1.1
+++ google-droid-fonts.spec	16 Jan 2009 22:29:21 -0000	1.2
@@ -3,7 +3,7 @@
 %define download_root http://android.git.kernel.org/?p=platform/frameworks/base.git;a=blob_plain;f=data/fonts
 
 %define common_desc \
-The Droid typeface family was designed in the fall of 2006 by Ascender???s \
+The Droid typeface family was designed in the fall of 2006 by Ascender's \
 Steve Matteson, as a commission from Google to create a set of system fonts \
 for its Android platform. The goal was to provide optimal quality and comfort \
 on a mobile handset when rendered in application menus, web browsers and for \
@@ -12,7 +12,7 @@
 Name:    %{fontname}-fonts
 # The font files all have the same version except for sans fallback which I'm going to ignore here
 Version: 1.0.112
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: General-purpose fonts released by Google as part of Android
 
 Group:     User Interface/X
@@ -143,6 +143,8 @@
 
 %changelog
 * Fri Jan 16 2009 <nicolas.mailhot at laposte.net>
+- 1.0.112-3
+??? Workaround RHEL5 rpmbuild UTF-8 handling bug
 - 1.0.112-2
 ??? Convert to new naming guidelines
 ??? Do strange stuff with Sans Fallback (CJK users please check)


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/google-droid-fonts/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	16 Jan 2009 22:10:40 -0000	1.1
+++ import.log	16 Jan 2009 22:29:21 -0000	1.2
@@ -1 +1,2 @@
 google-droid-fonts-1_0_112-2_fc11:HEAD:google-droid-fonts-1.0.112-2.fc11.src.rpm:1232143809
+google-droid-fonts-1_0_112-3_fc11:HEAD:google-droid-fonts-1.0.112-3.fc11.src.rpm:1232144541



From mtruch at fedoraproject.org  Fri Jan 16 22:33:08 2009
From: mtruch at fedoraproject.org (Matthew D Truch)
Date: Fri, 16 Jan 2009 22:33:08 +0000 (UTC)
Subject: rpms/getdata/F-9 getdata-0.5.0.tar.bz2.sig, NONE, 1.1 .cvsignore,
	1.3, 1.4 getdata.spec, 1.2, 1.3 sources, 1.3,
	1.4 getdata-0.4.2.tar.bz2.sig, 1.1, NONE
Message-ID: <20090116223308.0C88C70127@cvs1.fedora.phx.redhat.com>

Author: mtruch

Update of /cvs/extras/rpms/getdata/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16080

Modified Files:
	.cvsignore getdata.spec sources 
Added Files:
	getdata-0.5.0.tar.bz2.sig 
Removed Files:
	getdata-0.4.2.tar.bz2.sig 
Log Message:
Update to upstream 0.5.0



--- NEW FILE getdata-0.5.0.tar.bz2.sig ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)

iD4DBQBJcNdKHjxAJ9xPubwRAvi3AJdxgtb4I9+Kohshi6F8DWzLjBTvAJ4kBZnV
NRRLYqfDhvXM1X7WhsweFQ==
=58T5
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/getdata/F-9/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	18 Nov 2008 17:18:36 -0000	1.3
+++ .cvsignore	16 Jan 2009 22:32:37 -0000	1.4
@@ -1 +1 @@
-getdata-0.4.2.tar.bz2
+getdata-0.5.0.tar.bz2


Index: getdata.spec
===================================================================
RCS file: /cvs/extras/rpms/getdata/F-9/getdata.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- getdata.spec	18 Nov 2008 17:18:36 -0000	1.2
+++ getdata.spec	16 Jan 2009 22:32:37 -0000	1.3
@@ -1,5 +1,5 @@
 Name:           getdata
-Version:        0.4.2
+Version:        0.5.0
 Release:        1%{?dist}
 Summary:        Library for reading and writing dirfile data
 
@@ -9,7 +9,7 @@
 Source0:        http://dl.sf.net/sourceforge/%{name}/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:     gcc-gfortran
+BuildRequires:     gcc-gfortran zlib-devel libtool-ltdl-devel bzip2-devel
 Requires(post):    /sbin/ldconfig
 Requires(postun):  /sbin/ldconfig
 
@@ -29,12 +29,22 @@
 Headers required when building a program against the GetData library.
 Includes C++ and FORTRAN (77 & 95) bindings. 
 
+%package bzip2                                                                 
+Group:  Development/Libraries                                                  
+Summary: Enables getdata read ability of bzip2 compressed dirfiles             
+Requires: %{name} = %{version}-%{release}                                      
+                                                                               
+%description bzip2                                                             
+Enables getdata to read dirfiles that are encoded (compressed) with bzip2.     
+Fields must be fully compressed with bzip2, not actively being written to.     
+Does not yet allow writing of bzip2 encoded dirfiles.
+
 %prep
 %setup -q
 
 %build
 # FIXME: FFLAGS/FCFLAGS are not being honored; looking into it with upstream.
-%configure --disable-static
+%configure --disable-static --enable-modules --enable-debug
 make %{?_smp_mflags}
 
 %check
@@ -46,6 +56,8 @@
 make DESTDIR=%{buildroot} SUID_ROOT="" install
 # Remove .la files.  
 rm -f %{buildroot}/%{_libdir}/lib*.la
+# Remove simple docs, as we install them ourselves (along with others)         
+rm -f %{buildroot}/%{_datadir}/doc/%{name}/*
 
 %clean
 rm -rf %{buildroot}
@@ -62,14 +74,30 @@
 %{_mandir}/man5/*
 
 %files devel
-%defattr(-,root,root)
-%doc README.cxx README.f77 README.f95
-%{_libdir}/lib*getdata*.so
+%defattr(-,root,root,-)
+%doc doc/README.cxx doc/README.f77 doc/README.f95 doc/unclean_database_recovery.txt
+%{_libdir}/libgetdata.so
+%{_libdir}/libf*getdata.so
+%{_libdir}/libgetdata++.so
 %{_includedir}/*
 %{_mandir}/man3/*
 %{_libdir}/pkgconfig/getdata.pc
 
+%files gzip
+%defattr(-,root,root,-)
+%{_libdir}/libgetdatagzip*.so
+
+%files bzip2
+%defattr(-,root,root,-)
+%{_libdir}/libgetdatabzip2*.so
+
 %changelog
+* Fri Jan 16 2009 Matthew Truch <matt at truch.net> - 0.5.0-1
+- Upstream 0.5.0
+-   Includes bugfixes.
+-   New gzip and bzip2 encoded dirfile read ability.
+-   Uses ltdl dynamic module loading for gzip and bzip2 modules.
+
 * Tue Nov 18 2008 Matthew Truch <matt at truch.net> - 0.4.2-1
 - Upstream 0.4.2.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/getdata/F-9/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	18 Nov 2008 17:18:36 -0000	1.3
+++ sources	16 Jan 2009 22:32:37 -0000	1.4
@@ -1 +1 @@
-f930006c80e93060a798187661487286  getdata-0.4.2.tar.bz2
+465709d1f5fcce5f3bedc26ed83a5a2f  getdata-0.5.0.tar.bz2


--- getdata-0.4.2.tar.bz2.sig DELETED ---



From mtruch at fedoraproject.org  Fri Jan 16 22:35:22 2009
From: mtruch at fedoraproject.org (Matthew D Truch)
Date: Fri, 16 Jan 2009 22:35:22 +0000 (UTC)
Subject: rpms/getdata/F-9 getdata.spec,1.3,1.4
Message-ID: <20090116223522.DB59970127@cvs1.fedora.phx.redhat.com>

Author: mtruch

Update of /cvs/extras/rpms/getdata/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16361

Modified Files:
	getdata.spec 
Log Message:
Missed part of the specfile for the gzip module.



Index: getdata.spec
===================================================================
RCS file: /cvs/extras/rpms/getdata/F-9/getdata.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- getdata.spec	16 Jan 2009 22:32:37 -0000	1.3
+++ getdata.spec	16 Jan 2009 22:34:52 -0000	1.4
@@ -39,6 +39,16 @@
 Fields must be fully compressed with bzip2, not actively being written to.     
 Does not yet allow writing of bzip2 encoded dirfiles.
 
+%package gzip                                                                  
+Group:  Development/Libraries                                                  
+Summary: Enables getdata read ability of gzip compressed dirfiles              
+Requires: %{name} = %{version}-%{release}                                      
+                                                                               
+%description gzip                                                              
+Enables getdata to read dirfiles that are encoded (compressed) with gzip.      
+Fields must be fully compressed with gzip, not actively being written to.      
+Does not yet allow writing of gzip encoded dirfiles.
+
 %prep
 %setup -q
 



From ke4qqq at fedoraproject.org  Fri Jan 16 22:41:40 2009
From: ke4qqq at fedoraproject.org (David Nalley)
Date: Fri, 16 Jan 2009 22:41:40 +0000 (UTC)
Subject: rpms/zapplet/F-10 README.fedora, NONE, 1.1 import.log, NONE,
	1.1 zapplet.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090116224140.6A2A870127@cvs1.fedora.phx.redhat.com>

Author: ke4qqq

Update of /cvs/pkgs/rpms/zapplet/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17143/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	README.fedora import.log zapplet.spec 
Log Message:
* Mon Jan 16 2009 David Nalley <david at gnsa.us> 
- Initial upload



--- NEW FILE README.fedora ---
To have Zapplet start on login use the following command as root: 
'cp /usr/share/applications/zapplet.desktop  /etc/xdg/autostart/zapplet.desktop'


--- NEW FILE import.log ---
zapplet-0_1-3_fc10:F-10:zapplet-0.1-3.fc10.src.rpm:1232145562


--- NEW FILE zapplet.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
Name:           zapplet
Version:        0.1
Release:        3%{dist} 
Summary:        Zenoss Tray Applet
Group:          Applications/Communications
License:        GPLv2+
URL:            http://zapplet.sourceforge.net
Source0:        http://downloads.sourceforge.net/zapplet/zapplet-%{version}.tar.gz
Source1:        http://ke4qqq.fedorapeople.org/zapplet/README.fedora
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  python
BuildRequires:  python-setuptools-devel 
BuildRequires:  desktop-file-utils
Requires:       pygtk2 
BuildArch:      noarch

%description
Zapplet is a tray applet for monitoring aspects of Zenoss from the desktop. 

%prep
%setup -q -n zapplet-%{version}
cp %{SOURCE1} ./README.fedora
%build
CFLAGS="%{optflags}" %{__python} setup.py build

%install
rm -rf %{buildroot}
%{__python} setup.py install -O1 --skip-build --root %{buildroot}

desktop-file-install --add-category="Network" --dir=%{buildroot}%{_datadir}/applications zapplet.desktop
rm -rf %{buildroot}%{_sysconfdir}/xdg/autostart/zapplet.desktop

%clean 
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%{python_sitelib}/*
%{_bindir}/%{name} 
%{_datadir}/applications/zapplet.desktop
%doc README.fedora
%changelog
* Sun Dec 28 2008 David Nalley <david at gnsa.us> 0.1-3
- Made changes suggested by Brian Pepple
* Sat Dec 27 2008 David Nalley <david at gnsa.us> 0.1-2
- Making corrections suggested by Fabian Affolter
* Sun Dec 14 2008 David Nalley <david at gnsa.us> 0.1-1
- Initial packaging efforts



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/zapplet/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	15 Jan 2009 20:13:55 -0000	1.1
+++ .cvsignore	16 Jan 2009 22:41:10 -0000	1.2
@@ -0,0 +1 @@
+zapplet-0.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/zapplet/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	15 Jan 2009 20:13:55 -0000	1.1
+++ sources	16 Jan 2009 22:41:10 -0000	1.2
@@ -0,0 +1 @@
+d12db237f805d6711d8d720080e06eaa  zapplet-0.1.tar.gz



From nim at fedoraproject.org  Fri Jan 16 22:44:02 2009
From: nim at fedoraproject.org (Nicolas Mailhot)
Date: Fri, 16 Jan 2009 22:44:02 +0000 (UTC)
Subject: comps comps-f11.xml.in,1.61,1.62
Message-ID: <20090116224402.1F11170127@cvs1.fedora.phx.redhat.com>

Author: nim

Update of /cvs/extras/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17520

Modified Files:
	comps-f11.xml.in 
Log Message:
add droid, rename a few font packages


Index: comps-f11.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-f11.xml.in,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- comps-f11.xml.in	15 Jan 2009 23:02:17 -0000	1.61
+++ comps-f11.xml.in	16 Jan 2009 22:43:31 -0000	1.62
@@ -1281,10 +1281,10 @@
       <packagereq type="optional">sextractor</packagereq>
       <packagereq type="optional">SIBsim4</packagereq>
       <packagereq type="optional">speedcrunch</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">stix-integrals-fonts</packagereq>
+      <packagereq type="optional">stix-pua-fonts</packagereq>
+      <packagereq type="optional">stix-sizes-fonts</packagereq>
+      <packagereq type="optional">stix-variants-fonts</packagereq>
       <packagereq type="optional">tcd-utils</packagereq>
       <packagereq type="optional">TeXmacs</packagereq>
       <packagereq type="optional">tgif</packagereq>
@@ -1511,6 +1511,7 @@
       <packagereq type="optional">doulos-fonts</packagereq>
       <packagereq type="optional">dustin-dustismo-fonts</packagereq>
       <packagereq type="optional">ecolier-court-fonts</packagereq>
+      <packagereq type="optional">ecolier-court-lignes-fonts</packagereq>
       <packagereq type="optional">edrip-fonts</packagereq>
       <packagereq type="optional">fonts-truetype-apl</packagereq>
       <packagereq type="optional">freecol-shadowedblack-fonts</packagereq>
@@ -1535,6 +1536,9 @@
       <packagereq type="optional">gfs-porson-fonts</packagereq>
       <packagereq type="optional">gfs-solomos-fonts</packagereq>
       <packagereq type="optional">gfs-theokritos-fonts</packagereq>
+      <packagereq type="optional">google-droid-sans-fonts</packagereq>
+      <packagereq type="optional">google-droid-sans-mono-fonts</packagereq>
+      <packagereq type="optional">google-droid-serif-fonts</packagereq>
       <packagereq type="optional">hanazono-fonts</packagereq>
       <packagereq type="optional">icelandic-fonts</packagereq>
       <packagereq type="optional">inconsolata-fonts</packagereq>
@@ -1576,10 +1580,10 @@
       <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">stix-integrals-fonts</packagereq>
+      <packagereq type="optional">stix-pua-fonts</packagereq>
+      <packagereq type="optional">stix-sizes-fonts</packagereq>
+      <packagereq type="optional">stix-variants-fonts</packagereq>
       <packagereq type="optional">thibault-fonts-essays1743</packagereq>
       <packagereq type="optional">thibault-fonts-isabella</packagereq>
       <packagereq type="optional">thibault-fonts-rockets</packagereq>
@@ -1632,6 +1636,7 @@
       <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-fr</packagereq>
       <packagereq type="conditional" requires="tesseract">tesseract-langpack-fr</packagereq>
       <packagereq type="optional">ecolier-court-fonts</packagereq>
+      <packagereq type="optional">ecolier-court-lignes-fonts</packagereq>
       <packagereq type="optional">m17n-db-french</packagereq>
     </packagelist>
   </group>



From nim at fedoraproject.org  Fri Jan 16 23:04:31 2009
From: nim at fedoraproject.org (Nicolas Mailhot)
Date: Fri, 16 Jan 2009 23:04:31 +0000 (UTC)
Subject: rpms/dejavu-fonts/devel dejavu-fonts.spec, 1.93, 1.94 import.log,
	1.10, 1.11
Message-ID: <20090116230431.8E71370127@cvs1.fedora.phx.redhat.com>

Author: nim

Update of /cvs/extras/rpms/dejavu-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20163/devel

Modified Files:
	dejavu-fonts.spec import.log 
Log Message:
fix lgc-serif obsoletes


Index: dejavu-fonts.spec
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/devel/dejavu-fonts.spec,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -r1.93 -r1.94
--- dejavu-fonts.spec	15 Jan 2009 22:54:37 -0000	1.93
+++ dejavu-fonts.spec	16 Jan 2009 23:04:00 -0000	1.94
@@ -28,7 +28,7 @@
 
 Name:    %{fontname}-fonts
 Version: 2.28
-Release: 2%{?alphatag}%{?dist}
+Release: 3%{?alphatag}%{?dist}
 Summary: DejaVu fonts
 
 Group:     User Interface/X
@@ -177,7 +177,7 @@
 
 Conflicts: dejavu-lgc-fonts < 2.26-3
 
-Obsoletes: %{name}-lgc-sans < 2.28-2
+Obsoletes: %{name}-lgc-serif < 2.28-2
 
 %description -n %{fontname}-lgc-serif-fonts
 %common_desc
@@ -256,7 +256,11 @@
 
 
 %changelog
-* Thu Jan 15 2009 Nicolas Mailhot <nim at fedoraproject dot org>
+* Fri Jan 16 2009 <nicolas.mailhot at laposte.net>
+- 2.28-3
+??? Fix lgc-serif obsoletes
+
+* Thu Jan 15 2009 Nicolas Mailhot <nicolas.mailhot at laposte.net>
 - 2.28-2
 ??? Update URL
 ??? update for new naming guidelines


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/devel/import.log,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- import.log	15 Jan 2009 22:54:38 -0000	1.10
+++ import.log	16 Jan 2009 23:04:00 -0000	1.11
@@ -8,3 +8,4 @@
 dejavu-fonts-2_27-7_fc11:HEAD:dejavu-fonts-2.27-7.fc11.src.rpm:1229544635
 dejavu-fonts-2_28-1_fc11:HEAD:dejavu-fonts-2.28-1.fc11.src.rpm:1229879833
 dejavu-fonts-2_28-2_fc11:HEAD:dejavu-fonts-2.28-2.fc11.src.rpm:1232060001
+dejavu-fonts-2_28-3_fc11:HEAD:dejavu-fonts-2.28-3.fc11.src.rpm:1232147011



From mnowak at fedoraproject.org  Fri Jan 16 23:11:36 2009
From: mnowak at fedoraproject.org (Michal Nowak)
Date: Fri, 16 Jan 2009 23:11:36 +0000 (UTC)
Subject: rpms/ncmpcpp/devel import.log, NONE, 1.1 ncmpcpp.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090116231136.2110B70127@cvs1.fedora.phx.redhat.com>

Author: mnowak

Update of /cvs/pkgs/rpms/ncmpcpp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20963/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log ncmpcpp.spec 
Log Message:
init/0.2.5



--- NEW FILE import.log ---
ncmpcpp-0_2_5-4_fc10:HEAD:ncmpcpp-0.2.5-4.fc10.src.rpm:1232146929


--- NEW FILE ncmpcpp.spec ---
Name:           ncmpcpp
Version:        0.2.5
Release:        4%{?dist}
Summary:        Clone of ncmpc with new features and written in C++
Group:          Applications/Multimedia
License:        GPLv2+
URL:            http://unkart.ovh.org/ncmpcpp
Source0:        http://unkart.ovh.org/ncmpcpp/%{name}-%{version}.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  curl-devel
BuildRequires:  taglib-devel
BuildRequires:  ncurses-devel


%description
Ncmpcpp is almost exact clone of ncmpc but it contains some new 
features ncmpc doesn't have. It's been also rewritten from scratch 
in C++. New features include: tag editor, playlists editor, easy to 
use search screen, media library screen, lyrics screen and more.


%prep
%setup -q


%build
%configure --with-taglib --with-curl --disable-static

make %{?_smp_mflags}


%install
rm -rf %{buildroot}

make DESTDIR="%{buildroot}" INSTALL="install -p" docdir="%{_docdir}/%{name}-%{version}" install


%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%doc doc/config doc/keys AUTHORS NEWS COPYING
%{_bindir}/ncmpcpp


%changelog
* Thu Jan 15 2009 Michal Nowak <mnowak at redhat.com> 0.2.5-4
- disable building static archives

* Tue Jan 13 2009 Michal Nowak <mnowak at redhat.com> 0.2.5-3
- minor SPEC file changes

* Thu Dec 11 2008 Michal Nowak <mnowak at redhat.com> 0.2.5-2
- added ncurses-devel as BuildRequires

* Tue Dec  9 2008 Michal Nowak <mnowak at redhat.com> 0.2.5-1
- 0.2.5



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ncmpcpp/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	15 Jan 2009 20:17:34 -0000	1.1
+++ .cvsignore	16 Jan 2009 23:11:04 -0000	1.2
@@ -0,0 +1 @@
+ncmpcpp-0.2.5.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ncmpcpp/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	15 Jan 2009 20:17:34 -0000	1.1
+++ sources	16 Jan 2009 23:11:05 -0000	1.2
@@ -0,0 +1 @@
+acd8df3f5512f7cab8b5b9207c778db1  ncmpcpp-0.2.5.tar.bz2



From kevin at fedoraproject.org  Fri Jan 16 23:12:35 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 16 Jan 2009 23:12:35 +0000 (UTC)
Subject: rpms/libxfce4util/devel sources, 1.12, 1.13 .cvsignore, 1.12,
	1.13 libxfce4util.spec, 1.22, 1.23
Message-ID: <20090116231235.A901570127@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/libxfce4util/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21295

Modified Files:
	sources .cvsignore libxfce4util.spec 
Log Message:
Update to 4.5.93



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libxfce4util/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	12 Jan 2009 23:21:40 -0000	1.12
+++ sources	16 Jan 2009 23:12:05 -0000	1.13
@@ -1 +1 @@
-a38edd1bfaa016ab7abd3f4693eaecbd  libxfce4util-4.5.92.tar.bz2
+c0a7ae70609ba5df8d42c82c3d8cdb07  libxfce4util-4.5.93.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libxfce4util/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	12 Jan 2009 23:21:40 -0000	1.12
+++ .cvsignore	16 Jan 2009 23:12:05 -0000	1.13
@@ -1 +1 @@
-libxfce4util-4.5.92.tar.bz2
+libxfce4util-4.5.93.tar.bz2


Index: libxfce4util.spec
===================================================================
RCS file: /cvs/extras/rpms/libxfce4util/devel/libxfce4util.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- libxfce4util.spec	12 Jan 2009 23:21:40 -0000	1.22
+++ libxfce4util.spec	16 Jan 2009 23:12:05 -0000	1.23
@@ -1,6 +1,6 @@
 Summary: Utility library for the Xfce4 desktop environment
 Name: libxfce4util
-Version: 4.5.92
+Version: 4.5.93
 Release: 1%{?dist}
 License: LGPLv2+
 URL: http://www.xfce.org/
@@ -64,6 +64,9 @@
 %{_datadir}/gtk-doc/html/libxfce4util/
 
 %changelog
+* Tue Jan 13 2009 Kevin Fenzi <kevin at tummy.com> - 4.5.93-1
+- Update to 4.5.93
+
 * Sun Dec 21 2008 Kevin Fenzi <kevin at tummy.com> - 4.5.92-1
 - Update to 4.5.92
 



From mnowak at fedoraproject.org  Fri Jan 16 23:20:18 2009
From: mnowak at fedoraproject.org (Michal Nowak)
Date: Fri, 16 Jan 2009 23:20:18 +0000 (UTC)
Subject: rpms/ncmpcpp/F-10 import.log, NONE, 1.1 ncmpcpp.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090116232018.80CED70127@cvs1.fedora.phx.redhat.com>

Author: mnowak

Update of /cvs/pkgs/rpms/ncmpcpp/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22464/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	import.log ncmpcpp.spec 
Log Message:
init



--- NEW FILE import.log ---
ncmpcpp-0_2_5-4_fc10:F-10:ncmpcpp-0.2.5-4.fc10.src.rpm:1232147953


--- NEW FILE ncmpcpp.spec ---
Name:           ncmpcpp
Version:        0.2.5
Release:        4%{?dist}
Summary:        Clone of ncmpc with new features and written in C++
Group:          Applications/Multimedia
License:        GPLv2+
URL:            http://unkart.ovh.org/ncmpcpp
Source0:        http://unkart.ovh.org/ncmpcpp/%{name}-%{version}.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  curl-devel
BuildRequires:  taglib-devel
BuildRequires:  ncurses-devel


%description
Ncmpcpp is almost exact clone of ncmpc but it contains some new 
features ncmpc doesn't have. It's been also rewritten from scratch 
in C++. New features include: tag editor, playlists editor, easy to 
use search screen, media library screen, lyrics screen and more.


%prep
%setup -q


%build
%configure --with-taglib --with-curl --disable-static

make %{?_smp_mflags}


%install
rm -rf %{buildroot}

make DESTDIR="%{buildroot}" INSTALL="install -p" docdir="%{_docdir}/%{name}-%{version}" install


%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%doc doc/config doc/keys AUTHORS NEWS COPYING
%{_bindir}/ncmpcpp


%changelog
* Thu Jan 15 2009 Michal Nowak <mnowak at redhat.com> 0.2.5-4
- disable building static archives

* Tue Jan 13 2009 Michal Nowak <mnowak at redhat.com> 0.2.5-3
- minor SPEC file changes

* Thu Dec 11 2008 Michal Nowak <mnowak at redhat.com> 0.2.5-2
- added ncurses-devel as BuildRequires

* Tue Dec  9 2008 Michal Nowak <mnowak at redhat.com> 0.2.5-1
- 0.2.5



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ncmpcpp/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	15 Jan 2009 20:17:34 -0000	1.1
+++ .cvsignore	16 Jan 2009 23:19:48 -0000	1.2
@@ -0,0 +1 @@
+ncmpcpp-0.2.5.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ncmpcpp/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	15 Jan 2009 20:17:34 -0000	1.1
+++ sources	16 Jan 2009 23:19:48 -0000	1.2
@@ -0,0 +1 @@
+acd8df3f5512f7cab8b5b9207c778db1  ncmpcpp-0.2.5.tar.bz2



From pgordon at fedoraproject.org  Fri Jan 16 23:22:09 2009
From: pgordon at fedoraproject.org (Peter Gordon)
Date: Fri, 16 Jan 2009 23:22:09 +0000 (UTC)
Subject: rpms/deluge/F-10 .cvsignore, 1.48, 1.49 deluge.spec, 1.72,
	1.73 sources, 1.48, 1.49
Message-ID: <20090116232209.D505D70127@cvs1.fedora.phx.redhat.com>

Author: pgordon

Update of /cvs/pkgs/rpms/deluge/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22784/F-10

Modified Files:
	.cvsignore deluge.spec sources 
Log Message:
Update to 1.1.0


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/deluge/F-10/.cvsignore,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- .cvsignore	17 Dec 2008 05:17:53 -0000	1.48
+++ .cvsignore	16 Jan 2009 23:21:39 -0000	1.49
@@ -1 +1 @@
-deluge-1.0.7.tar.bz2
+deluge-1.1.0.tar.bz2


Index: deluge.spec
===================================================================
RCS file: /cvs/pkgs/rpms/deluge/F-10/deluge.spec,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- deluge.spec	17 Dec 2008 05:17:53 -0000	1.72
+++ deluge.spec	16 Jan 2009 23:21:39 -0000	1.73
@@ -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:	1.0.7
+Version:	1.1.0
 Release:	1%{?dist}
 Summary:	A GTK+ BitTorrent client with support for DHT, UPnP, and PEX
 Group:		Applications/Internet
@@ -78,7 +78,18 @@
 	--delete-original				\
 	--remove-category=Application			\
 	%{buildroot}%{_datadir}/applications/%{name}.desktop
-## TODO: The lang files should REEEAALLLY be in a standard place such as
+## Remove the country flags. This is a FEDORA-SPECIFIC change.
+## TODO: Perhaps instead of removing the flags entirely, we can replace that
+##       single column of pixbuf renderers with text renderers that show the
+##       country/locale code of the peer.
+## Fedora bug: https://bugzilla.redhat.com/show_bug.cgi?id=479265
+pushd %{buildroot}%{python_sitearch}/%{name}
+	## FIXME: Now that we're not showing the flags and whatnot, do we
+	##        still need the GeoIP data (GeoIP.dat) too?
+	rm -rf data/pixmaps/flags/
+popd 
+
+## NOTE: The lang files should REEEAALLLY be in a standard place such as
 ##       /usr/share/locale or similar. It'd make things so much nicer for
 ##       the packaging. :O
 ## A bit of sed magic to mark the translation files with %%lang, taken from
@@ -115,7 +126,7 @@
 %files -f %{name}.filelist
 %defattr(-,root,root,-)
 %doc ChangeLog
-%{python_sitearch}/%{name}-%{version}-py?.?.egg-info
+%{python_sitearch}/%{name}-%{version}-py?.?.egg-info/
 %{_bindir}/%{name}
 %{_bindir}/%{name}d
 %{_datadir}/applications/fedora-%{name}.desktop
@@ -142,6 +153,10 @@
 
 
 %changelog
+* Fri Jan 16 2009 Peter Gordon <peter at thecodergeek.com> - 1.1.0-1
+- Update to new upstream release (1.1.0 Final - yay!)
+- Do not package the country flags data. (#479265)
+
 * Tue Dec 16 2008 Peter Gordon <peter at thecodergeek.com> - 1.0.7-1
 - Update to new upstream bug-fix release (1.0.7)
 - Remove CC-BY-SA license (the Tango WebUI images have been replaced by upstream).


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/deluge/F-10/sources,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- sources	17 Dec 2008 05:17:53 -0000	1.48
+++ sources	16 Jan 2009 23:21:39 -0000	1.49
@@ -1 +1 @@
-60e64ad3869be46aafe49e831b5ba010  deluge-1.0.7.tar.bz2
+c315f7d793d55e36f4e6d22c974be8ee  deluge-1.1.0.tar.bz2



From mnowak at fedoraproject.org  Fri Jan 16 23:29:46 2009
From: mnowak at fedoraproject.org (Michal Nowak)
Date: Fri, 16 Jan 2009 23:29:46 +0000 (UTC)
Subject: rpms/ncmpcpp/F-9 import.log, NONE, 1.1 ncmpcpp.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090116232947.044DC70127@cvs1.fedora.phx.redhat.com>

Author: mnowak

Update of /cvs/pkgs/rpms/ncmpcpp/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23692/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	import.log ncmpcpp.spec 
Log Message:
init



--- NEW FILE import.log ---
ncmpcpp-0_2_5-4_fc10:F-9:ncmpcpp-0.2.5-4.fc10.src.rpm:1232148517


--- NEW FILE ncmpcpp.spec ---
Name:           ncmpcpp
Version:        0.2.5
Release:        4%{?dist}
Summary:        Clone of ncmpc with new features and written in C++
Group:          Applications/Multimedia
License:        GPLv2+
URL:            http://unkart.ovh.org/ncmpcpp
Source0:        http://unkart.ovh.org/ncmpcpp/%{name}-%{version}.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  curl-devel
BuildRequires:  taglib-devel
BuildRequires:  ncurses-devel


%description
Ncmpcpp is almost exact clone of ncmpc but it contains some new 
features ncmpc doesn't have. It's been also rewritten from scratch 
in C++. New features include: tag editor, playlists editor, easy to 
use search screen, media library screen, lyrics screen and more.


%prep
%setup -q


%build
%configure --with-taglib --with-curl --disable-static

make %{?_smp_mflags}


%install
rm -rf %{buildroot}

make DESTDIR="%{buildroot}" INSTALL="install -p" docdir="%{_docdir}/%{name}-%{version}" install


%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%doc doc/config doc/keys AUTHORS NEWS COPYING
%{_bindir}/ncmpcpp


%changelog
* Thu Jan 15 2009 Michal Nowak <mnowak at redhat.com> 0.2.5-4
- disable building static archives

* Tue Jan 13 2009 Michal Nowak <mnowak at redhat.com> 0.2.5-3
- minor SPEC file changes

* Thu Dec 11 2008 Michal Nowak <mnowak at redhat.com> 0.2.5-2
- added ncurses-devel as BuildRequires

* Tue Dec  9 2008 Michal Nowak <mnowak at redhat.com> 0.2.5-1
- 0.2.5



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ncmpcpp/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	15 Jan 2009 20:17:34 -0000	1.1
+++ .cvsignore	16 Jan 2009 23:29:16 -0000	1.2
@@ -0,0 +1 @@
+ncmpcpp-0.2.5.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ncmpcpp/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	15 Jan 2009 20:17:34 -0000	1.1
+++ sources	16 Jan 2009 23:29:16 -0000	1.2
@@ -0,0 +1 @@
+acd8df3f5512f7cab8b5b9207c778db1  ncmpcpp-0.2.5.tar.bz2



From jjames at fedoraproject.org  Fri Jan 16 23:31:43 2009
From: jjames at fedoraproject.org (Jerry James)
Date: Fri, 16 Jan 2009 23:31:43 +0000 (UTC)
Subject: rpms/gcl/F-9 gcl.spec,1.27,1.28
Message-ID: <20090116233143.DB63970127@cvs1.fedora.phx.redhat.com>

Author: jjames

Update of /cvs/pkgs/rpms/gcl/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23958

Modified Files:
	gcl.spec 
Log Message:
Fedora 9 also BuildRequires selinux-policy-devel.



Index: gcl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gcl/F-9/gcl.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- gcl.spec	16 Jan 2009 22:25:17 -0000	1.27
+++ gcl.spec	16 Jan 2009 23:31:12 -0000	1.28
@@ -110,7 +110,7 @@
 BuildRequires:  texinfo
 BuildRequires:  emacs, emacs-el
 BuildRequires:  xemacs, xemacs-devel, xemacs-packages-extra
-BuildRequires:  selinux-policy
+BuildRequires:  selinux-policy, selinux-policy-devel
 Requires(post): /sbin/install-info, policycoreutils
 Requires(postun): /sbin/install-info, policycoreutils
 



From carllibpst at fedoraproject.org  Fri Jan 16 23:38:23 2009
From: carllibpst at fedoraproject.org (Carl Byington)
Date: Fri, 16 Jan 2009 23:38:23 +0000 (UTC)
Subject: rpms/libpst/devel .cvsignore, 1.10, 1.11 libpst.spec, 1.9,
	1.10 sources, 1.10, 1.11
Message-ID: <20090116233823.704BB70127@cvs1.fedora.phx.redhat.com>

Author: carllibpst

Update of /cvs/pkgs/rpms/libpst/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25294

Modified Files:
	.cvsignore libpst.spec sources 
Log Message:
update to 0.6.25


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libpst/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	4 Dec 2008 18:53:12 -0000	1.10
+++ .cvsignore	16 Jan 2009 23:37:52 -0000	1.11
@@ -1 +1 @@
-libpst-0.6.23.tar.gz
+libpst-0.6.25.tar.gz


Index: libpst.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libpst/devel/libpst.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- libpst.spec	4 Dec 2008 18:53:12 -0000	1.9
+++ libpst.spec	16 Jan 2009 23:37:53 -0000	1.10
@@ -1,6 +1,6 @@
 Summary:            Utilities to convert Outlook .pst files to other formats
 Name:               libpst
-Version:            0.6.23
+Version:            0.6.25
 Release:            1%{?dist}
 License:            GPLv2+
 Group:              Applications/Productivity
@@ -47,6 +47,12 @@
 
 
 %changelog
+* Tue Jan 13 2009 Carl Byington <carl at five-ten-sg.com> - 0.6.25-1
+- work on proper handling of content-type charset values
+
+* Thu Dec 11 2008 Carl Byington <carl at five-ten-sg.com> - 0.6.24-1
+- patch from Chris Eagle to build on cygwin
+
 * Thu Dec 04 2008 Carl Byington <carl at five-ten-sg.com> - 0.6.23-1
 - bump version to avoid cvs tagging mistake in fedora
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libpst/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	4 Dec 2008 18:53:12 -0000	1.10
+++ sources	16 Jan 2009 23:37:53 -0000	1.11
@@ -1 +1 @@
-f5e780dd98f55a2c179d5ce90ab59a33  libpst-0.6.23.tar.gz
+20d53b78bf26c4d051b5103f5ac35b3d  libpst-0.6.25.tar.gz



From carllibpst at fedoraproject.org  Fri Jan 16 23:39:41 2009
From: carllibpst at fedoraproject.org (Carl Byington)
Date: Fri, 16 Jan 2009 23:39:41 +0000 (UTC)
Subject: rpms/libpst/F-10 .cvsignore, 1.10, 1.11 libpst.spec, 1.9,
	1.10 sources, 1.10, 1.11
Message-ID: <20090116233941.5E5AD70127@cvs1.fedora.phx.redhat.com>

Author: carllibpst

Update of /cvs/pkgs/rpms/libpst/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25644

Modified Files:
	.cvsignore libpst.spec sources 
Log Message:
update to 0.6.25


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libpst/F-10/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	4 Dec 2008 18:54:23 -0000	1.10
+++ .cvsignore	16 Jan 2009 23:39:11 -0000	1.11
@@ -1 +1 @@
-libpst-0.6.23.tar.gz
+libpst-0.6.25.tar.gz


Index: libpst.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libpst/F-10/libpst.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- libpst.spec	4 Dec 2008 18:54:23 -0000	1.9
+++ libpst.spec	16 Jan 2009 23:39:11 -0000	1.10
@@ -1,6 +1,6 @@
 Summary:            Utilities to convert Outlook .pst files to other formats
 Name:               libpst
-Version:            0.6.23
+Version:            0.6.25
 Release:            1%{?dist}
 License:            GPLv2+
 Group:              Applications/Productivity
@@ -47,6 +47,12 @@
 
 
 %changelog
+* Tue Jan 13 2009 Carl Byington <carl at five-ten-sg.com> - 0.6.25-1
+- work on proper handling of content-type charset values
+
+* Thu Dec 11 2008 Carl Byington <carl at five-ten-sg.com> - 0.6.24-1
+- patch from Chris Eagle to build on cygwin
+
 * Thu Dec 04 2008 Carl Byington <carl at five-ten-sg.com> - 0.6.23-1
 - bump version to avoid cvs tagging mistake in fedora
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libpst/F-10/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	4 Dec 2008 18:54:23 -0000	1.10
+++ sources	16 Jan 2009 23:39:11 -0000	1.11
@@ -1 +1 @@
-f5e780dd98f55a2c179d5ce90ab59a33  libpst-0.6.23.tar.gz
+20d53b78bf26c4d051b5103f5ac35b3d  libpst-0.6.25.tar.gz



From cebbert at fedoraproject.org  Fri Jan 16 23:48:49 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Fri, 16 Jan 2009 23:48:49 +0000 (UTC)
Subject: rpms/kernel/F-9 patch-2.6.27.12-rc2.bz2.sign, NONE,
	1.1.2.1 .cvsignore, 
	1.837.2.1, 1.837.2.2 kernel.spec, 1.891.2.2, 1.891.2.3 sources,
	1.798.2.1, 1.798.2.2 upstream, 1.717.2.1, 1.717.2.2
	linux-2.6-iwlwifi-use-GFP_KERNEL-to-allocate-Rx-SKB-memory.patch,
	1.1, NONE
Message-ID: <20090116234849.F203D70127@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26480

Modified Files:
      Tag: private-fedora-9-2_6_27-branch
	.cvsignore kernel.spec sources upstream 
Added Files:
      Tag: private-fedora-9-2_6_27-branch
	patch-2.6.27.12-rc2.bz2.sign 
Removed Files:
      Tag: private-fedora-9-2_6_27-branch
	linux-2.6-iwlwifi-use-GFP_KERNEL-to-allocate-Rx-SKB-memory.patch 
Log Message:
Linux 2.6.27.12-rc2
  Dropped patches:
    linux-2.6-iwlwifi-use-GFP_KERNEL-to-allocate-Rx-SKB-memory.patch


--- NEW FILE patch-2.6.27.12-rc2.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBJcROYyGugalF9Dw4RAkFDAJ4osbFSozIAhn5b6U4SM4hyBOGrJQCcCW77
6pFv5cFNoiBSVYKORg6Znh8=
=P98z
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/.cvsignore,v
retrieving revision 1.837.2.1
retrieving revision 1.837.2.2
diff -u -r1.837.2.1 -r1.837.2.2
--- .cvsignore	16 Jan 2009 19:23:22 -0000	1.837.2.1
+++ .cvsignore	16 Jan 2009 23:48:19 -0000	1.837.2.2
@@ -5,3 +5,4 @@
 kernel-2.6.27
 linux-2.6.27.tar.bz2
 patch-2.6.27.11.bz2
+patch-2.6.27.12-rc2.bz2


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/kernel.spec,v
retrieving revision 1.891.2.2
retrieving revision 1.891.2.3
diff -u -r1.891.2.2 -r1.891.2.3
--- kernel.spec	16 Jan 2009 19:48:19 -0000	1.891.2.2
+++ kernel.spec	16 Jan 2009 23:48:19 -0000	1.891.2.3
@@ -36,9 +36,9 @@
 %if 0%{?released_kernel}
 
 # Do we have a -stable update to apply?
-%define stable_update 11
+%define stable_update 12
 # Is it a -stable RC?
-%define stable_rc 0
+%define stable_rc 2
 # Set rpm version accordingly
 %if 0%{?stable_update}
 %define stablerev .%{stable_update}
@@ -681,7 +681,6 @@
 
 # wireless
 Patch682: linux-2.6-iwl3945-ibss-tsf-fix.patch
-Patch684: linux-2.6-iwlwifi-use-GFP_KERNEL-to-allocate-Rx-SKB-memory.patch
 Patch685: linux-2.6-wireless-ath9k-dma-fixes.patch
 Patch690: linux-2.6-at76.patch
 
@@ -1261,8 +1260,6 @@
 
 # iwl3945 fix for stable ad-hoc mode connections (#459401)
 ApplyPatch linux-2.6-iwl3945-ibss-tsf-fix.patch
-# iwlwifi: use GFP_KERNEL to allocate Rx SKB memory
-ApplyPatch linux-2.6-iwlwifi-use-GFP_KERNEL-to-allocate-Rx-SKB-memory.patch
 
 # Add misc wireless bits from upstream wireless tree
 ApplyPatch linux-2.6-at76.patch
@@ -1925,6 +1922,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
+* Fri Jan 16 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.27.12-78.2.3.rc2
+- Linux 2.6.27.12-rc2
+  Dropped patches:
+    linux-2.6-iwlwifi-use-GFP_KERNEL-to-allocate-Rx-SKB-memory.patch
+
 * Fri Jan 16 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.27.11-78.2.2
 - ext4 - delay capable() checks in space accounting (F10#478299)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/sources,v
retrieving revision 1.798.2.1
retrieving revision 1.798.2.2
diff -u -r1.798.2.1 -r1.798.2.2
--- sources	16 Jan 2009 19:23:22 -0000	1.798.2.1
+++ sources	16 Jan 2009 23:48:19 -0000	1.798.2.2
@@ -1,2 +1,3 @@
 b3e78977aa79d3754cb7f8143d7ddabd  linux-2.6.27.tar.bz2
 89e88096f5cee9334eb0d7a47d46191c  patch-2.6.27.11.bz2
+9bd7a7f711683b89d33fb11fdd7f5027  patch-2.6.27.12-rc2.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/upstream,v
retrieving revision 1.717.2.1
retrieving revision 1.717.2.2
diff -u -r1.717.2.1 -r1.717.2.2
--- upstream	16 Jan 2009 19:23:22 -0000	1.717.2.1
+++ upstream	16 Jan 2009 23:48:19 -0000	1.717.2.2
@@ -1,2 +1,3 @@
 linux-2.6.27.tar.bz2
 patch-2.6.27.11.bz2
+patch-2.6.27.12-rc2.bz2


--- linux-2.6-iwlwifi-use-GFP_KERNEL-to-allocate-Rx-SKB-memory.patch DELETED ---



From kevin at fedoraproject.org  Fri Jan 16 23:50:30 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 16 Jan 2009 23:50:30 +0000 (UTC)
Subject: rpms/xfconf/devel .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 xfconf.spec,
	1.1, 1.2 xfconf-4.5.92-perl.patch, 1.1, NONE
Message-ID: <20090116235030.4631C70127@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfconf/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26636

Modified Files:
	.cvsignore sources xfconf.spec 
Removed Files:
	xfconf-4.5.92-perl.patch 
Log Message:
Update to 4.5.93



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfconf/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	13 Jan 2009 01:50:23 -0000	1.2
+++ .cvsignore	16 Jan 2009 23:49:59 -0000	1.3
@@ -1 +1 @@
-xfconf-4.5.92.tar.bz2
+xfconf-4.5.93.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfconf/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	13 Jan 2009 01:50:23 -0000	1.2
+++ sources	16 Jan 2009 23:49:59 -0000	1.3
@@ -1 +1 @@
-1ca682571554c7704f4c09398b74529d  xfconf-4.5.92.tar.bz2
+d426da2c79f9741aeea7a55ce967ffa3  xfconf-4.5.93.tar.bz2


Index: xfconf.spec
===================================================================
RCS file: /cvs/extras/rpms/xfconf/devel/xfconf.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xfconf.spec	13 Jan 2009 01:50:23 -0000	1.1
+++ xfconf.spec	16 Jan 2009 23:49:59 -0000	1.2
@@ -1,17 +1,16 @@
 Name:           xfconf
-Version:        4.5.92
-Release:        4%{?dist}
+Version:        4.5.93
+Release:        1%{?dist}
 Summary:        Hierarchical configuration system for Xfce
 
 Group:          Development/Libraries
 License:        GPLv2
 URL:            http://www.xfce.org/
 Source0:        http://www.xfce.org/archive/xfce-%{version}/src/xfconf-%{version}.tar.bz2
-Patch1:         xfconf-4.5.92-perl.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  glib2-devel
-BuildRequires:  libxfce4util-devel = 4.5.92
+BuildRequires:  libxfce4util-devel = %{version}
 BuildRequires:  dbus-devel
 BuildRequires:  dbus-glib-devel
 BuildRequires:  perl(ExtUtils::Depends) perl(ExtUtils::PkgConfig) perl(Glib)
@@ -55,10 +54,8 @@
 %prep
 %setup -q
 
-%patch1 -p1 
-
 %build
-%configure --disable-static --disable-rpath
+%configure --disable-static --with-perl-options=INSTALLDIRS="vendor"
 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
 
@@ -93,7 +90,7 @@
 %doc AUTHORS ChangeLog NEWS TODO COPYING
 %{_libdir}/lib*.so.*
 %{_bindir}/xfconf-query
-%{_bindir}/xfconfd
+%{_libexecdir}/xfconfd
 %{_datadir}/dbus-1/services/org.xfce.Xfconf.service
 %{_datadir}/gtk-doc/html/xfconf
 
@@ -110,6 +107,9 @@
 %{_mandir}/man3/*.3*
 
 %changelog
+* Tue Jan 13 2009 Kevin Fenzi <kevin at tummy.com> - 4.5.93-1
+- Update to 4.5.93
+
 * Fri Jan 02 2009 Kevin Fenzi <kevin at tummy.com> - 4.5.92-4
 - Add Obsoletes for mcs packages
 


--- xfconf-4.5.92-perl.patch DELETED ---



From pfj at fedoraproject.org  Fri Jan 16 23:59:37 2009
From: pfj at fedoraproject.org (Paul F. Johnson)
Date: Fri, 16 Jan 2009 23:59:37 +0000 (UTC)
Subject: rpms/mono/devel .cvsignore, 1.34, 1.35 import.log, 1.33,
	1.34 mono.spec, 1.106, 1.107 sources, 1.40, 1.41
Message-ID: <20090116235937.3E247700D9@cvs1.fedora.phx.redhat.com>

Author: pfj

Update of /cvs/pkgs/rpms/mono/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27601/devel

Modified Files:
	.cvsignore import.log mono.spec sources 
Log Message:

Update from svn 



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mono/devel/.cvsignore,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- .cvsignore	11 Jan 2009 18:22:38 -0000	1.34
+++ .cvsignore	16 Jan 2009 23:59:06 -0000	1.35
@@ -1 +1 @@
-mono-122994.tar.bz2
+mono-123642.tar.bz2


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/mono/devel/import.log,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- import.log	11 Jan 2009 18:22:38 -0000	1.33
+++ import.log	16 Jan 2009 23:59:06 -0000	1.34
@@ -31,3 +31,4 @@
 mono-2_2-15_RC1_20090401svn122388_fc11:HEAD:mono-2.2-15.RC1.20090401svn122388.fc11.src.rpm:1231110581
 mono-2_2-16_RC2_20091001svn122990_fc11:HEAD:mono-2.2-16.RC2.20091001svn122990.fc11.src.rpm:1231633729
 mono-2_2-17_RC2_20091101svn122994_fc11:HEAD:mono-2.2-17.RC2.20091101svn122994.fc11.src.rpm:1231698016
+mono-2_4-1_20091601svn123642_fc11:HEAD:mono-2.4-1.20091601svn123642.fc11.src.rpm:1232150299


Index: mono.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mono/devel/mono.spec,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -r1.106 -r1.107
--- mono.spec	11 Jan 2009 18:22:38 -0000	1.106
+++ mono.spec	16 Jan 2009 23:59:06 -0000	1.107
@@ -1,8 +1,8 @@
-%define svnver 122994
+%define svnver 123642
 
 Name:		mono
-Version:        2.2
-Release:        17.RC2.20091101svn%{svnver}%{?dist}
+Version:        2.4
+Release:        1.20091601svn%{svnver}%{?dist}
 Summary:        A .NET runtime environment
 
 Group:          Development/Languages
@@ -688,6 +688,10 @@
 %{_libdir}/pkgconfig/monodoc.pc
 
 %changelog
+* Fri Jan 16 2009 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.4-1.20091601svn123642
+- Move to 2.4 branch
+- Update from svn
+
 * Sun Jan 11 2009 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.2-17.RC2.20091101svn122991
 - Updates from svn
 - Change to RC2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mono/devel/sources,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- sources	11 Jan 2009 18:22:38 -0000	1.40
+++ sources	16 Jan 2009 23:59:06 -0000	1.41
@@ -1 +1 @@
-6edeb8509dfab121ffae95fe355e56d8  mono-122994.tar.bz2
+296fa89b7388b2912dd845177c3a4106  mono-123642.tar.bz2



From pfj at fedoraproject.org  Sat Jan 17 00:08:43 2009
From: pfj at fedoraproject.org (Paul F. Johnson)
Date: Sat, 17 Jan 2009 00:08:43 +0000 (UTC)
Subject: rpms/mono-debugger/devel .cvsignore, 1.8, 1.9 import.log, 1.5,
	1.6 mono-debugger.spec, 1.18, 1.19 sources, 1.8, 1.9
Message-ID: <20090117000843.5C3367012B@cvs1.fedora.phx.redhat.com>

Author: pfj

Update of /cvs/pkgs/rpms/mono-debugger/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28885/devel

Modified Files:
	.cvsignore import.log mono-debugger.spec sources 
Log Message:

Update from svn 



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mono-debugger/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	11 Jan 2009 00:35:21 -0000	1.8
+++ .cvsignore	17 Jan 2009 00:08:12 -0000	1.9
@@ -1 +1 @@
-mono-debugger-122605.tar.bz2
+mono-debugger-123514.tar.bz2


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/mono-debugger/devel/import.log,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- import.log	11 Jan 2009 00:35:21 -0000	1.5
+++ import.log	17 Jan 2009 00:08:12 -0000	1.6
@@ -3,3 +3,4 @@
 mono-debugger-2_0-5_fc10:HEAD:mono-debugger-2.0-5.fc10.src.rpm:1219792595
 mono-debugger-2_2-1_pre1_fc10:HEAD:mono-debugger-2.2-1.pre1.fc10.src.rpm:1227710038
 mono-debugger-2_2-3_RC2_20090109svn122605_fc11:HEAD:mono-debugger-2.2-3.RC2.20090109svn122605.fc11.src.rpm:1231634063
+mono-debugger-2_4-1_20090116svn123514_fc11:HEAD:mono-debugger-2.4-1.20090116svn123514.fc11.src.rpm:1232150631


Index: mono-debugger.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mono-debugger/devel/mono-debugger.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- mono-debugger.spec	11 Jan 2009 00:35:21 -0000	1.18
+++ mono-debugger.spec	17 Jan 2009 00:08:12 -0000	1.19
@@ -1,9 +1,9 @@
-%define svnver 122605
+%define svnver 123514
 
 Summary: A debugger for Mono
 Name: mono-debugger
-Version: 2.2
-Release: 3.RC2.20090109svn%{svnver}%{?dist}
+Version: 2.4
+Release: 1.20090116svn%{svnver}%{?dist}
 License: MIT
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 URL: http://www.go-mono.com/sources-stable/
@@ -93,6 +93,9 @@
 %{_libdir}/pkgconfig/mono-debugger-frontend.pc
 
 %changelog
+* Fri Jan 16 2009 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.4-1.20090116svn123514
+- Move to 2.4 branch
+
 * Fri Jan 09 2009 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.2-3.RC2.20090901svn122605
 - bump to RC2
 - use svn rather than tarballs


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mono-debugger/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	11 Jan 2009 00:35:21 -0000	1.8
+++ sources	17 Jan 2009 00:08:12 -0000	1.9
@@ -1 +1 @@
-209e6a6eda714287bceff083e49ca01b  mono-debugger-122605.tar.bz2
+6fb2f301ba3b037fd92a1e2ba4726c33  mono-debugger-123514.tar.bz2



From pfj at fedoraproject.org  Sat Jan 17 00:14:04 2009
From: pfj at fedoraproject.org (Paul F. Johnson)
Date: Sat, 17 Jan 2009 00:14:04 +0000 (UTC)
Subject: rpms/mono-tools/devel .cvsignore, 1.11, 1.12 import.log, 1.20,
	1.21 mono-tools.spec, 1.25, 1.26 sources, 1.12, 1.13
Message-ID: <20090117001404.D0C497012B@cvs1.fedora.phx.redhat.com>

Author: pfj

Update of /cvs/pkgs/rpms/mono-tools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29568/devel

Modified Files:
	.cvsignore import.log mono-tools.spec sources 
Log Message:

Update from svn 



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mono-tools/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	11 Jan 2009 18:25:36 -0000	1.11
+++ .cvsignore	17 Jan 2009 00:13:34 -0000	1.12
@@ -1 +1 @@
-mono-tools-122993.tar.bz2
+mono-tools-123182.tar.bz2


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/mono-tools/devel/import.log,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- import.log	11 Jan 2009 18:25:36 -0000	1.20
+++ import.log	17 Jan 2009 00:13:34 -0000	1.21
@@ -18,3 +18,4 @@
 mono-tools-2_2-9_RC1_20090104svn122377_fc11:HEAD:mono-tools-2.2-9.RC1.20090104svn122377.fc11.src.rpm:1231110855
 mono-tools-2_2-10_RC2_20090110svn122974_fc11:HEAD:mono-tools-2.2-10.RC2.20090110svn122974.fc11.src.rpm:1231634505
 mono-tools-2_2-10_RC2_20090111svn122993_fc11:HEAD:mono-tools-2.2-10.RC2.20090111svn122993.fc11.src.rpm:1231698297
+mono-tools-2_4-1_20091601svn123182_fc11:HEAD:mono-tools-2.4-1.20091601svn123182.fc11.src.rpm:1232151054


Index: mono-tools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mono-tools/devel/mono-tools.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- mono-tools.spec	11 Jan 2009 18:25:36 -0000	1.25
+++ mono-tools.spec	17 Jan 2009 00:13:34 -0000	1.26
@@ -1,10 +1,10 @@
 %define debug_package %{nil}
-%define svnver 122993
+%define svnver 123182
 
 Summary: A collection of tools for mono applications
 Name: mono-tools
-Version: 2.2
-Release: 10.RC2.20090111svn%{svnver}%{?dist}
+Version: 2.4
+Release: 1.20091601svn%{svnver}%{?dist}
 License: MIT
 Group: Development/Tools
 Source0: %{name}-%{svnver}.tar.bz2
@@ -133,6 +133,9 @@
 %{_libdir}/monodoc/sources/Gendarme*
 
 %changelog
+* Fri Jan 16 2009 Paul F. Johnson <paul at all-the-johnsons.co.uk> - 2.4-1.20091601svn123182
+- Move to 2.4 svn branch
+
 * Sun Jan 11 2009  Paul F. Johnson <paul at all-the-johnsons.co.uk> -.2.2-10.RC2.20090111svn122974
 - update from svn
 - bump to RC2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mono-tools/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	11 Jan 2009 18:25:36 -0000	1.12
+++ sources	17 Jan 2009 00:13:34 -0000	1.13
@@ -1 +1 @@
-a377426ffb354626e06fc2c91f81d322  mono-tools-122993.tar.bz2
+8a83e6e4dfce76e6b11983051f0f804e  mono-tools-123182.tar.bz2



From pfj at fedoraproject.org  Sat Jan 17 00:21:53 2009
From: pfj at fedoraproject.org (Paul F. Johnson)
Date: Sat, 17 Jan 2009 00:21:53 +0000 (UTC)
Subject: rpms/monodevelop/devel monodevelop-192-nunit.patch, NONE,
	1.1 .cvsignore, 1.16, 1.17 import.log, 1.14,
	1.15 monodevelop-2.spec, 1.6, 1.7 sources, 1.16,
	1.17 monodevelop-1.9.1-use-system-nunit.patch, 1.1, NONE
Message-ID: <20090117002153.EC74B7012B@cvs1.fedora.phx.redhat.com>

Author: pfj

Update of /cvs/pkgs/rpms/monodevelop/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30565/devel

Modified Files:
	.cvsignore import.log monodevelop-2.spec sources 
Added Files:
	monodevelop-192-nunit.patch 
Removed Files:
	monodevelop-1.9.1-use-system-nunit.patch 
Log Message:

Update from svn
Fix mono-nunit patch 


monodevelop-192-nunit.patch:

--- NEW FILE monodevelop-192-nunit.patch ---
--- monodevelop-123651/src/addins/NUnit/Makefile.in	2009-01-16 22:57:53.000000000 +0000
+++ monodevelop-123651/src/addins/NUnit/Makefile-new.in	2009-01-16 23:20:46.000000000 +0000
@@ -200,10 +200,10 @@
 	$(GLIB_SHARP_LIBS) \
 	$(GTK_SHARP_LIBS) \
 	$(MONO_ADDINS_LIBS) \
-	-r:$(top_srcdir)/src/addins/NUnit/lib/nunit.core.dll \
-	-r:$(top_srcdir)/src/addins/NUnit/lib/nunit.core.interfaces.dll \
-	-r:$(top_srcdir)/src/addins/NUnit/lib/nunit.framework.dll \
-	-r:$(top_srcdir)/src/addins/NUnit/lib/nunit.util.dll \
+	-r:$(libdir)/mono/nunit22/nunit.core.dll \
+	-r:$(libdir)/mono/nunit22/nunit.core.interfaces.dll \
+	-r:$(libdir)/mono/nunit22/nunit.framework.dll \
+	-r:$(libdir)/mono/nunit22/nunit.util.dll \
 	-r:Mono.Posix \
 	-r:System \
 	-r:System.Xml
@@ -267,18 +267,10 @@
 	templates/NUnitProject.xpt.xml \
 	templates/NUnitTestClass.xft.xml
 
-NUNIT_FILES = \
-nunit.core.dll \
-nunit.framework.dll \
-nunit.core.interfaces.dll \
-nunit.util.dll
-
-SRC_NUNIT_FILES = $(addprefix $(srcdir)/lib/, $(NUNIT_FILES))
-BUILD_NUNIT_FILES = $(addprefix $(ADDIN_BUILD)/, $(NUNIT_FILES))
 assemblydir = $(MD_ADDIN_DIR)/NUnit
-assembly_DATA = $(ASSEMBLY) $(ASSEMBLY).mdb $(SRC_NUNIT_FILES)
-CLEANFILES = $(ASSEMBLY) $(ASSEMBLY).mdb $(BUILD_NUNIT_FILES)
-EXTRA_DIST = $(FILES) $(RES) $(SRC_NUNIT_FILES)
+assembly_DATA = $(ASSEMBLY) $(ASSEMBLY).mdb
+CLEANFILES = $(ASSEMBLY) $(ASSEMBLY).mdb
+EXTRA_DIST = $(FILES) $(RES)
 build_deps = $(addprefix -r:, $(DEPS))
 build_sources = $(addprefix $(srcdir)/, $(FILES)) $(GENERATED_FILES)
 build_resources = $(addprefix $(srcdir)/, $(RES))
@@ -618,7 +610,7 @@
 	uninstall-assemblyDATA
 
 
-all: $(ASSEMBLY) $(ASSEMBLY).mdb $(BUILD_NUNIT_FILES)
+all: $(ASSEMBLY) $(ASSEMBLY).mdb 
 
 $(ADDIN_BUILD)/%: $(srcdir)/lib/%
 	mkdir -p $(ADDIN_BUILD)
--- monodevelop-123651/src/addins/NUnit/MonoDevelopNUnit.addin.xml	2009-01-16 22:57:53.000000000 +0000
+++ monodevelop-123651/src/addins/NUnit/MonoDevelopNUnit.addin-new.xml	2009-01-16 23:16:11.000000000 +0000
@@ -10,10 +10,10 @@
 
 	<Runtime>
 		<Import assembly="MonoDevelop.NUnit.dll" />
-		<Import assembly="nunit.core.dll" />
-		<Import assembly="nunit.core.interfaces.dll" />
-		<Import assembly="nunit.framework.dll" />
-		<Import assembly="nunit.util.dll" />
+		<Import assembly="LIBDIR/mono/nunit22/nunit.core.dll" />
+		<Import assembly="LIBDIR/mono/nunit22/nunit.core.interfaces.dll" />
+		<Import assembly="LIBDIR/mono/nunit22/nunit.framework.dll" />
+		<Import assembly="LIBDIR/mono/nunit22/nunit.util.dll" />
 	</Runtime>
 	
 	<Dependencies>


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/monodevelop/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore	11 Jan 2009 00:40:00 -0000	1.16
+++ .cvsignore	17 Jan 2009 00:21:23 -0000	1.17
@@ -1 +1 @@
-monodevelop-122940.tar.bz2
+monodevelop-123651.tar.bz2


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/monodevelop/devel/import.log,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- import.log	11 Jan 2009 00:40:00 -0000	1.14
+++ import.log	17 Jan 2009 00:21:23 -0000	1.15
@@ -12,3 +12,4 @@
 monodevelop-1_9_1-6_pre1_20081230svn122192_fc11:HEAD:monodevelop-1.9.1-6.pre1.20081230svn122192.fc11.src.rpm:1230647557
 monodevelop-1_9_2-pre1_20090104svn122336_fc11:HEAD:monodevelop-1.9.2-pre1.20090104svn122336.fc11.src.rpm:1231111150
 monodevelop-1_9_2-pre1_20090110svn122940_fc11:HEAD:monodevelop-1.9.2-pre1.20090110svn122940.fc11.src.rpm:1231634326
+monodevelop-1_9_2-pre1_20090116svn123651_fc11:HEAD:monodevelop-1.9.2-pre1.20090116svn123651.fc11.src.rpm:1232151572


Index: monodevelop-2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/monodevelop/devel/monodevelop-2.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- monodevelop-2.spec	11 Jan 2009 00:40:00 -0000	1.6
+++ monodevelop-2.spec	17 Jan 2009 00:21:23 -0000	1.7
@@ -8,12 +8,12 @@
 #%(gacutil -l nunit.core | tail -n 2 | grep nunit.core | cut -d "=" -f 2 | cut -d "," -f 1)
 %define nunitver 2.2.10.0
 
-%define svnver 122940
+%define svnver 123651
 
 
 Name:           monodevelop
 Version:        1.9.2
-Release:        pre1.20090110svn%{svnver}%{?dist}
+Release:        pre1.20090116svn%{svnver}%{?dist}
 Summary:        A full-featured IDE for Mono and Gtk#
 
 Group:          Development/Tools
@@ -22,7 +22,7 @@
 Source0:        %{name}-%{svnver}.tar.bz2
 Patch0:         monodevelop-1.9.1-use-mono-cecil.patch
 Patch1:		monodevelop-1.9.1-use-system-cecil.patch
-Patch2:		monodevelop-1.9.1-use-system-nunit.patch
+Patch2:		monodevelop-192-nunit.patch
 Patch3:		monodevelop-191-usemonocecil.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -160,6 +160,10 @@
 %{_libdir}/pkgconfig/monodevelop*.pc
 
 %changelog
+* Fri Jan 16 2009 Paul F. Johnson <paul at all-the-johnsons.co.uk> 1.9.2-pre1.20090116svn123651
+- Update from svn
+- Altered nunit patch
+
 * Sat Jan 10 2009 Paul F. Johnson <paul at all-the-johnsons.co.uk> 1.9.2-pre1.200900109svn122940
 - Update from svn
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/monodevelop/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources	11 Jan 2009 00:40:00 -0000	1.16
+++ sources	17 Jan 2009 00:21:23 -0000	1.17
@@ -1 +1 @@
-247e303c62c499b03f14635a4b04b770  monodevelop-122940.tar.bz2
+995fbc003a6f380534bf846cbea0b008  monodevelop-123651.tar.bz2


--- monodevelop-1.9.1-use-system-nunit.patch DELETED ---



From jakub at fedoraproject.org  Sat Jan 17 00:45:05 2009
From: jakub at fedoraproject.org (Jakub Jelinek)
Date: Sat, 17 Jan 2009 00:45:05 +0000 (UTC)
Subject: rpms/gcc/devel .cvsignore, 1.247, 1.248 gcc.spec, 1.1,
	1.2 gcc44-hack.patch, 1.1, 1.2 sources, 1.250, 1.251
Message-ID: <20090117004505.F1F697012B@cvs1.fedora.phx.redhat.com>

Author: jakub

Update of /cvs/pkgs/rpms/gcc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1013

Modified Files:
	.cvsignore gcc.spec gcc44-hack.patch sources 
Log Message:
4.4.0-0.4


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/devel/.cvsignore,v
retrieving revision 1.247
retrieving revision 1.248
diff -u -r1.247 -r1.248
--- .cvsignore	16 Jan 2009 18:34:37 -0000	1.247
+++ .cvsignore	17 Jan 2009 00:44:35 -0000	1.248
@@ -1,2 +1,3 @@
 fastjar-0.97.tar.gz
 gcc-4.4.0-20090115.tar.bz2
+ppc64gnat.tar.bz2


Index: gcc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/devel/gcc.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gcc.spec	16 Jan 2009 18:34:37 -0000	1.1
+++ gcc.spec	17 Jan 2009 00:44:35 -0000	1.2
@@ -3,11 +3,11 @@
 %define gcc_version 4.4.0
 # 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 0.3
+%define gcc_release 0.4
 %define _unpackaged_files_terminate_build 0
 %define multilib_64_archs sparc64 ppc64 s390x x86_64
 %define include_gappletviewer 1
-%ifarch %{ix86} x86_64 ia64 ppc alpha
+%ifarch %{ix86} x86_64 ia64 ppc ppc64 alpha
 %define build_ada 1
 %else
 %define build_ada 0
@@ -50,6 +50,8 @@
 Source3: protoize.1
 %define fastjar_ver 0.97
 Source4: http://download.savannah.nongnu.org/releases/fastjar/fastjar-%{fastjar_ver}.tar.gz
+# Temporary bootstrap stuff.
+Source100: ppc64gnat.tar.bz2
 URL: http://gcc.gnu.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # Need binutils with -pie support >= 2.14.90.0.4-4
@@ -83,9 +85,11 @@
 BuildRequires: /lib/libc.so.6 /usr/lib/libc.so /lib64/libc.so.6 /usr/lib64/libc.so
 %endif
 %if %{build_ada}
+%ifnarch ppc64
 # Ada requires Ada to build
 BuildRequires: gcc-gnat >= 3.1, libgnat >= 3.1
 %endif
+%endif
 %ifarch ia64
 BuildRequires: libunwind >= 0.98
 %endif
@@ -478,6 +482,14 @@
 mkdir obj-%{gcc_target_platform}
 cd obj-%{gcc_target_platform}
 
+%ifarch ppc64
+mkdir gnat_hacks
+cd gnat_hacks
+tar xjf %{SOURCE100}
+export PATH=`pwd`/bin${PATH:+:$PATH}
+cd ..
+%endif
+
 %if %{build_java}
 %if !%{bootstrap_java}
 # If we don't have gjavah in $PATH, try to build it with the old gij
@@ -599,7 +611,7 @@
 GCJFLAGS="$OPT_FLAGS" make %{?_smp_mflags} BOOT_CFLAGS="$OPT_FLAGS" profiledbootstrap
 
 # run the tests.
-make %{?_smp_mflags} -k check ALT_CC_UNDER_TEST=gcc ALT_CXX_UNDER_TEST=g++ RUNTESTFLAGS="--target_board=unix/'{,-fstack-protector/--param=ssp-buffer-size=4}'" || :
+make %{?_smp_mflags} -k check ALT_CC_UNDER_TEST=gcc ALT_CXX_UNDER_TEST=g++ RUNTESTFLAGS="--target_board=unix/'{,-fstack-protector}'" || :
 echo ====================TESTING=========================
 ( ../contrib/test_summary || : ) 2>&1 | sed -n '/^cat.*EOF/,/^EOF/{/^cat.*EOF/d;/^EOF/d;/^LAST_UPDATED:/d;p;}'
 echo ====================TESTING END=====================
@@ -1709,5 +1721,8 @@
 %doc rpm.doc/changelogs/libmudflap/ChangeLog*
 
 %changelog
+* Sat Jan 17 2009 Jakub Jelinek <jakub at redhat.com> 4.4.0-0.4
+- enable Ada support on ppc64
+
 * Fri Jan 16 2009 Jakub Jelinek <jakub at redhat.com> 4.4.0-0.3
 - initial 4.4 package, using newly created redhat/gcc-4_4-branch

gcc44-hack.patch:

Index: gcc44-hack.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/devel/gcc44-hack.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gcc44-hack.patch	16 Jan 2009 18:34:38 -0000	1.1
+++ gcc44-hack.patch	17 Jan 2009 00:44:35 -0000	1.2
@@ -111,3 +111,14 @@
           then
              Add_Switch (Argv, Compiler, And_Save => And_Save);
              Add_Switch (Argv, Linker, And_Save => And_Save);
+--- gcc/ada/gcc-interface/Makefile.in.jj	2009-01-02 19:54:27.000000000 +0100
++++ gcc/ada/gcc-interface/Makefile.in	2009-01-16 18:56:29.848954175 +0100
+@@ -1492,7 +1492,7 @@ ifeq ($(strip $(filter-out powerpc% linu
+   LIBGNAT_TARGET_PAIRS_64 = \
+   system.ads<system-linux-ppc64.ads
+ 
+-  ifeq ($(strip $(MULTISUBDIR)),/64)
++  ifeq ($(strip $(shell $(GCC_FOR_TARGET) $(GNATLIBCFLAGS) -print-multi-os-directory)),../lib64)
+     LIBGNAT_TARGET_PAIRS = \
+     $(LIBGNAT_TARGET_PAIRS_COMMON) $(LIBGNAT_TARGET_PAIRS_64)
+   else


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/devel/sources,v
retrieving revision 1.250
retrieving revision 1.251
diff -u -r1.250 -r1.251
--- sources	16 Jan 2009 18:34:38 -0000	1.250
+++ sources	17 Jan 2009 00:44:35 -0000	1.251
@@ -1,2 +1,3 @@
 2659f09c2e43ef8b7d4406321753f1b2  fastjar-0.97.tar.gz
 0fafcb0d23d420c978ab253702094ada  gcc-4.4.0-20090115.tar.bz2
+8ebb9e69b2e356829451316d9af92eee  ppc64gnat.tar.bz2



From lmacken at fedoraproject.org  Sat Jan 17 01:24:04 2009
From: lmacken at fedoraproject.org (Luke Macken)
Date: Sat, 17 Jan 2009 01:24:04 +0000 (UTC)
Subject: rpms/liveusb-creator/devel .cvsignore, 1.6, 1.7 liveusb-creator.spec,
	1.10, 1.11 sources, 1.9, 1.10
Message-ID: <20090117012404.9FF127012B@cvs1.fedora.phx.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/liveusb-creator/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5477

Modified Files:
	.cvsignore liveusb-creator.spec sources 
Log Message:
Update to 3.4


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/liveusb-creator/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	16 Jan 2009 00:26:35 -0000	1.6
+++ .cvsignore	17 Jan 2009 01:23:34 -0000	1.7
@@ -1 +1 @@
-liveusb-creator-3.3.tar.bz2
+liveusb-creator-3.4.tar.bz2


Index: liveusb-creator.spec
===================================================================
RCS file: /cvs/pkgs/rpms/liveusb-creator/devel/liveusb-creator.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- liveusb-creator.spec	16 Jan 2009 00:26:35 -0000	1.10
+++ liveusb-creator.spec	17 Jan 2009 01:23:34 -0000	1.11
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           liveusb-creator
-Version:        3.3
+Version:        3.4
 Release:        1%{?dist}
 Summary:        A liveusb creator
 
@@ -17,6 +17,7 @@
 
 BuildRequires:  python-devel, python-setuptools, PyQt4-devel, desktop-file-utils gettext
 Requires:       syslinux, PyQt4, usermode, isomd5sum
+Requires:       python-urlgrabber
 
 %description
 A liveusb creator from Live Fedora images
@@ -31,6 +32,7 @@
 %install
 rm -rf %{buildroot}
 %{__python} setup.py install -O1 --skip-build --root %{buildroot}
+%{__rm} -r liveusb/urlgrabber
 
 # Adjust for console-helper magic
 mkdir -p %{buildroot}%{_sbindir}
@@ -64,6 +66,12 @@
 %config(noreplace) %{_sysconfdir}/security/console.apps/%{name}
 
 %changelog
+* Fri Jan 16 2009 Luke Macken <lmacken at redhat.com> 3.4-1
+- Update to 3.4.
+
+* Fri Jan 16 2009 Luke Macken <lmacken at redhat.com> 3.3-2
+- Require python-urlgrabber
+
 * Fri Jan 15 2009 Luke Macken <lmacken at redhat.com> 3.3-1
 - Update to 3.3
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/liveusb-creator/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	16 Jan 2009 00:26:35 -0000	1.9
+++ sources	17 Jan 2009 01:23:34 -0000	1.10
@@ -1 +1 @@
-59d7dea71ab528f9301978c75e839b7f  liveusb-creator-3.3.tar.bz2
+be1dc9fcecd6a67966198f10a67d7119  liveusb-creator-3.4.tar.bz2



From steve at fedoraproject.org  Sat Jan 17 01:28:29 2009
From: steve at fedoraproject.org (Steven Pritchard)
Date: Sat, 17 Jan 2009 01:28:29 +0000 (UTC)
Subject: rpms/perl-IPC-Run/devel .cvsignore, 1.4, 1.5 perl-IPC-Run.spec, 1.16,
	1.17 sources, 1.4, 1.5
Message-ID: <20090117012829.893B77012B@cvs1.fedora.phx.redhat.com>

Author: steve

Update of /cvs/pkgs/rpms/perl-IPC-Run/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5900

Modified Files:
	.cvsignore perl-IPC-Run.spec sources 
Log Message:
Update to 0.82.
Use fixperms macro instead of our own chmod incantation.
Fix Source0 URL.
BR Test::More.
Include LICENSE, README, and abuse/ in docs.
Cleanup to more closely resemble cpanspec output.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-IPC-Run/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	11 May 2006 15:32:16 -0000	1.4
+++ .cvsignore	17 Jan 2009 01:27:59 -0000	1.5
@@ -1 +1 @@
-IPC-Run-0.80.tar.gz
+IPC-Run-0.82.tar.gz


Index: perl-IPC-Run.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-IPC-Run/devel/perl-IPC-Run.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- perl-IPC-Run.spec	2 Mar 2008 15:51:23 -0000	1.16
+++ perl-IPC-Run.spec	17 Jan 2009 01:27:59 -0000	1.17
@@ -1,18 +1,17 @@
 Name:           perl-IPC-Run
-Version:        0.80
-Release:        5%{?dist}
+Version:        0.82
+Release:        1%{?dist}
 Summary:        Perl module for interacting with child processes
-
 License:        GPL+ or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/IPC-Run/
-Source0:        http://www.cpan.org/authors/id/R/RS/RSOD/IPC-Run-%{version}.tar.gz
+Source0:        http://www.cpan.org/authors/id/A/AD/ADAMK/IPC-Run-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
 BuildArch:      noarch
 BuildRequires:  perl(ExtUtils::MakeMaker)
-BuildRequires:  perl(IO::Pty)
-Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+BuildRequires:  perl(IO::Pty) >= 1.00
+BuildRequires:  perl(Test::More) >= 0.47
+Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
 IPC::Run allows you run and interact with child processes using files,
@@ -22,45 +21,53 @@
 Various redirection operators reminiscent of those seen on common Unix
 and DOS command lines are provided.
 
-
 %prep
 %setup -q -n IPC-Run-%{version}
 chmod 644 lib/IPC/*.pm lib/IPC/Run/*.pm Changes eg/*
-%{__perl} -pi -e 's|/usr/local/bin/perl|%{__perl}|' eg/run_daemon
-
+for file in eg/run_daemon abuse/timers abuse/blocking_debug_with_sub_coprocess ; do
+    %{__perl} -pi -e 's,^#!.*/perl,%{__perl}, if ($. == 1)' "$file"
+done
 
 %build
 %{__perl} Makefile.PL INSTALLDIRS=vendor
 make %{?_smp_mflags}
 
-
 %install
 rm -rf $RPM_BUILD_ROOT
+
 make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
-find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';'
-find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null ';'
-chmod -R u+w $RPM_BUILD_ROOT/*
+
+find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
+find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;
+
+%{_fixperms} $RPM_BUILD_ROOT/*
+
 rm -f $RPM_BUILD_ROOT%{perl_vendorlib}/IPC/Run/Win32*.pm
 rm -f $RPM_BUILD_ROOT%{_mandir}/man3/IPC::Run::Win32*.3*
 
-
 %check
 # https://rt.cpan.org/NoAuth/Bug.html?id=11129
 [ ! -d /dev/pts ] || IPCRUNDEBUG=2 make test
 
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-
 %files
 %defattr(-,root,root,-)
-%doc Changes TODO eg/
-%{perl_vendorlib}/IPC/
-%{_mandir}/man3/IPC::Run*.3*
-
+%doc Changes LICENSE README TODO
+%doc abuse/ eg/
+%{perl_vendorlib}/*
+%{_mandir}/man3/*
 
 %changelog
+* Fri Jan 16 2009 Steven Pritchard <steve at kspei.com> 0.82-1
+- Update to 0.82.
+- Use fixperms macro instead of our own chmod incantation.
+- Fix Source0 URL.
+- BR Test::More.
+- Include LICENSE, README, and abuse/ in docs.
+- Cleanup to more closely resemble cpanspec output.
+
 * Wed Feb 27 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.80-5
 - Rebuild for perl 5.10 (again)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-IPC-Run/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	11 May 2006 15:32:16 -0000	1.4
+++ sources	17 Jan 2009 01:27:59 -0000	1.5
@@ -1 +1 @@
-a867e694862afd4a3c429124618fc15e  IPC-Run-0.80.tar.gz
+6eb9fa0058956ece7fdf25c6ec395288  IPC-Run-0.82.tar.gz



From lmacken at fedoraproject.org  Sat Jan 17 01:28:40 2009
From: lmacken at fedoraproject.org (Luke Macken)
Date: Sat, 17 Jan 2009 01:28:40 +0000 (UTC)
Subject: rpms/liveusb-creator/F-10 .cvsignore, 1.6, 1.7 liveusb-creator.spec,
	1.9, 1.10 sources, 1.8, 1.9
Message-ID: <20090117012840.1D0817012B@cvs1.fedora.phx.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/liveusb-creator/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5966

Modified Files:
	.cvsignore liveusb-creator.spec sources 
Log Message:
3.4


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/liveusb-creator/F-10/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	16 Jan 2009 00:32:30 -0000	1.6
+++ .cvsignore	17 Jan 2009 01:28:09 -0000	1.7
@@ -1 +1 @@
-liveusb-creator-3.3.tar.bz2
+liveusb-creator-3.4.tar.bz2


Index: liveusb-creator.spec
===================================================================
RCS file: /cvs/pkgs/rpms/liveusb-creator/F-10/liveusb-creator.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- liveusb-creator.spec	16 Jan 2009 00:32:30 -0000	1.9
+++ liveusb-creator.spec	17 Jan 2009 01:28:09 -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:           liveusb-creator
-Version:        3.3
+Version:        3.4
 Release:        1%{?dist}
 Summary:        A liveusb creator
 
@@ -17,6 +17,7 @@
 
 BuildRequires:  python-devel, python-setuptools, PyQt4-devel, desktop-file-utils gettext
 Requires:       syslinux, PyQt4, usermode, isomd5sum
+Requires:       python-urlgrabber
 
 %description
 A liveusb creator from Live Fedora images
@@ -31,6 +32,7 @@
 %install
 rm -rf %{buildroot}
 %{__python} setup.py install -O1 --skip-build --root %{buildroot}
+%{__rm} -r liveusb/urlgrabber
 
 # Adjust for console-helper magic
 mkdir -p %{buildroot}%{_sbindir}
@@ -64,6 +66,12 @@
 %config(noreplace) %{_sysconfdir}/security/console.apps/%{name}
 
 %changelog
+* Fri Jan 16 2009 Luke Macken <lmacken at redhat.com> 3.4-1
+- Update to 3.4.
+
+* Fri Jan 16 2009 Luke Macken <lmacken at redhat.com> 3.3-2
+- Require python-urlgrabber
+
 * Fri Jan 15 2009 Luke Macken <lmacken at redhat.com> 3.3-1
 - Update to 3.3
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/liveusb-creator/F-10/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	16 Jan 2009 00:32:30 -0000	1.8
+++ sources	17 Jan 2009 01:28:09 -0000	1.9
@@ -1 +1 @@
-59d7dea71ab528f9301978c75e839b7f  liveusb-creator-3.3.tar.bz2
+be1dc9fcecd6a67966198f10a67d7119  liveusb-creator-3.4.tar.bz2



From lmacken at fedoraproject.org  Sat Jan 17 01:33:25 2009
From: lmacken at fedoraproject.org (Luke Macken)
Date: Sat, 17 Jan 2009 01:33:25 +0000 (UTC)
Subject: rpms/liveusb-creator/F-9 .cvsignore, 1.5, 1.6 liveusb-creator.spec, 
	1.6, 1.7 sources, 1.6, 1.7
Message-ID: <20090117013325.EFE2A7012B@cvs1.fedora.phx.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/liveusb-creator/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6486

Modified Files:
	.cvsignore liveusb-creator.spec sources 
Log Message:
3.4


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/liveusb-creator/F-9/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	16 Jan 2009 00:33:37 -0000	1.5
+++ .cvsignore	17 Jan 2009 01:32:55 -0000	1.6
@@ -1 +1 @@
-liveusb-creator-3.3.tar.bz2
+liveusb-creator-3.4.tar.bz2


Index: liveusb-creator.spec
===================================================================
RCS file: /cvs/pkgs/rpms/liveusb-creator/F-9/liveusb-creator.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- liveusb-creator.spec	16 Jan 2009 00:33:37 -0000	1.6
+++ liveusb-creator.spec	17 Jan 2009 01:32:55 -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:           liveusb-creator
-Version:        3.3
+Version:        3.4
 Release:        1%{?dist}
 Summary:        A liveusb creator
 
@@ -17,6 +17,7 @@
 
 BuildRequires:  python-devel, python-setuptools, PyQt4-devel, desktop-file-utils gettext
 Requires:       syslinux, PyQt4, usermode, isomd5sum
+Requires:       python-urlgrabber
 
 %description
 A liveusb creator from Live Fedora images
@@ -31,6 +32,7 @@
 %install
 rm -rf %{buildroot}
 %{__python} setup.py install -O1 --skip-build --root %{buildroot}
+%{__rm} -r liveusb/urlgrabber
 
 # Adjust for console-helper magic
 mkdir -p %{buildroot}%{_sbindir}
@@ -64,6 +66,12 @@
 %config(noreplace) %{_sysconfdir}/security/console.apps/%{name}
 
 %changelog
+* Fri Jan 16 2009 Luke Macken <lmacken at redhat.com> 3.4-1
+- Update to 3.4.
+
+* Fri Jan 16 2009 Luke Macken <lmacken at redhat.com> 3.3-2
+- Require python-urlgrabber
+
 * Fri Jan 15 2009 Luke Macken <lmacken at redhat.com> 3.3-1
 - Update to 3.3
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/liveusb-creator/F-9/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	16 Jan 2009 00:33:37 -0000	1.6
+++ sources	17 Jan 2009 01:32:55 -0000	1.7
@@ -1 +1 @@
-59d7dea71ab528f9301978c75e839b7f  liveusb-creator-3.3.tar.bz2
+be1dc9fcecd6a67966198f10a67d7119  liveusb-creator-3.4.tar.bz2



From steve at fedoraproject.org  Sat Jan 17 01:39:47 2009
From: steve at fedoraproject.org (Steven Pritchard)
Date: Sat, 17 Jan 2009 01:39:47 +0000 (UTC)
Subject: rpms/perl-PAR-Dist/devel .cvsignore, 1.20, 1.21 perl-PAR-Dist.spec, 
	1.30, 1.31 sources, 1.20, 1.21
Message-ID: <20090117013947.8581F7012B@cvs1.fedora.phx.redhat.com>

Author: steve

Update of /cvs/pkgs/rpms/perl-PAR-Dist/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7775

Modified Files:
	.cvsignore perl-PAR-Dist.spec sources 
Log Message:
Update to 0.42.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-PAR-Dist/devel/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- .cvsignore	15 Dec 2008 20:32:58 -0000	1.20
+++ .cvsignore	17 Jan 2009 01:39:16 -0000	1.21
@@ -1 +1 @@
-PAR-Dist-0.40.tar.gz
+PAR-Dist-0.42.tar.gz


Index: perl-PAR-Dist.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-PAR-Dist/devel/perl-PAR-Dist.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- perl-PAR-Dist.spec	15 Dec 2008 20:32:58 -0000	1.30
+++ perl-PAR-Dist.spec	17 Jan 2009 01:39:16 -0000	1.31
@@ -1,5 +1,5 @@
 Name:           perl-PAR-Dist
-Version:        0.40
+Version:        0.42
 Release:        1%{?dist}
 Summary:        Toolkit for creating and manipulating Perl PAR distributions
 License:        GPL+ or Artistic
@@ -53,6 +53,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Fri Jan 16 2009 Steven Pritchard <steve at kspei.com> 0.42-1
+- Update to 0.42.
+
 * Mon Dec 15 2008 Steven Pritchard <steve at kspei.com> 0.40-1
 - Update to 0.40.
 - BR Archive::Zip and YAML::Tiny for t/03merge_meta.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-PAR-Dist/devel/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources	15 Dec 2008 20:32:58 -0000	1.20
+++ sources	17 Jan 2009 01:39:17 -0000	1.21
@@ -1 +1 @@
-904832a892277849aef78d07a3f8d9d7  PAR-Dist-0.40.tar.gz
+9be1f1e5cfa4ffefe3ba72ecff222f2e  PAR-Dist-0.42.tar.gz



From steve at fedoraproject.org  Sat Jan 17 01:48:12 2009
From: steve at fedoraproject.org (Steven Pritchard)
Date: Sat, 17 Jan 2009 01:48:12 +0000 (UTC)
Subject: rpms/perl-Parse-CPAN-Meta/devel .cvsignore, 1.2,
	1.3 perl-Parse-CPAN-Meta.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20090117014812.450787012B@cvs1.fedora.phx.redhat.com>

Author: steve

Update of /cvs/pkgs/rpms/perl-Parse-CPAN-Meta/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8509

Modified Files:
	.cvsignore perl-Parse-CPAN-Meta.spec sources 
Log Message:
Update to 0.04.
Update Source0 URL.
Add version to Test::More dep.
LICENSE and README went away.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Parse-CPAN-Meta/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	19 May 2008 23:00:51 -0000	1.2
+++ .cvsignore	17 Jan 2009 01:47:41 -0000	1.3
@@ -1 +1 @@
-Parse-CPAN-Meta-0.03.tar.gz
+Parse-CPAN-Meta-0.04.tar.gz


Index: perl-Parse-CPAN-Meta.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Parse-CPAN-Meta/devel/perl-Parse-CPAN-Meta.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Parse-CPAN-Meta.spec	19 May 2008 23:00:51 -0000	1.1
+++ perl-Parse-CPAN-Meta.spec	17 Jan 2009 01:47:41 -0000	1.2
@@ -1,15 +1,15 @@
 Name:           perl-Parse-CPAN-Meta
-Version:        0.03
+Version:        0.04
 Release:        1%{?dist}
 Summary:        Parse META.yml and other similar CPAN metadata files
 License:        GPL+ or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/Parse-CPAN-Meta/
-Source0:        http://www.cpan.org/authors/id/A/AD/ADAMK/Parse-CPAN-Meta-%{version}.tar.gz
+Source0:        http://www.cpan.org/authors/id/S/SM/SMUELLER/Parse-CPAN-Meta-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 BuildRequires:  perl(ExtUtils::MakeMaker)
-BuildRequires:  perl(Test::More)
+BuildRequires:  perl(Test::More) >= 0.47
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
@@ -41,11 +41,17 @@
 
 %files
 %defattr(-,root,root,-)
-%doc Changes LICENSE README
+%doc Changes
 %{perl_vendorlib}/*
 %{_mandir}/man3/*
 
 %changelog
+* Fri Jan 16 2009 Steven Pritchard <steve at kspei.com> 0.04-1
+- Update to 0.04.
+- Update Source0 URL.
+- Add version to Test::More dep.
+- LICENSE and README went away.
+
 * Fri May 16 2008 Steven Pritchard <steve at kspei.com> 0.03-1
 - Specfile autogenerated by cpanspec 1.75.
 - BR Test::More.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Parse-CPAN-Meta/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	19 May 2008 23:00:51 -0000	1.2
+++ sources	17 Jan 2009 01:47:41 -0000	1.3
@@ -1 +1 @@
-6085074818ee8242b15a099c0339defa  Parse-CPAN-Meta-0.03.tar.gz
+93876624d5cb4df9f9c4a51f6381499b  Parse-CPAN-Meta-0.04.tar.gz



From lmacken at fedoraproject.org  Sat Jan 17 01:57:50 2009
From: lmacken at fedoraproject.org (Luke Macken)
Date: Sat, 17 Jan 2009 01:57:50 +0000 (UTC)
Subject: rpms/liveusb-creator/devel .cvsignore, 1.7, 1.8 liveusb-creator.spec,
	1.11, 1.12 sources, 1.10, 1.11
Message-ID: <20090117015750.B11637012B@cvs1.fedora.phx.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/liveusb-creator/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9355

Modified Files:
	.cvsignore liveusb-creator.spec sources 
Log Message:
Update to v3.5, to fix an OLPC issue


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/liveusb-creator/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	17 Jan 2009 01:23:34 -0000	1.7
+++ .cvsignore	17 Jan 2009 01:57:20 -0000	1.8
@@ -1 +1 @@
-liveusb-creator-3.4.tar.bz2
+liveusb-creator-3.5.tar.bz2


Index: liveusb-creator.spec
===================================================================
RCS file: /cvs/pkgs/rpms/liveusb-creator/devel/liveusb-creator.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- liveusb-creator.spec	17 Jan 2009 01:23:34 -0000	1.11
+++ liveusb-creator.spec	17 Jan 2009 01:57:20 -0000	1.12
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           liveusb-creator
-Version:        3.4
+Version:        3.5
 Release:        1%{?dist}
 Summary:        A liveusb creator
 
@@ -66,6 +66,9 @@
 %config(noreplace) %{_sysconfdir}/security/console.apps/%{name}
 
 %changelog
+* Fri Jan 16 2009 Luke Macken <lmacken at redhat.com> 3.5-1
+- Update to v3.5
+
 * Fri Jan 16 2009 Luke Macken <lmacken at redhat.com> 3.4-1
 - Update to 3.4.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/liveusb-creator/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	17 Jan 2009 01:23:34 -0000	1.10
+++ sources	17 Jan 2009 01:57:20 -0000	1.11
@@ -1 +1 @@
-be1dc9fcecd6a67966198f10a67d7119  liveusb-creator-3.4.tar.bz2
+9d314557ad8972374a7f087eaa9fe28a  liveusb-creator-3.5.tar.bz2



From lmacken at fedoraproject.org  Sat Jan 17 01:58:53 2009
From: lmacken at fedoraproject.org (Luke Macken)
Date: Sat, 17 Jan 2009 01:58:53 +0000 (UTC)
Subject: rpms/liveusb-creator/F-10 .cvsignore, 1.7, 1.8 liveusb-creator.spec,
	1.10, 1.11 sources, 1.9, 1.10
Message-ID: <20090117015853.583E77012B@cvs1.fedora.phx.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/liveusb-creator/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9549

Modified Files:
	.cvsignore liveusb-creator.spec sources 
Log Message:
Update to v3.5, to fix an OLPC issue


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/liveusb-creator/F-10/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	17 Jan 2009 01:28:09 -0000	1.7
+++ .cvsignore	17 Jan 2009 01:58:23 -0000	1.8
@@ -1 +1 @@
-liveusb-creator-3.4.tar.bz2
+liveusb-creator-3.5.tar.bz2


Index: liveusb-creator.spec
===================================================================
RCS file: /cvs/pkgs/rpms/liveusb-creator/F-10/liveusb-creator.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- liveusb-creator.spec	17 Jan 2009 01:28:09 -0000	1.10
+++ liveusb-creator.spec	17 Jan 2009 01:58:23 -0000	1.11
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           liveusb-creator
-Version:        3.4
+Version:        3.5
 Release:        1%{?dist}
 Summary:        A liveusb creator
 
@@ -66,6 +66,9 @@
 %config(noreplace) %{_sysconfdir}/security/console.apps/%{name}
 
 %changelog
+* Fri Jan 16 2009 Luke Macken <lmacken at redhat.com> 3.5-1
+- Update to v3.5
+
 * Fri Jan 16 2009 Luke Macken <lmacken at redhat.com> 3.4-1
 - Update to 3.4.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/liveusb-creator/F-10/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	17 Jan 2009 01:28:09 -0000	1.9
+++ sources	17 Jan 2009 01:58:23 -0000	1.10
@@ -1 +1 @@
-be1dc9fcecd6a67966198f10a67d7119  liveusb-creator-3.4.tar.bz2
+9d314557ad8972374a7f087eaa9fe28a  liveusb-creator-3.5.tar.bz2



From lmacken at fedoraproject.org  Sat Jan 17 01:59:55 2009
From: lmacken at fedoraproject.org (Luke Macken)
Date: Sat, 17 Jan 2009 01:59:55 +0000 (UTC)
Subject: rpms/liveusb-creator/F-9 .cvsignore, 1.6, 1.7 liveusb-creator.spec, 
	1.7, 1.8 sources, 1.7, 1.8
Message-ID: <20090117015955.46F5D7012B@cvs1.fedora.phx.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/liveusb-creator/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9746

Modified Files:
	.cvsignore liveusb-creator.spec sources 
Log Message:
Update to v3.5, to fix an OLPC issue


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/liveusb-creator/F-9/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	17 Jan 2009 01:32:55 -0000	1.6
+++ .cvsignore	17 Jan 2009 01:59:25 -0000	1.7
@@ -1 +1 @@
-liveusb-creator-3.4.tar.bz2
+liveusb-creator-3.5.tar.bz2


Index: liveusb-creator.spec
===================================================================
RCS file: /cvs/pkgs/rpms/liveusb-creator/F-9/liveusb-creator.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- liveusb-creator.spec	17 Jan 2009 01:32:55 -0000	1.7
+++ liveusb-creator.spec	17 Jan 2009 01:59:25 -0000	1.8
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           liveusb-creator
-Version:        3.4
+Version:        3.5
 Release:        1%{?dist}
 Summary:        A liveusb creator
 
@@ -66,6 +66,9 @@
 %config(noreplace) %{_sysconfdir}/security/console.apps/%{name}
 
 %changelog
+* Fri Jan 16 2009 Luke Macken <lmacken at redhat.com> 3.5-1
+- Update to v3.5
+
 * Fri Jan 16 2009 Luke Macken <lmacken at redhat.com> 3.4-1
 - Update to 3.4.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/liveusb-creator/F-9/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	17 Jan 2009 01:32:55 -0000	1.7
+++ sources	17 Jan 2009 01:59:25 -0000	1.8
@@ -1 +1 @@
-be1dc9fcecd6a67966198f10a67d7119  liveusb-creator-3.4.tar.bz2
+9d314557ad8972374a7f087eaa9fe28a  liveusb-creator-3.5.tar.bz2



From alexlan at fedoraproject.org  Sat Jan 17 02:36:14 2009
From: alexlan at fedoraproject.org (Alex Lancaster)
Date: Sat, 17 Jan 2009 02:36:14 +0000 (UTC)
Subject: rpms/php-ZendFramework/devel php-ZendFramework.spec,1.10,1.11
Message-ID: <20090117023614.9A4B77012B@cvs1.fedora.phx.redhat.com>

Author: alexlan

Update of /cvs/pkgs/rpms/php-ZendFramework/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12984

Modified Files:
	php-ZendFramework.spec 
Log Message:
* Fri Jan 16 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 1.7.2-5
- Fix font [Build]Requires yet again to track moving target of naming
  convention.  Fixes broken deps.



Index: php-ZendFramework.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php-ZendFramework/devel/php-ZendFramework.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- php-ZendFramework.spec	13 Jan 2009 03:37:07 -0000	1.10
+++ php-ZendFramework.spec	17 Jan 2009 02:35:44 -0000	1.11
@@ -3,7 +3,7 @@
 Summary:         Leading open-source PHP framework
 Name:            php-ZendFramework
 Version:         1.7.2
-Release:         4%{?dist}
+Release:         5%{?dist}
 
 License:         BSD
 Group:           Development/Libraries
@@ -57,8 +57,8 @@
 Group:    Development/Libraries
 Requires: %{name} = %{version}-%{release}
 Requires: php-pear(pear.phpunit.de/PHPUnit) >= 3.0.0
-Requires: bitstream-vera-fonts-sans bitstream-vera-fonts-sans-mono bitstream-vera-fonts-serif
-BuildRequires: bitstream-vera-fonts-sans bitstream-vera-fonts-sans-mono bitstream-vera-fonts-serif
+Requires: bitstream-vera-sans-fonts bitstream-vera-sans-mono-fonts bitstream-vera-serif-fonts
+BuildRequires: bitstream-vera-sans-fonts bitstream-vera-sans-mono-fonts bitstream-vera-serif-fonts
 
 %description tests
 This package includes Zend Framework unit tests for all available subpackages.
@@ -453,6 +453,10 @@
 
 
 %changelog
+* Fri Jan 16 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 1.7.2-5
+- Fix font [Build]Requires yet again to track moving target of naming
+  convention.  Fixes broken deps.
+
 * Mon Jan 12 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 1.7.2-4
 - Fix Requires, BuildRequires: bitstream-vera-fonts-{sans,sans-mono,serif}
   fixes broken deps



From alexlan at fedoraproject.org  Sat Jan 17 02:41:12 2009
From: alexlan at fedoraproject.org (Alex Lancaster)
Date: Sat, 17 Jan 2009 02:41:12 +0000 (UTC)
Subject: rpms/neverball/devel neverball.spec,1.18,1.19
Message-ID: <20090117024112.825D17012B@cvs1.fedora.phx.redhat.com>

Author: alexlan

Update of /cvs/pkgs/rpms/neverball/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14104

Modified Files:
	neverball.spec 
Log Message:
* Fri Jan 16 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 1.4.0-14
- Fix font Requires bitstream-vera-fonts-sans ->
  bitstream-vera-sans-fonts (another font naming convention change).



Index: neverball.spec
===================================================================
RCS file: /cvs/pkgs/rpms/neverball/devel/neverball.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- neverball.spec	1 Jan 2009 23:07:14 -0000	1.18
+++ neverball.spec	17 Jan 2009 02:40:42 -0000	1.19
@@ -1,6 +1,6 @@
 Name:           neverball
 Version:        1.4.0
-Release:        13%{?dist}
+Release:        14%{?dist}
 
 Summary:        Roll a ball through an obstacle course
 
@@ -15,7 +15,7 @@
 BuildRequires:  SDL_image-devel, SDL_ttf-devel, SDL_mixer-devel
 BuildRequires:  freetype-devel, desktop-file-utils, zlib-devel
 BuildRequires:  libGL-devel
-Requires: opengl-games-utils bitstream-vera-fonts-sans
+Requires: opengl-games-utils bitstream-vera-sans-fonts
 
 %description
 Tilt the floor to roll a ball through an obstacle course within the
@@ -70,6 +70,10 @@
 %{_datadir}/applications/*
 
 %changelog
+* Fri Jan 16 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 1.4.0-14
+- Fix font Requires bitstream-vera-fonts-sans ->
+  bitstream-vera-sans-fonts (another font naming convention change).
+
 * Thu Jan 1 2009 Wart <wart at kobold.org> - 1.4.0-13
 - Fix font package name for F11
 



From kevin at fedoraproject.org  Sat Jan 17 02:57:57 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 17 Jan 2009 02:57:57 +0000 (UTC)
Subject: rpms/libxfcegui4/devel .cvsignore, 1.11, 1.12 sources, 1.11,
	1.12 libxfcegui4.spec, 1.26, 1.27
Message-ID: <20090117025757.C435C7012B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/libxfcegui4/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15377

Modified Files:
	.cvsignore sources libxfcegui4.spec 
Log Message:
Update to 4.5.93



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libxfcegui4/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	13 Jan 2009 02:14:15 -0000	1.11
+++ .cvsignore	17 Jan 2009 02:57:27 -0000	1.12
@@ -1 +1 @@
-libxfcegui4-4.5.92.tar.bz2
+libxfcegui4-4.5.93.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libxfcegui4/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	13 Jan 2009 02:14:15 -0000	1.11
+++ sources	17 Jan 2009 02:57:27 -0000	1.12
@@ -1 +1 @@
-f4c0e9740b0e1bb04c66ea1d263ce013  libxfcegui4-4.5.92.tar.bz2
+e8c760abcd08df81abe4a2f94ced26aa  libxfcegui4-4.5.93.tar.bz2


Index: libxfcegui4.spec
===================================================================
RCS file: /cvs/extras/rpms/libxfcegui4/devel/libxfcegui4.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- libxfcegui4.spec	13 Jan 2009 02:14:15 -0000	1.26
+++ libxfcegui4.spec	17 Jan 2009 02:57:27 -0000	1.27
@@ -1,6 +1,6 @@
 Summary: GTK widgets for Xfce
 Name: libxfcegui4
-Version: 4.5.92
+Version: 4.5.93
 Release: 1%{?dist}
 License: LGPLv2+
 URL: http://www.xfce.org/
@@ -21,6 +21,7 @@
 BuildRequires: libglade2-devel
 BuildRequires: glade3-libgladeui-devel
 BuildRequires: perl(XML::Parser)
+BuildRequires: intltool
 
 %description
 The package includes various gtk widgets for Xfce.
@@ -91,6 +92,9 @@
 %{_datadir}/glade3/pixmaps/hicolor/*/actions/*
 
 %changelog
+* Tue Jan 13 2009 Kevin Fenzi <kevin at tummy.com> - 4.5.93-1
+- Update to 4.5.93
+
 * Sun Dec 21 2008 Kevin Fenzi <kevin at tummy.com> - 4.5.92-1
 - Update to 4.5.92
 



From kevin at fedoraproject.org  Sat Jan 17 03:10:45 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 17 Jan 2009 03:10:45 +0000 (UTC)
Subject: rpms/libxfce4menu/devel sources, 1.2, 1.3 .cvsignore, 1.2,
	1.3 libxfce4menu.spec, 1.1, 1.2
Message-ID: <20090117031045.B49977012B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/libxfce4menu/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17055

Modified Files:
	sources .cvsignore libxfce4menu.spec 
Log Message:
Update to 4.5.93



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libxfce4menu/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	13 Jan 2009 02:24:31 -0000	1.2
+++ sources	17 Jan 2009 03:10:14 -0000	1.3
@@ -1 +1 @@
-4a92cbc2d568181f688b971670946e92  libxfce4menu-4.5.92.tar.bz2
+54b75f848566f179fcfd463af03281ff  libxfce4menu-4.5.93.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libxfce4menu/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	13 Jan 2009 02:24:31 -0000	1.2
+++ .cvsignore	17 Jan 2009 03:10:14 -0000	1.3
@@ -1 +1 @@
-libxfce4menu-4.5.92.tar.bz2
+libxfce4menu-4.5.93.tar.bz2


Index: libxfce4menu.spec
===================================================================
RCS file: /cvs/extras/rpms/libxfce4menu/devel/libxfce4menu.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libxfce4menu.spec	13 Jan 2009 02:24:31 -0000	1.1
+++ libxfce4menu.spec	17 Jan 2009 03:10:14 -0000	1.2
@@ -1,5 +1,5 @@
 Name:           libxfce4menu
-Version:        4.5.92
+Version:        4.5.93
 Release:        1%{?dist}
 Summary:        A freedesktop.org compliant menu implementation for Xfce
 
@@ -12,7 +12,8 @@
 BuildRequires: gettext
 BuildRequires: glib2-devel
 BuildRequires: gtk2-devel
-BuildRequires: libxfce4util-devel >= 4.5.92
+BuildRequires: libxfce4util-devel >= %{version}
+BuildRequires: intltool
 
 %description
 libxfce4menu is a freedesktop.org compliant menu library written for Xfce. 
@@ -62,5 +63,8 @@
 %{_libdir}/pkgconfig/%{name}-0.1.pc
 
 %changelog
+* Tue Jan 13 2009 Kevin Fenzi <kevin at tummy.com> - 4.5.93-1
+- Update to 4.5.93
+
 * Tue Dec 23 2008 Kevin Fenzi <kevin at tummy.com> - 4.5.92-1
 - Initial packaging for Fedora



From pkgdb at fedoraproject.org  Sat Jan 17 03:14:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 17 Jan 2009 03:14:53 +0000
Subject: [pkgdb] jpilot-backup was added for pcfe
Message-ID: <20090117031453.8B8B2208457@bastion.fedora.phx.redhat.com>

kevin has added Package jpilot-backup with summary Enhanced backup plugin for J-Pilot
kevin has approved Package jpilot-backup
kevin has added a Fedora devel branch for jpilot-backup with an owner of pcfe
kevin has approved jpilot-backup in Fedora devel
kevin has approved Package jpilot-backup
kevin has set commit to Approved for provenpackager on jpilot-backup (Fedora devel)
kevin has set build to Approved for provenpackager on jpilot-backup (Fedora devel)
kevin has set checkout to Approved for provenpackager on jpilot-backup (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/jpilot-backup



From pkgdb at fedoraproject.org  Sat Jan 17 03:15:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 17 Jan 2009 03:15:00 +0000
Subject: [pkgdb] jpilot-backup (Fedora, devel) updated by kevin
Message-ID: <20090117031500.8DE90208469@bastion.fedora.phx.redhat.com>

kevin approved watchbugzilla on jpilot-backup (Fedora devel) for thl
kevin approved watchcommits on jpilot-backup (Fedora devel) for thl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/jpilot-backup



From kevin at fedoraproject.org  Sat Jan 17 03:15:16 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 17 Jan 2009 03:15:16 +0000 (UTC)
Subject: rpms/jpilot-backup - New directory
Message-ID: <20090117031516.2E1E07012B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/jpilot-backup
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsO17520/rpms/jpilot-backup

Log Message:
Directory /cvs/pkgs/rpms/jpilot-backup added to the repository




From kevin at fedoraproject.org  Sat Jan 17 03:15:16 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 17 Jan 2009 03:15:16 +0000 (UTC)
Subject: rpms/jpilot-backup/devel - New directory
Message-ID: <20090117031516.63B8570141@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/jpilot-backup/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsO17520/rpms/jpilot-backup/devel

Log Message:
Directory /cvs/pkgs/rpms/jpilot-backup/devel added to the repository




From pkgdb at fedoraproject.org  Sat Jan 17 03:15:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 17 Jan 2009 03:15:00 +0000
Subject: [pkgdb] jpilot-backup (Fedora, 10) updated by kevin
Message-ID: <20090117031500.97039208471@bastion.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for jpilot-backup
kevin has set commit to Approved for provenpackager on jpilot-backup (Fedora 10)
kevin has set build to Approved for provenpackager on jpilot-backup (Fedora 10)
kevin has set checkout to Approved for provenpackager on jpilot-backup (Fedora 10)
kevin approved watchbugzilla on jpilot-backup (Fedora 10) for thl
kevin approved watchcommits on jpilot-backup (Fedora 10) for thl

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/jpilot-backup



From kevin at fedoraproject.org  Sat Jan 17 03:15:31 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 17 Jan 2009 03:15:31 +0000 (UTC)
Subject: rpms/jpilot-backup Makefile,NONE,1.1
Message-ID: <20090117031531.BAF6C7012B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/jpilot-backup
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsO17520/rpms/jpilot-backup

Added Files:
	Makefile 
Log Message:
Setup of module jpilot-backup


--- NEW FILE Makefile ---
# Top level Makefile for module jpilot-backup
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Sat Jan 17 03:15:32 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 17 Jan 2009 03:15:32 +0000 (UTC)
Subject: rpms/jpilot-backup/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090117031532.1E44E7012B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/jpilot-backup/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsO17520/rpms/jpilot-backup/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module jpilot-backup


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: jpilot-backup
# $Id: Makefile,v 1.1 2009/01/17 03:15:31 kevin Exp $
NAME := jpilot-backup
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Sat Jan 17 03:15:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 17 Jan 2009 03:15:59 +0000
Subject: [pkgdb] python-libasyncns was added for mcepl
Message-ID: <20090117031559.27D26208468@bastion.fedora.phx.redhat.com>

kevin has added Package python-libasyncns with summary Python binding for libasyncns
kevin has approved Package python-libasyncns
kevin has added a Fedora devel branch for python-libasyncns with an owner of mcepl
kevin has approved python-libasyncns in Fedora devel
kevin has approved Package python-libasyncns
kevin has set commit to Approved for provenpackager on python-libasyncns (Fedora devel)
kevin has set build to Approved for provenpackager on python-libasyncns (Fedora devel)
kevin has set checkout to Approved for provenpackager on python-libasyncns (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-libasyncns



From pkgdb at fedoraproject.org  Sat Jan 17 03:16:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 17 Jan 2009 03:16:00 +0000
Subject: [pkgdb] python-libasyncns (Fedora, 9) updated by kevin
Message-ID: <20090117031600.579A2208470@bastion.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for python-libasyncns
kevin has set commit to Approved for provenpackager on python-libasyncns (Fedora 9)
kevin has set build to Approved for provenpackager on python-libasyncns (Fedora 9)
kevin has set checkout to Approved for provenpackager on python-libasyncns (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-libasyncns



From pkgdb at fedoraproject.org  Sat Jan 17 03:16:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 17 Jan 2009 03:16:00 +0000
Subject: [pkgdb] python-libasyncns (Fedora, 10) updated by kevin
Message-ID: <20090117031600.5FE03208473@bastion.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for python-libasyncns
kevin has set commit to Approved for provenpackager on python-libasyncns (Fedora 10)
kevin has set build to Approved for provenpackager on python-libasyncns (Fedora 10)
kevin has set checkout to Approved for provenpackager on python-libasyncns (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-libasyncns



From kevin at fedoraproject.org  Sat Jan 17 03:16:12 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 17 Jan 2009 03:16:12 +0000 (UTC)
Subject: rpms/python-libasyncns - New directory
Message-ID: <20090117031612.2DBC77012B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/python-libasyncns
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsw17674/rpms/python-libasyncns

Log Message:
Directory /cvs/pkgs/rpms/python-libasyncns added to the repository




From kevin at fedoraproject.org  Sat Jan 17 03:16:12 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 17 Jan 2009 03:16:12 +0000 (UTC)
Subject: rpms/python-libasyncns/devel - New directory
Message-ID: <20090117031612.72D707012B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/python-libasyncns/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsw17674/rpms/python-libasyncns/devel

Log Message:
Directory /cvs/pkgs/rpms/python-libasyncns/devel added to the repository




From kevin at fedoraproject.org  Sat Jan 17 03:16:29 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 17 Jan 2009 03:16:29 +0000 (UTC)
Subject: rpms/python-libasyncns Makefile,NONE,1.1
Message-ID: <20090117031629.92A777012B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/python-libasyncns
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsw17674/rpms/python-libasyncns

Added Files:
	Makefile 
Log Message:
Setup of module python-libasyncns


--- NEW FILE Makefile ---
# Top level Makefile for module python-libasyncns
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Sat Jan 17 03:16:29 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 17 Jan 2009 03:16:29 +0000 (UTC)
Subject: rpms/python-libasyncns/devel .cvsignore, NONE, 1.1 Makefile, NONE, 
	1.1 sources, NONE, 1.1
Message-ID: <20090117031629.E9D1C7012B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/python-libasyncns/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsw17674/rpms/python-libasyncns/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module python-libasyncns


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: python-libasyncns
# $Id: Makefile,v 1.1 2009/01/17 03:16:29 kevin Exp $
NAME := python-libasyncns
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Sat Jan 17 03:17:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 17 Jan 2009 03:17:14 +0000
Subject: [pkgdb] gtksourceviewmm was added for denis
Message-ID: <20090117031714.22A15208457@bastion.fedora.phx.redhat.com>

kevin has added Package gtksourceviewmm with summary C++ wrapper for the gtksourceview widget library
kevin has approved Package gtksourceviewmm
kevin has added a Fedora devel branch for gtksourceviewmm with an owner of denis
kevin has approved gtksourceviewmm in Fedora devel
kevin has approved Package gtksourceviewmm
kevin has set commit to Approved for provenpackager on gtksourceviewmm (Fedora devel)
kevin has set build to Approved for provenpackager on gtksourceviewmm (Fedora devel)
kevin has set checkout to Approved for provenpackager on gtksourceviewmm (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gtksourceviewmm



From kevin at fedoraproject.org  Sat Jan 17 03:17:34 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 17 Jan 2009 03:17:34 +0000 (UTC)
Subject: rpms/gtksourceviewmm - New directory
Message-ID: <20090117031734.2D78B7012B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/gtksourceviewmm
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsd17901/rpms/gtksourceviewmm

Log Message:
Directory /cvs/pkgs/rpms/gtksourceviewmm added to the repository




From kevin at fedoraproject.org  Sat Jan 17 03:17:34 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 17 Jan 2009 03:17:34 +0000 (UTC)
Subject: rpms/gtksourceviewmm/devel - New directory
Message-ID: <20090117031734.75FCB7012B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/gtksourceviewmm/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsd17901/rpms/gtksourceviewmm/devel

Log Message:
Directory /cvs/pkgs/rpms/gtksourceviewmm/devel added to the repository




From kevin at fedoraproject.org  Sat Jan 17 03:17:53 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 17 Jan 2009 03:17:53 +0000 (UTC)
Subject: rpms/gtksourceviewmm Makefile,NONE,1.1
Message-ID: <20090117031753.E0CA77012B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/gtksourceviewmm
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsd17901/rpms/gtksourceviewmm

Added Files:
	Makefile 
Log Message:
Setup of module gtksourceviewmm


--- NEW FILE Makefile ---
# Top level Makefile for module gtksourceviewmm
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Sat Jan 17 03:17:54 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 17 Jan 2009 03:17:54 +0000 (UTC)
Subject: rpms/gtksourceviewmm/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090117031754.4C3C27012B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/gtksourceviewmm/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsd17901/rpms/gtksourceviewmm/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module gtksourceviewmm


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: gtksourceviewmm
# $Id: Makefile,v 1.1 2009/01/17 03:17:54 kevin Exp $
NAME := gtksourceviewmm
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Sat Jan 17 03:18:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 17 Jan 2009 03:18:22 +0000
Subject: [pkgdb] rubygem-tlsmail was added for mcpierce
Message-ID: <20090117031822.5A135208467@bastion.fedora.phx.redhat.com>

kevin has added Package rubygem-tlsmail with summary This library enables pop or smtp via ssl/tls
kevin has approved Package rubygem-tlsmail
kevin has added a Fedora devel branch for rubygem-tlsmail with an owner of mcpierce
kevin has approved rubygem-tlsmail in Fedora devel
kevin has approved Package rubygem-tlsmail
kevin has set commit to Approved for provenpackager on rubygem-tlsmail (Fedora devel)
kevin has set build to Approved for provenpackager on rubygem-tlsmail (Fedora devel)
kevin has set checkout to Approved for provenpackager on rubygem-tlsmail (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rubygem-tlsmail



From pkgdb at fedoraproject.org  Sat Jan 17 03:18:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 17 Jan 2009 03:18:24 +0000
Subject: [pkgdb] rubygem-tlsmail (Fedora, 9) updated by kevin
Message-ID: <20090117031824.9F591208470@bastion.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for rubygem-tlsmail
kevin has set commit to Approved for provenpackager on rubygem-tlsmail (Fedora 9)
kevin has set build to Approved for provenpackager on rubygem-tlsmail (Fedora 9)
kevin has set checkout to Approved for provenpackager on rubygem-tlsmail (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rubygem-tlsmail



From pkgdb at fedoraproject.org  Sat Jan 17 03:18:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 17 Jan 2009 03:18:24 +0000
Subject: [pkgdb] rubygem-tlsmail (Fedora, 10) updated by kevin
Message-ID: <20090117031824.A9BA4208473@bastion.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for rubygem-tlsmail
kevin has set commit to Approved for provenpackager on rubygem-tlsmail (Fedora 10)
kevin has set build to Approved for provenpackager on rubygem-tlsmail (Fedora 10)
kevin has set checkout to Approved for provenpackager on rubygem-tlsmail (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rubygem-tlsmail



From kevin at fedoraproject.org  Sat Jan 17 03:18:38 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 17 Jan 2009 03:18:38 +0000 (UTC)
Subject: rpms/rubygem-tlsmail - New directory
Message-ID: <20090117031838.2CF207012B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/rubygem-tlsmail
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvst18026/rpms/rubygem-tlsmail

Log Message:
Directory /cvs/pkgs/rpms/rubygem-tlsmail added to the repository




From kevin at fedoraproject.org  Sat Jan 17 03:18:38 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 17 Jan 2009 03:18:38 +0000 (UTC)
Subject: rpms/rubygem-tlsmail/devel - New directory
Message-ID: <20090117031838.79F4E7012B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/rubygem-tlsmail/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvst18026/rpms/rubygem-tlsmail/devel

Log Message:
Directory /cvs/pkgs/rpms/rubygem-tlsmail/devel added to the repository




From kevin at fedoraproject.org  Sat Jan 17 03:18:55 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 17 Jan 2009 03:18:55 +0000 (UTC)
Subject: rpms/rubygem-tlsmail Makefile,NONE,1.1
Message-ID: <20090117031855.DBB227012B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/rubygem-tlsmail
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvst18026/rpms/rubygem-tlsmail

Added Files:
	Makefile 
Log Message:
Setup of module rubygem-tlsmail


--- NEW FILE Makefile ---
# Top level Makefile for module rubygem-tlsmail
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Sat Jan 17 03:18:56 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 17 Jan 2009 03:18:56 +0000 (UTC)
Subject: rpms/rubygem-tlsmail/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090117031856.41B817012B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/rubygem-tlsmail/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvst18026/rpms/rubygem-tlsmail/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module rubygem-tlsmail


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: rubygem-tlsmail
# $Id: Makefile,v 1.1 2009/01/17 03:18:56 kevin Exp $
NAME := rubygem-tlsmail
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Sat Jan 17 03:19:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 17 Jan 2009 03:19:41 +0000
Subject: [pkgdb] mingw32-SDL was added for rjones
Message-ID: <20090117031941.B16FF208457@bastion.fedora.phx.redhat.com>

kevin has added Package mingw32-SDL with summary MinGW Windows port of SDL cross-platform multimedia library
kevin has approved Package mingw32-SDL
kevin has added a Fedora devel branch for mingw32-SDL with an owner of rjones
kevin has approved mingw32-SDL in Fedora devel
kevin has approved Package mingw32-SDL
kevin has set commit to Approved for provenpackager on mingw32-SDL (Fedora devel)
kevin has set build to Approved for provenpackager on mingw32-SDL (Fedora devel)
kevin has set checkout to Approved for provenpackager on mingw32-SDL (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-SDL



From pkgdb at fedoraproject.org  Sat Jan 17 03:19:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 17 Jan 2009 03:19:43 +0000
Subject: [pkgdb] mingw32-SDL (Fedora EPEL, 5) updated by kevin
Message-ID: <20090117031943.EC4D6208470@bastion.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for mingw32-SDL
kevin has set commit to Approved for provenpackager on mingw32-SDL (Fedora EPEL 5)
kevin has set build to Approved for provenpackager on mingw32-SDL (Fedora EPEL 5)
kevin has set checkout to Approved for provenpackager on mingw32-SDL (Fedora EPEL 5)
kevin approved watchbugzilla on mingw32-SDL (Fedora EPEL 5) for berrange
kevin approved watchcommits on mingw32-SDL (Fedora EPEL 5) for berrange
kevin approved commit on mingw32-SDL (Fedora EPEL 5) for berrange
kevin approved build on mingw32-SDL (Fedora EPEL 5) for berrange
kevin approved approveacls on mingw32-SDL (Fedora EPEL 5) for berrange
kevin approved watchbugzilla on mingw32-SDL (Fedora EPEL 5) for lfarkas
kevin approved watchcommits on mingw32-SDL (Fedora EPEL 5) for lfarkas
kevin approved commit on mingw32-SDL (Fedora EPEL 5) for lfarkas
kevin approved build on mingw32-SDL (Fedora EPEL 5) for lfarkas
kevin approved approveacls on mingw32-SDL (Fedora EPEL 5) for lfarkas

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-SDL



From pkgdb at fedoraproject.org  Sat Jan 17 03:19:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 17 Jan 2009 03:19:43 +0000
Subject: [pkgdb] mingw32-SDL (Fedora, 10) updated by kevin
Message-ID: <20090117031944.073FF208474@bastion.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for mingw32-SDL
kevin has set commit to Approved for provenpackager on mingw32-SDL (Fedora 10)
kevin has set build to Approved for provenpackager on mingw32-SDL (Fedora 10)
kevin has set checkout to Approved for provenpackager on mingw32-SDL (Fedora 10)
kevin approved watchbugzilla on mingw32-SDL (Fedora 10) for berrange
kevin approved watchcommits on mingw32-SDL (Fedora 10) for berrange
kevin approved commit on mingw32-SDL (Fedora 10) for berrange
kevin approved build on mingw32-SDL (Fedora 10) for berrange
kevin approved approveacls on mingw32-SDL (Fedora 10) for berrange
kevin approved watchbugzilla on mingw32-SDL (Fedora 10) for lfarkas
kevin approved watchcommits on mingw32-SDL (Fedora 10) for lfarkas
kevin approved commit on mingw32-SDL (Fedora 10) for lfarkas
kevin approved build on mingw32-SDL (Fedora 10) for lfarkas
kevin approved approveacls on mingw32-SDL (Fedora 10) for lfarkas

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-SDL



From kevin at fedoraproject.org  Sat Jan 17 03:19:55 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 17 Jan 2009 03:19:55 +0000 (UTC)
Subject: rpms/mingw32-SDL - New directory
Message-ID: <20090117031955.25E9E7012B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/mingw32-SDL
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsT18253/rpms/mingw32-SDL

Log Message:
Directory /cvs/pkgs/rpms/mingw32-SDL added to the repository




From kevin at fedoraproject.org  Sat Jan 17 03:19:55 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 17 Jan 2009 03:19:55 +0000 (UTC)
Subject: rpms/mingw32-SDL/devel - New directory
Message-ID: <20090117031955.67AEF70144@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/mingw32-SDL/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsT18253/rpms/mingw32-SDL/devel

Log Message:
Directory /cvs/pkgs/rpms/mingw32-SDL/devel added to the repository




From kevin at fedoraproject.org  Sat Jan 17 03:20:10 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 17 Jan 2009 03:20:10 +0000 (UTC)
Subject: rpms/mingw32-SDL Makefile,NONE,1.1
Message-ID: <20090117032010.419557012B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/mingw32-SDL
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsT18253/rpms/mingw32-SDL

Added Files:
	Makefile 
Log Message:
Setup of module mingw32-SDL


--- NEW FILE Makefile ---
# Top level Makefile for module mingw32-SDL
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Sat Jan 17 03:20:10 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 17 Jan 2009 03:20:10 +0000 (UTC)
Subject: rpms/mingw32-SDL/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090117032010.8A1C77012B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/mingw32-SDL/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsT18253/rpms/mingw32-SDL/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module mingw32-SDL


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: mingw32-SDL
# $Id: Makefile,v 1.1 2009/01/17 03:20:10 kevin Exp $
NAME := mingw32-SDL
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Sat Jan 17 03:19:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 17 Jan 2009 03:19:43 +0000
Subject: [pkgdb] mingw32-SDL (Fedora, devel) updated by kevin
Message-ID: <20090117031945.72D4B20847A@bastion.fedora.phx.redhat.com>

kevin approved watchbugzilla on mingw32-SDL (Fedora devel) for berrange
kevin approved watchcommits on mingw32-SDL (Fedora devel) for berrange
kevin approved commit on mingw32-SDL (Fedora devel) for berrange
kevin approved build on mingw32-SDL (Fedora devel) for berrange
kevin approved approveacls on mingw32-SDL (Fedora devel) for berrange
kevin approved watchbugzilla on mingw32-SDL (Fedora devel) for lfarkas
kevin approved watchcommits on mingw32-SDL (Fedora devel) for lfarkas
kevin approved commit on mingw32-SDL (Fedora devel) for lfarkas
kevin approved build on mingw32-SDL (Fedora devel) for lfarkas
kevin approved approveacls on mingw32-SDL (Fedora devel) for lfarkas

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-SDL



From pkgdb at fedoraproject.org  Sat Jan 17 03:21:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 17 Jan 2009 03:21:59 +0000
Subject: [pkgdb] mingw32-dlfcn was added for rjones
Message-ID: <20090117032159.2705F208467@bastion.fedora.phx.redhat.com>

kevin has added Package mingw32-dlfcn with summary Implements a wrapper for dlfcn (dlopen dlclose dlsym dlerror)
kevin has approved Package mingw32-dlfcn
kevin has added a Fedora devel branch for mingw32-dlfcn with an owner of rjones
kevin has approved mingw32-dlfcn in Fedora devel
kevin has approved Package mingw32-dlfcn
kevin has set commit to Approved for provenpackager on mingw32-dlfcn (Fedora devel)
kevin has set build to Approved for provenpackager on mingw32-dlfcn (Fedora devel)
kevin has set checkout to Approved for provenpackager on mingw32-dlfcn (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-dlfcn



From pkgdb at fedoraproject.org  Sat Jan 17 03:22:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 17 Jan 2009 03:22:06 +0000
Subject: [pkgdb] mingw32-dlfcn (Fedora EPEL, 5) updated by kevin
Message-ID: <20090117032206.8489D208470@bastion.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for mingw32-dlfcn
kevin has set commit to Approved for provenpackager on mingw32-dlfcn (Fedora EPEL 5)
kevin has set build to Approved for provenpackager on mingw32-dlfcn (Fedora EPEL 5)
kevin has set checkout to Approved for provenpackager on mingw32-dlfcn (Fedora EPEL 5)
kevin approved watchbugzilla on mingw32-dlfcn (Fedora EPEL 5) for berrange
kevin approved watchcommits on mingw32-dlfcn (Fedora EPEL 5) for berrange
kevin approved commit on mingw32-dlfcn (Fedora EPEL 5) for berrange
kevin approved build on mingw32-dlfcn (Fedora EPEL 5) for berrange
kevin approved approveacls on mingw32-dlfcn (Fedora EPEL 5) for berrange
kevin approved watchbugzilla on mingw32-dlfcn (Fedora EPEL 5) for lfarkas
kevin approved watchcommits on mingw32-dlfcn (Fedora EPEL 5) for lfarkas
kevin approved commit on mingw32-dlfcn (Fedora EPEL 5) for lfarkas
kevin approved build on mingw32-dlfcn (Fedora EPEL 5) for lfarkas
kevin approved approveacls on mingw32-dlfcn (Fedora EPEL 5) for lfarkas

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-dlfcn



From pkgdb at fedoraproject.org  Sat Jan 17 03:22:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 17 Jan 2009 03:22:06 +0000
Subject: [pkgdb] mingw32-dlfcn (Fedora, 10) updated by kevin
Message-ID: <20090117032206.94BFF208475@bastion.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for mingw32-dlfcn
kevin has set commit to Approved for provenpackager on mingw32-dlfcn (Fedora 10)
kevin has set build to Approved for provenpackager on mingw32-dlfcn (Fedora 10)
kevin has set checkout to Approved for provenpackager on mingw32-dlfcn (Fedora 10)
kevin approved watchbugzilla on mingw32-dlfcn (Fedora 10) for berrange
kevin approved watchcommits on mingw32-dlfcn (Fedora 10) for berrange
kevin approved commit on mingw32-dlfcn (Fedora 10) for berrange
kevin approved build on mingw32-dlfcn (Fedora 10) for berrange
kevin approved approveacls on mingw32-dlfcn (Fedora 10) for berrange
kevin approved watchbugzilla on mingw32-dlfcn (Fedora 10) for lfarkas
kevin approved watchcommits on mingw32-dlfcn (Fedora 10) for lfarkas
kevin approved commit on mingw32-dlfcn (Fedora 10) for lfarkas
kevin approved build on mingw32-dlfcn (Fedora 10) for lfarkas
kevin approved approveacls on mingw32-dlfcn (Fedora 10) for lfarkas

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-dlfcn



From pkgdb at fedoraproject.org  Sat Jan 17 03:22:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 17 Jan 2009 03:22:06 +0000
Subject: [pkgdb] mingw32-dlfcn (Fedora, devel) updated by kevin
Message-ID: <20090117032206.A416920847A@bastion.fedora.phx.redhat.com>

kevin approved watchbugzilla on mingw32-dlfcn (Fedora devel) for berrange
kevin approved watchcommits on mingw32-dlfcn (Fedora devel) for berrange
kevin approved commit on mingw32-dlfcn (Fedora devel) for berrange
kevin approved build on mingw32-dlfcn (Fedora devel) for berrange
kevin approved approveacls on mingw32-dlfcn (Fedora devel) for berrange
kevin approved watchbugzilla on mingw32-dlfcn (Fedora devel) for lfarkas
kevin approved watchcommits on mingw32-dlfcn (Fedora devel) for lfarkas
kevin approved commit on mingw32-dlfcn (Fedora devel) for lfarkas
kevin approved build on mingw32-dlfcn (Fedora devel) for lfarkas
kevin approved approveacls on mingw32-dlfcn (Fedora devel) for lfarkas

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-dlfcn



From kevin at fedoraproject.org  Sat Jan 17 03:22:18 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 17 Jan 2009 03:22:18 +0000 (UTC)
Subject: rpms/mingw32-dlfcn - New directory
Message-ID: <20090117032218.2B7E47012B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/mingw32-dlfcn
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvso18556/rpms/mingw32-dlfcn

Log Message:
Directory /cvs/pkgs/rpms/mingw32-dlfcn added to the repository




From kevin at fedoraproject.org  Sat Jan 17 03:22:18 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 17 Jan 2009 03:22:18 +0000 (UTC)
Subject: rpms/mingw32-dlfcn/devel - New directory
Message-ID: <20090117032218.70B107012B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/mingw32-dlfcn/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvso18556/rpms/mingw32-dlfcn/devel

Log Message:
Directory /cvs/pkgs/rpms/mingw32-dlfcn/devel added to the repository




From kevin at fedoraproject.org  Sat Jan 17 03:22:33 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 17 Jan 2009 03:22:33 +0000 (UTC)
Subject: rpms/mingw32-dlfcn Makefile,NONE,1.1
Message-ID: <20090117032233.5563B7012B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/mingw32-dlfcn
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvso18556/rpms/mingw32-dlfcn

Added Files:
	Makefile 
Log Message:
Setup of module mingw32-dlfcn


--- NEW FILE Makefile ---
# Top level Makefile for module mingw32-dlfcn
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Sat Jan 17 03:22:33 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 17 Jan 2009 03:22:33 +0000 (UTC)
Subject: rpms/mingw32-dlfcn/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090117032233.AC5807012B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/mingw32-dlfcn/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvso18556/rpms/mingw32-dlfcn/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module mingw32-dlfcn


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: mingw32-dlfcn
# $Id: Makefile,v 1.1 2009/01/17 03:22:33 kevin Exp $
NAME := mingw32-dlfcn
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Sat Jan 17 03:22:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 17 Jan 2009 03:22:52 +0000
Subject: [pkgdb] mythes-fr was added for caolanm
Message-ID: <20090117032253.6AC75208469@bastion.fedora.phx.redhat.com>

kevin has added Package mythes-fr with summary French Thesaurus
kevin has approved Package mythes-fr
kevin has added a Fedora devel branch for mythes-fr with an owner of caolanm
kevin has approved mythes-fr in Fedora devel
kevin has approved Package mythes-fr
kevin has set commit to Approved for provenpackager on mythes-fr (Fedora devel)
kevin has set build to Approved for provenpackager on mythes-fr (Fedora devel)
kevin has set checkout to Approved for provenpackager on mythes-fr (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mythes-fr



From kevin at fedoraproject.org  Sat Jan 17 03:23:11 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 17 Jan 2009 03:23:11 +0000 (UTC)
Subject: rpms/mythes-fr/devel - New directory
Message-ID: <20090117032311.5E7937012B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/mythes-fr/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsI18730/rpms/mythes-fr/devel

Log Message:
Directory /cvs/pkgs/rpms/mythes-fr/devel added to the repository




From kevin at fedoraproject.org  Sat Jan 17 03:23:11 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 17 Jan 2009 03:23:11 +0000 (UTC)
Subject: rpms/mythes-fr - New directory
Message-ID: <20090117032311.2563B7012B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/mythes-fr
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsI18730/rpms/mythes-fr

Log Message:
Directory /cvs/pkgs/rpms/mythes-fr added to the repository




From kevin at fedoraproject.org  Sat Jan 17 03:23:27 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 17 Jan 2009 03:23:27 +0000 (UTC)
Subject: rpms/mythes-fr Makefile,NONE,1.1
Message-ID: <20090117032327.0FA0C7012B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/mythes-fr
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsI18730/rpms/mythes-fr

Added Files:
	Makefile 
Log Message:
Setup of module mythes-fr


--- NEW FILE Makefile ---
# Top level Makefile for module mythes-fr
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Sat Jan 17 03:23:27 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 17 Jan 2009 03:23:27 +0000 (UTC)
Subject: rpms/mythes-fr/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090117032327.7650B7012B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/mythes-fr/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsI18730/rpms/mythes-fr/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module mythes-fr


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: mythes-fr
# $Id: Makefile,v 1.1 2009/01/17 03:23:27 kevin Exp $
NAME := mythes-fr
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Sat Jan 17 03:23:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 17 Jan 2009 03:23:30 +0000
Subject: [pkgdb] mythes-el was added for caolanm
Message-ID: <20090117032333.D41AC208467@bastion.fedora.phx.redhat.com>

kevin has added Package mythes-el with summary Greek Thesaurus
kevin has approved Package mythes-el
kevin has added a Fedora devel branch for mythes-el with an owner of caolanm
kevin has approved mythes-el in Fedora devel
kevin has approved Package mythes-el
kevin has set commit to Approved for provenpackager on mythes-el (Fedora devel)
kevin has set build to Approved for provenpackager on mythes-el (Fedora devel)
kevin has set checkout to Approved for provenpackager on mythes-el (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mythes-el



From kevin at fedoraproject.org  Sat Jan 17 03:24:54 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 17 Jan 2009 03:24:54 +0000 (UTC)
Subject: rpms/mythes-el - New directory
Message-ID: <20090117032454.28F0D7012B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/mythes-el
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsa18851/rpms/mythes-el

Log Message:
Directory /cvs/pkgs/rpms/mythes-el added to the repository




From kevin at fedoraproject.org  Sat Jan 17 03:24:54 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 17 Jan 2009 03:24:54 +0000 (UTC)
Subject: rpms/mythes-el/devel - New directory
Message-ID: <20090117032454.639877012B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/mythes-el/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsa18851/rpms/mythes-el/devel

Log Message:
Directory /cvs/pkgs/rpms/mythes-el/devel added to the repository




From kevin at fedoraproject.org  Sat Jan 17 03:25:11 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 17 Jan 2009 03:25:11 +0000 (UTC)
Subject: rpms/mythes-el Makefile,NONE,1.1
Message-ID: <20090117032511.0620A7012B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/mythes-el
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsa18851/rpms/mythes-el

Added Files:
	Makefile 
Log Message:
Setup of module mythes-el


--- NEW FILE Makefile ---
# Top level Makefile for module mythes-el
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Sat Jan 17 03:25:11 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 17 Jan 2009 03:25:11 +0000 (UTC)
Subject: rpms/mythes-el/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090117032511.4DD357012B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/mythes-el/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsa18851/rpms/mythes-el/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module mythes-el


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: mythes-el
# $Id: Makefile,v 1.1 2009/01/17 03:25:11 kevin Exp $
NAME := mythes-el
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Sat Jan 17 03:25:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 17 Jan 2009 03:25:46 +0000
Subject: [pkgdb] mingw32-pdcurses was added for rjones
Message-ID: <20090117032546.62DA9208457@bastion.fedora.phx.redhat.com>

kevin has added Package mingw32-pdcurses with summary Curses library for MinGW
kevin has approved Package mingw32-pdcurses
kevin has added a Fedora devel branch for mingw32-pdcurses with an owner of rjones
kevin has approved mingw32-pdcurses in Fedora devel
kevin has approved Package mingw32-pdcurses
kevin has set commit to Approved for provenpackager on mingw32-pdcurses (Fedora devel)
kevin has set build to Approved for provenpackager on mingw32-pdcurses (Fedora devel)
kevin has set checkout to Approved for provenpackager on mingw32-pdcurses (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-pdcurses



From pkgdb at fedoraproject.org  Sat Jan 17 03:25:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 17 Jan 2009 03:25:53 +0000
Subject: [pkgdb] mingw32-pdcurses (Fedora EPEL, 5) updated by kevin
Message-ID: <20090117032553.5FE3A208470@bastion.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for mingw32-pdcurses
kevin has set commit to Approved for provenpackager on mingw32-pdcurses (Fedora EPEL 5)
kevin has set build to Approved for provenpackager on mingw32-pdcurses (Fedora EPEL 5)
kevin has set checkout to Approved for provenpackager on mingw32-pdcurses (Fedora EPEL 5)
kevin approved watchbugzilla on mingw32-pdcurses (Fedora EPEL 5) for berrange
kevin approved watchcommits on mingw32-pdcurses (Fedora EPEL 5) for berrange
kevin approved commit on mingw32-pdcurses (Fedora EPEL 5) for berrange
kevin approved build on mingw32-pdcurses (Fedora EPEL 5) for berrange
kevin approved approveacls on mingw32-pdcurses (Fedora EPEL 5) for berrange
kevin approved watchbugzilla on mingw32-pdcurses (Fedora EPEL 5) for lfarkas
kevin approved watchcommits on mingw32-pdcurses (Fedora EPEL 5) for lfarkas
kevin approved commit on mingw32-pdcurses (Fedora EPEL 5) for lfarkas
kevin approved build on mingw32-pdcurses (Fedora EPEL 5) for lfarkas
kevin approved approveacls on mingw32-pdcurses (Fedora EPEL 5) for lfarkas

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-pdcurses



From pkgdb at fedoraproject.org  Sat Jan 17 03:25:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 17 Jan 2009 03:25:53 +0000
Subject: [pkgdb] mingw32-pdcurses (Fedora, 10) updated by kevin
Message-ID: <20090117032553.71058208475@bastion.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for mingw32-pdcurses
kevin has set commit to Approved for provenpackager on mingw32-pdcurses (Fedora 10)
kevin has set build to Approved for provenpackager on mingw32-pdcurses (Fedora 10)
kevin has set checkout to Approved for provenpackager on mingw32-pdcurses (Fedora 10)
kevin approved watchbugzilla on mingw32-pdcurses (Fedora 10) for berrange
kevin approved watchcommits on mingw32-pdcurses (Fedora 10) for berrange
kevin approved commit on mingw32-pdcurses (Fedora 10) for berrange
kevin approved build on mingw32-pdcurses (Fedora 10) for berrange
kevin approved approveacls on mingw32-pdcurses (Fedora 10) for berrange
kevin approved watchbugzilla on mingw32-pdcurses (Fedora 10) for lfarkas
kevin approved watchcommits on mingw32-pdcurses (Fedora 10) for lfarkas
kevin approved commit on mingw32-pdcurses (Fedora 10) for lfarkas
kevin approved build on mingw32-pdcurses (Fedora 10) for lfarkas
kevin approved approveacls on mingw32-pdcurses (Fedora 10) for lfarkas

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-pdcurses



From kevin at fedoraproject.org  Sat Jan 17 03:26:09 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 17 Jan 2009 03:26:09 +0000 (UTC)
Subject: rpms/mingw32-pdcurses - New directory
Message-ID: <20090117032609.2912D7012B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/mingw32-pdcurses
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsP18972/rpms/mingw32-pdcurses

Log Message:
Directory /cvs/pkgs/rpms/mingw32-pdcurses added to the repository




From kevin at fedoraproject.org  Sat Jan 17 03:26:09 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 17 Jan 2009 03:26:09 +0000 (UTC)
Subject: rpms/mingw32-pdcurses/devel - New directory
Message-ID: <20090117032609.67BE270143@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/mingw32-pdcurses/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsP18972/rpms/mingw32-pdcurses/devel

Log Message:
Directory /cvs/pkgs/rpms/mingw32-pdcurses/devel added to the repository




From kevin at fedoraproject.org  Sat Jan 17 03:26:28 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 17 Jan 2009 03:26:28 +0000 (UTC)
Subject: rpms/mingw32-pdcurses Makefile,NONE,1.1
Message-ID: <20090117032628.8A0A67012B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/mingw32-pdcurses
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsP18972/rpms/mingw32-pdcurses

Added Files:
	Makefile 
Log Message:
Setup of module mingw32-pdcurses


--- NEW FILE Makefile ---
# Top level Makefile for module mingw32-pdcurses
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout 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 Jan 17 03:25:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 17 Jan 2009 03:25:53 +0000
Subject: [pkgdb] mingw32-pdcurses (Fedora, devel) updated by kevin
Message-ID: <20090117032553.9552E20847A@bastion.fedora.phx.redhat.com>

kevin approved watchbugzilla on mingw32-pdcurses (Fedora devel) for berrange
kevin approved watchcommits on mingw32-pdcurses (Fedora devel) for berrange
kevin approved commit on mingw32-pdcurses (Fedora devel) for berrange
kevin approved build on mingw32-pdcurses (Fedora devel) for berrange
kevin approved approveacls on mingw32-pdcurses (Fedora devel) for berrange
kevin approved watchbugzilla on mingw32-pdcurses (Fedora devel) for lfarkas
kevin approved watchcommits on mingw32-pdcurses (Fedora devel) for lfarkas
kevin approved commit on mingw32-pdcurses (Fedora devel) for lfarkas
kevin approved build on mingw32-pdcurses (Fedora devel) for lfarkas
kevin approved approveacls on mingw32-pdcurses (Fedora devel) for lfarkas

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-pdcurses



From kevin at fedoraproject.org  Sat Jan 17 03:26:29 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 17 Jan 2009 03:26:29 +0000 (UTC)
Subject: rpms/mingw32-pdcurses/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090117032629.1BC907012B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/mingw32-pdcurses/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsP18972/rpms/mingw32-pdcurses/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module mingw32-pdcurses


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: mingw32-pdcurses
# $Id: Makefile,v 1.1 2009/01/17 03:26:28 kevin Exp $
NAME := mingw32-pdcurses
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Sat Jan 17 03:26:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 17 Jan 2009 03:26:48 +0000
Subject: [pkgdb] mingw32-gdbm was added for rjones
Message-ID: <20090117032648.AE71B208457@bastion.fedora.phx.redhat.com>

kevin has added Package mingw32-gdbm with summary MinGW port of GNU database routines
kevin has approved Package mingw32-gdbm
kevin has added a Fedora devel branch for mingw32-gdbm with an owner of rjones
kevin has approved mingw32-gdbm in Fedora devel
kevin has approved Package mingw32-gdbm
kevin has set commit to Approved for provenpackager on mingw32-gdbm (Fedora devel)
kevin has set build to Approved for provenpackager on mingw32-gdbm (Fedora devel)
kevin has set checkout to Approved for provenpackager on mingw32-gdbm (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-gdbm



From pkgdb at fedoraproject.org  Sat Jan 17 03:26:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 17 Jan 2009 03:26:52 +0000
Subject: [pkgdb] mingw32-gdbm (Fedora EPEL, 5) updated by kevin
Message-ID: <20090117032652.62F0E20846E@bastion.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for mingw32-gdbm
kevin has set commit to Approved for provenpackager on mingw32-gdbm (Fedora EPEL 5)
kevin has set build to Approved for provenpackager on mingw32-gdbm (Fedora EPEL 5)
kevin has set checkout to Approved for provenpackager on mingw32-gdbm (Fedora EPEL 5)
kevin approved watchbugzilla on mingw32-gdbm (Fedora EPEL 5) for berrange
kevin approved watchcommits on mingw32-gdbm (Fedora EPEL 5) for berrange
kevin approved commit on mingw32-gdbm (Fedora EPEL 5) for berrange
kevin approved build on mingw32-gdbm (Fedora EPEL 5) for berrange
kevin approved approveacls on mingw32-gdbm (Fedora EPEL 5) for berrange
kevin approved watchbugzilla on mingw32-gdbm (Fedora EPEL 5) for lfarkas
kevin approved watchcommits on mingw32-gdbm (Fedora EPEL 5) for lfarkas
kevin approved commit on mingw32-gdbm (Fedora EPEL 5) for lfarkas
kevin approved build on mingw32-gdbm (Fedora EPEL 5) for lfarkas
kevin approved approveacls on mingw32-gdbm (Fedora EPEL 5) for lfarkas

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-gdbm



From pkgdb at fedoraproject.org  Sat Jan 17 03:26:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 17 Jan 2009 03:26:52 +0000
Subject: [pkgdb] mingw32-gdbm (Fedora, 10) updated by kevin
Message-ID: <20090117032652.75047208474@bastion.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for mingw32-gdbm
kevin has set commit to Approved for provenpackager on mingw32-gdbm (Fedora 10)
kevin has set build to Approved for provenpackager on mingw32-gdbm (Fedora 10)
kevin has set checkout to Approved for provenpackager on mingw32-gdbm (Fedora 10)
kevin approved watchbugzilla on mingw32-gdbm (Fedora 10) for berrange
kevin approved watchcommits on mingw32-gdbm (Fedora 10) for berrange
kevin approved commit on mingw32-gdbm (Fedora 10) for berrange
kevin approved build on mingw32-gdbm (Fedora 10) for berrange
kevin approved approveacls on mingw32-gdbm (Fedora 10) for berrange
kevin approved watchbugzilla on mingw32-gdbm (Fedora 10) for lfarkas
kevin approved watchcommits on mingw32-gdbm (Fedora 10) for lfarkas
kevin approved commit on mingw32-gdbm (Fedora 10) for lfarkas
kevin approved build on mingw32-gdbm (Fedora 10) for lfarkas
kevin approved approveacls on mingw32-gdbm (Fedora 10) for lfarkas

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-gdbm



From kevin at fedoraproject.org  Sat Jan 17 03:27:07 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 17 Jan 2009 03:27:07 +0000 (UTC)
Subject: rpms/mingw32-gdbm - New directory
Message-ID: <20090117032707.2955E7012B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/mingw32-gdbm
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsm19176/rpms/mingw32-gdbm

Log Message:
Directory /cvs/pkgs/rpms/mingw32-gdbm added to the repository




From kevin at fedoraproject.org  Sat Jan 17 03:27:07 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 17 Jan 2009 03:27:07 +0000 (UTC)
Subject: rpms/mingw32-gdbm/devel - New directory
Message-ID: <20090117032707.6DE167012B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/mingw32-gdbm/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsm19176/rpms/mingw32-gdbm/devel

Log Message:
Directory /cvs/pkgs/rpms/mingw32-gdbm/devel added to the repository




From pkgdb at fedoraproject.org  Sat Jan 17 03:26:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 17 Jan 2009 03:26:52 +0000
Subject: [pkgdb] mingw32-gdbm (Fedora, devel) updated by kevin
Message-ID: <20090117032653.58537208479@bastion.fedora.phx.redhat.com>

kevin approved watchbugzilla on mingw32-gdbm (Fedora devel) for berrange
kevin approved watchcommits on mingw32-gdbm (Fedora devel) for berrange
kevin approved commit on mingw32-gdbm (Fedora devel) for berrange
kevin approved build on mingw32-gdbm (Fedora devel) for berrange
kevin approved approveacls on mingw32-gdbm (Fedora devel) for berrange
kevin approved watchbugzilla on mingw32-gdbm (Fedora devel) for lfarkas
kevin approved watchcommits on mingw32-gdbm (Fedora devel) for lfarkas
kevin approved commit on mingw32-gdbm (Fedora devel) for lfarkas
kevin approved build on mingw32-gdbm (Fedora devel) for lfarkas
kevin approved approveacls on mingw32-gdbm (Fedora devel) for lfarkas

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-gdbm



From kevin at fedoraproject.org  Sat Jan 17 03:27:23 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 17 Jan 2009 03:27:23 +0000 (UTC)
Subject: rpms/mingw32-gdbm Makefile,NONE,1.1
Message-ID: <20090117032723.611827012B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/mingw32-gdbm
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsm19176/rpms/mingw32-gdbm

Added Files:
	Makefile 
Log Message:
Setup of module mingw32-gdbm


--- NEW FILE Makefile ---
# Top level Makefile for module mingw32-gdbm
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Sat Jan 17 03:27:23 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 17 Jan 2009 03:27:23 +0000 (UTC)
Subject: rpms/mingw32-gdbm/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090117032723.B30887012B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/mingw32-gdbm/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsm19176/rpms/mingw32-gdbm/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module mingw32-gdbm


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: mingw32-gdbm
# $Id: Makefile,v 1.1 2009/01/17 03:27:23 kevin Exp $
NAME := mingw32-gdbm
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Sat Jan 17 03:28:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 17 Jan 2009 03:28:03 +0000
Subject: [pkgdb] mingw32-freetype was added for rjones
Message-ID: <20090117032803.E5524208457@bastion.fedora.phx.redhat.com>

kevin has added Package mingw32-freetype with summary Free and portable font rendering engine
kevin has approved Package mingw32-freetype
kevin has added a Fedora devel branch for mingw32-freetype with an owner of rjones
kevin has approved mingw32-freetype in Fedora devel
kevin has approved Package mingw32-freetype
kevin has set commit to Approved for provenpackager on mingw32-freetype (Fedora devel)
kevin has set build to Approved for provenpackager on mingw32-freetype (Fedora devel)
kevin has set checkout to Approved for provenpackager on mingw32-freetype (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-freetype



From pkgdb at fedoraproject.org  Sat Jan 17 03:28:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 17 Jan 2009 03:28:11 +0000
Subject: [pkgdb] mingw32-freetype (Fedora EPEL, 5) updated by kevin
Message-ID: <20090117032811.B27E420846E@bastion.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for mingw32-freetype
kevin has set commit to Approved for provenpackager on mingw32-freetype (Fedora EPEL 5)
kevin has set build to Approved for provenpackager on mingw32-freetype (Fedora EPEL 5)
kevin has set checkout to Approved for provenpackager on mingw32-freetype (Fedora EPEL 5)
kevin approved watchbugzilla on mingw32-freetype (Fedora EPEL 5) for berrange
kevin approved watchcommits on mingw32-freetype (Fedora EPEL 5) for berrange
kevin approved commit on mingw32-freetype (Fedora EPEL 5) for berrange
kevin approved build on mingw32-freetype (Fedora EPEL 5) for berrange
kevin approved approveacls on mingw32-freetype (Fedora EPEL 5) for berrange
kevin approved watchbugzilla on mingw32-freetype (Fedora EPEL 5) for lfarkas
kevin approved watchcommits on mingw32-freetype (Fedora EPEL 5) for lfarkas
kevin approved commit on mingw32-freetype (Fedora EPEL 5) for lfarkas
kevin approved build on mingw32-freetype (Fedora EPEL 5) for lfarkas
kevin approved approveacls on mingw32-freetype (Fedora EPEL 5) for lfarkas

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-freetype



From pkgdb at fedoraproject.org  Sat Jan 17 03:28:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 17 Jan 2009 03:28:11 +0000
Subject: [pkgdb] mingw32-freetype (Fedora, 10) updated by kevin
Message-ID: <20090117032811.D9B42208474@bastion.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for mingw32-freetype
kevin has set commit to Approved for provenpackager on mingw32-freetype (Fedora 10)
kevin has set build to Approved for provenpackager on mingw32-freetype (Fedora 10)
kevin has set checkout to Approved for provenpackager on mingw32-freetype (Fedora 10)
kevin approved watchbugzilla on mingw32-freetype (Fedora 10) for berrange
kevin approved watchcommits on mingw32-freetype (Fedora 10) for berrange
kevin approved commit on mingw32-freetype (Fedora 10) for berrange
kevin approved build on mingw32-freetype (Fedora 10) for berrange
kevin approved approveacls on mingw32-freetype (Fedora 10) for berrange
kevin approved watchbugzilla on mingw32-freetype (Fedora 10) for lfarkas
kevin approved watchcommits on mingw32-freetype (Fedora 10) for lfarkas
kevin approved commit on mingw32-freetype (Fedora 10) for lfarkas
kevin approved build on mingw32-freetype (Fedora 10) for lfarkas
kevin approved approveacls on mingw32-freetype (Fedora 10) for lfarkas

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-freetype



From pkgdb at fedoraproject.org  Sat Jan 17 03:28:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 17 Jan 2009 03:28:11 +0000
Subject: [pkgdb] mingw32-freetype (Fedora, devel) updated by kevin
Message-ID: <20090117032811.EB739208479@bastion.fedora.phx.redhat.com>

kevin approved watchbugzilla on mingw32-freetype (Fedora devel) for berrange
kevin approved watchcommits on mingw32-freetype (Fedora devel) for berrange
kevin approved commit on mingw32-freetype (Fedora devel) for berrange
kevin approved build on mingw32-freetype (Fedora devel) for berrange
kevin approved approveacls on mingw32-freetype (Fedora devel) for berrange
kevin approved watchbugzilla on mingw32-freetype (Fedora devel) for lfarkas
kevin approved watchcommits on mingw32-freetype (Fedora devel) for lfarkas
kevin approved commit on mingw32-freetype (Fedora devel) for lfarkas
kevin approved build on mingw32-freetype (Fedora devel) for lfarkas
kevin approved approveacls on mingw32-freetype (Fedora devel) for lfarkas

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-freetype



From kevin at fedoraproject.org  Sat Jan 17 03:28:32 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 17 Jan 2009 03:28:32 +0000 (UTC)
Subject: rpms/mingw32-freetype - New directory
Message-ID: <20090117032832.348657012B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/mingw32-freetype
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsx19404/rpms/mingw32-freetype

Log Message:
Directory /cvs/pkgs/rpms/mingw32-freetype added to the repository




From kevin at fedoraproject.org  Sat Jan 17 03:28:32 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 17 Jan 2009 03:28:32 +0000 (UTC)
Subject: rpms/mingw32-freetype/devel - New directory
Message-ID: <20090117032832.7C2827012B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/mingw32-freetype/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsx19404/rpms/mingw32-freetype/devel

Log Message:
Directory /cvs/pkgs/rpms/mingw32-freetype/devel added to the repository




From kevin at fedoraproject.org  Sat Jan 17 03:28:53 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 17 Jan 2009 03:28:53 +0000 (UTC)
Subject: rpms/mingw32-freetype Makefile,NONE,1.1
Message-ID: <20090117032853.5DCA17012B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/mingw32-freetype
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsx19404/rpms/mingw32-freetype

Added Files:
	Makefile 
Log Message:
Setup of module mingw32-freetype


--- NEW FILE Makefile ---
# Top level Makefile for module mingw32-freetype
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Sat Jan 17 03:28:53 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 17 Jan 2009 03:28:53 +0000 (UTC)
Subject: rpms/mingw32-freetype/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090117032853.B3D0E7012B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/mingw32-freetype/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsx19404/rpms/mingw32-freetype/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module mingw32-freetype


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: mingw32-freetype
# $Id: Makefile,v 1.1 2009/01/17 03:28:53 kevin Exp $
NAME := mingw32-freetype
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Sat Jan 17 03:29:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 17 Jan 2009 03:29:11 +0000
Subject: [pkgdb] mingw32-gettext was added for rjones
Message-ID: <20090117032911.3D313208467@bastion.fedora.phx.redhat.com>

kevin has added Package mingw32-gettext with summary GNU libraries and utilities for producing multi-lingual messages
kevin has approved Package mingw32-gettext
kevin has added a Fedora devel branch for mingw32-gettext with an owner of rjones
kevin has approved mingw32-gettext in Fedora devel
kevin has approved Package mingw32-gettext
kevin has set commit to Approved for provenpackager on mingw32-gettext (Fedora devel)
kevin has set build to Approved for provenpackager on mingw32-gettext (Fedora devel)
kevin has set checkout to Approved for provenpackager on mingw32-gettext (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-gettext



From pkgdb at fedoraproject.org  Sat Jan 17 03:29:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 17 Jan 2009 03:29:18 +0000
Subject: [pkgdb] mingw32-gettext (Fedora EPEL, 5) updated by kevin
Message-ID: <20090117032919.053B720846E@bastion.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for mingw32-gettext
kevin has set commit to Approved for provenpackager on mingw32-gettext (Fedora EPEL 5)
kevin has set build to Approved for provenpackager on mingw32-gettext (Fedora EPEL 5)
kevin has set checkout to Approved for provenpackager on mingw32-gettext (Fedora EPEL 5)
kevin approved watchbugzilla on mingw32-gettext (Fedora EPEL 5) for berrange
kevin approved watchcommits on mingw32-gettext (Fedora EPEL 5) for berrange
kevin approved commit on mingw32-gettext (Fedora EPEL 5) for berrange
kevin approved build on mingw32-gettext (Fedora EPEL 5) for berrange
kevin approved approveacls on mingw32-gettext (Fedora EPEL 5) for berrange
kevin approved watchbugzilla on mingw32-gettext (Fedora EPEL 5) for lfarkas
kevin approved watchcommits on mingw32-gettext (Fedora EPEL 5) for lfarkas
kevin approved commit on mingw32-gettext (Fedora EPEL 5) for lfarkas
kevin approved build on mingw32-gettext (Fedora EPEL 5) for lfarkas
kevin approved approveacls on mingw32-gettext (Fedora EPEL 5) for lfarkas

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-gettext



From pkgdb at fedoraproject.org  Sat Jan 17 03:29:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 17 Jan 2009 03:29:18 +0000
Subject: [pkgdb] mingw32-gettext (Fedora, 10) updated by kevin
Message-ID: <20090117032919.31915208475@bastion.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for mingw32-gettext
kevin has set commit to Approved for provenpackager on mingw32-gettext (Fedora 10)
kevin has set build to Approved for provenpackager on mingw32-gettext (Fedora 10)
kevin has set checkout to Approved for provenpackager on mingw32-gettext (Fedora 10)
kevin approved watchbugzilla on mingw32-gettext (Fedora 10) for berrange
kevin approved watchcommits on mingw32-gettext (Fedora 10) for berrange
kevin approved commit on mingw32-gettext (Fedora 10) for berrange
kevin approved build on mingw32-gettext (Fedora 10) for berrange
kevin approved approveacls on mingw32-gettext (Fedora 10) for berrange
kevin approved watchbugzilla on mingw32-gettext (Fedora 10) for lfarkas
kevin approved watchcommits on mingw32-gettext (Fedora 10) for lfarkas
kevin approved commit on mingw32-gettext (Fedora 10) for lfarkas
kevin approved build on mingw32-gettext (Fedora 10) for lfarkas
kevin approved approveacls on mingw32-gettext (Fedora 10) for lfarkas

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-gettext



From pkgdb at fedoraproject.org  Sat Jan 17 03:29:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 17 Jan 2009 03:29:18 +0000
Subject: [pkgdb] mingw32-gettext (Fedora, devel) updated by kevin
Message-ID: <20090117032919.40DCC208479@bastion.fedora.phx.redhat.com>

kevin approved watchbugzilla on mingw32-gettext (Fedora devel) for berrange
kevin approved watchcommits on mingw32-gettext (Fedora devel) for berrange
kevin approved commit on mingw32-gettext (Fedora devel) for berrange
kevin approved build on mingw32-gettext (Fedora devel) for berrange
kevin approved approveacls on mingw32-gettext (Fedora devel) for berrange
kevin approved watchbugzilla on mingw32-gettext (Fedora devel) for lfarkas
kevin approved watchcommits on mingw32-gettext (Fedora devel) for lfarkas
kevin approved commit on mingw32-gettext (Fedora devel) for lfarkas
kevin approved build on mingw32-gettext (Fedora devel) for lfarkas
kevin approved approveacls on mingw32-gettext (Fedora devel) for lfarkas

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-gettext



From kevin at fedoraproject.org  Sat Jan 17 03:29:39 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 17 Jan 2009 03:29:39 +0000 (UTC)
Subject: rpms/mingw32-gettext - New directory
Message-ID: <20090117032939.2E5AB7012B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/mingw32-gettext
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsV19608/rpms/mingw32-gettext

Log Message:
Directory /cvs/pkgs/rpms/mingw32-gettext added to the repository




From kevin at fedoraproject.org  Sat Jan 17 03:29:39 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 17 Jan 2009 03:29:39 +0000 (UTC)
Subject: rpms/mingw32-gettext/devel - New directory
Message-ID: <20090117032939.7D8E17012B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/mingw32-gettext/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsV19608/rpms/mingw32-gettext/devel

Log Message:
Directory /cvs/pkgs/rpms/mingw32-gettext/devel added to the repository




From kevin at fedoraproject.org  Sat Jan 17 03:29:58 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 17 Jan 2009 03:29:58 +0000 (UTC)
Subject: rpms/mingw32-gettext Makefile,NONE,1.1
Message-ID: <20090117032958.872BD7012B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/mingw32-gettext
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsV19608/rpms/mingw32-gettext

Added Files:
	Makefile 
Log Message:
Setup of module mingw32-gettext


--- NEW FILE Makefile ---
# Top level Makefile for module mingw32-gettext
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Sat Jan 17 03:29:58 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 17 Jan 2009 03:29:58 +0000 (UTC)
Subject: rpms/mingw32-gettext/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090117032958.EEB6D7012B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/mingw32-gettext/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsV19608/rpms/mingw32-gettext/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module mingw32-gettext


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: mingw32-gettext
# $Id: Makefile,v 1.1 2009/01/17 03:29:58 kevin Exp $
NAME := mingw32-gettext
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Sat Jan 17 03:30:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 17 Jan 2009 03:30:06 +0000
Subject: [pkgdb] mingw32-readline was added for rjones
Message-ID: <20090117033007.58BF1208457@bastion.fedora.phx.redhat.com>

kevin has added Package mingw32-readline with summary MinGW port of readline for editing typed command lines
kevin has approved Package mingw32-readline
kevin has added a Fedora devel branch for mingw32-readline with an owner of rjones
kevin has approved mingw32-readline in Fedora devel
kevin has approved Package mingw32-readline
kevin has set commit to Approved for provenpackager on mingw32-readline (Fedora devel)
kevin has set build to Approved for provenpackager on mingw32-readline (Fedora devel)
kevin has set checkout to Approved for provenpackager on mingw32-readline (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-readline



From pkgdb at fedoraproject.org  Sat Jan 17 03:30:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 17 Jan 2009 03:30:08 +0000
Subject: [pkgdb] mingw32-readline (Fedora, devel) updated by kevin
Message-ID: <20090117033008.D27F2208476@bastion.fedora.phx.redhat.com>

kevin approved watchbugzilla on mingw32-readline (Fedora devel) for berrange
kevin approved watchcommits on mingw32-readline (Fedora devel) for berrange
kevin approved commit on mingw32-readline (Fedora devel) for berrange
kevin approved build on mingw32-readline (Fedora devel) for berrange
kevin approved approveacls on mingw32-readline (Fedora devel) for berrange
kevin approved watchbugzilla on mingw32-readline (Fedora devel) for lfarkas
kevin approved watchcommits on mingw32-readline (Fedora devel) for lfarkas
kevin approved commit on mingw32-readline (Fedora devel) for lfarkas
kevin approved build on mingw32-readline (Fedora devel) for lfarkas
kevin approved approveacls on mingw32-readline (Fedora devel) for lfarkas

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-readline



From pkgdb at fedoraproject.org  Sat Jan 17 03:30:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 17 Jan 2009 03:30:08 +0000
Subject: [pkgdb] mingw32-readline (Fedora EPEL, 5) updated by kevin
Message-ID: <20090117033008.EB3F020847A@bastion.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for mingw32-readline
kevin has set commit to Approved for provenpackager on mingw32-readline (Fedora EPEL 5)
kevin has set build to Approved for provenpackager on mingw32-readline (Fedora EPEL 5)
kevin has set checkout to Approved for provenpackager on mingw32-readline (Fedora EPEL 5)
kevin approved watchbugzilla on mingw32-readline (Fedora EPEL 5) for berrange
kevin approved watchcommits on mingw32-readline (Fedora EPEL 5) for berrange
kevin approved commit on mingw32-readline (Fedora EPEL 5) for berrange
kevin approved build on mingw32-readline (Fedora EPEL 5) for berrange
kevin approved approveacls on mingw32-readline (Fedora EPEL 5) for berrange
kevin approved watchbugzilla on mingw32-readline (Fedora EPEL 5) for lfarkas
kevin approved watchcommits on mingw32-readline (Fedora EPEL 5) for lfarkas
kevin approved commit on mingw32-readline (Fedora EPEL 5) for lfarkas
kevin approved build on mingw32-readline (Fedora EPEL 5) for lfarkas
kevin approved approveacls on mingw32-readline (Fedora EPEL 5) for lfarkas

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-readline



From pkgdb at fedoraproject.org  Sat Jan 17 03:30:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 17 Jan 2009 03:30:08 +0000
Subject: [pkgdb] mingw32-readline (Fedora, 10) updated by kevin
Message-ID: <20090117033009.1E38420847F@bastion.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for mingw32-readline
kevin has set commit to Approved for provenpackager on mingw32-readline (Fedora 10)
kevin has set build to Approved for provenpackager on mingw32-readline (Fedora 10)
kevin has set checkout to Approved for provenpackager on mingw32-readline (Fedora 10)
kevin approved watchbugzilla on mingw32-readline (Fedora 10) for berrange
kevin approved watchcommits on mingw32-readline (Fedora 10) for berrange
kevin approved commit on mingw32-readline (Fedora 10) for berrange
kevin approved build on mingw32-readline (Fedora 10) for berrange
kevin approved approveacls on mingw32-readline (Fedora 10) for berrange
kevin approved watchbugzilla on mingw32-readline (Fedora 10) for lfarkas
kevin approved watchcommits on mingw32-readline (Fedora 10) for lfarkas
kevin approved commit on mingw32-readline (Fedora 10) for lfarkas
kevin approved build on mingw32-readline (Fedora 10) for lfarkas
kevin approved approveacls on mingw32-readline (Fedora 10) for lfarkas

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-readline



From kevin at fedoraproject.org  Sat Jan 17 03:30:24 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 17 Jan 2009 03:30:24 +0000 (UTC)
Subject: rpms/mingw32-readline - New directory
Message-ID: <20090117033024.263497012B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/mingw32-readline
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsM19800/rpms/mingw32-readline

Log Message:
Directory /cvs/pkgs/rpms/mingw32-readline added to the repository




From kevin at fedoraproject.org  Sat Jan 17 03:30:24 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 17 Jan 2009 03:30:24 +0000 (UTC)
Subject: rpms/mingw32-readline/devel - New directory
Message-ID: <20090117033024.632357012B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/mingw32-readline/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsM19800/rpms/mingw32-readline/devel

Log Message:
Directory /cvs/pkgs/rpms/mingw32-readline/devel added to the repository




From kevin at fedoraproject.org  Sat Jan 17 03:30:40 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 17 Jan 2009 03:30:40 +0000 (UTC)
Subject: rpms/mingw32-readline Makefile,NONE,1.1
Message-ID: <20090117033040.8F7047012B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/mingw32-readline
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsM19800/rpms/mingw32-readline

Added Files:
	Makefile 
Log Message:
Setup of module mingw32-readline


--- NEW FILE Makefile ---
# Top level Makefile for module mingw32-readline
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Sat Jan 17 03:30:40 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 17 Jan 2009 03:30:40 +0000 (UTC)
Subject: rpms/mingw32-readline/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090117033040.CCC5B7012B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/mingw32-readline/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsM19800/rpms/mingw32-readline/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module mingw32-readline


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: mingw32-readline
# $Id: Makefile,v 1.1 2009/01/17 03:30:40 kevin Exp $
NAME := mingw32-readline
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Sat Jan 17 03:31:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 17 Jan 2009 03:31:15 +0000
Subject: [pkgdb] TVAnytimeAPI was added for red
Message-ID: <20090117033115.4CB59208469@bastion.fedora.phx.redhat.com>

kevin has added Package TVAnytimeAPI with summary A Java API for parsing, manipulating and creating TV-Anytime metadata
kevin has approved Package TVAnytimeAPI
kevin has added a Fedora devel branch for TVAnytimeAPI with an owner of red
kevin has approved TVAnytimeAPI in Fedora devel
kevin has approved Package TVAnytimeAPI
kevin has set commit to Approved for provenpackager on TVAnytimeAPI (Fedora devel)
kevin has set build to Approved for provenpackager on TVAnytimeAPI (Fedora devel)
kevin has set checkout to Approved for provenpackager on TVAnytimeAPI (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/TVAnytimeAPI



From pkgdb at fedoraproject.org  Sat Jan 17 03:31:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 17 Jan 2009 03:31:16 +0000
Subject: [pkgdb] TVAnytimeAPI (Fedora, 9) updated by kevin
Message-ID: <20090117033116.943B820846E@bastion.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for TVAnytimeAPI
kevin has set commit to Approved for provenpackager on TVAnytimeAPI (Fedora 9)
kevin has set build to Approved for provenpackager on TVAnytimeAPI (Fedora 9)
kevin has set checkout to Approved for provenpackager on TVAnytimeAPI (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/TVAnytimeAPI



From pkgdb at fedoraproject.org  Sat Jan 17 03:31:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 17 Jan 2009 03:31:16 +0000
Subject: [pkgdb] TVAnytimeAPI (Fedora, 10) updated by kevin
Message-ID: <20090117033116.A2DD3208473@bastion.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for TVAnytimeAPI
kevin has set commit to Approved for provenpackager on TVAnytimeAPI (Fedora 10)
kevin has set build to Approved for provenpackager on TVAnytimeAPI (Fedora 10)
kevin has set checkout to Approved for provenpackager on TVAnytimeAPI (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/TVAnytimeAPI



From kevin at fedoraproject.org  Sat Jan 17 03:31:32 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 17 Jan 2009 03:31:32 +0000 (UTC)
Subject: rpms/TVAnytimeAPI - New directory
Message-ID: <20090117033132.266167012B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/TVAnytimeAPI
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvss20017/rpms/TVAnytimeAPI

Log Message:
Directory /cvs/pkgs/rpms/TVAnytimeAPI added to the repository




From kevin at fedoraproject.org  Sat Jan 17 03:31:32 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 17 Jan 2009 03:31:32 +0000 (UTC)
Subject: rpms/TVAnytimeAPI/devel - New directory
Message-ID: <20090117033132.68B297012B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/TVAnytimeAPI/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvss20017/rpms/TVAnytimeAPI/devel

Log Message:
Directory /cvs/pkgs/rpms/TVAnytimeAPI/devel added to the repository




From kevin at fedoraproject.org  Sat Jan 17 03:31:49 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 17 Jan 2009 03:31:49 +0000 (UTC)
Subject: rpms/TVAnytimeAPI/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090117033149.591987012B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/TVAnytimeAPI/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvss20017/rpms/TVAnytimeAPI/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module TVAnytimeAPI


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: TVAnytimeAPI
# $Id: Makefile,v 1.1 2009/01/17 03:31:49 kevin Exp $
NAME := TVAnytimeAPI
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From kevin at fedoraproject.org  Sat Jan 17 03:31:49 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 17 Jan 2009 03:31:49 +0000 (UTC)
Subject: rpms/TVAnytimeAPI Makefile,NONE,1.1
Message-ID: <20090117033149.09D697012B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/TVAnytimeAPI
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvss20017/rpms/TVAnytimeAPI

Added Files:
	Makefile 
Log Message:
Setup of module TVAnytimeAPI


--- NEW FILE Makefile ---
# Top level Makefile for module TVAnytimeAPI
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout 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 Jan 17 03:32:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 17 Jan 2009 03:32:30 +0000
Subject: [pkgdb] xtvd was added for red
Message-ID: <20090117033230.6FFBA208467@bastion.fedora.phx.redhat.com>

kevin has added Package xtvd with summary A client java library for easy access to the tv data from schedulesdirect.org
kevin has approved Package xtvd
kevin has added a Fedora devel branch for xtvd with an owner of red
kevin has approved xtvd in Fedora devel
kevin has approved Package xtvd
kevin has set commit to Approved for provenpackager on xtvd (Fedora devel)
kevin has set build to Approved for provenpackager on xtvd (Fedora devel)
kevin has set checkout to Approved for provenpackager on xtvd (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/xtvd



From pkgdb at fedoraproject.org  Sat Jan 17 03:32:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 17 Jan 2009 03:32:35 +0000
Subject: [pkgdb] xtvd (Fedora, 9) updated by kevin
Message-ID: <20090117033237.12ABC208469@bastion.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for xtvd
kevin has set commit to Approved for provenpackager on xtvd (Fedora 9)
kevin has set build to Approved for provenpackager on xtvd (Fedora 9)
kevin has set checkout to Approved for provenpackager on xtvd (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/xtvd



From pkgdb at fedoraproject.org  Sat Jan 17 03:32:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 17 Jan 2009 03:32:35 +0000
Subject: [pkgdb] xtvd (Fedora, 10) updated by kevin
Message-ID: <20090117033237.4ACE0208473@bastion.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for xtvd
kevin has set commit to Approved for provenpackager on xtvd (Fedora 10)
kevin has set build to Approved for provenpackager on xtvd (Fedora 10)
kevin has set checkout to Approved for provenpackager on xtvd (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/xtvd



From kevin at fedoraproject.org  Sat Jan 17 03:33:02 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 17 Jan 2009 03:33:02 +0000 (UTC)
Subject: rpms/xtvd/devel - New directory
Message-ID: <20090117033302.5A5997012B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/xtvd/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsg20291/rpms/xtvd/devel

Log Message:
Directory /cvs/pkgs/rpms/xtvd/devel added to the repository




From kevin at fedoraproject.org  Sat Jan 17 03:33:02 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 17 Jan 2009 03:33:02 +0000 (UTC)
Subject: rpms/xtvd - New directory
Message-ID: <20090117033302.249157012B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/xtvd
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsg20291/rpms/xtvd

Log Message:
Directory /cvs/pkgs/rpms/xtvd added to the repository




From kevin at fedoraproject.org  Sat Jan 17 03:33:17 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 17 Jan 2009 03:33:17 +0000 (UTC)
Subject: rpms/xtvd Makefile,NONE,1.1
Message-ID: <20090117033317.6E8447012B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/xtvd
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsg20291/rpms/xtvd

Added Files:
	Makefile 
Log Message:
Setup of module xtvd


--- NEW FILE Makefile ---
# Top level Makefile for module xtvd
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Sat Jan 17 03:33:17 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 17 Jan 2009 03:33:17 +0000 (UTC)
Subject: rpms/xtvd/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <20090117033317.AEF377012B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/xtvd/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsg20291/rpms/xtvd/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module xtvd


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: xtvd
# $Id: Makefile,v 1.1 2009/01/17 03:33:17 kevin Exp $
NAME := xtvd
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From rakesh at fedoraproject.org  Sat Jan 17 03:52:40 2009
From: rakesh at fedoraproject.org (Rakesh Pandit)
Date: Sat, 17 Jan 2009 03:52:40 +0000 (UTC)
Subject: rpms/djvulibre/F-10 djvulibre-configure.patch, NONE, 1.1 import.log,
	NONE, 1.1 .cvsignore, 1.11, 1.12 djvulibre.spec, 1.27,
	1.28 sources, 1.11, 1.12
Message-ID: <20090117035240.C74897012B@cvs1.fedora.phx.redhat.com>

Author: rakesh

Update of /cvs/pkgs/rpms/djvulibre/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22638/F-10

Modified Files:
	.cvsignore djvulibre.spec sources 
Added Files:
	djvulibre-configure.patch import.log 
Log Message:
Updated to 3.5.21.


djvulibre-configure.patch:

--- NEW FILE djvulibre-configure.patch ---
--- djvulibre-3.5.21.org/configure	2009-01-16 20:59:06.000000000 +0530
+++ djvulibre-3.5.21/configure	2009-01-16 20:57:27.000000000 +0530
@@ -21691,6 +21691,7 @@
 __sync_lock_test_and_set(&l,1);
   __sync_lock_release(&l);
   __sync_add_and_fetch(&l,1);
+  __sync_bool_compare_and_swap(&l,&l,1);
   return 0;
   ;
   return 0;


--- NEW FILE import.log ---
djvulibre-3_5_21-1_fc10:F-10:djvulibre-3.5.21-1.fc10.src.rpm:1232121108


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/djvulibre/F-10/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	3 Feb 2008 16:02:15 -0000	1.11
+++ .cvsignore	17 Jan 2009 03:52:39 -0000	1.12
@@ -1 +1 @@
-djvulibre-3.5.20-2.tar.gz
+djvulibre-3.5.21.tar.gz


Index: djvulibre.spec
===================================================================
RCS file: /cvs/pkgs/rpms/djvulibre/F-10/djvulibre.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- djvulibre.spec	6 Jun 2008 22:35:51 -0000	1.27
+++ djvulibre.spec	17 Jan 2009 03:52:39 -0000	1.28
@@ -1,13 +1,14 @@
 Summary: DjVu viewers, encoders, and utilities
 Name: djvulibre
-Version: 3.5.20
-Release: 3%{?dist}
+Version: 3.5.21
+Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/Publishing
 URL: http://djvu.sourceforge.net/
-Source: http://dl.sf.net/djvu/djvulibre-%{version}-2.tar.gz
+Source: http://dl.sf.net/djvu/djvulibre-%{version}.tar.gz
 Patch0: djvulibre-3.5.18-plugin-manpage.patch
 Patch1: djvulibre-3.5.19-ja-encoding.patch
+Patch2: djvulibre-configure.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires(post): xdg-utils, /sbin/ldconfig
 Requires(preun): xdg-utils
@@ -63,6 +64,7 @@
 %setup -q
 %patch0 -p1 -b .plugin-manpage
 %patch1 -p1 -b .ja-encoding
+%patch2 -p1 -b .configure
 # Convert ISO8859-1 ja man pages to UTF-8 (still as of 3.5.20-2)
 for manpage in i18n/ja/*.1*; do
     iconv -f iso8859-1 -t utf-8 -o tmp ${manpage}
@@ -142,6 +144,9 @@
 
 
 %changelog
+* Sat Jan 17 2009 Rakesh Pandit <rakesh at fedoraproject.org> 3.5.21-1
+- Updated to 3.5.21
+
 * Fri Jun 06 2008 Dennis Gilmore <dennis at ausil.us> 3.5.20-3
 - BR qt3-devel
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/djvulibre/F-10/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	3 Feb 2008 16:02:15 -0000	1.11
+++ sources	17 Jan 2009 03:52:39 -0000	1.12
@@ -1 +1 @@
-9211170b1ada6c75971d01353a73333e  djvulibre-3.5.20-2.tar.gz
+4c6f3eb03ffbd067b6d2fe2344b0d9ad  djvulibre-3.5.21.tar.gz



From rakesh at fedoraproject.org  Sat Jan 17 03:52:58 2009
From: rakesh at fedoraproject.org (Rakesh Pandit)
Date: Sat, 17 Jan 2009 03:52:58 +0000 (UTC)
Subject: rpms/djvulibre/devel djvulibre-configure.patch, NONE, 1.1 import.log,
	NONE, 1.1 .cvsignore, 1.11, 1.12 djvulibre.spec, 1.27,
	1.28 sources, 1.11, 1.12
Message-ID: <20090117035258.BCFE87012B@cvs1.fedora.phx.redhat.com>

Author: rakesh

Update of /cvs/pkgs/rpms/djvulibre/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22599/devel

Modified Files:
	.cvsignore djvulibre.spec sources 
Added Files:
	djvulibre-configure.patch import.log 
Log Message:
Updated to 3.5.21.


djvulibre-configure.patch:

--- NEW FILE djvulibre-configure.patch ---
--- djvulibre-3.5.21.org/configure	2009-01-16 20:59:06.000000000 +0530
+++ djvulibre-3.5.21/configure	2009-01-16 20:57:27.000000000 +0530
@@ -21691,6 +21691,7 @@
 __sync_lock_test_and_set(&l,1);
   __sync_lock_release(&l);
   __sync_add_and_fetch(&l,1);
+  __sync_bool_compare_and_swap(&l,&l,1);
   return 0;
   ;
   return 0;


--- NEW FILE import.log ---
djvulibre-3_5_21-1_fc10:HEAD:djvulibre-3.5.21-1.fc10.src.rpm:1232121100


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/djvulibre/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	3 Feb 2008 16:02:15 -0000	1.11
+++ .cvsignore	17 Jan 2009 03:52:28 -0000	1.12
@@ -1 +1 @@
-djvulibre-3.5.20-2.tar.gz
+djvulibre-3.5.21.tar.gz


Index: djvulibre.spec
===================================================================
RCS file: /cvs/pkgs/rpms/djvulibre/devel/djvulibre.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- djvulibre.spec	6 Jun 2008 22:35:51 -0000	1.27
+++ djvulibre.spec	17 Jan 2009 03:52:28 -0000	1.28
@@ -1,13 +1,14 @@
 Summary: DjVu viewers, encoders, and utilities
 Name: djvulibre
-Version: 3.5.20
-Release: 3%{?dist}
+Version: 3.5.21
+Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/Publishing
 URL: http://djvu.sourceforge.net/
-Source: http://dl.sf.net/djvu/djvulibre-%{version}-2.tar.gz
+Source: http://dl.sf.net/djvu/djvulibre-%{version}.tar.gz
 Patch0: djvulibre-3.5.18-plugin-manpage.patch
 Patch1: djvulibre-3.5.19-ja-encoding.patch
+Patch2: djvulibre-configure.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires(post): xdg-utils, /sbin/ldconfig
 Requires(preun): xdg-utils
@@ -63,6 +64,7 @@
 %setup -q
 %patch0 -p1 -b .plugin-manpage
 %patch1 -p1 -b .ja-encoding
+%patch2 -p1 -b .configure
 # Convert ISO8859-1 ja man pages to UTF-8 (still as of 3.5.20-2)
 for manpage in i18n/ja/*.1*; do
     iconv -f iso8859-1 -t utf-8 -o tmp ${manpage}
@@ -142,6 +144,9 @@
 
 
 %changelog
+* Sat Jan 17 2009 Rakesh Pandit <rakesh at fedoraproject.org> 3.5.21-1
+- Updated to 3.5.21
+
 * Fri Jun 06 2008 Dennis Gilmore <dennis at ausil.us> 3.5.20-3
 - BR qt3-devel
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/djvulibre/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	3 Feb 2008 16:02:15 -0000	1.11
+++ sources	17 Jan 2009 03:52:28 -0000	1.12
@@ -1 +1 @@
-9211170b1ada6c75971d01353a73333e  djvulibre-3.5.20-2.tar.gz
+4c6f3eb03ffbd067b6d2fe2344b0d9ad  djvulibre-3.5.21.tar.gz



From rakesh at fedoraproject.org  Sat Jan 17 03:53:23 2009
From: rakesh at fedoraproject.org (Rakesh Pandit)
Date: Sat, 17 Jan 2009 03:53:23 +0000 (UTC)
Subject: rpms/djvulibre/F-9 djvulibre-configure.patch, NONE, 1.1 import.log, 
	NONE, 1.1 .cvsignore, 1.11, 1.12 djvulibre.spec, 1.27,
	1.28 sources, 1.11, 1.12
Message-ID: <20090117035323.407197012B@cvs1.fedora.phx.redhat.com>

Author: rakesh

Update of /cvs/pkgs/rpms/djvulibre/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22691/F-9

Modified Files:
	.cvsignore djvulibre.spec sources 
Added Files:
	djvulibre-configure.patch import.log 
Log Message:
Updated to 3.5.21.


djvulibre-configure.patch:

--- NEW FILE djvulibre-configure.patch ---
--- djvulibre-3.5.21.org/configure	2009-01-16 20:59:06.000000000 +0530
+++ djvulibre-3.5.21/configure	2009-01-16 20:57:27.000000000 +0530
@@ -21691,6 +21691,7 @@
 __sync_lock_test_and_set(&l,1);
   __sync_lock_release(&l);
   __sync_add_and_fetch(&l,1);
+  __sync_bool_compare_and_swap(&l,&l,1);
   return 0;
   ;
   return 0;


--- NEW FILE import.log ---
djvulibre-3_5_21-1_fc10:F-9:djvulibre-3.5.21-1.fc10.src.rpm:1232121128


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/djvulibre/F-9/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	3 Feb 2008 16:02:15 -0000	1.11
+++ .cvsignore	17 Jan 2009 03:52:52 -0000	1.12
@@ -1 +1 @@
-djvulibre-3.5.20-2.tar.gz
+djvulibre-3.5.21.tar.gz


Index: djvulibre.spec
===================================================================
RCS file: /cvs/pkgs/rpms/djvulibre/F-9/djvulibre.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- djvulibre.spec	6 Jun 2008 22:32:23 -0000	1.27
+++ djvulibre.spec	17 Jan 2009 03:52:52 -0000	1.28
@@ -1,13 +1,14 @@
 Summary: DjVu viewers, encoders, and utilities
 Name: djvulibre
-Version: 3.5.20
-Release: 3%{?dist}
+Version: 3.5.21
+Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/Publishing
 URL: http://djvu.sourceforge.net/
-Source: http://dl.sf.net/djvu/djvulibre-%{version}-2.tar.gz
+Source: http://dl.sf.net/djvu/djvulibre-%{version}.tar.gz
 Patch0: djvulibre-3.5.18-plugin-manpage.patch
 Patch1: djvulibre-3.5.19-ja-encoding.patch
+Patch2: djvulibre-configure.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires(post): xdg-utils, /sbin/ldconfig
 Requires(preun): xdg-utils
@@ -63,6 +64,7 @@
 %setup -q
 %patch0 -p1 -b .plugin-manpage
 %patch1 -p1 -b .ja-encoding
+%patch2 -p1 -b .configure
 # Convert ISO8859-1 ja man pages to UTF-8 (still as of 3.5.20-2)
 for manpage in i18n/ja/*.1*; do
     iconv -f iso8859-1 -t utf-8 -o tmp ${manpage}
@@ -142,6 +144,9 @@
 
 
 %changelog
+* Sat Jan 17 2009 Rakesh Pandit <rakesh at fedoraproject.org> 3.5.21-1
+- Updated to 3.5.21
+
 * Fri Jun 06 2008 Dennis Gilmore <dennis at ausil.us> 3.5.20-3
 - BR qt3-devel
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/djvulibre/F-9/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	3 Feb 2008 16:02:15 -0000	1.11
+++ sources	17 Jan 2009 03:52:52 -0000	1.12
@@ -1 +1 @@
-9211170b1ada6c75971d01353a73333e  djvulibre-3.5.20-2.tar.gz
+4c6f3eb03ffbd067b6d2fe2344b0d9ad  djvulibre-3.5.21.tar.gz



From pcfe at fedoraproject.org  Sat Jan 17 04:07:23 2009
From: pcfe at fedoraproject.org (=?utf-8?q?Patrick_Charles_Fran=C3=A7ois_Ernzer?=)
Date: Sat, 17 Jan 2009 04:07:23 +0000 (UTC)
Subject: rpms/jpilot-backup/devel import.log, NONE,
	1.1 jpilot-backup-libdir.patch, NONE, 1.1 jpilot-backup.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090117040723.458597012B@cvs1.fedora.phx.redhat.com>

Author: pcfe

Update of /cvs/pkgs/rpms/jpilot-backup/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23918/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log jpilot-backup-libdir.patch jpilot-backup.spec 
Log Message:
* Sat Jan 17 2009 Patrick C. F. Ernzer <jpilot-backup.spec at pcfe.net>
- checking package in (#474768)



--- NEW FILE import.log ---
jpilot-backup-0_53-5_fc10:HEAD:jpilot-backup-0.53-5.fc10.src.rpm:1232164995

jpilot-backup-libdir.patch:

--- NEW FILE jpilot-backup-libdir.patch ---
diff -up jpilot-backup-0.53/configure.in.libdir jpilot-backup-0.53/configure.in
--- jpilot-backup-0.53/configure.in.libdir	2006-09-27 04:46:40.000000000 +0300
+++ jpilot-backup-0.53/configure.in	2008-12-04 23:52:47.000000000 +0200
@@ -64,7 +64,7 @@ pilotlibs=${FORCE_PILOT_LIBS:-no}
 PILOT_LIBS="-lpisock"
 
 if test $pilotlibs = no ; then
-for pilot_libs in $pilot_prefix/lib /usr/lib /usr/local/lib/ \
+for pilot_libs in $pilot_prefix/lib $pilot_prefix/lib64 /usr/lib /usr/lib64 /usr/local/lib/ \
   /usr/extra/pilot/lib ; do
    if test -r $pilot_libs/libpisock.so >/dev/null 2>&1 ; then
       pilotlibs=yes
diff -up jpilot-backup-0.53/configure.libdir jpilot-backup-0.53/configure
--- jpilot-backup-0.53/configure.libdir	2006-09-27 04:48:10.000000000 +0300
+++ jpilot-backup-0.53/configure	2008-12-04 23:52:47.000000000 +0200
@@ -19161,7 +19161,7 @@ pilotlibs=${FORCE_PILOT_LIBS:-no}
 PILOT_LIBS="-lpisock"
 
 if test $pilotlibs = no ; then
-for pilot_libs in $pilot_prefix/lib /usr/lib /usr/local/lib/ \
+for pilot_libs in $pilot_prefix/lib $pilot_prefix/lib64 /usr/lib /usr/lib64 /usr/local/lib/ \
   /usr/extra/pilot/lib ; do
    if test -r $pilot_libs/libpisock.so >/dev/null 2>&1 ; then
       pilotlibs=yes
diff -up jpilot-backup-0.53/src/Makefile.am.libdir jpilot-backup-0.53/src/Makefile.am
--- jpilot-backup-0.53/src/Makefile.am.libdir	2006-09-15 02:20:52.000000000 +0300
+++ jpilot-backup-0.53/src/Makefile.am	2008-12-04 23:52:47.000000000 +0200
@@ -12,7 +12,7 @@ libbackup_la_SOURCES = \
 
 libbackup_la_LDFLAGS = -avoid-version
 libbackup_la_LIBADD = @LIBS@ @PILOT_LIBS@ @GTK_LIBS@
-libdir = $(prefix)/lib/jpilot/plugins
+libdir = $(prefix)/.. at libdir@/jpilot/plugins
 
 AM_CFLAGS = -Wall @PILOT_FLAGS@ @GTK_CFLAGS@
 
diff -up jpilot-backup-0.53/src/Makefile.in.libdir jpilot-backup-0.53/src/Makefile.in
--- jpilot-backup-0.53/src/Makefile.in.libdir	2008-12-04 23:53:45.000000000 +0200
+++ jpilot-backup-0.53/src/Makefile.in	2008-12-04 23:54:28.000000000 +0200
@@ -168,7 +168,7 @@ host_vendor = @host_vendor@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-libdir = $(prefix)/lib/jpilot/plugins
+libdir = $(prefix)/.. at libdir@/jpilot/plugins
 libexecdir = @libexecdir@
 localstatedir = @localstatedir@
 mandir = @mandir@


--- NEW FILE jpilot-backup.spec ---
Summary: Enhanced backup plugin for J-Pilot
Name: jpilot-backup
Version: 0.53
Release: 5%{dist}
License: GPLv2+
Group: Applications/Productivity
Source: http://jasonday.home.att.net/code/backup/jpilot-backup-%{version}.tar.gz
Patch0: jpilot-backup-libdir.patch
URL: http://jasonday.home.att.net/code/backup/backup.html
Requires: jpilot >= 0.99.2
BuildRequires: pilot-link-devel
BuildRequires: gtk2-devel
BuildRequires: gdbm-devel
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

%description
Features include multiple archives, automatic backups at user-specified times,
and the ability to specify which databases to backup.

%prep
%setup -n %{name}-%{version} -q
%patch0 -p1 -b .libdir

%build
%configure
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make prefix=$RPM_BUILD_ROOT%{_prefix} install

# manually remove the static library
# as --disable-static flag to ./configure does not help
rm  $RPM_BUILD_ROOT%{_libdir}/jpilot/plugins/libbackup.la

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc README README.NFS ChangeLog COPYING CREDITS TODO
%{_libdir}/jpilot/plugins/libbackup.so

%changelog
* Tue Dec 16 2008 Patrick C. F. Ernzer <jpilot-backup.spec at pcfe.net> 0.53-5
- incorporate feedback from Bug 474768 Comments #5

* Wed Dec 10 2008 Patrick C. F. Ernzer <jpilot-backup.spec at pcfe.net> 0.53-4
- incorporate feedback from Bug 474768 Comments #1, #2 and #3

* Fri Dec 05 2008 Patrick C. F. Ernzer <jpilot-backup.spec at pcfe.net> 0.53-3
- minor cleanups to remove rpmlint warnings
- BuildRequires gtk2-devel and gdbm-devel added
- Requires gdbm added

* Thu Nov 27 2008 Patrick C. F. Ernzer <jpilot-backup.spec at pcfe.net> 0.53-2
- add libdir patch so this compiles on x86_64

* Thu Jun 14 2007 Patrick C. F. Ernzer <jpilot-backup.spec at pcfe.net> 0.53
- bump to 0.53
- changed obsolete Copyright tag to current License tag

* Wed Jan 29 2003 Jason Day <jasonday at worldnet.att.net> 0.50
- Added README.NFS to docs

* Thu Oct 14 2002 Jason Day <jasonday at worldnet.att.net> 0.43
- Bump version

* Mon May 14 2002 Jason Day <jasonday at worldnet.att.net> 0.42
- Minor misc cleanup
- Added TODO to dist files

* Sun Apr  7 2002 Jason Day <jasonday at worldnet.att.net> 0.41.2-1
- incorporated Sylvain's changes into main trunk, making patch
  unnecessary

* Sat Feb  9 2002 Sylvain Holtzer <sylvain.holtzer at free.fr> 0.41.2-0.sho1
- minor fixes : "version" upgraded ; requires jpilot-0.99.2 ;
- added sho1.patch, so we don't need superuser privileges (Makefile.in,
  and this .spec - see (v01) pattern) ;
- used rpm macros, and "make install" ;
- installs libbackup.la ;



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/jpilot-backup/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	17 Jan 2009 03:15:31 -0000	1.1
+++ .cvsignore	17 Jan 2009 04:06:52 -0000	1.2
@@ -0,0 +1 @@
+jpilot-backup-0.53.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/jpilot-backup/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	17 Jan 2009 03:15:31 -0000	1.1
+++ sources	17 Jan 2009 04:06:52 -0000	1.2
@@ -0,0 +1 @@
+c8a3eefd3706d9614cb25f2bebf48ece  jpilot-backup-0.53.tar.gz



From pcfe at fedoraproject.org  Sat Jan 17 04:29:07 2009
From: pcfe at fedoraproject.org (=?utf-8?q?Patrick_Charles_Fran=C3=A7ois_Ernzer?=)
Date: Sat, 17 Jan 2009 04:29:07 +0000 (UTC)
Subject: rpms/jpilot-backup/F-10 import.log, NONE,
	1.1 jpilot-backup-libdir.patch, NONE, 1.1 jpilot-backup.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090117042907.BE6FE7012B@cvs1.fedora.phx.redhat.com>

Author: pcfe

Update of /cvs/pkgs/rpms/jpilot-backup/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26750/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	import.log jpilot-backup-libdir.patch jpilot-backup.spec 
Log Message:
* Sat Jan 17 2009 Patrick C. F. Ernzer <jpilot-backup.spec at pcfe.net>
- first checking into CVS (#474768)



--- NEW FILE import.log ---
jpilot-backup-0_53-5_fc10:F-10:jpilot-backup-0.53-5.fc10.src.rpm:1232166374

jpilot-backup-libdir.patch:

--- NEW FILE jpilot-backup-libdir.patch ---
diff -up jpilot-backup-0.53/configure.in.libdir jpilot-backup-0.53/configure.in
--- jpilot-backup-0.53/configure.in.libdir	2006-09-27 04:46:40.000000000 +0300
+++ jpilot-backup-0.53/configure.in	2008-12-04 23:52:47.000000000 +0200
@@ -64,7 +64,7 @@ pilotlibs=${FORCE_PILOT_LIBS:-no}
 PILOT_LIBS="-lpisock"
 
 if test $pilotlibs = no ; then
-for pilot_libs in $pilot_prefix/lib /usr/lib /usr/local/lib/ \
+for pilot_libs in $pilot_prefix/lib $pilot_prefix/lib64 /usr/lib /usr/lib64 /usr/local/lib/ \
   /usr/extra/pilot/lib ; do
    if test -r $pilot_libs/libpisock.so >/dev/null 2>&1 ; then
       pilotlibs=yes
diff -up jpilot-backup-0.53/configure.libdir jpilot-backup-0.53/configure
--- jpilot-backup-0.53/configure.libdir	2006-09-27 04:48:10.000000000 +0300
+++ jpilot-backup-0.53/configure	2008-12-04 23:52:47.000000000 +0200
@@ -19161,7 +19161,7 @@ pilotlibs=${FORCE_PILOT_LIBS:-no}
 PILOT_LIBS="-lpisock"
 
 if test $pilotlibs = no ; then
-for pilot_libs in $pilot_prefix/lib /usr/lib /usr/local/lib/ \
+for pilot_libs in $pilot_prefix/lib $pilot_prefix/lib64 /usr/lib /usr/lib64 /usr/local/lib/ \
   /usr/extra/pilot/lib ; do
    if test -r $pilot_libs/libpisock.so >/dev/null 2>&1 ; then
       pilotlibs=yes
diff -up jpilot-backup-0.53/src/Makefile.am.libdir jpilot-backup-0.53/src/Makefile.am
--- jpilot-backup-0.53/src/Makefile.am.libdir	2006-09-15 02:20:52.000000000 +0300
+++ jpilot-backup-0.53/src/Makefile.am	2008-12-04 23:52:47.000000000 +0200
@@ -12,7 +12,7 @@ libbackup_la_SOURCES = \
 
 libbackup_la_LDFLAGS = -avoid-version
 libbackup_la_LIBADD = @LIBS@ @PILOT_LIBS@ @GTK_LIBS@
-libdir = $(prefix)/lib/jpilot/plugins
+libdir = $(prefix)/.. at libdir@/jpilot/plugins
 
 AM_CFLAGS = -Wall @PILOT_FLAGS@ @GTK_CFLAGS@
 
diff -up jpilot-backup-0.53/src/Makefile.in.libdir jpilot-backup-0.53/src/Makefile.in
--- jpilot-backup-0.53/src/Makefile.in.libdir	2008-12-04 23:53:45.000000000 +0200
+++ jpilot-backup-0.53/src/Makefile.in	2008-12-04 23:54:28.000000000 +0200
@@ -168,7 +168,7 @@ host_vendor = @host_vendor@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-libdir = $(prefix)/lib/jpilot/plugins
+libdir = $(prefix)/.. at libdir@/jpilot/plugins
 libexecdir = @libexecdir@
 localstatedir = @localstatedir@
 mandir = @mandir@


--- NEW FILE jpilot-backup.spec ---
Summary: Enhanced backup plugin for J-Pilot
Name: jpilot-backup
Version: 0.53
Release: 5%{dist}
License: GPLv2+
Group: Applications/Productivity
Source: http://jasonday.home.att.net/code/backup/jpilot-backup-%{version}.tar.gz
Patch0: jpilot-backup-libdir.patch
URL: http://jasonday.home.att.net/code/backup/backup.html
Requires: jpilot >= 0.99.2
BuildRequires: pilot-link-devel
BuildRequires: gtk2-devel
BuildRequires: gdbm-devel
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

%description
Features include multiple archives, automatic backups at user-specified times,
and the ability to specify which databases to backup.

%prep
%setup -n %{name}-%{version} -q
%patch0 -p1 -b .libdir

%build
%configure
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make prefix=$RPM_BUILD_ROOT%{_prefix} install

# manually remove the static library
# as --disable-static flag to ./configure does not help
rm  $RPM_BUILD_ROOT%{_libdir}/jpilot/plugins/libbackup.la

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc README README.NFS ChangeLog COPYING CREDITS TODO
%{_libdir}/jpilot/plugins/libbackup.so

%changelog
* Tue Dec 16 2008 Patrick C. F. Ernzer <jpilot-backup.spec at pcfe.net> 0.53-5
- incorporate feedback from Bug 474768 Comments #5

* Wed Dec 10 2008 Patrick C. F. Ernzer <jpilot-backup.spec at pcfe.net> 0.53-4
- incorporate feedback from Bug 474768 Comments #1, #2 and #3

* Fri Dec 05 2008 Patrick C. F. Ernzer <jpilot-backup.spec at pcfe.net> 0.53-3
- minor cleanups to remove rpmlint warnings
- BuildRequires gtk2-devel and gdbm-devel added
- Requires gdbm added

* Thu Nov 27 2008 Patrick C. F. Ernzer <jpilot-backup.spec at pcfe.net> 0.53-2
- add libdir patch so this compiles on x86_64

* Thu Jun 14 2007 Patrick C. F. Ernzer <jpilot-backup.spec at pcfe.net> 0.53
- bump to 0.53
- changed obsolete Copyright tag to current License tag

* Wed Jan 29 2003 Jason Day <jasonday at worldnet.att.net> 0.50
- Added README.NFS to docs

* Thu Oct 14 2002 Jason Day <jasonday at worldnet.att.net> 0.43
- Bump version

* Mon May 14 2002 Jason Day <jasonday at worldnet.att.net> 0.42
- Minor misc cleanup
- Added TODO to dist files

* Sun Apr  7 2002 Jason Day <jasonday at worldnet.att.net> 0.41.2-1
- incorporated Sylvain's changes into main trunk, making patch
  unnecessary

* Sat Feb  9 2002 Sylvain Holtzer <sylvain.holtzer at free.fr> 0.41.2-0.sho1
- minor fixes : "version" upgraded ; requires jpilot-0.99.2 ;
- added sho1.patch, so we don't need superuser privileges (Makefile.in,
  and this .spec - see (v01) pattern) ;
- used rpm macros, and "make install" ;
- installs libbackup.la ;



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/jpilot-backup/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	17 Jan 2009 03:15:31 -0000	1.1
+++ .cvsignore	17 Jan 2009 04:28:37 -0000	1.2
@@ -0,0 +1 @@
+jpilot-backup-0.53.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/jpilot-backup/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	17 Jan 2009 03:15:31 -0000	1.1
+++ sources	17 Jan 2009 04:28:37 -0000	1.2
@@ -0,0 +1 @@
+c8a3eefd3706d9614cb25f2bebf48ece  jpilot-backup-0.53.tar.gz



From mclasen at fedoraproject.org  Sat Jan 17 04:33:54 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Sat, 17 Jan 2009 04:33:54 +0000 (UTC)
Subject: rpms/totem/devel totem.spec,1.215,1.216
Message-ID: <20090117043354.C48947012B@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/totem/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27505

Modified Files:
	totem.spec 
Log Message:
Own /usr/lib/totem



Index: totem.spec
===================================================================
RCS file: /cvs/pkgs/rpms/totem/devel/totem.spec,v
retrieving revision 1.215
retrieving revision 1.216
diff -u -r1.215 -r1.216
--- totem.spec	6 Jan 2009 10:15:46 -0000	1.215
+++ totem.spec	17 Jan 2009 04:33:24 -0000	1.216
@@ -10,7 +10,7 @@
 Summary: Movie player for GNOME
 Name: totem
 Version: 2.25.3
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: GPLv2+ with exceptions
 Group: Applications/Multimedia
 URL: http://projects.gnome.org/totem/
@@ -393,6 +393,7 @@
 %{_libexecdir}/totem/totem-bugreport.py
 %exclude %{_libexecdir}/totem/totem-bugreport.py[co]
 %{_libdir}/libbaconvideowidget.so*
+%dir %{_libdir}/totem
 %dir %{_libdir}/totem/plugins
 %{_libdir}/totem/plugins/gromit
 %{_libdir}/totem/plugins/ontop
@@ -458,6 +459,9 @@
 %endif
 
 %changelog
+* Fri Jan 16 2009  Matthias Clasen <mclasen at redhat.com> - 2.25.3-7
+- Own /usr/lib/totem
+
 * Mon Jan 05 2009 - Bastien Nocera <bnocera at redhat.com> - 2.25.3-6
 - Remove compiled bits for the bug report scripts (#478889)
 



From rakesh at fedoraproject.org  Sat Jan 17 04:42:44 2009
From: rakesh at fedoraproject.org (Rakesh Pandit)
Date: Sat, 17 Jan 2009 04:42:44 +0000 (UTC)
Subject: rpms/pdf2djvu/devel .cvsignore, 1.2, 1.3 import.log, 1.1,
	1.2 pdf2djvu.spec, 1.1, 1.2 sources, 1.2,
	1.3 pdf2djvu-strerror.patch, 1.1, NONE
Message-ID: <20090117044244.253BC70142@cvs1.fedora.phx.redhat.com>

Author: rakesh

Update of /cvs/pkgs/rpms/pdf2djvu/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28550/devel

Modified Files:
	.cvsignore import.log pdf2djvu.spec sources 
Removed Files:
	pdf2djvu-strerror.patch 
Log Message:
Updated to 0.5.0.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pdf2djvu/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	11 Nov 2008 08:00:43 -0000	1.2
+++ .cvsignore	17 Jan 2009 04:42:13 -0000	1.3
@@ -1 +1 @@
-pdf2djvu_0.4.13.tar.gz
+pdf2djvu_0.5.0.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/pdf2djvu/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	11 Nov 2008 08:00:43 -0000	1.1
+++ import.log	17 Jan 2009 04:42:13 -0000	1.2
@@ -1 +1,2 @@
 pdf2djvu-0_4_13-3_fc10:HEAD:pdf2djvu-0.4.13-3.fc10.src.rpm:1226407417
+pdf2djvu-0_5_0-1_fc10:HEAD:pdf2djvu-0.5.0-1.fc10.src.rpm:1232124128


Index: pdf2djvu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pdf2djvu/devel/pdf2djvu.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pdf2djvu.spec	11 Nov 2008 08:00:43 -0000	1.1
+++ pdf2djvu.spec	17 Jan 2009 04:42:13 -0000	1.2
@@ -1,12 +1,11 @@
 Name:           pdf2djvu
-Version:        0.4.13
-Release:        3%{?dist}
+Version:        0.5.0
+Release:        1%{?dist}
 Summary:        PDF to DjVu converter
 Group:          Applications/Publishing
 License:        GPLv2+
 URL:            http://pdf2djvu.googlecode.com/
 Source0:        http://pdf2djvu.googlecode.com/files/%{name}_%{version}.tar.gz
-Patch0:         pdf2djvu-strerror.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  djvulibre-devel
@@ -22,15 +21,15 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .stderr
 
 %build
-make %{?_smp_mflags} CXXFLAGS="$RPM_OPT_FLAGS"
+%configure
+make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
+make DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" install
 install -p -m 644 -D {doc,%{buildroot}%{_mandir}/man1}/pdf2djvu.1
-install -p -m 755 -D {,%{buildroot}%{_bindir}/}pdf2djvu
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -41,6 +40,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Sat Jan 17 2009 Rakesh Pandit <rakesh at fedoraproject.org> 0.5.0-1
+- Updated to 0.5.0
+
 * Mon Nov 10 2008 Rakesh Pandit <rakesh at fedoraproject.org> 0.4.13-3
 - Cleaned useless permissions in %%files section
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pdf2djvu/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	11 Nov 2008 08:00:43 -0000	1.2
+++ sources	17 Jan 2009 04:42:13 -0000	1.3
@@ -1 +1 @@
-96c971cadb696f15167f892aa8a4b8c9  pdf2djvu_0.4.13.tar.gz
+289bc52ad069fc51993ac6b71a58ebf8  pdf2djvu_0.5.0.tar.gz


--- pdf2djvu-strerror.patch DELETED ---



From rakesh at fedoraproject.org  Sat Jan 17 04:43:52 2009
From: rakesh at fedoraproject.org (Rakesh Pandit)
Date: Sat, 17 Jan 2009 04:43:52 +0000 (UTC)
Subject: rpms/pdf2djvu/F-10 .cvsignore, 1.2, 1.3 import.log, 1.1,
	1.2 pdf2djvu.spec, 1.1, 1.2 sources, 1.2,
	1.3 pdf2djvu-strerror.patch, 1.1, NONE
Message-ID: <20090117044352.502E97012B@cvs1.fedora.phx.redhat.com>

Author: rakesh

Update of /cvs/pkgs/rpms/pdf2djvu/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29582/F-10

Modified Files:
	.cvsignore import.log pdf2djvu.spec sources 
Removed Files:
	pdf2djvu-strerror.patch 
Log Message:
Updated to 0.5.0.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pdf2djvu/F-10/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	11 Nov 2008 08:14:36 -0000	1.2
+++ .cvsignore	17 Jan 2009 04:43:22 -0000	1.3
@@ -1 +1 @@
-pdf2djvu_0.4.13.tar.gz
+pdf2djvu_0.5.0.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/pdf2djvu/F-10/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	11 Nov 2008 08:14:37 -0000	1.1
+++ import.log	17 Jan 2009 04:43:22 -0000	1.2
@@ -1 +1,2 @@
 pdf2djvu-0_4_13-3_fc10:F-10:pdf2djvu-0.4.13-3.fc10.src.rpm:1226410828
+pdf2djvu-0_5_0-1_fc10:F-10:pdf2djvu-0.5.0-1.fc10.src.rpm:1232124199


Index: pdf2djvu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pdf2djvu/F-10/pdf2djvu.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pdf2djvu.spec	11 Nov 2008 08:14:37 -0000	1.1
+++ pdf2djvu.spec	17 Jan 2009 04:43:22 -0000	1.2
@@ -1,12 +1,11 @@
 Name:           pdf2djvu
-Version:        0.4.13
-Release:        3%{?dist}
+Version:        0.5.0
+Release:        1%{?dist}
 Summary:        PDF to DjVu converter
 Group:          Applications/Publishing
 License:        GPLv2+
 URL:            http://pdf2djvu.googlecode.com/
 Source0:        http://pdf2djvu.googlecode.com/files/%{name}_%{version}.tar.gz
-Patch0:         pdf2djvu-strerror.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  djvulibre-devel
@@ -22,15 +21,15 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .stderr
 
 %build
-make %{?_smp_mflags} CXXFLAGS="$RPM_OPT_FLAGS"
+%configure
+make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
+make DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" install
 install -p -m 644 -D {doc,%{buildroot}%{_mandir}/man1}/pdf2djvu.1
-install -p -m 755 -D {,%{buildroot}%{_bindir}/}pdf2djvu
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -41,6 +40,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Sat Jan 17 2009 Rakesh Pandit <rakesh at fedoraproject.org> 0.5.0-1
+- Updated to 0.5.0
+
 * Mon Nov 10 2008 Rakesh Pandit <rakesh at fedoraproject.org> 0.4.13-3
 - Cleaned useless permissions in %%files section
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pdf2djvu/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	11 Nov 2008 08:14:37 -0000	1.2
+++ sources	17 Jan 2009 04:43:22 -0000	1.3
@@ -1 +1 @@
-96c971cadb696f15167f892aa8a4b8c9  pdf2djvu_0.4.13.tar.gz
+289bc52ad069fc51993ac6b71a58ebf8  pdf2djvu_0.5.0.tar.gz


--- pdf2djvu-strerror.patch DELETED ---



From rakesh at fedoraproject.org  Sat Jan 17 04:48:09 2009
From: rakesh at fedoraproject.org (Rakesh Pandit)
Date: Sat, 17 Jan 2009 04:48:09 +0000 (UTC)
Subject: rpms/pdf2djvu/F-9 .cvsignore, 1.2, 1.3 import.log, 1.1,
	1.2 pdf2djvu.spec, 1.1, 1.2 sources, 1.2,
	1.3 pdf2djvu-strerror.patch, 1.1, NONE
Message-ID: <20090117044809.867627012B@cvs1.fedora.phx.redhat.com>

Author: rakesh

Update of /cvs/pkgs/rpms/pdf2djvu/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29685/F-9

Modified Files:
	.cvsignore import.log pdf2djvu.spec sources 
Removed Files:
	pdf2djvu-strerror.patch 
Log Message:
Updated to 0.5.0.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pdf2djvu/F-9/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	11 Nov 2008 08:10:33 -0000	1.2
+++ .cvsignore	17 Jan 2009 04:47:39 -0000	1.3
@@ -1 +1 @@
-pdf2djvu_0.4.13.tar.gz
+pdf2djvu_0.5.0.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/pdf2djvu/F-9/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	11 Nov 2008 08:10:33 -0000	1.1
+++ import.log	17 Jan 2009 04:47:39 -0000	1.2
@@ -1 +1,2 @@
 pdf2djvu-0_4_13-3_fc10:F-9:pdf2djvu-0.4.13-3.fc10.src.rpm:1226410267
+pdf2djvu-0_5_0-1_fc10:F-9:pdf2djvu-0.5.0-1.fc10.src.rpm:1232124213


Index: pdf2djvu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pdf2djvu/F-9/pdf2djvu.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pdf2djvu.spec	11 Nov 2008 08:10:33 -0000	1.1
+++ pdf2djvu.spec	17 Jan 2009 04:47:39 -0000	1.2
@@ -1,12 +1,11 @@
 Name:           pdf2djvu
-Version:        0.4.13
-Release:        3%{?dist}
+Version:        0.5.0
+Release:        1%{?dist}
 Summary:        PDF to DjVu converter
 Group:          Applications/Publishing
 License:        GPLv2+
 URL:            http://pdf2djvu.googlecode.com/
 Source0:        http://pdf2djvu.googlecode.com/files/%{name}_%{version}.tar.gz
-Patch0:         pdf2djvu-strerror.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  djvulibre-devel
@@ -22,15 +21,15 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .stderr
 
 %build
-make %{?_smp_mflags} CXXFLAGS="$RPM_OPT_FLAGS"
+%configure
+make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
+make DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" install
 install -p -m 644 -D {doc,%{buildroot}%{_mandir}/man1}/pdf2djvu.1
-install -p -m 755 -D {,%{buildroot}%{_bindir}/}pdf2djvu
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -41,6 +40,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Sat Jan 17 2009 Rakesh Pandit <rakesh at fedoraproject.org> 0.5.0-1
+- Updated to 0.5.0
+
 * Mon Nov 10 2008 Rakesh Pandit <rakesh at fedoraproject.org> 0.4.13-3
 - Cleaned useless permissions in %%files section
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pdf2djvu/F-9/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	11 Nov 2008 08:10:33 -0000	1.2
+++ sources	17 Jan 2009 04:47:39 -0000	1.3
@@ -1 +1 @@
-96c971cadb696f15167f892aa8a4b8c9  pdf2djvu_0.4.13.tar.gz
+289bc52ad069fc51993ac6b71a58ebf8  pdf2djvu_0.5.0.tar.gz


--- pdf2djvu-strerror.patch DELETED ---



From clumens at fedoraproject.org  Sat Jan 17 04:54:06 2009
From: clumens at fedoraproject.org (Christopher Edward Lumens)
Date: Sat, 17 Jan 2009 04:54:06 +0000 (UTC)
Subject: rpms/anaconda/devel .cvsignore, 1.598, 1.599 anaconda.spec, 1.742, 
	1.743 sources, 1.733, 1.734
Message-ID: <20090117045406.0E0CA7012B@cvs1.fedora.phx.redhat.com>

Author: clumens

Update of /cvs/pkgs/rpms/anaconda/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30798

Modified Files:
	.cvsignore anaconda.spec sources 
Log Message:
New version.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/devel/.cvsignore,v
retrieving revision 1.598
retrieving revision 1.599
diff -u -r1.598 -r1.599
--- .cvsignore	15 Jan 2009 00:56:34 -0000	1.598
+++ .cvsignore	17 Jan 2009 04:53:35 -0000	1.599
@@ -1 +1,2 @@
 anaconda-11.5.0.8.tar.bz2
+anaconda-11.5.0.9.tar.bz2


Index: anaconda.spec
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/devel/anaconda.spec,v
retrieving revision 1.742
retrieving revision 1.743
diff -u -r1.742 -r1.743
--- anaconda.spec	15 Jan 2009 00:56:34 -0000	1.742
+++ anaconda.spec	17 Jan 2009 04:53:35 -0000	1.743
@@ -2,7 +2,7 @@
 
 Summary: Graphical system installer
 Name:    anaconda
-Version: 11.5.0.8
+Version: 11.5.0.9
 Release: 1
 License: GPLv2+
 Group:   Applications/System
@@ -204,6 +204,19 @@
 %endif
 
 %changelog
+* Fri Jan 16 2009 Chris Lumens <clumens at redhat.com> - 11.5.0.9-1
+- Cracklib moved locations, account for this in our keepfiles. (jkeating)
+- Look in the right path for kernel module lists. (jkeating)
+- Fix more problems in expandModuleSet, based on a patch from markmc
+  (#480307). (clumens)
+- Allow ext4 without magic argument (keep a flag for migrate) (katzj)
+- Fix pulling in network modules (katzj)
+- Support mounting NTFS filesystems (#430084) (katzj)
+- dejavu fonts changed package names, pick up new names. (jkeating)
+- TightVNC is now the default VNC server in Fedora (#480308). (clumens)
+- Only skip (over)writing netconfig if we have an actual instPath (jkeating)
+- The sets module is deprecated, so no longer use it. (clumens)
+
 * Wed Jan 14 2009 David Cantrell <dcantrell at redhat.com> - 11.5.0.8-1
 - Fix D-Bus usage in get_connection in loader (jkeating)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/devel/sources,v
retrieving revision 1.733
retrieving revision 1.734
diff -u -r1.733 -r1.734
--- sources	15 Jan 2009 00:56:34 -0000	1.733
+++ sources	17 Jan 2009 04:53:35 -0000	1.734
@@ -1 +1 @@
-9030acfac51fc12c3673d6e9a0f90e5d  anaconda-11.5.0.8.tar.bz2
+886a92d1d01fa2d5853b508d6c77681d  anaconda-11.5.0.9.tar.bz2



From mtasaka at fedoraproject.org  Sat Jan 17 05:21:35 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Sat, 17 Jan 2009 05:21:35 +0000 (UTC)
Subject: rpms/cairo-dock/devel .cvsignore, 1.100, 1.101 cairo-dock.spec,
	1.135, 1.136 sources, 1.100, 1.101
Message-ID: <20090117052135.A06D47012B@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/cairo-dock/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1052

Modified Files:
	.cvsignore cairo-dock.spec sources 
Log Message:
* Sat Jan 17 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
- rev 1487



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cairo-dock/devel/.cvsignore,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -r1.100 -r1.101
--- .cvsignore	16 Jan 2009 05:25:59 -0000	1.100
+++ .cvsignore	17 Jan 2009 05:21:05 -0000	1.101
@@ -1 +1 @@
-cairo-dock-sources-svn1485_trunk.tar.bz2
+cairo-dock-sources-svn1487_trunk.tar.bz2


Index: cairo-dock.spec
===================================================================
RCS file: /cvs/extras/rpms/cairo-dock/devel/cairo-dock.spec,v
retrieving revision 1.135
retrieving revision 1.136
diff -u -r1.135 -r1.136
--- cairo-dock.spec	16 Jan 2009 05:25:59 -0000	1.135
+++ cairo-dock.spec	17 Jan 2009 05:21:05 -0000	1.136
@@ -11,7 +11,7 @@
 %undefine		betaver		
 %define		build_webkit	1
 %define		build_xfce	1
-%define		tarballver	svn1485_trunk
+%define		tarballver	svn1487_trunk
 
 %define		fedora_main_rel	3
 
@@ -638,8 +638,8 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
-* Fri Jan 16 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
-- rev 1485
+* Sat Jan 17 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- rev 1487
 
 * Thu Jan 15 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
 - rev 1484


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cairo-dock/devel/sources,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -r1.100 -r1.101
--- sources	16 Jan 2009 05:25:59 -0000	1.100
+++ sources	17 Jan 2009 05:21:05 -0000	1.101
@@ -1 +1 @@
-0e9aeeab1dc211acfd269fb2650eda2c  cairo-dock-sources-svn1485_trunk.tar.bz2
+95f7b48faa9c3f4e21a2c86c2ab07dde  cairo-dock-sources-svn1487_trunk.tar.bz2



From rajeeshknambiar at fedoraproject.org  Sat Jan 17 05:28:48 2009
From: rajeeshknambiar at fedoraproject.org (Rajeesh K Nambiar)
Date: Sat, 17 Jan 2009 05:28:48 +0000 (UTC)
Subject: rpms/smc-fonts/devel smc-fonts.spec,1.3,1.4
Message-ID: <20090117052848.AD99A7012B@cvs1.fedora.phx.redhat.com>

Author: rajeeshknambiar

Update of /cvs/pkgs/rpms/smc-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1672

Modified Files:
	smc-fonts.spec 
Log Message:
Update for new font naming guidelines



Index: smc-fonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/smc-fonts/devel/smc-fonts.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- smc-fonts.spec	6 Jan 2009 09:30:39 -0000	1.3
+++ smc-fonts.spec	17 Jan 2009 05:28:18 -0000	1.4
@@ -6,16 +6,16 @@
 The smc-fonts package contains fonts for the display of\
 traditional and new Malayalam Script.
 
-Name:	%{fontname}-fonts
+Name:		%{fontname}-fonts
 Version:	04.1
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Open Type Fonts for Malayalam script
-Group:	User Interface/X
+Group:		User Interface/X
 License:	GPLv3+ with exceptions and GPLv2+ with exceptions and GPLv2+ and  GPLv2
-URL:	http://savannah.nongnu.org/projects/smc
-Source:	http://download.savannah.nongnu.org/releases/smc/fonts/malayalam-fonts-%{version}.zip
+URL:		http://savannah.nongnu.org/projects/smc
+Source:		http://download.savannah.nongnu.org/releases/smc/fonts/malayalam-fonts-%{version}.zip
 BuildArch:	noarch
-BuildRequires: fontpackages-devel
+BuildRequires:	fontpackages-devel > 1.13
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -23,74 +23,81 @@
 
 %package common
 Summary:  Common files for smc-fonts
-Group:  User Interface/X
+Group:	User Interface/X
 Requires: fontpackages-filesystem
 
 %description common
 %common_desc
 
-%package dyuthi
+%package -n %{fontname}-dyuthi-fonts
 Summary: Open Type Fonts for Malayalam script
 Group: User Interface/X 
 Requires: %{name}-common = %{version}-%{release}
 License: GPLv3+ with exceptions
-%description dyuthi
+Obsoletes: %{name}-dyuthi < 04.1-3
+%description -n %{fontname}-dyuthi-fonts
 The smc-fonts-dyuthi package contains fonts for the display of
 traditional Malayalam Scripts.
 
-%package meera 
+%package -n %{fontname}-meera-fonts
 Summary: Open Type Fonts for Malayalam script
 Group: User Interface/X 
 Requires: %{name}-common = %{version}-%{release}
 License: GPLv2+ with exceptions
-%description meera
+Obsoletes: %{name}-meera < 04.1-3
+%description -n %{fontname}-meera-fonts
 The smc-fonts-meera package contains fonts for the display of
 traditional Malayalam Scripts.
 
 
-%package rachana 
+%package -n %{fontname}-rachana-fonts
 Summary: Open Type Fonts for Malayalam script
 Group: User Interface/X 
 Requires: %{name}-common = %{version}-%{release}
 License: GPLv2+
-%description rachana
+Obsoletes: %{name}-rachana < 04.1-3
+%description -n %{fontname}-rachana-fonts
 The smc-fonts-rachana package contains fonts for the display of
 traditional Malayalam Scripts.
 
 
-%package raghumalayalam
+%package -n %{fontname}-raghumalayalam-fonts
 Summary: Open Type Fonts for Malayalam script
 Group: User Interface/X 
 Requires: %{name}-common = %{version}-%{release}
 License: GPLv2
-%description raghumalayalam
+Obsoletes: %{name}-raghumalayalam < 04.1-3
+%description -n %{fontname}-raghumalayalam-fonts
 The smc-fonts-malayalam package contains fonts for the display of
 new Malayalam Scripts.
 
-%package suruma
+%package -n %{fontname}-suruma-fonts
 Summary: Open Type Fonts for Malayalam script
 Group: User Interface/X 
 Requires: %{name}-common = %{version}-%{release}
 License: GPLv3+ with exceptions
-%description suruma
+Obsoletes: %{name}-suruma < 04.1-3
+%description -n %{fontname}-suruma-fonts
 The smc-fonts-suruma package contains fonts for the display of
 traditional Malayalam Scripts.
 
-%package kalyani
+%package -n %{fontname}-kalyani-fonts
 Summary: Open Type Fonts for Malayalam script
 Group: User Interface/X
 Requires: %{name}-common = %{version}-%{release}
 License: GPLv3+ with exceptions
-%description kalyani
+Obsoletes: %{name}-kalyani < 04-1.3
+%description -n %{fontname}-kalyani-fonts
 The smc-fonts-suruma package contains fonts for the display of
 new Malayalam Scripts.
 
-%package anjalioldlipi
+%package -n %{fontname}-anjalioldlipi-fonts
 Summary: Open Type Fonts for Malayalam script
 Group: User Interface/X
 Requires: %{name}-common = %{version}-%{release}
 License: GPLv3+ with exceptions
-%description anjalioldlipi
+Obsoletes: %{name}-anjalioldlipi < 04.1-3
+%description -n %{fontname}-anjalioldlipi-fonts
 The smc-fonts-suruma package contains fonts for the display of
 traditional Malayalam Scripts.
 
@@ -137,6 +144,9 @@
 %dir %{_fontdir}
 
 %changelog
+* Sat Jan 17 2009 Rajeesh K Nambiar <rajeeshknambiar at gmail.com> 04.1-3
+- update for new font guidelines
+
 * Tue Jan 06 2009 Pravin Satpute <psatpute at redhat.com> 04.1-2
 - bugfix 477458
 - updated spec



From mtasaka at fedoraproject.org  Sat Jan 17 05:38:19 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Sat, 17 Jan 2009 05:38:19 +0000 (UTC)
Subject: rpms/cairo-dock/devel cairo-dock.spec,1.136,1.137
Message-ID: <20090117053819.CA1557012B@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/cairo-dock/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2562

Modified Files:
	cairo-dock.spec 
Log Message:



Index: cairo-dock.spec
===================================================================
RCS file: /cvs/extras/rpms/cairo-dock/devel/cairo-dock.spec,v
retrieving revision 1.136
retrieving revision 1.137
diff -u -r1.136 -r1.137
--- cairo-dock.spec	17 Jan 2009 05:21:05 -0000	1.136
+++ cairo-dock.spec	17 Jan 2009 05:37:49 -0000	1.137
@@ -265,6 +265,9 @@
 %{__sed} -i.gettext \
 	-e '/^GETTEXT_PACKAGE/s|@GETTEXT_PACKAGE@|@GETTEXT_WEBLETS@|' \
 	po/Makefile.in.in
+
+## Need check
+sed -i.tmp '/cairo_dock_build_dialog/d' src/applet-*.c
 cd ..
 
 



From mclasen at fedoraproject.org  Sat Jan 17 05:43:29 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Sat, 17 Jan 2009 05:43:29 +0000 (UTC)
Subject: rpms/control-center/F-10 notification-theme.patch, 1.5,
	1.6 control-center.spec, 1.406, 1.407
Message-ID: <20090117054329.635A17012B@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/control-center/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3073

Modified Files:
	control-center.spec 
Added Files:
	notification-theme.patch 
Log Message:
Make notification theme setting work better


notification-theme.patch:

Index: notification-theme.patch
===================================================================
RCS file: notification-theme.patch
diff -N notification-theme.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ notification-theme.patch	17 Jan 2009 05:42:59 -0000	1.6
@@ -0,0 +1,23 @@
+diff -up gnome-control-center-2.24.0.1/capplets/common/gnome-theme-apply.c.notification-theme gnome-control-center-2.24.0.1/capplets/common/gnome-theme-apply.c
+--- gnome-control-center-2.24.0.1/capplets/common/gnome-theme-apply.c.notification-theme	2009-01-17 00:39:18.000000000 -0500
++++ gnome-control-center-2.24.0.1/capplets/common/gnome-theme-apply.c	2009-01-17 00:40:30.000000000 -0500
+@@ -43,6 +43,7 @@ gnome_meta_theme_set (GnomeThemeMetaInfo
+ {
+   GConfClient *client;
+   gchar *old_key;
++  gchar *new_key;
+   gint old_key_int;
+   GnomeWindowManager *window_manager;
+   GnomeWMSettings wm_settings;
+@@ -100,7 +101,10 @@ gnome_meta_theme_set (GnomeThemeMetaInfo
+   g_free (old_key);
+ 
+   /* set the notification theme */
+-  if (meta_theme_info->notification_theme_name != NULL)
++  new_key = meta_theme_info->notification_theme_name;
++  if (new_key == NULL)
++    new_key = "standard";
++  if (compare (old_key, new_key))
+     {
+       old_key = gconf_client_get_string (client, NOTIFICATION_THEME_KEY, NULL);
+       if (compare (old_key, meta_theme_info->notification_theme_name))


Index: control-center.spec
===================================================================
RCS file: /cvs/pkgs/rpms/control-center/F-10/control-center.spec,v
retrieving revision 1.406
retrieving revision 1.407
diff -u -r1.406 -r1.407
--- control-center.spec	6 Nov 2008 23:55:45 -0000	1.406
+++ control-center.spec	17 Jan 2009 05:42:58 -0000	1.407
@@ -22,7 +22,7 @@
 Summary: GNOME Control Center
 Name: control-center
 Version: 2.24.0.1
-Release: 9%{?dist}
+Release: 10%{?dist}
 Epoch: 1
 License: GPLv2+ and GFDL
 Group: User Interface/Desktops
@@ -61,6 +61,9 @@
 
 Patch32: display-no-help.patch
 
+# http://bugzilla.gnome.org/show_bug.cgi?id=546036
+Patch33: notification-theme.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
@@ -193,6 +196,7 @@
 %patch30 -p1 -b .default-layout-toggle
 %patch31 -p1 -b .editable-sections
 %patch32 -p1 -b .display-no-help
+%patch33 -p1 -b .notification-theme
 
 # vendor configuration patches
 %patch95 -p1 -b .passwd
@@ -362,6 +366,9 @@
 %dir %{_datadir}/gnome-control-center/keybindings
 
 %changelog
+* Sat Jan 17 2009 Matthias Clasen <mclasen at redhat.com> - 2.24.0.1-10
+- Make notification theme setting work better 
+
 * Thu Nov  6 2008 Matthias Clasen <mclasen at redhat.com> - 2.24.0.1-9
 - Remove a nonworking help button (#470375)
 



From mclasen at fedoraproject.org  Sat Jan 17 05:46:17 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Sat, 17 Jan 2009 05:46:17 +0000 (UTC)
Subject: rpms/control-center/devel notification-theme.patch, 1.5,
	1.6 control-center.spec, 1.425, 1.426
Message-ID: <20090117054617.D829C7012B@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/control-center/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4056

Modified Files:
	control-center.spec 
Added Files:
	notification-theme.patch 
Log Message:
Make notification theme switching work better


notification-theme.patch:

Index: notification-theme.patch
===================================================================
RCS file: notification-theme.patch
diff -N notification-theme.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ notification-theme.patch	17 Jan 2009 05:45:46 -0000	1.6
@@ -0,0 +1,23 @@
+diff -up gnome-control-center-2.24.0.1/capplets/common/gnome-theme-apply.c.notification-theme gnome-control-center-2.24.0.1/capplets/common/gnome-theme-apply.c
+--- gnome-control-center-2.24.0.1/capplets/common/gnome-theme-apply.c.notification-theme	2009-01-17 00:39:18.000000000 -0500
++++ gnome-control-center-2.24.0.1/capplets/common/gnome-theme-apply.c	2009-01-17 00:40:30.000000000 -0500
+@@ -43,6 +43,7 @@ gnome_meta_theme_set (GnomeThemeMetaInfo
+ {
+   GConfClient *client;
+   gchar *old_key;
++  gchar *new_key;
+   gint old_key_int;
+   GnomeWindowManager *window_manager;
+   GnomeWMSettings wm_settings;
+@@ -100,7 +101,10 @@ gnome_meta_theme_set (GnomeThemeMetaInfo
+   g_free (old_key);
+ 
+   /* set the notification theme */
+-  if (meta_theme_info->notification_theme_name != NULL)
++  new_key = meta_theme_info->notification_theme_name;
++  if (new_key == NULL)
++    new_key = "standard";
++  if (compare (old_key, new_key))
+     {
+       old_key = gconf_client_get_string (client, NOTIFICATION_THEME_KEY, NULL);
+       if (compare (old_key, meta_theme_info->notification_theme_name))


Index: control-center.spec
===================================================================
RCS file: /cvs/pkgs/rpms/control-center/devel/control-center.spec,v
retrieving revision 1.425
retrieving revision 1.426
diff -u -r1.425 -r1.426
--- control-center.spec	18 Dec 2008 19:43:47 -0000	1.425
+++ control-center.spec	17 Jan 2009 05:45:46 -0000	1.426
@@ -22,7 +22,7 @@
 Summary: Utilities to configure the GNOME desktop
 Name: control-center
 Version: 2.25.3
-Release: 1%{?dist}
+Release: 2%{?dist}
 Epoch: 1
 License: GPLv2+ and GFDL
 Group: User Interface/Desktops
@@ -46,6 +46,9 @@
 
 Patch32: display-no-help.patch
 
+# http://bugzilla.gnome.org/show_bug.cgi?id=546036
+Patch33: notification-theme.patch
+
 # call the Fedora/RHEL graphical passwd changing apps
 Patch95: gnome-control-center-2.25.2-passwd.patch
 Patch96: gnome-control-center-2.25.2-gecos.patch
@@ -166,6 +169,7 @@
 %patch25 -p1 -b .ta-schema
 %patch30 -p1 -b .default-layout-toggle
 %patch32 -p1 -b .display-no-help
+%patch33 -p1 -b .notification-theme
 
 # vendor configuration patches
 %patch95 -p1 -b .passwd
@@ -340,6 +344,9 @@
 %dir %{_datadir}/gnome-control-center/keybindings
 
 %changelog
+* Sat Jan 17 2009 Matthias Clasen  <mclasen at redhat.com> - 2.25.3-2
+Make notification theme changing work better
+
 * Thu Dec 18 2008 - Bastien Nocera <bnocera at redhat.com> - 2.25.3-1
 - Update to 2.25.3
 - Drop upstreamed patches



From mclasen at fedoraproject.org  Sat Jan 17 06:01:48 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Sat, 17 Jan 2009 06:01:48 +0000 (UTC)
Subject: rpms/control-center/F-10 control-center.spec, 1.407,
	1.408 notification-theme.patch, 1.6, 1.7
Message-ID: <20090117060148.5A7AB7012B@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/control-center/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5185

Modified Files:
	control-center.spec notification-theme.patch 
Log Message:
fix the patch



Index: control-center.spec
===================================================================
RCS file: /cvs/pkgs/rpms/control-center/F-10/control-center.spec,v
retrieving revision 1.407
retrieving revision 1.408
diff -u -r1.407 -r1.408
--- control-center.spec	17 Jan 2009 05:42:58 -0000	1.407
+++ control-center.spec	17 Jan 2009 06:01:17 -0000	1.408
@@ -22,7 +22,7 @@
 Summary: GNOME Control Center
 Name: control-center
 Version: 2.24.0.1
-Release: 10%{?dist}
+Release: 11%{?dist}
 Epoch: 1
 License: GPLv2+ and GFDL
 Group: User Interface/Desktops
@@ -366,7 +366,7 @@
 %dir %{_datadir}/gnome-control-center/keybindings
 
 %changelog
-* Sat Jan 17 2009 Matthias Clasen <mclasen at redhat.com> - 2.24.0.1-10
+* Sat Jan 17 2009 Matthias Clasen <mclasen at redhat.com> - 2.24.0.1-11
 - Make notification theme setting work better 
 
 * Thu Nov  6 2008 Matthias Clasen <mclasen at redhat.com> - 2.24.0.1-9

notification-theme.patch:

Index: notification-theme.patch
===================================================================
RCS file: /cvs/pkgs/rpms/control-center/F-10/notification-theme.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- notification-theme.patch	17 Jan 2009 05:42:59 -0000	1.6
+++ notification-theme.patch	17 Jan 2009 06:01:17 -0000	1.7
@@ -1,6 +1,6 @@
 diff -up gnome-control-center-2.24.0.1/capplets/common/gnome-theme-apply.c.notification-theme gnome-control-center-2.24.0.1/capplets/common/gnome-theme-apply.c
---- gnome-control-center-2.24.0.1/capplets/common/gnome-theme-apply.c.notification-theme	2009-01-17 00:39:18.000000000 -0500
-+++ gnome-control-center-2.24.0.1/capplets/common/gnome-theme-apply.c	2009-01-17 00:40:30.000000000 -0500
+--- gnome-control-center-2.24.0.1/capplets/common/gnome-theme-apply.c.notification-theme	2008-09-24 12:36:22.000000000 -0400
++++ gnome-control-center-2.24.0.1/capplets/common/gnome-theme-apply.c	2009-01-17 00:57:26.000000000 -0500
 @@ -43,6 +43,7 @@ gnome_meta_theme_set (GnomeThemeMetaInfo
  {
    GConfClient *client;
@@ -9,7 +9,7 @@
    gint old_key_int;
    GnomeWindowManager *window_manager;
    GnomeWMSettings wm_settings;
-@@ -100,7 +101,10 @@ gnome_meta_theme_set (GnomeThemeMetaInfo
+@@ -100,15 +101,15 @@ gnome_meta_theme_set (GnomeThemeMetaInfo
    g_free (old_key);
  
    /* set the notification theme */
@@ -17,7 +17,18 @@
 +  new_key = meta_theme_info->notification_theme_name;
 +  if (new_key == NULL)
 +    new_key = "standard";
++  old_key = gconf_client_get_string (client, NOTIFICATION_THEME_KEY, NULL);
 +  if (compare (old_key, new_key))
      {
-       old_key = gconf_client_get_string (client, NOTIFICATION_THEME_KEY, NULL);
-       if (compare (old_key, meta_theme_info->notification_theme_name))
+-      old_key = gconf_client_get_string (client, NOTIFICATION_THEME_KEY, NULL);
+-      if (compare (old_key, meta_theme_info->notification_theme_name))
+-        {
+-          gconf_client_set_string (client, NOTIFICATION_THEME_KEY, meta_theme_info->notification_theme_name, NULL);
+-        }
+-      g_free (old_key);
++       gconf_client_set_string (client, NOTIFICATION_THEME_KEY, new_key, NULL);
+     }
++  g_free (old_key);
+ 
+   /* Set the cursor theme key */
+ #ifdef HAVE_XCURSOR



From mclasen at fedoraproject.org  Sat Jan 17 06:02:19 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Sat, 17 Jan 2009 06:02:19 +0000 (UTC)
Subject: rpms/control-center/devel control-center.spec, 1.426,
	1.427 notification-theme.patch, 1.6, 1.7
Message-ID: <20090117060219.1B76C7012B@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/control-center/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5262

Modified Files:
	control-center.spec notification-theme.patch 
Log Message:
fix patch



Index: control-center.spec
===================================================================
RCS file: /cvs/pkgs/rpms/control-center/devel/control-center.spec,v
retrieving revision 1.426
retrieving revision 1.427
diff -u -r1.426 -r1.427
--- control-center.spec	17 Jan 2009 05:45:46 -0000	1.426
+++ control-center.spec	17 Jan 2009 06:01:48 -0000	1.427
@@ -22,7 +22,7 @@
 Summary: Utilities to configure the GNOME desktop
 Name: control-center
 Version: 2.25.3
-Release: 2%{?dist}
+Release: 3%{?dist}
 Epoch: 1
 License: GPLv2+ and GFDL
 Group: User Interface/Desktops
@@ -344,8 +344,8 @@
 %dir %{_datadir}/gnome-control-center/keybindings
 
 %changelog
-* Sat Jan 17 2009 Matthias Clasen  <mclasen at redhat.com> - 2.25.3-2
-Make notification theme changing work better
+* Sat Jan 17 2009 Matthias Clasen  <mclasen at redhat.com> - 2.25.3-3
+- Make notification theme changing work better
 
 * Thu Dec 18 2008 - Bastien Nocera <bnocera at redhat.com> - 2.25.3-1
 - Update to 2.25.3

notification-theme.patch:

Index: notification-theme.patch
===================================================================
RCS file: /cvs/pkgs/rpms/control-center/devel/notification-theme.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- notification-theme.patch	17 Jan 2009 05:45:46 -0000	1.6
+++ notification-theme.patch	17 Jan 2009 06:01:48 -0000	1.7
@@ -1,6 +1,6 @@
 diff -up gnome-control-center-2.24.0.1/capplets/common/gnome-theme-apply.c.notification-theme gnome-control-center-2.24.0.1/capplets/common/gnome-theme-apply.c
---- gnome-control-center-2.24.0.1/capplets/common/gnome-theme-apply.c.notification-theme	2009-01-17 00:39:18.000000000 -0500
-+++ gnome-control-center-2.24.0.1/capplets/common/gnome-theme-apply.c	2009-01-17 00:40:30.000000000 -0500
+--- gnome-control-center-2.24.0.1/capplets/common/gnome-theme-apply.c.notification-theme	2008-09-24 12:36:22.000000000 -0400
++++ gnome-control-center-2.24.0.1/capplets/common/gnome-theme-apply.c	2009-01-17 00:57:26.000000000 -0500
 @@ -43,6 +43,7 @@ gnome_meta_theme_set (GnomeThemeMetaInfo
  {
    GConfClient *client;
@@ -9,7 +9,7 @@
    gint old_key_int;
    GnomeWindowManager *window_manager;
    GnomeWMSettings wm_settings;
-@@ -100,7 +101,10 @@ gnome_meta_theme_set (GnomeThemeMetaInfo
+@@ -100,15 +101,15 @@ gnome_meta_theme_set (GnomeThemeMetaInfo
    g_free (old_key);
  
    /* set the notification theme */
@@ -17,7 +17,18 @@
 +  new_key = meta_theme_info->notification_theme_name;
 +  if (new_key == NULL)
 +    new_key = "standard";
++  old_key = gconf_client_get_string (client, NOTIFICATION_THEME_KEY, NULL);
 +  if (compare (old_key, new_key))
      {
-       old_key = gconf_client_get_string (client, NOTIFICATION_THEME_KEY, NULL);
-       if (compare (old_key, meta_theme_info->notification_theme_name))
+-      old_key = gconf_client_get_string (client, NOTIFICATION_THEME_KEY, NULL);
+-      if (compare (old_key, meta_theme_info->notification_theme_name))
+-        {
+-          gconf_client_set_string (client, NOTIFICATION_THEME_KEY, meta_theme_info->notification_theme_name, NULL);
+-        }
+-      g_free (old_key);
++       gconf_client_set_string (client, NOTIFICATION_THEME_KEY, new_key, NULL);
+     }
++  g_free (old_key);
+ 
+   /* Set the cursor theme key */
+ #ifdef HAVE_XCURSOR



From mebrown at fedoraproject.org  Sat Jan 17 06:07:20 2009
From: mebrown at fedoraproject.org (Michael E Brown)
Date: Sat, 17 Jan 2009 06:07:20 +0000 (UTC)
Subject: rpms/libsmbios/devel .cvsignore, 1.12, 1.13 libsmbios.spec, 1.15,
	1.16 sources, 1.12, 1.13
Message-ID: <20090117060720.B7CB47012B@cvs1.fedora.phx.redhat.com>

Author: mebrown

Update of /cvs/extras/rpms/libsmbios/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5818

Modified Files:
	.cvsignore libsmbios.spec sources 
Log Message:
* Thu Jan 15 2009 Michael E Brown <michael_e_brown at dell.com> - 2.2.8-1
- revert change in upstream renaming rpm to libsmbios2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libsmbios/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	16 Jan 2009 02:11:06 -0000	1.12
+++ .cvsignore	17 Jan 2009 06:06:50 -0000	1.13
@@ -1 +1 @@
-libsmbios-2.2.7.tar.bz2
+libsmbios-2.2.8.tar.bz2


Index: libsmbios.spec
===================================================================
RCS file: /cvs/extras/rpms/libsmbios/devel/libsmbios.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- libsmbios.spec	16 Jan 2009 02:11:06 -0000	1.15
+++ libsmbios.spec	17 Jan 2009 06:06:50 -0000	1.16
@@ -3,11 +3,20 @@
 # these are all substituted by autoconf
 %define major 2
 %define minor 2
-%define micro 7
+%define micro 8
 %define extra %{nil}
-%define lang_dom  libsmbios2-2.2
+%define lang_dom  libsmbios-2.2
 %define release_version %{major}.%{minor}.%{micro}%{extra}
 
+%define release_name libsmbios
+%define other_name   libsmbios2
+
+# suse naming conventions
+%if 0%{?suse_version}
+%define release_name libsmbios2
+%define other_name   libsmbios
+%endif
+
 # required by suse build system
 # norootforbuild
 
@@ -54,21 +63,21 @@
 # fedora: use the !? code below to define when it isnt already
 %{!?py_sitedir: %define py_sitedir %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
-Name: libsmbios2
+Name: %{release_name}
 Version: %{release_version}
 Release: 1%{?dist}
 License: GPLv2+ or OSL 2.1
 Summary: Libsmbios C/C++ shared libraries
 Group: System Environment/Libraries
-Source: http://linux.dell.com/libsmbios/download/libsmbios/libsmbios-%{version}/libsmbios-%{version}.tar.bz2
+Source: http://linux.dell.com/libsmbios/download/libsmbios/libsmbios-%{version}/libsmbios-%{version}.tar.gz
 URL: http://linux.dell.com/libsmbios/main
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: strace libxml2-devel python-devel gcc-c++ gettext valgrind doxygen %{cppunit_BR} %{fdupes_BR}
-Provides: libsmbios-libs = 0:%{version}-%{release}
 # uncomment for official fedora
-#Obsoletes: libsmbios-libs < 2.0.0
-Obsoletes: libsmbios < 0:%{version}-%{release}
-Provides: libsmbios = 0:%{version}-%{release}
+Obsoletes: libsmbios-libs < 2.0.0
+Provides: libsmbios-libs = 0:%{version}-%{release}
+Obsoletes: %{other_name} <= 0:%{version}-%{release}
+Provides: %{other_name}  0:%{version}-%{release}
 
 # libsmbios only ever makes sense on intel compatible arches
 # no DMI tables on ppc, s390, etc.
@@ -88,7 +97,7 @@
 %package -n python-smbios
 Summary: Python interface to Libsmbios C library
 Group: System Environment/Libraries
-Requires: libsmbios2 = %{version}-%{release}
+Requires: %{release_name} = 0:%{version}-%{release}
 Requires: python %{ctypes_BR}
 
 %description -n python-smbios
@@ -110,7 +119,7 @@
 %package -n smbios-utils-bin
 Summary: Binary utilities that use libsmbios
 Group: Applications/System
-Requires: libsmbios2 = %{version}-%{release}
+Requires: %{release_name} = 0:%{version}-%{release}
 
 %description -n smbios-utils-bin
 Get BIOS information, such as System product name, product id, service tag and
@@ -127,14 +136,15 @@
 cards/bluetooth on Dell laptops. Set BIOS password on select Dell systems.
 Update BIOS on select Dell systems. Set LCD brightness on select Dell laptops.
 
-%package -n libsmbios2-devel
+# name the devel package libsmbios-devel regardless of package name, per suse/fedora convention
+%package -n libsmbios-devel
 Summary: Development headers and archives
 Group: Development/Libraries
-Requires: libsmbios = %{version}-%{release}
-Provides: libsmbios-devel = %{version}-%{release}
-Obsoletes: libsmbios-devel < %{version}-%{release}
+Requires: %{release_name} = 0:%{version}-%{release}
+Provides: libsmbios2-devel = %{version}-%{release}
+Obsoletes: libsmbios2-devel < %{version}-%{release}
 
-%description -n libsmbios2-devel
+%description -n libsmbios-devel
 Libsmbios is a library and utilities that can be used by client programs to get
 information from standard BIOS tables, such as the SMBIOS table.
 
@@ -157,7 +167,10 @@
 echo '../configure "$@"' > configure
 chmod +x ./configure
 
-%configure RELEASE_MAJOR=%{major} RELEASE_MINOR=%{minor} RELEASE_MICRO=%{micro} RELEASE_EXTRA=%{extra} CFLAGS="%{optflags}" CXXFLAGS="%{optflags}"
+%configure \
+    --disable-static    \
+    RELEASE_MAJOR=%{major} RELEASE_MINOR=%{minor} RELEASE_MICRO=%{micro} RELEASE_EXTRA=%{extra} \
+    CFLAGS="%{optflags}" CXXFLAGS="%{optflags}"
 mkdir -p out/libsmbios_c
 mkdir -p out/libsmbios_c++
 make -e %{?_smp_mflags} 2>&1 | tee build.log
@@ -204,7 +217,7 @@
 mkdir -p %{buildroot}/usr/include
 cp -a $TOPDIR/src/include/*  %{buildroot}/usr/include/
 rm -f %{buildroot}/%{_libdir}/lib*.la
-find %{buildroot}/usr/include -exec touch -r $TOPDIR/configure.ac {} \;
+find %{buildroot}/usr/include out/libsmbios_c++ out/libsmbios_c -exec touch -r $TOPDIR/configure.ac {} \;
 
 # backwards compatible:
 ln -s ../sbin/dellWirelessCtl %{buildroot}/usr/bin/dellWirelessCtl
@@ -221,10 +234,10 @@
 %clean
 rm -rf %{buildroot}
 
-%post   -n libsmbios2   -p /sbin/ldconfig
-%postun -n libsmbios2   -p /sbin/ldconfig
+%post   -n %{release_name}   -p /sbin/ldconfig
+%postun -n %{release_name}   -p /sbin/ldconfig
 
-%files -n libsmbios2 -f _build/%{lang_dom}.lang
+%files -n %{release_name} -f _build/%{lang_dom}.lang
 %defattr(-,root,root,-)
 %{_libdir}/libsmbios_c.so.*
 %{_libdir}/libsmbios.so.*
@@ -234,14 +247,12 @@
 %doc COPYING-GPL COPYING-OSL README
 %{py_sitedir}/*
 
-%files -n libsmbios2-devel -f _build/buildlogs.txt
+%files -n libsmbios-devel -f _build/buildlogs.txt
 %defattr(-,root,root,-)
 %doc COPYING-GPL COPYING-OSL README src/bin/getopts_LICENSE.txt src/include/smbios/config/boost_LICENSE_1_0_txt
 /usr/include/smbios
 /usr/include/smbios_c
-%{_libdir}/libsmbios.a
 %{_libdir}/libsmbios.so
-%{_libdir}/libsmbios_c.a
 %{_libdir}/libsmbios_c.so
 %doc _build/out/libsmbios_c++
 %doc _build/out/libsmbios_c
@@ -312,6 +323,9 @@
 %{_datadir}/smbios-utils
 
 %changelog
+* Thu Jan 15 2009 Michael E Brown <michael_e_brown at dell.com> - 2.2.8-1
+- revert change in upstream renaming rpm to libsmbios2
+
 * Thu Jan 15 2009 Michael E Brown <michael_e_brown at dell.com> - 2.2.7-1
 - change source to bz2 format
 - Update to latest upstream release. Many changes in the new release:


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libsmbios/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	16 Jan 2009 02:11:06 -0000	1.12
+++ sources	17 Jan 2009 06:06:50 -0000	1.13
@@ -1 +1 @@
-6a016ca6223fd98bda04fca514bb63d4  libsmbios-2.2.7.tar.bz2
+063418dc6ff5137373c6cf9022ec3622  libsmbios-2.2.8.tar.bz2



From mebrown at fedoraproject.org  Sat Jan 17 06:09:39 2009
From: mebrown at fedoraproject.org (Michael E Brown)
Date: Sat, 17 Jan 2009 06:09:39 +0000 (UTC)
Subject: rpms/libsmbios/devel libsmbios.spec,1.16,1.17
Message-ID: <20090117060939.5828E7012B@cvs1.fedora.phx.redhat.com>

Author: mebrown

Update of /cvs/extras/rpms/libsmbios/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5996

Modified Files:
	libsmbios.spec 
Log Message:
change spec file to point at bz2 source.


Index: libsmbios.spec
===================================================================
RCS file: /cvs/extras/rpms/libsmbios/devel/libsmbios.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- libsmbios.spec	17 Jan 2009 06:06:50 -0000	1.16
+++ libsmbios.spec	17 Jan 2009 06:09:08 -0000	1.17
@@ -69,7 +69,7 @@
 License: GPLv2+ or OSL 2.1
 Summary: Libsmbios C/C++ shared libraries
 Group: System Environment/Libraries
-Source: http://linux.dell.com/libsmbios/download/libsmbios/libsmbios-%{version}/libsmbios-%{version}.tar.gz
+Source: http://linux.dell.com/libsmbios/download/libsmbios/libsmbios-%{version}/libsmbios-%{version}.tar.bz2
 URL: http://linux.dell.com/libsmbios/main
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: strace libxml2-devel python-devel gcc-c++ gettext valgrind doxygen %{cppunit_BR} %{fdupes_BR}



From michich at fedoraproject.org  Sat Jan 17 06:41:52 2009
From: michich at fedoraproject.org (Michal Schmidt)
Date: Sat, 17 Jan 2009 06:41:52 +0000 (UTC)
Subject: rpms/jabbim/devel jabbim.spec,1.25,1.26
Message-ID: <20090117064152.D0FC97012B@cvs1.fedora.phx.redhat.com>

Author: michich

Update of /cvs/pkgs/rpms/jabbim/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8951

Modified Files:
	jabbim.spec 
Log Message:
* Sat Jan 17 2009 Michal Schmidt <mschmidt at redhat.com> - 0.4.3-5
- Don't require python-sqlite2. Python >= 2.5 has sqlite support already.



Index: jabbim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jabbim/devel/jabbim.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- jabbim.spec	1 Dec 2008 15:00:32 -0000	1.25
+++ jabbim.spec	17 Jan 2009 06:41:22 -0000	1.26
@@ -1,6 +1,6 @@
 Name:		jabbim
 Version:	0.4.3
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	Jabber client for mere mortals
 
 Group:		Applications/Internet
@@ -24,7 +24,6 @@
 Requires:	python-twisted-names
 Requires:	python-twisted-web
 Requires:	python-twisted-words
-Requires:	python-sqlite2
 Requires:	pyOpenSSL
 
 %define jabbimdata %{_datadir}/jabbim
@@ -114,6 +113,9 @@
 
 
 %changelog
+* Sat Jan 17 2009 Michal Schmidt <mschmidt at redhat.com> - 0.4.3-5
+- Don't require python-sqlite2. Python >= 2.5 has sqlite support already.
+
 * Mon Dec 01 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 0.4.3-4
 - Rebuild for Python 2.6
 



From michich at fedoraproject.org  Sat Jan 17 06:47:58 2009
From: michich at fedoraproject.org (Michal Schmidt)
Date: Sat, 17 Jan 2009 06:47:58 +0000 (UTC)
Subject: rpms/jabbim/F-10 jabbim.spec,1.24,1.25
Message-ID: <20090117064758.9281C7012B@cvs1.fedora.phx.redhat.com>

Author: michich

Update of /cvs/pkgs/rpms/jabbim/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10027

Modified Files:
	jabbim.spec 
Log Message:
* Sat Jan 17 2009 Michal Schmidt <mschmidt at redhat.com> - 0.4.3-5
- Don't require python-sqlite2. Python >= 2.5 has sqlite support already.



Index: jabbim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jabbim/F-10/jabbim.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- jabbim.spec	15 Sep 2008 20:35:06 -0000	1.24
+++ jabbim.spec	17 Jan 2009 06:47:28 -0000	1.25
@@ -1,6 +1,6 @@
 Name:		jabbim
 Version:	0.4.3
-Release:	3%{?dist}
+Release:	5%{?dist}
 Summary:	Jabber client for mere mortals
 
 Group:		Applications/Internet
@@ -24,7 +24,6 @@
 Requires:	python-twisted-names
 Requires:	python-twisted-web
 Requires:	python-twisted-words
-Requires:	python-sqlite2
 Requires:	pyOpenSSL
 
 %define jabbimdata %{_datadir}/jabbim
@@ -114,6 +113,9 @@
 
 
 %changelog
+* Sat Jan 17 2009 Michal Schmidt <mschmidt at redhat.com> - 0.4.3-5
+- Don't require python-sqlite2. Python >= 2.5 has sqlite support already.
+
 * Mon Sep 15 2008 Michal Schmidt <mschmidt at redhat.com> - 0.4.3-3
 - Fix mistaken parentheses in the previous patch.
 



From michich at fedoraproject.org  Sat Jan 17 06:54:49 2009
From: michich at fedoraproject.org (Michal Schmidt)
Date: Sat, 17 Jan 2009 06:54:49 +0000 (UTC)
Subject: rpms/jabbim/F-9 jabbim-0.4-stringlists-in-QVariants.diff, NONE,
	1.1 jabbim.spec, 1.21, 1.22
Message-ID: <20090117065449.9DC3C7012B@cvs1.fedora.phx.redhat.com>

Author: michich

Update of /cvs/pkgs/rpms/jabbim/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10577

Modified Files:
	jabbim.spec 
Added Files:
	jabbim-0.4-stringlists-in-QVariants.diff 
Log Message:
sync changes from F-10 (QVariant bugfix, python-sqlite2 removal)

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
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
+++ 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/F-9/jabbim.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- jabbim.spec	3 Jul 2008 15:35:26 -0000	1.21
+++ jabbim.spec	17 Jan 2009 06:54:19 -0000	1.22
@@ -1,6 +1,6 @@
 Name:		jabbim
 Version:	0.4.3
-Release:	1%{?dist}
+Release:	5%{?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)
 
@@ -23,7 +24,6 @@
 Requires:	python-twisted-names
 Requires:	python-twisted-web
 Requires:	python-twisted-words
-Requires:	python-sqlite2
 Requires:	pyOpenSSL
 
 %define jabbimdata %{_datadir}/jabbim
@@ -38,6 +38,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 +113,16 @@
 
 
 %changelog
+* Sat Jan 17 2009 Michal Schmidt <mschmidt at redhat.com> - 0.4.3-5
+- Don't require python-sqlite2. Python >= 2.5 has sqlite support already.
+
+* 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.
+
 * 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 kevin at fedoraproject.org  Sat Jan 17 07:29:18 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 17 Jan 2009 07:29:18 +0000 (UTC)
Subject: rpms/exo/devel sources, 1.8, 1.9 .cvsignore, 1.8, 1.9 exo.spec, 1.29,
	1.30
Message-ID: <20090117072918.2A7DC7012B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/exo/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13796

Modified Files:
	sources .cvsignore exo.spec 
Log Message:
Update to 0.3.93



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/exo/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	13 Jan 2009 02:47:33 -0000	1.8
+++ sources	17 Jan 2009 07:28:47 -0000	1.9
@@ -1 +1 @@
-42f7e60ce8d8a6ba233a91c62a5d78bb  exo-0.3.92.tar.bz2
+5edbf2c2a2d7c43c7704b76a10cf46b8  exo-0.3.93.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/exo/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	13 Jan 2009 02:47:33 -0000	1.8
+++ .cvsignore	17 Jan 2009 07:28:47 -0000	1.9
@@ -1 +1 @@
-exo-0.3.92.tar.bz2
+exo-0.3.93.tar.bz2


Index: exo.spec
===================================================================
RCS file: /cvs/extras/rpms/exo/devel/exo.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- exo.spec	13 Jan 2009 02:47:33 -0000	1.29
+++ exo.spec	17 Jan 2009 07:28:47 -0000	1.30
@@ -2,13 +2,13 @@
 
 Summary: Application library for the Xfce desktop environment
 Name: exo
-Version: 0.3.92
+Version: 0.3.93
 Release: 1%{?dist}
 # libexo-hal exo-helper mount-notify and exo-mount are all GPLv2+
 # everything else is LGPLv2+
 License: LGPLv2+ and GPLv2+
 URL: http://xfce.org/
-Source0: http://www.xfce.org/archive/xfce-4.5.92/src/exo-%{version}.tar.bz2
+Source0: http://www.xfce.org/archive/xfce-4.5.93/src/exo-%{version}.tar.bz2
 Patch0: exo-0.3.0-x86_64-build.patch
 Group: System Environment/Libraries
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -97,6 +97,9 @@
 %{_datadir}/xfce4/doc/C
 %{_datadir}/xfce4/doc/ja
 %{_datadir}/xfce4/doc/fr
+%{_datadir}/xfce4/doc/id
+%{_datadir}/xfce4/doc/pt_BR
+%{_datadir}/xfce4/doc/tr
 %{_mandir}/man1/exo-csource.1.gz
 %{_mandir}/man1/exo-open.1.gz
 %{_bindir}/exo-csource
@@ -131,6 +134,9 @@
 %{python_sitearch}/pyexo.*
 
 %changelog
+* Tue Jan 13 2009 Kevin Fenzi <kevin at tummy.com> 0.3.93-1
+- Update to 0.3.93
+
 * Tue Dec 23 2008 Kevin Fenzi <kevin at tummy.com> 0.3.92-1
 - Update to 0.3.92
 



From kevin at fedoraproject.org  Sat Jan 17 07:50:12 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 17 Jan 2009 07:50:12 +0000 (UTC)
Subject: rpms/xfce4-settings/devel sources, 1.2, 1.3 .cvsignore, 1.2,
	1.3 xfce4-settings.spec, 1.1, 1.2
Message-ID: <20090117075012.C29947012B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce4-settings/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15514

Modified Files:
	sources .cvsignore xfce4-settings.spec 
Log Message:
Update to 4.5.93



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfce4-settings/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	13 Jan 2009 03:09:05 -0000	1.2
+++ sources	17 Jan 2009 07:49:42 -0000	1.3
@@ -1 +1 @@
-0e9f8ea8043a902353d4b5b1c0528e4b  xfce4-settings-4.5.92.tar.bz2
+3873c76afcb8f1d174381825fc0467cf  xfce4-settings-4.5.93.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfce4-settings/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	13 Jan 2009 03:09:05 -0000	1.2
+++ .cvsignore	17 Jan 2009 07:49:42 -0000	1.3
@@ -1 +1 @@
-xfce4-settings-4.5.92.tar.bz2
+xfce4-settings-4.5.93.tar.bz2


Index: xfce4-settings.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-settings/devel/xfce4-settings.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xfce4-settings.spec	13 Jan 2009 03:09:05 -0000	1.1
+++ xfce4-settings.spec	17 Jan 2009 07:49:42 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           xfce4-settings
-Version:        4.5.92
-Release:        2%{?dist}
+Version:        4.5.93
+Release:        1%{?dist}
 Summary:        Settings Manager for Xfce
 
 Group:          User Interface/Desktops
@@ -11,8 +11,11 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: gettext
-BuildRequires: exo-devel >= 0.3.92
-BuildRequires: libxfcegui4-devel >= 4.5.92
+BuildRequires: intltool
+BuildRequires: exo-devel >= 0.3.93
+BuildRequires: libxfcegui4-devel >= %{version}
+BuildRequires: libxfce4util-devel >= %{version}
+BuildRequires: xfconf-devel >= %{version}
 BuildRequires: libglade2-devel
 BuildRequires: libwnck-devel
 BuildRequires: desktop-file-utils >= 0.7
@@ -97,6 +100,9 @@
 %{_datadir}/applications/*.desktop
 
 %changelog
+* Tue Jan 13 2009 Kevin Fenzi <kevin at tummy.com> - 4.5.93-1
+- Update to 4.5.93
+
 * Sat Dec 27 2008 Kevin Fenzi <kevin at tummy.com> - 4.5.92-2
 - Cleaned up desktop-file-install
 - Added some BuildRequires. 



From kevin at fedoraproject.org  Sat Jan 17 08:04:50 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 17 Jan 2009 08:04:50 +0000 (UTC)
Subject: rpms/Thunar/devel sources, 1.7, 1.8 .cvsignore, 1.7, 1.8 Thunar.spec,
	1.18, 1.19
Message-ID: <20090117080450.CC3337012B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/Thunar/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16399

Modified Files:
	sources .cvsignore Thunar.spec 
Log Message:
Update to 4.5.93



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/Thunar/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	13 Jan 2009 05:08:20 -0000	1.7
+++ sources	17 Jan 2009 08:04:20 -0000	1.8
@@ -1 +1 @@
-8717e7e6125ff841dda4e9301889afd0  Thunar-0.9.92.tar.bz2
+8fb12c28284503929732dea8c185c413  Thunar-0.9.93.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/Thunar/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	13 Jan 2009 05:08:20 -0000	1.7
+++ .cvsignore	17 Jan 2009 08:04:20 -0000	1.8
@@ -1 +1 @@
-Thunar-0.9.92.tar.bz2
+Thunar-0.9.93.tar.bz2


Index: Thunar.spec
===================================================================
RCS file: /cvs/extras/rpms/Thunar/devel/Thunar.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- Thunar.spec	13 Jan 2009 05:08:20 -0000	1.18
+++ Thunar.spec	17 Jan 2009 08:04:20 -0000	1.19
@@ -1,10 +1,10 @@
 Summary: Thunar File Manager
 Name: Thunar
-Version: 0.9.92
+Version: 0.9.93
 Release: 1%{?dist}
 License: GPLv2+
 URL: http://thunar.xfce.org/
-Source0: http://www.xfce.org/archive/xfce-4.4.2/src/Thunar-%{version}.tar.bz2
+Source0: http://www.xfce.org/archive/xfce-4.5.93/src/Thunar-%{version}.tar.bz2
 Source1: thunar-sendto-bluetooth.desktop
 Source2: thunar-sendto-audacious-playlist.desktop
 Group: User Interface/Desktops
@@ -198,6 +198,9 @@
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Tue Jan 13 2009 Kevin Fenzi <kevin at tummy.com> - 4.5.93-1
+- Update to 4.5.93
+
 * Fri Dec 26 2008 Kevin Fenzi <kevin at tummy.com> - 0.9.92-1
 - Update to 0.9.92
 



From kevin at fedoraproject.org  Sat Jan 17 08:20:46 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 17 Jan 2009 08:20:46 +0000 (UTC)
Subject: rpms/xfce4-appfinder/devel .cvsignore, 1.11, 1.12 sources, 1.11,
	1.12 xfce4-appfinder.spec, 1.18, 1.19
Message-ID: <20090117082046.B65727012B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce4-appfinder/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18083

Modified Files:
	.cvsignore sources xfce4-appfinder.spec 
Log Message:
Update to 4.5.93



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfce4-appfinder/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	13 Jan 2009 17:47:17 -0000	1.11
+++ .cvsignore	17 Jan 2009 08:20:16 -0000	1.12
@@ -1 +1 @@
-xfce4-appfinder-4.5.92.tar.bz2
+xfce4-appfinder-4.5.93.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfce4-appfinder/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	13 Jan 2009 17:47:17 -0000	1.11
+++ sources	17 Jan 2009 08:20:16 -0000	1.12
@@ -1 +1 @@
-e494cfe19c703d5b27a1b5feb9efcb11  xfce4-appfinder-4.5.92.tar.bz2
+75b37cd228cf85a85b36d227429fe9a3  xfce4-appfinder-4.5.93.tar.bz2


Index: xfce4-appfinder.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-appfinder/devel/xfce4-appfinder.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- xfce4-appfinder.spec	13 Jan 2009 17:47:17 -0000	1.18
+++ xfce4-appfinder.spec	17 Jan 2009 08:20:16 -0000	1.19
@@ -1,6 +1,6 @@
 Summary: Appfinder for the Xfce4 Desktop Environment
 Name: xfce4-appfinder
-Version: 4.5.92
+Version: 4.5.93
 Release: 1%{?dist}
 License: GPLv2+
 URL: http://www.xfce.org/
@@ -55,6 +55,9 @@
 %{_datadir}/icons/hicolor/48x48/apps/xfce4-appfinder.png
 
 %changelog
+* Tue Jan 13 2009 Kevin Fenzi <kevin at tummy.com> - 4.5.93-1
+- Update to 4.5.93
+
 * Tue Dec 23 2008 Kevin Fenzi <kevin at tummy.com> - 4.5.92-1
 - Update to 4.5.92
 



From awjb at fedoraproject.org  Sat Jan 17 08:22:39 2009
From: awjb at fedoraproject.org (Andreas Bierfert)
Date: Sat, 17 Jan 2009 08:22:39 +0000 (UTC)
Subject: rpms/wine/EL-5 .cvsignore, 1.45, 1.46 sources, 1.46,
	1.47 wine-desktop-mime.patch, 1.1, 1.2 wine.spec, 1.61, 1.62
Message-ID: <20090117082239.39D927012B@cvs1.fedora.phx.redhat.com>

Author: awjb

Update of /cvs/pkgs/rpms/wine/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18368

Modified Files:
	.cvsignore sources wine-desktop-mime.patch wine.spec 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/wine/EL-5/.cvsignore,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- .cvsignore	17 Jun 2008 19:10:07 -0000	1.45
+++ .cvsignore	17 Jan 2009 08:22:08 -0000	1.46
@@ -1 +1 @@
-wine-1.0-fe.tar.bz2
+wine-1.0.1-fe.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/wine/EL-5/sources,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- sources	17 Jun 2008 19:10:07 -0000	1.46
+++ sources	17 Jan 2009 08:22:08 -0000	1.47
@@ -1 +1 @@
-8131688557a6168bf9248e48ee9e90ad  wine-1.0-fe.tar.bz2
+4693261648786cd3a334880183260ac1  wine-1.0.1-fe.tar.bz2

wine-desktop-mime.patch:

Index: wine-desktop-mime.patch
===================================================================
RCS file: /cvs/pkgs/rpms/wine/EL-5/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:10:07 -0000	1.1
+++ wine-desktop-mime.patch	17 Jan 2009 08:22:08 -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	2009-01-17 09:09:01.000000000 +0100
++++ tools/wine.desktop	2009-01-17 09:09:33.000000000 +0100
+@@ -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/EL-5/wine.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- wine.spec	17 Jun 2008 19:10:07 -0000	1.61
+++ wine.spec	17 Jan 2009 08:22:08 -0000	1.62
@@ -1,5 +1,5 @@
 Name:		wine
-Version:	1.0
+Version:	1.0.1
 Release:	1%{?dist}
 Summary:	A Windows 16/32/64 bit emulator
 
@@ -814,6 +814,10 @@
 %{_libdir}/wine/*.def
 
 %changelog
+* Thu Oct 23 2008 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- 1.0.1-1
+- version upgrade
+
 * Tue Jun 17 2008 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 - 1.0-1
 - version upgrade (#446311,#417161)



From kevin at fedoraproject.org  Sat Jan 17 08:23:37 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 17 Jan 2009 08:23:37 +0000 (UTC)
Subject: rpms/xfce4-session/devel sources, 1.11, 1.12 .cvsignore, 1.11,
	1.12 xfce4-session.spec, 1.23, 1.24
Message-ID: <20090117082337.D3EA67012B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce4-session/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18540

Modified Files:
	sources .cvsignore xfce4-session.spec 
Log Message:
Update to 4.5.93



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfce4-session/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	13 Jan 2009 22:12:42 -0000	1.11
+++ sources	17 Jan 2009 08:23:07 -0000	1.12
@@ -1 +1 @@
-bf094cce9c2150438a1c7e03bec5ee0d  xfce4-session-4.5.92.tar.bz2
+7d3b5f1400cc053ef01ad61e209d5828  xfce4-session-4.5.93.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfce4-session/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	13 Jan 2009 22:12:42 -0000	1.11
+++ .cvsignore	17 Jan 2009 08:23:07 -0000	1.12
@@ -1 +1 @@
-xfce4-session-4.5.92.tar.bz2
+xfce4-session-4.5.93.tar.bz2


Index: xfce4-session.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-session/devel/xfce4-session.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- xfce4-session.spec	13 Jan 2009 22:12:42 -0000	1.23
+++ xfce4-session.spec	17 Jan 2009 08:23:07 -0000	1.24
@@ -1,6 +1,6 @@
 Summary: Xfce session manager
 Name: xfce4-session
-Version: 4.5.92
+Version: 4.5.93
 Release: 1%{?dist}
 License: GPLv2+
 URL: http://www.xfce.org/
@@ -125,6 +125,9 @@
 %{_libexecdir}/balou-*
 
 %changelog
+* Tue Jan 13 2009 Kevin Fenzi <kevin at tummy.com> - 4.5.93-1
+- Update to 4.5.93
+
 * Fri Dec 26 2008 Kevin Fenzi <kevin at tummy.com> - 4.5.92-1
 - Update 4.5.92
 



From jakub at fedoraproject.org  Sat Jan 17 08:25:45 2009
From: jakub at fedoraproject.org (Jakub Jelinek)
Date: Sat, 17 Jan 2009 08:25:45 +0000 (UTC)
Subject: rpms/gcc/devel gcc.spec,1.2,1.3
Message-ID: <20090117082546.00F777012B@cvs1.fedora.phx.redhat.com>

Author: jakub

Update of /cvs/pkgs/rpms/gcc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18795

Modified Files:
	gcc.spec 
Log Message:
.



Index: gcc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/devel/gcc.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gcc.spec	17 Jan 2009 00:44:35 -0000	1.2
+++ gcc.spec	17 Jan 2009 08:25:15 -0000	1.3
@@ -1722,7 +1722,7 @@
 
 %changelog
 * Sat Jan 17 2009 Jakub Jelinek <jakub at redhat.com> 4.4.0-0.4
-- enable Ada support on ppc64
+- attempt to enable Ada support on ppc64
 
 * Fri Jan 16 2009 Jakub Jelinek <jakub at redhat.com> 4.4.0-0.3
 - initial 4.4 package, using newly created redhat/gcc-4_4-branch



From rakesh at fedoraproject.org  Sat Jan 17 09:00:04 2009
From: rakesh at fedoraproject.org (Rakesh Pandit)
Date: Sat, 17 Jan 2009 09:00:04 +0000 (UTC)
Subject: rpms/ImageMagick/devel ImageMagick.spec,1.83,1.84
Message-ID: <20090117090004.922347012B@cvs1.fedora.phx.redhat.com>

Author: rakesh

Update of /cvs/pkgs/rpms/ImageMagick/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20954

Modified Files:
	ImageMagick.spec 
Log Message:
Rebuild with new djvulibre.



Index: ImageMagick.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ImageMagick/devel/ImageMagick.spec,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- ImageMagick.spec	27 Dec 2008 13:59:23 -0000	1.83
+++ ImageMagick.spec	17 Jan 2009 08:59:34 -0000	1.84
@@ -3,7 +3,7 @@
 
 Name:           ImageMagick
 Version:        %{VER}.%{Patchlevel}
-Release:        5%{?dist}
+Release:        1%{?dist}
 Summary:        An X application for displaying and manipulating images
 Group:          Applications/Multimedia
 License:        ImageMagick
@@ -307,6 +307,9 @@
 
 
 %changelog
+* Sat Jan 17 2009 Rakesh Pandit <rakesh at fedoraproject.org> 6.4.5.5-6
+- Rebuild with new djvulibre
+
 * Sat Dec 27 2008 Hans de Goede <hdegoede at redhat.com> 6.4.5.5-5
 - Remove 2 included copies of the non Free artbrush font (rh 477399)
 



From awjb at fedoraproject.org  Sat Jan 17 09:11:02 2009
From: awjb at fedoraproject.org (Andreas Bierfert)
Date: Sat, 17 Jan 2009 09:11:02 +0000 (UTC)
Subject: rpms/wine/EL-4 .cvsignore, 1.34, 1.35 sources, 1.35,
	1.36 wine-desktop-mime.patch, 1.1, 1.2 wine.spec, 1.45, 1.46
Message-ID: <20090117091102.B04CF7012B@cvs1.fedora.phx.redhat.com>

Author: awjb

Update of /cvs/pkgs/rpms/wine/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21752

Modified Files:
	.cvsignore sources wine-desktop-mime.patch wine.spec 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/wine/EL-4/.cvsignore,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- .cvsignore	17 Jun 2008 19:09:33 -0000	1.34
+++ .cvsignore	17 Jan 2009 09:10:32 -0000	1.35
@@ -1 +1 @@
-wine-1.0-fe.tar.bz2
+wine-1.0.1-fe.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/wine/EL-4/sources,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- sources	17 Jun 2008 19:09:33 -0000	1.35
+++ sources	17 Jan 2009 09:10:32 -0000	1.36
@@ -1 +1 @@
-8131688557a6168bf9248e48ee9e90ad  wine-1.0-fe.tar.bz2
+4693261648786cd3a334880183260ac1  wine-1.0.1-fe.tar.bz2

wine-desktop-mime.patch:

Index: wine-desktop-mime.patch
===================================================================
RCS file: /cvs/pkgs/rpms/wine/EL-4/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:09:33 -0000	1.1
+++ wine-desktop-mime.patch	17 Jan 2009 09:10:32 -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	2009-01-17 09:09:01.000000000 +0100
++++ tools/wine.desktop	2009-01-17 09:09:33.000000000 +0100
+@@ -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/EL-4/wine.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- wine.spec	17 Jun 2008 19:09:33 -0000	1.45
+++ wine.spec	17 Jan 2009 09:10:32 -0000	1.46
@@ -1,5 +1,5 @@
 Name:		wine
-Version:	1.0
+Version:	1.0.1
 Release:	1%{?dist}
 Summary:	A Windows 16/32/64 bit emulator
 
@@ -797,6 +797,10 @@
 %{_libdir}/wine/*.def
 
 %changelog
+* Sat Jan 17 2009 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- 1.0.1-1
+- version upgrade
+
 * Tue Jun 17 2008 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 - 1.0-1
 - version upgrade (#446311,#417161)



From denis at fedoraproject.org  Sat Jan 17 09:28:13 2009
From: denis at fedoraproject.org (Denis Leroy)
Date: Sat, 17 Jan 2009 09:28:13 +0000 (UTC)
Subject: rpms/gtksourceviewmm/devel gtksourceviewmm.spec, NONE,
	1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090117092813.A74DD7012B@cvs1.fedora.phx.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/gtksourceviewmm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23349/devel

Modified Files:
	.cvsignore sources 
Added Files:
	gtksourceviewmm.spec import.log 
Log Message:
First version



--- NEW FILE gtksourceviewmm.spec ---
Name:             gtksourceviewmm
Version:          2.2.0
Release:          2%{?dist}
Summary:          A C++ wrapper for the gtksourceview widget library

Group:            System Environment/Libraries
License:          LGPLv2+
URL:              http://projects.gnome.org/gtksourceviewmm/
Source0:          http://ftp.gnome.org/pub/GNOME/sources/gtksourceviewmm/2.2/%{name}-%{version}.tar.bz2
BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:    gtkmm24-devel >= 2.4
BuildRequires:    gtksourceview2-devel >= 2.2.0
BuildRequires:    doxygen graphviz


%description
gtksourceviewmm is a C++ wrapper for the gtksourceview widget
library. It offers all the power of gtksourceview with an interface
familiar to c++ developers, including users of the gtkmm library


%package        devel
Summary:        Development files for %{name}
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}
Requires:       gtkmm24-devel
Requires:       gtksourceview2-devel
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
sed -i -e 's! -shared ! -Wl,--as-needed\0!g' libtool
make %{?_smp_mflags}
iconv -f iso8859-1 -t utf-8 ChangeLog > ChangeLog.conv && mv -f ChangeLog.conv ChangeLog


%install
rm -rf $RPM_BUILD_ROOT
make INSTALL="install -c -p" DESTDIR=$RPM_BUILD_ROOT install
find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
# Move documentation to gtk-doc directory
mkdir -p $RPM_BUILD_ROOT%{_datadir}/gtk-doc/html
mv $RPM_BUILD_ROOT%{_datadir}/doc/libgtksourceviewmm-2.0 $RPM_BUILD_ROOT%{_datadir}/gtk-doc/html/gtksourceviewmm-2.0
# Remove files related to code generation
rm -rf $RPM_BUILD_ROOT%{_libdir}/gtksourceviewmm-2.0


%clean
rm -rf $RPM_BUILD_ROOT


%post -p /sbin/ldconfig


%postun -p /sbin/ldconfig


%files
%defattr(-,root,root,-)
%doc README AUTHORS COPYING ChangeLog NEWS
%{_libdir}/*.so.*


%files devel
%defattr(-,root,root,-)
%doc %{_datadir}/gtk-doc/html/gtksourceviewmm-2.0
%{_includedir}/gtksourceviewmm-2.0
%{_libdir}/*.so
%{_libdir}/pkgconfig/*.pc


%changelog
* Thu Jan 15 2009 Denis Leroy <denis at poolshark.org> - 2.2.0-2
- Fixed BRs

* Tue Jan 13 2009 Denis Leroy <denis at poolshark.org> - 2.2.0-1
- Initial draft, based on 1.0 version



--- NEW FILE import.log ---
gtksourceviewmm-2_2_0-2_fc10:HEAD:gtksourceviewmm-2.2.0-2.fc10.src.rpm:1232184377


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gtksourceviewmm/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	17 Jan 2009 03:17:54 -0000	1.1
+++ .cvsignore	17 Jan 2009 09:27:43 -0000	1.2
@@ -0,0 +1 @@
+gtksourceviewmm-2.2.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gtksourceviewmm/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	17 Jan 2009 03:17:54 -0000	1.1
+++ sources	17 Jan 2009 09:27:43 -0000	1.2
@@ -0,0 +1 @@
+2306402f31dff1cb9d3d664aa9153c28  gtksourceviewmm-2.2.0.tar.bz2



From rakesh at fedoraproject.org  Sat Jan 17 09:34:01 2009
From: rakesh at fedoraproject.org (Rakesh Pandit)
Date: Sat, 17 Jan 2009 09:34:01 +0000 (UTC)
Subject: rpms/ImageMagick/devel ImageMagick.spec,1.84,1.85
Message-ID: <20090117093401.634407012B@cvs1.fedora.phx.redhat.com>

Author: rakesh

Update of /cvs/pkgs/rpms/ImageMagick/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23766

Modified Files:
	ImageMagick.spec 
Log Message:
Bumped - fixed the wrong release tag.



Index: ImageMagick.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ImageMagick/devel/ImageMagick.spec,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -r1.84 -r1.85
--- ImageMagick.spec	17 Jan 2009 08:59:34 -0000	1.84
+++ ImageMagick.spec	17 Jan 2009 09:33:31 -0000	1.85
@@ -3,7 +3,7 @@
 
 Name:           ImageMagick
 Version:        %{VER}.%{Patchlevel}
-Release:        1%{?dist}
+Release:        7%{?dist}
 Summary:        An X application for displaying and manipulating images
 Group:          Applications/Multimedia
 License:        ImageMagick
@@ -307,6 +307,9 @@
 
 
 %changelog
+* Sat Jan 17 2009 Rakesh Pandit <rakesh at fedoraproject.org> 6.4.5.5-7
+- Corrected the wrong release and bumped
+
 * Sat Jan 17 2009 Rakesh Pandit <rakesh at fedoraproject.org> 6.4.5.5-6
 - Rebuild with new djvulibre
 



From rakesh at fedoraproject.org  Sat Jan 17 09:40:38 2009
From: rakesh at fedoraproject.org (Rakesh Pandit)
Date: Sat, 17 Jan 2009 09:40:38 +0000 (UTC)
Subject: rpms/djview4/devel djview4.spec,1.1,1.2
Message-ID: <20090117094038.B75597012B@cvs1.fedora.phx.redhat.com>

Author: rakesh

Update of /cvs/pkgs/rpms/djview4/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24169

Modified Files:
	djview4.spec 
Log Message:
Rebuild with new djvulibre


Index: djview4.spec
===================================================================
RCS file: /cvs/pkgs/rpms/djview4/devel/djview4.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- djview4.spec	24 Aug 2008 11:44:03 -0000	1.1
+++ djview4.spec	17 Jan 2009 09:40:08 -0000	1.2
@@ -1,7 +1,7 @@
 Summary:       DjVu viewer
 Name:          djview4
 Version:       4.3
-Release:       2%{?dist}
+Release:       3%{?dist}
 License:       GPLv2+
 Group:         Applications/Publishing
 URL:           http://djvu.sourceforge.net/djview4.html
@@ -69,6 +69,9 @@
 %{_datadir}/icons/hicolor/32x32/apps/djvulibre-%{name}.png
 
 %changelog
+* Sat Jan 17 2009 Rakesh Pandit <rakesh at fedoraproject.org> - 4.3-3
+- Rebuild with new djvulibre
+
 * Tue Aug 12 2008 Terje Rosten <terje.rosten at ntnu.no> - 4.3-2
 - Add gtk-update-icon-cache scriptlet
 



From rakesh at fedoraproject.org  Sat Jan 17 09:53:03 2009
From: rakesh at fedoraproject.org (Rakesh Pandit)
Date: Sat, 17 Jan 2009 09:53:03 +0000 (UTC)
Subject: rpms/evince/devel evince.spec,1.144,1.145
Message-ID: <20090117095303.B24277012B@cvs1.fedora.phx.redhat.com>

Author: rakesh

Update of /cvs/pkgs/rpms/evince/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25464

Modified Files:
	evince.spec 
Log Message:
Rebuild with new djvulibre


Index: evince.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evince/devel/evince.spec,v
retrieving revision 1.144
retrieving revision 1.145
diff -u -r1.144 -r1.145
--- evince.spec	7 Jan 2009 03:55:12 -0000	1.144
+++ evince.spec	17 Jan 2009 09:52:33 -0000	1.145
@@ -6,7 +6,7 @@
 
 Name:		evince
 Version:	2.25.4
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Document viewer
 
 License:	GPLv2+ and GFDL
@@ -237,6 +237,9 @@
 %{_libdir}/evince/backends/djvudocument.evince-backend
 
 %changelog
+* Sat Jan 17 2009 Rakesh Pandit <rakesh at fedoraproject.org> - 2.25.4-2
+- Rebuild with mew djvulibre
+
 * Mon Jan  5 2009 Matthias Clasen  <mclasen at redhat.com> - 2.25.4-1
 - Update to 2.25.4
 - Temporarily drop the duplex patch, it needs updating



From rakesh at fedoraproject.org  Sat Jan 17 09:57:19 2009
From: rakesh at fedoraproject.org (Rakesh Pandit)
Date: Sat, 17 Jan 2009 09:57:19 +0000 (UTC)
Subject: rpms/kdegraphics/devel kdegraphics.spec,1.184,1.185
Message-ID: <20090117095719.12A377012B@cvs1.fedora.phx.redhat.com>

Author: rakesh

Update of /cvs/pkgs/rpms/kdegraphics/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25714

Modified Files:
	kdegraphics.spec 
Log Message:
Rebuild with new djvulibre


Index: kdegraphics.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdegraphics/devel/kdegraphics.spec,v
retrieving revision 1.184
retrieving revision 1.185
diff -u -r1.184 -r1.185
--- kdegraphics.spec	7 Jan 2009 16:13:19 -0000	1.184
+++ kdegraphics.spec	17 Jan 2009 09:56:48 -0000	1.185
@@ -7,7 +7,7 @@
 Summary:        K Desktop Environment - Graphics Applications
 Epoch:          7
 Version:        4.1.96
-Release:        1%{?dist}
+Release:        2%{?dist}
 
 Name:           kdegraphics
 #Obsoletes:     kdegraphics4 < %{version}-%{release}
@@ -179,6 +179,9 @@
 
 
 %changelog
+* Sat Jan 17 2009 Rakesh Pandit <rakesh at fedoraproject.org> - 4.1.96-2
+- Updated with new djvulibre
+
 * Wed Jan 07 2009 Than Ngo <than at redhat.com> - 4.1.96-1
 - 4.2rc1
 



From mcepl at fedoraproject.org  Sat Jan 17 10:21:58 2009
From: mcepl at fedoraproject.org (Matej Cepl)
Date: Sat, 17 Jan 2009 10:21:58 +0000 (UTC)
Subject: rpms/python-libasyncns/devel python-libasyncns.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090117102158.E4D0970142@cvs1.fedora.phx.redhat.com>

Author: mcepl

Update of /cvs/extras/rpms/python-libasyncns/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26894

Modified Files:
	.cvsignore sources 
Added Files:
	python-libasyncns.spec 
Log Message:
Initial import of the package.


--- NEW FILE python-libasyncns.spec ---
%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}

Name:           python-libasyncns
Version:        0.7
Release:        2%{?dist}
Summary:        Python binding for libasyncns

Group:          Development/Languages
License:        LGPLv2+
URL:            https://launchpad.net/libasyncns-python
Source0:        http://launchpad.net/libasyncns-python/trunk/%{version}/+download/libasyncns-python-%{version}.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  python-devel libasyncns-devel >= 0.4

%description
Python binding for the libasyncns asynchronous name service query library.

%prep
%setup -q -n libasyncns-python-%{version}


%build
CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build


%install
rm -rf $RPM_BUILD_ROOT
%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
find $RPM_BUILD_ROOT%{_libdir} -type f -exec chmod 0755 '{}' \;

%check
#make test

%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc README LICENSE
%{python_sitearch}/*


%changelog
* Thu Jan 15 2009 Mat??j Cepl <mcepl at redhat.com> 0.7-2
- Modified according to reviewers comments.

* Thu Dec 18 2008 Mat??j Cepl <mcepl at redhat.com> 0.7-1
- Experimental build


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-libasyncns/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	17 Jan 2009 03:16:29 -0000	1.1
+++ .cvsignore	17 Jan 2009 10:21:28 -0000	1.2
@@ -0,0 +1 @@
+libasyncns-python-0.7.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-libasyncns/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	17 Jan 2009 03:16:29 -0000	1.1
+++ sources	17 Jan 2009 10:21:28 -0000	1.2
@@ -0,0 +1 @@
+a121964ef8ad9aa6b553326b595aaf0c  libasyncns-python-0.7.tar.bz2



From pkgdb at fedoraproject.org  Sat Jan 17 10:24:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 17 Jan 2009 10:24:58 +0000
Subject: [pkgdb] audit: lmacken has requested watchcommits
Message-ID: <20090117102458.D6A57208457@bastion.fedora.phx.redhat.com>

lmacken has requested the watchcommits acl on audit (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/audit



From mcepl at fedoraproject.org  Sat Jan 17 10:25:21 2009
From: mcepl at fedoraproject.org (Matej Cepl)
Date: Sat, 17 Jan 2009 10:25:21 +0000 (UTC)
Subject: rpms/python-libasyncns/F-10 python-libasyncns.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090117102521.6ED407012B@cvs1.fedora.phx.redhat.com>

Author: mcepl

Update of /cvs/extras/rpms/python-libasyncns/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27810

Modified Files:
	.cvsignore sources 
Added Files:
	python-libasyncns.spec 
Log Message:
Initial import of the package.


--- NEW FILE python-libasyncns.spec ---
%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}

Name:           python-libasyncns
Version:        0.7
Release:        2%{?dist}
Summary:        Python binding for libasyncns

Group:          Development/Languages
License:        LGPLv2+
URL:            https://launchpad.net/libasyncns-python
Source0:        http://launchpad.net/libasyncns-python/trunk/%{version}/+download/libasyncns-python-%{version}.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  python-devel libasyncns-devel >= 0.4

%description
Python binding for the libasyncns asynchronous name service query library.

%prep
%setup -q -n libasyncns-python-%{version}


%build
CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build


%install
rm -rf $RPM_BUILD_ROOT
%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
find $RPM_BUILD_ROOT%{_libdir} -type f -exec chmod 0755 '{}' \;

%check
#make test

%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc README LICENSE
%{python_sitearch}/*


%changelog
* Thu Jan 15 2009 Mat??j Cepl <mcepl at redhat.com> 0.7-2
- Modified according to reviewers comments.

* Thu Dec 18 2008 Mat??j Cepl <mcepl at redhat.com> 0.7-1
- Experimental build


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-libasyncns/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	17 Jan 2009 03:16:29 -0000	1.1
+++ .cvsignore	17 Jan 2009 10:24:51 -0000	1.2
@@ -0,0 +1 @@
+libasyncns-python-0.7.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-libasyncns/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	17 Jan 2009 03:16:29 -0000	1.1
+++ sources	17 Jan 2009 10:24:51 -0000	1.2
@@ -0,0 +1 @@
+a121964ef8ad9aa6b553326b595aaf0c  libasyncns-python-0.7.tar.bz2



From tmraz at fedoraproject.org  Sat Jan 17 10:54:04 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Sat, 17 Jan 2009 10:54:04 +0000 (UTC)
Subject: rpms/httperf/devel httperf.spec,1.1,1.2
Message-ID: <20090117105405.07E217012B@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/httperf/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30740

Modified Files:
	httperf.spec 
Log Message:
* Fri Jan 16 2009 Tomas Mraz <tmraz at redhat.com> - 0.9.0-3
- rebuild with new openssl



Index: httperf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/httperf/devel/httperf.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- httperf.spec	14 Oct 2008 07:17:56 -0000	1.1
+++ httperf.spec	17 Jan 2009 10:53:34 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           httperf
 Version:        0.9.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Tool for measuring web server performance
 Group:          Development/Tools
 License:        GPLv2+ with exceptions
@@ -49,6 +49,9 @@
 
 
 %changelog
+* Fri Jan 16 2009 Tomas Mraz <tmraz at redhat.com> - 0.9.0-3
+- rebuild with new openssl
+
 * Tue Oct 14 2008 Thomas Moschny <thomas.moschny at gmx.de> - 0.9.0-2
 - Suggestion from the review: Use install -p to preserve timestamps.
 



From tmraz at fedoraproject.org  Sat Jan 17 10:54:36 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Sat, 17 Jan 2009 10:54:36 +0000 (UTC)
Subject: rpms/http_ping/devel http_ping.spec,1.13,1.14
Message-ID: <20090117105436.78F547012B@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/http_ping/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31096

Modified Files:
	http_ping.spec 
Log Message:
* Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> - 20050629-8
- rebuild with new openssl



Index: http_ping.spec
===================================================================
RCS file: /cvs/pkgs/rpms/http_ping/devel/http_ping.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- http_ping.spec	8 Feb 2008 22:12:53 -0000	1.13
+++ http_ping.spec	17 Jan 2009 10:54:06 -0000	1.14
@@ -1,6 +1,6 @@
 Name:           http_ping
 Version:        20050629
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        HTTP latency measuring utility
 
 Group:          Applications/Internet
@@ -47,6 +47,9 @@
 
 
 %changelog
+* Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> - 20050629-8
+- rebuild with new openssl
+
 * Sat Feb  9 2008 Ville Skytt?? <ville.skytta at iki.fi> - 20050629-7
 - Rebuild.
 



From tmraz at fedoraproject.org  Sat Jan 17 10:56:38 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Sat, 17 Jan 2009 10:56:38 +0000 (UTC)
Subject: rpms/ice/devel ice.spec,1.23,1.24
Message-ID: <20090117105638.1ECC07012B@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/ice/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31557

Modified Files:
	ice.spec 
Log Message:
* Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> - 3.3.0-11
- rebuild with new openssl



Index: ice.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ice/devel/ice.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- ice.spec	10 Jan 2009 15:42:57 -0000	1.23
+++ ice.spec	17 Jan 2009 10:56:07 -0000	1.24
@@ -4,7 +4,7 @@
 
 Name: ice
 Version: 3.3.0
-Release: 10%{?dist}
+Release: 11%{?dist}
 Summary: The Ice base runtime and services
 
 Group: System Environment/Libraries
@@ -555,6 +555,9 @@
 %config(noreplace) %{_sysconfdir}/php.d/ice.ini
 
 %changelog
+* Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> - 3.3.0-11
+- rebuild with new openssl
+
 * Sat Jan 10 2009 Dennis Gilmore <dennis at ausil.us> - 3.3.0-10
 - ExcludeArch sparc64 no mono there
 



From rjones at fedoraproject.org  Sat Jan 17 11:32:04 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Sat, 17 Jan 2009 11:32:04 +0000 (UTC)
Subject: rpms/mingw32-pdcurses/devel import.log, NONE,
	1.1 mingw32-pdcurses-3.4-build.patch, NONE,
	1.1 mingw32-pdcurses.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090117113204.363897012B@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/mingw32-pdcurses/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2848/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log mingw32-pdcurses-3.4-build.patch 
	mingw32-pdcurses.spec 
Log Message:
Initial import.



--- NEW FILE import.log ---
mingw32-pdcurses-3_4-3_fc10:HEAD:mingw32-pdcurses-3.4-3.fc10.src.rpm:1232191645

mingw32-pdcurses-3.4-build.patch:

--- NEW FILE mingw32-pdcurses-3.4-build.patch ---
--- PDCurses-3.4/win32/mingwin32.mak.orig	2008-09-25 15:30:14.000000000 +0100
+++ PDCurses-3.4/win32/mingwin32.mak	2008-09-25 15:43:50.000000000 +0100
@@ -30,8 +30,8 @@
 
 CFLAGS += -I$(PDCURSES_SRCDIR)
 
-BASEDEF		= $(PDCURSES_SRCDIR)\exp-base.def
-WIDEDEF		= $(PDCURSES_SRCDIR)\exp-wide.def
+BASEDEF		= $(PDCURSES_SRCDIR)/exp-base.def
+WIDEDEF		= $(PDCURSES_SRCDIR)/exp-wide.def
 
 DEFDEPS		= $(BASEDEF)
 
@@ -50,7 +50,7 @@
 
 ifeq ($(DLL),Y)
 	CFLAGS += -DPDC_DLL_BUILD
-	LIBEXE = gcc $(DEFFILE)
+	LIBEXE = i686-pc-mingw32-gcc $(DEFFILE)
 	LIBFLAGS = -Wl,--out-implib,pdcurses.a -shared -o
 	LIBCURSES = pdcurses.dll
 	LIBDEPS = $(LIBOBJS) $(PDCOBJS) $(DEFFILE)
@@ -70,24 +70,24 @@
 libs:	$(LIBCURSES)
 
 clean:
-	-del *.o
-	-del *.exe
-	-del $(CLEAN)
+	-rm *.o
+	-rm *.exe
+	-rm $(CLEAN)
 
 demos:	$(DEMOS)
-	strip *.exe
+	i686-pc-mingw32-strip *.exe
 
 $(DEFFILE): $(DEFDEPS)
 	echo LIBRARY pdcurses > $@
 	echo EXPORTS >> $@
-	type $(BASEDEF) >> $@
+	cat $(BASEDEF) >> $@
 ifeq ($(WIDE),Y)
-	type $(WIDEDEF) >> $@
+	cat $(WIDEDEF) >> $@
 endif
 
 $(LIBCURSES) : $(LIBDEPS)
 	$(LIBEXE) $(LIBFLAGS) $@ $?
-	-copy pdcurses.a panel.a
+	-cp pdcurses.a panel.a
 
 $(LIBOBJS) $(PDCOBJS) : $(PDCURSES_HEADERS)
 $(PDCOBJS) : $(PDCURSES_WIN_H)


--- NEW FILE mingw32-pdcurses.spec ---
%define __strip %{_mingw32_strip}
%define __objdump %{_mingw32_objdump}
%define _use_internal_dependency_generator 0
%define __find_requires %{_mingw32_findrequires}
%define __find_provides %{_mingw32_findprovides}

Name:           mingw32-pdcurses
Version:        3.4
Release:        3%{?dist}
Summary:        Curses library for MinGW

License:        Public Domain
Group:          Development/Libraries
URL:            http://pdcurses.sourceforge.net/
Source0:        http://dl.sourceforge.net/sourceforge/pdcurses/PDCurses-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch

Patch0:         mingw32-pdcurses-3.4-build.patch

BuildRequires:  mingw32-filesystem >= 26
BuildRequires:  mingw32-gcc
BuildRequires:  mingw32-binutils


%description
PDCurses is a public domain curses library for DOS, OS/2, Win32, X11
and SDL, implementing most of the functions available in X/Open and
System V R4 curses. It supports many compilers for these
platforms. The X11 port lets you recompile existing text-mode curses
programs to produce native X11 applications.

Note that ncurses is not available for MinGW / Windows.  Applications
which need curses functionality can use this package, provided they
don't use any of the extensions specific to ncurses.


%prep
%setup -q -n PDCurses-%{version}
%patch0 -p1


%build
pushd win32
make -f mingwin32.mak \
  CC=%{_mingw32_cc} \
  LINK=%{_mingw32_cc} \
  WIDE=Y UTF8=Y DLL=Y
popd


%install
rm -rf $RPM_BUILD_ROOT

mkdir -p $RPM_BUILD_ROOT%{_mingw32_bindir}
mkdir -p $RPM_BUILD_ROOT%{_mingw32_libdir}
mkdir -p $RPM_BUILD_ROOT%{_mingw32_includedir}

install win32/*.exe $RPM_BUILD_ROOT%{_mingw32_bindir}
install win32/pdcurses.dll $RPM_BUILD_ROOT%{_mingw32_bindir}/pdcurses.dll
install win32/pdcurses.a $RPM_BUILD_ROOT%{_mingw32_libdir}/libpdcurses.dll.a
install -m 0644 curses.h panel.h term.h $RPM_BUILD_ROOT%{_mingw32_includedir}


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root)
%{_mingw32_bindir}/pdcurses.dll
%{_mingw32_libdir}/libpdcurses.dll.a
%{_mingw32_includedir}/curses.h
%{_mingw32_includedir}/panel.h
%{_mingw32_includedir}/term.h
%{_mingw32_bindir}/firework.exe
%{_mingw32_bindir}/newdemo.exe
%{_mingw32_bindir}/ptest.exe
%{_mingw32_bindir}/rain.exe
%{_mingw32_bindir}/testcurs.exe
%{_mingw32_bindir}/tuidemo.exe
%{_mingw32_bindir}/xmas.exe
%{_mingw32_bindir}/worm.exe


%changelog
* Fri Jan 16 2009 Richard Jones <rjones at redhat.com> - 3.4-3
- Remove +x permissions on the header files.

* Sat Nov 22 2008 Richard Jones <rjones at redhat.com> - 3.4-2
- Rename implib to libpdcurses.dll.a so that libtool can use it.

* Thu Sep 25 2008 Richard Jones <rjones at redhat.com> - 3.4-1
- Initial RPM release.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-pdcurses/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	17 Jan 2009 03:26:28 -0000	1.1
+++ .cvsignore	17 Jan 2009 11:31:31 -0000	1.2
@@ -0,0 +1 @@
+PDCurses-3.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-pdcurses/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	17 Jan 2009 03:26:28 -0000	1.1
+++ sources	17 Jan 2009 11:31:32 -0000	1.2
@@ -0,0 +1 @@
+4e04e4412d1b1392a7f9a489b95b331a  PDCurses-3.4.tar.gz



From rjones at fedoraproject.org  Sat Jan 17 11:33:59 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Sat, 17 Jan 2009 11:33:59 +0000 (UTC)
Subject: rpms/mingw32-dlfcn/devel dlfcn_configure.patch, NONE, 1.1 import.log,
	NONE, 1.1 mingw32-dlfcn.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090117113359.D5A7E7012B@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/mingw32-dlfcn/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3344/devel

Modified Files:
	.cvsignore sources 
Added Files:
	dlfcn_configure.patch import.log mingw32-dlfcn.spec 
Log Message:
Initial import.


dlfcn_configure.patch:

--- NEW FILE dlfcn_configure.patch ---
diff -ruNp dlfcn-win32-r11/config.mak dlfcn-win32-r11.new/config.mak
--- dlfcn-win32-r11/config.mak	1969-12-31 21:00:00.000000000 -0300
+++ dlfcn-win32-r11.new/config.mak	2009-01-02 12:08:15.000000000 -0200
@@ -0,0 +1,9 @@
+# Automatically generated by configure
+PREFIX=/usr/i686-pc-mingw32/sys-root/mingw
+libdir=/usr/i686-pc-mingw32/sys-root/mingw/lib
+incdir=/usr/i686-pc-mingw32/sys-root/mingw/include
+CC=i686-pc-mingw32-gcc
+BUILD_SHARED=yes
+BUILD_STATIC=yes
+BUILD_MSVC=no
+DO_STRIP=yes
diff -ruNp dlfcn-win32-r11/configure dlfcn-win32-r11.new/configure
--- dlfcn-win32-r11/configure	2009-01-02 11:54:38.000000000 -0200
+++ dlfcn-win32-r11.new/configure	2009-01-02 12:35:30.000000000 -0200
@@ -97,6 +97,45 @@ for opt do
     --make=*)
         make="$optval"
     ;;
+    --enable-shared=*)
+        shared="$optval"
+    ;;
+    --enable-static=*)
+        static="$optval"
+    ;;
+    --enable-strip=*)
+       strip="$optval"
+    ;;
+    --cache-file=*)
+    ;;
+    --host=*)
+    ;;
+    --build=*)
+    ;;
+    --target=*)
+    ;;
+    --exec-prefix=*)
+    ;;
+    --bindir=*)
+    ;;
+    --sbindir=*)
+    ;;
+    --sysconfdir=*)
+    ;;
+    --datadir=*)
+    ;;
+    --includedir=*)
+    ;;
+    --libexecdir=*)
+    ;;
+    --localstatedir=*)
+    ;;
+    --sharedstatedir=*)
+    ;;
+    --mandir=*)
+    ;;
+    --infodir=*)
+    ;;
     --enable-?*|--disable-?*)
         eval `echo "$opt" | sed 's/--/action=/;s/-/ option=/;s/-/_/g'`
         echo "$CMDLINE_SELECT" | grep -q "^ *$option\$" || die_unknown $opt


--- NEW FILE import.log ---
mingw32-dlfcn-0-0_3_r11_fc10:HEAD:mingw32-dlfcn-0-0.3.r11.fc10.src.rpm:1232191683


--- NEW FILE mingw32-dlfcn.spec ---
%define __strip %{_mingw32_strip}
%define __objdump %{_mingw32_objdump}
%define _use_internal_dependency_generator 0
%define __find_requires %{_mingw32_findrequires}
%define __find_provides %{_mingw32_findprovides}

%define realname dlfcn-win32

%define alphatag r11

Name:          mingw32-dlfcn
Version:       0
Release:       0.3.%{alphatag}%{?dist}
Summary:       Implements a wrapper for dlfcn (dlopen dlclose dlsym dlerror)

License:       LGPLv2+
Group:         Development/Libraries
URL:           http://code.google.com/p/dlfcn-win32/
Source0:       http://dlfcn-win32.googlecode.com/files/%{realname}-%{alphatag}.tar.bz2
BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:     noarch

BuildRequires: mingw32-filesystem >= 40
BuildRequires: mingw32-gcc
BuildRequires: mingw32-binutils
#BuildRequires: dos2unix

Patch1:        dlfcn_configure.patch


%description
This library implements a wrapper for dlfcn, as specified in POSIX and SUS,
around the dynamic link library functions found in the Windows API.


%prep
%setup -q -n %{realname}-%{alphatag}

%{__sed} -i 's/\r//' configure
%{__sed} -i 's/\r//' README
%{__sed} -i 's/\r//' COPYING

%patch1 -p1


%build
%{_mingw32_configure} \
  --incdir=%{_mingw32_includedir} \
  --cc=i686-pc-mingw32-gcc \
  --enable-shared=yes \
  --enable-static=no \
  --enable-strip=i686-pc-mingw32-strip
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make DESTDIR=$RPM_BUILD_ROOT install


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root)
%doc README COPYING
%{_mingw32_bindir}/libdl.dll
%{_mingw32_libdir}/libdl.dll.a
%{_mingw32_includedir}/dlfcn.h


%changelog
* Wed Jan 14 2009 Richard W.M. Jones <rjones at redhat.com> - 0-0.3.r11
- Use Version 0
  (https://www.redhat.com/archives/fedora-packaging/2009-January/msg00064.html)
- Revert use of dos2unix for now
  (https://www.redhat.com/archives/fedora-packaging/2009-January/msg00066.html)
- Use _smp_mflags.

* Tue Jan 13 2009 Richard W.M. Jones <rjones at redhat.com> - 0.1-0.2.r11
- Import into fedora-mingw temporary repository because there are packages
  which will depend on this.
- Fix the version/release according to packaging guidelines.
- Tidy up the spec file.
- Use dos2unix and keep the timestamps.

* Fri Jan 02 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - r11-1
- Initial RPM release. 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-dlfcn/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	17 Jan 2009 03:22:33 -0000	1.1
+++ .cvsignore	17 Jan 2009 11:33:29 -0000	1.2
@@ -0,0 +1 @@
+dlfcn-win32-r11.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-dlfcn/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	17 Jan 2009 03:22:33 -0000	1.1
+++ sources	17 Jan 2009 11:33:29 -0000	1.2
@@ -0,0 +1 @@
+728d2c79edaf09ee3c309860499502eb  dlfcn-win32-r11.tar.bz2



From rjones at fedoraproject.org  Sat Jan 17 11:34:50 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Sat, 17 Jan 2009 11:34:50 +0000 (UTC)
Subject: rpms/mingw32-gdbm/devel gdbm-1.8.0-64offset.patch, NONE,
	1.1 gdbm-1.8.0-cflags.patch, NONE, 1.1 gdbm-1.8.0-fhs.patch,
	NONE, 1.1 gdbm-1.8.0-jbj.patch, NONE, 1.1 import.log, NONE,
	1.1 mingw32-gdbm-1.8.0-windows.patch, NONE,
	1.1 mingw32-gdbm.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <20090117113450.151CA7012B@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/mingw32-gdbm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3576/devel

Modified Files:
	.cvsignore sources 
Added Files:
	gdbm-1.8.0-64offset.patch gdbm-1.8.0-cflags.patch 
	gdbm-1.8.0-fhs.patch gdbm-1.8.0-jbj.patch import.log 
	mingw32-gdbm-1.8.0-windows.patch mingw32-gdbm.spec 
Log Message:
Initial import.


gdbm-1.8.0-64offset.patch:

--- NEW FILE gdbm-1.8.0-64offset.patch ---
diff -buNr gdbm-1.8.0.orig/falloc.c gdbm-1.8.0/falloc.c
--- gdbm-1.8.0.orig/falloc.c	Tue May 18 20:16:06 1999
+++ gdbm-1.8.0/falloc.c	Thu Apr 25 18:20:45 2002
@@ -180,6 +180,13 @@
   avail_block *new_blk;
   int index;
 
+  if (dbf->header->avail.count == dbf->header->avail.size)
+    {
+      /* We're kind of stuck here, so we re-split the header in order to
+         avoid crashing.  Sigh. */
+      push_avail_block(dbf);
+    }
+
   /* Set up variables. */
   new_el.av_adr = dbf->header->avail.next_block;
   new_el.av_size = ( ( (dbf->header->avail.size * sizeof (avail_elem)) >> 1)
@@ -196,12 +203,24 @@
   if (num_bytes != new_el.av_size) _gdbm_fatal (dbf, "read error");
 
   /* Add the elements from the new block to the header. */
-  for (index = 0; index < new_blk->count; index++)
+  index = 0;
+  while (index < new_blk->count)
+    {
+      while(index < new_blk->count
+            && dbf->header->avail.count < dbf->header->avail.size)
     {
       /* With luck, this will merge a lot of blocks! */
       _gdbm_put_av_elem(new_blk->av_table[index],
 			dbf->header->avail.av_table,
-			&dbf->header->avail.count, dbf->coalesce_blocks);
+			     &dbf->header->avail.count, TRUE);
+	   index++;
+	}
+      if (dbf->header->avail.count == dbf->header->avail.size)
+        {
+          /* We're kind of stuck here, so we re-split the header in order to
+             avoid crashing.  Sigh. */
+          push_avail_block(dbf);
+	}
     }
 
   /* Fix next_block, as well. */
@@ -210,9 +229,17 @@
   /* We changed the header. */
   dbf->header_changed = TRUE;
 
-  /* Free the previous avail block. */
+  /* Free the previous avail block.   It is possible that the header table
+     is now FULL, which will cause us to overflow it! */
+  if (dbf->header->avail.count == dbf->header->avail.size)
+    {
+      /* We're kind of stuck here, so we re-split the header in order to
+         avoid crashing.  Sigh. */
+      push_avail_block(dbf);
+    }
+
   _gdbm_put_av_elem (new_el, dbf->header->avail.av_table,
-		     &dbf->header->avail.count, dbf->coalesce_blocks);
+		     &dbf->header->avail.count, TRUE);
   free (new_blk);
 }
 

gdbm-1.8.0-cflags.patch:

--- NEW FILE gdbm-1.8.0-cflags.patch ---
--- gdbm-1.8.0/Makefile.in.cflags	Tue Jun 12 19:50:21 2001
+++ gdbm-1.8.0/Makefile.in	Tue Jun 12 19:57:45 2001
@@ -17,22 +17,23 @@
 MAKEINFO = makeinfo
 TEXI2DVI = texi2dvi
 
-DEFS =
+DEFS = @DEFS@
 
 # Where the system [n]dbm routines are...
 LIBS = @LIBS@ -lc
 
 # SunOS 4 users might wish to add '-fpcc-struct-return' to CFLAGS. see INSTALL.
-CFLAGS = -O
-LDFLAGS =
+CPPFLAGS = @CPPFLAGS@
+CFLAGS = @CFLAGS@
+LDFLAGS = @LDFLAGS@
 
 # Common prefix for installation directories
-prefix = /usr/local
+prefix = /usr
 exec_prefix = $(prefix)
 mandir = $(prefix)/man
 
 # Directory in which to put libgdbm.a.
-libdir = $(exec_prefix)/lib
+libdir = $(prefix)/lib
 # The include directory for gdbm.h and dbm.h.
 includedir = $(prefix)/include
 # Info and man directories.

gdbm-1.8.0-fhs.patch:

--- NEW FILE gdbm-1.8.0-fhs.patch ---
--- gdbm-1.8.0/Makefile.in.fhs	Mon Jun  5 15:12:15 2000
+++ gdbm-1.8.0/Makefile.in	Mon Jun  5 15:16:34 2000
@@ -14,10 +14,6 @@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
 
-# File ownership and group
-BINOWN = bin
-BINGRP = bin
-
 MAKEINFO = makeinfo
 TEXI2DVI = texi2dvi
 
@@ -33,8 +29,7 @@
 # Common prefix for installation directories
 prefix = /usr/local
 exec_prefix = $(prefix)
-binprefix = $(exec_prefix)
-manprefix = $(prefix)
+mandir = $(prefix)/man
 
 # Directory in which to put libgdbm.a.
 libdir = $(exec_prefix)/lib
@@ -42,7 +37,7 @@
 includedir = $(prefix)/include
 # Info and man directories.
 infodir = $(prefix)/info
-man3dir = $(prefix)/man/man3
+man3dir = $(mandir)/man3
 manext = 3
 
 #### End of system configuration section. ####
@@ -122,18 +117,14 @@
 install: libgdbm.la gdbm.h gdbm.info
 	$(srcdir)/mkinstalldirs $(libdir) $(includedir) $(man3dir) $(infodir)
 	$(LIBTOOL) install -c libgdbm.la $(libdir)/libgdbm.la
-	$(INSTALL_DATA) -o $(BINOWN) -g $(BINGRP) gdbm.h $(includedir)/gdbm.h
-	$(INSTALL_DATA) -o $(BINOWN) -g $(BINGRP) $(srcdir)/gdbm.3 \
-		$(man3dir)/gdbm.3
-	$(INSTALL_DATA) -o $(BINOWN) -g $(BINGRP) $(srcdir)/gdbm.info \
-		$(infodir)/gdbm.info
+	$(INSTALL_DATA) gdbm.h $(includedir)/gdbm.h
+	$(INSTALL_DATA) $(srcdir)/gdbm.3 $(man3dir)/gdbm.3
+	$(INSTALL_DATA) $(srcdir)/gdbm.info $(infodir)/gdbm.info
 
 install-compat:
 	$(srcdir)/mkinstalldirs $(includedir)
-	$(INSTALL_DATA) -o $(BINOWN) -g $(BINGRP) $(srcdir)/dbm.h \
-		$(includedir)/dbm.h
-	$(INSTALL_DATA) -o $(BINOWN) -g $(BINGRP) $(srcdir)/ndbm.h \
-		$(includedir)/ndbm.h
+	$(INSTALL_DATA) $(srcdir)/dbm.h $(includedir)/dbm.h
+	$(INSTALL_DATA) $(srcdir)/ndbm.h $(includedir)/ndbm.h
 
 #libgdbm.a: $(OBJS) gdbm.h
 #	rm -f libgdbm.a

gdbm-1.8.0-jbj.patch:

--- NEW FILE gdbm-1.8.0-jbj.patch ---
--- gdbm-1.8.0/gdbmopen.c.jbj	Tue Aug 10 10:57:38 1999
+++ gdbm-1.8.0/gdbmopen.c	Tue Aug 10 10:59:06 1999
@@ -214,7 +214,7 @@
 	file_block_size = block_size;
 
       /* Get space for the file header. */
-      dbf->header = (gdbm_file_header *) malloc (file_block_size);
+      dbf->header = (gdbm_file_header *) calloc (1, file_block_size);
       if (dbf->header == NULL)
 	{
 	  gdbm_close (dbf);


--- NEW FILE import.log ---
mingw32-gdbm-1_8_0-1_fc10:HEAD:mingw32-gdbm-1.8.0-1.fc10.src.rpm:1232191724

mingw32-gdbm-1.8.0-windows.patch:

--- NEW FILE mingw32-gdbm-1.8.0-windows.patch ---
diff -urN gdbm-1.8.0.orig/configure.in gdbm-1.8.0.flock/configure.in
--- gdbm-1.8.0.orig/configure.in	1999-05-19 01:17:02.000000000 +0100
+++ gdbm-1.8.0.flock/configure.in	2008-10-03 16:55:30.000000000 +0100
@@ -5,6 +5,7 @@
 AC_PROG_CC
 AC_PROG_CPP
 AC_PROG_INSTALL
+AC_LIBTOOL_WIN32_DLL
 AM_PROG_LIBTOOL
 dnl AC_PROG_RANLIB
 dnl AC_WORDS_BIGENDIAN
@@ -13,8 +14,8 @@
 AC_HAVE_HEADERS(memory.h)
 AC_CHECK_LIB(dbm, main)
 AC_CHECK_LIB(ndbm, main)
-AC_HAVE_FUNCS(rename ftruncate flock bcopy fsync)
-AC_REPLACE_FUNCS(getopt)
+AC_HAVE_FUNCS(rename ftruncate bcopy)
+AC_REPLACE_FUNCS(flock fsync getopt)
 AC_OFF_T
 AC_ST_BLKSIZE
 AC_OUTPUT(Makefile)
diff -urN gdbm-1.8.0.orig/dbminit.c gdbm-1.8.0.flock/dbminit.c
--- gdbm-1.8.0.orig/dbminit.c	1999-05-19 01:16:05.000000000 +0100
+++ gdbm-1.8.0.flock/dbminit.c	2008-10-03 17:07:20.000000000 +0100
@@ -91,6 +91,7 @@
 	}
     }
 
+#if (!defined _WIN32 && !defined __WIN32__) || defined __CYGWIN__
   /* If the database is new, link "file.dir" to "file.pag". This is done
      so the time stamp on both files is the same. */
   if (stat (dir_file, &dir_stat) == 0)
@@ -116,6 +117,7 @@
 	  goto done;
 	}
     }
+#endif
 
   ret = 0;
 
diff -urN gdbm-1.8.0.orig/dbmopen.c gdbm-1.8.0.flock/dbmopen.c
--- gdbm-1.8.0.orig/dbmopen.c	1999-05-19 01:16:05.000000000 +0100
+++ gdbm-1.8.0.flock/dbmopen.c	2008-10-03 17:07:33.000000000 +0100
@@ -105,6 +105,7 @@
       goto done;
     }
 
+#if (!defined _WIN32 && !defined __WIN32__) || defined __CYGWIN__
   /* If the database is new, link "file.dir" to "file.pag". This is done
      so the time stamp on both files is the same. */
   if (stat (dir_file, &dir_stat) == 0)
@@ -130,6 +131,7 @@
 	  goto done;
 	}
     }
+#endif
 
 done:
   free (pag_file);
diff -urN gdbm-1.8.0.orig/flock.c gdbm-1.8.0.flock/flock.c
--- gdbm-1.8.0.orig/flock.c	1970-01-01 01:00:00.000000000 +0100
+++ gdbm-1.8.0.flock/flock.c	2008-10-03 17:02:01.000000000 +0100
@@ -0,0 +1,212 @@
+/* Emulate flock on platforms that lack it, primarily Windows and MinGW.
+
+   This is derived from sqlite3 sources.
+   http://www.sqlite.org/cvstrac/rlog?f=sqlite/src/os_win.c
+   http://www.sqlite.org/copyright.html
+
+   Written by Richard W.M. Jones <rjones.at.redhat.com>
+
+   Copyright (C) 2008 Free Software Foundation, Inc.
+
+   This library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   This library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#include <autoconf.h>
+#include "systems.h"
+
+#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
+
+/* _get_osfhandle */
+#include <io.h>
+
+/* LockFileEx */
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
+
+#include <errno.h>
+
+/* Determine the current size of a file.  Because the other braindead
+ * APIs we'll call need lower/upper 32 bit pairs, keep the file size
+ * like that too.
+ */
+static BOOL
+file_size (HANDLE h, DWORD * lower, DWORD * upper)
+{
+  *lower = GetFileSize (h, upper);
+  return 1;
+}
+
+/* LOCKFILE_FAIL_IMMEDIATELY is undefined on some Windows systems. */
+#ifndef LOCKFILE_FAIL_IMMEDIATELY
+# define LOCKFILE_FAIL_IMMEDIATELY 1
+#endif
+
+/* Acquire a lock. */
+static BOOL
+do_lock (HANDLE h, int non_blocking, int exclusive)
+{
+  BOOL res;
+  DWORD size_lower, size_upper;
+  OVERLAPPED ovlp;
+  int flags = 0;
+
+  /* We're going to lock the whole file, so get the file size. */
+  res = file_size (h, &size_lower, &size_upper);
+  if (!res)
+    return 0;
+
+  /* Start offset is 0, and also zero the remaining members of this struct. */
+  memset (&ovlp, 0, sizeof ovlp);
+
+  if (non_blocking)
+    flags |= LOCKFILE_FAIL_IMMEDIATELY;
+  if (exclusive)
+    flags |= LOCKFILE_EXCLUSIVE_LOCK;
+
+  return LockFileEx (h, flags, 0, size_lower, size_upper, &ovlp);
+}
+
+/* Unlock reader or exclusive lock. */
+static BOOL
+do_unlock (HANDLE h)
+{
+  int res;
+  DWORD size_lower, size_upper;
+
+  res = file_size (h, &size_lower, &size_upper);
+  if (!res)
+    return 0;
+
+  return UnlockFile (h, 0, 0, size_lower, size_upper);
+}
+
+/* Now our BSD-like flock operation. */
+int
+flock (int fd, int operation)
+{
+  HANDLE h = (HANDLE) _get_osfhandle (fd);
+  DWORD res;
+  int non_blocking;
+
+  if (h == INVALID_HANDLE_VALUE)
+    {
+      errno = EBADF;
+      return -1;
+    }
+
+  non_blocking = operation & LOCK_NB;
+  operation &= ~LOCK_NB;
+
+  switch (operation)
+    {
+    case LOCK_SH:
+      res = do_lock (h, non_blocking, 0);
+      break;
+    case LOCK_EX:
+      res = do_lock (h, non_blocking, 1);
+      break;
+    case LOCK_UN:
+      res = do_unlock (h);
+      break;
+    default:
+      errno = EINVAL;
+      return -1;
+    }
+
+  /* Map Windows errors into Unix errnos.  As usual MSDN fails to
+   * document the permissible error codes.
+   */
+  if (!res)
+    {
+      DWORD err = GetLastError ();
+      switch (err)
+	{
+	  /* This means someone else is holding a lock. */
+	case ERROR_LOCK_VIOLATION:
+	  errno = EAGAIN;
+	  break;
+
+	  /* Out of memory. */
+	case ERROR_NOT_ENOUGH_MEMORY:
+	  errno = ENOMEM;
+	  break;
+
+	case ERROR_BAD_COMMAND:
+	  errno = EINVAL;
+	  break;
+
+	  /* Unlikely to be other errors, but at least don't lose the
+	   * error code.
+	   */
+	default:
+	  errno = err;
+	}
+
+      return -1;
+    }
+
+  return 0;
+}
+
+#else /* !Windows */
+
+/* We know how to implement flock in terms of fcntl. */
+
+#ifdef HAVE_FCNTL_H
+#include <fcntl.h>
+#endif
+
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+
+int
+flock (int fd, int operation)
+{
+  int cmd, r;
+  struct flock fl;
+
+  if (operation & LOCK_NB)
+    cmd = F_SETLK;
+  else
+    cmd = F_SETLKW;
+  operation &= ~LOCK_NB;
+
+  memset (&fl, 0, sizeof fl);
+  fl.l_whence = SEEK_SET;
+  /* l_start & l_len are 0, which as a special case means "whole file". */
+
+  switch (operation)
+    {
+    case LOCK_SH:
+      fl.l_type = F_RDLCK;
+      break;
+    case LOCK_EX:
+      fl.l_type = F_WRLCK;
+      break;
+    case LOCK_UN:
+      fl.l_type = F_UNLCK;
+      break;
+    default:
+      errno = EINVAL;
+      return -1;
+    }
+
+  r = fcntl (fd, cmd, &fl);
+  if (r == -1 && errno == EACCES)
+    errno = EAGAIN;
+
+  return r;
+}
+
+#endif /* !Windows */
diff -urN gdbm-1.8.0.orig/fsync.c gdbm-1.8.0.flock/fsync.c
--- gdbm-1.8.0.orig/fsync.c	1970-01-01 01:00:00.000000000 +0100
+++ gdbm-1.8.0.flock/fsync.c	2008-10-03 17:02:15.000000000 +0100
@@ -0,0 +1,83 @@
+/* Emulate fsync on platforms that lack it, primarily Windows and
+   cross-compilers like MinGW.
+
+   This is derived from sqlite3 sources.
+   http://www.sqlite.org/cvstrac/rlog?f=sqlite/src/os_win.c
+   http://www.sqlite.org/copyright.html
+
+   Written by Richard W.M. Jones <rjones.at.redhat.com>
+
+   Copyright (C) 2008 Free Software Foundation, Inc.
+
+   This library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   This library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#include <autoconf.h>
+#include "systems.h"
+#include <unistd.h>
+
+#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
+
+/* _get_osfhandle */
+#include <io.h>
+
+/* FlushFileBuffers */
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
+
+#include <errno.h>
+
+int
+fsync (int fd)
+{
+  HANDLE h = (HANDLE) _get_osfhandle (fd);
+  DWORD err;
+
+  if (h == INVALID_HANDLE_VALUE)
+    {
+      errno = EBADF;
+      return -1;
+    }
+
+  if (!FlushFileBuffers (h))
+    {
+      /* Translate some Windows errors into rough approximations of Unix
+       * errors.  MSDN is useless as usual - in this case it doesn't
+       * document the full range of errors.
+       */
+      err = GetLastError ();
+      switch (err)
+	{
+	  /* eg. Trying to fsync a tty. */
+	case ERROR_INVALID_HANDLE:
+	  errno = EINVAL;
+	  break;
+
+	default:
+	  errno = EIO;
+	}
+      return -1;
+    }
+
+  return 0;
+}
+
+#else /* !Windows */
+
+int fsync (int fd)
+{
+  sync ();
+  sync ();
+}
+
+#endif /* !Windows */
diff -urN gdbm-1.8.0.orig/Makefile.in gdbm-1.8.0.flock/Makefile.in
--- gdbm-1.8.0.orig/Makefile.in	2008-10-03 16:32:57.000000000 +0100
+++ gdbm-1.8.0.flock/Makefile.in	2008-10-03 17:12:25.000000000 +0100
@@ -20,7 +20,7 @@
 DEFS = @DEFS@
 
 # Where the system [n]dbm routines are...
-LIBS = @LIBS@ -lc
+LIBS = @LIBS@
 
 # SunOS 4 users might wish to add '-fpcc-struct-return' to CFLAGS. see INSTALL.
 CPPFLAGS = @CPPFLAGS@
@@ -132,10 +132,10 @@
 #	ar q libgdbm.a $(OBJS)
 #	$(RANLIB) libgdbm.a
 
-libgdbm.la: $(LOBJS) gdbm.h
+libgdbm.la: $(LOBJS) @LTLIBOBJS@ gdbm.h
 	rm -f libgdbm.la
 	$(LIBTOOL) --mode=link $(CC) -o libgdbm.la -rpath $(libdir) \
-		-version-info $(SHLIB_VER) $(LOBJS)
+		-version-info $(SHLIB_VER) -no-undefined $(LOBJS) @LTLIBOBJS@
 
 gdbm.h:	gdbm.proto gdbmerrno.h gdbm.proto2
 	rm -f gdbm.h
@@ -146,19 +146,19 @@
 	chmod -w gdbm.h
 
 testgdbm: testgdbm.o libgdbm.la @LIBOBJS@
-	$(LIBTOOL) $(CC) $(LDFLAGS) -o testgdbm testgdbm.o libgdbm.la @LIBOBJS@
+	$(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o testgdbm testgdbm.o libgdbm.la @LIBOBJS@
 
 testdbm: testdbm.o libgdbm.la
-	$(LIBTOOL) $(CC) $(LDFLAGS) -o testdbm testdbm.o libgdbm.la
+	$(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o testdbm testdbm.o libgdbm.la
 
 tdbm: testdbm.o
-	$(CC) $(LDFLAGS) -o tdbm testdbm.o $(LIBS)
+	$(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o tdbm testdbm.o libgdbm.la $(LIBS)
 
 testndbm.o: testndbm.c
 	$(CC) -c -I. -I$(srcdir) $(CFLAGS) $(DEFS) -DGNU $(srcdir)/testndbm.c
 
 testndbm: testndbm.o libgdbm.la
-	$(LIBTOOL) $(CC) $(LDFLAGS) -o testndbm testndbm.o libgdbm.la
+	$(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o testndbm testndbm.o libgdbm.la
 
 tndbm.o: testndbm.c
 	cp $(srcdir)/testndbm.c ./tndbm.c
@@ -166,10 +166,10 @@
 	rm -f ./tndbm.c
 
 tndbm: tndbm.o
-	$(CC) $(LDFLAGS) -o tndbm tndbm.o $(LIBS)
+	$(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o tndbm tndbm.o libgdbm.la $(LIBS)
 
 conv2gdbm: conv2gdbm.o libgdbm.la @LIBOBJS@
-	$(LIBTOOL) $(CC) $(LDFLAGS) -o conv2gdbm conv2gdbm.o $(LIBS) libgdbm.la @LIBOBJS@
+	$(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o conv2gdbm conv2gdbm.o $(LIBS) libgdbm.la @LIBOBJS@
 
 lintgdbm: 
 	lint $(DEFS) $(LFLAGS) $(DBM_CF) $(NDBM_CF) $(GDBM_CF) testgdbm.c
diff -urN gdbm-1.8.0.orig/systems.h gdbm-1.8.0.flock/systems.h
--- gdbm-1.8.0.orig/systems.h	1999-05-19 03:09:46.000000000 +0100
+++ gdbm-1.8.0.flock/systems.h	2008-10-03 16:54:09.000000000 +0100
@@ -59,9 +59,9 @@
 #define L_SET SEEK_SET
 #endif
 
-/* Do we have flock?  (BSD...) */
-
-#if HAVE_FLOCK
+#ifndef HAVE_FLOCK
+extern int flock (int fd, int operation);
+#endif
 
 #ifndef LOCK_SH
 #define LOCK_SH	1
@@ -83,36 +83,6 @@
 #define READLOCK_FILE(dbf) lock_val = flock (dbf->desc, LOCK_SH + LOCK_NB)
 #define WRITELOCK_FILE(dbf) lock_val = flock (dbf->desc, LOCK_EX + LOCK_NB)
 
-#else
-
-/* Assume it is done like System V. */
-
-#define UNLOCK_FILE(dbf) \
-	{					\
-	  struct flock flock;			\
-	  flock.l_type = F_UNLCK;		\
-	  flock.l_whence = SEEK_SET;		\
-	  flock.l_start = flock.l_len = 0L;	\
-	  fcntl (dbf->desc, F_SETLK, &flock);	\
-	}
-#define READLOCK_FILE(dbf) \
-	{					\
-	  struct flock flock;			\
-	  flock.l_type = F_RDLCK;		\
-	  flock.l_whence = SEEK_SET;			\
-	  flock.l_start = flock.l_len = 0L;	\
-	  lock_val = fcntl (dbf->desc, F_SETLK, &flock);	\
-	}
-#define WRITELOCK_FILE(dbf) \
-	{					\
-	  struct flock flock;			\
-	  flock.l_type = F_WRLCK;		\
-	  flock.l_whence = SEEK_SET;			\
-	  flock.l_start = flock.l_len = 0L;	\
-	  lock_val = fcntl (dbf->desc, F_SETLK, &flock);	\
-	}
-#endif
-
 /* Do we have bcopy?  */
 #if !HAVE_BCOPY
 #if HAVE_MEMORY_H
@@ -122,9 +92,8 @@
 #define bcopy(d1, d2, n) memcpy(d2, d1, n)
 #endif
 
-/* Do we have fsync? */
-#if !HAVE_FSYNC
-#define fsync(f) {sync(); sync();}
+#ifndef HAVE_FSYNC
+extern int fsync (int fd);
 #endif
 
 /* Default block size.  Some systems do not have blocksize in their


--- NEW FILE mingw32-gdbm.spec ---
%define __strip %{_mingw32_strip}
%define __objdump %{_mingw32_objdump}
%define _use_internal_dependency_generator 0
%define __find_requires %{_mingw32_findrequires}
%define __find_provides %{_mingw32_findprovides}

Name:           mingw32-gdbm
Version:        1.8.0
Release:        1%{?dist}
Summary:        MinGW port of GNU database routines

License:        GPLv2+
Group:          Development/Libraries
URL:            http://www.gnu.org/software/gdbm/
Source0:        ftp://ftp.gnu.org/gnu/gdbm/gdbm-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Patch0:         gdbm-1.8.0-jbj.patch
Patch1:         gdbm-1.8.0-fhs.patch
Patch2:         gdbm-1.8.0-cflags.patch
Patch3:         gdbm-1.8.0-64offset.patch

Patch100:       mingw32-gdbm-1.8.0-windows.patch

BuildArch:      noarch

BuildRequires:  mingw32-filesystem >= 26
BuildRequires:  mingw32-gcc
BuildRequires:  mingw32-binutils

BuildRequires:  libtool


%description
Gdbm is a GNU database indexing library, including routines which use
extensible hashing.  Gdbm works in a similar way to standard UNIX dbm
routines.  Gdbm is useful for developers who write C applications and
need access to a simple and efficient database or who are building C
applications which will use such a database.

This is the MinGW Windows port of the libraries and development tools.


%prep
%setup -q -n gdbm-%{version}
%patch0 -p 1 -b .jbj
%patch1 -p 1 -b .fhs
%patch2 -p 1 -b .cflags
%patch3 -p1 -b .offset

%patch100 -p1 -b .windows


%build
libtoolize --force --copy
aclocal
autoreconf
%{_mingw32_configure}
make libdir=%{_mingw32_libdir} all progs


%install
rm -rf $RPM_BUILD_ROOT
make prefix=$RPM_BUILD_ROOT%{_mingw32_prefix} install

# Install the binaries.  Arguable whether we really want these.
install conv2gdbm.exe tdbm.exe testdbm.exe testgdbm.exe testndbm.exe tndbm.exe \
  $RPM_BUILD_ROOT%{_mingw32_bindir}

# Native Fedora package seems to fluff this, but as far as I
# can tell they are trying to create <gdbm/gdbm.h> which
# links to <gdbm.h>.
pushd $RPM_BUILD_ROOT%{_mingw32_includedir}
mkdir gdbm
cd gdbm
ln -s ../gdbm.h
popd

# Remove the static library.
rm $RPM_BUILD_ROOT%{_mingw32_libdir}/libgdbm.a

# Remove man page and info file which duplicate what is in native package.
rm -r $RPM_BUILD_ROOT%{_mingw32_prefix}/man
rm -r $RPM_BUILD_ROOT%{_mingw32_prefix}/info


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root)
%{_mingw32_bindir}/conv2gdbm.exe
%{_mingw32_bindir}/tdbm.exe
%{_mingw32_bindir}/testdbm.exe
%{_mingw32_bindir}/testgdbm.exe
%{_mingw32_bindir}/testndbm.exe
%{_mingw32_bindir}/tndbm.exe
%{_mingw32_bindir}/libgdbm-2.dll
%{_mingw32_libdir}/libgdbm.dll.a
%{_mingw32_libdir}/libgdbm.la
%{_mingw32_includedir}/gdbm.h
%{_mingw32_includedir}/gdbm


%changelog
* Fri Oct  3 2008 Richard W.M. Jones <rjones at redhat.com> - 1.8.0-1
- Initial RPM release.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-gdbm/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	17 Jan 2009 03:27:23 -0000	1.1
+++ .cvsignore	17 Jan 2009 11:34:19 -0000	1.2
@@ -0,0 +1 @@
+gdbm-1.8.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-gdbm/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	17 Jan 2009 03:27:23 -0000	1.1
+++ sources	17 Jan 2009 11:34:19 -0000	1.2
@@ -0,0 +1 @@
+cd543862287f55ad66e62cc9d82cc906  gdbm-1.8.0.tar.gz



From rjones at fedoraproject.org  Sat Jan 17 11:36:40 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Sat, 17 Jan 2009 11:36:40 +0000 (UTC)
Subject: rpms/mingw32-freetype/devel freetype-2.1.10-enable-ft2-bci.patch,
	NONE, 1.1 freetype-2.2.1-enable-valid.patch, NONE,
	1.1 freetype-2.2.1-memcpy-fix.patch, NONE,
	1.1 freetype-2.3.0-enable-spr.patch, NONE,
	1.1 freetype-multilib.patch, NONE, 1.1 import.log, NONE,
	1.1 mingw32-freetype.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090117113640.14D1B7012B@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/mingw32-freetype/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4013/devel

Modified Files:
	.cvsignore sources 
Added Files:
	freetype-2.1.10-enable-ft2-bci.patch 
	freetype-2.2.1-enable-valid.patch 
	freetype-2.2.1-memcpy-fix.patch 
	freetype-2.3.0-enable-spr.patch freetype-multilib.patch 
	import.log mingw32-freetype.spec 
Log Message:
Initial import.


freetype-2.1.10-enable-ft2-bci.patch:

--- NEW FILE freetype-2.1.10-enable-ft2-bci.patch ---
--- freetype-2.1.10/include/freetype/config/ftoption.h.enable-ft2-bci	2005-10-12 13:50:40.000000000 -0400
+++ freetype-2.1.10/include/freetype/config/ftoption.h	2005-10-12 14:18:50.000000000 -0400
@@ -436,7 +436,7 @@
   /*   Do not #undef this macro here, since the build system might         */
   /*   define it for certain configurations only.                          */
   /*                                                                       */
-/* #define TT_CONFIG_OPTION_BYTECODE_INTERPRETER */
+#define TT_CONFIG_OPTION_BYTECODE_INTERPRETER
 
 
   /*************************************************************************/

freetype-2.2.1-enable-valid.patch:

--- NEW FILE freetype-2.2.1-enable-valid.patch ---
--- freetype-2.2.1/modules.cfg.orig	2006-07-07 21:01:09.000000000 -0400
+++ freetype-2.2.1/modules.cfg	2006-07-07 21:01:54.000000000 -0400
@@ -110,7 +110,7 @@
 AUX_MODULES += cache
 
 # TrueType GX/AAT table validation.  Needs ftgxval.c below.
-# AUX_MODULES += gxvalid
+AUX_MODULES += gxvalid
 
 # Support for streams compressed with gzip (files with suffix .gz).
 #
@@ -124,7 +124,7 @@
 
 # OpenType table validation.  Needs ftotval.c below.
 #
-# AUX_MODULES += otvalid
+AUX_MODULES += otvalid
 
 # Auxiliary PostScript driver component to share common code.
 #

freetype-2.2.1-memcpy-fix.patch:

--- NEW FILE freetype-2.2.1-memcpy-fix.patch ---
--- freetype-2.2.1/src/psaux/psobjs.c~	2006-04-26 16:38:17.000000000 +0200
+++ freetype-2.2.1/src/psaux/psobjs.c	2006-09-10 15:01:13.000000000 +0200
@@ -165,6 +165,11 @@
       return PSaux_Err_Invalid_Argument;
     }
 
+    if ( length < 0 ) {
+      FT_ERROR(( "ps_table_add: invalid length\n" ));
+      return PSaux_Err_Invalid_Argument;
+    }
+
     /* grow the base block if needed */
     if ( table->cursor + length > table->capacity )
     {

freetype-2.3.0-enable-spr.patch:

--- NEW FILE freetype-2.3.0-enable-spr.patch ---
--- freetype-2.3.0/include/freetype/config/ftoption.h.spf	2007-01-18 14:27:34.000000000 -0500
+++ freetype-2.3.0/include/freetype/config/ftoption.h	2007-01-18 14:27:48.000000000 -0500
@@ -92,7 +92,7 @@
   /* This is done to allow FreeType clients to run unmodified, forcing     */
   /* them to display normal gray-level anti-aliased glyphs.                */
   /*                                                                       */
-/* #define FT_CONFIG_OPTION_SUBPIXEL_RENDERING */
+#define FT_CONFIG_OPTION_SUBPIXEL_RENDERING
 
 
   /*************************************************************************/

freetype-multilib.patch:

--- NEW FILE freetype-multilib.patch ---
--- freetype-2.2.1/builds/unix/freetype-config.in.multilib	2006-07-27 18:50:40.000000000 -0400
+++ freetype-2.2.1/builds/unix/freetype-config.in	2006-07-27 18:58:13.000000000 -0400
@@ -9,11 +9,11 @@
 # indicate that you have read the license and understand and accept it
 # fully.
 
-prefix=@prefix@
-exec_prefix=@exec_prefix@
+prefix=`pkg-config --variable prefix freetype2`
+exec_prefix=`pkg-config --variable exec_prefix freetype2`
 exec_prefix_set=no
-includedir=@includedir@
-libdir=@libdir@
+includedir=`pkg-config --variable includedir freetype2`
+libdir=`pkg-config --variable libdir freetype2`
 enable_shared=@build_libtool_libs@
 wl=@wl@
 hardcode_libdir_flag_spec='@hardcode_libdir_flag_spec@'


--- NEW FILE import.log ---
mingw32-freetype-2_3_8-1_fc10:HEAD:mingw32-freetype-2.3.8-1.fc10.src.rpm:1232191855


--- NEW FILE mingw32-freetype.spec ---
%define __strip %{_mingw32_strip}
%define __objdump %{_mingw32_objdump}
%define _use_internal_dependency_generator 0
%define __find_requires %{_mingw32_findrequires}
%define __find_provides %{_mingw32_findprovides}

# Patented bytecode interpreter and patented subpixel rendering
# disabled by default.  Pass '--with bytecode_interpreter' and '--with
# subpixel_rendering' on rpmbuild command-line to enable them.

%define _with_subpixel_rendering 1}
%define _without_subpixel_rendering 0}
%{!?_with_bytecode_interpreter: %{!?_without_bytecode_interpreter: %define _without_bytecode_interpreter --without-bytecode_interpreter}}
%{!?_with_subpixel_rendering: %{!?_without_subpixel_rendering: %define _without_subpixel_rendering --without-subpixel_rendering}}

%define with_xfree86 0

Name:           mingw32-freetype
Version:        2.3.8
Release:        1%{?dist}
Summary:        Free and portable font rendering engine

License:        FTL or GPLv2+
URL:            http://www.freetype.org
Source:         http://download.savannah.gnu.org/releases/freetype/freetype-%{version}.tar.bz2
Source1:        http://download.savannah.gnu.org/releases/freetype/freetype-doc-%{version}.tar.bz2
#Source2:        http://download.savannah.gnu.org/releases/freetype/ft2demos-%{version}.tar.bz2
Group:          Development/Libraries
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

# Patches from native Fedora package.
#Patch5:         ft2demos-2.1.9-mathlib.patch
Patch20:        freetype-2.1.10-enable-ft2-bci.patch
Patch21:        freetype-2.3.0-enable-spr.patch
Patch46:        freetype-2.2.1-enable-valid.patch
Patch88:        freetype-multilib.patch
Patch89:        freetype-2.2.1-memcpy-fix.patch

BuildArch:      noarch

BuildRequires:  mingw32-filesystem >= 25
BuildRequires:  mingw32-gcc
BuildRequires:  mingw32-binutils
BuildRequires:  mingw32-zlib
BuildRequires:  mingw32-dlfcn

Requires:       pkgconfig


%description
MinGW Windows Freetype library.


%prep
%setup -q -n freetype-%{version} -b 1 -a 1

#pushd ft2demos-%{version}
#%patch5 -p1 -b .mathlib
#popd

%if %{?_with_bytecode_interpreter:1}%{!?_with_bytecode_interpreter:0}
%patch20  -p1 -b .enable-ft2-bci
%endif

%if %{?_with_subpixel_rendering:1}%{!?_with_subpixel_rendering:0}
%patch21  -p1 -b .enable-spr
%endif

%patch46  -p1 -b .enable-valid

%patch88 -p1 -b .multilib
%patch89 -p1 -b .memcpy


%build
%{_mingw32_configure} --disable-static
make %{?_smp_mflags}

# The ft2demos Makefile is hacky and doesn't understand
# cross-compilation.  This nearly works, but not quite, so
# disable. it.
#pushd ft2demos-%{version}
#make TOP_DIR=".." PLATFORM=win32
#popd


%install
rm -rf $RPM_BUILD_ROOT

make DESTDIR=$RPM_BUILD_ROOT install


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root)
%doc docs/LICENSE.TXT
%{_mingw32_bindir}/freetype-config
%{_mingw32_bindir}/libfreetype-6.dll
%{_mingw32_includedir}/freetype2
%{_mingw32_includedir}/ft2build.h
%{_mingw32_libdir}/libfreetype.dll.a
%{_mingw32_libdir}/libfreetype.la
%{_mingw32_libdir}/pkgconfig/freetype2.pc
%{_mingw32_datadir}/aclocal/freetype2.m4


%changelog
* Fri Jan 16 2009 Richard W.M. Jones <rjones at redhat.com> - 2.3.8-1
- New upstream version 2.3.8.
- Use the patches from the Fedora native package.
- Disable patented code.
- Don't build the static library.
- Use _smp_mflags.
- BR mingw32-dlfcn (not required, but uses it if installed).
- Add license file to doc section.

* Tue Jan 13 2009 Richard W.M. Jones <rjones at redhat.com> - 2.3.7-6
- Requires pkgconfig.

* Wed Sep 24 2008 Richard W.M. Jones <rjones at redhat.com> - 2.3.7-5
- Rename mingw -> mingw32.

* Mon Sep 22 2008 Daniel P. Berrange <berrange at redhat.com> - 2.3.7-4
- Import patches from rawhide  & add docs

* Sun Sep 21 2008 Richard W.M. Jones <rjones at redhat.com> - 2.3.7-3
- Depends on filesystem >= 25.

* Wed Sep 10 2008 Richard W.M. Jones <rjones at redhat.com> - 2.3.7-2
- Fix source URL.
- Remove static libraries.

* Tue Sep  9 2008 Daniel P. Berrange <berrange at redhat.com> - 2.3.7-1
- Initial RPM release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-freetype/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	17 Jan 2009 03:28:53 -0000	1.1
+++ .cvsignore	17 Jan 2009 11:36:09 -0000	1.2
@@ -0,0 +1,2 @@
+freetype-2.3.8.tar.bz2
+freetype-doc-2.3.8.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-freetype/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	17 Jan 2009 03:28:53 -0000	1.1
+++ sources	17 Jan 2009 11:36:09 -0000	1.2
@@ -0,0 +1,2 @@
+6cf31a08826715a0d16ae366da9c7d3b  freetype-2.3.8.tar.bz2
+de1cc7cf098e11fba5898efdab1bc23d  freetype-doc-2.3.8.tar.bz2



From rjones at fedoraproject.org  Sat Jan 17 11:38:21 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Sat, 17 Jan 2009 11:38:21 +0000 (UTC)
Subject: rpms/mingw32-readline/devel import.log, NONE,
	1.1 mingw32-readline.spec, NONE, 1.1 readline-5.2-001.patch,
	NONE, 1.1 readline-5.2-002.patch, NONE,
	1.1 readline-5.2-003.patch, NONE, 1.1 readline-5.2-004.patch,
	NONE, 1.1 readline-5.2-005.patch, NONE,
	1.1 readline-5.2-006.patch, NONE, 1.1 readline-5.2-007.patch,
	NONE, 1.1 readline-5.2-008.patch, NONE,
	1.1 readline-5.2-009.patch, NONE, 1.1 readline-5.2-010.patch,
	NONE, 1.1 readline-5.2-011.patch, NONE,
	1.1 readline-5.2-redisplay-sigint.patch, NONE,
	1.1 readline-5.2-shlib.patch, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090117113821.AB5487012B@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/mingw32-readline/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4357/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log mingw32-readline.spec readline-5.2-001.patch 
	readline-5.2-002.patch readline-5.2-003.patch 
	readline-5.2-004.patch readline-5.2-005.patch 
	readline-5.2-006.patch readline-5.2-007.patch 
	readline-5.2-008.patch readline-5.2-009.patch 
	readline-5.2-010.patch readline-5.2-011.patch 
	readline-5.2-redisplay-sigint.patch readline-5.2-shlib.patch 
Log Message:
Initial import.



--- NEW FILE import.log ---
mingw32-readline-5_2-4_fc10:HEAD:mingw32-readline-5.2-4.fc10.src.rpm:1232192026


--- NEW FILE mingw32-readline.spec ---
%define __strip %{_mingw32_strip}
%define __objdump %{_mingw32_objdump}
%define _use_internal_dependency_generator 0
%define __find_requires %{_mingw32_findrequires}
%define __find_provides %{_mingw32_findprovides}

Name:           mingw32-readline
Version:        5.2
Release:        4%{?dist}
Summary:        MinGW port of readline for editing typed command lines

License:        GPLv2+
Group:          System Environment/Libraries
URL:            http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html
Source0:        ftp://ftp.gnu.org/gnu/readline/readline-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Patch1:         readline-5.2-shlib.patch
Patch2:         readline-5.2-001.patch
Patch3:         readline-5.2-002.patch
Patch4:         readline-5.2-003.patch
Patch5:         readline-5.2-004.patch
Patch6:         readline-5.2-005.patch
Patch7:         readline-5.2-006.patch
Patch8:         readline-5.2-007.patch
Patch9:         readline-5.2-008.patch
Patch10:        readline-5.2-009.patch
Patch11:        readline-5.2-010.patch
Patch12:        readline-5.2-011.patch
Patch13:        readline-5.2-redisplay-sigint.patch

BuildArch:      noarch

BuildRequires:  mingw32-filesystem >= 29
BuildRequires:  mingw32-gcc
BuildRequires:  mingw32-binutils
BuildRequires:  mingw32-termcap >= 1.3.1-3


%description
The Readline library provides a set of functions that allow users to
edit command lines. Both Emacs and vi editing modes are available. The
Readline library includes additional functions for maintaining a list
of previously-entered command lines for recalling or editing those
lines, and for performing csh-like history expansion on previous
commands.

This is a port of the library and development tools to Windows.


%prep
%setup -q -n readline-%{version}
%patch1 -p1 -b .shlib
%patch2 -p0 -b .001
%patch3 -p0 -b .002
%patch4 -p0 -b .003
%patch5 -p0 -b .004
%patch6 -p0 -b .005
%patch7 -p0 -b .006
%patch8 -p0 -b .007
%patch9 -p0 -b .008
%patch10 -p0 -b .009
%patch11 -p0 -b .010
%patch12 -p0 -b .011
%patch13 -p1 -b .redisplay-sigint

pushd examples
rm -f rlfe/configure
iconv -f iso8859-1 -t utf8 -o rl-fgets.c{_,}
touch -r rl-fgets.c{,_}
mv -f rl-fgets.c{_,}
popd


%build
%{_mingw32_configure} --enable-shared
make SHLIB_LIBS=-ltermcap

# Rebuild the DLLs correctly and create implibs.
pushd shlib
%{_mingw32_cc} -shared -o readline.dll -Wl,--out-implib,libreadline.dll.a readline.so vi_mode.so funmap.so keymaps.so parens.so search.so rltty.so complete.so bind.so isearch.so display.so signals.so util.so kill.so undo.so macro.so input.so callback.so terminal.so text.so nls.so misc.so xmalloc.so history.so histexpand.so histfile.so histsearch.so shell.so mbutil.so tilde.so compat.so -ltermcap
%{_mingw32_cc} -shared -o history.dll -Wl,--out-implib,libhistory.dll.a history.so histexpand.so histfile.so histsearch.so shell.so mbutil.so xmalloc.so
popd


%install
rm -rf $RPM_BUILD_ROOT
make DESTDIR=$RPM_BUILD_ROOT install

# Remove the fake .so files and install our DLLs and implibs.
pushd shlib
rm $RPM_BUILD_ROOT%{_mingw32_libdir}/lib*.so.*
mkdir -p $RPM_BUILD_ROOT%{_mingw32_bindir}
install readline.dll $RPM_BUILD_ROOT%{_mingw32_bindir}
install libreadline.dll.a $RPM_BUILD_ROOT%{_mingw32_libdir}
install history.dll $RPM_BUILD_ROOT%{_mingw32_bindir}
install libhistory.dll.a $RPM_BUILD_ROOT%{_mingw32_libdir}
popd

# Don't want the info files or manpages which duplicate the native package.
rm -rf $RPM_BUILD_ROOT%{_mingw32_mandir}
rm -rf $RPM_BUILD_ROOT%{_mingw32_infodir}

# Don't want the static library.
rm $RPM_BUILD_ROOT%{_mingw32_libdir}/libhistory.a
rm $RPM_BUILD_ROOT%{_mingw32_libdir}/libreadline.a


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root)
%{_mingw32_bindir}/readline.dll
%{_mingw32_bindir}/history.dll
%{_mingw32_libdir}/libreadline.dll.a
%{_mingw32_libdir}/libhistory.dll.a
%{_mingw32_includedir}/readline/


%changelog
* Sat Nov 22 2008 Richard W.M. Jones <rjones at redhat.com> - 5.2-4
- Rename *.dll.a to lib*.dll.a so that libtool can use these libraries.

* Wed Nov 19 2008 Richard W.M. Jones <rjones at redhat.com> - 5.2-3
- Fix paths to mandir, infodir.

* Fri Oct 31 2008 Richard W.M. Jones <rjones at redhat.com> - 5.2-2
- Rebuild against latest termcap.

* Thu Sep 25 2008 Richard W.M. Jones <rjones at redhat.com> - 5.2-1
- Initial RPM release.

readline-5.2-001.patch:

--- NEW FILE readline-5.2-001.patch ---
			   READLINE PATCH REPORT
			   =====================

Readline-Release: 5.2
Patch-ID: readline52-001

Bug-Reported-by:	ebb9 at byu.net
Bug-Reference-ID:	<45540862.9030900 at byu.net>
Bug-Reference-URL:	http://lists.gnu.org/archive/html/bug-bash/2006-11/msg00017.html
			http://lists.gnu.org/archive/html/bug-bash/2006-11/msg00016.html

Bug-Description:

In some cases, code that is intended to be used in the presence of multibyte
characters is called when no such characters are present, leading to incorrect
display position calculations and incorrect redisplay.

Patch:

*** ../readline-5.2/display.c	Thu Sep 14 14:20:12 2006
--- display.c	Mon Nov 13 17:55:57 2006
***************
*** 2381,2384 ****
--- 2409,2414 ----
    if (end <= start)
      return 0;
+   if (MB_CUR_MAX == 1 || rl_byte_oriented)
+     return (end - start);
  
    memset (&ps, 0, sizeof (mbstate_t));

readline-5.2-002.patch:

--- NEW FILE readline-5.2-002.patch ---
			   READLINE PATCH REPORT
			   =====================

Readline-Release: 5.2
Patch-ID: readline52-002

Bug-Reported-by: Magnus Svensson <msvensson at mysql.com>
Bug-Reference-ID: <45BDC44D.80609 at mysql.com>
Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-readline/2007-01/msg00002.html

Bug-Description:

Readline neglects to reallocate the array it uses to keep track of wrapped
screen lines when increasing its size.  This will eventually result in
segmentation faults when given sufficiently long input.

Patch:

*** ../readline-5.2-patched/display.c	Thu Sep 14 14:20:12 2006
--- display.c	Fri Feb  2 20:23:17 2007
***************
*** 561,574 ****
--- 561,586 ----
        wrap_offset = prompt_invis_chars_first_line = 0;
      }
  
+ #if defined (HANDLE_MULTIBYTE)
  #define CHECK_INV_LBREAKS() \
        do { \
  	if (newlines >= (inv_lbsize - 2)) \
  	  { \
  	    inv_lbsize *= 2; \
  	    inv_lbreaks = (int *)xrealloc (inv_lbreaks, inv_lbsize * sizeof (int)); \
+ 	    _rl_wrapped_line = (int *)xrealloc (_rl_wrapped_line, inv_lbsize * sizeof (int)); \
  	  } \
        } while (0)
+ #else
+ #define CHECK_INV_LBREAKS() \
+       do { \
+ 	if (newlines >= (inv_lbsize - 2)) \
+ 	  { \
+ 	    inv_lbsize *= 2; \
+ 	    inv_lbreaks = (int *)xrealloc (inv_lbreaks, inv_lbsize * sizeof (int)); \
+ 	  } \
+       } while (0)
+ #endif /* HANDLE_MULTIBYTE */
  
  #if defined (HANDLE_MULTIBYTE)	  
  #define CHECK_LPOS() \

readline-5.2-003.patch:

--- NEW FILE readline-5.2-003.patch ---
			   READLINE PATCH REPORT
			   =====================

Readline-Release: 5.2
Patch-ID: readline52-003

Bug-Reported-by: Peter Volkov <torre_cremata at mail.ru>
Bug-Reference-ID: <1171795523.8021.18.camel at localhost>
Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2007-02/msg00054.html

Bug-Description:

When moving the cursor, bash sometimes misplaces the cursor when the prompt
contains two or more multibyte characters.  The particular circumstance that
uncovered the problem was having the (multibyte) current directory name in
the prompt string.

Patch:

*** ../readline-5.2.2/display.c	Fri Jan 19 13:34:50 2007
--- display.c	Sat Mar 10 17:25:44 2007
***************
*** 1745,1749 ****
      {
        dpos = _rl_col_width (data, 0, new);
!       if (dpos > prompt_last_invisible)		/* XXX - don't use woff here */
  	{
  	  dpos -= woff;
--- 1745,1752 ----
      {
        dpos = _rl_col_width (data, 0, new);
!       /* Use NEW when comparing against the last invisible character in the
! 	 prompt string, since they're both buffer indices and DPOS is a
! 	 desired display position. */
!       if (new > prompt_last_invisible)		/* XXX - don't use woff here */
  	{
  	  dpos -= woff;

readline-5.2-004.patch:

--- NEW FILE readline-5.2-004.patch ---
			   READLINE PATCH REPORT
			   =====================

Readline-Release: 5.2
Patch-ID: readline52-004

Bug-Reported-by: Peter Volkov <torre_cremata at mail.ru>
Bug-Reference-ID: <1173636022.7039.36.camel at localhost>
Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2007-03/msg00039.html

Bug-Description:

When restoring the original prompt after finishing an incremental search,
bash sometimes places the cursor incorrectly if the primary prompt contains
invisible characters.

Patch:

*** ../readline-5.2.3/display.c	Fri Apr 20 13:30:16 2007
--- display.c	Fri Apr 20 15:17:01 2007
***************
*** 1599,1604 ****
  	  if (temp > 0)
  	    {
  	      _rl_output_some_chars (nfd, temp);
! 	      _rl_last_c_pos += _rl_col_width (nfd, 0, temp);;
  	    }
  	}
--- 1599,1618 ----
  	  if (temp > 0)
  	    {
+ 	      /* If nfd begins at the prompt, or before the invisible
+ 		 characters in the prompt, we need to adjust _rl_last_c_pos
+ 		 in a multibyte locale to account for the wrap offset and
+ 		 set cpos_adjusted accordingly. */
  	      _rl_output_some_chars (nfd, temp);
! 	      if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
! 		{
!                   _rl_last_c_pos += _rl_col_width (nfd, 0, temp);
!                   if (current_line == 0 && wrap_offset &&  ((nfd - new) <= prompt_last_invisible))
! 		    {
! 		      _rl_last_c_pos -= wrap_offset;
! 		      cpos_adjusted = 1;
! 		    }
! 		}
!               else
!                 _rl_last_c_pos += temp;
  	    }
  	}
***************
*** 1608,1613 ****
--- 1622,1639 ----
  	  if (temp > 0)
  	    {
+ 	      /* If nfd begins at the prompt, or before the invisible
+ 		 characters in the prompt, we need to adjust _rl_last_c_pos
+ 		 in a multibyte locale to account for the wrap offset and
+ 		 set cpos_adjusted accordingly. */
  	      _rl_output_some_chars (nfd, temp);
  	      _rl_last_c_pos += col_temp;		/* XXX */
+ 	      if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
+ 		{
+ 		  if (current_line == 0 && wrap_offset &&  ((nfd - new) <= prompt_last_invisible))
+ 		    {
+ 		      _rl_last_c_pos -= wrap_offset;
+ 		      cpos_adjusted = 1;
+ 		    }
+ 		}
  	    }
  	  lendiff = (oe - old) - (ne - new);

readline-5.2-005.patch:

--- NEW FILE readline-5.2-005.patch ---
			   READLINE PATCH REPORT
			   =====================

Readline-Release: 5.2
Patch-ID: readline52-005

Bug-Reported-by:        Thomas Loeber <ifp at loeber1.de>
Bug-Reference-ID:       <200703082223.08919.ifp at loeber1.de>
Bug-Reference-URL:	http://lists.gnu.org/archive/html/bug-bash/2007-03/msg00036.html

Bug-Description:

When rl_read_key returns -1, indicating that readline's controlling terminal
has been invalidated for some reason (e.g., receiving a SIGHUP), the error
status was not reported correctly to the caller.  This could cause input
loops. 

Patch:

*** ../readline-5.2/complete.c	Fri Jul 28 11:35:49 2006
--- complete.c	Tue Mar 13 08:50:16 2007
***************
*** 429,433 ****
        if (c == 'n' || c == 'N' || c == RUBOUT)
  	return (0);
!       if (c == ABORT_CHAR)
  	_rl_abort_internal ();
        if (for_pager && (c == NEWLINE || c == RETURN))
--- 440,444 ----
        if (c == 'n' || c == 'N' || c == RUBOUT)
  	return (0);
!       if (c == ABORT_CHAR || c < 0)
  	_rl_abort_internal ();
        if (for_pager && (c == NEWLINE || c == RETURN))
*** ../readline-5.2/input.c	Wed Aug 16 15:15:16 2006
--- input.c	Wed May  2 16:07:59 2007
***************
*** 514,518 ****
       int size;
  {
!   int mb_len = 0;
    size_t mbchar_bytes_length;
    wchar_t wc;
--- 522,526 ----
       int size;
  {
!   int mb_len, c;
    size_t mbchar_bytes_length;
    wchar_t wc;
***************
*** 521,531 ****
    memset(&ps, 0, sizeof (mbstate_t));
    memset(&ps_back, 0, sizeof (mbstate_t));
!   
    while (mb_len < size)
      {
        RL_SETSTATE(RL_STATE_MOREINPUT);
!       mbchar[mb_len++] = rl_read_key ();
        RL_UNSETSTATE(RL_STATE_MOREINPUT);
  
        mbchar_bytes_length = mbrtowc (&wc, mbchar, mb_len, &ps);
        if (mbchar_bytes_length == (size_t)(-1))
--- 529,545 ----
    memset(&ps, 0, sizeof (mbstate_t));
    memset(&ps_back, 0, sizeof (mbstate_t));
! 
!   mb_len = 0;  
    while (mb_len < size)
      {
        RL_SETSTATE(RL_STATE_MOREINPUT);
!       c = rl_read_key ();
        RL_UNSETSTATE(RL_STATE_MOREINPUT);
  
+       if (c < 0)
+ 	break;
+ 
+       mbchar[mb_len++] = c;
+ 
        mbchar_bytes_length = mbrtowc (&wc, mbchar, mb_len, &ps);
        if (mbchar_bytes_length == (size_t)(-1))
***************
*** 565,569 ****
    c = first;
    memset (mb, 0, mlen);
!   for (i = 0; i < mlen; i++)
      {
        mb[i] = (char)c;
--- 579,583 ----
    c = first;
    memset (mb, 0, mlen);
!   for (i = 0; c >= 0 && i < mlen; i++)
      {
        mb[i] = (char)c;
*** ../readline-5.2/isearch.c	Mon Dec 26 17:18:53 2005
--- isearch.c	Fri Mar  9 14:30:59 2007
***************
*** 328,333 ****
  
    f = (rl_command_func_t *)NULL;
!  
!  /* Translate the keys we do something with to opcodes. */
    if (c >= 0 && _rl_keymap[c].type == ISFUNC)
      {
--- 328,340 ----
  
    f = (rl_command_func_t *)NULL;
! 
!   if (c < 0)
!     {
!       cxt->sflags |= SF_FAILED;
!       cxt->history_pos = cxt->last_found_line;
!       return -1;
!     }
! 
!   /* Translate the keys we do something with to opcodes. */
    if (c >= 0 && _rl_keymap[c].type == ISFUNC)
      {
*** ../readline-5.2/misc.c	Mon Dec 26 17:20:46 2005
--- misc.c	Fri Mar  9 14:44:11 2007
***************
*** 147,150 ****
--- 147,152 ----
  	  rl_clear_message ();
  	  RL_UNSETSTATE(RL_STATE_NUMERICARG);
+ 	  if (key < 0)
+ 	    return -1;
  	  return (_rl_dispatch (key, _rl_keymap));
  	}
*** ../readline-5.2/readline.c	Wed Aug 16 15:00:36 2006
--- readline.c	Fri Mar  9 14:47:24 2007
***************
*** 646,649 ****
--- 669,677 ----
      {
        nkey = _rl_subseq_getchar (cxt->okey);
+       if (nkey < 0)
+ 	{
+ 	  _rl_abort_internal ();
+ 	  return -1;
+ 	}
        r = _rl_dispatch_subseq (nkey, cxt->dmap, cxt->subseq_arg);
        cxt->flags |= KSEQ_DISPATCHED;
*** ../readline-5.2/text.c	Fri Jul 28 11:55:27 2006
--- text.c	Sun Mar 25 13:41:38 2007
***************
*** 858,861 ****
--- 864,870 ----
    RL_UNSETSTATE(RL_STATE_MOREINPUT);
  
+   if (c < 0)
+     return -1;
+ 
  #if defined (HANDLE_SIGNALS)
    if (RL_ISSTATE (RL_STATE_CALLBACK) == 0)
***************
*** 1521,1524 ****
--- 1530,1536 ----
    mb_len = _rl_read_mbchar (mbchar, MB_LEN_MAX);
  
+   if (mb_len <= 0)
+     return -1;
+ 
    if (count < 0)
      return (_rl_char_search_internal (-count, bdir, mbchar, mb_len));
***************
*** 1537,1540 ****
--- 1549,1555 ----
    RL_UNSETSTATE(RL_STATE_MOREINPUT);
  
+   if (c < 0)
+     return -1;
+ 
    if (count < 0)
      return (_rl_char_search_internal (-count, bdir, c));
*** ../readline-5.2/vi_mode.c	Sat Jul 29 16:42:28 2006
--- vi_mode.c	Fri Mar  9 15:02:11 2007
***************
*** 887,890 ****
--- 887,897 ----
    c = rl_read_key ();
    RL_UNSETSTATE(RL_STATE_MOREINPUT);
+ 
+   if (c < 0)
+     {
+       *nextkey = 0;
+       return -1;
+     }
+ 
    *nextkey = c;
  
***************
*** 903,906 ****
--- 910,918 ----
  	  c = rl_read_key ();	/* real command */
  	  RL_UNSETSTATE(RL_STATE_MOREINPUT);
+ 	  if (c < 0)
+ 	    {
+ 	      *nextkey = 0;
+ 	      return -1;
+ 	    }
  	  *nextkey = c;
  	}
***************
*** 1225,1236 ****
       _rl_callback_generic_arg *data;
  {
  #if defined (HANDLE_MULTIBYTE)
!   _rl_vi_last_search_mblen = _rl_read_mbchar (_rl_vi_last_search_mbchar, MB_LEN_MAX);
  #else
    RL_SETSTATE(RL_STATE_MOREINPUT);
!   _rl_vi_last_search_char = rl_read_key ();
    RL_UNSETSTATE(RL_STATE_MOREINPUT);
  #endif
  
    _rl_callback_func = 0;
    _rl_want_redisplay = 1;
--- 1243,1262 ----
       _rl_callback_generic_arg *data;
  {
+   int c;
  #if defined (HANDLE_MULTIBYTE)
!   c = _rl_vi_last_search_mblen = _rl_read_mbchar (_rl_vi_last_search_mbchar, MB_LEN_MAX);
  #else
    RL_SETSTATE(RL_STATE_MOREINPUT);
!   c = rl_read_key ();
    RL_UNSETSTATE(RL_STATE_MOREINPUT);
  #endif
  
+   if (c <= 0)
+     return -1;
+ 
+ #if !defined (HANDLE_MULTIBYTE)
+   _rl_vi_last_search_char = c;
+ #endif
+ 
    _rl_callback_func = 0;
    _rl_want_redisplay = 1;
***************
*** 1248,1251 ****
--- 1274,1278 ----
       int count, key;
  {
+   int c;
  #if defined (HANDLE_MULTIBYTE)
    static char *target;
***************
*** 1294,1302 ****
  	{
  #if defined (HANDLE_MULTIBYTE)
! 	  _rl_vi_last_search_mblen = _rl_read_mbchar (_rl_vi_last_search_mbchar, MB_LEN_MAX);
  #else
  	  RL_SETSTATE(RL_STATE_MOREINPUT);
! 	  _rl_vi_last_search_char = rl_read_key ();
  	  RL_UNSETSTATE(RL_STATE_MOREINPUT);
  #endif
  	}
--- 1321,1335 ----
  	{
  #if defined (HANDLE_MULTIBYTE)
! 	  c = _rl_read_mbchar (_rl_vi_last_search_mbchar, MB_LEN_MAX);
! 	  if (c <= 0)
! 	    return -1;
! 	  _rl_vi_last_search_mblen = c;
  #else
  	  RL_SETSTATE(RL_STATE_MOREINPUT);
! 	  c = rl_read_key ();
  	  RL_UNSETSTATE(RL_STATE_MOREINPUT);
+ 	  if (c < 0)
+ 	    return -1;
+ 	  _rl_vi_last_search_char = c;
  #endif
  	}
***************
*** 1468,1471 ****
--- 1501,1507 ----
    RL_UNSETSTATE(RL_STATE_MOREINPUT);
  
+   if (c < 0)
+     return -1;
+ 
  #if defined (HANDLE_MULTIBYTE)
    if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
***************
*** 1486,1489 ****
--- 1522,1528 ----
    _rl_vi_last_replacement = c = _rl_vi_callback_getchar (mb, MB_LEN_MAX);
  
+   if (c < 0)
+     return -1;
+ 
    _rl_callback_func = 0;
    _rl_want_redisplay = 1;
***************
*** 1517,1520 ****
--- 1556,1562 ----
      _rl_vi_last_replacement = c = _rl_vi_callback_getchar (mb, MB_LEN_MAX);
  
+   if (c < 0)
+     return -1;
+ 
    return (_rl_vi_change_char (count, c, mb));
  }
***************
*** 1651,1655 ****
    RL_UNSETSTATE(RL_STATE_MOREINPUT);
  
!   if (ch < 'a' || ch > 'z')
      {
        rl_ding ();
--- 1693,1697 ----
    RL_UNSETSTATE(RL_STATE_MOREINPUT);
  
!   if (ch < 0 || ch < 'a' || ch > 'z')	/* make test against 0 explicit */
      {
        rl_ding ();
***************
*** 1703,1707 ****
        return 0;
      }
!   else if (ch < 'a' || ch > 'z')
      {
        rl_ding ();
--- 1745,1749 ----
        return 0;
      }
!   else if (ch < 0 || ch < 'a' || ch > 'z')	/* make test against 0 explicit */
      {
        rl_ding ();

readline-5.2-006.patch:

--- NEW FILE readline-5.2-006.patch ---
			   READLINE PATCH REPORT
			   =====================

Readline-Release: 5.2
Patch-ID: readline52-006

Bug-Reported-by:        Peter Volkov <torre_cremata at mail.ru>
Bug-Reference-ID:       <1178376645.9063.25.camel at localhost>
Bug-Reference-URL:      http://bugs.gentoo.org/177095

Bug-Description:

The readline display code miscalculated the screen position when performing
a redisplay in which the new text occupies more screen space that the old,
but takes fewer bytes to do so (e.g., when replacing a shorter string
containing multibyte characters with a longer one containing only ASCII).

Patch:

*** ../readline-5.2/display.c	Thu Apr 26 11:38:22 2007
--- display.c	Thu Jul 12 23:10:10 2007
***************
*** 1519,1527 ****
        /* Non-zero if we're increasing the number of lines. */
        int gl = current_line >= _rl_vis_botlin && inv_botlin > _rl_vis_botlin;
        /* Sometimes it is cheaper to print the characters rather than
  	 use the terminal's capabilities.  If we're growing the number
  	 of lines, make sure we actually cause the new line to wrap
  	 around on auto-wrapping terminals. */
!       if (_rl_terminal_can_insert && ((2 * col_temp) >= col_lendiff || _rl_term_IC) && (!_rl_term_autowrap || !gl))
  	{
  	  /* If lendiff > prompt_visible_length and _rl_last_c_pos == 0 and
--- 1568,1596 ----
        /* Non-zero if we're increasing the number of lines. */
        int gl = current_line >= _rl_vis_botlin && inv_botlin > _rl_vis_botlin;
+       /* If col_lendiff is > 0, implying that the new string takes up more
+ 	 screen real estate than the old, but lendiff is < 0, meaning that it
+ 	 takes fewer bytes, we need to just output the characters starting
+ 	 from the first difference.  These will overwrite what is on the
+ 	 display, so there's no reason to do a smart update.  This can really
+ 	 only happen in a multibyte environment. */
+       if (lendiff < 0)
+ 	{
+ 	  _rl_output_some_chars (nfd, temp);
+ 	  _rl_last_c_pos += _rl_col_width (nfd, 0, temp);
+ 	  /* If nfd begins before any invisible characters in the prompt,
+ 	     adjust _rl_last_c_pos to account for wrap_offset and set
+ 	     cpos_adjusted to let the caller know. */
+ 	  if (current_line == 0 && wrap_offset && ((nfd - new) <= prompt_last_invisible))
+ 	    {
+ 	      _rl_last_c_pos -= wrap_offset;
+ 	      cpos_adjusted = 1;
+ 	    }
+ 	  return;
+ 	}
        /* Sometimes it is cheaper to print the characters rather than
  	 use the terminal's capabilities.  If we're growing the number
  	 of lines, make sure we actually cause the new line to wrap
  	 around on auto-wrapping terminals. */
!       else if (_rl_terminal_can_insert && ((2 * col_temp) >= col_lendiff || _rl_term_IC) && (!_rl_term_autowrap || !gl))
  	{
  	  /* If lendiff > prompt_visible_length and _rl_last_c_pos == 0 and

readline-5.2-007.patch:

--- NEW FILE readline-5.2-007.patch ---
			   READLINE PATCH REPORT
			   =====================

Readline-Release: 5.2
Patch-ID: readline52-007

Bug-Reported-by:        Tom Bjorkholm <tom.bjorkholm at ericsson.com>
Bug-Reference-ID:       <AEA1A32F001C6B4F98614B5B80D7647D01C075E9 at esealmw115.eemea.ericsson.se>
Bug-Reference-URL:	http://lists.gnu.org/archive/html/bug-readline/2007-04/msg00004.html


Bug-Description:

An off-by-one error in readline's input buffering caused readline to drop
each 511th character of buffered input (e.g., when pasting a large amount
of data into a terminal window).

Patch:

*** ../readline-5.2/input.c	Wed Aug 16 15:15:16 2006
--- input.c	Tue Jul 17 09:24:21 2007
***************
*** 134,139 ****
  
    *key = ibuffer[pop_index++];
! 
    if (pop_index >= ibuffer_len)
      pop_index = 0;
  
--- 134,142 ----
  
    *key = ibuffer[pop_index++];
! #if 0
    if (pop_index >= ibuffer_len)
+ #else
+   if (pop_index > ibuffer_len)
+ #endif
      pop_index = 0;
  
***************
*** 251,255 ****
  	{
  	  k = (*rl_getc_function) (rl_instream);
! 	  rl_stuff_char (k);
  	  if (k == NEWLINE || k == RETURN)
  	    break;
--- 254,259 ----
  	{
  	  k = (*rl_getc_function) (rl_instream);
! 	  if (rl_stuff_char (k) == 0)
! 	    break;			/* some problem; no more room */
  	  if (k == NEWLINE || k == RETURN)
  	    break;
***************
*** 374,378 ****
--- 378,386 ----
      }
    ibuffer[push_index++] = key;
+ #if 0
    if (push_index >= ibuffer_len)
+ #else
+   if (push_index > ibuffer_len)
+ #endif
      push_index = 0;
  

readline-5.2-008.patch:

--- NEW FILE readline-5.2-008.patch ---
			   READLINE PATCH REPORT
			   =====================

Readline-Release: 5.2
Patch-ID: readline52-008

Bug-Reported-by:	dAniel hAhler <ubuntu at thequod.de>
Bug-Reference-ID:	<4702ED8A.5000503 at thequod.de>
Bug-Reference-URL:	https://bugs.launchpad.net/ubuntu/+source/bash/+bug/119938

Bug-Description:

When updating the display after displaying, for instance, a list of possible
completions, readline will place the cursor at the wrong position if the
prompt contains invisible characters and a newline.

Patch:

*** ../readline-5.2-patched/display.c	Mon Aug  6 14:26:29 2007
--- display.c	Wed Oct 10 22:43:58 2007
***************
*** 1049,1053 ****
  	      else
  		tx = nleft;
! 	      if (_rl_last_c_pos > tx)
  		{
  	          _rl_backspace (_rl_last_c_pos - tx);	/* XXX */
--- 1049,1053 ----
  	      else
  		tx = nleft;
! 	      if (tx >= 0 && _rl_last_c_pos > tx)
  		{
  	          _rl_backspace (_rl_last_c_pos - tx);	/* XXX */
***************
*** 1205,1209 ****
  {
    register char *ofd, *ols, *oe, *nfd, *nls, *ne;
!   int temp, lendiff, wsatend, od, nd;
    int current_invis_chars;
    int col_lendiff, col_temp;
--- 1205,1209 ----
  {
    register char *ofd, *ols, *oe, *nfd, *nls, *ne;
!   int temp, lendiff, wsatend, od, nd, o_cpos;
    int current_invis_chars;
    int col_lendiff, col_temp;
***************
*** 1466,1469 ****
--- 1466,1471 ----
      }
  
+   o_cpos = _rl_last_c_pos;
+ 
    /* When this function returns, _rl_last_c_pos is correct, and an absolute
       cursor postion in multibyte mode, but a buffer index when not in a
***************
*** 1475,1479 ****
       invisible characters in the prompt string.  Let's see if setting this when
       we make sure we're at the end of the drawn prompt string works. */
!   if (current_line == 0 && MB_CUR_MAX > 1 && rl_byte_oriented == 0 && _rl_last_c_pos == prompt_physical_chars)
      cpos_adjusted = 1;
  #endif
--- 1477,1483 ----
       invisible characters in the prompt string.  Let's see if setting this when
       we make sure we're at the end of the drawn prompt string works. */
!   if (current_line == 0 && MB_CUR_MAX > 1 && rl_byte_oriented == 0 && 
!       (_rl_last_c_pos > 0 || o_cpos > 0) &&
!       _rl_last_c_pos == prompt_physical_chars)
      cpos_adjusted = 1;
  #endif

readline-5.2-009.patch:

--- NEW FILE readline-5.2-009.patch ---
			   READLINE PATCH REPORT
			   =====================

Readline-Release: 5.2
Patch-ID: readline52-009

Bug-Reported-by:	dAniel hAhler <ubuntu at thequod.de>
Bug-Reference-ID:
Bug-Reference-URL:

Bug-Description:

Under some circumstances, readline will incorrectly display a prompt string
containing invisible characters after the final newline.

Patch:

*** ../readline-5.2-patched/display.c	2007-08-25 13:47:08.000000000 -0400
--- display.c	2007-11-10 17:51:29.000000000 -0500
***************
*** 392,396 ****
        local_prompt = expand_prompt (p, &prompt_visible_length,
  				       &prompt_last_invisible,
! 				       (int *)NULL,
  				       &prompt_physical_chars);
        c = *t; *t = '\0';
--- 420,424 ----
        local_prompt = expand_prompt (p, &prompt_visible_length,
  				       &prompt_last_invisible,
! 				       &prompt_invis_chars_first_line,
  				       &prompt_physical_chars);
        c = *t; *t = '\0';
***************
*** 399,403 ****
        local_prompt_prefix = expand_prompt (prompt, &prompt_prefix_length,
  						   (int *)NULL,
! 						   &prompt_invis_chars_first_line,
  						   (int *)NULL);
        *t = c;
--- 427,431 ----
        local_prompt_prefix = expand_prompt (prompt, &prompt_prefix_length,
  						   (int *)NULL,
! 						   (int *)NULL,
  						   (int *)NULL);
        *t = c;

readline-5.2-010.patch:

--- NEW FILE readline-5.2-010.patch ---
			   READLINE PATCH REPORT
			   =====================

Readline-Release: 5.2
Patch-ID: readline52-010

Bug-Reported-by:	Miroslav Lichvar <mlichvar at redhat.com>
Bug-Reference-ID:	Fri, 02 Nov 2007 14:07:45 +0100
Bug-Reference-URL:	http://lists.gnu.org/archive/html/bug-readline/2007-11/msg00000.html

Bug-Description:

In certain cases when outputting characters at the end of the line,
e.g., when displaying the prompt string, readline positions the cursor
incorrectly if the prompt string contains invisible characters and the
text being drawn begins before the last invisible character in the line.

Patch:

*** ../readline-5.2-patched/display.c	2007-08-25 13:47:08.000000000 -0400
--- display.c	2007-11-10 17:51:29.000000000 -0500
***************
*** 1566,1574 ****
  	  else
  	    {
- 	      /* We have horizontal scrolling and we are not inserting at
- 		 the end.  We have invisible characters in this line.  This
- 		 is a dumb update. */
  	      _rl_output_some_chars (nfd, temp);
  	      _rl_last_c_pos += col_temp;
  	      return;
  	    }
--- 1619,1632 ----
  	  else
  	    {
  	      _rl_output_some_chars (nfd, temp);
  	      _rl_last_c_pos += col_temp;
+ 	      /* If nfd begins before any invisible characters in the prompt,
+ 		 adjust _rl_last_c_pos to account for wrap_offset and set
+ 		 cpos_adjusted to let the caller know. */
+ 	      if (current_line == 0 && wrap_offset && ((nfd - new) <= prompt_last_invisible))
+ 		{
+ 		  _rl_last_c_pos -= wrap_offset;
+ 		  cpos_adjusted = 1;
+ 		}
  	      return;
  	    }

readline-5.2-011.patch:

--- NEW FILE readline-5.2-011.patch ---
			   READLINE PATCH REPORT
			   =====================

Readline-Release: 5.2
Patch-ID: readline52-011

Bug-Reported-by:	Uwe Doering <gemini at geminix.org>
Bug-Reference-ID:	<46F3DD72.2090801 at geminix.org>
Bug-Reference-URL:	http://lists.gnu.org/archive/html/bug-bash/2007-09/msg00102.html

Bug-Description:

There is an off-by-one error in the code that buffers characters received
very quickly in succession, causing characters to be dropped.

Patch:

*** ../readline-5.2-patched/input.c	2007-08-25 13:47:10.000000000 -0400
--- input.c	2007-10-12 22:55:25.000000000 -0400
***************
*** 155,159 ****
        pop_index--;
        if (pop_index < 0)
! 	pop_index = ibuffer_len - 1;
        ibuffer[pop_index] = key;
        return (1);
--- 155,159 ----
        pop_index--;
        if (pop_index < 0)
! 	pop_index = ibuffer_len;
        ibuffer[pop_index] = key;
        return (1);

readline-5.2-redisplay-sigint.patch:

--- NEW FILE readline-5.2-redisplay-sigint.patch ---
GDB PR 544: gdb.cp/annota2.exp and gdb.cp/annota3.exp sometimes FAIL with:
	FAIL: gdb.cp/annota3.exp: annotate-quit (pattern 1)

One can put `sleep (1)' at the end of _RL_OUTPUT_SOME_CHARS and type
	p 1<enter><ctrl-c>
to abort the prompt printing. Before the patch:
	(gdb) p 1
	$1 = 1
	Quit) (gdb) 
	(gdb) _
After the patch:
	[bash]jkratoch at host0.dyn.jankratochvil.net:/home/jkratoch/redhat/sources/readline# ../gdb/gdb -nx -silent(gdb) p 1
	$1 = 1
	(gdb) Quit
	(gdb) _

The readline patch posted upstream:
	http://sourceware.org/ml/gdb-patches/2008-03/msg00317.html

On Fri, 21 Mar 2008 19:37:31 +0100, Chet Ramey wrote:
> I will add something like your block_sigint/release_sigint changes around
> the guts of rl_redisplay.  That's the right thing to do anyway.  It will
> probably not come out as a patch for readline-5.2; you can use your
> current patch (though the names will change to _rl_block_sigint and
> _rl_release_sigint -- fair warning).

Application cannot easily supply its own RL_REDISPLAY_FUNCTION as a custom
function there changes the readline behavior:
	http://sourceware.org/ml/gdb-patches/2008-03/msg00340.html

BLOCK_SIGINT / RELEASE_SIGINT: Make it public and prefix it by `_rl_'.
RL_REDISPLAY: Wrap it by _RL_BLOCK_SIGINT / _RL_RELEASE_SIGINT.

--- readline-5.2-orig/display.c	2008-03-23 20:52:12.000000000 +0100
+++ readline-5.2/display.c	2008-03-23 20:56:58.000000000 +0100
@@ -472,6 +472,10 @@ rl_redisplay ()
   if (!readline_echoing_p)
     return;
 
+  /* Signals are blocked through this function as the global data structures
+     could get corrupted upon modifications from an invoked signal handler. */
+  _rl_block_sigint ();
+
   if (!rl_display_prompt)
     rl_display_prompt = "";
 
@@ -1180,6 +1184,8 @@ rl_redisplay ()
     else
       visible_wrap_offset = wrap_offset;
   }
+
+  _rl_release_sigint ();
 }
 
 /* PWP: update_line() is based on finding the middle difference of each
--- readline-5.2-orig/rltty.c	2005-12-26 23:21:50.000000000 +0100
+++ readline-5.2/rltty.c	2008-03-23 20:57:26.000000000 +0100
@@ -52,8 +52,8 @@ extern int errno;
 rl_vintfunc_t *rl_prep_term_function = rl_prep_terminal;
 rl_voidfunc_t *rl_deprep_term_function = rl_deprep_terminal;
 
-static void block_sigint PARAMS((void));
-static void release_sigint PARAMS((void));
+void _rl_block_sigint PARAMS((void));
+void _rl_release_sigint PARAMS((void));
 
 static void set_winsize PARAMS((int));
 
@@ -74,9 +74,9 @@ static int sigint_oldmask;
 static int sigint_blocked;
 
 /* Cause SIGINT to not be delivered until the corresponding call to
-   release_sigint(). */
-static void
-block_sigint ()
+   _rl_release_sigint(). */
+void
+_rl_block_sigint ()
 {
   if (sigint_blocked)
     return;
@@ -100,8 +100,8 @@ block_sigint ()
 }
 
 /* Allow SIGINT to be delivered. */
-static void
-release_sigint ()
+void
+_rl_release_sigint ()
 {
   if (sigint_blocked == 0)
     return;
@@ -663,7 +663,7 @@ rl_prep_terminal (meta_flag)
     return;
 
   /* Try to keep this function from being INTerrupted. */
-  block_sigint ();
+  _rl_block_sigint ();
 
   tty = fileno (rl_instream);
 
@@ -676,7 +676,7 @@ rl_prep_terminal (meta_flag)
       if (errno == ENOTTY)
 #endif
 	readline_echoing_p = 1;		/* XXX */
-      release_sigint ();
+      _rl_release_sigint ();
       return;
     }
 
@@ -711,7 +711,7 @@ rl_prep_terminal (meta_flag)
 
   if (set_tty_settings (tty, &tio) < 0)
     {
-      release_sigint ();
+      _rl_release_sigint ();
       return;
     }
 
@@ -722,7 +722,7 @@ rl_prep_terminal (meta_flag)
   terminal_prepped = 1;
   RL_SETSTATE(RL_STATE_TERMPREPPED);
 
-  release_sigint ();
+  _rl_release_sigint ();
 }
 
 /* Restore the terminal's normal settings and modes. */
@@ -735,7 +735,7 @@ rl_deprep_terminal ()
     return;
 
   /* Try to keep this function from being interrupted. */
-  block_sigint ();
+  _rl_block_sigint ();
 
   tty = fileno (rl_instream);
 
@@ -746,14 +746,14 @@ rl_deprep_terminal ()
 
   if (set_tty_settings (tty, &otio) < 0)
     {
-      release_sigint ();
+      _rl_release_sigint ();
       return;
     }
 
   terminal_prepped = 0;
   RL_UNSETSTATE(RL_STATE_TERMPREPPED);
 
-  release_sigint ();
+  _rl_release_sigint ();
 }
 #endif /* !NO_TTY_DRIVER */
 
--- readline-5.2-orig/rltty.h	2003-02-01 04:43:11.000000000 +0100
+++ readline-5.2/rltty.h	2008-03-23 20:57:30.000000000 +0100
@@ -79,4 +79,7 @@ typedef struct _rl_tty_chars {
   unsigned char t_status;
 } _RL_TTY_CHARS;
 
+extern void _rl_block_sigint PARAMS((void));
+extern void _rl_release_sigint PARAMS((void));
+
 #endif /* _RLTTY_H_ */

readline-5.2-shlib.patch:

--- NEW FILE readline-5.2-shlib.patch ---
--- readline-5.2/support/shlib-install.shlib	2006-01-03 20:06:27.000000000 +0100
+++ readline-5.2/support/shlib-install	2006-11-13 13:51:02.000000000 +0100
@@ -71,7 +71,7 @@
 case "$host_os" in
 hpux*|darwin*|macosx*|linux*)
 	if [ -z "$uninstall" ]; then
-		chmod 555 ${INSTALLDIR}/${LIBNAME}
+		chmod 755 ${INSTALLDIR}/${LIBNAME}
 	fi ;;
 cygwin*)
 	IMPLIBNAME=`echo ${LIBNAME} \
--- readline-5.2/support/shobj-conf.shlib	2006-04-11 15:15:43.000000000 +0200
+++ readline-5.2/support/shobj-conf	2007-03-15 14:11:36.000000000 +0100
@@ -108,10 +108,11 @@
 linux*-*|gnu*-*|k*bsd*-gnu-*)
 	SHOBJ_CFLAGS=-fPIC
 	SHOBJ_LD='${CC}'
-	SHOBJ_LDFLAGS='-shared -Wl,-soname,$@'
+	SHOBJ_LDFLAGS='$(CFLAGS) -shared -Wl,-soname,$@'
 
-	SHLIB_XLDFLAGS='-Wl,-rpath,$(libdir) -Wl,-soname,`basename $@ $(SHLIB_MINOR)`'
+	SHLIB_XLDFLAGS='-Wl,-soname,`basename $@ $(SHLIB_MINOR)`'
 	SHLIB_LIBVERSION='$(SHLIB_LIBSUFF).$(SHLIB_MAJOR)$(SHLIB_MINOR)'
+	SHLIB_LIBS='-ltinfo'
 	;;
 
 freebsd2* | netbsd*)
--- readline-5.2/shlib/Makefile.in.shlib	2005-08-12 05:56:10.000000000 +0200
+++ readline-5.2/shlib/Makefile.in	2007-11-05 18:59:14.000000000 +0100
@@ -168,7 +168,7 @@ $(SHARED_READLINE):	$(SHARED_OBJ)
 
 $(SHARED_HISTORY):	$(SHARED_HISTOBJ) xmalloc.so
 	$(RM) $@
-	$(SHOBJ_LD) ${SHOBJ_LDFLAGS} ${SHLIB_XLDFLAGS} -o $@ $(SHARED_HISTOBJ) xmalloc.so $(SHLIB_LIBS)
+	$(SHOBJ_LD) ${SHOBJ_LDFLAGS} ${SHLIB_XLDFLAGS} -o $@ $(SHARED_HISTOBJ) xmalloc.so
 
 # Since tilde.c is shared between readline and bash, make sure we compile 
 # it with the right flags when it's built as part of readline


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-readline/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	17 Jan 2009 03:30:40 -0000	1.1
+++ .cvsignore	17 Jan 2009 11:38:21 -0000	1.2
@@ -0,0 +1 @@
+readline-5.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-readline/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	17 Jan 2009 03:30:40 -0000	1.1
+++ sources	17 Jan 2009 11:38:21 -0000	1.2
@@ -0,0 +1 @@
+e39331f32ad14009b9ff49cc10c5e751  readline-5.2.tar.gz



From rjones at fedoraproject.org  Sat Jan 17 11:38:56 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Sat, 17 Jan 2009 11:38:56 +0000 (UTC)
Subject: rpms/mingw32-gettext/devel import.log, NONE,
	1.1 mingw32-gettext-0.17-gnulib-optarg-symbols.patch, NONE,
	1.1 mingw32-gettext.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <20090117113856.7AA297012B@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/mingw32-gettext/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4446/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log mingw32-gettext-0.17-gnulib-optarg-symbols.patch 
	mingw32-gettext.spec 
Log Message:
Initial import.



--- NEW FILE import.log ---
mingw32-gettext-0_17-7_fc10:HEAD:mingw32-gettext-0.17-7.fc10.src.rpm:1232192061

mingw32-gettext-0.17-gnulib-optarg-symbols.patch:

--- NEW FILE mingw32-gettext-0.17-gnulib-optarg-symbols.patch ---
See https://bugzilla.redhat.com/show_bug.cgi?id=467398#c3

--- ./gettext-tools/woe32dll/gettextlib-exports.c.lfarkas 2008-10-31 11:42:38.000000000 +0100
+++ ./gettext-tools/woe32dll/gettextlib-exports.c 2008-10-31 11:43:29.000000000 +0100
@@ -26,7 +26,7 @@
 VARIABLE(gl_array_list_implementation)
 VARIABLE(gl_linkedhash_list_implementation)
 VARIABLE(program_name)
-VARIABLE(rpl_optarg)
-VARIABLE(rpl_optind)
+/*VARIABLE(rpl_optarg)
+VARIABLE(rpl_optind)*/
 VARIABLE(simple_backup_suffix)
 VARIABLE(styled_ostream_typeinfo)


--- NEW FILE mingw32-gettext.spec ---
%define __strip %{_mingw32_strip}
%define __objdump %{_mingw32_objdump}
%define _use_internal_dependency_generator 0
%define __find_requires %{_mingw32_findrequires}
%define __find_provides %{_mingw32_findprovides}

Name:      mingw32-gettext
Version:   0.17
Release:   7%{?dist}
Summary:   GNU libraries and utilities for producing multi-lingual messages

License:   GPLv2+ and LGPLv2+
Group:     Development/Libraries
URL:       http://www.gnu.org/software/gettext/
Source0:   http://ftp.gnu.org/pub/gnu/gettext/gettext-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Patch0:    mingw32-gettext-0.17-gnulib-optarg-symbols.patch

BuildArch: noarch

BuildRequires: mingw32-filesystem >= 23
BuildRequires: mingw32-runtime >= 3.15.1
BuildRequires: mingw32-gcc
BuildRequires: mingw32-gcc-c++
BuildRequires: mingw32-binutils
BuildRequires: mingw32-iconv
BuildRequires: mingw32-termcap >= 1.3.1-3

# Possible extra BRs.  These are used if available, but
# not required just for building.
#BuildRequires: mingw32-dlfcn
#BuildRequires: mingw32-libxml2
#BuildRequires: mingw32-expat
#BuildRequires: mingw32-glib2


%description
MinGW Windows Gettext library


%prep
%setup -q -n gettext-%{version}

%patch0 -p1


%build
%{_mingw32_configure} \
  --disable-java \
  --disable-native-java \
  --disable-csharp \
  --disable-static \
  --enable-threads=win32 \
  --without-emacs
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT

make DESTDIR=$RPM_BUILD_ROOT install
rm -f $RPM_BUILD_ROOT%{_mingw32_datadir}/locale/locale.alias
rm -f $RPM_BUILD_ROOT%{_mingw32_libdir}/charset.alias
rm -f $RPM_BUILD_ROOT%{_mingw32_datadir}/info/dir

# Remove man pages, these are available in base gettext-devel.
rm -rf $RPM_BUILD_ROOT%{_mingw32_mandir}/man1/
rm -rf $RPM_BUILD_ROOT%{_mingw32_mandir}/man3/


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root)
%doc COPYING
%{_mingw32_bindir}/autopoint
%{_mingw32_bindir}/envsubst.exe
%{_mingw32_bindir}/gettext.exe
%{_mingw32_bindir}/gettext.sh
%{_mingw32_bindir}/gettextize
%{_mingw32_bindir}/libasprintf-0.dll
%{_mingw32_bindir}/libgettextlib-0-17.dll
%{_mingw32_bindir}/libgettextpo-0.dll
%{_mingw32_bindir}/libgettextsrc-0-17.dll
%{_mingw32_bindir}/libintl-8.dll
%{_mingw32_bindir}/msg*.exe
%{_mingw32_bindir}/ngettext.exe
%{_mingw32_bindir}/recode-sr-latin.exe
%{_mingw32_bindir}/xgettext.exe

%{_mingw32_includedir}/autosprintf.h
%{_mingw32_includedir}/gettext-po.h
%{_mingw32_includedir}/libintl.h

%{_mingw32_libdir}/gettext

%{_mingw32_libdir}/libasprintf.dll.a
%{_mingw32_libdir}/libasprintf.la

%{_mingw32_libdir}/libgettextlib.dll.a
%{_mingw32_libdir}/libgettextlib.la

%{_mingw32_libdir}/libgettextpo.dll.a
%{_mingw32_libdir}/libgettextpo.la

%{_mingw32_libdir}/libgettextsrc.dll.a
%{_mingw32_libdir}/libgettextsrc.la

%{_mingw32_libdir}/libintl.dll.a
%{_mingw32_libdir}/libintl.la

%{_mingw32_docdir}/gettext
%{_mingw32_docdir}/libasprintf/autosprintf_all.html

%{_mingw32_datadir}/gettext/

%{_mingw32_datadir}/aclocal/*m4
%{_mingw32_datadir}/info/autosprintf.info
%{_mingw32_datadir}/info/gettext.info

%{_mingw32_datadir}/locale/*/LC_MESSAGES/gettext-tools.mo
%{_mingw32_datadir}/locale/*/LC_MESSAGES/gettext-runtime.mo


%changelog
* Fri Jan 16 2009 Richard W.M. Jones <rjones at redhat.com> - 0.17-7
- Remove the manpages - already available in base Fedora gettext-devel.
- Use _smp_mflags for build.
- Added list of potential BRs.
- Added license file to doc section.

* Fri Oct 31 2008 Richard W.M. Jones <rjones at redhat.com> - 0.17-6
- Add fix for undefined Gnulib symbols (Farkas Levente).
- Rebuild against mingw32-termcap / libtermcap.

* Wed Sep 24 2008 Richard W.M. Jones <rjones at redhat.com> - 0.17-5
- Rename mingw -> mingw32.

* Thu Sep 11 2008 Daniel P. Berrange <berrange at redhat.com> - 0.17-4
- Disable emacs lisp file install

* Thu Sep 10 2008 Richard W.M. Jones <rjones at redhat.com> - 0.17-3
- Remove static libraries.

* Thu Sep  4 2008 Richard W.M. Jones <rjones at redhat.com> - 0.17-2
- Use RPM macros from mingw-filesystem.

* Tue Sep  2 2008 Daniel P. Berrange <berrange at redhat.com> - 0.17-1
- Initial RPM release, largely based on earlier work from several sources.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-gettext/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	17 Jan 2009 03:29:58 -0000	1.1
+++ .cvsignore	17 Jan 2009 11:38:26 -0000	1.2
@@ -0,0 +1 @@
+gettext-0.17.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-gettext/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	17 Jan 2009 03:29:58 -0000	1.1
+++ sources	17 Jan 2009 11:38:26 -0000	1.2
@@ -0,0 +1 @@
+58a2bc6d39c0ba57823034d55d65d606  gettext-0.17.tar.gz



From rjones at fedoraproject.org  Sat Jan 17 11:39:33 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Sat, 17 Jan 2009 11:39:33 +0000 (UTC)
Subject: rpms/mingw32-SDL/devel SDL-1.2.10-byteorder.patch, NONE,
	1.1 SDL-1.2.11-dynamic-esd.patch, NONE,
	1.1 SDL-1.2.12-disable_yasm.patch, NONE,
	1.1 SDL-1.2.12-multilib.patch, NONE,
	1.1 SDL-1.2.12-x11dyn64.patch, NONE,
	1.1 SDL-1.2.13-audiodriver.patch, NONE,
	1.1 SDL-1.2.13-dynamic-pulse.patch, NONE,
	1.1 SDL-1.2.13-libdir.patch, NONE,
	1.1 SDL-1.2.13-pulse-rework.patch, NONE, 1.1 import.log, NONE,
	1.1 mingw32-SDL.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090117113933.A0D9E7012B@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/mingw32-SDL/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4590/devel

Modified Files:
	.cvsignore sources 
Added Files:
	SDL-1.2.10-byteorder.patch SDL-1.2.11-dynamic-esd.patch 
	SDL-1.2.12-disable_yasm.patch SDL-1.2.12-multilib.patch 
	SDL-1.2.12-x11dyn64.patch SDL-1.2.13-audiodriver.patch 
	SDL-1.2.13-dynamic-pulse.patch SDL-1.2.13-libdir.patch 
	SDL-1.2.13-pulse-rework.patch import.log mingw32-SDL.spec 
Log Message:
Initial import.


SDL-1.2.10-byteorder.patch:

--- NEW FILE SDL-1.2.10-byteorder.patch ---
--- SDL-1.2.10/include/SDL_endian.h.byteorder	2006-05-01 10:02:59.000000000 +0200
+++ SDL-1.2.10/include/SDL_endian.h	2006-05-19 11:53:07.000000000 +0200
@@ -32,6 +32,10 @@
 #define SDL_BIG_ENDIAN	4321
 
 #ifndef SDL_BYTEORDER	/* Not defined in SDL_config.h? */
+#ifdef __linux__
+#include <endian.h>
+#define SDL_BYTEORDER  __BYTE_ORDER
+#else /* __linux __ */
 #if defined(__hppa__) || \
     defined(__m68k__) || defined(mc68000) || defined(_M_M68K) || \
     (defined(__MIPS__) && defined(__MISPEB__)) || \
@@ -41,6 +45,7 @@
 #else
 #define SDL_BYTEORDER	SDL_LIL_ENDIAN
 #endif
+#endif /* __linux __ */
 #endif /* !SDL_BYTEORDER */
 
 

SDL-1.2.11-dynamic-esd.patch:

--- NEW FILE SDL-1.2.11-dynamic-esd.patch ---
--- SDL-1.2.11/configure.in.dynamic-esd	2007-03-19 17:44:47.000000000 +0100
+++ SDL-1.2.11/configure.in	2007-03-19 17:44:47.000000000 +0100
@@ -430,6 +430,16 @@
             AC_ARG_ENABLE(esd-shared,
 AC_HELP_STRING([--enable-esd-shared], [dynamically load ESD audio support [[default=yes]]]),
                           , enable_esd_shared=yes)
+            if test "x`echo $ESD_LIBS | grep -- -L`" = "x"; then
+                pfx=${libdir##*/}
+                if test "x`ls /${pfx}/libesd.so.* 2> /dev/null`" != "x"; then
+                    ESD_LIBS="-L/${pfx} $ESD_LIBS"
+                elif test "x`ls /usr/${pfx}/libesd.so.* 2> /dev/null`" != "x"; then
+                    ESD_LIBS="-L/usr/${pfx} $ESD_LIBS"
+                elif test "x`ls /usr/local/${pfx}/libesd.so.* 2> /dev/null`" != "x"; then
+                    ESD_LIBS="-L/usr/local/${pfx} $ESD_LIBS"
+                fi
+            fi
             esd_lib_spec=`echo $ESD_LIBS | sed 's/.*-L\([[^ ]]*\).*/\1\/libesd.so.*/'`
             esd_lib=`ls -- $esd_lib_spec | sed 's/.*\/\(.*\)/\1/; q'`
             echo "-- $esd_lib_spec -> $esd_lib"

SDL-1.2.12-disable_yasm.patch:

--- NEW FILE SDL-1.2.12-disable_yasm.patch ---
diff -up SDL-1.2.12/configure.in.disable_yasm SDL-1.2.12/configure.in
--- SDL-1.2.12/configure.in.disable_yasm	2007-08-27 18:24:44.000000000 +0200
+++ SDL-1.2.12/configure.in	2007-08-27 18:25:04.000000000 +0200
@@ -715,7 +715,6 @@ AC_HELP_STRING([--enable-nasm], [use nas
             esac
         fi
 
-        AC_PATH_PROG(NASM, yasm)
         echo "%ifidn __OUTPUT_FORMAT__,elf" > unquoted-sections
         echo "section .note.GNU-stack noalloc noexec nowrite progbits" >> unquoted-sections
         echo "%endif" >> unquoted-sections

SDL-1.2.12-multilib.patch:

--- NEW FILE SDL-1.2.12-multilib.patch ---
diff -up SDL-1.2.12/sdl-config.in.multilib SDL-1.2.12/sdl-config.in
--- SDL-1.2.12/sdl-config.in.multilib	2007-07-20 07:52:45.000000000 +0200
+++ SDL-1.2.12/sdl-config.in	2007-11-06 17:07:25.000000000 +0100
@@ -3,7 +3,6 @@
 prefix=@prefix@
 exec_prefix=@exec_prefix@
 exec_prefix_set=no
-libdir=@libdir@
 
 @ENABLE_STATIC_FALSE at usage="\
 @ENABLE_STATIC_FALSE at Usage: sdl-config [--prefix[=DIR]] [--exec-prefix[=DIR]] [--version] [--cflags] [--libs]"
@@ -45,11 +44,11 @@ while test $# -gt 0; do
       echo -I at includedir@/SDL @SDL_CFLAGS@
       ;;
 @ENABLE_SHARED_TRUE@    --libs)
- at ENABLE_SHARED_TRUE@      echo -L at libdir@ @SDL_RLD_FLAGS@ @SDL_LIBS@
+ at ENABLE_SHARED_TRUE@      echo @SDL_RLD_FLAGS@ @SDL_LIBS@
 @ENABLE_SHARED_TRUE@      ;;
 @ENABLE_STATIC_TRUE@@ENABLE_SHARED_TRUE@    --static-libs)
 @ENABLE_STATIC_TRUE@@ENABLE_SHARED_FALSE@    --libs|--static-libs)
- at ENABLE_STATIC_TRUE@      echo -L at libdir@ @SDL_RLD_FLAGS@ @SDL_STATIC_LIBS@
+ at ENABLE_STATIC_TRUE@      echo @SDL_RLD_FLAGS@ @SDL_STATIC_LIBS@
 @ENABLE_STATIC_TRUE@      ;;
     *)
       echo "${usage}" 1>&2

SDL-1.2.12-x11dyn64.patch:

--- NEW FILE SDL-1.2.12-x11dyn64.patch ---
diff -up SDL-1.2.12/configure.in.x11dyn64 SDL-1.2.12/configure.in
--- SDL-1.2.12/configure.in.x11dyn64	2007-08-27 18:18:28.000000000 +0200
+++ SDL-1.2.12/configure.in	2007-08-27 18:20:48.000000000 +0200
@@ -950,7 +950,8 @@ AC_HELP_STRING([--enable-x11-shared], [d
                     ;;
                 *)
                     x11_lib_path=[`echo $X_LIBS | sed 's/.*-L\([^ ]*\).*/\1/'`]
-                    for path in $x11_lib_path /usr/lib /usr/X11/lib /usr/X11R6/lib; do
+		    pfx=${libdir##*/}
+                    for path in $x11_lib_path /usr/${pfx} /usr/lib /usr/X11/lib /usr/X11R6/lib; do
                         if test "x$x11_lib" = "x"; then
                             x11_lib=[`ls -- $path/libX11.so.[0-9] 2>/dev/null | sort -r | sed 's/.*\/\(.*\)/\1/; q'`]
                             if test "x$x11_lib" = "x"; then

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

SDL-1.2.13-dynamic-pulse.patch:

--- NEW FILE SDL-1.2.13-dynamic-pulse.patch ---
diff -up SDL-1.2.13/configure.in.dynamic-pulse SDL-1.2.13/configure.in
--- SDL-1.2.13/configure.in.dynamic-pulse	2008-01-07 12:31:57.000000000 +0100
+++ SDL-1.2.13/configure.in	2008-01-07 12:32:02.000000000 +0100
@@ -500,14 +510,15 @@ AC_HELP_STRING([--enable-pulseaudio], [u
         if test x$audio_pulse = xyes; then
             AC_ARG_ENABLE(pulseaudio-shared,
 AC_HELP_STRING([--enable-pulseaudio-shared], [dynamically load PulseAudio support [[default=yes]]]),
-                          , enable_pulse_shared=yes)
+                          , enable_pulseaudio_shared=yes)
             if test "x`echo $PULSE_LIBS | grep -- -L`" = "x"; then
-                if test "x`ls /lib/libpulse-simple.so.* 2> /dev/null`" != "x"; then
-                    PULSE_LIBS="-L/lib $PULSE_LIBS"
-                elif test "x`ls /usr/lib/libpulse-simple.so.* 2> /dev/null`" != "x"; then
-                    PULSE_LIBS="-L/usr/lib $PULSE_LIBS"
-                elif test "x`ls /usr/local/lib/libpulse-simple.so.* 2> /dev/null`" != "x"; then
-                    PULSE_LIBS="-L/usr/local/lib $PULSE_LIBS"
+	        pfx=${libdir##*/}
+                if test "x`ls /${pfx}/libpulse-simple.so.* 2> /dev/null`" != "x"; then
+                    PULSE_LIBS="-L/${pfx} $PULSE_LIBS"
+                elif test "x`ls /usr/${pfx}/libpulse-simple.so.* 2> /dev/null`" != "x"; then
+                    PULSE_LIBS="-L/usr/${pfx} $PULSE_LIBS"
+                elif test "x`ls /usr/local/${pfx}/libpulse-simple.so.* 2> /dev/null`" != "x"; then
+                    PULSE_LIBS="-L/usr/local/${pfx} $PULSE_LIBS"
                 fi
             fi
             pulse_lib_spec=`echo $PULSE_LIBS | sed 's/.*-L\([[^ ]]*\).*/\1\/libpulse-simple.so.*/'`
@@ -518,11 +529,11 @@ AC_HELP_STRING([--enable-pulseaudio-shar
             SOURCES="$SOURCES $srcdir/src/audio/pulse/*.c"
             EXTRA_CFLAGS="$EXTRA_CFLAGS $PULSE_CFLAGS"
             if test x$have_loadso != xyes && \
-               test x$enable_pulse_shared = xyes; then
+               test x$enable_pulseaudio_shared = xyes; then
                 AC_MSG_WARN([You must have SDL_LoadObject() support for dynamic PulseAudio loading])
             fi
             if test x$have_loadso = xyes && \
-               test x$enable_pulse_shared = xyes && test x$pulse_lib != x; then
+               test x$enable_pulseaudio_shared = xyes && test x$pulse_lib != x; then
                 AC_DEFINE_UNQUOTED(SDL_AUDIO_DRIVER_PULSE_DYNAMIC, "$pulse_lib")
             else
                 EXTRA_LDFLAGS="$EXTRA_LDFLAGS $PULSE_LIBS"

SDL-1.2.13-libdir.patch:

--- NEW FILE SDL-1.2.13-libdir.patch ---
diff -up SDL-1.2.13/configure.in.libdir SDL-1.2.13/configure.in
--- SDL-1.2.13/configure.in.libdir	2007-12-31 05:48:39.000000000 +0100
+++ SDL-1.2.13/configure.in	2008-01-07 11:56:10.000000000 +0100
@@ -348,12 +348,13 @@ AC_HELP_STRING([--enable-alsa], [support
 AC_HELP_STRING([--enable-alsa-shared], [dynamically load ALSA audio support [[default=yes]]]),
                           , enable_alsa_shared=yes)
             if test "x`echo $ALSA_LIBS | grep -- -L`" = "x"; then
-                if test "x`ls /lib/libasound.so.* 2> /dev/null`" != "x"; then
-                    ALSA_LIBS="-L/lib $ALSA_LIBS"
-                elif test "x`ls /usr/lib/libasound.so.* 2> /dev/null`" != "x"; then
-                    ALSA_LIBS="-L/usr/lib $ALSA_LIBS"
-                elif test "x`ls /usr/local/lib/libasound.so.* 2> /dev/null`" != "x"; then
-                    ALSA_LIBS="-L/usr/local/lib $ALSA_LIBS"
+	        pfx=${libdir##*/}
+                if test "x`ls /${pfx}/libasound.so.* 2> /dev/null`" != "x"; then
+                    ALSA_LIBS="-L/${pfx} $ALSA_LIBS"
+                elif test "x`ls /usr/${pfx}/libasound.so.* 2> /dev/null`" != "x"; then
+                    ALSA_LIBS="-L/usr/${pfx} $ALSA_LIBS"
+                elif test "x`ls /usr/local/${pfx}/libasound.so.* 2> /dev/null`" != "x"; then
+                    ALSA_LIBS="-L/usr/local/${pfx} $ALSA_LIBS"
                 fi
             fi
             alsa_lib_spec=`echo $ALSA_LIBS | sed 's/.*-L\([[^ ]]*\).*/\1\/libasound.so.*/'`
@@ -561,7 +572,8 @@ AC_HELP_STRING([--enable-arts], [support
                 AC_ARG_ENABLE(arts-shared,
 AC_HELP_STRING([--enable-arts-shared], [dynamically load aRts audio support [[default=yes]]]),
                               , enable_arts_shared=yes)
-                arts_lib_spec="$ARTS_PREFIX/lib/libartsc.so.*"
+                pfx=${libdir##*/}
+                arts_lib_spec="$ARTS_PREFIX/${pfx}/libartsc.so.*"
                 arts_lib=`ls -- $arts_lib_spec | sed 's/.*\/\(.*\)/\1/; q'`
                 echo "-- $arts_lib_spec -> $arts_lib"
 
diff -up SDL-1.2.13/configure.libdir SDL-1.2.13/configure
--- SDL-1.2.13/configure.libdir	2007-12-31 06:09:39.000000000 +0100
+++ SDL-1.2.13/configure	2008-01-07 12:01:32.000000000 +0100
@@ -24888,12 +24888,13 @@ else
 fi
 
             if test "x`echo $ALSA_LIBS | grep -- -L`" = "x"; then
-                if test "x`ls /lib/libasound.so.* 2> /dev/null`" != "x"; then
-                    ALSA_LIBS="-L/lib $ALSA_LIBS"
-                elif test "x`ls /usr/lib/libasound.so.* 2> /dev/null`" != "x"; then
-                    ALSA_LIBS="-L/usr/lib $ALSA_LIBS"
-                elif test "x`ls /usr/local/lib/libasound.so.* 2> /dev/null`" != "x"; then
-                    ALSA_LIBS="-L/usr/local/lib $ALSA_LIBS"
+	        pfx=${libdir##*/}
+                if test "x`ls /${pfx}/libasound.so.* 2> /dev/null`" != "x"; then
+                    ALSA_LIBS="-L/${pfx} $ALSA_LIBS"
+                elif test "x`ls /usr/${pfx}/libasound.so.* 2> /dev/null`" != "x"; then
+                    ALSA_LIBS="-L/usr/${pfx} $ALSA_LIBS"
+                elif test "x`ls /usr/local/${pfx}/libasound.so.* 2> /dev/null`" != "x"; then
+                    ALSA_LIBS="-L/usr/local/${pfx} $ALSA_LIBS"
                 fi
             fi
             alsa_lib_spec=`echo $ALSA_LIBS | sed 's/.*-L\([^ ]*\).*/\1\/libasound.so.*/'`
@@ -25643,7 +25634,8 @@ else
   enable_arts_shared=yes
 fi
 
-                arts_lib_spec="$ARTS_PREFIX/lib/libartsc.so.*"
+		pfx=${libdir##*/}
+                arts_lib_spec="$ARTS_PREFIX/${pfx}/libartsc.so.*"
                 arts_lib=`ls -- $arts_lib_spec | sed 's/.*\/\(.*\)/\1/; q'`
                 echo "-- $arts_lib_spec -> $arts_lib"
 

SDL-1.2.13-pulse-rework.patch:

--- NEW FILE SDL-1.2.13-pulse-rework.patch ---
--- SDL-1.2.13/src/audio/pulse/SDL_pulseaudio.c	2007-12-31 05:47:58.000000000 +0100
+++ SDL-1.2.13.lennart/src/audio/pulse/SDL_pulseaudio.c	2008-03-31 16:09:05.000000000 +0200
@@ -1,3 +1,4 @@
+/* -*- Mode: C; c-basic-offset: 8; indent-tabs-mode: t -*- */
 /*
     SDL - Simple DirectMedia Layer
     Copyright (C) 1997-2007 Sam Lantinga
@@ -18,7 +19,7 @@
 
     St??phan Kochen
     stephan at kochen.nl
-    
+
     Based on parts of the ALSA and ESounD output drivers.
 */
 #include "SDL_config.h"
@@ -78,14 +79,14 @@ static int (*SDL_NAME(pa_simple_write))(
 	pa_simple *s,
 	const void *data,
 	size_t length,
-	int *error 
+	int *error
 );
 static pa_channel_map* (*SDL_NAME(pa_channel_map_init_auto))(
 	pa_channel_map *m,
 	unsigned channels,
 	pa_channel_map_def_t def
 );
-	
+
 
 static struct {
 	const char *name;
@@ -158,16 +159,16 @@ static int Audio_Available(void)
 	if ( LoadPulseLibrary() < 0 ) {
 		return available;
 	}
-	
+
 	/* Connect with a dummy format. */
 	paspec.format = PA_SAMPLE_U8;
 	paspec.rate = 11025;
 	paspec.channels = 1;
 	connection = SDL_NAME(pa_simple_new)(
-		SDL_getenv("PASERVER"),      /* server */
+		NULL,                        /* server */
 		"Test stream",               /* application name */
 		PA_STREAM_PLAYBACK,          /* playback mode */
-		SDL_getenv("PADEVICE"),      /* device on the server */
+		NULL,                        /* device on the server */
 		"Simple DirectMedia Layer",  /* stream description */
 		&paspec,                     /* sample format spec */
 		NULL,                        /* channel map */
@@ -178,7 +179,7 @@ static int Audio_Available(void)
 		available = 1;
 		SDL_NAME(pa_simple_free)(connection);
 	}
-	
+
 	UnloadPulseLibrary();
 	return(available);
 }
@@ -233,7 +234,7 @@ static void PULSE_WaitAudio(_THIS)
 {
 	/* Check to see if the thread-parent process is still alive */
 	{ static int cnt = 0;
-		/* Note that this only works with thread implementations 
+		/* Note that this only works with thread implementations
 		   that use a different process id for each thread.
 		*/
 		if (parent && (((++cnt)%10) == 0)) { /* Check every 10 loops */
@@ -302,7 +303,7 @@ static int PULSE_OpenAudio(_THIS, SDL_Au
 	pa_sample_spec  paspec;
 	pa_buffer_attr  paattr;
 	pa_channel_map  pacmap;
-	
+
 	paspec.format = PA_SAMPLE_INVALID;
 	for ( test_format = SDL_FirstAudioFormat(spec->format); test_format; ) {
 		switch ( test_format ) {
@@ -324,7 +325,7 @@ static int PULSE_OpenAudio(_THIS, SDL_Au
 		return(-1);
 	}
 	spec->format = test_format;
-	
+
 	paspec.channels = spec->channels;
 	paspec.rate = spec->freq;
 
@@ -338,25 +339,24 @@ static int PULSE_OpenAudio(_THIS, SDL_Au
 		return(-1);
 	}
 	SDL_memset(mixbuf, spec->silence, spec->size);
-	
+
 	/* Reduced prebuffering compared to the defaults. */
-	paattr.tlength = mixlen;
+	paattr.tlength = mixlen*2;
 	paattr.minreq = mixlen;
-	paattr.fragsize = mixlen;
-	paattr.prebuf = mixlen;
-	paattr.maxlength = mixlen * 4;
-	
+	paattr.prebuf = mixlen*2;
+	paattr.maxlength = mixlen*2;
+
 	/* The SDL ALSA output hints us that we use Windows' channel mapping */
 	/* http://bugzilla.libsdl.org/show_bug.cgi?id=110 */
 	SDL_NAME(pa_channel_map_init_auto)(
 		&pacmap, spec->channels, PA_CHANNEL_MAP_WAVEEX);
-	
+
 	/* Connect to the PulseAudio server */
 	stream = SDL_NAME(pa_simple_new)(
-		SDL_getenv("PASERVER"),      /* server */
+		NULL,                        /* server */
 		get_progname(),              /* application name */
 		PA_STREAM_PLAYBACK,          /* playback mode */
-		SDL_getenv("PADEVICE"),      /* device on the server */
+		NULL,                        /* device on the server */
 		"Simple DirectMedia Layer",  /* stream description */
 		&paspec,                     /* sample format spec */
 		&pacmap,                     /* channel map */
@@ -371,7 +371,6 @@ static int PULSE_OpenAudio(_THIS, SDL_Au
 
 	/* Get the parent process id (we're the parent of the audio thread) */
 	parent = getpid();
-	
+
 	return(0);
 }
-


--- NEW FILE import.log ---
mingw32-SDL-1_2_13-4_fc10:HEAD:mingw32-SDL-1.2.13-4.fc10.src.rpm:1232192069


--- NEW FILE mingw32-SDL.spec ---
%define __strip %{_mingw32_strip}
%define __objdump %{_mingw32_objdump}
%define _use_internal_dependency_generator 0
%define __find_requires %{_mingw32_findrequires}
%define __find_provides %{_mingw32_findprovides}

Name:           mingw32-SDL
Version:        1.2.13
Release:        4%{?dist}
Summary:        MinGW Windows port of SDL cross-platform multimedia library

License:        LGPLv2+
Group:          Development/Libraries
URL:            http://www.libsdl.org/
Source0:        http://www.libsdl.org/release/SDL-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch

# Patches from native version.
Patch0:         SDL-1.2.10-byteorder.patch
Patch17:        SDL-1.2.13-libdir.patch
Patch21:        SDL-1.2.12-multilib.patch
Patch23:        SDL-1.2.11-dynamic-esd.patch
Patch24:        SDL-1.2.12-x11dyn64.patch
Patch25:        SDL-1.2.12-disable_yasm.patch
Patch26:        SDL-1.2.13-dynamic-pulse.patch
Patch27:        SDL-1.2.13-pulse-rework.patch
Patch28:        SDL-1.2.13-audiodriver.patch

BuildRequires:  mingw32-filesystem >= 40
BuildRequires:  mingw32-gcc
BuildRequires:  mingw32-binutils
BuildRequires:  mingw32-dlfcn
BuildRequires:  mingw32-iconv

Requires:       pkgconfig

# Not required at the moment, but SDL does contain plenty of C++ code,
# I just haven't worked out how to enable it.
#BuildRequires:  mingw32-gcc-c++

# If we have nasm in the future, then this would enable future
# optimizations on x86-based architectures.
#%ifarch %{ix86}
#BuildRequires: nasm
#%endif


%description
Simple DirectMedia Layer (SDL) is a cross-platform multimedia library
designed to provide fast access to the graphics frame buffer and audio
device.


%prep
%setup -q -n SDL-%{version}
%patch0 -p1 -b .byteorder
%patch17 -p1 -b .libdir
%patch21 -p1 -b .multilib
%patch23 -p1 -b .dynamic-esd
%patch24 -p1 -b .x11dyn64
%patch25 -p1 -b .disable_yasm
%patch26 -p1 -b .dynamic-pulse
%patch27 -p1 -b .pulse-rework
%patch28 -p1 -b .audiodriver


%build
%{_mingw32_configure} \
  --disable-video-svga --disable-video-ggi --disable-video-aalib \
  --disable-debug \
  --enable-sdl-dlopen \
  --enable-dlopen \
  --enable-arts-shared \
  --enable-esd-shared \
  --enable-pulseaudio-shared \
  --enable-alsa \
  --disable-rpath

make


%install
rm -rf $RPM_BUILD_ROOT
make DESTDIR=$RPM_BUILD_ROOT install

# Remove static libraries but DON'T remove *.dll.a files.
rm $RPM_BUILD_ROOT%{_mingw32_libdir}/libSDL.a

# Actually libSDLmain.a seems to be required.  It just contains
# a single object file called SDL_win32_main.o.
#rm $RPM_BUILD_ROOT%{_mingw32_libdir}/libSDLmain.a

# Delete man pages since they duplicate what is already available
# in base Fedora package.
rm $RPM_BUILD_ROOT%{_mingw32_mandir}/man3/*.3*


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root)
%doc COPYING
%{_mingw32_bindir}/SDL.dll
%{_mingw32_bindir}/sdl-config
%{_mingw32_libdir}/libSDL.dll.a
%{_mingw32_libdir}/libSDL.la
%{_mingw32_libdir}/libSDLmain.a
%{_mingw32_libdir}/pkgconfig/sdl.pc
%{_mingw32_datadir}/aclocal/sdl.m4
%{_mingw32_includedir}/SDL


%changelog
* Tue Jan 13 2009 Richard W.M. Jones <rjones at redhat.com> - 1.2.13-4
- Verify we are still up to date with Fedora release.
- Include COPYING in documentation.
- Build with dlfcn.
- List all BRs.
- No need to package the man pages, don't duplicate what's in the
  base Fedora package already.
- Requires pkgconfig.

* Fri Oct 24 2008 Richard W.M. Jones <rjones at redhat.com> - 1.2.13-2
- Initial RPM release.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-SDL/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	17 Jan 2009 03:20:10 -0000	1.1
+++ .cvsignore	17 Jan 2009 11:39:32 -0000	1.2
@@ -0,0 +1 @@
+SDL-1.2.13.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-SDL/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	17 Jan 2009 03:20:10 -0000	1.1
+++ sources	17 Jan 2009 11:39:33 -0000	1.2
@@ -0,0 +1 @@
+c6660feea2a6834de10bc71b2f8e4d88  SDL-1.2.13.tar.gz



From rjones at fedoraproject.org  Sat Jan 17 11:41:47 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Sat, 17 Jan 2009 11:41:47 +0000 (UTC)
Subject: rpms/mingw32-pdcurses/F-10 import.log, NONE,
	1.1 mingw32-pdcurses-3.4-build.patch, NONE,
	1.1 mingw32-pdcurses.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090117114147.ED4317012B@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/mingw32-pdcurses/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7104/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	import.log mingw32-pdcurses-3.4-build.patch 
	mingw32-pdcurses.spec 
Log Message:
Initial import.



--- NEW FILE import.log ---
mingw32-pdcurses-3_4-3_fc10:F-10:mingw32-pdcurses-3.4-3.fc10.src.rpm:1232192190

mingw32-pdcurses-3.4-build.patch:

--- NEW FILE mingw32-pdcurses-3.4-build.patch ---
--- PDCurses-3.4/win32/mingwin32.mak.orig	2008-09-25 15:30:14.000000000 +0100
+++ PDCurses-3.4/win32/mingwin32.mak	2008-09-25 15:43:50.000000000 +0100
@@ -30,8 +30,8 @@
 
 CFLAGS += -I$(PDCURSES_SRCDIR)
 
-BASEDEF		= $(PDCURSES_SRCDIR)\exp-base.def
-WIDEDEF		= $(PDCURSES_SRCDIR)\exp-wide.def
+BASEDEF		= $(PDCURSES_SRCDIR)/exp-base.def
+WIDEDEF		= $(PDCURSES_SRCDIR)/exp-wide.def
 
 DEFDEPS		= $(BASEDEF)
 
@@ -50,7 +50,7 @@
 
 ifeq ($(DLL),Y)
 	CFLAGS += -DPDC_DLL_BUILD
-	LIBEXE = gcc $(DEFFILE)
+	LIBEXE = i686-pc-mingw32-gcc $(DEFFILE)
 	LIBFLAGS = -Wl,--out-implib,pdcurses.a -shared -o
 	LIBCURSES = pdcurses.dll
 	LIBDEPS = $(LIBOBJS) $(PDCOBJS) $(DEFFILE)
@@ -70,24 +70,24 @@
 libs:	$(LIBCURSES)
 
 clean:
-	-del *.o
-	-del *.exe
-	-del $(CLEAN)
+	-rm *.o
+	-rm *.exe
+	-rm $(CLEAN)
 
 demos:	$(DEMOS)
-	strip *.exe
+	i686-pc-mingw32-strip *.exe
 
 $(DEFFILE): $(DEFDEPS)
 	echo LIBRARY pdcurses > $@
 	echo EXPORTS >> $@
-	type $(BASEDEF) >> $@
+	cat $(BASEDEF) >> $@
 ifeq ($(WIDE),Y)
-	type $(WIDEDEF) >> $@
+	cat $(WIDEDEF) >> $@
 endif
 
 $(LIBCURSES) : $(LIBDEPS)
 	$(LIBEXE) $(LIBFLAGS) $@ $?
-	-copy pdcurses.a panel.a
+	-cp pdcurses.a panel.a
 
 $(LIBOBJS) $(PDCOBJS) : $(PDCURSES_HEADERS)
 $(PDCOBJS) : $(PDCURSES_WIN_H)


--- NEW FILE mingw32-pdcurses.spec ---
%define __strip %{_mingw32_strip}
%define __objdump %{_mingw32_objdump}
%define _use_internal_dependency_generator 0
%define __find_requires %{_mingw32_findrequires}
%define __find_provides %{_mingw32_findprovides}

Name:           mingw32-pdcurses
Version:        3.4
Release:        3%{?dist}
Summary:        Curses library for MinGW

License:        Public Domain
Group:          Development/Libraries
URL:            http://pdcurses.sourceforge.net/
Source0:        http://dl.sourceforge.net/sourceforge/pdcurses/PDCurses-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch

Patch0:         mingw32-pdcurses-3.4-build.patch

BuildRequires:  mingw32-filesystem >= 26
BuildRequires:  mingw32-gcc
BuildRequires:  mingw32-binutils


%description
PDCurses is a public domain curses library for DOS, OS/2, Win32, X11
and SDL, implementing most of the functions available in X/Open and
System V R4 curses. It supports many compilers for these
platforms. The X11 port lets you recompile existing text-mode curses
programs to produce native X11 applications.

Note that ncurses is not available for MinGW / Windows.  Applications
which need curses functionality can use this package, provided they
don't use any of the extensions specific to ncurses.


%prep
%setup -q -n PDCurses-%{version}
%patch0 -p1


%build
pushd win32
make -f mingwin32.mak \
  CC=%{_mingw32_cc} \
  LINK=%{_mingw32_cc} \
  WIDE=Y UTF8=Y DLL=Y
popd


%install
rm -rf $RPM_BUILD_ROOT

mkdir -p $RPM_BUILD_ROOT%{_mingw32_bindir}
mkdir -p $RPM_BUILD_ROOT%{_mingw32_libdir}
mkdir -p $RPM_BUILD_ROOT%{_mingw32_includedir}

install win32/*.exe $RPM_BUILD_ROOT%{_mingw32_bindir}
install win32/pdcurses.dll $RPM_BUILD_ROOT%{_mingw32_bindir}/pdcurses.dll
install win32/pdcurses.a $RPM_BUILD_ROOT%{_mingw32_libdir}/libpdcurses.dll.a
install -m 0644 curses.h panel.h term.h $RPM_BUILD_ROOT%{_mingw32_includedir}


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root)
%{_mingw32_bindir}/pdcurses.dll
%{_mingw32_libdir}/libpdcurses.dll.a
%{_mingw32_includedir}/curses.h
%{_mingw32_includedir}/panel.h
%{_mingw32_includedir}/term.h
%{_mingw32_bindir}/firework.exe
%{_mingw32_bindir}/newdemo.exe
%{_mingw32_bindir}/ptest.exe
%{_mingw32_bindir}/rain.exe
%{_mingw32_bindir}/testcurs.exe
%{_mingw32_bindir}/tuidemo.exe
%{_mingw32_bindir}/xmas.exe
%{_mingw32_bindir}/worm.exe


%changelog
* Fri Jan 16 2009 Richard Jones <rjones at redhat.com> - 3.4-3
- Remove +x permissions on the header files.

* Sat Nov 22 2008 Richard Jones <rjones at redhat.com> - 3.4-2
- Rename implib to libpdcurses.dll.a so that libtool can use it.

* Thu Sep 25 2008 Richard Jones <rjones at redhat.com> - 3.4-1
- Initial RPM release.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-pdcurses/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	17 Jan 2009 03:26:28 -0000	1.1
+++ .cvsignore	17 Jan 2009 11:41:17 -0000	1.2
@@ -0,0 +1 @@
+PDCurses-3.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-pdcurses/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	17 Jan 2009 03:26:28 -0000	1.1
+++ sources	17 Jan 2009 11:41:17 -0000	1.2
@@ -0,0 +1 @@
+4e04e4412d1b1392a7f9a489b95b331a  PDCurses-3.4.tar.gz



From rjones at fedoraproject.org  Sat Jan 17 11:41:52 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Sat, 17 Jan 2009 11:41:52 +0000 (UTC)
Subject: rpms/mingw32-pdcurses/EL-5 import.log, NONE,
	1.1 mingw32-pdcurses-3.4-build.patch, NONE,
	1.1 mingw32-pdcurses.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090117114152.8AA307012B@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/mingw32-pdcurses/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7044/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	import.log mingw32-pdcurses-3.4-build.patch 
	mingw32-pdcurses.spec 
Log Message:
Initial import.



--- NEW FILE import.log ---
mingw32-pdcurses-3_4-3_fc10:EL-5:mingw32-pdcurses-3.4-3.fc10.src.rpm:1232192191

mingw32-pdcurses-3.4-build.patch:

--- NEW FILE mingw32-pdcurses-3.4-build.patch ---
--- PDCurses-3.4/win32/mingwin32.mak.orig	2008-09-25 15:30:14.000000000 +0100
+++ PDCurses-3.4/win32/mingwin32.mak	2008-09-25 15:43:50.000000000 +0100
@@ -30,8 +30,8 @@
 
 CFLAGS += -I$(PDCURSES_SRCDIR)
 
-BASEDEF		= $(PDCURSES_SRCDIR)\exp-base.def
-WIDEDEF		= $(PDCURSES_SRCDIR)\exp-wide.def
+BASEDEF		= $(PDCURSES_SRCDIR)/exp-base.def
+WIDEDEF		= $(PDCURSES_SRCDIR)/exp-wide.def
 
 DEFDEPS		= $(BASEDEF)
 
@@ -50,7 +50,7 @@
 
 ifeq ($(DLL),Y)
 	CFLAGS += -DPDC_DLL_BUILD
-	LIBEXE = gcc $(DEFFILE)
+	LIBEXE = i686-pc-mingw32-gcc $(DEFFILE)
 	LIBFLAGS = -Wl,--out-implib,pdcurses.a -shared -o
 	LIBCURSES = pdcurses.dll
 	LIBDEPS = $(LIBOBJS) $(PDCOBJS) $(DEFFILE)
@@ -70,24 +70,24 @@
 libs:	$(LIBCURSES)
 
 clean:
-	-del *.o
-	-del *.exe
-	-del $(CLEAN)
+	-rm *.o
+	-rm *.exe
+	-rm $(CLEAN)
 
 demos:	$(DEMOS)
-	strip *.exe
+	i686-pc-mingw32-strip *.exe
 
 $(DEFFILE): $(DEFDEPS)
 	echo LIBRARY pdcurses > $@
 	echo EXPORTS >> $@
-	type $(BASEDEF) >> $@
+	cat $(BASEDEF) >> $@
 ifeq ($(WIDE),Y)
-	type $(WIDEDEF) >> $@
+	cat $(WIDEDEF) >> $@
 endif
 
 $(LIBCURSES) : $(LIBDEPS)
 	$(LIBEXE) $(LIBFLAGS) $@ $?
-	-copy pdcurses.a panel.a
+	-cp pdcurses.a panel.a
 
 $(LIBOBJS) $(PDCOBJS) : $(PDCURSES_HEADERS)
 $(PDCOBJS) : $(PDCURSES_WIN_H)


--- NEW FILE mingw32-pdcurses.spec ---
%define __strip %{_mingw32_strip}
%define __objdump %{_mingw32_objdump}
%define _use_internal_dependency_generator 0
%define __find_requires %{_mingw32_findrequires}
%define __find_provides %{_mingw32_findprovides}

Name:           mingw32-pdcurses
Version:        3.4
Release:        3%{?dist}
Summary:        Curses library for MinGW

License:        Public Domain
Group:          Development/Libraries
URL:            http://pdcurses.sourceforge.net/
Source0:        http://dl.sourceforge.net/sourceforge/pdcurses/PDCurses-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch

Patch0:         mingw32-pdcurses-3.4-build.patch

BuildRequires:  mingw32-filesystem >= 26
BuildRequires:  mingw32-gcc
BuildRequires:  mingw32-binutils


%description
PDCurses is a public domain curses library for DOS, OS/2, Win32, X11
and SDL, implementing most of the functions available in X/Open and
System V R4 curses. It supports many compilers for these
platforms. The X11 port lets you recompile existing text-mode curses
programs to produce native X11 applications.

Note that ncurses is not available for MinGW / Windows.  Applications
which need curses functionality can use this package, provided they
don't use any of the extensions specific to ncurses.


%prep
%setup -q -n PDCurses-%{version}
%patch0 -p1


%build
pushd win32
make -f mingwin32.mak \
  CC=%{_mingw32_cc} \
  LINK=%{_mingw32_cc} \
  WIDE=Y UTF8=Y DLL=Y
popd


%install
rm -rf $RPM_BUILD_ROOT

mkdir -p $RPM_BUILD_ROOT%{_mingw32_bindir}
mkdir -p $RPM_BUILD_ROOT%{_mingw32_libdir}
mkdir -p $RPM_BUILD_ROOT%{_mingw32_includedir}

install win32/*.exe $RPM_BUILD_ROOT%{_mingw32_bindir}
install win32/pdcurses.dll $RPM_BUILD_ROOT%{_mingw32_bindir}/pdcurses.dll
install win32/pdcurses.a $RPM_BUILD_ROOT%{_mingw32_libdir}/libpdcurses.dll.a
install -m 0644 curses.h panel.h term.h $RPM_BUILD_ROOT%{_mingw32_includedir}


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root)
%{_mingw32_bindir}/pdcurses.dll
%{_mingw32_libdir}/libpdcurses.dll.a
%{_mingw32_includedir}/curses.h
%{_mingw32_includedir}/panel.h
%{_mingw32_includedir}/term.h
%{_mingw32_bindir}/firework.exe
%{_mingw32_bindir}/newdemo.exe
%{_mingw32_bindir}/ptest.exe
%{_mingw32_bindir}/rain.exe
%{_mingw32_bindir}/testcurs.exe
%{_mingw32_bindir}/tuidemo.exe
%{_mingw32_bindir}/xmas.exe
%{_mingw32_bindir}/worm.exe


%changelog
* Fri Jan 16 2009 Richard Jones <rjones at redhat.com> - 3.4-3
- Remove +x permissions on the header files.

* Sat Nov 22 2008 Richard Jones <rjones at redhat.com> - 3.4-2
- Rename implib to libpdcurses.dll.a so that libtool can use it.

* Thu Sep 25 2008 Richard Jones <rjones at redhat.com> - 3.4-1
- Initial RPM release.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-pdcurses/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	17 Jan 2009 03:26:28 -0000	1.1
+++ .cvsignore	17 Jan 2009 11:41:22 -0000	1.2
@@ -0,0 +1 @@
+PDCurses-3.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-pdcurses/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	17 Jan 2009 03:26:28 -0000	1.1
+++ sources	17 Jan 2009 11:41:22 -0000	1.2
@@ -0,0 +1 @@
+4e04e4412d1b1392a7f9a489b95b331a  PDCurses-3.4.tar.gz



From rjones at fedoraproject.org  Sat Jan 17 11:42:00 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Sat, 17 Jan 2009 11:42:00 +0000 (UTC)
Subject: rpms/mingw32-gdbm/F-10 gdbm-1.8.0-64offset.patch, NONE,
	1.1 gdbm-1.8.0-cflags.patch, NONE, 1.1 gdbm-1.8.0-fhs.patch,
	NONE, 1.1 gdbm-1.8.0-jbj.patch, NONE, 1.1 import.log, NONE,
	1.1 mingw32-gdbm-1.8.0-windows.patch, NONE,
	1.1 mingw32-gdbm.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <20090117114200.C32387012B@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/mingw32-gdbm/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7417/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	gdbm-1.8.0-64offset.patch gdbm-1.8.0-cflags.patch 
	gdbm-1.8.0-fhs.patch gdbm-1.8.0-jbj.patch import.log 
	mingw32-gdbm-1.8.0-windows.patch mingw32-gdbm.spec 
Log Message:
Initial import.


gdbm-1.8.0-64offset.patch:

--- NEW FILE gdbm-1.8.0-64offset.patch ---
diff -buNr gdbm-1.8.0.orig/falloc.c gdbm-1.8.0/falloc.c
--- gdbm-1.8.0.orig/falloc.c	Tue May 18 20:16:06 1999
+++ gdbm-1.8.0/falloc.c	Thu Apr 25 18:20:45 2002
@@ -180,6 +180,13 @@
   avail_block *new_blk;
   int index;
 
+  if (dbf->header->avail.count == dbf->header->avail.size)
+    {
+      /* We're kind of stuck here, so we re-split the header in order to
+         avoid crashing.  Sigh. */
+      push_avail_block(dbf);
+    }
+
   /* Set up variables. */
   new_el.av_adr = dbf->header->avail.next_block;
   new_el.av_size = ( ( (dbf->header->avail.size * sizeof (avail_elem)) >> 1)
@@ -196,12 +203,24 @@
   if (num_bytes != new_el.av_size) _gdbm_fatal (dbf, "read error");
 
   /* Add the elements from the new block to the header. */
-  for (index = 0; index < new_blk->count; index++)
+  index = 0;
+  while (index < new_blk->count)
+    {
+      while(index < new_blk->count
+            && dbf->header->avail.count < dbf->header->avail.size)
     {
       /* With luck, this will merge a lot of blocks! */
       _gdbm_put_av_elem(new_blk->av_table[index],
 			dbf->header->avail.av_table,
-			&dbf->header->avail.count, dbf->coalesce_blocks);
+			     &dbf->header->avail.count, TRUE);
+	   index++;
+	}
+      if (dbf->header->avail.count == dbf->header->avail.size)
+        {
+          /* We're kind of stuck here, so we re-split the header in order to
+             avoid crashing.  Sigh. */
+          push_avail_block(dbf);
+	}
     }
 
   /* Fix next_block, as well. */
@@ -210,9 +229,17 @@
   /* We changed the header. */
   dbf->header_changed = TRUE;
 
-  /* Free the previous avail block. */
+  /* Free the previous avail block.   It is possible that the header table
+     is now FULL, which will cause us to overflow it! */
+  if (dbf->header->avail.count == dbf->header->avail.size)
+    {
+      /* We're kind of stuck here, so we re-split the header in order to
+         avoid crashing.  Sigh. */
+      push_avail_block(dbf);
+    }
+
   _gdbm_put_av_elem (new_el, dbf->header->avail.av_table,
-		     &dbf->header->avail.count, dbf->coalesce_blocks);
+		     &dbf->header->avail.count, TRUE);
   free (new_blk);
 }
 

gdbm-1.8.0-cflags.patch:

--- NEW FILE gdbm-1.8.0-cflags.patch ---
--- gdbm-1.8.0/Makefile.in.cflags	Tue Jun 12 19:50:21 2001
+++ gdbm-1.8.0/Makefile.in	Tue Jun 12 19:57:45 2001
@@ -17,22 +17,23 @@
 MAKEINFO = makeinfo
 TEXI2DVI = texi2dvi
 
-DEFS =
+DEFS = @DEFS@
 
 # Where the system [n]dbm routines are...
 LIBS = @LIBS@ -lc
 
 # SunOS 4 users might wish to add '-fpcc-struct-return' to CFLAGS. see INSTALL.
-CFLAGS = -O
-LDFLAGS =
+CPPFLAGS = @CPPFLAGS@
+CFLAGS = @CFLAGS@
+LDFLAGS = @LDFLAGS@
 
 # Common prefix for installation directories
-prefix = /usr/local
+prefix = /usr
 exec_prefix = $(prefix)
 mandir = $(prefix)/man
 
 # Directory in which to put libgdbm.a.
-libdir = $(exec_prefix)/lib
+libdir = $(prefix)/lib
 # The include directory for gdbm.h and dbm.h.
 includedir = $(prefix)/include
 # Info and man directories.

gdbm-1.8.0-fhs.patch:

--- NEW FILE gdbm-1.8.0-fhs.patch ---
--- gdbm-1.8.0/Makefile.in.fhs	Mon Jun  5 15:12:15 2000
+++ gdbm-1.8.0/Makefile.in	Mon Jun  5 15:16:34 2000
@@ -14,10 +14,6 @@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
 
-# File ownership and group
-BINOWN = bin
-BINGRP = bin
-
 MAKEINFO = makeinfo
 TEXI2DVI = texi2dvi
 
@@ -33,8 +29,7 @@
 # Common prefix for installation directories
 prefix = /usr/local
 exec_prefix = $(prefix)
-binprefix = $(exec_prefix)
-manprefix = $(prefix)
+mandir = $(prefix)/man
 
 # Directory in which to put libgdbm.a.
 libdir = $(exec_prefix)/lib
@@ -42,7 +37,7 @@
 includedir = $(prefix)/include
 # Info and man directories.
 infodir = $(prefix)/info
-man3dir = $(prefix)/man/man3
+man3dir = $(mandir)/man3
 manext = 3
 
 #### End of system configuration section. ####
@@ -122,18 +117,14 @@
 install: libgdbm.la gdbm.h gdbm.info
 	$(srcdir)/mkinstalldirs $(libdir) $(includedir) $(man3dir) $(infodir)
 	$(LIBTOOL) install -c libgdbm.la $(libdir)/libgdbm.la
-	$(INSTALL_DATA) -o $(BINOWN) -g $(BINGRP) gdbm.h $(includedir)/gdbm.h
-	$(INSTALL_DATA) -o $(BINOWN) -g $(BINGRP) $(srcdir)/gdbm.3 \
-		$(man3dir)/gdbm.3
-	$(INSTALL_DATA) -o $(BINOWN) -g $(BINGRP) $(srcdir)/gdbm.info \
-		$(infodir)/gdbm.info
+	$(INSTALL_DATA) gdbm.h $(includedir)/gdbm.h
+	$(INSTALL_DATA) $(srcdir)/gdbm.3 $(man3dir)/gdbm.3
+	$(INSTALL_DATA) $(srcdir)/gdbm.info $(infodir)/gdbm.info
 
 install-compat:
 	$(srcdir)/mkinstalldirs $(includedir)
-	$(INSTALL_DATA) -o $(BINOWN) -g $(BINGRP) $(srcdir)/dbm.h \
-		$(includedir)/dbm.h
-	$(INSTALL_DATA) -o $(BINOWN) -g $(BINGRP) $(srcdir)/ndbm.h \
-		$(includedir)/ndbm.h
+	$(INSTALL_DATA) $(srcdir)/dbm.h $(includedir)/dbm.h
+	$(INSTALL_DATA) $(srcdir)/ndbm.h $(includedir)/ndbm.h
 
 #libgdbm.a: $(OBJS) gdbm.h
 #	rm -f libgdbm.a

gdbm-1.8.0-jbj.patch:

--- NEW FILE gdbm-1.8.0-jbj.patch ---
--- gdbm-1.8.0/gdbmopen.c.jbj	Tue Aug 10 10:57:38 1999
+++ gdbm-1.8.0/gdbmopen.c	Tue Aug 10 10:59:06 1999
@@ -214,7 +214,7 @@
 	file_block_size = block_size;
 
       /* Get space for the file header. */
-      dbf->header = (gdbm_file_header *) malloc (file_block_size);
+      dbf->header = (gdbm_file_header *) calloc (1, file_block_size);
       if (dbf->header == NULL)
 	{
 	  gdbm_close (dbf);


--- NEW FILE import.log ---
mingw32-gdbm-1_8_0-1_fc10:F-10:mingw32-gdbm-1.8.0-1.fc10.src.rpm:1232192228

mingw32-gdbm-1.8.0-windows.patch:

--- NEW FILE mingw32-gdbm-1.8.0-windows.patch ---
diff -urN gdbm-1.8.0.orig/configure.in gdbm-1.8.0.flock/configure.in
--- gdbm-1.8.0.orig/configure.in	1999-05-19 01:17:02.000000000 +0100
+++ gdbm-1.8.0.flock/configure.in	2008-10-03 16:55:30.000000000 +0100
@@ -5,6 +5,7 @@
 AC_PROG_CC
 AC_PROG_CPP
 AC_PROG_INSTALL
+AC_LIBTOOL_WIN32_DLL
 AM_PROG_LIBTOOL
 dnl AC_PROG_RANLIB
 dnl AC_WORDS_BIGENDIAN
@@ -13,8 +14,8 @@
 AC_HAVE_HEADERS(memory.h)
 AC_CHECK_LIB(dbm, main)
 AC_CHECK_LIB(ndbm, main)
-AC_HAVE_FUNCS(rename ftruncate flock bcopy fsync)
-AC_REPLACE_FUNCS(getopt)
+AC_HAVE_FUNCS(rename ftruncate bcopy)
+AC_REPLACE_FUNCS(flock fsync getopt)
 AC_OFF_T
 AC_ST_BLKSIZE
 AC_OUTPUT(Makefile)
diff -urN gdbm-1.8.0.orig/dbminit.c gdbm-1.8.0.flock/dbminit.c
--- gdbm-1.8.0.orig/dbminit.c	1999-05-19 01:16:05.000000000 +0100
+++ gdbm-1.8.0.flock/dbminit.c	2008-10-03 17:07:20.000000000 +0100
@@ -91,6 +91,7 @@
 	}
     }
 
+#if (!defined _WIN32 && !defined __WIN32__) || defined __CYGWIN__
   /* If the database is new, link "file.dir" to "file.pag". This is done
      so the time stamp on both files is the same. */
   if (stat (dir_file, &dir_stat) == 0)
@@ -116,6 +117,7 @@
 	  goto done;
 	}
     }
+#endif
 
   ret = 0;
 
diff -urN gdbm-1.8.0.orig/dbmopen.c gdbm-1.8.0.flock/dbmopen.c
--- gdbm-1.8.0.orig/dbmopen.c	1999-05-19 01:16:05.000000000 +0100
+++ gdbm-1.8.0.flock/dbmopen.c	2008-10-03 17:07:33.000000000 +0100
@@ -105,6 +105,7 @@
       goto done;
     }
 
+#if (!defined _WIN32 && !defined __WIN32__) || defined __CYGWIN__
   /* If the database is new, link "file.dir" to "file.pag". This is done
      so the time stamp on both files is the same. */
   if (stat (dir_file, &dir_stat) == 0)
@@ -130,6 +131,7 @@
 	  goto done;
 	}
     }
+#endif
 
 done:
   free (pag_file);
diff -urN gdbm-1.8.0.orig/flock.c gdbm-1.8.0.flock/flock.c
--- gdbm-1.8.0.orig/flock.c	1970-01-01 01:00:00.000000000 +0100
+++ gdbm-1.8.0.flock/flock.c	2008-10-03 17:02:01.000000000 +0100
@@ -0,0 +1,212 @@
+/* Emulate flock on platforms that lack it, primarily Windows and MinGW.
+
+   This is derived from sqlite3 sources.
+   http://www.sqlite.org/cvstrac/rlog?f=sqlite/src/os_win.c
+   http://www.sqlite.org/copyright.html
+
+   Written by Richard W.M. Jones <rjones.at.redhat.com>
+
+   Copyright (C) 2008 Free Software Foundation, Inc.
+
+   This library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   This library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#include <autoconf.h>
+#include "systems.h"
+
+#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
+
+/* _get_osfhandle */
+#include <io.h>
+
+/* LockFileEx */
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
+
+#include <errno.h>
+
+/* Determine the current size of a file.  Because the other braindead
+ * APIs we'll call need lower/upper 32 bit pairs, keep the file size
+ * like that too.
+ */
+static BOOL
+file_size (HANDLE h, DWORD * lower, DWORD * upper)
+{
+  *lower = GetFileSize (h, upper);
+  return 1;
+}
+
+/* LOCKFILE_FAIL_IMMEDIATELY is undefined on some Windows systems. */
+#ifndef LOCKFILE_FAIL_IMMEDIATELY
+# define LOCKFILE_FAIL_IMMEDIATELY 1
+#endif
+
+/* Acquire a lock. */
+static BOOL
+do_lock (HANDLE h, int non_blocking, int exclusive)
+{
+  BOOL res;
+  DWORD size_lower, size_upper;
+  OVERLAPPED ovlp;
+  int flags = 0;
+
+  /* We're going to lock the whole file, so get the file size. */
+  res = file_size (h, &size_lower, &size_upper);
+  if (!res)
+    return 0;
+
+  /* Start offset is 0, and also zero the remaining members of this struct. */
+  memset (&ovlp, 0, sizeof ovlp);
+
+  if (non_blocking)
+    flags |= LOCKFILE_FAIL_IMMEDIATELY;
+  if (exclusive)
+    flags |= LOCKFILE_EXCLUSIVE_LOCK;
+
+  return LockFileEx (h, flags, 0, size_lower, size_upper, &ovlp);
+}
+
+/* Unlock reader or exclusive lock. */
+static BOOL
+do_unlock (HANDLE h)
+{
+  int res;
+  DWORD size_lower, size_upper;
+
+  res = file_size (h, &size_lower, &size_upper);
+  if (!res)
+    return 0;
+
+  return UnlockFile (h, 0, 0, size_lower, size_upper);
+}
+
+/* Now our BSD-like flock operation. */
+int
+flock (int fd, int operation)
+{
+  HANDLE h = (HANDLE) _get_osfhandle (fd);
+  DWORD res;
+  int non_blocking;
+
+  if (h == INVALID_HANDLE_VALUE)
+    {
+      errno = EBADF;
+      return -1;
+    }
+
+  non_blocking = operation & LOCK_NB;
+  operation &= ~LOCK_NB;
+
+  switch (operation)
+    {
+    case LOCK_SH:
+      res = do_lock (h, non_blocking, 0);
+      break;
+    case LOCK_EX:
+      res = do_lock (h, non_blocking, 1);
+      break;
+    case LOCK_UN:
+      res = do_unlock (h);
+      break;
+    default:
+      errno = EINVAL;
+      return -1;
+    }
+
+  /* Map Windows errors into Unix errnos.  As usual MSDN fails to
+   * document the permissible error codes.
+   */
+  if (!res)
+    {
+      DWORD err = GetLastError ();
+      switch (err)
+	{
+	  /* This means someone else is holding a lock. */
+	case ERROR_LOCK_VIOLATION:
+	  errno = EAGAIN;
+	  break;
+
+	  /* Out of memory. */
+	case ERROR_NOT_ENOUGH_MEMORY:
+	  errno = ENOMEM;
+	  break;
+
+	case ERROR_BAD_COMMAND:
+	  errno = EINVAL;
+	  break;
+
+	  /* Unlikely to be other errors, but at least don't lose the
+	   * error code.
+	   */
+	default:
+	  errno = err;
+	}
+
+      return -1;
+    }
+
+  return 0;
+}
+
+#else /* !Windows */
+
+/* We know how to implement flock in terms of fcntl. */
+
+#ifdef HAVE_FCNTL_H
+#include <fcntl.h>
+#endif
+
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+
+int
+flock (int fd, int operation)
+{
+  int cmd, r;
+  struct flock fl;
+
+  if (operation & LOCK_NB)
+    cmd = F_SETLK;
+  else
+    cmd = F_SETLKW;
+  operation &= ~LOCK_NB;
+
+  memset (&fl, 0, sizeof fl);
+  fl.l_whence = SEEK_SET;
+  /* l_start & l_len are 0, which as a special case means "whole file". */
+
+  switch (operation)
+    {
+    case LOCK_SH:
+      fl.l_type = F_RDLCK;
+      break;
+    case LOCK_EX:
+      fl.l_type = F_WRLCK;
+      break;
+    case LOCK_UN:
+      fl.l_type = F_UNLCK;
+      break;
+    default:
+      errno = EINVAL;
+      return -1;
+    }
+
+  r = fcntl (fd, cmd, &fl);
+  if (r == -1 && errno == EACCES)
+    errno = EAGAIN;
+
+  return r;
+}
+
+#endif /* !Windows */
diff -urN gdbm-1.8.0.orig/fsync.c gdbm-1.8.0.flock/fsync.c
--- gdbm-1.8.0.orig/fsync.c	1970-01-01 01:00:00.000000000 +0100
+++ gdbm-1.8.0.flock/fsync.c	2008-10-03 17:02:15.000000000 +0100
@@ -0,0 +1,83 @@
+/* Emulate fsync on platforms that lack it, primarily Windows and
+   cross-compilers like MinGW.
+
+   This is derived from sqlite3 sources.
+   http://www.sqlite.org/cvstrac/rlog?f=sqlite/src/os_win.c
+   http://www.sqlite.org/copyright.html
+
+   Written by Richard W.M. Jones <rjones.at.redhat.com>
+
+   Copyright (C) 2008 Free Software Foundation, Inc.
+
+   This library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   This library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#include <autoconf.h>
+#include "systems.h"
+#include <unistd.h>
+
+#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
+
+/* _get_osfhandle */
+#include <io.h>
+
+/* FlushFileBuffers */
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
+
+#include <errno.h>
+
+int
+fsync (int fd)
+{
+  HANDLE h = (HANDLE) _get_osfhandle (fd);
+  DWORD err;
+
+  if (h == INVALID_HANDLE_VALUE)
+    {
+      errno = EBADF;
+      return -1;
+    }
+
+  if (!FlushFileBuffers (h))
+    {
+      /* Translate some Windows errors into rough approximations of Unix
+       * errors.  MSDN is useless as usual - in this case it doesn't
+       * document the full range of errors.
+       */
+      err = GetLastError ();
+      switch (err)
+	{
+	  /* eg. Trying to fsync a tty. */
+	case ERROR_INVALID_HANDLE:
+	  errno = EINVAL;
+	  break;
+
+	default:
+	  errno = EIO;
+	}
+      return -1;
+    }
+
+  return 0;
+}
+
+#else /* !Windows */
+
+int fsync (int fd)
+{
+  sync ();
+  sync ();
+}
+
+#endif /* !Windows */
diff -urN gdbm-1.8.0.orig/Makefile.in gdbm-1.8.0.flock/Makefile.in
--- gdbm-1.8.0.orig/Makefile.in	2008-10-03 16:32:57.000000000 +0100
+++ gdbm-1.8.0.flock/Makefile.in	2008-10-03 17:12:25.000000000 +0100
@@ -20,7 +20,7 @@
 DEFS = @DEFS@
 
 # Where the system [n]dbm routines are...
-LIBS = @LIBS@ -lc
+LIBS = @LIBS@
 
 # SunOS 4 users might wish to add '-fpcc-struct-return' to CFLAGS. see INSTALL.
 CPPFLAGS = @CPPFLAGS@
@@ -132,10 +132,10 @@
 #	ar q libgdbm.a $(OBJS)
 #	$(RANLIB) libgdbm.a
 
-libgdbm.la: $(LOBJS) gdbm.h
+libgdbm.la: $(LOBJS) @LTLIBOBJS@ gdbm.h
 	rm -f libgdbm.la
 	$(LIBTOOL) --mode=link $(CC) -o libgdbm.la -rpath $(libdir) \
-		-version-info $(SHLIB_VER) $(LOBJS)
+		-version-info $(SHLIB_VER) -no-undefined $(LOBJS) @LTLIBOBJS@
 
 gdbm.h:	gdbm.proto gdbmerrno.h gdbm.proto2
 	rm -f gdbm.h
@@ -146,19 +146,19 @@
 	chmod -w gdbm.h
 
 testgdbm: testgdbm.o libgdbm.la @LIBOBJS@
-	$(LIBTOOL) $(CC) $(LDFLAGS) -o testgdbm testgdbm.o libgdbm.la @LIBOBJS@
+	$(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o testgdbm testgdbm.o libgdbm.la @LIBOBJS@
 
 testdbm: testdbm.o libgdbm.la
-	$(LIBTOOL) $(CC) $(LDFLAGS) -o testdbm testdbm.o libgdbm.la
+	$(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o testdbm testdbm.o libgdbm.la
 
 tdbm: testdbm.o
-	$(CC) $(LDFLAGS) -o tdbm testdbm.o $(LIBS)
+	$(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o tdbm testdbm.o libgdbm.la $(LIBS)
 
 testndbm.o: testndbm.c
 	$(CC) -c -I. -I$(srcdir) $(CFLAGS) $(DEFS) -DGNU $(srcdir)/testndbm.c
 
 testndbm: testndbm.o libgdbm.la
-	$(LIBTOOL) $(CC) $(LDFLAGS) -o testndbm testndbm.o libgdbm.la
+	$(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o testndbm testndbm.o libgdbm.la
 
 tndbm.o: testndbm.c
 	cp $(srcdir)/testndbm.c ./tndbm.c
@@ -166,10 +166,10 @@
 	rm -f ./tndbm.c
 
 tndbm: tndbm.o
-	$(CC) $(LDFLAGS) -o tndbm tndbm.o $(LIBS)
+	$(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o tndbm tndbm.o libgdbm.la $(LIBS)
 
 conv2gdbm: conv2gdbm.o libgdbm.la @LIBOBJS@
-	$(LIBTOOL) $(CC) $(LDFLAGS) -o conv2gdbm conv2gdbm.o $(LIBS) libgdbm.la @LIBOBJS@
+	$(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o conv2gdbm conv2gdbm.o $(LIBS) libgdbm.la @LIBOBJS@
 
 lintgdbm: 
 	lint $(DEFS) $(LFLAGS) $(DBM_CF) $(NDBM_CF) $(GDBM_CF) testgdbm.c
diff -urN gdbm-1.8.0.orig/systems.h gdbm-1.8.0.flock/systems.h
--- gdbm-1.8.0.orig/systems.h	1999-05-19 03:09:46.000000000 +0100
+++ gdbm-1.8.0.flock/systems.h	2008-10-03 16:54:09.000000000 +0100
@@ -59,9 +59,9 @@
 #define L_SET SEEK_SET
 #endif
 
-/* Do we have flock?  (BSD...) */
-
-#if HAVE_FLOCK
+#ifndef HAVE_FLOCK
+extern int flock (int fd, int operation);
+#endif
 
 #ifndef LOCK_SH
 #define LOCK_SH	1
@@ -83,36 +83,6 @@
 #define READLOCK_FILE(dbf) lock_val = flock (dbf->desc, LOCK_SH + LOCK_NB)
 #define WRITELOCK_FILE(dbf) lock_val = flock (dbf->desc, LOCK_EX + LOCK_NB)
 
-#else
-
-/* Assume it is done like System V. */
-
-#define UNLOCK_FILE(dbf) \
-	{					\
-	  struct flock flock;			\
-	  flock.l_type = F_UNLCK;		\
-	  flock.l_whence = SEEK_SET;		\
-	  flock.l_start = flock.l_len = 0L;	\
-	  fcntl (dbf->desc, F_SETLK, &flock);	\
-	}
-#define READLOCK_FILE(dbf) \
-	{					\
-	  struct flock flock;			\
-	  flock.l_type = F_RDLCK;		\
-	  flock.l_whence = SEEK_SET;			\
-	  flock.l_start = flock.l_len = 0L;	\
-	  lock_val = fcntl (dbf->desc, F_SETLK, &flock);	\
-	}
-#define WRITELOCK_FILE(dbf) \
-	{					\
-	  struct flock flock;			\
-	  flock.l_type = F_WRLCK;		\
-	  flock.l_whence = SEEK_SET;			\
-	  flock.l_start = flock.l_len = 0L;	\
-	  lock_val = fcntl (dbf->desc, F_SETLK, &flock);	\
-	}
-#endif
-
 /* Do we have bcopy?  */
 #if !HAVE_BCOPY
 #if HAVE_MEMORY_H
@@ -122,9 +92,8 @@
 #define bcopy(d1, d2, n) memcpy(d2, d1, n)
 #endif
 
-/* Do we have fsync? */
-#if !HAVE_FSYNC
-#define fsync(f) {sync(); sync();}
+#ifndef HAVE_FSYNC
+extern int fsync (int fd);
 #endif
 
 /* Default block size.  Some systems do not have blocksize in their


--- NEW FILE mingw32-gdbm.spec ---
%define __strip %{_mingw32_strip}
%define __objdump %{_mingw32_objdump}
%define _use_internal_dependency_generator 0
%define __find_requires %{_mingw32_findrequires}
%define __find_provides %{_mingw32_findprovides}

Name:           mingw32-gdbm
Version:        1.8.0
Release:        1%{?dist}
Summary:        MinGW port of GNU database routines

License:        GPLv2+
Group:          Development/Libraries
URL:            http://www.gnu.org/software/gdbm/
Source0:        ftp://ftp.gnu.org/gnu/gdbm/gdbm-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Patch0:         gdbm-1.8.0-jbj.patch
Patch1:         gdbm-1.8.0-fhs.patch
Patch2:         gdbm-1.8.0-cflags.patch
Patch3:         gdbm-1.8.0-64offset.patch

Patch100:       mingw32-gdbm-1.8.0-windows.patch

BuildArch:      noarch

BuildRequires:  mingw32-filesystem >= 26
BuildRequires:  mingw32-gcc
BuildRequires:  mingw32-binutils

BuildRequires:  libtool


%description
Gdbm is a GNU database indexing library, including routines which use
extensible hashing.  Gdbm works in a similar way to standard UNIX dbm
routines.  Gdbm is useful for developers who write C applications and
need access to a simple and efficient database or who are building C
applications which will use such a database.

This is the MinGW Windows port of the libraries and development tools.


%prep
%setup -q -n gdbm-%{version}
%patch0 -p 1 -b .jbj
%patch1 -p 1 -b .fhs
%patch2 -p 1 -b .cflags
%patch3 -p1 -b .offset

%patch100 -p1 -b .windows


%build
libtoolize --force --copy
aclocal
autoreconf
%{_mingw32_configure}
make libdir=%{_mingw32_libdir} all progs


%install
rm -rf $RPM_BUILD_ROOT
make prefix=$RPM_BUILD_ROOT%{_mingw32_prefix} install

# Install the binaries.  Arguable whether we really want these.
install conv2gdbm.exe tdbm.exe testdbm.exe testgdbm.exe testndbm.exe tndbm.exe \
  $RPM_BUILD_ROOT%{_mingw32_bindir}

# Native Fedora package seems to fluff this, but as far as I
# can tell they are trying to create <gdbm/gdbm.h> which
# links to <gdbm.h>.
pushd $RPM_BUILD_ROOT%{_mingw32_includedir}
mkdir gdbm
cd gdbm
ln -s ../gdbm.h
popd

# Remove the static library.
rm $RPM_BUILD_ROOT%{_mingw32_libdir}/libgdbm.a

# Remove man page and info file which duplicate what is in native package.
rm -r $RPM_BUILD_ROOT%{_mingw32_prefix}/man
rm -r $RPM_BUILD_ROOT%{_mingw32_prefix}/info


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root)
%{_mingw32_bindir}/conv2gdbm.exe
%{_mingw32_bindir}/tdbm.exe
%{_mingw32_bindir}/testdbm.exe
%{_mingw32_bindir}/testgdbm.exe
%{_mingw32_bindir}/testndbm.exe
%{_mingw32_bindir}/tndbm.exe
%{_mingw32_bindir}/libgdbm-2.dll
%{_mingw32_libdir}/libgdbm.dll.a
%{_mingw32_libdir}/libgdbm.la
%{_mingw32_includedir}/gdbm.h
%{_mingw32_includedir}/gdbm


%changelog
* Fri Oct  3 2008 Richard W.M. Jones <rjones at redhat.com> - 1.8.0-1
- Initial RPM release.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-gdbm/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	17 Jan 2009 03:27:23 -0000	1.1
+++ .cvsignore	17 Jan 2009 11:41:30 -0000	1.2
@@ -0,0 +1 @@
+gdbm-1.8.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-gdbm/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	17 Jan 2009 03:27:23 -0000	1.1
+++ sources	17 Jan 2009 11:41:30 -0000	1.2
@@ -0,0 +1 @@
+cd543862287f55ad66e62cc9d82cc906  gdbm-1.8.0.tar.gz



From rjones at fedoraproject.org  Sat Jan 17 11:42:04 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Sat, 17 Jan 2009 11:42:04 +0000 (UTC)
Subject: rpms/mingw32-gdbm/EL-5 gdbm-1.8.0-64offset.patch, NONE,
	1.1 gdbm-1.8.0-cflags.patch, NONE, 1.1 gdbm-1.8.0-fhs.patch,
	NONE, 1.1 gdbm-1.8.0-jbj.patch, NONE, 1.1 import.log, NONE,
	1.1 mingw32-gdbm-1.8.0-windows.patch, NONE,
	1.1 mingw32-gdbm.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <20090117114204.E224C7012B@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/mingw32-gdbm/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7349/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	gdbm-1.8.0-64offset.patch gdbm-1.8.0-cflags.patch 
	gdbm-1.8.0-fhs.patch gdbm-1.8.0-jbj.patch import.log 
	mingw32-gdbm-1.8.0-windows.patch mingw32-gdbm.spec 
Log Message:
Initial import.


gdbm-1.8.0-64offset.patch:

--- NEW FILE gdbm-1.8.0-64offset.patch ---
diff -buNr gdbm-1.8.0.orig/falloc.c gdbm-1.8.0/falloc.c
--- gdbm-1.8.0.orig/falloc.c	Tue May 18 20:16:06 1999
+++ gdbm-1.8.0/falloc.c	Thu Apr 25 18:20:45 2002
@@ -180,6 +180,13 @@
   avail_block *new_blk;
   int index;
 
+  if (dbf->header->avail.count == dbf->header->avail.size)
+    {
+      /* We're kind of stuck here, so we re-split the header in order to
+         avoid crashing.  Sigh. */
+      push_avail_block(dbf);
+    }
+
   /* Set up variables. */
   new_el.av_adr = dbf->header->avail.next_block;
   new_el.av_size = ( ( (dbf->header->avail.size * sizeof (avail_elem)) >> 1)
@@ -196,12 +203,24 @@
   if (num_bytes != new_el.av_size) _gdbm_fatal (dbf, "read error");
 
   /* Add the elements from the new block to the header. */
-  for (index = 0; index < new_blk->count; index++)
+  index = 0;
+  while (index < new_blk->count)
+    {
+      while(index < new_blk->count
+            && dbf->header->avail.count < dbf->header->avail.size)
     {
       /* With luck, this will merge a lot of blocks! */
       _gdbm_put_av_elem(new_blk->av_table[index],
 			dbf->header->avail.av_table,
-			&dbf->header->avail.count, dbf->coalesce_blocks);
+			     &dbf->header->avail.count, TRUE);
+	   index++;
+	}
+      if (dbf->header->avail.count == dbf->header->avail.size)
+        {
+          /* We're kind of stuck here, so we re-split the header in order to
+             avoid crashing.  Sigh. */
+          push_avail_block(dbf);
+	}
     }
 
   /* Fix next_block, as well. */
@@ -210,9 +229,17 @@
   /* We changed the header. */
   dbf->header_changed = TRUE;
 
-  /* Free the previous avail block. */
+  /* Free the previous avail block.   It is possible that the header table
+     is now FULL, which will cause us to overflow it! */
+  if (dbf->header->avail.count == dbf->header->avail.size)
+    {
+      /* We're kind of stuck here, so we re-split the header in order to
+         avoid crashing.  Sigh. */
+      push_avail_block(dbf);
+    }
+
   _gdbm_put_av_elem (new_el, dbf->header->avail.av_table,
-		     &dbf->header->avail.count, dbf->coalesce_blocks);
+		     &dbf->header->avail.count, TRUE);
   free (new_blk);
 }
 

gdbm-1.8.0-cflags.patch:

--- NEW FILE gdbm-1.8.0-cflags.patch ---
--- gdbm-1.8.0/Makefile.in.cflags	Tue Jun 12 19:50:21 2001
+++ gdbm-1.8.0/Makefile.in	Tue Jun 12 19:57:45 2001
@@ -17,22 +17,23 @@
 MAKEINFO = makeinfo
 TEXI2DVI = texi2dvi
 
-DEFS =
+DEFS = @DEFS@
 
 # Where the system [n]dbm routines are...
 LIBS = @LIBS@ -lc
 
 # SunOS 4 users might wish to add '-fpcc-struct-return' to CFLAGS. see INSTALL.
-CFLAGS = -O
-LDFLAGS =
+CPPFLAGS = @CPPFLAGS@
+CFLAGS = @CFLAGS@
+LDFLAGS = @LDFLAGS@
 
 # Common prefix for installation directories
-prefix = /usr/local
+prefix = /usr
 exec_prefix = $(prefix)
 mandir = $(prefix)/man
 
 # Directory in which to put libgdbm.a.
-libdir = $(exec_prefix)/lib
+libdir = $(prefix)/lib
 # The include directory for gdbm.h and dbm.h.
 includedir = $(prefix)/include
 # Info and man directories.

gdbm-1.8.0-fhs.patch:

--- NEW FILE gdbm-1.8.0-fhs.patch ---
--- gdbm-1.8.0/Makefile.in.fhs	Mon Jun  5 15:12:15 2000
+++ gdbm-1.8.0/Makefile.in	Mon Jun  5 15:16:34 2000
@@ -14,10 +14,6 @@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
 
-# File ownership and group
-BINOWN = bin
-BINGRP = bin
-
 MAKEINFO = makeinfo
 TEXI2DVI = texi2dvi
 
@@ -33,8 +29,7 @@
 # Common prefix for installation directories
 prefix = /usr/local
 exec_prefix = $(prefix)
-binprefix = $(exec_prefix)
-manprefix = $(prefix)
+mandir = $(prefix)/man
 
 # Directory in which to put libgdbm.a.
 libdir = $(exec_prefix)/lib
@@ -42,7 +37,7 @@
 includedir = $(prefix)/include
 # Info and man directories.
 infodir = $(prefix)/info
-man3dir = $(prefix)/man/man3
+man3dir = $(mandir)/man3
 manext = 3
 
 #### End of system configuration section. ####
@@ -122,18 +117,14 @@
 install: libgdbm.la gdbm.h gdbm.info
 	$(srcdir)/mkinstalldirs $(libdir) $(includedir) $(man3dir) $(infodir)
 	$(LIBTOOL) install -c libgdbm.la $(libdir)/libgdbm.la
-	$(INSTALL_DATA) -o $(BINOWN) -g $(BINGRP) gdbm.h $(includedir)/gdbm.h
-	$(INSTALL_DATA) -o $(BINOWN) -g $(BINGRP) $(srcdir)/gdbm.3 \
-		$(man3dir)/gdbm.3
-	$(INSTALL_DATA) -o $(BINOWN) -g $(BINGRP) $(srcdir)/gdbm.info \
-		$(infodir)/gdbm.info
+	$(INSTALL_DATA) gdbm.h $(includedir)/gdbm.h
+	$(INSTALL_DATA) $(srcdir)/gdbm.3 $(man3dir)/gdbm.3
+	$(INSTALL_DATA) $(srcdir)/gdbm.info $(infodir)/gdbm.info
 
 install-compat:
 	$(srcdir)/mkinstalldirs $(includedir)
-	$(INSTALL_DATA) -o $(BINOWN) -g $(BINGRP) $(srcdir)/dbm.h \
-		$(includedir)/dbm.h
-	$(INSTALL_DATA) -o $(BINOWN) -g $(BINGRP) $(srcdir)/ndbm.h \
-		$(includedir)/ndbm.h
+	$(INSTALL_DATA) $(srcdir)/dbm.h $(includedir)/dbm.h
+	$(INSTALL_DATA) $(srcdir)/ndbm.h $(includedir)/ndbm.h
 
 #libgdbm.a: $(OBJS) gdbm.h
 #	rm -f libgdbm.a

gdbm-1.8.0-jbj.patch:

--- NEW FILE gdbm-1.8.0-jbj.patch ---
--- gdbm-1.8.0/gdbmopen.c.jbj	Tue Aug 10 10:57:38 1999
+++ gdbm-1.8.0/gdbmopen.c	Tue Aug 10 10:59:06 1999
@@ -214,7 +214,7 @@
 	file_block_size = block_size;
 
       /* Get space for the file header. */
-      dbf->header = (gdbm_file_header *) malloc (file_block_size);
+      dbf->header = (gdbm_file_header *) calloc (1, file_block_size);
       if (dbf->header == NULL)
 	{
 	  gdbm_close (dbf);


--- NEW FILE import.log ---
mingw32-gdbm-1_8_0-1_fc10:EL-5:mingw32-gdbm-1.8.0-1.fc10.src.rpm:1232192228

mingw32-gdbm-1.8.0-windows.patch:

--- NEW FILE mingw32-gdbm-1.8.0-windows.patch ---
diff -urN gdbm-1.8.0.orig/configure.in gdbm-1.8.0.flock/configure.in
--- gdbm-1.8.0.orig/configure.in	1999-05-19 01:17:02.000000000 +0100
+++ gdbm-1.8.0.flock/configure.in	2008-10-03 16:55:30.000000000 +0100
@@ -5,6 +5,7 @@
 AC_PROG_CC
 AC_PROG_CPP
 AC_PROG_INSTALL
+AC_LIBTOOL_WIN32_DLL
 AM_PROG_LIBTOOL
 dnl AC_PROG_RANLIB
 dnl AC_WORDS_BIGENDIAN
@@ -13,8 +14,8 @@
 AC_HAVE_HEADERS(memory.h)
 AC_CHECK_LIB(dbm, main)
 AC_CHECK_LIB(ndbm, main)
-AC_HAVE_FUNCS(rename ftruncate flock bcopy fsync)
-AC_REPLACE_FUNCS(getopt)
+AC_HAVE_FUNCS(rename ftruncate bcopy)
+AC_REPLACE_FUNCS(flock fsync getopt)
 AC_OFF_T
 AC_ST_BLKSIZE
 AC_OUTPUT(Makefile)
diff -urN gdbm-1.8.0.orig/dbminit.c gdbm-1.8.0.flock/dbminit.c
--- gdbm-1.8.0.orig/dbminit.c	1999-05-19 01:16:05.000000000 +0100
+++ gdbm-1.8.0.flock/dbminit.c	2008-10-03 17:07:20.000000000 +0100
@@ -91,6 +91,7 @@
 	}
     }
 
+#if (!defined _WIN32 && !defined __WIN32__) || defined __CYGWIN__
   /* If the database is new, link "file.dir" to "file.pag". This is done
      so the time stamp on both files is the same. */
   if (stat (dir_file, &dir_stat) == 0)
@@ -116,6 +117,7 @@
 	  goto done;
 	}
     }
+#endif
 
   ret = 0;
 
diff -urN gdbm-1.8.0.orig/dbmopen.c gdbm-1.8.0.flock/dbmopen.c
--- gdbm-1.8.0.orig/dbmopen.c	1999-05-19 01:16:05.000000000 +0100
+++ gdbm-1.8.0.flock/dbmopen.c	2008-10-03 17:07:33.000000000 +0100
@@ -105,6 +105,7 @@
       goto done;
     }
 
+#if (!defined _WIN32 && !defined __WIN32__) || defined __CYGWIN__
   /* If the database is new, link "file.dir" to "file.pag". This is done
      so the time stamp on both files is the same. */
   if (stat (dir_file, &dir_stat) == 0)
@@ -130,6 +131,7 @@
 	  goto done;
 	}
     }
+#endif
 
 done:
   free (pag_file);
diff -urN gdbm-1.8.0.orig/flock.c gdbm-1.8.0.flock/flock.c
--- gdbm-1.8.0.orig/flock.c	1970-01-01 01:00:00.000000000 +0100
+++ gdbm-1.8.0.flock/flock.c	2008-10-03 17:02:01.000000000 +0100
@@ -0,0 +1,212 @@
+/* Emulate flock on platforms that lack it, primarily Windows and MinGW.
+
+   This is derived from sqlite3 sources.
+   http://www.sqlite.org/cvstrac/rlog?f=sqlite/src/os_win.c
+   http://www.sqlite.org/copyright.html
+
+   Written by Richard W.M. Jones <rjones.at.redhat.com>
+
+   Copyright (C) 2008 Free Software Foundation, Inc.
+
+   This library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   This library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#include <autoconf.h>
+#include "systems.h"
+
+#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
+
+/* _get_osfhandle */
+#include <io.h>
+
+/* LockFileEx */
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
+
+#include <errno.h>
+
+/* Determine the current size of a file.  Because the other braindead
+ * APIs we'll call need lower/upper 32 bit pairs, keep the file size
+ * like that too.
+ */
+static BOOL
+file_size (HANDLE h, DWORD * lower, DWORD * upper)
+{
+  *lower = GetFileSize (h, upper);
+  return 1;
+}
+
+/* LOCKFILE_FAIL_IMMEDIATELY is undefined on some Windows systems. */
+#ifndef LOCKFILE_FAIL_IMMEDIATELY
+# define LOCKFILE_FAIL_IMMEDIATELY 1
+#endif
+
+/* Acquire a lock. */
+static BOOL
+do_lock (HANDLE h, int non_blocking, int exclusive)
+{
+  BOOL res;
+  DWORD size_lower, size_upper;
+  OVERLAPPED ovlp;
+  int flags = 0;
+
+  /* We're going to lock the whole file, so get the file size. */
+  res = file_size (h, &size_lower, &size_upper);
+  if (!res)
+    return 0;
+
+  /* Start offset is 0, and also zero the remaining members of this struct. */
+  memset (&ovlp, 0, sizeof ovlp);
+
+  if (non_blocking)
+    flags |= LOCKFILE_FAIL_IMMEDIATELY;
+  if (exclusive)
+    flags |= LOCKFILE_EXCLUSIVE_LOCK;
+
+  return LockFileEx (h, flags, 0, size_lower, size_upper, &ovlp);
+}
+
+/* Unlock reader or exclusive lock. */
+static BOOL
+do_unlock (HANDLE h)
+{
+  int res;
+  DWORD size_lower, size_upper;
+
+  res = file_size (h, &size_lower, &size_upper);
+  if (!res)
+    return 0;
+
+  return UnlockFile (h, 0, 0, size_lower, size_upper);
+}
+
+/* Now our BSD-like flock operation. */
+int
+flock (int fd, int operation)
+{
+  HANDLE h = (HANDLE) _get_osfhandle (fd);
+  DWORD res;
+  int non_blocking;
+
+  if (h == INVALID_HANDLE_VALUE)
+    {
+      errno = EBADF;
+      return -1;
+    }
+
+  non_blocking = operation & LOCK_NB;
+  operation &= ~LOCK_NB;
+
+  switch (operation)
+    {
+    case LOCK_SH:
+      res = do_lock (h, non_blocking, 0);
+      break;
+    case LOCK_EX:
+      res = do_lock (h, non_blocking, 1);
+      break;
+    case LOCK_UN:
+      res = do_unlock (h);
+      break;
+    default:
+      errno = EINVAL;
+      return -1;
+    }
+
+  /* Map Windows errors into Unix errnos.  As usual MSDN fails to
+   * document the permissible error codes.
+   */
+  if (!res)
+    {
+      DWORD err = GetLastError ();
+      switch (err)
+	{
+	  /* This means someone else is holding a lock. */
+	case ERROR_LOCK_VIOLATION:
+	  errno = EAGAIN;
+	  break;
+
+	  /* Out of memory. */
+	case ERROR_NOT_ENOUGH_MEMORY:
+	  errno = ENOMEM;
+	  break;
+
+	case ERROR_BAD_COMMAND:
+	  errno = EINVAL;
+	  break;
+
+	  /* Unlikely to be other errors, but at least don't lose the
+	   * error code.
+	   */
+	default:
+	  errno = err;
+	}
+
+      return -1;
+    }
+
+  return 0;
+}
+
+#else /* !Windows */
+
+/* We know how to implement flock in terms of fcntl. */
+
+#ifdef HAVE_FCNTL_H
+#include <fcntl.h>
+#endif
+
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+
+int
+flock (int fd, int operation)
+{
+  int cmd, r;
+  struct flock fl;
+
+  if (operation & LOCK_NB)
+    cmd = F_SETLK;
+  else
+    cmd = F_SETLKW;
+  operation &= ~LOCK_NB;
+
+  memset (&fl, 0, sizeof fl);
+  fl.l_whence = SEEK_SET;
+  /* l_start & l_len are 0, which as a special case means "whole file". */
+
+  switch (operation)
+    {
+    case LOCK_SH:
+      fl.l_type = F_RDLCK;
+      break;
+    case LOCK_EX:
+      fl.l_type = F_WRLCK;
+      break;
+    case LOCK_UN:
+      fl.l_type = F_UNLCK;
+      break;
+    default:
+      errno = EINVAL;
+      return -1;
+    }
+
+  r = fcntl (fd, cmd, &fl);
+  if (r == -1 && errno == EACCES)
+    errno = EAGAIN;
+
+  return r;
+}
+
+#endif /* !Windows */
diff -urN gdbm-1.8.0.orig/fsync.c gdbm-1.8.0.flock/fsync.c
--- gdbm-1.8.0.orig/fsync.c	1970-01-01 01:00:00.000000000 +0100
+++ gdbm-1.8.0.flock/fsync.c	2008-10-03 17:02:15.000000000 +0100
@@ -0,0 +1,83 @@
+/* Emulate fsync on platforms that lack it, primarily Windows and
+   cross-compilers like MinGW.
+
+   This is derived from sqlite3 sources.
+   http://www.sqlite.org/cvstrac/rlog?f=sqlite/src/os_win.c
+   http://www.sqlite.org/copyright.html
+
+   Written by Richard W.M. Jones <rjones.at.redhat.com>
+
+   Copyright (C) 2008 Free Software Foundation, Inc.
+
+   This library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   This library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#include <autoconf.h>
+#include "systems.h"
+#include <unistd.h>
+
+#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
+
+/* _get_osfhandle */
+#include <io.h>
+
+/* FlushFileBuffers */
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
+
+#include <errno.h>
+
+int
+fsync (int fd)
+{
+  HANDLE h = (HANDLE) _get_osfhandle (fd);
+  DWORD err;
+
+  if (h == INVALID_HANDLE_VALUE)
+    {
+      errno = EBADF;
+      return -1;
+    }
+
+  if (!FlushFileBuffers (h))
+    {
+      /* Translate some Windows errors into rough approximations of Unix
+       * errors.  MSDN is useless as usual - in this case it doesn't
+       * document the full range of errors.
+       */
+      err = GetLastError ();
+      switch (err)
+	{
+	  /* eg. Trying to fsync a tty. */
+	case ERROR_INVALID_HANDLE:
+	  errno = EINVAL;
+	  break;
+
+	default:
+	  errno = EIO;
+	}
+      return -1;
+    }
+
+  return 0;
+}
+
+#else /* !Windows */
+
+int fsync (int fd)
+{
+  sync ();
+  sync ();
+}
+
+#endif /* !Windows */
diff -urN gdbm-1.8.0.orig/Makefile.in gdbm-1.8.0.flock/Makefile.in
--- gdbm-1.8.0.orig/Makefile.in	2008-10-03 16:32:57.000000000 +0100
+++ gdbm-1.8.0.flock/Makefile.in	2008-10-03 17:12:25.000000000 +0100
@@ -20,7 +20,7 @@
 DEFS = @DEFS@
 
 # Where the system [n]dbm routines are...
-LIBS = @LIBS@ -lc
+LIBS = @LIBS@
 
 # SunOS 4 users might wish to add '-fpcc-struct-return' to CFLAGS. see INSTALL.
 CPPFLAGS = @CPPFLAGS@
@@ -132,10 +132,10 @@
 #	ar q libgdbm.a $(OBJS)
 #	$(RANLIB) libgdbm.a
 
-libgdbm.la: $(LOBJS) gdbm.h
+libgdbm.la: $(LOBJS) @LTLIBOBJS@ gdbm.h
 	rm -f libgdbm.la
 	$(LIBTOOL) --mode=link $(CC) -o libgdbm.la -rpath $(libdir) \
-		-version-info $(SHLIB_VER) $(LOBJS)
+		-version-info $(SHLIB_VER) -no-undefined $(LOBJS) @LTLIBOBJS@
 
 gdbm.h:	gdbm.proto gdbmerrno.h gdbm.proto2
 	rm -f gdbm.h
@@ -146,19 +146,19 @@
 	chmod -w gdbm.h
 
 testgdbm: testgdbm.o libgdbm.la @LIBOBJS@
-	$(LIBTOOL) $(CC) $(LDFLAGS) -o testgdbm testgdbm.o libgdbm.la @LIBOBJS@
+	$(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o testgdbm testgdbm.o libgdbm.la @LIBOBJS@
 
 testdbm: testdbm.o libgdbm.la
-	$(LIBTOOL) $(CC) $(LDFLAGS) -o testdbm testdbm.o libgdbm.la
+	$(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o testdbm testdbm.o libgdbm.la
 
 tdbm: testdbm.o
-	$(CC) $(LDFLAGS) -o tdbm testdbm.o $(LIBS)
+	$(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o tdbm testdbm.o libgdbm.la $(LIBS)
 
 testndbm.o: testndbm.c
 	$(CC) -c -I. -I$(srcdir) $(CFLAGS) $(DEFS) -DGNU $(srcdir)/testndbm.c
 
 testndbm: testndbm.o libgdbm.la
-	$(LIBTOOL) $(CC) $(LDFLAGS) -o testndbm testndbm.o libgdbm.la
+	$(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o testndbm testndbm.o libgdbm.la
 
 tndbm.o: testndbm.c
 	cp $(srcdir)/testndbm.c ./tndbm.c
@@ -166,10 +166,10 @@
 	rm -f ./tndbm.c
 
 tndbm: tndbm.o
-	$(CC) $(LDFLAGS) -o tndbm tndbm.o $(LIBS)
+	$(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o tndbm tndbm.o libgdbm.la $(LIBS)
 
 conv2gdbm: conv2gdbm.o libgdbm.la @LIBOBJS@
-	$(LIBTOOL) $(CC) $(LDFLAGS) -o conv2gdbm conv2gdbm.o $(LIBS) libgdbm.la @LIBOBJS@
+	$(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o conv2gdbm conv2gdbm.o $(LIBS) libgdbm.la @LIBOBJS@
 
 lintgdbm: 
 	lint $(DEFS) $(LFLAGS) $(DBM_CF) $(NDBM_CF) $(GDBM_CF) testgdbm.c
diff -urN gdbm-1.8.0.orig/systems.h gdbm-1.8.0.flock/systems.h
--- gdbm-1.8.0.orig/systems.h	1999-05-19 03:09:46.000000000 +0100
+++ gdbm-1.8.0.flock/systems.h	2008-10-03 16:54:09.000000000 +0100
@@ -59,9 +59,9 @@
 #define L_SET SEEK_SET
 #endif
 
-/* Do we have flock?  (BSD...) */
-
-#if HAVE_FLOCK
+#ifndef HAVE_FLOCK
+extern int flock (int fd, int operation);
+#endif
 
 #ifndef LOCK_SH
 #define LOCK_SH	1
@@ -83,36 +83,6 @@
 #define READLOCK_FILE(dbf) lock_val = flock (dbf->desc, LOCK_SH + LOCK_NB)
 #define WRITELOCK_FILE(dbf) lock_val = flock (dbf->desc, LOCK_EX + LOCK_NB)
 
-#else
-
-/* Assume it is done like System V. */
-
-#define UNLOCK_FILE(dbf) \
-	{					\
-	  struct flock flock;			\
-	  flock.l_type = F_UNLCK;		\
-	  flock.l_whence = SEEK_SET;		\
-	  flock.l_start = flock.l_len = 0L;	\
-	  fcntl (dbf->desc, F_SETLK, &flock);	\
-	}
-#define READLOCK_FILE(dbf) \
-	{					\
-	  struct flock flock;			\
-	  flock.l_type = F_RDLCK;		\
-	  flock.l_whence = SEEK_SET;			\
-	  flock.l_start = flock.l_len = 0L;	\
-	  lock_val = fcntl (dbf->desc, F_SETLK, &flock);	\
-	}
-#define WRITELOCK_FILE(dbf) \
-	{					\
-	  struct flock flock;			\
-	  flock.l_type = F_WRLCK;		\
-	  flock.l_whence = SEEK_SET;			\
-	  flock.l_start = flock.l_len = 0L;	\
-	  lock_val = fcntl (dbf->desc, F_SETLK, &flock);	\
-	}
-#endif
-
 /* Do we have bcopy?  */
 #if !HAVE_BCOPY
 #if HAVE_MEMORY_H
@@ -122,9 +92,8 @@
 #define bcopy(d1, d2, n) memcpy(d2, d1, n)
 #endif
 
-/* Do we have fsync? */
-#if !HAVE_FSYNC
-#define fsync(f) {sync(); sync();}
+#ifndef HAVE_FSYNC
+extern int fsync (int fd);
 #endif
 
 /* Default block size.  Some systems do not have blocksize in their


--- NEW FILE mingw32-gdbm.spec ---
%define __strip %{_mingw32_strip}
%define __objdump %{_mingw32_objdump}
%define _use_internal_dependency_generator 0
%define __find_requires %{_mingw32_findrequires}
%define __find_provides %{_mingw32_findprovides}

Name:           mingw32-gdbm
Version:        1.8.0
Release:        1%{?dist}
Summary:        MinGW port of GNU database routines

License:        GPLv2+
Group:          Development/Libraries
URL:            http://www.gnu.org/software/gdbm/
Source0:        ftp://ftp.gnu.org/gnu/gdbm/gdbm-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Patch0:         gdbm-1.8.0-jbj.patch
Patch1:         gdbm-1.8.0-fhs.patch
Patch2:         gdbm-1.8.0-cflags.patch
Patch3:         gdbm-1.8.0-64offset.patch

Patch100:       mingw32-gdbm-1.8.0-windows.patch

BuildArch:      noarch

BuildRequires:  mingw32-filesystem >= 26
BuildRequires:  mingw32-gcc
BuildRequires:  mingw32-binutils

BuildRequires:  libtool


%description
Gdbm is a GNU database indexing library, including routines which use
extensible hashing.  Gdbm works in a similar way to standard UNIX dbm
routines.  Gdbm is useful for developers who write C applications and
need access to a simple and efficient database or who are building C
applications which will use such a database.

This is the MinGW Windows port of the libraries and development tools.


%prep
%setup -q -n gdbm-%{version}
%patch0 -p 1 -b .jbj
%patch1 -p 1 -b .fhs
%patch2 -p 1 -b .cflags
%patch3 -p1 -b .offset

%patch100 -p1 -b .windows


%build
libtoolize --force --copy
aclocal
autoreconf
%{_mingw32_configure}
make libdir=%{_mingw32_libdir} all progs


%install
rm -rf $RPM_BUILD_ROOT
make prefix=$RPM_BUILD_ROOT%{_mingw32_prefix} install

# Install the binaries.  Arguable whether we really want these.
install conv2gdbm.exe tdbm.exe testdbm.exe testgdbm.exe testndbm.exe tndbm.exe \
  $RPM_BUILD_ROOT%{_mingw32_bindir}

# Native Fedora package seems to fluff this, but as far as I
# can tell they are trying to create <gdbm/gdbm.h> which
# links to <gdbm.h>.
pushd $RPM_BUILD_ROOT%{_mingw32_includedir}
mkdir gdbm
cd gdbm
ln -s ../gdbm.h
popd

# Remove the static library.
rm $RPM_BUILD_ROOT%{_mingw32_libdir}/libgdbm.a

# Remove man page and info file which duplicate what is in native package.
rm -r $RPM_BUILD_ROOT%{_mingw32_prefix}/man
rm -r $RPM_BUILD_ROOT%{_mingw32_prefix}/info


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root)
%{_mingw32_bindir}/conv2gdbm.exe
%{_mingw32_bindir}/tdbm.exe
%{_mingw32_bindir}/testdbm.exe
%{_mingw32_bindir}/testgdbm.exe
%{_mingw32_bindir}/testndbm.exe
%{_mingw32_bindir}/tndbm.exe
%{_mingw32_bindir}/libgdbm-2.dll
%{_mingw32_libdir}/libgdbm.dll.a
%{_mingw32_libdir}/libgdbm.la
%{_mingw32_includedir}/gdbm.h
%{_mingw32_includedir}/gdbm


%changelog
* Fri Oct  3 2008 Richard W.M. Jones <rjones at redhat.com> - 1.8.0-1
- Initial RPM release.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-gdbm/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	17 Jan 2009 03:27:23 -0000	1.1
+++ .cvsignore	17 Jan 2009 11:41:34 -0000	1.2
@@ -0,0 +1 @@
+gdbm-1.8.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-gdbm/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	17 Jan 2009 03:27:23 -0000	1.1
+++ sources	17 Jan 2009 11:41:34 -0000	1.2
@@ -0,0 +1 @@
+cd543862287f55ad66e62cc9d82cc906  gdbm-1.8.0.tar.gz



From rjones at fedoraproject.org  Sat Jan 17 11:42:13 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Sat, 17 Jan 2009 11:42:13 +0000 (UTC)
Subject: rpms/mingw32-freetype/F-10 freetype-2.1.10-enable-ft2-bci.patch,
	NONE, 1.1 freetype-2.2.1-enable-valid.patch, NONE,
	1.1 freetype-2.2.1-memcpy-fix.patch, NONE,
	1.1 freetype-2.3.0-enable-spr.patch, NONE,
	1.1 freetype-multilib.patch, NONE, 1.1 import.log, NONE,
	1.1 mingw32-freetype.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090117114213.A1D9C7012B@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/mingw32-freetype/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7761/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	freetype-2.1.10-enable-ft2-bci.patch 
	freetype-2.2.1-enable-valid.patch 
	freetype-2.2.1-memcpy-fix.patch 
	freetype-2.3.0-enable-spr.patch freetype-multilib.patch 
	import.log mingw32-freetype.spec 
Log Message:
Initial import.


freetype-2.1.10-enable-ft2-bci.patch:

--- NEW FILE freetype-2.1.10-enable-ft2-bci.patch ---
--- freetype-2.1.10/include/freetype/config/ftoption.h.enable-ft2-bci	2005-10-12 13:50:40.000000000 -0400
+++ freetype-2.1.10/include/freetype/config/ftoption.h	2005-10-12 14:18:50.000000000 -0400
@@ -436,7 +436,7 @@
   /*   Do not #undef this macro here, since the build system might         */
   /*   define it for certain configurations only.                          */
   /*                                                                       */
-/* #define TT_CONFIG_OPTION_BYTECODE_INTERPRETER */
+#define TT_CONFIG_OPTION_BYTECODE_INTERPRETER
 
 
   /*************************************************************************/

freetype-2.2.1-enable-valid.patch:

--- NEW FILE freetype-2.2.1-enable-valid.patch ---
--- freetype-2.2.1/modules.cfg.orig	2006-07-07 21:01:09.000000000 -0400
+++ freetype-2.2.1/modules.cfg	2006-07-07 21:01:54.000000000 -0400
@@ -110,7 +110,7 @@
 AUX_MODULES += cache
 
 # TrueType GX/AAT table validation.  Needs ftgxval.c below.
-# AUX_MODULES += gxvalid
+AUX_MODULES += gxvalid
 
 # Support for streams compressed with gzip (files with suffix .gz).
 #
@@ -124,7 +124,7 @@
 
 # OpenType table validation.  Needs ftotval.c below.
 #
-# AUX_MODULES += otvalid
+AUX_MODULES += otvalid
 
 # Auxiliary PostScript driver component to share common code.
 #

freetype-2.2.1-memcpy-fix.patch:

--- NEW FILE freetype-2.2.1-memcpy-fix.patch ---
--- freetype-2.2.1/src/psaux/psobjs.c~	2006-04-26 16:38:17.000000000 +0200
+++ freetype-2.2.1/src/psaux/psobjs.c	2006-09-10 15:01:13.000000000 +0200
@@ -165,6 +165,11 @@
       return PSaux_Err_Invalid_Argument;
     }
 
+    if ( length < 0 ) {
+      FT_ERROR(( "ps_table_add: invalid length\n" ));
+      return PSaux_Err_Invalid_Argument;
+    }
+
     /* grow the base block if needed */
     if ( table->cursor + length > table->capacity )
     {

freetype-2.3.0-enable-spr.patch:

--- NEW FILE freetype-2.3.0-enable-spr.patch ---
--- freetype-2.3.0/include/freetype/config/ftoption.h.spf	2007-01-18 14:27:34.000000000 -0500
+++ freetype-2.3.0/include/freetype/config/ftoption.h	2007-01-18 14:27:48.000000000 -0500
@@ -92,7 +92,7 @@
   /* This is done to allow FreeType clients to run unmodified, forcing     */
   /* them to display normal gray-level anti-aliased glyphs.                */
   /*                                                                       */
-/* #define FT_CONFIG_OPTION_SUBPIXEL_RENDERING */
+#define FT_CONFIG_OPTION_SUBPIXEL_RENDERING
 
 
   /*************************************************************************/

freetype-multilib.patch:

--- NEW FILE freetype-multilib.patch ---
--- freetype-2.2.1/builds/unix/freetype-config.in.multilib	2006-07-27 18:50:40.000000000 -0400
+++ freetype-2.2.1/builds/unix/freetype-config.in	2006-07-27 18:58:13.000000000 -0400
@@ -9,11 +9,11 @@
 # indicate that you have read the license and understand and accept it
 # fully.
 
-prefix=@prefix@
-exec_prefix=@exec_prefix@
+prefix=`pkg-config --variable prefix freetype2`
+exec_prefix=`pkg-config --variable exec_prefix freetype2`
 exec_prefix_set=no
-includedir=@includedir@
-libdir=@libdir@
+includedir=`pkg-config --variable includedir freetype2`
+libdir=`pkg-config --variable libdir freetype2`
 enable_shared=@build_libtool_libs@
 wl=@wl@
 hardcode_libdir_flag_spec='@hardcode_libdir_flag_spec@'


--- NEW FILE import.log ---
mingw32-freetype-2_3_8-1_fc10:F-10:mingw32-freetype-2.3.8-1.fc10.src.rpm:1232192240


--- NEW FILE mingw32-freetype.spec ---
%define __strip %{_mingw32_strip}
%define __objdump %{_mingw32_objdump}
%define _use_internal_dependency_generator 0
%define __find_requires %{_mingw32_findrequires}
%define __find_provides %{_mingw32_findprovides}

# Patented bytecode interpreter and patented subpixel rendering
# disabled by default.  Pass '--with bytecode_interpreter' and '--with
# subpixel_rendering' on rpmbuild command-line to enable them.

%define _with_subpixel_rendering 1}
%define _without_subpixel_rendering 0}
%{!?_with_bytecode_interpreter: %{!?_without_bytecode_interpreter: %define _without_bytecode_interpreter --without-bytecode_interpreter}}
%{!?_with_subpixel_rendering: %{!?_without_subpixel_rendering: %define _without_subpixel_rendering --without-subpixel_rendering}}

%define with_xfree86 0

Name:           mingw32-freetype
Version:        2.3.8
Release:        1%{?dist}
Summary:        Free and portable font rendering engine

License:        FTL or GPLv2+
URL:            http://www.freetype.org
Source:         http://download.savannah.gnu.org/releases/freetype/freetype-%{version}.tar.bz2
Source1:        http://download.savannah.gnu.org/releases/freetype/freetype-doc-%{version}.tar.bz2
#Source2:        http://download.savannah.gnu.org/releases/freetype/ft2demos-%{version}.tar.bz2
Group:          Development/Libraries
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

# Patches from native Fedora package.
#Patch5:         ft2demos-2.1.9-mathlib.patch
Patch20:        freetype-2.1.10-enable-ft2-bci.patch
Patch21:        freetype-2.3.0-enable-spr.patch
Patch46:        freetype-2.2.1-enable-valid.patch
Patch88:        freetype-multilib.patch
Patch89:        freetype-2.2.1-memcpy-fix.patch

BuildArch:      noarch

BuildRequires:  mingw32-filesystem >= 25
BuildRequires:  mingw32-gcc
BuildRequires:  mingw32-binutils
BuildRequires:  mingw32-zlib
BuildRequires:  mingw32-dlfcn

Requires:       pkgconfig


%description
MinGW Windows Freetype library.


%prep
%setup -q -n freetype-%{version} -b 1 -a 1

#pushd ft2demos-%{version}
#%patch5 -p1 -b .mathlib
#popd

%if %{?_with_bytecode_interpreter:1}%{!?_with_bytecode_interpreter:0}
%patch20  -p1 -b .enable-ft2-bci
%endif

%if %{?_with_subpixel_rendering:1}%{!?_with_subpixel_rendering:0}
%patch21  -p1 -b .enable-spr
%endif

%patch46  -p1 -b .enable-valid

%patch88 -p1 -b .multilib
%patch89 -p1 -b .memcpy


%build
%{_mingw32_configure} --disable-static
make %{?_smp_mflags}

# The ft2demos Makefile is hacky and doesn't understand
# cross-compilation.  This nearly works, but not quite, so
# disable. it.
#pushd ft2demos-%{version}
#make TOP_DIR=".." PLATFORM=win32
#popd


%install
rm -rf $RPM_BUILD_ROOT

make DESTDIR=$RPM_BUILD_ROOT install


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root)
%doc docs/LICENSE.TXT
%{_mingw32_bindir}/freetype-config
%{_mingw32_bindir}/libfreetype-6.dll
%{_mingw32_includedir}/freetype2
%{_mingw32_includedir}/ft2build.h
%{_mingw32_libdir}/libfreetype.dll.a
%{_mingw32_libdir}/libfreetype.la
%{_mingw32_libdir}/pkgconfig/freetype2.pc
%{_mingw32_datadir}/aclocal/freetype2.m4


%changelog
* Fri Jan 16 2009 Richard W.M. Jones <rjones at redhat.com> - 2.3.8-1
- New upstream version 2.3.8.
- Use the patches from the Fedora native package.
- Disable patented code.
- Don't build the static library.
- Use _smp_mflags.
- BR mingw32-dlfcn (not required, but uses it if installed).
- Add license file to doc section.

* Tue Jan 13 2009 Richard W.M. Jones <rjones at redhat.com> - 2.3.7-6
- Requires pkgconfig.

* Wed Sep 24 2008 Richard W.M. Jones <rjones at redhat.com> - 2.3.7-5
- Rename mingw -> mingw32.

* Mon Sep 22 2008 Daniel P. Berrange <berrange at redhat.com> - 2.3.7-4
- Import patches from rawhide  & add docs

* Sun Sep 21 2008 Richard W.M. Jones <rjones at redhat.com> - 2.3.7-3
- Depends on filesystem >= 25.

* Wed Sep 10 2008 Richard W.M. Jones <rjones at redhat.com> - 2.3.7-2
- Fix source URL.
- Remove static libraries.

* Tue Sep  9 2008 Daniel P. Berrange <berrange at redhat.com> - 2.3.7-1
- Initial RPM release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-freetype/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	17 Jan 2009 03:28:53 -0000	1.1
+++ .cvsignore	17 Jan 2009 11:41:43 -0000	1.2
@@ -0,0 +1,2 @@
+freetype-2.3.8.tar.bz2
+freetype-doc-2.3.8.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-freetype/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	17 Jan 2009 03:28:53 -0000	1.1
+++ sources	17 Jan 2009 11:41:43 -0000	1.2
@@ -0,0 +1,2 @@
+6cf31a08826715a0d16ae366da9c7d3b  freetype-2.3.8.tar.bz2
+de1cc7cf098e11fba5898efdab1bc23d  freetype-doc-2.3.8.tar.bz2



From rjones at fedoraproject.org  Sat Jan 17 11:42:20 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Sat, 17 Jan 2009 11:42:20 +0000 (UTC)
Subject: rpms/mingw32-readline/EL-5 import.log, NONE,
	1.1 mingw32-readline.spec, NONE, 1.1 readline-5.2-001.patch, NONE,
	1.1 readline-5.2-002.patch, NONE, 1.1 readline-5.2-003.patch,
	NONE, 1.1 readline-5.2-004.patch, NONE,
	1.1 readline-5.2-005.patch, NONE, 1.1 readline-5.2-006.patch,
	NONE, 1.1 readline-5.2-007.patch, NONE,
	1.1 readline-5.2-008.patch, NONE, 1.1 readline-5.2-009.patch,
	NONE, 1.1 readline-5.2-010.patch, NONE,
	1.1 readline-5.2-011.patch, NONE,
	1.1 readline-5.2-redisplay-sigint.patch, NONE,
	1.1 readline-5.2-shlib.patch, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090117114220.444F97012B@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/mingw32-readline/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8269/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	import.log mingw32-readline.spec readline-5.2-001.patch 
	readline-5.2-002.patch readline-5.2-003.patch 
	readline-5.2-004.patch readline-5.2-005.patch 
	readline-5.2-006.patch readline-5.2-007.patch 
	readline-5.2-008.patch readline-5.2-009.patch 
	readline-5.2-010.patch readline-5.2-011.patch 
	readline-5.2-redisplay-sigint.patch readline-5.2-shlib.patch 
Log Message:
Initial import.



--- NEW FILE import.log ---
mingw32-readline-5_2-4_fc10:EL-5:mingw32-readline-5.2-4.fc10.src.rpm:1232192261


--- NEW FILE mingw32-readline.spec ---
%define __strip %{_mingw32_strip}
%define __objdump %{_mingw32_objdump}
%define _use_internal_dependency_generator 0
%define __find_requires %{_mingw32_findrequires}
%define __find_provides %{_mingw32_findprovides}

Name:           mingw32-readline
Version:        5.2
Release:        4%{?dist}
Summary:        MinGW port of readline for editing typed command lines

License:        GPLv2+
Group:          System Environment/Libraries
URL:            http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html
Source0:        ftp://ftp.gnu.org/gnu/readline/readline-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Patch1:         readline-5.2-shlib.patch
Patch2:         readline-5.2-001.patch
Patch3:         readline-5.2-002.patch
Patch4:         readline-5.2-003.patch
Patch5:         readline-5.2-004.patch
Patch6:         readline-5.2-005.patch
Patch7:         readline-5.2-006.patch
Patch8:         readline-5.2-007.patch
Patch9:         readline-5.2-008.patch
Patch10:        readline-5.2-009.patch
Patch11:        readline-5.2-010.patch
Patch12:        readline-5.2-011.patch
Patch13:        readline-5.2-redisplay-sigint.patch

BuildArch:      noarch

BuildRequires:  mingw32-filesystem >= 29
BuildRequires:  mingw32-gcc
BuildRequires:  mingw32-binutils
BuildRequires:  mingw32-termcap >= 1.3.1-3


%description
The Readline library provides a set of functions that allow users to
edit command lines. Both Emacs and vi editing modes are available. The
Readline library includes additional functions for maintaining a list
of previously-entered command lines for recalling or editing those
lines, and for performing csh-like history expansion on previous
commands.

This is a port of the library and development tools to Windows.


%prep
%setup -q -n readline-%{version}
%patch1 -p1 -b .shlib
%patch2 -p0 -b .001
%patch3 -p0 -b .002
%patch4 -p0 -b .003
%patch5 -p0 -b .004
%patch6 -p0 -b .005
%patch7 -p0 -b .006
%patch8 -p0 -b .007
%patch9 -p0 -b .008
%patch10 -p0 -b .009
%patch11 -p0 -b .010
%patch12 -p0 -b .011
%patch13 -p1 -b .redisplay-sigint

pushd examples
rm -f rlfe/configure
iconv -f iso8859-1 -t utf8 -o rl-fgets.c{_,}
touch -r rl-fgets.c{,_}
mv -f rl-fgets.c{_,}
popd


%build
%{_mingw32_configure} --enable-shared
make SHLIB_LIBS=-ltermcap

# Rebuild the DLLs correctly and create implibs.
pushd shlib
%{_mingw32_cc} -shared -o readline.dll -Wl,--out-implib,libreadline.dll.a readline.so vi_mode.so funmap.so keymaps.so parens.so search.so rltty.so complete.so bind.so isearch.so display.so signals.so util.so kill.so undo.so macro.so input.so callback.so terminal.so text.so nls.so misc.so xmalloc.so history.so histexpand.so histfile.so histsearch.so shell.so mbutil.so tilde.so compat.so -ltermcap
%{_mingw32_cc} -shared -o history.dll -Wl,--out-implib,libhistory.dll.a history.so histexpand.so histfile.so histsearch.so shell.so mbutil.so xmalloc.so
popd


%install
rm -rf $RPM_BUILD_ROOT
make DESTDIR=$RPM_BUILD_ROOT install

# Remove the fake .so files and install our DLLs and implibs.
pushd shlib
rm $RPM_BUILD_ROOT%{_mingw32_libdir}/lib*.so.*
mkdir -p $RPM_BUILD_ROOT%{_mingw32_bindir}
install readline.dll $RPM_BUILD_ROOT%{_mingw32_bindir}
install libreadline.dll.a $RPM_BUILD_ROOT%{_mingw32_libdir}
install history.dll $RPM_BUILD_ROOT%{_mingw32_bindir}
install libhistory.dll.a $RPM_BUILD_ROOT%{_mingw32_libdir}
popd

# Don't want the info files or manpages which duplicate the native package.
rm -rf $RPM_BUILD_ROOT%{_mingw32_mandir}
rm -rf $RPM_BUILD_ROOT%{_mingw32_infodir}

# Don't want the static library.
rm $RPM_BUILD_ROOT%{_mingw32_libdir}/libhistory.a
rm $RPM_BUILD_ROOT%{_mingw32_libdir}/libreadline.a


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root)
%{_mingw32_bindir}/readline.dll
%{_mingw32_bindir}/history.dll
%{_mingw32_libdir}/libreadline.dll.a
%{_mingw32_libdir}/libhistory.dll.a
%{_mingw32_includedir}/readline/


%changelog
* Sat Nov 22 2008 Richard W.M. Jones <rjones at redhat.com> - 5.2-4
- Rename *.dll.a to lib*.dll.a so that libtool can use these libraries.

* Wed Nov 19 2008 Richard W.M. Jones <rjones at redhat.com> - 5.2-3
- Fix paths to mandir, infodir.

* Fri Oct 31 2008 Richard W.M. Jones <rjones at redhat.com> - 5.2-2
- Rebuild against latest termcap.

* Thu Sep 25 2008 Richard W.M. Jones <rjones at redhat.com> - 5.2-1
- Initial RPM release.

readline-5.2-001.patch:

--- NEW FILE readline-5.2-001.patch ---
			   READLINE PATCH REPORT
			   =====================

Readline-Release: 5.2
Patch-ID: readline52-001

Bug-Reported-by:	ebb9 at byu.net
Bug-Reference-ID:	<45540862.9030900 at byu.net>
Bug-Reference-URL:	http://lists.gnu.org/archive/html/bug-bash/2006-11/msg00017.html
			http://lists.gnu.org/archive/html/bug-bash/2006-11/msg00016.html

Bug-Description:

In some cases, code that is intended to be used in the presence of multibyte
characters is called when no such characters are present, leading to incorrect
display position calculations and incorrect redisplay.

Patch:

*** ../readline-5.2/display.c	Thu Sep 14 14:20:12 2006
--- display.c	Mon Nov 13 17:55:57 2006
***************
*** 2381,2384 ****
--- 2409,2414 ----
    if (end <= start)
      return 0;
+   if (MB_CUR_MAX == 1 || rl_byte_oriented)
+     return (end - start);
  
    memset (&ps, 0, sizeof (mbstate_t));

readline-5.2-002.patch:

--- NEW FILE readline-5.2-002.patch ---
			   READLINE PATCH REPORT
			   =====================

Readline-Release: 5.2
Patch-ID: readline52-002

Bug-Reported-by: Magnus Svensson <msvensson at mysql.com>
Bug-Reference-ID: <45BDC44D.80609 at mysql.com>
Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-readline/2007-01/msg00002.html

Bug-Description:

Readline neglects to reallocate the array it uses to keep track of wrapped
screen lines when increasing its size.  This will eventually result in
segmentation faults when given sufficiently long input.

Patch:

*** ../readline-5.2-patched/display.c	Thu Sep 14 14:20:12 2006
--- display.c	Fri Feb  2 20:23:17 2007
***************
*** 561,574 ****
--- 561,586 ----
        wrap_offset = prompt_invis_chars_first_line = 0;
      }
  
+ #if defined (HANDLE_MULTIBYTE)
  #define CHECK_INV_LBREAKS() \
        do { \
  	if (newlines >= (inv_lbsize - 2)) \
  	  { \
  	    inv_lbsize *= 2; \
  	    inv_lbreaks = (int *)xrealloc (inv_lbreaks, inv_lbsize * sizeof (int)); \
+ 	    _rl_wrapped_line = (int *)xrealloc (_rl_wrapped_line, inv_lbsize * sizeof (int)); \
  	  } \
        } while (0)
+ #else
+ #define CHECK_INV_LBREAKS() \
+       do { \
+ 	if (newlines >= (inv_lbsize - 2)) \
+ 	  { \
+ 	    inv_lbsize *= 2; \
+ 	    inv_lbreaks = (int *)xrealloc (inv_lbreaks, inv_lbsize * sizeof (int)); \
+ 	  } \
+       } while (0)
+ #endif /* HANDLE_MULTIBYTE */
  
  #if defined (HANDLE_MULTIBYTE)	  
  #define CHECK_LPOS() \

readline-5.2-003.patch:

--- NEW FILE readline-5.2-003.patch ---
			   READLINE PATCH REPORT
			   =====================

Readline-Release: 5.2
Patch-ID: readline52-003

Bug-Reported-by: Peter Volkov <torre_cremata at mail.ru>
Bug-Reference-ID: <1171795523.8021.18.camel at localhost>
Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2007-02/msg00054.html

Bug-Description:

When moving the cursor, bash sometimes misplaces the cursor when the prompt
contains two or more multibyte characters.  The particular circumstance that
uncovered the problem was having the (multibyte) current directory name in
the prompt string.

Patch:

*** ../readline-5.2.2/display.c	Fri Jan 19 13:34:50 2007
--- display.c	Sat Mar 10 17:25:44 2007
***************
*** 1745,1749 ****
      {
        dpos = _rl_col_width (data, 0, new);
!       if (dpos > prompt_last_invisible)		/* XXX - don't use woff here */
  	{
  	  dpos -= woff;
--- 1745,1752 ----
      {
        dpos = _rl_col_width (data, 0, new);
!       /* Use NEW when comparing against the last invisible character in the
! 	 prompt string, since they're both buffer indices and DPOS is a
! 	 desired display position. */
!       if (new > prompt_last_invisible)		/* XXX - don't use woff here */
  	{
  	  dpos -= woff;

readline-5.2-004.patch:

--- NEW FILE readline-5.2-004.patch ---
			   READLINE PATCH REPORT
			   =====================

Readline-Release: 5.2
Patch-ID: readline52-004

Bug-Reported-by: Peter Volkov <torre_cremata at mail.ru>
Bug-Reference-ID: <1173636022.7039.36.camel at localhost>
Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2007-03/msg00039.html

Bug-Description:

When restoring the original prompt after finishing an incremental search,
bash sometimes places the cursor incorrectly if the primary prompt contains
invisible characters.

Patch:

*** ../readline-5.2.3/display.c	Fri Apr 20 13:30:16 2007
--- display.c	Fri Apr 20 15:17:01 2007
***************
*** 1599,1604 ****
  	  if (temp > 0)
  	    {
  	      _rl_output_some_chars (nfd, temp);
! 	      _rl_last_c_pos += _rl_col_width (nfd, 0, temp);;
  	    }
  	}
--- 1599,1618 ----
  	  if (temp > 0)
  	    {
+ 	      /* If nfd begins at the prompt, or before the invisible
+ 		 characters in the prompt, we need to adjust _rl_last_c_pos
+ 		 in a multibyte locale to account for the wrap offset and
+ 		 set cpos_adjusted accordingly. */
  	      _rl_output_some_chars (nfd, temp);
! 	      if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
! 		{
!                   _rl_last_c_pos += _rl_col_width (nfd, 0, temp);
!                   if (current_line == 0 && wrap_offset &&  ((nfd - new) <= prompt_last_invisible))
! 		    {
! 		      _rl_last_c_pos -= wrap_offset;
! 		      cpos_adjusted = 1;
! 		    }
! 		}
!               else
!                 _rl_last_c_pos += temp;
  	    }
  	}
***************
*** 1608,1613 ****
--- 1622,1639 ----
  	  if (temp > 0)
  	    {
+ 	      /* If nfd begins at the prompt, or before the invisible
+ 		 characters in the prompt, we need to adjust _rl_last_c_pos
+ 		 in a multibyte locale to account for the wrap offset and
+ 		 set cpos_adjusted accordingly. */
  	      _rl_output_some_chars (nfd, temp);
  	      _rl_last_c_pos += col_temp;		/* XXX */
+ 	      if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
+ 		{
+ 		  if (current_line == 0 && wrap_offset &&  ((nfd - new) <= prompt_last_invisible))
+ 		    {
+ 		      _rl_last_c_pos -= wrap_offset;
+ 		      cpos_adjusted = 1;
+ 		    }
+ 		}
  	    }
  	  lendiff = (oe - old) - (ne - new);

readline-5.2-005.patch:

--- NEW FILE readline-5.2-005.patch ---
			   READLINE PATCH REPORT
			   =====================

Readline-Release: 5.2
Patch-ID: readline52-005

Bug-Reported-by:        Thomas Loeber <ifp at loeber1.de>
Bug-Reference-ID:       <200703082223.08919.ifp at loeber1.de>
Bug-Reference-URL:	http://lists.gnu.org/archive/html/bug-bash/2007-03/msg00036.html

Bug-Description:

When rl_read_key returns -1, indicating that readline's controlling terminal
has been invalidated for some reason (e.g., receiving a SIGHUP), the error
status was not reported correctly to the caller.  This could cause input
loops. 

Patch:

*** ../readline-5.2/complete.c	Fri Jul 28 11:35:49 2006
--- complete.c	Tue Mar 13 08:50:16 2007
***************
*** 429,433 ****
        if (c == 'n' || c == 'N' || c == RUBOUT)
  	return (0);
!       if (c == ABORT_CHAR)
  	_rl_abort_internal ();
        if (for_pager && (c == NEWLINE || c == RETURN))
--- 440,444 ----
        if (c == 'n' || c == 'N' || c == RUBOUT)
  	return (0);
!       if (c == ABORT_CHAR || c < 0)
  	_rl_abort_internal ();
        if (for_pager && (c == NEWLINE || c == RETURN))
*** ../readline-5.2/input.c	Wed Aug 16 15:15:16 2006
--- input.c	Wed May  2 16:07:59 2007
***************
*** 514,518 ****
       int size;
  {
!   int mb_len = 0;
    size_t mbchar_bytes_length;
    wchar_t wc;
--- 522,526 ----
       int size;
  {
!   int mb_len, c;
    size_t mbchar_bytes_length;
    wchar_t wc;
***************
*** 521,531 ****
    memset(&ps, 0, sizeof (mbstate_t));
    memset(&ps_back, 0, sizeof (mbstate_t));
!   
    while (mb_len < size)
      {
        RL_SETSTATE(RL_STATE_MOREINPUT);
!       mbchar[mb_len++] = rl_read_key ();
        RL_UNSETSTATE(RL_STATE_MOREINPUT);
  
        mbchar_bytes_length = mbrtowc (&wc, mbchar, mb_len, &ps);
        if (mbchar_bytes_length == (size_t)(-1))
--- 529,545 ----
    memset(&ps, 0, sizeof (mbstate_t));
    memset(&ps_back, 0, sizeof (mbstate_t));
! 
!   mb_len = 0;  
    while (mb_len < size)
      {
        RL_SETSTATE(RL_STATE_MOREINPUT);
!       c = rl_read_key ();
        RL_UNSETSTATE(RL_STATE_MOREINPUT);
  
+       if (c < 0)
+ 	break;
+ 
+       mbchar[mb_len++] = c;
+ 
        mbchar_bytes_length = mbrtowc (&wc, mbchar, mb_len, &ps);
        if (mbchar_bytes_length == (size_t)(-1))
***************
*** 565,569 ****
    c = first;
    memset (mb, 0, mlen);
!   for (i = 0; i < mlen; i++)
      {
        mb[i] = (char)c;
--- 579,583 ----
    c = first;
    memset (mb, 0, mlen);
!   for (i = 0; c >= 0 && i < mlen; i++)
      {
        mb[i] = (char)c;
*** ../readline-5.2/isearch.c	Mon Dec 26 17:18:53 2005
--- isearch.c	Fri Mar  9 14:30:59 2007
***************
*** 328,333 ****
  
    f = (rl_command_func_t *)NULL;
!  
!  /* Translate the keys we do something with to opcodes. */
    if (c >= 0 && _rl_keymap[c].type == ISFUNC)
      {
--- 328,340 ----
  
    f = (rl_command_func_t *)NULL;
! 
!   if (c < 0)
!     {
!       cxt->sflags |= SF_FAILED;
!       cxt->history_pos = cxt->last_found_line;
!       return -1;
!     }
! 
!   /* Translate the keys we do something with to opcodes. */
    if (c >= 0 && _rl_keymap[c].type == ISFUNC)
      {
*** ../readline-5.2/misc.c	Mon Dec 26 17:20:46 2005
--- misc.c	Fri Mar  9 14:44:11 2007
***************
*** 147,150 ****
--- 147,152 ----
  	  rl_clear_message ();
  	  RL_UNSETSTATE(RL_STATE_NUMERICARG);
+ 	  if (key < 0)
+ 	    return -1;
  	  return (_rl_dispatch (key, _rl_keymap));
  	}
*** ../readline-5.2/readline.c	Wed Aug 16 15:00:36 2006
--- readline.c	Fri Mar  9 14:47:24 2007
***************
*** 646,649 ****
--- 669,677 ----
      {
        nkey = _rl_subseq_getchar (cxt->okey);
+       if (nkey < 0)
+ 	{
+ 	  _rl_abort_internal ();
+ 	  return -1;
+ 	}
        r = _rl_dispatch_subseq (nkey, cxt->dmap, cxt->subseq_arg);
        cxt->flags |= KSEQ_DISPATCHED;
*** ../readline-5.2/text.c	Fri Jul 28 11:55:27 2006
--- text.c	Sun Mar 25 13:41:38 2007
***************
*** 858,861 ****
--- 864,870 ----
    RL_UNSETSTATE(RL_STATE_MOREINPUT);
  
+   if (c < 0)
+     return -1;
+ 
  #if defined (HANDLE_SIGNALS)
    if (RL_ISSTATE (RL_STATE_CALLBACK) == 0)
***************
*** 1521,1524 ****
--- 1530,1536 ----
    mb_len = _rl_read_mbchar (mbchar, MB_LEN_MAX);
  
+   if (mb_len <= 0)
+     return -1;
+ 
    if (count < 0)
      return (_rl_char_search_internal (-count, bdir, mbchar, mb_len));
***************
*** 1537,1540 ****
--- 1549,1555 ----
    RL_UNSETSTATE(RL_STATE_MOREINPUT);
  
+   if (c < 0)
+     return -1;
+ 
    if (count < 0)
      return (_rl_char_search_internal (-count, bdir, c));
*** ../readline-5.2/vi_mode.c	Sat Jul 29 16:42:28 2006
--- vi_mode.c	Fri Mar  9 15:02:11 2007
***************
*** 887,890 ****
--- 887,897 ----
    c = rl_read_key ();
    RL_UNSETSTATE(RL_STATE_MOREINPUT);
+ 
+   if (c < 0)
+     {
+       *nextkey = 0;
+       return -1;
+     }
+ 
    *nextkey = c;
  
***************
*** 903,906 ****
--- 910,918 ----
  	  c = rl_read_key ();	/* real command */
  	  RL_UNSETSTATE(RL_STATE_MOREINPUT);
+ 	  if (c < 0)
+ 	    {
+ 	      *nextkey = 0;
+ 	      return -1;
+ 	    }
  	  *nextkey = c;
  	}
***************
*** 1225,1236 ****
       _rl_callback_generic_arg *data;
  {
  #if defined (HANDLE_MULTIBYTE)
!   _rl_vi_last_search_mblen = _rl_read_mbchar (_rl_vi_last_search_mbchar, MB_LEN_MAX);
  #else
    RL_SETSTATE(RL_STATE_MOREINPUT);
!   _rl_vi_last_search_char = rl_read_key ();
    RL_UNSETSTATE(RL_STATE_MOREINPUT);
  #endif
  
    _rl_callback_func = 0;
    _rl_want_redisplay = 1;
--- 1243,1262 ----
       _rl_callback_generic_arg *data;
  {
+   int c;
  #if defined (HANDLE_MULTIBYTE)
!   c = _rl_vi_last_search_mblen = _rl_read_mbchar (_rl_vi_last_search_mbchar, MB_LEN_MAX);
  #else
    RL_SETSTATE(RL_STATE_MOREINPUT);
!   c = rl_read_key ();
    RL_UNSETSTATE(RL_STATE_MOREINPUT);
  #endif
  
+   if (c <= 0)
+     return -1;
+ 
+ #if !defined (HANDLE_MULTIBYTE)
+   _rl_vi_last_search_char = c;
+ #endif
+ 
    _rl_callback_func = 0;
    _rl_want_redisplay = 1;
***************
*** 1248,1251 ****
--- 1274,1278 ----
       int count, key;
  {
+   int c;
  #if defined (HANDLE_MULTIBYTE)
    static char *target;
***************
*** 1294,1302 ****
  	{
  #if defined (HANDLE_MULTIBYTE)
! 	  _rl_vi_last_search_mblen = _rl_read_mbchar (_rl_vi_last_search_mbchar, MB_LEN_MAX);
  #else
  	  RL_SETSTATE(RL_STATE_MOREINPUT);
! 	  _rl_vi_last_search_char = rl_read_key ();
  	  RL_UNSETSTATE(RL_STATE_MOREINPUT);
  #endif
  	}
--- 1321,1335 ----
  	{
  #if defined (HANDLE_MULTIBYTE)
! 	  c = _rl_read_mbchar (_rl_vi_last_search_mbchar, MB_LEN_MAX);
! 	  if (c <= 0)
! 	    return -1;
! 	  _rl_vi_last_search_mblen = c;
  #else
  	  RL_SETSTATE(RL_STATE_MOREINPUT);
! 	  c = rl_read_key ();
  	  RL_UNSETSTATE(RL_STATE_MOREINPUT);
+ 	  if (c < 0)
+ 	    return -1;
+ 	  _rl_vi_last_search_char = c;
  #endif
  	}
***************
*** 1468,1471 ****
--- 1501,1507 ----
    RL_UNSETSTATE(RL_STATE_MOREINPUT);
  
+   if (c < 0)
+     return -1;
+ 
  #if defined (HANDLE_MULTIBYTE)
    if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
***************
*** 1486,1489 ****
--- 1522,1528 ----
    _rl_vi_last_replacement = c = _rl_vi_callback_getchar (mb, MB_LEN_MAX);
  
+   if (c < 0)
+     return -1;
+ 
    _rl_callback_func = 0;
    _rl_want_redisplay = 1;
***************
*** 1517,1520 ****
--- 1556,1562 ----
      _rl_vi_last_replacement = c = _rl_vi_callback_getchar (mb, MB_LEN_MAX);
  
+   if (c < 0)
+     return -1;
+ 
    return (_rl_vi_change_char (count, c, mb));
  }
***************
*** 1651,1655 ****
    RL_UNSETSTATE(RL_STATE_MOREINPUT);
  
!   if (ch < 'a' || ch > 'z')
      {
        rl_ding ();
--- 1693,1697 ----
    RL_UNSETSTATE(RL_STATE_MOREINPUT);
  
!   if (ch < 0 || ch < 'a' || ch > 'z')	/* make test against 0 explicit */
      {
        rl_ding ();
***************
*** 1703,1707 ****
        return 0;
      }
!   else if (ch < 'a' || ch > 'z')
      {
        rl_ding ();
--- 1745,1749 ----
        return 0;
      }
!   else if (ch < 0 || ch < 'a' || ch > 'z')	/* make test against 0 explicit */
      {
        rl_ding ();

readline-5.2-006.patch:

--- NEW FILE readline-5.2-006.patch ---
			   READLINE PATCH REPORT
			   =====================

Readline-Release: 5.2
Patch-ID: readline52-006

Bug-Reported-by:        Peter Volkov <torre_cremata at mail.ru>
Bug-Reference-ID:       <1178376645.9063.25.camel at localhost>
Bug-Reference-URL:      http://bugs.gentoo.org/177095

Bug-Description:

The readline display code miscalculated the screen position when performing
a redisplay in which the new text occupies more screen space that the old,
but takes fewer bytes to do so (e.g., when replacing a shorter string
containing multibyte characters with a longer one containing only ASCII).

Patch:

*** ../readline-5.2/display.c	Thu Apr 26 11:38:22 2007
--- display.c	Thu Jul 12 23:10:10 2007
***************
*** 1519,1527 ****
        /* Non-zero if we're increasing the number of lines. */
        int gl = current_line >= _rl_vis_botlin && inv_botlin > _rl_vis_botlin;
        /* Sometimes it is cheaper to print the characters rather than
  	 use the terminal's capabilities.  If we're growing the number
  	 of lines, make sure we actually cause the new line to wrap
  	 around on auto-wrapping terminals. */
!       if (_rl_terminal_can_insert && ((2 * col_temp) >= col_lendiff || _rl_term_IC) && (!_rl_term_autowrap || !gl))
  	{
  	  /* If lendiff > prompt_visible_length and _rl_last_c_pos == 0 and
--- 1568,1596 ----
        /* Non-zero if we're increasing the number of lines. */
        int gl = current_line >= _rl_vis_botlin && inv_botlin > _rl_vis_botlin;
+       /* If col_lendiff is > 0, implying that the new string takes up more
+ 	 screen real estate than the old, but lendiff is < 0, meaning that it
+ 	 takes fewer bytes, we need to just output the characters starting
+ 	 from the first difference.  These will overwrite what is on the
+ 	 display, so there's no reason to do a smart update.  This can really
+ 	 only happen in a multibyte environment. */
+       if (lendiff < 0)
+ 	{
+ 	  _rl_output_some_chars (nfd, temp);
+ 	  _rl_last_c_pos += _rl_col_width (nfd, 0, temp);
+ 	  /* If nfd begins before any invisible characters in the prompt,
+ 	     adjust _rl_last_c_pos to account for wrap_offset and set
+ 	     cpos_adjusted to let the caller know. */
+ 	  if (current_line == 0 && wrap_offset && ((nfd - new) <= prompt_last_invisible))
+ 	    {
+ 	      _rl_last_c_pos -= wrap_offset;
+ 	      cpos_adjusted = 1;
+ 	    }
+ 	  return;
+ 	}
        /* Sometimes it is cheaper to print the characters rather than
  	 use the terminal's capabilities.  If we're growing the number
  	 of lines, make sure we actually cause the new line to wrap
  	 around on auto-wrapping terminals. */
!       else if (_rl_terminal_can_insert && ((2 * col_temp) >= col_lendiff || _rl_term_IC) && (!_rl_term_autowrap || !gl))
  	{
  	  /* If lendiff > prompt_visible_length and _rl_last_c_pos == 0 and

readline-5.2-007.patch:

--- NEW FILE readline-5.2-007.patch ---
			   READLINE PATCH REPORT
			   =====================

Readline-Release: 5.2
Patch-ID: readline52-007

Bug-Reported-by:        Tom Bjorkholm <tom.bjorkholm at ericsson.com>
Bug-Reference-ID:       <AEA1A32F001C6B4F98614B5B80D7647D01C075E9 at esealmw115.eemea.ericsson.se>
Bug-Reference-URL:	http://lists.gnu.org/archive/html/bug-readline/2007-04/msg00004.html


Bug-Description:

An off-by-one error in readline's input buffering caused readline to drop
each 511th character of buffered input (e.g., when pasting a large amount
of data into a terminal window).

Patch:

*** ../readline-5.2/input.c	Wed Aug 16 15:15:16 2006
--- input.c	Tue Jul 17 09:24:21 2007
***************
*** 134,139 ****
  
    *key = ibuffer[pop_index++];
! 
    if (pop_index >= ibuffer_len)
      pop_index = 0;
  
--- 134,142 ----
  
    *key = ibuffer[pop_index++];
! #if 0
    if (pop_index >= ibuffer_len)
+ #else
+   if (pop_index > ibuffer_len)
+ #endif
      pop_index = 0;
  
***************
*** 251,255 ****
  	{
  	  k = (*rl_getc_function) (rl_instream);
! 	  rl_stuff_char (k);
  	  if (k == NEWLINE || k == RETURN)
  	    break;
--- 254,259 ----
  	{
  	  k = (*rl_getc_function) (rl_instream);
! 	  if (rl_stuff_char (k) == 0)
! 	    break;			/* some problem; no more room */
  	  if (k == NEWLINE || k == RETURN)
  	    break;
***************
*** 374,378 ****
--- 378,386 ----
      }
    ibuffer[push_index++] = key;
+ #if 0
    if (push_index >= ibuffer_len)
+ #else
+   if (push_index > ibuffer_len)
+ #endif
      push_index = 0;
  

readline-5.2-008.patch:

--- NEW FILE readline-5.2-008.patch ---
			   READLINE PATCH REPORT
			   =====================

Readline-Release: 5.2
Patch-ID: readline52-008

Bug-Reported-by:	dAniel hAhler <ubuntu at thequod.de>
Bug-Reference-ID:	<4702ED8A.5000503 at thequod.de>
Bug-Reference-URL:	https://bugs.launchpad.net/ubuntu/+source/bash/+bug/119938

Bug-Description:

When updating the display after displaying, for instance, a list of possible
completions, readline will place the cursor at the wrong position if the
prompt contains invisible characters and a newline.

Patch:

*** ../readline-5.2-patched/display.c	Mon Aug  6 14:26:29 2007
--- display.c	Wed Oct 10 22:43:58 2007
***************
*** 1049,1053 ****
  	      else
  		tx = nleft;
! 	      if (_rl_last_c_pos > tx)
  		{
  	          _rl_backspace (_rl_last_c_pos - tx);	/* XXX */
--- 1049,1053 ----
  	      else
  		tx = nleft;
! 	      if (tx >= 0 && _rl_last_c_pos > tx)
  		{
  	          _rl_backspace (_rl_last_c_pos - tx);	/* XXX */
***************
*** 1205,1209 ****
  {
    register char *ofd, *ols, *oe, *nfd, *nls, *ne;
!   int temp, lendiff, wsatend, od, nd;
    int current_invis_chars;
    int col_lendiff, col_temp;
--- 1205,1209 ----
  {
    register char *ofd, *ols, *oe, *nfd, *nls, *ne;
!   int temp, lendiff, wsatend, od, nd, o_cpos;
    int current_invis_chars;
    int col_lendiff, col_temp;
***************
*** 1466,1469 ****
--- 1466,1471 ----
      }
  
+   o_cpos = _rl_last_c_pos;
+ 
    /* When this function returns, _rl_last_c_pos is correct, and an absolute
       cursor postion in multibyte mode, but a buffer index when not in a
***************
*** 1475,1479 ****
       invisible characters in the prompt string.  Let's see if setting this when
       we make sure we're at the end of the drawn prompt string works. */
!   if (current_line == 0 && MB_CUR_MAX > 1 && rl_byte_oriented == 0 && _rl_last_c_pos == prompt_physical_chars)
      cpos_adjusted = 1;
  #endif
--- 1477,1483 ----
       invisible characters in the prompt string.  Let's see if setting this when
       we make sure we're at the end of the drawn prompt string works. */
!   if (current_line == 0 && MB_CUR_MAX > 1 && rl_byte_oriented == 0 && 
!       (_rl_last_c_pos > 0 || o_cpos > 0) &&
!       _rl_last_c_pos == prompt_physical_chars)
      cpos_adjusted = 1;
  #endif

readline-5.2-009.patch:

--- NEW FILE readline-5.2-009.patch ---
			   READLINE PATCH REPORT
			   =====================

Readline-Release: 5.2
Patch-ID: readline52-009

Bug-Reported-by:	dAniel hAhler <ubuntu at thequod.de>
Bug-Reference-ID:
Bug-Reference-URL:

Bug-Description:

Under some circumstances, readline will incorrectly display a prompt string
containing invisible characters after the final newline.

Patch:

*** ../readline-5.2-patched/display.c	2007-08-25 13:47:08.000000000 -0400
--- display.c	2007-11-10 17:51:29.000000000 -0500
***************
*** 392,396 ****
        local_prompt = expand_prompt (p, &prompt_visible_length,
  				       &prompt_last_invisible,
! 				       (int *)NULL,
  				       &prompt_physical_chars);
        c = *t; *t = '\0';
--- 420,424 ----
        local_prompt = expand_prompt (p, &prompt_visible_length,
  				       &prompt_last_invisible,
! 				       &prompt_invis_chars_first_line,
  				       &prompt_physical_chars);
        c = *t; *t = '\0';
***************
*** 399,403 ****
        local_prompt_prefix = expand_prompt (prompt, &prompt_prefix_length,
  						   (int *)NULL,
! 						   &prompt_invis_chars_first_line,
  						   (int *)NULL);
        *t = c;
--- 427,431 ----
        local_prompt_prefix = expand_prompt (prompt, &prompt_prefix_length,
  						   (int *)NULL,
! 						   (int *)NULL,
  						   (int *)NULL);
        *t = c;

readline-5.2-010.patch:

--- NEW FILE readline-5.2-010.patch ---
			   READLINE PATCH REPORT
			   =====================

Readline-Release: 5.2
Patch-ID: readline52-010

Bug-Reported-by:	Miroslav Lichvar <mlichvar at redhat.com>
Bug-Reference-ID:	Fri, 02 Nov 2007 14:07:45 +0100
Bug-Reference-URL:	http://lists.gnu.org/archive/html/bug-readline/2007-11/msg00000.html

Bug-Description:

In certain cases when outputting characters at the end of the line,
e.g., when displaying the prompt string, readline positions the cursor
incorrectly if the prompt string contains invisible characters and the
text being drawn begins before the last invisible character in the line.

Patch:

*** ../readline-5.2-patched/display.c	2007-08-25 13:47:08.000000000 -0400
--- display.c	2007-11-10 17:51:29.000000000 -0500
***************
*** 1566,1574 ****
  	  else
  	    {
- 	      /* We have horizontal scrolling and we are not inserting at
- 		 the end.  We have invisible characters in this line.  This
- 		 is a dumb update. */
  	      _rl_output_some_chars (nfd, temp);
  	      _rl_last_c_pos += col_temp;
  	      return;
  	    }
--- 1619,1632 ----
  	  else
  	    {
  	      _rl_output_some_chars (nfd, temp);
  	      _rl_last_c_pos += col_temp;
+ 	      /* If nfd begins before any invisible characters in the prompt,
+ 		 adjust _rl_last_c_pos to account for wrap_offset and set
+ 		 cpos_adjusted to let the caller know. */
+ 	      if (current_line == 0 && wrap_offset && ((nfd - new) <= prompt_last_invisible))
+ 		{
+ 		  _rl_last_c_pos -= wrap_offset;
+ 		  cpos_adjusted = 1;
+ 		}
  	      return;
  	    }

readline-5.2-011.patch:

--- NEW FILE readline-5.2-011.patch ---
			   READLINE PATCH REPORT
			   =====================

Readline-Release: 5.2
Patch-ID: readline52-011

Bug-Reported-by:	Uwe Doering <gemini at geminix.org>
Bug-Reference-ID:	<46F3DD72.2090801 at geminix.org>
Bug-Reference-URL:	http://lists.gnu.org/archive/html/bug-bash/2007-09/msg00102.html

Bug-Description:

There is an off-by-one error in the code that buffers characters received
very quickly in succession, causing characters to be dropped.

Patch:

*** ../readline-5.2-patched/input.c	2007-08-25 13:47:10.000000000 -0400
--- input.c	2007-10-12 22:55:25.000000000 -0400
***************
*** 155,159 ****
        pop_index--;
        if (pop_index < 0)
! 	pop_index = ibuffer_len - 1;
        ibuffer[pop_index] = key;
        return (1);
--- 155,159 ----
        pop_index--;
        if (pop_index < 0)
! 	pop_index = ibuffer_len;
        ibuffer[pop_index] = key;
        return (1);

readline-5.2-redisplay-sigint.patch:

--- NEW FILE readline-5.2-redisplay-sigint.patch ---
GDB PR 544: gdb.cp/annota2.exp and gdb.cp/annota3.exp sometimes FAIL with:
	FAIL: gdb.cp/annota3.exp: annotate-quit (pattern 1)

One can put `sleep (1)' at the end of _RL_OUTPUT_SOME_CHARS and type
	p 1<enter><ctrl-c>
to abort the prompt printing. Before the patch:
	(gdb) p 1
	$1 = 1
	Quit) (gdb) 
	(gdb) _
After the patch:
	[bash]jkratoch at host0.dyn.jankratochvil.net:/home/jkratoch/redhat/sources/readline# ../gdb/gdb -nx -silent(gdb) p 1
	$1 = 1
	(gdb) Quit
	(gdb) _

The readline patch posted upstream:
	http://sourceware.org/ml/gdb-patches/2008-03/msg00317.html

On Fri, 21 Mar 2008 19:37:31 +0100, Chet Ramey wrote:
> I will add something like your block_sigint/release_sigint changes around
> the guts of rl_redisplay.  That's the right thing to do anyway.  It will
> probably not come out as a patch for readline-5.2; you can use your
> current patch (though the names will change to _rl_block_sigint and
> _rl_release_sigint -- fair warning).

Application cannot easily supply its own RL_REDISPLAY_FUNCTION as a custom
function there changes the readline behavior:
	http://sourceware.org/ml/gdb-patches/2008-03/msg00340.html

BLOCK_SIGINT / RELEASE_SIGINT: Make it public and prefix it by `_rl_'.
RL_REDISPLAY: Wrap it by _RL_BLOCK_SIGINT / _RL_RELEASE_SIGINT.

--- readline-5.2-orig/display.c	2008-03-23 20:52:12.000000000 +0100
+++ readline-5.2/display.c	2008-03-23 20:56:58.000000000 +0100
@@ -472,6 +472,10 @@ rl_redisplay ()
   if (!readline_echoing_p)
     return;
 
+  /* Signals are blocked through this function as the global data structures
+     could get corrupted upon modifications from an invoked signal handler. */
+  _rl_block_sigint ();
+
   if (!rl_display_prompt)
     rl_display_prompt = "";
 
@@ -1180,6 +1184,8 @@ rl_redisplay ()
     else
       visible_wrap_offset = wrap_offset;
   }
+
+  _rl_release_sigint ();
 }
 
 /* PWP: update_line() is based on finding the middle difference of each
--- readline-5.2-orig/rltty.c	2005-12-26 23:21:50.000000000 +0100
+++ readline-5.2/rltty.c	2008-03-23 20:57:26.000000000 +0100
@@ -52,8 +52,8 @@ extern int errno;
 rl_vintfunc_t *rl_prep_term_function = rl_prep_terminal;
 rl_voidfunc_t *rl_deprep_term_function = rl_deprep_terminal;
 
-static void block_sigint PARAMS((void));
-static void release_sigint PARAMS((void));
+void _rl_block_sigint PARAMS((void));
+void _rl_release_sigint PARAMS((void));
 
 static void set_winsize PARAMS((int));
 
@@ -74,9 +74,9 @@ static int sigint_oldmask;
 static int sigint_blocked;
 
 /* Cause SIGINT to not be delivered until the corresponding call to
-   release_sigint(). */
-static void
-block_sigint ()
+   _rl_release_sigint(). */
+void
+_rl_block_sigint ()
 {
   if (sigint_blocked)
     return;
@@ -100,8 +100,8 @@ block_sigint ()
 }
 
 /* Allow SIGINT to be delivered. */
-static void
-release_sigint ()
+void
+_rl_release_sigint ()
 {
   if (sigint_blocked == 0)
     return;
@@ -663,7 +663,7 @@ rl_prep_terminal (meta_flag)
     return;
 
   /* Try to keep this function from being INTerrupted. */
-  block_sigint ();
+  _rl_block_sigint ();
 
   tty = fileno (rl_instream);
 
@@ -676,7 +676,7 @@ rl_prep_terminal (meta_flag)
       if (errno == ENOTTY)
 #endif
 	readline_echoing_p = 1;		/* XXX */
-      release_sigint ();
+      _rl_release_sigint ();
       return;
     }
 
@@ -711,7 +711,7 @@ rl_prep_terminal (meta_flag)
 
   if (set_tty_settings (tty, &tio) < 0)
     {
-      release_sigint ();
+      _rl_release_sigint ();
       return;
     }
 
@@ -722,7 +722,7 @@ rl_prep_terminal (meta_flag)
   terminal_prepped = 1;
   RL_SETSTATE(RL_STATE_TERMPREPPED);
 
-  release_sigint ();
+  _rl_release_sigint ();
 }
 
 /* Restore the terminal's normal settings and modes. */
@@ -735,7 +735,7 @@ rl_deprep_terminal ()
     return;
 
   /* Try to keep this function from being interrupted. */
-  block_sigint ();
+  _rl_block_sigint ();
 
   tty = fileno (rl_instream);
 
@@ -746,14 +746,14 @@ rl_deprep_terminal ()
 
   if (set_tty_settings (tty, &otio) < 0)
     {
-      release_sigint ();
+      _rl_release_sigint ();
       return;
     }
 
   terminal_prepped = 0;
   RL_UNSETSTATE(RL_STATE_TERMPREPPED);
 
-  release_sigint ();
+  _rl_release_sigint ();
 }
 #endif /* !NO_TTY_DRIVER */
 
--- readline-5.2-orig/rltty.h	2003-02-01 04:43:11.000000000 +0100
+++ readline-5.2/rltty.h	2008-03-23 20:57:30.000000000 +0100
@@ -79,4 +79,7 @@ typedef struct _rl_tty_chars {
   unsigned char t_status;
 } _RL_TTY_CHARS;
 
+extern void _rl_block_sigint PARAMS((void));
+extern void _rl_release_sigint PARAMS((void));
+
 #endif /* _RLTTY_H_ */

readline-5.2-shlib.patch:

--- NEW FILE readline-5.2-shlib.patch ---
--- readline-5.2/support/shlib-install.shlib	2006-01-03 20:06:27.000000000 +0100
+++ readline-5.2/support/shlib-install	2006-11-13 13:51:02.000000000 +0100
@@ -71,7 +71,7 @@
 case "$host_os" in
 hpux*|darwin*|macosx*|linux*)
 	if [ -z "$uninstall" ]; then
-		chmod 555 ${INSTALLDIR}/${LIBNAME}
+		chmod 755 ${INSTALLDIR}/${LIBNAME}
 	fi ;;
 cygwin*)
 	IMPLIBNAME=`echo ${LIBNAME} \
--- readline-5.2/support/shobj-conf.shlib	2006-04-11 15:15:43.000000000 +0200
+++ readline-5.2/support/shobj-conf	2007-03-15 14:11:36.000000000 +0100
@@ -108,10 +108,11 @@
 linux*-*|gnu*-*|k*bsd*-gnu-*)
 	SHOBJ_CFLAGS=-fPIC
 	SHOBJ_LD='${CC}'
-	SHOBJ_LDFLAGS='-shared -Wl,-soname,$@'
+	SHOBJ_LDFLAGS='$(CFLAGS) -shared -Wl,-soname,$@'
 
-	SHLIB_XLDFLAGS='-Wl,-rpath,$(libdir) -Wl,-soname,`basename $@ $(SHLIB_MINOR)`'
+	SHLIB_XLDFLAGS='-Wl,-soname,`basename $@ $(SHLIB_MINOR)`'
 	SHLIB_LIBVERSION='$(SHLIB_LIBSUFF).$(SHLIB_MAJOR)$(SHLIB_MINOR)'
+	SHLIB_LIBS='-ltinfo'
 	;;
 
 freebsd2* | netbsd*)
--- readline-5.2/shlib/Makefile.in.shlib	2005-08-12 05:56:10.000000000 +0200
+++ readline-5.2/shlib/Makefile.in	2007-11-05 18:59:14.000000000 +0100
@@ -168,7 +168,7 @@ $(SHARED_READLINE):	$(SHARED_OBJ)
 
 $(SHARED_HISTORY):	$(SHARED_HISTOBJ) xmalloc.so
 	$(RM) $@
-	$(SHOBJ_LD) ${SHOBJ_LDFLAGS} ${SHLIB_XLDFLAGS} -o $@ $(SHARED_HISTOBJ) xmalloc.so $(SHLIB_LIBS)
+	$(SHOBJ_LD) ${SHOBJ_LDFLAGS} ${SHLIB_XLDFLAGS} -o $@ $(SHARED_HISTOBJ) xmalloc.so
 
 # Since tilde.c is shared between readline and bash, make sure we compile 
 # it with the right flags when it's built as part of readline


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-readline/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	17 Jan 2009 03:30:40 -0000	1.1
+++ .cvsignore	17 Jan 2009 11:42:19 -0000	1.2
@@ -0,0 +1 @@
+readline-5.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-readline/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	17 Jan 2009 03:30:40 -0000	1.1
+++ sources	17 Jan 2009 11:42:19 -0000	1.2
@@ -0,0 +1 @@
+e39331f32ad14009b9ff49cc10c5e751  readline-5.2.tar.gz



From rjones at fedoraproject.org  Sat Jan 17 11:42:16 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Sat, 17 Jan 2009 11:42:16 +0000 (UTC)
Subject: rpms/mingw32-readline/F-10 import.log, NONE,
	1.1 mingw32-readline.spec, NONE, 1.1 readline-5.2-001.patch, NONE,
	1.1 readline-5.2-002.patch, NONE, 1.1 readline-5.2-003.patch,
	NONE, 1.1 readline-5.2-004.patch, NONE,
	1.1 readline-5.2-005.patch, NONE, 1.1 readline-5.2-006.patch,
	NONE, 1.1 readline-5.2-007.patch, NONE,
	1.1 readline-5.2-008.patch, NONE, 1.1 readline-5.2-009.patch,
	NONE, 1.1 readline-5.2-010.patch, NONE,
	1.1 readline-5.2-011.patch, NONE,
	1.1 readline-5.2-redisplay-sigint.patch, NONE,
	1.1 readline-5.2-shlib.patch, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090117114216.CDEE37012B@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/mingw32-readline/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8288/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	import.log mingw32-readline.spec readline-5.2-001.patch 
	readline-5.2-002.patch readline-5.2-003.patch 
	readline-5.2-004.patch readline-5.2-005.patch 
	readline-5.2-006.patch readline-5.2-007.patch 
	readline-5.2-008.patch readline-5.2-009.patch 
	readline-5.2-010.patch readline-5.2-011.patch 
	readline-5.2-redisplay-sigint.patch readline-5.2-shlib.patch 
Log Message:
Initial import.



--- NEW FILE import.log ---
mingw32-readline-5_2-4_fc10:F-10:mingw32-readline-5.2-4.fc10.src.rpm:1232192262


--- NEW FILE mingw32-readline.spec ---
%define __strip %{_mingw32_strip}
%define __objdump %{_mingw32_objdump}
%define _use_internal_dependency_generator 0
%define __find_requires %{_mingw32_findrequires}
%define __find_provides %{_mingw32_findprovides}

Name:           mingw32-readline
Version:        5.2
Release:        4%{?dist}
Summary:        MinGW port of readline for editing typed command lines

License:        GPLv2+
Group:          System Environment/Libraries
URL:            http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html
Source0:        ftp://ftp.gnu.org/gnu/readline/readline-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Patch1:         readline-5.2-shlib.patch
Patch2:         readline-5.2-001.patch
Patch3:         readline-5.2-002.patch
Patch4:         readline-5.2-003.patch
Patch5:         readline-5.2-004.patch
Patch6:         readline-5.2-005.patch
Patch7:         readline-5.2-006.patch
Patch8:         readline-5.2-007.patch
Patch9:         readline-5.2-008.patch
Patch10:        readline-5.2-009.patch
Patch11:        readline-5.2-010.patch
Patch12:        readline-5.2-011.patch
Patch13:        readline-5.2-redisplay-sigint.patch

BuildArch:      noarch

BuildRequires:  mingw32-filesystem >= 29
BuildRequires:  mingw32-gcc
BuildRequires:  mingw32-binutils
BuildRequires:  mingw32-termcap >= 1.3.1-3


%description
The Readline library provides a set of functions that allow users to
edit command lines. Both Emacs and vi editing modes are available. The
Readline library includes additional functions for maintaining a list
of previously-entered command lines for recalling or editing those
lines, and for performing csh-like history expansion on previous
commands.

This is a port of the library and development tools to Windows.


%prep
%setup -q -n readline-%{version}
%patch1 -p1 -b .shlib
%patch2 -p0 -b .001
%patch3 -p0 -b .002
%patch4 -p0 -b .003
%patch5 -p0 -b .004
%patch6 -p0 -b .005
%patch7 -p0 -b .006
%patch8 -p0 -b .007
%patch9 -p0 -b .008
%patch10 -p0 -b .009
%patch11 -p0 -b .010
%patch12 -p0 -b .011
%patch13 -p1 -b .redisplay-sigint

pushd examples
rm -f rlfe/configure
iconv -f iso8859-1 -t utf8 -o rl-fgets.c{_,}
touch -r rl-fgets.c{,_}
mv -f rl-fgets.c{_,}
popd


%build
%{_mingw32_configure} --enable-shared
make SHLIB_LIBS=-ltermcap

# Rebuild the DLLs correctly and create implibs.
pushd shlib
%{_mingw32_cc} -shared -o readline.dll -Wl,--out-implib,libreadline.dll.a readline.so vi_mode.so funmap.so keymaps.so parens.so search.so rltty.so complete.so bind.so isearch.so display.so signals.so util.so kill.so undo.so macro.so input.so callback.so terminal.so text.so nls.so misc.so xmalloc.so history.so histexpand.so histfile.so histsearch.so shell.so mbutil.so tilde.so compat.so -ltermcap
%{_mingw32_cc} -shared -o history.dll -Wl,--out-implib,libhistory.dll.a history.so histexpand.so histfile.so histsearch.so shell.so mbutil.so xmalloc.so
popd


%install
rm -rf $RPM_BUILD_ROOT
make DESTDIR=$RPM_BUILD_ROOT install

# Remove the fake .so files and install our DLLs and implibs.
pushd shlib
rm $RPM_BUILD_ROOT%{_mingw32_libdir}/lib*.so.*
mkdir -p $RPM_BUILD_ROOT%{_mingw32_bindir}
install readline.dll $RPM_BUILD_ROOT%{_mingw32_bindir}
install libreadline.dll.a $RPM_BUILD_ROOT%{_mingw32_libdir}
install history.dll $RPM_BUILD_ROOT%{_mingw32_bindir}
install libhistory.dll.a $RPM_BUILD_ROOT%{_mingw32_libdir}
popd

# Don't want the info files or manpages which duplicate the native package.
rm -rf $RPM_BUILD_ROOT%{_mingw32_mandir}
rm -rf $RPM_BUILD_ROOT%{_mingw32_infodir}

# Don't want the static library.
rm $RPM_BUILD_ROOT%{_mingw32_libdir}/libhistory.a
rm $RPM_BUILD_ROOT%{_mingw32_libdir}/libreadline.a


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root)
%{_mingw32_bindir}/readline.dll
%{_mingw32_bindir}/history.dll
%{_mingw32_libdir}/libreadline.dll.a
%{_mingw32_libdir}/libhistory.dll.a
%{_mingw32_includedir}/readline/


%changelog
* Sat Nov 22 2008 Richard W.M. Jones <rjones at redhat.com> - 5.2-4
- Rename *.dll.a to lib*.dll.a so that libtool can use these libraries.

* Wed Nov 19 2008 Richard W.M. Jones <rjones at redhat.com> - 5.2-3
- Fix paths to mandir, infodir.

* Fri Oct 31 2008 Richard W.M. Jones <rjones at redhat.com> - 5.2-2
- Rebuild against latest termcap.

* Thu Sep 25 2008 Richard W.M. Jones <rjones at redhat.com> - 5.2-1
- Initial RPM release.

readline-5.2-001.patch:

--- NEW FILE readline-5.2-001.patch ---
			   READLINE PATCH REPORT
			   =====================

Readline-Release: 5.2
Patch-ID: readline52-001

Bug-Reported-by:	ebb9 at byu.net
Bug-Reference-ID:	<45540862.9030900 at byu.net>
Bug-Reference-URL:	http://lists.gnu.org/archive/html/bug-bash/2006-11/msg00017.html
			http://lists.gnu.org/archive/html/bug-bash/2006-11/msg00016.html

Bug-Description:

In some cases, code that is intended to be used in the presence of multibyte
characters is called when no such characters are present, leading to incorrect
display position calculations and incorrect redisplay.

Patch:

*** ../readline-5.2/display.c	Thu Sep 14 14:20:12 2006
--- display.c	Mon Nov 13 17:55:57 2006
***************
*** 2381,2384 ****
--- 2409,2414 ----
    if (end <= start)
      return 0;
+   if (MB_CUR_MAX == 1 || rl_byte_oriented)
+     return (end - start);
  
    memset (&ps, 0, sizeof (mbstate_t));

readline-5.2-002.patch:

--- NEW FILE readline-5.2-002.patch ---
			   READLINE PATCH REPORT
			   =====================

Readline-Release: 5.2
Patch-ID: readline52-002

Bug-Reported-by: Magnus Svensson <msvensson at mysql.com>
Bug-Reference-ID: <45BDC44D.80609 at mysql.com>
Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-readline/2007-01/msg00002.html

Bug-Description:

Readline neglects to reallocate the array it uses to keep track of wrapped
screen lines when increasing its size.  This will eventually result in
segmentation faults when given sufficiently long input.

Patch:

*** ../readline-5.2-patched/display.c	Thu Sep 14 14:20:12 2006
--- display.c	Fri Feb  2 20:23:17 2007
***************
*** 561,574 ****
--- 561,586 ----
        wrap_offset = prompt_invis_chars_first_line = 0;
      }
  
+ #if defined (HANDLE_MULTIBYTE)
  #define CHECK_INV_LBREAKS() \
        do { \
  	if (newlines >= (inv_lbsize - 2)) \
  	  { \
  	    inv_lbsize *= 2; \
  	    inv_lbreaks = (int *)xrealloc (inv_lbreaks, inv_lbsize * sizeof (int)); \
+ 	    _rl_wrapped_line = (int *)xrealloc (_rl_wrapped_line, inv_lbsize * sizeof (int)); \
  	  } \
        } while (0)
+ #else
+ #define CHECK_INV_LBREAKS() \
+       do { \
+ 	if (newlines >= (inv_lbsize - 2)) \
+ 	  { \
+ 	    inv_lbsize *= 2; \
+ 	    inv_lbreaks = (int *)xrealloc (inv_lbreaks, inv_lbsize * sizeof (int)); \
+ 	  } \
+       } while (0)
+ #endif /* HANDLE_MULTIBYTE */
  
  #if defined (HANDLE_MULTIBYTE)	  
  #define CHECK_LPOS() \

readline-5.2-003.patch:

--- NEW FILE readline-5.2-003.patch ---
			   READLINE PATCH REPORT
			   =====================

Readline-Release: 5.2
Patch-ID: readline52-003

Bug-Reported-by: Peter Volkov <torre_cremata at mail.ru>
Bug-Reference-ID: <1171795523.8021.18.camel at localhost>
Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2007-02/msg00054.html

Bug-Description:

When moving the cursor, bash sometimes misplaces the cursor when the prompt
contains two or more multibyte characters.  The particular circumstance that
uncovered the problem was having the (multibyte) current directory name in
the prompt string.

Patch:

*** ../readline-5.2.2/display.c	Fri Jan 19 13:34:50 2007
--- display.c	Sat Mar 10 17:25:44 2007
***************
*** 1745,1749 ****
      {
        dpos = _rl_col_width (data, 0, new);
!       if (dpos > prompt_last_invisible)		/* XXX - don't use woff here */
  	{
  	  dpos -= woff;
--- 1745,1752 ----
      {
        dpos = _rl_col_width (data, 0, new);
!       /* Use NEW when comparing against the last invisible character in the
! 	 prompt string, since they're both buffer indices and DPOS is a
! 	 desired display position. */
!       if (new > prompt_last_invisible)		/* XXX - don't use woff here */
  	{
  	  dpos -= woff;

readline-5.2-004.patch:

--- NEW FILE readline-5.2-004.patch ---
			   READLINE PATCH REPORT
			   =====================

Readline-Release: 5.2
Patch-ID: readline52-004

Bug-Reported-by: Peter Volkov <torre_cremata at mail.ru>
Bug-Reference-ID: <1173636022.7039.36.camel at localhost>
Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2007-03/msg00039.html

Bug-Description:

When restoring the original prompt after finishing an incremental search,
bash sometimes places the cursor incorrectly if the primary prompt contains
invisible characters.

Patch:

*** ../readline-5.2.3/display.c	Fri Apr 20 13:30:16 2007
--- display.c	Fri Apr 20 15:17:01 2007
***************
*** 1599,1604 ****
  	  if (temp > 0)
  	    {
  	      _rl_output_some_chars (nfd, temp);
! 	      _rl_last_c_pos += _rl_col_width (nfd, 0, temp);;
  	    }
  	}
--- 1599,1618 ----
  	  if (temp > 0)
  	    {
+ 	      /* If nfd begins at the prompt, or before the invisible
+ 		 characters in the prompt, we need to adjust _rl_last_c_pos
+ 		 in a multibyte locale to account for the wrap offset and
+ 		 set cpos_adjusted accordingly. */
  	      _rl_output_some_chars (nfd, temp);
! 	      if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
! 		{
!                   _rl_last_c_pos += _rl_col_width (nfd, 0, temp);
!                   if (current_line == 0 && wrap_offset &&  ((nfd - new) <= prompt_last_invisible))
! 		    {
! 		      _rl_last_c_pos -= wrap_offset;
! 		      cpos_adjusted = 1;
! 		    }
! 		}
!               else
!                 _rl_last_c_pos += temp;
  	    }
  	}
***************
*** 1608,1613 ****
--- 1622,1639 ----
  	  if (temp > 0)
  	    {
+ 	      /* If nfd begins at the prompt, or before the invisible
+ 		 characters in the prompt, we need to adjust _rl_last_c_pos
+ 		 in a multibyte locale to account for the wrap offset and
+ 		 set cpos_adjusted accordingly. */
  	      _rl_output_some_chars (nfd, temp);
  	      _rl_last_c_pos += col_temp;		/* XXX */
+ 	      if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
+ 		{
+ 		  if (current_line == 0 && wrap_offset &&  ((nfd - new) <= prompt_last_invisible))
+ 		    {
+ 		      _rl_last_c_pos -= wrap_offset;
+ 		      cpos_adjusted = 1;
+ 		    }
+ 		}
  	    }
  	  lendiff = (oe - old) - (ne - new);

readline-5.2-005.patch:

--- NEW FILE readline-5.2-005.patch ---
			   READLINE PATCH REPORT
			   =====================

Readline-Release: 5.2
Patch-ID: readline52-005

Bug-Reported-by:        Thomas Loeber <ifp at loeber1.de>
Bug-Reference-ID:       <200703082223.08919.ifp at loeber1.de>
Bug-Reference-URL:	http://lists.gnu.org/archive/html/bug-bash/2007-03/msg00036.html

Bug-Description:

When rl_read_key returns -1, indicating that readline's controlling terminal
has been invalidated for some reason (e.g., receiving a SIGHUP), the error
status was not reported correctly to the caller.  This could cause input
loops. 

Patch:

*** ../readline-5.2/complete.c	Fri Jul 28 11:35:49 2006
--- complete.c	Tue Mar 13 08:50:16 2007
***************
*** 429,433 ****
        if (c == 'n' || c == 'N' || c == RUBOUT)
  	return (0);
!       if (c == ABORT_CHAR)
  	_rl_abort_internal ();
        if (for_pager && (c == NEWLINE || c == RETURN))
--- 440,444 ----
        if (c == 'n' || c == 'N' || c == RUBOUT)
  	return (0);
!       if (c == ABORT_CHAR || c < 0)
  	_rl_abort_internal ();
        if (for_pager && (c == NEWLINE || c == RETURN))
*** ../readline-5.2/input.c	Wed Aug 16 15:15:16 2006
--- input.c	Wed May  2 16:07:59 2007
***************
*** 514,518 ****
       int size;
  {
!   int mb_len = 0;
    size_t mbchar_bytes_length;
    wchar_t wc;
--- 522,526 ----
       int size;
  {
!   int mb_len, c;
    size_t mbchar_bytes_length;
    wchar_t wc;
***************
*** 521,531 ****
    memset(&ps, 0, sizeof (mbstate_t));
    memset(&ps_back, 0, sizeof (mbstate_t));
!   
    while (mb_len < size)
      {
        RL_SETSTATE(RL_STATE_MOREINPUT);
!       mbchar[mb_len++] = rl_read_key ();
        RL_UNSETSTATE(RL_STATE_MOREINPUT);
  
        mbchar_bytes_length = mbrtowc (&wc, mbchar, mb_len, &ps);
        if (mbchar_bytes_length == (size_t)(-1))
--- 529,545 ----
    memset(&ps, 0, sizeof (mbstate_t));
    memset(&ps_back, 0, sizeof (mbstate_t));
! 
!   mb_len = 0;  
    while (mb_len < size)
      {
        RL_SETSTATE(RL_STATE_MOREINPUT);
!       c = rl_read_key ();
        RL_UNSETSTATE(RL_STATE_MOREINPUT);
  
+       if (c < 0)
+ 	break;
+ 
+       mbchar[mb_len++] = c;
+ 
        mbchar_bytes_length = mbrtowc (&wc, mbchar, mb_len, &ps);
        if (mbchar_bytes_length == (size_t)(-1))
***************
*** 565,569 ****
    c = first;
    memset (mb, 0, mlen);
!   for (i = 0; i < mlen; i++)
      {
        mb[i] = (char)c;
--- 579,583 ----
    c = first;
    memset (mb, 0, mlen);
!   for (i = 0; c >= 0 && i < mlen; i++)
      {
        mb[i] = (char)c;
*** ../readline-5.2/isearch.c	Mon Dec 26 17:18:53 2005
--- isearch.c	Fri Mar  9 14:30:59 2007
***************
*** 328,333 ****
  
    f = (rl_command_func_t *)NULL;
!  
!  /* Translate the keys we do something with to opcodes. */
    if (c >= 0 && _rl_keymap[c].type == ISFUNC)
      {
--- 328,340 ----
  
    f = (rl_command_func_t *)NULL;
! 
!   if (c < 0)
!     {
!       cxt->sflags |= SF_FAILED;
!       cxt->history_pos = cxt->last_found_line;
!       return -1;
!     }
! 
!   /* Translate the keys we do something with to opcodes. */
    if (c >= 0 && _rl_keymap[c].type == ISFUNC)
      {
*** ../readline-5.2/misc.c	Mon Dec 26 17:20:46 2005
--- misc.c	Fri Mar  9 14:44:11 2007
***************
*** 147,150 ****
--- 147,152 ----
  	  rl_clear_message ();
  	  RL_UNSETSTATE(RL_STATE_NUMERICARG);
+ 	  if (key < 0)
+ 	    return -1;
  	  return (_rl_dispatch (key, _rl_keymap));
  	}
*** ../readline-5.2/readline.c	Wed Aug 16 15:00:36 2006
--- readline.c	Fri Mar  9 14:47:24 2007
***************
*** 646,649 ****
--- 669,677 ----
      {
        nkey = _rl_subseq_getchar (cxt->okey);
+       if (nkey < 0)
+ 	{
+ 	  _rl_abort_internal ();
+ 	  return -1;
+ 	}
        r = _rl_dispatch_subseq (nkey, cxt->dmap, cxt->subseq_arg);
        cxt->flags |= KSEQ_DISPATCHED;
*** ../readline-5.2/text.c	Fri Jul 28 11:55:27 2006
--- text.c	Sun Mar 25 13:41:38 2007
***************
*** 858,861 ****
--- 864,870 ----
    RL_UNSETSTATE(RL_STATE_MOREINPUT);
  
+   if (c < 0)
+     return -1;
+ 
  #if defined (HANDLE_SIGNALS)
    if (RL_ISSTATE (RL_STATE_CALLBACK) == 0)
***************
*** 1521,1524 ****
--- 1530,1536 ----
    mb_len = _rl_read_mbchar (mbchar, MB_LEN_MAX);
  
+   if (mb_len <= 0)
+     return -1;
+ 
    if (count < 0)
      return (_rl_char_search_internal (-count, bdir, mbchar, mb_len));
***************
*** 1537,1540 ****
--- 1549,1555 ----
    RL_UNSETSTATE(RL_STATE_MOREINPUT);
  
+   if (c < 0)
+     return -1;
+ 
    if (count < 0)
      return (_rl_char_search_internal (-count, bdir, c));
*** ../readline-5.2/vi_mode.c	Sat Jul 29 16:42:28 2006
--- vi_mode.c	Fri Mar  9 15:02:11 2007
***************
*** 887,890 ****
--- 887,897 ----
    c = rl_read_key ();
    RL_UNSETSTATE(RL_STATE_MOREINPUT);
+ 
+   if (c < 0)
+     {
+       *nextkey = 0;
+       return -1;
+     }
+ 
    *nextkey = c;
  
***************
*** 903,906 ****
--- 910,918 ----
  	  c = rl_read_key ();	/* real command */
  	  RL_UNSETSTATE(RL_STATE_MOREINPUT);
+ 	  if (c < 0)
+ 	    {
+ 	      *nextkey = 0;
+ 	      return -1;
+ 	    }
  	  *nextkey = c;
  	}
***************
*** 1225,1236 ****
       _rl_callback_generic_arg *data;
  {
  #if defined (HANDLE_MULTIBYTE)
!   _rl_vi_last_search_mblen = _rl_read_mbchar (_rl_vi_last_search_mbchar, MB_LEN_MAX);
  #else
    RL_SETSTATE(RL_STATE_MOREINPUT);
!   _rl_vi_last_search_char = rl_read_key ();
    RL_UNSETSTATE(RL_STATE_MOREINPUT);
  #endif
  
    _rl_callback_func = 0;
    _rl_want_redisplay = 1;
--- 1243,1262 ----
       _rl_callback_generic_arg *data;
  {
+   int c;
  #if defined (HANDLE_MULTIBYTE)
!   c = _rl_vi_last_search_mblen = _rl_read_mbchar (_rl_vi_last_search_mbchar, MB_LEN_MAX);
  #else
    RL_SETSTATE(RL_STATE_MOREINPUT);
!   c = rl_read_key ();
    RL_UNSETSTATE(RL_STATE_MOREINPUT);
  #endif
  
+   if (c <= 0)
+     return -1;
+ 
+ #if !defined (HANDLE_MULTIBYTE)
+   _rl_vi_last_search_char = c;
+ #endif
+ 
    _rl_callback_func = 0;
    _rl_want_redisplay = 1;
***************
*** 1248,1251 ****
--- 1274,1278 ----
       int count, key;
  {
+   int c;
  #if defined (HANDLE_MULTIBYTE)
    static char *target;
***************
*** 1294,1302 ****
  	{
  #if defined (HANDLE_MULTIBYTE)
! 	  _rl_vi_last_search_mblen = _rl_read_mbchar (_rl_vi_last_search_mbchar, MB_LEN_MAX);
  #else
  	  RL_SETSTATE(RL_STATE_MOREINPUT);
! 	  _rl_vi_last_search_char = rl_read_key ();
  	  RL_UNSETSTATE(RL_STATE_MOREINPUT);
  #endif
  	}
--- 1321,1335 ----
  	{
  #if defined (HANDLE_MULTIBYTE)
! 	  c = _rl_read_mbchar (_rl_vi_last_search_mbchar, MB_LEN_MAX);
! 	  if (c <= 0)
! 	    return -1;
! 	  _rl_vi_last_search_mblen = c;
  #else
  	  RL_SETSTATE(RL_STATE_MOREINPUT);
! 	  c = rl_read_key ();
  	  RL_UNSETSTATE(RL_STATE_MOREINPUT);
+ 	  if (c < 0)
+ 	    return -1;
+ 	  _rl_vi_last_search_char = c;
  #endif
  	}
***************
*** 1468,1471 ****
--- 1501,1507 ----
    RL_UNSETSTATE(RL_STATE_MOREINPUT);
  
+   if (c < 0)
+     return -1;
+ 
  #if defined (HANDLE_MULTIBYTE)
    if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
***************
*** 1486,1489 ****
--- 1522,1528 ----
    _rl_vi_last_replacement = c = _rl_vi_callback_getchar (mb, MB_LEN_MAX);
  
+   if (c < 0)
+     return -1;
+ 
    _rl_callback_func = 0;
    _rl_want_redisplay = 1;
***************
*** 1517,1520 ****
--- 1556,1562 ----
      _rl_vi_last_replacement = c = _rl_vi_callback_getchar (mb, MB_LEN_MAX);
  
+   if (c < 0)
+     return -1;
+ 
    return (_rl_vi_change_char (count, c, mb));
  }
***************
*** 1651,1655 ****
    RL_UNSETSTATE(RL_STATE_MOREINPUT);
  
!   if (ch < 'a' || ch > 'z')
      {
        rl_ding ();
--- 1693,1697 ----
    RL_UNSETSTATE(RL_STATE_MOREINPUT);
  
!   if (ch < 0 || ch < 'a' || ch > 'z')	/* make test against 0 explicit */
      {
        rl_ding ();
***************
*** 1703,1707 ****
        return 0;
      }
!   else if (ch < 'a' || ch > 'z')
      {
        rl_ding ();
--- 1745,1749 ----
        return 0;
      }
!   else if (ch < 0 || ch < 'a' || ch > 'z')	/* make test against 0 explicit */
      {
        rl_ding ();

readline-5.2-006.patch:

--- NEW FILE readline-5.2-006.patch ---
			   READLINE PATCH REPORT
			   =====================

Readline-Release: 5.2
Patch-ID: readline52-006

Bug-Reported-by:        Peter Volkov <torre_cremata at mail.ru>
Bug-Reference-ID:       <1178376645.9063.25.camel at localhost>
Bug-Reference-URL:      http://bugs.gentoo.org/177095

Bug-Description:

The readline display code miscalculated the screen position when performing
a redisplay in which the new text occupies more screen space that the old,
but takes fewer bytes to do so (e.g., when replacing a shorter string
containing multibyte characters with a longer one containing only ASCII).

Patch:

*** ../readline-5.2/display.c	Thu Apr 26 11:38:22 2007
--- display.c	Thu Jul 12 23:10:10 2007
***************
*** 1519,1527 ****
        /* Non-zero if we're increasing the number of lines. */
        int gl = current_line >= _rl_vis_botlin && inv_botlin > _rl_vis_botlin;
        /* Sometimes it is cheaper to print the characters rather than
  	 use the terminal's capabilities.  If we're growing the number
  	 of lines, make sure we actually cause the new line to wrap
  	 around on auto-wrapping terminals. */
!       if (_rl_terminal_can_insert && ((2 * col_temp) >= col_lendiff || _rl_term_IC) && (!_rl_term_autowrap || !gl))
  	{
  	  /* If lendiff > prompt_visible_length and _rl_last_c_pos == 0 and
--- 1568,1596 ----
        /* Non-zero if we're increasing the number of lines. */
        int gl = current_line >= _rl_vis_botlin && inv_botlin > _rl_vis_botlin;
+       /* If col_lendiff is > 0, implying that the new string takes up more
+ 	 screen real estate than the old, but lendiff is < 0, meaning that it
+ 	 takes fewer bytes, we need to just output the characters starting
+ 	 from the first difference.  These will overwrite what is on the
+ 	 display, so there's no reason to do a smart update.  This can really
+ 	 only happen in a multibyte environment. */
+       if (lendiff < 0)
+ 	{
+ 	  _rl_output_some_chars (nfd, temp);
+ 	  _rl_last_c_pos += _rl_col_width (nfd, 0, temp);
+ 	  /* If nfd begins before any invisible characters in the prompt,
+ 	     adjust _rl_last_c_pos to account for wrap_offset and set
+ 	     cpos_adjusted to let the caller know. */
+ 	  if (current_line == 0 && wrap_offset && ((nfd - new) <= prompt_last_invisible))
+ 	    {
+ 	      _rl_last_c_pos -= wrap_offset;
+ 	      cpos_adjusted = 1;
+ 	    }
+ 	  return;
+ 	}
        /* Sometimes it is cheaper to print the characters rather than
  	 use the terminal's capabilities.  If we're growing the number
  	 of lines, make sure we actually cause the new line to wrap
  	 around on auto-wrapping terminals. */
!       else if (_rl_terminal_can_insert && ((2 * col_temp) >= col_lendiff || _rl_term_IC) && (!_rl_term_autowrap || !gl))
  	{
  	  /* If lendiff > prompt_visible_length and _rl_last_c_pos == 0 and

readline-5.2-007.patch:

--- NEW FILE readline-5.2-007.patch ---
			   READLINE PATCH REPORT
			   =====================

Readline-Release: 5.2
Patch-ID: readline52-007

Bug-Reported-by:        Tom Bjorkholm <tom.bjorkholm at ericsson.com>
Bug-Reference-ID:       <AEA1A32F001C6B4F98614B5B80D7647D01C075E9 at esealmw115.eemea.ericsson.se>
Bug-Reference-URL:	http://lists.gnu.org/archive/html/bug-readline/2007-04/msg00004.html


Bug-Description:

An off-by-one error in readline's input buffering caused readline to drop
each 511th character of buffered input (e.g., when pasting a large amount
of data into a terminal window).

Patch:

*** ../readline-5.2/input.c	Wed Aug 16 15:15:16 2006
--- input.c	Tue Jul 17 09:24:21 2007
***************
*** 134,139 ****
  
    *key = ibuffer[pop_index++];
! 
    if (pop_index >= ibuffer_len)
      pop_index = 0;
  
--- 134,142 ----
  
    *key = ibuffer[pop_index++];
! #if 0
    if (pop_index >= ibuffer_len)
+ #else
+   if (pop_index > ibuffer_len)
+ #endif
      pop_index = 0;
  
***************
*** 251,255 ****
  	{
  	  k = (*rl_getc_function) (rl_instream);
! 	  rl_stuff_char (k);
  	  if (k == NEWLINE || k == RETURN)
  	    break;
--- 254,259 ----
  	{
  	  k = (*rl_getc_function) (rl_instream);
! 	  if (rl_stuff_char (k) == 0)
! 	    break;			/* some problem; no more room */
  	  if (k == NEWLINE || k == RETURN)
  	    break;
***************
*** 374,378 ****
--- 378,386 ----
      }
    ibuffer[push_index++] = key;
+ #if 0
    if (push_index >= ibuffer_len)
+ #else
+   if (push_index > ibuffer_len)
+ #endif
      push_index = 0;
  

readline-5.2-008.patch:

--- NEW FILE readline-5.2-008.patch ---
			   READLINE PATCH REPORT
			   =====================

Readline-Release: 5.2
Patch-ID: readline52-008

Bug-Reported-by:	dAniel hAhler <ubuntu at thequod.de>
Bug-Reference-ID:	<4702ED8A.5000503 at thequod.de>
Bug-Reference-URL:	https://bugs.launchpad.net/ubuntu/+source/bash/+bug/119938

Bug-Description:

When updating the display after displaying, for instance, a list of possible
completions, readline will place the cursor at the wrong position if the
prompt contains invisible characters and a newline.

Patch:

*** ../readline-5.2-patched/display.c	Mon Aug  6 14:26:29 2007
--- display.c	Wed Oct 10 22:43:58 2007
***************
*** 1049,1053 ****
  	      else
  		tx = nleft;
! 	      if (_rl_last_c_pos > tx)
  		{
  	          _rl_backspace (_rl_last_c_pos - tx);	/* XXX */
--- 1049,1053 ----
  	      else
  		tx = nleft;
! 	      if (tx >= 0 && _rl_last_c_pos > tx)
  		{
  	          _rl_backspace (_rl_last_c_pos - tx);	/* XXX */
***************
*** 1205,1209 ****
  {
    register char *ofd, *ols, *oe, *nfd, *nls, *ne;
!   int temp, lendiff, wsatend, od, nd;
    int current_invis_chars;
    int col_lendiff, col_temp;
--- 1205,1209 ----
  {
    register char *ofd, *ols, *oe, *nfd, *nls, *ne;
!   int temp, lendiff, wsatend, od, nd, o_cpos;
    int current_invis_chars;
    int col_lendiff, col_temp;
***************
*** 1466,1469 ****
--- 1466,1471 ----
      }
  
+   o_cpos = _rl_last_c_pos;
+ 
    /* When this function returns, _rl_last_c_pos is correct, and an absolute
       cursor postion in multibyte mode, but a buffer index when not in a
***************
*** 1475,1479 ****
       invisible characters in the prompt string.  Let's see if setting this when
       we make sure we're at the end of the drawn prompt string works. */
!   if (current_line == 0 && MB_CUR_MAX > 1 && rl_byte_oriented == 0 && _rl_last_c_pos == prompt_physical_chars)
      cpos_adjusted = 1;
  #endif
--- 1477,1483 ----
       invisible characters in the prompt string.  Let's see if setting this when
       we make sure we're at the end of the drawn prompt string works. */
!   if (current_line == 0 && MB_CUR_MAX > 1 && rl_byte_oriented == 0 && 
!       (_rl_last_c_pos > 0 || o_cpos > 0) &&
!       _rl_last_c_pos == prompt_physical_chars)
      cpos_adjusted = 1;
  #endif

readline-5.2-009.patch:

--- NEW FILE readline-5.2-009.patch ---
			   READLINE PATCH REPORT
			   =====================

Readline-Release: 5.2
Patch-ID: readline52-009

Bug-Reported-by:	dAniel hAhler <ubuntu at thequod.de>
Bug-Reference-ID:
Bug-Reference-URL:

Bug-Description:

Under some circumstances, readline will incorrectly display a prompt string
containing invisible characters after the final newline.

Patch:

*** ../readline-5.2-patched/display.c	2007-08-25 13:47:08.000000000 -0400
--- display.c	2007-11-10 17:51:29.000000000 -0500
***************
*** 392,396 ****
        local_prompt = expand_prompt (p, &prompt_visible_length,
  				       &prompt_last_invisible,
! 				       (int *)NULL,
  				       &prompt_physical_chars);
        c = *t; *t = '\0';
--- 420,424 ----
        local_prompt = expand_prompt (p, &prompt_visible_length,
  				       &prompt_last_invisible,
! 				       &prompt_invis_chars_first_line,
  				       &prompt_physical_chars);
        c = *t; *t = '\0';
***************
*** 399,403 ****
        local_prompt_prefix = expand_prompt (prompt, &prompt_prefix_length,
  						   (int *)NULL,
! 						   &prompt_invis_chars_first_line,
  						   (int *)NULL);
        *t = c;
--- 427,431 ----
        local_prompt_prefix = expand_prompt (prompt, &prompt_prefix_length,
  						   (int *)NULL,
! 						   (int *)NULL,
  						   (int *)NULL);
        *t = c;

readline-5.2-010.patch:

--- NEW FILE readline-5.2-010.patch ---
			   READLINE PATCH REPORT
			   =====================

Readline-Release: 5.2
Patch-ID: readline52-010

Bug-Reported-by:	Miroslav Lichvar <mlichvar at redhat.com>
Bug-Reference-ID:	Fri, 02 Nov 2007 14:07:45 +0100
Bug-Reference-URL:	http://lists.gnu.org/archive/html/bug-readline/2007-11/msg00000.html

Bug-Description:

In certain cases when outputting characters at the end of the line,
e.g., when displaying the prompt string, readline positions the cursor
incorrectly if the prompt string contains invisible characters and the
text being drawn begins before the last invisible character in the line.

Patch:

*** ../readline-5.2-patched/display.c	2007-08-25 13:47:08.000000000 -0400
--- display.c	2007-11-10 17:51:29.000000000 -0500
***************
*** 1566,1574 ****
  	  else
  	    {
- 	      /* We have horizontal scrolling and we are not inserting at
- 		 the end.  We have invisible characters in this line.  This
- 		 is a dumb update. */
  	      _rl_output_some_chars (nfd, temp);
  	      _rl_last_c_pos += col_temp;
  	      return;
  	    }
--- 1619,1632 ----
  	  else
  	    {
  	      _rl_output_some_chars (nfd, temp);
  	      _rl_last_c_pos += col_temp;
+ 	      /* If nfd begins before any invisible characters in the prompt,
+ 		 adjust _rl_last_c_pos to account for wrap_offset and set
+ 		 cpos_adjusted to let the caller know. */
+ 	      if (current_line == 0 && wrap_offset && ((nfd - new) <= prompt_last_invisible))
+ 		{
+ 		  _rl_last_c_pos -= wrap_offset;
+ 		  cpos_adjusted = 1;
+ 		}
  	      return;
  	    }

readline-5.2-011.patch:

--- NEW FILE readline-5.2-011.patch ---
			   READLINE PATCH REPORT
			   =====================

Readline-Release: 5.2
Patch-ID: readline52-011

Bug-Reported-by:	Uwe Doering <gemini at geminix.org>
Bug-Reference-ID:	<46F3DD72.2090801 at geminix.org>
Bug-Reference-URL:	http://lists.gnu.org/archive/html/bug-bash/2007-09/msg00102.html

Bug-Description:

There is an off-by-one error in the code that buffers characters received
very quickly in succession, causing characters to be dropped.

Patch:

*** ../readline-5.2-patched/input.c	2007-08-25 13:47:10.000000000 -0400
--- input.c	2007-10-12 22:55:25.000000000 -0400
***************
*** 155,159 ****
        pop_index--;
        if (pop_index < 0)
! 	pop_index = ibuffer_len - 1;
        ibuffer[pop_index] = key;
        return (1);
--- 155,159 ----
        pop_index--;
        if (pop_index < 0)
! 	pop_index = ibuffer_len;
        ibuffer[pop_index] = key;
        return (1);

readline-5.2-redisplay-sigint.patch:

--- NEW FILE readline-5.2-redisplay-sigint.patch ---
GDB PR 544: gdb.cp/annota2.exp and gdb.cp/annota3.exp sometimes FAIL with:
	FAIL: gdb.cp/annota3.exp: annotate-quit (pattern 1)

One can put `sleep (1)' at the end of _RL_OUTPUT_SOME_CHARS and type
	p 1<enter><ctrl-c>
to abort the prompt printing. Before the patch:
	(gdb) p 1
	$1 = 1
	Quit) (gdb) 
	(gdb) _
After the patch:
	[bash]jkratoch at host0.dyn.jankratochvil.net:/home/jkratoch/redhat/sources/readline# ../gdb/gdb -nx -silent(gdb) p 1
	$1 = 1
	(gdb) Quit
	(gdb) _

The readline patch posted upstream:
	http://sourceware.org/ml/gdb-patches/2008-03/msg00317.html

On Fri, 21 Mar 2008 19:37:31 +0100, Chet Ramey wrote:
> I will add something like your block_sigint/release_sigint changes around
> the guts of rl_redisplay.  That's the right thing to do anyway.  It will
> probably not come out as a patch for readline-5.2; you can use your
> current patch (though the names will change to _rl_block_sigint and
> _rl_release_sigint -- fair warning).

Application cannot easily supply its own RL_REDISPLAY_FUNCTION as a custom
function there changes the readline behavior:
	http://sourceware.org/ml/gdb-patches/2008-03/msg00340.html

BLOCK_SIGINT / RELEASE_SIGINT: Make it public and prefix it by `_rl_'.
RL_REDISPLAY: Wrap it by _RL_BLOCK_SIGINT / _RL_RELEASE_SIGINT.

--- readline-5.2-orig/display.c	2008-03-23 20:52:12.000000000 +0100
+++ readline-5.2/display.c	2008-03-23 20:56:58.000000000 +0100
@@ -472,6 +472,10 @@ rl_redisplay ()
   if (!readline_echoing_p)
     return;
 
+  /* Signals are blocked through this function as the global data structures
+     could get corrupted upon modifications from an invoked signal handler. */
+  _rl_block_sigint ();
+
   if (!rl_display_prompt)
     rl_display_prompt = "";
 
@@ -1180,6 +1184,8 @@ rl_redisplay ()
     else
       visible_wrap_offset = wrap_offset;
   }
+
+  _rl_release_sigint ();
 }
 
 /* PWP: update_line() is based on finding the middle difference of each
--- readline-5.2-orig/rltty.c	2005-12-26 23:21:50.000000000 +0100
+++ readline-5.2/rltty.c	2008-03-23 20:57:26.000000000 +0100
@@ -52,8 +52,8 @@ extern int errno;
 rl_vintfunc_t *rl_prep_term_function = rl_prep_terminal;
 rl_voidfunc_t *rl_deprep_term_function = rl_deprep_terminal;
 
-static void block_sigint PARAMS((void));
-static void release_sigint PARAMS((void));
+void _rl_block_sigint PARAMS((void));
+void _rl_release_sigint PARAMS((void));
 
 static void set_winsize PARAMS((int));
 
@@ -74,9 +74,9 @@ static int sigint_oldmask;
 static int sigint_blocked;
 
 /* Cause SIGINT to not be delivered until the corresponding call to
-   release_sigint(). */
-static void
-block_sigint ()
+   _rl_release_sigint(). */
+void
+_rl_block_sigint ()
 {
   if (sigint_blocked)
     return;
@@ -100,8 +100,8 @@ block_sigint ()
 }
 
 /* Allow SIGINT to be delivered. */
-static void
-release_sigint ()
+void
+_rl_release_sigint ()
 {
   if (sigint_blocked == 0)
     return;
@@ -663,7 +663,7 @@ rl_prep_terminal (meta_flag)
     return;
 
   /* Try to keep this function from being INTerrupted. */
-  block_sigint ();
+  _rl_block_sigint ();
 
   tty = fileno (rl_instream);
 
@@ -676,7 +676,7 @@ rl_prep_terminal (meta_flag)
       if (errno == ENOTTY)
 #endif
 	readline_echoing_p = 1;		/* XXX */
-      release_sigint ();
+      _rl_release_sigint ();
       return;
     }
 
@@ -711,7 +711,7 @@ rl_prep_terminal (meta_flag)
 
   if (set_tty_settings (tty, &tio) < 0)
     {
-      release_sigint ();
+      _rl_release_sigint ();
       return;
     }
 
@@ -722,7 +722,7 @@ rl_prep_terminal (meta_flag)
   terminal_prepped = 1;
   RL_SETSTATE(RL_STATE_TERMPREPPED);
 
-  release_sigint ();
+  _rl_release_sigint ();
 }
 
 /* Restore the terminal's normal settings and modes. */
@@ -735,7 +735,7 @@ rl_deprep_terminal ()
     return;
 
   /* Try to keep this function from being interrupted. */
-  block_sigint ();
+  _rl_block_sigint ();
 
   tty = fileno (rl_instream);
 
@@ -746,14 +746,14 @@ rl_deprep_terminal ()
 
   if (set_tty_settings (tty, &otio) < 0)
     {
-      release_sigint ();
+      _rl_release_sigint ();
       return;
     }
 
   terminal_prepped = 0;
   RL_UNSETSTATE(RL_STATE_TERMPREPPED);
 
-  release_sigint ();
+  _rl_release_sigint ();
 }
 #endif /* !NO_TTY_DRIVER */
 
--- readline-5.2-orig/rltty.h	2003-02-01 04:43:11.000000000 +0100
+++ readline-5.2/rltty.h	2008-03-23 20:57:30.000000000 +0100
@@ -79,4 +79,7 @@ typedef struct _rl_tty_chars {
   unsigned char t_status;
 } _RL_TTY_CHARS;
 
+extern void _rl_block_sigint PARAMS((void));
+extern void _rl_release_sigint PARAMS((void));
+
 #endif /* _RLTTY_H_ */

readline-5.2-shlib.patch:

--- NEW FILE readline-5.2-shlib.patch ---
--- readline-5.2/support/shlib-install.shlib	2006-01-03 20:06:27.000000000 +0100
+++ readline-5.2/support/shlib-install	2006-11-13 13:51:02.000000000 +0100
@@ -71,7 +71,7 @@
 case "$host_os" in
 hpux*|darwin*|macosx*|linux*)
 	if [ -z "$uninstall" ]; then
-		chmod 555 ${INSTALLDIR}/${LIBNAME}
+		chmod 755 ${INSTALLDIR}/${LIBNAME}
 	fi ;;
 cygwin*)
 	IMPLIBNAME=`echo ${LIBNAME} \
--- readline-5.2/support/shobj-conf.shlib	2006-04-11 15:15:43.000000000 +0200
+++ readline-5.2/support/shobj-conf	2007-03-15 14:11:36.000000000 +0100
@@ -108,10 +108,11 @@
 linux*-*|gnu*-*|k*bsd*-gnu-*)
 	SHOBJ_CFLAGS=-fPIC
 	SHOBJ_LD='${CC}'
-	SHOBJ_LDFLAGS='-shared -Wl,-soname,$@'
+	SHOBJ_LDFLAGS='$(CFLAGS) -shared -Wl,-soname,$@'
 
-	SHLIB_XLDFLAGS='-Wl,-rpath,$(libdir) -Wl,-soname,`basename $@ $(SHLIB_MINOR)`'
+	SHLIB_XLDFLAGS='-Wl,-soname,`basename $@ $(SHLIB_MINOR)`'
 	SHLIB_LIBVERSION='$(SHLIB_LIBSUFF).$(SHLIB_MAJOR)$(SHLIB_MINOR)'
+	SHLIB_LIBS='-ltinfo'
 	;;
 
 freebsd2* | netbsd*)
--- readline-5.2/shlib/Makefile.in.shlib	2005-08-12 05:56:10.000000000 +0200
+++ readline-5.2/shlib/Makefile.in	2007-11-05 18:59:14.000000000 +0100
@@ -168,7 +168,7 @@ $(SHARED_READLINE):	$(SHARED_OBJ)
 
 $(SHARED_HISTORY):	$(SHARED_HISTOBJ) xmalloc.so
 	$(RM) $@
-	$(SHOBJ_LD) ${SHOBJ_LDFLAGS} ${SHLIB_XLDFLAGS} -o $@ $(SHARED_HISTOBJ) xmalloc.so $(SHLIB_LIBS)
+	$(SHOBJ_LD) ${SHOBJ_LDFLAGS} ${SHLIB_XLDFLAGS} -o $@ $(SHARED_HISTOBJ) xmalloc.so
 
 # Since tilde.c is shared between readline and bash, make sure we compile 
 # it with the right flags when it's built as part of readline


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-readline/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	17 Jan 2009 03:30:40 -0000	1.1
+++ .cvsignore	17 Jan 2009 11:42:16 -0000	1.2
@@ -0,0 +1 @@
+readline-5.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-readline/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	17 Jan 2009 03:30:40 -0000	1.1
+++ sources	17 Jan 2009 11:42:16 -0000	1.2
@@ -0,0 +1 @@
+e39331f32ad14009b9ff49cc10c5e751  readline-5.2.tar.gz



From rjones at fedoraproject.org  Sat Jan 17 11:42:18 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Sat, 17 Jan 2009 11:42:18 +0000 (UTC)
Subject: rpms/mingw32-freetype/EL-5 freetype-2.1.10-enable-ft2-bci.patch,
	NONE, 1.1 freetype-2.2.1-enable-valid.patch, NONE,
	1.1 freetype-2.2.1-memcpy-fix.patch, NONE,
	1.1 freetype-2.3.0-enable-spr.patch, NONE,
	1.1 freetype-multilib.patch, NONE, 1.1 import.log, NONE,
	1.1 mingw32-freetype.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090117114218.2790E7012B@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/mingw32-freetype/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7778/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	freetype-2.1.10-enable-ft2-bci.patch 
	freetype-2.2.1-enable-valid.patch 
	freetype-2.2.1-memcpy-fix.patch 
	freetype-2.3.0-enable-spr.patch freetype-multilib.patch 
	import.log mingw32-freetype.spec 
Log Message:
Initial import.


freetype-2.1.10-enable-ft2-bci.patch:

--- NEW FILE freetype-2.1.10-enable-ft2-bci.patch ---
--- freetype-2.1.10/include/freetype/config/ftoption.h.enable-ft2-bci	2005-10-12 13:50:40.000000000 -0400
+++ freetype-2.1.10/include/freetype/config/ftoption.h	2005-10-12 14:18:50.000000000 -0400
@@ -436,7 +436,7 @@
   /*   Do not #undef this macro here, since the build system might         */
   /*   define it for certain configurations only.                          */
   /*                                                                       */
-/* #define TT_CONFIG_OPTION_BYTECODE_INTERPRETER */
+#define TT_CONFIG_OPTION_BYTECODE_INTERPRETER
 
 
   /*************************************************************************/

freetype-2.2.1-enable-valid.patch:

--- NEW FILE freetype-2.2.1-enable-valid.patch ---
--- freetype-2.2.1/modules.cfg.orig	2006-07-07 21:01:09.000000000 -0400
+++ freetype-2.2.1/modules.cfg	2006-07-07 21:01:54.000000000 -0400
@@ -110,7 +110,7 @@
 AUX_MODULES += cache
 
 # TrueType GX/AAT table validation.  Needs ftgxval.c below.
-# AUX_MODULES += gxvalid
+AUX_MODULES += gxvalid
 
 # Support for streams compressed with gzip (files with suffix .gz).
 #
@@ -124,7 +124,7 @@
 
 # OpenType table validation.  Needs ftotval.c below.
 #
-# AUX_MODULES += otvalid
+AUX_MODULES += otvalid
 
 # Auxiliary PostScript driver component to share common code.
 #

freetype-2.2.1-memcpy-fix.patch:

--- NEW FILE freetype-2.2.1-memcpy-fix.patch ---
--- freetype-2.2.1/src/psaux/psobjs.c~	2006-04-26 16:38:17.000000000 +0200
+++ freetype-2.2.1/src/psaux/psobjs.c	2006-09-10 15:01:13.000000000 +0200
@@ -165,6 +165,11 @@
       return PSaux_Err_Invalid_Argument;
     }
 
+    if ( length < 0 ) {
+      FT_ERROR(( "ps_table_add: invalid length\n" ));
+      return PSaux_Err_Invalid_Argument;
+    }
+
     /* grow the base block if needed */
     if ( table->cursor + length > table->capacity )
     {

freetype-2.3.0-enable-spr.patch:

--- NEW FILE freetype-2.3.0-enable-spr.patch ---
--- freetype-2.3.0/include/freetype/config/ftoption.h.spf	2007-01-18 14:27:34.000000000 -0500
+++ freetype-2.3.0/include/freetype/config/ftoption.h	2007-01-18 14:27:48.000000000 -0500
@@ -92,7 +92,7 @@
   /* This is done to allow FreeType clients to run unmodified, forcing     */
   /* them to display normal gray-level anti-aliased glyphs.                */
   /*                                                                       */
-/* #define FT_CONFIG_OPTION_SUBPIXEL_RENDERING */
+#define FT_CONFIG_OPTION_SUBPIXEL_RENDERING
 
 
   /*************************************************************************/

freetype-multilib.patch:

--- NEW FILE freetype-multilib.patch ---
--- freetype-2.2.1/builds/unix/freetype-config.in.multilib	2006-07-27 18:50:40.000000000 -0400
+++ freetype-2.2.1/builds/unix/freetype-config.in	2006-07-27 18:58:13.000000000 -0400
@@ -9,11 +9,11 @@
 # indicate that you have read the license and understand and accept it
 # fully.
 
-prefix=@prefix@
-exec_prefix=@exec_prefix@
+prefix=`pkg-config --variable prefix freetype2`
+exec_prefix=`pkg-config --variable exec_prefix freetype2`
 exec_prefix_set=no
-includedir=@includedir@
-libdir=@libdir@
+includedir=`pkg-config --variable includedir freetype2`
+libdir=`pkg-config --variable libdir freetype2`
 enable_shared=@build_libtool_libs@
 wl=@wl@
 hardcode_libdir_flag_spec='@hardcode_libdir_flag_spec@'


--- NEW FILE import.log ---
mingw32-freetype-2_3_8-1_fc10:EL-5:mingw32-freetype-2.3.8-1.fc10.src.rpm:1232192240


--- NEW FILE mingw32-freetype.spec ---
%define __strip %{_mingw32_strip}
%define __objdump %{_mingw32_objdump}
%define _use_internal_dependency_generator 0
%define __find_requires %{_mingw32_findrequires}
%define __find_provides %{_mingw32_findprovides}

# Patented bytecode interpreter and patented subpixel rendering
# disabled by default.  Pass '--with bytecode_interpreter' and '--with
# subpixel_rendering' on rpmbuild command-line to enable them.

%define _with_subpixel_rendering 1}
%define _without_subpixel_rendering 0}
%{!?_with_bytecode_interpreter: %{!?_without_bytecode_interpreter: %define _without_bytecode_interpreter --without-bytecode_interpreter}}
%{!?_with_subpixel_rendering: %{!?_without_subpixel_rendering: %define _without_subpixel_rendering --without-subpixel_rendering}}

%define with_xfree86 0

Name:           mingw32-freetype
Version:        2.3.8
Release:        1%{?dist}
Summary:        Free and portable font rendering engine

License:        FTL or GPLv2+
URL:            http://www.freetype.org
Source:         http://download.savannah.gnu.org/releases/freetype/freetype-%{version}.tar.bz2
Source1:        http://download.savannah.gnu.org/releases/freetype/freetype-doc-%{version}.tar.bz2
#Source2:        http://download.savannah.gnu.org/releases/freetype/ft2demos-%{version}.tar.bz2
Group:          Development/Libraries
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

# Patches from native Fedora package.
#Patch5:         ft2demos-2.1.9-mathlib.patch
Patch20:        freetype-2.1.10-enable-ft2-bci.patch
Patch21:        freetype-2.3.0-enable-spr.patch
Patch46:        freetype-2.2.1-enable-valid.patch
Patch88:        freetype-multilib.patch
Patch89:        freetype-2.2.1-memcpy-fix.patch

BuildArch:      noarch

BuildRequires:  mingw32-filesystem >= 25
BuildRequires:  mingw32-gcc
BuildRequires:  mingw32-binutils
BuildRequires:  mingw32-zlib
BuildRequires:  mingw32-dlfcn

Requires:       pkgconfig


%description
MinGW Windows Freetype library.


%prep
%setup -q -n freetype-%{version} -b 1 -a 1

#pushd ft2demos-%{version}
#%patch5 -p1 -b .mathlib
#popd

%if %{?_with_bytecode_interpreter:1}%{!?_with_bytecode_interpreter:0}
%patch20  -p1 -b .enable-ft2-bci
%endif

%if %{?_with_subpixel_rendering:1}%{!?_with_subpixel_rendering:0}
%patch21  -p1 -b .enable-spr
%endif

%patch46  -p1 -b .enable-valid

%patch88 -p1 -b .multilib
%patch89 -p1 -b .memcpy


%build
%{_mingw32_configure} --disable-static
make %{?_smp_mflags}

# The ft2demos Makefile is hacky and doesn't understand
# cross-compilation.  This nearly works, but not quite, so
# disable. it.
#pushd ft2demos-%{version}
#make TOP_DIR=".." PLATFORM=win32
#popd


%install
rm -rf $RPM_BUILD_ROOT

make DESTDIR=$RPM_BUILD_ROOT install


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root)
%doc docs/LICENSE.TXT
%{_mingw32_bindir}/freetype-config
%{_mingw32_bindir}/libfreetype-6.dll
%{_mingw32_includedir}/freetype2
%{_mingw32_includedir}/ft2build.h
%{_mingw32_libdir}/libfreetype.dll.a
%{_mingw32_libdir}/libfreetype.la
%{_mingw32_libdir}/pkgconfig/freetype2.pc
%{_mingw32_datadir}/aclocal/freetype2.m4


%changelog
* Fri Jan 16 2009 Richard W.M. Jones <rjones at redhat.com> - 2.3.8-1
- New upstream version 2.3.8.
- Use the patches from the Fedora native package.
- Disable patented code.
- Don't build the static library.
- Use _smp_mflags.
- BR mingw32-dlfcn (not required, but uses it if installed).
- Add license file to doc section.

* Tue Jan 13 2009 Richard W.M. Jones <rjones at redhat.com> - 2.3.7-6
- Requires pkgconfig.

* Wed Sep 24 2008 Richard W.M. Jones <rjones at redhat.com> - 2.3.7-5
- Rename mingw -> mingw32.

* Mon Sep 22 2008 Daniel P. Berrange <berrange at redhat.com> - 2.3.7-4
- Import patches from rawhide  & add docs

* Sun Sep 21 2008 Richard W.M. Jones <rjones at redhat.com> - 2.3.7-3
- Depends on filesystem >= 25.

* Wed Sep 10 2008 Richard W.M. Jones <rjones at redhat.com> - 2.3.7-2
- Fix source URL.
- Remove static libraries.

* Tue Sep  9 2008 Daniel P. Berrange <berrange at redhat.com> - 2.3.7-1
- Initial RPM release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-freetype/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	17 Jan 2009 03:28:53 -0000	1.1
+++ .cvsignore	17 Jan 2009 11:41:47 -0000	1.2
@@ -0,0 +1,2 @@
+freetype-2.3.8.tar.bz2
+freetype-doc-2.3.8.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-freetype/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	17 Jan 2009 03:28:53 -0000	1.1
+++ sources	17 Jan 2009 11:41:47 -0000	1.2
@@ -0,0 +1,2 @@
+6cf31a08826715a0d16ae366da9c7d3b  freetype-2.3.8.tar.bz2
+de1cc7cf098e11fba5898efdab1bc23d  freetype-doc-2.3.8.tar.bz2



From rjones at fedoraproject.org  Sat Jan 17 11:42:30 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Sat, 17 Jan 2009 11:42:30 +0000 (UTC)
Subject: rpms/mingw32-gettext/F-10 import.log, NONE,
	1.1 mingw32-gettext-0.17-gnulib-optarg-symbols.patch, NONE,
	1.1 mingw32-gettext.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <20090117114230.6DF077012B@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/mingw32-gettext/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7744/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	import.log mingw32-gettext-0.17-gnulib-optarg-symbols.patch 
	mingw32-gettext.spec 
Log Message:
Initial import.



--- NEW FILE import.log ---
mingw32-gettext-0_17-7_fc10:F-10:mingw32-gettext-0.17-7.fc10.src.rpm:1232192232

mingw32-gettext-0.17-gnulib-optarg-symbols.patch:

--- NEW FILE mingw32-gettext-0.17-gnulib-optarg-symbols.patch ---
See https://bugzilla.redhat.com/show_bug.cgi?id=467398#c3

--- ./gettext-tools/woe32dll/gettextlib-exports.c.lfarkas 2008-10-31 11:42:38.000000000 +0100
+++ ./gettext-tools/woe32dll/gettextlib-exports.c 2008-10-31 11:43:29.000000000 +0100
@@ -26,7 +26,7 @@
 VARIABLE(gl_array_list_implementation)
 VARIABLE(gl_linkedhash_list_implementation)
 VARIABLE(program_name)
-VARIABLE(rpl_optarg)
-VARIABLE(rpl_optind)
+/*VARIABLE(rpl_optarg)
+VARIABLE(rpl_optind)*/
 VARIABLE(simple_backup_suffix)
 VARIABLE(styled_ostream_typeinfo)


--- NEW FILE mingw32-gettext.spec ---
%define __strip %{_mingw32_strip}
%define __objdump %{_mingw32_objdump}
%define _use_internal_dependency_generator 0
%define __find_requires %{_mingw32_findrequires}
%define __find_provides %{_mingw32_findprovides}

Name:      mingw32-gettext
Version:   0.17
Release:   7%{?dist}
Summary:   GNU libraries and utilities for producing multi-lingual messages

License:   GPLv2+ and LGPLv2+
Group:     Development/Libraries
URL:       http://www.gnu.org/software/gettext/
Source0:   http://ftp.gnu.org/pub/gnu/gettext/gettext-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Patch0:    mingw32-gettext-0.17-gnulib-optarg-symbols.patch

BuildArch: noarch

BuildRequires: mingw32-filesystem >= 23
BuildRequires: mingw32-runtime >= 3.15.1
BuildRequires: mingw32-gcc
BuildRequires: mingw32-gcc-c++
BuildRequires: mingw32-binutils
BuildRequires: mingw32-iconv
BuildRequires: mingw32-termcap >= 1.3.1-3

# Possible extra BRs.  These are used if available, but
# not required just for building.
#BuildRequires: mingw32-dlfcn
#BuildRequires: mingw32-libxml2
#BuildRequires: mingw32-expat
#BuildRequires: mingw32-glib2


%description
MinGW Windows Gettext library


%prep
%setup -q -n gettext-%{version}

%patch0 -p1


%build
%{_mingw32_configure} \
  --disable-java \
  --disable-native-java \
  --disable-csharp \
  --disable-static \
  --enable-threads=win32 \
  --without-emacs
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT

make DESTDIR=$RPM_BUILD_ROOT install
rm -f $RPM_BUILD_ROOT%{_mingw32_datadir}/locale/locale.alias
rm -f $RPM_BUILD_ROOT%{_mingw32_libdir}/charset.alias
rm -f $RPM_BUILD_ROOT%{_mingw32_datadir}/info/dir

# Remove man pages, these are available in base gettext-devel.
rm -rf $RPM_BUILD_ROOT%{_mingw32_mandir}/man1/
rm -rf $RPM_BUILD_ROOT%{_mingw32_mandir}/man3/


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root)
%doc COPYING
%{_mingw32_bindir}/autopoint
%{_mingw32_bindir}/envsubst.exe
%{_mingw32_bindir}/gettext.exe
%{_mingw32_bindir}/gettext.sh
%{_mingw32_bindir}/gettextize
%{_mingw32_bindir}/libasprintf-0.dll
%{_mingw32_bindir}/libgettextlib-0-17.dll
%{_mingw32_bindir}/libgettextpo-0.dll
%{_mingw32_bindir}/libgettextsrc-0-17.dll
%{_mingw32_bindir}/libintl-8.dll
%{_mingw32_bindir}/msg*.exe
%{_mingw32_bindir}/ngettext.exe
%{_mingw32_bindir}/recode-sr-latin.exe
%{_mingw32_bindir}/xgettext.exe

%{_mingw32_includedir}/autosprintf.h
%{_mingw32_includedir}/gettext-po.h
%{_mingw32_includedir}/libintl.h

%{_mingw32_libdir}/gettext

%{_mingw32_libdir}/libasprintf.dll.a
%{_mingw32_libdir}/libasprintf.la

%{_mingw32_libdir}/libgettextlib.dll.a
%{_mingw32_libdir}/libgettextlib.la

%{_mingw32_libdir}/libgettextpo.dll.a
%{_mingw32_libdir}/libgettextpo.la

%{_mingw32_libdir}/libgettextsrc.dll.a
%{_mingw32_libdir}/libgettextsrc.la

%{_mingw32_libdir}/libintl.dll.a
%{_mingw32_libdir}/libintl.la

%{_mingw32_docdir}/gettext
%{_mingw32_docdir}/libasprintf/autosprintf_all.html

%{_mingw32_datadir}/gettext/

%{_mingw32_datadir}/aclocal/*m4
%{_mingw32_datadir}/info/autosprintf.info
%{_mingw32_datadir}/info/gettext.info

%{_mingw32_datadir}/locale/*/LC_MESSAGES/gettext-tools.mo
%{_mingw32_datadir}/locale/*/LC_MESSAGES/gettext-runtime.mo


%changelog
* Fri Jan 16 2009 Richard W.M. Jones <rjones at redhat.com> - 0.17-7
- Remove the manpages - already available in base Fedora gettext-devel.
- Use _smp_mflags for build.
- Added list of potential BRs.
- Added license file to doc section.

* Fri Oct 31 2008 Richard W.M. Jones <rjones at redhat.com> - 0.17-6
- Add fix for undefined Gnulib symbols (Farkas Levente).
- Rebuild against mingw32-termcap / libtermcap.

* Wed Sep 24 2008 Richard W.M. Jones <rjones at redhat.com> - 0.17-5
- Rename mingw -> mingw32.

* Thu Sep 11 2008 Daniel P. Berrange <berrange at redhat.com> - 0.17-4
- Disable emacs lisp file install

* Thu Sep 10 2008 Richard W.M. Jones <rjones at redhat.com> - 0.17-3
- Remove static libraries.

* Thu Sep  4 2008 Richard W.M. Jones <rjones at redhat.com> - 0.17-2
- Use RPM macros from mingw-filesystem.

* Tue Sep  2 2008 Daniel P. Berrange <berrange at redhat.com> - 0.17-1
- Initial RPM release, largely based on earlier work from several sources.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-gettext/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	17 Jan 2009 03:29:58 -0000	1.1
+++ .cvsignore	17 Jan 2009 11:42:00 -0000	1.2
@@ -0,0 +1 @@
+gettext-0.17.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-gettext/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	17 Jan 2009 03:29:58 -0000	1.1
+++ sources	17 Jan 2009 11:42:00 -0000	1.2
@@ -0,0 +1 @@
+58a2bc6d39c0ba57823034d55d65d606  gettext-0.17.tar.gz



From rjones at fedoraproject.org  Sat Jan 17 11:42:31 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Sat, 17 Jan 2009 11:42:31 +0000 (UTC)
Subject: rpms/mingw32-SDL/F-10 SDL-1.2.10-byteorder.patch, NONE,
	1.1 SDL-1.2.11-dynamic-esd.patch, NONE,
	1.1 SDL-1.2.12-disable_yasm.patch, NONE,
	1.1 SDL-1.2.12-multilib.patch, NONE,
	1.1 SDL-1.2.12-x11dyn64.patch, NONE,
	1.1 SDL-1.2.13-audiodriver.patch, NONE,
	1.1 SDL-1.2.13-dynamic-pulse.patch, NONE,
	1.1 SDL-1.2.13-libdir.patch, NONE,
	1.1 SDL-1.2.13-pulse-rework.patch, NONE, 1.1 import.log, NONE,
	1.1 mingw32-SDL.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090117114231.16AD57012B@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/mingw32-SDL/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8697/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	SDL-1.2.10-byteorder.patch SDL-1.2.11-dynamic-esd.patch 
	SDL-1.2.12-disable_yasm.patch SDL-1.2.12-multilib.patch 
	SDL-1.2.12-x11dyn64.patch SDL-1.2.13-audiodriver.patch 
	SDL-1.2.13-dynamic-pulse.patch SDL-1.2.13-libdir.patch 
	SDL-1.2.13-pulse-rework.patch import.log mingw32-SDL.spec 
Log Message:
Initial import.


SDL-1.2.10-byteorder.patch:

--- NEW FILE SDL-1.2.10-byteorder.patch ---
--- SDL-1.2.10/include/SDL_endian.h.byteorder	2006-05-01 10:02:59.000000000 +0200
+++ SDL-1.2.10/include/SDL_endian.h	2006-05-19 11:53:07.000000000 +0200
@@ -32,6 +32,10 @@
 #define SDL_BIG_ENDIAN	4321
 
 #ifndef SDL_BYTEORDER	/* Not defined in SDL_config.h? */
+#ifdef __linux__
+#include <endian.h>
+#define SDL_BYTEORDER  __BYTE_ORDER
+#else /* __linux __ */
 #if defined(__hppa__) || \
     defined(__m68k__) || defined(mc68000) || defined(_M_M68K) || \
     (defined(__MIPS__) && defined(__MISPEB__)) || \
@@ -41,6 +45,7 @@
 #else
 #define SDL_BYTEORDER	SDL_LIL_ENDIAN
 #endif
+#endif /* __linux __ */
 #endif /* !SDL_BYTEORDER */
 
 

SDL-1.2.11-dynamic-esd.patch:

--- NEW FILE SDL-1.2.11-dynamic-esd.patch ---
--- SDL-1.2.11/configure.in.dynamic-esd	2007-03-19 17:44:47.000000000 +0100
+++ SDL-1.2.11/configure.in	2007-03-19 17:44:47.000000000 +0100
@@ -430,6 +430,16 @@
             AC_ARG_ENABLE(esd-shared,
 AC_HELP_STRING([--enable-esd-shared], [dynamically load ESD audio support [[default=yes]]]),
                           , enable_esd_shared=yes)
+            if test "x`echo $ESD_LIBS | grep -- -L`" = "x"; then
+                pfx=${libdir##*/}
+                if test "x`ls /${pfx}/libesd.so.* 2> /dev/null`" != "x"; then
+                    ESD_LIBS="-L/${pfx} $ESD_LIBS"
+                elif test "x`ls /usr/${pfx}/libesd.so.* 2> /dev/null`" != "x"; then
+                    ESD_LIBS="-L/usr/${pfx} $ESD_LIBS"
+                elif test "x`ls /usr/local/${pfx}/libesd.so.* 2> /dev/null`" != "x"; then
+                    ESD_LIBS="-L/usr/local/${pfx} $ESD_LIBS"
+                fi
+            fi
             esd_lib_spec=`echo $ESD_LIBS | sed 's/.*-L\([[^ ]]*\).*/\1\/libesd.so.*/'`
             esd_lib=`ls -- $esd_lib_spec | sed 's/.*\/\(.*\)/\1/; q'`
             echo "-- $esd_lib_spec -> $esd_lib"

SDL-1.2.12-disable_yasm.patch:

--- NEW FILE SDL-1.2.12-disable_yasm.patch ---
diff -up SDL-1.2.12/configure.in.disable_yasm SDL-1.2.12/configure.in
--- SDL-1.2.12/configure.in.disable_yasm	2007-08-27 18:24:44.000000000 +0200
+++ SDL-1.2.12/configure.in	2007-08-27 18:25:04.000000000 +0200
@@ -715,7 +715,6 @@ AC_HELP_STRING([--enable-nasm], [use nas
             esac
         fi
 
-        AC_PATH_PROG(NASM, yasm)
         echo "%ifidn __OUTPUT_FORMAT__,elf" > unquoted-sections
         echo "section .note.GNU-stack noalloc noexec nowrite progbits" >> unquoted-sections
         echo "%endif" >> unquoted-sections

SDL-1.2.12-multilib.patch:

--- NEW FILE SDL-1.2.12-multilib.patch ---
diff -up SDL-1.2.12/sdl-config.in.multilib SDL-1.2.12/sdl-config.in
--- SDL-1.2.12/sdl-config.in.multilib	2007-07-20 07:52:45.000000000 +0200
+++ SDL-1.2.12/sdl-config.in	2007-11-06 17:07:25.000000000 +0100
@@ -3,7 +3,6 @@
 prefix=@prefix@
 exec_prefix=@exec_prefix@
 exec_prefix_set=no
-libdir=@libdir@
 
 @ENABLE_STATIC_FALSE at usage="\
 @ENABLE_STATIC_FALSE at Usage: sdl-config [--prefix[=DIR]] [--exec-prefix[=DIR]] [--version] [--cflags] [--libs]"
@@ -45,11 +44,11 @@ while test $# -gt 0; do
       echo -I at includedir@/SDL @SDL_CFLAGS@
       ;;
 @ENABLE_SHARED_TRUE@    --libs)
- at ENABLE_SHARED_TRUE@      echo -L at libdir@ @SDL_RLD_FLAGS@ @SDL_LIBS@
+ at ENABLE_SHARED_TRUE@      echo @SDL_RLD_FLAGS@ @SDL_LIBS@
 @ENABLE_SHARED_TRUE@      ;;
 @ENABLE_STATIC_TRUE@@ENABLE_SHARED_TRUE@    --static-libs)
 @ENABLE_STATIC_TRUE@@ENABLE_SHARED_FALSE@    --libs|--static-libs)
- at ENABLE_STATIC_TRUE@      echo -L at libdir@ @SDL_RLD_FLAGS@ @SDL_STATIC_LIBS@
+ at ENABLE_STATIC_TRUE@      echo @SDL_RLD_FLAGS@ @SDL_STATIC_LIBS@
 @ENABLE_STATIC_TRUE@      ;;
     *)
       echo "${usage}" 1>&2

SDL-1.2.12-x11dyn64.patch:

--- NEW FILE SDL-1.2.12-x11dyn64.patch ---
diff -up SDL-1.2.12/configure.in.x11dyn64 SDL-1.2.12/configure.in
--- SDL-1.2.12/configure.in.x11dyn64	2007-08-27 18:18:28.000000000 +0200
+++ SDL-1.2.12/configure.in	2007-08-27 18:20:48.000000000 +0200
@@ -950,7 +950,8 @@ AC_HELP_STRING([--enable-x11-shared], [d
                     ;;
                 *)
                     x11_lib_path=[`echo $X_LIBS | sed 's/.*-L\([^ ]*\).*/\1/'`]
-                    for path in $x11_lib_path /usr/lib /usr/X11/lib /usr/X11R6/lib; do
+		    pfx=${libdir##*/}
+                    for path in $x11_lib_path /usr/${pfx} /usr/lib /usr/X11/lib /usr/X11R6/lib; do
                         if test "x$x11_lib" = "x"; then
                             x11_lib=[`ls -- $path/libX11.so.[0-9] 2>/dev/null | sort -r | sed 's/.*\/\(.*\)/\1/; q'`]
                             if test "x$x11_lib" = "x"; then

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

SDL-1.2.13-dynamic-pulse.patch:

--- NEW FILE SDL-1.2.13-dynamic-pulse.patch ---
diff -up SDL-1.2.13/configure.in.dynamic-pulse SDL-1.2.13/configure.in
--- SDL-1.2.13/configure.in.dynamic-pulse	2008-01-07 12:31:57.000000000 +0100
+++ SDL-1.2.13/configure.in	2008-01-07 12:32:02.000000000 +0100
@@ -500,14 +510,15 @@ AC_HELP_STRING([--enable-pulseaudio], [u
         if test x$audio_pulse = xyes; then
             AC_ARG_ENABLE(pulseaudio-shared,
 AC_HELP_STRING([--enable-pulseaudio-shared], [dynamically load PulseAudio support [[default=yes]]]),
-                          , enable_pulse_shared=yes)
+                          , enable_pulseaudio_shared=yes)
             if test "x`echo $PULSE_LIBS | grep -- -L`" = "x"; then
-                if test "x`ls /lib/libpulse-simple.so.* 2> /dev/null`" != "x"; then
-                    PULSE_LIBS="-L/lib $PULSE_LIBS"
-                elif test "x`ls /usr/lib/libpulse-simple.so.* 2> /dev/null`" != "x"; then
-                    PULSE_LIBS="-L/usr/lib $PULSE_LIBS"
-                elif test "x`ls /usr/local/lib/libpulse-simple.so.* 2> /dev/null`" != "x"; then
-                    PULSE_LIBS="-L/usr/local/lib $PULSE_LIBS"
+	        pfx=${libdir##*/}
+                if test "x`ls /${pfx}/libpulse-simple.so.* 2> /dev/null`" != "x"; then
+                    PULSE_LIBS="-L/${pfx} $PULSE_LIBS"
+                elif test "x`ls /usr/${pfx}/libpulse-simple.so.* 2> /dev/null`" != "x"; then
+                    PULSE_LIBS="-L/usr/${pfx} $PULSE_LIBS"
+                elif test "x`ls /usr/local/${pfx}/libpulse-simple.so.* 2> /dev/null`" != "x"; then
+                    PULSE_LIBS="-L/usr/local/${pfx} $PULSE_LIBS"
                 fi
             fi
             pulse_lib_spec=`echo $PULSE_LIBS | sed 's/.*-L\([[^ ]]*\).*/\1\/libpulse-simple.so.*/'`
@@ -518,11 +529,11 @@ AC_HELP_STRING([--enable-pulseaudio-shar
             SOURCES="$SOURCES $srcdir/src/audio/pulse/*.c"
             EXTRA_CFLAGS="$EXTRA_CFLAGS $PULSE_CFLAGS"
             if test x$have_loadso != xyes && \
-               test x$enable_pulse_shared = xyes; then
+               test x$enable_pulseaudio_shared = xyes; then
                 AC_MSG_WARN([You must have SDL_LoadObject() support for dynamic PulseAudio loading])
             fi
             if test x$have_loadso = xyes && \
-               test x$enable_pulse_shared = xyes && test x$pulse_lib != x; then
+               test x$enable_pulseaudio_shared = xyes && test x$pulse_lib != x; then
                 AC_DEFINE_UNQUOTED(SDL_AUDIO_DRIVER_PULSE_DYNAMIC, "$pulse_lib")
             else
                 EXTRA_LDFLAGS="$EXTRA_LDFLAGS $PULSE_LIBS"

SDL-1.2.13-libdir.patch:

--- NEW FILE SDL-1.2.13-libdir.patch ---
diff -up SDL-1.2.13/configure.in.libdir SDL-1.2.13/configure.in
--- SDL-1.2.13/configure.in.libdir	2007-12-31 05:48:39.000000000 +0100
+++ SDL-1.2.13/configure.in	2008-01-07 11:56:10.000000000 +0100
@@ -348,12 +348,13 @@ AC_HELP_STRING([--enable-alsa], [support
 AC_HELP_STRING([--enable-alsa-shared], [dynamically load ALSA audio support [[default=yes]]]),
                           , enable_alsa_shared=yes)
             if test "x`echo $ALSA_LIBS | grep -- -L`" = "x"; then
-                if test "x`ls /lib/libasound.so.* 2> /dev/null`" != "x"; then
-                    ALSA_LIBS="-L/lib $ALSA_LIBS"
-                elif test "x`ls /usr/lib/libasound.so.* 2> /dev/null`" != "x"; then
-                    ALSA_LIBS="-L/usr/lib $ALSA_LIBS"
-                elif test "x`ls /usr/local/lib/libasound.so.* 2> /dev/null`" != "x"; then
-                    ALSA_LIBS="-L/usr/local/lib $ALSA_LIBS"
+	        pfx=${libdir##*/}
+                if test "x`ls /${pfx}/libasound.so.* 2> /dev/null`" != "x"; then
+                    ALSA_LIBS="-L/${pfx} $ALSA_LIBS"
+                elif test "x`ls /usr/${pfx}/libasound.so.* 2> /dev/null`" != "x"; then
+                    ALSA_LIBS="-L/usr/${pfx} $ALSA_LIBS"
+                elif test "x`ls /usr/local/${pfx}/libasound.so.* 2> /dev/null`" != "x"; then
+                    ALSA_LIBS="-L/usr/local/${pfx} $ALSA_LIBS"
                 fi
             fi
             alsa_lib_spec=`echo $ALSA_LIBS | sed 's/.*-L\([[^ ]]*\).*/\1\/libasound.so.*/'`
@@ -561,7 +572,8 @@ AC_HELP_STRING([--enable-arts], [support
                 AC_ARG_ENABLE(arts-shared,
 AC_HELP_STRING([--enable-arts-shared], [dynamically load aRts audio support [[default=yes]]]),
                               , enable_arts_shared=yes)
-                arts_lib_spec="$ARTS_PREFIX/lib/libartsc.so.*"
+                pfx=${libdir##*/}
+                arts_lib_spec="$ARTS_PREFIX/${pfx}/libartsc.so.*"
                 arts_lib=`ls -- $arts_lib_spec | sed 's/.*\/\(.*\)/\1/; q'`
                 echo "-- $arts_lib_spec -> $arts_lib"
 
diff -up SDL-1.2.13/configure.libdir SDL-1.2.13/configure
--- SDL-1.2.13/configure.libdir	2007-12-31 06:09:39.000000000 +0100
+++ SDL-1.2.13/configure	2008-01-07 12:01:32.000000000 +0100
@@ -24888,12 +24888,13 @@ else
 fi
 
             if test "x`echo $ALSA_LIBS | grep -- -L`" = "x"; then
-                if test "x`ls /lib/libasound.so.* 2> /dev/null`" != "x"; then
-                    ALSA_LIBS="-L/lib $ALSA_LIBS"
-                elif test "x`ls /usr/lib/libasound.so.* 2> /dev/null`" != "x"; then
-                    ALSA_LIBS="-L/usr/lib $ALSA_LIBS"
-                elif test "x`ls /usr/local/lib/libasound.so.* 2> /dev/null`" != "x"; then
-                    ALSA_LIBS="-L/usr/local/lib $ALSA_LIBS"
+	        pfx=${libdir##*/}
+                if test "x`ls /${pfx}/libasound.so.* 2> /dev/null`" != "x"; then
+                    ALSA_LIBS="-L/${pfx} $ALSA_LIBS"
+                elif test "x`ls /usr/${pfx}/libasound.so.* 2> /dev/null`" != "x"; then
+                    ALSA_LIBS="-L/usr/${pfx} $ALSA_LIBS"
+                elif test "x`ls /usr/local/${pfx}/libasound.so.* 2> /dev/null`" != "x"; then
+                    ALSA_LIBS="-L/usr/local/${pfx} $ALSA_LIBS"
                 fi
             fi
             alsa_lib_spec=`echo $ALSA_LIBS | sed 's/.*-L\([^ ]*\).*/\1\/libasound.so.*/'`
@@ -25643,7 +25634,8 @@ else
   enable_arts_shared=yes
 fi
 
-                arts_lib_spec="$ARTS_PREFIX/lib/libartsc.so.*"
+		pfx=${libdir##*/}
+                arts_lib_spec="$ARTS_PREFIX/${pfx}/libartsc.so.*"
                 arts_lib=`ls -- $arts_lib_spec | sed 's/.*\/\(.*\)/\1/; q'`
                 echo "-- $arts_lib_spec -> $arts_lib"
 

SDL-1.2.13-pulse-rework.patch:

--- NEW FILE SDL-1.2.13-pulse-rework.patch ---
--- SDL-1.2.13/src/audio/pulse/SDL_pulseaudio.c	2007-12-31 05:47:58.000000000 +0100
+++ SDL-1.2.13.lennart/src/audio/pulse/SDL_pulseaudio.c	2008-03-31 16:09:05.000000000 +0200
@@ -1,3 +1,4 @@
+/* -*- Mode: C; c-basic-offset: 8; indent-tabs-mode: t -*- */
 /*
     SDL - Simple DirectMedia Layer
     Copyright (C) 1997-2007 Sam Lantinga
@@ -18,7 +19,7 @@
 
     St??phan Kochen
     stephan at kochen.nl
-    
+
     Based on parts of the ALSA and ESounD output drivers.
 */
 #include "SDL_config.h"
@@ -78,14 +79,14 @@ static int (*SDL_NAME(pa_simple_write))(
 	pa_simple *s,
 	const void *data,
 	size_t length,
-	int *error 
+	int *error
 );
 static pa_channel_map* (*SDL_NAME(pa_channel_map_init_auto))(
 	pa_channel_map *m,
 	unsigned channels,
 	pa_channel_map_def_t def
 );
-	
+
 
 static struct {
 	const char *name;
@@ -158,16 +159,16 @@ static int Audio_Available(void)
 	if ( LoadPulseLibrary() < 0 ) {
 		return available;
 	}
-	
+
 	/* Connect with a dummy format. */
 	paspec.format = PA_SAMPLE_U8;
 	paspec.rate = 11025;
 	paspec.channels = 1;
 	connection = SDL_NAME(pa_simple_new)(
-		SDL_getenv("PASERVER"),      /* server */
+		NULL,                        /* server */
 		"Test stream",               /* application name */
 		PA_STREAM_PLAYBACK,          /* playback mode */
-		SDL_getenv("PADEVICE"),      /* device on the server */
+		NULL,                        /* device on the server */
 		"Simple DirectMedia Layer",  /* stream description */
 		&paspec,                     /* sample format spec */
 		NULL,                        /* channel map */
@@ -178,7 +179,7 @@ static int Audio_Available(void)
 		available = 1;
 		SDL_NAME(pa_simple_free)(connection);
 	}
-	
+
 	UnloadPulseLibrary();
 	return(available);
 }
@@ -233,7 +234,7 @@ static void PULSE_WaitAudio(_THIS)
 {
 	/* Check to see if the thread-parent process is still alive */
 	{ static int cnt = 0;
-		/* Note that this only works with thread implementations 
+		/* Note that this only works with thread implementations
 		   that use a different process id for each thread.
 		*/
 		if (parent && (((++cnt)%10) == 0)) { /* Check every 10 loops */
@@ -302,7 +303,7 @@ static int PULSE_OpenAudio(_THIS, SDL_Au
 	pa_sample_spec  paspec;
 	pa_buffer_attr  paattr;
 	pa_channel_map  pacmap;
-	
+
 	paspec.format = PA_SAMPLE_INVALID;
 	for ( test_format = SDL_FirstAudioFormat(spec->format); test_format; ) {
 		switch ( test_format ) {
@@ -324,7 +325,7 @@ static int PULSE_OpenAudio(_THIS, SDL_Au
 		return(-1);
 	}
 	spec->format = test_format;
-	
+
 	paspec.channels = spec->channels;
 	paspec.rate = spec->freq;
 
@@ -338,25 +339,24 @@ static int PULSE_OpenAudio(_THIS, SDL_Au
 		return(-1);
 	}
 	SDL_memset(mixbuf, spec->silence, spec->size);
-	
+
 	/* Reduced prebuffering compared to the defaults. */
-	paattr.tlength = mixlen;
+	paattr.tlength = mixlen*2;
 	paattr.minreq = mixlen;
-	paattr.fragsize = mixlen;
-	paattr.prebuf = mixlen;
-	paattr.maxlength = mixlen * 4;
-	
+	paattr.prebuf = mixlen*2;
+	paattr.maxlength = mixlen*2;
+
 	/* The SDL ALSA output hints us that we use Windows' channel mapping */
 	/* http://bugzilla.libsdl.org/show_bug.cgi?id=110 */
 	SDL_NAME(pa_channel_map_init_auto)(
 		&pacmap, spec->channels, PA_CHANNEL_MAP_WAVEEX);
-	
+
 	/* Connect to the PulseAudio server */
 	stream = SDL_NAME(pa_simple_new)(
-		SDL_getenv("PASERVER"),      /* server */
+		NULL,                        /* server */
 		get_progname(),              /* application name */
 		PA_STREAM_PLAYBACK,          /* playback mode */
-		SDL_getenv("PADEVICE"),      /* device on the server */
+		NULL,                        /* device on the server */
 		"Simple DirectMedia Layer",  /* stream description */
 		&paspec,                     /* sample format spec */
 		&pacmap,                     /* channel map */
@@ -371,7 +371,6 @@ static int PULSE_OpenAudio(_THIS, SDL_Au
 
 	/* Get the parent process id (we're the parent of the audio thread) */
 	parent = getpid();
-	
+
 	return(0);
 }
-


--- NEW FILE import.log ---
mingw32-SDL-1_2_13-4_fc10:F-10:mingw32-SDL-1.2.13-4.fc10.src.rpm:1232192285


--- NEW FILE mingw32-SDL.spec ---
%define __strip %{_mingw32_strip}
%define __objdump %{_mingw32_objdump}
%define _use_internal_dependency_generator 0
%define __find_requires %{_mingw32_findrequires}
%define __find_provides %{_mingw32_findprovides}

Name:           mingw32-SDL
Version:        1.2.13
Release:        4%{?dist}
Summary:        MinGW Windows port of SDL cross-platform multimedia library

License:        LGPLv2+
Group:          Development/Libraries
URL:            http://www.libsdl.org/
Source0:        http://www.libsdl.org/release/SDL-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch

# Patches from native version.
Patch0:         SDL-1.2.10-byteorder.patch
Patch17:        SDL-1.2.13-libdir.patch
Patch21:        SDL-1.2.12-multilib.patch
Patch23:        SDL-1.2.11-dynamic-esd.patch
Patch24:        SDL-1.2.12-x11dyn64.patch
Patch25:        SDL-1.2.12-disable_yasm.patch
Patch26:        SDL-1.2.13-dynamic-pulse.patch
Patch27:        SDL-1.2.13-pulse-rework.patch
Patch28:        SDL-1.2.13-audiodriver.patch

BuildRequires:  mingw32-filesystem >= 40
BuildRequires:  mingw32-gcc
BuildRequires:  mingw32-binutils
BuildRequires:  mingw32-dlfcn
BuildRequires:  mingw32-iconv

Requires:       pkgconfig

# Not required at the moment, but SDL does contain plenty of C++ code,
# I just haven't worked out how to enable it.
#BuildRequires:  mingw32-gcc-c++

# If we have nasm in the future, then this would enable future
# optimizations on x86-based architectures.
#%ifarch %{ix86}
#BuildRequires: nasm
#%endif


%description
Simple DirectMedia Layer (SDL) is a cross-platform multimedia library
designed to provide fast access to the graphics frame buffer and audio
device.


%prep
%setup -q -n SDL-%{version}
%patch0 -p1 -b .byteorder
%patch17 -p1 -b .libdir
%patch21 -p1 -b .multilib
%patch23 -p1 -b .dynamic-esd
%patch24 -p1 -b .x11dyn64
%patch25 -p1 -b .disable_yasm
%patch26 -p1 -b .dynamic-pulse
%patch27 -p1 -b .pulse-rework
%patch28 -p1 -b .audiodriver


%build
%{_mingw32_configure} \
  --disable-video-svga --disable-video-ggi --disable-video-aalib \
  --disable-debug \
  --enable-sdl-dlopen \
  --enable-dlopen \
  --enable-arts-shared \
  --enable-esd-shared \
  --enable-pulseaudio-shared \
  --enable-alsa \
  --disable-rpath

make


%install
rm -rf $RPM_BUILD_ROOT
make DESTDIR=$RPM_BUILD_ROOT install

# Remove static libraries but DON'T remove *.dll.a files.
rm $RPM_BUILD_ROOT%{_mingw32_libdir}/libSDL.a

# Actually libSDLmain.a seems to be required.  It just contains
# a single object file called SDL_win32_main.o.
#rm $RPM_BUILD_ROOT%{_mingw32_libdir}/libSDLmain.a

# Delete man pages since they duplicate what is already available
# in base Fedora package.
rm $RPM_BUILD_ROOT%{_mingw32_mandir}/man3/*.3*


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root)
%doc COPYING
%{_mingw32_bindir}/SDL.dll
%{_mingw32_bindir}/sdl-config
%{_mingw32_libdir}/libSDL.dll.a
%{_mingw32_libdir}/libSDL.la
%{_mingw32_libdir}/libSDLmain.a
%{_mingw32_libdir}/pkgconfig/sdl.pc
%{_mingw32_datadir}/aclocal/sdl.m4
%{_mingw32_includedir}/SDL


%changelog
* Tue Jan 13 2009 Richard W.M. Jones <rjones at redhat.com> - 1.2.13-4
- Verify we are still up to date with Fedora release.
- Include COPYING in documentation.
- Build with dlfcn.
- List all BRs.
- No need to package the man pages, don't duplicate what's in the
  base Fedora package already.
- Requires pkgconfig.

* Fri Oct 24 2008 Richard W.M. Jones <rjones at redhat.com> - 1.2.13-2
- Initial RPM release.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-SDL/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	17 Jan 2009 03:20:10 -0000	1.1
+++ .cvsignore	17 Jan 2009 11:42:30 -0000	1.2
@@ -0,0 +1 @@
+SDL-1.2.13.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-SDL/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	17 Jan 2009 03:20:10 -0000	1.1
+++ sources	17 Jan 2009 11:42:30 -0000	1.2
@@ -0,0 +1 @@
+c6660feea2a6834de10bc71b2f8e4d88  SDL-1.2.13.tar.gz



From rjones at fedoraproject.org  Sat Jan 17 11:42:23 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Sat, 17 Jan 2009 11:42:23 +0000 (UTC)
Subject: rpms/mingw32-dlfcn/F-10 dlfcn_configure.patch, NONE, 1.1 import.log,
	NONE, 1.1 mingw32-dlfcn.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090117114223.2C2B97012B@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/mingw32-dlfcn/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7649/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	dlfcn_configure.patch import.log mingw32-dlfcn.spec 
Log Message:
Initial import.


dlfcn_configure.patch:

--- NEW FILE dlfcn_configure.patch ---
diff -ruNp dlfcn-win32-r11/config.mak dlfcn-win32-r11.new/config.mak
--- dlfcn-win32-r11/config.mak	1969-12-31 21:00:00.000000000 -0300
+++ dlfcn-win32-r11.new/config.mak	2009-01-02 12:08:15.000000000 -0200
@@ -0,0 +1,9 @@
+# Automatically generated by configure
+PREFIX=/usr/i686-pc-mingw32/sys-root/mingw
+libdir=/usr/i686-pc-mingw32/sys-root/mingw/lib
+incdir=/usr/i686-pc-mingw32/sys-root/mingw/include
+CC=i686-pc-mingw32-gcc
+BUILD_SHARED=yes
+BUILD_STATIC=yes
+BUILD_MSVC=no
+DO_STRIP=yes
diff -ruNp dlfcn-win32-r11/configure dlfcn-win32-r11.new/configure
--- dlfcn-win32-r11/configure	2009-01-02 11:54:38.000000000 -0200
+++ dlfcn-win32-r11.new/configure	2009-01-02 12:35:30.000000000 -0200
@@ -97,6 +97,45 @@ for opt do
     --make=*)
         make="$optval"
     ;;
+    --enable-shared=*)
+        shared="$optval"
+    ;;
+    --enable-static=*)
+        static="$optval"
+    ;;
+    --enable-strip=*)
+       strip="$optval"
+    ;;
+    --cache-file=*)
+    ;;
+    --host=*)
+    ;;
+    --build=*)
+    ;;
+    --target=*)
+    ;;
+    --exec-prefix=*)
+    ;;
+    --bindir=*)
+    ;;
+    --sbindir=*)
+    ;;
+    --sysconfdir=*)
+    ;;
+    --datadir=*)
+    ;;
+    --includedir=*)
+    ;;
+    --libexecdir=*)
+    ;;
+    --localstatedir=*)
+    ;;
+    --sharedstatedir=*)
+    ;;
+    --mandir=*)
+    ;;
+    --infodir=*)
+    ;;
     --enable-?*|--disable-?*)
         eval `echo "$opt" | sed 's/--/action=/;s/-/ option=/;s/-/_/g'`
         echo "$CMDLINE_SELECT" | grep -q "^ *$option\$" || die_unknown $opt


--- NEW FILE import.log ---
mingw32-dlfcn-0-0_3_r11_fc10:F-10:mingw32-dlfcn-0-0.3.r11.fc10.src.rpm:1232192225


--- NEW FILE mingw32-dlfcn.spec ---
%define __strip %{_mingw32_strip}
%define __objdump %{_mingw32_objdump}
%define _use_internal_dependency_generator 0
%define __find_requires %{_mingw32_findrequires}
%define __find_provides %{_mingw32_findprovides}

%define realname dlfcn-win32

%define alphatag r11

Name:          mingw32-dlfcn
Version:       0
Release:       0.3.%{alphatag}%{?dist}
Summary:       Implements a wrapper for dlfcn (dlopen dlclose dlsym dlerror)

License:       LGPLv2+
Group:         Development/Libraries
URL:           http://code.google.com/p/dlfcn-win32/
Source0:       http://dlfcn-win32.googlecode.com/files/%{realname}-%{alphatag}.tar.bz2
BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:     noarch

BuildRequires: mingw32-filesystem >= 40
BuildRequires: mingw32-gcc
BuildRequires: mingw32-binutils
#BuildRequires: dos2unix

Patch1:        dlfcn_configure.patch


%description
This library implements a wrapper for dlfcn, as specified in POSIX and SUS,
around the dynamic link library functions found in the Windows API.


%prep
%setup -q -n %{realname}-%{alphatag}

%{__sed} -i 's/\r//' configure
%{__sed} -i 's/\r//' README
%{__sed} -i 's/\r//' COPYING

%patch1 -p1


%build
%{_mingw32_configure} \
  --incdir=%{_mingw32_includedir} \
  --cc=i686-pc-mingw32-gcc \
  --enable-shared=yes \
  --enable-static=no \
  --enable-strip=i686-pc-mingw32-strip
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make DESTDIR=$RPM_BUILD_ROOT install


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root)
%doc README COPYING
%{_mingw32_bindir}/libdl.dll
%{_mingw32_libdir}/libdl.dll.a
%{_mingw32_includedir}/dlfcn.h


%changelog
* Wed Jan 14 2009 Richard W.M. Jones <rjones at redhat.com> - 0-0.3.r11
- Use Version 0
  (https://www.redhat.com/archives/fedora-packaging/2009-January/msg00064.html)
- Revert use of dos2unix for now
  (https://www.redhat.com/archives/fedora-packaging/2009-January/msg00066.html)
- Use _smp_mflags.

* Tue Jan 13 2009 Richard W.M. Jones <rjones at redhat.com> - 0.1-0.2.r11
- Import into fedora-mingw temporary repository because there are packages
  which will depend on this.
- Fix the version/release according to packaging guidelines.
- Tidy up the spec file.
- Use dos2unix and keep the timestamps.

* Fri Jan 02 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - r11-1
- Initial RPM release. 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-dlfcn/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	17 Jan 2009 03:22:33 -0000	1.1
+++ .cvsignore	17 Jan 2009 11:41:52 -0000	1.2
@@ -0,0 +1 @@
+dlfcn-win32-r11.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-dlfcn/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	17 Jan 2009 03:22:33 -0000	1.1
+++ sources	17 Jan 2009 11:41:52 -0000	1.2
@@ -0,0 +1 @@
+728d2c79edaf09ee3c309860499502eb  dlfcn-win32-r11.tar.bz2



From rjones at fedoraproject.org  Sat Jan 17 11:42:26 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Sat, 17 Jan 2009 11:42:26 +0000 (UTC)
Subject: rpms/mingw32-dlfcn/EL-5 dlfcn_configure.patch, NONE, 1.1 import.log,
	NONE, 1.1 mingw32-dlfcn.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090117114226.0E85C7012B@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/mingw32-dlfcn/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7575/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	dlfcn_configure.patch import.log mingw32-dlfcn.spec 
Log Message:
Initial import.


dlfcn_configure.patch:

--- NEW FILE dlfcn_configure.patch ---
diff -ruNp dlfcn-win32-r11/config.mak dlfcn-win32-r11.new/config.mak
--- dlfcn-win32-r11/config.mak	1969-12-31 21:00:00.000000000 -0300
+++ dlfcn-win32-r11.new/config.mak	2009-01-02 12:08:15.000000000 -0200
@@ -0,0 +1,9 @@
+# Automatically generated by configure
+PREFIX=/usr/i686-pc-mingw32/sys-root/mingw
+libdir=/usr/i686-pc-mingw32/sys-root/mingw/lib
+incdir=/usr/i686-pc-mingw32/sys-root/mingw/include
+CC=i686-pc-mingw32-gcc
+BUILD_SHARED=yes
+BUILD_STATIC=yes
+BUILD_MSVC=no
+DO_STRIP=yes
diff -ruNp dlfcn-win32-r11/configure dlfcn-win32-r11.new/configure
--- dlfcn-win32-r11/configure	2009-01-02 11:54:38.000000000 -0200
+++ dlfcn-win32-r11.new/configure	2009-01-02 12:35:30.000000000 -0200
@@ -97,6 +97,45 @@ for opt do
     --make=*)
         make="$optval"
     ;;
+    --enable-shared=*)
+        shared="$optval"
+    ;;
+    --enable-static=*)
+        static="$optval"
+    ;;
+    --enable-strip=*)
+       strip="$optval"
+    ;;
+    --cache-file=*)
+    ;;
+    --host=*)
+    ;;
+    --build=*)
+    ;;
+    --target=*)
+    ;;
+    --exec-prefix=*)
+    ;;
+    --bindir=*)
+    ;;
+    --sbindir=*)
+    ;;
+    --sysconfdir=*)
+    ;;
+    --datadir=*)
+    ;;
+    --includedir=*)
+    ;;
+    --libexecdir=*)
+    ;;
+    --localstatedir=*)
+    ;;
+    --sharedstatedir=*)
+    ;;
+    --mandir=*)
+    ;;
+    --infodir=*)
+    ;;
     --enable-?*|--disable-?*)
         eval `echo "$opt" | sed 's/--/action=/;s/-/ option=/;s/-/_/g'`
         echo "$CMDLINE_SELECT" | grep -q "^ *$option\$" || die_unknown $opt


--- NEW FILE import.log ---
mingw32-dlfcn-0-0_3_r11_fc10:EL-5:mingw32-dlfcn-0-0.3.r11.fc10.src.rpm:1232192225


--- NEW FILE mingw32-dlfcn.spec ---
%define __strip %{_mingw32_strip}
%define __objdump %{_mingw32_objdump}
%define _use_internal_dependency_generator 0
%define __find_requires %{_mingw32_findrequires}
%define __find_provides %{_mingw32_findprovides}

%define realname dlfcn-win32

%define alphatag r11

Name:          mingw32-dlfcn
Version:       0
Release:       0.3.%{alphatag}%{?dist}
Summary:       Implements a wrapper for dlfcn (dlopen dlclose dlsym dlerror)

License:       LGPLv2+
Group:         Development/Libraries
URL:           http://code.google.com/p/dlfcn-win32/
Source0:       http://dlfcn-win32.googlecode.com/files/%{realname}-%{alphatag}.tar.bz2
BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:     noarch

BuildRequires: mingw32-filesystem >= 40
BuildRequires: mingw32-gcc
BuildRequires: mingw32-binutils
#BuildRequires: dos2unix

Patch1:        dlfcn_configure.patch


%description
This library implements a wrapper for dlfcn, as specified in POSIX and SUS,
around the dynamic link library functions found in the Windows API.


%prep
%setup -q -n %{realname}-%{alphatag}

%{__sed} -i 's/\r//' configure
%{__sed} -i 's/\r//' README
%{__sed} -i 's/\r//' COPYING

%patch1 -p1


%build
%{_mingw32_configure} \
  --incdir=%{_mingw32_includedir} \
  --cc=i686-pc-mingw32-gcc \
  --enable-shared=yes \
  --enable-static=no \
  --enable-strip=i686-pc-mingw32-strip
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make DESTDIR=$RPM_BUILD_ROOT install


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root)
%doc README COPYING
%{_mingw32_bindir}/libdl.dll
%{_mingw32_libdir}/libdl.dll.a
%{_mingw32_includedir}/dlfcn.h


%changelog
* Wed Jan 14 2009 Richard W.M. Jones <rjones at redhat.com> - 0-0.3.r11
- Use Version 0
  (https://www.redhat.com/archives/fedora-packaging/2009-January/msg00064.html)
- Revert use of dos2unix for now
  (https://www.redhat.com/archives/fedora-packaging/2009-January/msg00066.html)
- Use _smp_mflags.

* Tue Jan 13 2009 Richard W.M. Jones <rjones at redhat.com> - 0.1-0.2.r11
- Import into fedora-mingw temporary repository because there are packages
  which will depend on this.
- Fix the version/release according to packaging guidelines.
- Tidy up the spec file.
- Use dos2unix and keep the timestamps.

* Fri Jan 02 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - r11-1
- Initial RPM release. 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-dlfcn/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	17 Jan 2009 03:22:33 -0000	1.1
+++ .cvsignore	17 Jan 2009 11:41:55 -0000	1.2
@@ -0,0 +1 @@
+dlfcn-win32-r11.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-dlfcn/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	17 Jan 2009 03:22:33 -0000	1.1
+++ sources	17 Jan 2009 11:41:55 -0000	1.2
@@ -0,0 +1 @@
+728d2c79edaf09ee3c309860499502eb  dlfcn-win32-r11.tar.bz2



From rjones at fedoraproject.org  Sat Jan 17 11:42:34 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Sat, 17 Jan 2009 11:42:34 +0000 (UTC)
Subject: rpms/mingw32-SDL/EL-5 SDL-1.2.10-byteorder.patch, NONE,
	1.1 SDL-1.2.11-dynamic-esd.patch, NONE,
	1.1 SDL-1.2.12-disable_yasm.patch, NONE,
	1.1 SDL-1.2.12-multilib.patch, NONE,
	1.1 SDL-1.2.12-x11dyn64.patch, NONE,
	1.1 SDL-1.2.13-audiodriver.patch, NONE,
	1.1 SDL-1.2.13-dynamic-pulse.patch, NONE,
	1.1 SDL-1.2.13-libdir.patch, NONE,
	1.1 SDL-1.2.13-pulse-rework.patch, NONE, 1.1 import.log, NONE,
	1.1 mingw32-SDL.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090117114234.D3ABB7012B@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/mingw32-SDL/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8722/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	SDL-1.2.10-byteorder.patch SDL-1.2.11-dynamic-esd.patch 
	SDL-1.2.12-disable_yasm.patch SDL-1.2.12-multilib.patch 
	SDL-1.2.12-x11dyn64.patch SDL-1.2.13-audiodriver.patch 
	SDL-1.2.13-dynamic-pulse.patch SDL-1.2.13-libdir.patch 
	SDL-1.2.13-pulse-rework.patch import.log mingw32-SDL.spec 
Log Message:
Initial import.


SDL-1.2.10-byteorder.patch:

--- NEW FILE SDL-1.2.10-byteorder.patch ---
--- SDL-1.2.10/include/SDL_endian.h.byteorder	2006-05-01 10:02:59.000000000 +0200
+++ SDL-1.2.10/include/SDL_endian.h	2006-05-19 11:53:07.000000000 +0200
@@ -32,6 +32,10 @@
 #define SDL_BIG_ENDIAN	4321
 
 #ifndef SDL_BYTEORDER	/* Not defined in SDL_config.h? */
+#ifdef __linux__
+#include <endian.h>
+#define SDL_BYTEORDER  __BYTE_ORDER
+#else /* __linux __ */
 #if defined(__hppa__) || \
     defined(__m68k__) || defined(mc68000) || defined(_M_M68K) || \
     (defined(__MIPS__) && defined(__MISPEB__)) || \
@@ -41,6 +45,7 @@
 #else
 #define SDL_BYTEORDER	SDL_LIL_ENDIAN
 #endif
+#endif /* __linux __ */
 #endif /* !SDL_BYTEORDER */
 
 

SDL-1.2.11-dynamic-esd.patch:

--- NEW FILE SDL-1.2.11-dynamic-esd.patch ---
--- SDL-1.2.11/configure.in.dynamic-esd	2007-03-19 17:44:47.000000000 +0100
+++ SDL-1.2.11/configure.in	2007-03-19 17:44:47.000000000 +0100
@@ -430,6 +430,16 @@
             AC_ARG_ENABLE(esd-shared,
 AC_HELP_STRING([--enable-esd-shared], [dynamically load ESD audio support [[default=yes]]]),
                           , enable_esd_shared=yes)
+            if test "x`echo $ESD_LIBS | grep -- -L`" = "x"; then
+                pfx=${libdir##*/}
+                if test "x`ls /${pfx}/libesd.so.* 2> /dev/null`" != "x"; then
+                    ESD_LIBS="-L/${pfx} $ESD_LIBS"
+                elif test "x`ls /usr/${pfx}/libesd.so.* 2> /dev/null`" != "x"; then
+                    ESD_LIBS="-L/usr/${pfx} $ESD_LIBS"
+                elif test "x`ls /usr/local/${pfx}/libesd.so.* 2> /dev/null`" != "x"; then
+                    ESD_LIBS="-L/usr/local/${pfx} $ESD_LIBS"
+                fi
+            fi
             esd_lib_spec=`echo $ESD_LIBS | sed 's/.*-L\([[^ ]]*\).*/\1\/libesd.so.*/'`
             esd_lib=`ls -- $esd_lib_spec | sed 's/.*\/\(.*\)/\1/; q'`
             echo "-- $esd_lib_spec -> $esd_lib"

SDL-1.2.12-disable_yasm.patch:

--- NEW FILE SDL-1.2.12-disable_yasm.patch ---
diff -up SDL-1.2.12/configure.in.disable_yasm SDL-1.2.12/configure.in
--- SDL-1.2.12/configure.in.disable_yasm	2007-08-27 18:24:44.000000000 +0200
+++ SDL-1.2.12/configure.in	2007-08-27 18:25:04.000000000 +0200
@@ -715,7 +715,6 @@ AC_HELP_STRING([--enable-nasm], [use nas
             esac
         fi
 
-        AC_PATH_PROG(NASM, yasm)
         echo "%ifidn __OUTPUT_FORMAT__,elf" > unquoted-sections
         echo "section .note.GNU-stack noalloc noexec nowrite progbits" >> unquoted-sections
         echo "%endif" >> unquoted-sections

SDL-1.2.12-multilib.patch:

--- NEW FILE SDL-1.2.12-multilib.patch ---
diff -up SDL-1.2.12/sdl-config.in.multilib SDL-1.2.12/sdl-config.in
--- SDL-1.2.12/sdl-config.in.multilib	2007-07-20 07:52:45.000000000 +0200
+++ SDL-1.2.12/sdl-config.in	2007-11-06 17:07:25.000000000 +0100
@@ -3,7 +3,6 @@
 prefix=@prefix@
 exec_prefix=@exec_prefix@
 exec_prefix_set=no
-libdir=@libdir@
 
 @ENABLE_STATIC_FALSE at usage="\
 @ENABLE_STATIC_FALSE at Usage: sdl-config [--prefix[=DIR]] [--exec-prefix[=DIR]] [--version] [--cflags] [--libs]"
@@ -45,11 +44,11 @@ while test $# -gt 0; do
       echo -I at includedir@/SDL @SDL_CFLAGS@
       ;;
 @ENABLE_SHARED_TRUE@    --libs)
- at ENABLE_SHARED_TRUE@      echo -L at libdir@ @SDL_RLD_FLAGS@ @SDL_LIBS@
+ at ENABLE_SHARED_TRUE@      echo @SDL_RLD_FLAGS@ @SDL_LIBS@
 @ENABLE_SHARED_TRUE@      ;;
 @ENABLE_STATIC_TRUE@@ENABLE_SHARED_TRUE@    --static-libs)
 @ENABLE_STATIC_TRUE@@ENABLE_SHARED_FALSE@    --libs|--static-libs)
- at ENABLE_STATIC_TRUE@      echo -L at libdir@ @SDL_RLD_FLAGS@ @SDL_STATIC_LIBS@
+ at ENABLE_STATIC_TRUE@      echo @SDL_RLD_FLAGS@ @SDL_STATIC_LIBS@
 @ENABLE_STATIC_TRUE@      ;;
     *)
       echo "${usage}" 1>&2

SDL-1.2.12-x11dyn64.patch:

--- NEW FILE SDL-1.2.12-x11dyn64.patch ---
diff -up SDL-1.2.12/configure.in.x11dyn64 SDL-1.2.12/configure.in
--- SDL-1.2.12/configure.in.x11dyn64	2007-08-27 18:18:28.000000000 +0200
+++ SDL-1.2.12/configure.in	2007-08-27 18:20:48.000000000 +0200
@@ -950,7 +950,8 @@ AC_HELP_STRING([--enable-x11-shared], [d
                     ;;
                 *)
                     x11_lib_path=[`echo $X_LIBS | sed 's/.*-L\([^ ]*\).*/\1/'`]
-                    for path in $x11_lib_path /usr/lib /usr/X11/lib /usr/X11R6/lib; do
+		    pfx=${libdir##*/}
+                    for path in $x11_lib_path /usr/${pfx} /usr/lib /usr/X11/lib /usr/X11R6/lib; do
                         if test "x$x11_lib" = "x"; then
                             x11_lib=[`ls -- $path/libX11.so.[0-9] 2>/dev/null | sort -r | sed 's/.*\/\(.*\)/\1/; q'`]
                             if test "x$x11_lib" = "x"; then

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

SDL-1.2.13-dynamic-pulse.patch:

--- NEW FILE SDL-1.2.13-dynamic-pulse.patch ---
diff -up SDL-1.2.13/configure.in.dynamic-pulse SDL-1.2.13/configure.in
--- SDL-1.2.13/configure.in.dynamic-pulse	2008-01-07 12:31:57.000000000 +0100
+++ SDL-1.2.13/configure.in	2008-01-07 12:32:02.000000000 +0100
@@ -500,14 +510,15 @@ AC_HELP_STRING([--enable-pulseaudio], [u
         if test x$audio_pulse = xyes; then
             AC_ARG_ENABLE(pulseaudio-shared,
 AC_HELP_STRING([--enable-pulseaudio-shared], [dynamically load PulseAudio support [[default=yes]]]),
-                          , enable_pulse_shared=yes)
+                          , enable_pulseaudio_shared=yes)
             if test "x`echo $PULSE_LIBS | grep -- -L`" = "x"; then
-                if test "x`ls /lib/libpulse-simple.so.* 2> /dev/null`" != "x"; then
-                    PULSE_LIBS="-L/lib $PULSE_LIBS"
-                elif test "x`ls /usr/lib/libpulse-simple.so.* 2> /dev/null`" != "x"; then
-                    PULSE_LIBS="-L/usr/lib $PULSE_LIBS"
-                elif test "x`ls /usr/local/lib/libpulse-simple.so.* 2> /dev/null`" != "x"; then
-                    PULSE_LIBS="-L/usr/local/lib $PULSE_LIBS"
+	        pfx=${libdir##*/}
+                if test "x`ls /${pfx}/libpulse-simple.so.* 2> /dev/null`" != "x"; then
+                    PULSE_LIBS="-L/${pfx} $PULSE_LIBS"
+                elif test "x`ls /usr/${pfx}/libpulse-simple.so.* 2> /dev/null`" != "x"; then
+                    PULSE_LIBS="-L/usr/${pfx} $PULSE_LIBS"
+                elif test "x`ls /usr/local/${pfx}/libpulse-simple.so.* 2> /dev/null`" != "x"; then
+                    PULSE_LIBS="-L/usr/local/${pfx} $PULSE_LIBS"
                 fi
             fi
             pulse_lib_spec=`echo $PULSE_LIBS | sed 's/.*-L\([[^ ]]*\).*/\1\/libpulse-simple.so.*/'`
@@ -518,11 +529,11 @@ AC_HELP_STRING([--enable-pulseaudio-shar
             SOURCES="$SOURCES $srcdir/src/audio/pulse/*.c"
             EXTRA_CFLAGS="$EXTRA_CFLAGS $PULSE_CFLAGS"
             if test x$have_loadso != xyes && \
-               test x$enable_pulse_shared = xyes; then
+               test x$enable_pulseaudio_shared = xyes; then
                 AC_MSG_WARN([You must have SDL_LoadObject() support for dynamic PulseAudio loading])
             fi
             if test x$have_loadso = xyes && \
-               test x$enable_pulse_shared = xyes && test x$pulse_lib != x; then
+               test x$enable_pulseaudio_shared = xyes && test x$pulse_lib != x; then
                 AC_DEFINE_UNQUOTED(SDL_AUDIO_DRIVER_PULSE_DYNAMIC, "$pulse_lib")
             else
                 EXTRA_LDFLAGS="$EXTRA_LDFLAGS $PULSE_LIBS"

SDL-1.2.13-libdir.patch:

--- NEW FILE SDL-1.2.13-libdir.patch ---
diff -up SDL-1.2.13/configure.in.libdir SDL-1.2.13/configure.in
--- SDL-1.2.13/configure.in.libdir	2007-12-31 05:48:39.000000000 +0100
+++ SDL-1.2.13/configure.in	2008-01-07 11:56:10.000000000 +0100
@@ -348,12 +348,13 @@ AC_HELP_STRING([--enable-alsa], [support
 AC_HELP_STRING([--enable-alsa-shared], [dynamically load ALSA audio support [[default=yes]]]),
                           , enable_alsa_shared=yes)
             if test "x`echo $ALSA_LIBS | grep -- -L`" = "x"; then
-                if test "x`ls /lib/libasound.so.* 2> /dev/null`" != "x"; then
-                    ALSA_LIBS="-L/lib $ALSA_LIBS"
-                elif test "x`ls /usr/lib/libasound.so.* 2> /dev/null`" != "x"; then
-                    ALSA_LIBS="-L/usr/lib $ALSA_LIBS"
-                elif test "x`ls /usr/local/lib/libasound.so.* 2> /dev/null`" != "x"; then
-                    ALSA_LIBS="-L/usr/local/lib $ALSA_LIBS"
+	        pfx=${libdir##*/}
+                if test "x`ls /${pfx}/libasound.so.* 2> /dev/null`" != "x"; then
+                    ALSA_LIBS="-L/${pfx} $ALSA_LIBS"
+                elif test "x`ls /usr/${pfx}/libasound.so.* 2> /dev/null`" != "x"; then
+                    ALSA_LIBS="-L/usr/${pfx} $ALSA_LIBS"
+                elif test "x`ls /usr/local/${pfx}/libasound.so.* 2> /dev/null`" != "x"; then
+                    ALSA_LIBS="-L/usr/local/${pfx} $ALSA_LIBS"
                 fi
             fi
             alsa_lib_spec=`echo $ALSA_LIBS | sed 's/.*-L\([[^ ]]*\).*/\1\/libasound.so.*/'`
@@ -561,7 +572,8 @@ AC_HELP_STRING([--enable-arts], [support
                 AC_ARG_ENABLE(arts-shared,
 AC_HELP_STRING([--enable-arts-shared], [dynamically load aRts audio support [[default=yes]]]),
                               , enable_arts_shared=yes)
-                arts_lib_spec="$ARTS_PREFIX/lib/libartsc.so.*"
+                pfx=${libdir##*/}
+                arts_lib_spec="$ARTS_PREFIX/${pfx}/libartsc.so.*"
                 arts_lib=`ls -- $arts_lib_spec | sed 's/.*\/\(.*\)/\1/; q'`
                 echo "-- $arts_lib_spec -> $arts_lib"
 
diff -up SDL-1.2.13/configure.libdir SDL-1.2.13/configure
--- SDL-1.2.13/configure.libdir	2007-12-31 06:09:39.000000000 +0100
+++ SDL-1.2.13/configure	2008-01-07 12:01:32.000000000 +0100
@@ -24888,12 +24888,13 @@ else
 fi
 
             if test "x`echo $ALSA_LIBS | grep -- -L`" = "x"; then
-                if test "x`ls /lib/libasound.so.* 2> /dev/null`" != "x"; then
-                    ALSA_LIBS="-L/lib $ALSA_LIBS"
-                elif test "x`ls /usr/lib/libasound.so.* 2> /dev/null`" != "x"; then
-                    ALSA_LIBS="-L/usr/lib $ALSA_LIBS"
-                elif test "x`ls /usr/local/lib/libasound.so.* 2> /dev/null`" != "x"; then
-                    ALSA_LIBS="-L/usr/local/lib $ALSA_LIBS"
+	        pfx=${libdir##*/}
+                if test "x`ls /${pfx}/libasound.so.* 2> /dev/null`" != "x"; then
+                    ALSA_LIBS="-L/${pfx} $ALSA_LIBS"
+                elif test "x`ls /usr/${pfx}/libasound.so.* 2> /dev/null`" != "x"; then
+                    ALSA_LIBS="-L/usr/${pfx} $ALSA_LIBS"
+                elif test "x`ls /usr/local/${pfx}/libasound.so.* 2> /dev/null`" != "x"; then
+                    ALSA_LIBS="-L/usr/local/${pfx} $ALSA_LIBS"
                 fi
             fi
             alsa_lib_spec=`echo $ALSA_LIBS | sed 's/.*-L\([^ ]*\).*/\1\/libasound.so.*/'`
@@ -25643,7 +25634,8 @@ else
   enable_arts_shared=yes
 fi
 
-                arts_lib_spec="$ARTS_PREFIX/lib/libartsc.so.*"
+		pfx=${libdir##*/}
+                arts_lib_spec="$ARTS_PREFIX/${pfx}/libartsc.so.*"
                 arts_lib=`ls -- $arts_lib_spec | sed 's/.*\/\(.*\)/\1/; q'`
                 echo "-- $arts_lib_spec -> $arts_lib"
 

SDL-1.2.13-pulse-rework.patch:

--- NEW FILE SDL-1.2.13-pulse-rework.patch ---
--- SDL-1.2.13/src/audio/pulse/SDL_pulseaudio.c	2007-12-31 05:47:58.000000000 +0100
+++ SDL-1.2.13.lennart/src/audio/pulse/SDL_pulseaudio.c	2008-03-31 16:09:05.000000000 +0200
@@ -1,3 +1,4 @@
+/* -*- Mode: C; c-basic-offset: 8; indent-tabs-mode: t -*- */
 /*
     SDL - Simple DirectMedia Layer
     Copyright (C) 1997-2007 Sam Lantinga
@@ -18,7 +19,7 @@
 
     St??phan Kochen
     stephan at kochen.nl
-    
+
     Based on parts of the ALSA and ESounD output drivers.
 */
 #include "SDL_config.h"
@@ -78,14 +79,14 @@ static int (*SDL_NAME(pa_simple_write))(
 	pa_simple *s,
 	const void *data,
 	size_t length,
-	int *error 
+	int *error
 );
 static pa_channel_map* (*SDL_NAME(pa_channel_map_init_auto))(
 	pa_channel_map *m,
 	unsigned channels,
 	pa_channel_map_def_t def
 );
-	
+
 
 static struct {
 	const char *name;
@@ -158,16 +159,16 @@ static int Audio_Available(void)
 	if ( LoadPulseLibrary() < 0 ) {
 		return available;
 	}
-	
+
 	/* Connect with a dummy format. */
 	paspec.format = PA_SAMPLE_U8;
 	paspec.rate = 11025;
 	paspec.channels = 1;
 	connection = SDL_NAME(pa_simple_new)(
-		SDL_getenv("PASERVER"),      /* server */
+		NULL,                        /* server */
 		"Test stream",               /* application name */
 		PA_STREAM_PLAYBACK,          /* playback mode */
-		SDL_getenv("PADEVICE"),      /* device on the server */
+		NULL,                        /* device on the server */
 		"Simple DirectMedia Layer",  /* stream description */
 		&paspec,                     /* sample format spec */
 		NULL,                        /* channel map */
@@ -178,7 +179,7 @@ static int Audio_Available(void)
 		available = 1;
 		SDL_NAME(pa_simple_free)(connection);
 	}
-	
+
 	UnloadPulseLibrary();
 	return(available);
 }
@@ -233,7 +234,7 @@ static void PULSE_WaitAudio(_THIS)
 {
 	/* Check to see if the thread-parent process is still alive */
 	{ static int cnt = 0;
-		/* Note that this only works with thread implementations 
+		/* Note that this only works with thread implementations
 		   that use a different process id for each thread.
 		*/
 		if (parent && (((++cnt)%10) == 0)) { /* Check every 10 loops */
@@ -302,7 +303,7 @@ static int PULSE_OpenAudio(_THIS, SDL_Au
 	pa_sample_spec  paspec;
 	pa_buffer_attr  paattr;
 	pa_channel_map  pacmap;
-	
+
 	paspec.format = PA_SAMPLE_INVALID;
 	for ( test_format = SDL_FirstAudioFormat(spec->format); test_format; ) {
 		switch ( test_format ) {
@@ -324,7 +325,7 @@ static int PULSE_OpenAudio(_THIS, SDL_Au
 		return(-1);
 	}
 	spec->format = test_format;
-	
+
 	paspec.channels = spec->channels;
 	paspec.rate = spec->freq;
 
@@ -338,25 +339,24 @@ static int PULSE_OpenAudio(_THIS, SDL_Au
 		return(-1);
 	}
 	SDL_memset(mixbuf, spec->silence, spec->size);
-	
+
 	/* Reduced prebuffering compared to the defaults. */
-	paattr.tlength = mixlen;
+	paattr.tlength = mixlen*2;
 	paattr.minreq = mixlen;
-	paattr.fragsize = mixlen;
-	paattr.prebuf = mixlen;
-	paattr.maxlength = mixlen * 4;
-	
+	paattr.prebuf = mixlen*2;
+	paattr.maxlength = mixlen*2;
+
 	/* The SDL ALSA output hints us that we use Windows' channel mapping */
 	/* http://bugzilla.libsdl.org/show_bug.cgi?id=110 */
 	SDL_NAME(pa_channel_map_init_auto)(
 		&pacmap, spec->channels, PA_CHANNEL_MAP_WAVEEX);
-	
+
 	/* Connect to the PulseAudio server */
 	stream = SDL_NAME(pa_simple_new)(
-		SDL_getenv("PASERVER"),      /* server */
+		NULL,                        /* server */
 		get_progname(),              /* application name */
 		PA_STREAM_PLAYBACK,          /* playback mode */
-		SDL_getenv("PADEVICE"),      /* device on the server */
+		NULL,                        /* device on the server */
 		"Simple DirectMedia Layer",  /* stream description */
 		&paspec,                     /* sample format spec */
 		&pacmap,                     /* channel map */
@@ -371,7 +371,6 @@ static int PULSE_OpenAudio(_THIS, SDL_Au
 
 	/* Get the parent process id (we're the parent of the audio thread) */
 	parent = getpid();
-	
+
 	return(0);
 }
-


--- NEW FILE import.log ---
mingw32-SDL-1_2_13-4_fc10:EL-5:mingw32-SDL-1.2.13-4.fc10.src.rpm:1232192288


--- NEW FILE mingw32-SDL.spec ---
%define __strip %{_mingw32_strip}
%define __objdump %{_mingw32_objdump}
%define _use_internal_dependency_generator 0
%define __find_requires %{_mingw32_findrequires}
%define __find_provides %{_mingw32_findprovides}

Name:           mingw32-SDL
Version:        1.2.13
Release:        4%{?dist}
Summary:        MinGW Windows port of SDL cross-platform multimedia library

License:        LGPLv2+
Group:          Development/Libraries
URL:            http://www.libsdl.org/
Source0:        http://www.libsdl.org/release/SDL-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch

# Patches from native version.
Patch0:         SDL-1.2.10-byteorder.patch
Patch17:        SDL-1.2.13-libdir.patch
Patch21:        SDL-1.2.12-multilib.patch
Patch23:        SDL-1.2.11-dynamic-esd.patch
Patch24:        SDL-1.2.12-x11dyn64.patch
Patch25:        SDL-1.2.12-disable_yasm.patch
Patch26:        SDL-1.2.13-dynamic-pulse.patch
Patch27:        SDL-1.2.13-pulse-rework.patch
Patch28:        SDL-1.2.13-audiodriver.patch

BuildRequires:  mingw32-filesystem >= 40
BuildRequires:  mingw32-gcc
BuildRequires:  mingw32-binutils
BuildRequires:  mingw32-dlfcn
BuildRequires:  mingw32-iconv

Requires:       pkgconfig

# Not required at the moment, but SDL does contain plenty of C++ code,
# I just haven't worked out how to enable it.
#BuildRequires:  mingw32-gcc-c++

# If we have nasm in the future, then this would enable future
# optimizations on x86-based architectures.
#%ifarch %{ix86}
#BuildRequires: nasm
#%endif


%description
Simple DirectMedia Layer (SDL) is a cross-platform multimedia library
designed to provide fast access to the graphics frame buffer and audio
device.


%prep
%setup -q -n SDL-%{version}
%patch0 -p1 -b .byteorder
%patch17 -p1 -b .libdir
%patch21 -p1 -b .multilib
%patch23 -p1 -b .dynamic-esd
%patch24 -p1 -b .x11dyn64
%patch25 -p1 -b .disable_yasm
%patch26 -p1 -b .dynamic-pulse
%patch27 -p1 -b .pulse-rework
%patch28 -p1 -b .audiodriver


%build
%{_mingw32_configure} \
  --disable-video-svga --disable-video-ggi --disable-video-aalib \
  --disable-debug \
  --enable-sdl-dlopen \
  --enable-dlopen \
  --enable-arts-shared \
  --enable-esd-shared \
  --enable-pulseaudio-shared \
  --enable-alsa \
  --disable-rpath

make


%install
rm -rf $RPM_BUILD_ROOT
make DESTDIR=$RPM_BUILD_ROOT install

# Remove static libraries but DON'T remove *.dll.a files.
rm $RPM_BUILD_ROOT%{_mingw32_libdir}/libSDL.a

# Actually libSDLmain.a seems to be required.  It just contains
# a single object file called SDL_win32_main.o.
#rm $RPM_BUILD_ROOT%{_mingw32_libdir}/libSDLmain.a

# Delete man pages since they duplicate what is already available
# in base Fedora package.
rm $RPM_BUILD_ROOT%{_mingw32_mandir}/man3/*.3*


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root)
%doc COPYING
%{_mingw32_bindir}/SDL.dll
%{_mingw32_bindir}/sdl-config
%{_mingw32_libdir}/libSDL.dll.a
%{_mingw32_libdir}/libSDL.la
%{_mingw32_libdir}/libSDLmain.a
%{_mingw32_libdir}/pkgconfig/sdl.pc
%{_mingw32_datadir}/aclocal/sdl.m4
%{_mingw32_includedir}/SDL


%changelog
* Tue Jan 13 2009 Richard W.M. Jones <rjones at redhat.com> - 1.2.13-4
- Verify we are still up to date with Fedora release.
- Include COPYING in documentation.
- Build with dlfcn.
- List all BRs.
- No need to package the man pages, don't duplicate what's in the
  base Fedora package already.
- Requires pkgconfig.

* Fri Oct 24 2008 Richard W.M. Jones <rjones at redhat.com> - 1.2.13-2
- Initial RPM release.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-SDL/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	17 Jan 2009 03:20:10 -0000	1.1
+++ .cvsignore	17 Jan 2009 11:42:34 -0000	1.2
@@ -0,0 +1 @@
+SDL-1.2.13.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-SDL/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	17 Jan 2009 03:20:10 -0000	1.1
+++ sources	17 Jan 2009 11:42:34 -0000	1.2
@@ -0,0 +1 @@
+c6660feea2a6834de10bc71b2f8e4d88  SDL-1.2.13.tar.gz



From rjones at fedoraproject.org  Sat Jan 17 11:42:35 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Sat, 17 Jan 2009 11:42:35 +0000 (UTC)
Subject: rpms/mingw32-gettext/EL-5 import.log, NONE,
	1.1 mingw32-gettext-0.17-gnulib-optarg-symbols.patch, NONE,
	1.1 mingw32-gettext.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <20090117114235.917CE7012B@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/mingw32-gettext/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7724/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	import.log mingw32-gettext-0.17-gnulib-optarg-symbols.patch 
	mingw32-gettext.spec 
Log Message:
Initial import.



--- NEW FILE import.log ---
mingw32-gettext-0_17-7_fc10:EL-5:mingw32-gettext-0.17-7.fc10.src.rpm:1232192232

mingw32-gettext-0.17-gnulib-optarg-symbols.patch:

--- NEW FILE mingw32-gettext-0.17-gnulib-optarg-symbols.patch ---
See https://bugzilla.redhat.com/show_bug.cgi?id=467398#c3

--- ./gettext-tools/woe32dll/gettextlib-exports.c.lfarkas 2008-10-31 11:42:38.000000000 +0100
+++ ./gettext-tools/woe32dll/gettextlib-exports.c 2008-10-31 11:43:29.000000000 +0100
@@ -26,7 +26,7 @@
 VARIABLE(gl_array_list_implementation)
 VARIABLE(gl_linkedhash_list_implementation)
 VARIABLE(program_name)
-VARIABLE(rpl_optarg)
-VARIABLE(rpl_optind)
+/*VARIABLE(rpl_optarg)
+VARIABLE(rpl_optind)*/
 VARIABLE(simple_backup_suffix)
 VARIABLE(styled_ostream_typeinfo)


--- NEW FILE mingw32-gettext.spec ---
%define __strip %{_mingw32_strip}
%define __objdump %{_mingw32_objdump}
%define _use_internal_dependency_generator 0
%define __find_requires %{_mingw32_findrequires}
%define __find_provides %{_mingw32_findprovides}

Name:      mingw32-gettext
Version:   0.17
Release:   7%{?dist}
Summary:   GNU libraries and utilities for producing multi-lingual messages

License:   GPLv2+ and LGPLv2+
Group:     Development/Libraries
URL:       http://www.gnu.org/software/gettext/
Source0:   http://ftp.gnu.org/pub/gnu/gettext/gettext-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Patch0:    mingw32-gettext-0.17-gnulib-optarg-symbols.patch

BuildArch: noarch

BuildRequires: mingw32-filesystem >= 23
BuildRequires: mingw32-runtime >= 3.15.1
BuildRequires: mingw32-gcc
BuildRequires: mingw32-gcc-c++
BuildRequires: mingw32-binutils
BuildRequires: mingw32-iconv
BuildRequires: mingw32-termcap >= 1.3.1-3

# Possible extra BRs.  These are used if available, but
# not required just for building.
#BuildRequires: mingw32-dlfcn
#BuildRequires: mingw32-libxml2
#BuildRequires: mingw32-expat
#BuildRequires: mingw32-glib2


%description
MinGW Windows Gettext library


%prep
%setup -q -n gettext-%{version}

%patch0 -p1


%build
%{_mingw32_configure} \
  --disable-java \
  --disable-native-java \
  --disable-csharp \
  --disable-static \
  --enable-threads=win32 \
  --without-emacs
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT

make DESTDIR=$RPM_BUILD_ROOT install
rm -f $RPM_BUILD_ROOT%{_mingw32_datadir}/locale/locale.alias
rm -f $RPM_BUILD_ROOT%{_mingw32_libdir}/charset.alias
rm -f $RPM_BUILD_ROOT%{_mingw32_datadir}/info/dir

# Remove man pages, these are available in base gettext-devel.
rm -rf $RPM_BUILD_ROOT%{_mingw32_mandir}/man1/
rm -rf $RPM_BUILD_ROOT%{_mingw32_mandir}/man3/


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root)
%doc COPYING
%{_mingw32_bindir}/autopoint
%{_mingw32_bindir}/envsubst.exe
%{_mingw32_bindir}/gettext.exe
%{_mingw32_bindir}/gettext.sh
%{_mingw32_bindir}/gettextize
%{_mingw32_bindir}/libasprintf-0.dll
%{_mingw32_bindir}/libgettextlib-0-17.dll
%{_mingw32_bindir}/libgettextpo-0.dll
%{_mingw32_bindir}/libgettextsrc-0-17.dll
%{_mingw32_bindir}/libintl-8.dll
%{_mingw32_bindir}/msg*.exe
%{_mingw32_bindir}/ngettext.exe
%{_mingw32_bindir}/recode-sr-latin.exe
%{_mingw32_bindir}/xgettext.exe

%{_mingw32_includedir}/autosprintf.h
%{_mingw32_includedir}/gettext-po.h
%{_mingw32_includedir}/libintl.h

%{_mingw32_libdir}/gettext

%{_mingw32_libdir}/libasprintf.dll.a
%{_mingw32_libdir}/libasprintf.la

%{_mingw32_libdir}/libgettextlib.dll.a
%{_mingw32_libdir}/libgettextlib.la

%{_mingw32_libdir}/libgettextpo.dll.a
%{_mingw32_libdir}/libgettextpo.la

%{_mingw32_libdir}/libgettextsrc.dll.a
%{_mingw32_libdir}/libgettextsrc.la

%{_mingw32_libdir}/libintl.dll.a
%{_mingw32_libdir}/libintl.la

%{_mingw32_docdir}/gettext
%{_mingw32_docdir}/libasprintf/autosprintf_all.html

%{_mingw32_datadir}/gettext/

%{_mingw32_datadir}/aclocal/*m4
%{_mingw32_datadir}/info/autosprintf.info
%{_mingw32_datadir}/info/gettext.info

%{_mingw32_datadir}/locale/*/LC_MESSAGES/gettext-tools.mo
%{_mingw32_datadir}/locale/*/LC_MESSAGES/gettext-runtime.mo


%changelog
* Fri Jan 16 2009 Richard W.M. Jones <rjones at redhat.com> - 0.17-7
- Remove the manpages - already available in base Fedora gettext-devel.
- Use _smp_mflags for build.
- Added list of potential BRs.
- Added license file to doc section.

* Fri Oct 31 2008 Richard W.M. Jones <rjones at redhat.com> - 0.17-6
- Add fix for undefined Gnulib symbols (Farkas Levente).
- Rebuild against mingw32-termcap / libtermcap.

* Wed Sep 24 2008 Richard W.M. Jones <rjones at redhat.com> - 0.17-5
- Rename mingw -> mingw32.

* Thu Sep 11 2008 Daniel P. Berrange <berrange at redhat.com> - 0.17-4
- Disable emacs lisp file install

* Thu Sep 10 2008 Richard W.M. Jones <rjones at redhat.com> - 0.17-3
- Remove static libraries.

* Thu Sep  4 2008 Richard W.M. Jones <rjones at redhat.com> - 0.17-2
- Use RPM macros from mingw-filesystem.

* Tue Sep  2 2008 Daniel P. Berrange <berrange at redhat.com> - 0.17-1
- Initial RPM release, largely based on earlier work from several sources.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-gettext/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	17 Jan 2009 03:29:58 -0000	1.1
+++ .cvsignore	17 Jan 2009 11:42:05 -0000	1.2
@@ -0,0 +1 @@
+gettext-0.17.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-gettext/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	17 Jan 2009 03:29:58 -0000	1.1
+++ sources	17 Jan 2009 11:42:05 -0000	1.2
@@ -0,0 +1 @@
+58a2bc6d39c0ba57823034d55d65d606  gettext-0.17.tar.gz



From nim at fedoraproject.org  Sat Jan 17 11:42:43 2009
From: nim at fedoraproject.org (Nicolas Mailhot)
Date: Sat, 17 Jan 2009 11:42:43 +0000 (UTC)
Subject: rpms/ecolier-court-fonts/devel ecolier-court-fonts.spec, 1.4,
	1.5 import.log, 1.4, 1.5
Message-ID: <20090117114243.33C877012B@cvs1.fedora.phx.redhat.com>

Author: nim

Update of /cvs/extras/rpms/ecolier-court-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8651/devel

Modified Files:
	ecolier-court-fonts.spec import.log 
Log Message:
add missing obsoletes


Index: ecolier-court-fonts.spec
===================================================================
RCS file: /cvs/extras/rpms/ecolier-court-fonts/devel/ecolier-court-fonts.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ecolier-court-fonts.spec	16 Jan 2009 21:13:43 -0000	1.4
+++ ecolier-court-fonts.spec	17 Jan 2009 11:42:12 -0000	1.5
@@ -52,6 +52,8 @@
 Group:    User Interface/X
 Requires: %{name}-common = %{version}-%{release}
 
+Obsoletes: %{name}-lignes < 20070702-7
+
 %description -n %{fontname}-lignes-fonts
 %common_desc
 
@@ -109,8 +111,8 @@
 
 
 %changelog
-* Fri Jan 16 2009 <nicolas.mailhot at laposte.net>
-- 20070702-6
+* Sat Jan 17 2009 <nicolas.mailhot at laposte.net>
+- 20070702-7
 ??? Convert to new naming guidelines
 
 * Wed Dec 17 2008 <nicolas.mailhot at laposte.net>


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/ecolier-court-fonts/devel/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- import.log	16 Jan 2009 21:13:43 -0000	1.4
+++ import.log	17 Jan 2009 11:42:12 -0000	1.5
@@ -2,3 +2,4 @@
 ecolier-court-fonts-20070702-4_fc11:HEAD:ecolier-court-fonts-20070702-4.fc11.src.rpm:1229541673
 ecolier-court-fonts-20070702-5_fc11:HEAD:ecolier-court-fonts-20070702-5.fc11.src.rpm:1229543899
 ecolier-court-fonts-20070702-6_fc11:HEAD:ecolier-court-fonts-20070702-6.fc11.src.rpm:1232140382
+ecolier-court-fonts-20070702-6_fc11:HEAD:ecolier-court-fonts-20070702-6.fc11.src.rpm:1232192497



From tmraz at fedoraproject.org  Sat Jan 17 12:01:38 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Sat, 17 Jan 2009 12:01:38 +0000 (UTC)
Subject: rpms/ike-scan/devel ike-scan.spec,1.4,1.5
Message-ID: <20090117120138.799CC7012B@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/ike-scan/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12083

Modified Files:
	ike-scan.spec 
Log Message:
* Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> - 1.9-6
- rebuild with new openssl



Index: ike-scan.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ike-scan/devel/ike-scan.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ike-scan.spec	31 Jul 2008 17:55:16 -0000	1.4
+++ ike-scan.spec	17 Jan 2009 12:01:08 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           ike-scan
 Version:        1.9
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        IKE protocol tool to discover, fingerprint and test IPsec VPN servers
 
 Group:          Applications/Internet
@@ -44,6 +44,9 @@
 
 
 %changelog
+* Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> - 1.9-6
+- rebuild with new openssl
+
 * Thu Jul 31 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1.9-5
 - fix license tag
 



From tmraz at fedoraproject.org  Sat Jan 17 12:02:08 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Sat, 17 Jan 2009 12:02:08 +0000 (UTC)
Subject: rpms/inkscape/devel inkscape.spec,1.61,1.62
Message-ID: <20090117120208.8E8C17012B@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/inkscape/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12145

Modified Files:
	inkscape.spec 
Log Message:
* Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> - 0.46-10
- rebuild with new openssl



Index: inkscape.spec
===================================================================
RCS file: /cvs/pkgs/rpms/inkscape/devel/inkscape.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- inkscape.spec	13 Jan 2009 21:30:55 -0000	1.61
+++ inkscape.spec	17 Jan 2009 12:01:38 -0000	1.62
@@ -1,6 +1,6 @@
 Name:           inkscape
 Version:        0.46
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        Vector-based drawing program using SVG
 
 Group:          Applications/Productivity
@@ -146,6 +146,9 @@
 
 
 %changelog
+* Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> - 0.46-10
+- rebuild with new openssl
+
 * Tue Jan 13 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.46-9
 - Fix crash with bitmap font (#477158)
 



From nim at fedoraproject.org  Sat Jan 17 12:03:11 2009
From: nim at fedoraproject.org (Nicolas Mailhot)
Date: Sat, 17 Jan 2009 12:03:11 +0000 (UTC)
Subject: rpms/ecolier-court-fonts/devel ecolier-court-fonts.spec, 1.5,
	1.6 import.log, 1.5, 1.6
Message-ID: <20090117120311.349277012B@cvs1.fedora.phx.redhat.com>

Author: nim

Update of /cvs/extras/rpms/ecolier-court-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12432/devel

Modified Files:
	ecolier-court-fonts.spec import.log 
Log Message:
add missing obsoletes


Index: ecolier-court-fonts.spec
===================================================================
RCS file: /cvs/extras/rpms/ecolier-court-fonts/devel/ecolier-court-fonts.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ecolier-court-fonts.spec	17 Jan 2009 11:42:12 -0000	1.5
+++ ecolier-court-fonts.spec	17 Jan 2009 12:02:40 -0000	1.6
@@ -11,7 +11,7 @@
 
 Name:    %{fontname}-fonts
 Version: 20070702
-Release: 6%{?dist}
+Release: 7%{?dist}
 Summary: Schoolchildren cursive fonts
 
 Group:     User Interface/X


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/ecolier-court-fonts/devel/import.log,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- import.log	17 Jan 2009 11:42:12 -0000	1.5
+++ import.log	17 Jan 2009 12:02:40 -0000	1.6
@@ -3,3 +3,4 @@
 ecolier-court-fonts-20070702-5_fc11:HEAD:ecolier-court-fonts-20070702-5.fc11.src.rpm:1229543899
 ecolier-court-fonts-20070702-6_fc11:HEAD:ecolier-court-fonts-20070702-6.fc11.src.rpm:1232140382
 ecolier-court-fonts-20070702-6_fc11:HEAD:ecolier-court-fonts-20070702-6.fc11.src.rpm:1232192497
+ecolier-court-fonts-20070702-7_fc11:HEAD:ecolier-court-fonts-20070702-7.fc11.src.rpm:1232193736



From tmraz at fedoraproject.org  Sat Jan 17 12:03:29 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Sat, 17 Jan 2009 12:03:29 +0000 (UTC)
Subject: rpms/ipa/devel ipa.spec,1.20,1.21
Message-ID: <20090117120329.2460A7012B@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/ipa/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12484

Modified Files:
	ipa.spec 
Log Message:
* Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> - 1.2.1-3
- rebuild with new openssl



Index: ipa.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ipa/devel/ipa.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- ipa.spec	19 Dec 2008 16:04:27 -0000	1.20
+++ ipa.spec	17 Jan 2009 12:02:58 -0000	1.21
@@ -6,7 +6,7 @@
 
 Name:           ipa
 Version:        1.2.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        The Identity, Policy and Audit system
 
 Group:          System Environment/Base
@@ -471,6 +471,9 @@
 %{_sbindir}/ipa-modradiusprofile
 
 %changelog
+* Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> - 1.2.1-3
+- rebuild with new openssl
+
 * Fri Dec 19 2008 Dan Walsh <dwalsh at redhat.com> - 1.2.1-2
 - Fix SELinux code
 



From tmraz at fedoraproject.org  Sat Jan 17 12:07:11 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Sat, 17 Jan 2009 12:07:11 +0000 (UTC)
Subject: rpms/ipmitool/devel ipmitool.spec,1.1,1.2
Message-ID: <20090117120711.453857012B@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/ipmitool/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12850

Modified Files:
	ipmitool.spec 
Log Message:
* Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> 1.8.10-3
- rebuild with new openssl



Index: ipmitool.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ipmitool/devel/ipmitool.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ipmitool.spec	17 Oct 2008 10:26:34 -0000	1.1
+++ ipmitool.spec	17 Jan 2009 12:06:40 -0000	1.2
@@ -1,7 +1,7 @@
 Name:         ipmitool
 Summary:      Utility for IPMI control
 Version:      1.8.10
-Release:      2%{?dist}
+Release:      3%{?dist}
 License:      BSD
 Group:        System Environment/Base
 URL:          http://ipmitool.sourceforge.net/
@@ -85,6 +85,9 @@
 
 
 %changelog
+* Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> 1.8.10-3
+- rebuild with new openssl
+
 * Tue Oct 14 2008 Jan Safranek <jsafrane at redhat.com> 1.8.10-2
 - fix issues found during package review:
   - clear Default-Start: line in the init script, the service should be 



From tmraz at fedoraproject.org  Sat Jan 17 12:16:04 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Sat, 17 Jan 2009 12:16:04 +0000 (UTC)
Subject: rpms/ircd-hybrid/devel ircd-hybrid.spec,1.18,1.19
Message-ID: <20090117121604.5A37E7012B@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/ircd-hybrid/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13406

Modified Files:
	ircd-hybrid.spec 
Log Message:
* Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> - 7.2.3-7
- rebuild with new openssl



Index: ircd-hybrid.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ircd-hybrid/devel/ircd-hybrid.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- ircd-hybrid.spec	31 Jul 2008 21:10:06 -0000	1.18
+++ ircd-hybrid.spec	17 Jan 2009 12:15:33 -0000	1.19
@@ -10,7 +10,7 @@
 Summary: Internet Relay Chat Server
 Name: ircd-hybrid
 Version: 7.2.3
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: GPLv2+
 Group: System Environment/Daemons
 Source0: http://ovh.dl.sourceforge.net/sourceforge/ircd-hybrid/ircd-hybrid-%{version}.tgz
@@ -129,6 +129,9 @@
 
 
 %changelog
+* Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> - 7.2.3-7
+- rebuild with new openssl
+
 * Thu Jul 31 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 7.2.3-6
 - fix license tag
 



From tmraz at fedoraproject.org  Sat Jan 17 12:17:23 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Sat, 17 Jan 2009 12:17:23 +0000 (UTC)
Subject: rpms/ircd-ratbox/devel ircd-ratbox.spec,1.2,1.3
Message-ID: <20090117121723.4240F7012B@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/ircd-ratbox/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13611

Modified Files:
	ircd-ratbox.spec 
Log Message:
* Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> - 2.2.8-3
- rebuild with new openssl



Index: ircd-ratbox.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ircd-ratbox/devel/ircd-ratbox.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ircd-ratbox.spec	3 Sep 2008 12:37:10 -0000	1.2
+++ ircd-ratbox.spec	17 Jan 2009 12:16:53 -0000	1.3
@@ -2,7 +2,7 @@
 
 Name:		ircd-ratbox
 Version:	2.2.8
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Ircd-ratbox is an advanced, stable and fast ircd	
 
 License:	GPLv2
@@ -128,5 +128,8 @@
 %{_bindir}/ircd-mkpasswd
 
 %changelog
+* Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> - 2.2.8-3
+- rebuild with new openssl
+
 * Wed Aug 27 2008 Marek Mahut <mmahut at fedoraproject.org> - 2.2.8-2
 - Initial package build



From tmraz at fedoraproject.org  Sat Jan 17 12:18:44 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Sat, 17 Jan 2009 12:18:44 +0000 (UTC)
Subject: rpms/irssi/devel irssi.spec,1.35,1.36
Message-ID: <20090117121844.348427012B@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/irssi/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13804

Modified Files:
	irssi.spec 
Log Message:
* Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> - 0.8.12-12
- rebuild with new openssl



Index: irssi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/irssi/devel/irssi.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- irssi.spec	28 Aug 2008 22:47:30 -0000	1.35
+++ irssi.spec	17 Jan 2009 12:18:14 -0000	1.36
@@ -3,7 +3,7 @@
 Summary:	Modular text mode IRC client with Perl scripting
 Name:		irssi
 Version:	0.8.12
-Release:	11%{?dist}
+Release:	12%{?dist}
 
 License:	GPLv2+
 Group:		Applications/Communications
@@ -85,6 +85,9 @@
 
 
 %changelog
+* Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> - 0.8.12-12
+- rebuild with new openssl
+
 * Fri Aug 29 2008 Michael Schwendt <mschwendt at fedoraproject.org> - 0.8.12-11
 - Don't include any C header files in main package.
 



From rjones at fedoraproject.org  Sat Jan 17 12:27:27 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Sat, 17 Jan 2009 12:27:27 +0000 (UTC)
Subject: rpms/mingw32-gdbm/devel mingw32-gdbm-1.8.0-libtool-install.patch,
	NONE, 1.1 mingw32-gdbm.spec, 1.1, 1.2
Message-ID: <20090117122727.5D2BE7012B@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/mingw32-gdbm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14812

Modified Files:
	mingw32-gdbm.spec 
Added Files:
	mingw32-gdbm-1.8.0-libtool-install.patch 
Log Message:
- Update config.sub and config.guess.
- Patch to use libtool-2-style commands.


mingw32-gdbm-1.8.0-libtool-install.patch:

--- NEW FILE mingw32-gdbm-1.8.0-libtool-install.patch ---
--- gdbm-1.8.0/Makefile.in.libtool-install	2009-01-17 12:16:36.000000000 +0000
+++ gdbm-1.8.0/Makefile.in	2009-01-17 12:19:11.000000000 +0000
@@ -117,7 +117,7 @@
 
 install: libgdbm.la gdbm.h gdbm.info
 	$(srcdir)/mkinstalldirs $(libdir) $(includedir) $(man3dir) $(infodir)
-	$(LIBTOOL) install -c libgdbm.la $(libdir)/libgdbm.la
+	$(LIBTOOL) --mode=install install libgdbm.la $(libdir)/libgdbm.la
 	$(INSTALL_DATA) gdbm.h $(includedir)/gdbm.h
 	$(INSTALL_DATA) $(srcdir)/gdbm.3 $(man3dir)/gdbm.3
 	$(INSTALL_DATA) $(srcdir)/gdbm.info $(infodir)/gdbm.info


Index: mingw32-gdbm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-gdbm/devel/mingw32-gdbm.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mingw32-gdbm.spec	17 Jan 2009 11:34:19 -0000	1.1
+++ mingw32-gdbm.spec	17 Jan 2009 12:26:57 -0000	1.2
@@ -6,7 +6,7 @@
 
 Name:           mingw32-gdbm
 Version:        1.8.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        MinGW port of GNU database routines
 
 License:        GPLv2+
@@ -20,7 +20,8 @@
 Patch2:         gdbm-1.8.0-cflags.patch
 Patch3:         gdbm-1.8.0-64offset.patch
 
-Patch100:       mingw32-gdbm-1.8.0-windows.patch
+Patch1000:      mingw32-gdbm-1.8.0-windows.patch
+Patch1001:      mingw32-gdbm-1.8.0-libtool-install.patch
 
 BuildArch:      noarch
 
@@ -29,6 +30,7 @@
 BuildRequires:  mingw32-binutils
 
 BuildRequires:  libtool
+BuildRequires:  automake
 
 
 %description
@@ -48,14 +50,26 @@
 %patch2 -p 1 -b .cflags
 %patch3 -p1 -b .offset
 
-%patch100 -p1 -b .windows
+%patch1000 -p1 -b .windows
+%patch1001 -p1 -b .libtool-install
 
 
 %build
+# Update the version of libtool.
 libtoolize --force --copy
+
 aclocal
-autoreconf
+
+# We want to update config.sub and config.guess because the ones
+# shipped with gdbm are ancient history.  However note that there is
+# no Makefile.am -- we are only using automake for convenience here!
+rm -f config.sub config.guess
+automake --add-missing ||:
+
+autoconf
+
 %{_mingw32_configure}
+# NB: %{?_smp_mflags} causes build to fail.
 make libdir=%{_mingw32_libdir} all progs
 
 
@@ -104,5 +118,9 @@
 
 
 %changelog
+* Sat Jan 17 2009 Richard W.M. Jones <rjones at redhat.com> - 1.8.0-2
+- Update config.sub and config.guess.
+- Patch to use libtool-2-style commands.
+
 * Fri Oct  3 2008 Richard W.M. Jones <rjones at redhat.com> - 1.8.0-1
 - Initial RPM release.



From dchen at fedoraproject.org  Sat Jan 17 12:46:30 2009
From: dchen at fedoraproject.org (Ding-Yi Chen)
Date: Sat, 17 Jan 2009 12:46:30 +0000 (UTC)
Subject: rpms/tomoe/devel import.log, NONE,
	1.1 tomoe-0.6.0-multiarch-conflict.patch, NONE, 1.1 tomoe.spec,
	1.25, 1.26
Message-ID: <20090117124630.8A1CD7012B@cvs1.fedora.phx.redhat.com>

Author: dchen

Update of /cvs/pkgs/rpms/tomoe/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16345/devel

Modified Files:
	tomoe.spec 
Added Files:
	import.log tomoe-0.6.0-multiarch-conflict.patch 
Log Message:
Bug 343321


--- NEW FILE import.log ---
tomoe-0_6_0-9_fc10:HEAD:tomoe-0.6.0-9.fc10.src.rpm:1232196134

tomoe-0.6.0-multiarch-conflict.patch:

--- NEW FILE tomoe-0.6.0-multiarch-conflict.patch ---
diff -up ./doc/reference/tomoe-docs.sgml.multiarch-conflict ./doc/reference/tomoe-docs.sgml
--- ./doc/reference/tomoe-docs.sgml.multiarch-conflict	2007-04-10 17:24:20.000000000 +1000
+++ ./doc/reference/tomoe-docs.sgml	2009-01-16 17:54:20.000000000 +1000
@@ -41,6 +41,7 @@
   </chapter>
 
   <index>
+    <anchor id="index_page">
     <title>Index</title>
   </index>
 <!--
diff -up ./lib/tomoe-char.c.multiarch-conflict ./lib/tomoe-char.c
--- ./lib/tomoe-char.c.multiarch-conflict	2007-06-18 11:35:43.000000000 +1000
+++ ./lib/tomoe-char.c	2009-01-16 17:53:58.000000000 +1000
@@ -92,7 +92,7 @@ tomoe_char_class_init (TomoeCharClass *k
     spec = g_param_spec_int ("n_strokes",
                              N_("Number of strokes"),
                              N_("Number of strokes of the character."),
-                             -1, G_MAXINT32, -1,
+                             -2, G_MAXINT32, -1,
                              G_PARAM_READABLE | G_PARAM_WRITABLE);
     g_object_class_install_property (gobject_class, PROP_N_STROKES, spec);
 
diff -up ./lib/tomoe-query.c.multiarch-conflict ./lib/tomoe-query.c
--- ./lib/tomoe-query.c.multiarch-conflict	2007-06-07 17:04:20.000000000 +1000
+++ ./lib/tomoe-query.c	2009-01-16 17:53:58.000000000 +1000
@@ -95,7 +95,7 @@ tomoe_query_class_init (TomoeQueryClass 
                              N_("Minimum number of strokes"),
                              N_("Minimum number of strokes of searched "
                                 "character."),
-                             -1, G_MAXINT32, -1,
+                             -2, G_MAXINT32, -1,
                              G_PARAM_READWRITE);
     g_object_class_install_property (gobject_class, PROP_MIN_N_STROKES, spec);
 
@@ -103,7 +103,7 @@ tomoe_query_class_init (TomoeQueryClass 
                              N_("Maximum number of strokes"),
                              N_("Maximum number of strokes of searched "
                                 "character."),
-                             -1, G_MAXINT32, -1,
+                             -2, G_MAXINT32, -1,
                              G_PARAM_READWRITE);
     g_object_class_install_property (gobject_class, PROP_MAX_N_STROKES, spec);
 


Index: tomoe.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tomoe/devel/tomoe.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- tomoe.spec	30 Nov 2008 00:53:27 -0000	1.25
+++ tomoe.spec	17 Jan 2009 12:46:00 -0000	1.26
@@ -3,16 +3,17 @@
 
 Name:           tomoe
 Version:        0.6.0
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        Handwritten input system for Japanese and Chinese
 
 Group:          System Environment/Libraries
 License:        LGPLv2+
 URL:            http://scim-imengine.sourceforge.jp/
 Source0:        http://downloads.sourceforge.net/sourceforge/tomoe/%{name}-%{version}.tar.gz
+Patch0:         tomoe-0.6.0-multiarch-conflict.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:  glib2-devel, gettext, gtk-doc
-BuildRequires:  perl(XML::Parser), python, pygtk2-codegen
+BuildRequires:  glib2-devel, gettext, gtk-doc, libtool, intltool
+BuildRequires:  perl(XML::Parser), python
 %if %{python_binding}
 BuildRequires:  pygobject2-devel, python-devel, pygtk2-codegen
 %endif
@@ -27,7 +28,7 @@
 
 
 %package devel
-Summary:    tomoe development files
+Summary:    Tomoe development files
 Group:      Development/Libraries
 Requires:   %{name} = %{version}-%{release}
 # for %{_datadir}/gtk-doc/html
@@ -40,9 +41,10 @@
 
 %prep
 %setup -q
-
+%patch0 -p0 -b .multiarch-conflict
 
 %build
+autoreconf -vif
 %configure --disable-static --enable-gtk-doc
 make %{?_smp_mflags}
 
@@ -51,8 +53,9 @@
 make install DESTDIR=$RPM_BUILD_ROOT
 
 %if !%{ruby_binding}
-rm -f $RPM_BUILD_ROOT%{_prefix}/lib/ruby/site_ruby/*/tomoe.rb $RPM_BUILD_ROOT%{_libdir}/ruby/site_ruby/*/*-linux/*
+rm -f $RPM_BUILD_ROOT%{_libdir}/ruby/site_ruby/*/tomoe.rb $RPM_BUILD_ROOT%{_libdir}/ruby/site_ruby/*/*-linux/*
 %endif
+chmod 755 $RPM_BUILD_ROOT%{_datadir}/%{name}/xml2est.rb
 
 # remove .la files
 find ${RPM_BUILD_ROOT}%{_libdir} -name '*.la' | xargs rm
@@ -91,11 +94,18 @@
 %{_datadir}/gtk-doc/html/tomoe
 %{_libdir}/pkgconfig/pytomoe.pc
 %if %{ruby_binding}
-%{_prefix}/lib/ruby/site_ruby/1.8/tomoe.rb
+%{_libdir}/ruby/site_ruby/1.8/tomoe.rb
 %{_libdir}/ruby/site_ruby/1.8/*-linux/*
 %endif
 
 %changelog
+* Fri Jan 16 2009 Ding-Yi Chen <dchen at redhat.com> - 0.6.0-9
+- Fix [Bug 343321] multiarch conflicts in tomoe.
+  Maybe cause by bug in gtk-doc.
+- Also fix the errors from rpmlint:
+  chmod 755 /usr/share/tomoe/xml2est.rb
+  
+
 * Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 0.6.0-8
 - Fix locations for Python 2.6
 



From dchen at fedoraproject.org  Sat Jan 17 12:52:38 2009
From: dchen at fedoraproject.org (Ding-Yi Chen)
Date: Sat, 17 Jan 2009 12:52:38 +0000 (UTC)
Subject: rpms/tomoe/F-10 import.log, NONE,
	1.1 tomoe-0.6.0-multiarch-conflict.patch, NONE, 1.1 tomoe.spec,
	1.23, 1.24
Message-ID: <20090117125238.253B67012B@cvs1.fedora.phx.redhat.com>

Author: dchen

Update of /cvs/pkgs/rpms/tomoe/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16869/F-10

Modified Files:
	tomoe.spec 
Added Files:
	import.log tomoe-0.6.0-multiarch-conflict.patch 
Log Message:
Bug 343321


--- NEW FILE import.log ---
tomoe-0_6_0-9_fc10:F-10:tomoe-0.6.0-9.fc10.src.rpm:1232196692

tomoe-0.6.0-multiarch-conflict.patch:

--- NEW FILE tomoe-0.6.0-multiarch-conflict.patch ---
diff -up ./doc/reference/tomoe-docs.sgml.multiarch-conflict ./doc/reference/tomoe-docs.sgml
--- ./doc/reference/tomoe-docs.sgml.multiarch-conflict	2007-04-10 17:24:20.000000000 +1000
+++ ./doc/reference/tomoe-docs.sgml	2009-01-16 17:54:20.000000000 +1000
@@ -41,6 +41,7 @@
   </chapter>
 
   <index>
+    <anchor id="index_page">
     <title>Index</title>
   </index>
 <!--
diff -up ./lib/tomoe-char.c.multiarch-conflict ./lib/tomoe-char.c
--- ./lib/tomoe-char.c.multiarch-conflict	2007-06-18 11:35:43.000000000 +1000
+++ ./lib/tomoe-char.c	2009-01-16 17:53:58.000000000 +1000
@@ -92,7 +92,7 @@ tomoe_char_class_init (TomoeCharClass *k
     spec = g_param_spec_int ("n_strokes",
                              N_("Number of strokes"),
                              N_("Number of strokes of the character."),
-                             -1, G_MAXINT32, -1,
+                             -2, G_MAXINT32, -1,
                              G_PARAM_READABLE | G_PARAM_WRITABLE);
     g_object_class_install_property (gobject_class, PROP_N_STROKES, spec);
 
diff -up ./lib/tomoe-query.c.multiarch-conflict ./lib/tomoe-query.c
--- ./lib/tomoe-query.c.multiarch-conflict	2007-06-07 17:04:20.000000000 +1000
+++ ./lib/tomoe-query.c	2009-01-16 17:53:58.000000000 +1000
@@ -95,7 +95,7 @@ tomoe_query_class_init (TomoeQueryClass 
                              N_("Minimum number of strokes"),
                              N_("Minimum number of strokes of searched "
                                 "character."),
-                             -1, G_MAXINT32, -1,
+                             -2, G_MAXINT32, -1,
                              G_PARAM_READWRITE);
     g_object_class_install_property (gobject_class, PROP_MIN_N_STROKES, spec);
 
@@ -103,7 +103,7 @@ tomoe_query_class_init (TomoeQueryClass 
                              N_("Maximum number of strokes"),
                              N_("Maximum number of strokes of searched "
                                 "character."),
-                             -1, G_MAXINT32, -1,
+                             -2, G_MAXINT32, -1,
                              G_PARAM_READWRITE);
     g_object_class_install_property (gobject_class, PROP_MAX_N_STROKES, spec);
 


Index: tomoe.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tomoe/F-10/tomoe.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- tomoe.spec	8 Sep 2008 21:22:53 -0000	1.23
+++ tomoe.spec	17 Jan 2009 12:52:07 -0000	1.24
@@ -3,16 +3,17 @@
 
 Name:           tomoe
 Version:        0.6.0
-Release:        6%{?dist}
+Release:        9%{?dist}
 Summary:        Handwritten input system for Japanese and Chinese
 
 Group:          System Environment/Libraries
 License:        LGPLv2+
 URL:            http://scim-imengine.sourceforge.jp/
 Source0:        http://downloads.sourceforge.net/sourceforge/tomoe/%{name}-%{version}.tar.gz
+Patch0:         tomoe-0.6.0-multiarch-conflict.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:  glib2-devel, gettext, gtk-doc
-BuildRequires:  perl(XML::Parser), python, pygtk2-codegen
+BuildRequires:  glib2-devel, gettext, gtk-doc, libtool, intltool
+BuildRequires:  perl(XML::Parser), python
 %if %{python_binding}
 BuildRequires:  pygobject2-devel, python-devel, pygtk2-codegen
 %endif
@@ -27,7 +28,7 @@
 
 
 %package devel
-Summary:    tomoe development files
+Summary:    Tomoe development files
 Group:      Development/Libraries
 Requires:   %{name} = %{version}-%{release}
 # for %{_datadir}/gtk-doc/html
@@ -40,9 +41,10 @@
 
 %prep
 %setup -q
-
+%patch0 -p0 -b .multiarch-conflict
 
 %build
+autoreconf -vif
 %configure --disable-static --enable-gtk-doc
 make %{?_smp_mflags}
 
@@ -51,8 +53,9 @@
 make install DESTDIR=$RPM_BUILD_ROOT
 
 %if !%{ruby_binding}
-rm -f $RPM_BUILD_ROOT%{_prefix}/lib/ruby/site_ruby/*/tomoe.rb $RPM_BUILD_ROOT%{_libdir}/ruby/site_ruby/*/*-linux/*
+rm -f $RPM_BUILD_ROOT%{_libdir}/ruby/site_ruby/*/tomoe.rb $RPM_BUILD_ROOT%{_libdir}/ruby/site_ruby/*/*-linux/*
 %endif
+chmod 755 $RPM_BUILD_ROOT%{_datadir}/%{name}/xml2est.rb
 
 # remove .la files
 find ${RPM_BUILD_ROOT}%{_libdir} -name '*.la' | xargs rm
@@ -75,7 +78,7 @@
 %doc AUTHORS COPYING NEWS README TODO data/kanjidic*.html
 %{_libdir}/libtomoe.so.*
 %if %{python_binding}
-%{_libdir}/python2.5/site-packages/tomoe.so
+%{_libdir}/python?.?/site-packages/tomoe.so
 %endif
 %{_libdir}/tomoe
 %{_datadir}/tomoe
@@ -91,11 +94,24 @@
 %{_datadir}/gtk-doc/html/tomoe
 %{_libdir}/pkgconfig/pytomoe.pc
 %if %{ruby_binding}
-%{_prefix}/lib/ruby/site_ruby/1.8/tomoe.rb
+%{_libdir}/ruby/site_ruby/1.8/tomoe.rb
 %{_libdir}/ruby/site_ruby/1.8/*-linux/*
 %endif
 
 %changelog
+* Fri Jan 16 2009 Ding-Yi Chen <dchen at redhat.com> - 0.6.0-9
+- Fix [Bug 343321] multiarch conflicts in tomoe.
+  Maybe cause by bug in gtk-doc.
+- Also fix the errors from rpmlint:
+  chmod 755 /usr/share/tomoe/xml2est.rb
+  
+
+* Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 0.6.0-8
+- Fix locations for Python 2.6
+
+* Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 0.6.0-7
+- Rebuild for Python 2.6
+
 * Mon Sep  8 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.6.0-6
 - fix license tag
 



From dchen at fedoraproject.org  Sat Jan 17 12:54:37 2009
From: dchen at fedoraproject.org (Ding-Yi Chen)
Date: Sat, 17 Jan 2009 12:54:37 +0000 (UTC)
Subject: rpms/tomoe/F-9 import.log, NONE,
	1.1 tomoe-0.6.0-multiarch-conflict.patch, NONE, 1.1 tomoe.spec,
	1.22, 1.23
Message-ID: <20090117125438.061D47012B@cvs1.fedora.phx.redhat.com>

Author: dchen

Update of /cvs/pkgs/rpms/tomoe/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17127/F-9

Modified Files:
	tomoe.spec 
Added Files:
	import.log tomoe-0.6.0-multiarch-conflict.patch 
Log Message:
Bug 343321


--- NEW FILE import.log ---
tomoe-0_6_0-9_fc10:F-9:tomoe-0.6.0-9.fc10.src.rpm:1232196797

tomoe-0.6.0-multiarch-conflict.patch:

--- NEW FILE tomoe-0.6.0-multiarch-conflict.patch ---
diff -up ./doc/reference/tomoe-docs.sgml.multiarch-conflict ./doc/reference/tomoe-docs.sgml
--- ./doc/reference/tomoe-docs.sgml.multiarch-conflict	2007-04-10 17:24:20.000000000 +1000
+++ ./doc/reference/tomoe-docs.sgml	2009-01-16 17:54:20.000000000 +1000
@@ -41,6 +41,7 @@
   </chapter>
 
   <index>
+    <anchor id="index_page">
     <title>Index</title>
   </index>
 <!--
diff -up ./lib/tomoe-char.c.multiarch-conflict ./lib/tomoe-char.c
--- ./lib/tomoe-char.c.multiarch-conflict	2007-06-18 11:35:43.000000000 +1000
+++ ./lib/tomoe-char.c	2009-01-16 17:53:58.000000000 +1000
@@ -92,7 +92,7 @@ tomoe_char_class_init (TomoeCharClass *k
     spec = g_param_spec_int ("n_strokes",
                              N_("Number of strokes"),
                              N_("Number of strokes of the character."),
-                             -1, G_MAXINT32, -1,
+                             -2, G_MAXINT32, -1,
                              G_PARAM_READABLE | G_PARAM_WRITABLE);
     g_object_class_install_property (gobject_class, PROP_N_STROKES, spec);
 
diff -up ./lib/tomoe-query.c.multiarch-conflict ./lib/tomoe-query.c
--- ./lib/tomoe-query.c.multiarch-conflict	2007-06-07 17:04:20.000000000 +1000
+++ ./lib/tomoe-query.c	2009-01-16 17:53:58.000000000 +1000
@@ -95,7 +95,7 @@ tomoe_query_class_init (TomoeQueryClass 
                              N_("Minimum number of strokes"),
                              N_("Minimum number of strokes of searched "
                                 "character."),
-                             -1, G_MAXINT32, -1,
+                             -2, G_MAXINT32, -1,
                              G_PARAM_READWRITE);
     g_object_class_install_property (gobject_class, PROP_MIN_N_STROKES, spec);
 
@@ -103,7 +103,7 @@ tomoe_query_class_init (TomoeQueryClass 
                              N_("Maximum number of strokes"),
                              N_("Maximum number of strokes of searched "
                                 "character."),
-                             -1, G_MAXINT32, -1,
+                             -2, G_MAXINT32, -1,
                              G_PARAM_READWRITE);
     g_object_class_install_property (gobject_class, PROP_MAX_N_STROKES, spec);
 


Index: tomoe.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tomoe/F-9/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	17 Jan 2009 12:54:07 -0000	1.23
@@ -3,16 +3,17 @@
 
 Name:           tomoe
 Version:        0.6.0
-Release:        5%{?dist}
+Release:        9%{?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
+Patch0:         tomoe-0.6.0-multiarch-conflict.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:  glib2-devel, gettext, gtk-doc
-BuildRequires:  perl(XML::Parser), python, pygtk2-codegen
+BuildRequires:  glib2-devel, gettext, gtk-doc, libtool, intltool
+BuildRequires:  perl(XML::Parser), python
 %if %{python_binding}
 BuildRequires:  pygobject2-devel, python-devel, pygtk2-codegen
 %endif
@@ -27,7 +28,7 @@
 
 
 %package devel
-Summary:    tomoe development files
+Summary:    Tomoe development files
 Group:      Development/Libraries
 Requires:   %{name} = %{version}-%{release}
 # for %{_datadir}/gtk-doc/html
@@ -40,9 +41,10 @@
 
 %prep
 %setup -q
-
+%patch0 -p0 -b .multiarch-conflict
 
 %build
+autoreconf -vif
 %configure --disable-static --enable-gtk-doc
 make %{?_smp_mflags}
 
@@ -51,8 +53,9 @@
 make install DESTDIR=$RPM_BUILD_ROOT
 
 %if !%{ruby_binding}
-rm -f $RPM_BUILD_ROOT%{_prefix}/lib/ruby/site_ruby/*/tomoe.rb $RPM_BUILD_ROOT%{_libdir}/ruby/site_ruby/*/*-linux/*
+rm -f $RPM_BUILD_ROOT%{_libdir}/ruby/site_ruby/*/tomoe.rb $RPM_BUILD_ROOT%{_libdir}/ruby/site_ruby/*/*-linux/*
 %endif
+chmod 755 $RPM_BUILD_ROOT%{_datadir}/%{name}/xml2est.rb
 
 # remove .la files
 find ${RPM_BUILD_ROOT}%{_libdir} -name '*.la' | xargs rm
@@ -75,7 +78,7 @@
 %doc AUTHORS COPYING NEWS README TODO data/kanjidic*.html
 %{_libdir}/libtomoe.so.*
 %if %{python_binding}
-%{_libdir}/python2.5/site-packages/tomoe.so
+%{_libdir}/python?.?/site-packages/tomoe.so
 %endif
 %{_libdir}/tomoe
 %{_datadir}/tomoe
@@ -91,11 +94,27 @@
 %{_datadir}/gtk-doc/html/tomoe
 %{_libdir}/pkgconfig/pytomoe.pc
 %if %{ruby_binding}
-%{_prefix}/lib/ruby/site_ruby/1.8/tomoe.rb
+%{_libdir}/ruby/site_ruby/1.8/tomoe.rb
 %{_libdir}/ruby/site_ruby/1.8/*-linux/*
 %endif
 
 %changelog
+* Fri Jan 16 2009 Ding-Yi Chen <dchen at redhat.com> - 0.6.0-9
+- Fix [Bug 343321] multiarch conflicts in tomoe.
+  Maybe cause by bug in gtk-doc.
+- Also fix the errors from rpmlint:
+  chmod 755 /usr/share/tomoe/xml2est.rb
+  
+
+* Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 0.6.0-8
+- Fix locations for Python 2.6
+
+* Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 0.6.0-7
+- Rebuild for Python 2.6
+
+* 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 mcpierce at fedoraproject.org  Sat Jan 17 13:11:12 2009
From: mcpierce at fedoraproject.org (Darryl L. Pierce)
Date: Sat, 17 Jan 2009 13:11:12 +0000 (UTC)
Subject: rpms/rubygem-tlsmail/devel .cvsignore,1.1,1.2 sources,1.1,1.2
Message-ID: <20090117131112.219037012B@cvs1.fedora.phx.redhat.com>

Author: mcpierce

Update of /cvs/pkgs/rpms/rubygem-tlsmail/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18786

Modified Files:
	.cvsignore sources 
Log Message:
First official release of tlsmail to Fedora.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-tlsmail/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	17 Jan 2009 03:18:56 -0000	1.1
+++ .cvsignore	17 Jan 2009 13:10:41 -0000	1.2
@@ -0,0 +1 @@
+tlsmail-0.0.1.gem


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-tlsmail/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	17 Jan 2009 03:18:56 -0000	1.1
+++ sources	17 Jan 2009 13:10:41 -0000	1.2
@@ -0,0 +1 @@
+5f5e3e29f929013d1f64a3b930cdff39  tlsmail-0.0.1.gem



From mcpierce at fedoraproject.org  Sat Jan 17 13:13:46 2009
From: mcpierce at fedoraproject.org (Darryl L. Pierce)
Date: Sat, 17 Jan 2009 13:13:46 +0000 (UTC)
Subject: rpms/rubygem-tlsmail/devel rubygem-tlsmail.spec,NONE,1.1
Message-ID: <20090117131346.B02707012B@cvs1.fedora.phx.redhat.com>

Author: mcpierce

Update of /cvs/pkgs/rpms/rubygem-tlsmail/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19168

Added Files:
	rubygem-tlsmail.spec 
Log Message:
Forgot to check in the spec file.



--- NEW FILE rubygem-tlsmail.spec ---
# Generated from tlsmail-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 tlsmail
%define geminstdir %{gemdir}/gems/%{gemname}-%{version}
%define gemdocsdir %{gemdir}/doc/%{gemname}-%{version}
%define installroot %{buildroot}%{geminstdir}

Summary: 	This library enables pop or smtp via ssl/tls
Name: 		rubygem-%{gemname}
Version: 	0.0.1
Release: 	6%{?dist}
Group: 		Development/Languages
License: 	Public Domain
URL: 		http://tlsmail.rubyforge.org
Source0: 	http://gems.rubyforge.org/gems/%{gemname}-%{version}.gem
BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: 	rubygems
Requires:       ruby(abi) = 1.8
BuildRequires: 	rubygems
BuildArch: 	noarch
Provides: 	rubygem(%{gemname}) = %{version}

%description
This library enables pop or smtp via ssl/tls by dynamically replacing these
classes to these in ruby 1.9.


%prep

%build

%install
rm -rf %{buildroot}
mkdir -p %{buildroot}%{gemdir}
gem install --local --install-dir %{buildroot}%{gemdir} \
            --force --rdoc %{SOURCE0}
rm -f %{installroot}/CHANGELOG.txt

for file in \
%{buildroot}%{gemdocsdir}/ri/Net/POP3/POPMail/pop-i.yaml \
%{buildroot}%{gemdocsdir}/ri/Net/POP3/delete_all-i.yaml \
%{buildroot}%{gemdocsdir}/ri/Net/POP3/each_mail-i.yaml \
%{buildroot}%{gemdocsdir}/ri/Net/POP3/foreach-c.yaml \
%{buildroot}%{gemdocsdir}/ri/Net/POP3/start-c.yaml \
%{buildroot}%{gemdocsdir}/ri/Net/POP3/start-i.yaml \
%{buildroot}%{gemdocsdir}/ri/Net/SMTP/open_message_stream-i.yaml \
%{buildroot}%{gemdocsdir}/ri/Net/SMTP/start-c.yaml \
%{buildroot}%{gemdocsdir}/ri/Net/SMTP/start-i.yaml \
%{buildroot}%{geminstdir}/README.txt \
%{buildroot}%{geminstdir}/Manifest.txt \
%{buildroot}%{geminstdir}/Rakefile \
%{buildroot}%{geminstdir}/lib/net/pop.rb \
%{buildroot}%{geminstdir}/lib/net/smtp.rb \
%{buildroot}%{geminstdir}/lib/tlsmail.rb \
%{buildroot}%{geminstdir}/test/test_helper.rb \
%{buildroot}%{geminstdir}/test/tlsmail_test.rb; do
    cat $file | sed 's/\r//' > ${file}.tmp
    rm -f ${file}
    mv ${file}.tmp $file
done

%clean
rm -rf %{buildroot}

%files
%defattr(-, root, root, -)
%dir %{geminstdir}
%doc %{gemdocsdir}
%doc %{geminstdir}/Manifest.txt
%doc %{geminstdir}/Rakefile
%doc %{geminstdir}/README.txt
%{geminstdir}/*/
%{gemdir}/cache/%{gemname}-%{version}.gem
%{gemdir}/specifications/%{gemname}-%{version}.gemspec


%changelog
* Sat Jan 17 2009 Darryl Pierce <dpierce at redhat.com> - 0.0.1-6
- First official build for Fedora.

* Fri Jan 16 2009 Darryl Pierce <dpierce at redhat.com> - 0.0.1-5
- Final changes per package review.
- Remarked

* Thu Jan 15 2009 Darryl Pierce <dpierce at redhat.com> - 0.0.1-4
- Changes per review.
- Fixed CRLF issues with contained files.

* Thu Jan 15 2009 Darryl Pierce <dpierce at redhat.com> - 0.0.1-3
- Removed all CRLF instances.

* Mon Jan 05 2009 Darryl Pierce <dpierce at redhat.com> - 0.0.1-2
- Fixed Requires to include ruby(abi)
- Added README.txt to %%doc

* Sat Dec 13 2008 Darryl Pierce <dpierce at redhat.com> - 0.0.1-1
- Initial package creation for Fedora.



From bpepple at fedoraproject.org  Sat Jan 17 13:14:12 2009
From: bpepple at fedoraproject.org (Brian Pepple)
Date: Sat, 17 Jan 2009 13:14:12 +0000 (UTC)
Subject: rpms/gwibber/devel gwibber.spec,1.10,1.11
Message-ID: <20090117131412.730387012B@cvs1.fedora.phx.redhat.com>

Author: bpepple

Update of /cvs/pkgs/rpms/gwibber/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19226

Modified Files:
	gwibber.spec 
Log Message:
* Sat Jan 17 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.7.2-5.165bzr%{?dist}
- Enable spell checking by adding missing requires on python-sexy.



Index: gwibber.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gwibber/devel/gwibber.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- gwibber.spec	15 Jan 2009 01:58:01 -0000	1.10
+++ gwibber.spec	17 Jan 2009 13:13:42 -0000	1.11
@@ -4,7 +4,7 @@
 
 Name:           gwibber
 Version:        0.7.2
-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
@@ -18,9 +18,12 @@
 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 mx python-feedparser pyxdg python-imaging
-Requires:       python-simplejson >= 1.9.1
 BuildRequires:  python-devel desktop-file-utils
+
+Requires:       python pygtk2 dbus-python gnome-python2-gconf PyXML
+Requires:       pywebkitgtk mx python-feedparser pyxdg python-imaging
+Requires:       python-sexy python-simplejson >= 1.9.1
+
 BuildArch:      noarch
 
 %description
@@ -59,6 +62,9 @@
 
 
 %changelog
+* Sat Jan 17 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.7.2-5.165bzr%{?dist}
+- Enable spell checking by adding missing requires on python-sexy.
+
 * Wed Jan 14 2009 Ian Weller <ianweller at gmail.com> 0.7.2-4.165bzr
 - Add python-imaging to Requires
 



From mcpierce at fedoraproject.org  Sat Jan 17 13:15:07 2009
From: mcpierce at fedoraproject.org (Darryl L. Pierce)
Date: Sat, 17 Jan 2009 13:15:07 +0000 (UTC)
Subject: rpms/rubygem-tlsmail/devel rubygem-tlsmail.spec,1.1,1.2
Message-ID: <20090117131507.E2CC17012B@cvs1.fedora.phx.redhat.com>

Author: mcpierce

Update of /cvs/pkgs/rpms/rubygem-tlsmail/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19362

Modified Files:
	rubygem-tlsmail.spec 
Log Message:
Release #7 contains the spec file.



Index: rubygem-tlsmail.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-tlsmail/devel/rubygem-tlsmail.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- rubygem-tlsmail.spec	17 Jan 2009 13:13:46 -0000	1.1
+++ rubygem-tlsmail.spec	17 Jan 2009 13:14:37 -0000	1.2
@@ -9,7 +9,7 @@
 Summary: 	This library enables pop or smtp via ssl/tls
 Name: 		rubygem-%{gemname}
 Version: 	0.0.1
-Release: 	6%{?dist}
+Release: 	7%{?dist}
 Group: 		Development/Languages
 License: 	Public Domain
 URL: 		http://tlsmail.rubyforge.org
@@ -76,7 +76,7 @@
 
 
 %changelog
-* Sat Jan 17 2009 Darryl Pierce <dpierce at redhat.com> - 0.0.1-6
+* Sat Jan 17 2009 Darryl Pierce <dpierce at redhat.com> - 0.0.1-7
 - First official build for Fedora.
 
 * Fri Jan 16 2009 Darryl Pierce <dpierce at redhat.com> - 0.0.1-5



From mclasen at fedoraproject.org  Sat Jan 17 12:50:00 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Sat, 17 Jan 2009 12:50:00 +0000 (UTC)
Subject: comps comps-f11.xml.in,1.62,1.63
Message-ID: <20090117125000.D79027012B@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16607

Modified Files:
	comps-f11.xml.in 
Log Message:
make bluez-alsa optional



Index: comps-f11.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f11.xml.in,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- comps-f11.xml.in	16 Jan 2009 22:43:31 -0000	1.62
+++ comps-f11.xml.in	17 Jan 2009 12:49:30 -0000	1.63
@@ -4165,7 +4165,6 @@
       <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-alsa</packagereq>
       <packagereq type="default">cdparanoia</packagereq>
       <packagereq type="default">genisoimage</packagereq>
       <packagereq type="default">gstreamer-plugins-good</packagereq>
@@ -4192,6 +4191,7 @@
       <packagereq type="optional">audacity</packagereq>
       <packagereq type="optional">aumix</packagereq>
       <packagereq type="optional">banshee</packagereq>
+      <packagereq type="optional">bluez-alsa</packagereq>
       <packagereq type="optional">bmpx</packagereq>
       <packagereq type="optional">brasero</packagereq>
       <packagereq type="optional">camE</packagereq>



From bpepple at fedoraproject.org  Sat Jan 17 13:18:17 2009
From: bpepple at fedoraproject.org (Brian Pepple)
Date: Sat, 17 Jan 2009 13:18:17 +0000 (UTC)
Subject: rpms/gwibber/F-10 gwibber.spec,1.9,1.10
Message-ID: <20090117131817.44E7A7012B@cvs1.fedora.phx.redhat.com>

Author: bpepple

Update of /cvs/pkgs/rpms/gwibber/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19919

Modified Files:
	gwibber.spec 
Log Message:
* Sat Jan 17 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.7.2-5.165bzr
- Enable spell checking by adding missing requires on python-sexy.



Index: gwibber.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gwibber/F-10/gwibber.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- gwibber.spec	15 Jan 2009 01:58:00 -0000	1.9
+++ gwibber.spec	17 Jan 2009 13:17:46 -0000	1.10
@@ -4,7 +4,7 @@
 
 Name:           gwibber
 Version:        0.7.2
-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
@@ -18,9 +18,12 @@
 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 mx python-feedparser pyxdg python-imaging
-Requires:       python-simplejson >= 1.9.1
 BuildRequires:  python-devel desktop-file-utils
+
+Requires:       python pygtk2 dbus-python gnome-python2-gconf PyXML
+Requires:       pywebkitgtk mx python-feedparser pyxdg python-imaging
+Requires:       python-sexy python-simplejson >= 1.9.1
+
 BuildArch:      noarch
 
 %description
@@ -59,6 +62,9 @@
 
 
 %changelog
+* Sat Jan 17 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.7.2-5.165bzr
+- Enable spell checking by adding missing requires on python-sexy.
+
 * Wed Jan 14 2009 Ian Weller <ianweller at gmail.com> 0.7.2-4.165bzr
 - Add python-imaging to Requires
 



From robert at fedoraproject.org  Sat Jan 17 13:20:43 2009
From: robert at fedoraproject.org (Robert Scheck)
Date: Sat, 17 Jan 2009 13:20:43 +0000 (UTC)
Subject: rpms/ethtool/F-9 ethtool-6-help_usage.patch, NONE,
	1.1 ethtool-6-man_pages.patch, NONE, 1.1 .cvsignore, 1.10,
	1.11 ethtool.spec, 1.19, 1.20 sources, 1.10, 1.11
Message-ID: <20090117132043.A79A77012B@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/pkgs/rpms/ethtool/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20093/F-9

Modified Files:
	.cvsignore ethtool.spec sources 
Added Files:
	ethtool-6-help_usage.patch ethtool-6-man_pages.patch 
Log Message:
- Changes to match with Fedora Packaging Guidelines (#225735)
- Upgrade to GIT 20090115 (#225735, #477498)
- Removed bogus stated need of DEVNAME in -h/--help (#472038)
- Removed completely needless INSTALL file from %doc (#472034)


ethtool-6-help_usage.patch:

--- NEW FILE ethtool-6-help_usage.patch ---
Patch by Robert Scheck <robert at fedoraproject.org> for ethtool >= 6, which removes
the bogus -h/--help usage stating, that DEVNAME is required for help. For further
information, please have a look to Red Hat Bugzilla ID #472038.

--- ethtool-6/ethtool.c				2009-01-15 23:14:44.000000000 +0100
+++ ethtool-6/ethtool.c.help_usage		2009-01-15 23:59:20.000000000 +0100
@@ -201,8 +201,9 @@
 		"Usage:\n"
 		"ethtool DEVNAME\tDisplay standard information about device\n");
 	for (i = 0; args[i].srt; i++) {
-		fprintf(stderr, "        ethtool %s|%s DEVNAME\t%s\n%s",
+		fprintf(stderr, "        ethtool %s|%s %s\t%s\n%s",
 			args[i].srt, args[i].lng,
+			strstr(args[i].srt, "-h") ? "\t" : "DEVNAME",
 			args[i].help,
 			args[i].opthelp ? args[i].opthelp : "");
 	}

ethtool-6-man_pages.patch:

--- NEW FILE ethtool-6-man_pages.patch ---
Patch by Ben Hutchings <ben at decadent.org.uk> for ethtool >= 6, which fixes the
wrong long name for the -p option in the man page (correct --identify rather the
wrong --blink). And it removes some typos in man page. For further information,
please have a look to Debian bug IDs #488067 and #506225).

--- ethtool-6/ethtool.8				2008-09-14 04:12:31.000000000 +0200
+++ ethtool-6/ethtool.8.man_pages		2009-01-15 23:44:38.000000000 +0100
@@ -158,7 +158,7 @@
 .B ethtool \-k|\-\-show\-offload
 .I ethX
 
-.B ethtool \-K\-\-offload
+.B ethtool \-K|\-\-offload
 .I ethX
 .B2 rx on off
 .B2 tx on off
@@ -167,9 +167,9 @@
 .B2 ufo on off
 .B2 gso on off
 
-.B ethtool \-p|\-\-blink
+.B ethtool \-p|\-\-identify
 .I ethX
-.IR [ N ]
+.RI [ N ]
 
 .B ethtool \-r|\-\-negotiate
 .I ethX


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ethtool/F-9/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	12 Mar 2008 15:47:32 -0000	1.10
+++ .cvsignore	17 Jan 2009 13:20:13 -0000	1.11
@@ -1 +1,2 @@
 ethtool-6.tar.gz
+gpl-2.0.txt


Index: ethtool.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ethtool/F-9/ethtool.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- ethtool.spec	12 Mar 2008 15:47:32 -0000	1.19
+++ ethtool.spec	17 Jan 2009 13:20:13 -0000	1.20
@@ -1,44 +1,74 @@
-Summary: Ethernet settings tool for PCI ethernet cards
-Name: ethtool
-Version: 6
-Release: 1%{?dist}
-License: GPL+
-Group: Applications/System
-URL: http://sourceforge.net/projects/gkernel/
-Source0: http://download.sourceforge.net/gkernel/%{name}-%{version}.tar.gz
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-
-%define _sbindir	/sbin
+Summary:	Ethernet settings tool for PCI ethernet cards
+Name:		ethtool
+Version:	6
+Release:	2.20090115git%{?dist}
+License:	GPLv2
+Group:		Applications/System
+URL:		http://sourceforge.net/projects/gkernel/
+# When using tarball from released upstream version:
+# - http://downloads.sourceforge.net/gkernel/%{name}-%{version}.tar.gz
+#
+# When generating tarball package from upstream git:
+# - git clone git://git.kernel.org/pub/scm/network/ethtool/ethtool.git ethtool-6
+# - cd ethtool-6; git checkout 2c4bd1c0c4d8112c16f9143da69c03d02ac3b1ae
+# - cp -f ChangeLog ChangeLog.old; git log > ChangeLog.git
+# - rm -rf .git; cd ..; tar cvfz ethtool-6.tar.gz ethtool-6
+# - Use the visible date of latest git log entry for %{release} in spec file
+Source0:	%{name}-%{version}.tar.gz
+Source1:	http://www.gnu.org/licenses/gpl-2.0.txt
+Patch0:		ethtool-6-man_pages.patch
+Patch1:		ethtool-6-help_usage.patch
+BuildRequires:	automake, autoconf
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
-This utility allows querying and changing of ethernet
-card settings, such as speed, port, autonegotiation,
-and PCI locations.
+This utility allows querying and changing settings such as speed,
+port, autonegotiation, PCI locations and checksum offload on many
+network devices, especially of ethernet devices.
 
 %prep
 %setup -q
+%patch0 -p1 -b .man_pages
+%patch1 -p1 -b .help_usage
+
+# Only needed when using upstream git
+aclocal
+autoheader
+automake --gnu --add-missing --copy
+autoconf
+
+# Replace GPLvX from automake by GPLv2
+cp -f %{SOURCE1} COPYING
 
 %build
-%configure
-make
+%configure --sbindir=/sbin
+make %{?_smp_mflags}
 
 %install
-rm -rf %{buildroot}
-%makeinstall
-mkdir -p %{buildroot}/usr/sbin
-ln -s /sbin/ethtool %{buildroot}/usr/sbin
+rm -rf $RPM_BUILD_ROOT
+make DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p' install
+
+# Some legacy support for scripts etc. out there
+mkdir -p $RPM_BUILD_ROOT%{_sbindir}
+ln -sf ../../sbin/%{name} $RPM_BUILD_ROOT%{_sbindir}/%{name}
 
 %clean
-rm -rf %{buildroot}
+rm -rf $RPM_BUILD_ROOT
 
 %files
-%defattr(-,root,root)
-%doc AUTHORS ChangeLog COPYING INSTALL NEWS README
-/sbin/ethtool
-/usr/sbin/ethtool
-%{_mandir}/man8/ethtool.*
+%defattr(-,root,root,-)
+%doc AUTHORS ChangeLog.* COPYING LICENSE NEWS README
+/sbin/%{name}
+%{_sbindir}/%{name}
+%{_mandir}/man8/%{name}.8*
 
 %changelog
+* Sat Jan 17 2009 Robert Scheck <robert at fedoraproject.org> 6-2.20090115git
+- Changes to match with Fedora Packaging Guidelines (#225735)
+- Upgrade to GIT 20090115 (#225735, #477498)
+- Removed bogus stated need of DEVNAME in -h/--help (#472038)
+- Removed completely needless INSTALL file from %%doc (#472034)
+
 * Wed Mar 12 2008 Tom "spot" Callaway <tcallawa at redhat.com> 6-1
 - Upgrade to ethtool version 6
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ethtool/F-9/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	12 Mar 2008 15:47:32 -0000	1.10
+++ sources	17 Jan 2009 13:20:13 -0000	1.11
@@ -1 +1,2 @@
-3b721ec27f17ebf320ba8c505cf66d9c  ethtool-6.tar.gz
+462e8eb1a18a05007e183ebeed65bfd5  ethtool-6.tar.gz
+751419260aa954499f7abaabaa882bbe  gpl-2.0.txt



From robert at fedoraproject.org  Sat Jan 17 13:20:43 2009
From: robert at fedoraproject.org (Robert Scheck)
Date: Sat, 17 Jan 2009 13:20:43 +0000 (UTC)
Subject: rpms/ethtool/F-10 ethtool-6-help_usage.patch, NONE,
	1.1 ethtool-6-man_pages.patch, NONE, 1.1 .cvsignore, 1.10,
	1.11 ethtool.spec, 1.19, 1.20 sources, 1.10, 1.11
Message-ID: <20090117132043.7BDA57012B@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/pkgs/rpms/ethtool/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20093/F-10

Modified Files:
	.cvsignore ethtool.spec sources 
Added Files:
	ethtool-6-help_usage.patch ethtool-6-man_pages.patch 
Log Message:
- Changes to match with Fedora Packaging Guidelines (#225735)
- Upgrade to GIT 20090115 (#225735, #477498)
- Removed bogus stated need of DEVNAME in -h/--help (#472038)
- Removed completely needless INSTALL file from %doc (#472034)


ethtool-6-help_usage.patch:

--- NEW FILE ethtool-6-help_usage.patch ---
Patch by Robert Scheck <robert at fedoraproject.org> for ethtool >= 6, which removes
the bogus -h/--help usage stating, that DEVNAME is required for help. For further
information, please have a look to Red Hat Bugzilla ID #472038.

--- ethtool-6/ethtool.c				2009-01-15 23:14:44.000000000 +0100
+++ ethtool-6/ethtool.c.help_usage		2009-01-15 23:59:20.000000000 +0100
@@ -201,8 +201,9 @@
 		"Usage:\n"
 		"ethtool DEVNAME\tDisplay standard information about device\n");
 	for (i = 0; args[i].srt; i++) {
-		fprintf(stderr, "        ethtool %s|%s DEVNAME\t%s\n%s",
+		fprintf(stderr, "        ethtool %s|%s %s\t%s\n%s",
 			args[i].srt, args[i].lng,
+			strstr(args[i].srt, "-h") ? "\t" : "DEVNAME",
 			args[i].help,
 			args[i].opthelp ? args[i].opthelp : "");
 	}

ethtool-6-man_pages.patch:

--- NEW FILE ethtool-6-man_pages.patch ---
Patch by Ben Hutchings <ben at decadent.org.uk> for ethtool >= 6, which fixes the
wrong long name for the -p option in the man page (correct --identify rather the
wrong --blink). And it removes some typos in man page. For further information,
please have a look to Debian bug IDs #488067 and #506225).

--- ethtool-6/ethtool.8				2008-09-14 04:12:31.000000000 +0200
+++ ethtool-6/ethtool.8.man_pages		2009-01-15 23:44:38.000000000 +0100
@@ -158,7 +158,7 @@
 .B ethtool \-k|\-\-show\-offload
 .I ethX
 
-.B ethtool \-K\-\-offload
+.B ethtool \-K|\-\-offload
 .I ethX
 .B2 rx on off
 .B2 tx on off
@@ -167,9 +167,9 @@
 .B2 ufo on off
 .B2 gso on off
 
-.B ethtool \-p|\-\-blink
+.B ethtool \-p|\-\-identify
 .I ethX
-.IR [ N ]
+.RI [ N ]
 
 .B ethtool \-r|\-\-negotiate
 .I ethX


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ethtool/F-10/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	12 Mar 2008 15:47:32 -0000	1.10
+++ .cvsignore	17 Jan 2009 13:20:13 -0000	1.11
@@ -1 +1,2 @@
 ethtool-6.tar.gz
+gpl-2.0.txt


Index: ethtool.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ethtool/F-10/ethtool.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- ethtool.spec	12 Mar 2008 15:47:32 -0000	1.19
+++ ethtool.spec	17 Jan 2009 13:20:13 -0000	1.20
@@ -1,44 +1,74 @@
-Summary: Ethernet settings tool for PCI ethernet cards
-Name: ethtool
-Version: 6
-Release: 1%{?dist}
-License: GPL+
-Group: Applications/System
-URL: http://sourceforge.net/projects/gkernel/
-Source0: http://download.sourceforge.net/gkernel/%{name}-%{version}.tar.gz
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-
-%define _sbindir	/sbin
+Summary:	Ethernet settings tool for PCI ethernet cards
+Name:		ethtool
+Version:	6
+Release:	2.20090115git%{?dist}
+License:	GPLv2
+Group:		Applications/System
+URL:		http://sourceforge.net/projects/gkernel/
+# When using tarball from released upstream version:
+# - http://downloads.sourceforge.net/gkernel/%{name}-%{version}.tar.gz
+#
+# When generating tarball package from upstream git:
+# - git clone git://git.kernel.org/pub/scm/network/ethtool/ethtool.git ethtool-6
+# - cd ethtool-6; git checkout 2c4bd1c0c4d8112c16f9143da69c03d02ac3b1ae
+# - cp -f ChangeLog ChangeLog.old; git log > ChangeLog.git
+# - rm -rf .git; cd ..; tar cvfz ethtool-6.tar.gz ethtool-6
+# - Use the visible date of latest git log entry for %{release} in spec file
+Source0:	%{name}-%{version}.tar.gz
+Source1:	http://www.gnu.org/licenses/gpl-2.0.txt
+Patch0:		ethtool-6-man_pages.patch
+Patch1:		ethtool-6-help_usage.patch
+BuildRequires:	automake, autoconf
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
-This utility allows querying and changing of ethernet
-card settings, such as speed, port, autonegotiation,
-and PCI locations.
+This utility allows querying and changing settings such as speed,
+port, autonegotiation, PCI locations and checksum offload on many
+network devices, especially of ethernet devices.
 
 %prep
 %setup -q
+%patch0 -p1 -b .man_pages
+%patch1 -p1 -b .help_usage
+
+# Only needed when using upstream git
+aclocal
+autoheader
+automake --gnu --add-missing --copy
+autoconf
+
+# Replace GPLvX from automake by GPLv2
+cp -f %{SOURCE1} COPYING
 
 %build
-%configure
-make
+%configure --sbindir=/sbin
+make %{?_smp_mflags}
 
 %install
-rm -rf %{buildroot}
-%makeinstall
-mkdir -p %{buildroot}/usr/sbin
-ln -s /sbin/ethtool %{buildroot}/usr/sbin
+rm -rf $RPM_BUILD_ROOT
+make DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p' install
+
+# Some legacy support for scripts etc. out there
+mkdir -p $RPM_BUILD_ROOT%{_sbindir}
+ln -sf ../../sbin/%{name} $RPM_BUILD_ROOT%{_sbindir}/%{name}
 
 %clean
-rm -rf %{buildroot}
+rm -rf $RPM_BUILD_ROOT
 
 %files
-%defattr(-,root,root)
-%doc AUTHORS ChangeLog COPYING INSTALL NEWS README
-/sbin/ethtool
-/usr/sbin/ethtool
-%{_mandir}/man8/ethtool.*
+%defattr(-,root,root,-)
+%doc AUTHORS ChangeLog.* COPYING LICENSE NEWS README
+/sbin/%{name}
+%{_sbindir}/%{name}
+%{_mandir}/man8/%{name}.8*
 
 %changelog
+* Sat Jan 17 2009 Robert Scheck <robert at fedoraproject.org> 6-2.20090115git
+- Changes to match with Fedora Packaging Guidelines (#225735)
+- Upgrade to GIT 20090115 (#225735, #477498)
+- Removed bogus stated need of DEVNAME in -h/--help (#472038)
+- Removed completely needless INSTALL file from %%doc (#472034)
+
 * Wed Mar 12 2008 Tom "spot" Callaway <tcallawa at redhat.com> 6-1
 - Upgrade to ethtool version 6
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ethtool/F-10/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	12 Mar 2008 15:47:32 -0000	1.10
+++ sources	17 Jan 2009 13:20:13 -0000	1.11
@@ -1 +1,2 @@
-3b721ec27f17ebf320ba8c505cf66d9c  ethtool-6.tar.gz
+462e8eb1a18a05007e183ebeed65bfd5  ethtool-6.tar.gz
+751419260aa954499f7abaabaa882bbe  gpl-2.0.txt



From robert at fedoraproject.org  Sat Jan 17 13:20:43 2009
From: robert at fedoraproject.org (Robert Scheck)
Date: Sat, 17 Jan 2009 13:20:43 +0000 (UTC)
Subject: rpms/ethtool/devel ethtool-6-help_usage.patch, NONE,
	1.1 ethtool-6-man_pages.patch, NONE, 1.1 .cvsignore, 1.10,
	1.11 ethtool.spec, 1.19, 1.20 sources, 1.10, 1.11
Message-ID: <20090117132043.EEB117012B@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/pkgs/rpms/ethtool/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20093/devel

Modified Files:
	.cvsignore ethtool.spec sources 
Added Files:
	ethtool-6-help_usage.patch ethtool-6-man_pages.patch 
Log Message:
- Changes to match with Fedora Packaging Guidelines (#225735)
- Upgrade to GIT 20090115 (#225735, #477498)
- Removed bogus stated need of DEVNAME in -h/--help (#472038)
- Removed completely needless INSTALL file from %doc (#472034)


ethtool-6-help_usage.patch:

--- NEW FILE ethtool-6-help_usage.patch ---
Patch by Robert Scheck <robert at fedoraproject.org> for ethtool >= 6, which removes
the bogus -h/--help usage stating, that DEVNAME is required for help. For further
information, please have a look to Red Hat Bugzilla ID #472038.

--- ethtool-6/ethtool.c				2009-01-15 23:14:44.000000000 +0100
+++ ethtool-6/ethtool.c.help_usage		2009-01-15 23:59:20.000000000 +0100
@@ -201,8 +201,9 @@
 		"Usage:\n"
 		"ethtool DEVNAME\tDisplay standard information about device\n");
 	for (i = 0; args[i].srt; i++) {
-		fprintf(stderr, "        ethtool %s|%s DEVNAME\t%s\n%s",
+		fprintf(stderr, "        ethtool %s|%s %s\t%s\n%s",
 			args[i].srt, args[i].lng,
+			strstr(args[i].srt, "-h") ? "\t" : "DEVNAME",
 			args[i].help,
 			args[i].opthelp ? args[i].opthelp : "");
 	}

ethtool-6-man_pages.patch:

--- NEW FILE ethtool-6-man_pages.patch ---
Patch by Ben Hutchings <ben at decadent.org.uk> for ethtool >= 6, which fixes the
wrong long name for the -p option in the man page (correct --identify rather the
wrong --blink). And it removes some typos in man page. For further information,
please have a look to Debian bug IDs #488067 and #506225).

--- ethtool-6/ethtool.8				2008-09-14 04:12:31.000000000 +0200
+++ ethtool-6/ethtool.8.man_pages		2009-01-15 23:44:38.000000000 +0100
@@ -158,7 +158,7 @@
 .B ethtool \-k|\-\-show\-offload
 .I ethX
 
-.B ethtool \-K\-\-offload
+.B ethtool \-K|\-\-offload
 .I ethX
 .B2 rx on off
 .B2 tx on off
@@ -167,9 +167,9 @@
 .B2 ufo on off
 .B2 gso on off
 
-.B ethtool \-p|\-\-blink
+.B ethtool \-p|\-\-identify
 .I ethX
-.IR [ N ]
+.RI [ N ]
 
 .B ethtool \-r|\-\-negotiate
 .I ethX


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ethtool/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	12 Mar 2008 15:47:32 -0000	1.10
+++ .cvsignore	17 Jan 2009 13:20:13 -0000	1.11
@@ -1 +1,2 @@
 ethtool-6.tar.gz
+gpl-2.0.txt


Index: ethtool.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ethtool/devel/ethtool.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- ethtool.spec	12 Mar 2008 15:47:32 -0000	1.19
+++ ethtool.spec	17 Jan 2009 13:20:13 -0000	1.20
@@ -1,44 +1,74 @@
-Summary: Ethernet settings tool for PCI ethernet cards
-Name: ethtool
-Version: 6
-Release: 1%{?dist}
-License: GPL+
-Group: Applications/System
-URL: http://sourceforge.net/projects/gkernel/
-Source0: http://download.sourceforge.net/gkernel/%{name}-%{version}.tar.gz
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-
-%define _sbindir	/sbin
+Summary:	Ethernet settings tool for PCI ethernet cards
+Name:		ethtool
+Version:	6
+Release:	2.20090115git%{?dist}
+License:	GPLv2
+Group:		Applications/System
+URL:		http://sourceforge.net/projects/gkernel/
+# When using tarball from released upstream version:
+# - http://downloads.sourceforge.net/gkernel/%{name}-%{version}.tar.gz
+#
+# When generating tarball package from upstream git:
+# - git clone git://git.kernel.org/pub/scm/network/ethtool/ethtool.git ethtool-6
+# - cd ethtool-6; git checkout 2c4bd1c0c4d8112c16f9143da69c03d02ac3b1ae
+# - cp -f ChangeLog ChangeLog.old; git log > ChangeLog.git
+# - rm -rf .git; cd ..; tar cvfz ethtool-6.tar.gz ethtool-6
+# - Use the visible date of latest git log entry for %{release} in spec file
+Source0:	%{name}-%{version}.tar.gz
+Source1:	http://www.gnu.org/licenses/gpl-2.0.txt
+Patch0:		ethtool-6-man_pages.patch
+Patch1:		ethtool-6-help_usage.patch
+BuildRequires:	automake, autoconf
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
-This utility allows querying and changing of ethernet
-card settings, such as speed, port, autonegotiation,
-and PCI locations.
+This utility allows querying and changing settings such as speed,
+port, autonegotiation, PCI locations and checksum offload on many
+network devices, especially of ethernet devices.
 
 %prep
 %setup -q
+%patch0 -p1 -b .man_pages
+%patch1 -p1 -b .help_usage
+
+# Only needed when using upstream git
+aclocal
+autoheader
+automake --gnu --add-missing --copy
+autoconf
+
+# Replace GPLvX from automake by GPLv2
+cp -f %{SOURCE1} COPYING
 
 %build
-%configure
-make
+%configure --sbindir=/sbin
+make %{?_smp_mflags}
 
 %install
-rm -rf %{buildroot}
-%makeinstall
-mkdir -p %{buildroot}/usr/sbin
-ln -s /sbin/ethtool %{buildroot}/usr/sbin
+rm -rf $RPM_BUILD_ROOT
+make DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p' install
+
+# Some legacy support for scripts etc. out there
+mkdir -p $RPM_BUILD_ROOT%{_sbindir}
+ln -sf ../../sbin/%{name} $RPM_BUILD_ROOT%{_sbindir}/%{name}
 
 %clean
-rm -rf %{buildroot}
+rm -rf $RPM_BUILD_ROOT
 
 %files
-%defattr(-,root,root)
-%doc AUTHORS ChangeLog COPYING INSTALL NEWS README
-/sbin/ethtool
-/usr/sbin/ethtool
-%{_mandir}/man8/ethtool.*
+%defattr(-,root,root,-)
+%doc AUTHORS ChangeLog.* COPYING LICENSE NEWS README
+/sbin/%{name}
+%{_sbindir}/%{name}
+%{_mandir}/man8/%{name}.8*
 
 %changelog
+* Sat Jan 17 2009 Robert Scheck <robert at fedoraproject.org> 6-2.20090115git
+- Changes to match with Fedora Packaging Guidelines (#225735)
+- Upgrade to GIT 20090115 (#225735, #477498)
+- Removed bogus stated need of DEVNAME in -h/--help (#472038)
+- Removed completely needless INSTALL file from %%doc (#472034)
+
 * Wed Mar 12 2008 Tom "spot" Callaway <tcallawa at redhat.com> 6-1
 - Upgrade to ethtool version 6
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ethtool/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	12 Mar 2008 15:47:32 -0000	1.10
+++ sources	17 Jan 2009 13:20:13 -0000	1.11
@@ -1 +1,2 @@
-3b721ec27f17ebf320ba8c505cf66d9c  ethtool-6.tar.gz
+462e8eb1a18a05007e183ebeed65bfd5  ethtool-6.tar.gz
+751419260aa954499f7abaabaa882bbe  gpl-2.0.txt



From mcpierce at fedoraproject.org  Sat Jan 17 13:24:29 2009
From: mcpierce at fedoraproject.org (Darryl L. Pierce)
Date: Sat, 17 Jan 2009 13:24:29 +0000 (UTC)
Subject: rpms/rubygem-tlsmail/F-9 rubygem-tlsmail.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090117132429.AB4DD7012B@cvs1.fedora.phx.redhat.com>

Author: mcpierce

Update of /cvs/pkgs/rpms/rubygem-tlsmail/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20392

Modified Files:
	.cvsignore sources 
Added Files:
	rubygem-tlsmail.spec 
Log Message:
First official release for Fedora.



--- NEW FILE rubygem-tlsmail.spec ---
# Generated from tlsmail-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 tlsmail
%define geminstdir %{gemdir}/gems/%{gemname}-%{version}
%define gemdocsdir %{gemdir}/doc/%{gemname}-%{version}
%define installroot %{buildroot}%{geminstdir}

Summary: 	This library enables pop or smtp via ssl/tls
Name: 		rubygem-%{gemname}
Version: 	0.0.1
Release: 	7%{?dist}
Group: 		Development/Languages
License: 	Public Domain
URL: 		http://tlsmail.rubyforge.org
Source0: 	http://gems.rubyforge.org/gems/%{gemname}-%{version}.gem
BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: 	rubygems
Requires:       ruby(abi) = 1.8
BuildRequires: 	rubygems
BuildArch: 	noarch
Provides: 	rubygem(%{gemname}) = %{version}

%description
This library enables pop or smtp via ssl/tls by dynamically replacing these
classes to these in ruby 1.9.


%prep

%build

%install
rm -rf %{buildroot}
mkdir -p %{buildroot}%{gemdir}
gem install --local --install-dir %{buildroot}%{gemdir} \
            --force --rdoc %{SOURCE0}
rm -f %{installroot}/CHANGELOG.txt

for file in \
%{buildroot}%{gemdocsdir}/ri/Net/POP3/POPMail/pop-i.yaml \
%{buildroot}%{gemdocsdir}/ri/Net/POP3/delete_all-i.yaml \
%{buildroot}%{gemdocsdir}/ri/Net/POP3/each_mail-i.yaml \
%{buildroot}%{gemdocsdir}/ri/Net/POP3/foreach-c.yaml \
%{buildroot}%{gemdocsdir}/ri/Net/POP3/start-c.yaml \
%{buildroot}%{gemdocsdir}/ri/Net/POP3/start-i.yaml \
%{buildroot}%{gemdocsdir}/ri/Net/SMTP/open_message_stream-i.yaml \
%{buildroot}%{gemdocsdir}/ri/Net/SMTP/start-c.yaml \
%{buildroot}%{gemdocsdir}/ri/Net/SMTP/start-i.yaml \
%{buildroot}%{geminstdir}/README.txt \
%{buildroot}%{geminstdir}/Manifest.txt \
%{buildroot}%{geminstdir}/Rakefile \
%{buildroot}%{geminstdir}/lib/net/pop.rb \
%{buildroot}%{geminstdir}/lib/net/smtp.rb \
%{buildroot}%{geminstdir}/lib/tlsmail.rb \
%{buildroot}%{geminstdir}/test/test_helper.rb \
%{buildroot}%{geminstdir}/test/tlsmail_test.rb; do
    cat $file | sed 's/\r//' > ${file}.tmp
    rm -f ${file}
    mv ${file}.tmp $file
done

%clean
rm -rf %{buildroot}

%files
%defattr(-, root, root, -)
%dir %{geminstdir}
%doc %{gemdocsdir}
%doc %{geminstdir}/Manifest.txt
%doc %{geminstdir}/Rakefile
%doc %{geminstdir}/README.txt
%{geminstdir}/*/
%{gemdir}/cache/%{gemname}-%{version}.gem
%{gemdir}/specifications/%{gemname}-%{version}.gemspec


%changelog
* Sat Jan 17 2009 Darryl Pierce <dpierce at redhat.com> - 0.0.1-7
- First official build for Fedora.

* Fri Jan 16 2009 Darryl Pierce <dpierce at redhat.com> - 0.0.1-5
- Final changes per package review.
- Remarked

* Thu Jan 15 2009 Darryl Pierce <dpierce at redhat.com> - 0.0.1-4
- Changes per review.
- Fixed CRLF issues with contained files.

* Thu Jan 15 2009 Darryl Pierce <dpierce at redhat.com> - 0.0.1-3
- Removed all CRLF instances.

* Mon Jan 05 2009 Darryl Pierce <dpierce at redhat.com> - 0.0.1-2
- Fixed Requires to include ruby(abi)
- Added README.txt to %%doc

* Sat Dec 13 2008 Darryl Pierce <dpierce at redhat.com> - 0.0.1-1
- Initial package creation for Fedora.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-tlsmail/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	17 Jan 2009 03:18:56 -0000	1.1
+++ .cvsignore	17 Jan 2009 13:23:59 -0000	1.2
@@ -0,0 +1 @@
+tlsmail-0.0.1.gem


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-tlsmail/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	17 Jan 2009 03:18:56 -0000	1.1
+++ sources	17 Jan 2009 13:23:59 -0000	1.2
@@ -0,0 +1 @@
+5f5e3e29f929013d1f64a3b930cdff39  tlsmail-0.0.1.gem



From tmraz at fedoraproject.org  Sat Jan 17 13:33:14 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Sat, 17 Jan 2009 13:33:14 +0000 (UTC)
Subject: rpms/isns-utils/devel isns-utils.spec,1.2,1.3
Message-ID: <20090117133314.674787012B@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/isns-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21937

Modified Files:
	isns-utils.spec 
Log Message:
* Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> - 0.91-1
- rebuild with new openssl



Index: isns-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/isns-utils/devel/isns-utils.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- isns-utils.spec	11 Feb 2008 22:58:10 -0000	1.2
+++ isns-utils.spec	17 Jan 2009 13:32:44 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           isns-utils
 Version:        0.91
-Release:        0.0%{?dist}
+Release:        1%{?dist}
 Summary:        The iSNS daemon and utility programs
 
 Group:          System Environment/Daemons
@@ -97,5 +97,8 @@
 %attr(0644,root,root) %config(noreplace) %{_sysconfdir}/isns/*
 
 %changelog
+* Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> - 0.91-1
+- rebuild with new openssl
+
 * Wed Jan 16 2008 Mike Christie <mchristie at redhat.com> - 0.91-0.0
 - first build



From ivazquez at fedoraproject.org  Sat Jan 17 13:33:32 2009
From: ivazquez at fedoraproject.org (Ignacio Vazquez-Abrams)
Date: Sat, 17 Jan 2009 13:33:32 +0000 (UTC)
Subject: rpms/feh/devel feh.spec,1.15,1.16
Message-ID: <20090117133332.AD41E7012B@cvs1.fedora.phx.redhat.com>

Author: ivazquez

Update of /cvs/pkgs/rpms/feh/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21990

Modified Files:
	feh.spec 
Log Message:
Fix font Requires


Index: feh.spec
===================================================================
RCS file: /cvs/pkgs/rpms/feh/devel/feh.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- feh.spec	22 Dec 2008 16:53:06 -0000	1.15
+++ feh.spec	17 Jan 2009 13:33:02 -0000	1.16
@@ -1,9 +1,9 @@
 # No desktop file for feh. It may be a GUI program, but it needs 
 # file names or it just spits out the help.
 
-Name:           feh 
+Name:           feh
 Version:        1.3.4
-Release:        10%{?dist}
+Release:        11%{?dist}
 Summary:        Fast command line image viewer using Imlib2
 Group:          Applications/Multimedia
 License:        MIT
@@ -21,7 +21,7 @@
 BuildRequires:  giblib-devel imlib2-devel libjpeg-devel libpng-devel
 BuildRequires:  libXt-devel
 %if 0%{?fedora} > 10
-Requires:       dejavu-fonts-sans
+Requires:       dejavu-sans-fonts
 %else
 Requires:       dejavu-fonts
 %endif
@@ -70,6 +70,9 @@
 
 
 %changelog
+* Sat Jan 17 2009 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> 1.3.4-11
+- Fix font Requires
+
 * Mon Dec 22 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> 1.3.4-10
 - Fix thinko in DejaVu package name
 



From tmraz at fedoraproject.org  Sat Jan 17 13:36:14 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Sat, 17 Jan 2009 13:36:14 +0000 (UTC)
Subject: rpms/isync/devel isync.spec,1.7,1.8
Message-ID: <20090117133614.557617012B@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/isync/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22310

Modified Files:
	isync.spec 
Log Message:
* Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> 1.0.4-2
- rebuild with new openssl



Index: isync.spec
===================================================================
RCS file: /cvs/pkgs/rpms/isync/devel/isync.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- isync.spec	23 Feb 2008 12:08:39 -0000	1.7
+++ isync.spec	17 Jan 2009 13:35:44 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           isync
 Version:        1.0.4
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Tool to synchronize IMAP4 and Maildir mailboxes
 
 Group:          Applications/Internet
@@ -51,6 +51,9 @@
 
 
 %changelog
+* Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> 1.0.4-2
+- rebuild with new openssl
+
 * Sat Feb 23 2008 Lubomir Kundrak <lkundrak at redhat.com> 1.0.4-1
 - 1.0.4
 - Drop upstreamed patches (all!)



From tmraz at fedoraproject.org  Sat Jan 17 13:37:14 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Sat, 17 Jan 2009 13:37:14 +0000 (UTC)
Subject: rpms/jabbin/devel jabbin.spec,1.2,1.3
Message-ID: <20090117133714.10D117012B@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/jabbin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22514

Modified Files:
	jabbin.spec 
Log Message:
* Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> - 2.0-0.7.beta2a
- rebuild with new openssl



Index: jabbin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jabbin/devel/jabbin.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- jabbin.spec	25 Mar 2008 13:02:41 -0000	1.2
+++ jabbin.spec	17 Jan 2009 13:36:43 -0000	1.3
@@ -2,7 +2,7 @@
 Summary(pl):    Komunikator i VoIP Jabber klient
 Name:           jabbin
 Version:        2.0
-Release:        0.6.beta2a%{?dist}
+Release:        0.7.beta2a%{?dist}
 License:        GPLv2+
 Group:          Applications/Communications
 URL:            http://jabbin.com/
@@ -91,6 +91,9 @@
 %{_datadir}/applications/fedora-jabbin.desktop
 
 %changelog
+* Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> - 2.0-0.7.beta2a
+- rebuild with new openssl
+
 * Sun Feb 10 2008 Krzysztof Kurzawski <kurzawax at gmail.com> - 2.0-0.6.beta2a
 - Fix license tag
 - Add polish summary and description



From mcpierce at fedoraproject.org  Sat Jan 17 13:37:59 2009
From: mcpierce at fedoraproject.org (Darryl L. Pierce)
Date: Sat, 17 Jan 2009 13:37:59 +0000 (UTC)
Subject: rpms/rubygem-tlsmail/F-10 rubygem-tlsmail.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090117133759.CDB767012B@cvs1.fedora.phx.redhat.com>

Author: mcpierce

Update of /cvs/pkgs/rpms/rubygem-tlsmail/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22603

Modified Files:
	.cvsignore sources 
Added Files:
	rubygem-tlsmail.spec 
Log Message:
First official release for Fedora.



--- NEW FILE rubygem-tlsmail.spec ---
# Generated from tlsmail-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 tlsmail
%define geminstdir %{gemdir}/gems/%{gemname}-%{version}
%define gemdocsdir %{gemdir}/doc/%{gemname}-%{version}
%define installroot %{buildroot}%{geminstdir}

Summary: 	This library enables pop or smtp via ssl/tls
Name: 		rubygem-%{gemname}
Version: 	0.0.1
Release: 	7%{?dist}
Group: 		Development/Languages
License: 	Public Domain
URL: 		http://tlsmail.rubyforge.org
Source0: 	http://gems.rubyforge.org/gems/%{gemname}-%{version}.gem
BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: 	rubygems
Requires:       ruby(abi) = 1.8
BuildRequires: 	rubygems
BuildArch: 	noarch
Provides: 	rubygem(%{gemname}) = %{version}

%description
This library enables pop or smtp via ssl/tls by dynamically replacing these
classes to these in ruby 1.9.


%prep

%build

%install
rm -rf %{buildroot}
mkdir -p %{buildroot}%{gemdir}
gem install --local --install-dir %{buildroot}%{gemdir} \
            --force --rdoc %{SOURCE0}
rm -f %{installroot}/CHANGELOG.txt

for file in \
%{buildroot}%{gemdocsdir}/ri/Net/POP3/POPMail/pop-i.yaml \
%{buildroot}%{gemdocsdir}/ri/Net/POP3/delete_all-i.yaml \
%{buildroot}%{gemdocsdir}/ri/Net/POP3/each_mail-i.yaml \
%{buildroot}%{gemdocsdir}/ri/Net/POP3/foreach-c.yaml \
%{buildroot}%{gemdocsdir}/ri/Net/POP3/start-c.yaml \
%{buildroot}%{gemdocsdir}/ri/Net/POP3/start-i.yaml \
%{buildroot}%{gemdocsdir}/ri/Net/SMTP/open_message_stream-i.yaml \
%{buildroot}%{gemdocsdir}/ri/Net/SMTP/start-c.yaml \
%{buildroot}%{gemdocsdir}/ri/Net/SMTP/start-i.yaml \
%{buildroot}%{geminstdir}/README.txt \
%{buildroot}%{geminstdir}/Manifest.txt \
%{buildroot}%{geminstdir}/Rakefile \
%{buildroot}%{geminstdir}/lib/net/pop.rb \
%{buildroot}%{geminstdir}/lib/net/smtp.rb \
%{buildroot}%{geminstdir}/lib/tlsmail.rb \
%{buildroot}%{geminstdir}/test/test_helper.rb \
%{buildroot}%{geminstdir}/test/tlsmail_test.rb; do
    cat $file | sed 's/\r//' > ${file}.tmp
    rm -f ${file}
    mv ${file}.tmp $file
done

%clean
rm -rf %{buildroot}

%files
%defattr(-, root, root, -)
%dir %{geminstdir}
%doc %{gemdocsdir}
%doc %{geminstdir}/Manifest.txt
%doc %{geminstdir}/Rakefile
%doc %{geminstdir}/README.txt
%{geminstdir}/*/
%{gemdir}/cache/%{gemname}-%{version}.gem
%{gemdir}/specifications/%{gemname}-%{version}.gemspec


%changelog
* Sat Jan 17 2009 Darryl Pierce <dpierce at redhat.com> - 0.0.1-7
- First official build for Fedora.

* Fri Jan 16 2009 Darryl Pierce <dpierce at redhat.com> - 0.0.1-5
- Final changes per package review.
- Remarked

* Thu Jan 15 2009 Darryl Pierce <dpierce at redhat.com> - 0.0.1-4
- Changes per review.
- Fixed CRLF issues with contained files.

* Thu Jan 15 2009 Darryl Pierce <dpierce at redhat.com> - 0.0.1-3
- Removed all CRLF instances.

* Mon Jan 05 2009 Darryl Pierce <dpierce at redhat.com> - 0.0.1-2
- Fixed Requires to include ruby(abi)
- Added README.txt to %%doc

* Sat Dec 13 2008 Darryl Pierce <dpierce at redhat.com> - 0.0.1-1
- Initial package creation for Fedora.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-tlsmail/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	17 Jan 2009 03:18:56 -0000	1.1
+++ .cvsignore	17 Jan 2009 13:37:29 -0000	1.2
@@ -0,0 +1 @@
+tlsmail-0.0.1.gem


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-tlsmail/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	17 Jan 2009 03:18:56 -0000	1.1
+++ sources	17 Jan 2009 13:37:29 -0000	1.2
@@ -0,0 +1 @@
+5f5e3e29f929013d1f64a3b930cdff39  tlsmail-0.0.1.gem



From tmraz at fedoraproject.org  Sat Jan 17 13:38:11 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Sat, 17 Jan 2009 13:38:11 +0000 (UTC)
Subject: rpms/jpilot/devel jpilot.spec,1.47,1.48
Message-ID: <20090117133811.9C1CC7012B@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/jpilot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22717

Modified Files:
	jpilot.spec 
Log Message:
* Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> - 1.6.0-3
- rebuild with new openssl



Index: jpilot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jpilot/devel/jpilot.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- jpilot.spec	2 Sep 2008 08:51:55 -0000	1.47
+++ jpilot.spec	17 Jan 2009 13:37:41 -0000	1.48
@@ -1,7 +1,7 @@
 Summary: Jpilot pilot desktop software
 Name: jpilot
 Version: 1.6.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2
 Group: Applications/Productivity
 URL: http://jpilot.org
@@ -88,6 +88,9 @@
 %{_datadir}/applications/*
 
 %changelog
+* Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> - 1.6.0-3
+- rebuild with new openssl
+
 * Tue Sep  2 2008 Ivana Varekova <varekova at redhat.com> - 1.6.0-2
 - update patches
 



From tmraz at fedoraproject.org  Sat Jan 17 13:47:52 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Sat, 17 Jan 2009 13:47:52 +0000 (UTC)
Subject: rpms/kadu/devel kadu.spec,1.41,1.42
Message-ID: <20090117134752.A48F17012B@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/kadu/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23549

Modified Files:
	kadu.spec 
Log Message:
* Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> - 0.6.5-8
- rebuild with new openssl



Index: kadu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kadu/devel/kadu.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- kadu.spec	16 Dec 2008 20:15:59 -0000	1.41
+++ kadu.spec	17 Jan 2009 13:47:22 -0000	1.42
@@ -107,7 +107,7 @@
 Name:		kadu_opt
 %endif
 Version:	0.6.5
-Release:	7%{?dist}
+Release:	8%{?dist}
 Summary:	An Gadu-Gadu client for online messaging
 Summary(pl):	Klient Gadu-Gadu
 Group:		Applications/Internet
@@ -678,6 +678,9 @@
 
 
 %changelog
+* Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> - 0.6.5-8
+- rebuild with new openssl
+
 * Tue Dec 16 2008 Micha?? Bentkowski <mr.ecik at gmail.com> - 0.6.5-7
 - Osd_hints tarball was missing in sources
 



From tmraz at fedoraproject.org  Sat Jan 17 13:48:22 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Sat, 17 Jan 2009 13:48:22 +0000 (UTC)
Subject: rpms/kannel/devel kannel.spec,1.19,1.20
Message-ID: <20090117134822.B3E9C7012B@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/kannel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23617

Modified Files:
	kannel.spec 
Log Message:
* Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> 1.4.1-10
- rebuild with new openssl



Index: kannel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kannel/devel/kannel.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- kannel.spec	22 Dec 2008 16:20:23 -0000	1.19
+++ kannel.spec	17 Jan 2009 13:47:52 -0000	1.20
@@ -1,7 +1,7 @@
 Summary: WAP and SMS gateway
 Name: kannel
 Version: 1.4.1
-Release: 9
+Release: 10
 License: BSD
 Group: System Environment/Daemons
 URL: http://www.kannel.org/
@@ -141,6 +141,9 @@
 
 
 %changelog
+* Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> 1.4.1-10
+- rebuild with new openssl
+
 * Mon Dec 22 2008 Matthias Saou <http://freshrpms.net/> 1.4.1-9
 - Include patch to fix openssl detection on 64bit.
 - Include gw-config wrapper script to fix multilib conflicts (#341701).



From tmraz at fedoraproject.org  Sat Jan 17 13:48:46 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Sat, 17 Jan 2009 13:48:46 +0000 (UTC)
Subject: rpms/kasablanca/devel kasablanca.spec,1.20,1.21
Message-ID: <20090117134846.67B127012B@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/kasablanca/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23772

Modified Files:
	kasablanca.spec 
Log Message:
* Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> 0.4.0.2-13
- rebuild with new openssl



Index: kasablanca.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kasablanca/devel/kasablanca.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- kasablanca.spec	11 Feb 2008 12:52:11 -0000	1.20
+++ kasablanca.spec	17 Jan 2009 13:48:16 -0000	1.21
@@ -2,7 +2,7 @@
 Name:    kasablanca
 Summary: Graphical FTP client
 Version: 0.4.0.2
-Release: 12%{?dist}
+Release: 13%{?dist}
 
 License: GPLv2+
 Url: 	 http://kasablanca.berlios.de/ 
@@ -108,6 +108,9 @@
 
 
 %changelog
+* Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> 0.4.0.2-13
+- rebuild with new openssl
+
 * Mon Feb 11 2008 Rex Dieter <rdieter at fedoraproject.org> 0.4.0.2-12
 - respin (gcc43)
 



From gemi at fedoraproject.org  Sat Jan 17 13:51:33 2009
From: gemi at fedoraproject.org (=?utf-8?q?G=C3=A9rard_Milmeister?=)
Date: Sat, 17 Jan 2009 13:51:33 +0000 (UTC)
Subject: rpms/curry/F-10 curry.spec,1.9,1.10
Message-ID: <20090117135133.90DB67012B@cvs1.fedora.phx.redhat.com>

Author: gemi

Update of /cvs/pkgs/rpms/curry/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24120/F-10

Modified Files:
	curry.spec 
Log Message:
added alpha to excludearch


Index: curry.spec
===================================================================
RCS file: /cvs/pkgs/rpms/curry/F-10/curry.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- curry.spec	19 Feb 2008 03:29:04 -0000	1.9
+++ curry.spec	17 Jan 2009 13:51:03 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           curry
 Version:        0.9.11
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        M??nster Curry compiler
 
 Group:          Development/Languages
@@ -11,7 +11,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  ghc >= 6.4
 Requires:	gcc
-ExcludeArch:    ppc64
+ExcludeArch:    ppc64 alpha
 
 %description
 The M??nster Curry compiler is a native code compiler for the
@@ -47,6 +47,9 @@
 
 
 %changelog
+* Thu Jan 15 2009 Gerard Milmeister <gemi at bluewin.ch> - 0.9.11-5
+- added alpha to excludearch
+
 * Mon Feb 18 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.9.11-4
 - Autorebuild for GCC 4.3
 



From gemi at fedoraproject.org  Sat Jan 17 13:51:33 2009
From: gemi at fedoraproject.org (=?utf-8?q?G=C3=A9rard_Milmeister?=)
Date: Sat, 17 Jan 2009 13:51:33 +0000 (UTC)
Subject: rpms/curry/F-9 curry.spec,1.9,1.10
Message-ID: <20090117135133.C54D37012B@cvs1.fedora.phx.redhat.com>

Author: gemi

Update of /cvs/pkgs/rpms/curry/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24120/F-9

Modified Files:
	curry.spec 
Log Message:
added alpha to excludearch


Index: curry.spec
===================================================================
RCS file: /cvs/pkgs/rpms/curry/F-9/curry.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- curry.spec	19 Feb 2008 03:29:04 -0000	1.9
+++ curry.spec	17 Jan 2009 13:51:03 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           curry
 Version:        0.9.11
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        M??nster Curry compiler
 
 Group:          Development/Languages
@@ -11,7 +11,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  ghc >= 6.4
 Requires:	gcc
-ExcludeArch:    ppc64
+ExcludeArch:    ppc64 alpha
 
 %description
 The M??nster Curry compiler is a native code compiler for the
@@ -47,6 +47,9 @@
 
 
 %changelog
+* Thu Jan 15 2009 Gerard Milmeister <gemi at bluewin.ch> - 0.9.11-5
+- added alpha to excludearch
+
 * Mon Feb 18 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.9.11-4
 - Autorebuild for GCC 4.3
 



From josef at fedoraproject.org  Sat Jan 17 13:56:15 2009
From: josef at fedoraproject.org (Josef Bacik)
Date: Sat, 17 Jan 2009 13:56:15 +0000 (UTC)
Subject: rpms/btrfs-progs/devel .cvsignore, 1.6, 1.7 btrfs-progs.spec, 1.8, 
	1.9 sources, 1.6, 1.7
Message-ID: <20090117135615.2A7D17012B@cvs1.fedora.phx.redhat.com>

Author: josef

Update of /cvs/pkgs/rpms/btrfs-progs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24428

Modified Files:
	.cvsignore btrfs-progs.spec sources 
Log Message:
updating to 0.18 so it will work with the rawhide kernels.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/btrfs-progs/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	12 Jan 2009 21:02:21 -0000	1.6
+++ .cvsignore	17 Jan 2009 13:55:44 -0000	1.7
@@ -1 +1 @@
-btrfs-progs-0.17.tar.bz2
+btrfs-progs-0.18.tar.bz2


Index: btrfs-progs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/btrfs-progs/devel/btrfs-progs.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- btrfs-progs.spec	16 Jan 2009 12:21:08 -0000	1.8
+++ btrfs-progs.spec	17 Jan 2009 13:55:44 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           btrfs-progs
-Version:        0.17
-Release:        4%{?dist}
+Version:        0.18
+Release:        1%{?dist}
 Summary:        Userspace programs for btrfs
 
 Group:          System Environment/Base
@@ -45,6 +45,9 @@
 %{_root_sbindir}/btrfstune
 
 %changelog
+* Sat Jan 17 2009 Josef Bacik <josef at toxicpanda.com> 0.18-1
+- updated to 0.18 because of the ioctl change in 2.6.29-rc2
+
 * Fri Jan 16 2009 Marek Mahut <mmahut at fedoraproject.org> 0.17-4
 - RHBZ#480219 btrfs-convert is missing
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/btrfs-progs/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	12 Jan 2009 21:02:21 -0000	1.6
+++ sources	17 Jan 2009 13:55:44 -0000	1.7
@@ -1 +1 @@
-88d1fde8ecf237fc210510911ba06786  btrfs-progs-0.17.tar.bz2
+f1d49b54e3059f127fc82eab4fafcb8e  btrfs-progs-0.18.tar.bz2



From tmraz at fedoraproject.org  Sat Jan 17 13:59:56 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Sat, 17 Jan 2009 13:59:56 +0000 (UTC)
Subject: rpms/keepalived/devel keepalived.spec,1.12,1.13
Message-ID: <20090117135956.88F917012B@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/keepalived/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25083

Modified Files:
	keepalived.spec 
Log Message:
* Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> 1.1.15-7
- rebuild with new openssl



Index: keepalived.spec
===================================================================
RCS file: /cvs/pkgs/rpms/keepalived/devel/keepalived.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- keepalived.spec	24 Dec 2008 14:56:52 -0000	1.12
+++ keepalived.spec	17 Jan 2009 13:59:26 -0000	1.13
@@ -4,7 +4,7 @@
 Summary: HA monitor built upon LVS, VRRP and service pollers
 Name: keepalived
 Version: 1.1.15
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: GPLv2+
 Group: Applications/System
 URL: http://www.keepalived.org/
@@ -106,6 +106,9 @@
 
 
 %changelog
+* Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> 1.1.15-7
+- rebuild with new openssl
+
 * Mon Dec 22 2008 Matthias Saou <http://freshrpms.net/> 1.1.15-6
 - Fork the init script to be (mostly for now) LSB compliant (#246966).
 



From tmraz at fedoraproject.org  Sat Jan 17 14:00:22 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Sat, 17 Jan 2009 14:00:22 +0000 (UTC)
Subject: rpms/kftpgrabber/devel kftpgrabber.spec,1.6,1.7
Message-ID: <20090117140022.751A97012B@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/kftpgrabber/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25512

Modified Files:
	kftpgrabber.spec 
Log Message:
* Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> 0.8.1-7
- rebuild with new openssl



Index: kftpgrabber.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kftpgrabber/devel/kftpgrabber.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- kftpgrabber.spec	20 Feb 2008 05:44:37 -0000	1.6
+++ kftpgrabber.spec	17 Jan 2009 13:59:52 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           kftpgrabber
 Version:        0.8.1
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        FTP client
 
 Group:          Applications/Internet
@@ -106,6 +106,9 @@
 
 
 %changelog
+* Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> 0.8.1-7
+- rebuild with new openssl
+
 * Wed Feb 20 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.8.1-6
 - Autorebuild for GCC 4.3
 



From tmraz at fedoraproject.org  Sat Jan 17 14:02:21 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Sat, 17 Jan 2009 14:02:21 +0000 (UTC)
Subject: rpms/ldapvi/devel ldapvi.spec,1.6,1.7
Message-ID: <20090117140221.5C6947012B@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/ldapvi/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25845

Modified Files:
	ldapvi.spec 
Log Message:
* Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> - 1.7-7
- rebuild with new openssl



Index: ldapvi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ldapvi/devel/ldapvi.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ldapvi.spec	5 Aug 2008 20:47:36 -0000	1.6
+++ ldapvi.spec	17 Jan 2009 14:01:50 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           ldapvi
 Version:        1.7
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        An interactive LDAP client
 
 Group:          Applications/Editors
@@ -49,6 +49,9 @@
 
 
 %changelog
+* Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> - 1.7-7
+- rebuild with new openssl
+
 * Tue Aug  5 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1.7-6
 - fix license tag
 



From tmraz at fedoraproject.org  Sat Jan 17 14:16:44 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Sat, 17 Jan 2009 14:16:44 +0000 (UTC)
Subject: rpms/ldns/devel ldns.spec,1.35,1.36
Message-ID: <20090117141644.66DA67012B@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/ldns/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26751

Modified Files:
	ldns.spec 
Log Message:
* Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> - 1.4.0-2
- rebuild with new openssl



Index: ldns.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ldns/devel/ldns.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- ldns.spec	7 Nov 2008 23:51:22 -0000	1.35
+++ ldns.spec	17 Jan 2009 14:16:13 -0000	1.36
@@ -1,7 +1,7 @@
 Summary: Lowlevel DNS(SEC) library with API
 Name: ldns
 Version: 1.4.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: BSD
 Url: http://www.nlnetlabs.nl/%{name}/
 Source: http://www.nlnetlabs.nl/downloads/%{name}-%{version}.tar.gz
@@ -85,6 +85,9 @@
 %postun -p /sbin/ldconfig
 
 %changelog
+* Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> - 1.4.0-2
+- rebuild with new openssl
+
 * Fri Nov  7 2008 Paul Wouters <paul at xelerance.com> - 1.4.0-1
 - Updated to 1.4.0
 



From tmraz at fedoraproject.org  Sat Jan 17 14:17:10 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Sat, 17 Jan 2009 14:17:10 +0000 (UTC)
Subject: rpms/libesmtp/devel libesmtp.spec,1.15,1.16
Message-ID: <20090117141710.099627012B@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/libesmtp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26787

Modified Files:
	libesmtp.spec 
Log Message:
* Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> - 1.0.4-9
- rebuild with new openssl



Index: libesmtp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libesmtp/devel/libesmtp.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- libesmtp.spec	1 Nov 2008 16:48:40 -0000	1.15
+++ libesmtp.spec	17 Jan 2009 14:16:39 -0000	1.16
@@ -3,7 +3,7 @@
 Summary:        SMTP client library
 Name:           libesmtp
 Version:        1.0.4
-Release:        8%{?dist}
+Release:        9%{?dist}
 License:        LGPLv2+
 Group:          System Environment/Libraries
 Source:         http://www.stafford.uklinux.net/libesmtp/%{name}-%{version}.tar.bz2
@@ -101,6 +101,9 @@
 %{_libdir}/pkgconfig/libesmtp.pc
 
 %changelog
+* Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> - 1.0.4-9
+- rebuild with new openssl
+
 * Sat Nov  1 2008 Manuel "lonely wolf" Wolfshant <wolfy at fedoraproject.org> - 1.0.4-8
 - do not package libtool files from the plugin directory
 



From tmraz at fedoraproject.org  Sat Jan 17 14:22:06 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Sat, 17 Jan 2009 14:22:06 +0000 (UTC)
Subject: rpms/libfprint/devel libfprint.spec,1.11,1.12
Message-ID: <20090117142206.693E17012B@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/libfprint/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27306

Modified Files:
	libfprint.spec 
Log Message:
* Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> - 0.1.0-4.pre1
- rebuild with new openssl



Index: libfprint.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libfprint/devel/libfprint.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- libfprint.spec	25 Nov 2008 15:59:27 -0000	1.11
+++ libfprint.spec	17 Jan 2009 14:21:36 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           libfprint
 Version:        0.1.0
-Release:        3.pre1%{?dist}
+Release:        4.pre1%{?dist}
 Summary:        Tool kit for fingerprint scanner
 
 Group:          System Environment/Libraries
@@ -71,6 +71,9 @@
 %{_datadir}/hal/fdi/information/20thirdparty/10-fingerprint-reader-fprint.fdi
 
 %changelog
+* Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> - 0.1.0-4.pre1
+- rebuild with new openssl
+
 * Tue Nov 25 2008 - Bastien Nocera <bnocera at redhat.com> - 0.1.0-3.pre1
 - Fix possible crasher in libfprint when setting up the fds for polling
 



From tmraz at fedoraproject.org  Sat Jan 17 14:23:04 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Sat, 17 Jan 2009 14:23:04 +0000 (UTC)
Subject: rpms/libgadu/devel libgadu.spec,1.8,1.9
Message-ID: <20090117142304.465497012B@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/libgadu/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27462

Modified Files:
	libgadu.spec 
Log Message:
* Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> 1.8.2-2
- rebuild with new openssl



Index: libgadu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libgadu/devel/libgadu.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- libgadu.spec	26 Oct 2008 15:25:37 -0000	1.8
+++ libgadu.spec	17 Jan 2009 14:22:34 -0000	1.9
@@ -1,6 +1,6 @@
 Name:		libgadu
 Version:	1.8.2
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	A Gadu-gadu protocol compatible communications library
 License:	LGPLv2
 Group:		System Environment/Libraries
@@ -69,6 +69,9 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> 1.8.2-2
+- rebuild with new openssl
+
 * Sun Oct 26 2008 Dominik Mierzejewski <rpm at greysector.net> 1.8.2-1
 - updated to 1.8.2 (security update)
 - preserve timestamps during make install



From tmraz at fedoraproject.org  Sat Jan 17 14:26:01 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Sat, 17 Jan 2009 14:26:01 +0000 (UTC)
Subject: rpms/libjingle/devel libjingle.spec,1.11,1.12
Message-ID: <20090117142601.D2B0B7012B@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/libjingle/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27841

Modified Files:
	libjingle.spec 
Log Message:
* Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> - 0.3.12-2
- rebuild with new openssl



Index: libjingle.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libjingle/devel/libjingle.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- libjingle.spec	19 Sep 2008 19:42:11 -0000	1.11
+++ libjingle.spec	17 Jan 2009 14:25:31 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           libjingle
 Version:        0.3.12
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        GoogleTalk implementation of Jingle
 
 Group:          System Environment/Libraries
@@ -77,6 +77,9 @@
 
 
 %changelog
+* Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> - 0.3.12-2
+- rebuild with new openssl
+
 * Wed Sep 17 2008 Brian Pepple <bpepple at fedoraproject.org> - 0.3.12-1
 - Update to 0.3.12.
 - Add hack to remove rpath.



From rjones at fedoraproject.org  Sat Jan 17 14:27:10 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Sat, 17 Jan 2009 14:27:10 +0000 (UTC)
Subject: rpms/cduce/devel .cvsignore, 1.5, 1.6 cduce.spec, 1.9, 1.10 sources,
	1.5, 1.6
Message-ID: <20090117142710.669537012B@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/cduce/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28027

Modified Files:
	.cvsignore cduce.spec sources 
Log Message:
- Add ocamlduce subpackage.
- Capitalize the summary line as per packaging guidelines.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cduce/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	5 Dec 2008 14:44:43 -0000	1.5
+++ .cvsignore	17 Jan 2009 14:26:40 -0000	1.6
@@ -1,3 +1,4 @@
 cduce-0.5.2.1.tar.gz
 ocaml-3.10.2.tar.bz2
 ocaml-3.11.0.tar.bz2
+ocamlduce-3.11.0.0rc1.tar.gz


Index: cduce.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cduce/devel/cduce.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- cduce.spec	14 Jan 2009 18:43:29 -0000	1.9
+++ cduce.spec	17 Jan 2009 14:26:40 -0000	1.10
@@ -1,21 +1,26 @@
 %define opt %(test -x %{_bindir}/ocamlopt && echo 1 || echo 0)
 %define debug_package %{nil}
+
 %define ocaml_major 3.11
 %define ocaml_minor 0
 
+%define ocamlduce_version %{ocaml_major}.%{ocaml_minor}.0rc1
+
 Name:           cduce
 Version:        0.5.2.1
-Release:        12%{?dist}
-Summary:        modern XML-oriented functional language
+Release:        13%{?dist}
+Summary:        Modern XML-oriented functional language
 
 Group:          Development/Libraries
 License:        BSD
 URL:            http://www.cduce.org/
-Source0:        http://www.cduce.org/download/%{name}-%{version}.tar.gz
-Source1:        http://caml.inria.fr/distrib/ocaml-%{ocaml_major}/ocaml-%{ocaml_major}.%{ocaml_minor}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 ExcludeArch:    ppc64
 
+Source0:        http://www.cduce.org/download/%{name}-%{version}.tar.gz
+Source1:        http://caml.inria.fr/distrib/ocaml-%{ocaml_major}/ocaml-%{ocaml_major}.%{ocaml_minor}.tar.bz2
+Source2:        https://forge.ocamlcore.org/frs/download.php/107/ocamlduce-%{ocamlduce_version}.tar.gz
+
 Patch0:         cduce-0.5.2.1-ocaml-3.11.0.patch
 
 BuildRequires:  ocaml = %{ocaml_major}.%{ocaml_minor}
@@ -37,12 +42,16 @@
 %define __find_requires /usr/lib/rpm/ocaml-find-requires.sh -i Asttypes -i Outcometree -i Parsetree
 %define __find_provides /usr/lib/rpm/ocaml-find-provides.sh
 
+
 %description
 CDuce is a modern XML-oriented functional language with innovative
 features. A compiler is available under the terms of an open-source
 license. CDuce is type-safe, efficient, and offers powerful
 constructions to work with XML documents.
 
+For ocamlduce (the modified OCaml language which incorporates CDuce
+extensions), please install the cduce-ocamlduce package.
+
 
 %package        devel
 Summary:        Development files for %{name}
@@ -55,8 +64,20 @@
 developing applications that use %{name}.
 
 
+%package        ocamlduce
+Summary:        Development files for %{name}
+Group:          Development/Libraries
+Requires:       %{name} = %{version}-%{release}
+
+
+%description    ocamlduce
+This package contains a modified version of the OCaml language which
+incorporates CDuce extensions for working with XML documents.
+
+
 %prep
 %setup -q -n cduce-0.5.2
+%setup -q -n cduce-0.5.2 -T -D -a 2
 
 %patch0 -p1
 
@@ -74,6 +95,23 @@
 strip cduce dtd2cduce
 chrpath --delete cduce
 
+# Building ocamlduce is a bit more involved ...
+pushd ocamlduce-%{ocamlduce_version}
+make prepare \
+  OCAML_VERSION=%{ocaml_major}.%{ocaml_minor} \
+  OCAML_SOURCE=%{SOURCE1} \
+  OCAML_SRCDIR=ocaml-%{ocaml_major}.%{ocaml_minor}
+cd ocaml-%{ocaml_major}.%{ocaml_minor}
+  # Configure must match the one from base ocaml.spec
+CFLAGS="$RPM_OPT_FLAGS" ./configure \
+    -bindir %{_bindir} \
+    -libdir %{_libdir}/ocaml \
+    -x11lib %{_libdir} \
+    -x11include %{_includedir} \
+    -mandir %{_mandir}/man1
+make -f Makefile.ocamlduce world world.opt
+popd
+
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -85,6 +123,15 @@
   MANDIR=$RPM_BUILD_ROOT%{_mandir} \
   DOCDIR=$RPM_BUILD_ROOT%{_docdir}/%{name}-devel-%{version}
 
+# Install ocamlduce.
+pushd ocamlduce-%{ocamlduce_version}
+mkdir -p $RPM_BUILD_ROOT%{_libdir}/ocaml/ocamlduce
+cd ocaml-%{ocaml_major}.%{ocaml_minor}
+make -f Makefile.ocamlduce installbyte installopt \
+  DUCE_LIBDIR=$RPM_BUILD_ROOT%{_libdir}/ocaml/ocamlduce \
+  BINDIR=$RPM_BUILD_ROOT%{_bindir}
+popd
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -111,7 +158,17 @@
 %{_docdir}/%{name}-devel-%{version}/
 
 
+%files ocamlduce
+%defattr(-,root,root,-)
+%{_bindir}/ocamlduce*
+%{_libdir}/ocaml/ocamlduce/
+
+
 %changelog
+* Sat Jan 17 2009 Richard W.M. Jones <rjones at redhat.com> - 0.5.2.1-13
+- Add ocamlduce subpackage.
+- Capitalize the summary line as per packaging guidelines.
+
 * Wed Jan 14 2009 Richard W.M. Jones <rjones at redhat.com> - 0.5.2.1-12
 - Improve the OCaml 3.11.0 patch (suggested by Kim Nguyen).
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cduce/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	5 Dec 2008 14:44:43 -0000	1.5
+++ sources	17 Jan 2009 14:26:40 -0000	1.6
@@ -1,2 +1,3 @@
 d2d52bf536c1a8f4397b4c64794d9322  cduce-0.5.2.1.tar.gz
 6ed1c3ed660a15408362242fa8fa4668  ocaml-3.11.0.tar.bz2
+0e36873aa7c3ae9684a49e3e831446ed  ocamlduce-3.11.0.0rc1.tar.gz



From tmraz at fedoraproject.org  Sat Jan 17 14:28:38 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Sat, 17 Jan 2009 14:28:38 +0000 (UTC)
Subject: rpms/libmsn/devel libmsn.spec,1.4,1.5
Message-ID: <20090117142838.4C0317012B@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/libmsn/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28217

Modified Files:
	libmsn.spec 
Log Message:
* Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> 4.0-0.7.beta2
- rebuild with new openssl



Index: libmsn.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libmsn/devel/libmsn.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- libmsn.spec	10 Jan 2009 01:00:19 -0000	1.4
+++ libmsn.spec	17 Jan 2009 14:28:07 -0000	1.5
@@ -3,7 +3,7 @@
 
 Name:		libmsn
 Version:	4.0
-Release:	0.6.%{beta}%{?dist}
+Release:	0.7.%{beta}%{?dist}
 
 Group:		System Environment/Libraries
 License:	GPLv2
@@ -78,6 +78,9 @@
 
 
 %changelog
+* Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> 4.0-0.7.beta2
+- rebuild with new openssl
+
 * Fri Jan 09 2009 Rex Dieter <rdieter at fedoraproject.org> 4.0-0.6.beta2
 - pkgconfig patch to workaround bug #479493
 



From tmraz at fedoraproject.org  Sat Jan 17 14:30:39 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Sat, 17 Jan 2009 14:30:39 +0000 (UTC)
Subject: rpms/libnasl/devel libnasl.spec,1.17,1.18
Message-ID: <20090117143039.85EC57012B@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/libnasl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28533

Modified Files:
	libnasl.spec 
Log Message:
* Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> - 2.2.11-4
- rebuild with new openssl



Index: libnasl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libnasl/devel/libnasl.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- libnasl.spec	12 Jan 2009 16:34:59 -0000	1.17
+++ libnasl.spec	17 Jan 2009 14:30:09 -0000	1.18
@@ -1,6 +1,6 @@
 Name:           libnasl
 Version:        2.2.11
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Nessus Attack Scripting Language
 
 Group:          System Environment/Libraries
@@ -105,6 +105,9 @@
 %doc %{_datadir}/libnasl/
 
 %changelog
+* Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> - 2.2.11-4
+- rebuild with new openssl
+
 * Mon Jan 12 2009 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 - 2.2.11-3
 - fix #479655



From tmraz at fedoraproject.org  Sat Jan 17 14:31:42 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Sat, 17 Jan 2009 14:31:42 +0000 (UTC)
Subject: rpms/libp11/devel libp11.spec,1.7,1.8
Message-ID: <20090117143142.730017012B@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/libp11/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29252

Modified Files:
	libp11.spec 
Log Message:
* Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> - 0.2.3-5
- rebuild with new openssl



Index: libp11.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libp11/devel/libp11.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- libp11.spec	28 Nov 2008 09:03:06 -0000	1.7
+++ libp11.spec	17 Jan 2009 14:31:12 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           libp11
 Version:        0.2.3
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Library for using PKCS#11 modules
 
 Group:          Development/Libraries
@@ -57,6 +57,9 @@
 
 
 %changelog
+* Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> - 0.2.3-5
+- rebuild with new openssl
+
 * Fri Nov 28 2008 Adam Tkac <atkac redhat com> - 0.2.3-4
 - rebuild against new libltdl
 



From tmraz at fedoraproject.org  Sat Jan 17 14:33:18 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Sat, 17 Jan 2009 14:33:18 +0000 (UTC)
Subject: rpms/libssh2/devel libssh2.spec,1.4,1.5
Message-ID: <20090117143318.80D307012B@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/libssh2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29503

Modified Files:
	libssh2.spec 
Log Message:
* Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> - 0.18-8
- rebuild with new openssl



Index: libssh2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libssh2/devel/libssh2.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- libssh2.spec	18 Feb 2008 23:06:21 -0000	1.4
+++ libssh2.spec	17 Jan 2009 14:32:48 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           libssh2
 Version:        0.18
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        A library implementing the SSH2 protocol
 
 Group:          System Environment/Libraries
@@ -93,6 +93,9 @@
 %{_libdir}/*.so
 
 %changelog
+* Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> - 0.18-8
+- rebuild with new openssl
+
 * Mon Feb 18 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.18-7
 - Autorebuild for GCC 4.3
 



From rjones at fedoraproject.org  Sat Jan 17 14:34:25 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Sat, 17 Jan 2009 14:34:25 +0000 (UTC)
Subject: rpms/ocaml-mysql/devel ocaml-mysql.spec,1.4,1.5
Message-ID: <20090117143425.D46137012B@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/ocaml-mysql/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29743

Modified Files:
	ocaml-mysql.spec 
Log Message:
Requires mysql-libs, not automatically found.


Index: ocaml-mysql.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-mysql/devel/ocaml-mysql.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ocaml-mysql.spec	4 Dec 2008 19:27:50 -0000	1.4
+++ ocaml-mysql.spec	17 Jan 2009 14:33:55 -0000	1.5
@@ -3,7 +3,7 @@
 
 Name:           ocaml-mysql
 Version:        1.0.4
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        OCaml library for accessing MySQL databases
 
 Group:          Development/Libraries
@@ -19,6 +19,8 @@
 BuildRequires:  mysql-devel
 BuildRequires:  chrpath
 
+Requires:       mysql-libs
+
 %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
@@ -94,6 +96,9 @@
 
 
 %changelog
+* Sat Jan 17 2009 Richard W.M. Jones <rjones at redhat.com> - 1.0.4-6
+- Requires mysql-libs, not automatically found.
+
 * Wed Nov 26 2008 Richard W.M. Jones <rjones at redhat.com> - 1.0.4-5
 - Rebuild for OCaml 3.11.0+rc1.
 



From tmraz at fedoraproject.org  Sat Jan 17 14:36:34 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Sat, 17 Jan 2009 14:36:34 +0000 (UTC)
Subject: rpms/libtorrent/devel libtorrent.spec,1.28,1.29
Message-ID: <20090117143634.D2AC57012B@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/libtorrent/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30080

Modified Files:
	libtorrent.spec 
Log Message:
* Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> - 0.12.4-2
- rebuild with new openssl



Index: libtorrent.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libtorrent/devel/libtorrent.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- libtorrent.spec	26 Nov 2008 21:41:33 -0000	1.28
+++ libtorrent.spec	17 Jan 2009 14:36:04 -0000	1.29
@@ -2,7 +2,7 @@
 License:       GPLv2+
 Group:         System Environment/Libraries
 Version:       0.12.4
-Release:       1%{?dist}
+Release:       2%{?dist}
 Summary:       BitTorrent library with a focus on high performance & good code
 URL:           http://libtorrent.rakshasa.no/
 Source0:       http://libtorrent.rakshasa.no/downloads/%{name}-%{version}.tar.gz
@@ -63,6 +63,9 @@
 %{_libdir}/*.so
 
 %changelog
+* Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> - 0.12.4-2
+- rebuild with new openssl
+
 * Wed Nov 26 2008 Conrad Meyer <konrad at tylerc.org> - 0.12.4-1
 - Bump to 0.12.4.
 



From tmraz at fedoraproject.org  Sat Jan 17 14:36:55 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Sat, 17 Jan 2009 14:36:55 +0000 (UTC)
Subject: rpms/libwvstreams/devel libwvstreams.spec,1.34,1.35
Message-ID: <20090117143655.A487F7012B@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/libwvstreams/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30133

Modified Files:
	libwvstreams.spec 
Log Message:
* Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> - 4.5.1-3
- rebuild with new openssl



Index: libwvstreams.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libwvstreams/devel/libwvstreams.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- libwvstreams.spec	9 Jan 2009 15:59:41 -0000	1.34
+++ libwvstreams.spec	17 Jan 2009 14:36:25 -0000	1.35
@@ -1,6 +1,6 @@
 Name: libwvstreams
 Version: 4.5.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: WvStreams is a network programming library written in C++
 Source: http://wvstreams.googlecode.com/files/wvstreams-%{version}.tar.gz
 Patch1: wvstreams-4.2.2-multilib.patch
@@ -80,6 +80,9 @@
 %postun -p /sbin/ldconfig
 
 %changelog
+* Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> - 4.5.1-3
+- rebuild with new openssl
+
 * Fri Jan 09 2009 Ondrej Vasik <ovasik at redhat.com> - 4.5.1-2
 - do not remove libwvdbus.pc (#479144)
 



From tmraz at fedoraproject.org  Sat Jan 17 14:38:00 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Sat, 17 Jan 2009 14:38:00 +0000 (UTC)
Subject: rpms/licq/devel licq.spec,1.26,1.27
Message-ID: <20090117143800.E93477012B@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/licq/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30400

Modified Files:
	licq.spec 
Log Message:
* Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> 1.3.5-5
- rebuild with new openssl



Index: licq.spec
===================================================================
RCS file: /cvs/pkgs/rpms/licq/devel/licq.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- licq.spec	7 Aug 2008 17:27:20 -0000	1.26
+++ licq.spec	17 Jan 2009 14:37:30 -0000	1.27
@@ -1,6 +1,6 @@
 Name: licq
 Version: 1.3.5
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPLv2+
 Source0: http://prdownloads.sourceforge.net/licq/licq-%{version}.tar.gz
 Source1: http://prdownloads.sourceforge.net/icqnd/icqnd-0.1.9.6.tar.bz2
@@ -230,6 +230,9 @@
 %doc plugins/auto-reply/{README,licq_autoreply.conf,examples}
 
 %changelog
+* Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> 1.3.5-5
+- rebuild with new openssl
+
 * Thu Aug  7 2008 Tom "spot" Callaway <tcallawa at redhat.com> 1.3.5-4
 - fix license tag
 



From tmraz at fedoraproject.org  Sat Jan 17 14:48:04 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Sat, 17 Jan 2009 14:48:04 +0000 (UTC)
Subject: rpms/linkage/devel linkage.spec,1.13,1.14
Message-ID: <20090117144804.614E27012B@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/linkage/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31394

Modified Files:
	linkage.spec 
Log Message:
* Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> 0.2.0-5
- rebuild with new openssl



Index: linkage.spec
===================================================================
RCS file: /cvs/pkgs/rpms/linkage/devel/linkage.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- linkage.spec	19 Dec 2008 18:34:06 -0000	1.13
+++ linkage.spec	17 Jan 2009 14:47:33 -0000	1.14
@@ -1,6 +1,6 @@
 Name: linkage
 Version: 0.2.0       
-Release: 4%{?dist}
+Release: 5%{?dist}
 Summary: Lightweight bittorent client       
 
 Group: Applications/Internet          
@@ -119,6 +119,9 @@
 %{_libdir}/liblinkage-1.so
 
 %changelog
+* Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> 0.2.0-5
+- rebuild with new openssl
+
 * Thu Dec 18 2008 Benjamin Kosnik  <bkoz at redhat.com> 0.2.0-4
 - Rebuild for boost-1.37.0.
 



From tmraz at fedoraproject.org  Sat Jan 17 14:48:57 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Sat, 17 Jan 2009 14:48:57 +0000 (UTC)
Subject: rpms/linuxdcpp/devel linuxdcpp.spec,1.8,1.9
Message-ID: <20090117144857.5BB337012B@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/linuxdcpp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31613

Modified Files:
	linuxdcpp.spec 
Log Message:
* Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> 1.0.2-3
- rebuild with new openssl



Index: linuxdcpp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/linuxdcpp/devel/linuxdcpp.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- linuxdcpp.spec	25 Sep 2008 14:36:32 -0000	1.8
+++ linuxdcpp.spec	17 Jan 2009 14:48:26 -0000	1.9
@@ -1,6 +1,6 @@
 Name:		linuxdcpp
 Version:	1.0.2
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Direct Connect client
 
 Group:		Applications/Internet
@@ -60,6 +60,9 @@
 %{_datadir}/pixmaps/linuxdcpp.png
 
 %changelog
+* Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> 1.0.2-3
+- rebuild with new openssl
+
 * Thu Sep 25 2008 Marcin Garski <mgarski[AT]post.pl> 1.0.2-2
 - Use XDG Downloads directory (#460749)
 



From tmraz at fedoraproject.org  Sat Jan 17 14:49:57 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Sat, 17 Jan 2009 14:49:57 +0000 (UTC)
Subject: rpms/lynx/devel lynx.spec,1.55,1.56
Message-ID: <20090117144957.54D727012B@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/lynx/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31879

Modified Files:
	lynx.spec 
Log Message:
* Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> - 2.8.6-19
- rebuild with new openssl



Index: lynx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lynx/devel/lynx.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- lynx.spec	7 Nov 2008 13:50:50 -0000	1.55
+++ lynx.spec	17 Jan 2009 14:49:27 -0000	1.56
@@ -1,7 +1,7 @@
 Summary: A text-based Web browser
 Name: lynx
 Version: 2.8.6
-Release: 18%{?dist}
+Release: 19%{?dist}
 License: GPLv2
 Group: Applications/Internet
 Source: http://lynx.isc.org/current/lynx%{version}.tar.bz2
@@ -108,6 +108,9 @@
 %config(noreplace,missingok) %{_sysconfdir}/lynx-site.cfg
 
 %changelog
+* Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> - 2.8.6-19
+- rebuild with new openssl
+
 * Fri Nov  7 2008 Jiri Moskovcak <jmoskovc at redhat.com> - 2.8.6-18
 - Fixed CVE-2008-4690 lynx: remote arbitrary command execution.
   via a crafted lynxcgi: URL (thoger)



From tmraz at fedoraproject.org  Sat Jan 17 14:58:14 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Sat, 17 Jan 2009 14:58:14 +0000 (UTC)
Subject: rpms/m2crypto/devel m2crypto.spec,1.48,1.49
Message-ID: <20090117145814.42C0270142@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/m2crypto/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32725

Modified Files:
	m2crypto.spec 
Log Message:
* Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> - 0.19.1-4
- rebuild with new openssl



Index: m2crypto.spec
===================================================================
RCS file: /cvs/pkgs/rpms/m2crypto/devel/m2crypto.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- m2crypto.spec	29 Nov 2008 05:10:18 -0000	1.48
+++ m2crypto.spec	17 Jan 2009 14:57:43 -0000	1.49
@@ -6,7 +6,7 @@
 Summary: Support for using OpenSSL in python scripts
 Name: m2crypto
 Version: 0.19.1
-Release: 3
+Release: 4
 Source0: http://pypi.python.org/packages/source/M/M2Crypto/M2Crypto-%{version}.tar.gz
 # https://bugzilla.osafoundation.org/show_bug.cgi?id=2341
 Patch0: m2crypto-0.18-timeouts.patch
@@ -88,6 +88,9 @@
 %{python_sitearch}/M2Crypto-*.egg-info
 
 %changelog
+* Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> - 0.19.1-4
+- rebuild with new openssl
+
 * Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 0.19.1-3
 - Rebuild for Python 2.6
 



From tmraz at fedoraproject.org  Sat Jan 17 14:58:49 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Sat, 17 Jan 2009 14:58:49 +0000 (UTC)
Subject: rpms/mail-notification/devel mail-notification.spec,1.64,1.65
Message-ID: <20090117145849.F3BB870142@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/mail-notification/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv492

Modified Files:
	mail-notification.spec 
Log Message:
* Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> - 5.4-8
- rebuild with new openssl



Index: mail-notification.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mail-notification/devel/mail-notification.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- mail-notification.spec	23 Dec 2008 11:09:50 -0000	1.64
+++ mail-notification.spec	17 Jan 2009 14:58:19 -0000	1.65
@@ -1,6 +1,6 @@
 Name:           mail-notification
 Version:        5.4
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Status icon that informs you if you have new mail
 
 Group:          Applications/Internet
@@ -181,6 +181,9 @@
 
 
 %changelog
+* Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> - 5.4-8
+- rebuild with new openssl
+
 * Mon Dec 22 2008 Dmitry Butskoy <Dmitry at Butskoy.name> - 5.4-7
 - rebuild with new gmime-2.4
 



From tmraz at fedoraproject.org  Sat Jan 17 15:00:10 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Sat, 17 Jan 2009 15:00:10 +0000 (UTC)
Subject: rpms/mapserver/devel mapserver.spec,1.17,1.18
Message-ID: <20090117150010.7CB197012B@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/mapserver/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1401

Modified Files:
	mapserver.spec 
Log Message:
* Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> 5.2.1-4
- rebuild with new openssl



Index: mapserver.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mapserver/devel/mapserver.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- mapserver.spec	3 Jan 2009 14:12:16 -0000	1.17
+++ mapserver.spec	17 Jan 2009 14:59:40 -0000	1.18
@@ -1,6 +1,6 @@
 Name:           mapserver
 Version:        5.2.1
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Environment for building spatially-enabled internet applications
 Group:          Development/Tools
 License:        BSD
@@ -240,6 +240,9 @@
 %{_javadir}/*.jar
 
 %changelog
+* Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> 5.2.1-4
+- rebuild with new openssl
+
 * Sat Jan 03 2009 Balint Cristian <rezso at rdsor.ro> 5.2.1-3
 - require external fonts
 - get rid of internal fonts



From tmraz at fedoraproject.org  Sat Jan 17 15:10:43 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Sat, 17 Jan 2009 15:10:43 +0000 (UTC)
Subject: rpms/Miro/devel Miro.spec,1.45,1.46
Message-ID: <20090117151043.D4D377012B@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/Miro/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2501

Modified Files:
	Miro.spec 
Log Message:
* Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> - 1.2.8-5
- rebuild with new openssl



Index: Miro.spec
===================================================================
RCS file: /cvs/pkgs/rpms/Miro/devel/Miro.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- Miro.spec	23 Dec 2008 23:05:25 -0000	1.45
+++ Miro.spec	17 Jan 2009 15:10:13 -0000	1.46
@@ -5,7 +5,7 @@
 
 Name:           Miro
 Version:        1.2.8
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Miro - Internet TV Player
 Group:          Applications/Multimedia
 License:        GPLv2+
@@ -87,6 +87,9 @@
 
 
 %changelog
+* Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> - 1.2.8-5
+- rebuild with new openssl
+
 * Tue Dec 23 2008 Caol??n McNamara <caolanm at redhat.com> - 1.2.8-4
 - Rebuild against newer gecko 1.9.1
 



From tmraz at fedoraproject.org  Sat Jan 17 15:11:11 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Sat, 17 Jan 2009 15:11:11 +0000 (UTC)
Subject: rpms/mcabber/devel mcabber.spec,1.10,1.11
Message-ID: <20090117151111.87D7D7012B@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/mcabber/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2555

Modified Files:
	mcabber.spec 
Log Message:
* Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> - 0.9.9-2
- rebuild with new openssl



Index: mcabber.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mcabber/devel/mcabber.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- mcabber.spec	12 Oct 2008 11:20:12 -0000	1.10
+++ mcabber.spec	17 Jan 2009 15:10:41 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           mcabber
 Version:        0.9.9
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Console Jabber instant messaging client
 
 Group:          Applications/Internet
@@ -49,6 +49,9 @@
 %{_datadir}/mcabber
 
 %changelog
+* Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> - 0.9.9-2
+- rebuild with new openssl
+
 * Sun Oct 12 2008 Michael Fleming <mfleming+rpm at enlartenment.com> - 0.9.9-1
 - Upgrade to 0.9.9
 - Revert to using OpenSSL (#bz 389481)



From tmraz at fedoraproject.org  Sat Jan 17 15:12:11 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Sat, 17 Jan 2009 15:12:11 +0000 (UTC)
Subject: rpms/mod_authz_ldap/devel mod_authz_ldap.spec,1.19,1.20
Message-ID: <20090117151211.D1A587012B@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/mod_authz_ldap/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2815

Modified Files:
	mod_authz_ldap.spec 
Log Message:
* Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> - 0.26-11
- rebuild with new openssl



Index: mod_authz_ldap.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mod_authz_ldap/devel/mod_authz_ldap.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- mod_authz_ldap.spec	19 Feb 2008 07:09:24 -0000	1.19
+++ mod_authz_ldap.spec	17 Jan 2009 15:11:41 -0000	1.20
@@ -2,7 +2,7 @@
 Summary: LDAP authorization module for the Apache HTTP Server
 Name: mod_authz_ldap
 Version: 0.26
-Release: 10
+Release: 11
 License: BSD
 Group: System Environment/Daemons
 URL: http://authzldap.othello.ch/
@@ -77,6 +77,9 @@
 %doc NEWS AUTHORS ChangeLog COPYING
 
 %changelog
+* Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> - 0.26-11
+- rebuild with new openssl
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.26-10
 - Autorebuild for GCC 4.3
 



From tmraz at fedoraproject.org  Sat Jan 17 15:18:56 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Sat, 17 Jan 2009 15:18:56 +0000 (UTC)
Subject: rpms/monit/devel monit.spec,1.6,1.7
Message-ID: <20090117151856.693567012B@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/monit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3460

Modified Files:
	monit.spec 
Log Message:
* Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> 4.10.1-9
- rebuild with new openssl



Index: monit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/monit/devel/monit.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- monit.spec	23 Dec 2008 03:09:20 -0000	1.6
+++ monit.spec	17 Jan 2009 15:18:26 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           monit
 Version:        4.10.1
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        Manages and monitors processes, files, directories and devices
 
 Group:          Applications/Internet
@@ -96,6 +96,9 @@
 %{_mandir}/man1/monit.1*
 
 %changelog
+* Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> 4.10.1-9
+- rebuild with new openssl
+
 * Mon Dec 22 2008 Stewart Adam <s.adam at diffingo.com> 4.10.1-8
 - Tweak configuration defaults: include /etc/monit.d/*, log to /var/log/monit
   and set daemon time to 60s



From tmraz at fedoraproject.org  Sat Jan 17 15:19:40 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Sat, 17 Jan 2009 15:19:40 +0000 (UTC)
Subject: rpms/nagios-plugins/devel nagios-plugins.spec,1.55,1.56
Message-ID: <20090117151940.D756C7012B@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/nagios-plugins/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3557

Modified Files:
	nagios-plugins.spec 
Log Message:
* Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> 1.4.13-12
- rebuild with new openssl



Index: nagios-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nagios-plugins/devel/nagios-plugins.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- nagios-plugins.spec	20 Oct 2008 18:57:48 -0000	1.55
+++ nagios-plugins.spec	17 Jan 2009 15:19:10 -0000	1.56
@@ -1,6 +1,6 @@
 Name: nagios-plugins
 Version: 1.4.13
-Release: 11%{?dist}
+Release: 12%{?dist}
 Summary: Host/service/network monitoring program plugins for Nagios
 
 Group: Applications/System
@@ -807,6 +807,9 @@
 %{_libdir}/nagios/plugins/utils.sh
 
 %changelog
+* Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> 1.4.13-12
+- rebuild with new openssl
+
 * Mon Oct 20 2008 Robert M. Albrecht <romal at gmx.de> 1.4.13-11
 - Enabled --with-extra-opts again
 



From tmraz at fedoraproject.org  Sat Jan 17 15:25:51 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Sat, 17 Jan 2009 15:25:51 +0000 (UTC)
Subject: rpms/nagios-plugins-snmp-disk-proc/devel
	nagios-plugins-snmp-disk-proc.spec, 1.6, 1.7
Message-ID: <20090117152551.8A7427012B@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/nagios-plugins-snmp-disk-proc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4312

Modified Files:
	nagios-plugins-snmp-disk-proc.spec 
Log Message:
* Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> - 1.2-3
- rebuild with new openssl



Index: nagios-plugins-snmp-disk-proc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nagios-plugins-snmp-disk-proc/devel/nagios-plugins-snmp-disk-proc.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- nagios-plugins-snmp-disk-proc.spec	20 Feb 2008 01:25:16 -0000	1.6
+++ nagios-plugins-snmp-disk-proc.spec	17 Jan 2009 15:25:21 -0000	1.7
@@ -2,7 +2,7 @@
 
 Name:           nagios-plugins-snmp-disk-proc
 Version:        1.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Nagios SNMP plugins to monitor remote disk and processes
 
 Group:          Applications/System
@@ -53,6 +53,9 @@
 
 
 %changelog
+* Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> - 1.2-3
+- rebuild with new openssl
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1.2-2
 - Autorebuild for GCC 4.3
 



From tmraz at fedoraproject.org  Sat Jan 17 15:27:25 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Sat, 17 Jan 2009 15:27:25 +0000 (UTC)
Subject: rpms/nessus-core/devel nessus-core.spec,1.12,1.13
Message-ID: <20090117152725.D372870142@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/nessus-core/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4642

Modified Files:
	nessus-core.spec 
Log Message:
* Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> - 2.2.11-2
- rebuild with new openssl



Index: nessus-core.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nessus-core/devel/nessus-core.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- nessus-core.spec	23 Nov 2008 11:54:06 -0000	1.12
+++ nessus-core.spec	17 Jan 2009 15:26:55 -0000	1.13
@@ -1,6 +1,6 @@
 Name:           nessus-core
 Version:        2.2.11
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Network vulnerability scanner
 
 Group:          Applications/System
@@ -233,6 +233,9 @@
 %ghost %config(missingok,noreplace) %verify(not md5 size mtime) %{_sysconfdir}/nessus/*
 
 %changelog
+* Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> - 2.2.11-2
+- rebuild with new openssl
+
 * Sun Nov 23 2008 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 - 2.2.11-1
 - fix #465113 FTBFS



From tmraz at fedoraproject.org  Sat Jan 17 15:27:53 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Sat, 17 Jan 2009 15:27:53 +0000 (UTC)
Subject: rpms/netatalk/devel netatalk.spec,1.47,1.48
Message-ID: <20090117152753.3CDBD70141@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/netatalk/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4713

Modified Files:
	netatalk.spec 
Log Message:
* Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> - 4:2.0.3-23
- rebuild with new openssl



Index: netatalk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/netatalk/devel/netatalk.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- netatalk.spec	15 Jan 2009 09:50:03 -0000	1.47
+++ netatalk.spec	17 Jan 2009 15:27:22 -0000	1.48
@@ -1,7 +1,7 @@
 Summary: AppleTalk networking programs
 Name:    netatalk
 Version: 2.0.3
-Release: 22%{?dist}
+Release: 23%{?dist}
 Epoch:   4
 License: GPLv2+
 Group:   System Environment/Daemons
@@ -192,6 +192,9 @@
 %{_mandir}/man*/netatalk-config.1*
 
 %changelog
+* Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> - 4:2.0.3-23
+- rebuild with new openssl
+
 * Wed Dec 03 2008 Jiri Skala <jskala at redhat.com> -4:2.0.3-22
 - fix #473939 netatalk-2.0.3-21.fc10 disable quota
 



From tmraz at fedoraproject.org  Sat Jan 17 15:31:53 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Sat, 17 Jan 2009 15:31:53 +0000 (UTC)
Subject: rpms/net-snmp/devel net-snmp.spec,1.174,1.175
Message-ID: <20090117153153.F325A7012B@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/net-snmp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5967

Modified Files:
	net-snmp.spec 
Log Message:
* Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> 5.4.2.1-7
- rebuild with new openssl



Index: net-snmp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/net-snmp/devel/net-snmp.spec,v
retrieving revision 1.174
retrieving revision 1.175
diff -u -r1.174 -r1.175
--- net-snmp.spec	17 Dec 2008 09:32:59 -0000	1.174
+++ net-snmp.spec	17 Jan 2009 15:31:23 -0000	1.175
@@ -8,7 +8,7 @@
 Summary: A collection of SNMP protocol tools and libraries
 Name: net-snmp
 Version: %{major_ver}
-Release: 6%{?dist}
+Release: 7%{?dist}
 Epoch: 1
 
 License: BSD and MIT
@@ -415,6 +415,9 @@
 %{_datadir}/snmp/mibs
 
 %changelog
+* Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> 5.4.2.1-7
+- rebuild with new openssl
+
 * Wed Dec 17 2008 Jan Safranek <jsafranek at redhat.com> 5.4.2.1-6
 - rebuilt for new python again...
 



From tmraz at fedoraproject.org  Sat Jan 17 15:37:25 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Sat, 17 Jan 2009 15:37:25 +0000 (UTC)
Subject: rpms/nginx/devel nginx.spec,1.28,1.29
Message-ID: <20090117153725.54C797012B@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/nginx/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6647

Modified Files:
	nginx.spec 
Log Message:
* Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> - 0.6.34-2
- rebuild with new openssl



Index: nginx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nginx/devel/nginx.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- nginx.spec	31 Dec 2008 03:54:08 -0000	1.28
+++ nginx.spec	17 Jan 2009 15:36:54 -0000	1.29
@@ -9,7 +9,7 @@
 
 Name:           nginx
 Version:        0.6.34
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Robust, small and high performance http and reverse proxy server
 Group:          System Environment/Daemons   
 
@@ -182,6 +182,9 @@
 
 
 %changelog
+* Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> - 0.6.34-2
+- rebuild with new openssl
+
 * Tue Dec 30 2008 Jeremy Hinegardner <jeremy at hinegardner dot org> - 0.6.34-1
 - update to 0.6.34
 



From tmraz at fedoraproject.org  Sat Jan 17 15:38:13 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Sat, 17 Jan 2009 15:38:13 +0000 (UTC)
Subject: rpms/nmap/devel nmap.spec,1.51,1.52
Message-ID: <20090117153813.74CA87012B@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/nmap/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6824

Modified Files:
	nmap.spec 
Log Message:
* Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> - 2:4.76-3
- rebuild with new openssl



Index: nmap.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nmap/devel/nmap.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- nmap.spec	15 Dec 2008 10:56:37 -0000	1.51
+++ nmap.spec	17 Jan 2009 15:37:43 -0000	1.52
@@ -1,7 +1,7 @@
 Summary: Network exploration tool and security scanner
 Name: nmap
 Version: 4.76
-Release: 2%{?dist}
+Release: 3%{?dist}
 # libdnet-stripped is BSD (advertising clause rescinded by the Univ. of California in 1999)
 License: GPLv2
 Group: Applications/System
@@ -119,6 +119,9 @@
 %{_mandir}/man1/xnmap.1.gz
 
 %changelog
+* Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> - 2:4.76-3
+- rebuild with new openssl
+
 * Mon Dec 15 2008 Michal Hlavinka <mhlavink at redhat.com> - 2:4.77-2
 - bump release for rebuild
 



From tmraz at fedoraproject.org  Sat Jan 17 15:44:52 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Sat, 17 Jan 2009 15:44:52 +0000 (UTC)
Subject: rpms/nsd/devel nsd.spec,1.42,1.43
Message-ID: <20090117154452.EC7EB7012B@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/nsd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7632

Modified Files:
	nsd.spec 
Log Message:
* Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> - 3.2.0-4
- rebuild with new openssl



Index: nsd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nsd/devel/nsd.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- nsd.spec	25 Nov 2008 01:55:28 -0000	1.42
+++ nsd.spec	17 Jan 2009 15:44:22 -0000	1.43
@@ -1,7 +1,7 @@
 Summary: fast and lean authoritative DNS name server
 Name: nsd
 Version: 3.2.0
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: BSD
 Url: http://www.nlnetlabs.nl/%{name}/
 #Source: http://www.nlnetlabs.nl/downloads/%{name}/%{name}-%{version}.tar.gz
@@ -92,6 +92,9 @@
 fi
 
 %changelog
+* Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> - 3.2.0-4
+- rebuild with new openssl
+
 * Mon Nov 24 2008 Paul Wouters <paul at xelerance.com> - 3.2.0-3
 - Updates summary as per Richard Hughes guidelines
 



From tmraz at fedoraproject.org  Sat Jan 17 15:45:57 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Sat, 17 Jan 2009 15:45:57 +0000 (UTC)
Subject: rpms/nrpe/devel nrpe.spec,1.9,1.10
Message-ID: <20090117154557.8AFCC7012B@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/nrpe/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7854

Modified Files:
	nrpe.spec 
Log Message:
* Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> - 2.12-5
- rebuild with new openssl



Index: nrpe.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nrpe/devel/nrpe.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- nrpe.spec	21 Dec 2008 23:53:46 -0000	1.9
+++ nrpe.spec	17 Jan 2009 15:45:27 -0000	1.10
@@ -2,7 +2,7 @@
 
 Name: nrpe
 Version: 2.12
-Release: 4%{?dist}
+Release: 5%{?dist}
 Summary: Host/service/network monitoring agent for Nagios
 
 Group: Applications/System
@@ -106,6 +106,9 @@
 %doc Changelog LEGAL README README.SSL SECURITY docs/NRPE.pdf
 
 %changelog
+* Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> - 2.12-5
+- rebuild with new openssl
+
 * Sun Dec 21 2008 Mike McGrath <mmcgrath at redhat.com> - 2.12-4
 - Added some doc lines for ticket 477527
 



From tmraz at fedoraproject.org  Sat Jan 17 15:46:35 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Sat, 17 Jan 2009 15:46:35 +0000 (UTC)
Subject: rpms/nufw/devel nufw.spec,1.1,1.2
Message-ID: <20090117154635.05E097012B@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/nufw/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7921

Modified Files:
	nufw.spec 
Log Message:
* Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> 2.2.20-6
- rebuild with new openssl



Index: nufw.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nufw/devel/nufw.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nufw.spec	9 Jan 2009 18:24:38 -0000	1.1
+++ nufw.spec	17 Jan 2009 15:46:04 -0000	1.2
@@ -2,7 +2,7 @@
 
 Name: nufw
 Version: 2.2.20
-Release: 5%{dist}
+Release: 6%{dist}
 Summary: Authentication Firewall Suite for Linux
 License: GPLv2
 Group: System Environment/Daemons
@@ -357,6 +357,9 @@
 %{python_sitelib}/nuclient/*
 
 %changelog
+* Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> 2.2.20-6
+- rebuild with new openssl
+
 * Fri Dec 19 2008 Jerome Soyer <saispo at gmail.com> 2.2.20-5
 - Add "touch -r" in the charset conversion for keeping timestamps
 



From pkgdb at fedoraproject.org  Sat Jan 17 15:47:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 17 Jan 2009 15:47:09 +0000
Subject: [pkgdb] audit had acl change status
Message-ID: <20090117154710.835B6208457@bastion.fedora.phx.redhat.com>

sgrubb has set the watchcommits acl on audit (Fedora devel) to Approved for lmacken

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/audit



From tmraz at fedoraproject.org  Sat Jan 17 15:49:58 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Sat, 17 Jan 2009 15:49:58 +0000 (UTC)
Subject: rpms/nut/devel nut.spec,1.66,1.67
Message-ID: <20090117154958.75C517012B@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/nut/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8435

Modified Files:
	nut.spec 
Log Message:
* Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> 2.2.2-6
- rebuild with new openssl



Index: nut.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nut/devel/nut.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- nut.spec	18 Dec 2008 14:30:26 -0000	1.66
+++ nut.spec	17 Jan 2009 15:49:28 -0000	1.67
@@ -9,7 +9,7 @@
 Summary: Network UPS Tools
 Name: nut
 Version: 2.2.2
-Release: 5%{?dist}
+Release: 6%{?dist}
 Group: Applications/System
 License: GPLv2+
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -345,6 +345,9 @@
 %{_libdir}/pkgconfig/libupsclient.pc
 
 %changelog
+* Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> 2.2.2-6
+- rebuild with new openssl
+
 * Thu Dec 18 2008 Michal Hlavinka <mhlavink at redhat.com> 2.2.2-5
 - remove rpath, fix libtool
 



From tmraz at fedoraproject.org  Sat Jan 17 15:52:30 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Sat, 17 Jan 2009 15:52:30 +0000 (UTC)
Subject: rpms/ocspd/devel ocspd.spec,1.1,1.2
Message-ID: <20090117155230.28E937012B@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/ocspd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8994

Modified Files:
	ocspd.spec 
Log Message:
* Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> 1.5.1-0.4.rc1
- rebuild with new openssl



Index: ocspd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocspd/devel/ocspd.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ocspd.spec	13 Oct 2008 10:04:20 -0000	1.1
+++ ocspd.spec	17 Jan 2009 15:51:59 -0000	1.2
@@ -4,7 +4,7 @@
 
 Name:		ocspd
 Version:	1.5.1
-Release:	0.3.%{alphatag}%{?dist}
+Release:	0.4.%{alphatag}%{?dist}
 Summary:	OpenCA OCSP Daemon
 License:	ASL 1.0
 Group:		System Environment/Daemons
@@ -106,6 +106,9 @@
 
 
 %changelog
+* Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> 1.5.1-0.4.rc1
+- rebuild with new openssl
+
 * Wed Oct  8 2008 Patrick Monnerat <pm at datasphere.ch> 1.5.1-0.3.rc1
 - Use group "ocspd" for daemon.
 



From tmraz at fedoraproject.org  Sat Jan 17 15:53:01 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Sat, 17 Jan 2009 15:53:01 +0000 (UTC)
Subject: rpms/nx/devel nx.spec,1.26,1.27
Message-ID: <20090117155301.598FD7012B@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/nx/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9174

Modified Files:
	nx.spec 
Log Message:
* Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> - 3.2.0-32
- rebuild with new openssl



Index: nx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nx/devel/nx.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- nx.spec	26 Aug 2008 23:31:06 -0000	1.26
+++ nx.spec	17 Jan 2009 15:52:31 -0000	1.27
@@ -8,7 +8,7 @@
 Summary: Proxy system for X11
 Name: nx
 Version: 3.2.0
-Release: 31%{?dist}
+Release: 32%{?dist}
 # MIT on the X11 bits
 License: GPLv2 and MIT
 Group: Applications/Internet
@@ -168,6 +168,9 @@
 %{_pkglibexecdir}
 
 %changelog
+* Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> - 3.2.0-32
+- rebuild with new openssl
+
 * Tue Aug 26 2008 TOm "spot" Callaway <tcallawa at redhat.com> - 3.2.0-31
 - fix license tag
 



From tmraz at fedoraproject.org  Sat Jan 17 16:04:59 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Sat, 17 Jan 2009 16:04:59 +0000 (UTC)
Subject: rpms/opal/devel opal.spec,1.36,1.37
Message-ID: <20090117160459.8E9667012B@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/opal/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12326

Modified Files:
	opal.spec 
Log Message:
* Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> - 3.5.2-4
- rebuild with new openssl



Index: opal.spec
===================================================================
RCS file: /cvs/pkgs/rpms/opal/devel/opal.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- opal.spec	13 Jan 2009 08:25:30 -0000	1.36
+++ opal.spec	17 Jan 2009 16:04:29 -0000	1.37
@@ -1,7 +1,7 @@
 Name:		opal
 Summary:	Open Phone Abstraction Library
 Version:	3.5.2
-Release:	3%{?dist}
+Release:	4%{?dist}
 URL:		http://www.opalvoip.org/
 Source0:	ftp://ftp.gnome.org/pub/gnome/sources/%{name}/3.4/%{name}-%{version}.tar.bz2
 License:	MPLv1.0
@@ -70,6 +70,9 @@
 %{_libdir}/pkgconfig/opal.pc
 
 %changelog
+* Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> - 3.5.2-4
+- rebuild with new openssl
+
 * Tue Jan 13 2009 Peter Robinson <pbrobinson at gmail.com> - 3.5.2-3
 - Yet another dep that configure doesn't check and it just fails on
 



From tmraz at fedoraproject.org  Sat Jan 17 16:05:25 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Sat, 17 Jan 2009 16:05:25 +0000 (UTC)
Subject: rpms/openconnect/devel openconnect.spec,1.1,1.2
Message-ID: <20090117160525.EE1FC7012B@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/openconnect/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12394

Modified Files:
	openconnect.spec 
Log Message:
* Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> - 0.99-2
- rebuild with new openssl



Index: openconnect.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openconnect/devel/openconnect.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openconnect.spec	18 Dec 2008 00:05:27 -0000	1.1
+++ openconnect.spec	17 Jan 2009 16:04:55 -0000	1.2
@@ -1,6 +1,6 @@
 Name:		openconnect
 Version:	0.99
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Open client for Cisco AnyConnect VPN
 
 Group:		Applications/Internet
@@ -43,6 +43,9 @@
 
 
 %changelog
+* Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> - 0.99-2
+- rebuild with new openssl
+
 * Tue Dec 16 2008 David Woodhouse <David.Woodhouse at intel.com> - 0.99-1
 - Update to 0.99.
 - Fix BuildRequires



From tmraz at fedoraproject.org  Sat Jan 17 16:06:26 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Sat, 17 Jan 2009 16:06:26 +0000 (UTC)
Subject: rpms/openhpi/devel openhpi.spec,1.69,1.70
Message-ID: <20090117160626.417F47012B@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/openhpi/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12700

Modified Files:
	openhpi.spec 
Log Message:
* Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> - 2.13.1-3
- rebuild with new openssl



Index: openhpi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openhpi/devel/openhpi.spec,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- openhpi.spec	25 Nov 2008 10:25:37 -0000	1.69
+++ openhpi.spec	17 Jan 2009 16:05:55 -0000	1.70
@@ -1,7 +1,7 @@
 Summary: Hardware Platform Interface library and tools
 Name: openhpi
 Version: 2.13.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: BSD
 Group: System Environment/Base
 URL: http://www.openhpi.org
@@ -148,6 +148,9 @@
 
 
 %changelog
+* Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> - 2.13.1-3
+- rebuild with new openssl
+
 * Tue Nov 25 2008 Dan Horak <dan[at]danny.cz> - 2.13.1-2
 - shorten Summary
 



From tmraz at fedoraproject.org  Sat Jan 17 16:12:48 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Sat, 17 Jan 2009 16:12:48 +0000 (UTC)
Subject: rpms/openhpi-subagent/devel openhpi-subagent.spec,1.2,1.3
Message-ID: <20090117161248.5E1297012B@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/openhpi-subagent/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13539

Modified Files:
	openhpi-subagent.spec 
Log Message:
* Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> - 2.3.4-4
- rebuild with new openssl



Index: openhpi-subagent.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openhpi-subagent/devel/openhpi-subagent.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- openhpi-subagent.spec	21 Nov 2008 06:47:47 -0000	1.2
+++ openhpi-subagent.spec	17 Jan 2009 16:12:17 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           openhpi-subagent
 Version:        2.3.4
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        NetSNMP subagent for OpenHPI
 
 Group:          System Environment/Base
@@ -67,6 +67,9 @@
 %{_datadir}/snmp/mibs/*.mib
 
 %changelog
+* Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> - 2.3.4-4
+- rebuild with new openssl
+
 * Fri Nov 21 2008 Dan Horak <dan[at]danny.cz> - 2.3.4-3
 - fix Source0 URL
 



From tmraz at fedoraproject.org  Sat Jan 17 16:13:52 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Sat, 17 Jan 2009 16:13:52 +0000 (UTC)
Subject: rpms/OpenIPMI/devel OpenIPMI.spec,1.64,1.65
Message-ID: <20090117161352.414F07012B@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/OpenIPMI/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13763

Modified Files:
	OpenIPMI.spec 
Log Message:
* Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> - 2.0.14-10
- rebuild with new openssl



Index: OpenIPMI.spec
===================================================================
RCS file: /cvs/pkgs/rpms/OpenIPMI/devel/OpenIPMI.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- OpenIPMI.spec	11 Dec 2008 11:19:08 -0000	1.64
+++ OpenIPMI.spec	17 Jan 2009 16:13:21 -0000	1.65
@@ -4,7 +4,7 @@
 Summary: IPMI (Intelligent Platform Management Interface) library and tools
 Name: OpenIPMI
 Version: 2.0.14
-Release: 9%{?dist}
+Release: 10%{?dist}
 License: BSD and BSD with advertising and LGPLv2+ and GPLv2+
 Group: System Environment/Base
 URL: http://sourceforge.net/projects/openipmi/
@@ -165,6 +165,9 @@
 %{_datadir}/applications/fedora-openipmigui.desktop
 
 %changelog
+* Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> - 2.0.14-10
+- rebuild with new openssl
+
 * Thu Dec 11 2008 Jan Safranek <jsafrane at redhat.com> - 2.0.14-9
 - fix linking without rpath, prelink won't screw up the libraries
   anymore (#475265)



From tmraz at fedoraproject.org  Sat Jan 17 16:19:37 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Sat, 17 Jan 2009 16:19:37 +0000 (UTC)
Subject: rpms/openldap/devel openldap.spec,1.136,1.137
Message-ID: <20090117161937.F08847012B@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/openldap/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14566

Modified Files:
	openldap.spec 
Log Message:
* Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> 2.4.11-3
- rebuild with new openssl



Index: openldap.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openldap/devel/openldap.spec,v
retrieving revision 1.136
retrieving revision 1.137
diff -u -r1.136 -r1.137
--- openldap.spec	15 Dec 2008 16:57:17 -0000	1.136
+++ openldap.spec	17 Jan 2009 16:19:07 -0000	1.137
@@ -11,7 +11,7 @@
 Summary: LDAP support libraries
 Name: openldap
 Version: %{version}
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: OpenLDAP
 Group: System Environment/Daemons
 Source0: ftp://ftp.OpenLDAP.org/pub/OpenLDAP/openldap-release/openldap-%{version}.tgz
@@ -600,6 +600,9 @@
 %attr(0644,root,root)      %{evolution_connector_libdir}/*.a
 
 %changelog
+* Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> 2.4.11-3
+- rebuild with new openssl
+
 * Mon Dec 15 2008 Caol??n McNamara <caolanm at redhat.com> 2.4.11-2
 - rebuild for libltdl, i.e. copy config.sub|guess from new location
 



From tmraz at fedoraproject.org  Sat Jan 17 16:26:29 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Sat, 17 Jan 2009 16:26:29 +0000 (UTC)
Subject: rpms/openslp/devel openslp.spec,1.18,1.19
Message-ID: <20090117162629.459757012B@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/openslp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15394

Modified Files:
	openslp.spec 
Log Message:
* Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> - 1.2.1-10
- rebuild with new openssl



Index: openslp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openslp/devel/openslp.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- openslp.spec	19 Feb 2008 21:27:35 -0000	1.18
+++ openslp.spec	17 Jan 2009 16:25:58 -0000	1.19
@@ -2,7 +2,7 @@
 Summary: Open implementation of Service Location Protocol V2
 Name:    openslp
 Version: 1.2.1
-Release: 9%{?dist}
+Release: 10%{?dist}
 
 Group:   System Environment/Libraries
 License: BSD
@@ -139,6 +139,9 @@
 
 
 %changelog
+* Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> - 1.2.1-10
+- rebuild with new openssl
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1.2.1-9
 - Autorebuild for GCC 4.3
 



From tmraz at fedoraproject.org  Sat Jan 17 16:27:24 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Sat, 17 Jan 2009 16:27:24 +0000 (UTC)
Subject: rpms/openvpn/devel openvpn.spec,1.42,1.43
Message-ID: <20090117162724.A198A7012B@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/openvpn/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15620

Modified Files:
	openvpn.spec 
Log Message:
* Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> 2.1-0.31.rc15
- rebuild with new openssl



Index: openvpn.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openvpn/devel/openvpn.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- openvpn.spec	12 Dec 2008 02:52:09 -0000	1.42
+++ openvpn.spec	17 Jan 2009 16:26:54 -0000	1.43
@@ -4,7 +4,7 @@
 
 Name:              openvpn
 Version:           2.1
-Release:           0.30%{?prerelease:.%{prerelease}}%{?dist}
+Release:           0.31%{?prerelease:.%{prerelease}}%{?dist}
 Summary:           A full-featured SSL VPN solution
 URL:               http://openvpn.net/
 #Source0:           http://openvpn.net/beta/%{name}-%{version}%{?prerelease:_%{prerelease}}.tar.gz
@@ -169,6 +169,9 @@
 %config %dir %{_sysconfdir}/%{name}/
 
 %changelog
+* Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> 2.1-0.31.rc15
+- rebuild with new openssl
+
 * Thu Dec 11 2008 Steven Pritchard <steve at kspei.com> 2.1-0.30.rc15
 - Attempt to fix BZ#476129.
 



From tmraz at fedoraproject.org  Sat Jan 17 16:35:08 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Sat, 17 Jan 2009 16:35:08 +0000 (UTC)
Subject: rpms/osslsigncode/devel osslsigncode.spec,1.3,1.4
Message-ID: <20090117163508.A76937012B@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/osslsigncode/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17127

Modified Files:
	osslsigncode.spec 
Log Message:
* Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> - 1.2-5
- rebuild with new openssl



Index: osslsigncode.spec
===================================================================
RCS file: /cvs/pkgs/rpms/osslsigncode/devel/osslsigncode.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- osslsigncode.spec	20 Feb 2008 04:28:01 -0000	1.3
+++ osslsigncode.spec	17 Jan 2009 16:34:38 -0000	1.4
@@ -1,7 +1,7 @@
 Summary: Tool for Authenticode signing of EXE/CAB files
 Name: osslsigncode
 Version: 1.2
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPLv2+
 Group: Applications/System
 URL: http://sourceforge.net/projects/osslsigncode/
@@ -42,6 +42,9 @@
 
 
 %changelog
+* Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> - 1.2-5
+- rebuild with new openssl
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1.2-4
 - Autorebuild for GCC 4.3
 



From tmraz at fedoraproject.org  Sat Jan 17 16:37:42 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Sat, 17 Jan 2009 16:37:42 +0000 (UTC)
Subject: rpms/pam_mount/devel pam_mount.spec,1.48,1.49
Message-ID: <20090117163742.7CF117012B@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/pam_mount/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17493

Modified Files:
	pam_mount.spec 
Log Message:
* Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> - 1.4-2
- rebuild with new openssl



Index: pam_mount.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pam_mount/devel/pam_mount.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- pam_mount.spec	2 Dec 2008 21:02:08 -0000	1.48
+++ pam_mount.spec	17 Jan 2009 16:37:12 -0000	1.49
@@ -1,6 +1,6 @@
 Name:           pam_mount
 Version:        1.4
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A PAM module that can mount volumes for a user session
 
 Group:          System Environment/Base
@@ -89,6 +89,9 @@
 
 
 %changelog
+* Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> - 1.4-2
+- rebuild with new openssl
+
 * Thu Nov 27 2008 Till Maas <opensource at till.name> - 1.4-1
 - Update to new release
 - Add patch to support fsck mount option



From tmraz at fedoraproject.org  Sat Jan 17 16:39:23 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Sat, 17 Jan 2009 16:39:23 +0000 (UTC)
Subject: rpms/paraview/devel paraview.spec,1.28,1.29
Message-ID: <20090117163923.F1E137012B@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/paraview/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17738

Modified Files:
	paraview.spec 
Log Message:
* Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> - 3.4.0-3
- rebuild with new openssl



Index: paraview.spec
===================================================================
RCS file: /cvs/pkgs/rpms/paraview/devel/paraview.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- paraview.spec	1 Dec 2008 05:03:51 -0000	1.28
+++ paraview.spec	17 Jan 2009 16:38:53 -0000	1.29
@@ -6,7 +6,7 @@
 
 Name:           paraview
 Version:        %{pv_majmin}.%{pv_patch}
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Parallel visualization application
 
 Group:          Applications/Engineering
@@ -322,6 +322,9 @@
 
 
 %changelog
+* Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> - 3.4.0-3
+- rebuild with new openssl
+
 * Sun Nov 30 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 3.4.0-2
 - Rebuild for Python 2.6
 



From tmraz at fedoraproject.org  Sat Jan 17 16:41:21 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Sat, 17 Jan 2009 16:41:21 +0000 (UTC)
Subject: rpms/perl-Crypt-OpenSSL-AES/devel perl-Crypt-OpenSSL-AES.spec, 1.7, 
	1.8
Message-ID: <20090117164121.1CEE97012B@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/perl-Crypt-OpenSSL-AES/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18051

Modified Files:
	perl-Crypt-OpenSSL-AES.spec 
Log Message:
* Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> - 0.02-6
- rebuild with new openssl



Index: perl-Crypt-OpenSSL-AES.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Crypt-OpenSSL-AES/devel/perl-Crypt-OpenSSL-AES.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- perl-Crypt-OpenSSL-AES.spec	7 Mar 2008 01:57:25 -0000	1.7
+++ perl-Crypt-OpenSSL-AES.spec	17 Jan 2009 16:40:50 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           perl-Crypt-OpenSSL-AES
 Version:        0.02
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Perl interface to OpenSSL for AES
 License:        GPL+ or Artistic 
 Group:          Development/Libraries
@@ -46,6 +46,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> - 0.02-6
+- rebuild with new openssl
+
 * Thu Mar 06 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.02-5
 Rebuild for new perl
 



From tmraz at fedoraproject.org  Sat Jan 17 16:43:45 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Sat, 17 Jan 2009 16:43:45 +0000 (UTC)
Subject: rpms/perl-Crypt-OpenSSL-Bignum/devel perl-Crypt-OpenSSL-Bignum.spec,
	1.7, 1.8
Message-ID: <20090117164345.3EE9A7012B@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/perl-Crypt-OpenSSL-Bignum/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18372

Modified Files:
	perl-Crypt-OpenSSL-Bignum.spec 
Log Message:
* Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> 0.04-5
- rebuild with new openssl



Index: perl-Crypt-OpenSSL-Bignum.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Crypt-OpenSSL-Bignum/devel/perl-Crypt-OpenSSL-Bignum.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- perl-Crypt-OpenSSL-Bignum.spec	5 Mar 2008 18:28:17 -0000	1.7
+++ perl-Crypt-OpenSSL-Bignum.spec	17 Jan 2009 16:43:14 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           perl-Crypt-OpenSSL-Bignum
 Version:        0.04
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Perl interface to OpenSSL for Bignum
 License:        GPL+ or Artistic 
 Group:          Development/Libraries
@@ -46,6 +46,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> 0.04-5
+- rebuild with new openssl
+
 * Wed Mar  5 2008 Tom "spot" Callaway <tcallawa at redhat.com> 0.04-4
 - rebuild for new perl
 



From pmatilai at fedoraproject.org  Sat Jan 17 17:06:13 2009
From: pmatilai at fedoraproject.org (Panu Matilainen)
Date: Sat, 17 Jan 2009 17:06:13 +0000 (UTC)
Subject: rpms/sqlite/F-10 sqlite-3.5.9-nan-ix86-fix.patch, NONE,
	1.1 sqlite.spec, 1.41, 1.42
Message-ID: <20090117170613.1A3D77012B@cvs1.fedora.phx.redhat.com>

Author: pmatilai

Update of /cvs/pkgs/rpms/sqlite/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21367

Modified Files:
	sqlite.spec 
Added Files:
	sqlite-3.5.9-nan-ix86-fix.patch 
Log Message:
- Floating point handling fix on x86 (#474260)


sqlite-3.5.9-nan-ix86-fix.patch:

--- NEW FILE sqlite-3.5.9-nan-ix86-fix.patch ---
diff -up sqlite-3.5.9/src/util.c.nan-ix86-fix sqlite-3.5.9/src/util.c
--- sqlite-3.5.9/src/util.c.nan-ix86-fix	2008-05-13 19:41:50.000000000 +0300
+++ sqlite-3.5.9/src/util.c	2009-01-17 12:30:30.000000000 +0200
@@ -35,7 +35,8 @@ int sqlite3IsNaN(double x){
   **      rules/specifications for math functions.
   */
   volatile double y = x;
-  return x!=y;
+  volatile double z = y;
+  return y!=z;
 }
 
 /*


Index: sqlite.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sqlite/F-10/sqlite.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- sqlite.spec	30 Sep 2008 05:43:16 -0000	1.41
+++ sqlite.spec	17 Jan 2009 17:05:41 -0000	1.42
@@ -6,7 +6,7 @@
 Summary: Library that implements an embeddable SQL database engine
 Name: sqlite
 Version: 3.5.9
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: Public Domain
 Group: 	Applications/Databases
 URL: http://www.sqlite.org/
@@ -16,11 +16,13 @@
 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
+# Upstream fix http://www.sqlite.org/cvstrac/chngview?cn=5396
+Patch4: sqlite-3.5.9-nan-ix86-fix.patch
 Obsoletes: sqlite3 sqlite3-devel
-BuildRequires: ncurses-devel readline-devel glibc-devel
+BuildRequires: ncurses-devel%{?_isa} readline-devel glibc-devel%{?_isa}
 BuildRequires: /usr/bin/tclsh
 %if %{with tcl}
-BuildRequires: tcl-devel
+BuildRequires: tcl-devel%{_isa}
 %endif
 BuildRoot: %{_tmppath}/%{name}-root
 
@@ -58,6 +60,7 @@
 %patch1 -p1 -b .pkgconf
 %patch2 -p1 -b .libdl
 %patch3 -p1 -b .remove-temp
+%patch4 -p1 -b .nan-ix86-fix
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS -DSQLITE_ENABLE_COLUMN_METADATA=1 -DSQLITE_DISABLE_DIRSYNC=1 -Wall"
@@ -116,6 +119,9 @@
 %endif
 
 %changelog
+* Sat Jan 17 2009 Panu Matilainen <pmatilai at redhat.com> - 3.5.9-3
+- Floating point handling fix on x86 (#474260)
+
 * 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)



From spot at fedoraproject.org  Sat Jan 17 17:22:12 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Sat, 17 Jan 2009 17:22:12 +0000 (UTC)
Subject: rpms/lincity-ng/devel lincity-ng.spec,1.19,1.20
Message-ID: <20090117172212.4C9067012B@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/extras/rpms/lincity-ng/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23107

Modified Files:
	lincity-ng.spec 
Log Message:
fix requires on dejavu-sans-fonts


Index: lincity-ng.spec
===================================================================
RCS file: /cvs/extras/rpms/lincity-ng/devel/lincity-ng.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- lincity-ng.spec	12 Jan 2009 20:04:55 -0000	1.19
+++ lincity-ng.spec	17 Jan 2009 17:21:41 -0000	1.20
@@ -1,6 +1,6 @@
 Name:		lincity-ng
 Version:	1.97
-Release:	0.2.beta%{?dist}
+Release:	0.3.beta%{?dist}
 License:	GPLv2+
 Group:		Amusements/Games
 Summary:	City Simulation Game
@@ -24,7 +24,7 @@
 License:	GPLv2+ or CC-BY-SA
 Group:		Amusements/Games
 Requires:	%{name} = %{version}-%{release}
-Requires:	dejavu-fonts-sans
+Requires:	dejavu-sans-fonts
 
 %description data
 This package contains the data files (graphics, models, audio) necessary to
@@ -70,6 +70,9 @@
 %{_datadir}/lincity-ng/
 
 %changelog
+* Sat Jan 17 2009 Tom "spot" Callaway <tcallawa at redhat.com> 1.97-0.3.beta
+- fix Requires: dejavu-sans-fonts
+
 * Mon Jan 12 2009 Tom "spot" Callaway <tcallawa at redhat.com> 1.97-0.2.beta
 - do not bundle font in data subpackage, use symlink and Requires: dejavu-fonts-sans
 



From kkofler at fedoraproject.org  Sat Jan 17 18:23:41 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Sat, 17 Jan 2009 18:23:41 +0000 (UTC)
Subject: rpms/rasqal/devel rasqal.spec,1.6,1.7
Message-ID: <20090117182341.707F67012B@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/rasqal/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29842/devel

Modified Files:
	rasqal.spec 
Log Message:
* Sat Jan 17 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 0.9.15-3
- disable testsuite so this builds
- rebuild for pkg-config Provides


Index: rasqal.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rasqal/devel/rasqal.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- rasqal.spec	23 Nov 2008 13:54:29 -0000	1.6
+++ rasqal.spec	17 Jan 2009 18:23:10 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           rasqal
 Version:        0.9.15
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        RDF Query Library
 
 Group:          System Environment/Libraries
@@ -14,7 +14,8 @@
 BuildRequires:  gtk-doc
 BuildRequires:  pcre-devel
 BuildRequires:  libxml2-devel
-BuildRequires:  perl(XML::DOM)
+# for the testsuite
+#BuildRequires:  perl(XML::DOM)
 
 # to avoid /usr/lib64 rpath on x86_64
 BuildRequires:  libtool
@@ -49,7 +50,7 @@
 make LIBTOOL=/usr/bin/libtool %{?_smp_mflags}
 
 %check
-make check
+#make check
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -92,6 +93,10 @@
 %{_datadir}/gtk-doc/html
 
 %changelog
+* Sat Jan 17 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 0.9.15-3
+- disable testsuite so this builds
+- rebuild for pkg-config Provides
+
 * Sun Nov 23 2008 Thomas Vander Stichele <thomas at apestaart dot org>
 - 0.9.15-2
 - update summary



From tmraz at fedoraproject.org  Sat Jan 17 18:56:48 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Sat, 17 Jan 2009 18:56:48 +0000 (UTC)
Subject: rpms/perl-Crypt-OpenSSL-DSA/devel perl-Crypt-OpenSSL-DSA.spec, 1.5, 
	1.6
Message-ID: <20090117185648.6753A7012B@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/perl-Crypt-OpenSSL-DSA/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1267

Modified Files:
	perl-Crypt-OpenSSL-DSA.spec 
Log Message:
* Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> - 0.13-8
- rebuild with new openssl



Index: perl-Crypt-OpenSSL-DSA.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Crypt-OpenSSL-DSA/devel/perl-Crypt-OpenSSL-DSA.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perl-Crypt-OpenSSL-DSA.spec	5 Mar 2008 22:50:22 -0000	1.5
+++ perl-Crypt-OpenSSL-DSA.spec	17 Jan 2009 18:56:18 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           perl-Crypt-OpenSSL-DSA
 Version:        0.13
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Perl interface to OpenSSL for DSA
 License:        GPL+ or Artistic 
 Group:          Development/Libraries
@@ -47,6 +47,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> - 0.13-8
+- rebuild with new openssl
+
 * Wed Mar  5 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.13-7
 - rebuild for new perl
 



From tmraz at fedoraproject.org  Sat Jan 17 18:57:19 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Sat, 17 Jan 2009 18:57:19 +0000 (UTC)
Subject: rpms/perl-Crypt-OpenSSL-PKCS10/devel perl-Crypt-OpenSSL-PKCS10.spec,
	1.5, 1.6
Message-ID: <20090117185719.5B8707012B@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/perl-Crypt-OpenSSL-PKCS10/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1350

Modified Files:
	perl-Crypt-OpenSSL-PKCS10.spec 
Log Message:
* Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> - 0.06-10
- rebuild with new openssl



Index: perl-Crypt-OpenSSL-PKCS10.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Crypt-OpenSSL-PKCS10/devel/perl-Crypt-OpenSSL-PKCS10.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perl-Crypt-OpenSSL-PKCS10.spec	7 Mar 2008 01:57:34 -0000	1.5
+++ perl-Crypt-OpenSSL-PKCS10.spec	17 Jan 2009 18:56:49 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           perl-Crypt-OpenSSL-PKCS10
 Version:        0.06
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        Perl interface to OpenSSL for PKCS10
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -56,6 +56,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> - 0.06-10
+- rebuild with new openssl
+
 * Thu Mar 06 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.06-9
 Rebuild for new perl
 



From tmraz at fedoraproject.org  Sat Jan 17 18:57:44 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Sat, 17 Jan 2009 18:57:44 +0000 (UTC)
Subject: rpms/perl-Crypt-OpenSSL-Random/devel perl-Crypt-OpenSSL-Random.spec,
	1.4, 1.5
Message-ID: <20090117185744.C6F8F7012B@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/perl-Crypt-OpenSSL-Random/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1492

Modified Files:
	perl-Crypt-OpenSSL-Random.spec 
Log Message:
* Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> - 0.04-6
- rebuild with new openssl



Index: perl-Crypt-OpenSSL-Random.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Crypt-OpenSSL-Random/devel/perl-Crypt-OpenSSL-Random.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-Crypt-OpenSSL-Random.spec	5 Mar 2008 18:29:40 -0000	1.4
+++ perl-Crypt-OpenSSL-Random.spec	17 Jan 2009 18:57:14 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           perl-Crypt-OpenSSL-Random
 Version:        0.04
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Perl interface to OpenSSL for Random
 License:        GPL+ or Artistic 
 Group:          Development/Libraries
@@ -48,6 +48,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> - 0.04-6
+- rebuild with new openssl
+
 * Wed Mar  5 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.04-5
 - rebuild for new perl
 



From tmraz at fedoraproject.org  Sat Jan 17 19:02:37 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Sat, 17 Jan 2009 19:02:37 +0000 (UTC)
Subject: rpms/perl-Crypt-OpenSSL-RSA/devel perl-Crypt-OpenSSL-RSA.spec, 1.7, 
	1.8
Message-ID: <20090117190237.B53317012B@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/perl-Crypt-OpenSSL-RSA/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2077

Modified Files:
	perl-Crypt-OpenSSL-RSA.spec 
Log Message:
* Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> - 0.25-7
- rebuild with new openssl



Index: perl-Crypt-OpenSSL-RSA.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Crypt-OpenSSL-RSA/devel/perl-Crypt-OpenSSL-RSA.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- perl-Crypt-OpenSSL-RSA.spec	19 Jun 2008 19:00:32 -0000	1.7
+++ perl-Crypt-OpenSSL-RSA.spec	17 Jan 2009 19:02:07 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           perl-Crypt-OpenSSL-RSA
 Version:        0.25
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Perl interface to OpenSSL for RSA
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -50,6 +50,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> - 0.25-7
+- rebuild with new openssl
+
 * Wed Jun 18 2008 Wes Hardaker <wjhns174 at hardakers.net> - 0.25-6
 - Fix bug 451900: force-require the bignum module
 



From tmraz at fedoraproject.org  Sat Jan 17 19:04:08 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Sat, 17 Jan 2009 19:04:08 +0000 (UTC)
Subject: rpms/perl-Crypt-SSLeay/devel perl-Crypt-SSLeay.spec,1.37,1.38
Message-ID: <20090117190408.39EE77012B@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/perl-Crypt-SSLeay/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2354

Modified Files:
	perl-Crypt-SSLeay.spec 
Log Message:
* Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> - 0.57-10
- rebuild with new openssl



Index: perl-Crypt-SSLeay.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Crypt-SSLeay/devel/perl-Crypt-SSLeay.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- perl-Crypt-SSLeay.spec	6 Oct 2008 12:59:25 -0000	1.37
+++ perl-Crypt-SSLeay.spec	17 Jan 2009 19:03:38 -0000	1.38
@@ -1,7 +1,7 @@
 Name:           perl-Crypt-SSLeay
 Summary:        Crypt::SSLeay - OpenSSL glue that provides LWP https support
 Version:        0.57
-Release:        9%{?dist}
+Release:        10%{?dist}
 License:        GPL+ or Artistic
 Group:          Development/Libraries
 Source0:        http://www.cpan.org/authors/id/D/DL/DLAND/Crypt-SSLeay-%{version}.tar.gz
@@ -86,6 +86,9 @@
 
 
 %changelog
+* Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> - 0.57-10
+- rebuild with new openssl
+
 * Mon Oct  6 2008 Marcela Maslanova <mmaslano at redhat.com> - 0.57-9
 - add examples into doc
 



From tmraz at fedoraproject.org  Sat Jan 17 19:04:32 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Sat, 17 Jan 2009 19:04:32 +0000 (UTC)
Subject: rpms/perl-Crypt-OpenSSL-X509/devel perl-Crypt-OpenSSL-X509.spec, 1.7,
	1.8
Message-ID: <20090117190432.01D8E7012B@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/perl-Crypt-OpenSSL-X509/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2409

Modified Files:
	perl-Crypt-OpenSSL-X509.spec 
Log Message:
* Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> - 0.7-2
- rebuild with new openssl



Index: perl-Crypt-OpenSSL-X509.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Crypt-OpenSSL-X509/devel/perl-Crypt-OpenSSL-X509.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- perl-Crypt-OpenSSL-X509.spec	21 Jul 2008 16:05:49 -0000	1.7
+++ perl-Crypt-OpenSSL-X509.spec	17 Jan 2009 19:04:01 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           perl-Crypt-OpenSSL-X509
 Version:        0.7
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Perl interface to OpenSSL for X509
 License:        GPL+ or Artistic 
 Group:          Development/Libraries
@@ -47,6 +47,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> - 0.7-2
+- rebuild with new openssl
+
 * Mon Jul 21 2008 Wes Hardaker <wjhns174 at hardakers.net> - 0.7-1
 - Updated to upstream 0.7
 



From pfj at fedoraproject.org  Sat Jan 17 19:29:35 2009
From: pfj at fedoraproject.org (Paul F. Johnson)
Date: Sat, 17 Jan 2009 19:29:35 +0000 (UTC)
Subject: rpms/mono-debugger/devel import.log, 1.6, 1.7 mono-debugger.spec,
	1.19, 1.20
Message-ID: <20090117192935.9730E7012B@cvs1.fedora.phx.redhat.com>

Author: pfj

Update of /cvs/pkgs/rpms/mono-debugger/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5478/devel

Modified Files:
	import.log mono-debugger.spec 
Log Message:

Fix lib64 problem in configure.in 



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/mono-debugger/devel/import.log,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- import.log	17 Jan 2009 00:08:12 -0000	1.6
+++ import.log	17 Jan 2009 19:29:05 -0000	1.7
@@ -4,3 +4,4 @@
 mono-debugger-2_2-1_pre1_fc10:HEAD:mono-debugger-2.2-1.pre1.fc10.src.rpm:1227710038
 mono-debugger-2_2-3_RC2_20090109svn122605_fc11:HEAD:mono-debugger-2.2-3.RC2.20090109svn122605.fc11.src.rpm:1231634063
 mono-debugger-2_4-1_20090116svn123514_fc11:HEAD:mono-debugger-2.4-1.20090116svn123514.fc11.src.rpm:1232150631
+mono-debugger-2_4-2_20090116svn123514_fc11:HEAD:mono-debugger-2.4-2.20090116svn123514.fc11.src.rpm:1232220493


Index: mono-debugger.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mono-debugger/devel/mono-debugger.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- mono-debugger.spec	17 Jan 2009 00:08:12 -0000	1.19
+++ mono-debugger.spec	17 Jan 2009 19:29:05 -0000	1.20
@@ -3,7 +3,7 @@
 Summary: A debugger for Mono
 Name: mono-debugger
 Version: 2.4
-Release: 1.20090116svn%{svnver}%{?dist}
+Release: 2.20090116svn%{svnver}%{?dist}
 License: MIT
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 URL: http://www.go-mono.com/sources-stable/
@@ -52,6 +52,7 @@
            sed -i -e 's!${exec_prefix}/lib!%{_libdir}!' "$f" ;
          done
 
+sed -i -e 's!$(prefix)/lib!%{_libdir}!' configure.in
 sed -i -e 's!/usr/lib!%{_libdir}!' mono-debugger-frontend.pc.in
 sed -i -e 's!${prefix}/lib/!%{_libdir}/!' mono-debugger-frontend.pc.in
 
@@ -93,6 +94,9 @@
 %{_libdir}/pkgconfig/mono-debugger-frontend.pc
 
 %changelog
+* Sat Jan 17 2009 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.4-2.20090116svn123514
+- Fix lib64 issue in configure.in
+
 * Fri Jan 16 2009 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.4-1.20090116svn123514
 - Move to 2.4 branch
 



From tmraz at fedoraproject.org  Sat Jan 17 19:31:59 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Sat, 17 Jan 2009 19:31:59 +0000 (UTC)
Subject: rpms/openssl/devel openssl-0.9.8j-fips-no-pairwise.patch, NONE,
	1.1 openssl.spec, 1.116, 1.117
Message-ID: <20090117193159.625717012B@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/openssl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5854

Modified Files:
	openssl.spec 
Added Files:
	openssl-0.9.8j-fips-no-pairwise.patch 
Log Message:
* Sat Jan 16 2009 Tomas Mraz <tmraz at redhat.com> 0.9.8j-4
- no pairwise key tests in non-fips mode (#479817)


openssl-0.9.8j-fips-no-pairwise.patch:

--- NEW FILE openssl-0.9.8j-fips-no-pairwise.patch ---
diff -up openssl-0.9.8j/fips/rsa/fips_rsa_gen.c.no-pairwise openssl-0.9.8j/fips/rsa/fips_rsa_gen.c
--- openssl-0.9.8j/fips/rsa/fips_rsa_gen.c.no-pairwise	2009-01-17 20:27:37.000000000 +0100
+++ openssl-0.9.8j/fips/rsa/fips_rsa_gen.c	2009-01-17 20:27:28.000000000 +0100
@@ -288,7 +288,7 @@ static int rsa_builtin_keygen(RSA *rsa, 
 	if (fips_rsa_pairwise_fail)
 		BN_add_word(rsa->n, 1);
 
-	if(!fips_check_rsa(rsa))
+	if(FIPS_mode() && !fips_check_rsa(rsa))
 	    goto err;
 
 	ok=1;
diff -up openssl-0.9.8j/fips/dsa/fips_dsa_key.c.no-pairwise openssl-0.9.8j/fips/dsa/fips_dsa_key.c
--- openssl-0.9.8j/fips/dsa/fips_dsa_key.c.no-pairwise	2008-09-16 12:12:15.000000000 +0200
+++ openssl-0.9.8j/fips/dsa/fips_dsa_key.c	2009-01-17 20:26:20.000000000 +0100
@@ -154,7 +154,7 @@ static int dsa_builtin_keygen(DSA *dsa)
 	dsa->pub_key=pub_key;
 	if (fips_dsa_pairwise_fail)
 		BN_add_word(dsa->pub_key, 1);
-	if(!fips_check_dsa(dsa))
+	if(FIPS_mode() && !fips_check_dsa(dsa))
 	    goto err;
 	ok=1;
 


Index: openssl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openssl/devel/openssl.spec,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -r1.116 -r1.117
--- openssl.spec	16 Jan 2009 16:11:07 -0000	1.116
+++ openssl.spec	17 Jan 2009 19:31:29 -0000	1.117
@@ -23,7 +23,7 @@
 Summary: A general purpose cryptography library with TLS implementation
 Name: openssl
 Version: 0.9.8j
-Release: 3%{?dist}
+Release: 4%{?dist}
 # We remove certain patented algorithms from the openssl source tarball
 # with the hobble-openssl script which is included below.
 Source: openssl-%{version}-usa.tar.bz2
@@ -63,6 +63,7 @@
 Patch46: openssl-0.9.8j-eap-fast.patch
 Patch47: openssl-0.9.8j-readme-warning.patch
 Patch48: openssl-0.9.8j-bad-mime.patch
+Patch49: openssl-0.9.8j-fips-no-pairwise.patch
 # Backported fixes including security fixes
 
 License: OpenSSL
@@ -146,6 +147,7 @@
 %patch46 -p1 -b .eap-fast
 %patch47 -p1 -b .warning
 %patch48 -p1 -b .bad-mime
+%patch49 -p1 -b .no-pairwise
 
 # Modify the various perl scripts to reference perl in the right location.
 perl util/perlpath.pl `dirname %{__perl}`
@@ -412,6 +414,9 @@
 /sbin/ldconfig -X
 
 %changelog
+* Sat Jan 16 2009 Tomas Mraz <tmraz at redhat.com> 0.9.8j-4
+- no pairwise key tests in non-fips mode (#479817)
+
 * Fri Jan 16 2009 Tomas Mraz <tmraz at redhat.com> 0.9.8j-3
 - even more robust test for the temporary symlinks
 



From steve at fedoraproject.org  Sat Jan 17 19:32:35 2009
From: steve at fedoraproject.org (Steven Pritchard)
Date: Sat, 17 Jan 2009 19:32:35 +0000 (UTC)
Subject: rpms/perl-Image-Math-Constrain/devel .cvsignore, 1.2,
	1.3 perl-Image-Math-Constrain.spec, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <20090117193235.125A77012B@cvs1.fedora.phx.redhat.com>

Author: steve

Update of /cvs/pkgs/rpms/perl-Image-Math-Constrain/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5945

Modified Files:
	.cvsignore perl-Image-Math-Constrain.spec sources 
Log Message:
Update to 1.02.
BR Test::More, Test::CPAN::Meta, and Test::MinimumVersion.
Set AUTOMATED_TESTING so we run the pod and meta tests.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Image-Math-Constrain/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	18 May 2007 22:52:11 -0000	1.2
+++ .cvsignore	17 Jan 2009 19:32:04 -0000	1.3
@@ -1 +1 @@
-Image-Math-Constrain-1.01.tar.gz
+Image-Math-Constrain-1.02.tar.gz


Index: perl-Image-Math-Constrain.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Image-Math-Constrain/devel/perl-Image-Math-Constrain.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-Image-Math-Constrain.spec	5 Mar 2008 22:30:40 -0000	1.2
+++ perl-Image-Math-Constrain.spec	17 Jan 2009 19:32:04 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-Image-Math-Constrain
-Version:        1.01
-Release:        2%{?dist}
+Version:        1.02
+Release:        1%{?dist}
 Summary:        Scaling math used in image size constraining (such as thumbnails)
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -9,7 +9,10 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 BuildRequires:  perl(ExtUtils::MakeMaker)
-BuildRequires:  perl(Test::Pod)
+BuildRequires:  perl(Test::Pod) >= 1.26
+BuildRequires:  perl(Test::More) >= 0.47
+BuildRequires:  perl(Test::CPAN::Meta) >= 0.12
+BuildRequires:  perl(Test::MinimumVersion) >= 0.008
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
@@ -37,7 +40,7 @@
 %{_fixperms} $RPM_BUILD_ROOT/*
 
 %check
-make test
+make test AUTOMATED_TESTING=1
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -49,6 +52,11 @@
 %{_mandir}/man3/*
 
 %changelog
+* Tue Aug 05 2008 Steven Pritchard <steve at kspei.com> 1.02-1
+- Update to 1.02.
+- BR Test::More, Test::CPAN::Meta, and Test::MinimumVersion.
+- Set AUTOMATED_TESTING so we run the pod and meta tests.
+
 * Wed Mar 05 2008 Tom "spot" Callaway <tcallawa at redhat.com> 1.01-2
 - rebuild for new perl
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Image-Math-Constrain/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	18 May 2007 22:52:12 -0000	1.2
+++ sources	17 Jan 2009 19:32:04 -0000	1.3
@@ -1 +1 @@
-92980c42977b0dfe9dba715d405313b0  Image-Math-Constrain-1.01.tar.gz
+74edb272d148b26e9ac60ce25d960a92  Image-Math-Constrain-1.02.tar.gz



From tmraz at fedoraproject.org  Sat Jan 17 19:37:26 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Sat, 17 Jan 2009 19:37:26 +0000 (UTC)
Subject: rpms/perl-Net-SSLeay/devel perl-Net-SSLeay.spec,1.11,1.12
Message-ID: <20090117193726.4DCDA7012B@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/perl-Net-SSLeay/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6863

Modified Files:
	perl-Net-SSLeay.spec 
Log Message:
* Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> - 1.35-2
- rebuild with new openssl



Index: perl-Net-SSLeay.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Net-SSLeay/devel/perl-Net-SSLeay.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- perl-Net-SSLeay.spec	28 Jul 2008 15:10:39 -0000	1.11
+++ perl-Net-SSLeay.spec	17 Jan 2009 19:36:55 -0000	1.12
@@ -1,6 +1,6 @@
 Name:		perl-Net-SSLeay
 Version:	1.35
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Perl extension for using OpenSSL
 Group:		Development/Libraries
 License:	OpenSSL
@@ -64,6 +64,9 @@
 %{_mandir}/man3/Net::SSLeay*.3*
 
 %changelog
+* Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> - 1.35-2
+- rebuild with new openssl
+
 * Mon Jul 28 2008 Paul Howarth <paul at city-fan.org> - 1.35-1
 - update to 1.35
 - drop flag and patch for enabling/disabling external tests - patch now upstream



From tmraz at fedoraproject.org  Sat Jan 17 19:38:47 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Sat, 17 Jan 2009 19:38:47 +0000 (UTC)
Subject: rpms/pinot/devel pinot.spec,1.37,1.38
Message-ID: <20090117193847.E08A17012B@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/pinot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7592

Modified Files:
	pinot.spec 
Log Message:
* Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> 0.89-4
- rebuild with new openssl



Index: pinot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pinot/devel/pinot.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- pinot.spec	26 Dec 2008 10:30:09 -0000	1.37
+++ pinot.spec	17 Jan 2009 19:38:17 -0000	1.38
@@ -1,6 +1,6 @@
 Name:  pinot
 Version: 0.89
-Release: 3%{?dist}
+Release: 4%{?dist}
 Summary: Personal search and metasearch for the Desktop      
 
 Group: User Interface/Desktops        
@@ -121,6 +121,9 @@
 
 
 %changelog
+* Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> 0.89-4
+- rebuild with new openssl
+
 * Fri Dec 26 2008 Adel Gadllah <adel.gadllah at gmail.com> 0.89-3
 - Port to gmime-2.4 api
 



From tmraz at fedoraproject.org  Sat Jan 17 19:44:50 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Sat, 17 Jan 2009 19:44:50 +0000 (UTC)
Subject: rpms/pl/devel pl.spec,1.52,1.53
Message-ID: <20090117194450.574517012B@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/pl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8374

Modified Files:
	pl.spec 
Log Message:
* Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> - 5.6.60-3
- rebuild with new openssl



Index: pl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pl/devel/pl.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- pl.spec	19 Sep 2008 16:10:44 -0000	1.52
+++ pl.spec	17 Jan 2009 19:44:19 -0000	1.53
@@ -3,7 +3,7 @@
 
 Name:		pl
 Version:	5.6.60
-Release:	2%{?dist}
+Release:	3%{?dist}
 
 Summary:	SWI-Prolog - Edinburgh compatible Prolog compiler
 
@@ -227,6 +227,9 @@
 
 
 %changelog
+* Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> - 5.6.60-3
+- rebuild with new openssl
+
 * Fri Sep 19 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 5.6.60-2
 - forgot to remove ANNOUNCE from doc list
 



From tmraz at fedoraproject.org  Sat Jan 17 19:45:13 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Sat, 17 Jan 2009 19:45:13 +0000 (UTC)
Subject: rpms/player/devel player.spec,1.5,1.6
Message-ID: <20090117194513.729087012B@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/player/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8467

Modified Files:
	player.spec 
Log Message:
* Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> - 2.1.1-9
- rebuild with new openssl



Index: player.spec
===================================================================
RCS file: /cvs/pkgs/rpms/player/devel/player.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- player.spec	21 Dec 2008 17:54:13 -0000	1.5
+++ player.spec	17 Jan 2009 19:44:43 -0000	1.6
@@ -2,7 +2,7 @@
 
 Name:           player
 Version:        2.1.1
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        Cross-platform robot device interface and server
 
 Group:          Applications/System
@@ -199,6 +199,9 @@
 %{_libdir}/*.a
 
 %changelog
+* Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> - 2.1.1-9
+- rebuild with new openssl
+
 * Sun Dec 21 2008 Tim Niemueller <tim at niemueller.de> - 2.1.1-8
 - Add patch for broken linux/serial.h (thanks to Caol??n McNamara)
 - Add patch for GCC 4.4 (thanks to Caol??n McNamara)



From tmraz at fedoraproject.org  Sat Jan 17 19:46:46 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Sat, 17 Jan 2009 19:46:46 +0000 (UTC)
Subject: rpms/postgresql/devel postgresql.spec,1.103,1.104
Message-ID: <20090117194646.832E27012B@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/postgresql/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8845

Modified Files:
	postgresql.spec 
Log Message:
* Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> - 8.3.5-3
- rebuild with new openssl



Index: postgresql.spec
===================================================================
RCS file: /cvs/pkgs/rpms/postgresql/devel/postgresql.spec,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -r1.103 -r1.104
--- postgresql.spec	29 Nov 2008 17:56:28 -0000	1.103
+++ postgresql.spec	17 Jan 2009 19:46:16 -0000	1.104
@@ -83,7 +83,7 @@
 Summary: PostgreSQL client programs and libraries
 Name: postgresql
 Version: 8.3.5
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: BSD
 Group: Applications/Databases
 Url: http://www.postgresql.org/ 
@@ -859,6 +859,9 @@
 %endif
 
 %changelog
+* Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> - 8.3.5-3
+- rebuild with new openssl
+
 * Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 8.3.5-2
 - Rebuild for Python 2.6
 



From steve at fedoraproject.org  Sat Jan 17 19:48:15 2009
From: steve at fedoraproject.org (Steven Pritchard)
Date: Sat, 17 Jan 2009 19:48:15 +0000 (UTC)
Subject: rpms/perl-Spreadsheet-ParseExcel/devel .cvsignore, 1.7,
	1.8 perl-Spreadsheet-ParseExcel.spec, 1.14, 1.15 sources, 1.7, 1.8
Message-ID: <20090117194815.B6A1A7012B@cvs1.fedora.phx.redhat.com>

Author: steve

Update of /cvs/pkgs/rpms/perl-Spreadsheet-ParseExcel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9098

Modified Files:
	.cvsignore perl-Spreadsheet-ParseExcel.spec sources 
Log Message:
Update to 0.45.
s/Get/Extract/ in Summary.
Update Source0 URL.
Update description.
Fix line endings in README and samples.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Spreadsheet-ParseExcel/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	11 Dec 2008 17:11:21 -0000	1.7
+++ .cvsignore	17 Jan 2009 19:47:45 -0000	1.8
@@ -1 +1 @@
-Spreadsheet-ParseExcel-0.33.tar.gz
+Spreadsheet-ParseExcel-0.45.tar.gz


Index: perl-Spreadsheet-ParseExcel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Spreadsheet-ParseExcel/devel/perl-Spreadsheet-ParseExcel.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- perl-Spreadsheet-ParseExcel.spec	11 Dec 2008 17:11:21 -0000	1.14
+++ perl-Spreadsheet-ParseExcel.spec	17 Jan 2009 19:47:45 -0000	1.15
@@ -2,16 +2,16 @@
 %define debug_package %{nil}
 
 # Avoid Epoch inflation
-%define module_version 0.33
+%define module_version 0.45
 
 Name:           perl-Spreadsheet-ParseExcel
-Version:        0.3300
+Version:        0.4500
 Release:        1%{?dist}
-Summary:        Get information from an Excel file
+Summary:        Extract information from an Excel file
 License:        GPL+ or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/Spreadsheet-ParseExcel/
-Source0:        http://www.cpan.org/authors/id/S/SZ/SZABGAB/Spreadsheet-ParseExcel-%{module_version}.tar.gz
+Source0:        http://www.cpan.org/authors/id/J/JM/JMCNAMARA/Spreadsheet-ParseExcel-%{module_version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  perl(IO::Scalar)
 BuildRequires:  perl(Module::Build)
@@ -25,12 +25,16 @@
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
-This module allows you to get information from an Excel file.
-The module can handle files of Excel95, 97, 2000, and Excel4.
+The Spreadsheet::ParseExcel module can be used to read information from an
+Excel 95-2003 file.
 
 %prep
 %setup -q -n Spreadsheet-ParseExcel-%{module_version}
 
+for file in README sample/* ; do
+    [ -f "$file" ] && %{__perl} -pi -e 's/\r\n/\n/' "$file"
+done
+
 %build
 %{__perl} Build.PL installdirs=vendor
 ./Build
@@ -60,8 +64,15 @@
 %{_mandir}/man3/*
 
 %changelog
+* Sat Jan 17 2009 Steven Pritchard <steve at kspei.com> 0.4500-1
+- Update to 0.45.
+- s/Get/Extract/ in Summary.
+- Update Source0 URL.
+- Update description.
+- Fix line endings in README and samples.
+
 * Thu Dec 11 2008 Steven Pritchard <steve at kspei.com> 0.3300-1
-- Update to 0.3300.
+- Update to 0.33.
 - Make Test::More dep versioned.
 - BR Test::Pod.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Spreadsheet-ParseExcel/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	11 Dec 2008 17:11:21 -0000	1.7
+++ sources	17 Jan 2009 19:47:45 -0000	1.8
@@ -1 +1 @@
-9ddfe56e9a556b8e18053467f05dabf9  Spreadsheet-ParseExcel-0.33.tar.gz
+a1340a5190c307f026c66e216d4145b4  Spreadsheet-ParseExcel-0.45.tar.gz



From steve at fedoraproject.org  Sat Jan 17 19:51:39 2009
From: steve at fedoraproject.org (Steven Pritchard)
Date: Sat, 17 Jan 2009 19:51:39 +0000 (UTC)
Subject: rpms/perl-YAML-Tiny/devel .cvsignore, 1.9, 1.10 perl-YAML-Tiny.spec,
	1.9, 1.10 sources, 1.9, 1.10
Message-ID: <20090117195139.C31A67012B@cvs1.fedora.phx.redhat.com>

Author: steve

Update of /cvs/pkgs/rpms/perl-YAML-Tiny/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9576

Modified Files:
	.cvsignore perl-YAML-Tiny.spec sources 
Log Message:
Update to 1.36.
BR Test::More.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-YAML-Tiny/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	16 May 2008 23:36:44 -0000	1.9
+++ .cvsignore	17 Jan 2009 19:51:09 -0000	1.10
@@ -1 +1 @@
-YAML-Tiny-1.32.tar.gz
+YAML-Tiny-1.36.tar.gz


Index: perl-YAML-Tiny.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-YAML-Tiny/devel/perl-YAML-Tiny.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- perl-YAML-Tiny.spec	16 May 2008 23:36:44 -0000	1.9
+++ perl-YAML-Tiny.spec	17 Jan 2009 19:51:09 -0000	1.10
@@ -1,5 +1,5 @@
 Name:           perl-YAML-Tiny
-Version:        1.32
+Version:        1.36
 Release:        1%{?dist}
 Summary:        Read/Write YAML files with as little code as possible
 License:        GPL+ or Artistic
@@ -10,6 +10,7 @@
 BuildArch:      noarch
 BuildRequires:  perl(ExtUtils::MakeMaker)
 BuildRequires:  perl(Test::MinimumVersion)
+BuildRequires:  perl(Test::More) >= 0.47
 BuildRequires:  perl(Test::Pod)
 BuildRequires:  perl(YAML)
 BuildRequires:  perl(YAML::Syck)
@@ -50,6 +51,10 @@
 %{_mandir}/man3/*
 
 %changelog
+* Sat Jan 17 2009 Steven Pritchard <steve at kspei.com> 1.36-1
+- Update to 1.36.
+- BR Test::More.
+
 * Fri May 16 2008 Steven Pritchard <steve at kspei.com> 1.32-1
 - Update to 1.32.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-YAML-Tiny/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	16 May 2008 23:36:44 -0000	1.9
+++ sources	17 Jan 2009 19:51:09 -0000	1.10
@@ -1 +1 @@
-494c5d61d5f0321b59a5b40351e504f6  YAML-Tiny-1.32.tar.gz
+4d2b19298e9f500b3fff961daf458a01  YAML-Tiny-1.36.tar.gz



From tmraz at fedoraproject.org  Sat Jan 17 20:03:28 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Sat, 17 Jan 2009 20:03:28 +0000 (UTC)
Subject: rpms/ptlib/devel ptlib.spec,1.8,1.9
Message-ID: <20090117200328.435507012B@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/ptlib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10876

Modified Files:
	ptlib.spec 
Log Message:
* Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> - 2.5.2-4
- rebuild with new openssl



Index: ptlib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ptlib/devel/ptlib.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ptlib.spec	13 Jan 2009 07:01:09 -0000	1.8
+++ ptlib.spec	17 Jan 2009 20:02:57 -0000	1.9
@@ -1,7 +1,7 @@
 Name:		ptlib
 Summary:	Portable Tools Library
 Version:	2.5.2
-Release:	3%{?dist}
+Release:	4%{?dist}
 URL:		http://www.opalvoip.org/
 Source0:	ftp://ftp.gnome.org/pub/gnome/sources/%{name}/2.5/%{name}-%{version}.tar.bz2
 License:	MPLv1.0
@@ -83,6 +83,9 @@
 %attr(755,root,root) %{_bindir}/*
 
 %changelog
+* Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> - 2.5.2-4
+- rebuild with new openssl
+
 * Tue Jan 13 2009 Peter Robinson <pbrobinson at gmail.com> - 2.5.2-3
 - Add an extra build dep
 



From tmraz at fedoraproject.org  Sat Jan 17 20:05:39 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Sat, 17 Jan 2009 20:05:39 +0000 (UTC)
Subject: rpms/pwlib/devel pwlib.spec,1.58,1.59
Message-ID: <20090117200539.A3BD47012B@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/pwlib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11196

Modified Files:
	pwlib.spec 
Log Message:
* Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> 1.10.10-11
- rebuild with new openssl



Index: pwlib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pwlib/devel/pwlib.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- pwlib.spec	30 Aug 2008 18:49:53 -0000	1.58
+++ pwlib.spec	17 Jan 2009 20:05:09 -0000	1.59
@@ -1,7 +1,7 @@
 Summary:	Portable Windows Library
 Name:		pwlib
 Version:	1.10.10
-Release:        10%{?dist}
+Release:        11%{?dist}
 URL:		http://www.openh323.org/
 Source0:	http://www.ekiga.org/pwlib-%{version}.tar.gz
 License:	MPLv1.0
@@ -101,6 +101,9 @@
 
 
 %changelog
+* Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> 1.10.10-11
+- rebuild with new openssl
+
 * Sat Aug 30 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 1.10.10-10
 - Add patch to use libv4l to support webcams which generate custom video
   formats (bz 456868)



From tmraz at fedoraproject.org  Sat Jan 17 20:06:55 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Sat, 17 Jan 2009 20:06:55 +0000 (UTC)
Subject: rpms/pwsafe/devel pwsafe.spec,1.5,1.6
Message-ID: <20090117200655.7DF5D7012B@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/pwsafe/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11427

Modified Files:
	pwsafe.spec 
Log Message:
* Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> - 0.2.0-6
- rebuild with new openssl



Index: pwsafe.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pwsafe/devel/pwsafe.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- pwsafe.spec	29 Aug 2008 20:13:09 -0000	1.5
+++ pwsafe.spec	17 Jan 2009 20:06:25 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           pwsafe
 Version:        0.2.0
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        A unix commandline program that manages encrypted password databases
 
 Group:          Applications/Databases
@@ -48,6 +48,9 @@
 
 
 %changelog
+* Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> - 0.2.0-6
+- rebuild with new openssl
+
 * Fri Aug 29 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.2.0-5
 - fix license tag
 



From tmraz at fedoraproject.org  Sat Jan 17 20:16:44 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Sat, 17 Jan 2009 20:16:44 +0000 (UTC)
Subject: rpms/pysvn/devel pysvn.spec,1.5,1.6
Message-ID: <20090117201644.DC6207012B@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/pysvn/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13158

Modified Files:
	pysvn.spec 
Log Message:
* Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> - 1.6.2-3
- rebuild with new openssl



Index: pysvn.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pysvn/devel/pysvn.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- pysvn.spec	29 Nov 2008 18:16:55 -0000	1.5
+++ pysvn.spec	17 Jan 2009 20:16:14 -0000	1.6
@@ -2,7 +2,7 @@
 
 Name:           pysvn
 Version:        1.6.2
-Release:        2%{dist}
+Release:        3%{dist}
 Summary:        Pythonic style bindings for Subversion
 Group:          Development/Languages
 License:        ASL 1.1
@@ -54,6 +54,9 @@
 %{python_sitearch}/%{name}
 
 %changelog
+* Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> - 1.6.2-3
+- rebuild with new openssl
+
 * Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 1.6.2-2
 - Rebuild for Python 2.6
 



From tmraz at fedoraproject.org  Sat Jan 17 20:18:01 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Sat, 17 Jan 2009 20:18:01 +0000 (UTC)
Subject: rpms/qca-ossl/devel qca-ossl.spec,1.5,1.6
Message-ID: <20090117201801.5EB937012B@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/qca-ossl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13461

Modified Files:
	qca-ossl.spec 
Log Message:
* Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> - 2.0.0-0.5.beta3
- rebuild with new openssl



Index: qca-ossl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qca-ossl/devel/qca-ossl.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- qca-ossl.spec	18 Feb 2008 18:29:22 -0000	1.5
+++ qca-ossl.spec	17 Jan 2009 20:17:31 -0000	1.6
@@ -2,7 +2,7 @@
 
 Name:       qca-ossl
 Version:    2.0.0
-Release:    0.4.beta%{beta}%{?dist}
+Release:    0.5.beta%{beta}%{?dist}
 
 Summary:    OpenSSL plugin for the Qt Cryptographic Architecture v2
 License:    LGPLv2+
@@ -51,6 +51,9 @@
 
 
 %changelog
+* Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> - 2.0.0-0.5.beta3
+- rebuild with new openssl
+
 * Mon Feb 18 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 2.0.0-0.4.beta3
 - Autorebuild for GCC 4.3
 



From tmraz at fedoraproject.org  Sat Jan 17 20:18:30 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Sat, 17 Jan 2009 20:18:30 +0000 (UTC)
Subject: rpms/qca-tls/devel qca-tls.spec,1.20,1.21
Message-ID: <20090117201830.4F36B7012B@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/qca-tls/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13558

Modified Files:
	qca-tls.spec 
Log Message:
* Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> 1.0-15
- rebuild with new openssl



Index: qca-tls.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qca-tls/devel/qca-tls.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- qca-tls.spec	5 Jun 2008 20:26:28 -0000	1.20
+++ qca-tls.spec	17 Jan 2009 20:18:00 -0000	1.21
@@ -1,6 +1,6 @@
 Name:		qca-tls
 Version:	1.0
-Release:	14%{?dist}
+Release:	15%{?dist}
 
 Summary:	TLS plugin for the Qt Cryptographic Architecture
 License:	LGPLv2+
@@ -56,6 +56,9 @@
 
 
 %changelog
+* Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> 1.0-15
+- rebuild with new openssl
+
 * Thu Jun 05 2008 Aurelien Bompard <abompard at fedoraproject.org> 1.0-14
 - fix build
 



From kevin at fedoraproject.org  Sat Jan 17 20:20:25 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 17 Jan 2009 20:20:25 +0000 (UTC)
Subject: rpms/xfce-utils/devel sources, 1.11, 1.12 .cvsignore, 1.11,
	1.12 xfce-utils.spec, 1.23, 1.24
Message-ID: <20090117202025.6BB437012B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13986

Modified Files:
	sources .cvsignore xfce-utils.spec 
Log Message:
Update to 4.5.93



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfce-utils/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	13 Jan 2009 22:38:50 -0000	1.11
+++ sources	17 Jan 2009 20:19:55 -0000	1.12
@@ -1 +1 @@
-8700842ab643838910ec9adfa08aa01d  xfce-utils-4.5.92.tar.bz2
+dae0c86338acb3c66e433ba8a430a977  xfce-utils-4.5.93.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfce-utils/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	13 Jan 2009 22:38:50 -0000	1.11
+++ .cvsignore	17 Jan 2009 20:19:55 -0000	1.12
@@ -1 +1 @@
-xfce-utils-4.5.92.tar.bz2
+xfce-utils-4.5.93.tar.bz2


Index: xfce-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce-utils/devel/xfce-utils.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- xfce-utils.spec	13 Jan 2009 22:38:50 -0000	1.23
+++ xfce-utils.spec	17 Jan 2009 20:19:55 -0000	1.24
@@ -2,7 +2,7 @@
 
 Summary: Utilities for the Xfce Desktop Environment
 Name: xfce-utils
-Version: 4.5.92
+Version: 4.5.93
 Release: 1%{?dist}
 License: GPLv2+
 URL: http://www.xfce.org/
@@ -23,6 +23,7 @@
 BuildRequires: dbus-devel 
 BuildRequires: dbus-glib-devel
 BuildRequires: perl(XML::Parser)
+BuildRequires: intltool
 
 %description
 This package includes utilities for the Xfce Desktop Environment
@@ -107,6 +108,9 @@
 %{_datadir}/dbus-1/services/org.xfce.RunDialog.service
 
 %changelog
+* Tue Jan 13 2009 Kevin Fenzi <kevin at tummy.com> - 4.5.93-1
+- Update to 4.5.93
+
 * Sat Dec 27 2008 Kevin Fenzi <kevin at tummy.com> - 4.5.92-1
 - Update to 4.5.92
 



From kevin at fedoraproject.org  Sat Jan 17 20:27:43 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 17 Jan 2009 20:27:43 +0000 (UTC)
Subject: rpms/xfprint/devel sources, 1.11, 1.12 .cvsignore, 1.11,
	1.12 xfprint.spec, 1.23, 1.24
Message-ID: <20090117202743.3B3787012B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfprint/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14908

Modified Files:
	sources .cvsignore xfprint.spec 
Log Message:
Update to 4.5.93



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfprint/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	13 Jan 2009 22:52:22 -0000	1.11
+++ sources	17 Jan 2009 20:27:12 -0000	1.12
@@ -1 +1 @@
-7945ab513be2a518cfaa03ba9867b066  xfprint-4.5.92.tar.bz2
+2d3b658167bfbe10ec3258d7c3d995d2  xfprint-4.5.93.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfprint/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	13 Jan 2009 22:52:22 -0000	1.11
+++ .cvsignore	17 Jan 2009 20:27:12 -0000	1.12
@@ -1 +1 @@
-xfprint-4.5.92.tar.bz2
+xfprint-4.5.93.tar.bz2


Index: xfprint.spec
===================================================================
RCS file: /cvs/extras/rpms/xfprint/devel/xfprint.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- xfprint.spec	13 Jan 2009 22:52:22 -0000	1.23
+++ xfprint.spec	17 Jan 2009 20:27:12 -0000	1.24
@@ -1,6 +1,6 @@
 Summary: Print dialog and printer manager for Xfce 4
 Name: xfprint
-Version: 4.5.92
+Version: 4.5.93
 Release: 1%{?dist}
 License: GPLv2+
 URL: http://www.xfce.org
@@ -84,6 +84,9 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Tue Jan 13 2009 Kevin Fenzi <kevin at tummy.com> - 4.5.93-1
+- Update to 4.5.93
+
 * Sat Dec 27 2008 Kevin Fenzi <kevin at tummy.com> - 4.5.92-1
 - Update to 4.5.92
 



From kevin at fedoraproject.org  Sat Jan 17 20:43:53 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 17 Jan 2009 20:43:53 +0000 (UTC)
Subject: rpms/xfwm4/devel sources, 1.12, 1.13 .cvsignore, 1.12,
	1.13 xfwm4.spec, 1.28, 1.29
Message-ID: <20090117204353.56F7F7012B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfwm4/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17453

Modified Files:
	sources .cvsignore xfwm4.spec 
Log Message:
Update to 4.5.93



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfwm4/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	13 Jan 2009 23:11:17 -0000	1.12
+++ sources	17 Jan 2009 20:43:22 -0000	1.13
@@ -1 +1 @@
-941823870ee48b025f2cb72bec9d6fd3  xfwm4-4.5.92.tar.bz2
+5655230f7323cda513cf3cc26b8bea78  xfwm4-4.5.93.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfwm4/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	13 Jan 2009 23:11:17 -0000	1.12
+++ .cvsignore	17 Jan 2009 20:43:22 -0000	1.13
@@ -1 +1 @@
-xfwm4-4.5.92.tar.bz2
+xfwm4-4.5.93.tar.bz2


Index: xfwm4.spec
===================================================================
RCS file: /cvs/extras/rpms/xfwm4/devel/xfwm4.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- xfwm4.spec	13 Jan 2009 23:11:17 -0000	1.28
+++ xfwm4.spec	17 Jan 2009 20:43:22 -0000	1.29
@@ -1,6 +1,6 @@
 Summary: Next generation window manager for Xfce
 Name: xfwm4
-Version: 4.5.92
+Version: 4.5.93
 Release: 1%{?dist}
 License: GPLv2+
 URL: http://www.xfce.org/
@@ -75,6 +75,9 @@
 %{_libexecdir}/xfce4
 
 %changelog
+* Tue Jan 13 2009 Kevin Fenzi <kevin at tummy.com> - 4.5.93-1
+- Update to 4.5.93
+
 * Sat Dec 27 2008 Kevin Fenzi <kevin at tummy.com> - 4.5.92-1
 - Update to 4.5.92
 



From mschwendt at fedoraproject.org  Sat Jan 17 20:45:23 2009
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Sat, 17 Jan 2009 20:45:23 +0000 (UTC)
Subject: rpms/audacity/F-9 audacity-1.3.5-flac-import.patch, NONE,
	1.1 audacity.spec, 1.53, 1.54
Message-ID: <20090117204523.0661E7012B@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/pkgs/rpms/audacity/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17748

Modified Files:
	audacity.spec 
Added Files:
	audacity-1.3.5-flac-import.patch 
Log Message:
* Sat Jan 17 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.3.5-0.8.beta
- build this for F-9 for the broken dependency caused by the
  changed SONAME in vamp-plugin-sdk-1.3-2.fc9

* Tue Nov  4 2008 Michael Schwendt <mschwendt at fedoraproject.org> - 1.3.5-0.8.beta
- insert a guard in ImportFLAC next to the import assertion



audacity-1.3.5-flac-import.patch:

--- NEW FILE audacity-1.3.5-flac-import.patch ---
diff -Nur audacity-src-1.3.5-beta-orig/src/import/ImportFLAC.cpp audacity-src-1.3.5-beta/src/import/ImportFLAC.cpp
--- audacity-src-1.3.5-beta-orig/src/import/ImportFLAC.cpp	2008-05-07 23:19:50.000000000 +0200
+++ audacity-src-1.3.5-beta/src/import/ImportFLAC.cpp	2008-11-07 13:48:58.000000000 +0100
@@ -370,6 +370,8 @@
               Tags *tags)
 {
    wxASSERT(mStreamInfoDone);
+   if (!mStreamInfoDone)
+      return false;
    
    mChannels = new WaveTrack *[mNumChannels];
 


Index: audacity.spec
===================================================================
RCS file: /cvs/pkgs/rpms/audacity/F-9/audacity.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- audacity.spec	4 Nov 2008 13:32:32 -0000	1.53
+++ audacity.spec	17 Jan 2009 20:44:52 -0000	1.54
@@ -5,7 +5,7 @@
 
 Name: audacity
 Version: 1.3.5
-Release: 0.7.beta%{?dist}
+Release: 0.8.beta%{?dist}
 Summary: Multitrack audio editor
 Group: Applications/Multimedia
 License: GPLv2
@@ -18,6 +18,7 @@
 Patch1: audacity-1.3.4-libmp3lame-default.patch
 Patch2: audacity-1.3.5-libdir.patch
 Patch3: audacity-1.3.5-fr.patch
+Patch4: audacity-1.3.5-flac-import.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: alsa-lib-devel
@@ -62,6 +63,7 @@
 grep -q -s __RPM_LIB * -R && exit 1
 
 %patch3 -p1 -b .fr
+%patch4 -p1 -b .dumb-flac-import
 
 # Substitute occurences of "libmp3lame.so" with "libmp3lame.so.0".
 for i in locale/*.po src/export/ExportMP3.cpp
@@ -132,6 +134,13 @@
 
 
 %changelog
+* Sat Jan 17 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.3.5-0.8.beta
+- build this for F-9 for the broken dependency caused by the
+  changed SONAME in vamp-plugin-sdk-1.3-2.fc9
+
+* Tue Nov  4 2008 Michael Schwendt <mschwendt at fedoraproject.org> - 1.3.5-0.8.beta
+- insert a guard in ImportFLAC next to the import assertion
+
 * Tue Nov  4 2008 Michael Schwendt <mschwendt at fedoraproject.org> - 1.3.5-0.7.beta
 - BR vamp-plugin-sdk-devel
 - no longer build with included Vamp API, also drop Vamp multilib patch



From tmraz at fedoraproject.org  Sat Jan 17 20:49:15 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Sat, 17 Jan 2009 20:49:15 +0000 (UTC)
Subject: rpms/openssl/devel openssl.spec,1.117,1.118
Message-ID: <20090117204915.23BD67012B@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/openssl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18356

Modified Files:
	openssl.spec 
Log Message:
* Sat Jan 16 2009 Tomas Mraz <tmraz at redhat.com> 0.9.8j-5
- add temporary triggerpostun to reinstate the symlinks



Index: openssl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openssl/devel/openssl.spec,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -r1.117 -r1.118
--- openssl.spec	17 Jan 2009 19:31:29 -0000	1.117
+++ openssl.spec	17 Jan 2009 20:48:44 -0000	1.118
@@ -413,7 +413,20 @@
 %postun
 /sbin/ldconfig -X
 
+%triggerpostun -- openssl < 0.9.8j
+[ $1 != 0 ] || exit 0
+if [ "$(readlink /%{_lib}/libcrypto.so.7)" != libcrypto.so.%{version} ] ; then
+    ln -sf libcrypto.so.%{version} /%{_lib}/libcrypto.so.7 || :
+fi
+if [ "$(readlink /%{_lib}/libssl.so.7)" != libssl.so.%{version} ] ; then
+    ln -sf libssl.so.%{version} /%{_lib}/libssl.so.7 || :
+fi
+/sbin/ldconfig -X
+
 %changelog
+* Sat Jan 16 2009 Tomas Mraz <tmraz at redhat.com> 0.9.8j-5
+- add temporary triggerpostun to reinstate the symlinks
+
 * Sat Jan 16 2009 Tomas Mraz <tmraz at redhat.com> 0.9.8j-4
 - no pairwise key tests in non-fips mode (#479817)
 



From tmraz at fedoraproject.org  Sat Jan 17 20:50:18 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Sat, 17 Jan 2009 20:50:18 +0000 (UTC)
Subject: rpms/openssl/devel openssl.spec,1.118,1.119
Message-ID: <20090117205018.DCE2F7012B@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/openssl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18548

Modified Files:
	openssl.spec 
Log Message:
* Sat Jan 16 2009 Tomas Mraz <tmraz at redhat.com> 0.9.8j-5
- add temporary triggerpostun to reinstate the symlinks



Index: openssl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openssl/devel/openssl.spec,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -r1.118 -r1.119
--- openssl.spec	17 Jan 2009 20:48:44 -0000	1.118
+++ openssl.spec	17 Jan 2009 20:49:48 -0000	1.119
@@ -23,7 +23,7 @@
 Summary: A general purpose cryptography library with TLS implementation
 Name: openssl
 Version: 0.9.8j
-Release: 4%{?dist}
+Release: 5%{?dist}
 # We remove certain patented algorithms from the openssl source tarball
 # with the hobble-openssl script which is included below.
 Source: openssl-%{version}-usa.tar.bz2



From kevin at fedoraproject.org  Sat Jan 17 20:50:41 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 17 Jan 2009 20:50:41 +0000 (UTC)
Subject: rpms/xfce4-panel/devel sources, 1.11, 1.12 .cvsignore, 1.11,
	1.12 xfce4-panel.spec, 1.29, 1.30
Message-ID: <20090117205041.40B4C7012B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce4-panel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18594

Modified Files:
	sources .cvsignore xfce4-panel.spec 
Log Message:
Update to 4.5.93



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfce4-panel/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	13 Jan 2009 23:18:47 -0000	1.11
+++ sources	17 Jan 2009 20:50:11 -0000	1.12
@@ -1 +1 @@
-a76c63aaa1a13ab9eac83651573770c4  xfce4-panel-4.5.92.tar.bz2
+96c4cccf520aa789b267b14b491359ab  xfce4-panel-4.5.93.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfce4-panel/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	13 Jan 2009 23:18:47 -0000	1.11
+++ .cvsignore	17 Jan 2009 20:50:11 -0000	1.12
@@ -1 +1 @@
-xfce4-panel-4.5.92.tar.bz2
+xfce4-panel-4.5.93.tar.bz2


Index: xfce4-panel.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-panel/devel/xfce4-panel.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- xfce4-panel.spec	13 Jan 2009 23:18:47 -0000	1.29
+++ xfce4-panel.spec	17 Jan 2009 20:50:11 -0000	1.30
@@ -1,6 +1,6 @@
 Summary: Next generation panel for Xfce
 Name: xfce4-panel
-Version: 4.5.92
+Version: 4.5.93
 Release: 1%{?dist}
 License: GPLv2+ and LGPLv2+
 URL: http://www.xfce.org/
@@ -17,7 +17,7 @@
 BuildRequires: imake
 BuildRequires: libXt-devel
 BuildRequires: gettext intltool
-BuildRequires: exo-devel >= 0.3.92
+BuildRequires: exo-devel >= 0.3.93
 BuildRequires: libwnck-devel
 
 # xfce4-iconbox isn't in Xfce 4.4
@@ -124,6 +124,9 @@
 %{_includedir}/xfce4/libxfce4panel
 
 %changelog
+* Tue Jan 13 2009 Kevin Fenzi <kevin at tummy.com> - 4.5.93-1
+- Update to 4.5.93
+
 * Sat Dec 27 2008 Kevin Fenzi <kevin at tummy.com> - 4.5.92-1
 - Update to 4.5.92
 



From tmraz at fedoraproject.org  Sat Jan 17 20:50:54 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Sat, 17 Jan 2009 20:50:54 +0000 (UTC)
Subject: rpms/qmmp/devel qmmp.spec,1.8,1.9
Message-ID: <20090117205054.C1E087012B@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/qmmp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18653

Modified Files:
	qmmp.spec 
Log Message:
* Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> 0.2.3-2
- rebuild with new openssl



Index: qmmp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qmmp/devel/qmmp.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- qmmp.spec	5 Dec 2008 13:31:18 -0000	1.8
+++ qmmp.spec	17 Jan 2009 20:50:24 -0000	1.9
@@ -1,6 +1,6 @@
 Name:		qmmp
 Version:	0.2.3
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Qt-based multimedia player
 
 Group:		Applications/Multimedia
@@ -105,6 +105,9 @@
 
 
 %changelog
+* Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> 0.2.3-2
+- rebuild with new openssl
+
 * Fri Dec 05 2008 Karel Volny <kvolny at redhat.com> 0.2.3-1
 - new version
 - added %%{?_smp_mflags} to make, as parallel build was fixed



From tmraz at fedoraproject.org  Sat Jan 17 20:53:25 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Sat, 17 Jan 2009 20:53:25 +0000 (UTC)
Subject: rpms/rdesktop/devel rdesktop.spec,1.31,1.32
Message-ID: <20090117205325.44A4B7012B@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/rdesktop/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19222

Modified Files:
	rdesktop.spec 
Log Message:
* Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> - 1.6.0-3
- rebuild with new openssl



Index: rdesktop.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rdesktop/devel/rdesktop.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- rdesktop.spec	3 Sep 2008 20:18:51 -0000	1.31
+++ rdesktop.spec	17 Jan 2009 20:52:54 -0000	1.32
@@ -1,6 +1,6 @@
 Name:           rdesktop
 Version:        1.6.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        X client for remote desktop into Windows Terminal Server
 
 Group:          User Interface/Desktops
@@ -38,6 +38,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> - 1.6.0-3
+- rebuild with new openssl
+
 * Wed Sep  3 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1.6.0-2
 - fix license tag
 



From kevin at fedoraproject.org  Sat Jan 17 20:56:22 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 17 Jan 2009 20:56:22 +0000 (UTC)
Subject: rpms/xfce4-mixer/devel sources, 1.10, 1.11 .cvsignore, 1.10,
	1.11 xfce4-mixer.desktop, 1.2, NONE
Message-ID: <20090117205622.49A947012B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce4-mixer/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19701

Modified Files:
	sources .cvsignore 
Removed Files:
	xfce4-mixer.desktop 
Log Message:
Update to 4.5.93



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfce4-mixer/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	27 Oct 2008 22:08:47 -0000	1.10
+++ sources	17 Jan 2009 20:55:51 -0000	1.11
@@ -1 +1 @@
-0d7b402acaffdb5d8b292f2ce3ea1441  xfce4-mixer-4.4.3.tar.bz2
+bb4c4b46873a576797c74e642da5c0ad  xfce4-mixer-4.5.93.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfce4-mixer/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	27 Oct 2008 22:08:47 -0000	1.10
+++ .cvsignore	17 Jan 2009 20:55:51 -0000	1.11
@@ -1 +1 @@
-xfce4-mixer-4.4.3.tar.bz2
+xfce4-mixer-4.5.93.tar.bz2


--- xfce4-mixer.desktop DELETED ---



From tmraz at fedoraproject.org  Sat Jan 17 20:58:34 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Sat, 17 Jan 2009 20:58:34 +0000 (UTC)
Subject: rpms/ricci/devel ricci.spec,1.12,1.13
Message-ID: <20090117205834.67DF57012B@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/ricci/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19983

Modified Files:
	ricci.spec 
Log Message:
* Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> 0.15.0-9
- rebuild with new openssl



Index: ricci.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ricci/devel/ricci.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- ricci.spec	22 Oct 2008 19:49:39 -0000	1.12
+++ ricci.spec	17 Jan 2009 20:58:04 -0000	1.13
@@ -10,7 +10,7 @@
 
 Name: ricci
 Version: 0.15.0
-Release: 8%{?dist}
+Release: 9%{?dist}
 License: GPLv2
 URL: http://sources.redhat.com/cluster/conga/
 Group: System Environment/Base
@@ -135,6 +135,9 @@
 exit 0
 
 %changelog
+* Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> 0.15.0-9
+- rebuild with new openssl
+
 * Wed Oct 22 2008 Ryan McCabe <rmccabe at redhat.com> 0.15.0-8
 - Fix build.
 



From kevin at fedoraproject.org  Sat Jan 17 20:59:20 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 17 Jan 2009 20:59:20 +0000 (UTC)
Subject: rpms/xfce4-mixer/devel xfce4-mixer.spec,1.21,1.22
Message-ID: <20090117205920.B08E07012B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce4-mixer/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20221

Modified Files:
	xfce4-mixer.spec 
Log Message:
Update to 4.5.93



Index: xfce4-mixer.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-mixer/devel/xfce4-mixer.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- xfce4-mixer.spec	15 Nov 2008 11:37:44 -0000	1.21
+++ xfce4-mixer.spec	17 Jan 2009 20:58:50 -0000	1.22
@@ -1,24 +1,24 @@
 Summary: Volume control plugin for the Xfce 4 panel
 Name: xfce4-mixer
-Version: 4.4.3
-Release: 2%{?dist}
+Version: 4.5.93
+Release: 1%{?dist}
 License: GPLv2+
 URL: http://www.xfce.org/
 Source0: http://www.xfce.org/archive/xfce-%{version}/src/xfce4-mixer-%{version}.tar.bz2
-Source1: xfce4-mixer.desktop
 Group: User Interface/Desktops
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: xfce4-panel >= %{version}
 BuildRequires: xfce4-panel-devel >= %{version}
 BuildRequires: libxfce4util-devel >= %{version}
 BuildRequires: libxfcegui4-devel >= %{version}
-BuildRequires: libxfce4mcs-devel >= %{version}
-BuildRequires: xfce-mcs-manager-devel >= %{version}
 BuildRequires: libxml2-devel >= 2.4.0
 BuildRequires: startup-notification-devel
 BuildRequires: gettext intltool
 BuildRequires: alsa-lib-devel
 BuildRequires: desktop-file-utils
+BuildRequires: gstreamer-plugins-base-devel
+BuildRequires: gstreamer-devel
+BuildRequires: xfconf-devel
 
 %description
 Volume control plugin for the Xfce 4 panel.
@@ -26,14 +26,10 @@
 %prep
 %setup -q
 
-# fix for http://bugzilla.xfce.org/show_bug.cgi?id=4538
-rm panel-plugin/xfce4-mixer.desktop
-
 %build
 %configure --with-sound=alsa
 
-# removed %{?_smp_mflags} for now. Broken since 4.4.1
-make
+make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -43,7 +39,7 @@
 
 desktop-file-install --vendor ""                                \
         --dir ${RPM_BUILD_ROOT}%{_datadir}/applications         \
-        %{SOURCE1}
+        xfce4-mixer/xfce4-mixer.desktop
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -60,17 +56,23 @@
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-%doc README TODO ChangeLog NOTES COPYING AUTHORS NEWS
+%doc README TODO ChangeLog COPYING AUTHORS NEWS
 %{_bindir}/xfce4-mixer
-%{_libdir}/xfce4/mcs-plugins/*
-%{_libdir}/xfce4/modules/
-%{_datadir}/applications/xfce-mixer-settings.desktop
-%{_datadir}/xfce4/panel-plugins/xfce4-mixer.desktop
-%{_datadir}/icons/hicolor/48x48/apps/xfce4-mixer.png
 %{_datadir}/applications/xfce4-mixer.desktop
 %{_libexecdir}/xfce4/panel-plugins/xfce4-mixer-plugin
+%dir %{_datadir}/pixmaps/xfce4-mixer
+%{_datadir}/pixmaps/xfce4-mixer/chain-broken.png
+%{_datadir}/pixmaps/xfce4-mixer/chain.png
+%{_datadir}/xfce4-mixer/icons/hicolor/*/status/*
+%{_datadir}/xfce4/panel-plugins/xfce4-mixer-plugin.desktop
 
 %changelog
+* Tue Jan 13 2009 Kevin Fenzi <kevin at tummy.com> - 4.5.93-1
+- Update to 4.5.93
+
+* Sat Dec 27 2008 Kevin Fenzi <kevin at tummy.com> - 4.5.92-1
+- Update to 4.5.92
+
 * Sat Nov 15 2008 Christoph Wickert <cwickert at fedoraproject.org> - 4.4.3-2
 - Fix desktop file (bugzilla.xfce.org #4538)
 



From tmraz at fedoraproject.org  Sat Jan 17 21:00:15 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Sat, 17 Jan 2009 21:00:15 +0000 (UTC)
Subject: rpms/ruby/devel ruby.spec,1.124,1.125
Message-ID: <20090117210015.113BD7012B@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/ruby/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20423

Modified Files:
	ruby.spec 
Log Message:
* Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> - 1.8.6.287-3
- rebuild with new openssl



Index: ruby.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ruby/devel/ruby.spec,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -r1.124 -r1.125
--- ruby.spec	8 Oct 2008 13:30:47 -0000	1.124
+++ ruby.spec	17 Jan 2009 20:59:44 -0000	1.125
@@ -12,7 +12,7 @@
 
 Name:		ruby
 Version:	%{rubyver}%{?dotpatchlevel}
-Release:	2%{?dist}
+Release:	3%{?dist}
 License:	Ruby or GPLv2
 URL:		http://www.ruby-lang.org/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -504,6 +504,9 @@
 %{_datadir}/emacs/site-lisp/site-start.d/ruby-mode-init.el
 
 %changelog
+* Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> - 1.8.6.287-3
+- rebuild with new openssl
+
 * Wed Oct  8 2008 Akira TAGOH <tagoh at redhat.com> - 1.8.6.287-2
 - CVE-2008-3790: DoS vulnerability in the REXML module.
 



From kevin at fedoraproject.org  Sat Jan 17 21:03:19 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 17 Jan 2009 21:03:19 +0000 (UTC)
Subject: rpms/orage/devel sources, 1.7, 1.8 .cvsignore, 1.7, 1.8 orage.spec, 
	1.13, 1.14
Message-ID: <20090117210319.886207012B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/orage/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21052

Modified Files:
	sources .cvsignore orage.spec 
Log Message:
Update to 4.5.93



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/orage/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	27 Oct 2008 21:45:50 -0000	1.7
+++ sources	17 Jan 2009 21:02:49 -0000	1.8
@@ -1 +1 @@
-004c1f838771bb8b22b3d61a86912653  orage-4.4.3.tar.bz2
+99066cda2994c54124e5666c91834bd3  orage-4.5.93.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/orage/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	27 Oct 2008 21:45:50 -0000	1.7
+++ .cvsignore	17 Jan 2009 21:02:49 -0000	1.8
@@ -1 +1 @@
-orage-4.4.3.tar.bz2
+orage-4.5.93.tar.bz2


Index: orage.spec
===================================================================
RCS file: /cvs/extras/rpms/orage/devel/orage.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- orage.spec	28 Oct 2008 07:57:06 -0000	1.13
+++ orage.spec	17 Jan 2009 21:02:49 -0000	1.14
@@ -1,14 +1,12 @@
 Summary: Time-managing application for Xfce4
 Name: orage
-Version: 4.4.3
+Version: 4.5.93
 Release: 1%{?dist}
 License: GPLv2+
 URL: http://www.xfce.org/
 Source0: http://www.xfce.org/archive/xfce-%{version}/src/orage-%{version}.tar.bz2
 Group: User Interface/Desktops
-Requires: xfce-mcs-manager
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: xfce-mcs-manager-devel >= %{version}
 BuildRequires: libxfce4util-devel >= %{version}
 BuildRequires: libxfcegui4-devel >= %{version}
 BuildRequires: xfce4-panel-devel >= %{version}
@@ -16,6 +14,7 @@
 BuildRequires: gettext intltool
 BuildRequires: desktop-file-utils
 BuildRequires: db4-devel
+BuildRequires: libnotify-devel
 
 Provides: xfcalendar = %{version}-%{release}
 Obsoletes: xfcalendar <= 4.2.3-3.fc6
@@ -34,7 +33,6 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
-rm -f $RPM_BUILD_ROOT/%{_libdir}/xfce4/mcs-plugins/*.la
 %find_lang %{name}
 
 desktop-file-install --vendor fedora                            \
@@ -59,7 +57,6 @@
 %defattr(-,root,root,-)
 %doc README ChangeLog COPYING AUTHORS
 %{_bindir}/orage
-%{_libdir}/xfce4/mcs-plugins/orage_plugin.so
 %{_datadir}/applications/fedora-xfcalendar.desktop
 %{_datadir}/applications/xfce-xfcalendar-settings.desktop
 %{_datadir}/orage
@@ -67,8 +64,19 @@
 %{_datadir}/icons/hicolor/48x48/apps/xfcalendar.png
 %{_datadir}/icons/hicolor/scalable/apps/xfcalendar.svg
 %{_datadir}/xfce4/panel-plugins/orageclock.desktop
+%{_bindir}/globaltime
+%{_datadir}/dbus-1/services/org.xfce.calendar.service
+%{_datadir}/dbus-1/services/org.xfce.orage.service
+%{_mandir}/man1/globaltime.1.gz
+%{_mandir}/man1/orage.1.gz
 
 %changelog
+* Tue Jan 13 2009 Kevin Fenzi <kevin at tummy.com> - 4.5.93-1
+- Update to 4.5.93
+
+* Sun Dec 28 2008 Kevin Fenzi <kevin at tummy.com> - 4.5.92-1
+- Update to 4.5.92
+
 * Mon Oct 27 2008 Christoph Wickert <cwickert at fedoraproject.org> - 4.4.3-1
 - Update to 4.4.3
 - BuildRequire intltool



From rakesh at fedoraproject.org  Sat Jan 17 21:27:43 2009
From: rakesh at fedoraproject.org (Rakesh Pandit)
Date: Sat, 17 Jan 2009 21:27:43 +0000 (UTC)
Subject: rpms/egoboo/devel egoboo.spec,1.8,1.9
Message-ID: <20090117212743.500287012B@cvs1.fedora.phx.redhat.com>

Author: rakesh

Update of /cvs/pkgs/rpms/egoboo/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24737

Modified Files:
	egoboo.spec 
Log Message:
 Rebuild for new enet update.


Index: egoboo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/egoboo/devel/egoboo.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- egoboo.spec	19 Feb 2008 08:18:59 -0000	1.8
+++ egoboo.spec	17 Jan 2009 21:27:13 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           egoboo
 Version:        2.7.5
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        A top down graphical (3D) RPG in the spirit of Nethack
 Group:          Amusements/Games
 License:        GPLv3
@@ -66,6 +66,9 @@
 
 
 %changelog
+* Sun Jan 18 2009 Rakesh Pandit <rakesh at fedoraproject.org> - 2.7.5-5
+- Rebuild for new enet update.
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 2.7.5-4
 - Autorebuild for GCC 4.3
 



From rakesh at fedoraproject.org  Sat Jan 17 21:35:48 2009
From: rakesh at fedoraproject.org (Rakesh Pandit)
Date: Sat, 17 Jan 2009 21:35:48 +0000 (UTC)
Subject: rpms/egoboo/F-10 egoboo.spec,1.8,1.9
Message-ID: <20090117213548.0D01B7012B@cvs1.fedora.phx.redhat.com>

Author: rakesh

Update of /cvs/pkgs/rpms/egoboo/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25677

Modified Files:
	egoboo.spec 
Log Message:
 Rebuild for new enet update.


Index: egoboo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/egoboo/F-10/egoboo.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- egoboo.spec	19 Feb 2008 08:18:59 -0000	1.8
+++ egoboo.spec	17 Jan 2009 21:35:17 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           egoboo
 Version:        2.7.5
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        A top down graphical (3D) RPG in the spirit of Nethack
 Group:          Amusements/Games
 License:        GPLv3
@@ -66,6 +66,9 @@
 
 
 %changelog
+* Sun Jan 18 2009 Rakesh Pandit <rakesh at fedoraproject.org> - 2.7.5-5
+- Rebuild for new enet update.
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 2.7.5-4
 - Autorebuild for GCC 4.3
 



From kevin at fedoraproject.org  Sat Jan 17 21:36:24 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 17 Jan 2009 21:36:24 +0000 (UTC)
Subject: rpms/gtk-xfce-engine/devel sources, 1.10, 1.11 .cvsignore, 1.10,
	1.11 gtk-xfce-engine.spec, 1.21, 1.22
Message-ID: <20090117213624.DE0527012B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/gtk-xfce-engine/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25799

Modified Files:
	sources .cvsignore gtk-xfce-engine.spec 
Log Message:
Update to 2.5.93



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gtk-xfce-engine/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	27 Oct 2008 20:32:26 -0000	1.10
+++ sources	17 Jan 2009 21:35:54 -0000	1.11
@@ -1 +1 @@
-6aa618469f3a3d8f6457c6874a60817e  gtk-xfce-engine-2.4.3.tar.bz2
+5c90c0a07db3ee6d2185b4e9973627ec  gtk-xfce-engine-2.5.93.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gtk-xfce-engine/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	27 Oct 2008 20:32:26 -0000	1.10
+++ .cvsignore	17 Jan 2009 21:35:54 -0000	1.11
@@ -1 +1 @@
-gtk-xfce-engine-2.4.3.tar.bz2
+gtk-xfce-engine-2.5.93.tar.bz2


Index: gtk-xfce-engine.spec
===================================================================
RCS file: /cvs/extras/rpms/gtk-xfce-engine/devel/gtk-xfce-engine.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- gtk-xfce-engine.spec	27 Oct 2008 20:46:33 -0000	1.21
+++ gtk-xfce-engine.spec	17 Jan 2009 21:35:54 -0000	1.22
@@ -1,10 +1,10 @@
 Summary: Port of Xfce engine to GTK+-2.0
 Name: gtk-xfce-engine
-Version: 2.4.3
+Version: 2.5.93
 Release: 1%{?dist}
 License: GPLv2+
 URL: http://www.xfce.org/
-Source0: http://www.xfce.org/archive/xfce-4.4.2/src/gtk-xfce-engine-%{version}.tar.bz2
+Source0: http://www.xfce.org/archive/xfce-4.5.93/src/gtk-xfce-engine-%{version}.tar.bz2
 Group: User Interface/Desktops
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: gtk2-devel >= 2.0.0
@@ -36,6 +36,12 @@
 %{_datadir}/themes/*
 
 %changelog
+* Tue Jan 13 2009 Kevin Fenzi <kevin at tummy.com> - 2.5.93-1
+- Update to 2.5.93
+
+* Sun Dec 28 2008 Kevin Fenzi <kevin at tummy.com> - 2.5.92-1
+- Update to 2.5.92
+
 * Mon Oct 27 2008 Christoph Wickert <cwickert at fedoraproject.org> - 2.4.3-1
 - Update to 2.4.3
 - Require filesystem package instead of owning %%{_datadir}/themes



From kevin at fedoraproject.org  Sat Jan 17 21:41:27 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 17 Jan 2009 21:41:27 +0000 (UTC)
Subject: rpms/xfwm4-themes/devel sources, 1.10, 1.11 .cvsignore, 1.10,
	1.11 xfwm4-themes.spec, 1.17, 1.18
Message-ID: <20090117214127.3EB577012B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfwm4-themes/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27240

Modified Files:
	sources .cvsignore xfwm4-themes.spec 
Log Message:
Update to 4.5.93



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfwm4-themes/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	27 Oct 2008 20:38:55 -0000	1.10
+++ sources	17 Jan 2009 21:40:56 -0000	1.11
@@ -1 +1 @@
-0e713465f79a000958307c7f5b37185f  xfwm4-themes-4.4.3.tar.bz2
+0a0f34521e3c32ae04b349fe571fb9ce  xfwm4-themes-4.5.93.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfwm4-themes/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	27 Oct 2008 20:38:55 -0000	1.10
+++ .cvsignore	17 Jan 2009 21:40:56 -0000	1.11
@@ -1 +1 @@
-xfwm4-themes-4.4.3.tar.bz2
+xfwm4-themes-4.5.93.tar.bz2


Index: xfwm4-themes.spec
===================================================================
RCS file: /cvs/extras/rpms/xfwm4-themes/devel/xfwm4-themes.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- xfwm4-themes.spec	27 Oct 2008 20:44:22 -0000	1.17
+++ xfwm4-themes.spec	17 Jan 2009 21:40:56 -0000	1.18
@@ -1,6 +1,6 @@
 Summary: Additional themes for xfwm4
 Name: xfwm4-themes
-Version: 4.4.3
+Version: 4.5.93
 Release: 1%{?dist}
 License: GPL+ and BSD
 URL: http://www.xfce.org/
@@ -35,6 +35,12 @@
 %{_datadir}/themes/*
 
 %changelog
+* Tue Jan 13 2009 Kevin Fenzi <kevin at tummy.com> - 4.5.93-1
+- Update to 4.5.93
+
+* Sun Dec 29 2008 Kevin Fenzi <kevin at tummy.com> - 4.5.92-1
+- Update to 4.5.92
+
 * Mon Oct 27 2008 Christoph Wickert <cwickert at fedoraproject.org> - 4.4.3-1
 - Update to 4.4.3
 - Require filesystem package instead of owning %%{_datadir}/themes



From rakesh at fedoraproject.org  Sat Jan 17 21:46:02 2009
From: rakesh at fedoraproject.org (Rakesh Pandit)
Date: Sat, 17 Jan 2009 21:46:02 +0000 (UTC)
Subject: rpms/egoboo/F-9 egoboo.spec,1.8,1.9
Message-ID: <20090117214602.79F697012B@cvs1.fedora.phx.redhat.com>

Author: rakesh

Update of /cvs/pkgs/rpms/egoboo/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27895

Modified Files:
	egoboo.spec 
Log Message:
 Rebuild for new enet update.


Index: egoboo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/egoboo/F-9/egoboo.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- egoboo.spec	19 Feb 2008 08:18:59 -0000	1.8
+++ egoboo.spec	17 Jan 2009 21:45:32 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           egoboo
 Version:        2.7.5
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        A top down graphical (3D) RPG in the spirit of Nethack
 Group:          Amusements/Games
 License:        GPLv3
@@ -66,6 +66,9 @@
 
 
 %changelog
+* Sun Jan 18 2009 Rakesh Pandit <rakesh at fedoraproject.org> - 2.7.5-5
+- Rebuild for new enet update.
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 2.7.5-4
 - Autorebuild for GCC 4.3
 



From kevin at fedoraproject.org  Sat Jan 17 21:50:54 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 17 Jan 2009 21:50:54 +0000 (UTC)
Subject: rpms/xfce4-dev-tools/devel xfce4-dev-tools.spec, 1.6, 1.7 sources,
	1.5, 1.6 .cvsignore, 1.5, 1.6
Message-ID: <20090117215055.03DCB7012B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce4-dev-tools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28549

Modified Files:
	xfce4-dev-tools.spec sources .cvsignore 
Log Message:
Update to 4.5.93



Index: xfce4-dev-tools.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-dev-tools/devel/xfce4-dev-tools.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- xfce4-dev-tools.spec	8 Sep 2008 02:06:27 -0000	1.6
+++ xfce4-dev-tools.spec	17 Jan 2009 21:50:24 -0000	1.7
@@ -1,5 +1,5 @@
 Name:		xfce4-dev-tools
-Version:	4.4.0.1
+Version:	4.5.93
 Release:	1%{?dist}
 Summary:	Xfce developer tools
 
@@ -43,6 +43,12 @@
 %{_datadir}/aclocal/*
 
 %changelog
+* Tue Jan 13 2009 Kevin Fenzi <kevin at tummy.com> - 4.5.93-1
+- Update to 4.5.93
+
+* Sun Dec 28 2008 Kevin Fenzi <kevin at tummy.com> - 4.5.92-1
+- Update to 4.5.92
+
 * Mon Sep 08 2008 Christoph Wickert <fedora christoph-wickert de> - 4.4.0.1-1
 - Update to 4.4.0.1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfce4-dev-tools/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	8 Sep 2008 02:06:27 -0000	1.5
+++ sources	17 Jan 2009 21:50:24 -0000	1.6
@@ -1 +1 @@
-7d09d161efc7ef86b3b48791d98c8ae8  xfce4-dev-tools-4.4.0.1.tar.bz2
+99d2362c4007d567dacec6b9cd1f05b9  xfce4-dev-tools-4.5.93.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfce4-dev-tools/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	8 Sep 2008 02:06:27 -0000	1.5
+++ .cvsignore	17 Jan 2009 21:50:24 -0000	1.6
@@ -1 +1 @@
-xfce4-dev-tools-4.4.0.1.tar.bz2
+xfce4-dev-tools-4.5.93.tar.bz2



From michich at fedoraproject.org  Sat Jan 17 21:59:50 2009
From: michich at fedoraproject.org (Michal Schmidt)
Date: Sat, 17 Jan 2009 21:59:50 +0000 (UTC)
Subject: rpms/jabbim/devel .cvsignore, 1.11, 1.12 jabbim.spec, 1.26,
	1.27 sources, 1.20,
	1.21 jabbim-0.4-stringlists-in-QVariants.diff, 1.2, NONE
Message-ID: <20090117215950.182547012B@cvs1.fedora.phx.redhat.com>

Author: michich

Update of /cvs/pkgs/rpms/jabbim/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29691

Modified Files:
	.cvsignore jabbim.spec sources 
Removed Files:
	jabbim-0.4-stringlists-in-QVariants.diff 
Log Message:
* Sat Jan 17 2009 Michal Schmidt <mschmidt at redhat.com> - 0.5-0.1.svn20090117
- Rebase to upstream 0.5 SVN snapshot.
- Upstream now supports 'make install', which simplifies the spec file.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/jabbim/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	3 Jul 2008 15:27:22 -0000	1.11
+++ .cvsignore	17 Jan 2009 21:59:19 -0000	1.12
@@ -1 +1 @@
-jabbim-0.4.3.tar.bz2
+jabbim-svn20090117.tar.bz2


Index: jabbim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jabbim/devel/jabbim.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- jabbim.spec	17 Jan 2009 06:41:22 -0000	1.26
+++ jabbim.spec	17 Jan 2009 21:59:19 -0000	1.27
@@ -1,29 +1,31 @@
 Name:		jabbim
-Version:	0.4.3
-Release:	5%{?dist}
+Version:	0.5
+Release:	0.1.svn20090117%{?dist}
 Summary:	Jabber client for mere mortals
 
 Group:		Applications/Internet
 License:	GPLv2+
 URL:		http://dev.jabbim.cz/jabbim
 # The source was obtained from upstream SVN repository:
-# svn export svn://dev.jabbim.cz/jabbim/tags/0.4.3 jabbim-0.4.3
-# tar -cjf jabbim-0.4.3.tar.bz2 jabbim-0.4.3/
-Source0:	jabbim-0.4.3.tar.bz2
+# svn export -r 4005 svn://dev.jabbim.cz/jabbim/trunk jabbim-svn20090117
+# tar -cjf jabbim-svn20090117.tar.bz2 jabbim-svn20090117/
+Source0:	jabbim-svn20090117.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)
 
 BuildRequires:	python >= 2.5
 BuildRequires:	desktop-file-utils
+BuildRequires:	qt4-devel
 
 Requires:	python >= 2.5
 Requires:	PyQt4
 Requires:	python-twisted-names
 Requires:	python-twisted-web
+Requires:	python-twisted-web2
 Requires:	python-twisted-words
+Requires:	python-configobj
 Requires:	pyOpenSSL
 
 %define jabbimdata %{_datadir}/jabbim
@@ -36,54 +38,25 @@
 
 
 %prep
-%setup -q
+%setup -q -n jabbim-svn20090117
 %patch0 -p1
-%patch1 -p1
 # fill in the template for the starting script
 sed -e 's|@JABBIMDATA@|%{jabbimdata}|g' %{SOURCE1} > jabbim
 
 %build
+# Upstream likes to provide generated *.qm files in the tarballs.
+# Make sure they are recreated from the *.ts files:
+make clean
+make PREFIX=%{_prefix}
 
 %install
 rm -rf %{buildroot}
+make install DESTDIR=%{buildroot}
 
 desktop-file-install --vendor fedora \
 	--dir %{buildroot}%{_datadir}/applications \
 	--delete-original \
-	jabbim.desktop
-
-mkdir -p %{buildroot}/%{_bindir}
-install -p -m 755 jabbim %{buildroot}/%{_bindir}/jabbim
-rm jabbim
-
-# remove the files which are not useful for end-users
-# and files which upstream forgot to remove
-rm jabbim.sh jabbim.pro
-rm images/32x32/status/rsvg2png.sh
-rm widgets/preferences.py.orig
-
-mkdir -p %{buildroot}/%{jabbimdata}
-# take everything else upstream ships
-cp -a . %{buildroot}/%{jabbimdata}
-
-# these will be installed from their original location
-rm %{buildroot}/%{jabbimdata}/{AUTHORS,COPYING}
-
-for i in 16 22 32 48 ; do
-	d="%{buildroot}%{_datadir}/icons/hicolor/${i}x${i}/apps"
-	install -dm 755 "$d"
-	install -m 644 -p images/${i}x${i}/apps/jabbim.png "$d/jabbim.png"
-done
-
-d="%{buildroot}%{_datadir}/icons/hicolor/scalable/apps"
-install -dm 755 "$d"
-install -m 644 -p images/scalable/apps/jabbim.svg "$d/jabbim.svg"
-
-install -dm 755 %{buildroot}/%{_datadir}/pixmaps
-pushd %{buildroot}/%{_datadir}/pixmaps
-ln -s ../icons/hicolor/48x48/apps/jabbim.png .
-ln -s ../icons/hicolor/scalable/apps/jabbim.svg .
-popd
+	%{buildroot}/%{_datadir}/applications/%{name}.desktop
 
 %clean
 rm -rf %{buildroot}
@@ -113,6 +86,10 @@
 
 
 %changelog
+* Sat Jan 17 2009 Michal Schmidt <mschmidt at redhat.com> - 0.5-0.1.svn20090117
+- Rebase to upstream 0.5 SVN snapshot.
+- Upstream now supports 'make install', which simplifies the spec file.
+
 * Sat Jan 17 2009 Michal Schmidt <mschmidt at redhat.com> - 0.4.3-5
 - Don't require python-sqlite2. Python >= 2.5 has sqlite support already.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/jabbim/devel/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources	3 Jul 2008 15:27:22 -0000	1.20
+++ sources	17 Jan 2009 21:59:19 -0000	1.21
@@ -1 +1 @@
-bf9973631495cea7a21e625f76fa2545  jabbim-0.4.3.tar.bz2
+3c06b8a3bb1aacef7bebcecc04cee8df  jabbim-svn20090117.tar.bz2


--- jabbim-0.4-stringlists-in-QVariants.diff DELETED ---



From denis at fedoraproject.org  Sat Jan 17 22:01:59 2009
From: denis at fedoraproject.org (Denis Leroy)
Date: Sat, 17 Jan 2009 22:01:59 +0000 (UTC)
Subject: rpms/nemiver/devel .cvsignore, 1.11, 1.12 nemiver.spec, 1.18,
	1.19 sources, 1.11, 1.12
Message-ID: <20090117220159.763767012B@cvs1.fedora.phx.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/nemiver/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29987

Modified Files:
	.cvsignore nemiver.spec sources 
Log Message:
Update to upstream 0.6.4. Now build against gtksourceviewmm 2.2.0


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/nemiver/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	28 Sep 2008 21:54:37 -0000	1.11
+++ .cvsignore	17 Jan 2009 22:01:29 -0000	1.12
@@ -1 +1 @@
-nemiver-0.6.3.tar.bz2
+nemiver-0.6.4.tar.bz2


Index: nemiver.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nemiver/devel/nemiver.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- nemiver.spec	28 Sep 2008 21:54:37 -0000	1.18
+++ nemiver.spec	17 Jan 2009 22:01:29 -0000	1.19
@@ -1,5 +1,5 @@
 Name:		nemiver
-Version:	0.6.3
+Version:	0.6.4
 Release:	1%{?dist}
 Summary:	A GNOME C/C++ Debugger
 
@@ -27,7 +27,7 @@
 BuildRequires:	gnome-doc-utils >= 0.3.2
 BuildRequires:	libglademm24-devel >= 2.6.0
 BuildRequires:	libgnome-devel >= 2.0
-BuildRequires:	libgtksourceviewmm-devel >= 0.3.0
+BuildRequires:	gtksourceviewmm-devel >= 2.0.0
 BuildRequires:	libgtop2-devel >= 2.14
 BuildRequires:	libtool
 BuildRequires:	perl(XML::Parser)
@@ -156,6 +156,10 @@
 
 
 %changelog
+* Sat Jan 17 2009 Denis Leroy <denis at poolshark.org> - 0.6.4-1
+- Update to upstream 0.6.4
+- Now build against gtksourceviewmm 2.2.0
+
 * 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


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nemiver/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	28 Sep 2008 21:54:37 -0000	1.11
+++ sources	17 Jan 2009 22:01:29 -0000	1.12
@@ -1 +1 @@
-0b420acf4695188c8da675926011169a  nemiver-0.6.3.tar.bz2
+67087d15289ca6149aa71ed60b603661  nemiver-0.6.4.tar.bz2



From denis at fedoraproject.org  Sat Jan 17 22:15:11 2009
From: denis at fedoraproject.org (Denis Leroy)
Date: Sat, 17 Jan 2009 22:15:11 +0000 (UTC)
Subject: rpms/bakery/devel .cvsignore, 1.7, 1.8 bakery.spec, 1.10,
	1.11 sources, 1.8, 1.9
Message-ID: <20090117221512.8CDBF7012B@cvs1.fedora.phx.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/bakery/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32179

Modified Files:
	.cvsignore bakery.spec sources 
Log Message:
Update to upstream 2.6.2


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bakery/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	5 Aug 2008 23:56:59 -0000	1.7
+++ .cvsignore	17 Jan 2009 22:14:40 -0000	1.8
@@ -1 +1 @@
-bakery-2.5.1.tar.bz2
+bakery-2.6.2.tar.bz2


Index: bakery.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bakery/devel/bakery.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- bakery.spec	6 Aug 2008 04:06:23 -0000	1.10
+++ bakery.spec	17 Jan 2009 22:14:40 -0000	1.11
@@ -1,10 +1,10 @@
-%define major_version   2.4
-%define minor_version   4
-%define api_version     2.4
+%define major_version   2.6
+%define minor_version   2
+%define api_version     2.6
 
 Name:           bakery
 Version:        %{major_version}.%{minor_version}
-Release:        3%{?dist}
+Release:        1%{?dist}
 Summary:        C++ framework for creating GNOME applications using gtkmm
 Epoch:          1
 
@@ -14,11 +14,11 @@
 Source0:        http://ftp.gnome.org/pub/GNOME/sources/bakery/%{major_version}/bakery-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+BuildRequires:  glibmm24-devel >= 2.16.0
 BuildRequires:  gtkmm24-devel >= 2.10.0
 BuildRequires:  gconfmm26-devel >= 2.6.0
 BuildRequires:  libglademm24-devel >= 2.4.0
 BuildRequires:  libxml++-devel >= 2.8.0
-BuildRequires:  gnome-vfsmm26-devel >= 2.6.0
 BuildRequires:  doxygen graphviz gettext
 
 
@@ -53,7 +53,7 @@
 
 
 %build
-%configure --disable-static --disable-dependency-tracking --enable-docs
+%configure --disable-static --disable-dependency-tracking
 make %{?_smp_mflags}
 make -C docs/reference %{?_smp_mflags}
 
@@ -91,11 +91,14 @@
 %doc docs-to-include/*
 %{_includedir}/bakery-%{api_version}
 %{_libdir}/*.so
-%{_libdir}/bakery-2.4
+%{_libdir}/bakery-%{api_version}
 %{_libdir}/pkgconfig/*.pc
 
 
 %changelog
+* Sat Jan 17 2009 Denis Leroy <denis at poolshark.org> - 1:2.6.2-1
+- Update to upstream 2.6.2
+
 * Wed Aug  6 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1:2.4.4-3
 - revert to 2.4.4
 - set epoch to 1


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bakery/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	6 Aug 2008 04:06:23 -0000	1.8
+++ sources	17 Jan 2009 22:14:40 -0000	1.9
@@ -1 +1 @@
-c80b4cf39dc8aa65bb9302b84f084b93  bakery-2.4.4.tar.bz2
+749586e2f9dfc381a16c4f7cc56c03f1  bakery-2.6.2.tar.bz2



From iburrell at fedoraproject.org  Sat Jan 17 22:24:44 2009
From: iburrell at fedoraproject.org (Ian Burrell)
Date: Sat, 17 Jan 2009 22:24:44 +0000 (UTC)
Subject: rpms/perl-SVK/devel .cvsignore, 1.5, 1.6 perl-SVK.spec, 1.11,
	1.12 sources, 1.5, 1.6
Message-ID: <20090117222444.EF56E7012B@cvs1.fedora.phx.redhat.com>

Author: iburrell

Update of /cvs/extras/rpms/perl-SVK/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv983

Modified Files:
	.cvsignore perl-SVK.spec sources 
Log Message:
update to 2.2.1


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-SVK/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	16 Aug 2007 19:26:19 -0000	1.5
+++ .cvsignore	17 Jan 2009 22:24:14 -0000	1.6
@@ -1 +1 @@
-SVK-v2.0.2.tar.gz
+SVK-v2.2.1.tar.gz


Index: perl-SVK.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-SVK/devel/perl-SVK.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- perl-SVK.spec	6 Mar 2008 21:36:20 -0000	1.11
+++ perl-SVK.spec	17 Jan 2009 22:24:14 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           perl-SVK
-Version:        2.0.2
-Release:        3%{?dist}
+Version:        2.2.1
+Release:        1%{?dist}
 Summary:        A Distributed Version Control System
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -101,6 +101,9 @@
 %{_bindir}/svk
 
 %changelog
+* Sat Jan 17 2009 Ian Burrell <ianburrell at gmail.com> - 2.2.1-1
+- Update to 2.2.1
+
 * Thu Mar  6 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 2.0.2-3
 - disable tests, they're a bit hosed
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-SVK/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	16 Aug 2007 19:26:19 -0000	1.5
+++ sources	17 Jan 2009 22:24:14 -0000	1.6
@@ -1 +1 @@
-501d823231bd276e5b8f22b6ebe6cf2e  SVK-v2.0.2.tar.gz
+5778f876a744acebde5c9bff0bb865ce  SVK-v2.2.1.tar.gz



From kevin at fedoraproject.org  Sat Jan 17 22:29:30 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 17 Jan 2009 22:29:30 +0000 (UTC)
Subject: rpms/xfdesktop/devel xfdesktop-4.5.92-backdrop-image.patch, NONE,
	1.1 xfdesktop-4.5.92-desktop-menu-icon.patch, NONE,
	1.1 xfdesktop.spec, 1.25, 1.26 sources, 1.9, 1.10 .cvsignore,
	1.9, 1.10 xfdesktop-4.4.2-desktop-menu-fixes.patch, 1.1,
	NONE xfdesktop-4.4.2-desktop-menu-icon.patch, 1.1,
	NONE xfdesktop-4.4.2-fix-CRITICAL-register-message-startup.patch,
	1.1, NONE xfdesktop-4.4.2-fix-size-warning-amd64.patch, 1.1,
	NONE xfdesktop-4.4.2-gcc43.patch, 1.1,
	NONE xfdesktop-4.4.2-memleak.patch, 1.1,
	NONE xfdesktop-4.4.2-show-backdrop-by-default.patch, 1.1,
	NONE xfdesktop-4.4.2-simplify-free-code.patch, 1.1,
	NONE xfdesktop-4.4.2-xdg-userdir-compat.patch, 1.2,
	NONE xfdesktop-image-4.2.1.patch, 1.1,
	NONE xfdesktop-image-4.3.90.1.patch, 1.1,
	NONE xfdesktop-image.patch, 1.2, NONE
Message-ID: <20090117222930.24CD37012B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfdesktop/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1833

Modified Files:
	xfdesktop.spec sources .cvsignore 
Added Files:
	xfdesktop-4.5.92-backdrop-image.patch 
	xfdesktop-4.5.92-desktop-menu-icon.patch 
Removed Files:
	xfdesktop-4.4.2-desktop-menu-fixes.patch 
	xfdesktop-4.4.2-desktop-menu-icon.patch 
	xfdesktop-4.4.2-fix-CRITICAL-register-message-startup.patch 
	xfdesktop-4.4.2-fix-size-warning-amd64.patch 
	xfdesktop-4.4.2-gcc43.patch xfdesktop-4.4.2-memleak.patch 
	xfdesktop-4.4.2-show-backdrop-by-default.patch 
	xfdesktop-4.4.2-simplify-free-code.patch 
	xfdesktop-4.4.2-xdg-userdir-compat.patch 
	xfdesktop-image-4.2.1.patch xfdesktop-image-4.3.90.1.patch 
	xfdesktop-image.patch 
Log Message:
Update to 4.5.93


xfdesktop-4.5.92-backdrop-image.patch:

--- NEW FILE xfdesktop-4.5.92-backdrop-image.patch ---
diff -Nur xfdesktop-4.5.92.orig/common/xfdesktop-common.h xfdesktop-4.5.92/common/xfdesktop-common.h
--- xfdesktop-4.5.92.orig/common/xfdesktop-common.h	2008-10-14 01:33:41.000000000 -0600
+++ xfdesktop-4.5.92/common/xfdesktop-common.h	2008-12-30 16:45:55.000000000 -0700
@@ -31,7 +31,8 @@
 #include <X11/Xlib.h>
 
 #define XFDESKTOP_CHANNEL        "xfce4-desktop"
-#define DEFAULT_BACKDROP         DATADIR "/xfce4/backdrops/xfce-stripes.png"
+/* Use Fedora (tm) default background image */
+#define DEFAULT_BACKDROP         DATADIR "/backgrounds/images/default.png"
 #define DEFAULT_BACKDROP_LIST    "xfce4/desktop/backdrop.list"
 #define DEFAULT_ICON_FONT_SIZE   12
 #define DEFAULT_ICON_SIZE        32

xfdesktop-4.5.92-desktop-menu-icon.patch:

--- NEW FILE xfdesktop-4.5.92-desktop-menu-icon.patch ---
diff -Nur xfdesktop-4.5.92.orig/panel-plugin/desktop-menu-plugin.c xfdesktop-4.5.92/panel-plugin/desktop-menu-plugin.c
--- xfdesktop-4.5.92.orig/panel-plugin/desktop-menu-plugin.c	2008-10-14 01:33:42.000000000 -0600
+++ xfdesktop-4.5.92/panel-plugin/desktop-menu-plugin.c	2008-12-30 16:51:18.000000000 -0700
@@ -62,7 +62,7 @@
 #include "xfce4-popup-menu.h"
 
 #define BORDER 8
-#define DEFAULT_BUTTON_ICON  DATADIR "/pixmaps/xfce4_xicon1.png"
+#define DEFAULT_BUTTON_ICON  "xfce4_xicon1"
 #define DEFAULT_BUTTON_TITLE "Xfce Menu"
 
 /* this'll only allow one copy of the plugin; useful for forcing the


Index: xfdesktop.spec
===================================================================
RCS file: /cvs/extras/rpms/xfdesktop/devel/xfdesktop.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- xfdesktop.spec	31 Aug 2008 00:50:44 -0000	1.25
+++ xfdesktop.spec	17 Jan 2009 22:28:59 -0000	1.26
@@ -1,44 +1,25 @@
 Summary: Desktop manager for the XFce Desktop Environment
 Name: xfdesktop
-Version: 4.4.2
-Release: 6%{?dist}
+Version: 4.5.93
+Release: 1%{?dist}
 License: GPLv2+
 URL: http://www.xfce.org/
-Source0: http://www.xfce.org/archive/xfce-4.4.2/src/xfdesktop-4.4.2.tar.bz2
+Source0: http://www.xfce.org/archive/xfce-%{version}/src/xfdesktop-%{version}.tar.bz2
 
-# Change default for Fedora
-Patch0: xfdesktop-image-4.3.90.1.patch
-# Show default image
-Patch1: xfdesktop-4.4.2-show-backdrop-by-default.patch
-# Fix for gcc 4.3
-Patch2: xfdesktop-4.4.2-gcc43.patch
-# Fix memory leaks
-Patch3: xfdesktop-4.4.2-memleak.patch
-# Fix desktop menu
-Patch4: xfdesktop-4.4.2-desktop-menu-fixes.patch
+# Change default background for Fedora
+Patch0: xfdesktop-4.5.92-backdrop-image.patch
 # Enable distro specific logo in desktop menu
-Patch5: xfdesktop-4.4.2-desktop-menu-icon.patch
-# Fix CRITICAL register message
-Patch6: xfdesktop-4.4.2-fix-CRITICAL-register-message-startup.patch
-# simplify free code
-Patch7: xfdesktop-4.4.2-simplify-free-code.patch
-# Fix for x86_64
-Patch8: xfdesktop-4.4.2-fix-size-warning-amd64.patch
-# Enable xdg user dirs
-Patch9: xfdesktop-4.4.2-xdg-userdir-compat.patch
+Patch1: xfdesktop-4.5.92-desktop-menu-icon.patch
 
 Group: User Interface/Desktops
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Requires: xfce-mcs-manager
 Requires: xfwm4
 Requires: xfce4-panel
 Requires: desktop-backgrounds-basic
-BuildRequires: libxfce4mcs-devel >= %{version}
 BuildRequires: libxfcegui4-devel >= %{version}
 BuildRequires: xfce4-panel-devel >= %{version}
 BuildRequires: libxml2-devel
-BuildRequires: xfce-mcs-manager-devel
 BuildRequires: imake
 BuildRequires: libXt-devel
 BuildRequires: gettext
@@ -46,6 +27,11 @@
 BuildRequires: Thunar-devel
 BuildRequires: dbus-glib-devel
 BuildRequires: dbus-devel
+BuildRequires: libwnck-devel
+BuildRequires: libglade2-devel
+BuildRequires: libxfce4menu-devel
+BuildRequires: xfconf-devel
+BuildRequires: intltool
 
 %description
 This package includes a desktop manager for the XFce Desktop Environment.
@@ -53,16 +39,8 @@
 %prep
 %setup -q
 
-%patch0 -p1 -b .fedora
-%patch1 -p1 -b .show-backdrop
-%patch2 -p1 -b .gcc43
-%patch3 -p1 -b .memleak
-%patch4 -p1 -b .fixed
-%patch5 -p1 -b .distro-logo
-%patch6 -p1 -b .critical
-%patch7 -p1 -b .simplyfied
-%patch8 -p1 -b .x86_64
-%patch9 -p1 -b .userdir
+%patch0 -p1 -b .backdrop
+%patch1 -p1 -b .distro-logo
 
 %build
 %configure
@@ -93,21 +71,26 @@
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc README TODO ChangeLog NEWS COPYING AUTHORS
-%{_sysconfdir}/xdg/xfce4/*
 %{_bindir}/*
-%{_libdir}/xfce4/mcs-plugins/*
 %{_libexecdir}/xfce4/panel-plugins/*
 %{_libdir}/xfce4/modules/
 %{_datadir}/applications/*
 %{_datadir}/icons/hicolor/*/*/*
 %{_datadir}/pixmaps/*
-%{_datadir}/xfce4/panel-plugins/xfce4-menu.desktop
 %{_datadir}/xfce4/doc
 %{_datadir}/xfce4/backdrops
-%{_datadir}/xfce4-menueditor/
 %{_mandir}/man1/*
+%config(noreplace) %{_sysconfdir}/xdg/menus/xfce-applications.menu
+%{_datadir}/desktop-directories
+%{_datadir}/xfce4/panel-plugins/xfce4-menu.desktop
 
 %changelog
+* Tue Jan 13 2009 Kevin Fenzi <kevin at tummy.com> - 4.5.93-1
+- Update to 4.5.93
+
+* Sun Dec 28 2008 Kevin Fenzi <kevin at tummy.com> - 4.5.92-1
+- Update 4.5.92
+
 * Sun Aug 31 2008 Christoph Wickert <fedora at christoph-wickert.de> - 4.4.2-6
 - Update xdg-userdir-compat.patch to use upstream's variable names
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfdesktop/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	3 Dec 2007 06:15:05 -0000	1.9
+++ sources	17 Jan 2009 22:28:59 -0000	1.10
@@ -1 +1 @@
-694601234e74903d0fccba064f411e0c  xfdesktop-4.4.2.tar.bz2
+9b56cf695a502a84878f154de077f593  xfdesktop-4.5.93.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfdesktop/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	3 Dec 2007 06:15:05 -0000	1.9
+++ .cvsignore	17 Jan 2009 22:28:59 -0000	1.10
@@ -1 +1 @@
-xfdesktop-4.4.2.tar.bz2
+xfdesktop-4.5.93.tar.bz2


--- xfdesktop-4.4.2-desktop-menu-fixes.patch DELETED ---


--- xfdesktop-4.4.2-desktop-menu-icon.patch DELETED ---


--- xfdesktop-4.4.2-fix-CRITICAL-register-message-startup.patch DELETED ---


--- xfdesktop-4.4.2-fix-size-warning-amd64.patch DELETED ---


--- xfdesktop-4.4.2-gcc43.patch DELETED ---


--- xfdesktop-4.4.2-memleak.patch DELETED ---


--- xfdesktop-4.4.2-show-backdrop-by-default.patch DELETED ---


--- xfdesktop-4.4.2-simplify-free-code.patch DELETED ---


--- xfdesktop-4.4.2-xdg-userdir-compat.patch DELETED ---


--- xfdesktop-image-4.2.1.patch DELETED ---


--- xfdesktop-image-4.3.90.1.patch DELETED ---


--- xfdesktop-image.patch DELETED ---



From iburrell at fedoraproject.org  Sat Jan 17 22:43:33 2009
From: iburrell at fedoraproject.org (Ian Burrell)
Date: Sat, 17 Jan 2009 22:43:33 +0000 (UTC)
Subject: rpms/perl-SVN-Mirror/devel .cvsignore, 1.5, 1.6 perl-SVN-Mirror.spec,
	1.8, 1.9 sources, 1.5, 1.6
Message-ID: <20090117224333.499C87012B@cvs1.fedora.phx.redhat.com>

Author: iburrell

Update of /cvs/extras/rpms/perl-SVN-Mirror/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4250

Modified Files:
	.cvsignore perl-SVN-Mirror.spec sources 
Log Message:
Update to 0.75


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-SVN-Mirror/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	29 May 2007 19:53:56 -0000	1.5
+++ .cvsignore	17 Jan 2009 22:43:02 -0000	1.6
@@ -1 +1 @@
-SVN-Mirror-0.73.tar.gz
+SVN-Mirror-0.75.tar.gz


Index: perl-SVN-Mirror.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-SVN-Mirror/devel/perl-SVN-Mirror.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- perl-SVN-Mirror.spec	6 Mar 2008 18:59:18 -0000	1.8
+++ perl-SVN-Mirror.spec	17 Jan 2009 22:43:02 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           perl-SVN-Mirror
-Version:        0.73
-Release:        3%{?dist}
+Version:        0.75
+Release:        1%{?dist}
 Summary:        Mirror remote repository to local Subversion repository
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -66,6 +66,9 @@
 %{_bindir}/svm
 
 %changelog
+* Sat Jan 17 2009 Ian Burrell <ianburrell at gmail.com> - 0.75-1
+- Update to 0.75 with test fixes for subversion 1.5.0
+
 * Thu Mar  6 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.73-3
 - rebuild for new perl
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-SVN-Mirror/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	29 May 2007 19:53:56 -0000	1.5
+++ sources	17 Jan 2009 22:43:02 -0000	1.6
@@ -1 +1 @@
-170e067de85916f8d0b6a508194fbba3  SVN-Mirror-0.73.tar.gz
+15c81a0958ae94e11fcb0dbb62548c98  SVN-Mirror-0.75.tar.gz



From iburrell at fedoraproject.org  Sat Jan 17 22:47:44 2009
From: iburrell at fedoraproject.org (Ian Burrell)
Date: Sat, 17 Jan 2009 22:47:44 +0000 (UTC)
Subject: rpms/perl-SVN-Mirror/F-10 .cvsignore, 1.5, 1.6 perl-SVN-Mirror.spec,
	1.8, 1.9 sources, 1.5, 1.6
Message-ID: <20090117224744.CB1B27012B@cvs1.fedora.phx.redhat.com>

Author: iburrell

Update of /cvs/extras/rpms/perl-SVN-Mirror/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4916

Modified Files:
	.cvsignore perl-SVN-Mirror.spec sources 
Log Message:
Update to 0.75


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-SVN-Mirror/F-10/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	29 May 2007 19:53:56 -0000	1.5
+++ .cvsignore	17 Jan 2009 22:47:14 -0000	1.6
@@ -1 +1 @@
-SVN-Mirror-0.73.tar.gz
+SVN-Mirror-0.75.tar.gz


Index: perl-SVN-Mirror.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-SVN-Mirror/F-10/perl-SVN-Mirror.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- perl-SVN-Mirror.spec	6 Mar 2008 18:59:18 -0000	1.8
+++ perl-SVN-Mirror.spec	17 Jan 2009 22:47:14 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           perl-SVN-Mirror
-Version:        0.73
-Release:        3%{?dist}
+Version:        0.75
+Release:        1%{?dist}
 Summary:        Mirror remote repository to local Subversion repository
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -66,6 +66,9 @@
 %{_bindir}/svm
 
 %changelog
+* Sat Jan 17 2009 Ian Burrell <ianburrell at gmail.com> - 0.75-1
+- Update to 0.75 with test fixes for subversion 1.5.0
+
 * Thu Mar  6 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.73-3
 - rebuild for new perl
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-SVN-Mirror/F-10/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	29 May 2007 19:53:56 -0000	1.5
+++ sources	17 Jan 2009 22:47:14 -0000	1.6
@@ -1 +1 @@
-170e067de85916f8d0b6a508194fbba3  SVN-Mirror-0.73.tar.gz
+15c81a0958ae94e11fcb0dbb62548c98  SVN-Mirror-0.75.tar.gz



From iburrell at fedoraproject.org  Sat Jan 17 22:48:02 2009
From: iburrell at fedoraproject.org (Ian Burrell)
Date: Sat, 17 Jan 2009 22:48:02 +0000 (UTC)
Subject: rpms/perl-SVK/F-10 .cvsignore, 1.5, 1.6 perl-SVK.spec, 1.11,
	1.12 sources, 1.5, 1.6
Message-ID: <20090117224802.B8E967012B@cvs1.fedora.phx.redhat.com>

Author: iburrell

Update of /cvs/extras/rpms/perl-SVK/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4990

Modified Files:
	.cvsignore perl-SVK.spec sources 
Log Message:
Update to 2.2.1


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-SVK/F-10/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	16 Aug 2007 19:26:19 -0000	1.5
+++ .cvsignore	17 Jan 2009 22:47:32 -0000	1.6
@@ -1 +1 @@
-SVK-v2.0.2.tar.gz
+SVK-v2.2.1.tar.gz


Index: perl-SVK.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-SVK/F-10/perl-SVK.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- perl-SVK.spec	6 Mar 2008 21:36:20 -0000	1.11
+++ perl-SVK.spec	17 Jan 2009 22:47:32 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           perl-SVK
-Version:        2.0.2
-Release:        3%{?dist}
+Version:        2.2.1
+Release:        1%{?dist}
 Summary:        A Distributed Version Control System
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -101,6 +101,9 @@
 %{_bindir}/svk
 
 %changelog
+* Sat Jan 17 2009 Ian Burrell <ianburrell at gmail.com> - 2.2.1-1
+- Update to 2.2.1
+
 * Thu Mar  6 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 2.0.2-3
 - disable tests, they're a bit hosed
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-SVK/F-10/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	16 Aug 2007 19:26:19 -0000	1.5
+++ sources	17 Jan 2009 22:47:32 -0000	1.6
@@ -1 +1 @@
-501d823231bd276e5b8f22b6ebe6cf2e  SVK-v2.0.2.tar.gz
+5778f876a744acebde5c9bff0bb865ce  SVK-v2.2.1.tar.gz



From denis at fedoraproject.org  Sat Jan 17 23:06:17 2009
From: denis at fedoraproject.org (Denis Leroy)
Date: Sat, 17 Jan 2009 23:06:17 +0000 (UTC)
Subject: rpms/goocanvas/devel .cvsignore, 1.4, 1.5 goocanvas.spec, 1.8,
	1.9 sources, 1.4, 1.5
Message-ID: <20090117230617.E01067012B@cvs1.fedora.phx.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/goocanvas/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7364

Modified Files:
	.cvsignore goocanvas.spec sources 
Log Message:
Update to upstream 0.13. Updated URLs to gnome.org


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/goocanvas/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	29 Jun 2008 23:06:17 -0000	1.4
+++ .cvsignore	17 Jan 2009 23:05:47 -0000	1.5
@@ -1 +1 @@
-goocanvas-0.10.tar.gz
+goocanvas-0.13.tar.bz2


Index: goocanvas.spec
===================================================================
RCS file: /cvs/pkgs/rpms/goocanvas/devel/goocanvas.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- goocanvas.spec	30 Sep 2008 23:44:18 -0000	1.8
+++ goocanvas.spec	17 Jan 2009 23:05:47 -0000	1.9
@@ -1,12 +1,12 @@
 Name:           goocanvas
-Version:        0.10
-Release:        2%{?dist}
+Version:        0.13
+Release:        1%{?dist}
 Summary:        A new canvas widget for GTK+ that uses cairo for drawing
 
 Group:          System Environment/Libraries
 License:        LGPLv2+
-URL:            http://sourceforge.net/projects/%{name} 
-Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
+URL:            http://live.gnome.org/GooCanvas
+Source0:        ftp://ftp.gnome.org/pub/GNOME/sources/0.13/%{name}/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  pkgconfig, gettext, gtk2-devel
@@ -69,6 +69,10 @@
 
 
 %changelog
+* Sat Jan 17 2009 Denis Leroy <denis at poolshark.org> - 0.13-1
+- Update to upstream 0.13
+- Updated URLs to gnome.org
+
 * Tue Sep 30 2008 Bernard Johnson <bjohnson at symetrix.com> - 0.10-2
 - demo application does not build; remove it
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/goocanvas/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	29 Jun 2008 23:06:17 -0000	1.4
+++ sources	17 Jan 2009 23:05:47 -0000	1.5
@@ -1 +1 @@
-ed67903a547ca16e093255041ce46671  goocanvas-0.10.tar.gz
+0f10b2dfb760e03b2b5cf945ad05dbd6  goocanvas-0.13.tar.bz2



From kevin at fedoraproject.org  Sat Jan 17 23:13:54 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 17 Jan 2009 23:13:54 +0000 (UTC)
Subject: rpms/heartbeat/devel heartbeat.spec,1.27,1.28
Message-ID: <20090117231354.B791C70142@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/heartbeat/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8412

Modified Files:
	heartbeat.spec 
Log Message:
Main package shouldn't require pygtk (#480157)



Index: heartbeat.spec
===================================================================
RCS file: /cvs/extras/rpms/heartbeat/devel/heartbeat.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- heartbeat.spec	16 Jan 2009 17:06:12 -0000	1.27
+++ heartbeat.spec	17 Jan 2009 23:13:23 -0000	1.28
@@ -6,7 +6,7 @@
 Summary:          Heartbeat subsystem for High-Availability Linux
 Name:             heartbeat
 Version:          2.1.4
-Release:          3%{?dist}
+Release:          4%{?dist}
 License:          GPLv2 and LGPLv2+
 URL:              http://linux-ha.org/
 Group:            System Environment/Daemons
@@ -34,7 +34,6 @@
 BuildRequires:    swig
 %endif
 Requires:         ldirectord = %{version}-%{release}
-Requires:         pygtk2 >= 2.4
 Requires:	  PyXML
 Requires(pre):    fedora-usermgmt
 Requires(postun): fedora-usermgmt
@@ -341,6 +340,9 @@
 %{_bindir}/hb_gui
 
 %changelog
+* Sat Jan 17 2009 Kevin Fenzi <kevin at tummy.com> - 2.1.4-4
+- Main package shouldn't require pygtk2 (#480157)
+
 * Fri Jan 16 2009 Tomas Mraz <tmraz at redhat.com> - 2.1.4-3
 - rebuild with new openssl
 



From denis at fedoraproject.org  Sat Jan 17 23:14:55 2009
From: denis at fedoraproject.org (Denis Leroy)
Date: Sat, 17 Jan 2009 23:14:55 +0000 (UTC)
Subject: rpms/pygoocanvas/devel .cvsignore, 1.4, 1.5 pygoocanvas.spec, 1.8, 
	1.9 sources, 1.4, 1.5
Message-ID: <20090117231455.162AD7012B@cvs1.fedora.phx.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/pygoocanvas/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9141

Modified Files:
	.cvsignore pygoocanvas.spec sources 
Log Message:
Update to 0.13.1. Updated URLs to gnome.org


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pygoocanvas/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	29 Jun 2008 23:26:30 -0000	1.4
+++ .cvsignore	17 Jan 2009 23:14:24 -0000	1.5
@@ -1 +1 @@
-pygoocanvas-0.10.0.tar.gz
+pygoocanvas-0.13.1.tar.bz2


Index: pygoocanvas.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pygoocanvas/devel/pygoocanvas.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- pygoocanvas.spec	22 Dec 2008 01:03:18 -0000	1.8
+++ pygoocanvas.spec	17 Jan 2009 23:14:24 -0000	1.9
@@ -1,22 +1,24 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
+%define major_version 0.13
+
 Name:           pygoocanvas
-Version:        0.10.0
-Release:        4%{?dist}
+Version:        0.13.1
+Release:        1%{?dist}
 Summary:        GooCanvas python bindings
 
 Group:          Development/Languages
 License:        LGPLv2+
-URL:            https://developer.berlios.de/projects/%{name}/
-Source0:        http://download.berlios.de/%{name}/%{name}-%{version}.tar.gz
+URL:            http://live.gnome.org/PyGoocanvas
+Source0:        ftp://ftp.gnome.org/pub/GNOME/sources/pygoocanvas/%{name}/%{major_version}/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  python-devel, pkgconfig, pygobject2-devel
 BuildRequires:  pycairo-devel >= 1.2.0, pygtk2-devel >= 2.10.0
-BuildRequires:  goocanvas-devel = 0.10, gtk2-devel
+BuildRequires:  goocanvas-devel = %{major_version}, gtk2-devel
 BuildRequires:  libxslt, docbook-style-xsl
 
-Requires:       goocanvas = 0.10
+Requires:       goocanvas = %{major_version}
 
 %description
 GooCanvas python bindings.
@@ -49,7 +51,7 @@
 %package devel
 Group:          Development/Languages
 Summary:        GooCanvas python bindings development files
-Requires:       goocanvas = 0.10, %{name} = %{version}-%{release}, pkgconfig
+Requires:       goocanvas = %{major_version}, %{name} = %{version}-%{release}, pkgconfig
 
 %description devel
 GooCanvas python bindings development files.
@@ -60,6 +62,10 @@
 %{_datadir}/gtk-doc/html/%{name}
 
 %changelog
+* Sat Jan 17 2009 Denis Leroy <denis at poolshark.org> - 0.13.1-1
+- Update to 0.13.1
+- Updated URLs to gnome.org
+
 * Sun Dec 21 2008 Bernard Johnson <bjohnson at symetrix.com> - 0.10.0-4
 - break into main and -devel packages
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pygoocanvas/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	29 Jun 2008 23:26:30 -0000	1.4
+++ sources	17 Jan 2009 23:14:24 -0000	1.5
@@ -1 +1 @@
-1fe21b066c590a6f3c02b343ef3190c1  pygoocanvas-0.10.0.tar.gz
+e70089ab34f4d8e6fb6aec9e73e01bef  pygoocanvas-0.13.1.tar.bz2



From jakub at fedoraproject.org  Sat Jan 17 23:17:11 2009
From: jakub at fedoraproject.org (Jakub Jelinek)
Date: Sat, 17 Jan 2009 23:17:11 +0000 (UTC)
Subject: rpms/gcc/devel gcc.spec,1.3,1.4
Message-ID: <20090117231711.8B9E17012B@cvs1.fedora.phx.redhat.com>

Author: jakub

Update of /cvs/pkgs/rpms/gcc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9666

Modified Files:
	gcc.spec 
Log Message:
4.4.0-0.4


Index: gcc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/devel/gcc.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gcc.spec	17 Jan 2009 08:25:15 -0000	1.3
+++ gcc.spec	17 Jan 2009 23:16:41 -0000	1.4
@@ -488,6 +488,13 @@
 tar xjf %{SOURCE100}
 export PATH=`pwd`/bin${PATH:+:$PATH}
 cd ..
+which gcc
+gnatgcc --version || :
+gcc --version || :
+gcc --version -gnatg || :
+gnatgcc -print-multi-os-directory || :
+gcc -print-multi-os-directory || :
+gcc -print-multi-os-directory -gnatg || :
 %endif
 
 %if %{build_java}



From slankes at fedoraproject.org  Sat Jan 17 23:18:13 2009
From: slankes at fedoraproject.org (Sven Lankes)
Date: Sat, 17 Jan 2009 23:18:13 +0000 (UTC)
Subject: rpms/dustin-dustismo-fonts/devel
	dustin-dustismo-fonts-sans-fontconfig.conf, NONE,
	1.1 dustin-dustismo-fonts.spec, 1.1,
	1.2 dustin-dustismo-fonts-fontconfig.conf, 1.1, NONE
Message-ID: <20090117231813.623FB7012B@cvs1.fedora.phx.redhat.com>

Author: slankes

Update of /cvs/pkgs/rpms/dustin-dustismo-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9895

Modified Files:
	dustin-dustismo-fonts.spec 
Added Files:
	dustin-dustismo-fonts-sans-fontconfig.conf 
Removed Files:
	dustin-dustismo-fonts-fontconfig.conf 
Log Message:
compliance with new font packaging guidelines


--- NEW FILE dustin-dustismo-fonts-sans-fontconfig.conf ---
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
<fontconfig>
  <alias>
    <family>sans-serif</family>
    <prefer>
      <family>Dustismo</family>
    </prefer>
  </alias>
  <alias>
    <family>Dustismo</family>
    <default>
      <family>sans-serif</family>
    </default>
  </alias>
</fontconfig>



Index: dustin-dustismo-fonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dustin-dustismo-fonts/devel/dustin-dustismo-fonts.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- dustin-dustismo-fonts.spec	7 Jan 2009 19:39:53 -0000	1.1
+++ dustin-dustismo-fonts.spec	17 Jan 2009 23:17:43 -0000	1.2
@@ -6,7 +6,7 @@
 
 Name:          %{fontname}-fonts
 Version:       20030318
-Release:       2%{?dist}
+Release:       3%{?dist}
 Summary:       General purpose sans-serif font with bold, italic and bold-italic variations
 
 Group:         User Interface/X
@@ -15,7 +15,7 @@
 # Actual download URL
 #URL:           http://ftp.de.debian.org/debian/pool/main/t/ttf-dustin/ttf-dustin_20030517.orig.tar.gz 
 Source0:       Dustismo.zip
-Source1:       %{name}-fontconfig.conf
+Source1:       %{name}-sans-fontconfig.conf
 Source2:       %{name}-roman-fontconfig.conf
 BuildRoot:     %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
@@ -25,8 +25,6 @@
 %description
 %common_desc
 
-%_font_pkg -f %{fontconf}.conf dustismo_bold_italic.ttf dustismo_bold.ttf dustismo_italic.ttf Dustismo.ttf
-
 %package common
 Summary:       Common files for %{name}
 Group:         User Interface/X
@@ -37,12 +35,28 @@
 
 This package consists of files used by other %{name} packages.
 
-%package       roman
+%package -n %{fontname}-sans-fonts
+Summary:       General purpos sans-serif fonts
+Group:         User Interface/X
+Requires:      %{name}-common = %{version}-%{release}
+Provides:      %{name} = 20030318-3
+Obsoletes:     %{name} < 20030318-3
+
+%description -n %{fontname}-sans-fonts
+%common_desc
+
+General purpose sans-serif font with bold, italic and bold-italic variations
+
+%_font_pkg -n sans -f %{fontconf}-sans.conf dustismo_bold_italic.ttf dustismo_bold.ttf dustismo_italic.ttf Dustismo.ttf
+
+%package -n %{fontname}-roman-fonts
 Summary:       General purpose serif font
 Group:         User Interface/X
 Requires:      %{name}-common = %{version}-%{release}
+Provides:      %{name}-roman = 20030318-3
+Obsoletes:     %{name}-roman < 20030318-3
 
-%description roman
+%description -n %{fontname}-roman-fonts
 %common_desc
 
 General purpose serif font with bold, italic and bold-italic variations
@@ -63,10 +77,10 @@
 
 install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} %{buildroot}%{_fontconfig_confdir}
 
-install -m 0644 -p %{SOURCE1} %{buildroot}%{_fontconfig_templatedir}/%{fontconf}.conf
+install -m 0644 -p %{SOURCE1} %{buildroot}%{_fontconfig_templatedir}/%{fontconf}-sans.conf
 install -m 0644 -p %{SOURCE2} %{buildroot}%{_fontconfig_templatedir}/%{fontconf}-roman.conf
 
-for fontconf in %{fontconf}.conf %{fontconf}-roman.conf ; do
+for fontconf in %{fontconf}-sans.conf %{fontconf}-roman.conf ; do
   ln -s %{_fontconfig_templatedir}/$fontconf %{buildroot}%{_fontconfig_confdir}/$fontconf
 done
 
@@ -80,10 +94,16 @@
 %dir %{_fontdir}
 
 %changelog
-* Wed Dec 07 2009 Sven Lankes <sven at lank.es> - 20030318-2
+* Sat Jan 17 2009 Sven Lankes <sven at lank.es> - 20030318-3
+- rename according to new naming-guidelines
+
+* Sat Jan 17 2009 Sven Lankes <sven at lank.es> - 20030318-2
+- Change package-name to dustin-dustistmo-fonts
+
+* Wed Jan 07 2009 Sven Lankes <sven at lank.es> - 20030318-2
 - Change package-name to dustin-dustistmo-fonts
 
-* Sun Dec 04 2009 Sven Lankes <sven at lank.es> - 20030318-1
+* Sun Jan 04 2009 Sven Lankes <sven at lank.es> - 20030318-1
 - Use newer debian-source as source
 - Convert to -multi spec
 


--- dustin-dustismo-fonts-fontconfig.conf DELETED ---



From iburrell at fedoraproject.org  Sat Jan 17 23:29:47 2009
From: iburrell at fedoraproject.org (Ian Burrell)
Date: Sat, 17 Jan 2009 23:29:47 +0000 (UTC)
Subject: rpms/perl-SVK/F-9 .cvsignore, 1.5, 1.6 perl-SVK.spec, 1.11,
	1.12 sources, 1.5, 1.6
Message-ID: <20090117232947.2753C7012B@cvs1.fedora.phx.redhat.com>

Author: iburrell

Update of /cvs/extras/rpms/perl-SVK/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11670

Modified Files:
	.cvsignore perl-SVK.spec sources 
Log Message:
Update to 2.2.1


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-SVK/F-9/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	16 Aug 2007 19:26:19 -0000	1.5
+++ .cvsignore	17 Jan 2009 23:29:16 -0000	1.6
@@ -1 +1 @@
-SVK-v2.0.2.tar.gz
+SVK-v2.2.1.tar.gz


Index: perl-SVK.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-SVK/F-9/perl-SVK.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- perl-SVK.spec	6 Mar 2008 21:36:20 -0000	1.11
+++ perl-SVK.spec	17 Jan 2009 23:29:16 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           perl-SVK
-Version:        2.0.2
-Release:        3%{?dist}
+Version:        2.2.1
+Release:        1%{?dist}
 Summary:        A Distributed Version Control System
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -101,6 +101,9 @@
 %{_bindir}/svk
 
 %changelog
+* Sat Jan 17 2009 Ian Burrell <ianburrell at gmail.com> - 2.2.1-1
+- Update to 2.2.1
+
 * Thu Mar  6 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 2.0.2-3
 - disable tests, they're a bit hosed
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-SVK/F-9/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	16 Aug 2007 19:26:19 -0000	1.5
+++ sources	17 Jan 2009 23:29:16 -0000	1.6
@@ -1 +1 @@
-501d823231bd276e5b8f22b6ebe6cf2e  SVK-v2.0.2.tar.gz
+5778f876a744acebde5c9bff0bb865ce  SVK-v2.2.1.tar.gz



From iburrell at fedoraproject.org  Sat Jan 17 23:30:22 2009
From: iburrell at fedoraproject.org (Ian Burrell)
Date: Sat, 17 Jan 2009 23:30:22 +0000 (UTC)
Subject: rpms/perl-SVN-Mirror/F-9 .cvsignore, 1.5, 1.6 perl-SVN-Mirror.spec, 
	1.8, 1.9 sources, 1.5, 1.6
Message-ID: <20090117233022.263987012B@cvs1.fedora.phx.redhat.com>

Author: iburrell

Update of /cvs/extras/rpms/perl-SVN-Mirror/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11868

Modified Files:
	.cvsignore perl-SVN-Mirror.spec sources 
Log Message:
Update to 0.75


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-SVN-Mirror/F-9/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	29 May 2007 19:53:56 -0000	1.5
+++ .cvsignore	17 Jan 2009 23:29:51 -0000	1.6
@@ -1 +1 @@
-SVN-Mirror-0.73.tar.gz
+SVN-Mirror-0.75.tar.gz


Index: perl-SVN-Mirror.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-SVN-Mirror/F-9/perl-SVN-Mirror.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- perl-SVN-Mirror.spec	6 Mar 2008 18:59:18 -0000	1.8
+++ perl-SVN-Mirror.spec	17 Jan 2009 23:29:51 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           perl-SVN-Mirror
-Version:        0.73
-Release:        3%{?dist}
+Version:        0.75
+Release:        1%{?dist}
 Summary:        Mirror remote repository to local Subversion repository
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -66,6 +66,9 @@
 %{_bindir}/svm
 
 %changelog
+* Sat Jan 17 2009 Ian Burrell <ianburrell at gmail.com> - 0.75-1
+- Update to 0.75 with test fixes for subversion 1.5.0
+
 * Thu Mar  6 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.73-3
 - rebuild for new perl
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-SVN-Mirror/F-9/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	29 May 2007 19:53:56 -0000	1.5
+++ sources	17 Jan 2009 23:29:51 -0000	1.6
@@ -1 +1 @@
-170e067de85916f8d0b6a508194fbba3  SVN-Mirror-0.73.tar.gz
+15c81a0958ae94e11fcb0dbb62548c98  SVN-Mirror-0.75.tar.gz



From slankes at fedoraproject.org  Sat Jan 17 23:30:43 2009
From: slankes at fedoraproject.org (Sven Lankes)
Date: Sat, 17 Jan 2009 23:30:43 +0000 (UTC)
Subject: rpms/dustin-dustismo-fonts/F-10
	dustin-dustismo-fonts-sans-fontconfig.conf, NONE,
	1.1 dustin-dustismo-fonts.spec, 1.1,
	1.2 dustin-dustismo-fonts-fontconfig.conf, 1.1, NONE
Message-ID: <20090117233043.2208A7012B@cvs1.fedora.phx.redhat.com>

Author: slankes

Update of /cvs/pkgs/rpms/dustin-dustismo-fonts/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11908/F-10

Modified Files:
	dustin-dustismo-fonts.spec 
Added Files:
	dustin-dustismo-fonts-sans-fontconfig.conf 
Removed Files:
	dustin-dustismo-fonts-fontconfig.conf 
Log Message:
compliance with new font packaging guidelines


--- NEW FILE dustin-dustismo-fonts-sans-fontconfig.conf ---
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
<fontconfig>
  <alias>
    <family>sans-serif</family>
    <prefer>
      <family>Dustismo</family>
    </prefer>
  </alias>
  <alias>
    <family>Dustismo</family>
    <default>
      <family>sans-serif</family>
    </default>
  </alias>
</fontconfig>



Index: dustin-dustismo-fonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dustin-dustismo-fonts/F-10/dustin-dustismo-fonts.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- dustin-dustismo-fonts.spec	7 Jan 2009 19:56:40 -0000	1.1
+++ dustin-dustismo-fonts.spec	17 Jan 2009 23:30:12 -0000	1.2
@@ -6,7 +6,7 @@
 
 Name:          %{fontname}-fonts
 Version:       20030318
-Release:       2%{?dist}
+Release:       3%{?dist}
 Summary:       General purpose sans-serif font with bold, italic and bold-italic variations
 
 Group:         User Interface/X
@@ -15,7 +15,7 @@
 # Actual download URL
 #URL:           http://ftp.de.debian.org/debian/pool/main/t/ttf-dustin/ttf-dustin_20030517.orig.tar.gz 
 Source0:       Dustismo.zip
-Source1:       %{name}-fontconfig.conf
+Source1:       %{name}-sans-fontconfig.conf
 Source2:       %{name}-roman-fontconfig.conf
 BuildRoot:     %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
@@ -25,8 +25,6 @@
 %description
 %common_desc
 
-%_font_pkg -f %{fontconf}.conf dustismo_bold_italic.ttf dustismo_bold.ttf dustismo_italic.ttf Dustismo.ttf
-
 %package common
 Summary:       Common files for %{name}
 Group:         User Interface/X
@@ -37,12 +35,28 @@
 
 This package consists of files used by other %{name} packages.
 
-%package       roman
+%package -n %{fontname}-sans-fonts
+Summary:       General purpos sans-serif fonts
+Group:         User Interface/X
+Requires:      %{name}-common = %{version}-%{release}
+Provides:      %{name} = 20030318-3
+Obsoletes:     %{name} < 20030318-3
+
+%description -n %{fontname}-sans-fonts
+%common_desc
+
+General purpose sans-serif font with bold, italic and bold-italic variations
+
+%_font_pkg -n sans -f %{fontconf}-sans.conf dustismo_bold_italic.ttf dustismo_bold.ttf dustismo_italic.ttf Dustismo.ttf
+
+%package -n %{fontname}-roman-fonts
 Summary:       General purpose serif font
 Group:         User Interface/X
 Requires:      %{name}-common = %{version}-%{release}
+Provides:      %{name}-roman = 20030318-3
+Obsoletes:     %{name}-roman < 20030318-3
 
-%description roman
+%description -n %{fontname}-roman-fonts
 %common_desc
 
 General purpose serif font with bold, italic and bold-italic variations
@@ -63,10 +77,10 @@
 
 install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} %{buildroot}%{_fontconfig_confdir}
 
-install -m 0644 -p %{SOURCE1} %{buildroot}%{_fontconfig_templatedir}/%{fontconf}.conf
+install -m 0644 -p %{SOURCE1} %{buildroot}%{_fontconfig_templatedir}/%{fontconf}-sans.conf
 install -m 0644 -p %{SOURCE2} %{buildroot}%{_fontconfig_templatedir}/%{fontconf}-roman.conf
 
-for fontconf in %{fontconf}.conf %{fontconf}-roman.conf ; do
+for fontconf in %{fontconf}-sans.conf %{fontconf}-roman.conf ; do
   ln -s %{_fontconfig_templatedir}/$fontconf %{buildroot}%{_fontconfig_confdir}/$fontconf
 done
 
@@ -80,10 +94,13 @@
 %dir %{_fontdir}
 
 %changelog
-* Wed Dec 07 2009 Sven Lankes <sven at lank.es> - 20030318-2
+* Sat Jan 17 2009 Sven Lankes <sven at lank.es> - 20030318-3
+- rename according to new naming-guidelines
+
+* Wed Jan 07 2009 Sven Lankes <sven at lank.es> - 20030318-2
 - Change package-name to dustin-dustistmo-fonts
 
-* Sun Dec 04 2009 Sven Lankes <sven at lank.es> - 20030318-1
+* Sun Jan 04 2009 Sven Lankes <sven at lank.es> - 20030318-1
 - Use newer debian-source as source
 - Convert to -multi spec
 


--- dustin-dustismo-fonts-fontconfig.conf DELETED ---



From slankes at fedoraproject.org  Sat Jan 17 23:30:43 2009
From: slankes at fedoraproject.org (Sven Lankes)
Date: Sat, 17 Jan 2009 23:30:43 +0000 (UTC)
Subject: rpms/dustin-dustismo-fonts/devel dustin-dustismo-fonts.spec, 1.2,
	1.3
Message-ID: <20090117233043.8EC2A70142@cvs1.fedora.phx.redhat.com>

Author: slankes

Update of /cvs/pkgs/rpms/dustin-dustismo-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11908/devel

Modified Files:
	dustin-dustismo-fonts.spec 
Log Message:
compliance with new font packaging guidelines


Index: dustin-dustismo-fonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dustin-dustismo-fonts/devel/dustin-dustismo-fonts.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- dustin-dustismo-fonts.spec	17 Jan 2009 23:17:43 -0000	1.2
+++ dustin-dustismo-fonts.spec	17 Jan 2009 23:30:13 -0000	1.3
@@ -97,9 +97,6 @@
 * Sat Jan 17 2009 Sven Lankes <sven at lank.es> - 20030318-3
 - rename according to new naming-guidelines
 
-* Sat Jan 17 2009 Sven Lankes <sven at lank.es> - 20030318-2
-- Change package-name to dustin-dustistmo-fonts
-
 * Wed Jan 07 2009 Sven Lankes <sven at lank.es> - 20030318-2
 - Change package-name to dustin-dustistmo-fonts
 



From slankes at fedoraproject.org  Sat Jan 17 23:30:43 2009
From: slankes at fedoraproject.org (Sven Lankes)
Date: Sat, 17 Jan 2009 23:30:43 +0000 (UTC)
Subject: rpms/dustin-dustismo-fonts/F-9
	dustin-dustismo-fonts-sans-fontconfig.conf, NONE,
	1.1 dustin-dustismo-fonts.spec, 1.1,
	1.2 dustin-dustismo-fonts-fontconfig.conf, 1.1, NONE
Message-ID: <20090117233043.5EE907012B@cvs1.fedora.phx.redhat.com>

Author: slankes

Update of /cvs/pkgs/rpms/dustin-dustismo-fonts/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11908/F-9

Modified Files:
	dustin-dustismo-fonts.spec 
Added Files:
	dustin-dustismo-fonts-sans-fontconfig.conf 
Removed Files:
	dustin-dustismo-fonts-fontconfig.conf 
Log Message:
compliance with new font packaging guidelines


--- NEW FILE dustin-dustismo-fonts-sans-fontconfig.conf ---
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
<fontconfig>
  <alias>
    <family>sans-serif</family>
    <prefer>
      <family>Dustismo</family>
    </prefer>
  </alias>
  <alias>
    <family>Dustismo</family>
    <default>
      <family>sans-serif</family>
    </default>
  </alias>
</fontconfig>



Index: dustin-dustismo-fonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dustin-dustismo-fonts/F-9/dustin-dustismo-fonts.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- dustin-dustismo-fonts.spec	7 Jan 2009 19:56:40 -0000	1.1
+++ dustin-dustismo-fonts.spec	17 Jan 2009 23:30:13 -0000	1.2
@@ -6,7 +6,7 @@
 
 Name:          %{fontname}-fonts
 Version:       20030318
-Release:       2%{?dist}
+Release:       3%{?dist}
 Summary:       General purpose sans-serif font with bold, italic and bold-italic variations
 
 Group:         User Interface/X
@@ -15,7 +15,7 @@
 # Actual download URL
 #URL:           http://ftp.de.debian.org/debian/pool/main/t/ttf-dustin/ttf-dustin_20030517.orig.tar.gz 
 Source0:       Dustismo.zip
-Source1:       %{name}-fontconfig.conf
+Source1:       %{name}-sans-fontconfig.conf
 Source2:       %{name}-roman-fontconfig.conf
 BuildRoot:     %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
@@ -25,8 +25,6 @@
 %description
 %common_desc
 
-%_font_pkg -f %{fontconf}.conf dustismo_bold_italic.ttf dustismo_bold.ttf dustismo_italic.ttf Dustismo.ttf
-
 %package common
 Summary:       Common files for %{name}
 Group:         User Interface/X
@@ -37,12 +35,28 @@
 
 This package consists of files used by other %{name} packages.
 
-%package       roman
+%package -n %{fontname}-sans-fonts
+Summary:       General purpos sans-serif fonts
+Group:         User Interface/X
+Requires:      %{name}-common = %{version}-%{release}
+Provides:      %{name} = 20030318-3
+Obsoletes:     %{name} < 20030318-3
+
+%description -n %{fontname}-sans-fonts
+%common_desc
+
+General purpose sans-serif font with bold, italic and bold-italic variations
+
+%_font_pkg -n sans -f %{fontconf}-sans.conf dustismo_bold_italic.ttf dustismo_bold.ttf dustismo_italic.ttf Dustismo.ttf
+
+%package -n %{fontname}-roman-fonts
 Summary:       General purpose serif font
 Group:         User Interface/X
 Requires:      %{name}-common = %{version}-%{release}
+Provides:      %{name}-roman = 20030318-3
+Obsoletes:     %{name}-roman < 20030318-3
 
-%description roman
+%description -n %{fontname}-roman-fonts
 %common_desc
 
 General purpose serif font with bold, italic and bold-italic variations
@@ -63,10 +77,10 @@
 
 install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} %{buildroot}%{_fontconfig_confdir}
 
-install -m 0644 -p %{SOURCE1} %{buildroot}%{_fontconfig_templatedir}/%{fontconf}.conf
+install -m 0644 -p %{SOURCE1} %{buildroot}%{_fontconfig_templatedir}/%{fontconf}-sans.conf
 install -m 0644 -p %{SOURCE2} %{buildroot}%{_fontconfig_templatedir}/%{fontconf}-roman.conf
 
-for fontconf in %{fontconf}.conf %{fontconf}-roman.conf ; do
+for fontconf in %{fontconf}-sans.conf %{fontconf}-roman.conf ; do
   ln -s %{_fontconfig_templatedir}/$fontconf %{buildroot}%{_fontconfig_confdir}/$fontconf
 done
 
@@ -80,10 +94,13 @@
 %dir %{_fontdir}
 
 %changelog
-* Wed Dec 07 2009 Sven Lankes <sven at lank.es> - 20030318-2
+* Sat Jan 17 2009 Sven Lankes <sven at lank.es> - 20030318-3
+- rename according to new naming-guidelines
+
+* Wed Jan 07 2009 Sven Lankes <sven at lank.es> - 20030318-2
 - Change package-name to dustin-dustistmo-fonts
 
-* Sun Dec 04 2009 Sven Lankes <sven at lank.es> - 20030318-1
+* Sun Jan 04 2009 Sven Lankes <sven at lank.es> - 20030318-1
 - Use newer debian-source as source
 - Convert to -multi spec
 


--- dustin-dustismo-fonts-fontconfig.conf DELETED ---



From kevin at fedoraproject.org  Sat Jan 17 23:46:09 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sat, 17 Jan 2009 23:46:09 +0000 (UTC)
Subject: rpms/munin/devel munin.spec,1.20,1.21
Message-ID: <20090117234609.2A0F27012B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/munin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14885

Modified Files:
	munin.spec 
Log Message:
Adjust font requires for new dejavu-sans-mono-fonts name (fixes #480463)



Index: munin.spec
===================================================================
RCS file: /cvs/extras/rpms/munin/devel/munin.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- munin.spec	12 Jan 2009 18:07:48 -0000	1.20
+++ munin.spec	17 Jan 2009 23:45:38 -0000	1.21
@@ -1,6 +1,6 @@
 Name:      munin
 Version:   1.2.6
-Release:   6%{?dist}
+Release:   7%{?dist}
 Summary:   Network-wide graphing framework (grapher/gatherer)
 License:   GPLv2 and Bitstream Vera
 Group:     System Environment/Daemons
@@ -25,7 +25,7 @@
 Requires: logrotate
 Requires(pre): shadow-utils
 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
-Requires: dejavu-fonts-sans-mono
+Requires: dejavu-sans-mono-fonts
 
 %description
 Munin is a highly flexible and powerful solution used to create graphs of
@@ -246,6 +246,9 @@
 %doc %{_mandir}/man5/munin-node*
 
 %changelog
+* Sat Jan 17 2009 Kevin Fenzi <kevin at tummy.com> - 1.2.6-7
+- Adjust font requires for new dejavu-sans-mono-fonts name (fixes #480463)
+
 * Mon Jan 12 2009 Kevin Fenzi <kevin at tummy.com> - 1.2.6-6
 - Fix to require the correct font
 



From nbecker at fedoraproject.org  Sat Jan 17 23:49:19 2009
From: nbecker at fedoraproject.org (Neal Becker)
Date: Sat, 17 Jan 2009 23:49:19 +0000 (UTC)
Subject: rpms/kdiff3/devel .cvsignore, 1.6, 1.7 kdiff3.spec, 1.21,
	1.22 sources, 1.6, 1.7
Message-ID: <20090117234919.9C0E47012B@cvs1.fedora.phx.redhat.com>

Author: nbecker

Update of /cvs/pkgs/rpms/kdiff3/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15436

Modified Files:
	.cvsignore kdiff3.spec sources 
Log Message:
Update to 0.9.4



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdiff3/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	9 Jan 2009 13:46:26 -0000	1.6
+++ .cvsignore	17 Jan 2009 23:48:49 -0000	1.7
@@ -1 +1 @@
-kdiff3-0.9.93-3.tar.gz
+kdiff3-0.9.94.tar.gz


Index: kdiff3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdiff3/devel/kdiff3.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- kdiff3.spec	9 Jan 2009 13:48:27 -0000	1.21
+++ kdiff3.spec	17 Jan 2009 23:48:49 -0000	1.22
@@ -1,14 +1,12 @@
 Name:           kdiff3
-Version:        0.9.93
-%define inc 3
-%define realname %{name}-%{version}-%{inc}
-Release: 	1.%{inc}%{?dist}
+Version:        0.9.94
+Release: 	1%{?dist}
 Summary:        Compare + merge 2 or 3 files or directories
 
 Group:          Development/Tools
 License:        GPLv2
 URL:            http://kdiff3.sourceforge.net/
-Source0:        http://downloads.sourceforge.net/sourceforge/kdiff3/%{realname}.tar.gz
+Source0:        http://downloads.sourceforge.net/sourceforge/kdiff3/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # What's the purpose of this patch?  -- Rex 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdiff3/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	9 Jan 2009 13:46:26 -0000	1.6
+++ sources	17 Jan 2009 23:48:49 -0000	1.7
@@ -1 +1 @@
-f9a3ac045b3df0a24104a4a5e6299488  kdiff3-0.9.93-3.tar.gz
+8bf580e53a420b1aa1eca3ea502bbe8b  kdiff3-0.9.94.tar.gz



From nbecker at fedoraproject.org  Sun Jan 18 00:02:01 2009
From: nbecker at fedoraproject.org (Neal Becker)
Date: Sun, 18 Jan 2009 00:02:01 +0000 (UTC)
Subject: rpms/kdiff3/F-10 .cvsignore, 1.3, 1.4 kdiff3.spec, 1.12,
	1.13 sources, 1.3, 1.4
Message-ID: <20090118000201.BF853700E0@cvs1.fedora.phx.redhat.com>

Author: nbecker

Update of /cvs/pkgs/rpms/kdiff3/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17090

Modified Files:
	.cvsignore kdiff3.spec sources 
Log Message:
update to 0.9.94


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdiff3/F-10/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	7 Nov 2007 01:57:35 -0000	1.3
+++ .cvsignore	18 Jan 2009 00:01:30 -0000	1.4
@@ -1 +1 @@
-kdiff3-0.9.92.tar.gz
+kdiff3-0.9.94.tar.gz


Index: kdiff3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdiff3/F-10/kdiff3.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- kdiff3.spec	5 Jun 2008 22:55:05 -0000	1.12
+++ kdiff3.spec	18 Jan 2009 00:01:31 -0000	1.13
@@ -1,19 +1,21 @@
 Name:           kdiff3
-Version:        0.9.92
-Release: 	14%{?dist}
+Version:        0.9.94
+Release: 	1%{?dist}
 Summary:        Compare + merge 2 or 3 files or directories
 
 Group:          Development/Tools
 License:        GPLv2
 URL:            http://kdiff3.sourceforge.net/
-Source0:        http://dl.sourceforge.net/sourceforge/kdiff3/%{name}-%{version}.tar.gz
+Source0:        http://downloads.sourceforge.net/sourceforge/kdiff3/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-%if 0%{?rhel}
-BuildRequires:  kdebase-devel, kdelibs-devel, desktop-file-utils
-%else
-BuildRequires:  kdebase3-devel, kdelibs3-devel, desktop-file-utils
-%endif
+# What's the purpose of this patch?  -- Rex 
+Patch0:         kdiff3part.desktop.diff
+
+BuildRequires:  desktop-file-utils
+BuildRequires:  gettext
+BuildRequires:  kdelibs4-devel
+BuildRequires:  kdebase4-devel
 
 %description
 KDiff3 is a program that
@@ -26,28 +28,31 @@
 
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{version}
+%patch0 -p1
 
 
 %build
-unset QTDIR || : ; source /etc/profile.d/qt.sh
-%configure \
-         --disable-rpath
+mkdir -p %{_target_platform}
+pushd %{_target_platform}
+%{cmake_kde4} ..
+popd
 
-make %{?_smp_mflags}
+make %{?_smp_mflags} -C %{_target_platform} VERBOSE=1
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
 
-HTML_DIR=$(kde-config --expandvars --install html)
+make -C %{_target_platform} install/fast DESTDIR=$RPM_BUILD_ROOT
 
-# this is junk
-rm -rf $RPM_BUILD_ROOT$HTML_DIR/%{name} 
+HTML_DIR=%{_kde4_docdir}/HTML
 
 # locale's
 %find_lang %{name} || touch %{name}.lang
+%find_lang %{name}plugin || touch %{name}.lang
+cat %{name}plugin.lang >> %{name}.lang
+
 # HTML (1.0)
 if [ -d $RPM_BUILD_ROOT$HTML_DIR ]; then
 for lang_dir in $RPM_BUILD_ROOT$HTML_DIR/* ; do
@@ -65,45 +70,74 @@
 fi
 
 # Desktop.
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
+desktop-file-install --vendor="" \
+    --dir=$RPM_BUILD_ROOT%{_kde4_datadir}/kde4/services \
+    $RPM_BUILD_ROOT%{_kde4_datadir}/kde4/services/kdiff3part.desktop
 
-desktop-file-install  --vendor fedora \
-    --dir $RPM_BUILD_ROOT%{_datadir}/applications  \
-    --add-category Development \
-    --add-category X-Fedora \
-    --delete-original \
-        $RPM_BUILD_ROOT%{_datadir}/applnk/Development/kdiff3.desktop
-
-echo "NoDisplay=true" >> \
-$RPM_BUILD_ROOT%{_datadir}/applnk/.hidden/kdiff3plugin.desktop
 desktop-file-install  --vendor="" \
-     --dir $RPM_BUILD_ROOT%{_datadir}/applications/kde \
-     --delete-original \
-     $RPM_BUILD_ROOT%{_datadir}/applnk/.hidden/kdiff3plugin.desktop
+    --dir=$RPM_BUILD_ROOT%{_kde4_datadir}/applications/kde4  \
+    --add-category=Development \
+        $RPM_BUILD_ROOT%{_kde4_datadir}/applications/kde4/kdiff3.desktop
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+
 %post
-touch --no-create %{_datadir}/icons/hicolor || :
-%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+touch --no-create %{_kde4_iconsdir}/hicolor || :
+touch --no-create %{_kde4_iconsdir}/locolor || :
+%{_bindir}/gtk-update-icon-cache --quiet %{_kde4_iconsdir}/icons/hicolor 2> /dev/null || :
+%{_bindir}/gtk-update-icon-cache --quiet %{_kde4_iconsdir}/icons/locolor 2> /dev/null || :
 
 %postun
-touch --no-create %{_datadir}/icons/hicolor || :
-%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+touch --no-create %{_kde4_iconsdir}/hicolor || :
+touch --no-create %{_kde4_iconsdir}/locolor || :
+%{_bindir}/gtk-update-icon-cache --quiet %{_kde4_iconsdir}/icons/hicolor 2> /dev/null || :
+%{_bindir}/gtk-update-icon-cache --quiet %{_kde4_iconsdir}/icons/locolor 2> /dev/null || :
+
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog README TODO
-%{_bindir}/kdiff3
-%{_libdir}/kde3/*
-%{_datadir}/applications/*
-%{_datadir}/apps/*
-%{_datadir}/icons/*/*/*/kdiff3.png
-%{_datadir}/services/*
-%{_mandir}/man1/kdiff3*
+%{_kde4_bindir}/kdiff3
+%{_kde4_libdir}/kde4/libkdiff3*.so
+%{_kde4_datadir}/applications/kde4/*
+%{_kde4_appsdir}/kdiff3/
+%{_kde4_iconsdir}/hicolor/*/*/kdiff3.png
+%{_kde4_iconsdir}/locolor/*/*/kdiff3.png
+%{_kde4_datadir}/kde4/services/kdiff3*.desktop
+
 
 %changelog
+* Fri Jan  9 2009 Neal Becker <ndbecker2 at gmail.com> - 0.9.93-1.3%{?dist}
+- Update to 0.9.93-3
+
+* Tue Jan  6 2009 Neal Becker <ndbecker2 at gmail.com> - 0.9.93-2-1
+- Update to 0.9.93-2
+
+* Tue Jan  6 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.9.93-6
+- use kde4 macros
+- add scriptlets for locolor icons
+- update d-f-i usage
+- include khelpcenter handbook
+- update Source0 URL
+
+* Tue Jan  6 2009 Neal Becker <ndbecker2 at gmail.com> - 0.9.93-5
+- Fix HTML_DIR and use kde4_ versions of datadir, libdir, bindir
+
+* Tue Jan  6 2009 Neal Becker <ndbecker2 at gmail.com> - 0.9.93-4
+- Remove /etc/profile.d/qt.sh, remove configure
+
+* Tue Jan  6 2009 Neal Becker <ndbecker2 at gmail.com> - 0.9.93-3
+- Change BR, no longer kde3
+
+* Tue Jan  6 2009 Neal Becker <ndbecker2 at gmail.com> - 0.9.93-2
+- Add br cmake
+
+* Tue Jan  6 2009 Neal Becker <ndbecker2 at gmail.com> - 0.9.93-1
+- Update to 0.9.93
+
 * Thu Jun 5 2008 Manuel Wolfshant <wolfy at fedoraproject.org> - 0.9.92-14
 - add a conditional BR, allowing build in EPEL-5
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdiff3/F-10/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	7 Nov 2007 01:57:35 -0000	1.3
+++ sources	18 Jan 2009 00:01:31 -0000	1.4
@@ -1 +1 @@
-c7b52bfee6a085393de0c4f83732e8f0  kdiff3-0.9.92.tar.gz
+8bf580e53a420b1aa1eca3ea502bbe8b  kdiff3-0.9.94.tar.gz



From nbecker at fedoraproject.org  Sun Jan 18 00:08:40 2009
From: nbecker at fedoraproject.org (Neal Becker)
Date: Sun, 18 Jan 2009 00:08:40 +0000 (UTC)
Subject: rpms/kdiff3/F-10 kdiff3part.desktop.diff,NONE,1.1
Message-ID: <20090118000840.80254700E0@cvs1.fedora.phx.redhat.com>

Author: nbecker

Update of /cvs/pkgs/rpms/kdiff3/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18197

Added Files:
	kdiff3part.desktop.diff 
Log Message:
add kdiff3part.desktop.diff

kdiff3part.desktop.diff:

--- NEW FILE kdiff3part.desktop.diff ---
--- kdiff3-0.9.93/src-QT4/kdiff3part.desktop~	2008-10-26 17:55:20.000000000 -0400
+++ kdiff3-0.9.93/src-QT4/kdiff3part.desktop	2009-01-06 11:31:20.000000000 -0500
@@ -5,7 +5,6 @@
 Name[hi]=??????-?????????3???????????????
 Name[sv]=Kdiff3-del
 Name[x-test]=xxKDiff3Partxx
-MimeType=text/x-diff;
 ServiceTypes=KParts/ReadOnlyPart,KParts/ReadWritePart
 X-KDE-Library=libkdiff3part
 Type=Service



From kevin at fedoraproject.org  Sun Jan 18 00:09:06 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 18 Jan 2009 00:09:06 +0000 (UTC)
Subject: rpms/rdiff-backup/devel .cvsignore, 1.11, 1.12 sources, 1.12,
	1.13 rdiff-backup.spec, 1.27, 1.28
Message-ID: <20090118000906.48C91700E0@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/rdiff-backup/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18162

Modified Files:
	.cvsignore sources rdiff-backup.spec 
Log Message:
Update to 1.2.5



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rdiff-backup/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	1 Jan 2009 18:16:19 -0000	1.11
+++ .cvsignore	18 Jan 2009 00:08:35 -0000	1.12
@@ -1 +1 @@
-rdiff-backup-1.2.4.tar.gz
+rdiff-backup-1.2.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rdiff-backup/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	1 Jan 2009 18:16:19 -0000	1.12
+++ sources	18 Jan 2009 00:08:35 -0000	1.13
@@ -1 +1 @@
-0d3f24ede9d27321371fd19014431e59  rdiff-backup-1.2.4.tar.gz
+28c9f45afd0e4a250ecc95e555995e48  rdiff-backup-1.2.5.tar.gz


Index: rdiff-backup.spec
===================================================================
RCS file: /cvs/extras/rpms/rdiff-backup/devel/rdiff-backup.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- rdiff-backup.spec	1 Jan 2009 18:16:19 -0000	1.27
+++ rdiff-backup.spec	18 Jan 2009 00:08:35 -0000	1.28
@@ -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.4
+Version: 1.2.5
 Summary: Convenient and transparent local/remote incremental mirror/backup
 Name: rdiff-backup
 Release: 1%{?dist}
@@ -56,6 +56,9 @@
 %{python_sitearch}/rdiff_backup-%{version}-py?.?.egg-info
 
 %changelog
+* Sat Jan 17 2009 Kevin Fenzi <kevin at tummy.com> - 1.2.5-1
+- Update to 1.2.5
+
 * Thu Jan 01 2009 Kevin Fenzi <kevin at tummy.com> - 1.2.4-1
 - Update to 1.2.4
 



From nbecker at fedoraproject.org  Sun Jan 18 00:11:12 2009
From: nbecker at fedoraproject.org (Neal Becker)
Date: Sun, 18 Jan 2009 00:11:12 +0000 (UTC)
Subject: rpms/kdiff3/F-9 kdiff3part.desktop.diff, NONE, 1.1 .cvsignore, 1.3, 
	1.4 kdiff3.spec, 1.9, 1.10 sources, 1.3, 1.4
Message-ID: <20090118001112.4E5DD700E0@cvs1.fedora.phx.redhat.com>

Author: nbecker

Update of /cvs/pkgs/rpms/kdiff3/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18741

Modified Files:
	.cvsignore kdiff3.spec sources 
Added Files:
	kdiff3part.desktop.diff 
Log Message:
Update to 0.9.4


kdiff3part.desktop.diff:

--- NEW FILE kdiff3part.desktop.diff ---
--- kdiff3-0.9.93/src-QT4/kdiff3part.desktop~	2008-10-26 17:55:20.000000000 -0400
+++ kdiff3-0.9.93/src-QT4/kdiff3part.desktop	2009-01-06 11:31:20.000000000 -0500
@@ -5,7 +5,6 @@
 Name[hi]=??????-?????????3???????????????
 Name[sv]=Kdiff3-del
 Name[x-test]=xxKDiff3Partxx
-MimeType=text/x-diff;
 ServiceTypes=KParts/ReadOnlyPart,KParts/ReadWritePart
 X-KDE-Library=libkdiff3part
 Type=Service


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdiff3/F-9/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	7 Nov 2007 01:57:35 -0000	1.3
+++ .cvsignore	18 Jan 2009 00:10:41 -0000	1.4
@@ -1 +1 @@
-kdiff3-0.9.92.tar.gz
+kdiff3-0.9.94.tar.gz


Index: kdiff3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdiff3/F-9/kdiff3.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- kdiff3.spec	25 Mar 2008 15:00:03 -0000	1.9
+++ kdiff3.spec	18 Jan 2009 00:10:41 -0000	1.10
@@ -1,15 +1,21 @@
 Name:           kdiff3
-Version:        0.9.92
-Release: 	13%{?dist}
+Version:        0.9.94
+Release: 	1%{?dist}
 Summary:        Compare + merge 2 or 3 files or directories
 
 Group:          Development/Tools
 License:        GPLv2
 URL:            http://kdiff3.sourceforge.net/
-Source0:        http://dl.sourceforge.net/sourceforge/kdiff3/%{name}-%{version}.tar.gz
+Source0:        http://downloads.sourceforge.net/sourceforge/kdiff3/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  kdebase3-devel, kdelibs3-devel, desktop-file-utils
+# What's the purpose of this patch?  -- Rex 
+Patch0:         kdiff3part.desktop.diff
+
+BuildRequires:  desktop-file-utils
+BuildRequires:  gettext
+BuildRequires:  kdelibs4-devel
+BuildRequires:  kdebase4-devel
 
 %description
 KDiff3 is a program that
@@ -22,28 +28,31 @@
 
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{version}
+%patch0 -p1
 
 
 %build
-unset QTDIR || : ; source /etc/profile.d/qt.sh
-%configure \
-         --disable-rpath
+mkdir -p %{_target_platform}
+pushd %{_target_platform}
+%{cmake_kde4} ..
+popd
 
-make %{?_smp_mflags}
+make %{?_smp_mflags} -C %{_target_platform} VERBOSE=1
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
 
-HTML_DIR=$(kde-config --expandvars --install html)
+make -C %{_target_platform} install/fast DESTDIR=$RPM_BUILD_ROOT
 
-# this is junk
-rm -rf $RPM_BUILD_ROOT$HTML_DIR/%{name} 
+HTML_DIR=%{_kde4_docdir}/HTML
 
 # locale's
 %find_lang %{name} || touch %{name}.lang
+%find_lang %{name}plugin || touch %{name}.lang
+cat %{name}plugin.lang >> %{name}.lang
+
 # HTML (1.0)
 if [ -d $RPM_BUILD_ROOT$HTML_DIR ]; then
 for lang_dir in $RPM_BUILD_ROOT$HTML_DIR/* ; do
@@ -61,45 +70,77 @@
 fi
 
 # Desktop.
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
+desktop-file-install --vendor="" \
+    --dir=$RPM_BUILD_ROOT%{_kde4_datadir}/kde4/services \
+    $RPM_BUILD_ROOT%{_kde4_datadir}/kde4/services/kdiff3part.desktop
 
-desktop-file-install  --vendor fedora \
-    --dir $RPM_BUILD_ROOT%{_datadir}/applications  \
-    --add-category Development \
-    --add-category X-Fedora \
-    --delete-original \
-        $RPM_BUILD_ROOT%{_datadir}/applnk/Development/kdiff3.desktop
-
-echo "NoDisplay=true" >> \
-$RPM_BUILD_ROOT%{_datadir}/applnk/.hidden/kdiff3plugin.desktop
 desktop-file-install  --vendor="" \
-     --dir $RPM_BUILD_ROOT%{_datadir}/applications/kde \
-     --delete-original \
-     $RPM_BUILD_ROOT%{_datadir}/applnk/.hidden/kdiff3plugin.desktop
+    --dir=$RPM_BUILD_ROOT%{_kde4_datadir}/applications/kde4  \
+    --add-category=Development \
+        $RPM_BUILD_ROOT%{_kde4_datadir}/applications/kde4/kdiff3.desktop
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+
 %post
-touch --no-create %{_datadir}/icons/hicolor || :
-%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+touch --no-create %{_kde4_iconsdir}/hicolor || :
+touch --no-create %{_kde4_iconsdir}/locolor || :
+%{_bindir}/gtk-update-icon-cache --quiet %{_kde4_iconsdir}/icons/hicolor 2> /dev/null || :
+%{_bindir}/gtk-update-icon-cache --quiet %{_kde4_iconsdir}/icons/locolor 2> /dev/null || :
 
 %postun
-touch --no-create %{_datadir}/icons/hicolor || :
-%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+touch --no-create %{_kde4_iconsdir}/hicolor || :
+touch --no-create %{_kde4_iconsdir}/locolor || :
+%{_bindir}/gtk-update-icon-cache --quiet %{_kde4_iconsdir}/icons/hicolor 2> /dev/null || :
+%{_bindir}/gtk-update-icon-cache --quiet %{_kde4_iconsdir}/icons/locolor 2> /dev/null || :
+
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog README TODO
-%{_bindir}/kdiff3
-%{_libdir}/kde3/*
-%{_datadir}/applications/*
-%{_datadir}/apps/*
-%{_datadir}/icons/*/*/*/kdiff3.png
-%{_datadir}/services/*
-%{_mandir}/man1/kdiff3*
+%{_kde4_bindir}/kdiff3
+%{_kde4_libdir}/kde4/libkdiff3*.so
+%{_kde4_datadir}/applications/kde4/*
+%{_kde4_appsdir}/kdiff3/
+%{_kde4_iconsdir}/hicolor/*/*/kdiff3.png
+%{_kde4_iconsdir}/locolor/*/*/kdiff3.png
+%{_kde4_datadir}/kde4/services/kdiff3*.desktop
+
 
 %changelog
+* Fri Jan  9 2009 Neal Becker <ndbecker2 at gmail.com> - 0.9.93-1.3%{?dist}
+- Update to 0.9.93-3
+
+* Tue Jan  6 2009 Neal Becker <ndbecker2 at gmail.com> - 0.9.93-2-1
+- Update to 0.9.93-2
+
+* Tue Jan  6 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.9.93-6
+- use kde4 macros
+- add scriptlets for locolor icons
+- update d-f-i usage
+- include khelpcenter handbook
+- update Source0 URL
+
+* Tue Jan  6 2009 Neal Becker <ndbecker2 at gmail.com> - 0.9.93-5
+- Fix HTML_DIR and use kde4_ versions of datadir, libdir, bindir
+
+* Tue Jan  6 2009 Neal Becker <ndbecker2 at gmail.com> - 0.9.93-4
+- Remove /etc/profile.d/qt.sh, remove configure
+
+* Tue Jan  6 2009 Neal Becker <ndbecker2 at gmail.com> - 0.9.93-3
+- Change BR, no longer kde3
+
+* Tue Jan  6 2009 Neal Becker <ndbecker2 at gmail.com> - 0.9.93-2
+- Add br cmake
+
+* Tue Jan  6 2009 Neal Becker <ndbecker2 at gmail.com> - 0.9.93-1
+- Update to 0.9.93
+
+* Thu Jun 5 2008 Manuel Wolfshant <wolfy at fedoraproject.org> - 0.9.92-14
+- add a conditional BR, allowing build in EPEL-5
+
 * Tue Mar 25 2008 Rex Dieter <rdieter at fedoraproject.org> - 0.9.92-13
 - drop BR: qt-devel (broken)
 - omit 64bit configure hack (invalid and not needed)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdiff3/F-9/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	7 Nov 2007 01:57:35 -0000	1.3
+++ sources	18 Jan 2009 00:10:41 -0000	1.4
@@ -1 +1 @@
-c7b52bfee6a085393de0c4f83732e8f0  kdiff3-0.9.92.tar.gz
+8bf580e53a420b1aa1eca3ea502bbe8b  kdiff3-0.9.94.tar.gz



From kevin at fedoraproject.org  Sun Jan 18 00:19:04 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 18 Jan 2009 00:19:04 +0000 (UTC)
Subject: rpms/rdiff-backup/F-10 .cvsignore, 1.11, 1.12 sources, 1.12,
	1.13 rdiff-backup.spec, 1.25, 1.26
Message-ID: <20090118001904.E0B23700E0@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/rdiff-backup/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20373

Modified Files:
	.cvsignore sources rdiff-backup.spec 
Log Message:
Update to 1.2.5



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rdiff-backup/F-10/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	1 Jan 2009 18:29:44 -0000	1.11
+++ .cvsignore	18 Jan 2009 00:18:34 -0000	1.12
@@ -1 +1 @@
-rdiff-backup-1.2.4.tar.gz
+rdiff-backup-1.2.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rdiff-backup/F-10/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	1 Jan 2009 18:29:44 -0000	1.12
+++ sources	18 Jan 2009 00:18:34 -0000	1.13
@@ -1 +1 @@
-0d3f24ede9d27321371fd19014431e59  rdiff-backup-1.2.4.tar.gz
+28c9f45afd0e4a250ecc95e555995e48  rdiff-backup-1.2.5.tar.gz


Index: rdiff-backup.spec
===================================================================
RCS file: /cvs/extras/rpms/rdiff-backup/F-10/rdiff-backup.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- rdiff-backup.spec	1 Jan 2009 18:29:44 -0000	1.25
+++ rdiff-backup.spec	18 Jan 2009 00:18:34 -0000	1.26
@@ -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.4
+Version: 1.2.5
 Summary: Convenient and transparent local/remote incremental mirror/backup
 Name: rdiff-backup
 Release: 1%{?dist}
@@ -56,6 +56,9 @@
 %{python_sitearch}/rdiff_backup-%{version}-py?.?.egg-info
 
 %changelog
+* Sat Jan 17 2009 Kevin Fenzi <kevin at tummy.com> - 1.2.5-1
+- Update to 1.2.5
+
 * Thu Jan 01 2009 Kevin Fenzi <kevin at tummy.com> - 1.2.4-1
 - Update to 1.2.4
 



From kevin at fedoraproject.org  Sun Jan 18 00:24:34 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 18 Jan 2009 00:24:34 +0000 (UTC)
Subject: rpms/rdiff-backup/F-9 sources, 1.12, 1.13 .cvsignore, 1.11,
	1.12 rdiff-backup.spec, 1.24, 1.25
Message-ID: <20090118002434.164F9700E0@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-serv21344

Modified Files:
	sources .cvsignore rdiff-backup.spec 
Log Message:
Update to 1.2.5



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rdiff-backup/F-9/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	1 Jan 2009 18:48:58 -0000	1.12
+++ sources	18 Jan 2009 00:24:03 -0000	1.13
@@ -1 +1 @@
-0d3f24ede9d27321371fd19014431e59  rdiff-backup-1.2.4.tar.gz
+28c9f45afd0e4a250ecc95e555995e48  rdiff-backup-1.2.5.tar.gz


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rdiff-backup/F-9/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	1 Jan 2009 18:48:58 -0000	1.11
+++ .cvsignore	18 Jan 2009 00:24:03 -0000	1.12
@@ -1 +1 @@
-rdiff-backup-1.2.4.tar.gz
+rdiff-backup-1.2.5.tar.gz


Index: rdiff-backup.spec
===================================================================
RCS file: /cvs/extras/rpms/rdiff-backup/F-9/rdiff-backup.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- rdiff-backup.spec	1 Jan 2009 18:48:58 -0000	1.24
+++ rdiff-backup.spec	18 Jan 2009 00:24:03 -0000	1.25
@@ -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.4
+Version: 1.2.5
 Summary: Convenient and transparent local/remote incremental mirror/backup
 Name: rdiff-backup
 Release: 1%{?dist}
@@ -56,6 +56,9 @@
 %{python_sitearch}/rdiff_backup-%{version}-py?.?.egg-info
 
 %changelog
+* Sat Jan 17 2009 Kevin Fenzi <kevin at tummy.com> - 1.2.5-1
+- Update to 1.2.5
+
 * Thu Jan 01 2009 Kevin Fenzi <kevin at tummy.com> - 1.2.4-1
 - Update to 1.2.4
 



From davej at fedoraproject.org  Sun Jan 18 01:49:43 2009
From: davej at fedoraproject.org (Dave Jones)
Date: Sun, 18 Jan 2009 01:49:43 +0000 (UTC)
Subject: rpms/kernel/devel patch-2.6.29-rc2-git1.bz2.sign, NONE,
	1.1 .cvsignore, 
	1.995, 1.996 kernel.spec, 1.1221, 1.1222 sources, 1.957,
	1.958 upstream, 1.869, 1.870
Message-ID: <20090118014943.56A27700E0@cvs1.fedora.phx.redhat.com>

Author: davej

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31745

Modified Files:
	.cvsignore kernel.spec sources upstream 
Added Files:
	patch-2.6.29-rc2-git1.bz2.sign 
Log Message:
2.6.29-rc2-git1


--- NEW FILE patch-2.6.29-rc2-git1.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBJcnF7yGugalF9Dw4RAtqGAJ4x+EkjoQGOQW41dkcrSTWXQbhWywCghlFT
reUK8bMKhg0AWPaOkEeh6/c=
=WXDk
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.995
retrieving revision 1.996
diff -u -r1.995 -r1.996
--- .cvsignore	16 Jan 2009 21:34:24 -0000	1.995
+++ .cvsignore	18 Jan 2009 01:49:11 -0000	1.996
@@ -5,3 +5,4 @@
 kernel-2.6.28
 linux-2.6.28.tar.bz2
 patch-2.6.29-rc2.bz2
+patch-2.6.29-rc2-git1.bz2


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1221
retrieving revision 1.1222
diff -u -r1.1221 -r1.1222
--- kernel.spec	16 Jan 2009 21:34:24 -0000	1.1221
+++ kernel.spec	18 Jan 2009 01:49:11 -0000	1.1222
@@ -58,7 +58,7 @@
 # The rc snapshot level
 %define rcrev 2
 # The git snapshot level
-%define gitrev 0
+%define gitrev 1
 # Set rpm version accordingly
 %define rpmversion 2.6.%{upstream_sublevel}
 %endif
@@ -1735,6 +1735,9 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Sat Jan 17 2009 Dave Jones <davej at redhat.com>
+- 2.6.29-rc2-git1
+
 * Fri Jan 16 2009 Chuck Ebbert <cebbert at redhat.com>
 - 2.6.29-rc2
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v
retrieving revision 1.957
retrieving revision 1.958
diff -u -r1.957 -r1.958
--- sources	16 Jan 2009 21:34:25 -0000	1.957
+++ sources	18 Jan 2009 01:49:11 -0000	1.958
@@ -1,2 +1,3 @@
 d351e44709c9810b85e29b877f50968a  linux-2.6.28.tar.bz2
 c8b4ae394659c8723aae2f1bafcb55dc  patch-2.6.29-rc2.bz2
+dd06feab96f652440954dbf352349ba4  patch-2.6.29-rc2-git1.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v
retrieving revision 1.869
retrieving revision 1.870
diff -u -r1.869 -r1.870
--- upstream	16 Jan 2009 21:34:25 -0000	1.869
+++ upstream	18 Jan 2009 01:49:11 -0000	1.870
@@ -1,2 +1,3 @@
 linux-2.6.28.tar.bz2
 patch-2.6.29-rc2.bz2
+patch-2.6.29-rc2-git1.bz2



From jcollie at fedoraproject.org  Sun Jan 18 02:05:03 2009
From: jcollie at fedoraproject.org (Jeffrey C. Ollie)
Date: Sun, 18 Jan 2009 02:05:03 +0000 (UTC)
Subject: rpms/pitivi/devel pitivi-0.11.3-py26.patch, NONE, 1.1 pitivi.spec, 
	1.30, 1.31
Message-ID: <20090118020503.90BF5700E0@cvs1.fedora.phx.redhat.com>

Author: jcollie

Update of /cvs/pkgs/rpms/pitivi/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1333

Modified Files:
	pitivi.spec 
Added Files:
	pitivi-0.11.3-py26.patch 
Log Message:
* Sat Jan 17 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 0.11.3-2
- Add patch from Denis Leroy to fix running with Python 2.6


pitivi-0.11.3-py26.patch:

--- NEW FILE pitivi-0.11.3-py26.patch ---
--- /usr/share/pitivi/python/pitivi/timeline/timeline.py~	2008-12-15 15:27:28.000000000 +0100
+++ /usr/share/pitivi/python/pitivi/timeline/timeline.py	2009-01-18 00:30:33.000000000 +0100
@@ -195,8 +195,8 @@
 
     def getAutoSettings(self):
         vs = self.videocomp._getAutoSettings()
-        as = self.audiocomp._getAutoSettings()
-        if not vs and not as:
+        acas = self.audiocomp._getAutoSettings()
+        if not vs and not acas:
             return None
         # return an ExportSettings containing the combination of
         # the autosettings from the audio and video composition.
@@ -206,10 +206,10 @@
             settings.videoheight = vs.videoheight
             settings.videorate = vs.videorate
             settings.videopar = vs.videopar
-        if as:
-            settings.audiochannels = as.audiochannels
-            settings.audiorate = as.audiorate
-            settings.audiodepth = as.audiodepth
+        if acas:
+            settings.audiochannels = acas.audiochannels
+            settings.audiorate = acas.audiorate
+            settings.audiodepth = acas.audiodepth
         return settings
 
     def getDuration(self):


Index: pitivi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pitivi/devel/pitivi.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- pitivi.spec	15 Dec 2008 14:22:51 -0000	1.30
+++ pitivi.spec	18 Jan 2009 02:04:32 -0000	1.31
@@ -2,7 +2,7 @@
 %define minor   3
 Name:           pitivi
 Version:        %{major}.%{minor}
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Non-linear video editor
 
 Group:          Applications/Multimedia
@@ -10,6 +10,7 @@
 URL:            http://www.pitivi.org/
 Source0:        http://ftp.gnome.org/pub/GNOME/sources/pitivi/%{major}/pitivi-%{version}.tar.bz2
 Patch0:         0001-Fix-non-utf-8-ness-in-ChangeLog.patch
+Patch1:         pitivi-0.11.3-py26.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
@@ -46,6 +47,7 @@
 %prep
 %setup0 -q
 %patch0 -p1
+%patch1 -p5
 
 for f in `find . -name \*.py`
 do
@@ -78,6 +80,9 @@
 %{_datadir}/applications/*
 
 %changelog
+* Sat Jan 17 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 0.11.3-2
+- Add patch from Denis Leroy to fix running with Python 2.6
+
 * Mon Dec 15 2008 Jeffrey C. Ollie <jeff at ocjtech.us> - 0.11.3-1
 - Update to 0.11.3
 



From mtasaka at fedoraproject.org  Sun Jan 18 04:16:51 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Sun, 18 Jan 2009 04:16:51 +0000 (UTC)
Subject: rpms/jd/devel .cvsignore, 1.327, 1.328 jd.spec, 1.384, 1.385 sources,
	1.328, 1.329
Message-ID: <20090118041651.253EF700E0@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16852

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
* Sun Jan 18 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
- rev 2628



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/.cvsignore,v
retrieving revision 1.327
retrieving revision 1.328
diff -u -r1.327 -r1.328
--- .cvsignore	28 Dec 2008 15:37:58 -0000	1.327
+++ .cvsignore	18 Jan 2009 04:16:19 -0000	1.328
@@ -1 +1 @@
-jd-2.1.0-081228.tgz
+jd-2.1.0-svn2628_trunk.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/jd.spec,v
retrieving revision 1.384
retrieving revision 1.385
diff -u -r1.384 -r1.385
--- jd.spec	30 Dec 2008 02:13:23 -0000	1.384
+++ jd.spec	18 Jan 2009 04:16:19 -0000	1.385
@@ -9,17 +9,17 @@
 ##########################################
 # Defined by upsteam
 #
-%define         main_ver      2.1.0
-%define         strtag        081228
+%define         main_ver      2.2.0
+%define         strtag        svn2628_trunk
 %define         repoid        36802
 # Define this if this is pre-version
-%define         pre_release   0
+%define         pre_release   1
 ##########################################
 
 ##########################################
 # Defined by vendor
 #
-%define         vendor_rel    2
+%define         vendor_rel    1
 %define         extra_rel     %{nil}
 # Tag name changed from vendor to vendorname so as not to
 # overwrite Vendor entry in Summary
@@ -53,7 +53,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-2.1.0-issue-jd6-868.patch 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  %{gtkmmdevel}
@@ -79,7 +78,6 @@
 
 %prep
 %setup -q -n %{name}-%{main_ver}-%{strtag}
-%patch0 -p0 -b .issue868
 #find . -name .svn | sort -r | xargs %{__rm} -rf
 
 sh autogen.sh
@@ -135,6 +133,9 @@
 %{icondir}/%{name}.png
 
 %changelog
+* Sun Jan 18 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- rev 2628
+
 * Tue Dec 30 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.1.0-2
 - Workaround for the issue on res 868 in JD 6 thread (segv when
   bookmarking when bookmark is empty)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/sources,v
retrieving revision 1.328
retrieving revision 1.329
diff -u -r1.328 -r1.329
--- sources	28 Dec 2008 15:37:59 -0000	1.328
+++ sources	18 Jan 2009 04:16:19 -0000	1.329
@@ -1 +1 @@
-e5d2294bf3635cd81b530bedbbcf0016  jd-2.1.0-081228.tgz
+45d7ab266f3e6bb97d3ce3266d2d2057  jd-2.1.0-svn2628_trunk.tgz



From mtasaka at fedoraproject.org  Sun Jan 18 04:26:38 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Sun, 18 Jan 2009 04:26:38 +0000 (UTC)
Subject: rpms/jd/devel .cvsignore,1.328,1.329 sources,1.329,1.330
Message-ID: <20090118042638.27057700E0@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18771

Modified Files:
	.cvsignore sources 
Log Message:
source name was wrong...


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/.cvsignore,v
retrieving revision 1.328
retrieving revision 1.329
diff -u -r1.328 -r1.329
--- .cvsignore	18 Jan 2009 04:16:19 -0000	1.328
+++ .cvsignore	18 Jan 2009 04:26:07 -0000	1.329
@@ -1 +1 @@
-jd-2.1.0-svn2628_trunk.tgz
+jd-2.2.0-svn2628_trunk.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/sources,v
retrieving revision 1.329
retrieving revision 1.330
diff -u -r1.329 -r1.330
--- sources	18 Jan 2009 04:16:19 -0000	1.329
+++ sources	18 Jan 2009 04:26:07 -0000	1.330
@@ -1 +1 @@
-45d7ab266f3e6bb97d3ce3266d2d2057  jd-2.1.0-svn2628_trunk.tgz
+db32c6c454eb59ba1b2c50aa7b93bf43  jd-2.2.0-svn2628_trunk.tgz



From mtasaka at fedoraproject.org  Sun Jan 18 04:51:44 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Sun, 18 Jan 2009 04:51:44 +0000 (UTC)
Subject: rpms/jd/F-10 .cvsignore, 1.337, 1.338 jd.spec, 1.391, 1.392 sources,
	1.338, 1.339
Message-ID: <20090118045144.E3CCA700E0@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21629/F-10

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
* Sun Jan 18 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
- rev 2628



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/F-10/.cvsignore,v
retrieving revision 1.337
retrieving revision 1.338
diff -u -r1.337 -r1.338
--- .cvsignore	28 Dec 2008 15:37:57 -0000	1.337
+++ .cvsignore	18 Jan 2009 04:51:13 -0000	1.338
@@ -1 +1 @@
-jd-2.1.0-081228.tgz
+jd-2.2.0-svn2628_trunk.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/F-10/jd.spec,v
retrieving revision 1.391
retrieving revision 1.392
diff -u -r1.391 -r1.392
--- jd.spec	30 Dec 2008 02:13:22 -0000	1.391
+++ jd.spec	18 Jan 2009 04:51:13 -0000	1.392
@@ -9,17 +9,17 @@
 ##########################################
 # Defined by upsteam
 #
-%define         main_ver      2.1.0
-%define         strtag        081228
+%define         main_ver      2.2.0
+%define         strtag        svn2628_trunk
 %define         repoid        36802
 # Define this if this is pre-version
-%define         pre_release   0
+%define         pre_release   1
 ##########################################
 
 ##########################################
 # Defined by vendor
 #
-%define         vendor_rel    2
+%define         vendor_rel    1
 %define         extra_rel     %{nil}
 # Tag name changed from vendor to vendorname so as not to
 # overwrite Vendor entry in Summary
@@ -53,7 +53,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-2.1.0-issue-jd6-868.patch 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  %{gtkmmdevel}
@@ -79,7 +78,6 @@
 
 %prep
 %setup -q -n %{name}-%{main_ver}-%{strtag}
-%patch0 -p0 -b .issue868
 #find . -name .svn | sort -r | xargs %{__rm} -rf
 
 sh autogen.sh
@@ -135,6 +133,9 @@
 %{icondir}/%{name}.png
 
 %changelog
+* Sun Jan 18 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- rev 2628
+
 * Tue Dec 30 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.1.0-2
 - Workaround for the issue on res 868 in JD 6 thread (segv when
   bookmarking when bookmark is empty)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/F-10/sources,v
retrieving revision 1.338
retrieving revision 1.339
diff -u -r1.338 -r1.339
--- sources	28 Dec 2008 15:37:57 -0000	1.338
+++ sources	18 Jan 2009 04:51:13 -0000	1.339
@@ -1 +1 @@
-e5d2294bf3635cd81b530bedbbcf0016  jd-2.1.0-081228.tgz
+db32c6c454eb59ba1b2c50aa7b93bf43  jd-2.2.0-svn2628_trunk.tgz



From mtasaka at fedoraproject.org  Sun Jan 18 04:51:44 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Sun, 18 Jan 2009 04:51:44 +0000 (UTC)
Subject: rpms/jd/F-9 .cvsignore, 1.337, 1.338 jd.spec, 1.382, 1.383 sources, 
	1.338, 1.339
Message-ID: <20090118045144.E7BDA70141@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21629/F-9

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
* Sun Jan 18 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
- rev 2628



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/F-9/.cvsignore,v
retrieving revision 1.337
retrieving revision 1.338
diff -u -r1.337 -r1.338
--- .cvsignore	28 Dec 2008 15:37:58 -0000	1.337
+++ .cvsignore	18 Jan 2009 04:51:14 -0000	1.338
@@ -1 +1 @@
-jd-2.1.0-081228.tgz
+jd-2.2.0-svn2628_trunk.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/F-9/jd.spec,v
retrieving revision 1.382
retrieving revision 1.383
diff -u -r1.382 -r1.383
--- jd.spec	30 Dec 2008 02:13:22 -0000	1.382
+++ jd.spec	18 Jan 2009 04:51:14 -0000	1.383
@@ -9,17 +9,17 @@
 ##########################################
 # Defined by upsteam
 #
-%define         main_ver      2.1.0
-%define         strtag        081228
+%define         main_ver      2.2.0
+%define         strtag        svn2628_trunk
 %define         repoid        36802
 # Define this if this is pre-version
-%define         pre_release   0
+%define         pre_release   1
 ##########################################
 
 ##########################################
 # Defined by vendor
 #
-%define         vendor_rel    2
+%define         vendor_rel    1
 %define         extra_rel     %{nil}
 # Tag name changed from vendor to vendorname so as not to
 # overwrite Vendor entry in Summary
@@ -53,7 +53,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-2.1.0-issue-jd6-868.patch 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  %{gtkmmdevel}
@@ -79,7 +78,6 @@
 
 %prep
 %setup -q -n %{name}-%{main_ver}-%{strtag}
-%patch0 -p0 -b .issue868
 #find . -name .svn | sort -r | xargs %{__rm} -rf
 
 sh autogen.sh
@@ -135,6 +133,9 @@
 %{icondir}/%{name}.png
 
 %changelog
+* Sun Jan 18 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- rev 2628
+
 * Tue Dec 30 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.1.0-2
 - Workaround for the issue on res 868 in JD 6 thread (segv when
   bookmarking when bookmark is empty)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/F-9/sources,v
retrieving revision 1.338
retrieving revision 1.339
diff -u -r1.338 -r1.339
--- sources	28 Dec 2008 15:37:58 -0000	1.338
+++ sources	18 Jan 2009 04:51:14 -0000	1.339
@@ -1 +1 @@
-e5d2294bf3635cd81b530bedbbcf0016  jd-2.1.0-081228.tgz
+db32c6c454eb59ba1b2c50aa7b93bf43  jd-2.2.0-svn2628_trunk.tgz



From mtasaka at fedoraproject.org  Sun Jan 18 04:58:20 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Sun, 18 Jan 2009 04:58:20 +0000 (UTC)
Subject: rpms/jd/F-10 jd.spec,1.392,1.393
Message-ID: <20090118045820.CD8E1700E0@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23350/F-10

Modified Files:
	jd.spec 
Log Message:
retag


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/F-10/jd.spec,v
retrieving revision 1.392
retrieving revision 1.393
diff -u -r1.392 -r1.393
--- jd.spec	18 Jan 2009 04:51:13 -0000	1.392
+++ jd.spec	18 Jan 2009 04:57:50 -0000	1.393
@@ -45,7 +45,7 @@
 
 Name:           jd
 Version:        %{main_ver}
-Release:        %{rel}
+Release:        %{rel}.1
 Summary:        A 2ch browser
 
 Group:          Applications/Internet



From mtasaka at fedoraproject.org  Sun Jan 18 04:58:20 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Sun, 18 Jan 2009 04:58:20 +0000 (UTC)
Subject: rpms/jd/F-9 jd.spec,1.383,1.384
Message-ID: <20090118045820.F34D6700F7@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23350/F-9

Modified Files:
	jd.spec 
Log Message:
retag


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/F-9/jd.spec,v
retrieving revision 1.383
retrieving revision 1.384
diff -u -r1.383 -r1.384
--- jd.spec	18 Jan 2009 04:51:14 -0000	1.383
+++ jd.spec	18 Jan 2009 04:57:50 -0000	1.384
@@ -45,7 +45,7 @@
 
 Name:           jd
 Version:        %{main_ver}
-Release:        %{rel}
+Release:        %{rel}.1
 Summary:        A 2ch browser
 
 Group:          Applications/Internet



From mtasaka at fedoraproject.org  Sun Jan 18 05:12:46 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Sun, 18 Jan 2009 05:12:46 +0000 (UTC)
Subject: rpms/cairo-dock/devel .cvsignore, 1.101, 1.102 cairo-dock.spec,
	1.137, 1.138 sources, 1.101, 1.102
Message-ID: <20090118051246.392BF700E0@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/cairo-dock/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25174

Modified Files:
	.cvsignore cairo-dock.spec sources 
Log Message:
* Sun Jan 18 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
- rev 1488



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cairo-dock/devel/.cvsignore,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -r1.101 -r1.102
--- .cvsignore	17 Jan 2009 05:21:05 -0000	1.101
+++ .cvsignore	18 Jan 2009 05:12:14 -0000	1.102
@@ -1 +1 @@
-cairo-dock-sources-svn1487_trunk.tar.bz2
+cairo-dock-sources-svn1488_trunk.tar.bz2


Index: cairo-dock.spec
===================================================================
RCS file: /cvs/extras/rpms/cairo-dock/devel/cairo-dock.spec,v
retrieving revision 1.137
retrieving revision 1.138
diff -u -r1.137 -r1.138
--- cairo-dock.spec	17 Jan 2009 05:37:49 -0000	1.137
+++ cairo-dock.spec	18 Jan 2009 05:12:14 -0000	1.138
@@ -11,7 +11,7 @@
 %undefine		betaver		
 %define		build_webkit	1
 %define		build_xfce	1
-%define		tarballver	svn1487_trunk
+%define		tarballver	svn1488_trunk
 
 %define		fedora_main_rel	3
 
@@ -594,6 +594,7 @@
 %{_datadir}/%{name}/*.conf
 %{_datadir}/%{name}/*.png
 %{_datadir}/%{name}/*.svg
+%{_datadir}/%{name}/*.xpm
 %{_datadir}/%{name}/*view
 %{_datadir}/%{name}/emblems/
 %{_datadir}/%{name}/explosion/
@@ -641,8 +642,8 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
-* Sat Jan 17 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
-- rev 1487
+* Sun Jan 18 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- rev 1488
 
 * Thu Jan 15 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
 - rev 1484


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cairo-dock/devel/sources,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -r1.101 -r1.102
--- sources	17 Jan 2009 05:21:05 -0000	1.101
+++ sources	18 Jan 2009 05:12:14 -0000	1.102
@@ -1 +1 @@
-95f7b48faa9c3f4e21a2c86c2ab07dde  cairo-dock-sources-svn1487_trunk.tar.bz2
+259beb12f95210f826179ec3631b6736  cairo-dock-sources-svn1488_trunk.tar.bz2



From jjames at fedoraproject.org  Sun Jan 18 05:13:28 2009
From: jjames at fedoraproject.org (Jerry James)
Date: Sun, 18 Jan 2009 05:13:28 +0000 (UTC)
Subject: rpms/gcl/devel gcl-2.6.8-bfd.patch,1.1,1.2 gcl.spec,1.31,1.32
Message-ID: <20090118051328.01E90700E0@cvs1.fedora.phx.redhat.com>

Author: jjames

Update of /cvs/pkgs/rpms/gcl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25264/devel

Modified Files:
	gcl-2.6.8-bfd.patch gcl.spec 
Log Message:
* Sat Jan 17 2009 Jerry James <loganjerry at gmail.com> - 2.6.8-0.1.20080902cvs.1
- ExcludeArch ppc64 for now until I can figure out why it doesn't build


gcl-2.6.8-bfd.patch:

Index: gcl-2.6.8-bfd.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gcl/devel/gcl-2.6.8-bfd.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gcl-2.6.8-bfd.patch	10 Jan 2009 05:23:17 -0000	1.1
+++ gcl-2.6.8-bfd.patch	18 Jan 2009 05:13:27 -0000	1.2
@@ -174,24 +174,12 @@
 diff -dur gcl-2.6.8.ORIG/o/sfasli.c gcl-2.6.8/o/sfasli.c
 --- gcl-2.6.8.ORIG/o/sfasli.c	2005-01-15 09:26:43.000000000 -0700
 +++ gcl-2.6.8/o/sfasli.c	2008-12-29 17:58:20.000000000 -0700
-@@ -32,6 +32,9 @@
-   int u,v;
-   unsigned long pa;
-   asymbol **q;
-+#ifdef HAVE_OUTPUT_BFD
-+  const char **bfd_targets;
-+#endif
- 
-   bfd_init();
-   if (!(bself=bfd_openr(kcl_self,0)))
-@@ -40,6 +43,11 @@
+@@ -40,6 +40,9 @@
      FEerror("I'm not an object",0);
  /*    if (link_info.hash) */
  /*      bfd_link_hash_table_free(bself,link_info.hash); */
 +#ifdef HAVE_OUTPUT_BFD
-+  bfd_targets = bfd_target_list();
-+  link_info.output_bfd = bfd_openw("/dev/null", bfd_targets[0]);
-+  free(bfd_targets);
++  link_info.output_bfd = bfd_openw("/dev/null", bfd_get_target(bself));
 +#endif
    if (!(link_info.hash = bfd_link_hash_table_create (bself)))
      FEerror("Cannot make hash table",0);


Index: gcl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gcl/devel/gcl.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- gcl.spec	10 Jan 2009 15:23:53 -0000	1.31
+++ gcl.spec	18 Jan 2009 05:13:27 -0000	1.32
@@ -28,7 +28,7 @@
 
 Name:           gcl
 Version:        2.6.8
-Release:        0.1.%{alphatag}%{?dist}
+Release:        0.1.%{alphatag}.1%{?dist}
 Summary:        GNU Common Lisp
 
 Group:          Development/Languages
@@ -57,7 +57,7 @@
 # This patch was last sent upstream on 29 Dec 2008.  It fixes a large number of
 # compile- and run-time problems with the Emacs interface code.
 Patch4:         gcl-2.6.8-elisp.patch
-# This patch was last sent upstream on 09 Jan 2009.  It adds support for
+# This patch was last sent upstream on 17 Jan 2009.  It adds support for
 # compiling and running on an SELinux-enabled host.
 Patch5:         gcl-2.6.8-selinux.patch
 # This patch was last sent upstream on 29 Dec 2008.  It uses the rename()
@@ -89,7 +89,7 @@
 # error on newer GCC systems due to an include inside a function.  This affects
 # the "unrandomize" sbrk() functionality, hence the name of the patch.
 Patch12:        gcl-2.6.8-unrandomize.patch
-# This patch was last sent upstream on 29 Dec 2008.  It fixes compilation with
+# This patch was last sent upstream on 17 Jan 2009.  It fixes compilation with
 # a system BFD library that comes from a newer binutils distribution.  It also
 # updates o/unexelf.c from Emacs 22.2, the last version of Emacs released under
 # the GPL version 2.
@@ -114,6 +114,8 @@
 Requires(post): /sbin/install-info, policycoreutils
 Requires(postun): /sbin/install-info, policycoreutils
 
+# GCL currently fails to build on PPC64 platforms.  See bugzilla #480519.
+ExcludeArch: ppc64
 
 %description
 GCL is a Common Lisp currently compliant with the ANSI standard.  Lisp
@@ -312,6 +314,9 @@
 
 
 %changelog
+* Sat Jan 17 2009 Jerry James <loganjerry at gmail.com> - 2.6.8-0.1.20080902cvs.1
+- ExcludeArch ppc64 for now until I can figure out why it doesn't build
+
 * Fri Jan  9 2009 Jerry James <loganjerry at gmail.com> - 2.6.8-0.1.20080902cvs
 - Update from CVS to fix many build problems
 - Fix SELinux and BFD problems that blocked the build



From jjames at fedoraproject.org  Sun Jan 18 05:13:57 2009
From: jjames at fedoraproject.org (Jerry James)
Date: Sun, 18 Jan 2009 05:13:57 +0000 (UTC)
Subject: rpms/gcl/F-10 gcl-2.6.8-bfd.patch,1.1,1.2 gcl.spec,1.28,1.29
Message-ID: <20090118051357.35F8F700E0@cvs1.fedora.phx.redhat.com>

Author: jjames

Update of /cvs/pkgs/rpms/gcl/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25264/F-10

Modified Files:
	gcl-2.6.8-bfd.patch gcl.spec 
Log Message:
* Sat Jan 17 2009 Jerry James <loganjerry at gmail.com> - 2.6.8-0.1.20080902cvs.1
- ExcludeArch ppc64 for now until I can figure out why it doesn't build


gcl-2.6.8-bfd.patch:

Index: gcl-2.6.8-bfd.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gcl/F-10/gcl-2.6.8-bfd.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gcl-2.6.8-bfd.patch	16 Jan 2009 22:22:38 -0000	1.1
+++ gcl-2.6.8-bfd.patch	18 Jan 2009 05:13:26 -0000	1.2
@@ -174,24 +174,12 @@
 diff -dur gcl-2.6.8.ORIG/o/sfasli.c gcl-2.6.8/o/sfasli.c
 --- gcl-2.6.8.ORIG/o/sfasli.c	2005-01-15 09:26:43.000000000 -0700
 +++ gcl-2.6.8/o/sfasli.c	2008-12-29 17:58:20.000000000 -0700
-@@ -32,6 +32,9 @@
-   int u,v;
-   unsigned long pa;
-   asymbol **q;
-+#ifdef HAVE_OUTPUT_BFD
-+  const char **bfd_targets;
-+#endif
- 
-   bfd_init();
-   if (!(bself=bfd_openr(kcl_self,0)))
-@@ -40,6 +43,11 @@
+@@ -40,6 +40,9 @@
      FEerror("I'm not an object",0);
  /*    if (link_info.hash) */
  /*      bfd_link_hash_table_free(bself,link_info.hash); */
 +#ifdef HAVE_OUTPUT_BFD
-+  bfd_targets = bfd_target_list();
-+  link_info.output_bfd = bfd_openw("/dev/null", bfd_targets[0]);
-+  free(bfd_targets);
++  link_info.output_bfd = bfd_openw("/dev/null", bfd_get_target(bself));
 +#endif
    if (!(link_info.hash = bfd_link_hash_table_create (bself)))
      FEerror("Cannot make hash table",0);


Index: gcl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gcl/F-10/gcl.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- gcl.spec	16 Jan 2009 22:22:39 -0000	1.28
+++ gcl.spec	18 Jan 2009 05:13:26 -0000	1.29
@@ -28,7 +28,7 @@
 
 Name:           gcl
 Version:        2.6.8
-Release:        0.1.%{alphatag}%{?dist}
+Release:        0.1.%{alphatag}.1%{?dist}
 Summary:        GNU Common Lisp
 
 Group:          Development/Languages
@@ -57,7 +57,7 @@
 # This patch was last sent upstream on 29 Dec 2008.  It fixes a large number of
 # compile- and run-time problems with the Emacs interface code.
 Patch4:         gcl-2.6.8-elisp.patch
-# This patch was last sent upstream on 09 Jan 2009.  It adds support for
+# This patch was last sent upstream on 17 Jan 2009.  It adds support for
 # compiling and running on an SELinux-enabled host.
 Patch5:         gcl-2.6.8-selinux.patch
 # This patch was last sent upstream on 29 Dec 2008.  It uses the rename()
@@ -89,7 +89,7 @@
 # error on newer GCC systems due to an include inside a function.  This affects
 # the "unrandomize" sbrk() functionality, hence the name of the patch.
 Patch12:        gcl-2.6.8-unrandomize.patch
-# This patch was last sent upstream on 29 Dec 2008.  It fixes compilation with
+# This patch was last sent upstream on 17 Jan 2009.  It fixes compilation with
 # a system BFD library that comes from a newer binutils distribution.  It also
 # updates o/unexelf.c from Emacs 22.2, the last version of Emacs released under
 # the GPL version 2.
@@ -114,6 +114,8 @@
 Requires(post): /sbin/install-info, policycoreutils
 Requires(postun): /sbin/install-info, policycoreutils
 
+# GCL currently fails to build on PPC64 platforms.  See bugzilla #480519.
+ExcludeArch: ppc64
 
 %description
 GCL is a Common Lisp currently compliant with the ANSI standard.  Lisp
@@ -312,6 +314,9 @@
 
 
 %changelog
+* Sat Jan 17 2009 Jerry James <loganjerry at gmail.com> - 2.6.8-0.1.20080902cvs.1
+- ExcludeArch ppc64 for now until I can figure out why it doesn't build
+
 * Fri Jan  9 2009 Jerry James <loganjerry at gmail.com> - 2.6.8-0.1.20080902cvs
 - Update from CVS to fix many build problems
 - Fix SELinux and BFD problems that blocked the build



From jjames at fedoraproject.org  Sun Jan 18 05:13:57 2009
From: jjames at fedoraproject.org (Jerry James)
Date: Sun, 18 Jan 2009 05:13:57 +0000 (UTC)
Subject: rpms/gcl/F-9 gcl-2.6.8-bfd.patch,1.1,1.2 gcl.spec,1.28,1.29
Message-ID: <20090118051357.C4C00700E0@cvs1.fedora.phx.redhat.com>

Author: jjames

Update of /cvs/pkgs/rpms/gcl/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25264/F-9

Modified Files:
	gcl-2.6.8-bfd.patch gcl.spec 
Log Message:
* Sat Jan 17 2009 Jerry James <loganjerry at gmail.com> - 2.6.8-0.1.20080902cvs.1
- ExcludeArch ppc64 for now until I can figure out why it doesn't build


gcl-2.6.8-bfd.patch:

Index: gcl-2.6.8-bfd.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gcl/F-9/gcl-2.6.8-bfd.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gcl-2.6.8-bfd.patch	16 Jan 2009 22:25:16 -0000	1.1
+++ gcl-2.6.8-bfd.patch	18 Jan 2009 05:13:27 -0000	1.2
@@ -174,24 +174,12 @@
 diff -dur gcl-2.6.8.ORIG/o/sfasli.c gcl-2.6.8/o/sfasli.c
 --- gcl-2.6.8.ORIG/o/sfasli.c	2005-01-15 09:26:43.000000000 -0700
 +++ gcl-2.6.8/o/sfasli.c	2008-12-29 17:58:20.000000000 -0700
-@@ -32,6 +32,9 @@
-   int u,v;
-   unsigned long pa;
-   asymbol **q;
-+#ifdef HAVE_OUTPUT_BFD
-+  const char **bfd_targets;
-+#endif
- 
-   bfd_init();
-   if (!(bself=bfd_openr(kcl_self,0)))
-@@ -40,6 +43,11 @@
+@@ -40,6 +40,9 @@
      FEerror("I'm not an object",0);
  /*    if (link_info.hash) */
  /*      bfd_link_hash_table_free(bself,link_info.hash); */
 +#ifdef HAVE_OUTPUT_BFD
-+  bfd_targets = bfd_target_list();
-+  link_info.output_bfd = bfd_openw("/dev/null", bfd_targets[0]);
-+  free(bfd_targets);
++  link_info.output_bfd = bfd_openw("/dev/null", bfd_get_target(bself));
 +#endif
    if (!(link_info.hash = bfd_link_hash_table_create (bself)))
      FEerror("Cannot make hash table",0);


Index: gcl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gcl/F-9/gcl.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- gcl.spec	16 Jan 2009 23:31:12 -0000	1.28
+++ gcl.spec	18 Jan 2009 05:13:27 -0000	1.29
@@ -28,7 +28,7 @@
 
 Name:           gcl
 Version:        2.6.8
-Release:        0.1.%{alphatag}%{?dist}
+Release:        0.1.%{alphatag}.1%{?dist}
 Summary:        GNU Common Lisp
 
 Group:          Development/Languages
@@ -57,7 +57,7 @@
 # This patch was last sent upstream on 29 Dec 2008.  It fixes a large number of
 # compile- and run-time problems with the Emacs interface code.
 Patch4:         gcl-2.6.8-elisp.patch
-# This patch was last sent upstream on 09 Jan 2009.  It adds support for
+# This patch was last sent upstream on 17 Jan 2009.  It adds support for
 # compiling and running on an SELinux-enabled host.
 Patch5:         gcl-2.6.8-selinux.patch
 # This patch was last sent upstream on 29 Dec 2008.  It uses the rename()
@@ -89,7 +89,7 @@
 # error on newer GCC systems due to an include inside a function.  This affects
 # the "unrandomize" sbrk() functionality, hence the name of the patch.
 Patch12:        gcl-2.6.8-unrandomize.patch
-# This patch was last sent upstream on 29 Dec 2008.  It fixes compilation with
+# This patch was last sent upstream on 17 Jan 2009.  It fixes compilation with
 # a system BFD library that comes from a newer binutils distribution.  It also
 # updates o/unexelf.c from Emacs 22.2, the last version of Emacs released under
 # the GPL version 2.
@@ -114,6 +114,8 @@
 Requires(post): /sbin/install-info, policycoreutils
 Requires(postun): /sbin/install-info, policycoreutils
 
+# GCL currently fails to build on PPC64 platforms.  See bugzilla #480519.
+ExcludeArch: ppc64
 
 %description
 GCL is a Common Lisp currently compliant with the ANSI standard.  Lisp
@@ -312,6 +314,9 @@
 
 
 %changelog
+* Sat Jan 17 2009 Jerry James <loganjerry at gmail.com> - 2.6.8-0.1.20080902cvs.1
+- ExcludeArch ppc64 for now until I can figure out why it doesn't build
+
 * Fri Jan  9 2009 Jerry James <loganjerry at gmail.com> - 2.6.8-0.1.20080902cvs
 - Update from CVS to fix many build problems
 - Fix SELinux and BFD problems that blocked the build



From alexlan at fedoraproject.org  Sun Jan 18 08:52:36 2009
From: alexlan at fedoraproject.org (Alex Lancaster)
Date: Sun, 18 Jan 2009 08:52:36 +0000 (UTC)
Subject: rpms/perl-bioperl/devel .cvsignore, 1.5, 1.6 perl-bioperl.spec, 1.17,
	1.18 sources, 1.6, 1.7
Message-ID: <20090118085236.5740F700E0@cvs1.fedora.phx.redhat.com>

Author: alexlan

Update of /cvs/extras/rpms/perl-bioperl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20818

Modified Files:
	.cvsignore perl-bioperl.spec sources 
Log Message:
* Sun Jan 18 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 1.5.9-0.4.3
- Update to 1.6.0 release candidate 3



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-bioperl/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	8 Jan 2009 06:48:43 -0000	1.5
+++ .cvsignore	18 Jan 2009 08:52:02 -0000	1.6
@@ -1 +1 @@
-BioPerl-1.5.9_2.tar.bz2
+BioPerl-1.5.9_3.tar.bz2


Index: perl-bioperl.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-bioperl/devel/perl-bioperl.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- perl-bioperl.spec	8 Jan 2009 06:48:43 -0000	1.17
+++ perl-bioperl.spec	18 Jan 2009 08:52:03 -0000	1.18
@@ -1,12 +1,12 @@
 Name:           perl-bioperl
 Version:        1.5.9
-Release:        0.3.2%{?dist}
+Release:        0.4.3%{?dist}
 Summary:        Perl tools for computational molecular biology
 
 Group:          Development/Libraries
 License:        GPL+ or Artistic
 URL:            http://www.bioperl.org/
-Source0:        http://bioperl.org/DIST/BioPerl-%{version}_2.tar.bz2
+Source0:        http://bioperl.org/DIST/BioPerl-%{version}_3.tar.bz2
 Patch0:         bioperl-1.5.9-paths.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -58,7 +58,7 @@
 many modules depend on each other to achieve a task.
 
 %prep
-%setup -q -n BioPerl-%{version}._2
+%setup -q -n BioPerl-%{version}._3
 %patch0 -p1 
 
 # temporarily remove PhyloNetwork before compiling until upstream says
@@ -70,13 +70,13 @@
 # these are the unwanted Requires for perl-bioperl-run, keeping in
 # case we need to do the temporary hack for bootstrapping again
 
-#cat << \EOF > %{_builddir}/BioPerl-%{version}._2/%{name}-req
+#cat << \EOF > %{_builddir}/BioPerl-%{version}._3/%{name}-req
 ##!/bin/sh
 #%{__perl_requires} $* |\
 #   sed -e '/perl(Bio::Tools::Run::Alignment::Clustalw)/d; /perl(Bio::Tools::Run::GenericParameters)/d; /perl(Bio::Tools::Run::Phylo::Molphy::ProtML)/d; /perl(Bio::Tools::Run::Phylo::Phylip::Neighbor)/d; /perl(Bio::Tools::Run::Phylo::Phylip::ProtDist)/d; /perl(Bio::Tools::Run::Phylo::Phylip::ProtPars)/d; /perl(Bio::Tools::Run::RemoteBlast)/d'
 #EOF
  
-#%%define __perl_requires %{_builddir}/BioPerl-%{version}._2/%{name}-req
+#%%define __perl_requires %{_builddir}/BioPerl-%{version}._3/%{name}-req
 #chmod +x %{__perl_requires}
 
 # remove all execute bits from the doc stuff
@@ -129,6 +129,9 @@
 %{_mandir}/man3/*.3*    
 
 %changelog
+* Sun Jan 18 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 1.5.9-0.4.3
+- Update to 1.6.0 release candidate 3
+
 * Wed Jan  7 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 1.5.9-0.3.2
 - Update to 1.6.0 release candidate 2
 - Remove filter for Bio::Graphics*, upstream removed them from the


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-bioperl/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	8 Jan 2009 06:48:43 -0000	1.6
+++ sources	18 Jan 2009 08:52:03 -0000	1.7
@@ -1 +1 @@
-e01ce300592c8a5f7f1f1d2eba5405bc  BioPerl-1.5.9_2.tar.bz2
+d4cf25074d40c6797e7eeff8c925b5d6  BioPerl-1.5.9_3.tar.bz2



From denis at fedoraproject.org  Sun Jan 18 08:56:15 2009
From: denis at fedoraproject.org (Denis Leroy)
Date: Sun, 18 Jan 2009 08:56:15 +0000 (UTC)
Subject: rpms/goocanvasmm/devel .cvsignore, 1.4, 1.5 goocanvasmm.spec, 1.4, 
	1.5 sources, 1.4, 1.5
Message-ID: <20090118085615.D47BC700E0@cvs1.fedora.phx.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/goocanvasmm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21357

Modified Files:
	.cvsignore goocanvasmm.spec sources 
Log Message:
Update to upstream 0.13.0


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/goocanvasmm/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	3 Sep 2008 06:45:52 -0000	1.4
+++ .cvsignore	18 Jan 2009 08:55:45 -0000	1.5
@@ -1 +1 @@
-goocanvasmm-0.9.0.tar.bz2
+goocanvasmm-0.13.0.tar.bz2


Index: goocanvasmm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/goocanvasmm/devel/goocanvasmm.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- goocanvasmm.spec	3 Sep 2008 06:45:52 -0000	1.4
+++ goocanvasmm.spec	18 Jan 2009 08:55:45 -0000	1.5
@@ -1,5 +1,5 @@
 Name:           goocanvasmm
-Version:        0.9.0
+Version:        0.13.0
 Release:        1%{?dist}
 
 Summary:        C++ interface for goocanvas
@@ -7,12 +7,12 @@
 Group:          System Environment/Libraries
 License:        LGPLv2+
 URL:            http://gtkmm.sourceforge.net/
-Source0:        http://ftp.gnome.org/pub/GNOME/sources/goocanvasmm/0.6/goocanvasmm-%{version}.tar.bz2
+Source0:        http://ftp.gnome.org/pub/GNOME/sources/goocanvasmm/0.13/goocanvasmm-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  glibmm24-devel >= 2.14.2
 BuildRequires:  gtkmm24-devel >= 2.10.9
-BuildRequires:  goocanvas-devel >= 0.10
+BuildRequires:  goocanvas-devel >= 0.13
 BuildRequires:  doxygen graphviz
 
 
@@ -84,6 +84,9 @@
 
 
 %changelog
+* Sun Jan 18 2009 Denis Leroy <denis at poolshark.org> - 0.13.0-1
+- Update to upstream 0.13.0
+
 * Wed Sep  3 2008 Denis Leroy <denis at poolshark.org> - 0.9.0-1
 - Update to upstream 0.9.0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/goocanvasmm/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	3 Sep 2008 06:45:53 -0000	1.4
+++ sources	18 Jan 2009 08:55:45 -0000	1.5
@@ -1 +1 @@
-202953757c7e86463ac1480475aa53e0  goocanvasmm-0.9.0.tar.bz2
+c25c567f95af4619b0af0124251b3c39  goocanvasmm-0.13.0.tar.bz2



From tmraz at fedoraproject.org  Sun Jan 18 09:09:02 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Sun, 18 Jan 2009 09:09:02 +0000 (UTC)
Subject: rpms/ruby-ldap/devel ruby-ldap.spec,1.3,1.4
Message-ID: <20090118090902.7C513700E0@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/ruby-ldap/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23619

Modified Files:
	ruby-ldap.spec 
Log Message:
* Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> - 0.9.7-6
- rebuild with new openssl



Index: ruby-ldap.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ruby-ldap/devel/ruby-ldap.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ruby-ldap.spec	20 Feb 2008 02:42:57 -0000	1.3
+++ ruby-ldap.spec	18 Jan 2009 09:08:31 -0000	1.4
@@ -3,7 +3,7 @@
 
 Name:           ruby-ldap
 Version:        0.9.7 
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Ruby LDAP libraries
 Group:          Development/Languages
 License:        BSD 
@@ -52,6 +52,9 @@
 
 
 %changelog
+* Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> - 0.9.7-6
+- rebuild with new openssl
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.9.7-5
 - Autorebuild for GCC 4.3
 



From tmraz at fedoraproject.org  Sun Jan 18 09:10:09 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Sun, 18 Jan 2009 09:10:09 +0000 (UTC)
Subject: rpms/rudesocket/devel rudesocket.spec,1.3,1.4
Message-ID: <20090118091009.D98D8700E0@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/rudesocket/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23843

Modified Files:
	rudesocket.spec 
Log Message:
* Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com>
- 1.3.0-3
- rebuild with new openssl



Index: rudesocket.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rudesocket/devel/rudesocket.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- rudesocket.spec	6 Feb 2008 23:13:34 -0000	1.3
+++ rudesocket.spec	18 Jan 2009 09:09:39 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           rudesocket
 Version:        1.3.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Library (C++ API) for creating client sockets
 
 Group:          System Environment/Libraries
@@ -64,6 +64,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com>
+- 1.3.0-3
+- rebuild with new openssl
 
 * Wed Feb 06 2008 Matt Flood <matt at rudeserver.com>
 - 1.3.0-2



From tmraz at fedoraproject.org  Sun Jan 18 09:11:17 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Sun, 18 Jan 2009 09:11:17 +0000 (UTC)
Subject: rpms/scribus/devel scribus.spec,1.38,1.39
Message-ID: <20090118091117.5CB35700E0@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/scribus/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24106

Modified Files:
	scribus.spec 
Log Message:
* Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> - 1.3.4-0.9.12516svn
- rebuild with new openssl



Index: scribus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/scribus/devel/scribus.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- scribus.spec	4 Dec 2008 18:16:26 -0000	1.38
+++ scribus.spec	18 Jan 2009 09:10:46 -0000	1.39
@@ -1,6 +1,6 @@
 Name:           scribus
 Version:        1.3.5
-Release:        0.8.12516svn%{?dist}
+Release:        0.9.12516svn%{?dist}
 
 Summary:        DeskTop Publishing application written in Qt
 
@@ -179,6 +179,9 @@
  
 
 %changelog
+* Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> - 1.3.4-0.9.12516svn
+- rebuild with new openssl
+
 * Thu Dec 04 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 1.3.5-0.8.12516svn
 - Rebuild for Python 2.6
 



From tmraz at fedoraproject.org  Sun Jan 18 09:17:57 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Sun, 18 Jan 2009 09:17:57 +0000 (UTC)
Subject: rpms/scsi-target-utils/devel scsi-target-utils.spec,1.8,1.9
Message-ID: <20090118091757.45AB3700E0@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/scsi-target-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24839

Modified Files:
	scsi-target-utils.spec 
Log Message:
* Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> - 0.9.2-2
- rebuild with new openssl



Index: scsi-target-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/scsi-target-utils/devel/scsi-target-utils.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- scsi-target-utils.spec	16 Dec 2008 21:29:12 -0000	1.8
+++ scsi-target-utils.spec	18 Jan 2009 09:17:26 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           scsi-target-utils
 Version:        0.9.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        The SCSI target daemon and utility programs
 
 Group:          System Environment/Daemons
@@ -78,6 +78,9 @@
 %{_initrddir}/tgtd
 
 %changelog
+* Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> - 0.9.2-2
+- rebuild with new openssl
+
 * Tue Dec 16 2008 Jarod Wilson <jarod at redhat.com> - 0.9.2-1
 - Update to 0.9.2 release
 



From tmraz at fedoraproject.org  Sun Jan 18 09:19:41 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Sun, 18 Jan 2009 09:19:41 +0000 (UTC)
Subject: rpms/sepostgresql/devel sepostgresql.spec,1.29,1.30
Message-ID: <20090118091941.53DF2700E0@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/sepostgresql/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25109

Modified Files:
	sepostgresql.spec 
Log Message:
* Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> - 8.3.5-2.1183
- rebuild with new openssl



Index: sepostgresql.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sepostgresql/devel/sepostgresql.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- sepostgresql.spec	5 Nov 2008 02:09:01 -0000	1.29
+++ sepostgresql.spec	18 Jan 2009 09:19:10 -0000	1.30
@@ -214,6 +214,9 @@
 %attr(700,sepgsql,sepgsql) %dir %{_localstatedir}/lib/sepgsql/backups
 
 %changelog
+* Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> - 8.3.5-2.1183
+- rebuild with new openssl
+
 * Wed Nov  5 2008 <kaigai at kaigai.gr.jp> - 8.3.5-2.1182
 - upgrade base PostgreSQL version 8.3.4->8.3.5
 - backport cumulative bugfixes from 8.4devel series



From tmraz at fedoraproject.org  Sun Jan 18 09:23:15 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Sun, 18 Jan 2009 09:23:15 +0000 (UTC)
Subject: rpms/siege/devel siege.spec,1.6,1.7
Message-ID: <20090118092315.859C7700E0@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/siege/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25554

Modified Files:
	siege.spec 
Log Message:
* Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> 2.67-2
- rebuild with new openssl



Index: siege.spec
===================================================================
RCS file: /cvs/pkgs/rpms/siege/devel/siege.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- siege.spec	17 May 2008 02:52:06 -0000	1.6
+++ siege.spec	18 Jan 2009 09:22:45 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           siege
 Version:        2.67
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Siege is an http regression testing and benchmarking utility
 
 Group:          Development/Tools
@@ -58,6 +58,8 @@
 %config(noreplace) %{_sysconfdir}/urls.txt
 
 %changelog
+* Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> 2.67-2
+- rebuild with new openssl
 
 * Fri May 16 2008 Allisson Azevedo <allisson at gmail.com> 2.67-1
 - Update to 2.67



From tmraz at fedoraproject.org  Sun Jan 18 09:49:52 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Sun, 18 Jan 2009 09:49:52 +0000 (UTC)
Subject: rpms/sim/devel sim.spec,1.10,1.11
Message-ID: <20090118094952.E5A40700E0@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/sim/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29529

Modified Files:
	sim.spec 
Log Message:
* Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> - 0.9.5-0.15.20080923svn2261rev
- rebuild with new openssl



Index: sim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sim/devel/sim.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sim.spec	22 Nov 2008 16:47:19 -0000	1.10
+++ sim.spec	18 Jan 2009 09:49:20 -0000	1.11
@@ -4,7 +4,7 @@
 
 Name: 		sim
 Version: 		0.9.5
-Release:		0.14.%{SVNdate}svn%{SVNrev}rev%{?dist}
+Release:		0.15.%{SVNdate}svn%{SVNrev}rev%{?dist}
 #svn checkout -r %{SVNrev} svn://svn.berlios.de/sim-im/trunk; tar -cjf '%{name}-%{version}-SVN%{SVNdate}rev%{SVNrev}.tar.bz2' trunk
 Source0:		%{name}-%{version}-SVN%{SVNdate}rev%{SVNrev}.tar.bz2
 Summary:		Multiprotocol Instant Messenger
@@ -127,6 +127,9 @@
 %{_datadir}/services/
 
 %changelog
+* Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> - 0.9.5-0.15.20080923svn2261rev
+- rebuild with new openssl
+
 * Sat Nov 22 2008 Pavel Alexeev <Pahan [ at ] Hubbitus [ DOT ] spb [ dOt.] su> - 0.9.5-0.14.20080923svn2261rev
 - Remove package name from package description.
 



From tmraz at fedoraproject.org  Sun Jan 18 09:50:15 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Sun, 18 Jan 2009 09:50:15 +0000 (UTC)
Subject: rpms/sipsak/devel sipsak.spec,1.4,1.5
Message-ID: <20090118095015.BC7D1700E0@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/sipsak/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29636

Modified Files:
	sipsak.spec 
Log Message:
* Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> 0.9.6-5
- rebuild with new openssl



Index: sipsak.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sipsak/devel/sipsak.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sipsak.spec	4 Sep 2008 19:45:51 -0000	1.4
+++ sipsak.spec	18 Jan 2009 09:49:45 -0000	1.5
@@ -1,7 +1,7 @@
 Summary:	SIP swiss army knife
 Name:		sipsak
 Version:	0.9.6
-Release: 	4%{?dist}
+Release: 	5%{?dist}
 License:	GPLv2+
 Group:		Applications/Communications
 URL:		http://sipsak.org/
@@ -41,6 +41,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> 0.9.6-5
+- rebuild with new openssl
+
 * Thu Sep 04 2008 Tom "spot" Callaway <tcallawa at redhat.com> 0.9.6-4
 - fix license tag
 



From tmraz at fedoraproject.org  Sun Jan 18 09:50:40 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Sun, 18 Jan 2009 09:50:40 +0000 (UTC)
Subject: rpms/sipp/devel sipp.spec,1.10,1.11
Message-ID: <20090118095040.D55FC700E0@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/sipp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29798

Modified Files:
	sipp.spec 
Log Message:
* Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> 3.1-3
- rebuild with new openssl



Index: sipp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sipp/devel/sipp.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sipp.spec	6 Jul 2008 13:37:06 -0000	1.10
+++ sipp.spec	18 Jan 2009 09:50:10 -0000	1.11
@@ -1,7 +1,7 @@
 Summary:	SIP test tool / traffic generator
 Name:		sipp
 Version:	3.1
-Release:	2%{?dist}
+Release:	3%{?dist}
 License:	GPLv2+
 Group:		Applications/Communications
 URL:		http://sipp.sourceforge.net/
@@ -55,6 +55,9 @@
 %{_datadir}/%{name}
 
 %changelog
+* Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> 3.1-3
+- rebuild with new openssl
+
 * Sun Jul  6 2008 Peter Lemenkov <lemenkov at gmail.com> 3.1-2
 - CVE-2008-2085
 



From alexlan at fedoraproject.org  Sun Jan 18 10:22:29 2009
From: alexlan at fedoraproject.org (Alex Lancaster)
Date: Sun, 18 Jan 2009 10:22:29 +0000 (UTC)
Subject: rpms/emacs-common-ess/devel .cvsignore, 1.4,
	1.5 emacs-common-ess.spec, 1.3, 1.4 sources, 1.4, 1.5
Message-ID: <20090118102229.F136B700E0@cvs1.fedora.phx.redhat.com>

Author: alexlan

Update of /cvs/extras/rpms/emacs-common-ess/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1387

Modified Files:
	.cvsignore emacs-common-ess.spec sources 
Log Message:
- Update to latest upstream (5.3.10)
- Add BR: texinfo-tex
- Fix paths to installation of documentation



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/emacs-common-ess/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	4 Aug 2008 08:35:27 -0000	1.4
+++ .cvsignore	18 Jan 2009 10:21:57 -0000	1.5
@@ -1 +1 @@
-ess-5.3.8.tgz
+ess-5.3.10.tgz


Index: emacs-common-ess.spec
===================================================================
RCS file: /cvs/extras/rpms/emacs-common-ess/devel/emacs-common-ess.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- emacs-common-ess.spec	4 Aug 2008 08:35:27 -0000	1.3
+++ emacs-common-ess.spec	18 Jan 2009 10:21:57 -0000	1.4
@@ -27,7 +27,7 @@
 %endif
 
 Name:           emacs-common-%{pkg}
-Version:        5.3.8
+Version:        5.3.10
 Release:        1%{?dist}
 Summary:        %{pkgname} add-on package for Emacs
 
@@ -40,6 +40,7 @@
 BuildArch:      noarch
 BuildRequires:  emacs emacs-el
 BuildRequires:  xemacs-devel xemacs-packages-extra
+BuildRequires:  texinfo-tex
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
 
@@ -158,6 +159,7 @@
           PREFIX=${RPM_BUILD_ROOT}%{_prefix} \
           LISPDIR=$PKGLISP \
           INFODIR=$INFODIR \
+	  DOCDIR=${RPM_BUILD_ROOT}%{_docdir}/%{name}-%{version} \
           ETCDIR=$ETCDIR \
           ETCFILES="backbug? *.S ess-sas-sh-command config.guess"
 %{__rm} -f $INFODIR/dir # don't package but instead update in pre and post
@@ -188,6 +190,7 @@
           PREFIX=${RPM_BUILD_ROOT}%{_prefix} \
           LISPDIR=$PKGLISP \
           INFODIR=$INFODIR \
+	  DOCDIR=${RPM_BUILD_ROOT}%{_docdir}/%{name}-%{version} \
           ETCDIR=$ETCDIR \
           ETCFILES="backbug? *.S ess-sas-sh-command config.guess"
 %{__rm} -f $INFODIR/dir # don't package but instead update in pre and post
@@ -254,6 +257,11 @@
 
 
 %changelog
+* Sun Jan 18 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 5.3.10-1
+- Update to latest upstream (5.3.10)
+- Add BR: texinfo-tex
+- Fix paths to installation of documentation
+
 * Mon Aug  4 2008 Alex Lancaster <alexlan[AT]fedoraproject org> - 5.3.8-1
 - Update to latest upstream (5.3.8)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/emacs-common-ess/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	4 Aug 2008 08:35:27 -0000	1.4
+++ sources	18 Jan 2009 10:21:58 -0000	1.5
@@ -1 +1 @@
-2ae71f7738f6c8582305b3f204a37b55  ess-5.3.8.tgz
+f89247503ed4563ad6d2c97779f23520  ess-5.3.10.tgz



From scop at fedoraproject.org  Sun Jan 18 10:27:11 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Sun, 18 Jan 2009 10:27:11 +0000 (UTC)
Subject: rpms/bash-completion/devel bash-completion-snapshot.sh, NONE,
	1.1 .cvsignore, 1.11, 1.12 bash-completion-lzop, 1.2,
	1.3 bash-completion-repomanage, 1.2, 1.3 bash-completion.spec,
	1.32, 1.33 sources, 1.11,
	1.12 bash-completion-20060301-man.patch, 1.1,
	NONE bash-completion-20060301-rpm-eval.patch, 1.1,
	NONE bash-completion-20060301-sqlite.patch, 1.1,
	NONE bash-completion-20060301-yum-available-speedup-478784.patch,
	1.1, NONE bash-completion-20080705-getent.patch, 1.1,
	NONE bash-completion-20080705-gzip.patch, 1.1,
	NONE bash-completion-20080705-jpeg2000-304771.patch, 1.1,
	NONE bash-completion-20080705-lzma.patch, 1.1,
	NONE bash-completion-20080705-mediafiles-444467.patch, 1.1,
	NONE bash-completion-20080705-rpm-backups.patch, 1.1,
	NONE bash-completion-20080705-rpm-installed.patch, 1.1,
	NONE bash-completion-20080705-svn-filenames-430059.patch, 1.1, NONE
Message-ID: <20090118102711.9368B700E0@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/bash-completion/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2060

Modified Files:
	.cvsignore bash-completion-lzop bash-completion-repomanage 
	bash-completion.spec sources 
Added Files:
	bash-completion-snapshot.sh 
Removed Files:
	bash-completion-20060301-man.patch 
	bash-completion-20060301-rpm-eval.patch 
	bash-completion-20060301-sqlite.patch 
	bash-completion-20060301-yum-available-speedup-478784.patch 
	bash-completion-20080705-getent.patch 
	bash-completion-20080705-gzip.patch 
	bash-completion-20080705-jpeg2000-304771.patch 
	bash-completion-20080705-lzma.patch 
	bash-completion-20080705-mediafiles-444467.patch 
	bash-completion-20080705-rpm-backups.patch 
	bash-completion-20080705-rpm-installed.patch 
	bash-completion-20080705-svn-filenames-430059.patch 
Log Message:
* Sun Jan 18 2009 Ville Skytt?? <ville.skytta at iki.fi> - 20080705-2.20090115bzr1252
- r1252 snapshot; all patches applied upstream.
- Do not install mercurial completion, an updated version is shipped with it.
- Improve lzop and repomanage completion.



--- NEW FILE bash-completion-snapshot.sh ---
#!/bin/sh

if [ -z "$1" -o $# -ne 1 ]; then
  echo "Usage: $0 <bzr-revision>"
  exit 2
fi

rev="$1"
url=http://bzr.debian.org/bzr/bash-completion/current

bzr export -r $rev bash-completion-$(date +%Y%m%d)bzr$rev.tar.bz2 $url


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bash-completion/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	6 Jan 2009 18:44:43 -0000	1.11
+++ .cvsignore	18 Jan 2009 10:26:39 -0000	1.12
@@ -1 +1 @@
-bash-completion_20080705.tar.gz
+bash-completion-20090115bzr1252.tar.bz2


Index: bash-completion-lzop
===================================================================
RCS file: /cvs/pkgs/rpms/bash-completion/devel/bash-completion-lzop,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- bash-completion-lzop	6 Jan 2009 18:44:43 -0000	1.2
+++ bash-completion-lzop	18 Jan 2009 10:26:40 -0000	1.3
@@ -1,42 +1,52 @@
-# bash completion for lzop(1)                                        -*- sh -*-
+# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
+# ex: ts=8 sw=8 noet filetype=sh
 #
+# lzop(1) completion
+
 have lzop &&
 _lzop()
 {
-	local cur prev xspec IFS=$' \t\n'
+	local cur prev xspec
 
 	COMPREPLY=()
 	cur=`_get_cword`
 	prev=${COMP_WORDS[COMP_CWORD-1]}
 
+	# TODO: -p: takes a dir argument, without a separating space
+
 	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 \
+		COMPREPLY=( $( compgen -W '-d -x -l -t -h -I -V -L -1 -2 -3 \
+			-4 -5 -6 -7 -8 -9 -q -v -c -f -F -n -N -P -k -U -o \
+			-S --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 ) )
+			--version --stdout --to-stdout --output --path \
+			--force --no-checksum --no-name --name --no-mode \
+			--no-time --suffix --keep --unlink --delete --crc32 \
+			--no-warn --ignore-warn --quiet --silent --verbose \
+			--no-stdin --filter --checksum --no-color --mono \
+			--color' -- $cur ) )
 		return 0
 	fi
 
+	case "$prev" in
+		-o|--output)	_filedir ; return 0 ;;
+		--path)		_filedir -d ; return 0 ;;
+		-S|--suffix)	return 0 ;;
+	esac
+
 	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
+	case "$prev" in
+		--@(@(de|un)compress|extract|list|ls|info|test))
+				xspec="!"$xspec ;;
+		--force)	xspec= ;;
+		--*)		;;
+		-*f*|'<'|'>')	xspec= ;;
+		-*[dltx]*)	xspec="!"$xspec ;;
+	esac
 
 	_expand || return 0
 
+	local IFS=$'\t\n'
 	COMPREPLY=( $( compgen -f -X "$xspec" -- $cur ) \
 		    $( compgen -d -- $cur ) )
 } &&


Index: bash-completion-repomanage
===================================================================
RCS file: /cvs/pkgs/rpms/bash-completion/devel/bash-completion-repomanage,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- bash-completion-repomanage	6 Jan 2009 18:44:43 -0000	1.2
+++ bash-completion-repomanage	18 Jan 2009 10:26:40 -0000	1.3
@@ -1,24 +1,24 @@
-# bash completion for repomanage                                     -*- sh -*-
+# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
+# ex: ts=8 sw=8 noet filetype=sh
+#
+# bash completion for repomanage
 
+have repomanage &&
 _repomanage()
 {
-    local cur prev
+	local cur prev
 
-    COMPREPLY=()
-    cur=`_get_cword`
-    prev=${COMP_WORDS[COMP_CWORD-1]}
+	COMPREPLY=()
+	cur=`_get_cword`
+	prev=${COMP_WORDS[COMP_CWORD-1]}
 
-    case $prev in
-        -@(h|-help|k|-keep))
-            return 0
-            ;;
-    esac
+	[[ "$prev" == -@(h|-help|k|-keep) ]] && return 0
 
-    if [[ "$cur" == -* ]] ; then
-        COMPREPLY=( $( compgen -W '-o --old -n --new -s --space -k --keep \
-            -c --nocheck -h --help' -- $cur ) )
-    else
-        _filedir -d
-    fi
-}
-complete -F _repomanage repomanage
+	if [[ "$cur" == -* ]] ; then
+		COMPREPLY=( $( compgen -W '-o --old -n --new -s --space -k \
+				--keep -c --nocheck -h --help' -- $cur ) )
+	else
+		_filedir -d
+	fi
+} &&
+complete -F _repomanage $filenames repomanage


Index: bash-completion.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bash-completion/devel/bash-completion.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- bash-completion.spec	6 Jan 2009 21:06:13 -0000	1.32
+++ bash-completion.spec	18 Jan 2009 10:26:40 -0000	1.33
@@ -1,28 +1,24 @@
+%define snap    20090115bzr1252
+
 Name:           bash-completion
 Version:        20080705
-Release:        1
+Release:        2%{?snap:.%{snap}}
 Summary:        Programmable completion for Bash
 
 Group:          System Environment/Shells
 License:        GPLv2+
 URL:            http://bash-completion.alioth.debian.org/
+# Snapshot tarballs created with Source99
+%if 0%{?snap:1}
+Source0:        %{name}-%{snap}.tar.bz2
+%else
 Source0:        http://ftp.debian.org/debian/pool/main/b/bash-completion/%{name}_%{version}.tar.gz
+%endif
 Source1:        %{name}-lzop
 Source2:        %{name}-mock
 Source3:        %{name}-repomanage
 Source4:        %{name}-plague-client
-Patch0:         %{name}-20080705-rpm-installed.patch
-Patch1:         %{name}-20060301-yum-available-speedup-478784.patch
-Patch2:         %{name}-20080705-lzma.patch
-Patch3:         %{name}-20080705-jpeg2000-304771.patch
-Patch4:         %{name}-20080705-mediafiles-444467.patch
-Patch5:         %{name}-20080705-svn-filenames-430059.patch
-Patch6:         %{name}-20080705-gzip.patch
-Patch7:         %{name}-20060301-man.patch
-Patch8:         %{name}-20080705-rpm-backups.patch
-Patch9:         %{name}-20060301-rpm-eval.patch
-Patch10:        %{name}-20080705-getent.patch
-Patch11:        %{name}-20060301-sqlite.patch
+Source99:       %{name}-snapshot.sh
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -34,24 +30,12 @@
 
 
 %prep
-%setup -q -n %{name}
-%patch0
-%patch1
-%patch2
-%patch3
-%patch4
-%patch5
-%patch6
-%patch7
-%patch8
-%patch9 -p1
-%patch10
-%patch11 -p1
+%setup -q -n %{name}%{?snap:-%{snap}}
 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
-
+rm contrib/hg # Updated version shipped in the mercurial package
 
 %build
 
@@ -80,7 +64,7 @@
 %define do_triggerun() [ $2 -gt 0 ] || rm -f %{_sysconfdir}/bash_completion.d/%1 || :
 
 # Not handled (yet?):
-# bitkeeper, harbour, larch, lisp, p4, povray
+# apache2ctl, bitkeeper, harbour, larch, lisp, p4, povray
 
 %triggerin -- bittorrent
 %do_triggerin bittorrent
@@ -122,11 +106,21 @@
 %triggerun -- gkrellm
 %do_triggerun gkrellm
 
+%triggerin -- gnupg2
+%do_triggerin gpg2
+%triggerun -- gnupg2
+%do_triggerun gpg2
+
 %triggerin -- lilypond
 %do_triggerin lilypond
 %triggerun -- lilypond
 %do_triggerun lilypond
 
+%triggerin -- lzma
+%do_triggerin lzma
+%triggerun -- lzma
+%do_triggerun lzma
+
 %triggerin -- lzop
 %do_triggerin lzop
 %triggerun -- lzop
@@ -142,21 +136,26 @@
 %triggerun -- mcrypt
 %do_triggerun mcrypt
 
-%triggerin -- mercurial
-%do_triggerin hg
-%triggerun -- mercurial
-%do_triggerun hg
-
 %triggerin -- mock
 %do_triggerin mock
 %triggerun -- mock
 %do_triggerun mock
 
+%triggerin -- monodevelop
+%do_triggerin monodevelop
+%triggerun -- monodevelop
+%do_triggerun monodevelop
+
 %triggerin -- mtx
 %do_triggerin mtx
 %triggerun -- mtx
 %do_triggerun mtx
 
+%triggerin -- openssh-clients
+%do_triggerin ssh
+%triggerun -- openssh-clients
+%do_triggerun ssh
+
 %triggerin -- perl-SVK
 %do_triggerin svk
 %triggerun -- perl-SVK
@@ -167,6 +166,11 @@
 %triggerun -- plague-client
 %do_triggerun plague-client
 
+%triggerin -- qt
+%do_triggerin qdbus
+%triggerun -- qt
+%do_triggerun qdbus
+
 %triggerin -- ruby-ri
 %do_triggerin ri
 %triggerun -- ruby-ri
@@ -187,6 +191,11 @@
 %triggerun -- snownews
 %do_triggerun snownews
 
+%triggerin -- subversion
+%do_triggerin _subversion
+%triggerun -- subversion
+%do_triggerun _subversion
+
 %triggerin -- unace
 %do_triggerin unace
 %triggerun -- unace
@@ -218,6 +227,11 @@
 
 
 %changelog
+* Sun Jan 18 2009 Ville Skytt?? <ville.skytta at iki.fi> - 20080705-2.20090115bzr1252
+- r1252 snapshot; all patches applied upstream.
+- Do not install mercurial completion, an updated version is shipped with it.
+- Improve lzop and repomanage completion.
+
 * Tue Jan  6 2009 Ville Skytt?? <ville.skytta at iki.fi> - 20080705-1
 - 20080705; new upstream at http://bash-completion.alioth.debian.org/
 - Perl, Debian, and scp patches applied upstream.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bash-completion/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	6 Jan 2009 18:44:43 -0000	1.11
+++ sources	18 Jan 2009 10:26:40 -0000	1.12
@@ -1 +1 @@
-8bc36281bb0567bc67a9083c4c5595a9  bash-completion_20080705.tar.gz
+69a699369cd0dd836e9b93d7eed71f65  bash-completion-20090115bzr1252.tar.bz2


--- bash-completion-20060301-man.patch DELETED ---


--- bash-completion-20060301-rpm-eval.patch DELETED ---


--- bash-completion-20060301-sqlite.patch DELETED ---


--- bash-completion-20060301-yum-available-speedup-478784.patch DELETED ---


--- bash-completion-20080705-getent.patch DELETED ---


--- bash-completion-20080705-gzip.patch DELETED ---


--- bash-completion-20080705-jpeg2000-304771.patch DELETED ---


--- bash-completion-20080705-lzma.patch DELETED ---


--- bash-completion-20080705-mediafiles-444467.patch DELETED ---


--- bash-completion-20080705-rpm-backups.patch DELETED ---


--- bash-completion-20080705-rpm-installed.patch DELETED ---


--- bash-completion-20080705-svn-filenames-430059.patch DELETED ---



From alexlan at fedoraproject.org  Sun Jan 18 10:30:04 2009
From: alexlan at fedoraproject.org (Alex Lancaster)
Date: Sun, 18 Jan 2009 10:30:04 +0000 (UTC)
Subject: rpms/emacs-common-ess/F-10 .cvsignore, 1.4,
	1.5 emacs-common-ess.spec, 1.3, 1.4 sources, 1.4, 1.5
Message-ID: <20090118103004.7CF90700E0@cvs1.fedora.phx.redhat.com>

Author: alexlan

Update of /cvs/extras/rpms/emacs-common-ess/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2254/F-10

Modified Files:
	.cvsignore emacs-common-ess.spec sources 
Log Message:
- Update to latest upstream (5.3.10)
- Add BR: texinfo-tex
- Fix paths to installation of documentation



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/emacs-common-ess/F-10/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	4 Aug 2008 08:35:27 -0000	1.4
+++ .cvsignore	18 Jan 2009 10:29:33 -0000	1.5
@@ -1 +1 @@
-ess-5.3.8.tgz
+ess-5.3.10.tgz


Index: emacs-common-ess.spec
===================================================================
RCS file: /cvs/extras/rpms/emacs-common-ess/F-10/emacs-common-ess.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- emacs-common-ess.spec	4 Aug 2008 08:35:27 -0000	1.3
+++ emacs-common-ess.spec	18 Jan 2009 10:29:33 -0000	1.4
@@ -27,7 +27,7 @@
 %endif
 
 Name:           emacs-common-%{pkg}
-Version:        5.3.8
+Version:        5.3.10
 Release:        1%{?dist}
 Summary:        %{pkgname} add-on package for Emacs
 
@@ -40,6 +40,7 @@
 BuildArch:      noarch
 BuildRequires:  emacs emacs-el
 BuildRequires:  xemacs-devel xemacs-packages-extra
+BuildRequires:  texinfo-tex
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
 
@@ -158,6 +159,7 @@
           PREFIX=${RPM_BUILD_ROOT}%{_prefix} \
           LISPDIR=$PKGLISP \
           INFODIR=$INFODIR \
+	  DOCDIR=${RPM_BUILD_ROOT}%{_docdir}/%{name}-%{version} \
           ETCDIR=$ETCDIR \
           ETCFILES="backbug? *.S ess-sas-sh-command config.guess"
 %{__rm} -f $INFODIR/dir # don't package but instead update in pre and post
@@ -188,6 +190,7 @@
           PREFIX=${RPM_BUILD_ROOT}%{_prefix} \
           LISPDIR=$PKGLISP \
           INFODIR=$INFODIR \
+	  DOCDIR=${RPM_BUILD_ROOT}%{_docdir}/%{name}-%{version} \
           ETCDIR=$ETCDIR \
           ETCFILES="backbug? *.S ess-sas-sh-command config.guess"
 %{__rm} -f $INFODIR/dir # don't package but instead update in pre and post
@@ -254,6 +257,11 @@
 
 
 %changelog
+* Sun Jan 18 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 5.3.10-1
+- Update to latest upstream (5.3.10)
+- Add BR: texinfo-tex
+- Fix paths to installation of documentation
+
 * Mon Aug  4 2008 Alex Lancaster <alexlan[AT]fedoraproject org> - 5.3.8-1
 - Update to latest upstream (5.3.8)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/emacs-common-ess/F-10/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	4 Aug 2008 08:35:27 -0000	1.4
+++ sources	18 Jan 2009 10:29:33 -0000	1.5
@@ -1 +1 @@
-2ae71f7738f6c8582305b3f204a37b55  ess-5.3.8.tgz
+f89247503ed4563ad6d2c97779f23520  ess-5.3.10.tgz



From alexlan at fedoraproject.org  Sun Jan 18 10:30:04 2009
From: alexlan at fedoraproject.org (Alex Lancaster)
Date: Sun, 18 Jan 2009 10:30:04 +0000 (UTC)
Subject: rpms/emacs-common-ess/F-9 .cvsignore, 1.4, 1.5 emacs-common-ess.spec,
	1.3, 1.4 sources, 1.4, 1.5
Message-ID: <20090118103004.BE064700E0@cvs1.fedora.phx.redhat.com>

Author: alexlan

Update of /cvs/extras/rpms/emacs-common-ess/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2254/F-9

Modified Files:
	.cvsignore emacs-common-ess.spec sources 
Log Message:
- Update to latest upstream (5.3.10)
- Add BR: texinfo-tex
- Fix paths to installation of documentation



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/emacs-common-ess/F-9/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	4 Aug 2008 08:45:20 -0000	1.4
+++ .cvsignore	18 Jan 2009 10:29:34 -0000	1.5
@@ -1 +1 @@
-ess-5.3.8.tgz
+ess-5.3.10.tgz


Index: emacs-common-ess.spec
===================================================================
RCS file: /cvs/extras/rpms/emacs-common-ess/F-9/emacs-common-ess.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- emacs-common-ess.spec	4 Aug 2008 08:45:20 -0000	1.3
+++ emacs-common-ess.spec	18 Jan 2009 10:29:34 -0000	1.4
@@ -27,7 +27,7 @@
 %endif
 
 Name:           emacs-common-%{pkg}
-Version:        5.3.8
+Version:        5.3.10
 Release:        1%{?dist}
 Summary:        %{pkgname} add-on package for Emacs
 
@@ -40,6 +40,7 @@
 BuildArch:      noarch
 BuildRequires:  emacs emacs-el
 BuildRequires:  xemacs-devel xemacs-packages-extra
+BuildRequires:  texinfo-tex
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
 
@@ -158,6 +159,7 @@
           PREFIX=${RPM_BUILD_ROOT}%{_prefix} \
           LISPDIR=$PKGLISP \
           INFODIR=$INFODIR \
+	  DOCDIR=${RPM_BUILD_ROOT}%{_docdir}/%{name}-%{version} \
           ETCDIR=$ETCDIR \
           ETCFILES="backbug? *.S ess-sas-sh-command config.guess"
 %{__rm} -f $INFODIR/dir # don't package but instead update in pre and post
@@ -188,6 +190,7 @@
           PREFIX=${RPM_BUILD_ROOT}%{_prefix} \
           LISPDIR=$PKGLISP \
           INFODIR=$INFODIR \
+	  DOCDIR=${RPM_BUILD_ROOT}%{_docdir}/%{name}-%{version} \
           ETCDIR=$ETCDIR \
           ETCFILES="backbug? *.S ess-sas-sh-command config.guess"
 %{__rm} -f $INFODIR/dir # don't package but instead update in pre and post
@@ -254,6 +257,11 @@
 
 
 %changelog
+* Sun Jan 18 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 5.3.10-1
+- Update to latest upstream (5.3.10)
+- Add BR: texinfo-tex
+- Fix paths to installation of documentation
+
 * Mon Aug  4 2008 Alex Lancaster <alexlan[AT]fedoraproject org> - 5.3.8-1
 - Update to latest upstream (5.3.8)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/emacs-common-ess/F-9/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	4 Aug 2008 08:45:20 -0000	1.4
+++ sources	18 Jan 2009 10:29:34 -0000	1.5
@@ -1 +1 @@
-2ae71f7738f6c8582305b3f204a37b55  ess-5.3.8.tgz
+f89247503ed4563ad6d2c97779f23520  ess-5.3.10.tgz



From pkgdb at fedoraproject.org  Sun Jan 18 10:32:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 18 Jan 2009 10:32:36 +0000
Subject: [pkgdb] abyssinica-fonts ownership updated
Message-ID: <20090118103236.44C44208468@bastion.fedora.phx.redhat.com>

Package abyssinica-fonts in Fedora devel was orphaned by nim

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/abyssinica-fonts



From kanarip at fedoraproject.org  Sun Jan 18 11:47:03 2009
From: kanarip at fedoraproject.org (Jeroen van Meeuwen)
Date: Sun, 18 Jan 2009 11:47:03 +0000 (UTC)
Subject: rpms/rubygem-restr/devel import.log, NONE, 1.1 rubygem-restr.spec, 
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090118114703.5ED0E700E0@cvs1.fedora.phx.redhat.com>

Author: kanarip

Update of /cvs/pkgs/rpms/rubygem-restr/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8137/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log rubygem-restr.spec 
Log Message:
0.4.0-1


--- NEW FILE import.log ---
rubygem-restr-0_4_0-1_fc10:HEAD:rubygem-restr-0.4.0-1.fc10.src.rpm:1232279166


--- NEW FILE rubygem-restr.spec ---
%define ruby_sitelib %(ruby -rrbconfig -e "puts Config::CONFIG['sitelibdir']")
%define gemdir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null)
%define gemname restr
%define geminstdir %{gemdir}/gems/%{gemname}-%{version}

Summary:        Simple client for RESTful web services
Name:           rubygem-%{gemname}
Version:        0.4.0
Release:        1%{?dist}
Group:          Development/Languages
License:        LGPLv3
URL:            http://rubyforge.org/projects/restr/
Source0:        http://gems.rubyforge.org/gems/%{gemname}-%{version}.gem
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires:       ruby(abi) = 1.8
Requires:       rubygems
BuildRequires:  rubygems
BuildArch:      noarch
Provides:       rubygem(%{gemname}) = %{version}

%description
Restr is a simple client for RESTful web services, designed
as a lightweight alternative to ActiveResource

%prep

%build

%install
rm -rf %{buildroot}
mkdir -p %{buildroot}%{gemdir}
gem install --local --install-dir %{buildroot}%{gemdir} \
            --force --rdoc %{SOURCE0}

# Find files with a shebang that do not have executable permissions
for script in `find %{buildroot}/%{geminstdir} -type f ! -perm /a+x`; do
    [ ! -z "`head -n 1 $script | grep \"^#!/\"`" ] && chmod -v 755 $script
done

# Find sero-length files and remove them
find %{buildroot}/%{geminstdir} -type f -size 0c -exec rm -rvf {} \;

# Remove these hidden files
rm -rf %{buildroot}/%{geminstdir}/.project
rm -rf %{buildroot}/%{geminstdir}/.loadpath

%clean
rm -rf %{buildroot}

%files
%defattr(-, root, root, -)
%{gemdir}/gems/%{gemname}-%{version}/
%doc %{gemdir}/doc/%{gemname}-%{version}
%{gemdir}/cache/%{gemname}-%{version}.gem
%{gemdir}/specifications/%{gemname}-%{version}.gemspec


%changelog
* Tue Dec 16 2008 Jeroen van Meeuwen <kanarip at fedoraproject.org> - 0.4.0-1
- Package for review


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-restr/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	15 Jan 2009 20:47:03 -0000	1.1
+++ .cvsignore	18 Jan 2009 11:46:31 -0000	1.2
@@ -0,0 +1 @@
+restr-0.4.0.gem


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-restr/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	15 Jan 2009 20:47:03 -0000	1.1
+++ sources	18 Jan 2009 11:46:31 -0000	1.2
@@ -0,0 +1 @@
+07700195eb62bf60adcce5631c440864  restr-0.4.0.gem



From kanarip at fedoraproject.org  Sun Jan 18 11:48:27 2009
From: kanarip at fedoraproject.org (Jeroen van Meeuwen)
Date: Sun, 18 Jan 2009 11:48:27 +0000 (UTC)
Subject: rpms/rubygem-restr/F-10 import.log, NONE, 1.1 rubygem-restr.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090118114827.1498E700E0@cvs1.fedora.phx.redhat.com>

Author: kanarip

Update of /cvs/pkgs/rpms/rubygem-restr/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8445/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	import.log rubygem-restr.spec 
Log Message:
0.4.0-1


--- NEW FILE import.log ---
rubygem-restr-0_4_0-1_fc10:F-10:rubygem-restr-0.4.0-1.fc10.src.rpm:1232279255


--- NEW FILE rubygem-restr.spec ---
%define ruby_sitelib %(ruby -rrbconfig -e "puts Config::CONFIG['sitelibdir']")
%define gemdir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null)
%define gemname restr
%define geminstdir %{gemdir}/gems/%{gemname}-%{version}

Summary:        Simple client for RESTful web services
Name:           rubygem-%{gemname}
Version:        0.4.0
Release:        1%{?dist}
Group:          Development/Languages
License:        LGPLv3
URL:            http://rubyforge.org/projects/restr/
Source0:        http://gems.rubyforge.org/gems/%{gemname}-%{version}.gem
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires:       ruby(abi) = 1.8
Requires:       rubygems
BuildRequires:  rubygems
BuildArch:      noarch
Provides:       rubygem(%{gemname}) = %{version}

%description
Restr is a simple client for RESTful web services, designed
as a lightweight alternative to ActiveResource

%prep

%build

%install
rm -rf %{buildroot}
mkdir -p %{buildroot}%{gemdir}
gem install --local --install-dir %{buildroot}%{gemdir} \
            --force --rdoc %{SOURCE0}

# Find files with a shebang that do not have executable permissions
for script in `find %{buildroot}/%{geminstdir} -type f ! -perm /a+x`; do
    [ ! -z "`head -n 1 $script | grep \"^#!/\"`" ] && chmod -v 755 $script
done

# Find sero-length files and remove them
find %{buildroot}/%{geminstdir} -type f -size 0c -exec rm -rvf {} \;

# Remove these hidden files
rm -rf %{buildroot}/%{geminstdir}/.project
rm -rf %{buildroot}/%{geminstdir}/.loadpath

%clean
rm -rf %{buildroot}

%files
%defattr(-, root, root, -)
%{gemdir}/gems/%{gemname}-%{version}/
%doc %{gemdir}/doc/%{gemname}-%{version}
%{gemdir}/cache/%{gemname}-%{version}.gem
%{gemdir}/specifications/%{gemname}-%{version}.gemspec


%changelog
* Tue Dec 16 2008 Jeroen van Meeuwen <kanarip at fedoraproject.org> - 0.4.0-1
- Package for review


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-restr/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	15 Jan 2009 20:47:03 -0000	1.1
+++ .cvsignore	18 Jan 2009 11:47:56 -0000	1.2
@@ -0,0 +1 @@
+restr-0.4.0.gem


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-restr/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	15 Jan 2009 20:47:03 -0000	1.1
+++ sources	18 Jan 2009 11:47:56 -0000	1.2
@@ -0,0 +1 @@
+07700195eb62bf60adcce5631c440864  restr-0.4.0.gem



From kanarip at fedoraproject.org  Sun Jan 18 11:49:50 2009
From: kanarip at fedoraproject.org (Jeroen van Meeuwen)
Date: Sun, 18 Jan 2009 11:49:50 +0000 (UTC)
Subject: rpms/rubygem-restr/F-9 import.log, NONE, 1.1 rubygem-restr.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090118114950.7E34D700E0@cvs1.fedora.phx.redhat.com>

Author: kanarip

Update of /cvs/pkgs/rpms/rubygem-restr/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8722/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	import.log rubygem-restr.spec 
Log Message:
0.4.0-1


--- NEW FILE import.log ---
rubygem-restr-0_4_0-1_fc10:F-9:rubygem-restr-0.4.0-1.fc10.src.rpm:1232279338


--- NEW FILE rubygem-restr.spec ---
%define ruby_sitelib %(ruby -rrbconfig -e "puts Config::CONFIG['sitelibdir']")
%define gemdir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null)
%define gemname restr
%define geminstdir %{gemdir}/gems/%{gemname}-%{version}

Summary:        Simple client for RESTful web services
Name:           rubygem-%{gemname}
Version:        0.4.0
Release:        1%{?dist}
Group:          Development/Languages
License:        LGPLv3
URL:            http://rubyforge.org/projects/restr/
Source0:        http://gems.rubyforge.org/gems/%{gemname}-%{version}.gem
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires:       ruby(abi) = 1.8
Requires:       rubygems
BuildRequires:  rubygems
BuildArch:      noarch
Provides:       rubygem(%{gemname}) = %{version}

%description
Restr is a simple client for RESTful web services, designed
as a lightweight alternative to ActiveResource

%prep

%build

%install
rm -rf %{buildroot}
mkdir -p %{buildroot}%{gemdir}
gem install --local --install-dir %{buildroot}%{gemdir} \
            --force --rdoc %{SOURCE0}

# Find files with a shebang that do not have executable permissions
for script in `find %{buildroot}/%{geminstdir} -type f ! -perm /a+x`; do
    [ ! -z "`head -n 1 $script | grep \"^#!/\"`" ] && chmod -v 755 $script
done

# Find sero-length files and remove them
find %{buildroot}/%{geminstdir} -type f -size 0c -exec rm -rvf {} \;

# Remove these hidden files
rm -rf %{buildroot}/%{geminstdir}/.project
rm -rf %{buildroot}/%{geminstdir}/.loadpath

%clean
rm -rf %{buildroot}

%files
%defattr(-, root, root, -)
%{gemdir}/gems/%{gemname}-%{version}/
%doc %{gemdir}/doc/%{gemname}-%{version}
%{gemdir}/cache/%{gemname}-%{version}.gem
%{gemdir}/specifications/%{gemname}-%{version}.gemspec


%changelog
* Tue Dec 16 2008 Jeroen van Meeuwen <kanarip at fedoraproject.org> - 0.4.0-1
- Package for review


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-restr/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	15 Jan 2009 20:47:03 -0000	1.1
+++ .cvsignore	18 Jan 2009 11:49:20 -0000	1.2
@@ -0,0 +1 @@
+restr-0.4.0.gem


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-restr/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	15 Jan 2009 20:47:03 -0000	1.1
+++ sources	18 Jan 2009 11:49:20 -0000	1.2
@@ -0,0 +1 @@
+07700195eb62bf60adcce5631c440864  restr-0.4.0.gem



From kanarip at fedoraproject.org  Sun Jan 18 11:51:15 2009
From: kanarip at fedoraproject.org (Jeroen van Meeuwen)
Date: Sun, 18 Jan 2009 11:51:15 +0000 (UTC)
Subject: rpms/rubygem-restr/EL-5 import.log, NONE, 1.1 rubygem-restr.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090118115115.CD339700E0@cvs1.fedora.phx.redhat.com>

Author: kanarip

Update of /cvs/pkgs/rpms/rubygem-restr/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9012/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	import.log rubygem-restr.spec 
Log Message:
0.4.0-1


--- NEW FILE import.log ---
rubygem-restr-0_4_0-1_fc10:EL-5:rubygem-restr-0.4.0-1.fc10.src.rpm:1232279422


--- NEW FILE rubygem-restr.spec ---
%define ruby_sitelib %(ruby -rrbconfig -e "puts Config::CONFIG['sitelibdir']")
%define gemdir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null)
%define gemname restr
%define geminstdir %{gemdir}/gems/%{gemname}-%{version}

Summary:        Simple client for RESTful web services
Name:           rubygem-%{gemname}
Version:        0.4.0
Release:        1%{?dist}
Group:          Development/Languages
License:        LGPLv3
URL:            http://rubyforge.org/projects/restr/
Source0:        http://gems.rubyforge.org/gems/%{gemname}-%{version}.gem
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires:       ruby(abi) = 1.8
Requires:       rubygems
BuildRequires:  rubygems
BuildArch:      noarch
Provides:       rubygem(%{gemname}) = %{version}

%description
Restr is a simple client for RESTful web services, designed
as a lightweight alternative to ActiveResource

%prep

%build

%install
rm -rf %{buildroot}
mkdir -p %{buildroot}%{gemdir}
gem install --local --install-dir %{buildroot}%{gemdir} \
            --force --rdoc %{SOURCE0}

# Find files with a shebang that do not have executable permissions
for script in `find %{buildroot}/%{geminstdir} -type f ! -perm /a+x`; do
    [ ! -z "`head -n 1 $script | grep \"^#!/\"`" ] && chmod -v 755 $script
done

# Find sero-length files and remove them
find %{buildroot}/%{geminstdir} -type f -size 0c -exec rm -rvf {} \;

# Remove these hidden files
rm -rf %{buildroot}/%{geminstdir}/.project
rm -rf %{buildroot}/%{geminstdir}/.loadpath

%clean
rm -rf %{buildroot}

%files
%defattr(-, root, root, -)
%{gemdir}/gems/%{gemname}-%{version}/
%doc %{gemdir}/doc/%{gemname}-%{version}
%{gemdir}/cache/%{gemname}-%{version}.gem
%{gemdir}/specifications/%{gemname}-%{version}.gemspec


%changelog
* Tue Dec 16 2008 Jeroen van Meeuwen <kanarip at fedoraproject.org> - 0.4.0-1
- Package for review


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-restr/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	15 Jan 2009 20:47:03 -0000	1.1
+++ .cvsignore	18 Jan 2009 11:50:45 -0000	1.2
@@ -0,0 +1 @@
+restr-0.4.0.gem


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-restr/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	15 Jan 2009 20:47:03 -0000	1.1
+++ sources	18 Jan 2009 11:50:45 -0000	1.2
@@ -0,0 +1 @@
+07700195eb62bf60adcce5631c440864  restr-0.4.0.gem



From tmraz at fedoraproject.org  Sun Jan 18 11:56:07 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Sun, 18 Jan 2009 11:56:07 +0000 (UTC)
Subject: rpms/snmp++/devel snmp++.spec,1.1,1.2
Message-ID: <20090118115608.05AFF700E0@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/snmp++/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9558

Modified Files:
	snmp++.spec 
Log Message:
* Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> - 3.2.23-6
- rebuild with new openssl



Index: snmp++.spec
===================================================================
RCS file: /cvs/pkgs/rpms/snmp++/devel/snmp++.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- snmp++.spec	23 Nov 2008 05:23:46 -0000	1.1
+++ snmp++.spec	18 Jan 2009 11:55:36 -0000	1.2
@@ -1,6 +1,6 @@
 Name: snmp++
 Version: 3.2.23
-Release: 5%{?dist}
+Release: 6%{?dist}
 Summary: SNMP++v3.x is based on SNMP++v2.8 from HP* and extends it by support for SNMPv3
 
 Group:	Development/Libraries
@@ -74,6 +74,9 @@
 %{_includedir}/snmp_pp
 
 %changelog
+* Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> - 3.2.23-6
+- rebuild with new openssl
+
 * Thu Nov 20 2008 Hayden James - 3.2.23-5
 - Fixed weak references in shared object
 - Changed soname version once again



From tmraz at fedoraproject.org  Sun Jan 18 11:56:33 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Sun, 18 Jan 2009 11:56:33 +0000 (UTC)
Subject: rpms/socat/devel socat.spec,1.9,1.10
Message-ID: <20090118115633.7F328700E0@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/socat/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9608

Modified Files:
	socat.spec 
Log Message:
* Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> 1.6.0.1-3
- rebuild with new openssl



Index: socat.spec
===================================================================
RCS file: /cvs/pkgs/rpms/socat/devel/socat.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- socat.spec	4 Sep 2008 20:59:20 -0000	1.9
+++ socat.spec	18 Jan 2009 11:56:03 -0000	1.10
@@ -1,7 +1,7 @@
 Summary: Bidirectional data relay between two data channels ('netcat++')
 Name: socat
 Version: 1.6.0.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2
 Url:  http://www.dest-unreach.org/%{name}
 Source: http://www.dest-unreach.org/socat/download/%{name}-%{version}.tar.bz2
@@ -56,6 +56,9 @@
 %doc %{_mandir}/man1/socat.1*
 
 %changelog
+* Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> 1.6.0.1-3
+- rebuild with new openssl
+
 * Thu Sep  4 2008 Tom "spot" Callaway <tcallawa at redhat.com> 1.6.0.1-2
 - forgot to upload new source
 



From tmraz at fedoraproject.org  Sun Jan 18 11:56:56 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Sun, 18 Jan 2009 11:56:56 +0000 (UTC)
Subject: rpms/sofia-sip/devel sofia-sip.spec,1.11,1.12
Message-ID: <20090118115656.61D88700E0@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/sofia-sip/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9716

Modified Files:
	sofia-sip.spec 
Log Message:
* Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> - 1.12.10-2
- rebuild with new openssl



Index: sofia-sip.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sofia-sip/devel/sofia-sip.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sofia-sip.spec	9 Dec 2008 16:26:11 -0000	1.11
+++ sofia-sip.spec	18 Jan 2009 11:56:26 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           sofia-sip
 Version:        1.12.10
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Sofia SIP User-Agent library
 
 Group:          System Environment/Libraries
@@ -145,6 +145,9 @@
 %{_mandir}/man1/*.1*
 
 %changelog
+* Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> - 1.12.10-2
+- rebuild with new openssl
+
 * Tue Dec  9 2008 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.12.10-1
 - Update to 1.12.10
 



From tmraz at fedoraproject.org  Sun Jan 18 12:21:44 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Sun, 18 Jan 2009 12:21:44 +0000 (UTC)
Subject: rpms/socat/devel socat.spec,1.10,1.11
Message-ID: <20090118122144.B8F6E700E0@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/socat/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11814

Modified Files:
	socat.spec 
Log Message:
* Sun Jan 18 2009 Tomas Mraz <tmraz at redhat.com> 1.6.0.1-3
- disable the upstream openssl fips support



Index: socat.spec
===================================================================
RCS file: /cvs/pkgs/rpms/socat/devel/socat.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- socat.spec	18 Jan 2009 11:56:03 -0000	1.10
+++ socat.spec	18 Jan 2009 12:21:42 -0000	1.11
@@ -30,7 +30,7 @@
         --enable-listen --enable-proxy --enable-exec \
         --enable-system --enable-pty --enable-readline \
         --enable-openssl --enable-sycls --enable-filan \
-        --enable-retry --enable-libwrap
+        --enable-retry --enable-libwrap --disable-fips
 
 chmod 644 *.sh
 make %{?_smp_mflags}
@@ -56,8 +56,8 @@
 %doc %{_mandir}/man1/socat.1*
 
 %changelog
-* Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> 1.6.0.1-3
-- rebuild with new openssl
+* Sun Jan 18 2009 Tomas Mraz <tmraz at redhat.com> 1.6.0.1-3
+- disable the upstream openssl fips support
 
 * Thu Sep  4 2008 Tom "spot" Callaway <tcallawa at redhat.com> 1.6.0.1-2
 - forgot to upload new source



From tmraz at fedoraproject.org  Sun Jan 18 12:25:18 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Sun, 18 Jan 2009 12:25:18 +0000 (UTC)
Subject: rpms/spamassassin/devel spamassassin.spec,1.110,1.111
Message-ID: <20090118122518.6EC72700E0@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/spamassassin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12181

Modified Files:
	spamassassin.spec 
Log Message:
* Sun Jan 18 2009 Tomas Mraz <tmraz at redhat.com> - 3.2.5-4
- rebuild with new openssl



Index: spamassassin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/spamassassin/devel/spamassassin.spec,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -r1.110 -r1.111
--- spamassassin.spec	16 Dec 2008 05:45:33 -0000	1.110
+++ spamassassin.spec	18 Jan 2009 12:24:47 -0000	1.111
@@ -41,7 +41,7 @@
 Summary: Spam filter for email which can be invoked from mail delivery agents
 Name: spamassassin
 Version: 3.2.5
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: ASL 2.0
 Group: Applications/Internet
 URL: http://spamassassin.apache.org/
@@ -222,6 +222,9 @@
 exit 0
 
 %changelog
+* Sun Jan 18 2009 Tomas Mraz <tmraz at redhat.com> - 3.2.5-4
+- rebuild with new openssl
+
 * Mon Dec 15 2008 Kevin Fenzi <kevin at tummy.com> - 3.2.5-3
 - Update for merge review - bug 226426
 



From tmraz at fedoraproject.org  Sun Jan 18 12:25:59 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Sun, 18 Jan 2009 12:25:59 +0000 (UTC)
Subject: rpms/squid/devel squid.spec,1.112,1.113
Message-ID: <20090118122559.E05CA700E0@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/squid/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12271

Modified Files:
	squid.spec 
Log Message:
* Sun Jan 18 2009 Tomas Mraz <tmraz at redhat.com> - 7:3.0.STABLE10-4
- rebuild with new openssl



Index: squid.spec
===================================================================
RCS file: /cvs/pkgs/rpms/squid/devel/squid.spec,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -r1.112 -r1.113
--- squid.spec	19 Dec 2008 07:29:49 -0000	1.112
+++ squid.spec	18 Jan 2009 12:25:29 -0000	1.113
@@ -4,7 +4,7 @@
 
 Name:     squid
 Version:  3.0.STABLE10
-Release:  3%{?dist}
+Release:  4%{?dist}
 Summary:  The Squid proxy caching server
 Epoch:    7
 License:  GPLv2+
@@ -341,6 +341,9 @@
     chgrp squid /var/cache/samba/winbindd_privileged >/dev/null 2>&1 || :
 
 %changelog
+* Sun Jan 18 2009 Tomas Mraz <tmraz at redhat.com> - 7:3.0.STABLE10-4
+- rebuild with new openssl
+
 * Fri Dec 19 2008 Henrik Nordstrom <henrik at henriknordstrom.net> - 7:3.0.STABLE10-3
 - actually include the upstream bugfixes in the build
 



From tmraz at fedoraproject.org  Sun Jan 18 12:32:08 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Sun, 18 Jan 2009 12:32:08 +0000 (UTC)
Subject: rpms/stunnel/devel stunnel.spec,1.53,1.54
Message-ID: <20090118123208.A8361700E0@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/stunnel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12929

Modified Files:
	stunnel.spec 
Log Message:
* Sun Jan 18 2009 Tomas Mraz <tmraz at redhat.com> - 4.26-2
- rebuild with new openssl



Index: stunnel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/stunnel/devel/stunnel.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- stunnel.spec	22 Sep 2008 19:46:14 -0000	1.53
+++ stunnel.spec	18 Jan 2009 12:31:38 -0000	1.54
@@ -1,7 +1,7 @@
 Summary: An SSL-encrypting socket wrapper
 Name: stunnel
 Version: 4.26
-Release: 1
+Release: 2
 License: GPLv2
 Group: Applications/Internet
 URL: http://stunnel.mirt.net/
@@ -81,6 +81,9 @@
 %exclude %{_sysconfdir}/stunnel/*
 
 %changelog
+* Sun Jan 18 2009 Tomas Mraz <tmraz at redhat.com> - 4.26-2
+- rebuild with new openssl
+
 * Mon Sep 22 2008 Miloslav Trma?? <mitr at redhat.com> - 4.26-1
 - Update to stunnel-4.26.
 



From tmraz at fedoraproject.org  Sun Jan 18 12:33:56 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Sun, 18 Jan 2009 12:33:56 +0000 (UTC)
Subject: rpms/sylpheed/devel sylpheed.spec,1.95,1.96
Message-ID: <20090118123356.82C0C700E0@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/sylpheed/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13227

Modified Files:
	sylpheed.spec 
Log Message:
* Sun Jan 18 2009 Tomas Mraz <tmraz at redhat.com> - 2.6.0-2
- rebuild with new openssl



Index: sylpheed.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sylpheed/devel/sylpheed.spec,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -r1.95 -r1.96
--- sylpheed.spec	19 Dec 2008 09:41:03 -0000	1.95
+++ sylpheed.spec	18 Jan 2009 12:33:26 -0000	1.96
@@ -7,7 +7,7 @@
 Summary: GTK+ based, lightweight, and fast email client
 Name: sylpheed
 Version: 2.6.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 URL: http://sylpheed.sraoss.jp/
 Group: Applications/Internet
@@ -101,6 +101,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Sun Jan 18 2009 Tomas Mraz <tmraz at redhat.com> - 2.6.0-2
+- rebuild with new openssl
+
 * Fri Dec 19 2008 Michael Schwendt <mschwendt at fedoraproject.org> - 2.6.0-1
 - update to 2.6.0 final (obsoletes SOCK_NONBLOCK patch)
 



From tmraz at fedoraproject.org  Sun Jan 18 12:35:08 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Sun, 18 Jan 2009 12:35:08 +0000 (UTC)
Subject: rpms/tcltls/devel tcltls.spec,1.9,1.10
Message-ID: <20090118123508.C9821700E0@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/tcltls/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13432

Modified Files:
	tcltls.spec 
Log Message:
* Sun Jan 18 2009 Tomas Mraz <tmraz at redhat.com> - 1.6-3
- rebuild with new openssl



Index: tcltls.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tcltls/devel/tcltls.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- tcltls.spec	3 Dec 2008 14:09:45 -0000	1.9
+++ tcltls.spec	18 Jan 2009 12:34:38 -0000	1.10
@@ -3,7 +3,7 @@
 
 Name:           tcltls
 Version:        1.6
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        OpenSSL extension for Tcl
 
 Group:          Development/Libraries
@@ -59,6 +59,9 @@
 %{_includedir}/tls.h
 
 %changelog
+* Sun Jan 18 2009 Tomas Mraz <tmraz at redhat.com> - 1.6-3
+- rebuild with new openssl
+
 * Thu Dec 03 2008 Sander Hoentjen <sander at hoentjen.eu> - 1.6-2
 - Add requires on tcl
 



From tmraz at fedoraproject.org  Sun Jan 18 13:07:03 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Sun, 18 Jan 2009 13:07:03 +0000 (UTC)
Subject: rpms/stunnel/devel stunnel.spec,1.54,1.55
Message-ID: <20090118130703.629EF700E0@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/stunnel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16348

Modified Files:
	stunnel.spec 
Log Message:
* Sun Jan 18 2009 Tomas Mraz <tmraz at redhat.com> - 4.26-2
- disable openssl upstream fips mode



Index: stunnel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/stunnel/devel/stunnel.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- stunnel.spec	18 Jan 2009 12:31:38 -0000	1.54
+++ stunnel.spec	18 Jan 2009 13:06:30 -0000	1.55
@@ -39,7 +39,7 @@
 	CFLAGS="$CFLAGS `pkg-config --cflags openssl`";
 	LDFLAGS="`pkg-config --libs-only-L openssl`"; export LDFLAGS
 fi
-%configure --enable-ipv6 \
+%configure --disable-fips --enable-ipv6 \
 	CPPFLAGS="-UPIDFILE -DPIDFILE='\"%{_localstatedir}/run/stunnel.pid\"'"
 make LDADD="-pie -Wl,-z,defs,-z,relro"
 
@@ -82,7 +82,7 @@
 
 %changelog
 * Sun Jan 18 2009 Tomas Mraz <tmraz at redhat.com> - 4.26-2
-- rebuild with new openssl
+- disable openssl upstream fips mode
 
 * Mon Sep 22 2008 Miloslav Trma?? <mitr at redhat.com> - 4.26-1
 - Update to stunnel-4.26.



From tmraz at fedoraproject.org  Sun Jan 18 13:08:35 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Sun, 18 Jan 2009 13:08:35 +0000 (UTC)
Subject: rpms/telepathy-idle/devel telepathy-idle.spec,1.7,1.8
Message-ID: <20090118130835.26855700E0@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/telepathy-idle/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16526

Modified Files:
	telepathy-idle.spec 
Log Message:
* Sun Jan 18 2009 Tomas Mraz <tmraz at redhat.com> - 0.1.2-4
- rebuild with new openssl



Index: telepathy-idle.spec
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-idle/devel/telepathy-idle.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- telepathy-idle.spec	9 Feb 2008 00:29:51 -0000	1.7
+++ telepathy-idle.spec	18 Jan 2009 13:08:04 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           telepathy-idle
 Version:        0.1.2
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        IRC connection manager for Telepathy
 
 Group:          Applications/Communications
@@ -54,6 +54,9 @@
 
 
 %changelog
+* Sun Jan 18 2009 Tomas Mraz <tmraz at redhat.com> - 0.1.2-4
+- rebuild with new openssl
+
 * Fri Feb  8 2008 Brian Pepple <bpepple at fedoraproject.org> - 0.1.2-3
 - Rebuild for gcc-4.3.
 



From tmraz at fedoraproject.org  Sun Jan 18 13:09:21 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Sun, 18 Jan 2009 13:09:21 +0000 (UTC)
Subject: rpms/telepathy-salut/devel telepathy-salut.spec,1.23,1.24
Message-ID: <20090118130921.4C643700E0@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/telepathy-salut/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16711

Modified Files:
	telepathy-salut.spec 
Log Message:
* Sun Jan 18 2009 Tomas Mraz <tmraz at redhat.com> - 0.3.7-2
- rebuild with new openssl



Index: telepathy-salut.spec
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-salut/devel/telepathy-salut.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- telepathy-salut.spec	5 Jan 2009 17:06:14 -0000	1.23
+++ telepathy-salut.spec	18 Jan 2009 13:08:51 -0000	1.24
@@ -1,6 +1,6 @@
 Name:           telepathy-salut
 Version:        0.3.7
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Link-local XMPP telepathy connection manager
 
 Group:          Applications/Communications
@@ -59,6 +59,9 @@
 %{_mandir}/man8/%{name}.8.gz
 
 %changelog
+* Sun Jan 18 2009 Tomas Mraz <tmraz at redhat.com> - 0.3.7-2
+- rebuild with new openssl
+
 * Mon Jan  5 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.3.7-1
 - Update to 0.3.7.
 - Change BR to libsoup-devel, since they support it now.



From cwickert at fedoraproject.org  Sun Jan 18 13:11:08 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Sun, 18 Jan 2009 13:11:08 +0000 (UTC)
Subject: rpms/xfce4-screenshooter/devel .cvsignore, 1.2, 1.3 sources, 1.2,
	1.3 xfce4-screenshooter.spec, 1.2, 1.3
Message-ID: <20090118131108.65343700E0@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/xfce4-screenshooter/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16963

Modified Files:
	.cvsignore sources xfce4-screenshooter.spec 
Log Message:
* Sun Jan 18 2009 Christoph Wickert <cwickert at fedoraproject.org> - 1.5.0-1
- Update to 1.5.0 on Xfce 4.5.93.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-screenshooter/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	4 Jan 2009 22:34:39 -0000	1.2
+++ .cvsignore	18 Jan 2009 13:10:37 -0000	1.3
@@ -1 +1 @@
-xfce4-screenshooter-1.4.90.0.tar.gz
+xfce4-screenshooter-1.5.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-screenshooter/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	4 Jan 2009 22:34:39 -0000	1.2
+++ sources	18 Jan 2009 13:10:38 -0000	1.3
@@ -1 +1 @@
-1bcd5d2e7428c7ced039be87dfa30d74  xfce4-screenshooter-1.4.90.0.tar.gz
+128b1385fee7f4c15bbc7bfa46b1d6d0  xfce4-screenshooter-1.5.0.tar.gz


Index: xfce4-screenshooter.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-screenshooter/devel/xfce4-screenshooter.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xfce4-screenshooter.spec	4 Jan 2009 22:45:40 -0000	1.2
+++ xfce4-screenshooter.spec	18 Jan 2009 13:10:38 -0000	1.3
@@ -3,7 +3,7 @@
 # https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=179202
 
 Name:           xfce4-screenshooter
-Version:        1.4.90.0
+Version:        1.5.0
 Release:        1%{?dist}
 Summary:        Screenshot utility for the Xfce desktop
 
@@ -92,6 +92,9 @@
 
 
 %changelog
+* Sun Jan 18 2009 Christoph Wickert <cwickert at fedoraproject.org> - 1.5.0-1
+- Update to 1.5.0 on Xfce 4.5.93.
+
 * Fri Jan 02 2009 Christoph Wickert <cwickert at fedoraproject.org> - 1.4.90.0-1
 - Update to 1.4.90.0
 - Split package into standalone app and panel plugin



From tmraz at fedoraproject.org  Sun Jan 18 13:23:56 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Sun, 18 Jan 2009 13:23:56 +0000 (UTC)
Subject: rpms/tightvnc/devel tightvnc.spec,1.4,1.5
Message-ID: <20090118132356.98C02700E0@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/tightvnc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18313

Modified Files:
	tightvnc.spec 
Log Message:
* Sun Jan 18 2009 Tomas Mraz <tmraz at redhat.com> 1.5.0-0.10.20081120svn3200
- rebuild with new openssl



Index: tightvnc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tightvnc/devel/tightvnc.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- tightvnc.spec	20 Nov 2008 15:00:45 -0000	1.4
+++ tightvnc.spec	18 Jan 2009 13:23:26 -0000	1.5
@@ -4,7 +4,7 @@
 
 Name:		tightvnc
 Version:	1.5.0
-Release:	0.9.%{releasetag}%{?dist}
+Release:	0.10.%{releasetag}%{?dist}
 Summary:	A TightVNC remote display system
 
 Group:		User Interface/Desktops
@@ -238,6 +238,9 @@
 %{_libdir}/xorg/modules/extensions/libvnc.so
 
 %changelog
+* Sun Jan 18 2009 Tomas Mraz <tmraz at redhat.com> 1.5.0-0.10.20081120svn3200
+- rebuild with new openssl
+
 * Thu Nov 20 2008 Adam Tkac <atkac redhat com> 1.5.0-0.9.20081120svn3200
 - updated to r3200 (IPv6 support in viewer + some additional fixes)
 - fix building with new libtool



From tmraz at fedoraproject.org  Sun Jan 18 13:24:32 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Sun, 18 Jan 2009 13:24:32 +0000 (UTC)
Subject: rpms/tinyfugue/devel tinyfugue.spec,1.9,1.10
Message-ID: <20090118132432.7061E700E0@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/tinyfugue/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18379

Modified Files:
	tinyfugue.spec 
Log Message:
* Sun Jan 18 2009 Tomas Mraz <tmraz at redhat.com> - 5.0-0.10.b8
- rebuild with new openssl



Index: tinyfugue.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tinyfugue/devel/tinyfugue.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- tinyfugue.spec	8 Sep 2008 21:13:10 -0000	1.9
+++ tinyfugue.spec	18 Jan 2009 13:24:02 -0000	1.10
@@ -2,7 +2,7 @@
 
 Name:    tinyfugue
 Version: 5.0
-Release: 0.9.b8%{?dist}
+Release: 0.10.b8%{?dist}
 Summary: A MU* client
 
 Group:   Applications/Internet
@@ -47,6 +47,9 @@
 %{_mandir}/man1/tf.1*
 
 %changelog
+* Sun Jan 18 2009 Tomas Mraz <tmraz at redhat.com> - 5.0-0.10.b8
+- rebuild with new openssl
+
 * Mon Sep  8 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 5.0-0.9.b8
 - fix license tag
 



From tmraz at fedoraproject.org  Sun Jan 18 13:25:34 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Sun, 18 Jan 2009 13:25:34 +0000 (UTC)
Subject: rpms/tn5250/devel tn5250.spec,1.34,1.35
Message-ID: <20090118132534.58D21700E0@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/tn5250/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18597

Modified Files:
	tn5250.spec 
Log Message:
* Sun Jan 18 2009 Tomas Mraz <tmraz at redhat.com> - 0.17.3-20
- rebuild with new openssl



Index: tn5250.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tn5250/devel/tn5250.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- tn5250.spec	19 Feb 2008 10:00:55 -0000	1.34
+++ tn5250.spec	18 Jan 2009 13:25:03 -0000	1.35
@@ -1,7 +1,7 @@
 Summary:   5250 Telnet protocol and Terminal
 Name:      tn5250
 Version:   0.17.3
-Release:   19%{?dist}
+Release:   20%{?dist}
 License:   LGPLv2+
 Group:     Applications/Internet
 Source:    http://prdownloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
@@ -106,6 +106,9 @@
 %{_bindir}/tn5250-config
 
 %changelog
+* Sun Jan 18 2009 Tomas Mraz <tmraz at redhat.com> - 0.17.3-20
+- rebuild with new openssl
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.17.3-19
 - Autorebuild for GCC 4.3
 



From ricky at fedoraproject.org  Sun Jan 18 13:43:33 2009
From: ricky at fedoraproject.org (=?utf-8?b?Umlja3kgWmhvdSAo5ZGo5a625p2wKQ==?=)
Date: Sun, 18 Jan 2009 13:43:33 +0000 (UTC)
Subject: rpms/supybot/EL-4 supybot.spec,1.2,1.3
Message-ID: <20090118134333.A0C73700E0@cvs1.fedora.phx.redhat.com>

Author: ricky

Update of /cvs/pkgs/rpms/supybot/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19656/EL-4

Modified Files:
	supybot.spec 
Log Message:
Remove python-twisted-core and python-twisted-names in EL-4.



Index: supybot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/supybot/EL-4/supybot.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- supybot.spec	5 Jun 2008 23:30:13 -0000	1.2
+++ supybot.spec	18 Jan 2009 13:43:02 -0000	1.3
@@ -3,7 +3,7 @@
 
 Name:           supybot
 Version:        0.83.3
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Cross-platform IRC bot written in Python
 
 Group:          Applications/Internet
@@ -23,8 +23,9 @@
 %else
 BuildRequires:  python-setuptools
 %endif
-Requires:       python-twisted-core
-Requires:       python-twisted-names
+# EL-4 doesn't have these packages, which are only required for SSL support.
+#Requires:       python-twisted-core
+#Requires:       python-twisted-names
 Requires:       python-dateutil
 Requires:       python-feedparser
 Requires:       python-dictclient
@@ -96,6 +97,9 @@
 
 
 %changelog
+* Sun Jan 18 2009 Ricky Zhou <ricky at fedoraproject.org> - 0.83.3-8
+- Remove python-twisted-core and python-twisted-names in EL-4.
+
 * Thu Jun 05 2008 Ricky Zhou <ricky at fedoraproject.org> - 0.83.3-7
 - Uncomment python-dictclient requirement.
 



From tmraz at fedoraproject.org  Sun Jan 18 13:43:45 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Sun, 18 Jan 2009 13:43:45 +0000 (UTC)
Subject: rpms/tog-pegasus/devel tog-pegasus.spec,1.64,1.65
Message-ID: <20090118134345.7DACA700E0@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/tog-pegasus/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19701

Modified Files:
	tog-pegasus.spec 
Log Message:
* Sun Jan 18 2009 Tomas Mraz <tmraz at redhat.com> - 2:2.7.2-3
- rebuild with new openssl



Index: tog-pegasus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tog-pegasus/devel/tog-pegasus.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- tog-pegasus.spec	11 Nov 2008 13:39:19 -0000	1.64
+++ tog-pegasus.spec	18 Jan 2009 13:43:15 -0000	1.65
@@ -43,7 +43,7 @@
 %define _default_patch_fuzz 2
 
 Version: 		2.7.2
-Release: 		2%{?dist}
+Release: 		3%{?dist}
 Epoch:   		2
 #
 Summary:   		OpenPegasus WBEM Services for Linux
@@ -442,6 +442,9 @@
 
 
 %changelog
+* Sun Jan 18 2009 Tomas Mraz <tmraz at redhat.com> - 2:2.7.2-3
+- rebuild with new openssl
+
 * Tue Nov 11 2008 Vitezslav Crhonek <vcrhonek at redhat.com> - 2:2.7.2-2
 - Fix local or remote auth patch to work correctly with new code base
   Related: #459217



From tmraz at fedoraproject.org  Sun Jan 18 13:44:08 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Sun, 18 Jan 2009 13:44:08 +0000 (UTC)
Subject: rpms/tomcat-native/devel tomcat-native.spec,1.12,1.13
Message-ID: <20090118134408.403FA700E0@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/tomcat-native/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19772

Modified Files:
	tomcat-native.spec 
Log Message:
* Sun Jan 18 2009 Tomas Mraz <tmraz at redhat.com> - 1.1.16-2
- rebuild with new openssl



Index: tomcat-native.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tomcat-native/devel/tomcat-native.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- tomcat-native.spec	20 Nov 2008 17:51:26 -0000	1.12
+++ tomcat-native.spec	18 Jan 2009 13:43:37 -0000	1.13
@@ -1,6 +1,6 @@
 Name:           tomcat-native
 Version:        1.1.16
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Tomcat native library
 
 Group:          System Environment/Libraries
@@ -66,6 +66,9 @@
 
 
 %changelog
+* Sun Jan 18 2009 Tomas Mraz <tmraz at redhat.com> - 1.1.16-2
+- rebuild with new openssl
+
 * Thu Nov 20 2008 Ville Skytt?? <ville.skytta at iki.fi> - 1.1.16-1
 - 1.1.16.
 



From tmraz at fedoraproject.org  Sun Jan 18 13:45:10 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Sun, 18 Jan 2009 13:45:10 +0000 (UTC)
Subject: rpms/tor/devel tor.spec,1.25,1.26
Message-ID: <20090118134510.CBCF1700E0@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/tor/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20083

Modified Files:
	tor.spec 
Log Message:
* Sun Jan 18 2009 Tomas Mraz <tmraz at redhat.com> - 0.2.0.32-2
- rebuild with new openssl



Index: tor.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tor/devel/tor.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- tor.spec	7 Dec 2008 10:59:39 -0000	1.25
+++ tor.spec	18 Jan 2009 13:44:40 -0000	1.26
@@ -11,7 +11,7 @@
 
 Name:		tor
 Version:	0.2.0.32
-Release:	%release_func 1
+Release:	%release_func 2
 Group:		System Environment/Daemons
 License:	BSD
 Summary:	Anonymizing overlay network for TCP (The onion router)
@@ -198,6 +198,9 @@
 
 
 %changelog
+* Sun Jan 18 2009 Tomas Mraz <tmraz at redhat.com> - 0.2.0.32-2
+- rebuild with new openssl
+
 * Sun Dec  7 2008 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.2.0.32-1
 - updated to 0.2.0.32
 - removed -setgroups patch; supplementary groups are now set upstream



From tmraz at fedoraproject.org  Sun Jan 18 13:59:54 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Sun, 18 Jan 2009 13:59:54 +0000 (UTC)
Subject: rpms/tpm-tools/devel tpm-tools.spec,1.2,1.3
Message-ID: <20090118135954.D8811700E0@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/tpm-tools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22168

Modified Files:
	tpm-tools.spec 
Log Message:
* Sun Jan 18 2009 Tomas Mraz <tmraz at redhat.com> - 1.3.1-6
- rebuild with new openssl



Index: tpm-tools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tpm-tools/devel/tpm-tools.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- tpm-tools.spec	19 Feb 2008 10:15:55 -0000	1.2
+++ tpm-tools.spec	18 Jan 2009 13:59:23 -0000	1.3
@@ -1,7 +1,7 @@
 
 %define name            tpm-tools
 %define version         1.3.1
-%define release         5
+%define release         6
 
 Name:             %{name}
 Summary:          Management tools for the TPM hardware
@@ -68,6 +68,9 @@
 %{_mandir}/man3/tpmUnseal*
 
 %changelog
+* Sun Jan 18 2009 Tomas Mraz <tmraz at redhat.com> - 1.3.1-6
+- rebuild with new openssl
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1.3.1-5
 - Autorebuild for GCC 4.3
 



From tmraz at fedoraproject.org  Sun Jan 18 14:00:46 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Sun, 18 Jan 2009 14:00:46 +0000 (UTC)
Subject: rpms/tqsllib/devel tqsllib.spec,1.2,1.3
Message-ID: <20090118140046.A6F9B700E0@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/tqsllib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22379

Modified Files:
	tqsllib.spec 
Log Message:
* Sun Jan 18 2009 Tomas Mraz <tmraz at redhat.com> - 2.0-6
- rebuild with new openssl



Index: tqsllib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tqsllib/devel/tqsllib.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- tqsllib.spec	12 Jan 2009 13:05:08 -0000	1.2
+++ tqsllib.spec	18 Jan 2009 14:00:16 -0000	1.3
@@ -1,6 +1,6 @@
 Name: tqsllib
 Version: 2.0
-Release: 5%{?dist}
+Release: 6%{?dist}
 Summary: The TrustedQSL library
 Group: Development/Libraries
 License: BSD
@@ -79,6 +79,9 @@
 %postun -p /sbin/ldconfig
 
 %changelog
+* Sun Jan 18 2009 Tomas Mraz <tmraz at redhat.com> - 2.0-6
+- rebuild with new openssl
+
 * Mon Jan 12 2009 Lucian Langa <cooly at gnome.eu.org> - 2.0-5
 - modify patch0 to include fix for #479650 (CVE-2008-5077 related)
 



From tmraz at fedoraproject.org  Sun Jan 18 14:17:44 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Sun, 18 Jan 2009 14:17:44 +0000 (UTC)
Subject: rpms/transmission/devel transmission.spec,1.29,1.30
Message-ID: <20090118141745.32CBD700F7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/transmission/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23634

Modified Files:
	transmission.spec 
Log Message:
* Sun Jan 18 2009 Tomas Mraz <tmraz at redhat.com> - 1.42-2
- rebuild with new openssl



Index: transmission.spec
===================================================================
RCS file: /cvs/pkgs/rpms/transmission/devel/transmission.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- transmission.spec	31 Dec 2008 18:19:20 -0000	1.29
+++ transmission.spec	18 Jan 2009 14:17:12 -0000	1.30
@@ -1,7 +1,7 @@
 
 Name:           transmission
 Version:        1.42
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A lightweight GTK+ BitTorrent client
 
 Group:          Applications/Internet
@@ -76,6 +76,9 @@
 
 
 %changelog
+* Sun Jan 18 2009 Tomas Mraz <tmraz at redhat.com> - 1.42-2
+- rebuild with new openssl
+
 * Wed Dec 31 2008 Brian Pepple <bpepple at fedoraproject.org> - 1.42-1
 - Update to 1.42.
 - Update event patch to 1.42.



From tmraz at fedoraproject.org  Sun Jan 18 14:18:09 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Sun, 18 Jan 2009 14:18:09 +0000 (UTC)
Subject: rpms/tripwire/devel tripwire.spec,1.16,1.17
Message-ID: <20090118141809.BEB30700F7@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/tripwire/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23775

Modified Files:
	tripwire.spec 
Log Message:
* Sun Jan 18 2009 Tomas Mraz <tmraz at redhat.com> - 2.4.1.2-7
- rebuild with new openssl



Index: tripwire.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tripwire/devel/tripwire.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- tripwire.spec	8 Sep 2008 21:49:08 -0000	1.16
+++ tripwire.spec	18 Jan 2009 14:17:39 -0000	1.17
@@ -3,7 +3,7 @@
 
 Name:		tripwire
 Version:	2.4.1.2
-Release:	6%{?dist}
+Release:	7%{?dist}
 Summary:	IDS (Intrusion Detection System)
 
 License:	GPLv2+
@@ -146,6 +146,9 @@
 
 
 %changelog
+* Sun Jan 18 2009 Tomas Mraz <tmraz at redhat.com> - 2.4.1.2-7
+- rebuild with new openssl
+
 * Mon Sep  8 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 2.4.1.2-6
 - fix license tag
 



From tmraz at fedoraproject.org  Sun Jan 18 14:18:32 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Sun, 18 Jan 2009 14:18:32 +0000 (UTC)
Subject: rpms/trousers/devel trousers.spec,1.11,1.12
Message-ID: <20090118141832.66095700E0@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/trousers/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23959

Modified Files:
	trousers.spec 
Log Message:
* Sun Jan 18 2009 Tomas Mraz <tmraz at redhat.com> - 0.3.1-13
- rebuild with new openssl



Index: trousers.spec
===================================================================
RCS file: /cvs/pkgs/rpms/trousers/devel/trousers.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- trousers.spec	16 Dec 2008 23:29:59 -0000	1.11
+++ trousers.spec	18 Jan 2009 14:18:02 -0000	1.12
@@ -3,7 +3,7 @@
 
 %define name		trousers
 %define version		0.3.1
-%define release		12
+%define release		13
 
 Name:			%{name}
 Summary:		TCG's Software Stack v1.2 
@@ -131,6 +131,9 @@
 %{_libdir}/libtddl.a
 
 %changelog
+* Sun Jan 18 2009 Tomas Mraz <tmraz at redhat.com> - 0.3.1-13
+- rebuild with new openssl
+
 * Tue Dec 16 2008 David Woodhouse <David.Woodhouse at intel.com> - 0.3.1-12
 - Bump release to avoid wrong tag in rawhide
 



From tmraz at fedoraproject.org  Sun Jan 18 14:51:45 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Sun, 18 Jan 2009 14:51:45 +0000 (UTC)
Subject: rpms/up-imapproxy/devel up-imapproxy.spec,1.13,1.14
Message-ID: <20090118145145.EF849700E0@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/up-imapproxy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27511

Modified Files:
	up-imapproxy.spec 
Log Message:
* Sun Jan 18 2009 Tomas Mraz <tmraz at redhat.com> 1.2.7-0.2.rc1
- rebuild with new openssl



Index: up-imapproxy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/up-imapproxy/devel/up-imapproxy.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- up-imapproxy.spec	23 Oct 2008 14:17:48 -0000	1.13
+++ up-imapproxy.spec	18 Jan 2009 14:51:14 -0000	1.14
@@ -1,7 +1,7 @@
 Name:           up-imapproxy
 Summary:        University of Pittsburgh IMAP Proxy
 Version:        1.2.7
-Release:        0.1.rc1%{?dist}
+Release:        0.2.rc1%{?dist}
 License:        GPLv2+
 Group:          System Environment/Daemons
 URL:            http://www.imapproxy.org
@@ -76,6 +76,9 @@
 %{_sbindir}/*
 
 %changelog
+* Sun Jan 18 2009 Tomas Mraz <tmraz at redhat.com> 1.2.7-0.2.rc1
+- rebuild with new openssl
+
 * Thu Oct 23 2008 Rakesh Pandit <rakesh at fedoraproject.org> 1.2.7-0.1.rc1
 - fixed version and release fields (acc. to guidelines)
 



From tmraz at fedoraproject.org  Sun Jan 18 14:52:23 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Sun, 18 Jan 2009 14:52:23 +0000 (UTC)
Subject: rpms/uw-imap/devel uw-imap.spec,1.57,1.58
Message-ID: <20090118145223.B0BA6700E0@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/uw-imap/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27575

Modified Files:
	uw-imap.spec 
Log Message:
* Sun Jan 18 2009 Tomas Mraz <tmraz at redhat.com> 2007e-4
- rebuild with new openssl



Index: uw-imap.spec
===================================================================
RCS file: /cvs/pkgs/rpms/uw-imap/devel/uw-imap.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- uw-imap.spec	12 Jan 2009 20:46:22 -0000	1.57
+++ uw-imap.spec	18 Jan 2009 14:51:53 -0000	1.58
@@ -14,7 +14,7 @@
 Summary: UW Server daemons for IMAP and POP network mail protocols
 Name:	 uw-imap 
 Version: 2007e
-Release: 3%{?dist}
+Release: 4%{?dist}
 
 # See LICENSE.txt, http://www.apache.org/licenses/LICENSE-2.0
 License: ASL 2.0 
@@ -312,6 +312,9 @@
 
 
 %changelog
+* Sun Jan 18 2009 Tomas Mraz <tmraz at redhat.com> 2007e-4
+- rebuild with new openssl
+
 * Mon Jan 12 2009 Rex Dieter <rdieter at fedoraproject.org> 2007e-3
 - main/-utils: +Req: %%imap_libs = %%version-%%release
 



From tmraz at fedoraproject.org  Sun Jan 18 14:53:00 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Sun, 18 Jan 2009 14:53:00 +0000 (UTC)
Subject: rpms/unbound/devel unbound.spec,1.18,1.19
Message-ID: <20090118145300.D1949700E0@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/unbound/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27701

Modified Files:
	unbound.spec 
Log Message:
* Sun Jan 18 2009 Tomas Mraz <tmraz at redhat.com> - 1.2.0-2
- rebuild with new openssl



Index: unbound.spec
===================================================================
RCS file: /cvs/pkgs/rpms/unbound/devel/unbound.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- unbound.spec	14 Jan 2009 15:44:12 -0000	1.18
+++ unbound.spec	18 Jan 2009 14:52:30 -0000	1.19
@@ -1,7 +1,7 @@
 Summary: Validating, recursive, and caching DNS(SEC) resolver
 Name: unbound
 Version: 1.2.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: BSD
 Url: http://www.nlnetlabs.nl/unbound/
 Source: http://www.unbound.net/downloads/%{name}-%{version}.tar.gz
@@ -145,6 +145,9 @@
 %postun libs -p /sbin/ldconfig
 
 %changelog
+* Sun Jan 18 2009 Tomas Mraz <tmraz at redhat.com> - 1.2.0-2
+- rebuild with new openssl
+
 * Wed Jan 14 2009 Paul Wouters <paul at xelerance.com - 1.2.0-1
 - Updated to 1.2.0
 - Added dependancy on minimum SSL for CVE-2008-5077



From tmraz at fedoraproject.org  Sun Jan 18 15:04:27 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Sun, 18 Jan 2009 15:04:27 +0000 (UTC)
Subject: rpms/vnc/devel vnc.spec,1.203,1.204
Message-ID: <20090118150427.DBED7700E0@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/vnc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28716

Modified Files:
	vnc.spec 
Log Message:
* Sun Jan 18 2009 Tomas Mraz <tmraz at redhat.com> 4.1.2-36
- rebuild with new openssl



Index: vnc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vnc/devel/vnc.spec,v
retrieving revision 1.203
retrieving revision 1.204
diff -u -r1.203 -r1.204
--- vnc.spec	3 Oct 2008 12:51:55 -0000	1.203
+++ vnc.spec	18 Jan 2009 15:03:56 -0000	1.204
@@ -3,7 +3,7 @@
 Summary:   A remote display system
 Name:      vnc
 Version:   4.1.2
-Release:   35%{?dist}
+Release:   36%{?dist}
 URL:       http://www.realvnc.com
 Source0:   http://www.realvnc.com/dist/vnc-%{vnc_version}-unixsrc.tar.gz
 Source1:   Makefile.am
@@ -332,6 +332,9 @@
 %{_libdir}/librfb.so.*
 
 %changelog
+* Sun Jan 18 2009 Tomas Mraz <tmraz at redhat.com> 4.1.2-36
+- rebuild with new openssl
+
 * Fri Oct 03 2008 Adam Tkac <atkac redhat com> 4.1.2-35
 - updated patches due rpm 4.6 (#465099)
 - build with -O2



From tmraz at fedoraproject.org  Sun Jan 18 15:05:14 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Sun, 18 Jan 2009 15:05:14 +0000 (UTC)
Subject: rpms/valknut/devel valknut.spec,1.14,1.15
Message-ID: <20090118150514.25059700E0@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/valknut/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28861

Modified Files:
	valknut.spec 
Log Message:
* Sun Jan 18 2009 Tomas Mraz <tmraz at redhat.com> 0.3.11-5
- rebuild with new openssl



Index: valknut.spec
===================================================================
RCS file: /cvs/pkgs/rpms/valknut/devel/valknut.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- valknut.spec	4 Apr 2008 18:06:12 -0000	1.14
+++ valknut.spec	18 Jan 2009 15:04:43 -0000	1.15
@@ -1,6 +1,6 @@
 Name:           valknut
 Version:        0.3.11
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Valknut is a QT Direct Connect client
 
 Group:          Applications/Internet
@@ -57,6 +57,9 @@
 
 
 %changelog
+* Sun Jan 18 2009 Tomas Mraz <tmraz at redhat.com> 0.3.11-5
+- rebuild with new openssl
+
 * Fri Apr 04 2008 Luke Macken <lmacken at redhat.com> 0.3.11-4
 - Add qt3-devel to BuildRequires to fix build issue (#440837)
 



From tmz at fedoraproject.org  Sun Jan 18 15:06:09 2009
From: tmz at fedoraproject.org (Todd M. Zullinger)
Date: Sun, 18 Jan 2009 15:06:09 +0000 (UTC)
Subject: rpms/cgit/devel cgit.spec,1.1,1.2
Message-ID: <20090118150609.81353700E0@cvs1.fedora.phx.redhat.com>

Author: tmz

Update of /cvs/pkgs/rpms/cgit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29121

Modified Files:
	cgit.spec 
Log Message:
Rebuild with new openssl


Index: cgit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cgit/devel/cgit.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cgit.spec	13 Jan 2009 21:48:56 -0000	1.1
+++ cgit.spec	18 Jan 2009 15:05:39 -0000	1.2
@@ -17,7 +17,7 @@
 
 Name:           cgit
 Version:        0.8.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A fast webinterface for git
 
 Group:          Development/Tools
@@ -84,5 +84,8 @@
 
 
 %changelog
+* Sun Jan 18 2009 Todd Zullinger <tmz at pobox.com> - 0.8.1-2
+- Rebuild with new openssl
+
 * Mon Jan 12 2009 Todd Zullinger <tmz at pobox.com> - 0.8.1-1
 - Initial package



From tmraz at fedoraproject.org  Sun Jan 18 15:06:35 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Sun, 18 Jan 2009 15:06:35 +0000 (UTC)
Subject: rpms/vtun/devel vtun.spec,1.1,1.2
Message-ID: <20090118150635.A0465700E0@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/vtun/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29165

Modified Files:
	vtun.spec 
Log Message:
* Sun Jan 18 2009 Tomas Mraz <tmraz at redhat.com> 3.0.1-4
- rebuild with new openssl



Index: vtun.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vtun/devel/vtun.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- vtun.spec	19 Nov 2008 14:45:37 -0000	1.1
+++ vtun.spec	18 Jan 2009 15:06:05 -0000	1.2
@@ -1,6 +1,6 @@
 Name: vtun
 Version: 3.0.1
-Release: 3%{?dist}
+Release: 4%{?dist}
 Summary: Virtual tunnel over TCP/IP networks
 License: GPLv2+
 Group: System Environment/Daemons
@@ -71,6 +71,9 @@
 %{_mandir}/man8/vtund.8*
 
 %changelog
+* Sun Jan 18 2009 Tomas Mraz <tmraz at redhat.com> 3.0.1-4
+- rebuild with new openssl
+
 * Mon Nov 17 2008 Gabriel Somlo <somlo at cmu.edu> 3.0.1-3
 - scriptlets fixes
 * Fri Nov 14 2008 Gabriel Somlo <somlo at cmu.edu> 3.0.1-2



From tmraz at fedoraproject.org  Sun Jan 18 15:15:49 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Sun, 18 Jan 2009 15:15:49 +0000 (UTC)
Subject: rpms/w3m/devel w3m.spec,1.53,1.54
Message-ID: <20090118151549.1340D700E0@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/w3m/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29971

Modified Files:
	w3m.spec 
Log Message:
* Sun Jan 18 2009 Tomas Mraz <tmraz at redhat.com> - 0.5.2-12
- rebuild with new openssl



Index: w3m.spec
===================================================================
RCS file: /cvs/pkgs/rpms/w3m/devel/w3m.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- w3m.spec	18 Jul 2008 03:07:58 -0000	1.53
+++ w3m.spec	18 Jan 2009 15:15:17 -0000	1.54
@@ -5,7 +5,7 @@
 
 Name:     w3m
 Version:  0.5.2
-Release:  11%{?dist}
+Release:  12%{?dist}
 License:  MIT
 URL:      http://w3m.sourceforge.net/
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -140,6 +140,9 @@
 %{_libexecdir}/w3m/w3mimgdisplay
 
 %changelog
+* Sun Jan 18 2009 Tomas Mraz <tmraz at redhat.com> - 0.5.2-12
+- rebuild with new openssl
+
 * Fri Jul 18 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.5.2-11
 - Add BR: lynx which provides "text-www-browser" virtual Provides
   to avoid BR dependency loop between gtk2-devel and w3m (shorter name wins



From tmraz at fedoraproject.org  Sun Jan 18 15:16:21 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Sun, 18 Jan 2009 15:16:21 +0000 (UTC)
Subject: rpms/w3c-libwww/devel w3c-libwww.spec,1.12,1.13
Message-ID: <20090118151621.6D1AE700E0@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/w3c-libwww/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30024

Modified Files:
	w3c-libwww.spec 
Log Message:
* Sun Jan 18 2009 Tomas Mraz <tmraz at redhat.com> - 5.4.1-0.14.20060206cvs
- rebuild with new openssl



Index: w3c-libwww.spec
===================================================================
RCS file: /cvs/pkgs/rpms/w3c-libwww/devel/w3c-libwww.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- w3c-libwww.spec	26 Dec 2008 17:43:07 -0000	1.12
+++ w3c-libwww.spec	18 Jan 2009 15:15:51 -0000	1.13
@@ -1,6 +1,6 @@
 Name:          w3c-libwww
 Version:       5.4.1
-Release:       0.13.20060206cvs%{?dist}
+Release:       0.14.20060206cvs%{?dist}
 Summary:       HTTP library of common code
 
 Group:         System Environment/Libraries
@@ -132,6 +132,9 @@
 %{_includedir}/w3c-libwww
 
 %changelog
+* Sun Jan 18 2009 Tomas Mraz <tmraz at redhat.com> - 5.4.1-0.14.20060206cvs
+- rebuild with new openssl
+
 * Fri Dec 26 2008 Debarshi Ray <rishi at fedoraproject.org> - 5.4.1-0.13.20060206cvs
 - Fixed linkage problems to reduce the number of undefined non-weak symbols.
 



From tmraz at fedoraproject.org  Sun Jan 18 15:17:43 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Sun, 18 Jan 2009 15:17:43 +0000 (UTC)
Subject: rpms/wget/devel wget.spec,1.67,1.68
Message-ID: <20090118151743.BF212700E0@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/wget/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30359

Modified Files:
	wget.spec 
Log Message:
* Sun Jan 18 2009 Tomas Mraz <tmraz at redhat.com> 1.11.4-2
- rebuild with new openssl



Index: wget.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wget/devel/wget.spec,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- wget.spec	13 Aug 2008 12:46:12 -0000	1.67
+++ wget.spec	18 Jan 2009 15:17:13 -0000	1.68
@@ -1,7 +1,7 @@
 Summary: A utility for retrieving files using the HTTP or FTP protocols
 Name: wget
 Version: 1.11.4
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv3+
 Group: Applications/Internet
 Url: http://wget.sunsite.dk/
@@ -68,6 +68,9 @@
 %{_infodir}/*
 
 %changelog
+* Sun Jan 18 2009 Tomas Mraz <tmraz at redhat.com> 1.11.4-2
+- rebuild with new openssl
+
 * Wed Aug 13 2008 Karsten Hopp <karsten at redhat.com> 1.11.4-1
 - update
 



From tmraz at fedoraproject.org  Sun Jan 18 15:30:44 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Sun, 18 Jan 2009 15:30:44 +0000 (UTC)
Subject: rpms/wireshark/devel wireshark.spec,1.44,1.45
Message-ID: <20090118153044.BE268700E0@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/wireshark/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32058

Modified Files:
	wireshark.spec 
Log Message:
* Sun Jan 18 2009 Tomas Mraz <tmraz at redhat.com> - 1.1.1-0.pre1.2
- rebuild with new openssl



Index: wireshark.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wireshark/devel/wireshark.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- wireshark.spec	29 Nov 2008 17:35:11 -0000	1.44
+++ wireshark.spec	18 Jan 2009 15:30:13 -0000	1.45
@@ -6,7 +6,7 @@
 Summary: 	Network traffic analyzer
 Name: 		wireshark
 Version:	1.1.1
-Release: 	0.pre1%{?dist}.1
+Release: 	0.pre1%{?dist}.2
 License: 	GPL+
 Group: 		Applications/Internet
 %if %{svn_version}
@@ -200,6 +200,9 @@
 
 
 %changelog
+* Sun Jan 18 2009 Tomas Mraz <tmraz at redhat.com> - 1.1.1-0.pre1.2
+- rebuild with new openssl
+
 * Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 1.1.1-0.pre1.1
 - Rebuild for Python 2.6
 



From tmraz at fedoraproject.org  Sun Jan 18 15:31:17 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Sun, 18 Jan 2009 15:31:17 +0000 (UTC)
Subject: rpms/wmweather+/devel wmweather+.spec,1.8,1.9
Message-ID: <20090118153117.B8EA1700E0@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/wmweather+/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32126

Modified Files:
	wmweather+.spec 
Log Message:
* Sun Jan 18 2009 Tomas Mraz <tmraz at redhat.com> - 2.9-9
- rebuild with new openssl



Index: wmweather+.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wmweather+/devel/wmweather+.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- wmweather+.spec	18 Feb 2008 20:57:47 -0000	1.8
+++ wmweather+.spec	18 Jan 2009 15:30:47 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           wmweather+
 Version:        2.9
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        Weather status dockapp
 
 Group:          User Interface/X
@@ -51,6 +51,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Sun Jan 18 2009 Tomas Mraz <tmraz at redhat.com> - 2.9-9
+- rebuild with new openssl
+
 * Mon Feb 18 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 2.9-8
 - Autorebuild for GCC 4.3
 



From tmraz at fedoraproject.org  Sun Jan 18 15:32:22 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Sun, 18 Jan 2009 15:32:22 +0000 (UTC)
Subject: rpms/wpa_supplicant/devel wpa_supplicant.spec,1.49,1.50
Message-ID: <20090118153222.910FA700E0@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/wpa_supplicant/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32388

Modified Files:
	wpa_supplicant.spec 
Log Message:
* Sun Jan 18 2009 Tomas Mraz <tmraz at redhat.com> - 1:0.6.4-3
- rebuild with new openssl



Index: wpa_supplicant.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wpa_supplicant/devel/wpa_supplicant.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- wpa_supplicant.spec	13 Oct 2008 15:06:57 -0000	1.49
+++ wpa_supplicant.spec	18 Jan 2009 15:31:52 -0000	1.50
@@ -2,7 +2,7 @@
 Name: wpa_supplicant
 Epoch: 1
 Version: 0.6.4
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: BSD
 Group: System Environment/Base
 Source0: http://hostap.epitest.fi/releases/%{name}-%{version}.tar.gz
@@ -148,6 +148,9 @@
 %{_bindir}/wpa_gui
 
 %changelog
+* Sun Jan 18 2009 Tomas Mraz <tmraz at redhat.com> - 1:0.6.4-3
+- rebuild with new openssl
+
 * Mon Oct 15 2008 Dan Williams <dcbw at redhat.com> - 1:0.6.4-2
 - Handle encryption keys correctly when switching 802.11 modes (rh #459399)
 - Better scanning behavior on resume from suspend/hibernate



From s4504kr at fedoraproject.org  Sun Jan 18 16:11:11 2009
From: s4504kr at fedoraproject.org (Jochen Schmitt)
Date: Sun, 18 Jan 2009 16:11:11 +0000 (UTC)
Subject: rpms/blender/devel blender.spec,1.99,1.100
Message-ID: <20090118161112.10059700E0@cvs1.fedora.phx.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/blender/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4263

Modified Files:
	blender.spec 
Log Message:
Change Req. to font package (fonts package renaming)


Index: blender.spec
===================================================================
RCS file: /cvs/extras/rpms/blender/devel/blender.spec,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -r1.99 -r1.100
--- blender.spec	15 Jan 2009 20:52:23 -0000	1.99
+++ blender.spec	18 Jan 2009 16:10:39 -0000	1.100
@@ -5,7 +5,7 @@
 
 Name:           blender
 Version:        2.48a
-Release: 	11%{?dist}
+Release: 	12%{?dist}
 
 Summary:        3D modeling, animation, rendering and post-production
 
@@ -67,7 +67,7 @@
 Requires(postun): shared-mime-info
 
 Requires:	  blender-fonts = %{version}-%{release}
-Requires:	  dejavu-fonts-sans
+Requires:	  dejavu-sans-fonts
 
 Provides:	  blender-fonts = %{version}-%{release}
 Obsoletes:	  blender-fonts <= 2.48a-9
@@ -195,6 +195,9 @@
 %{_datadir}/mime/packages/blender.xml
 
 %changelog
+* Sun Jan 18 2009 Jochen Schmitt <Jochen herr-schmitt de> 2.48a-12
+- Change Req. for font package because fonts naming was changed (#480444)
+
 * Thu Jan 15 2009 Jochen Schmitt <Jochen herr-schmitt de> 2.48a-11
 - Rebuild for new openssl package
 
@@ -216,7 +219,7 @@
 
 * Mon Nov  3 2008 Jochen Schmitt <Jochen herr-schmitt de> 2.48a-4
 - Fix security issue (#469655, CVE-2008-4863)
-
+[5~
 * Sun Oct 26 2008 Jochen Schmitt <Jochen herr-schmitt de> 2.48a-3
 - Create %%{_libdir}/blender/scripts/ to claim ownership
 



From jgu at fedoraproject.org  Sun Jan 18 16:22:10 2009
From: jgu at fedoraproject.org (Jonathan G. Underwood)
Date: Sun, 18 Jan 2009 16:22:10 +0000 (UTC)
Subject: rpms/emacs/devel emacs.spec,1.114,1.115
Message-ID: <20090118162210.22D5E700E0@cvs1.fedora.phx.redhat.com>

Author: jgu

Update of /cvs/extras/rpms/emacs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5700

Modified Files:
	emacs.spec 
Log Message:
* Sun Jan 18 2009 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 1:22.3-3
- Add /etc/rpm/macros.emacs file



Index: emacs.spec
===================================================================
RCS file: /cvs/extras/rpms/emacs/devel/emacs.spec,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -r1.114 -r1.115
--- emacs.spec	1 Dec 2008 15:00:21 -0000	1.114
+++ emacs.spec	18 Jan 2009 16:22:07 -0000	1.115
@@ -4,7 +4,7 @@
 Name: emacs
 Epoch: 1
 Version: 22.3
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv3+
 URL: http://www.gnu.org/software/emacs/
 Group: Applications/Editors
@@ -48,6 +48,8 @@
 %define expurgate 0
 
 %define site_lisp %{_datadir}/emacs/site-lisp
+%define site_start_d %{site_lisp}/site-start.d
+%define bytecompargs -batch --no-init-file --no-site-file -f batch-byte-compile
 %define pkgconfig %{_datadir}/pkgconfig
 
 %description
@@ -141,11 +143,9 @@
 # remove versioned file so that we end up with .1 suffix and only one DOC file
 rm src/emacs-%{version}.*
 
-TOPDIR=${PWD}
-%define emacsbatch ${TOPDIR}/src/emacs -batch --no-init-file --no-site-file
-
 # make sure patched lisp files get byte-compiled
-%emacsbatch -f batch-byte-compile site-lisp/*.el
+TOPDIR=${PWD}
+${TOPDIR}/src/emacs %{bytecompargs} site-lisp/*.el
 
 %__make %{?_smp_mflags} -C lisp updates
 
@@ -159,6 +159,15 @@
 Version: %{epoch}:%{version}
 EOF
 
+# Create macros.emacs RPM macro file
+cat > macros.emacs << EOF
+%%_emacs_version %{version}
+%%_emacs_epoch %{epoch}
+%%_emacs_sitelispdir %{site_lisp}
+%%_emacs_sitestartdir %{site_start_d}
+%%_emacs_bytecompile /usr/bin/emacs %bytecompargs 
+EOF
+
 %install
 rm -rf %{buildroot}
 
@@ -202,6 +211,10 @@
 mkdir -p %{buildroot}/%{pkgconfig}
 install -m 0644 emacs.pc %{buildroot}/%{pkgconfig}
 
+# install rpm macro definition file
+mkdir -p %{buildroot}%{_sysconfdir}/rpm
+install -m 0644 macros.emacs %{buildroot}%{_sysconfdir}/rpm/
+
 # after everything is installed, remove info dir
 rm -f %{buildroot}%{_infodir}/dir
 rm %{buildroot}%{_localstatedir}/games/emacs/*
@@ -289,6 +302,7 @@
 %files -f common-filelist common
 %defattr(-,root,root)
 %config(noreplace) %{_sysconfdir}/skel/.emacs
+%config(noreplace) %{_sysconfdir}/rpm/macros.emacs
 %doc etc/NEWS BUGS README
 %exclude %{_bindir}/emacs-*
 %{_bindir}/*
@@ -309,6 +323,9 @@
 %dir %{_datadir}/emacs/%{version}
 
 %changelog
+* Sun Jan 18 2009 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 1:22.3-3
+- Add /etc/rpm/macros.emacs file
+
 * Mon Dec 01 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 1:22.3-2
 - Rebuild for Python 2.6
 



From s4504kr at fedoraproject.org  Sun Jan 18 16:23:24 2009
From: s4504kr at fedoraproject.org (Jochen Schmitt)
Date: Sun, 18 Jan 2009 16:23:24 +0000 (UTC)
Subject: rpms/stellarium/devel stellarium.spec,1.50,1.51
Message-ID: <20090118162324.846C5700E0@cvs1.fedora.phx.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/stellarium/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5999

Modified Files:
	stellarium.spec 
Log Message:
Change Req. because fonts package renaming


Index: stellarium.spec
===================================================================
RCS file: /cvs/extras/rpms/stellarium/devel/stellarium.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- stellarium.spec	4 Jan 2009 18:41:33 -0000	1.50
+++ stellarium.spec	18 Jan 2009 16:22:53 -0000	1.51
@@ -2,7 +2,7 @@
 
 Name:           stellarium
 Version:        0.10.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Photo-realistic nightsky renderer
 
 Group:          Amusements/Graphics
@@ -29,7 +29,7 @@
 
 Requires:	opengl-games-utils
 
-Requires:	dejavu-fonts-sans dejavu-fonts-sans-mono
+Requires:	dejavu-sans-fonts dejavu-sans-mono-fonts
 
 %description
 Stellarium is a real-time 3D photo-realistic nightsky renderer. It can
@@ -100,6 +100,9 @@
 %doc COPYING stellarium_user_guide-%{guidever}.pdf
 
 %changelog
+* Sun Jan 18 2009 Jochen Schmitt <Jochen herr-schmitt de> - 0.10.0-3
+- Change Req. to fonts pakcage because fonts package renaming (#480474)
+
 * Sun Jan  4 2009 Jochen Schmitt <Jochen herr-schmitt de> 0.10.0-2
 - Create symlinks to DejaVu fonts (#477460)
 



From cheese at fedoraproject.org  Sun Jan 18 16:28:53 2009
From: cheese at fedoraproject.org (josef radinger)
Date: Sun, 18 Jan 2009 16:28:53 +0000 (UTC)
Subject: rpms/libopensync-plugin-syncml/devel libopensync-plugin-syncml.spec,
	1.5, 1.6
Message-ID: <20090118162853.E0B4B700E0@cvs1.fedora.phx.redhat.com>

Author: cheese

Update of /cvs/pkgs/rpms/libopensync-plugin-syncml/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7174

Modified Files:
	libopensync-plugin-syncml.spec 
Log Message:
revert back to 0.35-5 as i have problems with dependencies



Index: libopensync-plugin-syncml.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libopensync-plugin-syncml/devel/libopensync-plugin-syncml.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- libopensync-plugin-syncml.spec	1 Nov 2008 17:58:12 -0000	1.5
+++ libopensync-plugin-syncml.spec	18 Jan 2009 16:28:23 -0000	1.6
@@ -1,17 +1,19 @@
 Name:           libopensync-plugin-syncml
-Version:        0.36
-Release:        1%{?dist}
+Version:        0.35
+Release:        5%{?dist}
 Summary:        SyncML plugin for libopensync
 
 Group:          System Environment/Libraries
 License:        LGPLv2+
 URL:            http://www.opensync.org
 Source0:        http://www.opensync.org/download/releases/%{version}/%{name}-%{version}.tar.bz2
+Patch1:         cmake.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  cmake
 BuildRequires:  libopensync-devel >= 0.35
-BuildRequires:  libsyncml-devel openobex-devel pkgconfig libsoup-devel
+BuildRequires:  libsyncml-devel >= 0.4.7
+BuildRequires:  openobex-devel pkgconfig libsoup-devel
 BuildRequires:  glib2-devel >= 2.15.1
 
 %description
@@ -20,6 +22,7 @@
 %prep
 %setup -q
 
+%patch1 -p1
 
 %build
 mkdir build
@@ -43,6 +46,14 @@
 %{_datadir}/opensync-1.0/defaults/syncml-obex-client
 
 %changelog
+* Sun Jan 18 2009 josef radinger <cheese at nosuchhost.net> 
+- 0.35-5
+- revert back to 0.35 as i have problems with dependencies
+
+* Sat Nov 1 2008 josef radinger <cheese at nosuchhost.net> 
+- 0.36-2
+- add cmake-patch
+
 * Sat Nov 1 2008 josef radinger <cheese at nosuchhost.net> 
 - 0.36-1
 - bump version



From jgu at fedoraproject.org  Sun Jan 18 16:31:48 2009
From: jgu at fedoraproject.org (Jonathan G. Underwood)
Date: Sun, 18 Jan 2009 16:31:48 +0000 (UTC)
Subject: rpms/emacs/F-10 emacs.spec,1.112,1.113
Message-ID: <20090118163148.3A94B700E0@cvs1.fedora.phx.redhat.com>

Author: jgu

Update of /cvs/extras/rpms/emacs/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7696

Modified Files:
	emacs.spec 
Log Message:
* Sun Jan 18 2009 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 1:22.3-2
- Add /etc/rpm/macros.emacs file



Index: emacs.spec
===================================================================
RCS file: /cvs/extras/rpms/emacs/F-10/emacs.spec,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -r1.112 -r1.113
--- emacs.spec	17 Dec 2008 11:50:18 -0000	1.112
+++ emacs.spec	18 Jan 2009 16:31:17 -0000	1.113
@@ -4,7 +4,7 @@
 Name: emacs
 Epoch: 1
 Version: 22.3
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv3+
 URL: http://www.gnu.org/software/emacs/
 Group: Applications/Editors
@@ -50,6 +50,8 @@
 %define expurgate 0
 
 %define site_lisp %{_datadir}/emacs/site-lisp
+%define site_start_d %{site_lisp}/site-start.d
+%define bytecompargs -batch --no-init-file --no-site-file -f batch-byte-compile
 %define pkgconfig %{_datadir}/pkgconfig
 
 %description
@@ -149,7 +151,8 @@
 %define emacsbatch ${TOPDIR}/src/emacs -batch --no-init-file --no-site-file
 
 # make sure patched lisp files get byte-compiled
-%emacsbatch -f batch-byte-compile site-lisp/*.el
+TOPDIR=${PWD}
+${TOPDIR}/src/emacs %{bytecompargs} site-lisp/*.el
 
 %__make %{?_smp_mflags} -C lisp updates
 
@@ -163,6 +166,15 @@
 Version: %{epoch}:%{version}
 EOF
 
+# Create macros.emacs RPM macro file
+cat > macros.emacs << EOF
+%%_emacs_version %{version}
+%%_emacs_epoch %{epoch}
+%%_emacs_sitelispdir %{site_lisp}
+%%_emacs_sitestartdir %{site_start_d}
+%%_emacs_bytecompile /usr/bin/emacs %bytecompargs 
+EOF
+
 %install
 rm -rf %{buildroot}
 
@@ -206,6 +218,10 @@
 mkdir -p %{buildroot}/%{pkgconfig}
 install -m 0644 emacs.pc %{buildroot}/%{pkgconfig}
 
+# install rpm macro definition file
+mkdir -p %{buildroot}%{_sysconfdir}/rpm
+install -m 0644 macros.emacs %{buildroot}%{_sysconfdir}/rpm/
+
 # after everything is installed, remove info dir
 rm -f %{buildroot}%{_infodir}/dir
 rm %{buildroot}%{_localstatedir}/games/emacs/*
@@ -293,6 +309,7 @@
 %files -f common-filelist common
 %defattr(-,root,root)
 %config(noreplace) %{_sysconfdir}/skel/.emacs
+%config(noreplace) %{_sysconfdir}/rpm/macros.emacs
 %doc etc/NEWS BUGS README
 %exclude %{_bindir}/emacs-*
 %{_bindir}/*
@@ -313,6 +330,9 @@
 %dir %{_datadir}/emacs/%{version}
 
 %changelog
+* Sun Jan 18 2009 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 1:22.3-2
+- Add /etc/rpm/macros.emacs file
+
 * Wed Dec 17 2008 Daniel Novotny <dnovotny at redhat.com> 22.3-1
 - update from 22.2 to 22.3 (bz#461448)
 - removed upstreamed patches



From cheese at fedoraproject.org  Sun Jan 18 16:36:14 2009
From: cheese at fedoraproject.org (josef radinger)
Date: Sun, 18 Jan 2009 16:36:14 +0000 (UTC)
Subject: rpms/libopensync-plugin-syncml/devel libopensync-plugin-syncml.spec,
	1.6, 1.7
Message-ID: <20090118163614.90CF8700E0@cvs1.fedora.phx.redhat.com>

Author: cheese

Update of /cvs/pkgs/rpms/libopensync-plugin-syncml/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8251

Modified Files:
	libopensync-plugin-syncml.spec 
Log Message:
remove unneeded patch



Index: libopensync-plugin-syncml.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libopensync-plugin-syncml/devel/libopensync-plugin-syncml.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- libopensync-plugin-syncml.spec	18 Jan 2009 16:28:23 -0000	1.6
+++ libopensync-plugin-syncml.spec	18 Jan 2009 16:35:43 -0000	1.7
@@ -1,13 +1,13 @@
 Name:           libopensync-plugin-syncml
 Version:        0.35
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        SyncML plugin for libopensync
 
 Group:          System Environment/Libraries
 License:        LGPLv2+
 URL:            http://www.opensync.org
 Source0:        http://www.opensync.org/download/releases/%{version}/%{name}-%{version}.tar.bz2
-Patch1:         cmake.patch
+#Patch1:         cmake.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  cmake
@@ -22,7 +22,7 @@
 %prep
 %setup -q
 
-%patch1 -p1
+#%patch1 -p1
 
 %build
 mkdir build
@@ -47,6 +47,10 @@
 
 %changelog
 * Sun Jan 18 2009 josef radinger <cheese at nosuchhost.net> 
+- 0.35-6
+- and remove the later patches
+
+* Sun Jan 18 2009 josef radinger <cheese at nosuchhost.net> 
 - 0.35-5
 - revert back to 0.35 as i have problems with dependencies
 



From cheese at fedoraproject.org  Sun Jan 18 16:38:03 2009
From: cheese at fedoraproject.org (josef radinger)
Date: Sun, 18 Jan 2009 16:38:03 +0000 (UTC)
Subject: rpms/libopensync-plugin-syncml/devel libopensync-plugin-syncml.spec,
	1.7, 1.8
Message-ID: <20090118163804.09109700E0@cvs1.fedora.phx.redhat.com>

Author: cheese

Update of /cvs/pkgs/rpms/libopensync-plugin-syncml/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8491

Modified Files:
	libopensync-plugin-syncml.spec 
Log Message:
rebuild



Index: libopensync-plugin-syncml.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libopensync-plugin-syncml/devel/libopensync-plugin-syncml.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- libopensync-plugin-syncml.spec	18 Jan 2009 16:35:43 -0000	1.7
+++ libopensync-plugin-syncml.spec	18 Jan 2009 16:37:33 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           libopensync-plugin-syncml
 Version:        0.35
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        SyncML plugin for libopensync
 
 Group:          System Environment/Libraries
@@ -47,6 +47,10 @@
 
 %changelog
 * Sun Jan 18 2009 josef radinger <cheese at nosuchhost.net> 
+- 0.35-7
+-rebuild
+
+* Sun Jan 18 2009 josef radinger <cheese at nosuchhost.net> 
 - 0.35-6
 - and remove the later patches
 



From cheese at fedoraproject.org  Sun Jan 18 16:46:29 2009
From: cheese at fedoraproject.org (josef radinger)
Date: Sun, 18 Jan 2009 16:46:29 +0000 (UTC)
Subject: rpms/libopensync-plugin-syncml/devel libopensync-plugin-syncml.spec,
	1.8, 1.9
Message-ID: <20090118164629.B9AD2700E0@cvs1.fedora.phx.redhat.com>

Author: cheese

Update of /cvs/pkgs/rpms/libopensync-plugin-syncml/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9318

Modified Files:
	libopensync-plugin-syncml.spec 
Log Message:
bump version


Index: libopensync-plugin-syncml.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libopensync-plugin-syncml/devel/libopensync-plugin-syncml.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- libopensync-plugin-syncml.spec	18 Jan 2009 16:37:33 -0000	1.8
+++ libopensync-plugin-syncml.spec	18 Jan 2009 16:45:59 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           libopensync-plugin-syncml
-Version:        0.35
-Release:        7%{?dist}
+Version:        0.38
+Release:        1%{?dist}
 Summary:        SyncML plugin for libopensync
 
 Group:          System Environment/Libraries
@@ -47,6 +47,10 @@
 
 %changelog
 * Sun Jan 18 2009 josef radinger <cheese at nosuchhost.net> 
+- 0.38-1
+- bump version as libsyncml is now on 0.50
+
+* Sun Jan 18 2009 josef radinger <cheese at nosuchhost.net> 
 - 0.35-7
 -rebuild
 



From cheese at fedoraproject.org  Sun Jan 18 16:50:21 2009
From: cheese at fedoraproject.org (josef radinger)
Date: Sun, 18 Jan 2009 16:50:21 +0000 (UTC)
Subject: rpms/libopensync-plugin-syncml/devel
	libopensync-plugin-syncml-0.38.tar.bz2, NONE, 1.1
Message-ID: <20090118165021.C79A3700E0@cvs1.fedora.phx.redhat.com>

Author: cheese

Update of /cvs/pkgs/rpms/libopensync-plugin-syncml/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9824

Added Files:
	libopensync-plugin-syncml-0.38.tar.bz2 
Log Message:
sources




--- NEW FILE libopensync-plugin-syncml-0.38.tar.bz2 ---
BZh91AY&SY?w????????????????????(???A?
??a!?????
T	*	^?@?:w?_.}n??Q??%????????:!????P}??????}??CY?w?;?????w????oy??}?????

~?M1??SiC?I??h
bZ?!h???+ir?SL?????-???Kf????-???Kf??R??5???PV
???m)??U??M*?m??b??m)?0
L?
L?!?`??5???2d?)Y-$?4????VE?$ImJ?L??Mm?S1I?`d?k"??I4R?ZIZi?????$??E??Z54??,?c??m-?j?S-?T?j?d??f?????d?M?"R??X???X?%
????l?&??JI$AM?femL???????Y?0??.??-2?
?9?!?t?Jq?:O?%???t??~?????I??p??'?q>.?????~	??q??Z?F??????`????2j>?P????K???+F??????~{?	??p??^????X,??v??{d?????}}??I%?????I$???????????[;	EQ???????K??HY?f??q??o??9??}	A&?????o???sr?[??t??
{^f\?J???d;?8.???<hU!HTBR???	???V??A>???%?m,??Z??o????0n@??&g%??Dy3?B?	$!
? B?("?`??h{>N???!N?e??:3???_%h?:?[??Z???W|!?l?1?2l?.3
?????IG? ?h??????%????L.?/?{?????[L
?O?????vzrN#???u?.7K?I?Z$?
???V
t?{????2!??pK?????????j?3
?1??z:8
elX???%?'X?V`D;z@??^??1?)???z?%VM?'K??Hu???t80?#qv`ul
E??????`kr??Q?(?mx=??Ey?(?Q???q??HV??????5Or???PQSN??7?y?k?4~??2????m!??/??<?b??u??4??{???A????N??<??;'?
"%?
	?IF?7?>???y??y|??Z:27"&?c?d???v???SD?Q?'6??2??=?1s?*????(?l??nd?-??[.?~uP9?(e?????0???=S^?x?H?!????o?@??~?{i?ID????C?????<??????d??3??_?"S?.I ?t}?	L?U??D?=??~@???]r?	?r??(???jDi*?5????????	??3n&?#???Y[NV?L#?Lj??????v??|N??JbR???? ?BC?70<PV?
?:?QwBK?!?????????H?x?u{?B??*	N?????????s?!?{<
?j??/:??
?J4??
	D??Q??,Wk[Pw????3'?6,?he?I?(d"v??|`7?
??:?(?Z????d????T?M?X?????lS??td?db?1????"?!??$:???$=?j???!"?|??
4I??"F5? ?$????+?X??9h?g?????mVM?m??(???\?)?D?????)?)=X???$G????.?VO$&?n?\??8???-?]?b?{W???3=?f?,???.?o?X??6{??m?*4l?:d?????h??
???$??e7?:?3??7?>????Vr??a?/{R???r????N?0??v?B?}??|"""#??G???T????32?k???7??????s3+???.h?q???QQ?:????{??????U5n?&j"?Oq?Eb"?#3?ff?e?????c?]?im????yVB"??L[N???}?o?yu?F?I?? a
???@?????v?D????s)?4i??????~?w8?v?????=Q???\???B>?wZo??vd?Y{?*???????^4?F0??3?:j??7Z????bK??Mw?6k???}???R????d,?
??u#7~??z?D)O???[Ry\??O???{????????5S?g:?????e2z,??`?n????)"I$?z????M????U???C???#??:
?(
?BaDP

!????m????g?
(D?!?4?*?X?F??mWX?k|)&?,A	*
hR!?C?R
?U?"h?T?A
?w??d4"
*xC?hK?
P??r???i@?
?62?B
	""n?2?>??
???
?;????!???w?????-PR1?SUu<??8?0d`??`?2?
???A?H???????+???4??h?b?l[t2!i(2 ??r?,?-$??|???b??&???(???l?3,?????~J???v??S???}?(?	?h?I?mg%????'???E'???}??$?I,?????O?%??A?f&E#???K????8??Gnd?????????>THQ
??uwa0????fWsb???En??"??""""??
??+?]+?].??u??.?VTHP??B??R??-???E!@Kl? ZT???????"?F
m0Q?Y?(??~?[j?y?wun????f
,EEu??$?W(???(??(??(??(??? H^?]???M???g??w??~????????Z??I?I|or4b""???=????^]??????????+D??M?	??Pd???Pp????C???ZV???*????????????i?b;B,B??TK?K{?M??w???[_?Z?*Dd?L4?P?mt?????t8??????%Cn*a
(P???f^m??`?zJ?$????J??$F?w??g??V??????m
P?9????L??D?u<????>1?????=G?#?(??d???r0{??5?F/??+////8
Et??	??m?!@f???????@?>'!%?Q1??'!???Jv??
?.??]??????#?C??&?9y???t;?;(?F?W"???y??9'??c??????G\$ ???@?-???r????D|pO????&????7*???ol	YxN?D!??l ??"??R???OX??????R??q
??&??`?zA??
Tr]?2bN?(@??B?????K\?L4??O?w??fD?x q????#%u??o??l????'???_?B(HH&)????:???L??a!?????
?<"@??-???9Cw?
e?}??	?@t6???6??????{7?K??.?Y?X??=G?????????bk#DB
?????"??V???8?O?o?ty5??
????<^?????w2???.??Dn?????O??????B???&??4???D??2t)+UKCvfH|????&a?\]???3f?i??Cx?2??????[?-`lK??Y?GS0?-?9?u??-?Li6(@f?G???Zv???nPP???????????????e???O???c?~?????
??1?ad????????-M?7?x???op??????????N???????
?3W????
inU-??P1?????^	?F??????C`7???????P?lS?Vdy???????\ ??????	X?20@??????\-_???????????A#:q??'q???????0?d?UA }?e?q?:I?*a
I??+??'?r??&?}?:?????=?B?SX????T] ?E?`?q:N?=4d\m?
?o?EA??+?j???L?&-&o?i???`????@????UP?c????n6??7A????f?????2N?@???\=???h<W?b?{qO?N??Ry??????'q?}a?7>?/?BhY????M?
V?vn y?x"Z?3#?%??L?Qb:"Z???????3$QE??l7I????t??QE??i7I?H???t???(??C@`??t??????-&?3!QE????A-???|??
?????Ad????a????????)_+LJYJ???f$??6?D$??SW??N??]Y????3?2
?xcK???????0"!????????wT?g	??G
O???@
?[&???R6?????A???????`A??&???1L?p???`5?,
h? B??|j??&<??~????f??:n?@??s??s????\O?}??j,0
?? ???!B	
z1o2!)??RI$?I$?[??0?:?<?*
????ML??3%.g?,OP?TDa????&?<??
?5??Htr=23s=?6;ix????3g?39?????N??0?O??????	?????o<?`?S??g?????s?&??!TE????<???%`??$_w?w??hM?av|??=]C??k???7x??g??$??s?s-?=?R?	Gj???y?v????4??+D>??N??????%??H
????/???4????[K??}?@{?m_??}?#,????????m??)??}??^????#,??2??#,??2??&?#,???H?MR?0a3?<??7?|????zL[q??????w:?R?[??B?C??:kB?mI?o????B??;????#
?M
?S????h?&Q?~???J;????z?M?v3?6?y????6?s??4???}?)?y?y??????Re?j?%Y??????E~\?M?#?L??o???K?V??????)???!fH?H?-3?-6??(>A?3??44Y?F???Q"????^DN.d???;pi???'????~???}k?P&& ?7?A?W??C=??O)?OK{???|??l???=??:k??|?-3(l?F?a_
?{Xq??5g_???>?9O?_?E?;??O_sb????4???ya?JfN,	?X?//??-??30eA	?	??3????3?iYsH?????\????P'K????W??["??[i??J?W??????????bL??T.]??????????y?H,?tZg?[?Z$??|???%T?[}??<&r?NC????I
_Et?/?<??L!?b$=?f?
?&m##M#Dl?	p??P1s??C?b?????-%?Q]???????????
?fhu?m.:^4????b?
?X??/%??jC1???j???i??????Q??
?G???u?4B?G
?%??+p?P?37kc?4?:Qlb??M???*??;{?}??Cf?9???? ?33??W????9??.???	?j?wC??E?CII!??????X?t-C?????j??4?8?z???[?,?`?a9??????3???????#????j??:??
??????B?#"??}:??,t2??R?????NZ?	??{??~A=jBVj????>P???>??D??yuk?]^???(:???
????G????q??>????M?>??Y??????;\???:.?2)i???q??p??ID]?L???L??WJJJJdDK(???8?R)???N???/vl??iE????A?0?????????=&??>??I ?????b.T??|?~?J???;9??????c?p??j??i?VN?0A%b?@E???w??&F?^????/M?c?G??????wT???YQ.?"?1R???|fV?) ??????$0?O?y*?B%?????5%????i???M-#1???8?B??t??????????w?????.H0(????*?'???zQI$??o????']????[?Yo!dq??|??G?
?m??G??_*??Du?*??3
 ????????jY?U??W?u;??x;?,U<????]?L?Z?\??o8??IUn?????an?=/?b\?/$?I?.??S????Y??3?0?1???,?????rv???V???4enH?z??????O?????;[?4 ;?\0R?H+??"??C~A?
?h????(F??????lcP?'???????I$?L??????21O???=C_????X?g?{;?????l??zG??$?~????a??a???BMJ}???JQ?#?	?z=)$$?	$?p?U? ??f?e=??????r?;7???`w????=????n???
?????"???L???;r??Z_?Z???*????I:u??+??O???dZ???F?|??r???g??ER??q[?n??c?Pl?????/?H?P?RE?|?@????cM|??W]%#"n?$I???zu??f/MKEL?w(X????^??Xf???5+?C?pD?iY-3)I`P??"p PDCA??C?(z.?",??o?N??aKeB?
???}??YK?????l??????? 	0?DU?Zu.?93?q??????
,3>?=??L{?^??=>?d"?????_???;?Q??q??|k???N????/??,<???s?o?Z!E????DLY??^??????yd????PC??;S'1?c?p3?;:]?L?8?????M@{??=?
2:V??P,?$Ue?H?|???E?6?s?????????/?qe|f?~`9!
s???U???O???'??8z?"QT?W????Y?L??.???9[??[j??|e??.??3???D!
??????D?lz?9\??`]5!????*M???Q????r????9?nH
?l???t?5??J???G??u??W???Z?*7?Q???,??h;???s*??3???o?r??p??
4		?t;8??U[??Mu?,cW*?????q?8?D????3?uq???G*??je???4] ???|??:
5?Ih???TN?x??????.-???M0+????&P???U?i?F?Kh?D???my?4????*?c<??^H]???6x?J|??M????s??)??>??F?[Pr????|RZ????Bwt+?????S?????5??)?f5?'N?????x????zs??9?
i?z?]??$)?tE?s?>???????S??t?kv1?-????i??9??R?P??
?<i`?U??F??????<>?!?g????n>>??%${?hV??PaD V???Pv4?b????Ty???mmV?d?+?sI?xh?7?6??c}?Sr???x???g???`)/S?w???????
?qwN:?????S????1A]Z?1O?? ??=??y?g??????????gH?B"??*??J?\????E[?HY??J???c?#????d?lC?l???l?B?/?J?.~9??	V??W{??g??UU"u?d?YO|?q????{??-?
?XQ??????L???????YX???+J?5=?O??L?s??TT.$ ??H???0 i?????#?rO7?wN?WJ1H???^?j??????'@?v???P?^o??0?d??d(s?&]??&;i??}7?R??J???m??Tu??u(|S?????????q????p??????L?	?
???????zu??K?P?a\???V4?wN???v??s/<j?7?
??l?s?&?x?\??;u??v??.s??D?????s?^
x??>}?<w???:(?????
?"?wt??;????}?c?
?????|g?O??????3???????????-??{8?~
??Q???cS???~?????3?????,%?{{?o{3??O??Q????C??K????L?^???^<?K??Wn??)
G?:??
?o???k[?3?????$????\???%??7????a??0??7?f????????N????L??K??3???[??}?dij^???B=j??????v??i2?>?3??????.s?????>9???!?}??C???K?N??O?Y?=??5I?[??????????e?n?)??-Zjb??4??_wX?ds?i??,????g?^????1w????p?	??w????q?2?n?+??*BA??U>?ww??O
??~.?$?IO3?o??r?????W????*?2??$?Ib?>2?99Z ??Ye???&?c???b???4????Dm?W?z?H!3l????5i?>?;?$????yM?H??c?1f??)??Pv???UP;m????0?
Be?????k?I??`jY0??
?F?Q??C?????*?t ?_}??h????(?j?r????5w?
+?????l?"4???Uh???L?K??h?1}Z>??GkX~??Q?}????q?m???A??????????O?YBX??9?Ak9`???~?O???M:?Jy??
???Fp?:??????th?
?i?M?????c!?,?$2?/??O?|_?tx?*h????r?p0 V
(ZbC&=f?
7?,"??T?P???
??|@?????????H??~ ??26??4GZn*
?Q"????5R?>?I?LE?,??????DX?M-???N?[kyD?M??p???
????aIS? ?
?l?%d&?r?N:!k??????C?M
??P????qp??>?hl?D??'?? H?L???d??Qg5???)7?M??E??I_n?um?kF?V?w??9???p??<x?x???????*M&?\?p?l??7?Pj????W?????%?$?H???<?Q~Q?)? <?v?L2I&
":A?4UH	Z????W??4VGv{[??cHZ%??!DdF??????el?
?E_}??d??A ????\??a??e???B???z????!??????f?(????1Fa?Y??m?q??#O?A?/^?Z?5&????????????P$&`l?NC????=???]??????]?B?v?`?.??????p:%??"??????&?J?6????>?;~?t 9@???5??c?:?
??gu?
?1?	??;??@???
??MMH?d`C????6?r???$???;??s?:H??9??????Y?Rn??gi??r??e0?&e1$?8
??
?p???@?` fP1 e??fSn?5?e??8!
d5?J%D{??2m,Fil!?"3;?{???&??,6&0?i?d???????????????l?d??RRV?[e,??$?K*?d????uC?K9l?(v$8?k'Q"???d??<??Vv??Y y??p?o?M??"???ZB?X??i*?[H??l-????l-????l-????l-??c/?S??Iwy%????O|
MN??q:????+??)N???6q??	.?"??
4&?PY?
??B??
L?
?~/???n??9????l??[???????3~wZ??>??m??8?Ii????m????T????3*?|?e?{????????ff??y5????
<?|????xd:I'?i1)?;`??
qT?m??B/C???}l*??S6??(??&???'??? ?-k
 ?	???	?i?>S?x?92??????*??_:7??)???C????!	?_U?iO???SD??(va?_a'???~??????oT`??fO????&L????~?>??$??z??[[^??Zf????^s7-=??@?Py?X`@?LU???!?A?=????r????Z???tX?>?$??????.??/)?K?/??0?\??/[???????&uJb?????????7??@????$p0??9?kE??l??%ou??\???6KfD~f?XW?U??r?w?.?e?m??I&;{??????%!i,dYs?????`?(?5d}???
??G???]?&??????XN??C??F?)??[??J???)???"??2?=????????l?QTP ??i?????D7?S?C???? ?? ??@?D2?h??q??+??/:???>??41?cJf2@?
?X????V?B^?pQZQt(?X+?L???.x??k?#V??*??T???B??L?E????u?Hoiz-???il?x??_!]??P~???QRZ=???$?5?\?+!F?:???*??%>?\??l??F?x??J?-??????	??;?????X???l?fW	bf!/??Ja????g??dK?R??.??z????=$?}?p|N?1?r
2}???
?C0???}?i%!?nNXz?'??????g]???(n??K?d.?0?Z????K]??@?A3?P??
/????WT?C?????m ?U\(1?r(=?x?
a???u?{?um?????????\?9~^Vq??????$G?c??=???9?|?0?,y7>?????X?t??L ?BM????Ps???V?K??[?????3?31?H?9?%?
??;t???u?i??.~,????w+q?\??T#????C???f#3??	?,^<9???????4?~????B6?>=%???-???l??K>??T8?
?I?,?"?(?????f?I?I?4??5?@r?T??/&?O9??????????Uj???????=>?O~?J?^Y???????1????
????a?	 1?_?)H???/?"?????6?ex.??wr?W?+?PC??\??7???/??????/?{k?*N?K?"j?R????K?K?+|???
J??8??@??y?B6?R<?$TP?w?????8ag=??9H`
??J???-Il??????????z?><k?W&=?q??%?????I??#Q??Va?	?D??*????D?bRuu??y?0E(e???????;;>??V?Me
hN? Pr?^?I? Gs??'?n(5???
Gx?)k??s??aQ??>?z?????y??Cl?
???>t*?u?l9?????q`?0Tut?A?f94???M??$?? mpv??~???v?????'??%????},
?d??-?$???T?1ha???iT[~GEB???O??(C??.??Pt?E???Q?YE9s??(????????
??n?? ;??<??}]5?X(?dl?%?V'y???????1O?:?
?F??f??????m???,?F}9?n?W
?n??e?????P>
?~????@|?b\???,K?9~?D$?L?p???
??<??Wu?A???
?nd??+6
????ap???3? ?5?0
??b???C[??1?
??????ob
?A???m ???J??Zti???KM^??W???
:???????QV???z???<R?:Mq
6???b?j?3????c????QEl??
?u!????6??-???.?u{?+??????M????3?C??I?N????????{??~?~??8?jgV?i??|??*??
??[??k????w-???z??~H)~W?9Yd??j?4????4(/V
u?[?.???????N?vl??%s~#hg?F?dxy?????????CP~?)?C???????????????l?i?I?-}??`?TRI?1????J??KT?S}????K0mf???UY*?g???
???8?A"?y?-??b?e
?z?n??WY HDC?????Ac%EI	!	C"
???????G;7ct?v	I~??9<-w?I$?{??L?O???U?9??xQ???????????',M??B0	5?(??iwI?S???|???]0$ZZ????n_z9U?5G'??1?i*?uF???x?C?u??[=??k??Q?%??w6??;?Sq????Z??~?p?3??v-`??tr6??I$?B6?T5Q?
p?[M?????|n?,Q? ?_R??^?=W??R?:????|?%8???*A???????L4w74?KTD?7?F?K?)?'=g??????w???\<?kB?e???W???r??V?]???Y?R)B?t???_?"?????
?;?? st?+???,???]?<????|q?w??!V??6?6?7???>??0g????FC?uPR4#9?????h?f??m?NZ?I??
?d??335v?
[M?????f\??|:$??$???`0)
.K??????ey??:????M???v?????D????C(
|*????f??K-?bH?\???w	?}???
uu???5?m??h?2??=!???????xL?????.&FL?*??*Q??O.??!???J??<?????$B?
?BUi@?h?!XVHT?
XD3????@N?<?$??e3???_??l???0R"H????;`b}??7D???]m?? ??J???GC??????~???h?-????T???/???ZkcqiT "B
nH???
W?"
D??be"???m!??El?l3??l????????9?????q???[??w?=}???????h???i??y?/?,_{?]?T?6)??????w??d?'??{Q??'$
?'???D???6????P??????*8;s?ZB^f"?
N?CJj????S????6?:?Z?>?????E?37Z{??UlO????,	?)|s
?&??
U?????1??,?]????[ ?6h??????????=}O\?9?0c?2?q?G?-???.???llz?^???k?<x??h???????mVMN???hf?	??J?3?<??????8A??;5 ?dV?<?????n<?m?K}??3;????????{8??e?~????u?F??i?h?1?^pbn7?m9??Vy??T?w[??Q)J2?#
B?RffcN?Z??*]??????%?j?,hZ???m?%??????zcZ??mjjZ??????]???e?????46?r?q)&?
???g?????1???,?T???D???C?$?]?wt?w???u??????9???,LK;???????{v3?\?4?5?????m1?m?{????j??m?6??mm#3m??m????g93???w???r7?????O1%???F???Z??kUVL??(??Q??#hb?@?????V????I&fg]6s??S?????3wUK
?? ?!2v0X?*?m*H]????CW????2'pv??<ON??y??=?Y???3??jq?g83?5??Z?p??c?X?b9?3?????????????/?O????c??4P??
??9???,???H?N^v???y?&?????;???~???_?<L??g
<k???q???uI???^?????1?z??s????X@???(~o?????%?jT????`i?Q????????4??????]h???d?????oiH????????i???gDt?]S?30,,???yq???*?]

???2???(?+?^??Q?/???Ve?f?\??o=?)-?	?e?5
nf"^A?/9j????U???n*i?c*?1X?
SRp?#??l?v??R??BQI$???P|^?G???q?????J_$????7??
?$?I?B??????R.???5?J?}?????0??N??R?8?I???/???y:?lZ????M?:D4?B?????^??_?[6??r???+????qR?o?j?s?"q??)M3???????)S??????
?Nz??,???"??&??P???*$?D?????lJ"??>e????~#0???~C??I?Iwz??9???3?f?????????N????b??""2t??q???rvD
?
?
?I
??????P??#p??????1~7y?FH6+?>??9}?z??????????c???pf?rI?{?1??????Mf?????!?T???Ips?e'?a%+??$???????????X+???? ?????)
a?svjC"b?i?w8??p
k$??$"v???TT(?E
?p%??3?????1?y??? ?Do(h??d??k??#VZQ?l4??u?????~?_?m?????Z??;-???is=<~??<???W?l??
??|???8a?{???/?????y?<`y???YR??~???e?????B???C?C?+??
??? 6)??)bs????Q-?4@??????L??????P?R?????moy1qr]? ??#
E??C????q
?F^UGn?z??H?m?6?? ????7?+?o??DR?????{O??\=????yb,c{? ???=?????;#?%??9??lv<?qx???<????LA????nh%?_n???1???+?D?7?<Fd
[j??0!?V???????h(?S2??
v?J
?;???????dt???v+lBEA?
J?L?3?yT??????T????D~ ?r
?Xy~C?\Oa?J??u,6??yv??"h|??,d/?X?[l??o??;?
ZF???^???<
????"A???*
?T	?????Q?[ecl-?UQV???G??
a }v???-?ZUR2?????mJ?j???
[6Mil??Z?Z??VB???5m&?M?kY6????????m@?,%@???????	P??????`^n???^??h}??gR????~2h??.?x?A,?e?	e?"6 5D?Y??1a??@?BBB_???/?{??????Z???C?,?S?@m???M?. at EOP????92?C3_??f9?*	???*
?0Y"#??J?p
??,49????'?,A?k?+??D?x?	s!??h)?r?QuTpy?n??? \GB?H?XZA$?? y????u?
?n???????????5???B~??&????7?3?K?zJ	?AQI????I(???M?KIme???m^??????E+'???
??????<??????:???l+??
t
Z??#???
?KQ?>5?I????
*
0 at C??U??PyX???]v
 A]X%?K9???X??D?????
(?V{f?5b?H????
+$?wVc?F$??????+?|?J?|??]}?
?????
Q???`A`?4?+?<??6????|
u??h?????)??2#G`_?;
?Mx???1??????3Xx"H??Q?H-
??????#
M??P???_????????????[m??W??????W??(??B
?4
r?PS?X#!3?e??
??
?2?? ?H$S?$????^???#?????G%??I????????2?Q)-u?9?\Ft@A?"?
?	?0a?'w?pXC)*2?U???XZ?h>
l at d/?s
i*??
??6??8`e-??0??fK?0???????YF??e??L??0??)?B??
7,???0??Ct?C?D`??"@!?SjV??????/???~???T?H?1x?.??i???U?Y?
N_s????RZ?}??5Y%??????l????QDB$???E?!??
?^A?
b ????????c?????'?Cc?`]M?&???????DZ???z@?}????J???	n5-?Z?j??????????Kim*?U[im*W??c??>?H?
x?????al??[Z?j?1?kU??m?U??)P????09L?????q?6??kU?V?k,?????U-??m?J5??????t?ks?s??I$?:I$??L??2?????y$?/I$?<s??8
??u+??ZZ??;??%??I$?I$?M5??I%??H?kYc:????jV?r?k?s????
G?@???;??
?6?b?SHm???l???SESz?
?Q???E??E(i?%??5??=?D?_x
???(z?)A{>?????J???LO??t
???5&??"4?2?z?b?????:LI??AwPb?J?g??@?d???C?%(?7
:Pt\?dG???P???c
%2R?U%R`:?1?#?a?f?????
@\??x*	z&6?????YY??YY??,??m,????5?6????Se??i??R?6?????[+-??b?5o?nb???Kf.????????????1P??J	?0?
??[?`?????R?V???iO-?[??M? ?2(H?4P68?`??\??u??=0???
???"?;?p?v
??sC??????????'??6.??`
???GV????BcK????h???=???j??
??????q+1D????b???? ??H???\w?x???P?)???H?aPAi9jG?:yt$8{h????
ER????X?/?3??????;N?Rc?.????A>so??y????????i?i?)??O`=????F????????^7??j4(????????6s
,	)2??J?Bu????9???Y??JyA??
blQo?????U?)??I?7?B$H?1? ?6b?
A??R
@J???
?Y?c?"&?D	(?cZd???;nm?[RVF??l?????$@</??bF
	B???T???W??????|?'??I???>??z
0'#g???????? 1Dc??????k???$+?>[?=????b?Q??^9?????]
Ox?X
??
M?^??5?(??(y"d?l
,?I
@*l@`?|m??A-??A1T??M?%?
?a?f?w'?
?D"H??)??m?5?g?*b???\?????|??A?????_?????bBt?.\.6!?:7??????`??9,????????^,+4I???x?L??	&]?????0hcc???,??o??????T???Aj4??%??!???y{}??]???[i?BB2BI$?8????~???Q??p2`???2>????>??@z`??^*?@k(?9??c! ?@^?D?gH??i?"#h???w(?B=t?SB???6x???.;8??P?##?P???x-P$%??????????????\D,?X?M?C????g????	
.P
p???=B9G?
?>??????EU2??kHJpP?T???.??t8|@??S?{E3??j?(U???8??9??yCu2?D$'K?pR??)[Rm?6?T???HD?	???AWX?:'?????
}??,?F????@l$?????.?|?@X??(???[?eAa
?????	???A?;)?!j at E???PA@?*?J*YY??*?
D???f?,X0VP?,-B???????i,???i,?????f?R??f???
??????"Q??!dx?3????L}??B)%j?Q??r
F
???????d??J????n????;?1?QEh??F?4?t??f??5??q\?sD(2F)E?L?????k?{d?c>?=??????]?u?]?V????LI3$??
H?r?.K?????W??n???????
???iM1?? 2'-r?C?Y@???z??.??N?????????-;L??&Ab7?????,A??[w?2??.?r??Q3?????0?
?]5I'?&"!???@B??u?(6! ?c????1?$?/E{??SYlL???*i0?)?)M-6?e??dAA?G???????XH$!R?[Kim-??? ?E
?1c~>????????????+???6 {?Q~??
?MI????p??k???"?^???!>?N0??@X?j1???%?RC~??0?^?j?????l???p5
????]?j??-???)O?uD?Ka!#???+???/'?a4?P?I0??0?p/?u	?oG]? ?"????C?Eo;|?.?E>P???
P???R8 at 7??y

??????}?n?%??=qN7???Ue?3?b,Tc?M)t?????S?[?E?4?a??!?a???R6E????f??
`z
FH;,
}???"???h??????@&..R?TE?????Pz?1?dg0
,(?S&?np?f? ??dN
??.fa?
? ???????$?I2?^(]???????4??!?@??E ????y?'???t????j(??,X?b?j?m?????h
???
?,a8???Cl?^?	m??(%IB????y??@.??[D2????????F?rr!!??b
?c?eH??w%?<????????P?I$?>?Nm?_}?????%???B	$?Y????dv?!$?H?????}?????v]????u?L$?Is?P?g'?h?????O?I$v??>y??!??????u?s??i?:?I$??..???~??\?q??I$???`~\???:?<7??j8??/{??[F???????`???OL??x??UUX*????%x???I$?QID??I??O??|?s??f?)?i?m??????z?????/?V??J?-???x
???N????q???Q%xId?G??o?.??==-??\?7[?l???f??????;? ??w2|??S?????|????v????]?????4????l?F?`6?l7 ?`UUz?oN?u?o?Z?y????????Z?o{?y??c?>sJ?<?HB?1??!??d???K]b?HP?A"??/?yU????1?u??E68R??z?l?{we??l?$?H0w???W?w
P
?e??<?=L??X,??!?I??w8?;???v4!$?d?#B??????.?????s_^rSE??rA?s??????6?X??t?I-U????4U4???V?f?	?$??;????2
??
?????(????=????OB{??c??z?:F0`?????cOSC??????????9?[r?zfI$??w??ry?sg?9??<??|?s#?w??;$?I
?6?\??p?x?????e?_[???g??
U	??=?$?W???	????L????B?L?E???V???l?[l????-?3T??j??,???k3?r-???E??i?? ?r[?o,&lU??????1?&I?s?
????I$?????
??hf\SaE"??
`H?qC>r?C1?/??{?????c??K???r???????D?????>'K?h
????2 ^?>y$???2!#3W?ZP?M
?????
?KTlh???C???????`7a??
?2???H?"?`???*B??P	??:I?8?x??????hEz4@?%????"??M???????????$?E?p??????????(?;?A?
?Ps?	$??a????6	P&?^?JrrD?b?hX????T?gQ?B??*???^?*??U??D>?Y???C	!$h'??H?&?????J??T???q*q?E9B?9Iw?&?EpN?]???|??4<'9?L?_
????H?Q?X??;?@?????}Malt?9?A?|??H?\N?h????????@????*??]Y?_9O
??# F1?j!?kN???[?za??N?s?dK?GD???5??
?p??.?}?@?
?\?j?
t?$??"???`???(R??h??;??k??Z????J=??1????>?:_LI?:I$??????????y?;??a'?Vhr?7??t	zw?H???)???????Y$:????m
,6?,

?`??DjwArR?????y???M?? $?	'?(??
??EU1????;-???i??UtK?z?V????!FU?p??:$%
??
??aq
Z? x?8????0_Q?Y? u??D?????????C?0?M?"&?
l?rD5????q? ?@o??<???(???u??t?L??R???	?P??#2?:??,%?WfHW????CJB????\?}??Y??@e;??JHN 
??JC?N5????1??P?PS??1???R?e?K	8?Q?>:i??$6?l??d?`R
G???	?J??m?m56??U%?X?-????$??VG ?
???k??}?>?	J
????(?F	P?	???????U'???????k??f)???????? ????RK$?qAp?QxS??br??
7??z??]?L?_?<?w??
:o?7I1???m?c?n\^O?n??AQ????b
?Rd ?:r?T???!Ad1??c?)?????E4&?t(
??NlQ*W|?e??v?~K?&f?m*???q_xp?A??hV??"$?F??????20Os???C???,???
??6??na|??7??O<Pd????&??R?PMU??C?????7???
???????-H?a H??:??/?XO`?Y\?
????	?EZ?l5?????T#rB?$RUsQ??Ba???????P??EFF??# ?m
!
[eK%H?8DZ?
W???|?p?1#j???Z??U?????U?
0??q??`???N?IsqnH;I?&?*.%V?Z?l?J? 9?]D????%?i??DD??gb??xj??q?>?	H???UC?Za??6?M?5??	?????-{X??0?????y?gO???<?h???D?V?M8???w?/2?T??????;??y?hw?;U;??)????(B ??>w??n???T?????#
_????J?d?J?Q?G(!Jh??"g??pP>?
l??_@~??x4?1<q?T		
4??Y??b?D?
f?k=????BD?!$	? ?r?7K???M]??g??(F?6???R?HVD"q?E(??&?2	"(??J?	&? J0???a???L??2=??.;!?p8s?8s??N
"Id8	??A?WA%B?????
m??k^?S????*??jD?ULK???? ????|???'?????n?M?Np	O???N6?C??`??3???9??6???i?Z????J?-??h?G????q5??????%???
! \	??d??
A.?Ou?#????>
\????B??B$?DHR???,? ?T)
?a?!
?
??/^?&HS??`?HE6?l
X?`P??:?c??
??+p???B/[
?u?#?H?WP):??B?&(j@?4?W??J?]!?
?p????@]g6???xPB!1??R5$!?~????B?R0??KD???bC	?BP?b2H?LR,??`???????$?(???T???a???????r???QY
P??'e9?8k/?ta
d0???Q??Q?,&*u?2,????t
???2?;4????l8? d?B?LT?Q$c?6S??`.?]?? l??n??????ff.??88F3??q??qByB*?????
*?eU??$<z?,M?UA?7`?????>??*N??4g?2???g???2{?plM?)+??X^e??7?b'? _IH?????
???| ????
<X??]??a????
r?)[!I!
?\5!O$???~???\?6?6??H!??{2???????`???6???+^??Gt
?W?3?P???)??P???s?~???pN??)?4????Y?#{i???j?????????g1?????>?????d???n???5'r??&?T?????"?H
AA`?D??(???T8??\]wm???i?NI?7OBy?\??f!?6S??`??	??:?}?/???32???DJ?T<??z ?2&???D??Sl??ka{?Lq??$/t??n/???{L\??X??!???4??0?????H????^?y??*?,?=r?M????K?sCKq?c?<?$WQ??O???????_8g??nY?1??9?(	F??????Z
?4E????%?'?;{tS'Bk?Z?:L?J?T?$???<P?K??f?&4??7
????o?)0y?Z)????j???T??L?T?t??5v?@7?f?
?Z?/?Y?#S?????U?]@??gc????/}??R?pt???;??k=?IE???*???
?8s??O[??
??
????GT??c??25?v#O????S?t????;S??5?????Y???BN??/?K??S?x?L??^???c???S??N?3?s	ffM
??? ????
B? ????T??a???&b& !??WVE?H????r??E????o??$??????i?}t?TR?>j?G1??i????R??w;??K???-(~o??????s?c???????9u?U0)???9;???&u??I?,?5?B???????H?N0
?2mH?Q?
)9a52? ????5?sb9$??e???l8?4	'XJ"$??8?????D??Nt?[|??z?w?1???1=?T?c?d????$?{???8n:?????s?\???W2%o6?;'?p?:b,??K?2;;4:D`?nj?[??#
??y?B2????7???	5????\???rhN$?:F??/??????????Z???O??&????WM?g8?i6]?RP?g??b??o|?J?ik?kJ?2??[
?
	`-?A??
F1?P
?????U&J?<N7????J
`)??@2?``????4Dd?
??w?C
CP)P?'
UUT?~P$;
?!??f@????	?	???(? ??N9?:?s??J?%PJ??;
?B ?t?t`X??
?v????v/?(1?"?,?????d"????\?_'?)3??q?"???
?S;?$QhC??&n?r ?-oW?b
?p??
uY?)c?)???,-Pb$1???????xA(:?q?E?l,????*^?=??S*??????I
(?E1(??????%#?0c??$??????.o??S?
V????oF/,; ????t?<WZ?A[D3?9????$o????N?>
???n???FQ?L?u?????b8P??s?0?!?p#????-G???4CRqh?Z!4?D/?5???~F?MaSP????p???HH"2$??0???A9EHG{????? l?]@? P)E????}t??????e????2??l
 ?!H'hN?S?r?
???m?pBx1?m???x?????o?Q????=B???(!F??????x)???c?ck1M????<???~;?????yG?Q?t?;?.????m?bf??o?????b????H?? ?????s0f?4?H??z????o??--?UNUW??WS??	-jXq?f??Ed????????8?@????#C1???????~&?????Y??	?9%??o??i???????qi??*c??C?2w?!?B)??&u?
???????T:f??
x????L(?sm?
??\3\B"A??????`f?H??BD???*???k?v?ea??????3?A??m????-???@rO??)?:ra?eA??p??????6n?9E	?/Z?????? ???>z?O>?;G?9
|?y~??????????G?z???$"???Z?D?C?L??E???!????-?KD???#i?p?????i?Q??{E?xzvE	iG?????6-Qz??z????a1?s/$C>???E???;
??B???
???1`??:??s?a?z`sx?a?+{??I.??&2????L?~??u??????Gpm??c???Xd??
?U?f???KH???o?? r??p????H?'?St4?]i???5????y??@?
"?|1??`?,????:6'??|??BH?)???y?
??
??h?:??Q1"?N?PX??if???(J?JY?R??-????4C???V7?DLD????G'G??DXaN?R?H2,BJx?h? )??)???????????r? ?I??jTY?b??OW??????????H
?Q'J???{d?^?rdd<n?'????A?: ?(h ?CZR;?\2jk;$7p-^?0??s????0 K?Dn_?R????Q???TL?j???eI???!?O???1???<s??4w?\??;2Ly:??x?@?yd??&z?c2??c??o3?x""?zD??#BM"?j!?kK?b!?2??'???:?s?R???Y?dy???qT?
??:????????11?p(?#LV????????????)?ag2??????e????^gY???????p??d????3??>`h
?z??????9??5
??P??i??e??)?+?^zX
??I$	?i?VgY?(???l?/> ?W6???m????Cu?8?')#??~?4`)???}^???TS?g
?4>Kt???t?????P ]JBfK?>`?LaUL?*5
??f5$??;???z<0;??2??A
????,??
????#???)??????z S??%7"
5
??g??}???$)????.??
 ?qA????^?????R0?A?{n?
j"????3????H:?'@?h"?
???"x????u ~B?H!??H=?!????[Z?P??? 5??x??
z?T[?ki*Sl?%?#k?z?????X?`X?g??XE ??WB?????Dy>??D?`??D??
???G?j?OQ????D??uR???B	DP?8v_??C??dQ?)??="?
.&?'??????????Y?F0E?(??,@?7?]??Q?B
???<?g??????7Y?)??????<??V
????{<?}??AllC??C??o??i???@v0????O#Jf?,u????9);?:????(?0
EE%!??P?t???A&????
H

}??????)u?!Z?a?
??2J?????5??_c??W????L??????<??&2X?G??&???5??u?~?Z?&????Th?Q????M???m\?9????k?Z?+m?Q?jf?;?????VD?$$A)?b!??!Hu ?W?
??(???Q???am???B??YX??-2(\?q"&???0+d;?5?Y?e???dvE
 ???????Y)?l????????l?
?????I|Lw?chH??Z?I?k

Z??????s??>??K?R*"B?-??*??H?0
Y?X?=n??@??rJi??J?/?}?????
T*?&>=S?-??
I?<???????j???????????? n???|??f:???(?
??0?MC??1W ??????4D?/???
?"(?$0D_<W?????P?=????
b???M?#ie-?H?2?Q}Q?c??
H?pDd`??t?H!???Nd7~
??????*???{.A??F*$1cF?RlcRY,?K&?1???v?d?????????^F??Ub?j???n???Fad?Ct|?????.??$?t??~??x-J?x????C???j??I?1?7?}???r?j????v?ljj????!?\?5??5????jB????ED?p???l??3?Bn???7l?V(??|????`W???;???????`$?3?=_?F?IvS
e0 ?-??,`p??%?R?
??mMMMemL5f???J?,X?6??)j6?j6???a{?i?~?+?!??K??#????u.?}???T??????qj?[&?dk%??[???2?%2?,??O??I?,*??]#R4g?Z???M???????N?S?wNI???"??K??d?RT(jH??R?X?$@`FY?
?TV*e??????MF?U?$s??ue\?g8!??0N??O?YN*L2@`)!?;
{Gr???B0???P???|E=(?M?p3??m??$?$????????h?H??p#?*d4??ju??]Wf?
9??T?
??6???*????????<?HA????R/K?
?"?`??????Ud????=??I:D?@?
??????`y??`^aa??X?4a??2(?????a?I?m??[2s?c
 ?S?!
???{?
]6?+Z{??Iz?????
??*QJ$`?" 066b]	ff??^?'?9??D? ?x@
??	?d??;?*???????pB6?; ?6??z.?F??Y?$?>????oy??J?;0@????H?????4?-????s??dI?t?]S?
??M??Y
%?G??NE??(?{??y?y?JG??R?b?????B{G9?::??s&"?????4B?-?Zfq?2A5iyyB?%VB??&???xD$?g
I
?2? ?A
??q?U7j??K?-)??!$g???uZO?z??t????L??????????????<??j?:?K+??so~?!?o
?
??P?????4?Sr?Xx???.??9nHQa?%,?f?
?$?%Bi
F?BB^?????P?[?]
k]?*????@?u??W???a??T?!gq-??z??w?C?C1?x?'???????o?o=??+Y???A?7?pj*?6??^'????`?", ?$???????P	?I?kJZ?????Z4
??
?~?Z
?#!?????D?rl0\6PH??a???????fBP1?
??d??)?Q$?2?\j?W?Np90>?o????????o^r????W??"?N?8?????QL?Hb
?????,	IvB?P:?00 at +e???m???PU??w0??
??k???Y??]??Ba????q3??????]1?N3???m
?o2?(??J?K5?????bz{????EAENG	b??=$M?K'S.?????????f?]&[9uML???,???????[bN6E
? ?$@??9?1H(8??X
??
?1?)?F??az??(.!M?&F.F?A?M?@,*)l7?
??s??E??"?X????b9?(????Xi
@???LV(?Bt????
????@5*4$#??0?a??
???0?qRpHR?;$&@P??,5
?w???b??????`
*&@??brz???u?6zM??+????$ ?X??{7?W????}06??6??H?"???7???HI	??I??=~*?G?@6?j,?5Pd/?P?\??C3?? ?
6"Jz0?d?#? n???
???`jB?F?J??
f????TV??E
?7????$T**?^.????E>$x9????ud?t?????m"?E
j3?O?X?
?UX'6???

?$"????v??"??M???m??P'w?y/[??Y??&S???j%?S^l9J?!|v????m|?d`0 G?"#??	POt???z zl?61u??f at m???>
N
????a???B?4??[|U#?]F?C?$?bd2?P?P'&??{?`"???]d??c?
' ??	"q??@??~?K0?pp?CH???
?z ?`?Q?a?4????| ?5??3?"???f??O??Yd#j?n??T9?c?=??????????(?????h?C??S?E)?~S??~=JtdR! ??$?X?K)???cmn}Wn??N???????t??f"X???MKO(????L?T???F?I??.???]w?#G??????&e???????9?I?y?W?`????\2?@???o??HY??8
?i????	?V?T?kL?????dA$?Hb4???S?od'?[jZ?I<2?Z?)?=
???I??D??]???{????ob?#[?@?r?????:@?IX?	v_/????t?"HE???U5B??"P tq??????'?3?~??

?f??JEH????,Z?+??At???E????D????#??5!`A????#P=?6???w?grD#X8%?J???e?C/C?	?[?u
}????
j227]RH???^???>?\B???mue[VU?p????O?d?t?Y#4Db ??Qda<??Cx/s?|??=??D%???
?zm4%?
U??B
z^V?vKk???V?5[?f5?YzuD#$
??Jk
p?d?AE?H??????a?b????V?:??Bk?X??????vaT?w%??Ci?J?]c1?t?2,??I?q?oQ?5z;????Y?jiP??h?2e
L????m????m?fD,?F??
`(????`??n?~?.?? F
~v???DB?#T?????7A?m?O>?
???????`?3??H?>dfz* ~
t??
f?????tJ?N?Q??*)??.(??8????
L??%qE?\?mG3?R?E??R??h??? ??????G?X??F?9??C???N?/??b?qJ??SI-jj???ON+??R
???m9?s?!???$!b?I? r?*D???}V?????~???????%??/?%~o)*????>2	b??>/?,26?y???? 1`(?w?!l
??j????X???,?A????????????YD?  #???i??#1??V#y?8?"?U%?a??5???
?m?z??tF'L	?c??p?????A?G.? ?BI"!2???O???smZ/?? @P????93???~??@????l???D|????T?????I?eF?*?n?B????m?P?8?B???w?u??BF$? ?(??1B
?????;??/
?r???<????A)????O,?<??????O??B(2*H????? AH????b#@?)a,??rA;??&?8????2?m?Y)M?V
m9we?D??????I*@'??>??V4;?Y??2?
???????;?JJ???n?]?????
*Qm?????^6????_[?.H??T??hV*??B!
?pOd?????@
?#
? ??$???Q?Tq????:f4???L3????s?y??
J;-y?3?V?%?z.?T&
?:????ST4W?e??2aT=L!%???]??#?$Z?36??`W?d????jL	??????????dS)?Y?1??0zM??g)&b?uq???Rbo??	?QY?`4??#I?Y^?h??/?"y?R?I68$&C$?y????p?et????G!?a??????8	?~?:F[.??J?IT?u6?Zy?i?S#???+?c08????0?-<?'???1?=7???X?,i?s
???&??Y???`???zy??????7S???.<@?^U??>8?]??H	C???$		"?l??M.a\??S??'
??U??O*????	?=?????.J@??B#??X`???#
?}??????cTFZ?H'y?oH?ro|?
@?.C?3sa??g2? ?!!????@?2??3?:??s?h??rlPe?
9??9?81?s!|r??l
d?T`?%I?jI??3ibT6?	@?
B??'?)
??=??????L?T???IHWy<9?pCq G?6??
@H?C|2??4b?
??????]??'??W????|?)!0?Fk?:?P??????HB??(]?RQ>???$@?A????????.d???e??UB??
Z
 T?\????????EF@
v??(?F???C???)p??r^"P???F?bz\`?I??C?
z9?g??z???:??q??"5?"r?g????????h#???'??-?????8L??hS?`?
A`u?+7??????? ???1.!l?un??BC?c?Nu)@?
?}F?t]????k??^??&???F????7xH????Sb?g	NQ?????AF??F?I$???PKxO|?]@?b?>l?????Jj?RD?B?W???_7????fDM?$?#?d)?"
??%????
??FZ?5???!?????_q??4qr?h???S?\?[?b??Q;?|??{,?oR?N?zn???&?SIH??iU"???T??>?$<?P?M+?b??f`m?&0??? aB3
?%???u??u
??QV??q?fs??&H?m3??p;?N
?N
??????%?W??
??z?i??V??!9pK8?jn?(p???g???P??T????qp???$R??P?8>x")T<]^w?
??fT???A??Syx%$?)J?l?Ap????N?? ??v???F??w?I?B???H R*DA)??D?h?q\RL?R?Dmm?`???g???l???{-#??';u?(???+"?N????
7iia(???2>?+4???fq????glp?&wM??????

,?V?0??)*?o?????????h?u?h??`u	???????[{????0?L???I??@?
??
?Q8?ce07 [?>3-CP???
~"?q?
?L>??r???Z???.???X?&[2$d???b???5??Q?q.?zR**C??>???'?=??0?	=????????>?q????Ek???&5T?Bg?T????tO?a??8??????@C?S?#???,??P??@?O?MKK(??4??@?M
8???
R???%o!M???

*?n?;?'1??US5u??c ??T?=3????~???8r??Wm?k?????V??h?????P"???2B)???c???r?w??l?;??????r??\?8????+e?L?????4/??y6??!
?A$k4!6f????
???0?4_?@N??
?$S?$Y
p?a????W???&??T$??Q@???p??j'????"???????Gax????C8????D?5?X?J????^?????R8?a!?m
!??????b'lTz?H????P?bK????b+ !?
^??o??w?(Y?6?2?ybxl??a?Ms??kl!D???(?`-?
?8)n??2?{jOxrn??\DC??(2Z???^?Nf?T_:??????2++lk$<????x3?????????????oN?)BFX???2???
????t???R?g0Z???]?08??j????[??O?eRx?A2	O?;?[?U??]?[????z?????@?v?P? h?%,?y?=^wm%:g?*v????@}CY
X?X,)H?$?#?????AL?????!????$????F????j??f?Y???????R(, (?V?X?!"!?)?????E-?K-?Y?
KM4e6???2Rk)F(?D
SX]??+Jvav?KkyA?9??
d?
?A`"?V?gs7???Q*FBI??P?$????????	??0?:L<?-??bf?`?,yZf?M&]f??w??*???????`???$?)??D????'?`o???????Tx?$?$BL????`"????"?(H_??



From cheese at fedoraproject.org  Sun Jan 18 17:48:44 2009
From: cheese at fedoraproject.org (josef radinger)
Date: Sun, 18 Jan 2009 17:48:44 +0000 (UTC)
Subject: rpms/libopensync-plugin-syncml/devel libopensync-plugin-syncml.spec,
	1.9, 1.10
Message-ID: <20090118174844.0E5C6700E0@cvs1.fedora.phx.redhat.com>

Author: cheese

Update of /cvs/pkgs/rpms/libopensync-plugin-syncml/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17434

Modified Files:
	libopensync-plugin-syncml.spec 
Log Message:
rebuild



Index: libopensync-plugin-syncml.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libopensync-plugin-syncml/devel/libopensync-plugin-syncml.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- libopensync-plugin-syncml.spec	18 Jan 2009 16:45:59 -0000	1.9
+++ libopensync-plugin-syncml.spec	18 Jan 2009 17:48:13 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           libopensync-plugin-syncml
 Version:        0.38
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        SyncML plugin for libopensync
 
 Group:          System Environment/Libraries
@@ -47,6 +47,10 @@
 
 %changelog
 * Sun Jan 18 2009 josef radinger <cheese at nosuchhost.net> 
+- 0.38-2
+- rebuild
+
+* Sun Jan 18 2009 josef radinger <cheese at nosuchhost.net> 
 - 0.38-1
 - bump version as libsyncml is now on 0.50
 



From tmraz at fedoraproject.org  Sun Jan 18 17:49:15 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Sun, 18 Jan 2009 17:49:15 +0000 (UTC)
Subject: rpms/x3270/devel x3270.spec,1.31,1.32
Message-ID: <20090118174915.B5E16700E0@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/x3270/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17544

Modified Files:
	x3270.spec 
Log Message:
* Sun Jan 18 2009 Tomas Mraz <tmraz at redhat.com> 3.3.6-7
- rebuild with new openssl



Index: x3270.spec
===================================================================
RCS file: /cvs/pkgs/rpms/x3270/devel/x3270.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- x3270.spec	2 Oct 2008 12:23:23 -0000	1.31
+++ x3270.spec	18 Jan 2009 17:48:45 -0000	1.32
@@ -8,7 +8,7 @@
 Summary: An X Window System based IBM 3278/3279 terminal emulator
 Name: x3270
 Version: 3.3.6
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: MIT
 Group: Applications/Internet
 URL: http://www.geocities.com/SiliconValley/Peaks/7814
@@ -195,6 +195,9 @@
 %{_mandir}/man1/c3270*
 
 %changelog
+* Sun Jan 18 2009 Tomas Mraz <tmraz at redhat.com> 3.3.6-7
+- rebuild with new openssl
+
 * Thu Oct 02 2008 Karsten Hopp <karsten at redhat.com> 3.3.6-6
 - update redhat patch for fuzz=0 (#465087)
 



From tmraz at fedoraproject.org  Sun Jan 18 17:49:48 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Sun, 18 Jan 2009 17:49:48 +0000 (UTC)
Subject: rpms/xar/devel xar.spec,1.8,1.9
Message-ID: <20090118174948.7AB38700E0@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/xar/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17717

Modified Files:
	xar.spec 
Log Message:
* Sun Jan 18 2009 Tomas Mraz <tmraz at redhat.com> 1.5.2-2
- rebuild with new openssl



Index: xar.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xar/devel/xar.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- xar.spec	23 Dec 2008 22:52:05 -0000	1.8
+++ xar.spec	18 Jan 2009 17:49:18 -0000	1.9
@@ -1,7 +1,7 @@
 Summary: The eXtensible ARchiver
 Name: xar
 Version: 1.5.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: BSD
 Group: Applications/Archiving
 URL: http://code.google.com/p/xar/
@@ -73,6 +73,9 @@
 
 
 %changelog
+* Sun Jan 18 2009 Tomas Mraz <tmraz at redhat.com> 1.5.2-2
+- rebuild with new openssl
+
 * Tue Dec 23 2008 Matthias Saou <http://freshrpms.net/> 1.5.2-1
 - Update to 1.5.2.
 - Remove no longer needed install and memset patches.



From tmraz at fedoraproject.org  Sun Jan 18 17:52:07 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Sun, 18 Jan 2009 17:52:07 +0000 (UTC)
Subject: rpms/xca/devel xca.spec,1.24,1.25
Message-ID: <20090118175207.13E35700E0@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/xca/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18183

Modified Files:
	xca.spec 
Log Message:
* Sun Jan 18 2009 Tomas Mraz <tmraz at redhat.com> - 0.6.4-5
- rebuild with new openssl



Index: xca.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xca/devel/xca.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- xca.spec	21 Jun 2008 15:14:38 -0000	1.24
+++ xca.spec	18 Jan 2009 17:51:36 -0000	1.25
@@ -3,7 +3,7 @@
 Summary:	Graphical X.509 certificate management tool
 Name:		xca
 Version:	0.6.4
-Release:	%release_func 4
+Release:	%release_func 5
 
 License:	BSD
 Group:		Applications/Productivity
@@ -128,6 +128,9 @@
 
 
 %changelog
+* Sun Jan 18 2009 Tomas Mraz <tmraz at redhat.com> - 0.6.4-5
+- rebuild with new openssl
+
 * Mon Feb 18 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.6.4-4
 - Autorebuild for GCC 4.3
 



From tmraz at fedoraproject.org  Sun Jan 18 17:58:04 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Sun, 18 Jan 2009 17:58:04 +0000 (UTC)
Subject: rpms/xchat-gnome/devel xchat-gnome.spec,1.56,1.57
Message-ID: <20090118175804.9A555700E0@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/xchat-gnome/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19664

Modified Files:
	xchat-gnome.spec 
Log Message:
* Sun Jan 18 2009 Tomas Mraz <tmraz at redhat.com> - 0.24.1-3
- rebuild with new openssl



Index: xchat-gnome.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xchat-gnome/devel/xchat-gnome.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- xchat-gnome.spec	1 Dec 2008 05:03:55 -0000	1.56
+++ xchat-gnome.spec	18 Jan 2009 17:57:34 -0000	1.57
@@ -1,6 +1,6 @@
 Name:           xchat-gnome
 Version:        0.24.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        GNOME front-end to xchat
 
 Group:          Applications/Internet
@@ -136,6 +136,9 @@
 
 
 %changelog
+* Sun Jan 18 2009 Tomas Mraz <tmraz at redhat.com> - 0.24.1-3
+- rebuild with new openssl
+
 * Sun Nov 30 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 0.24.1-2
 - Rebuild for Python 2.6
 



From tmraz at fedoraproject.org  Sun Jan 18 17:59:28 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Sun, 18 Jan 2009 17:59:28 +0000 (UTC)
Subject: rpms/xen/devel xen.spec,1.225,1.226
Message-ID: <20090118175928.30059700E0@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/xen/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19947

Modified Files:
	xen.spec 
Log Message:
* Sun Jan 18 2009 Tomas Mraz <tmraz at redhat.com> - 3.3.1-2
- rebuild with new openssl



Index: xen.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xen/devel/xen.spec,v
retrieving revision 1.225
retrieving revision 1.226
diff -u -r1.225 -r1.226
--- xen.spec	8 Jan 2009 20:18:01 -0000	1.225
+++ xen.spec	18 Jan 2009 17:58:57 -0000	1.226
@@ -2,7 +2,7 @@
 
 # Always set these 3 tags
 %define base_version 3.3.1
-%define base_release 1
+%define base_release 2
 
 # Hypervisor ABI
 %define hv_abi  3.3
@@ -479,6 +479,9 @@
 %{_libdir}/*.a
 
 %changelog
+* Sun Jan 18 2009 Tomas Mraz <tmraz at redhat.com> - 3.3.1-2
+- rebuild with new openssl
+
 * Thu Jan 8 2009 Gerd Hoffmann <kraxel at redhat.com> - 3.3.1-1
 - update to xen 3.3.1 release.
 



From tmraz at fedoraproject.org  Sun Jan 18 18:01:23 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Sun, 18 Jan 2009 18:01:23 +0000 (UTC)
Subject: rpms/xmlsec1/devel xmlsec1.spec,1.32,1.33
Message-ID: <20090118180123.0C879700E0@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/xmlsec1/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20285

Modified Files:
	xmlsec1.spec 
Log Message:
* Sun Jan 18 2009 Tomas Mraz <tmraz at redhat.com> - 1.2.11-2
- rebuild with new openssl



Index: xmlsec1.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xmlsec1/devel/xmlsec1.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- xmlsec1.spec	11 Jul 2008 12:38:57 -0000	1.32
+++ xmlsec1.spec	18 Jan 2009 18:00:52 -0000	1.33
@@ -1,7 +1,7 @@
 Summary: Library providing support for "XML Signature" and "XML Encryption" standards
 Name: xmlsec1
 Version: 1.2.11
-Release: 1
+Release: 2
 License: MIT
 Group: Development/Libraries
 Source: ftp://ftp.aleksey.com/pub/xmlsec/releases/xmlsec1-%{version}.tar.gz
@@ -238,6 +238,9 @@
 %{prefix}/lib*/pkgconfig/xmlsec1-nss.pc
 
 %changelog
+* Sun Jan 18 2009 Tomas Mraz <tmraz at redhat.com> - 1.2.11-2
+- rebuild with new openssl
+
 * Fri Jul 11 2008 Daniel Veillard <veillard at redhat.com> - 1.2.11-1
 - update to new upstream release 1.2.11
 - rebuild for gnutls update



From tmraz at fedoraproject.org  Sun Jan 18 18:09:22 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Sun, 18 Jan 2009 18:09:22 +0000 (UTC)
Subject: rpms/xmms2/devel xmms2.spec,1.3,1.4
Message-ID: <20090118180922.11D28700E0@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/xmms2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21466

Modified Files:
	xmms2.spec 
Log Message:
* Sun Jan 18 2009 Tomas Mraz <tmraz at redhat.com> - 0.5-5
- rebuild with new openssl



Index: xmms2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xmms2/devel/xmms2.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xmms2.spec	13 Jan 2009 09:59:49 -0000	1.3
+++ xmms2.spec	18 Jan 2009 18:08:51 -0000	1.4
@@ -6,7 +6,7 @@
 Name:			xmms2
 Summary: 		A modular audio framework and plugin architecture
 Version:		0.5
-Release:		4%{?dist}
+Release:		5%{?dist}
 License:		LGPLv2+ and GPLv2+ and BSD
 Group:			Applications/Multimedia
 # We can't use the upstream source tarball as-is, because it includes an mp4 decoder.
@@ -180,6 +180,9 @@
 %{ruby_sitearch}/xmmsclient*
 
 %changelog
+* Sun Jan 18 2009 Tomas Mraz <tmraz at redhat.com> - 0.5-5
+- rebuild with new openssl
+
 * Tue Jan 13 2009 Adrian Reber <adrian at lisas.de> - 0.5-4
 - Rebuild for libcdio-0.81
 



From tmraz at fedoraproject.org  Sun Jan 18 18:11:44 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Sun, 18 Jan 2009 18:11:44 +0000 (UTC)
Subject: rpms/xsupplicant/devel xsupplicant.spec,1.38,1.39
Message-ID: <20090118181144.1E67E700E0@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/xsupplicant/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21892

Modified Files:
	xsupplicant.spec 
Log Message:
* Sun Jan 18 2009 Tomas Mraz <tmraz at redhat.com> - 1.2.8-9
- rebuild with new openssl



Index: xsupplicant.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xsupplicant/devel/xsupplicant.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- xsupplicant.spec	8 Jul 2008 20:30:29 -0000	1.38
+++ xsupplicant.spec	18 Jan 2009 18:11:13 -0000	1.39
@@ -1,7 +1,7 @@
 Name:		xsupplicant
 Summary:	Open Source Implementation of IEEE 802.1x
 Version:	1.2.8
-Release:	8%{?dist}
+Release:	9%{?dist}
 License:	GPLv2+
 Group:		System Environment/Base
 URL:		http://www.open1x.org/
@@ -77,6 +77,9 @@
 %{_libdir}/libxsup*.a
 
 %changelog
+* Sun Jan 18 2009 Tomas Mraz <tmraz at redhat.com> - 1.2.8-9
+- rebuild with new openssl
+
 * Tue Jul  8 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1.2.8-8
 - fix iwlib handling
 



From eponyme at fedoraproject.org  Sun Jan 18 18:20:46 2009
From: eponyme at fedoraproject.org (Nicoleau Fabien)
Date: Sun, 18 Jan 2009 18:20:46 +0000 (UTC)
Subject: rpms/clive/devel .cvsignore, 1.7, 1.8 clive.spec, 1.7, 1.8 sources, 
	1.7, 1.8
Message-ID: <20090118182046.98061700E0@cvs1.fedora.phx.redhat.com>

Author: eponyme

Update of /cvs/pkgs/rpms/clive/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23126

Modified Files:
	.cvsignore clive.spec sources 
Log Message:
Update to 2.1.3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/clive/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	4 Nov 2008 22:26:56 -0000	1.7
+++ .cvsignore	18 Jan 2009 18:20:16 -0000	1.8
@@ -1 +1 @@
-clive-1.0.2.tar.bz2
+clive-2.1.3.tar.bz2


Index: clive.spec
===================================================================
RCS file: /cvs/pkgs/rpms/clive/devel/clive.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- clive.spec	29 Nov 2008 16:36:44 -0000	1.7
+++ clive.spec	18 Jan 2009 18:20:16 -0000	1.8
@@ -1,21 +1,15 @@
-%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 Name:           clive
-Version:        1.0.2
-Release:        2%{?dist}
+Version:        2.1.3
+Release:        1%{?dist}
 Summary:        Video extraction tool for user-uploaded video hosts
 
 Group:          Applications/Multimedia
-License:        GPLv3+
-URL:            http://%{name}.sourceforge.net/
-Source0:        http://dl.gna.org/%{name}/1.0.x/%{name}-%{version}.tar.bz2
+License:        ISC
+URL:            http://code.google.com/p/%{name}/
+Source0:        http://%{name}.googlecode.com/files/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
-BuildRequires:  python-devel
-Requires:       newt-python
-Requires:       python-crypto 
-Requires:       python-feedparser
-Requires:       python-urlgrabber
 
 %description
 clive is a video extraction tool for user-uploaded video hosts such as Youtube,
@@ -28,14 +22,14 @@
 
 
 %build
-%configure
-make
-
+pod2man clive > clive.1
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
-
+mkdir -p $RPM_BUILD_ROOT%{_bindir}
+mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
+install -pm 755 %{name} $RPM_BUILD_ROOT%{_bindir}
+install -pm 644 %{name}.1 $RPM_BUILD_ROOT%{_mandir}/man1
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -43,20 +37,19 @@
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING INSTALL README TODO ChangeLog NEWS CHANGES HACKING
-%dir %{python_sitelib}/%{name}
+%doc AUTHORS CHANGES configrc INSTALL TODO LICENSE
 %{_bindir}/%{name}
-%{_bindir}/%{name}-passwd
-%{python_sitelib}/%{name}/*.py
-%{python_sitelib}/%{name}/*.pyc
-%{python_sitelib}/%{name}/*.pyo
-%{_mandir}/man?/%{name}*
-
+%{_mandir}/man1/%{name}.1.gz
 
 %changelog
-* Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 1.0.2-2
-- Rebuild for Python 2.6
-
+* Thu Jan 15 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> 2.1.3-1
+- Rebuild for 2.1.3
+- License update
+* Wed Dec 31 2008 Nicoleau Fabien <nicoleau.fabien at gmail.com> 2.1.2-1
+- Rebuild for 2.1.2
+- URLs update
+* Wed Dec  3 2008 Nicoleau Fabien <nicoleau.fabien at gmail.com> 2.1.0-1
+- Rebuild for 2.1.0
 * Sun Nov  2 2008 Nicoleau Fabien <nicoleau.fabien at gmail.com> 1.0.2-1
 - Rebuild for 1.0.2
 * Wed Jul 30 2008 Nicoleau Fabien <nicoleau.fabien at gmail.com> 0.4.20-1


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/clive/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	4 Nov 2008 22:26:56 -0000	1.7
+++ sources	18 Jan 2009 18:20:16 -0000	1.8
@@ -1 +1 @@
-ff617c65ba447bf2f3ef050d02a93dd3  clive-1.0.2.tar.bz2
+3e1cbaa365f0c0e09839dbcb85ab8415  clive-2.1.3.tar.bz2



From lkundrak at fedoraproject.org  Sun Jan 18 18:27:48 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Sun, 18 Jan 2009 18:27:48 +0000 (UTC)
Subject: rpms/teeworlds/devel teeworlds-0.5.0-extlibs.patch, NONE,
	1.1 teeworlds-0.5.0-optflags.patch, NONE,
	1.1 teeworlds-0.5.0-segv.patch, NONE, 1.1 .cvsignore, 1.2,
	1.3 sources, 1.2, 1.3 teeworlds.spec, 1.1,
	1.2 teeworlds-datadir.patch, 1.1, NONE teeworlds-extlibs.patch,
	1.1, NONE
Message-ID: <20090118182748.0B7E5700E0@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/teeworlds/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24744

Modified Files:
	.cvsignore sources teeworlds.spec 
Added Files:
	teeworlds-0.5.0-extlibs.patch teeworlds-0.5.0-optflags.patch 
	teeworlds-0.5.0-segv.patch 
Removed Files:
	teeworlds-datadir.patch teeworlds-extlibs.patch 
Log Message:
* Sat Jan 17 2009 Lubomir Rintel <lkundrak at v3.sk> 0.5.0-1
- New upstream release


teeworlds-0.5.0-extlibs.patch:

--- NEW FILE teeworlds-0.5.0-extlibs.patch ---
Use external libraries.

* Bam checks for headers existence in a rather stupid way. It should be
  fixed to allow OptFindLibrary("pnglite", {"sys/types.h", "pnglite.h"}...

* Multiple directores to look for headers are not yet implemented in bam,
  therefore these are really Fedora specific.

* engine_openfile() search multiple paths, which we don't do.

Lubomir Rintel <lkundrak at v3.sk>

diff -up teeworlds-0.5.0-src/default.bam.extlibs teeworlds-0.5.0-src/default.bam
--- teeworlds-0.5.0-src/default.bam.extlibs	2009-01-13 20:36:11.000000000 +0100
+++ teeworlds-0.5.0-src/default.bam	2009-01-18 19:08:33.000000000 +0100
@@ -7,6 +7,8 @@ config = NewConfig()
 config:Add(OptFindCompiler())
 config:Add(OptTestCompileC("stackprotector", "int main(){return 0;}", "-fstack-protector -fstack-protector-all"))
 config:Add(OptFindLibrary("zlib", "zlib.h", false))
+config:Add(OptFindLibrary("wavpack", "wavpack/wavpack.h", false))
+config:Add(OptFindLibrary("pnglite", "sys/types.h", false))
 config:Add(SDL.OptFind("sdl", true))
 config:Finalize("config.bam")
 
@@ -156,9 +161,30 @@ function build(settings)
 		settings.cc.includes:Add("src/engine/external/zlib")
 	end
 
-	-- build the small libraries
-	wavpack = Compile(settings, Collect("src/engine/external/wavpack/*.c"))
-	pnglite = Compile(settings, Collect("src/engine/external/pnglite/*.c"))
+	-- compile wavpack if needed
+	if config.wavpack.value == 1 then
+		settings.link.libs:Add("wavpack")
+		if config.wavpack.include_path then
+			settings.cc.includes:Add(config.wavpack.include_path)
+		end
+		wavpack = {}
+	else
+		wavpack = Compile(settings, Collect("src/engine/external/wavpack/*.c"))
+		settings.cc.includes:Add("src/engine/external")
+	end
+
+
+	-- compile pnglite if needed
+	if config.pnglite.value == 1 then
+		settings.link.libs:Add("pnglite")
+		if config.pnglite.include_path then
+			settings.cc.includes:Add(config.pnglite.include_path)
+		end
+		pnglite = {}
+	else
+		pnglite = Compile(settings, Collect("src/engine/external/pnglite/*.c"))
+		settings.cc.includes:Add("src/engine/external/pnglite")
+	end
 	
 	-- build game components
 	engine_settings = settings:Copy()
diff -up teeworlds-0.5.0-src/src/engine/client/ec_gfx.c.extlibs teeworlds-0.5.0-src/src/engine/client/ec_gfx.c
--- teeworlds-0.5.0-src/src/engine/client/ec_gfx.c.extlibs	2009-01-13 20:36:11.000000000 +0100
+++ teeworlds-0.5.0-src/src/engine/client/ec_gfx.c	2009-01-18 18:43:39.000000000 +0100
@@ -18,7 +18,7 @@
 #endif
 
 #include <base/system.h>
-#include <engine/external/pnglite/pnglite.h>
+#include <pnglite.h>
 
 #include <engine/e_client_interface.h>
 #include <engine/e_engine.h>
diff -up teeworlds-0.5.0-src/src/engine/client/ec_snd.c.extlibs teeworlds-0.5.0-src/src/engine/client/ec_snd.c
--- teeworlds-0.5.0-src/src/engine/client/ec_snd.c.extlibs	2009-01-13 20:36:11.000000000 +0100
+++ teeworlds-0.5.0-src/src/engine/client/ec_snd.c	2009-01-18 19:07:35.000000000 +0100
@@ -6,7 +6,7 @@
 
 #include "SDL.h"
 
-#include <engine/external/wavpack/wavpack.h>
+#include <wavpack/wavpack.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <math.h>
@@ -358,19 +358,12 @@ static void rate_convert(int sid)
 	snd->num_frames = num_frames;
 }
 
-
-static IOHANDLE file = NULL;
-
-static int read_data(void *buffer, int size)
-{
-	return io_read(file, buffer, size);
-}
-
 int snd_load_wv(const char *filename)
 {
 	SAMPLE *snd;
 	int sid = -1;
 	char error[100];
+	char completefilename[512];
 	WavpackContext *context;
 	
 	/* don't waste memory on sound when we are stress testing */
@@ -381,19 +374,13 @@ int snd_load_wv(const char *filename)
 	if(!sound_enabled)
 		return 1;
 
-	file = engine_openfile(filename, IOFLAG_READ); /* TODO: use system.h stuff for this */
-	if(!file)
-	{
-		dbg_msg("sound/wv", "failed to open %s", filename);
-		return -1;
-	}
-
 	sid = snd_alloc_id();
 	if(sid < 0)
 		return -1;
 	snd = &samples[sid];
 
-	context = WavpackOpenFileInput(read_data, error);
+	engine_getpath(completefilename, sizeof(completefilename), filename, IOFLAG_READ);
+	context = WavpackOpenFileInput(completefilename, error, 0, 0);
 	if (context)
 	{
 		int samples = WavpackGetNumSamples(context);
@@ -445,12 +432,9 @@ int snd_load_wv(const char *filename)
 	}
 	else
 	{
-		dbg_msg("sound/wv", "failed to open %s: %s", filename, error);
+		dbg_msg("sound/wv", "failed to open %s: %s", completefilename, error);
 	}
 
-	io_close(file);
-	file = NULL;
-
 	if(config.debug)
 		dbg_msg("sound/wv", "loaded %s", filename);
 
diff -up teeworlds-0.5.0-src/src/game/client/render.hpp.extlibs teeworlds-0.5.0-src/src/game/client/render.hpp
--- teeworlds-0.5.0-src/src/game/client/render.hpp.extlibs	2009-01-13 20:36:11.000000000 +0100
+++ teeworlds-0.5.0-src/src/game/client/render.hpp	2009-01-18 18:43:39.000000000 +0100
@@ -37,7 +37,7 @@ enum
 	TILERENDERFLAG_EXTEND=4,
 };
 
-typedef struct SPRITE;
+struct SPRITE;
 
 void select_sprite(SPRITE *spr, int flags=0, int sx=0, int sy=0);
 void select_sprite(int id, int flags=0, int sx=0, int sy=0);
diff -up teeworlds-0.5.0-src/src/tools/dilate.c.extlibs teeworlds-0.5.0-src/src/tools/dilate.c
--- teeworlds-0.5.0-src/src/tools/dilate.c.extlibs	2009-01-13 20:36:11.000000000 +0100
+++ teeworlds-0.5.0-src/src/tools/dilate.c	2009-01-18 18:43:39.000000000 +0100
@@ -1,6 +1,9 @@
 /* copyright (c) 2007 magnus auvinen, see licence.txt for more info */
 
-#include "../engine/external/pnglite/pnglite.c"
+#include <sys/types.h>
+#include <string.h>
+#include <stdio.h>
+#include <pnglite.h>
 
 typedef struct pixel_t
 {
diff -up teeworlds-0.5.0-src/src/tools/tileset_borderfix.c.extlibs teeworlds-0.5.0-src/src/tools/tileset_borderfix.c
--- teeworlds-0.5.0-src/src/tools/tileset_borderfix.c.extlibs	2009-01-13 20:36:11.000000000 +0100
+++ teeworlds-0.5.0-src/src/tools/tileset_borderfix.c	2009-01-18 18:43:39.000000000 +0100
@@ -1,6 +1,9 @@
 /* copyright (c) 2007 magnus auvinen, see licence.txt for more info */
 
-#include "../engine/external/pnglite/pnglite.c"
+#include <sys/types.h>
+#include <string.h>
+#include <stdio.h>
+#include <pnglite.h>
 
 typedef struct pixel_t
 {

teeworlds-0.5.0-optflags.patch:

--- NEW FILE teeworlds-0.5.0-optflags.patch ---
This should really be done in bam's NewSettings.

Lubomir Rintel <lkundrak at v3.sk>

diff -urp teeworlds-0.5.0-src/default.bam teeworlds-0.5.0-src.fixed/default.bam
--- teeworlds-0.5.0-src/default.bam	2009-01-17 14:20:53.000000000 +0100
+++ teeworlds-0.5.0-src.fixed/default.bam	2009-01-17 14:18:23.000000000 +0100
@@ -106,6 +109,9 @@ end
 function build(settings)
 	--settings.objdir = Path("objs")
 	settings.cc.Output = Intermediate_Output
+	settings.cc.flags:Add(os.getenv ('CFLAGS'))
+	settings.cc.flags:Add(os.getenv ('CPPFLAGS'))
+	settings.cc.flags:Add(os.getenv ('LDFLAGS'))
 
 	if config.compiler.value == "cl" then
 		settings.cc.flags:Add("/wd4244")

teeworlds-0.5.0-segv.patch:

--- NEW FILE teeworlds-0.5.0-segv.patch ---
Don't segfault when graphics can't be initialized (i.e. attempt to
launch outside of X11)

Lubomir Rintel <lkundrak at v3.sk>

diff -up teeworlds-0.5.0-src/src/engine/client/ec_client.c.segv teeworlds-0.5.0-src/src/engine/client/ec_client.c
--- teeworlds-0.5.0-src/src/engine/client/ec_client.c.segv	2009-01-18 19:19:05.000000000 +0100
+++ teeworlds-0.5.0-src/src/engine/client/ec_client.c	2009-01-18 19:19:24.000000000 +0100
@@ -1521,7 +1521,7 @@ static void client_run()
 	snapshot_parts = 0;
 	
 	/* init graphics and sound */
-	if(!gfx_init())
+	if(gfx_init() < 1)
 		return;
 
 	/* start refreshing addresses while we load */


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/teeworlds/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Jan 2009 14:49:22 -0000	1.2
+++ .cvsignore	18 Jan 2009 18:27:17 -0000	1.3
@@ -1,2 +1 @@
-teeworlds-0.4.3-src.tar.gz
-teeworlds.png
+teeworlds-0.5.0-src.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/teeworlds/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Jan 2009 14:49:22 -0000	1.2
+++ sources	18 Jan 2009 18:27:17 -0000	1.3
@@ -1,2 +1 @@
-a31a8cbd1af3f71a462122166e5872d6  teeworlds-0.4.3-src.tar.gz
-d541e3afa7809bd73bb64adb0795cb65  teeworlds.png
+39d7b5d41c2c7250201214a4ab6844ed  teeworlds-0.5.0-src.tar.gz


Index: teeworlds.spec
===================================================================
RCS file: /cvs/pkgs/rpms/teeworlds/devel/teeworlds.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- teeworlds.spec	8 Jan 2009 14:49:22 -0000	1.1
+++ teeworlds.spec	18 Jan 2009 18:27:17 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           teeworlds
-Version:        0.4.3
-Release:        5%{?dist}
+Version:        0.5.0
+Release:        1%{?dist}
 Summary:        Online multi-player platform 2D shooter
 
 Group:          Amusements/Games
@@ -9,20 +9,20 @@
 Source0:        http://www.teeworlds.com/files/%{name}-%{version}-src.tar.gz
 Source1:        %{name}.png
 Source2:        %{name}.desktop
-Patch0:         %{name}-datadir.patch
-Patch1:         %{name}-extlibs.patch
+Patch1:         %{name}-0.5.0-extlibs.patch
+Patch2:         %{name}-0.5.0-optflags.patch
+Patch3:         %{name}-0.5.0-segv.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  mesa-libGLU-devel
-BuildRequires:  bam = 0.0.%{version}
+BuildRequires:  bam >= 0.2.0
 BuildRequires:  python-devel
 BuildRequires:  alsa-lib-devel
 BuildRequires:  desktop-file-utils
 BuildRequires:  zlib-devel
-BuildRequires:  libglfw-devel
 BuildRequires:  wavpack-devel
-BuildRequires:  portaudio-devel
 BuildRequires:  pnglite-devel
+BuildRequires:  SDL-devel
 Requires:       %{name}-data
    
 
@@ -51,19 +51,18 @@
 
 %prep
 %setup -q -n %{name}-%{version}-src
+rm -rf src/engine/external
 
-%patch0 -p1 -b .datadir
 %patch1 -p1 -b .extlibs
-rm -rf src/engine/external
+%patch2 -p1 -b .optflags
+%patch3 -p1 -b .segv
 
-iconv -f iso-8859-1 -t utf-8 readme.txt > readme.txt.utf8
-sed -i 's|\r$||g' readme.txt.utf8
+iconv -f iso-8859-1 -t utf-8 readme.txt |sed 's|\r||g' > readme.txt.utf8
 touch -c -r readme.txt readme.txt.utf8
 mv readme.txt.utf8 readme.txt
 
 %build
-sed 's|-D__OPTFLAGS__|%{optflags}|' -i default.bam
-bam -v release
+CFLAGS="%{optflags}" bam -v release
 
 
 %install
@@ -116,6 +115,9 @@
 
 
 %changelog
+* Sat Jan 17 2009 Lubomir Rintel <lkundrak at v3.sk> 0.5.0-1
+- New upstream release
+
 * Fri Jan 02 2009 Simon Wesp <cassmodiah at fedoraproject.org> 0.4.3-5
 - Remove requires from subpackage 'data'
 - Correct description 


--- teeworlds-datadir.patch DELETED ---


--- teeworlds-extlibs.patch DELETED ---



From lkundrak at fedoraproject.org  Sun Jan 18 18:31:22 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Sun, 18 Jan 2009 18:31:22 +0000 (UTC)
Subject: rpms/teeworlds/devel sources,1.3,1.4
Message-ID: <20090118183122.7F448700E0@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/teeworlds/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25456

Modified Files:
	sources 
Log Message:
Unbreak sources


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/teeworlds/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	18 Jan 2009 18:27:17 -0000	1.3
+++ sources	18 Jan 2009 18:30:52 -0000	1.4
@@ -1 +1,2 @@
 39d7b5d41c2c7250201214a4ab6844ed  teeworlds-0.5.0-src.tar.gz
+d541e3afa7809bd73bb64adb0795cb65  teeworlds.png



From eponyme at fedoraproject.org  Sun Jan 18 18:31:20 2009
From: eponyme at fedoraproject.org (Nicoleau Fabien)
Date: Sun, 18 Jan 2009 18:31:20 +0000 (UTC)
Subject: rpms/clive/F-10 .cvsignore, 1.7, 1.8 clive.spec, 1.6, 1.7 sources,
	1.7, 1.8
Message-ID: <20090118183120.CC2CC700E0@cvs1.fedora.phx.redhat.com>

Author: eponyme

Update of /cvs/pkgs/rpms/clive/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25430

Modified Files:
	.cvsignore clive.spec sources 
Log Message:
Update to 2.1.3


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/clive/F-10/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	4 Nov 2008 22:26:56 -0000	1.7
+++ .cvsignore	18 Jan 2009 18:30:50 -0000	1.8
@@ -1 +1 @@
-clive-1.0.2.tar.bz2
+clive-2.1.3.tar.bz2


Index: clive.spec
===================================================================
RCS file: /cvs/pkgs/rpms/clive/F-10/clive.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- clive.spec	4 Nov 2008 22:26:56 -0000	1.6
+++ clive.spec	18 Jan 2009 18:30:50 -0000	1.7
@@ -1,21 +1,15 @@
-%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 Name:           clive
-Version:        1.0.2
+Version:        2.1.3
 Release:        1%{?dist}
 Summary:        Video extraction tool for user-uploaded video hosts
 
 Group:          Applications/Multimedia
-License:        GPLv3+
-URL:            http://%{name}.sourceforge.net/
-Source0:        http://dl.gna.org/%{name}/1.0.x/%{name}-%{version}.tar.bz2
+License:        ISC
+URL:            http://code.google.com/p/%{name}/
+Source0:        http://%{name}.googlecode.com/files/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
-BuildRequires:  python-devel
-Requires:       newt-python
-Requires:       python-crypto 
-Requires:       python-feedparser
-Requires:       python-urlgrabber
 
 %description
 clive is a video extraction tool for user-uploaded video hosts such as Youtube,
@@ -28,14 +22,14 @@
 
 
 %build
-%configure
-make
-
+pod2man clive > clive.1
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
-
+mkdir -p $RPM_BUILD_ROOT%{_bindir}
+mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
+install -pm 755 %{name} $RPM_BUILD_ROOT%{_bindir}
+install -pm 644 %{name}.1 $RPM_BUILD_ROOT%{_mandir}/man1
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -43,17 +37,19 @@
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING INSTALL README TODO ChangeLog NEWS CHANGES HACKING
-%dir %{python_sitelib}/%{name}
+%doc AUTHORS CHANGES configrc INSTALL TODO LICENSE
 %{_bindir}/%{name}
-%{_bindir}/%{name}-passwd
-%{python_sitelib}/%{name}/*.py
-%{python_sitelib}/%{name}/*.pyc
-%{python_sitelib}/%{name}/*.pyo
-%{_mandir}/man?/%{name}*
-
+%{_mandir}/man1/%{name}.1.gz
 
 %changelog
+* Thu Jan 15 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> 2.1.3-1
+- Rebuild for 2.1.3
+- License update
+* Wed Dec 31 2008 Nicoleau Fabien <nicoleau.fabien at gmail.com> 2.1.2-1
+- Rebuild for 2.1.2
+- URLs update
+* Wed Dec  3 2008 Nicoleau Fabien <nicoleau.fabien at gmail.com> 2.1.0-1
+- Rebuild for 2.1.0
 * Sun Nov  2 2008 Nicoleau Fabien <nicoleau.fabien at gmail.com> 1.0.2-1
 - Rebuild for 1.0.2
 * Wed Jul 30 2008 Nicoleau Fabien <nicoleau.fabien at gmail.com> 0.4.20-1


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/clive/F-10/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	4 Nov 2008 22:26:56 -0000	1.7
+++ sources	18 Jan 2009 18:30:50 -0000	1.8
@@ -1 +1 @@
-ff617c65ba447bf2f3ef050d02a93dd3  clive-1.0.2.tar.bz2
+3e1cbaa365f0c0e09839dbcb85ab8415  clive-2.1.3.tar.bz2



From nphilipp at fedoraproject.org  Sun Jan 18 18:31:52 2009
From: nphilipp at fedoraproject.org (Nils Philippsen)
Date: Sun, 18 Jan 2009 18:31:52 +0000 (UTC)
Subject: rpms/xsane/devel .cvsignore, 1.17, 1.18 sources, 1.17,
	1.18 xsane.spec, 1.58, 1.59
Message-ID: <20090118183152.DCF1D700E0@cvs1.fedora.phx.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/xsane/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25529

Modified Files:
	.cvsignore sources xsane.spec 
Log Message:
version 0.996



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xsane/devel/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- .cvsignore	23 Nov 2007 11:03:41 -0000	1.17
+++ .cvsignore	18 Jan 2009 18:31:22 -0000	1.18
@@ -1 +1 @@
-xsane-0.995.tar.gz
+xsane-0.996.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xsane/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources	23 Nov 2007 11:03:41 -0000	1.17
+++ sources	18 Jan 2009 18:31:22 -0000	1.18
@@ -1 +1 @@
-5aaedb75973c3b13b136edec714e3fe8  xsane-0.995.tar.gz
+7dcbcdf0e83322d7c0a543672d9ca2d8  xsane-0.996.tar.gz


Index: xsane.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xsane/devel/xsane.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- xsane.spec	18 Jul 2008 14:13:01 -0000	1.58
+++ xsane.spec	18 Jan 2009 18:31:22 -0000	1.59
@@ -2,8 +2,8 @@
 
 Name: xsane
 Summary: X Window System front-end for the SANE scanner interface
-Version: 0.995
-Release: 5%{?dist}
+Version: 0.996
+Release: 1%{?dist}
 Source0: http://www.xsane.org/download/%{name}-%{version}.tar.gz
 Source1: xsane.desktop
 Source2: xsane.conf.in
@@ -107,6 +107,9 @@
 %config(noreplace) %{_sysconfdir}/gimp/plugins.d/xsane.conf
 
 %changelog
+* Sun Jan 18 2009 Nils Philippsen <nphilipp at redhat.com> - 0.996-1
+- versuib 0.996
+
 * Fri Jul 18 2008 Nils Philippsen <nphilipp at redhat.com> - 0.995-5
 - fix fd leak prevention (#455450)
 



From eponyme at fedoraproject.org  Sun Jan 18 18:38:12 2009
From: eponyme at fedoraproject.org (Nicoleau Fabien)
Date: Sun, 18 Jan 2009 18:38:12 +0000 (UTC)
Subject: rpms/clive/F-9 .cvsignore, 1.7, 1.8 clive.spec, 1.6, 1.7 sources,
	1.7, 1.8
Message-ID: <20090118183812.74B1E700E0@cvs1.fedora.phx.redhat.com>

Author: eponyme

Update of /cvs/pkgs/rpms/clive/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26684

Modified Files:
	.cvsignore clive.spec sources 
Log Message:
Update to 2.1.3


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/clive/F-9/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	4 Nov 2008 22:33:22 -0000	1.7
+++ .cvsignore	18 Jan 2009 18:37:42 -0000	1.8
@@ -1 +1 @@
-clive-1.0.2.tar.bz2
+clive-2.1.3.tar.bz2


Index: clive.spec
===================================================================
RCS file: /cvs/pkgs/rpms/clive/F-9/clive.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- clive.spec	4 Nov 2008 22:33:22 -0000	1.6
+++ clive.spec	18 Jan 2009 18:37:42 -0000	1.7
@@ -1,21 +1,15 @@
-%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 Name:           clive
-Version:        1.0.2
+Version:        2.1.3
 Release:        1%{?dist}
 Summary:        Video extraction tool for user-uploaded video hosts
 
 Group:          Applications/Multimedia
-License:        GPLv3+
-URL:            http://%{name}.sourceforge.net/
-Source0:        http://dl.gna.org/%{name}/1.0.x/%{name}-%{version}.tar.bz2
+License:        ISC
+URL:            http://code.google.com/p/%{name}/
+Source0:        http://%{name}.googlecode.com/files/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
-BuildRequires:  python-devel
-Requires:       newt-python
-Requires:       python-crypto 
-Requires:       python-feedparser
-Requires:       python-urlgrabber
 
 %description
 clive is a video extraction tool for user-uploaded video hosts such as Youtube,
@@ -28,14 +22,14 @@
 
 
 %build
-%configure
-make
-
+pod2man clive > clive.1
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
-
+mkdir -p $RPM_BUILD_ROOT%{_bindir}
+mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
+install -pm 755 %{name} $RPM_BUILD_ROOT%{_bindir}
+install -pm 644 %{name}.1 $RPM_BUILD_ROOT%{_mandir}/man1
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -43,17 +37,19 @@
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING INSTALL README TODO ChangeLog NEWS CHANGES HACKING
-%dir %{python_sitelib}/%{name}
+%doc AUTHORS CHANGES configrc INSTALL TODO LICENSE
 %{_bindir}/%{name}
-%{_bindir}/%{name}-passwd
-%{python_sitelib}/%{name}/*.py
-%{python_sitelib}/%{name}/*.pyc
-%{python_sitelib}/%{name}/*.pyo
-%{_mandir}/man?/%{name}*
-
+%{_mandir}/man1/%{name}.1.gz
 
 %changelog
+* Thu Jan 15 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> 2.1.3-1
+- Rebuild for 2.1.3
+- License update
+* Wed Dec 31 2008 Nicoleau Fabien <nicoleau.fabien at gmail.com> 2.1.2-1
+- Rebuild for 2.1.2
+- URLs update
+* Wed Dec  3 2008 Nicoleau Fabien <nicoleau.fabien at gmail.com> 2.1.0-1
+- Rebuild for 2.1.0
 * Sun Nov  2 2008 Nicoleau Fabien <nicoleau.fabien at gmail.com> 1.0.2-1
 - Rebuild for 1.0.2
 * Wed Jul 30 2008 Nicoleau Fabien <nicoleau.fabien at gmail.com> 0.4.20-1


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/clive/F-9/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	4 Nov 2008 22:33:22 -0000	1.7
+++ sources	18 Jan 2009 18:37:42 -0000	1.8
@@ -1 +1 @@
-ff617c65ba447bf2f3ef050d02a93dd3  clive-1.0.2.tar.bz2
+3e1cbaa365f0c0e09839dbcb85ab8415  clive-2.1.3.tar.bz2



From nphilipp at fedoraproject.org  Sun Jan 18 18:40:27 2009
From: nphilipp at fedoraproject.org (Nils Philippsen)
Date: Sun, 18 Jan 2009 18:40:27 +0000 (UTC)
Subject: rpms/xsane/devel xsane.spec,1.59,1.60
Message-ID: <20090118184027.06F42700E0@cvs1.fedora.phx.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/xsane/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26975

Modified Files:
	xsane.spec 
Log Message:
don't use %makeinstall



Index: xsane.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xsane/devel/xsane.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- xsane.spec	18 Jan 2009 18:31:22 -0000	1.59
+++ xsane.spec	18 Jan 2009 18:39:56 -0000	1.60
@@ -58,7 +58,7 @@
 
 %install
 rm -rf %{buildroot}
-%makeinstall
+make DESTDIR=%{buildroot} install
 
 install src/xsane-gimp %{buildroot}%{_bindir}
 
@@ -108,7 +108,8 @@
 
 %changelog
 * Sun Jan 18 2009 Nils Philippsen <nphilipp at redhat.com> - 0.996-1
-- versuib 0.996
+- version 0.996
+- don't use %%makeinstall
 
 * Fri Jul 18 2008 Nils Philippsen <nphilipp at redhat.com> - 0.995-5
 - fix fd leak prevention (#455450)



From lkundrak at fedoraproject.org  Sun Jan 18 18:41:07 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Sun, 18 Jan 2009 18:41:07 +0000 (UTC)
Subject: rpms/teeworlds/F-10 teeworlds-0.5.0-extlibs.patch, NONE,
	1.1 teeworlds-0.5.0-optflags.patch, NONE,
	1.1 teeworlds-0.5.0-segv.patch, NONE, 1.1 .cvsignore, 1.2,
	1.3 sources, 1.2, 1.3 teeworlds.spec, 1.1,
	1.2 teeworlds-datadir.patch, 1.1, NONE teeworlds-extlibs.patch,
	1.1, NONE
Message-ID: <20090118184107.56F19700E0@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/teeworlds/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27141/F-10

Modified Files:
	.cvsignore sources teeworlds.spec 
Added Files:
	teeworlds-0.5.0-extlibs.patch teeworlds-0.5.0-optflags.patch 
	teeworlds-0.5.0-segv.patch 
Removed Files:
	teeworlds-datadir.patch teeworlds-extlibs.patch 
Log Message:
Import 0.5.0 into branches

teeworlds-0.5.0-extlibs.patch:

--- NEW FILE teeworlds-0.5.0-extlibs.patch ---
Use external libraries.

* Bam checks for headers existence in a rather stupid way. It should be
  fixed to allow OptFindLibrary("pnglite", {"sys/types.h", "pnglite.h"}...

* Multiple directores to look for headers are not yet implemented in bam,
  therefore these are really Fedora specific.

* engine_openfile() search multiple paths, which we don't do.

Lubomir Rintel <lkundrak at v3.sk>

diff -up teeworlds-0.5.0-src/default.bam.extlibs teeworlds-0.5.0-src/default.bam
--- teeworlds-0.5.0-src/default.bam.extlibs	2009-01-13 20:36:11.000000000 +0100
+++ teeworlds-0.5.0-src/default.bam	2009-01-18 19:08:33.000000000 +0100
@@ -7,6 +7,8 @@ config = NewConfig()
 config:Add(OptFindCompiler())
 config:Add(OptTestCompileC("stackprotector", "int main(){return 0;}", "-fstack-protector -fstack-protector-all"))
 config:Add(OptFindLibrary("zlib", "zlib.h", false))
+config:Add(OptFindLibrary("wavpack", "wavpack/wavpack.h", false))
+config:Add(OptFindLibrary("pnglite", "sys/types.h", false))
 config:Add(SDL.OptFind("sdl", true))
 config:Finalize("config.bam")
 
@@ -156,9 +161,30 @@ function build(settings)
 		settings.cc.includes:Add("src/engine/external/zlib")
 	end
 
-	-- build the small libraries
-	wavpack = Compile(settings, Collect("src/engine/external/wavpack/*.c"))
-	pnglite = Compile(settings, Collect("src/engine/external/pnglite/*.c"))
+	-- compile wavpack if needed
+	if config.wavpack.value == 1 then
+		settings.link.libs:Add("wavpack")
+		if config.wavpack.include_path then
+			settings.cc.includes:Add(config.wavpack.include_path)
+		end
+		wavpack = {}
+	else
+		wavpack = Compile(settings, Collect("src/engine/external/wavpack/*.c"))
+		settings.cc.includes:Add("src/engine/external")
+	end
+
+
+	-- compile pnglite if needed
+	if config.pnglite.value == 1 then
+		settings.link.libs:Add("pnglite")
+		if config.pnglite.include_path then
+			settings.cc.includes:Add(config.pnglite.include_path)
+		end
+		pnglite = {}
+	else
+		pnglite = Compile(settings, Collect("src/engine/external/pnglite/*.c"))
+		settings.cc.includes:Add("src/engine/external/pnglite")
+	end
 	
 	-- build game components
 	engine_settings = settings:Copy()
diff -up teeworlds-0.5.0-src/src/engine/client/ec_gfx.c.extlibs teeworlds-0.5.0-src/src/engine/client/ec_gfx.c
--- teeworlds-0.5.0-src/src/engine/client/ec_gfx.c.extlibs	2009-01-13 20:36:11.000000000 +0100
+++ teeworlds-0.5.0-src/src/engine/client/ec_gfx.c	2009-01-18 18:43:39.000000000 +0100
@@ -18,7 +18,7 @@
 #endif
 
 #include <base/system.h>
-#include <engine/external/pnglite/pnglite.h>
+#include <pnglite.h>
 
 #include <engine/e_client_interface.h>
 #include <engine/e_engine.h>
diff -up teeworlds-0.5.0-src/src/engine/client/ec_snd.c.extlibs teeworlds-0.5.0-src/src/engine/client/ec_snd.c
--- teeworlds-0.5.0-src/src/engine/client/ec_snd.c.extlibs	2009-01-13 20:36:11.000000000 +0100
+++ teeworlds-0.5.0-src/src/engine/client/ec_snd.c	2009-01-18 19:07:35.000000000 +0100
@@ -6,7 +6,7 @@
 
 #include "SDL.h"
 
-#include <engine/external/wavpack/wavpack.h>
+#include <wavpack/wavpack.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <math.h>
@@ -358,19 +358,12 @@ static void rate_convert(int sid)
 	snd->num_frames = num_frames;
 }
 
-
-static IOHANDLE file = NULL;
-
-static int read_data(void *buffer, int size)
-{
-	return io_read(file, buffer, size);
-}
-
 int snd_load_wv(const char *filename)
 {
 	SAMPLE *snd;
 	int sid = -1;
 	char error[100];
+	char completefilename[512];
 	WavpackContext *context;
 	
 	/* don't waste memory on sound when we are stress testing */
@@ -381,19 +374,13 @@ int snd_load_wv(const char *filename)
 	if(!sound_enabled)
 		return 1;
 
-	file = engine_openfile(filename, IOFLAG_READ); /* TODO: use system.h stuff for this */
-	if(!file)
-	{
-		dbg_msg("sound/wv", "failed to open %s", filename);
-		return -1;
-	}
-
 	sid = snd_alloc_id();
 	if(sid < 0)
 		return -1;
 	snd = &samples[sid];
 
-	context = WavpackOpenFileInput(read_data, error);
+	engine_getpath(completefilename, sizeof(completefilename), filename, IOFLAG_READ);
+	context = WavpackOpenFileInput(completefilename, error, 0, 0);
 	if (context)
 	{
 		int samples = WavpackGetNumSamples(context);
@@ -445,12 +432,9 @@ int snd_load_wv(const char *filename)
 	}
 	else
 	{
-		dbg_msg("sound/wv", "failed to open %s: %s", filename, error);
+		dbg_msg("sound/wv", "failed to open %s: %s", completefilename, error);
 	}
 
-	io_close(file);
-	file = NULL;
-
 	if(config.debug)
 		dbg_msg("sound/wv", "loaded %s", filename);
 
diff -up teeworlds-0.5.0-src/src/game/client/render.hpp.extlibs teeworlds-0.5.0-src/src/game/client/render.hpp
--- teeworlds-0.5.0-src/src/game/client/render.hpp.extlibs	2009-01-13 20:36:11.000000000 +0100
+++ teeworlds-0.5.0-src/src/game/client/render.hpp	2009-01-18 18:43:39.000000000 +0100
@@ -37,7 +37,7 @@ enum
 	TILERENDERFLAG_EXTEND=4,
 };
 
-typedef struct SPRITE;
+struct SPRITE;
 
 void select_sprite(SPRITE *spr, int flags=0, int sx=0, int sy=0);
 void select_sprite(int id, int flags=0, int sx=0, int sy=0);
diff -up teeworlds-0.5.0-src/src/tools/dilate.c.extlibs teeworlds-0.5.0-src/src/tools/dilate.c
--- teeworlds-0.5.0-src/src/tools/dilate.c.extlibs	2009-01-13 20:36:11.000000000 +0100
+++ teeworlds-0.5.0-src/src/tools/dilate.c	2009-01-18 18:43:39.000000000 +0100
@@ -1,6 +1,9 @@
 /* copyright (c) 2007 magnus auvinen, see licence.txt for more info */
 
-#include "../engine/external/pnglite/pnglite.c"
+#include <sys/types.h>
+#include <string.h>
+#include <stdio.h>
+#include <pnglite.h>
 
 typedef struct pixel_t
 {
diff -up teeworlds-0.5.0-src/src/tools/tileset_borderfix.c.extlibs teeworlds-0.5.0-src/src/tools/tileset_borderfix.c
--- teeworlds-0.5.0-src/src/tools/tileset_borderfix.c.extlibs	2009-01-13 20:36:11.000000000 +0100
+++ teeworlds-0.5.0-src/src/tools/tileset_borderfix.c	2009-01-18 18:43:39.000000000 +0100
@@ -1,6 +1,9 @@
 /* copyright (c) 2007 magnus auvinen, see licence.txt for more info */
 
-#include "../engine/external/pnglite/pnglite.c"
+#include <sys/types.h>
+#include <string.h>
+#include <stdio.h>
+#include <pnglite.h>
 
 typedef struct pixel_t
 {

teeworlds-0.5.0-optflags.patch:

--- NEW FILE teeworlds-0.5.0-optflags.patch ---
This should really be done in bam's NewSettings.

Lubomir Rintel <lkundrak at v3.sk>

diff -urp teeworlds-0.5.0-src/default.bam teeworlds-0.5.0-src.fixed/default.bam
--- teeworlds-0.5.0-src/default.bam	2009-01-17 14:20:53.000000000 +0100
+++ teeworlds-0.5.0-src.fixed/default.bam	2009-01-17 14:18:23.000000000 +0100
@@ -106,6 +109,9 @@ end
 function build(settings)
 	--settings.objdir = Path("objs")
 	settings.cc.Output = Intermediate_Output
+	settings.cc.flags:Add(os.getenv ('CFLAGS'))
+	settings.cc.flags:Add(os.getenv ('CPPFLAGS'))
+	settings.cc.flags:Add(os.getenv ('LDFLAGS'))
 
 	if config.compiler.value == "cl" then
 		settings.cc.flags:Add("/wd4244")

teeworlds-0.5.0-segv.patch:

--- NEW FILE teeworlds-0.5.0-segv.patch ---
Don't segfault when graphics can't be initialized (i.e. attempt to
launch outside of X11)

Lubomir Rintel <lkundrak at v3.sk>

diff -up teeworlds-0.5.0-src/src/engine/client/ec_client.c.segv teeworlds-0.5.0-src/src/engine/client/ec_client.c
--- teeworlds-0.5.0-src/src/engine/client/ec_client.c.segv	2009-01-18 19:19:05.000000000 +0100
+++ teeworlds-0.5.0-src/src/engine/client/ec_client.c	2009-01-18 19:19:24.000000000 +0100
@@ -1521,7 +1521,7 @@ static void client_run()
 	snapshot_parts = 0;
 	
 	/* init graphics and sound */
-	if(!gfx_init())
+	if(gfx_init() < 1)
 		return;
 
 	/* start refreshing addresses while we load */


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/teeworlds/F-10/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Jan 2009 14:49:21 -0000	1.2
+++ .cvsignore	18 Jan 2009 18:40:36 -0000	1.3
@@ -1,2 +1,2 @@
-teeworlds-0.4.3-src.tar.gz
+teeworlds-0.5.0-src.tar.gz
 teeworlds.png


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/teeworlds/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Jan 2009 14:49:21 -0000	1.2
+++ sources	18 Jan 2009 18:40:36 -0000	1.3
@@ -1,2 +1,2 @@
-a31a8cbd1af3f71a462122166e5872d6  teeworlds-0.4.3-src.tar.gz
+39d7b5d41c2c7250201214a4ab6844ed  teeworlds-0.5.0-src.tar.gz
 d541e3afa7809bd73bb64adb0795cb65  teeworlds.png


Index: teeworlds.spec
===================================================================
RCS file: /cvs/pkgs/rpms/teeworlds/F-10/teeworlds.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- teeworlds.spec	8 Jan 2009 14:49:21 -0000	1.1
+++ teeworlds.spec	18 Jan 2009 18:40:37 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           teeworlds
-Version:        0.4.3
-Release:        5%{?dist}
+Version:        0.5.0
+Release:        1%{?dist}
 Summary:        Online multi-player platform 2D shooter
 
 Group:          Amusements/Games
@@ -9,20 +9,20 @@
 Source0:        http://www.teeworlds.com/files/%{name}-%{version}-src.tar.gz
 Source1:        %{name}.png
 Source2:        %{name}.desktop
-Patch0:         %{name}-datadir.patch
-Patch1:         %{name}-extlibs.patch
+Patch1:         %{name}-0.5.0-extlibs.patch
+Patch2:         %{name}-0.5.0-optflags.patch
+Patch3:         %{name}-0.5.0-segv.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  mesa-libGLU-devel
-BuildRequires:  bam = 0.0.%{version}
+BuildRequires:  bam >= 0.2.0
 BuildRequires:  python-devel
 BuildRequires:  alsa-lib-devel
 BuildRequires:  desktop-file-utils
 BuildRequires:  zlib-devel
-BuildRequires:  libglfw-devel
 BuildRequires:  wavpack-devel
-BuildRequires:  portaudio-devel
 BuildRequires:  pnglite-devel
+BuildRequires:  SDL-devel
 Requires:       %{name}-data
    
 
@@ -51,19 +51,18 @@
 
 %prep
 %setup -q -n %{name}-%{version}-src
+rm -rf src/engine/external
 
-%patch0 -p1 -b .datadir
 %patch1 -p1 -b .extlibs
-rm -rf src/engine/external
+%patch2 -p1 -b .optflags
+%patch3 -p1 -b .segv
 
-iconv -f iso-8859-1 -t utf-8 readme.txt > readme.txt.utf8
-sed -i 's|\r$||g' readme.txt.utf8
+iconv -f iso-8859-1 -t utf-8 readme.txt |sed 's|\r||g' > readme.txt.utf8
 touch -c -r readme.txt readme.txt.utf8
 mv readme.txt.utf8 readme.txt
 
 %build
-sed 's|-D__OPTFLAGS__|%{optflags}|' -i default.bam
-bam -v release
+CFLAGS="%{optflags}" bam -v release
 
 
 %install
@@ -116,6 +115,9 @@
 
 
 %changelog
+* Sat Jan 17 2009 Lubomir Rintel <lkundrak at v3.sk> 0.5.0-1
+- New upstream release
+
 * Fri Jan 02 2009 Simon Wesp <cassmodiah at fedoraproject.org> 0.4.3-5
 - Remove requires from subpackage 'data'
 - Correct description 


--- teeworlds-datadir.patch DELETED ---


--- teeworlds-extlibs.patch DELETED ---



From lkundrak at fedoraproject.org  Sun Jan 18 18:41:07 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Sun, 18 Jan 2009 18:41:07 +0000 (UTC)
Subject: rpms/teeworlds/F-9 teeworlds-0.5.0-extlibs.patch, NONE,
	1.1 teeworlds-0.5.0-optflags.patch, NONE,
	1.1 teeworlds-0.5.0-segv.patch, NONE, 1.1 .cvsignore, 1.2,
	1.3 sources, 1.2, 1.3 teeworlds.spec, 1.1,
	1.2 teeworlds-datadir.patch, 1.1, NONE teeworlds-extlibs.patch,
	1.1, NONE
Message-ID: <20090118184107.D2372700E0@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/teeworlds/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27141/F-9

Modified Files:
	.cvsignore sources teeworlds.spec 
Added Files:
	teeworlds-0.5.0-extlibs.patch teeworlds-0.5.0-optflags.patch 
	teeworlds-0.5.0-segv.patch 
Removed Files:
	teeworlds-datadir.patch teeworlds-extlibs.patch 
Log Message:
Import 0.5.0 into branches

teeworlds-0.5.0-extlibs.patch:

--- NEW FILE teeworlds-0.5.0-extlibs.patch ---
Use external libraries.

* Bam checks for headers existence in a rather stupid way. It should be
  fixed to allow OptFindLibrary("pnglite", {"sys/types.h", "pnglite.h"}...

* Multiple directores to look for headers are not yet implemented in bam,
  therefore these are really Fedora specific.

* engine_openfile() search multiple paths, which we don't do.

Lubomir Rintel <lkundrak at v3.sk>

diff -up teeworlds-0.5.0-src/default.bam.extlibs teeworlds-0.5.0-src/default.bam
--- teeworlds-0.5.0-src/default.bam.extlibs	2009-01-13 20:36:11.000000000 +0100
+++ teeworlds-0.5.0-src/default.bam	2009-01-18 19:08:33.000000000 +0100
@@ -7,6 +7,8 @@ config = NewConfig()
 config:Add(OptFindCompiler())
 config:Add(OptTestCompileC("stackprotector", "int main(){return 0;}", "-fstack-protector -fstack-protector-all"))
 config:Add(OptFindLibrary("zlib", "zlib.h", false))
+config:Add(OptFindLibrary("wavpack", "wavpack/wavpack.h", false))
+config:Add(OptFindLibrary("pnglite", "sys/types.h", false))
 config:Add(SDL.OptFind("sdl", true))
 config:Finalize("config.bam")
 
@@ -156,9 +161,30 @@ function build(settings)
 		settings.cc.includes:Add("src/engine/external/zlib")
 	end
 
-	-- build the small libraries
-	wavpack = Compile(settings, Collect("src/engine/external/wavpack/*.c"))
-	pnglite = Compile(settings, Collect("src/engine/external/pnglite/*.c"))
+	-- compile wavpack if needed
+	if config.wavpack.value == 1 then
+		settings.link.libs:Add("wavpack")
+		if config.wavpack.include_path then
+			settings.cc.includes:Add(config.wavpack.include_path)
+		end
+		wavpack = {}
+	else
+		wavpack = Compile(settings, Collect("src/engine/external/wavpack/*.c"))
+		settings.cc.includes:Add("src/engine/external")
+	end
+
+
+	-- compile pnglite if needed
+	if config.pnglite.value == 1 then
+		settings.link.libs:Add("pnglite")
+		if config.pnglite.include_path then
+			settings.cc.includes:Add(config.pnglite.include_path)
+		end
+		pnglite = {}
+	else
+		pnglite = Compile(settings, Collect("src/engine/external/pnglite/*.c"))
+		settings.cc.includes:Add("src/engine/external/pnglite")
+	end
 	
 	-- build game components
 	engine_settings = settings:Copy()
diff -up teeworlds-0.5.0-src/src/engine/client/ec_gfx.c.extlibs teeworlds-0.5.0-src/src/engine/client/ec_gfx.c
--- teeworlds-0.5.0-src/src/engine/client/ec_gfx.c.extlibs	2009-01-13 20:36:11.000000000 +0100
+++ teeworlds-0.5.0-src/src/engine/client/ec_gfx.c	2009-01-18 18:43:39.000000000 +0100
@@ -18,7 +18,7 @@
 #endif
 
 #include <base/system.h>
-#include <engine/external/pnglite/pnglite.h>
+#include <pnglite.h>
 
 #include <engine/e_client_interface.h>
 #include <engine/e_engine.h>
diff -up teeworlds-0.5.0-src/src/engine/client/ec_snd.c.extlibs teeworlds-0.5.0-src/src/engine/client/ec_snd.c
--- teeworlds-0.5.0-src/src/engine/client/ec_snd.c.extlibs	2009-01-13 20:36:11.000000000 +0100
+++ teeworlds-0.5.0-src/src/engine/client/ec_snd.c	2009-01-18 19:07:35.000000000 +0100
@@ -6,7 +6,7 @@
 
 #include "SDL.h"
 
-#include <engine/external/wavpack/wavpack.h>
+#include <wavpack/wavpack.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <math.h>
@@ -358,19 +358,12 @@ static void rate_convert(int sid)
 	snd->num_frames = num_frames;
 }
 
-
-static IOHANDLE file = NULL;
-
-static int read_data(void *buffer, int size)
-{
-	return io_read(file, buffer, size);
-}
-
 int snd_load_wv(const char *filename)
 {
 	SAMPLE *snd;
 	int sid = -1;
 	char error[100];
+	char completefilename[512];
 	WavpackContext *context;
 	
 	/* don't waste memory on sound when we are stress testing */
@@ -381,19 +374,13 @@ int snd_load_wv(const char *filename)
 	if(!sound_enabled)
 		return 1;
 
-	file = engine_openfile(filename, IOFLAG_READ); /* TODO: use system.h stuff for this */
-	if(!file)
-	{
-		dbg_msg("sound/wv", "failed to open %s", filename);
-		return -1;
-	}
-
 	sid = snd_alloc_id();
 	if(sid < 0)
 		return -1;
 	snd = &samples[sid];
 
-	context = WavpackOpenFileInput(read_data, error);
+	engine_getpath(completefilename, sizeof(completefilename), filename, IOFLAG_READ);
+	context = WavpackOpenFileInput(completefilename, error, 0, 0);
 	if (context)
 	{
 		int samples = WavpackGetNumSamples(context);
@@ -445,12 +432,9 @@ int snd_load_wv(const char *filename)
 	}
 	else
 	{
-		dbg_msg("sound/wv", "failed to open %s: %s", filename, error);
+		dbg_msg("sound/wv", "failed to open %s: %s", completefilename, error);
 	}
 
-	io_close(file);
-	file = NULL;
-
 	if(config.debug)
 		dbg_msg("sound/wv", "loaded %s", filename);
 
diff -up teeworlds-0.5.0-src/src/game/client/render.hpp.extlibs teeworlds-0.5.0-src/src/game/client/render.hpp
--- teeworlds-0.5.0-src/src/game/client/render.hpp.extlibs	2009-01-13 20:36:11.000000000 +0100
+++ teeworlds-0.5.0-src/src/game/client/render.hpp	2009-01-18 18:43:39.000000000 +0100
@@ -37,7 +37,7 @@ enum
 	TILERENDERFLAG_EXTEND=4,
 };
 
-typedef struct SPRITE;
+struct SPRITE;
 
 void select_sprite(SPRITE *spr, int flags=0, int sx=0, int sy=0);
 void select_sprite(int id, int flags=0, int sx=0, int sy=0);
diff -up teeworlds-0.5.0-src/src/tools/dilate.c.extlibs teeworlds-0.5.0-src/src/tools/dilate.c
--- teeworlds-0.5.0-src/src/tools/dilate.c.extlibs	2009-01-13 20:36:11.000000000 +0100
+++ teeworlds-0.5.0-src/src/tools/dilate.c	2009-01-18 18:43:39.000000000 +0100
@@ -1,6 +1,9 @@
 /* copyright (c) 2007 magnus auvinen, see licence.txt for more info */
 
-#include "../engine/external/pnglite/pnglite.c"
+#include <sys/types.h>
+#include <string.h>
+#include <stdio.h>
+#include <pnglite.h>
 
 typedef struct pixel_t
 {
diff -up teeworlds-0.5.0-src/src/tools/tileset_borderfix.c.extlibs teeworlds-0.5.0-src/src/tools/tileset_borderfix.c
--- teeworlds-0.5.0-src/src/tools/tileset_borderfix.c.extlibs	2009-01-13 20:36:11.000000000 +0100
+++ teeworlds-0.5.0-src/src/tools/tileset_borderfix.c	2009-01-18 18:43:39.000000000 +0100
@@ -1,6 +1,9 @@
 /* copyright (c) 2007 magnus auvinen, see licence.txt for more info */
 
-#include "../engine/external/pnglite/pnglite.c"
+#include <sys/types.h>
+#include <string.h>
+#include <stdio.h>
+#include <pnglite.h>
 
 typedef struct pixel_t
 {

teeworlds-0.5.0-optflags.patch:

--- NEW FILE teeworlds-0.5.0-optflags.patch ---
This should really be done in bam's NewSettings.

Lubomir Rintel <lkundrak at v3.sk>

diff -urp teeworlds-0.5.0-src/default.bam teeworlds-0.5.0-src.fixed/default.bam
--- teeworlds-0.5.0-src/default.bam	2009-01-17 14:20:53.000000000 +0100
+++ teeworlds-0.5.0-src.fixed/default.bam	2009-01-17 14:18:23.000000000 +0100
@@ -106,6 +109,9 @@ end
 function build(settings)
 	--settings.objdir = Path("objs")
 	settings.cc.Output = Intermediate_Output
+	settings.cc.flags:Add(os.getenv ('CFLAGS'))
+	settings.cc.flags:Add(os.getenv ('CPPFLAGS'))
+	settings.cc.flags:Add(os.getenv ('LDFLAGS'))
 
 	if config.compiler.value == "cl" then
 		settings.cc.flags:Add("/wd4244")

teeworlds-0.5.0-segv.patch:

--- NEW FILE teeworlds-0.5.0-segv.patch ---
Don't segfault when graphics can't be initialized (i.e. attempt to
launch outside of X11)

Lubomir Rintel <lkundrak at v3.sk>

diff -up teeworlds-0.5.0-src/src/engine/client/ec_client.c.segv teeworlds-0.5.0-src/src/engine/client/ec_client.c
--- teeworlds-0.5.0-src/src/engine/client/ec_client.c.segv	2009-01-18 19:19:05.000000000 +0100
+++ teeworlds-0.5.0-src/src/engine/client/ec_client.c	2009-01-18 19:19:24.000000000 +0100
@@ -1521,7 +1521,7 @@ static void client_run()
 	snapshot_parts = 0;
 	
 	/* init graphics and sound */
-	if(!gfx_init())
+	if(gfx_init() < 1)
 		return;
 
 	/* start refreshing addresses while we load */


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/teeworlds/F-9/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Jan 2009 14:49:22 -0000	1.2
+++ .cvsignore	18 Jan 2009 18:40:37 -0000	1.3
@@ -1,2 +1,2 @@
-teeworlds-0.4.3-src.tar.gz
+teeworlds-0.5.0-src.tar.gz
 teeworlds.png


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/teeworlds/F-9/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Jan 2009 14:49:22 -0000	1.2
+++ sources	18 Jan 2009 18:40:37 -0000	1.3
@@ -1,2 +1,2 @@
-a31a8cbd1af3f71a462122166e5872d6  teeworlds-0.4.3-src.tar.gz
+39d7b5d41c2c7250201214a4ab6844ed  teeworlds-0.5.0-src.tar.gz
 d541e3afa7809bd73bb64adb0795cb65  teeworlds.png


Index: teeworlds.spec
===================================================================
RCS file: /cvs/pkgs/rpms/teeworlds/F-9/teeworlds.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- teeworlds.spec	8 Jan 2009 14:49:22 -0000	1.1
+++ teeworlds.spec	18 Jan 2009 18:40:37 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           teeworlds
-Version:        0.4.3
-Release:        5%{?dist}
+Version:        0.5.0
+Release:        1%{?dist}
 Summary:        Online multi-player platform 2D shooter
 
 Group:          Amusements/Games
@@ -9,20 +9,20 @@
 Source0:        http://www.teeworlds.com/files/%{name}-%{version}-src.tar.gz
 Source1:        %{name}.png
 Source2:        %{name}.desktop
-Patch0:         %{name}-datadir.patch
-Patch1:         %{name}-extlibs.patch
+Patch1:         %{name}-0.5.0-extlibs.patch
+Patch2:         %{name}-0.5.0-optflags.patch
+Patch3:         %{name}-0.5.0-segv.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  mesa-libGLU-devel
-BuildRequires:  bam = 0.0.%{version}
+BuildRequires:  bam >= 0.2.0
 BuildRequires:  python-devel
 BuildRequires:  alsa-lib-devel
 BuildRequires:  desktop-file-utils
 BuildRequires:  zlib-devel
-BuildRequires:  libglfw-devel
 BuildRequires:  wavpack-devel
-BuildRequires:  portaudio-devel
 BuildRequires:  pnglite-devel
+BuildRequires:  SDL-devel
 Requires:       %{name}-data
    
 
@@ -51,19 +51,18 @@
 
 %prep
 %setup -q -n %{name}-%{version}-src
+rm -rf src/engine/external
 
-%patch0 -p1 -b .datadir
 %patch1 -p1 -b .extlibs
-rm -rf src/engine/external
+%patch2 -p1 -b .optflags
+%patch3 -p1 -b .segv
 
-iconv -f iso-8859-1 -t utf-8 readme.txt > readme.txt.utf8
-sed -i 's|\r$||g' readme.txt.utf8
+iconv -f iso-8859-1 -t utf-8 readme.txt |sed 's|\r||g' > readme.txt.utf8
 touch -c -r readme.txt readme.txt.utf8
 mv readme.txt.utf8 readme.txt
 
 %build
-sed 's|-D__OPTFLAGS__|%{optflags}|' -i default.bam
-bam -v release
+CFLAGS="%{optflags}" bam -v release
 
 
 %install
@@ -116,6 +115,9 @@
 
 
 %changelog
+* Sat Jan 17 2009 Lubomir Rintel <lkundrak at v3.sk> 0.5.0-1
+- New upstream release
+
 * Fri Jan 02 2009 Simon Wesp <cassmodiah at fedoraproject.org> 0.4.3-5
 - Remove requires from subpackage 'data'
 - Correct description 


--- teeworlds-datadir.patch DELETED ---


--- teeworlds-extlibs.patch DELETED ---



From lkundrak at fedoraproject.org  Sun Jan 18 18:41:08 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Sun, 18 Jan 2009 18:41:08 +0000 (UTC)
Subject: rpms/teeworlds/devel .cvsignore,1.3,1.4
Message-ID: <20090118184108.00AD6700E0@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/teeworlds/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27141/devel

Modified Files:
	.cvsignore 
Log Message:
Import 0.5.0 into branches


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/teeworlds/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	18 Jan 2009 18:27:17 -0000	1.3
+++ .cvsignore	18 Jan 2009 18:40:37 -0000	1.4
@@ -1 +1,2 @@
 teeworlds-0.5.0-src.tar.gz
+teeworlds.png



From nphilipp at fedoraproject.org  Sun Jan 18 19:28:38 2009
From: nphilipp at fedoraproject.org (Nils Philippsen)
Date: Sun, 18 Jan 2009 19:28:38 +0000 (UTC)
Subject: rpms/xsane/devel xsane.spec,1.60,1.61
Message-ID: <20090118192838.30EA8700E0@cvs1.fedora.phx.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/xsane/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv388

Modified Files:
	xsane.spec 
Log Message:
use our own desktop file



Index: xsane.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xsane/devel/xsane.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- xsane.spec	18 Jan 2009 18:39:56 -0000	1.60
+++ xsane.spec	18 Jan 2009 19:28:07 -0000	1.61
@@ -62,7 +62,8 @@
 
 install src/xsane-gimp %{buildroot}%{_bindir}
 
-mkdir %{buildroot}%{_datadir}/applications
+# use our own desktop file
+rm %{buildroot}%{_datadir}/applications/xsane.desktop
 desktop-file-install --vendor %{desktop_vendor}         \
     --dir %{buildroot}%{_datadir}/applications          \
     %{SOURCE1}



From remi at fedoraproject.org  Sun Jan 18 19:32:16 2009
From: remi at fedoraproject.org (Remi Collet)
Date: Sun, 18 Jan 2009 19:32:16 +0000 (UTC)
Subject: rpms/ocsinventory/EL-4 ocsinventory.spec,1.2,1.3
Message-ID: <20090118193216.E68B6700E0@cvs1.fedora.phx.redhat.com>

Author: remi

Update of /cvs/extras/rpms/ocsinventory/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1454

Modified Files:
	ocsinventory.spec 
Log Message:
fix broken deps (php-xml / php-domxml)


Index: ocsinventory.spec
===================================================================
RCS file: /cvs/extras/rpms/ocsinventory/EL-4/ocsinventory.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ocsinventory.spec	11 Jan 2009 11:41:02 -0000	1.2
+++ ocsinventory.spec	18 Jan 2009 19:31:46 -0000	1.3
@@ -10,7 +10,7 @@
 Summary:     Open Computer and Software Inventory Next Generation
 
 Version:     1.02
-Release:     0.10.rc3%{?dist}
+Release:     0.10.rc3%{?dist}.1
 
 Group:       Applications/Internet
 License:     GPLv2
@@ -111,7 +111,12 @@
 Summary:  OCS Inventory NG - Communication server
 # From PHP_Compat : date, mysql, ereg, pcre, zip, hash, xml, gd, zlib 
 Requires: php
-Requires: php-mysql php-zip php-xml php-gd 
+Requires: php-mysql php-zip php-gd 
+%if 0%{?rhel} == 4
+Requires:       php-domxml
+%else
+Requires:       php-xml
+%endif
 # Required by the original setup script, but not detected automatically :
 Requires: perl(DBD::mysql)
 # Required by ipdiscover-util.pl (nmap and nmblookup)
@@ -283,6 +288,9 @@
 
 
 %changelog
+* Sun Jan 18 2009 Remi Collet <Fedora at famillecollet.com> 1.02-0.10.rc3.el4.1
+- fix php-xml > php-domxml in EL-4
+
 * Sun Jan 11 2009 Remi Collet <Fedora at famillecollet.com> 1.02-0.10.rc3
 - add r1447 and r1462 patch
 - change log selinux context (httpd_log_t)



From lkundrak at fedoraproject.org  Sun Jan 18 19:36:58 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Sun, 18 Jan 2009 19:36:58 +0000 (UTC)
Subject: rpms/supertux/devel supertux-0.3.1-comments.patch, NONE,
	1.1 supertux-0.3.1-cons_disable.patch, NONE, 1.1 supertux.spec,
	1.19, 1.20
Message-ID: <20090118193658.6A916700E0@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/supertux/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2143

Modified Files:
	supertux.spec 
Added Files:
	supertux-0.3.1-comments.patch 
	supertux-0.3.1-cons_disable.patch 
Log Message:
* Sun Jan 18 2008 Lubomir Rintel <lkundrak at v3.sk> 0.3.1-4
- Fix parsing of translations (#477497)
- Disable debugging console


supertux-0.3.1-comments.patch:

--- NEW FILE supertux-0.3.1-comments.patch ---
From: Lubomir Rintel <lkundrak at v3.sk>
Subject: [PATCH] Fix useless warnings using most locales

This actually addresses two issues:

Consider blank lines to be comments, skip over them rather than
attempting to read keywords there.

Empty a token when the comment is enountered -- the comment
is not necessarily followed by a keyword, but it can be an EOF.

diff -up supertux-0.3.1/src/tinygettext/tinygettext.cpp.comments supertux-0.3.1/src/tinygettext/tinygettext.cpp
--- supertux-0.3.1/src/tinygettext/tinygettext.cpp.comments	2008-12-20 22:37:54.000000000 +0100
+++ supertux-0.3.1/src/tinygettext/tinygettext.cpp	2008-12-20 22:38:17.000000000 +0100
@@ -705,15 +705,16 @@ public:
         switch(state)
           {
           case READ_KEYWORD:
-            if (c == '#')
+            // Read a new token
+            token = Token();
+
+            if (c == '#' || c == '\n' || c == '\r')
               {
                 state = SKIP_COMMENT;
+                in.unget();
               }
             else
               {
-                // Read a new token
-                token = Token();
-
                 do { // Read keyword
                   token.keyword += c;
                 } while((c = getchar(in)) != EOF && !isspace(c));

supertux-0.3.1-cons_disable.patch:

--- NEW FILE supertux-0.3.1-cons_disable.patch ---
diff -up supertux-0.3.1/src/console.cpp.cons_disable supertux-0.3.1/src/console.cpp
--- supertux-0.3.1/src/console.cpp.cons_disable	2008-12-20 22:46:37.000000000 +0100
+++ supertux-0.3.1/src/console.cpp	2008-12-20 22:46:48.000000000 +0100
@@ -347,6 +347,7 @@ Console::addLine(std::string s)
   // output line to stderr
   std::cerr << s << std::endl;
 
+#if 0
   // wrap long lines
   std::string overflow;
   unsigned int line_count = 0;
@@ -373,6 +374,7 @@ Console::addLine(std::string s)
   // increase time that console stays open
   if(stayOpen < 6)
     stayOpen += 1.5;
+#endif
 }
 
 void


Index: supertux.spec
===================================================================
RCS file: /cvs/pkgs/rpms/supertux/devel/supertux.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- supertux.spec	10 Jul 2008 09:26:37 -0000	1.19
+++ supertux.spec	18 Jan 2009 19:36:28 -0000	1.20
@@ -6,7 +6,7 @@
 
 Name:           supertux
 Version:        0.3.1
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Jump'n run like game similar to Mario Bros
 Group:          Amusements/Games
 License:        GPLv2+
@@ -14,6 +14,8 @@
 #Source0:        http://download.berlios.de/supertux/supertux-%{version}.tar.bz2
 Source0:        http://download.berlios.de/supertux/supertux-%{version}d.tar.bz2
 Patch0:         supertux-0.3.1-gcc43.patch
+Patch1:         supertux-0.3.1-comments.patch
+Patch2:         supertux-0.3.1-cons_disable.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  SDL-devel >= 1.2.4
 BuildRequires:  SDL_image-devel
@@ -43,7 +45,9 @@
 
 %prep
 %setup -q
-%patch0 -p1
+%patch0 -p1 -b .gcc43
+%patch1 -p1 -b .comments
+%patch2 -p1 -b .cons_disable
 
 # We want to just call this release "supertux", not "supertux2".
 find . -depth -name 'supertux2*' \
@@ -88,6 +92,10 @@
 %{_datadir}/pixmaps/*
 
 %changelog
+* Sun Jan 18 2008 Lubomir Rintel <lkundrak at v3.sk> 0.3.1-4
+- Fix parsing of translations (#477497)
+- Disable debugging console
+
 * Thu Jul 10 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 0.3.1-3
 - Fix building with gcc-4.3 (bz 434445)
 



From nphilipp at fedoraproject.org  Sun Jan 18 19:38:30 2009
From: nphilipp at fedoraproject.org (Nils Philippsen)
Date: Sun, 18 Jan 2009 19:38:30 +0000 (UTC)
Subject: rpms/xsane/devel xsane.desktop,1.3,1.4 xsane.spec,1.61,1.62
Message-ID: <20090118193830.EAA8E700E0@cvs1.fedora.phx.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/xsane/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2443

Modified Files:
	xsane.desktop xsane.spec 
Log Message:
use shipped xsane.xpm as application icon


Index: xsane.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/xsane/devel/xsane.desktop,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xsane.desktop	27 Sep 2007 13:46:17 -0000	1.3
+++ xsane.desktop	18 Jan 2009 19:38:00 -0000	1.4
@@ -8,7 +8,7 @@
 Comment=Scan images to view, copy, fax or email them
 Exec=xsane
 TryExec=xsane
-Icon=/usr/share/sane/xsane/xsane-logo.xpm
+Icon=xsane
 Terminal=false
 Categories=Graphics;2DGraphics;RasterGraphics;Scanning;GTK;
 StartupNotify=true


Index: xsane.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xsane/devel/xsane.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- xsane.spec	18 Jan 2009 19:28:07 -0000	1.61
+++ xsane.spec	18 Jan 2009 19:38:00 -0000	1.62
@@ -96,6 +96,7 @@
 %{_datadir}/sane
 %dir %{_datadir}/applications
 %{_datadir}/applications/%{desktop_vendor}-xsane.desktop
+%{_datadir}/pixmaps/xsane.xpm
 
 %files gimp
 %defattr(-,root,root)
@@ -111,6 +112,7 @@
 * Sun Jan 18 2009 Nils Philippsen <nphilipp at redhat.com> - 0.996-1
 - version 0.996
 - don't use %%makeinstall
+- use shipped xsane.xpm as application icon
 
 * Fri Jul 18 2008 Nils Philippsen <nphilipp at redhat.com> - 0.995-5
 - fix fd leak prevention (#455450)



From lkundrak at fedoraproject.org  Sun Jan 18 19:47:02 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Sun, 18 Jan 2009 19:47:02 +0000 (UTC)
Subject: rpms/supertux/devel supertux.spec,1.20,1.21
Message-ID: <20090118194702.D4866700E0@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/supertux/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3466

Modified Files:
	supertux.spec 
Log Message:
2009, not 2008...


Index: supertux.spec
===================================================================
RCS file: /cvs/pkgs/rpms/supertux/devel/supertux.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- supertux.spec	18 Jan 2009 19:36:28 -0000	1.20
+++ supertux.spec	18 Jan 2009 19:46:31 -0000	1.21
@@ -92,7 +92,7 @@
 %{_datadir}/pixmaps/*
 
 %changelog
-* Sun Jan 18 2008 Lubomir Rintel <lkundrak at v3.sk> 0.3.1-4
+* Sun Jan 18 2009 Lubomir Rintel <lkundrak at v3.sk> 0.3.1-4
 - Fix parsing of translations (#477497)
 - Disable debugging console
 



From s4504kr at fedoraproject.org  Sun Jan 18 20:40:16 2009
From: s4504kr at fedoraproject.org (Jochen Schmitt)
Date: Sun, 18 Jan 2009 20:40:16 +0000 (UTC)
Subject: rpms/aplus-fsf/devel aplus-fsf.spec,1.34,1.35
Message-ID: <20090118204016.C7569700E0@cvs1.fedora.phx.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/aplus-fsf/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10443

Modified Files:
	aplus-fsf.spec 
Log Message:
Add font family name to font subpackage name


Index: aplus-fsf.spec
===================================================================
RCS file: /cvs/extras/rpms/aplus-fsf/devel/aplus-fsf.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- aplus-fsf.spec	15 Jan 2009 20:58:48 -0000	1.34
+++ aplus-fsf.spec	18 Jan 2009 20:39:46 -0000	1.35
@@ -1,5 +1,3 @@
-%define fontname aplus-fsf
-
 %define catalogue %{_sysconfdir}/X11/fontpath.d/
 %define name aplus-fsf
 %define ver 4.22
@@ -14,7 +12,7 @@
 
 Name: %name
 Version: 4.22.4
-Release: 10%{?dist}
+Release: 11%{?dist}
 License: GPLv2
 
 Summary: Advanced APL interpreter with s interface
@@ -51,7 +49,7 @@
 communication, calls to user C subroutines, and many other features. 
 Execution is by a very efficient interpreter. 
 
-%package fonts
+%package KAPL-fonts
 Summary: TrueType fonts for the Advanced APL Interpreter
 Group: User Interface/X
 Provides: apl-fonts
@@ -63,7 +61,7 @@
 Requires: fontpackages-filesystem
 
 
-%description fonts
+%description KAPL-fonts
 The A+ programming language development environment requires these 
 APL fonts to properly display A+ code in XTerm or XEmacs.
 
@@ -144,7 +142,7 @@
 
 %postun -p /sbin/ldconfig
 
-%_font_pkg -n fonts *.TTF
+%_font_pkg -n KAPL *.TTF
 
 %files
 %defattr(-,root,root,-)
@@ -170,6 +168,9 @@
 %{_lispstart}/aplus-fsf-init.el
 
 %Changelog
+* Sun Jan 18 2009 Jochen Schmitt <Jochen herr-schmitt de> 4.22.4-11
+- Add font family name to font subpackage name
+
 * Thu Jan 15 2009 Jochen Schmitt <Jochen herr-schmitt de> 4.22.4-10
 - Rebuild for new openssl package
 - Remove wrong '-n' flag on subpackage name



From rdieter at fedoraproject.org  Sun Jan 18 21:02:03 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sun, 18 Jan 2009 21:02:03 +0000 (UTC)
Subject: rpms/xine-lib/devel xine-lib.spec,1.58,1.59
Message-ID: <20090118210203.DEBBA700E0@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/xine-lib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13329

Modified Files:
	xine-lib.spec 
Log Message:
* Sun Jan 18 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.1.16-2
- drop deepbind patch (#480504)



Index: xine-lib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xine-lib/devel/xine-lib.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- xine-lib.spec	7 Jan 2009 23:14:29 -0000	1.58
+++ xine-lib.spec	18 Jan 2009 21:01:33 -0000	1.59
@@ -36,7 +36,7 @@
 Summary:        Xine library
 Name:           xine-lib
 Version:        1.1.16
-Release:        1%{?dist}.1
+Release:        2%{?dist}
 License:        GPLv2+
 Group:          System Environment/Libraries
 URL:            http://xinehq.de/
@@ -195,8 +195,9 @@
 touch -r m4/optimizations.m4 m4/optimizations.m4.stamp
 %patch1 -p1 -b .optflags
 touch -r m4/optimizations.m4.stamp m4/optimizations.m4
-# Patch6 needed at least when compiling with external ffmpeg, #939.
-%patch6 -p1 -b .deepbind
+# needed at least when compiling with external ffmpeg and internal faad livna bug#939.
+# see also http://bugzilla.redhat.com/480504 for side-effects
+#patch6 -p1 -b .deepbind
 %if 0%{?old_caca}
 %patch7 -p0 -b .old-caca
 %endif
@@ -434,6 +435,9 @@
 
 
 %changelog
+* Sun Jan 18 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.1.16-2
+- drop deepbind patch (#480504)
+
 * Wed Jan 07 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 1.1.16-1.1
 - patch for old libcaca in F9-
 



From rdieter at fedoraproject.org  Sun Jan 18 21:41:27 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sun, 18 Jan 2009 21:41:27 +0000 (UTC)
Subject: rpms/xine-lib/F-10 xine-lib-1.1.16-old-caca.patch, NONE,
	1.1 xine-lib.spec, 1.52, 1.53
Message-ID: <20090118214127.3BC8C700E0@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/xine-lib/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18466

Modified Files:
	xine-lib.spec 
Added Files:
	xine-lib-1.1.16-old-caca.patch 
Log Message:
* Sun Jan 18 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.1.16-2
- drop deepbind patch (#480504)


xine-lib-1.1.16-old-caca.patch:

--- NEW FILE xine-lib-1.1.16-old-caca.patch ---
--- src/video_out/video_out_caca.c	Tue Nov 18 21:13:55 2008 +0100
+++ src/video_out/video_out_caca.c	Mon Nov 10 16:33:51 2008 +0100
@@ -276,7 +276,6 @@ static int caca_redraw_needed (vo_driver
 
 static vo_driver_t *open_plugin (video_driver_class_t *class_gen, const void *visual_gen) {
   caca_class_t         *class = (caca_class_t *) class_gen;
-  caca_display_t       *dp = (caca_display_t *)visual_gen;
   caca_driver_t        *this;
 
   this = calloc(1, sizeof (caca_driver_t));
@@ -301,13 +300,8 @@ static vo_driver_t *open_plugin (video_d
   this->yuv2rgb_factory = yuv2rgb_factory_init(MODE_32_RGB, 0, NULL);
   this->yuv2rgb_factory->set_csc_levels(this->yuv2rgb_factory, 0, 128, 128);
 
-  if (dp) {
-    this->cv = caca_get_canvas(dp);
-    this->dp = dp;
-  } else {
-    this->cv = cucul_create_canvas(0, 0);
-    this->dp = caca_create_display(this->cv);
-  }
+  this->cv = cucul_create_canvas(0, 0);
+  this->dp = caca_create_display(this->cv);
 
   caca_refresh_display(this->dp);
   return &this->vo_driver;



Index: xine-lib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xine-lib/F-10/xine-lib.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- xine-lib.spec	7 Jan 2009 21:17:12 -0000	1.52
+++ xine-lib.spec	18 Jan 2009 21:40:56 -0000	1.53
@@ -13,16 +13,18 @@
     %define     have_vidix  0
 %endif # ix86
 
-%if 0%{?fedora} > 9
-%define _with_caca --with-caca 
+%if 0%{?fedora} <= 9
+    %define     old_caca    1
 %endif
 
 %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
@@ -34,7 +36,7 @@
 Summary:        Xine library
 Name:           xine-lib
 Version:        1.1.16
-Release:        1%{?dist}
+Release:        2%{?dist}
 License:        GPLv2+
 Group:          System Environment/Libraries
 URL:            http://xinehq.de/
@@ -50,6 +52,7 @@
 
 Patch1:         %{name}-1.1.4-optflags.patch
 Patch6:         %{name}-1.1.1-deepbind-939.patch
+Patch7:         %{name}-1.1.16-old-caca.patch
 ## upstream patches
 
 Provides:       xine-lib(plugin-abi) = %{abiver}
@@ -69,8 +72,12 @@
 %if %{with_aalib}
 BuildRequires:  aalib-devel >= 1.4
 %endif # aalib
-%if 0%{?_with_caca:1}
-BuildRequires:  libcaca-devel >= 0.99-0.5.beta16 
+%if %{with_caca}
+%if 0%{?old_caca}
+BuildRequires:  libcaca-devel >= 0.99
+%else
+BuildRequires:  libcaca-devel >= 0.99-0.5.beta16
+%endif
 %endif # caca
 %if 0%{!?_without_directfb:1}
 BuildRequires:  directfb-devel
@@ -170,7 +177,7 @@
 %if %{with_aalib}
   - AA-lib
 %endif # aalib
-%if 0%{?with_caca:1}
+%if %{with_caca}
   - Libcaca
 %endif # caca
 %if 0%{!?_without_imagemagick:1}
@@ -188,8 +195,12 @@
 touch -r m4/optimizations.m4 m4/optimizations.m4.stamp
 %patch1 -p1 -b .optflags
 touch -r m4/optimizations.m4.stamp m4/optimizations.m4
-# Patch6 needed at least when compiling with external ffmpeg, #939.
-%patch6 -p1 -b .deepbind
+# needed at least when compiling with external ffmpeg and internal faad livna bug#939.
+# see also http://bugzilla.redhat.com/480504 for side-effects
+#patch6 -p1 -b .deepbind
+%if 0%{?old_caca}
+%patch7 -p0 -b .old-caca
+%endif
 
 # Avoid standard rpaths on lib64 archs: (autotools patch should handle this, no? -- Rex )
 #sed -i -e 's|"/lib /usr/lib\b|"/%{_lib} %{_libdir}|' configure
@@ -227,7 +238,6 @@
 %if 0%{?_without_imagemagick:1}
     --without-imagemagick \
 %endif # imagemagick
-    %{?_with_caca} %{!?_with_caca:--without-caca} \
     %{!?_without_arts:--with-arts} %{?_without_arts} \
     --with-wavpack \
     --with-real-codecs-path=%{codecdir} \
@@ -401,7 +411,7 @@
 %if %{with_aalib}
 %{_libdir}/xine/plugins/%{abiver}/xineplug_vo_out_aa.so
 %endif # aalib
-%if 0%{?_with_caca}
+%if %{with_caca}
 %{_libdir}/xine/plugins/%{abiver}/xineplug_vo_out_caca.so
 %endif # caca
 %if 0%{!?_without_directfb:1}
@@ -425,6 +435,12 @@
 
 
 %changelog
+* Sun Jan 18 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.1.16-2
+- drop deepbind patch (#480504)
+
+* Wed Jan 07 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 1.1.16-1.1
+- patch for old libcaca in F9-
+
 * Wed Jan 07 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.1.16-1
 - xine-lib-1.1.16, plugin ABI 1.25
 - --with-external-libdvdnav, include mpeg demuxers (#213597)



From rdieter at fedoraproject.org  Sun Jan 18 21:43:31 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sun, 18 Jan 2009 21:43:31 +0000 (UTC)
Subject: rpms/xine-lib/F-9 xine-lib.spec,1.48,1.49
Message-ID: <20090118214331.5A21A700E0@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/xine-lib/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18912

Modified Files:
	xine-lib.spec 
Log Message:
* Sun Jan 18 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.1.16-2
- drop deepbind patch (#480504)



Index: xine-lib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xine-lib/F-9/xine-lib.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- xine-lib.spec	7 Jan 2009 23:14:28 -0000	1.48
+++ xine-lib.spec	18 Jan 2009 21:43:01 -0000	1.49
@@ -36,7 +36,7 @@
 Summary:        Xine library
 Name:           xine-lib
 Version:        1.1.16
-Release:        1%{?dist}.1
+Release:        2%{?dist}
 License:        GPLv2+
 Group:          System Environment/Libraries
 URL:            http://xinehq.de/
@@ -195,8 +195,9 @@
 touch -r m4/optimizations.m4 m4/optimizations.m4.stamp
 %patch1 -p1 -b .optflags
 touch -r m4/optimizations.m4.stamp m4/optimizations.m4
-# Patch6 needed at least when compiling with external ffmpeg, #939.
-%patch6 -p1 -b .deepbind
+# needed at least when compiling with external ffmpeg and internal faad livna bug#939.
+# see also http://bugzilla.redhat.com/480504 for side-effects
+#patch6 -p1 -b .deepbind
 %if 0%{?old_caca}
 %patch7 -p0 -b .old-caca
 %endif
@@ -434,6 +435,9 @@
 
 
 %changelog
+* Sun Jan 18 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.1.16-2
+- drop deepbind patch (#480504)
+
 * Wed Jan 07 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 1.1.16-1.1
 - patch for old libcaca in F9-
 



From jhrozek at fedoraproject.org  Sun Jan 18 21:58:42 2009
From: jhrozek at fedoraproject.org (Jakub Hrozek)
Date: Sun, 18 Jan 2009 21:58:42 +0000 (UTC)
Subject: rpms/fsniper/devel fsniper-umask.patch, NONE, 1.1 fsniper.conf, NONE,
	1.1 fsniper.initscript, NONE, 1.1 fsniper.spec, NONE,
	1.1 fsniper.sysconfig, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090118215842.8EEDE700E0@cvs1.fedora.phx.redhat.com>

Author: jhrozek

Update of /cvs/extras/rpms/fsniper/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21154/devel

Modified Files:
	.cvsignore sources 
Added Files:
	fsniper-umask.patch fsniper.conf fsniper.initscript 
	fsniper.spec fsniper.sysconfig import.log 
Log Message:
Initial import


fsniper-umask.patch:

--- NEW FILE fsniper-umask.patch ---
X-Git-Url: http://code.l3ib.org/?p=fsniper.git;a=blobdiff_plain;f=src%2Fmain.c;fp=src%2Fmain.c;h=cd49dffebe4b4c728b62c28c1381c4fb6f5ad87d;hp=03a8d701d6f9802ba346b591429e58741ca53479;hb=82cb0b46c48485fd4f6231ce3169c7be87d1ea07;hpb=2bbeb5d6e6b55bb9692c043fcdbeab15d9723c9e

diff --git a/src/main.c b/src/main.c
index 03a8d70..cd49dff 100644
--- a/src/main.c
+++ b/src/main.c
@@ -153,7 +153,10 @@ char *get_pid_filename()
 void write_pid_file(char *pidfilename)
 {
     FILE *pidfile;
+    mode_t umask_old;
+    umask_old = umask(0177);
     pidfile = fopen(pidfilename, "w");
+    umask(umask_old);
     fprintf(pidfile, "%d", getpid());
     fclose(pidfile);
 }



--- NEW FILE fsniper.conf ---
# the amount of time, in seconds, to wait before trying the handler
# again.  If not specified, it defaults to 300, which is 5 minutes.
# delay_time 300
#
# the number of repeats it should try before giving up.  This can
# be 0, meaning infinite retries.
# delay_repeats 0
#
# An example of watch section follows
watch {
#      
#    # watch the ~/drop directory for new files
#    ~/drop {
#        # matches any mimetype beginning with image/
#        image/* {
#            # %% is replaced with the filename of the new file
#            handler = echo found an image: %%
#        }
#
#        # matches any file ending with .extension
#        *.extension {
#            # the filename is added to the end of the handler line if %% is not present
#            handler = echo glob handler 1: 
#            # the second handler will be run if the first exits with a return code of 1
#            handler = echo glob handler 2: %%
#        }
#
#        # run handlers on files that match this regex
#        /.*regex.*/ {
#            handler = echo regex handler
#        }
#
#        # generic handler to catch files that nothing else did
#        * {
#            handler = mv %% ~/downloads/
#        }
#    }
#
}


--- NEW FILE fsniper.initscript ---
#!/bin/sh
#
# fsniper      Monitors directories for new files and invokes scripts on them
#
# chkconfig: - 55 65
# description: fsniper is a tool that monitors a given set of directories for \
#              new files. Then, based on the new file's type or name, it \
#              invokes a script to be run (any executable via the shell) on \
#              that file. Common uses include making a single drop directory \
#              for all things from a webbrowser etc, and having \
#              semi-intelligent scripts figure out what to do with those \
#              files. You write the scripts yourself. 

RETVAL=0
PROG=fsniper
EXEC=/usr/bin/fsniper
LOCK_FILE=/var/lock/subsys/fsniper
CONFIG_FILE=/etc/fsniper.conf


# Source function library.
. /etc/init.d/functions

[ -e /etc/sysconfig/$PROG ] && . /etc/sysconfig/$PROG

start() {
            [ -x $EXEC ] || exit 5
            echo -n $"Starting $PROG: "
            daemon --user=$USER $EXEC --daemon $CONFIG_FILE 1>/dev/null && success || failure
            RETVAL=$?
            [ "$RETVAL" = 0 ] && touch $LOCK_FILE
            echo
}

stop() {
        echo -n $"Stopping $PROG: "
        killproc $PROG
        RETVAL=$?
        [ "$RETVAL" = 0 ] && rm -f $LOCK_FILE
        echo
}

restart() {
        stop
        start
}

reload() {
        echo -n $"Reloading $PROG: "
        killproc $PROG -HUP
        echo
}

rh_status() {
    status $PROG
}

rh_status_q() {
    rh_status >/dev/null 2>&1
}

case "$1" in
    start)
        rh_status_q && exit 0
        start
        ;;
    stop)
        rh_status_q || exit 0
        stop
        ;;
    restart|force-reload)
        stop
        start
        ;;
    reload)
        rh_status_q || exit 7
        reload
        ;;
    status)
        rh_status
        ;;

    condrestart|try-restart)
        if [ -f  $LOCK_FILE ]; then
            if [ "$RETVAL" = 0 ]; then
                stop
                sleep 3
                start
            fi
        fi
        ;;

    *)
        echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload}"
        RETVAL=2
esac

exit $?



--- NEW FILE fsniper.spec ---
Name:           fsniper
Version:        1.3.1
Release:        3%{?dist}
Summary:        A tool that monitors directories for new files and invokes scripts on them

Group:          Applications/File
License:        GPLv3+
URL:            http://projects.l3ib.org/trac/fsniper
Source0:        http://projects.l3ib.org/fsniper/files/fsniper-%{version}.tar.gz
Source1:        fsniper.initscript
Source2:        fsniper.conf
Source3:        fsniper.sysconfig

# Fix umask permissions - http://bugs.l3ib.org/index.php?do=details&task_id=21
Patch1:         fsniper-umask.patch

BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  file-devel
BuildRequires:  pcre-devel

Requires(preun):  initscripts chkconfig
Requires(post):   chkconfig
Requires(postun): initscripts
Requires(pre):    /usr/sbin/useradd /usr/sbin/groupadd

%define servicename fsniper
%define fsdir       %{_localstatedir}/lib/%{name}

%description
fsniper is a tool that monitors a given set of directories for new
files. Then, based on the new file's type or name, it invokes a script to
be run (any executable via the shell) on that file.  Common uses include
making a single drop directory for all things from a webbrowser etc, and
having semi-intelligent scripts figure out what to do with those files. You
write the scripts yourself.


%prep
%setup -q
%patch1 -p1 -b .umask


%build
%configure
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_initrddir}
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig
mkdir -p $RPM_BUILD_ROOT%{fsdir}

make install DESTDIR=$RPM_BUILD_ROOT

install -pm 0755 %{SOURCE1} $RPM_BUILD_ROOT%{_initrddir}/fsniper
install -pm 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/fsniper.conf
install -pm 0644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/fsniper
install -pm 0644 doc/doc.txt $RPM_BUILD_ROOT%{docdir}

%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%{_bindir}/fsniper
%{_initrddir}/%{name}
%attr(-,%{name},%{name}) %dir %{fsdir}/
%config(noreplace) %{_sysconfdir}/fsniper.conf
%config(noreplace) %{_sysconfdir}/sysconfig/fsniper
%doc AUTHORS COPYING INSTALL README
%doc doc/doc.txt doc/keyvalcfg.txt example.conf

%pre
if [ $1 = 1 ]; then
    getent group %{name} >/dev/null || groupadd -r %{name}
    getent passwd %{name} >/dev/null || \
           useradd -r -g %{name} -d %{_localstatedir}/lib/%{name} -s /sbin/nologin \
           -c "%{name} user" %{name}
    exit 0
fi

%post
/sbin/chkconfig --add %{servicename}

%preun
if [ $1 = 0 ]; then
    /sbin/service %{servicename} stop >/dev/null 2>&1
    /sbin/chkconfig --del %{servicename} 
fi

%postun
if [ "$1" -ge "1" ] ; then
        /sbin/service %{servicename} condrestart >/dev/null 2>&1 || :
fi

%changelog
* Mon Jan 12 2009 Jakub Hrozek <jhrozek at redhat.com> 1.3.1-3
- apply the correct patch from upstream VCS (Manuel Wolfshant)

* Wed Oct 22 2008 Jakub Hrozek <jhrozek at redhat.com> 1.3.1-2
- issues found during review (#467627):
- add link to upstream bugtracker for patch
- exit with 0 after useradd

* Sun Oct 19 2008 Jakub Hrozek <jhrozek at redhat.com> 1.3.1-1
- Initial packaging



--- NEW FILE fsniper.sysconfig ---
USER=fsniper


--- NEW FILE import.log ---
fsniper-1_3_1-3_fc10:HEAD:fsniper-1.3.1-3.fc10.src.rpm:1232315849


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fsniper/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	13 Jan 2009 21:14:26 -0000	1.1
+++ .cvsignore	18 Jan 2009 21:58:12 -0000	1.2
@@ -0,0 +1 @@
+fsniper-1.3.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fsniper/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	13 Jan 2009 21:14:26 -0000	1.1
+++ sources	18 Jan 2009 21:58:12 -0000	1.2
@@ -0,0 +1 @@
+62f30bb4b00f9499499d83a30281f10f  fsniper-1.3.1.tar.gz



From veillard at fedoraproject.org  Sun Jan 18 22:00:53 2009
From: veillard at fedoraproject.org (Daniel Veillard)
Date: Sun, 18 Jan 2009 22:00:53 +0000 (UTC)
Subject: rpms/libxml2/devel .cvsignore, 1.43, 1.44 libxml2.spec, 1.68,
	1.69 sources, 1.45, 1.46 CVE-2008-4225.patch, 1.1,
	NONE CVE-2008-4226.patch, 1.1, NONE
Message-ID: <20090118220053.5B8E9700E0@cvs1.fedora.phx.redhat.com>

Author: veillard

Update of /cvs/pkgs/rpms/libxml2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21607

Modified Files:
	.cvsignore libxml2.spec sources 
Removed Files:
	CVE-2008-4225.patch CVE-2008-4226.patch 
Log Message:
New upstream release 2.7.3, Daniel



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libxml2/devel/.cvsignore,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- .cvsignore	3 Oct 2008 08:14:10 -0000	1.43
+++ .cvsignore	18 Jan 2009 22:00:22 -0000	1.44
@@ -21,3 +21,4 @@
 libxml2-2.7.0.tar.gz
 libxml2-2.7.1.tar.gz
 libxml2-2.7.2.tar.gz
+libxml2-2.7.3.tar.gz


Index: libxml2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libxml2/devel/libxml2.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- libxml2.spec	3 Dec 2008 23:30:45 -0000	1.68
+++ libxml2.spec	18 Jan 2009 22:00:22 -0000	1.69
@@ -1,7 +1,7 @@
 Summary: Library providing XML and HTML support
 Name: libxml2
-Version: 2.7.2
-Release: 7%{?dist}%{?extra_release}
+Version: 2.7.3
+Release: 1%{?dist}%{?extra_release}
 License: MIT
 Group: Development/Libraries
 Source: ftp://xmlsoft.org/libxml2/libxml2-%{version}.tar.gz
@@ -9,8 +9,6 @@
 BuildRequires: python python-devel zlib-devel pkgconfig
 URL: http://xmlsoft.org/
 Patch0: libxml2-multilib.patch
-Patch1: CVE-2008-4225.patch
-Patch2: CVE-2008-4226.patch
 
 %description
 This library allows to manipulate XML files. It includes support 
@@ -69,8 +67,6 @@
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p0
-%patch2 -p0
 
 %build
 %configure
@@ -145,6 +141,12 @@
 %doc doc/python.html
 
 %changelog
+* Sun Jan 18 2009 Daniel Veillard <veillard at redhat.com> - 2.7.3-1
+- new release 2.7.3
+- limit default max size of text nodes
+- special parser mode for PHP
+- bug fixes and more compiler checks
+
 * Wed Dec  3 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 2.7.2-7
 - Pull back into Python 2.6
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libxml2/devel/sources,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- sources	3 Oct 2008 08:14:11 -0000	1.45
+++ sources	18 Jan 2009 22:00:22 -0000	1.46
@@ -1 +1 @@
-dc43ff7ae6aded45f578c87b7b0c8766  libxml2-2.7.2.tar.gz
+8f4fda3969237c2a33bdb1583b5d06b2  libxml2-2.7.3.tar.gz


--- CVE-2008-4225.patch DELETED ---


--- CVE-2008-4226.patch DELETED ---



From cwickert at fedoraproject.org  Sun Jan 18 22:17:15 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Sun, 18 Jan 2009 22:17:15 +0000 (UTC)
Subject: rpms/xfce4-battery-plugin/devel xfce4-battery-plugin.spec, 1.16,
	1.17
Message-ID: <20090118221715.1B0AA700E0@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-serv24258

Modified Files:
	xfce4-battery-plugin.spec 
Log Message:
* 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)



Index: xfce4-battery-plugin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-battery-plugin/devel/xfce4-battery-plugin.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- xfce4-battery-plugin.spec	5 Sep 2008 21:42:14 -0000	1.16
+++ xfce4-battery-plugin.spec	18 Jan 2009 22:16:44 -0000	1.17
@@ -1,6 +1,6 @@
 Name:		xfce4-battery-plugin
 Version:	0.5.1
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Battery monitor for the Xfce panel
 
 Group:		User Interface/Desktops
@@ -50,6 +50,9 @@
 %{_datadir}/icons/hicolor/scalable/devices/battery.svg
 
 %changelog
+* Sun Jan 18 2009 Christoph Wickert <fedora christoph-wickert de> - 0.5.1-2
+- Rebuild for Xfce 4.6 (Beta 3)
+
 * Fri Sep 05 2008 Christoph Wickert <fedora christoph-wickert de> - 0.5.1-1
 - Update to 0.5.1
 - Remove acpi.patch (included upstream)



From rdieter at fedoraproject.org  Sun Jan 18 22:26:51 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sun, 18 Jan 2009 22:26:51 +0000 (UTC)
Subject: rpms/xine-lib/EL-5 xine-lib.spec,1.21,1.22
Message-ID: <20090118222651.179F0700E0@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-serv25389

Modified Files:
	xine-lib.spec 
Log Message:
* Sun Jan 18 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.1.16-2
- drop deepbind patch (#480504)
- caca support (EPEL)



Index: xine-lib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xine-lib/EL-5/xine-lib.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- xine-lib.spec	7 Jan 2009 21:38:05 -0000	1.21
+++ xine-lib.spec	18 Jan 2009 22:26:20 -0000	1.22
@@ -13,8 +13,8 @@
     %define     have_vidix  0
 %endif # ix86
 
-%if 0%{?fedora} > 9
-%define _with_caca --with-caca 
+%if 0%{?fedora} <= 9
+    %define     old_caca    1
 %endif
 
 %if 0%{?fedora}
@@ -34,7 +34,7 @@
 Summary:        Xine library
 Name:           xine-lib
 Version:        1.1.16
-Release:        1%{?dist}
+Release:        2%{?dist}
 License:        GPLv2+
 Group:          System Environment/Libraries
 URL:            http://xinehq.de/
@@ -50,6 +50,7 @@
 
 Patch1:         %{name}-1.1.4-optflags.patch
 Patch6:         %{name}-1.1.1-deepbind-939.patch
+Patch7:         %{name}-1.1.16-old-caca.patch
 ## upstream patches
 
 Provides:       xine-lib(plugin-abi) = %{abiver}
@@ -69,9 +70,11 @@
 %if %{with_aalib}
 BuildRequires:  aalib-devel >= 1.4
 %endif # aalib
-%if 0%{?_with_caca:1}
-BuildRequires:  libcaca-devel >= 0.99-0.5.beta16 
-%endif # caca
+%if 0%{?old_caca}
+BuildRequires:  libcaca-devel >= 0.99
+%else
+BuildRequires:  libcaca-devel >= 0.99-0.5.beta16
+%endif
 %if 0%{!?_without_directfb:1}
 BuildRequires:  directfb-devel
 %endif # directfb
@@ -170,9 +173,7 @@
 %if %{with_aalib}
   - AA-lib
 %endif # aalib
-%if 0%{?_with_caca:1}
   - Libcaca
-%endif # caca
 %if 0%{!?_without_imagemagick:1}
   - Image decoding
 %endif # imagemagick
@@ -188,8 +189,12 @@
 touch -r m4/optimizations.m4 m4/optimizations.m4.stamp
 %patch1 -p1 -b .optflags
 touch -r m4/optimizations.m4.stamp m4/optimizations.m4
-# Patch6 needed at least when compiling with external ffmpeg, #939.
-%patch6 -p1 -b .deepbind
+# needed at least when compiling with external ffmpeg and internal faad livna bug#939.
+# see also http://bugzilla.redhat.com/480504 for side-effects
+#patch6 -p1 -b .deepbind
+%if 0%{?old_caca}
+%patch7 -p0 -b .old-caca
+%endif
 
 # Avoid standard rpaths on lib64 archs: (autotools patch should handle this, no? -- Rex )
 #sed -i -e 's|"/lib /usr/lib\b|"/%{_lib} %{_libdir}|' configure
@@ -227,7 +232,6 @@
 %if 0%{?_without_imagemagick:1}
     --without-imagemagick \
 %endif # imagemagick
-    %{?_with_caca} %{!?_with_caca:--without-caca} \
     %{!?_without_arts:--with-arts} %{?_without_arts} \
     --with-wavpack \
     --with-real-codecs-path=%{codecdir} \
@@ -401,9 +405,7 @@
 %if %{with_aalib}
 %{_libdir}/xine/plugins/%{abiver}/xineplug_vo_out_aa.so
 %endif # aalib
-%if 0%{?_with_caca:1}
 %{_libdir}/xine/plugins/%{abiver}/xineplug_vo_out_caca.so
-%endif # caca
 %if 0%{!?_without_directfb:1}
 %{_libdir}/xine/plugins/%{abiver}/xineplug_vo_out_directfb.so
 %{_libdir}/xine/plugins/%{abiver}/xineplug_vo_out_xdirectfb.so
@@ -425,6 +427,13 @@
 
 
 %changelog
+* Sun Jan 18 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.1.16-2
+- drop deepbind patch (#480504)
+- caca support (EPEL)
+
+* Wed Jan 07 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 1.1.16-1.1
+- patch for old libcaca in F9-
+
 * Wed Jan 07 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.1.16-1
 - xine-lib-1.1.16, plugin ABI 1.25
 - --with-external-libdvdnav, include mpeg demuxers (#213597)



From pkgdb at fedoraproject.org  Sun Jan 18 22:27:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 18 Jan 2009 22:27:59 +0000
Subject: [pkgdb] sbackup was added for cassmodiah
Message-ID: <20090118222759.21ECD2082B5@bastion.fedora.phx.redhat.com>

kevin has added Package sbackup with summary Simple Backup Suite for desktop use
kevin has approved Package sbackup
kevin has added a Fedora devel branch for sbackup with an owner of cassmodiah
kevin has approved sbackup in Fedora devel
kevin has approved Package sbackup
kevin has set commit to Approved for provenpackager on sbackup (Fedora devel)
kevin has set build to Approved for provenpackager on sbackup (Fedora devel)
kevin has set checkout to Approved for provenpackager on sbackup (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sbackup



From pkgdb at fedoraproject.org  Sun Jan 18 22:28:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 18 Jan 2009 22:28:02 +0000
Subject: [pkgdb] sbackup (Fedora, 9) updated by kevin
Message-ID: <20090118222802.447C1208469@bastion.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for sbackup
kevin has set commit to Approved for provenpackager on sbackup (Fedora 9)
kevin has set build to Approved for provenpackager on sbackup (Fedora 9)
kevin has set checkout to Approved for provenpackager on sbackup (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sbackup



From pkgdb at fedoraproject.org  Sun Jan 18 22:28:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 18 Jan 2009 22:28:02 +0000
Subject: [pkgdb] sbackup (Fedora, 10) updated by kevin
Message-ID: <20090118222803.A9996208474@bastion.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for sbackup
kevin has set commit to Approved for provenpackager on sbackup (Fedora 10)
kevin has set build to Approved for provenpackager on sbackup (Fedora 10)
kevin has set checkout to Approved for provenpackager on sbackup (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sbackup



From pkgdb at fedoraproject.org  Sun Jan 18 22:28:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 18 Jan 2009 22:28:02 +0000
Subject: [pkgdb] sbackup (Fedora EPEL, 5) updated by kevin
Message-ID: <20090118222802.EBC4920846E@bastion.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for sbackup
kevin has set commit to Approved for provenpackager on sbackup (Fedora EPEL 5)
kevin has set build to Approved for provenpackager on sbackup (Fedora EPEL 5)
kevin has set checkout to Approved for provenpackager on sbackup (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sbackup



From kevin at fedoraproject.org  Sun Jan 18 22:28:18 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 18 Jan 2009 22:28:18 +0000 (UTC)
Subject: rpms/sbackup - New directory
Message-ID: <20090118222818.3F36F700E0@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/sbackup
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsG25700/rpms/sbackup

Log Message:
Directory /cvs/pkgs/rpms/sbackup added to the repository




From kevin at fedoraproject.org  Sun Jan 18 22:28:18 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 18 Jan 2009 22:28:18 +0000 (UTC)
Subject: rpms/sbackup/devel - New directory
Message-ID: <20090118222818.8CEC670141@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/sbackup/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsG25700/rpms/sbackup/devel

Log Message:
Directory /cvs/pkgs/rpms/sbackup/devel added to the repository




From kevin at fedoraproject.org  Sun Jan 18 22:28:38 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 18 Jan 2009 22:28:38 +0000 (UTC)
Subject: rpms/sbackup Makefile,NONE,1.1
Message-ID: <20090118222838.C8E33700E0@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/sbackup
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsG25700/rpms/sbackup

Added Files:
	Makefile 
Log Message:
Setup of module sbackup


--- NEW FILE Makefile ---
# Top level Makefile for module sbackup
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Jan 18 22:28:39 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 18 Jan 2009 22:28:39 +0000 (UTC)
Subject: rpms/sbackup/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <20090118222839.4954A700E0@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/sbackup/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsG25700/rpms/sbackup/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module sbackup


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: sbackup
# $Id: Makefile,v 1.1 2009/01/18 22:28:39 kevin Exp $
NAME := sbackup
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Jan 18 22:29:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 18 Jan 2009 22:29:04 +0000
Subject: [pkgdb] botan was added for thm
Message-ID: <20090118222905.8D1A5208469@bastion.fedora.phx.redhat.com>

kevin has added Package botan with summary Crypto library written in C++
kevin has approved Package botan
kevin has added a Fedora devel branch for botan with an owner of thm
kevin has approved botan in Fedora devel
kevin has approved Package botan
kevin has set commit to Approved for provenpackager on botan (Fedora devel)
kevin has set build to Approved for provenpackager on botan (Fedora devel)
kevin has set checkout to Approved for provenpackager on botan (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/botan



From pkgdb at fedoraproject.org  Sun Jan 18 22:29:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 18 Jan 2009 22:29:06 +0000
Subject: [pkgdb] botan (Fedora, 9) updated by kevin
Message-ID: <20090118222906.273E6208471@bastion.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for botan
kevin has set commit to Approved for provenpackager on botan (Fedora 9)
kevin has set build to Approved for provenpackager on botan (Fedora 9)
kevin has set checkout to Approved for provenpackager on botan (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/botan



From pkgdb at fedoraproject.org  Sun Jan 18 22:29:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 18 Jan 2009 22:29:06 +0000
Subject: [pkgdb] botan (Fedora, 10) updated by kevin
Message-ID: <20090118222906.30A54208474@bastion.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for botan
kevin has set commit to Approved for provenpackager on botan (Fedora 10)
kevin has set build to Approved for provenpackager on botan (Fedora 10)
kevin has set checkout to Approved for provenpackager on botan (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/botan



From kevin at fedoraproject.org  Sun Jan 18 22:29:23 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 18 Jan 2009 22:29:23 +0000 (UTC)
Subject: rpms/botan - New directory
Message-ID: <20090118222923.2D9FE700E0@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/botan
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsk25999/rpms/botan

Log Message:
Directory /cvs/pkgs/rpms/botan added to the repository




From kevin at fedoraproject.org  Sun Jan 18 22:29:23 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 18 Jan 2009 22:29:23 +0000 (UTC)
Subject: rpms/botan/devel - New directory
Message-ID: <20090118222923.7E3A4700E0@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/botan/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsk25999/rpms/botan/devel

Log Message:
Directory /cvs/pkgs/rpms/botan/devel added to the repository




From kevin at fedoraproject.org  Sun Jan 18 22:29:45 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 18 Jan 2009 22:29:45 +0000 (UTC)
Subject: rpms/botan Makefile,NONE,1.1
Message-ID: <20090118222945.B0E7D700E0@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/botan
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsk25999/rpms/botan

Added Files:
	Makefile 
Log Message:
Setup of module botan


--- NEW FILE Makefile ---
# Top level Makefile for module botan
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Jan 18 22:29:46 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 18 Jan 2009 22:29:46 +0000 (UTC)
Subject: rpms/botan/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <20090118222946.5A55F700E0@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/botan/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsk25999/rpms/botan/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module botan


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: botan
# $Id: Makefile,v 1.1 2009/01/18 22:29:46 kevin Exp $
NAME := botan
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Jan 18 22:29:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 18 Jan 2009 22:29:59 +0000
Subject: [pkgdb] ratproxy was added for rakesh
Message-ID: <20090118222959.604F1208468@bastion.fedora.phx.redhat.com>

kevin has added Package ratproxy with summary A passive web application security assessment tool
kevin has approved Package ratproxy
kevin has added a Fedora devel branch for ratproxy with an owner of rakesh
kevin has approved ratproxy in Fedora devel
kevin has approved Package ratproxy
kevin has set commit to Approved for provenpackager on ratproxy (Fedora devel)
kevin has set build to Approved for provenpackager on ratproxy (Fedora devel)
kevin has set checkout to Approved for provenpackager on ratproxy (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ratproxy



From pkgdb at fedoraproject.org  Sun Jan 18 22:30:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 18 Jan 2009 22:30:00 +0000
Subject: [pkgdb] ratproxy (Fedora, 9) updated by kevin
Message-ID: <20090118223000.D3A32208471@bastion.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for ratproxy
kevin has set commit to Approved for provenpackager on ratproxy (Fedora 9)
kevin has set build to Approved for provenpackager on ratproxy (Fedora 9)
kevin has set checkout to Approved for provenpackager on ratproxy (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ratproxy



From pkgdb at fedoraproject.org  Sun Jan 18 22:30:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 18 Jan 2009 22:30:00 +0000
Subject: [pkgdb] ratproxy (Fedora, 10) updated by kevin
Message-ID: <20090118223000.E60E5208473@bastion.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for ratproxy
kevin has set commit to Approved for provenpackager on ratproxy (Fedora 10)
kevin has set build to Approved for provenpackager on ratproxy (Fedora 10)
kevin has set checkout to Approved for provenpackager on ratproxy (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ratproxy



From kevin at fedoraproject.org  Sun Jan 18 22:30:27 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 18 Jan 2009 22:30:27 +0000 (UTC)
Subject: rpms/ratproxy - New directory
Message-ID: <20090118223027.33D16700E0@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/ratproxy
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsv26349/rpms/ratproxy

Log Message:
Directory /cvs/pkgs/rpms/ratproxy added to the repository




From kevin at fedoraproject.org  Sun Jan 18 22:30:27 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 18 Jan 2009 22:30:27 +0000 (UTC)
Subject: rpms/ratproxy/devel - New directory
Message-ID: <20090118223027.D97AD70142@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/ratproxy/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsv26349/rpms/ratproxy/devel

Log Message:
Directory /cvs/pkgs/rpms/ratproxy/devel added to the repository




From kevin at fedoraproject.org  Sun Jan 18 22:31:00 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 18 Jan 2009 22:31:00 +0000 (UTC)
Subject: rpms/ratproxy/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090118223100.617A9700E0@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/ratproxy/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsv26349/rpms/ratproxy/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module ratproxy


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: ratproxy
# $Id: Makefile,v 1.1 2009/01/18 22:30:59 kevin Exp $
NAME := ratproxy
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out 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 Jan 18 22:30:59 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 18 Jan 2009 22:30:59 +0000 (UTC)
Subject: rpms/ratproxy Makefile,NONE,1.1
Message-ID: <20090118223059.7213F700E0@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/ratproxy
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsv26349/rpms/ratproxy

Added Files:
	Makefile 
Log Message:
Setup of module ratproxy


--- NEW FILE Makefile ---
# Top level Makefile for module ratproxy
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout 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 Jan 18 22:31:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 18 Jan 2009 22:31:55 +0000
Subject: [pkgdb] ris-linux was added for kanarip
Message-ID: <20090118223155.15C90208467@bastion.fedora.phx.redhat.com>

kevin has added Package ris-linux with summary RIS for Linux - Boot winpe from the net / Ris Windows Installation
kevin has approved Package ris-linux
kevin has added a Fedora devel branch for ris-linux with an owner of kanarip
kevin has approved ris-linux in Fedora devel
kevin has approved Package ris-linux
kevin has set commit to Approved for provenpackager on ris-linux (Fedora devel)
kevin has set build to Approved for provenpackager on ris-linux (Fedora devel)
kevin has set checkout to Approved for provenpackager on ris-linux (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ris-linux



From pkgdb at fedoraproject.org  Sun Jan 18 22:31:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 18 Jan 2009 22:31:57 +0000
Subject: [pkgdb] ris-linux (Fedora, 9) updated by kevin
Message-ID: <20090118223157.BB177208470@bastion.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for ris-linux
kevin has set commit to Approved for provenpackager on ris-linux (Fedora 9)
kevin has set build to Approved for provenpackager on ris-linux (Fedora 9)
kevin has set checkout to Approved for provenpackager on ris-linux (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ris-linux



From pkgdb at fedoraproject.org  Sun Jan 18 22:31:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 18 Jan 2009 22:31:57 +0000
Subject: [pkgdb] ris-linux (Fedora EPEL, 5) updated by kevin
Message-ID: <20090118223157.C12AB208474@bastion.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for ris-linux
kevin has set commit to Approved for provenpackager on ris-linux (Fedora EPEL 5)
kevin has set build to Approved for provenpackager on ris-linux (Fedora EPEL 5)
kevin has set checkout to Approved for provenpackager on ris-linux (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ris-linux



From pkgdb at fedoraproject.org  Sun Jan 18 22:31:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 18 Jan 2009 22:31:57 +0000
Subject: [pkgdb] ris-linux (Fedora, 10) updated by kevin
Message-ID: <20090118223157.C8009208476@bastion.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for ris-linux
kevin has set commit to Approved for provenpackager on ris-linux (Fedora 10)
kevin has set build to Approved for provenpackager on ris-linux (Fedora 10)
kevin has set checkout to Approved for provenpackager on ris-linux (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ris-linux



From pkgdb at fedoraproject.org  Sun Jan 18 22:31:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 18 Jan 2009 22:31:57 +0000
Subject: [pkgdb] ris-linux (Fedora EPEL, 4) updated by kevin
Message-ID: <20090118223157.D868F208479@bastion.fedora.phx.redhat.com>

kevin added a Fedora EPEL 4 branch for ris-linux
kevin has set commit to Approved for provenpackager on ris-linux (Fedora EPEL 4)
kevin has set build to Approved for provenpackager on ris-linux (Fedora EPEL 4)
kevin has set checkout to Approved for provenpackager on ris-linux (Fedora EPEL 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ris-linux



From kevin at fedoraproject.org  Sun Jan 18 22:32:16 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 18 Jan 2009 22:32:16 +0000 (UTC)
Subject: rpms/ris-linux - New directory
Message-ID: <20090118223216.511E7700F7@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/ris-linux
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsk26681/rpms/ris-linux

Log Message:
Directory /cvs/pkgs/rpms/ris-linux added to the repository




From kevin at fedoraproject.org  Sun Jan 18 22:32:16 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 18 Jan 2009 22:32:16 +0000 (UTC)
Subject: rpms/ris-linux/devel - New directory
Message-ID: <20090118223216.C40AC700F7@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/ris-linux/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsk26681/rpms/ris-linux/devel

Log Message:
Directory /cvs/pkgs/rpms/ris-linux/devel added to the repository




From kevin at fedoraproject.org  Sun Jan 18 22:32:36 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 18 Jan 2009 22:32:36 +0000 (UTC)
Subject: rpms/ris-linux Makefile,NONE,1.1
Message-ID: <20090118223236.34359700F7@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/ris-linux
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsk26681/rpms/ris-linux

Added Files:
	Makefile 
Log Message:
Setup of module ris-linux


--- NEW FILE Makefile ---
# Top level Makefile for module ris-linux
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Jan 18 22:32:36 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 18 Jan 2009 22:32:36 +0000 (UTC)
Subject: rpms/ris-linux/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090118223236.8ED1D700F7@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/ris-linux/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsk26681/rpms/ris-linux/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module ris-linux


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: ris-linux
# $Id: Makefile,v 1.1 2009/01/18 22:32:36 kevin Exp $
NAME := ris-linux
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Jan 18 22:33:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 18 Jan 2009 22:33:20 +0000
Subject: [pkgdb] python-epdb was added for jforbes
Message-ID: <20090118223320.964B3208467@bastion.fedora.phx.redhat.com>

kevin has added Package python-epdb with summary Extended Python debugger
kevin has approved Package python-epdb
kevin has added a Fedora devel branch for python-epdb with an owner of jforbes
kevin has approved python-epdb in Fedora devel
kevin has approved Package python-epdb
kevin has set commit to Approved for provenpackager on python-epdb (Fedora devel)
kevin has set build to Approved for provenpackager on python-epdb (Fedora devel)
kevin has set checkout to Approved for provenpackager on python-epdb (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-epdb



From pkgdb at fedoraproject.org  Sun Jan 18 22:33:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 18 Jan 2009 22:33:22 +0000
Subject: [pkgdb] python-epdb (Fedora, 9) updated by kevin
Message-ID: <20090118223322.C3E5820846E@bastion.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for python-epdb
kevin has set commit to Approved for provenpackager on python-epdb (Fedora 9)
kevin has set build to Approved for provenpackager on python-epdb (Fedora 9)
kevin has set checkout to Approved for provenpackager on python-epdb (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-epdb



From kevin at fedoraproject.org  Sun Jan 18 22:33:38 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 18 Jan 2009 22:33:38 +0000 (UTC)
Subject: rpms/python-epdb - New directory
Message-ID: <20090118223338.27138700E0@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/python-epdb
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsd27775/rpms/python-epdb

Log Message:
Directory /cvs/pkgs/rpms/python-epdb added to the repository




From kevin at fedoraproject.org  Sun Jan 18 22:33:38 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 18 Jan 2009 22:33:38 +0000 (UTC)
Subject: rpms/python-epdb/devel - New directory
Message-ID: <20090118223338.60EB7700E0@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/python-epdb/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsd27775/rpms/python-epdb/devel

Log Message:
Directory /cvs/pkgs/rpms/python-epdb/devel added to the repository




From rdieter at fedoraproject.org  Sun Jan 18 22:33:47 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sun, 18 Jan 2009 22:33:47 +0000 (UTC)
Subject: rpms/xine-lib/devel xine-lib.spec,1.59,1.60
Message-ID: <20090118223347.CA148700E0@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/xine-lib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27706

Modified Files:
	xine-lib.spec 
Log Message:
make caca support unconditional



Index: xine-lib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xine-lib/devel/xine-lib.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- xine-lib.spec	18 Jan 2009 21:01:33 -0000	1.59
+++ xine-lib.spec	18 Jan 2009 22:33:17 -0000	1.60
@@ -19,12 +19,10 @@
 
 %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
@@ -72,13 +70,11 @@
 %if %{with_aalib}
 BuildRequires:  aalib-devel >= 1.4
 %endif # aalib
-%if %{with_caca}
 %if 0%{?old_caca}
 BuildRequires:  libcaca-devel >= 0.99
 %else
 BuildRequires:  libcaca-devel >= 0.99-0.5.beta16
 %endif
-%endif # caca
 %if 0%{!?_without_directfb:1}
 BuildRequires:  directfb-devel
 %endif # directfb
@@ -125,7 +121,7 @@
 disk drives, and displays multimedia streamed over the Internet. It
 interprets many of the most common multimedia formats available - and some
 of the most uncommon formats, too.  --with/--without rpmbuild options
-(some default values depend on target distribution): aalib, caca, directfb,
+(some default values depend on target distribution): aalib, directfb,
 imagemagick, freetype, antialiasing (with freetype), pulseaudio, xcb.
 
 %package        devel
@@ -177,9 +173,7 @@
 %if %{with_aalib}
   - AA-lib
 %endif # aalib
-%if %{with_caca}
   - Libcaca
-%endif # caca
 %if 0%{!?_without_imagemagick:1}
   - Image decoding
 %endif # imagemagick
@@ -226,6 +220,7 @@
 %if 0%{?_with_freetype:1}
 %if 0%{?_with_antialiasing:1}
     --enable-antialiasing \
+    --with-caca \
 %endif # antialiasing
     --with-freetype \
     --with-fontconfig \
@@ -411,9 +406,7 @@
 %if %{with_aalib}
 %{_libdir}/xine/plugins/%{abiver}/xineplug_vo_out_aa.so
 %endif # aalib
-%if %{with_caca}
 %{_libdir}/xine/plugins/%{abiver}/xineplug_vo_out_caca.so
-%endif # caca
 %if 0%{!?_without_directfb:1}
 %{_libdir}/xine/plugins/%{abiver}/xineplug_vo_out_directfb.so
 %{_libdir}/xine/plugins/%{abiver}/xineplug_vo_out_xdirectfb.so
@@ -437,6 +430,7 @@
 %changelog
 * Sun Jan 18 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.1.16-2
 - drop deepbind patch (#480504)
+- caca support (EPEL)
 
 * Wed Jan 07 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 1.1.16-1.1
 - patch for old libcaca in F9-



From pkgdb at fedoraproject.org  Sun Jan 18 22:33:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 18 Jan 2009 22:33:22 +0000
Subject: [pkgdb] python-epdb (Fedora, 10) updated by kevin
Message-ID: <20090118223322.D0527208472@bastion.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for python-epdb
kevin has set commit to Approved for provenpackager on python-epdb (Fedora 10)
kevin has set build to Approved for provenpackager on python-epdb (Fedora 10)
kevin has set checkout to Approved for provenpackager on python-epdb (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-epdb



From kevin at fedoraproject.org  Sun Jan 18 22:33:53 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 18 Jan 2009 22:33:53 +0000 (UTC)
Subject: rpms/python-epdb Makefile,NONE,1.1
Message-ID: <20090118223353.D2615700E0@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/python-epdb
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsd27775/rpms/python-epdb

Added Files:
	Makefile 
Log Message:
Setup of module python-epdb


--- NEW FILE Makefile ---
# Top level Makefile for module python-epdb
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Jan 18 22:33:54 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 18 Jan 2009 22:33:54 +0000 (UTC)
Subject: rpms/python-epdb/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090118223354.24812700E0@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/python-epdb/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsd27775/rpms/python-epdb/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module python-epdb


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: python-epdb
# $Id: Makefile,v 1.1 2009/01/18 22:33:53 kevin Exp $
NAME := python-epdb
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Jan 18 22:34:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 18 Jan 2009 22:34:22 +0000
Subject: [pkgdb] perl-MooseX-MultiInitArg was added for cweyl
Message-ID: <20090118223422.8AFB8208467@bastion.fedora.phx.redhat.com>

kevin has added Package perl-MooseX-MultiInitArg with summary Attributes with aliases for constructor arguments
kevin has approved Package perl-MooseX-MultiInitArg
kevin has added a Fedora devel branch for perl-MooseX-MultiInitArg with an owner of cweyl
kevin has approved perl-MooseX-MultiInitArg in Fedora devel
kevin has approved Package perl-MooseX-MultiInitArg
kevin has set commit to Approved for provenpackager on perl-MooseX-MultiInitArg (Fedora devel)
kevin has set build to Approved for provenpackager on perl-MooseX-MultiInitArg (Fedora devel)
kevin has set checkout to Approved for provenpackager on perl-MooseX-MultiInitArg (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-MooseX-MultiInitArg



From pkgdb at fedoraproject.org  Sun Jan 18 22:34:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 18 Jan 2009 22:34:24 +0000
Subject: [pkgdb] perl-MooseX-MultiInitArg (Fedora, 9) updated by kevin
Message-ID: <20090118223424.D0657208471@bastion.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for perl-MooseX-MultiInitArg
kevin has set commit to Approved for provenpackager on perl-MooseX-MultiInitArg (Fedora 9)
kevin has set build to Approved for provenpackager on perl-MooseX-MultiInitArg (Fedora 9)
kevin has set checkout to Approved for provenpackager on perl-MooseX-MultiInitArg (Fedora 9)
kevin approved watchbugzilla on perl-MooseX-MultiInitArg (Fedora 9) for perl-sig
kevin approved watchcommits on perl-MooseX-MultiInitArg (Fedora 9) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-MooseX-MultiInitArg



From pkgdb at fedoraproject.org  Sun Jan 18 22:34:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 18 Jan 2009 22:34:24 +0000
Subject: [pkgdb] perl-MooseX-MultiInitArg (Fedora, 10) updated by kevin
Message-ID: <20090118223424.DCCBB208474@bastion.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for perl-MooseX-MultiInitArg
kevin has set commit to Approved for provenpackager on perl-MooseX-MultiInitArg (Fedora 10)
kevin has set build to Approved for provenpackager on perl-MooseX-MultiInitArg (Fedora 10)
kevin has set checkout to Approved for provenpackager on perl-MooseX-MultiInitArg (Fedora 10)
kevin approved watchbugzilla on perl-MooseX-MultiInitArg (Fedora 10) for perl-sig
kevin approved watchcommits on perl-MooseX-MultiInitArg (Fedora 10) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-MooseX-MultiInitArg



From pkgdb at fedoraproject.org  Sun Jan 18 22:34:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 18 Jan 2009 22:34:24 +0000
Subject: [pkgdb] perl-MooseX-MultiInitArg (Fedora, devel) updated by kevin
Message-ID: <20090118223424.EA602208477@bastion.fedora.phx.redhat.com>

kevin approved watchbugzilla on perl-MooseX-MultiInitArg (Fedora devel) for perl-sig
kevin approved watchcommits on perl-MooseX-MultiInitArg (Fedora devel) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-MooseX-MultiInitArg



From kevin at fedoraproject.org  Sun Jan 18 22:34:40 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 18 Jan 2009 22:34:40 +0000 (UTC)
Subject: rpms/perl-MooseX-MultiInitArg - New directory
Message-ID: <20090118223440.28F93700E0@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-MooseX-MultiInitArg
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsS28091/rpms/perl-MooseX-MultiInitArg

Log Message:
Directory /cvs/pkgs/rpms/perl-MooseX-MultiInitArg added to the repository




From kevin at fedoraproject.org  Sun Jan 18 22:34:57 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 18 Jan 2009 22:34:57 +0000 (UTC)
Subject: rpms/perl-MooseX-MultiInitArg Makefile,NONE,1.1
Message-ID: <20090118223457.59799700E0@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-MooseX-MultiInitArg
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsS28091/rpms/perl-MooseX-MultiInitArg

Added Files:
	Makefile 
Log Message:
Setup of module perl-MooseX-MultiInitArg


--- NEW FILE Makefile ---
# Top level Makefile for module perl-MooseX-MultiInitArg
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Jan 18 22:34:57 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 18 Jan 2009 22:34:57 +0000 (UTC)
Subject: rpms/perl-MooseX-MultiInitArg/devel .cvsignore, NONE, 1.1 Makefile, 
	NONE, 1.1 sources, NONE, 1.1
Message-ID: <20090118223457.9FC2E700E0@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-MooseX-MultiInitArg/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsS28091/rpms/perl-MooseX-MultiInitArg/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-MooseX-MultiInitArg


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: perl-MooseX-MultiInitArg
# $Id: Makefile,v 1.1 2009/01/18 22:34:57 kevin Exp $
NAME := perl-MooseX-MultiInitArg
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out 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 Jan 18 22:34:40 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 18 Jan 2009 22:34:40 +0000 (UTC)
Subject: rpms/perl-MooseX-MultiInitArg/devel - New directory
Message-ID: <20090118223440.65D68700E0@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-MooseX-MultiInitArg/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsS28091/rpms/perl-MooseX-MultiInitArg/devel

Log Message:
Directory /cvs/pkgs/rpms/perl-MooseX-MultiInitArg/devel added to the repository




From rdieter at fedoraproject.org  Sun Jan 18 22:35:13 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sun, 18 Jan 2009 22:35:13 +0000 (UTC)
Subject: rpms/xine-lib/EL-5 xine-lib-1.1.16-old-caca.patch, NONE,
	1.1 xine-lib.spec, 1.22, 1.23
Message-ID: <20090118223513.BC8AC700E0@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-serv28067

Modified Files:
	xine-lib.spec 
Added Files:
	xine-lib-1.1.16-old-caca.patch 
Log Message:
--with-caca, add awol patch


xine-lib-1.1.16-old-caca.patch:

--- NEW FILE xine-lib-1.1.16-old-caca.patch ---
--- src/video_out/video_out_caca.c	Tue Nov 18 21:13:55 2008 +0100
+++ src/video_out/video_out_caca.c	Mon Nov 10 16:33:51 2008 +0100
@@ -276,7 +276,6 @@ static int caca_redraw_needed (vo_driver
 
 static vo_driver_t *open_plugin (video_driver_class_t *class_gen, const void *visual_gen) {
   caca_class_t         *class = (caca_class_t *) class_gen;
-  caca_display_t       *dp = (caca_display_t *)visual_gen;
   caca_driver_t        *this;
 
   this = calloc(1, sizeof (caca_driver_t));
@@ -301,13 +300,8 @@ static vo_driver_t *open_plugin (video_d
   this->yuv2rgb_factory = yuv2rgb_factory_init(MODE_32_RGB, 0, NULL);
   this->yuv2rgb_factory->set_csc_levels(this->yuv2rgb_factory, 0, 128, 128);
 
-  if (dp) {
-    this->cv = caca_get_canvas(dp);
-    this->dp = dp;
-  } else {
-    this->cv = cucul_create_canvas(0, 0);
-    this->dp = caca_create_display(this->cv);
-  }
+  this->cv = cucul_create_canvas(0, 0);
+  this->dp = caca_create_display(this->cv);
 
   caca_refresh_display(this->dp);
   return &this->vo_driver;



Index: xine-lib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xine-lib/EL-5/xine-lib.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- xine-lib.spec	18 Jan 2009 22:26:20 -0000	1.22
+++ xine-lib.spec	18 Jan 2009 22:34:43 -0000	1.23
@@ -121,7 +121,7 @@
 disk drives, and displays multimedia streamed over the Internet. It
 interprets many of the most common multimedia formats available - and some
 of the most uncommon formats, too.  --with/--without rpmbuild options
-(some default values depend on target distribution): aalib, caca, directfb,
+(some default values depend on target distribution): aalib, directfb,
 imagemagick, freetype, antialiasing (with freetype), pulseaudio, xcb.
 
 %package        devel
@@ -220,6 +220,7 @@
 %if 0%{?_with_freetype:1}
 %if 0%{?_with_antialiasing:1}
     --enable-antialiasing \
+    --with-caca \
 %endif # antialiasing
     --with-freetype \
     --with-fontconfig \



From cwickert at fedoraproject.org  Sun Jan 18 22:51:41 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Sun, 18 Jan 2009 22:51:41 +0000 (UTC)
Subject: rpms/xfce4-clipman-plugin/devel xfce4-clipman-plugin.spec, 1.11,
	1.12
Message-ID: <20090118225141.3691B700E0@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/xfce4-clipman-plugin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30060

Modified Files:
	xfce4-clipman-plugin.spec 
Log Message:
* Sun Jan 18 2009 Christoph Wickert <fedora christoph-wickert de> - 0.8.1-2
- Rebuild for Xfce 4.6 (Beta 3)



Index: xfce4-clipman-plugin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-clipman-plugin/devel/xfce4-clipman-plugin.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- xfce4-clipman-plugin.spec	7 Mar 2008 02:08:08 -0000	1.11
+++ xfce4-clipman-plugin.spec	18 Jan 2009 22:51:10 -0000	1.12
@@ -1,6 +1,6 @@
 Name:		xfce4-clipman-plugin
 Version:	0.8.1
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Clipboard manager plugin for the Xfce panel
 
 Group:		User Interface/Desktops
@@ -39,6 +39,9 @@
 %{_datadir}/xfce4/panel-plugins/*.desktop
 
 %changelog
+* Sun Jan 18 2009 Christoph Wickert <fedora christoph-wickert de> - 0.8.1-2
+- Rebuild for Xfce 4.6 (Beta 3)
+
 * Fri Mar 07 2008 Christoph Wickert <fedora christoph-wickert de> - 0.8.1-1
 - Update to 0.8.1 (fixes bugzilla.xfce.org #3304)
 



From cwickert at fedoraproject.org  Sun Jan 18 22:52:01 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Sun, 18 Jan 2009 22:52:01 +0000 (UTC)
Subject: rpms/xfce4-cpugraph-plugin/devel xfce4-cpugraph-plugin.spec, 1.13, 
	1.14
Message-ID: <20090118225201.2EA9D700E0@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/xfce4-cpugraph-plugin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30113

Modified Files:
	xfce4-cpugraph-plugin.spec 
Log Message:
* Sun Jan 18 2009 Christoph Wickert <fedora christoph-wickert de> - 0.4.0-4
- Rebuild for Xfce 4.6 (Beta 3)



Index: xfce4-cpugraph-plugin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-cpugraph-plugin/devel/xfce4-cpugraph-plugin.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- xfce4-cpugraph-plugin.spec	18 Feb 2008 23:43:57 -0000	1.13
+++ xfce4-cpugraph-plugin.spec	18 Jan 2009 22:51:30 -0000	1.14
@@ -1,6 +1,6 @@
 Name:		xfce4-cpugraph-plugin
 Version:	0.4.0
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	CPU monitor for the Xfce panel
 
 Group:		User Interface/Desktops
@@ -40,6 +40,9 @@
 %{_datadir}/xfce4/panel-plugins/*.desktop
 
 %changelog
+* Sun Jan 18 2009 Christoph Wickert <fedora christoph-wickert de> - 0.4.0-4
+- Rebuild for Xfce 4.6 (Beta 3)
+
 * Mon Feb 18 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.4.0-3
 - Autorebuild for GCC 4.3
 



From cwickert at fedoraproject.org  Sun Jan 18 23:00:12 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Sun, 18 Jan 2009 23:00:12 +0000 (UTC)
Subject: rpms/xfce4-datetime-plugin/devel xfce4-datetime-plugin.spec, 1.22, 
	1.23
Message-ID: <20090118230012.1F0C3700E0@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/xfce4-datetime-plugin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31204

Modified Files:
	xfce4-datetime-plugin.spec 
Log Message:
* Sun Jan 18 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.6.1-2
- Rebuild for Xfce 4.6 (Beta 3)



Index: xfce4-datetime-plugin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-datetime-plugin/devel/xfce4-datetime-plugin.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- xfce4-datetime-plugin.spec	28 Nov 2008 00:38:00 -0000	1.22
+++ xfce4-datetime-plugin.spec	18 Jan 2009 22:59:41 -0000	1.23
@@ -1,6 +1,6 @@
 Name:		xfce4-datetime-plugin
 Version:	0.6.1
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Date/time plugin for the Xfce panel
 
 Group:		User Interface/Desktops
@@ -48,6 +48,9 @@
 
 
 %changelog
+* Sun Jan 18 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.6.1-2
+- Rebuild for Xfce 4.6 (Beta 3)
+
 * Thu Nov 27 2008 Christoph Wickert <cwickert at fedoraproject.org> - 0.6.1-1
 - Update to 0.6.1
 - Include NEWS and THANKS docs



From cwickert at fedoraproject.org  Sun Jan 18 23:01:57 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Sun, 18 Jan 2009 23:01:57 +0000 (UTC)
Subject: rpms/xfce4-cpugraph-plugin/devel xfce4-cpugraph-plugin.spec, 1.14, 
	1.15
Message-ID: <20090118230157.BE113700E0@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/xfce4-cpugraph-plugin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31568

Modified Files:
	xfce4-cpugraph-plugin.spec 
Log Message:
fix email in changelog


Index: xfce4-cpugraph-plugin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-cpugraph-plugin/devel/xfce4-cpugraph-plugin.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- xfce4-cpugraph-plugin.spec	18 Jan 2009 22:51:30 -0000	1.14
+++ xfce4-cpugraph-plugin.spec	18 Jan 2009 23:01:27 -0000	1.15
@@ -40,38 +40,38 @@
 %{_datadir}/xfce4/panel-plugins/*.desktop
 
 %changelog
-* Sun Jan 18 2009 Christoph Wickert <fedora christoph-wickert de> - 0.4.0-4
+* Sun Jan 18 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.4.0-4
 - Rebuild for Xfce 4.6 (Beta 3)
 
 * Mon Feb 18 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.4.0-3
 - Autorebuild for GCC 4.3
 
-* Fri Dec 07 2007 Christoph Wickert <fedora christoph-wickert de> - 0.4.0-2
+* Fri Dec 07 2007 Christoph Wickert <cwickert at fedoraproject.org> - 0.4.0-2
 - Rebuild for Xfce 4.4.2
 
-* Sat Nov 24 2007 Christoph Wickert <fedora christoph-wickert de> - 0.4.0-1
+* Sat Nov 24 2007 Christoph Wickert <cwickert at fedoraproject.org> - 0.4.0-1
 - Update to 0.4.0
 - Remove asneeded patch, fixed upstream
 - drop --disable-static
 
-* Sat Apr 28 2007 Christoph Wickert <fedora christoph-wickert de> - 0.3.0-5
+* Sat Apr 28 2007 Christoph Wickert <cwickert at fedoraproject.org> - 0.3.0-5
 - Rebuild for Xfce 4.4.1
 
-* Mon Jan 22 2007 Christoph Wickert <fedora christoph-wickert de> - 0.3.0-4
+* Mon Jan 22 2007 Christoph Wickert <cwickert at fedoraproject.org> - 0.3.0-4
 - Rebuild for Xfce 4.4.
 - Patch to compile with -Wl,--as-needed (bugzilla.xfce.org #2785)
 
-* Thu Oct 05 2006 Christoph Wickert <fedora christoph-wickert de> - 0.3.0-3
+* Thu Oct 05 2006 Christoph Wickert <cwickert at fedoraproject.org> - 0.3.0-3
 - Bump release for devel checkin.
 
-* Wed Sep 13 2006 Christoph Wickert <fedora christoph-wickert de> - 0.3.0-2
+* Wed Sep 13 2006 Christoph Wickert <cwickert at fedoraproject.org> - 0.3.0-2
 - Rebuild for XFCE 4.3.99.1.
 - BR perl(XML::Parser).
 
-* Mon Sep 04 2006 Christoph Wickert <fedora christoph-wickert de> - 0.3.0-1
+* Mon Sep 04 2006 Christoph Wickert <cwickert at fedoraproject.org> - 0.3.0-1
 - Update to 0.3 on XFCE 4.3.90.2.
 
-* Mon Sep 04 2006 Christoph Wickert <fedora christoph-wickert de> - 0.2.2-7
+* Mon Sep 04 2006 Christoph Wickert <cwickert at fedoraproject.org> - 0.2.2-7
 - Mass rebuild for Fedora Core 6.
 
 * Tue Apr 11 2006 Christoph Wickert <fedora wickert at arcor de> - 0.2.2-6



From cwickert at fedoraproject.org  Sun Jan 18 23:04:04 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Sun, 18 Jan 2009 23:04:04 +0000 (UTC)
Subject: rpms/xfce4-battery-plugin/devel xfce4-battery-plugin.spec, 1.17,
	1.18
Message-ID: <20090118230404.C4EC9700E0@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-serv32306

Modified Files:
	xfce4-battery-plugin.spec 
Log Message:
fix email in changelog


Index: xfce4-battery-plugin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-battery-plugin/devel/xfce4-battery-plugin.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- xfce4-battery-plugin.spec	18 Jan 2009 22:16:44 -0000	1.17
+++ xfce4-battery-plugin.spec	18 Jan 2009 23:03:34 -0000	1.18
@@ -19,7 +19,7 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .2.6.24
+#%patch0 -p1 -b .2.6.24
 
 %build
 %configure --disable-static
@@ -50,43 +50,43 @@
 %{_datadir}/icons/hicolor/scalable/devices/battery.svg
 
 %changelog
-* Sun Jan 18 2009 Christoph Wickert <fedora christoph-wickert de> - 0.5.1-2
+* Sun Jan 18 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.5.1-2
 - Rebuild for Xfce 4.6 (Beta 3)
 
-* Fri Sep 05 2008 Christoph Wickert <fedora christoph-wickert de> - 0.5.1-1
+* Fri Sep 05 2008 Christoph Wickert <cwickert at fedoraproject.org> - 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
+* Sat Apr 05 2008 Christoph Wickert <cwickert at fedoraproject.org> - 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
 
-* Tue Aug 28 2007 Christoph Wickert <fedora christoph-wickert de> - 0.5.0-3
+* Tue Aug 28 2007 Christoph Wickert <cwickert at fedoraproject.org> - 0.5.0-3
 - Fix for x86_64 kernels >= 2.6.21. (bugzilla.xfce.org #3190)
 - Update license tag
 
-* Mon Apr 23 2007 Christoph Wickert <fedora christoph-wickert de> - 0.5.0-2
+* Mon Apr 23 2007 Christoph Wickert <cwickert at fedoraproject.org> - 0.5.0-2
 - Rebuild for Xfce 4.4.1
 
-* Mon Jan 22 2007 Christoph Wickert <fedora christoph-wickert de> - 0.5.0-1
+* Mon Jan 22 2007 Christoph Wickert <cwickert at fedoraproject.org> - 0.5.0-1
 - Update to 0.5.0 on Xfce 4.4.
 
-* Sat Nov 11 2006 Christoph Wickert <fedora christoph-wickert de> - 0.4.90.3-1
+* Sat Nov 11 2006 Christoph Wickert <cwickert at fedoraproject.org> - 0.4.90.3-1
 - Update to 0.4.90.3 on XFCE 4.3.99.2.
 
-* Thu Oct 05 2006 Christoph Wickert <fedora christoph-wickert de> - 0.4.90.2-3
+* Thu Oct 05 2006 Christoph Wickert <cwickert at fedoraproject.org> - 0.4.90.2-3
 - Bump release for devel checkin.
 
-* Wed Sep 13 2006 Christoph Wickert <fedora christoph-wickert de> - 0.4.90.2-2
+* Wed Sep 13 2006 Christoph Wickert <cwickert at fedoraproject.org> - 0.4.90.2-2
 - Rebuild for XFCE 4.3.99.1.
 - BR perl(XML::Parser).
 
-* Mon Sep 04 2006 Christoph Wickert <fedora christoph-wickert de> - 0.4.90.2-1
+* Mon Sep 04 2006 Christoph Wickert <cwickert at fedoraproject.org> - 0.4.90.2-1
 - Update to 0.4.90.2 on XFCE 4.3.90.2.
 
-* Mon Sep 04 2006 Christoph Wickert <fedora christoph-wickert de> - 0.3.0-7
+* Mon Sep 04 2006 Christoph Wickert <cwickert at fedoraproject.org> - 0.3.0-7
 - Mass rebuild for Fedora Core 6.
 
 * Tue Apr 11 2006 Christoph Wickert <fedora wickert at arcor de> - 0.3.0-6



From cwickert at fedoraproject.org  Sun Jan 18 23:04:34 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Sun, 18 Jan 2009 23:04:34 +0000 (UTC)
Subject: rpms/xfce4-clipman-plugin/devel xfce4-clipman-plugin.spec, 1.12,
	1.13
Message-ID: <20090118230434.4278B700E0@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/xfce4-clipman-plugin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32622

Modified Files:
	xfce4-clipman-plugin.spec 
Log Message:
fix email in changelog


Index: xfce4-clipman-plugin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-clipman-plugin/devel/xfce4-clipman-plugin.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- xfce4-clipman-plugin.spec	18 Jan 2009 22:51:10 -0000	1.12
+++ xfce4-clipman-plugin.spec	18 Jan 2009 23:04:04 -0000	1.13
@@ -39,38 +39,38 @@
 %{_datadir}/xfce4/panel-plugins/*.desktop
 
 %changelog
-* Sun Jan 18 2009 Christoph Wickert <fedora christoph-wickert de> - 0.8.1-2
+* Sun Jan 18 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.8.1-2
 - Rebuild for Xfce 4.6 (Beta 3)
 
-* Fri Mar 07 2008 Christoph Wickert <fedora christoph-wickert de> - 0.8.1-1
+* Fri Mar 07 2008 Christoph Wickert <cwickert at fedoraproject.org> - 0.8.1-1
 - Update to 0.8.1 (fixes bugzilla.xfce.org #3304)
 
 * Mon Feb 18 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.8.0-4
 - Autorebuild for GCC 4.3
 
-* Sat Aug 25 2007 Christoph Wickert <fedora christoph-wickert de> - 0.8.0-3
+* Sat Aug 25 2007 Christoph Wickert <cwickert at fedoraproject.org> - 0.8.0-3
 - Rebuild for BuildID feature
 
-* Sat Apr 28 2007 Christoph Wickert <fedora christoph-wickert de> - 0.8.0-2
+* Sat Apr 28 2007 Christoph Wickert <cwickert at fedoraproject.org> - 0.8.0-2
 - Rebuild for Xfce 4.4.1
 
-* Mon Jan 22 2007 Christoph Wickert <fedora christoph-wickert de> - 0.8.0-1
+* Mon Jan 22 2007 Christoph Wickert <cwickert at fedoraproject.org> - 0.8.0-1
 - Update to 0.8.0 on Xfce 4.4.
 
-* Thu Oct 05 2006 Christoph Wickert <fedora christoph-wickert de> - 0.5.99.1-3
+* Thu Oct 05 2006 Christoph Wickert <cwickert at fedoraproject.org> - 0.5.99.1-3
 - Bump release for devel checkin.
 
-* Wed Sep 13 2006 Christoph Wickert <fedora christoph-wickert de> - 0.5.99.1-2
+* Wed Sep 13 2006 Christoph Wickert <cwickert at fedoraproject.org> - 0.5.99.1-2
 - Rebuild for XFCE 4.3.99.1.
 - BR perl(XML::Parser).
 
-* Wed Sep 13 2006 Christoph Wickert <fedora christoph-wickert de> - 0.5.99.1-1
+* Wed Sep 13 2006 Christoph Wickert <cwickert at fedoraproject.org> - 0.5.99.1-1
 - Update to 0.5.99.1.
 
-* Mon Sep 04 2006 Christoph Wickert <fedora christoph-wickert de> - 0.5.90.2-1
+* Mon Sep 04 2006 Christoph Wickert <cwickert at fedoraproject.org> - 0.5.90.2-1
 - Update to 0.5.90.2 on XFCE 4.3.90.2.
 
-* Mon Sep 04 2006 Christoph Wickert <fedora christoph-wickert de> - 0.4.1-7
+* Mon Sep 04 2006 Christoph Wickert <cwickert at fedoraproject.org> - 0.4.1-7
 - Mass rebuild for Fedora Core 6.
 
 * Tue Apr 11 2006 Christoph Wickert <fedora wickert at arcor de> - 0.4.1-6



From caolanm at fedoraproject.org  Sun Jan 18 23:06:38 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Sun, 18 Jan 2009 23:06:38 +0000 (UTC)
Subject: rpms/mythes-el/devel import.log, NONE, 1.1 mythes-el.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090118230638.5323D700E0@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/mythes-el/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv619/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log mythes-el.spec 
Log Message:



--- NEW FILE import.log ---
mythes-el-0_20070412-1_fc10:HEAD:mythes-el-0.20070412-1.fc10.src.rpm:1232319934


--- NEW FILE mythes-el.spec ---
Name: mythes-el
Summary: Greek thesaurus
%define upstreamid 20070412
Version: 0.%{upstreamid}
Release: 1%{?dist}
Source: http://www.ellak.gr/pub/oo_extras/th_el.zip
Group: Applications/Text
URL: http://www.openthesaurus.gr/
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
License: GPLv2+
BuildArch: noarch

%description
Greek thesaurus.

%prep
%setup -q -c

%build
iconv -f ISO-8859-7 -t UTF-8 README_th_el_GR_v2.txt > README_th_el_GR_v2.txt.new
mv -f README_th_el_GR_v2.txt.new README_th_el_GR_v2.txt

%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT/%{_datadir}/mythes
cp -p th_el_GR_v2.* $RPM_BUILD_ROOT/%{_datadir}/mythes

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc README_th_el_GR_v2.txt
%dir %{_datadir}/mythes
%{_datadir}/mythes/*

%changelog
* Thu Jan 15 2009 Caolan McNamara <caolanm at redhat.com> - 0.20070412-1
- initial version


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mythes-el/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	17 Jan 2009 03:25:11 -0000	1.1
+++ .cvsignore	18 Jan 2009 23:06:07 -0000	1.2
@@ -0,0 +1 @@
+th_el.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mythes-el/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	17 Jan 2009 03:25:11 -0000	1.1
+++ sources	18 Jan 2009 23:06:07 -0000	1.2
@@ -0,0 +1 @@
+491b6b88184f3f935e9fe2111adb4555  th_el.zip



From cwickert at fedoraproject.org  Sun Jan 18 23:06:57 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Sun, 18 Jan 2009 23:06:57 +0000 (UTC)
Subject: rpms/xfce4-dict/devel xfce4-dict.spec,1.5,1.6
Message-ID: <20090118230657.A18EF700E0@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/xfce4-dict/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv701

Modified Files:
	xfce4-dict.spec 
Log Message:
* Sun Jan 18 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.5.2-2
- Rebuild for Xfce 4.6 (Beta 3)



Index: xfce4-dict.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-dict/devel/xfce4-dict.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- xfce4-dict.spec	15 Dec 2008 04:17:13 -0000	1.5
+++ xfce4-dict.spec	18 Jan 2009 23:06:27 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           xfce4-dict
 Version:        0.5.2
-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
@@ -87,6 +87,9 @@
 %{_datadir}/xfce4/panel-plugins/*.desktop
 
 %changelog
+* Sun Jan 18 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.5.2-2
+- Rebuild for Xfce 4.6 (Beta 3)
+
 * Thu Nov 27 2008 Christoph Wickert <cwickert at fedoraproject.org> - 0.5.2-1
 - Update to 0.5.2
 



From cwickert at fedoraproject.org  Sun Jan 18 23:07:20 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Sun, 18 Jan 2009 23:07:20 +0000 (UTC)
Subject: rpms/xfce4-diskperf-plugin/devel xfce4-diskperf-plugin.spec, 1.15, 
	1.16
Message-ID: <20090118230720.8E470700E0@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/xfce4-diskperf-plugin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv772

Modified Files:
	xfce4-diskperf-plugin.spec 
Log Message:
* Sun Jan 18 2009 Christoph Wickert <cwickert at fedoraproject.org> - 2.2.0-2
- Rebuild for Xfce 4.6 (Beta 3)



Index: xfce4-diskperf-plugin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-diskperf-plugin/devel/xfce4-diskperf-plugin.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- xfce4-diskperf-plugin.spec	27 Apr 2008 13:10:24 -0000	1.15
+++ xfce4-diskperf-plugin.spec	18 Jan 2009 23:06:50 -0000	1.16
@@ -1,6 +1,6 @@
 Name:		xfce4-diskperf-plugin
 Version:	2.2.0
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Disk performance plugin for the Xfce panel
 
 Group:		User Interface/Desktops
@@ -39,6 +39,9 @@
 %{_datadir}/xfce4/panel-plugins/*.desktop
 
 %changelog
+* Sun Jan 18 2009 Christoph Wickert <cwickert at fedoraproject.org> - 2.2.0-2
+- Rebuild for Xfce 4.6 (Beta 3)
+
 * Sun Apr 27 2008 Christoph Wickert <fedora christoph-wickert de> - 2.2.0-1
 - Update to 2.2.0
 



From cwickert at fedoraproject.org  Sun Jan 18 23:09:21 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Sun, 18 Jan 2009 23:09:21 +0000 (UTC)
Subject: rpms/xfce4-eyes-plugin/devel xfce4-eyes-plugin.spec,1.7,1.8
Message-ID: <20090118230921.888D1700E0@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/xfce4-eyes-plugin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1324

Modified Files:
	xfce4-eyes-plugin.spec 
Log Message:
* Sun Jan 18 2009 Christoph Wickert <cwickert at fedoraproject.org> - 4.4.0-5
- Rebuild for Xfce 4.6 (Beta 3)



Index: xfce4-eyes-plugin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-eyes-plugin/devel/xfce4-eyes-plugin.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- xfce4-eyes-plugin.spec	18 Feb 2008 23:47:33 -0000	1.7
+++ xfce4-eyes-plugin.spec	18 Jan 2009 23:08:51 -0000	1.8
@@ -1,6 +1,6 @@
 Name:		xfce4-eyes-plugin
 Version:	4.4.0
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	Eyes for the Xfce panel
 
 Group:		User Interface/Desktops
@@ -48,6 +48,9 @@
 %{_datadir}/xfce4/eyes/
 
 %changelog
+* Sun Jan 18 2009 Christoph Wickert <cwickert at fedoraproject.org> - 4.4.0-5
+- Rebuild for Xfce 4.6 (Beta 3)
+
 * Mon Feb 18 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 4.4.0-4
 - Autorebuild for GCC 4.3
 



From caolanm at fedoraproject.org  Sun Jan 18 23:11:17 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Sun, 18 Jan 2009 23:11:17 +0000 (UTC)
Subject: rpms/mythes-fr/devel import.log, NONE, 1.1 mythes-fr.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090118231117.6C65C700E0@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/mythes-fr/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1784/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log mythes-fr.spec 
Log Message:



--- NEW FILE import.log ---
mythes-fr-2_1-1_fc10:HEAD:mythes-fr-2.1-1.fc10.src.rpm:1232320173


--- NEW FILE mythes-fr.spec ---
Name: mythes-fr
Summary: French thesaurus
Version: 2.1
Release: 1%{?dist}
Source: http://dicollecte.free.fr/download/fr/thesaurus_2-1.zip
Group: Applications/Text
URL: http://dicollecte.free.fr
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
License: LGPLv2+
BuildArch: noarch

%description
French thesaurus.

%prep
%setup -q -c

%build
iconv -f ISO-8859-1 -t UTF-8 README_th_fr_FR_v2.txt > README_th_fr_FR_v2.txt.new
mv -f README_th_fr_FR_v2.txt.new README_th_fr_FR_v2.txt

%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT/%{_datadir}/mythes
cp -p th_fr_FR_v2.* $RPM_BUILD_ROOT/%{_datadir}/mythes

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc README_th_fr_FR_v2.txt
%dir %{_datadir}/mythes
%{_datadir}/mythes/*

%changelog
* Thu Jan 15 2009 Caolan McNamara <caolanm at redhat.com> - 2.1-1
- initial version


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mythes-fr/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	17 Jan 2009 03:23:27 -0000	1.1
+++ .cvsignore	18 Jan 2009 23:10:46 -0000	1.2
@@ -0,0 +1 @@
+thesaurus_2-1.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mythes-fr/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	17 Jan 2009 03:23:27 -0000	1.1
+++ sources	18 Jan 2009 23:10:46 -0000	1.2
@@ -0,0 +1 @@
+74ca532d23176886beb05248dfa49d0a  thesaurus_2-1.zip



From cwickert at fedoraproject.org  Sun Jan 18 23:11:57 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Sun, 18 Jan 2009 23:11:57 +0000 (UTC)
Subject: rpms/xfce4-eyes-plugin/devel xfce4-eyes-plugin.spec,1.8,1.9
Message-ID: <20090118231157.B3910700E0@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/xfce4-eyes-plugin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1986

Modified Files:
	xfce4-eyes-plugin.spec 
Log Message:
fix email in changelog


Index: xfce4-eyes-plugin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-eyes-plugin/devel/xfce4-eyes-plugin.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- xfce4-eyes-plugin.spec	18 Jan 2009 23:08:51 -0000	1.8
+++ xfce4-eyes-plugin.spec	18 Jan 2009 23:11:27 -0000	1.9
@@ -54,19 +54,19 @@
 * Mon Feb 18 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 4.4.0-4
 - Autorebuild for GCC 4.3
 
-* Sat Aug 25 2007 Christoph Wickert <fedora christoph-wickert de> - 4.4.0-3
+* Sat Aug 25 2007 Christoph Wickert <cwickert at fedoraproject.org> - 4.4.0-3
 - Rebuild for BuildID feature
 - Update license tag
 
-* Sat Apr 28 2007 Christoph Wickert <fedora christoph-wickert de> - 4.4.0-2
+* Sat Apr 28 2007 Christoph Wickert <cwickert at fedoraproject.org> - 4.4.0-2
 - Rebuild for Xfce 4.4.1
 
-* Mon Jan 22 2007 Christoph Wickert <fedora christoph-wickert de> - 4.4.0-1
+* Mon Jan 22 2007 Christoph Wickert <cwickert at fedoraproject.org> - 4.4.0-1
 - Update to 4.4.0 on Xfce 4.4.
 - Update gtk-icon-cache scriptlets.
 
-* Sun Nov 12 2006 Christoph Wickert <fedora christoph-wickert de> - 4.3.99.1-2
+* Sun Nov 12 2006 Christoph Wickert <cwickert at fedoraproject.org> - 4.3.99.1-2
 - Add %%defattr.
 
-* Sat Sep 23 2006 Christoph Wickert <fedora christoph-wickert de> - 4.3.99.1-1
+* Sat Sep 23 2006 Christoph Wickert <cwickert at fedoraproject.org> - 4.3.99.1-1
 - Initial Fedora Extras version.



From cwickert at fedoraproject.org  Sun Jan 18 23:12:34 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Sun, 18 Jan 2009 23:12:34 +0000 (UTC)
Subject: rpms/xfce4-fsguard-plugin/devel xfce4-fsguard-plugin.spec, 1.14,
	1.15
Message-ID: <20090118231234.2B984700E0@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/xfce4-fsguard-plugin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2164

Modified Files:
	xfce4-fsguard-plugin.spec 
Log Message:
* Sun Jan 18 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.4.2-2
- Rebuild for Xfce 4.6 (Beta 3)



Index: xfce4-fsguard-plugin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-fsguard-plugin/devel/xfce4-fsguard-plugin.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- xfce4-fsguard-plugin.spec	27 Nov 2008 22:44:01 -0000	1.14
+++ xfce4-fsguard-plugin.spec	18 Jan 2009 23:12:03 -0000	1.15
@@ -1,6 +1,6 @@
 Name:		xfce4-fsguard-plugin
 Version:	0.4.2
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Filesystem-Guard plugin for the Xfce panel
 
 Group:		User Interface/Desktops
@@ -65,6 +65,9 @@
 
 
 %changelog
+* Sun Jan 18 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.4.2-2
+- Rebuild for Xfce 4.6 (Beta 3)
+
 * Thu Nov 27 2008 Christoph Wickert <cwickert at fedoraproject.org> - 0.4.2-1
 - Update to 0.4.2
 - BR intltool



From caolanm at fedoraproject.org  Sun Jan 18 23:17:06 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Sun, 18 Jan 2009 23:17:06 +0000 (UTC)
Subject: rpms/openoffice.org/devel openoffice.org.spec,1.1760,1.1761
Message-ID: <20090118231706.8774E700E0@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3068

Modified Files:
	openoffice.org.spec 
Log Message:
dependencies and foo


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1760
retrieving revision 1.1761
diff -u -r1.1760 -r1.1761
--- openoffice.org.spec	16 Jan 2009 15:34:36 -0000	1.1760
+++ openoffice.org.spec	18 Jan 2009 23:16:35 -0000	1.1761
@@ -733,7 +733,7 @@
 Summary: Greek language pack for %{name}
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
-Requires: hunspell-el, hyphen-el
+Requires: hunspell-el, hyphen-el, mythes-el
 Obsoletes: openoffice.org-i18n < 1.9.0
 Obsoletes: openoffice.org-langpack-el < 1:2.0.3
 Obsoletes: openoffice.org2-langpack-el_GR < 1:3.0.0
@@ -801,7 +801,7 @@
 Summary: French language pack for %{name}
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
-Requires: hunspell-fr, hyphen-fr
+Requires: hunspell-fr, hyphen-fr, mythes-fr
 Obsoletes: openoffice.org-i18n < 1.9.0
 Obsoletes: openoffice.org2-langpack-fr < 1:3.0.0
 
@@ -1272,7 +1272,7 @@
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
 Requires: hunspell-ml
-Requires: smc-fonts-meera
+Requires: smc-meera-fonts
 Obsoletes: openoffice.org2-langpack-ml_IN < 1:3.0.0
 
 %description langpack-ml_IN
@@ -3826,10 +3826,10 @@
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
-* Fri Jan 16 2009 Caol??n McNamara <caolanm at redhat.com> - 1:3.0.1-15.2
+* Sun Jan 18 2009 Caol??n McNamara <caolanm at redhat.com> - 1:3.0.1-15.2
 - Resolves: rhbz#479624 add
   openoffice.org-3.0.1.ooo98024.vcl.emboldenoverlap.patch
-- add hyphen-uk, hyphen-pt dependency
+- add hyphen-uk, hyphen-pt, mythes-el, mythes-fr dependency
 - Resolves: rhbz#479163 add
   openoffice.org-3.0.1.oooXXXXX.fpicker.allformatsonsave.patch
 - Resolves: rhbz#480117 workspace.fwk99.patch



From pfj at fedoraproject.org  Sun Jan 18 23:17:32 2009
From: pfj at fedoraproject.org (Paul F. Johnson)
Date: Sun, 18 Jan 2009 23:17:32 +0000 (UTC)
Subject: rpms/mono-debugger/devel import.log, 1.7, 1.8 mono-debugger.spec,
	1.20, 1.21 monodebugger-2.2-configure.patch, 1.1,
	NONE monodebugger-2.2-makefiles.patch, 1.1, NONE
Message-ID: <20090118231732.A4A97700E0@cvs1.fedora.phx.redhat.com>

Author: pfj

Update of /cvs/pkgs/rpms/mono-debugger/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3133/devel

Modified Files:
	import.log mono-debugger.spec 
Removed Files:
	monodebugger-2.2-configure.patch 
	monodebugger-2.2-makefiles.patch 
Log Message:

Remove redundant patches
Use sed to fix lib64 problem 



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/mono-debugger/devel/import.log,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- import.log	17 Jan 2009 19:29:05 -0000	1.7
+++ import.log	18 Jan 2009 23:17:02 -0000	1.8
@@ -5,3 +5,4 @@
 mono-debugger-2_2-3_RC2_20090109svn122605_fc11:HEAD:mono-debugger-2.2-3.RC2.20090109svn122605.fc11.src.rpm:1231634063
 mono-debugger-2_4-1_20090116svn123514_fc11:HEAD:mono-debugger-2.4-1.20090116svn123514.fc11.src.rpm:1232150631
 mono-debugger-2_4-2_20090116svn123514_fc11:HEAD:mono-debugger-2.4-2.20090116svn123514.fc11.src.rpm:1232220493
+mono-debugger-2_4-3_20090116svn123514_fc11:HEAD:mono-debugger-2.4-3.20090116svn123514.fc11.src.rpm:1232320566


Index: mono-debugger.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mono-debugger/devel/mono-debugger.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- mono-debugger.spec	17 Jan 2009 19:29:05 -0000	1.20
+++ mono-debugger.spec	18 Jan 2009 23:17:02 -0000	1.21
@@ -3,13 +3,11 @@
 Summary: A debugger for Mono
 Name: mono-debugger
 Version: 2.4
-Release: 2.20090116svn%{svnver}%{?dist}
+Release: 3.20090116svn%{svnver}%{?dist}
 License: MIT
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 URL: http://www.go-mono.com/sources-stable/
 Source0: %{name}-%{svnver}.tar.bz2
-Patch0: monodebugger-2.2-configure.patch
-Patch1: monodebugger-2.2-makefiles.patch
 BuildRequires: readline-devel ncurses-devel libtool
 BuildRequires: mono-devel >= 2.2 mono-nunit
 BuildRequires: mono-nunit-devel autoconf automake xsp-devel
@@ -37,22 +35,14 @@
 %prep
 %setup -q -n %{name}-%{svnver}
 rm -rf build/*.dll
-# bit of sed magic... - let's see if this works
-#sed -i -e 's!@libdir@!%{_libdir}!' %{PATCH0}
-#sed -i -e 's!@libdir@!%{_libdir}!' %{PATCH1}
-#%patch0 -p1 -b .configure
-#%patch1 -p1 -b .makefiles
-#sed -i -e 's!%{_libdir}!@libdir@!' %{PATCH0}
-#sed -i -e 's!%{_libdir}!@libdir@!' %{PATCH1}
 
-find . -name Makefile.in -or -name Makefile.am -or -name \*.pc.in \
+find . -name \*.in -or -name \*.am -or -name \*.pc.in \
        | while read f ;
          do
-           sed -i -e 's!$(prefix)/lib!%{_libdir}!' "$f" 
+           sed -i -e 's!$(prefix)/lib!%{_libdir}!g' "$f" 
            sed -i -e 's!${exec_prefix}/lib!%{_libdir}!' "$f" ;
          done
 
-sed -i -e 's!$(prefix)/lib!%{_libdir}!' configure.in
 sed -i -e 's!/usr/lib!%{_libdir}!' mono-debugger-frontend.pc.in
 sed -i -e 's!${prefix}/lib/!%{_libdir}/!' mono-debugger-frontend.pc.in
 
@@ -94,6 +84,10 @@
 %{_libdir}/pkgconfig/mono-debugger-frontend.pc
 
 %changelog
+* Sat Jan 17 2009 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.4-3.20090116svn123514
+- Try another approach for fixing configure.in
+- Removed redundant patches
+
 * Sat Jan 17 2009 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.4-2.20090116svn123514
 - Fix lib64 issue in configure.in
 


--- monodebugger-2.2-configure.patch DELETED ---


--- monodebugger-2.2-makefiles.patch DELETED ---



From cwickert at fedoraproject.org  Sun Jan 18 23:18:50 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Sun, 18 Jan 2009 23:18:50 +0000 (UTC)
Subject: rpms/xfce4-diskperf-plugin/devel xfce4-diskperf-plugin.spec, 1.16, 
	1.17
Message-ID: <20090118231850.3A047700E0@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/xfce4-diskperf-plugin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3461

Modified Files:
	xfce4-diskperf-plugin.spec 
Log Message:
fix email in changelog


Index: xfce4-diskperf-plugin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-diskperf-plugin/devel/xfce4-diskperf-plugin.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- xfce4-diskperf-plugin.spec	18 Jan 2009 23:06:50 -0000	1.16
+++ xfce4-diskperf-plugin.spec	18 Jan 2009 23:18:19 -0000	1.17
@@ -42,39 +42,39 @@
 * Sun Jan 18 2009 Christoph Wickert <cwickert at fedoraproject.org> - 2.2.0-2
 - Rebuild for Xfce 4.6 (Beta 3)
 
-* Sun Apr 27 2008 Christoph Wickert <fedora christoph-wickert de> - 2.2.0-1
+* Sun Apr 27 2008 Christoph Wickert <cwickert at fedoraproject.org> - 2.2.0-1
 - Update to 2.2.0
 
 * Mon Feb 18 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 2.1.0-5
 - Autorebuild for GCC 4.3
 
-* Sat Aug 25 2007 Christoph Wickert <fedora christoph-wickert de> - 2.1.0-4
+* Sat Aug 25 2007 Christoph Wickert <cwickert at fedoraproject.org> - 2.1.0-4
 - Rebuild for BuildID feature
 
-* Sat Apr 28 2007 Christoph Wickert <fedora christoph-wickert de> - 2.1.0-3
+* Sat Apr 28 2007 Christoph Wickert <cwickert at fedoraproject.org> - 2.1.0-3
 - Rebuild for Xfce 4.4.1
 
-* Mon Jan 22 2007 Christoph Wickert <fedora christoph-wickert de> - 2.1.0-2
+* Mon Jan 22 2007 Christoph Wickert <cwickert at fedoraproject.org> - 2.1.0-2
 - Rebuild for Xfce 4.4.
 
-* Sat Jan 20 2007 Christoph Wickert <fedora christoph-wickert de> - 2.1.0-1
+* Sat Jan 20 2007 Christoph Wickert <cwickert at fedoraproject.org> - 2.1.0-1
 - Update to 2.1.0.
 - Remove patch for #215863, fixed upstream.
 
-* Sat Nov 25 2006 Christoph Wickert <fedora christoph-wickert de> - 2.0-4
+* Sat Nov 25 2006 Christoph Wickert <cwickert at fedoraproject.org> - 2.0-4
 - Add patch to fix bug bugzilla.xfce.org #1842 (#215863)
 
-* Thu Oct 05 2006 Christoph Wickert <fedora christoph-wickert de> - 2.0-3
+* Thu Oct 05 2006 Christoph Wickert <cwickert at fedoraproject.org> - 2.0-3
 - Bump release for devel checkin.
 
-* Wed Sep 13 2006 Christoph Wickert <fedora christoph-wickert de> - 2.0-2
+* Wed Sep 13 2006 Christoph Wickert <cwickert at fedoraproject.org> - 2.0-2
 - Rebuild for XFCE 4.3.99.1.
 - BR perl(XML::Parser).
 
-* Mon Sep 04 2006 Christoph Wickert <fedora christoph-wickert de> - 2.0-1
+* Mon Sep 04 2006 Christoph Wickert <cwickert at fedoraproject.org> - 2.0-1
 - Update to 2.0 on XFCE 4.3.90.2.
 
-* Mon Sep 04 2006 Christoph Wickert <fedora christoph-wickert de> - 1.5-7
+* Mon Sep 04 2006 Christoph Wickert <cwickert at fedoraproject.org> - 1.5-7
 - Mass rebuild for Fedora Core 6.
 
 * Tue Apr 11 2006 Christoph Wickert <fedora wickert at arcor de> - 1.5-6



From cwickert at fedoraproject.org  Sun Jan 18 23:21:37 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Sun, 18 Jan 2009 23:21:37 +0000 (UTC)
Subject: rpms/xfce4-genmon-plugin/devel xfce4-genmon-plugin.spec,1.15,1.16
Message-ID: <20090118232137.CB1B8700E0@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/xfce4-genmon-plugin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4027

Modified Files:
	xfce4-genmon-plugin.spec 
Log Message:
* Sun Jan 18 2009 Christoph Wickert <cwickert at fedoraproject.org> - 3.2-2
- Rebuild for Xfce 4.6 (Beta 3)



Index: xfce4-genmon-plugin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-genmon-plugin/devel/xfce4-genmon-plugin.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- xfce4-genmon-plugin.spec	18 Mar 2008 23:28:31 -0000	1.15
+++ xfce4-genmon-plugin.spec	18 Jan 2009 23:21:07 -0000	1.16
@@ -1,6 +1,6 @@
 Name:		xfce4-genmon-plugin
 Version:	3.2
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Generic monitor plugin for the Xfce panel
 
 Group:		User Interface/Desktops
@@ -39,45 +39,48 @@
 %{_datadir}/xfce4/panel-plugins/*.desktop
 
 %changelog
-* Wed Mar 19 2008 Christoph Wickert <fedora christoph-wickert de> - 3.2-1
+* Sun Jan 18 2009 Christoph Wickert <cwickert at fedoraproject.org> - 3.2-2
+- Rebuild for Xfce 4.6 (Beta 3)
+
+* Wed Mar 19 2008 Christoph Wickert <cwickert at fedoraproject.org> - 3.2-1
 - Update to 0.3.2.
 
 * Mon Feb 18 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 3.1-4
 - Autorebuild for GCC 4.3
 
-* Fri Aug 24 2007 Christoph Wickert <fedora christoph-wickert de> - 3.1-3
+* Fri Aug 24 2007 Christoph Wickert <cwickert at fedoraproject.org> - 3.1-3
 - Rebuild for BuildID feature
 - Update license tag
 
-* Sat Apr 28 2007 Christoph Wickert <fedora christoph-wickert de> - 3.1-2
+* Sat Apr 28 2007 Christoph Wickert <cwickert at fedoraproject.org> - 3.1-2
 - Rebuild for Xfce 4.4.1
 
-* Sat Feb 24 2007 Christoph Wickert <fedora christoph-wickert de> - 3.1-1
+* Sat Feb 24 2007 Christoph Wickert <cwickert at fedoraproject.org> - 3.1-1
 - Update to 0.3.1.
 - Fix bugzilla.xfce.org #2435 and #2722, drop xfce4-dev-tools BR.
 
-* Mon Jan 22 2007 Christoph Wickert <fedora christoph-wickert de> - 3.0-3
+* Mon Jan 22 2007 Christoph Wickert <cwickert at fedoraproject.org> - 3.0-3
 - Rebuild for XFCE 4.4.
 - Patch to compile with -Wl,--as-needed (bugzilla.xfce.org #2722)
 
-* Sat Nov 11 2006 Christoph Wickert <fedora christoph-wickert de> - 3.0-2
+* Sat Nov 11 2006 Christoph Wickert <cwickert at fedoraproject.org> - 3.0-2
 - Rebuild for XFCE 4.3.99.2.
 
-* Thu Oct 31 2006 Christoph Wickert <fedora christoph-wickert de> - 3.0-1
+* Thu Oct 31 2006 Christoph Wickert <cwickert at fedoraproject.org> - 3.0-1
 - Update to 3.0.
 - BR xfce4-dev-tools (bugzilla.xfce.org #2435) and gettext.
 
-* Thu Oct 05 2006 Christoph Wickert <fedora christoph-wickert de> - 2.0-3
+* Thu Oct 05 2006 Christoph Wickert <cwickert at fedoraproject.org> - 2.0-3
 - Bump release for devel checkin.
 
-* Wed Sep 13 2006 Christoph Wickert <fedora christoph-wickert de> - 2.0-2
+* Wed Sep 13 2006 Christoph Wickert <cwickert at fedoraproject.org> - 2.0-2
 - Rebuild for XFCE 4.3.99.1.
 - BR perl(XML::Parser).
 
-* Mon Sep 04 2006 Christoph Wickert <fedora christoph-wickert de> - 2.0-1
+* Mon Sep 04 2006 Christoph Wickert <cwickert at fedoraproject.org> - 2.0-1
 - Update to 2.0 on XFCE 4.3.90.2.
 
-* Mon Sep 04 2006 Christoph Wickert <fedora christoph-wickert de> - 1.1-7
+* Mon Sep 04 2006 Christoph Wickert <cwickert at fedoraproject.org> - 1.1-7
 - Mass rebuild for Fedora Core 6.
 
 * Tue Apr 11 2006 Christoph Wickert <fedora wickert at arcor de> - 1.1-6



From cwickert at fedoraproject.org  Sun Jan 18 23:25:36 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Sun, 18 Jan 2009 23:25:36 +0000 (UTC)
Subject: rpms/xfce4-mailwatch-plugin/devel xfce4-mailwatch-plugin.spec, 1.11,
	1.12
Message-ID: <20090118232537.03516700E0@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/xfce4-mailwatch-plugin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4669

Modified Files:
	xfce4-mailwatch-plugin.spec 
Log Message:
* Sun Jan 18 2009 Christoph Wickert <cwickert at fedoraproject.org> - 1.1.0-2
- Rebuild for Xfce 4.6 (Beta 3)



Index: xfce4-mailwatch-plugin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-mailwatch-plugin/devel/xfce4-mailwatch-plugin.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- xfce4-mailwatch-plugin.spec	1 Oct 2008 22:39:36 -0000	1.11
+++ xfce4-mailwatch-plugin.spec	18 Jan 2009 23:25:06 -0000	1.12
@@ -1,6 +1,6 @@
 Name:		xfce4-mailwatch-plugin
 Version:	1.1.0
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Mail Watcher plugin for the Xfce panel
 
 Group:		User Interface/Desktops
@@ -62,36 +62,39 @@
 %{_datadir}/xfce4/doc/C/images/mailwatch-*.png
 
 %changelog
-* Wed Oct 01 2008 Christoph Wickert <fedora christoph-wickert de> - 1.1.0-1
+* Sun Jan 18 2009 Christoph Wickert <cwickert at fedoraproject.org> - 1.1.0-2
+- Rebuild for Xfce 4.6 (Beta 3)
+
+* Wed Oct 01 2008 Christoph Wickert <cwickert at fedoraproject.org> - 1.1.0-1
 - Update to 1.1.0 fixes crash due to obscure GTK hash error (#463412)
 
 * Mon Jul 07 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1.0.1-10
 - fix conditional comparison
 
-* Fri Jun 06 2008 Christoph Wickert <fedora christoph-wickert de> - 1.0.1-9
+* Fri Jun 06 2008 Christoph Wickert <cwickert at fedoraproject.org> - 1.0.1-9
 - BuildRequire libXt-devel for all releases (#449496)
 
 * Mon Feb 18 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1.0.1-8
 - Autorebuild for GCC 4.3
 
-* Fri Aug 24 2007 Christoph Wickert <fedora christoph-wickert de> - 1.0.1-7
+* Fri Aug 24 2007 Christoph Wickert <cwickert at fedoraproject.org> - 1.0.1-7
 - Rebuild for BuildID feature
 - Update license tag
 
-* Sat Apr 28 2007 Christoph Wickert <fedora christoph-wickert de> - 1.0.1-6
+* Sat Apr 28 2007 Christoph Wickert <cwickert at fedoraproject.org> - 1.0.1-6
 - Rebuild for Xfce 4.4.1
 
-* Mon Jan 22 2007 Christoph Wickert <fedora christoph-wickert de> - 1.0.1-5
+* Mon Jan 22 2007 Christoph Wickert <cwickert at fedoraproject.org> - 1.0.1-5
 - Rebuild for Xfce 4.4.
 - Update gtk-icon-cache scriptlets.
 
-* Thu Oct 05 2006 Christoph Wickert <fedora christoph-wickert de> - 1.0.1-4
+* Thu Oct 05 2006 Christoph Wickert <cwickert at fedoraproject.org> - 1.0.1-4
 - Bump release for devel checkin.
 
-* Mon Sep 04 2006 Christoph Wickert <fedora christoph-wickert de> - 1.0.1-3
+* Mon Sep 04 2006 Christoph Wickert <cwickert at fedoraproject.org> - 1.0.1-3
 - Recompile against XFCE 4.3.90.2.
 
-* Mon Sep 04 2006 Christoph Wickert <fedora christoph-wickert de> - 1.0.1-2
+* Mon Sep 04 2006 Christoph Wickert <cwickert at fedoraproject.org> - 1.0.1-2
 - Mass rebuild for Fedora Core 6.
 
 * Sat Jun 17 2006 Christoph Wickert <fedora wickert at arcor de> - 1.0.1-1



From cwickert at fedoraproject.org  Sun Jan 18 23:26:34 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Sun, 18 Jan 2009 23:26:34 +0000 (UTC)
Subject: rpms/xfce4-modemlights-plugin/devel xfce4-modemlights-plugin.spec, 
	1.11, 1.12
Message-ID: <20090118232634.59CDB700E0@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/xfce4-modemlights-plugin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4881

Modified Files:
	xfce4-modemlights-plugin.spec 
Log Message:
* Mon Feb 18 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.1.3.99-3
- Autorebuild for GCC 4.3



Index: xfce4-modemlights-plugin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-modemlights-plugin/devel/xfce4-modemlights-plugin.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- xfce4-modemlights-plugin.spec	18 Feb 2008 23:52:06 -0000	1.11
+++ xfce4-modemlights-plugin.spec	18 Jan 2009 23:26:04 -0000	1.12
@@ -45,10 +45,10 @@
 * Mon Feb 18 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.1.3.99-3
 - Autorebuild for GCC 4.3
 
-* Wed Nov 21 2007 Christoph Wickert <fedora christoph-wickert de> - 0.1.3.99-2
+* Wed Nov 21 2007 Christoph Wickert <cwickert at fedoraproject.org> - 0.1.3.99-2
 - Require ppp
 
-* Tue Nov 20 2007 Christoph Wickert <fedora christoph-wickert de> - 0.1.3.99-1
+* Tue Nov 20 2007 Christoph Wickert <cwickert at fedoraproject.org> - 0.1.3.99-1
 - Update to 0.1.4 RC
 - Update license tag
 



From rdieter at fedoraproject.org  Sun Jan 18 23:29:50 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sun, 18 Jan 2009 23:29:50 +0000 (UTC)
Subject: rpms/maxima/devel maxima.spec,1.122,1.123
Message-ID: <20090118232950.EDFF1700E0@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/maxima/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5471

Modified Files:
	maxima.spec 
Log Message:
* Sun Jan 18 2009 Rex Dieter <rdieter at fedoraproject.org> - 5.17.1-3
- reenable gcl on i386 (#451801), x86_64 (#427250), ppc (#167952)



Index: maxima.spec
===================================================================
RCS file: /cvs/pkgs/rpms/maxima/devel/maxima.spec,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -r1.122 -r1.123
--- maxima.spec	31 Dec 2008 21:25:50 -0000	1.122
+++ maxima.spec	18 Jan 2009 23:29:20 -0000	1.123
@@ -3,7 +3,7 @@
 Name: 	 maxima
 Version: 5.17.1
 
-Release: 2%{?dist} 
+Release: 3%{?dist} 
 License: GPLv2
 Group:	 Applications/Engineering 
 URL: 	 http://maxima.sourceforge.net/
@@ -26,7 +26,7 @@
 %define _enable_cmucl --enable-cmucl
 %if 0%{?fedora}
 # gcl/f8 bustage on i386: https://bugzilla.redhat.com/show_bug.cgi?id=451801
-#define _enable_gcl --enable-gcl
+%define _enable_gcl --enable-gcl
 %endif
 %endif
 
@@ -35,7 +35,7 @@
 %if 0%{?fedora} > 2
 %define _enable_clisp --enable-clisp 
 # gcl busted on x86_64 atm: http://bugzilla.redhat.com/427250
-#define _enable_gcl --enable-gcl
+%define _enable_gcl --enable-gcl
 %define _enable_sbcl --enable-sbcl
 %else
 # epel/rhel
@@ -48,7 +48,7 @@
 # clisp: http://bugzilla.redhat.com/166347 (resolved) - clisp/ppc (still) awol.
 #define _enable_clisp --enable-clisp 
 # gcl:   http://bugzilla.redhat.com/167952
-#define _enable_gcl --enable-gcl 
+%define _enable_gcl --enable-gcl 
 # sbcl:  http://bugzilla.redhat.com/220053 (resolved)
 # sbcl: ppc/ld joy, "final link failed: Nonrepresentable section on output" http://bugzilla.redhat.com/448734
 %define _enable_sbcl --enable-sbcl 
@@ -175,7 +175,8 @@
 Group:   Applications/Engineering
 BuildRequires: gcl
 Requires:  %{name} = %{version}
-%if 0%{?fedora} > 4 || 0%{?rhel} > 4
+%if 0
+#if 0%{?fedora} > 4 || 0%{?rhel} > 4
 # See http://bugzilla.redhat.com/187647
 %define setarch_hack 1
 BuildRequires: setarch
@@ -440,6 +441,9 @@
 
 
 %changelog
+* Sun Jan 18 2009 Rex Dieter <rdieter at fedoraproject.org> - 5.17.1-3
+- reenable gcl on i386 (#451801), x86_64 (#427250), ppc (#167952)
+
 * Wed Dec 31 2008 Rex Dieter <rdieter at fedoraproject.org> - 5.17.1-2
 - respin (sbcl)
 



From cwickert at fedoraproject.org  Sun Jan 18 23:30:45 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Sun, 18 Jan 2009 23:30:45 +0000 (UTC)
Subject: rpms/xfce4-mount-plugin/devel xfce4-mount-plugin.spec,1.15,1.16
Message-ID: <20090118233045.7878B700E0@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/xfce4-mount-plugin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5739

Modified Files:
	xfce4-mount-plugin.spec 
Log Message:
* Sun Jan 18 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.5.5-2
- Rebuild for Xfce 4.6 (Beta 3)



Index: xfce4-mount-plugin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-mount-plugin/devel/xfce4-mount-plugin.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- xfce4-mount-plugin.spec	24 May 2008 01:50:42 -0000	1.15
+++ xfce4-mount-plugin.spec	18 Jan 2009 23:30:15 -0000	1.16
@@ -1,6 +1,6 @@
 Name:		xfce4-mount-plugin
 Version:	0.5.5
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Mount/unmount utility for the Xfce panel
 
 Group:		User Interface/Desktops
@@ -48,40 +48,43 @@
 %{_datadir}/icons/hicolor/scalable/apps/xfce-mount.svg
 
 %changelog
-* Sat May 24 2008 Christoph Wickert <fedora christoph-wickert de> - 0.5.5-1
+* Sun Jan 18 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.5.5-2
+- Rebuild for Xfce 4.6 (Beta 3)
+
+* Sat May 24 2008 Christoph Wickert <cwickert at fedoraproject.org> - 0.5.5-1
 - Update to 0.5.5. Can now mount devices by UUID
 
 * Mon Feb 18 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.5.1-4
 - Autorebuild for GCC 4.3
 
-* Sat Aug 25 2007 Christoph Wickert <fedora christoph-wickert de> - 0.5.1-3
+* Sat Aug 25 2007 Christoph Wickert <cwickert at fedoraproject.org> - 0.5.1-3
 - Rebuild for BuildID feature
 - Update license tag
 
-* Sat Apr 28 2007 Christoph Wickert <fedora christoph-wickert de> - 0.5.1-2
+* Sat Apr 28 2007 Christoph Wickert <cwickert at fedoraproject.org> - 0.5.1-2
 - Rebuild for Xfce 4.4.1
 
-* Sat Mar 03 2007 Christoph Wickert <fedora christoph-wickert de> - 0.5.1-1
+* Sat Mar 03 2007 Christoph Wickert <cwickert at fedoraproject.org> - 0.5.1-1
 - Update to 0.5.1.
 
-* Fri Mar 02 2007 Christoph Wickert <fedora christoph-wickert de> - 0.5.0-1
+* Fri Mar 02 2007 Christoph Wickert <cwickert at fedoraproject.org> - 0.5.0-1
 - Update to 0.5.0.
 
-* Sun Jan 28 2007 Christoph Wickert <fedora christoph-wickert de> - 0.4.8-2
+* Sun Jan 28 2007 Christoph Wickert <cwickert at fedoraproject.org> - 0.4.8-2
 - Rebuild for Xfce 4.4.
 - Update gtk-icon-cache scriptlets.
 
-* Thu Oct 05 2006 Christoph Wickert <fedora christoph-wickert de> - 0.4.8-1
+* Thu Oct 05 2006 Christoph Wickert <cwickert at fedoraproject.org> - 0.4.8-1
 - Update to 0.4.8.
 
-* Wed Sep 13 2006 Christoph Wickert <fedora christoph-wickert de> - 0.4.5-2
+* Wed Sep 13 2006 Christoph Wickert <cwickert at fedoraproject.org> - 0.4.5-2
 - Rebuild for XFCE 4.3.99.1.
 - BR perl(XML::Parser), drop BR intltool.
 
-* Mon Sep 04 2006 Christoph Wickert <fedora christoph-wickert de> - 0.4.5-1
+* Mon Sep 04 2006 Christoph Wickert <cwickert at fedoraproject.org> - 0.4.5-1
 - Update to 0.4.5 on XFCE 4.3.90.2.
 
-* Mon Sep 04 2006 Christoph Wickert <fedora christoph-wickert de> - 0.3.3-5
+* Mon Sep 04 2006 Christoph Wickert <cwickert at fedoraproject.org> - 0.3.3-5
 - Mass rebuild for Fedora Core 6.
 
 * Sat Jun 03 2006 Christoph Wickert <fedora wickert at arcor de> - 0.3.3-4



From pkgdb at fedoraproject.org  Sun Jan 18 23:41:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 18 Jan 2009 23:41:08 +0000
Subject: [pkgdb] emesene had acl change status
Message-ID: <20090118234108.84091208467@bastion.fedora.phx.redhat.com>

cchance has set the watchbugzilla acl on emesene (Fedora 10) to Approved for ziobizzo

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/emesene



From pkgdb at fedoraproject.org  Sun Jan 18 23:41:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 18 Jan 2009 23:41:09 +0000
Subject: [pkgdb] emesene had acl change status
Message-ID: <20090118234109.9823720846E@bastion.fedora.phx.redhat.com>

cchance has set the watchcommits acl on emesene (Fedora 10) to Approved for ziobizzo

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/emesene



From cwickert at fedoraproject.org  Sun Jan 18 23:43:37 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Sun, 18 Jan 2009 23:43:37 +0000 (UTC)
Subject: rpms/xfconf/devel xfconf.spec,1.2,1.3
Message-ID: <20090118234337.67F12700E0@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/xfconf/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8151

Modified Files:
	xfconf.spec 
Log Message:
fix group tag


Index: xfconf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfconf/devel/xfconf.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xfconf.spec	16 Jan 2009 23:49:59 -0000	1.2
+++ xfconf.spec	18 Jan 2009 23:43:06 -0000	1.3
@@ -3,7 +3,7 @@
 Release:        1%{?dist}
 Summary:        Hierarchical configuration system for Xfce
 
-Group:          Development/Libraries
+Group:          User Interface/Desktops
 License:        GPLv2
 URL:            http://www.xfce.org/
 Source0:        http://www.xfce.org/archive/xfce-%{version}/src/xfconf-%{version}.tar.bz2



From cwickert at fedoraproject.org  Sun Jan 18 23:47:01 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Sun, 18 Jan 2009 23:47:01 +0000 (UTC)
Subject: rpms/xfce4-mpc-plugin/devel xfce4-mpc-plugin.spec,1.2,1.3
Message-ID: <20090118234701.3554F700E0@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/xfce4-mpc-plugin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8696

Modified Files:
	xfce4-mpc-plugin.spec 
Log Message:
* Sun Jan 18 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.3.3-2
- Rebuild for Xfce 4.6 (Beta 3)



Index: xfce4-mpc-plugin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-mpc-plugin/devel/xfce4-mpc-plugin.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xfce4-mpc-plugin.spec	14 Jul 2008 09:14:45 -0000	1.2
+++ xfce4-mpc-plugin.spec	18 Jan 2009 23:46:30 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           xfce4-mpc-plugin
 Version:        0.3.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        MPD client for the Xfce panel
 
 Group:          User Interface/Desktops
@@ -58,24 +58,27 @@
 
 
 %changelog
-* Fri Jul 11 2008 Christoph Wickert <fedora christoph-wickert de> - 0.3.3-1
+* Sun Jan 18 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.3.3-2
+- Rebuild for Xfce 4.6 (Beta 3)
+
+* Fri Jul 11 2008 Christoph Wickert <cwickert at fedoraproject.org> - 0.3.3-1
 - Update to 0.3.3 on Xfce 4.4.2
 
-* Sat Aug 25 2007 Christoph Wickert <fedora christoph-wickert de> - 0.3.2-1
+* Sat Aug 25 2007 Christoph Wickert <cwickert at fedoraproject.org> - 0.3.2-1
 - Update to 0.3.2
 - Update license tag
 
-* Sat Apr 28 2007 Christoph Wickert <fedora christoph-wickert de> - 0.3.1-2
+* Sat Apr 28 2007 Christoph Wickert <cwickert at fedoraproject.org> - 0.3.1-2
 - Rebuild for Xfce 4.4.1
 
-* Sat Feb 03 2007 Christoph Wickert <fedora christoph-wickert de> - 0.3.1-1
+* Sat Feb 03 2007 Christoph Wickert <cwickert at fedoraproject.org> - 0.3.1-1
 - Update to 0.3.1
 
-* Mon Jan 22 2007 Christoph Wickert <fedora christoph-wickert de> - 0.3.0-1
+* Mon Jan 22 2007 Christoph Wickert <cwickert at fedoraproject.org> - 0.3.0-1
 - Update to 0.3.0 on Xfce 4.4
 
-* Sat Nov 11 2006 Christoph Wickert <fedora christoph-wickert de> - 0.2.0-1
+* Sat Nov 11 2006 Christoph Wickert <cwickert at fedoraproject.org> - 0.2.0-1
 - Update to 0.2.0
 
-* Sat Sep 23 2006 Christoph Wickert <fedora christoph-wickert de> - 0.1.0-1
+* Sat Sep 23 2006 Christoph Wickert <cwickert at fedoraproject.org> - 0.1.0-1
 - Initial Fedora package



From cwickert at fedoraproject.org  Sun Jan 18 23:47:16 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Sun, 18 Jan 2009 23:47:16 +0000 (UTC)
Subject: rpms/xfce4-netload-plugin/devel xfce4-netload-plugin.spec, 1.11,
	1.12
Message-ID: <20090118234716.EC80B700E0@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/xfce4-netload-plugin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8768

Modified Files:
	xfce4-netload-plugin.spec 
Log Message:
* Sun Jan 18 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.4.0-8
- Rebuild for Xfce 4.6 (Beta 3)



Index: xfce4-netload-plugin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-netload-plugin/devel/xfce4-netload-plugin.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- xfce4-netload-plugin.spec	18 Feb 2008 23:53:52 -0000	1.11
+++ xfce4-netload-plugin.spec	18 Jan 2009 23:46:46 -0000	1.12
@@ -1,6 +1,6 @@
 Name:		xfce4-netload-plugin
 Version:	0.4.0
-Release:	7%{?dist}
+Release:	8%{?dist}
 Summary:	Network-load monitor for the Xfce panel
 
 Group:		User Interface/Desktops
@@ -40,31 +40,34 @@
 %{_datadir}/xfce4/panel-plugins/*.desktop
 
 %changelog
+* Sun Jan 18 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.4.0-8
+- Rebuild for Xfce 4.6 (Beta 3)
+
 * Mon Feb 18 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.4.0-7
 - Autorebuild for GCC 4.3
 
-* Sat Aug 25 2007 Christoph Wickert <fedora christoph-wickert de> - 0.4.0-6
+* Sat Aug 25 2007 Christoph Wickert <cwickert at fedoraproject.org> - 0.4.0-6
 - Rebuild for BuildID feature
 - Update license tag
 
-* Sat Apr 28 2007 Christoph Wickert <fedora christoph-wickert de> - 0.4.0-5
+* Sat Apr 28 2007 Christoph Wickert <cwickert at fedoraproject.org> - 0.4.0-5
 - Rebuild for Xfce 4.4.1
 
-* Mon Jan 22 2007 Christoph Wickert <fedora christoph-wickert de> - 0.4.0-4
+* Mon Jan 22 2007 Christoph Wickert <cwickert at fedoraproject.org> - 0.4.0-4
 - Rebuild for Xfce 4.4.
 - Patch to compile with -Wl,--as-needed (bugzilla.xfce.org #2782)
 
-* Thu Oct 05 2006 Christoph Wickert <fedora christoph-wickert de> - 0.4.0-3
+* Thu Oct 05 2006 Christoph Wickert <cwickert at fedoraproject.org> - 0.4.0-3
 - Bump release for devel checkin.
 
-* Wed Sep 13 2006 Christoph Wickert <fedora christoph-wickert de> - 0.4.0-2
+* Wed Sep 13 2006 Christoph Wickert <cwickert at fedoraproject.org> - 0.4.0-2
 - BR perl(XML::Parser).
 
-* Mon Sep 04 2006 Christoph Wickert <fedora christoph-wickert de> - 0.4.0-1
+* Mon Sep 04 2006 Christoph Wickert <cwickert at fedoraproject.org> - 0.4.0-1
 - Update to 0.4 on XFCE 4.3.90.2.
 - Remove bufsize-patch for now.
 
-* Mon Sep 04 2006 Christoph Wickert <fedora christoph-wickert de> - 0.3.3-7
+* Mon Sep 04 2006 Christoph Wickert <cwickert at fedoraproject.org> - 0.3.3-7
 - Mass rebuild for Fedora Core 6.
 
 * Tue Apr 11 2006 Christoph Wickert <fedora wickert at arcor de> - 0.3.3-6



From kanarip at fedoraproject.org  Sun Jan 18 23:50:33 2009
From: kanarip at fedoraproject.org (Jeroen van Meeuwen)
Date: Sun, 18 Jan 2009 23:50:33 +0000 (UTC)
Subject: rpms/ris-linux/devel import.log, NONE,
	1.1 ris-linux-0.4-basepath.patch, NONE,
	1.1 ris-linux-0.4-locations.patch, NONE,
	1.1 ris-linux-0.4-pidfile.patch, NONE, 1.1 ris-linux.spec, NONE,
	1.1 ris-linuxd.README, NONE, 1.1 ris-linuxd.init, NONE,
	1.1 ris-linuxd.sh, NONE, 1.1 ris-linuxd.smb.conf.sample, NONE,
	1.1 ris-linuxd.sysconfig, NONE, 1.1 ris-linuxd.tftpd.rules, NONE,
	1.1 ris-linuxd.tftpd.xinetd, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090118235033.320C5700E0@cvs1.fedora.phx.redhat.com>

Author: kanarip

Update of /cvs/pkgs/rpms/ris-linux/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9648/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log ris-linux-0.4-basepath.patch 
	ris-linux-0.4-locations.patch ris-linux-0.4-pidfile.patch 
	ris-linux.spec ris-linuxd.README ris-linuxd.init ris-linuxd.sh 
	ris-linuxd.smb.conf.sample ris-linuxd.sysconfig 
	ris-linuxd.tftpd.rules ris-linuxd.tftpd.xinetd 
Log Message:
0.4-4


--- NEW FILE import.log ---
ris-linux-0_4-4_fc10:HEAD:ris-linux-0.4-4.fc10.src.rpm:1232322579

ris-linux-0.4-basepath.patch:

--- NEW FILE ris-linux-0.4-basepath.patch ---
diff -ur ris-linux-0.4.orig/binlsrv.py ris-linux-0.4/binlsrv.py
--- ris-linux-0.4.orig/binlsrv.py	2007-09-28 17:29:12.000000000 +0200
+++ ris-linux-0.4/binlsrv.py	2008-09-01 20:12:43.000000000 +0200
@@ -59,7 +59,8 @@

 #############
 # Make sure there is the trailing / here
-BASEPATH = '/mnt/disk/ris/OSChooser/English/'
+#BASEPATH = '/mnt/disk/ris/OSChooser/English/'
+BASEPATH='/var/lib/tftpboot/winos/inf/'
 WELCOME  = 'welcome.osc'
 DUMPING  = False


ris-linux-0.4-locations.patch:

--- NEW FILE ris-linux-0.4-locations.patch ---
diff -ur ris-linux-0.4.orig/infparser.py ris-linux-0.4/infparser.py
--- ris-linux-0.4.orig/infparser.py	2008-04-27 04:35:04.000000000 +0200
+++ ris-linux-0.4/infparser.py	2008-12-05 14:04:35.000000000 +0100
@@ -17,7 +17,7 @@
 
 from codecs import utf_16_le_decode, BOM_LE, BOM_BE
 from sys import argv, exit as sys_exit
-from os.path import isfile
+import os
 from glob import glob
 from cPickle import dump
 from traceback import format_exc
@@ -293,14 +293,17 @@
         print 'Usage %s: directory_with_infs or inf file' % argv[0]
         sys_exit(-1)
 
-    if isfile(argv[1]):
+    if os.path.isfile(argv[1]):
         filelist = [ argv[1] ]
-    else:
+    elif os.path.isdir(argv[1]):
         filelist = glob(argv[1] + '/*.inf')
+    else:
+        print 'No such file or directory %s' % argv[1]
+        exit(1)
 
     devlist = {}
     for inffile in filelist:
-        if inffile.split('/').pop() not in exclude:
+        if os.path.basename(inffile) not in exclude:
             try:
                 devlist.update(scan_inf(inffile))
             except:
@@ -311,15 +314,17 @@
                 print '%s Version %s\n' % (argv[0], __version__)
                 print format_exc()
                 print '---- CUT HERE ----'
+        else:
+            print 'Excluding %s' % inffile
 
     print 'Compiled %d drivers' % len(devlist)
 
-    fd = open('devlist.cache', 'wb')
+    fd = open(os.path.join(os.path.dirname(filelist[0]),'devlist.cache'), 'wb')
     dump(devlist, fd)
     fd.close()
     print 'generated devlist.cache'
 
-    fd = open('nics.txt', 'w')
+    fd = open(os.path.join(os.path.dirname(filelist[0]),'nics.txt'), 'w')
     drvhash = {}
     for nic in devlist.items():
         entry = nic[0].split('&')

ris-linux-0.4-pidfile.patch:

--- NEW FILE ris-linux-0.4-pidfile.patch ---
diff -ur ris-linux-0.4.orig/binlsrv.py ris-linux-0.4/binlsrv.py
--- ris-linux-0.4.orig/binlsrv.py	2008-12-05 13:48:23.000000000 +0100
+++ ris-linux-0.4/binlsrv.py	2008-12-05 13:50:31.000000000 +0100
@@ -1024,7 +1024,7 @@
 
     ## Parse command line arguments
     shortopts = 'hdl:a:p:'
-    longopts = [ 'help', 'daemon', 'logfile=', 'address=', 'port=' ]
+    longopts = [ 'help', 'daemon', 'logfile=', 'address=', 'port=', "pid=" ]
 
     try:
         opts, args = getopt(argv[1:], shortopts, longopts)


--- NEW FILE ris-linux.spec ---
%define _tftpboot %{_var}/lib/tftpboot/
%define win_inf_dir %{_tftpboot}/winos/inf/

Name:           ris-linux
Version:        0.4
Release:        4%{?dist}
Summary:        RIS for Linux - Boot winpe from the net / Ris Windows Installation
Group:          Applications/System
License:        GPLv2+
URL:            http://oss.netfarm.it/guides/pxe.php
Source0:        http://oss.netfarm.it/guides/%{name}-%{version}.tar.gz
Source1:        ris-linuxd.init
Source2:        ris-linuxd.sysconfig
Source3:        ris-linuxd.smb.conf.sample
Source4:        ris-linuxd.README
Source5:        ris-linuxd.tftpd.rules
Source6:        ris-linuxd.tftpd.xinetd
Source7:        ris-linuxd.sh
Patch1:         ris-linux-0.4-basepath.patch
Patch2:         ris-linux-0.4-pidfile.patch
Patch3:         ris-linux-0.4-locations.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch

BuildRequires:  python(abi) >= 2.1

Requires:       python(abi) >= 2.1
Requires:       samba
Requires:       tftp-server

Requires(post): chkconfig, python
Requires(preun):chkconfig, initscripts
Requires(postun):initscripts

%description
Windows Remote Installation Services for Linux - Boot Windows Preinstallation
Environments from the net.

%prep
%setup -q
%patch1 -p1
%patch2 -p1
%patch3 -p1

%build

%install
rm -rf %{buildroot}
mkdir -p %{buildroot}/%{_datadir}/%{name}/
mkdir -p %{buildroot}/%{_initrddir}/
mkdir -p %{buildroot}/%{_sysconfdir}/sysconfig/
mkdir -p %{buildroot}/%{_sbindir}/
install -pm 755 %{SOURCE7} %{buildroot}/%{_sbindir}/%{name}d
install -pm 755 *.py %{buildroot}/%{_datadir}/%{name}/.
install -pm 755 %{SOURCE1} %{buildroot}/%{_initrddir}/%{name}d
install -pm 644 %{SOURCE2} %{buildroot}/%{_sysconfdir}/sysconfig/%{name}d
cp -a %{SOURCE3} smb.conf.sample
cp -a %{SOURCE4} README
cp -a %{SOURCE5} tftpd.rules
cp -a %{SOURCE6} tftpd.xinetd

%clean
rm -rf %{buildroot}

%post
chkconfig --add %{name}d

if [ -d "%{win_inf_dir}" ]; then
    cd %{_datadir}/%{name}/
    python %{_datadir}/%{name}/infparser.py %{win_inf_dir}
fi

%postun
if [ "$1" -ge "1" ] ; then
    /sbin/service %{name}d condrestart >/dev/null 2>&1 || :
fi

%preun
if [ $1 = 0 ] ; then
    /sbin/service %{name}d stop >/dev/null 2>&1
    /sbin/chkconfig --del %{name}d
fi

%files
%defattr(-,root,root,-)
%doc README contrib.txt smb.conf.sample tftpd.rules tftpd.xinetd winpe.sif
%dir %{_datadir}/%{name}
%{_datadir}/%{name}/*
%{_initrddir}/%{name}d
%{_sbindir}/%{name}d
%config(noreplace) %{_sysconfdir}/sysconfig/%{name}d

%changelog
* Wed Jan 14 2009 Jeroen van Meeuwen <kanarip at kanarip.com> - 0.4-4
- Rebuild for review (#469052)

* Fri Dec 05 2008 Jeroen van Meeuwen <kanarip at fedoraproject.org> - 0.4-3
- Tune some of the init scripts and sysconfig settings

* Mon Nov 3 2008 Jeroen van Meeuwen <kanarip at fedoraproject.org> - 0.4-2
- Improve post, preun and postun scriptlets (#469052)
- Improve macro usage (#469052)
- Improve init script

* Mon Sep 1 2008 Jeroen van Meeuwen <kanarip at fedoraproject.org> - 0.4-1
- Initial package


--- NEW FILE ris-linuxd.README ---
For ris-linux to work, you need the following;

- Some Windows files
- A Samba server
- A TFTP server that is capable of rewriting RRQ's to
  actual filenames

For more information on how to set things up completely, let me
refer you to the following websites;

Upstream for ris-linux:
http://oss.netfarm.it/guides/pxe.php

My own little piece of documentation:
http://www.kanarip.com/courses/ClassRoomManual-WindowsInstallationsOverTheNetwork.html

Kind regards,

Jeroen van Meeuwen
-kanarip

--- NEW FILE ris-linuxd.init ---
#!/bin/sh
#
#   Startup/shutdown script for the Linux RIS daemon.
#
#   Linux chkconfig stuff:
#
#   chkconfig: - 98 10
#   description: Startup/shutdown script for the Linux RIS \
#                daemon.
#
### BEGIN INIT INFO
# Provides: ris-linuxd
# Required-Start: $syslog $local_fs
# Required-Stop: $syslog $local_fs
# Default-Stop: 0 1 6
# Short-Description: RIS for Linux
# Description: RIS for Linux
### END INIT INFO

# Source function library.
. /etc/init.d/functions

[ -f /etc/sysconfig/ris-linuxd ] && source /etc/sysconfig/ris-linuxd

# Check if the directory exists
if [ -z "$BINLSRV_INFPATH" -o ! -d "$BINLSRV_INFPATH" ]; then
    echo "No such file or directory $BINLSRV_INFPATH"
    exit 1
fi

BINLSRV_DEVLISTCACHE="${BINLSRV_INFPATH}/devlist.cache"
if [ ! -f "$BINLSRV_DEVLISTCACHE" ]; then
    /usr/share/ris-linux/infparser.py $BINLSRV_INFPATH
fi

[ -z "$BINLSRV_LOGFILE" ] && LOG_OPT="-l /var/log/ris-linuxd.log" || LOG_OPT="-l $BINLSRV_LOGFILE"
[ -z "$BINLSRV_PIDFILE" ] && PID_OPT="--pid=/var/run/ris-linuxd.pid" || PID_OPT="--pid=$BINLSRV_PIDFILE"

DAEMON="ris-linuxd"

prog=ris-linuxd

start () {
    echo -n $"Starting $prog: "

    # start daemon
    daemon $DAEMON -d $BINLSRV_OPTS $LOG_OPT $PID_OPT $BINLSRV_DEVLISTCACHE

    RETVAL=$?
    echo
    [ $RETVAL -eq 0 ] && touch /var/lock/subsys/ris-linuxd
    return $RETVAL
}

stop () {
    # stop daemon
    echo -n $"Stopping $prog: "
    killproc $DAEMON
    RETVAL=$?
    echo
    [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/ris-linuxd
    return $RETVAL
}

restart() {
    stop
    start
}

rh_status() {
    # run checks to determine if the service is running or use generic status
    status $prog
}

rh_status_q() {
    rh_status >/dev/null 2>&1
}

case $1 in
    start)
        start
    ;;
    stop)
        stop
    ;;
    restart)
        restart
    ;;
    condrestart|try-restart)
        rh_status_q || exit 0
        restart
    ;;
    reload)
        restart
    ;;
    status)
        status $DAEMON
        RETVAL=$?
    ;;
    *)

    echo $"Usage: $prog {start|stop|restart|condrestart|reload|status}"
    exit 3
esac

exit $RETVAL


--- NEW FILE ris-linuxd.sh ---
#!/bin/bash

python /usr/share/ris-linux/binlsrv.py $@


--- NEW FILE ris-linuxd.smb.conf.sample ---
[global]
    workgroup = OGD
    server string = L337 Samba Server
    netbios name = server
    security = share
    wins support = yes
    guest account = nobody
    null passwords = true

[REMINST]
    path = /var/lib/tftpboot
    guest ok = yes
    browseable = yes
    read only = Yes

[WINOS]
    path = /var/lib/tftpboot/winos
    guest ok = yes
    browseable = yes
    writeable = Yes


--- NEW FILE ris-linuxd.sysconfig ---
# This is the service configuration file for the
# ris-linuxd service.

# The location of the inf/ directory where all the drivers
# are
BINLSRV_INFPATH=/var/lib/tftpboot/winos/inf/

# Extra options for the daemon, like -a (address binding)
BINLSRV_OPTS=

# The log file to write to
BINLSRV_LOGFILE=/var/log/ris-linuxd.log

# The location of the PID file
BINLSRV_PIDFILE=/var/run/ris-linuxd.pid


--- NEW FILE ris-linuxd.tftpd.rules ---
# TFTP rules to:
# - Convert backslashes to forward slashes
# - Convert everything under /winos/*/* to upper-case
rg \\ / # Convert backslashes to slashes
r   (/winos/w2k/i386/)(.*)          \1\U\2
r   (/winos/wxp-x86/i386/)(.*)      \1\U\2
r   (/winos/w2k3-x86/i386/)(.*)     \1\U\2
r   (/winos/w2k3-x64/i386/)(.*)     \1\U\2
r   (/winos/w2k3-x64/amd64/)(.*)    \1\U\2


--- NEW FILE ris-linuxd.tftpd.xinetd ---
# description: The tftp server serves files using the trivial file transfer \
#   protocol.  The tftp protocol is often used to boot diskless \
#   workstations, download configuration files to network-aware printers, \
#   and to start the installation process for some operating systems.
service tftp
{
    socket_type     = dgram
    protocol        = udp
    wait            = yes
    user            = root
    server          = /usr/sbin/in.tftpd
# Use -vvv to debug rewriting rules
    server_args     = -s /tftpboot/ -m /etc/tftpd.rules -v
    disable         = no
    per_source      = 11
    cps             = 100 2
    flags           = IPv4
}



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ris-linux/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	18 Jan 2009 22:32:36 -0000	1.1
+++ .cvsignore	18 Jan 2009 23:50:02 -0000	1.2
@@ -0,0 +1 @@
+ris-linux-0.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ris-linux/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	18 Jan 2009 22:32:36 -0000	1.1
+++ sources	18 Jan 2009 23:50:02 -0000	1.2
@@ -0,0 +1 @@
+7315e1d02436668299f3d6aaf4efc87e  ris-linux-0.4.tar.gz



From kanarip at fedoraproject.org  Sun Jan 18 23:52:29 2009
From: kanarip at fedoraproject.org (Jeroen van Meeuwen)
Date: Sun, 18 Jan 2009 23:52:29 +0000 (UTC)
Subject: rpms/ris-linux/F-10 import.log, NONE,
	1.1 ris-linux-0.4-basepath.patch, 
	NONE, 1.1 ris-linux-0.4-locations.patch, NONE,
	1.1 ris-linux-0.4-pidfile.patch, NONE, 1.1 ris-linux.spec, NONE,
	1.1 ris-linuxd.README, NONE, 1.1 ris-linuxd.init, NONE,
	1.1 ris-linuxd.sh, NONE, 1.1 ris-linuxd.smb.conf.sample, NONE,
	1.1 ris-linuxd.sysconfig, NONE, 1.1 ris-linuxd.tftpd.rules, NONE,
	1.1 ris-linuxd.tftpd.xinetd, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090118235229.10821700E0@cvs1.fedora.phx.redhat.com>

Author: kanarip

Update of /cvs/pkgs/rpms/ris-linux/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10255/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	import.log ris-linux-0.4-basepath.patch 
	ris-linux-0.4-locations.patch ris-linux-0.4-pidfile.patch 
	ris-linux.spec ris-linuxd.README ris-linuxd.init ris-linuxd.sh 
	ris-linuxd.smb.conf.sample ris-linuxd.sysconfig 
	ris-linuxd.tftpd.rules ris-linuxd.tftpd.xinetd 
Log Message:
0.4-4


--- NEW FILE import.log ---
ris-linux-0_4-4_fc10:F-10:ris-linux-0.4-4.fc10.src.rpm:1232322698

ris-linux-0.4-basepath.patch:

--- NEW FILE ris-linux-0.4-basepath.patch ---
diff -ur ris-linux-0.4.orig/binlsrv.py ris-linux-0.4/binlsrv.py
--- ris-linux-0.4.orig/binlsrv.py	2007-09-28 17:29:12.000000000 +0200
+++ ris-linux-0.4/binlsrv.py	2008-09-01 20:12:43.000000000 +0200
@@ -59,7 +59,8 @@

 #############
 # Make sure there is the trailing / here
-BASEPATH = '/mnt/disk/ris/OSChooser/English/'
+#BASEPATH = '/mnt/disk/ris/OSChooser/English/'
+BASEPATH='/var/lib/tftpboot/winos/inf/'
 WELCOME  = 'welcome.osc'
 DUMPING  = False


ris-linux-0.4-locations.patch:

--- NEW FILE ris-linux-0.4-locations.patch ---
diff -ur ris-linux-0.4.orig/infparser.py ris-linux-0.4/infparser.py
--- ris-linux-0.4.orig/infparser.py	2008-04-27 04:35:04.000000000 +0200
+++ ris-linux-0.4/infparser.py	2008-12-05 14:04:35.000000000 +0100
@@ -17,7 +17,7 @@
 
 from codecs import utf_16_le_decode, BOM_LE, BOM_BE
 from sys import argv, exit as sys_exit
-from os.path import isfile
+import os
 from glob import glob
 from cPickle import dump
 from traceback import format_exc
@@ -293,14 +293,17 @@
         print 'Usage %s: directory_with_infs or inf file' % argv[0]
         sys_exit(-1)
 
-    if isfile(argv[1]):
+    if os.path.isfile(argv[1]):
         filelist = [ argv[1] ]
-    else:
+    elif os.path.isdir(argv[1]):
         filelist = glob(argv[1] + '/*.inf')
+    else:
+        print 'No such file or directory %s' % argv[1]
+        exit(1)
 
     devlist = {}
     for inffile in filelist:
-        if inffile.split('/').pop() not in exclude:
+        if os.path.basename(inffile) not in exclude:
             try:
                 devlist.update(scan_inf(inffile))
             except:
@@ -311,15 +314,17 @@
                 print '%s Version %s\n' % (argv[0], __version__)
                 print format_exc()
                 print '---- CUT HERE ----'
+        else:
+            print 'Excluding %s' % inffile
 
     print 'Compiled %d drivers' % len(devlist)
 
-    fd = open('devlist.cache', 'wb')
+    fd = open(os.path.join(os.path.dirname(filelist[0]),'devlist.cache'), 'wb')
     dump(devlist, fd)
     fd.close()
     print 'generated devlist.cache'
 
-    fd = open('nics.txt', 'w')
+    fd = open(os.path.join(os.path.dirname(filelist[0]),'nics.txt'), 'w')
     drvhash = {}
     for nic in devlist.items():
         entry = nic[0].split('&')

ris-linux-0.4-pidfile.patch:

--- NEW FILE ris-linux-0.4-pidfile.patch ---
diff -ur ris-linux-0.4.orig/binlsrv.py ris-linux-0.4/binlsrv.py
--- ris-linux-0.4.orig/binlsrv.py	2008-12-05 13:48:23.000000000 +0100
+++ ris-linux-0.4/binlsrv.py	2008-12-05 13:50:31.000000000 +0100
@@ -1024,7 +1024,7 @@
 
     ## Parse command line arguments
     shortopts = 'hdl:a:p:'
-    longopts = [ 'help', 'daemon', 'logfile=', 'address=', 'port=' ]
+    longopts = [ 'help', 'daemon', 'logfile=', 'address=', 'port=', "pid=" ]
 
     try:
         opts, args = getopt(argv[1:], shortopts, longopts)


--- NEW FILE ris-linux.spec ---
%define _tftpboot %{_var}/lib/tftpboot/
%define win_inf_dir %{_tftpboot}/winos/inf/

Name:           ris-linux
Version:        0.4
Release:        4%{?dist}
Summary:        RIS for Linux - Boot winpe from the net / Ris Windows Installation
Group:          Applications/System
License:        GPLv2+
URL:            http://oss.netfarm.it/guides/pxe.php
Source0:        http://oss.netfarm.it/guides/%{name}-%{version}.tar.gz
Source1:        ris-linuxd.init
Source2:        ris-linuxd.sysconfig
Source3:        ris-linuxd.smb.conf.sample
Source4:        ris-linuxd.README
Source5:        ris-linuxd.tftpd.rules
Source6:        ris-linuxd.tftpd.xinetd
Source7:        ris-linuxd.sh
Patch1:         ris-linux-0.4-basepath.patch
Patch2:         ris-linux-0.4-pidfile.patch
Patch3:         ris-linux-0.4-locations.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch

BuildRequires:  python(abi) >= 2.1

Requires:       python(abi) >= 2.1
Requires:       samba
Requires:       tftp-server

Requires(post): chkconfig, python
Requires(preun):chkconfig, initscripts
Requires(postun):initscripts

%description
Windows Remote Installation Services for Linux - Boot Windows Preinstallation
Environments from the net.

%prep
%setup -q
%patch1 -p1
%patch2 -p1
%patch3 -p1

%build

%install
rm -rf %{buildroot}
mkdir -p %{buildroot}/%{_datadir}/%{name}/
mkdir -p %{buildroot}/%{_initrddir}/
mkdir -p %{buildroot}/%{_sysconfdir}/sysconfig/
mkdir -p %{buildroot}/%{_sbindir}/
install -pm 755 %{SOURCE7} %{buildroot}/%{_sbindir}/%{name}d
install -pm 755 *.py %{buildroot}/%{_datadir}/%{name}/.
install -pm 755 %{SOURCE1} %{buildroot}/%{_initrddir}/%{name}d
install -pm 644 %{SOURCE2} %{buildroot}/%{_sysconfdir}/sysconfig/%{name}d
cp -a %{SOURCE3} smb.conf.sample
cp -a %{SOURCE4} README
cp -a %{SOURCE5} tftpd.rules
cp -a %{SOURCE6} tftpd.xinetd

%clean
rm -rf %{buildroot}

%post
chkconfig --add %{name}d

if [ -d "%{win_inf_dir}" ]; then
    cd %{_datadir}/%{name}/
    python %{_datadir}/%{name}/infparser.py %{win_inf_dir}
fi

%postun
if [ "$1" -ge "1" ] ; then
    /sbin/service %{name}d condrestart >/dev/null 2>&1 || :
fi

%preun
if [ $1 = 0 ] ; then
    /sbin/service %{name}d stop >/dev/null 2>&1
    /sbin/chkconfig --del %{name}d
fi

%files
%defattr(-,root,root,-)
%doc README contrib.txt smb.conf.sample tftpd.rules tftpd.xinetd winpe.sif
%dir %{_datadir}/%{name}
%{_datadir}/%{name}/*
%{_initrddir}/%{name}d
%{_sbindir}/%{name}d
%config(noreplace) %{_sysconfdir}/sysconfig/%{name}d

%changelog
* Wed Jan 14 2009 Jeroen van Meeuwen <kanarip at kanarip.com> - 0.4-4
- Rebuild for review (#469052)

* Fri Dec 05 2008 Jeroen van Meeuwen <kanarip at fedoraproject.org> - 0.4-3
- Tune some of the init scripts and sysconfig settings

* Mon Nov 3 2008 Jeroen van Meeuwen <kanarip at fedoraproject.org> - 0.4-2
- Improve post, preun and postun scriptlets (#469052)
- Improve macro usage (#469052)
- Improve init script

* Mon Sep 1 2008 Jeroen van Meeuwen <kanarip at fedoraproject.org> - 0.4-1
- Initial package


--- NEW FILE ris-linuxd.README ---
For ris-linux to work, you need the following;

- Some Windows files
- A Samba server
- A TFTP server that is capable of rewriting RRQ's to
  actual filenames

For more information on how to set things up completely, let me
refer you to the following websites;

Upstream for ris-linux:
http://oss.netfarm.it/guides/pxe.php

My own little piece of documentation:
http://www.kanarip.com/courses/ClassRoomManual-WindowsInstallationsOverTheNetwork.html

Kind regards,

Jeroen van Meeuwen
-kanarip

--- NEW FILE ris-linuxd.init ---
#!/bin/sh
#
#   Startup/shutdown script for the Linux RIS daemon.
#
#   Linux chkconfig stuff:
#
#   chkconfig: - 98 10
#   description: Startup/shutdown script for the Linux RIS \
#                daemon.
#
### BEGIN INIT INFO
# Provides: ris-linuxd
# Required-Start: $syslog $local_fs
# Required-Stop: $syslog $local_fs
# Default-Stop: 0 1 6
# Short-Description: RIS for Linux
# Description: RIS for Linux
### END INIT INFO

# Source function library.
. /etc/init.d/functions

[ -f /etc/sysconfig/ris-linuxd ] && source /etc/sysconfig/ris-linuxd

# Check if the directory exists
if [ -z "$BINLSRV_INFPATH" -o ! -d "$BINLSRV_INFPATH" ]; then
    echo "No such file or directory $BINLSRV_INFPATH"
    exit 1
fi

BINLSRV_DEVLISTCACHE="${BINLSRV_INFPATH}/devlist.cache"
if [ ! -f "$BINLSRV_DEVLISTCACHE" ]; then
    /usr/share/ris-linux/infparser.py $BINLSRV_INFPATH
fi

[ -z "$BINLSRV_LOGFILE" ] && LOG_OPT="-l /var/log/ris-linuxd.log" || LOG_OPT="-l $BINLSRV_LOGFILE"
[ -z "$BINLSRV_PIDFILE" ] && PID_OPT="--pid=/var/run/ris-linuxd.pid" || PID_OPT="--pid=$BINLSRV_PIDFILE"

DAEMON="ris-linuxd"

prog=ris-linuxd

start () {
    echo -n $"Starting $prog: "

    # start daemon
    daemon $DAEMON -d $BINLSRV_OPTS $LOG_OPT $PID_OPT $BINLSRV_DEVLISTCACHE

    RETVAL=$?
    echo
    [ $RETVAL -eq 0 ] && touch /var/lock/subsys/ris-linuxd
    return $RETVAL
}

stop () {
    # stop daemon
    echo -n $"Stopping $prog: "
    killproc $DAEMON
    RETVAL=$?
    echo
    [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/ris-linuxd
    return $RETVAL
}

restart() {
    stop
    start
}

rh_status() {
    # run checks to determine if the service is running or use generic status
    status $prog
}

rh_status_q() {
    rh_status >/dev/null 2>&1
}

case $1 in
    start)
        start
    ;;
    stop)
        stop
    ;;
    restart)
        restart
    ;;
    condrestart|try-restart)
        rh_status_q || exit 0
        restart
    ;;
    reload)
        restart
    ;;
    status)
        status $DAEMON
        RETVAL=$?
    ;;
    *)

    echo $"Usage: $prog {start|stop|restart|condrestart|reload|status}"
    exit 3
esac

exit $RETVAL


--- NEW FILE ris-linuxd.sh ---
#!/bin/bash

python /usr/share/ris-linux/binlsrv.py $@


--- NEW FILE ris-linuxd.smb.conf.sample ---
[global]
    workgroup = OGD
    server string = L337 Samba Server
    netbios name = server
    security = share
    wins support = yes
    guest account = nobody
    null passwords = true

[REMINST]
    path = /var/lib/tftpboot
    guest ok = yes
    browseable = yes
    read only = Yes

[WINOS]
    path = /var/lib/tftpboot/winos
    guest ok = yes
    browseable = yes
    writeable = Yes


--- NEW FILE ris-linuxd.sysconfig ---
# This is the service configuration file for the
# ris-linuxd service.

# The location of the inf/ directory where all the drivers
# are
BINLSRV_INFPATH=/var/lib/tftpboot/winos/inf/

# Extra options for the daemon, like -a (address binding)
BINLSRV_OPTS=

# The log file to write to
BINLSRV_LOGFILE=/var/log/ris-linuxd.log

# The location of the PID file
BINLSRV_PIDFILE=/var/run/ris-linuxd.pid


--- NEW FILE ris-linuxd.tftpd.rules ---
# TFTP rules to:
# - Convert backslashes to forward slashes
# - Convert everything under /winos/*/* to upper-case
rg \\ / # Convert backslashes to slashes
r   (/winos/w2k/i386/)(.*)          \1\U\2
r   (/winos/wxp-x86/i386/)(.*)      \1\U\2
r   (/winos/w2k3-x86/i386/)(.*)     \1\U\2
r   (/winos/w2k3-x64/i386/)(.*)     \1\U\2
r   (/winos/w2k3-x64/amd64/)(.*)    \1\U\2


--- NEW FILE ris-linuxd.tftpd.xinetd ---
# description: The tftp server serves files using the trivial file transfer \
#   protocol.  The tftp protocol is often used to boot diskless \
#   workstations, download configuration files to network-aware printers, \
#   and to start the installation process for some operating systems.
service tftp
{
    socket_type     = dgram
    protocol        = udp
    wait            = yes
    user            = root
    server          = /usr/sbin/in.tftpd
# Use -vvv to debug rewriting rules
    server_args     = -s /tftpboot/ -m /etc/tftpd.rules -v
    disable         = no
    per_source      = 11
    cps             = 100 2
    flags           = IPv4
}



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ris-linux/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	18 Jan 2009 22:32:36 -0000	1.1
+++ .cvsignore	18 Jan 2009 23:51:58 -0000	1.2
@@ -0,0 +1 @@
+ris-linux-0.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ris-linux/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	18 Jan 2009 22:32:36 -0000	1.1
+++ sources	18 Jan 2009 23:51:58 -0000	1.2
@@ -0,0 +1 @@
+7315e1d02436668299f3d6aaf4efc87e  ris-linux-0.4.tar.gz



From kanarip at fedoraproject.org  Sun Jan 18 23:54:24 2009
From: kanarip at fedoraproject.org (Jeroen van Meeuwen)
Date: Sun, 18 Jan 2009 23:54:24 +0000 (UTC)
Subject: rpms/ris-linux/F-9 import.log, NONE,
	1.1 ris-linux-0.4-basepath.patch, 
	NONE, 1.1 ris-linux-0.4-locations.patch, NONE,
	1.1 ris-linux-0.4-pidfile.patch, NONE, 1.1 ris-linux.spec, NONE,
	1.1 ris-linuxd.README, NONE, 1.1 ris-linuxd.init, NONE,
	1.1 ris-linuxd.sh, NONE, 1.1 ris-linuxd.smb.conf.sample, NONE,
	1.1 ris-linuxd.sysconfig, NONE, 1.1 ris-linuxd.tftpd.rules, NONE,
	1.1 ris-linuxd.tftpd.xinetd, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090118235424.20D79700F7@cvs1.fedora.phx.redhat.com>

Author: kanarip

Update of /cvs/pkgs/rpms/ris-linux/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10843/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	import.log ris-linux-0.4-basepath.patch 
	ris-linux-0.4-locations.patch ris-linux-0.4-pidfile.patch 
	ris-linux.spec ris-linuxd.README ris-linuxd.init ris-linuxd.sh 
	ris-linuxd.smb.conf.sample ris-linuxd.sysconfig 
	ris-linuxd.tftpd.rules ris-linuxd.tftpd.xinetd 
Log Message:
0.4-4


--- NEW FILE import.log ---
ris-linux-0_4-4_fc10:F-9:ris-linux-0.4-4.fc10.src.rpm:1232322813

ris-linux-0.4-basepath.patch:

--- NEW FILE ris-linux-0.4-basepath.patch ---
diff -ur ris-linux-0.4.orig/binlsrv.py ris-linux-0.4/binlsrv.py
--- ris-linux-0.4.orig/binlsrv.py	2007-09-28 17:29:12.000000000 +0200
+++ ris-linux-0.4/binlsrv.py	2008-09-01 20:12:43.000000000 +0200
@@ -59,7 +59,8 @@

 #############
 # Make sure there is the trailing / here
-BASEPATH = '/mnt/disk/ris/OSChooser/English/'
+#BASEPATH = '/mnt/disk/ris/OSChooser/English/'
+BASEPATH='/var/lib/tftpboot/winos/inf/'
 WELCOME  = 'welcome.osc'
 DUMPING  = False


ris-linux-0.4-locations.patch:

--- NEW FILE ris-linux-0.4-locations.patch ---
diff -ur ris-linux-0.4.orig/infparser.py ris-linux-0.4/infparser.py
--- ris-linux-0.4.orig/infparser.py	2008-04-27 04:35:04.000000000 +0200
+++ ris-linux-0.4/infparser.py	2008-12-05 14:04:35.000000000 +0100
@@ -17,7 +17,7 @@
 
 from codecs import utf_16_le_decode, BOM_LE, BOM_BE
 from sys import argv, exit as sys_exit
-from os.path import isfile
+import os
 from glob import glob
 from cPickle import dump
 from traceback import format_exc
@@ -293,14 +293,17 @@
         print 'Usage %s: directory_with_infs or inf file' % argv[0]
         sys_exit(-1)
 
-    if isfile(argv[1]):
+    if os.path.isfile(argv[1]):
         filelist = [ argv[1] ]
-    else:
+    elif os.path.isdir(argv[1]):
         filelist = glob(argv[1] + '/*.inf')
+    else:
+        print 'No such file or directory %s' % argv[1]
+        exit(1)
 
     devlist = {}
     for inffile in filelist:
-        if inffile.split('/').pop() not in exclude:
+        if os.path.basename(inffile) not in exclude:
             try:
                 devlist.update(scan_inf(inffile))
             except:
@@ -311,15 +314,17 @@
                 print '%s Version %s\n' % (argv[0], __version__)
                 print format_exc()
                 print '---- CUT HERE ----'
+        else:
+            print 'Excluding %s' % inffile
 
     print 'Compiled %d drivers' % len(devlist)
 
-    fd = open('devlist.cache', 'wb')
+    fd = open(os.path.join(os.path.dirname(filelist[0]),'devlist.cache'), 'wb')
     dump(devlist, fd)
     fd.close()
     print 'generated devlist.cache'
 
-    fd = open('nics.txt', 'w')
+    fd = open(os.path.join(os.path.dirname(filelist[0]),'nics.txt'), 'w')
     drvhash = {}
     for nic in devlist.items():
         entry = nic[0].split('&')

ris-linux-0.4-pidfile.patch:

--- NEW FILE ris-linux-0.4-pidfile.patch ---
diff -ur ris-linux-0.4.orig/binlsrv.py ris-linux-0.4/binlsrv.py
--- ris-linux-0.4.orig/binlsrv.py	2008-12-05 13:48:23.000000000 +0100
+++ ris-linux-0.4/binlsrv.py	2008-12-05 13:50:31.000000000 +0100
@@ -1024,7 +1024,7 @@
 
     ## Parse command line arguments
     shortopts = 'hdl:a:p:'
-    longopts = [ 'help', 'daemon', 'logfile=', 'address=', 'port=' ]
+    longopts = [ 'help', 'daemon', 'logfile=', 'address=', 'port=', "pid=" ]
 
     try:
         opts, args = getopt(argv[1:], shortopts, longopts)


--- NEW FILE ris-linux.spec ---
%define _tftpboot %{_var}/lib/tftpboot/
%define win_inf_dir %{_tftpboot}/winos/inf/

Name:           ris-linux
Version:        0.4
Release:        4%{?dist}
Summary:        RIS for Linux - Boot winpe from the net / Ris Windows Installation
Group:          Applications/System
License:        GPLv2+
URL:            http://oss.netfarm.it/guides/pxe.php
Source0:        http://oss.netfarm.it/guides/%{name}-%{version}.tar.gz
Source1:        ris-linuxd.init
Source2:        ris-linuxd.sysconfig
Source3:        ris-linuxd.smb.conf.sample
Source4:        ris-linuxd.README
Source5:        ris-linuxd.tftpd.rules
Source6:        ris-linuxd.tftpd.xinetd
Source7:        ris-linuxd.sh
Patch1:         ris-linux-0.4-basepath.patch
Patch2:         ris-linux-0.4-pidfile.patch
Patch3:         ris-linux-0.4-locations.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch

BuildRequires:  python(abi) >= 2.1

Requires:       python(abi) >= 2.1
Requires:       samba
Requires:       tftp-server

Requires(post): chkconfig, python
Requires(preun):chkconfig, initscripts
Requires(postun):initscripts

%description
Windows Remote Installation Services for Linux - Boot Windows Preinstallation
Environments from the net.

%prep
%setup -q
%patch1 -p1
%patch2 -p1
%patch3 -p1

%build

%install
rm -rf %{buildroot}
mkdir -p %{buildroot}/%{_datadir}/%{name}/
mkdir -p %{buildroot}/%{_initrddir}/
mkdir -p %{buildroot}/%{_sysconfdir}/sysconfig/
mkdir -p %{buildroot}/%{_sbindir}/
install -pm 755 %{SOURCE7} %{buildroot}/%{_sbindir}/%{name}d
install -pm 755 *.py %{buildroot}/%{_datadir}/%{name}/.
install -pm 755 %{SOURCE1} %{buildroot}/%{_initrddir}/%{name}d
install -pm 644 %{SOURCE2} %{buildroot}/%{_sysconfdir}/sysconfig/%{name}d
cp -a %{SOURCE3} smb.conf.sample
cp -a %{SOURCE4} README
cp -a %{SOURCE5} tftpd.rules
cp -a %{SOURCE6} tftpd.xinetd

%clean
rm -rf %{buildroot}

%post
chkconfig --add %{name}d

if [ -d "%{win_inf_dir}" ]; then
    cd %{_datadir}/%{name}/
    python %{_datadir}/%{name}/infparser.py %{win_inf_dir}
fi

%postun
if [ "$1" -ge "1" ] ; then
    /sbin/service %{name}d condrestart >/dev/null 2>&1 || :
fi

%preun
if [ $1 = 0 ] ; then
    /sbin/service %{name}d stop >/dev/null 2>&1
    /sbin/chkconfig --del %{name}d
fi

%files
%defattr(-,root,root,-)
%doc README contrib.txt smb.conf.sample tftpd.rules tftpd.xinetd winpe.sif
%dir %{_datadir}/%{name}
%{_datadir}/%{name}/*
%{_initrddir}/%{name}d
%{_sbindir}/%{name}d
%config(noreplace) %{_sysconfdir}/sysconfig/%{name}d

%changelog
* Wed Jan 14 2009 Jeroen van Meeuwen <kanarip at kanarip.com> - 0.4-4
- Rebuild for review (#469052)

* Fri Dec 05 2008 Jeroen van Meeuwen <kanarip at fedoraproject.org> - 0.4-3
- Tune some of the init scripts and sysconfig settings

* Mon Nov 3 2008 Jeroen van Meeuwen <kanarip at fedoraproject.org> - 0.4-2
- Improve post, preun and postun scriptlets (#469052)
- Improve macro usage (#469052)
- Improve init script

* Mon Sep 1 2008 Jeroen van Meeuwen <kanarip at fedoraproject.org> - 0.4-1
- Initial package


--- NEW FILE ris-linuxd.README ---
For ris-linux to work, you need the following;

- Some Windows files
- A Samba server
- A TFTP server that is capable of rewriting RRQ's to
  actual filenames

For more information on how to set things up completely, let me
refer you to the following websites;

Upstream for ris-linux:
http://oss.netfarm.it/guides/pxe.php

My own little piece of documentation:
http://www.kanarip.com/courses/ClassRoomManual-WindowsInstallationsOverTheNetwork.html

Kind regards,

Jeroen van Meeuwen
-kanarip

--- NEW FILE ris-linuxd.init ---
#!/bin/sh
#
#   Startup/shutdown script for the Linux RIS daemon.
#
#   Linux chkconfig stuff:
#
#   chkconfig: - 98 10
#   description: Startup/shutdown script for the Linux RIS \
#                daemon.
#
### BEGIN INIT INFO
# Provides: ris-linuxd
# Required-Start: $syslog $local_fs
# Required-Stop: $syslog $local_fs
# Default-Stop: 0 1 6
# Short-Description: RIS for Linux
# Description: RIS for Linux
### END INIT INFO

# Source function library.
. /etc/init.d/functions

[ -f /etc/sysconfig/ris-linuxd ] && source /etc/sysconfig/ris-linuxd

# Check if the directory exists
if [ -z "$BINLSRV_INFPATH" -o ! -d "$BINLSRV_INFPATH" ]; then
    echo "No such file or directory $BINLSRV_INFPATH"
    exit 1
fi

BINLSRV_DEVLISTCACHE="${BINLSRV_INFPATH}/devlist.cache"
if [ ! -f "$BINLSRV_DEVLISTCACHE" ]; then
    /usr/share/ris-linux/infparser.py $BINLSRV_INFPATH
fi

[ -z "$BINLSRV_LOGFILE" ] && LOG_OPT="-l /var/log/ris-linuxd.log" || LOG_OPT="-l $BINLSRV_LOGFILE"
[ -z "$BINLSRV_PIDFILE" ] && PID_OPT="--pid=/var/run/ris-linuxd.pid" || PID_OPT="--pid=$BINLSRV_PIDFILE"

DAEMON="ris-linuxd"

prog=ris-linuxd

start () {
    echo -n $"Starting $prog: "

    # start daemon
    daemon $DAEMON -d $BINLSRV_OPTS $LOG_OPT $PID_OPT $BINLSRV_DEVLISTCACHE

    RETVAL=$?
    echo
    [ $RETVAL -eq 0 ] && touch /var/lock/subsys/ris-linuxd
    return $RETVAL
}

stop () {
    # stop daemon
    echo -n $"Stopping $prog: "
    killproc $DAEMON
    RETVAL=$?
    echo
    [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/ris-linuxd
    return $RETVAL
}

restart() {
    stop
    start
}

rh_status() {
    # run checks to determine if the service is running or use generic status
    status $prog
}

rh_status_q() {
    rh_status >/dev/null 2>&1
}

case $1 in
    start)
        start
    ;;
    stop)
        stop
    ;;
    restart)
        restart
    ;;
    condrestart|try-restart)
        rh_status_q || exit 0
        restart
    ;;
    reload)
        restart
    ;;
    status)
        status $DAEMON
        RETVAL=$?
    ;;
    *)

    echo $"Usage: $prog {start|stop|restart|condrestart|reload|status}"
    exit 3
esac

exit $RETVAL


--- NEW FILE ris-linuxd.sh ---
#!/bin/bash

python /usr/share/ris-linux/binlsrv.py $@


--- NEW FILE ris-linuxd.smb.conf.sample ---
[global]
    workgroup = OGD
    server string = L337 Samba Server
    netbios name = server
    security = share
    wins support = yes
    guest account = nobody
    null passwords = true

[REMINST]
    path = /var/lib/tftpboot
    guest ok = yes
    browseable = yes
    read only = Yes

[WINOS]
    path = /var/lib/tftpboot/winos
    guest ok = yes
    browseable = yes
    writeable = Yes


--- NEW FILE ris-linuxd.sysconfig ---
# This is the service configuration file for the
# ris-linuxd service.

# The location of the inf/ directory where all the drivers
# are
BINLSRV_INFPATH=/var/lib/tftpboot/winos/inf/

# Extra options for the daemon, like -a (address binding)
BINLSRV_OPTS=

# The log file to write to
BINLSRV_LOGFILE=/var/log/ris-linuxd.log

# The location of the PID file
BINLSRV_PIDFILE=/var/run/ris-linuxd.pid


--- NEW FILE ris-linuxd.tftpd.rules ---
# TFTP rules to:
# - Convert backslashes to forward slashes
# - Convert everything under /winos/*/* to upper-case
rg \\ / # Convert backslashes to slashes
r   (/winos/w2k/i386/)(.*)          \1\U\2
r   (/winos/wxp-x86/i386/)(.*)      \1\U\2
r   (/winos/w2k3-x86/i386/)(.*)     \1\U\2
r   (/winos/w2k3-x64/i386/)(.*)     \1\U\2
r   (/winos/w2k3-x64/amd64/)(.*)    \1\U\2


--- NEW FILE ris-linuxd.tftpd.xinetd ---
# description: The tftp server serves files using the trivial file transfer \
#   protocol.  The tftp protocol is often used to boot diskless \
#   workstations, download configuration files to network-aware printers, \
#   and to start the installation process for some operating systems.
service tftp
{
    socket_type     = dgram
    protocol        = udp
    wait            = yes
    user            = root
    server          = /usr/sbin/in.tftpd
# Use -vvv to debug rewriting rules
    server_args     = -s /tftpboot/ -m /etc/tftpd.rules -v
    disable         = no
    per_source      = 11
    cps             = 100 2
    flags           = IPv4
}



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ris-linux/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	18 Jan 2009 22:32:36 -0000	1.1
+++ .cvsignore	18 Jan 2009 23:53:53 -0000	1.2
@@ -0,0 +1 @@
+ris-linux-0.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ris-linux/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	18 Jan 2009 22:32:36 -0000	1.1
+++ sources	18 Jan 2009 23:53:53 -0000	1.2
@@ -0,0 +1 @@
+7315e1d02436668299f3d6aaf4efc87e  ris-linux-0.4.tar.gz



From kanarip at fedoraproject.org  Sun Jan 18 23:56:21 2009
From: kanarip at fedoraproject.org (Jeroen van Meeuwen)
Date: Sun, 18 Jan 2009 23:56:21 +0000 (UTC)
Subject: rpms/ris-linux/EL-5 import.log, NONE,
	1.1 ris-linux-0.4-basepath.patch, 
	NONE, 1.1 ris-linux-0.4-locations.patch, NONE,
	1.1 ris-linux-0.4-pidfile.patch, NONE, 1.1 ris-linux.spec, NONE,
	1.1 ris-linuxd.README, NONE, 1.1 ris-linuxd.init, NONE,
	1.1 ris-linuxd.sh, NONE, 1.1 ris-linuxd.smb.conf.sample, NONE,
	1.1 ris-linuxd.sysconfig, NONE, 1.1 ris-linuxd.tftpd.rules, NONE,
	1.1 ris-linuxd.tftpd.xinetd, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090118235621.2C97E700F7@cvs1.fedora.phx.redhat.com>

Author: kanarip

Update of /cvs/pkgs/rpms/ris-linux/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11476/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	import.log ris-linux-0.4-basepath.patch 
	ris-linux-0.4-locations.patch ris-linux-0.4-pidfile.patch 
	ris-linux.spec ris-linuxd.README ris-linuxd.init ris-linuxd.sh 
	ris-linuxd.smb.conf.sample ris-linuxd.sysconfig 
	ris-linuxd.tftpd.rules ris-linuxd.tftpd.xinetd 
Log Message:
0.4-4


--- NEW FILE import.log ---
ris-linux-0_4-4_fc10:EL-5:ris-linux-0.4-4.fc10.src.rpm:1232322930

ris-linux-0.4-basepath.patch:

--- NEW FILE ris-linux-0.4-basepath.patch ---
diff -ur ris-linux-0.4.orig/binlsrv.py ris-linux-0.4/binlsrv.py
--- ris-linux-0.4.orig/binlsrv.py	2007-09-28 17:29:12.000000000 +0200
+++ ris-linux-0.4/binlsrv.py	2008-09-01 20:12:43.000000000 +0200
@@ -59,7 +59,8 @@

 #############
 # Make sure there is the trailing / here
-BASEPATH = '/mnt/disk/ris/OSChooser/English/'
+#BASEPATH = '/mnt/disk/ris/OSChooser/English/'
+BASEPATH='/var/lib/tftpboot/winos/inf/'
 WELCOME  = 'welcome.osc'
 DUMPING  = False


ris-linux-0.4-locations.patch:

--- NEW FILE ris-linux-0.4-locations.patch ---
diff -ur ris-linux-0.4.orig/infparser.py ris-linux-0.4/infparser.py
--- ris-linux-0.4.orig/infparser.py	2008-04-27 04:35:04.000000000 +0200
+++ ris-linux-0.4/infparser.py	2008-12-05 14:04:35.000000000 +0100
@@ -17,7 +17,7 @@
 
 from codecs import utf_16_le_decode, BOM_LE, BOM_BE
 from sys import argv, exit as sys_exit
-from os.path import isfile
+import os
 from glob import glob
 from cPickle import dump
 from traceback import format_exc
@@ -293,14 +293,17 @@
         print 'Usage %s: directory_with_infs or inf file' % argv[0]
         sys_exit(-1)
 
-    if isfile(argv[1]):
+    if os.path.isfile(argv[1]):
         filelist = [ argv[1] ]
-    else:
+    elif os.path.isdir(argv[1]):
         filelist = glob(argv[1] + '/*.inf')
+    else:
+        print 'No such file or directory %s' % argv[1]
+        exit(1)
 
     devlist = {}
     for inffile in filelist:
-        if inffile.split('/').pop() not in exclude:
+        if os.path.basename(inffile) not in exclude:
             try:
                 devlist.update(scan_inf(inffile))
             except:
@@ -311,15 +314,17 @@
                 print '%s Version %s\n' % (argv[0], __version__)
                 print format_exc()
                 print '---- CUT HERE ----'
+        else:
+            print 'Excluding %s' % inffile
 
     print 'Compiled %d drivers' % len(devlist)
 
-    fd = open('devlist.cache', 'wb')
+    fd = open(os.path.join(os.path.dirname(filelist[0]),'devlist.cache'), 'wb')
     dump(devlist, fd)
     fd.close()
     print 'generated devlist.cache'
 
-    fd = open('nics.txt', 'w')
+    fd = open(os.path.join(os.path.dirname(filelist[0]),'nics.txt'), 'w')
     drvhash = {}
     for nic in devlist.items():
         entry = nic[0].split('&')

ris-linux-0.4-pidfile.patch:

--- NEW FILE ris-linux-0.4-pidfile.patch ---
diff -ur ris-linux-0.4.orig/binlsrv.py ris-linux-0.4/binlsrv.py
--- ris-linux-0.4.orig/binlsrv.py	2008-12-05 13:48:23.000000000 +0100
+++ ris-linux-0.4/binlsrv.py	2008-12-05 13:50:31.000000000 +0100
@@ -1024,7 +1024,7 @@
 
     ## Parse command line arguments
     shortopts = 'hdl:a:p:'
-    longopts = [ 'help', 'daemon', 'logfile=', 'address=', 'port=' ]
+    longopts = [ 'help', 'daemon', 'logfile=', 'address=', 'port=', "pid=" ]
 
     try:
         opts, args = getopt(argv[1:], shortopts, longopts)


--- NEW FILE ris-linux.spec ---
%define _tftpboot %{_var}/lib/tftpboot/
%define win_inf_dir %{_tftpboot}/winos/inf/

Name:           ris-linux
Version:        0.4
Release:        4%{?dist}
Summary:        RIS for Linux - Boot winpe from the net / Ris Windows Installation
Group:          Applications/System
License:        GPLv2+
URL:            http://oss.netfarm.it/guides/pxe.php
Source0:        http://oss.netfarm.it/guides/%{name}-%{version}.tar.gz
Source1:        ris-linuxd.init
Source2:        ris-linuxd.sysconfig
Source3:        ris-linuxd.smb.conf.sample
Source4:        ris-linuxd.README
Source5:        ris-linuxd.tftpd.rules
Source6:        ris-linuxd.tftpd.xinetd
Source7:        ris-linuxd.sh
Patch1:         ris-linux-0.4-basepath.patch
Patch2:         ris-linux-0.4-pidfile.patch
Patch3:         ris-linux-0.4-locations.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch

BuildRequires:  python(abi) >= 2.1

Requires:       python(abi) >= 2.1
Requires:       samba
Requires:       tftp-server

Requires(post): chkconfig, python
Requires(preun):chkconfig, initscripts
Requires(postun):initscripts

%description
Windows Remote Installation Services for Linux - Boot Windows Preinstallation
Environments from the net.

%prep
%setup -q
%patch1 -p1
%patch2 -p1
%patch3 -p1

%build

%install
rm -rf %{buildroot}
mkdir -p %{buildroot}/%{_datadir}/%{name}/
mkdir -p %{buildroot}/%{_initrddir}/
mkdir -p %{buildroot}/%{_sysconfdir}/sysconfig/
mkdir -p %{buildroot}/%{_sbindir}/
install -pm 755 %{SOURCE7} %{buildroot}/%{_sbindir}/%{name}d
install -pm 755 *.py %{buildroot}/%{_datadir}/%{name}/.
install -pm 755 %{SOURCE1} %{buildroot}/%{_initrddir}/%{name}d
install -pm 644 %{SOURCE2} %{buildroot}/%{_sysconfdir}/sysconfig/%{name}d
cp -a %{SOURCE3} smb.conf.sample
cp -a %{SOURCE4} README
cp -a %{SOURCE5} tftpd.rules
cp -a %{SOURCE6} tftpd.xinetd

%clean
rm -rf %{buildroot}

%post
chkconfig --add %{name}d

if [ -d "%{win_inf_dir}" ]; then
    cd %{_datadir}/%{name}/
    python %{_datadir}/%{name}/infparser.py %{win_inf_dir}
fi

%postun
if [ "$1" -ge "1" ] ; then
    /sbin/service %{name}d condrestart >/dev/null 2>&1 || :
fi

%preun
if [ $1 = 0 ] ; then
    /sbin/service %{name}d stop >/dev/null 2>&1
    /sbin/chkconfig --del %{name}d
fi

%files
%defattr(-,root,root,-)
%doc README contrib.txt smb.conf.sample tftpd.rules tftpd.xinetd winpe.sif
%dir %{_datadir}/%{name}
%{_datadir}/%{name}/*
%{_initrddir}/%{name}d
%{_sbindir}/%{name}d
%config(noreplace) %{_sysconfdir}/sysconfig/%{name}d

%changelog
* Wed Jan 14 2009 Jeroen van Meeuwen <kanarip at kanarip.com> - 0.4-4
- Rebuild for review (#469052)

* Fri Dec 05 2008 Jeroen van Meeuwen <kanarip at fedoraproject.org> - 0.4-3
- Tune some of the init scripts and sysconfig settings

* Mon Nov 3 2008 Jeroen van Meeuwen <kanarip at fedoraproject.org> - 0.4-2
- Improve post, preun and postun scriptlets (#469052)
- Improve macro usage (#469052)
- Improve init script

* Mon Sep 1 2008 Jeroen van Meeuwen <kanarip at fedoraproject.org> - 0.4-1
- Initial package


--- NEW FILE ris-linuxd.README ---
For ris-linux to work, you need the following;

- Some Windows files
- A Samba server
- A TFTP server that is capable of rewriting RRQ's to
  actual filenames

For more information on how to set things up completely, let me
refer you to the following websites;

Upstream for ris-linux:
http://oss.netfarm.it/guides/pxe.php

My own little piece of documentation:
http://www.kanarip.com/courses/ClassRoomManual-WindowsInstallationsOverTheNetwork.html

Kind regards,

Jeroen van Meeuwen
-kanarip

--- NEW FILE ris-linuxd.init ---
#!/bin/sh
#
#   Startup/shutdown script for the Linux RIS daemon.
#
#   Linux chkconfig stuff:
#
#   chkconfig: - 98 10
#   description: Startup/shutdown script for the Linux RIS \
#                daemon.
#
### BEGIN INIT INFO
# Provides: ris-linuxd
# Required-Start: $syslog $local_fs
# Required-Stop: $syslog $local_fs
# Default-Stop: 0 1 6
# Short-Description: RIS for Linux
# Description: RIS for Linux
### END INIT INFO

# Source function library.
. /etc/init.d/functions

[ -f /etc/sysconfig/ris-linuxd ] && source /etc/sysconfig/ris-linuxd

# Check if the directory exists
if [ -z "$BINLSRV_INFPATH" -o ! -d "$BINLSRV_INFPATH" ]; then
    echo "No such file or directory $BINLSRV_INFPATH"
    exit 1
fi

BINLSRV_DEVLISTCACHE="${BINLSRV_INFPATH}/devlist.cache"
if [ ! -f "$BINLSRV_DEVLISTCACHE" ]; then
    /usr/share/ris-linux/infparser.py $BINLSRV_INFPATH
fi

[ -z "$BINLSRV_LOGFILE" ] && LOG_OPT="-l /var/log/ris-linuxd.log" || LOG_OPT="-l $BINLSRV_LOGFILE"
[ -z "$BINLSRV_PIDFILE" ] && PID_OPT="--pid=/var/run/ris-linuxd.pid" || PID_OPT="--pid=$BINLSRV_PIDFILE"

DAEMON="ris-linuxd"

prog=ris-linuxd

start () {
    echo -n $"Starting $prog: "

    # start daemon
    daemon $DAEMON -d $BINLSRV_OPTS $LOG_OPT $PID_OPT $BINLSRV_DEVLISTCACHE

    RETVAL=$?
    echo
    [ $RETVAL -eq 0 ] && touch /var/lock/subsys/ris-linuxd
    return $RETVAL
}

stop () {
    # stop daemon
    echo -n $"Stopping $prog: "
    killproc $DAEMON
    RETVAL=$?
    echo
    [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/ris-linuxd
    return $RETVAL
}

restart() {
    stop
    start
}

rh_status() {
    # run checks to determine if the service is running or use generic status
    status $prog
}

rh_status_q() {
    rh_status >/dev/null 2>&1
}

case $1 in
    start)
        start
    ;;
    stop)
        stop
    ;;
    restart)
        restart
    ;;
    condrestart|try-restart)
        rh_status_q || exit 0
        restart
    ;;
    reload)
        restart
    ;;
    status)
        status $DAEMON
        RETVAL=$?
    ;;
    *)

    echo $"Usage: $prog {start|stop|restart|condrestart|reload|status}"
    exit 3
esac

exit $RETVAL


--- NEW FILE ris-linuxd.sh ---
#!/bin/bash

python /usr/share/ris-linux/binlsrv.py $@


--- NEW FILE ris-linuxd.smb.conf.sample ---
[global]
    workgroup = OGD
    server string = L337 Samba Server
    netbios name = server
    security = share
    wins support = yes
    guest account = nobody
    null passwords = true

[REMINST]
    path = /var/lib/tftpboot
    guest ok = yes
    browseable = yes
    read only = Yes

[WINOS]
    path = /var/lib/tftpboot/winos
    guest ok = yes
    browseable = yes
    writeable = Yes


--- NEW FILE ris-linuxd.sysconfig ---
# This is the service configuration file for the
# ris-linuxd service.

# The location of the inf/ directory where all the drivers
# are
BINLSRV_INFPATH=/var/lib/tftpboot/winos/inf/

# Extra options for the daemon, like -a (address binding)
BINLSRV_OPTS=

# The log file to write to
BINLSRV_LOGFILE=/var/log/ris-linuxd.log

# The location of the PID file
BINLSRV_PIDFILE=/var/run/ris-linuxd.pid


--- NEW FILE ris-linuxd.tftpd.rules ---
# TFTP rules to:
# - Convert backslashes to forward slashes
# - Convert everything under /winos/*/* to upper-case
rg \\ / # Convert backslashes to slashes
r   (/winos/w2k/i386/)(.*)          \1\U\2
r   (/winos/wxp-x86/i386/)(.*)      \1\U\2
r   (/winos/w2k3-x86/i386/)(.*)     \1\U\2
r   (/winos/w2k3-x64/i386/)(.*)     \1\U\2
r   (/winos/w2k3-x64/amd64/)(.*)    \1\U\2


--- NEW FILE ris-linuxd.tftpd.xinetd ---
# description: The tftp server serves files using the trivial file transfer \
#   protocol.  The tftp protocol is often used to boot diskless \
#   workstations, download configuration files to network-aware printers, \
#   and to start the installation process for some operating systems.
service tftp
{
    socket_type     = dgram
    protocol        = udp
    wait            = yes
    user            = root
    server          = /usr/sbin/in.tftpd
# Use -vvv to debug rewriting rules
    server_args     = -s /tftpboot/ -m /etc/tftpd.rules -v
    disable         = no
    per_source      = 11
    cps             = 100 2
    flags           = IPv4
}



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ris-linux/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	18 Jan 2009 22:32:36 -0000	1.1
+++ .cvsignore	18 Jan 2009 23:55:50 -0000	1.2
@@ -0,0 +1 @@
+ris-linux-0.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ris-linux/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	18 Jan 2009 22:32:36 -0000	1.1
+++ sources	18 Jan 2009 23:55:50 -0000	1.2
@@ -0,0 +1 @@
+7315e1d02436668299f3d6aaf4efc87e  ris-linux-0.4.tar.gz



From cwickert at fedoraproject.org  Sun Jan 18 23:56:43 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Sun, 18 Jan 2009 23:56:43 +0000 (UTC)
Subject: rpms/xfce4-notes-plugin/devel xfce4-notes-plugin.spec,1.15,1.16
Message-ID: <20090118235643.6C1BB700F7@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/xfce4-notes-plugin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11544

Modified Files:
	xfce4-notes-plugin.spec 
Log Message:
* Sun Jan 18 2009 Christoph Wickert <cwickert at fedoraproject.org> - 1.6.3-2
- Rebuild for Xfce 4.6 (Beta 3)
- Enable Xfconf settings dialog



Index: xfce4-notes-plugin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-notes-plugin/devel/xfce4-notes-plugin.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- xfce4-notes-plugin.spec	27 Nov 2008 22:33:36 -0000	1.15
+++ xfce4-notes-plugin.spec	18 Jan 2009 23:56:13 -0000	1.16
@@ -1,6 +1,6 @@
 Name:		xfce4-notes-plugin
 Version:	1.6.3
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Notes plugin for the Xfce panel
 
 Group:		User Interface/Desktops
@@ -10,9 +10,9 @@
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	xfce4-panel-devel >= 4.4.0, libxfcegui4-devel >= 4.4.0, libxml2-devel
-BuildRequires:	Thunar-devel >= 0.8.0
+BuildRequires:	Thunar-devel >= 0.8.0, xfconf-devel >= 4.5.90
 BuildRequires:	gettext, intltool, perl(XML::Parser)
-Requires:	xfce4-panel >= 4.4.1
+Requires:	xfce4-panel >= 4.4.1, xfconf >= 4.5.90
 
 %description
 This plugin provides sticky notes for your desktop. You can create a note by 
@@ -65,6 +65,10 @@
 
 
 %changelog
+* Sun Jan 18 2009 Christoph Wickert <cwickert at fedoraproject.org> - 1.6.3-2
+- Rebuild for Xfce 4.6 (Beta 3)
+- Enable Xfconf settings dialog
+
 * Thu Nov 27 2008 Christoph Wickert <cwickert at fedoraproject.org> - 1.6.3-1
 - Update to 1.6.3
 - BR intltool



From cwickert at fedoraproject.org  Sun Jan 18 23:59:27 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Sun, 18 Jan 2009 23:59:27 +0000 (UTC)
Subject: rpms/xfce4-places-plugin/devel xfce4-places-plugin.spec,1.12,1.13
Message-ID: <20090118235927.7FB0D700F7@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/xfce4-places-plugin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12111

Modified Files:
	xfce4-places-plugin.spec 
Log Message:
* Sun Jan 18 2009 Christoph Wickert <cwickert at fedoraproject.org> - 1.1.0-4
- Rebuild for Xfce 4.6 (Beta 3)



Index: xfce4-places-plugin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-places-plugin/devel/xfce4-places-plugin.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- xfce4-places-plugin.spec	30 Aug 2008 23:33:02 -0000	1.12
+++ xfce4-places-plugin.spec	18 Jan 2009 23:58:56 -0000	1.13
@@ -1,6 +1,6 @@
 Name:		xfce4-places-plugin
 Version:	1.1.0
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	Places menu for the Xfce panel
 
 Group:		User Interface/Desktops
@@ -49,37 +49,40 @@
 %{_datadir}/xfce4/panel-plugins/*.desktop
 
 %changelog
-* Sun Aug 31 2008 Christoph Wickert <fedora christoph-wickert de> - 1.1.0-3
+* Sun Jan 18 2009 Christoph Wickert <cwickert at fedoraproject.org> - 1.1.0-4
+- Rebuild for Xfce 4.6 (Beta 3)
+
+* Sun Aug 31 2008 Christoph Wickert <cwickert at fedoraproject.org> - 1.1.0-3
 - Update xdg-userdir-compat.patch to use upstream's variable names
 
-* Wed Aug 27 2008 Christoph Wickert <fedora christoph-wickert de> - 1.1.0-2
+* Wed Aug 27 2008 Christoph Wickert <cwickert at fedoraproject.org> - 1.1.0-2
 - Respect xdg user directory paths (#457740)
 
-* Thu Jun 12 2008 Christoph Wickert <fedora christoph-wickert de> - 1.1.0-1
+* Thu Jun 12 2008 Christoph Wickert <cwickert at fedoraproject.org> - 1.1.0-1
 - Update to 1.1.0
 - Fix changelog
 
 * Mon Feb 18 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1.0.0-3
 - Autorebuild for GCC 4.3
 
-* Fri Dec 07 2007 Christoph Wickert <fedora christoph-wickert de> - 1.0.0-2
+* Fri Dec 07 2007 Christoph Wickert <cwickert at fedoraproject.org> - 1.0.0-2
 - Rebuild for Xfce 4.4.2 and Thunar 0.9.0
 
-* Wed Nov 07 2007 Christoph Wickert <fedora christoph-wickert de> - 1.0.0-1
+* Wed Nov 07 2007 Christoph Wickert <cwickert at fedoraproject.org> - 1.0.0-1
 - Update to 1.0.0
 
-* Sat Aug 25 2007 Christoph Wickert <fedora christoph-wickert de> - 0.9.992-1
+* Sat Aug 25 2007 Christoph Wickert <cwickert at fedoraproject.org> - 0.9.992-1
 - Update to 0.9.992
 
-* Sat Aug 25 2007 Christoph Wickert <fedora christoph-wickert de> - 0.9.991-1
+* Sat Aug 25 2007 Christoph Wickert <cwickert at fedoraproject.org> - 0.9.991-1
 - Update to 0.9.991
 - Update license tag
 
-* Thu May 17 2007 Christoph Wickert <fedora christoph-wickert de> - 0.3.0-1
+* Thu May 17 2007 Christoph Wickert <cwickert at fedoraproject.org> - 0.3.0-1
 - Update to 0.3.0
 
-* Sun Apr 29 2007 Christoph Wickert <fedora christoph-wickert de> - 0.2.0-1
+* Sun Apr 29 2007 Christoph Wickert <cwickert at fedoraproject.org> - 0.2.0-1
 - Update to 0.2.0
 
-* Sun Apr 08 2007 Christoph Wickert <fedora christoph-wickert de> - 0.1.0-1
+* Sun Apr 08 2007 Christoph Wickert <cwickert at fedoraproject.org> - 0.1.0-1
 - Initial package.



From pkgdb at fedoraproject.org  Sun Jan 18 23:59:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 18 Jan 2009 23:59:32 +0000
Subject: [pkgdb] emesene had acl change status
Message-ID: <20090118235933.0A7A4208469@bastion.fedora.phx.redhat.com>

cchance has set the watchbugzilla acl on emesene (Fedora 10) to Denied for ziobizzo

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/emesene



From pkgdb at fedoraproject.org  Sun Jan 18 23:59:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 18 Jan 2009 23:59:34 +0000
Subject: [pkgdb] emesene had acl change status
Message-ID: <20090118235934.C387A208471@bastion.fedora.phx.redhat.com>

cchance has set the watchcommits acl on emesene (Fedora 10) to Denied for ziobizzo

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/emesene



From pkgdb at fedoraproject.org  Sun Jan 18 23:59:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 18 Jan 2009 23:59:40 +0000
Subject: [pkgdb] emesene had acl change status
Message-ID: <20090118235940.71A96208474@bastion.fedora.phx.redhat.com>

cchance has set the watchbugzilla acl on emesene (Fedora 10) to Obsolete for ziobizzo

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/emesene



From pkgdb at fedoraproject.org  Sun Jan 18 23:59:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 18 Jan 2009 23:59:42 +0000
Subject: [pkgdb] emesene had acl change status
Message-ID: <20090118235942.67BFA208477@bastion.fedora.phx.redhat.com>

cchance has set the watchcommits acl on emesene (Fedora 10) to Awaiting Review for ziobizzo

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/emesene



From pkgdb at fedoraproject.org  Sun Jan 18 23:59:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 18 Jan 2009 23:59:45 +0000
Subject: [pkgdb] emesene had acl change status
Message-ID: <20090118235945.8DC43208478@bastion.fedora.phx.redhat.com>

cchance has set the watchbugzilla acl on emesene (Fedora 10) to Awaiting Review for ziobizzo

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/emesene



From cwickert at fedoraproject.org  Mon Jan 19 00:01:03 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Mon, 19 Jan 2009 00:01:03 +0000 (UTC)
Subject: rpms/xfce4-quicklauncher-plugin/devel
	xfce4-quicklauncher-plugin.spec, 1.12, 1.13
Message-ID: <20090119000103.C3667700F8@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/xfce4-quicklauncher-plugin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12391

Modified Files:
	xfce4-quicklauncher-plugin.spec 
Log Message:
* Sun Jan 18 2009 Christoph Wickert <cwickert at fedoraproject.org> - 1.9.4-3
- Rebuild for Xfce 4.6 (Beta 3)



Index: xfce4-quicklauncher-plugin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-quicklauncher-plugin/devel/xfce4-quicklauncher-plugin.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- xfce4-quicklauncher-plugin.spec	18 Feb 2008 23:56:31 -0000	1.12
+++ xfce4-quicklauncher-plugin.spec	19 Jan 2009 00:00:33 -0000	1.13
@@ -1,6 +1,6 @@
 Name:		xfce4-quicklauncher-plugin
 Version:	1.9.4
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Quicklauncher plugin for the Xfce panel
 
 Group:		User Interface/Desktops
@@ -42,33 +42,36 @@
 %{_libdir}/xfce4/panel-plugins/*.desktop
 
 %changelog
+* Sun Jan 18 2009 Christoph Wickert <cwickert at fedoraproject.org> - 1.9.4-3
+- Rebuild for Xfce 4.6 (Beta 3)
+
 * Mon Feb 18 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1.9.4-2
 - Autorebuild for GCC 4.3
 
-* Sat Aug 25 2007 Christoph Wickert <fedora christoph-wickert de> - 1.9.4-1
+* Sat Aug 25 2007 Christoph Wickert <cwickert at fedoraproject.org> - 1.9.4-1
 - Update to 1.9.4
 - Update license tag
 
-* Sat Jun 09 2007 Christoph Wickert <fedora christoph-wickert de> - 1.9.2-4
+* Sat Jun 09 2007 Christoph Wickert <cwickert at fedoraproject.org> - 1.9.2-4
 - Multilib fix for desktop file (#228168)
 
-* Sat Apr 28 2007 Christoph Wickert <fedora christoph-wickert de> - 1.9.2-3
+* Sat Apr 28 2007 Christoph Wickert <cwickert at fedoraproject.org> - 1.9.2-3
 - Rebuild for Xfce 4.4.1
 
-* Sun Jan 28 2007 Christoph Wickert <fedora christoph-wickert de> - 1.9.2-2
+* Sun Jan 28 2007 Christoph Wickert <cwickert at fedoraproject.org> - 1.9.2-2
 - Rebuild for Xfce 4.4.
 
-* Thu Oct 05 2006 Christoph Wickert <fedora christoph-wickert de> - 1.9.2-1
+* Thu Oct 05 2006 Christoph Wickert <cwickert at fedoraproject.org> - 1.9.2-1
 - Update to 1.9.2.
 
-* Wed Sep 13 2006 Christoph Wickert <fedora christoph-wickert de> - 1.9.1-2
+* Wed Sep 13 2006 Christoph Wickert <cwickert at fedoraproject.org> - 1.9.1-2
 - Rebuild for XFCE 4.3.99.1.
 - BR perl(XML::Parser).
 
-* Mon Sep 04 2006 Christoph Wickert <fedora christoph-wickert de> - 1.9.1-1
+* Mon Sep 04 2006 Christoph Wickert <cwickert at fedoraproject.org> - 1.9.1-1
 - Update to 1.9.1 on XFCE 4.3.90.2.
 
-* Mon Sep 04 2006 Christoph Wickert <fedora christoph-wickert de> - 0.81-5
+* Mon Sep 04 2006 Christoph Wickert <cwickert at fedoraproject.org> - 0.81-5
 - Mass rebuild for Fedora Core 6.
 
 * Tue Apr 11 2006 Christoph Wickert <fedora wickert at arcor de> - 0.81-4



From cebbert at fedoraproject.org  Mon Jan 19 00:08:23 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Mon, 19 Jan 2009 00:08:23 +0000 (UTC)
Subject: rpms/kernel/F-10 patch-2.6.28.1.bz2.sign, NONE, 1.1 .cvsignore,
	1.963, 
	1.964 kernel.spec, 1.1216, 1.1217 sources, 1.925, 1.926 upstream,
	1.836, 1.837 patch-2.6.28.1-rc2.bz2.sign, 1.1, NONE
Message-ID: <20090119000823.2D96D700F8@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14005

Modified Files:
	.cvsignore kernel.spec sources upstream 
Added Files:
	patch-2.6.28.1.bz2.sign 
Removed Files:
	patch-2.6.28.1-rc2.bz2.sign 
Log Message:
2.6.28.1


--- NEW FILE patch-2.6.28.1.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBJc3oPyGugalF9Dw4RAuy+AJ9KKoX8093G9U9BYh/Hd/oCQMjGPQCfd8VA
TMiunF5DwaIr8/v6VES+u8c=
=+nZY
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/.cvsignore,v
retrieving revision 1.963
retrieving revision 1.964
diff -u -r1.963 -r1.964
--- .cvsignore	16 Jan 2009 14:13:30 -0000	1.963
+++ .cvsignore	19 Jan 2009 00:07:52 -0000	1.964
@@ -4,4 +4,4 @@
 temp-*
 kernel-2.6.28
 linux-2.6.28.tar.bz2
-patch-2.6.28.1-rc2.bz2
+patch-2.6.28.1.bz2


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/kernel.spec,v
retrieving revision 1.1216
retrieving revision 1.1217
diff -u -r1.1216 -r1.1217
--- kernel.spec	16 Jan 2009 14:13:30 -0000	1.1216
+++ kernel.spec	19 Jan 2009 00:07:52 -0000	1.1217
@@ -38,7 +38,7 @@
 # Do we have a -stable update to apply?
 %define stable_update 1
 # Is it a -stable RC?
-%define stable_rc 2
+%define stable_rc 0
 # Set rpm version accordingly
 %if 0%{?stable_update}
 %define stablerev .%{stable_update}
@@ -1776,6 +1776,9 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Sun Jan 18 2009 Chuck Ebbert <cebbert at redhat.com>
+- 2.6.28.1
+
 * Fri Jan 16 2009 Kyle McMartin <kyle at redhat.com>
 - 2.6.28.1-rc2
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/sources,v
retrieving revision 1.925
retrieving revision 1.926
diff -u -r1.925 -r1.926
--- sources	16 Jan 2009 14:13:30 -0000	1.925
+++ sources	19 Jan 2009 00:07:52 -0000	1.926
@@ -1,2 +1,2 @@
 d351e44709c9810b85e29b877f50968a  linux-2.6.28.tar.bz2
-c44fbfbbe4ca3c07a8bb18c71abfe551  patch-2.6.28.1-rc2.bz2
+137d854fbbb05d600de4006b74a9828c  patch-2.6.28.1.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/upstream,v
retrieving revision 1.836
retrieving revision 1.837
diff -u -r1.836 -r1.837
--- upstream	16 Jan 2009 14:13:30 -0000	1.836
+++ upstream	19 Jan 2009 00:07:52 -0000	1.837
@@ -1,2 +1,2 @@
 linux-2.6.28.tar.bz2
-patch-2.6.28.1-rc2.bz2
+patch-2.6.28.1.bz2


--- patch-2.6.28.1-rc2.bz2.sign DELETED ---



From cwickert at fedoraproject.org  Mon Jan 19 00:12:31 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Mon, 19 Jan 2009 00:12:31 +0000 (UTC)
Subject: rpms/xfce4-sensors-plugin/devel xfce4-sensors-plugin.spec, 1.17,
	1.18
Message-ID: <20090119001231.0A466700F8@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/xfce4-sensors-plugin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14501

Modified Files:
	xfce4-sensors-plugin.spec 
Log Message:
* Sun Jan 18 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.10.99.6-2
- Rebuild for Xfce 4.6 (Beta 3)



Index: xfce4-sensors-plugin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-sensors-plugin/devel/xfce4-sensors-plugin.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- xfce4-sensors-plugin.spec	29 Nov 2008 01:53:01 -0000	1.17
+++ xfce4-sensors-plugin.spec	19 Jan 2009 00:12:00 -0000	1.18
@@ -1,6 +1,6 @@
 Name:           xfce4-sensors-plugin
 Version:        0.10.99.6
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Sensors plugin for the Xfce panel
 
 Group:          User Interface/Desktops
@@ -84,6 +84,9 @@
 
 
 %changelog
+* Sun Jan 18 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.10.99.6-2
+- Rebuild for Xfce 4.6 (Beta 3)
+
 * Thu Nov 27 2008 Christoph Wickert <cwickert at fedoraproject.org> - 0.10.99.6-1
 - Update to 0.10.99.6
 - Remove obsolete lm_sensors patch



From cwickert at fedoraproject.org  Mon Jan 19 00:14:02 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Mon, 19 Jan 2009 00:14:02 +0000 (UTC)
Subject: rpms/xfce4-systemload-plugin/devel xfce4-systemload-plugin.spec,
	1.12, 1.13
Message-ID: <20090119001402.177F6700F8@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/xfce4-systemload-plugin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14786

Modified Files:
	xfce4-systemload-plugin.spec 
Log Message:
* Sun Jan 18 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.4.2-5
- Rebuild for Xfce 4.6 (Beta 3)



Index: xfce4-systemload-plugin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-systemload-plugin/devel/xfce4-systemload-plugin.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- xfce4-systemload-plugin.spec	19 Feb 2008 00:00:33 -0000	1.12
+++ xfce4-systemload-plugin.spec	19 Jan 2009 00:13:31 -0000	1.13
@@ -1,6 +1,6 @@
 Name:		xfce4-systemload-plugin
 Version:	0.4.2
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	Systemload monitor for the Xfce panel
 
 Group:		User Interface/Desktops
@@ -39,32 +39,35 @@
 %{_datadir}/xfce4/panel-plugins/*.desktop
 
 %changelog
+* Sun Jan 18 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.4.2-5
+- Rebuild for Xfce 4.6 (Beta 3)
+
 * Mon Feb 18 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.4.2-4
 - Autorebuild for GCC 4.3
 
-* Sat Aug 25 2007 Christoph Wickert <fedora christoph-wickert de> - 0.4.2-3
+* Sat Aug 25 2007 Christoph Wickert <cwickert at fedoraproject.org> - 0.4.2-3
 - Rebuild for BuildID feature
 
-* Sat Apr 28 2007 Christoph Wickert <fedora christoph-wickert de> - 0.4.2-2
+* Sat Apr 28 2007 Christoph Wickert <cwickert at fedoraproject.org> - 0.4.2-2
 - Rebuild for Xfce 4.4.1
 
-* Mon Jan 22 2007 Christoph Wickert <fedora christoph-wickert de> - 0.4.2-1
+* Mon Jan 22 2007 Christoph Wickert <cwickert at fedoraproject.org> - 0.4.2-1
 - Update to 0.4.2 on Xfce 4.4.
 
-* Fri Dec 22 2006 Christoph Wickert <fedora christoph-wickert de> - 0.4.1-1
+* Fri Dec 22 2006 Christoph Wickert <cwickert at fedoraproject.org> - 0.4.1-1
 - Update to 0.4.1.
 
-* Thu Oct 05 2006 Christoph Wickert <fedora christoph-wickert de> - 0.4.0-3
+* Thu Oct 05 2006 Christoph Wickert <cwickert at fedoraproject.org> - 0.4.0-3
 - Bump release for devel checkin.
 
-* Wed Sep 13 2006 Christoph Wickert <fedora christoph-wickert de> - 0.4.0-2
+* Wed Sep 13 2006 Christoph Wickert <cwickert at fedoraproject.org> - 0.4.0-2
 - Rebuild for XFCE 4.3.99.1.
 - BR perl(XML::Parser).
 
-* Mon Sep 04 2006 Christoph Wickert <fedora christoph-wickert de> - 0.4.0-1
+* Mon Sep 04 2006 Christoph Wickert <cwickert at fedoraproject.org> - 0.4.0-1
 - Update to 0.4.0 on XFCE 4.3.90.2.
 
-* Mon Sep 04 2006 Christoph Wickert <fedora christoph-wickert de> - 0.3.6-7
+* Mon Sep 04 2006 Christoph Wickert <cwickert at fedoraproject.org> - 0.3.6-7
 - Mass rebuild for Fedora Core 6.
 
 * Tue Apr 11 2006 Christoph Wickert <fedora wickert at arcor de> - 0.3.6-6



From cwickert at fedoraproject.org  Mon Jan 19 00:14:21 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Mon, 19 Jan 2009 00:14:21 +0000 (UTC)
Subject: rpms/xfce4-smartbookmark-plugin/devel
	xfce4-smartbookmark-plugin.spec, 1.9, 1.10
Message-ID: <20090119001421.712C2700F8@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/xfce4-smartbookmark-plugin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14837

Modified Files:
	xfce4-smartbookmark-plugin.spec 
Log Message:
* Sun Jan 18 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.4.2-7
- Rebuild for Xfce 4.6 (Beta 3)



Index: xfce4-smartbookmark-plugin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-smartbookmark-plugin/devel/xfce4-smartbookmark-plugin.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- xfce4-smartbookmark-plugin.spec	18 Feb 2008 23:59:27 -0000	1.9
+++ xfce4-smartbookmark-plugin.spec	19 Jan 2009 00:13:51 -0000	1.10
@@ -1,6 +1,6 @@
 Name:		xfce4-smartbookmark-plugin
 Version:	0.4.2
-Release:	6%{?dist}
+Release:	7%{?dist}
 Summary:	Smart bookmarks for the Xfce panel
 
 Group:		User Interface/Desktops
@@ -46,21 +46,24 @@
 %{_libdir}/xfce4/panel-plugins/*.desktop
 
 %changelog
+* Sun Jan 18 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.4.2-7
+- Rebuild for Xfce 4.6 (Beta 3)
+
 * Mon Feb 18 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.4.2-6
 - Autorebuild for GCC 4.3
 
-* Sat Aug 25 2007 Christoph Wickert <fedora christoph-wickert de> - 0.4.2-5
+* Sat Aug 25 2007 Christoph Wickert <cwickert at fedoraproject.org> - 0.4.2-5
 - Rebuild for BuildID feature
 - Update license tag
 
-* Sat Jun 09 2007 Christoph Wickert <fedora christoph-wickert de> - 0.4.2-4
+* Sat Jun 09 2007 Christoph Wickert <cwickert at fedoraproject.org> - 0.4.2-4
 - Multilib fix for desktop file (#228168).
 
-* Sat Apr 28 2007 Christoph Wickert <fedora christoph-wickert de> - 0.4.2-3
+* Sat Apr 28 2007 Christoph Wickert <cwickert at fedoraproject.org> - 0.4.2-3
 - Rebuild for Xfce 4.4.1
 
-* Mon Jan 22 2007 Christoph Wickert <fedora christoph-wickert de> - 0.4.2-2
+* Mon Jan 22 2007 Christoph Wickert <cwickert at fedoraproject.org> - 0.4.2-2
 - Rebuild for Xfce 4.4.
 
-* Sat Sep 23 2006 Christoph Wickert <fedora christoph-wickert de> - 0.4.2-1
+* Sat Sep 23 2006 Christoph Wickert <cwickert at fedoraproject.org> - 0.4.2-1
 - Initial Fedora Extras version.



From cwickert at fedoraproject.org  Mon Jan 19 00:17:33 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Mon, 19 Jan 2009 00:17:33 +0000 (UTC)
Subject: rpms/xfce4-time-out-plugin/devel xfce4-time-out-plugin.spec, 1.2,
	1.3
Message-ID: <20090119001733.BF0C3700F8@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/xfce4-time-out-plugin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15345

Modified Files:
	xfce4-time-out-plugin.spec 
Log Message:
* Sun Jan 18 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.1.1-2
- Rebuild for Xfce 4.6 (Beta 3)



Index: xfce4-time-out-plugin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-time-out-plugin/devel/xfce4-time-out-plugin.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xfce4-time-out-plugin.spec	7 Mar 2008 01:42:55 -0000	1.2
+++ xfce4-time-out-plugin.spec	19 Jan 2009 00:17:03 -0000	1.3
@@ -2,7 +2,7 @@
 
 Name:		xfce4-time-out-plugin
 Version:	0.1.1
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Xfce panel plugin for taking breaks from the computer
 
 Group:		User Interface/Desktops
@@ -20,12 +20,15 @@
 X minutes. During breaks it locks your screen. It optionally allows you to 
 postpone breaks for a certain time.
 
+
 %prep
 %setup -q
 
+
 %build
 %configure 
-make
+make %{?_smp_mflags}
+
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -34,15 +37,22 @@
 
 %post
 touch --no-create %{_datadir}/icons/hicolor || :
-%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+fi
+
 
 %postun
 touch --no-create %{_datadir}/icons/hicolor || :
-%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+fi
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog NEWS README THANKS TODO
@@ -51,6 +61,10 @@
 %{_datadir}/icons/hicolor/*/apps/%{name}.png
 %{_datadir}/icons/hicolor/scalable/apps/%{name}.svg
 
+
 %changelog
-* Sun Nov 25 2007 Christoph Wickert <fedora christoph-wickert de> - 0.1.1-1
+* Sun Jan 18 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.1.1-2
+- Rebuild for Xfce 4.6 (Beta 3)
+
+* Sun Nov 25 2007 Christoph Wickert <cwickert at fedoraproject.org> - 0.1.1-1
 - Initial Fedora package



From dchen at fedoraproject.org  Mon Jan 19 00:18:55 2009
From: dchen at fedoraproject.org (Ding-Yi Chen)
Date: Mon, 19 Jan 2009 00:18:55 +0000 (UTC)
Subject: rpms/tomoe/devel import.log, 1.1,
	1.2 tomoe-0.6.0-multiarch-conflict.patch, 1.1, 1.2 tomoe.spec,
	1.26, 1.27
Message-ID: <20090119001855.28532700F8@cvs1.fedora.phx.redhat.com>

Author: dchen

Update of /cvs/pkgs/rpms/tomoe/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15577/devel

Modified Files:
	import.log tomoe-0.6.0-multiarch-conflict.patch tomoe.spec 
Log Message:
[bug 343321] multiarch conflicts in tomoe


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/tomoe/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	17 Jan 2009 12:45:59 -0000	1.1
+++ import.log	19 Jan 2009 00:18:24 -0000	1.2
@@ -1 +1,2 @@
 tomoe-0_6_0-9_fc10:HEAD:tomoe-0.6.0-9.fc10.src.rpm:1232196134
+tomoe-0_6_0-10_fc10:HEAD:tomoe-0.6.0-10.fc10.src.rpm:1232324186

tomoe-0.6.0-multiarch-conflict.patch:

Index: tomoe-0.6.0-multiarch-conflict.patch
===================================================================
RCS file: /cvs/pkgs/rpms/tomoe/devel/tomoe-0.6.0-multiarch-conflict.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tomoe-0.6.0-multiarch-conflict.patch	17 Jan 2009 12:46:00 -0000	1.1
+++ tomoe-0.6.0-multiarch-conflict.patch	19 Jan 2009 00:18:24 -0000	1.2
@@ -1,17 +1,18 @@
 diff -up ./doc/reference/tomoe-docs.sgml.multiarch-conflict ./doc/reference/tomoe-docs.sgml
 --- ./doc/reference/tomoe-docs.sgml.multiarch-conflict	2007-04-10 17:24:20.000000000 +1000
-+++ ./doc/reference/tomoe-docs.sgml	2009-01-16 17:54:20.000000000 +1000
-@@ -41,6 +41,7 @@
++++ ./doc/reference/tomoe-docs.sgml	2009-01-19 09:57:04.000000000 +1000
+@@ -40,7 +40,7 @@
+     &tomoe-Writing;
    </chapter>
  
-   <index>
-+    <anchor id="index_page">
+-  <index>
++  <index id="index_page">
      <title>Index</title>
    </index>
  <!--
 diff -up ./lib/tomoe-char.c.multiarch-conflict ./lib/tomoe-char.c
 --- ./lib/tomoe-char.c.multiarch-conflict	2007-06-18 11:35:43.000000000 +1000
-+++ ./lib/tomoe-char.c	2009-01-16 17:53:58.000000000 +1000
++++ ./lib/tomoe-char.c	2009-01-16 17:55:11.000000000 +1000
 @@ -92,7 +92,7 @@ tomoe_char_class_init (TomoeCharClass *k
      spec = g_param_spec_int ("n_strokes",
                               N_("Number of strokes"),
@@ -23,7 +24,7 @@
  
 diff -up ./lib/tomoe-query.c.multiarch-conflict ./lib/tomoe-query.c
 --- ./lib/tomoe-query.c.multiarch-conflict	2007-06-07 17:04:20.000000000 +1000
-+++ ./lib/tomoe-query.c	2009-01-16 17:53:58.000000000 +1000
++++ ./lib/tomoe-query.c	2009-01-16 17:55:11.000000000 +1000
 @@ -95,7 +95,7 @@ tomoe_query_class_init (TomoeQueryClass 
                               N_("Minimum number of strokes"),
                               N_("Minimum number of strokes of searched "


Index: tomoe.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tomoe/devel/tomoe.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- tomoe.spec	17 Jan 2009 12:46:00 -0000	1.26
+++ tomoe.spec	19 Jan 2009 00:18:24 -0000	1.27
@@ -3,7 +3,7 @@
 
 Name:           tomoe
 Version:        0.6.0
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        Handwritten input system for Japanese and Chinese
 
 Group:          System Environment/Libraries
@@ -99,7 +99,7 @@
 %endif
 
 %changelog
-* Fri Jan 16 2009 Ding-Yi Chen <dchen at redhat.com> - 0.6.0-9
+* Mon Jan 19 2009 Ding-Yi Chen <dchen at redhat.com> - 0.6.0-10
 - Fix [Bug 343321] multiarch conflicts in tomoe.
   Maybe cause by bug in gtk-doc.
 - Also fix the errors from rpmlint:



From cwickert at fedoraproject.org  Mon Jan 19 00:20:29 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Mon, 19 Jan 2009 00:20:29 +0000 (UTC)
Subject: rpms/xfce4-timer-plugin/devel xfce4-timer-plugin.spec,1.11,1.12
Message-ID: <20090119002029.0272F700F8@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/xfce4-timer-plugin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15850

Modified Files:
	xfce4-timer-plugin.spec 
Log Message:
* Sun Jan 18 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.6.1-2
- Rebuild for Xfce 4.6 (Beta 3)



Index: xfce4-timer-plugin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-timer-plugin/devel/xfce4-timer-plugin.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- xfce4-timer-plugin.spec	27 Nov 2008 23:40:47 -0000	1.11
+++ xfce4-timer-plugin.spec	19 Jan 2009 00:19:58 -0000	1.12
@@ -1,6 +1,6 @@
 Name:		xfce4-timer-plugin
 Version:	0.6.1
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Timer for the Xfce panel
 
 Group:		User Interface/Desktops
@@ -45,6 +45,9 @@
 
 
 %changelog
+* Sun Jan 18 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.6.1-2
+- Rebuild for Xfce 4.6 (Beta 3)
+
 * Thu Nov 27 2008 Christoph Wickert <cwickert at fedoraproject.org> - 0.6.1-1
 - Update to 0.6.1
 - BR intltool



From dchen at fedoraproject.org  Mon Jan 19 00:21:09 2009
From: dchen at fedoraproject.org (Ding-Yi Chen)
Date: Mon, 19 Jan 2009 00:21:09 +0000 (UTC)
Subject: rpms/tomoe/F-10 import.log, 1.1,
	1.2 tomoe-0.6.0-multiarch-conflict.patch, 1.1, 1.2 tomoe.spec,
	1.24, 1.25
Message-ID: <20090119002109.58B3F700F8@cvs1.fedora.phx.redhat.com>

Author: dchen

Update of /cvs/pkgs/rpms/tomoe/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15997/F-10

Modified Files:
	import.log tomoe-0.6.0-multiarch-conflict.patch tomoe.spec 
Log Message:
[bug 343321] multiarch conflicts in tomoe


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/tomoe/F-10/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	17 Jan 2009 12:52:07 -0000	1.1
+++ import.log	19 Jan 2009 00:20:38 -0000	1.2
@@ -1 +1,2 @@
 tomoe-0_6_0-9_fc10:F-10:tomoe-0.6.0-9.fc10.src.rpm:1232196692
+tomoe-0_6_0-10_fc10:F-10:tomoe-0.6.0-10.fc10.src.rpm:1232324403

tomoe-0.6.0-multiarch-conflict.patch:

Index: tomoe-0.6.0-multiarch-conflict.patch
===================================================================
RCS file: /cvs/pkgs/rpms/tomoe/F-10/tomoe-0.6.0-multiarch-conflict.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tomoe-0.6.0-multiarch-conflict.patch	17 Jan 2009 12:52:07 -0000	1.1
+++ tomoe-0.6.0-multiarch-conflict.patch	19 Jan 2009 00:20:39 -0000	1.2
@@ -1,17 +1,18 @@
 diff -up ./doc/reference/tomoe-docs.sgml.multiarch-conflict ./doc/reference/tomoe-docs.sgml
 --- ./doc/reference/tomoe-docs.sgml.multiarch-conflict	2007-04-10 17:24:20.000000000 +1000
-+++ ./doc/reference/tomoe-docs.sgml	2009-01-16 17:54:20.000000000 +1000
-@@ -41,6 +41,7 @@
++++ ./doc/reference/tomoe-docs.sgml	2009-01-19 09:57:04.000000000 +1000
+@@ -40,7 +40,7 @@
+     &tomoe-Writing;
    </chapter>
  
-   <index>
-+    <anchor id="index_page">
+-  <index>
++  <index id="index_page">
      <title>Index</title>
    </index>
  <!--
 diff -up ./lib/tomoe-char.c.multiarch-conflict ./lib/tomoe-char.c
 --- ./lib/tomoe-char.c.multiarch-conflict	2007-06-18 11:35:43.000000000 +1000
-+++ ./lib/tomoe-char.c	2009-01-16 17:53:58.000000000 +1000
++++ ./lib/tomoe-char.c	2009-01-16 17:55:11.000000000 +1000
 @@ -92,7 +92,7 @@ tomoe_char_class_init (TomoeCharClass *k
      spec = g_param_spec_int ("n_strokes",
                               N_("Number of strokes"),
@@ -23,7 +24,7 @@
  
 diff -up ./lib/tomoe-query.c.multiarch-conflict ./lib/tomoe-query.c
 --- ./lib/tomoe-query.c.multiarch-conflict	2007-06-07 17:04:20.000000000 +1000
-+++ ./lib/tomoe-query.c	2009-01-16 17:53:58.000000000 +1000
++++ ./lib/tomoe-query.c	2009-01-16 17:55:11.000000000 +1000
 @@ -95,7 +95,7 @@ tomoe_query_class_init (TomoeQueryClass 
                               N_("Minimum number of strokes"),
                               N_("Minimum number of strokes of searched "


Index: tomoe.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tomoe/F-10/tomoe.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- tomoe.spec	17 Jan 2009 12:52:07 -0000	1.24
+++ tomoe.spec	19 Jan 2009 00:20:39 -0000	1.25
@@ -3,7 +3,7 @@
 
 Name:           tomoe
 Version:        0.6.0
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        Handwritten input system for Japanese and Chinese
 
 Group:          System Environment/Libraries
@@ -99,7 +99,7 @@
 %endif
 
 %changelog
-* Fri Jan 16 2009 Ding-Yi Chen <dchen at redhat.com> - 0.6.0-9
+* Mon Jan 19 2009 Ding-Yi Chen <dchen at redhat.com> - 0.6.0-10
 - Fix [Bug 343321] multiarch conflicts in tomoe.
   Maybe cause by bug in gtk-doc.
 - Also fix the errors from rpmlint:



From cwickert at fedoraproject.org  Mon Jan 19 00:23:36 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Mon, 19 Jan 2009 00:23:36 +0000 (UTC)
Subject: rpms/xfce4-verve-plugin/devel xfce4-verve-plugin.spec,1.9,1.10
Message-ID: <20090119002336.46B0B700F8@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/xfce4-verve-plugin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16426

Modified Files:
	xfce4-verve-plugin.spec 
Log Message:
* Sun Jan 18 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.3.6-2
- Rebuild for Xfce 4.6 (Beta 3)



Index: xfce4-verve-plugin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-verve-plugin/devel/xfce4-verve-plugin.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- xfce4-verve-plugin.spec	27 Nov 2008 23:37:56 -0000	1.9
+++ xfce4-verve-plugin.spec	19 Jan 2009 00:23:05 -0000	1.10
@@ -1,7 +1,7 @@
 Name:		xfce4-verve-plugin
 Version:	0.3.6
-Release:	1%{?dist}
-Summary:	A comfortable command line plugin for the Xfce panel
+Release:	2%{?dist}
+Summary:	Comfortable command line plugin for the Xfce panel
 
 Group:		User Interface/Desktops
 License:	GPLv2+
@@ -56,6 +56,9 @@
 %{_bindir}/verve-focus
 
 %changelog
+* Sun Jan 18 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.3.6-2
+- Rebuild for Xfce 4.6 (Beta 3)
+
 * Thu Nov 27 2008 Christoph Wickert <cwickert at fedoraproject.org> - 0.3.6-1
 - Update to 0.3.6
 - Remove "verve-plugin" provides because package name now matches upstream



From cwickert at fedoraproject.org  Mon Jan 19 00:25:34 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Mon, 19 Jan 2009 00:25:34 +0000 (UTC)
Subject: rpms/xfce4-volstatus-icon/devel xfce4-volstatus-icon.spec,1.3,1.4
Message-ID: <20090119002534.D0321700F8@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/xfce4-volstatus-icon/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16718

Modified Files:
	xfce4-volstatus-icon.spec 
Log Message:
* Sun Jan 18 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.1.0-4
- Rebuild for Xfce 4.6 (Beta 3)



Index: xfce4-volstatus-icon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-volstatus-icon/devel/xfce4-volstatus-icon.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xfce4-volstatus-icon.spec	19 Feb 2008 00:05:03 -0000	1.3
+++ xfce4-volstatus-icon.spec	19 Jan 2009 00:25:04 -0000	1.4
@@ -1,18 +1,18 @@
 Name:		xfce4-volstatus-icon
 Version:	0.1.0
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	System tray icon to easily eject removable devices
 
 Group:		User Interface/Desktops
 License:	GPLv2
-URL:		http://goodies.xfce.org/projects/applications/xfce4-volstatus-icon
+URL:		http://goodies.xfce.org/projects/applications/%{name}
 Source0:	http://goodies.xfce.org/releases/%{name}/%{name}-%{version}.tar.bz2
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	exo-devel >= 0.3.2, libxfcegui4-devel >= 4.4.0
 BuildRequires:	dbus-glib-devel >= 0.70 hal-devel >= 0.5.7.1
 BuildRequires:	gettext
-Requires:	xfce4-panel >= 4.4.0
+Requires:	xfce4-panel >= 4.4.0, hal
 
 %description
 Xfce4 Volstatus Icon is a system tray icon that allows you to easily eject 
@@ -40,12 +40,15 @@
 %{_bindir}/%{name}
 
 %changelog
+* Sun Jan 18 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.1.0-4
+- Rebuild for Xfce 4.6 (Beta 3)
+
 * Mon Feb 18 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.1.0-3
 - Autorebuild for GCC 4.3
 
-* Sat Aug 25 2007 Christoph Wickert <fedora christoph-wickert de> - 0.1.0-2
+* Sat Aug 25 2007 Christoph Wickert <cwickert at fedoraproject.org> - 0.1.0-2
 - Rebuild for BuildID feature and to fix SELinux issues on PPC32
 - Update license tag
 
-* Mon Jun 11 2007 Christoph Wickert <fedora christoph-wickert de> - 0.1.0-1
+* Mon Jun 11 2007 Christoph Wickert <cwickert at fedoraproject.org> - 0.1.0-1
 - Initial package.



From cwickert at fedoraproject.org  Mon Jan 19 00:27:57 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Mon, 19 Jan 2009 00:27:57 +0000 (UTC)
Subject: rpms/xfce4-wavelan-plugin/devel xfce4-wavelan-plugin.spec, 1.10,
	1.11
Message-ID: <20090119002757.DE26F700F8@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/xfce4-wavelan-plugin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17100

Modified Files:
	xfce4-wavelan-plugin.spec 
Log Message:
* Sun Jan 18 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.5.4-5
- Rebuild for Xfce 4.6 (Beta 3)



Index: xfce4-wavelan-plugin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-wavelan-plugin/devel/xfce4-wavelan-plugin.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- xfce4-wavelan-plugin.spec	19 Feb 2008 00:05:53 -0000	1.10
+++ xfce4-wavelan-plugin.spec	19 Jan 2009 00:27:27 -0000	1.11
@@ -1,6 +1,6 @@
 Name:		xfce4-wavelan-plugin
 Version:	0.5.4
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	WaveLAN plugin for the Xfce panel
 
 Group:		User Interface/Desktops
@@ -39,32 +39,35 @@
 %{_datadir}/xfce4/panel-plugins/*.desktop
 
 %changelog
+* Sun Jan 18 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.5.4-5
+- Rebuild for Xfce 4.6 (Beta 3)
+
 * Mon Feb 18 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.5.4-4
 - Autorebuild for GCC 4.3
 
-* Sat Aug 25 2007 Christoph Wickert <fedora christoph-wickert de> - 0.5.4-3
+* Sat Aug 25 2007 Christoph Wickert <cwickert at fedoraproject.org> - 0.5.4-3
 - Rebuild for BuildID feature 
 
-* Sat Apr 28 2007 Christoph Wickert <fedora christoph-wickert de> - 0.5.4-2
+* Sat Apr 28 2007 Christoph Wickert <cwickert at fedoraproject.org> - 0.5.4-2
 - Rebuild for Xfce 4.4.1
 
-* Sun Feb 25 2007 Christoph Wickert <fedora christoph-wickert de> - 0.5.4-1
+* Sun Feb 25 2007 Christoph Wickert <cwickert at fedoraproject.org> - 0.5.4-1
 - Update to 0.5.4.
 
-* Mon Jan 22 2007 Christoph Wickert <fedora christoph-wickert de> - 0.5.3-4
+* Mon Jan 22 2007 Christoph Wickert <cwickert at fedoraproject.org> - 0.5.3-4
 - Rebuild for Xfce 4.4.
 
-* Thu Oct 05 2006 Christoph Wickert <fedora christoph-wickert de> - 0.5.3-3
+* Thu Oct 05 2006 Christoph Wickert <cwickert at fedoraproject.org> - 0.5.3-3
 - Bump release for devel checkin.
 
-* Wed Sep 13 2006 Christoph Wickert <fedora christoph-wickert de> - 0.5.3-2
+* Wed Sep 13 2006 Christoph Wickert <cwickert at fedoraproject.org> - 0.5.3-2
 - Rebuild for XFCE 4.3.99.1.
 - BR perl(XML::Parser).
 
-* Wed Sep 13 2006 Christoph Wickert <fedora christoph-wickert de> - 0.5.3-1
+* Wed Sep 13 2006 Christoph Wickert <cwickert at fedoraproject.org> - 0.5.3-1
 - Update to 0.5.3 on XFCE 4.3.90.2.
 
-* Mon Sep 04 2006 Christoph Wickert <fedora christoph-wickert de> - 0.4.1-7
+* Mon Sep 04 2006 Christoph Wickert <cwickert at fedoraproject.org> - 0.4.1-7
 - Mass rebuild for Fedora Core 6.
 
 * Tue Apr 11 2006 Christoph Wickert <fedora wickert at arcor de> - 0.4.1-6



From dchen at fedoraproject.org  Mon Jan 19 00:29:30 2009
From: dchen at fedoraproject.org (Ding-Yi Chen)
Date: Mon, 19 Jan 2009 00:29:30 +0000 (UTC)
Subject: rpms/tomoe/F-9 import.log, 1.1,
	1.2 tomoe-0.6.0-multiarch-conflict.patch, 1.1, 1.2 tomoe.spec,
	1.23, 1.24
Message-ID: <20090119002930.AF850700F8@cvs1.fedora.phx.redhat.com>

Author: dchen

Update of /cvs/pkgs/rpms/tomoe/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17461/F-9

Modified Files:
	import.log tomoe-0.6.0-multiarch-conflict.patch tomoe.spec 
Log Message:
[bug 343321] multiarch conflicts in tomoe


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/tomoe/F-9/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	17 Jan 2009 12:54:07 -0000	1.1
+++ import.log	19 Jan 2009 00:29:00 -0000	1.2
@@ -1 +1,2 @@
 tomoe-0_6_0-9_fc10:F-9:tomoe-0.6.0-9.fc10.src.rpm:1232196797
+tomoe-0_6_0-10_fc10:F-9:tomoe-0.6.0-10.fc10.src.rpm:1232324907

tomoe-0.6.0-multiarch-conflict.patch:

Index: tomoe-0.6.0-multiarch-conflict.patch
===================================================================
RCS file: /cvs/pkgs/rpms/tomoe/F-9/tomoe-0.6.0-multiarch-conflict.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tomoe-0.6.0-multiarch-conflict.patch	17 Jan 2009 12:54:07 -0000	1.1
+++ tomoe-0.6.0-multiarch-conflict.patch	19 Jan 2009 00:29:00 -0000	1.2
@@ -1,17 +1,18 @@
 diff -up ./doc/reference/tomoe-docs.sgml.multiarch-conflict ./doc/reference/tomoe-docs.sgml
 --- ./doc/reference/tomoe-docs.sgml.multiarch-conflict	2007-04-10 17:24:20.000000000 +1000
-+++ ./doc/reference/tomoe-docs.sgml	2009-01-16 17:54:20.000000000 +1000
-@@ -41,6 +41,7 @@
++++ ./doc/reference/tomoe-docs.sgml	2009-01-19 09:57:04.000000000 +1000
+@@ -40,7 +40,7 @@
+     &tomoe-Writing;
    </chapter>
  
-   <index>
-+    <anchor id="index_page">
+-  <index>
++  <index id="index_page">
      <title>Index</title>
    </index>
  <!--
 diff -up ./lib/tomoe-char.c.multiarch-conflict ./lib/tomoe-char.c
 --- ./lib/tomoe-char.c.multiarch-conflict	2007-06-18 11:35:43.000000000 +1000
-+++ ./lib/tomoe-char.c	2009-01-16 17:53:58.000000000 +1000
++++ ./lib/tomoe-char.c	2009-01-16 17:55:11.000000000 +1000
 @@ -92,7 +92,7 @@ tomoe_char_class_init (TomoeCharClass *k
      spec = g_param_spec_int ("n_strokes",
                               N_("Number of strokes"),
@@ -23,7 +24,7 @@
  
 diff -up ./lib/tomoe-query.c.multiarch-conflict ./lib/tomoe-query.c
 --- ./lib/tomoe-query.c.multiarch-conflict	2007-06-07 17:04:20.000000000 +1000
-+++ ./lib/tomoe-query.c	2009-01-16 17:53:58.000000000 +1000
++++ ./lib/tomoe-query.c	2009-01-16 17:55:11.000000000 +1000
 @@ -95,7 +95,7 @@ tomoe_query_class_init (TomoeQueryClass 
                               N_("Minimum number of strokes"),
                               N_("Minimum number of strokes of searched "


Index: tomoe.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tomoe/F-9/tomoe.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- tomoe.spec	17 Jan 2009 12:54:07 -0000	1.23
+++ tomoe.spec	19 Jan 2009 00:29:00 -0000	1.24
@@ -3,7 +3,7 @@
 
 Name:           tomoe
 Version:        0.6.0
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        Handwritten input system for Japanese and Chinese
 
 Group:          System Environment/Libraries
@@ -99,7 +99,7 @@
 %endif
 
 %changelog
-* Fri Jan 16 2009 Ding-Yi Chen <dchen at redhat.com> - 0.6.0-9
+* Mon Jan 19 2009 Ding-Yi Chen <dchen at redhat.com> - 0.6.0-10
 - Fix [Bug 343321] multiarch conflicts in tomoe.
   Maybe cause by bug in gtk-doc.
 - Also fix the errors from rpmlint:



From cwickert at fedoraproject.org  Mon Jan 19 00:31:17 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Mon, 19 Jan 2009 00:31:17 +0000 (UTC)
Subject: rpms/xfce4-weather-plugin/devel xfce4-weather-plugin.spec, 1.13,
	1.14
Message-ID: <20090119003117.16ABA700F8@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/xfce4-weather-plugin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17776

Modified Files:
	xfce4-weather-plugin.spec 
Log Message:
* Sun Jan 18 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.6.2-4
- Rebuild for Xfce 4.6 (Beta 3)



Index: xfce4-weather-plugin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-weather-plugin/devel/xfce4-weather-plugin.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- xfce4-weather-plugin.spec	19 Feb 2008 00:06:49 -0000	1.13
+++ xfce4-weather-plugin.spec	19 Jan 2009 00:30:46 -0000	1.14
@@ -1,6 +1,6 @@
 Name:		xfce4-weather-plugin
 Version:	0.6.2
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	Weather plugin for the Xfce panel
 
 Group:		User Interface/Desktops
@@ -17,29 +17,40 @@
 A weather plugin for the Xfce panel. It shows the current temperature and 
 weather condition, using weather data provided by xoap.weather.com.
 
+
 %prep
 %setup -q
 
+
 %build
 %configure --disable-static
 make %{?_smp_mflags}
 
+
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 %find_lang %{name}
 
+
 %post
 touch --no-create %{_datadir}/icons/hicolor || :
-%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+fi
+
 
 %postun
 touch --no-create %{_datadir}/icons/hicolor || :
-%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+fi
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog README TODO
@@ -48,37 +59,41 @@
 %{_datadir}/icons/hicolor/48x48/apps/xfce4-weather.png
 %{_datadir}/xfce4/weather
 
+
 %changelog
+* Sun Jan 18 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.6.2-4
+- Rebuild for Xfce 4.6 (Beta 3)
+
 * Mon Feb 18 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.6.2-3
 - Autorebuild for GCC 4.3
 
-* Fri Dec 07 2007 Christoph Wickert <fedora christoph-wickert de> - 0.6.2-2
+* Fri Dec 07 2007 Christoph Wickert <cwickert at fedoraproject.org> - 0.6.2-2
 - Rebuild for Xfce 4.4.2
 
-* Mon Nov 19 2007 Christoph Wickert <fedora christoph-wickert de> - 0.6.2-1
+* Mon Nov 19 2007 Christoph Wickert <cwickert at fedoraproject.org> - 0.6.2-1
 - Update to 0.6.0 on Xfce 4.4.1
 
-* Mon Jan 22 2007 Christoph Wickert <fedora christoph-wickert de> - 0.6.0-1
+* Mon Jan 22 2007 Christoph Wickert <cwickert at fedoraproject.org> - 0.6.0-1
 - Update to 0.6.0 on Xfce 4.4.
 - Update gtk-icon-cache scriptlets.
 
-* Thu Oct 05 2006 Christoph Wickert <fedora christoph-wickert de> - 0.5.99.1-3
+* Thu Oct 05 2006 Christoph Wickert <cwickert at fedoraproject.org> - 0.5.99.1-3
 - Bump release for devel checkin.
 
-* Wed Sep 13 2006 Christoph Wickert <fedora christoph-wickert de> - 0.5.99.1-2
+* Wed Sep 13 2006 Christoph Wickert <cwickert at fedoraproject.org> - 0.5.99.1-2
 - Rebuild for XFCE 4.3.99.1.
 - BR perl(XML::Parser).
 
-* Wed Sep 13 2006 Christoph Wickert <fedora christoph-wickert de> - 0.5.99.1-1
+* Wed Sep 13 2006 Christoph Wickert <cwickert at fedoraproject.org> - 0.5.99.1-1
 - Update to 0.5.99.1.
 
-* Mon Sep 04 2006 Christoph Wickert <fedora christoph-wickert de> - 0.5.90.2-1
+* Mon Sep 04 2006 Christoph Wickert <cwickert at fedoraproject.org> - 0.5.90.2-1
 - Update to 0.5.90.2 on XFCE 4.3.90.2.
 
-* Mon Sep 04 2006 Christoph Wickert <fedora christoph-wickert de> - 0.4.9-7
+* Mon Sep 04 2006 Christoph Wickert <cwickert at fedoraproject.org> - 0.4.9-7
 - Mass rebuild for Fedora Core 6.
 
-* Sat Jul 29 2006 Christoph Wickert <fedora christoph-wickert de> - 0.4.9-6
+* Sat Jul 29 2006 Christoph Wickert <cwickert at fedoraproject.org> - 0.4.9-6
 - BuildRequire gettext (#193444)
 - Require xfce4-panel.
 



From cwickert at fedoraproject.org  Mon Jan 19 00:33:07 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Mon, 19 Jan 2009 00:33:07 +0000 (UTC)
Subject: rpms/xfce4-websearch-plugin/devel xfce4-websearch-plugin.spec, 1.14,
	1.15
Message-ID: <20090119003307.90ADB700F8@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/xfce4-websearch-plugin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18130

Modified Files:
	xfce4-websearch-plugin.spec 
Log Message:
* Sun Jan 18 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.1.1-0.9.20070428svn2704
- Rebuild for Xfce 4.6 (Beta 3)



Index: xfce4-websearch-plugin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-websearch-plugin/devel/xfce4-websearch-plugin.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- xfce4-websearch-plugin.spec	12 Aug 2008 13:39:48 -0000	1.14
+++ xfce4-websearch-plugin.spec	19 Jan 2009 00:32:37 -0000	1.15
@@ -1,6 +1,6 @@
 Name:		xfce4-websearch-plugin
 Version:	0.1.1
-Release:	0.8.20070428svn2704%{?dist}
+Release:	0.9.20070428svn2704%{?dist}
 Summary:	Websearch plugin from the XFCE panel
 
 Group:		User Interface/Desktops
@@ -47,34 +47,37 @@
 %{_libdir}/xfce4/panel-plugins/*.desktop
 
 %changelog
+* Sun Jan 18 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.1.1-0.9.20070428svn2704
+- Rebuild for Xfce 4.6 (Beta 3)
+
 * Tue Aug 12 2008 Jason L Tibbitts III <tibbs at math.uh.edu> - 0.1.1-0.8.20070428svn2704
 - Fix license tag.
 
 * Mon Feb 18 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.1.1-0.7.20070428svn2704
 - Autorebuild for GCC 4.3
 
-* Sat Jun 09 2007 Christoph Wickert <fedora christoph-wickert de> - 0.1.1-0.6.20070428svn2704
+* Sat Jun 09 2007 Christoph Wickert <cwickert at fedoraproject.org> - 0.1.1-0.6.20070428svn2704
 - Multilib fix for desktop file (#28168).
 
-* Sat Apr 28 2007 Christoph Wickert <fedora christoph-wickert de> - 0.1.1-0.5.20070428svn2704
+* Sat Apr 28 2007 Christoph Wickert <cwickert at fedoraproject.org> - 0.1.1-0.5.20070428svn2704
 - Update to svn release 2704 on Xfce 4.4.1
 
-* Tue Mar 20 2007 Christoph Wickert <fedora christoph-wickert de> - 0.1.1-0.4.20070128svn2458
+* Tue Mar 20 2007 Christoph Wickert <cwickert at fedoraproject.org> - 0.1.1-0.4.20070128svn2458
 - Update to svn release 2458.
 
-* Mon Jan 22 2007 Christoph Wickert <fedora christoph-wickert de> - 0.1.1-0.3.20060923svn
+* Mon Jan 22 2007 Christoph Wickert <cwickert at fedoraproject.org> - 0.1.1-0.3.20060923svn
 - Rebuild on Xfce 4.4.
 
-* Thu Oct 05 2006 Christoph Wickert <fedora christoph-wickert de> - 0.1.1-0.2.20060923svn
+* Thu Oct 05 2006 Christoph Wickert <cwickert at fedoraproject.org> - 0.1.1-0.2.20060923svn
 - Bump release for devel checkin.
 
-* Sat Sep 23 2006 Christoph Wickert <fedora christoph-wickert de> - 0.1.1-0.1.20060923svn
+* Sat Sep 23 2006 Christoph Wickert <cwickert at fedoraproject.org> - 0.1.1-0.1.20060923svn
 - Update to svn snapshot of Sep 23rd 2006 on Xfce 4.3.99.1.
 
-* Mon Sep 04 2006 Christoph Wickert <fedora christoph-wickert de> - 0.1.0-7
+* Mon Sep 04 2006 Christoph Wickert <cwickert at fedoraproject.org> - 0.1.0-7
 - Mass rebuild for Fedora Core 6.
 
-* Mon Sep 04 2006 Christoph Wickert <fedora christoph-wickert de> - 0.1.0-7
+* Mon Sep 04 2006 Christoph Wickert <cwickert at fedoraproject.org> - 0.1.0-7
 - Mass rebuild for Fedora Core 6.
 
 * Tue Apr 11 2006 Christoph Wickert <fedora wickert at arcor de> - 0.1.0-6



From cwickert at fedoraproject.org  Mon Jan 19 00:35:24 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Mon, 19 Jan 2009 00:35:24 +0000 (UTC)
Subject: rpms/xfce4-xfapplet-plugin/devel xfce4-xfapplet-plugin.spec, 1.8,
	1.9
Message-ID: <20090119003525.04EDE70141@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/xfce4-xfapplet-plugin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18524

Modified Files:
	xfce4-xfapplet-plugin.spec 
Log Message:
* Sun Jan 18 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.1.0-7
- Rebuild for Xfce 4.6 (Beta 3)



Index: xfce4-xfapplet-plugin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-xfapplet-plugin/devel/xfce4-xfapplet-plugin.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- xfce4-xfapplet-plugin.spec	2 Mar 2008 16:01:38 -0000	1.8
+++ xfce4-xfapplet-plugin.spec	19 Jan 2009 00:34:54 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           xfce4-xfapplet-plugin
 Version:        0.1.0
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        A plugin to use gnome-panel based applets inside the Xfce4 panel
 
 Group:          User Interface/Desktops
@@ -49,21 +49,24 @@
 
 
 %changelog
-* Sun Mar 02 2008 Christoph Wickert <fedora christoph-wickert de> - 0.1.0-6
+* Sun Jan 18 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.1.0-7
+- Rebuild for Xfce 4.6 (Beta 3)
+
+* Sun Mar 02 2008 Christoph Wickert <cwickert at fedoraproject.org> - 0.1.0-6
 - Require only gnome-panel instead of gnome-applets
 
 * Mon Feb 18 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.1.0-5
 - Autorebuild for GCC 4.3
 
-* Sat Aug 25 2007 Christoph Wickert <fedora christoph-wickert de> - 0.1.0-4
+* Sat Aug 25 2007 Christoph Wickert <cwickert at fedoraproject.org> - 0.1.0-4
 - Rebuild for BuildID feature
 - Update license tag
 
-* Sat Apr 28 2007 Christoph Wickert <fedora christoph-wickert de> - 0.1.0-3
+* Sat Apr 28 2007 Christoph Wickert <cwickert at fedoraproject.org> - 0.1.0-3
 - Rebuild for Xfce 4.4.1
 
-* Mon Jan 22 2007 Christoph Wickert <fedora christoph-wickert de> - 0.1.0-2
+* Mon Jan 22 2007 Christoph Wickert <cwickert at fedoraproject.org> - 0.1.0-2
 - Rebuild for Xfce 4.4.
 
-* Sat Sep 23 2006 Christoph Wickert <fedora christoph-wickert de> - 0.1.0-1
+* Sat Sep 23 2006 Christoph Wickert <cwickert at fedoraproject.org> - 0.1.0-1
 - Initial Fedora Extras version.



From cwickert at fedoraproject.org  Mon Jan 19 00:39:27 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Mon, 19 Jan 2009 00:39:27 +0000 (UTC)
Subject: rpms/xfce4-xkb-plugin/devel xfce4-xkb-plugin.spec,1.17,1.18
Message-ID: <20090119003928.00E10700F8@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/xfce4-xkb-plugin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19673

Modified Files:
	xfce4-xkb-plugin.spec 
Log Message:
* Sun Jan 18 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.5.2-2
- Rebuild for Xfce 4.6 (Beta 3)



Index: xfce4-xkb-plugin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-xkb-plugin/devel/xfce4-xkb-plugin.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- xfce4-xkb-plugin.spec	28 Nov 2008 00:50:10 -0000	1.17
+++ xfce4-xkb-plugin.spec	19 Jan 2009 00:38:57 -0000	1.18
@@ -1,6 +1,6 @@
 Name:		xfce4-xkb-plugin
 Version:	0.5.2
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	XKB layout switcher for the Xfce panel
 
 Group:		User Interface/Desktops
@@ -46,6 +46,9 @@
 %{_datadir}/xfce4/xkb/flags/*.svg
 
 %changelog
+* Sun Jan 18 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.5.2-2
+- Rebuild for Xfce 4.6 (Beta 3)
+
 * Thu Nov 27 2008 Christoph Wickert <cwickert at fedoraproject.org> - 0.5.2-1
 - Update to 0.5.2
 



From cweyl at fedoraproject.org  Mon Jan 19 01:22:38 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Mon, 19 Jan 2009 01:22:38 +0000 (UTC)
Subject: rpms/perl-MooseX-MultiInitArg/devel import.log, NONE,
	1.1 perl-MooseX-MultiInitArg.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090119012238.904F0700F8@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-MooseX-MultiInitArg/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25556/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-MooseX-MultiInitArg.spec 
Log Message:
initial import


--- NEW FILE import.log ---
perl-MooseX-MultiInitArg-0_01-2_fc10:HEAD:perl-MooseX-MultiInitArg-0.01-2.fc10.src.rpm:1232328119


--- NEW FILE perl-MooseX-MultiInitArg.spec ---
Name:       perl-MooseX-MultiInitArg 
Version:    0.01 
Release:    2%{?dist}
# lib/MooseX/MultiInitArg.pm -> GPL+ or Artistic
# lib/MooseX/MultiInitArg/Attribute.pm -> GPL+ or Artistic
# lib/MooseX/MultiInitArg/Trait.pm -> GPL+ or Artistic
License:    GPL+ or Artistic 
Group:      Development/Libraries
Summary:    Attributes with aliases for constructor arguments 
Source:     http://search.cpan.org/CPAN/authors/id/F/FR/FRODWITH/MooseX-MultiInitArg-%{version}.tar.gz 
Url:        http://search.cpan.org/dist/MooseX-MultiInitArg
BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
Requires:   perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
BuildArch:  noarch

BuildRequires: perl(Moose)
BuildRequires: perl(Test::More)
BuildRequires: perl(Test::Pod)


%description
If you've ever wanted to be able to call an attribute any number of
things while you're passing arguments to your object constructor, Now
You Can. This is an attribute metaclass / trait to allow easy new()-time
attribute aliasing.

%prep
%setup -q -n MooseX-MultiInitArg-%{version}

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

%install
rm -rf %{buildroot}

make pure_install PERL_INSTALL_ROOT=%{buildroot}
find %{buildroot} -type f -name .packlist -exec rm -f {} ';'
find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null ';'

%{_fixperms} %{buildroot}/*

%check
make test

%clean
rm -rf %{buildroot} 

%files
%defattr(-,root,root,-)
%doc Changes README 
%{perl_vendorlib}/*
%{_mandir}/man3/*.3*

%changelog
* Sun Jan 18 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.01-2
- update description

* Sat Jan 17 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.01-1
- update for submission

* Mon Jan 05 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.01-0
- initial RPM packaging
- generated with cpan2dist (CPANPLUS::Dist::RPM version 0.0.7)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-MooseX-MultiInitArg/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	18 Jan 2009 22:34:57 -0000	1.1
+++ .cvsignore	19 Jan 2009 01:22:08 -0000	1.2
@@ -0,0 +1 @@
+MooseX-MultiInitArg-0.01.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-MooseX-MultiInitArg/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	18 Jan 2009 22:34:57 -0000	1.1
+++ sources	19 Jan 2009 01:22:08 -0000	1.2
@@ -0,0 +1 @@
+064975c86717373bc9d512f18349b1bc  MooseX-MultiInitArg-0.01.tar.gz



From cweyl at fedoraproject.org  Mon Jan 19 01:23:23 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Mon, 19 Jan 2009 01:23:23 +0000 (UTC)
Subject: rpms/perl-MooseX-MultiInitArg/F-10 import.log, NONE,
	1.1 perl-MooseX-MultiInitArg.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090119012323.ECD6D700F8@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-MooseX-MultiInitArg/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25934/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-MooseX-MultiInitArg.spec 
Log Message:
initial import


--- NEW FILE import.log ---
perl-MooseX-MultiInitArg-0_01-2_fc10:F-10:perl-MooseX-MultiInitArg-0.01-2.fc10.src.rpm:1232328165


--- NEW FILE perl-MooseX-MultiInitArg.spec ---
Name:       perl-MooseX-MultiInitArg 
Version:    0.01 
Release:    2%{?dist}
# lib/MooseX/MultiInitArg.pm -> GPL+ or Artistic
# lib/MooseX/MultiInitArg/Attribute.pm -> GPL+ or Artistic
# lib/MooseX/MultiInitArg/Trait.pm -> GPL+ or Artistic
License:    GPL+ or Artistic 
Group:      Development/Libraries
Summary:    Attributes with aliases for constructor arguments 
Source:     http://search.cpan.org/CPAN/authors/id/F/FR/FRODWITH/MooseX-MultiInitArg-%{version}.tar.gz 
Url:        http://search.cpan.org/dist/MooseX-MultiInitArg
BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
Requires:   perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
BuildArch:  noarch

BuildRequires: perl(Moose)
BuildRequires: perl(Test::More)
BuildRequires: perl(Test::Pod)


%description
If you've ever wanted to be able to call an attribute any number of
things while you're passing arguments to your object constructor, Now
You Can. This is an attribute metaclass / trait to allow easy new()-time
attribute aliasing.

%prep
%setup -q -n MooseX-MultiInitArg-%{version}

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

%install
rm -rf %{buildroot}

make pure_install PERL_INSTALL_ROOT=%{buildroot}
find %{buildroot} -type f -name .packlist -exec rm -f {} ';'
find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null ';'

%{_fixperms} %{buildroot}/*

%check
make test

%clean
rm -rf %{buildroot} 

%files
%defattr(-,root,root,-)
%doc Changes README 
%{perl_vendorlib}/*
%{_mandir}/man3/*.3*

%changelog
* Sun Jan 18 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.01-2
- update description

* Sat Jan 17 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.01-1
- update for submission

* Mon Jan 05 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.01-0
- initial RPM packaging
- generated with cpan2dist (CPANPLUS::Dist::RPM version 0.0.7)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-MooseX-MultiInitArg/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	18 Jan 2009 22:34:57 -0000	1.1
+++ .cvsignore	19 Jan 2009 01:22:53 -0000	1.2
@@ -0,0 +1 @@
+MooseX-MultiInitArg-0.01.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-MooseX-MultiInitArg/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	18 Jan 2009 22:34:57 -0000	1.1
+++ sources	19 Jan 2009 01:22:53 -0000	1.2
@@ -0,0 +1 @@
+064975c86717373bc9d512f18349b1bc  MooseX-MultiInitArg-0.01.tar.gz



From cweyl at fedoraproject.org  Mon Jan 19 01:24:10 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Mon, 19 Jan 2009 01:24:10 +0000 (UTC)
Subject: rpms/perl-MooseX-MultiInitArg/F-9 import.log, NONE,
	1.1 perl-MooseX-MultiInitArg.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090119012410.25775700F8@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-MooseX-MultiInitArg/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26287/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-MooseX-MultiInitArg.spec 
Log Message:
initial import


--- NEW FILE import.log ---
perl-MooseX-MultiInitArg-0_01-2_fc10:F-9:perl-MooseX-MultiInitArg-0.01-2.fc10.src.rpm:1232328211


--- NEW FILE perl-MooseX-MultiInitArg.spec ---
Name:       perl-MooseX-MultiInitArg 
Version:    0.01 
Release:    2%{?dist}
# lib/MooseX/MultiInitArg.pm -> GPL+ or Artistic
# lib/MooseX/MultiInitArg/Attribute.pm -> GPL+ or Artistic
# lib/MooseX/MultiInitArg/Trait.pm -> GPL+ or Artistic
License:    GPL+ or Artistic 
Group:      Development/Libraries
Summary:    Attributes with aliases for constructor arguments 
Source:     http://search.cpan.org/CPAN/authors/id/F/FR/FRODWITH/MooseX-MultiInitArg-%{version}.tar.gz 
Url:        http://search.cpan.org/dist/MooseX-MultiInitArg
BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
Requires:   perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
BuildArch:  noarch

BuildRequires: perl(Moose)
BuildRequires: perl(Test::More)
BuildRequires: perl(Test::Pod)


%description
If you've ever wanted to be able to call an attribute any number of
things while you're passing arguments to your object constructor, Now
You Can. This is an attribute metaclass / trait to allow easy new()-time
attribute aliasing.

%prep
%setup -q -n MooseX-MultiInitArg-%{version}

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

%install
rm -rf %{buildroot}

make pure_install PERL_INSTALL_ROOT=%{buildroot}
find %{buildroot} -type f -name .packlist -exec rm -f {} ';'
find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null ';'

%{_fixperms} %{buildroot}/*

%check
make test

%clean
rm -rf %{buildroot} 

%files
%defattr(-,root,root,-)
%doc Changes README 
%{perl_vendorlib}/*
%{_mandir}/man3/*.3*

%changelog
* Sun Jan 18 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.01-2
- update description

* Sat Jan 17 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.01-1
- update for submission

* Mon Jan 05 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.01-0
- initial RPM packaging
- generated with cpan2dist (CPANPLUS::Dist::RPM version 0.0.7)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-MooseX-MultiInitArg/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	18 Jan 2009 22:34:57 -0000	1.1
+++ .cvsignore	19 Jan 2009 01:23:39 -0000	1.2
@@ -0,0 +1 @@
+MooseX-MultiInitArg-0.01.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-MooseX-MultiInitArg/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	18 Jan 2009 22:34:57 -0000	1.1
+++ sources	19 Jan 2009 01:23:39 -0000	1.2
@@ -0,0 +1 @@
+064975c86717373bc9d512f18349b1bc  MooseX-MultiInitArg-0.01.tar.gz



From cchance at fedoraproject.org  Mon Jan 19 01:32:27 2009
From: cchance at fedoraproject.org (Caius Chance)
Date: Mon, 19 Jan 2009 01:32:27 +0000 (UTC)
Subject: rpms/cjkunifonts/devel cjkunifonts.spec,1.30,1.31
Message-ID: <20090119013227.57158700F8@cvs1.fedora.phx.redhat.com>

Author: cchance

Update of /cvs/pkgs/rpms/cjkunifonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27488

Modified Files:
	cjkunifonts.spec 
Log Message:
* Mon Jan 19 2009 Caius Chance <cchance at redhat.com> - 0.2.20080216.1-14.fc11
- Resolves: rhbz#477373
- Used _fontdir macro instead of self-definition.
- Created common subpackage for common files.
- Created compat subpackage for uming backward compatibility.
- Refined descriptions.



Index: cjkunifonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cjkunifonts/devel/cjkunifonts.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- cjkunifonts.spec	14 Jan 2009 04:47:38 -0000	1.30
+++ cjkunifonts.spec	19 Jan 2009 01:31:56 -0000	1.31
@@ -1,10 +1,9 @@
 %define fontname cjkunifonts
 %define common_desc \
-Chinese Unicode TrueType fonts derived from original fonts made available by \
-Arphic Technology under "Arphic Public License" and extended by the CJK \
-Unifonts project.
+CJK Unifonts are Unicode TrueType fonts derived from original fonts made \
+available by Arphic Technology under "Arphic Public License" and extended by \
+the CJK Unifonts project.
 
-%define fontdir         %{_datadir}/fonts/%{name}
 %define gsdir           %{_datadir}/ghostscript/conf.d
 %define catalogue       %{_sysconfdir}/X11/fontpath.d
 
@@ -13,7 +12,7 @@
 
 Name:        %{fontname}
 Version:     0.2.20080216.1
-Release:     13%{?dist}
+Release:     14%{?dist}
 Summary:     Chinese Unicode TrueType fonts in Ming and Kai face.
 License:     Arphic
 Group:       User Interface/X
@@ -40,7 +39,7 @@
 Summary:      Chinese Unicode TrueType font in Ming face.
 License:      Arphic
 Group:        User Interface/X
-Requires:     fontpackages-filesystem
+Requires:     fontpackages-filesystem, %{name}-common = %{version}-%{release}
 Conflicts:    fonts-chinese <= 3.03-9.fc8
 Obsoletes:    fonts-chinese < 3.03-13
 Obsoletes:    ttfonts-zh_CN <= 2.14-10, ttfonts-zh_TW <= 2.11-28
@@ -48,8 +47,7 @@
 %description uming
 %common_desc
 
-Ming face Chinese Unicode TrueType font derived from the original fonts \
-released by Arphic Technology and extended by the CJK Unifonts project.
+CJK Unifonts in Ming face.
 
 %_font_pkg -n uming -f *-ttf-arphic-uming*.conf uming.ttc
 
@@ -64,23 +62,12 @@
 %doc ../%{umingbuilddir}/NEWS
 %doc ../%{umingbuilddir}/README
 %doc ../%{umingbuilddir}/TODO
-%{gsdir}/FAPIcidfmap.zh_TW
-%{gsdir}/FAPIcidfmap.zh_CN
-%{gsdir}/cidfmap.zh_TW
-%{gsdir}/cidfmap.zh_CN
-%{gsdir}/CIDFnmap.zh_TW
-%{gsdir}/CIDFnmap.zh_CN
-%verify(not md5 size mtime) %{fontdir}/fonts.dir
-%verify(not md5 size mtime) %{fontdir}/fonts.scale
-%verify(not md5 size mtime) %{_datadir}/fonts/zh_CN/TrueType/zysong.ttf
-%verify(not md5 size mtime) %{_datadir}/fonts/zh_TW/TrueType/bsmi00lp.ttf
-%{catalogue}/%{name}
 
 %package ukai
 Summary:      Chinese Unicode TrueType font in Kai face.
 License:      Arphic
 Group:        User Interface/X
-Requires:     fontpackages-filesystem
+Requires:     fontpackages-filesystem, %{name}-common = %{version}-%{release}
 Conflicts:    fonts-chinese <= 3.03-9.fc8
 Obsoletes:    fonts-chinese < 3.03-13
 Obsoletes:    ttfonts-zh_CN <= 2.14-10, ttfonts-zh_TW <= 2.11-28
@@ -88,8 +75,7 @@
 %description ukai
 %common_desc
 
-Kai face Chinese Unicode TrueType font derived from the original fonts \
-released by Arphic Technology and extended by the CJK Unifonts project.
+CJK Unifonts in Kai face.
 
 %_font_pkg -n ukai -f *-ttf-arphic-ukai*.conf ukai.ttc
 
@@ -104,16 +90,52 @@
 %doc ../%{ukaibuilddir}/NEWS
 %doc ../%{ukaibuilddir}/README
 %doc ../%{ukaibuilddir}/TODO
+
+%package common
+Summary:      Chinese Unicode TrueType font common files.
+License:      Arphic
+Group:        User Interface/X
+Requires:     fontpackages-filesystem
+Conflicts:    fonts-chinese <= 3.03-9.fc8
+Obsoletes:    fonts-chinese < 3.03-13
+Obsoletes:    ttfonts-zh_CN <= 2.14-10, ttfonts-zh_TW <= 2.11-28
+
+%description common
+%common_desc
+
+CJK Unifonts common files.
+
+%files common
+%defattr(0644,root,root,0755)
 %{gsdir}/FAPIcidfmap.zh_TW
 %{gsdir}/FAPIcidfmap.zh_CN
 %{gsdir}/cidfmap.zh_TW
 %{gsdir}/cidfmap.zh_CN
 %{gsdir}/CIDFnmap.zh_TW
 %{gsdir}/CIDFnmap.zh_CN
-%verify(not md5 size mtime) %{fontdir}/fonts.dir
-%verify(not md5 size mtime) %{fontdir}/fonts.scale
+%verify(not md5 size mtime) %{_fontdir}/fonts.dir
+%verify(not md5 size mtime) %{_fontdir}/fonts.scale
 %{catalogue}/%{name}
 
+%package compat
+Summary:      Chinese Unicode TrueType font compatibility files.
+License:      Arphic
+Group:        User Interface/X
+Requires:     fontpackages-filesystem, %{name}-uming = %{version}-%{relsease}
+Conflicts:    fonts-chinese <= 3.03-9.fc8
+Obsoletes:    fonts-chinese < 3.03-13
+Obsoletes:    ttfonts-zh_CN <= 2.14-10, ttfonts-zh_TW <= 2.11-28
+
+%description compat
+%common_desc
+
+CJK Unifonts compatibility files.
+
+%files compat
+%defattr(0644,root,root,0755)
+%verify(not md5 size mtime) %{_datadir}/fonts/zh_CN/TrueType/zysong.ttf
+%verify(not md5 size mtime) %{_datadir}/fonts/zh_TW/TrueType/bsmi00lp.ttf
+
 %prep
 %setup -q -c -T -a1 -n %{umingbuilddir}
 %patch1 -p1 -b .1-rhbz466667
@@ -126,14 +148,14 @@
 %__rm -rf %{buildroot}
 
 # *.ttc(ttf)
-%__install -m 0755 -d %{buildroot}%{fontdir}
-%__install -m 0644 ../%{umingbuilddir}/uming.ttc %{buildroot}%{fontdir}/
-%__install -m 0644 ../%{ukaibuilddir}/ukai.ttc %{buildroot}%{fontdir}/
+%__install -m 0755 -d %{buildroot}%{_fontdir}
+%__install -m 0644 ../%{umingbuilddir}/uming.ttc %{buildroot}%{_fontdir}/
+%__install -m 0644 ../%{ukaibuilddir}/ukai.ttc %{buildroot}%{_fontdir}/
 
 # fonts.{scale,dir}
-%{_bindir}/ttmkfdir -d %{buildroot}%{fontdir} \
-    -o %{buildroot}%{fontdir}/fonts.scale
-%{_bindir}/mkfontdir %{buildroot}%{fontdir}
+%{_bindir}/ttmkfdir -d %{buildroot}%{_fontdir} \
+    -o %{buildroot}%{_fontdir}/fonts.scale
+%{_bindir}/mkfontdir %{buildroot}%{_fontdir}
 
 # *.conf
 %__install -m 0755 -d %{buildroot}%{_fontconfig_templatedir}
@@ -154,14 +176,6 @@
 done
 cd -
 
-# backward compat to obsoleted ttf
-%__install -m 0755 -d %{buildroot}%{_datadir}/fonts/zh_CN/TrueType
-%__install -m 0755 -d %{buildroot}%{_datadir}/fonts/zh_TW/TrueType
-%__ln_s ../../%{name}/uming.ttc \
-    %{buildroot}%{_datadir}/fonts/zh_CN/TrueType/zysong.ttf
-%__ln_s ../../%{name}/uming.ttc \
-    %{buildroot}%{_datadir}/fonts/zh_TW/TrueType/bsmi00lp.ttf
-
 # ghostscript
 %__install -m 0755 -d %{buildroot}%{gsdir}
 %__install -m 0644 %{SOURCE3} %{buildroot}%{gsdir}/
@@ -173,12 +187,27 @@
 
 # catalogue
 %__install -m 0755 -d %{buildroot}%{catalogue}
-%__ln_s %{fontdir} %{buildroot}%{catalogue}/%{name}
+%__ln_s %{_fontdir} %{buildroot}%{catalogue}/%{name}
+
+# backward compat to obsoleted ttf
+%__install -m 0755 -d %{buildroot}%{_datadir}/fonts/zh_CN/TrueType
+%__install -m 0755 -d %{buildroot}%{_datadir}/fonts/zh_TW/TrueType
+%__ln_s ../../%{name}/uming.ttc \
+    %{buildroot}%{_datadir}/fonts/zh_CN/TrueType/zysong.ttf
+%__ln_s ../../%{name}/uming.ttc \
+    %{buildroot}%{_datadir}/fonts/zh_TW/TrueType/bsmi00lp.ttf
 
 %clean
 %__rm -fr ${buildroot}
 
 %changelog
+* Mon Jan 19 2009 Caius Chance <cchance at redhat.com> - 0.2.20080216.1-14.fc11
+- Resolves: rhbz#477373
+- Used _fontdir macro instead of self-definition.
+- Created common subpackage for common files.
+- Created compat subpackage for uming backward compatibility.
+- Refined descriptions.
+
 * Wed Jan 14 2009 Caius Chance <cchance at redhat.com> - 0.2.20080216.1-13.fc11
 - Resolves: rhbz#477373
 - Included _font_pkg macro to conform new font packaging guidelines.



From cchance at fedoraproject.org  Mon Jan 19 02:30:22 2009
From: cchance at fedoraproject.org (Caius Chance)
Date: Mon, 19 Jan 2009 02:30:22 +0000 (UTC)
Subject: rpms/cjkunifonts/devel cjkunifonts.spec,1.31,1.32
Message-ID: <20090119023022.E059B700F8@cvs1.fedora.phx.redhat.com>

Author: cchance

Update of /cvs/pkgs/rpms/cjkunifonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2599

Modified Files:
	cjkunifonts.spec 
Log Message:
* Mon Jan 19 2009 Caius Chance <cchance at redhat.com> - 0.2.20080216.1-15.fc11
- Resolves: rhbz#477373
- Updated font renaming for post-1.13 fontpackages.




Index: cjkunifonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cjkunifonts/devel/cjkunifonts.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- cjkunifonts.spec	19 Jan 2009 01:31:56 -0000	1.31
+++ cjkunifonts.spec	19 Jan 2009 02:29:52 -0000	1.32
@@ -1,4 +1,4 @@
-%define fontname cjkunifonts
+%define fontname cjkuni
 %define common_desc \
 CJK Unifonts are Unicode TrueType fonts derived from original fonts made \
 available by Arphic Technology under "Arphic Public License" and extended by \
@@ -10,9 +10,9 @@
 %define umingbuilddir   %{name}-uming-%{version}
 %define ukaibuilddir    %{name}-ukai-%{version}
 
-Name:        %{fontname}
+Name:        %{fontname}-fonts
 Version:     0.2.20080216.1
-Release:     14%{?dist}
+Release:     15%{?dist}
 Summary:     Chinese Unicode TrueType fonts in Ming and Kai face.
 License:     Arphic
 Group:       User Interface/X
@@ -35,16 +35,18 @@
 %description
 %common_desc
 
-%package uming
+%package -n %{fontname}-uming-fonts
 Summary:      Chinese Unicode TrueType font in Ming face.
 License:      Arphic
 Group:        User Interface/X
-Requires:     fontpackages-filesystem, %{name}-common = %{version}-%{release}
+Requires:     fontpackages-filesystem
+Requires:     %{fontname}-common-fonts = %{version}-%{release}
 Conflicts:    fonts-chinese <= 3.03-9.fc8
 Obsoletes:    fonts-chinese < 3.03-13
 Obsoletes:    ttfonts-zh_CN <= 2.14-10, ttfonts-zh_TW <= 2.11-28
+Obsoletes:    %{name}-uming < %{version}-%{release}
 
-%description uming
+%description -n %{fontname}-uming-fonts
 %common_desc
 
 CJK Unifonts in Ming face.
@@ -63,16 +65,18 @@
 %doc ../%{umingbuilddir}/README
 %doc ../%{umingbuilddir}/TODO
 
-%package ukai
+%package -n %{fontname}-ukai-fonts
 Summary:      Chinese Unicode TrueType font in Kai face.
 License:      Arphic
 Group:        User Interface/X
-Requires:     fontpackages-filesystem, %{name}-common = %{version}-%{release}
+Requires:     fontpackages-filesystem
+Requires:     %{fontname}-common-fonts = %{version}-%{release}
 Conflicts:    fonts-chinese <= 3.03-9.fc8
 Obsoletes:    fonts-chinese < 3.03-13
 Obsoletes:    ttfonts-zh_CN <= 2.14-10, ttfonts-zh_TW <= 2.11-28
+Obsoletes:    %{name}-ukai < %{version}-%{release}
 
-%description ukai
+%description -n %{fontname}-ukai-fonts
 %common_desc
 
 CJK Unifonts in Kai face.
@@ -91,7 +95,7 @@
 %doc ../%{ukaibuilddir}/README
 %doc ../%{ukaibuilddir}/TODO
 
-%package common
+%package -n %{fontname}-common-fonts
 Summary:      Chinese Unicode TrueType font common files.
 License:      Arphic
 Group:        User Interface/X
@@ -99,13 +103,14 @@
 Conflicts:    fonts-chinese <= 3.03-9.fc8
 Obsoletes:    fonts-chinese < 3.03-13
 Obsoletes:    ttfonts-zh_CN <= 2.14-10, ttfonts-zh_TW <= 2.11-28
+Obsoletes:    %{name}-common < %{version}-%{release}
 
-%description common
+%description -n %{fontname}-common-fonts
 %common_desc
 
 CJK Unifonts common files.
 
-%files common
+%files -n %{fontname}-common-fonts
 %defattr(0644,root,root,0755)
 %{gsdir}/FAPIcidfmap.zh_TW
 %{gsdir}/FAPIcidfmap.zh_CN
@@ -117,21 +122,23 @@
 %verify(not md5 size mtime) %{_fontdir}/fonts.scale
 %{catalogue}/%{name}
 
-%package compat
+%package -n %{fontname}-compat-fonts
 Summary:      Chinese Unicode TrueType font compatibility files.
 License:      Arphic
 Group:        User Interface/X
-Requires:     fontpackages-filesystem, %{name}-uming = %{version}-%{relsease}
+Requires:     fontpackages-filesystem
+Requires:     %{fontname}-uming-fonts = %{version}-%{relsease}
 Conflicts:    fonts-chinese <= 3.03-9.fc8
 Obsoletes:    fonts-chinese < 3.03-13
 Obsoletes:    ttfonts-zh_CN <= 2.14-10, ttfonts-zh_TW <= 2.11-28
+Obsoletes:    %{name}-compat < %{version}-%{release}
 
-%description compat
+%description -n %{fontname}-compat-fonts
 %common_desc
 
 CJK Unifonts compatibility files.
 
-%files compat
+%files -n %{fontname}-compat-fonts
 %defattr(0644,root,root,0755)
 %verify(not md5 size mtime) %{_datadir}/fonts/zh_CN/TrueType/zysong.ttf
 %verify(not md5 size mtime) %{_datadir}/fonts/zh_TW/TrueType/bsmi00lp.ttf
@@ -201,6 +208,10 @@
 %__rm -fr ${buildroot}
 
 %changelog
+* Mon Jan 19 2009 Caius Chance <cchance at redhat.com> - 0.2.20080216.1-15.fc11
+- Resolves: rhbz#477373
+- Updated font renaming for post-1.13 fontpackages.
+
 * Mon Jan 19 2009 Caius Chance <cchance at redhat.com> - 0.2.20080216.1-14.fc11
 - Resolves: rhbz#477373
 - Used _fontdir macro instead of self-definition.



From tmz at fedoraproject.org  Mon Jan 19 03:30:56 2009
From: tmz at fedoraproject.org (Todd M. Zullinger)
Date: Mon, 19 Jan 2009 03:30:56 +0000 (UTC)
Subject: rpms/gtkpod/F-10 gtkpod-0.99.12-tooltips.patch, NONE,
	1.1 gtkpod.spec, 1.7, 1.8
Message-ID: <20090119033056.9BDB3700F8@cvs1.fedora.phx.redhat.com>

Author: tmz

Update of /cvs/pkgs/rpms/gtkpod/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10910/F-10

Modified Files:
	gtkpod.spec 
Added Files:
	gtkpod-0.99.12-tooltips.patch 
Log Message:
Apply upstream fix for disappearing tooltips (#428940)

gtkpod-0.99.12-tooltips.patch:

--- NEW FILE gtkpod-0.99.12-tooltips.patch ---
commit fcda7e67c5e6445186257b53965ccc8a45bce444
Author: Jorg Schuler <jcsjcs at users.sourceforge.net>
Date:   Sat Jan 17 10:54:46 2009 +0000

    	* src/file_convert.c (conversion_log_set_status): don't change tab
    	  label text in conversion log window unless actually
    	  necessary. Fixes the "disappearing tooltips" problem (tracker
    	  #1906016).

diff --git a/src/file_convert.c b/src/file_convert.c
index c17a33f..027e773 100644
--- a/src/file_convert.c
+++ b/src/file_convert.c
@@ -566,19 +566,28 @@ static void conversion_log_set_status (Conversion *conv)
     glthread = conv->threads;
     for (glpage=conv->pages; glpage; glpage=glpage->next)
     {
+	GtkNotebook *notebook = GTK_NOTEBOOK (conv->notebook);
 	GtkWidget *child = glpage->data;
+	const gchar *current_label;
 	g_return_if_fail (child);
 
+	current_label = gtk_notebook_get_tab_label_text (notebook, child);
+
 	/* in the beginning we may have more pages than thread entries */
 	if (glthread && glthread->data)
 	{
-	    gtk_notebook_set_tab_label_text (GTK_NOTEBOOK (conv->notebook),
-					     child, _("active"));
+	    if (!current_label || strcmp (current_label, _("active")) != 0)
+	    {   /* only change the label if it has changed --
+		   otherwise our tooltips will be switched off */
+		gtk_notebook_set_tab_label_text (notebook, child, _("active"));
+	    }
 	}
 	else
 	{
-	    gtk_notebook_set_tab_label_text (GTK_NOTEBOOK (conv->notebook),
-					     child, _("inactive"));
+	    if (!current_label || strcmp (current_label, _("inactive")) != 0)
+	    {
+		gtk_notebook_set_tab_label_text (notebook, child, _("inactive"));
+	    }
 	}
 
 	if (glthread)


Index: gtkpod.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtkpod/F-10/gtkpod.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- gtkpod.spec	10 Jun 2008 15:44:49 -0000	1.7
+++ gtkpod.spec	19 Jan 2009 03:30:25 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           gtkpod
 Version:        0.99.12
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Graphical song management program for Apple's iPod
 
 Group:          Applications/Multimedia
@@ -9,6 +9,8 @@
 Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 # https://bugzilla.redhat.com/449199
 Patch0:         gtkpod-0.99.12-use-xdg-open.patch
+# https://bugzilla.redhat.com/428940 (upstream patch)
+Patch1:         gtkpod-0.99.12-tooltips.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  curl-devel
@@ -39,6 +41,7 @@
 %prep
 %setup -q
 %patch0 -p1 -b .use-xdg-open
+%patch1 -p1 -b .tooltips
 
 
 %build
@@ -87,6 +90,9 @@
 
 
 %changelog
+* Sun Jan 18 2009 Todd Zullinger <tmz at pobox.com> - 0.99.12-4
+- Apply upstream fix for disappearing tooltips (#428940)
+
 * Tue Jun 10 2008 Todd Zullinger <tmz at pobox.com> - 0.99.12-3
 - use xdg-open as default player (#449199)
   (patch from Debarshi Ray)



From tmz at fedoraproject.org  Mon Jan 19 03:30:56 2009
From: tmz at fedoraproject.org (Todd M. Zullinger)
Date: Mon, 19 Jan 2009 03:30:56 +0000 (UTC)
Subject: rpms/gtkpod/devel gtkpod-0.99.12-tooltips.patch, NONE,
	1.1 gtkpod.spec, 1.8, 1.9
Message-ID: <20090119033056.BD7B170143@cvs1.fedora.phx.redhat.com>

Author: tmz

Update of /cvs/pkgs/rpms/gtkpod/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10910/devel

Modified Files:
	gtkpod.spec 
Added Files:
	gtkpod-0.99.12-tooltips.patch 
Log Message:
Apply upstream fix for disappearing tooltips (#428940)

gtkpod-0.99.12-tooltips.patch:

--- NEW FILE gtkpod-0.99.12-tooltips.patch ---
commit fcda7e67c5e6445186257b53965ccc8a45bce444
Author: Jorg Schuler <jcsjcs at users.sourceforge.net>
Date:   Sat Jan 17 10:54:46 2009 +0000

    	* src/file_convert.c (conversion_log_set_status): don't change tab
    	  label text in conversion log window unless actually
    	  necessary. Fixes the "disappearing tooltips" problem (tracker
    	  #1906016).

diff --git a/src/file_convert.c b/src/file_convert.c
index c17a33f..027e773 100644
--- a/src/file_convert.c
+++ b/src/file_convert.c
@@ -566,19 +566,28 @@ static void conversion_log_set_status (Conversion *conv)
     glthread = conv->threads;
     for (glpage=conv->pages; glpage; glpage=glpage->next)
     {
+	GtkNotebook *notebook = GTK_NOTEBOOK (conv->notebook);
 	GtkWidget *child = glpage->data;
+	const gchar *current_label;
 	g_return_if_fail (child);
 
+	current_label = gtk_notebook_get_tab_label_text (notebook, child);
+
 	/* in the beginning we may have more pages than thread entries */
 	if (glthread && glthread->data)
 	{
-	    gtk_notebook_set_tab_label_text (GTK_NOTEBOOK (conv->notebook),
-					     child, _("active"));
+	    if (!current_label || strcmp (current_label, _("active")) != 0)
+	    {   /* only change the label if it has changed --
+		   otherwise our tooltips will be switched off */
+		gtk_notebook_set_tab_label_text (notebook, child, _("active"));
+	    }
 	}
 	else
 	{
-	    gtk_notebook_set_tab_label_text (GTK_NOTEBOOK (conv->notebook),
-					     child, _("inactive"));
+	    if (!current_label || strcmp (current_label, _("inactive")) != 0)
+	    {
+		gtk_notebook_set_tab_label_text (notebook, child, _("inactive"));
+	    }
 	}
 
 	if (glthread)


Index: gtkpod.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtkpod/devel/gtkpod.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- gtkpod.spec	1 Dec 2008 15:00:29 -0000	1.8
+++ gtkpod.spec	19 Jan 2009 03:30:26 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           gtkpod
 Version:        0.99.12
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Graphical song management program for Apple's iPod
 
 Group:          Applications/Multimedia
@@ -9,6 +9,8 @@
 Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 # https://bugzilla.redhat.com/449199
 Patch0:         gtkpod-0.99.12-use-xdg-open.patch
+# https://bugzilla.redhat.com/428940 (upstream patch)
+Patch1:         gtkpod-0.99.12-tooltips.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  curl-devel
@@ -39,6 +41,7 @@
 %prep
 %setup -q
 %patch0 -p1 -b .use-xdg-open
+%patch1 -p1 -b .tooltips
 
 
 %build
@@ -87,6 +90,9 @@
 
 
 %changelog
+* Sat Jan 17 2009 Todd Zullinger <tmz at pobox.com> - 0.99.12-5
+- Apply upstream fix for disappearing tooltips (#428940)
+
 * Mon Dec 01 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 0.99.12-4
 - Rebuild for Python 2.6
 



From tmz at fedoraproject.org  Mon Jan 19 03:30:56 2009
From: tmz at fedoraproject.org (Todd M. Zullinger)
Date: Mon, 19 Jan 2009 03:30:56 +0000 (UTC)
Subject: rpms/gtkpod/F-9 gtkpod-0.99.12-tooltips.patch, NONE, 1.1 gtkpod.spec,
	1.5, 1.6
Message-ID: <20090119033056.A959670141@cvs1.fedora.phx.redhat.com>

Author: tmz

Update of /cvs/pkgs/rpms/gtkpod/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10910/F-9

Modified Files:
	gtkpod.spec 
Added Files:
	gtkpod-0.99.12-tooltips.patch 
Log Message:
Apply upstream fix for disappearing tooltips (#428940)

gtkpod-0.99.12-tooltips.patch:

--- NEW FILE gtkpod-0.99.12-tooltips.patch ---
commit fcda7e67c5e6445186257b53965ccc8a45bce444
Author: Jorg Schuler <jcsjcs at users.sourceforge.net>
Date:   Sat Jan 17 10:54:46 2009 +0000

    	* src/file_convert.c (conversion_log_set_status): don't change tab
    	  label text in conversion log window unless actually
    	  necessary. Fixes the "disappearing tooltips" problem (tracker
    	  #1906016).

diff --git a/src/file_convert.c b/src/file_convert.c
index c17a33f..027e773 100644
--- a/src/file_convert.c
+++ b/src/file_convert.c
@@ -566,19 +566,28 @@ static void conversion_log_set_status (Conversion *conv)
     glthread = conv->threads;
     for (glpage=conv->pages; glpage; glpage=glpage->next)
     {
+	GtkNotebook *notebook = GTK_NOTEBOOK (conv->notebook);
 	GtkWidget *child = glpage->data;
+	const gchar *current_label;
 	g_return_if_fail (child);
 
+	current_label = gtk_notebook_get_tab_label_text (notebook, child);
+
 	/* in the beginning we may have more pages than thread entries */
 	if (glthread && glthread->data)
 	{
-	    gtk_notebook_set_tab_label_text (GTK_NOTEBOOK (conv->notebook),
-					     child, _("active"));
+	    if (!current_label || strcmp (current_label, _("active")) != 0)
+	    {   /* only change the label if it has changed --
+		   otherwise our tooltips will be switched off */
+		gtk_notebook_set_tab_label_text (notebook, child, _("active"));
+	    }
 	}
 	else
 	{
-	    gtk_notebook_set_tab_label_text (GTK_NOTEBOOK (conv->notebook),
-					     child, _("inactive"));
+	    if (!current_label || strcmp (current_label, _("inactive")) != 0)
+	    {
+		gtk_notebook_set_tab_label_text (notebook, child, _("inactive"));
+	    }
 	}
 
 	if (glthread)


Index: gtkpod.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtkpod/F-9/gtkpod.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- gtkpod.spec	12 Feb 2008 08:36:39 -0000	1.5
+++ gtkpod.spec	19 Jan 2009 03:30:26 -0000	1.6
@@ -1,12 +1,14 @@
 Name:           gtkpod
 Version:        0.99.12
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Graphical song management program for Apple's iPod
 
 Group:          Applications/Multimedia
 License:        GPLv2+
 URL:            http://www.gtkpod.org
 Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
+# https://bugzilla.redhat.com/428940 (upstream patch)
+Patch0:         gtkpod-0.99.12-tooltips.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  curl-devel
@@ -35,6 +37,7 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .tooltips
 
 
 %build
@@ -83,6 +86,9 @@
 
 
 %changelog
+* Sun Jan 18 2009 Todd Zullinger <tmz at pobox.com> - 0.99.12-3
+- Apply upstream fix for disappearing tooltips (#428940)
+
 * Tue Feb 12 2008 Todd Zullinger <tmz at pobox.com> - 0.99.12-2
 - rebuild for gcc 4.3
 



From jforbes at fedoraproject.org  Mon Jan 19 04:03:49 2009
From: jforbes at fedoraproject.org (Justin M. Forbes)
Date: Mon, 19 Jan 2009 04:03:49 +0000 (UTC)
Subject: rpms/python-epdb/devel import.log, NONE, 1.1 python-epdb.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090119040349.F3E47700F8@cvs1.fedora.phx.redhat.com>

Author: jforbes

Update of /cvs/pkgs/rpms/python-epdb/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15210/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log python-epdb.spec 
Log Message:
Initial package import



--- NEW FILE import.log ---
python-epdb-0_11-1_fc10:HEAD:python-epdb-0.11-1.fc10.src.rpm:1232337714


--- NEW FILE python-epdb.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

Name:           python-epdb
Version:        0.11
Release:        1%{?dist}
Summary:        Extended Python debugger

Group:          Development/Debuggers
License:        MIT
URL:            ftp://download.rpath.com/pub/epdb/
Source0:        ftp://download.rpath.com/pub/epdb/epdb-%{version}.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch

BuildRequires:  python-devel

%description
epdb is an extended Python debugger.

%prep
%setup -q -n epdb-%{version}
sed -i 's,python2.4,python,g' Make.rules epdb/epdb.py


%build
make %{?_smp_mflags} sitedir=%{python_sitelib}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT sitedir=%{python_sitelib}


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc LICENSE NEWS
%{python_sitelib}/*



%changelog
* Fri Jan 16 2009 Justin M. Forbes <jmforbes at linuxtx.org> 0.11-1
- Initial package build.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-epdb/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	18 Jan 2009 22:33:53 -0000	1.1
+++ .cvsignore	19 Jan 2009 04:03:18 -0000	1.2
@@ -0,0 +1 @@
+epdb-0.11.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-epdb/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	18 Jan 2009 22:33:53 -0000	1.1
+++ sources	19 Jan 2009 04:03:18 -0000	1.2
@@ -0,0 +1 @@
+c21e11839ecaa3bbe28b99c886622ea8  epdb-0.11.tar.bz2



From jforbes at fedoraproject.org  Mon Jan 19 04:08:10 2009
From: jforbes at fedoraproject.org (Justin M. Forbes)
Date: Mon, 19 Jan 2009 04:08:10 +0000 (UTC)
Subject: rpms/python-epdb/F-9 import.log, NONE, 1.1 python-epdb.spec, NONE, 
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090119040810.6CB75700F8@cvs1.fedora.phx.redhat.com>

Author: jforbes

Update of /cvs/pkgs/rpms/python-epdb/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15919/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	import.log python-epdb.spec 
Log Message:
Initial F-9 import



--- NEW FILE import.log ---
python-epdb-0_11-1_fc10:F-9:python-epdb-0.11-1.fc10.src.rpm:1232337898


--- NEW FILE python-epdb.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

Name:           python-epdb
Version:        0.11
Release:        1%{?dist}
Summary:        Extended Python debugger

Group:          Development/Debuggers
License:        MIT
URL:            ftp://download.rpath.com/pub/epdb/
Source0:        ftp://download.rpath.com/pub/epdb/epdb-%{version}.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch

BuildRequires:  python-devel

%description
epdb is an extended Python debugger.

%prep
%setup -q -n epdb-%{version}
sed -i 's,python2.4,python,g' Make.rules epdb/epdb.py


%build
make %{?_smp_mflags} sitedir=%{python_sitelib}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT sitedir=%{python_sitelib}


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc LICENSE NEWS
%{python_sitelib}/*



%changelog
* Fri Jan 16 2009 Justin M. Forbes <jmforbes at linuxtx.org> 0.11-1
- Initial package build.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-epdb/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	18 Jan 2009 22:33:53 -0000	1.1
+++ .cvsignore	19 Jan 2009 04:07:40 -0000	1.2
@@ -0,0 +1 @@
+epdb-0.11.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-epdb/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	18 Jan 2009 22:33:53 -0000	1.1
+++ sources	19 Jan 2009 04:07:40 -0000	1.2
@@ -0,0 +1 @@
+c21e11839ecaa3bbe28b99c886622ea8  epdb-0.11.tar.bz2



From jforbes at fedoraproject.org  Mon Jan 19 04:10:14 2009
From: jforbes at fedoraproject.org (Justin M. Forbes)
Date: Mon, 19 Jan 2009 04:10:14 +0000 (UTC)
Subject: rpms/python-epdb/F-10 import.log, NONE, 1.1 python-epdb.spec, NONE, 
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090119041014.B73F4700F8@cvs1.fedora.phx.redhat.com>

Author: jforbes

Update of /cvs/pkgs/rpms/python-epdb/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16426/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	import.log python-epdb.spec 
Log Message:
Initial F-10 import.



--- NEW FILE import.log ---
python-epdb-0_11-1_fc10:F-10:python-epdb-0.11-1.fc10.src.rpm:1232338122


--- NEW FILE python-epdb.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

Name:           python-epdb
Version:        0.11
Release:        1%{?dist}
Summary:        Extended Python debugger

Group:          Development/Debuggers
License:        MIT
URL:            ftp://download.rpath.com/pub/epdb/
Source0:        ftp://download.rpath.com/pub/epdb/epdb-%{version}.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch

BuildRequires:  python-devel

%description
epdb is an extended Python debugger.

%prep
%setup -q -n epdb-%{version}
sed -i 's,python2.4,python,g' Make.rules epdb/epdb.py


%build
make %{?_smp_mflags} sitedir=%{python_sitelib}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT sitedir=%{python_sitelib}


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc LICENSE NEWS
%{python_sitelib}/*



%changelog
* Fri Jan 16 2009 Justin M. Forbes <jmforbes at linuxtx.org> 0.11-1
- Initial package build.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-epdb/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	18 Jan 2009 22:33:53 -0000	1.1
+++ .cvsignore	19 Jan 2009 04:09:44 -0000	1.2
@@ -0,0 +1 @@
+epdb-0.11.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-epdb/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	18 Jan 2009 22:33:53 -0000	1.1
+++ sources	19 Jan 2009 04:09:44 -0000	1.2
@@ -0,0 +1 @@
+c21e11839ecaa3bbe28b99c886622ea8  epdb-0.11.tar.bz2



From paragn at fedoraproject.org  Mon Jan 19 04:26:54 2009
From: paragn at fedoraproject.org (Parag Ashok Nemade)
Date: Mon, 19 Jan 2009 04:26:54 +0000 (UTC)
Subject: rpms/iok/devel .cvsignore,1.4,1.5 iok.spec,1.3,1.4 sources,1.4,1.5
Message-ID: <20090119042654.8ABEE700F8@cvs1.fedora.phx.redhat.com>

Author: paragn

Update of /cvs/pkgs/rpms/iok/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19210

Modified Files:
	.cvsignore iok.spec sources 
Log Message:

* Mon Jan 19 2009 Parag Nemade <panemade at gmail.com>- 1.2.0-1
- Update to Next release 1.2.0




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/iok/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	13 Jan 2009 08:55:28 -0000	1.4
+++ .cvsignore	19 Jan 2009 04:26:23 -0000	1.5
@@ -1,3 +1,4 @@
 iok-1.0.8.tar.gz
 iok-1.0.9.tar.gz
 iok-1.1.0.tar.gz
+iok-1.2.0.tar.gz


Index: iok.spec
===================================================================
RCS file: /cvs/pkgs/rpms/iok/devel/iok.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- iok.spec	13 Jan 2009 08:55:28 -0000	1.3
+++ iok.spec	19 Jan 2009 04:26:24 -0000	1.4
@@ -1,5 +1,5 @@
 Name:           iok
-Version:        1.1.0
+Version:        1.2.0
 Release:        1%{?dist}
 Summary:        Indic Onscreen Virtual Keyboard
 Group:          Applications/System
@@ -46,6 +46,9 @@
 %{_datadir}/pixmaps/iok.xpm
 
 %changelog
+* Mon Jan 19 2009 Parag Nemade <panemade at gmail.com>- 1.2.0-1
+- Update to Next release 1.2.0
+
 * Tue Jan 13 2009 Parag Nemade <panemade at gmail.com>- 1.1.0-1
 - Update to Next release 1.1.0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/iok/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	13 Jan 2009 08:55:28 -0000	1.4
+++ sources	19 Jan 2009 04:26:24 -0000	1.5
@@ -1,2 +1 @@
-400cacfd92dbdb7016a16e7ea0d05e14  iok-1.0.9.tar.gz
-05b33004d90a3a09b6e898ffa6600cc7  iok-1.1.0.tar.gz
+26758cfa9fe2d9282885636f019eb84f  iok-1.2.0.tar.gz



From cchance at fedoraproject.org  Mon Jan 19 04:40:54 2009
From: cchance at fedoraproject.org (Caius Chance)
Date: Mon, 19 Jan 2009 04:40:54 +0000 (UTC)
Subject: rpms/baekmuk-ttf-fonts/devel baekmuk-ttf-fonts.spec,1.8,1.9
Message-ID: <20090119044054.4DD81700F8@cvs1.fedora.phx.redhat.com>

Author: cchance

Update of /cvs/pkgs/rpms/baekmuk-ttf-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21114

Modified Files:
	baekmuk-ttf-fonts.spec 
Log Message:
* Mon Jan 19 2009 Caius Chance <cchance at redhat.com> - 2.2-13.fc11
- Resolves: rhbz#477332
- Package renaming for post-1.13 fontpackages.




Index: baekmuk-ttf-fonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/baekmuk-ttf-fonts/devel/baekmuk-ttf-fonts.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- baekmuk-ttf-fonts.spec	16 Jan 2009 04:18:42 -0000	1.8
+++ baekmuk-ttf-fonts.spec	19 Jan 2009 04:40:23 -0000	1.9
@@ -3,13 +3,12 @@
 %define common_desc \
 This package provides the free Korean TrueType fonts.
 
-%define fontdir        %{_datadir}/fonts/%{fontname}
 %define gsdir          %{_datadir}/ghostscript/conf.d
 %define catalogue      %{_sysconfdir}/X11/fontpath.d
 
 Name:           %{fontname}-fonts
 Version:        2.2
-Release:        12%{?dist}
+Release:        13%{?dist}
 Summary:        Free Korean TrueType fonts
 
 Group:          User Interface/X
@@ -27,94 +26,95 @@
 
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildArch:      noarch
-BuildRequires:  fontpackages-devel, xorg-x11-font-utils, ttmkfdir >= 3.0.6
+BuildRequires:  fontpackages-devel >= 1.13 , xorg-x11-font-utils
+BuildRequires:  ttmkfdir >= 3.0.6
 
 %description
 %common_desc
 
-%package common
-Summary:        Common files for Korean Baekmuk TrueType fonts
-License:        Baekmuk
-Group:          User Interface/X
-Requires:       fontpackages-filesystem
-Conflicts:      fonts-korean < 2.2-5
-
-%description common
-%common_desc
-
-This package contains some common files for Baekmuk Korean TrueType fonts.
-
-%package batang
+%package -n %{fontname}-batang-fonts
 Summary:        Korean Baekmuk TrueType Batang typeface
 License:        Baekmuk
 Group:          User Interface/X
-Obsoletes:      ttfonts-ko < 1.0.11-33 fonts-korean < 2.2-6
-Requires:       fontpackages-filesystem, %{name}-common
+Obsoletes:      ttfonts-ko < 1.0.11-33, fonts-korean < 2.2-6
+Obsoletes:      %{name}-batang < %{version}-%{release}
+Requires:       fontpackages-filesystem >= 1.13
+Requires:       %{fontname}-common-fonts = %{version}-%{release}
 
-%description batang
+%description -n %{fontname}-batang-fonts
 %common_desc
 
-This package contains the Korean TrueType font Batang typeface.
+Batang is Korean TrueType font in Serif typeface.
 
 %_font_pkg -n batang -f *-%{fontname}-batang*.conf batang.ttf
 
-%verify(not md5 size mtime) %{fontdir}/fonts.dir
-%verify(not md5 size mtime) %{fontdir}/fonts.scale
-%verify(not md5 size mtime) %{catalogue}/%{fontname}
-
-%package dotum
+%package -n %{fontname}-dotum-fonts
 Summary:        Korean Baekmuk TrueType Dotum typeface
 License:        Baekmuk
 Group:          User Interface/X
-Obsoletes:      ttfonts-ko < 1.0.11-33 fonts-korean < 2.2-6
-Requires:       fontpackages-filesystem, %{name}-common
+Obsoletes:      ttfonts-ko < 1.0.11-33, fonts-korean < 2.2-6
+Obsoletes:      %{name}-dotum < %{version}-%{release}
+Requires:       fontpackages-filesystem >= 1.13
+Requires:       %{fontname}-common-fonts = %{version}-%{release}
 
-%description dotum
+%description -n %{fontname}-dotum-fonts
 %common_desc
 
-This package contains the Korean TrueType font Dotum typeface.
+Dotum is Korean TrueType font in San-serif typeface.
 
 %_font_pkg -n dotum -f *-%{fontname}-dotum*.conf dotum.ttf
 
-%verify(not md5 size mtime) %{fontdir}/fonts.dir
-%verify(not md5 size mtime) %{fontdir}/fonts.scale
-%verify(not md5 size mtime) %{catalogue}/%{fontname}
-
-%package gulim
+%package -n %{fontname}-gulim-fonts
 Summary:        Korean Baekmuk TrueType Gulim typeface
 License:        Baekmuk
 Group:          User Interface/X
-Obsoletes:      ttfonts-ko < 1.0.11-33 fonts-korean < 2.2-6
-Requires:       fontpackages-filesystem, %{name}-common
+Obsoletes:      ttfonts-ko < 1.0.11-33, fonts-korean < 2.2-6
+Obsoletes:      %{name}-gulim < %{version}-%{release}
+Requires:       fontpackages-filesystem >= 1.13
+Requires:       %{fontname}-common-fonts = %{version}-%{release}
 
-%description gulim
+%description -n %{fontname}-gulim-fonts
 %common_desc
 
-This package contains the Korean TrueType font Gulim typeface.
+Gulim is Korean TrueType font in Monospace typeface.
 
 %_font_pkg -n gulim -f *-%{fontname}-gulim*.conf gulim.ttf
 
-%verify(not md5 size mtime) %{fontdir}/fonts.dir
-%verify(not md5 size mtime) %{fontdir}/fonts.scale
-%verify(not md5 size mtime) %{catalogue}/%{fontname}
-
-%package hline
+%package -n %{fontname}-hline-fonts
 Summary:        Korean Baekmuk TrueType Headline typeface
 License:        Baekmuk
 Group:          User Interface/X
-Obsoletes:      ttfonts-ko < 1.0.11-33 fonts-korean < 2.2-6
-Requires:       fontpackages-filesystem, %{name}-common
+Obsoletes:      ttfonts-ko < 1.0.11-33, fonts-korean < 2.2-6
+Obsoletes:      %{name}-hline < %{version}-%{release}
+Requires:       fontpackages-filesystem >= 1.13
+Requires:       %{fontname}-common-fonts = %{version}-%{release}
 
-%description hline
+%description -n %{fontname}-hline-fonts
 %common_desc
 
-This package contains the Korean TrueType font Headline typeface.
+Headline is Korean TrueType font in Black face.
 
 %_font_pkg -n hline -f *-%{fontname}-hline*.conf hline.ttf
 
-%verify(not md5 size mtime) %{fontdir}/fonts.dir
-%verify(not md5 size mtime) %{fontdir}/fonts.scale
+%package -n %{fontname}-common-fonts
+Summary:        Common files for Korean Baekmuk TrueType fonts
+License:        Baekmuk
+Group:          User Interface/X
+Requires:       fontpackages-filesystem >= 1.13
+Conflicts:      fonts-korean < 2.2-5
+
+%description -n %{fontname}-common-fonts
+%common_desc
+
+This is common files for Baekmuk Korean TrueType fonts.
+
+%files -n %{fontname}-common-fonts
+%defattr(0644,root,root,0755)
+%verify(not md5 size mtime) %{_fontdir}/fonts.dir
+%verify(not md5 size mtime) %{_fontdir}/fonts.scale
 %verify(not md5 size mtime) %{catalogue}/%{fontname}
+%doc COPYRIGHT COPYRIGHT.ko README
+%{gsdir}/
 
 %prep
 %setup -q -n %{archivename}
@@ -126,9 +126,9 @@
 %__rm -rf %{buildroot}
 
 # font
-%__install -d -m 0755 %{buildroot}%{fontdir}
+%__install -d -m 0755 %{buildroot}%{_fontdir}
 for i in batang dotum gulim hline; do
-  %__install -p -m 0644 ttf/$i.ttf %{buildroot}%{fontdir}
+  %__install -p -m 0644 ttf/$i.ttf %{buildroot}%{_fontdir}
 done
 
 # fontconfig conf
@@ -144,9 +144,9 @@
 cd -
 
 # fonts.{scale,dir}
-%{_bindir}/ttmkfdir -d %{buildroot}%{fontdir} \
-  -o %{buildroot}%{fontdir}/fonts.scale
-%{_bindir}/mkfontdir %{buildroot}%{fontdir}
+%{_bindir}/ttmkfdir -d %{buildroot}%{_fontdir} \
+  -o %{buildroot}%{_fontdir}/fonts.scale
+%{_bindir}/mkfontdir %{buildroot}%{_fontdir}
 
 # ghostscript
 %__install -d -m 0755 %{buildroot}%{gsdir}
@@ -155,7 +155,7 @@
 
 # catalogue
 %__install -d %{buildroot}%{catalogue}
-%__ln_s %{fontdir} %{buildroot}%{catalogue}/%{fontname}
+%__ln_s %{_fontdir} %{buildroot}%{catalogue}/%{fontname}
 
 # convert Korean copyright file to utf8
 %{_bindir}/iconv -f EUC-KR -t UTF-8 COPYRIGHT.ks > COPYRIGHT.ko
@@ -163,11 +163,11 @@
 %clean
 %__rm -rf %{buildroot}
 
-%files common
-%doc COPYRIGHT COPYRIGHT.ko README
-%{gsdir}/
-
 %changelog
+* Mon Jan 19 2009 Caius Chance <cchance at redhat.com> - 2.2-13.fc11
+- Resolves: rhbz#477332
+- Package renaming for post-1.13 fontpackages.
+
 * Fri Jan 16 2009 Caius Chance <cchance at redhat.com> - 2.2-12.fc11
 - Resolves: rhbz#477332 (Repatched buildsys error.)
 



From petersen at fedoraproject.org  Mon Jan 19 05:40:26 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Mon, 19 Jan 2009 05:40:26 +0000 (UTC)
Subject: rpms/ghc/devel cabal-binlib-template.spec.in, 1.3,
	1.4 cabal-lib-template.spec.in, 1.3, 1.4 ghc.spec, 1.66, 1.67
Message-ID: <20090119054026.0F078700F8@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/ghc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27699

Modified Files:
	cabal-binlib-template.spec.in cabal-lib-template.spec.in 
	ghc.spec 
Log Message:
- move spec templates to haskell-packaging for easy updating
- provide correct haddock version

spec templating:
- use bcond for 
- add doc subpackages to lib and binlib templates
- add license header for cabal2spec




Index: cabal-binlib-template.spec.in
===================================================================
RCS file: /cvs/extras/rpms/ghc/devel/cabal-binlib-template.spec.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- cabal-binlib-template.spec.in	5 Dec 2008 09:50:10 -0000	1.3
+++ cabal-binlib-template.spec.in	19 Jan 2009 05:39:55 -0000	1.4
@@ -3,8 +3,8 @@
 %define pkg_libdir %{_libdir}/ghc-%{ghc_version}/%{name}-%{version}
 %define pkg_docdir %{_docdir}/ghc/libraries/%{name}-%{version}
 
-%define build_prof 1
-%define build_doc 1
+%bcond_without prof
+%bcond_without doc
 
 # ghc does not emit debug information
 %define debug_package %{nil}
@@ -15,14 +15,14 @@
 Summary:        *FIXME*
 
 Group:          *FIXME*
-License:        BSD?
+License:        BSD? *FIXME*
 URL:            http://hackage.haskell.org/cgi-bin/hackage-scripts/package/%{name}
 Source0:        http://hackage.haskell.org/packages/archive/%{name}/%{version}/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # ghc has only been bootstrapped on the following archs:
 ExclusiveArch:  i386 x86_64 ppc
 BuildRequires:  ghc = %{ghc_version}
-%if %{build_prof}
+%if %{with prof}
 BuildRequires:  ghc-prof = %{ghc_version}
 %endif
 
@@ -37,13 +37,24 @@
 Requires:       ghc = %{ghc_version}
 Requires(post): ghc = %{ghc_version}
 Requires(preun): ghc = %{ghc_version}
-Requires(postun): ghc = %{ghc_version}
 
 %description -n ghc-%{name}
 Haskell %{name} library. *FIXME*
 
 
-%if %{build_prof}
+%if %{with doc}
+%package -n ghc-%{name}-doc
+Summary: Documentation for %{name}
+Group: Development/Libraries
+Requires: ghc-doc = %{ghc_version}
+Requires(postun): ghc-doc = %{ghc_version}
+
+%description -n ghc-%{name}-doc
+This package contains development documentation files for the %{name} library.
+%endif
+
+
+%if %{with prof}
 %package -n ghc-%{name}-prof
 Summary: Profiling libraries for %{name}
 Group: Development/Libraries
@@ -60,14 +71,9 @@
 
 
 %build
-%cabal_configure --ghc \
-%if %{build_prof}
-  -p
-%else
-%{nil}
-%endif
+%cabal_configure --ghc %{!?without_prof:-p}
 %cabal build
-%if %{build_doc}
+%if %{with doc}
 %cabal haddock
 %endif
 %ghc_gen_scripts
@@ -86,7 +92,10 @@
 
 %post -n ghc-%{name}
 %ghc_register_pkg
-%if %{build_doc}
+
+
+%if %{with doc}
+%post -n ghc-%{name}-doc
 %ghc_reindex_haddock
 %endif
 
@@ -97,26 +106,32 @@
 fi
 
 
-%postun -n ghc-%{name}
+%if %{with doc}
+%postun -n ghc-%{name}-doc
 if [ "$1" -eq 0 ] ; then
-%if %{build_doc}
   %ghc_reindex_haddock
-%endif
 fi
+%endif
+
 
 %files
 %defattr(-,root,root,-)
 %doc LICENSE
 %{_bindir}/%{name}
 
+
 %files -n ghc-%{name} -f ghc-%{name}.files
 %defattr(-,root,root,-)
-%if %{build_doc}
+
+
+%if %{with doc}
+%files -n ghc-%{name}-doc
+%defattr(-,root,root,-)
 %{pkg_docdir}
 %endif
 
 
-%if %{build_prof}
+%if %{with prof}
 %files -n ghc-%{name}-prof -f ghc-%{name}-prof.files
 %defattr(-,root,root,-)
 %endif


Index: cabal-lib-template.spec.in
===================================================================
RCS file: /cvs/extras/rpms/ghc/devel/cabal-lib-template.spec.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- cabal-lib-template.spec.in	5 Dec 2008 09:50:10 -0000	1.3
+++ cabal-lib-template.spec.in	19 Jan 2009 05:39:55 -0000	1.4
@@ -4,8 +4,8 @@
 %define pkg_libdir %{_libdir}/ghc-%{ghc_version}/%{pkg_name}-%{version}
 %define pkg_docdir %{_docdir}/ghc/libraries/%{pkg_name}-%{version}
 
-%define build_prof 1
-%define build_doc 1
+%bcond_without prof
+%bcond_without doc
 
 # ghc does not emit debug information
 %define debug_package %{nil}
@@ -16,27 +16,39 @@
 Summary:        Haskell %{pkg_name} library *FIXME*
 
 Group:          Development/Libraries
-License:        BSD?
+License:        BSD? *FIXME*
 URL:            http://hackage.haskell.org/cgi-bin/hackage-scripts/package/%{pkg_name}
 Source0:        http://hackage.haskell.org/packages/archive/%{pkg_name}/%{version}/%{pkg_name}-%{version}.tar.gz
-Provides:       %{name}-devel = %{version}-%{release}
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Provides:       %{name}-devel = %{version}-%{release}
 # ghc has only been bootstrapped on the following archs:
 ExclusiveArch:  i386 x86_64 ppc
 BuildRequires:  ghc = %{ghc_version}
-%if %{build_prof}
+%if %{with prof}
 BuildRequires:  ghc-prof = %{ghc_version}
 %endif
 Requires:       ghc = %{ghc_version}
 Requires(post): ghc = %{ghc_version}
 Requires(preun): ghc = %{ghc_version}
-Requires(postun): ghc = %{ghc_version}
 
 %description
 Haskell %{pkg_name} library for ghc-%{ghc_version}. *FIXME*
 
 
-%if %{build_prof}
+%if %{with doc}
+%package doc
+Summary: Documentation for %{name}
+Group: Development/Libraries
+Requires: ghc-doc = %{ghc_version}
+Requires(postun): ghc-doc = %{ghc_version}
+
+%description doc
+This package contains development documentation files for the %{name} library.
+%endif
+
+
+%if %{with prof}
 %package prof
 Summary: Profiling libraries for %{name}
 Group: Development/Libraries
@@ -53,14 +65,9 @@
 
 
 %build
-%cabal_configure --ghc \
-%if %{build_prof}
-  -p
-%else
-%{nil}
-%endif
+%cabal_configure --ghc %{!?without_prof:-p}
 %cabal build
-%if %{build_doc}
+%if %{with doc}
 %cabal haddock
 %endif
 %ghc_gen_scripts
@@ -77,9 +84,12 @@
 rm -rf $RPM_BUILD_ROOT
 
 
-%post 
+%post
 %ghc_register_pkg
-%if %{build_doc}
+
+
+%if %{with doc}
+%post doc
 %ghc_reindex_haddock
 %endif
 
@@ -90,23 +100,27 @@
 fi
 
 
-%postun
+%if %{with doc}
+%postun doc
 if [ "$1" -eq 0 ] ; then
-%if %{build_doc}
   %ghc_reindex_haddock
-%endif
 fi
+%endif
 
 
 %files -f %{name}.files
 %defattr(-,root,root,-)
 %doc LICENSE
-%if %{build_doc}
+
+
+%if %{with doc}
+%files doc
+%defattr(-,root,root,-)
 %{pkg_docdir}
 %endif
 
 
-%if %{build_prof}
+%if %{with prof}
 %files prof -f %{name}-prof.files
 %defattr(-,root,root,-)
 %endif


Index: ghc.spec
===================================================================
RCS file: /cvs/extras/rpms/ghc/devel/ghc.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- ghc.spec	5 Dec 2008 09:50:10 -0000	1.66
+++ ghc.spec	19 Jan 2009 05:39:55 -0000	1.67
@@ -25,17 +25,13 @@
 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
-Source3:	cabal2spec
-Source4:	cabal-bin-template.spec.in
-Source5:	cabal-lib-template.spec.in
-Source6:	cabal-binlib-template.spec.in
 URL:		http://haskell.org/ghc/
 Requires:	gcc, gmp-devel, libedit-devel
 Requires(post): policycoreutils
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Obsoletes:      ghc682, ghc681, ghc661, ghc66, haddock <= 2.0.0.0
 # introduced for f11 and to be removed for f13:
-Provides:       haddock = 2.2.2
+Provides:       haddock = 2.3.0
 BuildRequires:  ghc, happy, sed
 BuildRequires:  gmp-devel, libedit-devel
 %if %{build_doc}
@@ -131,13 +127,6 @@
 mkdir -p ${RPM_BUILD_ROOT}/%{_sysconfdir}/rpm
 cp -p %{SOURCE2} ${RPM_BUILD_ROOT}/%{_sysconfdir}/rpm/macros.ghc
 
-# spec templating
-# cabal2spec
-install -m 0755 -p %{SOURCE3} ${RPM_BUILD_ROOT}/%{_bindir}
-# templates for bin, lib and binlib cabal hackages
-mkdir -p ${RPM_BUILD_ROOT}/%{_datadir}/ghc
-cp -p %{SOURCE4} %{SOURCE5} %{SOURCE6} ${RPM_BUILD_ROOT}/%{_datadir}/ghc/
-
 SRC_TOP=$PWD
 rm -f rpm-*-filelist rpm-*.files
 ( cd $RPM_BUILD_ROOT
@@ -203,7 +192,6 @@
 %{_bindir}/*
 %{_sysconfdir}/rpm/macros.ghc
 %config(noreplace) %{_libdir}/ghc-%{version}/package.conf
-%{_datadir}/ghc
 
 %if %{build_prof}
 %files prof -f rpm-prof-filelist
@@ -229,11 +217,9 @@
 %endif
 
 %changelog
-* Fri Dec  5 2008 Jens Petersen <petersen at redhat.com>
-- more template fixes:
-  - version pkg_docdir
-  - put provides in lib subsubpackage
-  - binlib scripts are for lib subpackage
+* Mon Jan 19 2009 Jens Petersen <petersen at redhat.com> - 6.10.1-6
+- move spec templates to a haskell-packaging for easy updating
+- provide correct haddock version
 
 * Mon Dec  1 2008 Jens Petersen <petersen at redhat.com> - 6.10.1-6
 - update macros.ghc to latest proposed revised packaging guidelines:



From paragn at fedoraproject.org  Mon Jan 19 05:42:19 2009
From: paragn at fedoraproject.org (Parag Ashok Nemade)
Date: Mon, 19 Jan 2009 05:42:19 +0000 (UTC)
Subject: rpms/iok/F-10 iok.spec,1.2,1.3 sources,1.3,1.4
Message-ID: <20090119054219.91C1D700F8@cvs1.fedora.phx.redhat.com>

Author: paragn

Update of /cvs/pkgs/rpms/iok/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29294

Modified Files:
	iok.spec sources 
Log Message:

* Mon Jan 19 2009 Parag Nemade <panemade at gmail.com>- 1.2.0-1
- Update to Next release 1.2.0

* Tue Jan 13 2009 Parag Nemade <panemade at gmail.com>- 1.1.0-1
- Update to Next release 1.1.0

* Thu Dec 17 2008 Parag Nemade <panemade at gmail.com>- 1.0.9-1
- Update to Next release 1.0.9




Index: iok.spec
===================================================================
RCS file: /cvs/pkgs/rpms/iok/F-10/iok.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- iok.spec	27 Dec 2008 07:07:50 -0000	1.2
+++ iok.spec	19 Jan 2009 05:41:49 -0000	1.3
@@ -1,5 +1,5 @@
 Name:           iok
-Version:        1.0.9
+Version:        1.2.0
 Release:        1%{?dist}
 Summary:        Indic Onscreen Virtual Keyboard
 Group:          Applications/System
@@ -8,7 +8,7 @@
 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
+BuildRequires:  gtk2-devel gettext
 
 %description
 iok is Indic Onscreen Keyboard. It provides virtual Keyboard functionality. 
@@ -32,11 +32,13 @@
     --dir %{buildroot}/%{_datadir}/applications/ \
      %{buildroot}%{_datadir}/applications/%{name}.desktop
 
+%find_lang %{name}
+
 
 %clean
 rm -rf %{buildroot}
 
-%files
+%files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc COPYING AUTHORS ChangeLog README
 %{_bindir}/iok
@@ -44,7 +46,13 @@
 %{_datadir}/pixmaps/iok.xpm
 
 %changelog
-* Thu Dec 18 2008 Parag Nemade <panemade at gmail.com>- 1.0.9-1
+* Mon Jan 19 2009 Parag Nemade <panemade at gmail.com>- 1.2.0-1
+- Update to Next release 1.2.0
+
+* Tue Jan 13 2009 Parag Nemade <panemade at gmail.com>- 1.1.0-1
+- Update to Next release 1.1.0
+
+* Thu Dec 17 2008 Parag Nemade <panemade at gmail.com>- 1.0.9-1
 - Update to Next release 1.0.9
 
 * Tue Sep 02 2008 Parag Nemade <panemade at gmail.com>- 1.0.8-2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/iok/F-10/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	27 Dec 2008 07:07:50 -0000	1.3
+++ sources	19 Jan 2009 05:41:49 -0000	1.4
@@ -1 +1 @@
-400cacfd92dbdb7016a16e7ea0d05e14  iok-1.0.9.tar.gz
+26758cfa9fe2d9282885636f019eb84f  iok-1.2.0.tar.gz



From cchance at fedoraproject.org  Mon Jan 19 05:43:09 2009
From: cchance at fedoraproject.org (Caius Chance)
Date: Mon, 19 Jan 2009 05:43:09 +0000 (UTC)
Subject: rpms/liberation-fonts/devel 65-liberation-mono.conf, NONE,
	1.1 65-liberation-sans.conf, NONE, 1.1 65-liberation-serif.conf,
	NONE, 1.1 liberation-fonts.spec, 1.27, 1.28
Message-ID: <20090119054309.C05A7700F8@cvs1.fedora.phx.redhat.com>

Author: cchance

Update of /cvs/pkgs/rpms/liberation-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29355

Modified Files:
	liberation-fonts.spec 
Added Files:
	65-liberation-mono.conf 65-liberation-sans.conf 
	65-liberation-serif.conf 
Log Message:
reseolves 474734
incl fontconfig .conf files
rename package for post-1.13 fontpackages macros



--- NEW FILE 65-liberation-mono.conf ---
<?xml version="1.0"?>
<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
<fontconfig>
<!--
  monospace faces
 -->
	<alias>
		<family>Liberation Mono</family>
		<default>
            <family>monospace</family>
        </default>
	</alias>
	<alias>
		<family>monospace</family>
		<prefer>
			<family>Liberation Mono</family>
		</prefer>
	</alias>
</fontconfig>


--- NEW FILE 65-liberation-sans.conf ---
<?xml version="1.0"?>
<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
<fontconfig>
<!--
  Sans-serif faces
 -->
	<alias>
		<family>Liberation Sans</family>
		<default>
            <family>sans-serif</family>
        </default>
	</alias>
	<alias>
		<family>sans-serif</family>
		<prefer>
			<family>Liberation Sans</family>
		</prefer>
	</alias>
</fontconfig>


--- NEW FILE 65-liberation-serif.conf ---
<?xml version="1.0"?>
<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
<fontconfig>
<!--
  Serif faces
 -->
	<alias>
		<family>Liberation Serif</family>
		<default>
            <family>serif</family>
        </default>
	</alias>
	<alias>
		<family>serif</family>
		<prefer>
			<family>Liberation Serif</family>
		</prefer>
	</alias>
</fontconfig>


Index: liberation-fonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/liberation-fonts/devel/liberation-fonts.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- liberation-fonts.spec	9 Jan 2009 03:31:34 -0000	1.27
+++ liberation-fonts.spec	19 Jan 2009 05:42:39 -0000	1.28
@@ -1,18 +1,16 @@
 %define fontname liberation
-%define fontconf <65>-%{fontname}
 %define archivename %{name}-%{version}
 %define common_desc \
 The Liberation Fonts are intended to be replacements for the three most \
 commonly used fonts on Microsoft systems: Times New Roman, Arial, and Courier \
 New.
 
-%define fontdir %{_datadir}/fonts/%{fontname}
 %define catalogue %{_sysconfdir}/X11/fontpath.d
 
 Name:             %{fontname}-fonts
 Summary:          Fonts to replace commonly used Microsoft Windows fonts
 Version:          1.04.93
-Release:          3%{?dist}
+Release:          4%{?dist}
 # The license of the Liberation Fonts is a EULA that contains GPLv2 and two 
 # exceptions:
 # The first exception is the standard FSF font exception.
@@ -23,12 +21,15 @@
 URL:              https://www.redhat.com/promo/fonts/
 Source0:          liberation-fonts-1.04.93.devel.tar.gz
 
-Requires:         liberation-fonts-sans >= %{version}
-Requires:         liberation-fonts-serif >= %{version}
-Requires:         liberation-fonts-mono >= %{version}
+Requires:         %{name}-sans >= %{version}-%{release}
+Requires:         %{name}-serif >= %{version}-%{release}
+Requires:         %{name}-mono >= %{version}-%{release}
+Obsoletes:        liberation-fonts-sans < %{version}-%{release}
+Obsoletes:        liberation-fonts-serif < %{version}-%{release}
+Obsoletes:        liberation-fonts-mono < %{version}-%{release}
 BuildRoot:        %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildArch:        noarch
-Buildrequires:    fontpackages-devel xorg-x11-font-utils
+Buildrequires:    fontpackages-devel >= 1.13, xorg-x11-font-utils
 
 %description
 %common_desc
@@ -36,33 +37,43 @@
 Meta-package of Liberation fonts which installs Sans, Serif, and Monospace 
 families.
 
-%package common
+%files
+%{nil}
+
+%package -n %{fontname}-common-fonts
 Summary:          Shared common files of Liberation font families.
 License:          Liberation
 Group:            User Interface/X
-Requires:         fontpackages-filesystem
+Requires:         fontpackages-filesystem >= 1.13
 
-%description common
+%description -n %{fontname}-common-fonts
 %common_desc
 
 Shared common files of Liberation font families.
 
+%files -n %{fontname}-common-fonts
+%defattr(0644,root,root,0755)
+%doc AUTHORS ChangeLog COPYING License.txt README
+%dir %{_fontdir}
+%verify(not md5 size mtime) %{_fontdir}/fonts.dir
+%verify(not md5 size mtime) %{_fontdir}/fonts.scale
+%{catalogue}/%{name}
+
 %define mk_pkg()\
-%package %1\
+%package -n %{fontname}-%1-fonts\
 Summary:          %3 fonts to replace commonly used Microsoft %4\
 License:          Liberation\
 Group:            User Interface/X\
-Requires:         fontpackages-filesystem, %{name}-common >= %{version}\
+Obsoletes:        %{name}-%1 < %{version}-%{release}\
+Requires:         fontpackages-filesystem >= 1.13\
+Requires:         %{fontname}-common-fonts = %{version}-%{release}\
 \
-%description %1\
+%description -n %{fontname}-%1-fonts\
 %common_desc\
 \
-%3 TrueType fonts that replaced commonly used Microsoft %4.\
+This is %3 TrueType fonts that replaced commonly used Microsoft %4.\
 \
-%files %1\
-%defattr(0644,root,root,0755)\
-%dir %{fontdir}\
-%{fontdir}/Liberation%2-*.ttf
+%_font_pkg -n %1 -f *-%{fontname}-%1*.conf Liberation%2-*.ttf
 
 %mk_pkg sans Sans Sans Arial
 %mk_pkg serif Serif Sans-serif Times_New_Roman
@@ -79,42 +90,23 @@
 
 %install
 rm -rf %{buildroot}
-# fonts
-install -m 0755 -d %{buildroot}%{fontdir}
-install -m 0644 *.ttf %{buildroot}%{fontdir}
-# configuration
+# fonts .ttf
+install -m 0755 -d %{buildroot}%{_fontdir}
+install -m 0644 *.ttf %{buildroot}%{_fontdir}
+# fontconfig .conf
 install -m 0755 -d %{buildroot}%{_sysconfdir}/fonts/conf.d
 # catalogue
 install -d %{buildroot}%{catalogue}
-ln -sf %{fontdir} %{buildroot}%{catalogue}/%{name}
-
-# generate fonts.dir and fonts.scale
-mkfontdir %{buildroot}%{fontdir}
-mkfontscale %{buildroot}%{fontdir}
-
-%post
-if [ -x /usr/bin/fc-cache ]; then
-  /usr/bin/fc-cache %{_datadir}/fonts
-fi
-
-%postun
-if [ "$1" = "0" ]; then
-  if [ -x /usr/bin/fc-cache ]; then
-    /usr/bin/fc-cache %{_datadir}/fonts
-  fi
-fi
-
-%files
-%{nil}
-
-%files common
-%defattr(0644,root,root,0755)
-%doc AUTHORS ChangeLog COPYING License.txt README
-%verify(not md5 size mtime) %{fontdir}/fonts.dir
-%verify(not md5 size mtime) %{fontdir}/fonts.scale
-%{catalogue}/%{name}
+ln -sf %{_fontdir} %{buildroot}%{catalogue}/%{name}
+# fonts.{dir,scale}
+mkfontdir %{buildroot}%{_fontdir}
+mkfontscale %{buildroot}%{_fontdir}
 
 %changelog
+* Mon Jan 19 2009 Caius Chance <cchance at redhat.com> - 1.04.93-4.fc11
+- Resolves: thbz#477410
+- Package renaming for post-1.13 fontpackages macros.
+
 * Fri Jan 09 2009 Caius Chance <cchance at redhat.com> - 1.04.93-3.fc11
 - Resolves: rhbz#477410 (Convert to new font packaging guidelines.)
 



From pgordon at fedoraproject.org  Mon Jan 19 05:43:51 2009
From: pgordon at fedoraproject.org (Peter Gordon)
Date: Mon, 19 Jan 2009 05:43:51 +0000 (UTC)
Subject: rpms/nemiver/F-10 .cvsignore, 1.11, 1.12 nemiver.spec, 1.18,
	1.19 sources, 1.11, 1.12
Message-ID: <20090119054351.7456570142@cvs1.fedora.phx.redhat.com>

Author: pgordon

Update of /cvs/pkgs/rpms/nemiver/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29653/F-10

Modified Files:
	.cvsignore nemiver.spec sources 
Log Message:
Update to 0.6.4


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/nemiver/F-10/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	28 Sep 2008 21:54:37 -0000	1.11
+++ .cvsignore	19 Jan 2009 05:43:21 -0000	1.12
@@ -1 +1 @@
-nemiver-0.6.3.tar.bz2
+nemiver-0.6.4.tar.bz2


Index: nemiver.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nemiver/F-10/nemiver.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- nemiver.spec	28 Sep 2008 21:54:37 -0000	1.18
+++ nemiver.spec	19 Jan 2009 05:43:21 -0000	1.19
@@ -1,5 +1,5 @@
 Name:		nemiver
-Version:	0.6.3
+Version:	0.6.4
 Release:	1%{?dist}
 Summary:	A GNOME C/C++ Debugger
 
@@ -156,6 +156,9 @@
 
 
 %changelog
+* Sun Jan 18 2009 Peter Gordon <peter at thecodergeek.com> - 0.6.4-1
+- Update to new upstream release (0.6.4).
+
 * 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


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nemiver/F-10/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	28 Sep 2008 21:54:37 -0000	1.11
+++ sources	19 Jan 2009 05:43:21 -0000	1.12
@@ -1 +1 @@
-0b420acf4695188c8da675926011169a  nemiver-0.6.3.tar.bz2
+67087d15289ca6149aa71ed60b603661  nemiver-0.6.4.tar.bz2



From petersen at fedoraproject.org  Mon Jan 19 05:47:30 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Mon, 19 Jan 2009 05:47:30 +0000 (UTC)
Subject: rpms/ghc/devel cabal2spec,1.4,1.5 ghc.spec,1.67,1.68
Message-ID: <20090119054730.7954C700F8@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/ghc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30676

Modified Files:
	cabal2spec ghc.spec 
Log Message:
bump release



Index: cabal2spec
===================================================================
RCS file: /cvs/extras/rpms/ghc/devel/cabal2spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- cabal2spec	28 Nov 2008 02:47:49 -0000	1.4
+++ cabal2spec	19 Jan 2009 05:46:59 -0000	1.5
@@ -1,5 +1,22 @@
 #!/bin/sh
 
+# Copyright (C) 2008-2009 Red Hat, Inc
+# Written by Jens Petersen <petersen at redhat.com>, 2008.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 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.
+
 set -e
 
 [ $# -ne 1 -o ! -r "$1" ] && echo "Usage: $(basename $0) [hackage.tar.gz|hackage.cabal]" && exit 1


Index: ghc.spec
===================================================================
RCS file: /cvs/extras/rpms/ghc/devel/ghc.spec,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- ghc.spec	19 Jan 2009 05:39:55 -0000	1.67
+++ ghc.spec	19 Jan 2009 05:47:00 -0000	1.68
@@ -16,7 +16,7 @@
 
 Name:		ghc
 Version:	6.10.1
-Release:	6%{?dist}
+Release:	7%{?dist}
 Summary:	Glasgow Haskell Compilation system
 # See https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=239713
 ExcludeArch:	alpha ppc64
@@ -217,7 +217,7 @@
 %endif
 
 %changelog
-* Mon Jan 19 2009 Jens Petersen <petersen at redhat.com> - 6.10.1-6
+* Mon Jan 19 2009 Jens Petersen <petersen at redhat.com> - 6.10.1-7
 - move spec templates to a haskell-packaging for easy updating
 - provide correct haddock version
 



From paragn at fedoraproject.org  Mon Jan 19 05:49:07 2009
From: paragn at fedoraproject.org (Parag Ashok Nemade)
Date: Mon, 19 Jan 2009 05:49:07 +0000 (UTC)
Subject: rpms/iok/F-9 iok.spec,1.1,1.2 sources,1.2,1.3
Message-ID: <20090119054907.9720F700F8@cvs1.fedora.phx.redhat.com>

Author: paragn

Update of /cvs/pkgs/rpms/iok/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30942

Modified Files:
	iok.spec sources 
Log Message:

* Mon Jan 19 2009 Parag Nemade <panemade at gmail.com>- 1.2.0-1
- Update to Next release 1.2.0

* Tue Jan 13 2009 Parag Nemade <panemade at gmail.com>- 1.1.0-1
- Update to Next release 1.1.0

* Thu Dec 17 2008 Parag Nemade <panemade at gmail.com>- 1.0.9-1
- Update to Next release 1.0.9




Index: iok.spec
===================================================================
RCS file: /cvs/pkgs/rpms/iok/F-9/iok.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- iok.spec	5 Sep 2008 11:10:19 -0000	1.1
+++ iok.spec	19 Jan 2009 05:48:37 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           iok
-Version:        1.0.8
-Release:        2%{?dist}
+Version:        1.2.0
+Release:        1%{?dist}
 Summary:        Indic Onscreen Virtual Keyboard
 Group:          Applications/System
 License:        GPLv2+
@@ -8,7 +8,7 @@
 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
+BuildRequires:  gtk2-devel gettext
 
 %description
 iok is Indic Onscreen Keyboard. It provides virtual Keyboard functionality. 
@@ -28,14 +28,17 @@
 
 desktop-file-install --vendor fedora \
     --delete-original \
+    --copy-generic-name-to-name \
     --dir %{buildroot}/%{_datadir}/applications/ \
      %{buildroot}%{_datadir}/applications/%{name}.desktop
 
+%find_lang %{name}
+
 
 %clean
 rm -rf %{buildroot}
 
-%files
+%files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc COPYING AUTHORS ChangeLog README
 %{_bindir}/iok
@@ -43,6 +46,15 @@
 %{_datadir}/pixmaps/iok.xpm
 
 %changelog
+* Mon Jan 19 2009 Parag Nemade <panemade at gmail.com>- 1.2.0-1
+- Update to Next release 1.2.0
+
+* Tue Jan 13 2009 Parag Nemade <panemade at gmail.com>- 1.1.0-1
+- Update to Next release 1.1.0
+
+* Thu Dec 17 2008 Parag Nemade <panemade at gmail.com>- 1.0.9-1
+- Update to Next release 1.0.9
+
 * Tue Sep 02 2008 Parag Nemade <panemade at gmail.com>- 1.0.8-2
 - Added Source URL and modified description 
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/iok/F-9/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	5 Sep 2008 11:10:19 -0000	1.2
+++ sources	19 Jan 2009 05:48:37 -0000	1.3
@@ -1 +1 @@
-2bd14a41a710f8c91fd994df6322d748  iok-1.0.8.tar.gz
+26758cfa9fe2d9282885636f019eb84f  iok-1.2.0.tar.gz



From paragn at fedoraproject.org  Mon Jan 19 05:57:00 2009
From: paragn at fedoraproject.org (Parag Ashok Nemade)
Date: Mon, 19 Jan 2009 05:57:00 +0000 (UTC)
Subject: rpms/iok/EL-5 iok.spec,1.1,1.2 sources,1.2,1.3
Message-ID: <20090119055701.13B82700F8@cvs1.fedora.phx.redhat.com>

Author: paragn

Update of /cvs/pkgs/rpms/iok/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31920

Modified Files:
	iok.spec sources 
Log Message:

* Mon Jan 19 2009 Parag Nemade <panemade at gmail.com>- 1.2.0-1
- Update to Next release 1.2.0

* Tue Jan 13 2009 Parag Nemade <panemade at gmail.com>- 1.1.0-1
- Update to Next release 1.1.0

* Thu Dec 17 2008 Parag Nemade <panemade at gmail.com>- 1.0.9-1
- Update to Next release 1.0.9




Index: iok.spec
===================================================================
RCS file: /cvs/pkgs/rpms/iok/EL-5/iok.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- iok.spec	5 Sep 2008 11:07:24 -0000	1.1
+++ iok.spec	19 Jan 2009 05:56:29 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           iok
-Version:        1.0.8
-Release:        2%{?dist}
+Version:        1.2.0
+Release:        1%{?dist}
 Summary:        Indic Onscreen Virtual Keyboard
 Group:          Applications/System
 License:        GPLv2+
@@ -8,7 +8,7 @@
 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
+BuildRequires:  gtk2-devel gettext
 
 %description
 iok is Indic Onscreen Keyboard. It provides virtual Keyboard functionality. 
@@ -28,14 +28,17 @@
 
 desktop-file-install --vendor fedora \
     --delete-original \
+    --copy-generic-name-to-name \
     --dir %{buildroot}/%{_datadir}/applications/ \
      %{buildroot}%{_datadir}/applications/%{name}.desktop
 
+%find_lang %{name}
+
 
 %clean
 rm -rf %{buildroot}
 
-%files
+%files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc COPYING AUTHORS ChangeLog README
 %{_bindir}/iok
@@ -43,6 +46,15 @@
 %{_datadir}/pixmaps/iok.xpm
 
 %changelog
+* Mon Jan 19 2009 Parag Nemade <panemade at gmail.com>- 1.2.0-1
+- Update to Next release 1.2.0
+
+* Tue Jan 13 2009 Parag Nemade <panemade at gmail.com>- 1.1.0-1
+- Update to Next release 1.1.0
+
+* Thu Dec 17 2008 Parag Nemade <panemade at gmail.com>- 1.0.9-1
+- Update to Next release 1.0.9
+
 * Tue Sep 02 2008 Parag Nemade <panemade at gmail.com>- 1.0.8-2
 - Added Source URL and modified description 
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/iok/EL-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	5 Sep 2008 11:06:21 -0000	1.2
+++ sources	19 Jan 2009 05:56:29 -0000	1.3
@@ -1 +1 @@
-2bd14a41a710f8c91fd994df6322d748  iok-1.0.8.tar.gz
+26758cfa9fe2d9282885636f019eb84f  iok-1.2.0.tar.gz



From cchance at fedoraproject.org  Mon Jan 19 06:08:46 2009
From: cchance at fedoraproject.org (Caius Chance)
Date: Mon, 19 Jan 2009 06:08:46 +0000 (UTC)
Subject: rpms/liberation-fonts/devel liberation-fonts.spec,1.28,1.29
Message-ID: <20090119060847.065F6700F8@cvs1.fedora.phx.redhat.com>

Author: cchance

Update of /cvs/pkgs/rpms/liberation-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv455

Modified Files:
	liberation-fonts.spec 
Log Message:
resolves: rhbz#477410
updated .spec w/ new renaming



Index: liberation-fonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/liberation-fonts/devel/liberation-fonts.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- liberation-fonts.spec	19 Jan 2009 05:42:39 -0000	1.28
+++ liberation-fonts.spec	19 Jan 2009 06:08:16 -0000	1.29
@@ -20,6 +20,9 @@
 Group:            User Interface/X
 URL:              https://www.redhat.com/promo/fonts/
 Source0:          liberation-fonts-1.04.93.devel.tar.gz
+Source1:          65-liberation-sans.conf
+Source2:          65-liberation-serif.conf
+Source3:          65-liberation-mono.conf
 
 Requires:         %{name}-sans >= %{version}-%{release}
 Requires:         %{name}-serif >= %{version}-%{release}
@@ -59,32 +62,56 @@
 %verify(not md5 size mtime) %{_fontdir}/fonts.scale
 %{catalogue}/%{name}
 
-%define mk_pkg()\
-%package -n %{fontname}-%1-fonts\
-Summary:          %3 fonts to replace commonly used Microsoft %4\
-License:          Liberation\
-Group:            User Interface/X\
-Obsoletes:        %{name}-%1 < %{version}-%{release}\
-Requires:         fontpackages-filesystem >= 1.13\
-Requires:         %{fontname}-common-fonts = %{version}-%{release}\
-\
-%description -n %{fontname}-%1-fonts\
-%common_desc\
-\
-This is %3 TrueType fonts that replaced commonly used Microsoft %4.\
-\
-%_font_pkg -n %1 -f *-%{fontname}-%1*.conf Liberation%2-*.ttf
-
-%mk_pkg sans Sans Sans Arial
-%mk_pkg serif Serif Sans-serif Times_New_Roman
-%mk_pkg mono Mono Monospace Courier_New
+%package -n %{fontname}-sans-fonts
+Summary:      Sans fonts to replace commonly used Microsoft Arial
+License:      Liberation
+Group:        User Interface/X
+Obsoletes:    %{name}-sans < %{version}-%{release}
+Requires:     fontpackages-filesystem >= 1.13
+Requires:     %{fontname}-common-fonts = %{version}-%{release}
+
+%description -n %{fontname}-sans-fonts
+%common_desc
+
+This is Sans TrueType fonts that replaced commonly used Microsoft Arial.
+
+%_font_pkg -n sans -f 65-%{fontname}-sans.conf LiberationSans-*.ttf
+
+%package -n %{fontname}-serif-fonts
+Summary:      San-serif fonts to replace commonly used Microsoft Times New Roman
+License:      Liberation
+Group:        User Interface/X
+Obsoletes:    %{name}-serif < %{version}-%{release}
+Requires:     fontpackages-filesystem >= 1.13
+Requires:     %{fontname}-common-fonts = %{version}-%{release}
+
+%description -n %{fontname}-serif-fonts
+%common_desc
+
+This is Sans-serif TrueType fonts that replaced commonly used Microsoft Times \
+New Roman.
+
+%_font_pkg -n serif -f 65-%{fontname}-serif.conf LiberationSerif-*.ttf
+
+%package -n %{fontname}-mono-fonts
+Summary:      Monospace fonts to replace commonly used Microsoft Courier New
+License:      Liberation
+Group:        User Interface/X
+Obsoletes:    %{name}-sans < %{version}-%{release}
+Requires:     fontpackages-filesystem >= 1.13
+Requires:     %{fontname}-common-fonts = %{version}-%{release}
+
+%description -n %{fontname}-mono-fonts
+%common_desc
+
+This is Monospace TrueType fonts that replaced commonly used Microsoft Courier \
+New.
+
+%_font_pkg -n mono -f 65-%{fontname}-mono.conf LiberationMono-*.ttf
 
 %prep
 %setup -q -n %{name}-%{version}.devel
 
-%clean
-rm -rf %{buildroot}
-
 %build
 %{nil}
 
@@ -94,7 +121,16 @@
 install -m 0755 -d %{buildroot}%{_fontdir}
 install -m 0644 *.ttf %{buildroot}%{_fontdir}
 # fontconfig .conf
-install -m 0755 -d %{buildroot}%{_sysconfdir}/fonts/conf.d
+%__install -m 0755 -d %{buildroot}%{_fontconfig_templatedir}
+%__install -m 0755 -d %{buildroot}%{_fontconfig_confdir}
+cd ../
+for fconf in %{SOURCE1} %{SOURCE2} %{SOURCE3}
+do
+    %__install -m 0644 $fconf %{buildroot}%{_fontconfig_templatedir}/
+    %__ln_s %{_fontconfig_templatedir}/`basename $fconf` \
+        %{buildroot}%{_fontconfig_confdir}/`basename $fconf`
+done
+cd -
 # catalogue
 install -d %{buildroot}%{catalogue}
 ln -sf %{_fontdir} %{buildroot}%{catalogue}/%{name}
@@ -102,6 +138,9 @@
 mkfontdir %{buildroot}%{_fontdir}
 mkfontscale %{buildroot}%{_fontdir}
 
+%clean
+rm -rf %{buildroot}
+
 %changelog
 * Mon Jan 19 2009 Caius Chance <cchance at redhat.com> - 1.04.93-4.fc11
 - Resolves: thbz#477410



From kyle at fedoraproject.org  Mon Jan 19 06:22:02 2009
From: kyle at fedoraproject.org (Kyle McMartin)
Date: Mon, 19 Jan 2009 06:22:02 +0000 (UTC)
Subject: rpms/kernel/F-10 kernel.spec, 1.1217,
	1.1218 linux-2.6-execshield.patch, 1.98, 1.99
Message-ID: <20090119062202.76FAC700F8@cvs1.fedora.phx.redhat.com>

Author: kyle

Update of /cvs/pkgs/rpms/kernel/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3384

Modified Files:
	kernel.spec linux-2.6-execshield.patch 
Log Message:
* Mon Jan 19 2009 Kyle McMartin <kyle at redhat.com>
- execshield fixes: should no longer generate spurious handled GPFs,
  fixes randomization of executables. also some clean ups.



Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/kernel.spec,v
retrieving revision 1.1217
retrieving revision 1.1218
diff -u -r1.1217 -r1.1218
--- kernel.spec	19 Jan 2009 00:07:52 -0000	1.1217
+++ kernel.spec	19 Jan 2009 06:21:31 -0000	1.1218
@@ -1776,6 +1776,10 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Mon Jan 19 2009 Kyle McMartin <kyle at redhat.com>
+- execshield fixes: should no longer generate spurious handled GPFs,
+  fixes randomization of executables. also some clean ups.
+
 * Sun Jan 18 2009 Chuck Ebbert <cebbert at redhat.com>
 - 2.6.28.1
 

linux-2.6-execshield.patch:

Index: linux-2.6-execshield.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/linux-2.6-execshield.patch,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -r1.98 -r1.99
--- linux-2.6-execshield.patch	12 Jan 2009 19:51:29 -0000	1.98
+++ linux-2.6-execshield.patch	19 Jan 2009 06:21:32 -0000	1.99
@@ -1,5 +1,5 @@
 diff --git a/arch/x86/include/asm/desc.h b/arch/x86/include/asm/desc.h
-index e6b82b1..c314884 100644
+index e6b82b1..aea00b6 100644
 --- a/arch/x86/include/asm/desc.h
 +++ b/arch/x86/include/asm/desc.h
 @@ -6,6 +6,7 @@
@@ -20,7 +20,7 @@
  
  #define write_ldt_entry(dt, entry, desc)	\
  	native_write_ldt_entry(dt, entry, desc)
-@@ -381,6 +385,24 @@ static inline void set_system_intr_gate_ist(int n, void *addr, unsigned ist)
+@@ -381,6 +385,27 @@ static inline void set_system_intr_gate_ist(int n, void *addr, unsigned ist)
  	_set_gate(n, GATE_INTERRUPT, addr, 0x3, ist, __KERNEL_CS);
  }
  
@@ -37,8 +37,11 @@
 +	get_cpu_gdt_table(cpu)[GDT_ENTRY_DEFAULT_USER_CS] = (mm)->context.user_cs;
 +}
 +
++#define arch_add_exec_range	arch_add_exec_range
 +extern void arch_add_exec_range(struct mm_struct *mm, unsigned long limit);
++#define arch_remove_exec_range	arch_remove_exec_range
 +extern void arch_remove_exec_range(struct mm_struct *mm, unsigned long limit);
++#define arch_flush_exec_range	arch_flush_exec_range
 +extern void arch_flush_exec_range(struct mm_struct *mm);
 +#endif /* CONFIG_X86_32 */
 +
@@ -151,21 +154,31 @@
  	.load_idt = native_load_idt,
  	.store_gdt = native_store_gdt,
 diff --git a/arch/x86/kernel/process_32.c b/arch/x86/kernel/process_32.c
-index 0a1302f..ab96a10 100644
+index 0a1302f..7d5927e 100644
 --- a/arch/x86/kernel/process_32.c
 +++ b/arch/x86/kernel/process_32.c
-@@ -354,6 +354,10 @@ start_thread(struct pt_regs *regs, unsigned long new_ip, unsigned long new_sp)
+@@ -345,6 +345,8 @@ int copy_thread(int nr, unsigned long clone_flags, unsigned long sp,
+ void
+ start_thread(struct pt_regs *regs, unsigned long new_ip, unsigned long new_sp)
+ {
++	int cpu;
++
+ 	__asm__("movl %0, %%gs" :: "r"(0));
+ 	regs->fs		= 0;
+ 	set_fs(USER_DS);
+@@ -354,6 +356,11 @@ start_thread(struct pt_regs *regs, unsigned long new_ip, unsigned long new_sp)
  	regs->cs		= __USER_CS;
  	regs->ip		= new_ip;
  	regs->sp		= new_sp;
-+	preempt_disable();
-+	load_user_cs_desc(smp_processor_id(), current->mm);
-+	preempt_enable();
++
++	cpu = get_cpu();
++	load_user_cs_desc(cpu, current->mm);
++	put_cpu();
 +
  	/*
  	 * Free the old FP and other extended state
  	 */
-@@ -558,7 +562,8 @@ struct task_struct * __switch_to(struct task_struct *prev_p, struct task_struct
+@@ -558,7 +565,8 @@ struct task_struct * __switch_to(struct task_struct *prev_p, struct task_struct
  	/* never put a printk in __switch_to... printk() calls wake_up*() indirectly */
  
  	__unlazy_fpu(prev_p);
@@ -175,7 +188,7 @@
  
  	/* we're going to use this soon, after a few expensive things */
  	if (next_p->fpu_counter > 5)
-@@ -731,3 +736,39 @@ unsigned long arch_randomize_brk(struct mm_struct *mm)
+@@ -731,3 +739,39 @@ unsigned long arch_randomize_brk(struct mm_struct *mm)
  	unsigned long range_end = mm->brk + 0x02000000;
  	return randomize_range(mm->brk, range_end, 0) ? : mm->brk;
  }
@@ -185,9 +198,9 @@
 +	mm->context.exec_limit = limit;
 +	set_user_cs(&mm->context.user_cs, limit);
 +	if (mm == current->mm) {
-+		preempt_disable();
-+		load_user_cs_desc(smp_processor_id(), mm);
-+		preempt_enable();
++		int cpu = get_cpu();
++		load_user_cs_desc(cpu, mm);
++		put_cpu();
 +	}
 +}
 +
@@ -237,14 +250,25 @@
  	if (!cpu_isset(cpu, flush_cpumask))
  		goto out;
 diff --git a/arch/x86/kernel/traps.c b/arch/x86/kernel/traps.c
-index 04d242a..bb52785 100644
+index 04d242a..e478f3b 100644
 --- a/arch/x86/kernel/traps.c
 +++ b/arch/x86/kernel/traps.c
-@@ -159,6 +159,63 @@ static int lazy_iobitmap_copy(void)
+@@ -159,6 +159,74 @@ static int lazy_iobitmap_copy(void)
  
  	return 0;
  }
 +
++static inline int
++__compare_user_cs_desc(const struct desc_struct * const desc1,
++	const struct desc_struct * const desc2)
++{
++	return ((desc1->limit0 != desc2->limit0) ||
++		(desc1->limit != desc2->limit) ||
++		(desc1->base0 != desc2->base0) ||
++		(desc1->base1 != desc2->base1) ||
++		(desc1->base2 != desc2->base2));
++}
++
 +/*
 + * lazy-check for CS validity on exec-shield binaries:
 + *
@@ -281,8 +305,7 @@
 +	desc1 = &current->mm->context.user_cs;
 +	desc2 = get_cpu_gdt_table(cpu) + GDT_ENTRY_DEFAULT_USER_CS;
 +
-+	if ((desc1->a & 0xff0000ff) != (desc2->a & 0xff0000ff) ||
-+	    desc1->b != desc2->b) {
++	if (__compare_user_cs_desc(desc1, desc2)) {
 +		/*
 +		 * The CS was not in sync - reload it and retry the
 +		 * instruction. If the instruction still faults then
@@ -290,9 +313,10 @@
 +		 */
 +		if (print_fatal_signals >= 2) {
 +			printk(KERN_ERR "#GPF fixup (%ld[seg:%lx]) at %08lx, CPU#%d.\n",
-+				error_code, error_code/8, regs->ip, smp_processor_id());
++				error_code, error_code/8, regs->ip, cpu);
 +			printk(KERN_ERR "exec_limit: %08lx, user_cs: %08x/%08x, CPU_cs: %08x/%08x.\n",
-+				current->mm->context.exec_limit, desc1->a, desc1->b, desc2->a, desc2->b);
++				current->mm->context.exec_limit,
++				desc1->a, desc1->b, desc2->a, desc2->b);
 +		}
 +		load_user_cs_desc(cpu, current->mm);
 +
@@ -304,7 +328,7 @@
  #endif
  
  static void __kprobes
-@@ -320,6 +377,29 @@ do_general_protection(struct pt_regs *regs, long error_code)
+@@ -320,6 +388,29 @@ do_general_protection(struct pt_regs *regs, long error_code)
  	if (!user_mode(regs))
  		goto gp_in_kernel;
  
@@ -322,7 +346,7 @@
 +
 +	if (print_fatal_signals) {
 +		printk(KERN_ERR "#GPF(%ld[seg:%lx]) at %08lx, CPU#%d.\n",
-+			error_code, error_code/8, regs->ip, smp_processor_id());
++			error_code, error_code/8, regs->ip, cpu);
 +		printk(KERN_ERR "exec_limit: %08lx, user_cs: %08x/%08x.\n",
 +			current->mm->context.exec_limit,
 +			current->mm->context.user_cs.a,
@@ -334,7 +358,7 @@
  	tsk->thread.error_code = error_code;
  	tsk->thread.trap_no = 13;
  
-@@ -931,19 +1011,37 @@ do_device_not_available(struct pt_regs *regs, long error)
+@@ -931,19 +1022,37 @@ do_device_not_available(struct pt_regs *regs, long error)
  }
  
  #ifdef CONFIG_X86_32
@@ -702,7 +726,7 @@
  		.procname	= "core_uses_pid",
  		.data		= &core_uses_pid,
 diff --git a/mm/mmap.c b/mm/mmap.c
-index d4855a6..0850042 100644
+index d4855a6..ac07ab7 100644
 --- a/mm/mmap.c
 +++ b/mm/mmap.c
 @@ -27,6 +27,7 @@
@@ -790,7 +814,7 @@
  	if (file && file->f_op && file->f_op->get_unmapped_area)
  		get_area = file->f_op->get_unmapped_area;
  	addr = get_area(file, addr, len, pgoff, flags);
-@@ -1460,8 +1484,74 @@ get_unmapped_area(struct file *file, unsigned long addr, unsigned long len,
+@@ -1460,8 +1484,76 @@ get_unmapped_area(struct file *file, unsigned long addr, unsigned long len,
  
  	return arch_rebalance_pgtables(addr, len);
  }
@@ -798,7 +822,8 @@
 +
 +#define SHLIB_BASE	0x00110000
 +
-+unsigned long arch_get_unmapped_exec_area(struct file *filp, unsigned long addr0,
++unsigned long
++arch_get_unmapped_exec_area(struct file *filp, unsigned long addr0,
 +		unsigned long len0, unsigned long pgoff, unsigned long flags)
 +{
 +	unsigned long addr = addr0, len = len0;
@@ -812,9 +837,10 @@
 +	if (flags & MAP_FIXED)
 +		return addr;
 +
-+	if (!addr) {
++	if (!addr)
 +		addr = randomize_range(SHLIB_BASE, 0x01000000, len);
-+	} else {
++
++	if (addr) {
 +		addr = PAGE_ALIGN(addr);
 +		vma = find_vma(mm, addr);
 +		if (TASK_SIZE - len >= addr &&
@@ -866,7 +892,7 @@
  
  /* Look up the first VMA which satisfies  addr < vm_end,  NULL if none. */
  struct vm_area_struct * find_vma(struct mm_struct * mm, unsigned long addr)
-@@ -1536,6 +1626,14 @@ out:
+@@ -1536,6 +1628,14 @@ out:
  	return prev ? prev->vm_next : vma;
  }
  
@@ -881,7 +907,7 @@
  /*
   * Verify that the stack growth is acceptable and
   * update accounting. This is shared with both the
-@@ -1552,7 +1650,7 @@ static int acct_stack_growth(struct vm_area_struct * vma, unsigned long size, un
+@@ -1552,7 +1652,7 @@ static int acct_stack_growth(struct vm_area_struct * vma, unsigned long size, un
  		return -ENOMEM;
  
  	/* Stack limit test */
@@ -890,7 +916,7 @@
  		return -ENOMEM;
  
  	/* mlock limit tests */
-@@ -1862,10 +1960,14 @@ int split_vma(struct mm_struct * mm, struct vm_area_struct * vma,
+@@ -1862,10 +1962,14 @@ int split_vma(struct mm_struct * mm, struct vm_area_struct * vma,
  	if (new->vm_ops && new->vm_ops->open)
  		new->vm_ops->open(new);
  
@@ -907,7 +933,7 @@
  		vma_adjust(vma, vma->vm_start, addr, vma->vm_pgoff, new);
  
  	return 0;
-@@ -2109,6 +2211,7 @@ void exit_mmap(struct mm_struct *mm)
+@@ -2109,6 +2213,7 @@ void exit_mmap(struct mm_struct *mm)
  	vm_unacct_memory(nr_accounted);
  	free_pgtables(tlb, vma, FIRST_USER_ADDRESS, 0);
  	tlb_finish_mmu(tlb, 0, end);
@@ -916,26 +942,25 @@
  	/*
  	 * Walk the list again, actually closing and freeing it,
 diff --git a/mm/mprotect.c b/mm/mprotect.c
-index fded06f..cdfcbd2 100644
+index fded06f..a2cf942 100644
 --- a/mm/mprotect.c
 +++ b/mm/mprotect.c
-@@ -24,8 +24,15 @@
+@@ -24,9 +24,14 @@
  #include <linux/mmu_notifier.h>
  #include <asm/uaccess.h>
  #include <asm/pgtable.h>
 +#include <asm/pgalloc.h>
  #include <asm/cacheflush.h>
  #include <asm/tlbflush.h>
-+#ifdef CONFIG_X86
-+#include <asm/desc.h>
-+#endif
+ 
 +#ifndef arch_remove_exec_range
 +#define arch_remove_exec_range(mm, limit)      do { ; } while (0)
 +#endif
- 
++
  #ifndef pgprot_modify
  static inline pgprot_t pgprot_modify(pgprot_t oldprot, pgprot_t newprot)
-@@ -140,7 +147,7 @@ mprotect_fixup(struct vm_area_struct *vma, struct vm_area_struct **pprev,
+ {
+@@ -140,7 +145,7 @@ mprotect_fixup(struct vm_area_struct *vma, struct vm_area_struct **pprev,
  	struct mm_struct *mm = vma->vm_mm;
  	unsigned long oldflags = vma->vm_flags;
  	long nrpages = (end - start) >> PAGE_SHIFT;
@@ -944,7 +969,7 @@
  	pgoff_t pgoff;
  	int error;
  	int dirty_accountable = 0;
-@@ -204,6 +211,9 @@ success:
+@@ -204,6 +209,9 @@ success:
  		dirty_accountable = 1;
  	}
  



From kyle at fedoraproject.org  Mon Jan 19 06:23:07 2009
From: kyle at fedoraproject.org (Kyle McMartin)
Date: Mon, 19 Jan 2009 06:23:07 +0000 (UTC)
Subject: rpms/kernel/F-9 kernel.spec, 1.895, 1.896 linux-2.6-execshield.patch,
	1.91, 1.92
Message-ID: <20090119062307.5B21B700F8@cvs1.fedora.phx.redhat.com>

Author: kyle

Update of /cvs/pkgs/rpms/kernel/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3530

Modified Files:
	kernel.spec linux-2.6-execshield.patch 
Log Message:
* Mon Jan 19 2009 Kyle McMartin <kyle at redhat.com>
- execshield fixes: should no longer generate spurious handled GPFs,
  fixes randomization of executables. also some clean ups.



Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/kernel.spec,v
retrieving revision 1.895
retrieving revision 1.896
diff -u -r1.895 -r1.896
--- kernel.spec	14 Jan 2009 16:03:04 -0000	1.895
+++ kernel.spec	19 Jan 2009 06:22:36 -0000	1.896
@@ -1779,6 +1779,10 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Mon Jan 19 2009 Kyle McMartin <kyle at redhat.com>
+- execshield fixes: should no longer generate spurious handled GPFs,
+  fixes randomization of executables. also some clean ups.
+
 * Wed Jan 14 2009 Hans de Goede <hdegoede at redhat.com>
 - Rebase gspca git patch and re-enable
 - Add gscpa-stv06xx (qc-usb replacement) driver from its own git tree

linux-2.6-execshield.patch:

Index: linux-2.6-execshield.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/linux-2.6-execshield.patch,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -r1.91 -r1.92
--- linux-2.6-execshield.patch	12 Jan 2009 19:54:17 -0000	1.91
+++ linux-2.6-execshield.patch	19 Jan 2009 06:22:37 -0000	1.92
@@ -1,5 +1,5 @@
 diff --git a/arch/x86/include/asm/desc.h b/arch/x86/include/asm/desc.h
-index e6b82b1..c314884 100644
+index e6b82b1..aea00b6 100644
 --- a/arch/x86/include/asm/desc.h
 +++ b/arch/x86/include/asm/desc.h
 @@ -6,6 +6,7 @@
@@ -20,7 +20,7 @@
  
  #define write_ldt_entry(dt, entry, desc)	\
  	native_write_ldt_entry(dt, entry, desc)
-@@ -381,6 +385,24 @@ static inline void set_system_intr_gate_ist(int n, void *addr, unsigned ist)
+@@ -381,6 +385,27 @@ static inline void set_system_intr_gate_ist(int n, void *addr, unsigned ist)
  	_set_gate(n, GATE_INTERRUPT, addr, 0x3, ist, __KERNEL_CS);
  }
  
@@ -37,8 +37,11 @@
 +	get_cpu_gdt_table(cpu)[GDT_ENTRY_DEFAULT_USER_CS] = (mm)->context.user_cs;
 +}
 +
++#define arch_add_exec_range	arch_add_exec_range
 +extern void arch_add_exec_range(struct mm_struct *mm, unsigned long limit);
++#define arch_remove_exec_range	arch_remove_exec_range
 +extern void arch_remove_exec_range(struct mm_struct *mm, unsigned long limit);
++#define arch_flush_exec_range	arch_flush_exec_range
 +extern void arch_flush_exec_range(struct mm_struct *mm);
 +#endif /* CONFIG_X86_32 */
 +
@@ -151,21 +154,31 @@
  	.load_idt = native_load_idt,
  	.store_gdt = native_store_gdt,
 diff --git a/arch/x86/kernel/process_32.c b/arch/x86/kernel/process_32.c
-index 0a1302f..ab96a10 100644
+index 0a1302f..7d5927e 100644
 --- a/arch/x86/kernel/process_32.c
 +++ b/arch/x86/kernel/process_32.c
-@@ -354,6 +354,10 @@ start_thread(struct pt_regs *regs, unsigned long new_ip, unsigned long new_sp)
+@@ -345,6 +345,8 @@ int copy_thread(int nr, unsigned long clone_flags, unsigned long sp,
+ void
+ start_thread(struct pt_regs *regs, unsigned long new_ip, unsigned long new_sp)
+ {
++	int cpu;
++
+ 	__asm__("movl %0, %%gs" :: "r"(0));
+ 	regs->fs		= 0;
+ 	set_fs(USER_DS);
+@@ -354,6 +356,11 @@ start_thread(struct pt_regs *regs, unsigned long new_ip, unsigned long new_sp)
  	regs->cs		= __USER_CS;
  	regs->ip		= new_ip;
  	regs->sp		= new_sp;
-+	preempt_disable();
-+	load_user_cs_desc(smp_processor_id(), current->mm);
-+	preempt_enable();
++
++	cpu = get_cpu();
++	load_user_cs_desc(cpu, current->mm);
++	put_cpu();
 +
  	/*
  	 * Free the old FP and other extended state
  	 */
-@@ -558,7 +562,8 @@ struct task_struct * __switch_to(struct task_struct *prev_p, struct task_struct
+@@ -558,7 +565,8 @@ struct task_struct * __switch_to(struct task_struct *prev_p, struct task_struct
  	/* never put a printk in __switch_to... printk() calls wake_up*() indirectly */
  
  	__unlazy_fpu(prev_p);
@@ -175,7 +188,7 @@
  
  	/* we're going to use this soon, after a few expensive things */
  	if (next_p->fpu_counter > 5)
-@@ -731,3 +736,39 @@ unsigned long arch_randomize_brk(struct mm_struct *mm)
+@@ -731,3 +739,39 @@ unsigned long arch_randomize_brk(struct mm_struct *mm)
  	unsigned long range_end = mm->brk + 0x02000000;
  	return randomize_range(mm->brk, range_end, 0) ? : mm->brk;
  }
@@ -185,9 +198,9 @@
 +	mm->context.exec_limit = limit;
 +	set_user_cs(&mm->context.user_cs, limit);
 +	if (mm == current->mm) {
-+		preempt_disable();
-+		load_user_cs_desc(smp_processor_id(), mm);
-+		preempt_enable();
++		int cpu = get_cpu();
++		load_user_cs_desc(cpu, mm);
++		put_cpu();
 +	}
 +}
 +
@@ -237,14 +250,25 @@
  	if (!cpu_isset(cpu, flush_cpumask))
  		goto out;
 diff --git a/arch/x86/kernel/traps.c b/arch/x86/kernel/traps.c
-index 04d242a..bb52785 100644
+index 04d242a..e478f3b 100644
 --- a/arch/x86/kernel/traps.c
 +++ b/arch/x86/kernel/traps.c
-@@ -159,6 +159,63 @@ static int lazy_iobitmap_copy(void)
+@@ -159,6 +159,74 @@ static int lazy_iobitmap_copy(void)
  
  	return 0;
  }
 +
++static inline int
++__compare_user_cs_desc(const struct desc_struct * const desc1,
++	const struct desc_struct * const desc2)
++{
++	return ((desc1->limit0 != desc2->limit0) ||
++		(desc1->limit != desc2->limit) ||
++		(desc1->base0 != desc2->base0) ||
++		(desc1->base1 != desc2->base1) ||
++		(desc1->base2 != desc2->base2));
++}
++
 +/*
 + * lazy-check for CS validity on exec-shield binaries:
 + *
@@ -281,8 +305,7 @@
 +	desc1 = &current->mm->context.user_cs;
 +	desc2 = get_cpu_gdt_table(cpu) + GDT_ENTRY_DEFAULT_USER_CS;
 +
-+	if ((desc1->a & 0xff0000ff) != (desc2->a & 0xff0000ff) ||
-+	    desc1->b != desc2->b) {
++	if (__compare_user_cs_desc(desc1, desc2)) {
 +		/*
 +		 * The CS was not in sync - reload it and retry the
 +		 * instruction. If the instruction still faults then
@@ -290,9 +313,10 @@
 +		 */
 +		if (print_fatal_signals >= 2) {
 +			printk(KERN_ERR "#GPF fixup (%ld[seg:%lx]) at %08lx, CPU#%d.\n",
-+				error_code, error_code/8, regs->ip, smp_processor_id());
++				error_code, error_code/8, regs->ip, cpu);
 +			printk(KERN_ERR "exec_limit: %08lx, user_cs: %08x/%08x, CPU_cs: %08x/%08x.\n",
-+				current->mm->context.exec_limit, desc1->a, desc1->b, desc2->a, desc2->b);
++				current->mm->context.exec_limit,
++				desc1->a, desc1->b, desc2->a, desc2->b);
 +		}
 +		load_user_cs_desc(cpu, current->mm);
 +
@@ -304,7 +328,7 @@
  #endif
  
  static void __kprobes
-@@ -320,6 +377,29 @@ do_general_protection(struct pt_regs *regs, long error_code)
+@@ -320,6 +388,29 @@ do_general_protection(struct pt_regs *regs, long error_code)
  	if (!user_mode(regs))
  		goto gp_in_kernel;
  
@@ -322,7 +346,7 @@
 +
 +	if (print_fatal_signals) {
 +		printk(KERN_ERR "#GPF(%ld[seg:%lx]) at %08lx, CPU#%d.\n",
-+			error_code, error_code/8, regs->ip, smp_processor_id());
++			error_code, error_code/8, regs->ip, cpu);
 +		printk(KERN_ERR "exec_limit: %08lx, user_cs: %08x/%08x.\n",
 +			current->mm->context.exec_limit,
 +			current->mm->context.user_cs.a,
@@ -334,7 +358,7 @@
  	tsk->thread.error_code = error_code;
  	tsk->thread.trap_no = 13;
  
-@@ -931,19 +1011,37 @@ do_device_not_available(struct pt_regs *regs, long error)
+@@ -931,19 +1022,37 @@ do_device_not_available(struct pt_regs *regs, long error)
  }
  
  #ifdef CONFIG_X86_32
@@ -702,7 +726,7 @@
  		.procname	= "core_uses_pid",
  		.data		= &core_uses_pid,
 diff --git a/mm/mmap.c b/mm/mmap.c
-index d4855a6..0850042 100644
+index d4855a6..ac07ab7 100644
 --- a/mm/mmap.c
 +++ b/mm/mmap.c
 @@ -27,6 +27,7 @@
@@ -790,7 +814,7 @@
  	if (file && file->f_op && file->f_op->get_unmapped_area)
  		get_area = file->f_op->get_unmapped_area;
  	addr = get_area(file, addr, len, pgoff, flags);
-@@ -1460,8 +1484,74 @@ get_unmapped_area(struct file *file, unsigned long addr, unsigned long len,
+@@ -1460,8 +1484,76 @@ get_unmapped_area(struct file *file, unsigned long addr, unsigned long len,
  
  	return arch_rebalance_pgtables(addr, len);
  }
@@ -798,7 +822,8 @@
 +
 +#define SHLIB_BASE	0x00110000
 +
-+unsigned long arch_get_unmapped_exec_area(struct file *filp, unsigned long addr0,
++unsigned long
++arch_get_unmapped_exec_area(struct file *filp, unsigned long addr0,
 +		unsigned long len0, unsigned long pgoff, unsigned long flags)
 +{
 +	unsigned long addr = addr0, len = len0;
@@ -812,9 +837,10 @@
 +	if (flags & MAP_FIXED)
 +		return addr;
 +
-+	if (!addr) {
++	if (!addr)
 +		addr = randomize_range(SHLIB_BASE, 0x01000000, len);
-+	} else {
++
++	if (addr) {
 +		addr = PAGE_ALIGN(addr);
 +		vma = find_vma(mm, addr);
 +		if (TASK_SIZE - len >= addr &&
@@ -866,7 +892,7 @@
  
  /* Look up the first VMA which satisfies  addr < vm_end,  NULL if none. */
  struct vm_area_struct * find_vma(struct mm_struct * mm, unsigned long addr)
-@@ -1536,6 +1626,14 @@ out:
+@@ -1536,6 +1628,14 @@ out:
  	return prev ? prev->vm_next : vma;
  }
  
@@ -881,7 +907,7 @@
  /*
   * Verify that the stack growth is acceptable and
   * update accounting. This is shared with both the
-@@ -1552,7 +1650,7 @@ static int acct_stack_growth(struct vm_area_struct * vma, unsigned long size, un
+@@ -1552,7 +1652,7 @@ static int acct_stack_growth(struct vm_area_struct * vma, unsigned long size, un
  		return -ENOMEM;
  
  	/* Stack limit test */
@@ -890,7 +916,7 @@
  		return -ENOMEM;
  
  	/* mlock limit tests */
-@@ -1862,10 +1960,14 @@ int split_vma(struct mm_struct * mm, struct vm_area_struct * vma,
+@@ -1862,10 +1962,14 @@ int split_vma(struct mm_struct * mm, struct vm_area_struct * vma,
  	if (new->vm_ops && new->vm_ops->open)
  		new->vm_ops->open(new);
  
@@ -907,7 +933,7 @@
  		vma_adjust(vma, vma->vm_start, addr, vma->vm_pgoff, new);
  
  	return 0;
-@@ -2109,6 +2211,7 @@ void exit_mmap(struct mm_struct *mm)
+@@ -2109,6 +2213,7 @@ void exit_mmap(struct mm_struct *mm)
  	vm_unacct_memory(nr_accounted);
  	free_pgtables(tlb, vma, FIRST_USER_ADDRESS, 0);
  	tlb_finish_mmu(tlb, 0, end);
@@ -916,26 +942,25 @@
  	/*
  	 * Walk the list again, actually closing and freeing it,
 diff --git a/mm/mprotect.c b/mm/mprotect.c
-index fded06f..cdfcbd2 100644
+index fded06f..a2cf942 100644
 --- a/mm/mprotect.c
 +++ b/mm/mprotect.c
-@@ -24,8 +24,15 @@
+@@ -24,9 +24,14 @@
  #include <linux/mmu_notifier.h>
  #include <asm/uaccess.h>
  #include <asm/pgtable.h>
 +#include <asm/pgalloc.h>
  #include <asm/cacheflush.h>
  #include <asm/tlbflush.h>
-+#ifdef CONFIG_X86
-+#include <asm/desc.h>
-+#endif
+ 
 +#ifndef arch_remove_exec_range
 +#define arch_remove_exec_range(mm, limit)      do { ; } while (0)
 +#endif
- 
++
  #ifndef pgprot_modify
  static inline pgprot_t pgprot_modify(pgprot_t oldprot, pgprot_t newprot)
-@@ -140,7 +147,7 @@ mprotect_fixup(struct vm_area_struct *vma, struct vm_area_struct **pprev,
+ {
+@@ -140,7 +145,7 @@ mprotect_fixup(struct vm_area_struct *vma, struct vm_area_struct **pprev,
  	struct mm_struct *mm = vma->vm_mm;
  	unsigned long oldflags = vma->vm_flags;
  	long nrpages = (end - start) >> PAGE_SHIFT;
@@ -944,7 +969,7 @@
  	pgoff_t pgoff;
  	int error;
  	int dirty_accountable = 0;
-@@ -204,6 +211,9 @@ success:
+@@ -204,6 +209,9 @@ success:
  		dirty_accountable = 1;
  	}
  



From kyle at fedoraproject.org  Mon Jan 19 06:23:58 2009
From: kyle at fedoraproject.org (Kyle McMartin)
Date: Mon, 19 Jan 2009 06:23:58 +0000 (UTC)
Subject: rpms/kernel/devel kernel.spec, 1.1222,
	1.1223 linux-2.6-execshield.patch, 1.101, 1.102
Message-ID: <20090119062358.E180D700F8@cvs1.fedora.phx.redhat.com>

Author: kyle

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3677

Modified Files:
	kernel.spec linux-2.6-execshield.patch 
Log Message:
* Mon Jan 19 2009 Kyle McMartin <kyle at redhat.com>
- execshield fixes: should no longer generate spurious handled GPFs,
  fixes randomization of executables. also some clean ups.



Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1222
retrieving revision 1.1223
diff -u -r1.1222 -r1.1223
--- kernel.spec	18 Jan 2009 01:49:11 -0000	1.1222
+++ kernel.spec	19 Jan 2009 06:23:28 -0000	1.1223
@@ -1735,6 +1735,10 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Mon Jan 19 2009 Kyle McMartin <kyle at redhat.com>
+- execshield fixes: should no longer generate spurious handled GPFs,
+  fixes randomization of executables. also some clean ups.
+
 * Sat Jan 17 2009 Dave Jones <davej at redhat.com>
 - 2.6.29-rc2-git1
 

linux-2.6-execshield.patch:

Index: linux-2.6-execshield.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-execshield.patch,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -r1.101 -r1.102
--- linux-2.6-execshield.patch	10 Jan 2009 07:46:11 -0000	1.101
+++ linux-2.6-execshield.patch	19 Jan 2009 06:23:28 -0000	1.102
@@ -1,5 +1,5 @@
 diff --git a/arch/x86/include/asm/desc.h b/arch/x86/include/asm/desc.h
-index dc27705..6aa5630 100644
+index dc27705..34ed3a2 100644
 --- a/arch/x86/include/asm/desc.h
 +++ b/arch/x86/include/asm/desc.h
 @@ -6,6 +6,7 @@
@@ -20,7 +20,7 @@
  
  #define write_ldt_entry(dt, entry, desc)	\
  	native_write_ldt_entry(dt, entry, desc)
-@@ -379,6 +383,24 @@ static inline void set_system_intr_gate_ist(int n, void *addr, unsigned ist)
+@@ -379,6 +383,27 @@ static inline void set_system_intr_gate_ist(int n, void *addr, unsigned ist)
  	_set_gate(n, GATE_INTERRUPT, addr, 0x3, ist, __KERNEL_CS);
  }
  
@@ -37,6 +37,9 @@
 +	get_cpu_gdt_table(cpu)[GDT_ENTRY_DEFAULT_USER_CS] = (mm)->context.user_cs;
 +}
 +
++#define arch_add_exec_range arch_add_exec_range
++#define arch_remove_exec_range arch_remove_exec_range
++#define arch_flush_exec_range arch_flush_exec_range
 +extern void arch_add_exec_range(struct mm_struct *mm, unsigned long limit);
 +extern void arch_remove_exec_range(struct mm_struct *mm, unsigned long limit);
 +extern void arch_flush_exec_range(struct mm_struct *mm);
@@ -111,10 +114,10 @@
  
  extern struct pt_regs *idle_regs(struct pt_regs *);
 diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c
-index 3f95a40..2c2893a 100644
+index 83492b1..a84c787 100644
 --- a/arch/x86/kernel/cpu/common.c
 +++ b/arch/x86/kernel/cpu/common.c
-@@ -688,6 +688,21 @@ static void __cpuinit identify_cpu(struct cpuinfo_x86 *c)
+@@ -708,6 +708,21 @@ static void __cpuinit identify_cpu(struct cpuinfo_x86 *c)
  	 * we do "generic changes."
  	 */
  
@@ -151,21 +154,31 @@
  	.load_idt = native_load_idt,
  	.store_gdt = native_store_gdt,
 diff --git a/arch/x86/kernel/process_32.c b/arch/x86/kernel/process_32.c
-index 3ba155d..09ae04c 100644
+index a546f55..f180caf 100644
 --- a/arch/x86/kernel/process_32.c
 +++ b/arch/x86/kernel/process_32.c
-@@ -356,6 +356,10 @@ start_thread(struct pt_regs *regs, unsigned long new_ip, unsigned long new_sp)
+@@ -346,6 +346,8 @@ int copy_thread(int nr, unsigned long clone_flags, unsigned long sp,
+ void
+ start_thread(struct pt_regs *regs, unsigned long new_ip, unsigned long new_sp)
+ {
++	int cpu;
++
+ 	__asm__("movl %0, %%gs" : : "r"(0));
+ 	regs->fs		= 0;
+ 	set_fs(USER_DS);
+@@ -355,6 +357,11 @@ start_thread(struct pt_regs *regs, unsigned long new_ip, unsigned long new_sp)
  	regs->cs		= __USER_CS;
  	regs->ip		= new_ip;
  	regs->sp		= new_sp;
-+	preempt_disable();
-+	load_user_cs_desc(smp_processor_id(), current->mm);
-+	preempt_enable();
++
++	cpu = get_cpu();
++	load_user_cs_desc(cpu, current->mm);
++	put_cpu();
 +
  	/*
  	 * Free the old FP and other extended state
  	 */
-@@ -523,7 +527,8 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
+@@ -522,7 +529,8 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
  	/* never put a printk in __switch_to... printk() calls wake_up*() indirectly */
  
  	__unlazy_fpu(prev_p);
@@ -175,7 +188,7 @@
  
  	/* we're going to use this soon, after a few expensive things */
  	if (next_p->fpu_counter > 5)
-@@ -696,3 +701,39 @@ unsigned long arch_randomize_brk(struct mm_struct *mm)
+@@ -695,3 +703,41 @@ unsigned long arch_randomize_brk(struct mm_struct *mm)
  	unsigned long range_end = mm->brk + 0x02000000;
  	return randomize_range(mm->brk, range_end, 0) ? : mm->brk;
  }
@@ -185,9 +198,11 @@
 +	mm->context.exec_limit = limit;
 +	set_user_cs(&mm->context.user_cs, limit);
 +	if (mm == current->mm) {
-+		preempt_disable();
-+		load_user_cs_desc(smp_processor_id(), mm);
-+		preempt_enable();
++		int cpu;
++
++		cpu = get_cpu();
++		load_user_cs_desc(cpu, mm);
++		put_cpu();
 +	}
 +}
 +
@@ -237,14 +252,25 @@
  	if (!cpu_isset(cpu, flush_cpumask))
  		goto out;
 diff --git a/arch/x86/kernel/traps.c b/arch/x86/kernel/traps.c
-index c9a666c..b702c77 100644
+index 98c2d05..db483ea 100644
 --- a/arch/x86/kernel/traps.c
 +++ b/arch/x86/kernel/traps.c
-@@ -157,6 +157,63 @@ static int lazy_iobitmap_copy(void)
+@@ -154,6 +154,76 @@ static int lazy_iobitmap_copy(void)
  
  	return 0;
  }
 +
++static inline int
++__compare_user_cs_desc(const struct desc_struct *desc1,
++	const struct desc_struct *desc2)
++{
++	return ((desc1->limit0 != desc2->limit0) ||
++		(desc1->limit != desc2->limit) ||
++		(desc1->base0 != desc2->base0) ||
++		(desc1->base1 != desc2->base1) ||
++		(desc1->base2 != desc2->base2));
++}
++
 +/*
 + * lazy-check for CS validity on exec-shield binaries:
 + *
@@ -281,8 +307,7 @@
 +	desc1 = &current->mm->context.user_cs;
 +	desc2 = get_cpu_gdt_table(cpu) + GDT_ENTRY_DEFAULT_USER_CS;
 +
-+	if ((desc1->a & 0xff0000ff) != (desc2->a & 0xff0000ff) ||
-+	    desc1->b != desc2->b) {
++	if (__compare_user_cs_desc(desc1, desc2)) {
 +		/*
 +		 * The CS was not in sync - reload it and retry the
 +		 * instruction. If the instruction still faults then
@@ -290,10 +315,13 @@
 +		 */
 +		if (print_fatal_signals >= 2) {
 +			printk(KERN_ERR "#GPF fixup (%ld[seg:%lx]) at %08lx, CPU#%d.\n",
-+				error_code, error_code/8, regs->ip, smp_processor_id());
++				error_code, error_code/8, regs->ip,
++				smp_processor_id());
 +			printk(KERN_ERR "exec_limit: %08lx, user_cs: %08x/%08x, CPU_cs: %08x/%08x.\n",
-+				current->mm->context.exec_limit, desc1->a, desc1->b, desc2->a, desc2->b);
++				current->mm->context.exec_limit,
++				desc1->a, desc1->b, desc2->a, desc2->b);
 +		}
++
 +		load_user_cs_desc(cpu, current->mm);
 +
 +		return 1;
@@ -304,7 +332,7 @@
  #endif
  
  static void __kprobes
-@@ -320,6 +377,29 @@ do_general_protection(struct pt_regs *regs, long error_code)
+@@ -317,6 +387,29 @@ do_general_protection(struct pt_regs *regs, long error_code)
  	if (!user_mode(regs))
  		goto gp_in_kernel;
  
@@ -334,7 +362,7 @@
  	tsk->thread.error_code = error_code;
  	tsk->thread.trap_no = 13;
  
-@@ -926,19 +1006,37 @@ do_device_not_available(struct pt_regs *regs, long error)
+@@ -923,19 +1016,37 @@ do_device_not_available(struct pt_regs *regs, long error)
  }
  
  #ifdef CONFIG_X86_32
@@ -584,10 +612,10 @@
  		min_flt = task->min_flt;
  		maj_flt = task->maj_flt;
 diff --git a/include/linux/mm.h b/include/linux/mm.h
-index b91a73f..a0f6d93 100644
+index e8ddc98..bf87f4a 100644
 --- a/include/linux/mm.h
 +++ b/include/linux/mm.h
-@@ -1123,7 +1123,13 @@ extern int install_special_mapping(struct mm_struct *mm,
+@@ -1122,7 +1122,13 @@ extern int install_special_mapping(struct mm_struct *mm,
  				   unsigned long addr, unsigned long len,
  				   unsigned long flags, struct page **pages);
  
@@ -659,7 +687,7 @@
  arch_get_unmapped_area_topdown(struct file *filp, unsigned long addr,
  			  unsigned long len, unsigned long pgoff,
 diff --git a/kernel/sysctl.c b/kernel/sysctl.c
-index 89d7443..6ea2333 100644
+index 368d163..2e4ab66 100644
 --- a/kernel/sysctl.c
 +++ b/kernel/sysctl.c
 @@ -85,6 +85,26 @@ extern int sysctl_nr_open_min, sysctl_nr_open_max;
@@ -689,7 +717,7 @@
  #ifdef CONFIG_RCU_TORTURE_TEST
  extern int rcutorture_runnable;
  #endif /* #ifdef CONFIG_RCU_TORTURE_TEST */
-@@ -377,6 +397,14 @@ static struct ctl_table kern_table[] = {
+@@ -378,6 +398,14 @@ static struct ctl_table kern_table[] = {
  		.proc_handler	= &proc_dointvec,
  	},
  	{
@@ -705,7 +733,7 @@
  		.procname	= "core_uses_pid",
  		.data		= &core_uses_pid,
 diff --git a/mm/mmap.c b/mm/mmap.c
-index 7496231..4cfb9fe 100644
+index 8d95902..c84ff1f 100644
 --- a/mm/mmap.c
 +++ b/mm/mmap.c
 @@ -27,6 +27,7 @@
@@ -793,7 +821,7 @@
  	if (file && file->f_op && file->f_op->get_unmapped_area)
  		get_area = file->f_op->get_unmapped_area;
  	addr = get_area(file, addr, len, pgoff, flags);
-@@ -1459,8 +1483,74 @@ get_unmapped_area(struct file *file, unsigned long addr, unsigned long len,
+@@ -1459,8 +1483,76 @@ get_unmapped_area(struct file *file, unsigned long addr, unsigned long len,
  
  	return arch_rebalance_pgtables(addr, len);
  }
@@ -801,7 +829,8 @@
 +
 +#define SHLIB_BASE	0x00110000
 +
-+unsigned long arch_get_unmapped_exec_area(struct file *filp, unsigned long addr0,
++unsigned long
++arch_get_unmapped_exec_area(struct file *filp, unsigned long addr0,
 +		unsigned long len0, unsigned long pgoff, unsigned long flags)
 +{
 +	unsigned long addr = addr0, len = len0;
@@ -815,9 +844,10 @@
 +	if (flags & MAP_FIXED)
 +		return addr;
 +
-+	if (!addr) {
++	if (!addr)
 +		addr = randomize_range(SHLIB_BASE, 0x01000000, len);
-+	} else {
++
++	if (addr) {
 +		addr = PAGE_ALIGN(addr);
 +		vma = find_vma(mm, addr);
 +		if (TASK_SIZE - len >= addr &&
@@ -869,7 +899,7 @@
  
  /* Look up the first VMA which satisfies  addr < vm_end,  NULL if none. */
  struct vm_area_struct *find_vma(struct mm_struct *mm, unsigned long addr)
-@@ -1535,6 +1625,14 @@ out:
+@@ -1535,6 +1627,14 @@ out:
  	return prev ? prev->vm_next : vma;
  }
  
@@ -884,7 +914,7 @@
  /*
   * Verify that the stack growth is acceptable and
   * update accounting. This is shared with both the
-@@ -1551,7 +1649,7 @@ static int acct_stack_growth(struct vm_area_struct *vma, unsigned long size, uns
+@@ -1551,7 +1651,7 @@ static int acct_stack_growth(struct vm_area_struct *vma, unsigned long size, uns
  		return -ENOMEM;
  
  	/* Stack limit test */
@@ -893,7 +923,7 @@
  		return -ENOMEM;
  
  	/* mlock limit tests */
-@@ -1861,10 +1959,14 @@ int split_vma(struct mm_struct * mm, struct vm_area_struct * vma,
+@@ -1861,10 +1961,14 @@ int split_vma(struct mm_struct * mm, struct vm_area_struct * vma,
  	if (new->vm_ops && new->vm_ops->open)
  		new->vm_ops->open(new);
  
@@ -910,7 +940,7 @@
  		vma_adjust(vma, vma->vm_start, addr, vma->vm_pgoff, new);
  
  	return 0;
-@@ -2111,6 +2213,7 @@ void exit_mmap(struct mm_struct *mm)
+@@ -2111,6 +2215,7 @@ void exit_mmap(struct mm_struct *mm)
  	vm_unacct_memory(nr_accounted);
  	free_pgtables(tlb, vma, FIRST_USER_ADDRESS, 0);
  	tlb_finish_mmu(tlb, 0, end);
@@ -919,26 +949,25 @@
  	/*
  	 * Walk the list again, actually closing and freeing it,
 diff --git a/mm/mprotect.c b/mm/mprotect.c
-index d0f6e7c..d51a400 100644
+index abe2694..eb16148 100644
 --- a/mm/mprotect.c
 +++ b/mm/mprotect.c
-@@ -25,8 +25,15 @@
+@@ -25,9 +25,14 @@
  #include <linux/migrate.h>
  #include <asm/uaccess.h>
  #include <asm/pgtable.h>
 +#include <asm/pgalloc.h>
  #include <asm/cacheflush.h>
  #include <asm/tlbflush.h>
-+#ifdef CONFIG_X86
-+#include <asm/desc.h>
-+#endif
+ 
 +#ifndef arch_remove_exec_range
 +#define arch_remove_exec_range(mm, limit)      do { ; } while (0)
 +#endif
- 
++
  #ifndef pgprot_modify
  static inline pgprot_t pgprot_modify(pgprot_t oldprot, pgprot_t newprot)
-@@ -138,7 +145,7 @@ mprotect_fixup(struct vm_area_struct *vma, struct vm_area_struct **pprev,
+ {
+@@ -138,7 +143,7 @@ mprotect_fixup(struct vm_area_struct *vma, struct vm_area_struct **pprev,
  	struct mm_struct *mm = vma->vm_mm;
  	unsigned long oldflags = vma->vm_flags;
  	long nrpages = (end - start) >> PAGE_SHIFT;
@@ -947,7 +976,7 @@
  	pgoff_t pgoff;
  	int error;
  	int dirty_accountable = 0;
-@@ -202,6 +209,9 @@ success:
+@@ -202,6 +207,9 @@ success:
  		dirty_accountable = 1;
  	}
  
@@ -958,7 +987,7 @@
  	if (is_vm_hugetlb_page(vma))
  		hugetlb_change_protection(vma, start, end, vma->vm_page_prot);
 diff --git a/mm/mremap.c b/mm/mremap.c
-index 646de95..b77db03 100644
+index a39b7b9..6bebfde 100644
 --- a/mm/mremap.c
 +++ b/mm/mremap.c
 @@ -400,8 +400,8 @@ unsigned long do_mremap(unsigned long addr,



From kyle at fedoraproject.org  Mon Jan 19 06:25:23 2009
From: kyle at fedoraproject.org (Kyle McMartin)
Date: Mon, 19 Jan 2009 06:25:23 +0000 (UTC)
Subject: rpms/kernel/F-9 kernel.spec, 1.891.2.3,
	1.891.2.4 linux-2.6-execshield.patch, 1.90, 1.90.2.1
Message-ID: <20090119062523.426C7700F8@cvs1.fedora.phx.redhat.com>

Author: kyle

Update of /cvs/pkgs/rpms/kernel/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3816

Modified Files:
      Tag: private-fedora-9-2_6_27-branch
	kernel.spec linux-2.6-execshield.patch 
Log Message:
* Mon Jan 19 2009 Kyle McMartin <kyle at redhat.com>
- execshield fixes: should no longer generate spurious handled GPFs,
  fixes randomization of executables. also some clean ups.



Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/kernel.spec,v
retrieving revision 1.891.2.3
retrieving revision 1.891.2.4
diff -u -r1.891.2.3 -r1.891.2.4
--- kernel.spec	16 Jan 2009 23:48:19 -0000	1.891.2.3
+++ kernel.spec	19 Jan 2009 06:24:52 -0000	1.891.2.4
@@ -1922,6 +1922,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 Jan 19 2009 Kyle McMartin <kyle at redhat.com>
+- execshield fixes: should no longer generate spurious handled GPFs,
+  fixes randomization of executables. also some clean ups.
+
 * Fri Jan 16 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.27.12-78.2.3.rc2
 - Linux 2.6.27.12-rc2
   Dropped patches:

linux-2.6-execshield.patch:

Index: linux-2.6-execshield.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/linux-2.6-execshield.patch,v
retrieving revision 1.90
retrieving revision 1.90.2.1
diff -u -r1.90 -r1.90.2.1
--- linux-2.6-execshield.patch	30 Oct 2008 04:41:11 -0000	1.90
+++ linux-2.6-execshield.patch	19 Jan 2009 06:24:52 -0000	1.90.2.1
@@ -1,6 +1,8 @@
---- linux-2.6.25.noarch/arch/x86/kernel/cpu/common.c~	2008-05-16 13:41:08.000000000 -0400
-+++ linux-2.6.25.noarch/arch/x86/kernel/cpu/common.c	2008-05-16 13:42:11.000000000 -0400
-@@ -479,6 +479,21 @@ void __cpuinit identify_cpu(struct cpuin
+diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c
+index 4e456bd..c061fe9 100644
+--- a/arch/x86/kernel/cpu/common.c
++++ b/arch/x86/kernel/cpu/common.c
+@@ -493,6 +493,21 @@ static void __cpuinit identify_cpu(struct cpuinfo_x86 *c)
  	 * we do "generic changes."
  	 */
  
@@ -23,10 +25,31 @@
  	if (!c->x86_model_id[0]) {
  		char *p;
 diff --git a/arch/x86/kernel/process_32.c b/arch/x86/kernel/process_32.c
-index a7d50a5..83f7b4e 100644
+index 31f40b2..e5c9006 100644
 --- a/arch/x86/kernel/process_32.c
 +++ b/arch/x86/kernel/process_32.c
-@@ -677,7 +677,8 @@ struct task_struct * __switch_to(struct task_struct *prev_p, struct task_struct
+@@ -364,6 +364,8 @@ int copy_thread(int nr, unsigned long clone_flags, unsigned long sp,
+ void
+ start_thread(struct pt_regs *regs, unsigned long new_ip, unsigned long new_sp)
+ {
++	int cpu;
++
+ 	__asm__("movl %0, %%gs" :: "r"(0));
+ 	regs->fs		= 0;
+ 	set_fs(USER_DS);
+@@ -373,6 +375,11 @@ start_thread(struct pt_regs *regs, unsigned long new_ip, unsigned long new_sp)
+ 	regs->cs		= __USER_CS;
+ 	regs->ip		= new_ip;
+ 	regs->sp		= new_sp;
++
++	cpu = get_cpu();
++	load_user_cs_desc(cpu, current->mm);
++	put_cpu();
++
+ 	/*
+ 	 * Free the old FP and other extended state
+ 	 */
+@@ -555,7 +562,8 @@ struct task_struct * __switch_to(struct task_struct *prev_p, struct task_struct
  	/* never put a printk in __switch_to... printk() calls wake_up*() indirectly */
  
  	__unlazy_fpu(prev_p);
@@ -36,11 +59,7 @@
  
  	/* we're going to use this soon, after a few expensive things */
  	if (next_p->fpu_counter > 5)
-diff --git a/arch/x86/kernel/process_32.c b/arch/x86/kernel/process_32.c
-index a7d50a5..86e35cb 100644
---- a/arch/x86/kernel/process_32.c
-+++ b/arch/x86/kernel/process_32.c
-@@ -847,3 +847,39 @@ unsigned long arch_randomize_brk(struct mm_struct *mm)
+@@ -728,3 +736,39 @@ unsigned long arch_randomize_brk(struct mm_struct *mm)
  	unsigned long range_end = mm->brk + 0x02000000;
  	return randomize_range(mm->brk, range_end, 0) ? : mm->brk;
  }
@@ -50,9 +69,9 @@
 +	mm->context.exec_limit = limit;
 +	set_user_cs(&mm->context.user_cs, limit);
 +	if (mm == current->mm) {
-+		preempt_disable();
-+		load_user_cs_desc(smp_processor_id(), mm);
-+		preempt_enable();
++		int cpu = get_cpu();
++		load_user_cs_desc(cpu, mm);
++		put_cpu();
 +	}
 +}
 +
@@ -80,8 +99,10 @@
 +	mm->context.exec_limit = 0;
 +	set_user_cs(&mm->context.user_cs, 0);
 +}
---- linux-2.6.25.noarch/arch/x86/kernel/tlb_32.c~	2008-05-16 13:30:44.000000000 -0400
-+++ linux-2.6.25.noarch/arch/x86/kernel/tlb_32.c	2008-05-16 13:31:14.000000000 -0400
+diff --git a/arch/x86/kernel/tlb_32.c b/arch/x86/kernel/tlb_32.c
+index fec1ece..f33213f 100644
+--- a/arch/x86/kernel/tlb_32.c
++++ b/arch/x86/kernel/tlb_32.c
 @@ -2,6 +2,7 @@
  #include <linux/cpu.h>
  #include <linux/interrupt.h>
@@ -90,7 +111,7 @@
  #include <asm/tlbflush.h>
  
  DEFINE_PER_CPU(struct tlb_state, cpu_tlbstate)
-@@ -92,6 +93,8 @@ void smp_invalidate_interrupt(struct pt_
+@@ -92,6 +93,8 @@ void smp_invalidate_interrupt(struct pt_regs *regs)
  	unsigned long cpu;
  
  	cpu = get_cpu();
@@ -99,14 +120,27 @@
  
  	if (!cpu_isset(cpu, flush_cpumask))
  		goto out;
---- linux-2.6.26.noarch/arch/x86/kernel/traps_32.c~	2008-07-14 20:20:15.000000000 -0400
-+++ linux-2.6.26.noarch/arch/x86/kernel/traps_32.c	2008-07-14 20:26:18.000000000 -0400
-@@ -596,7 +596,91 @@ DO_ERROR(10, SIGSEGV, "invalid TSS", inv
+diff --git a/arch/x86/kernel/traps_32.c b/arch/x86/kernel/traps_32.c
+index 03df8e4..0fd091b 100644
+--- a/arch/x86/kernel/traps_32.c
++++ b/arch/x86/kernel/traps_32.c
+@@ -584,7 +584,102 @@ DO_ERROR(10, SIGSEGV, "invalid TSS", invalid_TSS)
  DO_ERROR(11, SIGBUS, "segment not present", segment_not_present)
  DO_ERROR(12, SIGBUS, "stack segment", stack_segment)
  DO_ERROR_INFO(17, SIGBUS, "alignment check", alignment_check, BUS_ADRALN, 0, 0)
 -DO_ERROR_INFO(32, SIGILL, "iret exception", iret_error, ILL_BADSTK, 0, 1)
 +
++static inline int
++__check_user_cs_desc(const struct desc_struct * const desc1,
++	const struct desc_struct * const desc2)
++{
++	return ((desc1->limit0 != desc2->limit0) ||
++		(desc1->limit != desc2->limit) ||
++		(desc1->base0 != desc2->base0) ||
++		(desc1->base1 != desc2->base1) ||
++		(desc1->base2 != desc2->base2));
++}
++
 +/*
 + * lazy-check for CS validity on exec-shield binaries:
 + *
@@ -143,8 +177,7 @@
 +	desc1 = &current->mm->context.user_cs;
 +	desc2 = get_cpu_gdt_table(cpu) + GDT_ENTRY_DEFAULT_USER_CS;
 +
-+	if ((desc1->a & 0xff0000ff) != (desc2->a & 0xff0000ff) ||
-+	    desc1->b != desc2->b) {
++	if (__check_user_cs_desc(desc1, desc2)) {
 +		/*
 +		 * The CS was not in sync - reload it and retry the
 +		 * instruction. If the instruction still faults then
@@ -152,10 +185,11 @@
 +		 */
 +		if (print_fatal_signals >= 2) {
 +			printk(KERN_ERR "#GPF fixup (%ld[seg:%lx]) at %08lx, CPU#%d.\n",
-+				error_code, error_code/8, regs->ip, smp_processor_id());
++				error_code, error_code/8, regs->ip, cpu);
 +			printk(KERN_ERR "exec_limit: %08lx, user_cs: %08x/%08x, CPU_cs: %08x/%08x.\n",
 +				current->mm->context.exec_limit, desc1->a, desc1->b, desc2->a, desc2->b);
 +		}
++
 +		load_user_cs_desc(cpu, current->mm);
 +		return 1;
 +	}
@@ -194,7 +228,7 @@
  
  void __kprobes
  do_general_protection(struct pt_regs *regs, long error_code)
-@@ -605,6 +688,7 @@ do_general_protection(struct pt_regs *re
+@@ -593,6 +688,7 @@ do_general_protection(struct pt_regs *regs, long error_code)
  	struct thread_struct *thread;
  	struct tss_struct *tss;
  	int cpu;
@@ -202,12 +236,12 @@
  
  	cpu = get_cpu();
  	tss = &per_cpu(init_tss, cpu);
-@@ -645,6 +729,23 @@ do_general_protection(struct pt_regs *re
+@@ -634,6 +730,23 @@ do_general_protection(struct pt_regs *regs, long error_code)
  	if (!user_mode(regs))
  		goto gp_in_kernel;
  
++	cpu = get_cpu();
 +	ok = check_lazy_exec_limit(cpu, regs, error_code);
-+
 +	put_cpu();
 +
 +	if (ok)
@@ -215,7 +249,7 @@
 +
 +	if (print_fatal_signals) {
 +		printk(KERN_ERR "#GPF(%ld[seg:%lx]) at %08lx, CPU#%d.\n", error_code,
-+			error_code/8, regs->ip, smp_processor_id());
++			error_code/8, regs->ip, cpu);
 +		printk(KERN_ERR "exec_limit: %08lx, user_cs: %08x/%08x.\n",
 +			current->mm->context.exec_limit,
 +			current->mm->context.user_cs.a,
@@ -226,7 +260,7 @@
  	tsk->thread.error_code = error_code;
  	tsk->thread.trap_no = 13;
  
-@@ -662,11 +763,13 @@ do_general_protection(struct pt_regs *re
+@@ -651,11 +764,13 @@ do_general_protection(struct pt_regs *regs, long error_code)
  	return;
  
  gp_in_vm86:
@@ -241,10 +275,10 @@
  		return;
  
 diff --git a/arch/x86/mm/init_32.c b/arch/x86/mm/init_32.c
-index 8106bba..23932be 100644
+index 60ec1d0..66d1a78 100644
 --- a/arch/x86/mm/init_32.c
 +++ b/arch/x86/mm/init_32.c
-@@ -473,7 +473,7 @@ static int disable_nx __initdata;
+@@ -514,7 +514,7 @@ static int disable_nx __initdata;
   * Control non executable mappings.
   *
   * on      Enable
@@ -253,7 +287,7 @@
   */
  static int __init noexec_setup(char *str)
  {
-@@ -482,14 +482,12 @@ static int __init noexec_setup(char *str)
+@@ -523,14 +523,12 @@ static int __init noexec_setup(char *str)
  			__supported_pte_mask |= _PAGE_NX;
  			disable_nx = 0;
  		}
@@ -274,7 +308,8 @@
  
  	return 0;
  }
-@@ -782,6 +782,10 @@ unsigned long __init_refok init_memory_m
+@@ -779,7 +777,11 @@ unsigned long __init_refok init_memory_mapping(unsigned long start,
+ 	set_nx();
  	if (nx_enabled)
  		printk(KERN_INFO "NX (Execute Disable) protection: active\n");
 +	else
@@ -307,10 +342,10 @@
  	}
  }
 diff --git a/arch/x86/vdso/vdso32-setup.c b/arch/x86/vdso/vdso32-setup.c
-index 348f134..0bd5f44 100644
+index 513f330..2fb420a 100644
 --- a/arch/x86/vdso/vdso32-setup.c
 +++ b/arch/x86/vdso/vdso32-setup.c
-@@ -336,7 +336,7 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int exstack)
+@@ -331,7 +331,7 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int exstack)
  	if (compat)
  		addr = VDSO_HIGH_BASE;
  	else {
@@ -320,10 +355,10 @@
  			ret = addr;
  			goto up_fail;
 diff --git a/fs/binfmt_elf.c b/fs/binfmt_elf.c
-index 41a958a..22cbd06 100644
+index 655ed8d..09da3e5 100644
 --- a/fs/binfmt_elf.c
 +++ b/fs/binfmt_elf.c
-@@ -81,7 +81,7 @@ static struct linux_binfmt elf_format = {
+@@ -80,7 +80,7 @@ static struct linux_binfmt elf_format = {
  		.hasvdso	= 1
  };
  
@@ -332,7 +367,7 @@
  
  static int set_brk(unsigned long start, unsigned long end)
  {
-@@ -709,6 +711,11 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs)
+@@ -723,6 +723,11 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs)
  			break;
  		}
  
@@ -344,7 +379,7 @@
  	/* Some simple consistency checks for the interpreter */
  	if (elf_interpreter) {
  		retval = -ELIBBAD;
-@@ -721,6 +721,15 @@ static int load_elf_binary(struct linux_
+@@ -742,6 +747,15 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs)
  	if (retval)
  		goto out_free_dentry;
  
@@ -360,7 +395,7 @@
  	/* OK, This is the point of no return */
  	current->flags &= ~PF_FORKNOEXEC;
  	current->mm->def_flags = def_flags;
-@@ -741,7 +757,8 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs)
+@@ -749,7 +763,8 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs)
  	/* Do this immediately, since STACK_TOP as used in setup_arg_pages
  	   may depend on the personality.  */
  	SET_PERSONALITY(loc->elf_ex, 0);
@@ -370,7 +405,7 @@
  		current->personality |= READ_IMPLIES_EXEC;
  
  	if (!(current->personality & ADDR_NO_RANDOMIZE) && randomize_va_space)
-@@ -906,7 +923,7 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs)
+@@ -914,7 +929,7 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs)
  					    interpreter,
  					    &interp_map_addr,
  					    load_bias);
@@ -379,9 +414,11 @@
  			/*
  			 * load_elf_interp() returns relocation
  			 * adjustment
---- linux-2.6.25.noarch/fs/proc/array.c~	2008-05-16 13:51:04.000000000 -0400
-+++ linux-2.6.25.noarch/fs/proc/array.c	2008-05-16 13:53:24.000000000 -0400
-@@ -473,8 +473,13 @@ static int do_task_stat(struct seq_file 
+diff --git a/fs/proc/array.c b/fs/proc/array.c
+index 71c9be5..4b40398 100644
+--- a/fs/proc/array.c
++++ b/fs/proc/array.c
+@@ -419,8 +419,13 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
  		unlock_task_sighand(task, &flags);
  	}
  
@@ -398,10 +435,10 @@
  		min_flt = task->min_flt;
  		maj_flt = task->maj_flt;
 diff --git a/include/asm-x86/desc.h b/include/asm-x86/desc.h
-index 5b6a05d..7ad80b9 100644
+index a44c4dc..dfdf649 100644
 --- a/include/asm-x86/desc.h
 +++ b/include/asm-x86/desc.h
-@@ -353,6 +353,22 @@ static inline void set_system_gate_ist(int n, void *addr, unsigned ist)
+@@ -372,6 +372,25 @@ static inline void set_system_gate_ist(int n, void *addr, unsigned ist)
  	_set_gate(n, GATE_INTERRUPT, addr, 0x3, ist, __KERNEL_CS);
  }
  
@@ -416,8 +453,11 @@
 +#define load_user_cs_desc(cpu, mm) \
 +	get_cpu_gdt_table(cpu)[GDT_ENTRY_DEFAULT_USER_CS] = (mm)->context.user_cs
 +
++#define arch_add_exec_range	arch_add_exec_range
 +extern void arch_add_exec_range(struct mm_struct *mm, unsigned long limit);
++#define arch_remove_exec_range	arch_remove_exec_range
 +extern void arch_remove_exec_range(struct mm_struct *mm, unsigned long limit);
++#define arch_flush_exec_range	arch_flush_exec_range
 +extern void arch_flush_exec_range(struct mm_struct *mm);
 +#endif /* CONFIG_X86_32 */
 +
@@ -425,7 +465,7 @@
  /*
   * GET_DESC_BASE reads the descriptor base of the specified segment.
 diff --git a/include/asm-x86/mmu.h b/include/asm-x86/mmu.h
-index efa962c..db9b109 100644
+index 00e8867..f1c5860 100644
 --- a/include/asm-x86/mmu.h
 +++ b/include/asm-x86/mmu.h
 @@ -9,6 +9,8 @@
@@ -448,8 +488,10 @@
  } mm_context_t;
  
  #ifdef CONFIG_SMP
---- linux-2.6.25.noarch/include/asm-x86/processor.h~	2008-05-16 15:56:21.000000000 -0400
-+++ linux-2.6.25.noarch/include/asm-x86/processor.h	2008-05-16 16:02:44.000000000 -0400
+diff --git a/include/asm-x86/processor.h b/include/asm-x86/processor.h
+index 4df3e2f..a64e1e3 100644
+--- a/include/asm-x86/processor.h
++++ b/include/asm-x86/processor.h
 @@ -151,6 +151,9 @@ static inline int hlt_works(int cpu)
  
  #define cache_line_size()	(boot_cpu_data.x86_cache_alignment)
@@ -459,25 +501,12 @@
 +
  extern void cpu_detect(struct cpuinfo_x86 *c);
  
- extern void identify_cpu(struct cpuinfo_x86 *);
---- linux-2.6.25.noarch/arch/x86/kernel/process_32.c~	2008-05-16 16:02:50.000000000 -0400
-+++ linux-2.6.25.noarch/arch/x86/kernel/process_32.c	2008-05-16 16:03:21.000000000 -0400
-@@ -411,6 +411,10 @@ start_thread(struct pt_regs *regs, unsig
- 	regs->cs		= __USER_CS;
- 	regs->ip		= new_ip;
- 	regs->sp		= new_sp;
-+	preempt_disable();
-+	load_user_cs_desc(smp_processor_id(), current->mm);
-+	preempt_enable();
-+
- 	/*
- 	 * Free the old FP and other extended state
- 	 */
+ extern void early_cpu_init(void);
 diff --git a/include/linux/mm.h b/include/linux/mm.h
-index e8abb38..1483fc7 100644
+index 72a15dc..f7f5411 100644
 --- a/include/linux/mm.h
 +++ b/include/linux/mm.h
-@@ -1041,7 +1041,13 @@ extern int install_special_mapping(struct mm_struct *mm,
+@@ -1105,7 +1105,13 @@ extern int install_special_mapping(struct mm_struct *mm,
  				   unsigned long addr, unsigned long len,
  				   unsigned long flags, struct page **pages);
  
@@ -493,10 +522,10 @@
  extern unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
  	unsigned long len, unsigned long prot,
 diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h
-index bfee0bd..30ec32f 100644
+index bf33413..c921bf0 100644
 --- a/include/linux/mm_types.h
 +++ b/include/linux/mm_types.h
-@@ -166,6 +166,9 @@ struct mm_struct {
+@@ -178,6 +178,9 @@ struct mm_struct {
  	unsigned long (*get_unmapped_area) (struct file *filp,
  				unsigned long addr, unsigned long len,
  				unsigned long pgoff, unsigned long flags);
@@ -507,10 +536,10 @@
  	unsigned long mmap_base;		/* base of mmap area */
  	unsigned long task_size;		/* size of task vm space */
 diff --git a/include/linux/resource.h b/include/linux/resource.h
-index ae13db7..14757af 100644
+index aaa423a..07a1e51 100644
 --- a/include/linux/resource.h
 +++ b/include/linux/resource.h
-@@ -54,8 +54,11 @@ struct rlimit {
+@@ -55,8 +55,11 @@ struct rlimit {
  /*
   * Limit the stack by to some sane default: root can always
   * increase this limit if needed..  8MB seems reasonable.
@@ -524,10 +553,10 @@
  /*
   * GPG wants 32kB of mlocked memory, to make sure pass phrases
 diff --git a/include/linux/sched.h b/include/linux/sched.h
-index 00e1441..c1c8a7d 100644
+index 3d9120c..16f3911 100644
 --- a/include/linux/sched.h
 +++ b/include/linux/sched.h
-@@ -98,6 +98,9 @@ struct futex_pi_state;
+@@ -97,6 +97,9 @@ struct futex_pi_state;
  struct robust_list_head;
  struct bio;
  
@@ -537,7 +566,7 @@
  /*
   * List of flags we want to share for kernel threads,
   * if only because they are not used by them anyway.
-@@ -342,6 +345,10 @@ extern int sysctl_max_map_count;
+@@ -345,6 +348,10 @@ extern int sysctl_max_map_count;
  extern unsigned long
  arch_get_unmapped_area(struct file *, unsigned long, unsigned long,
  		       unsigned long, unsigned long);
@@ -549,11 +578,11 @@
  arch_get_unmapped_area_topdown(struct file *filp, unsigned long addr,
  			  unsigned long len, unsigned long pgoff,
 diff --git a/kernel/sysctl.c b/kernel/sysctl.c
-index d41ef6b..5304704 100644
+index 50ec088..112a419 100644
 --- a/kernel/sysctl.c
 +++ b/kernel/sysctl.c
-@@ -83,6 +83,26 @@ extern int maps_protect;
- extern int sysctl_stat_interval;
+@@ -83,6 +83,26 @@ extern int compat_log;
+ extern int maps_protect;
  extern int latencytop_enabled;
  extern int sysctl_nr_open_min, sysctl_nr_open_max;
 +
@@ -579,7 +608,7 @@
  #ifdef CONFIG_RCU_TORTURE_TEST
  extern int rcutorture_runnable;
  #endif /* #ifdef CONFIG_RCU_TORTURE_TEST */
-@@ -383,6 +403,14 @@ static struct ctl_table kern_table[] = {
+@@ -363,6 +383,14 @@ static struct ctl_table kern_table[] = {
  		.proc_handler	= &proc_dointvec,
  	},
  	{
@@ -595,7 +624,7 @@
  		.procname	= "core_uses_pid",
  		.data		= &core_uses_pid,
 diff --git a/mm/mmap.c b/mm/mmap.c
-index a32d28c..7634038 100644
+index e7a5a68..fa7b4c5 100644
 --- a/mm/mmap.c
 +++ b/mm/mmap.c
 @@ -27,6 +27,7 @@
@@ -606,7 +635,7 @@
  
  #include <asm/uaccess.h>
  #include <asm/cacheflush.h>
-@@ -41,6 +41,18 @@
+@@ -43,6 +44,18 @@
  #define arch_rebalance_pgtables(addr, len)		(addr)
  #endif
  
@@ -625,7 +654,7 @@
  static void unmap_region(struct mm_struct *mm,
  		struct vm_area_struct *vma, struct vm_area_struct *prev,
  		unsigned long start, unsigned long end);
-@@ -377,6 +378,8 @@ static inline void
+@@ -390,6 +403,8 @@ static inline void
  __vma_link_list(struct mm_struct *mm, struct vm_area_struct *vma,
  		struct vm_area_struct *prev, struct rb_node *rb_parent)
  {
@@ -634,7 +663,7 @@
  	if (prev) {
  		vma->vm_next = prev->vm_next;
  		prev->vm_next = vma;
-@@ -480,6 +483,8 @@ __vma_unlink(struct mm_struct *mm, struct vm_area_struct *vma,
+@@ -493,6 +508,8 @@ __vma_unlink(struct mm_struct *mm, struct vm_area_struct *vma,
  	rb_erase(&vma->vm_rb, &mm->mm_rb);
  	if (mm->mmap_cache == vma)
  		mm->mmap_cache = prev;
@@ -643,7 +672,7 @@
  }
  
  /*
-@@ -785,6 +790,8 @@ struct vm_area_struct *vma_merge(struct mm_struct *mm,
+@@ -801,6 +818,8 @@ struct vm_area_struct *vma_merge(struct mm_struct *mm,
  		} else					/* cases 2, 5, 7 */
  			vma_adjust(prev, prev->vm_start,
  				end, prev->vm_pgoff, NULL);
@@ -652,7 +681,7 @@
  		return prev;
  	}
  
-@@ -940,7 +947,8 @@ unsigned long do_mmap_pgoff(struct file * file, unsigned long addr,
+@@ -956,7 +975,8 @@ unsigned long do_mmap_pgoff(struct file * file, unsigned long addr,
  	/* Obtain the address to map to. we verify (or select) it and ensure
  	 * that it represents a valid section of the address space.
  	 */
@@ -662,7 +691,7 @@
  	if (addr & ~PAGE_MASK)
  		return addr;
  
-@@ -1410,13 +1418,17 @@ void arch_unmap_area_topdown(struct mm_struct *mm, unsigned long addr)
+@@ -1434,13 +1454,17 @@ void arch_unmap_area_topdown(struct mm_struct *mm, unsigned long addr)
  }
  
  unsigned long
@@ -683,7 +712,7 @@
  	if (file && file->f_op && file->f_op->get_unmapped_area)
  		get_area = file->f_op->get_unmapped_area;
  	addr = get_area(file, addr, len, pgoff, flags);
-@@ -1430,8 +1442,74 @@ get_unmapped_area(struct file *file, unsigned long addr, unsigned long len,
+@@ -1454,8 +1478,76 @@ get_unmapped_area(struct file *file, unsigned long addr, unsigned long len,
  
  	return arch_rebalance_pgtables(addr, len);
  }
@@ -691,7 +720,8 @@
 +
 +#define SHLIB_BASE	0x00110000
 +
-+unsigned long arch_get_unmapped_exec_area(struct file *filp, unsigned long addr0,
++unsigned long
++arch_get_unmapped_exec_area(struct file *filp, unsigned long addr0,
 +		unsigned long len0, unsigned long pgoff, unsigned long flags)
 +{
 +	unsigned long addr = addr0, len = len0;
@@ -705,9 +735,10 @@
 +	if (flags & MAP_FIXED)
 +		return addr;
 +
-+	if (!addr) {
++	if (!addr)
 +		addr = randomize_range(SHLIB_BASE, 0x01000000, len);
-+	} else {
++
++	if (addr) {
 +		addr = PAGE_ALIGN(addr);
 +		vma = find_vma(mm, addr);
 +		if (TASK_SIZE - len >= addr &&
@@ -759,7 +790,7 @@
  
  /* Look up the first VMA which satisfies  addr < vm_end,  NULL if none. */
  struct vm_area_struct * find_vma(struct mm_struct * mm, unsigned long addr)
-@@ -1506,6 +1585,14 @@ out:
+@@ -1530,6 +1622,14 @@ out:
  	return prev ? prev->vm_next : vma;
  }
  
@@ -774,7 +805,7 @@
  /*
   * Verify that the stack growth is acceptable and
   * update accounting. This is shared with both the
-@@ -1522,7 +1609,7 @@ static int acct_stack_growth(struct vm_area_struct * vma, unsigned long size, un
+@@ -1546,7 +1646,7 @@ static int acct_stack_growth(struct vm_area_struct * vma, unsigned long size, un
  		return -ENOMEM;
  
  	/* Stack limit test */
@@ -783,7 +814,7 @@
  		return -ENOMEM;
  
  	/* mlock limit tests */
-@@ -1826,10 +1913,14 @@ int split_vma(struct mm_struct * mm, struct vm_area_struct * vma,
+@@ -1854,10 +1954,14 @@ int split_vma(struct mm_struct * mm, struct vm_area_struct * vma,
  	if (new->vm_ops && new->vm_ops->open)
  		new->vm_ops->open(new);
  
@@ -800,7 +831,7 @@
  		vma_adjust(vma, vma->vm_start, addr, vma->vm_pgoff, new);
  
  	return 0;
-@@ -2173,6 +2173,7 @@ void exit_mmap(struct mm_struct *mm)
+@@ -2077,6 +2181,7 @@ void exit_mmap(struct mm_struct *mm)
  	vm_unacct_memory(nr_accounted);
  	free_pgtables(tlb, vma, FIRST_USER_ADDRESS, 0);
  	tlb_finish_mmu(tlb, 0, end);
@@ -809,26 +840,25 @@
  	/*
  	 * Walk the list again, actually closing and freeing it,
 diff --git a/mm/mprotect.c b/mm/mprotect.c
-index 4de5468..6d822ad 100644
+index fded06f..a2cf942 100644
 --- a/mm/mprotect.c
 +++ b/mm/mprotect.c
-@@ -23,8 +23,15 @@
- #include <linux/swapops.h>
+@@ -24,9 +24,14 @@
+ #include <linux/mmu_notifier.h>
  #include <asm/uaccess.h>
  #include <asm/pgtable.h>
 +#include <asm/pgalloc.h>
  #include <asm/cacheflush.h>
  #include <asm/tlbflush.h>
-+#ifdef CONFIG_X86
-+#include <asm/desc.h>
-+#endif
+ 
 +#ifndef arch_remove_exec_range
 +#define arch_remove_exec_range(mm, limit)      do { ; } while (0)
 +#endif
- 
++
  #ifndef pgprot_modify
  static inline pgprot_t pgprot_modify(pgprot_t oldprot, pgprot_t newprot)
-@@ -134,7 +138,7 @@ mprotect_fixup(struct vm_area_struct *vma, struct vm_area_struct **pprev,
+ {
+@@ -140,7 +145,7 @@ mprotect_fixup(struct vm_area_struct *vma, struct vm_area_struct **pprev,
  	struct mm_struct *mm = vma->vm_mm;
  	unsigned long oldflags = vma->vm_flags;
  	long nrpages = (end - start) >> PAGE_SHIFT;
@@ -837,7 +867,7 @@
  	pgoff_t pgoff;
  	int error;
  	int dirty_accountable = 0;
-@@ -211,6 +211,9 @@ success:
+@@ -204,6 +209,9 @@ success:
  		dirty_accountable = 1;
  	}
  
@@ -848,10 +878,10 @@
  	if (is_vm_hugetlb_page(vma))
  		hugetlb_change_protection(vma, start, end, vma->vm_page_prot);
 diff --git a/mm/mremap.c b/mm/mremap.c
-index 08e3c7f..101f885 100644
+index 1a77439..5bc2b6e 100644
 --- a/mm/mremap.c
 +++ b/mm/mremap.c
-@@ -392,8 +392,8 @@ unsigned long do_mremap(unsigned long addr,
+@@ -398,8 +398,8 @@ unsigned long do_mremap(unsigned long addr,
  			if (vma->vm_flags & VM_MAYSHARE)
  				map_flags |= MAP_SHARED;
  



From kyle at fedoraproject.org  Mon Jan 19 06:26:16 2009
From: kyle at fedoraproject.org (Kyle McMartin)
Date: Mon, 19 Jan 2009 06:26:16 +0000 (UTC)
Subject: rpms/kernel/F-10 kernel.spec, 1.1206,
	1.1206.2.1 linux-2.6-execshield.patch, 1.97, 1.97.12.1
Message-ID: <20090119062616.73A26700F8@cvs1.fedora.phx.redhat.com>

Author: kyle

Update of /cvs/pkgs/rpms/kernel/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3975

Modified Files:
      Tag: private-fedora-10-2_6_27
	kernel.spec linux-2.6-execshield.patch 
Log Message:
* Mon Jan 19 2009 Kyle McMartin <kyle at redhat.com>
- execshield fixes: should no longer generate spurious handled GPFs,
  fixes randomization of executables. also some clean ups.



Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/kernel.spec,v
retrieving revision 1.1206
retrieving revision 1.1206.2.1
diff -u -r1.1206 -r1.1206.2.1
--- kernel.spec	12 Jan 2009 03:29:30 -0000	1.1206
+++ kernel.spec	19 Jan 2009 06:25:46 -0000	1.1206.2.1
@@ -1937,6 +1937,10 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Mon Jan 19 2009 Kyle McMartin <kyle at redhat.com>
+- execshield fixes: should no longer generate spurious handled GPFs,
+  fixes randomization of executables. also some clean ups.
+
 * Sun Jan 11 2009 Dave Jones <davej at redhat.com>
 - Don't use MAXSMP on x86-64
 

linux-2.6-execshield.patch:

Index: linux-2.6-execshield.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/linux-2.6-execshield.patch,v
retrieving revision 1.97
retrieving revision 1.97.12.1
diff -u -r1.97 -r1.97.12.1
--- linux-2.6-execshield.patch	10 Oct 2008 19:46:18 -0000	1.97
+++ linux-2.6-execshield.patch	19 Jan 2009 06:25:46 -0000	1.97.12.1
@@ -1,6 +1,8 @@
---- linux-2.6.25.noarch/arch/x86/kernel/cpu/common.c~	2008-05-16 13:41:08.000000000 -0400
-+++ linux-2.6.25.noarch/arch/x86/kernel/cpu/common.c	2008-05-16 13:42:11.000000000 -0400
-@@ -479,6 +479,21 @@ void __cpuinit identify_cpu(struct cpuin
+diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c
+index 4e456bd..c061fe9 100644
+--- a/arch/x86/kernel/cpu/common.c
++++ b/arch/x86/kernel/cpu/common.c
+@@ -493,6 +493,21 @@ static void __cpuinit identify_cpu(struct cpuinfo_x86 *c)
  	 * we do "generic changes."
  	 */
  
@@ -23,10 +25,31 @@
  	if (!c->x86_model_id[0]) {
  		char *p;
 diff --git a/arch/x86/kernel/process_32.c b/arch/x86/kernel/process_32.c
-index a7d50a5..83f7b4e 100644
+index 31f40b2..e5c9006 100644
 --- a/arch/x86/kernel/process_32.c
 +++ b/arch/x86/kernel/process_32.c
-@@ -677,7 +677,8 @@ struct task_struct * __switch_to(struct task_struct *prev_p, struct task_struct
+@@ -364,6 +364,8 @@ int copy_thread(int nr, unsigned long clone_flags, unsigned long sp,
+ void
+ start_thread(struct pt_regs *regs, unsigned long new_ip, unsigned long new_sp)
+ {
++	int cpu;
++
+ 	__asm__("movl %0, %%gs" :: "r"(0));
+ 	regs->fs		= 0;
+ 	set_fs(USER_DS);
+@@ -373,6 +375,11 @@ start_thread(struct pt_regs *regs, unsigned long new_ip, unsigned long new_sp)
+ 	regs->cs		= __USER_CS;
+ 	regs->ip		= new_ip;
+ 	regs->sp		= new_sp;
++
++	cpu = get_cpu();
++	load_user_cs_desc(cpu, current->mm);
++	put_cpu();
++
+ 	/*
+ 	 * Free the old FP and other extended state
+ 	 */
+@@ -555,7 +562,8 @@ struct task_struct * __switch_to(struct task_struct *prev_p, struct task_struct
  	/* never put a printk in __switch_to... printk() calls wake_up*() indirectly */
  
  	__unlazy_fpu(prev_p);
@@ -36,11 +59,7 @@
  
  	/* we're going to use this soon, after a few expensive things */
  	if (next_p->fpu_counter > 5)
-diff --git a/arch/x86/kernel/process_32.c b/arch/x86/kernel/process_32.c
-index a7d50a5..86e35cb 100644
---- a/arch/x86/kernel/process_32.c
-+++ b/arch/x86/kernel/process_32.c
-@@ -847,3 +847,39 @@ unsigned long arch_randomize_brk(struct mm_struct *mm)
+@@ -728,3 +736,39 @@ unsigned long arch_randomize_brk(struct mm_struct *mm)
  	unsigned long range_end = mm->brk + 0x02000000;
  	return randomize_range(mm->brk, range_end, 0) ? : mm->brk;
  }
@@ -50,9 +69,9 @@
 +	mm->context.exec_limit = limit;
 +	set_user_cs(&mm->context.user_cs, limit);
 +	if (mm == current->mm) {
-+		preempt_disable();
-+		load_user_cs_desc(smp_processor_id(), mm);
-+		preempt_enable();
++		int cpu = get_cpu();
++		load_user_cs_desc(cpu, mm);
++		put_cpu();
 +	}
 +}
 +
@@ -80,8 +99,10 @@
 +	mm->context.exec_limit = 0;
 +	set_user_cs(&mm->context.user_cs, 0);
 +}
---- linux-2.6.25.noarch/arch/x86/kernel/tlb_32.c~	2008-05-16 13:30:44.000000000 -0400
-+++ linux-2.6.25.noarch/arch/x86/kernel/tlb_32.c	2008-05-16 13:31:14.000000000 -0400
+diff --git a/arch/x86/kernel/tlb_32.c b/arch/x86/kernel/tlb_32.c
+index fec1ece..f33213f 100644
+--- a/arch/x86/kernel/tlb_32.c
++++ b/arch/x86/kernel/tlb_32.c
 @@ -2,6 +2,7 @@
  #include <linux/cpu.h>
  #include <linux/interrupt.h>
@@ -90,7 +111,7 @@
  #include <asm/tlbflush.h>
  
  DEFINE_PER_CPU(struct tlb_state, cpu_tlbstate)
-@@ -92,6 +93,8 @@ void smp_invalidate_interrupt(struct pt_
+@@ -92,6 +93,8 @@ void smp_invalidate_interrupt(struct pt_regs *regs)
  	unsigned long cpu;
  
  	cpu = get_cpu();
@@ -99,14 +120,27 @@
  
  	if (!cpu_isset(cpu, flush_cpumask))
  		goto out;
---- linux-2.6.26.noarch/arch/x86/kernel/traps_32.c~	2008-07-14 20:20:15.000000000 -0400
-+++ linux-2.6.26.noarch/arch/x86/kernel/traps_32.c	2008-07-14 20:26:18.000000000 -0400
-@@ -596,7 +596,91 @@ DO_ERROR(10, SIGSEGV, "invalid TSS", inv
+diff --git a/arch/x86/kernel/traps_32.c b/arch/x86/kernel/traps_32.c
+index 03df8e4..0fd091b 100644
+--- a/arch/x86/kernel/traps_32.c
++++ b/arch/x86/kernel/traps_32.c
+@@ -584,7 +584,102 @@ DO_ERROR(10, SIGSEGV, "invalid TSS", invalid_TSS)
  DO_ERROR(11, SIGBUS, "segment not present", segment_not_present)
  DO_ERROR(12, SIGBUS, "stack segment", stack_segment)
  DO_ERROR_INFO(17, SIGBUS, "alignment check", alignment_check, BUS_ADRALN, 0, 0)
 -DO_ERROR_INFO(32, SIGILL, "iret exception", iret_error, ILL_BADSTK, 0, 1)
 +
++static inline int
++__check_user_cs_desc(const struct desc_struct * const desc1,
++	const struct desc_struct * const desc2)
++{
++	return ((desc1->limit0 != desc2->limit0) ||
++		(desc1->limit != desc2->limit) ||
++		(desc1->base0 != desc2->base0) ||
++		(desc1->base1 != desc2->base1) ||
++		(desc1->base2 != desc2->base2));
++}
++
 +/*
 + * lazy-check for CS validity on exec-shield binaries:
 + *
@@ -143,8 +177,7 @@
 +	desc1 = &current->mm->context.user_cs;
 +	desc2 = get_cpu_gdt_table(cpu) + GDT_ENTRY_DEFAULT_USER_CS;
 +
-+	if ((desc1->a & 0xff0000ff) != (desc2->a & 0xff0000ff) ||
-+	    desc1->b != desc2->b) {
++	if (__check_user_cs_desc(desc1, desc2)) {
 +		/*
 +		 * The CS was not in sync - reload it and retry the
 +		 * instruction. If the instruction still faults then
@@ -152,10 +185,11 @@
 +		 */
 +		if (print_fatal_signals >= 2) {
 +			printk(KERN_ERR "#GPF fixup (%ld[seg:%lx]) at %08lx, CPU#%d.\n",
-+				error_code, error_code/8, regs->ip, smp_processor_id());
++				error_code, error_code/8, regs->ip, cpu);
 +			printk(KERN_ERR "exec_limit: %08lx, user_cs: %08x/%08x, CPU_cs: %08x/%08x.\n",
 +				current->mm->context.exec_limit, desc1->a, desc1->b, desc2->a, desc2->b);
 +		}
++
 +		load_user_cs_desc(cpu, current->mm);
 +		return 1;
 +	}
@@ -194,7 +228,7 @@
  
  void __kprobes
  do_general_protection(struct pt_regs *regs, long error_code)
-@@ -605,6 +688,7 @@ do_general_protection(struct pt_regs *re
+@@ -593,6 +688,7 @@ do_general_protection(struct pt_regs *regs, long error_code)
  	struct thread_struct *thread;
  	struct tss_struct *tss;
  	int cpu;
@@ -202,12 +236,12 @@
  
  	cpu = get_cpu();
  	tss = &per_cpu(init_tss, cpu);
-@@ -645,6 +729,23 @@ do_general_protection(struct pt_regs *re
+@@ -634,6 +730,23 @@ do_general_protection(struct pt_regs *regs, long error_code)
  	if (!user_mode(regs))
  		goto gp_in_kernel;
  
++	cpu = get_cpu();
 +	ok = check_lazy_exec_limit(cpu, regs, error_code);
-+
 +	put_cpu();
 +
 +	if (ok)
@@ -215,7 +249,7 @@
 +
 +	if (print_fatal_signals) {
 +		printk(KERN_ERR "#GPF(%ld[seg:%lx]) at %08lx, CPU#%d.\n", error_code,
-+			error_code/8, regs->ip, smp_processor_id());
++			error_code/8, regs->ip, cpu);
 +		printk(KERN_ERR "exec_limit: %08lx, user_cs: %08x/%08x.\n",
 +			current->mm->context.exec_limit,
 +			current->mm->context.user_cs.a,
@@ -226,7 +260,7 @@
  	tsk->thread.error_code = error_code;
  	tsk->thread.trap_no = 13;
  
-@@ -662,11 +763,13 @@ do_general_protection(struct pt_regs *re
+@@ -651,11 +764,13 @@ do_general_protection(struct pt_regs *regs, long error_code)
  	return;
  
  gp_in_vm86:
@@ -241,10 +275,10 @@
  		return;
  
 diff --git a/arch/x86/mm/init_32.c b/arch/x86/mm/init_32.c
-index 8106bba..23932be 100644
+index 60ec1d0..66d1a78 100644
 --- a/arch/x86/mm/init_32.c
 +++ b/arch/x86/mm/init_32.c
-@@ -473,7 +473,7 @@ static int disable_nx __initdata;
+@@ -514,7 +514,7 @@ static int disable_nx __initdata;
   * Control non executable mappings.
   *
   * on      Enable
@@ -253,7 +287,7 @@
   */
  static int __init noexec_setup(char *str)
  {
-@@ -482,14 +482,12 @@ static int __init noexec_setup(char *str)
+@@ -523,14 +523,12 @@ static int __init noexec_setup(char *str)
  			__supported_pte_mask |= _PAGE_NX;
  			disable_nx = 0;
  		}
@@ -274,7 +308,8 @@
  
  	return 0;
  }
-@@ -782,6 +782,10 @@ unsigned long __init_refok init_memory_m
+@@ -779,7 +777,11 @@ unsigned long __init_refok init_memory_mapping(unsigned long start,
+ 	set_nx();
  	if (nx_enabled)
  		printk(KERN_INFO "NX (Execute Disable) protection: active\n");
 +	else
@@ -307,10 +342,10 @@
  	}
  }
 diff --git a/arch/x86/vdso/vdso32-setup.c b/arch/x86/vdso/vdso32-setup.c
-index 348f134..0bd5f44 100644
+index 513f330..2fb420a 100644
 --- a/arch/x86/vdso/vdso32-setup.c
 +++ b/arch/x86/vdso/vdso32-setup.c
-@@ -336,7 +336,7 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int exstack)
+@@ -331,7 +331,7 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int exstack)
  	if (compat)
  		addr = VDSO_HIGH_BASE;
  	else {
@@ -320,10 +355,10 @@
  			ret = addr;
  			goto up_fail;
 diff --git a/fs/binfmt_elf.c b/fs/binfmt_elf.c
-index 41a958a..22cbd06 100644
+index 655ed8d..09da3e5 100644
 --- a/fs/binfmt_elf.c
 +++ b/fs/binfmt_elf.c
-@@ -81,7 +81,7 @@ static struct linux_binfmt elf_format = {
+@@ -80,7 +80,7 @@ static struct linux_binfmt elf_format = {
  		.hasvdso	= 1
  };
  
@@ -332,7 +367,7 @@
  
  static int set_brk(unsigned long start, unsigned long end)
  {
-@@ -709,6 +711,11 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs)
+@@ -723,6 +723,11 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs)
  			break;
  		}
  
@@ -344,7 +379,7 @@
  	/* Some simple consistency checks for the interpreter */
  	if (elf_interpreter) {
  		retval = -ELIBBAD;
-@@ -721,6 +721,15 @@ static int load_elf_binary(struct linux_
+@@ -742,6 +747,15 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs)
  	if (retval)
  		goto out_free_dentry;
  
@@ -360,7 +395,7 @@
  	/* OK, This is the point of no return */
  	current->flags &= ~PF_FORKNOEXEC;
  	current->mm->def_flags = def_flags;
-@@ -741,7 +757,8 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs)
+@@ -749,7 +763,8 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs)
  	/* Do this immediately, since STACK_TOP as used in setup_arg_pages
  	   may depend on the personality.  */
  	SET_PERSONALITY(loc->elf_ex, 0);
@@ -370,7 +405,7 @@
  		current->personality |= READ_IMPLIES_EXEC;
  
  	if (!(current->personality & ADDR_NO_RANDOMIZE) && randomize_va_space)
-@@ -906,7 +923,7 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs)
+@@ -914,7 +929,7 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs)
  					    interpreter,
  					    &interp_map_addr,
  					    load_bias);
@@ -379,9 +414,11 @@
  			/*
  			 * load_elf_interp() returns relocation
  			 * adjustment
---- linux-2.6.25.noarch/fs/proc/array.c~	2008-05-16 13:51:04.000000000 -0400
-+++ linux-2.6.25.noarch/fs/proc/array.c	2008-05-16 13:53:24.000000000 -0400
-@@ -473,8 +473,13 @@ static int do_task_stat(struct seq_file 
+diff --git a/fs/proc/array.c b/fs/proc/array.c
+index 71c9be5..4b40398 100644
+--- a/fs/proc/array.c
++++ b/fs/proc/array.c
+@@ -419,8 +419,13 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
  		unlock_task_sighand(task, &flags);
  	}
  
@@ -398,10 +435,10 @@
  		min_flt = task->min_flt;
  		maj_flt = task->maj_flt;
 diff --git a/include/asm-x86/desc.h b/include/asm-x86/desc.h
-index 5b6a05d..7ad80b9 100644
+index a44c4dc..dfdf649 100644
 --- a/include/asm-x86/desc.h
 +++ b/include/asm-x86/desc.h
-@@ -353,6 +353,22 @@ static inline void set_system_gate_ist(int n, void *addr, unsigned ist)
+@@ -372,6 +372,25 @@ static inline void set_system_gate_ist(int n, void *addr, unsigned ist)
  	_set_gate(n, GATE_INTERRUPT, addr, 0x3, ist, __KERNEL_CS);
  }
  
@@ -416,8 +453,11 @@
 +#define load_user_cs_desc(cpu, mm) \
 +	get_cpu_gdt_table(cpu)[GDT_ENTRY_DEFAULT_USER_CS] = (mm)->context.user_cs
 +
++#define arch_add_exec_range	arch_add_exec_range
 +extern void arch_add_exec_range(struct mm_struct *mm, unsigned long limit);
++#define arch_remove_exec_range	arch_remove_exec_range
 +extern void arch_remove_exec_range(struct mm_struct *mm, unsigned long limit);
++#define arch_flush_exec_range	arch_flush_exec_range
 +extern void arch_flush_exec_range(struct mm_struct *mm);
 +#endif /* CONFIG_X86_32 */
 +
@@ -425,7 +465,7 @@
  /*
   * GET_DESC_BASE reads the descriptor base of the specified segment.
 diff --git a/include/asm-x86/mmu.h b/include/asm-x86/mmu.h
-index efa962c..db9b109 100644
+index 00e8867..f1c5860 100644
 --- a/include/asm-x86/mmu.h
 +++ b/include/asm-x86/mmu.h
 @@ -9,6 +9,8 @@
@@ -448,8 +488,10 @@
  } mm_context_t;
  
  #ifdef CONFIG_SMP
---- linux-2.6.25.noarch/include/asm-x86/processor.h~	2008-05-16 15:56:21.000000000 -0400
-+++ linux-2.6.25.noarch/include/asm-x86/processor.h	2008-05-16 16:02:44.000000000 -0400
+diff --git a/include/asm-x86/processor.h b/include/asm-x86/processor.h
+index 4df3e2f..a64e1e3 100644
+--- a/include/asm-x86/processor.h
++++ b/include/asm-x86/processor.h
 @@ -151,6 +151,9 @@ static inline int hlt_works(int cpu)
  
  #define cache_line_size()	(boot_cpu_data.x86_cache_alignment)
@@ -459,25 +501,12 @@
 +
  extern void cpu_detect(struct cpuinfo_x86 *c);
  
- extern void identify_cpu(struct cpuinfo_x86 *);
---- linux-2.6.25.noarch/arch/x86/kernel/process_32.c~	2008-05-16 16:02:50.000000000 -0400
-+++ linux-2.6.25.noarch/arch/x86/kernel/process_32.c	2008-05-16 16:03:21.000000000 -0400
-@@ -411,6 +411,10 @@ start_thread(struct pt_regs *regs, unsig
- 	regs->cs		= __USER_CS;
- 	regs->ip		= new_ip;
- 	regs->sp		= new_sp;
-+	preempt_disable();
-+	load_user_cs_desc(smp_processor_id(), current->mm);
-+	preempt_enable();
-+
- 	/*
- 	 * Free the old FP and other extended state
- 	 */
+ extern void early_cpu_init(void);
 diff --git a/include/linux/mm.h b/include/linux/mm.h
-index e8abb38..1483fc7 100644
+index 72a15dc..f7f5411 100644
 --- a/include/linux/mm.h
 +++ b/include/linux/mm.h
-@@ -1041,7 +1041,13 @@ extern int install_special_mapping(struct mm_struct *mm,
+@@ -1105,7 +1105,13 @@ extern int install_special_mapping(struct mm_struct *mm,
  				   unsigned long addr, unsigned long len,
  				   unsigned long flags, struct page **pages);
  
@@ -493,10 +522,10 @@
  extern unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
  	unsigned long len, unsigned long prot,
 diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h
-index bfee0bd..30ec32f 100644
+index bf33413..c921bf0 100644
 --- a/include/linux/mm_types.h
 +++ b/include/linux/mm_types.h
-@@ -166,6 +166,9 @@ struct mm_struct {
+@@ -178,6 +178,9 @@ struct mm_struct {
  	unsigned long (*get_unmapped_area) (struct file *filp,
  				unsigned long addr, unsigned long len,
  				unsigned long pgoff, unsigned long flags);
@@ -507,10 +536,10 @@
  	unsigned long mmap_base;		/* base of mmap area */
  	unsigned long task_size;		/* size of task vm space */
 diff --git a/include/linux/resource.h b/include/linux/resource.h
-index ae13db7..14757af 100644
+index aaa423a..07a1e51 100644
 --- a/include/linux/resource.h
 +++ b/include/linux/resource.h
-@@ -54,8 +54,11 @@ struct rlimit {
+@@ -55,8 +55,11 @@ struct rlimit {
  /*
   * Limit the stack by to some sane default: root can always
   * increase this limit if needed..  8MB seems reasonable.
@@ -524,10 +553,10 @@
  /*
   * GPG wants 32kB of mlocked memory, to make sure pass phrases
 diff --git a/include/linux/sched.h b/include/linux/sched.h
-index 00e1441..c1c8a7d 100644
+index 3d9120c..16f3911 100644
 --- a/include/linux/sched.h
 +++ b/include/linux/sched.h
-@@ -98,6 +98,9 @@ struct futex_pi_state;
+@@ -97,6 +97,9 @@ struct futex_pi_state;
  struct robust_list_head;
  struct bio;
  
@@ -537,7 +566,7 @@
  /*
   * List of flags we want to share for kernel threads,
   * if only because they are not used by them anyway.
-@@ -342,6 +345,10 @@ extern int sysctl_max_map_count;
+@@ -345,6 +348,10 @@ extern int sysctl_max_map_count;
  extern unsigned long
  arch_get_unmapped_area(struct file *, unsigned long, unsigned long,
  		       unsigned long, unsigned long);
@@ -549,11 +578,11 @@
  arch_get_unmapped_area_topdown(struct file *filp, unsigned long addr,
  			  unsigned long len, unsigned long pgoff,
 diff --git a/kernel/sysctl.c b/kernel/sysctl.c
-index d41ef6b..5304704 100644
+index 50ec088..112a419 100644
 --- a/kernel/sysctl.c
 +++ b/kernel/sysctl.c
-@@ -83,6 +83,26 @@ extern int maps_protect;
- extern int sysctl_stat_interval;
+@@ -83,6 +83,26 @@ extern int compat_log;
+ extern int maps_protect;
  extern int latencytop_enabled;
  extern int sysctl_nr_open_min, sysctl_nr_open_max;
 +
@@ -579,7 +608,7 @@
  #ifdef CONFIG_RCU_TORTURE_TEST
  extern int rcutorture_runnable;
  #endif /* #ifdef CONFIG_RCU_TORTURE_TEST */
-@@ -383,6 +403,14 @@ static struct ctl_table kern_table[] = {
+@@ -363,6 +383,14 @@ static struct ctl_table kern_table[] = {
  		.proc_handler	= &proc_dointvec,
  	},
  	{
@@ -595,7 +624,7 @@
  		.procname	= "core_uses_pid",
  		.data		= &core_uses_pid,
 diff --git a/mm/mmap.c b/mm/mmap.c
-index a32d28c..7634038 100644
+index e7a5a68..fa7b4c5 100644
 --- a/mm/mmap.c
 +++ b/mm/mmap.c
 @@ -27,6 +27,7 @@
@@ -606,7 +635,7 @@
  
  #include <asm/uaccess.h>
  #include <asm/cacheflush.h>
-@@ -41,6 +41,18 @@
+@@ -43,6 +44,18 @@
  #define arch_rebalance_pgtables(addr, len)		(addr)
  #endif
  
@@ -625,7 +654,7 @@
  static void unmap_region(struct mm_struct *mm,
  		struct vm_area_struct *vma, struct vm_area_struct *prev,
  		unsigned long start, unsigned long end);
-@@ -377,6 +378,8 @@ static inline void
+@@ -390,6 +403,8 @@ static inline void
  __vma_link_list(struct mm_struct *mm, struct vm_area_struct *vma,
  		struct vm_area_struct *prev, struct rb_node *rb_parent)
  {
@@ -634,7 +663,7 @@
  	if (prev) {
  		vma->vm_next = prev->vm_next;
  		prev->vm_next = vma;
-@@ -480,6 +483,8 @@ __vma_unlink(struct mm_struct *mm, struct vm_area_struct *vma,
+@@ -493,6 +508,8 @@ __vma_unlink(struct mm_struct *mm, struct vm_area_struct *vma,
  	rb_erase(&vma->vm_rb, &mm->mm_rb);
  	if (mm->mmap_cache == vma)
  		mm->mmap_cache = prev;
@@ -643,7 +672,7 @@
  }
  
  /*
-@@ -785,6 +790,8 @@ struct vm_area_struct *vma_merge(struct mm_struct *mm,
+@@ -801,6 +818,8 @@ struct vm_area_struct *vma_merge(struct mm_struct *mm,
  		} else					/* cases 2, 5, 7 */
  			vma_adjust(prev, prev->vm_start,
  				end, prev->vm_pgoff, NULL);
@@ -652,7 +681,7 @@
  		return prev;
  	}
  
-@@ -940,7 +947,8 @@ unsigned long do_mmap_pgoff(struct file * file, unsigned long addr,
+@@ -956,7 +975,8 @@ unsigned long do_mmap_pgoff(struct file * file, unsigned long addr,
  	/* Obtain the address to map to. we verify (or select) it and ensure
  	 * that it represents a valid section of the address space.
  	 */
@@ -662,7 +691,7 @@
  	if (addr & ~PAGE_MASK)
  		return addr;
  
-@@ -1410,13 +1418,17 @@ void arch_unmap_area_topdown(struct mm_struct *mm, unsigned long addr)
+@@ -1434,13 +1454,17 @@ void arch_unmap_area_topdown(struct mm_struct *mm, unsigned long addr)
  }
  
  unsigned long
@@ -683,7 +712,7 @@
  	if (file && file->f_op && file->f_op->get_unmapped_area)
  		get_area = file->f_op->get_unmapped_area;
  	addr = get_area(file, addr, len, pgoff, flags);
-@@ -1430,8 +1442,74 @@ get_unmapped_area(struct file *file, unsigned long addr, unsigned long len,
+@@ -1454,8 +1478,76 @@ get_unmapped_area(struct file *file, unsigned long addr, unsigned long len,
  
  	return arch_rebalance_pgtables(addr, len);
  }
@@ -691,7 +720,8 @@
 +
 +#define SHLIB_BASE	0x00110000
 +
-+unsigned long arch_get_unmapped_exec_area(struct file *filp, unsigned long addr0,
++unsigned long
++arch_get_unmapped_exec_area(struct file *filp, unsigned long addr0,
 +		unsigned long len0, unsigned long pgoff, unsigned long flags)
 +{
 +	unsigned long addr = addr0, len = len0;
@@ -705,9 +735,10 @@
 +	if (flags & MAP_FIXED)
 +		return addr;
 +
-+	if (!addr) {
++	if (!addr)
 +		addr = randomize_range(SHLIB_BASE, 0x01000000, len);
-+	} else {
++
++	if (addr) {
 +		addr = PAGE_ALIGN(addr);
 +		vma = find_vma(mm, addr);
 +		if (TASK_SIZE - len >= addr &&
@@ -759,7 +790,7 @@
  
  /* Look up the first VMA which satisfies  addr < vm_end,  NULL if none. */
  struct vm_area_struct * find_vma(struct mm_struct * mm, unsigned long addr)
-@@ -1506,6 +1585,14 @@ out:
+@@ -1530,6 +1622,14 @@ out:
  	return prev ? prev->vm_next : vma;
  }
  
@@ -774,7 +805,7 @@
  /*
   * Verify that the stack growth is acceptable and
   * update accounting. This is shared with both the
-@@ -1522,7 +1609,7 @@ static int acct_stack_growth(struct vm_area_struct * vma, unsigned long size, un
+@@ -1546,7 +1646,7 @@ static int acct_stack_growth(struct vm_area_struct * vma, unsigned long size, un
  		return -ENOMEM;
  
  	/* Stack limit test */
@@ -783,7 +814,7 @@
  		return -ENOMEM;
  
  	/* mlock limit tests */
-@@ -1826,10 +1913,14 @@ int split_vma(struct mm_struct * mm, struct vm_area_struct * vma,
+@@ -1854,10 +1954,14 @@ int split_vma(struct mm_struct * mm, struct vm_area_struct * vma,
  	if (new->vm_ops && new->vm_ops->open)
  		new->vm_ops->open(new);
  
@@ -800,7 +831,7 @@
  		vma_adjust(vma, vma->vm_start, addr, vma->vm_pgoff, new);
  
  	return 0;
-@@ -2173,6 +2173,7 @@ void exit_mmap(struct mm_struct *mm)
+@@ -2077,6 +2181,7 @@ void exit_mmap(struct mm_struct *mm)
  	vm_unacct_memory(nr_accounted);
  	free_pgtables(tlb, vma, FIRST_USER_ADDRESS, 0);
  	tlb_finish_mmu(tlb, 0, end);
@@ -809,26 +840,25 @@
  	/*
  	 * Walk the list again, actually closing and freeing it,
 diff --git a/mm/mprotect.c b/mm/mprotect.c
-index 4de5468..6d822ad 100644
+index fded06f..a2cf942 100644
 --- a/mm/mprotect.c
 +++ b/mm/mprotect.c
-@@ -23,8 +23,15 @@
- #include <linux/swapops.h>
+@@ -24,9 +24,14 @@
+ #include <linux/mmu_notifier.h>
  #include <asm/uaccess.h>
  #include <asm/pgtable.h>
 +#include <asm/pgalloc.h>
  #include <asm/cacheflush.h>
  #include <asm/tlbflush.h>
-+#ifdef CONFIG_X86
-+#include <asm/desc.h>
-+#endif
+ 
 +#ifndef arch_remove_exec_range
 +#define arch_remove_exec_range(mm, limit)      do { ; } while (0)
 +#endif
- 
++
  #ifndef pgprot_modify
  static inline pgprot_t pgprot_modify(pgprot_t oldprot, pgprot_t newprot)
-@@ -134,7 +138,7 @@ mprotect_fixup(struct vm_area_struct *vma, struct vm_area_struct **pprev,
+ {
+@@ -140,7 +145,7 @@ mprotect_fixup(struct vm_area_struct *vma, struct vm_area_struct **pprev,
  	struct mm_struct *mm = vma->vm_mm;
  	unsigned long oldflags = vma->vm_flags;
  	long nrpages = (end - start) >> PAGE_SHIFT;
@@ -837,7 +867,7 @@
  	pgoff_t pgoff;
  	int error;
  	int dirty_accountable = 0;
-@@ -211,6 +211,9 @@ success:
+@@ -204,6 +209,9 @@ success:
  		dirty_accountable = 1;
  	}
  
@@ -848,10 +878,10 @@
  	if (is_vm_hugetlb_page(vma))
  		hugetlb_change_protection(vma, start, end, vma->vm_page_prot);
 diff --git a/mm/mremap.c b/mm/mremap.c
-index 08e3c7f..101f885 100644
+index 1a77439..5bc2b6e 100644
 --- a/mm/mremap.c
 +++ b/mm/mremap.c
-@@ -392,8 +392,8 @@ unsigned long do_mremap(unsigned long addr,
+@@ -398,8 +398,8 @@ unsigned long do_mremap(unsigned long addr,
  			if (vma->vm_flags & VM_MAYSHARE)
  				map_flags |= MAP_SHARED;
  



From kyle at fedoraproject.org  Mon Jan 19 07:23:40 2009
From: kyle at fedoraproject.org (Kyle McMartin)
Date: Mon, 19 Jan 2009 07:23:40 +0000 (UTC)
Subject: rpms/kernel/F-9 patch-2.6.27.12.bz2.sign, NONE, 1.1.2.1 .cvsignore, 
	1.837.2.2, 1.837.2.3 kernel.spec, 1.891.2.4,
	1.891.2.5 linux-2.6-execshield.patch, 1.90.2.1, 1.90.2.2 sources,
	1.798.2.2, 1.798.2.3 upstream, 1.717.2.2,
	1.717.2.3 patch-2.6.27.11.bz2.sign, 1.1.2.1,
	NONE patch-2.6.27.12-rc2.bz2.sign, 1.1.2.1, NONE
Message-ID: <20090119072340.CC681700F8@cvs1.fedora.phx.redhat.com>

Author: kyle

Update of /cvs/pkgs/rpms/kernel/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12958

Modified Files:
      Tag: private-fedora-9-2_6_27-branch
	.cvsignore kernel.spec linux-2.6-execshield.patch sources 
	upstream 
Added Files:
      Tag: private-fedora-9-2_6_27-branch
	patch-2.6.27.12.bz2.sign 
Removed Files:
      Tag: private-fedora-9-2_6_27-branch
	patch-2.6.27.11.bz2.sign patch-2.6.27.12-rc2.bz2.sign 
Log Message:
* Mon Jan 19 2009 Kyle McMartin <kyle at redhat.com> 2.6.27.12-78.2.4
- Linux 2.6.27.12



--- NEW FILE patch-2.6.27.12.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBJc3o+yGugalF9Dw4RAtN9AJwOXrslxF5Qg9DZIB4BjBBg5NlUWACcDZHJ
xhabYnp+/X7iiLKItLv39Ek=
=Vp+t
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/.cvsignore,v
retrieving revision 1.837.2.2
retrieving revision 1.837.2.3
diff -u -r1.837.2.2 -r1.837.2.3
--- .cvsignore	16 Jan 2009 23:48:19 -0000	1.837.2.2
+++ .cvsignore	19 Jan 2009 07:23:09 -0000	1.837.2.3
@@ -4,5 +4,4 @@
 temp-*
 kernel-2.6.27
 linux-2.6.27.tar.bz2
-patch-2.6.27.11.bz2
-patch-2.6.27.12-rc2.bz2
+patch-2.6.27.12.bz2


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/kernel.spec,v
retrieving revision 1.891.2.4
retrieving revision 1.891.2.5
diff -u -r1.891.2.4 -r1.891.2.5
--- kernel.spec	19 Jan 2009 06:24:52 -0000	1.891.2.4
+++ kernel.spec	19 Jan 2009 07:23:09 -0000	1.891.2.5
@@ -38,7 +38,7 @@
 # Do we have a -stable update to apply?
 %define stable_update 12
 # Is it a -stable RC?
-%define stable_rc 2
+%define stable_rc 0
 # Set rpm version accordingly
 %if 0%{?stable_update}
 %define stablerev .%{stable_update}
@@ -1922,6 +1922,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
+* Mon Jan 19 2009 Kyle McMartin <kyle at redhat.com> 2.6.27.12-78.2.4
+- Linux 2.6.27.12
+
+* Mon Jan 19 2009 Kyle McMartin <kyle at redhat.com>
+- Roll in xen changes to execshield diff as in later kernels.
+  (harmless on F-9 as xen was still seperate.)
+
 * Mon Jan 19 2009 Kyle McMartin <kyle at redhat.com>
 - execshield fixes: should no longer generate spurious handled GPFs,
   fixes randomization of executables. also some clean ups.

linux-2.6-execshield.patch:

Index: linux-2.6-execshield.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/linux-2.6-execshield.patch,v
retrieving revision 1.90.2.1
retrieving revision 1.90.2.2
diff -u -r1.90.2.1 -r1.90.2.2
--- linux-2.6-execshield.patch	19 Jan 2009 06:24:52 -0000	1.90.2.1
+++ linux-2.6-execshield.patch	19 Jan 2009 07:23:09 -0000	1.90.2.2
@@ -24,6 +24,20 @@
  	/* If the model name is still unset, do table lookup. */
  	if (!c->x86_model_id[0]) {
  		char *p;
+diff --git a/arch/x86/kernel/paravirt.c b/arch/x86/kernel/paravirt.c
+index 300da17..7efab43 100644
+--- a/arch/x86/kernel/paravirt.c
++++ b/arch/x86/kernel/paravirt.c
+@@ -336,6 +336,9 @@ struct pv_cpu_ops pv_cpu_ops = {
+ 	.read_tscp = native_read_tscp,
+ 	.load_tr_desc = native_load_tr_desc,
+ 	.set_ldt = native_set_ldt,
++#ifdef CONFIG_X86_32
++	.load_user_cs_desc = native_load_user_cs_desc,
++#endif
+ 	.load_gdt = native_load_gdt,
+ 	.load_idt = native_load_idt,
+ 	.store_gdt = native_store_gdt,
 diff --git a/arch/x86/kernel/process_32.c b/arch/x86/kernel/process_32.c
 index 31f40b2..e5c9006 100644
 --- a/arch/x86/kernel/process_32.c
@@ -354,6 +368,45 @@
  		if (IS_ERR_VALUE(addr)) {
  			ret = addr;
  			goto up_fail;
+diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c
+index a4e201b..3b01589 100644
+--- a/arch/x86/xen/enlighten.c
++++ b/arch/x86/xen/enlighten.c
+@@ -340,6 +340,24 @@ static void xen_set_ldt(const void *addr, unsigned entries)
+ 	xen_mc_issue(PARAVIRT_LAZY_CPU);
+ }
+ 
++#ifdef CONFIG_X86_32
++static inline void xen_load_user_cs_desc(int cpu, struct mm_struct *mm)
++{
++	void *gdt;
++	xmaddr_t mgdt;
++	u64 descriptor;
++	struct desc_struct user_cs;
++	
++	gdt = &get_cpu_gdt_table(cpu)[GDT_ENTRY_DEFAULT_USER_CS];
++	mgdt = virt_to_machine(gdt);
++
++	user_cs = mm->context.user_cs;
++	descriptor = (u64) user_cs.a | ((u64) user_cs.b) << 32;
++
++	HYPERVISOR_update_descriptor(mgdt.maddr, descriptor);
++}
++#endif
++
+ static void xen_load_gdt(const struct desc_ptr *dtr)
+ {
+ 	unsigned long *frames;
+@@ -1213,6 +1231,9 @@ static const struct pv_cpu_ops xen_cpu_ops __initdata = {
+ 
+ 	.load_tr_desc = paravirt_nop,
+ 	.set_ldt = xen_set_ldt,
++#ifdef CONFIG_X86_32
++	.load_user_cs_desc = xen_load_user_cs_desc,
++#endif
+ 	.load_gdt = xen_load_gdt,
+ 	.load_idt = xen_load_idt,
+ 	.load_tls = xen_load_tls,
 diff --git a/fs/binfmt_elf.c b/fs/binfmt_elf.c
 index 655ed8d..09da3e5 100644
 --- a/fs/binfmt_elf.c
@@ -435,10 +488,28 @@
  		min_flt = task->min_flt;
  		maj_flt = task->maj_flt;
 diff --git a/include/asm-x86/desc.h b/include/asm-x86/desc.h
-index a44c4dc..dfdf649 100644
+index a44c4dc..aeac336 100644
 --- a/include/asm-x86/desc.h
 +++ b/include/asm-x86/desc.h
-@@ -372,6 +372,25 @@ static inline void set_system_gate_ist(int n, void *addr, unsigned ist)
+@@ -6,6 +6,7 @@
+ #include <asm/ldt.h>
+ #include <asm/mmu.h>
+ #include <linux/smp.h>
++#include <linux/mm_types.h>
+ 
+ static inline void fill_ldt(struct desc_struct *desc,
+ 			    const struct user_desc *info)
+@@ -90,6 +91,9 @@ static inline int desc_empty(const void *ptr)
+ 
+ #define load_TLS(t, cpu) native_load_tls(t, cpu)
+ #define set_ldt native_set_ldt
++#ifdef CONFIG_X86_32
++#define load_user_cs_desc native_load_user_cs_desc
++#endif
+ 
+ #define write_ldt_entry(dt, entry, desc)	\
+ 	native_write_ldt_entry(dt, entry, desc)
+@@ -372,6 +376,29 @@ static inline void set_system_gate_ist(int n, void *addr, unsigned ist)
  	_set_gate(n, GATE_INTERRUPT, addr, 0x3, ist, __KERNEL_CS);
  }
  
@@ -450,8 +521,12 @@
 +	desc->b = (limit & 0xf0000) | 0x00c0fb00;
 +}
 +
-+#define load_user_cs_desc(cpu, mm) \
-+	get_cpu_gdt_table(cpu)[GDT_ENTRY_DEFAULT_USER_CS] = (mm)->context.user_cs
++#ifdef CONFIG_X86_32
++static inline void native_load_user_cs_desc(int cpu, struct mm_struct *mm)
++{
++	get_cpu_gdt_table(cpu)[GDT_ENTRY_DEFAULT_USER_CS] = mm->context.user_cs;
++}
++#endif
 +
 +#define arch_add_exec_range	arch_add_exec_range
 +extern void arch_add_exec_range(struct mm_struct *mm, unsigned long limit);
@@ -488,6 +563,34 @@
  } mm_context_t;
  
  #ifdef CONFIG_SMP
+diff --git a/include/asm-x86/paravirt.h b/include/asm-x86/paravirt.h
+index fbbde93..f354748 100644
+--- a/include/asm-x86/paravirt.h
++++ b/include/asm-x86/paravirt.h
+@@ -113,6 +113,9 @@ struct pv_cpu_ops {
+ 	void (*store_gdt)(struct desc_ptr *);
+ 	void (*store_idt)(struct desc_ptr *);
+ 	void (*set_ldt)(const void *desc, unsigned entries);
++#ifdef CONFIG_X86_32
++	void (*load_user_cs_desc)(int cpu, struct mm_struct *mm);
++#endif
+ 	unsigned long (*store_tr)(void);
+ 	void (*load_tls)(struct thread_struct *t, unsigned int cpu);
+ #ifdef CONFIG_X86_64
+@@ -840,6 +843,13 @@ static inline void set_ldt(const void *addr, unsigned entries)
+ {
+ 	PVOP_VCALL2(pv_cpu_ops.set_ldt, addr, entries);
+ }
++#ifdef CONFIG_X86_32
++static inline void load_user_cs_desc(unsigned int cpu, 
++				     struct mm_struct *mm)
++{
++	PVOP_VCALL2(pv_cpu_ops.load_user_cs_desc, cpu, mm);
++}
++#endif
+ static inline void store_gdt(struct desc_ptr *dtr)
+ {
+ 	PVOP_VCALL1(pv_cpu_ops.store_gdt, dtr);
 diff --git a/include/asm-x86/processor.h b/include/asm-x86/processor.h
 index 4df3e2f..a64e1e3 100644
 --- a/include/asm-x86/processor.h


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/sources,v
retrieving revision 1.798.2.2
retrieving revision 1.798.2.3
diff -u -r1.798.2.2 -r1.798.2.3
--- sources	16 Jan 2009 23:48:19 -0000	1.798.2.2
+++ sources	19 Jan 2009 07:23:10 -0000	1.798.2.3
@@ -1,3 +1,2 @@
 b3e78977aa79d3754cb7f8143d7ddabd  linux-2.6.27.tar.bz2
-89e88096f5cee9334eb0d7a47d46191c  patch-2.6.27.11.bz2
-9bd7a7f711683b89d33fb11fdd7f5027  patch-2.6.27.12-rc2.bz2
+6ec5b819521600fc5bd20b17a939113d  patch-2.6.27.12.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/upstream,v
retrieving revision 1.717.2.2
retrieving revision 1.717.2.3
diff -u -r1.717.2.2 -r1.717.2.3
--- upstream	16 Jan 2009 23:48:19 -0000	1.717.2.2
+++ upstream	19 Jan 2009 07:23:10 -0000	1.717.2.3
@@ -1,3 +1,2 @@
 linux-2.6.27.tar.bz2
-patch-2.6.27.11.bz2
-patch-2.6.27.12-rc2.bz2
+patch-2.6.27.12.bz2


--- patch-2.6.27.11.bz2.sign DELETED ---


--- patch-2.6.27.12-rc2.bz2.sign DELETED ---



From kyle at fedoraproject.org  Mon Jan 19 07:35:46 2009
From: kyle at fedoraproject.org (Kyle McMartin)
Date: Mon, 19 Jan 2009 07:35:46 +0000 (UTC)
Subject: rpms/kernel/F-10 patch-2.6.27.12.bz2.sign, NONE, 1.1.2.1 .cvsignore,
	1.960, 1.960.2.1 kernel.spec, 1.1206.2.1,
	1.1206.2.2 linux-2.6-execshield.patch, 1.97.12.1,
	1.97.12.2 linux-2.6.27.9-alsa-driver-1.0.18a.patch, 1.1,
	1.1.2.1 sources, 1.922, 1.922.2.1 upstream, 1.834,
	1.834.2.1 linux-2.6-iwlagn-downgrade-BUG_ON-in-interrupt.patch, 1.1, 
	NONE linux-2.6-iwlwifi-use-GFP_KERNEL-to-allocate-Rx-SKB-memory.patch,
	1.1, NONE
	linux-2.6-xen-execshield-add-xen-specific-load_user_cs_desc.patch,
	1.1, NONE
	linux-2.6-xen-execshield-only-define-load_user_cs_desc-on-32-bit.patch,
	1.1, NONE patch-2.6.27.10.bz2.sign, 1.1, NONE
Message-ID: <20090119073546.A3F4C700F8@cvs1.fedora.phx.redhat.com>

Author: kyle

Update of /cvs/pkgs/rpms/kernel/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15310

Modified Files:
      Tag: private-fedora-10-2_6_27
	.cvsignore kernel.spec linux-2.6-execshield.patch 
	linux-2.6.27.9-alsa-driver-1.0.18a.patch sources upstream 
Added Files:
      Tag: private-fedora-10-2_6_27
	patch-2.6.27.12.bz2.sign 
Removed Files:
      Tag: private-fedora-10-2_6_27
	linux-2.6-iwlagn-downgrade-BUG_ON-in-interrupt.patch 
	linux-2.6-iwlwifi-use-GFP_KERNEL-to-allocate-Rx-SKB-memory.patch 
	linux-2.6-xen-execshield-add-xen-specific-load_user_cs_desc.patch 
	linux-2.6-xen-execshield-only-define-load_user_cs_desc-on-32-bit.patch 
	patch-2.6.27.10.bz2.sign 
Log Message:
* Mon Jan 19 2009 Kyle McMartin <kyle at redhat.com>
- Linux 2.6.27.12
- linux-2.6-iwlagn-downgrade-BUG_ON-in-interrupt.patch: merged
- linux-2.6-iwlwifi-use-GFP_KERNEL-to-allocate-Rx-SKB-memory.patch: merged



--- NEW FILE patch-2.6.27.12.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBJc3o+yGugalF9Dw4RAtN9AJwOXrslxF5Qg9DZIB4BjBBg5NlUWACcDZHJ
xhabYnp+/X7iiLKItLv39Ek=
=Vp+t
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/.cvsignore,v
retrieving revision 1.960
retrieving revision 1.960.2.1
diff -u -r1.960 -r1.960.2.1
--- .cvsignore	18 Dec 2008 22:13:53 -0000	1.960
+++ .cvsignore	19 Jan 2009 07:35:12 -0000	1.960.2.1
@@ -4,4 +4,4 @@
 temp-*
 kernel-2.6.27
 linux-2.6.27.tar.bz2
-patch-2.6.27.10.bz2
+patch-2.6.27.12.bz2


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/kernel.spec,v
retrieving revision 1.1206.2.1
retrieving revision 1.1206.2.2
diff -u -r1.1206.2.1 -r1.1206.2.2
--- kernel.spec	19 Jan 2009 06:25:46 -0000	1.1206.2.1
+++ kernel.spec	19 Jan 2009 07:35:12 -0000	1.1206.2.2
@@ -36,7 +36,7 @@
 %if 0%{?released_kernel}
 
 # Do we have a -stable update to apply?
-%define stable_update 10
+%define stable_update 12
 # Is it a -stable RC?
 %define stable_rc 0
 # Set rpm version accordingly
@@ -604,8 +604,6 @@
 Patch149: linux-2.6-efika-not-chrp.patch
 
 Patch160: linux-2.6-execshield.patch
-Patch161: linux-2.6-xen-execshield-add-xen-specific-load_user_cs_desc.patch
-Patch163: linux-2.6-xen-execshield-only-define-load_user_cs_desc-on-32-bit.patch
 Patch250: linux-2.6-debug-sizeof-structs.patch
 Patch260: linux-2.6-debug-nmi-timeout.patch
 Patch270: linux-2.6-debug-taint-vm.patch
@@ -655,10 +653,8 @@
 
 Patch670: linux-2.6-ata-quirk.patch
 
-Patch680: linux-2.6-iwlagn-downgrade-BUG_ON-in-interrupt.patch
 Patch681: linux-2.6-iwl3945-ibss-tsf-fix.patch
 Patch682: linux-2.6-wireless-ath9k-dma-fixes.patch
-Patch684: linux-2.6-iwlwifi-use-GFP_KERNEL-to-allocate-Rx-SKB-memory.patch
 Patch690: linux-2.6-at76.patch
 
 Patch700: linux-2.6-nfs-client-mounts-hang.patch
@@ -1159,9 +1155,6 @@
 # Exec shield
 #
 ApplyPatch linux-2.6-execshield.patch
-ApplyPatch linux-2.6-xen-execshield-add-xen-specific-load_user_cs_desc.patch
-
-ApplyPatch linux-2.6-xen-execshield-only-define-load_user_cs_desc-on-32-bit.patch
 
 #
 # bugfixes to drivers and filesystems
@@ -1268,17 +1261,12 @@
 # ia64 ata quirk
 ApplyPatch linux-2.6-ata-quirk.patch
 
-# make jarod's iwl4965 not panic near N APs, hopefully
-ApplyPatch linux-2.6-iwlagn-downgrade-BUG_ON-in-interrupt.patch
 # iwl3945 fix for stable ad-hoc mode connections (#459401)
 ApplyPatch linux-2.6-iwl3945-ibss-tsf-fix.patch
 
 # Backported ath9k DMA fixes from pre-2.6.28
 ApplyPatch linux-2.6-wireless-ath9k-dma-fixes.patch
 
-# iwlwifi: use GFP_KERNEL to allocate Rx SKB memory
-ApplyPatch linux-2.6-iwlwifi-use-GFP_KERNEL-to-allocate-Rx-SKB-memory.patch
-
 # Add misc wireless bits from upstream wireless tree
 ApplyPatch linux-2.6-at76.patch
 
@@ -1938,6 +1926,14 @@
 
 %changelog
 * Mon Jan 19 2009 Kyle McMartin <kyle at redhat.com>
+- Linux 2.6.27.12
+- linux-2.6-iwlagn-downgrade-BUG_ON-in-interrupt.patch: merged
+- linux-2.6-iwlwifi-use-GFP_KERNEL-to-allocate-Rx-SKB-memory.patch: merged
+
+* Mon Jan 19 2009 Kyle McMartin <kyle at redhat.com>
+- Roll in xen changes to execshield diff as in later kernels.
+
+* Mon Jan 19 2009 Kyle McMartin <kyle at redhat.com>
 - execshield fixes: should no longer generate spurious handled GPFs,
   fixes randomization of executables. also some clean ups.
 

linux-2.6-execshield.patch:

Index: linux-2.6-execshield.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/linux-2.6-execshield.patch,v
retrieving revision 1.97.12.1
retrieving revision 1.97.12.2
diff -u -r1.97.12.1 -r1.97.12.2
--- linux-2.6-execshield.patch	19 Jan 2009 06:25:46 -0000	1.97.12.1
+++ linux-2.6-execshield.patch	19 Jan 2009 07:35:13 -0000	1.97.12.2
@@ -24,6 +24,20 @@
  	/* If the model name is still unset, do table lookup. */
  	if (!c->x86_model_id[0]) {
  		char *p;
+diff --git a/arch/x86/kernel/paravirt.c b/arch/x86/kernel/paravirt.c
+index 300da17..7efab43 100644
+--- a/arch/x86/kernel/paravirt.c
++++ b/arch/x86/kernel/paravirt.c
+@@ -336,6 +336,9 @@ struct pv_cpu_ops pv_cpu_ops = {
+ 	.read_tscp = native_read_tscp,
+ 	.load_tr_desc = native_load_tr_desc,
+ 	.set_ldt = native_set_ldt,
++#ifdef CONFIG_X86_32
++	.load_user_cs_desc = native_load_user_cs_desc,
++#endif
+ 	.load_gdt = native_load_gdt,
+ 	.load_idt = native_load_idt,
+ 	.store_gdt = native_store_gdt,
 diff --git a/arch/x86/kernel/process_32.c b/arch/x86/kernel/process_32.c
 index 31f40b2..e5c9006 100644
 --- a/arch/x86/kernel/process_32.c
@@ -354,6 +368,45 @@
  		if (IS_ERR_VALUE(addr)) {
  			ret = addr;
  			goto up_fail;
+diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c
+index a4e201b..3b01589 100644
+--- a/arch/x86/xen/enlighten.c
++++ b/arch/x86/xen/enlighten.c
+@@ -340,6 +340,24 @@ static void xen_set_ldt(const void *addr, unsigned entries)
+ 	xen_mc_issue(PARAVIRT_LAZY_CPU);
+ }
+ 
++#ifdef CONFIG_X86_32
++static inline void xen_load_user_cs_desc(int cpu, struct mm_struct *mm)
++{
++	void *gdt;
++	xmaddr_t mgdt;
++	u64 descriptor;
++	struct desc_struct user_cs;
++	
++	gdt = &get_cpu_gdt_table(cpu)[GDT_ENTRY_DEFAULT_USER_CS];
++	mgdt = virt_to_machine(gdt);
++
++	user_cs = mm->context.user_cs;
++	descriptor = (u64) user_cs.a | ((u64) user_cs.b) << 32;
++
++	HYPERVISOR_update_descriptor(mgdt.maddr, descriptor);
++}
++#endif
++
+ static void xen_load_gdt(const struct desc_ptr *dtr)
+ {
+ 	unsigned long *frames;
+@@ -1213,6 +1231,9 @@ static const struct pv_cpu_ops xen_cpu_ops __initdata = {
+ 
+ 	.load_tr_desc = paravirt_nop,
+ 	.set_ldt = xen_set_ldt,
++#ifdef CONFIG_X86_32
++	.load_user_cs_desc = xen_load_user_cs_desc,
++#endif
+ 	.load_gdt = xen_load_gdt,
+ 	.load_idt = xen_load_idt,
+ 	.load_tls = xen_load_tls,
 diff --git a/fs/binfmt_elf.c b/fs/binfmt_elf.c
 index 655ed8d..09da3e5 100644
 --- a/fs/binfmt_elf.c
@@ -435,10 +488,28 @@
  		min_flt = task->min_flt;
  		maj_flt = task->maj_flt;
 diff --git a/include/asm-x86/desc.h b/include/asm-x86/desc.h
-index a44c4dc..dfdf649 100644
+index a44c4dc..aeac336 100644
 --- a/include/asm-x86/desc.h
 +++ b/include/asm-x86/desc.h
-@@ -372,6 +372,25 @@ static inline void set_system_gate_ist(int n, void *addr, unsigned ist)
+@@ -6,6 +6,7 @@
+ #include <asm/ldt.h>
+ #include <asm/mmu.h>
+ #include <linux/smp.h>
++#include <linux/mm_types.h>
+ 
+ static inline void fill_ldt(struct desc_struct *desc,
+ 			    const struct user_desc *info)
+@@ -90,6 +91,9 @@ static inline int desc_empty(const void *ptr)
+ 
+ #define load_TLS(t, cpu) native_load_tls(t, cpu)
+ #define set_ldt native_set_ldt
++#ifdef CONFIG_X86_32
++#define load_user_cs_desc native_load_user_cs_desc
++#endif
+ 
+ #define write_ldt_entry(dt, entry, desc)	\
+ 	native_write_ldt_entry(dt, entry, desc)
+@@ -372,6 +376,29 @@ static inline void set_system_gate_ist(int n, void *addr, unsigned ist)
  	_set_gate(n, GATE_INTERRUPT, addr, 0x3, ist, __KERNEL_CS);
  }
  
@@ -450,8 +521,12 @@
 +	desc->b = (limit & 0xf0000) | 0x00c0fb00;
 +}
 +
-+#define load_user_cs_desc(cpu, mm) \
-+	get_cpu_gdt_table(cpu)[GDT_ENTRY_DEFAULT_USER_CS] = (mm)->context.user_cs
++#ifdef CONFIG_X86_32
++static inline void native_load_user_cs_desc(int cpu, struct mm_struct *mm)
++{
++	get_cpu_gdt_table(cpu)[GDT_ENTRY_DEFAULT_USER_CS] = mm->context.user_cs;
++}
++#endif
 +
 +#define arch_add_exec_range	arch_add_exec_range
 +extern void arch_add_exec_range(struct mm_struct *mm, unsigned long limit);
@@ -488,6 +563,34 @@
  } mm_context_t;
  
  #ifdef CONFIG_SMP
+diff --git a/include/asm-x86/paravirt.h b/include/asm-x86/paravirt.h
+index fbbde93..f354748 100644
+--- a/include/asm-x86/paravirt.h
++++ b/include/asm-x86/paravirt.h
+@@ -113,6 +113,9 @@ struct pv_cpu_ops {
+ 	void (*store_gdt)(struct desc_ptr *);
+ 	void (*store_idt)(struct desc_ptr *);
+ 	void (*set_ldt)(const void *desc, unsigned entries);
++#ifdef CONFIG_X86_32
++	void (*load_user_cs_desc)(int cpu, struct mm_struct *mm);
++#endif
+ 	unsigned long (*store_tr)(void);
+ 	void (*load_tls)(struct thread_struct *t, unsigned int cpu);
+ #ifdef CONFIG_X86_64
+@@ -840,6 +843,13 @@ static inline void set_ldt(const void *addr, unsigned entries)
+ {
+ 	PVOP_VCALL2(pv_cpu_ops.set_ldt, addr, entries);
+ }
++#ifdef CONFIG_X86_32
++static inline void load_user_cs_desc(unsigned int cpu, 
++				     struct mm_struct *mm)
++{
++	PVOP_VCALL2(pv_cpu_ops.load_user_cs_desc, cpu, mm);
++}
++#endif
+ static inline void store_gdt(struct desc_ptr *dtr)
+ {
+ 	PVOP_VCALL1(pv_cpu_ops.store_gdt, dtr);
 diff --git a/include/asm-x86/processor.h b/include/asm-x86/processor.h
 index 4df3e2f..a64e1e3 100644
 --- a/include/asm-x86/processor.h

linux-2.6.27.9-alsa-driver-1.0.18a.patch:

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.1 -r 1.1.2.1 linux-2.6.27.9-alsa-driver-1.0.18a.patch
Index: linux-2.6.27.9-alsa-driver-1.0.18a.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/Attic/linux-2.6.27.9-alsa-driver-1.0.18a.patch,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- linux-2.6.27.9-alsa-driver-1.0.18a.patch	12 Dec 2008 05:22:56 -0000	1.1
+++ linux-2.6.27.9-alsa-driver-1.0.18a.patch	19 Jan 2009 07:35:13 -0000	1.1.2.1
@@ -1,6 +1,8 @@
-diff -uprP a/Documentation/ALSA-Configuration.txt b/Documentation/ALSA-Configuration.txt
---- a/Documentation/ALSA-Configuration.txt	1969-12-31 19:00:00.000000000 -0500
-+++ b/Documentation/ALSA-Configuration.txt	2008-11-12 05:02:25.000000000 -0500
+diff --git a/Documentation/ALSA-Configuration.txt b/Documentation/ALSA-Configuration.txt
+new file mode 100644
+index 0000000..3ab5fb1
+--- /dev/null
++++ b/Documentation/ALSA-Configuration.txt
 @@ -0,0 +1,2415 @@
 +
 +		Advanced Linux Sound Architecture - Driver
@@ -2417,9 +2419,11 @@
 +
 +  ALSA Developers ML
 +       mailto:alsa-devel at alsa-project.org
-diff -uprP a/Documentation/Audigy-mixer.txt b/Documentation/Audigy-mixer.txt
---- a/Documentation/Audigy-mixer.txt	1969-12-31 19:00:00.000000000 -0500
-+++ b/Documentation/Audigy-mixer.txt	2008-11-12 05:02:25.000000000 -0500
+diff --git a/Documentation/Audigy-mixer.txt b/Documentation/Audigy-mixer.txt
+new file mode 100644
+index 0000000..7f10dc6
+--- /dev/null
++++ b/Documentation/Audigy-mixer.txt
 @@ -0,0 +1,345 @@
 +
 +		Sound Blaster Audigy mixer / default DSP code
@@ -2766,9 +2770,11 @@
 +                        a common interrupt by associating programs to GP registers,
 +                        defining interrupt register, polling GP registers, and invoking
 +                        callback routine associated with defined interrupt register
-diff -uprP a/Documentation/Audiophile-Usb.txt b/Documentation/Audiophile-Usb.txt
---- a/Documentation/Audiophile-Usb.txt	1969-12-31 19:00:00.000000000 -0500
-+++ b/Documentation/Audiophile-Usb.txt	2008-11-12 05:02:25.000000000 -0500
+diff --git a/Documentation/Audiophile-Usb.txt b/Documentation/Audiophile-Usb.txt
+new file mode 100644
+index 0000000..a4c53d8
+--- /dev/null
++++ b/Documentation/Audiophile-Usb.txt
 @@ -0,0 +1,442 @@
 +	Guide to using M-Audio Audiophile USB with ALSA and Jack	v1.5
 +	========================================================
@@ -3212,9 +3218,11 @@
 +
 +I had no success in testing this for now, if you have any success with this kind 
 +of setup, please drop me an email.
-diff -uprP a/Documentation/Bt87x.txt b/Documentation/Bt87x.txt
---- a/Documentation/Bt87x.txt	1969-12-31 19:00:00.000000000 -0500
-+++ b/Documentation/Bt87x.txt	2008-11-12 05:02:25.000000000 -0500
+diff --git a/Documentation/Bt87x.txt b/Documentation/Bt87x.txt
+new file mode 100644
+index 0000000..f158cde
+--- /dev/null
++++ b/Documentation/Bt87x.txt
 @@ -0,0 +1,78 @@
 +Intro
 +=====
@@ -3294,9 +3302,11 @@
 +
 +Written by Clemens Ladisch <clemens at ladisch.de>
 +big parts copied from btaudio.txt by Gerd Knorr <kraxel at bytesex.org>
-diff -uprP a/Documentation/CMIPCI.txt b/Documentation/CMIPCI.txt
---- a/Documentation/CMIPCI.txt	1969-12-31 19:00:00.000000000 -0500
-+++ b/Documentation/CMIPCI.txt	2008-11-12 05:02:25.000000000 -0500
+diff --git a/Documentation/CMIPCI.txt b/Documentation/CMIPCI.txt
+new file mode 100644
+index 0000000..16935c8
+--- /dev/null
++++ b/Documentation/CMIPCI.txt
 @@ -0,0 +1,254 @@
 +         Brief Notes on C-Media 8338/8738/8768/8770 Driver
 +         =================================================
@@ -3552,9 +3562,11 @@
 +The registers are shown in /proc/asound/cardX/cmipci.  If you have any
 +problem (especially unexpected behavior of mixer), please attach the
 +output of this proc file together with the bug report.
-diff -uprP a/Documentation/ControlNames.txt b/Documentation/ControlNames.txt
---- a/Documentation/ControlNames.txt	1969-12-31 19:00:00.000000000 -0500
-+++ b/Documentation/ControlNames.txt	2008-11-12 05:02:25.000000000 -0500
+diff --git a/Documentation/ControlNames.txt b/Documentation/ControlNames.txt
+new file mode 100644
+index 0000000..5b18298
+--- /dev/null
++++ b/Documentation/ControlNames.txt
 @@ -0,0 +1,84 @@
 +This document describes standard names of mixer controls.
 +
@@ -3640,9 +3652,11 @@
 +  IEC958 [...] [Playback|Capture] PCM Stream	/* the settings assigned to a PCM stream */
 +  IEC958 Q-subcode [Playback|Capture] Default	/* Q-subcode bits */
 +  IEC958 Preamble [Playback|Capture] Default	/* burst preamble words (4*16bits) */
-diff -uprP a/Documentation/DocBook/alsa-driver-api.tmpl b/Documentation/DocBook/alsa-driver-api.tmpl
---- a/Documentation/DocBook/alsa-driver-api.tmpl	1969-12-31 19:00:00.000000000 -0500
-+++ b/Documentation/DocBook/alsa-driver-api.tmpl	2008-11-12 05:02:25.000000000 -0500
+diff --git a/Documentation/DocBook/alsa-driver-api.tmpl b/Documentation/DocBook/alsa-driver-api.tmpl
+new file mode 100644
+index 0000000..9d644f7
+--- /dev/null
++++ b/Documentation/DocBook/alsa-driver-api.tmpl
 @@ -0,0 +1,100 @@
 +<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook V4.1//EN">
 +
@@ -3744,9 +3758,11 @@
 +  </chapter>
 +
 +</book>
-diff -uprP a/Documentation/DocBook/writing-an-alsa-driver.tmpl b/Documentation/DocBook/writing-an-alsa-driver.tmpl
---- a/Documentation/DocBook/writing-an-alsa-driver.tmpl	1969-12-31 19:00:00.000000000 -0500
-+++ b/Documentation/DocBook/writing-an-alsa-driver.tmpl	2008-11-12 05:02:25.000000000 -0500
+diff --git a/Documentation/DocBook/writing-an-alsa-driver.tmpl b/Documentation/DocBook/writing-an-alsa-driver.tmpl
+new file mode 100644
+index 0000000..87a7c07
+--- /dev/null
++++ b/Documentation/DocBook/writing-an-alsa-driver.tmpl
 @@ -0,0 +1,6210 @@
 +<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook V4.1//EN">
 +
@@ -9958,1899 +9974,1933 @@
 +    </para>
 +  </chapter>
 +</book>
-diff -uprP a/Documentation/emu10k1-jack.txt b/Documentation/emu10k1-jack.txt
---- a/Documentation/emu10k1-jack.txt	1969-12-31 19:00:00.000000000 -0500
-+++ b/Documentation/emu10k1-jack.txt	2008-11-12 05:02:25.000000000 -0500
-@@ -0,0 +1,74 @@
-+This document is a guide to using the emu10k1 based devices with JACK for low
-+latency, multichannel recording functionality.  All of my recent work to allow
-+Linux users to use the full capabilities of their hardware has been inspired 
-+by the kX Project.  Without their work I never would have discovered the true
-+power of this hardware.
+diff --git a/Documentation/Joystick.txt b/Documentation/Joystick.txt
+new file mode 100644
+index 0000000..ccda41b
+--- /dev/null
++++ b/Documentation/Joystick.txt
+@@ -0,0 +1,86 @@
++Analog Joystick Support on ALSA Drivers
++=======================================
++                          Oct. 14, 2003
++           Takashi Iwai <tiwai at suse.de>
 +
-+	http://www.kxproject.com
-+						- Lee Revell, 2005.03.30
++General
++-------
 +
-+Low latency, multichannel audio with JACK and the emu10k1/emu10k2
-+-----------------------------------------------------------------
++First of all, you need to enable GAMEPORT support on Linux kernel for
++using a joystick with the ALSA driver.  For the details of gameport
++support, refer to Documentation/input/joystick.txt.
 +
-+Until recently, emu10k1 users on Linux did not have access to the same low
-+latency, multichannel features offered by the "kX ASIO" feature of their
-+Windows driver.  As of ALSA 1.0.9 this is no more!
++The joystick support of ALSA drivers is different between ISA and PCI
++cards.  In the case of ISA (PnP) cards, it's usually handled by the
++independent module (ns558).  Meanwhile, the ALSA PCI drivers have the
++built-in gameport support.  Hence, when the ALSA PCI driver is built
++in the kernel, CONFIG_GAMEPORT must be 'y', too.  Otherwise, the
++gameport support on that card will be (silently) disabled.
 +
-+For those unfamiliar with kX ASIO, this consists of 16 capture and 16 playback
-+channels.  With a post 2.6.9 Linux kernel, latencies down to 64 (1.33 ms) or
-+even 32 (0.66ms) frames should work well.
++Some adapter modules probe the physical connection of the device at
++the load time.  It'd be safer to plug in the joystick device before
++loading the module.
 +
-+The configuration is slightly more involved than on Windows, as you have to
-+select the correct device for JACK to use.  Actually, for qjackctl users it's
-+fairly self explanatory - select Duplex, then for capture and playback select
-+the multichannel devices, set the in and out channels to 16, and the sample
-+rate to 48000Hz.  The command line looks like this:
 +
-+/usr/local/bin/jackd -R -dalsa -r48000 -p64 -n2 -D -Chw:0,2 -Phw:0,3 -S
++PCI Cards
++---------
 +
-+This will give you 16 input ports and 16 output ports.
++For PCI cards, the joystick is enabled when the appropriate module
++option is specified.  Some drivers don't need options, and the
++joystick support is always enabled.  In the former ALSA version, there
++was a dynamic control API for the joystick activation.  It was
++changed, however, to the static module options because of the system
++stability and the resource management.
 +
-+The 16 output ports map onto the 16 FX buses (or the first 16 of 64, for the
-+Audigy).  The mapping from FX bus to physical output is described in
-+SB-Live-mixer.txt (or Audigy-mixer.txt).
++The following PCI drivers support the joystick natively.
 +
[...34316 lines suppressed...]
  	if (quirk->type < QUIRK_TYPE_COUNT) {
-@@ -3629,7 +3637,7 @@ static void *snd_usb_audio_probe(struct 
+@@ -3629,7 +3637,7 @@ static void *snd_usb_audio_probe(struct usb_device *dev,
  	if (err > 0) {
  		/* create normal USB audio interfaces */
  		if (snd_usb_create_streams(chip, ifnum) < 0 ||
@@ -86299,9 +86751,10 @@
  			goto __error;
  		}
  	}
-diff -uprP a/sound/usb/usbaudio.h b/sound/usb/usbaudio.h
---- a/sound/usb/usbaudio.h	2008-10-09 18:13:53.000000000 -0400
-+++ b/sound/usb/usbaudio.h	2008-11-12 05:02:25.000000000 -0500
+diff --git a/sound/usb/usbaudio.h b/sound/usb/usbaudio.h
+index 7cf18c3..36e4f7a 100644
+--- a/sound/usb/usbaudio.h
++++ b/sound/usb/usbaudio.h
 @@ -156,11 +156,12 @@ enum quirk_type {
  	QUIRK_MIDI_RAW,
  	QUIRK_MIDI_EMAGIC,
@@ -86316,7 +86769,7 @@
  
  	QUIRK_TYPE_COUNT
  };
-@@ -222,7 +223,8 @@ int snd_usb_ctl_msg(struct usb_device *d
+@@ -222,7 +223,8 @@ int snd_usb_ctl_msg(struct usb_device *dev, unsigned int pipe,
  		    __u8 request, __u8 requesttype, __u16 value, __u16 index,
  		    void *data, __u16 size, int timeout);
  
@@ -86326,10 +86779,11 @@
  void snd_usb_mixer_disconnect(struct list_head *p);
  
  int snd_usb_create_midi_interface(struct snd_usb_audio *chip, struct usb_interface *iface,
-diff -uprP a/sound/usb/usbmidi.c b/sound/usb/usbmidi.c
---- a/sound/usb/usbmidi.c	2008-10-09 18:13:53.000000000 -0400
-+++ b/sound/usb/usbmidi.c	2008-11-12 05:02:25.000000000 -0500
-@@ -669,6 +669,42 @@ static struct usb_protocol_ops snd_usbmi
+diff --git a/sound/usb/usbmidi.c b/sound/usb/usbmidi.c
+index 6676a17..5962e4b 100644
+--- a/sound/usb/usbmidi.c
++++ b/sound/usb/usbmidi.c
+@@ -669,6 +669,42 @@ static struct usb_protocol_ops snd_usbmidi_raw_ops = {
  	.output = snd_usbmidi_raw_output,
  };
  
@@ -86372,7 +86826,7 @@
  /*
   * Emagic USB MIDI protocol: raw MIDI with "F5 xx" port switching.
   */
-@@ -1076,6 +1112,15 @@ void snd_usbmidi_disconnect(struct list_
+@@ -1076,6 +1112,15 @@ void snd_usbmidi_disconnect(struct list_head* p)
  		}
  		if (ep->in)
  			usb_kill_urb(ep->in->urb);
@@ -86388,7 +86842,7 @@
  	}
  	del_timer_sync(&umidi->error_timer);
  }
-@@ -1714,6 +1759,9 @@ int snd_usb_create_midi_interface(struct
+@@ -1714,6 +1759,9 @@ int snd_usb_create_midi_interface(struct snd_usb_audio* chip,
  			umidi->usb_protocol_ops =
  				&snd_usbmidi_maudio_broken_running_status_ops;
  		break;
@@ -86398,9 +86852,10 @@
  	case QUIRK_MIDI_FIXED_ENDPOINT:
  		memcpy(&endpoints[0], quirk->data,
  		       sizeof(struct snd_usb_midi_endpoint_info));
-diff -uprP a/sound/usb/usbmixer.c b/sound/usb/usbmixer.c
---- a/sound/usb/usbmixer.c	2008-10-09 18:13:53.000000000 -0400
-+++ b/sound/usb/usbmixer.c	2008-11-12 05:02:25.000000000 -0500
+diff --git a/sound/usb/usbmixer.c b/sound/usb/usbmixer.c
+index 89c63d0..a492461 100644
+--- a/sound/usb/usbmixer.c
++++ b/sound/usb/usbmixer.c
 @@ -59,12 +59,13 @@ static const struct rc_config {
  	u8  offset;
  	u8  length;
@@ -86418,7 +86873,7 @@
  };
  
  struct usb_mixer_interface {
-@@ -1388,7 +1389,8 @@ static int mixer_ctl_selector_info(struc
+@@ -1388,7 +1389,8 @@ static int mixer_ctl_selector_info(struct snd_kcontrol *kcontrol, struct snd_ctl
  	struct usb_mixer_elem_info *cval = kcontrol->private_data;
  	char **itemlist = (char **)kcontrol->private_value;
  
@@ -86428,7 +86883,7 @@
  	uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
  	uinfo->count = 1;
  	uinfo->value.enumerated.items = cval->max;
-@@ -1781,7 +1783,7 @@ static void snd_usb_soundblaster_remote_
+@@ -1781,7 +1783,7 @@ static void snd_usb_soundblaster_remote_complete(struct urb *urb)
  	const struct rc_config *rc = mixer->rc_cfg;
  	u32 code;
  
@@ -86437,7 +86892,7 @@
  		return;
  
  	code = mixer->rc_buffer[rc->offset];
-@@ -2012,7 +2014,8 @@ static void snd_audigy2nx_proc_read(stru
+@@ -2012,7 +2014,8 @@ static void snd_audigy2nx_proc_read(struct snd_info_entry *entry,
  	}
  }
  
@@ -86447,7 +86902,7 @@
  {
  	static struct snd_device_ops dev_ops = {
  		.dev_free = snd_usb_mixer_dev_free
-@@ -2027,9 +2030,7 @@ int snd_usb_create_mixer(struct snd_usb_
+@@ -2027,9 +2030,7 @@ int snd_usb_create_mixer(struct snd_usb_audio *chip, int ctrlif)
  		return -ENOMEM;
  	mixer->chip = chip;
  	mixer->ctrlif = ctrlif;
@@ -86458,9 +86913,10 @@
  	mixer->id_elems = kcalloc(256, sizeof(*mixer->id_elems), GFP_KERNEL);
  	if (!mixer->id_elems) {
  		kfree(mixer);
-diff -uprP a/sound/usb/usbquirks.h b/sound/usb/usbquirks.h
---- a/sound/usb/usbquirks.h	2008-10-09 18:13:53.000000000 -0400
-+++ b/sound/usb/usbquirks.h	2008-11-12 05:02:25.000000000 -0500
+diff --git a/sound/usb/usbquirks.h b/sound/usb/usbquirks.h
+index 9ea726c..9211575 100644
+--- a/sound/usb/usbquirks.h
++++ b/sound/usb/usbquirks.h
 @@ -62,6 +62,13 @@
  	.idProduct = 0x3f04,
  	.bInterfaceClass = USB_CLASS_AUDIO,
@@ -86625,18 +87081,21 @@
  
  /* Guillemot devices */
  {
-diff -uprP a/sound/usb/usx2y/Makefile b/sound/usb/usx2y/Makefile
---- a/sound/usb/usx2y/Makefile	2008-10-09 18:13:53.000000000 -0400
-+++ b/sound/usb/usx2y/Makefile	2008-11-12 05:02:25.000000000 -0500
+diff --git a/sound/usb/usx2y/Makefile b/sound/usb/usx2y/Makefile
+index 9ac22bc..7489330 100644
+--- a/sound/usb/usx2y/Makefile
++++ b/sound/usb/usx2y/Makefile
 @@ -1,3 +1,5 @@
  snd-usb-usx2y-objs := usbusx2y.o usX2Yhwdep.o usx2yhwdeppcm.o
 +snd-usb-us122l-objs := us122l.o
  
  obj-$(CONFIG_SND_USB_USX2Y) += snd-usb-usx2y.o
 +obj-$(CONFIG_SND_USB_US122L) += snd-usb-us122l.o
-diff -uprP a/sound/usb/usx2y/us122l.c b/sound/usb/usx2y/us122l.c
---- a/sound/usb/usx2y/us122l.c	1969-12-31 19:00:00.000000000 -0500
-+++ b/sound/usb/usx2y/us122l.c	2008-11-12 05:02:25.000000000 -0500
+diff --git a/sound/usb/usx2y/us122l.c b/sound/usb/usx2y/us122l.c
+new file mode 100644
+index 0000000..c2515b6
+--- /dev/null
++++ b/sound/usb/usx2y/us122l.c
 @@ -0,0 +1,693 @@
 +/*
 + * Copyright (C) 2007, 2008 Karsten Wiese <fzu at wemgehoertderstaat.de>
@@ -87331,9 +87790,11 @@
 +
 +module_init(snd_us122l_module_init)
 +module_exit(snd_us122l_module_exit)
-diff -uprP a/sound/usb/usx2y/us122l.h b/sound/usb/usx2y/us122l.h
---- a/sound/usb/usx2y/us122l.h	1969-12-31 19:00:00.000000000 -0500
-+++ b/sound/usb/usx2y/us122l.h	2008-11-12 05:02:25.000000000 -0500
+diff --git a/sound/usb/usx2y/us122l.h b/sound/usb/usx2y/us122l.h
+new file mode 100644
+index 0000000..3d10c4b
+--- /dev/null
++++ b/sound/usb/usx2y/us122l.h
 @@ -0,0 +1,27 @@
 +#ifndef US122L_H
 +#define US122L_H
@@ -87362,9 +87823,11 @@
 +#define USB_ID_US144 0x800F
 +
 +#endif
-diff -uprP a/sound/usb/usx2y/usb_stream.c b/sound/usb/usx2y/usb_stream.c
---- a/sound/usb/usx2y/usb_stream.c	1969-12-31 19:00:00.000000000 -0500
-+++ b/sound/usb/usx2y/usb_stream.c	2008-11-12 05:02:25.000000000 -0500
+diff --git a/sound/usb/usx2y/usb_stream.c b/sound/usb/usx2y/usb_stream.c
+new file mode 100644
+index 0000000..ff23cc1
+--- /dev/null
++++ b/sound/usb/usx2y/usb_stream.c
 @@ -0,0 +1,761 @@
 +/*
 + * Copyright (C) 2007, 2008 Karsten Wiese <fzu at wemgehoertderstaat.de>
@@ -88127,9 +88590,11 @@
 +	sk->s->state = usb_stream_stopped;
 +	msleep(400);
 +}
-diff -uprP a/sound/usb/usx2y/usb_stream.h b/sound/usb/usx2y/usb_stream.h
---- a/sound/usb/usx2y/usb_stream.h	1969-12-31 19:00:00.000000000 -0500
-+++ b/sound/usb/usx2y/usb_stream.h	2008-11-12 05:02:25.000000000 -0500
+diff --git a/sound/usb/usx2y/usb_stream.h b/sound/usb/usx2y/usb_stream.h
+new file mode 100644
+index 0000000..4dd74ab
+--- /dev/null
++++ b/sound/usb/usx2y/usb_stream.h
 @@ -0,0 +1,112 @@
 +/*
 + * Copyright (C) 2007, 2008 Karsten Wiese <fzu at wemgehoertderstaat.de>


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/sources,v
retrieving revision 1.922
retrieving revision 1.922.2.1
diff -u -r1.922 -r1.922.2.1
--- sources	18 Dec 2008 22:13:54 -0000	1.922
+++ sources	19 Jan 2009 07:35:13 -0000	1.922.2.1
@@ -1,2 +1,2 @@
 b3e78977aa79d3754cb7f8143d7ddabd  linux-2.6.27.tar.bz2
-82691ff96bff9b4fa19f91b69a9695f9  patch-2.6.27.10.bz2
+6ec5b819521600fc5bd20b17a939113d  patch-2.6.27.12.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/upstream,v
retrieving revision 1.834
retrieving revision 1.834.2.1
diff -u -r1.834 -r1.834.2.1
--- upstream	18 Dec 2008 22:13:54 -0000	1.834
+++ upstream	19 Jan 2009 07:35:13 -0000	1.834.2.1
@@ -1,2 +1,2 @@
 linux-2.6.27.tar.bz2
-patch-2.6.27.10.bz2
+patch-2.6.27.12.bz2


--- linux-2.6-iwlagn-downgrade-BUG_ON-in-interrupt.patch DELETED ---


--- linux-2.6-iwlwifi-use-GFP_KERNEL-to-allocate-Rx-SKB-memory.patch DELETED ---


--- linux-2.6-xen-execshield-add-xen-specific-load_user_cs_desc.patch DELETED ---


--- linux-2.6-xen-execshield-only-define-load_user_cs_desc-on-32-bit.patch DELETED ---


--- patch-2.6.27.10.bz2.sign DELETED ---



From petersen at fedoraproject.org  Mon Jan 19 08:18:44 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Mon, 19 Jan 2009 08:18:44 +0000 (UTC)
Subject: comps comps-f11.xml.in,1.63,1.64
Message-ID: <20090119081844.9724470141@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/extras/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21350

Modified Files:
	comps-f11.xml.in 
Log Message:
- install ibus by default instead of scim
- [haskell] update to install ghc-doc by default and add some optional packages




Index: comps-f11.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-f11.xml.in,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- comps-f11.xml.in	17 Jan 2009 12:49:30 -0000	1.63
+++ comps-f11.xml.in	19 Jan 2009 08:18:14 -0000	1.64
@@ -127,7 +127,7 @@
       <packagereq type="mandatory">m17n-contrib-assamese</packagereq>
       <packagereq type="mandatory">m17n-db-assamese</packagereq>
       <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-as_IN</packagereq>
-      <packagereq type="conditional" requires="xorg-x11-server-Xorg">scim-lang-assamese</packagereq>
+      <packagereq type="conditional" requires="xorg-x11-server-Xorg">ibus-m17n</packagereq>
       <packagereq type="default">iok</packagereq>
     </packagelist>
   </group>
@@ -426,7 +426,7 @@
       <packagereq type="conditional" requires="kdelibs3">kde-i18n-Bengali</packagereq>
       <packagereq type="conditional" requires="moodle">moodle-bn</packagereq>
       <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-bn</packagereq>
-      <packagereq type="conditional" requires="xorg-x11-server-Xorg">scim-lang-bengali</packagereq>
+      <packagereq type="conditional" requires="xorg-x11-server-Xorg">ibus-m17n</packagereq>
       <packagereq type="default">iok</packagereq>
     </packagelist>
   </group>
@@ -602,26 +602,22 @@
       <packagereq type="conditional" requires="moodle">moodle-zh_tw</packagereq>
       <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-zh_CN</packagereq>
       <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-zh_TW</packagereq>
-      <packagereq type="conditional" requires="xorg-x11-server-Xorg">scim-chewing</packagereq>
-      <packagereq type="conditional" requires="xorg-x11-server-Xorg">scim-lang-chinese</packagereq>
-      <packagereq type="conditional" requires="xorg-x11-server-Xorg">scim-python-chinese</packagereq>
-      <packagereq type="conditional" requires="xorg-x11-server-Xorg">scim-tables-chinese</packagereq>
-      <packagereq type="default">scim-python-pinyin</packagereq>
-      <packagereq type="default">scim-python-xingma-cangjie</packagereq>
-      <packagereq type="default">scim-python-xingma-erbi</packagereq>
-      <packagereq type="default">scim-python-xingma-wubi</packagereq>
-      <packagereq type="default">scim-python-xingma-zhengma</packagereq>
+      <packagereq type="conditional" requires="xorg-x11-server-Xorg">ibus-chewing</packagereq>
+      <packagereq type="conditional" requires="xorg-x11-server-Xorg">ibus-pinyin</packagereq>
+      <packagereq type="conditional" requires="xorg-x11-server-Xorg">ibus-table-chinese</packagereq>
       <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-python-pinyin</packagereq>
+      <packagereq type="optional">scim-python-xingma-cangjie</packagereq>
+      <packagereq type="optional">scim-python-xingma-erbi</packagereq>
+      <packagereq type="optional">scim-python-xingma-wubi</packagereq>
+      <packagereq type="optional">scim-python-xingma-zhengma</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>
@@ -2423,7 +2419,7 @@
       <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>
+      <packagereq type="conditional" requires="xorg-x11-server-Xorg">ibus-m17n</packagereq>
       <packagereq type="default">iok</packagereq>
       <packagereq type="default">samyak-fonts-gujarati</packagereq>
     </packagelist>
@@ -2484,14 +2480,14 @@
       <packagereq type="default">alex</packagereq>
       <packagereq type="default">darcs</packagereq>
       <packagereq type="default">ghc</packagereq>
-      <packagereq type="default">haddock09</packagereq>
+      <packagereq type="default">ghc-doc</packagereq>
       <packagereq type="default">happy</packagereq>
-      <packagereq type="default">hugs98</packagereq>
-      <packagereq type="optional">ghc-doc</packagereq>
       <packagereq type="optional">ghc-gtk2hs</packagereq>
-      <packagereq type="optional">ghc-haddock</packagereq>
+      <packagereq type="optional">ghc-gtk2hs-doc</packagereq>
       <packagereq type="optional">ghc-prof</packagereq>
       <packagereq type="optional">haddock</packagereq>
+      <packagereq type="optional">haddock09</packagereq>
+      <packagereq type="optional">hugs98</packagereq>
       <packagereq type="optional">hugs98-alut</packagereq>
       <packagereq type="optional">hugs98-demos</packagereq>
       <packagereq type="optional">hugs98-glut</packagereq>
@@ -2540,7 +2536,7 @@
       <packagereq type="conditional" requires="kdelibs">kde-l10n-Hindi</packagereq>
       <packagereq type="conditional" requires="moodle">moodle-hi</packagereq>
       <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-hi_IN</packagereq>
-      <packagereq type="conditional" requires="xorg-x11-server-Xorg">scim-lang-hindi</packagereq>
+      <packagereq type="conditional" requires="xorg-x11-server-Xorg">ibus-m17n</packagereq>
       <packagereq type="default">iok</packagereq>
       <packagereq type="default">samyak-fonts-devanagari</packagereq>
       <packagereq type="default">sarai-fonts</packagereq>
@@ -2604,9 +2600,13 @@
     <uservisible>true</uservisible>
     <packagelist>
       <packagereq type="conditional" requires="xfce-utils">imsettings-xfce</packagereq>
-      <packagereq type="conditional" requires="gtk2">scim-bridge-gtk</packagereq>
-      <packagereq type="conditional" requires="qt">scim-bridge-qt</packagereq>
-      <packagereq type="conditional" requires="qt3">scim-qtimm</packagereq>
+      <packagereq type="conditional" requires="gtk2">ibus-gtk</packagereq>
+      <packagereq type="conditional" requires="qt">ibus-qt</packagereq>
+      <packagereq type="default">ibus-anthy</packagereq>
+      <packagereq type="default">ibus-chewing</packagereq>
+      <packagereq type="default">ibus-hangul</packagereq>
+      <packagereq type="default">ibus-m17n</packagereq>
+      <packagereq type="default">ibus-pinyin</packagereq>
       <packagereq type="default">m17n-contrib-assamese</packagereq>
       <packagereq type="default">m17n-contrib-bengali</packagereq>
       <packagereq type="default">m17n-contrib-gujarati</packagereq>
@@ -2621,24 +2621,9 @@
       <packagereq type="default">m17n-contrib-urdu</packagereq>
       <packagereq type="default">m17n-db-sinhala</packagereq>
       <packagereq type="default">m17n-db-thai</packagereq>
-      <packagereq type="default">scim-anthy</packagereq>
-      <packagereq type="default">scim-chewing</packagereq>
-      <packagereq type="default">scim-hangul</packagereq>
-      <packagereq type="default">scim-m17n</packagereq>
-      <packagereq type="default">scim-python-pinyin</packagereq>
-      <packagereq type="default">scim-rawcode</packagereq>
       <packagereq type="optional">cellwriter</packagereq>
       <packagereq type="optional">gcin</packagereq>
       <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">iok</packagereq>
@@ -2686,29 +2671,31 @@
       <packagereq type="optional">m17n-db-uyghur</packagereq>
       <packagereq type="optional">m17n-db-vietnamese</packagereq>
       <packagereq type="optional">nabi</packagereq>
+      <packagereq type="optional">scim-anthy</packagereq>
       <packagereq type="optional">scim-array</packagereq>
+      <packagereq type="optional">scim-bridge-gtk</packagereq>
+      <packagereq type="optional">scim-bridge-qt</packagereq>
       <packagereq type="optional">scim-bridge-qt3</packagereq>
+      <packagereq type="optional">scim-chewing</packagereq>
       <packagereq type="optional">scim-fcitx</packagereq>
       <packagereq type="optional">scim-gtk</packagereq>
+      <packagereq type="optional">scim-hangul</packagereq>
       <packagereq type="optional">scim-input-pad</packagereq>
+      <packagereq type="optional">scim-m17n</packagereq>
       <packagereq type="optional">scim-pinyin</packagereq>
       <packagereq type="optional">scim-python-chinese</packagereq>
       <packagereq type="optional">scim-python-english</packagereq>
+      <packagereq type="optional">scim-python-pinyin</packagereq>
       <packagereq type="optional">scim-python-xingma-cangjie</packagereq>
       <packagereq type="optional">scim-python-xingma-erbi</packagereq>
       <packagereq type="optional">scim-python-xingma-wubi</packagereq>
       <packagereq type="optional">scim-python-xingma-zhengma</packagereq>
+      <packagereq type="optional">scim-rawcode</packagereq>
       <packagereq type="optional">scim-sayura</packagereq>
       <packagereq type="optional">scim-skk</packagereq>
       <packagereq type="optional">scim-tables-additional</packagereq>
-      <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>
-      <packagereq type="optional">scim-tables-vietnamese</packagereq>
       <packagereq type="optional">scim-tomoe</packagereq>
       <packagereq type="optional">uim</packagereq>
       <packagereq type="optional">uim-anthy</packagereq>
@@ -2788,8 +2775,7 @@
       <packagereq type="conditional" requires="man-pages">man-pages-ja</packagereq>
       <packagereq type="conditional" requires="moodle">moodle-ja</packagereq>
       <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-ja_JP</packagereq>
-      <packagereq type="conditional" requires="xorg-x11-server-Xorg">scim-anthy</packagereq>
-      <packagereq type="conditional" requires="xorg-x11-server-Xorg">scim-lang-japanese</packagereq>
+      <packagereq type="conditional" requires="xorg-x11-server-Xorg">ibus-anthy</packagereq>
       <packagereq type="conditional" requires="uim">uim-anthy</packagereq>
       <packagereq type="default">japanese-bitmap-fonts</packagereq>
       <packagereq type="default">sazanami-fonts-gothic</packagereq>
@@ -2821,6 +2807,7 @@
       <packagereq type="optional">nkf</packagereq>
       <packagereq type="optional">oniguruma</packagereq>
       <packagereq type="optional">perl-NKF</packagereq>
+      <packagereq type="optional">scim-anthy</packagereq>
       <packagereq type="optional">scim-skk</packagereq>
       <packagereq type="optional">stardict-dic-ja</packagereq>
       <packagereq type="optional">uim-canna</packagereq>
@@ -2983,7 +2970,7 @@
       <packagereq type="mandatory">m17n-db-kannada</packagereq>
       <packagereq type="conditional" requires="moodle">moodle-kn</packagereq>
       <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-kn_IN</packagereq>
-      <packagereq type="conditional" requires="xorg-x11-server-Xorg">scim-lang-kannada</packagereq>
+      <packagereq type="conditional" requires="xorg-x11-server-Xorg">ibus-m17n</packagereq>
       <packagereq type="default">iok</packagereq>
     </packagelist>
   </group>
@@ -2996,7 +2983,7 @@
     <langonly>ks</langonly>
     <packagelist>
       <packagereq type="mandatory">lohit-fonts-kashmiri</packagereq>
-      <packagereq type="conditional" requires="xorg-x11-server-Xorg">scim-lang-hindi</packagereq>
+      <packagereq type="conditional" requires="xorg-x11-server-Xorg">ibus-m17n</packagereq>
       <packagereq type="default">iok</packagereq>
       <packagereq type="default">m17n-contrib-hindi</packagereq>
       <packagereq type="default">m17n-db-hindi</packagereq>
@@ -3182,7 +3169,7 @@
     <langonly>kok</langonly>
     <packagelist>
       <packagereq type="mandatory">lohit-fonts-konkani</packagereq>
-      <packagereq type="conditional" requires="xorg-x11-server-Xorg">scim-lang-hindi</packagereq>
+      <packagereq type="conditional" requires="xorg-x11-server-Xorg">ibus-m17n</packagereq>
       <packagereq type="default">iok</packagereq>
       <packagereq type="default">m17n-contrib-hindi</packagereq>
       <packagereq type="default">m17n-db-hindi</packagereq>
@@ -3203,8 +3190,7 @@
       <packagereq type="conditional" requires="man-pages">man-pages-ko</packagereq>
       <packagereq type="conditional" requires="moodle">moodle-ko</packagereq>
       <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-ko_KR</packagereq>
-      <packagereq type="conditional" requires="xorg-x11-server-Xorg">scim-hangul</packagereq>
-      <packagereq type="conditional" requires="xorg-x11-server-Xorg">scim-lang-korean</packagereq>
+      <packagereq type="conditional" requires="xorg-x11-server-Xorg">ibus-hangul</packagereq>
       <packagereq type="default">baekmuk-bdf-fonts</packagereq>
       <packagereq type="default">baekmuk-ttf-fonts-batang</packagereq>
       <packagereq type="default">baekmuk-ttf-fonts-dotum</packagereq>
@@ -3483,7 +3469,7 @@
     <uservisible>false</uservisible>
     <langonly>mai</langonly>
     <packagelist>
-      <packagereq type="conditional" requires="xorg-x11-server-Xorg">scim-lang-hindi</packagereq>
+      <packagereq type="conditional" requires="xorg-x11-server-Xorg">ibus-m17n</packagereq>
       <packagereq type="default">iok</packagereq>
       <packagereq type="default">lohit-fonts-maithili</packagereq>
       <packagereq type="default">m17n-contrib-hindi</packagereq>
@@ -3529,7 +3515,7 @@
       <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>
+      <packagereq type="conditional" requires="xorg-x11-server-Xorg">ibus-m17n</packagereq>
       <packagereq type="default">iok</packagereq>
       <packagereq type="default">lohit-fonts-malayalam</packagereq>
       <packagereq type="default">samyak-fonts-malayalam</packagereq>
@@ -3569,7 +3555,7 @@
       <packagereq type="conditional" requires="gcompris">gcompris-sound-mr</packagereq>
       <packagereq type="conditional" requires="hunspell">hunspell-mr</packagereq>
       <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-mr_IN</packagereq>
-      <packagereq type="conditional" requires="xorg-x11-server-Xorg">scim-lang-marathi</packagereq>
+      <packagereq type="conditional" requires="xorg-x11-server-Xorg">ibus-m17n</packagereq>
       <packagereq type="default">iok</packagereq>
       <packagereq type="default">samyak-fonts-devanagari</packagereq>
     </packagelist>
@@ -3623,7 +3609,7 @@
       <packagereq type="conditional" requires="hunspell">hunspell-ne</packagereq>
       <packagereq type="conditional" requires="kdelibs">kde-l10n-Nepali</packagereq>
       <packagereq type="conditional" requires="koffice-core">koffice-langpack-ne</packagereq>
-      <packagereq type="conditional" requires="xorg-x11-server-Xorg">scim-lang-nepali</packagereq>
+      <packagereq type="conditional" requires="xorg-x11-server-Xorg">ibus-m17n</packagereq>
       <packagereq type="optional">scim-tables-nepali</packagereq>
     </packagelist>
   </group>
@@ -3842,7 +3828,7 @@
       <packagereq type="conditional" requires="aspell">aspell-or</packagereq>
       <packagereq type="conditional" requires="hunspell">hunspell-or</packagereq>
       <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-or_IN</packagereq>
-      <packagereq type="conditional" requires="xorg-x11-server-Xorg">scim-lang-oriya</packagereq>
+      <packagereq type="conditional" requires="xorg-x11-server-Xorg">ibus-m17n</packagereq>
       <packagereq type="default">iok</packagereq>
       <packagereq type="default">samyak-fonts-oriya</packagereq>
     </packagelist>
@@ -3942,7 +3928,7 @@
       <packagereq type="conditional" requires="kdelibs3">kde-i18n-Punjabi</packagereq>
       <packagereq type="conditional" requires="kdelibs">kde-l10n-Punjabi</packagereq>
       <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-pa_IN</packagereq>
-      <packagereq type="conditional" requires="xorg-x11-server-Xorg">scim-lang-punjabi</packagereq>
+      <packagereq type="conditional" requires="xorg-x11-server-Xorg">ibus-m17n</packagereq>
       <packagereq type="default">iok</packagereq>
     </packagelist>
   </group>
@@ -4086,8 +4072,8 @@
       <packagereq type="mandatory">m17n-contrib-sinhala</packagereq>
       <packagereq type="mandatory">m17n-db-sinhala</packagereq>
       <packagereq type="conditional" requires="moodle">moodle-si</packagereq>
-      <packagereq type="conditional" requires="xorg-x11-server-Xorg">scim-lang-sinhalese</packagereq>
-      <packagereq type="conditional" requires="xorg-x11-server-Xorg">scim-sayura</packagereq>
+      <packagereq type="conditional" requires="xorg-x11-server-Xorg">ibus-m17n</packagereq>
+      <packagereq type="optional">scim-sayura</packagereq>
     </packagelist>
   </group>
   <group>
@@ -4637,7 +4623,7 @@
       <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>
-      <packagereq type="conditional" requires="xorg-x11-server-Xorg">scim-lang-tamil</packagereq>
+      <packagereq type="conditional" requires="xorg-x11-server-Xorg">ibus-m17n</packagereq>
       <packagereq type="default">iok</packagereq>
       <packagereq type="default">samyak-fonts-tamil</packagereq>
       <packagereq type="optional">serafettin-cartoon-fonts</packagereq>
@@ -4657,7 +4643,7 @@
       <packagereq type="conditional" requires="aspell">aspell-te</packagereq>
       <packagereq type="conditional" requires="hunspell">hunspell-te</packagereq>
       <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-te_IN</packagereq>
-      <packagereq type="conditional" requires="xorg-x11-server-Xorg">scim-lang-telugu</packagereq>
+      <packagereq type="conditional" requires="xorg-x11-server-Xorg">ibus-m17n</packagereq>
       <packagereq type="default">iok</packagereq>
     </packagelist>
   </group>
@@ -4721,7 +4707,7 @@
       <packagereq type="conditional" requires="kdelibs">kde-l10n-Thai</packagereq>
       <packagereq type="conditional" requires="moodle">moodle-th</packagereq>
       <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-th_TH</packagereq>
-      <packagereq type="conditional" requires="xorg-x11-server-Xorg">scim-lang-thai</packagereq>
+      <packagereq type="conditional" requires="xorg-x11-server-Xorg">ibus-m17n</packagereq>
       <packagereq type="optional">scim-tables-thai</packagereq>
     </packagelist>
   </group>
@@ -4735,7 +4721,7 @@
     <packagelist>
       <packagereq type="mandatory">m17n-db-tibetan</packagereq>
       <packagereq type="mandatory">tibetan-machine-uni-fonts</packagereq>
-      <packagereq type="conditional" requires="xorg-x11-server-Xorg">scim-lang-tibetan</packagereq>
+      <packagereq type="conditional" requires="xorg-x11-server-Xorg">ibus-m17n</packagereq>
       <packagereq type="default">jomolhari-fonts</packagereq>
     </packagelist>
   </group>



From pbrobinson at fedoraproject.org  Mon Jan 19 08:35:30 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Mon, 19 Jan 2009 08:35:30 +0000 (UTC)
Subject: rpms/tangogps/devel .cvsignore, 1.2, 1.3 sources, 1.2,
	1.3 tangogps.spec, 1.1, 1.2
Message-ID: <20090119083530.58633700F8@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/tangogps/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24155

Modified Files:
	.cvsignore sources tangogps.spec 
Log Message:
- New upstream release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/tangogps/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	1 Sep 2008 22:28:59 -0000	1.2
+++ .cvsignore	19 Jan 2009 08:34:59 -0000	1.3
@@ -1 +1 @@
-tangogps-0.9.3.tar.gz
+tangogps-0.9.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tangogps/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	1 Sep 2008 22:28:59 -0000	1.2
+++ sources	19 Jan 2009 08:34:59 -0000	1.3
@@ -1 +1 @@
-4e6e4c1a5c1ee2e6026454083de3d5d5  tangogps-0.9.3.tar.gz
+1065970332a1e92b747c3a0b78d2f7b5  tangogps-0.9.5.tar.gz


Index: tangogps.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tangogps/devel/tangogps.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tangogps.spec	1 Sep 2008 22:28:59 -0000	1.1
+++ tangogps.spec	19 Jan 2009 08:34:59 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           tangogps
-Version:        0.9.3
-Release:        3%{?dist}
+Version:        0.9.5
+Release:        1%{?dist}
 Summary:        GTK+ mapping and GPS application
 
 Group:          Applications/Productivity
@@ -41,6 +41,7 @@
 desktop-file-install --vendor="fedora" \
 --dir=%{buildroot}%{_datadir}/applications %{SOURCE1}
 rm -rf %{buildroot}%{_datadir}/applications/tangogps.desktop
+rm -rf %{buildroot}/usr/doc/%{name}/
 
 %find_lang %{name}
 
@@ -49,13 +50,16 @@
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-%doc COPYING
+%doc COPYING 
 %{_bindir}/tangogps
 %{_datadir}/applications/fedora-tangogps.desktop
 %{_datadir}/pixmaps/tangogps.png
 %{_datadir}/pixmaps/tangogps-*.png
 
 %changelog
+* Mon Jan 19 2009 Peter Robinson <pbrobinson at gmail.com> 0.9.5-1
+- New upstream release
+
 * Mon Sep 1 2008 Peter Robinson <pbrobinson at gmail.com> 0.9.3-3
 - Cleanups from package review
 



From pbrobinson at fedoraproject.org  Mon Jan 19 08:36:36 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Mon, 19 Jan 2009 08:36:36 +0000 (UTC)
Subject: rpms/tangogps/F-10 sources,1.2,1.3 tangogps.spec,1.1,1.2
Message-ID: <20090119083636.DAA67700F8@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/tangogps/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24396

Modified Files:
	sources tangogps.spec 
Log Message:
- New upstream release


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tangogps/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	1 Sep 2008 22:28:59 -0000	1.2
+++ sources	19 Jan 2009 08:36:06 -0000	1.3
@@ -1 +1 @@
-4e6e4c1a5c1ee2e6026454083de3d5d5  tangogps-0.9.3.tar.gz
+1065970332a1e92b747c3a0b78d2f7b5  tangogps-0.9.5.tar.gz


Index: tangogps.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tangogps/F-10/tangogps.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tangogps.spec	1 Sep 2008 22:28:59 -0000	1.1
+++ tangogps.spec	19 Jan 2009 08:36:06 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           tangogps
-Version:        0.9.3
-Release:        3%{?dist}
+Version:        0.9.5
+Release:        1%{?dist}
 Summary:        GTK+ mapping and GPS application
 
 Group:          Applications/Productivity
@@ -41,6 +41,7 @@
 desktop-file-install --vendor="fedora" \
 --dir=%{buildroot}%{_datadir}/applications %{SOURCE1}
 rm -rf %{buildroot}%{_datadir}/applications/tangogps.desktop
+rm -rf %{buildroot}/usr/doc/%{name}/
 
 %find_lang %{name}
 
@@ -49,13 +50,16 @@
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-%doc COPYING
+%doc COPYING 
 %{_bindir}/tangogps
 %{_datadir}/applications/fedora-tangogps.desktop
 %{_datadir}/pixmaps/tangogps.png
 %{_datadir}/pixmaps/tangogps-*.png
 
 %changelog
+* Mon Jan 19 2009 Peter Robinson <pbrobinson at gmail.com> 0.9.5-1
+- New upstream release
+
 * Mon Sep 1 2008 Peter Robinson <pbrobinson at gmail.com> 0.9.3-3
 - Cleanups from package review
 



From mmaslano at fedoraproject.org  Mon Jan 19 08:37:13 2009
From: mmaslano at fedoraproject.org (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?=)
Date: Mon, 19 Jan 2009 08:37:13 +0000 (UTC)
Subject: rpms/perl/devel perl-5.10.0-PerlIO-via-change34025.patch, NONE,
	1.1 perl.spec, 1.200, 1.201
Message-ID: <20090119083713.B6597700F8@cvs1.fedora.phx.redhat.com>

Author: mmaslano

Update of /cvs/pkgs/rpms/perl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24526

Modified Files:
	perl.spec 
Added Files:
	perl-5.10.0-PerlIO-via-change34025.patch 
Log Message:
* Mon Jan 19 2009 Marcela Ma??l????ov?? <mmaslano at redhat.com> - 4:5.10.0-54
- 455410 http://rt.perl.org/rt3/Public/Bug/Display.html?id=54934
  Attempt to free unreferenced scalar fiddling with the symbol table
  Keep the refcount of the globs generated by PerlIO::via balanced.


perl-5.10.0-PerlIO-via-change34025.patch:

--- NEW FILE perl-5.10.0-PerlIO-via-change34025.patch ---
Change 34025 by rgs at scipion on 2008/06/08 14:00:59

Fix for bug [perl #54934] Attempt to free unreferenced scalar
fiddling with the symbol table
Keep the refcount of the globs generated by PerlIO::via balanced.

Affected files ...

... //depot/perl/ext/PerlIO/via/via.pm#9 edit
... //depot/perl/ext/PerlIO/via/via.xs#17 edit

Differences ...
diff -up perl-5.10.0/ext/PerlIO/via/via.xs.34025 perl-5.10.0/ext/PerlIO/via/via.xs
--- perl-5.10.0/ext/PerlIO/via/via.xs.34025	2007-12-18 11:47:07.000000000 +0100
+++ perl-5.10.0/ext/PerlIO/via/via.xs	2009-01-19 09:15:46.000000000 +0100
@@ -89,7 +89,7 @@ PerlIOVia_method(pTHX_ PerlIO * f, char 
 	    if (!s->fh) {
 		GV *gv = newGVgen(HvNAME_get(s->stash));
 		GvIOp(gv) = newIO();
-		s->fh = newRV_noinc((SV *) gv);
+		s->fh = newRV((SV *) gv);
 		s->io = GvIOp(gv);
 	    }
 	    IoIFP(s->io) = PerlIONext(f);


Index: perl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl/devel/perl.spec,v
retrieving revision 1.200
retrieving revision 1.201
diff -u -r1.200 -r1.201
--- perl.spec	22 Dec 2008 10:06:37 -0000	1.200
+++ perl.spec	19 Jan 2009 08:36:43 -0000	1.201
@@ -7,7 +7,7 @@
 
 Name:           perl
 Version:        %{perl_version}
-Release:        53%{?dist}
+Release:        54%{?dist}
 Epoch:          %{perl_epoch}
 Summary:        Practical Extraction and Report Language
 Group:          Development/Languages
@@ -123,6 +123,7 @@
 Patch31:    perl-5.10.0-Change33897.patch
 
 Patch32:	perl-5.10.0-ArchiveTar1.40.patch
+Patch33:	perl-5.10.0-PerlIO-via-change34025.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{perl_version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  tcsh, dos2unix, man, groff
@@ -863,6 +864,7 @@
 %patch30 -p1
 %patch31 -p1
 %patch32 -p1
+%patch33 -p1
 
 #
 # Candidates for doc recoding (need case by case review):
@@ -1097,6 +1099,7 @@
 perl -x patchlevel.h '33896 Eliminate POSIX::int_macro_int, and all the complex AUTOLOAD fandango'
 perl -x patchlevel.h '33897 Replaced the WEXITSTATUS, WIFEXITED, WIFSIGNALED, WIFSTOPPED, WSTOPSIG'
 perl -x patchlevel.h 'Fedora Patch32: CVE-2007-4829 Update Archive::Tar to 1.40'
+perl -x patchlevel.h '54934 Change 34025 refcount of the globs generated by PerlIO::via balanced'
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -1704,6 +1707,11 @@
 
 # Old changelog entries are preserved in CVS.
 %changelog
+* Mon Jan 19 2009 Marcela Ma??l????ov?? <mmaslano at redhat.com> - 4:5.10.0-54
+- 455410 http://rt.perl.org/rt3/Public/Bug/Display.html?id=54934
+  Attempt to free unreferenced scalar fiddling with the symbol table
+  Keep the refcount of the globs generated by PerlIO::via balanced.
+
 * Mon Dec 22 2008 Marcela Ma??l????ov?? <mmaslano at redhat.com> - 4:5.10.0-53
 - add missing XHTML.pm into Pod::Simple
 



From pbrobinson at fedoraproject.org  Mon Jan 19 08:38:57 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Mon, 19 Jan 2009 08:38:57 +0000 (UTC)
Subject: rpms/tangogps/F-9 sources,1.2,1.3 tangogps.spec,1.1,1.2
Message-ID: <20090119083857.BD62D700F8@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/tangogps/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25012

Modified Files:
	sources tangogps.spec 
Log Message:
- New upstream release


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tangogps/F-9/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	1 Sep 2008 22:36:11 -0000	1.2
+++ sources	19 Jan 2009 08:38:27 -0000	1.3
@@ -1 +1 @@
-4e6e4c1a5c1ee2e6026454083de3d5d5  tangogps-0.9.3.tar.gz
+1065970332a1e92b747c3a0b78d2f7b5  tangogps-0.9.5.tar.gz


Index: tangogps.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tangogps/F-9/tangogps.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tangogps.spec	1 Sep 2008 22:36:11 -0000	1.1
+++ tangogps.spec	19 Jan 2009 08:38:27 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           tangogps
-Version:        0.9.3
-Release:        3%{?dist}
+Version:        0.9.5
+Release:        1%{?dist}
 Summary:        GTK+ mapping and GPS application
 
 Group:          Applications/Productivity
@@ -41,6 +41,7 @@
 desktop-file-install --vendor="fedora" \
 --dir=%{buildroot}%{_datadir}/applications %{SOURCE1}
 rm -rf %{buildroot}%{_datadir}/applications/tangogps.desktop
+rm -rf %{buildroot}/usr/doc/%{name}/
 
 %find_lang %{name}
 
@@ -49,13 +50,16 @@
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-%doc COPYING
+%doc COPYING 
 %{_bindir}/tangogps
 %{_datadir}/applications/fedora-tangogps.desktop
 %{_datadir}/pixmaps/tangogps.png
 %{_datadir}/pixmaps/tangogps-*.png
 
 %changelog
+* Mon Jan 19 2009 Peter Robinson <pbrobinson at gmail.com> 0.9.5-1
+- New upstream release
+
 * Mon Sep 1 2008 Peter Robinson <pbrobinson at gmail.com> 0.9.3-3
 - Cleanups from package review
 



From mmaslano at fedoraproject.org  Mon Jan 19 08:39:20 2009
From: mmaslano at fedoraproject.org (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?=)
Date: Mon, 19 Jan 2009 08:39:20 +0000 (UTC)
Subject: rpms/perl/F-10 perl-5.10.0-PerlIO-via-change34025.patch, NONE,
	1.1 perl.spec, 1.198, 1.199
Message-ID: <20090119083920.48523700F8@cvs1.fedora.phx.redhat.com>

Author: mmaslano

Update of /cvs/pkgs/rpms/perl/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25127

Modified Files:
	perl.spec 
Added Files:
	perl-5.10.0-PerlIO-via-change34025.patch 
Log Message:
* Mon Jan 19 2009 Marcela Ma??l????ov?? <mmaslano at redhat.com> - 4:5.10.0-53
- 455410 http://rt.perl.org/rt3/Public/Bug/Display.html?id=54934
  Attempt to free unreferenced scalar fiddling with the symbol table
  Keep the refcount of the globs generated by PerlIO::via balanced.


perl-5.10.0-PerlIO-via-change34025.patch:

--- NEW FILE perl-5.10.0-PerlIO-via-change34025.patch ---
Change 34025 by rgs at scipion on 2008/06/08 14:00:59

Fix for bug [perl #54934] Attempt to free unreferenced scalar
fiddling with the symbol table
Keep the refcount of the globs generated by PerlIO::via balanced.

Affected files ...

... //depot/perl/ext/PerlIO/via/via.pm#9 edit
... //depot/perl/ext/PerlIO/via/via.xs#17 edit

Differences ...
diff -up perl-5.10.0/ext/PerlIO/via/via.xs.34025 perl-5.10.0/ext/PerlIO/via/via.xs
--- perl-5.10.0/ext/PerlIO/via/via.xs.34025	2007-12-18 11:47:07.000000000 +0100
+++ perl-5.10.0/ext/PerlIO/via/via.xs	2009-01-19 09:15:46.000000000 +0100
@@ -89,7 +89,7 @@ PerlIOVia_method(pTHX_ PerlIO * f, char 
 	    if (!s->fh) {
 		GV *gv = newGVgen(HvNAME_get(s->stash));
 		GvIOp(gv) = newIO();
-		s->fh = newRV_noinc((SV *) gv);
+		s->fh = newRV((SV *) gv);
 		s->io = GvIOp(gv);
 	    }
 	    IoIFP(s->io) = PerlIONext(f);


Index: perl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl/F-10/perl.spec,v
retrieving revision 1.198
retrieving revision 1.199
diff -u -r1.198 -r1.199
--- perl.spec	22 Dec 2008 10:41:14 -0000	1.198
+++ perl.spec	19 Jan 2009 08:38:50 -0000	1.199
@@ -7,7 +7,7 @@
 
 Name:           perl
 Version:        %{perl_version}
-Release:        52%{?dist}
+Release:        53%{?dist}
 Epoch:          %{perl_epoch}
 Summary:        Practical Extraction and Report Language
 Group:          Development/Languages
@@ -863,6 +863,7 @@
 %patch30 -p1
 %patch31 -p1
 %patch32 -p1
+%patch33 -p1
 
 #
 # Candidates for doc recoding (need case by case review):
@@ -1097,6 +1098,7 @@
 perl -x patchlevel.h '33896 Eliminate POSIX::int_macro_int, and all the complex AUTOLOAD fandango'
 perl -x patchlevel.h '33897 Replaced the WEXITSTATUS, WIFEXITED, WIFSIGNALED, WIFSTOPPED, WSTOPSIG'
 perl -x patchlevel.h 'Fedora Patch32: CVE-2007-4829 Update Archive::Tar to 1.40'
+perl -x patchlevel.h '54934 Change 34025 refcount of the globs generated by PerlIO::via balanced'
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -1704,6 +1706,11 @@
 
 # Old changelog entries are preserved in CVS.
 %changelog
+* Mon Jan 19 2009 Marcela Ma??l????ov?? <mmaslano at redhat.com> - 4:5.10.0-53
+- 455410 http://rt.perl.org/rt3/Public/Bug/Display.html?id=54934
+  Attempt to free unreferenced scalar fiddling with the symbol table
+  Keep the refcount of the globs generated by PerlIO::via balanced.
+
 * Mon Dec 22 2008 Marcela Ma??l????ov?? <mmaslano at redhat.com> - 4:5.10.0-52
 - add missing XHTML.pm into Pod::Simple
 - 295021 CVE-2007-4829 perl-Archive-Tar directory traversal flaws



From caolanm at fedoraproject.org  Mon Jan 19 08:39:55 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Mon, 19 Jan 2009 08:39:55 +0000 (UTC)
Subject: rpms/openoffice.org/devel openoffice.org.spec,1.1761,1.1762
Message-ID: <20090119083955.4D378700F8@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25347

Modified Files:
	openoffice.org.spec 
Log Message:
another fontname change


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1761
retrieving revision 1.1762
diff -u -r1.1761 -r1.1762
--- openoffice.org.spec	18 Jan 2009 23:16:35 -0000	1.1761
+++ openoffice.org.spec	19 Jan 2009 08:39:24 -0000	1.1762
@@ -931,7 +931,7 @@
 Summary: Korean language pack for %{name}
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
-Requires: baekmuk-ttf-fonts-gulim
+Requires: baekmuk-ttf-gulim-fonts
 Obsoletes: openoffice.org-i18n < 1.9.0
 Obsoletes: openoffice.org-langpack-ko < 1:2.0.3
 Obsoletes: openoffice.org2-langpack-ko_KR < 1:3.0.0



From veillard at fedoraproject.org  Mon Jan 19 08:40:35 2009
From: veillard at fedoraproject.org (Daniel Veillard)
Date: Mon, 19 Jan 2009 08:40:35 +0000 (UTC)
Subject: rpms/libxml2/F-10 libxml2.spec, 1.62, 1.63 sources, 1.45,
	1.46 CVE-2008-4225.patch, 1.1, NONE CVE-2008-4226.patch, 1.1, NONE
Message-ID: <20090119084035.5524A700F8@cvs1.fedora.phx.redhat.com>

Author: veillard

Update of /cvs/pkgs/rpms/libxml2/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25425

Modified Files:
	libxml2.spec sources 
Removed Files:
	CVE-2008-4225.patch CVE-2008-4226.patch 
Log Message:
Upstream release 2.7.3, Daniel



Index: libxml2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libxml2/F-10/libxml2.spec,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- libxml2.spec	17 Nov 2008 16:02:11 -0000	1.62
+++ libxml2.spec	19 Jan 2009 08:40:05 -0000	1.63
@@ -1,7 +1,7 @@
 Summary: Library providing XML and HTML support
 Name: libxml2
-Version: 2.7.2
-Release: 2%{?dist}%{?extra_release}
+Version: 2.7.3
+Release: 1%{?dist}%{?extra_release}
 License: MIT
 Group: Development/Libraries
 Source: ftp://xmlsoft.org/libxml2-%{version}.tar.gz
@@ -9,8 +9,6 @@
 BuildRequires: python python-devel zlib-devel
 URL: http://xmlsoft.org/
 Patch0: libxml2-multilib.patch
-Patch1: CVE-2008-4225.patch
-Patch2: CVE-2008-4226.patch
 
 %description
 This library allows to manipulate XML files. It includes support 
@@ -69,8 +67,6 @@
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p0
-%patch2 -p0
 
 %build
 %configure
@@ -145,6 +141,12 @@
 %doc doc/python.html
 
 %changelog
+* Mon Jan 19 2009 Daniel Veillard <veillard at redhat.com> - 2.7.3-1.fc10
+- new release 2.7.3
+- limit default max size of text nodes
+- special parser mode for PHP
+- bug fixes and more compiler checks
+
 * Wed Nov 12 2008 Daniel Veillard <veillard at redhat.com> - 2.7.2-2.fc10
 - two patches for size overflows problems CVE-2008-4225 and CVE-2008-4226
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libxml2/F-10/sources,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- sources	3 Oct 2008 08:14:11 -0000	1.45
+++ sources	19 Jan 2009 08:40:05 -0000	1.46
@@ -1 +1 @@
-dc43ff7ae6aded45f578c87b7b0c8766  libxml2-2.7.2.tar.gz
+8f4fda3969237c2a33bdb1583b5d06b2  libxml2-2.7.3.tar.gz


--- CVE-2008-4225.patch DELETED ---


--- CVE-2008-4226.patch DELETED ---



From thm at fedoraproject.org  Mon Jan 19 08:46:17 2009
From: thm at fedoraproject.org (Thomas Moschny)
Date: Mon, 19 Jan 2009 08:46:17 +0000 (UTC)
Subject: rpms/botan/devel botan.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090119084617.2B785700F8@cvs1.fedora.phx.redhat.com>

Author: thm

Update of /cvs/pkgs/rpms/botan/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26438/devel

Modified Files:
	.cvsignore sources 
Added Files:
	botan.spec import.log 
Log Message:
Initial import.



--- NEW FILE botan.spec ---
Name:           botan
Version:        1.8.0
Release:        2%{?dist}
Summary:        Crypto library written in C++

Group:          System Environment/Libraries
License:        BSD
URL:            http://botan.randombit.net/
Source0:        http://files.randombit.net/botan/Botan-%{version}.tgz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  gcc-c++
BuildRequires:  perl

BuildRequires:  bzip2-devel
BuildRequires:  zlib-devel
BuildRequires:  gmp-devel
BuildRequires:  openssl-devel


%description
Botan is a BSD-licensed crypto library written in C++. It provides a
wide variety of basic cryptographic algorithms, X.509 certificates and
CRLs, PKCS \#10 certificate requests, a filter/pipe message processing
system, and a wide variety of other features, all written in portable
C++. The API reference, tutorial, and examples may help impart the
flavor of the library.


%package        devel
Summary:        Development files for %{name}
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}
Requires:       pkgconfig

%description    devel
The %{name}-devel package contains libraries and header files for
developing applications that use %{name}.


%prep
%setup -q -n Botan-%{version}


%build
%define enable_modules alloc_mmap,egd,fd_unix,posix_rt,bzip2,zlib,pthreads,openssl
%define disable_modules %{nil}

./configure.pl \
        --prefix=%{_prefix} \
        --libdir=%{_lib} \
        --cc=gcc \
        --os=linux \
        --cpu=%{_arch} \
        --enable-modules=%{enable_modules} \
        --disable-modules=%{disable_modules}

# (ab)using CXX as an easy way to inject our CXXFLAGS
make CXX="g++ ${CXXFLAGS:-%{optflags}}" %{?_smp_mflags}


%install
rm -rf %{buildroot}
make install \
     DESTDIR=%{buildroot}%{_prefix} \
     DOCDIR=_doc \
     INSTALL_CMD_EXEC="install -p -m 755" \
     INSTALL_CMD_DATA="install -p -m 644" \


%clean
rm -rf %{buildroot}


%post -p /sbin/ldconfig


%postun -p /sbin/ldconfig


%files
%defattr(-,root,root,-)
%{_libdir}/libbotan*-*.so
%doc _doc/readme.txt _doc/log.txt _doc/thanks.txt _doc/credits.txt 
%doc _doc/license.txt _doc/fips140.tex _doc/pgpkeys.asc


%files devel
%defattr(-,root,root,-)
%doc doc/examples
%doc _doc/api* _doc/tutorial*
%{_bindir}/botan-config
%{_includedir}/*
%exclude %{_libdir}/libbotan.a
%{_libdir}/libbotan.so
%{_libdir}/pkgconfig/botan-1.8.pc


%check
make CXX="g++ ${CXXFLAGS:-%{optflags}}" %{?_smp_mflags} check
LD_LIBRARY_PATH=%{buildroot}%{_libdir} ./check --validate


%changelog
* Mon Jan 19 2009 Thomas Moschny <thomas.moschny at gmx.de> - 1.8.0-2
- Move api* and tutorial* doc files to -devel package.

* Sat Jan 17 2009 Thomas Moschny <thomas.moschny at gmx.de> - 1.8.0-1
- New package.


--- NEW FILE import.log ---
botan-1_8_0-2_fc10:HEAD:botan-1.8.0-2.fc10.src.rpm:1232354502


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/botan/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	18 Jan 2009 22:29:46 -0000	1.1
+++ .cvsignore	19 Jan 2009 08:45:46 -0000	1.2
@@ -0,0 +1 @@
+Botan-1.8.0.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/botan/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	18 Jan 2009 22:29:46 -0000	1.1
+++ sources	19 Jan 2009 08:45:46 -0000	1.2
@@ -0,0 +1 @@
+827c81f42cd1c118fc9bf1891be7cde5  Botan-1.8.0.tgz



From veillard at fedoraproject.org  Mon Jan 19 08:48:25 2009
From: veillard at fedoraproject.org (Daniel Veillard)
Date: Mon, 19 Jan 2009 08:48:25 +0000 (UTC)
Subject: rpms/libxml2/F-9 libxml2.spec, 1.60, 1.61 sources, 1.44,
	1.45 CVE-2008-4225.patch, 1.1, NONE CVE-2008-4226.patch, 1.1, NONE
Message-ID: <20090119084825.9EC4F700F8@cvs1.fedora.phx.redhat.com>

Author: veillard

Update of /cvs/pkgs/rpms/libxml2/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26815

Modified Files:
	libxml2.spec sources 
Removed Files:
	CVE-2008-4225.patch CVE-2008-4226.patch 
Log Message:
Release of libxml2-2.7.3, Daniel



Index: libxml2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libxml2/F-9/libxml2.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- libxml2.spec	17 Nov 2008 16:01:59 -0000	1.60
+++ libxml2.spec	19 Jan 2009 08:47:55 -0000	1.61
@@ -1,7 +1,7 @@
 Summary: Library providing XML and HTML support
 Name: libxml2
-Version: 2.7.2
-Release: 2%{?dist}%{?extra_release}
+Version: 2.7.3
+Release: 1%{?dist}%{?extra_release}
 License: MIT
 Group: Development/Libraries
 Source: ftp://xmlsoft.org/libxml2-%{version}.tar.gz
@@ -9,8 +9,6 @@
 BuildRequires: python python-devel zlib-devel
 URL: http://xmlsoft.org/
 Patch0: libxml2-multilib.patch
-Patch1: CVE-2008-4225.patch
-Patch2: CVE-2008-4226.patch
 
 %description
 This library allows to manipulate XML files. It includes support 
@@ -69,8 +67,6 @@
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p0
-%patch2 -p0
 
 %build
 %configure
@@ -145,6 +141,12 @@
 %doc doc/python.html
 
 %changelog
+* Mon Jan 19 2009 Daniel Veillard <veillard at redhat.com> - 2.7.3-1.fc9
+- new release 2.7.3
+- limit default max size of text nodes
+- special parser mode for PHP
+- bug fixes and more compiler checks
+
 * Wed Nov 12 2008 Daniel Veillard <veillard at redhat.com> - 2.7.2-2.fc9
 - two patches for size overflows problems CVE-2008-4225 and CVE-2008-4226
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libxml2/F-9/sources,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- sources	7 Oct 2008 15:10:20 -0000	1.44
+++ sources	19 Jan 2009 08:47:55 -0000	1.45
@@ -1 +1 @@
-dc43ff7ae6aded45f578c87b7b0c8766  libxml2-2.7.2.tar.gz
+8f4fda3969237c2a33bdb1583b5d06b2  libxml2-2.7.3.tar.gz


--- CVE-2008-4225.patch DELETED ---


--- CVE-2008-4226.patch DELETED ---



From jorton at fedoraproject.org  Mon Jan 19 08:53:32 2009
From: jorton at fedoraproject.org (Joe Orton)
Date: Mon, 19 Jan 2009 08:53:32 +0000 (UTC)
Subject: rpms/neon/devel neon.spec,1.46,1.47
Message-ID: <20090119085332.71ADA700F8@cvs1.fedora.phx.redhat.com>

Author: jorton

Update of /cvs/extras/rpms/neon/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28255

Modified Files:
	neon.spec 
Log Message:
* Mon Jan 19 2009 Joe Orton <jorton at redhat.com> 0.28.3-3
- use install-p in "make install" (Robert Scheck, #226189)



Index: neon.spec
===================================================================
RCS file: /cvs/extras/rpms/neon/devel/neon.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- neon.spec	28 Aug 2008 18:20:43 -0000	1.46
+++ neon.spec	19 Jan 2009 08:53:02 -0000	1.47
@@ -1,7 +1,7 @@
 Summary: An HTTP and WebDAV client library
 Name: neon
 Version: 0.28.3
-Release: 2
+Release: 3
 License: LGPLv2+
 Group: System Environment/Libraries
 URL: http://www.webdav.org/neon/
@@ -45,7 +45,7 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
 
 sed -ri "/^dependency_libs/{s,-l[^ ']*,,g}" \
       $RPM_BUILD_ROOT%{_libdir}/libneon.la
@@ -75,6 +75,9 @@
 %{_libdir}/*.so
 
 %changelog
+* Mon Jan 19 2009 Joe Orton <jorton at redhat.com> 0.28.3-3
+- use install-p in "make install" (Robert Scheck, #226189)
+
 * Thu Aug 28 2008 Joe Orton <jorton at redhat.com> 0.28.3-2
 - update to 0.28.3
 



From jnovy at fedoraproject.org  Mon Jan 19 08:55:10 2009
From: jnovy at fedoraproject.org (Jindrich Novy)
Date: Mon, 19 Jan 2009 08:55:10 +0000 (UTC)
Subject: rpms/netpbm/devel .cvsignore, 1.48, 1.49 netpbm.spec, 1.126,
	1.127 sources, 1.52, 1.53
Message-ID: <20090119085510.5A2B0700F8@cvs1.fedora.phx.redhat.com>

Author: jnovy

Update of /cvs/pkgs/rpms/netpbm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28533

Modified Files:
	.cvsignore netpbm.spec sources 
Log Message:
* Mon Jan 19 2009 Jindrich Novy <jnovy at redhat.com> 10.35.58-1
- update to 10.35.38
- fixes crashes in picttoppm, pbmtomrf, mrftopbm
- fixes bugs in leaftoppm, ilbmtoppm



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/netpbm/devel/.cvsignore,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- .cvsignore	15 Dec 2008 09:36:07 -0000	1.48
+++ .cvsignore	19 Jan 2009 08:54:39 -0000	1.49
@@ -1 +1 @@
-netpbm-10.35.57.tar.bz2
+netpbm-10.35.58.tar.bz2


Index: netpbm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/netpbm/devel/netpbm.spec,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -r1.126 -r1.127
--- netpbm.spec	23 Dec 2008 20:37:42 -0000	1.126
+++ netpbm.spec	19 Jan 2009 08:54:39 -0000	1.127
@@ -1,7 +1,7 @@
 Summary: A library for handling different graphics file formats
 Name: netpbm
-Version: 10.35.57
-Release: 3%{?dist}
+Version: 10.35.58
+Release: 1%{?dist}
 # See copyright_summary for details
 License: BSD and GPLv2 and IJG and MIT and Public Domain
 Group: System Environment/Libraries
@@ -221,6 +221,11 @@
 %{_datadir}/netpbm/
 
 %changelog
+* Mon Jan 19 2009 Jindrich Novy <jnovy at redhat.com> 10.35.58-1
+- update to 10.35.38
+- fixes crashes in picttoppm, pbmtomrf, mrftopbm
+- fixes bugs in leaftoppm, ilbmtoppm
+
 * Tue Dec 23 2008 Jindrich Novy <jnovy at redhat.com> 10.35.57-3
 - unbreak ppmshadow and ppmrainbow (#476989)
 - pnmmontage won't crash because of uninitialized memory usage


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/netpbm/devel/sources,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- sources	15 Dec 2008 09:36:08 -0000	1.52
+++ sources	19 Jan 2009 08:54:40 -0000	1.53
@@ -1 +1 @@
-185a849a620efed4d540fef313c07774  netpbm-10.35.57.tar.bz2
+f4e789971594212d0be2d8fd1e8a00ac  netpbm-10.35.58.tar.bz2



From caolanm at fedoraproject.org  Mon Jan 19 08:55:12 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Mon, 19 Jan 2009 08:55:12 +0000 (UTC)
Subject: rpms/openoffice.org/devel openoffice.org.spec, 1.1762,
	1.1763 workspace.sw31bf02.patch, 1.1,
	1.2 openoffice.org-3.0.0.ooo96391.sw.prefsalwaysmodified.patch,
	1.1, NONE
Message-ID: <20090119085512.E5D7A700F8@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28557

Modified Files:
	openoffice.org.spec workspace.sw31bf02.patch 
Removed Files:
	openoffice.org-3.0.0.ooo96391.sw.prefsalwaysmodified.patch 
Log Message:
merge patches


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1762
retrieving revision 1.1763
diff -u -r1.1762 -r1.1763
--- openoffice.org.spec	19 Jan 2009 08:39:24 -0000	1.1762
+++ openoffice.org.spec	19 Jan 2009 08:54:42 -0000	1.1763
@@ -122,19 +122,18 @@
 Patch49: workspace.sw31bf02.patch
 Patch50: workspace.cmcfixes51.patch
 Patch51: openoffice.org-3.0.0.ooo96279.swext.mediawiki.proxies.patch
-Patch52: openoffice.org-3.0.0.ooo96391.sw.prefsalwaysmodified.patch
-Patch53: workspace.tkr16.patch
-Patch54: openoffice.org-3.0.1.ooo97088.sd.accel-fallback.patch
-Patch55: workspace.transogl03.patch
-Patch56: workspace.vcl97.patch
-Patch57: workspace.vcl98.patch
-Patch58: workspace.configuretoplevel.patch
-Patch59: openoffice.org-3.0.1.oooXXXXX.extensions.npapi.patch
-Patch60: openoffice.org-3.0.1.ooo97975.bridges.mainalreadyexited.patch
-Patch61: openoffice.org-3.0.1.ooo97488.sw.ww8toc.patch
-Patch62: openoffice.org-3.0.1.oooXXXXX.fpicker.allformatsonsave.patch
-Patch63: workspace.fwk99.patch
-Patch64: openoffice.org-3.1.0.ooo98137.filter.redeclared-variables.patch
+Patch52: workspace.tkr16.patch
+Patch53: openoffice.org-3.0.1.ooo97088.sd.accel-fallback.patch
+Patch54: workspace.transogl03.patch
+Patch55: workspace.vcl97.patch
+Patch56: workspace.vcl98.patch
+Patch57: workspace.configuretoplevel.patch
+Patch58: openoffice.org-3.0.1.oooXXXXX.extensions.npapi.patch
+Patch59: openoffice.org-3.0.1.ooo97975.bridges.mainalreadyexited.patch
+Patch60: openoffice.org-3.0.1.ooo97488.sw.ww8toc.patch
+Patch61: openoffice.org-3.0.1.oooXXXXX.fpicker.allformatsonsave.patch
+Patch62: workspace.fwk99.patch
+Patch63: openoffice.org-3.1.0.ooo98137.filter.redeclared-variables.patch
 
 %define instdir %{_libdir}
 %define baseinstdir %{instdir}/openoffice.org
@@ -1404,19 +1403,18 @@
 %patch49 -p1 -b .workspace.sw31bf02.patch
 %patch50 -p1 -b .workspace.cmcfixes51.patch
 %patch51 -p1 -b .ooo96279.swext.mediawiki.proxies.patch
-%patch52 -p1 -b .ooo96391.sw.prefsalwaysmodified.patch
-%patch53 -p1 -b .workspace.tkr16.patch
-%patch54 -p1
-%patch55 -p0 -b .workspace.transogl03.patch
-%patch56 -p1 -b .workspace.vcl97.patch
-%patch57 -p1 -b .workspace.vcl98.patch
-%patch58 -p1 -b .workspace.configuretoplevel.patch
-%patch59 -p1 -b .oooXXXXX.extensions.npapi.patch
-%patch60 -p1 -b .ooo97975.bridges.mainalreadyexited.patch
-%patch61 -p1 -b .ooo97488.sw.ww8toc.patch
-%patch62 -p1 -b .oooXXXXX.fpicker.allformatsonsave.patch
-%patch63 -p1 -b .workspace.fwk99.patch
-%patch64 -p1 -b .ooo98137.filter.redeclared-variables.patch
+%patch52 -p1 -b .workspace.tkr16.patch
+%patch53 -p1
+%patch54 -p0 -b .workspace.transogl03.patch
+%patch55 -p1 -b .workspace.vcl97.patch
+%patch56 -p1 -b .workspace.vcl98.patch
+%patch57 -p1 -b .workspace.configuretoplevel.patch
+%patch58 -p1 -b .oooXXXXX.extensions.npapi.patch
+%patch59 -p1 -b .ooo97975.bridges.mainalreadyexited.patch
+%patch60 -p1 -b .ooo97488.sw.ww8toc.patch
+%patch61 -p1 -b .oooXXXXX.fpicker.allformatsonsave.patch
+%patch62 -p1 -b .workspace.fwk99.patch
+%patch63 -p1 -b .ooo98137.filter.redeclared-variables.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -3826,7 +3824,7 @@
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
-* Sun Jan 18 2009 Caol??n McNamara <caolanm at redhat.com> - 1:3.0.1-15.2
+* Mon Jan 19 2009 Caol??n McNamara <caolanm at redhat.com> - 1:3.0.1-15.2
 - Resolves: rhbz#479624 add
   openoffice.org-3.0.1.ooo98024.vcl.emboldenoverlap.patch
 - add hyphen-uk, hyphen-pt, mythes-el, mythes-fr dependency
@@ -3835,6 +3833,8 @@
 - Resolves: rhbz#480117 workspace.fwk99.patch
 - Resolves: rhbz#480121 add
   openoffice.org-3.1.0.ooo98137.filter.redeclared-variables.patch
+- merge openoffice.org-3.0.0.ooo96391.sw.prefsalwaysmodified.patch into
+  upstream workspace.sw31bf02.patch
 
 * Mon Jan 12 2009 Caol??n McNamara <caolanm at redhat.com> - 1:3.0.1-15.1
 - next milestone

workspace.sw31bf02.patch:

Index: workspace.sw31bf02.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/workspace.sw31bf02.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- workspace.sw31bf02.patch	9 Jan 2009 13:56:10 -0000	1.1
+++ workspace.sw31bf02.patch	19 Jan 2009 08:54:42 -0000	1.2
@@ -38,3 +38,19 @@
  
          aResult.AddRule(UNDO_ARG1, aStr);
      }
+Index: source/ui/config/usrpref.cxx
+===================================================================
+RCS file: /cvs/sw/sw/source/ui/config/usrpref.cxx,v
+retrieving revision 1.39
+diff -u -r1.39 usrpref.cxx
+--- openoffice.org.orig/sw/source/ui/config/usrpref.cxx	10 Apr 2008 18:18:02 -0000	1.39
++++ openoffice.org/sw/source/ui/config/usrpref.cxx	20 Nov 2008 15:15:40 -0000
+@@ -421,7 +421,7 @@
+                     }
+                     break;// "ViewLayout/Columns",
+                     case 17: rParent.SetViewLayoutBookMode(bSet); break;// "ViewLayout/BookMode",
+-                    case 18: rParent.SetDefaultPageMode(bSet); break;// "Other/IsSquaredPageMode",
++                    case 18: rParent.SetDefaultPageMode(bSet, TRUE); break;// "Other/IsSquaredPageMode",
+                 }
+ 			}
+ 		}


--- openoffice.org-3.0.0.ooo96391.sw.prefsalwaysmodified.patch DELETED ---



From thm at fedoraproject.org  Mon Jan 19 09:00:31 2009
From: thm at fedoraproject.org (Thomas Moschny)
Date: Mon, 19 Jan 2009 09:00:31 +0000 (UTC)
Subject: rpms/botan/F-10 botan.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090119090031.BD0C7700F8@cvs1.fedora.phx.redhat.com>

Author: thm

Update of /cvs/pkgs/rpms/botan/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29310/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	botan.spec import.log 
Log Message:
Initial import for F-10.


--- NEW FILE botan.spec ---
Name:           botan
Version:        1.8.0
Release:        2%{?dist}
Summary:        Crypto library written in C++

Group:          System Environment/Libraries
License:        BSD
URL:            http://botan.randombit.net/
Source0:        http://files.randombit.net/botan/Botan-%{version}.tgz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  gcc-c++
BuildRequires:  perl

BuildRequires:  bzip2-devel
BuildRequires:  zlib-devel
BuildRequires:  gmp-devel
BuildRequires:  openssl-devel


%description
Botan is a BSD-licensed crypto library written in C++. It provides a
wide variety of basic cryptographic algorithms, X.509 certificates and
CRLs, PKCS \#10 certificate requests, a filter/pipe message processing
system, and a wide variety of other features, all written in portable
C++. The API reference, tutorial, and examples may help impart the
flavor of the library.


%package        devel
Summary:        Development files for %{name}
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}
Requires:       pkgconfig

%description    devel
The %{name}-devel package contains libraries and header files for
developing applications that use %{name}.


%prep
%setup -q -n Botan-%{version}


%build
%define enable_modules alloc_mmap,egd,fd_unix,posix_rt,bzip2,zlib,pthreads,openssl
%define disable_modules %{nil}

./configure.pl \
        --prefix=%{_prefix} \
        --libdir=%{_lib} \
        --cc=gcc \
        --os=linux \
        --cpu=%{_arch} \
        --enable-modules=%{enable_modules} \
        --disable-modules=%{disable_modules}

# (ab)using CXX as an easy way to inject our CXXFLAGS
make CXX="g++ ${CXXFLAGS:-%{optflags}}" %{?_smp_mflags}


%install
rm -rf %{buildroot}
make install \
     DESTDIR=%{buildroot}%{_prefix} \
     DOCDIR=_doc \
     INSTALL_CMD_EXEC="install -p -m 755" \
     INSTALL_CMD_DATA="install -p -m 644" \


%clean
rm -rf %{buildroot}


%post -p /sbin/ldconfig


%postun -p /sbin/ldconfig


%files
%defattr(-,root,root,-)
%{_libdir}/libbotan*-*.so
%doc _doc/readme.txt _doc/log.txt _doc/thanks.txt _doc/credits.txt 
%doc _doc/license.txt _doc/fips140.tex _doc/pgpkeys.asc


%files devel
%defattr(-,root,root,-)
%doc doc/examples
%doc _doc/api* _doc/tutorial*
%{_bindir}/botan-config
%{_includedir}/*
%exclude %{_libdir}/libbotan.a
%{_libdir}/libbotan.so
%{_libdir}/pkgconfig/botan-1.8.pc


%check
make CXX="g++ ${CXXFLAGS:-%{optflags}}" %{?_smp_mflags} check
LD_LIBRARY_PATH=%{buildroot}%{_libdir} ./check --validate


%changelog
* Mon Jan 19 2009 Thomas Moschny <thomas.moschny at gmx.de> - 1.8.0-2
- Move api* and tutorial* doc files to -devel package.

* Sat Jan 17 2009 Thomas Moschny <thomas.moschny at gmx.de> - 1.8.0-1
- New package.


--- NEW FILE import.log ---
botan-1_8_0-2_fc10:F-10:botan-1.8.0-2.fc10.src.rpm:1232355547


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/botan/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	18 Jan 2009 22:29:46 -0000	1.1
+++ .cvsignore	19 Jan 2009 09:00:00 -0000	1.2
@@ -0,0 +1 @@
+Botan-1.8.0.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/botan/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	18 Jan 2009 22:29:46 -0000	1.1
+++ sources	19 Jan 2009 09:00:01 -0000	1.2
@@ -0,0 +1 @@
+827c81f42cd1c118fc9bf1891be7cde5  Botan-1.8.0.tgz



From caolanm at fedoraproject.org  Mon Jan 19 09:10:06 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Mon, 19 Jan 2009 09:10:06 +0000 (UTC)
Subject: rpms/openoffice.org/devel openoffice.org.spec,1.1763,1.1764
Message-ID: <20090119091006.F39E8700F8@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30617

Modified Files:
	openoffice.org.spec 
Log Message:
change font requires


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1763
retrieving revision 1.1764
diff -u -r1.1763 -r1.1764
--- openoffice.org.spec	19 Jan 2009 08:54:42 -0000	1.1763
+++ openoffice.org.spec	19 Jan 2009 09:09:36 -0000	1.1764
@@ -163,8 +163,9 @@
 %package core
 Summary: Core modules for %{name}
 Group: Applications/Productivity
-Requires: %{name}-fonts, liberation-fonts >= 1.00
-Requires: dejavu-fonts-sans, dejavu-fonts-serif, dejavu-fonts-sans-mono
+Requires: %{name}-fonts
+Requires: liberation-sans-fonts, liberation-serif-fonts, liberation-mono-fonts
+Requires: dejavu-sans-fonts, dejavu-serif-fonts, dejavu-sans-mono-fonts
 Requires: hunspell-en, hyphen-en
 Requires: saxon, lucene
 PreReq: gtk2 >= 2.9.4



From thm at fedoraproject.org  Mon Jan 19 09:18:58 2009
From: thm at fedoraproject.org (Thomas Moschny)
Date: Mon, 19 Jan 2009 09:18:58 +0000 (UTC)
Subject: rpms/botan/F-9 botan.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090119091858.61DCB700F8@cvs1.fedora.phx.redhat.com>

Author: thm

Update of /cvs/pkgs/rpms/botan/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31678/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	botan.spec import.log 
Log Message:
Initial import for F-9.


--- NEW FILE botan.spec ---
Name:           botan
Version:        1.8.0
Release:        2%{?dist}
Summary:        Crypto library written in C++

Group:          System Environment/Libraries
License:        BSD
URL:            http://botan.randombit.net/
Source0:        http://files.randombit.net/botan/Botan-%{version}.tgz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  gcc-c++
BuildRequires:  perl

BuildRequires:  bzip2-devel
BuildRequires:  zlib-devel
BuildRequires:  gmp-devel
BuildRequires:  openssl-devel


%description
Botan is a BSD-licensed crypto library written in C++. It provides a
wide variety of basic cryptographic algorithms, X.509 certificates and
CRLs, PKCS \#10 certificate requests, a filter/pipe message processing
system, and a wide variety of other features, all written in portable
C++. The API reference, tutorial, and examples may help impart the
flavor of the library.


%package        devel
Summary:        Development files for %{name}
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}
Requires:       pkgconfig

%description    devel
The %{name}-devel package contains libraries and header files for
developing applications that use %{name}.


%prep
%setup -q -n Botan-%{version}


%build
%define enable_modules alloc_mmap,egd,fd_unix,posix_rt,bzip2,zlib,pthreads,openssl
%define disable_modules %{nil}

./configure.pl \
        --prefix=%{_prefix} \
        --libdir=%{_lib} \
        --cc=gcc \
        --os=linux \
        --cpu=%{_arch} \
        --enable-modules=%{enable_modules} \
        --disable-modules=%{disable_modules}

# (ab)using CXX as an easy way to inject our CXXFLAGS
make CXX="g++ ${CXXFLAGS:-%{optflags}}" %{?_smp_mflags}


%install
rm -rf %{buildroot}
make install \
     DESTDIR=%{buildroot}%{_prefix} \
     DOCDIR=_doc \
     INSTALL_CMD_EXEC="install -p -m 755" \
     INSTALL_CMD_DATA="install -p -m 644" \


%clean
rm -rf %{buildroot}


%post -p /sbin/ldconfig


%postun -p /sbin/ldconfig


%files
%defattr(-,root,root,-)
%{_libdir}/libbotan*-*.so
%doc _doc/readme.txt _doc/log.txt _doc/thanks.txt _doc/credits.txt 
%doc _doc/license.txt _doc/fips140.tex _doc/pgpkeys.asc


%files devel
%defattr(-,root,root,-)
%doc doc/examples
%doc _doc/api* _doc/tutorial*
%{_bindir}/botan-config
%{_includedir}/*
%exclude %{_libdir}/libbotan.a
%{_libdir}/libbotan.so
%{_libdir}/pkgconfig/botan-1.8.pc


%check
make CXX="g++ ${CXXFLAGS:-%{optflags}}" %{?_smp_mflags} check
LD_LIBRARY_PATH=%{buildroot}%{_libdir} ./check --validate


%changelog
* Mon Jan 19 2009 Thomas Moschny <thomas.moschny at gmx.de> - 1.8.0-2
- Move api* and tutorial* doc files to -devel package.

* Sat Jan 17 2009 Thomas Moschny <thomas.moschny at gmx.de> - 1.8.0-1
- New package.


--- NEW FILE import.log ---
botan-1_8_0-2_fc10:F-9:botan-1.8.0-2.fc10.src.rpm:1232356659


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/botan/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	18 Jan 2009 22:29:46 -0000	1.1
+++ .cvsignore	19 Jan 2009 09:18:27 -0000	1.2
@@ -0,0 +1 @@
+Botan-1.8.0.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/botan/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	18 Jan 2009 22:29:46 -0000	1.1
+++ sources	19 Jan 2009 09:18:27 -0000	1.2
@@ -0,0 +1 @@
+827c81f42cd1c118fc9bf1891be7cde5  Botan-1.8.0.tgz



From tmraz at fedoraproject.org  Mon Jan 19 09:19:26 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Mon, 19 Jan 2009 09:19:26 +0000 (UTC)
Subject: rpms/pam/devel pam-1.0.90-mkhomedir-helper.patch, NONE, 1.1 pam.spec,
	1.185, 1.186
Message-ID: <20090119091926.6E5C2700F8@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/pam/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31837

Modified Files:
	pam.spec 
Added Files:
	pam-1.0.90-mkhomedir-helper.patch 
Log Message:
* Mon Jan 19 2009 Tomas Mraz <tmraz at redhat.com> 1.0.90-2
- add helper to pam_mkhomedir for proper SELinux confinement (#476784)


pam-1.0.90-mkhomedir-helper.patch:

--- NEW FILE pam-1.0.90-mkhomedir-helper.patch ---
diff -up /dev/null Linux-PAM-1.0.90/modules/pam_mkhomedir/mkhomedir_helper.c
--- /dev/null	2009-01-09 08:55:49.164063715 +0100
+++ Linux-PAM-1.0.90/modules/pam_mkhomedir/mkhomedir_helper.c	2009-01-19 10:15:39.000000000 +0100
@@ -0,0 +1,422 @@
+/* mkhomedir_helper - helper for pam_mkhomedir module
+
+   Released under the GNU LGPL version 2 or later
+
+   Copyright (c) Red Hat, Inc., 2009
+   Originally written by Jason Gunthorpe <jgg at debian.org> Feb 1999
+   Structure taken from pam_lastlogin by Andrew Morgan
+     <morgan at parc.power.net> 1996
+ */
+
+#include "config.h"
+
+#include <stdarg.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <unistd.h>
+#include <pwd.h>
+#include <errno.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include <dirent.h>
+#include <syslog.h>
+
+#include <security/pam_ext.h>
+#include <security/pam_modutil.h>
+
+static unsigned long u_mask = 0022;
+static char skeldir[BUFSIZ] = "/etc/skel";
+
+static int
+rec_mkdir(const char *dir, mode_t mode)
+{
+  char *cp;
+  char *parent = strdup(dir);
+
+  if (parent == NULL)
+    return 1;
+
+  cp = strrchr(parent, '/');
+
+  if (cp != NULL && cp != parent)
+    {
+      struct stat st;
+
+      *cp++ = '\0';
+      if (stat(parent, &st) == -1 && errno == ENOENT)
+        if (rec_mkdir(parent, mode) != 0)
+	  {
+	    free(parent);
+	    return 1;
+	  }
+    }
+
+  free(parent);
+
+  if (mkdir(dir, mode) != 0 && errno != EEXIST)
+    return 1;
+
+  return 0;
+}
+
+/* Do the actual work of creating a home dir */
+static int
+create_homedir(const struct passwd *pwd,
+	       const char *source, const char *dest)
+{
+   char remark[BUFSIZ];
+   DIR *d;
+   struct dirent *dent;
+   int retval = PAM_SESSION_ERR;
+
+   /* Create the new directory */
+   if (rec_mkdir(dest, 0755) != 0)
+   {
+      pam_syslog(NULL, LOG_ERR, "unable to create directory %s: %m", dest);
+      return PAM_PERM_DENIED;
+   }
+
+   /* See if we need to copy the skel dir over. */
+   if ((source == NULL) || (strlen(source) == 0))
+   {
+      retval = PAM_SUCCESS;
+      goto go_out;
+   }
+
+   /* Scan the directory */
+   d = opendir(source);
+   if (d == NULL)
+   {
+      pam_syslog(NULL, LOG_DEBUG, "unable to read directory %s: %m", source);
+      retval = PAM_PERM_DENIED;
+      goto go_out;
+   }
+
+   for (dent = readdir(d); dent != NULL; dent = readdir(d))
+   {
+      int srcfd;
+      int destfd;
+      int res;
+      struct stat st;
+#ifndef PATH_MAX
+      char *newsource = NULL, *newdest = NULL;
+      /* track length of buffers */
+      int nslen = 0, ndlen = 0;
+      int slen = strlen(source), dlen = strlen(dest);
+#else
+      char newsource[PATH_MAX], newdest[PATH_MAX];
+#endif
+
+      /* Skip some files.. */
+      if (strcmp(dent->d_name,".") == 0 ||
+	  strcmp(dent->d_name,"..") == 0)
+	 continue;
+
+      /* Determine what kind of file it is. */
+#ifndef PATH_MAX
+      nslen = slen + strlen(dent->d_name) + 2;
+
+      if (nslen <= 0)
+	{
+	  retval = PAM_BUF_ERR;
+	  goto go_out;
+	}
+
+      if ((newsource = malloc(nslen)) == NULL)
+	{
+	  retval = PAM_BUF_ERR;
+	  goto go_out;
+	}
+
+      sprintf(newsource, "%s/%s", source, dent->d_name);
+#else
+      snprintf(newsource, sizeof(newsource), "%s/%s", source, dent->d_name);
+#endif
+
+      if (lstat(newsource, &st) != 0)
+#ifndef PATH_MAX
+      {
+	      free(newsource);
+	      newsource = NULL;
+         continue;
+      }
+#else
+      continue;
+#endif
+
+
+      /* We'll need the new file's name. */
+#ifndef PATH_MAX
+      ndlen = dlen + strlen(dent->d_name)+2;
+
+      if (ndlen <= 0)
+	{
+	  retval = PAM_BUF_ERR;
+	  goto go_out;
+	}
+
+      if ((newdest = malloc(ndlen)) == NULL)
+	{
+	  free (newsource);
+	  retval = PAM_BUF_ERR;
+	  goto go_out;
+	}
+
+      sprintf (newdest, "%s/%s", dest, dent->d_name);
+#else
+      snprintf (newdest, sizeof (newdest), "%s/%s", dest, dent->d_name);
+#endif
+
+      /* If it's a directory, recurse. */
+      if (S_ISDIR(st.st_mode))
+      {
+         retval = create_homedir(pwd, newsource, newdest);
+
+#ifndef PATH_MAX
+	 free(newsource); newsource = NULL;
+	 free(newdest); newdest = NULL;
+#endif
+
+         if (retval != PAM_SUCCESS)
+	   {
+	     closedir(d);
+	     goto go_out;
+	   }
+         continue;
+      }
+
+      /* If it's a symlink, create a new link. */
+      if (S_ISLNK(st.st_mode))
+      {
+	 int pointedlen = 0;
+#ifndef PATH_MAX
+	 char *pointed = NULL;
+           {
+		   int size = 100;
+
+		   while (1) {
+			   pointed = malloc(size);
+			   if (pointed == NULL) {
+				   free(newsource);
+				   free(newdest);
+				   return PAM_BUF_ERR;
+			   }
+			   pointedlen = readlink(newsource, pointed, size);
+			   if (pointedlen < 0) break;
+			   if (pointedlen < size) break;
+			   free(pointed);
+			   size *= 2;
+		   }
+	   }
+	   if (pointedlen < 0)
+		   free(pointed);
+	   else
+		   pointed[pointedlen] = 0;
+#else
+         char pointed[PATH_MAX];
+         memset(pointed, 0, sizeof(pointed));
+
+         pointedlen = readlink(newsource, pointed, sizeof(pointed) - 1);
+#endif
+
+	 if (pointedlen >= 0) {
+            if(symlink(pointed, newdest) == 0)
+            {
+               if (lchown(newdest, pwd->pw_uid, pwd->pw_gid) != 0)
+               {
+                   pam_syslog(NULL, LOG_DEBUG,
+			      "unable to change perms on link %s: %m", newdest);
+                   closedir(d);
+#ifndef PATH_MAX
+		   free(pointed);
+		   free(newsource);
+		   free(newdest);
+#endif
+                   return PAM_PERM_DENIED;
+               }
+            }
+#ifndef PATH_MAX
+	    free(pointed);
+#endif
+         }
+#ifndef PATH_MAX
+	 free(newsource); newsource = NULL;
+	 free(newdest); newdest = NULL;
+#endif
+         continue;
+      }
+
+      /* If it's not a regular file, it's probably not a good idea to create
+       * the new device node, FIFO, or whatever it is. */
+      if (!S_ISREG(st.st_mode))
+      {
+#ifndef PATH_MAX
+	 free(newsource); newsource = NULL;
+	 free(newdest); newdest = NULL;
+#endif
+         continue;
+      }
+
+      /* Open the source file */
+      if ((srcfd = open(newsource, O_RDONLY)) < 0 || fstat(srcfd, &st) != 0)
+      {
+         pam_syslog(NULL, LOG_DEBUG,
+		    "unable to open src file %s: %m", newsource);
+         closedir(d);
+
+#ifndef PATH_MAX
+	 free(newsource); newsource = NULL;
+	 free(newdest); newdest = NULL;
+#endif
+
+	 return PAM_PERM_DENIED;
+      }
+      if (stat(newsource, &st) != 0)
+	{
+	  pam_syslog(NULL, LOG_DEBUG, "unable to stat src file %s: %m",
+		     newsource);
+	  close(srcfd);
+	  closedir(d);
+
+#ifndef PATH_MAX
+	  free(newsource); newsource = NULL;
+	  free(newdest); newdest = NULL;
+#endif
+
+	  return PAM_PERM_DENIED;
+	}
+
+      /* Open the dest file */
+      if ((destfd = open(newdest, O_WRONLY | O_TRUNC | O_CREAT, 0600)) < 0)
+      {
+         pam_syslog(NULL, LOG_DEBUG,
+		    "unable to open dest file %s: %m", newdest);
+	 close(srcfd);
+	 closedir(d);
+
+#ifndef PATH_MAX
+	 free(newsource); newsource = NULL;
+	 free(newdest); newdest = NULL;
+#endif
+	 return PAM_PERM_DENIED;
+      }
+
+      /* Set the proper ownership and permissions for the module. We make
+       	 the file a+w and then mask it with the set mask. This preseves
+       	 execute bits */
+      if (fchmod(destfd, (st.st_mode | 0222) & (~u_mask)) != 0 ||
+	  fchown(destfd, pwd->pw_uid, pwd->pw_gid) != 0)
+      {
+         pam_syslog(NULL, LOG_DEBUG,
+		    "unable to change perms on copy %s: %m", newdest);
+         close(srcfd);
+         close(destfd);
+         closedir(d);
+
+#ifndef PATH_MAX
+	 free(newsource); newsource = NULL;
+	 free(newdest); newdest = NULL;
+#endif
+
+	 return PAM_PERM_DENIED;
+      }
+
+      /* Copy the file */
+      do
+      {
+	 res = pam_modutil_read(srcfd, remark, sizeof(remark));
+
+	 if (res == 0)
+	     continue;
+
+	 if (res > 0) {
+	     if (pam_modutil_write(destfd, remark, res) == res)
+		continue;
+	 }
+
+	 /* If we get here, pam_modutil_read returned a -1 or
+	    pam_modutil_write returned something unexpected. */
+	 pam_syslog(NULL, LOG_DEBUG, "unable to perform IO: %m");
+	 close(srcfd);
+	 close(destfd);
+	 closedir(d);
+
+#ifndef PATH_MAX
+	 free(newsource); newsource = NULL;
+	 free(newdest); newdest = NULL;
+#endif
+
+	 return PAM_PERM_DENIED;
+      }
+      while (res != 0);
+      close(srcfd);
+      close(destfd);
+
+#ifndef PATH_MAX
+      free(newsource); newsource = NULL;
+      free(newdest); newdest = NULL;
+#endif
+
+   }
+   closedir(d);
+
+   retval = PAM_SUCCESS;
+
+ go_out:
+
+   if (chmod(dest, 0777 & (~u_mask)) != 0 ||
+       chown(dest, pwd->pw_uid, pwd->pw_gid) != 0)
+   {
+      pam_syslog(NULL, LOG_DEBUG,
+		 "unable to change perms on directory %s: %m", dest);
+      return PAM_PERM_DENIED;
+   }
+
+   return retval;
+}
+
+int
+main(int argc, char *argv[])
+{
+   const struct passwd *pwd;
+   struct stat st;
+
+   if (argc < 2) {
+	fprintf(stderr, "Usage: %s <username> [<umask> [<skeldir>]]\n", argv[0]);
+	return PAM_SESSION_ERR;
+   }
+
+   pwd = getpwnam(argv[1]);
+   if (pwd == NULL) {
+   	pam_syslog(NULL, LOG_ERR, "User unknown.");
+   	return PAM_CRED_INSUFFICIENT;
+   }
+
+   if (argc >= 3) {
+	char *eptr;
+	errno = 0;
+	u_mask = strtoul(argv[2], &eptr, 0);
+	if (errno != 0 || *eptr != '\0') {
+		pam_syslog(NULL, LOG_ERR, "Bogus umask value %s", argv[2]);
+		return PAM_SESSION_ERR;
+	}
+   }
+
+   if (argc >= 4) {
+   	if (strlen(argv[3]) >= sizeof(skeldir)) {
+		pam_syslog(NULL, LOG_ERR, "Too long skeldir path.");
+		return PAM_SESSION_ERR;
+   	}
+   	strcpy(skeldir, argv[3]);
+   }
+
+   /* Stat the home directory, if something exists then we assume it is
+      correct and return a success */
+   if (stat(pwd->pw_dir, &st) == 0)
+	return PAM_SUCCESS;
+
+   return create_homedir(pwd, skeldir, pwd->pw_dir);
+}
+
diff -up Linux-PAM-1.0.90/modules/pam_mkhomedir/Makefile.am.mkhomedir-helper Linux-PAM-1.0.90/modules/pam_mkhomedir/Makefile.am
--- Linux-PAM-1.0.90/modules/pam_mkhomedir/Makefile.am.mkhomedir-helper	2007-09-03 09:57:30.000000000 +0200
+++ Linux-PAM-1.0.90/modules/pam_mkhomedir/Makefile.am	2009-01-19 10:15:39.000000000 +0100
@@ -1,21 +1,23 @@
 #
 # Copyright (c) 2005, 2006 Thorsten Kukuk <kukuk at suse.de>
+# Copyright (c) 2008 Red Hat, Inc.
 #
 
 CLEANFILES = *~
 
 EXTRA_DIST = README $(MANS) $(XMLS) tst-pam_mkhomedir
 
-man_MANS = pam_mkhomedir.8
+man_MANS = pam_mkhomedir.8 mkhomedir_helper.8
 
-XMLS = README.xml pam_mkhomedir.8.xml
+XMLS = README.xml pam_mkhomedir.8.xml mkhomedir_helper.8.xml
 
 TESTS = tst-pam_mkhomedir
 
 securelibdir = $(SECUREDIR)
 secureconfdir = $(SCONFIGDIR)
 
-AM_CFLAGS = -I$(top_srcdir)/libpam/include -I$(top_srcdir)/libpamc/include
+AM_CFLAGS = -I$(top_srcdir)/libpam/include -I$(top_srcdir)/libpamc/include \
+	    -DMKHOMEDIR_HELPER=\"$(sbindir)/mkhomedir_helper\"
 AM_LDFLAGS = -no-undefined -avoid-version -module
 if HAVE_VERSIONING
   AM_LDFLAGS += -Wl,--version-script=$(srcdir)/../modules.map
@@ -25,6 +27,10 @@ securelib_LTLIBRARIES = pam_mkhomedir.la
 pam_mkhomedir_la_SOURCES = pam_mkhomedir.c
 pam_mkhomedir_la_LIBADD = -L$(top_builddir)/libpam -lpam
 
+sbin_PROGRAMS = mkhomedir_helper
+mkhomedir_helper_SOURCES = mkhomedir_helper.c
+mkhomedir_helper_LDADD = -L$(top_builddir)/libpam -lpam
+
 if ENABLE_REGENERATE_MAN
 noinst_DATA = README
 README: pam_mkhomedir.8.xml
diff -up /dev/null Linux-PAM-1.0.90/modules/pam_mkhomedir/mkhomedir_helper.8.xml
--- /dev/null	2009-01-09 08:55:49.164063715 +0100
+++ Linux-PAM-1.0.90/modules/pam_mkhomedir/mkhomedir_helper.8.xml	2009-01-19 10:15:39.000000000 +0100
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding='UTF-8'?>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+	"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd">
+
+<refentry id="mkhomedir_helper">
+
+  <refmeta>
+    <refentrytitle>mkhomedir_helper</refentrytitle>
+    <manvolnum>8</manvolnum>
+    <refmiscinfo class="sectdesc">Linux-PAM Manual</refmiscinfo>
+  </refmeta>
+
+  <refnamediv id="mkhomedir_helper-name">
+    <refname>mkhomedir_helper</refname>
+    <refpurpose>Helper binary that creates home directories</refpurpose>
+  </refnamediv>
+
+  <refsynopsisdiv>
+    <cmdsynopsis id="mkhomedir_helper-cmdsynopsis">
+      <command>mkhomedir_helper</command>
+      <arg choice="req">
+        <replaceable>user</replaceable>
+      </arg>
+      <arg choice="opt">
+        <replaceable>umask</replaceable>
+      <arg choice="opt">
+        <replaceable>path-to-skel</replaceable>
+      </arg>
+      </arg>
+    </cmdsynopsis>
+  </refsynopsisdiv>
+
+  <refsect1 id="mkhomedir_helper-description">
+
+    <title>DESCRIPTION</title>
+
+    <para>
+      <emphasis>mkhomedir_helper</emphasis> is a helper program for the
+      <emphasis>pam_mkhomedir</emphasis> module that creates home directories
+      and populates them with contents of the specified skel directory.
+    </para>
+
+    <para>
+      The default value of <replaceable>umask</replaceable> is 0022 and the
+      default value of <replaceable>path-to-skel</replaceable> is
+      <emphasis>/etc/skel</emphasis>.
+    </para>
+
+    <para>
+      The helper is separated from the module to not require direct access from
+      login SELinux domains to the contents of user home directories. The
+      SELinux domain transition happens when the module is executing the
+      <emphasis>mkhomedir_helper</emphasis>.
+    </para>
+
+    <para>
+      The helper never touches home directories if they already exist.
+    </para>
+  </refsect1>
+
+  <refsect1 id='mkhomedir_helper-see_also'>
+    <title>SEE ALSO</title>
+    <para>
+      <citerefentry>
+	<refentrytitle>pam_mkhomedir</refentrytitle><manvolnum>8</manvolnum>
+      </citerefentry>
+    </para>
+  </refsect1>
+
+  <refsect1 id='mkhomedir_helper-author'>
+    <title>AUTHOR</title>
+      <para>
+        Written by Tomas Mraz based on the code originally in
+        <emphasis>pam_mkhomedir</emphasis> module.
+      </para>
+  </refsect1>
+
+</refentry>
diff -up Linux-PAM-1.0.90/modules/pam_mkhomedir/pam_mkhomedir.c.mkhomedir-helper Linux-PAM-1.0.90/modules/pam_mkhomedir/pam_mkhomedir.c
--- Linux-PAM-1.0.90/modules/pam_mkhomedir/pam_mkhomedir.c.mkhomedir-helper	2007-06-28 11:00:30.000000000 +0200
+++ Linux-PAM-1.0.90/modules/pam_mkhomedir/pam_mkhomedir.c	2009-01-19 10:15:39.000000000 +0100
@@ -22,6 +22,7 @@
    password   required   pam_unix.so
 
    Released under the GNU LGPL version 2 or later
+   Copyright (c) Red Hat, Inc. 2009
    Originally written by Jason Gunthorpe <jgg at debian.org> Feb 1999
    Structure taken from pam_lastlogin by Andrew Morgan
      <morgan at parc.power.net> 1996
@@ -29,18 +30,19 @@
 
 #include "config.h"
 
-#include <stdarg.h>
 #include <sys/types.h>
 #include <sys/stat.h>
-#include <fcntl.h>
+#include <sys/time.h>
+#include <sys/resource.h>
+#include <sys/wait.h>
 #include <unistd.h>
 #include <pwd.h>
 #include <errno.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
-#include <dirent.h>
 #include <syslog.h>
+#include <signal.h>
 
 /*
  * here, we make a definition for the externally accessible function
@@ -56,12 +58,13 @@
 #include <security/pam_modutil.h>
 #include <security/pam_ext.h>
 
+#define MAX_FD_NO 10000
 
 /* argument parsing */
 #define MKHOMEDIR_DEBUG      020	/* be verbose about things */
 #define MKHOMEDIR_QUIET      040	/* keep quiet about things */
 
-static unsigned int UMask = 0022;
+static char UMask[16] = "0022";
 static char SkelDir[BUFSIZ] = "/etc/skel"; /* THIS MODULE IS NOT THREAD SAFE */
 
 static int
@@ -81,7 +84,8 @@ _pam_parse (const pam_handle_t *pamh, in
       } else if (!strcmp(*argv, "debug")) {
          ctrl |= MKHOMEDIR_DEBUG;
       } else if (!strncmp(*argv,"umask=",6)) {
-	 UMask = strtol(*argv+6,0,0);
+	 strncpy(SkelDir,*argv+6,sizeof(UMask));
+	 UMask[sizeof(UMask)-1] = '\0';
       } else if (!strncmp(*argv,"skel=",5)) {
 	 strncpy(SkelDir,*argv+5,sizeof(SkelDir));
 	 SkelDir[sizeof(SkelDir)-1] = '\0';
@@ -94,357 +98,88 @@ _pam_parse (const pam_handle_t *pamh, in
    return ctrl;
 }
 
-static int
-rec_mkdir (const char *dir, mode_t mode)
-{
-  char *cp;
-  char *parent = strdup (dir);
-
-  if (parent == NULL)
-    return 1;
-
-  cp = strrchr (parent, '/');
-
-  if (cp != NULL && cp != parent)
-    {
-      struct stat st;
-
-      *cp++ = '\0';
-      if (stat (parent, &st) == -1 && errno == ENOENT)
-        if (rec_mkdir (parent, mode) != 0)
-	  {
-	    free (parent);
-	    return 1;
-	  }
-    }
-
-  free (parent);
-
-  if (mkdir (dir, mode) != 0 && errno != EEXIST)
-    return 1;
-
-  return 0;
-}
-
 /* Do the actual work of creating a home dir */
 static int
-create_homedir (pam_handle_t * pamh, int ctrl,
-		const struct passwd *pwd,
-		const char *source, const char *dest)
+create_homedir (pam_handle_t *pamh, int ctrl,
+		const struct passwd *pwd)
 {
-   char remark[BUFSIZ];
-   DIR *D;
-   struct dirent *Dir;
-   int retval = PAM_AUTH_ERR;
+   int retval, child;
+   void (*sighandler)(int) = NULL;
 
    /* Mention what is happening, if the notification fails that is OK */
-   if ((ctrl & MKHOMEDIR_QUIET) != MKHOMEDIR_QUIET)
-      pam_info(pamh, _("Creating directory '%s'."), dest);
+   if (!(ctrl & MKHOMEDIR_QUIET))
+      pam_info(pamh, _("Creating directory '%s'."), pwd->pw_dir);
 
-   /* Create the new directory */
-   if (rec_mkdir (dest,0755) != 0)
-   {
-      pam_error(pamh, _("Unable to create directory %s: %m"), dest);
-      pam_syslog(pamh, LOG_ERR, "unable to create directory %s: %m", dest);
-      return PAM_PERM_DENIED;
-   }
 
-   /* See if we need to copy the skel dir over. */
-   if ((source == NULL) || (strlen(source) == 0))
-   {
-     retval = PAM_SUCCESS;
-     goto go_out;
-   }
+   D(("called."));
 
-   /* Scan the directory */
-   D = opendir (source);
-   if (D == 0)
-   {
-      pam_syslog(pamh, LOG_DEBUG, "unable to read directory %s: %m", source);
-      retval = PAM_PERM_DENIED;
-      goto go_out;
-   }
-
-   for (Dir = readdir(D); Dir != 0; Dir = readdir(D))
-   {
-      int SrcFd;
-      int DestFd;
-      int Res;
-      struct stat St;
-#ifndef PATH_MAX
-      char *newsource = NULL, *newdest = NULL;
-      /* track length of buffers */
-      int nslen = 0, ndlen = 0;
-      int slen = strlen(source), dlen = strlen(dest);
-#else
-      char newsource[PATH_MAX], newdest[PATH_MAX];
-#endif
-
-      /* Skip some files.. */
-      if (strcmp(Dir->d_name,".") == 0 ||
-	  strcmp(Dir->d_name,"..") == 0)
-	 continue;
-
-      /* Determine what kind of file it is. */
-#ifndef PATH_MAX
-      nslen = slen + strlen(Dir->d_name) + 2;
-
-      if (nslen <= 0)
-	{
-	  retval = PAM_BUF_ERR;
-	  goto go_out;
-	}
-
-      if ((newsource = malloc (nslen)) == NULL)
-	{
-	  retval = PAM_BUF_ERR;
-	  goto go_out;
-	}
-
-      sprintf(newsource, "%s/%s", source, Dir->d_name);
-#else
-      snprintf(newsource,sizeof(newsource),"%s/%s",source,Dir->d_name);
-#endif
-
-      if (lstat(newsource,&St) != 0)
-#ifndef PATH_MAX
-      {
-	      free(newsource);
-	      newsource = NULL;
-         continue;
-      }
-#else
-      continue;
-#endif
-
-
-      /* We'll need the new file's name. */
-#ifndef PATH_MAX
-      ndlen = dlen + strlen(Dir->d_name)+2;
-
-      if (ndlen <= 0)
-	{
-	  retval = PAM_BUF_ERR;
-	  goto go_out;
-	}
-
-      if ((newdest = malloc(ndlen)) == NULL)
-	{
-	  free (newsource);
-	  retval = PAM_BUF_ERR;
-	  goto go_out;
+   /*
+    * This code arranges that the demise of the child does not cause
+    * the application to receive a signal it is not expecting - which
+    * may kill the application or worse.
+    */
+   sighandler = signal(SIGCHLD, SIG_DFL);
+
+   if (ctrl & MKHOMEDIR_DEBUG) {
+        pam_syslog(pamh, LOG_DEBUG, "Executing mkhomedir_helper.");
+   }
+
+   /* fork */
+   child = fork();
+   if (child == 0) {
+        int i;
+        struct rlimit rlim;
+	static char *envp[] = { NULL };
+	char *args[] = { NULL, NULL, NULL, NULL, NULL };
+
+	if (getrlimit(RLIMIT_NOFILE, &rlim)==0) {
+          if (rlim.rlim_max >= MAX_FD_NO)
+                rlim.rlim_max = MAX_FD_NO;
+	  for (i=0; i < (int)rlim.rlim_max; i++) {
+	  	close(i);
+	  }
 	}
 
-      sprintf (newdest, "%s/%s", dest, Dir->d_name);
-#else
-      snprintf (newdest,sizeof (newdest),"%s/%s",dest,Dir->d_name);
-#endif
-
-      /* If it's a directory, recurse. */
-      if (S_ISDIR(St.st_mode))
-      {
-        retval = create_homedir (pamh, ctrl, pwd, newsource, newdest);
-
-#ifndef PATH_MAX
-	 free(newsource); newsource = NULL;
-	 free(newdest); newdest = NULL;
-#endif
-
-         if (retval != PAM_SUCCESS)
-	   {
-	     closedir(D);
-	     goto go_out;
-	   }
-         continue;
-      }
-
-      /* If it's a symlink, create a new link. */
-      if (S_ISLNK(St.st_mode))
-      {
-	 int pointedlen = 0;
-#ifndef PATH_MAX
-	 char *pointed = NULL;
-           {
-		   int size = 100;
-
-		   while (1) {
-			   pointed = (char *) malloc(size);
-			   if ( ! pointed ) {
-				   free(newsource);
-				   free(newdest);
-				   return PAM_BUF_ERR;
-			   }
-			   pointedlen = readlink (newsource, pointed, size);
-			   if ( pointedlen < 0 ) break;
-			   if ( pointedlen < size ) break;
-			   free (pointed);
-			   size *= 2;
-		   }
-	   }
-	   if ( pointedlen < 0 )
-		   free(pointed);
-	   else
-		   pointed[pointedlen] = 0;
-#else
-         char pointed[PATH_MAX];
-         memset(pointed, 0, sizeof(pointed));
-
-         pointedlen = readlink(newsource, pointed, sizeof(pointed) - 1);
-#endif
-
-	 if ( pointedlen >= 0 ) {
-            if(symlink(pointed, newdest) == 0)
-            {
-               if (lchown(newdest,pwd->pw_uid,pwd->pw_gid) != 0)
-               {
-                   pam_syslog(pamh, LOG_DEBUG,
-			      "unable to change perms on link %s: %m", newdest);
-                   closedir(D);
-#ifndef PATH_MAX
-		   free(pointed);
-		   free(newsource);
-		   free(newdest);
-#endif
-                   return PAM_PERM_DENIED;
-               }
-            }
-#ifndef PATH_MAX
-	    free(pointed);
-#endif
-         }
-#ifndef PATH_MAX
-	 free(newsource); newsource = NULL;
-	 free(newdest); newdest = NULL;
-#endif
-         continue;
-      }
-
-      /* If it's not a regular file, it's probably not a good idea to create
-       * the new device node, FIFO, or whatever it is. */
-      if (!S_ISREG(St.st_mode))
-      {
-#ifndef PATH_MAX
-	 free(newsource); newsource = NULL;
-	 free(newdest); newdest = NULL;
-#endif
-         continue;
-      }
-
-      /* Open the source file */
-      if ((SrcFd = open(newsource,O_RDONLY)) < 0 || fstat(SrcFd,&St) != 0)
-      {
-         pam_syslog(pamh, LOG_DEBUG,
-		    "unable to open src file %s: %m", newsource);
-         closedir(D);
-
-#ifndef PATH_MAX
-	 free(newsource); newsource = NULL;
-	 free(newdest); newdest = NULL;
-#endif
-
-	 return PAM_PERM_DENIED;
-      }
-      if (stat(newsource,&St) != 0)
-	{
-	  pam_syslog(pamh, LOG_DEBUG, "unable to stat src file %s: %m",
-		     newsource);
-	  close(SrcFd);
-	  closedir(D);
-
-#ifndef PATH_MAX
-	  free(newsource); newsource = NULL;
-	  free(newdest); newdest = NULL;
-#endif
-
-	  return PAM_PERM_DENIED;
+	/* exec the mkhomedir helper */
+	args[0] = x_strdup(MKHOMEDIR_HELPER);
+	args[1] = pwd->pw_name;
+	args[2] = UMask;
+	args[3] = SkelDir;
+
+	execve(MKHOMEDIR_HELPER, args, envp);
+
+	/* should not get here: exit with error */
+	D(("helper binary is not available"));
+	exit(PAM_SYSTEM_ERR);
+   } else if (child > 0) {
+	int rc;
+	while ((rc=waitpid(child, &retval, 0)) < 0 && errno == EINTR);
+	if (rc < 0) {
+	  pam_syslog(pamh, LOG_ERR, "waitpid failed: %m");
+	  retval = PAM_SYSTEM_ERR;
+	} else {
+	  retval = WEXITSTATUS(retval);
 	}
-
-      /* Open the dest file */
-      if ((DestFd = open(newdest,O_WRONLY | O_TRUNC | O_CREAT,0600)) < 0)
-      {
-         pam_syslog(pamh, LOG_DEBUG,
-		    "unable to open dest file %s: %m", newdest);
-	 close(SrcFd);
-	 closedir(D);
-
-#ifndef PATH_MAX
-	 free(newsource); newsource = NULL;
-	 free(newdest); newdest = NULL;
-#endif
-	 return PAM_PERM_DENIED;
-      }
-
-      /* Set the proper ownership and permissions for the module. We make
-       	 the file a+w and then mask it with the set mask. This preseves
-       	 execute bits */
-      if (fchmod(DestFd,(St.st_mode | 0222) & (~UMask)) != 0 ||
-	  fchown(DestFd,pwd->pw_uid,pwd->pw_gid) != 0)
-      {
-         pam_syslog(pamh, LOG_DEBUG,
-		    "unable to change perms on copy %s: %m", newdest);
-         close(SrcFd);
-         close(DestFd);
-         closedir(D);
-
-#ifndef PATH_MAX
-	 free(newsource); newsource = NULL;
-	 free(newdest); newdest = NULL;
-#endif
-
-	 return PAM_PERM_DENIED;
-      }
-
-      /* Copy the file */
-      do
-      {
-	 Res = pam_modutil_read(SrcFd,remark,sizeof(remark));
-
-	 if (Res == 0)
-	     continue;
-
-	 if (Res > 0) {
-	     if (pam_modutil_write(DestFd,remark,Res) == Res)
-		continue;
-	 }
-
-	 /* If we get here, pam_modutil_read returned a -1 or
-	    pam_modutil_write returned something unexpected. */
-	 pam_syslog(pamh, LOG_DEBUG, "unable to perform IO: %m");
-	 close(SrcFd);
-	 close(DestFd);
-	 closedir(D);
-
-#ifndef PATH_MAX
-	 free(newsource); newsource = NULL;
-	 free(newdest); newdest = NULL;
-#endif
-
-	 return PAM_PERM_DENIED;
-      }
-      while (Res != 0);
-      close(SrcFd);
-      close(DestFd);
-
-#ifndef PATH_MAX
-	 free(newsource); newsource = NULL;
-	 free(newdest); newdest = NULL;
-#endif
-
+   } else {
+	D(("fork failed"));
+	pam_syslog(pamh, LOG_ERR, "fork failed: %m");
+	retval = PAM_SYSTEM_ERR;
    }
-   closedir(D);
 
-   retval = PAM_SUCCESS;
+   if (sighandler != SIG_ERR) {
+        (void) signal(SIGCHLD, sighandler);   /* restore old signal handler */
+   }
 
- go_out:
+   if (ctrl & MKHOMEDIR_DEBUG) {
+        pam_syslog(pamh, LOG_DEBUG, "mkhomedir_helper returned %d", retval);
+   }
 
-   if (chmod(dest,0777 & (~UMask)) != 0 ||
-       chown(dest,pwd->pw_uid,pwd->pw_gid) != 0)
-   {
-      pam_syslog(pamh, LOG_DEBUG,
-		 "unable to change perms on directory %s: %m", dest);
-      return PAM_PERM_DENIED;
+   if (retval != PAM_SUCCESS && !(ctrl & MKHOMEDIR_QUIET)) {
+	pam_error(pamh, _("Unable to create and initialize directory '%s'."),
+	    pwd->pw_dir);
    }
 
+   D(("returning %d", retval));
    return retval;
 }
 
@@ -466,7 +201,7 @@ pam_sm_open_session (pam_handle_t *pamh,
    retval = pam_get_item(pamh, PAM_USER, &user);
    if (retval != PAM_SUCCESS || user == NULL || *(const char *)user == '\0')
    {
-      pam_syslog(pamh, LOG_NOTICE, "user unknown");
+      pam_syslog(pamh, LOG_NOTICE, "Cannot obtain the user name.");
       return PAM_USER_UNKNOWN;
    }
 
@@ -474,16 +209,22 @@ pam_sm_open_session (pam_handle_t *pamh,
    pwd = pam_modutil_getpwnam (pamh, user);
    if (pwd == NULL)
    {
+      pam_syslog(pamh, LOG_NOTICE, "User unknown.");
       D(("couldn't identify user %s", user));
       return PAM_CRED_INSUFFICIENT;
    }
 
    /* Stat the home directory, if something exists then we assume it is
       correct and return a success*/
-   if (stat(pwd->pw_dir,&St) == 0)
+   if (stat(pwd->pw_dir, &St) == 0) {
+      if (ctrl & MKHOMEDIR_DEBUG) {
+          pam_syslog(pamh, LOG_DEBUG, "Home directory %s already exists.",
+              pwd->pw_dir);
+      }
       return PAM_SUCCESS;
+   }
 
-   return create_homedir(pamh,ctrl,pwd,SkelDir,pwd->pw_dir);
+   return create_homedir(pamh, ctrl, pwd);
 }
 
 /* Ignore */


Index: pam.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pam/devel/pam.spec,v
retrieving revision 1.185
retrieving revision 1.186
diff -u -r1.185 -r1.186
--- pam.spec	16 Dec 2008 15:17:16 -0000	1.185
+++ pam.spec	19 Jan 2009 09:18:56 -0000	1.186
@@ -3,7 +3,7 @@
 Summary: An extensible library which provides authentication for applications
 Name: pam
 Version: 1.0.90
-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
@@ -20,6 +20,7 @@
 Source10: config-util.5
 Source11: 90-nproc.conf
 Patch1:  pam-1.0.90-redhat-modules.patch
+Patch2:  pam-1.0.90-mkhomedir-helper.patch
 
 %define _sbindir /sbin
 %define _moduledir /%{_lib}/security
@@ -82,6 +83,7 @@
 mv pam-redhat-%{pam_redhat_version}/* modules
 
 %patch1 -p1 -b .redhat-modules
+%patch2 -p1 -b .mkhomedir-helper
 
 autoreconf
 
@@ -217,6 +219,7 @@
 %attr(4755,root,root) %{_sbindir}/pam_timestamp_check
 %attr(4755,root,root) %{_sbindir}/unix_chkpwd
 %attr(0700,root,root) %{_sbindir}/unix_update
+%attr(0755,root,root) %{_sbindir}/mkhomedir_helper
 %if %{_lib} != lib
 %dir /lib/security
 %endif
@@ -313,6 +316,9 @@
 %doc doc/adg/*.txt doc/adg/html
 
 %changelog
+* Mon Jan 19 2009 Tomas Mraz <tmraz at redhat.com> 1.0.90-2
+- add helper to pam_mkhomedir for proper SELinux confinement (#476784)
+
 * Tue Dec 16 2008 Tomas Mraz <tmraz at redhat.com> 1.0.90-1
 - upgrade to new upstream release
 - add --disable-prelude (#466242)



From jussilehtola at fedoraproject.org  Mon Jan 19 09:20:33 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Mon, 19 Jan 2009 09:20:33 +0000 (UTC)
Subject: rpms/gromacs/devel .cvsignore, 1.5, 1.6 gromacs.spec, 1.5,
	1.6 import.log, 1.4, 1.5 sources, 1.5, 1.6
Message-ID: <20090119092033.769BB700F8@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

Update of /cvs/pkgs/rpms/gromacs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32231/devel

Modified Files:
	.cvsignore gromacs.spec import.log sources 
Log Message:
* Mon Jan 19 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0.3-1
- Update to 4.0.3.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gromacs/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	14 Jan 2009 12:13:14 -0000	1.5
+++ .cvsignore	19 Jan 2009 09:20:03 -0000	1.6
@@ -1,2 +1,2 @@
-gromacs-4.0.2.tar.gz
 manual-4.0.pdf
+gromacs-4.0.3.tar.gz


Index: gromacs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gromacs/devel/gromacs.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- gromacs.spec	14 Jan 2009 12:13:14 -0000	1.5
+++ gromacs.spec	19 Jan 2009 09:20:03 -0000	1.6
@@ -1,6 +1,6 @@
 Name:		gromacs
-Version:	4.0.2
-Release:	7%{?dist}
+Version:	4.0.3
+Release:	1%{?dist}
 Summary:	GROMACS binaries
 Group:		Applications/Engineering
 License:	GPLv2+
@@ -532,6 +532,9 @@
 
 
 %changelog
+* Mon Jan 19 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0.3-1
+- Update to 4.0.3.
+
 * Wed Jan 14 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0.2-7
 - Update manual to latest version.
 - Removed Requires: blas and lapack.


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/gromacs/devel/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- import.log	14 Jan 2009 12:13:14 -0000	1.4
+++ import.log	19 Jan 2009 09:20:03 -0000	1.5
@@ -2,3 +2,4 @@
 gromacs-4_0_1-4_fc9:HEAD:gromacs-4.0.1-4.fc9.src.rpm:1226248354
 gromacs-4_0_2-6_fc9:HEAD:gromacs-4.0.2-6.fc9.src.rpm:1226305676
 gromacs-4_0_2-7_fc10:HEAD:gromacs-4.0.2-7.fc10.src.rpm:1231935162
+gromacs-4_0_3-1_fc10:HEAD:gromacs-4.0.3-1.fc10.src.rpm:1232356764


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gromacs/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	14 Jan 2009 12:13:14 -0000	1.5
+++ sources	19 Jan 2009 09:20:03 -0000	1.6
@@ -1,2 +1,2 @@
-7a9eedf9ef365d32cd01355b8950ddc5  gromacs-4.0.2.tar.gz
 2b6565bef76109a579c39ec1dcb0ecf2  manual-4.0.pdf
+2902403671a0f9b0934ddf3ca586b7ec  gromacs-4.0.3.tar.gz



From jussilehtola at fedoraproject.org  Mon Jan 19 09:22:45 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Mon, 19 Jan 2009 09:22:45 +0000 (UTC)
Subject: rpms/gromacs/EL-4 gromacs.spec,1.5,1.6 sources,1.5,1.6
Message-ID: <20090119092245.D2EB8700F8@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

Update of /cvs/pkgs/rpms/gromacs/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv651/EL-4

Modified Files:
	gromacs.spec sources 
Log Message:
* Mon Jan 19 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0.3-1
- Update to 4.0.3.



Index: gromacs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gromacs/EL-4/gromacs.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- gromacs.spec	14 Jan 2009 12:16:29 -0000	1.5
+++ gromacs.spec	19 Jan 2009 09:22:15 -0000	1.6
@@ -1,6 +1,6 @@
 Name:		gromacs
-Version:	4.0.2
-Release:	7%{?dist}
+Version:	4.0.3
+Release:	1%{?dist}
 Summary:	GROMACS binaries
 Group:		Applications/Engineering
 License:	GPLv2+
@@ -532,6 +532,9 @@
 
 
 %changelog
+* Mon Jan 19 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0.3-1
+- Update to 4.0.3.
+
 * Wed Jan 14 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0.2-7
 - Update manual to latest version.
 - Removed Requires: blas and lapack.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gromacs/EL-4/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	14 Jan 2009 12:16:29 -0000	1.5
+++ sources	19 Jan 2009 09:22:15 -0000	1.6
@@ -1,2 +1,2 @@
-7a9eedf9ef365d32cd01355b8950ddc5  gromacs-4.0.2.tar.gz
 2b6565bef76109a579c39ec1dcb0ecf2  manual-4.0.pdf
+2902403671a0f9b0934ddf3ca586b7ec  gromacs-4.0.3.tar.gz



From jussilehtola at fedoraproject.org  Mon Jan 19 09:22:45 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Mon, 19 Jan 2009 09:22:45 +0000 (UTC)
Subject: rpms/gromacs/EL-5 gromacs.spec,1.5,1.6 sources,1.5,1.6
Message-ID: <20090119092245.F3738700F8@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

Update of /cvs/pkgs/rpms/gromacs/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv651/EL-5

Modified Files:
	gromacs.spec sources 
Log Message:
* Mon Jan 19 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0.3-1
- Update to 4.0.3.



Index: gromacs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gromacs/EL-5/gromacs.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- gromacs.spec	14 Jan 2009 12:16:29 -0000	1.5
+++ gromacs.spec	19 Jan 2009 09:22:15 -0000	1.6
@@ -1,6 +1,6 @@
 Name:		gromacs
-Version:	4.0.2
-Release:	7%{?dist}
+Version:	4.0.3
+Release:	1%{?dist}
 Summary:	GROMACS binaries
 Group:		Applications/Engineering
 License:	GPLv2+
@@ -532,6 +532,9 @@
 
 
 %changelog
+* Mon Jan 19 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0.3-1
+- Update to 4.0.3.
+
 * Wed Jan 14 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0.2-7
 - Update manual to latest version.
 - Removed Requires: blas and lapack.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gromacs/EL-5/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	14 Jan 2009 12:16:29 -0000	1.5
+++ sources	19 Jan 2009 09:22:15 -0000	1.6
@@ -1,2 +1,2 @@
-7a9eedf9ef365d32cd01355b8950ddc5  gromacs-4.0.2.tar.gz
 2b6565bef76109a579c39ec1dcb0ecf2  manual-4.0.pdf
+2902403671a0f9b0934ddf3ca586b7ec  gromacs-4.0.3.tar.gz



From jussilehtola at fedoraproject.org  Mon Jan 19 09:22:46 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Mon, 19 Jan 2009 09:22:46 +0000 (UTC)
Subject: rpms/gromacs/F-10 gromacs.spec,1.5,1.6 sources,1.5,1.6
Message-ID: <20090119092246.48ECC700F8@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

Update of /cvs/pkgs/rpms/gromacs/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv651/F-10

Modified Files:
	gromacs.spec sources 
Log Message:
* Mon Jan 19 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0.3-1
- Update to 4.0.3.



Index: gromacs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gromacs/F-10/gromacs.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- gromacs.spec	14 Jan 2009 12:16:29 -0000	1.5
+++ gromacs.spec	19 Jan 2009 09:22:15 -0000	1.6
@@ -1,6 +1,6 @@
 Name:		gromacs
-Version:	4.0.2
-Release:	7%{?dist}
+Version:	4.0.3
+Release:	1%{?dist}
 Summary:	GROMACS binaries
 Group:		Applications/Engineering
 License:	GPLv2+
@@ -532,6 +532,9 @@
 
 
 %changelog
+* Mon Jan 19 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0.3-1
+- Update to 4.0.3.
+
 * Wed Jan 14 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0.2-7
 - Update manual to latest version.
 - Removed Requires: blas and lapack.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gromacs/F-10/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	14 Jan 2009 12:16:29 -0000	1.5
+++ sources	19 Jan 2009 09:22:16 -0000	1.6
@@ -1,2 +1,2 @@
-7a9eedf9ef365d32cd01355b8950ddc5  gromacs-4.0.2.tar.gz
 2b6565bef76109a579c39ec1dcb0ecf2  manual-4.0.pdf
+2902403671a0f9b0934ddf3ca586b7ec  gromacs-4.0.3.tar.gz



From jussilehtola at fedoraproject.org  Mon Jan 19 09:22:46 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Mon, 19 Jan 2009 09:22:46 +0000 (UTC)
Subject: rpms/gromacs/F-9 gromacs.spec,1.5,1.6 sources,1.5,1.6
Message-ID: <20090119092246.8EEDA700F8@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

Update of /cvs/pkgs/rpms/gromacs/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv651/F-9

Modified Files:
	gromacs.spec sources 
Log Message:
* Mon Jan 19 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0.3-1
- Update to 4.0.3.



Index: gromacs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gromacs/F-9/gromacs.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- gromacs.spec	14 Jan 2009 12:16:29 -0000	1.5
+++ gromacs.spec	19 Jan 2009 09:22:16 -0000	1.6
@@ -1,6 +1,6 @@
 Name:		gromacs
-Version:	4.0.2
-Release:	7%{?dist}
+Version:	4.0.3
+Release:	1%{?dist}
 Summary:	GROMACS binaries
 Group:		Applications/Engineering
 License:	GPLv2+
@@ -532,6 +532,9 @@
 
 
 %changelog
+* Mon Jan 19 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0.3-1
+- Update to 4.0.3.
+
 * Wed Jan 14 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0.2-7
 - Update manual to latest version.
 - Removed Requires: blas and lapack.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gromacs/F-9/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	14 Jan 2009 12:16:29 -0000	1.5
+++ sources	19 Jan 2009 09:22:16 -0000	1.6
@@ -1,2 +1,2 @@
-7a9eedf9ef365d32cd01355b8950ddc5  gromacs-4.0.2.tar.gz
 2b6565bef76109a579c39ec1dcb0ecf2  manual-4.0.pdf
+2902403671a0f9b0934ddf3ca586b7ec  gromacs-4.0.3.tar.gz



From caolanm at fedoraproject.org  Mon Jan 19 09:26:42 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Mon, 19 Jan 2009 09:26:42 +0000 (UTC)
Subject: rpms/openoffice.org/devel openoffice.org.spec,1.1764,1.1765
Message-ID: <20090119092642.E798E700F8@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1477

Modified Files:
	openoffice.org.spec 
Log Message:
Resolves: rhbz#477435 font making macro changed


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1764
retrieving revision 1.1765
diff -u -r1.1764 -r1.1765
--- openoffice.org.spec	19 Jan 2009 09:09:36 -0000	1.1764
+++ openoffice.org.spec	19 Jan 2009 09:26:12 -0000	1.1765
@@ -30,8 +30,6 @@
 %define langpack_langs en-US
 %endif
 
-%define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
-
 %define ooo_base_name %{oootag}_m%{ooomilestone}
 
 Summary:        OpenOffice.org comprehensive office suite.
@@ -135,6 +133,7 @@
 Patch62: workspace.fwk99.patch
 Patch63: openoffice.org-3.1.0.ooo98137.filter.redeclared-variables.patch
 
+%define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
 %define instdir %{_libdir}
 %define baseinstdir %{instdir}/openoffice.org
 %define ureinstdir %{baseinstdir}/ure
@@ -142,6 +141,7 @@
 %define sdkinstdir %{baseinstdir}/basis3.0/sdk
 %define oooinstdir %{instdir}/openoffice.org3
 %define brinstdir %{instdir}/broffice.org3
+%define fontname %{name}
 %define OFFICEUPD 300
 %define UPD %nil
 %define SOPOST l*
@@ -3235,7 +3235,7 @@
     # clear disk cache
     unopkg list --shared > /dev/null 2>&1 || :
 
-%_font_pkg -n fonts opens___.ttf
+%_font_pkg opens___.ttf
 
 %files calc-core
 %defattr(-,root,root,-)
@@ -3836,6 +3836,7 @@
   openoffice.org-3.1.0.ooo98137.filter.redeclared-variables.patch
 - merge openoffice.org-3.0.0.ooo96391.sw.prefsalwaysmodified.patch into
   upstream workspace.sw31bf02.patch
+- Resolves: rhbz#477435 font making macro changed
 
 * Mon Jan 12 2009 Caol??n McNamara <caolanm at redhat.com> - 1:3.0.1-15.1
 - next milestone



From mmaslano at fedoraproject.org  Mon Jan 19 09:45:45 2009
From: mmaslano at fedoraproject.org (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?=)
Date: Mon, 19 Jan 2009 09:45:45 +0000 (UTC)
Subject: rpms/perl/F-10 perl.spec,1.199,1.200
Message-ID: <20090119094545.A19A8700F8@cvs1.fedora.phx.redhat.com>

Author: mmaslano

Update of /cvs/pkgs/rpms/perl/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3718

Modified Files:
	perl.spec 
Log Message:
Add forgotten patch33 into spec.



Index: perl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl/F-10/perl.spec,v
retrieving revision 1.199
retrieving revision 1.200
diff -u -r1.199 -r1.200
--- perl.spec	19 Jan 2009 08:38:50 -0000	1.199
+++ perl.spec	19 Jan 2009 09:45:15 -0000	1.200
@@ -123,6 +123,7 @@
 Patch31:    perl-5.10.0-Change33897.patch
 
 Patch32:	perl-5.10.0-ArchiveTar1.40.patch
+Patch33:	perl-5.10.0-PerlIO-via-change34025.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{perl_version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  tcsh, dos2unix, man, groff



From jwrdegoede at fedoraproject.org  Mon Jan 19 10:01:48 2009
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Mon, 19 Jan 2009 10:01:48 +0000 (UTC)
Subject: rpms/DevIL/devel DevIL-1.7.5-add-missing-files.patch, NONE,
	1.1 DevIL-1.7.5-CVE-2008-5262.patch, 1.1, 1.2 DevIL.spec, 1.10, 1.11
Message-ID: <20090119100148.95802700F8@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/DevIL/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6817

Modified Files:
	DevIL-1.7.5-CVE-2008-5262.patch DevIL.spec 
Added Files:
	DevIL-1.7.5-add-missing-files.patch 
Log Message:
* Mon Jan 19 2009 Hans de Goede <hdegoede at redhat.com> 1.7.5-2
- Fix missing symbols (rh 480269)
- Fix off by one error in CVE-2008-5262 check (rh 479864)


DevIL-1.7.5-add-missing-files.patch:

--- NEW FILE DevIL-1.7.5-add-missing-files.patch ---
Index: devil/lib/Makefile.am
===================================================================
--- devil.orig/lib/Makefile.am	2009-01-10 20:43:26.000000000 +0000
+++ devil/lib/Makefile.am	2009-01-10 20:54:27.000000000 +0000
@@ -69,8 +69,8 @@
 
 libIL_la_CPPFLAGS = -I $(il_include) -I $(all_include)
 libIL_la_CFLAGS = $(CFLAGS) @IL_CFLAGS@
-libIL_la_SOURCES = $(il_src)/il_alloc.c $(il_src)/il_doom.c $(il_src)/il_stack.c $(il_src)/il_pcx.c $(il_src)/il_rle.c $(il_src)/il_bits.c $(il_src)/il_endian.c $(il_src)/il_jpeg.c $(il_src)/il_pic.c $(il_src)/il_sgi.c $(il_src)/il_bmp.c $(il_src)/il_error.c $(il_src)/il_lif.c $(il_src)/il_png.c $(il_src)/il_states.c $(il_src)/il_convbuff.c $(il_src)/il_files.c $(il_src)/il_main.c $(il_src)/il_pnm.c $(il_src)/il_targa.c $(il_src)/il_wdp.c $(il_src)/il_convert.c $(il_src)/il_gif.c $(il_src)/il_manip.c $(il_src)/il_profiles.c $(il_src)/il_tiff.c $(il_src)/il_cut.c $(il_src)/il_header.c $(il_src)/il_mdl.c $(il_src)/il_quantizer.c $(il_src)/il_utility.c $(il_src)/il_dcx.c $(il_src)/il_icon.c $(il_src)/il_mng.c $(il_src)/il_raw.c $(il_src)/il_wal.c $(il_src)/il_dds.c $(il_src)/il_internal.c $(il_src)/il_pal.c $(il_src)/il_rawdata.c $(il_src)/il_devil.c $(il_src)/il_io.c $(il_src)/il_pcd.c $(il_src)/il_register.c $(il_src)/il_psd.c $(il_src)/il_fastconv.c $(il_src)/il_neuquant.c $
 (il_src)/il_dds-save.c $(il_src)/il_psp.c $(il_src)/il_pix.c $(il_src)/il_pxr.c $(il_src)/il_xpm.c $(il_src)/il_hdr.c $(il_src)/il_icns.c $(il_src)/il_jp2.c $(il_src)/altivec_common.c $(il_src)/altivec_typeconversion.c
-libIL_la_SOURCES += $(il_include)/altivec_common.h $(il_include)/altivec_typeconversion.h $(il_include)/il_alloc.h $(il_include)/il_bits.h $(il_include)/il_bmp.h $(il_include)/il_dcx.h $(il_include)/il_dds.h $(il_include)/il_doompal.h $(il_include)/il_endian.h $(il_include)/il_exr.h $(il_include)/il_files.h $(il_include)/il_gif.h $(il_include)/il_hdr.h $(il_include)/il_icns.h $(il_include)/il_icon.h $(il_include)/il_internal.h $(il_include)/il_jp2.h $(il_include)/il_jpeg.h $(il_include)/il_lif.h $(il_include)/il_manip.h $(il_include)/il_mdl.h $(il_include)/il_pal.h $(il_include)/il_pcx.h $(il_include)/il_pic.h $(il_include)/il_pnm.h $(il_include)/il_psd.h $(il_include)/il_psp.h $(il_include)/il_q2pal.h $(il_include)/il_register.h $(il_include)/il_rle.h $(il_include)/il_sgi.h $(il_include)/il_stack.h $(il_include)/il_states.h $(il_include)/il_targa.h $(il_include)/il_wdp.h $(all_include)/IL/devil_internal_exports.h
+libIL_la_SOURCES = $(il_src)/il_alloc.c $(il_src)/il_doom.c $(il_src)/il_stack.c $(il_src)/il_pcx.c $(il_src)/il_rle.c $(il_src)/il_bits.c $(il_src)/il_endian.c $(il_src)/il_jpeg.c $(il_src)/il_pic.c $(il_src)/il_sgi.c $(il_src)/il_bmp.c $(il_src)/il_error.c $(il_src)/il_lif.c $(il_src)/il_png.c $(il_src)/il_states.c $(il_src)/il_convbuff.c $(il_src)/il_files.c $(il_src)/il_main.c $(il_src)/il_pnm.c $(il_src)/il_targa.c $(il_src)/il_wdp.c $(il_src)/il_convert.c $(il_src)/il_gif.c $(il_src)/il_manip.c $(il_src)/il_profiles.c $(il_src)/il_tiff.c $(il_src)/il_cut.c $(il_src)/il_header.c $(il_src)/il_mdl.c $(il_src)/il_quantizer.c $(il_src)/il_utility.c $(il_src)/il_dcx.c $(il_src)/il_icon.c $(il_src)/il_mng.c $(il_src)/il_raw.c $(il_src)/il_wal.c $(il_src)/il_dds.c $(il_src)/il_internal.c $(il_src)/il_pal.c $(il_src)/il_rawdata.c $(il_src)/il_devil.c $(il_src)/il_io.c $(il_src)/il_pcd.c $(il_src)/il_register.c $(il_src)/il_psd.c $(il_src)/il_fastconv.c $(il_src)/il_neuquant.c $
 (il_src)/il_dds-save.c $(il_src)/il_psp.c $(il_src)/il_pix.c $(il_src)/il_pxr.c $(il_src)/il_xpm.c $(il_src)/il_hdr.c $(il_src)/il_icns.c $(il_src)/il_jp2.c $(il_src)/altivec_common.c $(il_src)/altivec_typeconversion.c $(il_src)/il_vtf.c
+libIL_la_SOURCES += $(il_include)/altivec_common.h $(il_include)/altivec_typeconversion.h $(il_include)/il_alloc.h $(il_include)/il_bits.h $(il_include)/il_bmp.h $(il_include)/il_dcx.h $(il_include)/il_dds.h $(il_include)/il_doompal.h $(il_include)/il_endian.h $(il_include)/il_exr.h $(il_include)/il_files.h $(il_include)/il_gif.h $(il_include)/il_hdr.h $(il_include)/il_icns.h $(il_include)/il_icon.h $(il_include)/il_internal.h $(il_include)/il_jp2.h $(il_include)/il_jpeg.h $(il_include)/il_lif.h $(il_include)/il_manip.h $(il_include)/il_mdl.h $(il_include)/il_pal.h $(il_include)/il_pcx.h $(il_include)/il_pic.h $(il_include)/il_pnm.h $(il_include)/il_psd.h $(il_include)/il_psp.h $(il_include)/il_q2pal.h $(il_include)/il_register.h $(il_include)/il_rle.h $(il_include)/il_sgi.h $(il_include)/il_stack.h $(il_include)/il_states.h $(il_include)/il_targa.h $(il_include)/il_wdp.h $(all_include)/IL/devil_internal_exports.h $(il_include)/il_vtf.h
 libIL_la_LDFLAGS = @IL_LIBS@ $(AM_LDFLAGS)
 
 libILU_la_CPPFLAGS = -I $(ilu_include) -I $(all_include)
Index: devil/src-IL/include/il_vtf.h
===================================================================
--- /dev/null	1970-01-01 00:00:00.000000000 +0000
+++ devil/src-IL/include/il_vtf.h	2009-01-10 20:54:27.000000000 +0000
@@ -0,0 +1,130 @@
+//-----------------------------------------------------------------------------
+//
+// ImageLib Sources
+// Copyright (C) 2000-2008 by Denton Woods
+// Last modified: 12/27/2008
+//
+// Filename: src-IL/include/il_vtf.h
+//
+// Description: Reads from and writes to a Valve Texture Format (.vtf) file.
+//                These are used in Valve's Source games.  VTF specs available
+//                from http://developer.valvesoftware.com/wiki/VTF.
+//
+//-----------------------------------------------------------------------------
+
+
+#ifndef VTF_H
+#define VTF_H
+
+#include "il_internal.h"
+
+#ifdef _MSC_VER
+#pragma pack(push, vtf_struct, 1)
+#elif defined(MACOSX) || defined(__GNUC__)
+#pragma pack(1)
+#endif
+
+typedef struct VTFHEAD
+{
+	ILubyte		Signature[4];		// File signature ("VTF\0").
+	ILuint		Version[2];			// version[0].version[1] (currently 7.2).
+	ILuint		HeaderSize;			// Size of the header struct (16 byte aligned; currently 80 bytes).
+	ILushort	Width;				// Width of the largest mipmap in pixels. Must be a power of 2.
+	ILushort	Height;				// Height of the largest mipmap in pixels. Must be a power of 2.
+	ILuint		Flags;				// VTF flags.
+	ILushort	Frames;				// Number of frames, if animated (1 for no animation).
+	ILushort	FirstFrame;			// First frame in animation (0 based).
+	ILubyte		Padding0[4];		// reflectivity padding (16 byte alignment).
+	ILfloat		Reflectivity[3];	// reflectivity vector.
+	ILubyte		Padding1[4];		// reflectivity padding (8 byte packing).
+	ILfloat		BumpmapScale;		// Bumpmap scale.
+	ILuint		HighResImageFormat;	// High resolution image format.
+	ILubyte		MipmapCount;		// Number of mipmaps.
+	ILint		LowResImageFormat;	// Low resolution image format (always DXT1).
+	ILubyte		LowResImageWidth;	// Low resolution image width.
+	ILubyte		LowResImageHeight;	// Low resolution image height.
+	ILushort	Depth;				// Depth of the largest mipmap in pixels.
+									// Must be a power of 2. Can be 0 or 1 for a 2D texture (v7.2 only).
+} IL_PACKSTRUCT VTFHEAD;
+
+#if defined(MACOSX) || defined(__GNUC__)
+#pragma pack()
+#elif _MSC_VER
+#pragma pack(pop, vtf_struct)
+#endif
+
+enum
+{
+	IMAGE_FORMAT_NONE = -1,
+	IMAGE_FORMAT_RGBA8888 = 0,
+	IMAGE_FORMAT_ABGR8888,
+	IMAGE_FORMAT_RGB888,
+	IMAGE_FORMAT_BGR888,
+	IMAGE_FORMAT_RGB565,
+	IMAGE_FORMAT_I8,
+	IMAGE_FORMAT_IA88,
+	IMAGE_FORMAT_P8,
+	IMAGE_FORMAT_A8,
+	IMAGE_FORMAT_RGB888_BLUESCREEN,
+	IMAGE_FORMAT_BGR888_BLUESCREEN,
+	IMAGE_FORMAT_ARGB8888,
+	IMAGE_FORMAT_BGRA8888,
+	IMAGE_FORMAT_DXT1,
+	IMAGE_FORMAT_DXT3,
+	IMAGE_FORMAT_DXT5,
+	IMAGE_FORMAT_BGRX8888,
+	IMAGE_FORMAT_BGR565,
+	IMAGE_FORMAT_BGRX5551,
+	IMAGE_FORMAT_BGRA4444,
+	IMAGE_FORMAT_DXT1_ONEBITALPHA,
+	IMAGE_FORMAT_BGRA5551,
+	IMAGE_FORMAT_UV88,
+	IMAGE_FORMAT_UVWQ8888,
+	IMAGE_FORMAT_RGBA16161616F,
+	IMAGE_FORMAT_RGBA16161616,
+	IMAGE_FORMAT_UVLX8888
+};
+
+enum
+{
+	TEXTUREFLAGS_POINTSAMPLE = 0x00000001,
+	TEXTUREFLAGS_TRILINEAR = 0x00000002,
+	TEXTUREFLAGS_CLAMPS = 0x00000004,
+	TEXTUREFLAGS_CLAMPT = 0x00000008,
+	TEXTUREFLAGS_ANISOTROPIC = 0x00000010,
+	TEXTUREFLAGS_HINT_DXT5 = 0x00000020,
+	TEXTUREFLAGS_NOCOMPRESS = 0x00000040,
+	TEXTUREFLAGS_NORMAL = 0x00000080,
+	TEXTUREFLAGS_NOMIP = 0x00000100,
+	TEXTUREFLAGS_NOLOD = 0x00000200,
+	TEXTUREFLAGS_MINMIP = 0x00000400,
+	TEXTUREFLAGS_PROCEDURAL = 0x00000800,
+	TEXTUREFLAGS_ONEBITALPHA = 0x00001000,
+	TEXTUREFLAGS_EIGHTBITALPHA = 0x00002000,
+	TEXTUREFLAGS_ENVMAP = 0x00004000,
+	TEXTUREFLAGS_RENDERTARGET = 0x00008000,
+	TEXTUREFLAGS_DEPTHRENDERTARGET = 0x00010000,
+	TEXTUREFLAGS_NODEBUGOVERRIDE = 0x00020000,
+	TEXTUREFLAGS_SINGLECOPY = 0x00040000,
+	TEXTUREFLAGS_ONEOVERMIPLEVELINALPHA = 0x00080000,
+	TEXTUREFLAGS_PREMULTCOLORBYONEOVERMIPLEVEL = 0x00100000,
+	TEXTUREFLAGS_NORMALTODUDV = 0x00200000,
+	TEXTUREFLAGS_ALPHATESTMIPGENERATION = 0x00400000,
+	TEXTUREFLAGS_NODEPTHBUFFER = 0x00800000,
+	TEXTUREFLAGS_NICEFILTERED = 0x01000000,
+	TEXTUREFLAGS_CLAMPU = 0x02000000
+};
+
+
+
+// Internal functions
+ILboolean	iIsValidVtf(void);
+ILboolean	iGetVtfHead(VTFHEAD *Header);
+ILboolean	iCheckVtf(VTFHEAD *Header);
+ILboolean	iLoadVtfInternal(void);
+ILboolean	VtfInitMipmaps(ILimage *BaseImage, VTFHEAD *Header);
+ILboolean	VtfReadData(void);
+ILboolean	VtfDecompressDXT1(ILimage *Image);
+ILboolean	VtfDecompressDXT5(ILimage *Image);
+
+#endif//VTF_H
Index: devil/src-IL/src/il_vtf.c
===================================================================
--- /dev/null	1970-01-01 00:00:00.000000000 +0000
+++ devil/src-IL/src/il_vtf.c	2009-01-10 20:54:27.000000000 +0000
@@ -0,0 +1,612 @@
+//-----------------------------------------------------------------------------
+//
+// ImageLib Sources
+// Copyright (C) 2000-2008 by Denton Woods
+// Last modified: 12/29/2008
+//
+// Filename: src-IL/src/il_vtf.c
+//
+// Description: Reads from and writes to a Valve Texture Format (.vtf) file.
+//                These are used in Valve's Source games.  VTF specs available
+//                from http://developer.valvesoftware.com/wiki/VTF.
+//
+//-----------------------------------------------------------------------------
+
+
+#include "il_internal.h"
+#ifndef IL_NO_VTF
+#include "il_vtf.h"
+#include "il_dds.h"
+
+// the max and min functions are not present, at least not on unixes
+#ifndef max
+	#define max( a, b ) ( ((a) > (b)) ? (a) : (b) )
+#endif
+
+#ifndef min
+	#define min( a, b ) ( ((a) < (b)) ? (a) : (b) )
+#endif
+
+//@TODO: Get rid of these globals.
+//static VTFHEAD Head;
+
+
+//! Checks if the file specified in FileName is a valid VTF file.
+ILboolean ilIsValidVtf(ILconst_string FileName)
+{
+	ILHANDLE	VtfFile;
+	ILboolean	bVtf = IL_FALSE;
+	
+	if (!iCheckExtension(FileName, IL_TEXT("vtf"))) {
+		ilSetError(IL_INVALID_EXTENSION);
+		return bVtf;
+	}
+	
+	VtfFile = iopenr(FileName);
+	if (VtfFile == NULL) {
+		ilSetError(IL_COULD_NOT_OPEN_FILE);
+		return bVtf;
+	}
+	
+	bVtf = ilIsValidVtfF(VtfFile);
+	icloser(VtfFile);
+	
+	return bVtf;
+}
+
+
+//! Checks if the ILHANDLE contains a valid VTF file at the current position.
+ILboolean ilIsValidVtfF(ILHANDLE File)
+{
+	ILuint		FirstPos;
+	ILboolean	bRet;
+	
+	iSetInputFile(File);
+	FirstPos = itell();
+	bRet = iIsValidVtf();
+	iseek(FirstPos, IL_SEEK_SET);
+	
+	return bRet;
+}
+
+
+//! Checks if Lump is a valid VTF lump.
+ILboolean ilIsValidVtfL(const void *Lump, ILuint Size)
+{
+	iSetInputLump(Lump, Size);
+	return iIsValidVtf();
+}
+
+
+// Internal function used to get the VTF header from the current file.
+ILboolean iGetVtfHead(VTFHEAD *Header)
+{
+	iread(Header->Signature, 1, 4);
+	Header->Version[0] = GetLittleUInt();
+	Header->Version[1] = GetLittleUInt();
+	Header->HeaderSize = GetLittleUInt();
+	Header->Width = GetLittleUShort();
+	Header->Height = GetLittleUShort();
+	Header->Flags = GetLittleUInt();
+	Header->Frames = GetLittleUShort();
+	Header->FirstFrame = GetLittleUShort();
+	iseek(4, IL_SEEK_CUR);  // Padding
+	Header->Reflectivity[0] = GetLittleFloat();
+	Header->Reflectivity[1] = GetLittleFloat();
+	Header->Reflectivity[2] = GetLittleFloat();
+	iseek(4, IL_SEEK_CUR);  // Padding
+	Header->BumpmapScale = GetLittleFloat();
+	Header->HighResImageFormat = GetLittleUInt();
+	Header->MipmapCount = (ILubyte)igetc();
+	Header->LowResImageFormat = GetLittleInt();
+	Header->LowResImageWidth = (ILubyte)igetc();
+	Header->LowResImageHeight = (ILubyte)igetc();
+	Header->Depth = GetLittleUShort();
+
+	iseek(Header->HeaderSize - sizeof(VTFHEAD), IL_SEEK_CUR);
+
+	return IL_TRUE;
+}
+
+
+// Internal function to get the header and check it.
+ILboolean iIsValidVtf()
+{
+	VTFHEAD Head;
+
+	if (!iGetVtfHead(&Head))
+		return IL_FALSE;
+	iseek(-(ILint)sizeof(VTFHEAD), IL_SEEK_CUR);
+	
+	return iCheckVtf(&Head);
+}
+
+
+//@TODO: Add more checks.
+// Should we check for Frames, MipmapCount and Depth != 0?
+
+// Internal function used to check if the HEADER is a valid VTF header.
+ILboolean iCheckVtf(VTFHEAD *Header)
+{
+	// The file signature is "VTF\0".
+	if ((Header->Signature[0] != 'V') || (Header->Signature[1] != 'T') || (Header->Signature[2] != 'F')
+		|| (Header->Signature[3] != 0))
+		return IL_FALSE;
+	// Are there other versions available yet?
+	if (Header->Version[0] != 7)
+		return IL_FALSE;
+	// We have 7.0 through 7.4 as of 12/27/2008.
+	if (Header->Version[1] > 4)
+		return IL_FALSE;
+	// May change in future version of the specifications.
+	//  80 is through version 7.2, and 96/104 are through 7.4.
+	//  This must be 16-byte aligned, but something is outputting headers with 104.
+	if ((Header->HeaderSize != 80) && (Header->HeaderSize != 96) && (Header->HeaderSize != 104))
+		return IL_FALSE;
+
+	// 0 is an invalid dimension
+	if (Header->Width == 0 || Header->Height == 0)
+		return IL_FALSE;
+	// Width and Height must be powers of 2.
+	if ((ilNextPower2(Header->Width) != Header->Width) || (ilNextPower2(Header->Height) != Header->Height))
+		return IL_FALSE;
+	if ((ilNextPower2(Header->LowResImageWidth) != Header->LowResImageWidth)
+		|| (ilNextPower2(Header->LowResImageHeight) != Header->LowResImageHeight))
+		return IL_FALSE;
+	// In addition, the LowResImage has to have dimensions no greater than 16.
+	if ((Header->LowResImageWidth > 16) || (Header->LowResImageHeight > 16)
+		|| (Header->LowResImageWidth == 0) || (Header->LowResImageHeight == 0))
+		return IL_FALSE;
+	// And the LowResImage has to have dimensions less than or equal to the main image.
+	if ((Header->LowResImageWidth > Header->Width) || (Header->LowResImageHeight > Header->Height))
+		return IL_FALSE;
+	// The LowResImage must be in DXT1 format.
+	if (Header->LowResImageFormat != IMAGE_FORMAT_DXT1)
+		return IL_FALSE;
+	
+	return IL_TRUE;
+}
+
+
+//! Reads a VTF file
+ILboolean ilLoadVtf(ILconst_string FileName)
+{
+	ILHANDLE	VtfFile;
+	ILboolean	bVtf = IL_FALSE;
+	
+	VtfFile = iopenr(FileName);
+	if (VtfFile == NULL) {
+		ilSetError(IL_COULD_NOT_OPEN_FILE);
+		return bVtf;
+	}
+
+	bVtf = ilLoadVtfF(VtfFile);
+	icloser(VtfFile);
+
+	return bVtf;
+}
+
+
+//! Reads an already-opened VTF file
+ILboolean ilLoadVtfF(ILHANDLE File) {
+	ILuint		FirstPos;
+	ILboolean	bRet;
+	
+	iSetInputFile(File);
+	FirstPos = itell();
+	bRet = iLoadVtfInternal();
+	iseek(FirstPos, IL_SEEK_SET);
+	
+	return bRet;
+}
+
+
+//! Reads from a memory "lump" that contains a VTF
+ILboolean ilLoadVtfL(const void *Lump, ILuint Size)
+{
+	iSetInputLump(Lump, Size);
+	return iLoadVtfInternal();
+}
+
+
+// Internal function used to load the VTF.
+ILboolean iLoadVtfInternal()
+{
+	ILboolean	bVtf = IL_TRUE;
+	ILimage		*Image, *BaseImage;
+	ILenum		Format, Type;
+	ILint		Frame, Mipmap;
+	ILuint		SizeOfData, Channels, k;
+	ILubyte		*CompData = NULL, SwapVal, *Data16Bit, *Temp;
+	VTFHEAD		Head;
+	ILuint		CurName;
+
+	if (iCurImage == NULL) {
+		ilSetError(IL_ILLEGAL_OPERATION);
+		return IL_FALSE;
+	}
+	CurName = ilGetCurName();
+	
+	if (!iGetVtfHead(&Head))
+		return IL_FALSE;
+	if (!iCheckVtf(&Head)) {
+		ilSetError(IL_INVALID_FILE_HEADER);
+		return IL_FALSE;
+	}
+
+	//@TODO: Take care of animation chains soon.
+	//if (Head.Frames > 1) {
+	//	ilSetError(IL_FORMAT_NOT_SUPPORTED);
+	//	return IL_FALSE;
+	//}
+	//@TODO: Find out how to tell whether the environment map is cubic or spherical.
+	if (Head.Flags & TEXTUREFLAGS_ENVMAP) {
+		ilSetError(IL_FORMAT_NOT_SUPPORTED);
+		return IL_FALSE;
+	}
+
+	// Skip the low resolution image.  This is just a thumbnail.
+	//  The block size is 8, and the compression ratio is 6:1.
+	SizeOfData = max(Head.LowResImageWidth * Head.LowResImageHeight / 2, 8);
+	iseek(SizeOfData, IL_SEEK_CUR);
+
+	//@TODO: Make this a helper function that set channels, bpc and format.
+	switch (Head.HighResImageFormat)
+	{
+		case IMAGE_FORMAT_DXT1:  //@TODO: Should we make DXT1 channels = 3?
+		case IMAGE_FORMAT_DXT1_ONEBITALPHA:
+		case IMAGE_FORMAT_DXT3:
+		case IMAGE_FORMAT_DXT5:
+			Channels = 4;
+			Format = IL_RGBA;
+			Type = IL_UNSIGNED_BYTE;
+			break;
+		case IMAGE_FORMAT_BGR888:
+		case IMAGE_FORMAT_BGR888_BLUESCREEN:
+			Channels = 3;
+			Format = IL_BGR;
+			Type = IL_UNSIGNED_BYTE;
+			break;
+		case IMAGE_FORMAT_BGRA8888:
+			Channels = 4;
+			Format = IL_BGRA;
+			Type = IL_UNSIGNED_BYTE;
+			break;
+		case IMAGE_FORMAT_BGRX8888:
+			Channels = 3;
+			Format = IL_BGR;
+			Type = IL_UNSIGNED_BYTE;
+			break;
+		case IMAGE_FORMAT_RGB888:
+		case IMAGE_FORMAT_RGB888_BLUESCREEN:
+			Channels = 3;
+			Format = IL_RGB;
+			Type = IL_UNSIGNED_BYTE;
+			break;
+		case IMAGE_FORMAT_RGBA8888:
+			Channels = 4;
+			Format = IL_RGBA;
+			Type = IL_UNSIGNED_BYTE;
+			break;
+		case IMAGE_FORMAT_RGBA16161616:  // 16-bit shorts
+			Channels = 4;
+			Format = IL_RGBA;
+			Type = IL_UNSIGNED_SHORT;
+			break;
+		case IMAGE_FORMAT_RGBA16161616F:  // 16-bit floats
+			Channels = 4;
+			Format = IL_RGBA;
+			Type = IL_FLOAT;
+			break;
+		case IMAGE_FORMAT_I8:  // 8-bit luminance data
+			Channels = 1;
+			Format = IL_LUMINANCE;
+			Type = IL_UNSIGNED_BYTE;
+			break;
+		case IMAGE_FORMAT_IA88:  // 8-bit luminance and alpha data
+			Channels = 2;
+			Format = IL_LUMINANCE_ALPHA;
+			Type = IL_UNSIGNED_BYTE;
+			break;
+		case IMAGE_FORMAT_A8:  // 8-bit alpha data
+			Channels = 1;
+			Format = IL_ALPHA;
+			Type = IL_UNSIGNED_BYTE;
+			break;
+		case IMAGE_FORMAT_ARGB8888:
+			Channels = 4;
+			Format = IL_BGRA;
+			Type = IL_UNSIGNED_BYTE;
+			break;
+		case IMAGE_FORMAT_ABGR8888:
+			Channels = 4;
+			Format = IL_RGBA;
+			Type = IL_UNSIGNED_BYTE;
+			break;
+		case IMAGE_FORMAT_RGB565:
+			Channels = 3;
+			Format = IL_RGB;
+			Type = IL_UNSIGNED_BYTE;
+			break;
+		case IMAGE_FORMAT_BGR565:
+			Channels = 3;
+			Format = IL_BGR;
+			Type = IL_UNSIGNED_BYTE;
+			break;
+		case IMAGE_FORMAT_BGRA5551:
+			Channels = 4;
+			Format = IL_BGRA;
+			Type = IL_UNSIGNED_BYTE;
+			break;
+		case IMAGE_FORMAT_BGRX5551:  // Unused alpha channel
+			Channels = 3;
+			Format = IL_BGR;
+			Type = IL_UNSIGNED_BYTE;
+			break;
+
+		default:
+			ilSetError(IL_FORMAT_NOT_SUPPORTED);
+			return IL_FALSE;
+	}
+
+	if (!ilTexImage(Head.Width, Head.Height, Head.Depth, Channels, Format, Type, NULL))
+		return IL_FALSE;
+	// The origin should be in the upper left.
+	iCurImage->Origin = IL_ORIGIN_UPPER_LEFT;
+	// Create any mipmaps.
+	VtfInitMipmaps(iCurImage, &Head);
+
+	// Create our animation chain
+	BaseImage = Image = iCurImage;  // Top-level image
+	for (Frame = 1; Frame < Head.Frames; Frame++) {
+		Image->Next = ilNewImageFull(Head.Width, Head.Height, Head.Depth, Channels, Format, Type, NULL);
+		if (Image->Next == NULL)
+			return IL_FALSE;
+		Image = Image->Next;
+		// The origin should be in the upper left.
+		Image->Origin = IL_ORIGIN_UPPER_LEFT;
+
+		// Create our mipmaps for each frame.
+		VtfInitMipmaps(Image, &Head);
+	}
+
+	// We want to put the smallest mipmap at the end, but it is first in the file, so we count backwards.
+	for (Mipmap = Head.MipmapCount - 1; Mipmap >= 0; Mipmap--) {
+		// Frames are in the normal order.
+		for (Frame = 0; Frame < Head.Frames; Frame++) {
+			//@TODO: Would probably be quicker to do the linked list traversal manually here.
+			ilBindImage(CurName);
+			ilActiveImage(Frame);
+			ilActiveMipmap(Mipmap);
+			Image = iCurImage;
+
+			switch (Head.HighResImageFormat)
+			{
+				// DXT1 compression
+				case IMAGE_FORMAT_DXT1:
+				case IMAGE_FORMAT_DXT1_ONEBITALPHA:
+					// The block size is 8.
+					SizeOfData = max(Image->Width * Image->Height * Image->Depth / 2, 8);
+					CompData = ialloc(SizeOfData);  // Gives a 6:1 compression ratio (or 8:1 for DXT1 with alpha)
+					iread(CompData, 1, SizeOfData);
+					if (ilGetInteger(IL_KEEP_DXTC_DATA) == IL_TRUE) {
+						Image->DxtcSize = SizeOfData;
+						Image->DxtcData = CompData;
+						Image->DxtcFormat = IL_DXT5;
+						CompData = NULL;
+					}
+					bVtf = DecompressDXT1(Image, CompData);
+					break;
+
+				// DXT3 compression
+				case IMAGE_FORMAT_DXT3:
+					// The block size is 16.
+					SizeOfData = max(Image->Width * Image->Height * Image->Depth, 16);
+					CompData = ialloc(SizeOfData);  // Gives a 4:1 compression ratio
+					iread(CompData, 1, SizeOfData);
+					if (ilGetInteger(IL_KEEP_DXTC_DATA) == IL_TRUE) {
+						Image->DxtcSize = SizeOfData;
+						Image->DxtcData = CompData;
+						Image->DxtcFormat = IL_DXT3;
+						CompData = NULL;
+					}
+					bVtf = DecompressDXT3(Image, CompData);
+					break;
+
+				// DXT5 compression
+				case IMAGE_FORMAT_DXT5:
+					// The block size is 16.
+					SizeOfData = max(Image->Width * Image->Height * Image->Depth, 16);
+					CompData = ialloc(SizeOfData);  // Gives a 4:1 compression ratio
+					iread(CompData, 1, SizeOfData);
+					if (ilGetInteger(IL_KEEP_DXTC_DATA) == IL_TRUE) {
+						Image->DxtcSize = SizeOfData;
+						Image->DxtcData = CompData;
+						Image->DxtcFormat = IL_DXT5;
+						CompData = NULL;
+					}
+					bVtf = DecompressDXT5(Image, CompData);
+					break;
+
+				// Uncompressed BGR(A) data (24-bit and 32-bit)
+				case IMAGE_FORMAT_BGR888:
+				case IMAGE_FORMAT_BGRA8888:
+				// Uncompressed RGB(A) data (24-bit and 32-bit)
+				case IMAGE_FORMAT_RGB888:
+				case IMAGE_FORMAT_RGBA8888:
+				// Uncompressed 16-bit shorts
+				case IMAGE_FORMAT_RGBA16161616:
+				// Luminance data only
+				case IMAGE_FORMAT_I8:
+				// Luminance and alpha data
+				case IMAGE_FORMAT_IA88:
+				// Alpha data only
+				case IMAGE_FORMAT_A8:
+				// We will ignore the part about the bluescreen right now.
+				//   I could not find any information about it.
+				case IMAGE_FORMAT_RGB888_BLUESCREEN:
+				case IMAGE_FORMAT_BGR888_BLUESCREEN:
+					// Just copy the data over - no compression.
+					if (iread(Image->Data, 1, Image->SizeOfData) != Image->SizeOfData)
+						bVtf = IL_FALSE;
+					else
+						bVtf = IL_TRUE;
+					break;
+
+				// Uncompressed 24-bit data with an unused alpha channel (we discard it)
+				case IMAGE_FORMAT_BGRX8888:
+					SizeOfData = Image->Width * Image->Height * Image->Depth * 3;
+					Temp = CompData = ialloc(SizeOfData / 3 * 4);  // Not compressed data
+					if (iread(CompData, 1, SizeOfData / 3 * 4) != SizeOfData / 3 * 4) {
+						bVtf = IL_FALSE;
+						break;
+					}
+					for (k = 0; k < SizeOfData; k += 3) {
+						Image->Data[k]   = Temp[0];
+						Image->Data[k+1] = Temp[1];
+						Image->Data[k+2] = Temp[2];
+						Temp += 4;
+					}
+
+					break;
+
+				// Uncompressed 16-bit floats (must be converted to 32-bit)
+				case IMAGE_FORMAT_RGBA16161616F:
+					SizeOfData = Image->Width * Image->Height * Image->Depth * Image->Bpp * 2;
+					CompData = ialloc(SizeOfData);  // Not compressed data
+					if (iread(CompData, 1, SizeOfData) != SizeOfData) {
+						bVtf = IL_FALSE;
+						break;
+					}
+					bVtf = iConvFloat16ToFloat32((ILuint*)Image->Data, (ILushort*)CompData, SizeOfData / 2);
+					break;
+
+				// Uncompressed 32-bit ARGB and ABGR data.  DevIL does not handle this
+				//   internally, so we have to swap values.
+				case IMAGE_FORMAT_ARGB8888:
+				case IMAGE_FORMAT_ABGR8888:
+					if (iread(Image->Data, 1, Image->SizeOfData) != Image->SizeOfData) {
+						bVtf = IL_FALSE;
+						break;
+					}
+					else {
+						bVtf = IL_TRUE;
+					}
+					// Swap the data
+					for (k = 0; k < Image->SizeOfData; k += 4) {
+						SwapVal = Image->Data[k];
+						Image->Data[k]   = Image->Data[k+3];
+						Image->Data[k+3] = SwapVal;
+						SwapVal = Image->Data[k+1];
+						Image->Data[k+1] = Image->Data[k+2];
+						Image->Data[k+2] = SwapVal;
+					}
+					break;
+
+				// Uncompressed 16-bit RGB and BGR data.  We have to expand this to 24-bit, since
+				//   DevIL does not handle this internally.
+				//   The data is in the file as: gggbbbbb rrrrrrggg
+				case IMAGE_FORMAT_RGB565:
+				case IMAGE_FORMAT_BGR565:
+					SizeOfData = Image->Width * Image->Height * Image->Depth * 2;
+					Data16Bit = CompData = ialloc(SizeOfData);  // Not compressed data
+					if (iread(CompData, 1, SizeOfData) != SizeOfData) {
+						bVtf = IL_FALSE;
+						break;
+					}
+					for (k = 0; k < Image->SizeOfData; k += 3) {
+						Image->Data[k]   =  (Data16Bit[0] & 0x1F) << 3;
+						Image->Data[k+1] = ((Data16Bit[1] & 0x07) << 5) | ((Data16Bit[0] & 0xE0) >> 3);
+						Image->Data[k+2] =   Data16Bit[1] & 0xF8;
+						Data16Bit += 2;
+					}
+					break;
+
+				// Uncompressed 16-bit BGRA data (1-bit alpha).  We have to expand this to 32-bit,
+				//   since DevIL does not handle this internally.
+				//   Something seems strange with this one, but this is how VTFEdit outputs.
+				//   The data is in the file as: gggbbbbb arrrrrgg
+				case IMAGE_FORMAT_BGRA5551:
+					SizeOfData = Image->Width * Image->Height * Image->Depth * 2;
+					Data16Bit = CompData = ialloc(SizeOfData);  // Not compressed data
+					if (iread(CompData, 1, SizeOfData) != SizeOfData) {
+						bVtf = IL_FALSE;
+						break;
+					}
+					for (k = 0; k < Image->SizeOfData; k += 4) {
+						Image->Data[k]   =  (Data16Bit[0] & 0x1F) << 3;
+						Image->Data[k+1] = ((Data16Bit[0] & 0xE0) >> 2) | ((Data16Bit[1] & 0x03) << 6);
+						Image->Data[k+2] =  (Data16Bit[1] & 0x7C) << 1;
+						// 1-bit alpha is either off or on.
+						Image->Data[k+3] = ((Data16Bit[0] & 0x80) == 0x80) ? 0xFF : 0x00;
+						Data16Bit += 2;
+					}
+					break;
+
+				// Same as above, but the alpha channel is unused.
+				case IMAGE_FORMAT_BGRX5551:
+					SizeOfData = Image->Width * Image->Height * Image->Depth * 2;
+					Data16Bit = CompData = ialloc(SizeOfData);  // Not compressed data
+					if (iread(CompData, 1, SizeOfData) != SizeOfData) {
+						bVtf = IL_FALSE;
+						break;
+					}
+					for (k = 0; k < Image->SizeOfData; k += 3) {
+						Image->Data[k]   =  (Data16Bit[0] & 0x1F) << 3;
+						Image->Data[k+1] = ((Data16Bit[0] & 0xE0) >> 2) | ((Data16Bit[1] & 0x03) << 6);
+						Image->Data[k+2] =  (Data16Bit[1] & 0x7C) << 1;
+						Data16Bit += 2;
+					}
+					break;
+			}
+
+			ifree(CompData);
+			CompData = NULL;
+			if (bVtf == IL_FALSE)  //@TODO: Do we need to do any cleanup here?
+				return IL_FALSE;
+		}
+	}
+
+	ilBindImage(CurName);  // Set to parent image first.
+	return ilFixImage();
+}
+
+
+ILboolean VtfInitMipmaps(ILimage *BaseImage, VTFHEAD *Header)
+{
+	ILimage *Image;
+	ILuint Width, Height, Depth, Mipmap;
+
+	Image = BaseImage;
+	Width = BaseImage->Width;  Height = BaseImage->Height;  Depth = BaseImage->Depth;
+
+	for (Mipmap = 1; Mipmap < Header->MipmapCount; Mipmap++) {
+		// 1 is the smallest dimension possible.
+		Width = (Width >> 1) == 0 ? 1 : (Width >> 1);
+		Height = (Height >> 1) == 0 ? 1 : (Height >> 1);
+		Depth = (Depth >> 1) == 0 ? 1 : (Depth >> 1);
+
+		if (Mipmap == 1) {  // Our first mipmap is at Mipmap.
+			Image->Mipmaps = ilNewImage(Width, Height, Depth, BaseImage->Bpp, BaseImage->Bpc);
+			if (Image->Mipmaps == NULL)
+				return IL_FALSE;
+			Image = Image->Mipmaps;
+		}
+		else {  // The other mipmaps are at Mipmap->Next.
+			Image->Next = ilNewImage(Width, Height, Depth, BaseImage->Bpp, BaseImage->Bpc);
+			if (Image->Next == NULL)
+				return IL_FALSE;
+			Image = Image->Next;
+		}
+
+		// ilNewImage does not set these.
+		Image->Format = BaseImage->Format;
+		Image->Type = BaseImage->Type;
+		// The origin should be in the upper left.
+		Image->Origin = IL_ORIGIN_UPPER_LEFT;
+	}
+
+	return IL_TRUE;
+}
+
+#endif//IL_NO_VTF
Index: devil/lib/Makefile.in
===================================================================
--- devil.orig/lib/Makefile.in	2009-01-10 20:54:50.000000000 +0000
+++ devil/lib/Makefile.in	2009-01-10 20:55:39.000000000 +0000
@@ -111,7 +111,7 @@
 	$(il_src)/il_pxr.c $(il_src)/il_xpm.c $(il_src)/il_hdr.c \
 	$(il_src)/il_icns.c $(il_src)/il_jp2.c \
 	$(il_src)/altivec_common.c $(il_src)/altivec_typeconversion.c \
-	$(il_include)/altivec_common.h \
+	$(il_src)/il_vtf.c $(il_include)/altivec_common.h \
 	$(il_include)/altivec_typeconversion.h \
 	$(il_include)/il_alloc.h $(il_include)/il_bits.h \
 	$(il_include)/il_bmp.h $(il_include)/il_dcx.h \
@@ -131,18 +131,19 @@
 	$(il_include)/il_states.h $(il_include)/il_targa.h \
 	$(il_include)/il_wdp.h \
 	$(all_include)/IL/devil_internal_exports.h \
-	$(ilu_src)/ilu_alloc.c $(ilu_src)/ilu_internal.c \
-	$(ilu_src)/ilu_noise.c $(ilu_src)/ilu_scale.c \
-	$(ilu_src)/ilu_error.c $(ilu_src)/ilu_main.c \
-	$(ilu_src)/ilu_rotate.c $(ilu_src)/ilu_scaling.c \
-	$(ilu_src)/ilu_filter.c $(ilu_src)/ilu_manip.c \
-	$(ilu_src)/ilu_scale2d.c $(ilu_src)/ilu_states.c \
-	$(ilu_src)/ilu_filter_rcg.c $(ilu_src)/ilu_mipmap.c \
-	$(ilu_src)/ilu_scale3d.c $(ilu_src)/ilu_utilities.c \
-	$(ilu_src)/ilu_region.c $(ilu_include)/ilu_alloc.h \
-	$(ilu_include)/ilu_filter.h $(ilu_include)/ilu_internal.h \
-	$(ilu_include)/ilu_mipmap.h $(ilu_include)/ilu_region.h \
-	$(ilu_include)/ilu_states.h $(all_include)/IL/ilu_region.h \
+	$(il_include)/il_vtf.h $(ilu_src)/ilu_alloc.c \
+	$(ilu_src)/ilu_internal.c $(ilu_src)/ilu_noise.c \
+	$(ilu_src)/ilu_scale.c $(ilu_src)/ilu_error.c \
+	$(ilu_src)/ilu_main.c $(ilu_src)/ilu_rotate.c \
+	$(ilu_src)/ilu_scaling.c $(ilu_src)/ilu_filter.c \
+	$(ilu_src)/ilu_manip.c $(ilu_src)/ilu_scale2d.c \
+	$(ilu_src)/ilu_states.c $(ilu_src)/ilu_filter_rcg.c \
+	$(ilu_src)/ilu_mipmap.c $(ilu_src)/ilu_scale3d.c \
+	$(ilu_src)/ilu_utilities.c $(ilu_src)/ilu_region.c \
+	$(ilu_include)/ilu_alloc.h $(ilu_include)/ilu_filter.h \
+	$(ilu_include)/ilu_internal.h $(ilu_include)/ilu_mipmap.h \
+	$(ilu_include)/ilu_region.h $(ilu_include)/ilu_states.h \
+	$(all_include)/IL/ilu_region.h \
 	$(ilu_include)/ilu_error/ilu_err-arabic.h \
 	$(ilu_include)/ilu_error/ilu_err-dutch.h \
 	$(ilu_include)/ilu_error/ilu_err-english.h \
@@ -184,7 +185,7 @@
 	libDevIL_la-il_pxr.lo libDevIL_la-il_xpm.lo \
 	libDevIL_la-il_hdr.lo libDevIL_la-il_icns.lo \
 	libDevIL_la-il_jp2.lo libDevIL_la-altivec_common.lo \
-	libDevIL_la-altivec_typeconversion.lo
+	libDevIL_la-altivec_typeconversion.lo libDevIL_la-il_vtf.lo
 @BUILD_IL_TRUE@@BUILD_MONOLITHIC_TRUE at am__objects_2 =  \
 @BUILD_IL_TRUE@@BUILD_MONOLITHIC_TRUE@	$(am__objects_1)
 am__objects_3 = libDevIL_la-ilu_alloc.lo libDevIL_la-ilu_internal.lo \
@@ -240,7 +241,8 @@
 	libIL_la-il_dds-save.lo libIL_la-il_psp.lo libIL_la-il_pix.lo \
 	libIL_la-il_pxr.lo libIL_la-il_xpm.lo libIL_la-il_hdr.lo \
 	libIL_la-il_icns.lo libIL_la-il_jp2.lo \
-	libIL_la-altivec_common.lo libIL_la-altivec_typeconversion.lo
+	libIL_la-altivec_common.lo libIL_la-altivec_typeconversion.lo \
+	libIL_la-il_vtf.lo
 libIL_la_OBJECTS = $(am_libIL_la_OBJECTS)
 libIL_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
 	--mode=link $(CCLD) $(libIL_la_CFLAGS) $(CFLAGS) \
@@ -505,7 +507,7 @@
 	$(il_src)/il_pxr.c $(il_src)/il_xpm.c $(il_src)/il_hdr.c \
 	$(il_src)/il_icns.c $(il_src)/il_jp2.c \
 	$(il_src)/altivec_common.c $(il_src)/altivec_typeconversion.c \
-	$(il_include)/altivec_common.h \
+	$(il_src)/il_vtf.c $(il_include)/altivec_common.h \
 	$(il_include)/altivec_typeconversion.h \
 	$(il_include)/il_alloc.h $(il_include)/il_bits.h \
 	$(il_include)/il_bmp.h $(il_include)/il_dcx.h \
@@ -524,7 +526,8 @@
 	$(il_include)/il_sgi.h $(il_include)/il_stack.h \
 	$(il_include)/il_states.h $(il_include)/il_targa.h \
 	$(il_include)/il_wdp.h \
-	$(all_include)/IL/devil_internal_exports.h
+	$(all_include)/IL/devil_internal_exports.h \
+	$(il_include)/il_vtf.h
 libIL_la_LDFLAGS = @IL_LIBS@ $(AM_LDFLAGS)
 libILU_la_CPPFLAGS = -I $(ilu_include) -I $(all_include)
 libILU_la_CFLAGS = $(CFLAGS) @ILU_CFLAGS@
@@ -689,6 +692,7 @@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libDevIL_la-il_targa.Plo at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libDevIL_la-il_tiff.Plo at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libDevIL_la-il_utility.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libDevIL_la-il_vtf.Plo at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libDevIL_la-il_wal.Plo at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libDevIL_la-il_wdp.Plo at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libDevIL_la-il_xpm.Plo at am__quote@
@@ -800,6 +804,7 @@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libIL_la-il_targa.Plo at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libIL_la-il_tiff.Plo at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libIL_la-il_utility.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libIL_la-il_vtf.Plo at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libIL_la-il_wal.Plo at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libIL_la-il_wdp.Plo at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libIL_la-il_xpm.Plo at am__quote@
@@ -1224,6 +1229,13 @@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libDevIL_la_CPPFLAGS) $(CPPFLAGS) $(libDevIL_la_CFLAGS) $(CFLAGS) -c -o libDevIL_la-altivec_typeconversion.lo `test -f '$(il_src)/altivec_typeconversion.c' || echo '$(srcdir)/'`$(il_src)/altivec_typeconversion.c
 
+libDevIL_la-il_vtf.lo: $(il_src)/il_vtf.c
+ at am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libDevIL_la_CPPFLAGS) $(CPPFLAGS) $(libDevIL_la_CFLAGS) $(CFLAGS) -MT libDevIL_la-il_vtf.lo -MD -MP -MF $(DEPDIR)/libDevIL_la-il_vtf.Tpo -c -o libDevIL_la-il_vtf.lo `test -f '$(il_src)/il_vtf.c' || echo '$(srcdir)/'`$(il_src)/il_vtf.c
+ at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libDevIL_la-il_vtf.Tpo $(DEPDIR)/libDevIL_la-il_vtf.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(il_src)/il_vtf.c' object='libDevIL_la-il_vtf.lo' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libDevIL_la_CPPFLAGS) $(CPPFLAGS) $(libDevIL_la_CFLAGS) $(CFLAGS) -c -o libDevIL_la-il_vtf.lo `test -f '$(il_src)/il_vtf.c' || echo '$(srcdir)/'`$(il_src)/il_vtf.c
+
 libDevIL_la-ilu_alloc.lo: $(ilu_src)/ilu_alloc.c
 @am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libDevIL_la_CPPFLAGS) $(CPPFLAGS) $(libDevIL_la_CFLAGS) $(CFLAGS) -MT libDevIL_la-ilu_alloc.lo -MD -MP -MF $(DEPDIR)/libDevIL_la-ilu_alloc.Tpo -c -o libDevIL_la-ilu_alloc.lo `test -f '$(ilu_src)/ilu_alloc.c' || echo '$(srcdir)/'`$(ilu_src)/ilu_alloc.c
 @am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libDevIL_la-ilu_alloc.Tpo $(DEPDIR)/libDevIL_la-ilu_alloc.Plo
@@ -1812,6 +1824,13 @@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libIL_la_CPPFLAGS) $(CPPFLAGS) $(libIL_la_CFLAGS) $(CFLAGS) -c -o libIL_la-altivec_typeconversion.lo `test -f '$(il_src)/altivec_typeconversion.c' || echo '$(srcdir)/'`$(il_src)/altivec_typeconversion.c
 
+libIL_la-il_vtf.lo: $(il_src)/il_vtf.c
+ at am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libIL_la_CPPFLAGS) $(CPPFLAGS) $(libIL_la_CFLAGS) $(CFLAGS) -MT libIL_la-il_vtf.lo -MD -MP -MF $(DEPDIR)/libIL_la-il_vtf.Tpo -c -o libIL_la-il_vtf.lo `test -f '$(il_src)/il_vtf.c' || echo '$(srcdir)/'`$(il_src)/il_vtf.c
+ at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libIL_la-il_vtf.Tpo $(DEPDIR)/libIL_la-il_vtf.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(il_src)/il_vtf.c' object='libIL_la-il_vtf.lo' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libIL_la_CPPFLAGS) $(CPPFLAGS) $(libIL_la_CFLAGS) $(CFLAGS) -c -o libIL_la-il_vtf.lo `test -f '$(il_src)/il_vtf.c' || echo '$(srcdir)/'`$(il_src)/il_vtf.c
+
 libILU_la-ilu_alloc.lo: $(ilu_src)/ilu_alloc.c
 @am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libILU_la_CPPFLAGS) $(CPPFLAGS) $(libILU_la_CFLAGS) $(CFLAGS) -MT libILU_la-ilu_alloc.lo -MD -MP -MF $(DEPDIR)/libILU_la-ilu_alloc.Tpo -c -o libILU_la-ilu_alloc.lo `test -f '$(ilu_src)/ilu_alloc.c' || echo '$(srcdir)/'`$(ilu_src)/ilu_alloc.c
 @am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libILU_la-ilu_alloc.Tpo $(DEPDIR)/libILU_la-ilu_alloc.Plo

DevIL-1.7.5-CVE-2008-5262.patch:

Index: DevIL-1.7.5-CVE-2008-5262.patch
===================================================================
RCS file: /cvs/extras/rpms/DevIL/devel/DevIL-1.7.5-CVE-2008-5262.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DevIL-1.7.5-CVE-2008-5262.patch	14 Jan 2009 10:53:07 -0000	1.1
+++ DevIL-1.7.5-CVE-2008-5262.patch	19 Jan 2009 10:01:48 -0000	1.2
@@ -13,7 +13,7 @@
  	if (iread(&a, 1, 1) != 1)
  		return IL_FALSE;
  	while (a != '\n') {
-+		if (count >= 80) {  // Line shouldn't be this long at all.
++		if (count >= sizeof(buff) - 1) {  // Line shouldn't be this long at all.
 +			ilSetError(IL_INVALID_FILE_HEADER);
 +			return IL_FALSE;
 +		}


Index: DevIL.spec
===================================================================
RCS file: /cvs/extras/rpms/DevIL/devel/DevIL.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- DevIL.spec	14 Jan 2009 10:53:07 -0000	1.10
+++ DevIL.spec	19 Jan 2009 10:01:48 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           DevIL
 Version:        1.7.5
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A cross-platform image library
 Group:          System Environment/Libraries
 License:        LGPLv2
@@ -9,6 +9,7 @@
 Patch0:         DevIL-1.7.5-allegropicfix.patch
 Patch1:         DevIL-1.7.5-il_endian_h.patch
 Patch2:         DevIL-1.7.5-CVE-2008-5262.patch
+Patch3:         DevIL-1.7.5-add-missing-files.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  allegro-devel
 BuildRequires:  lcms-devel
@@ -68,6 +69,7 @@
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 iconv -f iso8859-1 CREDITS -t utf8 > CREDITS.conv
 touch -r CREDITS CREDITS.conv
 mv CREDITS.conv CREDITS
@@ -136,6 +138,10 @@
 
 
 %changelog
+* Mon Jan 19 2009 Hans de Goede <hdegoede at redhat.com> 1.7.5-2
+- Fix missing symbols (rh 480269)
+- Fix off by one error in CVE-2008-5262 check (rh 479864)
+
 * Tue Jan 13 2009 Hans de Goede <hdegoede at redhat.com> 1.7.5-1
 - Update to latest upstream: 1.7.5
 - Add patch to fix CVE-2008-5262



From varekova at fedoraproject.org  Mon Jan 19 10:01:53 2009
From: varekova at fedoraproject.org (Ivana Varekova)
Date: Mon, 19 Jan 2009 10:01:53 +0000 (UTC)
Subject: rpms/gsl/devel .cvsignore, 1.14, 1.15 gsl.spec, 1.45, 1.46 sources, 
	1.15, 1.16
Message-ID: <20090119100153.E61A7700F8@cvs1.fedora.phx.redhat.com>

Author: varekova

Update of /cvs/pkgs/rpms/gsl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6696

Modified Files:
	.cvsignore gsl.spec sources 
Log Message:
update to 1.12



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gsl/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	16 Jun 2008 13:31:15 -0000	1.14
+++ .cvsignore	19 Jan 2009 10:01:23 -0000	1.15
@@ -1 +1 @@
-gsl-1.11.tar.gz
+gsl-1.12.tar.gz


Index: gsl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gsl/devel/gsl.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- gsl.spec	16 Sep 2008 07:48:06 -0000	1.45
+++ gsl.spec	19 Jan 2009 10:01:23 -0000	1.46
@@ -1,7 +1,7 @@
 Summary: The GNU Scientific Library for numerical analysis
 Name: gsl
-Version: 1.11
-Release: 4%{?dist}
+Version: 1.12
+Release: 1%{?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
@@ -98,6 +98,9 @@
 %{_libdir}/*.a
 
 %changelog
+* Mon Jan 19 2008 Ivana Varekova <varekova at redhat.com> - 1.12-1
+- update to 1.12
+
 * Tue Sep 16 2008 Ivana Varekova <varekova at redhat.com> - 1.11-4
 - Resolves: #462369 - remove %%{_datadir}/aclocal
 - add automake dependency


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gsl/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	16 Jun 2008 13:31:15 -0000	1.15
+++ sources	19 Jan 2009 10:01:23 -0000	1.16
@@ -1 +1 @@
-f28f9de8bec867f3f4f436d3ed80680a  gsl-1.11.tar.gz
+3ec101903c8157756fa1352161bd4c39  gsl-1.12.tar.gz



From jwrdegoede at fedoraproject.org  Mon Jan 19 10:02:59 2009
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Mon, 19 Jan 2009 10:02:59 +0000 (UTC)
Subject: rpms/DevIL/F-10 DevIL-1.7.5-add-missing-files.patch, NONE,
	1.1 DevIL-1.7.5-CVE-2008-5262.patch, 1.1, 1.2 DevIL.spec, 1.10, 1.11
Message-ID: <20090119100259.65CB0700F8@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/DevIL/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7143

Modified Files:
	DevIL-1.7.5-CVE-2008-5262.patch DevIL.spec 
Added Files:
	DevIL-1.7.5-add-missing-files.patch 
Log Message:
* Mon Jan 19 2009 Hans de Goede <hdegoede at redhat.com> 1.7.5-2
- Fix missing symbols (rh 480269)
- Fix off by one error in CVE-2008-5262 check (rh 479864)


DevIL-1.7.5-add-missing-files.patch:

--- NEW FILE DevIL-1.7.5-add-missing-files.patch ---
Index: devil/lib/Makefile.am
===================================================================
--- devil.orig/lib/Makefile.am	2009-01-10 20:43:26.000000000 +0000
+++ devil/lib/Makefile.am	2009-01-10 20:54:27.000000000 +0000
@@ -69,8 +69,8 @@
 
 libIL_la_CPPFLAGS = -I $(il_include) -I $(all_include)
 libIL_la_CFLAGS = $(CFLAGS) @IL_CFLAGS@
-libIL_la_SOURCES = $(il_src)/il_alloc.c $(il_src)/il_doom.c $(il_src)/il_stack.c $(il_src)/il_pcx.c $(il_src)/il_rle.c $(il_src)/il_bits.c $(il_src)/il_endian.c $(il_src)/il_jpeg.c $(il_src)/il_pic.c $(il_src)/il_sgi.c $(il_src)/il_bmp.c $(il_src)/il_error.c $(il_src)/il_lif.c $(il_src)/il_png.c $(il_src)/il_states.c $(il_src)/il_convbuff.c $(il_src)/il_files.c $(il_src)/il_main.c $(il_src)/il_pnm.c $(il_src)/il_targa.c $(il_src)/il_wdp.c $(il_src)/il_convert.c $(il_src)/il_gif.c $(il_src)/il_manip.c $(il_src)/il_profiles.c $(il_src)/il_tiff.c $(il_src)/il_cut.c $(il_src)/il_header.c $(il_src)/il_mdl.c $(il_src)/il_quantizer.c $(il_src)/il_utility.c $(il_src)/il_dcx.c $(il_src)/il_icon.c $(il_src)/il_mng.c $(il_src)/il_raw.c $(il_src)/il_wal.c $(il_src)/il_dds.c $(il_src)/il_internal.c $(il_src)/il_pal.c $(il_src)/il_rawdata.c $(il_src)/il_devil.c $(il_src)/il_io.c $(il_src)/il_pcd.c $(il_src)/il_register.c $(il_src)/il_psd.c $(il_src)/il_fastconv.c $(il_src)/il_neuquant.c $
 (il_src)/il_dds-save.c $(il_src)/il_psp.c $(il_src)/il_pix.c $(il_src)/il_pxr.c $(il_src)/il_xpm.c $(il_src)/il_hdr.c $(il_src)/il_icns.c $(il_src)/il_jp2.c $(il_src)/altivec_common.c $(il_src)/altivec_typeconversion.c
-libIL_la_SOURCES += $(il_include)/altivec_common.h $(il_include)/altivec_typeconversion.h $(il_include)/il_alloc.h $(il_include)/il_bits.h $(il_include)/il_bmp.h $(il_include)/il_dcx.h $(il_include)/il_dds.h $(il_include)/il_doompal.h $(il_include)/il_endian.h $(il_include)/il_exr.h $(il_include)/il_files.h $(il_include)/il_gif.h $(il_include)/il_hdr.h $(il_include)/il_icns.h $(il_include)/il_icon.h $(il_include)/il_internal.h $(il_include)/il_jp2.h $(il_include)/il_jpeg.h $(il_include)/il_lif.h $(il_include)/il_manip.h $(il_include)/il_mdl.h $(il_include)/il_pal.h $(il_include)/il_pcx.h $(il_include)/il_pic.h $(il_include)/il_pnm.h $(il_include)/il_psd.h $(il_include)/il_psp.h $(il_include)/il_q2pal.h $(il_include)/il_register.h $(il_include)/il_rle.h $(il_include)/il_sgi.h $(il_include)/il_stack.h $(il_include)/il_states.h $(il_include)/il_targa.h $(il_include)/il_wdp.h $(all_include)/IL/devil_internal_exports.h
+libIL_la_SOURCES = $(il_src)/il_alloc.c $(il_src)/il_doom.c $(il_src)/il_stack.c $(il_src)/il_pcx.c $(il_src)/il_rle.c $(il_src)/il_bits.c $(il_src)/il_endian.c $(il_src)/il_jpeg.c $(il_src)/il_pic.c $(il_src)/il_sgi.c $(il_src)/il_bmp.c $(il_src)/il_error.c $(il_src)/il_lif.c $(il_src)/il_png.c $(il_src)/il_states.c $(il_src)/il_convbuff.c $(il_src)/il_files.c $(il_src)/il_main.c $(il_src)/il_pnm.c $(il_src)/il_targa.c $(il_src)/il_wdp.c $(il_src)/il_convert.c $(il_src)/il_gif.c $(il_src)/il_manip.c $(il_src)/il_profiles.c $(il_src)/il_tiff.c $(il_src)/il_cut.c $(il_src)/il_header.c $(il_src)/il_mdl.c $(il_src)/il_quantizer.c $(il_src)/il_utility.c $(il_src)/il_dcx.c $(il_src)/il_icon.c $(il_src)/il_mng.c $(il_src)/il_raw.c $(il_src)/il_wal.c $(il_src)/il_dds.c $(il_src)/il_internal.c $(il_src)/il_pal.c $(il_src)/il_rawdata.c $(il_src)/il_devil.c $(il_src)/il_io.c $(il_src)/il_pcd.c $(il_src)/il_register.c $(il_src)/il_psd.c $(il_src)/il_fastconv.c $(il_src)/il_neuquant.c $
 (il_src)/il_dds-save.c $(il_src)/il_psp.c $(il_src)/il_pix.c $(il_src)/il_pxr.c $(il_src)/il_xpm.c $(il_src)/il_hdr.c $(il_src)/il_icns.c $(il_src)/il_jp2.c $(il_src)/altivec_common.c $(il_src)/altivec_typeconversion.c $(il_src)/il_vtf.c
+libIL_la_SOURCES += $(il_include)/altivec_common.h $(il_include)/altivec_typeconversion.h $(il_include)/il_alloc.h $(il_include)/il_bits.h $(il_include)/il_bmp.h $(il_include)/il_dcx.h $(il_include)/il_dds.h $(il_include)/il_doompal.h $(il_include)/il_endian.h $(il_include)/il_exr.h $(il_include)/il_files.h $(il_include)/il_gif.h $(il_include)/il_hdr.h $(il_include)/il_icns.h $(il_include)/il_icon.h $(il_include)/il_internal.h $(il_include)/il_jp2.h $(il_include)/il_jpeg.h $(il_include)/il_lif.h $(il_include)/il_manip.h $(il_include)/il_mdl.h $(il_include)/il_pal.h $(il_include)/il_pcx.h $(il_include)/il_pic.h $(il_include)/il_pnm.h $(il_include)/il_psd.h $(il_include)/il_psp.h $(il_include)/il_q2pal.h $(il_include)/il_register.h $(il_include)/il_rle.h $(il_include)/il_sgi.h $(il_include)/il_stack.h $(il_include)/il_states.h $(il_include)/il_targa.h $(il_include)/il_wdp.h $(all_include)/IL/devil_internal_exports.h $(il_include)/il_vtf.h
 libIL_la_LDFLAGS = @IL_LIBS@ $(AM_LDFLAGS)
 
 libILU_la_CPPFLAGS = -I $(ilu_include) -I $(all_include)
Index: devil/src-IL/include/il_vtf.h
===================================================================
--- /dev/null	1970-01-01 00:00:00.000000000 +0000
+++ devil/src-IL/include/il_vtf.h	2009-01-10 20:54:27.000000000 +0000
@@ -0,0 +1,130 @@
+//-----------------------------------------------------------------------------
+//
+// ImageLib Sources
+// Copyright (C) 2000-2008 by Denton Woods
+// Last modified: 12/27/2008
+//
+// Filename: src-IL/include/il_vtf.h
+//
+// Description: Reads from and writes to a Valve Texture Format (.vtf) file.
+//                These are used in Valve's Source games.  VTF specs available
+//                from http://developer.valvesoftware.com/wiki/VTF.
+//
+//-----------------------------------------------------------------------------
+
+
+#ifndef VTF_H
+#define VTF_H
+
+#include "il_internal.h"
+
+#ifdef _MSC_VER
+#pragma pack(push, vtf_struct, 1)
+#elif defined(MACOSX) || defined(__GNUC__)
+#pragma pack(1)
+#endif
+
+typedef struct VTFHEAD
+{
+	ILubyte		Signature[4];		// File signature ("VTF\0").
+	ILuint		Version[2];			// version[0].version[1] (currently 7.2).
+	ILuint		HeaderSize;			// Size of the header struct (16 byte aligned; currently 80 bytes).
+	ILushort	Width;				// Width of the largest mipmap in pixels. Must be a power of 2.
+	ILushort	Height;				// Height of the largest mipmap in pixels. Must be a power of 2.
+	ILuint		Flags;				// VTF flags.
+	ILushort	Frames;				// Number of frames, if animated (1 for no animation).
+	ILushort	FirstFrame;			// First frame in animation (0 based).
+	ILubyte		Padding0[4];		// reflectivity padding (16 byte alignment).
+	ILfloat		Reflectivity[3];	// reflectivity vector.
+	ILubyte		Padding1[4];		// reflectivity padding (8 byte packing).
+	ILfloat		BumpmapScale;		// Bumpmap scale.
+	ILuint		HighResImageFormat;	// High resolution image format.
+	ILubyte		MipmapCount;		// Number of mipmaps.
+	ILint		LowResImageFormat;	// Low resolution image format (always DXT1).
+	ILubyte		LowResImageWidth;	// Low resolution image width.
+	ILubyte		LowResImageHeight;	// Low resolution image height.
+	ILushort	Depth;				// Depth of the largest mipmap in pixels.
+									// Must be a power of 2. Can be 0 or 1 for a 2D texture (v7.2 only).
+} IL_PACKSTRUCT VTFHEAD;
+
+#if defined(MACOSX) || defined(__GNUC__)
+#pragma pack()
+#elif _MSC_VER
+#pragma pack(pop, vtf_struct)
+#endif
+
+enum
+{
+	IMAGE_FORMAT_NONE = -1,
+	IMAGE_FORMAT_RGBA8888 = 0,
+	IMAGE_FORMAT_ABGR8888,
+	IMAGE_FORMAT_RGB888,
+	IMAGE_FORMAT_BGR888,
+	IMAGE_FORMAT_RGB565,
+	IMAGE_FORMAT_I8,
+	IMAGE_FORMAT_IA88,
+	IMAGE_FORMAT_P8,
+	IMAGE_FORMAT_A8,
+	IMAGE_FORMAT_RGB888_BLUESCREEN,
+	IMAGE_FORMAT_BGR888_BLUESCREEN,
+	IMAGE_FORMAT_ARGB8888,
+	IMAGE_FORMAT_BGRA8888,
+	IMAGE_FORMAT_DXT1,
+	IMAGE_FORMAT_DXT3,
+	IMAGE_FORMAT_DXT5,
+	IMAGE_FORMAT_BGRX8888,
+	IMAGE_FORMAT_BGR565,
+	IMAGE_FORMAT_BGRX5551,
+	IMAGE_FORMAT_BGRA4444,
+	IMAGE_FORMAT_DXT1_ONEBITALPHA,
+	IMAGE_FORMAT_BGRA5551,
+	IMAGE_FORMAT_UV88,
+	IMAGE_FORMAT_UVWQ8888,
+	IMAGE_FORMAT_RGBA16161616F,
+	IMAGE_FORMAT_RGBA16161616,
+	IMAGE_FORMAT_UVLX8888
+};
+
+enum
+{
+	TEXTUREFLAGS_POINTSAMPLE = 0x00000001,
+	TEXTUREFLAGS_TRILINEAR = 0x00000002,
+	TEXTUREFLAGS_CLAMPS = 0x00000004,
+	TEXTUREFLAGS_CLAMPT = 0x00000008,
+	TEXTUREFLAGS_ANISOTROPIC = 0x00000010,
+	TEXTUREFLAGS_HINT_DXT5 = 0x00000020,
+	TEXTUREFLAGS_NOCOMPRESS = 0x00000040,
+	TEXTUREFLAGS_NORMAL = 0x00000080,
+	TEXTUREFLAGS_NOMIP = 0x00000100,
+	TEXTUREFLAGS_NOLOD = 0x00000200,
+	TEXTUREFLAGS_MINMIP = 0x00000400,
+	TEXTUREFLAGS_PROCEDURAL = 0x00000800,
+	TEXTUREFLAGS_ONEBITALPHA = 0x00001000,
+	TEXTUREFLAGS_EIGHTBITALPHA = 0x00002000,
+	TEXTUREFLAGS_ENVMAP = 0x00004000,
+	TEXTUREFLAGS_RENDERTARGET = 0x00008000,
+	TEXTUREFLAGS_DEPTHRENDERTARGET = 0x00010000,
+	TEXTUREFLAGS_NODEBUGOVERRIDE = 0x00020000,
+	TEXTUREFLAGS_SINGLECOPY = 0x00040000,
+	TEXTUREFLAGS_ONEOVERMIPLEVELINALPHA = 0x00080000,
+	TEXTUREFLAGS_PREMULTCOLORBYONEOVERMIPLEVEL = 0x00100000,
+	TEXTUREFLAGS_NORMALTODUDV = 0x00200000,
+	TEXTUREFLAGS_ALPHATESTMIPGENERATION = 0x00400000,
+	TEXTUREFLAGS_NODEPTHBUFFER = 0x00800000,
+	TEXTUREFLAGS_NICEFILTERED = 0x01000000,
+	TEXTUREFLAGS_CLAMPU = 0x02000000
+};
+
+
+
+// Internal functions
+ILboolean	iIsValidVtf(void);
+ILboolean	iGetVtfHead(VTFHEAD *Header);
+ILboolean	iCheckVtf(VTFHEAD *Header);
+ILboolean	iLoadVtfInternal(void);
+ILboolean	VtfInitMipmaps(ILimage *BaseImage, VTFHEAD *Header);
+ILboolean	VtfReadData(void);
+ILboolean	VtfDecompressDXT1(ILimage *Image);
+ILboolean	VtfDecompressDXT5(ILimage *Image);
+
+#endif//VTF_H
Index: devil/src-IL/src/il_vtf.c
===================================================================
--- /dev/null	1970-01-01 00:00:00.000000000 +0000
+++ devil/src-IL/src/il_vtf.c	2009-01-10 20:54:27.000000000 +0000
@@ -0,0 +1,612 @@
+//-----------------------------------------------------------------------------
+//
+// ImageLib Sources
+// Copyright (C) 2000-2008 by Denton Woods
+// Last modified: 12/29/2008
+//
+// Filename: src-IL/src/il_vtf.c
+//
+// Description: Reads from and writes to a Valve Texture Format (.vtf) file.
+//                These are used in Valve's Source games.  VTF specs available
+//                from http://developer.valvesoftware.com/wiki/VTF.
+//
+//-----------------------------------------------------------------------------
+
+
+#include "il_internal.h"
+#ifndef IL_NO_VTF
+#include "il_vtf.h"
+#include "il_dds.h"
+
+// the max and min functions are not present, at least not on unixes
+#ifndef max
+	#define max( a, b ) ( ((a) > (b)) ? (a) : (b) )
+#endif
+
+#ifndef min
+	#define min( a, b ) ( ((a) < (b)) ? (a) : (b) )
+#endif
+
+//@TODO: Get rid of these globals.
+//static VTFHEAD Head;
+
+
+//! Checks if the file specified in FileName is a valid VTF file.
+ILboolean ilIsValidVtf(ILconst_string FileName)
+{
+	ILHANDLE	VtfFile;
+	ILboolean	bVtf = IL_FALSE;
+	
+	if (!iCheckExtension(FileName, IL_TEXT("vtf"))) {
+		ilSetError(IL_INVALID_EXTENSION);
+		return bVtf;
+	}
+	
+	VtfFile = iopenr(FileName);
+	if (VtfFile == NULL) {
+		ilSetError(IL_COULD_NOT_OPEN_FILE);
+		return bVtf;
+	}
+	
+	bVtf = ilIsValidVtfF(VtfFile);
+	icloser(VtfFile);
+	
+	return bVtf;
+}
+
+
+//! Checks if the ILHANDLE contains a valid VTF file at the current position.
+ILboolean ilIsValidVtfF(ILHANDLE File)
+{
+	ILuint		FirstPos;
+	ILboolean	bRet;
+	
+	iSetInputFile(File);
+	FirstPos = itell();
+	bRet = iIsValidVtf();
+	iseek(FirstPos, IL_SEEK_SET);
+	
+	return bRet;
+}
+
+
+//! Checks if Lump is a valid VTF lump.
+ILboolean ilIsValidVtfL(const void *Lump, ILuint Size)
+{
+	iSetInputLump(Lump, Size);
+	return iIsValidVtf();
+}
+
+
+// Internal function used to get the VTF header from the current file.
+ILboolean iGetVtfHead(VTFHEAD *Header)
+{
+	iread(Header->Signature, 1, 4);
+	Header->Version[0] = GetLittleUInt();
+	Header->Version[1] = GetLittleUInt();
+	Header->HeaderSize = GetLittleUInt();
+	Header->Width = GetLittleUShort();
+	Header->Height = GetLittleUShort();
+	Header->Flags = GetLittleUInt();
+	Header->Frames = GetLittleUShort();
+	Header->FirstFrame = GetLittleUShort();
+	iseek(4, IL_SEEK_CUR);  // Padding
+	Header->Reflectivity[0] = GetLittleFloat();
+	Header->Reflectivity[1] = GetLittleFloat();
+	Header->Reflectivity[2] = GetLittleFloat();
+	iseek(4, IL_SEEK_CUR);  // Padding
+	Header->BumpmapScale = GetLittleFloat();
+	Header->HighResImageFormat = GetLittleUInt();
+	Header->MipmapCount = (ILubyte)igetc();
+	Header->LowResImageFormat = GetLittleInt();
+	Header->LowResImageWidth = (ILubyte)igetc();
+	Header->LowResImageHeight = (ILubyte)igetc();
+	Header->Depth = GetLittleUShort();
+
+	iseek(Header->HeaderSize - sizeof(VTFHEAD), IL_SEEK_CUR);
+
+	return IL_TRUE;
+}
+
+
+// Internal function to get the header and check it.
+ILboolean iIsValidVtf()
+{
+	VTFHEAD Head;
+
+	if (!iGetVtfHead(&Head))
+		return IL_FALSE;
+	iseek(-(ILint)sizeof(VTFHEAD), IL_SEEK_CUR);
+	
+	return iCheckVtf(&Head);
+}
+
+
+//@TODO: Add more checks.
+// Should we check for Frames, MipmapCount and Depth != 0?
+
+// Internal function used to check if the HEADER is a valid VTF header.
+ILboolean iCheckVtf(VTFHEAD *Header)
+{
+	// The file signature is "VTF\0".
+	if ((Header->Signature[0] != 'V') || (Header->Signature[1] != 'T') || (Header->Signature[2] != 'F')
+		|| (Header->Signature[3] != 0))
+		return IL_FALSE;
+	// Are there other versions available yet?
+	if (Header->Version[0] != 7)
+		return IL_FALSE;
+	// We have 7.0 through 7.4 as of 12/27/2008.
+	if (Header->Version[1] > 4)
+		return IL_FALSE;
+	// May change in future version of the specifications.
+	//  80 is through version 7.2, and 96/104 are through 7.4.
+	//  This must be 16-byte aligned, but something is outputting headers with 104.
+	if ((Header->HeaderSize != 80) && (Header->HeaderSize != 96) && (Header->HeaderSize != 104))
+		return IL_FALSE;
+
+	// 0 is an invalid dimension
+	if (Header->Width == 0 || Header->Height == 0)
+		return IL_FALSE;
+	// Width and Height must be powers of 2.
+	if ((ilNextPower2(Header->Width) != Header->Width) || (ilNextPower2(Header->Height) != Header->Height))
+		return IL_FALSE;
+	if ((ilNextPower2(Header->LowResImageWidth) != Header->LowResImageWidth)
+		|| (ilNextPower2(Header->LowResImageHeight) != Header->LowResImageHeight))
+		return IL_FALSE;
+	// In addition, the LowResImage has to have dimensions no greater than 16.
+	if ((Header->LowResImageWidth > 16) || (Header->LowResImageHeight > 16)
+		|| (Header->LowResImageWidth == 0) || (Header->LowResImageHeight == 0))
+		return IL_FALSE;
+	// And the LowResImage has to have dimensions less than or equal to the main image.
+	if ((Header->LowResImageWidth > Header->Width) || (Header->LowResImageHeight > Header->Height))
+		return IL_FALSE;
+	// The LowResImage must be in DXT1 format.
+	if (Header->LowResImageFormat != IMAGE_FORMAT_DXT1)
+		return IL_FALSE;
+	
+	return IL_TRUE;
+}
+
+
+//! Reads a VTF file
+ILboolean ilLoadVtf(ILconst_string FileName)
+{
+	ILHANDLE	VtfFile;
+	ILboolean	bVtf = IL_FALSE;
+	
+	VtfFile = iopenr(FileName);
+	if (VtfFile == NULL) {
+		ilSetError(IL_COULD_NOT_OPEN_FILE);
+		return bVtf;
+	}
+
+	bVtf = ilLoadVtfF(VtfFile);
+	icloser(VtfFile);
+
+	return bVtf;
+}
+
+
+//! Reads an already-opened VTF file
+ILboolean ilLoadVtfF(ILHANDLE File) {
+	ILuint		FirstPos;
+	ILboolean	bRet;
+	
+	iSetInputFile(File);
+	FirstPos = itell();
+	bRet = iLoadVtfInternal();
+	iseek(FirstPos, IL_SEEK_SET);
+	
+	return bRet;
+}
+
+
+//! Reads from a memory "lump" that contains a VTF
+ILboolean ilLoadVtfL(const void *Lump, ILuint Size)
+{
+	iSetInputLump(Lump, Size);
+	return iLoadVtfInternal();
+}
+
+
+// Internal function used to load the VTF.
+ILboolean iLoadVtfInternal()
+{
+	ILboolean	bVtf = IL_TRUE;
+	ILimage		*Image, *BaseImage;
+	ILenum		Format, Type;
+	ILint		Frame, Mipmap;
+	ILuint		SizeOfData, Channels, k;
+	ILubyte		*CompData = NULL, SwapVal, *Data16Bit, *Temp;
+	VTFHEAD		Head;
+	ILuint		CurName;
+
+	if (iCurImage == NULL) {
+		ilSetError(IL_ILLEGAL_OPERATION);
+		return IL_FALSE;
+	}
+	CurName = ilGetCurName();
+	
+	if (!iGetVtfHead(&Head))
+		return IL_FALSE;
+	if (!iCheckVtf(&Head)) {
+		ilSetError(IL_INVALID_FILE_HEADER);
+		return IL_FALSE;
+	}
+
+	//@TODO: Take care of animation chains soon.
+	//if (Head.Frames > 1) {
+	//	ilSetError(IL_FORMAT_NOT_SUPPORTED);
+	//	return IL_FALSE;
+	//}
+	//@TODO: Find out how to tell whether the environment map is cubic or spherical.
+	if (Head.Flags & TEXTUREFLAGS_ENVMAP) {
+		ilSetError(IL_FORMAT_NOT_SUPPORTED);
+		return IL_FALSE;
+	}
+
+	// Skip the low resolution image.  This is just a thumbnail.
+	//  The block size is 8, and the compression ratio is 6:1.
+	SizeOfData = max(Head.LowResImageWidth * Head.LowResImageHeight / 2, 8);
+	iseek(SizeOfData, IL_SEEK_CUR);
+
+	//@TODO: Make this a helper function that set channels, bpc and format.
+	switch (Head.HighResImageFormat)
+	{
+		case IMAGE_FORMAT_DXT1:  //@TODO: Should we make DXT1 channels = 3?
+		case IMAGE_FORMAT_DXT1_ONEBITALPHA:
+		case IMAGE_FORMAT_DXT3:
+		case IMAGE_FORMAT_DXT5:
+			Channels = 4;
+			Format = IL_RGBA;
+			Type = IL_UNSIGNED_BYTE;
+			break;
+		case IMAGE_FORMAT_BGR888:
+		case IMAGE_FORMAT_BGR888_BLUESCREEN:
+			Channels = 3;
+			Format = IL_BGR;
+			Type = IL_UNSIGNED_BYTE;
+			break;
+		case IMAGE_FORMAT_BGRA8888:
+			Channels = 4;
+			Format = IL_BGRA;
+			Type = IL_UNSIGNED_BYTE;
+			break;
+		case IMAGE_FORMAT_BGRX8888:
+			Channels = 3;
+			Format = IL_BGR;
+			Type = IL_UNSIGNED_BYTE;
+			break;
+		case IMAGE_FORMAT_RGB888:
+		case IMAGE_FORMAT_RGB888_BLUESCREEN:
+			Channels = 3;
+			Format = IL_RGB;
+			Type = IL_UNSIGNED_BYTE;
+			break;
+		case IMAGE_FORMAT_RGBA8888:
+			Channels = 4;
+			Format = IL_RGBA;
+			Type = IL_UNSIGNED_BYTE;
+			break;
+		case IMAGE_FORMAT_RGBA16161616:  // 16-bit shorts
+			Channels = 4;
+			Format = IL_RGBA;
+			Type = IL_UNSIGNED_SHORT;
+			break;
+		case IMAGE_FORMAT_RGBA16161616F:  // 16-bit floats
+			Channels = 4;
+			Format = IL_RGBA;
+			Type = IL_FLOAT;
+			break;
+		case IMAGE_FORMAT_I8:  // 8-bit luminance data
+			Channels = 1;
+			Format = IL_LUMINANCE;
+			Type = IL_UNSIGNED_BYTE;
+			break;
+		case IMAGE_FORMAT_IA88:  // 8-bit luminance and alpha data
+			Channels = 2;
+			Format = IL_LUMINANCE_ALPHA;
+			Type = IL_UNSIGNED_BYTE;
+			break;
+		case IMAGE_FORMAT_A8:  // 8-bit alpha data
+			Channels = 1;
+			Format = IL_ALPHA;
+			Type = IL_UNSIGNED_BYTE;
+			break;
+		case IMAGE_FORMAT_ARGB8888:
+			Channels = 4;
+			Format = IL_BGRA;
+			Type = IL_UNSIGNED_BYTE;
+			break;
+		case IMAGE_FORMAT_ABGR8888:
+			Channels = 4;
+			Format = IL_RGBA;
+			Type = IL_UNSIGNED_BYTE;
+			break;
+		case IMAGE_FORMAT_RGB565:
+			Channels = 3;
+			Format = IL_RGB;
+			Type = IL_UNSIGNED_BYTE;
+			break;
+		case IMAGE_FORMAT_BGR565:
+			Channels = 3;
+			Format = IL_BGR;
+			Type = IL_UNSIGNED_BYTE;
+			break;
+		case IMAGE_FORMAT_BGRA5551:
+			Channels = 4;
+			Format = IL_BGRA;
+			Type = IL_UNSIGNED_BYTE;
+			break;
+		case IMAGE_FORMAT_BGRX5551:  // Unused alpha channel
+			Channels = 3;
+			Format = IL_BGR;
+			Type = IL_UNSIGNED_BYTE;
+			break;
+
+		default:
+			ilSetError(IL_FORMAT_NOT_SUPPORTED);
+			return IL_FALSE;
+	}
+
+	if (!ilTexImage(Head.Width, Head.Height, Head.Depth, Channels, Format, Type, NULL))
+		return IL_FALSE;
+	// The origin should be in the upper left.
+	iCurImage->Origin = IL_ORIGIN_UPPER_LEFT;
+	// Create any mipmaps.
+	VtfInitMipmaps(iCurImage, &Head);
+
+	// Create our animation chain
+	BaseImage = Image = iCurImage;  // Top-level image
+	for (Frame = 1; Frame < Head.Frames; Frame++) {
+		Image->Next = ilNewImageFull(Head.Width, Head.Height, Head.Depth, Channels, Format, Type, NULL);
+		if (Image->Next == NULL)
+			return IL_FALSE;
+		Image = Image->Next;
+		// The origin should be in the upper left.
+		Image->Origin = IL_ORIGIN_UPPER_LEFT;
+
+		// Create our mipmaps for each frame.
+		VtfInitMipmaps(Image, &Head);
+	}
+
+	// We want to put the smallest mipmap at the end, but it is first in the file, so we count backwards.
+	for (Mipmap = Head.MipmapCount - 1; Mipmap >= 0; Mipmap--) {
+		// Frames are in the normal order.
+		for (Frame = 0; Frame < Head.Frames; Frame++) {
+			//@TODO: Would probably be quicker to do the linked list traversal manually here.
+			ilBindImage(CurName);
+			ilActiveImage(Frame);
+			ilActiveMipmap(Mipmap);
+			Image = iCurImage;
+
+			switch (Head.HighResImageFormat)
+			{
+				// DXT1 compression
+				case IMAGE_FORMAT_DXT1:
+				case IMAGE_FORMAT_DXT1_ONEBITALPHA:
+					// The block size is 8.
+					SizeOfData = max(Image->Width * Image->Height * Image->Depth / 2, 8);
+					CompData = ialloc(SizeOfData);  // Gives a 6:1 compression ratio (or 8:1 for DXT1 with alpha)
+					iread(CompData, 1, SizeOfData);
+					if (ilGetInteger(IL_KEEP_DXTC_DATA) == IL_TRUE) {
+						Image->DxtcSize = SizeOfData;
+						Image->DxtcData = CompData;
+						Image->DxtcFormat = IL_DXT5;
+						CompData = NULL;
+					}
+					bVtf = DecompressDXT1(Image, CompData);
+					break;
+
+				// DXT3 compression
+				case IMAGE_FORMAT_DXT3:
+					// The block size is 16.
+					SizeOfData = max(Image->Width * Image->Height * Image->Depth, 16);
+					CompData = ialloc(SizeOfData);  // Gives a 4:1 compression ratio
+					iread(CompData, 1, SizeOfData);
+					if (ilGetInteger(IL_KEEP_DXTC_DATA) == IL_TRUE) {
+						Image->DxtcSize = SizeOfData;
+						Image->DxtcData = CompData;
+						Image->DxtcFormat = IL_DXT3;
+						CompData = NULL;
+					}
+					bVtf = DecompressDXT3(Image, CompData);
+					break;
+
+				// DXT5 compression
+				case IMAGE_FORMAT_DXT5:
+					// The block size is 16.
+					SizeOfData = max(Image->Width * Image->Height * Image->Depth, 16);
+					CompData = ialloc(SizeOfData);  // Gives a 4:1 compression ratio
+					iread(CompData, 1, SizeOfData);
+					if (ilGetInteger(IL_KEEP_DXTC_DATA) == IL_TRUE) {
+						Image->DxtcSize = SizeOfData;
+						Image->DxtcData = CompData;
+						Image->DxtcFormat = IL_DXT5;
+						CompData = NULL;
+					}
+					bVtf = DecompressDXT5(Image, CompData);
+					break;
+
+				// Uncompressed BGR(A) data (24-bit and 32-bit)
+				case IMAGE_FORMAT_BGR888:
+				case IMAGE_FORMAT_BGRA8888:
+				// Uncompressed RGB(A) data (24-bit and 32-bit)
+				case IMAGE_FORMAT_RGB888:
+				case IMAGE_FORMAT_RGBA8888:
+				// Uncompressed 16-bit shorts
+				case IMAGE_FORMAT_RGBA16161616:
+				// Luminance data only
+				case IMAGE_FORMAT_I8:
+				// Luminance and alpha data
+				case IMAGE_FORMAT_IA88:
+				// Alpha data only
+				case IMAGE_FORMAT_A8:
+				// We will ignore the part about the bluescreen right now.
+				//   I could not find any information about it.
+				case IMAGE_FORMAT_RGB888_BLUESCREEN:
+				case IMAGE_FORMAT_BGR888_BLUESCREEN:
+					// Just copy the data over - no compression.
+					if (iread(Image->Data, 1, Image->SizeOfData) != Image->SizeOfData)
+						bVtf = IL_FALSE;
+					else
+						bVtf = IL_TRUE;
+					break;
+
+				// Uncompressed 24-bit data with an unused alpha channel (we discard it)
+				case IMAGE_FORMAT_BGRX8888:
+					SizeOfData = Image->Width * Image->Height * Image->Depth * 3;
+					Temp = CompData = ialloc(SizeOfData / 3 * 4);  // Not compressed data
+					if (iread(CompData, 1, SizeOfData / 3 * 4) != SizeOfData / 3 * 4) {
+						bVtf = IL_FALSE;
+						break;
+					}
+					for (k = 0; k < SizeOfData; k += 3) {
+						Image->Data[k]   = Temp[0];
+						Image->Data[k+1] = Temp[1];
+						Image->Data[k+2] = Temp[2];
+						Temp += 4;
+					}
+
+					break;
+
+				// Uncompressed 16-bit floats (must be converted to 32-bit)
+				case IMAGE_FORMAT_RGBA16161616F:
+					SizeOfData = Image->Width * Image->Height * Image->Depth * Image->Bpp * 2;
+					CompData = ialloc(SizeOfData);  // Not compressed data
+					if (iread(CompData, 1, SizeOfData) != SizeOfData) {
+						bVtf = IL_FALSE;
+						break;
+					}
+					bVtf = iConvFloat16ToFloat32((ILuint*)Image->Data, (ILushort*)CompData, SizeOfData / 2);
+					break;
+
+				// Uncompressed 32-bit ARGB and ABGR data.  DevIL does not handle this
+				//   internally, so we have to swap values.
+				case IMAGE_FORMAT_ARGB8888:
+				case IMAGE_FORMAT_ABGR8888:
+					if (iread(Image->Data, 1, Image->SizeOfData) != Image->SizeOfData) {
+						bVtf = IL_FALSE;
+						break;
+					}
+					else {
+						bVtf = IL_TRUE;
+					}
+					// Swap the data
+					for (k = 0; k < Image->SizeOfData; k += 4) {
+						SwapVal = Image->Data[k];
+						Image->Data[k]   = Image->Data[k+3];
+						Image->Data[k+3] = SwapVal;
+						SwapVal = Image->Data[k+1];
+						Image->Data[k+1] = Image->Data[k+2];
+						Image->Data[k+2] = SwapVal;
+					}
+					break;
+
+				// Uncompressed 16-bit RGB and BGR data.  We have to expand this to 24-bit, since
+				//   DevIL does not handle this internally.
+				//   The data is in the file as: gggbbbbb rrrrrrggg
+				case IMAGE_FORMAT_RGB565:
+				case IMAGE_FORMAT_BGR565:
+					SizeOfData = Image->Width * Image->Height * Image->Depth * 2;
+					Data16Bit = CompData = ialloc(SizeOfData);  // Not compressed data
+					if (iread(CompData, 1, SizeOfData) != SizeOfData) {
+						bVtf = IL_FALSE;
+						break;
+					}
+					for (k = 0; k < Image->SizeOfData; k += 3) {
+						Image->Data[k]   =  (Data16Bit[0] & 0x1F) << 3;
+						Image->Data[k+1] = ((Data16Bit[1] & 0x07) << 5) | ((Data16Bit[0] & 0xE0) >> 3);
+						Image->Data[k+2] =   Data16Bit[1] & 0xF8;
+						Data16Bit += 2;
+					}
+					break;
+
+				// Uncompressed 16-bit BGRA data (1-bit alpha).  We have to expand this to 32-bit,
+				//   since DevIL does not handle this internally.
+				//   Something seems strange with this one, but this is how VTFEdit outputs.
+				//   The data is in the file as: gggbbbbb arrrrrgg
+				case IMAGE_FORMAT_BGRA5551:
+					SizeOfData = Image->Width * Image->Height * Image->Depth * 2;
+					Data16Bit = CompData = ialloc(SizeOfData);  // Not compressed data
+					if (iread(CompData, 1, SizeOfData) != SizeOfData) {
+						bVtf = IL_FALSE;
+						break;
+					}
+					for (k = 0; k < Image->SizeOfData; k += 4) {
+						Image->Data[k]   =  (Data16Bit[0] & 0x1F) << 3;
+						Image->Data[k+1] = ((Data16Bit[0] & 0xE0) >> 2) | ((Data16Bit[1] & 0x03) << 6);
+						Image->Data[k+2] =  (Data16Bit[1] & 0x7C) << 1;
+						// 1-bit alpha is either off or on.
+						Image->Data[k+3] = ((Data16Bit[0] & 0x80) == 0x80) ? 0xFF : 0x00;
+						Data16Bit += 2;
+					}
+					break;
+
+				// Same as above, but the alpha channel is unused.
+				case IMAGE_FORMAT_BGRX5551:
+					SizeOfData = Image->Width * Image->Height * Image->Depth * 2;
+					Data16Bit = CompData = ialloc(SizeOfData);  // Not compressed data
+					if (iread(CompData, 1, SizeOfData) != SizeOfData) {
+						bVtf = IL_FALSE;
+						break;
+					}
+					for (k = 0; k < Image->SizeOfData; k += 3) {
+						Image->Data[k]   =  (Data16Bit[0] & 0x1F) << 3;
+						Image->Data[k+1] = ((Data16Bit[0] & 0xE0) >> 2) | ((Data16Bit[1] & 0x03) << 6);
+						Image->Data[k+2] =  (Data16Bit[1] & 0x7C) << 1;
+						Data16Bit += 2;
+					}
+					break;
+			}
+
+			ifree(CompData);
+			CompData = NULL;
+			if (bVtf == IL_FALSE)  //@TODO: Do we need to do any cleanup here?
+				return IL_FALSE;
+		}
+	}
+
+	ilBindImage(CurName);  // Set to parent image first.
+	return ilFixImage();
+}
+
+
+ILboolean VtfInitMipmaps(ILimage *BaseImage, VTFHEAD *Header)
+{
+	ILimage *Image;
+	ILuint Width, Height, Depth, Mipmap;
+
+	Image = BaseImage;
+	Width = BaseImage->Width;  Height = BaseImage->Height;  Depth = BaseImage->Depth;
+
+	for (Mipmap = 1; Mipmap < Header->MipmapCount; Mipmap++) {
+		// 1 is the smallest dimension possible.
+		Width = (Width >> 1) == 0 ? 1 : (Width >> 1);
+		Height = (Height >> 1) == 0 ? 1 : (Height >> 1);
+		Depth = (Depth >> 1) == 0 ? 1 : (Depth >> 1);
+
+		if (Mipmap == 1) {  // Our first mipmap is at Mipmap.
+			Image->Mipmaps = ilNewImage(Width, Height, Depth, BaseImage->Bpp, BaseImage->Bpc);
+			if (Image->Mipmaps == NULL)
+				return IL_FALSE;
+			Image = Image->Mipmaps;
+		}
+		else {  // The other mipmaps are at Mipmap->Next.
+			Image->Next = ilNewImage(Width, Height, Depth, BaseImage->Bpp, BaseImage->Bpc);
+			if (Image->Next == NULL)
+				return IL_FALSE;
+			Image = Image->Next;
+		}
+
+		// ilNewImage does not set these.
+		Image->Format = BaseImage->Format;
+		Image->Type = BaseImage->Type;
+		// The origin should be in the upper left.
+		Image->Origin = IL_ORIGIN_UPPER_LEFT;
+	}
+
+	return IL_TRUE;
+}
+
+#endif//IL_NO_VTF
Index: devil/lib/Makefile.in
===================================================================
--- devil.orig/lib/Makefile.in	2009-01-10 20:54:50.000000000 +0000
+++ devil/lib/Makefile.in	2009-01-10 20:55:39.000000000 +0000
@@ -111,7 +111,7 @@
 	$(il_src)/il_pxr.c $(il_src)/il_xpm.c $(il_src)/il_hdr.c \
 	$(il_src)/il_icns.c $(il_src)/il_jp2.c \
 	$(il_src)/altivec_common.c $(il_src)/altivec_typeconversion.c \
-	$(il_include)/altivec_common.h \
+	$(il_src)/il_vtf.c $(il_include)/altivec_common.h \
 	$(il_include)/altivec_typeconversion.h \
 	$(il_include)/il_alloc.h $(il_include)/il_bits.h \
 	$(il_include)/il_bmp.h $(il_include)/il_dcx.h \
@@ -131,18 +131,19 @@
 	$(il_include)/il_states.h $(il_include)/il_targa.h \
 	$(il_include)/il_wdp.h \
 	$(all_include)/IL/devil_internal_exports.h \
-	$(ilu_src)/ilu_alloc.c $(ilu_src)/ilu_internal.c \
-	$(ilu_src)/ilu_noise.c $(ilu_src)/ilu_scale.c \
-	$(ilu_src)/ilu_error.c $(ilu_src)/ilu_main.c \
-	$(ilu_src)/ilu_rotate.c $(ilu_src)/ilu_scaling.c \
-	$(ilu_src)/ilu_filter.c $(ilu_src)/ilu_manip.c \
-	$(ilu_src)/ilu_scale2d.c $(ilu_src)/ilu_states.c \
-	$(ilu_src)/ilu_filter_rcg.c $(ilu_src)/ilu_mipmap.c \
-	$(ilu_src)/ilu_scale3d.c $(ilu_src)/ilu_utilities.c \
-	$(ilu_src)/ilu_region.c $(ilu_include)/ilu_alloc.h \
-	$(ilu_include)/ilu_filter.h $(ilu_include)/ilu_internal.h \
-	$(ilu_include)/ilu_mipmap.h $(ilu_include)/ilu_region.h \
-	$(ilu_include)/ilu_states.h $(all_include)/IL/ilu_region.h \
+	$(il_include)/il_vtf.h $(ilu_src)/ilu_alloc.c \
+	$(ilu_src)/ilu_internal.c $(ilu_src)/ilu_noise.c \
+	$(ilu_src)/ilu_scale.c $(ilu_src)/ilu_error.c \
+	$(ilu_src)/ilu_main.c $(ilu_src)/ilu_rotate.c \
+	$(ilu_src)/ilu_scaling.c $(ilu_src)/ilu_filter.c \
+	$(ilu_src)/ilu_manip.c $(ilu_src)/ilu_scale2d.c \
+	$(ilu_src)/ilu_states.c $(ilu_src)/ilu_filter_rcg.c \
+	$(ilu_src)/ilu_mipmap.c $(ilu_src)/ilu_scale3d.c \
+	$(ilu_src)/ilu_utilities.c $(ilu_src)/ilu_region.c \
+	$(ilu_include)/ilu_alloc.h $(ilu_include)/ilu_filter.h \
+	$(ilu_include)/ilu_internal.h $(ilu_include)/ilu_mipmap.h \
+	$(ilu_include)/ilu_region.h $(ilu_include)/ilu_states.h \
+	$(all_include)/IL/ilu_region.h \
 	$(ilu_include)/ilu_error/ilu_err-arabic.h \
 	$(ilu_include)/ilu_error/ilu_err-dutch.h \
 	$(ilu_include)/ilu_error/ilu_err-english.h \
@@ -184,7 +185,7 @@
 	libDevIL_la-il_pxr.lo libDevIL_la-il_xpm.lo \
 	libDevIL_la-il_hdr.lo libDevIL_la-il_icns.lo \
 	libDevIL_la-il_jp2.lo libDevIL_la-altivec_common.lo \
-	libDevIL_la-altivec_typeconversion.lo
+	libDevIL_la-altivec_typeconversion.lo libDevIL_la-il_vtf.lo
 @BUILD_IL_TRUE@@BUILD_MONOLITHIC_TRUE at am__objects_2 =  \
 @BUILD_IL_TRUE@@BUILD_MONOLITHIC_TRUE@	$(am__objects_1)
 am__objects_3 = libDevIL_la-ilu_alloc.lo libDevIL_la-ilu_internal.lo \
@@ -240,7 +241,8 @@
 	libIL_la-il_dds-save.lo libIL_la-il_psp.lo libIL_la-il_pix.lo \
 	libIL_la-il_pxr.lo libIL_la-il_xpm.lo libIL_la-il_hdr.lo \
 	libIL_la-il_icns.lo libIL_la-il_jp2.lo \
-	libIL_la-altivec_common.lo libIL_la-altivec_typeconversion.lo
+	libIL_la-altivec_common.lo libIL_la-altivec_typeconversion.lo \
+	libIL_la-il_vtf.lo
 libIL_la_OBJECTS = $(am_libIL_la_OBJECTS)
 libIL_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
 	--mode=link $(CCLD) $(libIL_la_CFLAGS) $(CFLAGS) \
@@ -505,7 +507,7 @@
 	$(il_src)/il_pxr.c $(il_src)/il_xpm.c $(il_src)/il_hdr.c \
 	$(il_src)/il_icns.c $(il_src)/il_jp2.c \
 	$(il_src)/altivec_common.c $(il_src)/altivec_typeconversion.c \
-	$(il_include)/altivec_common.h \
+	$(il_src)/il_vtf.c $(il_include)/altivec_common.h \
 	$(il_include)/altivec_typeconversion.h \
 	$(il_include)/il_alloc.h $(il_include)/il_bits.h \
 	$(il_include)/il_bmp.h $(il_include)/il_dcx.h \
@@ -524,7 +526,8 @@
 	$(il_include)/il_sgi.h $(il_include)/il_stack.h \
 	$(il_include)/il_states.h $(il_include)/il_targa.h \
 	$(il_include)/il_wdp.h \
-	$(all_include)/IL/devil_internal_exports.h
+	$(all_include)/IL/devil_internal_exports.h \
+	$(il_include)/il_vtf.h
 libIL_la_LDFLAGS = @IL_LIBS@ $(AM_LDFLAGS)
 libILU_la_CPPFLAGS = -I $(ilu_include) -I $(all_include)
 libILU_la_CFLAGS = $(CFLAGS) @ILU_CFLAGS@
@@ -689,6 +692,7 @@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libDevIL_la-il_targa.Plo at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libDevIL_la-il_tiff.Plo at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libDevIL_la-il_utility.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libDevIL_la-il_vtf.Plo at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libDevIL_la-il_wal.Plo at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libDevIL_la-il_wdp.Plo at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libDevIL_la-il_xpm.Plo at am__quote@
@@ -800,6 +804,7 @@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libIL_la-il_targa.Plo at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libIL_la-il_tiff.Plo at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libIL_la-il_utility.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libIL_la-il_vtf.Plo at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libIL_la-il_wal.Plo at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libIL_la-il_wdp.Plo at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libIL_la-il_xpm.Plo at am__quote@
@@ -1224,6 +1229,13 @@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libDevIL_la_CPPFLAGS) $(CPPFLAGS) $(libDevIL_la_CFLAGS) $(CFLAGS) -c -o libDevIL_la-altivec_typeconversion.lo `test -f '$(il_src)/altivec_typeconversion.c' || echo '$(srcdir)/'`$(il_src)/altivec_typeconversion.c
 
+libDevIL_la-il_vtf.lo: $(il_src)/il_vtf.c
+ at am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libDevIL_la_CPPFLAGS) $(CPPFLAGS) $(libDevIL_la_CFLAGS) $(CFLAGS) -MT libDevIL_la-il_vtf.lo -MD -MP -MF $(DEPDIR)/libDevIL_la-il_vtf.Tpo -c -o libDevIL_la-il_vtf.lo `test -f '$(il_src)/il_vtf.c' || echo '$(srcdir)/'`$(il_src)/il_vtf.c
+ at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libDevIL_la-il_vtf.Tpo $(DEPDIR)/libDevIL_la-il_vtf.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(il_src)/il_vtf.c' object='libDevIL_la-il_vtf.lo' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libDevIL_la_CPPFLAGS) $(CPPFLAGS) $(libDevIL_la_CFLAGS) $(CFLAGS) -c -o libDevIL_la-il_vtf.lo `test -f '$(il_src)/il_vtf.c' || echo '$(srcdir)/'`$(il_src)/il_vtf.c
+
 libDevIL_la-ilu_alloc.lo: $(ilu_src)/ilu_alloc.c
 @am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libDevIL_la_CPPFLAGS) $(CPPFLAGS) $(libDevIL_la_CFLAGS) $(CFLAGS) -MT libDevIL_la-ilu_alloc.lo -MD -MP -MF $(DEPDIR)/libDevIL_la-ilu_alloc.Tpo -c -o libDevIL_la-ilu_alloc.lo `test -f '$(ilu_src)/ilu_alloc.c' || echo '$(srcdir)/'`$(ilu_src)/ilu_alloc.c
 @am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libDevIL_la-ilu_alloc.Tpo $(DEPDIR)/libDevIL_la-ilu_alloc.Plo
@@ -1812,6 +1824,13 @@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libIL_la_CPPFLAGS) $(CPPFLAGS) $(libIL_la_CFLAGS) $(CFLAGS) -c -o libIL_la-altivec_typeconversion.lo `test -f '$(il_src)/altivec_typeconversion.c' || echo '$(srcdir)/'`$(il_src)/altivec_typeconversion.c
 
+libIL_la-il_vtf.lo: $(il_src)/il_vtf.c
+ at am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libIL_la_CPPFLAGS) $(CPPFLAGS) $(libIL_la_CFLAGS) $(CFLAGS) -MT libIL_la-il_vtf.lo -MD -MP -MF $(DEPDIR)/libIL_la-il_vtf.Tpo -c -o libIL_la-il_vtf.lo `test -f '$(il_src)/il_vtf.c' || echo '$(srcdir)/'`$(il_src)/il_vtf.c
+ at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libIL_la-il_vtf.Tpo $(DEPDIR)/libIL_la-il_vtf.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(il_src)/il_vtf.c' object='libIL_la-il_vtf.lo' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libIL_la_CPPFLAGS) $(CPPFLAGS) $(libIL_la_CFLAGS) $(CFLAGS) -c -o libIL_la-il_vtf.lo `test -f '$(il_src)/il_vtf.c' || echo '$(srcdir)/'`$(il_src)/il_vtf.c
+
 libILU_la-ilu_alloc.lo: $(ilu_src)/ilu_alloc.c
 @am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libILU_la_CPPFLAGS) $(CPPFLAGS) $(libILU_la_CFLAGS) $(CFLAGS) -MT libILU_la-ilu_alloc.lo -MD -MP -MF $(DEPDIR)/libILU_la-ilu_alloc.Tpo -c -o libILU_la-ilu_alloc.lo `test -f '$(ilu_src)/ilu_alloc.c' || echo '$(srcdir)/'`$(ilu_src)/ilu_alloc.c
 @am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libILU_la-ilu_alloc.Tpo $(DEPDIR)/libILU_la-ilu_alloc.Plo

DevIL-1.7.5-CVE-2008-5262.patch:

Index: DevIL-1.7.5-CVE-2008-5262.patch
===================================================================
RCS file: /cvs/extras/rpms/DevIL/F-10/DevIL-1.7.5-CVE-2008-5262.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DevIL-1.7.5-CVE-2008-5262.patch	14 Jan 2009 10:56:06 -0000	1.1
+++ DevIL-1.7.5-CVE-2008-5262.patch	19 Jan 2009 10:02:59 -0000	1.2
@@ -13,7 +13,7 @@
  	if (iread(&a, 1, 1) != 1)
  		return IL_FALSE;
  	while (a != '\n') {
-+		if (count >= 80) {  // Line shouldn't be this long at all.
++		if (count >= sizeof(buff) - 1) {  // Line shouldn't be this long at all.
 +			ilSetError(IL_INVALID_FILE_HEADER);
 +			return IL_FALSE;
 +		}


Index: DevIL.spec
===================================================================
RCS file: /cvs/extras/rpms/DevIL/F-10/DevIL.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- DevIL.spec	14 Jan 2009 10:56:06 -0000	1.10
+++ DevIL.spec	19 Jan 2009 10:02:59 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           DevIL
 Version:        1.7.5
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A cross-platform image library
 Group:          System Environment/Libraries
 License:        LGPLv2
@@ -9,6 +9,7 @@
 Patch0:         DevIL-1.7.5-allegropicfix.patch
 Patch1:         DevIL-1.7.5-il_endian_h.patch
 Patch2:         DevIL-1.7.5-CVE-2008-5262.patch
+Patch3:         DevIL-1.7.5-add-missing-files.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  allegro-devel
 BuildRequires:  lcms-devel
@@ -68,6 +69,7 @@
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 iconv -f iso8859-1 CREDITS -t utf8 > CREDITS.conv
 touch -r CREDITS CREDITS.conv
 mv CREDITS.conv CREDITS
@@ -136,6 +138,10 @@
 
 
 %changelog
+* Mon Jan 19 2009 Hans de Goede <hdegoede at redhat.com> 1.7.5-2
+- Fix missing symbols (rh 480269)
+- Fix off by one error in CVE-2008-5262 check (rh 479864)
+
 * Tue Jan 13 2009 Hans de Goede <hdegoede at redhat.com> 1.7.5-1
 - Update to latest upstream: 1.7.5
 - Add patch to fix CVE-2008-5262



From jwrdegoede at fedoraproject.org  Mon Jan 19 10:03:58 2009
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Mon, 19 Jan 2009 10:03:58 +0000 (UTC)
Subject: rpms/DevIL/F-9 DevIL-1.7.5-add-missing-files.patch, NONE,
	1.1 DevIL-1.7.5-CVE-2008-5262.patch, 1.1, 1.2 DevIL.spec, 1.11, 1.12
Message-ID: <20090119100358.597E7700F8@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/DevIL/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7440

Modified Files:
	DevIL-1.7.5-CVE-2008-5262.patch DevIL.spec 
Added Files:
	DevIL-1.7.5-add-missing-files.patch 
Log Message:
* Mon Jan 19 2009 Hans de Goede <hdegoede at redhat.com> 1.7.5-2
- Fix missing symbols (rh 480269)
- Fix off by one error in CVE-2008-5262 check (rh 479864)


DevIL-1.7.5-add-missing-files.patch:

--- NEW FILE DevIL-1.7.5-add-missing-files.patch ---
Index: devil/lib/Makefile.am
===================================================================
--- devil.orig/lib/Makefile.am	2009-01-10 20:43:26.000000000 +0000
+++ devil/lib/Makefile.am	2009-01-10 20:54:27.000000000 +0000
@@ -69,8 +69,8 @@
 
 libIL_la_CPPFLAGS = -I $(il_include) -I $(all_include)
 libIL_la_CFLAGS = $(CFLAGS) @IL_CFLAGS@
-libIL_la_SOURCES = $(il_src)/il_alloc.c $(il_src)/il_doom.c $(il_src)/il_stack.c $(il_src)/il_pcx.c $(il_src)/il_rle.c $(il_src)/il_bits.c $(il_src)/il_endian.c $(il_src)/il_jpeg.c $(il_src)/il_pic.c $(il_src)/il_sgi.c $(il_src)/il_bmp.c $(il_src)/il_error.c $(il_src)/il_lif.c $(il_src)/il_png.c $(il_src)/il_states.c $(il_src)/il_convbuff.c $(il_src)/il_files.c $(il_src)/il_main.c $(il_src)/il_pnm.c $(il_src)/il_targa.c $(il_src)/il_wdp.c $(il_src)/il_convert.c $(il_src)/il_gif.c $(il_src)/il_manip.c $(il_src)/il_profiles.c $(il_src)/il_tiff.c $(il_src)/il_cut.c $(il_src)/il_header.c $(il_src)/il_mdl.c $(il_src)/il_quantizer.c $(il_src)/il_utility.c $(il_src)/il_dcx.c $(il_src)/il_icon.c $(il_src)/il_mng.c $(il_src)/il_raw.c $(il_src)/il_wal.c $(il_src)/il_dds.c $(il_src)/il_internal.c $(il_src)/il_pal.c $(il_src)/il_rawdata.c $(il_src)/il_devil.c $(il_src)/il_io.c $(il_src)/il_pcd.c $(il_src)/il_register.c $(il_src)/il_psd.c $(il_src)/il_fastconv.c $(il_src)/il_neuquant.c $
 (il_src)/il_dds-save.c $(il_src)/il_psp.c $(il_src)/il_pix.c $(il_src)/il_pxr.c $(il_src)/il_xpm.c $(il_src)/il_hdr.c $(il_src)/il_icns.c $(il_src)/il_jp2.c $(il_src)/altivec_common.c $(il_src)/altivec_typeconversion.c
-libIL_la_SOURCES += $(il_include)/altivec_common.h $(il_include)/altivec_typeconversion.h $(il_include)/il_alloc.h $(il_include)/il_bits.h $(il_include)/il_bmp.h $(il_include)/il_dcx.h $(il_include)/il_dds.h $(il_include)/il_doompal.h $(il_include)/il_endian.h $(il_include)/il_exr.h $(il_include)/il_files.h $(il_include)/il_gif.h $(il_include)/il_hdr.h $(il_include)/il_icns.h $(il_include)/il_icon.h $(il_include)/il_internal.h $(il_include)/il_jp2.h $(il_include)/il_jpeg.h $(il_include)/il_lif.h $(il_include)/il_manip.h $(il_include)/il_mdl.h $(il_include)/il_pal.h $(il_include)/il_pcx.h $(il_include)/il_pic.h $(il_include)/il_pnm.h $(il_include)/il_psd.h $(il_include)/il_psp.h $(il_include)/il_q2pal.h $(il_include)/il_register.h $(il_include)/il_rle.h $(il_include)/il_sgi.h $(il_include)/il_stack.h $(il_include)/il_states.h $(il_include)/il_targa.h $(il_include)/il_wdp.h $(all_include)/IL/devil_internal_exports.h
+libIL_la_SOURCES = $(il_src)/il_alloc.c $(il_src)/il_doom.c $(il_src)/il_stack.c $(il_src)/il_pcx.c $(il_src)/il_rle.c $(il_src)/il_bits.c $(il_src)/il_endian.c $(il_src)/il_jpeg.c $(il_src)/il_pic.c $(il_src)/il_sgi.c $(il_src)/il_bmp.c $(il_src)/il_error.c $(il_src)/il_lif.c $(il_src)/il_png.c $(il_src)/il_states.c $(il_src)/il_convbuff.c $(il_src)/il_files.c $(il_src)/il_main.c $(il_src)/il_pnm.c $(il_src)/il_targa.c $(il_src)/il_wdp.c $(il_src)/il_convert.c $(il_src)/il_gif.c $(il_src)/il_manip.c $(il_src)/il_profiles.c $(il_src)/il_tiff.c $(il_src)/il_cut.c $(il_src)/il_header.c $(il_src)/il_mdl.c $(il_src)/il_quantizer.c $(il_src)/il_utility.c $(il_src)/il_dcx.c $(il_src)/il_icon.c $(il_src)/il_mng.c $(il_src)/il_raw.c $(il_src)/il_wal.c $(il_src)/il_dds.c $(il_src)/il_internal.c $(il_src)/il_pal.c $(il_src)/il_rawdata.c $(il_src)/il_devil.c $(il_src)/il_io.c $(il_src)/il_pcd.c $(il_src)/il_register.c $(il_src)/il_psd.c $(il_src)/il_fastconv.c $(il_src)/il_neuquant.c $
 (il_src)/il_dds-save.c $(il_src)/il_psp.c $(il_src)/il_pix.c $(il_src)/il_pxr.c $(il_src)/il_xpm.c $(il_src)/il_hdr.c $(il_src)/il_icns.c $(il_src)/il_jp2.c $(il_src)/altivec_common.c $(il_src)/altivec_typeconversion.c $(il_src)/il_vtf.c
+libIL_la_SOURCES += $(il_include)/altivec_common.h $(il_include)/altivec_typeconversion.h $(il_include)/il_alloc.h $(il_include)/il_bits.h $(il_include)/il_bmp.h $(il_include)/il_dcx.h $(il_include)/il_dds.h $(il_include)/il_doompal.h $(il_include)/il_endian.h $(il_include)/il_exr.h $(il_include)/il_files.h $(il_include)/il_gif.h $(il_include)/il_hdr.h $(il_include)/il_icns.h $(il_include)/il_icon.h $(il_include)/il_internal.h $(il_include)/il_jp2.h $(il_include)/il_jpeg.h $(il_include)/il_lif.h $(il_include)/il_manip.h $(il_include)/il_mdl.h $(il_include)/il_pal.h $(il_include)/il_pcx.h $(il_include)/il_pic.h $(il_include)/il_pnm.h $(il_include)/il_psd.h $(il_include)/il_psp.h $(il_include)/il_q2pal.h $(il_include)/il_register.h $(il_include)/il_rle.h $(il_include)/il_sgi.h $(il_include)/il_stack.h $(il_include)/il_states.h $(il_include)/il_targa.h $(il_include)/il_wdp.h $(all_include)/IL/devil_internal_exports.h $(il_include)/il_vtf.h
 libIL_la_LDFLAGS = @IL_LIBS@ $(AM_LDFLAGS)
 
 libILU_la_CPPFLAGS = -I $(ilu_include) -I $(all_include)
Index: devil/src-IL/include/il_vtf.h
===================================================================
--- /dev/null	1970-01-01 00:00:00.000000000 +0000
+++ devil/src-IL/include/il_vtf.h	2009-01-10 20:54:27.000000000 +0000
@@ -0,0 +1,130 @@
+//-----------------------------------------------------------------------------
+//
+// ImageLib Sources
+// Copyright (C) 2000-2008 by Denton Woods
+// Last modified: 12/27/2008
+//
+// Filename: src-IL/include/il_vtf.h
+//
+// Description: Reads from and writes to a Valve Texture Format (.vtf) file.
+//                These are used in Valve's Source games.  VTF specs available
+//                from http://developer.valvesoftware.com/wiki/VTF.
+//
+//-----------------------------------------------------------------------------
+
+
+#ifndef VTF_H
+#define VTF_H
+
+#include "il_internal.h"
+
+#ifdef _MSC_VER
+#pragma pack(push, vtf_struct, 1)
+#elif defined(MACOSX) || defined(__GNUC__)
+#pragma pack(1)
+#endif
+
+typedef struct VTFHEAD
+{
+	ILubyte		Signature[4];		// File signature ("VTF\0").
+	ILuint		Version[2];			// version[0].version[1] (currently 7.2).
+	ILuint		HeaderSize;			// Size of the header struct (16 byte aligned; currently 80 bytes).
+	ILushort	Width;				// Width of the largest mipmap in pixels. Must be a power of 2.
+	ILushort	Height;				// Height of the largest mipmap in pixels. Must be a power of 2.
+	ILuint		Flags;				// VTF flags.
+	ILushort	Frames;				// Number of frames, if animated (1 for no animation).
+	ILushort	FirstFrame;			// First frame in animation (0 based).
+	ILubyte		Padding0[4];		// reflectivity padding (16 byte alignment).
+	ILfloat		Reflectivity[3];	// reflectivity vector.
+	ILubyte		Padding1[4];		// reflectivity padding (8 byte packing).
+	ILfloat		BumpmapScale;		// Bumpmap scale.
+	ILuint		HighResImageFormat;	// High resolution image format.
+	ILubyte		MipmapCount;		// Number of mipmaps.
+	ILint		LowResImageFormat;	// Low resolution image format (always DXT1).
+	ILubyte		LowResImageWidth;	// Low resolution image width.
+	ILubyte		LowResImageHeight;	// Low resolution image height.
+	ILushort	Depth;				// Depth of the largest mipmap in pixels.
+									// Must be a power of 2. Can be 0 or 1 for a 2D texture (v7.2 only).
+} IL_PACKSTRUCT VTFHEAD;
+
+#if defined(MACOSX) || defined(__GNUC__)
+#pragma pack()
+#elif _MSC_VER
+#pragma pack(pop, vtf_struct)
+#endif
+
+enum
+{
+	IMAGE_FORMAT_NONE = -1,
+	IMAGE_FORMAT_RGBA8888 = 0,
+	IMAGE_FORMAT_ABGR8888,
+	IMAGE_FORMAT_RGB888,
+	IMAGE_FORMAT_BGR888,
+	IMAGE_FORMAT_RGB565,
+	IMAGE_FORMAT_I8,
+	IMAGE_FORMAT_IA88,
+	IMAGE_FORMAT_P8,
+	IMAGE_FORMAT_A8,
+	IMAGE_FORMAT_RGB888_BLUESCREEN,
+	IMAGE_FORMAT_BGR888_BLUESCREEN,
+	IMAGE_FORMAT_ARGB8888,
+	IMAGE_FORMAT_BGRA8888,
+	IMAGE_FORMAT_DXT1,
+	IMAGE_FORMAT_DXT3,
+	IMAGE_FORMAT_DXT5,
+	IMAGE_FORMAT_BGRX8888,
+	IMAGE_FORMAT_BGR565,
+	IMAGE_FORMAT_BGRX5551,
+	IMAGE_FORMAT_BGRA4444,
+	IMAGE_FORMAT_DXT1_ONEBITALPHA,
+	IMAGE_FORMAT_BGRA5551,
+	IMAGE_FORMAT_UV88,
+	IMAGE_FORMAT_UVWQ8888,
+	IMAGE_FORMAT_RGBA16161616F,
+	IMAGE_FORMAT_RGBA16161616,
+	IMAGE_FORMAT_UVLX8888
+};
+
+enum
+{
+	TEXTUREFLAGS_POINTSAMPLE = 0x00000001,
+	TEXTUREFLAGS_TRILINEAR = 0x00000002,
+	TEXTUREFLAGS_CLAMPS = 0x00000004,
+	TEXTUREFLAGS_CLAMPT = 0x00000008,
+	TEXTUREFLAGS_ANISOTROPIC = 0x00000010,
+	TEXTUREFLAGS_HINT_DXT5 = 0x00000020,
+	TEXTUREFLAGS_NOCOMPRESS = 0x00000040,
+	TEXTUREFLAGS_NORMAL = 0x00000080,
+	TEXTUREFLAGS_NOMIP = 0x00000100,
+	TEXTUREFLAGS_NOLOD = 0x00000200,
+	TEXTUREFLAGS_MINMIP = 0x00000400,
+	TEXTUREFLAGS_PROCEDURAL = 0x00000800,
+	TEXTUREFLAGS_ONEBITALPHA = 0x00001000,
+	TEXTUREFLAGS_EIGHTBITALPHA = 0x00002000,
+	TEXTUREFLAGS_ENVMAP = 0x00004000,
+	TEXTUREFLAGS_RENDERTARGET = 0x00008000,
+	TEXTUREFLAGS_DEPTHRENDERTARGET = 0x00010000,
+	TEXTUREFLAGS_NODEBUGOVERRIDE = 0x00020000,
+	TEXTUREFLAGS_SINGLECOPY = 0x00040000,
+	TEXTUREFLAGS_ONEOVERMIPLEVELINALPHA = 0x00080000,
+	TEXTUREFLAGS_PREMULTCOLORBYONEOVERMIPLEVEL = 0x00100000,
+	TEXTUREFLAGS_NORMALTODUDV = 0x00200000,
+	TEXTUREFLAGS_ALPHATESTMIPGENERATION = 0x00400000,
+	TEXTUREFLAGS_NODEPTHBUFFER = 0x00800000,
+	TEXTUREFLAGS_NICEFILTERED = 0x01000000,
+	TEXTUREFLAGS_CLAMPU = 0x02000000
+};
+
+
+
+// Internal functions
+ILboolean	iIsValidVtf(void);
+ILboolean	iGetVtfHead(VTFHEAD *Header);
+ILboolean	iCheckVtf(VTFHEAD *Header);
+ILboolean	iLoadVtfInternal(void);
+ILboolean	VtfInitMipmaps(ILimage *BaseImage, VTFHEAD *Header);
+ILboolean	VtfReadData(void);
+ILboolean	VtfDecompressDXT1(ILimage *Image);
+ILboolean	VtfDecompressDXT5(ILimage *Image);
+
+#endif//VTF_H
Index: devil/src-IL/src/il_vtf.c
===================================================================
--- /dev/null	1970-01-01 00:00:00.000000000 +0000
+++ devil/src-IL/src/il_vtf.c	2009-01-10 20:54:27.000000000 +0000
@@ -0,0 +1,612 @@
+//-----------------------------------------------------------------------------
+//
+// ImageLib Sources
+// Copyright (C) 2000-2008 by Denton Woods
+// Last modified: 12/29/2008
+//
+// Filename: src-IL/src/il_vtf.c
+//
+// Description: Reads from and writes to a Valve Texture Format (.vtf) file.
+//                These are used in Valve's Source games.  VTF specs available
+//                from http://developer.valvesoftware.com/wiki/VTF.
+//
+//-----------------------------------------------------------------------------
+
+
+#include "il_internal.h"
+#ifndef IL_NO_VTF
+#include "il_vtf.h"
+#include "il_dds.h"
+
+// the max and min functions are not present, at least not on unixes
+#ifndef max
+	#define max( a, b ) ( ((a) > (b)) ? (a) : (b) )
+#endif
+
+#ifndef min
+	#define min( a, b ) ( ((a) < (b)) ? (a) : (b) )
+#endif
+
+//@TODO: Get rid of these globals.
+//static VTFHEAD Head;
+
+
+//! Checks if the file specified in FileName is a valid VTF file.
+ILboolean ilIsValidVtf(ILconst_string FileName)
+{
+	ILHANDLE	VtfFile;
+	ILboolean	bVtf = IL_FALSE;
+	
+	if (!iCheckExtension(FileName, IL_TEXT("vtf"))) {
+		ilSetError(IL_INVALID_EXTENSION);
+		return bVtf;
+	}
+	
+	VtfFile = iopenr(FileName);
+	if (VtfFile == NULL) {
+		ilSetError(IL_COULD_NOT_OPEN_FILE);
+		return bVtf;
+	}
+	
+	bVtf = ilIsValidVtfF(VtfFile);
+	icloser(VtfFile);
+	
+	return bVtf;
+}
+
+
+//! Checks if the ILHANDLE contains a valid VTF file at the current position.
+ILboolean ilIsValidVtfF(ILHANDLE File)
+{
+	ILuint		FirstPos;
+	ILboolean	bRet;
+	
+	iSetInputFile(File);
+	FirstPos = itell();
+	bRet = iIsValidVtf();
+	iseek(FirstPos, IL_SEEK_SET);
+	
+	return bRet;
+}
+
+
+//! Checks if Lump is a valid VTF lump.
+ILboolean ilIsValidVtfL(const void *Lump, ILuint Size)
+{
+	iSetInputLump(Lump, Size);
+	return iIsValidVtf();
+}
+
+
+// Internal function used to get the VTF header from the current file.
+ILboolean iGetVtfHead(VTFHEAD *Header)
+{
+	iread(Header->Signature, 1, 4);
+	Header->Version[0] = GetLittleUInt();
+	Header->Version[1] = GetLittleUInt();
+	Header->HeaderSize = GetLittleUInt();
+	Header->Width = GetLittleUShort();
+	Header->Height = GetLittleUShort();
+	Header->Flags = GetLittleUInt();
+	Header->Frames = GetLittleUShort();
+	Header->FirstFrame = GetLittleUShort();
+	iseek(4, IL_SEEK_CUR);  // Padding
+	Header->Reflectivity[0] = GetLittleFloat();
+	Header->Reflectivity[1] = GetLittleFloat();
+	Header->Reflectivity[2] = GetLittleFloat();
+	iseek(4, IL_SEEK_CUR);  // Padding
+	Header->BumpmapScale = GetLittleFloat();
+	Header->HighResImageFormat = GetLittleUInt();
+	Header->MipmapCount = (ILubyte)igetc();
+	Header->LowResImageFormat = GetLittleInt();
+	Header->LowResImageWidth = (ILubyte)igetc();
+	Header->LowResImageHeight = (ILubyte)igetc();
+	Header->Depth = GetLittleUShort();
+
+	iseek(Header->HeaderSize - sizeof(VTFHEAD), IL_SEEK_CUR);
+
+	return IL_TRUE;
+}
+
+
+// Internal function to get the header and check it.
+ILboolean iIsValidVtf()
+{
+	VTFHEAD Head;
+
+	if (!iGetVtfHead(&Head))
+		return IL_FALSE;
+	iseek(-(ILint)sizeof(VTFHEAD), IL_SEEK_CUR);
+	
+	return iCheckVtf(&Head);
+}
+
+
+//@TODO: Add more checks.
+// Should we check for Frames, MipmapCount and Depth != 0?
+
+// Internal function used to check if the HEADER is a valid VTF header.
+ILboolean iCheckVtf(VTFHEAD *Header)
+{
+	// The file signature is "VTF\0".
+	if ((Header->Signature[0] != 'V') || (Header->Signature[1] != 'T') || (Header->Signature[2] != 'F')
+		|| (Header->Signature[3] != 0))
+		return IL_FALSE;
+	// Are there other versions available yet?
+	if (Header->Version[0] != 7)
+		return IL_FALSE;
+	// We have 7.0 through 7.4 as of 12/27/2008.
+	if (Header->Version[1] > 4)
+		return IL_FALSE;
+	// May change in future version of the specifications.
+	//  80 is through version 7.2, and 96/104 are through 7.4.
+	//  This must be 16-byte aligned, but something is outputting headers with 104.
+	if ((Header->HeaderSize != 80) && (Header->HeaderSize != 96) && (Header->HeaderSize != 104))
+		return IL_FALSE;
+
+	// 0 is an invalid dimension
+	if (Header->Width == 0 || Header->Height == 0)
+		return IL_FALSE;
+	// Width and Height must be powers of 2.
+	if ((ilNextPower2(Header->Width) != Header->Width) || (ilNextPower2(Header->Height) != Header->Height))
+		return IL_FALSE;
+	if ((ilNextPower2(Header->LowResImageWidth) != Header->LowResImageWidth)
+		|| (ilNextPower2(Header->LowResImageHeight) != Header->LowResImageHeight))
+		return IL_FALSE;
+	// In addition, the LowResImage has to have dimensions no greater than 16.
+	if ((Header->LowResImageWidth > 16) || (Header->LowResImageHeight > 16)
+		|| (Header->LowResImageWidth == 0) || (Header->LowResImageHeight == 0))
+		return IL_FALSE;
+	// And the LowResImage has to have dimensions less than or equal to the main image.
+	if ((Header->LowResImageWidth > Header->Width) || (Header->LowResImageHeight > Header->Height))
+		return IL_FALSE;
+	// The LowResImage must be in DXT1 format.
+	if (Header->LowResImageFormat != IMAGE_FORMAT_DXT1)
+		return IL_FALSE;
+	
+	return IL_TRUE;
+}
+
+
+//! Reads a VTF file
+ILboolean ilLoadVtf(ILconst_string FileName)
+{
+	ILHANDLE	VtfFile;
+	ILboolean	bVtf = IL_FALSE;
+	
+	VtfFile = iopenr(FileName);
+	if (VtfFile == NULL) {
+		ilSetError(IL_COULD_NOT_OPEN_FILE);
+		return bVtf;
+	}
+
+	bVtf = ilLoadVtfF(VtfFile);
+	icloser(VtfFile);
+
+	return bVtf;
+}
+
+
+//! Reads an already-opened VTF file
+ILboolean ilLoadVtfF(ILHANDLE File) {
+	ILuint		FirstPos;
+	ILboolean	bRet;
+	
+	iSetInputFile(File);
+	FirstPos = itell();
+	bRet = iLoadVtfInternal();
+	iseek(FirstPos, IL_SEEK_SET);
+	
+	return bRet;
+}
+
+
+//! Reads from a memory "lump" that contains a VTF
+ILboolean ilLoadVtfL(const void *Lump, ILuint Size)
+{
+	iSetInputLump(Lump, Size);
+	return iLoadVtfInternal();
+}
+
+
+// Internal function used to load the VTF.
+ILboolean iLoadVtfInternal()
+{
+	ILboolean	bVtf = IL_TRUE;
+	ILimage		*Image, *BaseImage;
+	ILenum		Format, Type;
+	ILint		Frame, Mipmap;
+	ILuint		SizeOfData, Channels, k;
+	ILubyte		*CompData = NULL, SwapVal, *Data16Bit, *Temp;
+	VTFHEAD		Head;
+	ILuint		CurName;
+
+	if (iCurImage == NULL) {
+		ilSetError(IL_ILLEGAL_OPERATION);
+		return IL_FALSE;
+	}
+	CurName = ilGetCurName();
+	
+	if (!iGetVtfHead(&Head))
+		return IL_FALSE;
+	if (!iCheckVtf(&Head)) {
+		ilSetError(IL_INVALID_FILE_HEADER);
+		return IL_FALSE;
+	}
+
+	//@TODO: Take care of animation chains soon.
+	//if (Head.Frames > 1) {
+	//	ilSetError(IL_FORMAT_NOT_SUPPORTED);
+	//	return IL_FALSE;
+	//}
+	//@TODO: Find out how to tell whether the environment map is cubic or spherical.
+	if (Head.Flags & TEXTUREFLAGS_ENVMAP) {
+		ilSetError(IL_FORMAT_NOT_SUPPORTED);
+		return IL_FALSE;
+	}
+
+	// Skip the low resolution image.  This is just a thumbnail.
+	//  The block size is 8, and the compression ratio is 6:1.
+	SizeOfData = max(Head.LowResImageWidth * Head.LowResImageHeight / 2, 8);
+	iseek(SizeOfData, IL_SEEK_CUR);
+
+	//@TODO: Make this a helper function that set channels, bpc and format.
+	switch (Head.HighResImageFormat)
+	{
+		case IMAGE_FORMAT_DXT1:  //@TODO: Should we make DXT1 channels = 3?
+		case IMAGE_FORMAT_DXT1_ONEBITALPHA:
+		case IMAGE_FORMAT_DXT3:
+		case IMAGE_FORMAT_DXT5:
+			Channels = 4;
+			Format = IL_RGBA;
+			Type = IL_UNSIGNED_BYTE;
+			break;
+		case IMAGE_FORMAT_BGR888:
+		case IMAGE_FORMAT_BGR888_BLUESCREEN:
+			Channels = 3;
+			Format = IL_BGR;
+			Type = IL_UNSIGNED_BYTE;
+			break;
+		case IMAGE_FORMAT_BGRA8888:
+			Channels = 4;
+			Format = IL_BGRA;
+			Type = IL_UNSIGNED_BYTE;
+			break;
+		case IMAGE_FORMAT_BGRX8888:
+			Channels = 3;
+			Format = IL_BGR;
+			Type = IL_UNSIGNED_BYTE;
+			break;
+		case IMAGE_FORMAT_RGB888:
+		case IMAGE_FORMAT_RGB888_BLUESCREEN:
+			Channels = 3;
+			Format = IL_RGB;
+			Type = IL_UNSIGNED_BYTE;
+			break;
+		case IMAGE_FORMAT_RGBA8888:
+			Channels = 4;
+			Format = IL_RGBA;
+			Type = IL_UNSIGNED_BYTE;
+			break;
+		case IMAGE_FORMAT_RGBA16161616:  // 16-bit shorts
+			Channels = 4;
+			Format = IL_RGBA;
+			Type = IL_UNSIGNED_SHORT;
+			break;
+		case IMAGE_FORMAT_RGBA16161616F:  // 16-bit floats
+			Channels = 4;
+			Format = IL_RGBA;
+			Type = IL_FLOAT;
+			break;
+		case IMAGE_FORMAT_I8:  // 8-bit luminance data
+			Channels = 1;
+			Format = IL_LUMINANCE;
+			Type = IL_UNSIGNED_BYTE;
+			break;
+		case IMAGE_FORMAT_IA88:  // 8-bit luminance and alpha data
+			Channels = 2;
+			Format = IL_LUMINANCE_ALPHA;
+			Type = IL_UNSIGNED_BYTE;
+			break;
+		case IMAGE_FORMAT_A8:  // 8-bit alpha data
+			Channels = 1;
+			Format = IL_ALPHA;
+			Type = IL_UNSIGNED_BYTE;
+			break;
+		case IMAGE_FORMAT_ARGB8888:
+			Channels = 4;
+			Format = IL_BGRA;
+			Type = IL_UNSIGNED_BYTE;
+			break;
+		case IMAGE_FORMAT_ABGR8888:
+			Channels = 4;
+			Format = IL_RGBA;
+			Type = IL_UNSIGNED_BYTE;
+			break;
+		case IMAGE_FORMAT_RGB565:
+			Channels = 3;
+			Format = IL_RGB;
+			Type = IL_UNSIGNED_BYTE;
+			break;
+		case IMAGE_FORMAT_BGR565:
+			Channels = 3;
+			Format = IL_BGR;
+			Type = IL_UNSIGNED_BYTE;
+			break;
+		case IMAGE_FORMAT_BGRA5551:
+			Channels = 4;
+			Format = IL_BGRA;
+			Type = IL_UNSIGNED_BYTE;
+			break;
+		case IMAGE_FORMAT_BGRX5551:  // Unused alpha channel
+			Channels = 3;
+			Format = IL_BGR;
+			Type = IL_UNSIGNED_BYTE;
+			break;
+
+		default:
+			ilSetError(IL_FORMAT_NOT_SUPPORTED);
+			return IL_FALSE;
+	}
+
+	if (!ilTexImage(Head.Width, Head.Height, Head.Depth, Channels, Format, Type, NULL))
+		return IL_FALSE;
+	// The origin should be in the upper left.
+	iCurImage->Origin = IL_ORIGIN_UPPER_LEFT;
+	// Create any mipmaps.
+	VtfInitMipmaps(iCurImage, &Head);
+
+	// Create our animation chain
+	BaseImage = Image = iCurImage;  // Top-level image
+	for (Frame = 1; Frame < Head.Frames; Frame++) {
+		Image->Next = ilNewImageFull(Head.Width, Head.Height, Head.Depth, Channels, Format, Type, NULL);
+		if (Image->Next == NULL)
+			return IL_FALSE;
+		Image = Image->Next;
+		// The origin should be in the upper left.
+		Image->Origin = IL_ORIGIN_UPPER_LEFT;
+
+		// Create our mipmaps for each frame.
+		VtfInitMipmaps(Image, &Head);
+	}
+
+	// We want to put the smallest mipmap at the end, but it is first in the file, so we count backwards.
+	for (Mipmap = Head.MipmapCount - 1; Mipmap >= 0; Mipmap--) {
+		// Frames are in the normal order.
+		for (Frame = 0; Frame < Head.Frames; Frame++) {
+			//@TODO: Would probably be quicker to do the linked list traversal manually here.
+			ilBindImage(CurName);
+			ilActiveImage(Frame);
+			ilActiveMipmap(Mipmap);
+			Image = iCurImage;
+
+			switch (Head.HighResImageFormat)
+			{
+				// DXT1 compression
+				case IMAGE_FORMAT_DXT1:
+				case IMAGE_FORMAT_DXT1_ONEBITALPHA:
+					// The block size is 8.
+					SizeOfData = max(Image->Width * Image->Height * Image->Depth / 2, 8);
+					CompData = ialloc(SizeOfData);  // Gives a 6:1 compression ratio (or 8:1 for DXT1 with alpha)
+					iread(CompData, 1, SizeOfData);
+					if (ilGetInteger(IL_KEEP_DXTC_DATA) == IL_TRUE) {
+						Image->DxtcSize = SizeOfData;
+						Image->DxtcData = CompData;
+						Image->DxtcFormat = IL_DXT5;
+						CompData = NULL;
+					}
+					bVtf = DecompressDXT1(Image, CompData);
+					break;
+
+				// DXT3 compression
+				case IMAGE_FORMAT_DXT3:
+					// The block size is 16.
+					SizeOfData = max(Image->Width * Image->Height * Image->Depth, 16);
+					CompData = ialloc(SizeOfData);  // Gives a 4:1 compression ratio
+					iread(CompData, 1, SizeOfData);
+					if (ilGetInteger(IL_KEEP_DXTC_DATA) == IL_TRUE) {
+						Image->DxtcSize = SizeOfData;
+						Image->DxtcData = CompData;
+						Image->DxtcFormat = IL_DXT3;
+						CompData = NULL;
+					}
+					bVtf = DecompressDXT3(Image, CompData);
+					break;
+
+				// DXT5 compression
+				case IMAGE_FORMAT_DXT5:
+					// The block size is 16.
+					SizeOfData = max(Image->Width * Image->Height * Image->Depth, 16);
+					CompData = ialloc(SizeOfData);  // Gives a 4:1 compression ratio
+					iread(CompData, 1, SizeOfData);
+					if (ilGetInteger(IL_KEEP_DXTC_DATA) == IL_TRUE) {
+						Image->DxtcSize = SizeOfData;
+						Image->DxtcData = CompData;
+						Image->DxtcFormat = IL_DXT5;
+						CompData = NULL;
+					}
+					bVtf = DecompressDXT5(Image, CompData);
+					break;
+
+				// Uncompressed BGR(A) data (24-bit and 32-bit)
+				case IMAGE_FORMAT_BGR888:
+				case IMAGE_FORMAT_BGRA8888:
+				// Uncompressed RGB(A) data (24-bit and 32-bit)
+				case IMAGE_FORMAT_RGB888:
+				case IMAGE_FORMAT_RGBA8888:
+				// Uncompressed 16-bit shorts
+				case IMAGE_FORMAT_RGBA16161616:
+				// Luminance data only
+				case IMAGE_FORMAT_I8:
+				// Luminance and alpha data
+				case IMAGE_FORMAT_IA88:
+				// Alpha data only
+				case IMAGE_FORMAT_A8:
+				// We will ignore the part about the bluescreen right now.
+				//   I could not find any information about it.
+				case IMAGE_FORMAT_RGB888_BLUESCREEN:
+				case IMAGE_FORMAT_BGR888_BLUESCREEN:
+					// Just copy the data over - no compression.
+					if (iread(Image->Data, 1, Image->SizeOfData) != Image->SizeOfData)
+						bVtf = IL_FALSE;
+					else
+						bVtf = IL_TRUE;
+					break;
+
+				// Uncompressed 24-bit data with an unused alpha channel (we discard it)
+				case IMAGE_FORMAT_BGRX8888:
+					SizeOfData = Image->Width * Image->Height * Image->Depth * 3;
+					Temp = CompData = ialloc(SizeOfData / 3 * 4);  // Not compressed data
+					if (iread(CompData, 1, SizeOfData / 3 * 4) != SizeOfData / 3 * 4) {
+						bVtf = IL_FALSE;
+						break;
+					}
+					for (k = 0; k < SizeOfData; k += 3) {
+						Image->Data[k]   = Temp[0];
+						Image->Data[k+1] = Temp[1];
+						Image->Data[k+2] = Temp[2];
+						Temp += 4;
+					}
+
+					break;
+
+				// Uncompressed 16-bit floats (must be converted to 32-bit)
+				case IMAGE_FORMAT_RGBA16161616F:
+					SizeOfData = Image->Width * Image->Height * Image->Depth * Image->Bpp * 2;
+					CompData = ialloc(SizeOfData);  // Not compressed data
+					if (iread(CompData, 1, SizeOfData) != SizeOfData) {
+						bVtf = IL_FALSE;
+						break;
+					}
+					bVtf = iConvFloat16ToFloat32((ILuint*)Image->Data, (ILushort*)CompData, SizeOfData / 2);
+					break;
+
+				// Uncompressed 32-bit ARGB and ABGR data.  DevIL does not handle this
+				//   internally, so we have to swap values.
+				case IMAGE_FORMAT_ARGB8888:
+				case IMAGE_FORMAT_ABGR8888:
+					if (iread(Image->Data, 1, Image->SizeOfData) != Image->SizeOfData) {
+						bVtf = IL_FALSE;
+						break;
+					}
+					else {
+						bVtf = IL_TRUE;
+					}
+					// Swap the data
+					for (k = 0; k < Image->SizeOfData; k += 4) {
+						SwapVal = Image->Data[k];
+						Image->Data[k]   = Image->Data[k+3];
+						Image->Data[k+3] = SwapVal;
+						SwapVal = Image->Data[k+1];
+						Image->Data[k+1] = Image->Data[k+2];
+						Image->Data[k+2] = SwapVal;
+					}
+					break;
+
+				// Uncompressed 16-bit RGB and BGR data.  We have to expand this to 24-bit, since
+				//   DevIL does not handle this internally.
+				//   The data is in the file as: gggbbbbb rrrrrrggg
+				case IMAGE_FORMAT_RGB565:
+				case IMAGE_FORMAT_BGR565:
+					SizeOfData = Image->Width * Image->Height * Image->Depth * 2;
+					Data16Bit = CompData = ialloc(SizeOfData);  // Not compressed data
+					if (iread(CompData, 1, SizeOfData) != SizeOfData) {
+						bVtf = IL_FALSE;
+						break;
+					}
+					for (k = 0; k < Image->SizeOfData; k += 3) {
+						Image->Data[k]   =  (Data16Bit[0] & 0x1F) << 3;
+						Image->Data[k+1] = ((Data16Bit[1] & 0x07) << 5) | ((Data16Bit[0] & 0xE0) >> 3);
+						Image->Data[k+2] =   Data16Bit[1] & 0xF8;
+						Data16Bit += 2;
+					}
+					break;
+
+				// Uncompressed 16-bit BGRA data (1-bit alpha).  We have to expand this to 32-bit,
+				//   since DevIL does not handle this internally.
+				//   Something seems strange with this one, but this is how VTFEdit outputs.
+				//   The data is in the file as: gggbbbbb arrrrrgg
+				case IMAGE_FORMAT_BGRA5551:
+					SizeOfData = Image->Width * Image->Height * Image->Depth * 2;
+					Data16Bit = CompData = ialloc(SizeOfData);  // Not compressed data
+					if (iread(CompData, 1, SizeOfData) != SizeOfData) {
+						bVtf = IL_FALSE;
+						break;
+					}
+					for (k = 0; k < Image->SizeOfData; k += 4) {
+						Image->Data[k]   =  (Data16Bit[0] & 0x1F) << 3;
+						Image->Data[k+1] = ((Data16Bit[0] & 0xE0) >> 2) | ((Data16Bit[1] & 0x03) << 6);
+						Image->Data[k+2] =  (Data16Bit[1] & 0x7C) << 1;
+						// 1-bit alpha is either off or on.
+						Image->Data[k+3] = ((Data16Bit[0] & 0x80) == 0x80) ? 0xFF : 0x00;
+						Data16Bit += 2;
+					}
+					break;
+
+				// Same as above, but the alpha channel is unused.
+				case IMAGE_FORMAT_BGRX5551:
+					SizeOfData = Image->Width * Image->Height * Image->Depth * 2;
+					Data16Bit = CompData = ialloc(SizeOfData);  // Not compressed data
+					if (iread(CompData, 1, SizeOfData) != SizeOfData) {
+						bVtf = IL_FALSE;
+						break;
+					}
+					for (k = 0; k < Image->SizeOfData; k += 3) {
+						Image->Data[k]   =  (Data16Bit[0] & 0x1F) << 3;
+						Image->Data[k+1] = ((Data16Bit[0] & 0xE0) >> 2) | ((Data16Bit[1] & 0x03) << 6);
+						Image->Data[k+2] =  (Data16Bit[1] & 0x7C) << 1;
+						Data16Bit += 2;
+					}
+					break;
+			}
+
+			ifree(CompData);
+			CompData = NULL;
+			if (bVtf == IL_FALSE)  //@TODO: Do we need to do any cleanup here?
+				return IL_FALSE;
+		}
+	}
+
+	ilBindImage(CurName);  // Set to parent image first.
+	return ilFixImage();
+}
+
+
+ILboolean VtfInitMipmaps(ILimage *BaseImage, VTFHEAD *Header)
+{
+	ILimage *Image;
+	ILuint Width, Height, Depth, Mipmap;
+
+	Image = BaseImage;
+	Width = BaseImage->Width;  Height = BaseImage->Height;  Depth = BaseImage->Depth;
+
+	for (Mipmap = 1; Mipmap < Header->MipmapCount; Mipmap++) {
+		// 1 is the smallest dimension possible.
+		Width = (Width >> 1) == 0 ? 1 : (Width >> 1);
+		Height = (Height >> 1) == 0 ? 1 : (Height >> 1);
+		Depth = (Depth >> 1) == 0 ? 1 : (Depth >> 1);
+
+		if (Mipmap == 1) {  // Our first mipmap is at Mipmap.
+			Image->Mipmaps = ilNewImage(Width, Height, Depth, BaseImage->Bpp, BaseImage->Bpc);
+			if (Image->Mipmaps == NULL)
+				return IL_FALSE;
+			Image = Image->Mipmaps;
+		}
+		else {  // The other mipmaps are at Mipmap->Next.
+			Image->Next = ilNewImage(Width, Height, Depth, BaseImage->Bpp, BaseImage->Bpc);
+			if (Image->Next == NULL)
+				return IL_FALSE;
+			Image = Image->Next;
+		}
+
+		// ilNewImage does not set these.
+		Image->Format = BaseImage->Format;
+		Image->Type = BaseImage->Type;
+		// The origin should be in the upper left.
+		Image->Origin = IL_ORIGIN_UPPER_LEFT;
+	}
+
+	return IL_TRUE;
+}
+
+#endif//IL_NO_VTF
Index: devil/lib/Makefile.in
===================================================================
--- devil.orig/lib/Makefile.in	2009-01-10 20:54:50.000000000 +0000
+++ devil/lib/Makefile.in	2009-01-10 20:55:39.000000000 +0000
@@ -111,7 +111,7 @@
 	$(il_src)/il_pxr.c $(il_src)/il_xpm.c $(il_src)/il_hdr.c \
 	$(il_src)/il_icns.c $(il_src)/il_jp2.c \
 	$(il_src)/altivec_common.c $(il_src)/altivec_typeconversion.c \
-	$(il_include)/altivec_common.h \
+	$(il_src)/il_vtf.c $(il_include)/altivec_common.h \
 	$(il_include)/altivec_typeconversion.h \
 	$(il_include)/il_alloc.h $(il_include)/il_bits.h \
 	$(il_include)/il_bmp.h $(il_include)/il_dcx.h \
@@ -131,18 +131,19 @@
 	$(il_include)/il_states.h $(il_include)/il_targa.h \
 	$(il_include)/il_wdp.h \
 	$(all_include)/IL/devil_internal_exports.h \
-	$(ilu_src)/ilu_alloc.c $(ilu_src)/ilu_internal.c \
-	$(ilu_src)/ilu_noise.c $(ilu_src)/ilu_scale.c \
-	$(ilu_src)/ilu_error.c $(ilu_src)/ilu_main.c \
-	$(ilu_src)/ilu_rotate.c $(ilu_src)/ilu_scaling.c \
-	$(ilu_src)/ilu_filter.c $(ilu_src)/ilu_manip.c \
-	$(ilu_src)/ilu_scale2d.c $(ilu_src)/ilu_states.c \
-	$(ilu_src)/ilu_filter_rcg.c $(ilu_src)/ilu_mipmap.c \
-	$(ilu_src)/ilu_scale3d.c $(ilu_src)/ilu_utilities.c \
-	$(ilu_src)/ilu_region.c $(ilu_include)/ilu_alloc.h \
-	$(ilu_include)/ilu_filter.h $(ilu_include)/ilu_internal.h \
-	$(ilu_include)/ilu_mipmap.h $(ilu_include)/ilu_region.h \
-	$(ilu_include)/ilu_states.h $(all_include)/IL/ilu_region.h \
+	$(il_include)/il_vtf.h $(ilu_src)/ilu_alloc.c \
+	$(ilu_src)/ilu_internal.c $(ilu_src)/ilu_noise.c \
+	$(ilu_src)/ilu_scale.c $(ilu_src)/ilu_error.c \
+	$(ilu_src)/ilu_main.c $(ilu_src)/ilu_rotate.c \
+	$(ilu_src)/ilu_scaling.c $(ilu_src)/ilu_filter.c \
+	$(ilu_src)/ilu_manip.c $(ilu_src)/ilu_scale2d.c \
+	$(ilu_src)/ilu_states.c $(ilu_src)/ilu_filter_rcg.c \
+	$(ilu_src)/ilu_mipmap.c $(ilu_src)/ilu_scale3d.c \
+	$(ilu_src)/ilu_utilities.c $(ilu_src)/ilu_region.c \
+	$(ilu_include)/ilu_alloc.h $(ilu_include)/ilu_filter.h \
+	$(ilu_include)/ilu_internal.h $(ilu_include)/ilu_mipmap.h \
+	$(ilu_include)/ilu_region.h $(ilu_include)/ilu_states.h \
+	$(all_include)/IL/ilu_region.h \
 	$(ilu_include)/ilu_error/ilu_err-arabic.h \
 	$(ilu_include)/ilu_error/ilu_err-dutch.h \
 	$(ilu_include)/ilu_error/ilu_err-english.h \
@@ -184,7 +185,7 @@
 	libDevIL_la-il_pxr.lo libDevIL_la-il_xpm.lo \
 	libDevIL_la-il_hdr.lo libDevIL_la-il_icns.lo \
 	libDevIL_la-il_jp2.lo libDevIL_la-altivec_common.lo \
-	libDevIL_la-altivec_typeconversion.lo
+	libDevIL_la-altivec_typeconversion.lo libDevIL_la-il_vtf.lo
 @BUILD_IL_TRUE@@BUILD_MONOLITHIC_TRUE at am__objects_2 =  \
 @BUILD_IL_TRUE@@BUILD_MONOLITHIC_TRUE@	$(am__objects_1)
 am__objects_3 = libDevIL_la-ilu_alloc.lo libDevIL_la-ilu_internal.lo \
@@ -240,7 +241,8 @@
 	libIL_la-il_dds-save.lo libIL_la-il_psp.lo libIL_la-il_pix.lo \
 	libIL_la-il_pxr.lo libIL_la-il_xpm.lo libIL_la-il_hdr.lo \
 	libIL_la-il_icns.lo libIL_la-il_jp2.lo \
-	libIL_la-altivec_common.lo libIL_la-altivec_typeconversion.lo
+	libIL_la-altivec_common.lo libIL_la-altivec_typeconversion.lo \
+	libIL_la-il_vtf.lo
 libIL_la_OBJECTS = $(am_libIL_la_OBJECTS)
 libIL_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
 	--mode=link $(CCLD) $(libIL_la_CFLAGS) $(CFLAGS) \
@@ -505,7 +507,7 @@
 	$(il_src)/il_pxr.c $(il_src)/il_xpm.c $(il_src)/il_hdr.c \
 	$(il_src)/il_icns.c $(il_src)/il_jp2.c \
 	$(il_src)/altivec_common.c $(il_src)/altivec_typeconversion.c \
-	$(il_include)/altivec_common.h \
+	$(il_src)/il_vtf.c $(il_include)/altivec_common.h \
 	$(il_include)/altivec_typeconversion.h \
 	$(il_include)/il_alloc.h $(il_include)/il_bits.h \
 	$(il_include)/il_bmp.h $(il_include)/il_dcx.h \
@@ -524,7 +526,8 @@
 	$(il_include)/il_sgi.h $(il_include)/il_stack.h \
 	$(il_include)/il_states.h $(il_include)/il_targa.h \
 	$(il_include)/il_wdp.h \
-	$(all_include)/IL/devil_internal_exports.h
+	$(all_include)/IL/devil_internal_exports.h \
+	$(il_include)/il_vtf.h
 libIL_la_LDFLAGS = @IL_LIBS@ $(AM_LDFLAGS)
 libILU_la_CPPFLAGS = -I $(ilu_include) -I $(all_include)
 libILU_la_CFLAGS = $(CFLAGS) @ILU_CFLAGS@
@@ -689,6 +692,7 @@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libDevIL_la-il_targa.Plo at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libDevIL_la-il_tiff.Plo at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libDevIL_la-il_utility.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libDevIL_la-il_vtf.Plo at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libDevIL_la-il_wal.Plo at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libDevIL_la-il_wdp.Plo at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libDevIL_la-il_xpm.Plo at am__quote@
@@ -800,6 +804,7 @@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libIL_la-il_targa.Plo at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libIL_la-il_tiff.Plo at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libIL_la-il_utility.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libIL_la-il_vtf.Plo at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libIL_la-il_wal.Plo at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libIL_la-il_wdp.Plo at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libIL_la-il_xpm.Plo at am__quote@
@@ -1224,6 +1229,13 @@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libDevIL_la_CPPFLAGS) $(CPPFLAGS) $(libDevIL_la_CFLAGS) $(CFLAGS) -c -o libDevIL_la-altivec_typeconversion.lo `test -f '$(il_src)/altivec_typeconversion.c' || echo '$(srcdir)/'`$(il_src)/altivec_typeconversion.c
 
+libDevIL_la-il_vtf.lo: $(il_src)/il_vtf.c
+ at am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libDevIL_la_CPPFLAGS) $(CPPFLAGS) $(libDevIL_la_CFLAGS) $(CFLAGS) -MT libDevIL_la-il_vtf.lo -MD -MP -MF $(DEPDIR)/libDevIL_la-il_vtf.Tpo -c -o libDevIL_la-il_vtf.lo `test -f '$(il_src)/il_vtf.c' || echo '$(srcdir)/'`$(il_src)/il_vtf.c
+ at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libDevIL_la-il_vtf.Tpo $(DEPDIR)/libDevIL_la-il_vtf.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(il_src)/il_vtf.c' object='libDevIL_la-il_vtf.lo' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libDevIL_la_CPPFLAGS) $(CPPFLAGS) $(libDevIL_la_CFLAGS) $(CFLAGS) -c -o libDevIL_la-il_vtf.lo `test -f '$(il_src)/il_vtf.c' || echo '$(srcdir)/'`$(il_src)/il_vtf.c
+
 libDevIL_la-ilu_alloc.lo: $(ilu_src)/ilu_alloc.c
 @am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libDevIL_la_CPPFLAGS) $(CPPFLAGS) $(libDevIL_la_CFLAGS) $(CFLAGS) -MT libDevIL_la-ilu_alloc.lo -MD -MP -MF $(DEPDIR)/libDevIL_la-ilu_alloc.Tpo -c -o libDevIL_la-ilu_alloc.lo `test -f '$(ilu_src)/ilu_alloc.c' || echo '$(srcdir)/'`$(ilu_src)/ilu_alloc.c
 @am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libDevIL_la-ilu_alloc.Tpo $(DEPDIR)/libDevIL_la-ilu_alloc.Plo
@@ -1812,6 +1824,13 @@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libIL_la_CPPFLAGS) $(CPPFLAGS) $(libIL_la_CFLAGS) $(CFLAGS) -c -o libIL_la-altivec_typeconversion.lo `test -f '$(il_src)/altivec_typeconversion.c' || echo '$(srcdir)/'`$(il_src)/altivec_typeconversion.c
 
+libIL_la-il_vtf.lo: $(il_src)/il_vtf.c
+ at am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libIL_la_CPPFLAGS) $(CPPFLAGS) $(libIL_la_CFLAGS) $(CFLAGS) -MT libIL_la-il_vtf.lo -MD -MP -MF $(DEPDIR)/libIL_la-il_vtf.Tpo -c -o libIL_la-il_vtf.lo `test -f '$(il_src)/il_vtf.c' || echo '$(srcdir)/'`$(il_src)/il_vtf.c
+ at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libIL_la-il_vtf.Tpo $(DEPDIR)/libIL_la-il_vtf.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(il_src)/il_vtf.c' object='libIL_la-il_vtf.lo' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libIL_la_CPPFLAGS) $(CPPFLAGS) $(libIL_la_CFLAGS) $(CFLAGS) -c -o libIL_la-il_vtf.lo `test -f '$(il_src)/il_vtf.c' || echo '$(srcdir)/'`$(il_src)/il_vtf.c
+
 libILU_la-ilu_alloc.lo: $(ilu_src)/ilu_alloc.c
 @am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libILU_la_CPPFLAGS) $(CPPFLAGS) $(libILU_la_CFLAGS) $(CFLAGS) -MT libILU_la-ilu_alloc.lo -MD -MP -MF $(DEPDIR)/libILU_la-ilu_alloc.Tpo -c -o libILU_la-ilu_alloc.lo `test -f '$(ilu_src)/ilu_alloc.c' || echo '$(srcdir)/'`$(ilu_src)/ilu_alloc.c
 @am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libILU_la-ilu_alloc.Tpo $(DEPDIR)/libILU_la-ilu_alloc.Plo

DevIL-1.7.5-CVE-2008-5262.patch:

Index: DevIL-1.7.5-CVE-2008-5262.patch
===================================================================
RCS file: /cvs/extras/rpms/DevIL/F-9/DevIL-1.7.5-CVE-2008-5262.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DevIL-1.7.5-CVE-2008-5262.patch	14 Jan 2009 10:56:02 -0000	1.1
+++ DevIL-1.7.5-CVE-2008-5262.patch	19 Jan 2009 10:03:57 -0000	1.2
@@ -13,7 +13,7 @@
  	if (iread(&a, 1, 1) != 1)
  		return IL_FALSE;
  	while (a != '\n') {
-+		if (count >= 80) {  // Line shouldn't be this long at all.
++		if (count >= sizeof(buff) - 1) {  // Line shouldn't be this long at all.
 +			ilSetError(IL_INVALID_FILE_HEADER);
 +			return IL_FALSE;
 +		}


Index: DevIL.spec
===================================================================
RCS file: /cvs/extras/rpms/DevIL/F-9/DevIL.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- DevIL.spec	14 Jan 2009 11:05:53 -0000	1.11
+++ DevIL.spec	19 Jan 2009 10:03:57 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           DevIL
 Version:        1.7.5
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A cross-platform image library
 Group:          System Environment/Libraries
 License:        LGPLv2
@@ -9,6 +9,7 @@
 Patch0:         DevIL-1.7.5-allegropicfix.patch
 Patch1:         DevIL-1.7.5-il_endian_h.patch
 Patch2:         DevIL-1.7.5-CVE-2008-5262.patch
+Patch3:         DevIL-1.7.5-add-missing-files.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  allegro-devel
 BuildRequires:  lcms-devel
@@ -68,6 +69,7 @@
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 iconv -f iso8859-1 CREDITS -t utf8 > CREDITS.conv
 touch -r CREDITS CREDITS.conv
 mv CREDITS.conv CREDITS
@@ -136,6 +138,10 @@
 
 
 %changelog
+* Mon Jan 19 2009 Hans de Goede <hdegoede at redhat.com> 1.7.5-2
+- Fix missing symbols (rh 480269)
+- Fix off by one error in CVE-2008-5262 check (rh 479864)
+
 * Tue Jan 13 2009 Hans de Goede <hdegoede at redhat.com> 1.7.5-1
 - Update to latest upstream: 1.7.5
 - Add patch to fix CVE-2008-5262



From varekova at fedoraproject.org  Mon Jan 19 10:09:24 2009
From: varekova at fedoraproject.org (Ivana Varekova)
Date: Mon, 19 Jan 2009 10:09:24 +0000 (UTC)
Subject: rpms/gsl/devel gsl.spec,1.46,1.47
Message-ID: <20090119100924.87AD0700F8@cvs1.fedora.phx.redhat.com>

Author: varekova

Update of /cvs/pkgs/rpms/gsl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8188

Modified Files:
	gsl.spec 
Log Message:
fix the changelog date



Index: gsl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gsl/devel/gsl.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- gsl.spec	19 Jan 2009 10:01:23 -0000	1.46
+++ gsl.spec	19 Jan 2009 10:08:54 -0000	1.47
@@ -98,7 +98,7 @@
 %{_libdir}/*.a
 
 %changelog
-* Mon Jan 19 2008 Ivana Varekova <varekova at redhat.com> - 1.12-1
+* Mon Jan 19 2009 Ivana Varekova <varekova at redhat.com> - 1.12-1
 - update to 1.12
 
 * Tue Sep 16 2008 Ivana Varekova <varekova at redhat.com> - 1.11-4



From sarantis at fedoraproject.org  Mon Jan 19 10:18:29 2009
From: sarantis at fedoraproject.org (Sarantis Paskalis)
Date: Mon, 19 Jan 2009 10:18:29 +0000 (UTC)
Subject: rpms/mgopen-fonts/devel mgopen-fonts.spec,1.9,1.10
Message-ID: <20090119101829.4DDBD700F8@cvs1.fedora.phx.redhat.com>

Author: sarantis

Update of /cvs/extras/rpms/mgopen-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9432

Modified Files:
	mgopen-fonts.spec 
Log Message:
- Rename subpackages according to 
  http://fedoraproject.org/wiki/PackagingDrafts/Font_package_naming_(2009-01-13)
- Differentiate between macro and variable (fontconf->fconf)




Index: mgopen-fonts.spec
===================================================================
RCS file: /cvs/extras/rpms/mgopen-fonts/devel/mgopen-fonts.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- mgopen-fonts.spec	30 Dec 2008 14:07:38 -0000	1.9
+++ mgopen-fonts.spec	19 Jan 2009 10:17:58 -0000	1.10
@@ -19,7 +19,7 @@
 
 Name:      %{fontname}-fonts
 Version:   0.%{upstream_date}
-Release:   9%{?dist}
+Release:   10%{?dist}
 Summary:   Truetype greek fonts
 Group:     User Interface/X
 License:   MgOpen
@@ -31,86 +31,80 @@
 # The LICENCE file is an excerpt from the html page
 Source2:   %{fontname}-fontconfig.tar.gz
 # Tarball of fontconfig files for each font
-
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildArch: noarch
 BuildRequires: fontpackages-devel
 Requires:  fontpackages-filesystem
-
 %description
 %common_desc
 
+
 %package common
 Summary:  Truetype greek fonts, common files (documentation???)
 Group:    User Interface/X
-
-Obsoletes: mgopen-fonts<0.20050515-8
-
 %description common
 %common_desc
-
 This package consists of files used by other MgOpen packages.
 
+
+
 %package compat
 Summary: Truetype greek fonts, compatibility package
 Group:     User Interface/X
-
-Obsoletes: mgopen-fonts<0.20050515-6
-
-Requires: %{name}-canonica, %{name}-cosmetica, %{name}-modata, %{name}-moderna
-
+Obsoletes: mgopen-fonts<0.20050515-8
+Requires: %{fontname}-canonica-fonts, %{fontname}-cosmetica-fonts,
+Requires: %{fontname}-modata-fonts, %{fontname}-moderna-fonts
 %description compat
 %common_desc
 %compat_desc
 
 
-%package canonica
+
+%package -n %{fontname}-canonica-fonts
 Summary:   Truetype variable-stroke-width serif font faces
 Group:     User Interface/X
 Requires:  %{name}-common = %{version}-%{release}
-
-%description canonica
+%description -n %{fontname}-canonica-fonts
 %common_desc
-
 This package contains the MgOpen Canonica serif variable-stroke-width typeface,
 which is based on the design of Times Roman.
 
 %_font_pkg -n canonica -f %{fontconf}-canonica.conf MgOpenCanonica*.ttf
 
-%package cosmetica
+
+
+%package -n %{fontname}-cosmetica-fonts
 Summary:   Truetype variable-stroke-width sans serif font faces
 Group:     User Interface/X
 Requires:  %{name}-common = %{version}-%{release}
-
-%description cosmetica
+%description -n %{fontname}-cosmetica-fonts
 %common_desc
-
 This package contains the MgOpen Cosmetica sans serif variable-stroke-width
 typeface, which is  based on the design of Optima.
 
 %_font_pkg -n cosmetica -f %{fontconf}-cosmetica.conf MgOpenCosmetica*.ttf
 
-%package modata
+
+
+%package -n %{fontname}-modata-fonts
 Summary:   Truetype fixed-stroke-width sans serif font faces
 Group:     User Interface/X
 Requires:  %{name}-common = %{version}-%{release}
-
-%description modata
+%description -n %{fontname}-modata-fonts
 %common_desc
-
 This package contains the MgOpen Modata sans serif fixed-stroke-width
 which is based on the design of VAG rounded.
 
 %_font_pkg -n modata -f %{fontconf}-modata.conf MgOpenModata*.ttf
 
-%package moderna
+
+
+%package -n %{fontname}-moderna-fonts
 Summary:   Truetype fixed-stroke-width sans serif font faces
 Group:     User Interface/X
 Requires:  %{name}-common = %{version}-%{release}
-
-%description moderna
+%description -n %{fontname}-moderna-fonts
 %common_desc
-
 This package contains the MgOpen Moderna sans serif fixed-stroke-width
 typeface which is based on the design of Helvetica.
 
@@ -141,11 +135,11 @@
 install -m 0644 -p fontconfig/%{fontname}-moderna.conf \
          %{buildroot}%{_fontconfig_templatedir}/%{fontconf}-moderna.conf
 
-for fontconf in %{fontconf}-canonica.conf \
+for fconf in %{fontconf}-canonica.conf \
                 %{fontconf}-cosmetica.conf \
                 %{fontconf}-modata.conf \
                 %{fontconf}-moderna.conf ; do
-  ln -s %{_fontconfig_templatedir}/$fontconf \
+  ln -s %{_fontconfig_templatedir}/$fconf \
         %{buildroot}%{_fontconfig_confdir}/$fontconf
 done
 
@@ -163,6 +157,11 @@
 %files compat
 
 %changelog
+* Mon Jan 19 2009 Sarantis Paskalis <paskalis at di.uoa.gr> - 0.20050515-9
+- Rename subpackages according to 
+  http://fedoraproject.org/wiki/PackagingDrafts/Font_package_naming_(2009-01-13)
+- Differentiate between macro and variable (fontconf->fconf)
+
 * Tue Dec 30 2008 Sarantis Paskalis <paskalis at di.uoa.gr> - 0.20050515-9
 - Restructure spec file according to
   https://fedoraproject.org/wiki/Fonts_SIG_Fedora_11_packaging_changes



From pkgdb at fedoraproject.org  Mon Jan 19 10:30:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 10:30:30 +0000
Subject: [pkgdb] nload: fab has requested watchcommits
Message-ID: <20090119103030.B2C652082B5@bastion.fedora.phx.redhat.com>

fab has requested the watchcommits acl on nload (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/nload



From pkgdb at fedoraproject.org  Mon Jan 19 10:30:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 10:30:31 +0000
Subject: [pkgdb] nload: fab has requested watchbugzilla
Message-ID: <20090119103031.30A4A20846E@bastion.fedora.phx.redhat.com>

fab has requested the watchbugzilla acl on nload (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/nload



From pkgdb at fedoraproject.org  Mon Jan 19 10:34:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 10:34:29 +0000
Subject: [pkgdb] nload had acl change status
Message-ID: <20090119103430.1EE7720846E@bastion.fedora.phx.redhat.com>

itamarjp has set the watchbugzilla acl on nload (Fedora devel) to Approved for fab

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/nload



From pkgdb at fedoraproject.org  Mon Jan 19 10:34:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 10:34:33 +0000
Subject: [pkgdb] nload had acl change status
Message-ID: <20090119103433.924AD208469@bastion.fedora.phx.redhat.com>

itamarjp has set the watchcommits acl on nload (Fedora devel) to Approved for fab

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/nload



From pvrabec at fedoraproject.org  Mon Jan 19 10:37:54 2009
From: pvrabec at fedoraproject.org (Peter Vrabec)
Date: Mon, 19 Jan 2009 10:37:54 +0000 (UTC)
Subject: rpms/dosfstools/devel .cvsignore, 1.7, 1.8 dosfstools.spec, 1.33,
	1.34 sources, 1.7, 1.8
Message-ID: <20090119103754.7D8B7700F8@cvs1.fedora.phx.redhat.com>

Author: pvrabec

Update of /cvs/extras/rpms/dosfstools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12651

Modified Files:
	.cvsignore dosfstools.spec sources 
Log Message:
- upgrade
- include ChangeLog and COPYING (#225707)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/dosfstools/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	30 Sep 2008 14:55:52 -0000	1.7
+++ .cvsignore	19 Jan 2009 10:37:23 -0000	1.8
@@ -1 +1 @@
-dosfstools-3.0.0.tar.bz2
+dosfstools-3.0.1.tar.gz


Index: dosfstools.spec
===================================================================
RCS file: /cvs/extras/rpms/dosfstools/devel/dosfstools.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- dosfstools.spec	17 Nov 2008 22:01:24 -0000	1.33
+++ dosfstools.spec	19 Jan 2009 10:37:23 -0000	1.34
@@ -1,11 +1,10 @@
 Name: dosfstools
 Summary: Utilities for making and checking MS-DOS FAT filesystems on Linux
-Version: 3.0.0
-Release: 2%{?dist}
+Version: 3.0.1
+Release: 1%{?dist}
 License: GPLv3+
 Group: Applications/System
-Source0: http://www.daniel-baumann.ch/software/dosfstools/%{name}-%{version}.tar.bz2
-Patch0: dosfstools-vfat-timingfix.diff
+Source0: http://www.daniel-baumann.ch/software/dosfstools/%{name}-%{version}.tar.gz
 URL: http://www.daniel-baumann.ch/software/dosfstools/
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Obsoletes: mkdosfs-ygg
@@ -18,7 +17,6 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .vfat-timingfix
 
 %build
 make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
@@ -32,11 +30,16 @@
 
 %files
 %defattr(-,root,root,-)
-%doc %{_datadir}/doc/%{name}/
+%doc %{_datadir}/doc/%{name}/ 
+%doc ChangeLog COPYING
 /sbin/*
 %{_mandir}/man8/*
 
 %changelog
+* Mon Jan 19 2009 Peter Vrabec <pvrabec at redhat.com> - 3.0.1-1
+- upgrade
+- include ChangeLog and COPYING (#225707)
+
 * Mon Nov 17 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 3.0.0-2
 - apply vfat timing fix (bz 448247)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/dosfstools/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	30 Sep 2008 14:55:52 -0000	1.7
+++ sources	19 Jan 2009 10:37:23 -0000	1.8
@@ -1 +1 @@
-659687063b60efa1bde1463eb2ffa695  dosfstools-3.0.0.tar.bz2
+0b76d1359919fba3bdc4db74a2e3b0f6  dosfstools-3.0.1.tar.gz



From varekova at fedoraproject.org  Mon Jan 19 10:56:08 2009
From: varekova at fedoraproject.org (Ivana Varekova)
Date: Mon, 19 Jan 2009 10:56:08 +0000 (UTC)
Subject: rpms/busybox/devel .cvsignore, 1.26,
	1.27 busybox-1.12.1-anaconda.patch, 1.1,
	1.2 busybox-1.12.1-static.patch, 1.1,
	1.2 busybox-1.9.0-msh.patch, 1.2, 1.3 busybox.spec, 1.91,
	1.92 sources, 1.26, 1.27 busybox-1.10.3-findfs.patch, 1.2,
	NONE busybox-1.12.1-headers.patch, 1.1,
	NONE busybox-1.2.2-iptunnel.patch, 1.3, NONE
Message-ID: <20090119105608.EA06E700F8@cvs1.fedora.phx.redhat.com>

Author: varekova

Update of /cvs/pkgs/rpms/busybox/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16264

Modified Files:
	.cvsignore busybox-1.12.1-anaconda.patch 
	busybox-1.12.1-static.patch busybox-1.9.0-msh.patch 
	busybox.spec sources 
Removed Files:
	busybox-1.10.3-findfs.patch busybox-1.12.1-headers.patch 
	busybox-1.2.2-iptunnel.patch 
Log Message:
update to 1.13.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/busybox/devel/.cvsignore,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- .cvsignore	10 Nov 2008 13:09:34 -0000	1.26
+++ .cvsignore	19 Jan 2009 10:55:38 -0000	1.27
@@ -1 +1 @@
-busybox-1.12.1.tar.bz2
+busybox-1.13.2.tar.bz2

busybox-1.12.1-anaconda.patch:

Index: busybox-1.12.1-anaconda.patch
===================================================================
RCS file: /cvs/pkgs/rpms/busybox/devel/busybox-1.12.1-anaconda.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- busybox-1.12.1-anaconda.patch	10 Nov 2008 13:09:34 -0000	1.1
+++ busybox-1.12.1-anaconda.patch	19 Jan 2009 10:55:38 -0000	1.2
@@ -1,16 +1,16 @@
-diff -up busybox-1.12.1/scripts/defconfig.pom busybox-1.12.1/scripts/defconfig
---- busybox-1.12.1/scripts/defconfig.pom	2008-11-10 13:44:31.000000000 +0100
-+++ busybox-1.12.1/scripts/defconfig	2008-11-10 13:51:28.000000000 +0100
-@@ -185,7 +185,7 @@ CONFIG_FEATURE_LS_RECURSIVE=y
+diff -up busybox-1.13.2/scripts/defconfig.pom busybox-1.13.2/scripts/defconfig
+--- busybox-1.13.2/scripts/defconfig.pom	2009-01-19 10:25:07.000000000 +0100
++++ busybox-1.13.2/scripts/defconfig	2009-01-19 11:11:03.000000000 +0100
+@@ -186,7 +186,7 @@ CONFIG_FEATURE_LS_RECURSIVE=y
  CONFIG_FEATURE_LS_SORTFILES=y
  CONFIG_FEATURE_LS_TIMESTAMPS=y
  CONFIG_FEATURE_LS_USERNAME=y
 -CONFIG_FEATURE_LS_COLOR=y
-+# CONFIG_FEATURE_LS_COLOR is not set 
++# CONFIG_FEATURE_LS_COLOR is not set
  CONFIG_FEATURE_LS_COLOR_IS_DEFAULT=y
  CONFIG_MD5SUM=y
  CONFIG_MKDIR=y
-@@ -321,7 +321,7 @@ CONFIG_FEATURE_VI_YANKMARK=y
+@@ -324,7 +324,7 @@ CONFIG_FEATURE_VI_YANKMARK=y
  CONFIG_FEATURE_VI_SEARCH=y
  CONFIG_FEATURE_VI_USE_SIGNALS=y
  CONFIG_FEATURE_VI_DOT_CMD=y
@@ -19,25 +19,25 @@
  CONFIG_FEATURE_VI_SETOPTS=y
  CONFIG_FEATURE_VI_SET=y
  CONFIG_FEATURE_VI_WIN_RESIZE=y
-@@ -366,7 +366,7 @@ CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM=y
+@@ -369,7 +369,7 @@ CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM=y
  #
  # Init Utilities
  #
 -CONFIG_INIT=y
-+# CONFIG_INIT is not set 
- # CONFIG_DEBUG_INIT is not set
++# CONFIG_INIT is not set.
  CONFIG_FEATURE_USE_INITTAB=y
  # CONFIG_FEATURE_KILL_REMOVED is not set
-@@ -376,7 +376,7 @@ CONFIG_FEATURE_INIT_SCTTY=y
+ CONFIG_FEATURE_KILL_DELAY=0
+@@ -378,7 +378,7 @@ CONFIG_FEATURE_INIT_SYSLOG=y
  CONFIG_FEATURE_EXTRA_QUIET=y
  CONFIG_FEATURE_INIT_COREDUMPS=y
  CONFIG_FEATURE_INITRD=y
 -CONFIG_HALT=y
-+# CONFIG_HALT is not set 
++# CONFIG_HALT is not set.
  CONFIG_MESG=y
  
  #
-@@ -769,7 +769,7 @@ CONFIG_ASH=y
+@@ -826,7 +826,7 @@ CONFIG_ASH=y
  # Ash Shell Options
  #
  CONFIG_ASH_BASH_COMPAT=y
@@ -45,25 +45,21 @@
 +# CONFIG_ASH_JOB_CONTROL is not set
  CONFIG_ASH_READ_NCHARS=y
  CONFIG_ASH_READ_TIMEOUT=y
- # CONFIG_ASH_ALIAS is not set
-@@ -806,7 +806,7 @@ CONFIG_FEATURE_SH_EXTRA_QUIET=y
+ CONFIG_ASH_ALIAS=y
+@@ -863,7 +863,7 @@ CONFIG_CTTYHACK=y
  #
  # System Logging Utilities
  #
 -CONFIG_SYSLOGD=y
-+# CONFIG_SYSLOGD is not set
++# CONFIG_SYSLOGD is not set 
  CONFIG_FEATURE_ROTATE_LOGFILE=y
  CONFIG_FEATURE_REMOTE_LOG=y
- # CONFIG_FEATURE_SYSLOGD_DUP is not set
-@@ -814,9 +814,8 @@ CONFIG_FEATURE_IPC_SYSLOG=y
+ CONFIG_FEATURE_SYSLOGD_DUP=y
+@@ -871,5 +871,5 @@ CONFIG_FEATURE_IPC_SYSLOG=y
  CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=16
  CONFIG_LOGREAD=y
  CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING=y
 -CONFIG_KLOGD=y
 -CONFIG_LOGGER=y
--
-+# CONFIG_KLOGD is not set 
-+# CONFIG_LOGGER is not set 
- #
- # Runit Utilities
- #
++# CONFIG_KLOGD is not set
++# CONFIG_LOGGER is not set

busybox-1.12.1-static.patch:

Index: busybox-1.12.1-static.patch
===================================================================
RCS file: /cvs/pkgs/rpms/busybox/devel/busybox-1.12.1-static.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- busybox-1.12.1-static.patch	10 Nov 2008 13:09:34 -0000	1.1
+++ busybox-1.12.1-static.patch	19 Jan 2009 10:55:38 -0000	1.2
@@ -1,7 +1,7 @@
-diff -up busybox-1.12.1/scripts/defconfig.pom busybox-1.12.1/scripts/defconfig
---- busybox-1.12.1/scripts/defconfig.pom	2008-09-28 20:04:12.000000000 +0200
-+++ busybox-1.12.1/scripts/defconfig	2008-11-10 13:15:04.000000000 +0100
-@@ -39,7 +39,7 @@ CONFIG_FEATURE_HAVE_RPC=y
+diff -up busybox-1.13.2/scripts/defconfig.pom busybox-1.13.2/scripts/defconfig
+--- busybox-1.13.2/scripts/defconfig.pom	2008-11-09 18:28:00.000000000 +0100
++++ busybox-1.13.2/scripts/defconfig	2009-01-19 09:29:33.000000000 +0100
+@@ -41,7 +41,7 @@ CONFIG_FEATURE_HAVE_RPC=y
  #
  # Build Options
  #
@@ -10,7 +10,7 @@
  # CONFIG_PIE is not set
  # CONFIG_NOMMU is not set
  # CONFIG_BUILD_LIBBUSYBOX is not set
-@@ -185,7 +185,7 @@ CONFIG_FEATURE_LS_RECURSIVE=y
+@@ -186,7 +186,7 @@ CONFIG_FEATURE_LS_RECURSIVE=y
  CONFIG_FEATURE_LS_SORTFILES=y
  CONFIG_FEATURE_LS_TIMESTAMPS=y
  CONFIG_FEATURE_LS_USERNAME=y
@@ -19,7 +19,7 @@
  CONFIG_FEATURE_LS_COLOR_IS_DEFAULT=y
  CONFIG_MD5SUM=y
  CONFIG_MKDIR=y
-@@ -456,7 +456,7 @@ CONFIG_FEATURE_DMESG_PRETTY=y
+@@ -459,7 +459,7 @@ CONFIG_FEATURE_DMESG_PRETTY=y
  CONFIG_FBSET=y
  CONFIG_FEATURE_FBSET_FANCY=y
  CONFIG_FEATURE_FBSET_READMODE=y
@@ -28,12 +28,3 @@
  CONFIG_FDFORMAT=y
  CONFIG_FDISK=y
  CONFIG_FDISK_SUPPORT_LARGE_DISKS=y
-@@ -466,7 +466,7 @@ CONFIG_FEATURE_FDISK_WRITABLE=y
- # CONFIG_FEATURE_SUN_LABEL is not set
- # CONFIG_FEATURE_OSF_LABEL is not set
- CONFIG_FEATURE_FDISK_ADVANCED=y
--# CONFIG_FINDFS is not set
-+CONFIG_FINDFS=y
- CONFIG_FREERAMDISK=y
- CONFIG_FSCK_MINIX=y
- CONFIG_MKFS_MINIX=y

busybox-1.9.0-msh.patch:

Index: busybox-1.9.0-msh.patch
===================================================================
RCS file: /cvs/pkgs/rpms/busybox/devel/busybox-1.9.0-msh.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- busybox-1.9.0-msh.patch	10 Nov 2008 13:44:36 -0000	1.2
+++ busybox-1.9.0-msh.patch	19 Jan 2009 10:55:38 -0000	1.3
@@ -1,7 +1,7 @@
-diff -up busybox-1.12.1/scripts/defconfig.msh busybox-1.12.1/scripts/defconfig
---- busybox-1.12.1/scripts/defconfig.msh	2008-11-10 14:41:55.000000000 +0100
-+++ busybox-1.12.1/scripts/defconfig	2008-11-10 14:41:55.000000000 +0100
-@@ -761,7 +761,7 @@ CONFIG_WATCH=y
+diff -up busybox-1.13.2/scripts/defconfig.pom busybox-1.13.2/scripts/defconfig
+--- busybox-1.13.2/scripts/defconfig.pom	2009-01-19 09:57:35.000000000 +0100
++++ busybox-1.13.2/scripts/defconfig	2009-01-19 09:58:53.000000000 +0100
+@@ -818,7 +818,7 @@ CONFIG_SOFTLIMIT=y
  #
  CONFIG_FEATURE_SH_IS_ASH=y
  # CONFIG_FEATURE_SH_IS_HUSH is not set
@@ -10,12 +10,3 @@
  # CONFIG_FEATURE_SH_IS_NONE is not set
  CONFIG_ASH=y
  
-@@ -793,7 +793,7 @@ CONFIG_ASH_RANDOM_SUPPORT=y
- # CONFIG_HUSH_LOOPS is not set
- # CONFIG_HUSH_CASE is not set
- # CONFIG_LASH is not set
--# CONFIG_MSH is not set
-+CONFIG_MSH=y
- 
- #
- # Bourne Shell Options


Index: busybox.spec
===================================================================
RCS file: /cvs/pkgs/rpms/busybox/devel/busybox.spec,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -r1.91 -r1.92
--- busybox.spec	2 Dec 2008 14:48:19 -0000	1.91
+++ busybox.spec	19 Jan 2009 10:55:38 -0000	1.92
@@ -1,7 +1,7 @@
 Summary: Statically linked binary providing simplified versions of system commands
 Name: busybox
-Version: 1.12.1
-Release: 2%{?dist}
+Version: 1.13.2
+Release: 1%{?dist}
 Epoch: 1
 License: GPLv2
 Group: System Environment/Shells
@@ -10,12 +10,9 @@
 Patch0: busybox-1.12.1-static.patch
 Patch1: busybox-1.12.1-anaconda.patch
 Patch4: busybox-1.2.0-ppc64.patch
-Patch11: busybox-1.2.2-iptunnel.patch
 Patch12: busybox-1.2.2-ls.patch
 Patch14: busybox-1.9.0-msh.patch
 Patch16: busybox-1.10.1-hwclock.patch
-Patch18: busybox-1.10.3-findfs.patch
-Patch19: busybox-1.12.1-headers.patch
 Patch20: busybox-1.12.1-selinux.patch
 URL: http://www.busybox.net
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)  
@@ -57,12 +54,9 @@
 %prep
 %setup -q
 %patch0 -b .static -p1
-%patch11 -b .head -p1
 %patch12 -b .ls -p1
 %patch14 -b .msh -p1
 %patch16 -b .ia64 -p1
-%patch18 -b .ff -p1
-%patch19 -b .kh -p1
 %patch20 -b .sel -p1
 
 %build
@@ -117,6 +111,9 @@
 /sbin/busybox.petitboot
 
 %changelog
+* Mon Jan 19 2009 Ivana Varekova <varekova at redhat.com> - 1:1.13.2-1
+- update to 1.13.2
+
 * Tue Dec  2 2008 Ivana Varekova <varekova at redhat.com> - 1:1.12.1-2
 - enable selinux in static version of busybox (#462724)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/busybox/devel/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- sources	10 Nov 2008 13:09:34 -0000	1.26
+++ sources	19 Jan 2009 10:55:38 -0000	1.27
@@ -1 +1 @@
-dc2e5e00d6fee8229ae92884c68733a7  busybox-1.12.1.tar.bz2
+9e2a604d18bef219a5a6bf3acf78b9e1  busybox-1.13.2.tar.bz2


--- busybox-1.10.3-findfs.patch DELETED ---


--- busybox-1.12.1-headers.patch DELETED ---


--- busybox-1.2.2-iptunnel.patch DELETED ---



From petersen at fedoraproject.org  Mon Jan 19 10:59:20 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Mon, 19 Jan 2009 10:59:20 +0000 (UTC)
Subject: rpms/ghc/devel ghc.spec,1.68,1.69
Message-ID: <20090119105920.29CAF700F8@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/ghc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16645

Modified Files:
	ghc.spec 
Log Message:
buildrequire ncurses-devel to fix build of missing editline package needed
for ghci line-editing (#478466)



Index: ghc.spec
===================================================================
RCS file: /cvs/extras/rpms/ghc/devel/ghc.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- ghc.spec	19 Jan 2009 05:47:00 -0000	1.68
+++ ghc.spec	19 Jan 2009 10:58:49 -0000	1.69
@@ -34,6 +34,8 @@
 Provides:       haddock = 2.3.0
 BuildRequires:  ghc, happy, sed
 BuildRequires:  gmp-devel, libedit-devel
+# editline package requires ncurses to configure
+BuildRequires:  ncurses-devel
 %if %{build_doc}
 BuildRequires: libxslt, docbook-style-xsl
 %endif
@@ -218,6 +220,8 @@
 
 %changelog
 * Mon Jan 19 2009 Jens Petersen <petersen at redhat.com> - 6.10.1-7
+- buildrequire ncurses-devel to fix build of missing editline package needed
+  for ghci line-editing (#478466)
 - move spec templates to a haskell-packaging for easy updating
 - provide correct haddock version
 



From ruben at fedoraproject.org  Mon Jan 19 11:10:34 2009
From: ruben at fedoraproject.org (Ruben Kerkhof)
Date: Mon, 19 Jan 2009 11:10:34 +0000 (UTC)
Subject: rpms/Pound/F-10 .cvsignore, 1.21, 1.22 Pound.spec, 1.27,
	1.28 sources, 1.21, 1.22
Message-ID: <20090119111034.C3B77700F8@cvs1.fedora.phx.redhat.com>

Author: ruben

Update of /cvs/pkgs/rpms/Pound/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18122

Modified Files:
	.cvsignore Pound.spec sources 
Log Message:
* Mon Jan 19 2009 Ruben Kerkhof <ruben at rubenkerkhof.com> 2.4.4-1
- upstream released new version



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/Pound/F-10/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- .cvsignore	13 Oct 2008 11:28:50 -0000	1.21
+++ .cvsignore	19 Jan 2009 11:10:03 -0000	1.22
@@ -1 +1 @@
-Pound-2.4.3.tgz
+Pound-2.4.4.tgz


Index: Pound.spec
===================================================================
RCS file: /cvs/pkgs/rpms/Pound/F-10/Pound.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- Pound.spec	13 Oct 2008 11:28:50 -0000	1.27
+++ Pound.spec	19 Jan 2009 11:10:03 -0000	1.28
@@ -3,7 +3,7 @@
 %define pound_home   %{_localstatedir}/lib/pound
 
 Name:        Pound
-Version:     2.4.3
+Version:     2.4.4
 Release:     1%{?dist}
 Summary:     Reverse proxy and load balancer
 
@@ -116,6 +116,9 @@
 %attr(-,%{pound_user},%{pound_group}) %dir %{pound_home}
 
 %changelog
+* Mon Jan 19 2009 Ruben Kerkhof <ruben at rubenkerkhof.com> 2.4.4-1
+- upstream released new version
+
 * Mon Oct 13 2008 Ruben Kerkhof <ruben at rubenkerkhof.com> 2.4.3-1
 - Upstream released new version
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/Pound/F-10/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sources	13 Oct 2008 11:28:50 -0000	1.21
+++ sources	19 Jan 2009 11:10:03 -0000	1.22
@@ -1 +1 @@
-2de4c2ac1023b420b74a1bc08fb93b8a  Pound-2.4.3.tgz
+013144a9fef3302d3691617aedc0d438  Pound-2.4.4.tgz



From hadess at fedoraproject.org  Mon Jan 19 11:11:22 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Mon, 19 Jan 2009 11:11:22 +0000 (UTC)
Subject: rpms/bluez/devel .cvsignore, 1.21, 1.22 bluez.spec, 1.31,
	1.32 sources, 1.21, 1.22
Message-ID: <20090119111122.5BA21700F8@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/bluez/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18203

Modified Files:
	.cvsignore bluez.spec sources 
Log Message:
* Mon Jan 19 2009 - Bastien Nocera <bnocera at redhat.com> - 4.27-1
- Update to 4.27



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bluez/devel/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- .cvsignore	9 Jan 2009 10:55:46 -0000	1.21
+++ .cvsignore	19 Jan 2009 11:10:51 -0000	1.22
@@ -1 +1 @@
-bluez-4.26.tar.gz
+bluez-4.27.tar.gz


Index: bluez.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bluez/devel/bluez.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- bluez.spec	9 Jan 2009 10:55:46 -0000	1.31
+++ bluez.spec	19 Jan 2009 11:10:52 -0000	1.32
@@ -1,6 +1,6 @@
 Summary: Bluetooth utilities
 Name: bluez
-Version: 4.26
+Version: 4.27
 Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/System
@@ -189,6 +189,9 @@
 %{_libdir}/alsa-lib/*.so
 
 %changelog
+* Mon Jan 19 2009 - Bastien Nocera <bnocera at redhat.com> - 4.27-1
+- Update to 4.27
+
 * Fri Jan 09 2009 - Bastien Nocera <bnocera at redhat.com> - 4.26-1
 - Update to 4.26
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bluez/devel/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sources	9 Jan 2009 10:55:46 -0000	1.21
+++ sources	19 Jan 2009 11:10:52 -0000	1.22
@@ -1 +1 @@
-0ce0f9151fcc887844ce9fa8dc025ed2  bluez-4.26.tar.gz
+4f0bd19dd04a32eba6149b82b26c3f30  bluez-4.27.tar.gz



From ovasik at fedoraproject.org  Mon Jan 19 11:23:17 2009
From: ovasik at fedoraproject.org (Ondrej Vasik)
Date: Mon, 19 Jan 2009 11:23:17 +0000 (UTC)
Subject: rpms/pax/devel pax.spec,1.22,1.23
Message-ID: <20090119112318.0B485700F8@cvs1.fedora.phx.redhat.com>

Author: ovasik

Update of /cvs/extras/rpms/pax/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19165

Modified Files:
	pax.spec 
Log Message:
Merge review changes (#226235) - do ship doc files, use better buildroot, allow parallel build, do comment patch functionality


Index: pax.spec
===================================================================
RCS file: /cvs/extras/rpms/pax/devel/pax.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- pax.spec	29 Aug 2008 15:32:23 -0000	1.22
+++ pax.spec	19 Jan 2009 11:22:46 -0000	1.23
@@ -1,15 +1,18 @@
 Summary: POSIX File System Archiver
 Name: pax
 Version: 3.4
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: BSD
 Group: Applications/Archiving
 Source: ftp://ftp.suse.com/pub/people/kukuk/pax/%{name}-%{version}.tar.bz2
 URL:    ftp://ftp.suse.com/pub/people/kukuk/pax/
-Patch0: pax-3.0-PATHMAX.patch 
-Patch1: pax-3.4-abs100.patch 
+#use Linux PATH_MAX (4092) for maximum PATHLENGTH instead of pax default 3072
+Patch0: pax-3.0-PATHMAX.patch
+#fix bug with archiving files of filename length exactly 100 chars
+Patch1: pax-3.4-abs100.patch
+#do not truncate names when extracting
 Patch2: pax-3.4-rdtruncate.patch
-BuildRoot: %{_tmppath}/%{name}-root
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
 %description
 'pax' is the POSIX standard archive tool.  It supports the two most
@@ -23,7 +26,7 @@
 
 %build
 %configure
-make
+make %{?_smp_mflags}
 
 %install
 rm -rf %{buildroot}
@@ -33,11 +36,17 @@
 rm -rf %{buildroot}
 
 %files
-%defattr(-,root,root)
+%defattr(-,root,root,-)
+%doc ABOUT-NLS AUTHORS ChangeLog COPYING NEWS README THANKS
 %{_bindir}/pax
 %doc %{_mandir}/man1/*
 
 %changelog
+* Mon Jan 19 2009 Ondrej Vasik <ovasik at redhat.com> - 3.4-7
+- Merge review #226235: do ship doc files,
+  do comment patches, use better buildroot and
+  defaults for attributes, allow parallel builds
+
 * Fri Aug 29 2008 Ondrej Vasik <ovasik at redhat.com> - 3.4-6
 - removed duplicate Source0
 



From mmahut at fedoraproject.org  Mon Jan 19 11:33:41 2009
From: mmahut at fedoraproject.org (Marek Mahut)
Date: Mon, 19 Jan 2009 11:33:41 +0000 (UTC)
Subject: rpms/cpm/F-9 cpm-0.23beta-disclaimer.patch, NONE,
	1.1 cpm-0.23beta-make.patch, NONE, 1.1 cpm-0.23beta-open.patch,
	NONE, 1.1 cpm-0.23beta-sigint.patch, NONE, 1.1 cpm.pod, NONE,
	1.1 cpm.spec, NONE, 1.1 sources, 1.1, 1.2
Message-ID: <20090119113341.6B33E700F8@cvs1.fedora.phx.redhat.com>

Author: mmahut

Update of /cvs/pkgs/rpms/cpm/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20774

Modified Files:
	sources 
Added Files:
	cpm-0.23beta-disclaimer.patch cpm-0.23beta-make.patch 
	cpm-0.23beta-open.patch cpm-0.23beta-sigint.patch cpm.pod 
	cpm.spec 
Log Message:
initial import


cpm-0.23beta-disclaimer.patch:

--- NEW FILE cpm-0.23beta-disclaimer.patch ---
Marek Mahut <mmahut at fedoraproject.org>: adding security disclaimer

diff -Naur cpm-0.23beta-upstream/security.c cpm-0.23beta/security.c
--- cpm-0.23beta-upstream/security.c	2009-01-05 15:24:31.000000000 +0100
+++ cpm-0.23beta/security.c	2009-01-08 13:36:16.000000000 +0100
@@ -228,7 +228,7 @@
     else
       {
         if (!silent)
-          { printf("%s%s%s (%s)\n", STAT_RED, _("no"), STAT_OFF, memlimit); }
+          { printf("%s%s%s (%s)\n", STAT_RED, _("no"), STAT_OFF, memlimit); printf("\n%-50s\n", "For information how to configure your system for maximum security, please read README file included with this package.\n"); }
       }
 #endif
 #endif

cpm-0.23beta-make.patch:

--- NEW FILE cpm-0.23beta-make.patch ---
Marek Mahut <mmahut at fedoraproject.org>: We are setuid-ing it using rpm

diff -Naur cpm-0.23beta-upstream/Makefile.in cpm-0.23beta/Makefile.in
--- cpm-0.23beta-upstream/Makefile.in	2009-01-05 15:24:31.000000000 +0100
+++ cpm-0.23beta/Makefile.in	2009-01-05 15:57:40.000000000 +0100
@@ -374,7 +374,7 @@
 # install everything
 .PHONY: install
 install: cpm gettext
-	$(INSTALL) -D --mode=4755 --owner=root --group=root @PACKAGE_NAME@ $(DESTDIR)$(bindir)/@PACKAGE_NAME@
+	$(INSTALL) -D --mode=755 @PACKAGE_NAME@ $(DESTDIR)$(bindir)/@PACKAGE_NAME@
 	$(INSTALL) -D --mode=644 ./po/de_DE.mo $(DESTDIR)$(localedir)/de/LC_MESSAGES/@PACKAGE_NAME at .mo
 	$(INSTALL) -D --mode=644 ./docs/cpm.1.gz $(DESTDIR)$(mandir)/man1/cpm.1.gz
 

cpm-0.23beta-open.patch:

--- NEW FILE cpm-0.23beta-open.patch ---
open() takes three arguments when used with O_CREAT.
Furthermore, opening "/dev/null" and unsuccessfully creating it if it does
not exist and assuming everything's ok in that case makes no sense either.
Fix the test to be a bit more sane.

Lubomir Rintel <lkundrak at v3.sk>

diff -up cpm-0.23beta/security.c.open cpm-0.23beta/security.c
--- cpm-0.23beta/security.c.open	2009-01-08 16:45:49.000000000 +0100
+++ cpm-0.23beta/security.c	2009-01-08 16:46:54.000000000 +0100
@@ -495,15 +495,13 @@ int initSecurity(int* max_mem_lock, int*
     /* check that stderr, stdin and stdout are opened */
     /* NOTE: no file must be opened before this test! */
     /* Flawfinder: ignore */
-    canary = open("/dev/null", O_CREAT);
-    if ((canary >= 0) && (canary <= 2))
+    close (canary = dup(0));
+    if (canary != 3)
       {
         fprintf(stderr, "%s\n",
             _("stdin, stdout and/or stderr are invalid."));
-        close (canary);
         return 1;
       }
-    close (canary);
 
     return clearEnvironment();
   }


cpm-0.23beta-sigint.patch:

--- NEW FILE cpm-0.23beta-sigint.patch ---
Marek Mahut <mmahut at fedoraproject.org>: Correctly destroy window at ctrl-C

diff -Naur cpm-0.23beta-upstream/cpm.c cpm-0.23beta/cpm.c
--- cpm-0.23beta-upstream/cpm.c	2009-01-05 15:24:31.000000000 +0100
+++ cpm-0.23beta/cpm.c	2009-01-08 13:45:30.000000000 +0100
@@ -267,7 +267,8 @@
     if (signum == SIGINT ||
         signum == SIGTERM)
       {   /* we have to quit right away */
-        fileLockRemove(&dummy);
+        fileLockRemove(&dummy); 
+	destroyScreen(__LINE__, NULL);
         _exit(1);
       }
   }


--- NEW FILE cpm.pod ---
=head1 NAME

cpm - Console Password Manager

=head1 SYNOPSIS

cpm [--config FILE] [--configtest] [--encoding] [--file FILE] [--help]
    [--key KEY] [--noencryption] [--readonly] [--security] [--testrun TYPE]
    [--version] [PATH]

=head1 DESCRIPTION

Keep a password database safe and encrypted.

=head1 OPTIONS

=over 8

=item B<-c>, B<--config>

configuration file to use [~/.cpmrc]

=item B<--configtest>

verify the configuration file and exit

=item B<-e>, B<--encoding>

the encoding in which keyboard input arrives [ISO-8859-1]

=item B<-f>, B<--file>

database file to use [~/.cpmdb]

=item B<-h>, B<--help>

display this help

=item B<--key>

overwrite the default encryption keys and use this key instead; repeat for several keys

=item B<--noencryption>

turn off file encryption WARNING: THIS IS  FOR  DEVELOPMENT  AND TESTING ONLY!

=item B<-r>, B<--readonly>

open the database in read-only mode

=item B<-s>, B<--security>

run a security check and show the current security status

=item B<--testrun>

run one of the testmodes

backup run test on the backupfile creation

compress[fB-6]
     run compression test 1-6

decrypt
     run test on the decryption code

encrypt
     run test on the encryption code

environment
     run test on the environment validation

garbage
     run test on garbage input files

searchpattern
     run  test on the search patterns This only works when the
     application has been compiled with the compiler flag - DTEST_OPTION.

=item B<--version>

display the version and exit

=head1 KEYS

=over 8

=item B<^A>

add a new node to the current node.

=item B<^D>

delete  the currently selected node and all its subnodes.

=item B<^E>

edit the currently selected node.

=item B<^H>

show the help screen.

=item B<^K>

edit the currently used encryption keys.

=item B<^N>

edit the name of the current level.

=item B<^O>

edit the comment of the selected node.

=item B<^P>

edit the current node and suggest a password.

=item B<^W>

write the database to disk.

=head1 ENVIRONMENT

The following environment variables are used by the application,
all other variables are discarded at program startup:

=item B<GNUPGHOME>

If set directory used instead of "~/.gnupg".

=item B<GPG_AGENT_INFO>

Used  to  locate the gpg-agent

=item B<HOME>

Used to locate the default home directory.

=item B<LANG>

Used to determine the user???s language.

=item B<COLUMNS>

Used to size some displays to the full size of the screen.

=item B<LINES>

Used to size some displays to the full size of the screen.

=item B<TERMCAP>

Terminal settings of the currently used terminal.

=item B<TERM>

Terminal settings of the currently used terminal.

=head1 IMPORT

The data import utilities are installed in /usr/share/cpm and the following formats can be imported:

=item . csv

=item . passwordsafe

=item . pms

=head1 SEE ALSO

gpg(1)

=head1 REPORTING BUGS

Report bugs to <harry_b at mm.st>.

=head1 COPYRIGHT

Copyright (C) 2005, 2006 Harry Brueckner

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 any later
version.  This program is distributed in the hope that it will be  use-
ful,  but  WITHOUT  ANY  WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the  GNU  Gen-
eral  Public License for more details.  You should have received a copy
of the GNU General Public License along  with  this  program;  if  not,
write  to  the  Free  Software  Foundation, Inc., 51 Franklin St, Fifth
Floor, Boston, MA 02110-1301, USA.

Contact: Harry Brueckner <harry_b at mm.st> Muenchener Strasse  12a  85253
Kleinberghofen Germany


--- NEW FILE cpm.spec ---
Name:		cpm
Version:	0.23
Release:	0.1.beta%{?dist}
Summary:	Console Password Manager

Group:		Applications/Databases
License:	GPLv2+
URL:		http://www.harry-b.de/dokuwiki/doku.php?id=harry:cpm
Source0:	http://dl.sf.net/%{name}/%{name}-%{version}beta.tar.gz
Source1:	cpm.pod
Patch0:		cpm-0.23beta-make.patch
Patch1:		cpm-0.23beta-disclaimer.patch
Patch2:		cpm-0.23beta-sigint.patch
Patch3:		cpm-0.23beta-open.patch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	cracklib-devel, cracklib-dicts
BuildRequires:	gpgme-devel
BuildRequires:	cdk-devel
BuildRequires:	dotconf-devel 
BuildRequires:	ncurses-devel
BuildRequires:	libxml2-devel >= 2.6.16,
BuildRequires:	zlib-devel
BuildRequires:	gettext

%description
CPM is a ncurses based console tool to manage passwords
and store them public key encrypted in a file - even for
more than one person. The encryption is handled via GnuPG
so the programs data can be accessed via gpg as well,
in case you want to have a look inside. The data is stored
as as zlib compressed XML so it???s even possible to reuse
the data for some other purpose.

%prep
%setup -q -n %{name}-%{version}beta
%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1
for file in docs/changelog docs/ChangeLog docs/cpm.txt docs/GPLv2 docs/README; do
	mv $file timestamp
	iconv -f ISO-8859-1 -t UTF-8 -o $file timestamp
	touch -r timestamp $file
done

%build
%configure --with-crack-dict=%{_libdir}/cracklib_dict CFLAGS="-I/usr/include/cdk/ %{optflags}" 
make %{?_smp_mflags} 
pod2man --release=%{name}-%{version}beta --center="%{summary}" --name=%{name} %{SOURCE1} ./docs/cpm.1

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT mandir="%{_mandir}"
install -D -p -m 644 conf/cpmrc-default $RPM_BUILD_ROOT%{_sysconfdir}/cpmrc
%find_lang %{name}

%clean
rm -rf $RPM_BUILD_ROOT


%files -f %{name}.lang
%defattr(-,root,root,-)
%doc conf/cpmrc-default docs/ChangeLog docs/changelog docs/GPLv2 docs/README ./share/cpm/*
%attr (4755,root,root) %{_bindir}/cpm
%config(noreplace) %{_sysconfdir}/cpmrc
%{_mandir}/man1/cpm*

%changelog
* Mon Jan 5 2009 Marek Mahut <mmahut at fedoraproject.org> - 0.23beta-1
- Initial build


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cpm/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	11 Jan 2009 16:57:09 -0000	1.1
+++ sources	19 Jan 2009 11:33:09 -0000	1.2
@@ -0,0 +1 @@
+55912d0a716450b2ee338a7885d3a213  cpm-0.23beta.tar.gz



From rrakus at fedoraproject.org  Mon Jan 19 11:45:08 2009
From: rrakus at fedoraproject.org (Roman Rakus)
Date: Mon, 19 Jan 2009 11:45:08 +0000 (UTC)
Subject: rpms/gperf/devel gperf.spec,1.27,1.28
Message-ID: <20090119114508.C6880700F8@cvs1.fedora.phx.redhat.com>

Author: rrakus

Update of /cvs/extras/rpms/gperf/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21809

Modified Files:
	gperf.spec 
Log Message:
Specfile fixes. Resolves: #225854


Index: gperf.spec
===================================================================
RCS file: /cvs/extras/rpms/gperf/devel/gperf.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- gperf.spec	19 Feb 2008 10:41:29 -0000	1.27
+++ gperf.spec	19 Jan 2009 11:44:38 -0000	1.28
@@ -1,13 +1,14 @@
 Summary: A perfect hash function generator
 Name: gperf
 Version: 3.0.3
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPLv2+
 Source: ftp://ftp.gnu.org/pub/gnu/gperf/gperf-%{version}.tar.gz
 Group: Development/Tools
 URL: http://www.gnu.org/software/gperf/
-Prereq: /sbin/install-info
-BuildRoot: %{_tmppath}/%{name}-%{version}-root
+Requires(post): /sbin/install-info
+Requires(preun): /sbin/install-info
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
 Gperf is a perfect hash function generator written in C++. Simply
@@ -20,7 +21,7 @@
 
 %build
 %configure
-make
+make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -39,18 +40,22 @@
 
 %preun
 if [ $1 = 0 ]; then
-   /sbin/install-info --delete %{_infodir}/gperf.info.gz %{_infodir}/dir
+   /sbin/install-info --delete %{_infodir}/gperf.info.gz %{_infodir}/dir || :
 fi
 exit 0
 
 %files
 %defattr(-,root,root)
-%doc README NEWS doc/gperf.html
+%doc README NEWS doc/*.{html,ps,pdf} COPYING
 %{_bindir}/%{name}
 %{_mandir}/man1/gperf.1*
 %{_infodir}/gperf.info*
 
 %changelog
+* Mon Jan 19 2009 Roman Rakus <rrakus at redhat.com> - 3.0.3-5
+- Specfile fixes
+  Resolves: #225854
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 3.0.3-4
 - Autorebuild for GCC 4.3
 



From cwickert at fedoraproject.org  Mon Jan 19 11:55:09 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Mon, 19 Jan 2009 11:55:09 +0000 (UTC)
Subject: rpms/xfce4-clipman-plugin/devel .cvsignore, 1.5, 1.6 sources, 1.5, 
	1.6 xfce4-clipman-plugin.spec, 1.13, 1.14
Message-ID: <20090119115509.438F570142@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/xfce4-clipman-plugin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22762

Modified Files:
	.cvsignore sources xfce4-clipman-plugin.spec 
Log Message:
* Mon Jan 19 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.9.0-2
- Update to 0.9.0
- Update license tag to GPLv2+



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-clipman-plugin/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	7 Mar 2008 02:08:08 -0000	1.5
+++ .cvsignore	19 Jan 2009 11:54:38 -0000	1.6
@@ -1 +1 @@
-xfce4-clipman-plugin-0.8.1.tar.bz2
+xfce4-clipman-plugin-0.9.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-clipman-plugin/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	7 Mar 2008 02:08:08 -0000	1.5
+++ sources	19 Jan 2009 11:54:38 -0000	1.6
@@ -1 +1 @@
-3b2973ad5aae70720eda028e9af0b449  xfce4-clipman-plugin-0.8.1.tar.bz2
+f41ab83ed53d92d109e45fcf0477ff2c  xfce4-clipman-plugin-0.9.0.tar.bz2


Index: xfce4-clipman-plugin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-clipman-plugin/devel/xfce4-clipman-plugin.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- xfce4-clipman-plugin.spec	18 Jan 2009 23:04:04 -0000	1.13
+++ xfce4-clipman-plugin.spec	19 Jan 2009 11:54:38 -0000	1.14
@@ -1,10 +1,10 @@
 Name:		xfce4-clipman-plugin
-Version:	0.8.1
-Release:	2%{?dist}
+Version:	0.9.0
+Release:	1%{?dist}
 Summary:	Clipboard manager plugin for the Xfce panel
 
 Group:		User Interface/Desktops
-License:	BSD
+License:	GPLv2+
 URL:		http://goodies.xfce.org/projects/panel-plugins/%{name}
 Source0:	http://goodies.xfce.org/releases/%{name}/%{name}-%{version}.tar.bz2
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -39,6 +39,10 @@
 %{_datadir}/xfce4/panel-plugins/*.desktop
 
 %changelog
+* Mon Jan 19 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.9.0-2
+- Update to 0.9.0
+- Update license tag to GPLv2+
+
 * Sun Jan 18 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.8.1-2
 - Rebuild for Xfce 4.6 (Beta 3)
 



From ruben at fedoraproject.org  Mon Jan 19 12:00:37 2009
From: ruben at fedoraproject.org (Ruben Kerkhof)
Date: Mon, 19 Jan 2009 12:00:37 +0000 (UTC)
Subject: rpms/Pound/F-9 .cvsignore, 1.21, 1.22 Pound.spec, 1.27, 1.28 sources,
	1.21, 1.22
Message-ID: <20090119120037.3FBF6700F8@cvs1.fedora.phx.redhat.com>

Author: ruben

Update of /cvs/pkgs/rpms/Pound/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23949

Modified Files:
	.cvsignore Pound.spec sources 
Log Message:
* Mon Jan 19 2009 Ruben Kerkhof <ruben at rubenkerkhof.com> 2.4.4-1
- upstream released new version



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/Pound/F-9/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- .cvsignore	13 Oct 2008 12:08:59 -0000	1.21
+++ .cvsignore	19 Jan 2009 12:00:06 -0000	1.22
@@ -1 +1 @@
-Pound-2.4.3.tgz
+Pound-2.4.4.tgz


Index: Pound.spec
===================================================================
RCS file: /cvs/pkgs/rpms/Pound/F-9/Pound.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- Pound.spec	13 Oct 2008 12:08:59 -0000	1.27
+++ Pound.spec	19 Jan 2009 12:00:06 -0000	1.28
@@ -3,7 +3,7 @@
 %define pound_home   %{_localstatedir}/lib/pound
 
 Name:        Pound
-Version:     2.4.3
+Version:     2.4.4
 Release:     1%{?dist}
 Summary:     Reverse proxy and load balancer
 
@@ -116,6 +116,9 @@
 %attr(-,%{pound_user},%{pound_group}) %dir %{pound_home}
 
 %changelog
+* Mon Jan 19 2009 Ruben Kerkhof <ruben at rubenkerkhof.com> 2.4.4-1
+- upstream released new version
+
 * Mon Oct 13 2008 Ruben Kerkhof <ruben at rubenkerkhof.com> 2.4.3-1
 - Upstream released new version
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/Pound/F-9/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sources	13 Oct 2008 12:08:59 -0000	1.21
+++ sources	19 Jan 2009 12:00:06 -0000	1.22
@@ -1 +1 @@
-2de4c2ac1023b420b74a1bc08fb93b8a  Pound-2.4.3.tgz
+013144a9fef3302d3691617aedc0d438  Pound-2.4.4.tgz



From ghosler at fedoraproject.org  Mon Jan 19 12:13:00 2009
From: ghosler at fedoraproject.org (Gregory D Hosler)
Date: Mon, 19 Jan 2009 12:13:00 +0000 (UTC)
Subject: rpms/gyachi/F-10 gyachi.spec,1.33,1.34
Message-ID: <20090119121300.A1C79700F8@cvs1.fedora.phx.redhat.com>

Author: ghosler

Update of /cvs/pkgs/rpms/gyachi/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25626

Modified Files:
	gyachi.spec 
Log Message:
Change Obsolete spec file requirements.




Index: gyachi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gyachi/F-10/gyachi.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- gyachi.spec	3 Jan 2009 15:46:54 -0000	1.33
+++ gyachi.spec	19 Jan 2009 12:12:30 -0000	1.34
@@ -27,7 +27,7 @@
 
 Name:		gyachi
 Version:	1.1.61
-Release:	1%{?dist}
+Release:	3%{?dist}
 Summary:	A Yahoo! chat client with Webcam and voice support
 
 Group:		Applications/Internet
@@ -69,38 +69,15 @@
 %endif
 Requires:	ImageMagick
 
-%if 0%{?_without_blowfish:1}
-Obsoletes:	gyachi-plugin-blowfish <= 0:%version-%release
-%endif
-
-%if 0%{?_without_gpgme:1}
-Obsoletes:	gyachi-plugin-gpgme <= 0:%version-%release
-%endif
-
-%if 0%{?_without_mcrypt:1}
-Obsoletes:	gyachi-plugin-mcrypt <= 0:%version-%release
-%endif
-
-%if 0%{!?_with_photo_album:1}
-Obsoletes:	gyachi-plugin-photo_album <= 0:%version-%release
+Obsoletes:	gyachi-plugin-blowfish     <  0:%version-%release
+Obsoletes:	gyachi-plugin-gpgme        <  0:%version-%release
+Obsoletes:	gyachi-plugin-mcrypt       <  0:%version-%release
+Obsoletes:	gyachi-plugin-photo_album  <  0:%version-%release
 Obsoletes:	gyachi-plugin-photosharing <= 0:1.1.26
-%endif
-
-%if 0%{!?_with_xmms:1}
-Obsoletes:	gyachi-plugin-xmms <= 0:%version-%release
-%endif
-
-%if 0%{?_without_libnotify:1}
-Obsoletes:	gyachi-plugin-libnotify <= 0:%version-%release
-%endif
-
-%if 0%{?_without_pulseaudio:1}
-Obsoletes:	gyachi-plugin-pulseaudio <= 0:%version-%release
-%endif
-
-%if 0%{!?_without_gtkspell:1}
-Obsoletes:	gyachi-plugin-gtkspell <= 0:%version-%release
-%endif
+Obsoletes:	gyachi-plugin-xmms         <  0:%version-%release
+Obsoletes:	gyachi-plugin-libnotify    <  0:%version-%release
+Obsoletes:	gyachi-plugin-pulseaudio   <  0:%version-%release
+Obsoletes:	gyachi-plugin-gtkspell     <  0:%version-%release
 
 
 %description
@@ -268,6 +245,8 @@
 %build
 ./autogen.sh
 
+#NOTE: xmms & photo_album are disabled, by default, in configure.
+#      if either are wanted, then they must be explicitely enabled!
 %configure --disable-rpath \
 	--libexecdir=%{_libexecdir}/gyachi \
 	%{?_without_wine:--disable-wine} \
@@ -393,6 +372,9 @@
 
 
 %changelog
+* Mon Jan 19 2009 Gregory D Hosler <ghosler at users.sourceforge.net> - 1.1.61.3
+- change plugin Obsoletes
+
 * Sat Jan 03 2009 Gregory D Hosler <ghosler at users.sourceforge.net> - 1.1.61.1
 - Add fix for segfault in file transfer.
 



From rakesh at fedoraproject.org  Mon Jan 19 12:16:11 2009
From: rakesh at fedoraproject.org (Rakesh Pandit)
Date: Mon, 19 Jan 2009 12:16:11 +0000 (UTC)
Subject: rpms/ratproxy/devel generate-tarball.sh, NONE, 1.1 import.log, NONE,
	1.1 ratproxy.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090119121611.9FE5A700F8@cvs1.fedora.phx.redhat.com>

Author: rakesh

Update of /cvs/pkgs/rpms/ratproxy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26652/devel

Modified Files:
	.cvsignore sources 
Added Files:
	generate-tarball.sh import.log ratproxy.spec 
Log Message:
initial import



--- NEW FILE generate-tarball.sh ---
#!/bin/sh

VERSION=$1
SOURCE0=$2
NAME=$3

tar -xzvf $SOURCE0
rm -rf $NAME/flare $NAME/flare-dist
sed -i -e 's/flare-check//' $NAME/Makefile
tar -czvf $NAME-$VERSION-nobinary.tar.gz $NAME



--- NEW FILE import.log ---
ratproxy-1_51-4_fc10:HEAD:ratproxy-1.51-4.fc10.src.rpm:1232367157


--- NEW FILE ratproxy.spec ---
Name:           ratproxy
Version:        1.51
Release:        4%{?dist}
Summary:        A passive web application security assessment tool
Group:          Applications/Internet
License:        ASL 2.0
URL:            http://code.google.com/p/%{name}/
# URL of actual source containing binary
# http://rakesh.fedorapeople.org/srpm/ratproxy-1.51-3.fc10.src.rpm
# generate-tarball.sh removes that binary and makes source0 tarball.
Source0:        ratproxy-1.53-nobinary.tar.gz
Source1:        generate-tarball.sh
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  openssl-devel

%description
A semi-automated, largely passive web application security audit tool,
optimized for an accurate and sensitive detection, and automatic
annotation, of potential problems and security-relevant design
patterns based on the observation of existing, user-initiated traffic
in complex web 2.0 environments.
             Detects and prioritizes broad classes of security
problems, such as dynamic cross-site trust model considerations,
script inclusion issues, content serving problems, insufficient XSRF
and XSS defenses, and much more.

%prep
%setup -q -n %{name}

%build
sed -i -e 's at -O3@-O2@' Makefile
make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -Wno-pointer-sign"

%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_bindir}/
install -p %{name} $RPM_BUILD_ROOT/%{_bindir}/

rm doc/Solaris.README
chmod 644 doc/*

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc doc/*
%{_bindir}/%{name}

%changelog
* Thu Jan 08 2009 Rakesh Pandit <rakesh at fedoraproject.org> 1.51-4
- removed Solaris.README

* Thu Jan 08 2009 Rakesh Pandit <rakesh at fedoraproject.org> 1.51-3
- removed non free binary from tar.gz and re-compressed (generate-tarball.sh).

* Sat Nov 08 2008 Rakesh Pandit <rakesh at fedoraproject.org> 1.51-2
- corrected make flags

* Wed Nov 05 2008 Rakesh Pandit <rakesh at fedoraproject.org> 1.51-1
- Initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ratproxy/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	18 Jan 2009 22:30:59 -0000	1.1
+++ .cvsignore	19 Jan 2009 12:15:41 -0000	1.2
@@ -0,0 +1 @@
+ratproxy-1.53-nobinary.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ratproxy/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	18 Jan 2009 22:30:59 -0000	1.1
+++ sources	19 Jan 2009 12:15:41 -0000	1.2
@@ -0,0 +1 @@
+ea939987fbf30ed8cd36a8b18c3c406d  ratproxy-1.53-nobinary.tar.gz



From jussilehtola at fedoraproject.org  Mon Jan 19 12:18:36 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Mon, 19 Jan 2009 12:18:36 +0000 (UTC)
Subject: rpms/gromacs/devel .cvsignore, 1.6, 1.7 gromacs.spec, 1.6,
	1.7 import.log, 1.5, 1.6 sources, 1.6, 1.7
Message-ID: <20090119121836.5AC7B700F8@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

Update of /cvs/pkgs/rpms/gromacs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27016/devel

Modified Files:
	.cvsignore gromacs.spec import.log sources 
Log Message:
* Mon Jan 19 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0.3-2
- Fix EPEL 4 build.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gromacs/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	19 Jan 2009 09:20:03 -0000	1.6
+++ .cvsignore	19 Jan 2009 12:18:05 -0000	1.7
@@ -1,2 +1,2 @@
-manual-4.0.pdf
 gromacs-4.0.3.tar.gz
+manual-4.0.pdf


Index: gromacs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gromacs/devel/gromacs.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- gromacs.spec	19 Jan 2009 09:20:03 -0000	1.6
+++ gromacs.spec	19 Jan 2009 12:18:05 -0000	1.7
@@ -1,6 +1,6 @@
 Name:		gromacs
 Version:	4.0.3
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	GROMACS binaries
 Group:		Applications/Engineering
 License:	GPLv2+
@@ -354,6 +354,20 @@
 %install
 rm -rf %{buildroot}
 
+# 4.0.3 needs this to build in EPEL-4
+# Load MPI enviroment
+%if %modules == 1
+. /etc/profile.d/modules.sh
+module load %{_libdir}/openmpi/*/openmpi.module
+%endif
+
+%if %selector == 1
+# Set MPI environment
+mpi-selector --set `mpi-selector --list | grep openmpi`
+source /etc/profile.d/mpi-selector.sh
+%endif
+
+
 # Single precision
 cd single
 make DESTDIR=%{buildroot} INSTALL="install -p" install
@@ -532,6 +546,9 @@
 
 
 %changelog
+* Mon Jan 19 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0.3-2
+- Fix EPEL 4 build.
+
 * Mon Jan 19 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0.3-1
 - Update to 4.0.3.
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/gromacs/devel/import.log,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- import.log	19 Jan 2009 09:20:03 -0000	1.5
+++ import.log	19 Jan 2009 12:18:05 -0000	1.6
@@ -3,3 +3,4 @@
 gromacs-4_0_2-6_fc9:HEAD:gromacs-4.0.2-6.fc9.src.rpm:1226305676
 gromacs-4_0_2-7_fc10:HEAD:gromacs-4.0.2-7.fc10.src.rpm:1231935162
 gromacs-4_0_3-1_fc10:HEAD:gromacs-4.0.3-1.fc10.src.rpm:1232356764
+gromacs-4_0_3-2_fc10:HEAD:gromacs-4.0.3-2.fc10.src.rpm:1232367441


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gromacs/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	19 Jan 2009 09:20:03 -0000	1.6
+++ sources	19 Jan 2009 12:18:05 -0000	1.7
@@ -1,2 +1,2 @@
-2b6565bef76109a579c39ec1dcb0ecf2  manual-4.0.pdf
 2902403671a0f9b0934ddf3ca586b7ec  gromacs-4.0.3.tar.gz
+2b6565bef76109a579c39ec1dcb0ecf2  manual-4.0.pdf



From rvokal at fedoraproject.org  Mon Jan 19 12:20:57 2009
From: rvokal at fedoraproject.org (=?utf-8?q?Radek_Vok=C3=A1l?=)
Date: Mon, 19 Jan 2009 12:20:57 +0000 (UTC)
Subject: rpms/wireshark/devel .cvsignore, 1.22, 1.23 sources, 1.22,
	1.23 wireshark.spec, 1.45, 1.46
Message-ID: <20090119122057.EF7AC700F8@cvs1.fedora.phx.redhat.com>

Author: rvokal

Update of /cvs/extras/rpms/wireshark/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27407

Modified Files:
	.cvsignore sources wireshark.spec 
Log Message:
upgrade to latest development release - 1.1.2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/wireshark/devel/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- .cvsignore	13 Nov 2008 13:05:09 -0000	1.22
+++ .cvsignore	19 Jan 2009 12:20:27 -0000	1.23
@@ -1 +1 @@
-wireshark-1.1.1.tar.gz
+wireshark-1.1.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wireshark/devel/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- sources	13 Nov 2008 13:05:09 -0000	1.22
+++ sources	19 Jan 2009 12:20:27 -0000	1.23
@@ -1 +1 @@
-5814871a5fe2ba3d238373e5a2bc1efd  wireshark-1.1.1.tar.gz
+d46ff3a89f11b4a6f3a8a2f5962e9d4c  wireshark-1.1.2.tar.gz


Index: wireshark.spec
===================================================================
RCS file: /cvs/extras/rpms/wireshark/devel/wireshark.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- wireshark.spec	18 Jan 2009 15:30:13 -0000	1.45
+++ wireshark.spec	19 Jan 2009 12:20:27 -0000	1.46
@@ -2,11 +2,12 @@
 #define to 0 for final version
 %define svn_version 0
 %define with_adns 0
+%define with_portaudio 1
 
 Summary: 	Network traffic analyzer
 Name: 		wireshark
-Version:	1.1.1
-Release: 	0.pre1%{?dist}.2
+Version:	1.1.2
+Release: 	0.pre1%{?dist}
 License: 	GPL+
 Group: 		Applications/Internet
 %if %{svn_version}
@@ -37,6 +38,10 @@
 %if %{with_adns}
 BuildRequires:	adns-devel
 %endif
+%if %{with_portaudio}
+BuildRequires: portaudio-devel
+%endif
+
 Obsoletes:	ethereal
 Provides:	ethereal
 
@@ -52,6 +57,9 @@
 %if %{with_adns}
 Requires:	adns
 %endif
+%if %{with_portaudio}
+Requires:	portaudio
+%endif
 Obsoletes:	ethereal-gnome
 Provides:	ethereal-gnome
 
@@ -200,13 +208,17 @@
 
 
 %changelog
+* Mon Jan 19 2009 Radek Vokal <rvokal at redhat.com> - 1.1.2-0.pre1
+- upgrade to latest development release
+- added support for portaudio (#480195)
+
 * Sun Jan 18 2009 Tomas Mraz <tmraz at redhat.com> - 1.1.1-0.pre1.2
 - rebuild with new openssl
 
 * Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 1.1.1-0.pre1.1
 - Rebuild for Python 2.6
 
-* Thu Nov 13 2008 Radek Vok??l <rvokal at redhat.com> 1.1.1-1
+* Thu Nov 13 2008 Radek Vok??l <rvokal at redhat.com> 1.1.1-0.pre1
 - upgrade to 1.1.1 development branch
 
 * Wed Sep 10 2008 Radek Vok??l <rvokal at redhat.com> 1.0.3-1



From jussilehtola at fedoraproject.org  Mon Jan 19 12:21:37 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Mon, 19 Jan 2009 12:21:37 +0000 (UTC)
Subject: rpms/gromacs/EL-4 gromacs.spec,1.6,1.7 sources,1.6,1.7
Message-ID: <20090119122137.E92FE700F8@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

Update of /cvs/pkgs/rpms/gromacs/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27302/EL-4

Modified Files:
	gromacs.spec sources 
Log Message:
* Mon Jan 19 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0.3-2
- Fix EPEL 4 build.



Index: gromacs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gromacs/EL-4/gromacs.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- gromacs.spec	19 Jan 2009 09:22:15 -0000	1.6
+++ gromacs.spec	19 Jan 2009 12:21:07 -0000	1.7
@@ -1,6 +1,6 @@
 Name:		gromacs
 Version:	4.0.3
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	GROMACS binaries
 Group:		Applications/Engineering
 License:	GPLv2+
@@ -354,6 +354,20 @@
 %install
 rm -rf %{buildroot}
 
+# 4.0.3 needs this to build in EPEL-4
+# Load MPI enviroment
+%if %modules == 1
+. /etc/profile.d/modules.sh
+module load %{_libdir}/openmpi/*/openmpi.module
+%endif
+
+%if %selector == 1
+# Set MPI environment
+mpi-selector --set `mpi-selector --list | grep openmpi`
+source /etc/profile.d/mpi-selector.sh
+%endif
+
+
 # Single precision
 cd single
 make DESTDIR=%{buildroot} INSTALL="install -p" install
@@ -532,6 +546,9 @@
 
 
 %changelog
+* Mon Jan 19 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0.3-2
+- Fix EPEL 4 build.
+
 * Mon Jan 19 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0.3-1
 - Update to 4.0.3.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gromacs/EL-4/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	19 Jan 2009 09:22:15 -0000	1.6
+++ sources	19 Jan 2009 12:21:07 -0000	1.7
@@ -1,2 +1,2 @@
-2b6565bef76109a579c39ec1dcb0ecf2  manual-4.0.pdf
 2902403671a0f9b0934ddf3ca586b7ec  gromacs-4.0.3.tar.gz
+2b6565bef76109a579c39ec1dcb0ecf2  manual-4.0.pdf



From jussilehtola at fedoraproject.org  Mon Jan 19 12:21:38 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Mon, 19 Jan 2009 12:21:38 +0000 (UTC)
Subject: rpms/gromacs/EL-5 gromacs.spec,1.6,1.7 sources,1.6,1.7
Message-ID: <20090119122138.3CCD3700F8@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

Update of /cvs/pkgs/rpms/gromacs/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27302/EL-5

Modified Files:
	gromacs.spec sources 
Log Message:
* Mon Jan 19 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0.3-2
- Fix EPEL 4 build.



Index: gromacs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gromacs/EL-5/gromacs.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- gromacs.spec	19 Jan 2009 09:22:15 -0000	1.6
+++ gromacs.spec	19 Jan 2009 12:21:07 -0000	1.7
@@ -1,6 +1,6 @@
 Name:		gromacs
 Version:	4.0.3
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	GROMACS binaries
 Group:		Applications/Engineering
 License:	GPLv2+
@@ -354,6 +354,20 @@
 %install
 rm -rf %{buildroot}
 
+# 4.0.3 needs this to build in EPEL-4
+# Load MPI enviroment
+%if %modules == 1
+. /etc/profile.d/modules.sh
+module load %{_libdir}/openmpi/*/openmpi.module
+%endif
+
+%if %selector == 1
+# Set MPI environment
+mpi-selector --set `mpi-selector --list | grep openmpi`
+source /etc/profile.d/mpi-selector.sh
+%endif
+
+
 # Single precision
 cd single
 make DESTDIR=%{buildroot} INSTALL="install -p" install
@@ -532,6 +546,9 @@
 
 
 %changelog
+* Mon Jan 19 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0.3-2
+- Fix EPEL 4 build.
+
 * Mon Jan 19 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0.3-1
 - Update to 4.0.3.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gromacs/EL-5/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	19 Jan 2009 09:22:15 -0000	1.6
+++ sources	19 Jan 2009 12:21:08 -0000	1.7
@@ -1,2 +1,2 @@
-2b6565bef76109a579c39ec1dcb0ecf2  manual-4.0.pdf
 2902403671a0f9b0934ddf3ca586b7ec  gromacs-4.0.3.tar.gz
+2b6565bef76109a579c39ec1dcb0ecf2  manual-4.0.pdf



From jussilehtola at fedoraproject.org  Mon Jan 19 12:21:38 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Mon, 19 Jan 2009 12:21:38 +0000 (UTC)
Subject: rpms/gromacs/F-9 gromacs.spec,1.6,1.7 sources,1.6,1.7
Message-ID: <20090119122138.D0914700F8@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

Update of /cvs/pkgs/rpms/gromacs/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27302/F-9

Modified Files:
	gromacs.spec sources 
Log Message:
* Mon Jan 19 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0.3-2
- Fix EPEL 4 build.



Index: gromacs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gromacs/F-9/gromacs.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- gromacs.spec	19 Jan 2009 09:22:16 -0000	1.6
+++ gromacs.spec	19 Jan 2009 12:21:08 -0000	1.7
@@ -1,6 +1,6 @@
 Name:		gromacs
 Version:	4.0.3
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	GROMACS binaries
 Group:		Applications/Engineering
 License:	GPLv2+
@@ -354,6 +354,20 @@
 %install
 rm -rf %{buildroot}
 
+# 4.0.3 needs this to build in EPEL-4
+# Load MPI enviroment
+%if %modules == 1
+. /etc/profile.d/modules.sh
+module load %{_libdir}/openmpi/*/openmpi.module
+%endif
+
+%if %selector == 1
+# Set MPI environment
+mpi-selector --set `mpi-selector --list | grep openmpi`
+source /etc/profile.d/mpi-selector.sh
+%endif
+
+
 # Single precision
 cd single
 make DESTDIR=%{buildroot} INSTALL="install -p" install
@@ -532,6 +546,9 @@
 
 
 %changelog
+* Mon Jan 19 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0.3-2
+- Fix EPEL 4 build.
+
 * Mon Jan 19 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0.3-1
 - Update to 4.0.3.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gromacs/F-9/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	19 Jan 2009 09:22:16 -0000	1.6
+++ sources	19 Jan 2009 12:21:08 -0000	1.7
@@ -1,2 +1,2 @@
-2b6565bef76109a579c39ec1dcb0ecf2  manual-4.0.pdf
 2902403671a0f9b0934ddf3ca586b7ec  gromacs-4.0.3.tar.gz
+2b6565bef76109a579c39ec1dcb0ecf2  manual-4.0.pdf



From jussilehtola at fedoraproject.org  Mon Jan 19 12:21:38 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Mon, 19 Jan 2009 12:21:38 +0000 (UTC)
Subject: rpms/gromacs/F-10 gromacs.spec,1.6,1.7 sources,1.6,1.7
Message-ID: <20090119122138.87BB8700F8@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

Update of /cvs/pkgs/rpms/gromacs/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27302/F-10

Modified Files:
	gromacs.spec sources 
Log Message:
* Mon Jan 19 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0.3-2
- Fix EPEL 4 build.



Index: gromacs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gromacs/F-10/gromacs.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- gromacs.spec	19 Jan 2009 09:22:15 -0000	1.6
+++ gromacs.spec	19 Jan 2009 12:21:08 -0000	1.7
@@ -1,6 +1,6 @@
 Name:		gromacs
 Version:	4.0.3
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	GROMACS binaries
 Group:		Applications/Engineering
 License:	GPLv2+
@@ -354,6 +354,20 @@
 %install
 rm -rf %{buildroot}
 
+# 4.0.3 needs this to build in EPEL-4
+# Load MPI enviroment
+%if %modules == 1
+. /etc/profile.d/modules.sh
+module load %{_libdir}/openmpi/*/openmpi.module
+%endif
+
+%if %selector == 1
+# Set MPI environment
+mpi-selector --set `mpi-selector --list | grep openmpi`
+source /etc/profile.d/mpi-selector.sh
+%endif
+
+
 # Single precision
 cd single
 make DESTDIR=%{buildroot} INSTALL="install -p" install
@@ -532,6 +546,9 @@
 
 
 %changelog
+* Mon Jan 19 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0.3-2
+- Fix EPEL 4 build.
+
 * Mon Jan 19 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0.3-1
 - Update to 4.0.3.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gromacs/F-10/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	19 Jan 2009 09:22:16 -0000	1.6
+++ sources	19 Jan 2009 12:21:08 -0000	1.7
@@ -1,2 +1,2 @@
-2b6565bef76109a579c39ec1dcb0ecf2  manual-4.0.pdf
 2902403671a0f9b0934ddf3ca586b7ec  gromacs-4.0.3.tar.gz
+2b6565bef76109a579c39ec1dcb0ecf2  manual-4.0.pdf



From ghosler at fedoraproject.org  Mon Jan 19 12:26:39 2009
From: ghosler at fedoraproject.org (Gregory D Hosler)
Date: Mon, 19 Jan 2009 12:26:39 +0000 (UTC)
Subject: rpms/gyachi/F-8 gyachi.spec,1.21,1.22
Message-ID: <20090119122639.93770700F8@cvs1.fedora.phx.redhat.com>

Author: ghosler

Update of /cvs/pkgs/rpms/gyachi/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28167

Modified Files:
	gyachi.spec 
Log Message:
Change Obsolete spec file requirements




Index: gyachi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gyachi/F-8/gyachi.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- gyachi.spec	3 Jan 2009 15:53:53 -0000	1.21
+++ gyachi.spec	19 Jan 2009 12:26:09 -0000	1.22
@@ -27,7 +27,7 @@
 
 Name:		gyachi
 Version:	1.1.61
-Release:	1%{?dist}
+Release:	3%{?dist}
 Summary:	A Yahoo! chat client with Webcam and voice support
 
 Group:		Applications/Internet
@@ -69,38 +69,15 @@
 %endif
 Requires:	ImageMagick
 
-%if 0%{?_without_blowfish:1}
-Obsoletes:	gyachi-plugin-blowfish <= 0:%version-%release
-%endif
-
-%if 0%{?_without_gpgme:1}
-Obsoletes:	gyachi-plugin-gpgme <= 0:%version-%release
-%endif
-
-%if 0%{?_without_mcrypt:1}
-Obsoletes:	gyachi-plugin-mcrypt <= 0:%version-%release
-%endif
-
-%if 0%{!?_with_photo_album:1}
-Obsoletes:	gyachi-plugin-photo_album <= 0:%version-%release
+Obsoletes:	gyachi-plugin-blowfish     <  0:%version-%release
+Obsoletes:	gyachi-plugin-gpgme        <  0:%version-%release
+Obsoletes:	gyachi-plugin-mcrypt       <  0:%version-%release
+Obsoletes:	gyachi-plugin-photo_album  <  0:%version-%release
 Obsoletes:	gyachi-plugin-photosharing <= 0:1.1.26
-%endif
-
-%if 0%{!?_with_xmms:1}
-Obsoletes:	gyachi-plugin-xmms <= 0:%version-%release
-%endif
-
-%if 0%{?_without_libnotify:1}
-Obsoletes:	gyachi-plugin-libnotify <= 0:%version-%release
-%endif
-
-%if 0%{?_without_pulseaudio:1}
-Obsoletes:	gyachi-plugin-pulseaudio <= 0:%version-%release
-%endif
-
-%if 0%{!?_without_gtkspell:1}
-Obsoletes:	gyachi-plugin-gtkspell <= 0:%version-%release
-%endif
+Obsoletes:	gyachi-plugin-xmms         <  0:%version-%release
+Obsoletes:	gyachi-plugin-libnotify    <  0:%version-%release
+Obsoletes:	gyachi-plugin-pulseaudio   <  0:%version-%release
+Obsoletes:	gyachi-plugin-gtkspell     <  0:%version-%release
 
 
 %description
@@ -395,6 +372,9 @@
 
 
 %changelog
+* Mon Jan 19 2009 Gregory D Hosler <ghosler at users.sourceforge.net> - 1.1.61.3
+- change plugin Obsoletes
+
 * Sat Jan 03 2009 Gregory D Hosler <ghosler at users.sourceforge.net> - 1.1.61.1
 - Add fix for segfault in file transfer.
 



From ke4qqq at fedoraproject.org  Mon Jan 19 12:28:25 2009
From: ke4qqq at fedoraproject.org (David Nalley)
Date: Mon, 19 Jan 2009 12:28:25 +0000 (UTC)
Subject: rpms/zapplet/devel import.log,1.1,1.2 zapplet.spec,1.1,1.2
Message-ID: <20090119122825.70C59700F8@cvs1.fedora.phx.redhat.com>

Author: ke4qqq

Update of /cvs/pkgs/rpms/zapplet/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28867/devel

Modified Files:
	import.log zapplet.spec 
Log Message:
* Mon Jan 19 2009 David Nalley <david at gnsa.us> 0.1-4
- Made changes suggested by ianweller to overcome cvs issues



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/zapplet/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	16 Jan 2009 18:15:48 -0000	1.1
+++ import.log	19 Jan 2009 12:27:55 -0000	1.2
@@ -1 +1,2 @@
 zapplet-0_1-3:HEAD:zapplet-0.1-3.src.rpm:1232129636
+zapplet-0_1-4_fc10:HEAD:zapplet-0.1-4.fc10.src.rpm:1232367927


Index: zapplet.spec
===================================================================
RCS file: /cvs/pkgs/rpms/zapplet/devel/zapplet.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- zapplet.spec	16 Jan 2009 18:15:48 -0000	1.1
+++ zapplet.spec	19 Jan 2009 12:27:55 -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:           zapplet
 Version:        0.1
-Release:        3 
+Release:        4%{dist} 
 Summary:        Zenoss Tray Applet
 Group:          Applications/Communications
 License:        GPLv2+
@@ -41,6 +41,8 @@
 %{_datadir}/applications/zapplet.desktop
 %doc README.fedora
 %changelog
+* Mon Jan 19 2009 David Nalley <david at gnsa.us> 0.1-4
+- Made changes suggested by ianweller to fix cvs issues
 * Sun Dec 28 2008 David Nalley <david at gnsa.us> 0.1-3
 - Made changes suggested by Brian Pepple
 * Sat Dec 27 2008 David Nalley <david at gnsa.us> 0.1-2



From rakesh at fedoraproject.org  Mon Jan 19 12:30:21 2009
From: rakesh at fedoraproject.org (Rakesh Pandit)
Date: Mon, 19 Jan 2009 12:30:21 +0000 (UTC)
Subject: rpms/ratproxy/F-10 generate-tarball.sh, NONE, 1.1 import.log, NONE, 
	1.1 ratproxy.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090119123021.D936F700F8@cvs1.fedora.phx.redhat.com>

Author: rakesh

Update of /cvs/pkgs/rpms/ratproxy/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29523/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	generate-tarball.sh import.log ratproxy.spec 
Log Message:
initial import



--- NEW FILE generate-tarball.sh ---
#!/bin/sh

VERSION=$1
SOURCE0=$2
NAME=$3

tar -xzvf $SOURCE0
rm -rf $NAME/flare $NAME/flare-dist
sed -i -e 's/flare-check//' $NAME/Makefile
tar -czvf $NAME-$VERSION-nobinary.tar.gz $NAME



--- NEW FILE import.log ---
ratproxy-1_51-4_fc10:F-10:ratproxy-1.51-4.fc10.src.rpm:1232367998


--- NEW FILE ratproxy.spec ---
Name:           ratproxy
Version:        1.51
Release:        4%{?dist}
Summary:        A passive web application security assessment tool
Group:          Applications/Internet
License:        ASL 2.0
URL:            http://code.google.com/p/%{name}/
# URL of actual source containing binary
# http://rakesh.fedorapeople.org/srpm/ratproxy-1.51-3.fc10.src.rpm
# generate-tarball.sh removes that binary and makes source0 tarball.
Source0:        ratproxy-1.53-nobinary.tar.gz
Source1:        generate-tarball.sh
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  openssl-devel

%description
A semi-automated, largely passive web application security audit tool,
optimized for an accurate and sensitive detection, and automatic
annotation, of potential problems and security-relevant design
patterns based on the observation of existing, user-initiated traffic
in complex web 2.0 environments.
             Detects and prioritizes broad classes of security
problems, such as dynamic cross-site trust model considerations,
script inclusion issues, content serving problems, insufficient XSRF
and XSS defenses, and much more.

%prep
%setup -q -n %{name}

%build
sed -i -e 's at -O3@-O2@' Makefile
make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -Wno-pointer-sign"

%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_bindir}/
install -p %{name} $RPM_BUILD_ROOT/%{_bindir}/

rm doc/Solaris.README
chmod 644 doc/*

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc doc/*
%{_bindir}/%{name}

%changelog
* Thu Jan 08 2009 Rakesh Pandit <rakesh at fedoraproject.org> 1.51-4
- removed Solaris.README

* Thu Jan 08 2009 Rakesh Pandit <rakesh at fedoraproject.org> 1.51-3
- removed non free binary from tar.gz and re-compressed (generate-tarball.sh).

* Sat Nov 08 2008 Rakesh Pandit <rakesh at fedoraproject.org> 1.51-2
- corrected make flags

* Wed Nov 05 2008 Rakesh Pandit <rakesh at fedoraproject.org> 1.51-1
- Initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ratproxy/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	18 Jan 2009 22:30:59 -0000	1.1
+++ .cvsignore	19 Jan 2009 12:29:51 -0000	1.2
@@ -0,0 +1 @@
+ratproxy-1.53-nobinary.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ratproxy/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	18 Jan 2009 22:30:59 -0000	1.1
+++ sources	19 Jan 2009 12:29:51 -0000	1.2
@@ -0,0 +1 @@
+ea939987fbf30ed8cd36a8b18c3c406d  ratproxy-1.53-nobinary.tar.gz



From rakesh at fedoraproject.org  Mon Jan 19 12:32:30 2009
From: rakesh at fedoraproject.org (Rakesh Pandit)
Date: Mon, 19 Jan 2009 12:32:30 +0000 (UTC)
Subject: rpms/ratproxy/F-9 generate-tarball.sh, NONE, 1.1 import.log, NONE, 
	1.1 ratproxy.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090119123230.E54AB700F8@cvs1.fedora.phx.redhat.com>

Author: rakesh

Update of /cvs/pkgs/rpms/ratproxy/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30127/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	generate-tarball.sh import.log ratproxy.spec 
Log Message:
initial import



--- NEW FILE generate-tarball.sh ---
#!/bin/sh

VERSION=$1
SOURCE0=$2
NAME=$3

tar -xzvf $SOURCE0
rm -rf $NAME/flare $NAME/flare-dist
sed -i -e 's/flare-check//' $NAME/Makefile
tar -czvf $NAME-$VERSION-nobinary.tar.gz $NAME



--- NEW FILE import.log ---
ratproxy-1_51-4_fc10:F-9:ratproxy-1.51-4.fc10.src.rpm:1232368139


--- NEW FILE ratproxy.spec ---
Name:           ratproxy
Version:        1.51
Release:        4%{?dist}
Summary:        A passive web application security assessment tool
Group:          Applications/Internet
License:        ASL 2.0
URL:            http://code.google.com/p/%{name}/
# URL of actual source containing binary
# http://rakesh.fedorapeople.org/srpm/ratproxy-1.51-3.fc10.src.rpm
# generate-tarball.sh removes that binary and makes source0 tarball.
Source0:        ratproxy-1.53-nobinary.tar.gz
Source1:        generate-tarball.sh
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  openssl-devel

%description
A semi-automated, largely passive web application security audit tool,
optimized for an accurate and sensitive detection, and automatic
annotation, of potential problems and security-relevant design
patterns based on the observation of existing, user-initiated traffic
in complex web 2.0 environments.
             Detects and prioritizes broad classes of security
problems, such as dynamic cross-site trust model considerations,
script inclusion issues, content serving problems, insufficient XSRF
and XSS defenses, and much more.

%prep
%setup -q -n %{name}

%build
sed -i -e 's at -O3@-O2@' Makefile
make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -Wno-pointer-sign"

%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_bindir}/
install -p %{name} $RPM_BUILD_ROOT/%{_bindir}/

rm doc/Solaris.README
chmod 644 doc/*

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc doc/*
%{_bindir}/%{name}

%changelog
* Thu Jan 08 2009 Rakesh Pandit <rakesh at fedoraproject.org> 1.51-4
- removed Solaris.README

* Thu Jan 08 2009 Rakesh Pandit <rakesh at fedoraproject.org> 1.51-3
- removed non free binary from tar.gz and re-compressed (generate-tarball.sh).

* Sat Nov 08 2008 Rakesh Pandit <rakesh at fedoraproject.org> 1.51-2
- corrected make flags

* Wed Nov 05 2008 Rakesh Pandit <rakesh at fedoraproject.org> 1.51-1
- Initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ratproxy/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	18 Jan 2009 22:30:59 -0000	1.1
+++ .cvsignore	19 Jan 2009 12:32:00 -0000	1.2
@@ -0,0 +1 @@
+ratproxy-1.53-nobinary.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ratproxy/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	18 Jan 2009 22:30:59 -0000	1.1
+++ sources	19 Jan 2009 12:32:00 -0000	1.2
@@ -0,0 +1 @@
+ea939987fbf30ed8cd36a8b18c3c406d  ratproxy-1.53-nobinary.tar.gz



From ghosler at fedoraproject.org  Mon Jan 19 12:35:27 2009
From: ghosler at fedoraproject.org (Gregory D Hosler)
Date: Mon, 19 Jan 2009 12:35:27 +0000 (UTC)
Subject: rpms/gyachi/F-9 gyachi.spec,1.21,1.22
Message-ID: <20090119123527.B2D99700F8@cvs1.fedora.phx.redhat.com>

Author: ghosler

Update of /cvs/pkgs/rpms/gyachi/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30503

Modified Files:
	gyachi.spec 
Log Message:
Change Obsoletes spec file requirements




Index: gyachi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gyachi/F-9/gyachi.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- gyachi.spec	3 Jan 2009 15:50:43 -0000	1.21
+++ gyachi.spec	19 Jan 2009 12:34:57 -0000	1.22
@@ -27,7 +27,7 @@
 
 Name:		gyachi
 Version:	1.1.61
-Release:	1%{?dist}
+Release:	3%{?dist}
 Summary:	A Yahoo! chat client with Webcam and voice support
 
 Group:		Applications/Internet
@@ -69,38 +69,15 @@
 %endif
 Requires:	ImageMagick
 
-%if 0%{?_without_blowfish:1}
-Obsoletes:	gyachi-plugin-blowfish <= 0:%version-%release
-%endif
-
-%if 0%{?_without_gpgme:1}
-Obsoletes:	gyachi-plugin-gpgme <= 0:%version-%release
-%endif
-
-%if 0%{?_without_mcrypt:1}
-Obsoletes:	gyachi-plugin-mcrypt <= 0:%version-%release
-%endif
-
-%if 0%{!?_with_photo_album:1}
-Obsoletes:	gyachi-plugin-photo_album <= 0:%version-%release
+Obsoletes:	gyachi-plugin-blowfish     <  0:%version-%release
+Obsoletes:	gyachi-plugin-gpgme        <  0:%version-%release
+Obsoletes:	gyachi-plugin-mcrypt       <  0:%version-%release
+Obsoletes:	gyachi-plugin-photo_album  <  0:%version-%release
 Obsoletes:	gyachi-plugin-photosharing <= 0:1.1.26
-%endif
-
-%if 0%{!?_with_xmms:1}
-Obsoletes:	gyachi-plugin-xmms <= 0:%version-%release
-%endif
-
-%if 0%{?_without_libnotify:1}
-Obsoletes:	gyachi-plugin-libnotify <= 0:%version-%release
-%endif
-
-%if 0%{?_without_pulseaudio:1}
-Obsoletes:	gyachi-plugin-pulseaudio <= 0:%version-%release
-%endif
-
-%if 0%{!?_without_gtkspell:1}
-Obsoletes:	gyachi-plugin-gtkspell <= 0:%version-%release
-%endif
+Obsoletes:	gyachi-plugin-xmms         <  0:%version-%release
+Obsoletes:	gyachi-plugin-libnotify    <  0:%version-%release
+Obsoletes:	gyachi-plugin-pulseaudio   <  0:%version-%release
+Obsoletes:	gyachi-plugin-gtkspell     <  0:%version-%release
 
 
 %description
@@ -395,6 +372,9 @@
 
 
 %changelog
+* Mon Jan 19 2009 Gregory D Hosler <ghosler at users.sourceforge.net> - 1.1.61.3
+- change plugin Obsoletes
+
 * Sat Jan 03 2009 Gregory D Hosler <ghosler at users.sourceforge.net> - 1.1.61.1
 - Add fix for segfault in file transfer.
 



From ke4qqq at fedoraproject.org  Mon Jan 19 12:36:24 2009
From: ke4qqq at fedoraproject.org (David Nalley)
Date: Mon, 19 Jan 2009 12:36:24 +0000 (UTC)
Subject: rpms/zapplet/F-9 import.log,1.1,1.2 zapplet.spec,1.2,1.3
Message-ID: <20090119123624.3C1A3700F8@cvs1.fedora.phx.redhat.com>

Author: ke4qqq

Update of /cvs/pkgs/rpms/zapplet/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30601/F-9

Modified Files:
	import.log zapplet.spec 
Log Message:
* Mon Jan 19 2009 David Nalley <david at gnsa.us> 0.1-4
- Made changes suggested by ianweller to fix cvs issues



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/zapplet/F-9/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	16 Jan 2009 18:21:58 -0000	1.1
+++ import.log	19 Jan 2009 12:35:53 -0000	1.2
@@ -1 +1,2 @@
 zapplet-0_1-3:F-9:zapplet-0.1-3.src.rpm:1232129796
+zapplet-0_1-4_fc10:F-9:zapplet-0.1-4.fc10.src.rpm:1232368434


Index: zapplet.spec
===================================================================
RCS file: /cvs/pkgs/rpms/zapplet/F-9/zapplet.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- zapplet.spec	16 Jan 2009 21:44:38 -0000	1.2
+++ zapplet.spec	19 Jan 2009 12:35:53 -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:           zapplet
 Version:        0.1
-Release:        3%{dist} 
+Release:        4%{dist} 
 Summary:        Zenoss Tray Applet
 Group:          Applications/Communications
 License:        GPLv2+
@@ -41,6 +41,8 @@
 %{_datadir}/applications/zapplet.desktop
 %doc README.fedora
 %changelog
+* Mon Jan 19 2009 David Nalley <david at gnsa.us> 0.1-4
+- Made changes suggested by ianweller to fix cvs issues
 * Sun Dec 28 2008 David Nalley <david at gnsa.us> 0.1-3
 - Made changes suggested by Brian Pepple
 * Sat Dec 27 2008 David Nalley <david at gnsa.us> 0.1-2



From ke4qqq at fedoraproject.org  Mon Jan 19 12:38:30 2009
From: ke4qqq at fedoraproject.org (David Nalley)
Date: Mon, 19 Jan 2009 12:38:30 +0000 (UTC)
Subject: rpms/zapplet/F-10 import.log,1.1,1.2 zapplet.spec,1.1,1.2
Message-ID: <20090119123830.8C983700F8@cvs1.fedora.phx.redhat.com>

Author: ke4qqq

Update of /cvs/pkgs/rpms/zapplet/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31000/F-10

Modified Files:
	import.log zapplet.spec 
Log Message:
* Mon Jan 19 2009 David Nalley <david at gnsa.us> 0.1-4
- Made changes suggested by ianweller to fix cvs issues



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/zapplet/F-10/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	16 Jan 2009 22:41:10 -0000	1.1
+++ import.log	19 Jan 2009 12:38:00 -0000	1.2
@@ -1 +1,2 @@
 zapplet-0_1-3_fc10:F-10:zapplet-0.1-3.fc10.src.rpm:1232145562
+zapplet-0_1-4_fc10:F-10:zapplet-0.1-4.fc10.src.rpm:1232368578


Index: zapplet.spec
===================================================================
RCS file: /cvs/pkgs/rpms/zapplet/F-10/zapplet.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- zapplet.spec	16 Jan 2009 22:41:10 -0000	1.1
+++ zapplet.spec	19 Jan 2009 12:38:00 -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:           zapplet
 Version:        0.1
-Release:        3%{dist} 
+Release:        4%{dist} 
 Summary:        Zenoss Tray Applet
 Group:          Applications/Communications
 License:        GPLv2+
@@ -41,6 +41,8 @@
 %{_datadir}/applications/zapplet.desktop
 %doc README.fedora
 %changelog
+* Mon Jan 19 2009 David Nalley <david at gnsa.us> 0.1-4
+- Made changes suggested by ianweller to fix cvs issues
 * Sun Dec 28 2008 David Nalley <david at gnsa.us> 0.1-3
 - Made changes suggested by Brian Pepple
 * Sat Dec 27 2008 David Nalley <david at gnsa.us> 0.1-2



From pkgdb at fedoraproject.org  Mon Jan 19 12:59:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 12:59:44 +0000
Subject: [pkgdb] isync: fab has requested watchcommits
Message-ID: <20090119125944.4743B2081FA@bastion.fedora.phx.redhat.com>

fab has requested the watchcommits acl on isync (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/isync



From pkgdb at fedoraproject.org  Mon Jan 19 12:59:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 12:59:44 +0000
Subject: [pkgdb] isync: fab has requested watchbugzilla
Message-ID: <20090119125944.6F338208467@bastion.fedora.phx.redhat.com>

fab has requested the watchbugzilla acl on isync (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/isync



From mmaslano at fedoraproject.org  Mon Jan 19 13:03:17 2009
From: mmaslano at fedoraproject.org (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?=)
Date: Mon, 19 Jan 2009 13:03:17 +0000 (UTC)
Subject: rpms/iproute/devel .cvsignore, 1.27, 1.28 iproute-ip-man.patch, 1.5,
	1.6 iproute.spec, 1.90, 1.91 iproute2-2.6.25-segfault.patch, 1.3,
	1.4 iproute2-2.6.9-kernel.patch, 1.5,
	1.6 iproute2-ss050901-opt_flags.patch, 1.7, 1.8 sources, 1.27,
	1.28 ip-maddr-show.patch, 1.1, NONE prefix-assigned.patch, 1.1, NONE
Message-ID: <20090119130317.7CA51700F8@cvs1.fedora.phx.redhat.com>

Author: mmaslano

Update of /cvs/pkgs/rpms/iproute/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1434

Modified Files:
	.cvsignore iproute-ip-man.patch iproute.spec 
	iproute2-2.6.25-segfault.patch iproute2-2.6.9-kernel.patch 
	iproute2-ss050901-opt_flags.patch sources 
Removed Files:
	ip-maddr-show.patch prefix-assigned.patch 
Log Message:
* Mon Jan 19 2009 Marcela Ma??l????ov?? <mmaslano at redhat.com> - 2.6.28-1
- previous two patches were included into 2.6.28 release.
- update



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/iproute/devel/.cvsignore,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- .cvsignore	4 Dec 2008 09:47:45 -0000	1.27
+++ .cvsignore	19 Jan 2009 13:02:46 -0000	1.28
@@ -1 +1 @@
-iproute2-2.6.27.tar.gz
+iproute2-2.6.28.tar.bz2

iproute-ip-man.patch:

Index: iproute-ip-man.patch
===================================================================
RCS file: /cvs/pkgs/rpms/iproute/devel/iproute-ip-man.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- iproute-ip-man.patch	4 Dec 2008 09:47:45 -0000	1.5
+++ iproute-ip-man.patch	19 Jan 2009 13:02:46 -0000	1.6
@@ -1,6 +1,6 @@
-diff -up iproute2-2.6.27/iproute2-2.6.27/man/man8/ip.8.mm iproute2-2.6.27/iproute2-2.6.27/man/man8/ip.8
---- iproute2-2.6.27/iproute2-2.6.27/man/man8/ip.8.mm	2008-07-25 22:46:07.000000000 +0200
-+++ iproute2-2.6.27/iproute2-2.6.27/man/man8/ip.8	2008-08-12 14:24:01.000000000 +0200
+diff -up iproute2-2.6.28/iproute2-2.6.28/man/man8/ip.8.mm iproute2-2.6.28/iproute2-2.6.28/man/man8/ip.8
+--- iproute2-2.6.28/iproute2-2.6.28/man/man8/ip.8.mm	2008-07-25 22:46:07.000000000 +0200
++++ iproute2-2.6.28/iproute2-2.6.28/man/man8/ip.8	2008-08-12 14:24:01.000000000 +0200
 @@ -190,6 +190,8 @@ replace " | " monitor " } "
  .IR NUMBER " ] [ "
  .B  cwnd


Index: iproute.spec
===================================================================
RCS file: /cvs/pkgs/rpms/iproute/devel/iproute.spec,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -r1.90 -r1.91
--- iproute.spec	12 Jan 2009 10:04:48 -0000	1.90
+++ iproute.spec	19 Jan 2009 13:02:46 -0000	1.91
@@ -3,18 +3,16 @@
 
 Summary: Advanced IP routing and network device configuration tools
 Name: iproute
-Version: 2.6.27
-Release: 2%{?dist}
+Version: 2.6.28
+Release: 1%{?dist}
 Group: Applications/System
-Source: http://developer.osdl.org/dev/iproute2/download/iproute2-%{version}.tar.gz
+Source: http://developer.osdl.org/dev/iproute2/download/iproute2-%{version}.tar.bz2
 #Source1: iproute-doc-2.6.22.tar.gz
 URL:	http://linux-net.osdl.org/index.php/Iproute2
 Patch1: iproute2-2.6.9-kernel.patch
 Patch2: iproute2-ss050901-opt_flags.patch
 Patch3: iproute-ip-man.patch
 Patch4: iproute2-2.6.25-segfault.patch
-Patch5: prefix-assigned.patch
-Patch6: ip-maddr-show.patch
 
 License: GPLv2+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -27,13 +25,11 @@
 capabilities of the Linux 2.4.x and 2.6.x kernel.
 
 %prep
-%setup -q -c iproute2-%{version}
+%setup -q -c iproute-%{version}
 %patch1 -p1 -b .kernel
 %patch2 -p1 -b .opt_flags
 %patch3 -p1
 %patch4 -p1 -b .seg
-%patch5 -p1 -b .prefix
-%patch6 -p1 -b .maddr
 
 %build
 export LIBDIR=%{_libdir}
@@ -109,6 +105,10 @@
 %config(noreplace) %{_sysconfdir}/sysconfig/cbq/*
 
 %changelog
+* Mon Jan 19 2009 Marcela Ma??l????ov?? <mmaslano at redhat.com> - 2.6.28-1
+- previous two patches were included into 2.6.28 release.
+- update
+
 * Mon Jan 12 2009 Marcela Ma??l????ov?? <mmaslano at redhat.com> - 2.6.27-2
 - 475130 - Negative preferred lifetimes of IPv6 prefixes/addresses
   displayed incorrectly

iproute2-2.6.25-segfault.patch:

Index: iproute2-2.6.25-segfault.patch
===================================================================
RCS file: /cvs/pkgs/rpms/iproute/devel/iproute2-2.6.25-segfault.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- iproute2-2.6.25-segfault.patch	4 Dec 2008 09:47:45 -0000	1.3
+++ iproute2-2.6.25-segfault.patch	19 Jan 2009 13:02:46 -0000	1.4
@@ -1,6 +1,6 @@
-diff -up iproute2-2.6.27/iproute2-2.6.27/ip/xfrm_state.c.seg iproute2-2.6.27/iproute2-2.6.27/ip/xfrm_state.c
---- iproute2-2.6.27/iproute2-2.6.27/ip/xfrm_state.c.seg	2008-07-21 17:23:12.000000000 +0200
-+++ iproute2-2.6.27/iproute2-2.6.27/ip/xfrm_state.c	2008-07-22 09:27:12.000000000 +0200
+diff -up iproute2-2.6.28/iproute2-2.6.28/ip/xfrm_state.c.seg iproute2-2.6.28/iproute2-2.6.28/ip/xfrm_state.c
+--- iproute2-2.6.28/iproute2-2.6.28/ip/xfrm_state.c.seg	2008-07-21 17:23:12.000000000 +0200
++++ iproute2-2.6.28/iproute2-2.6.28/ip/xfrm_state.c	2008-07-22 09:27:12.000000000 +0200
 @@ -158,12 +158,16 @@ static int xfrm_algo_parse(struct xfrm_a
  			buf[j] = val;
  		}

iproute2-2.6.9-kernel.patch:

Index: iproute2-2.6.9-kernel.patch
===================================================================
RCS file: /cvs/pkgs/rpms/iproute/devel/iproute2-2.6.9-kernel.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- iproute2-2.6.9-kernel.patch	4 Dec 2008 09:47:45 -0000	1.5
+++ iproute2-2.6.9-kernel.patch	19 Jan 2009 13:02:46 -0000	1.6
@@ -1,6 +1,6 @@
-diff -up iproute2-2.6.27/iproute2-2.6.27/Makefile.kernel iproute2-2.6.27/iproute2-2.6.27/Makefile
---- iproute2-2.6.27/iproute2-2.6.27/Makefile.kernel	2008-07-25 22:46:07.000000000 +0200
-+++ iproute2-2.6.27/iproute2-2.6.27/Makefile	2008-08-12 14:19:58.000000000 +0200
+diff -up iproute2-2.6.28/iproute2-2.6.28/Makefile.kernel iproute2-2.6.28/iproute2-2.6.28/Makefile
+--- iproute2-2.6.28/iproute2-2.6.28/Makefile.kernel	2008-07-25 22:46:07.000000000 +0200
++++ iproute2-2.6.28/iproute2-2.6.28/Makefile	2008-08-12 14:19:58.000000000 +0200
 @@ -3,6 +3,7 @@ SBINDIR=/sbin
  CONFDIR=/etc/iproute2
  DOCDIR=/share/doc/iproute2

iproute2-ss050901-opt_flags.patch:

Index: iproute2-ss050901-opt_flags.patch
===================================================================
RCS file: /cvs/pkgs/rpms/iproute/devel/iproute2-ss050901-opt_flags.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- iproute2-ss050901-opt_flags.patch	4 Dec 2008 09:47:45 -0000	1.7
+++ iproute2-ss050901-opt_flags.patch	19 Jan 2009 13:02:46 -0000	1.8
@@ -1,6 +1,6 @@
-diff -up iproute2-2.6.27/iproute2-2.6.27/Makefile.opt iproute2-2.6.27/iproute2-2.6.27/Makefile
---- iproute2-2.6.27/iproute2-2.6.27/Makefile.opt	2008-08-12 14:19:58.000000000 +0200
-+++ iproute2-2.6.27/iproute2-2.6.27/Makefile	2008-08-12 14:21:42.000000000 +0200
+diff -up iproute2-2.6.28/iproute2-2.6.28/Makefile.opt iproute2-2.6.28/iproute2-2.6.28/Makefile
+--- iproute2-2.6.28/iproute2-2.6.28/Makefile.opt	2008-08-12 14:19:58.000000000 +0200
++++ iproute2-2.6.28/iproute2-2.6.28/Makefile	2008-08-12 14:21:42.000000000 +0200
 @@ -22,7 +22,7 @@ ADDLIB+=ipx_ntop.o ipx_pton.o
  
  CC = gcc


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/iproute/devel/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- sources	4 Dec 2008 09:47:45 -0000	1.27
+++ sources	19 Jan 2009 13:02:46 -0000	1.28
@@ -1 +1 @@
-70f9c837ba9fd7d9f15fd39aba1b14c9  iproute2-2.6.27.tar.gz
+595f9b17320f69e8d30d2fa80f1bca14  iproute2-2.6.28.tar.bz2


--- ip-maddr-show.patch DELETED ---


--- prefix-assigned.patch DELETED ---



From ruben at fedoraproject.org  Mon Jan 19 13:05:21 2009
From: ruben at fedoraproject.org (Ruben Kerkhof)
Date: Mon, 19 Jan 2009 13:05:21 +0000 (UTC)
Subject: rpms/pdns/devel .cvsignore, 1.6, 1.7 pdns.spec, 1.14, 1.15 sources, 
	1.6, 1.7
Message-ID: <20090119130521.08B69700F8@cvs1.fedora.phx.redhat.com>

Author: ruben

Update of /cvs/pkgs/rpms/pdns/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1774

Modified Files:
	.cvsignore pdns.spec sources 
Log Message:
* Mon Jan 19 2009 Ruben Kerkhof <ruben at rubenkerkhof.com> 2.9.22-1.rc3
- New release candidate



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pdns/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	3 Dec 2008 12:53:07 -0000	1.6
+++ .cvsignore	19 Jan 2009 13:04:50 -0000	1.7
@@ -1 +1 @@
-pdns-2.9.22-rc2.tar.gz
+pdns-2.9.22-rc3.tar.gz


Index: pdns.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pdns/devel/pdns.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- pdns.spec	3 Dec 2008 12:53:07 -0000	1.14
+++ pdns.spec	19 Jan 2009 13:04:50 -0000	1.15
@@ -1,4 +1,4 @@
-%define alphatag rc2
+%define alphatag rc3
 Summary:	A modern, advanced and high performance authoritative-only nameserver
 Name:		pdns
 Version:	2.9.22
@@ -180,8 +180,11 @@
 
 
 %changelog
+* Mon Jan 19 2009 Ruben Kerkhof <ruben at rubenkerkhof.com> 2.9.22-1.rc3
+- New release candidate
+
 * Wed Dec 03 2008 Ruben Kerkhof <ruben at rubenkerkhof.com> 2.9.22-1.rc2
-- Upstream releasd new release candidate
+- Upstream released new release candidate
 - Drop patches which are upstreamed
 
 * Mon Nov 17 2008 Ruben Kerkhof <ruben at rubenkerkhof.com> 2.9.21.2-1


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pdns/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	3 Dec 2008 12:53:07 -0000	1.6
+++ sources	19 Jan 2009 13:04:50 -0000	1.7
@@ -1 +1 @@
-f9b834fb313145604f417ceff1506601  pdns-2.9.22-rc2.tar.gz
+b562932743696db3b9fc93667dd06487  pdns-2.9.22-rc3.tar.gz



From ghosler at fedoraproject.org  Mon Jan 19 13:15:59 2009
From: ghosler at fedoraproject.org (Gregory D Hosler)
Date: Mon, 19 Jan 2009 13:15:59 +0000 (UTC)
Subject: rpms/gyachi/devel gyachi.spec,1.40,1.41
Message-ID: <20090119131559.0B129700F8@cvs1.fedora.phx.redhat.com>

Author: ghosler

Update of /cvs/pkgs/rpms/gyachi/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3170

Modified Files:
	gyachi.spec 
Log Message:
Change spec file Obsoletes requirements




Index: gyachi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gyachi/devel/gyachi.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- gyachi.spec	16 Jan 2009 17:05:26 -0000	1.40
+++ gyachi.spec	19 Jan 2009 13:15:28 -0000	1.41
@@ -27,7 +27,7 @@
 
 Name:		gyachi
 Version:	1.1.61
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	A Yahoo! chat client with Webcam and voice support
 
 Group:		Applications/Internet
@@ -67,38 +67,15 @@
 %endif
 Requires:	ImageMagick
 
-%if 0%{?_without_blowfish:1}
-Obsoletes:	gyachi-plugin-blowfish <= 0:%version-%release
-%endif
-
-%if 0%{?_without_gpgme:1}
-Obsoletes:	gyachi-plugin-gpgme <= 0:%version-%release
-%endif
-
-%if 0%{?_without_mcrypt:1}
-Obsoletes:	gyachi-plugin-mcrypt <= 0:%version-%release
-%endif
-
-%if 0%{!?_with_photo_album:1}
-Obsoletes:	gyachi-plugin-photo_album <= 0:%version-%release
+Obsoletes:	gyachi-plugin-blowfish     <  0:%version-%release
+Obsoletes:	gyachi-plugin-gpgme        <  0:%version-%release
+Obsoletes:	gyachi-plugin-mcrypt       <  0:%version-%release
+Obsoletes:	gyachi-plugin-photo_album  <  0:%version-%release
 Obsoletes:	gyachi-plugin-photosharing <= 0:1.1.26
-%endif
-
-%if 0%{!?_with_xmms:1}
-Obsoletes:	gyachi-plugin-xmms <= 0:%version-%release
-%endif
-
-%if 0%{?_without_libnotify:1}
-Obsoletes:	gyachi-plugin-libnotify <= 0:%version-%release
-%endif
-
-%if 0%{?_without_pulseaudio:1}
-Obsoletes:	gyachi-plugin-pulseaudio <= 0:%version-%release
-%endif
-
-%if 0%{!?_without_gtkspell:1}
-Obsoletes:	gyachi-plugin-gtkspell <= 0:%version-%release
-%endif
+Obsoletes:	gyachi-plugin-xmms         <  0:%version-%release
+Obsoletes:	gyachi-plugin-libnotify    <  0:%version-%release
+Obsoletes:	gyachi-plugin-pulseaudio   <  0:%version-%release
+Obsoletes:	gyachi-plugin-gtkspell     <  0:%version-%release
 
 
 %description
@@ -266,6 +243,8 @@
 %build
 ./autogen.sh
 
+#NOTE: xmms & photo_album are disabled, by default, in configure.
+#      if either are wanted, then they must be explicitely enabled!
 %configure --disable-rpath \
 	--libexecdir=%{_libexecdir}/gyachi \
 	%{?_without_wine:--disable-wine} \
@@ -391,6 +370,9 @@
 
 
 %changelog
+* Mon Jan 19 2009 Gregory D Hosler <ghosler at users.sourceforge.net> - 1.1.61.3
+- change plugin Obsoletes
+
 * Fri Jan 16 2009 Tomas Mraz <tmraz at redhat.com> - 1.1.61-2
 - rebuild with new openssl
 



From ruben at fedoraproject.org  Mon Jan 19 13:17:56 2009
From: ruben at fedoraproject.org (Ruben Kerkhof)
Date: Mon, 19 Jan 2009 13:17:56 +0000 (UTC)
Subject: rpms/perl-mogilefs-server/devel .cvsignore, 1.3,
	1.4 perl-mogilefs-server.spec, 1.9, 1.10 sources, 1.3, 1.4
Message-ID: <20090119131756.80CAC700F8@cvs1.fedora.phx.redhat.com>

Author: ruben

Update of /cvs/pkgs/rpms/perl-mogilefs-server/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3668

Modified Files:
	.cvsignore perl-mogilefs-server.spec sources 
Log Message:
* Mon Jan 19 2009 Ruben Kerkhof <ruben at rubenkerkhof.com> 2.30-1
- Upstream released new version



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-mogilefs-server/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	19 Oct 2008 20:53:20 -0000	1.3
+++ .cvsignore	19 Jan 2009 13:17:26 -0000	1.4
@@ -1 +1 @@
-mogilefs-server-2.20.tar.gz
+mogilefs-server-2.30.tar.gz


Index: perl-mogilefs-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-mogilefs-server/devel/perl-mogilefs-server.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- perl-mogilefs-server.spec	19 Oct 2008 21:48:14 -0000	1.9
+++ perl-mogilefs-server.spec	19 Jan 2009 13:17:26 -0000	1.10
@@ -1,6 +1,6 @@
 Name:       perl-mogilefs-server
-Version:    2.20
-Release:    4%{?dist}
+Version:    2.30
+Release:    1%{?dist}
 Summary:    Server part of the MogileFS distributed filesystem
 License:    GPL+ or Artistic
 Group:      System Environment/Daemons
@@ -52,6 +52,7 @@
 Requires(post): /sbin/chkconfig
 Requires(preun): /sbin/chkconfig
 Requires(preun): /sbin/service
+Requires:       perl(Mogstored::HTTPServer::None)
 BuildRequires:  perl(Gearman::Client::Async)
 BuildRequires:  perl(Gearman::Server)
 
@@ -254,6 +255,9 @@
 
 
 %changelog
+* Mon Jan 19 2009 Ruben Kerkhof <ruben at rubenkerkhof.com> 2.30-1
+- Upstream released new version
+
 * Sun Oct 19 2008 Ruben Kerkhof <ruben at rubenkerkhof.com> 2.20-4
 - Add the 'None' backend
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-mogilefs-server/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	19 Oct 2008 20:53:20 -0000	1.3
+++ sources	19 Jan 2009 13:17:26 -0000	1.4
@@ -1 +1 @@
-129ab60bb7a060626add89ee0ba92c19  mogilefs-server-2.20.tar.gz
+be0fdae8699dba12c17b15e4327dd45e  mogilefs-server-2.30.tar.gz



From hno at fedoraproject.org  Mon Jan 19 13:21:46 2009
From: hno at fedoraproject.org (=?utf-8?q?Henrik_Nordstr=C3=B6m?=)
Date: Mon, 19 Jan 2009 13:21:46 +0000 (UTC)
Subject: rpms/bzr/F-10 .cvsignore, 1.31, 1.32 bzr.spec, 1.44, 1.45 sources, 
	1.31, 1.32
Message-ID: <20090119132146.3DF2B700F8@cvs1.fedora.phx.redhat.com>

Author: hno

Update of /cvs/pkgs/rpms/bzr/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4145/F-10

Modified Files:
	.cvsignore bzr.spec sources 
Log Message:
Update to 1.11


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bzr/F-10/.cvsignore,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- .cvsignore	10 Dec 2008 18:24:28 -0000	1.31
+++ .cvsignore	19 Jan 2009 13:21:15 -0000	1.32
@@ -1 +1 @@
-bzr-1.10.tar.gz
+bzr-1.11.tar.gz


Index: bzr.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bzr/F-10/bzr.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- bzr.spec	10 Dec 2008 18:24:28 -0000	1.44
+++ bzr.spec	19 Jan 2009 13:21:15 -0000	1.45
@@ -1,14 +1,17 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
+# bzr major versions uses two digits. Specify subreleases if any in Version:
+%define bzrver 1.11
+
 Name:           bzr
-Version:        1.10
+Version:        %{bzrver}
 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.10/%{version}/+download/%{name}-%{version}.tar.gz
+Source0:        https://launchpad.net/%{name}/%{bzrver}/%{version}/+download/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  python-devel
@@ -77,12 +80,12 @@
 %endif
 
 %changelog
+* Mon Jan 19 2009 Henrik Nordstrom <henrik at henriknordstrom.net> - 1.11-1
+- Update to 1.11
+
 * Wed Dec 10 2008 Toshio Kuratomi <toshio at fedoraproject.org> - 1.10-1
 - Update to 1.10
 
-* Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 1.9-2
-- Rebuild for Python 2.6
-
 * Thu Nov 13 2008 Toshio Kuratomi <toshio at fedoraproject.org> - 1.9-1
 - Update to 1.9
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bzr/F-10/sources,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- sources	10 Dec 2008 18:24:28 -0000	1.31
+++ sources	19 Jan 2009 13:21:15 -0000	1.32
@@ -1 +1 @@
-1b31db46601efa8812c4d545a7069f82  bzr-1.10.tar.gz
+08f8e60cfd7a60e8a2552dee0df9a7e8  bzr-1.11.tar.gz



From hno at fedoraproject.org  Mon Jan 19 13:21:46 2009
From: hno at fedoraproject.org (=?utf-8?q?Henrik_Nordstr=C3=B6m?=)
Date: Mon, 19 Jan 2009 13:21:46 +0000 (UTC)
Subject: rpms/bzr/devel .cvsignore, 1.31, 1.32 bzr.spec, 1.45, 1.46 sources, 
	1.31, 1.32
Message-ID: <20090119132146.86531700F8@cvs1.fedora.phx.redhat.com>

Author: hno

Update of /cvs/pkgs/rpms/bzr/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4145/devel

Modified Files:
	.cvsignore bzr.spec sources 
Log Message:
Update to 1.11


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bzr/devel/.cvsignore,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- .cvsignore	10 Dec 2008 17:49:31 -0000	1.31
+++ .cvsignore	19 Jan 2009 13:21:16 -0000	1.32
@@ -1 +1 @@
-bzr-1.10.tar.gz
+bzr-1.11.tar.gz


Index: bzr.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bzr/devel/bzr.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- bzr.spec	10 Dec 2008 17:49:31 -0000	1.45
+++ bzr.spec	19 Jan 2009 13:21:16 -0000	1.46
@@ -1,14 +1,17 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
+# bzr major versions uses two digits. Specify subreleases if any in Version:
+%define bzrver 1.11
+
 Name:           bzr
-Version:        1.10
+Version:        %{bzrver}
 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.10/%{version}/+download/%{name}-%{version}.tar.gz
+Source0:        https://launchpad.net/%{name}/%{bzrver}/%{version}/+download/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  python-devel
@@ -77,6 +80,9 @@
 %endif
 
 %changelog
+* Mon Jan 19 2009 Henrik Nordstrom <henrik at henriknordstrom.net> - 1.11-1
+- Update to 1.11
+
 * Wed Dec 10 2008 Toshio Kuratomi <toshio at fedoraproject.org> - 1.10-1
 - Update to 1.10
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bzr/devel/sources,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- sources	10 Dec 2008 17:49:31 -0000	1.31
+++ sources	19 Jan 2009 13:21:16 -0000	1.32
@@ -1 +1 @@
-1b31db46601efa8812c4d545a7069f82  bzr-1.10.tar.gz
+08f8e60cfd7a60e8a2552dee0df9a7e8  bzr-1.11.tar.gz



From mmaslano at fedoraproject.org  Mon Jan 19 13:22:07 2009
From: mmaslano at fedoraproject.org (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?=)
Date: Mon, 19 Jan 2009 13:22:07 +0000 (UTC)
Subject: rpms/iproute/F-10 iproute-ip-man.patch, 1.5, 1.6 iproute.spec, 1.90,
	1.91 iproute2-2.6.25-segfault.patch, 1.3,
	1.4 iproute2-2.6.9-kernel.patch, 1.5,
	1.6 iproute2-ss050901-opt_flags.patch, 1.7,
	1.8 ip-maddr-show.patch, 1.1, NONE prefix-assigned.patch, 1.1, NONE
Message-ID: <20090119132207.4D0B1700F8@cvs1.fedora.phx.redhat.com>

Author: mmaslano

Update of /cvs/pkgs/rpms/iproute/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4262

Modified Files:
	iproute-ip-man.patch iproute.spec 
	iproute2-2.6.25-segfault.patch iproute2-2.6.9-kernel.patch 
	iproute2-ss050901-opt_flags.patch 
Removed Files:
	ip-maddr-show.patch prefix-assigned.patch 
Log Message:
* Mon Jan 19 2009 Marcela Ma??l????ov?? <mmaslano at redhat.com> - 2.6.28-1
- previous two patches were included into 2.6.28 release.
- update


iproute-ip-man.patch:

Index: iproute-ip-man.patch
===================================================================
RCS file: /cvs/pkgs/rpms/iproute/F-10/iproute-ip-man.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- iproute-ip-man.patch	4 Dec 2008 10:02:40 -0000	1.5
+++ iproute-ip-man.patch	19 Jan 2009 13:21:36 -0000	1.6
@@ -1,6 +1,6 @@
-diff -up iproute2-2.6.27/iproute2-2.6.27/man/man8/ip.8.mm iproute2-2.6.27/iproute2-2.6.27/man/man8/ip.8
---- iproute2-2.6.27/iproute2-2.6.27/man/man8/ip.8.mm	2008-07-25 22:46:07.000000000 +0200
-+++ iproute2-2.6.27/iproute2-2.6.27/man/man8/ip.8	2008-08-12 14:24:01.000000000 +0200
+diff -up iproute2-2.6.28/iproute2-2.6.28/man/man8/ip.8.mm iproute2-2.6.28/iproute2-2.6.28/man/man8/ip.8
+--- iproute2-2.6.28/iproute2-2.6.28/man/man8/ip.8.mm	2008-07-25 22:46:07.000000000 +0200
++++ iproute2-2.6.28/iproute2-2.6.28/man/man8/ip.8	2008-08-12 14:24:01.000000000 +0200
 @@ -190,6 +190,8 @@ replace " | " monitor " } "
  .IR NUMBER " ] [ "
  .B  cwnd


Index: iproute.spec
===================================================================
RCS file: /cvs/pkgs/rpms/iproute/F-10/iproute.spec,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -r1.90 -r1.91
--- iproute.spec	12 Jan 2009 09:13:58 -0000	1.90
+++ iproute.spec	19 Jan 2009 13:21:36 -0000	1.91
@@ -3,18 +3,16 @@
 
 Summary: Advanced IP routing and network device configuration tools
 Name: iproute
-Version: 2.6.27
-Release: 2%{?dist}
+Version: 2.6.28
+Release: 1%{?dist}
 Group: Applications/System
-Source: http://developer.osdl.org/dev/iproute2/download/iproute2-%{version}.tar.gz
+Source: http://developer.osdl.org/dev/iproute2/download/iproute2-%{version}.tar.bz2
 #Source1: iproute-doc-2.6.22.tar.gz
 URL:	http://linux-net.osdl.org/index.php/Iproute2
 Patch1: iproute2-2.6.9-kernel.patch
 Patch2: iproute2-ss050901-opt_flags.patch
 Patch3: iproute-ip-man.patch
 Patch4: iproute2-2.6.25-segfault.patch
-Patch5: prefix-assigned.patch
-Patch6: ip-maddr-show.patch
 
 License: GPLv2+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -27,13 +25,11 @@
 capabilities of the Linux 2.4.x and 2.6.x kernel.
 
 %prep
-%setup -q -c iproute2-%{version}
+%setup -q -c iproute-%{version}
 %patch1 -p1 -b .kernel
 %patch2 -p1 -b .opt_flags
 %patch3 -p1
 %patch4 -p1 -b .seg
-%patch5 -p1 -b .prefix
-%patch6 -p1 -b .maddr
 
 %build
 export LIBDIR=%{_libdir}
@@ -109,6 +105,10 @@
 %config(noreplace) %{_sysconfdir}/sysconfig/cbq/*
 
 %changelog
+* Mon Jan 19 2009 Marcela Ma??l????ov?? <mmaslano at redhat.com> - 2.6.28-1
+- previous two patches were included into 2.6.28 release.
+- update
+
 * Mon Jan 12 2009 Marcela Ma??l????ov?? <mmaslano at redhat.com> - 2.6.27-2
 - 475130 - Negative preferred lifetimes of IPv6 prefixes/addresses
   displayed incorrectly

iproute2-2.6.25-segfault.patch:

Index: iproute2-2.6.25-segfault.patch
===================================================================
RCS file: /cvs/pkgs/rpms/iproute/F-10/iproute2-2.6.25-segfault.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- iproute2-2.6.25-segfault.patch	4 Dec 2008 10:02:40 -0000	1.3
+++ iproute2-2.6.25-segfault.patch	19 Jan 2009 13:21:36 -0000	1.4
@@ -1,6 +1,6 @@
-diff -up iproute2-2.6.27/iproute2-2.6.27/ip/xfrm_state.c.seg iproute2-2.6.27/iproute2-2.6.27/ip/xfrm_state.c
---- iproute2-2.6.27/iproute2-2.6.27/ip/xfrm_state.c.seg	2008-07-21 17:23:12.000000000 +0200
-+++ iproute2-2.6.27/iproute2-2.6.27/ip/xfrm_state.c	2008-07-22 09:27:12.000000000 +0200
+diff -up iproute2-2.6.28/iproute2-2.6.28/ip/xfrm_state.c.seg iproute2-2.6.28/iproute2-2.6.28/ip/xfrm_state.c
+--- iproute2-2.6.28/iproute2-2.6.28/ip/xfrm_state.c.seg	2008-07-21 17:23:12.000000000 +0200
++++ iproute2-2.6.28/iproute2-2.6.28/ip/xfrm_state.c	2008-07-22 09:27:12.000000000 +0200
 @@ -158,12 +158,16 @@ static int xfrm_algo_parse(struct xfrm_a
  			buf[j] = val;
  		}

iproute2-2.6.9-kernel.patch:

Index: iproute2-2.6.9-kernel.patch
===================================================================
RCS file: /cvs/pkgs/rpms/iproute/F-10/iproute2-2.6.9-kernel.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- iproute2-2.6.9-kernel.patch	4 Dec 2008 10:02:40 -0000	1.5
+++ iproute2-2.6.9-kernel.patch	19 Jan 2009 13:21:36 -0000	1.6
@@ -1,6 +1,6 @@
-diff -up iproute2-2.6.27/iproute2-2.6.27/Makefile.kernel iproute2-2.6.27/iproute2-2.6.27/Makefile
---- iproute2-2.6.27/iproute2-2.6.27/Makefile.kernel	2008-07-25 22:46:07.000000000 +0200
-+++ iproute2-2.6.27/iproute2-2.6.27/Makefile	2008-08-12 14:19:58.000000000 +0200
+diff -up iproute2-2.6.28/iproute2-2.6.28/Makefile.kernel iproute2-2.6.28/iproute2-2.6.28/Makefile
+--- iproute2-2.6.28/iproute2-2.6.28/Makefile.kernel	2008-07-25 22:46:07.000000000 +0200
++++ iproute2-2.6.28/iproute2-2.6.28/Makefile	2008-08-12 14:19:58.000000000 +0200
 @@ -3,6 +3,7 @@ SBINDIR=/sbin
  CONFDIR=/etc/iproute2
  DOCDIR=/share/doc/iproute2

iproute2-ss050901-opt_flags.patch:

Index: iproute2-ss050901-opt_flags.patch
===================================================================
RCS file: /cvs/pkgs/rpms/iproute/F-10/iproute2-ss050901-opt_flags.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- iproute2-ss050901-opt_flags.patch	4 Dec 2008 10:02:40 -0000	1.7
+++ iproute2-ss050901-opt_flags.patch	19 Jan 2009 13:21:36 -0000	1.8
@@ -1,6 +1,6 @@
-diff -up iproute2-2.6.27/iproute2-2.6.27/Makefile.opt iproute2-2.6.27/iproute2-2.6.27/Makefile
---- iproute2-2.6.27/iproute2-2.6.27/Makefile.opt	2008-08-12 14:19:58.000000000 +0200
-+++ iproute2-2.6.27/iproute2-2.6.27/Makefile	2008-08-12 14:21:42.000000000 +0200
+diff -up iproute2-2.6.28/iproute2-2.6.28/Makefile.opt iproute2-2.6.28/iproute2-2.6.28/Makefile
+--- iproute2-2.6.28/iproute2-2.6.28/Makefile.opt	2008-08-12 14:19:58.000000000 +0200
++++ iproute2-2.6.28/iproute2-2.6.28/Makefile	2008-08-12 14:21:42.000000000 +0200
 @@ -22,7 +22,7 @@ ADDLIB+=ipx_ntop.o ipx_pton.o
  
  CC = gcc


--- ip-maddr-show.patch DELETED ---


--- prefix-assigned.patch DELETED ---



From caolanm at fedoraproject.org  Mon Jan 19 13:23:01 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Mon, 19 Jan 2009 13:23:01 +0000 (UTC)
Subject: rpms/openoffice.org/devel
	openoffice.org-3.0.1.ooo98240.sc.basicworkaround.patch, NONE,
	1.1 openoffice.org.spec, 1.1765, 1.1766
Message-ID: <20090119132301.4C169700F8@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4444

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-3.0.1.ooo98240.sc.basicworkaround.patch 
Log Message:
Resolves: rhbz#480362 add workaround

openoffice.org-3.0.1.ooo98240.sc.basicworkaround.patch:

--- NEW FILE openoffice.org-3.0.1.ooo98240.sc.basicworkaround.patch ---
Index: source/filter/excel/excel.cxx
===================================================================
RCS file: /cvs/sc/sc/source/filter/excel/excel.cxx,v
retrieving revision 1.27
diff -u -r1.27 excel.cxx
--- openoffice.org.orig/sc/source/filter/excel/excel.cxx	2 Jul 2008 09:00:17 -0000	1.27
+++ openoffice.org/sc/source/filter/excel/excel.cxx	19 Jan 2009 13:10:56 -0000
@@ -33,6 +33,7 @@
 
 #include <sfx2/docfile.hxx>
 #include <sfx2/app.hxx>
+#include <sfx2/objsh.hxx>
 #include <sot/storage.hxx>
 #include <sot/exchange.hxx>
 #include <tools/globname.hxx>
@@ -79,6 +80,20 @@
         return eERR_FORMAT;
     }
 
+#if 1
+	SfxApplication* pSfxApp = SFX_APP();
+	pSfxApp->EnterBasicCall();              // initialize document's BASIC
+
+	//RootStorage is destroyed if GetBasic gets called later
+	//in xiescher.cxx's XclImpDrawObjBase::ReadMacro GetBasic
+	//call, so preemtively call it now beforehand as a 
+	//workaround
+        if( SfxObjectShell* pDocShell = pDocument->GetDocumentShell() )
+                pDocShell->GetBasic();
+	pSfxApp->LeaveBasicCall();
+#endif
+
+
     // check the input stream from medium
     SvStream* pMedStrm = rMedium.GetInStream();
     DBG_ASSERT( pMedStrm, "::ScImportExcel - medium without input stream" );


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1765
retrieving revision 1.1766
diff -u -r1.1765 -r1.1766
--- openoffice.org.spec	19 Jan 2009 09:26:12 -0000	1.1765
+++ openoffice.org.spec	19 Jan 2009 13:22:30 -0000	1.1766
@@ -1,6 +1,6 @@
 %define oootag OOO300
 %define ooomilestone 15
-%define rh_rpm_release 2
+%define rh_rpm_release 3
 
 # rhbz#465664 jar-repacking breaks help by reordering META-INF/MANIFEST.MF
 %define __jar_repack %{nil}
@@ -132,6 +132,7 @@
 Patch61: openoffice.org-3.0.1.oooXXXXX.fpicker.allformatsonsave.patch
 Patch62: workspace.fwk99.patch
 Patch63: openoffice.org-3.1.0.ooo98137.filter.redeclared-variables.patch
+Patch64: openoffice.org-3.0.1.ooo98240.sc.basicworkaround.patch
 
 %define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
 %define instdir %{_libdir}
@@ -1416,6 +1417,7 @@
 %patch61 -p1 -b .oooXXXXX.fpicker.allformatsonsave.patch
 %patch62 -p1 -b .workspace.fwk99.patch
 %patch63 -p1 -b .ooo98137.filter.redeclared-variables.patch
+%patch64 -p1 -b .ooo98240.sc.basicworkaround.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -2512,8 +2514,9 @@
 %dir %{basisinstdir}/share/dtd
 %{basisinstdir}/share/dtd/officedocument
 %{basisinstdir}/share/gallery
-%{basisinstdir}/share/psprint
+%dir %{basisinstdir}/share/psprint
 %config %{basisinstdir}/share/psprint/psprint.conf
+%{basisinstdir}/share/psprint/driver
 %dir %{basisinstdir}/share/registry
 %dir %{basisinstdir}/share/registry/data
 %dir %{basisinstdir}/share/registry/data/org
@@ -3825,6 +3828,10 @@
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
+* Mon Jan 19 2009 Caol??n McNamara <caolanm at redhat.com> - 1:3.0.1-15.3
+- Resolves: rhbz#480362 add
+  openoffice.org-3.0.1.ooo98240.sc.basicworkaround.patch
+
 * Mon Jan 19 2009 Caol??n McNamara <caolanm at redhat.com> - 1:3.0.1-15.2
 - Resolves: rhbz#479624 add
   openoffice.org-3.0.1.ooo98024.vcl.emboldenoverlap.patch



From hno at fedoraproject.org  Mon Jan 19 13:23:57 2009
From: hno at fedoraproject.org (=?utf-8?q?Henrik_Nordstr=C3=B6m?=)
Date: Mon, 19 Jan 2009 13:23:57 +0000 (UTC)
Subject: rpms/bzrtools/F-10 bzrtools.spec,1.36,1.37 sources,1.24,1.25
Message-ID: <20090119132357.BEC53700F8@cvs1.fedora.phx.redhat.com>

Author: hno

Update of /cvs/pkgs/rpms/bzrtools/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4570/F-10

Modified Files:
	bzrtools.spec sources 
Log Message:
Update to 1.11.0


Index: bzrtools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bzrtools/F-10/bzrtools.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- bzrtools.spec	12 Dec 2008 09:59:26 -0000	1.36
+++ bzrtools.spec	19 Jan 2009 13:23:27 -0000	1.37
@@ -5,12 +5,12 @@
 # (bzrlib is arch dependent.  Thus bzrlib plugins are also arch dependent.)
 %define debug_package %{nil}
 
-%define bzrver 1.10
-%define bzrnextver 1.11
+%define bzrver 1.11
+%define bzrnextver 1.12
 
 Name:           bzrtools
 Version:        %{bzrver}.0
-Release:        3%{?dist}
+Release:        1%{?dist}
 Summary:        A collection of utilities and plugins for Bazaar-NG
 
 Group:          Development/Tools
@@ -71,6 +71,9 @@
 %endif
 
 %changelog
+* Mon Jan 19 2009 Henrik Nordstrom <henrik at henriknordstrom.net> - 1.11.0-1
+- Update to 1.11.0
+
 * Fri Dec 12 2008 Henrik Nordstrom <henrik at henriknordstrom.net> 1.10.0-3
 - correct changelog
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bzrtools/F-10/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- sources	11 Dec 2008 22:01:37 -0000	1.24
+++ sources	19 Jan 2009 13:23:27 -0000	1.25
@@ -1 +0,0 @@
-d8179995f99286242c0a508a17b046f1  bzrtools-1.10.0.tar.gz



From hno at fedoraproject.org  Mon Jan 19 13:23:58 2009
From: hno at fedoraproject.org (=?utf-8?q?Henrik_Nordstr=C3=B6m?=)
Date: Mon, 19 Jan 2009 13:23:58 +0000 (UTC)
Subject: rpms/bzrtools/devel bzrtools.spec,1.38,1.39 sources,1.24,1.25
Message-ID: <20090119132358.37549700F8@cvs1.fedora.phx.redhat.com>

Author: hno

Update of /cvs/pkgs/rpms/bzrtools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4570/devel

Modified Files:
	bzrtools.spec sources 
Log Message:
Update to 1.11.0


Index: bzrtools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bzrtools/devel/bzrtools.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- bzrtools.spec	12 Dec 2008 09:59:26 -0000	1.38
+++ bzrtools.spec	19 Jan 2009 13:23:27 -0000	1.39
@@ -5,12 +5,12 @@
 # (bzrlib is arch dependent.  Thus bzrlib plugins are also arch dependent.)
 %define debug_package %{nil}
 
-%define bzrver 1.10
-%define bzrnextver 1.11
+%define bzrver 1.11
+%define bzrnextver 1.12
 
 Name:           bzrtools
 Version:        %{bzrver}.0
-Release:        3%{?dist}
+Release:        1%{?dist}
 Summary:        A collection of utilities and plugins for Bazaar-NG
 
 Group:          Development/Tools
@@ -71,6 +71,9 @@
 %endif
 
 %changelog
+* Mon Jan 19 2009 Henrik Nordstrom <henrik at henriknordstrom.net> - 1.11.0-1
+- Update to 1.11.0
+
 * Fri Dec 12 2008 Henrik Nordstrom <henrik at henriknordstrom.net> 1.10.0-3
 - correct changelog
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bzrtools/devel/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- sources	10 Dec 2008 17:50:15 -0000	1.24
+++ sources	19 Jan 2009 13:23:27 -0000	1.25
@@ -1 +0,0 @@
-d8179995f99286242c0a508a17b046f1  bzrtools-1.10.0.tar.gz



From caolanm at fedoraproject.org  Mon Jan 19 13:25:12 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Mon, 19 Jan 2009 13:25:12 +0000 (UTC)
Subject: rpms/openoffice.org/F-10
	openoffice.org-3.0.1.ooo98240.sc.basicworkaround.patch, NONE,
	1.1 openoffice.org.spec, 1.1711, 1.1712
Message-ID: <20090119132512.A3544700F8@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4713

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-3.0.1.ooo98240.sc.basicworkaround.patch 
Log Message:
Resolves: rhbz#480362 add workaround

openoffice.org-3.0.1.ooo98240.sc.basicworkaround.patch:

--- NEW FILE openoffice.org-3.0.1.ooo98240.sc.basicworkaround.patch ---
Index: source/filter/excel/excel.cxx
===================================================================
RCS file: /cvs/sc/sc/source/filter/excel/excel.cxx,v
retrieving revision 1.27
diff -u -r1.27 excel.cxx
--- openoffice.org.orig/sc/source/filter/excel/excel.cxx	2 Jul 2008 09:00:17 -0000	1.27
+++ openoffice.org/sc/source/filter/excel/excel.cxx	19 Jan 2009 13:10:56 -0000
@@ -33,6 +33,7 @@
 
 #include <sfx2/docfile.hxx>
 #include <sfx2/app.hxx>
+#include <sfx2/objsh.hxx>
 #include <sot/storage.hxx>
 #include <sot/exchange.hxx>
 #include <tools/globname.hxx>
@@ -79,6 +80,20 @@
         return eERR_FORMAT;
     }
 
+#if 1
+	SfxApplication* pSfxApp = SFX_APP();
+	pSfxApp->EnterBasicCall();              // initialize document's BASIC
+
+	//RootStorage is destroyed if GetBasic gets called later
+	//in xiescher.cxx's XclImpDrawObjBase::ReadMacro GetBasic
+	//call, so preemtively call it now beforehand as a 
+	//workaround
+        if( SfxObjectShell* pDocShell = pDocument->GetDocumentShell() )
+                pDocShell->GetBasic();
+	pSfxApp->LeaveBasicCall();
+#endif
+
+
     // check the input stream from medium
     SvStream* pMedStrm = rMedium.GetInStream();
     DBG_ASSERT( pMedStrm, "::ScImportExcel - medium without input stream" );


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-10/openoffice.org.spec,v
retrieving revision 1.1711
retrieving revision 1.1712
diff -u -r1.1711 -r1.1712
--- openoffice.org.spec	16 Jan 2009 11:55:22 -0000	1.1711
+++ openoffice.org.spec	19 Jan 2009 13:24:42 -0000	1.1712
@@ -134,6 +134,7 @@
 Patch61: openoffice.org-3.0.1.ooo97975.bridges.mainalreadyexited.patch
 Patch62: openoffice.org-3.0.1.ooo98024.vcl.emboldenoverlap.patch
 Patch63: openoffice.org-3.1.0.ooo98137.filter.redeclared-variables.patch
+Patch64: openoffice.org-3.0.1.ooo98240.sc.basicworkaround.patch
 
 %define instdir %{_libdir}
 %define baseinstdir %{instdir}/openoffice.org
@@ -1392,6 +1393,7 @@
 %patch61 -p1 -b .ooo97975.bridges.mainalreadyexited.patch
 %patch62 -p1 -b .ooo98024.vcl.emboldenoverlap.patch
 %patch63 -p1 -b .ooo98137.filter.redeclared-variables.patch
+%patch64 -p1 -b .ooo98240.sc.basicworkaround.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -3758,11 +3760,13 @@
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
-* Tue Jan 13 2009 Caol??n McNamara <caolanm at redhat.com> - 1:3.0.1-15.2
+* Mon Jan 19 2009 Caol??n McNamara <caolanm at redhat.com> - 1:3.0.1-15.2
 - Resolves: rhbz#479624 add
   openoffice.org-3.0.1.ooo98024.vcl.emboldenoverlap.patch
 - Resolves: rhbz#480121 add
   openoffice.org-3.1.0.ooo98137.filter.redeclared-variables.patch
+- Resolves: rhbz#480362
+  openoffice.org-3.0.1.ooo98240.sc.basicworkaround.patch
 
 * Mon Jan 12 2009 Caol??n McNamara <caolanm at redhat.com> - 1:3.0.1-15.1
 - Resolves: rhbz#470302 g_file_input_stream_query_info doesn't do anything 



From mmaslano at fedoraproject.org  Mon Jan 19 13:26:39 2009
From: mmaslano at fedoraproject.org (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?=)
Date: Mon, 19 Jan 2009 13:26:39 +0000 (UTC)
Subject: rpms/iproute/F-10 .cvsignore,1.27,1.28 sources,1.27,1.28
Message-ID: <20090119132639.C7EDA700F8@cvs1.fedora.phx.redhat.com>

Author: mmaslano

Update of /cvs/pkgs/rpms/iproute/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4882

Modified Files:
	.cvsignore sources 
Log Message:
Upload new source.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/iproute/F-10/.cvsignore,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- .cvsignore	4 Dec 2008 10:02:40 -0000	1.27
+++ .cvsignore	19 Jan 2009 13:26:09 -0000	1.28
@@ -1 +1 @@
-iproute2-2.6.27.tar.gz
+iproute2-2.6.28.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/iproute/F-10/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- sources	4 Dec 2008 10:02:40 -0000	1.27
+++ sources	19 Jan 2009 13:26:09 -0000	1.28
@@ -1 +1 @@
-70f9c837ba9fd7d9f15fd39aba1b14c9  iproute2-2.6.27.tar.gz
+595f9b17320f69e8d30d2fa80f1bca14  iproute2-2.6.28.tar.bz2



From pkgdb at fedoraproject.org  Mon Jan 19 13:31:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 13:31:33 +0000
Subject: [pkgdb] isync ownership updated
Message-ID: <20090119133133.B84AC2081FA@bastion.fedora.phx.redhat.com>

Package isync in Fedora devel is now owned by fab

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/isync



From pkgdb at fedoraproject.org  Mon Jan 19 13:31:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 13:31:47 +0000
Subject: [pkgdb] isync ownership updated
Message-ID: <20090119133147.7C2BF2081FA@bastion.fedora.phx.redhat.com>

Package isync in Fedora 10 is now owned by fab

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/isync



From pkgdb at fedoraproject.org  Mon Jan 19 13:32:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 13:32:02 +0000
Subject: [pkgdb] isync: fab has given up watchbugzilla
Message-ID: <20090119133202.7169C208467@bastion.fedora.phx.redhat.com>

fab has given up the watchbugzilla acl on isync (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/isync



From pkgdb at fedoraproject.org  Mon Jan 19 13:32:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 13:32:03 +0000
Subject: [pkgdb] isync: fab has given up watchcommits
Message-ID: <20090119133203.0CD7D208469@bastion.fedora.phx.redhat.com>

fab has given up the watchcommits acl on isync (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/isync



From ruben at fedoraproject.org  Mon Jan 19 13:33:38 2009
From: ruben at fedoraproject.org (Ruben Kerkhof)
Date: Mon, 19 Jan 2009 13:33:38 +0000 (UTC)
Subject: rpms/perl-mogilefs-server/F-10 .cvsignore, 1.3,
	1.4 perl-mogilefs-server.spec, 1.9, 1.10 sources, 1.3, 1.4
Message-ID: <20090119133338.F4133700F8@cvs1.fedora.phx.redhat.com>

Author: ruben

Update of /cvs/pkgs/rpms/perl-mogilefs-server/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6586

Modified Files:
	.cvsignore perl-mogilefs-server.spec sources 
Log Message:
* Mon Jan 19 2009 Ruben Kerkhof <ruben at rubenkerkhof.com> 2.30-1
- Upstream released new version



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-mogilefs-server/F-10/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	19 Oct 2008 20:53:20 -0000	1.3
+++ .cvsignore	19 Jan 2009 13:33:08 -0000	1.4
@@ -1 +1 @@
-mogilefs-server-2.20.tar.gz
+mogilefs-server-2.30.tar.gz


Index: perl-mogilefs-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-mogilefs-server/F-10/perl-mogilefs-server.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- perl-mogilefs-server.spec	19 Oct 2008 21:48:14 -0000	1.9
+++ perl-mogilefs-server.spec	19 Jan 2009 13:33:08 -0000	1.10
@@ -1,6 +1,6 @@
 Name:       perl-mogilefs-server
-Version:    2.20
-Release:    4%{?dist}
+Version:    2.30
+Release:    1%{?dist}
 Summary:    Server part of the MogileFS distributed filesystem
 License:    GPL+ or Artistic
 Group:      System Environment/Daemons
@@ -52,6 +52,7 @@
 Requires(post): /sbin/chkconfig
 Requires(preun): /sbin/chkconfig
 Requires(preun): /sbin/service
+Requires:       perl(Mogstored::HTTPServer::None)
 BuildRequires:  perl(Gearman::Client::Async)
 BuildRequires:  perl(Gearman::Server)
 
@@ -254,6 +255,9 @@
 
 
 %changelog
+* Mon Jan 19 2009 Ruben Kerkhof <ruben at rubenkerkhof.com> 2.30-1
+- Upstream released new version
+
 * Sun Oct 19 2008 Ruben Kerkhof <ruben at rubenkerkhof.com> 2.20-4
 - Add the 'None' backend
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-mogilefs-server/F-10/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	19 Oct 2008 20:53:20 -0000	1.3
+++ sources	19 Jan 2009 13:33:08 -0000	1.4
@@ -1 +1 @@
-129ab60bb7a060626add89ee0ba92c19  mogilefs-server-2.20.tar.gz
+be0fdae8699dba12c17b15e4327dd45e  mogilefs-server-2.30.tar.gz



From hno at fedoraproject.org  Mon Jan 19 13:33:39 2009
From: hno at fedoraproject.org (=?utf-8?q?Henrik_Nordstr=C3=B6m?=)
Date: Mon, 19 Jan 2009 13:33:39 +0000 (UTC)
Subject: rpms/bzrtools/F-10 sources,1.25,1.26
Message-ID: <20090119133339.27E5C70141@cvs1.fedora.phx.redhat.com>

Author: hno

Update of /cvs/pkgs/rpms/bzrtools/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6559/F-10

Modified Files:
	sources 
Log Message:
Upload 1.11.0


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bzrtools/F-10/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- sources	19 Jan 2009 13:23:27 -0000	1.25
+++ sources	19 Jan 2009 13:33:08 -0000	1.26
@@ -0,0 +1 @@
+fab16ba04be463fcc1684cc7f5fe0246  bzrtools-1.11.0.tar.gz



From hno at fedoraproject.org  Mon Jan 19 13:33:39 2009
From: hno at fedoraproject.org (=?utf-8?q?Henrik_Nordstr=C3=B6m?=)
Date: Mon, 19 Jan 2009 13:33:39 +0000 (UTC)
Subject: rpms/bzrtools/devel .cvsignore,1.24,1.25 sources,1.25,1.26
Message-ID: <20090119133339.6137B700F8@cvs1.fedora.phx.redhat.com>

Author: hno

Update of /cvs/pkgs/rpms/bzrtools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6559/devel

Modified Files:
	.cvsignore sources 
Log Message:
Upload 1.11.0


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bzrtools/devel/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- .cvsignore	10 Dec 2008 17:50:15 -0000	1.24
+++ .cvsignore	19 Jan 2009 13:33:09 -0000	1.25
@@ -1 +1 @@
-bzrtools-1.10.0.tar.gz
+bzrtools-1.11.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bzrtools/devel/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- sources	19 Jan 2009 13:23:27 -0000	1.25
+++ sources	19 Jan 2009 13:33:09 -0000	1.26
@@ -0,0 +1 @@
+fab16ba04be463fcc1684cc7f5fe0246  bzrtools-1.11.0.tar.gz



From mbarnes at fedoraproject.org  Mon Jan 19 13:36:20 2009
From: mbarnes at fedoraproject.org (Matthew Barnes)
Date: Mon, 19 Jan 2009 13:36:20 +0000 (UTC)
Subject: rpms/gnome-python2/devel gnome-python2.spec,1.26,1.27
Message-ID: <20090119133620.106BB700F8@cvs1.fedora.phx.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/gnome-python2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6948

Modified Files:
	gnome-python2.spec 
Log Message:

* Mon Jan 19 2009 Matthew Barnes <mbarnes at redhat.com> - 2.25.1-1.fc11
- Update to 2.25.1



Index: gnome-python2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-python2/devel/gnome-python2.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- gnome-python2.spec	21 Dec 2008 13:52:05 -0000	1.26
+++ gnome-python2.spec	19 Jan 2009 13:35:49 -0000	1.27
@@ -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 2.22.0
+# Last updated for 2.25.1
 # The order here corresponds to that in configure.ac,
 # for easier comparison.  Please do not alphabetize.
 %define pygtk_version                   2.10.3
@@ -20,8 +20,8 @@
 ### Abstract ###
 
 Name: gnome-python2
-Version: 2.22.3
-Release: 4%{?dist}
+Version: 2.25.1
+Release: 1%{?dist}
 License: LGPLv2+
 Group: Development/Languages
 Summary: The sources for the PyGNOME Python extension module
@@ -210,6 +210,9 @@
 rm -f /usr/lib/python2.2/site-packages/bonobo/__init__.{pyc,pyo}
 
 %changelog
+* Mon Jan 19 2009 Matthew Barnes <mbarnes at redhat.com> - 2.25.1-1.fc11
+- Update to 2.25.1
+
 * Sun Dec 21 2008 Matthew Barnes <mbarnes at redhat.com> - 2.22.3-4.fc11
 - Don't require devel packages in a non-devel subpackage.
 - gnome-python2 doesn't need gome-python2-gnomevfs (RH bug #477494).



From mkasik at fedoraproject.org  Mon Jan 19 13:41:59 2009
From: mkasik at fedoraproject.org (=?utf-8?b?TWFyZWsgS2HFocOtaw==?=)
Date: Mon, 19 Jan 2009 13:41:59 +0000 (UTC)
Subject: rpms/gtk2/F-10 default_printer.patch, NONE, 1.1 gtk2.spec, 1.340,
	1.341
Message-ID: <20090119134159.E0C57700F8@cvs1.fedora.phx.redhat.com>

Author: mkasik

Update of /cvs/pkgs/rpms/gtk2/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7654

Modified Files:
	gtk2.spec 
Added Files:
	default_printer.patch 
Log Message:
* Mon Jan 19 2009 Marek Kasik <mkasik at redhat.com> - 2.14.7-2
- fix a problem with default printer in a network
- Resolves: #478400


default_printer.patch:

--- NEW FILE default_printer.patch ---
--- modules/printbackends/cups/gtkprintbackendcups.c	2009-01-07 17:33:32.000000000 +0100
+++ modules/printbackends/cups/gtkprintbackendcups.c	2009-01-19 13:20:05.000000000 +0100
@@ -1247,7 +1247,8 @@ cups_request_printer_list_cb (GtkPrintBa
         else if (strcmp (attr->name, "printer-type") == 0)
           {
             got_printer_type = TRUE;
-            if (attr->values[0].integer & 0x00020000)
+            if ((attr->values[0].integer & 0x00020000) &&
+               !(attr->values[0].integer & 0x00000002))
               default_printer = TRUE;
             else
               default_printer = FALSE;


Index: gtk2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtk2/F-10/gtk2.spec,v
retrieving revision 1.340
retrieving revision 1.341
diff -u -r1.340 -r1.341
--- gtk2.spec	8 Jan 2009 00:11:56 -0000	1.340
+++ gtk2.spec	19 Jan 2009 13:41:29 -0000	1.341
@@ -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
+# http://bugzilla.gnome.org/show_bug.cgi?id=478400
+Patch3: default_printer.patch
 
 BuildRequires: atk-devel >= %{atk_version}
 BuildRequires: pango-devel >= %{pango_version}
@@ -116,6 +118,7 @@
 %patch0 -p1 -b .lib64
 %patch1 -p1 -b .set-invisible-char-to-bullet
 %patch2 -p1 -b .workaround
+%patch3 -p0 -b default-printer
 
 for i in config.guess config.sub ; do
   test -f %{_datadir}/libtool/$i && cp %{_datadir}/libtool/$i .
@@ -297,6 +300,10 @@
 %{_datadir}/gtk-2.0
 
 %changelog
+* Mon Jan 19 2009 Marek Kasik <mkasik at redhat.com> - 2.14.7-2
+- fix a problem with default printer in a network
+- Resolves: #478400
+
 * Wed Jan  7 2009 Matthias Clasen <mclasen at redhat.com> - 2.14.7-1
 - Upate to 2.14.7
 



From ruben at fedoraproject.org  Mon Jan 19 13:42:41 2009
From: ruben at fedoraproject.org (Ruben Kerkhof)
Date: Mon, 19 Jan 2009 13:42:41 +0000 (UTC)
Subject: rpms/perl-mogilefs-server/F-9 mogilefs-remove_deps.patch, NONE,
	1.1 .cvsignore, 1.2, 1.3 perl-mogilefs-server.spec, 1.4,
	1.5 sources, 1.2, 1.3
Message-ID: <20090119134241.BCAAE700F8@cvs1.fedora.phx.redhat.com>

Author: ruben

Update of /cvs/pkgs/rpms/perl-mogilefs-server/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7756

Modified Files:
	.cvsignore perl-mogilefs-server.spec sources 
Added Files:
	mogilefs-remove_deps.patch 
Log Message:
* Mon Jan 19 2009 Ruben Kerkhof <ruben at rubenkerkhof.com> 2.30-1
- Upstream released new version


mogilefs-remove_deps.patch:

--- NEW FILE mogilefs-remove_deps.patch ---
diff -up mogilefs-server-2.20/Makefile.PL.orig mogilefs-server-2.20/Makefile.PL
--- mogilefs-server-2.20/Makefile.PL.orig	2008-10-19 23:10:24.000000000 +0200
+++ mogilefs-server-2.20/Makefile.PL	2008-10-19 23:11:00.000000000 +0200
@@ -36,8 +36,6 @@ WriteMakefile(
     },
     EXTRA_META              => <<'EXTRA',
 no_index:
-    directory:
-        - lib/mogdeps
     package:
         - ProcessHandle
         - TrackerHandle
diff -up mogilefs-server-2.20/MANIFEST.orig mogilefs-server-2.20/MANIFEST
--- mogilefs-server-2.20/MANIFEST.orig	2008-10-19 23:10:17.000000000 +0200
+++ mogilefs-server-2.20/MANIFEST	2008-10-19 23:10:47.000000000 +0200
@@ -3,52 +3,6 @@ doc/fsck-notes.txt
 doc/memcache-support.txt
 doc/pluggable-replication-policies.txt
 doc/testing.txt
-lib/mogdeps/Danga/Socket.pm
-lib/mogdeps/Gearman/Client.pm
-lib/mogdeps/Gearman/Client/Async.pm
-lib/mogdeps/Gearman/Client/Async/Connection.pm
-lib/mogdeps/Gearman/JobStatus.pm
-lib/mogdeps/Gearman/Objects.pm
-lib/mogdeps/Gearman/ResponseParser.pm
-lib/mogdeps/Gearman/ResponseParser/Taskset.pm
-lib/mogdeps/Gearman/Server.pm
-lib/mogdeps/Gearman/Server/Client.pm
-lib/mogdeps/Gearman/Server/Job.pm
-lib/mogdeps/Gearman/Task.pm
-lib/mogdeps/Gearman/Taskset.pm
-lib/mogdeps/Gearman/Util.pm
-lib/mogdeps/Gearman/Worker.pm
-lib/mogdeps/Net/Netmask.pm
-lib/mogdeps/Perlbal.pm
-lib/mogdeps/Perlbal/AIO.pm
-lib/mogdeps/Perlbal/BackendHTTP.pm
-lib/mogdeps/Perlbal/Cache.pm
-lib/mogdeps/Perlbal/ChunkedUploadState.pm
-lib/mogdeps/Perlbal/ClientHTTP.pm
-lib/mogdeps/Perlbal/ClientHTTPBase.pm
-lib/mogdeps/Perlbal/ClientManage.pm
-lib/mogdeps/Perlbal/ClientProxy.pm
-lib/mogdeps/Perlbal/CommandContext.pm
-lib/mogdeps/Perlbal/HTTPHeaders.pm
-lib/mogdeps/Perlbal/ManageCommand.pm
-lib/mogdeps/Perlbal/Plugin/AccessControl.pm
-lib/mogdeps/Perlbal/Plugin/AutoRemoveLeadingDir.pm
-lib/mogdeps/Perlbal/Plugin/Highpri.pm
-lib/mogdeps/Perlbal/Plugin/NotModified.pm
-lib/mogdeps/Perlbal/Plugin/Queues.pm
-lib/mogdeps/Perlbal/Plugin/Stats.pm
-lib/mogdeps/Perlbal/Plugin/Vhosts.pm
-lib/mogdeps/Perlbal/Pool.pm
-lib/mogdeps/Perlbal/ReproxyManager.pm
-lib/mogdeps/Perlbal/Service.pm
-lib/mogdeps/Perlbal/Socket.pm
-lib/mogdeps/Perlbal/TCPListener.pm
-lib/mogdeps/Perlbal/Test.pm
-lib/mogdeps/Perlbal/Test/WebClient.pm
-lib/mogdeps/Perlbal/Test/WebServer.pm
-lib/mogdeps/Perlbal/UploadListener.pm
-lib/mogdeps/Perlbal/Util.pm
-lib/mogdeps/Sys/Syscall.pm
 lib/MogileFS/Class.pm
 lib/MogileFS/Config.pm
 lib/MogileFS/Connection/Client.pm
diff -up mogilefs-server-2.20/META.yml.orig mogilefs-server-2.20/META.yml
--- mogilefs-server-2.20/META.yml.orig	2008-10-19 23:10:30.000000000 +0200
+++ mogilefs-server-2.20/META.yml	2008-10-19 23:11:08.000000000 +0200
@@ -23,8 +23,6 @@ meta-spec:
     url:     http://module-build.sourceforge.net/META-spec-v1.3.html
     version: 1.3
 no_index:
-    directory:
-        - lib/mogdeps
     package:
         - ProcessHandle
         - TrackerHandle


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-mogilefs-server/F-9/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	20 Jan 2008 20:33:48 -0000	1.2
+++ .cvsignore	19 Jan 2009 13:42:11 -0000	1.3
@@ -1 +1 @@
-mogilefs-server-2.17.tar.gz
+mogilefs-server-2.30.tar.gz


Index: perl-mogilefs-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-mogilefs-server/F-9/perl-mogilefs-server.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-mogilefs-server.spec	13 Aug 2008 14:22:10 -0000	1.4
+++ perl-mogilefs-server.spec	19 Jan 2009 13:42:11 -0000	1.5
@@ -1,18 +1,16 @@
 Name:       perl-mogilefs-server
-Version:    2.17
-Release:    7%{?dist}
+Version:    2.30
+Release:    1%{?dist}
 Summary:    Server part of the MogileFS distributed filesystem
 License:    GPL+ or Artistic
 Group:      System Environment/Daemons
 URL:        http://search.cpan.org/dist/mogilefs-server/
-Source0:    http://search.cpan.org/CPAN/authors/id/B/BR/BRADFITZ/mogilefs-server-%{version}.tar.gz
+Source0:    http://search.cpan.org/CPAN/authors/id/D/DO/DORMANDO/mogilefs-server-%{version}.tar.gz
 Source1:    mogstored.init
 Source2:    mogilefsd.init
 Source3:    mogilefsd.conf
 Source4:    mogilefs.conf
-
-# bz 458890
-Patch0:    mogilefs-dont_delete_valid_files_during_cleanup.patch
+Patch0:     mogilefs-remove_deps.patch
 
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:  noarch
@@ -20,6 +18,7 @@
 BuildRequires:  perl(ExtUtils::MakeMaker)
 BuildRequires:  perl(Test::More)
 BuildRequires:  perl(MogileFS::Utils)
+BuildRequires:  perl(MogileFS::Client)
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 Provides:  mogilefs-server = %{version}-%{release}
@@ -47,11 +46,13 @@
 Summary:        MogileFS storage daemon
 Group:          System Environment/Daemons
 Requires:       initscripts
+Requires:       sysstat
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 Requires(pre):  shadow-utils
 Requires(post): /sbin/chkconfig
 Requires(preun): /sbin/chkconfig
 Requires(preun): /sbin/service
+Requires:       perl(Mogstored::HTTPServer::None)
 BuildRequires:  perl(Gearman::Client::Async)
 BuildRequires:  perl(Gearman::Server)
 
@@ -77,6 +78,12 @@
 Requires:   perl(Mogstored::HTTPServer), lighttpd
 Requires:   perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
+%package -n mogstored-backend-none
+Summary:    Backend which allows mogstored to work with unmanaged DAV servers
+Group:      System Environment/Daemons
+Requires:   perl(Mogstored::HTTPServer)
+Requires:   perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+
 
 %description -n mogilefsd
 The MogileFS tracker daemon mogilefsd
@@ -97,10 +104,13 @@
 %description -n mogstored-backend-lighttpd
 LigHTTPd backend for mogstored, the MogileFS storage daemon
 
+%description -n mogstored-backend-none
+Backend which allows mogstored to work with unmanaged DAV servers
+
 
 %prep
 %setup -q -n mogilefs-server-%{version}
-%patch0 -p3 -b .orig
+%patch0 -p1
 
 # Remove mogstored backends and Perlbal from Requires:
 cat << \EOF > mogstored-req
@@ -115,6 +125,7 @@
 
 
 %build
+rm -rv lib/mogdeps
 %{__perl} Makefile.PL INSTALLDIRS=vendor
 make %{?_smp_mflags}
 
@@ -238,14 +249,33 @@
 %defattr(-,root,root,-)
 %{perl_vendorlib}/Mogstored/HTTPServer/Lighttpd.pm
 
+%files -n mogstored-backend-none
+%defattr(-,root,root,-)
+%{perl_vendorlib}/Mogstored/HTTPServer/None.pm
+
 
 %changelog
+* Mon Jan 19 2009 Ruben Kerkhof <ruben at rubenkerkhof.com> 2.30-1
+- Upstream released new version
+
+* Sun Oct 19 2008 Ruben Kerkhof <ruben at rubenkerkhof.com> 2.20-4
+- Add the 'None' backend
+
+* Sun Oct 19 2008 Ruben Kerkhof <ruben at rubenkerkhof.com> 2.20-3
+- Remove the included dependencies before building, not after
+
+* Sun Oct 19 2008 Ruben Kerkhof <ruben at rubenkerkhof.com> 2.20-2
+- Remove included dependencies
+
+* Sun Oct 19 2008 Ruben Kerkhof <ruben at rubenkerkhof.com> 2.20-1
+- Upstream released new version
+
 * Wed Aug 13 2008 Ruben Kerkhof <ruben at rubenkerkhof.com> 2.17-7
-- Due to a problem in the tempfile handling, mogilefs occasionally
-  looses file data after a while. Bz 458890
+- Add compat statements for subpackages
 
-* Sat Aug 02 2008 Ruben Kerkhof <ruben at rubenkerkhof.com> 2.17-6
-- Fix build for perl 5.10.0 (bz #453411)
+* Wed Aug 13 2008 Ruben Kerkhof <ruben at rubenkerkhof.com> 2.17-6
+- Due to a problem in the tempfile handling, mogilefs occasionally 
+  looses file data after a while. Bz 458890
 
 * Sat Feb 09 2008 Ruben Kerkhof <ruben at rubenkerkhof.com> 2.17-5
 - Rename package to respect the Naming Guidelines


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-mogilefs-server/F-9/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	20 Jan 2008 20:33:48 -0000	1.2
+++ sources	19 Jan 2009 13:42:11 -0000	1.3
@@ -1 +1 @@
-96814eb32b258557a1beea73d2ff4647  mogilefs-server-2.17.tar.gz
+be0fdae8699dba12c17b15e4327dd45e  mogilefs-server-2.30.tar.gz



From mkasik at fedoraproject.org  Mon Jan 19 13:45:12 2009
From: mkasik at fedoraproject.org (=?utf-8?b?TWFyZWsgS2HFocOtaw==?=)
Date: Mon, 19 Jan 2009 13:45:12 +0000 (UTC)
Subject: rpms/gtk2/devel default_printer.patch, NONE, 1.1 gtk2.spec, 1.342,
	1.343
Message-ID: <20090119134512.2CF16700F8@cvs1.fedora.phx.redhat.com>

Author: mkasik

Update of /cvs/pkgs/rpms/gtk2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8092

Modified Files:
	gtk2.spec 
Added Files:
	default_printer.patch 
Log Message:
* Mon Jan 19 2009 Marek Kasik <mkasik at redhat.com> - 2.15.0-2
- fix a problem with default printer in a network
- Resolves: #478400


default_printer.patch:

--- NEW FILE default_printer.patch ---
--- modules/printbackends/cups/gtkprintbackendcups.c	2009-01-01 20:41:58.000000000 +0100
+++ modules/printbackends/cups/gtkprintbackendcups.c	2009-01-19 13:31:59.000000000 +0100
@@ -1303,7 +1303,8 @@ cups_request_printer_list_cb (GtkPrintBa
         else if (strcmp (attr->name, "printer-type") == 0)
           {
             got_printer_type = TRUE;
-            if (attr->values[0].integer & 0x00020000)
+            if ((attr->values[0].integer & 0x00020000) &&
+               !(attr->values[0].integer & 0x00000002))
               default_printer = TRUE;
             else
               default_printer = FALSE;


Index: gtk2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtk2/devel/gtk2.spec,v
retrieving revision 1.342
retrieving revision 1.343
diff -u -r1.342 -r1.343
--- gtk2.spec	2 Jan 2009 01:46:04 -0000	1.342
+++ gtk2.spec	19 Jan 2009 13:44:41 -0000	1.343
@@ -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.15/gtk+-%{version}.tar.bz2
@@ -28,6 +28,8 @@
 # a workaround for some brokenness in the flash plugin
 # see http://bugzilla.gnome.org/show_bug.cgi?id=463773
 Patch2: workaround.patch
+# http://bugzilla.redhat.com/show_bug.cgi?id=478400
+Patch3: default_printer.patch
 
 BuildRequires: atk-devel >= %{atk_version}
 BuildRequires: pango-devel >= %{pango_version}
@@ -114,6 +116,7 @@
 
 %patch0 -p1 -b .lib64
 %patch2 -p1 -b .workaround
+%patch3 -p0 -b default-printer
 
 %build
 libtoolize --force --copy
@@ -291,6 +294,10 @@
 %{_datadir}/gtk-2.0
 
 %changelog
+* Mon Jan 19 2009 Marek Kasik <mkasik at redhat.com> - 2.15.0-2
+- fix a problem with default printer in a network
+- Resolves: #478400
+
 * Thu Jan  1 2009 Matthias Clasen <mclasen at redhat.com> - 2.15.0-1
 - Update to 2.15.0
 



From pvrabec at fedoraproject.org  Mon Jan 19 13:48:50 2009
From: pvrabec at fedoraproject.org (Peter Vrabec)
Date: Mon, 19 Jan 2009 13:48:50 +0000 (UTC)
Subject: rpms/shadow-utils/devel shadow-utils.spec,1.125,1.126
Message-ID: <20090119134850.17FAD700F8@cvs1.fedora.phx.redhat.com>

Author: pvrabec

Update of /cvs/extras/rpms/shadow-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8520

Modified Files:
	shadow-utils.spec 
Log Message:
- fix license tag (#226416)
- get rid of tabs in spec file (#226416)
- convert HOWTO to UTF8 (#226416)



Index: shadow-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/shadow-utils/devel/shadow-utils.spec,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -r1.125 -r1.126
--- shadow-utils.spec	5 Jan 2009 12:57:44 -0000	1.125
+++ shadow-utils.spec	19 Jan 2009 13:48:19 -0000	1.126
@@ -5,7 +5,7 @@
 Summary: Utilities for managing accounts and shadow password files
 Name: shadow-utils
 Version: 4.1.2
-Release: 10%{?dist}
+Release: 11%{?dist}
 Epoch: 2
 URL: http://pkg-shadow.alioth.debian.org/
 Source0: ftp://pkg-shadow.alioth.debian.org/pub/pkg-shadow/shadow-%{version}.tar.bz2
@@ -22,7 +22,7 @@
 Patch7: shadow-4.1.2-checkName.patch
 Patch8: shadow-4.1.2-gmNoGroup.patch
 
-License: BSD
+License: BSD and GPLv2+
 Group: System Environment/Base
 BuildRequires: autoconf, automake, libtool, gettext-devel
 BuildRequires: libselinux-devel >= 1.25.2-1
@@ -56,6 +56,8 @@
 %patch7 -p1 -b .checkName
 %patch8 -p1 -b .gmNoGroup
 
+iconv -f ISO88591 -t utf-8  doc/HOWTO > doc/HOWTO.utf8
+cp -f doc/HOWTO.utf8 doc/HOWTO
 
 rm po/*.gmo
 rm po/stamp-po
@@ -67,16 +69,16 @@
 
 %build
 %configure \
-	--enable-shadowgrp \
-	--with-audit \
-	--with-sha-crypt \
+        --enable-shadowgrp \
+        --with-audit \
+        --with-sha-crypt \
 %if %{WITH_SELINUX}
-	--with-selinux \
+        --with-selinux \
 %endif
-	--without-libcrack \
-	--without-libpam \
-	--disable-shared
-make 
+        --without-libcrack \
+        --without-libpam \
+        --disable-shared
+make
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -90,7 +92,7 @@
 #ln -s %{_mandir}/man8/useradd.8 $RPM_BUILD_ROOT/%{_mandir}/man8/adduser.8
 ln -s useradd.8 $RPM_BUILD_ROOT/%{_mandir}/man8/adduser.8
 for subdir in $RPM_BUILD_ROOT/%{_mandir}/{??,??_??,??_??.*}/man* ; do
-	test -d $subdir && test -e $subdir/useradd.8 && echo ".so man8/useradd.8" > $subdir/adduser.8
+        test -d $subdir && test -e $subdir/useradd.8 && echo ".so man8/useradd.8" > $subdir/adduser.8
 done
 
 # Remove binaries we don't use.
@@ -154,8 +156,8 @@
 %defattr(-,root,root)
 %doc NEWS doc/HOWTO README
 %dir %{_sysconfdir}/default
-%attr(0644,root,root)	%config(noreplace) %{_sysconfdir}/login.defs
-%attr(0600,root,root)	%config(noreplace) %{_sysconfdir}/default/useradd
+%attr(0644,root,root)   %config(noreplace) %{_sysconfdir}/login.defs
+%attr(0600,root,root)   %config(noreplace) %{_sysconfdir}/default/useradd
 %{_bindir}/sg
 %{_bindir}/chage
 %{_bindir}/faillog
@@ -163,8 +165,8 @@
 %{_bindir}/lastlog
 %{_bindir}/newgrp
 %{_sbindir}/adduser
-%attr(0750,root,root)	%{_sbindir}/user*
-%attr(0750,root,root)	%{_sbindir}/group*
+%attr(0750,root,root)   %{_sbindir}/user*
+%attr(0750,root,root)   %{_sbindir}/group*
 %{_sbindir}/grpck
 %{_sbindir}/pwck
 %{_sbindir}/*conv
@@ -195,6 +197,11 @@
 %{_mandir}/man8/vigr.8*
 
 %changelog
+* Mon Jan 19 2009 Peter Vrabec <pvrabec at redhat.com> 2:4.1.2-11
+- fix license tag (#226416)
+- get rid of tabs in spec file (#226416)
+- convert HOWTO to UTF8 (#226416)
+
 * Mon Jan 05 2009 Peter Vrabec <pvrabec at redhat.com> 2:4.1.2-10
 - Add policycoreutils as Requires, because of restorecon (#478494)
 



From mbarnes at fedoraproject.org  Mon Jan 19 13:49:36 2009
From: mbarnes at fedoraproject.org (Matthew Barnes)
Date: Mon, 19 Jan 2009 13:49:36 +0000 (UTC)
Subject: rpms/gnome-python2/devel .cvsignore,1.37,1.38 sources,1.37,1.38
Message-ID: <20090119134936.27062700F8@cvs1.fedora.phx.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/gnome-python2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8627

Modified Files:
	.cvsignore sources 
Log Message:
Helps to upload the tarball...



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-python2/devel/.cvsignore,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- .cvsignore	22 Sep 2008 16:15:16 -0000	1.37
+++ .cvsignore	19 Jan 2009 13:49:05 -0000	1.38
@@ -1 +1 @@
-gnome-python-2.22.3.tar.bz2
+gnome-python-2.25.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-python2/devel/sources,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- sources	22 Sep 2008 16:15:16 -0000	1.37
+++ sources	19 Jan 2009 13:49:05 -0000	1.38
@@ -1 +1 @@
-ab12d94954a57de39b25eb7903d8429c  gnome-python-2.22.3.tar.bz2
+6ead0134fd995726636440724ffb2639  gnome-python-2.25.1.tar.bz2



From dwalsh at fedoraproject.org  Mon Jan 19 13:51:44 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Mon, 19 Jan 2009 13:51:44 +0000 (UTC)
Subject: rpms/selinux-policy/devel modules-mls.conf, 1.43,
	1.44 policy-20090105.patch, 1.6, 1.7
Message-ID: <20090119135144.70F1F700F8@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8989

Modified Files:
	modules-mls.conf policy-20090105.patch 
Log Message:
* Thu Jan 15 2009 Dan Walsh <dwalsh at redhat.com> 3.6.2-5
- Define openoffice as an x_domain



Index: modules-mls.conf
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/modules-mls.conf,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- modules-mls.conf	16 Jan 2009 21:32:59 -0000	1.43
+++ modules-mls.conf	19 Jan 2009 13:51:13 -0000	1.44
@@ -1692,13 +1692,6 @@
 # 
 courier = module
 
-# Layer: apps
-# Module: livecd
-#
-# livecd creator
-# 
-livecd = module
-
 # Layer: services
 # Module: snort
 #

policy-20090105.patch:

Index: policy-20090105.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-20090105.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- policy-20090105.patch	16 Jan 2009 21:11:58 -0000	1.6
+++ policy-20090105.patch	19 Jan 2009 13:51:13 -0000	1.7
@@ -2647,8 +2647,8 @@
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/nsplugin.te serefpolicy-3.6.2/policy/modules/apps/nsplugin.te
 --- nsaserefpolicy/policy/modules/apps/nsplugin.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.2/policy/modules/apps/nsplugin.te	2009-01-05 17:54:58.000000000 -0500
-@@ -0,0 +1,275 @@
++++ serefpolicy-3.6.2/policy/modules/apps/nsplugin.te	2009-01-19 08:44:01.000000000 -0500
+@@ -0,0 +1,277 @@
 +
 +policy_module(nsplugin, 1.0.0)
 +
@@ -2921,7 +2921,9 @@
 +	allow nsplugin_t unconfined_mono_t:process signull;
 +')
 +
-+unconfined_execmem_exec(nsplugin_t)
++optional_policy(`
++	unconfined_execmem_exec(nsplugin_t)
++')
 +
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/openoffice.fc serefpolicy-3.6.2/policy/modules/apps/openoffice.fc



From mbarnes at fedoraproject.org  Mon Jan 19 13:57:16 2009
From: mbarnes at fedoraproject.org (Matthew Barnes)
Date: Mon, 19 Jan 2009 13:57:16 +0000 (UTC)
Subject: rpms/gnome-python2-desktop/devel .cvsignore, 1.24,
	1.25 gnome-python2-desktop.spec, 1.48, 1.49 sources, 1.24,
	1.25 gnome-python-desktop-2.24.1-missing-libgnomeui.patch, 1.1, NONE
Message-ID: <20090119135716.39127700F8@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-serv9716

Modified Files:
	.cvsignore gnome-python2-desktop.spec sources 
Removed Files:
	gnome-python-desktop-2.24.1-missing-libgnomeui.patch 
Log Message:

* Mon Jan 19 2009 Matthew Barnes <mbarnes at redhat.com> - 2.25.1-1.fc11
- Update to 2.25.1
- Remove patch for GNOME bug #564525 (fixed upstream).



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-python2-desktop/devel/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- .cvsignore	20 Dec 2008 00:01:39 -0000	1.24
+++ .cvsignore	19 Jan 2009 13:56:45 -0000	1.25
@@ -1 +1 @@
-gnome-python-desktop-2.24.1.tar.bz2
+gnome-python-desktop-2.25.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.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- gnome-python2-desktop.spec	23 Dec 2008 13:20:03 -0000	1.48
+++ gnome-python2-desktop.spec	19 Jan 2009 13:56:45 -0000	1.49
@@ -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.24.0
+# Last updated for version 2.25.1
 # The order here corresponds to that in configure.ac,
 # for easier comparison.  Please do not alphabetize.
 %define pygtk_version                   2.10.3
@@ -8,36 +8,32 @@
 %define gtk_version                     2.4.0
 %define gnome_python_version            2.10.0
 %define gnome_panel_version             2.13.4
+# Version not necessary for libgnomeprintui
 %define gtksourceview_version           1:1.8.5-2
 %define libwnck_version                 2.19.3
 %define libgtop_version                 2.13.0
 %define nautilus_cd_burner_version      2.15.3
 %define gnome_media_version             2.10.0
-%define gconf2_version			2.10.0
+%define gconf2_version                  2.10.0
 %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
 %define totem_version                   1.4.0
-%define eds_version			1.4.0
+%define eds_version                     1.4.0
 %define bug_buddy_version               2.16.0
 
 ### Abstract ###
 
 Name: gnome-python2-desktop
-Version: 2.24.1
-Release: 2%{?dist}
+Version: 2.25.1
+Release: 1%{?dist}
 License: GPLv2+
 Group: Development/Languages
 Summary: The sources for additional PyGNOME Python extension modules
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Source: gnome-python-desktop-%{version}.tar.bz2
 
-### Patches ###
-
-# GNOME bug #564525
-Patch1: gnome-python-desktop-2.24.1-missing-libgnomeui.patch
-
 ### Dependencies ###
 
 Requires: gnome-python2-canvas >= %{gnome_python_version}
@@ -229,7 +225,6 @@
 
 %prep
 %setup -q -n gnome-python-desktop-%{version}
-%patch1 -p1 -b .missing-libgnomeui
 
 %build
 autoreconf -f -i
@@ -318,6 +313,10 @@
 %{python_sitearch}/gtk-2.0/gnomekeyring.so
 
 %changelog
+* Mon Jan 19 2009 Matthew Barnes <mbarnes at redhat.com> - 2.25.1-1.fc11
+- Update to 2.25.1
+- Remove patch for GNOME bug #564525 (fixed upstream).
+
 * Tue Dec 23 2008 Caol??n McNamara <caolanm at redhat.com> - 2.24.1-2.fc11
 - make build
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-python2-desktop/devel/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- sources	20 Dec 2008 00:01:39 -0000	1.24
+++ sources	19 Jan 2009 13:56:45 -0000	1.25
@@ -1 +1 @@
-3eac6b859bff98148b021c9d11224ca5  gnome-python-desktop-2.24.1.tar.bz2
+213fa232fbf3a64e2afd4c38ad72e2b3  gnome-python-desktop-2.25.1.tar.bz2


--- gnome-python-desktop-2.24.1-missing-libgnomeui.patch DELETED ---



From pkgdb at fedoraproject.org  Mon Jan 19 14:00:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 14:00:00 +0000
Subject: [pkgdb] kvm: virtmaint has requested watchcommits
Message-ID: <20090119140001.10AC6208474@bastion.fedora.phx.redhat.com>

virtmaint has requested the watchcommits acl on kvm (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kvm



From ruben at fedoraproject.org  Mon Jan 19 14:00:12 2009
From: ruben at fedoraproject.org (Ruben Kerkhof)
Date: Mon, 19 Jan 2009 14:00:12 +0000 (UTC)
Subject: rpms/perl-mogilefs-server/EL-5 perl-mogilefs-server.spec,1.3,1.4
Message-ID: <20090119140012.ACC54700F8@cvs1.fedora.phx.redhat.com>

Author: ruben

Update of /cvs/pkgs/rpms/perl-mogilefs-server/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10720

Modified Files:
	perl-mogilefs-server.spec 
Log Message:
* Mon Jan 19 2009 Ruben Kerkhof <ruben at rubenkerkhof.com> 2.30-1
- Upstream released new version



Index: perl-mogilefs-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-mogilefs-server/EL-5/perl-mogilefs-server.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- perl-mogilefs-server.spec	2 Nov 2008 19:14:36 -0000	1.3
+++ perl-mogilefs-server.spec	19 Jan 2009 13:59:42 -0000	1.4
@@ -1,6 +1,6 @@
 Name:       perl-mogilefs-server
-Version:    2.20
-Release:    4%{?dist}
+Version:    2.30
+Release:    1%{?dist}
 Summary:    Server part of the MogileFS distributed filesystem
 License:    GPL+ or Artistic
 Group:      System Environment/Daemons
@@ -52,6 +52,7 @@
 Requires(post): /sbin/chkconfig
 Requires(preun): /sbin/chkconfig
 Requires(preun): /sbin/service
+Requires:       perl(Mogstored::HTTPServer::None)
 BuildRequires:  perl(Gearman::Client::Async)
 BuildRequires:  perl(Gearman::Server)
 
@@ -254,6 +255,9 @@
 
 
 %changelog
+* Mon Jan 19 2009 Ruben Kerkhof <ruben at rubenkerkhof.com> 2.30-1
+- Upstream released new version
+
 * Sun Nov 02 2008 Ruben Kerkhof <ruben at rubenkerkhof.com> 2.20-1
 - Upstream released new version
 



From pkgdb at fedoraproject.org  Mon Jan 19 14:00:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 14:00:12 +0000
Subject: [pkgdb] kvm: virtmaint has requested watchbugzilla
Message-ID: <20090119140012.622FE208467@bastion.fedora.phx.redhat.com>

virtmaint has requested the watchbugzilla acl on kvm (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kvm



From pkgdb at fedoraproject.org  Mon Jan 19 14:00:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 14:00:14 +0000
Subject: [pkgdb] kvm: virtmaint has requested watchcommits
Message-ID: <20090119140014.3E18020847B@bastion.fedora.phx.redhat.com>

virtmaint has requested the watchcommits acl on kvm (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kvm



From pkgdb at fedoraproject.org  Mon Jan 19 14:00:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 14:00:22 +0000
Subject: [pkgdb] kvm: virtmaint has requested watchbugzilla
Message-ID: <20090119140023.74D58208473@bastion.fedora.phx.redhat.com>

virtmaint has requested the watchbugzilla acl on kvm (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kvm



From pkgdb at fedoraproject.org  Mon Jan 19 14:00:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 14:00:23 +0000
Subject: [pkgdb] kvm: virtmaint has requested watchcommits
Message-ID: <20090119140023.B135220847F@bastion.fedora.phx.redhat.com>

virtmaint has requested the watchcommits acl on kvm (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kvm



From pkgdb at fedoraproject.org  Mon Jan 19 14:00:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 14:00:29 +0000
Subject: [pkgdb] kvm: virtmaint has requested watchbugzilla
Message-ID: <20090119140029.60B33208483@bastion.fedora.phx.redhat.com>

virtmaint has requested the watchbugzilla acl on kvm (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kvm



From pkgdb at fedoraproject.org  Mon Jan 19 14:00:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 14:00:45 +0000
Subject: [pkgdb] kvm: virtmaint has requested watchbugzilla
Message-ID: <20090119140045.B09A5208478@bastion.fedora.phx.redhat.com>

virtmaint has requested the watchbugzilla acl on kvm (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kvm



From pkgdb at fedoraproject.org  Mon Jan 19 14:00:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 14:00:33 +0000
Subject: [pkgdb] kvm: virtmaint has requested watchcommits
Message-ID: <20090119140033.F02A4208476@bastion.fedora.phx.redhat.com>

virtmaint has requested the watchcommits acl on kvm (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kvm



From pkgdb at fedoraproject.org  Mon Jan 19 14:00:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 14:00:45 +0000
Subject: [pkgdb] kvm: virtmaint has requested watchcommits
Message-ID: <20090119140046.0AB3F208479@bastion.fedora.phx.redhat.com>

virtmaint has requested the watchcommits acl on kvm (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kvm



From pkgdb at fedoraproject.org  Mon Jan 19 14:01:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 14:01:50 +0000
Subject: [pkgdb] xen: virtmaint has requested watchcommits
Message-ID: <20090119140151.828CD208473@bastion.fedora.phx.redhat.com>

virtmaint has requested the watchcommits acl on xen (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/xen



From pkgdb at fedoraproject.org  Mon Jan 19 14:01:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 14:01:53 +0000
Subject: [pkgdb] xen: virtmaint has requested watchcommits
Message-ID: <20090119140153.A7FB2208476@bastion.fedora.phx.redhat.com>

virtmaint has requested the watchcommits acl on xen (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/xen



From pkgdb at fedoraproject.org  Mon Jan 19 14:01:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 14:01:58 +0000
Subject: [pkgdb] xen: virtmaint has requested watchbugzilla
Message-ID: <20090119140158.CB85C208480@bastion.fedora.phx.redhat.com>

virtmaint has requested the watchbugzilla acl on xen (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/xen



From pkgdb at fedoraproject.org  Mon Jan 19 14:02:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 14:02:06 +0000
Subject: [pkgdb] xen: virtmaint has requested watchcommits
Message-ID: <20090119140207.00360208489@bastion.fedora.phx.redhat.com>

virtmaint has requested the watchcommits acl on xen (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/xen



From pkgdb at fedoraproject.org  Mon Jan 19 14:02:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 14:02:03 +0000
Subject: [pkgdb] xen: virtmaint has requested watchbugzilla
Message-ID: <20090119140207.C02C020848D@bastion.fedora.phx.redhat.com>

virtmaint has requested the watchbugzilla acl on xen (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/xen



From pkgdb at fedoraproject.org  Mon Jan 19 14:01:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 14:01:57 +0000
Subject: [pkgdb] xen: virtmaint has requested watchbugzilla
Message-ID: <20090119140208.71F63208490@bastion.fedora.phx.redhat.com>

virtmaint has requested the watchbugzilla acl on xen (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/xen



From pkgdb at fedoraproject.org  Mon Jan 19 14:02:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 14:02:07 +0000
Subject: [pkgdb] xen: virtmaint has requested watchbugzilla
Message-ID: <20090119140208.9B763208494@bastion.fedora.phx.redhat.com>

virtmaint has requested the watchbugzilla acl on xen (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/xen



From pkgdb at fedoraproject.org  Mon Jan 19 14:02:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 14:02:09 +0000
Subject: [pkgdb] xen: virtmaint has requested watchcommits
Message-ID: <20090119140209.5766E2084A7@bastion.fedora.phx.redhat.com>

virtmaint has requested the watchcommits acl on xen (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/xen



From pkgdb at fedoraproject.org  Mon Jan 19 14:01:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 14:01:57 +0000
Subject: [pkgdb] xen: virtmaint has requested watchbugzilla
Message-ID: <20090119140212.5810F208473@bastion.fedora.phx.redhat.com>

virtmaint has requested the watchbugzilla acl on xen (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/xen



From pkgdb at fedoraproject.org  Mon Jan 19 14:02:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 14:02:04 +0000
Subject: [pkgdb] xen: virtmaint has requested watchcommits
Message-ID: <20090119140214.1076C2084BA@bastion.fedora.phx.redhat.com>

virtmaint has requested the watchcommits acl on xen (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/xen



From pkgdb at fedoraproject.org  Mon Jan 19 14:02:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 14:02:30 +0000
Subject: [pkgdb] xenner: virtmaint has requested watchcommits
Message-ID: <20090119140230.CB46D20847D@bastion.fedora.phx.redhat.com>

virtmaint has requested the watchcommits acl on xenner (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/xenner



From pkgdb at fedoraproject.org  Mon Jan 19 14:02:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 14:02:31 +0000
Subject: [pkgdb] xenner: virtmaint has requested watchbugzilla
Message-ID: <20090119140232.19098208474@bastion.fedora.phx.redhat.com>

virtmaint has requested the watchbugzilla acl on xenner (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/xenner



From pkgdb at fedoraproject.org  Mon Jan 19 14:02:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 14:02:32 +0000
Subject: [pkgdb] xenner: virtmaint has requested watchbugzilla
Message-ID: <20090119140233.4302D208700@bastion.fedora.phx.redhat.com>

virtmaint has requested the watchbugzilla acl on xenner (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/xenner



From pkgdb at fedoraproject.org  Mon Jan 19 14:02:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 14:02:34 +0000
Subject: [pkgdb] xenner: virtmaint has requested watchcommits
Message-ID: <20090119140234.C7FB9208701@bastion.fedora.phx.redhat.com>

virtmaint has requested the watchcommits acl on xenner (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/xenner



From pkgdb at fedoraproject.org  Mon Jan 19 14:02:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 14:02:38 +0000
Subject: [pkgdb] xenner: virtmaint has requested watchcommits
Message-ID: <20090119140239.0C495208482@bastion.fedora.phx.redhat.com>

virtmaint has requested the watchcommits acl on xenner (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/xenner



From pkgdb at fedoraproject.org  Mon Jan 19 14:02:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 14:02:46 +0000
Subject: [pkgdb] xenner: virtmaint has requested watchbugzilla
Message-ID: <20090119140246.E25C4208744@bastion.fedora.phx.redhat.com>

virtmaint has requested the watchbugzilla acl on xenner (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/xenner



From pkgdb at fedoraproject.org  Mon Jan 19 14:02:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 14:02:50 +0000
Subject: [pkgdb] xenner: virtmaint has requested watchbugzilla
Message-ID: <20090119140250.915E020896A@bastion.fedora.phx.redhat.com>

virtmaint has requested the watchbugzilla acl on xenner (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/xenner



From pkgdb at fedoraproject.org  Mon Jan 19 14:02:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 14:02:52 +0000
Subject: [pkgdb] xenner: virtmaint has requested watchcommits
Message-ID: <20090119140252.89F41208974@bastion.fedora.phx.redhat.com>

virtmaint has requested the watchcommits acl on xenner (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/xenner



From pkgdb at fedoraproject.org  Mon Jan 19 14:03:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 14:03:01 +0000
Subject: [pkgdb] qemu: virtmaint has requested watchbugzilla
Message-ID: <20090119140302.194AF20897B@bastion.fedora.phx.redhat.com>

virtmaint has requested the watchbugzilla 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  Mon Jan 19 14:03:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 14:03:02 +0000
Subject: [pkgdb] qemu: virtmaint has requested watchcommits
Message-ID: <20090119140303.1B66D208489@bastion.fedora.phx.redhat.com>

virtmaint has requested the watchcommits 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  Mon Jan 19 14:03:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 14:03:06 +0000
Subject: [pkgdb] qemu: virtmaint has requested watchbugzilla
Message-ID: <20090119140307.3F6F320848B@bastion.fedora.phx.redhat.com>

virtmaint has requested the watchbugzilla 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  Mon Jan 19 14:03:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 14:03:09 +0000
Subject: [pkgdb] qemu: virtmaint has requested watchcommits
Message-ID: <20090119140309.4BB00208D1F@bastion.fedora.phx.redhat.com>

virtmaint has requested the watchcommits 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  Mon Jan 19 14:03:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 14:03:13 +0000
Subject: [pkgdb] qemu: virtmaint has requested watchbugzilla
Message-ID: <20090119140313.D9699208D5D@bastion.fedora.phx.redhat.com>

virtmaint has requested the watchbugzilla 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  Mon Jan 19 14:03:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 14:03:17 +0000
Subject: [pkgdb] qemu: virtmaint has requested watchcommits
Message-ID: <20090119140318.1A914208491@bastion.fedora.phx.redhat.com>

virtmaint has requested the watchcommits 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  Mon Jan 19 14:03:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 14:03:19 +0000
Subject: [pkgdb] qemu: virtmaint has requested watchbugzilla
Message-ID: <20090119140319.6B36A208DDB@bastion.fedora.phx.redhat.com>

virtmaint has requested the watchbugzilla 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  Mon Jan 19 14:03:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 14:03:20 +0000
Subject: [pkgdb] qemu: virtmaint has requested watchcommits
Message-ID: <20090119140320.94EA3208DDF@bastion.fedora.phx.redhat.com>

virtmaint has requested the watchcommits 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  Mon Jan 19 14:03:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 14:03:23 +0000
Subject: [pkgdb] qemu: virtmaint has requested watchbugzilla
Message-ID: <20090119140324.414C6208DE4@bastion.fedora.phx.redhat.com>

virtmaint has requested the watchbugzilla 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  Mon Jan 19 14:03:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 14:03:26 +0000
Subject: [pkgdb] qemu: virtmaint has requested watchcommits
Message-ID: <20090119140326.62B1F208DE6@bastion.fedora.phx.redhat.com>

virtmaint has requested the watchcommits 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  Mon Jan 19 14:03:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 14:03:28 +0000
Subject: [pkgdb] qemu: virtmaint has requested watchbugzilla
Message-ID: <20090119140328.ADAE4208495@bastion.fedora.phx.redhat.com>

virtmaint has requested the watchbugzilla 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  Mon Jan 19 14:03:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 14:03:31 +0000
Subject: [pkgdb] qemu: virtmaint has requested watchbugzilla
Message-ID: <20090119140331.E34B12084A7@bastion.fedora.phx.redhat.com>

virtmaint has requested the watchbugzilla 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  Mon Jan 19 14:03:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 14:03:32 +0000
Subject: [pkgdb] qemu: virtmaint has requested watchcommits
Message-ID: <20090119140333.00A89208DEB@bastion.fedora.phx.redhat.com>

virtmaint has requested the watchcommits 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  Mon Jan 19 14:03:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 14:03:35 +0000
Subject: [pkgdb] qemu: virtmaint has requested watchcommits
Message-ID: <20090119140335.CD5ED208DF1@bastion.fedora.phx.redhat.com>

virtmaint has requested the watchcommits 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  Mon Jan 19 14:03:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 14:03:44 +0000
Subject: [pkgdb] qemu: virtmaint has requested watchbugzilla
Message-ID: <20090119140345.3A2AD208478@bastion.fedora.phx.redhat.com>

virtmaint has requested the watchbugzilla 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  Mon Jan 19 14:03:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 14:03:47 +0000
Subject: [pkgdb] qemu: virtmaint has requested watchcommits
Message-ID: <20090119140348.F16992084B7@bastion.fedora.phx.redhat.com>

virtmaint has requested the watchcommits 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  Mon Jan 19 14:03:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 14:03:52 +0000
Subject: [pkgdb] qemu: virtmaint has requested watchbugzilla
Message-ID: <20090119140352.CD0782084BD@bastion.fedora.phx.redhat.com>

virtmaint has requested the watchbugzilla acl on qemu (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qemu



From pkgdb at fedoraproject.org  Mon Jan 19 14:03:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 14:03:54 +0000
Subject: [pkgdb] qemu: virtmaint has requested watchcommits
Message-ID: <20090119140354.7860C208DF5@bastion.fedora.phx.redhat.com>

virtmaint has requested the watchcommits acl on qemu (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qemu



From pkgdb at fedoraproject.org  Mon Jan 19 14:04:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 14:04:01 +0000
Subject: [pkgdb] qemu: virtmaint has requested watchcommits
Message-ID: <20090119140401.94451208DF9@bastion.fedora.phx.redhat.com>

virtmaint has requested the watchcommits 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  Mon Jan 19 14:03:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 14:03:58 +0000
Subject: [pkgdb] qemu: virtmaint has requested watchbugzilla
Message-ID: <20090119140358.BF30D208DF7@bastion.fedora.phx.redhat.com>

virtmaint has requested the watchbugzilla 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  Mon Jan 19 14:04:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 14:04:02 +0000
Subject: [pkgdb] qemu: virtmaint has requested watchbugzilla
Message-ID: <20090119140402.ECD59208DFD@bastion.fedora.phx.redhat.com>

virtmaint has requested the watchbugzilla 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  Mon Jan 19 14:04:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 14:04:04 +0000
Subject: [pkgdb] qemu: virtmaint has requested watchcommits
Message-ID: <20090119140404.60E09208E00@bastion.fedora.phx.redhat.com>

virtmaint has requested the watchcommits 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  Mon Jan 19 14:04:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 14:04:18 +0000
Subject: [pkgdb] libvirt: virtmaint has requested watchbugzilla
Message-ID: <20090119140418.CFEF5208678@bastion.fedora.phx.redhat.com>

virtmaint has requested the watchbugzilla acl on libvirt (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libvirt



From pkgdb at fedoraproject.org  Mon Jan 19 14:04:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 14:04:20 +0000
Subject: [pkgdb] libvirt: virtmaint has requested watchcommits
Message-ID: <20090119140420.798A8208E08@bastion.fedora.phx.redhat.com>

virtmaint has requested the watchcommits acl on libvirt (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libvirt



From pkgdb at fedoraproject.org  Mon Jan 19 14:04:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 14:04:25 +0000
Subject: [pkgdb] libvirt: virtmaint has requested watchbugzilla
Message-ID: <20090119140425.54727208700@bastion.fedora.phx.redhat.com>

virtmaint has requested the watchbugzilla acl on libvirt (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libvirt



From pkgdb at fedoraproject.org  Mon Jan 19 14:04:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 14:04:28 +0000
Subject: [pkgdb] libvirt: virtmaint has requested watchcommits
Message-ID: <20090119140428.6D76E208E0A@bastion.fedora.phx.redhat.com>

virtmaint has requested the watchcommits acl on libvirt (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libvirt



From pkgdb at fedoraproject.org  Mon Jan 19 14:04:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 14:04:29 +0000
Subject: [pkgdb] urw-fonts had acl change status
Message-ID: <20090119140429.0E0D2208E0E@bastion.fedora.phx.redhat.com>

than has set the commit acl on urw-fonts (Fedora devel) to Approved for karsten

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/urw-fonts



From pkgdb at fedoraproject.org  Mon Jan 19 14:04:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 14:04:31 +0000
Subject: [pkgdb] libvirt: virtmaint has requested watchcommits
Message-ID: <20090119140431.D716E208E11@bastion.fedora.phx.redhat.com>

virtmaint has requested the watchcommits acl on libvirt (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libvirt



From pkgdb at fedoraproject.org  Mon Jan 19 14:04:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 14:04:32 +0000
Subject: [pkgdb] urw-fonts had acl change status
Message-ID: <20090119140432.3C711208E14@bastion.fedora.phx.redhat.com>

than has set the commit acl on urw-fonts (Fedora 8) to Approved for karsten

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/urw-fonts



From pkgdb at fedoraproject.org  Mon Jan 19 14:04:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 14:04:32 +0000
Subject: [pkgdb] libvirt: virtmaint has requested watchbugzilla
Message-ID: <20090119140432.87029208E1B@bastion.fedora.phx.redhat.com>

virtmaint has requested the watchbugzilla acl on libvirt (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libvirt



From pkgdb at fedoraproject.org  Mon Jan 19 14:04:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 14:04:35 +0000
Subject: [pkgdb] libvirt: virtmaint has requested watchbugzilla
Message-ID: <20090119140435.3E52F208E1C@bastion.fedora.phx.redhat.com>

virtmaint has requested the watchbugzilla acl on libvirt (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libvirt



From pkgdb at fedoraproject.org  Mon Jan 19 14:04:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 14:04:35 +0000
Subject: [pkgdb] urw-fonts had acl change status
Message-ID: <20090119140435.73B0B208E23@bastion.fedora.phx.redhat.com>

than has set the commit acl on urw-fonts (Fedora 9) to Approved for karsten

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/urw-fonts



From pkgdb at fedoraproject.org  Mon Jan 19 14:04:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 14:04:35 +0000
Subject: [pkgdb] libvirt: virtmaint has requested watchcommits
Message-ID: <20090119140435.6FBC1208E22@bastion.fedora.phx.redhat.com>

virtmaint has requested the watchcommits acl on libvirt (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libvirt



From pkgdb at fedoraproject.org  Mon Jan 19 14:04:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 14:04:40 +0000
Subject: [pkgdb] libvirt: virtmaint has requested watchbugzilla
Message-ID: <20090119140440.3CFC0208E28@bastion.fedora.phx.redhat.com>

virtmaint has requested the watchbugzilla acl on libvirt (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libvirt



From pkgdb at fedoraproject.org  Mon Jan 19 14:04:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 14:04:41 +0000
Subject: [pkgdb] libvirt: virtmaint has requested watchcommits
Message-ID: <20090119140441.7259F208E2D@bastion.fedora.phx.redhat.com>

virtmaint has requested the watchcommits acl on libvirt (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libvirt



From pkgdb at fedoraproject.org  Mon Jan 19 14:04:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 14:04:44 +0000
Subject: [pkgdb] urw-fonts had acl change status
Message-ID: <20090119140444.F2B4C208482@bastion.fedora.phx.redhat.com>

than has set the commit acl on urw-fonts (Fedora 10) to Approved for karsten

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/urw-fonts



From pkgdb at fedoraproject.org  Mon Jan 19 14:05:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 14:05:03 +0000
Subject: [pkgdb] virt-manager: virtmaint has requested watchbugzilla
Message-ID: <20090119140503.6EE8C20876B@bastion.fedora.phx.redhat.com>

virtmaint has requested the watchbugzilla acl on virt-manager (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/virt-manager



From pkgdb at fedoraproject.org  Mon Jan 19 14:05:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 14:05:04 +0000
Subject: [pkgdb] virt-manager: virtmaint has requested watchcommits
Message-ID: <20090119140504.B5875208E33@bastion.fedora.phx.redhat.com>

virtmaint has requested the watchcommits acl on virt-manager (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/virt-manager



From pkgdb at fedoraproject.org  Mon Jan 19 14:05:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 14:05:08 +0000
Subject: [pkgdb] virt-manager: virtmaint has requested watchbugzilla
Message-ID: <20090119140508.E9C7D208E38@bastion.fedora.phx.redhat.com>

virtmaint has requested the watchbugzilla acl on virt-manager (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/virt-manager



From pkgdb at fedoraproject.org  Mon Jan 19 14:05:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 14:05:09 +0000
Subject: [pkgdb] virt-manager: virtmaint has requested watchcommits
Message-ID: <20090119140509.3249C208E3C@bastion.fedora.phx.redhat.com>

virtmaint has requested the watchcommits acl on virt-manager (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/virt-manager



From pkgdb at fedoraproject.org  Mon Jan 19 14:05:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 14:05:12 +0000
Subject: [pkgdb] virt-manager: virtmaint has requested watchbugzilla
Message-ID: <20090119140512.8EC89208E40@bastion.fedora.phx.redhat.com>

virtmaint has requested the watchbugzilla acl on virt-manager (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/virt-manager



From pkgdb at fedoraproject.org  Mon Jan 19 14:05:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 14:05:13 +0000
Subject: [pkgdb] virt-manager: virtmaint has requested watchcommits
Message-ID: <20090119140513.F362B208E45@bastion.fedora.phx.redhat.com>

virtmaint has requested the watchcommits acl on virt-manager (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/virt-manager



From pkgdb at fedoraproject.org  Mon Jan 19 14:05:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 14:05:17 +0000
Subject: [pkgdb] virt-manager: virtmaint has requested watchbugzilla
Message-ID: <20090119140517.200CF208488@bastion.fedora.phx.redhat.com>

virtmaint has requested the watchbugzilla acl on virt-manager (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/virt-manager



From pkgdb at fedoraproject.org  Mon Jan 19 14:05:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 14:05:19 +0000
Subject: [pkgdb] virt-manager: virtmaint has requested watchcommits
Message-ID: <20090119140519.2889D208E4B@bastion.fedora.phx.redhat.com>

virtmaint has requested the watchcommits acl on virt-manager (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/virt-manager



From pkgdb at fedoraproject.org  Mon Jan 19 14:05:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 14:05:21 +0000
Subject: [pkgdb] virt-manager: virtmaint has requested watchbugzilla
Message-ID: <20090119140521.C044B208E51@bastion.fedora.phx.redhat.com>

virtmaint has requested the watchbugzilla acl on virt-manager (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/virt-manager



From pkgdb at fedoraproject.org  Mon Jan 19 14:05:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 14:05:22 +0000
Subject: [pkgdb] virt-manager: virtmaint has requested watchcommits
Message-ID: <20090119140522.28B7B208E56@bastion.fedora.phx.redhat.com>

virtmaint has requested the watchcommits acl on virt-manager (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/virt-manager



From pkgdb at fedoraproject.org  Mon Jan 19 14:05:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 14:05:28 +0000
Subject: [pkgdb] virt-viewer: virtmaint has requested watchbugzilla
Message-ID: <20090119140529.67BD1208A5F@bastion.fedora.phx.redhat.com>

virtmaint has requested the watchbugzilla acl on virt-viewer (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/virt-viewer



From pkgdb at fedoraproject.org  Mon Jan 19 14:05:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 14:05:29 +0000
Subject: [pkgdb] virt-viewer: virtmaint has requested watchcommits
Message-ID: <20090119140529.A13D9208E5E@bastion.fedora.phx.redhat.com>

virtmaint has requested the watchcommits acl on virt-viewer (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/virt-viewer



From pkgdb at fedoraproject.org  Mon Jan 19 14:05:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 14:05:31 +0000
Subject: [pkgdb] virt-viewer: virtmaint has requested watchbugzilla
Message-ID: <20090119140532.1FB3B208E62@bastion.fedora.phx.redhat.com>

virtmaint has requested the watchbugzilla acl on virt-viewer (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/virt-viewer



From pkgdb at fedoraproject.org  Mon Jan 19 14:05:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 14:05:34 +0000
Subject: [pkgdb] virt-viewer: virtmaint has requested watchcommits
Message-ID: <20090119140534.7AAB8208E66@bastion.fedora.phx.redhat.com>

virtmaint has requested the watchcommits acl on virt-viewer (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/virt-viewer



From pkgdb at fedoraproject.org  Mon Jan 19 14:05:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 14:05:37 +0000
Subject: [pkgdb] virt-viewer: virtmaint has requested watchbugzilla
Message-ID: <20090119140537.49624208E6B@bastion.fedora.phx.redhat.com>

virtmaint has requested the watchbugzilla acl on virt-viewer (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/virt-viewer



From pkgdb at fedoraproject.org  Mon Jan 19 14:05:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 14:05:37 +0000
Subject: [pkgdb] virt-viewer: virtmaint has requested watchcommits
Message-ID: <20090119140537.D8130208E6F@bastion.fedora.phx.redhat.com>

virtmaint has requested the watchcommits acl on virt-viewer (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/virt-viewer



From pkgdb at fedoraproject.org  Mon Jan 19 14:05:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 14:05:41 +0000
Subject: [pkgdb] virt-viewer: virtmaint has requested watchbugzilla
Message-ID: <20090119140541.E21BE20848A@bastion.fedora.phx.redhat.com>

virtmaint has requested the watchbugzilla acl on virt-viewer (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/virt-viewer



From pkgdb at fedoraproject.org  Mon Jan 19 14:05:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 14:05:42 +0000
Subject: [pkgdb] virt-viewer: virtmaint has requested watchcommits
Message-ID: <20090119140542.8A3E2208E70@bastion.fedora.phx.redhat.com>

virtmaint has requested the watchcommits acl on virt-viewer (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/virt-viewer



From pkgdb at fedoraproject.org  Mon Jan 19 14:05:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 14:05:44 +0000
Subject: [pkgdb] virt-viewer: virtmaint has requested watchbugzilla
Message-ID: <20090119140545.0D8DA208E73@bastion.fedora.phx.redhat.com>

virtmaint has requested the watchbugzilla acl on virt-viewer (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/virt-viewer



From pkgdb at fedoraproject.org  Mon Jan 19 14:05:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 14:05:45 +0000
Subject: [pkgdb] virt-viewer: virtmaint has requested watchcommits
Message-ID: <20090119140545.ED4B1208E76@bastion.fedora.phx.redhat.com>

virtmaint has requested the watchcommits acl on virt-viewer (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/virt-viewer



From pkgdb at fedoraproject.org  Mon Jan 19 14:05:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 14:05:52 +0000
Subject: [pkgdb] python-virtinst: virtmaint has requested watchbugzilla
Message-ID: <20090119140552.31A5F208A61@bastion.fedora.phx.redhat.com>

virtmaint has requested the watchbugzilla acl on python-virtinst (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-virtinst



From pkgdb at fedoraproject.org  Mon Jan 19 14:05:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 14:05:52 +0000
Subject: [pkgdb] python-virtinst: virtmaint has requested watchcommits
Message-ID: <20090119140552.EE13B208E7B@bastion.fedora.phx.redhat.com>

virtmaint has requested the watchcommits acl on python-virtinst (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-virtinst



From pkgdb at fedoraproject.org  Mon Jan 19 14:05:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 14:05:56 +0000
Subject: [pkgdb] python-virtinst: virtmaint has requested watchbugzilla
Message-ID: <20090119140556.414CD208E7F@bastion.fedora.phx.redhat.com>

virtmaint has requested the watchbugzilla acl on python-virtinst (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-virtinst



From pkgdb at fedoraproject.org  Mon Jan 19 14:06:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 14:06:01 +0000
Subject: [pkgdb] python-virtinst: virtmaint has requested watchcommits
Message-ID: <20090119140601.EA678208E84@bastion.fedora.phx.redhat.com>

virtmaint has requested the watchcommits acl on python-virtinst (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-virtinst



From pkgdb at fedoraproject.org  Mon Jan 19 14:06:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 14:06:04 +0000
Subject: [pkgdb] python-virtinst: virtmaint has requested watchbugzilla
Message-ID: <20090119140604.4AA41208D5D@bastion.fedora.phx.redhat.com>

virtmaint has requested the watchbugzilla acl on python-virtinst (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-virtinst



From pkgdb at fedoraproject.org  Mon Jan 19 14:06:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 14:06:05 +0000
Subject: [pkgdb] python-virtinst: virtmaint has requested watchcommits
Message-ID: <20090119140606.18CF4208E89@bastion.fedora.phx.redhat.com>

virtmaint has requested the watchcommits acl on python-virtinst (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-virtinst



From pkgdb at fedoraproject.org  Mon Jan 19 14:06:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 14:06:10 +0000
Subject: [pkgdb] python-virtinst: virtmaint has requested watchbugzilla
Message-ID: <20090119140611.2F666208E8E@bastion.fedora.phx.redhat.com>

virtmaint has requested the watchbugzilla acl on python-virtinst (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-virtinst



From pkgdb at fedoraproject.org  Mon Jan 19 14:06:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 14:06:12 +0000
Subject: [pkgdb] python-virtinst: virtmaint has requested watchcommits
Message-ID: <20090119140612.9478B208E93@bastion.fedora.phx.redhat.com>

virtmaint has requested the watchcommits acl on python-virtinst (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-virtinst



From pkgdb at fedoraproject.org  Mon Jan 19 14:06:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 14:06:12 +0000
Subject: [pkgdb] python-virtinst: virtmaint has requested watchbugzilla
Message-ID: <20090119140612.A2A50208E98@bastion.fedora.phx.redhat.com>

virtmaint has requested the watchbugzilla acl on python-virtinst (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-virtinst



From pkgdb at fedoraproject.org  Mon Jan 19 14:06:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 14:06:16 +0000
Subject: [pkgdb] python-virtinst: virtmaint has requested watchcommits
Message-ID: <20090119140616.9FC2C208D9E@bastion.fedora.phx.redhat.com>

virtmaint has requested the watchcommits acl on python-virtinst (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-virtinst



From pkgdb at fedoraproject.org  Mon Jan 19 14:06:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 14:06:25 +0000
Subject: [pkgdb] gnome-applet-vm: virtmaint has requested watchbugzilla
Message-ID: <20090119140625.88EB3208DDF@bastion.fedora.phx.redhat.com>

virtmaint has requested the watchbugzilla acl on gnome-applet-vm (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gnome-applet-vm



From pkgdb at fedoraproject.org  Mon Jan 19 14:06:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 14:06:27 +0000
Subject: [pkgdb] gnome-applet-vm: virtmaint has requested watchcommits
Message-ID: <20090119140627.C37B3208E99@bastion.fedora.phx.redhat.com>

virtmaint has requested the watchcommits acl on gnome-applet-vm (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gnome-applet-vm



From pkgdb at fedoraproject.org  Mon Jan 19 14:06:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 14:06:28 +0000
Subject: [pkgdb] gnome-applet-vm: virtmaint has requested watchbugzilla
Message-ID: <20090119140629.8B675208E9C@bastion.fedora.phx.redhat.com>

virtmaint has requested the watchbugzilla acl on gnome-applet-vm (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gnome-applet-vm



From pkgdb at fedoraproject.org  Mon Jan 19 14:06:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 14:06:29 +0000
Subject: [pkgdb] gnome-applet-vm: virtmaint has requested watchcommits
Message-ID: <20090119140629.9C740208E9F@bastion.fedora.phx.redhat.com>

virtmaint has requested the watchcommits acl on gnome-applet-vm (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gnome-applet-vm



From pkgdb at fedoraproject.org  Mon Jan 19 14:06:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 14:06:34 +0000
Subject: [pkgdb] gnome-applet-vm: virtmaint has requested watchbugzilla
Message-ID: <20090119140635.13E40208EA0@bastion.fedora.phx.redhat.com>

virtmaint has requested the watchbugzilla acl on gnome-applet-vm (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gnome-applet-vm



From pkgdb at fedoraproject.org  Mon Jan 19 14:06:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 14:06:37 +0000
Subject: [pkgdb] gnome-applet-vm: virtmaint has requested watchcommits
Message-ID: <20090119140637.1F8A1208DE4@bastion.fedora.phx.redhat.com>

virtmaint has requested the watchcommits acl on gnome-applet-vm (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gnome-applet-vm



From pkgdb at fedoraproject.org  Mon Jan 19 14:06:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 14:06:41 +0000
Subject: [pkgdb] gnome-applet-vm: virtmaint has requested watchcommits
Message-ID: <20090119140641.142F0208EA6@bastion.fedora.phx.redhat.com>

virtmaint has requested the watchcommits acl on gnome-applet-vm (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gnome-applet-vm



From pkgdb at fedoraproject.org  Mon Jan 19 14:06:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 14:06:41 +0000
Subject: [pkgdb] gnome-applet-vm: virtmaint has requested watchbugzilla
Message-ID: <20090119140641.9FBD4208EA9@bastion.fedora.phx.redhat.com>

virtmaint has requested the watchbugzilla acl on gnome-applet-vm (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gnome-applet-vm



From pkgdb at fedoraproject.org  Mon Jan 19 14:06:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 14:06:43 +0000
Subject: [pkgdb] gnome-applet-vm: virtmaint has requested watchbugzilla
Message-ID: <20090119140644.0C772208EAC@bastion.fedora.phx.redhat.com>

virtmaint has requested the watchbugzilla acl on gnome-applet-vm (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gnome-applet-vm



From pkgdb at fedoraproject.org  Mon Jan 19 14:06:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 14:06:44 +0000
Subject: [pkgdb] gnome-applet-vm: virtmaint has requested watchcommits
Message-ID: <20090119140645.0DA7E208EAF@bastion.fedora.phx.redhat.com>

virtmaint has requested the watchcommits acl on gnome-applet-vm (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gnome-applet-vm



From pkgdb at fedoraproject.org  Mon Jan 19 14:06:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 14:06:55 +0000
Subject: [pkgdb] virt-top: virtmaint has requested watchbugzilla
Message-ID: <20090119140655.CEA59208DE8@bastion.fedora.phx.redhat.com>

virtmaint has requested the watchbugzilla acl on virt-top (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/virt-top



From pkgdb at fedoraproject.org  Mon Jan 19 14:06:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 14:06:57 +0000
Subject: [pkgdb] virt-top: virtmaint has requested watchcommits
Message-ID: <20090119140657.467B7208DE7@bastion.fedora.phx.redhat.com>

virtmaint has requested the watchcommits acl on virt-top (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/virt-top



From pkgdb at fedoraproject.org  Mon Jan 19 14:06:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 14:06:58 +0000
Subject: [pkgdb] virt-top: virtmaint has requested watchbugzilla
Message-ID: <20090119140658.ED50E208DEA@bastion.fedora.phx.redhat.com>

virtmaint has requested the watchbugzilla acl on virt-top (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/virt-top



From pkgdb at fedoraproject.org  Mon Jan 19 14:06:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 14:06:59 +0000
Subject: [pkgdb] virt-top: virtmaint has requested watchcommits
Message-ID: <20090119140659.50A73208EB4@bastion.fedora.phx.redhat.com>

virtmaint has requested the watchcommits acl on virt-top (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/virt-top



From pkgdb at fedoraproject.org  Mon Jan 19 14:07:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 14:07:04 +0000
Subject: [pkgdb] virt-top: virtmaint has requested watchbugzilla
Message-ID: <20090119140704.3EC62208EB7@bastion.fedora.phx.redhat.com>

virtmaint has requested the watchbugzilla acl on virt-top (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/virt-top



From pkgdb at fedoraproject.org  Mon Jan 19 14:07:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 14:07:05 +0000
Subject: [pkgdb] virt-top: virtmaint has requested watchcommits
Message-ID: <20090119140705.38DDB208EBB@bastion.fedora.phx.redhat.com>

virtmaint has requested the watchcommits acl on virt-top (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/virt-top



From pkgdb at fedoraproject.org  Mon Jan 19 14:07:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 14:07:07 +0000
Subject: [pkgdb] virt-top: virtmaint has requested watchcommits
Message-ID: <20090119140707.94705208DEF@bastion.fedora.phx.redhat.com>

virtmaint has requested the watchcommits acl on virt-top (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/virt-top



From pkgdb at fedoraproject.org  Mon Jan 19 14:07:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 14:07:09 +0000
Subject: [pkgdb] virt-top: virtmaint has requested watchbugzilla
Message-ID: <20090119140709.276F9208DED@bastion.fedora.phx.redhat.com>

virtmaint has requested the watchbugzilla acl on virt-top (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/virt-top



From pkgdb at fedoraproject.org  Mon Jan 19 14:07:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 14:07:10 +0000
Subject: [pkgdb] virt-top: virtmaint has requested watchbugzilla
Message-ID: <20090119140710.220EC208EBF@bastion.fedora.phx.redhat.com>

virtmaint has requested the watchbugzilla acl on virt-top (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/virt-top



From pkgdb at fedoraproject.org  Mon Jan 19 13:59:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 13:59:56 +0000
Subject: [pkgdb] kvm: virtmaint has requested watchbugzilla
Message-ID: <20090119135957.5A7E6208470@bastion.fedora.phx.redhat.com>

virtmaint has requested the watchbugzilla acl on kvm (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kvm



From pkgdb at fedoraproject.org  Mon Jan 19 14:07:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 14:07:12 +0000
Subject: [pkgdb] virt-top: virtmaint has requested watchcommits
Message-ID: <20090119140712.A2AD2208EC4@bastion.fedora.phx.redhat.com>

virtmaint has requested the watchcommits acl on virt-top (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/virt-top



From pkgdb at fedoraproject.org  Mon Jan 19 14:07:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 14:07:19 +0000
Subject: [pkgdb] virt-mem: virtmaint has requested watchcommits
Message-ID: <20090119140719.9B3D6208EC7@bastion.fedora.phx.redhat.com>

virtmaint has requested the watchcommits acl on virt-mem (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/virt-mem



From pkgdb at fedoraproject.org  Mon Jan 19 14:07:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 14:07:19 +0000
Subject: [pkgdb] virt-mem: virtmaint has requested watchbugzilla
Message-ID: <20090119140720.598EA208473@bastion.fedora.phx.redhat.com>

virtmaint has requested the watchbugzilla acl on virt-mem (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/virt-mem



From pkgdb at fedoraproject.org  Mon Jan 19 14:07:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 14:07:23 +0000
Subject: [pkgdb] virt-mem: virtmaint has requested watchcommits
Message-ID: <20090119140723.45AD2208EC8@bastion.fedora.phx.redhat.com>

virtmaint has requested the watchcommits acl on virt-mem (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/virt-mem



From pkgdb at fedoraproject.org  Mon Jan 19 14:07:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 14:07:25 +0000
Subject: [pkgdb] virt-mem: virtmaint has requested watchcommits
Message-ID: <20090119140726.32027208ECD@bastion.fedora.phx.redhat.com>

virtmaint has requested the watchcommits acl on virt-mem (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/virt-mem



From pkgdb at fedoraproject.org  Mon Jan 19 14:07:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 14:07:25 +0000
Subject: [pkgdb] virt-mem: virtmaint has requested watchbugzilla
Message-ID: <20090119140726.4B12D208ECF@bastion.fedora.phx.redhat.com>

virtmaint has requested the watchbugzilla acl on virt-mem (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/virt-mem



From pkgdb at fedoraproject.org  Mon Jan 19 14:07:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 14:07:26 +0000
Subject: [pkgdb] virt-mem: virtmaint has requested watchbugzilla
Message-ID: <20090119140726.9127E208ED1@bastion.fedora.phx.redhat.com>

virtmaint has requested the watchbugzilla acl on virt-mem (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/virt-mem



From pkgdb at fedoraproject.org  Mon Jan 19 14:07:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 14:07:29 +0000
Subject: [pkgdb] virt-mem: virtmaint has requested watchbugzilla
Message-ID: <20090119140729.986D8208ED4@bastion.fedora.phx.redhat.com>

virtmaint has requested the watchbugzilla acl on virt-mem (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/virt-mem



From pkgdb at fedoraproject.org  Mon Jan 19 14:07:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 14:07:34 +0000
Subject: [pkgdb] virt-mem: virtmaint has requested watchcommits
Message-ID: <20090119140734.D0D622084B7@bastion.fedora.phx.redhat.com>

virtmaint has requested the watchcommits acl on virt-mem (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/virt-mem



From pkgdb at fedoraproject.org  Mon Jan 19 14:07:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 14:07:45 +0000
Subject: [pkgdb] virt-df: virtmaint has requested watchbugzilla
Message-ID: <20090119140745.91F7F208610@bastion.fedora.phx.redhat.com>

virtmaint has requested the watchbugzilla acl on virt-df (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/virt-df



From pkgdb at fedoraproject.org  Mon Jan 19 14:07:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 14:07:47 +0000
Subject: [pkgdb] virt-df: virtmaint has requested watchcommits
Message-ID: <20090119140747.D4AA8208ED7@bastion.fedora.phx.redhat.com>

virtmaint has requested the watchcommits acl on virt-df (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/virt-df



From pkgdb at fedoraproject.org  Mon Jan 19 14:07:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 14:07:49 +0000
Subject: [pkgdb] virt-df: virtmaint has requested watchbugzilla
Message-ID: <20090119140749.5DD3F208EDA@bastion.fedora.phx.redhat.com>

virtmaint has requested the watchbugzilla acl on virt-df (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/virt-df



From pkgdb at fedoraproject.org  Mon Jan 19 14:07:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 14:07:50 +0000
Subject: [pkgdb] virt-df: virtmaint has requested watchcommits
Message-ID: <20090119140750.5091B208EDD@bastion.fedora.phx.redhat.com>

virtmaint has requested the watchcommits acl on virt-df (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/virt-df



From pkgdb at fedoraproject.org  Mon Jan 19 14:07:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 14:07:55 +0000
Subject: [pkgdb] virt-df: virtmaint has requested watchbugzilla
Message-ID: <20090119140755.DC6D0208DF4@bastion.fedora.phx.redhat.com>

virtmaint has requested the watchbugzilla acl on virt-df (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/virt-df



From pkgdb at fedoraproject.org  Mon Jan 19 14:08:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 14:08:00 +0000
Subject: [pkgdb] virt-df: virtmaint has requested watchcommits
Message-ID: <20090119140800.EFE97208EE0@bastion.fedora.phx.redhat.com>

virtmaint has requested the watchcommits acl on virt-df (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/virt-df



From pkgdb at fedoraproject.org  Mon Jan 19 14:08:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 14:08:05 +0000
Subject: [pkgdb] virt-df: virtmaint has requested watchcommits
Message-ID: <20090119140805.7236F208EE3@bastion.fedora.phx.redhat.com>

virtmaint has requested the watchcommits acl on virt-df (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/virt-df



From pkgdb at fedoraproject.org  Mon Jan 19 14:08:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 14:08:04 +0000
Subject: [pkgdb] virt-df: virtmaint has requested watchbugzilla
Message-ID: <20090119140805.ED270208476@bastion.fedora.phx.redhat.com>

virtmaint has requested the watchbugzilla acl on virt-df (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/virt-df



From pkgdb at fedoraproject.org  Mon Jan 19 14:08:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 14:08:16 +0000
Subject: [pkgdb] collectd: virtmaint has requested watchcommits
Message-ID: <20090119140816.C86A320847A@bastion.fedora.phx.redhat.com>

virtmaint has requested the watchcommits acl on collectd (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/collectd



From pkgdb at fedoraproject.org  Mon Jan 19 14:08:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 14:08:20 +0000
Subject: [pkgdb] collectd: virtmaint has requested watchbugzilla
Message-ID: <20090119140820.5131F208EE7@bastion.fedora.phx.redhat.com>

virtmaint has requested the watchbugzilla acl on collectd (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/collectd



From kvolny at fedoraproject.org  Mon Jan 19 14:08:23 2009
From: kvolny at fedoraproject.org (=?utf-8?q?Karel_Voln=C3=BD?=)
Date: Mon, 19 Jan 2009 14:08:23 +0000 (UTC)
Subject: rpms/vodovod/devel vodovod.spec,1.3,1.4
Message-ID: <20090119140823.1F1DF700F8@cvs1.fedora.phx.redhat.com>

Author: kvolny

Update of /cvs/pkgs/rpms/vodovod/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11508

Modified Files:
	vodovod.spec 
Log Message:
Required font package got renamed to dejavu-sans-mono-fonts (bug #480478)



Index: vodovod.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vodovod/devel/vodovod.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- vodovod.spec	16 Jan 2009 16:07:27 -0000	1.3
+++ vodovod.spec	19 Jan 2009 14:07:52 -0000	1.4
@@ -1,6 +1,6 @@
 Name:		vodovod
 Version:	1.10r19
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	A pipe connecting game
 
 Group:		Amusements/Games
@@ -13,7 +13,7 @@
 BuildRequires:	desktop-file-utils SDL-devel SDL_image-devel SDL_mixer-devel
 BuildRequires:	SDL_ttf-devel gettext ImageMagick
 
-Requires:	dejavu-fonts-sans-mono
+Requires:	dejavu-sans-mono-fonts
 Requires(post): coreutils
 Requires(postun): coreutils
 
@@ -100,6 +100,9 @@
 
 
 %changelog
+* Mon Jan 19 2009 Karel Volny <kvolny at redhat.com> 1.10r19-3
+- Required font package got renamed to dejavu-sans-mono-fonts (bug #480478)
+
 * Thu Jan 15 2009 Karel Volny <kvolny at redhat.com> 1.10r19-2
 - Use dejavu-fonts-sans-mono instead of bundling the font file (bug #477480)
 



From pkgdb at fedoraproject.org  Mon Jan 19 14:08:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 14:08:24 +0000
Subject: [pkgdb] collectd: virtmaint has requested watchcommits
Message-ID: <20090119140824.80636208EF3@bastion.fedora.phx.redhat.com>

virtmaint has requested the watchcommits acl on collectd (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/collectd



From pkgdb at fedoraproject.org  Mon Jan 19 14:08:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 14:08:23 +0000
Subject: [pkgdb] collectd: virtmaint has requested watchbugzilla
Message-ID: <20090119140824.4B6A5208EEF@bastion.fedora.phx.redhat.com>

virtmaint has requested the watchbugzilla acl on collectd (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/collectd



From pkgdb at fedoraproject.org  Mon Jan 19 14:08:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 14:08:30 +0000
Subject: [pkgdb] collectd: virtmaint has requested watchbugzilla
Message-ID: <20090119140830.6D42D208E00@bastion.fedora.phx.redhat.com>

virtmaint has requested the watchbugzilla acl on collectd (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/collectd



From pkgdb at fedoraproject.org  Mon Jan 19 14:08:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 14:08:30 +0000
Subject: [pkgdb] collectd: virtmaint has requested watchcommits
Message-ID: <20090119140830.E6AEF208EF9@bastion.fedora.phx.redhat.com>

virtmaint has requested the watchcommits acl on collectd (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/collectd



From pkgdb at fedoraproject.org  Mon Jan 19 14:08:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 14:08:38 +0000
Subject: [pkgdb] collectd: virtmaint has requested watchbugzilla
Message-ID: <20090119140838.C28C720866E@bastion.fedora.phx.redhat.com>

virtmaint has requested the watchbugzilla acl on collectd (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/collectd



From pkgdb at fedoraproject.org  Mon Jan 19 14:08:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 14:08:44 +0000
Subject: [pkgdb] collectd: virtmaint has requested watchcommits
Message-ID: <20090119140844.60A36208EFC@bastion.fedora.phx.redhat.com>

virtmaint has requested the watchcommits acl on collectd (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/collectd



From pkgdb at fedoraproject.org  Mon Jan 19 14:08:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 14:08:48 +0000
Subject: [pkgdb] collectd: virtmaint has requested watchcommits
Message-ID: <20090119140848.94684208F04@bastion.fedora.phx.redhat.com>

virtmaint has requested the watchcommits acl on collectd (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/collectd



From pkgdb at fedoraproject.org  Mon Jan 19 14:08:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 14:08:47 +0000
Subject: [pkgdb] collectd: virtmaint has requested watchbugzilla
Message-ID: <20090119140849.38B30208E06@bastion.fedora.phx.redhat.com>

virtmaint has requested the watchbugzilla acl on collectd (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/collectd



From pkgdb at fedoraproject.org  Mon Jan 19 14:08:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 14:08:56 +0000
Subject: [pkgdb] appliance-tools: virtmaint has requested watchbugzilla
Message-ID: <20090119140856.A6793208F09@bastion.fedora.phx.redhat.com>

virtmaint has requested the watchbugzilla acl on appliance-tools (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/appliance-tools



From pkgdb at fedoraproject.org  Mon Jan 19 14:08:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 14:08:58 +0000
Subject: [pkgdb] appliance-tools: virtmaint has requested watchcommits
Message-ID: <20090119140858.689F9208F0B@bastion.fedora.phx.redhat.com>

virtmaint has requested the watchcommits acl on appliance-tools (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/appliance-tools



From pkgdb at fedoraproject.org  Mon Jan 19 14:09:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 14:09:02 +0000
Subject: [pkgdb] appliance-tools: virtmaint has requested watchcommits
Message-ID: <20090119140902.41A25208F0C@bastion.fedora.phx.redhat.com>

virtmaint has requested the watchcommits acl on appliance-tools (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/appliance-tools



From pkgdb at fedoraproject.org  Mon Jan 19 14:09:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 14:09:06 +0000
Subject: [pkgdb] appliance-tools: virtmaint has requested watchbugzilla
Message-ID: <20090119140906.98CAC208F0F@bastion.fedora.phx.redhat.com>

virtmaint has requested the watchbugzilla acl on appliance-tools (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/appliance-tools



From pkgdb at fedoraproject.org  Mon Jan 19 14:09:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 14:09:12 +0000
Subject: [pkgdb] appliance-tools: virtmaint has requested watchcommits
Message-ID: <20090119140913.311B3208E09@bastion.fedora.phx.redhat.com>

virtmaint has requested the watchcommits acl on appliance-tools (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/appliance-tools



From pkgdb at fedoraproject.org  Mon Jan 19 14:09:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 14:09:16 +0000
Subject: [pkgdb] appliance-tools: virtmaint has requested watchbugzilla
Message-ID: <20090119140916.6AD61208F11@bastion.fedora.phx.redhat.com>

virtmaint has requested the watchbugzilla acl on appliance-tools (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/appliance-tools



From pkgdb at fedoraproject.org  Mon Jan 19 14:09:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 14:09:21 +0000
Subject: [pkgdb] appliance-tools: virtmaint has requested watchcommits
Message-ID: <20090119140921.35F3E208F13@bastion.fedora.phx.redhat.com>

virtmaint has requested the watchcommits acl on appliance-tools (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/appliance-tools



From pkgdb at fedoraproject.org  Mon Jan 19 14:09:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 14:09:25 +0000
Subject: [pkgdb] appliance-tools: virtmaint has requested watchbugzilla
Message-ID: <20090119140925.EE3CC208F14@bastion.fedora.phx.redhat.com>

virtmaint has requested the watchbugzilla acl on appliance-tools (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/appliance-tools



From pkgdb at fedoraproject.org  Mon Jan 19 14:14:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 14:14:28 +0000
Subject: [pkgdb] perl-Sys-Virt: virtmaint has requested watchbugzilla
Message-ID: <20090119141428.926CE20897D@bastion.fedora.phx.redhat.com>

virtmaint has requested the watchbugzilla acl on perl-Sys-Virt (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Sys-Virt



From pkgdb at fedoraproject.org  Mon Jan 19 14:14:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 14:14:30 +0000
Subject: [pkgdb] perl-Sys-Virt: virtmaint has requested watchcommits
Message-ID: <20090119141431.29E2120848F@bastion.fedora.phx.redhat.com>

virtmaint has requested the watchcommits acl on perl-Sys-Virt (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Sys-Virt



From pkgdb at fedoraproject.org  Mon Jan 19 14:14:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 14:14:34 +0000
Subject: [pkgdb] perl-Sys-Virt: virtmaint has requested watchbugzilla
Message-ID: <20090119141434.96F57208E1A@bastion.fedora.phx.redhat.com>

virtmaint has requested the watchbugzilla acl on perl-Sys-Virt (Fedora EPEL 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Sys-Virt



From pkgdb at fedoraproject.org  Mon Jan 19 14:14:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 14:14:35 +0000
Subject: [pkgdb] perl-Sys-Virt: virtmaint has requested watchcommits
Message-ID: <20090119141435.490C5208E1D@bastion.fedora.phx.redhat.com>

virtmaint has requested the watchcommits acl on perl-Sys-Virt (Fedora EPEL 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Sys-Virt



From pkgdb at fedoraproject.org  Mon Jan 19 14:14:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 14:14:40 +0000
Subject: [pkgdb] perl-Sys-Virt: virtmaint has requested watchbugzilla
Message-ID: <20090119141440.BF952208E1F@bastion.fedora.phx.redhat.com>

virtmaint has requested the watchbugzilla acl on perl-Sys-Virt (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Sys-Virt



From pkgdb at fedoraproject.org  Mon Jan 19 14:14:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 14:14:49 +0000
Subject: [pkgdb] perl-Sys-Virt: virtmaint has requested watchbugzilla
Message-ID: <20090119141451.31B83208E23@bastion.fedora.phx.redhat.com>

virtmaint has requested the watchbugzilla acl on perl-Sys-Virt (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Sys-Virt



From pkgdb at fedoraproject.org  Mon Jan 19 14:14:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 14:14:45 +0000
Subject: [pkgdb] perl-Sys-Virt: virtmaint has requested watchcommits
Message-ID: <20090119141445.7287A208E22@bastion.fedora.phx.redhat.com>

virtmaint has requested the watchcommits acl on perl-Sys-Virt (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Sys-Virt



From pkgdb at fedoraproject.org  Mon Jan 19 14:14:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 14:14:51 +0000
Subject: [pkgdb] perl-Sys-Virt: virtmaint has requested watchcommits
Message-ID: <20090119141451.E9A64208E28@bastion.fedora.phx.redhat.com>

virtmaint has requested the watchcommits acl on perl-Sys-Virt (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Sys-Virt



From pkgdb at fedoraproject.org  Mon Jan 19 14:14:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 14:14:55 +0000
Subject: [pkgdb] perl-Sys-Virt: virtmaint has requested watchbugzilla
Message-ID: <20090119141457.04092208E2D@bastion.fedora.phx.redhat.com>

virtmaint has requested the watchbugzilla acl on perl-Sys-Virt (Fedora 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Sys-Virt



From pkgdb at fedoraproject.org  Mon Jan 19 14:14:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 14:14:59 +0000
Subject: [pkgdb] perl-Sys-Virt: virtmaint has requested watchcommits
Message-ID: <20090119141500.92D81208E30@bastion.fedora.phx.redhat.com>

virtmaint has requested the watchcommits acl on perl-Sys-Virt (Fedora 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Sys-Virt



From pkgdb at fedoraproject.org  Mon Jan 19 14:15:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 14:15:06 +0000
Subject: [pkgdb] perl-Sys-Virt: virtmaint has requested watchbugzilla
Message-ID: <20090119141506.BAC20208E34@bastion.fedora.phx.redhat.com>

virtmaint has requested the watchbugzilla acl on perl-Sys-Virt (Fedora 6)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Sys-Virt



From pkgdb at fedoraproject.org  Mon Jan 19 14:15:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 14:15:08 +0000
Subject: [pkgdb] perl-Sys-Virt: virtmaint has requested watchcommits
Message-ID: <20090119141508.72F47208E37@bastion.fedora.phx.redhat.com>

virtmaint has requested the watchcommits acl on perl-Sys-Virt (Fedora 6)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Sys-Virt



From pkgdb at fedoraproject.org  Mon Jan 19 14:15:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 14:15:14 +0000
Subject: [pkgdb] perl-Sys-Virt: virtmaint has requested watchbugzilla
Message-ID: <20090119141514.5490C208E39@bastion.fedora.phx.redhat.com>

virtmaint has requested the watchbugzilla acl on perl-Sys-Virt (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Sys-Virt



From pkgdb at fedoraproject.org  Mon Jan 19 14:15:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 14:15:16 +0000
Subject: [pkgdb] perl-Sys-Virt: virtmaint has requested watchcommits
Message-ID: <20090119141516.D795A208E3B@bastion.fedora.phx.redhat.com>

virtmaint has requested the watchcommits acl on perl-Sys-Virt (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Sys-Virt



From pkgdb at fedoraproject.org  Mon Jan 19 14:15:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 14:15:21 +0000
Subject: [pkgdb] perl-Sys-Virt: virtmaint has requested watchbugzilla
Message-ID: <20090119141521.64CF0208E3A@bastion.fedora.phx.redhat.com>

virtmaint has requested the watchbugzilla acl on perl-Sys-Virt (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Sys-Virt



From pkgdb at fedoraproject.org  Mon Jan 19 14:15:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 14:15:23 +0000
Subject: [pkgdb] perl-Sys-Virt: virtmaint has requested watchcommits
Message-ID: <20090119141523.B8F69208E3F@bastion.fedora.phx.redhat.com>

virtmaint has requested the watchcommits acl on perl-Sys-Virt (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Sys-Virt



From pkgdb at fedoraproject.org  Mon Jan 19 14:15:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 14:15:27 +0000
Subject: [pkgdb] perl-Sys-Virt: virtmaint has requested watchbugzilla
Message-ID: <20090119141527.E5A27208E45@bastion.fedora.phx.redhat.com>

virtmaint has requested the watchbugzilla acl on perl-Sys-Virt (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Sys-Virt



From pkgdb at fedoraproject.org  Mon Jan 19 14:15:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 14:15:28 +0000
Subject: [pkgdb] perl-Sys-Virt: virtmaint has requested watchcommits
Message-ID: <20090119141528.DEC2C208E46@bastion.fedora.phx.redhat.com>

virtmaint has requested the watchcommits acl on perl-Sys-Virt (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Sys-Virt



From pkgdb at fedoraproject.org  Mon Jan 19 14:15:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 14:15:36 +0000
Subject: [pkgdb] ruby-libvirt: virtmaint has requested watchbugzilla
Message-ID: <20090119141536.C04F3208E4C@bastion.fedora.phx.redhat.com>

virtmaint has requested the watchbugzilla acl on ruby-libvirt (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ruby-libvirt



From pkgdb at fedoraproject.org  Mon Jan 19 14:15:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 14:15:38 +0000
Subject: [pkgdb] ruby-libvirt: virtmaint has requested watchcommits
Message-ID: <20090119141539.7DD26208E50@bastion.fedora.phx.redhat.com>

virtmaint has requested the watchcommits acl on ruby-libvirt (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ruby-libvirt



From pkgdb at fedoraproject.org  Mon Jan 19 14:15:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 14:15:43 +0000
Subject: [pkgdb] ruby-libvirt: virtmaint has requested watchbugzilla
Message-ID: <20090119141543.5A5D0208E54@bastion.fedora.phx.redhat.com>

virtmaint has requested the watchbugzilla acl on ruby-libvirt (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ruby-libvirt



From pkgdb at fedoraproject.org  Mon Jan 19 14:15:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 14:15:43 +0000
Subject: [pkgdb] ruby-libvirt: virtmaint has requested watchcommits
Message-ID: <20090119141543.D3D92208E58@bastion.fedora.phx.redhat.com>

virtmaint has requested the watchcommits acl on ruby-libvirt (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ruby-libvirt



From pkgdb at fedoraproject.org  Mon Jan 19 14:15:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 14:15:48 +0000
Subject: [pkgdb] ruby-libvirt: virtmaint has requested watchbugzilla
Message-ID: <20090119141548.EBA82208E60@bastion.fedora.phx.redhat.com>

virtmaint has requested the watchbugzilla acl on ruby-libvirt (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ruby-libvirt



From pkgdb at fedoraproject.org  Mon Jan 19 14:15:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 14:15:49 +0000
Subject: [pkgdb] ruby-libvirt: virtmaint has requested watchcommits
Message-ID: <20090119141549.97728208E66@bastion.fedora.phx.redhat.com>

virtmaint has requested the watchcommits acl on ruby-libvirt (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ruby-libvirt



From pkgdb at fedoraproject.org  Mon Jan 19 14:15:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 14:15:54 +0000
Subject: [pkgdb] ruby-libvirt: virtmaint has requested watchbugzilla
Message-ID: <20090119141554.B0A54208E68@bastion.fedora.phx.redhat.com>

virtmaint has requested the watchbugzilla acl on ruby-libvirt (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ruby-libvirt



From pkgdb at fedoraproject.org  Mon Jan 19 14:15:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 14:15:55 +0000
Subject: [pkgdb] ruby-libvirt: virtmaint has requested watchcommits
Message-ID: <20090119141555.3D461208E6D@bastion.fedora.phx.redhat.com>

virtmaint has requested the watchcommits acl on ruby-libvirt (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ruby-libvirt



From pkgdb at fedoraproject.org  Mon Jan 19 14:15:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 14:15:59 +0000
Subject: [pkgdb] ruby-libvirt: virtmaint has requested watchbugzilla
Message-ID: <20090119141559.B1F4D208E74@bastion.fedora.phx.redhat.com>

virtmaint has requested the watchbugzilla acl on ruby-libvirt (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ruby-libvirt



From pkgdb at fedoraproject.org  Mon Jan 19 14:16:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 14:16:00 +0000
Subject: [pkgdb] ruby-libvirt: virtmaint has requested watchcommits
Message-ID: <20090119141600.BE3F2208E77@bastion.fedora.phx.redhat.com>

virtmaint has requested the watchcommits acl on ruby-libvirt (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ruby-libvirt



From pkgdb at fedoraproject.org  Mon Jan 19 14:16:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 14:16:09 +0000
Subject: [pkgdb] ocaml-libvirt: virtmaint has requested watchbugzilla
Message-ID: <20090119141609.C40FD208DDB@bastion.fedora.phx.redhat.com>

virtmaint has requested the watchbugzilla acl on ocaml-libvirt (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-libvirt



From pkgdb at fedoraproject.org  Mon Jan 19 14:16:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 14:16:12 +0000
Subject: [pkgdb] ocaml-libvirt: virtmaint has requested watchbugzilla
Message-ID: <20090119141612.7FC9D208E7A@bastion.fedora.phx.redhat.com>

virtmaint has requested the watchbugzilla acl on ocaml-libvirt (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-libvirt



From pkgdb at fedoraproject.org  Mon Jan 19 14:16:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 14:16:13 +0000
Subject: [pkgdb] ocaml-libvirt: virtmaint has requested watchcommits
Message-ID: <20090119141613.4A977208E7E@bastion.fedora.phx.redhat.com>

virtmaint has requested the watchcommits acl on ocaml-libvirt (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-libvirt



From ovasik at fedoraproject.org  Mon Jan 19 14:16:17 2009
From: ovasik at fedoraproject.org (Ondrej Vasik)
Date: Mon, 19 Jan 2009 14:16:17 +0000 (UTC)
Subject: rpms/pax/devel pax.spec,1.23,1.24
Message-ID: <20090119141617.7BD38700F8@cvs1.fedora.phx.redhat.com>

Author: ovasik

Update of /cvs/extras/rpms/pax/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12313

Modified Files:
	pax.spec 
Log Message:
Merge review (#226235) - do not use %%makeinstall


Index: pax.spec
===================================================================
RCS file: /cvs/extras/rpms/pax/devel/pax.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- pax.spec	19 Jan 2009 11:22:46 -0000	1.23
+++ pax.spec	19 Jan 2009 14:15:47 -0000	1.24
@@ -1,7 +1,7 @@
 Summary: POSIX File System Archiver
 Name: pax
 Version: 3.4
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: BSD
 Group: Applications/Archiving
 Source: ftp://ftp.suse.com/pub/people/kukuk/pax/%{name}-%{version}.tar.bz2
@@ -30,7 +30,7 @@
 
 %install
 rm -rf %{buildroot}
-%makeinstall
+make DESTDIR=%{buildroot} install
 
 %clean
 rm -rf %{buildroot}
@@ -42,6 +42,9 @@
 %doc %{_mandir}/man1/*
 
 %changelog
+* Mon Jan 19 2009 Ondrej Vasik <ovasik at redhat.com> - 3.4-8
+- Merge review #226235: fix use of %%makeinstall as well
+
 * Mon Jan 19 2009 Ondrej Vasik <ovasik at redhat.com> - 3.4-7
 - Merge review #226235: do ship doc files,
   do comment patches, use better buildroot and



From pkgdb at fedoraproject.org  Mon Jan 19 14:16:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 14:16:19 +0000
Subject: [pkgdb] ocaml-libvirt: virtmaint has requested watchcommits
Message-ID: <20090119141619.EE33A208E7F@bastion.fedora.phx.redhat.com>

virtmaint has requested the watchcommits acl on ocaml-libvirt (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-libvirt



From pkgdb at fedoraproject.org  Mon Jan 19 14:16:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 14:16:22 +0000
Subject: [pkgdb] ocaml-libvirt: virtmaint has requested watchbugzilla
Message-ID: <20090119141622.6409D208E83@bastion.fedora.phx.redhat.com>

virtmaint has requested the watchbugzilla acl on ocaml-libvirt (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-libvirt



From pkgdb at fedoraproject.org  Mon Jan 19 14:16:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 14:16:23 +0000
Subject: [pkgdb] ocaml-libvirt: virtmaint has requested watchcommits
Message-ID: <20090119141623.6ED58208E86@bastion.fedora.phx.redhat.com>

virtmaint has requested the watchcommits acl on ocaml-libvirt (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-libvirt



From pkgdb at fedoraproject.org  Mon Jan 19 14:16:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 14:16:26 +0000
Subject: [pkgdb] ocaml-libvirt: virtmaint has requested watchbugzilla
Message-ID: <20090119141626.63B08208E89@bastion.fedora.phx.redhat.com>

virtmaint has requested the watchbugzilla acl on ocaml-libvirt (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-libvirt



From pkgdb at fedoraproject.org  Mon Jan 19 14:16:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 14:16:28 +0000
Subject: [pkgdb] ocaml-libvirt: virtmaint has requested watchcommits
Message-ID: <20090119141628.6E72E208E8D@bastion.fedora.phx.redhat.com>

virtmaint has requested the watchcommits acl on ocaml-libvirt (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-libvirt



From pkgdb at fedoraproject.org  Mon Jan 19 14:16:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 14:16:33 +0000
Subject: [pkgdb] ocaml-libvirt: virtmaint has requested watchbugzilla
Message-ID: <20090119141635.86820208E92@bastion.fedora.phx.redhat.com>

virtmaint has requested the watchbugzilla acl on ocaml-libvirt (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-libvirt



From pkgdb at fedoraproject.org  Mon Jan 19 14:16:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 14:16:33 +0000
Subject: [pkgdb] ocaml-libvirt: virtmaint has requested watchcommits
Message-ID: <20090119141633.D36F3208E8F@bastion.fedora.phx.redhat.com>

virtmaint has requested the watchcommits acl on ocaml-libvirt (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-libvirt



From pkgdb at fedoraproject.org  Mon Jan 19 14:16:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 14:16:36 +0000
Subject: [pkgdb] ocaml-libvirt: virtmaint has requested watchbugzilla
Message-ID: <20090119141637.0585B208E97@bastion.fedora.phx.redhat.com>

virtmaint has requested the watchbugzilla acl on ocaml-libvirt (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-libvirt



From pkgdb at fedoraproject.org  Mon Jan 19 14:16:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 14:16:37 +0000
Subject: [pkgdb] ocaml-libvirt: virtmaint has requested watchcommits
Message-ID: <20090119141638.31709208E9A@bastion.fedora.phx.redhat.com>

virtmaint has requested the watchcommits acl on ocaml-libvirt (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-libvirt



From pkgdb at fedoraproject.org  Mon Jan 19 14:16:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 14:16:45 +0000
Subject: [pkgdb] libvirt-java: virtmaint has requested watchbugzilla
Message-ID: <20090119141645.37843208E9C@bastion.fedora.phx.redhat.com>

virtmaint has requested the watchbugzilla acl on libvirt-java (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libvirt-java



From pkgdb at fedoraproject.org  Mon Jan 19 14:16:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 14:16:46 +0000
Subject: [pkgdb] libvirt-java: virtmaint has requested watchcommits
Message-ID: <20090119141646.3B475208E9F@bastion.fedora.phx.redhat.com>

virtmaint has requested the watchcommits acl on libvirt-java (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libvirt-java



From pkgdb at fedoraproject.org  Mon Jan 19 14:16:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 14:16:51 +0000
Subject: [pkgdb] libvirt-java: virtmaint has requested watchbugzilla
Message-ID: <20090119141652.0D654208DE4@bastion.fedora.phx.redhat.com>

virtmaint has requested the watchbugzilla acl on libvirt-java (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libvirt-java



From pkgdb at fedoraproject.org  Mon Jan 19 14:16:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 14:16:55 +0000
Subject: [pkgdb] libvirt-java: virtmaint has requested watchcommits
Message-ID: <20090119141655.E713B208EA5@bastion.fedora.phx.redhat.com>

virtmaint has requested the watchcommits acl on libvirt-java (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libvirt-java



From cassmodiah at fedoraproject.org  Mon Jan 19 14:18:07 2009
From: cassmodiah at fedoraproject.org (Simon Wesp)
Date: Mon, 19 Jan 2009 14:18:07 +0000 (UTC)
Subject: rpms/sbackup/devel import.log, NONE,
	1.1 sbackup-0.10.5-locales.patch, 
	NONE, 1.1 sbackup-0.10.5-prefix.patch, NONE,
	1.1 sbackup-conf.desktop, NONE, 1.1 sbackup-restore.desktop,
	NONE, 1.1 sbackup.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <20090119141807.DD57E700F8@cvs1.fedora.phx.redhat.com>

Author: cassmodiah

Update of /cvs/pkgs/rpms/sbackup/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12833/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log sbackup-0.10.5-locales.patch 
	sbackup-0.10.5-prefix.patch sbackup-conf.desktop 
	sbackup-restore.desktop sbackup.spec 
Log Message:



--- NEW FILE import.log ---
sbackup-0_10_5-5_fc10:HEAD:sbackup-0.10.5-5.fc10.src.rpm:1232374701

sbackup-0.10.5-locales.patch:

--- NEW FILE sbackup-0.10.5-locales.patch ---
--- sbackup-0.10.5.orig/Makefile	2008-06-15 17:39:25.000000000 +0200
+++ sbackup-0.10.5/Makefile	2009-01-16 01:12:14.000000000 +0100
@@ -1,4 +1,4 @@
-PO = pt_BR lv nl es sv fr
+PO = ca en_GB gl it ms pl sv zh_CN cs es hu lv nb pt_BR tr zh_TW de fr id nl pt uk
 
 ifndef DESTDIR
 	DESTDIR = /usr/local

sbackup-0.10.5-prefix.patch:

--- NEW FILE sbackup-0.10.5-prefix.patch ---
--- sbackup-0.10.5.orig/Makefile	2008-06-15 17:39:25.000000000 +0200
+++ sbackup-0.10.5/Makefile	2009-01-16 02:48:40.000000000 +0100
@@ -5,17 +5,18 @@
 endif 
 
 PREFIX = /usr/local
-BIN = $(DESTDIR)/sbin/
-SUPPORT = $(DESTDIR)/share/sbackup/
-DOC = $(DESTDIR)/share/doc/sbackup/
-PIXDIR = $(DESTDIR)/share/pixmaps/
+BIN = $(DESTDIR)/$(PREFIX)/sbin/
+SUPPORT = $(DESTDIR)/$(PREFIX)/share/sbackup/
+DOC = $(DESTDIR)/$(PREFIX)/share/doc/sbackup/
+PIXDIR = $(DESTDIR)/$(PREFIX)/share/pixmaps/
+SYSDIR = $(DESTDIR)/etc
 
 all:
 
 default:
 
 install: po-data install-po 
-	install -d $(BIN) $(SUPPORT) $(DOC) $(PIXDIR) $(DESTDIR)/share/applications $(DESTDIR)/etc
+	install -d $(BIN) $(SUPPORT) $(DOC) $(PIXDIR) $(DESTDIR)/$(PREFIX)/share/applications $(SYSDIR)
 	install ./sbackupd.py $(SUPPORT)
 	ln -s ../share/sbackup/sbackupd.py $(BIN)/sbackupd
 	install ./simple-backup-config.py $(SUPPORT)
@@ -30,16 +31,16 @@
 	install -m644 -D simple-backup-config.glade $(SUPPORT)
 	install -m644 -D sbackup-conf.png $(PIXDIR)
 	install -m644 -D sbackup-restore.png $(PIXDIR)
-	install -m644 -D sbackup.desktop $(DESTDIR)/share/applications/
-	install -m644 -D srestore.desktop $(DESTDIR)/share/applications/
+	install -m644 -D sbackup.desktop $(DESTDIR)/$(PREFIX)/share/applications/
+	install -m644 -D srestore.desktop $(DESTDIR)/$(PREFIX)/share/applications/
 	install -m644 -D simple-restore.glade $(SUPPORT)
 	install ./sbackup $(SUPPORT)
 #	install -m644 -D simple-backup-tocd.glade $(SUPPORT)
-ifeq ($(DESTDIR),/usr/local/)
-	install -b -m600 sbackup.conf.example /etc/sbackup.conf
-	@echo "[places]" >> /etc/sbackup.conf
-	@echo "prefix=$(PREFIX)" >> /etc/sbackup.conf
-endif
+#ifeq ($(DESTDIR),/usr/local/)
+	install -D -m644 sbackup.conf.example $(SYSDIR)/sbackup.conf
+	@echo "[places]" >> $(SYSDIR)/sbackup.conf
+	@echo "prefix=$(PREFIX)" >> $(SYSDIR)/sbackup.conf
+#endif
 
 uninstall:
 	rm -f $(BIN)/sbackupd
@@ -61,8 +62,8 @@
 	-rm -f *~ *.bak
 
 install-po:
-	for lang in $(PO); do install -d $(DESTDIR)/share/locale/$$lang/LC_MESSAGES/ ; done
-	for lang in $(PO); do install -m 644 po/$$lang/LC_MESSAGES/* $(DESTDIR)/share/locale/$$lang/LC_MESSAGES/ ; done
+	for lang in $(PO); do install -d $(DESTDIR)/$(PREFIX)/share/locale/$$lang/LC_MESSAGES/ ; done
+	for lang in $(PO); do install -m 644 po/$$lang/LC_MESSAGES/* $(DESTDIR)/$(PREFIX)/share/locale/$$lang/LC_MESSAGES/ ; done
 
 po-dir:
 	for lang in $(PO); do mkdir -p po/$$lang/LC_MESSAGES/ ; done


--- NEW FILE sbackup-conf.desktop ---
[Desktop Entry]
Version=1.0
Encoding=UTF-8
Name=Simple Backup Config
Comment=Configuration tool for Simple Backup Suite
Comment[de]=Hilfsprogramm zur Einstellung der Simple Backup Suite
Exec=simple-backup-config
Terminal=false
Type=Application
Categories=System;Settings;GNOME;GTK;
StartupNotify=true
Icon=sbackup-conf
GenericName=Backup Properties
GenericName[de]=Sicherungseinstellungen


--- NEW FILE sbackup-restore.desktop ---
[Desktop Entry]
Version=1.0
Encoding=UTF-8
Name=Simple Backup Restore
Comment=Restore tool for Simple Backup Suite
Comment[de]=Hilfsprogramm zur Wiederherstellung der Sicherungskopien
Exec=simple-restore-gnome
Terminal=false
Type=Application
Categories=System;Settings;GNOME;GTK;
StartupNotify=true
Icon=sbackup-restore
GenericName=Restore files and directories
GenericName[de]=Verzeichnisse und Dateien wiederherstellen


--- NEW FILE sbackup.spec ---
%define sbc simple-backup-config
%define srg simple-restore-gnome

Name:           sbackup
Version:        0.10.5
Release:        5%{?dist}
Summary:        Simple Backup Suite for desktop use

Group:          Applications/Archiving
License:        GPLv2+
URL:            http://sbackup.wiki.sourceforge.net/
Source0:        http://downloads.sourceforge.net/%{name}/%{name}_%{version}.tar.gz
Source1:        %{name}-conf.desktop
Source2:        %{name}-restore.desktop
Patch0:         %{name}-0.10.5-locales.patch
Patch1:         %{name}-0.10.5-prefix.patch
BuildArch:      noarch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  desktop-file-utils
BuildRequires:  gettext
Requires:       usermode-gtk
Requires:       pygtk2-libglade
Requires:       gettext
Requires:       gvfs

%description
Simple Backup Suite is a set of backend backup daemon and GNOME
GUI frontends that provide a simple yet powerful backup
solution for common desktop users.

Backups can be written to local directory or remote servers using
GNOME VFS technology. A fine control is possible regarding what
folders and files to backup. Files can be excluded even with a set
of regular expressions. Regular backups can be scheduled.


%prep
%setup -q
%patch0 -p1 
%patch1 -p1


%build
%install
rm -rf %{buildroot}
make install -p DESTDIR=%{buildroot} PREFIX=%{_prefix}

mkdir -p %{buildroot}%{_mandir}/man8/
cat simple-backup.8 | gzip -9 -c > %{name}.8.gz
install -pm644 %{name}.8.gz \
        %{buildroot}%{_mandir}/man8/%{name}.8.gz

rm -rf %{buildroot}%{_datadir}/applications/*
desktop-file-install \
                     %if 0%{?rhel}
                     --vendor="" \
                     %endif
                     --dir=%{buildroot}%{_datadir}/applications \
                     %{SOURCE1}
desktop-file-install \
                     %if 0%{?rhel}
                     --vendor="" \
                     %endif
                     --dir=%{buildroot}%{_datadir}/applications \
                     %{SOURCE2}

mkdir -p %{buildroot}%{_bindir}
ln -s consolehelper %{buildroot}%{_bindir}/%{sbc}
ln -s consolehelper %{buildroot}%{_bindir}/%{srg}

mkdir -p %{buildroot}%{_sysconfdir}/pam.d

cat << EOF > %{buildroot}%{_sysconfdir}/pam.d/%{sbc}
#%PAM-1.0
auth            include         config-util
account         include         config-util
session         include         config-util
EOF

cat << EOF > %{buildroot}%{_sysconfdir}/pam.d/%{srg}
#%PAM-1.0
auth            include         config-util
account         include         config-util
session         include         config-util
EOF

mkdir -p %{buildroot}%{_sysconfdir}/security/console.apps/

cat << EOF > %{buildroot}%{_sysconfdir}/security/console.apps/%{sbc}
USER=root
PROGRAM=%{_sbindir}/%{sbc}
SESSION=true
EOF

cat << EOF > %{buildroot}%{_sysconfdir}/security/console.apps/%{srg}
USER=root
PROGRAM=%{_sbindir}/%{srg}
SESSION=true
EOF

mkdir -p %{buildroot}%{_sysconfdir}/{cron.d,cron.daily,cron-hourly,cron.monthly,cron.weekly}/
touch %{buildroot}%{_sysconfdir}/{cron.d,cron.daily,cron-hourly,cron.monthly,cron.weekly}/%{name}

%find_lang %{name}


%clean
rm -rf %{buildroot}


%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS COPYING TODO VERSION
%{_bindir}/%{sbc}
%{_bindir}/%{srg}
%{_sbindir}/%{name}d
%{_sbindir}/%{sbc}
%{_sbindir}/%{srg}
%{_mandir}/man8/%{name}.8.gz
%{_datadir}/applications/%{name}*.desktop
%{_datadir}/pixmaps/%{name}-conf.png
%{_datadir}/pixmaps/%{name}-restore.png
%{_datadir}/%{name}/
%config(noreplace) %{_sysconfdir}/%{name}.conf
%config(noreplace) %{_sysconfdir}/pam.d/%{sbc}
%config %{_sysconfdir}/security/console.apps/%{sbc}
%config(noreplace) %{_sysconfdir}/pam.d/%{srg}
%config %{_sysconfdir}/security/console.apps/%{srg}
%exclude %{_sbindir}/srestore.*
%exclude %{_sbindir}/upgrade_backups.*
%ghost %{_sysconfdir}/cron*/%{name}


%changelog
* Fri Jan 16 2009 Simon Wesp <cassmodiah at fedoraproject.org> - 0.10.5-5
- Add ownage for cron-files
- Correct patch0
- Add patch1 
- Correct desktopfiles

* Mon Jan 05 2009 Simon Wesp <cassmodiah at fedoraproject.org> - 0.10.5-4
- Add Source0 again, to honor timestamp for Source0
- Require usermode-gtk instead of usermode for the password dialog.
 
* Wed Nov 26 2008 Simon Wesp <cassmodiah at fedoraproject.org> - 0.10.5-3
- Add patch0
- Add manpage
- Add translations

* Sat Nov 01 2008 Simon Wesp <cassmodiah at fedoraproject.org> - 0.10.5-2
- adjust for EPEL

* Fri Oct 24 2008 Simon Wesp <cassmodiah at fedoraproject.org> - 0.10.5-1
- Initial release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sbackup/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	18 Jan 2009 22:28:39 -0000	1.1
+++ .cvsignore	19 Jan 2009 14:17:37 -0000	1.2
@@ -0,0 +1 @@
+sbackup_0.10.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sbackup/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	18 Jan 2009 22:28:39 -0000	1.1
+++ sources	19 Jan 2009 14:17:37 -0000	1.2
@@ -0,0 +1 @@
+0d754b72da3b5cadf6de203cdf7afe13  sbackup_0.10.5.tar.gz



From pkgdb at fedoraproject.org  Mon Jan 19 14:21:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 14:21:31 +0000
Subject: [pkgdb] xenner had acl change status
Message-ID: <20090119142131.6AD0A208EB1@bastion.fedora.phx.redhat.com>

kraxel has set the watchbugzilla acl on xenner (Fedora devel) to Approved for virtmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/xenner



From pkgdb at fedoraproject.org  Mon Jan 19 14:21:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 14:21:37 +0000
Subject: [pkgdb] xenner had acl change status
Message-ID: <20090119142137.5A0D2208EB6@bastion.fedora.phx.redhat.com>

kraxel has set the watchcommits acl on xenner (Fedora devel) to Approved for virtmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/xenner



From pkgdb at fedoraproject.org  Mon Jan 19 14:21:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 14:21:44 +0000
Subject: [pkgdb] xenner had acl change status
Message-ID: <20090119142144.508E7208EBA@bastion.fedora.phx.redhat.com>

kraxel has set the watchbugzilla acl on xenner (Fedora 8) to Approved for virtmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/xenner



From pkgdb at fedoraproject.org  Mon Jan 19 14:21:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 14:21:45 +0000
Subject: [pkgdb] xenner had acl change status
Message-ID: <20090119142145.9F138208EBE@bastion.fedora.phx.redhat.com>

kraxel has set the watchcommits acl on xenner (Fedora 8) to Approved for virtmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/xenner



From pkgdb at fedoraproject.org  Mon Jan 19 14:21:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 14:21:52 +0000
Subject: [pkgdb] xenner had acl change status
Message-ID: <20090119142153.CCFC4208EC6@bastion.fedora.phx.redhat.com>

kraxel has set the watchbugzilla acl on xenner (Fedora 9) to Approved for virtmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/xenner



From pkgdb at fedoraproject.org  Mon Jan 19 14:21:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 14:21:54 +0000
Subject: [pkgdb] xenner had acl change status
Message-ID: <20090119142155.30076208EC7@bastion.fedora.phx.redhat.com>

kraxel has set the watchcommits acl on xenner (Fedora 9) to Approved for virtmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/xenner



From pkgdb at fedoraproject.org  Mon Jan 19 14:21:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 14:21:59 +0000
Subject: [pkgdb] xenner had acl change status
Message-ID: <20090119142159.8A701208ECD@bastion.fedora.phx.redhat.com>

kraxel has set the watchbugzilla acl on xenner (Fedora 10) to Approved for virtmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/xenner



From pkgdb at fedoraproject.org  Mon Jan 19 14:22:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 14:22:06 +0000
Subject: [pkgdb] xenner had acl change status
Message-ID: <20090119142209.139D3208ECF@bastion.fedora.phx.redhat.com>

kraxel has set the watchcommits acl on xenner (Fedora 10) to Approved for virtmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/xenner



From pkgdb at fedoraproject.org  Mon Jan 19 14:24:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 14:24:18 +0000
Subject: [pkgdb] libvirt had acl change status
Message-ID: <20090119142418.9B06F208701@bastion.fedora.phx.redhat.com>

markmc has set the watchbugzilla acl on libvirt (Fedora devel) to Approved for virtmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libvirt



From pkgdb at fedoraproject.org  Mon Jan 19 14:24:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 14:24:20 +0000
Subject: [pkgdb] libvirt had acl change status
Message-ID: <20090119142420.DBC65208745@bastion.fedora.phx.redhat.com>

markmc has set the watchcommits acl on libvirt (Fedora devel) to Approved for virtmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libvirt



From pkgdb at fedoraproject.org  Mon Jan 19 14:24:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 14:24:29 +0000
Subject: [pkgdb] libvirt had acl change status
Message-ID: <20090119142429.CCD86208771@bastion.fedora.phx.redhat.com>

markmc has set the watchbugzilla acl on libvirt (Fedora 8) to Approved for virtmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libvirt



From pkgdb at fedoraproject.org  Mon Jan 19 14:24:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 14:24:33 +0000
Subject: [pkgdb] libvirt had acl change status
Message-ID: <20090119142433.51500208E13@bastion.fedora.phx.redhat.com>

markmc has set the watchcommits acl on libvirt (Fedora 8) to Approved for virtmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libvirt



From pkgdb at fedoraproject.org  Mon Jan 19 14:24:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 14:24:38 +0000
Subject: [pkgdb] libvirt had acl change status
Message-ID: <20090119142440.E119820896A@bastion.fedora.phx.redhat.com>

markmc has set the watchbugzilla acl on libvirt (Fedora 9) to Approved for virtmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libvirt



From pkgdb at fedoraproject.org  Mon Jan 19 14:24:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 14:24:41 +0000
Subject: [pkgdb] libvirt had acl change status
Message-ID: <20090119142441.AF187208ED9@bastion.fedora.phx.redhat.com>

markmc has set the watchcommits acl on libvirt (Fedora 9) to Approved for virtmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libvirt



From twoerner at fedoraproject.org  Mon Jan 19 14:24:45 2009
From: twoerner at fedoraproject.org (Thomas Woerner)
Date: Mon, 19 Jan 2009 14:24:45 +0000 (UTC)
Subject: rpms/iptstate/devel iptstate.spec,1.18,1.19
Message-ID: <20090119142445.E1A84700F8@cvs1.fedora.phx.redhat.com>

Author: twoerner

Update of /cvs/pkgs/rpms/iptstate/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13785

Modified Files:
	iptstate.spec 
Log Message:
- merge review (rhbz#225908)



Index: iptstate.spec
===================================================================
RCS file: /cvs/pkgs/rpms/iptstate/devel/iptstate.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- iptstate.spec	25 Feb 2008 11:00:53 -0000	1.18
+++ iptstate.spec	19 Jan 2009 14:24:15 -0000	1.19
@@ -1,8 +1,8 @@
 Name: iptstate
 Summary: A top-like display of IP Tables state table entries
 Version: 2.2.1
-Release: 3%{?dist}
-Source: iptstate-%{version}.tar.bz2
+Release: 4%{?dist}
+Source: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
 Patch0: iptstate-2.1-man8.patch
 Patch1: iptstate-2.2.1-strerror.patch
 Group: System Environment/Base
@@ -22,7 +22,7 @@
 Since IP Tables doesn't have a built in way to easily display 
 this information even once, an option was added to just have it 
 display the state table once.
- 
+
   Features include:
         - Top-like realtime state table information
         - Sorting by any field
@@ -40,11 +40,11 @@
 %patch1 -p1 -b .strerror
 
 %build
-make CXXFLAGS="$RPM_OPT_FLAGS"
+make %{?_smp_mflags} CXXFLAGS="$RPM_OPT_FLAGS"
 
 %install
 rm -rf %{buildroot}
-%makeinstall PREFIX=%{buildroot}%{_prefix}
+make install PREFIX=%{buildroot}%{_prefix} INSTALL="install -p"
 
 %clean
 rm -rf %{buildroot}
@@ -56,6 +56,9 @@
 %{_mandir}/man8/iptstate.*
 
 %changelog
+* Mon Jan 19 2009 Thomas Woerner <twoerner at redhat.com> 2.2.1-4
+- merge review (rhbz#225908)
+
 * Mon Feb 25 2008 Thomas Woerner <twoerner at redhat.com> 2.2.1-3
 - fixed compile problem because of strerror undefined in scope
   Fixes (rhbz#434482)



From pkgdb at fedoraproject.org  Mon Jan 19 14:24:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 14:24:44 +0000
Subject: [pkgdb] libvirt had acl change status
Message-ID: <20090119142444.C79C2208EDD@bastion.fedora.phx.redhat.com>

markmc has set the watchbugzilla acl on libvirt (Fedora 10) to Approved for virtmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libvirt



From pkgdb at fedoraproject.org  Mon Jan 19 14:24:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 14:24:47 +0000
Subject: [pkgdb] libvirt had acl change status
Message-ID: <20090119142448.0A85F208EDF@bastion.fedora.phx.redhat.com>

markmc has set the watchcommits acl on libvirt (Fedora 10) to Approved for virtmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libvirt



From cassmodiah at fedoraproject.org  Mon Jan 19 14:25:04 2009
From: cassmodiah at fedoraproject.org (Simon Wesp)
Date: Mon, 19 Jan 2009 14:25:04 +0000 (UTC)
Subject: rpms/sbackup/F-10 import.log, NONE, 1.1 sbackup-0.10.5-locales.patch,
	NONE, 1.1 sbackup-0.10.5-prefix.patch, NONE,
	1.1 sbackup-conf.desktop, NONE, 1.1 sbackup-restore.desktop,
	NONE, 1.1 sbackup.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <20090119142504.A1696700F8@cvs1.fedora.phx.redhat.com>

Author: cassmodiah

Update of /cvs/pkgs/rpms/sbackup/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13819/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	import.log sbackup-0.10.5-locales.patch 
	sbackup-0.10.5-prefix.patch sbackup-conf.desktop 
	sbackup-restore.desktop sbackup.spec 
Log Message:



--- NEW FILE import.log ---
sbackup-0_10_5-5_fc10:F-10:sbackup-0.10.5-5.fc10.src.rpm:1232374996

sbackup-0.10.5-locales.patch:

--- NEW FILE sbackup-0.10.5-locales.patch ---
--- sbackup-0.10.5.orig/Makefile	2008-06-15 17:39:25.000000000 +0200
+++ sbackup-0.10.5/Makefile	2009-01-16 01:12:14.000000000 +0100
@@ -1,4 +1,4 @@
-PO = pt_BR lv nl es sv fr
+PO = ca en_GB gl it ms pl sv zh_CN cs es hu lv nb pt_BR tr zh_TW de fr id nl pt uk
 
 ifndef DESTDIR
 	DESTDIR = /usr/local

sbackup-0.10.5-prefix.patch:

--- NEW FILE sbackup-0.10.5-prefix.patch ---
--- sbackup-0.10.5.orig/Makefile	2008-06-15 17:39:25.000000000 +0200
+++ sbackup-0.10.5/Makefile	2009-01-16 02:48:40.000000000 +0100
@@ -5,17 +5,18 @@
 endif 
 
 PREFIX = /usr/local
-BIN = $(DESTDIR)/sbin/
-SUPPORT = $(DESTDIR)/share/sbackup/
-DOC = $(DESTDIR)/share/doc/sbackup/
-PIXDIR = $(DESTDIR)/share/pixmaps/
+BIN = $(DESTDIR)/$(PREFIX)/sbin/
+SUPPORT = $(DESTDIR)/$(PREFIX)/share/sbackup/
+DOC = $(DESTDIR)/$(PREFIX)/share/doc/sbackup/
+PIXDIR = $(DESTDIR)/$(PREFIX)/share/pixmaps/
+SYSDIR = $(DESTDIR)/etc
 
 all:
 
 default:
 
 install: po-data install-po 
-	install -d $(BIN) $(SUPPORT) $(DOC) $(PIXDIR) $(DESTDIR)/share/applications $(DESTDIR)/etc
+	install -d $(BIN) $(SUPPORT) $(DOC) $(PIXDIR) $(DESTDIR)/$(PREFIX)/share/applications $(SYSDIR)
 	install ./sbackupd.py $(SUPPORT)
 	ln -s ../share/sbackup/sbackupd.py $(BIN)/sbackupd
 	install ./simple-backup-config.py $(SUPPORT)
@@ -30,16 +31,16 @@
 	install -m644 -D simple-backup-config.glade $(SUPPORT)
 	install -m644 -D sbackup-conf.png $(PIXDIR)
 	install -m644 -D sbackup-restore.png $(PIXDIR)
-	install -m644 -D sbackup.desktop $(DESTDIR)/share/applications/
-	install -m644 -D srestore.desktop $(DESTDIR)/share/applications/
+	install -m644 -D sbackup.desktop $(DESTDIR)/$(PREFIX)/share/applications/
+	install -m644 -D srestore.desktop $(DESTDIR)/$(PREFIX)/share/applications/
 	install -m644 -D simple-restore.glade $(SUPPORT)
 	install ./sbackup $(SUPPORT)
 #	install -m644 -D simple-backup-tocd.glade $(SUPPORT)
-ifeq ($(DESTDIR),/usr/local/)
-	install -b -m600 sbackup.conf.example /etc/sbackup.conf
-	@echo "[places]" >> /etc/sbackup.conf
-	@echo "prefix=$(PREFIX)" >> /etc/sbackup.conf
-endif
+#ifeq ($(DESTDIR),/usr/local/)
+	install -D -m644 sbackup.conf.example $(SYSDIR)/sbackup.conf
+	@echo "[places]" >> $(SYSDIR)/sbackup.conf
+	@echo "prefix=$(PREFIX)" >> $(SYSDIR)/sbackup.conf
+#endif
 
 uninstall:
 	rm -f $(BIN)/sbackupd
@@ -61,8 +62,8 @@
 	-rm -f *~ *.bak
 
 install-po:
-	for lang in $(PO); do install -d $(DESTDIR)/share/locale/$$lang/LC_MESSAGES/ ; done
-	for lang in $(PO); do install -m 644 po/$$lang/LC_MESSAGES/* $(DESTDIR)/share/locale/$$lang/LC_MESSAGES/ ; done
+	for lang in $(PO); do install -d $(DESTDIR)/$(PREFIX)/share/locale/$$lang/LC_MESSAGES/ ; done
+	for lang in $(PO); do install -m 644 po/$$lang/LC_MESSAGES/* $(DESTDIR)/$(PREFIX)/share/locale/$$lang/LC_MESSAGES/ ; done
 
 po-dir:
 	for lang in $(PO); do mkdir -p po/$$lang/LC_MESSAGES/ ; done


--- NEW FILE sbackup-conf.desktop ---
[Desktop Entry]
Version=1.0
Encoding=UTF-8
Name=Simple Backup Config
Comment=Configuration tool for Simple Backup Suite
Comment[de]=Hilfsprogramm zur Einstellung der Simple Backup Suite
Exec=simple-backup-config
Terminal=false
Type=Application
Categories=System;Settings;GNOME;GTK;
StartupNotify=true
Icon=sbackup-conf
GenericName=Backup Properties
GenericName[de]=Sicherungseinstellungen


--- NEW FILE sbackup-restore.desktop ---
[Desktop Entry]
Version=1.0
Encoding=UTF-8
Name=Simple Backup Restore
Comment=Restore tool for Simple Backup Suite
Comment[de]=Hilfsprogramm zur Wiederherstellung der Sicherungskopien
Exec=simple-restore-gnome
Terminal=false
Type=Application
Categories=System;Settings;GNOME;GTK;
StartupNotify=true
Icon=sbackup-restore
GenericName=Restore files and directories
GenericName[de]=Verzeichnisse und Dateien wiederherstellen


--- NEW FILE sbackup.spec ---
%define sbc simple-backup-config
%define srg simple-restore-gnome

Name:           sbackup
Version:        0.10.5
Release:        5%{?dist}
Summary:        Simple Backup Suite for desktop use

Group:          Applications/Archiving
License:        GPLv2+
URL:            http://sbackup.wiki.sourceforge.net/
Source0:        http://downloads.sourceforge.net/%{name}/%{name}_%{version}.tar.gz
Source1:        %{name}-conf.desktop
Source2:        %{name}-restore.desktop
Patch0:         %{name}-0.10.5-locales.patch
Patch1:         %{name}-0.10.5-prefix.patch
BuildArch:      noarch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  desktop-file-utils
BuildRequires:  gettext
Requires:       usermode-gtk
Requires:       pygtk2-libglade
Requires:       gettext
Requires:       gvfs

%description
Simple Backup Suite is a set of backend backup daemon and GNOME
GUI frontends that provide a simple yet powerful backup
solution for common desktop users.

Backups can be written to local directory or remote servers using
GNOME VFS technology. A fine control is possible regarding what
folders and files to backup. Files can be excluded even with a set
of regular expressions. Regular backups can be scheduled.


%prep
%setup -q
%patch0 -p1 
%patch1 -p1


%build
%install
rm -rf %{buildroot}
make install -p DESTDIR=%{buildroot} PREFIX=%{_prefix}

mkdir -p %{buildroot}%{_mandir}/man8/
cat simple-backup.8 | gzip -9 -c > %{name}.8.gz
install -pm644 %{name}.8.gz \
        %{buildroot}%{_mandir}/man8/%{name}.8.gz

rm -rf %{buildroot}%{_datadir}/applications/*
desktop-file-install \
                     %if 0%{?rhel}
                     --vendor="" \
                     %endif
                     --dir=%{buildroot}%{_datadir}/applications \
                     %{SOURCE1}
desktop-file-install \
                     %if 0%{?rhel}
                     --vendor="" \
                     %endif
                     --dir=%{buildroot}%{_datadir}/applications \
                     %{SOURCE2}

mkdir -p %{buildroot}%{_bindir}
ln -s consolehelper %{buildroot}%{_bindir}/%{sbc}
ln -s consolehelper %{buildroot}%{_bindir}/%{srg}

mkdir -p %{buildroot}%{_sysconfdir}/pam.d

cat << EOF > %{buildroot}%{_sysconfdir}/pam.d/%{sbc}
#%PAM-1.0
auth            include         config-util
account         include         config-util
session         include         config-util
EOF

cat << EOF > %{buildroot}%{_sysconfdir}/pam.d/%{srg}
#%PAM-1.0
auth            include         config-util
account         include         config-util
session         include         config-util
EOF

mkdir -p %{buildroot}%{_sysconfdir}/security/console.apps/

cat << EOF > %{buildroot}%{_sysconfdir}/security/console.apps/%{sbc}
USER=root
PROGRAM=%{_sbindir}/%{sbc}
SESSION=true
EOF

cat << EOF > %{buildroot}%{_sysconfdir}/security/console.apps/%{srg}
USER=root
PROGRAM=%{_sbindir}/%{srg}
SESSION=true
EOF

mkdir -p %{buildroot}%{_sysconfdir}/{cron.d,cron.daily,cron-hourly,cron.monthly,cron.weekly}/
touch %{buildroot}%{_sysconfdir}/{cron.d,cron.daily,cron-hourly,cron.monthly,cron.weekly}/%{name}

%find_lang %{name}


%clean
rm -rf %{buildroot}


%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS COPYING TODO VERSION
%{_bindir}/%{sbc}
%{_bindir}/%{srg}
%{_sbindir}/%{name}d
%{_sbindir}/%{sbc}
%{_sbindir}/%{srg}
%{_mandir}/man8/%{name}.8.gz
%{_datadir}/applications/%{name}*.desktop
%{_datadir}/pixmaps/%{name}-conf.png
%{_datadir}/pixmaps/%{name}-restore.png
%{_datadir}/%{name}/
%config(noreplace) %{_sysconfdir}/%{name}.conf
%config(noreplace) %{_sysconfdir}/pam.d/%{sbc}
%config %{_sysconfdir}/security/console.apps/%{sbc}
%config(noreplace) %{_sysconfdir}/pam.d/%{srg}
%config %{_sysconfdir}/security/console.apps/%{srg}
%exclude %{_sbindir}/srestore.*
%exclude %{_sbindir}/upgrade_backups.*
%ghost %{_sysconfdir}/cron*/%{name}


%changelog
* Fri Jan 16 2009 Simon Wesp <cassmodiah at fedoraproject.org> - 0.10.5-5
- Add ownage for cron-files
- Correct patch0
- Add patch1 
- Correct desktopfiles

* Mon Jan 05 2009 Simon Wesp <cassmodiah at fedoraproject.org> - 0.10.5-4
- Add Source0 again, to honor timestamp for Source0
- Require usermode-gtk instead of usermode for the password dialog.
 
* Wed Nov 26 2008 Simon Wesp <cassmodiah at fedoraproject.org> - 0.10.5-3
- Add patch0
- Add manpage
- Add translations

* Sat Nov 01 2008 Simon Wesp <cassmodiah at fedoraproject.org> - 0.10.5-2
- adjust for EPEL

* Fri Oct 24 2008 Simon Wesp <cassmodiah at fedoraproject.org> - 0.10.5-1
- Initial release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sbackup/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	18 Jan 2009 22:28:39 -0000	1.1
+++ .cvsignore	19 Jan 2009 14:24:34 -0000	1.2
@@ -0,0 +1 @@
+sbackup_0.10.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sbackup/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	18 Jan 2009 22:28:39 -0000	1.1
+++ sources	19 Jan 2009 14:24:34 -0000	1.2
@@ -0,0 +1 @@
+0d754b72da3b5cadf6de203cdf7afe13  sbackup_0.10.5.tar.gz



From pkgdb at fedoraproject.org  Mon Jan 19 14:25:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 14:25:06 +0000
Subject: [pkgdb] kvm had acl change status
Message-ID: <20090119142507.02A4F20897B@bastion.fedora.phx.redhat.com>

markmc has set the watchbugzilla acl on kvm (Fedora devel) to Approved for virtmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kvm



From pkgdb at fedoraproject.org  Mon Jan 19 14:25:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 14:25:09 +0000
Subject: [pkgdb] kvm had acl change status
Message-ID: <20090119142510.DA931208E18@bastion.fedora.phx.redhat.com>

markmc has set the watchcommits acl on kvm (Fedora devel) to Approved for virtmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kvm



From than at fedoraproject.org  Mon Jan 19 14:25:23 2009
From: than at fedoraproject.org (Than Ngo)
Date: Mon, 19 Jan 2009 14:25:23 +0000 (UTC)
Subject: rpms/isdn4k-utils/devel isdn4k-utils-CVS-2006-07-20-capi.patch, NONE,
	1.1 isdn4k-utils.spec, 1.76, 1.77
Message-ID: <20090119142523.35D49700F8@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/isdn4k-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13902

Modified Files:
	isdn4k-utils.spec 
Added Files:
	isdn4k-utils-CVS-2006-07-20-capi.patch 
Log Message:
fix #398121, capiplugin.so uses non-existent libcapi20.so


isdn4k-utils-CVS-2006-07-20-capi.patch:

--- NEW FILE isdn4k-utils-CVS-2006-07-20-capi.patch ---
diff -up isdn4k-utils-CVS-2006-07-20/capi20/capidyn.c.orig isdn4k-utils-CVS-2006-07-20/capi20/capidyn.c
--- isdn4k-utils-CVS-2006-07-20/capi20/capidyn.c.orig	2009-01-19 15:18:10.000000000 +0100
+++ isdn4k-utils-CVS-2006-07-20/capi20/capidyn.c	2009-01-19 15:19:30.000000000 +0100
@@ -26,7 +26,7 @@
 #include <dlfcn.h>
 
 
-#define LIBCAPI	"libcapi20.so"
+#define LIBCAPI	"libcapi20.so.3"
 static int loadlib(void);
 
 /* ---------------------------------------------------------------------- */


Index: isdn4k-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/isdn4k-utils/devel/isdn4k-utils.spec,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- isdn4k-utils.spec	28 Oct 2008 12:48:16 -0000	1.76
+++ isdn4k-utils.spec	19 Jan 2009 14:24:52 -0000	1.77
@@ -17,7 +17,7 @@
 Summary: Utilities for configuring an ISDN subsystem.
 Name: isdn4k-utils
 Version: 3.2
-Release: 61%{?dist}
+Release: 62%{?dist}
 License: GPLv2+
 Group: Applications/System
 
@@ -43,6 +43,7 @@
 Patch13: isdn4k-utils-capiinit.patch
 Patch14: isdn4k-utils-CVS-2006-07-20-pppd-2.4.4.patch
 Patch15: isdn4k-utils-gcc3x.patch
+Patch16: isdn4k-utils-CVS-2006-07-20-capi.patch
 
 BuildRoot: %{_tmppath}/%name-%{version}-%{release}-root
 
@@ -128,6 +129,7 @@
 %patch13 -p1 -b .capi
 %patch14 -p1 -b .pppd-2.4.4
 %patch15 -p1 -b .glibc
+%patch16 -p1 -b .capi
 
 for i in */configure; do
 	cd `dirname $i`
@@ -502,6 +504,9 @@
 %doc xmonisdn/README
 
 %changelog
+* Mon Jan 19 2009 Than Ngo <than at redhat.com> - 3.2-62
+- fix #398121, capiplugin.so uses non-existent libcapi20.so
+
 * Mon Oct 27 2008 Than Ngo <than at redhat.com> 3.2-61
 - bz450370, fix multilib issue
 



From dwalsh at fedoraproject.org  Mon Jan 19 14:28:55 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Mon, 19 Jan 2009 14:28:55 +0000 (UTC)
Subject: rpms/selinux-policy/devel selinux-policy.spec,1.766,1.767
Message-ID: <20090119142855.54A73700F8@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14447

Modified Files:
	selinux-policy.spec 
Log Message:
* Thu Jan 15 2009 Dan Walsh <dwalsh at redhat.com> 3.6.2-5
- Define openoffice as an x_domain



Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.766
retrieving revision 1.767
diff -u -r1.766 -r1.767
--- selinux-policy.spec	16 Jan 2009 21:11:58 -0000	1.766
+++ selinux-policy.spec	19 Jan 2009 14:28:24 -0000	1.767
@@ -47,7 +47,7 @@
 Url: http://serefpolicy.sourceforge.net
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
-BuildRequires: python gawk checkpolicy >= %{CHECKPOLICYVER} m4 policycoreutils >= %{POLICYCOREUTILSVER} bzip2
+BuildRequires: python gawk checkpolicy >= %{CHECKPOLICYVER} m4 policycoreutils-python >= %{POLICYCOREUTILSVER} bzip2 
 Requires(pre): policycoreutils >= %{POLICYCOREUTILSVER} libsemanage >= 2.0.14-3
 Requires(post): /usr/bin/bunzip2 /bin/mktemp
 Requires: checkpolicy >= %{CHECKPOLICYVER} m4 



From cassmodiah at fedoraproject.org  Mon Jan 19 14:30:31 2009
From: cassmodiah at fedoraproject.org (Simon Wesp)
Date: Mon, 19 Jan 2009 14:30:31 +0000 (UTC)
Subject: rpms/sbackup/F-9 import.log, NONE, 1.1 sbackup-0.10.5-locales.patch,
	NONE, 1.1 sbackup-0.10.5-prefix.patch, NONE,
	1.1 sbackup-conf.desktop, NONE, 1.1 sbackup-restore.desktop,
	NONE, 1.1 sbackup.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <20090119143031.E88DF700F8@cvs1.fedora.phx.redhat.com>

Author: cassmodiah

Update of /cvs/pkgs/rpms/sbackup/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15260/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	import.log sbackup-0.10.5-locales.patch 
	sbackup-0.10.5-prefix.patch sbackup-conf.desktop 
	sbackup-restore.desktop sbackup.spec 
Log Message:



--- NEW FILE import.log ---
sbackup-0_10_5-5_fc10:F-9:sbackup-0.10.5-5.fc10.src.rpm:1232375421

sbackup-0.10.5-locales.patch:

--- NEW FILE sbackup-0.10.5-locales.patch ---
--- sbackup-0.10.5.orig/Makefile	2008-06-15 17:39:25.000000000 +0200
+++ sbackup-0.10.5/Makefile	2009-01-16 01:12:14.000000000 +0100
@@ -1,4 +1,4 @@
-PO = pt_BR lv nl es sv fr
+PO = ca en_GB gl it ms pl sv zh_CN cs es hu lv nb pt_BR tr zh_TW de fr id nl pt uk
 
 ifndef DESTDIR
 	DESTDIR = /usr/local

sbackup-0.10.5-prefix.patch:

--- NEW FILE sbackup-0.10.5-prefix.patch ---
--- sbackup-0.10.5.orig/Makefile	2008-06-15 17:39:25.000000000 +0200
+++ sbackup-0.10.5/Makefile	2009-01-16 02:48:40.000000000 +0100
@@ -5,17 +5,18 @@
 endif 
 
 PREFIX = /usr/local
-BIN = $(DESTDIR)/sbin/
-SUPPORT = $(DESTDIR)/share/sbackup/
-DOC = $(DESTDIR)/share/doc/sbackup/
-PIXDIR = $(DESTDIR)/share/pixmaps/
+BIN = $(DESTDIR)/$(PREFIX)/sbin/
+SUPPORT = $(DESTDIR)/$(PREFIX)/share/sbackup/
+DOC = $(DESTDIR)/$(PREFIX)/share/doc/sbackup/
+PIXDIR = $(DESTDIR)/$(PREFIX)/share/pixmaps/
+SYSDIR = $(DESTDIR)/etc
 
 all:
 
 default:
 
 install: po-data install-po 
-	install -d $(BIN) $(SUPPORT) $(DOC) $(PIXDIR) $(DESTDIR)/share/applications $(DESTDIR)/etc
+	install -d $(BIN) $(SUPPORT) $(DOC) $(PIXDIR) $(DESTDIR)/$(PREFIX)/share/applications $(SYSDIR)
 	install ./sbackupd.py $(SUPPORT)
 	ln -s ../share/sbackup/sbackupd.py $(BIN)/sbackupd
 	install ./simple-backup-config.py $(SUPPORT)
@@ -30,16 +31,16 @@
 	install -m644 -D simple-backup-config.glade $(SUPPORT)
 	install -m644 -D sbackup-conf.png $(PIXDIR)
 	install -m644 -D sbackup-restore.png $(PIXDIR)
-	install -m644 -D sbackup.desktop $(DESTDIR)/share/applications/
-	install -m644 -D srestore.desktop $(DESTDIR)/share/applications/
+	install -m644 -D sbackup.desktop $(DESTDIR)/$(PREFIX)/share/applications/
+	install -m644 -D srestore.desktop $(DESTDIR)/$(PREFIX)/share/applications/
 	install -m644 -D simple-restore.glade $(SUPPORT)
 	install ./sbackup $(SUPPORT)
 #	install -m644 -D simple-backup-tocd.glade $(SUPPORT)
-ifeq ($(DESTDIR),/usr/local/)
-	install -b -m600 sbackup.conf.example /etc/sbackup.conf
-	@echo "[places]" >> /etc/sbackup.conf
-	@echo "prefix=$(PREFIX)" >> /etc/sbackup.conf
-endif
+#ifeq ($(DESTDIR),/usr/local/)
+	install -D -m644 sbackup.conf.example $(SYSDIR)/sbackup.conf
+	@echo "[places]" >> $(SYSDIR)/sbackup.conf
+	@echo "prefix=$(PREFIX)" >> $(SYSDIR)/sbackup.conf
+#endif
 
 uninstall:
 	rm -f $(BIN)/sbackupd
@@ -61,8 +62,8 @@
 	-rm -f *~ *.bak
 
 install-po:
-	for lang in $(PO); do install -d $(DESTDIR)/share/locale/$$lang/LC_MESSAGES/ ; done
-	for lang in $(PO); do install -m 644 po/$$lang/LC_MESSAGES/* $(DESTDIR)/share/locale/$$lang/LC_MESSAGES/ ; done
+	for lang in $(PO); do install -d $(DESTDIR)/$(PREFIX)/share/locale/$$lang/LC_MESSAGES/ ; done
+	for lang in $(PO); do install -m 644 po/$$lang/LC_MESSAGES/* $(DESTDIR)/$(PREFIX)/share/locale/$$lang/LC_MESSAGES/ ; done
 
 po-dir:
 	for lang in $(PO); do mkdir -p po/$$lang/LC_MESSAGES/ ; done


--- NEW FILE sbackup-conf.desktop ---
[Desktop Entry]
Version=1.0
Encoding=UTF-8
Name=Simple Backup Config
Comment=Configuration tool for Simple Backup Suite
Comment[de]=Hilfsprogramm zur Einstellung der Simple Backup Suite
Exec=simple-backup-config
Terminal=false
Type=Application
Categories=System;Settings;GNOME;GTK;
StartupNotify=true
Icon=sbackup-conf
GenericName=Backup Properties
GenericName[de]=Sicherungseinstellungen


--- NEW FILE sbackup-restore.desktop ---
[Desktop Entry]
Version=1.0
Encoding=UTF-8
Name=Simple Backup Restore
Comment=Restore tool for Simple Backup Suite
Comment[de]=Hilfsprogramm zur Wiederherstellung der Sicherungskopien
Exec=simple-restore-gnome
Terminal=false
Type=Application
Categories=System;Settings;GNOME;GTK;
StartupNotify=true
Icon=sbackup-restore
GenericName=Restore files and directories
GenericName[de]=Verzeichnisse und Dateien wiederherstellen


--- NEW FILE sbackup.spec ---
%define sbc simple-backup-config
%define srg simple-restore-gnome

Name:           sbackup
Version:        0.10.5
Release:        5%{?dist}
Summary:        Simple Backup Suite for desktop use

Group:          Applications/Archiving
License:        GPLv2+
URL:            http://sbackup.wiki.sourceforge.net/
Source0:        http://downloads.sourceforge.net/%{name}/%{name}_%{version}.tar.gz
Source1:        %{name}-conf.desktop
Source2:        %{name}-restore.desktop
Patch0:         %{name}-0.10.5-locales.patch
Patch1:         %{name}-0.10.5-prefix.patch
BuildArch:      noarch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  desktop-file-utils
BuildRequires:  gettext
Requires:       usermode-gtk
Requires:       pygtk2-libglade
Requires:       gettext
Requires:       gvfs

%description
Simple Backup Suite is a set of backend backup daemon and GNOME
GUI frontends that provide a simple yet powerful backup
solution for common desktop users.

Backups can be written to local directory or remote servers using
GNOME VFS technology. A fine control is possible regarding what
folders and files to backup. Files can be excluded even with a set
of regular expressions. Regular backups can be scheduled.


%prep
%setup -q
%patch0 -p1 
%patch1 -p1


%build
%install
rm -rf %{buildroot}
make install -p DESTDIR=%{buildroot} PREFIX=%{_prefix}

mkdir -p %{buildroot}%{_mandir}/man8/
cat simple-backup.8 | gzip -9 -c > %{name}.8.gz
install -pm644 %{name}.8.gz \
        %{buildroot}%{_mandir}/man8/%{name}.8.gz

rm -rf %{buildroot}%{_datadir}/applications/*
desktop-file-install \
                     %if 0%{?rhel}
                     --vendor="" \
                     %endif
                     --dir=%{buildroot}%{_datadir}/applications \
                     %{SOURCE1}
desktop-file-install \
                     %if 0%{?rhel}
                     --vendor="" \
                     %endif
                     --dir=%{buildroot}%{_datadir}/applications \
                     %{SOURCE2}

mkdir -p %{buildroot}%{_bindir}
ln -s consolehelper %{buildroot}%{_bindir}/%{sbc}
ln -s consolehelper %{buildroot}%{_bindir}/%{srg}

mkdir -p %{buildroot}%{_sysconfdir}/pam.d

cat << EOF > %{buildroot}%{_sysconfdir}/pam.d/%{sbc}
#%PAM-1.0
auth            include         config-util
account         include         config-util
session         include         config-util
EOF

cat << EOF > %{buildroot}%{_sysconfdir}/pam.d/%{srg}
#%PAM-1.0
auth            include         config-util
account         include         config-util
session         include         config-util
EOF

mkdir -p %{buildroot}%{_sysconfdir}/security/console.apps/

cat << EOF > %{buildroot}%{_sysconfdir}/security/console.apps/%{sbc}
USER=root
PROGRAM=%{_sbindir}/%{sbc}
SESSION=true
EOF

cat << EOF > %{buildroot}%{_sysconfdir}/security/console.apps/%{srg}
USER=root
PROGRAM=%{_sbindir}/%{srg}
SESSION=true
EOF

mkdir -p %{buildroot}%{_sysconfdir}/{cron.d,cron.daily,cron-hourly,cron.monthly,cron.weekly}/
touch %{buildroot}%{_sysconfdir}/{cron.d,cron.daily,cron-hourly,cron.monthly,cron.weekly}/%{name}

%find_lang %{name}


%clean
rm -rf %{buildroot}


%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS COPYING TODO VERSION
%{_bindir}/%{sbc}
%{_bindir}/%{srg}
%{_sbindir}/%{name}d
%{_sbindir}/%{sbc}
%{_sbindir}/%{srg}
%{_mandir}/man8/%{name}.8.gz
%{_datadir}/applications/%{name}*.desktop
%{_datadir}/pixmaps/%{name}-conf.png
%{_datadir}/pixmaps/%{name}-restore.png
%{_datadir}/%{name}/
%config(noreplace) %{_sysconfdir}/%{name}.conf
%config(noreplace) %{_sysconfdir}/pam.d/%{sbc}
%config %{_sysconfdir}/security/console.apps/%{sbc}
%config(noreplace) %{_sysconfdir}/pam.d/%{srg}
%config %{_sysconfdir}/security/console.apps/%{srg}
%exclude %{_sbindir}/srestore.*
%exclude %{_sbindir}/upgrade_backups.*
%ghost %{_sysconfdir}/cron*/%{name}


%changelog
* Fri Jan 16 2009 Simon Wesp <cassmodiah at fedoraproject.org> - 0.10.5-5
- Add ownage for cron-files
- Correct patch0
- Add patch1 
- Correct desktopfiles

* Mon Jan 05 2009 Simon Wesp <cassmodiah at fedoraproject.org> - 0.10.5-4
- Add Source0 again, to honor timestamp for Source0
- Require usermode-gtk instead of usermode for the password dialog.
 
* Wed Nov 26 2008 Simon Wesp <cassmodiah at fedoraproject.org> - 0.10.5-3
- Add patch0
- Add manpage
- Add translations

* Sat Nov 01 2008 Simon Wesp <cassmodiah at fedoraproject.org> - 0.10.5-2
- adjust for EPEL

* Fri Oct 24 2008 Simon Wesp <cassmodiah at fedoraproject.org> - 0.10.5-1
- Initial release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sbackup/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	18 Jan 2009 22:28:39 -0000	1.1
+++ .cvsignore	19 Jan 2009 14:30:01 -0000	1.2
@@ -0,0 +1 @@
+sbackup_0.10.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sbackup/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	18 Jan 2009 22:28:39 -0000	1.1
+++ sources	19 Jan 2009 14:30:01 -0000	1.2
@@ -0,0 +1 @@
+0d754b72da3b5cadf6de203cdf7afe13  sbackup_0.10.5.tar.gz



From dwalsh at fedoraproject.org  Mon Jan 19 14:31:59 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Mon, 19 Jan 2009 14:31:59 +0000 (UTC)
Subject: rpms/setroubleshoot/devel setroubleshoot.spec,1.110,1.111
Message-ID: <20090119143159.0A087700F8@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/setroubleshoot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15769

Modified Files:
	setroubleshoot.spec 
Log Message:
* Fri Jan 16 2009 Dan Walsh <dwalsh at redhat.com> - 2.1.1-1
- Switch to C Based applet
- Use dbus for messaging.  Only run setroubleshoot when 



Index: setroubleshoot.spec
===================================================================
RCS file: /cvs/extras/rpms/setroubleshoot/devel/setroubleshoot.spec,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -r1.110 -r1.111
--- setroubleshoot.spec	16 Jan 2009 21:31:22 -0000	1.110
+++ setroubleshoot.spec	19 Jan 2009 14:31:28 -0000	1.111
@@ -13,7 +13,7 @@
 Requires: %{name}-plugins >= 2.0.4
 Requires: pygtk2 >= 2.9.2
 Requires: gnome-python2-gnome, gnome-python2-canvas
-BuildRequires: desktop-file-utils
+BuildRequires: desktop-file-utils dbus-devel
 Requires: gnome-python2-gtkhtml2
 Requires: dbus
 Requires: dbus-python



From rjones at fedoraproject.org  Mon Jan 19 14:42:12 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Mon, 19 Jan 2009 14:42:12 +0000 (UTC)
Subject: rpms/mingw32-binutils/EL-5 mingw32-binutils.spec,1.6,1.7
Message-ID: <20090119144212.BBACC700F8@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/mingw32-binutils/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16955

Modified Files:
	mingw32-binutils.spec 
Log Message:
Rebuild with the correctly attributed changelog.


Index: mingw32-binutils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-binutils/EL-5/mingw32-binutils.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- mingw32-binutils.spec	16 Dec 2008 00:29:09 -0000	1.6
+++ mingw32-binutils.spec	19 Jan 2009 14:41:42 -0000	1.7
@@ -4,7 +4,7 @@
 
 Name:           mingw32-binutils
 Version:        %{binutils_version}
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        MinGW Windows binutils
 
 License:        GPLv2+ and LGPLv2+ and GPLv3+ and LGPLv3+
@@ -74,7 +74,10 @@
 
 
 %changelog
-* Mon Dec 15 2008 Richard W.M. Jones <rjones at redhat.com> - 2.19-1
+* Mon Jan 19 2009 Richard W.M. Jones <rjones at redhat.com> - 2.19-3
+- Rebuild with the correctly attributed changelog.
+
+* Tue Dec 16 2008 Levente Farkas <lfarkas at lfarkas.org> - 2.19-2
 - New upstream version 2.19.
 
 * Sat Nov 29 2008 Richard W.M. Jones <rjones at redhat.com> - 2.18.50_20080109_2-10



From rjones at fedoraproject.org  Mon Jan 19 14:42:25 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Mon, 19 Jan 2009 14:42:25 +0000 (UTC)
Subject: rpms/mingw32-binutils/F-10 mingw32-binutils.spec,1.2,1.3
Message-ID: <20090119144225.1AE28700F8@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/mingw32-binutils/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17009

Modified Files:
	mingw32-binutils.spec 
Log Message:
Backport mingw32-binutils from Rawhide / upgrade to 2.19.


Index: mingw32-binutils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-binutils/F-10/mingw32-binutils.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mingw32-binutils.spec	29 Nov 2008 16:04:45 -0000	1.2
+++ mingw32-binutils.spec	19 Jan 2009 14:41:54 -0000	1.3
@@ -1,16 +1,16 @@
-%define binutils_version 2.18.50
-%define mingw32_binutils_version 20080109-2
-%define mingw32_binutils_rpmvers %{expand:%(echo %{mingw32_binutils_version} | tr - _)} 
+%define binutils_version 2.19
+#%define mingw32_binutils_version 20080109-2
+#%define mingw32_binutils_rpmvers %{expand:%(echo %{mingw32_binutils_version} | tr - _)} 
 
 Name:           mingw32-binutils
-Version:        %{binutils_version}_%{mingw32_binutils_rpmvers}
-Release:        10%{?dist}
+Version:        %{binutils_version}
+Release:        1%{?dist}
 Summary:        MinGW Windows binutils
 
 License:        GPLv2+ and LGPLv2+ and GPLv3+ and LGPLv3+
 Group:          Development/Libraries
 URL:            http://www.mingw.org/
-Source0:        http://dl.sourceforge.net/sourceforge/mingw/binutils-%{binutils_version}-%{mingw32_binutils_version}-src.tar.gz
+Source0:        http://dl.sourceforge.net/sourceforge/mingw/binutils-%{binutils_version}-src.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  flex
@@ -74,6 +74,9 @@
 
 
 %changelog
+* Mon Jan 19 2009 Richard W.M. Jones <rjones at redhat.com> - 2.19-1
+- Backport mingw32-binutils from Rawhide / upgrade to 2.19.
+
 * Sat Nov 29 2008 Richard W.M. Jones <rjones at redhat.com> - 2.18.50_20080109_2-10
 - Must runtime-require mingw32-filesystem.
 



From dwalsh at fedoraproject.org  Mon Jan 19 14:43:18 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Mon, 19 Jan 2009 14:43:18 +0000 (UTC)
Subject: rpms/setroubleshoot/devel setroubleshoot.spec,1.111,1.112
Message-ID: <20090119144318.18DF4700F8@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/setroubleshoot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17207

Modified Files:
	setroubleshoot.spec 
Log Message:
* Fri Jan 16 2009 Dan Walsh <dwalsh at redhat.com> - 2.1.1-1
- Switch to C Based applet
- Use dbus for messaging.  Only run setroubleshoot when 



Index: setroubleshoot.spec
===================================================================
RCS file: /cvs/extras/rpms/setroubleshoot/devel/setroubleshoot.spec,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -r1.111 -r1.112
--- setroubleshoot.spec	19 Jan 2009 14:31:28 -0000	1.111
+++ setroubleshoot.spec	19 Jan 2009 14:42:47 -0000	1.112
@@ -9,11 +9,12 @@
 Source2: setroubleshoot.logrotate
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: perl-XML-Parser
+BuildRequires: intltool gettext python
+BuildRequires: desktop-file-utils dbus-devel
 Requires: %{name}-server = %{version}-%{release} 
 Requires: %{name}-plugins >= 2.0.4
 Requires: pygtk2 >= 2.9.2
 Requires: gnome-python2-gnome, gnome-python2-canvas
-BuildRequires: desktop-file-utils dbus-devel
 Requires: gnome-python2-gtkhtml2
 Requires: dbus
 Requires: dbus-python



From cwickert at fedoraproject.org  Mon Jan 19 14:44:56 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Mon, 19 Jan 2009 14:44:56 +0000 (UTC)
Subject: rpms/xfce4-clipman-plugin/devel xfce4-clipman-plugin.spec, 1.14,
	1.15
Message-ID: <20090119144456.D4A1B700F8@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/xfce4-clipman-plugin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17757

Modified Files:
	xfce4-clipman-plugin.spec 
Log Message:
buildrequire intltool


Index: xfce4-clipman-plugin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-clipman-plugin/devel/xfce4-clipman-plugin.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- xfce4-clipman-plugin.spec	19 Jan 2009 11:54:38 -0000	1.14
+++ xfce4-clipman-plugin.spec	19 Jan 2009 14:44:26 -0000	1.15
@@ -10,7 +10,7 @@
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	xfce4-panel-devel >= 4.3.99.2, libxfcegui4-devel >= 4.3.99.2, libxml2-devel
-BuildRequires:	libXt-devel, gettext, perl(XML::Parser)
+BuildRequires:	libXt-devel, gettext, intltool
 Requires:	xfce4-panel >= 4.4.0
 
 %description



From cassmodiah at fedoraproject.org  Mon Jan 19 14:45:18 2009
From: cassmodiah at fedoraproject.org (Simon Wesp)
Date: Mon, 19 Jan 2009 14:45:18 +0000 (UTC)
Subject: rpms/sbackup/EL-5 import.log, NONE, 1.1 sbackup-0.10.5-locales.patch,
	NONE, 1.1 sbackup-0.10.5-prefix.patch, NONE,
	1.1 sbackup-conf.desktop, NONE, 1.1 sbackup-restore.desktop,
	NONE, 1.1 sbackup.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <20090119144518.7D700700F8@cvs1.fedora.phx.redhat.com>

Author: cassmodiah

Update of /cvs/pkgs/rpms/sbackup/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17841/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	import.log sbackup-0.10.5-locales.patch 
	sbackup-0.10.5-prefix.patch sbackup-conf.desktop 
	sbackup-restore.desktop sbackup.spec 
Log Message:



--- NEW FILE import.log ---
sbackup-0_10_5-5_fc10:EL-5:sbackup-0.10.5-5.fc10.src.rpm:1232376306

sbackup-0.10.5-locales.patch:

--- NEW FILE sbackup-0.10.5-locales.patch ---
--- sbackup-0.10.5.orig/Makefile	2008-06-15 17:39:25.000000000 +0200
+++ sbackup-0.10.5/Makefile	2009-01-16 01:12:14.000000000 +0100
@@ -1,4 +1,4 @@
-PO = pt_BR lv nl es sv fr
+PO = ca en_GB gl it ms pl sv zh_CN cs es hu lv nb pt_BR tr zh_TW de fr id nl pt uk
 
 ifndef DESTDIR
 	DESTDIR = /usr/local

sbackup-0.10.5-prefix.patch:

--- NEW FILE sbackup-0.10.5-prefix.patch ---
--- sbackup-0.10.5.orig/Makefile	2008-06-15 17:39:25.000000000 +0200
+++ sbackup-0.10.5/Makefile	2009-01-16 02:48:40.000000000 +0100
@@ -5,17 +5,18 @@
 endif 
 
 PREFIX = /usr/local
-BIN = $(DESTDIR)/sbin/
-SUPPORT = $(DESTDIR)/share/sbackup/
-DOC = $(DESTDIR)/share/doc/sbackup/
-PIXDIR = $(DESTDIR)/share/pixmaps/
+BIN = $(DESTDIR)/$(PREFIX)/sbin/
+SUPPORT = $(DESTDIR)/$(PREFIX)/share/sbackup/
+DOC = $(DESTDIR)/$(PREFIX)/share/doc/sbackup/
+PIXDIR = $(DESTDIR)/$(PREFIX)/share/pixmaps/
+SYSDIR = $(DESTDIR)/etc
 
 all:
 
 default:
 
 install: po-data install-po 
-	install -d $(BIN) $(SUPPORT) $(DOC) $(PIXDIR) $(DESTDIR)/share/applications $(DESTDIR)/etc
+	install -d $(BIN) $(SUPPORT) $(DOC) $(PIXDIR) $(DESTDIR)/$(PREFIX)/share/applications $(SYSDIR)
 	install ./sbackupd.py $(SUPPORT)
 	ln -s ../share/sbackup/sbackupd.py $(BIN)/sbackupd
 	install ./simple-backup-config.py $(SUPPORT)
@@ -30,16 +31,16 @@
 	install -m644 -D simple-backup-config.glade $(SUPPORT)
 	install -m644 -D sbackup-conf.png $(PIXDIR)
 	install -m644 -D sbackup-restore.png $(PIXDIR)
-	install -m644 -D sbackup.desktop $(DESTDIR)/share/applications/
-	install -m644 -D srestore.desktop $(DESTDIR)/share/applications/
+	install -m644 -D sbackup.desktop $(DESTDIR)/$(PREFIX)/share/applications/
+	install -m644 -D srestore.desktop $(DESTDIR)/$(PREFIX)/share/applications/
 	install -m644 -D simple-restore.glade $(SUPPORT)
 	install ./sbackup $(SUPPORT)
 #	install -m644 -D simple-backup-tocd.glade $(SUPPORT)
-ifeq ($(DESTDIR),/usr/local/)
-	install -b -m600 sbackup.conf.example /etc/sbackup.conf
-	@echo "[places]" >> /etc/sbackup.conf
-	@echo "prefix=$(PREFIX)" >> /etc/sbackup.conf
-endif
+#ifeq ($(DESTDIR),/usr/local/)
+	install -D -m644 sbackup.conf.example $(SYSDIR)/sbackup.conf
+	@echo "[places]" >> $(SYSDIR)/sbackup.conf
+	@echo "prefix=$(PREFIX)" >> $(SYSDIR)/sbackup.conf
+#endif
 
 uninstall:
 	rm -f $(BIN)/sbackupd
@@ -61,8 +62,8 @@
 	-rm -f *~ *.bak
 
 install-po:
-	for lang in $(PO); do install -d $(DESTDIR)/share/locale/$$lang/LC_MESSAGES/ ; done
-	for lang in $(PO); do install -m 644 po/$$lang/LC_MESSAGES/* $(DESTDIR)/share/locale/$$lang/LC_MESSAGES/ ; done
+	for lang in $(PO); do install -d $(DESTDIR)/$(PREFIX)/share/locale/$$lang/LC_MESSAGES/ ; done
+	for lang in $(PO); do install -m 644 po/$$lang/LC_MESSAGES/* $(DESTDIR)/$(PREFIX)/share/locale/$$lang/LC_MESSAGES/ ; done
 
 po-dir:
 	for lang in $(PO); do mkdir -p po/$$lang/LC_MESSAGES/ ; done


--- NEW FILE sbackup-conf.desktop ---
[Desktop Entry]
Version=1.0
Encoding=UTF-8
Name=Simple Backup Config
Comment=Configuration tool for Simple Backup Suite
Comment[de]=Hilfsprogramm zur Einstellung der Simple Backup Suite
Exec=simple-backup-config
Terminal=false
Type=Application
Categories=System;Settings;GNOME;GTK;
StartupNotify=true
Icon=sbackup-conf
GenericName=Backup Properties
GenericName[de]=Sicherungseinstellungen


--- NEW FILE sbackup-restore.desktop ---
[Desktop Entry]
Version=1.0
Encoding=UTF-8
Name=Simple Backup Restore
Comment=Restore tool for Simple Backup Suite
Comment[de]=Hilfsprogramm zur Wiederherstellung der Sicherungskopien
Exec=simple-restore-gnome
Terminal=false
Type=Application
Categories=System;Settings;GNOME;GTK;
StartupNotify=true
Icon=sbackup-restore
GenericName=Restore files and directories
GenericName[de]=Verzeichnisse und Dateien wiederherstellen


--- NEW FILE sbackup.spec ---
%define sbc simple-backup-config
%define srg simple-restore-gnome

Name:           sbackup
Version:        0.10.5
Release:        5%{?dist}
Summary:        Simple Backup Suite for desktop use

Group:          Applications/Archiving
License:        GPLv2+
URL:            http://sbackup.wiki.sourceforge.net/
Source0:        http://downloads.sourceforge.net/%{name}/%{name}_%{version}.tar.gz
Source1:        %{name}-conf.desktop
Source2:        %{name}-restore.desktop
Patch0:         %{name}-0.10.5-locales.patch
Patch1:         %{name}-0.10.5-prefix.patch
BuildArch:      noarch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  desktop-file-utils
BuildRequires:  gettext
Requires:       usermode-gtk
Requires:       pygtk2-libglade
Requires:       gettext
Requires:       gnome-vfs2

%description
Simple Backup Suite is a set of backend backup daemon and GNOME
GUI frontends that provide a simple yet powerful backup
solution for common desktop users.

Backups can be written to local directory or remote servers using
GNOME VFS technology. A fine control is possible regarding what
folders and files to backup. Files can be excluded even with a set
of regular expressions. Regular backups can be scheduled.


%prep
%setup -q
%patch0 -p1 
%patch1 -p1


%build
%install
rm -rf %{buildroot}
make install -p DESTDIR=%{buildroot} PREFIX=%{_prefix}

mkdir -p %{buildroot}%{_mandir}/man8/
cat simple-backup.8 | gzip -9 -c > %{name}.8.gz
install -pm644 %{name}.8.gz \
        %{buildroot}%{_mandir}/man8/%{name}.8.gz

rm -rf %{buildroot}%{_datadir}/applications/*
desktop-file-install \
                     %if 0%{?rhel}
                     --vendor="" \
                     %endif
                     --dir=%{buildroot}%{_datadir}/applications \
                     %{SOURCE1}
desktop-file-install \
                     %if 0%{?rhel}
                     --vendor="" \
                     %endif
                     --dir=%{buildroot}%{_datadir}/applications \
                     %{SOURCE2}

mkdir -p %{buildroot}%{_bindir}
ln -s consolehelper %{buildroot}%{_bindir}/%{sbc}
ln -s consolehelper %{buildroot}%{_bindir}/%{srg}

mkdir -p %{buildroot}%{_sysconfdir}/pam.d

cat << EOF > %{buildroot}%{_sysconfdir}/pam.d/%{sbc}
#%PAM-1.0
auth            include         config-util
account         include         config-util
session         include         config-util
EOF

cat << EOF > %{buildroot}%{_sysconfdir}/pam.d/%{srg}
#%PAM-1.0
auth            include         config-util
account         include         config-util
session         include         config-util
EOF

mkdir -p %{buildroot}%{_sysconfdir}/security/console.apps/

cat << EOF > %{buildroot}%{_sysconfdir}/security/console.apps/%{sbc}
USER=root
PROGRAM=%{_sbindir}/%{sbc}
SESSION=true
EOF

cat << EOF > %{buildroot}%{_sysconfdir}/security/console.apps/%{srg}
USER=root
PROGRAM=%{_sbindir}/%{srg}
SESSION=true
EOF

mkdir -p %{buildroot}%{_sysconfdir}/{cron.d,cron.daily,cron-hourly,cron.monthly,cron.weekly}/
touch %{buildroot}%{_sysconfdir}/{cron.d,cron.daily,cron-hourly,cron.monthly,cron.weekly}/%{name}

%find_lang %{name}


%clean
rm -rf %{buildroot}


%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS COPYING TODO VERSION
%{_bindir}/%{sbc}
%{_bindir}/%{srg}
%{_sbindir}/%{name}d
%{_sbindir}/%{sbc}
%{_sbindir}/%{srg}
%{_mandir}/man8/%{name}.8.gz
%{_datadir}/applications/%{name}*.desktop
%{_datadir}/pixmaps/%{name}-conf.png
%{_datadir}/pixmaps/%{name}-restore.png
%{_datadir}/%{name}/
%config(noreplace) %{_sysconfdir}/%{name}.conf
%config(noreplace) %{_sysconfdir}/pam.d/%{sbc}
%config %{_sysconfdir}/security/console.apps/%{sbc}
%config(noreplace) %{_sysconfdir}/pam.d/%{srg}
%config %{_sysconfdir}/security/console.apps/%{srg}
%exclude %{_sbindir}/srestore.*
%exclude %{_sbindir}/upgrade_backups.*
%ghost %{_sysconfdir}/cron*/%{name}


%changelog
* Fri Jan 16 2009 Simon Wesp <cassmodiah at fedoraproject.org> - 0.10.5-5
- Add ownage for cron-files
- Correct patch0
- Add patch1 
- Correct desktopfiles

* Mon Jan 05 2009 Simon Wesp <cassmodiah at fedoraproject.org> - 0.10.5-4
- Add Source0 again, to honor timestamp for Source0
- Require usermode-gtk instead of usermode for the password dialog.
 
* Wed Nov 26 2008 Simon Wesp <cassmodiah at fedoraproject.org> - 0.10.5-3
- Add patch0
- Add manpage
- Add translations

* Sat Nov 01 2008 Simon Wesp <cassmodiah at fedoraproject.org> - 0.10.5-2
- adjust for EPEL

* Fri Oct 24 2008 Simon Wesp <cassmodiah at fedoraproject.org> - 0.10.5-1
- Initial release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sbackup/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	18 Jan 2009 22:28:39 -0000	1.1
+++ .cvsignore	19 Jan 2009 14:44:48 -0000	1.2
@@ -0,0 +1 @@
+sbackup_0.10.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sbackup/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	18 Jan 2009 22:28:39 -0000	1.1
+++ sources	19 Jan 2009 14:44:48 -0000	1.2
@@ -0,0 +1 @@
+0d754b72da3b5cadf6de203cdf7afe13  sbackup_0.10.5.tar.gz



From pkgdb at fedoraproject.org  Mon Jan 19 14:17:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 14:17:02 +0000
Subject: [pkgdb] libvirt-java: virtmaint has requested watchcommits
Message-ID: <20090119141702.0F800208F1A@bastion.fedora.phx.redhat.com>

virtmaint has requested the watchcommits acl on libvirt-java (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libvirt-java



From pkgdb at fedoraproject.org  Mon Jan 19 14:16:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 14:16:59 +0000
Subject: [pkgdb] libvirt-java: virtmaint has requested watchbugzilla
Message-ID: <20090119141659.B42D8208F15@bastion.fedora.phx.redhat.com>

virtmaint has requested the watchbugzilla acl on libvirt-java (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libvirt-java



From pkgdb at fedoraproject.org  Mon Jan 19 14:50:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 14:50:56 +0000
Subject: [pkgdb] python-pyblock: jwrdegoede has requested watchbugzilla
Message-ID: <20090119145056.4556C208472@bastion.fedora.phx.redhat.com>

jwrdegoede has requested the watchbugzilla acl on python-pyblock (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-pyblock



From pkgdb at fedoraproject.org  Mon Jan 19 14:50:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 14:50:58 +0000
Subject: [pkgdb] python-pyblock: jwrdegoede has requested watchcommits
Message-ID: <20090119145059.B6026208475@bastion.fedora.phx.redhat.com>

jwrdegoede has requested the watchcommits acl on python-pyblock (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-pyblock



From pkgdb at fedoraproject.org  Mon Jan 19 14:50:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 14:50:59 +0000
Subject: [pkgdb] python-pyblock: jwrdegoede has requested commit
Message-ID: <20090119145059.C5187208479@bastion.fedora.phx.redhat.com>

jwrdegoede has requested the commit acl on python-pyblock (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-pyblock



From pkgdb at fedoraproject.org  Mon Jan 19 14:51:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 14:51:10 +0000
Subject: [pkgdb] python-pyblock: jwrdegoede has requested watchcommits
Message-ID: <20090119145110.CBB34208471@bastion.fedora.phx.redhat.com>

jwrdegoede has requested the watchcommits acl on python-pyblock (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-pyblock



From pkgdb at fedoraproject.org  Mon Jan 19 14:51:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 14:51:12 +0000
Subject: [pkgdb] python-pyblock: jwrdegoede has requested commit
Message-ID: <20090119145112.B889320847D@bastion.fedora.phx.redhat.com>

jwrdegoede has requested the commit acl on python-pyblock (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-pyblock



From pkgdb at fedoraproject.org  Mon Jan 19 14:51:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 14:51:14 +0000
Subject: [pkgdb] python-pyblock: jwrdegoede has requested watchbugzilla
Message-ID: <20090119145114.560A0208470@bastion.fedora.phx.redhat.com>

jwrdegoede has requested the watchbugzilla acl on python-pyblock (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-pyblock



From jussilehtola at fedoraproject.org  Mon Jan 19 14:55:51 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Mon, 19 Jan 2009 14:55:51 +0000 (UTC)
Subject: rpms/gromacs/devel gromacs-gmxdemo.patch, NONE, 1.1 gromacs.spec,
	1.7, 1.8 import.log, 1.6, 1.7
Message-ID: <20090119145551.C1620700F8@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

Update of /cvs/pkgs/rpms/gromacs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19049/devel

Modified Files:
	gromacs.spec import.log 
Added Files:
	gromacs-gmxdemo.patch 
Log Message:
* Mon Jan 19 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0.3-3
- Fixed gmxdemo.


gromacs-gmxdemo.patch:

--- NEW FILE gromacs-gmxdemo.patch ---
diff -up gromacs-4.0.3/share/tutor/gmxdemo/demo.orig gromacs-4.0.3/share/tutor/gmxdemo/demo
--- gromacs-4.0.3/share/tutor/gmxdemo/demo.orig	2006-02-15 23:48:34.000000000 +0200
+++ gromacs-4.0.3/share/tutor/gmxdemo/demo	2009-01-19 16:52:35.000000000 +0200
@@ -80,9 +80,9 @@ set  ans = $<
 
 echo "Starting pdb2gmx"
 if ( $?DISPLAY ) then 
-	xterm -title pdb2gmx -sb -e tail +0f output.pdb2gmx &
+	xterm -title g_pdb2gmx -sb -e tail +0f output.pdb2gmx &
 endif
-echo 0 | pdb2gmx -f ${MOL}.pdb -o ${MOL}.gro -p ${MOL}.top >& ! output.pdb2gmx
+echo 0 | g_pdb2gmx -f ${MOL}.pdb -o ${MOL}.gro -p ${MOL}.top >& ! output.pdb2gmx
 echo "pdb2gmx finished"
 echo -n "Press <enter>"
 set  ans = $<
@@ -119,11 +119,11 @@ set  ans = $<
 
 echo "Starting editconf and genbox..."
 if ( $?DISPLAY ) then 
-	xterm -title genbox -sb -e tail +0f output.genbox &
+	xterm -title g_genbox -sb -e tail +0f output.genbox &
 endif
-editconf -f ${MOL}.gro -o ${MOL}.gro -d 0.5 >& ! output.genbox 
+g_editconf -f ${MOL}.gro -o ${MOL}.gro -d 0.5 >& ! output.genbox 
 
-genbox -cp ${MOL}.gro -cs -o ${MOL}_b4em.gro -p ${MOL}.top >>& ! output.genbox 
+g_genbox -cp ${MOL}.gro -cs -o ${MOL}_b4em.gro -p ${MOL}.top >>& ! output.genbox 
 
 echo "editconf and genbox finished"
 echo -n "Press <enter>"
@@ -189,9 +189,9 @@ _EOF_
 
 echo "Starting grompp..."
 if ( $?DISPLAY ) then 
-	xterm -title grompp -sb -e tail +0f output.grompp_em &
+	xterm -title g_grompp -sb -e tail +0f output.grompp_em &
 endif
-grompp -f em -c ${MOL}_b4em -p ${MOL} -o ${MOL}_em >& ! output.grompp_em
+g_grompp -f em -c ${MOL}_b4em -p ${MOL} -o ${MOL}_em >& ! output.grompp_em
 
 echo "grompp finished"
 echo -n "Press <enter>"
@@ -230,9 +230,9 @@ set  ans = $<
 echo "starting energy minimisation mdrun..."
 
 if ( $?DISPLAY ) then 
-	xterm -title mdrun -sb -e tail +0f output.mdrun_em &
+	xterm -title g_mdrun -sb -e tail +0f output.mdrun_em &
 endif
-mdrun -nice 4 -s ${MOL}_em -o ${MOL}_em -c ${MOL}_b4pr -v >& ! output.mdrun_em 
+g_mdrun -nice 4 -s ${MOL}_em -o ${MOL}_em -c ${MOL}_b4pr -v >& ! output.mdrun_em 
 
 echo "mdrun finished"
 echo -n "Press <enter>"
@@ -316,9 +316,9 @@ _EOF_
 
 echo "Starting grompp..."
 if ( $?DISPLAY ) then 
-	xterm -title grompp -sb -e tail +0f output.grompp_pr &
+	xterm -title g_grompp -sb -e tail +0f output.grompp_pr &
 endif
-grompp -f pr -c ${MOL}_b4pr -r ${MOL}_b4pr -p ${MOL} -o ${MOL}_pr >& ! output.grompp_pr
+g_grompp -f pr -c ${MOL}_b4pr -r ${MOL}_b4pr -p ${MOL} -o ${MOL}_pr >& ! output.grompp_pr
 echo "grompp finished"
 
 echo -n "Press <enter>"
@@ -350,9 +350,9 @@ set  ans = $<
 
 echo "starting mdrun..."
 if ( $?DISPLAY ) then 
-	xterm -title mdrun -sb -e tail +0f output.mdrun_pr &
+	xterm -title g_mdrun -sb -e tail +0f output.mdrun_pr &
 endif
-mdrun -nice 4 -s ${MOL}_pr -o ${MOL}_pr -c ${MOL}_b4md -v >& ! output.mdrun_pr
+g_mdrun -nice 4 -s ${MOL}_pr -o ${MOL}_pr -c ${MOL}_b4md -v >& ! output.mdrun_pr
 
 echo "mdrun finished"
 echo -n "Press <enter>"
@@ -417,9 +417,9 @@ _EOF_
 
 echo "Starting grompp..."
 if ( $?DISPLAY ) then 
-	xterm -title grompp -sb -e tail +0f output.grompp_md &
+	xterm -title g_grompp -sb -e tail +0f output.grompp_md &
 endif
-grompp -f md -c ${MOL}_b4md  -p ${MOL} -o ${MOL}_md >& ! output.grompp_md
+g_grompp -f md -c ${MOL}_b4md  -p ${MOL} -o ${MOL}_md >& ! output.grompp_md
 
 echo "grompp finished"
 echo -n "Press <enter>"
@@ -449,9 +449,9 @@ set  ans = $<
 
 echo "starting mdrun..."
 if ( $?DISPLAY ) then 
-	xterm -title mdrun -sb -e tail +0f output.mdrun_md &
+	xterm -title g_mdrun -sb -e tail +0f output.mdrun_md &
 endif
-mdrun -nice 4 -s ${MOL}_md -o ${MOL}_md -c ${MOL}_after_md -v >& ! output.mdrun_md
+g_mdrun -nice 4 -s ${MOL}_md -o ${MOL}_md -c ${MOL}_after_md -v >& ! output.mdrun_md
 
 echo "mdrun finished"
 echo -n "Press <enter>"
@@ -493,7 +493,7 @@ _EOF_
 
 if ( $?DISPLAY ) then
 	echo Starting Trajectory viewer...
-	ngmx -f ${MOL}_md -s ${MOL}_md  &
+	g_ngmx -f ${MOL}_md -s ${MOL}_md  &
 endif
 #last line 
 


Index: gromacs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gromacs/devel/gromacs.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- gromacs.spec	19 Jan 2009 12:18:05 -0000	1.7
+++ gromacs.spec	19 Jan 2009 14:55:21 -0000	1.8
@@ -1,7 +1,7 @@
 Name:		gromacs
 Version:	4.0.3
-Release:	2%{?dist}
-Summary:	GROMACS binaries
+Release:	3%{?dist}
+Summary:	GROMACS - Fast, Free and Flexible Molecular Dynamics
 Group:		Applications/Engineering
 License:	GPLv2+
 URL:		http://www.gromacs.org
@@ -15,6 +15,8 @@
 
 # Add shebangs to scripts
 Patch0:		gromacs-GMXRC.patch
+# Patch gmxdemo for new filenames
+Patch1:		gromacs-gmxdemo.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:	gromacs-common  = %{version}-%{release}
@@ -260,6 +262,7 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 # Fix incorrect permission
 chmod a-x src/tools/gmx_xpm2ps.c
@@ -546,6 +549,9 @@
 
 
 %changelog
+* Mon Jan 19 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0.3-3
+- Fixed gmxdemo.
+
 * Mon Jan 19 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0.3-2
 - Fix EPEL 4 build.
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/gromacs/devel/import.log,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- import.log	19 Jan 2009 12:18:05 -0000	1.6
+++ import.log	19 Jan 2009 14:55:21 -0000	1.7
@@ -4,3 +4,4 @@
 gromacs-4_0_2-7_fc10:HEAD:gromacs-4.0.2-7.fc10.src.rpm:1231935162
 gromacs-4_0_3-1_fc10:HEAD:gromacs-4.0.3-1.fc10.src.rpm:1232356764
 gromacs-4_0_3-2_fc10:HEAD:gromacs-4.0.3-2.fc10.src.rpm:1232367441
+gromacs-4_0_3-3_fc10:HEAD:gromacs-4.0.3-3.fc10.src.rpm:1232376891



From rjones at fedoraproject.org  Mon Jan 19 14:57:40 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Mon, 19 Jan 2009 14:57:40 +0000 (UTC)
Subject: rpms/mingw32-binutils/F-10 .cvsignore, 1.2,
	1.3 mingw32-binutils.spec, 1.3, 1.4 sources, 1.2, 1.3
Message-ID: <20090119145740.BD421700F8@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/mingw32-binutils/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19421

Modified Files:
	.cvsignore mingw32-binutils.spec sources 
Log Message:
Forgot to upload the new sources.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-binutils/F-10/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	6 Nov 2008 13:50:23 -0000	1.2
+++ .cvsignore	19 Jan 2009 14:57:10 -0000	1.3
@@ -1 +1 @@
-binutils-2.18.50-20080109-2-src.tar.gz
+binutils-2.19-src.tar.gz


Index: mingw32-binutils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-binutils/F-10/mingw32-binutils.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- mingw32-binutils.spec	19 Jan 2009 14:41:54 -0000	1.3
+++ mingw32-binutils.spec	19 Jan 2009 14:57:10 -0000	1.4
@@ -4,7 +4,7 @@
 
 Name:           mingw32-binutils
 Version:        %{binutils_version}
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        MinGW Windows binutils
 
 License:        GPLv2+ and LGPLv2+ and GPLv3+ and LGPLv3+
@@ -74,7 +74,7 @@
 
 
 %changelog
-* Mon Jan 19 2009 Richard W.M. Jones <rjones at redhat.com> - 2.19-1
+* Mon Jan 19 2009 Richard W.M. Jones <rjones at redhat.com> - 2.19-2
 - Backport mingw32-binutils from Rawhide / upgrade to 2.19.
 
 * Sat Nov 29 2008 Richard W.M. Jones <rjones at redhat.com> - 2.18.50_20080109_2-10


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-binutils/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	6 Nov 2008 13:50:23 -0000	1.2
+++ sources	19 Jan 2009 14:57:10 -0000	1.3
@@ -1 +1 @@
-b03863598b784394a0de6be60eab37aa  binutils-2.18.50-20080109-2-src.tar.gz
+46c655f95370be0b0eed0ae952def9d2  binutils-2.19-src.tar.gz



From jussilehtola at fedoraproject.org  Mon Jan 19 14:57:44 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Mon, 19 Jan 2009 14:57:44 +0000 (UTC)
Subject: rpms/gromacs/EL-4 gromacs.spec,1.7,1.8
Message-ID: <20090119145744.7D5F8700F8@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

Update of /cvs/pkgs/rpms/gromacs/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19343/EL-4

Modified Files:
	gromacs.spec 
Log Message:
* Mon Jan 19 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0.3-3
- Fixed gmxdemo.



Index: gromacs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gromacs/EL-4/gromacs.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- gromacs.spec	19 Jan 2009 12:21:07 -0000	1.7
+++ gromacs.spec	19 Jan 2009 14:57:14 -0000	1.8
@@ -1,7 +1,7 @@
 Name:		gromacs
 Version:	4.0.3
-Release:	2%{?dist}
-Summary:	GROMACS binaries
+Release:	3%{?dist}
+Summary:	GROMACS - Fast, Free and Flexible Molecular Dynamics
 Group:		Applications/Engineering
 License:	GPLv2+
 URL:		http://www.gromacs.org
@@ -15,6 +15,8 @@
 
 # Add shebangs to scripts
 Patch0:		gromacs-GMXRC.patch
+# Patch gmxdemo for new filenames
+Patch1:		gromacs-gmxdemo.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:	gromacs-common  = %{version}-%{release}
@@ -260,6 +262,7 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 # Fix incorrect permission
 chmod a-x src/tools/gmx_xpm2ps.c
@@ -546,6 +549,9 @@
 
 
 %changelog
+* Mon Jan 19 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0.3-3
+- Fixed gmxdemo.
+
 * Mon Jan 19 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0.3-2
 - Fix EPEL 4 build.
 



From jussilehtola at fedoraproject.org  Mon Jan 19 14:57:44 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Mon, 19 Jan 2009 14:57:44 +0000 (UTC)
Subject: rpms/gromacs/EL-5 gromacs.spec,1.7,1.8
Message-ID: <20090119145744.BE742700F8@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

Update of /cvs/pkgs/rpms/gromacs/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19343/EL-5

Modified Files:
	gromacs.spec 
Log Message:
* Mon Jan 19 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0.3-3
- Fixed gmxdemo.



Index: gromacs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gromacs/EL-5/gromacs.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- gromacs.spec	19 Jan 2009 12:21:07 -0000	1.7
+++ gromacs.spec	19 Jan 2009 14:57:14 -0000	1.8
@@ -1,7 +1,7 @@
 Name:		gromacs
 Version:	4.0.3
-Release:	2%{?dist}
-Summary:	GROMACS binaries
+Release:	3%{?dist}
+Summary:	GROMACS - Fast, Free and Flexible Molecular Dynamics
 Group:		Applications/Engineering
 License:	GPLv2+
 URL:		http://www.gromacs.org
@@ -15,6 +15,8 @@
 
 # Add shebangs to scripts
 Patch0:		gromacs-GMXRC.patch
+# Patch gmxdemo for new filenames
+Patch1:		gromacs-gmxdemo.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:	gromacs-common  = %{version}-%{release}
@@ -260,6 +262,7 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 # Fix incorrect permission
 chmod a-x src/tools/gmx_xpm2ps.c
@@ -546,6 +549,9 @@
 
 
 %changelog
+* Mon Jan 19 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0.3-3
+- Fixed gmxdemo.
+
 * Mon Jan 19 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0.3-2
 - Fix EPEL 4 build.
 



From jussilehtola at fedoraproject.org  Mon Jan 19 14:57:45 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Mon, 19 Jan 2009 14:57:45 +0000 (UTC)
Subject: rpms/gromacs/F-10 gromacs.spec,1.7,1.8
Message-ID: <20090119145745.09912700F8@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

Update of /cvs/pkgs/rpms/gromacs/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19343/F-10

Modified Files:
	gromacs.spec 
Log Message:
* Mon Jan 19 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0.3-3
- Fixed gmxdemo.



Index: gromacs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gromacs/F-10/gromacs.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- gromacs.spec	19 Jan 2009 12:21:08 -0000	1.7
+++ gromacs.spec	19 Jan 2009 14:57:14 -0000	1.8
@@ -1,7 +1,7 @@
 Name:		gromacs
 Version:	4.0.3
-Release:	2%{?dist}
-Summary:	GROMACS binaries
+Release:	3%{?dist}
+Summary:	GROMACS - Fast, Free and Flexible Molecular Dynamics
 Group:		Applications/Engineering
 License:	GPLv2+
 URL:		http://www.gromacs.org
@@ -15,6 +15,8 @@
 
 # Add shebangs to scripts
 Patch0:		gromacs-GMXRC.patch
+# Patch gmxdemo for new filenames
+Patch1:		gromacs-gmxdemo.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:	gromacs-common  = %{version}-%{release}
@@ -260,6 +262,7 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 # Fix incorrect permission
 chmod a-x src/tools/gmx_xpm2ps.c
@@ -546,6 +549,9 @@
 
 
 %changelog
+* Mon Jan 19 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0.3-3
+- Fixed gmxdemo.
+
 * Mon Jan 19 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0.3-2
 - Fix EPEL 4 build.
 



From jussilehtola at fedoraproject.org  Mon Jan 19 14:57:45 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Mon, 19 Jan 2009 14:57:45 +0000 (UTC)
Subject: rpms/gromacs/F-9 gromacs.spec,1.7,1.8
Message-ID: <20090119145745.4772B700F8@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

Update of /cvs/pkgs/rpms/gromacs/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19343/F-9

Modified Files:
	gromacs.spec 
Log Message:
* Mon Jan 19 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0.3-3
- Fixed gmxdemo.



Index: gromacs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gromacs/F-9/gromacs.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- gromacs.spec	19 Jan 2009 12:21:08 -0000	1.7
+++ gromacs.spec	19 Jan 2009 14:57:15 -0000	1.8
@@ -1,7 +1,7 @@
 Name:		gromacs
 Version:	4.0.3
-Release:	2%{?dist}
-Summary:	GROMACS binaries
+Release:	3%{?dist}
+Summary:	GROMACS - Fast, Free and Flexible Molecular Dynamics
 Group:		Applications/Engineering
 License:	GPLv2+
 URL:		http://www.gromacs.org
@@ -15,6 +15,8 @@
 
 # Add shebangs to scripts
 Patch0:		gromacs-GMXRC.patch
+# Patch gmxdemo for new filenames
+Patch1:		gromacs-gmxdemo.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:	gromacs-common  = %{version}-%{release}
@@ -260,6 +262,7 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 # Fix incorrect permission
 chmod a-x src/tools/gmx_xpm2ps.c
@@ -546,6 +549,9 @@
 
 
 %changelog
+* Mon Jan 19 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0.3-3
+- Fixed gmxdemo.
+
 * Mon Jan 19 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0.3-2
 - Fix EPEL 4 build.
 



From pkgdb at fedoraproject.org  Mon Jan 19 14:59:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 14:59:10 +0000
Subject: [pkgdb] python-pyblock had acl change status
Message-ID: <20090119145910.E639420846E@bastion.fedora.phx.redhat.com>

katzj has set the watchbugzilla acl on python-pyblock (Fedora devel) to Approved for jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-pyblock



From pkgdb at fedoraproject.org  Mon Jan 19 14:59:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 14:59:12 +0000
Subject: [pkgdb] python-pyblock had acl change status
Message-ID: <20090119145912.C9AF2208474@bastion.fedora.phx.redhat.com>

katzj has set the watchcommits acl on python-pyblock (Fedora devel) to Approved for jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-pyblock



From pkgdb at fedoraproject.org  Mon Jan 19 14:59:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 14:59:16 +0000
Subject: [pkgdb] python-pyblock had acl change status
Message-ID: <20090119145916.EF5E3208479@bastion.fedora.phx.redhat.com>

katzj has set the watchcommits acl on python-pyblock (Fedora 10) to Approved for jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-pyblock



From pkgdb at fedoraproject.org  Mon Jan 19 14:59:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 14:59:43 +0000
Subject: [pkgdb] python-pyblock had acl change status
Message-ID: <20090119145944.E87A2208472@bastion.fedora.phx.redhat.com>

katzj has set the watchbugzilla acl on python-pyblock (Fedora 10) to Approved for jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-pyblock



From pkgdb at fedoraproject.org  Mon Jan 19 14:59:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 14:59:44 +0000
Subject: [pkgdb] python-pyblock had acl change status
Message-ID: <20090119145945.6E019208474@bastion.fedora.phx.redhat.com>

katzj has set the commit acl on python-pyblock (Fedora devel) to Approved for jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-pyblock



From pkgdb at fedoraproject.org  Mon Jan 19 14:59:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 14:59:45 +0000
Subject: [pkgdb] python-pyblock had acl change status
Message-ID: <20090119145950.745E2208480@bastion.fedora.phx.redhat.com>

katzj has set the commit acl on python-pyblock (Fedora 10) to Approved for jwrdegoede

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-pyblock



From jussilehtola at fedoraproject.org  Mon Jan 19 15:03:25 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Mon, 19 Jan 2009 15:03:25 +0000 (UTC)
Subject: rpms/gromacs/EL-4 gromacs-gmxdemo.patch,NONE,1.1
Message-ID: <20090119150325.5DD47700F8@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

Update of /cvs/pkgs/rpms/gromacs/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20992/EL-4

Added Files:
	gromacs-gmxdemo.patch 
Log Message:
* Mon Jan 19 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0.3-3
- Fixed gmxdemo.


gromacs-gmxdemo.patch:

--- NEW FILE gromacs-gmxdemo.patch ---
diff -up gromacs-4.0.3/share/tutor/gmxdemo/demo.orig gromacs-4.0.3/share/tutor/gmxdemo/demo
--- gromacs-4.0.3/share/tutor/gmxdemo/demo.orig	2006-02-15 23:48:34.000000000 +0200
+++ gromacs-4.0.3/share/tutor/gmxdemo/demo	2009-01-19 16:52:35.000000000 +0200
@@ -80,9 +80,9 @@ set  ans = $<
 
 echo "Starting pdb2gmx"
 if ( $?DISPLAY ) then 
-	xterm -title pdb2gmx -sb -e tail +0f output.pdb2gmx &
+	xterm -title g_pdb2gmx -sb -e tail +0f output.pdb2gmx &
 endif
-echo 0 | pdb2gmx -f ${MOL}.pdb -o ${MOL}.gro -p ${MOL}.top >& ! output.pdb2gmx
+echo 0 | g_pdb2gmx -f ${MOL}.pdb -o ${MOL}.gro -p ${MOL}.top >& ! output.pdb2gmx
 echo "pdb2gmx finished"
 echo -n "Press <enter>"
 set  ans = $<
@@ -119,11 +119,11 @@ set  ans = $<
 
 echo "Starting editconf and genbox..."
 if ( $?DISPLAY ) then 
-	xterm -title genbox -sb -e tail +0f output.genbox &
+	xterm -title g_genbox -sb -e tail +0f output.genbox &
 endif
-editconf -f ${MOL}.gro -o ${MOL}.gro -d 0.5 >& ! output.genbox 
+g_editconf -f ${MOL}.gro -o ${MOL}.gro -d 0.5 >& ! output.genbox 
 
-genbox -cp ${MOL}.gro -cs -o ${MOL}_b4em.gro -p ${MOL}.top >>& ! output.genbox 
+g_genbox -cp ${MOL}.gro -cs -o ${MOL}_b4em.gro -p ${MOL}.top >>& ! output.genbox 
 
 echo "editconf and genbox finished"
 echo -n "Press <enter>"
@@ -189,9 +189,9 @@ _EOF_
 
 echo "Starting grompp..."
 if ( $?DISPLAY ) then 
-	xterm -title grompp -sb -e tail +0f output.grompp_em &
+	xterm -title g_grompp -sb -e tail +0f output.grompp_em &
 endif
-grompp -f em -c ${MOL}_b4em -p ${MOL} -o ${MOL}_em >& ! output.grompp_em
+g_grompp -f em -c ${MOL}_b4em -p ${MOL} -o ${MOL}_em >& ! output.grompp_em
 
 echo "grompp finished"
 echo -n "Press <enter>"
@@ -230,9 +230,9 @@ set  ans = $<
 echo "starting energy minimisation mdrun..."
 
 if ( $?DISPLAY ) then 
-	xterm -title mdrun -sb -e tail +0f output.mdrun_em &
+	xterm -title g_mdrun -sb -e tail +0f output.mdrun_em &
 endif
-mdrun -nice 4 -s ${MOL}_em -o ${MOL}_em -c ${MOL}_b4pr -v >& ! output.mdrun_em 
+g_mdrun -nice 4 -s ${MOL}_em -o ${MOL}_em -c ${MOL}_b4pr -v >& ! output.mdrun_em 
 
 echo "mdrun finished"
 echo -n "Press <enter>"
@@ -316,9 +316,9 @@ _EOF_
 
 echo "Starting grompp..."
 if ( $?DISPLAY ) then 
-	xterm -title grompp -sb -e tail +0f output.grompp_pr &
+	xterm -title g_grompp -sb -e tail +0f output.grompp_pr &
 endif
-grompp -f pr -c ${MOL}_b4pr -r ${MOL}_b4pr -p ${MOL} -o ${MOL}_pr >& ! output.grompp_pr
+g_grompp -f pr -c ${MOL}_b4pr -r ${MOL}_b4pr -p ${MOL} -o ${MOL}_pr >& ! output.grompp_pr
 echo "grompp finished"
 
 echo -n "Press <enter>"
@@ -350,9 +350,9 @@ set  ans = $<
 
 echo "starting mdrun..."
 if ( $?DISPLAY ) then 
-	xterm -title mdrun -sb -e tail +0f output.mdrun_pr &
+	xterm -title g_mdrun -sb -e tail +0f output.mdrun_pr &
 endif
-mdrun -nice 4 -s ${MOL}_pr -o ${MOL}_pr -c ${MOL}_b4md -v >& ! output.mdrun_pr
+g_mdrun -nice 4 -s ${MOL}_pr -o ${MOL}_pr -c ${MOL}_b4md -v >& ! output.mdrun_pr
 
 echo "mdrun finished"
 echo -n "Press <enter>"
@@ -417,9 +417,9 @@ _EOF_
 
 echo "Starting grompp..."
 if ( $?DISPLAY ) then 
-	xterm -title grompp -sb -e tail +0f output.grompp_md &
+	xterm -title g_grompp -sb -e tail +0f output.grompp_md &
 endif
-grompp -f md -c ${MOL}_b4md  -p ${MOL} -o ${MOL}_md >& ! output.grompp_md
+g_grompp -f md -c ${MOL}_b4md  -p ${MOL} -o ${MOL}_md >& ! output.grompp_md
 
 echo "grompp finished"
 echo -n "Press <enter>"
@@ -449,9 +449,9 @@ set  ans = $<
 
 echo "starting mdrun..."
 if ( $?DISPLAY ) then 
-	xterm -title mdrun -sb -e tail +0f output.mdrun_md &
+	xterm -title g_mdrun -sb -e tail +0f output.mdrun_md &
 endif
-mdrun -nice 4 -s ${MOL}_md -o ${MOL}_md -c ${MOL}_after_md -v >& ! output.mdrun_md
+g_mdrun -nice 4 -s ${MOL}_md -o ${MOL}_md -c ${MOL}_after_md -v >& ! output.mdrun_md
 
 echo "mdrun finished"
 echo -n "Press <enter>"
@@ -493,7 +493,7 @@ _EOF_
 
 if ( $?DISPLAY ) then
 	echo Starting Trajectory viewer...
-	ngmx -f ${MOL}_md -s ${MOL}_md  &
+	g_ngmx -f ${MOL}_md -s ${MOL}_md  &
 endif
 #last line 
 



From jussilehtola at fedoraproject.org  Mon Jan 19 15:03:25 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Mon, 19 Jan 2009 15:03:25 +0000 (UTC)
Subject: rpms/gromacs/EL-5 gromacs-gmxdemo.patch,NONE,1.1
Message-ID: <20090119150325.B641C700F8@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

Update of /cvs/pkgs/rpms/gromacs/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20992/EL-5

Added Files:
	gromacs-gmxdemo.patch 
Log Message:
* Mon Jan 19 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0.3-3
- Fixed gmxdemo.


gromacs-gmxdemo.patch:

--- NEW FILE gromacs-gmxdemo.patch ---
diff -up gromacs-4.0.3/share/tutor/gmxdemo/demo.orig gromacs-4.0.3/share/tutor/gmxdemo/demo
--- gromacs-4.0.3/share/tutor/gmxdemo/demo.orig	2006-02-15 23:48:34.000000000 +0200
+++ gromacs-4.0.3/share/tutor/gmxdemo/demo	2009-01-19 16:52:35.000000000 +0200
@@ -80,9 +80,9 @@ set  ans = $<
 
 echo "Starting pdb2gmx"
 if ( $?DISPLAY ) then 
-	xterm -title pdb2gmx -sb -e tail +0f output.pdb2gmx &
+	xterm -title g_pdb2gmx -sb -e tail +0f output.pdb2gmx &
 endif
-echo 0 | pdb2gmx -f ${MOL}.pdb -o ${MOL}.gro -p ${MOL}.top >& ! output.pdb2gmx
+echo 0 | g_pdb2gmx -f ${MOL}.pdb -o ${MOL}.gro -p ${MOL}.top >& ! output.pdb2gmx
 echo "pdb2gmx finished"
 echo -n "Press <enter>"
 set  ans = $<
@@ -119,11 +119,11 @@ set  ans = $<
 
 echo "Starting editconf and genbox..."
 if ( $?DISPLAY ) then 
-	xterm -title genbox -sb -e tail +0f output.genbox &
+	xterm -title g_genbox -sb -e tail +0f output.genbox &
 endif
-editconf -f ${MOL}.gro -o ${MOL}.gro -d 0.5 >& ! output.genbox 
+g_editconf -f ${MOL}.gro -o ${MOL}.gro -d 0.5 >& ! output.genbox 
 
-genbox -cp ${MOL}.gro -cs -o ${MOL}_b4em.gro -p ${MOL}.top >>& ! output.genbox 
+g_genbox -cp ${MOL}.gro -cs -o ${MOL}_b4em.gro -p ${MOL}.top >>& ! output.genbox 
 
 echo "editconf and genbox finished"
 echo -n "Press <enter>"
@@ -189,9 +189,9 @@ _EOF_
 
 echo "Starting grompp..."
 if ( $?DISPLAY ) then 
-	xterm -title grompp -sb -e tail +0f output.grompp_em &
+	xterm -title g_grompp -sb -e tail +0f output.grompp_em &
 endif
-grompp -f em -c ${MOL}_b4em -p ${MOL} -o ${MOL}_em >& ! output.grompp_em
+g_grompp -f em -c ${MOL}_b4em -p ${MOL} -o ${MOL}_em >& ! output.grompp_em
 
 echo "grompp finished"
 echo -n "Press <enter>"
@@ -230,9 +230,9 @@ set  ans = $<
 echo "starting energy minimisation mdrun..."
 
 if ( $?DISPLAY ) then 
-	xterm -title mdrun -sb -e tail +0f output.mdrun_em &
+	xterm -title g_mdrun -sb -e tail +0f output.mdrun_em &
 endif
-mdrun -nice 4 -s ${MOL}_em -o ${MOL}_em -c ${MOL}_b4pr -v >& ! output.mdrun_em 
+g_mdrun -nice 4 -s ${MOL}_em -o ${MOL}_em -c ${MOL}_b4pr -v >& ! output.mdrun_em 
 
 echo "mdrun finished"
 echo -n "Press <enter>"
@@ -316,9 +316,9 @@ _EOF_
 
 echo "Starting grompp..."
 if ( $?DISPLAY ) then 
-	xterm -title grompp -sb -e tail +0f output.grompp_pr &
+	xterm -title g_grompp -sb -e tail +0f output.grompp_pr &
 endif
-grompp -f pr -c ${MOL}_b4pr -r ${MOL}_b4pr -p ${MOL} -o ${MOL}_pr >& ! output.grompp_pr
+g_grompp -f pr -c ${MOL}_b4pr -r ${MOL}_b4pr -p ${MOL} -o ${MOL}_pr >& ! output.grompp_pr
 echo "grompp finished"
 
 echo -n "Press <enter>"
@@ -350,9 +350,9 @@ set  ans = $<
 
 echo "starting mdrun..."
 if ( $?DISPLAY ) then 
-	xterm -title mdrun -sb -e tail +0f output.mdrun_pr &
+	xterm -title g_mdrun -sb -e tail +0f output.mdrun_pr &
 endif
-mdrun -nice 4 -s ${MOL}_pr -o ${MOL}_pr -c ${MOL}_b4md -v >& ! output.mdrun_pr
+g_mdrun -nice 4 -s ${MOL}_pr -o ${MOL}_pr -c ${MOL}_b4md -v >& ! output.mdrun_pr
 
 echo "mdrun finished"
 echo -n "Press <enter>"
@@ -417,9 +417,9 @@ _EOF_
 
 echo "Starting grompp..."
 if ( $?DISPLAY ) then 
-	xterm -title grompp -sb -e tail +0f output.grompp_md &
+	xterm -title g_grompp -sb -e tail +0f output.grompp_md &
 endif
-grompp -f md -c ${MOL}_b4md  -p ${MOL} -o ${MOL}_md >& ! output.grompp_md
+g_grompp -f md -c ${MOL}_b4md  -p ${MOL} -o ${MOL}_md >& ! output.grompp_md
 
 echo "grompp finished"
 echo -n "Press <enter>"
@@ -449,9 +449,9 @@ set  ans = $<
 
 echo "starting mdrun..."
 if ( $?DISPLAY ) then 
-	xterm -title mdrun -sb -e tail +0f output.mdrun_md &
+	xterm -title g_mdrun -sb -e tail +0f output.mdrun_md &
 endif
-mdrun -nice 4 -s ${MOL}_md -o ${MOL}_md -c ${MOL}_after_md -v >& ! output.mdrun_md
+g_mdrun -nice 4 -s ${MOL}_md -o ${MOL}_md -c ${MOL}_after_md -v >& ! output.mdrun_md
 
 echo "mdrun finished"
 echo -n "Press <enter>"
@@ -493,7 +493,7 @@ _EOF_
 
 if ( $?DISPLAY ) then
 	echo Starting Trajectory viewer...
-	ngmx -f ${MOL}_md -s ${MOL}_md  &
+	g_ngmx -f ${MOL}_md -s ${MOL}_md  &
 endif
 #last line 
 



From jussilehtola at fedoraproject.org  Mon Jan 19 15:03:26 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Mon, 19 Jan 2009 15:03:26 +0000 (UTC)
Subject: rpms/gromacs/F-10 gromacs-gmxdemo.patch,NONE,1.1
Message-ID: <20090119150326.1672D700F8@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

Update of /cvs/pkgs/rpms/gromacs/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20992/F-10

Added Files:
	gromacs-gmxdemo.patch 
Log Message:
* Mon Jan 19 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0.3-3
- Fixed gmxdemo.


gromacs-gmxdemo.patch:

--- NEW FILE gromacs-gmxdemo.patch ---
diff -up gromacs-4.0.3/share/tutor/gmxdemo/demo.orig gromacs-4.0.3/share/tutor/gmxdemo/demo
--- gromacs-4.0.3/share/tutor/gmxdemo/demo.orig	2006-02-15 23:48:34.000000000 +0200
+++ gromacs-4.0.3/share/tutor/gmxdemo/demo	2009-01-19 16:52:35.000000000 +0200
@@ -80,9 +80,9 @@ set  ans = $<
 
 echo "Starting pdb2gmx"
 if ( $?DISPLAY ) then 
-	xterm -title pdb2gmx -sb -e tail +0f output.pdb2gmx &
+	xterm -title g_pdb2gmx -sb -e tail +0f output.pdb2gmx &
 endif
-echo 0 | pdb2gmx -f ${MOL}.pdb -o ${MOL}.gro -p ${MOL}.top >& ! output.pdb2gmx
+echo 0 | g_pdb2gmx -f ${MOL}.pdb -o ${MOL}.gro -p ${MOL}.top >& ! output.pdb2gmx
 echo "pdb2gmx finished"
 echo -n "Press <enter>"
 set  ans = $<
@@ -119,11 +119,11 @@ set  ans = $<
 
 echo "Starting editconf and genbox..."
 if ( $?DISPLAY ) then 
-	xterm -title genbox -sb -e tail +0f output.genbox &
+	xterm -title g_genbox -sb -e tail +0f output.genbox &
 endif
-editconf -f ${MOL}.gro -o ${MOL}.gro -d 0.5 >& ! output.genbox 
+g_editconf -f ${MOL}.gro -o ${MOL}.gro -d 0.5 >& ! output.genbox 
 
-genbox -cp ${MOL}.gro -cs -o ${MOL}_b4em.gro -p ${MOL}.top >>& ! output.genbox 
+g_genbox -cp ${MOL}.gro -cs -o ${MOL}_b4em.gro -p ${MOL}.top >>& ! output.genbox 
 
 echo "editconf and genbox finished"
 echo -n "Press <enter>"
@@ -189,9 +189,9 @@ _EOF_
 
 echo "Starting grompp..."
 if ( $?DISPLAY ) then 
-	xterm -title grompp -sb -e tail +0f output.grompp_em &
+	xterm -title g_grompp -sb -e tail +0f output.grompp_em &
 endif
-grompp -f em -c ${MOL}_b4em -p ${MOL} -o ${MOL}_em >& ! output.grompp_em
+g_grompp -f em -c ${MOL}_b4em -p ${MOL} -o ${MOL}_em >& ! output.grompp_em
 
 echo "grompp finished"
 echo -n "Press <enter>"
@@ -230,9 +230,9 @@ set  ans = $<
 echo "starting energy minimisation mdrun..."
 
 if ( $?DISPLAY ) then 
-	xterm -title mdrun -sb -e tail +0f output.mdrun_em &
+	xterm -title g_mdrun -sb -e tail +0f output.mdrun_em &
 endif
-mdrun -nice 4 -s ${MOL}_em -o ${MOL}_em -c ${MOL}_b4pr -v >& ! output.mdrun_em 
+g_mdrun -nice 4 -s ${MOL}_em -o ${MOL}_em -c ${MOL}_b4pr -v >& ! output.mdrun_em 
 
 echo "mdrun finished"
 echo -n "Press <enter>"
@@ -316,9 +316,9 @@ _EOF_
 
 echo "Starting grompp..."
 if ( $?DISPLAY ) then 
-	xterm -title grompp -sb -e tail +0f output.grompp_pr &
+	xterm -title g_grompp -sb -e tail +0f output.grompp_pr &
 endif
-grompp -f pr -c ${MOL}_b4pr -r ${MOL}_b4pr -p ${MOL} -o ${MOL}_pr >& ! output.grompp_pr
+g_grompp -f pr -c ${MOL}_b4pr -r ${MOL}_b4pr -p ${MOL} -o ${MOL}_pr >& ! output.grompp_pr
 echo "grompp finished"
 
 echo -n "Press <enter>"
@@ -350,9 +350,9 @@ set  ans = $<
 
 echo "starting mdrun..."
 if ( $?DISPLAY ) then 
-	xterm -title mdrun -sb -e tail +0f output.mdrun_pr &
+	xterm -title g_mdrun -sb -e tail +0f output.mdrun_pr &
 endif
-mdrun -nice 4 -s ${MOL}_pr -o ${MOL}_pr -c ${MOL}_b4md -v >& ! output.mdrun_pr
+g_mdrun -nice 4 -s ${MOL}_pr -o ${MOL}_pr -c ${MOL}_b4md -v >& ! output.mdrun_pr
 
 echo "mdrun finished"
 echo -n "Press <enter>"
@@ -417,9 +417,9 @@ _EOF_
 
 echo "Starting grompp..."
 if ( $?DISPLAY ) then 
-	xterm -title grompp -sb -e tail +0f output.grompp_md &
+	xterm -title g_grompp -sb -e tail +0f output.grompp_md &
 endif
-grompp -f md -c ${MOL}_b4md  -p ${MOL} -o ${MOL}_md >& ! output.grompp_md
+g_grompp -f md -c ${MOL}_b4md  -p ${MOL} -o ${MOL}_md >& ! output.grompp_md
 
 echo "grompp finished"
 echo -n "Press <enter>"
@@ -449,9 +449,9 @@ set  ans = $<
 
 echo "starting mdrun..."
 if ( $?DISPLAY ) then 
-	xterm -title mdrun -sb -e tail +0f output.mdrun_md &
+	xterm -title g_mdrun -sb -e tail +0f output.mdrun_md &
 endif
-mdrun -nice 4 -s ${MOL}_md -o ${MOL}_md -c ${MOL}_after_md -v >& ! output.mdrun_md
+g_mdrun -nice 4 -s ${MOL}_md -o ${MOL}_md -c ${MOL}_after_md -v >& ! output.mdrun_md
 
 echo "mdrun finished"
 echo -n "Press <enter>"
@@ -493,7 +493,7 @@ _EOF_
 
 if ( $?DISPLAY ) then
 	echo Starting Trajectory viewer...
-	ngmx -f ${MOL}_md -s ${MOL}_md  &
+	g_ngmx -f ${MOL}_md -s ${MOL}_md  &
 endif
 #last line 
 



From jussilehtola at fedoraproject.org  Mon Jan 19 15:03:26 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Mon, 19 Jan 2009 15:03:26 +0000 (UTC)
Subject: rpms/gromacs/F-9 gromacs-gmxdemo.patch,NONE,1.1
Message-ID: <20090119150326.68A09700F8@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

Update of /cvs/pkgs/rpms/gromacs/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20992/F-9

Added Files:
	gromacs-gmxdemo.patch 
Log Message:
* Mon Jan 19 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0.3-3
- Fixed gmxdemo.


gromacs-gmxdemo.patch:

--- NEW FILE gromacs-gmxdemo.patch ---
diff -up gromacs-4.0.3/share/tutor/gmxdemo/demo.orig gromacs-4.0.3/share/tutor/gmxdemo/demo
--- gromacs-4.0.3/share/tutor/gmxdemo/demo.orig	2006-02-15 23:48:34.000000000 +0200
+++ gromacs-4.0.3/share/tutor/gmxdemo/demo	2009-01-19 16:52:35.000000000 +0200
@@ -80,9 +80,9 @@ set  ans = $<
 
 echo "Starting pdb2gmx"
 if ( $?DISPLAY ) then 
-	xterm -title pdb2gmx -sb -e tail +0f output.pdb2gmx &
+	xterm -title g_pdb2gmx -sb -e tail +0f output.pdb2gmx &
 endif
-echo 0 | pdb2gmx -f ${MOL}.pdb -o ${MOL}.gro -p ${MOL}.top >& ! output.pdb2gmx
+echo 0 | g_pdb2gmx -f ${MOL}.pdb -o ${MOL}.gro -p ${MOL}.top >& ! output.pdb2gmx
 echo "pdb2gmx finished"
 echo -n "Press <enter>"
 set  ans = $<
@@ -119,11 +119,11 @@ set  ans = $<
 
 echo "Starting editconf and genbox..."
 if ( $?DISPLAY ) then 
-	xterm -title genbox -sb -e tail +0f output.genbox &
+	xterm -title g_genbox -sb -e tail +0f output.genbox &
 endif
-editconf -f ${MOL}.gro -o ${MOL}.gro -d 0.5 >& ! output.genbox 
+g_editconf -f ${MOL}.gro -o ${MOL}.gro -d 0.5 >& ! output.genbox 
 
-genbox -cp ${MOL}.gro -cs -o ${MOL}_b4em.gro -p ${MOL}.top >>& ! output.genbox 
+g_genbox -cp ${MOL}.gro -cs -o ${MOL}_b4em.gro -p ${MOL}.top >>& ! output.genbox 
 
 echo "editconf and genbox finished"
 echo -n "Press <enter>"
@@ -189,9 +189,9 @@ _EOF_
 
 echo "Starting grompp..."
 if ( $?DISPLAY ) then 
-	xterm -title grompp -sb -e tail +0f output.grompp_em &
+	xterm -title g_grompp -sb -e tail +0f output.grompp_em &
 endif
-grompp -f em -c ${MOL}_b4em -p ${MOL} -o ${MOL}_em >& ! output.grompp_em
+g_grompp -f em -c ${MOL}_b4em -p ${MOL} -o ${MOL}_em >& ! output.grompp_em
 
 echo "grompp finished"
 echo -n "Press <enter>"
@@ -230,9 +230,9 @@ set  ans = $<
 echo "starting energy minimisation mdrun..."
 
 if ( $?DISPLAY ) then 
-	xterm -title mdrun -sb -e tail +0f output.mdrun_em &
+	xterm -title g_mdrun -sb -e tail +0f output.mdrun_em &
 endif
-mdrun -nice 4 -s ${MOL}_em -o ${MOL}_em -c ${MOL}_b4pr -v >& ! output.mdrun_em 
+g_mdrun -nice 4 -s ${MOL}_em -o ${MOL}_em -c ${MOL}_b4pr -v >& ! output.mdrun_em 
 
 echo "mdrun finished"
 echo -n "Press <enter>"
@@ -316,9 +316,9 @@ _EOF_
 
 echo "Starting grompp..."
 if ( $?DISPLAY ) then 
-	xterm -title grompp -sb -e tail +0f output.grompp_pr &
+	xterm -title g_grompp -sb -e tail +0f output.grompp_pr &
 endif
-grompp -f pr -c ${MOL}_b4pr -r ${MOL}_b4pr -p ${MOL} -o ${MOL}_pr >& ! output.grompp_pr
+g_grompp -f pr -c ${MOL}_b4pr -r ${MOL}_b4pr -p ${MOL} -o ${MOL}_pr >& ! output.grompp_pr
 echo "grompp finished"
 
 echo -n "Press <enter>"
@@ -350,9 +350,9 @@ set  ans = $<
 
 echo "starting mdrun..."
 if ( $?DISPLAY ) then 
-	xterm -title mdrun -sb -e tail +0f output.mdrun_pr &
+	xterm -title g_mdrun -sb -e tail +0f output.mdrun_pr &
 endif
-mdrun -nice 4 -s ${MOL}_pr -o ${MOL}_pr -c ${MOL}_b4md -v >& ! output.mdrun_pr
+g_mdrun -nice 4 -s ${MOL}_pr -o ${MOL}_pr -c ${MOL}_b4md -v >& ! output.mdrun_pr
 
 echo "mdrun finished"
 echo -n "Press <enter>"
@@ -417,9 +417,9 @@ _EOF_
 
 echo "Starting grompp..."
 if ( $?DISPLAY ) then 
-	xterm -title grompp -sb -e tail +0f output.grompp_md &
+	xterm -title g_grompp -sb -e tail +0f output.grompp_md &
 endif
-grompp -f md -c ${MOL}_b4md  -p ${MOL} -o ${MOL}_md >& ! output.grompp_md
+g_grompp -f md -c ${MOL}_b4md  -p ${MOL} -o ${MOL}_md >& ! output.grompp_md
 
 echo "grompp finished"
 echo -n "Press <enter>"
@@ -449,9 +449,9 @@ set  ans = $<
 
 echo "starting mdrun..."
 if ( $?DISPLAY ) then 
-	xterm -title mdrun -sb -e tail +0f output.mdrun_md &
+	xterm -title g_mdrun -sb -e tail +0f output.mdrun_md &
 endif
-mdrun -nice 4 -s ${MOL}_md -o ${MOL}_md -c ${MOL}_after_md -v >& ! output.mdrun_md
+g_mdrun -nice 4 -s ${MOL}_md -o ${MOL}_md -c ${MOL}_after_md -v >& ! output.mdrun_md
 
 echo "mdrun finished"
 echo -n "Press <enter>"
@@ -493,7 +493,7 @@ _EOF_
 
 if ( $?DISPLAY ) then
 	echo Starting Trajectory viewer...
-	ngmx -f ${MOL}_md -s ${MOL}_md  &
+	g_ngmx -f ${MOL}_md -s ${MOL}_md  &
 endif
 #last line 
 



From pkgdb at fedoraproject.org  Mon Jan 19 15:03:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:03:48 +0000
Subject: [pkgdb] virt-top had acl change status
Message-ID: <20090119150349.6D7C9208470@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on virt-top (Fedora devel) to Approved for virtmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/virt-top



From pkgdb at fedoraproject.org  Mon Jan 19 15:03:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:03:50 +0000
Subject: [pkgdb] virt-top had acl change status
Message-ID: <20090119150350.200B4208473@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on virt-top (Fedora devel) to Approved for virtmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/virt-top



From pkgdb at fedoraproject.org  Mon Jan 19 15:03:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:03:51 +0000
Subject: [pkgdb] virt-top had acl change status
Message-ID: <20090119150352.5D2072081FA@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on virt-top (Fedora 9) to Approved for virtmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/virt-top



From pkgdb at fedoraproject.org  Mon Jan 19 15:03:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:03:53 +0000
Subject: [pkgdb] virt-top had acl change status
Message-ID: <20090119150353.62182208469@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on virt-top (Fedora 9) to Approved for virtmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/virt-top



From pkgdb at fedoraproject.org  Mon Jan 19 15:03:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:03:55 +0000
Subject: [pkgdb] virt-top had acl change status
Message-ID: <20090119150355.36D86208479@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on virt-top (Fedora 8) to Approved for virtmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/virt-top



From pkgdb at fedoraproject.org  Mon Jan 19 15:03:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:03:55 +0000
Subject: [pkgdb] virt-top had acl change status
Message-ID: <20090119150356.1905920847D@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on virt-top (Fedora 8) to Approved for virtmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/virt-top



From pkgdb at fedoraproject.org  Mon Jan 19 15:03:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:03:59 +0000
Subject: [pkgdb] virt-top had acl change status
Message-ID: <20090119150359.90819208482@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on virt-top (Fedora EPEL 5) to Obsolete for virtmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/virt-top



From pkgdb at fedoraproject.org  Mon Jan 19 15:04:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:04:02 +0000
Subject: [pkgdb] virt-top had acl change status
Message-ID: <20090119150402.1FC71208485@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on virt-top (Fedora EPEL 5) to Approved for virtmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/virt-top



From pkgdb at fedoraproject.org  Mon Jan 19 15:04:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:04:49 +0000
Subject: [pkgdb] virt-top had acl change status
Message-ID: <20090119150450.C1A2020847A@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on virt-top (Fedora 10) to Approved for virtmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/virt-top



From pkgdb at fedoraproject.org  Mon Jan 19 15:04:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:04:52 +0000
Subject: [pkgdb] virt-top had acl change status
Message-ID: <20090119150452.389E220847E@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on virt-top (Fedora EPEL 5) to Approved for virtmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/virt-top



From pkgdb at fedoraproject.org  Mon Jan 19 15:05:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:05:05 +0000
Subject: [pkgdb] virt-top had acl change status
Message-ID: <20090119150505.20F9A208472@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on virt-top (Fedora 10) to Approved for virtmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/virt-top



From pkgdb at fedoraproject.org  Mon Jan 19 15:05:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:05:47 +0000
Subject: [pkgdb] ocaml-libvirt had acl change status
Message-ID: <20090119150547.C23CD20846E@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on ocaml-libvirt (Fedora devel) to Approved for virtmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-libvirt



From pkgdb at fedoraproject.org  Mon Jan 19 15:05:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:05:49 +0000
Subject: [pkgdb] ocaml-libvirt had acl change status
Message-ID: <20090119150550.2CE75208473@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on ocaml-libvirt (Fedora devel) to Approved for virtmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-libvirt



From pkgdb at fedoraproject.org  Mon Jan 19 15:05:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:05:52 +0000
Subject: [pkgdb] ocaml-libvirt had acl change status
Message-ID: <20090119150553.75AC3208476@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on ocaml-libvirt (Fedora 7) to Approved for virtmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-libvirt



From pkgdb at fedoraproject.org  Mon Jan 19 15:05:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:05:52 +0000
Subject: [pkgdb] ocaml-libvirt had acl change status
Message-ID: <20090119150553.83F24208479@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on ocaml-libvirt (Fedora 7) to Approved for virtmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-libvirt



From pkgdb at fedoraproject.org  Mon Jan 19 15:05:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:05:54 +0000
Subject: [pkgdb] ocaml-libvirt had acl change status
Message-ID: <20090119150554.9B494208482@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on ocaml-libvirt (Fedora 8) to Approved for virtmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-libvirt



From pkgdb at fedoraproject.org  Mon Jan 19 15:05:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:05:53 +0000
Subject: [pkgdb] ocaml-libvirt had acl change status
Message-ID: <20090119150554.AFCB4208483@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on ocaml-libvirt (Fedora 8) to Approved for virtmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-libvirt



From pkgdb at fedoraproject.org  Mon Jan 19 15:05:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:05:58 +0000
Subject: [pkgdb] ocaml-libvirt had acl change status
Message-ID: <20090119150558.2FD9120847E@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on ocaml-libvirt (Fedora EPEL 5) to Approved for virtmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-libvirt



From pkgdb at fedoraproject.org  Mon Jan 19 15:05:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:05:58 +0000
Subject: [pkgdb] ocaml-libvirt had acl change status
Message-ID: <20090119150558.6E7A2208485@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on ocaml-libvirt (Fedora EPEL 5) to Approved for virtmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-libvirt



From pkgdb at fedoraproject.org  Mon Jan 19 15:06:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:06:01 +0000
Subject: [pkgdb] ocaml-libvirt had acl change status
Message-ID: <20090119150601.55025208486@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on ocaml-libvirt (Fedora 9) to Approved for virtmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-libvirt



From pkgdb at fedoraproject.org  Mon Jan 19 15:06:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:06:01 +0000
Subject: [pkgdb] ocaml-libvirt had acl change status
Message-ID: <20090119150601.5F830208489@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on ocaml-libvirt (Fedora 9) to Approved for virtmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-libvirt



From pkgdb at fedoraproject.org  Mon Jan 19 15:06:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:06:04 +0000
Subject: [pkgdb] ocaml-libvirt had acl change status
Message-ID: <20090119150604.DCBC420848C@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on ocaml-libvirt (Fedora 10) to Approved for virtmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-libvirt



From pkgdb at fedoraproject.org  Mon Jan 19 15:06:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:06:05 +0000
Subject: [pkgdb] ocaml-libvirt had acl change status
Message-ID: <20090119150605.62E4220848F@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on ocaml-libvirt (Fedora 10) to Approved for virtmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-libvirt



From pkgdb at fedoraproject.org  Mon Jan 19 15:06:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:06:08 +0000
Subject: [pkgdb] virt-mem had acl change status
Message-ID: <20090119150608.7A928208471@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on virt-mem (Fedora devel) to Approved for virtmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/virt-mem



From pkgdb at fedoraproject.org  Mon Jan 19 15:06:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:06:10 +0000
Subject: [pkgdb] virt-mem had acl change status
Message-ID: <20090119150610.D13B8208474@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on virt-mem (Fedora 9) to Approved for virtmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/virt-mem



From pkgdb at fedoraproject.org  Mon Jan 19 15:06:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:06:11 +0000
Subject: [pkgdb] virt-mem had acl change status
Message-ID: <20090119150612.0288A208491@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on virt-mem (Fedora devel) to Approved for virtmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/virt-mem



From pkgdb at fedoraproject.org  Mon Jan 19 15:06:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:06:12 +0000
Subject: [pkgdb] virt-mem had acl change status
Message-ID: <20090119150613.4D4082084BA@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on virt-mem (Fedora 9) to Approved for virtmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/virt-mem



From pkgdb at fedoraproject.org  Mon Jan 19 15:06:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:06:13 +0000
Subject: [pkgdb] virt-mem had acl change status
Message-ID: <20090119150613.D227D20866E@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on virt-mem (Fedora 8) to Approved for virtmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/virt-mem



From pkgdb at fedoraproject.org  Mon Jan 19 15:06:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:06:15 +0000
Subject: [pkgdb] virt-mem had acl change status
Message-ID: <20090119150615.7D3792086F2@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on virt-mem (Fedora 8) to Approved for virtmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/virt-mem



From pkgdb at fedoraproject.org  Mon Jan 19 15:06:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:06:18 +0000
Subject: [pkgdb] virt-mem had acl change status
Message-ID: <20090119150618.6271A208477@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on virt-mem (Fedora 10) to Approved for virtmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/virt-mem



From pkgdb at fedoraproject.org  Mon Jan 19 15:06:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:06:18 +0000
Subject: [pkgdb] virt-mem had acl change status
Message-ID: <20090119150618.78941208739@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on virt-mem (Fedora 10) to Approved for virtmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/virt-mem



From pkgdb at fedoraproject.org  Mon Jan 19 15:06:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:06:21 +0000
Subject: [pkgdb] virt-df had acl change status
Message-ID: <20090119150621.73AC420873D@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on virt-df (Fedora devel) to Approved for virtmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/virt-df



From pkgdb at fedoraproject.org  Mon Jan 19 15:06:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:06:22 +0000
Subject: [pkgdb] virt-df had acl change status
Message-ID: <20090119150623.7E682208748@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on virt-df (Fedora devel) to Approved for virtmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/virt-df



From pkgdb at fedoraproject.org  Mon Jan 19 15:06:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:06:24 +0000
Subject: [pkgdb] virt-df had acl change status
Message-ID: <20090119150624.4A9B020896A@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on virt-df (Fedora 9) to Approved for virtmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/virt-df



From pkgdb at fedoraproject.org  Mon Jan 19 15:06:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:06:27 +0000
Subject: [pkgdb] virt-df had acl change status
Message-ID: <20090119150627.7CB5520897B@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on virt-df (Fedora 8) to Approved for virtmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/virt-df



From pkgdb at fedoraproject.org  Mon Jan 19 15:06:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:06:26 +0000
Subject: [pkgdb] virt-df had acl change status
Message-ID: <20090119150626.BF09B208974@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on virt-df (Fedora 9) to Approved for virtmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/virt-df



From pkgdb at fedoraproject.org  Mon Jan 19 15:06:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:06:27 +0000
Subject: [pkgdb] virt-df had acl change status
Message-ID: <20090119150627.D90B92089F1@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on virt-df (Fedora 8) to Approved for virtmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/virt-df



From pkgdb at fedoraproject.org  Mon Jan 19 15:06:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:06:29 +0000
Subject: [pkgdb] virt-df had acl change status
Message-ID: <20090119150629.A6E8420847F@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on virt-df (Fedora 10) to Approved for virtmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/virt-df



From pkgdb at fedoraproject.org  Mon Jan 19 15:06:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:06:30 +0000
Subject: [pkgdb] virt-df had acl change status
Message-ID: <20090119150630.C7C30208D0C@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on virt-df (Fedora 10) to Approved for virtmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/virt-df



From pkgdb at fedoraproject.org  Mon Jan 19 15:06:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:06:34 +0000
Subject: [pkgdb] collectd had acl change status
Message-ID: <20090119150634.94115208D5D@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on collectd (Fedora devel) to Approved for virtmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/collectd



From pkgdb at fedoraproject.org  Mon Jan 19 15:06:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:06:35 +0000
Subject: [pkgdb] collectd had acl change status
Message-ID: <20090119150635.F1364208DDE@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on collectd (Fedora devel) to Approved for virtmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/collectd



From pkgdb at fedoraproject.org  Mon Jan 19 15:06:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:06:37 +0000
Subject: [pkgdb] collectd had acl change status
Message-ID: <20090119150637.A4CF9208DE3@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on collectd (Fedora 9) to Approved for virtmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/collectd



From pkgdb at fedoraproject.org  Mon Jan 19 15:06:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:06:39 +0000
Subject: [pkgdb] collectd had acl change status
Message-ID: <20090119150639.8BDAA208DE6@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on collectd (Fedora 9) to Approved for virtmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/collectd



From pkgdb at fedoraproject.org  Mon Jan 19 15:06:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:06:41 +0000
Subject: [pkgdb] collectd had acl change status
Message-ID: <20090119150642.2DF20208483@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on collectd (Fedora 8) to Approved for virtmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/collectd



From pkgdb at fedoraproject.org  Mon Jan 19 15:06:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:06:43 +0000
Subject: [pkgdb] collectd had acl change status
Message-ID: <20090119150644.41272208DEE@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on collectd (Fedora 8) to Approved for virtmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/collectd



From pkgdb at fedoraproject.org  Mon Jan 19 15:06:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:06:45 +0000
Subject: [pkgdb] collectd had acl change status
Message-ID: <20090119150646.61A9C208DF4@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on collectd (Fedora 10) to Approved for virtmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/collectd



From pkgdb at fedoraproject.org  Mon Jan 19 15:06:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:06:48 +0000
Subject: [pkgdb] collectd had acl change status
Message-ID: <20090119150648.7DC59208DF9@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on collectd (Fedora 10) to Approved for virtmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/collectd



From jussilehtola at fedoraproject.org  Mon Jan 19 15:08:26 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Mon, 19 Jan 2009 15:08:26 +0000 (UTC)
Subject: rpms/gromacs/F-9 import.log,NONE,1.1 .cvsignore,1.1,1.2
Message-ID: <20090119150826.45179700F8@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

Update of /cvs/pkgs/rpms/gromacs/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21924/F-9

Modified Files:
	.cvsignore 
Added Files:
	import.log 
Log Message:
* Mon Jan 19 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0.3-3
- Fixed gmxdemo.



--- NEW FILE import.log ---
gromacs-4_0_3-3_fc10:F-9:gromacs-4.0.3-3.fc10.src.rpm:1232377614


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gromacs/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	15 Oct 2008 10:13:13 -0000	1.1
+++ .cvsignore	19 Jan 2009 15:07:55 -0000	1.2
@@ -0,0 +1,2 @@
+gromacs-4.0.3.tar.gz
+manual-4.0.pdf



From jwrdegoede at fedoraproject.org  Mon Jan 19 15:08:27 2009
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Mon, 19 Jan 2009 15:08:27 +0000 (UTC)
Subject: rpms/python-pyblock/devel .cvsignore, 1.31, 1.32 python-pyblock.spec,
	1.54, 1.55 sources, 1.34, 1.35
Message-ID: <20090119150827.96E64700F8@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/python-pyblock/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21964

Modified Files:
	.cvsignore python-pyblock.spec sources 
Log Message:
* Mon Jan 19 2009 Hans de Goede <hdegoede at redhat.com> - 0.33-1
- Allow use as non root (for pychecker)
- Forward port: "ERROR: only one argument allowed for this option"
  workaround from RHEL-5 (#468649, #474399)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-pyblock/devel/.cvsignore,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- .cvsignore	30 Sep 2008 15:47:07 -0000	1.31
+++ .cvsignore	19 Jan 2009 15:07:57 -0000	1.32
@@ -1,2 +1 @@
-pyblock-0.32.tar.bz2
-clog
+pyblock-0.33.tar.bz2


Index: python-pyblock.spec
===================================================================
RCS file: /cvs/extras/rpms/python-pyblock/devel/python-pyblock.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- python-pyblock.spec	29 Nov 2008 15:52:19 -0000	1.54
+++ python-pyblock.spec	19 Jan 2009 15:07:57 -0000	1.55
@@ -5,8 +5,8 @@
 
 Summary: Python modules for dealing with block devices
 Name: python-%{realname}
-Version: 0.32
-Release: 2%{?dist}
+Version: 0.33
+Release: 1%{?dist}
 Source0: %{realname}-%{version}.tar.bz2
 License: GPLv2 or GPLv3
 Group: System Environment/Libraries
@@ -42,6 +42,11 @@
 %{_docdir}/pyblock-%{version}/*
 
 %changelog
+* Mon Jan 19 2009 Hans de Goede <hdegoede at redhat.com> - 0.33-1
+- Allow use as non root (for pychecker)
+- Forward port: "ERROR: only one argument allowed for this option"
+  workaround from RHEL-5 (#468649, #474399)
+
 * Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 0.32-2
 - Rebuild for Python 2.6
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-pyblock/devel/sources,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- sources	30 Sep 2008 15:47:07 -0000	1.34
+++ sources	19 Jan 2009 15:07:57 -0000	1.35
@@ -1 +1 @@
-339b06ac1eb48dde8a54fbb2e174b26b  pyblock-0.32.tar.bz2
+b11aafcda789427be74999994addf027  pyblock-0.33.tar.bz2



From jwilson at fedoraproject.org  Mon Jan 19 15:09:33 2009
From: jwilson at fedoraproject.org (Jarod Wilson)
Date: Mon, 19 Jan 2009 15:09:33 +0000 (UTC)
Subject: rpms/rrdtool/devel .cvsignore, 1.32, 1.33 rrdtool.spec, 1.76,
	1.77 sources, 1.35, 1.36
Message-ID: <20090119150933.66F47700F8@cvs1.fedora.phx.redhat.com>

Author: jwilson

Update of /cvs/pkgs/rpms/rrdtool/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22200

Modified Files:
	.cvsignore rrdtool.spec sources 
Log Message:
* Mon Jan 19 2009 Jarod Wilson <jarod at redhat.com> 1.3.6-1
- Update to rrdtool 1.3.6



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rrdtool/devel/.cvsignore,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- .cvsignore	16 Jan 2009 14:53:09 -0000	1.32
+++ .cvsignore	19 Jan 2009 15:09:03 -0000	1.33
@@ -2,3 +2,4 @@
 rrdtool-1.3.3.tar.gz
 rrdtool-1.3.4.tar.gz
 rrdtool-1.3.5.tar.gz
+rrdtool-1.3.6.tar.gz


Index: rrdtool.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rrdtool/devel/rrdtool.spec,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- rrdtool.spec	16 Jan 2009 14:53:09 -0000	1.76
+++ rrdtool.spec	19 Jan 2009 15:09:03 -0000	1.77
@@ -8,8 +8,8 @@
 
 Summary: Round Robin Database Tool to store and display time-series data
 Name: rrdtool
-Version: 1.3.5
-Release: 2%{?dist}
+Version: 1.3.6
+Release: 1%{?dist}
 License: GPLv2+ with exceptions
 Group: Applications/Databases
 URL: http://oss.oetiker.ch/rrdtool/
@@ -325,6 +325,9 @@
 %endif
 
 %changelog
+* Mon Jan 19 2009 Jarod Wilson <jarod at redhat.com> 1.3.6-1
+- Update to rrdtool 1.3.6
+
 * Fri Jan 16 2009 Jarod Wilson <jarod at redhat.com> 1.3.5-2
 - dejavu font package names changed again...
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rrdtool/devel/sources,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- sources	16 Jan 2009 14:53:09 -0000	1.35
+++ sources	19 Jan 2009 15:09:03 -0000	1.36
@@ -1,2 +1,2 @@
 28074a9c368af013462631959ab90558  php4-r1190.tar.gz
-3f14381e64c2037f40af16380be9e9f3  rrdtool-1.3.5.tar.gz
+afaabd5a60115581e866efbac796d307  rrdtool-1.3.6.tar.gz



From jussilehtola at fedoraproject.org  Mon Jan 19 15:13:16 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Mon, 19 Jan 2009 15:13:16 +0000 (UTC)
Subject: rpms/gromacs/devel gromacs.spec,1.8,1.9 import.log,1.7,1.8
Message-ID: <20090119151316.57364700F8@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

Update of /cvs/pkgs/rpms/gromacs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22829/devel

Modified Files:
	gromacs.spec import.log 
Log Message:
* Mon Jan 19 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0.3-4
- Retry fixing gmxdemo.



Index: gromacs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gromacs/devel/gromacs.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- gromacs.spec	19 Jan 2009 14:55:21 -0000	1.8
+++ gromacs.spec	19 Jan 2009 15:12:45 -0000	1.9
@@ -1,6 +1,6 @@
 Name:		gromacs
 Version:	4.0.3
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	GROMACS - Fast, Free and Flexible Molecular Dynamics
 Group:		Applications/Engineering
 License:	GPLv2+
@@ -549,6 +549,9 @@
 
 
 %changelog
+* Mon Jan 19 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0.3-4
+- Retry fixing gmxdemo.
+
 * Mon Jan 19 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0.3-3
 - Fixed gmxdemo.
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/gromacs/devel/import.log,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- import.log	19 Jan 2009 14:55:21 -0000	1.7
+++ import.log	19 Jan 2009 15:12:45 -0000	1.8
@@ -5,3 +5,4 @@
 gromacs-4_0_3-1_fc10:HEAD:gromacs-4.0.3-1.fc10.src.rpm:1232356764
 gromacs-4_0_3-2_fc10:HEAD:gromacs-4.0.3-2.fc10.src.rpm:1232367441
 gromacs-4_0_3-3_fc10:HEAD:gromacs-4.0.3-3.fc10.src.rpm:1232376891
+gromacs-4_0_3-4_fc10:HEAD:gromacs-4.0.3-4.fc10.src.rpm:1232377885



From jussilehtola at fedoraproject.org  Mon Jan 19 15:13:20 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Mon, 19 Jan 2009 15:13:20 +0000 (UTC)
Subject: rpms/gromacs/F-9 gromacs.spec,1.8,1.9 import.log,1.1,1.2
Message-ID: <20090119151320.3C133700F8@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

Update of /cvs/pkgs/rpms/gromacs/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22866/F-9

Modified Files:
	gromacs.spec import.log 
Log Message:
* Mon Jan 19 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0.3-4
- Retry fixing gmxdemo.



Index: gromacs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gromacs/F-9/gromacs.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- gromacs.spec	19 Jan 2009 14:57:15 -0000	1.8
+++ gromacs.spec	19 Jan 2009 15:12:49 -0000	1.9
@@ -1,6 +1,6 @@
 Name:		gromacs
 Version:	4.0.3
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	GROMACS - Fast, Free and Flexible Molecular Dynamics
 Group:		Applications/Engineering
 License:	GPLv2+
@@ -549,6 +549,9 @@
 
 
 %changelog
+* Mon Jan 19 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0.3-4
+- Retry fixing gmxdemo.
+
 * Mon Jan 19 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0.3-3
 - Fixed gmxdemo.
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/gromacs/F-9/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	19 Jan 2009 15:07:55 -0000	1.1
+++ import.log	19 Jan 2009 15:12:49 -0000	1.2
@@ -1 +1,2 @@
 gromacs-4_0_3-3_fc10:F-9:gromacs-4.0.3-3.fc10.src.rpm:1232377614
+gromacs-4_0_3-4_fc10:F-9:gromacs-4.0.3-4.fc10.src.rpm:1232377902



From jussilehtola at fedoraproject.org  Mon Jan 19 15:13:23 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Mon, 19 Jan 2009 15:13:23 +0000 (UTC)
Subject: rpms/gromacs/F-10 import.log, NONE, 1.1 .cvsignore, 1.1,
	1.2 gromacs.spec, 1.8, 1.9
Message-ID: <20090119151323.397F9700F8@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

Update of /cvs/pkgs/rpms/gromacs/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22887/F-10

Modified Files:
	.cvsignore gromacs.spec 
Added Files:
	import.log 
Log Message:
* Mon Jan 19 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0.3-4
- Retry fixing gmxdemo.



--- NEW FILE import.log ---
gromacs-4_0_3-4_fc10:F-10:gromacs-4.0.3-4.fc10.src.rpm:1232377921


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gromacs/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	15 Oct 2008 10:13:13 -0000	1.1
+++ .cvsignore	19 Jan 2009 15:12:52 -0000	1.2
@@ -0,0 +1,2 @@
+gromacs-4.0.3.tar.gz
+manual-4.0.pdf


Index: gromacs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gromacs/F-10/gromacs.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- gromacs.spec	19 Jan 2009 14:57:14 -0000	1.8
+++ gromacs.spec	19 Jan 2009 15:12:52 -0000	1.9
@@ -1,6 +1,6 @@
 Name:		gromacs
 Version:	4.0.3
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	GROMACS - Fast, Free and Flexible Molecular Dynamics
 Group:		Applications/Engineering
 License:	GPLv2+
@@ -549,6 +549,9 @@
 
 
 %changelog
+* Mon Jan 19 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0.3-4
+- Retry fixing gmxdemo.
+
 * Mon Jan 19 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0.3-3
 - Fixed gmxdemo.
 



From jussilehtola at fedoraproject.org  Mon Jan 19 15:13:28 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Mon, 19 Jan 2009 15:13:28 +0000 (UTC)
Subject: rpms/gromacs/EL-4 import.log, NONE, 1.1 .cvsignore, 1.1,
	1.2 gromacs.spec, 1.8, 1.9
Message-ID: <20090119151328.38620700F8@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

Update of /cvs/pkgs/rpms/gromacs/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22927/EL-4

Modified Files:
	.cvsignore gromacs.spec 
Added Files:
	import.log 
Log Message:
* Mon Jan 19 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0.3-4
- Retry fixing gmxdemo.



--- NEW FILE import.log ---
gromacs-4_0_3-4_fc10:EL-4:gromacs-4.0.3-4.fc10.src.rpm:1232377930


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gromacs/EL-4/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	15 Oct 2008 10:13:13 -0000	1.1
+++ .cvsignore	19 Jan 2009 15:12:57 -0000	1.2
@@ -0,0 +1,2 @@
+gromacs-4.0.3.tar.gz
+manual-4.0.pdf


Index: gromacs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gromacs/EL-4/gromacs.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- gromacs.spec	19 Jan 2009 14:57:14 -0000	1.8
+++ gromacs.spec	19 Jan 2009 15:12:57 -0000	1.9
@@ -1,6 +1,6 @@
 Name:		gromacs
 Version:	4.0.3
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	GROMACS - Fast, Free and Flexible Molecular Dynamics
 Group:		Applications/Engineering
 License:	GPLv2+
@@ -549,6 +549,9 @@
 
 
 %changelog
+* Mon Jan 19 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0.3-4
+- Retry fixing gmxdemo.
+
 * Mon Jan 19 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0.3-3
 - Fixed gmxdemo.
 



From jussilehtola at fedoraproject.org  Mon Jan 19 15:14:16 2009
From: jussilehtola at fedoraproject.org (Jussi Lehtola)
Date: Mon, 19 Jan 2009 15:14:16 +0000 (UTC)
Subject: rpms/gromacs/EL-5 import.log, NONE, 1.1 .cvsignore, 1.1,
	1.2 gromacs.spec, 1.8, 1.9
Message-ID: <20090119151416.40996700F8@cvs1.fedora.phx.redhat.com>

Author: jussilehtola

Update of /cvs/pkgs/rpms/gromacs/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23242/EL-5

Modified Files:
	.cvsignore gromacs.spec 
Added Files:
	import.log 
Log Message:
* Mon Jan 19 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0.3-4
- Retry fixing gmxdemo.



--- NEW FILE import.log ---
gromacs-4_0_3-4_fc10:EL-5:gromacs-4.0.3-4.fc10.src.rpm:1232377940


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gromacs/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	15 Oct 2008 10:13:13 -0000	1.1
+++ .cvsignore	19 Jan 2009 15:13:45 -0000	1.2
@@ -0,0 +1,2 @@
+gromacs-4.0.3.tar.gz
+manual-4.0.pdf


Index: gromacs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gromacs/EL-5/gromacs.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- gromacs.spec	19 Jan 2009 14:57:14 -0000	1.8
+++ gromacs.spec	19 Jan 2009 15:13:45 -0000	1.9
@@ -1,6 +1,6 @@
 Name:		gromacs
 Version:	4.0.3
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	GROMACS - Fast, Free and Flexible Molecular Dynamics
 Group:		Applications/Engineering
 License:	GPLv2+
@@ -549,6 +549,9 @@
 
 
 %changelog
+* Mon Jan 19 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0.3-4
+- Retry fixing gmxdemo.
+
 * Mon Jan 19 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 4.0.3-3
 - Fixed gmxdemo.
 



From pkgdb at fedoraproject.org  Mon Jan 19 15:21:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:21:06 +0000
Subject: [pkgdb] virt-top: ocamlmaint has requested watchbugzilla
Message-ID: <20090119152106.EFAD5208469@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchbugzilla acl on virt-top (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/virt-top



From pkgdb at fedoraproject.org  Mon Jan 19 15:21:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:21:10 +0000
Subject: [pkgdb] virt-top: ocamlmaint has requested watchbugzilla
Message-ID: <20090119152110.E4673208474@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchbugzilla acl on virt-top (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/virt-top



From pkgdb at fedoraproject.org  Mon Jan 19 15:21:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:21:08 +0000
Subject: [pkgdb] virt-top: ocamlmaint has requested watchcommits
Message-ID: <20090119152113.C8937208475@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchcommits acl on virt-top (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/virt-top



From pkgdb at fedoraproject.org  Mon Jan 19 15:21:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:21:17 +0000
Subject: [pkgdb] virt-top: ocamlmaint has requested watchbugzilla
Message-ID: <20090119152117.958A320847A@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchbugzilla acl on virt-top (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/virt-top



From pkgdb at fedoraproject.org  Mon Jan 19 15:21:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:21:14 +0000
Subject: [pkgdb] virt-top: ocamlmaint has requested watchbugzilla
Message-ID: <20090119152115.76C35208478@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchbugzilla acl on virt-top (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/virt-top



From pkgdb at fedoraproject.org  Mon Jan 19 15:21:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:21:25 +0000
Subject: [pkgdb] virt-top: ocamlmaint has requested watchcommits
Message-ID: <20090119152127.632E320847E@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchcommits acl on virt-top (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/virt-top



From pkgdb at fedoraproject.org  Mon Jan 19 15:21:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:21:27 +0000
Subject: [pkgdb] virt-top: ocamlmaint has requested watchcommits
Message-ID: <20090119152127.9FDB5208470@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchcommits acl on virt-top (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/virt-top



From pkgdb at fedoraproject.org  Mon Jan 19 15:21:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:21:27 +0000
Subject: [pkgdb] virt-top: ocamlmaint has requested watchcommits
Message-ID: <20090119152127.B4841208481@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchcommits acl on virt-top (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/virt-top



From pkgdb at fedoraproject.org  Mon Jan 19 15:21:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:21:35 +0000
Subject: [pkgdb] cduce: ocamlmaint has requested watchbugzilla
Message-ID: <20090119152135.E6917208483@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchbugzilla acl on cduce (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cduce



From pkgdb at fedoraproject.org  Mon Jan 19 15:21:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:21:38 +0000
Subject: [pkgdb] cduce: ocamlmaint has requested watchcommits
Message-ID: <20090119152138.CF184208474@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchcommits acl on cduce (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cduce



From pkgdb at fedoraproject.org  Mon Jan 19 15:21:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:21:39 +0000
Subject: [pkgdb] cduce: ocamlmaint has requested watchbugzilla
Message-ID: <20090119152139.3E1C7208488@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchbugzilla acl on cduce (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cduce



From pkgdb at fedoraproject.org  Mon Jan 19 15:21:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:21:39 +0000
Subject: [pkgdb] cduce: ocamlmaint has requested watchcommits
Message-ID: <20090119152139.B1767208489@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchcommits acl on cduce (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cduce



From pkgdb at fedoraproject.org  Mon Jan 19 15:21:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:21:42 +0000
Subject: [pkgdb] cduce: ocamlmaint has requested watchcommits
Message-ID: <20090119152146.1F43620848E@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchcommits acl on cduce (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cduce



From pkgdb at fedoraproject.org  Mon Jan 19 15:21:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:21:43 +0000
Subject: [pkgdb] cduce: ocamlmaint has given up watchbugzilla
Message-ID: <20090119152146.38083208492@bastion.fedora.phx.redhat.com>

ocamlmaint has given up the watchbugzilla acl on cduce (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cduce



From pkgdb at fedoraproject.org  Mon Jan 19 15:21:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:21:41 +0000
Subject: [pkgdb] cduce: ocamlmaint has requested watchbugzilla
Message-ID: <20090119152146.2C12A20848F@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchbugzilla acl on cduce (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cduce



From pkgdb at fedoraproject.org  Mon Jan 19 15:21:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:21:46 +0000
Subject: [pkgdb] cduce: ocamlmaint has given up watchcommits
Message-ID: <20090119152147.45F75208495@bastion.fedora.phx.redhat.com>

ocamlmaint has given up the watchcommits acl on cduce (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cduce



From pkgdb at fedoraproject.org  Mon Jan 19 15:21:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:21:47 +0000
Subject: [pkgdb] cduce: ocamlmaint has requested watchbugzilla
Message-ID: <20090119152147.93DC62084A7@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchbugzilla acl on cduce (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cduce



From pkgdb at fedoraproject.org  Mon Jan 19 15:21:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:21:48 +0000
Subject: [pkgdb] cduce: ocamlmaint has requested watchcommits
Message-ID: <20090119152148.CAA602084BD@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchcommits acl on cduce (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cduce



From pkgdb at fedoraproject.org  Mon Jan 19 15:21:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:21:53 +0000
Subject: [pkgdb] coq: ocamlmaint has requested watchbugzilla
Message-ID: <20090119152153.A1D56208479@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchbugzilla acl on coq (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/coq



From pkgdb at fedoraproject.org  Mon Jan 19 15:21:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:21:56 +0000
Subject: [pkgdb] coq: ocamlmaint has requested watchcommits
Message-ID: <20090119152156.AC6D120866E@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchcommits acl on coq (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/coq



From pkgdb at fedoraproject.org  Mon Jan 19 15:21:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:21:57 +0000
Subject: [pkgdb] coq: ocamlmaint has requested watchbugzilla
Message-ID: <20090119152157.88FF12086F2@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchbugzilla acl on coq (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/coq



From pkgdb at fedoraproject.org  Mon Jan 19 15:21:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:21:58 +0000
Subject: [pkgdb] coq: ocamlmaint has requested watchcommits
Message-ID: <20090119152158.CD97220873D@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchcommits acl on coq (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/coq



From pkgdb at fedoraproject.org  Mon Jan 19 15:22:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:22:01 +0000
Subject: [pkgdb] coq: ocamlmaint has requested watchbugzilla
Message-ID: <20090119152201.7B003208748@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchbugzilla acl on coq (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/coq



From pkgdb at fedoraproject.org  Mon Jan 19 15:22:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:22:03 +0000
Subject: [pkgdb] coq: ocamlmaint has requested watchcommits
Message-ID: <20090119152203.92D1E208472@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchcommits acl on coq (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/coq



From pkgdb at fedoraproject.org  Mon Jan 19 15:22:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:22:10 +0000
Subject: [pkgdb] virt-ctrl: ocamlmaint has requested watchbugzilla
Message-ID: <20090119152210.48BA420847E@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchbugzilla acl on virt-ctrl (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/virt-ctrl



From pkgdb at fedoraproject.org  Mon Jan 19 15:22:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:22:11 +0000
Subject: [pkgdb] virt-ctrl: ocamlmaint has requested watchcommits
Message-ID: <20090119152211.1AADD20896A@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchcommits acl on virt-ctrl (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/virt-ctrl



From pkgdb at fedoraproject.org  Mon Jan 19 15:22:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:22:13 +0000
Subject: [pkgdb] virt-ctrl: ocamlmaint has requested watchcommits
Message-ID: <20090119152213.AE858208973@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchcommits acl on virt-ctrl (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/virt-ctrl



From pkgdb at fedoraproject.org  Mon Jan 19 15:22:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:22:13 +0000
Subject: [pkgdb] virt-ctrl: ocamlmaint has requested watchbugzilla
Message-ID: <20090119152213.AF0F6208974@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchbugzilla acl on virt-ctrl (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/virt-ctrl



From pkgdb at fedoraproject.org  Mon Jan 19 15:22:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:22:20 +0000
Subject: [pkgdb] emacs-common-tuareg: ocamlmaint has requested watchcommits
Message-ID: <20090119152220.A2168208484@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchcommits acl on emacs-common-tuareg (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/emacs-common-tuareg



From pkgdb at fedoraproject.org  Mon Jan 19 15:22:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:22:28 +0000
Subject: [pkgdb] emacs-common-tuareg: ocamlmaint has requested watchbugzilla
Message-ID: <20090119152228.80F7B208476@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchbugzilla acl on emacs-common-tuareg (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/emacs-common-tuareg



From pkgdb at fedoraproject.org  Mon Jan 19 15:22:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:22:31 +0000
Subject: [pkgdb] emacs-common-tuareg: ocamlmaint has requested watchbugzilla
Message-ID: <20090119152231.69269208977@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchbugzilla acl on emacs-common-tuareg (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/emacs-common-tuareg



From pkgdb at fedoraproject.org  Mon Jan 19 15:22:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:22:32 +0000
Subject: [pkgdb] emacs-common-tuareg: ocamlmaint has requested watchcommits
Message-ID: <20090119152232.8DE2320897C@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchcommits acl on emacs-common-tuareg (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/emacs-common-tuareg



From pkgdb at fedoraproject.org  Mon Jan 19 15:22:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:22:34 +0000
Subject: [pkgdb] emacs-common-tuareg: ocamlmaint has requested watchbugzilla
Message-ID: <20090119152234.F06A12089F1@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchbugzilla acl on emacs-common-tuareg (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/emacs-common-tuareg



From pkgdb at fedoraproject.org  Mon Jan 19 15:22:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:22:35 +0000
Subject: [pkgdb] emacs-common-tuareg: ocamlmaint has requested watchcommits
Message-ID: <20090119152236.0C41E208A61@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchcommits acl on emacs-common-tuareg (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/emacs-common-tuareg



From pkgdb at fedoraproject.org  Mon Jan 19 15:22:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:22:43 +0000
Subject: [pkgdb] ocaml-preludeml: ocamlmaint has requested watchbugzilla
Message-ID: <20090119152244.08CD7208489@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchbugzilla acl on ocaml-preludeml (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-preludeml



From pkgdb at fedoraproject.org  Mon Jan 19 15:22:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:22:44 +0000
Subject: [pkgdb] ocaml-preludeml: ocamlmaint has requested watchcommits
Message-ID: <20090119152244.DF124208D5D@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchcommits acl on ocaml-preludeml (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-preludeml



From pkgdb at fedoraproject.org  Mon Jan 19 15:22:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:22:45 +0000
Subject: [pkgdb] ocaml-preludeml: ocamlmaint has requested watchbugzilla
Message-ID: <20090119152245.A1213208DDB@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchbugzilla acl on ocaml-preludeml (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-preludeml



From pkgdb at fedoraproject.org  Mon Jan 19 15:22:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:22:47 +0000
Subject: [pkgdb] ocaml-preludeml: ocamlmaint has requested watchcommits
Message-ID: <20090119152248.6D3EC208DDC@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchcommits acl on ocaml-preludeml (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-preludeml



From pkgdb at fedoraproject.org  Mon Jan 19 15:22:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:22:56 +0000
Subject: [pkgdb] ocaml-reins: ocamlmaint has requested watchbugzilla
Message-ID: <20090119152257.1F215208DDF@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchbugzilla acl on ocaml-reins (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-reins



From pkgdb at fedoraproject.org  Mon Jan 19 15:22:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:22:57 +0000
Subject: [pkgdb] ocaml-reins: ocamlmaint has requested watchcommits
Message-ID: <20090119152257.2C1E2208DE1@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchcommits acl on ocaml-reins (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-reins



From pkgdb at fedoraproject.org  Mon Jan 19 15:22:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:22:58 +0000
Subject: [pkgdb] ocaml-reins: ocamlmaint has requested watchbugzilla
Message-ID: <20090119152258.5040F208492@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchbugzilla acl on ocaml-reins (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-reins



From pkgdb at fedoraproject.org  Mon Jan 19 15:22:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:22:59 +0000
Subject: [pkgdb] ocaml-reins: ocamlmaint has requested watchcommits
Message-ID: <20090119152259.716A5208DE4@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchcommits acl on ocaml-reins (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-reins



From pkgdb at fedoraproject.org  Mon Jan 19 15:22:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:22:59 +0000
Subject: [pkgdb] ocaml-reins: ocamlmaint has requested watchbugzilla
Message-ID: <20090119152300.2BC69208DE7@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchbugzilla acl on ocaml-reins (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-reins



From pkgdb at fedoraproject.org  Mon Jan 19 15:23:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:23:02 +0000
Subject: [pkgdb] ocaml-reins: ocamlmaint has requested watchcommits
Message-ID: <20090119152302.26CCA208DEA@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchcommits acl on ocaml-reins (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-reins



From pkgdb at fedoraproject.org  Mon Jan 19 15:23:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:23:09 +0000
Subject: [pkgdb] ocaml-lwt: ocamlmaint has requested watchbugzilla
Message-ID: <20090119152309.4A532208494@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchbugzilla acl on ocaml-lwt (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-lwt



From pkgdb at fedoraproject.org  Mon Jan 19 15:23:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:23:10 +0000
Subject: [pkgdb] ocaml-lwt: ocamlmaint has requested watchbugzilla
Message-ID: <20090119152310.B508A208DEB@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchbugzilla acl 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  Mon Jan 19 15:23:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:23:11 +0000
Subject: [pkgdb] ocaml-lwt: ocamlmaint has requested watchcommits
Message-ID: <20090119152311.84E13208DEE@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchcommits acl on ocaml-lwt (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-lwt



From pkgdb at fedoraproject.org  Mon Jan 19 15:23:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:23:11 +0000
Subject: [pkgdb] ocaml-lwt: ocamlmaint has requested watchcommits
Message-ID: <20090119152311.9FA92208DF1@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchcommits acl 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  Mon Jan 19 15:23:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:23:12 +0000
Subject: [pkgdb] ocaml-lwt: ocamlmaint has requested watchbugzilla
Message-ID: <20090119152312.D7285208DF3@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchbugzilla acl on ocaml-lwt (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-lwt



From pkgdb at fedoraproject.org  Mon Jan 19 15:23:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:23:12 +0000
Subject: [pkgdb] ocaml-lwt: ocamlmaint has requested watchcommits
Message-ID: <20090119152312.F19F0208DF6@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchcommits acl on ocaml-lwt (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-lwt



From pkgdb at fedoraproject.org  Mon Jan 19 15:23:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:23:19 +0000
Subject: [pkgdb] ocaml-cmigrep: ocamlmaint has requested watchbugzilla
Message-ID: <20090119152319.380A9208DF8@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchbugzilla acl on ocaml-cmigrep (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-cmigrep



From pkgdb at fedoraproject.org  Mon Jan 19 15:23:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:23:20 +0000
Subject: [pkgdb] ocaml-cmigrep: ocamlmaint has requested watchcommits
Message-ID: <20090119152320.2A031208DFA@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchcommits acl on ocaml-cmigrep (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-cmigrep



From pkgdb at fedoraproject.org  Mon Jan 19 15:23:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:23:21 +0000
Subject: [pkgdb] ocaml-cmigrep: ocamlmaint has requested watchbugzilla
Message-ID: <20090119152322.09879208DFB@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchbugzilla acl on ocaml-cmigrep (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-cmigrep



From pkgdb at fedoraproject.org  Mon Jan 19 15:23:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:23:22 +0000
Subject: [pkgdb] ocaml-cmigrep: ocamlmaint has requested watchcommits
Message-ID: <20090119152322.B67CC208DFD@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchcommits acl on ocaml-cmigrep (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-cmigrep



From pkgdb at fedoraproject.org  Mon Jan 19 15:23:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:23:24 +0000
Subject: [pkgdb] ocaml-cmigrep: ocamlmaint has requested watchcommits
Message-ID: <20090119152324.92111208DFE@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchcommits acl on ocaml-cmigrep (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-cmigrep



From pkgdb at fedoraproject.org  Mon Jan 19 15:23:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:23:24 +0000
Subject: [pkgdb] ocaml-cmigrep: ocamlmaint has requested watchbugzilla
Message-ID: <20090119152324.B038F208E02@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchbugzilla acl on ocaml-cmigrep (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-cmigrep



From pkgdb at fedoraproject.org  Mon Jan 19 15:23:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:23:32 +0000
Subject: [pkgdb] ocaml-bisect: ocamlmaint has requested watchbugzilla
Message-ID: <20090119152332.EEF9E208E05@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchbugzilla acl on ocaml-bisect (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-bisect



From pkgdb at fedoraproject.org  Mon Jan 19 15:23:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:23:31 +0000
Subject: [pkgdb] ocaml-bisect: ocamlmaint has requested watchcommits
Message-ID: <20090119152331.19333208479@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchcommits acl on ocaml-bisect (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-bisect



From pkgdb at fedoraproject.org  Mon Jan 19 15:23:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:23:33 +0000
Subject: [pkgdb] ocaml-bisect: ocamlmaint has requested watchbugzilla
Message-ID: <20090119152334.66951208E08@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchbugzilla acl on ocaml-bisect (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-bisect



From pkgdb at fedoraproject.org  Mon Jan 19 15:23:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:23:33 +0000
Subject: [pkgdb] ocaml-bisect: ocamlmaint has requested watchcommits
Message-ID: <20090119152334.80D1F208E0B@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchcommits acl on ocaml-bisect (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-bisect



From pkgdb at fedoraproject.org  Mon Jan 19 15:23:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:23:34 +0000
Subject: [pkgdb] ocaml-bisect: ocamlmaint has requested watchcommits
Message-ID: <20090119152334.A7B85208E0F@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchcommits acl on ocaml-bisect (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-bisect



From pkgdb at fedoraproject.org  Mon Jan 19 15:23:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:23:39 +0000
Subject: [pkgdb] ocaml-bisect: ocamlmaint has requested watchbugzilla
Message-ID: <20090119152340.6B3C0208E12@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchbugzilla acl on ocaml-bisect (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-bisect



From pkgdb at fedoraproject.org  Mon Jan 19 15:23:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:23:47 +0000
Subject: [pkgdb] ocaml-mikmatch: ocamlmaint has requested watchcommits
Message-ID: <20090119152347.65005208E13@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchcommits acl on ocaml-mikmatch (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-mikmatch



From pkgdb at fedoraproject.org  Mon Jan 19 15:23:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:23:48 +0000
Subject: [pkgdb] ocaml-mikmatch: ocamlmaint has requested watchbugzilla
Message-ID: <20090119152349.2A3D2208E16@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchbugzilla acl on ocaml-mikmatch (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-mikmatch



From pkgdb at fedoraproject.org  Mon Jan 19 15:23:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:23:49 +0000
Subject: [pkgdb] ocaml-mikmatch: ocamlmaint has requested watchcommits
Message-ID: <20090119152349.69583208E1A@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchcommits acl on ocaml-mikmatch (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-mikmatch



From pkgdb at fedoraproject.org  Mon Jan 19 15:23:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:23:49 +0000
Subject: [pkgdb] ocaml-mikmatch: ocamlmaint has requested watchbugzilla
Message-ID: <20090119152349.D7B86208E1C@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchbugzilla acl on ocaml-mikmatch (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-mikmatch



From pkgdb at fedoraproject.org  Mon Jan 19 15:23:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:23:50 +0000
Subject: [pkgdb] ocaml-mikmatch: ocamlmaint has requested watchcommits
Message-ID: <20090119152350.A5F5C208E20@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchcommits acl on ocaml-mikmatch (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-mikmatch



From pkgdb at fedoraproject.org  Mon Jan 19 15:23:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:23:53 +0000
Subject: [pkgdb] ocaml-mikmatch: ocamlmaint has requested watchbugzilla
Message-ID: <20090119152353.5FAE8208E22@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchbugzilla acl on ocaml-mikmatch (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-mikmatch



From pkgdb at fedoraproject.org  Mon Jan 19 15:24:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:24:03 +0000
Subject: [pkgdb] ocaml-ocamlgraph: ocamlmaint has requested watchbugzilla
Message-ID: <20090119152403.6D6BD20847F@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchbugzilla acl on ocaml-ocamlgraph (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-ocamlgraph



From pkgdb at fedoraproject.org  Mon Jan 19 15:24:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:24:03 +0000
Subject: [pkgdb] ocaml-ocamlgraph: ocamlmaint has requested watchcommits
Message-ID: <20090119152403.96D46208748@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchcommits acl on ocaml-ocamlgraph (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-ocamlgraph



From pkgdb at fedoraproject.org  Mon Jan 19 15:24:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:24:04 +0000
Subject: [pkgdb] ocaml-ocamlgraph: ocamlmaint has requested watchbugzilla
Message-ID: <20090119152405.297C2208E25@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchbugzilla acl on ocaml-ocamlgraph (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-ocamlgraph



From pkgdb at fedoraproject.org  Mon Jan 19 15:24:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:24:05 +0000
Subject: [pkgdb] ocaml-ocamlgraph: ocamlmaint has requested watchcommits
Message-ID: <20090119152406.362B3208E2A@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchcommits acl on ocaml-ocamlgraph (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-ocamlgraph



From pkgdb at fedoraproject.org  Mon Jan 19 15:24:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:24:07 +0000
Subject: [pkgdb] ocaml-ocamlgraph: ocamlmaint has requested watchbugzilla
Message-ID: <20090119152407.DABD2208E2D@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchbugzilla acl on ocaml-ocamlgraph (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-ocamlgraph



From pkgdb at fedoraproject.org  Mon Jan 19 15:24:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:24:13 +0000
Subject: [pkgdb] ocaml-ocamlgraph: ocamlmaint has requested watchcommits
Message-ID: <20090119152413.1124C208472@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchcommits acl on ocaml-ocamlgraph (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-ocamlgraph



From pkgdb at fedoraproject.org  Mon Jan 19 15:24:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:24:58 +0000
Subject: [pkgdb] ocaml-bitstring: ocamlmaint has requested watchbugzilla
Message-ID: <20090119152458.F016D208486@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchbugzilla acl on ocaml-bitstring (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-bitstring



From pkgdb at fedoraproject.org  Mon Jan 19 15:25:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:25:00 +0000
Subject: [pkgdb] ocaml-bitstring: ocamlmaint has requested watchcommits
Message-ID: <20090119152500.05E4420896A@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchcommits acl on ocaml-bitstring (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-bitstring



From pkgdb at fedoraproject.org  Mon Jan 19 15:25:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:25:02 +0000
Subject: [pkgdb] ocaml-bitstring: ocamlmaint has requested watchbugzilla
Message-ID: <20090119152502.A6532208974@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchbugzilla acl on ocaml-bitstring (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-bitstring



From pkgdb at fedoraproject.org  Mon Jan 19 15:25:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:25:04 +0000
Subject: [pkgdb] ocaml-bitstring: ocamlmaint has requested watchcommits
Message-ID: <20090119152505.8AAEB208977@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchcommits acl on ocaml-bitstring (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-bitstring



From pkgdb at fedoraproject.org  Mon Jan 19 15:25:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:25:06 +0000
Subject: [pkgdb] ocaml-bitstring: ocamlmaint has requested watchbugzilla
Message-ID: <20090119152506.AF72D20897C@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchbugzilla acl on ocaml-bitstring (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-bitstring



From pkgdb at fedoraproject.org  Mon Jan 19 15:25:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:25:07 +0000
Subject: [pkgdb] ocaml-bitstring: ocamlmaint has requested watchcommits
Message-ID: <20090119152507.8CE91208A5F@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchcommits acl on ocaml-bitstring (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-bitstring



From pkgdb at fedoraproject.org  Mon Jan 19 15:25:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:25:16 +0000
Subject: [pkgdb] ocaml-deriving: ocamlmaint has requested watchbugzilla
Message-ID: <20090119152516.65D18208A61@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchbugzilla acl on ocaml-deriving (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-deriving



From pkgdb at fedoraproject.org  Mon Jan 19 15:25:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:25:16 +0000
Subject: [pkgdb] ocaml-deriving: ocamlmaint has requested watchcommits
Message-ID: <20090119152516.B9F30208E35@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchcommits acl on ocaml-deriving (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-deriving



From pkgdb at fedoraproject.org  Mon Jan 19 15:25:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:25:19 +0000
Subject: [pkgdb] ocaml-deriving: ocamlmaint has requested watchcommits
Message-ID: <20090119152519.821A5208E38@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchcommits acl on ocaml-deriving (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-deriving



From pkgdb at fedoraproject.org  Mon Jan 19 15:25:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:25:20 +0000
Subject: [pkgdb] ocaml-deriving: ocamlmaint has requested watchbugzilla
Message-ID: <20090119152520.E6DFA208E3B@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchbugzilla acl on ocaml-deriving (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-deriving



From pkgdb at fedoraproject.org  Mon Jan 19 15:25:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:25:21 +0000
Subject: [pkgdb] ocaml-deriving: ocamlmaint has requested watchbugzilla
Message-ID: <20090119152521.25EBD208E3E@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchbugzilla acl on ocaml-deriving (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-deriving



From pkgdb at fedoraproject.org  Mon Jan 19 15:25:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:25:25 +0000
Subject: [pkgdb] ocaml-deriving: ocamlmaint has requested watchcommits
Message-ID: <20090119152525.A6E43208E42@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchcommits acl on ocaml-deriving (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-deriving



From pkgdb at fedoraproject.org  Mon Jan 19 15:25:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:25:30 +0000
Subject: [pkgdb] ocaml-pa-monad: ocamlmaint has requested watchbugzilla
Message-ID: <20090119152530.EC914208D64@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchbugzilla acl on ocaml-pa-monad (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-pa-monad



From pkgdb at fedoraproject.org  Mon Jan 19 15:25:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:25:33 +0000
Subject: [pkgdb] ocaml-pa-monad: ocamlmaint has requested watchcommits
Message-ID: <20090119152533.4B271208DDB@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchcommits acl on ocaml-pa-monad (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-pa-monad



From pkgdb at fedoraproject.org  Mon Jan 19 15:25:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:25:37 +0000
Subject: [pkgdb] ocaml-pa-monad: ocamlmaint has requested watchbugzilla
Message-ID: <20090119152537.EB9E1208E45@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchbugzilla acl on ocaml-pa-monad (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-pa-monad



From pkgdb at fedoraproject.org  Mon Jan 19 15:25:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:25:38 +0000
Subject: [pkgdb] ocaml-pa-monad: ocamlmaint has requested watchcommits
Message-ID: <20090119152538.D90C020848B@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchcommits acl on ocaml-pa-monad (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-pa-monad



From pkgdb at fedoraproject.org  Mon Jan 19 15:25:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:25:41 +0000
Subject: [pkgdb] ocaml-pa-monad: ocamlmaint has requested watchbugzilla
Message-ID: <20090119152541.2EB96208E46@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchbugzilla acl on ocaml-pa-monad (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-pa-monad



From pkgdb at fedoraproject.org  Mon Jan 19 15:25:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:25:43 +0000
Subject: [pkgdb] ocaml-pa-monad: ocamlmaint has requested watchcommits
Message-ID: <20090119152543.8E817208E49@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchcommits acl on ocaml-pa-monad (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-pa-monad



From pkgdb at fedoraproject.org  Mon Jan 19 15:25:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:25:51 +0000
Subject: [pkgdb] ocaml-json-static: ocamlmaint has requested watchbugzilla
Message-ID: <20090119152551.9D4A7208DDE@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchbugzilla acl on ocaml-json-static (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-json-static



From pkgdb at fedoraproject.org  Mon Jan 19 15:25:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:25:52 +0000
Subject: [pkgdb] ocaml-json-static: ocamlmaint has requested watchcommits
Message-ID: <20090119152552.3C43F208E4A@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchcommits acl on ocaml-json-static (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-json-static



From pkgdb at fedoraproject.org  Mon Jan 19 15:25:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:25:54 +0000
Subject: [pkgdb] ocaml-json-static: ocamlmaint has requested watchbugzilla
Message-ID: <20090119152554.7E8E1208E4D@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchbugzilla acl on ocaml-json-static (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-json-static



From pkgdb at fedoraproject.org  Mon Jan 19 15:25:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:25:54 +0000
Subject: [pkgdb] ocaml-json-static: ocamlmaint has requested watchcommits
Message-ID: <20090119152554.9D32F208E50@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchcommits acl on ocaml-json-static (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-json-static



From pkgdb at fedoraproject.org  Mon Jan 19 15:25:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:25:55 +0000
Subject: [pkgdb] ocaml-json-static: ocamlmaint has requested watchbugzilla
Message-ID: <20090119152556.7A63B208E53@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchbugzilla acl on ocaml-json-static (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-json-static



From pkgdb at fedoraproject.org  Mon Jan 19 15:25:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:25:57 +0000
Subject: [pkgdb] ocaml-json-static: ocamlmaint has requested watchcommits
Message-ID: <20090119152557.8FA02208E56@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchcommits acl on ocaml-json-static (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-json-static



From pkgdb at fedoraproject.org  Mon Jan 19 15:26:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:26:08 +0000
Subject: [pkgdb] ocaml-res: ocamlmaint has requested watchbugzilla
Message-ID: <20090119152608.8794C208E59@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchbugzilla acl on ocaml-res (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-res



From pkgdb at fedoraproject.org  Mon Jan 19 15:26:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:26:08 +0000
Subject: [pkgdb] ocaml-res: ocamlmaint has requested watchbugzilla
Message-ID: <20090119152608.754E2208E58@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchbugzilla acl on ocaml-res (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-res



From pkgdb at fedoraproject.org  Mon Jan 19 15:26:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:26:10 +0000
Subject: [pkgdb] ocaml-res: ocamlmaint has requested watchcommits
Message-ID: <20090119152610.8B111208E5E@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchcommits acl on ocaml-res (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-res



From pkgdb at fedoraproject.org  Mon Jan 19 15:26:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:26:14 +0000
Subject: [pkgdb] ocaml-res: ocamlmaint has requested watchcommits
Message-ID: <20090119152615.5FD92208DE5@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchcommits acl on ocaml-res (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-res



From pkgdb at fedoraproject.org  Mon Jan 19 15:26:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:26:16 +0000
Subject: [pkgdb] ocaml-res: ocamlmaint has requested watchcommits
Message-ID: <20090119152617.1ABC6208E5F@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchcommits acl on ocaml-res (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-res



From pkgdb at fedoraproject.org  Mon Jan 19 15:26:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:26:17 +0000
Subject: [pkgdb] ocaml-res: ocamlmaint has requested watchbugzilla
Message-ID: <20090119152617.29D38208E63@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchbugzilla acl on ocaml-res (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-res



From pkgdb at fedoraproject.org  Mon Jan 19 15:26:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:26:27 +0000
Subject: [pkgdb] ocaml-ounit: ocamlmaint has requested watchbugzilla
Message-ID: <20090119152627.2FA40208DE8@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchbugzilla acl on ocaml-ounit (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-ounit



From pkgdb at fedoraproject.org  Mon Jan 19 15:26:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:26:27 +0000
Subject: [pkgdb] ocaml-ounit: ocamlmaint has requested watchcommits
Message-ID: <20090119152627.82F0A208E6D@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchcommits acl on ocaml-ounit (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-ounit



From pkgdb at fedoraproject.org  Mon Jan 19 15:26:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:26:28 +0000
Subject: [pkgdb] ocaml-ounit: ocamlmaint has requested watchbugzilla
Message-ID: <20090119152628.9E49A208E71@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchbugzilla acl on ocaml-ounit (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-ounit



From pkgdb at fedoraproject.org  Mon Jan 19 15:26:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:26:32 +0000
Subject: [pkgdb] ocaml-ounit: ocamlmaint has requested watchcommits
Message-ID: <20090119152633.04EFA208E74@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchcommits acl on ocaml-ounit (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-ounit



From pkgdb at fedoraproject.org  Mon Jan 19 15:26:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:26:33 +0000
Subject: [pkgdb] ocaml-ounit: ocamlmaint has requested watchbugzilla
Message-ID: <20090119152633.3DC01208E77@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchbugzilla acl on ocaml-ounit (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-ounit



From pkgdb at fedoraproject.org  Mon Jan 19 15:26:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:26:38 +0000
Subject: [pkgdb] ocaml-ounit: ocamlmaint has requested watchcommits
Message-ID: <20090119152638.13112208496@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchcommits acl on ocaml-ounit (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-ounit



From pkgdb at fedoraproject.org  Mon Jan 19 15:26:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:26:45 +0000
Subject: [pkgdb] ocaml-sexplib: ocamlmaint has requested watchbugzilla
Message-ID: <20090119152645.BBC2F208DEC@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchbugzilla acl on ocaml-sexplib (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-sexplib



From pkgdb at fedoraproject.org  Mon Jan 19 15:26:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:26:45 +0000
Subject: [pkgdb] ocaml-sexplib: ocamlmaint has requested watchcommits
Message-ID: <20090119152645.DDDA4208DF0@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchcommits acl on ocaml-sexplib (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-sexplib



From pkgdb at fedoraproject.org  Mon Jan 19 15:26:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:26:47 +0000
Subject: [pkgdb] ocaml-sexplib: ocamlmaint has requested watchbugzilla
Message-ID: <20090119152647.7870E208DF1@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchbugzilla acl on ocaml-sexplib (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-sexplib



From pkgdb at fedoraproject.org  Mon Jan 19 15:26:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:26:49 +0000
Subject: [pkgdb] ocaml-sexplib: ocamlmaint has requested watchbugzilla
Message-ID: <20090119152649.E51E3208E7C@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchbugzilla acl on ocaml-sexplib (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-sexplib



From pkgdb at fedoraproject.org  Mon Jan 19 15:26:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:26:50 +0000
Subject: [pkgdb] ocaml-sexplib: ocamlmaint has requested watchcommits
Message-ID: <20090119152650.73D14208E7F@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchcommits acl on ocaml-sexplib (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-sexplib



From pkgdb at fedoraproject.org  Mon Jan 19 15:26:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:26:51 +0000
Subject: [pkgdb] ocaml-sexplib: ocamlmaint has requested watchcommits
Message-ID: <20090119152651.61875208E83@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchcommits acl on ocaml-sexplib (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-sexplib



From akurtakov at fedoraproject.org  Mon Jan 19 15:26:56 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Mon, 19 Jan 2009 15:26:56 +0000 (UTC)
Subject: rpms/eclipse/devel eclipse-pdebuild.sh,1.11,1.12
Message-ID: <20090119152656.CEE14700F8@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/eclipse/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24585/devel

Modified Files:
	eclipse-pdebuild.sh 
Log Message:
Fix pdebuild to auto-set javacSouce based on BREE.


Index: eclipse-pdebuild.sh
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse-pdebuild.sh,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- eclipse-pdebuild.sh	15 Dec 2008 17:32:26 -0000	1.11
+++ eclipse-pdebuild.sh	19 Jan 2009 15:26:25 -0000	1.12
@@ -99,6 +99,26 @@
     featureVersion=$(ant -Dbasedir=$sourceDir -f $buildFile 2>&1 | grep echo | sed "s/.*\[echo\]\ //")
     rm $buildFile
 }
+
+function findMaxBREE {
+	manifests=$(find $sourceDir -name MANIFEST.MF)
+	maxBree=1.4
+	for i in $manifests; do
+		breeLine=$(cat $i|grep RequiredExecutionEnvironment|cut -c37-|sed 's/^ *\(.*\) *$/\1/')
+		case $breeLine in
+         "J2SE-1.5")
+         	 bree=1.5
+             ;;
+         "JavaSE-1.6")
+         	 bree=1.6
+             ;;
+     	esac
+     	if [ "$bree" \> "$maxBree" ]; then
+     		maxBree=$bree
+     	fi
+    done
+}
+
 sourceDir=$PWD
 buildDir=$PWD/build
 SDK=$buildDir/SDK
@@ -236,6 +256,10 @@
         thisURL=
     done
 fi
+if [ -z "$additionalArgs" ]; then
+	findMaxBREE
+	additionalArgs="-DjavacSource=$maxBree -DjavacTarget=$maxBree"
+fi
 
 echo "Starting build:"
 



From pkgdb at fedoraproject.org  Mon Jan 19 15:26:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:26:59 +0000
Subject: [pkgdb] ocaml-pgocaml: ocamlmaint has requested watchbugzilla
Message-ID: <20090119152659.A1A65208DF5@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchbugzilla acl on ocaml-pgocaml (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-pgocaml



From pkgdb at fedoraproject.org  Mon Jan 19 15:27:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:27:00 +0000
Subject: [pkgdb] ocaml-pgocaml: ocamlmaint has requested watchcommits
Message-ID: <20090119152700.CB288208E87@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchcommits acl on ocaml-pgocaml (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-pgocaml



From pkgdb at fedoraproject.org  Mon Jan 19 15:27:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:27:03 +0000
Subject: [pkgdb] ocaml-pgocaml: ocamlmaint has requested watchbugzilla
Message-ID: <20090119152703.ED43C208E8A@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchbugzilla acl on ocaml-pgocaml (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-pgocaml



From pkgdb at fedoraproject.org  Mon Jan 19 15:27:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:27:04 +0000
Subject: [pkgdb] ocaml-pgocaml: ocamlmaint has requested watchbugzilla
Message-ID: <20090119152704.1E784208E8D@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchbugzilla acl on ocaml-pgocaml (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-pgocaml



From pkgdb at fedoraproject.org  Mon Jan 19 15:27:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:27:04 +0000
Subject: [pkgdb] ocaml-pgocaml: ocamlmaint has requested watchcommits
Message-ID: <20090119152704.DD4B7208E91@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchcommits acl on ocaml-pgocaml (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-pgocaml



From pkgdb at fedoraproject.org  Mon Jan 19 15:27:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:27:05 +0000
Subject: [pkgdb] ocaml-pgocaml: ocamlmaint has requested watchcommits
Message-ID: <20090119152705.4684C208E94@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchcommits acl on ocaml-pgocaml (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-pgocaml



From pkgdb at fedoraproject.org  Mon Jan 19 15:27:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:27:12 +0000
Subject: [pkgdb] ocaml-augeas: ocamlmaint has requested watchcommits
Message-ID: <20090119152712.E8901208E95@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchcommits acl on ocaml-augeas (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-augeas



From pkgdb at fedoraproject.org  Mon Jan 19 15:27:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:27:12 +0000
Subject: [pkgdb] ocaml-augeas: ocamlmaint has requested watchbugzilla
Message-ID: <20090119152712.93AB1208DF6@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchbugzilla acl on ocaml-augeas (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-augeas



From pkgdb at fedoraproject.org  Mon Jan 19 15:27:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:27:14 +0000
Subject: [pkgdb] ocaml-augeas: ocamlmaint has requested watchbugzilla
Message-ID: <20090119152714.6F411208E98@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchbugzilla acl on ocaml-augeas (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-augeas



From pkgdb at fedoraproject.org  Mon Jan 19 15:27:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:27:14 +0000
Subject: [pkgdb] ocaml-augeas: ocamlmaint has requested watchcommits
Message-ID: <20090119152714.C0D04208E9B@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchcommits acl on ocaml-augeas (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-augeas



From pkgdb at fedoraproject.org  Mon Jan 19 15:27:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:27:15 +0000
Subject: [pkgdb] ocaml-augeas: ocamlmaint has requested watchbugzilla
Message-ID: <20090119152715.69657208E9E@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchbugzilla acl on ocaml-augeas (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-augeas



From pkgdb at fedoraproject.org  Mon Jan 19 15:27:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:27:16 +0000
Subject: [pkgdb] ocaml-augeas: ocamlmaint has requested watchcommits
Message-ID: <20090119152716.6A5C2208EA1@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchcommits acl on ocaml-augeas (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-augeas



From pkgdb at fedoraproject.org  Mon Jan 19 15:27:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:27:23 +0000
Subject: [pkgdb] ocaml-bitmatch: ocamlmaint has requested watchcommits
Message-ID: <20090119152724.639F6208DFA@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchcommits acl on ocaml-bitmatch (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-bitmatch



From pkgdb at fedoraproject.org  Mon Jan 19 15:27:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:27:25 +0000
Subject: [pkgdb] ocaml-bitmatch: ocamlmaint has requested watchbugzilla
Message-ID: <20090119152726.81737208EA4@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchbugzilla acl on ocaml-bitmatch (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-bitmatch



From pkgdb at fedoraproject.org  Mon Jan 19 15:27:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:27:26 +0000
Subject: [pkgdb] ocaml-bitmatch: ocamlmaint has requested watchbugzilla
Message-ID: <20090119152726.B68A5208EA7@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchbugzilla acl on ocaml-bitmatch (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-bitmatch



From pkgdb at fedoraproject.org  Mon Jan 19 15:27:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:27:27 +0000
Subject: [pkgdb] ocaml-bitmatch: ocamlmaint has requested watchcommits
Message-ID: <20090119152727.AE3B3208EAA@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchcommits acl on ocaml-bitmatch (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-bitmatch



From pkgdb at fedoraproject.org  Mon Jan 19 15:27:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:27:28 +0000
Subject: [pkgdb] ocaml-bitmatch: ocamlmaint has requested watchbugzilla
Message-ID: <20090119152728.6FD84208EAD@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchbugzilla acl on ocaml-bitmatch (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-bitmatch



From pkgdb at fedoraproject.org  Mon Jan 19 15:27:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:27:28 +0000
Subject: [pkgdb] ocaml-bitmatch: ocamlmaint has requested watchcommits
Message-ID: <20090119152729.383A2208EB0@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchcommits acl on ocaml-bitmatch (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-bitmatch



From pkgdb at fedoraproject.org  Mon Jan 19 15:27:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:27:42 +0000
Subject: [pkgdb] ocaml-gettext: ocamlmaint has requested watchcommits
Message-ID: <20090119152742.196B9208DFF@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchcommits acl on ocaml-gettext (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-gettext



From pkgdb at fedoraproject.org  Mon Jan 19 15:27:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:27:43 +0000
Subject: [pkgdb] ocaml-gettext: ocamlmaint has requested watchbugzilla
Message-ID: <20090119152743.C8E61208E02@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchbugzilla acl on ocaml-gettext (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-gettext



From pkgdb at fedoraproject.org  Mon Jan 19 15:27:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:27:47 +0000
Subject: [pkgdb] ocaml-gettext: ocamlmaint has requested watchcommits
Message-ID: <20090119152747.3E6E3208EB2@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchcommits acl on ocaml-gettext (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-gettext



From pkgdb at fedoraproject.org  Mon Jan 19 15:27:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:27:50 +0000
Subject: [pkgdb] ocaml-gettext: ocamlmaint has requested watchbugzilla
Message-ID: <20090119152750.BA2FB208EB4@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchbugzilla acl on ocaml-gettext (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-gettext



From pkgdb at fedoraproject.org  Mon Jan 19 15:27:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:27:50 +0000
Subject: [pkgdb] ocaml-gettext: ocamlmaint has requested watchcommits
Message-ID: <20090119152750.CBD71208EB7@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchcommits acl on ocaml-gettext (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-gettext



From pkgdb at fedoraproject.org  Mon Jan 19 15:27:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:27:38 +0000
Subject: [pkgdb] ocaml-gettext: ocamlmaint has requested watchbugzilla
Message-ID: <20090119152739.07A54208DFC@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchbugzilla acl on ocaml-gettext (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-gettext



From pkgdb at fedoraproject.org  Mon Jan 19 15:28:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:28:05 +0000
Subject: [pkgdb] ocaml-gsl: ocamlmaint has requested watchbugzilla
Message-ID: <20090119152806.19CFE208E07@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchbugzilla acl on ocaml-gsl (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-gsl



From pkgdb at fedoraproject.org  Mon Jan 19 15:28:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:28:06 +0000
Subject: [pkgdb] ocaml-gsl: ocamlmaint has requested watchcommits
Message-ID: <20090119152806.9B2F4208E0A@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchcommits acl on ocaml-gsl (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-gsl



From pkgdb at fedoraproject.org  Mon Jan 19 15:28:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:28:07 +0000
Subject: [pkgdb] ocaml-gsl: ocamlmaint has requested watchcommits
Message-ID: <20090119152808.47564208EBC@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchcommits acl on ocaml-gsl (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-gsl



From pkgdb at fedoraproject.org  Mon Jan 19 15:28:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:28:07 +0000
Subject: [pkgdb] ocaml-gsl: ocamlmaint has requested watchbugzilla
Message-ID: <20090119152808.559B0208EBD@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchbugzilla acl on ocaml-gsl (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-gsl



From pkgdb at fedoraproject.org  Mon Jan 19 15:28:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:28:09 +0000
Subject: [pkgdb] ocaml-gsl: ocamlmaint has requested watchcommits
Message-ID: <20090119152810.09A74208EC0@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchcommits acl on ocaml-gsl (Fedora EPEL 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-gsl



From pkgdb at fedoraproject.org  Mon Jan 19 15:28:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:28:10 +0000
Subject: [pkgdb] ocaml-gsl: ocamlmaint has requested watchcommits
Message-ID: <20090119152810.A740E208EC4@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchcommits acl on ocaml-gsl (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-gsl



From pkgdb at fedoraproject.org  Mon Jan 19 15:28:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:28:10 +0000
Subject: [pkgdb] ocaml-gsl: ocamlmaint has requested watchbugzilla
Message-ID: <20090119152811.7763C208EC6@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchbugzilla acl on ocaml-gsl (Fedora EPEL 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-gsl



From pkgdb at fedoraproject.org  Mon Jan 19 15:28:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:28:12 +0000
Subject: [pkgdb] ocaml-gsl: ocamlmaint has requested watchbugzilla
Message-ID: <20090119152812.66EF5208EC9@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchbugzilla acl on ocaml-gsl (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-gsl



From pkgdb at fedoraproject.org  Mon Jan 19 15:28:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:28:13 +0000
Subject: [pkgdb] ocaml-gsl: ocamlmaint has requested watchbugzilla
Message-ID: <20090119152813.3456C208ECC@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchbugzilla acl on ocaml-gsl (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-gsl



From pkgdb at fedoraproject.org  Mon Jan 19 15:28:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:28:14 +0000
Subject: [pkgdb] ocaml-gsl: ocamlmaint has requested watchcommits
Message-ID: <20090119152814.E5791208ECF@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchcommits acl on ocaml-gsl (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-gsl



From akurtakov at fedoraproject.org  Mon Jan 19 15:28:25 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Mon, 19 Jan 2009 15:28:25 +0000 (UTC)
Subject: rpms/eclipse/devel eclipse.spec,1.615,1.616
Message-ID: <20090119152825.7903A700F8@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/eclipse/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24691/devel

Modified Files:
	eclipse.spec 
Log Message:
Fix pdebuild to auto-set javacSouce based on BREE.


Index: eclipse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.615
retrieving revision 1.616
diff -u -r1.615 -r1.616
--- eclipse.spec	19 Dec 2008 17:44:14 -0000	1.615
+++ eclipse.spec	19 Jan 2009 15:27:54 -0000	1.616
@@ -30,7 +30,7 @@
 Summary:        An open, extensible IDE
 Name:           eclipse
 Version:        %{eclipse_majmin}.%{eclipse_micro}
-Release:        12%{?dist}
+Release:        13%{?dist}
 License:        EPL
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
@@ -1567,6 +1567,9 @@
 #%{_libdir}/%{name}/configuration/org.eclipse.equinox.source
 
 %changelog
+* Mon Jan 19 2009 Alexander Kurtakov <akurtako at redhat.com> 1:3.4.1-13
+- Fix pdebuild to auto-set javacSouce based on BREE.
+
 * Fri Dec 19 2008 Andrew Overholt <overholt at redhat.com> 1:3.4.1-12
 - Fixed GCJ AOT compilation (Gary Benson).
 



From pkgdb at fedoraproject.org  Mon Jan 19 15:28:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:28:37 +0000
Subject: [pkgdb] ocaml-omake: ocamlmaint has requested watchcommits
Message-ID: <20090119152837.AF07D208700@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchcommits acl on ocaml-omake (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-omake



From pkgdb at fedoraproject.org  Mon Jan 19 15:28:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:28:38 +0000
Subject: [pkgdb] ocaml-omake: ocamlmaint has requested watchcommits
Message-ID: <20090119152838.BFF5F208E0B@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchcommits acl on ocaml-omake (Fedora EPEL 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-omake



From pkgdb at fedoraproject.org  Mon Jan 19 15:28:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:28:39 +0000
Subject: [pkgdb] ocaml-omake: ocamlmaint has requested watchbugzilla
Message-ID: <20090119152839.288AB208E0F@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchbugzilla acl on ocaml-omake (Fedora EPEL 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-omake



From pkgdb at fedoraproject.org  Mon Jan 19 15:28:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:28:43 +0000
Subject: [pkgdb] ocaml-omake: ocamlmaint has requested watchbugzilla
Message-ID: <20090119152843.13D26208E12@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchbugzilla acl on ocaml-omake (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-omake



From pkgdb at fedoraproject.org  Mon Jan 19 15:28:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:28:43 +0000
Subject: [pkgdb] ocaml-omake: ocamlmaint has requested watchbugzilla
Message-ID: <20090119152843.AE3BB208E15@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchbugzilla acl on ocaml-omake (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-omake



From pkgdb at fedoraproject.org  Mon Jan 19 15:28:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:28:43 +0000
Subject: [pkgdb] ocaml-omake: ocamlmaint has requested watchcommits
Message-ID: <20090119152843.D6556208ED2@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchcommits acl on ocaml-omake (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-omake



From pkgdb at fedoraproject.org  Mon Jan 19 15:28:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:28:45 +0000
Subject: [pkgdb] ocaml-omake: ocamlmaint has requested watchbugzilla
Message-ID: <20090119152845.5A353208ED6@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchbugzilla acl on ocaml-omake (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-omake



From pkgdb at fedoraproject.org  Mon Jan 19 15:28:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:28:45 +0000
Subject: [pkgdb] ocaml-omake: ocamlmaint has requested watchcommits
Message-ID: <20090119152845.E9217208EDA@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchcommits acl on ocaml-omake (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-omake



From pkgdb at fedoraproject.org  Mon Jan 19 15:28:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:28:48 +0000
Subject: [pkgdb] ocaml-omake: ocamlmaint has requested watchbugzilla
Message-ID: <20090119152848.85D88208EDC@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchbugzilla acl on ocaml-omake (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-omake



From pkgdb at fedoraproject.org  Mon Jan 19 15:28:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:28:49 +0000
Subject: [pkgdb] ocaml-omake: ocamlmaint has requested watchcommits
Message-ID: <20090119152850.889BB20873F@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchcommits acl on ocaml-omake (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-omake



From pkgdb at fedoraproject.org  Mon Jan 19 15:28:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:28:56 +0000
Subject: [pkgdb] ocaml-openin: ocamlmaint has requested watchbugzilla
Message-ID: <20090119152857.0CB98208EDE@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchbugzilla acl on ocaml-openin (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-openin



From pkgdb at fedoraproject.org  Mon Jan 19 15:28:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:28:58 +0000
Subject: [pkgdb] ocaml-openin: ocamlmaint has requested watchcommits
Message-ID: <20090119152858.3E5EB208EE1@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchcommits acl on ocaml-openin (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-openin



From pkgdb at fedoraproject.org  Mon Jan 19 15:28:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:28:59 +0000
Subject: [pkgdb] ocaml-openin: ocamlmaint has requested watchbugzilla
Message-ID: <20090119152859.9C826208EE3@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchbugzilla acl on ocaml-openin (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-openin



From pkgdb at fedoraproject.org  Mon Jan 19 15:29:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:29:01 +0000
Subject: [pkgdb] ocaml-openin: ocamlmaint has requested watchcommits
Message-ID: <20090119152901.2E712208EE4@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchcommits acl on ocaml-openin (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-openin



From pkgdb at fedoraproject.org  Mon Jan 19 15:29:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:29:01 +0000
Subject: [pkgdb] ocaml-openin: ocamlmaint has requested watchbugzilla
Message-ID: <20090119152901.D7DE1208EE5@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchbugzilla acl on ocaml-openin (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-openin



From pkgdb at fedoraproject.org  Mon Jan 19 15:29:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:29:02 +0000
Subject: [pkgdb] ocaml-openin: ocamlmaint has requested watchcommits
Message-ID: <20090119152903.E3DD9208EE6@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchcommits acl on ocaml-openin (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-openin



From pkgdb at fedoraproject.org  Mon Jan 19 15:29:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:29:08 +0000
Subject: [pkgdb] ocaml-type-conv: ocamlmaint has requested watchbugzilla
Message-ID: <20090119152908.50DD7208EEC@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchbugzilla acl on ocaml-type-conv (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-type-conv



From pkgdb at fedoraproject.org  Mon Jan 19 15:29:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:29:08 +0000
Subject: [pkgdb] ocaml-type-conv: ocamlmaint has requested watchcommits
Message-ID: <20090119152908.D5E4C208EEF@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchcommits acl on ocaml-type-conv (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-type-conv



From pkgdb at fedoraproject.org  Mon Jan 19 15:29:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:29:13 +0000
Subject: [pkgdb] ocaml-type-conv: ocamlmaint has requested watchbugzilla
Message-ID: <20090119152914.26A21208E20@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchbugzilla acl on ocaml-type-conv (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-type-conv



From pkgdb at fedoraproject.org  Mon Jan 19 15:29:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:29:14 +0000
Subject: [pkgdb] ocaml-type-conv: ocamlmaint has requested watchbugzilla
Message-ID: <20090119152914.BEF6D208EF3@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchbugzilla acl on ocaml-type-conv (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-type-conv



From pkgdb at fedoraproject.org  Mon Jan 19 15:29:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:29:15 +0000
Subject: [pkgdb] ocaml-type-conv: ocamlmaint has requested watchcommits
Message-ID: <20090119152915.71E7C208EF6@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchcommits acl on ocaml-type-conv (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-type-conv



From pkgdb at fedoraproject.org  Mon Jan 19 15:29:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:29:16 +0000
Subject: [pkgdb] ocaml-type-conv: ocamlmaint has requested watchcommits
Message-ID: <20090119152916.C9074208EF9@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchcommits acl on ocaml-type-conv (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-type-conv



From pkgdb at fedoraproject.org  Mon Jan 19 15:29:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:29:38 +0000
Subject: [pkgdb] ocaml-facile: ocamlmaint has requested watchbugzilla
Message-ID: <20090119152938.EFFD4208E23@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchbugzilla acl on ocaml-facile (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-facile



From pkgdb at fedoraproject.org  Mon Jan 19 15:29:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:29:40 +0000
Subject: [pkgdb] ocaml-facile: ocamlmaint has requested watchcommits
Message-ID: <20090119152941.363C4208E26@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchcommits acl on ocaml-facile (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-facile



From pkgdb at fedoraproject.org  Mon Jan 19 15:29:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:29:43 +0000
Subject: [pkgdb] ocaml-facile: ocamlmaint has requested watchbugzilla
Message-ID: <20090119152943.EA344208EFB@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchbugzilla acl on ocaml-facile (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-facile



From pkgdb at fedoraproject.org  Mon Jan 19 15:29:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:29:44 +0000
Subject: [pkgdb] ocaml-facile: ocamlmaint has requested watchcommits
Message-ID: <20090119152945.4EAEF208EFF@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchcommits acl on ocaml-facile (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-facile



From pkgdb at fedoraproject.org  Mon Jan 19 15:29:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:29:47 +0000
Subject: [pkgdb] ocaml-facile: ocamlmaint has requested watchbugzilla
Message-ID: <20090119152947.2BA2F208E2A@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchbugzilla acl on ocaml-facile (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-facile



From pkgdb at fedoraproject.org  Mon Jan 19 15:29:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:29:49 +0000
Subject: [pkgdb] ocaml-facile: ocamlmaint has requested watchcommits
Message-ID: <20090119152950.E9948208F00@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchcommits acl on ocaml-facile (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-facile



From pkgdb at fedoraproject.org  Mon Jan 19 15:29:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:29:58 +0000
Subject: [pkgdb] ocaml-camomile: ocamlmaint has requested watchbugzilla
Message-ID: <20090119152958.D8C4C208E2D@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchbugzilla acl on ocaml-camomile (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-camomile



From pkgdb at fedoraproject.org  Mon Jan 19 15:30:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:30:02 +0000
Subject: [pkgdb] ocaml-camomile: ocamlmaint has requested watchbugzilla
Message-ID: <20090119153002.8D5B1208F06@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchbugzilla acl on ocaml-camomile (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-camomile



From pkgdb at fedoraproject.org  Mon Jan 19 15:30:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:30:01 +0000
Subject: [pkgdb] ocaml-camomile: ocamlmaint has requested watchcommits
Message-ID: <20090119153002.3EF66208F03@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchcommits acl on ocaml-camomile (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-camomile



From pkgdb at fedoraproject.org  Mon Jan 19 15:30:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:30:04 +0000
Subject: [pkgdb] ocaml-camomile: ocamlmaint has requested watchcommits
Message-ID: <20090119153006.115F3208F0A@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchcommits acl on ocaml-camomile (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-camomile



From pkgdb at fedoraproject.org  Mon Jan 19 15:30:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:30:07 +0000
Subject: [pkgdb] ocaml-camomile: ocamlmaint has requested watchbugzilla
Message-ID: <20090119153007.ABE8C208F0C@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchbugzilla acl on ocaml-camomile (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-camomile



From pkgdb at fedoraproject.org  Mon Jan 19 15:30:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:30:08 +0000
Subject: [pkgdb] ocaml-camomile: ocamlmaint has requested watchcommits
Message-ID: <20090119153008.EAF47208F11@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchcommits acl on ocaml-camomile (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-camomile



From pkgdb at fedoraproject.org  Mon Jan 19 15:30:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:30:08 +0000
Subject: [pkgdb] ocaml-camomile: ocamlmaint has requested watchcommits
Message-ID: <20090119153008.ADF6B208F0E@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchcommits acl on ocaml-camomile (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-camomile



From pkgdb at fedoraproject.org  Mon Jan 19 15:30:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:30:13 +0000
Subject: [pkgdb] ocaml-newt: ocamlmaint has requested watchbugzilla
Message-ID: <20090119153013.C92D8208F16@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchbugzilla acl on ocaml-newt (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-newt



From pkgdb at fedoraproject.org  Mon Jan 19 15:30:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:30:17 +0000
Subject: [pkgdb] ocaml-newt: ocamlmaint has requested watchcommits
Message-ID: <20090119153017.40A0F208F1C@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchcommits acl on ocaml-newt (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-newt



From pkgdb at fedoraproject.org  Mon Jan 19 15:30:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:30:17 +0000
Subject: [pkgdb] ocaml-newt: ocamlmaint has requested watchbugzilla
Message-ID: <20090119153017.C0174208F1F@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchbugzilla acl on ocaml-newt (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-newt



From pkgdb at fedoraproject.org  Mon Jan 19 15:30:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:30:18 +0000
Subject: [pkgdb] ocaml-newt: ocamlmaint has requested watchcommits
Message-ID: <20090119153018.5CE22208F24@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchcommits acl on ocaml-newt (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-newt



From pkgdb at fedoraproject.org  Mon Jan 19 15:30:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:30:20 +0000
Subject: [pkgdb] ocaml-newt: ocamlmaint has requested watchbugzilla
Message-ID: <20090119153020.AB1C8208F21@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchbugzilla acl on ocaml-newt (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-newt



From pkgdb at fedoraproject.org  Mon Jan 19 15:30:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:30:21 +0000
Subject: [pkgdb] ocaml-newt: ocamlmaint has requested watchcommits
Message-ID: <20090119153021.5B142208482@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchcommits acl on ocaml-newt (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-newt



From pkgdb at fedoraproject.org  Mon Jan 19 15:30:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:30:29 +0000
Subject: [pkgdb] ocaml-json-wheel: ocamlmaint has requested watchbugzilla
Message-ID: <20090119153029.C107D208F27@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchbugzilla acl on ocaml-json-wheel (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-json-wheel



From pkgdb at fedoraproject.org  Mon Jan 19 15:30:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:30:31 +0000
Subject: [pkgdb] ocaml-json-wheel: ocamlmaint has requested watchbugzilla
Message-ID: <20090119153031.75BCD208771@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchbugzilla acl on ocaml-json-wheel (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-json-wheel



From pkgdb at fedoraproject.org  Mon Jan 19 15:30:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:30:34 +0000
Subject: [pkgdb] ocaml-json-wheel: ocamlmaint has requested watchbugzilla
Message-ID: <20090119153034.9E62C208F2B@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchbugzilla acl on ocaml-json-wheel (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-json-wheel



From pkgdb at fedoraproject.org  Mon Jan 19 15:30:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:30:34 +0000
Subject: [pkgdb] ocaml-json-wheel: ocamlmaint has requested watchcommits
Message-ID: <20090119153034.B4401208F2C@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchcommits acl on ocaml-json-wheel (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-json-wheel



From pkgdb at fedoraproject.org  Mon Jan 19 15:30:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:30:36 +0000
Subject: [pkgdb] ocaml-json-wheel: ocamlmaint has requested watchcommits
Message-ID: <20090119153037.0623920896A@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchcommits acl on ocaml-json-wheel (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-json-wheel



From pkgdb at fedoraproject.org  Mon Jan 19 15:30:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:30:37 +0000
Subject: [pkgdb] ocaml-json-wheel: ocamlmaint has requested watchcommits
Message-ID: <20090119153037.56DE7208F32@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchcommits acl on ocaml-json-wheel (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-json-wheel



From pkgdb at fedoraproject.org  Mon Jan 19 15:30:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:30:46 +0000
Subject: [pkgdb] ocaml-camlidl: ocamlmaint has requested watchcommits
Message-ID: <20090119153046.8CF22208977@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchcommits acl on ocaml-camlidl (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-camlidl



From pkgdb at fedoraproject.org  Mon Jan 19 15:30:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:30:46 +0000
Subject: [pkgdb] ocaml-camlidl: ocamlmaint has requested watchbugzilla
Message-ID: <20090119153046.C23AF208F34@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchbugzilla acl on ocaml-camlidl (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-camlidl



From pkgdb at fedoraproject.org  Mon Jan 19 15:30:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:30:49 +0000
Subject: [pkgdb] ocaml-camlidl: ocamlmaint has requested watchcommits
Message-ID: <20090119153049.69284208F3C@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchcommits acl on ocaml-camlidl (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-camlidl



From pkgdb at fedoraproject.org  Mon Jan 19 15:30:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:30:49 +0000
Subject: [pkgdb] ocaml-camlidl: ocamlmaint has requested watchbugzilla
Message-ID: <20090119153049.5DEB4208F39@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchbugzilla acl on ocaml-camlidl (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-camlidl



From pkgdb at fedoraproject.org  Mon Jan 19 15:30:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:30:49 +0000
Subject: [pkgdb] ocaml-camlidl: ocamlmaint has requested watchbugzilla
Message-ID: <20090119153049.90BA9208F3F@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchbugzilla acl on ocaml-camlidl (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-camlidl



From pkgdb at fedoraproject.org  Mon Jan 19 15:30:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:30:51 +0000
Subject: [pkgdb] ocaml-camlidl: ocamlmaint has requested watchcommits
Message-ID: <20090119153051.BEF51208F42@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchcommits acl on ocaml-camlidl (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-camlidl



From pkgdb at fedoraproject.org  Mon Jan 19 15:31:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:31:18 +0000
Subject: [pkgdb] ocaml-lacaml: ocamlmaint has requested watchbugzilla
Message-ID: <20090119153118.8DF58208489@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchbugzilla acl on ocaml-lacaml (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-lacaml



From pkgdb at fedoraproject.org  Mon Jan 19 15:31:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:31:19 +0000
Subject: [pkgdb] ocaml-lacaml: ocamlmaint has requested watchbugzilla
Message-ID: <20090119153119.41C28208E30@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchbugzilla acl on ocaml-lacaml (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-lacaml



From pkgdb at fedoraproject.org  Mon Jan 19 15:31:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:31:20 +0000
Subject: [pkgdb] ocaml-lacaml: ocamlmaint has requested watchcommits
Message-ID: <20090119153120.43859208E34@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchcommits acl on ocaml-lacaml (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-lacaml



From pkgdb at fedoraproject.org  Mon Jan 19 15:31:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:31:23 +0000
Subject: [pkgdb] ocaml-lacaml: ocamlmaint has requested watchcommits
Message-ID: <20090119153123.9DE39300002@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchcommits acl on ocaml-lacaml (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-lacaml



From pkgdb at fedoraproject.org  Mon Jan 19 15:31:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:31:24 +0000
Subject: [pkgdb] ocaml-lacaml: ocamlmaint has requested watchcommits
Message-ID: <20090119153124.AC5E7300008@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchcommits acl on ocaml-lacaml (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-lacaml



From pkgdb at fedoraproject.org  Mon Jan 19 15:31:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:31:23 +0000
Subject: [pkgdb] ocaml-lacaml: ocamlmaint has requested watchbugzilla
Message-ID: <20090119153123.D37C7300007@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchbugzilla acl on ocaml-lacaml (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-lacaml



From pkgdb at fedoraproject.org  Mon Jan 19 15:31:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:31:34 +0000
Subject: [pkgdb] ocaml-mysql: ocamlmaint has requested watchbugzilla
Message-ID: <20090119153134.CB3CD208E36@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchbugzilla acl on ocaml-mysql (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-mysql



From pkgdb at fedoraproject.org  Mon Jan 19 15:31:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:31:35 +0000
Subject: [pkgdb] ocaml-mysql: ocamlmaint has requested watchcommits
Message-ID: <20090119153135.11099208F47@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchcommits acl on ocaml-mysql (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-mysql



From pkgdb at fedoraproject.org  Mon Jan 19 15:31:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:31:38 +0000
Subject: [pkgdb] ocaml-mysql: ocamlmaint has requested watchbugzilla
Message-ID: <20090119153138.8BE97208E3B@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchbugzilla acl on ocaml-mysql (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-mysql



From pkgdb at fedoraproject.org  Mon Jan 19 15:31:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:31:38 +0000
Subject: [pkgdb] ocaml-mysql: ocamlmaint has requested watchcommits
Message-ID: <20090119153138.AB56330000B@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchcommits acl on ocaml-mysql (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-mysql



From pkgdb at fedoraproject.org  Mon Jan 19 15:31:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:31:44 +0000
Subject: [pkgdb] ocaml-postgresql: ocamlmaint has requested watchbugzilla
Message-ID: <20090119153144.9FA05208F49@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchbugzilla acl on ocaml-postgresql (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-postgresql



From pkgdb at fedoraproject.org  Mon Jan 19 15:31:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:31:47 +0000
Subject: [pkgdb] ocaml-postgresql: ocamlmaint has requested watchbugzilla
Message-ID: <20090119153147.5CD0A30000F@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchbugzilla acl on ocaml-postgresql (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-postgresql



From pkgdb at fedoraproject.org  Mon Jan 19 15:31:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:31:47 +0000
Subject: [pkgdb] ocaml-postgresql: ocamlmaint has requested watchcommits
Message-ID: <20090119153147.9DC9E300011@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchcommits acl on ocaml-postgresql (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-postgresql



From pkgdb at fedoraproject.org  Mon Jan 19 15:31:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:31:45 +0000
Subject: [pkgdb] ocaml-mysql: ocamlmaint has requested watchbugzilla
Message-ID: <20090119153151.AC7B1208F4A@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchbugzilla acl on ocaml-mysql (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-mysql



From pkgdb at fedoraproject.org  Mon Jan 19 15:31:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:31:50 +0000
Subject: [pkgdb] ocaml-postgresql: ocamlmaint has requested watchcommits
Message-ID: <20090119153150.B92E5208E41@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchcommits acl on ocaml-postgresql (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-postgresql



From pkgdb at fedoraproject.org  Mon Jan 19 15:31:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:31:55 +0000
Subject: [pkgdb] ocaml-mysql: ocamlmaint has requested watchcommits
Message-ID: <20090119153159.E0C64208D1F@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchcommits acl on ocaml-mysql (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-mysql



From pkgdb at fedoraproject.org  Mon Jan 19 15:32:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:32:05 +0000
Subject: [pkgdb] ocaml-postgresql: ocamlmaint has requested watchcommits
Message-ID: <20090119153205.89A7A208E42@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchcommits acl on ocaml-postgresql (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-postgresql



From pkgdb at fedoraproject.org  Mon Jan 19 15:32:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:32:05 +0000
Subject: [pkgdb] ocaml-xmlrpc-light: ocamlmaint has requested watchbugzilla
Message-ID: <20090119153205.D37AC208F4F@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchbugzilla acl on ocaml-xmlrpc-light (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-xmlrpc-light



From pkgdb at fedoraproject.org  Mon Jan 19 15:32:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:32:06 +0000
Subject: [pkgdb] ocaml-xmlrpc-light: ocamlmaint has requested watchbugzilla
Message-ID: <20090119153206.BD2A2300013@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchbugzilla acl on ocaml-xmlrpc-light (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-xmlrpc-light



From pkgdb at fedoraproject.org  Mon Jan 19 15:32:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:32:08 +0000
Subject: [pkgdb] ocaml-xmlrpc-light: ocamlmaint has requested watchcommits
Message-ID: <20090119153208.AB174300018@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchcommits acl on ocaml-xmlrpc-light (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-xmlrpc-light



From pkgdb at fedoraproject.org  Mon Jan 19 15:32:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:32:08 +0000
Subject: [pkgdb] ocaml-postgresql: ocamlmaint has requested watchbugzilla
Message-ID: <20090119153211.402D8300017@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchbugzilla acl on ocaml-postgresql (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-postgresql



From pkgdb at fedoraproject.org  Mon Jan 19 15:32:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:32:11 +0000
Subject: [pkgdb] ocaml-xmlrpc-light: ocamlmaint has requested watchcommits
Message-ID: <20090119153212.2451430001D@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchcommits acl on ocaml-xmlrpc-light (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-xmlrpc-light



From pkgdb at fedoraproject.org  Mon Jan 19 15:32:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:32:11 +0000
Subject: [pkgdb] ocaml-xmlrpc-light: ocamlmaint has requested watchcommits
Message-ID: <20090119153217.61817208DDC@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchcommits acl on ocaml-xmlrpc-light (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-xmlrpc-light



From pkgdb at fedoraproject.org  Mon Jan 19 15:32:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:32:18 +0000
Subject: [pkgdb] ocaml-xmlrpc-light: ocamlmaint has requested watchbugzilla
Message-ID: <20090119153218.818F630001A@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchbugzilla acl on ocaml-xmlrpc-light (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-xmlrpc-light



From pkgdb at fedoraproject.org  Mon Jan 19 15:32:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:32:24 +0000
Subject: [pkgdb] ocaml-perl4caml: ocamlmaint has requested watchbugzilla
Message-ID: <20090119153224.80D7220848C@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchbugzilla acl on ocaml-perl4caml (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-perl4caml



From pkgdb at fedoraproject.org  Mon Jan 19 15:32:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:32:25 +0000
Subject: [pkgdb] ocaml-perl4caml: ocamlmaint has requested watchbugzilla
Message-ID: <20090119153225.314D7208F52@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchbugzilla acl on ocaml-perl4caml (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-perl4caml



From pkgdb at fedoraproject.org  Mon Jan 19 15:32:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:32:30 +0000
Subject: [pkgdb] ocaml-perl4caml: ocamlmaint has requested watchcommits
Message-ID: <20090119153230.DC19B30001F@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchcommits acl on ocaml-perl4caml (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-perl4caml



From pkgdb at fedoraproject.org  Mon Jan 19 15:32:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:32:31 +0000
Subject: [pkgdb] ocaml-perl4caml: ocamlmaint has requested watchcommits
Message-ID: <20090119153231.C0B0F300025@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchcommits acl on ocaml-perl4caml (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-perl4caml



From pkgdb at fedoraproject.org  Mon Jan 19 15:32:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:32:31 +0000
Subject: [pkgdb] ocaml-perl4caml: ocamlmaint has requested watchbugzilla
Message-ID: <20090119153231.91A38300022@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchbugzilla acl on ocaml-perl4caml (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-perl4caml



From pkgdb at fedoraproject.org  Mon Jan 19 15:32:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:32:31 +0000
Subject: [pkgdb] ocaml-perl4caml: ocamlmaint has requested watchcommits
Message-ID: <20090119153235.EB2F9208E47@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchcommits acl on ocaml-perl4caml (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-perl4caml



From dwalsh at fedoraproject.org  Mon Jan 19 15:32:45 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Mon, 19 Jan 2009 15:32:45 +0000 (UTC)
Subject: rpms/setroubleshoot/devel setroubleshoot.spec,1.112,1.113
Message-ID: <20090119153245.D4F0C700F8@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/setroubleshoot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25538

Modified Files:
	setroubleshoot.spec 
Log Message:
* Fri Jan 16 2009 Dan Walsh <dwalsh at redhat.com> - 2.1.1-1
- Switch to C Based applet
- Use dbus for messaging.  Only run setroubleshoot when 



Index: setroubleshoot.spec
===================================================================
RCS file: /cvs/extras/rpms/setroubleshoot/devel/setroubleshoot.spec,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -r1.112 -r1.113
--- setroubleshoot.spec	19 Jan 2009 14:42:47 -0000	1.112
+++ setroubleshoot.spec	19 Jan 2009 15:32:15 -0000	1.113
@@ -10,7 +10,7 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: perl-XML-Parser
 BuildRequires: intltool gettext python
-BuildRequires: desktop-file-utils dbus-devel
+BuildRequires: desktop-file-utils dbus-devel gtk2-devel
 Requires: %{name}-server = %{version}-%{release} 
 Requires: %{name}-plugins >= 2.0.4
 Requires: pygtk2 >= 2.9.2



From pkgdb at fedoraproject.org  Mon Jan 19 15:32:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:32:46 +0000
Subject: [pkgdb] ocamldsort: ocamlmaint has requested watchbugzilla
Message-ID: <20090119153246.E292B208E4A@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchbugzilla acl on ocamldsort (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocamldsort



From pkgdb at fedoraproject.org  Mon Jan 19 15:32:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:32:48 +0000
Subject: [pkgdb] ocamldsort: ocamlmaint has requested watchbugzilla
Message-ID: <20090119153248.C2308300028@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchbugzilla acl on ocamldsort (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocamldsort



From pkgdb at fedoraproject.org  Mon Jan 19 15:32:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:32:49 +0000
Subject: [pkgdb] ocamldsort: ocamlmaint has requested watchcommits
Message-ID: <20090119153249.E76EE30002B@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchcommits acl on ocamldsort (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocamldsort



From pkgdb at fedoraproject.org  Mon Jan 19 15:32:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:32:52 +0000
Subject: [pkgdb] ocamldsort: ocamlmaint has requested watchcommits
Message-ID: <20090119153252.EB671208F55@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchcommits acl on ocamldsort (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocamldsort



From pkgdb at fedoraproject.org  Mon Jan 19 15:32:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:32:53 +0000
Subject: [pkgdb] ocamldsort: ocamlmaint has requested watchcommits
Message-ID: <20090119153253.88EBB208F58@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchcommits acl on ocamldsort (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocamldsort



From pkgdb at fedoraproject.org  Mon Jan 19 15:33:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:33:00 +0000
Subject: [pkgdb] ocaml-pxp: ocamlmaint has requested watchcommits
Message-ID: <20090119153300.36684208E4D@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchcommits acl on ocaml-pxp (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-pxp



From pkgdb at fedoraproject.org  Mon Jan 19 15:33:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:33:00 +0000
Subject: [pkgdb] ocaml-pxp: ocamlmaint has requested watchbugzilla
Message-ID: <20090119153300.81B9B208F59@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchbugzilla acl on ocaml-pxp (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-pxp



From pkgdb at fedoraproject.org  Mon Jan 19 15:33:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:33:01 +0000
Subject: [pkgdb] ocaml-pxp: ocamlmaint has requested watchcommits
Message-ID: <20090119153301.4A6BE30002C@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchcommits acl on ocaml-pxp (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-pxp



From pkgdb at fedoraproject.org  Mon Jan 19 15:33:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:33:01 +0000
Subject: [pkgdb] ocaml-pxp: ocamlmaint has requested watchbugzilla
Message-ID: <20090119153301.57E1830002F@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchbugzilla acl on ocaml-pxp (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-pxp



From pkgdb at fedoraproject.org  Mon Jan 19 15:33:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:33:01 +0000
Subject: [pkgdb] ocaml-pxp: ocamlmaint has requested watchbugzilla
Message-ID: <20090119153301.69D29300032@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchbugzilla acl on ocaml-pxp (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-pxp



From pkgdb at fedoraproject.org  Mon Jan 19 15:33:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:33:02 +0000
Subject: [pkgdb] ocaml-pxp: ocamlmaint has requested watchcommits
Message-ID: <20090119153302.B4788300035@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchcommits acl on ocaml-pxp (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-pxp



From pkgdb at fedoraproject.org  Mon Jan 19 15:33:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:33:08 +0000
Subject: [pkgdb] ocaml-cairo: ocamlmaint has requested watchcommits
Message-ID: <20090119153308.A8A9C208F5C@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchcommits acl on ocaml-cairo (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-cairo



From pkgdb at fedoraproject.org  Mon Jan 19 15:33:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:33:09 +0000
Subject: [pkgdb] ocaml-cairo: ocamlmaint has requested watchbugzilla
Message-ID: <20090119153309.A8DB6300037@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchbugzilla acl on ocaml-cairo (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-cairo



From pkgdb at fedoraproject.org  Mon Jan 19 15:33:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:33:10 +0000
Subject: [pkgdb] ocaml-cairo: ocamlmaint has requested watchcommits
Message-ID: <20090119153310.2F17930003A@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchcommits acl on ocaml-cairo (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-cairo



From pkgdb at fedoraproject.org  Mon Jan 19 15:32:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:32:44 +0000
Subject: [pkgdb] ocamldsort: ocamlmaint has requested watchbugzilla
Message-ID: <20090119153244.365C0208E49@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchbugzilla acl on ocamldsort (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocamldsort



From pkgdb at fedoraproject.org  Mon Jan 19 15:33:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:33:10 +0000
Subject: [pkgdb] ocaml-cairo: ocamlmaint has requested watchbugzilla
Message-ID: <20090119153310.62A4430003D@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchbugzilla acl on ocaml-cairo (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-cairo



From pkgdb at fedoraproject.org  Mon Jan 19 15:33:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:33:11 +0000
Subject: [pkgdb] ocaml-cairo: ocamlmaint has requested watchbugzilla
Message-ID: <20090119153311.B500B300040@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchbugzilla acl on ocaml-cairo (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-cairo



From pkgdb at fedoraproject.org  Mon Jan 19 15:33:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:33:14 +0000
Subject: [pkgdb] ocaml-cairo: ocamlmaint has requested watchcommits
Message-ID: <20090119153314.CCFEB300043@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchcommits acl on ocaml-cairo (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-cairo



From pkgdb at fedoraproject.org  Mon Jan 19 15:33:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:33:16 +0000
Subject: [pkgdb] ocaml-sqlite: ocamlmaint has requested watchbugzilla
Message-ID: <20090119153317.51C00300045@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchbugzilla acl on ocaml-sqlite (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-sqlite



From pkgdb at fedoraproject.org  Mon Jan 19 15:33:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:33:17 +0000
Subject: [pkgdb] ocaml-sqlite: ocamlmaint has requested watchcommits
Message-ID: <20090119153317.5DC3D300048@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchcommits acl on ocaml-sqlite (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-sqlite



From pkgdb at fedoraproject.org  Mon Jan 19 15:33:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:33:18 +0000
Subject: [pkgdb] ocaml-sqlite: ocamlmaint has requested watchbugzilla
Message-ID: <20090119153318.63C27208F5E@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchbugzilla acl on ocaml-sqlite (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-sqlite



From pkgdb at fedoraproject.org  Mon Jan 19 15:33:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:33:22 +0000
Subject: [pkgdb] ocaml-sqlite: ocamlmaint has requested watchcommits
Message-ID: <20090119153323.0B2FC208F5F@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchcommits acl on ocaml-sqlite (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-sqlite



From pkgdb at fedoraproject.org  Mon Jan 19 15:33:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:33:23 +0000
Subject: [pkgdb] ocaml-sqlite: ocamlmaint has requested watchbugzilla
Message-ID: <20090119153323.61AA630004E@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchbugzilla acl on ocaml-sqlite (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-sqlite



From pkgdb at fedoraproject.org  Mon Jan 19 15:33:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:33:29 +0000
Subject: [pkgdb] ocaml-camlp5: ocamlmaint has requested watchbugzilla
Message-ID: <20090119153330.08EF8208DE2@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchbugzilla acl on ocaml-camlp5 (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-camlp5



From pkgdb at fedoraproject.org  Mon Jan 19 15:33:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:33:30 +0000
Subject: [pkgdb] ocaml-camlp5: ocamlmaint has requested watchcommits
Message-ID: <20090119153330.B82D3300050@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchcommits acl on ocaml-camlp5 (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-camlp5



From pkgdb at fedoraproject.org  Mon Jan 19 15:33:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:33:32 +0000
Subject: [pkgdb] ocaml-camlp5: ocamlmaint has requested watchcommits
Message-ID: <20090119153333.41CE030005D@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchcommits acl on ocaml-camlp5 (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-camlp5



From pkgdb at fedoraproject.org  Mon Jan 19 15:33:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:33:32 +0000
Subject: [pkgdb] ocaml-camlp5: ocamlmaint has requested watchcommits
Message-ID: <20090119153333.379FF30005B@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchcommits acl on ocaml-camlp5 (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-camlp5



From pkgdb at fedoraproject.org  Mon Jan 19 15:33:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:33:33 +0000
Subject: [pkgdb] ocaml-camlp5: ocamlmaint has requested watchbugzilla
Message-ID: <20090119153333.BA91730005F@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchbugzilla acl on ocaml-camlp5 (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-camlp5



From pkgdb at fedoraproject.org  Mon Jan 19 15:33:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:33:31 +0000
Subject: [pkgdb] ocaml-sqlite: ocamlmaint has requested watchcommits
Message-ID: <20090119153337.AA348300061@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchcommits acl on ocaml-sqlite (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-sqlite



From pkgdb at fedoraproject.org  Mon Jan 19 15:33:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:33:42 +0000
Subject: [pkgdb] ocaml-cil: ocamlmaint has requested watchcommits
Message-ID: <20090119153342.8DD1C300064@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchcommits acl on ocaml-cil (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-cil



From pkgdb at fedoraproject.org  Mon Jan 19 15:33:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:33:42 +0000
Subject: [pkgdb] ocaml-cil: ocamlmaint has requested watchbugzilla
Message-ID: <20090119153342.BCC54300067@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchbugzilla acl on ocaml-cil (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-cil



From pkgdb at fedoraproject.org  Mon Jan 19 15:33:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:33:44 +0000
Subject: [pkgdb] ocaml-cil: ocamlmaint has requested watchbugzilla
Message-ID: <20090119153345.1B0F730006A@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchbugzilla acl on ocaml-cil (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-cil



From pkgdb at fedoraproject.org  Mon Jan 19 15:33:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:33:45 +0000
Subject: [pkgdb] ocaml-cil: ocamlmaint has requested watchcommits
Message-ID: <20090119153345.9C80B30006D@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchcommits acl on ocaml-cil (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-cil



From pkgdb at fedoraproject.org  Mon Jan 19 15:33:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:33:47 +0000
Subject: [pkgdb] ocaml-cil: ocamlmaint has requested watchbugzilla
Message-ID: <20090119153348.018B4208E5A@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchbugzilla acl on ocaml-cil (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-cil



From pkgdb at fedoraproject.org  Mon Jan 19 15:33:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:33:49 +0000
Subject: [pkgdb] ocaml-cil: ocamlmaint has requested watchcommits
Message-ID: <20090119153350.4448130006F@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchcommits acl on ocaml-cil (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-cil



From pkgdb at fedoraproject.org  Mon Jan 19 15:33:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:33:30 +0000
Subject: [pkgdb] ocaml-camlp5: ocamlmaint has requested watchbugzilla
Message-ID: <20090119153330.C6AC4300054@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchbugzilla acl on ocaml-camlp5 (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-camlp5



From pkgdb at fedoraproject.org  Mon Jan 19 15:35:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:35:22 +0000
Subject: [pkgdb] ocaml-zip: ocamlmaint has requested watchbugzilla
Message-ID: <20090119153522.E618C30008B@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchbugzilla acl on ocaml-zip (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-zip



From pkgdb at fedoraproject.org  Mon Jan 19 15:35:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:35:22 +0000
Subject: [pkgdb] ocaml-zip: ocamlmaint has requested watchcommits
Message-ID: <20090119153523.0021F30008D@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchcommits acl on ocaml-zip (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-zip



From pkgdb at fedoraproject.org  Mon Jan 19 15:35:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:35:23 +0000
Subject: [pkgdb] ocaml-zip: ocamlmaint has requested watchbugzilla
Message-ID: <20090119153523.4A8C9300090@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchbugzilla acl on ocaml-zip (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-zip



From pkgdb at fedoraproject.org  Mon Jan 19 15:35:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:35:24 +0000
Subject: [pkgdb] ocaml-zip: ocamlmaint has requested watchcommits
Message-ID: <20090119153526.A3E42300096@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchcommits acl on ocaml-zip (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-zip



From pkgdb at fedoraproject.org  Mon Jan 19 15:35:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:35:25 +0000
Subject: [pkgdb] ocaml-zip: ocamlmaint has requested watchbugzilla
Message-ID: <20090119153526.0412B300095@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchbugzilla acl on ocaml-zip (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-zip



From pkgdb at fedoraproject.org  Mon Jan 19 15:35:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:35:29 +0000
Subject: [pkgdb] ocaml-zip: ocamlmaint has requested watchcommits
Message-ID: <20090119153529.8379D30009B@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchcommits acl on ocaml-zip (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-zip



From pkgdb at fedoraproject.org  Mon Jan 19 15:35:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:35:36 +0000
Subject: [pkgdb] ocaml-fileutils: ocamlmaint has requested watchbugzilla
Message-ID: <20090119153536.9561530009F@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchbugzilla acl on ocaml-fileutils (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-fileutils



From pkgdb at fedoraproject.org  Mon Jan 19 15:35:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:35:36 +0000
Subject: [pkgdb] ocaml-fileutils: ocamlmaint has requested watchcommits
Message-ID: <20090119153536.C87B73000A2@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchcommits acl on ocaml-fileutils (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-fileutils



From pkgdb at fedoraproject.org  Mon Jan 19 15:35:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:35:38 +0000
Subject: [pkgdb] ocaml-fileutils: ocamlmaint has requested watchbugzilla
Message-ID: <20090119153538.890583000A5@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchbugzilla acl on ocaml-fileutils (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-fileutils



From pkgdb at fedoraproject.org  Mon Jan 19 15:35:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:35:38 +0000
Subject: [pkgdb] ocaml-fileutils: ocamlmaint has requested watchcommits
Message-ID: <20090119153539.526643000A8@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchcommits acl on ocaml-fileutils (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-fileutils



From pkgdb at fedoraproject.org  Mon Jan 19 15:35:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:35:40 +0000
Subject: [pkgdb] ocaml-fileutils: ocamlmaint has requested watchbugzilla
Message-ID: <20090119153542.1D9713000AB@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchbugzilla acl on ocaml-fileutils (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-fileutils



From pkgdb at fedoraproject.org  Mon Jan 19 15:35:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:35:44 +0000
Subject: [pkgdb] ocaml-fileutils: ocamlmaint has requested watchcommits
Message-ID: <20090119153544.E3FBA3000AE@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchcommits acl on ocaml-fileutils (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-fileutils



From pkgdb at fedoraproject.org  Mon Jan 19 15:35:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:35:51 +0000
Subject: [pkgdb] ocaml-cryptokit: ocamlmaint has requested watchbugzilla
Message-ID: <20090119153551.7492B3000B2@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchbugzilla acl on ocaml-cryptokit (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-cryptokit



From pkgdb at fedoraproject.org  Mon Jan 19 15:35:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:35:52 +0000
Subject: [pkgdb] ocaml-cryptokit: ocamlmaint has requested watchcommits
Message-ID: <20090119153552.C862E3000B4@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchcommits acl on ocaml-cryptokit (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-cryptokit



From pkgdb at fedoraproject.org  Mon Jan 19 15:35:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:35:53 +0000
Subject: [pkgdb] ocaml-cryptokit: ocamlmaint has requested watchbugzilla
Message-ID: <20090119153553.CB7D33000B8@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchbugzilla acl on ocaml-cryptokit (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-cryptokit



From pkgdb at fedoraproject.org  Mon Jan 19 15:35:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:35:55 +0000
Subject: [pkgdb] ocaml-cryptokit: ocamlmaint has requested watchcommits
Message-ID: <20090119153555.9DCB53000BC@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchcommits acl on ocaml-cryptokit (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-cryptokit



From pkgdb at fedoraproject.org  Mon Jan 19 15:35:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:35:55 +0000
Subject: [pkgdb] ocaml-cryptokit: ocamlmaint has requested watchbugzilla
Message-ID: <20090119153555.D44323000BF@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchbugzilla acl on ocaml-cryptokit (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-cryptokit



From pkgdb at fedoraproject.org  Mon Jan 19 15:35:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:35:57 +0000
Subject: [pkgdb] ocaml-cryptokit: ocamlmaint has requested watchcommits
Message-ID: <20090119153557.6247B208DEF@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchcommits acl on ocaml-cryptokit (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-cryptokit



From pkgdb at fedoraproject.org  Mon Jan 19 15:36:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:36:04 +0000
Subject: [pkgdb] ocaml-dbus: ocamlmaint has requested watchcommits
Message-ID: <20090119153604.EB7F83000C3@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchcommits acl on ocaml-dbus (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-dbus



From pkgdb at fedoraproject.org  Mon Jan 19 15:36:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:36:06 +0000
Subject: [pkgdb] ocaml-dbus: ocamlmaint has requested watchbugzilla
Message-ID: <20090119153606.61FD03000C7@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchbugzilla acl on ocaml-dbus (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-dbus



From pkgdb at fedoraproject.org  Mon Jan 19 15:36:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:36:07 +0000
Subject: [pkgdb] ocaml-dbus: ocamlmaint has requested watchbugzilla
Message-ID: <20090119153607.EE7933000C9@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchbugzilla acl on ocaml-dbus (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-dbus



From pkgdb at fedoraproject.org  Mon Jan 19 15:36:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:36:07 +0000
Subject: [pkgdb] ocaml-dbus: ocamlmaint has requested watchcommits
Message-ID: <20090119153608.BE8E03000CE@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchcommits acl on ocaml-dbus (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-dbus



From pkgdb at fedoraproject.org  Mon Jan 19 15:36:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:36:09 +0000
Subject: [pkgdb] ocaml-dbus: ocamlmaint has requested watchbugzilla
Message-ID: <20090119153609.460633000D1@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchbugzilla acl on ocaml-dbus (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-dbus



From pkgdb at fedoraproject.org  Mon Jan 19 15:36:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:36:10 +0000
Subject: [pkgdb] ocaml-dbus: ocamlmaint has requested watchcommits
Message-ID: <20090119153610.2DC183000D6@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchcommits acl on ocaml-dbus (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-dbus



From pkgdb at fedoraproject.org  Mon Jan 19 15:36:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:36:17 +0000
Subject: [pkgdb] ocaml-ocamlnet: ocamlmaint has requested watchbugzilla
Message-ID: <20090119153618.852E83000DA@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchbugzilla acl on ocaml-ocamlnet (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-ocamlnet



From pkgdb at fedoraproject.org  Mon Jan 19 15:36:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:36:21 +0000
Subject: [pkgdb] ocaml-ocamlnet: ocamlmaint has requested watchcommits
Message-ID: <20090119153621.6B0E33000DB@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchcommits acl on ocaml-ocamlnet (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-ocamlnet



From pkgdb at fedoraproject.org  Mon Jan 19 15:36:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:36:23 +0000
Subject: [pkgdb] ocaml-ocamlnet: ocamlmaint has requested watchbugzilla
Message-ID: <20090119153623.ADFE93000E1@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchbugzilla acl on ocaml-ocamlnet (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-ocamlnet



From pkgdb at fedoraproject.org  Mon Jan 19 15:36:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:36:24 +0000
Subject: [pkgdb] ocaml-ocamlnet: ocamlmaint has requested watchcommits
Message-ID: <20090119153624.3585F3000E5@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchcommits acl on ocaml-ocamlnet (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-ocamlnet



From pkgdb at fedoraproject.org  Mon Jan 19 15:36:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:36:28 +0000
Subject: [pkgdb] ocaml-ocamlnet: ocamlmaint has requested watchbugzilla
Message-ID: <20090119153628.D3E6D3000EA@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchbugzilla acl on ocaml-ocamlnet (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-ocamlnet



From pkgdb at fedoraproject.org  Mon Jan 19 15:36:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:36:29 +0000
Subject: [pkgdb] ocaml-ocamlnet: ocamlmaint has requested watchcommits
Message-ID: <20090119153629.E57183000F1@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchcommits acl on ocaml-ocamlnet (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-ocamlnet



From pkgdb at fedoraproject.org  Mon Jan 19 15:36:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:36:29 +0000
Subject: [pkgdb] ocaml-ocamlnet: ocamlmaint has given up watchbugzilla
Message-ID: <20090119153629.EA0E43000F2@bastion.fedora.phx.redhat.com>

ocamlmaint has given up the watchbugzilla acl on ocaml-ocamlnet (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-ocamlnet



From pkgdb at fedoraproject.org  Mon Jan 19 15:36:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:36:29 +0000
Subject: [pkgdb] ocaml-ocamlnet: ocamlmaint has given up watchcommits
Message-ID: <20090119153630.0EF1E3000F6@bastion.fedora.phx.redhat.com>

ocamlmaint has given up the watchcommits acl on ocaml-ocamlnet (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-ocamlnet



From pkgdb at fedoraproject.org  Mon Jan 19 15:36:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:36:32 +0000
Subject: [pkgdb] ocaml-ocamlnet: ocamlmaint has requested watchbugzilla
Message-ID: <20090119153632.87A363000FA@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchbugzilla acl on ocaml-ocamlnet (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-ocamlnet



From pkgdb at fedoraproject.org  Mon Jan 19 15:36:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:36:37 +0000
Subject: [pkgdb] ocaml-ocamlnet: ocamlmaint has requested watchcommits
Message-ID: <20090119153639.658C2300101@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchcommits acl on ocaml-ocamlnet (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-ocamlnet



From pkgdb at fedoraproject.org  Mon Jan 19 15:36:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:36:51 +0000
Subject: [pkgdb] ocaml-xml-light: ocamlmaint has requested watchbugzilla
Message-ID: <20090119153651.DD21A208DF4@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchbugzilla acl on ocaml-xml-light (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-xml-light



From pkgdb at fedoraproject.org  Mon Jan 19 15:36:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:36:52 +0000
Subject: [pkgdb] ocaml-xml-light: ocamlmaint has requested watchbugzilla
Message-ID: <20090119153653.2A4EA300104@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchbugzilla acl on ocaml-xml-light (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-xml-light



From pkgdb at fedoraproject.org  Mon Jan 19 15:36:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:36:53 +0000
Subject: [pkgdb] ocaml-xml-light: ocamlmaint has requested watchbugzilla
Message-ID: <20090119153653.53C2E300106@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchbugzilla acl on ocaml-xml-light (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-xml-light



From pkgdb at fedoraproject.org  Mon Jan 19 15:36:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:36:55 +0000
Subject: [pkgdb] ocaml-xml-light: ocamlmaint has requested watchcommits
Message-ID: <20090119153656.5037E300109@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchcommits acl on ocaml-xml-light (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-xml-light



From pkgdb at fedoraproject.org  Mon Jan 19 15:36:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:36:55 +0000
Subject: [pkgdb] ocaml-xml-light: ocamlmaint has requested watchcommits
Message-ID: <20090119153657.3552730010C@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchcommits acl on ocaml-xml-light (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-xml-light



From pkgdb at fedoraproject.org  Mon Jan 19 15:36:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:36:56 +0000
Subject: [pkgdb] ocaml-xml-light: ocamlmaint has requested watchbugzilla
Message-ID: <20090119153657.B772530010F@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchbugzilla acl on ocaml-xml-light (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-xml-light



From pkgdb at fedoraproject.org  Mon Jan 19 15:36:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:36:56 +0000
Subject: [pkgdb] ocaml-xml-light: ocamlmaint has requested watchcommits
Message-ID: <20090119153657.F0EFB300112@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchcommits acl on ocaml-xml-light (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-xml-light



From pkgdb at fedoraproject.org  Mon Jan 19 15:37:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:37:02 +0000
Subject: [pkgdb] ocaml-xml-light: ocamlmaint has requested watchcommits
Message-ID: <20090119153703.0702D300115@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchcommits acl on ocaml-xml-light (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-xml-light



From pkgdb at fedoraproject.org  Mon Jan 19 15:37:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:37:05 +0000
Subject: [pkgdb] ocaml-libvirt: ocamlmaint has requested watchcommits
Message-ID: <20090119153705.9AF46300118@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchcommits acl on ocaml-libvirt (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-libvirt



From pkgdb at fedoraproject.org  Mon Jan 19 15:37:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:37:05 +0000
Subject: [pkgdb] ocaml-libvirt: ocamlmaint has requested watchbugzilla
Message-ID: <20090119153705.F0EBA30011B@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchbugzilla acl on ocaml-libvirt (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-libvirt



From pkgdb at fedoraproject.org  Mon Jan 19 15:37:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:37:12 +0000
Subject: [pkgdb] ocaml-libvirt: ocamlmaint has requested watchcommits
Message-ID: <20090119153712.2F959300122@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchcommits acl on ocaml-libvirt (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-libvirt



From pkgdb at fedoraproject.org  Mon Jan 19 15:37:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:37:11 +0000
Subject: [pkgdb] ocaml-libvirt: ocamlmaint has requested watchbugzilla
Message-ID: <20090119153712.6BEB8300124@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchbugzilla acl on ocaml-libvirt (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-libvirt



From pkgdb at fedoraproject.org  Mon Jan 19 15:37:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:37:14 +0000
Subject: [pkgdb] ocaml-libvirt: ocamlmaint has requested watchbugzilla
Message-ID: <20090119153714.1FB78300127@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchbugzilla acl on ocaml-libvirt (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-libvirt



From pkgdb at fedoraproject.org  Mon Jan 19 15:37:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:37:15 +0000
Subject: [pkgdb] ocaml-libvirt: ocamlmaint has requested watchcommits
Message-ID: <20090119153717.01BAF208DF6@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchcommits acl on ocaml-libvirt (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-libvirt



From pkgdb at fedoraproject.org  Mon Jan 19 15:37:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:37:17 +0000
Subject: [pkgdb] ocaml-libvirt: ocamlmaint has requested watchbugzilla
Message-ID: <20090119153717.9CA6930012B@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchbugzilla acl on ocaml-libvirt (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-libvirt



From pkgdb at fedoraproject.org  Mon Jan 19 15:37:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:37:19 +0000
Subject: [pkgdb] ocaml-libvirt: ocamlmaint has requested watchcommits
Message-ID: <20090119153719.3EB5130012E@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchcommits acl on ocaml-libvirt (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-libvirt



From pkgdb at fedoraproject.org  Mon Jan 19 15:37:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:37:32 +0000
Subject: [pkgdb] ocaml-curses: ocamlmaint has requested watchbugzilla
Message-ID: <20090119153732.A3406300130@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchbugzilla acl on ocaml-curses (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-curses



From pkgdb at fedoraproject.org  Mon Jan 19 15:37:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:37:34 +0000
Subject: [pkgdb] ocaml-curses: ocamlmaint has requested watchbugzilla
Message-ID: <20090119153734.339EB300135@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchbugzilla acl on ocaml-curses (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-curses



From pkgdb at fedoraproject.org  Mon Jan 19 15:37:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:37:34 +0000
Subject: [pkgdb] ocaml-curses: ocamlmaint has requested watchbugzilla
Message-ID: <20090119153734.838D730013B@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchbugzilla acl on ocaml-curses (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-curses



From pkgdb at fedoraproject.org  Mon Jan 19 15:37:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:37:33 +0000
Subject: [pkgdb] ocaml-curses: ocamlmaint has requested watchcommits
Message-ID: <20090119153734.A7C3B30013C@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchcommits acl on ocaml-curses (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-curses



From pkgdb at fedoraproject.org  Mon Jan 19 15:37:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:37:35 +0000
Subject: [pkgdb] ocaml-curses: ocamlmaint has requested watchcommits
Message-ID: <20090119153735.C4C8930013F@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchcommits acl on ocaml-curses (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-curses



From pkgdb at fedoraproject.org  Mon Jan 19 15:37:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:37:34 +0000
Subject: [pkgdb] ocaml-curses: ocamlmaint has requested watchcommits
Message-ID: <20090119153734.5F183300138@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchcommits acl on ocaml-curses (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-curses



From pkgdb at fedoraproject.org  Mon Jan 19 15:37:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:37:36 +0000
Subject: [pkgdb] ocaml-curses: ocamlmaint has requested watchbugzilla
Message-ID: <20090119153736.8F265300142@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchbugzilla acl on ocaml-curses (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-curses



From pkgdb at fedoraproject.org  Mon Jan 19 15:37:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:37:37 +0000
Subject: [pkgdb] ocaml-curses: ocamlmaint has requested watchcommits
Message-ID: <20090119153737.730D7300145@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchcommits acl on ocaml-curses (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-curses



From pkgdb at fedoraproject.org  Mon Jan 19 15:37:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:37:45 +0000
Subject: [pkgdb] ocaml-csv: ocamlmaint has requested watchbugzilla
Message-ID: <20090119153745.3863030014A@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchbugzilla acl on ocaml-csv (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-csv



From pkgdb at fedoraproject.org  Mon Jan 19 15:37:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:37:46 +0000
Subject: [pkgdb] ocaml-csv: ocamlmaint has requested watchcommits
Message-ID: <20090119153746.1D21730014D@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchcommits acl on ocaml-csv (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-csv



From pkgdb at fedoraproject.org  Mon Jan 19 15:37:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:37:50 +0000
Subject: [pkgdb] ocaml-csv: ocamlmaint has requested watchbugzilla
Message-ID: <20090119153750.2D4FD300150@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchbugzilla acl on ocaml-csv (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-csv



From pkgdb at fedoraproject.org  Mon Jan 19 15:37:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:37:50 +0000
Subject: [pkgdb] ocaml-csv: ocamlmaint has requested watchcommits
Message-ID: <20090119153750.5ADF3300153@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchcommits acl on ocaml-csv (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-csv



From pkgdb at fedoraproject.org  Mon Jan 19 15:37:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:37:53 +0000
Subject: [pkgdb] ocaml-csv: ocamlmaint has requested watchcommits
Message-ID: <20090119153754.77FCE300157@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchcommits acl on ocaml-csv (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-csv



From pkgdb at fedoraproject.org  Mon Jan 19 15:37:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:37:59 +0000
Subject: [pkgdb] ocaml-csv: ocamlmaint has requested watchbugzilla
Message-ID: <20090119153759.1FFA430015F@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchbugzilla acl on ocaml-csv (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-csv



From pkgdb at fedoraproject.org  Mon Jan 19 15:38:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:38:02 +0000
Subject: [pkgdb] ocaml-csv: ocamlmaint has requested watchcommits
Message-ID: <20090119153803.14D98208DF8@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchcommits acl on ocaml-csv (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-csv



From pkgdb at fedoraproject.org  Mon Jan 19 15:38:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:38:11 +0000
Subject: [pkgdb] ocaml-calendar: ocamlmaint has requested watchbugzilla
Message-ID: <20090119153811.B6307300163@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchbugzilla acl on ocaml-calendar (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-calendar



From pkgdb at fedoraproject.org  Mon Jan 19 15:38:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:38:17 +0000
Subject: [pkgdb] ocaml-calendar: ocamlmaint has requested watchbugzilla
Message-ID: <20090119153818.4849930016B@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchbugzilla acl on ocaml-calendar (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-calendar



From pkgdb at fedoraproject.org  Mon Jan 19 15:38:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:38:17 +0000
Subject: [pkgdb] ocaml-calendar: ocamlmaint has requested watchcommits
Message-ID: <20090119153818.53E4530016C@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchcommits acl on ocaml-calendar (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-calendar



From pkgdb at fedoraproject.org  Mon Jan 19 15:38:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:38:17 +0000
Subject: [pkgdb] ocaml-calendar: ocamlmaint has requested watchcommits
Message-ID: <20090119153818.6AC2E30016F@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchcommits acl on ocaml-calendar (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-calendar



From pkgdb at fedoraproject.org  Mon Jan 19 15:38:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:38:20 +0000
Subject: [pkgdb] ocaml-calendar: ocamlmaint has requested watchbugzilla
Message-ID: <20090119153821.A14D1300172@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchbugzilla acl on ocaml-calendar (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-calendar



From pkgdb at fedoraproject.org  Mon Jan 19 15:38:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:38:21 +0000
Subject: [pkgdb] ocaml-calendar: ocamlmaint has requested watchcommits
Message-ID: <20090119153821.C660C300175@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchcommits acl on ocaml-calendar (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-calendar



From pkgdb at fedoraproject.org  Mon Jan 19 15:38:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:38:23 +0000
Subject: [pkgdb] ocaml-calendar: ocamlmaint has requested watchbugzilla
Message-ID: <20090119153827.A085B300178@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchbugzilla acl on ocaml-calendar (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-calendar



From pkgdb at fedoraproject.org  Mon Jan 19 15:38:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:38:27 +0000
Subject: [pkgdb] ocaml-calendar: ocamlmaint has requested watchcommits
Message-ID: <20090119153829.574AE30017C@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchcommits acl on ocaml-calendar (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-calendar



From pkgdb at fedoraproject.org  Mon Jan 19 15:38:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:38:38 +0000
Subject: [pkgdb] ocaml-SDL: ocamlmaint has requested watchbugzilla
Message-ID: <20090119153838.1C23430017F@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchbugzilla acl on ocaml-SDL (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-SDL



From pkgdb at fedoraproject.org  Mon Jan 19 15:38:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:38:38 +0000
Subject: [pkgdb] ocaml-SDL: ocamlmaint has requested watchcommits
Message-ID: <20090119153838.5367E300182@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchcommits acl on ocaml-SDL (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-SDL



From pkgdb at fedoraproject.org  Mon Jan 19 15:38:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:38:40 +0000
Subject: [pkgdb] ocaml-SDL: ocamlmaint has requested watchcommits
Message-ID: <20090119153840.AC78B300186@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchcommits acl on ocaml-SDL (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-SDL



From pkgdb at fedoraproject.org  Mon Jan 19 15:38:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:38:42 +0000
Subject: [pkgdb] ocaml-SDL: ocamlmaint has requested watchcommits
Message-ID: <20090119153843.109D3208478@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchcommits acl on ocaml-SDL (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-SDL



From pkgdb at fedoraproject.org  Mon Jan 19 15:38:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:38:45 +0000
Subject: [pkgdb] ocaml-SDL: ocamlmaint has requested watchbugzilla
Message-ID: <20090119153845.3A95730018A@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchbugzilla acl on ocaml-SDL (Fedora EPEL 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-SDL



From pkgdb at fedoraproject.org  Mon Jan 19 15:38:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:38:45 +0000
Subject: [pkgdb] ocaml-SDL: ocamlmaint has requested watchcommits
Message-ID: <20090119153845.C9C25300191@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchcommits acl on ocaml-SDL (Fedora EPEL 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-SDL



From pkgdb at fedoraproject.org  Mon Jan 19 15:38:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:38:47 +0000
Subject: [pkgdb] ocaml-SDL: ocamlmaint has requested watchcommits
Message-ID: <20090119153847.DCAC1300192@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchcommits acl on ocaml-SDL (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-SDL



From pkgdb at fedoraproject.org  Mon Jan 19 15:38:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:38:51 +0000
Subject: [pkgdb] ocaml-SDL: ocamlmaint has requested watchbugzilla
Message-ID: <20090119153852.28A73300198@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchbugzilla acl on ocaml-SDL (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-SDL



From pkgdb at fedoraproject.org  Mon Jan 19 15:38:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:38:48 +0000
Subject: [pkgdb] ocaml-SDL: ocamlmaint has requested watchbugzilla
Message-ID: <20090119153850.52441300195@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchbugzilla acl on ocaml-SDL (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-SDL



From pkgdb at fedoraproject.org  Mon Jan 19 15:39:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:39:01 +0000
Subject: [pkgdb] ocaml-pcre: ocamlmaint has requested watchbugzilla
Message-ID: <20090119153901.ED89530019B@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchbugzilla acl on ocaml-pcre (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-pcre



From pkgdb at fedoraproject.org  Mon Jan 19 15:39:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:39:02 +0000
Subject: [pkgdb] ocaml-pcre: ocamlmaint has requested watchcommits
Message-ID: <20090119153902.5C6D430019E@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchcommits acl on ocaml-pcre (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-pcre



From pkgdb at fedoraproject.org  Mon Jan 19 15:39:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:39:09 +0000
Subject: [pkgdb] ocaml-pcre: ocamlmaint has requested watchbugzilla
Message-ID: <20090119153909.72D4A3001A3@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchbugzilla acl on ocaml-pcre (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-pcre



From pkgdb at fedoraproject.org  Mon Jan 19 15:37:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:37:57 +0000
Subject: [pkgdb] ocaml-csv: ocamlmaint has requested watchbugzilla
Message-ID: <20090119153757.AE68530015B@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchbugzilla acl on ocaml-csv (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-csv



From pkgdb at fedoraproject.org  Mon Jan 19 15:38:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:38:42 +0000
Subject: [pkgdb] ocaml-SDL: ocamlmaint has requested watchbugzilla
Message-ID: <20090119153842.B53A9300187@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchbugzilla acl on ocaml-SDL (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-SDL



From pkgdb at fedoraproject.org  Mon Jan 19 15:39:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:39:15 +0000
Subject: [pkgdb] ocaml-pcre: ocamlmaint has given up watchbugzilla
Message-ID: <20090119153915.87BE63001A6@bastion.fedora.phx.redhat.com>

ocamlmaint has given up the watchbugzilla acl on ocaml-pcre (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-pcre



From pkgdb at fedoraproject.org  Mon Jan 19 15:39:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:39:19 +0000
Subject: [pkgdb] ocaml-pcre: ocamlmaint has requested watchbugzilla
Message-ID: <20090119153919.F406A3001AC@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchbugzilla acl on ocaml-pcre (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-pcre



From pkgdb at fedoraproject.org  Mon Jan 19 15:39:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:39:18 +0000
Subject: [pkgdb] ocaml-pcre: ocamlmaint has requested watchcommits
Message-ID: <20090119153918.D9B373001A9@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchcommits acl on ocaml-pcre (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-pcre



From pkgdb at fedoraproject.org  Mon Jan 19 15:39:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:39:21 +0000
Subject: [pkgdb] ocaml-pcre: ocamlmaint has requested watchcommits
Message-ID: <20090119153921.D0F5D3001AD@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchcommits acl on ocaml-pcre (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-pcre



From pkgdb at fedoraproject.org  Mon Jan 19 15:39:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:39:23 +0000
Subject: [pkgdb] ocaml-pcre: ocamlmaint has requested watchbugzilla
Message-ID: <20090119153923.712FA3001B3@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchbugzilla acl on ocaml-pcre (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-pcre



From pkgdb at fedoraproject.org  Mon Jan 19 15:39:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:39:31 +0000
Subject: [pkgdb] ocaml-curl: ocamlmaint has requested watchbugzilla
Message-ID: <20090119153931.DE4C6208E09@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchbugzilla acl on ocaml-curl (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-curl



From pkgdb at fedoraproject.org  Mon Jan 19 15:39:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:39:32 +0000
Subject: [pkgdb] ocaml-curl: ocamlmaint has requested watchcommits
Message-ID: <20090119153932.D874F208E5E@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchcommits acl on ocaml-curl (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-curl



From pkgdb at fedoraproject.org  Mon Jan 19 15:39:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:39:36 +0000
Subject: [pkgdb] ocaml-curl: ocamlmaint has requested watchcommits
Message-ID: <20090119153936.7846A208E62@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchcommits acl on ocaml-curl (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-curl



From pkgdb at fedoraproject.org  Mon Jan 19 15:39:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:39:36 +0000
Subject: [pkgdb] ocaml-curl: ocamlmaint has requested watchbugzilla
Message-ID: <20090119153938.DF4C33001B2@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchbugzilla acl on ocaml-curl (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-curl



From pkgdb at fedoraproject.org  Mon Jan 19 15:39:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:39:39 +0000
Subject: [pkgdb] ocaml-curl: ocamlmaint has requested watchbugzilla
Message-ID: <20090119153939.50E4B3001B8@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchbugzilla acl on ocaml-curl (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-curl



From pkgdb at fedoraproject.org  Mon Jan 19 15:39:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:39:43 +0000
Subject: [pkgdb] ocaml-curl: ocamlmaint has requested watchcommits
Message-ID: <20090119153943.6A7503001BD@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchcommits acl on ocaml-curl (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-curl



From pkgdb at fedoraproject.org  Mon Jan 19 15:39:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:39:50 +0000
Subject: [pkgdb] ocaml-ulex: ocamlmaint has requested watchbugzilla
Message-ID: <20090119153951.4518C3001C3@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchbugzilla acl on ocaml-ulex (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-ulex



From pkgdb at fedoraproject.org  Mon Jan 19 15:39:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:39:51 +0000
Subject: [pkgdb] ocaml-ulex: ocamlmaint has requested watchcommits
Message-ID: <20090119153951.7895F3001C5@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchcommits acl on ocaml-ulex (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-ulex



From pkgdb at fedoraproject.org  Mon Jan 19 15:39:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:39:54 +0000
Subject: [pkgdb] ocaml-ulex: ocamlmaint has requested watchcommits
Message-ID: <20090119153954.AA1CF3001C9@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchcommits acl on ocaml-ulex (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-ulex



From pkgdb at fedoraproject.org  Mon Jan 19 15:39:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:39:57 +0000
Subject: [pkgdb] ocaml-ulex: ocamlmaint has requested watchbugzilla
Message-ID: <20090119153957.76A003001CC@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchbugzilla acl on ocaml-ulex (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-ulex



From pkgdb at fedoraproject.org  Mon Jan 19 15:39:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:39:58 +0000
Subject: [pkgdb] ocaml-ulex: ocamlmaint has requested watchcommits
Message-ID: <20090119153959.2D3863001CF@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchcommits acl on ocaml-ulex (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-ulex



From pkgdb at fedoraproject.org  Mon Jan 19 15:40:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:40:02 +0000
Subject: [pkgdb] ocaml-ssl: ocamlmaint has requested watchcommits
Message-ID: <20090119154002.7776920866E@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchcommits acl on ocaml-ssl (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-ssl



From pkgdb at fedoraproject.org  Mon Jan 19 15:40:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:40:07 +0000
Subject: [pkgdb] ocaml-ssl: ocamlmaint has requested watchcommits
Message-ID: <20090119154008.F1A81208E6A@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchcommits acl on ocaml-ssl (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-ssl



From pkgdb at fedoraproject.org  Mon Jan 19 15:40:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:40:07 +0000
Subject: [pkgdb] ocaml-ssl: ocamlmaint has requested watchbugzilla
Message-ID: <20090119154007.C4017208E68@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchbugzilla acl on ocaml-ssl (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-ssl



From pkgdb at fedoraproject.org  Mon Jan 19 15:40:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:40:05 +0000
Subject: [pkgdb] ocaml-ulex: ocamlmaint has requested watchbugzilla
Message-ID: <20090119154011.78CBA3001D1@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchbugzilla acl on ocaml-ulex (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-ulex



From pkgdb at fedoraproject.org  Mon Jan 19 15:40:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:40:17 +0000
Subject: [pkgdb] ocaml-extlib: ocamlmaint has requested watchbugzilla
Message-ID: <20090119154017.B5EDE208E0D@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchbugzilla acl on ocaml-extlib (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-extlib



From pkgdb at fedoraproject.org  Mon Jan 19 15:40:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:40:17 +0000
Subject: [pkgdb] ocaml-extlib: ocamlmaint has requested watchcommits
Message-ID: <20090119154018.149AC208E6C@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchcommits acl on ocaml-extlib (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-extlib



From pkgdb at fedoraproject.org  Mon Jan 19 15:40:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:40:23 +0000
Subject: [pkgdb] ocaml-extlib: ocamlmaint has requested watchcommits
Message-ID: <20090119154023.1F57C3001D2@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchcommits acl on ocaml-extlib (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-extlib



From pkgdb at fedoraproject.org  Mon Jan 19 15:40:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:40:23 +0000
Subject: [pkgdb] ocaml-ssl: ocamlmaint has requested watchbugzilla
Message-ID: <20090119154023.CDFFF208E6D@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchbugzilla acl on ocaml-ssl (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-ssl



From pkgdb at fedoraproject.org  Mon Jan 19 15:40:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:40:23 +0000
Subject: [pkgdb] ocaml-ssl: ocamlmaint has requested watchbugzilla
Message-ID: <20090119154023.DF8383001D6@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchbugzilla acl on ocaml-ssl (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-ssl



From pkgdb at fedoraproject.org  Mon Jan 19 15:40:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:40:23 +0000
Subject: [pkgdb] ocaml-ssl: ocamlmaint has requested watchcommits
Message-ID: <20090119154024.10D663001D9@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchcommits acl on ocaml-ssl (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-ssl



From pkgdb at fedoraproject.org  Mon Jan 19 15:40:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:40:26 +0000
Subject: [pkgdb] ocaml-extlib: ocamlmaint has requested watchcommits
Message-ID: <20090119154026.E0EC4208E70@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchcommits acl on ocaml-extlib (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-extlib



From pkgdb at fedoraproject.org  Mon Jan 19 15:40:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:40:28 +0000
Subject: [pkgdb] ocaml-extlib: ocamlmaint has requested watchbugzilla
Message-ID: <20090119154028.9C843208E76@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchbugzilla acl on ocaml-extlib (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-extlib



From pkgdb at fedoraproject.org  Mon Jan 19 15:40:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:40:27 +0000
Subject: [pkgdb] ocaml-extlib: ocamlmaint has requested watchbugzilla
Message-ID: <20090119154028.4EC78208E73@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchbugzilla acl on ocaml-extlib (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-extlib



From pkgdb at fedoraproject.org  Mon Jan 19 15:40:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:40:28 +0000
Subject: [pkgdb] ocaml-extlib: ocamlmaint has requested watchcommits
Message-ID: <20090119154029.0089D208E79@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchcommits acl on ocaml-extlib (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-extlib



From pkgdb at fedoraproject.org  Mon Jan 19 15:40:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:40:33 +0000
Subject: [pkgdb] ocaml-extlib: ocamlmaint has requested watchbugzilla
Message-ID: <20090119154033.B3AA8208E7B@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchbugzilla acl on ocaml-extlib (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-extlib



From pkgdb at fedoraproject.org  Mon Jan 19 15:40:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:40:40 +0000
Subject: [pkgdb] ocaml-findlib: ocamlmaint has requested watchbugzilla
Message-ID: <20090119154040.44525208E7C@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchbugzilla acl on ocaml-findlib (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-findlib



From pkgdb at fedoraproject.org  Mon Jan 19 15:40:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:40:42 +0000
Subject: [pkgdb] ocaml-findlib: ocamlmaint has requested watchcommits
Message-ID: <20090119154042.B07863001DB@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchcommits acl on ocaml-findlib (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-findlib



From pkgdb at fedoraproject.org  Mon Jan 19 15:40:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:40:45 +0000
Subject: [pkgdb] ocaml-findlib: ocamlmaint has requested watchbugzilla
Message-ID: <20090119154047.264A63001E0@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchbugzilla acl on ocaml-findlib (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-findlib



From pkgdb at fedoraproject.org  Mon Jan 19 15:40:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:40:47 +0000
Subject: [pkgdb] ocaml-findlib: ocamlmaint has requested watchcommits
Message-ID: <20090119154047.54A623001E1@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchcommits acl on ocaml-findlib (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-findlib



From pkgdb at fedoraproject.org  Mon Jan 19 15:40:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:40:50 +0000
Subject: [pkgdb] ocaml-findlib: ocamlmaint has requested watchbugzilla
Message-ID: <20090119154050.7165E3001E4@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchbugzilla acl on ocaml-findlib (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-findlib



From pkgdb at fedoraproject.org  Mon Jan 19 15:40:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:40:50 +0000
Subject: [pkgdb] ocaml-findlib: ocamlmaint has requested watchcommits
Message-ID: <20090119154050.A11CA3001E7@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchcommits acl on ocaml-findlib (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-findlib



From dwalsh at fedoraproject.org  Mon Jan 19 15:40:52 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Mon, 19 Jan 2009 15:40:52 +0000 (UTC)
Subject: rpms/setroubleshoot/devel setroubleshoot.spec,1.113,1.114
Message-ID: <20090119154052.3CBC1700F8@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/setroubleshoot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26735

Modified Files:
	setroubleshoot.spec 
Log Message:
* Fri Jan 16 2009 Dan Walsh <dwalsh at redhat.com> - 2.1.1-1
- Switch to C Based applet
- Use dbus for messaging.  Only run setroubleshoot when 



Index: setroubleshoot.spec
===================================================================
RCS file: /cvs/extras/rpms/setroubleshoot/devel/setroubleshoot.spec,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -r1.113 -r1.114
--- setroubleshoot.spec	19 Jan 2009 15:32:15 -0000	1.113
+++ setroubleshoot.spec	19 Jan 2009 15:40:21 -0000	1.114
@@ -10,13 +10,13 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: perl-XML-Parser
 BuildRequires: intltool gettext python
-BuildRequires: desktop-file-utils dbus-devel gtk2-devel
+BuildRequires: desktop-file-utils dbus-devel gtk2-devel libnotify-devel
 Requires: %{name}-server = %{version}-%{release} 
 Requires: %{name}-plugins >= 2.0.4
 Requires: pygtk2 >= 2.9.2
 Requires: gnome-python2-gnome, gnome-python2-canvas
 Requires: gnome-python2-gtkhtml2
-Requires: dbus
+Requires: dbus libnotify
 Requires: dbus-python
 Requires: libxml2-python
 Requires(post): /usr/bin/update-desktop-database
@@ -112,7 +112,7 @@
 Requires: libxml2-python
 Requires: libselinux-python
 Requires: rpm-python
-
+Requires: gtk2 libnotify
 BuildRequires: intltool gettext python
 
 Requires(post):   /sbin/chkconfig



From pkgdb at fedoraproject.org  Mon Jan 19 15:40:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:40:51 +0000
Subject: [pkgdb] ocaml-findlib: ocamlmaint has requested watchbugzilla
Message-ID: <20090119154051.5572F3001EA@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchbugzilla acl on ocaml-findlib (Fedora EPEL 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-findlib



From pkgdb at fedoraproject.org  Mon Jan 19 15:40:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:40:52 +0000
Subject: [pkgdb] ocaml-findlib: ocamlmaint has requested watchcommits
Message-ID: <20090119154052.B1CBA3001EE@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchcommits acl on ocaml-findlib (Fedora EPEL 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-findlib



From pkgdb at fedoraproject.org  Mon Jan 19 15:40:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:40:54 +0000
Subject: [pkgdb] ocaml-findlib: ocamlmaint has requested watchbugzilla
Message-ID: <20090119154054.6F54D3001F1@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchbugzilla acl on ocaml-findlib (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-findlib



From pkgdb at fedoraproject.org  Mon Jan 19 15:40:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:40:54 +0000
Subject: [pkgdb] ocaml-findlib: ocamlmaint has requested watchcommits
Message-ID: <20090119154055.228EB3001F3@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchcommits acl on ocaml-findlib (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-findlib



From pkgdb at fedoraproject.org  Mon Jan 19 15:41:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:41:00 +0000
Subject: [pkgdb] ocaml-lablgl: ocamlmaint has requested watchcommits
Message-ID: <20090119154100.9ABAE3001F6@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchcommits acl on ocaml-lablgl (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-lablgl



From pkgdb at fedoraproject.org  Mon Jan 19 15:41:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:41:01 +0000
Subject: [pkgdb] ocaml-lablgl: ocamlmaint has requested watchbugzilla
Message-ID: <20090119154101.85FBE3001FA@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchbugzilla acl on ocaml-lablgl (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-lablgl



From pkgdb at fedoraproject.org  Mon Jan 19 15:41:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:41:05 +0000
Subject: [pkgdb] ocaml-lablgl: ocamlmaint has requested watchcommits
Message-ID: <20090119154105.A83663001FB@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchcommits acl on ocaml-lablgl (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-lablgl



From pkgdb at fedoraproject.org  Mon Jan 19 15:41:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:41:06 +0000
Subject: [pkgdb] ocaml-lablgl: ocamlmaint has requested watchbugzilla
Message-ID: <20090119154107.D8F4A208E16@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchbugzilla acl on ocaml-lablgl (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-lablgl



From pkgdb at fedoraproject.org  Mon Jan 19 15:41:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:41:12 +0000
Subject: [pkgdb] ocaml-lablgl: ocamlmaint has requested watchbugzilla
Message-ID: <20090119154112.45B52300209@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchbugzilla acl on ocaml-lablgl (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-lablgl



From pkgdb at fedoraproject.org  Mon Jan 19 15:41:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:41:12 +0000
Subject: [pkgdb] ocaml-lablgl: ocamlmaint has requested watchbugzilla
Message-ID: <20090119154112.41E8C300207@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchbugzilla acl on ocaml-lablgl (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-lablgl



From pkgdb at fedoraproject.org  Mon Jan 19 15:41:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:41:12 +0000
Subject: [pkgdb] ocaml-lablgl: ocamlmaint has requested watchcommits
Message-ID: <20090119154112.67FC430020C@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchcommits acl on ocaml-lablgl (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-lablgl



From pkgdb at fedoraproject.org  Mon Jan 19 15:41:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:41:23 +0000
Subject: [pkgdb] ocaml-expat: ocamlmaint has requested watchcommits
Message-ID: <20090119154123.AA031300217@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchcommits acl on ocaml-expat (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-expat



From pkgdb at fedoraproject.org  Mon Jan 19 15:41:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:41:29 +0000
Subject: [pkgdb] ocaml-expat: ocamlmaint has requested watchbugzilla
Message-ID: <20090119154129.F39DF30021D@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchbugzilla acl on ocaml-expat (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-expat



From pkgdb at fedoraproject.org  Mon Jan 19 15:41:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:41:30 +0000
Subject: [pkgdb] ocaml-expat: ocamlmaint has requested watchbugzilla
Message-ID: <20090119154131.0982530021E@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchbugzilla acl on ocaml-expat (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-expat



From pkgdb at fedoraproject.org  Mon Jan 19 15:41:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:41:31 +0000
Subject: [pkgdb] ocaml-expat: ocamlmaint has requested watchcommits
Message-ID: <20090119154131.4900A300222@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchcommits acl on ocaml-expat (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-expat



From pkgdb at fedoraproject.org  Mon Jan 19 15:41:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:41:35 +0000
Subject: [pkgdb] ocaml-expat: ocamlmaint has requested watchcommits
Message-ID: <20090119154135.A57BB300224@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchcommits acl on ocaml-expat (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-expat



From pkgdb at fedoraproject.org  Mon Jan 19 15:41:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:41:45 +0000
Subject: [pkgdb] ocaml-camlimages: ocamlmaint has requested watchbugzilla
Message-ID: <20090119154145.DA8A5208E1F@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchbugzilla acl on ocaml-camlimages (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-camlimages



From pkgdb at fedoraproject.org  Mon Jan 19 15:41:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:41:46 +0000
Subject: [pkgdb] ocaml-camlimages: ocamlmaint has requested watchcommits
Message-ID: <20090119154146.30F5E300227@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchcommits acl on ocaml-camlimages (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-camlimages



From pkgdb at fedoraproject.org  Mon Jan 19 15:41:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:41:51 +0000
Subject: [pkgdb] libvirt had acl change status
Message-ID: <20090119154151.F3CE630022D@bastion.fedora.phx.redhat.com>

veillard has set the watchbugzilla acl on libvirt (Fedora 7) to Approved for virtmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libvirt



From pkgdb at fedoraproject.org  Mon Jan 19 15:41:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:41:54 +0000
Subject: [pkgdb] libvirt had acl change status
Message-ID: <20090119154154.6D792300231@bastion.fedora.phx.redhat.com>

veillard has set the watchcommits acl on libvirt (Fedora 7) to Approved for virtmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libvirt



From pkgdb at fedoraproject.org  Mon Jan 19 15:41:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:41:57 +0000
Subject: [pkgdb] ocaml-camlimages: ocamlmaint has requested watchcommits
Message-ID: <20090119154157.B17C4300234@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchcommits acl on ocaml-camlimages (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-camlimages



From pkgdb at fedoraproject.org  Mon Jan 19 15:41:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:41:58 +0000
Subject: [pkgdb] ocaml-camlimages: ocamlmaint has requested watchbugzilla
Message-ID: <20090119154159.0384C300236@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchbugzilla acl on ocaml-camlimages (Fedora EPEL 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-camlimages



From pkgdb at fedoraproject.org  Mon Jan 19 15:42:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:42:03 +0000
Subject: [pkgdb] ocaml-camlimages: ocamlmaint has requested watchbugzilla
Message-ID: <20090119154203.EA772300238@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchbugzilla acl on ocaml-camlimages (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-camlimages



From pkgdb at fedoraproject.org  Mon Jan 19 15:42:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:42:05 +0000
Subject: [pkgdb] ocaml-camlimages: ocamlmaint has requested watchcommits
Message-ID: <20090119154205.EC32F30023A@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchcommits acl on ocaml-camlimages (Fedora EPEL 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-camlimages



From pkgdb at fedoraproject.org  Mon Jan 19 15:42:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:42:10 +0000
Subject: [pkgdb] ocaml-camlimages: ocamlmaint has requested watchbugzilla
Message-ID: <20090119154210.5B77830023D@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchbugzilla acl on ocaml-camlimages (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-camlimages



From pkgdb at fedoraproject.org  Mon Jan 19 15:42:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:42:11 +0000
Subject: [pkgdb] ocaml-camlimages: ocamlmaint has requested watchcommits
Message-ID: <20090119154211.4C5FF300240@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchcommits acl on ocaml-camlimages (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-camlimages



From pkgdb at fedoraproject.org  Mon Jan 19 15:42:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:42:12 +0000
Subject: [pkgdb] ocaml-camlimages: ocamlmaint has requested watchbugzilla
Message-ID: <20090119154212.36846300243@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchbugzilla acl on ocaml-camlimages (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-camlimages



From pkgdb at fedoraproject.org  Mon Jan 19 15:42:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:42:16 +0000
Subject: [pkgdb] ocaml-camlimages: ocamlmaint has requested watchcommits
Message-ID: <20090119154216.CCEC6208E82@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchcommits acl on ocaml-camlimages (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-camlimages



From pkgdb at fedoraproject.org  Mon Jan 19 15:42:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:42:26 +0000
Subject: [pkgdb] ocaml-lablgtk: ocamlmaint has requested watchbugzilla
Message-ID: <20090119154226.C5AFA208E84@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchbugzilla acl on ocaml-lablgtk (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-lablgtk



From pkgdb at fedoraproject.org  Mon Jan 19 15:42:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:42:27 +0000
Subject: [pkgdb] ocaml-lablgtk: ocamlmaint has requested watchcommits
Message-ID: <20090119154227.DA4C9300247@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchcommits acl on ocaml-lablgtk (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-lablgtk



From pkgdb at fedoraproject.org  Mon Jan 19 15:41:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:41:15 +0000
Subject: [pkgdb] ocaml-lablgl: ocamlmaint has requested watchcommits
Message-ID: <20090119154115.AB660300210@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchcommits acl on ocaml-lablgl (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-lablgl



From pkgdb at fedoraproject.org  Mon Jan 19 15:41:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:41:23 +0000
Subject: [pkgdb] ocaml-expat: ocamlmaint has requested watchbugzilla
Message-ID: <20090119154123.30D21300213@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchbugzilla acl on ocaml-expat (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-expat



From pkgdb at fedoraproject.org  Mon Jan 19 15:42:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:42:29 +0000
Subject: [pkgdb] ocaml-lablgtk: ocamlmaint has requested watchbugzilla
Message-ID: <20090119154230.26BE2300249@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchbugzilla acl on ocaml-lablgtk (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-lablgtk



From pkgdb at fedoraproject.org  Mon Jan 19 15:42:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:42:32 +0000
Subject: [pkgdb] ocaml-lablgtk: ocamlmaint has requested watchcommits
Message-ID: <20090119154232.3B1E030024C@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchcommits acl on ocaml-lablgtk (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-lablgtk



From pkgdb at fedoraproject.org  Mon Jan 19 15:42:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:42:37 +0000
Subject: [pkgdb] ocaml-lablgtk: ocamlmaint has requested watchbugzilla
Message-ID: <20090119154237.3001630024F@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchbugzilla acl on ocaml-lablgtk (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-lablgtk



From pkgdb at fedoraproject.org  Mon Jan 19 15:42:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:42:38 +0000
Subject: [pkgdb] ocaml-lablgtk: ocamlmaint has requested watchcommits
Message-ID: <20090119154238.D3948300252@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchcommits acl on ocaml-lablgtk (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-lablgtk



From pkgdb at fedoraproject.org  Mon Jan 19 15:42:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:42:41 +0000
Subject: [pkgdb] ocaml-lablgtk: ocamlmaint has requested watchbugzilla
Message-ID: <20090119154242.A729E300257@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchbugzilla acl on ocaml-lablgtk (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-lablgtk



From pkgdb at fedoraproject.org  Mon Jan 19 15:42:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:42:42 +0000
Subject: [pkgdb] ocaml-lablgtk: ocamlmaint has requested watchcommits
Message-ID: <20090119154242.BAEBC30025C@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchcommits acl on ocaml-lablgtk (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-lablgtk



From pkgdb at fedoraproject.org  Mon Jan 19 15:42:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:42:45 +0000
Subject: [pkgdb] ocaml-lablgtk: ocamlmaint has requested watchbugzilla
Message-ID: <20090119154246.08D48300262@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchbugzilla acl on ocaml-lablgtk (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-lablgtk



From pkgdb at fedoraproject.org  Mon Jan 19 15:42:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:42:47 +0000
Subject: [pkgdb] ocaml-lablgtk: ocamlmaint has requested watchcommits
Message-ID: <20090119154249.549FC208E94@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchcommits acl on ocaml-lablgtk (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-lablgtk



From pkgdb at fedoraproject.org  Mon Jan 19 15:42:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:42:47 +0000
Subject: [pkgdb] ocaml-lablgtk: ocamlmaint has given up watchbugzilla
Message-ID: <20090119154249.5FE63208E95@bastion.fedora.phx.redhat.com>

ocamlmaint has given up the watchbugzilla acl on ocaml-lablgtk (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-lablgtk



From pkgdb at fedoraproject.org  Mon Jan 19 15:42:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:42:47 +0000
Subject: [pkgdb] ocaml-lablgtk: ocamlmaint has given up watchcommits
Message-ID: <20090119154251.DC3B5208E8F@bastion.fedora.phx.redhat.com>

ocamlmaint has given up the watchcommits acl on ocaml-lablgtk (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-lablgtk



From pkgdb at fedoraproject.org  Mon Jan 19 15:42:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:42:56 +0000
Subject: [pkgdb] ocaml: ocamlmaint has requested watchbugzilla
Message-ID: <20090119154256.BCEDC208E87@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchbugzilla acl on ocaml (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml



From pkgdb at fedoraproject.org  Mon Jan 19 15:30:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:30:05 +0000
Subject: [pkgdb] ocaml-camomile: ocamlmaint has requested watchbugzilla
Message-ID: <20090119153005.8FDF0208470@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchbugzilla acl on ocaml-camomile (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-camomile



From pkgdb at fedoraproject.org  Mon Jan 19 15:43:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:43:00 +0000
Subject: [pkgdb] ocaml: ocamlmaint has requested watchbugzilla
Message-ID: <20090119154301.28AA3208E90@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchbugzilla acl on ocaml (Fedora EPEL 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml



From pkgdb at fedoraproject.org  Mon Jan 19 15:42:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:42:57 +0000
Subject: [pkgdb] ocaml: ocamlmaint has requested watchcommits
Message-ID: <20090119154258.6F053208E8D@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchcommits acl on ocaml (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml



From pkgdb at fedoraproject.org  Mon Jan 19 15:43:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:43:01 +0000
Subject: [pkgdb] ocaml: ocamlmaint has requested watchcommits
Message-ID: <20090119154302.5CFD4208E26@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchcommits acl on ocaml (Fedora EPEL 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml



From pkgdb at fedoraproject.org  Mon Jan 19 15:43:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:43:03 +0000
Subject: [pkgdb] ocaml: ocamlmaint has requested watchbugzilla
Message-ID: <20090119154304.22AEB300261@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchbugzilla acl on ocaml (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml



From pkgdb at fedoraproject.org  Mon Jan 19 15:43:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:43:04 +0000
Subject: [pkgdb] ocaml: ocamlmaint has requested watchcommits
Message-ID: <20090119154305.272AF300265@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchcommits acl on ocaml (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml



From pkgdb at fedoraproject.org  Mon Jan 19 15:43:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:43:13 +0000
Subject: [pkgdb] ocaml: ocamlmaint has requested watchbugzilla
Message-ID: <20090119154313.771FE30026B@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchbugzilla acl on ocaml (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml



From pkgdb at fedoraproject.org  Mon Jan 19 15:43:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:43:14 +0000
Subject: [pkgdb] ocaml: ocamlmaint has requested watchcommits
Message-ID: <20090119154314.96BA2300272@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchcommits acl on ocaml (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml



From pkgdb at fedoraproject.org  Mon Jan 19 15:43:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:43:15 +0000
Subject: [pkgdb] ocaml: ocamlmaint has requested watchbugzilla
Message-ID: <20090119154315.74B5B300276@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchbugzilla acl on ocaml (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml



From pkgdb at fedoraproject.org  Mon Jan 19 15:43:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:43:20 +0000
Subject: [pkgdb] ocaml: ocamlmaint has requested watchcommits
Message-ID: <20090119154320.8461F30027E@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchcommits acl on ocaml (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml



From pkgdb at fedoraproject.org  Mon Jan 19 15:43:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:43:25 +0000
Subject: [pkgdb] libvirt-java had acl change status
Message-ID: <20090119154325.59D27300282@bastion.fedora.phx.redhat.com>

veillard has set the watchbugzilla acl on libvirt-java (Fedora devel) to Approved for virtmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libvirt-java



From pkgdb at fedoraproject.org  Mon Jan 19 15:43:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:43:29 +0000
Subject: [pkgdb] libvirt-java had acl change status
Message-ID: <20090119154330.4C43330028C@bastion.fedora.phx.redhat.com>

veillard has set the watchcommits acl on libvirt-java (Fedora devel) to Approved for virtmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libvirt-java



From pkgdb at fedoraproject.org  Mon Jan 19 15:43:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:43:31 +0000
Subject: [pkgdb] virt-df: ocamlmaint has requested watchbugzilla
Message-ID: <20090119154331.367D2300290@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchbugzilla acl on virt-df (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/virt-df



From pkgdb at fedoraproject.org  Mon Jan 19 15:43:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:43:31 +0000
Subject: [pkgdb] libvirt-java had acl change status
Message-ID: <20090119154333.AE8DC300292@bastion.fedora.phx.redhat.com>

veillard has set the watchcommits acl on libvirt-java (Fedora 9) to Approved for virtmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libvirt-java



From pkgdb at fedoraproject.org  Mon Jan 19 15:43:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:43:35 +0000
Subject: [pkgdb] virt-df: ocamlmaint has requested watchcommits
Message-ID: <20090119154335.94C79300298@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchcommits acl on virt-df (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/virt-df



From pkgdb at fedoraproject.org  Mon Jan 19 15:43:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:43:36 +0000
Subject: [pkgdb] virt-df: ocamlmaint has requested watchbugzilla
Message-ID: <20090119154336.47E5A208E2C@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchbugzilla acl on virt-df (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/virt-df



From pkgdb at fedoraproject.org  Mon Jan 19 15:43:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:43:38 +0000
Subject: [pkgdb] virt-df: ocamlmaint has requested watchcommits
Message-ID: <20090119154338.DEC1030029B@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchcommits acl on virt-df (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/virt-df



From pkgdb at fedoraproject.org  Mon Jan 19 15:43:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:43:39 +0000
Subject: [pkgdb] libvirt-java had acl change status
Message-ID: <20090119154339.648C430029D@bastion.fedora.phx.redhat.com>

veillard has set the watchbugzilla acl on libvirt-java (Fedora 10) to Approved for virtmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libvirt-java



From pkgdb at fedoraproject.org  Mon Jan 19 15:43:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:43:39 +0000
Subject: [pkgdb] libvirt-java had acl change status
Message-ID: <20090119154339.C3C823002A0@bastion.fedora.phx.redhat.com>

veillard has set the watchcommits acl on libvirt-java (Fedora 10) to Approved for virtmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libvirt-java



From pkgdb at fedoraproject.org  Mon Jan 19 15:43:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:43:41 +0000
Subject: [pkgdb] virt-df: ocamlmaint has requested watchcommits
Message-ID: <20090119154341.AB1B93002A5@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchcommits acl on virt-df (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/virt-df



From pkgdb at fedoraproject.org  Mon Jan 19 15:43:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:43:45 +0000
Subject: [pkgdb] virt-df: ocamlmaint has requested watchbugzilla
Message-ID: <20090119154345.C584F208E2D@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchbugzilla acl on virt-df (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/virt-df



From pkgdb at fedoraproject.org  Mon Jan 19 15:43:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 15:43:29 +0000
Subject: [pkgdb] libvirt-java had acl change status
Message-ID: <20090119154329.C54A0208E29@bastion.fedora.phx.redhat.com>

veillard has set the watchbugzilla acl on libvirt-java (Fedora 9) to Approved for virtmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libvirt-java



From dwalsh at fedoraproject.org  Mon Jan 19 16:02:50 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Mon, 19 Jan 2009 16:02:50 +0000 (UTC)
Subject: rpms/setroubleshoot/devel setroubleshoot.spec,1.114,1.115
Message-ID: <20090119160250.9D8F270142@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/setroubleshoot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28336

Modified Files:
	setroubleshoot.spec 
Log Message:
* Fri Jan 16 2009 Dan Walsh <dwalsh at redhat.com> - 2.1.1-1
- Switch to C Based applet
- Use dbus for messaging.  Only run setroubleshoot when 



Index: setroubleshoot.spec
===================================================================
RCS file: /cvs/extras/rpms/setroubleshoot/devel/setroubleshoot.spec,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -r1.114 -r1.115
--- setroubleshoot.spec	19 Jan 2009 15:40:21 -0000	1.114
+++ setroubleshoot.spec	19 Jan 2009 16:02:20 -0000	1.115
@@ -10,7 +10,7 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: perl-XML-Parser
 BuildRequires: intltool gettext python
-BuildRequires: desktop-file-utils dbus-devel gtk2-devel libnotify-devel
+BuildRequires: desktop-file-utils dbus-devel gtk2-devel libnotify-devel audit-devel
 Requires: %{name}-server = %{version}-%{release} 
 Requires: %{name}-plugins >= 2.0.4
 Requires: pygtk2 >= 2.9.2



From katzj at fedoraproject.org  Mon Jan 19 16:18:00 2009
From: katzj at fedoraproject.org (Jeremy Katz)
Date: Mon, 19 Jan 2009 16:18:00 +0000 (UTC)
Subject: rpms/mkinitrd/devel .cvsignore, 1.214, 1.215 mkinitrd.spec, 1.307, 
	1.308 sources, 1.256, 1.257
Message-ID: <20090119161800.52F04700F8@cvs1.fedora.phx.redhat.com>

Author: katzj

Update of /cvs/pkgs/rpms/mkinitrd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30509

Modified Files:
	.cvsignore mkinitrd.spec sources 
Log Message:
* Mon Jan 19 2009 Jeremy Katz <katzj at redhat.com> - 6.0.75-1
- fix live images to be smarter with rootfstype=auto



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mkinitrd/devel/.cvsignore,v
retrieving revision 1.214
retrieving revision 1.215
diff -u -r1.214 -r1.215
--- .cvsignore	14 Jan 2009 21:44:09 -0000	1.214
+++ .cvsignore	19 Jan 2009 16:17:29 -0000	1.215
@@ -1 +1 @@
-mkinitrd-6.0.74.tar.bz2
+mkinitrd-6.0.75.tar.bz2


Index: mkinitrd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mkinitrd/devel/mkinitrd.spec,v
retrieving revision 1.307
retrieving revision 1.308
diff -u -r1.307 -r1.308
--- mkinitrd.spec	14 Jan 2009 21:44:09 -0000	1.307
+++ mkinitrd.spec	19 Jan 2009 16:17:29 -0000	1.308
@@ -2,7 +2,7 @@
 
 Summary: Creates an initial ramdisk image for preloading modules.
 Name: mkinitrd
-Version: 6.0.74
+Version: 6.0.75
 Release: 1%{?dist}
 License: GPLv2+
 Group: System Environment/Base
@@ -136,6 +136,9 @@
 %dir %{_sysconfdir}/kernel/prerm.d
 
 %changelog
+* Mon Jan 19 2009 Jeremy Katz <katzj at redhat.com> - 6.0.75-1
+- fix live images to be smarter with rootfstype=auto
+
 * Wed Jan 14 2009 Jeremy Katz <katzj at redhat.com> - 6.0.74-1
 - modesetting for live images
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mkinitrd/devel/sources,v
retrieving revision 1.256
retrieving revision 1.257
diff -u -r1.256 -r1.257
--- sources	14 Jan 2009 21:44:09 -0000	1.256
+++ sources	19 Jan 2009 16:17:29 -0000	1.257
@@ -1 +1 @@
-8f11feba21f89d6428a01f18e2e79081  mkinitrd-6.0.74.tar.bz2
+917783ba748a6e8a2c8ca9088b69a6bb  mkinitrd-6.0.75.tar.bz2



From bpepple at fedoraproject.org  Mon Jan 19 16:19:13 2009
From: bpepple at fedoraproject.org (Brian Pepple)
Date: Mon, 19 Jan 2009 16:19:13 +0000 (UTC)
Subject: rpms/rhythmbox/devel rb-avahi-assertion.patch, NONE,
	1.1 rhythmbox.spec, 1.222, 1.223
Message-ID: <20090119161913.7C116700F8@cvs1.fedora.phx.redhat.com>

Author: bpepple

Update of /cvs/pkgs/rpms/rhythmbox/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30793

Modified Files:
	rhythmbox.spec 
Added Files:
	rb-avahi-assertion.patch 
Log Message:
* Mon Jan 19 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.11.6-22.r6096
- Backport patch to fix avahi assertion in DAAP plugin.


rb-avahi-assertion.patch:

--- NEW FILE rb-avahi-assertion.patch ---
--- trunk/plugins/daap/rb-daap-mdns-avahi.c	2008/12/17 10:44:50	6103
+++ trunk/plugins/daap/rb-daap-mdns-avahi.c	2008/12/18 02:27:16	6104
@@ -114,7 +114,9 @@
 void
 rb_daap_mdns_avahi_set_entry_group (AvahiEntryGroup *eg)
 {
-	g_assert (eg == NULL || entry_group == NULL);
-	g_assert (avahi_entry_group_get_client (eg) == client);
+	if (eg != NULL) {
+		g_assert (entry_group == NULL);
+		g_assert (avahi_entry_group_get_client (eg) == client);
+	}
 	entry_group = eg;
 }


Index: rhythmbox.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rhythmbox/devel/rhythmbox.spec,v
retrieving revision 1.222
retrieving revision 1.223
diff -u -r1.222 -r1.223
--- rhythmbox.spec	13 Jan 2009 18:00:41 -0000	1.222
+++ rhythmbox.spec	19 Jan 2009 16:18:43 -0000	1.223
@@ -3,7 +3,7 @@
 Name: rhythmbox
 Summary: Music Management Application 
 Version: 0.11.6
-Release: 21.r6096%{?dist}
+Release: 22.r6096%{?dist}
 License: GPLv2+ with exceptions and GFDL
 Group: Applications/Multimedia
 URL: http://projects.gnome.org/rhythmbox/
@@ -54,6 +54,9 @@
 # https://bugzilla.redhat.com/show_bug.cgi?id=428034
 Patch0: rb-disable-power-plugin-by-default.patch
 
+# http://bugzilla.gnome.org/show_bug.cgi?id=562188
+Patch1: rb-avahi-assertion.patch
+
 %description
 Rhythmbox is an integrated music management application based on the powerful
 GStreamer media framework. It has a number of features, including an easy to
@@ -87,6 +90,7 @@
 %setup -q
 
 %patch0 -p0 -b .dont-disable-suspend
+%patch1 -p1 -b .avahi-assertion
 
 %build
 
@@ -220,6 +224,9 @@
 %{_libdir}/rhythmbox/plugins/upnp_coherence
 
 %changelog
+* Mon Jan 19 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.11.6-22.r6096
+- Backport patch to fix avahi assertion in DAAP plugin.
+
 * Tue Jan 13 2009 - Bastien Nocera <bnocera at redhat.com> - 0.11.6-21.r6096
 - Add more Python deps for the UPNP plugin (#474372)
 - Require gstreamer-python-devel, as it's been split from gstreamer-python



From pkgdb at fedoraproject.org  Mon Jan 19 16:26:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 16:26:04 +0000
Subject: [pkgdb] appliance-tools had acl change status
Message-ID: <20090119162604.80998208496@bastion.fedora.phx.redhat.com>

huff has set the watchbugzilla acl on appliance-tools (Fedora devel) to Approved for virtmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/appliance-tools



From pkgdb at fedoraproject.org  Mon Jan 19 16:26:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 16:26:05 +0000
Subject: [pkgdb] appliance-tools had acl change status
Message-ID: <20090119162606.68CD9208DE5@bastion.fedora.phx.redhat.com>

huff has set the watchcommits acl on appliance-tools (Fedora devel) to Approved for virtmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/appliance-tools



From pkgdb at fedoraproject.org  Mon Jan 19 16:26:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 16:26:14 +0000
Subject: [pkgdb] appliance-tools had acl change status
Message-ID: <20090119162614.792F1208DE9@bastion.fedora.phx.redhat.com>

huff has set the watchcommits acl on appliance-tools (Fedora 9) to Approved for virtmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/appliance-tools



From pkgdb at fedoraproject.org  Mon Jan 19 16:26:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 16:26:15 +0000
Subject: [pkgdb] appliance-tools had acl change status
Message-ID: <20090119162615.97B31208E2C@bastion.fedora.phx.redhat.com>

huff has set the watchbugzilla acl on appliance-tools (Fedora 9) to Approved for virtmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/appliance-tools



From pkgdb at fedoraproject.org  Mon Jan 19 16:26:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 16:26:19 +0000
Subject: [pkgdb] appliance-tools had acl change status
Message-ID: <20090119162619.A265C208E31@bastion.fedora.phx.redhat.com>

huff has set the watchbugzilla acl on appliance-tools (Fedora EPEL 5) to Approved for virtmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/appliance-tools



From pkgdb at fedoraproject.org  Mon Jan 19 16:26:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 16:26:22 +0000
Subject: [pkgdb] appliance-tools had acl change status
Message-ID: <20090119162622.C91F4208E30@bastion.fedora.phx.redhat.com>

huff has set the watchcommits acl on appliance-tools (Fedora EPEL 5) to Approved for virtmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/appliance-tools



From pkgdb at fedoraproject.org  Mon Jan 19 16:26:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 16:26:30 +0000
Subject: [pkgdb] appliance-tools had acl change status
Message-ID: <20090119162633.D7E66208E4D@bastion.fedora.phx.redhat.com>

huff has set the watchcommits acl on appliance-tools (Fedora 10) to Approved for virtmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/appliance-tools



From pkgdb at fedoraproject.org  Mon Jan 19 16:26:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 16:26:29 +0000
Subject: [pkgdb] appliance-tools had acl change status
Message-ID: <20090119162633.E6FE5208E44@bastion.fedora.phx.redhat.com>

huff has set the watchbugzilla acl on appliance-tools (Fedora 10) to Approved for virtmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/appliance-tools



From katzj at fedoraproject.org  Mon Jan 19 16:29:19 2009
From: katzj at fedoraproject.org (Jeremy Katz)
Date: Mon, 19 Jan 2009 16:29:19 +0000 (UTC)
Subject: rpms/livecd-tools/devel .cvsignore, 1.17, 1.18 livecd-tools.spec,
	1.18, 1.19 sources, 1.17, 1.18
Message-ID: <20090119162919.16C8C700F8@cvs1.fedora.phx.redhat.com>

Author: katzj

Update of /cvs/pkgs/rpms/livecd-tools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31789

Modified Files:
	.cvsignore livecd-tools.spec sources 
Log Message:
* Mon Jan 19 2009 Jeremy Katz <katzj at redhat.com> - 021-1
- Start of support for hybrid GPT/MBR usb sticks (Stewart Adam)
- Fix for udev deprecated syntax (#480109)
- Keep cache with --cache (Jan Kratochvil, #479716)
- Use absolute path to cachedir (#479716)
- Support UDF for large ISO spins (Bruno Wolf, #476696)
- Improvements for encrypted /home setup (mdomsch, #475399)
- Don't allow spaces in labels (#475834)
- Fix --tmpdir relative path (dhuff)
- Support ext4 rootfs
- Fix device command version check (apevec)
- Allow URLs for specifying the kickstart config (bkearney)
- Fix macro name for excludedocs (bkearney)
- Fix up --base-on (#471656)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/livecd-tools/devel/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- .cvsignore	10 Oct 2008 14:26:57 -0000	1.17
+++ .cvsignore	19 Jan 2009 16:28:48 -0000	1.18
@@ -1 +1 @@
-livecd-tools-019.tar.bz2
+livecd-tools-021.tar.bz2


Index: livecd-tools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/livecd-tools/devel/livecd-tools.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- livecd-tools.spec	29 Nov 2008 16:48:08 -0000	1.18
+++ livecd-tools.spec	19 Jan 2009 16:28:48 -0000	1.19
@@ -4,8 +4,8 @@
 
 Summary: Tools for building live CD's
 Name: livecd-tools
-Version: 019
-Release: 2%{?dist}
+Version: 021
+Release: 1%{?dist}
 License: GPLv2
 Group: System Environment/Base
 URL: http://git.fedoraproject.org/?p=hosted/livecd
@@ -21,10 +21,11 @@
 Requires: dosfstools >= 2.11-8
 Requires: isomd5sum
 Requires: rhpl
+Requires: python-urlgrabber
 %ifarch %{ix86} x86_64
 Requires: syslinux
 %endif
-%ifarch ppc ppc64
+%ifarch ppc
 Requires: yaboot
 %endif
 BuildRequires: python
@@ -64,8 +65,32 @@
 %{python_sitelib}/imgcreate/*.pyc
 
 %changelog
-* Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 019-2
-- Rebuild for Python 2.6
+* Mon Jan 19 2009 Jeremy Katz <katzj at redhat.com> - 021-1
+- Start of support for hybrid GPT/MBR usb sticks (Stewart Adam)
+- Fix for udev deprecated syntax (#480109)
+- Keep cache with --cache (Jan Kratochvil, #479716)
+- Use absolute path to cachedir (#479716)
+- Support UDF for large ISO spins (Bruno Wolf, #476696)
+- Improvements for encrypted /home setup (mdomsch, #475399)
+- Don't allow spaces in labels (#475834)
+- Fix --tmpdir relative path (dhuff)
+- Support ext4 rootfs
+- Fix device command version check (apevec)
+- Allow URLs for specifying the kickstart config (bkearney)
+- Fix macro name for excludedocs (bkearney)
+- Fix up --base-on (#471656)
+
+* Wed Nov 12 2008 Jeremy Katz <katzj at redhat.com> - 020-1
+- Support setting up a swap file
+- Verify integer args in livecd-iso-to-disk (#467257)
+- Set up persistent /home on internal mtd0 for XO
+- Default to resetting the overlay on XO
+- Support copying the raw ext3fs to the usb stick instead of the squash
+- Mactel fixes
+- Align initrd properly on XO (#467093)
+- Make initrd load addr work on newer XO firmwares
+- Fix up Xen paths for Xen live images (Michael Ansel)
+- Support --defaultdesktop (Orion Poplawski)
 
 * Fri Oct 10 2008 Jeremy Katz <katzj at redhat.com> - 019-1
 - livecd-iso-to-disk: Various other XO fixes


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/livecd-tools/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources	10 Oct 2008 14:26:57 -0000	1.17
+++ sources	19 Jan 2009 16:28:48 -0000	1.18
@@ -1 +1 @@
-d8c24fd4c2c6ced8893ea16f22ce985c  livecd-tools-019.tar.bz2
+92d8706282f51ab188c09d2bc4461532  livecd-tools-021.tar.bz2



From cebbert at fedoraproject.org  Mon Jan 19 16:31:17 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Mon, 19 Jan 2009 16:31:17 +0000 (UTC)
Subject: rpms/kernel/F-9 kernel.spec, 1.891.2.5,
	1.891.2.6 linux-2.6-upstream-reverts.patch, 1.15.2.1,
	1.15.2.2 linux-2.6-alsa-backport-beep-switch.patch, 1.1,
	NONE linux-2.6-alsa-hda-sigmatel-add-missing-terminators.patch,
	1.1.2.1, NONE linux-2.6-defaults-alsa-hda-beep-off.patch, 1.1,
	NONE linux-2.6.27.7-alsa-driver-fixups.patch, 1.3,
	NONE linux-2.6.27.9-alsa-driver-1.0.18a.patch, 1.1,
	NONE linux-2.6.27.9-alsa-hda-add-a-quirk-for-dell-studio-15.patch,
	1.1, NONE linux-2.6.27.9-alsa-hda-mark-dell-studio-1535-quirk.patch, 
	1.1, NONE
	linux-2.6.27.9-alsa-hda-no-headphone-as-line-out-swich-without-line-outs.patch,
	1.1, NONE
Message-ID: <20090119163117.DFE66700F8@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32068

Modified Files:
      Tag: private-fedora-9-2_6_27-branch
	kernel.spec linux-2.6-upstream-reverts.patch 
Removed Files:
      Tag: private-fedora-9-2_6_27-branch
	linux-2.6-alsa-backport-beep-switch.patch 
	linux-2.6-alsa-hda-sigmatel-add-missing-terminators.patch 
	linux-2.6-defaults-alsa-hda-beep-off.patch 
	linux-2.6.27.7-alsa-driver-fixups.patch 
	linux-2.6.27.9-alsa-driver-1.0.18a.patch 
	linux-2.6.27.9-alsa-hda-add-a-quirk-for-dell-studio-15.patch 
	linux-2.6.27.9-alsa-hda-mark-dell-studio-1535-quirk.patch 
	linux-2.6.27.9-alsa-hda-no-headphone-as-line-out-swich-without-line-outs.patch 
Log Message:
Revert ALSA to what is upstream in 2.6.27.


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/kernel.spec,v
retrieving revision 1.891.2.5
retrieving revision 1.891.2.6
diff -u -r1.891.2.5 -r1.891.2.6
--- kernel.spec	19 Jan 2009 07:23:09 -0000	1.891.2.5
+++ kernel.spec	19 Jan 2009 16:30:45 -0000	1.891.2.6
@@ -644,15 +644,6 @@
 Patch400: linux-2.6-scsi-cpqarray-set-master.patch
 Patch402: linux-2.6-scsi-mpt-vmware-fix.patch
 
-Patch410: linux-2.6.27.9-alsa-driver-1.0.18a.patch
-Patch411: linux-2.6.27.7-alsa-driver-fixups.patch
-Patch412: linux-2.6.27.9-alsa-hda-add-a-quirk-for-dell-studio-15.patch
-Patch413: linux-2.6.27.9-alsa-hda-no-headphone-as-line-out-swich-without-line-outs.patch
-Patch414: linux-2.6.27.9-alsa-hda-mark-dell-studio-1535-quirk.patch
-Patch415: linux-2.6-alsa-backport-beep-switch.patch
-Patch416: linux-2.6-defaults-alsa-hda-beep-off.patch
-Patch417: linux-2.6-alsa-hda-sigmatel-add-missing-terminators.patch
-
 # filesystem patches
 Patch421: linux-2.6-squashfs.patch
 
@@ -1203,14 +1194,6 @@
 
 # ALSA
 #
-ApplyPatch linux-2.6.27.9-alsa-driver-1.0.18a.patch
-ApplyPatch linux-2.6.27.7-alsa-driver-fixups.patch
-ApplyPatch linux-2.6.27.9-alsa-hda-add-a-quirk-for-dell-studio-15.patch
-ApplyPatch linux-2.6.27.9-alsa-hda-no-headphone-as-line-out-swich-without-line-outs.patch
-ApplyPatch linux-2.6.27.9-alsa-hda-mark-dell-studio-1535-quirk.patch
-ApplyPatch linux-2.6-alsa-backport-beep-switch.patch
-ApplyPatch linux-2.6-defaults-alsa-hda-beep-off.patch
-ApplyPatch linux-2.6-alsa-hda-sigmatel-add-missing-terminators.patch
 
 # block/bio
 #
@@ -1922,6 +1905,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 Jan 19 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.27.12-78.2.5
+- Revert ALSA to what is upstream in 2.6.27.
+
 * Mon Jan 19 2009 Kyle McMartin <kyle at redhat.com> 2.6.27.12-78.2.4
 - Linux 2.6.27.12
 

linux-2.6-upstream-reverts.patch:

Index: linux-2.6-upstream-reverts.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/linux-2.6-upstream-reverts.patch,v
retrieving revision 1.15.2.1
retrieving revision 1.15.2.2
diff -u -r1.15.2.1 -r1.15.2.2
--- linux-2.6-upstream-reverts.patch	16 Jan 2009 19:23:22 -0000	1.15.2.1
+++ linux-2.6-upstream-reverts.patch	19 Jan 2009 16:30:46 -0000	1.15.2.2
@@ -382,30 +382,3 @@
  	int gap_count;
  	bool beta_repeaters_present;
  
-From 574f3c4f5c55e99ea60f71fd98cc54931d4b2eae Mon Sep 17 00:00:00 2001
-From: Herton Ronaldo Krzesinski <herton at mandriva.com.br>
-Date: Tue, 23 Dec 2008 16:53:00 -0200
-Subject: ALSA: hda - Add missing terminators in patch_sigmatel.c
-
-From: Herton Ronaldo Krzesinski <herton at mandriva.com.br>
-
-commit 574f3c4f5c55e99ea60f71fd98cc54931d4b2eae upstream.
-
-Signed-off-by: Herton Ronaldo Krzesinski <herton at mandriva.com.br>
-Signed-off-by: Takashi Iwai <tiwai at suse.de>
-Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
-
----
- sound/pci/hda/patch_sigmatel.c |    1 +
- 1 file changed, 1 insertion(+)
-
---- a/sound/pci/hda/patch_sigmatel.c
-+++ b/sound/pci/hda/patch_sigmatel.c
-@@ -638,6 +638,7 @@ static struct hda_verb stac92hd71bxx_cor
- 	{ 0x0a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
- 	{ 0x0d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
- 	{ 0x0f, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
-+	{}
- };
- 
- #define HD_DISABLE_PORTF 3


--- linux-2.6-alsa-backport-beep-switch.patch DELETED ---


--- linux-2.6-alsa-hda-sigmatel-add-missing-terminators.patch DELETED ---


--- linux-2.6-defaults-alsa-hda-beep-off.patch DELETED ---


--- linux-2.6.27.7-alsa-driver-fixups.patch DELETED ---


--- linux-2.6.27.9-alsa-driver-1.0.18a.patch DELETED ---


--- linux-2.6.27.9-alsa-hda-add-a-quirk-for-dell-studio-15.patch DELETED ---


--- linux-2.6.27.9-alsa-hda-mark-dell-studio-1535-quirk.patch DELETED ---


--- linux-2.6.27.9-alsa-hda-no-headphone-as-line-out-swich-without-line-outs.patch DELETED ---



From bpepple at fedoraproject.org  Mon Jan 19 16:38:45 2009
From: bpepple at fedoraproject.org (Brian Pepple)
Date: Mon, 19 Jan 2009 16:38:45 +0000 (UTC)
Subject: rpms/rhythmbox/F-10 rb-avahi-assertion.patch, NONE,
	1.1 rhythmbox.spec, 1.218, 1.219
Message-ID: <20090119163845.E0705700F8@cvs1.fedora.phx.redhat.com>

Author: bpepple

Update of /cvs/pkgs/rpms/rhythmbox/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv851

Modified Files:
	rhythmbox.spec 
Added Files:
	rb-avahi-assertion.patch 
Log Message:
* Mon Jan 19 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.11.6-19.r6096
- Backport patch to fix avahi assertion in DAAP plugin.
- Better URL
- Tweak description


rb-avahi-assertion.patch:

--- NEW FILE rb-avahi-assertion.patch ---
--- trunk/plugins/daap/rb-daap-mdns-avahi.c	2008/12/17 10:44:50	6103
+++ trunk/plugins/daap/rb-daap-mdns-avahi.c	2008/12/18 02:27:16	6104
@@ -114,7 +114,9 @@
 void
 rb_daap_mdns_avahi_set_entry_group (AvahiEntryGroup *eg)
 {
-	g_assert (eg == NULL || entry_group == NULL);
-	g_assert (avahi_entry_group_get_client (eg) == client);
+	if (eg != NULL) {
+		g_assert (entry_group == NULL);
+		g_assert (avahi_entry_group_get_client (eg) == client);
+	}
 	entry_group = eg;
 }


Index: rhythmbox.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rhythmbox/F-10/rhythmbox.spec,v
retrieving revision 1.218
retrieving revision 1.219
diff -u -r1.218 -r1.219
--- rhythmbox.spec	13 Jan 2009 12:11:06 -0000	1.218
+++ rhythmbox.spec	19 Jan 2009 16:38:15 -0000	1.219
@@ -3,10 +3,10 @@
 Name: rhythmbox
 Summary: Music Management Application 
 Version: 0.11.6
-Release: 18.r6096%{?dist}
+Release: 19.r6096%{?dist}
 License: GPLv2+ with exceptions and GFDL
 Group: Applications/Multimedia
-URL: http://www.gnome.org/projects/rhythmbox/
+URL: http://projects.gnome.org/rhythmbox/
 #Source: http://download.gnome.org/sources/rhythmbox/0.11/%{name}-%{version}.tar.bz2
 Source: %{name}-%{version}-r6096.tar.gz
 Source1: rhythmbox-iradio-initial.pls
@@ -55,19 +55,25 @@
 # https://bugzilla.redhat.com/show_bug.cgi?id=428034
 Patch0: rb-disable-power-plugin-by-default.patch
 
+# http://bugzilla.gnome.org/show_bug.cgi?id=562188
+Patch1: rb-avahi-assertion.patch
+
 %description
 Rhythmbox is an integrated music management application based on the powerful
 GStreamer media framework. It has a number of features, including an easy to
 use music browser, searching and sorting, comprehensive audio format support
 through GStreamer, Internet Radio support, playlists and more.
 
+Rhythmbox is extensible through a plugin system.
+
 %package lirc
 Summary: LIRC (Infrared remote) plugin for Rhythmbox
 Group: Applications/Multimedia
 Requires: %{name} = %{version}-%{release}
 
 %description lirc
-A plugin to add LIRC (Infrared remote) support to Rhythmbox.
+This package contains a plugin to add LIRC (Infrared remote) support 
+to Rhythmbox.
 
 %package upnp
 Summary: UPNP/DLNA plugin for Rhythmbox
@@ -77,13 +83,14 @@
 Requires: python-louie python-twisted
 
 %description upnp
-A plugin to add support to Rhythmbox, for playing media from, and sending media to
-UPnP/DLNA network devices.
+This package contains a Rhythmbox plugin to add support for playing media 
+from, and sending media to UPnP/DLNA network devices.
 
 %prep
 %setup -q
 
 %patch0 -p0 -b .dont-disable-suspend
+%patch1 -p1 -b .avahi-assertion
 
 %build
 
@@ -220,6 +227,11 @@
 %{_libdir}/rhythmbox/plugins/upnp_coherence
 
 %changelog
+* Mon Jan 19 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.11.6-19.r6096
+- Backport patch to fix avahi assertion in DAAP plugin.
+- Better URL
+- Tweak description
+
 * Tue Jan 13 2009 - Bastien Nocera <bnocera at redhat.com> - 0.11.6-18.r6096
 - Add more Python deps for the UPNP plugin (#474372)
 



From caolanm at fedoraproject.org  Mon Jan 19 16:39:57 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Mon, 19 Jan 2009 16:39:57 +0000 (UTC)
Subject: rpms/openoffice.org/F-10
	openoffice.org-3.0.1.ooo98240.sc.basicworkaround.patch, 1.1, 1.2
Message-ID: <20090119163957.B70E8700F8@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1068/F-10

Modified Files:
	openoffice.org-3.0.1.ooo98240.sc.basicworkaround.patch 
Log Message:
switch to alternative patch

openoffice.org-3.0.1.ooo98240.sc.basicworkaround.patch:

Index: openoffice.org-3.0.1.ooo98240.sc.basicworkaround.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-10/openoffice.org-3.0.1.ooo98240.sc.basicworkaround.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openoffice.org-3.0.1.ooo98240.sc.basicworkaround.patch	19 Jan 2009 13:24:42 -0000	1.1
+++ openoffice.org-3.0.1.ooo98240.sc.basicworkaround.patch	19 Jan 2009 16:39:27 -0000	1.2
@@ -1,36 +1,13 @@
-Index: source/filter/excel/excel.cxx
-===================================================================
-RCS file: /cvs/sc/sc/source/filter/excel/excel.cxx,v
-retrieving revision 1.27
-diff -u -r1.27 excel.cxx
---- openoffice.org.orig/sc/source/filter/excel/excel.cxx	2 Jul 2008 09:00:17 -0000	1.27
-+++ openoffice.org/sc/source/filter/excel/excel.cxx	19 Jan 2009 13:10:56 -0000
-@@ -33,6 +33,7 @@
+diff --git sfx2/source/doc/objserv.cxx sfx2/source/doc/objserv.cxx
+index 80944e4..204dd55 100644
+--- openoffice.org.orig/sfx2/source/doc/objserv.cxx
++++ openoffice.org/sfx2/source/doc/objserv.cxx
+@@ -1333,7 +1333,7 @@ sal_uInt16 SfxObjectShell::ImplGetSignatureState( sal_Bool bScriptingContent )
+     {
+         *pState = SIGNATURESTATE_NOSIGNATURES;
  
- #include <sfx2/docfile.hxx>
- #include <sfx2/app.hxx>
-+#include <sfx2/objsh.hxx>
- #include <sot/storage.hxx>
- #include <sot/exchange.hxx>
- #include <tools/globname.hxx>
-@@ -79,6 +80,20 @@
-         return eERR_FORMAT;
-     }
- 
-+#if 1
-+	SfxApplication* pSfxApp = SFX_APP();
-+	pSfxApp->EnterBasicCall();              // initialize document's BASIC
-+
-+	//RootStorage is destroyed if GetBasic gets called later
-+	//in xiescher.cxx's XclImpDrawObjBase::ReadMacro GetBasic
-+	//call, so preemtively call it now beforehand as a 
-+	//workaround
-+        if( SfxObjectShell* pDocShell = pDocument->GetDocumentShell() )
-+                pDocShell->GetBasic();
-+	pSfxApp->LeaveBasicCall();
-+#endif
-+
-+
-     // check the input stream from medium
-     SvStream* pMedStrm = rMedium.GetInStream();
-     DBG_ASSERT( pMedStrm, "::ScImportExcel - medium without input stream" );
+-        if ( GetMedium() && GetMedium()->GetName().Len() && GetMedium()->GetStorage().is() && IsOwnStorageFormat_Impl( *GetMedium()) )
++        if ( GetMedium() && GetMedium()->GetName().Len() &&  IsOwnStorageFormat_Impl( *GetMedium()) && GetMedium()->GetStorage().is() )
+         {
+ 			try
+ 			{



From caolanm at fedoraproject.org  Mon Jan 19 16:39:58 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Mon, 19 Jan 2009 16:39:58 +0000 (UTC)
Subject: rpms/openoffice.org/devel
	openoffice.org-3.0.1.ooo98240.sc.basicworkaround.patch, 1.1, 1.2
Message-ID: <20090119163958.199E8700F8@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1068/devel

Modified Files:
	openoffice.org-3.0.1.ooo98240.sc.basicworkaround.patch 
Log Message:
switch to alternative patch

openoffice.org-3.0.1.ooo98240.sc.basicworkaround.patch:

Index: openoffice.org-3.0.1.ooo98240.sc.basicworkaround.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-3.0.1.ooo98240.sc.basicworkaround.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openoffice.org-3.0.1.ooo98240.sc.basicworkaround.patch	19 Jan 2009 13:22:30 -0000	1.1
+++ openoffice.org-3.0.1.ooo98240.sc.basicworkaround.patch	19 Jan 2009 16:39:27 -0000	1.2
@@ -1,36 +1,13 @@
-Index: source/filter/excel/excel.cxx
-===================================================================
-RCS file: /cvs/sc/sc/source/filter/excel/excel.cxx,v
-retrieving revision 1.27
-diff -u -r1.27 excel.cxx
---- openoffice.org.orig/sc/source/filter/excel/excel.cxx	2 Jul 2008 09:00:17 -0000	1.27
-+++ openoffice.org/sc/source/filter/excel/excel.cxx	19 Jan 2009 13:10:56 -0000
-@@ -33,6 +33,7 @@
+diff --git sfx2/source/doc/objserv.cxx sfx2/source/doc/objserv.cxx
+index 80944e4..204dd55 100644
+--- openoffice.org.orig/sfx2/source/doc/objserv.cxx
++++ openoffice.org/sfx2/source/doc/objserv.cxx
+@@ -1333,7 +1333,7 @@ sal_uInt16 SfxObjectShell::ImplGetSignatureState( sal_Bool bScriptingContent )
+     {
+         *pState = SIGNATURESTATE_NOSIGNATURES;
  
- #include <sfx2/docfile.hxx>
- #include <sfx2/app.hxx>
-+#include <sfx2/objsh.hxx>
- #include <sot/storage.hxx>
- #include <sot/exchange.hxx>
- #include <tools/globname.hxx>
-@@ -79,6 +80,20 @@
-         return eERR_FORMAT;
-     }
- 
-+#if 1
-+	SfxApplication* pSfxApp = SFX_APP();
-+	pSfxApp->EnterBasicCall();              // initialize document's BASIC
-+
-+	//RootStorage is destroyed if GetBasic gets called later
-+	//in xiescher.cxx's XclImpDrawObjBase::ReadMacro GetBasic
-+	//call, so preemtively call it now beforehand as a 
-+	//workaround
-+        if( SfxObjectShell* pDocShell = pDocument->GetDocumentShell() )
-+                pDocShell->GetBasic();
-+	pSfxApp->LeaveBasicCall();
-+#endif
-+
-+
-     // check the input stream from medium
-     SvStream* pMedStrm = rMedium.GetInStream();
-     DBG_ASSERT( pMedStrm, "::ScImportExcel - medium without input stream" );
+-        if ( GetMedium() && GetMedium()->GetName().Len() && GetMedium()->GetStorage().is() && IsOwnStorageFormat_Impl( *GetMedium()) )
++        if ( GetMedium() && GetMedium()->GetName().Len() &&  IsOwnStorageFormat_Impl( *GetMedium()) && GetMedium()->GetStorage().is() )
+         {
+ 			try
+ 			{



From than at fedoraproject.org  Mon Jan 19 16:45:45 2009
From: than at fedoraproject.org (Than Ngo)
Date: Mon, 19 Jan 2009 16:45:45 +0000 (UTC)
Subject: rpms/isdn4k-utils/devel
	isdn4k-utils-misc-overflow-in-capi-subsystem.patch, NONE,
	1.1 isdn4k-utils-sh-linux.patch, NONE, 1.1 isdn4k-utils.spec,
	1.77, 1.78
Message-ID: <20090119164545.84568700F8@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/isdn4k-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1665

Modified Files:
	isdn4k-utils.spec 
Added Files:
	isdn4k-utils-misc-overflow-in-capi-subsystem.patch 
	isdn4k-utils-sh-linux.patch 
Log Message:
- fix #398121, capiplugin.so uses non-existent libcapi20.so
- fix CAPI overflow
- fix #471712, add sh architecture support


isdn4k-utils-misc-overflow-in-capi-subsystem.patch:

--- NEW FILE isdn4k-utils-misc-overflow-in-capi-subsystem.patch ---
diff -up isdn4k-utils-CVS-2006-07-20/capi20/convert.c.orig isdn4k-utils-CVS-2006-07-20/capi20/convert.c
--- isdn4k-utils-CVS-2006-07-20/capi20/convert.c.orig	2009-01-19 17:24:26.000000000 +0100
+++ isdn4k-utils-CVS-2006-07-20/capi20/convert.c	2009-01-19 17:25:42.000000000 +0100
@@ -894,8 +894,12 @@ static char *p = 0;
 static void bufprint(char *fmt,...)
 {
 	va_list f;
+	size_t remain = (p >= buf && p < buf+sizeof(buf))
+				  ? buf+sizeof(buf)-p
+				  : 0;
+
 	va_start(f, fmt);
-	vsprintf(p, fmt, f);
+	vsnprintf(p, remain, fmt, f);
 	va_end(f);
 	p += strlen(p);
 }

isdn4k-utils-sh-linux.patch:

--- NEW FILE isdn4k-utils-sh-linux.patch ---
--- isdn4k-utils-CVS-2006-07-20/ipppd/main.c.org	2008-07-06 00:10:14.000000000 +0900
+++ isdn4k-utils-CVS-2006-07-20/ipppd/main.c	2008-07-06 00:11:11.000000000 +0900
@@ -1302,7 +1302,7 @@
          * what gets passed for a va_list is like a void * in some sense.
          */
         a = va_arg(args, void *);
-#ifdef __alpha__       /* always do this? */
+#if defined(__alpha__) || defined(__sh__)       /* always do this? */
 	n = fmtmsg(buf, buflen + 1, f, a);
 #else
 	n = vfmtmsg(buf, buflen + 1, f, a);


Index: isdn4k-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/isdn4k-utils/devel/isdn4k-utils.spec,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- isdn4k-utils.spec	19 Jan 2009 14:24:52 -0000	1.77
+++ isdn4k-utils.spec	19 Jan 2009 16:45:15 -0000	1.78
@@ -44,6 +44,8 @@
 Patch14: isdn4k-utils-CVS-2006-07-20-pppd-2.4.4.patch
 Patch15: isdn4k-utils-gcc3x.patch
 Patch16: isdn4k-utils-CVS-2006-07-20-capi.patch
+Patch17: isdn4k-utils-misc-overflow-in-capi-subsystem.patch
+Patch18: isdn4k-utils-sh-linux.patch
 
 BuildRoot: %{_tmppath}/%name-%{version}-%{release}-root
 
@@ -130,6 +132,8 @@
 %patch14 -p1 -b .pppd-2.4.4
 %patch15 -p1 -b .glibc
 %patch16 -p1 -b .capi
+%patch17 -p1 -b .misc-overflow
+%patch18 -p1 -b .sh-support
 
 for i in */configure; do
 	cd `dirname $i`
@@ -506,6 +510,8 @@
 %changelog
 * Mon Jan 19 2009 Than Ngo <than at redhat.com> - 3.2-62
 - fix #398121, capiplugin.so uses non-existent libcapi20.so
+- fix CAPI overflow
+- fix #471712, add sh architecture support
 
 * Mon Oct 27 2008 Than Ngo <than at redhat.com> 3.2-61
 - bz450370, fix multilib issue



From pwouters at fedoraproject.org  Mon Jan 19 16:53:52 2009
From: pwouters at fedoraproject.org (Paul Wouters)
Date: Mon, 19 Jan 2009 16:53:52 +0000 (UTC)
Subject: rpms/nsd/devel .cvsignore,1.14,1.15 sources,1.20,1.21
Message-ID: <20090119165352.7DB30700F8@cvs1.fedora.phx.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/nsd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2652

Modified Files:
	.cvsignore sources 
Log Message:
new sources



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/nsd/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	10 Nov 2008 17:40:09 -0000	1.14
+++ .cvsignore	19 Jan 2009 16:53:22 -0000	1.15
@@ -10,3 +10,4 @@
 nsd-3.1.0.tar.gz
 nsd-3.1.1.tar.gz
 nsd-3.2.0.tar.gz
+nsd-3.2.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nsd/devel/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources	11 Nov 2008 03:38:47 -0000	1.20
+++ sources	19 Jan 2009 16:53:22 -0000	1.21
@@ -1 +1 @@
-f93a3f23cf1d4ec46adec184e71b4179  nsd-3.2.0.tar.gz
+66b602a793b851ad109403d3d2654fad  nsd-3.2.1.tar.gz



From stingray at fedoraproject.org  Mon Jan 19 17:02:25 2009
From: stingray at fedoraproject.org (Paul P Komkoff Jr)
Date: Mon, 19 Jan 2009 17:02:25 +0000 (UTC)
Subject: rpms/libnfnetlink/devel .cvsignore, 1.6, 1.7 libnfnetlink.spec, 1.13,
	1.14 sources, 1.6, 1.7
Message-ID: <20090119170225.6ADEA700F8@cvs1.fedora.phx.redhat.com>

Author: stingray

Update of /cvs/extras/rpms/libnfnetlink/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3843

Modified Files:
	.cvsignore libnfnetlink.spec sources 
Log Message:
libnfnetlink-0.0.40-1


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libnfnetlink/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	16 Jul 2008 20:19:47 -0000	1.6
+++ .cvsignore	19 Jan 2009 17:01:55 -0000	1.7
@@ -1 +1 @@
-libnfnetlink-0.0.39.tar.bz2
+libnfnetlink-0.0.40.tar.bz2


Index: libnfnetlink.spec
===================================================================
RCS file: /cvs/extras/rpms/libnfnetlink/devel/libnfnetlink.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- libnfnetlink.spec	13 Jan 2009 09:10:27 -0000	1.13
+++ libnfnetlink.spec	19 Jan 2009 17:01:55 -0000	1.14
@@ -2,8 +2,8 @@
 # %define basever 0.0.30
 
 Name:           libnfnetlink
-Version:        0.0.39
-Release:        4%{?dist}
+Version:        0.0.40
+Release:        1%{?dist}
 Summary:        Netfilter netlink userspace library
 Group:          System Environment/Libraries
 License:        GPLv2
@@ -69,6 +69,9 @@
 %{_includedir}/libnfnetlink/*.h
 
 %changelog
+* Mon Jan 19 2009 Paul P. Komkoff Jr <i at stingr.net> - 0.0.40-1
+- upstream release
+
 * Tue Jan 13 2009 Caol??n McNamara <caolanm at redhat.com> - 0.0.39-4
 - rebuild to get provides pkgconfig(libnfnetlink)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libnfnetlink/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	16 Jul 2008 20:19:48 -0000	1.6
+++ sources	19 Jan 2009 17:01:55 -0000	1.7
@@ -1 +1 @@
-348fed8c1edbe5b873ffc7b192140093  libnfnetlink-0.0.39.tar.bz2
+3fe19dc4b05ba7e7e6216123097c2819  libnfnetlink-0.0.40.tar.bz2



From pkgdb at fedoraproject.org  Mon Jan 19 17:11:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:11:54 +0000
Subject: [pkgdb] virt-top had acl change status
Message-ID: <20090119171154.674A9208470@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on virt-top (Fedora devel) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/virt-top



From pkgdb at fedoraproject.org  Mon Jan 19 17:11:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:11:55 +0000
Subject: [pkgdb] virt-top had acl change status
Message-ID: <20090119171155.7C2DA208473@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on virt-top (Fedora devel) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/virt-top



From pkgdb at fedoraproject.org  Mon Jan 19 17:11:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:11:58 +0000
Subject: [pkgdb] virt-top had acl change status
Message-ID: <20090119171158.D2673208476@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on virt-top (Fedora 9) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/virt-top



From pkgdb at fedoraproject.org  Mon Jan 19 17:12:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:12:00 +0000
Subject: [pkgdb] virt-top had acl change status
Message-ID: <20090119171201.8863C208479@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on virt-top (Fedora 9) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/virt-top



From pkgdb at fedoraproject.org  Mon Jan 19 17:12:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:12:05 +0000
Subject: [pkgdb] virt-top had acl change status
Message-ID: <20090119171205.AFF8420847E@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on virt-top (Fedora EPEL 5) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/virt-top



From pkgdb at fedoraproject.org  Mon Jan 19 17:12:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:12:06 +0000
Subject: [pkgdb] virt-top had acl change status
Message-ID: <20090119171206.7DDFE20847F@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on virt-top (Fedora EPEL 5) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/virt-top



From pkgdb at fedoraproject.org  Mon Jan 19 17:12:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:12:06 +0000
Subject: [pkgdb] virt-top had acl change status
Message-ID: <20090119171206.E9425208481@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on virt-top (Fedora 10) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/virt-top



From pkgdb at fedoraproject.org  Mon Jan 19 17:12:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:12:09 +0000
Subject: [pkgdb] virt-top had acl change status
Message-ID: <20090119171209.6A75F208486@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on virt-top (Fedora 10) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/virt-top



From pkgdb at fedoraproject.org  Mon Jan 19 17:12:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:12:16 +0000
Subject: [pkgdb] virt-ctrl had acl change status
Message-ID: <20090119171216.3E756208489@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on virt-ctrl (Fedora devel) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/virt-ctrl



From pkgdb at fedoraproject.org  Mon Jan 19 17:12:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:12:17 +0000
Subject: [pkgdb] virt-ctrl had acl change status
Message-ID: <20090119171217.E153520848B@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on virt-ctrl (Fedora devel) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/virt-ctrl



From pkgdb at fedoraproject.org  Mon Jan 19 17:12:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:12:19 +0000
Subject: [pkgdb] virt-ctrl had acl change status
Message-ID: <20090119171220.2582920848D@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on virt-ctrl (Fedora 10) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/virt-ctrl



From pkgdb at fedoraproject.org  Mon Jan 19 17:12:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:12:20 +0000
Subject: [pkgdb] virt-ctrl had acl change status
Message-ID: <20090119171220.3BC37208490@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on virt-ctrl (Fedora 10) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/virt-ctrl



From pkgdb at fedoraproject.org  Mon Jan 19 17:12:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:12:35 +0000
Subject: [pkgdb] cduce had acl change status
Message-ID: <20090119171235.B908C208478@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on cduce (Fedora devel) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cduce



From pkgdb at fedoraproject.org  Mon Jan 19 17:12:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:12:35 +0000
Subject: [pkgdb] cduce had acl change status
Message-ID: <20090119171236.3F4A5208491@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on cduce (Fedora devel) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cduce



From pkgdb at fedoraproject.org  Mon Jan 19 17:12:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:12:39 +0000
Subject: [pkgdb] cduce had acl change status
Message-ID: <20090119171239.75300208492@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on cduce (Fedora 9) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cduce



From pkgdb at fedoraproject.org  Mon Jan 19 17:12:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:12:41 +0000
Subject: [pkgdb] cduce had acl change status
Message-ID: <20090119171241.DF51F20847D@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on cduce (Fedora 10) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cduce



From pkgdb at fedoraproject.org  Mon Jan 19 17:12:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:12:44 +0000
Subject: [pkgdb] cduce had acl change status
Message-ID: <20090119171244.30F53208496@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on cduce (Fedora 10) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cduce



From pkgdb at fedoraproject.org  Mon Jan 19 17:12:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:12:47 +0000
Subject: [pkgdb] cduce had acl change status
Message-ID: <20090119171247.BC4522084A7@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on cduce (Fedora 9) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cduce



From pkgdb at fedoraproject.org  Mon Jan 19 17:13:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:13:00 +0000
Subject: [pkgdb] emacs-common-tuareg had acl change status
Message-ID: <20090119171300.B9DBE208482@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on emacs-common-tuareg (Fedora devel) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/emacs-common-tuareg



From pkgdb at fedoraproject.org  Mon Jan 19 17:13:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:13:04 +0000
Subject: [pkgdb] emacs-common-tuareg had acl change status
Message-ID: <20090119171304.4A55E208485@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on emacs-common-tuareg (Fedora devel) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/emacs-common-tuareg



From pkgdb at fedoraproject.org  Mon Jan 19 17:13:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:13:05 +0000
Subject: [pkgdb] emacs-common-tuareg had acl change status
Message-ID: <20090119171305.59D752084BA@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on emacs-common-tuareg (Fedora 9) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/emacs-common-tuareg



From pkgdb at fedoraproject.org  Mon Jan 19 17:13:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:13:06 +0000
Subject: [pkgdb] emacs-common-tuareg had acl change status
Message-ID: <20090119171306.6588F208679@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on emacs-common-tuareg (Fedora 9) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/emacs-common-tuareg



From pkgdb at fedoraproject.org  Mon Jan 19 17:13:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:13:06 +0000
Subject: [pkgdb] emacs-common-tuareg had acl change status
Message-ID: <20090119171306.CA1EE208701@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on emacs-common-tuareg (Fedora 10) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/emacs-common-tuareg



From pkgdb at fedoraproject.org  Mon Jan 19 17:13:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:13:08 +0000
Subject: [pkgdb] emacs-common-tuareg had acl change status
Message-ID: <20090119171308.EC71420873D@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on emacs-common-tuareg (Fedora 10) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/emacs-common-tuareg



From pkgdb at fedoraproject.org  Mon Jan 19 17:14:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:14:11 +0000
Subject: [pkgdb] ocaml-omake had acl change status
Message-ID: <20090119171411.56840208477@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on ocaml-omake (Fedora devel) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-omake



From pkgdb at fedoraproject.org  Mon Jan 19 17:14:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:14:12 +0000
Subject: [pkgdb] ocaml-omake had acl change status
Message-ID: <20090119171412.31E4420847A@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on ocaml-omake (Fedora devel) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-omake



From pkgdb at fedoraproject.org  Mon Jan 19 17:14:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:14:17 +0000
Subject: [pkgdb] ocaml-omake had acl change status
Message-ID: <20090119171417.A3DFA208488@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on ocaml-omake (Fedora 9) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-omake



From pkgdb at fedoraproject.org  Mon Jan 19 17:14:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:14:17 +0000
Subject: [pkgdb] ocaml-omake had acl change status
Message-ID: <20090119171417.BEEAC20848B@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on ocaml-omake (Fedora 9) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-omake



From pkgdb at fedoraproject.org  Mon Jan 19 17:14:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:14:17 +0000
Subject: [pkgdb] ocaml-omake had acl change status
Message-ID: <20090119171417.E6EB020848E@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on ocaml-omake (Fedora EPEL 5) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-omake



From pkgdb at fedoraproject.org  Mon Jan 19 17:14:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:14:18 +0000
Subject: [pkgdb] ocaml-omake had acl change status
Message-ID: <20090119171419.5FD70208490@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on ocaml-omake (Fedora EPEL 5) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-omake



From pkgdb at fedoraproject.org  Mon Jan 19 17:14:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:14:19 +0000
Subject: [pkgdb] ocaml-omake had acl change status
Message-ID: <20090119171419.F156C208495@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on ocaml-omake (Fedora EPEL 4) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-omake



From pkgdb at fedoraproject.org  Mon Jan 19 17:14:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:14:22 +0000
Subject: [pkgdb] ocaml-omake had acl change status
Message-ID: <20090119171422.7E84C208493@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on ocaml-omake (Fedora EPEL 4) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-omake



From pkgdb at fedoraproject.org  Mon Jan 19 17:14:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:14:24 +0000
Subject: [pkgdb] ocaml-omake had acl change status
Message-ID: <20090119171424.6239120873F@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on ocaml-omake (Fedora 10) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-omake



From pkgdb at fedoraproject.org  Mon Jan 19 17:14:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:14:26 +0000
Subject: [pkgdb] ocaml-omake had acl change status
Message-ID: <20090119171426.F097420876B@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on ocaml-omake (Fedora 10) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-omake



From pkgdb at fedoraproject.org  Mon Jan 19 17:14:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:14:32 +0000
Subject: [pkgdb] ocaml-gsl had acl change status
Message-ID: <20090119171432.6C56D208481@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on ocaml-gsl (Fedora devel) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-gsl



From pkgdb at fedoraproject.org  Mon Jan 19 17:14:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:14:36 +0000
Subject: [pkgdb] ocaml-gsl had acl change status
Message-ID: <20090119171436.8195920896A@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on ocaml-gsl (Fedora devel) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-gsl



From pkgdb at fedoraproject.org  Mon Jan 19 17:14:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:14:36 +0000
Subject: [pkgdb] ocaml-gsl had acl change status
Message-ID: <20090119171436.E48F4208974@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on ocaml-gsl (Fedora 9) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-gsl



From pkgdb at fedoraproject.org  Mon Jan 19 17:14:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:14:36 +0000
Subject: [pkgdb] ocaml-gsl had acl change status
Message-ID: <20090119171436.EDC4C20897B@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on ocaml-gsl (Fedora 9) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-gsl



From pkgdb at fedoraproject.org  Mon Jan 19 17:14:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:14:39 +0000
Subject: [pkgdb] ocaml-gsl had acl change status
Message-ID: <20090119171439.402D12089F1@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on ocaml-gsl (Fedora EPEL 4) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-gsl



From pkgdb at fedoraproject.org  Mon Jan 19 17:14:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:14:41 +0000
Subject: [pkgdb] ocaml-gsl had acl change status
Message-ID: <20090119171441.F1FBA208A5F@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on ocaml-gsl (Fedora EPEL 4) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-gsl



From pkgdb at fedoraproject.org  Mon Jan 19 17:14:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:14:44 +0000
Subject: [pkgdb] ocaml-gsl had acl change status
Message-ID: <20090119171444.44948208D0C@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on ocaml-gsl (Fedora EPEL 5) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-gsl



From pkgdb at fedoraproject.org  Mon Jan 19 17:14:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:14:42 +0000
Subject: [pkgdb] ocaml-gsl had acl change status
Message-ID: <20090119171444.9BD38208D5D@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on ocaml-gsl (Fedora EPEL 5) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-gsl



From pkgdb at fedoraproject.org  Mon Jan 19 17:14:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:14:46 +0000
Subject: [pkgdb] ocaml-gsl had acl change status
Message-ID: <20090119171448.10AA6208DDE@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on ocaml-gsl (Fedora 10) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-gsl



From pkgdb at fedoraproject.org  Mon Jan 19 17:14:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:14:47 +0000
Subject: [pkgdb] ocaml-gsl had acl change status
Message-ID: <20090119171448.1D5BE208DE0@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on ocaml-gsl (Fedora 10) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-gsl



From pkgdb at fedoraproject.org  Mon Jan 19 17:14:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:14:54 +0000
Subject: [pkgdb] ocaml-gettext had acl change status
Message-ID: <20090119171454.9019B20866E@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on ocaml-gettext (Fedora devel) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-gettext



From pkgdb at fedoraproject.org  Mon Jan 19 17:14:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:14:55 +0000
Subject: [pkgdb] ocaml-gettext had acl change status
Message-ID: <20090119171455.543C6208DE2@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on ocaml-gettext (Fedora devel) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-gettext



From pkgdb at fedoraproject.org  Mon Jan 19 17:14:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:14:56 +0000
Subject: [pkgdb] ocaml-gettext had acl change status
Message-ID: <20090119171456.BC460208DE5@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on ocaml-gettext (Fedora 9) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-gettext



From pkgdb at fedoraproject.org  Mon Jan 19 17:14:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:14:58 +0000
Subject: [pkgdb] ocaml-gettext had acl change status
Message-ID: <20090119171458.81643208DE8@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on ocaml-gettext (Fedora 9) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-gettext



From pkgdb at fedoraproject.org  Mon Jan 19 17:15:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:15:02 +0000
Subject: [pkgdb] ocaml-gettext had acl change status
Message-ID: <20090119171502.C22BC208DEA@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on ocaml-gettext (Fedora 10) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-gettext



From pkgdb at fedoraproject.org  Mon Jan 19 17:15:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:15:07 +0000
Subject: [pkgdb] ocaml-gettext had acl change status
Message-ID: <20090119171507.94B00208739@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on ocaml-gettext (Fedora 10) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-gettext



From pkgdb at fedoraproject.org  Mon Jan 19 17:15:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:15:12 +0000
Subject: [pkgdb] ocaml-bitmatch had acl change status
Message-ID: <20090119171512.304D3208DEE@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on ocaml-bitmatch (Fedora devel) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-bitmatch



From pkgdb at fedoraproject.org  Mon Jan 19 17:15:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:15:14 +0000
Subject: [pkgdb] ocaml-bitmatch had acl change status
Message-ID: <20090119171515.06D28208472@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on ocaml-bitmatch (Fedora devel) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-bitmatch



From pkgdb at fedoraproject.org  Mon Jan 19 17:15:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:15:18 +0000
Subject: [pkgdb] ocaml-bitmatch had acl change status
Message-ID: <20090119171518.779D8208DF5@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on ocaml-bitmatch (Fedora 9) to Obsolete for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-bitmatch



From pkgdb at fedoraproject.org  Mon Jan 19 17:15:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:15:16 +0000
Subject: [pkgdb] ocaml-bitmatch had acl change status
Message-ID: <20090119171516.26D3A208DF2@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on ocaml-bitmatch (Fedora 9) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-bitmatch



From pkgdb at fedoraproject.org  Mon Jan 19 17:15:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:15:22 +0000
Subject: [pkgdb] ocaml-bitmatch had acl change status
Message-ID: <20090119171522.B7606208DF6@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on ocaml-bitmatch (Fedora EPEL 5) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-bitmatch



From pkgdb at fedoraproject.org  Mon Jan 19 17:15:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:15:23 +0000
Subject: [pkgdb] ocaml-bitmatch had acl change status
Message-ID: <20090119171523.B59A6208DF8@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on ocaml-bitmatch (Fedora 9) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-bitmatch



From pkgdb at fedoraproject.org  Mon Jan 19 17:15:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:15:27 +0000
Subject: [pkgdb] ocaml-bitmatch had acl change status
Message-ID: <20090119171527.BF5D1208DFA@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on ocaml-bitmatch (Fedora EPEL 5) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-bitmatch



From pkgdb at fedoraproject.org  Mon Jan 19 17:15:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:15:32 +0000
Subject: [pkgdb] ocaml-augeas had acl change status
Message-ID: <20090119171533.AB134208DFC@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on ocaml-augeas (Fedora devel) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-augeas



From pkgdb at fedoraproject.org  Mon Jan 19 17:15:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:15:34 +0000
Subject: [pkgdb] ocaml-augeas had acl change status
Message-ID: <20090119171534.6C2C8208E00@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on ocaml-augeas (Fedora devel) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-augeas



From pkgdb at fedoraproject.org  Mon Jan 19 17:15:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:15:35 +0000
Subject: [pkgdb] ocaml-augeas had acl change status
Message-ID: <20090119171535.888D0208E01@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on ocaml-augeas (Fedora 9) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-augeas



From pkgdb at fedoraproject.org  Mon Jan 19 17:15:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:15:38 +0000
Subject: [pkgdb] ocaml-augeas had acl change status
Message-ID: <20090119171538.92DD3208E04@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on ocaml-augeas (Fedora 10) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-augeas



From pkgdb at fedoraproject.org  Mon Jan 19 17:15:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:15:38 +0000
Subject: [pkgdb] ocaml-augeas had acl change status
Message-ID: <20090119171538.9D454208E07@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on ocaml-augeas (Fedora 9) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-augeas



From pkgdb at fedoraproject.org  Mon Jan 19 17:15:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:15:40 +0000
Subject: [pkgdb] ocaml-augeas had acl change status
Message-ID: <20090119171540.AAD44208E0A@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on ocaml-augeas (Fedora 10) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-augeas



From pkgdb at fedoraproject.org  Mon Jan 19 17:15:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:15:46 +0000
Subject: [pkgdb] ocaml-pgocaml had acl change status
Message-ID: <20090119171546.EC1B0208488@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on ocaml-pgocaml (Fedora devel) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-pgocaml



From pkgdb at fedoraproject.org  Mon Jan 19 17:15:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:15:48 +0000
Subject: [pkgdb] ocaml-pgocaml had acl change status
Message-ID: <20090119171549.E8A87208E0B@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on ocaml-pgocaml (Fedora 9) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-pgocaml



From pkgdb at fedoraproject.org  Mon Jan 19 17:15:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:15:49 +0000
Subject: [pkgdb] ocaml-pgocaml had acl change status
Message-ID: <20090119171550.13269208E10@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on ocaml-pgocaml (Fedora 9) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-pgocaml



From pkgdb at fedoraproject.org  Mon Jan 19 17:15:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:15:51 +0000
Subject: [pkgdb] ocaml-pgocaml had acl change status
Message-ID: <20090119171551.BBB46208E15@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on ocaml-pgocaml (Fedora 10) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-pgocaml



From pkgdb at fedoraproject.org  Mon Jan 19 17:15:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:15:51 +0000
Subject: [pkgdb] ocaml-pgocaml had acl change status
Message-ID: <20090119171551.C1550208E17@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on ocaml-pgocaml (Fedora 10) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-pgocaml



From pkgdb at fedoraproject.org  Mon Jan 19 17:15:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:15:48 +0000
Subject: [pkgdb] ocaml-pgocaml had acl change status
Message-ID: <20090119171555.3A0F4208E1A@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on ocaml-pgocaml (Fedora devel) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-pgocaml



From pkgdb at fedoraproject.org  Mon Jan 19 17:15:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:15:57 +0000
Subject: [pkgdb] ocaml-sexplib had acl change status
Message-ID: <20090119171558.C43D720848E@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on ocaml-sexplib (Fedora devel) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-sexplib



From pkgdb at fedoraproject.org  Mon Jan 19 17:15:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:15:59 +0000
Subject: [pkgdb] ocaml-sexplib had acl change status
Message-ID: <20090119171600.0F117208E1D@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on ocaml-sexplib (Fedora devel) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-sexplib



From pkgdb at fedoraproject.org  Mon Jan 19 17:16:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:16:00 +0000
Subject: [pkgdb] ocaml-sexplib had acl change status
Message-ID: <20090119171600.67ACA208E20@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on ocaml-sexplib (Fedora 9) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-sexplib



From pkgdb at fedoraproject.org  Mon Jan 19 17:16:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:16:03 +0000
Subject: [pkgdb] ocaml-sexplib had acl change status
Message-ID: <20090119171603.61416208E21@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on ocaml-sexplib (Fedora 9) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-sexplib



From pkgdb at fedoraproject.org  Mon Jan 19 17:16:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:16:03 +0000
Subject: [pkgdb] ocaml-sexplib had acl change status
Message-ID: <20090119171604.2999D208E24@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on ocaml-sexplib (Fedora 10) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-sexplib



From pkgdb at fedoraproject.org  Mon Jan 19 17:16:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:16:04 +0000
Subject: [pkgdb] ocaml-sexplib had acl change status
Message-ID: <20090119171604.E82B4208E27@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on ocaml-sexplib (Fedora 10) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-sexplib



From pkgdb at fedoraproject.org  Mon Jan 19 17:16:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:16:07 +0000
Subject: [pkgdb] ocaml-ounit had acl change status
Message-ID: <20090119171607.BF489208E2A@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on ocaml-ounit (Fedora devel) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-ounit



From pkgdb at fedoraproject.org  Mon Jan 19 17:16:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:16:09 +0000
Subject: [pkgdb] ocaml-ounit had acl change status
Message-ID: <20090119171609.150BF208E2D@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on ocaml-ounit (Fedora devel) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-ounit



From pkgdb at fedoraproject.org  Mon Jan 19 17:16:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:16:09 +0000
Subject: [pkgdb] ocaml-ounit had acl change status
Message-ID: <20090119171609.E4E7E208E30@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on ocaml-ounit (Fedora 9) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-ounit



From pkgdb at fedoraproject.org  Mon Jan 19 17:16:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:16:12 +0000
Subject: [pkgdb] ocaml-ounit had acl change status
Message-ID: <20090119171613.36D47208E32@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on ocaml-ounit (Fedora 10) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-ounit



From pkgdb at fedoraproject.org  Mon Jan 19 17:16:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:16:14 +0000
Subject: [pkgdb] ocaml-ounit had acl change status
Message-ID: <20090119171616.15765208E33@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on ocaml-ounit (Fedora 10) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-ounit



From pkgdb at fedoraproject.org  Mon Jan 19 17:16:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:16:17 +0000
Subject: [pkgdb] ocaml-ounit had acl change status
Message-ID: <20090119171617.57D40208E38@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on ocaml-ounit (Fedora 9) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-ounit



From pkgdb at fedoraproject.org  Mon Jan 19 17:16:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:16:18 +0000
Subject: [pkgdb] ocaml-res had acl change status
Message-ID: <20090119171619.093CE208E3B@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on ocaml-res (Fedora devel) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-res



From pkgdb at fedoraproject.org  Mon Jan 19 17:16:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:16:19 +0000
Subject: [pkgdb] ocaml-res had acl change status
Message-ID: <20090119171619.F0DEC208E3E@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on ocaml-res (Fedora devel) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-res



From pkgdb at fedoraproject.org  Mon Jan 19 17:16:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:16:20 +0000
Subject: [pkgdb] ocaml-res had acl change status
Message-ID: <20090119171621.0F99A208496@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on ocaml-res (Fedora 9) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-res



From pkgdb at fedoraproject.org  Mon Jan 19 17:16:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:16:23 +0000
Subject: [pkgdb] ocaml-res had acl change status
Message-ID: <20090119171623.D8E9F208E3F@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on ocaml-res (Fedora 10) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-res



From pkgdb at fedoraproject.org  Mon Jan 19 17:16:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:16:24 +0000
Subject: [pkgdb] ocaml-res had acl change status
Message-ID: <20090119171624.2B2C0208E42@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on ocaml-res (Fedora 10) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-res



From pkgdb at fedoraproject.org  Mon Jan 19 17:16:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:16:26 +0000
Subject: [pkgdb] ocaml-json-static had acl change status
Message-ID: <20090119171626.BC4F3208E45@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on ocaml-json-static (Fedora devel) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-json-static



From pkgdb at fedoraproject.org  Mon Jan 19 17:16:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:16:27 +0000
Subject: [pkgdb] ocaml-res had acl change status
Message-ID: <20090119171627.AEA26208E48@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on ocaml-res (Fedora 9) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-res



From pkgdb at fedoraproject.org  Mon Jan 19 17:16:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:16:27 +0000
Subject: [pkgdb] ocaml-json-static had acl change status
Message-ID: <20090119171628.2D24C208E4B@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on ocaml-json-static (Fedora devel) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-json-static



From pkgdb at fedoraproject.org  Mon Jan 19 17:16:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:16:30 +0000
Subject: [pkgdb] ocaml-json-static had acl change status
Message-ID: <20090119171630.52260208E4E@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on ocaml-json-static (Fedora 9) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-json-static



From pkgdb at fedoraproject.org  Mon Jan 19 17:16:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:16:31 +0000
Subject: [pkgdb] ocaml-json-static had acl change status
Message-ID: <20090119171632.D56B720873F@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on ocaml-json-static (Fedora 9) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-json-static



From pkgdb at fedoraproject.org  Mon Jan 19 17:16:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:16:32 +0000
Subject: [pkgdb] ocaml-json-static had acl change status
Message-ID: <20090119171632.E353A208E50@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on ocaml-json-static (Fedora 10) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-json-static



From pkgdb at fedoraproject.org  Mon Jan 19 17:16:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:16:35 +0000
Subject: [pkgdb] ocaml-json-static had acl change status
Message-ID: <20090119171635.33147208E52@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on ocaml-json-static (Fedora 10) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-json-static



From pkgdb at fedoraproject.org  Mon Jan 19 17:16:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:16:37 +0000
Subject: [pkgdb] ocaml-pa-monad had acl change status
Message-ID: <20090119171638.7528E208E55@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on ocaml-pa-monad (Fedora devel) to Obsolete for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-pa-monad



From pkgdb at fedoraproject.org  Mon Jan 19 17:16:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:16:41 +0000
Subject: [pkgdb] ocaml-pa-monad had acl change status
Message-ID: <20090119171642.224B8208E58@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on ocaml-pa-monad (Fedora devel) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-pa-monad



From pkgdb at fedoraproject.org  Mon Jan 19 17:16:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:16:43 +0000
Subject: [pkgdb] ocaml-pa-monad had acl change status
Message-ID: <20090119171643.A8D02208E59@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on ocaml-pa-monad (Fedora devel) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-pa-monad



From pkgdb at fedoraproject.org  Mon Jan 19 17:16:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:16:44 +0000
Subject: [pkgdb] ocaml-pa-monad had acl change status
Message-ID: <20090119171644.B1452208481@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on ocaml-pa-monad (Fedora 9) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-pa-monad



From pkgdb at fedoraproject.org  Mon Jan 19 17:16:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:16:44 +0000
Subject: [pkgdb] ocaml-pa-monad had acl change status
Message-ID: <20090119171644.D8147208E5D@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on ocaml-pa-monad (Fedora 9) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-pa-monad



From pkgdb at fedoraproject.org  Mon Jan 19 17:16:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:16:45 +0000
Subject: [pkgdb] ocaml-pa-monad had acl change status
Message-ID: <20090119171646.23FCD208E5F@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on ocaml-pa-monad (Fedora 10) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-pa-monad



From pkgdb at fedoraproject.org  Mon Jan 19 17:16:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:16:46 +0000
Subject: [pkgdb] ocaml-pa-monad had acl change status
Message-ID: <20090119171646.F2301208E62@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on ocaml-pa-monad (Fedora 10) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-pa-monad



From pkgdb at fedoraproject.org  Mon Jan 19 17:16:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:16:54 +0000
Subject: [pkgdb] ocaml-deriving had acl change status
Message-ID: <20090119171654.99DB4208E68@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on ocaml-deriving (Fedora 9) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-deriving



From pkgdb at fedoraproject.org  Mon Jan 19 17:16:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:16:54 +0000
Subject: [pkgdb] ocaml-deriving had acl change status
Message-ID: <20090119171655.1C386208E6C@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on ocaml-deriving (Fedora devel) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-deriving



From pkgdb at fedoraproject.org  Mon Jan 19 17:16:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:16:54 +0000
Subject: [pkgdb] ocaml-deriving had acl change status
Message-ID: <20090119171655.5B050208483@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on ocaml-deriving (Fedora 9) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-deriving



From pkgdb at fedoraproject.org  Mon Jan 19 17:16:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:16:57 +0000
Subject: [pkgdb] ocaml-deriving had acl change status
Message-ID: <20090119171657.82332208E6D@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on ocaml-deriving (Fedora devel) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-deriving



From pkgdb at fedoraproject.org  Mon Jan 19 17:16:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:16:58 +0000
Subject: [pkgdb] ocaml-deriving had acl change status
Message-ID: <20090119171658.933C4208E72@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on ocaml-deriving (Fedora 10) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-deriving



From pkgdb at fedoraproject.org  Mon Jan 19 17:16:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:16:58 +0000
Subject: [pkgdb] ocaml-deriving had acl change status
Message-ID: <20090119171659.C3121208E74@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on ocaml-deriving (Fedora 10) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-deriving



From pkgdb at fedoraproject.org  Mon Jan 19 17:17:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:17:05 +0000
Subject: [pkgdb] ocaml-bitstring had acl change status
Message-ID: <20090119171706.C8AB820897A@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on ocaml-bitstring (Fedora 9) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-bitstring



From pkgdb at fedoraproject.org  Mon Jan 19 17:17:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:17:03 +0000
Subject: [pkgdb] ocaml-bitstring had acl change status
Message-ID: <20090119171703.C3862208E77@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on ocaml-bitstring (Fedora devel) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-bitstring



From pkgdb at fedoraproject.org  Mon Jan 19 17:17:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:17:07 +0000
Subject: [pkgdb] ocaml-bitstring had acl change status
Message-ID: <20090119171707.1C958208E78@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on ocaml-bitstring (Fedora 9) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-bitstring



From pkgdb at fedoraproject.org  Mon Jan 19 17:17:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:17:07 +0000
Subject: [pkgdb] ocaml-bitstring had acl change status
Message-ID: <20090119171707.A022F208E7B@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on ocaml-bitstring (Fedora devel) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-bitstring



From pkgdb at fedoraproject.org  Mon Jan 19 17:17:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:17:07 +0000
Subject: [pkgdb] ocaml-bitstring had acl change status
Message-ID: <20090119171707.E63B6208E7E@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on ocaml-bitstring (Fedora 10) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-bitstring



From pkgdb at fedoraproject.org  Mon Jan 19 17:17:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:17:10 +0000
Subject: [pkgdb] ocaml-bitstring had acl change status
Message-ID: <20090119171710.E5226208E81@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on ocaml-bitstring (Fedora 10) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-bitstring



From pkgdb at fedoraproject.org  Mon Jan 19 17:17:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:17:18 +0000
Subject: [pkgdb] ocaml-newt had acl change status
Message-ID: <20090119171719.0B8C72089F1@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on ocaml-newt (Fedora devel) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-newt



From pkgdb at fedoraproject.org  Mon Jan 19 17:17:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:17:22 +0000
Subject: [pkgdb] ocaml-newt had acl change status
Message-ID: <20090119171722.44413208E84@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on ocaml-newt (Fedora devel) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-newt



From pkgdb at fedoraproject.org  Mon Jan 19 17:17:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:17:22 +0000
Subject: [pkgdb] ocaml-newt had acl change status
Message-ID: <20090119171723.0A103208E87@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on ocaml-newt (Fedora 9) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-newt



From pkgdb at fedoraproject.org  Mon Jan 19 17:17:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:17:23 +0000
Subject: [pkgdb] ocaml-newt had acl change status
Message-ID: <20090119171723.DC34F208E8C@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on ocaml-newt (Fedora 10) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-newt



From pkgdb at fedoraproject.org  Mon Jan 19 17:17:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:17:25 +0000
Subject: [pkgdb] ocaml-newt had acl change status
Message-ID: <20090119171725.8784A208E8F@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on ocaml-newt (Fedora 10) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-newt



From pkgdb at fedoraproject.org  Mon Jan 19 17:17:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:17:27 +0000
Subject: [pkgdb] ocaml-newt had acl change status
Message-ID: <20090119171727.C8598208E92@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on ocaml-newt (Fedora 9) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-newt



From pkgdb at fedoraproject.org  Mon Jan 19 17:17:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:17:28 +0000
Subject: [pkgdb] ocaml-camomile had acl change status
Message-ID: <20090119171729.5585E2084BA@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on ocaml-camomile (Fedora devel) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-camomile



From pkgdb at fedoraproject.org  Mon Jan 19 17:17:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:17:30 +0000
Subject: [pkgdb] ocaml-camomile had acl change status
Message-ID: <20090119171730.98CAA208E95@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on ocaml-camomile (Fedora devel) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-camomile



From pkgdb at fedoraproject.org  Mon Jan 19 17:17:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:17:32 +0000
Subject: [pkgdb] ocaml-camomile had acl change status
Message-ID: <20090119171732.8100B208E99@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on ocaml-camomile (Fedora EPEL 5) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-camomile



From pkgdb at fedoraproject.org  Mon Jan 19 17:17:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:17:33 +0000
Subject: [pkgdb] ocaml-camomile had acl change status
Message-ID: <20090119171733.5B888208E9C@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on ocaml-camomile (Fedora EPEL 5) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-camomile



From pkgdb at fedoraproject.org  Mon Jan 19 17:17:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:17:34 +0000
Subject: [pkgdb] ocaml-camomile had acl change status
Message-ID: <20090119171734.C9185208E9F@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on ocaml-camomile (Fedora 9) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-camomile



From pkgdb at fedoraproject.org  Mon Jan 19 17:17:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:17:36 +0000
Subject: [pkgdb] ocaml-camomile had acl change status
Message-ID: <20090119171740.7343F208D64@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on ocaml-camomile (Fedora 9) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-camomile



From pkgdb at fedoraproject.org  Mon Jan 19 17:17:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:17:39 +0000
Subject: [pkgdb] ocaml-camomile had acl change status
Message-ID: <20090119171740.BC059208DDB@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on ocaml-camomile (Fedora 10) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-camomile



From pkgdb at fedoraproject.org  Mon Jan 19 17:17:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:17:40 +0000
Subject: [pkgdb] ocaml-camomile had acl change status
Message-ID: <20090119171740.CAFE4208EA4@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on ocaml-camomile (Fedora 10) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-camomile



From pkgdb at fedoraproject.org  Mon Jan 19 17:17:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:17:45 +0000
Subject: [pkgdb] ocaml-type-conv had acl change status
Message-ID: <20090119171745.425DE208EA7@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on ocaml-type-conv (Fedora devel) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-type-conv



From pkgdb at fedoraproject.org  Mon Jan 19 17:17:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:17:46 +0000
Subject: [pkgdb] ocaml-type-conv had acl change status
Message-ID: <20090119171746.6CA55208EAA@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on ocaml-type-conv (Fedora devel) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-type-conv



From pkgdb at fedoraproject.org  Mon Jan 19 17:17:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:17:50 +0000
Subject: [pkgdb] ocaml-type-conv had acl change status
Message-ID: <20090119171750.80C21208EB0@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on ocaml-type-conv (Fedora 9) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-type-conv



From pkgdb at fedoraproject.org  Mon Jan 19 17:17:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:17:52 +0000
Subject: [pkgdb] ocaml-type-conv had acl change status
Message-ID: <20090119171752.43E00208DDE@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on ocaml-type-conv (Fedora 10) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-type-conv



From pkgdb at fedoraproject.org  Mon Jan 19 17:17:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:17:52 +0000
Subject: [pkgdb] ocaml-type-conv had acl change status
Message-ID: <20090119171752.8A625208EB1@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on ocaml-type-conv (Fedora 10) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-type-conv



From pkgdb at fedoraproject.org  Mon Jan 19 17:17:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:17:48 +0000
Subject: [pkgdb] ocaml-type-conv had acl change status
Message-ID: <20090119171749.68675208EAC@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on ocaml-type-conv (Fedora 9) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-type-conv



From pkgdb at fedoraproject.org  Mon Jan 19 17:17:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:17:57 +0000
Subject: [pkgdb] ocaml-openin had acl change status
Message-ID: <20090119171757.A8923208EB6@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on ocaml-openin (Fedora devel) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-openin



From pkgdb at fedoraproject.org  Mon Jan 19 17:17:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:17:57 +0000
Subject: [pkgdb] ocaml-openin had acl change status
Message-ID: <20090119171757.C11D6208EB9@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on ocaml-openin (Fedora devel) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-openin



From pkgdb at fedoraproject.org  Mon Jan 19 17:17:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:17:58 +0000
Subject: [pkgdb] ocaml-openin had acl change status
Message-ID: <20090119171758.E4802208EBD@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on ocaml-openin (Fedora 9) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-openin



From pkgdb at fedoraproject.org  Mon Jan 19 17:18:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:18:00 +0000
Subject: [pkgdb] ocaml-openin had acl change status
Message-ID: <20090119171800.7D9DA208EBE@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on ocaml-openin (Fedora 9) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-openin



From pkgdb at fedoraproject.org  Mon Jan 19 17:18:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:18:04 +0000
Subject: [pkgdb] ocaml-openin had acl change status
Message-ID: <20090119171804.34BFB208679@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on ocaml-openin (Fedora 10) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-openin



From pkgdb at fedoraproject.org  Mon Jan 19 17:18:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:18:01 +0000
Subject: [pkgdb] ocaml-openin had acl change status
Message-ID: <20090119171801.E17E7208EC0@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on ocaml-openin (Fedora 10) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-openin



From pkgdb at fedoraproject.org  Mon Jan 19 17:18:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:18:15 +0000
Subject: [pkgdb] ocaml-json-wheel had acl change status
Message-ID: <20090119171815.97163208DE4@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on ocaml-json-wheel (Fedora devel) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-json-wheel



From pkgdb at fedoraproject.org  Mon Jan 19 17:18:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:18:15 +0000
Subject: [pkgdb] ocaml-json-wheel had acl change status
Message-ID: <20090119171815.9B8B4208EC1@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on ocaml-json-wheel (Fedora devel) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-json-wheel



From pkgdb at fedoraproject.org  Mon Jan 19 17:18:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:18:16 +0000
Subject: [pkgdb] ocaml-json-wheel had acl change status
Message-ID: <20090119171816.EC5EA208EC4@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on ocaml-json-wheel (Fedora 9) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-json-wheel



From pkgdb at fedoraproject.org  Mon Jan 19 17:18:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:18:17 +0000
Subject: [pkgdb] ocaml-json-wheel had acl change status
Message-ID: <20090119171817.B3B33208EC7@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on ocaml-json-wheel (Fedora 9) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-json-wheel



From pkgdb at fedoraproject.org  Mon Jan 19 17:18:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:18:22 +0000
Subject: [pkgdb] ocaml-json-wheel had acl change status
Message-ID: <20090119171822.91BEE208ECA@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on ocaml-json-wheel (Fedora 10) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-json-wheel



From pkgdb at fedoraproject.org  Mon Jan 19 17:18:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:18:22 +0000
Subject: [pkgdb] ocaml-json-wheel had acl change status
Message-ID: <20090119171823.B6B3E208ECD@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on ocaml-json-wheel (Fedora 10) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-json-wheel



From pkgdb at fedoraproject.org  Mon Jan 19 17:18:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:18:24 +0000
Subject: [pkgdb] ocamldsort had acl change status
Message-ID: <20090119171826.56F87208ED1@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on ocamldsort (Fedora devel) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocamldsort



From pkgdb at fedoraproject.org  Mon Jan 19 17:18:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:18:25 +0000
Subject: [pkgdb] ocamldsort had acl change status
Message-ID: <20090119171828.97BD5208DE8@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on ocamldsort (Fedora devel) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocamldsort



From pkgdb at fedoraproject.org  Mon Jan 19 17:18:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:18:29 +0000
Subject: [pkgdb] ocamldsort had acl change status
Message-ID: <20090119171829.DCF33208ED0@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on ocamldsort (Fedora 9) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocamldsort



From pkgdb at fedoraproject.org  Mon Jan 19 17:18:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:18:30 +0000
Subject: [pkgdb] ocamldsort had acl change status
Message-ID: <20090119171830.45D16208ED4@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on ocamldsort (Fedora 9) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocamldsort



From pkgdb at fedoraproject.org  Mon Jan 19 17:18:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:18:30 +0000
Subject: [pkgdb] ocamldsort had acl change status
Message-ID: <20090119171830.6A1D4208ED7@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on ocamldsort (Fedora 10) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocamldsort



From pkgdb at fedoraproject.org  Mon Jan 19 17:18:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:18:31 +0000
Subject: [pkgdb] ocamldsort had acl change status
Message-ID: <20090119171831.895D3208EDA@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on ocamldsort (Fedora 10) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocamldsort



From pkgdb at fedoraproject.org  Mon Jan 19 17:18:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:18:37 +0000
Subject: [pkgdb] ocaml-perl4caml had acl change status
Message-ID: <20090119171837.426CD208701@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on ocaml-perl4caml (Fedora devel) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-perl4caml



From pkgdb at fedoraproject.org  Mon Jan 19 17:18:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:18:38 +0000
Subject: [pkgdb] ocaml-perl4caml had acl change status
Message-ID: <20090119171838.8F87D208EDD@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on ocaml-perl4caml (Fedora devel) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-perl4caml



From pkgdb at fedoraproject.org  Mon Jan 19 17:18:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:18:38 +0000
Subject: [pkgdb] ocaml-perl4caml had acl change status
Message-ID: <20090119171838.E8F54208EE0@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on ocaml-perl4caml (Fedora 9) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-perl4caml



From pkgdb at fedoraproject.org  Mon Jan 19 17:18:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:18:42 +0000
Subject: [pkgdb] ocaml-perl4caml had acl change status
Message-ID: <20090119171842.1255B208EE6@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on ocaml-perl4caml (Fedora 10) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-perl4caml



From pkgdb at fedoraproject.org  Mon Jan 19 17:18:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:18:41 +0000
Subject: [pkgdb] ocaml-perl4caml had acl change status
Message-ID: <20090119171841.BA0A3208EE3@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on ocaml-perl4caml (Fedora 9) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-perl4caml



From pkgdb at fedoraproject.org  Mon Jan 19 17:18:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:18:42 +0000
Subject: [pkgdb] ocaml-perl4caml had acl change status
Message-ID: <20090119171842.698E2208EE9@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on ocaml-perl4caml (Fedora 10) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-perl4caml



From pkgdb at fedoraproject.org  Mon Jan 19 17:18:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:18:49 +0000
Subject: [pkgdb] ocaml-xmlrpc-light had acl change status
Message-ID: <20090119171849.BBE6B208DEC@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on ocaml-xmlrpc-light (Fedora devel) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-xmlrpc-light



From pkgdb at fedoraproject.org  Mon Jan 19 17:18:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:18:50 +0000
Subject: [pkgdb] ocaml-xmlrpc-light had acl change status
Message-ID: <20090119171851.DCC9D208EEA@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on ocaml-xmlrpc-light (Fedora devel) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-xmlrpc-light



From pkgdb at fedoraproject.org  Mon Jan 19 17:18:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:18:51 +0000
Subject: [pkgdb] ocaml-xmlrpc-light had acl change status
Message-ID: <20090119171852.06B8D208EED@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on ocaml-xmlrpc-light (Fedora 9) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-xmlrpc-light



From pkgdb at fedoraproject.org  Mon Jan 19 17:18:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:18:51 +0000
Subject: [pkgdb] ocaml-xmlrpc-light had acl change status
Message-ID: <20090119171852.276B7208EF0@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on ocaml-xmlrpc-light (Fedora 9) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-xmlrpc-light



From pkgdb at fedoraproject.org  Mon Jan 19 17:18:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:18:51 +0000
Subject: [pkgdb] ocaml-xmlrpc-light had acl change status
Message-ID: <20090119171852.31C95208EF3@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on ocaml-xmlrpc-light (Fedora 10) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-xmlrpc-light



From pkgdb at fedoraproject.org  Mon Jan 19 17:18:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:18:51 +0000
Subject: [pkgdb] ocaml-xmlrpc-light had acl change status
Message-ID: <20090119171852.452BE208EF6@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on ocaml-xmlrpc-light (Fedora 10) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-xmlrpc-light



From pkgdb at fedoraproject.org  Mon Jan 19 17:18:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:18:58 +0000
Subject: [pkgdb] ocaml-postgresql had acl change status
Message-ID: <20090119171858.54966208EFA@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on ocaml-postgresql (Fedora devel) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-postgresql



From pkgdb at fedoraproject.org  Mon Jan 19 17:18:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:18:57 +0000
Subject: [pkgdb] ocaml-postgresql had acl change status
Message-ID: <20090119171857.A8CD4208EF8@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on ocaml-postgresql (Fedora devel) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-postgresql



From pkgdb at fedoraproject.org  Mon Jan 19 17:19:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:19:00 +0000
Subject: [pkgdb] ocaml-postgresql had acl change status
Message-ID: <20090119171900.75E4C20873D@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on ocaml-postgresql (Fedora 9) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-postgresql



From pkgdb at fedoraproject.org  Mon Jan 19 17:19:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:19:01 +0000
Subject: [pkgdb] ocaml-postgresql had acl change status
Message-ID: <20090119171901.7D848208EFC@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on ocaml-postgresql (Fedora 9) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-postgresql



From pkgdb at fedoraproject.org  Mon Jan 19 17:19:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:19:01 +0000
Subject: [pkgdb] ocaml-postgresql had acl change status
Message-ID: <20090119171901.B6F5C208F00@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on ocaml-postgresql (Fedora 10) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-postgresql



From pkgdb at fedoraproject.org  Mon Jan 19 17:19:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:19:06 +0000
Subject: [pkgdb] ocaml-postgresql had acl change status
Message-ID: <20090119171906.B9D7C208F03@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on ocaml-postgresql (Fedora 10) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-postgresql



From pkgdb at fedoraproject.org  Mon Jan 19 17:19:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:19:08 +0000
Subject: [pkgdb] ocaml-mysql had acl change status
Message-ID: <20090119171908.6F29E208DF2@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on ocaml-mysql (Fedora devel) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-mysql



From pkgdb at fedoraproject.org  Mon Jan 19 17:19:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:19:08 +0000
Subject: [pkgdb] ocaml-mysql had acl change status
Message-ID: <20090119171908.A363F208F04@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on ocaml-mysql (Fedora devel) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-mysql



From pkgdb at fedoraproject.org  Mon Jan 19 17:19:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:19:10 +0000
Subject: [pkgdb] ocaml-mysql had acl change status
Message-ID: <20090119171911.DBC2C208F09@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on ocaml-mysql (Fedora 9) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-mysql



From pkgdb at fedoraproject.org  Mon Jan 19 17:19:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:19:12 +0000
Subject: [pkgdb] ocaml-mysql had acl change status
Message-ID: <20090119171912.21B6C208F0C@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on ocaml-mysql (Fedora 9) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-mysql



From pkgdb at fedoraproject.org  Mon Jan 19 17:19:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:19:12 +0000
Subject: [pkgdb] ocaml-mysql had acl change status
Message-ID: <20090119171913.14E9C208F0F@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on ocaml-mysql (Fedora 10) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-mysql



From pkgdb at fedoraproject.org  Mon Jan 19 17:19:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:19:13 +0000
Subject: [pkgdb] ocaml-mysql had acl change status
Message-ID: <20090119171913.9A15F208F12@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on ocaml-mysql (Fedora 10) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-mysql



From pkgdb at fedoraproject.org  Mon Jan 19 17:19:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:19:17 +0000
Subject: [pkgdb] ocaml-lacaml had acl change status
Message-ID: <20090119171918.40F6A208F15@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on ocaml-lacaml (Fedora devel) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-lacaml



From pkgdb at fedoraproject.org  Mon Jan 19 17:19:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:19:20 +0000
Subject: [pkgdb] ocaml-lacaml had acl change status
Message-ID: <20090119171920.CCEFC208F17@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on ocaml-lacaml (Fedora 9) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-lacaml



From pkgdb at fedoraproject.org  Mon Jan 19 17:19:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:19:20 +0000
Subject: [pkgdb] ocaml-lacaml had acl change status
Message-ID: <20090119171921.12DFC208F18@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on ocaml-lacaml (Fedora devel) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-lacaml



From pkgdb at fedoraproject.org  Mon Jan 19 17:19:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:19:22 +0000
Subject: [pkgdb] ocaml-lacaml had acl change status
Message-ID: <20090119171922.758F0208F1C@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on ocaml-lacaml (Fedora 9) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-lacaml



From pkgdb at fedoraproject.org  Mon Jan 19 17:19:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:19:22 +0000
Subject: [pkgdb] ocaml-lacaml had acl change status
Message-ID: <20090119171922.B7658208F20@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on ocaml-lacaml (Fedora 10) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-lacaml



From pkgdb at fedoraproject.org  Mon Jan 19 17:19:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:19:23 +0000
Subject: [pkgdb] ocaml-lacaml had acl change status
Message-ID: <20090119171923.91085208F21@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on ocaml-lacaml (Fedora 10) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-lacaml



From pkgdb at fedoraproject.org  Mon Jan 19 17:19:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:19:30 +0000
Subject: [pkgdb] ocaml-camlidl had acl change status
Message-ID: <20090119171930.549A7208F28@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on ocaml-camlidl (Fedora 9) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-camlidl



From pkgdb at fedoraproject.org  Mon Jan 19 17:19:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:19:30 +0000
Subject: [pkgdb] ocaml-camlidl had acl change status
Message-ID: <20090119171932.235DE208F26@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on ocaml-camlidl (Fedora devel) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-camlidl



From pkgdb at fedoraproject.org  Mon Jan 19 17:19:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:19:31 +0000
Subject: [pkgdb] ocaml-camlidl had acl change status
Message-ID: <20090119171932.E02D6208F29@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on ocaml-camlidl (Fedora devel) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-camlidl



From pkgdb at fedoraproject.org  Mon Jan 19 17:19:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:19:31 +0000
Subject: [pkgdb] ocaml-camlidl had acl change status
Message-ID: <20090119171932.F04F0208F2C@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on ocaml-camlidl (Fedora 9) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-camlidl



From pkgdb at fedoraproject.org  Mon Jan 19 17:19:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:19:33 +0000
Subject: [pkgdb] ocaml-camlidl had acl change status
Message-ID: <20090119171933.E9D5E208F2F@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on ocaml-camlidl (Fedora 10) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-camlidl



From pkgdb at fedoraproject.org  Mon Jan 19 17:19:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:19:34 +0000
Subject: [pkgdb] ocaml-camlidl had acl change status
Message-ID: <20090119171934.46BEF208F32@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on ocaml-camlidl (Fedora 10) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-camlidl



From pkgdb at fedoraproject.org  Mon Jan 19 17:19:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:19:48 +0000
Subject: [pkgdb] ocaml-pxp had acl change status
Message-ID: <20090119171948.8EC93208F3C@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on ocaml-pxp (Fedora devel) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-pxp



From pkgdb at fedoraproject.org  Mon Jan 19 17:19:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:19:49 +0000
Subject: [pkgdb] ocaml-pxp had acl change status
Message-ID: <20090119171949.6048F208F3F@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on ocaml-pxp (Fedora devel) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-pxp



From pkgdb at fedoraproject.org  Mon Jan 19 17:19:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:19:49 +0000
Subject: [pkgdb] ocaml-pxp had acl change status
Message-ID: <20090119171949.6B28A208F42@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on ocaml-pxp (Fedora 9) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-pxp



From pkgdb at fedoraproject.org  Mon Jan 19 17:19:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:19:49 +0000
Subject: [pkgdb] ocaml-pxp had acl change status
Message-ID: <20090119171949.AFB6A208F43@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on ocaml-pxp (Fedora 9) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-pxp



From pkgdb at fedoraproject.org  Mon Jan 19 17:19:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:19:49 +0000
Subject: [pkgdb] ocaml-pxp had acl change status
Message-ID: <20090119171949.BE08E208F48@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on ocaml-pxp (Fedora 10) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-pxp



From pkgdb at fedoraproject.org  Mon Jan 19 17:19:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:19:53 +0000
Subject: [pkgdb] ocaml-pxp had acl change status
Message-ID: <20090119171953.B6615208E00@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on ocaml-pxp (Fedora 10) to Obsolete for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-pxp



From pkgdb at fedoraproject.org  Mon Jan 19 17:19:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:19:58 +0000
Subject: [pkgdb] ocaml-pxp had acl change status
Message-ID: <20090119171958.B6A46208F4D@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on ocaml-pxp (Fedora 10) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-pxp



From michich at fedoraproject.org  Mon Jan 19 17:21:16 2009
From: michich at fedoraproject.org (Michal Schmidt)
Date: Mon, 19 Jan 2009 17:21:16 +0000 (UTC)
Subject: rpms/jabbim/devel .cvsignore, 1.12, 1.13 jabbim.spec, 1.27,
	1.28 sources, 1.21, 1.22 jabbim.in, 1.1, NONE
Message-ID: <20090119172116.21229700F8@cvs1.fedora.phx.redhat.com>

Author: michich

Update of /cvs/pkgs/rpms/jabbim/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7919

Modified Files:
	.cvsignore jabbim.spec sources 
Removed Files:
	jabbim.in 
Log Message:
* Mon Jan 19 2009 Michal Schmidt <mschmidt at redhat.com> - 0.5-0.2.svn20090119
- Removed our jabbim.in, already upstream.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/jabbim/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	17 Jan 2009 21:59:19 -0000	1.12
+++ .cvsignore	19 Jan 2009 17:20:45 -0000	1.13
@@ -1 +1 @@
-jabbim-svn20090117.tar.bz2
+jabbim-svn20090119.tar.bz2


Index: jabbim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jabbim/devel/jabbim.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- jabbim.spec	17 Jan 2009 21:59:19 -0000	1.27
+++ jabbim.spec	19 Jan 2009 17:20:45 -0000	1.28
@@ -1,16 +1,15 @@
 Name:		jabbim
 Version:	0.5
-Release:	0.1.svn20090117%{?dist}
+Release:	0.2.svn20090119%{?dist}
 Summary:	Jabber client for mere mortals
 
 Group:		Applications/Internet
 License:	GPLv2+
 URL:		http://dev.jabbim.cz/jabbim
 # The source was obtained from upstream SVN repository:
-# svn export -r 4005 svn://dev.jabbim.cz/jabbim/trunk jabbim-svn20090117
-# tar -cjf jabbim-svn20090117.tar.bz2 jabbim-svn20090117/
-Source0:	jabbim-svn20090117.tar.bz2
-Source1:	jabbim.in
+# svn export -r 4014 svn://dev.jabbim.cz/jabbim/trunk jabbim-svn20090119
+# tar -cjf jabbim-svn20090119.tar.bz2 jabbim-svn20090119/
+Source0:	jabbim-svn20090119.tar.bz2
 Patch0:		jabbim-0.4-autoupdate-disable-notification.diff
 BuildArch:	noarch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -38,10 +37,8 @@
 
 
 %prep
-%setup -q -n jabbim-svn20090117
+%setup -q -n jabbim-svn20090119
 %patch0 -p1
-# fill in the template for the starting script
-sed -e 's|@JABBIMDATA@|%{jabbimdata}|g' %{SOURCE1} > jabbim
 
 %build
 # Upstream likes to provide generated *.qm files in the tarballs.
@@ -86,6 +83,9 @@
 
 
 %changelog
+* Mon Jan 19 2009 Michal Schmidt <mschmidt at redhat.com> - 0.5-0.2.svn20090119
+- Removed our jabbim.in, already upstream.
+
 * Sat Jan 17 2009 Michal Schmidt <mschmidt at redhat.com> - 0.5-0.1.svn20090117
 - Rebase to upstream 0.5 SVN snapshot.
 - Upstream now supports 'make install', which simplifies the spec file.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/jabbim/devel/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sources	17 Jan 2009 21:59:19 -0000	1.21
+++ sources	19 Jan 2009 17:20:45 -0000	1.22
@@ -1 +1 @@
-3c06b8a3bb1aacef7bebcecc04cee8df  jabbim-svn20090117.tar.bz2
+62054f78c8cd71dda541002b6c4e6f9c  jabbim-svn20090119.tar.bz2


--- jabbim.in DELETED ---



From pkgdb at fedoraproject.org  Mon Jan 19 17:21:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:21:53 +0000
Subject: [pkgdb] virt-df had acl change status
Message-ID: <20090119172153.E1DA7208E0A@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on virt-df (Fedora devel) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/virt-df



From pkgdb at fedoraproject.org  Mon Jan 19 17:21:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:21:55 +0000
Subject: [pkgdb] virt-df had acl change status
Message-ID: <20090119172155.71D62208E0C@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on virt-df (Fedora devel) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/virt-df



From pkgdb at fedoraproject.org  Mon Jan 19 17:21:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:21:56 +0000
Subject: [pkgdb] virt-df had acl change status
Message-ID: <20090119172156.23BE0208E11@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on virt-df (Fedora 9) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/virt-df



From pkgdb at fedoraproject.org  Mon Jan 19 17:21:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:21:58 +0000
Subject: [pkgdb] virt-df had acl change status
Message-ID: <20090119172159.50C0B208E13@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on virt-df (Fedora 9) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/virt-df



From pkgdb at fedoraproject.org  Mon Jan 19 17:22:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:22:00 +0000
Subject: [pkgdb] virt-df had acl change status
Message-ID: <20090119172201.00942208E16@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on virt-df (Fedora 10) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/virt-df



From pkgdb at fedoraproject.org  Mon Jan 19 17:22:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:22:01 +0000
Subject: [pkgdb] virt-df had acl change status
Message-ID: <20090119172201.DB90C208E1A@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on virt-df (Fedora 10) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/virt-df



From pkgdb at fedoraproject.org  Mon Jan 19 17:22:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:22:08 +0000
Subject: [pkgdb] ocaml had acl change status
Message-ID: <20090119172208.68C5C208E23@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on ocaml (Fedora devel) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml



From pkgdb at fedoraproject.org  Mon Jan 19 17:22:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:22:09 +0000
Subject: [pkgdb] ocaml had acl change status
Message-ID: <20090119172209.C9F07208E26@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on ocaml (Fedora devel) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml



From pkgdb at fedoraproject.org  Mon Jan 19 17:22:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:22:15 +0000
Subject: [pkgdb] ocaml had acl change status
Message-ID: <20090119172215.5B356208E2C@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on ocaml (Fedora EPEL 5) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml



From pkgdb at fedoraproject.org  Mon Jan 19 17:22:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:22:15 +0000
Subject: [pkgdb] ocaml had acl change status
Message-ID: <20090119172216.47927208E2F@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on ocaml (Fedora EPEL 4) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml



From pkgdb at fedoraproject.org  Mon Jan 19 17:22:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:22:16 +0000
Subject: [pkgdb] ocaml had acl change status
Message-ID: <20090119172216.8E74B208F50@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on ocaml (Fedora EPEL 5) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml



From pkgdb at fedoraproject.org  Mon Jan 19 17:22:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:22:21 +0000
Subject: [pkgdb] ocaml had acl change status
Message-ID: <20090119172222.96836208E31@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on ocaml (Fedora 9) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml



From pkgdb at fedoraproject.org  Mon Jan 19 17:22:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:22:23 +0000
Subject: [pkgdb] ocaml had acl change status
Message-ID: <20090119172223.B96DF208F53@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on ocaml (Fedora 10) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml



From pkgdb at fedoraproject.org  Mon Jan 19 17:22:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:22:25 +0000
Subject: [pkgdb] ocaml had acl change status
Message-ID: <20090119172225.37A7A208F57@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on ocaml (Fedora 9) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml



From pkgdb at fedoraproject.org  Mon Jan 19 17:22:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:22:25 +0000
Subject: [pkgdb] ocaml had acl change status
Message-ID: <20090119172225.9883F208F5B@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on ocaml (Fedora 10) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml



From pkgdb at fedoraproject.org  Mon Jan 19 17:22:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:22:30 +0000
Subject: [pkgdb] ocaml-lablgtk had acl change status
Message-ID: <20090119172230.80A45208F5D@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on ocaml-lablgtk (Fedora devel) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-lablgtk



From pkgdb at fedoraproject.org  Mon Jan 19 17:22:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:22:31 +0000
Subject: [pkgdb] ocaml-lablgtk had acl change status
Message-ID: <20090119172232.A4C0C208F61@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on ocaml-lablgtk (Fedora devel) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-lablgtk



From pkgdb at fedoraproject.org  Mon Jan 19 17:22:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:22:10 +0000
Subject: [pkgdb] ocaml had acl change status
Message-ID: <20090119172210.DBE06208E29@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on ocaml (Fedora EPEL 4) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml



From pkgdb at fedoraproject.org  Mon Jan 19 17:22:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:22:34 +0000
Subject: [pkgdb] ocaml-lablgtk had acl change status
Message-ID: <20090119172234.9F113208F66@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on ocaml-lablgtk (Fedora 9) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-lablgtk



From pkgdb at fedoraproject.org  Mon Jan 19 17:22:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:22:36 +0000
Subject: [pkgdb] ocaml-lablgtk had acl change status
Message-ID: <20090119172237.70952208F6D@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on ocaml-lablgtk (Fedora 9) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-lablgtk



From pkgdb at fedoraproject.org  Mon Jan 19 17:22:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:22:38 +0000
Subject: [pkgdb] ocaml-lablgtk had acl change status
Message-ID: <20090119172239.037DB208E36@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on ocaml-lablgtk (Fedora 10) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-lablgtk



From pkgdb at fedoraproject.org  Mon Jan 19 17:22:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:22:45 +0000
Subject: [pkgdb] ocaml-camlimages had acl change status
Message-ID: <20090119172245.96A7F208F77@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on ocaml-camlimages (Fedora devel) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-camlimages



From pkgdb at fedoraproject.org  Mon Jan 19 17:22:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:22:41 +0000
Subject: [pkgdb] ocaml-lablgtk had acl change status
Message-ID: <20090119172241.4CB53208F75@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on ocaml-lablgtk (Fedora 10) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-lablgtk



From pkgdb at fedoraproject.org  Mon Jan 19 17:22:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:22:45 +0000
Subject: [pkgdb] ocaml-camlimages had acl change status
Message-ID: <20090119172245.DA1F2208F7A@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on ocaml-camlimages (Fedora devel) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-camlimages



From pkgdb at fedoraproject.org  Mon Jan 19 17:22:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:22:51 +0000
Subject: [pkgdb] ocaml-camlimages ownership updated
Message-ID: <20090119172251.7C001208F7F@bastion.fedora.phx.redhat.com>

Package ocaml-camlimages in Fedora EPEL 4 is now owned by rjones

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-camlimages



From pkgdb at fedoraproject.org  Mon Jan 19 17:22:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:22:54 +0000
Subject: [pkgdb] ocaml-camlimages had acl change status
Message-ID: <20090119172254.B4727208E3E@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on ocaml-camlimages (Fedora EPEL 4) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-camlimages



From pkgdb at fedoraproject.org  Mon Jan 19 17:22:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:22:57 +0000
Subject: [pkgdb] ocaml-camlimages ownership updated
Message-ID: <20090119172258.27393208F80@bastion.fedora.phx.redhat.com>

Package ocaml-camlimages in Fedora EPEL 5 is now owned by rjones

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-camlimages



From pkgdb at fedoraproject.org  Mon Jan 19 17:22:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:22:59 +0000
Subject: [pkgdb] ocaml-camlimages had acl change status
Message-ID: <20090119172259.99075208491@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on ocaml-camlimages (Fedora EPEL 4) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-camlimages



From pkgdb at fedoraproject.org  Mon Jan 19 17:23:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:23:01 +0000
Subject: [pkgdb] ocaml-camlimages had acl change status
Message-ID: <20090119172301.996F6208F87@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on ocaml-camlimages (Fedora EPEL 5) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-camlimages



From pkgdb at fedoraproject.org  Mon Jan 19 17:23:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:23:06 +0000
Subject: [pkgdb] ocaml-camlimages had acl change status
Message-ID: <20090119172306.80AE9208F85@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on ocaml-camlimages (Fedora EPEL 5) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-camlimages



From pkgdb at fedoraproject.org  Mon Jan 19 17:23:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:23:07 +0000
Subject: [pkgdb] ocaml-camlimages had acl change status
Message-ID: <20090119172307.E5324208F8B@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on ocaml-camlimages (Fedora 9) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-camlimages



From pkgdb at fedoraproject.org  Mon Jan 19 17:23:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:23:09 +0000
Subject: [pkgdb] ocaml-camlimages had acl change status
Message-ID: <20090119172309.CB6D2208F8F@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on ocaml-camlimages (Fedora 9) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-camlimages



From pkgdb at fedoraproject.org  Mon Jan 19 17:23:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:23:11 +0000
Subject: [pkgdb] ocaml-camlimages had acl change status
Message-ID: <20090119172312.1DAF9208F91@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on ocaml-camlimages (Fedora 10) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-camlimages



From pkgdb at fedoraproject.org  Mon Jan 19 17:23:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:23:14 +0000
Subject: [pkgdb] ocaml-camlimages had acl change status
Message-ID: <20090119172314.452B1208E43@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on ocaml-camlimages (Fedora 10) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-camlimages



From pkgdb at fedoraproject.org  Mon Jan 19 17:23:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:23:14 +0000
Subject: [pkgdb] ocaml-expat had acl change status
Message-ID: <20090119172314.D32E8208F93@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on ocaml-expat (Fedora devel) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-expat



From pkgdb at fedoraproject.org  Mon Jan 19 17:23:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:23:16 +0000
Subject: [pkgdb] ocaml-expat had acl change status
Message-ID: <20090119172316.BA91A208F96@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on ocaml-expat (Fedora devel) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-expat



From pkgdb at fedoraproject.org  Mon Jan 19 17:23:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:23:19 +0000
Subject: [pkgdb] ocaml-expat had acl change status
Message-ID: <20090119172319.A68DF208F97@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on ocaml-expat (Fedora 9) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-expat



From pkgdb at fedoraproject.org  Mon Jan 19 17:23:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:23:21 +0000
Subject: [pkgdb] ocaml-expat had acl change status
Message-ID: <20090119172321.B6E9F208F9C@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on ocaml-expat (Fedora 10) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-expat



From pkgdb at fedoraproject.org  Mon Jan 19 17:23:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:23:23 +0000
Subject: [pkgdb] ocaml-expat had acl change status
Message-ID: <20090119172323.647DA208F9E@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on ocaml-expat (Fedora 9) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-expat



From pkgdb at fedoraproject.org  Mon Jan 19 17:23:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:23:31 +0000
Subject: [pkgdb] ocaml-findlib had acl change status
Message-ID: <20090119172331.C2A32208E48@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on ocaml-findlib (Fedora devel) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-findlib



From pkgdb at fedoraproject.org  Mon Jan 19 17:23:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:23:23 +0000
Subject: [pkgdb] ocaml-expat had acl change status
Message-ID: <20090119172323.AF1F9208FA0@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on ocaml-expat (Fedora 10) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-expat



From pkgdb at fedoraproject.org  Mon Jan 19 17:23:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:23:32 +0000
Subject: [pkgdb] ocaml-findlib had acl change status
Message-ID: <20090119172332.E603A208FA3@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on ocaml-findlib (Fedora devel) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-findlib



From pkgdb at fedoraproject.org  Mon Jan 19 17:23:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:23:35 +0000
Subject: [pkgdb] ocaml-findlib had acl change status
Message-ID: <20090119172336.3DA9C208E4B@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on ocaml-findlib (Fedora EPEL 5) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-findlib



From pkgdb at fedoraproject.org  Mon Jan 19 17:23:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:23:38 +0000
Subject: [pkgdb] ocaml-findlib had acl change status
Message-ID: <20090119172339.0A2B3208FA9@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on ocaml-findlib (Fedora EPEL 5) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-findlib



From pkgdb at fedoraproject.org  Mon Jan 19 17:23:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:23:38 +0000
Subject: [pkgdb] ocaml-findlib had acl change status
Message-ID: <20090119172339.07564208FA8@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on ocaml-findlib (Fedora 9) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-findlib



From pkgdb at fedoraproject.org  Mon Jan 19 17:23:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:23:39 +0000
Subject: [pkgdb] ocaml-findlib had acl change status
Message-ID: <20090119172339.8DFA3208FAC@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on ocaml-findlib (Fedora 9) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-findlib



From pkgdb at fedoraproject.org  Mon Jan 19 17:23:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:23:40 +0000
Subject: [pkgdb] ocaml-findlib had acl change status
Message-ID: <20090119172340.D80C3208FB0@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on ocaml-findlib (Fedora EPEL 4) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-findlib



From pkgdb at fedoraproject.org  Mon Jan 19 17:23:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:23:42 +0000
Subject: [pkgdb] ocaml-findlib had acl change status
Message-ID: <20090119172342.7087D208FB4@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on ocaml-findlib (Fedora EPEL 4) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-findlib



From pkgdb at fedoraproject.org  Mon Jan 19 17:23:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:23:45 +0000
Subject: [pkgdb] ocaml-findlib had acl change status
Message-ID: <20090119172345.1EEBD208FB7@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on ocaml-findlib (Fedora 10) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-findlib



From pkgdb at fedoraproject.org  Mon Jan 19 17:23:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:23:44 +0000
Subject: [pkgdb] ocaml-findlib had acl change status
Message-ID: <20090119172345.D1AF02084B6@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on ocaml-findlib (Fedora 10) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-findlib



From pkgdb at fedoraproject.org  Mon Jan 19 17:23:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:23:48 +0000
Subject: [pkgdb] ocaml-extlib had acl change status
Message-ID: <20090119172348.6E444208FBA@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on ocaml-extlib (Fedora devel) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-extlib



From pkgdb at fedoraproject.org  Mon Jan 19 17:23:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:23:49 +0000
Subject: [pkgdb] ocaml-extlib had acl change status
Message-ID: <20090119172349.6C5E9208FBC@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on ocaml-extlib (Fedora devel) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-extlib



From pkgdb at fedoraproject.org  Mon Jan 19 17:23:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:23:54 +0000
Subject: [pkgdb] ocaml-extlib had acl change status
Message-ID: <20090119172354.82C29208FC3@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on ocaml-extlib (Fedora EPEL 5) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-extlib



From pkgdb at fedoraproject.org  Mon Jan 19 17:23:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:23:54 +0000
Subject: [pkgdb] ocaml-extlib had acl change status
Message-ID: <20090119172354.83395208FC4@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on ocaml-extlib (Fedora EPEL 5) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-extlib



From pkgdb at fedoraproject.org  Mon Jan 19 17:23:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:23:55 +0000
Subject: [pkgdb] ocaml-extlib had acl change status
Message-ID: <20090119172355.B7F04208FC8@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on ocaml-extlib (Fedora 9) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-extlib



From pkgdb at fedoraproject.org  Mon Jan 19 17:23:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:23:57 +0000
Subject: [pkgdb] ocaml-extlib had acl change status
Message-ID: <20090119172357.3F246208E50@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on ocaml-extlib (Fedora 9) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-extlib



From pkgdb at fedoraproject.org  Mon Jan 19 17:24:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:24:00 +0000
Subject: [pkgdb] ocaml-extlib had acl change status
Message-ID: <20090119172400.9D40E208E52@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on ocaml-extlib (Fedora 10) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-extlib



From pkgdb at fedoraproject.org  Mon Jan 19 17:24:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:24:01 +0000
Subject: [pkgdb] ocaml-extlib had acl change status
Message-ID: <20090119172401.4CF9B208FCC@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on ocaml-extlib (Fedora 10) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-extlib



From pkgdb at fedoraproject.org  Mon Jan 19 17:24:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:24:04 +0000
Subject: [pkgdb] ocaml-ssl had acl change status
Message-ID: <20090119172404.D1BB5208FD2@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on ocaml-ssl (Fedora devel) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-ssl



From pkgdb at fedoraproject.org  Mon Jan 19 17:24:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:24:04 +0000
Subject: [pkgdb] ocaml-ssl had acl change status
Message-ID: <20090119172404.645DA208FD0@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on ocaml-ssl (Fedora devel) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-ssl



From pkgdb at fedoraproject.org  Mon Jan 19 17:24:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:24:07 +0000
Subject: [pkgdb] ocaml-ssl had acl change status
Message-ID: <20090119172407.9AE6A208FD3@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on ocaml-ssl (Fedora 9) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-ssl



From pkgdb at fedoraproject.org  Mon Jan 19 17:24:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:24:08 +0000
Subject: [pkgdb] ocaml-ssl had acl change status
Message-ID: <20090119172409.3F08B208E55@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on ocaml-ssl (Fedora 10) to Obsolete for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-ssl



From pkgdb at fedoraproject.org  Mon Jan 19 17:24:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:24:11 +0000
Subject: [pkgdb] ocaml-ssl had acl change status
Message-ID: <20090119172411.EEEF6208FD7@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on ocaml-ssl (Fedora 10) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-ssl



From pkgdb at fedoraproject.org  Mon Jan 19 17:24:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:24:11 +0000
Subject: [pkgdb] ocaml-ssl had acl change status
Message-ID: <20090119172412.092D0208FD9@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on ocaml-ssl (Fedora 9) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-ssl



From pkgdb at fedoraproject.org  Mon Jan 19 17:24:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:24:12 +0000
Subject: [pkgdb] ocaml-ssl had acl change status
Message-ID: <20090119172412.7A4F8208FDC@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on ocaml-ssl (Fedora 10) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-ssl



From pkgdb at fedoraproject.org  Mon Jan 19 17:24:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:24:26 +0000
Subject: [pkgdb] ocaml-mikmatch had acl change status
Message-ID: <20090119172427.B6CA3208FE2@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on ocaml-mikmatch (Fedora 9) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-mikmatch



From pkgdb at fedoraproject.org  Mon Jan 19 17:24:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:24:26 +0000
Subject: [pkgdb] ocaml-mikmatch had acl change status
Message-ID: <20090119172427.870CB208FDF@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on ocaml-mikmatch (Fedora devel) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-mikmatch



From pkgdb at fedoraproject.org  Mon Jan 19 17:24:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:24:26 +0000
Subject: [pkgdb] ocaml-mikmatch had acl change status
Message-ID: <20090119172426.DFEFB208FDE@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on ocaml-mikmatch (Fedora devel) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-mikmatch



From pkgdb at fedoraproject.org  Mon Jan 19 17:24:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:24:28 +0000
Subject: [pkgdb] ocaml-mikmatch had acl change status
Message-ID: <20090119172428.6BE8B208FE5@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on ocaml-mikmatch (Fedora 9) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-mikmatch



From pkgdb at fedoraproject.org  Mon Jan 19 17:24:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:24:29 +0000
Subject: [pkgdb] ocaml-mikmatch had acl change status
Message-ID: <20090119172429.8570F208FE8@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on ocaml-mikmatch (Fedora 10) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-mikmatch



From pkgdb at fedoraproject.org  Mon Jan 19 17:24:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:24:29 +0000
Subject: [pkgdb] ocaml-mikmatch had acl change status
Message-ID: <20090119172429.9BCE3208FED@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on ocaml-mikmatch (Fedora 10) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-mikmatch



From pkgdb at fedoraproject.org  Mon Jan 19 17:24:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:24:34 +0000
Subject: [pkgdb] ocaml-bisect had acl change status
Message-ID: <20090119172434.C0C22208E5B@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on ocaml-bisect (Fedora devel) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-bisect



From pkgdb at fedoraproject.org  Mon Jan 19 17:24:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:24:35 +0000
Subject: [pkgdb] ocaml-bisect had acl change status
Message-ID: <20090119172435.20EC9208FEA@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on ocaml-bisect (Fedora devel) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-bisect



From pkgdb at fedoraproject.org  Mon Jan 19 17:24:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:24:36 +0000
Subject: [pkgdb] ocaml-bisect had acl change status
Message-ID: <20090119172436.D142A208FEF@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on ocaml-bisect (Fedora 9) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-bisect



From pkgdb at fedoraproject.org  Mon Jan 19 17:24:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:24:38 +0000
Subject: [pkgdb] ocaml-bisect had acl change status
Message-ID: <20090119172438.A977A208FF5@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on ocaml-bisect (Fedora 10) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-bisect



From pkgdb at fedoraproject.org  Mon Jan 19 17:24:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:24:36 +0000
Subject: [pkgdb] ocaml-bisect had acl change status
Message-ID: <20090119172436.F3CFC208FF2@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on ocaml-bisect (Fedora 9) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-bisect



From pkgdb at fedoraproject.org  Mon Jan 19 17:24:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:24:42 +0000
Subject: [pkgdb] ocaml-cmigrep had acl change status
Message-ID: <20090119172446.44F89208E5E@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on ocaml-cmigrep (Fedora devel) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-cmigrep



From pkgdb at fedoraproject.org  Mon Jan 19 17:24:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:24:42 +0000
Subject: [pkgdb] ocaml-bisect had acl change status
Message-ID: <20090119172446.398E8208FF9@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on ocaml-bisect (Fedora 10) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-bisect



From pkgdb at fedoraproject.org  Mon Jan 19 17:24:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:24:44 +0000
Subject: [pkgdb] ocaml-cmigrep had acl change status
Message-ID: <20090119172446.7AA0A208FF8@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on ocaml-cmigrep (Fedora 9) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-cmigrep



From pkgdb at fedoraproject.org  Mon Jan 19 17:24:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:24:43 +0000
Subject: [pkgdb] ocaml-cmigrep had acl change status
Message-ID: <20090119172446.E92DA208FFE@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on ocaml-cmigrep (Fedora devel) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-cmigrep



From pkgdb at fedoraproject.org  Mon Jan 19 17:24:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:24:46 +0000
Subject: [pkgdb] ocaml-cmigrep had acl change status
Message-ID: <20090119172447.A2A6D209001@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on ocaml-cmigrep (Fedora 9) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-cmigrep



From pkgdb at fedoraproject.org  Mon Jan 19 17:24:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:24:47 +0000
Subject: [pkgdb] ocaml-cmigrep had acl change status
Message-ID: <20090119172448.7E9D6209004@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on ocaml-cmigrep (Fedora 10) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-cmigrep



From pkgdb at fedoraproject.org  Mon Jan 19 17:24:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:24:49 +0000
Subject: [pkgdb] ocaml-cmigrep had acl change status
Message-ID: <20090119172449.5A51D209007@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on ocaml-cmigrep (Fedora 10) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-cmigrep



From pkgdb at fedoraproject.org  Mon Jan 19 17:24:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:24:53 +0000
Subject: [pkgdb] ocaml-lwt had acl change status
Message-ID: <20090119172453.78BBB20900A@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on ocaml-lwt (Fedora devel) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-lwt



From pkgdb at fedoraproject.org  Mon Jan 19 17:24:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:24:52 +0000
Subject: [pkgdb] ocaml-lwt had acl change status
Message-ID: <20090119172452.38A12208E64@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on ocaml-lwt (Fedora devel) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-lwt



From pkgdb at fedoraproject.org  Mon Jan 19 17:24:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:24:57 +0000
Subject: [pkgdb] ocaml-lwt had acl change status
Message-ID: <20090119172457.33DC320900E@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on ocaml-lwt (Fedora 10) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-lwt



From pkgdb at fedoraproject.org  Mon Jan 19 17:24:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:24:56 +0000
Subject: [pkgdb] ocaml-lwt had acl change status
Message-ID: <20090119172458.48E09209010@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on ocaml-lwt (Fedora 9) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-lwt



From pkgdb at fedoraproject.org  Mon Jan 19 17:24:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:24:58 +0000
Subject: [pkgdb] ocaml-lwt had acl change status
Message-ID: <20090119172458.64FB6209013@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on ocaml-lwt (Fedora 9) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-lwt



From pkgdb at fedoraproject.org  Mon Jan 19 17:25:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:25:02 +0000
Subject: [pkgdb] ocaml-reins had acl change status
Message-ID: <20090119172503.9D6CE208E68@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on ocaml-reins (Fedora devel) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-reins



From pkgdb at fedoraproject.org  Mon Jan 19 17:25:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:25:04 +0000
Subject: [pkgdb] ocaml-reins had acl change status
Message-ID: <20090119172504.A22B0209017@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on ocaml-reins (Fedora 9) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-reins



From pkgdb at fedoraproject.org  Mon Jan 19 17:25:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:25:04 +0000
Subject: [pkgdb] ocaml-reins had acl change status
Message-ID: <20090119172505.2483B20901E@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on ocaml-reins (Fedora devel) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-reins



From pkgdb at fedoraproject.org  Mon Jan 19 17:25:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:25:04 +0000
Subject: [pkgdb] ocaml-reins had acl change status
Message-ID: <20090119172505.246E720901D@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on ocaml-reins (Fedora 9) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-reins



From pkgdb at fedoraproject.org  Mon Jan 19 17:25:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:25:07 +0000
Subject: [pkgdb] ocaml-reins had acl change status
Message-ID: <20090119172508.14108209022@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on ocaml-reins (Fedora 10) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-reins



From pkgdb at fedoraproject.org  Mon Jan 19 17:25:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:25:08 +0000
Subject: [pkgdb] ocaml-reins had acl change status
Message-ID: <20090119172508.E8EA5209026@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on ocaml-reins (Fedora 10) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-reins



From pkgdb at fedoraproject.org  Mon Jan 19 17:24:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:24:59 +0000
Subject: [pkgdb] ocaml-lwt had acl change status
Message-ID: <20090119172459.682C7209016@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on ocaml-lwt (Fedora 10) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-lwt



From pkgdb at fedoraproject.org  Mon Jan 19 17:25:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:25:10 +0000
Subject: [pkgdb] ocaml-preludeml had acl change status
Message-ID: <20090119172511.4D517209027@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on ocaml-preludeml (Fedora devel) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-preludeml



From pkgdb at fedoraproject.org  Mon Jan 19 17:25:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:25:12 +0000
Subject: [pkgdb] ocaml-preludeml had acl change status
Message-ID: <20090119172512.D8219209029@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on ocaml-preludeml (Fedora 10) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-preludeml



From pkgdb at fedoraproject.org  Mon Jan 19 17:25:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:25:13 +0000
Subject: [pkgdb] ocaml-preludeml had acl change status
Message-ID: <20090119172513.90D1820902C@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on ocaml-preludeml (Fedora devel) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-preludeml



From pkgdb at fedoraproject.org  Mon Jan 19 17:25:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:25:14 +0000
Subject: [pkgdb] ocaml-preludeml had acl change status
Message-ID: <20090119172514.2FED320902F@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on ocaml-preludeml (Fedora 10) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-preludeml



From pkgdb at fedoraproject.org  Mon Jan 19 17:25:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:25:22 +0000
Subject: [pkgdb] ocaml-fileutils had acl change status
Message-ID: <20090119172522.4BBB7209032@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on ocaml-fileutils (Fedora 9) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-fileutils



From pkgdb at fedoraproject.org  Mon Jan 19 17:25:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:25:17 +0000
Subject: [pkgdb] ocaml-fileutils had acl change status
Message-ID: <20090119172517.BBB1C208E6C@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on ocaml-fileutils (Fedora devel) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-fileutils



From pkgdb at fedoraproject.org  Mon Jan 19 17:25:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:25:22 +0000
Subject: [pkgdb] ocaml-fileutils had acl change status
Message-ID: <20090119172522.D7C3D209034@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on ocaml-fileutils (Fedora devel) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-fileutils



From pkgdb at fedoraproject.org  Mon Jan 19 17:25:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:25:22 +0000
Subject: [pkgdb] ocaml-fileutils had acl change status
Message-ID: <20090119172522.E9DCD209037@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on ocaml-fileutils (Fedora 9) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-fileutils



From pkgdb at fedoraproject.org  Mon Jan 19 17:25:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:25:24 +0000
Subject: [pkgdb] ocaml-fileutils had acl change status
Message-ID: <20090119172524.70C4120903B@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on ocaml-fileutils (Fedora 10) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-fileutils



From pkgdb at fedoraproject.org  Mon Jan 19 17:25:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:25:26 +0000
Subject: [pkgdb] ocaml-fileutils had acl change status
Message-ID: <20090119172526.B861D20903D@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on ocaml-fileutils (Fedora 10) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-fileutils



From pkgdb at fedoraproject.org  Mon Jan 19 17:25:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:25:31 +0000
Subject: [pkgdb] ocaml-zip had acl change status
Message-ID: <20090119172532.1748320903F@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on ocaml-zip (Fedora devel) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-zip



From pkgdb at fedoraproject.org  Mon Jan 19 17:25:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:25:32 +0000
Subject: [pkgdb] ocaml-zip had acl change status
Message-ID: <20090119172532.833BB209042@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on ocaml-zip (Fedora devel) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-zip



From pkgdb at fedoraproject.org  Mon Jan 19 17:25:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:25:36 +0000
Subject: [pkgdb] ocaml-zip had acl change status
Message-ID: <20090119172537.57045209043@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on ocaml-zip (Fedora 10) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-zip



From pkgdb at fedoraproject.org  Mon Jan 19 17:25:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:25:38 +0000
Subject: [pkgdb] ocaml-zip had acl change status
Message-ID: <20090119172538.1EAF3209045@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on ocaml-zip (Fedora 9) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-zip



From pkgdb at fedoraproject.org  Mon Jan 19 17:25:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:25:38 +0000
Subject: [pkgdb] ocaml-zip had acl change status
Message-ID: <20090119172538.C953520904A@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on ocaml-zip (Fedora 10) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-zip



From pkgdb at fedoraproject.org  Mon Jan 19 17:25:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:25:46 +0000
Subject: [pkgdb] ocaml-cil had acl change status
Message-ID: <20090119172546.A08F420897A@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on ocaml-cil (Fedora 9) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-cil



From pkgdb at fedoraproject.org  Mon Jan 19 17:25:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:25:47 +0000
Subject: [pkgdb] ocaml-cil had acl change status
Message-ID: <20090119172548.65DAC20904E@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on ocaml-cil (Fedora devel) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-cil



From pkgdb at fedoraproject.org  Mon Jan 19 17:25:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:25:47 +0000
Subject: [pkgdb] ocaml-cil had acl change status
Message-ID: <20090119172548.79AC0209051@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on ocaml-cil (Fedora devel) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-cil



From pkgdb at fedoraproject.org  Mon Jan 19 17:25:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:25:49 +0000
Subject: [pkgdb] ocaml-cil had acl change status
Message-ID: <20090119172549.96B62209054@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on ocaml-cil (Fedora 9) to Obsolete for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-cil



From pkgdb at fedoraproject.org  Mon Jan 19 17:25:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:25:51 +0000
Subject: [pkgdb] ocaml-cil had acl change status
Message-ID: <20090119172551.85D56209057@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on ocaml-cil (Fedora 10) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-cil



From pkgdb at fedoraproject.org  Mon Jan 19 17:25:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:25:52 +0000
Subject: [pkgdb] ocaml-cil had acl change status
Message-ID: <20090119172552.F2A6B20905A@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on ocaml-cil (Fedora 9) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-cil



From pkgdb at fedoraproject.org  Mon Jan 19 17:25:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:25:53 +0000
Subject: [pkgdb] ocaml-cil had acl change status
Message-ID: <20090119172554.2EB7820905D@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on ocaml-cil (Fedora 10) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-cil



From pkgdb at fedoraproject.org  Mon Jan 19 17:25:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:25:57 +0000
Subject: [pkgdb] ocaml-camlp5 had acl change status
Message-ID: <20090119172557.6E9D3208E79@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on ocaml-camlp5 (Fedora devel) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-camlp5



From pkgdb at fedoraproject.org  Mon Jan 19 17:25:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:25:57 +0000
Subject: [pkgdb] ocaml-camlp5 had acl change status
Message-ID: <20090119172557.6AE35208E78@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on ocaml-camlp5 (Fedora devel) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-camlp5



From pkgdb at fedoraproject.org  Mon Jan 19 17:25:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:25:59 +0000
Subject: [pkgdb] ocaml-camlp5 had acl change status
Message-ID: <20090119172559.A9261209061@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on ocaml-camlp5 (Fedora 9) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-camlp5



From pkgdb at fedoraproject.org  Mon Jan 19 17:26:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:26:02 +0000
Subject: [pkgdb] ocaml-camlp5 had acl change status
Message-ID: <20090119172602.7EEB7209065@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on ocaml-camlp5 (Fedora 10) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-camlp5



From pkgdb at fedoraproject.org  Mon Jan 19 17:26:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:26:03 +0000
Subject: [pkgdb] ocaml-camlp5 had acl change status
Message-ID: <20090119172603.F3CE8209068@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on ocaml-camlp5 (Fedora 9) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-camlp5



From pkgdb at fedoraproject.org  Mon Jan 19 17:26:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:26:04 +0000
Subject: [pkgdb] ocaml-camlp5 had acl change status
Message-ID: <20090119172604.9937320906B@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on ocaml-camlp5 (Fedora 10) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-camlp5



From pkgdb at fedoraproject.org  Mon Jan 19 17:26:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:26:08 +0000
Subject: [pkgdb] ocaml-sqlite had acl change status
Message-ID: <20090119172608.C23B220906E@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on ocaml-sqlite (Fedora devel) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-sqlite



From pkgdb at fedoraproject.org  Mon Jan 19 17:26:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:26:10 +0000
Subject: [pkgdb] ocaml-sqlite had acl change status
Message-ID: <20090119172611.7C437208E7E@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on ocaml-sqlite (Fedora devel) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-sqlite



From pkgdb at fedoraproject.org  Mon Jan 19 17:26:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:26:11 +0000
Subject: [pkgdb] ocaml-sqlite had acl change status
Message-ID: <20090119172611.F19C220906F@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on ocaml-sqlite (Fedora 9) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-sqlite



From pkgdb at fedoraproject.org  Mon Jan 19 17:26:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:26:13 +0000
Subject: [pkgdb] ocaml-sqlite had acl change status
Message-ID: <20090119172613.7B71C209075@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on ocaml-sqlite (Fedora 10) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-sqlite



From pkgdb at fedoraproject.org  Mon Jan 19 17:26:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:26:13 +0000
Subject: [pkgdb] ocaml-sqlite had acl change status
Message-ID: <20090119172613.60D9E209072@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on ocaml-sqlite (Fedora 9) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-sqlite



From pkgdb at fedoraproject.org  Mon Jan 19 17:26:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:26:14 +0000
Subject: [pkgdb] ocaml-sqlite had acl change status
Message-ID: <20090119172614.60BCC209078@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on ocaml-sqlite (Fedora 10) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-sqlite



From pkgdb at fedoraproject.org  Mon Jan 19 17:26:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:26:23 +0000
Subject: [pkgdb] ocaml-cairo had acl change status
Message-ID: <20090119172623.68CF3208E80@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on ocaml-cairo (Fedora devel) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-cairo



From pkgdb at fedoraproject.org  Mon Jan 19 17:26:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:26:25 +0000
Subject: [pkgdb] ocaml-cairo had acl change status
Message-ID: <20090119172627.3ECEC20907C@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on ocaml-cairo (Fedora devel) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-cairo



From pkgdb at fedoraproject.org  Mon Jan 19 17:26:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:26:27 +0000
Subject: [pkgdb] ocaml-cairo had acl change status
Message-ID: <20090119172627.58AE220907F@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on ocaml-cairo (Fedora 9) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-cairo



From pkgdb at fedoraproject.org  Mon Jan 19 17:26:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:26:30 +0000
Subject: [pkgdb] ocaml-cairo had acl change status
Message-ID: <20090119172630.8F6A8209080@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on ocaml-cairo (Fedora 9) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-cairo



From pkgdb at fedoraproject.org  Mon Jan 19 17:26:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:26:31 +0000
Subject: [pkgdb] ocaml-cairo had acl change status
Message-ID: <20090119172631.77476208E84@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on ocaml-cairo (Fedora 10) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-cairo



From pkgdb at fedoraproject.org  Mon Jan 19 17:25:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:25:38 +0000
Subject: [pkgdb] ocaml-zip had acl change status
Message-ID: <20090119172538.A3304209047@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on ocaml-zip (Fedora 9) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-zip



From pkgdb at fedoraproject.org  Mon Jan 19 17:26:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:26:33 +0000
Subject: [pkgdb] ocaml-cairo had acl change status
Message-ID: <20090119172636.25AB2209083@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on ocaml-cairo (Fedora 10) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-cairo



From pkgdb at fedoraproject.org  Mon Jan 19 17:26:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:26:53 +0000
Subject: [pkgdb] ocaml-dbus had acl change status
Message-ID: <20090119172654.03BDE208E89@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on ocaml-dbus (Fedora devel) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-dbus



From pkgdb at fedoraproject.org  Mon Jan 19 17:26:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:26:53 +0000
Subject: [pkgdb] ocaml-dbus had acl change status
Message-ID: <20090119172654.63E08208E8B@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on ocaml-dbus (Fedora devel) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-dbus



From pkgdb at fedoraproject.org  Mon Jan 19 17:26:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:26:54 +0000
Subject: [pkgdb] ocaml-dbus had acl change status
Message-ID: <20090119172654.A905C208E8E@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on ocaml-dbus (Fedora 9) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-dbus



From pkgdb at fedoraproject.org  Mon Jan 19 17:26:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:26:55 +0000
Subject: [pkgdb] ocaml-dbus had acl change status
Message-ID: <20090119172655.F075B209087@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on ocaml-dbus (Fedora 9) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-dbus



From pkgdb at fedoraproject.org  Mon Jan 19 17:26:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:26:55 +0000
Subject: [pkgdb] ocaml-dbus had acl change status
Message-ID: <20090119172656.18C5B20908A@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on ocaml-dbus (Fedora 10) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-dbus



From pkgdb at fedoraproject.org  Mon Jan 19 17:26:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:26:56 +0000
Subject: [pkgdb] ocaml-dbus had acl change status
Message-ID: <20090119172656.A7AF520908D@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on ocaml-dbus (Fedora 10) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-dbus



From pkgdb at fedoraproject.org  Mon Jan 19 17:27:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:27:02 +0000
Subject: [pkgdb] ocaml-pcre had acl change status
Message-ID: <20090119172702.CF6BC209097@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on ocaml-pcre (Fedora devel) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-pcre



From pkgdb at fedoraproject.org  Mon Jan 19 17:27:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:27:02 +0000
Subject: [pkgdb] ocaml-pcre had acl change status
Message-ID: <20090119172702.7DC88209090@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on ocaml-pcre (Fedora devel) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-pcre



From pkgdb at fedoraproject.org  Mon Jan 19 17:27:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:27:06 +0000
Subject: [pkgdb] ocaml-pcre had acl change status
Message-ID: <20090119172706.A6C2C209092@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on ocaml-pcre (Fedora 9) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-pcre



From pkgdb at fedoraproject.org  Mon Jan 19 17:27:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:27:09 +0000
Subject: [pkgdb] ocaml-pcre had acl change status
Message-ID: <20090119172710.05A4A209096@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on ocaml-pcre (Fedora 9) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-pcre



From pkgdb at fedoraproject.org  Mon Jan 19 17:27:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:27:10 +0000
Subject: [pkgdb] ocaml-pcre had acl change status
Message-ID: <20090119172710.8A28820909A@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on ocaml-pcre (Fedora 10) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-pcre



From pkgdb at fedoraproject.org  Mon Jan 19 17:27:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:27:10 +0000
Subject: [pkgdb] ocaml-pcre had acl change status
Message-ID: <20090119172710.AA60020909D@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on ocaml-pcre (Fedora 10) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-pcre



From pkgdb at fedoraproject.org  Mon Jan 19 17:27:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:27:18 +0000
Subject: [pkgdb] ocaml-SDL had acl change status
Message-ID: <20090119172719.7AD4A208A61@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on ocaml-SDL (Fedora EPEL 4) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-SDL



From pkgdb at fedoraproject.org  Mon Jan 19 17:27:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:27:19 +0000
Subject: [pkgdb] ocaml-SDL had acl change status
Message-ID: <20090119172719.C0F602090A0@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on ocaml-SDL (Fedora EPEL 4) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-SDL



From pkgdb at fedoraproject.org  Mon Jan 19 17:27:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:27:20 +0000
Subject: [pkgdb] ocaml-SDL had acl change status
Message-ID: <20090119172720.E936F2090A7@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on ocaml-SDL (Fedora devel) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-SDL



From pkgdb at fedoraproject.org  Mon Jan 19 17:27:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:27:27 +0000
Subject: [pkgdb] ocaml-SDL had acl change status
Message-ID: <20090119172727.743872090A8@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on ocaml-SDL (Fedora 10) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-SDL



From pkgdb at fedoraproject.org  Mon Jan 19 17:27:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:27:26 +0000
Subject: [pkgdb] ocaml-SDL had acl change status
Message-ID: <20090119172726.EFF80208E96@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on ocaml-SDL (Fedora 9) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-SDL



From pkgdb at fedoraproject.org  Mon Jan 19 17:27:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:27:28 +0000
Subject: [pkgdb] ocaml-SDL had acl change status
Message-ID: <20090119172728.C0A762090AB@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on ocaml-SDL (Fedora 10) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-SDL



From pkgdb at fedoraproject.org  Mon Jan 19 17:27:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:27:28 +0000
Subject: [pkgdb] ocaml-SDL had acl change status
Message-ID: <20090119172729.7E71C2090AE@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on ocaml-SDL (Fedora 9) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-SDL



From pkgdb at fedoraproject.org  Mon Jan 19 17:27:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:27:32 +0000
Subject: [pkgdb] ocaml-calendar had acl change status
Message-ID: <20090119172732.4BD2B2090B4@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on ocaml-calendar (Fedora devel) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-calendar



From pkgdb at fedoraproject.org  Mon Jan 19 17:27:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:27:33 +0000
Subject: [pkgdb] ocaml-calendar had acl change status
Message-ID: <20090119172733.898762090B7@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on ocaml-calendar (Fedora devel) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-calendar



From pkgdb at fedoraproject.org  Mon Jan 19 17:27:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:27:38 +0000
Subject: [pkgdb] ocaml-calendar had acl change status
Message-ID: <20090119172738.6E2042090B9@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on ocaml-calendar (Fedora EPEL 5) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-calendar



From pkgdb at fedoraproject.org  Mon Jan 19 17:27:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:27:36 +0000
Subject: [pkgdb] ocaml-calendar had acl change status
Message-ID: <20090119172738.C3D0C2090BB@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on ocaml-calendar (Fedora EPEL 5) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-calendar



From pkgdb at fedoraproject.org  Mon Jan 19 17:27:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:27:42 +0000
Subject: [pkgdb] ocaml-calendar had acl change status
Message-ID: <20090119172743.631B02090BE@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on ocaml-calendar (Fedora 10) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-calendar



From pkgdb at fedoraproject.org  Mon Jan 19 17:27:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:27:42 +0000
Subject: [pkgdb] ocaml-calendar had acl change status
Message-ID: <20090119172743.916A12090C1@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on ocaml-calendar (Fedora 9) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-calendar



From pkgdb at fedoraproject.org  Mon Jan 19 17:27:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:27:43 +0000
Subject: [pkgdb] ocaml-SDL had acl change status
Message-ID: <20090119172744.2490A2090C4@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on ocaml-SDL (Fedora EPEL 5) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-SDL



From pkgdb at fedoraproject.org  Mon Jan 19 17:27:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:27:43 +0000
Subject: [pkgdb] ocaml-calendar had acl change status
Message-ID: <20090119172745.4446B2090C5@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on ocaml-calendar (Fedora 9) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-calendar



From pkgdb at fedoraproject.org  Mon Jan 19 17:27:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:27:45 +0000
Subject: [pkgdb] ocaml-calendar had acl change status
Message-ID: <20090119172745.704422090C9@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on ocaml-calendar (Fedora 10) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-calendar



From pkgdb at fedoraproject.org  Mon Jan 19 17:27:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:27:49 +0000
Subject: [pkgdb] ocaml-csv had acl change status
Message-ID: <20090119172750.027282090CF@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on ocaml-csv (Fedora devel) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-csv



From pkgdb at fedoraproject.org  Mon Jan 19 17:27:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:27:49 +0000
Subject: [pkgdb] ocaml-csv had acl change status
Message-ID: <20090119172750.A5F132090D3@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on ocaml-csv (Fedora devel) to Obsolete for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-csv



From pkgdb at fedoraproject.org  Mon Jan 19 17:27:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:27:51 +0000
Subject: [pkgdb] ocaml-SDL had acl change status
Message-ID: <20090119172751.5E1AC2090D4@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on ocaml-SDL (Fedora EPEL 5) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-SDL



From pkgdb at fedoraproject.org  Mon Jan 19 17:27:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:27:51 +0000
Subject: [pkgdb] ocaml-csv had acl change status
Message-ID: <20090119172752.777072090D6@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on ocaml-csv (Fedora EPEL 5) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-csv



From pkgdb at fedoraproject.org  Mon Jan 19 17:27:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:27:53 +0000
Subject: [pkgdb] ocaml-csv had acl change status
Message-ID: <20090119172753.8931B2090D9@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on ocaml-csv (Fedora devel) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-csv



From pkgdb at fedoraproject.org  Mon Jan 19 17:27:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:27:55 +0000
Subject: [pkgdb] ocaml-csv had acl change status
Message-ID: <20090119172755.E12132090DC@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on ocaml-csv (Fedora EPEL 5) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-csv



From pkgdb at fedoraproject.org  Mon Jan 19 17:27:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:27:57 +0000
Subject: [pkgdb] ocaml-csv had acl change status
Message-ID: <20090119172757.F1EF12090DE@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on ocaml-csv (Fedora 9) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-csv



From pkgdb at fedoraproject.org  Mon Jan 19 17:28:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:28:01 +0000
Subject: [pkgdb] ocaml-csv had acl change status
Message-ID: <20090119172802.4F2F02090DF@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on ocaml-csv (Fedora 10) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-csv



From pkgdb at fedoraproject.org  Mon Jan 19 17:28:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:28:01 +0000
Subject: [pkgdb] ocaml-csv had acl change status
Message-ID: <20090119172803.45DDE2090E0@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on ocaml-csv (Fedora 10) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-csv



From pkgdb at fedoraproject.org  Mon Jan 19 17:28:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:28:05 +0000
Subject: [pkgdb] ocaml-csv had acl change status
Message-ID: <20090119172805.D81292090E4@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on ocaml-csv (Fedora 9) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-csv



From pkgdb at fedoraproject.org  Mon Jan 19 17:28:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:28:06 +0000
Subject: [pkgdb] ocaml-curses had acl change status
Message-ID: <20090119172807.23D9F2090EA@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on ocaml-curses (Fedora devel) to Obsolete for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-curses



From pkgdb at fedoraproject.org  Mon Jan 19 17:28:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:28:07 +0000
Subject: [pkgdb] ocaml-curses had acl change status
Message-ID: <20090119172807.F1EBC2090EE@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on ocaml-curses (Fedora devel) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-curses



From pkgdb at fedoraproject.org  Mon Jan 19 17:28:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:28:12 +0000
Subject: [pkgdb] ocaml-curses had acl change status
Message-ID: <20090119172812.4B53A208EA6@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on ocaml-curses (Fedora devel) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-curses



From pkgdb at fedoraproject.org  Mon Jan 19 17:28:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:28:14 +0000
Subject: [pkgdb] ocaml-curses had acl change status
Message-ID: <20090119172814.380E72090F1@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on ocaml-curses (Fedora EPEL 5) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-curses



From pkgdb at fedoraproject.org  Mon Jan 19 17:28:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:28:14 +0000
Subject: [pkgdb] ocaml-curses had acl change status
Message-ID: <20090119172814.AECD12090F4@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on ocaml-curses (Fedora EPEL 5) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-curses



From pkgdb at fedoraproject.org  Mon Jan 19 17:28:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:28:17 +0000
Subject: [pkgdb] ocaml-curses had acl change status
Message-ID: <20090119172817.B0B442090FA@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on ocaml-curses (Fedora 9) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-curses



From pkgdb at fedoraproject.org  Mon Jan 19 17:28:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:28:16 +0000
Subject: [pkgdb] ocaml-curses had acl change status
Message-ID: <20090119172816.66BDF2090F7@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on ocaml-curses (Fedora 9) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-curses



From pkgdb at fedoraproject.org  Mon Jan 19 17:27:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:27:20 +0000
Subject: [pkgdb] ocaml-SDL had acl change status
Message-ID: <20090119172720.AF4DF2090A3@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on ocaml-SDL (Fedora devel) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-SDL



From pkgdb at fedoraproject.org  Mon Jan 19 17:28:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:28:23 +0000
Subject: [pkgdb] ocaml-curses had acl change status
Message-ID: <20090119172823.623412090FE@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on ocaml-curses (Fedora 10) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-curses



From pkgdb at fedoraproject.org  Mon Jan 19 17:28:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:28:23 +0000
Subject: [pkgdb] ocaml-curses had acl change status
Message-ID: <20090119172823.8F622209101@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on ocaml-curses (Fedora 10) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-curses



From pkgdb at fedoraproject.org  Mon Jan 19 17:28:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:28:24 +0000
Subject: [pkgdb] ocaml-libvirt had acl change status
Message-ID: <20090119172824.8069B209107@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on ocaml-libvirt (Fedora devel) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-libvirt



From pkgdb at fedoraproject.org  Mon Jan 19 17:28:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:28:24 +0000
Subject: [pkgdb] ocaml-libvirt had acl change status
Message-ID: <20090119172824.E908A20910A@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on ocaml-libvirt (Fedora devel) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-libvirt



From pkgdb at fedoraproject.org  Mon Jan 19 17:28:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:28:27 +0000
Subject: [pkgdb] ocaml-libvirt had acl change status
Message-ID: <20090119172827.493BE20910E@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on ocaml-libvirt (Fedora EPEL 5) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-libvirt



From pkgdb at fedoraproject.org  Mon Jan 19 17:28:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:28:31 +0000
Subject: [pkgdb] ocaml-libvirt had acl change status
Message-ID: <20090119172832.5D2B8209111@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on ocaml-libvirt (Fedora EPEL 5) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-libvirt



From pkgdb at fedoraproject.org  Mon Jan 19 17:28:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:28:33 +0000
Subject: [pkgdb] ocaml-libvirt had acl change status
Message-ID: <20090119172833.9609E208DDC@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on ocaml-libvirt (Fedora 10) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-libvirt



From pkgdb at fedoraproject.org  Mon Jan 19 17:28:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:28:32 +0000
Subject: [pkgdb] ocaml-libvirt had acl change status
Message-ID: <20090119172834.0468A208EB0@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on ocaml-libvirt (Fedora 9) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-libvirt



From pkgdb at fedoraproject.org  Mon Jan 19 17:28:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:28:36 +0000
Subject: [pkgdb] ocaml-xml-light had acl change status
Message-ID: <20090119172839.0244F209118@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on ocaml-xml-light (Fedora devel) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-xml-light



From pkgdb at fedoraproject.org  Mon Jan 19 17:28:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:28:32 +0000
Subject: [pkgdb] ocaml-libvirt had acl change status
Message-ID: <20090119172834.66E6C209115@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on ocaml-libvirt (Fedora 9) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-libvirt



From pkgdb at fedoraproject.org  Mon Jan 19 17:28:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:28:40 +0000
Subject: [pkgdb] ocaml-xml-light had acl change status
Message-ID: <20090119172840.5381620911C@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on ocaml-xml-light (Fedora devel) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-xml-light



From pkgdb at fedoraproject.org  Mon Jan 19 17:28:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:28:42 +0000
Subject: [pkgdb] ocaml-xml-light had acl change status
Message-ID: <20090119172842.DF0D920911F@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on ocaml-xml-light (Fedora EPEL 5) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-xml-light



From pkgdb at fedoraproject.org  Mon Jan 19 17:28:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:28:43 +0000
Subject: [pkgdb] ocaml-xml-light had acl change status
Message-ID: <20090119172843.CD79D209121@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on ocaml-xml-light (Fedora 9) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-xml-light



From pkgdb at fedoraproject.org  Mon Jan 19 17:28:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:28:44 +0000
Subject: [pkgdb] ocaml-xml-light had acl change status
Message-ID: <20090119172844.512A8209124@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on ocaml-xml-light (Fedora EPEL 5) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-xml-light



From pkgdb at fedoraproject.org  Mon Jan 19 17:28:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:28:51 +0000
Subject: [pkgdb] ocaml-ocamlnet had acl change status
Message-ID: <20090119172851.DE3D7208EB1@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on ocaml-ocamlnet (Fedora devel) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-ocamlnet



From pkgdb at fedoraproject.org  Mon Jan 19 17:28:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:28:51 +0000
Subject: [pkgdb] ocaml-ocamlnet had acl change status
Message-ID: <20090119172852.1EEDC209128@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on ocaml-ocamlnet (Fedora devel) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-ocamlnet



From pkgdb at fedoraproject.org  Mon Jan 19 17:28:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:28:57 +0000
Subject: [pkgdb] ocaml-ocamlnet had acl change status
Message-ID: <20090119172858.3B189208EB7@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on ocaml-ocamlnet (Fedora 9) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-ocamlnet



From pkgdb at fedoraproject.org  Mon Jan 19 17:28:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:28:58 +0000
Subject: [pkgdb] ocaml-ocamlnet had acl change status
Message-ID: <20090119172859.29C1820912F@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on ocaml-ocamlnet (Fedora 9) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-ocamlnet



From pkgdb at fedoraproject.org  Mon Jan 19 17:29:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:29:03 +0000
Subject: [pkgdb] ocaml-ocamlnet had acl change status
Message-ID: <20090119172903.438CA209133@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on ocaml-ocamlnet (Fedora 10) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-ocamlnet



From pkgdb at fedoraproject.org  Mon Jan 19 17:29:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:29:16 +0000
Subject: [pkgdb] ocaml-xml-light had acl change status
Message-ID: <20090119172916.D4B00209135@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on ocaml-xml-light (Fedora 9) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-xml-light



From pkgdb at fedoraproject.org  Mon Jan 19 17:29:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:29:16 +0000
Subject: [pkgdb] ocaml-xml-light had acl change status
Message-ID: <20090119172916.C1790208EBB@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on ocaml-xml-light (Fedora 10) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-xml-light



From pkgdb at fedoraproject.org  Mon Jan 19 17:29:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:29:16 +0000
Subject: [pkgdb] ocaml-ocamlnet had acl change status
Message-ID: <20090119172917.6F037209139@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on ocaml-ocamlnet (Fedora 10) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-ocamlnet



From pkgdb at fedoraproject.org  Mon Jan 19 17:29:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:29:17 +0000
Subject: [pkgdb] ocaml-xml-light had acl change status
Message-ID: <20090119172917.8CD56209138@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on ocaml-xml-light (Fedora 10) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-xml-light



From pkgdb at fedoraproject.org  Mon Jan 19 17:29:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:29:21 +0000
Subject: [pkgdb] ocaml-ulex had acl change status
Message-ID: <20090119172922.9FCF720913F@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on ocaml-ulex (Fedora devel) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-ulex



From pkgdb at fedoraproject.org  Mon Jan 19 17:29:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:29:20 +0000
Subject: [pkgdb] ocaml-ulex had acl change status
Message-ID: <20090119172920.606D4208EBA@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on ocaml-ulex (Fedora devel) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-ulex



From pkgdb at fedoraproject.org  Mon Jan 19 17:29:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:29:25 +0000
Subject: [pkgdb] ocaml-ulex had acl change status
Message-ID: <20090119172926.6694C209144@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on ocaml-ulex (Fedora 9) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-ulex



From pkgdb at fedoraproject.org  Mon Jan 19 17:29:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:29:26 +0000
Subject: [pkgdb] ocaml-ulex had acl change status
Message-ID: <20090119172926.737A2209145@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on ocaml-ulex (Fedora 9) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-ulex



From pkgdb at fedoraproject.org  Mon Jan 19 17:29:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:29:29 +0000
Subject: [pkgdb] ocaml-ulex had acl change status
Message-ID: <20090119172930.336CC209146@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on ocaml-ulex (Fedora 10) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-ulex



From pkgdb at fedoraproject.org  Mon Jan 19 17:29:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:29:31 +0000
Subject: [pkgdb] ocaml-ulex had acl change status
Message-ID: <20090119172932.3B2B1209148@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on ocaml-ulex (Fedora 10) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-ulex



From pkgdb at fedoraproject.org  Mon Jan 19 17:29:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:29:39 +0000
Subject: [pkgdb] ocaml-curl had acl change status
Message-ID: <20090119172939.5FEC0209151@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on ocaml-curl (Fedora 9) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-curl



From pkgdb at fedoraproject.org  Mon Jan 19 17:29:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:29:39 +0000
Subject: [pkgdb] ocaml-curl had acl change status
Message-ID: <20090119172939.82E40209154@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on ocaml-curl (Fedora devel) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-curl



From pkgdb at fedoraproject.org  Mon Jan 19 17:29:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:29:39 +0000
Subject: [pkgdb] ocaml-curl had acl change status
Message-ID: <20090119172943.DC96B208DE3@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on ocaml-curl (Fedora devel) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-curl



From pkgdb at fedoraproject.org  Mon Jan 19 17:29:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:29:39 +0000
Subject: [pkgdb] ocaml-curl had acl change status
Message-ID: <20090119172944.52A65209153@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on ocaml-curl (Fedora 10) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-curl



From pkgdb at fedoraproject.org  Mon Jan 19 17:29:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:29:47 +0000
Subject: [pkgdb] ocaml-curl had acl change status
Message-ID: <20090119172947.E1F82209158@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on ocaml-curl (Fedora 10) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-curl



From pkgdb at fedoraproject.org  Mon Jan 19 17:29:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:29:39 +0000
Subject: [pkgdb] ocaml-curl had acl change status
Message-ID: <20090119172941.EEB8720915B@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on ocaml-curl (Fedora 9) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-curl



From pkgdb at fedoraproject.org  Mon Jan 19 17:34:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:34:15 +0000
Subject: [pkgdb] mingw32-filesystem: mingwmaint has requested watchbugzilla
Message-ID: <20090119173417.D9A84208EDB@bastion.fedora.phx.redhat.com>

mingwmaint has requested the watchbugzilla acl on mingw32-filesystem (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-filesystem



From pkgdb at fedoraproject.org  Mon Jan 19 17:34:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:34:19 +0000
Subject: [pkgdb] mingw32-filesystem: mingwmaint has requested watchbugzilla
Message-ID: <20090119173420.F1788208EDD@bastion.fedora.phx.redhat.com>

mingwmaint has requested the watchbugzilla acl on mingw32-filesystem (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-filesystem



From pkgdb at fedoraproject.org  Mon Jan 19 17:34:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:34:19 +0000
Subject: [pkgdb] mingw32-filesystem: mingwmaint has requested watchbugzilla
Message-ID: <20090119173421.3A239208EE2@bastion.fedora.phx.redhat.com>

mingwmaint has requested the watchbugzilla acl on mingw32-filesystem (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-filesystem



From pkgdb at fedoraproject.org  Mon Jan 19 17:34:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:34:21 +0000
Subject: [pkgdb] mingw32-filesystem: mingwmaint has requested watchcommits
Message-ID: <20090119173422.D07EE208EE7@bastion.fedora.phx.redhat.com>

mingwmaint has requested the watchcommits acl on mingw32-filesystem (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-filesystem



From pkgdb at fedoraproject.org  Mon Jan 19 17:34:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:34:22 +0000
Subject: [pkgdb] mingw32-filesystem: mingwmaint has requested watchcommits
Message-ID: <20090119173423.17DFF208EEB@bastion.fedora.phx.redhat.com>

mingwmaint has requested the watchcommits acl on mingw32-filesystem (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-filesystem



From pkgdb at fedoraproject.org  Mon Jan 19 17:34:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:34:27 +0000
Subject: [pkgdb] mingw32-filesystem: mingwmaint has requested watchcommits
Message-ID: <20090119173427.C04A2208EF2@bastion.fedora.phx.redhat.com>

mingwmaint has requested the watchcommits acl on mingw32-filesystem (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-filesystem



From pkgdb at fedoraproject.org  Mon Jan 19 17:34:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:34:31 +0000
Subject: [pkgdb] mingw32-binutils: mingwmaint has requested watchbugzilla
Message-ID: <20090119173432.02096208EF6@bastion.fedora.phx.redhat.com>

mingwmaint has requested the watchbugzilla acl on mingw32-binutils (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-binutils



From pkgdb at fedoraproject.org  Mon Jan 19 17:34:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:34:34 +0000
Subject: [pkgdb] mingw32-binutils: mingwmaint has requested watchcommits
Message-ID: <20090119173434.E1759208EFA@bastion.fedora.phx.redhat.com>

mingwmaint has requested the watchcommits acl on mingw32-binutils (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-binutils



From pkgdb at fedoraproject.org  Mon Jan 19 17:34:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:34:35 +0000
Subject: [pkgdb] mingw32-binutils: mingwmaint has requested watchbugzilla
Message-ID: <20090119173435.B05F5208EFE@bastion.fedora.phx.redhat.com>

mingwmaint has requested the watchbugzilla acl on mingw32-binutils (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-binutils



From pkgdb at fedoraproject.org  Mon Jan 19 17:34:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:34:36 +0000
Subject: [pkgdb] mingw32-binutils: mingwmaint has requested watchcommits
Message-ID: <20090119173436.6C2B2208F02@bastion.fedora.phx.redhat.com>

mingwmaint has requested the watchcommits acl on mingw32-binutils (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-binutils



From pkgdb at fedoraproject.org  Mon Jan 19 17:34:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:34:36 +0000
Subject: [pkgdb] mingw32-binutils: mingwmaint has requested watchbugzilla
Message-ID: <20090119173436.AA8F7208F06@bastion.fedora.phx.redhat.com>

mingwmaint has requested the watchbugzilla acl on mingw32-binutils (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-binutils



From pkgdb at fedoraproject.org  Mon Jan 19 17:34:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:34:39 +0000
Subject: [pkgdb] mingw32-binutils: mingwmaint has requested watchcommits
Message-ID: <20090119173439.BC5E1208F0B@bastion.fedora.phx.redhat.com>

mingwmaint has requested the watchcommits acl on mingw32-binutils (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-binutils



From pkgdb at fedoraproject.org  Mon Jan 19 17:34:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:34:44 +0000
Subject: [pkgdb] mingw32-gcc: mingwmaint has requested watchbugzilla
Message-ID: <20090119173444.DE3D9208F0D@bastion.fedora.phx.redhat.com>

mingwmaint has requested the watchbugzilla acl on mingw32-gcc (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-gcc



From pkgdb at fedoraproject.org  Mon Jan 19 17:34:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:34:44 +0000
Subject: [pkgdb] mingw32-gcc: mingwmaint has requested watchcommits
Message-ID: <20090119173444.F27B9208F10@bastion.fedora.phx.redhat.com>

mingwmaint has requested the watchcommits acl on mingw32-gcc (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-gcc



From pkgdb at fedoraproject.org  Mon Jan 19 17:34:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:34:45 +0000
Subject: [pkgdb] mingw32-gcc: mingwmaint has requested watchbugzilla
Message-ID: <20090119173446.2245E208F15@bastion.fedora.phx.redhat.com>

mingwmaint has requested the watchbugzilla acl on mingw32-gcc (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-gcc



From pkgdb at fedoraproject.org  Mon Jan 19 17:34:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:34:48 +0000
Subject: [pkgdb] mingw32-gcc: mingwmaint has requested watchbugzilla
Message-ID: <20090119173448.E6FA8208F21@bastion.fedora.phx.redhat.com>

mingwmaint has requested the watchbugzilla acl on mingw32-gcc (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-gcc



From pkgdb at fedoraproject.org  Mon Jan 19 17:34:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:34:48 +0000
Subject: [pkgdb] mingw32-gcc: mingwmaint has requested watchcommits
Message-ID: <20090119173450.4B7BB20915E@bastion.fedora.phx.redhat.com>

mingwmaint has requested the watchcommits acl on mingw32-gcc (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-gcc



From pkgdb at fedoraproject.org  Mon Jan 19 17:34:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:34:50 +0000
Subject: [pkgdb] mingw32-gcc: mingwmaint has requested watchcommits
Message-ID: <20090119173450.E87BF209162@bastion.fedora.phx.redhat.com>

mingwmaint has requested the watchcommits acl on mingw32-gcc (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-gcc



From pkgdb at fedoraproject.org  Mon Jan 19 17:34:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:34:54 +0000
Subject: [pkgdb] mingw32-runtime: mingwmaint has requested watchbugzilla
Message-ID: <20090119173454.8A4BE208F29@bastion.fedora.phx.redhat.com>

mingwmaint has requested the watchbugzilla acl on mingw32-runtime (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-runtime



From pkgdb at fedoraproject.org  Mon Jan 19 17:34:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:34:58 +0000
Subject: [pkgdb] mingw32-runtime: mingwmaint has requested watchbugzilla
Message-ID: <20090119173458.73439209167@bastion.fedora.phx.redhat.com>

mingwmaint has requested the watchbugzilla acl on mingw32-runtime (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-runtime



From pkgdb at fedoraproject.org  Mon Jan 19 17:34:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:34:56 +0000
Subject: [pkgdb] mingw32-runtime: mingwmaint has requested watchcommits
Message-ID: <20090119173458.9085B20916A@bastion.fedora.phx.redhat.com>

mingwmaint has requested the watchcommits acl on mingw32-runtime (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-runtime



From pkgdb at fedoraproject.org  Mon Jan 19 17:34:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:34:58 +0000
Subject: [pkgdb] mingw32-runtime: mingwmaint has requested watchcommits
Message-ID: <20090119173458.AC95420916E@bastion.fedora.phx.redhat.com>

mingwmaint has requested the watchcommits acl on mingw32-runtime (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-runtime



From pkgdb at fedoraproject.org  Mon Jan 19 17:35:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:35:01 +0000
Subject: [pkgdb] mingw32-runtime: mingwmaint has requested watchbugzilla
Message-ID: <20090119173502.136DB209172@bastion.fedora.phx.redhat.com>

mingwmaint has requested the watchbugzilla acl on mingw32-runtime (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-runtime



From pkgdb at fedoraproject.org  Mon Jan 19 17:35:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:35:02 +0000
Subject: [pkgdb] mingw32-runtime: mingwmaint has requested watchcommits
Message-ID: <20090119173502.4BED8209177@bastion.fedora.phx.redhat.com>

mingwmaint has requested the watchcommits acl on mingw32-runtime (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-runtime



From pkgdb at fedoraproject.org  Mon Jan 19 17:35:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:35:08 +0000
Subject: [pkgdb] mingw32-w32api: mingwmaint has requested watchbugzilla
Message-ID: <20090119173508.AE295208F2E@bastion.fedora.phx.redhat.com>

mingwmaint has requested the watchbugzilla acl on mingw32-w32api (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-w32api



From pkgdb at fedoraproject.org  Mon Jan 19 17:35:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:35:09 +0000
Subject: [pkgdb] mingw32-w32api: mingwmaint has requested watchcommits
Message-ID: <20090119173509.2F32820917B@bastion.fedora.phx.redhat.com>

mingwmaint has requested the watchcommits acl on mingw32-w32api (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-w32api



From pkgdb at fedoraproject.org  Mon Jan 19 17:35:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:35:13 +0000
Subject: [pkgdb] mingw32-w32api: mingwmaint has requested watchbugzilla
Message-ID: <20090119173515.6755A208F35@bastion.fedora.phx.redhat.com>

mingwmaint has requested the watchbugzilla acl on mingw32-w32api (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-w32api



From pkgdb at fedoraproject.org  Mon Jan 19 17:35:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:35:14 +0000
Subject: [pkgdb] mingw32-w32api: mingwmaint has requested watchcommits
Message-ID: <20090119173516.09BF8208F32@bastion.fedora.phx.redhat.com>

mingwmaint has requested the watchcommits acl on mingw32-w32api (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-w32api



From pkgdb at fedoraproject.org  Mon Jan 19 17:35:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:35:15 +0000
Subject: [pkgdb] mingw32-w32api: mingwmaint has requested watchcommits
Message-ID: <20090119173516.511E9209181@bastion.fedora.phx.redhat.com>

mingwmaint has requested the watchcommits acl on mingw32-w32api (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-w32api



From pkgdb at fedoraproject.org  Mon Jan 19 17:35:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:35:22 +0000
Subject: [pkgdb] mingw32-zlib: mingwmaint has requested watchbugzilla
Message-ID: <20090119173523.9CA69209184@bastion.fedora.phx.redhat.com>

mingwmaint has requested the watchbugzilla acl on mingw32-zlib (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-zlib



From pkgdb at fedoraproject.org  Mon Jan 19 17:35:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:35:24 +0000
Subject: [pkgdb] mingw32-w32api: mingwmaint has requested watchbugzilla
Message-ID: <20090119173524.F3E0B209189@bastion.fedora.phx.redhat.com>

mingwmaint has requested the watchbugzilla acl on mingw32-w32api (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-w32api



From pkgdb at fedoraproject.org  Mon Jan 19 17:35:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:35:24 +0000
Subject: [pkgdb] mingw32-zlib: mingwmaint has requested watchcommits
Message-ID: <20090119173525.4280A20918D@bastion.fedora.phx.redhat.com>

mingwmaint has requested the watchcommits acl on mingw32-zlib (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-zlib



From pkgdb at fedoraproject.org  Mon Jan 19 17:35:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:35:26 +0000
Subject: [pkgdb] mingw32-zlib: mingwmaint has requested watchbugzilla
Message-ID: <20090119173526.C3157209190@bastion.fedora.phx.redhat.com>

mingwmaint has requested the watchbugzilla acl on mingw32-zlib (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-zlib



From pkgdb at fedoraproject.org  Mon Jan 19 17:35:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:35:27 +0000
Subject: [pkgdb] mingw32-zlib: mingwmaint has requested watchbugzilla
Message-ID: <20090119173527.266DE209195@bastion.fedora.phx.redhat.com>

mingwmaint has requested the watchbugzilla acl on mingw32-zlib (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-zlib



From pkgdb at fedoraproject.org  Mon Jan 19 17:35:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:35:32 +0000
Subject: [pkgdb] mingw32-zlib: mingwmaint has requested watchcommits
Message-ID: <20090119173532.96420209198@bastion.fedora.phx.redhat.com>

mingwmaint has requested the watchcommits acl on mingw32-zlib (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-zlib



From pkgdb at fedoraproject.org  Mon Jan 19 17:35:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:35:32 +0000
Subject: [pkgdb] mingw32-zlib: mingwmaint has requested watchcommits
Message-ID: <20090119173532.BB01E20919D@bastion.fedora.phx.redhat.com>

mingwmaint has requested the watchcommits acl on mingw32-zlib (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-zlib



From pkgdb at fedoraproject.org  Mon Jan 19 17:35:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:35:38 +0000
Subject: [pkgdb] mingw32-sqlite: mingwmaint has requested watchcommits
Message-ID: <20090119173538.3B78A2091A4@bastion.fedora.phx.redhat.com>

mingwmaint has requested the watchcommits acl on mingw32-sqlite (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-sqlite



From pkgdb at fedoraproject.org  Mon Jan 19 17:35:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:35:39 +0000
Subject: [pkgdb] mingw32-sqlite: mingwmaint has requested watchcommits
Message-ID: <20090119173539.8ED502091AA@bastion.fedora.phx.redhat.com>

mingwmaint has requested the watchcommits acl on mingw32-sqlite (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-sqlite



From pkgdb at fedoraproject.org  Mon Jan 19 17:35:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:35:37 +0000
Subject: [pkgdb] mingw32-sqlite: mingwmaint has requested watchbugzilla
Message-ID: <20090119173540.F0230208F3B@bastion.fedora.phx.redhat.com>

mingwmaint has requested the watchbugzilla acl on mingw32-sqlite (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-sqlite



From pkgdb at fedoraproject.org  Mon Jan 19 17:35:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:35:43 +0000
Subject: [pkgdb] mingw32-sqlite: mingwmaint has requested watchbugzilla
Message-ID: <20090119173543.51AE2208F39@bastion.fedora.phx.redhat.com>

mingwmaint has requested the watchbugzilla acl on mingw32-sqlite (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-sqlite



From pkgdb at fedoraproject.org  Mon Jan 19 17:35:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:35:43 +0000
Subject: [pkgdb] mingw32-sqlite: mingwmaint has requested watchbugzilla
Message-ID: <20090119173543.A266F2091B5@bastion.fedora.phx.redhat.com>

mingwmaint has requested the watchbugzilla acl on mingw32-sqlite (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-sqlite



From pkgdb at fedoraproject.org  Mon Jan 19 17:35:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:35:47 +0000
Subject: [pkgdb] mingw32-sqlite: mingwmaint has requested watchcommits
Message-ID: <20090119173547.B1C862091B7@bastion.fedora.phx.redhat.com>

mingwmaint has requested the watchcommits acl on mingw32-sqlite (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-sqlite



From pkgdb at fedoraproject.org  Mon Jan 19 17:35:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:35:51 +0000
Subject: [pkgdb] mingw32-bzip2: mingwmaint has requested watchbugzilla
Message-ID: <20090119173551.A88942091BA@bastion.fedora.phx.redhat.com>

mingwmaint has requested the watchbugzilla acl on mingw32-bzip2 (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-bzip2



From pkgdb at fedoraproject.org  Mon Jan 19 17:35:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:35:52 +0000
Subject: [pkgdb] mingw32-bzip2: mingwmaint has requested watchcommits
Message-ID: <20090119173552.43A1B2091BF@bastion.fedora.phx.redhat.com>

mingwmaint has requested the watchcommits acl on mingw32-bzip2 (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-bzip2



From pkgdb at fedoraproject.org  Mon Jan 19 17:35:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:35:54 +0000
Subject: [pkgdb] mingw32-bzip2: mingwmaint has requested watchbugzilla
Message-ID: <20090119173555.4D0622091C3@bastion.fedora.phx.redhat.com>

mingwmaint has requested the watchbugzilla acl on mingw32-bzip2 (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-bzip2



From pkgdb at fedoraproject.org  Mon Jan 19 17:35:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:35:55 +0000
Subject: [pkgdb] mingw32-bzip2: mingwmaint has requested watchcommits
Message-ID: <20090119173555.F3FA02091CA@bastion.fedora.phx.redhat.com>

mingwmaint has requested the watchcommits acl on mingw32-bzip2 (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-bzip2



From pkgdb at fedoraproject.org  Mon Jan 19 17:35:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:35:57 +0000
Subject: [pkgdb] mingw32-bzip2: mingwmaint has requested watchcommits
Message-ID: <20090119173557.C847A208F42@bastion.fedora.phx.redhat.com>

mingwmaint has requested the watchcommits acl on mingw32-bzip2 (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-bzip2



From pkgdb at fedoraproject.org  Mon Jan 19 17:35:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:35:57 +0000
Subject: [pkgdb] mingw32-bzip2: mingwmaint has requested watchbugzilla
Message-ID: <20090119173558.02BB62091D2@bastion.fedora.phx.redhat.com>

mingwmaint has requested the watchbugzilla acl on mingw32-bzip2 (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-bzip2



From pkgdb at fedoraproject.org  Mon Jan 19 17:36:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:36:09 +0000
Subject: [pkgdb] mingw32-iconv: mingwmaint has requested watchbugzilla
Message-ID: <20090119173610.009C2208F47@bastion.fedora.phx.redhat.com>

mingwmaint has requested the watchbugzilla acl on mingw32-iconv (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-iconv



From pkgdb at fedoraproject.org  Mon Jan 19 17:36:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:36:10 +0000
Subject: [pkgdb] mingw32-iconv: mingwmaint has requested watchcommits
Message-ID: <20090119173610.44DD0208F48@bastion.fedora.phx.redhat.com>

mingwmaint has requested the watchcommits acl on mingw32-iconv (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-iconv



From pkgdb at fedoraproject.org  Mon Jan 19 17:36:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:36:10 +0000
Subject: [pkgdb] mingw32-iconv: mingwmaint has requested watchbugzilla
Message-ID: <20090119173612.B5D952091DE@bastion.fedora.phx.redhat.com>

mingwmaint has requested the watchbugzilla acl on mingw32-iconv (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-iconv



From dwalsh at fedoraproject.org  Mon Jan 19 17:36:14 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Mon, 19 Jan 2009 17:36:14 +0000 (UTC)
Subject: rpms/selinux-policy/devel .cvsignore, 1.155,
	1.156 policy-20090105.patch, 1.7, 1.8 selinux-policy.spec, 1.767,
	1.768 sources, 1.174, 1.175
Message-ID: <20090119173614.357ED700F8@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12160

Modified Files:
	.cvsignore policy-20090105.patch selinux-policy.spec sources 
Log Message:
* Mon Jan 19 2009 Dan Walsh <dwalsh at redhat.com> 3.6.3-1
- Update to upstream



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/.cvsignore,v
retrieving revision 1.155
retrieving revision 1.156
diff -u -r1.155 -r1.156
--- .cvsignore	5 Jan 2009 22:35:32 -0000	1.155
+++ .cvsignore	19 Jan 2009 17:35:43 -0000	1.156
@@ -157,3 +157,4 @@
 serefpolicy-3.5.13.tgz
 serefpolicy-3.6.1.tgz
 serefpolicy-3.6.2.tgz
+serefpolicy-3.6.3.tgz

policy-20090105.patch:

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.7 -r 1.8 policy-20090105.patch
Index: policy-20090105.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-20090105.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- policy-20090105.patch	19 Jan 2009 13:51:13 -0000	1.7
+++ policy-20090105.patch	19 Jan 2009 17:35:43 -0000	1.8
@@ -1,6 +1,6 @@
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/default_contexts serefpolicy-3.6.2/config/appconfig-mcs/default_contexts
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/default_contexts serefpolicy-3.6.3/config/appconfig-mcs/default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/default_contexts	2008-11-11 16:13:50.000000000 -0500
-+++ serefpolicy-3.6.2/config/appconfig-mcs/default_contexts	2009-01-05 17:54:58.000000000 -0500
++++ serefpolicy-3.6.3/config/appconfig-mcs/default_contexts	2009-01-19 12:34:01.000000000 -0500
 @@ -1,15 +1,6 @@
 -system_r:crond_t:s0		user_r:cronjob_t:s0 staff_r:cronjob_t:s0 sysadm_r:cronjob_t:s0 system_r:cronjob_t:s0 unconfined_r:unconfined_cronjob_t:s0
 -system_r:local_login_t:s0	user_r:user_t:s0 staff_r:staff_t:s0 sysadm_r:sysadm_t:s0 unconfined_r:unconfined_t:s0
@@ -22,15 +22,15 @@
 -user_r:user_su_t:s0		user_r:user_t:s0 staff_r:staff_t:s0 sysadm_r:sysadm_t:s0
 -user_r:user_sudo_t:s0		sysadm_r:sysadm_t:s0 user_r:user_t:s0
 +system_r:xdm_t:s0		user_r:user_t:s0
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/failsafe_context serefpolicy-3.6.2/config/appconfig-mcs/failsafe_context
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/failsafe_context serefpolicy-3.6.3/config/appconfig-mcs/failsafe_context
 --- nsaserefpolicy/config/appconfig-mcs/failsafe_context	2008-08-07 11:15:14.000000000 -0400
-+++ serefpolicy-3.6.2/config/appconfig-mcs/failsafe_context	2009-01-05 17:54:58.000000000 -0500
++++ serefpolicy-3.6.3/config/appconfig-mcs/failsafe_context	2009-01-19 12:34:01.000000000 -0500
 @@ -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.6.2/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.6.3/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.6.2/config/appconfig-mcs/guest_u_default_contexts	2009-01-05 17:54:58.000000000 -0500
++++ serefpolicy-3.6.3/config/appconfig-mcs/guest_u_default_contexts	2009-01-19 12:34:01.000000000 -0500
 @@ -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
@@ -38,9 +38,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.6.2/config/appconfig-mcs/root_default_contexts
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/root_default_contexts serefpolicy-3.6.3/config/appconfig-mcs/root_default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/root_default_contexts	2008-11-11 16:13:50.000000000 -0500
-+++ serefpolicy-3.6.2/config/appconfig-mcs/root_default_contexts	2009-01-05 17:54:58.000000000 -0500
++++ serefpolicy-3.6.3/config/appconfig-mcs/root_default_contexts	2009-01-19 12:34:01.000000000 -0500
 @@ -1,11 +1,7 @@
 -system_r:crond_t:s0		unconfined_r:unconfined_t:s0 sysadm_r:cronjob_t:s0 staff_r:cronjob_t:s0 user_r:cronjob_t:s0
 +system_r:crond_t:s0		unconfined_r:unconfined_t:s0 sysadm_r:sysadm_t:s0 staff_r:staff_t:s0 user_r:user_t:s0
@@ -55,18 +55,18 @@
  #
 -#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.6.2/config/appconfig-mcs/seusers
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/seusers serefpolicy-3.6.3/config/appconfig-mcs/seusers
 --- nsaserefpolicy/config/appconfig-mcs/seusers	2008-08-07 11:15:14.000000000 -0400
-+++ serefpolicy-3.6.2/config/appconfig-mcs/seusers	2009-01-05 17:54:58.000000000 -0500
++++ serefpolicy-3.6.3/config/appconfig-mcs/seusers	2009-01-19 12:34:01.000000000 -0500
 @@ -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.6.2/config/appconfig-mcs/staff_u_default_contexts
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/staff_u_default_contexts serefpolicy-3.6.3/config/appconfig-mcs/staff_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/staff_u_default_contexts	2008-11-11 16:13:50.000000000 -0500
-+++ serefpolicy-3.6.2/config/appconfig-mcs/staff_u_default_contexts	2009-01-05 17:54:58.000000000 -0500
++++ serefpolicy-3.6.3/config/appconfig-mcs/staff_u_default_contexts	2009-01-19 12:34:01.000000000 -0500
 @@ -1,10 +1,12 @@
  system_r:local_login_t:s0	staff_r:staff_t:s0 sysadm_r:sysadm_t:s0
  system_r:remote_login_t:s0	staff_r:staff_t:s0
@@ -81,9 +81,9 @@
  sysadm_r:sysadm_su_t:s0		sysadm_r:sysadm_t:s0 
  sysadm_r:sysadm_sudo_t:s0	sysadm_r:sysadm_t:s0
  
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/unconfined_u_default_contexts serefpolicy-3.6.2/config/appconfig-mcs/unconfined_u_default_contexts
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/unconfined_u_default_contexts serefpolicy-3.6.3/config/appconfig-mcs/unconfined_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/unconfined_u_default_contexts	2008-11-11 16:13:50.000000000 -0500
-+++ serefpolicy-3.6.2/config/appconfig-mcs/unconfined_u_default_contexts	2009-01-05 17:54:58.000000000 -0500
++++ serefpolicy-3.6.3/config/appconfig-mcs/unconfined_u_default_contexts	2009-01-19 12:34:01.000000000 -0500
 @@ -1,4 +1,4 @@
 -system_r:crond_t:s0		unconfined_r:unconfined_t:s0 unconfined_r:unconfined_cronjob_t:s0
 +system_r:crond_t:s0		unconfined_r:unconfined_t:s0
@@ -97,15 +97,15 @@
 +system_r:initrc_su_t:s0		unconfined_r:unconfined_t:s0
 +unconfined_r:unconfined_t:s0	unconfined_r:unconfined_t:s0
  system_r:xdm_t:s0		unconfined_r:unconfined_t:s0
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/userhelper_context serefpolicy-3.6.2/config/appconfig-mcs/userhelper_context
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/userhelper_context serefpolicy-3.6.3/config/appconfig-mcs/userhelper_context
 --- nsaserefpolicy/config/appconfig-mcs/userhelper_context	2008-08-07 11:15:14.000000000 -0400
-+++ serefpolicy-3.6.2/config/appconfig-mcs/userhelper_context	2009-01-05 17:54:58.000000000 -0500
++++ serefpolicy-3.6.3/config/appconfig-mcs/userhelper_context	2009-01-19 12:34:01.000000000 -0500
 @@ -1 +1 @@
 -system_u:sysadm_r:sysadm_t:s0
 +system_u:system_r:unconfined_t:s0	
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/user_u_default_contexts serefpolicy-3.6.2/config/appconfig-mcs/user_u_default_contexts
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/user_u_default_contexts serefpolicy-3.6.3/config/appconfig-mcs/user_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/user_u_default_contexts	2008-11-11 16:13:50.000000000 -0500
-+++ serefpolicy-3.6.2/config/appconfig-mcs/user_u_default_contexts	2009-01-05 17:54:58.000000000 -0500
++++ serefpolicy-3.6.3/config/appconfig-mcs/user_u_default_contexts	2009-01-19 12:34:01.000000000 -0500
 @@ -1,8 +1,9 @@
  system_r:local_login_t:s0	user_r:user_t:s0
  system_r:remote_login_t:s0	user_r:user_t:s0
@@ -118,9 +118,9 @@
 -
 +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/xguest_u_default_contexts serefpolicy-3.6.2/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.6.3/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.6.2/config/appconfig-mcs/xguest_u_default_contexts	2009-01-05 17:54:58.000000000 -0500
++++ serefpolicy-3.6.3/config/appconfig-mcs/xguest_u_default_contexts	2009-01-19 12:34:01.000000000 -0500
 @@ -0,0 +1,7 @@
 +system_r:local_login_t	xguest_r:xguest_t:s0
 +system_r:remote_login_t	xguest_r:xguest_t:s0
@@ -129,9 +129,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.6.2/config/appconfig-mls/default_contexts
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/default_contexts serefpolicy-3.6.3/config/appconfig-mls/default_contexts
 --- nsaserefpolicy/config/appconfig-mls/default_contexts	2008-11-11 16:13:50.000000000 -0500
-+++ serefpolicy-3.6.2/config/appconfig-mls/default_contexts	2009-01-05 17:54:58.000000000 -0500
++++ serefpolicy-3.6.3/config/appconfig-mls/default_contexts	2009-01-19 12:34:01.000000000 -0500
 @@ -1,15 +1,6 @@
 -system_r:crond_t:s0		user_r:cronjob_t:s0 staff_r:cronjob_t:s0 sysadm_r:cronjob_t:s0 system_r:cronjob_t:s0 unconfined_r:unconfined_cronjob_t:s0
 -system_r:local_login_t:s0	user_r:user_t:s0 staff_r:staff_t:s0 sysadm_r:sysadm_t:s0 unconfined_r:unconfined_t:s0
@@ -153,17 +153,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.6.2/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.6.3/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.6.2/config/appconfig-mls/guest_u_default_contexts	2009-01-05 17:54:58.000000000 -0500
++++ serefpolicy-3.6.3/config/appconfig-mls/guest_u_default_contexts	2009-01-19 12:34:01.000000000 -0500
 @@ -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.6.2/config/appconfig-mls/root_default_contexts
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/root_default_contexts serefpolicy-3.6.3/config/appconfig-mls/root_default_contexts
 --- nsaserefpolicy/config/appconfig-mls/root_default_contexts	2008-11-11 16:13:50.000000000 -0500
-+++ serefpolicy-3.6.2/config/appconfig-mls/root_default_contexts	2009-01-05 17:54:58.000000000 -0500
++++ serefpolicy-3.6.3/config/appconfig-mls/root_default_contexts	2009-01-19 12:34:01.000000000 -0500
 @@ -1,11 +1,11 @@
 -system_r:crond_t:s0		unconfined_r:unconfined_t:s0 sysadm_r:cronjob_t:s0 staff_r:cronjob_t:s0 user_r:cronjob_t:s0
 -system_r:local_login_t:s0	unconfined_r:unconfined_t:s0 sysadm_r:sysadm_t:s0 staff_r:staff_t:s0 user_r:user_t:s0
@@ -182,9 +182,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/xguest_u_default_contexts serefpolicy-3.6.2/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.6.3/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.6.2/config/appconfig-mls/xguest_u_default_contexts	2009-01-05 17:54:58.000000000 -0500
++++ serefpolicy-3.6.3/config/appconfig-mls/xguest_u_default_contexts	2009-01-19 12:34:01.000000000 -0500
 @@ -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/Makefile serefpolicy-3.6.2/Makefile
---- nsaserefpolicy/Makefile	2008-11-11 16:13:50.000000000 -0500
-+++ serefpolicy-3.6.2/Makefile	2009-01-05 17:54:58.000000000 -0500
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/Makefile serefpolicy-3.6.3/Makefile
+--- nsaserefpolicy/Makefile	2009-01-19 11:07:35.000000000 -0500
++++ serefpolicy-3.6.3/Makefile	2009-01-19 12:34:01.000000000 -0500
 @@ -315,20 +315,22 @@
  
  # parse-rolemap modulename,outputfile
@@ -229,6 +229,15 @@
  endef
  
  # create-base-per-role-tmpl modulenames,outputfile
+@@ -397,7 +399,7 @@
+ 	@echo "# $(notdir $@).in or $(notdir $@).m4 file should be modified." >> $@
+ 	@echo "#" >> $@
+ 	$(verbose) cat $@.in >> $@
+-	$(verbose) $(GREP) "^[[:blank:]]*network_(interface|node|port|packet)(_controlled)?\(.*\)" $< \
++	$(verbose) $(GREP) "^[[:blank:]]*network_(interface|node|port|packet)\(.*\)" $< \
+ 		| $(M4) -D self_contained_policy $(M4PARAM) $@.m4 - \
+ 		| $(SED) -e 's/dollarsone/\$$1/g' -e 's/dollarszero/\$$0/g' >> $@
+ 
 @@ -527,6 +529,10 @@
  	@mkdir -p $(appdir)/users
  	$(verbose) $(INSTALL) -m 644 $^ $@
@@ -240,9 +249,9 @@
  $(appdir)/%: $(appconf)/%
  	@mkdir -p $(appdir)
  	$(verbose) $(INSTALL) -m 644 $< $@
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/man/man8/httpd_selinux.8 serefpolicy-3.6.2/man/man8/httpd_selinux.8
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/man/man8/httpd_selinux.8 serefpolicy-3.6.3/man/man8/httpd_selinux.8
 --- nsaserefpolicy/man/man8/httpd_selinux.8	2008-08-25 09:12:31.000000000 -0400
-+++ serefpolicy-3.6.2/man/man8/httpd_selinux.8	2009-01-05 17:54:58.000000000 -0500
++++ serefpolicy-3.6.3/man/man8/httpd_selinux.8	2009-01-19 12:34:01.000000000 -0500
[...4915 lines suppressed...]
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.te serefpolicy-3.6.2/policy/modules/system/unconfined.te
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.te serefpolicy-3.6.3/policy/modules/system/unconfined.te
 --- nsaserefpolicy/policy/modules/system/unconfined.te	2008-11-11 16:13:48.000000000 -0500
-+++ serefpolicy-3.6.2/policy/modules/system/unconfined.te	2009-01-05 17:54:59.000000000 -0500
++++ serefpolicy-3.6.3/policy/modules/system/unconfined.te	2009-01-19 12:34:01.000000000 -0500
 @@ -6,35 +6,76 @@
  # Declarations
  #
@@ -26107,9 +26087,9 @@
 +')
 +
 +gen_user(unconfined_u, user, unconfined_r system_r, s0, s0 - mls_systemhigh, mcs_allcats)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.fc serefpolicy-3.6.2/policy/modules/system/userdomain.fc
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.fc serefpolicy-3.6.3/policy/modules/system/userdomain.fc
 --- nsaserefpolicy/policy/modules/system/userdomain.fc	2008-11-11 16:13:48.000000000 -0500
-+++ serefpolicy-3.6.2/policy/modules/system/userdomain.fc	2009-01-05 17:54:59.000000000 -0500
++++ serefpolicy-3.6.3/policy/modules/system/userdomain.fc	2009-01-19 12:34:01.000000000 -0500
 @@ -1,4 +1,7 @@
  HOME_DIR	-d	gen_context(system_u:object_r:user_home_dir_t,s0-mls_systemhigh)
 +HOME_DIR	-l	gen_context(system_u:object_r:user_home_dir_t,s0-mls_systemhigh)
@@ -26119,9 +26099,9 @@
 +/root(/.*)?	 	gen_context(system_u:object_r:admin_home_t,s0)
 +/dev/shm/pulse-shm.*	gen_context(system_u:object_r:user_tmpfs_t,s0)
 +/dev/shm/mono.*		gen_context(system_u:object_r:user_tmpfs_t,s0)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-3.6.2/policy/modules/system/userdomain.if
---- nsaserefpolicy/policy/modules/system/userdomain.if	2009-01-05 15:39:43.000000000 -0500
-+++ serefpolicy-3.6.2/policy/modules/system/userdomain.if	2009-01-12 14:04:30.000000000 -0500
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-3.6.3/policy/modules/system/userdomain.if
+--- nsaserefpolicy/policy/modules/system/userdomain.if	2009-01-19 11:07:34.000000000 -0500
++++ serefpolicy-3.6.3/policy/modules/system/userdomain.if	2009-01-19 12:34:01.000000000 -0500
 @@ -30,8 +30,9 @@
  	')
  
@@ -26414,10 +26394,10 @@
  
 -	corenet_all_recvfrom_unlabeled($1_t)
 -	corenet_all_recvfrom_netlabel($1_t)
--	corenet_tcp_sendrecv_all_if($1_t)
--	corenet_udp_sendrecv_all_if($1_t)
--	corenet_tcp_sendrecv_all_nodes($1_t)
--	corenet_udp_sendrecv_all_nodes($1_t)
+-	corenet_tcp_sendrecv_generic_if($1_t)
+-	corenet_udp_sendrecv_generic_if($1_t)
+-	corenet_tcp_sendrecv_generic_node($1_t)
+-	corenet_udp_sendrecv_generic_node($1_t)
 -	corenet_tcp_sendrecv_all_ports($1_t)
 -	corenet_udp_sendrecv_all_ports($1_t)
 -	corenet_tcp_connect_all_ports($1_t)
@@ -26426,10 +26406,10 @@
 -	corenet_all_recvfrom_labeled($1_t, $1_t)
 +	corenet_all_recvfrom_unlabeled($1)
 +	corenet_all_recvfrom_netlabel($1)
-+	corenet_tcp_sendrecv_all_if($1)
-+	corenet_udp_sendrecv_all_if($1)
-+	corenet_tcp_sendrecv_all_nodes($1)
-+	corenet_udp_sendrecv_all_nodes($1)
++	corenet_tcp_sendrecv_generic_if($1)
++	corenet_udp_sendrecv_generic_if($1)
++	corenet_tcp_sendrecv_generic_node($1)
++	corenet_udp_sendrecv_generic_node($1)
 +	corenet_tcp_sendrecv_all_ports($1)
 +	corenet_udp_sendrecv_all_ports($1)
 +	corenet_tcp_connect_all_ports($1)
@@ -26542,10 +26522,10 @@
 +	kernel_read_device_sysctls($1_usertype)
  
 -	corecmd_exec_bin($1_t)
-+	corenet_udp_bind_all_nodes($1_usertype)
++	corenet_udp_bind_generic_node($1_usertype)
 +	corenet_udp_bind_generic_port($1_usertype)
  
--	corenet_udp_bind_all_nodes($1_t)
+-	corenet_udp_bind_generic_node($1_t)
 -	corenet_udp_bind_generic_port($1_t)
 +	dev_read_rand($1_usertype)
 +	dev_write_sound($1_usertype)
@@ -27084,7 +27064,7 @@
  	# the same domain and outside users) disabling this forces FTP passive mode
  	# and may change other protocols
  	tunable_policy(`user_tcp_server',`
- 		corenet_tcp_bind_all_nodes($1_t)
+ 		corenet_tcp_bind_generic_node($1_t)
 -		corenet_tcp_bind_generic_port($1_t)
 +		corenet_tcp_bind_all_unreserved_ports($1_t)
  	')
@@ -27753,9 +27733,9 @@
 +
 +	allow $1 user_home_t:file execmod;
 +')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-3.6.2/policy/modules/system/userdomain.te
---- nsaserefpolicy/policy/modules/system/userdomain.te	2009-01-05 15:39:43.000000000 -0500
-+++ serefpolicy-3.6.2/policy/modules/system/userdomain.te	2009-01-05 17:54:59.000000000 -0500
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-3.6.3/policy/modules/system/userdomain.te
+--- nsaserefpolicy/policy/modules/system/userdomain.te	2009-01-19 11:07:34.000000000 -0500
++++ serefpolicy-3.6.3/policy/modules/system/userdomain.te	2009-01-19 12:34:01.000000000 -0500
 @@ -8,13 +8,6 @@
  
  ## <desc>
@@ -27817,9 +27797,9 @@
 +tunable_policy(`allow_console_login',`
 +	term_use_console(userdomain)
 +')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.fc serefpolicy-3.6.2/policy/modules/system/xen.fc
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.fc serefpolicy-3.6.3/policy/modules/system/xen.fc
 --- nsaserefpolicy/policy/modules/system/xen.fc	2009-01-05 15:39:43.000000000 -0500
-+++ serefpolicy-3.6.2/policy/modules/system/xen.fc	2009-01-05 17:54:59.000000000 -0500
++++ serefpolicy-3.6.3/policy/modules/system/xen.fc	2009-01-19 12:34:01.000000000 -0500
 @@ -2,17 +2,10 @@
  
  /usr/bin/virsh		--	gen_context(system_u:object_r:xm_exec_t,s0)
@@ -27846,9 +27826,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.6.2/policy/modules/system/xen.if
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.if serefpolicy-3.6.3/policy/modules/system/xen.if
 --- nsaserefpolicy/policy/modules/system/xen.if	2009-01-05 15:39:43.000000000 -0500
-+++ serefpolicy-3.6.2/policy/modules/system/xen.if	2009-01-05 17:54:59.000000000 -0500
++++ serefpolicy-3.6.3/policy/modules/system/xen.if	2009-01-19 12:34:01.000000000 -0500
 @@ -167,11 +167,14 @@
  #
  interface(`xen_stream_connect',`
@@ -27890,16 +27870,10 @@
 +	allow $1 xend_var_lib_t:dir search_dir_perms;
 +	rw_files_pattern($1, xen_image_t, xen_image_t)
 +')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.te serefpolicy-3.6.2/policy/modules/system/xen.te
---- nsaserefpolicy/policy/modules/system/xen.te	2009-01-05 15:39:43.000000000 -0500
-+++ serefpolicy-3.6.2/policy/modules/system/xen.te	2009-01-05 17:54:59.000000000 -0500
-@@ -1,11 +1,18 @@
- 
--policy_module(xen, 1.8.0)
-+policy_module(xen, 1.7.1)
- 
- ########################################
- #
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.te serefpolicy-3.6.3/policy/modules/system/xen.te
+--- nsaserefpolicy/policy/modules/system/xen.te	2009-01-19 11:07:34.000000000 -0500
++++ serefpolicy-3.6.3/policy/modules/system/xen.te	2009-01-19 12:34:01.000000000 -0500
+@@ -6,6 +6,13 @@
  # Declarations
  #
  
@@ -28079,7 +28053,7 @@
 +corecmd_exec_shell(xm_t)
  
  corenet_tcp_sendrecv_generic_if(xm_t)
- corenet_tcp_sendrecv_all_nodes(xm_t)
+ corenet_tcp_sendrecv_generic_node(xm_t)
 @@ -339,15 +373,38 @@
  
  storage_raw_read_fixed_disk(xm_t)
@@ -28120,9 +28094,9 @@
 +optional_policy(`
 +	unconfined_domain(xend_t)
 +')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/support/obj_perm_sets.spt serefpolicy-3.6.2/policy/support/obj_perm_sets.spt
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/support/obj_perm_sets.spt serefpolicy-3.6.3/policy/support/obj_perm_sets.spt
 --- nsaserefpolicy/policy/support/obj_perm_sets.spt	2008-10-16 17:21:16.000000000 -0400
-+++ serefpolicy-3.6.2/policy/support/obj_perm_sets.spt	2009-01-05 17:54:59.000000000 -0500
++++ serefpolicy-3.6.3/policy/support/obj_perm_sets.spt	2009-01-19 12:34:01.000000000 -0500
 @@ -179,20 +179,20 @@
  #
  # Directory (dir)
@@ -28167,9 +28141,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.6.2/policy/users
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/users serefpolicy-3.6.3/policy/users
 --- nsaserefpolicy/policy/users	2008-08-07 11:15:13.000000000 -0400
-+++ serefpolicy-3.6.2/policy/users	2009-01-05 17:54:59.000000000 -0500
++++ serefpolicy-3.6.3/policy/users	2009-01-19 12:34:01.000000000 -0500
 @@ -25,11 +25,8 @@
  # permit any access to such users, then remove this entry.
  #
@@ -28194,9 +28168,9 @@
 -	gen_user(root, sysadm, sysadm_r staff_r ifdef(`enable_mls',`secadm_r auditadm_r'), s0, s0 - mls_systemhigh, mcs_allcats)
 -')
 +gen_user(root, user, unconfined_r sysadm_r staff_r ifdef(`enable_mls',`secadm_r auditadm_r') system_r, s0, s0 - mls_systemhigh, mcs_allcats)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/Rules.modular serefpolicy-3.6.2/Rules.modular
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/Rules.modular serefpolicy-3.6.3/Rules.modular
 --- nsaserefpolicy/Rules.modular	2008-11-11 16:13:50.000000000 -0500
-+++ serefpolicy-3.6.2/Rules.modular	2009-01-05 17:54:59.000000000 -0500
++++ serefpolicy-3.6.3/Rules.modular	2009-01-19 12:34:01.000000000 -0500
 @@ -73,8 +73,8 @@
  $(tmpdir)/%.mod: $(m4support) $(tmpdir)/generated_definitions.conf $(tmpdir)/all_interfaces.conf %.te
  	@echo "Compliling $(NAME) $(@F) module"
@@ -28226,9 +28200,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/support/Makefile.devel serefpolicy-3.6.2/support/Makefile.devel
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/support/Makefile.devel serefpolicy-3.6.3/support/Makefile.devel
 --- nsaserefpolicy/support/Makefile.devel	2008-11-11 16:13:50.000000000 -0500
-+++ serefpolicy-3.6.2/support/Makefile.devel	2009-01-05 17:54:59.000000000 -0500
++++ serefpolicy-3.6.3/support/Makefile.devel	2009-01-19 12:34:01.000000000 -0500
 @@ -185,8 +185,7 @@
  tmp/%.mod: $(m4support) tmp/all_interfaces.conf %.te
  	@$(EINFO) "Compiling $(NAME) $(basename $(@F)) module"


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.767
retrieving revision 1.768
diff -u -r1.767 -r1.768
--- selinux-policy.spec	19 Jan 2009 14:28:24 -0000	1.767
+++ selinux-policy.spec	19 Jan 2009 17:35:43 -0000	1.768
@@ -19,8 +19,8 @@
 %define CHECKPOLICYVER 2.0.16-3
 Summary: SELinux policy configuration
 Name: selinux-policy
-Version: 3.6.2
-Release: 5%{?dist}
+Version: 3.6.3
+Release: 1%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -184,7 +184,7 @@
 
 %description
 SELinux Reference Policy - modular.
-Based off of reference policy: Checked out revision  2882.
+Based off of reference policy: Checked out revision  2904.
 
 %build
 
@@ -445,6 +445,9 @@
 %endif
 
 %changelog
+* Mon Jan 19 2009 Dan Walsh <dwalsh at redhat.com> 3.6.3-1
+- Update to upstream
+
 * Thu Jan 15 2009 Dan Walsh <dwalsh at redhat.com> 3.6.2-5
 - Define openoffice as an x_domain
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/sources,v
retrieving revision 1.174
retrieving revision 1.175
diff -u -r1.174 -r1.175
--- sources	5 Jan 2009 22:55:20 -0000	1.174
+++ sources	19 Jan 2009 17:35:43 -0000	1.175
@@ -1 +1 @@
-44fa8cab20d73ab4beb07513931e01b6  serefpolicy-3.6.2.tgz
+1d85fcc4fa4ad8fb28ee4d096968d36d  serefpolicy-3.6.3.tgz



From pkgdb at fedoraproject.org  Mon Jan 19 17:36:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:36:13 +0000
Subject: [pkgdb] mingw32-iconv: mingwmaint has requested watchbugzilla
Message-ID: <20090119173613.6A4212091E3@bastion.fedora.phx.redhat.com>

mingwmaint has requested the watchbugzilla acl on mingw32-iconv (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-iconv



From pkgdb at fedoraproject.org  Mon Jan 19 17:36:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:36:14 +0000
Subject: [pkgdb] mingw32-iconv: mingwmaint has requested watchcommits
Message-ID: <20090119173614.5EDFD2091E9@bastion.fedora.phx.redhat.com>

mingwmaint has requested the watchcommits acl on mingw32-iconv (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-iconv



From pkgdb at fedoraproject.org  Mon Jan 19 17:36:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:36:16 +0000
Subject: [pkgdb] mingw32-iconv: mingwmaint has requested watchcommits
Message-ID: <20090119173616.48B752091ED@bastion.fedora.phx.redhat.com>

mingwmaint has requested the watchcommits acl on mingw32-iconv (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-iconv



From pkgdb at fedoraproject.org  Mon Jan 19 17:36:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:36:21 +0000
Subject: [pkgdb] mingw32-termcap: mingwmaint has requested watchbugzilla
Message-ID: <20090119173621.F3B3F208F49@bastion.fedora.phx.redhat.com>

mingwmaint has requested the watchbugzilla acl on mingw32-termcap (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-termcap



From pkgdb at fedoraproject.org  Mon Jan 19 17:36:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:36:23 +0000
Subject: [pkgdb] mingw32-termcap: mingwmaint has requested watchcommits
Message-ID: <20090119173624.7002C2091F2@bastion.fedora.phx.redhat.com>

mingwmaint has requested the watchcommits acl on mingw32-termcap (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-termcap



From pkgdb at fedoraproject.org  Mon Jan 19 17:36:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:36:25 +0000
Subject: [pkgdb] mingw32-termcap: mingwmaint has requested watchbugzilla
Message-ID: <20090119173625.161632091F8@bastion.fedora.phx.redhat.com>

mingwmaint has requested the watchbugzilla acl on mingw32-termcap (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-termcap



From pkgdb at fedoraproject.org  Mon Jan 19 17:36:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:36:25 +0000
Subject: [pkgdb] mingw32-termcap: mingwmaint has requested watchbugzilla
Message-ID: <20090119173625.49CBC2091FD@bastion.fedora.phx.redhat.com>

mingwmaint has requested the watchbugzilla acl on mingw32-termcap (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-termcap



From pkgdb at fedoraproject.org  Mon Jan 19 17:36:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:36:24 +0000
Subject: [pkgdb] mingw32-termcap: mingwmaint has requested watchcommits
Message-ID: <20090119173625.AD443209201@bastion.fedora.phx.redhat.com>

mingwmaint has requested the watchcommits acl on mingw32-termcap (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-termcap



From pkgdb at fedoraproject.org  Mon Jan 19 17:36:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:36:28 +0000
Subject: [pkgdb] mingw32-termcap: mingwmaint has requested watchcommits
Message-ID: <20090119173628.C7DE6209207@bastion.fedora.phx.redhat.com>

mingwmaint has requested the watchcommits acl on mingw32-termcap (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-termcap



From pkgdb at fedoraproject.org  Mon Jan 19 17:36:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:36:31 +0000
Subject: [pkgdb] mingw32-libpng: mingwmaint has requested watchcommits
Message-ID: <20090119173631.EE33B20920B@bastion.fedora.phx.redhat.com>

mingwmaint has requested the watchcommits acl on mingw32-libpng (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-libpng



From pkgdb at fedoraproject.org  Mon Jan 19 17:36:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:36:32 +0000
Subject: [pkgdb] mingw32-libpng: mingwmaint has requested watchbugzilla
Message-ID: <20090119173632.8E3A5209210@bastion.fedora.phx.redhat.com>

mingwmaint has requested the watchbugzilla acl on mingw32-libpng (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-libpng



From pkgdb at fedoraproject.org  Mon Jan 19 17:36:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:36:32 +0000
Subject: [pkgdb] mingw32-libpng: mingwmaint has requested watchbugzilla
Message-ID: <20090119173632.D1245209215@bastion.fedora.phx.redhat.com>

mingwmaint has requested the watchbugzilla acl on mingw32-libpng (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-libpng



From pkgdb at fedoraproject.org  Mon Jan 19 17:36:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:36:33 +0000
Subject: [pkgdb] mingw32-libpng: mingwmaint has requested watchcommits
Message-ID: <20090119173633.278B820921A@bastion.fedora.phx.redhat.com>

mingwmaint has requested the watchcommits acl on mingw32-libpng (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-libpng



From pkgdb at fedoraproject.org  Mon Jan 19 17:36:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:36:34 +0000
Subject: [pkgdb] mingw32-libpng: mingwmaint has requested watchbugzilla
Message-ID: <20090119173634.3199620921F@bastion.fedora.phx.redhat.com>

mingwmaint has requested the watchbugzilla acl on mingw32-libpng (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-libpng



From pkgdb at fedoraproject.org  Mon Jan 19 17:36:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:36:36 +0000
Subject: [pkgdb] mingw32-libpng: mingwmaint has requested watchcommits
Message-ID: <20090119173637.6419F208F4D@bastion.fedora.phx.redhat.com>

mingwmaint has requested the watchcommits acl on mingw32-libpng (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-libpng



From pkgdb at fedoraproject.org  Mon Jan 19 17:36:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:36:39 +0000
Subject: [pkgdb] mingw32-pthreads: mingwmaint has requested watchbugzilla
Message-ID: <20090119173639.EEE2A209225@bastion.fedora.phx.redhat.com>

mingwmaint has requested the watchbugzilla acl on mingw32-pthreads (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-pthreads



From pkgdb at fedoraproject.org  Mon Jan 19 17:36:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:36:40 +0000
Subject: [pkgdb] mingw32-pthreads: mingwmaint has requested watchcommits
Message-ID: <20090119173640.3BFC120922A@bastion.fedora.phx.redhat.com>

mingwmaint has requested the watchcommits acl on mingw32-pthreads (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-pthreads



From pkgdb at fedoraproject.org  Mon Jan 19 17:36:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:36:40 +0000
Subject: [pkgdb] mingw32-pthreads: mingwmaint has requested watchbugzilla
Message-ID: <20090119173641.203A5209231@bastion.fedora.phx.redhat.com>

mingwmaint has requested the watchbugzilla acl on mingw32-pthreads (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-pthreads



From pkgdb at fedoraproject.org  Mon Jan 19 17:36:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:36:42 +0000
Subject: [pkgdb] mingw32-pthreads: mingwmaint has requested watchbugzilla
Message-ID: <20090119173642.E5FFA209235@bastion.fedora.phx.redhat.com>

mingwmaint has requested the watchbugzilla acl on mingw32-pthreads (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-pthreads



From pkgdb at fedoraproject.org  Mon Jan 19 17:36:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:36:41 +0000
Subject: [pkgdb] mingw32-pthreads: mingwmaint has requested watchcommits
Message-ID: <20090119173645.3F60F208E02@bastion.fedora.phx.redhat.com>

mingwmaint has requested the watchcommits acl on mingw32-pthreads (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-pthreads



From pkgdb at fedoraproject.org  Mon Jan 19 17:36:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:36:45 +0000
Subject: [pkgdb] mingw32-pthreads: mingwmaint has requested watchcommits
Message-ID: <20090119173645.D0B5F20923A@bastion.fedora.phx.redhat.com>

mingwmaint has requested the watchcommits acl on mingw32-pthreads (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-pthreads



From pkgdb at fedoraproject.org  Mon Jan 19 17:36:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:36:47 +0000
Subject: [pkgdb] mingw32-SDL: mingwmaint has requested watchbugzilla
Message-ID: <20090119173647.8BFE620923D@bastion.fedora.phx.redhat.com>

mingwmaint has requested the watchbugzilla acl on mingw32-SDL (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-SDL



From pkgdb at fedoraproject.org  Mon Jan 19 17:36:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:36:48 +0000
Subject: [pkgdb] mingw32-SDL: mingwmaint has requested watchcommits
Message-ID: <20090119173648.AED3F209242@bastion.fedora.phx.redhat.com>

mingwmaint has requested the watchcommits acl on mingw32-SDL (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-SDL



From pkgdb at fedoraproject.org  Mon Jan 19 17:36:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:36:49 +0000
Subject: [pkgdb] mingw32-SDL: mingwmaint has requested watchbugzilla
Message-ID: <20090119173649.510A2209247@bastion.fedora.phx.redhat.com>

mingwmaint has requested the watchbugzilla acl on mingw32-SDL (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-SDL



From pkgdb at fedoraproject.org  Mon Jan 19 17:36:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:36:50 +0000
Subject: [pkgdb] mingw32-SDL: mingwmaint has requested watchcommits
Message-ID: <20090119173650.1D84620924C@bastion.fedora.phx.redhat.com>

mingwmaint has requested the watchcommits acl on mingw32-SDL (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-SDL



From pkgdb at fedoraproject.org  Mon Jan 19 17:36:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:36:50 +0000
Subject: [pkgdb] mingw32-SDL: mingwmaint has requested watchbugzilla
Message-ID: <20090119173650.B9C06209251@bastion.fedora.phx.redhat.com>

mingwmaint has requested the watchbugzilla acl on mingw32-SDL (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-SDL



From pkgdb at fedoraproject.org  Mon Jan 19 17:36:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:36:53 +0000
Subject: [pkgdb] mingw32-SDL: mingwmaint has requested watchcommits
Message-ID: <20090119173653.D9A80209255@bastion.fedora.phx.redhat.com>

mingwmaint has requested the watchcommits acl on mingw32-SDL (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-SDL



From pkgdb at fedoraproject.org  Mon Jan 19 17:36:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:36:56 +0000
Subject: [pkgdb] mingw32-dlfcn: mingwmaint has requested watchbugzilla
Message-ID: <20090119173656.EB684209258@bastion.fedora.phx.redhat.com>

mingwmaint has requested the watchbugzilla acl on mingw32-dlfcn (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-dlfcn



From pkgdb at fedoraproject.org  Mon Jan 19 17:36:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:36:57 +0000
Subject: [pkgdb] mingw32-dlfcn: mingwmaint has requested watchcommits
Message-ID: <20090119173657.A28EB20925C@bastion.fedora.phx.redhat.com>

mingwmaint has requested the watchcommits acl on mingw32-dlfcn (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-dlfcn



From pkgdb at fedoraproject.org  Mon Jan 19 17:37:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:37:00 +0000
Subject: [pkgdb] mingw32-dlfcn: mingwmaint has requested watchbugzilla
Message-ID: <20090119173701.C3DD1209262@bastion.fedora.phx.redhat.com>

mingwmaint has requested the watchbugzilla acl on mingw32-dlfcn (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-dlfcn



From pkgdb at fedoraproject.org  Mon Jan 19 17:37:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:37:02 +0000
Subject: [pkgdb] mingw32-dlfcn: mingwmaint has requested watchbugzilla
Message-ID: <20090119173702.B14F8209267@bastion.fedora.phx.redhat.com>

mingwmaint has requested the watchbugzilla acl on mingw32-dlfcn (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-dlfcn



From pkgdb at fedoraproject.org  Mon Jan 19 17:37:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:37:01 +0000
Subject: [pkgdb] mingw32-dlfcn: mingwmaint has requested watchcommits
Message-ID: <20090119173703.4719220926A@bastion.fedora.phx.redhat.com>

mingwmaint has requested the watchcommits acl on mingw32-dlfcn (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-dlfcn



From pkgdb at fedoraproject.org  Mon Jan 19 17:37:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:37:03 +0000
Subject: [pkgdb] mingw32-dlfcn: mingwmaint has requested watchcommits
Message-ID: <20090119173704.5267D20848E@bastion.fedora.phx.redhat.com>

mingwmaint has requested the watchcommits acl on mingw32-dlfcn (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-dlfcn



From pkgdb at fedoraproject.org  Mon Jan 19 17:37:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:37:06 +0000
Subject: [pkgdb] mingw32-pdcurses: mingwmaint has requested watchbugzilla
Message-ID: <20090119173706.B34CD20848F@bastion.fedora.phx.redhat.com>

mingwmaint has requested the watchbugzilla acl on mingw32-pdcurses (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-pdcurses



From pkgdb at fedoraproject.org  Mon Jan 19 17:37:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:37:07 +0000
Subject: [pkgdb] mingw32-pdcurses: mingwmaint has requested watchbugzilla
Message-ID: <20090119173707.73677209277@bastion.fedora.phx.redhat.com>

mingwmaint has requested the watchbugzilla acl on mingw32-pdcurses (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-pdcurses



From pkgdb at fedoraproject.org  Mon Jan 19 17:37:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:37:07 +0000
Subject: [pkgdb] mingw32-pdcurses: mingwmaint has requested watchcommits
Message-ID: <20090119173708.95E7E20927C@bastion.fedora.phx.redhat.com>

mingwmaint has requested the watchcommits acl on mingw32-pdcurses (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-pdcurses



From pkgdb at fedoraproject.org  Mon Jan 19 17:37:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:37:08 +0000
Subject: [pkgdb] mingw32-pdcurses: mingwmaint has requested watchcommits
Message-ID: <20090119173709.56E0C20927D@bastion.fedora.phx.redhat.com>

mingwmaint has requested the watchcommits acl on mingw32-pdcurses (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-pdcurses



From pkgdb at fedoraproject.org  Mon Jan 19 17:37:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:37:09 +0000
Subject: [pkgdb] mingw32-pdcurses: mingwmaint has requested watchcommits
Message-ID: <20090119173709.E7DB3209280@bastion.fedora.phx.redhat.com>

mingwmaint has requested the watchcommits acl on mingw32-pdcurses (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-pdcurses



From pkgdb at fedoraproject.org  Mon Jan 19 17:37:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:37:11 +0000
Subject: [pkgdb] mingw32-pdcurses: mingwmaint has requested watchbugzilla
Message-ID: <20090119173711.A4938209284@bastion.fedora.phx.redhat.com>

mingwmaint has requested the watchbugzilla acl on mingw32-pdcurses (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-pdcurses



From pkgdb at fedoraproject.org  Mon Jan 19 17:37:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:37:13 +0000
Subject: [pkgdb] mingw32-gdbm: mingwmaint has requested watchbugzilla
Message-ID: <20090119173714.1480720928B@bastion.fedora.phx.redhat.com>

mingwmaint has requested the watchbugzilla acl on mingw32-gdbm (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-gdbm



From pkgdb at fedoraproject.org  Mon Jan 19 17:37:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:37:15 +0000
Subject: [pkgdb] mingw32-gdbm: mingwmaint has requested watchbugzilla
Message-ID: <20090119173715.C741D209293@bastion.fedora.phx.redhat.com>

mingwmaint has requested the watchbugzilla acl on mingw32-gdbm (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-gdbm



From pkgdb at fedoraproject.org  Mon Jan 19 17:37:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:37:16 +0000
Subject: [pkgdb] mingw32-gdbm: mingwmaint has requested watchcommits
Message-ID: <20090119173717.B46F1208E09@bastion.fedora.phx.redhat.com>

mingwmaint has requested the watchcommits acl on mingw32-gdbm (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-gdbm



From pkgdb at fedoraproject.org  Mon Jan 19 17:37:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:37:18 +0000
Subject: [pkgdb] mingw32-gdbm: mingwmaint has requested watchcommits
Message-ID: <20090119173718.9183E20929E@bastion.fedora.phx.redhat.com>

mingwmaint has requested the watchcommits acl on mingw32-gdbm (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-gdbm



From pkgdb at fedoraproject.org  Mon Jan 19 17:37:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:37:18 +0000
Subject: [pkgdb] mingw32-gdbm: mingwmaint has requested watchcommits
Message-ID: <20090119173718.D9D862092A3@bastion.fedora.phx.redhat.com>

mingwmaint has requested the watchcommits acl on mingw32-gdbm (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-gdbm



From pkgdb at fedoraproject.org  Mon Jan 19 17:37:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:37:19 +0000
Subject: [pkgdb] mingw32-gdbm: mingwmaint has requested watchbugzilla
Message-ID: <20090119173720.05AA42092A9@bastion.fedora.phx.redhat.com>

mingwmaint has requested the watchbugzilla acl on mingw32-gdbm (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-gdbm



From pkgdb at fedoraproject.org  Mon Jan 19 17:37:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:37:22 +0000
Subject: [pkgdb] mingw32-freetype: mingwmaint has requested watchbugzilla
Message-ID: <20090119173722.8B1252092AD@bastion.fedora.phx.redhat.com>

mingwmaint has requested the watchbugzilla acl on mingw32-freetype (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-freetype



From pkgdb at fedoraproject.org  Mon Jan 19 17:37:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:37:24 +0000
Subject: [pkgdb] mingw32-freetype: mingwmaint has requested watchcommits
Message-ID: <20090119173724.9D96A2092B1@bastion.fedora.phx.redhat.com>

mingwmaint has requested the watchcommits acl on mingw32-freetype (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-freetype



From pkgdb at fedoraproject.org  Mon Jan 19 17:37:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:37:27 +0000
Subject: [pkgdb] mingw32-freetype: mingwmaint has requested watchbugzilla
Message-ID: <20090119173727.835702092B3@bastion.fedora.phx.redhat.com>

mingwmaint has requested the watchbugzilla acl on mingw32-freetype (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-freetype



From pkgdb at fedoraproject.org  Mon Jan 19 17:37:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:37:28 +0000
Subject: [pkgdb] mingw32-freetype: mingwmaint has requested watchcommits
Message-ID: <20090119173728.568182092B8@bastion.fedora.phx.redhat.com>

mingwmaint has requested the watchcommits acl on mingw32-freetype (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-freetype



From pkgdb at fedoraproject.org  Mon Jan 19 17:37:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:37:29 +0000
Subject: [pkgdb] mingw32-freetype: mingwmaint has requested watchbugzilla
Message-ID: <20090119173729.BE2AC2092BD@bastion.fedora.phx.redhat.com>

mingwmaint has requested the watchbugzilla acl on mingw32-freetype (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-freetype



From pkgdb at fedoraproject.org  Mon Jan 19 17:37:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:37:32 +0000
Subject: [pkgdb] mingw32-freetype: mingwmaint has requested watchcommits
Message-ID: <20090119173732.52061300009@bastion.fedora.phx.redhat.com>

mingwmaint has requested the watchcommits acl on mingw32-freetype (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-freetype



From pkgdb at fedoraproject.org  Mon Jan 19 17:37:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:37:34 +0000
Subject: [pkgdb] mingw32-gettext: mingwmaint has requested watchcommits
Message-ID: <20090119173734.6584330000E@bastion.fedora.phx.redhat.com>

mingwmaint has requested the watchcommits acl on mingw32-gettext (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-gettext



From pkgdb at fedoraproject.org  Mon Jan 19 17:37:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:37:37 +0000
Subject: [pkgdb] mingw32-gettext: mingwmaint has requested watchbugzilla
Message-ID: <20090119173737.31959300012@bastion.fedora.phx.redhat.com>

mingwmaint has requested the watchbugzilla acl on mingw32-gettext (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-gettext



From pkgdb at fedoraproject.org  Mon Jan 19 17:37:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:37:37 +0000
Subject: [pkgdb] mingw32-gettext: mingwmaint has requested watchcommits
Message-ID: <20090119173738.A3DFC208E10@bastion.fedora.phx.redhat.com>

mingwmaint has requested the watchcommits acl on mingw32-gettext (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-gettext



From pkgdb at fedoraproject.org  Mon Jan 19 17:37:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:37:43 +0000
Subject: [pkgdb] mingw32-gettext: mingwmaint has requested watchbugzilla
Message-ID: <20090119173743.37D902092C0@bastion.fedora.phx.redhat.com>

mingwmaint has requested the watchbugzilla acl on mingw32-gettext (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-gettext



From pkgdb at fedoraproject.org  Mon Jan 19 17:37:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:37:41 +0000
Subject: [pkgdb] mingw32-gettext: mingwmaint has requested watchbugzilla
Message-ID: <20090119173746.6025C2092C5@bastion.fedora.phx.redhat.com>

mingwmaint has requested the watchbugzilla acl on mingw32-gettext (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-gettext



From pkgdb at fedoraproject.org  Mon Jan 19 17:37:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:37:49 +0000
Subject: [pkgdb] mingw32-gettext: mingwmaint has requested watchcommits
Message-ID: <20090119173750.EC1D7208E16@bastion.fedora.phx.redhat.com>

mingwmaint has requested the watchcommits acl on mingw32-gettext (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-gettext



From pkgdb at fedoraproject.org  Mon Jan 19 17:38:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:38:04 +0000
Subject: [pkgdb] mingw32-readline: mingwmaint has requested watchbugzilla
Message-ID: <20090119173804.D30B7208E1D@bastion.fedora.phx.redhat.com>

mingwmaint has requested the watchbugzilla acl on mingw32-readline (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-readline



From pkgdb at fedoraproject.org  Mon Jan 19 17:38:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:38:08 +0000
Subject: [pkgdb] mingw32-readline: mingwmaint has requested watchcommits
Message-ID: <20090119173808.E22502092CA@bastion.fedora.phx.redhat.com>

mingwmaint has requested the watchcommits acl on mingw32-readline (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-readline



From pkgdb at fedoraproject.org  Mon Jan 19 17:38:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:38:07 +0000
Subject: [pkgdb] mingw32-readline: mingwmaint has requested watchbugzilla
Message-ID: <20090119173808.A80F6208E22@bastion.fedora.phx.redhat.com>

mingwmaint has requested the watchbugzilla acl on mingw32-readline (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-readline



From pkgdb at fedoraproject.org  Mon Jan 19 17:38:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:38:09 +0000
Subject: [pkgdb] mingw32-readline: mingwmaint has requested watchcommits
Message-ID: <20090119173810.19B222092CF@bastion.fedora.phx.redhat.com>

mingwmaint has requested the watchcommits acl on mingw32-readline (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-readline



From pkgdb at fedoraproject.org  Mon Jan 19 17:38:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:38:10 +0000
Subject: [pkgdb] mingw32-readline: mingwmaint has requested watchcommits
Message-ID: <20090119173810.E669330001C@bastion.fedora.phx.redhat.com>

mingwmaint has requested the watchcommits acl on mingw32-readline (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-readline



From pkgdb at fedoraproject.org  Mon Jan 19 17:38:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:38:11 +0000
Subject: [pkgdb] mingw32-readline: mingwmaint has requested watchbugzilla
Message-ID: <20090119173811.C9849300021@bastion.fedora.phx.redhat.com>

mingwmaint has requested the watchbugzilla acl on mingw32-readline (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-readline



From pkgdb at fedoraproject.org  Mon Jan 19 17:40:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:40:10 +0000
Subject: [pkgdb] mingw32-readline had acl change status
Message-ID: <20090119174010.E6B59208E33@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on mingw32-readline (Fedora 10) to Approved for mingwmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-readline



From pkgdb at fedoraproject.org  Mon Jan 19 17:40:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:40:11 +0000
Subject: [pkgdb] mingw32-readline had acl change status
Message-ID: <20090119174011.EDDA4208F51@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on mingw32-readline (Fedora devel) to Approved for mingwmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-readline



From pkgdb at fedoraproject.org  Mon Jan 19 17:40:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:40:12 +0000
Subject: [pkgdb] mingw32-readline had acl change status
Message-ID: <20090119174012.77CF8208F56@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on mingw32-readline (Fedora EPEL 5) to Approved for mingwmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-readline



From pkgdb at fedoraproject.org  Mon Jan 19 17:40:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:40:11 +0000
Subject: [pkgdb] mingw32-readline had acl change status
Message-ID: <20090119174013.E37E7208F59@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on mingw32-readline (Fedora devel) to Approved for mingwmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-readline



From pkgdb at fedoraproject.org  Mon Jan 19 17:40:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:40:11 +0000
Subject: [pkgdb] mingw32-readline had acl change status
Message-ID: <20090119174014.91D4F208F5E@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on mingw32-readline (Fedora 10) to Approved for mingwmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-readline



From pkgdb at fedoraproject.org  Mon Jan 19 17:40:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:40:15 +0000
Subject: [pkgdb] mingw32-readline had acl change status
Message-ID: <20090119174015.3B361208F63@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on mingw32-readline (Fedora EPEL 5) to Approved for mingwmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-readline



From pkgdb at fedoraproject.org  Mon Jan 19 17:40:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:40:50 +0000
Subject: [pkgdb] mingw32-filesystem had acl change status
Message-ID: <20090119174050.7FB54208F6C@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on mingw32-filesystem (Fedora devel) to Approved for mingwmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-filesystem



From pkgdb at fedoraproject.org  Mon Jan 19 17:40:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:40:51 +0000
Subject: [pkgdb] mingw32-filesystem had acl change status
Message-ID: <20090119174051.8D680208F71@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on mingw32-filesystem (Fedora 10) to Approved for mingwmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-filesystem



From pkgdb at fedoraproject.org  Mon Jan 19 17:40:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:40:53 +0000
Subject: [pkgdb] mingw32-filesystem had acl change status
Message-ID: <20090119174053.DDD4D208F7D@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on mingw32-filesystem (Fedora EPEL 5) to Approved for mingwmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-filesystem



From pkgdb at fedoraproject.org  Mon Jan 19 17:40:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:40:53 +0000
Subject: [pkgdb] mingw32-filesystem had acl change status
Message-ID: <20090119174054.3DC352092D1@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on mingw32-filesystem (Fedora devel) to Approved for mingwmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-filesystem



From pkgdb at fedoraproject.org  Mon Jan 19 17:40:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:40:55 +0000
Subject: [pkgdb] mingw32-filesystem had acl change status
Message-ID: <20090119174055.DA0A62092D5@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on mingw32-filesystem (Fedora 10) to Approved for mingwmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-filesystem



From pkgdb at fedoraproject.org  Mon Jan 19 17:40:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:40:56 +0000
Subject: [pkgdb] mingw32-filesystem had acl change status
Message-ID: <20090119174056.A3BE22092D9@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on mingw32-filesystem (Fedora EPEL 5) to Approved for mingwmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-filesystem



From pkgdb at fedoraproject.org  Mon Jan 19 17:40:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:40:59 +0000
Subject: [pkgdb] mingw32-binutils had acl change status
Message-ID: <20090119174059.ACA662092DD@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on mingw32-binutils (Fedora devel) to Approved for mingwmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-binutils



From pkgdb at fedoraproject.org  Mon Jan 19 17:41:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:41:00 +0000
Subject: [pkgdb] mingw32-binutils had acl change status
Message-ID: <20090119174100.7AEA42092E1@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on mingw32-binutils (Fedora devel) to Approved for mingwmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-binutils



From pkgdb at fedoraproject.org  Mon Jan 19 17:41:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:41:01 +0000
Subject: [pkgdb] mingw32-binutils had acl change status
Message-ID: <20090119174101.8B0872092E5@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on mingw32-binutils (Fedora 10) to Approved for mingwmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-binutils



From pkgdb at fedoraproject.org  Mon Jan 19 17:41:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:41:03 +0000
Subject: [pkgdb] mingw32-binutils had acl change status
Message-ID: <20090119174103.6D7712092E6@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on mingw32-binutils (Fedora EPEL 5) to Approved for mingwmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-binutils



From pkgdb at fedoraproject.org  Mon Jan 19 17:41:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:41:03 +0000
Subject: [pkgdb] mingw32-binutils had acl change status
Message-ID: <20090119174103.C60122092EA@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on mingw32-binutils (Fedora 10) to Approved for mingwmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-binutils



From pkgdb at fedoraproject.org  Mon Jan 19 17:41:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:41:04 +0000
Subject: [pkgdb] mingw32-binutils had acl change status
Message-ID: <20090119174104.A734D2092EE@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on mingw32-binutils (Fedora EPEL 5) to Approved for mingwmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-binutils



From pkgdb at fedoraproject.org  Mon Jan 19 17:41:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:41:09 +0000
Subject: [pkgdb] mingw32-gcc had acl change status
Message-ID: <20090119174110.90E3B2092F3@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on mingw32-gcc (Fedora devel) to Approved for mingwmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-gcc



From pkgdb at fedoraproject.org  Mon Jan 19 17:41:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:41:09 +0000
Subject: [pkgdb] mingw32-gcc had acl change status
Message-ID: <20090119174110.F41BA2092F5@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on mingw32-gcc (Fedora devel) to Approved for mingwmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-gcc



From pkgdb at fedoraproject.org  Mon Jan 19 17:41:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:41:11 +0000
Subject: [pkgdb] mingw32-gcc had acl change status
Message-ID: <20090119174113.9E1EA2092F8@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on mingw32-gcc (Fedora 10) to Approved for mingwmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-gcc



From pkgdb at fedoraproject.org  Mon Jan 19 17:41:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:41:13 +0000
Subject: [pkgdb] mingw32-gcc had acl change status
Message-ID: <20090119174113.C7A652092FE@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on mingw32-gcc (Fedora EPEL 5) to Approved for mingwmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-gcc



From pkgdb at fedoraproject.org  Mon Jan 19 17:41:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:41:14 +0000
Subject: [pkgdb] mingw32-gcc had acl change status
Message-ID: <20090119174115.33B85300024@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on mingw32-gcc (Fedora EPEL 5) to Approved for mingwmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-gcc



From pkgdb at fedoraproject.org  Mon Jan 19 17:41:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:41:12 +0000
Subject: [pkgdb] mingw32-gcc had acl change status
Message-ID: <20090119174113.ADBF32092FC@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on mingw32-gcc (Fedora 10) to Approved for mingwmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-gcc



From pkgdb at fedoraproject.org  Mon Jan 19 17:41:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:41:17 +0000
Subject: [pkgdb] mingw32-runtime had acl change status
Message-ID: <20090119174117.DD318300029@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on mingw32-runtime (Fedora devel) to Approved for mingwmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-runtime



From pkgdb at fedoraproject.org  Mon Jan 19 17:41:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:41:17 +0000
Subject: [pkgdb] mingw32-runtime had acl change status
Message-ID: <20090119174118.25D6330002D@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on mingw32-runtime (Fedora devel) to Approved for mingwmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-runtime



From pkgdb at fedoraproject.org  Mon Jan 19 17:41:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:41:20 +0000
Subject: [pkgdb] mingw32-runtime had acl change status
Message-ID: <20090119174121.9C3F7208F83@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on mingw32-runtime (Fedora 10) to Approved for mingwmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-runtime



From pkgdb at fedoraproject.org  Mon Jan 19 17:41:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:41:21 +0000
Subject: [pkgdb] mingw32-runtime had acl change status
Message-ID: <20090119174121.E3686300031@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on mingw32-runtime (Fedora 10) to Approved for mingwmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-runtime



From pkgdb at fedoraproject.org  Mon Jan 19 17:41:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:41:22 +0000
Subject: [pkgdb] mingw32-runtime had acl change status
Message-ID: <20090119174123.4EAB3209308@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on mingw32-runtime (Fedora EPEL 5) to Approved for mingwmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-runtime



From pkgdb at fedoraproject.org  Mon Jan 19 17:41:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:41:22 +0000
Subject: [pkgdb] mingw32-runtime had acl change status
Message-ID: <20090119174124.995A5300032@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on mingw32-runtime (Fedora EPEL 5) to Approved for mingwmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-runtime



From pkgdb at fedoraproject.org  Mon Jan 19 17:41:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:41:25 +0000
Subject: [pkgdb] mingw32-w32api had acl change status
Message-ID: <20090119174125.B6E26300039@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on mingw32-w32api (Fedora devel) to Approved for mingwmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-w32api



From pkgdb at fedoraproject.org  Mon Jan 19 17:41:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:41:26 +0000
Subject: [pkgdb] mingw32-w32api had acl change status
Message-ID: <20090119174127.5BB8830003D@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on mingw32-w32api (Fedora devel) to Approved for mingwmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-w32api



From pkgdb at fedoraproject.org  Mon Jan 19 17:41:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:41:28 +0000
Subject: [pkgdb] mingw32-w32api had acl change status
Message-ID: <20090119174128.CF478300041@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on mingw32-w32api (Fedora 10) to Approved for mingwmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-w32api



From pkgdb at fedoraproject.org  Mon Jan 19 17:41:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:41:31 +0000
Subject: [pkgdb] mingw32-w32api had acl change status
Message-ID: <20090119174131.EAC68300045@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on mingw32-w32api (Fedora EPEL 5) to Approved for mingwmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-w32api



From pkgdb at fedoraproject.org  Mon Jan 19 17:41:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:41:32 +0000
Subject: [pkgdb] mingw32-w32api had acl change status
Message-ID: <20090119174132.E4F6C300049@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on mingw32-w32api (Fedora 10) to Approved for mingwmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-w32api



From pkgdb at fedoraproject.org  Mon Jan 19 17:41:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:41:32 +0000
Subject: [pkgdb] mingw32-w32api had acl change status
Message-ID: <20090119174133.EC454300056@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on mingw32-w32api (Fedora EPEL 5) to Approved for mingwmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-w32api



From pkgdb at fedoraproject.org  Mon Jan 19 17:41:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:41:35 +0000
Subject: [pkgdb] mingw32-zlib had acl change status
Message-ID: <20090119174135.D6A70209307@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on mingw32-zlib (Fedora devel) to Approved for mingwmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-zlib



From pkgdb at fedoraproject.org  Mon Jan 19 17:41:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:41:36 +0000
Subject: [pkgdb] mingw32-zlib had acl change status
Message-ID: <20090119174136.47A3F20930E@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on mingw32-zlib (Fedora devel) to Approved for mingwmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-zlib



From pkgdb at fedoraproject.org  Mon Jan 19 17:41:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:41:38 +0000
Subject: [pkgdb] mingw32-zlib had acl change status
Message-ID: <20090119174138.97DEB30004C@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on mingw32-zlib (Fedora 10) to Approved for mingwmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-zlib



From pkgdb at fedoraproject.org  Mon Jan 19 17:41:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:41:38 +0000
Subject: [pkgdb] mingw32-zlib had acl change status
Message-ID: <20090119174140.33DE8300051@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on mingw32-zlib (Fedora 10) to Approved for mingwmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-zlib



From pkgdb at fedoraproject.org  Mon Jan 19 17:41:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:41:42 +0000
Subject: [pkgdb] mingw32-zlib had acl change status
Message-ID: <20090119174142.7BBF1300058@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on mingw32-zlib (Fedora EPEL 5) to Approved for mingwmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-zlib



From pkgdb at fedoraproject.org  Mon Jan 19 17:41:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:41:42 +0000
Subject: [pkgdb] mingw32-zlib had acl change status
Message-ID: <20090119174143.3E432209316@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on mingw32-zlib (Fedora EPEL 5) to Approved for mingwmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-zlib



From pkgdb at fedoraproject.org  Mon Jan 19 17:41:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:41:45 +0000
Subject: [pkgdb] mingw32-sqlite had acl change status
Message-ID: <20090119174145.A394D30005D@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on mingw32-sqlite (Fedora devel) to Approved for mingwmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-sqlite



From pkgdb at fedoraproject.org  Mon Jan 19 17:41:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:41:46 +0000
Subject: [pkgdb] mingw32-sqlite had acl change status
Message-ID: <20090119174146.647E1300062@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on mingw32-sqlite (Fedora devel) to Approved for mingwmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-sqlite



From pkgdb at fedoraproject.org  Mon Jan 19 17:41:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:41:49 +0000
Subject: [pkgdb] mingw32-sqlite had acl change status
Message-ID: <20090119174150.0C023300067@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on mingw32-sqlite (Fedora 10) to Approved for mingwmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-sqlite



From pkgdb at fedoraproject.org  Mon Jan 19 17:41:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:41:51 +0000
Subject: [pkgdb] mingw32-sqlite had acl change status
Message-ID: <20090119174151.28C1630006C@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on mingw32-sqlite (Fedora 10) to Approved for mingwmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-sqlite



From pkgdb at fedoraproject.org  Mon Jan 19 17:41:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:41:51 +0000
Subject: [pkgdb] mingw32-sqlite had acl change status
Message-ID: <20090119174151.BAE70300071@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on mingw32-sqlite (Fedora EPEL 5) to Approved for mingwmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-sqlite



From pkgdb at fedoraproject.org  Mon Jan 19 17:41:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:41:56 +0000
Subject: [pkgdb] mingw32-bzip2 had acl change status
Message-ID: <20090119174156.A4EE3300076@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on mingw32-bzip2 (Fedora devel) to Approved for mingwmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-bzip2



From pkgdb at fedoraproject.org  Mon Jan 19 17:41:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:41:57 +0000
Subject: [pkgdb] mingw32-bzip2 had acl change status
Message-ID: <20090119174157.E5C7C300079@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on mingw32-bzip2 (Fedora devel) to Approved for mingwmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-bzip2



From pkgdb at fedoraproject.org  Mon Jan 19 17:41:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:41:57 +0000
Subject: [pkgdb] mingw32-sqlite had acl change status
Message-ID: <20090119174157.F41C030007E@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on mingw32-sqlite (Fedora EPEL 5) to Approved for mingwmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-sqlite



From pkgdb at fedoraproject.org  Mon Jan 19 17:41:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:41:57 +0000
Subject: [pkgdb] mingw32-bzip2 had acl change status
Message-ID: <20090119174158.89204208F8A@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on mingw32-bzip2 (Fedora 10) to Approved for mingwmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-bzip2



From pkgdb at fedoraproject.org  Mon Jan 19 17:41:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:41:59 +0000
Subject: [pkgdb] mingw32-bzip2 had acl change status
Message-ID: <20090119174201.368D5300087@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on mingw32-bzip2 (Fedora 10) to Approved for mingwmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-bzip2



From pkgdb at fedoraproject.org  Mon Jan 19 17:42:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:42:01 +0000
Subject: [pkgdb] mingw32-bzip2 had acl change status
Message-ID: <20090119174201.BA48430008C@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on mingw32-bzip2 (Fedora EPEL 5) to Obsolete for mingwmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-bzip2



From pkgdb at fedoraproject.org  Mon Jan 19 17:42:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:42:02 +0000
Subject: [pkgdb] mingw32-bzip2 had acl change status
Message-ID: <20090119174203.1D62A300091@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on mingw32-bzip2 (Fedora EPEL 5) to Approved for mingwmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-bzip2



From pkgdb at fedoraproject.org  Mon Jan 19 17:42:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:42:06 +0000
Subject: [pkgdb] mingw32-bzip2 had acl change status
Message-ID: <20090119174206.A80C7208F8F@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on mingw32-bzip2 (Fedora EPEL 5) to Approved for mingwmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-bzip2



From pkgdb at fedoraproject.org  Mon Jan 19 17:42:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:42:09 +0000
Subject: [pkgdb] mingw32-iconv had acl change status
Message-ID: <20090119174209.A89B9300095@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on mingw32-iconv (Fedora devel) to Approved for mingwmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-iconv



From pkgdb at fedoraproject.org  Mon Jan 19 17:42:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:42:10 +0000
Subject: [pkgdb] mingw32-iconv had acl change status
Message-ID: <20090119174210.5E24B30009A@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on mingw32-iconv (Fedora devel) to Approved for mingwmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-iconv



From pkgdb at fedoraproject.org  Mon Jan 19 17:42:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:42:10 +0000
Subject: [pkgdb] mingw32-iconv had acl change status
Message-ID: <20090119174211.0876230009F@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on mingw32-iconv (Fedora 10) to Approved for mingwmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-iconv



From pkgdb at fedoraproject.org  Mon Jan 19 17:42:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:42:14 +0000
Subject: [pkgdb] mingw32-iconv had acl change status
Message-ID: <20090119174214.4E0B73000A9@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on mingw32-iconv (Fedora 10) to Approved for mingwmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-iconv



From pkgdb at fedoraproject.org  Mon Jan 19 17:42:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:42:14 +0000
Subject: [pkgdb] mingw32-iconv had acl change status
Message-ID: <20090119174214.2314C3000A7@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on mingw32-iconv (Fedora EPEL 5) to Approved for mingwmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-iconv



From pkgdb at fedoraproject.org  Mon Jan 19 17:42:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:42:17 +0000
Subject: [pkgdb] mingw32-iconv had acl change status
Message-ID: <20090119174217.9DAED3000AC@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on mingw32-iconv (Fedora EPEL 5) to Approved for mingwmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-iconv



From pkgdb at fedoraproject.org  Mon Jan 19 17:42:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:42:27 +0000
Subject: [pkgdb] mingw32-termcap had acl change status
Message-ID: <20090119174228.010933000B1@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on mingw32-termcap (Fedora devel) to Approved for mingwmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-termcap



From pkgdb at fedoraproject.org  Mon Jan 19 17:42:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:42:30 +0000
Subject: [pkgdb] mingw32-termcap had acl change status
Message-ID: <20090119174230.6C65E208F99@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on mingw32-termcap (Fedora devel) to Approved for mingwmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-termcap



From pkgdb at fedoraproject.org  Mon Jan 19 17:42:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:42:31 +0000
Subject: [pkgdb] mingw32-termcap had acl change status
Message-ID: <20090119174231.587D83000B5@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on mingw32-termcap (Fedora 10) to Approved for mingwmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-termcap



From pkgdb at fedoraproject.org  Mon Jan 19 17:42:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:42:33 +0000
Subject: [pkgdb] mingw32-termcap had acl change status
Message-ID: <20090119174234.1F0213000BA@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on mingw32-termcap (Fedora 10) to Approved for mingwmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-termcap



From pkgdb at fedoraproject.org  Mon Jan 19 17:42:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:42:34 +0000
Subject: [pkgdb] mingw32-termcap had acl change status
Message-ID: <20090119174235.56C9C3000C1@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on mingw32-termcap (Fedora EPEL 5) to Approved for mingwmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-termcap



From pkgdb at fedoraproject.org  Mon Jan 19 17:42:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:42:35 +0000
Subject: [pkgdb] mingw32-termcap had acl change status
Message-ID: <20090119174235.57D4E3000C3@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on mingw32-termcap (Fedora EPEL 5) to Approved for mingwmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-termcap



From pkgdb at fedoraproject.org  Mon Jan 19 17:42:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:42:39 +0000
Subject: [pkgdb] mingw32-libpng had acl change status
Message-ID: <20090119174239.0FDDC3000C9@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on mingw32-libpng (Fedora devel) to Approved for mingwmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-libpng



From pkgdb at fedoraproject.org  Mon Jan 19 17:42:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:42:41 +0000
Subject: [pkgdb] mingw32-libpng had acl change status
Message-ID: <20090119174241.BF5FB208F9E@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on mingw32-libpng (Fedora devel) to Approved for mingwmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-libpng



From pkgdb at fedoraproject.org  Mon Jan 19 17:42:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:42:41 +0000
Subject: [pkgdb] mingw32-libpng had acl change status
Message-ID: <20090119174242.1EA72209319@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on mingw32-libpng (Fedora 10) to Approved for mingwmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-libpng



From pkgdb at fedoraproject.org  Mon Jan 19 17:42:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:42:44 +0000
Subject: [pkgdb] mingw32-libpng had acl change status
Message-ID: <20090119174244.3004E20931E@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on mingw32-libpng (Fedora EPEL 5) to Approved for mingwmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-libpng



From pkgdb at fedoraproject.org  Mon Jan 19 17:42:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:42:49 +0000
Subject: [pkgdb] mingw32-pthreads had acl change status
Message-ID: <20090119174249.91849209325@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on mingw32-pthreads (Fedora devel) to Approved for mingwmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-pthreads



From pkgdb at fedoraproject.org  Mon Jan 19 17:42:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:42:50 +0000
Subject: [pkgdb] mingw32-pthreads had acl change status
Message-ID: <20090119174250.A6F13209328@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on mingw32-pthreads (Fedora devel) to Approved for mingwmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-pthreads



From pkgdb at fedoraproject.org  Mon Jan 19 17:42:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:42:52 +0000
Subject: [pkgdb] mingw32-pthreads had acl change status
Message-ID: <20090119174252.51FDF20932B@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on mingw32-pthreads (Fedora 10) to Approved for mingwmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-pthreads



From pkgdb at fedoraproject.org  Mon Jan 19 17:42:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:42:53 +0000
Subject: [pkgdb] mingw32-pthreads had acl change status
Message-ID: <20090119174253.24B60209330@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on mingw32-pthreads (Fedora EPEL 5) to Approved for mingwmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-pthreads



From pkgdb at fedoraproject.org  Mon Jan 19 17:42:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:42:55 +0000
Subject: [pkgdb] mingw32-pthreads had acl change status
Message-ID: <20090119174255.F0AB1209335@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on mingw32-pthreads (Fedora EPEL 5) to Approved for mingwmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-pthreads



From pkgdb at fedoraproject.org  Mon Jan 19 17:42:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:42:59 +0000
Subject: [pkgdb] mingw32-SDL had acl change status
Message-ID: <20090119174300.1B9ED20933B@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on mingw32-SDL (Fedora 10) to Approved for mingwmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-SDL



From pkgdb at fedoraproject.org  Mon Jan 19 17:42:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:42:49 +0000
Subject: [pkgdb] mingw32-libpng had acl change status
Message-ID: <20090119174307.B042B208E4A@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on mingw32-libpng (Fedora 10) to Approved for mingwmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-libpng



From pkgdb at fedoraproject.org  Mon Jan 19 17:44:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:44:12 +0000
Subject: [pkgdb] mingw32-dlfcn had acl change status
Message-ID: <20090119174412.AD2F6208FAE@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on mingw32-dlfcn (Fedora devel) to Obsolete for mingwmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-dlfcn



From pkgdb at fedoraproject.org  Mon Jan 19 17:44:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:44:13 +0000
Subject: [pkgdb] mingw32-SDL had acl change status
Message-ID: <20090119174414.32A77208FB3@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on mingw32-SDL (Fedora EPEL 5) to Approved for mingwmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-SDL



From pkgdb at fedoraproject.org  Mon Jan 19 17:44:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:44:17 +0000
Subject: [pkgdb] mingw32-dlfcn had acl change status
Message-ID: <20090119174417.A135F208FBA@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on mingw32-dlfcn (Fedora devel) to Approved for mingwmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-dlfcn



From pkgdb at fedoraproject.org  Mon Jan 19 17:44:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:44:18 +0000
Subject: [pkgdb] mingw32-dlfcn had acl change status
Message-ID: <20090119174418.A0F12209341@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on mingw32-dlfcn (Fedora 10) to Approved for mingwmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-dlfcn



From pkgdb at fedoraproject.org  Mon Jan 19 17:44:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:44:20 +0000
Subject: [pkgdb] mingw32-dlfcn had acl change status
Message-ID: <20090119174420.77668209349@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on mingw32-dlfcn (Fedora 10) to Approved for mingwmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-dlfcn



From pkgdb at fedoraproject.org  Mon Jan 19 17:44:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:44:20 +0000
Subject: [pkgdb] mingw32-dlfcn had acl change status
Message-ID: <20090119174420.979B9208FBC@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on mingw32-dlfcn (Fedora EPEL 5) to Approved for mingwmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-dlfcn



From pkgdb at fedoraproject.org  Mon Jan 19 17:44:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:44:20 +0000
Subject: [pkgdb] mingw32-dlfcn had acl change status
Message-ID: <20090119174420.EE1D220934B@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on mingw32-dlfcn (Fedora EPEL 5) to Approved for mingwmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-dlfcn



From pkgdb at fedoraproject.org  Mon Jan 19 17:44:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:44:05 +0000
Subject: [pkgdb] mingw32-pthreads had acl change status
Message-ID: <20090119174422.E1A1A209351@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on mingw32-pthreads (Fedora 10) to Approved for mingwmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-pthreads



From pkgdb at fedoraproject.org  Mon Jan 19 17:44:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:44:05 +0000
Subject: [pkgdb] mingw32-libpng had acl change status
Message-ID: <20090119174422.B5C4620934F@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on mingw32-libpng (Fedora EPEL 5) to Approved for mingwmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-libpng



From pkgdb at fedoraproject.org  Mon Jan 19 17:44:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:44:22 +0000
Subject: [pkgdb] mingw32-pdcurses had acl change status
Message-ID: <20090119174423.11C89209356@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on mingw32-pdcurses (Fedora 10) to Approved for mingwmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-pdcurses



From pkgdb at fedoraproject.org  Mon Jan 19 17:44:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:44:25 +0000
Subject: [pkgdb] mingw32-pdcurses had acl change status
Message-ID: <20090119174426.ABF6B20935F@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on mingw32-pdcurses (Fedora devel) to Approved for mingwmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-pdcurses



From pkgdb at fedoraproject.org  Mon Jan 19 17:44:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:44:26 +0000
Subject: [pkgdb] mingw32-gdbm had acl change status
Message-ID: <20090119174426.EB767209363@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on mingw32-gdbm (Fedora devel) to Approved for mingwmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-gdbm



From pkgdb at fedoraproject.org  Mon Jan 19 17:44:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:44:16 +0000
Subject: [pkgdb] mingw32-SDL had acl change status
Message-ID: <20090119174427.91A8320936A@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on mingw32-SDL (Fedora EPEL 5) to Approved for mingwmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-SDL



From pkgdb at fedoraproject.org  Mon Jan 19 17:44:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:44:26 +0000
Subject: [pkgdb] mingw32-pdcurses had acl change status
Message-ID: <20090119174428.7E13020936C@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on mingw32-pdcurses (Fedora devel) to Approved for mingwmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-pdcurses



From pkgdb at fedoraproject.org  Mon Jan 19 17:44:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:44:26 +0000
Subject: [pkgdb] mingw32-pdcurses had acl change status
Message-ID: <20090119174428.9795A209372@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on mingw32-pdcurses (Fedora 10) to Approved for mingwmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-pdcurses



From pkgdb at fedoraproject.org  Mon Jan 19 17:44:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:44:28 +0000
Subject: [pkgdb] mingw32-pdcurses had acl change status
Message-ID: <20090119174428.AB1FC209377@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on mingw32-pdcurses (Fedora EPEL 5) to Approved for mingwmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-pdcurses



From pkgdb at fedoraproject.org  Mon Jan 19 17:44:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:44:29 +0000
Subject: [pkgdb] mingw32-gdbm had acl change status
Message-ID: <20090119174429.80A0820937C@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on mingw32-gdbm (Fedora EPEL 5) to Approved for mingwmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-gdbm



From pkgdb at fedoraproject.org  Mon Jan 19 17:44:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:44:29 +0000
Subject: [pkgdb] mingw32-gdbm had acl change status
Message-ID: <20090119174429.D4AA2209383@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on mingw32-gdbm (Fedora 10) to Approved for mingwmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-gdbm



From pkgdb at fedoraproject.org  Mon Jan 19 17:44:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:44:29 +0000
Subject: [pkgdb] mingw32-pdcurses had acl change status
Message-ID: <20090119174430.105D1209385@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on mingw32-pdcurses (Fedora EPEL 5) to Approved for mingwmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-pdcurses



From pkgdb at fedoraproject.org  Mon Jan 19 17:44:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:44:29 +0000
Subject: [pkgdb] mingw32-gdbm had acl change status
Message-ID: <20090119174430.7641E209389@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on mingw32-gdbm (Fedora 10) to Approved for mingwmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-gdbm



From pkgdb at fedoraproject.org  Mon Jan 19 17:44:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:44:16 +0000
Subject: [pkgdb] mingw32-SDL had acl change status
Message-ID: <20090119174430.7AA2D20938D@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on mingw32-SDL (Fedora devel) to Approved for mingwmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-SDL



From pkgdb at fedoraproject.org  Mon Jan 19 17:44:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:44:29 +0000
Subject: [pkgdb] mingw32-gdbm had acl change status
Message-ID: <20090119174430.94CE13000CA@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on mingw32-gdbm (Fedora devel) to Approved for mingwmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-gdbm



From pkgdb at fedoraproject.org  Mon Jan 19 17:44:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:44:31 +0000
Subject: [pkgdb] mingw32-gdbm had acl change status
Message-ID: <20090119174431.54B88208FC3@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on mingw32-gdbm (Fedora EPEL 5) to Approved for mingwmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-gdbm



From pkgdb at fedoraproject.org  Mon Jan 19 17:44:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:44:22 +0000
Subject: [pkgdb] mingw32-SDL had acl change status
Message-ID: <20090119174432.204543000D2@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on mingw32-SDL (Fedora devel) to Approved for mingwmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-SDL



From pkgdb at fedoraproject.org  Mon Jan 19 17:44:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:44:24 +0000
Subject: [pkgdb] mingw32-SDL had acl change status
Message-ID: <20090119174432.2B0583000D5@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on mingw32-SDL (Fedora 10) to Approved for mingwmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-SDL



From pkgdb at fedoraproject.org  Mon Jan 19 17:44:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:44:33 +0000
Subject: [pkgdb] mingw32-dlfcn had acl change status
Message-ID: <20090119174435.9DE113000DD@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on mingw32-dlfcn (Fedora devel) to Approved for mingwmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-dlfcn



From pkgdb at fedoraproject.org  Mon Jan 19 17:44:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:44:35 +0000
Subject: [pkgdb] mingw32-freetype had acl change status
Message-ID: <20090119174435.B42E33000E2@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on mingw32-freetype (Fedora 10) to Approved for mingwmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-freetype



From pkgdb at fedoraproject.org  Mon Jan 19 17:44:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:44:35 +0000
Subject: [pkgdb] mingw32-freetype had acl change status
Message-ID: <20090119174435.D43BC3000E7@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on mingw32-freetype (Fedora 10) to Approved for mingwmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-freetype



From pkgdb at fedoraproject.org  Mon Jan 19 17:44:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:44:35 +0000
Subject: [pkgdb] mingw32-freetype had acl change status
Message-ID: <20090119174436.100623000EF@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on mingw32-freetype (Fedora devel) to Approved for mingwmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-freetype



From pkgdb at fedoraproject.org  Mon Jan 19 17:44:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:44:32 +0000
Subject: [pkgdb] mingw32-freetype had acl change status
Message-ID: <20090119174436.067C93000EC@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on mingw32-freetype (Fedora devel) to Approved for mingwmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-freetype



From pkgdb at fedoraproject.org  Mon Jan 19 17:44:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:44:35 +0000
Subject: [pkgdb] mingw32-freetype had acl change status
Message-ID: <20090119174436.5C5913000F2@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on mingw32-freetype (Fedora EPEL 5) to Obsolete for mingwmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-freetype



From pkgdb at fedoraproject.org  Mon Jan 19 17:44:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:44:37 +0000
Subject: [pkgdb] mingw32-freetype had acl change status
Message-ID: <20090119174437.6C0E53000F8@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on mingw32-freetype (Fedora EPEL 5) to Approved for mingwmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-freetype



From pkgdb at fedoraproject.org  Mon Jan 19 17:44:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:44:48 +0000
Subject: [pkgdb] mingw32-freetype had acl change status
Message-ID: <20090119174449.B94AC300101@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on mingw32-freetype (Fedora EPEL 5) to Approved for mingwmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-freetype



From pkgdb at fedoraproject.org  Mon Jan 19 17:45:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:45:04 +0000
Subject: [pkgdb] mingw32-gettext had acl change status
Message-ID: <20090119174504.51399208FC7@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on mingw32-gettext (Fedora devel) to Approved for mingwmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-gettext



From pkgdb at fedoraproject.org  Mon Jan 19 17:45:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:45:05 +0000
Subject: [pkgdb] mingw32-gettext had acl change status
Message-ID: <20090119174505.664CB208FCA@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on mingw32-gettext (Fedora devel) to Approved for mingwmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-gettext



From pkgdb at fedoraproject.org  Mon Jan 19 17:45:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:45:07 +0000
Subject: [pkgdb] mingw32-gettext had acl change status
Message-ID: <20090119174507.8BC24300106@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on mingw32-gettext (Fedora 10) to Approved for mingwmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-gettext



From pkgdb at fedoraproject.org  Mon Jan 19 17:45:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:45:09 +0000
Subject: [pkgdb] mingw32-gettext had acl change status
Message-ID: <20090119174509.E9B4030010A@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on mingw32-gettext (Fedora 10) to Approved for mingwmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-gettext



From pkgdb at fedoraproject.org  Mon Jan 19 17:45:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:45:10 +0000
Subject: [pkgdb] mingw32-gettext had acl change status
Message-ID: <20090119174510.EFF00300113@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on mingw32-gettext (Fedora EPEL 5) to Approved for mingwmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-gettext



From pkgdb at fedoraproject.org  Mon Jan 19 17:45:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:45:10 +0000
Subject: [pkgdb] mingw32-gettext had acl change status
Message-ID: <20090119174510.E8AEE300111@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on mingw32-gettext (Fedora EPEL 5) to Approved for mingwmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-gettext



From pkgdb at fedoraproject.org  Mon Jan 19 17:59:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:59:09 +0000
Subject: [pkgdb] ruby-libvirt had acl change status
Message-ID: <20090119175909.6EF0A209010@bastion.fedora.phx.redhat.com>

lutter has set the watchbugzilla acl on ruby-libvirt (Fedora devel) to Approved for virtmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ruby-libvirt



From pkgdb at fedoraproject.org  Mon Jan 19 17:59:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:59:10 +0000
Subject: [pkgdb] ruby-libvirt had acl change status
Message-ID: <20090119175910.EBE72209013@bastion.fedora.phx.redhat.com>

lutter has set the watchcommits acl on ruby-libvirt (Fedora devel) to Approved for virtmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ruby-libvirt



From pkgdb at fedoraproject.org  Mon Jan 19 17:59:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:59:12 +0000
Subject: [pkgdb] ruby-libvirt had acl change status
Message-ID: <20090119175912.B29BD209016@bastion.fedora.phx.redhat.com>

lutter has set the watchbugzilla acl on ruby-libvirt (Fedora 8) to Approved for virtmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ruby-libvirt



From pkgdb at fedoraproject.org  Mon Jan 19 17:59:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:59:16 +0000
Subject: [pkgdb] ruby-libvirt had acl change status
Message-ID: <20090119175916.1AE6E20901B@bastion.fedora.phx.redhat.com>

lutter has set the watchcommits acl on ruby-libvirt (Fedora 8) to Approved for virtmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ruby-libvirt



From pkgdb at fedoraproject.org  Mon Jan 19 17:59:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:59:22 +0000
Subject: [pkgdb] ruby-libvirt had acl change status
Message-ID: <20090119175922.5148820901E@bastion.fedora.phx.redhat.com>

lutter has set the watchcommits acl on ruby-libvirt (Fedora 9) to Approved for virtmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ruby-libvirt



From pkgdb at fedoraproject.org  Mon Jan 19 17:59:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:59:25 +0000
Subject: [pkgdb] ruby-libvirt had acl change status
Message-ID: <20090119175925.5EA6C209023@bastion.fedora.phx.redhat.com>

lutter has set the watchcommits acl on ruby-libvirt (Fedora EPEL 5) to Approved for virtmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ruby-libvirt



From pkgdb at fedoraproject.org  Mon Jan 19 17:59:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:59:27 +0000
Subject: [pkgdb] ruby-libvirt had acl change status
Message-ID: <20090119175927.586DB209029@bastion.fedora.phx.redhat.com>

lutter has set the watchbugzilla acl on ruby-libvirt (Fedora 10) to Approved for virtmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ruby-libvirt



From pkgdb at fedoraproject.org  Mon Jan 19 17:59:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:59:25 +0000
Subject: [pkgdb] ruby-libvirt had acl change status
Message-ID: <20090119175927.90BDC20902B@bastion.fedora.phx.redhat.com>

lutter has set the watchbugzilla acl on ruby-libvirt (Fedora 9) to Approved for virtmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ruby-libvirt



From pkgdb at fedoraproject.org  Mon Jan 19 17:59:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:59:26 +0000
Subject: [pkgdb] ruby-libvirt had acl change status
Message-ID: <20090119175928.3DAD720902F@bastion.fedora.phx.redhat.com>

lutter has set the watchbugzilla acl on ruby-libvirt (Fedora EPEL 5) to Approved for virtmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ruby-libvirt



From pkgdb at fedoraproject.org  Mon Jan 19 17:59:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 17:59:28 +0000
Subject: [pkgdb] ruby-libvirt had acl change status
Message-ID: <20090119175929.37253209034@bastion.fedora.phx.redhat.com>

lutter has set the watchcommits acl on ruby-libvirt (Fedora 10) to Approved for virtmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ruby-libvirt



From rathann at fedoraproject.org  Mon Jan 19 18:11:56 2009
From: rathann at fedoraproject.org (Dominik Mierzejewski)
Date: Mon, 19 Jan 2009 18:11:56 +0000 (UTC)
Subject: rpms/mkvtoolnix/devel .cvsignore, 1.7, 1.8 mkvtoolnix.spec, 1.18,
	1.19 sources, 1.7, 1.8 mkvtoolnix-boost-lib64.patch, 1.1, NONE
Message-ID: <20090119181156.F3071700F8@cvs1.fedora.phx.redhat.com>

Author: rathann

Update of /cvs/pkgs/rpms/mkvtoolnix/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17498

Modified Files:
	.cvsignore mkvtoolnix.spec sources 
Removed Files:
	mkvtoolnix-boost-lib64.patch 
Log Message:
* Mon Jan 19 2009 Dominik Mierzejewski <rpm at greysector.net> 2.4.1-1
- updated to 2.4.1
- dropped obsolete boost detection patch



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mkvtoolnix/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	30 Nov 2008 21:32:21 -0000	1.7
+++ .cvsignore	19 Jan 2009 18:11:26 -0000	1.8
@@ -1 +1 @@
-mkvtoolnix-2.4.0.tar.bz2
+mkvtoolnix-2.4.1.tar.bz2


Index: mkvtoolnix.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mkvtoolnix/devel/mkvtoolnix.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- mkvtoolnix.spec	18 Dec 2008 06:20:15 -0000	1.18
+++ mkvtoolnix.spec	19 Jan 2009 18:11:26 -0000	1.19
@@ -1,13 +1,12 @@
 Summary: Matroska container manipulation utilities
 Name: mkvtoolnix
-Version: 2.4.0
-Release: 4%{?dist}
+Version: 2.4.1
+Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/Multimedia
 Source0: http://www.bunkus.org/videotools/mkvtoolnix/sources/%{name}-%{version}.tar.bz2
 Source1: mmg.desktop
 Source2: mkvinfo.desktop
-Patch1: %{name}-boost-lib64.patch
 URL: http://www.bunkus.org/videotools/mkvtoolnix/index.html
 BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
 BuildRequires: boost-devel
@@ -38,7 +37,6 @@
 
 %prep
 %setup -q
-%patch1 -p1 -b .lib64
 sed -i -e 's/"-O3"/""/' configure*
 for file in AUTHORS ChangeLog ; do
   iconv -f iso8859-1 -t utf8 $file >$file.utf && \
@@ -113,6 +111,10 @@
 %{_datadir}/icons/hicolor/32x32/apps/mmg.xpm
 
 %changelog
+* Mon Jan 19 2009 Dominik Mierzejewski <rpm at greysector.net> 2.4.1-1
+- updated to 2.4.1
+- dropped obsolete boost detection patch
+
 * Wed Dec 17 2008 Benjamin Kosnik  <bkoz at redhat.com> 2.4.0-4
 - Rebuild for boost-1.37.0.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mkvtoolnix/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	30 Nov 2008 21:32:21 -0000	1.7
+++ sources	19 Jan 2009 18:11:26 -0000	1.8
@@ -1 +1 @@
-125a6305de16236754d7554fa5b597cf  mkvtoolnix-2.4.0.tar.bz2
+b3f3763e3bc09aa797f6d65ad4974108  mkvtoolnix-2.4.1.tar.bz2


--- mkvtoolnix-boost-lib64.patch DELETED ---



From spot at fedoraproject.org  Mon Jan 19 18:28:05 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Mon, 19 Jan 2009 18:28:05 +0000 (UTC)
Subject: rpms/pyke/F-10 pyke.spec,1.4,1.5 sources,1.5,1.6
Message-ID: <20090119182805.6606F700F8@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/pyke/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19128/F-10

Modified Files:
	pyke.spec sources 
Log Message:
update to 0.7


Index: pyke.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pyke/F-10/pyke.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- pyke.spec	6 Jan 2009 21:51:45 -0000	1.4
+++ pyke.spec	19 Jan 2009 18:27:35 -0000	1.5
@@ -2,7 +2,7 @@
 
 Name:			pyke
 Summary: 		Knowledge-based inference engine
-Version:		0.6
+Version:		0.7
 Release:		1%{?dist}
 License:		MIT
 Group:			System Environment/Libraries
@@ -42,6 +42,9 @@
 %{python_sitelib}/%{name}-%{version}*.egg-info/
 
 %changelog
+* Mon Jan 19 2009 Tom "spot" Callaway <tcallawa at redhat.com> 0.7-1
+- update to 0.7
+
 * Tue Jan  6 2009 Tom "spot" Callaway <tcallawa at redhat.com> 0.6-1
 - update to 0.6
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pyke/F-10/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	6 Jan 2009 21:51:45 -0000	1.5
+++ sources	19 Jan 2009 18:27:35 -0000	1.6
@@ -1 +1 @@
-ecd21dfb4f190577f39b17cb43c7cc47  pyke-0.6.tar.gz
+243c362cb0aafa2103449779b734f3a1  pyke-0.7.tar.gz



From spot at fedoraproject.org  Mon Jan 19 18:28:05 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Mon, 19 Jan 2009 18:28:05 +0000 (UTC)
Subject: rpms/pyke/F-9 pyke.spec,1.3,1.4 sources,1.4,1.5
Message-ID: <20090119182805.A0084700F8@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/pyke/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19128/F-9

Modified Files:
	pyke.spec sources 
Log Message:
update to 0.7


Index: pyke.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pyke/F-9/pyke.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- pyke.spec	6 Jan 2009 21:51:45 -0000	1.3
+++ pyke.spec	19 Jan 2009 18:27:35 -0000	1.4
@@ -2,7 +2,7 @@
 
 Name:			pyke
 Summary: 		Knowledge-based inference engine
-Version:		0.6
+Version:		0.7
 Release:		1%{?dist}
 License:		MIT
 Group:			System Environment/Libraries
@@ -42,6 +42,9 @@
 %{python_sitelib}/%{name}-%{version}*.egg-info/
 
 %changelog
+* Mon Jan 19 2009 Tom "spot" Callaway <tcallawa at redhat.com> 0.7-1
+- update to 0.7
+
 * Tue Jan  6 2009 Tom "spot" Callaway <tcallawa at redhat.com> 0.6-1
 - update to 0.6
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pyke/F-9/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	6 Jan 2009 21:51:45 -0000	1.4
+++ sources	19 Jan 2009 18:27:35 -0000	1.5
@@ -1 +1 @@
-ecd21dfb4f190577f39b17cb43c7cc47  pyke-0.6.tar.gz
+243c362cb0aafa2103449779b734f3a1  pyke-0.7.tar.gz



From dwalsh at fedoraproject.org  Mon Jan 19 18:28:00 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Mon, 19 Jan 2009 18:28:00 +0000 (UTC)
Subject: rpms/setroubleshoot/devel setroubleshoot.spec,1.115,1.116
Message-ID: <20090119182800.B6FA8700F8@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/setroubleshoot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19186

Modified Files:
	setroubleshoot.spec 
Log Message:
* Fri Jan 16 2009 Dan Walsh <dwalsh at redhat.com> - 2.1.1-1
- Switch to C Based applet
- Use dbus for messaging.  Only run setroubleshoot when 



Index: setroubleshoot.spec
===================================================================
RCS file: /cvs/extras/rpms/setroubleshoot/devel/setroubleshoot.spec,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -r1.115 -r1.116
--- setroubleshoot.spec	19 Jan 2009 16:02:20 -0000	1.115
+++ setroubleshoot.spec	19 Jan 2009 18:27:30 -0000	1.116
@@ -10,7 +10,7 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: perl-XML-Parser
 BuildRequires: intltool gettext python
-BuildRequires: desktop-file-utils dbus-devel gtk2-devel libnotify-devel audit-devel
+BuildRequires: desktop-file-utils dbus-devel gtk2-devel libnotify-devel audit-libs-devel
 Requires: %{name}-server = %{version}-%{release} 
 Requires: %{name}-plugins >= 2.0.4
 Requires: pygtk2 >= 2.9.2



From spot at fedoraproject.org  Mon Jan 19 18:28:05 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Mon, 19 Jan 2009 18:28:05 +0000 (UTC)
Subject: rpms/pyke/devel .cvsignore, 1.4, 1.5 pyke.spec, 1.5, 1.6 sources,
	1.5, 1.6
Message-ID: <20090119182805.D8D27700F8@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/pyke/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19128/devel

Modified Files:
	.cvsignore pyke.spec sources 
Log Message:
update to 0.7


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pyke/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	11 Nov 2008 17:08:21 -0000	1.4
+++ .cvsignore	19 Jan 2009 18:27:35 -0000	1.5
@@ -1 +1 @@
-pyke-0.5.tar.gz
+pyke-0.7.tar.gz


Index: pyke.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pyke/devel/pyke.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- pyke.spec	6 Jan 2009 21:51:46 -0000	1.5
+++ pyke.spec	19 Jan 2009 18:27:35 -0000	1.6
@@ -2,7 +2,7 @@
 
 Name:			pyke
 Summary: 		Knowledge-based inference engine
-Version:		0.6
+Version:		0.7
 Release:		1%{?dist}
 License:		MIT
 Group:			System Environment/Libraries
@@ -42,6 +42,9 @@
 %{python_sitelib}/%{name}-%{version}*.egg-info/
 
 %changelog
+* Mon Jan 19 2009 Tom "spot" Callaway <tcallawa at redhat.com> 0.7-1
+- update to 0.7
+
 * Tue Jan  6 2009 Tom "spot" Callaway <tcallawa at redhat.com> 0.6-1
 - update to 0.6
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pyke/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	6 Jan 2009 21:51:46 -0000	1.5
+++ sources	19 Jan 2009 18:27:35 -0000	1.6
@@ -1 +1 @@
-ecd21dfb4f190577f39b17cb43c7cc47  pyke-0.6.tar.gz
+243c362cb0aafa2103449779b734f3a1  pyke-0.7.tar.gz



From corsepiu at fedoraproject.org  Mon Jan 19 18:29:36 2009
From: corsepiu at fedoraproject.org (=?utf-8?q?Ralf_Cors=C3=A9pius?=)
Date: Mon, 19 Jan 2009 18:29:36 +0000 (UTC)
Subject: rpms/perl-ExtUtils-PkgConfig/devel perl-ExtUtils-PkgConfig.spec,
	1.15, 1.16
Message-ID: <20090119182936.A77C6700F8@cvs1.fedora.phx.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-ExtUtils-PkgConfig/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19558

Modified Files:
	perl-ExtUtils-PkgConfig.spec 
Log Message:
* Mon Jan 19 2009 Ralf Cors??pius <corsepiu at fedoraproject.org> - 1.12-1
- Upstream update.



Index: perl-ExtUtils-PkgConfig.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-ExtUtils-PkgConfig/devel/perl-ExtUtils-PkgConfig.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- perl-ExtUtils-PkgConfig.spec	9 Jul 2008 11:14:03 -0000	1.15
+++ perl-ExtUtils-PkgConfig.spec	19 Jan 2009 18:29:06 -0000	1.16
@@ -1,5 +1,5 @@
 Name:           perl-ExtUtils-PkgConfig
-Version:        1.11
+Version:        1.12
 Release:        1%{?dist}
 Summary:        Simplistic interface to pkg-config
 
@@ -59,6 +59,9 @@
 
 
 %changelog
+* Mon Jan 19 2009 Ralf Cors??pius <corsepiu at fedoraproject.org> - 1.12-1
+- Upstream update.
+
 * Wed Jul 09 2008 Ralf Cors??pius <rc040203 at freenet.de> - 1.11-1
 - Upstream update.
 - Reflect Source0-URL having changed.



From corsepiu at fedoraproject.org  Mon Jan 19 18:30:23 2009
From: corsepiu at fedoraproject.org (=?utf-8?q?Ralf_Cors=C3=A9pius?=)
Date: Mon, 19 Jan 2009 18:30:23 +0000 (UTC)
Subject: rpms/perl-ExtUtils-PkgConfig/devel .cvsignore, 1.5, 1.6 sources, 1.5,
	1.6
Message-ID: <20090119183023.31BE9700F8@cvs1.fedora.phx.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-ExtUtils-PkgConfig/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19720

Modified Files:
	.cvsignore sources 
Log Message:
* Mon Jan 19 2009 Ralf Cors??pius <corsepiu at fedoraproject.org> - 1.12-1
- Upstream update.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-ExtUtils-PkgConfig/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	9 Jul 2008 11:14:03 -0000	1.5
+++ .cvsignore	19 Jan 2009 18:30:22 -0000	1.6
@@ -1 +1 @@
-ExtUtils-PkgConfig-1.11.tar.gz
+ExtUtils-PkgConfig-1.12.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-ExtUtils-PkgConfig/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	9 Jul 2008 11:14:03 -0000	1.5
+++ sources	19 Jan 2009 18:30:22 -0000	1.6
@@ -1 +1 @@
-cd68998c1f370d6c48042447f76ede9f  ExtUtils-PkgConfig-1.11.tar.gz
+8fc5c0b30cfda2048ec87ae418cc3508  ExtUtils-PkgConfig-1.12.tar.gz



From dwalsh at fedoraproject.org  Mon Jan 19 18:37:39 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Mon, 19 Jan 2009 18:37:39 +0000 (UTC)
Subject: rpms/selinux-policy/devel policy-20090105.patch,1.8,1.9
Message-ID: <20090119183739.D82A0700F8@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21194

Modified Files:
	policy-20090105.patch 
Log Message:
* Mon Jan 19 2009 Dan Walsh <dwalsh at redhat.com> 3.6.3-1
- Update to upstream


policy-20090105.patch:

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.8 -r 1.9 policy-20090105.patch
Index: policy-20090105.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-20090105.patch,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- policy-20090105.patch	19 Jan 2009 17:35:43 -0000	1.8
+++ policy-20090105.patch	19 Jan 2009 18:37:38 -0000	1.9
@@ -1,6 +1,6 @@
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/default_contexts serefpolicy-3.6.3/config/appconfig-mcs/default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/default_contexts	2008-11-11 16:13:50.000000000 -0500
-+++ serefpolicy-3.6.3/config/appconfig-mcs/default_contexts	2009-01-19 12:34:01.000000000 -0500
++++ serefpolicy-3.6.3/config/appconfig-mcs/default_contexts	2009-01-19 13:10:02.000000000 -0500
 @@ -1,15 +1,6 @@
 -system_r:crond_t:s0		user_r:cronjob_t:s0 staff_r:cronjob_t:s0 sysadm_r:cronjob_t:s0 system_r:cronjob_t:s0 unconfined_r:unconfined_cronjob_t:s0
 -system_r:local_login_t:s0	user_r:user_t:s0 staff_r:staff_t:s0 sysadm_r:sysadm_t:s0 unconfined_r:unconfined_t:s0
@@ -24,13 +24,13 @@
 +system_r:xdm_t:s0		user_r:user_t:s0
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/failsafe_context serefpolicy-3.6.3/config/appconfig-mcs/failsafe_context
 --- nsaserefpolicy/config/appconfig-mcs/failsafe_context	2008-08-07 11:15:14.000000000 -0400
-+++ serefpolicy-3.6.3/config/appconfig-mcs/failsafe_context	2009-01-19 12:34:01.000000000 -0500
++++ serefpolicy-3.6.3/config/appconfig-mcs/failsafe_context	2009-01-19 13:10:02.000000000 -0500
 @@ -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.6.3/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.6.3/config/appconfig-mcs/guest_u_default_contexts	2009-01-19 12:34:01.000000000 -0500
++++ serefpolicy-3.6.3/config/appconfig-mcs/guest_u_default_contexts	2009-01-19 13:10:02.000000000 -0500
 @@ -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
@@ -40,7 +40,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.6.3/config/appconfig-mcs/root_default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/root_default_contexts	2008-11-11 16:13:50.000000000 -0500
-+++ serefpolicy-3.6.3/config/appconfig-mcs/root_default_contexts	2009-01-19 12:34:01.000000000 -0500
++++ serefpolicy-3.6.3/config/appconfig-mcs/root_default_contexts	2009-01-19 13:10:02.000000000 -0500
 @@ -1,11 +1,7 @@
 -system_r:crond_t:s0		unconfined_r:unconfined_t:s0 sysadm_r:cronjob_t:s0 staff_r:cronjob_t:s0 user_r:cronjob_t:s0
 +system_r:crond_t:s0		unconfined_r:unconfined_t:s0 sysadm_r:sysadm_t:s0 staff_r:staff_t:s0 user_r:user_t:s0
@@ -57,7 +57,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/seusers serefpolicy-3.6.3/config/appconfig-mcs/seusers
 --- nsaserefpolicy/config/appconfig-mcs/seusers	2008-08-07 11:15:14.000000000 -0400
-+++ serefpolicy-3.6.3/config/appconfig-mcs/seusers	2009-01-19 12:34:01.000000000 -0500
++++ serefpolicy-3.6.3/config/appconfig-mcs/seusers	2009-01-19 13:10:02.000000000 -0500
 @@ -1,3 +1,3 @@
  system_u:system_u:s0-mcs_systemhigh
 -root:root:s0-mcs_systemhigh
@@ -66,7 +66,7 @@
 +__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.6.3/config/appconfig-mcs/staff_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/staff_u_default_contexts	2008-11-11 16:13:50.000000000 -0500
-+++ serefpolicy-3.6.3/config/appconfig-mcs/staff_u_default_contexts	2009-01-19 12:34:01.000000000 -0500
++++ serefpolicy-3.6.3/config/appconfig-mcs/staff_u_default_contexts	2009-01-19 13:10:02.000000000 -0500
 @@ -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
@@ -83,7 +83,7 @@
  
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/unconfined_u_default_contexts serefpolicy-3.6.3/config/appconfig-mcs/unconfined_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/unconfined_u_default_contexts	2008-11-11 16:13:50.000000000 -0500
-+++ serefpolicy-3.6.3/config/appconfig-mcs/unconfined_u_default_contexts	2009-01-19 12:34:01.000000000 -0500
++++ serefpolicy-3.6.3/config/appconfig-mcs/unconfined_u_default_contexts	2009-01-19 13:10:02.000000000 -0500
 @@ -1,4 +1,4 @@
 -system_r:crond_t:s0		unconfined_r:unconfined_t:s0 unconfined_r:unconfined_cronjob_t:s0
 +system_r:crond_t:s0		unconfined_r:unconfined_t:s0
@@ -99,13 +99,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/userhelper_context serefpolicy-3.6.3/config/appconfig-mcs/userhelper_context
 --- nsaserefpolicy/config/appconfig-mcs/userhelper_context	2008-08-07 11:15:14.000000000 -0400
-+++ serefpolicy-3.6.3/config/appconfig-mcs/userhelper_context	2009-01-19 12:34:01.000000000 -0500
++++ serefpolicy-3.6.3/config/appconfig-mcs/userhelper_context	2009-01-19 13:10:02.000000000 -0500
 @@ -1 +1 @@
 -system_u:sysadm_r:sysadm_t:s0
 +system_u:system_r:unconfined_t:s0	
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/user_u_default_contexts serefpolicy-3.6.3/config/appconfig-mcs/user_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/user_u_default_contexts	2008-11-11 16:13:50.000000000 -0500
-+++ serefpolicy-3.6.3/config/appconfig-mcs/user_u_default_contexts	2009-01-19 12:34:01.000000000 -0500
++++ serefpolicy-3.6.3/config/appconfig-mcs/user_u_default_contexts	2009-01-19 13:10:02.000000000 -0500
 @@ -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
@@ -120,7 +120,7 @@
 +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/xguest_u_default_contexts serefpolicy-3.6.3/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.6.3/config/appconfig-mcs/xguest_u_default_contexts	2009-01-19 12:34:01.000000000 -0500
++++ serefpolicy-3.6.3/config/appconfig-mcs/xguest_u_default_contexts	2009-01-19 13:10:02.000000000 -0500
 @@ -0,0 +1,7 @@
 +system_r:local_login_t	xguest_r:xguest_t:s0
 +system_r:remote_login_t	xguest_r:xguest_t:s0
@@ -131,7 +131,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/default_contexts serefpolicy-3.6.3/config/appconfig-mls/default_contexts
 --- nsaserefpolicy/config/appconfig-mls/default_contexts	2008-11-11 16:13:50.000000000 -0500
-+++ serefpolicy-3.6.3/config/appconfig-mls/default_contexts	2009-01-19 12:34:01.000000000 -0500
++++ serefpolicy-3.6.3/config/appconfig-mls/default_contexts	2009-01-19 13:10:02.000000000 -0500
 @@ -1,15 +1,6 @@
 -system_r:crond_t:s0		user_r:cronjob_t:s0 staff_r:cronjob_t:s0 sysadm_r:cronjob_t:s0 system_r:cronjob_t:s0 unconfined_r:unconfined_cronjob_t:s0
 -system_r:local_login_t:s0	user_r:user_t:s0 staff_r:staff_t:s0 sysadm_r:sysadm_t:s0 unconfined_r:unconfined_t:s0
@@ -155,7 +155,7 @@
 +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.6.3/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.6.3/config/appconfig-mls/guest_u_default_contexts	2009-01-19 12:34:01.000000000 -0500
++++ serefpolicy-3.6.3/config/appconfig-mls/guest_u_default_contexts	2009-01-19 13:10:02.000000000 -0500
 @@ -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
@@ -163,7 +163,7 @@
 +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.6.3/config/appconfig-mls/root_default_contexts
 --- nsaserefpolicy/config/appconfig-mls/root_default_contexts	2008-11-11 16:13:50.000000000 -0500
-+++ serefpolicy-3.6.3/config/appconfig-mls/root_default_contexts	2009-01-19 12:34:01.000000000 -0500
++++ serefpolicy-3.6.3/config/appconfig-mls/root_default_contexts	2009-01-19 13:10:02.000000000 -0500
 @@ -1,11 +1,11 @@
 -system_r:crond_t:s0		unconfined_r:unconfined_t:s0 sysadm_r:cronjob_t:s0 staff_r:cronjob_t:s0 user_r:cronjob_t:s0
 -system_r:local_login_t:s0	unconfined_r:unconfined_t:s0 sysadm_r:sysadm_t:s0 staff_r:staff_t:s0 user_r:user_t:s0
@@ -184,7 +184,7 @@
 +#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/xguest_u_default_contexts serefpolicy-3.6.3/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.6.3/config/appconfig-mls/xguest_u_default_contexts	2009-01-19 12:34:01.000000000 -0500
++++ serefpolicy-3.6.3/config/appconfig-mls/xguest_u_default_contexts	2009-01-19 13:10:02.000000000 -0500
 @@ -0,0 +1,7 @@
 +system_r:local_login_t	xguest_r:xguest_t:s0
 +system_r:remote_login_t	xguest_r:xguest_t:s0
@@ -195,7 +195,7 @@
 +xguest_r:xguest_t:s0	xguest_r:xguest_t:s0
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/Makefile serefpolicy-3.6.3/Makefile
 --- nsaserefpolicy/Makefile	2009-01-19 11:07:35.000000000 -0500
-+++ serefpolicy-3.6.3/Makefile	2009-01-19 12:34:01.000000000 -0500
++++ serefpolicy-3.6.3/Makefile	2009-01-19 13:10:02.000000000 -0500
 @@ -315,20 +315,22 @@
  
  # parse-rolemap modulename,outputfile
@@ -251,7 +251,7 @@
  	$(verbose) $(INSTALL) -m 644 $< $@
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/man/man8/httpd_selinux.8 serefpolicy-3.6.3/man/man8/httpd_selinux.8
 --- nsaserefpolicy/man/man8/httpd_selinux.8	2008-08-25 09:12:31.000000000 -0400
-+++ serefpolicy-3.6.3/man/man8/httpd_selinux.8	2009-01-19 12:34:01.000000000 -0500
++++ serefpolicy-3.6.3/man/man8/httpd_selinux.8	2009-01-19 13:10:02.000000000 -0500
 @@ -41,7 +41,7 @@
  - Set cgi scripts with httpd_unconfined_script_exec_t to allow them to run without any SELinux protection. This should only be used for a very complex httpd scripts, after exhausting all other options.  It is better to use this script rather than turning off SELinux protection for httpd.
  
@@ -272,7 +272,7 @@
  setsebool -P httpd_tty_comm 1
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/man/man8/kerberos_selinux.8 serefpolicy-3.6.3/man/man8/kerberos_selinux.8
 --- nsaserefpolicy/man/man8/kerberos_selinux.8	2008-08-07 11:15:14.000000000 -0400
-+++ serefpolicy-3.6.3/man/man8/kerberos_selinux.8	2009-01-19 12:34:01.000000000 -0500
++++ serefpolicy-3.6.3/man/man8/kerberos_selinux.8	2009-01-19 13:10:02.000000000 -0500
 @@ -12,7 +12,7 @@
  .SH "DESCRIPTION"
  
@@ -284,7 +284,7 @@
  You must set the allow_kerberos boolean to allow your system to work properly in a Kerberos environment.
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/man/man8/nfs_selinux.8 serefpolicy-3.6.3/man/man8/nfs_selinux.8
 --- nsaserefpolicy/man/man8/nfs_selinux.8	2008-08-07 11:15:14.000000000 -0400
-+++ serefpolicy-3.6.3/man/man8/nfs_selinux.8	2009-01-19 12:34:01.000000000 -0500
++++ serefpolicy-3.6.3/man/man8/nfs_selinux.8	2009-01-19 13:10:02.000000000 -0500
 @@ -26,5 +26,5 @@
  .SH AUTHOR	
  This manual page was written by Dan Walsh <dwalsh at redhat.com>.
@@ -294,7 +294,7 @@
  selinux(8), chcon(1), setsebool(8)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/man/man8/samba_selinux.8 serefpolicy-3.6.3/man/man8/samba_selinux.8
 --- nsaserefpolicy/man/man8/samba_selinux.8	2008-08-07 11:15:14.000000000 -0400
-+++ serefpolicy-3.6.3/man/man8/samba_selinux.8	2009-01-19 12:34:01.000000000 -0500
++++ serefpolicy-3.6.3/man/man8/samba_selinux.8	2009-01-19 13:10:02.000000000 -0500
 @@ -14,11 +14,17 @@
  .TP
  chcon -t samba_share_t /var/eng
@@ -318,7 +318,7 @@
  If you want to share files with multiple domains (Apache, FTP, rsync, Samba), you can set a file context of public_content_t and public_content_rw_t.  These context allow any of the above domains to read the content.  If you want a particular domain to write to the public_content_rw_t domain, you must set the appropriate boolean.  allow_DOMAIN_anon_write.  So for samba you would execute:
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/flask/access_vectors serefpolicy-3.6.3/policy/flask/access_vectors
 --- nsaserefpolicy/policy/flask/access_vectors	2009-01-05 17:53:53.000000000 -0500
-+++ serefpolicy-3.6.3/policy/flask/access_vectors	2009-01-19 12:34:01.000000000 -0500
++++ serefpolicy-3.6.3/policy/flask/access_vectors	2009-01-19 13:10:02.000000000 -0500
 @@ -616,6 +616,7 @@
  	nlmsg_write
  	nlmsg_relay
@@ -329,7 +329,7 @@
  class netlink_ip6fw_socket
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/global_tunables serefpolicy-3.6.3/policy/global_tunables
 --- nsaserefpolicy/policy/global_tunables	2008-11-11 16:13:50.000000000 -0500
-+++ serefpolicy-3.6.3/policy/global_tunables	2009-01-19 12:34:01.000000000 -0500
++++ serefpolicy-3.6.3/policy/global_tunables	2009-01-19 13:10:02.000000000 -0500
 @@ -61,15 +61,6 @@
  
  ## <desc>
@@ -361,7 +361,7 @@
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/anaconda.te serefpolicy-3.6.3/policy/modules/admin/anaconda.te
 --- nsaserefpolicy/policy/modules/admin/anaconda.te	2009-01-05 15:39:44.000000000 -0500
-+++ serefpolicy-3.6.3/policy/modules/admin/anaconda.te	2009-01-19 12:34:01.000000000 -0500
++++ serefpolicy-3.6.3/policy/modules/admin/anaconda.te	2009-01-19 13:10:02.000000000 -0500
 @@ -31,6 +31,7 @@
  modutils_domtrans_insmod(anaconda_t)
[...2791 lines suppressed...]
  /etc/selinux(/.*)?			gen_context(system_u:object_r:selinux_config_t,s0)
  /etc/selinux/([^/]*/)?contexts(/.*)?	gen_context(system_u:object_r:default_context_t,s0)
@@ -24264,7 +24292,7 @@
 +/etc/share/selinux/mls(/.*)?		gen_context(system_u:object_r:semanage_store_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.if serefpolicy-3.6.3/policy/modules/system/selinuxutil.if
 --- nsaserefpolicy/policy/modules/system/selinuxutil.if	2009-01-05 15:39:43.000000000 -0500
-+++ serefpolicy-3.6.3/policy/modules/system/selinuxutil.if	2009-01-19 12:34:01.000000000 -0500
++++ serefpolicy-3.6.3/policy/modules/system/selinuxutil.if	2009-01-19 13:10:02.000000000 -0500
 @@ -535,6 +535,53 @@
  
  ########################################
@@ -24655,7 +24683,7 @@
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.te serefpolicy-3.6.3/policy/modules/system/selinuxutil.te
 --- nsaserefpolicy/policy/modules/system/selinuxutil.te	2009-01-19 11:07:34.000000000 -0500
-+++ serefpolicy-3.6.3/policy/modules/system/selinuxutil.te	2009-01-19 12:34:01.000000000 -0500
++++ serefpolicy-3.6.3/policy/modules/system/selinuxutil.te	2009-01-19 13:10:02.000000000 -0500
 @@ -23,6 +23,9 @@
  type selinux_config_t;
  files_type(selinux_config_t)
@@ -25014,7 +25042,7 @@
  ')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/setrans.if serefpolicy-3.6.3/policy/modules/system/setrans.if
 --- nsaserefpolicy/policy/modules/system/setrans.if	2008-08-07 11:15:12.000000000 -0400
-+++ serefpolicy-3.6.3/policy/modules/system/setrans.if	2009-01-19 12:34:01.000000000 -0500
++++ serefpolicy-3.6.3/policy/modules/system/setrans.if	2009-01-19 13:10:02.000000000 -0500
 @@ -21,3 +21,23 @@
  	stream_connect_pattern($1,setrans_var_run_t,setrans_var_run_t,setrans_t)
  	files_list_pids($1)
@@ -25041,7 +25069,7 @@
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/sysnetwork.fc serefpolicy-3.6.3/policy/modules/system/sysnetwork.fc
 --- nsaserefpolicy/policy/modules/system/sysnetwork.fc	2008-08-07 11:15:12.000000000 -0400
-+++ serefpolicy-3.6.3/policy/modules/system/sysnetwork.fc	2009-01-19 12:34:01.000000000 -0500
++++ serefpolicy-3.6.3/policy/modules/system/sysnetwork.fc	2009-01-19 13:10:02.000000000 -0500
 @@ -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)
@@ -25066,7 +25094,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.6.3/policy/modules/system/sysnetwork.if
 --- nsaserefpolicy/policy/modules/system/sysnetwork.if	2009-01-19 11:07:34.000000000 -0500
-+++ serefpolicy-3.6.3/policy/modules/system/sysnetwork.if	2009-01-19 12:34:01.000000000 -0500
++++ serefpolicy-3.6.3/policy/modules/system/sysnetwork.if	2009-01-19 13:10:02.000000000 -0500
 @@ -192,7 +192,25 @@
  		type dhcpc_state_t;
  	')
@@ -25178,7 +25206,7 @@
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/sysnetwork.te serefpolicy-3.6.3/policy/modules/system/sysnetwork.te
 --- nsaserefpolicy/policy/modules/system/sysnetwork.te	2009-01-19 11:07:34.000000000 -0500
-+++ serefpolicy-3.6.3/policy/modules/system/sysnetwork.te	2009-01-19 12:34:01.000000000 -0500
++++ serefpolicy-3.6.3/policy/modules/system/sysnetwork.te	2009-01-19 13:10:02.000000000 -0500
 @@ -20,6 +20,9 @@
  init_daemon_domain(dhcpc_t,dhcpc_exec_t)
  role system_r types dhcpc_t;
@@ -25355,7 +25383,7 @@
  	xen_append_log(ifconfig_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/udev.fc serefpolicy-3.6.3/policy/modules/system/udev.fc
 --- nsaserefpolicy/policy/modules/system/udev.fc	2009-01-05 15:39:43.000000000 -0500
-+++ serefpolicy-3.6.3/policy/modules/system/udev.fc	2009-01-19 12:34:01.000000000 -0500
++++ serefpolicy-3.6.3/policy/modules/system/udev.fc	2009-01-19 13:10:02.000000000 -0500
 @@ -17,3 +17,5 @@
  /sbin/wait_for_sysfs -- gen_context(system_u:object_r:udev_exec_t,s0)
  
@@ -25364,7 +25392,7 @@
 +/var/run/PackageKit/udev(/.*)?		gen_context(system_u:object_r:udev_var_run_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/udev.if serefpolicy-3.6.3/policy/modules/system/udev.if
 --- nsaserefpolicy/policy/modules/system/udev.if	2008-08-07 11:15:12.000000000 -0400
-+++ serefpolicy-3.6.3/policy/modules/system/udev.if	2009-01-19 12:34:01.000000000 -0500
++++ serefpolicy-3.6.3/policy/modules/system/udev.if	2009-01-19 13:10:02.000000000 -0500
 @@ -96,6 +96,24 @@
  
  ########################################
@@ -25420,7 +25448,7 @@
  ')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/udev.te serefpolicy-3.6.3/policy/modules/system/udev.te
 --- nsaserefpolicy/policy/modules/system/udev.te	2009-01-05 15:39:43.000000000 -0500
-+++ serefpolicy-3.6.3/policy/modules/system/udev.te	2009-01-19 12:34:01.000000000 -0500
++++ serefpolicy-3.6.3/policy/modules/system/udev.te	2009-01-19 13:10:02.000000000 -0500
 @@ -83,6 +83,7 @@
  kernel_rw_unix_dgram_sockets(udev_t)
  kernel_dgram_send(udev_t)
@@ -25479,7 +25507,7 @@
  ')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.fc serefpolicy-3.6.3/policy/modules/system/unconfined.fc
 --- nsaserefpolicy/policy/modules/system/unconfined.fc	2008-09-11 16:42:49.000000000 -0400
-+++ serefpolicy-3.6.3/policy/modules/system/unconfined.fc	2009-01-19 12:34:01.000000000 -0500
++++ serefpolicy-3.6.3/policy/modules/system/unconfined.fc	2009-01-19 13:10:02.000000000 -0500
 @@ -2,15 +2,28 @@
  # e.g.:
  # /usr/local/bin/appsrv		--	gen_context(system_u:object_r:unconfined_exec_t,s0)
@@ -25520,7 +25548,7 @@
 +/opt/real/(.*/)?realplay\.bin --	gen_context(system_u:object_r:execmem_exec_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.if serefpolicy-3.6.3/policy/modules/system/unconfined.if
 --- nsaserefpolicy/policy/modules/system/unconfined.if	2008-11-11 16:13:48.000000000 -0500
-+++ serefpolicy-3.6.3/policy/modules/system/unconfined.if	2009-01-19 12:34:01.000000000 -0500
++++ serefpolicy-3.6.3/policy/modules/system/unconfined.if	2009-01-19 13:10:02.000000000 -0500
 @@ -12,14 +12,13 @@
  #
  interface(`unconfined_domain_noaudit',`
@@ -25756,7 +25784,7 @@
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.te serefpolicy-3.6.3/policy/modules/system/unconfined.te
 --- nsaserefpolicy/policy/modules/system/unconfined.te	2008-11-11 16:13:48.000000000 -0500
-+++ serefpolicy-3.6.3/policy/modules/system/unconfined.te	2009-01-19 12:34:01.000000000 -0500
++++ serefpolicy-3.6.3/policy/modules/system/unconfined.te	2009-01-19 13:10:02.000000000 -0500
 @@ -6,35 +6,76 @@
  # Declarations
  #
@@ -26089,7 +26117,7 @@
 +gen_user(unconfined_u, user, unconfined_r system_r, s0, s0 - mls_systemhigh, mcs_allcats)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.fc serefpolicy-3.6.3/policy/modules/system/userdomain.fc
 --- nsaserefpolicy/policy/modules/system/userdomain.fc	2008-11-11 16:13:48.000000000 -0500
-+++ serefpolicy-3.6.3/policy/modules/system/userdomain.fc	2009-01-19 12:34:01.000000000 -0500
++++ serefpolicy-3.6.3/policy/modules/system/userdomain.fc	2009-01-19 13:10:02.000000000 -0500
 @@ -1,4 +1,7 @@
  HOME_DIR	-d	gen_context(system_u:object_r:user_home_dir_t,s0-mls_systemhigh)
 +HOME_DIR	-l	gen_context(system_u:object_r:user_home_dir_t,s0-mls_systemhigh)
@@ -26101,7 +26129,7 @@
 +/dev/shm/mono.*		gen_context(system_u:object_r:user_tmpfs_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-3.6.3/policy/modules/system/userdomain.if
 --- nsaserefpolicy/policy/modules/system/userdomain.if	2009-01-19 11:07:34.000000000 -0500
-+++ serefpolicy-3.6.3/policy/modules/system/userdomain.if	2009-01-19 12:34:01.000000000 -0500
++++ serefpolicy-3.6.3/policy/modules/system/userdomain.if	2009-01-19 13:10:02.000000000 -0500
 @@ -30,8 +30,9 @@
  	')
  
@@ -27735,7 +27763,7 @@
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-3.6.3/policy/modules/system/userdomain.te
 --- nsaserefpolicy/policy/modules/system/userdomain.te	2009-01-19 11:07:34.000000000 -0500
-+++ serefpolicy-3.6.3/policy/modules/system/userdomain.te	2009-01-19 12:34:01.000000000 -0500
++++ serefpolicy-3.6.3/policy/modules/system/userdomain.te	2009-01-19 13:10:02.000000000 -0500
 @@ -8,13 +8,6 @@
  
  ## <desc>
@@ -27799,7 +27827,7 @@
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.fc serefpolicy-3.6.3/policy/modules/system/xen.fc
 --- nsaserefpolicy/policy/modules/system/xen.fc	2009-01-05 15:39:43.000000000 -0500
-+++ serefpolicy-3.6.3/policy/modules/system/xen.fc	2009-01-19 12:34:01.000000000 -0500
++++ serefpolicy-3.6.3/policy/modules/system/xen.fc	2009-01-19 13:10:02.000000000 -0500
 @@ -2,17 +2,10 @@
  
  /usr/bin/virsh		--	gen_context(system_u:object_r:xm_exec_t,s0)
@@ -27828,7 +27856,7 @@
  
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.if serefpolicy-3.6.3/policy/modules/system/xen.if
 --- nsaserefpolicy/policy/modules/system/xen.if	2009-01-05 15:39:43.000000000 -0500
-+++ serefpolicy-3.6.3/policy/modules/system/xen.if	2009-01-19 12:34:01.000000000 -0500
++++ serefpolicy-3.6.3/policy/modules/system/xen.if	2009-01-19 13:10:02.000000000 -0500
 @@ -167,11 +167,14 @@
  #
  interface(`xen_stream_connect',`
@@ -27872,7 +27900,7 @@
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.te serefpolicy-3.6.3/policy/modules/system/xen.te
 --- nsaserefpolicy/policy/modules/system/xen.te	2009-01-19 11:07:34.000000000 -0500
-+++ serefpolicy-3.6.3/policy/modules/system/xen.te	2009-01-19 12:34:01.000000000 -0500
++++ serefpolicy-3.6.3/policy/modules/system/xen.te	2009-01-19 13:10:02.000000000 -0500
 @@ -6,6 +6,13 @@
  # Declarations
  #
@@ -28096,7 +28124,7 @@
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/support/obj_perm_sets.spt serefpolicy-3.6.3/policy/support/obj_perm_sets.spt
 --- nsaserefpolicy/policy/support/obj_perm_sets.spt	2008-10-16 17:21:16.000000000 -0400
-+++ serefpolicy-3.6.3/policy/support/obj_perm_sets.spt	2009-01-19 12:34:01.000000000 -0500
++++ serefpolicy-3.6.3/policy/support/obj_perm_sets.spt	2009-01-19 13:10:02.000000000 -0500
 @@ -179,20 +179,20 @@
  #
  # Directory (dir)
@@ -28143,7 +28171,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.6.3/policy/users
 --- nsaserefpolicy/policy/users	2008-08-07 11:15:13.000000000 -0400
-+++ serefpolicy-3.6.3/policy/users	2009-01-19 12:34:01.000000000 -0500
++++ serefpolicy-3.6.3/policy/users	2009-01-19 13:10:02.000000000 -0500
 @@ -25,11 +25,8 @@
  # permit any access to such users, then remove this entry.
  #
@@ -28170,7 +28198,7 @@
 +gen_user(root, user, unconfined_r sysadm_r staff_r ifdef(`enable_mls',`secadm_r auditadm_r') system_r, s0, s0 - mls_systemhigh, mcs_allcats)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/Rules.modular serefpolicy-3.6.3/Rules.modular
 --- nsaserefpolicy/Rules.modular	2008-11-11 16:13:50.000000000 -0500
-+++ serefpolicy-3.6.3/Rules.modular	2009-01-19 12:34:01.000000000 -0500
++++ serefpolicy-3.6.3/Rules.modular	2009-01-19 13:10:02.000000000 -0500
 @@ -73,8 +73,8 @@
  $(tmpdir)/%.mod: $(m4support) $(tmpdir)/generated_definitions.conf $(tmpdir)/all_interfaces.conf %.te
  	@echo "Compliling $(NAME) $(@F) module"
@@ -28202,7 +28230,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/support/Makefile.devel serefpolicy-3.6.3/support/Makefile.devel
 --- nsaserefpolicy/support/Makefile.devel	2008-11-11 16:13:50.000000000 -0500
-+++ serefpolicy-3.6.3/support/Makefile.devel	2009-01-19 12:34:01.000000000 -0500
++++ serefpolicy-3.6.3/support/Makefile.devel	2009-01-19 13:10:02.000000000 -0500
 @@ -185,8 +185,7 @@
  tmp/%.mod: $(m4support) tmp/all_interfaces.conf %.te
  	@$(EINFO) "Compiling $(NAME) $(basename $(@F)) module"



From spot at fedoraproject.org  Mon Jan 19 18:50:41 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Mon, 19 Jan 2009 18:50:41 +0000 (UTC)
Subject: rpms/asymptote/devel .cvsignore, 1.40, 1.41 asymptote.spec, 1.48,
	1.49 sources, 1.40, 1.41
Message-ID: <20090119185041.6E8F2700F8@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/asymptote/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22762

Modified Files:
	.cvsignore asymptote.spec sources 
Log Message:
1.59


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/asymptote/devel/.cvsignore,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- .cvsignore	12 Jan 2009 20:49:24 -0000	1.40
+++ .cvsignore	19 Jan 2009 18:50:10 -0000	1.41
@@ -1 +1 @@
-asymptote-1.58.src.tgz
+asymptote-1.59.src.tgz


Index: asymptote.spec
===================================================================
RCS file: /cvs/pkgs/rpms/asymptote/devel/asymptote.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- asymptote.spec	12 Jan 2009 20:49:24 -0000	1.48
+++ asymptote.spec	19 Jan 2009 18:50:10 -0000	1.49
@@ -4,7 +4,7 @@
 %define xemacs_sitelisp %{_datadir}/xemacs/site-packages/lisp
 
 Name:           asymptote
-Version:        1.58
+Version:        1.59
 Release:        1%{?dist}
 Summary:        Descriptive vector graphics language
 
@@ -140,6 +140,9 @@
 
 
 %changelog
+* Mon Jan 19 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 1.59-1
+- 1.59
+
 * Mon Jan 12 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 1.58-1
 - 1.58
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/asymptote/devel/sources,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- sources	12 Jan 2009 20:49:24 -0000	1.40
+++ sources	19 Jan 2009 18:50:11 -0000	1.41
@@ -1 +1 @@
-1a832a2a0286f517611641a67dcb5b13  asymptote-1.58.src.tgz
+9d7c25d9e3a24b0d9b63c98b5f676c89  asymptote-1.59.src.tgz



From pkgdb at fedoraproject.org  Mon Jan 19 18:58:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 18:58:37 +0000
Subject: [pkgdb] emacs: bpepple has given up commit
Message-ID: <20090119185837.9C650208E5D@bastion.fedora.phx.redhat.com>

bpepple has given up the commit acl on emacs (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/emacs



From pkgdb at fedoraproject.org  Mon Jan 19 18:58:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 18:58:39 +0000
Subject: [pkgdb] emacs: bpepple has given up watchcommits
Message-ID: <20090119185839.2B6E3208E5E@bastion.fedora.phx.redhat.com>

bpepple has given up the watchcommits acl on emacs (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/emacs



From pkgdb at fedoraproject.org  Mon Jan 19 18:58:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 18:58:40 +0000
Subject: [pkgdb] emacs: bpepple has given up approveacls
Message-ID: <20090119185840.A835A208E62@bastion.fedora.phx.redhat.com>

bpepple has given up the approveacls acl on emacs (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/emacs



From pkgdb at fedoraproject.org  Mon Jan 19 18:58:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 18:58:42 +0000
Subject: [pkgdb] emacs: bpepple has given up watchbugzilla
Message-ID: <20090119185843.8D6A4208E67@bastion.fedora.phx.redhat.com>

bpepple has given up the watchbugzilla acl on emacs (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/emacs



From pkgdb at fedoraproject.org  Mon Jan 19 18:59:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 18:59:40 +0000
Subject: [pkgdb] emacs: bpepple has given up watchbugzilla
Message-ID: <20090119185941.00CF8208701@bastion.fedora.phx.redhat.com>

bpepple has given up the watchbugzilla acl on emacs (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/emacs



From pkgdb at fedoraproject.org  Mon Jan 19 18:59:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 18:59:42 +0000
Subject: [pkgdb] emacs: bpepple has given up watchcommits
Message-ID: <20090119185942.A0DF6208DDF@bastion.fedora.phx.redhat.com>

bpepple has given up the watchcommits acl on emacs (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/emacs



From pkgdb at fedoraproject.org  Mon Jan 19 18:59:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 18:59:44 +0000
Subject: [pkgdb] emacs: bpepple has given up watchbugzilla
Message-ID: <20090119185944.E7174208E6A@bastion.fedora.phx.redhat.com>

bpepple has given up the watchbugzilla acl on emacs (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/emacs



From pkgdb at fedoraproject.org  Mon Jan 19 18:59:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 18:59:46 +0000
Subject: [pkgdb] emacs: bpepple has given up commit
Message-ID: <20090119185946.D939F208E6F@bastion.fedora.phx.redhat.com>

bpepple has given up the commit acl on emacs (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/emacs



From pkgdb at fedoraproject.org  Mon Jan 19 18:59:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 18:59:46 +0000
Subject: [pkgdb] emacs: bpepple has given up approveacls
Message-ID: <20090119185947.265B1208E74@bastion.fedora.phx.redhat.com>

bpepple has given up the approveacls acl on emacs (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/emacs



From pkgdb at fedoraproject.org  Mon Jan 19 18:59:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 18:59:47 +0000
Subject: [pkgdb] emacs: bpepple has given up commit
Message-ID: <20090119185947.460CD208E79@bastion.fedora.phx.redhat.com>

bpepple has given up the commit acl on emacs (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/emacs



From pkgdb at fedoraproject.org  Mon Jan 19 18:59:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 18:59:48 +0000
Subject: [pkgdb] emacs: bpepple has given up approveacls
Message-ID: <20090119185948.605E1208E7E@bastion.fedora.phx.redhat.com>

bpepple has given up the approveacls acl on emacs (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/emacs



From pkgdb at fedoraproject.org  Mon Jan 19 18:59:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 18:59:51 +0000
Subject: [pkgdb] emacs: bpepple has given up watchcommits
Message-ID: <20090119185951.D91A6208E83@bastion.fedora.phx.redhat.com>

bpepple has given up the watchcommits acl on emacs (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/emacs



From pkgdb at fedoraproject.org  Mon Jan 19 18:59:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 18:59:50 +0000
Subject: [pkgdb] emacs: bpepple has given up watchcommits
Message-ID: <20090119185952.A9FEA208E87@bastion.fedora.phx.redhat.com>

bpepple has given up the watchcommits acl on emacs (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/emacs



From pkgdb at fedoraproject.org  Mon Jan 19 18:59:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 18:59:54 +0000
Subject: [pkgdb] emacs: bpepple has given up approveacls
Message-ID: <20090119185954.9AAC9208E8B@bastion.fedora.phx.redhat.com>

bpepple has given up the approveacls acl on emacs (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/emacs



From pkgdb at fedoraproject.org  Mon Jan 19 18:59:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 18:59:55 +0000
Subject: [pkgdb] emacs: bpepple has given up watchbugzilla
Message-ID: <20090119185955.7C5E0208E8F@bastion.fedora.phx.redhat.com>

bpepple has given up the watchbugzilla acl on emacs (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/emacs



From pkgdb at fedoraproject.org  Mon Jan 19 18:59:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 18:59:55 +0000
Subject: [pkgdb] emacs: bpepple has given up commit
Message-ID: <20090119185955.A060D208E94@bastion.fedora.phx.redhat.com>

bpepple has given up the commit acl on emacs (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/emacs



From pkgdb at fedoraproject.org  Mon Jan 19 19:02:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 19:02:53 +0000
Subject: [pkgdb] astyle: bpepple has given up commit
Message-ID: <20090119190253.CD2AB208DE5@bastion.fedora.phx.redhat.com>

bpepple has given up the commit acl on astyle (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/astyle



From pkgdb at fedoraproject.org  Mon Jan 19 19:02:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 19:02:58 +0000
Subject: [pkgdb] astyle: bpepple has given up commit
Message-ID: <20090119190258.34FA3208DE8@bastion.fedora.phx.redhat.com>

bpepple has given up the commit acl on astyle (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/astyle



From pkgdb at fedoraproject.org  Mon Jan 19 19:02:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 19:02:59 +0000
Subject: [pkgdb] astyle: bpepple has given up commit
Message-ID: <20090119190259.8BBD3208DEB@bastion.fedora.phx.redhat.com>

bpepple has given up the commit acl on astyle (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/astyle



From mgrepl at fedoraproject.org  Mon Jan 19 19:03:05 2009
From: mgrepl at fedoraproject.org (Miroslav Grepl)
Date: Mon, 19 Jan 2009 19:03:05 +0000 (UTC)
Subject: rpms/selinux-policy/F-10 policy-20080710.patch, 1.120,
	1.121 selinux-policy.spec, 1.767, 1.768
Message-ID: <20090119190305.A96CC700F8@cvs1.fedora.phx.redhat.com>

Author: mgrepl

Update of /cvs/extras/rpms/selinux-policy/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24058

Modified Files:
	policy-20080710.patch selinux-policy.spec 
Log Message:
- Allow kismet read generic files in /usr
- Add execstack for Podslueth policy  
- Allow qemu use generic ptys and ptmx



policy-20080710.patch:

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.120 -r 1.121 policy-20080710.patch
Index: policy-20080710.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-10/policy-20080710.patch,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -r1.120 -r1.121
--- policy-20080710.patch	12 Jan 2009 18:03:15 -0000	1.120
+++ policy-20080710.patch	19 Jan 2009 19:02:34 -0000	1.121
@@ -1,6 +1,6 @@
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/default_contexts serefpolicy-3.5.13/config/appconfig-mcs/default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/default_contexts	2008-10-17 14:49:10.000000000 +0200
-+++ serefpolicy-3.5.13/config/appconfig-mcs/default_contexts	2009-01-12 17:40:37.000000000 +0100
++++ serefpolicy-3.5.13/config/appconfig-mcs/default_contexts	2009-01-19 18:50:31.000000000 +0100
 @@ -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
@@ -24,13 +24,13 @@
 +system_r:xdm_t:s0		user_r:user_t:s0
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/failsafe_context serefpolicy-3.5.13/config/appconfig-mcs/failsafe_context
 --- nsaserefpolicy/config/appconfig-mcs/failsafe_context	2008-10-17 14:49:10.000000000 +0200
-+++ serefpolicy-3.5.13/config/appconfig-mcs/failsafe_context	2009-01-12 17:40:37.000000000 +0100
++++ serefpolicy-3.5.13/config/appconfig-mcs/failsafe_context	2009-01-19 18:50:31.000000000 +0100
 @@ -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.5.13/config/appconfig-mcs/guest_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/guest_u_default_contexts	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.5.13/config/appconfig-mcs/guest_u_default_contexts	2009-01-12 17:40:37.000000000 +0100
++++ serefpolicy-3.5.13/config/appconfig-mcs/guest_u_default_contexts	2009-01-19 18:50:31.000000000 +0100
 @@ -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
@@ -40,7 +40,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.5.13/config/appconfig-mcs/root_default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/root_default_contexts	2008-10-17 14:49:10.000000000 +0200
-+++ serefpolicy-3.5.13/config/appconfig-mcs/root_default_contexts	2009-01-12 17:40:37.000000000 +0100
++++ serefpolicy-3.5.13/config/appconfig-mcs/root_default_contexts	2009-01-19 18:50:31.000000000 +0100
 @@ -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
@@ -57,16 +57,16 @@
 +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/seusers serefpolicy-3.5.13/config/appconfig-mcs/seusers
 --- nsaserefpolicy/config/appconfig-mcs/seusers	2008-10-17 14:49:10.000000000 +0200
-+++ serefpolicy-3.5.13/config/appconfig-mcs/seusers	2009-01-12 17:40:37.000000000 +0100
++++ serefpolicy-3.5.13/config/appconfig-mcs/seusers	2009-01-19 19:09:10.000000000 +0100
 @@ -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
++__default__:unconfined_u:s0-mcs_systemhigh
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/staff_u_default_contexts serefpolicy-3.5.13/config/appconfig-mcs/staff_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/staff_u_default_contexts	2008-10-17 14:49:10.000000000 +0200
-+++ serefpolicy-3.5.13/config/appconfig-mcs/staff_u_default_contexts	2009-01-12 17:40:37.000000000 +0100
++++ serefpolicy-3.5.13/config/appconfig-mcs/staff_u_default_contexts	2009-01-19 18:50:31.000000000 +0100
 @@ -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
@@ -83,7 +83,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/unconfined_u_default_contexts serefpolicy-3.5.13/config/appconfig-mcs/unconfined_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/unconfined_u_default_contexts	2008-10-17 14:49:10.000000000 +0200
-+++ serefpolicy-3.5.13/config/appconfig-mcs/unconfined_u_default_contexts	2009-01-12 17:40:37.000000000 +0100
++++ serefpolicy-3.5.13/config/appconfig-mcs/unconfined_u_default_contexts	2009-01-19 18:50:31.000000000 +0100
 @@ -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
@@ -93,13 +93,13 @@
  system_r:xdm_t:s0		unconfined_r:unconfined_t:s0
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/userhelper_context serefpolicy-3.5.13/config/appconfig-mcs/userhelper_context
 --- nsaserefpolicy/config/appconfig-mcs/userhelper_context	2008-10-17 14:49:10.000000000 +0200
-+++ serefpolicy-3.5.13/config/appconfig-mcs/userhelper_context	2009-01-12 17:40:37.000000000 +0100
++++ serefpolicy-3.5.13/config/appconfig-mcs/userhelper_context	2009-01-19 18:50:31.000000000 +0100
 @@ -1 +1 @@
 -system_u:sysadm_r:sysadm_t:s0
 +system_u:system_r:unconfined_t:s0	
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/user_u_default_contexts serefpolicy-3.5.13/config/appconfig-mcs/user_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/user_u_default_contexts	2008-10-17 14:49:10.000000000 +0200
-+++ serefpolicy-3.5.13/config/appconfig-mcs/user_u_default_contexts	2009-01-12 17:40:37.000000000 +0100
++++ serefpolicy-3.5.13/config/appconfig-mcs/user_u_default_contexts	2009-01-19 18:50:31.000000000 +0100
 @@ -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
@@ -114,7 +114,7 @@
 +user_r:user_t:s0		user_r:user_t:s0
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/xguest_u_default_contexts serefpolicy-3.5.13/config/appconfig-mcs/xguest_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/xguest_u_default_contexts	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.5.13/config/appconfig-mcs/xguest_u_default_contexts	2009-01-12 17:40:37.000000000 +0100
++++ serefpolicy-3.5.13/config/appconfig-mcs/xguest_u_default_contexts	2009-01-19 18:50:31.000000000 +0100
 @@ -0,0 +1,7 @@
 +system_r:local_login_t	xguest_r:xguest_t:s0
 +system_r:remote_login_t	xguest_r:xguest_t:s0
@@ -125,7 +125,7 @@
 +xguest_r:xguest_t:s0	xguest_r:xguest_t:s0
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/default_contexts serefpolicy-3.5.13/config/appconfig-mls/default_contexts
 --- nsaserefpolicy/config/appconfig-mls/default_contexts	2008-10-17 14:49:10.000000000 +0200
-+++ serefpolicy-3.5.13/config/appconfig-mls/default_contexts	2009-01-12 17:40:37.000000000 +0100
++++ serefpolicy-3.5.13/config/appconfig-mls/default_contexts	2009-01-19 18:50:31.000000000 +0100
 @@ -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
@@ -149,7 +149,7 @@
 +system_r:xdm_t:s0		user_r:user_t:s0
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/guest_u_default_contexts serefpolicy-3.5.13/config/appconfig-mls/guest_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mls/guest_u_default_contexts	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.5.13/config/appconfig-mls/guest_u_default_contexts	2009-01-12 17:40:37.000000000 +0100
++++ serefpolicy-3.5.13/config/appconfig-mls/guest_u_default_contexts	2009-01-19 18:50:31.000000000 +0100
 @@ -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
@@ -157,7 +157,7 @@
 +system_r:crond_t:s0		guest_r:guest_t:s0
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/root_default_contexts serefpolicy-3.5.13/config/appconfig-mls/root_default_contexts
 --- nsaserefpolicy/config/appconfig-mls/root_default_contexts	2008-10-17 14:49:10.000000000 +0200
-+++ serefpolicy-3.5.13/config/appconfig-mls/root_default_contexts	2009-01-12 17:40:37.000000000 +0100
++++ serefpolicy-3.5.13/config/appconfig-mls/root_default_contexts	2009-01-19 18:50:31.000000000 +0100
 @@ -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
@@ -178,7 +178,7 @@
 +#system_r:sshd_t:s0		sysadm_r:sysadm_t:s0 staff_r:staff_t:s0
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/staff_u_default_contexts serefpolicy-3.5.13/config/appconfig-mls/staff_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mls/staff_u_default_contexts	2008-10-17 14:49:10.000000000 +0200
-+++ serefpolicy-3.5.13/config/appconfig-mls/staff_u_default_contexts	2009-01-12 17:40:37.000000000 +0100
++++ serefpolicy-3.5.13/config/appconfig-mls/staff_u_default_contexts	2009-01-19 18:50:31.000000000 +0100
 @@ -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
@@ -190,7 +190,7 @@
  staff_r:staff_sudo_t:s0		staff_r:staff_t:s0
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/user_u_default_contexts serefpolicy-3.5.13/config/appconfig-mls/user_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mls/user_u_default_contexts	2008-10-17 14:49:10.000000000 +0200
-+++ serefpolicy-3.5.13/config/appconfig-mls/user_u_default_contexts	2009-01-12 17:40:37.000000000 +0100
++++ serefpolicy-3.5.13/config/appconfig-mls/user_u_default_contexts	2009-01-19 18:50:31.000000000 +0100
 @@ -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
@@ -202,7 +202,7 @@
  user_r:user_sudo_t:s0		user_r:user_t:s0
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/xguest_u_default_contexts serefpolicy-3.5.13/config/appconfig-mls/xguest_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mls/xguest_u_default_contexts	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.5.13/config/appconfig-mls/xguest_u_default_contexts	2009-01-12 17:40:37.000000000 +0100
++++ serefpolicy-3.5.13/config/appconfig-mls/xguest_u_default_contexts	2009-01-19 18:50:31.000000000 +0100
 @@ -0,0 +1,7 @@
 +system_r:local_login_t	xguest_r:xguest_t:s0
 +system_r:remote_login_t	xguest_r:xguest_t:s0
@@ -213,7 +213,7 @@
 +xguest_r:xguest_t:s0	xguest_r:xguest_t:s0
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-standard/guest_u_default_contexts serefpolicy-3.5.13/config/appconfig-standard/guest_u_default_contexts
 --- nsaserefpolicy/config/appconfig-standard/guest_u_default_contexts	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.5.13/config/appconfig-standard/guest_u_default_contexts	2009-01-12 17:40:37.000000000 +0100
++++ serefpolicy-3.5.13/config/appconfig-standard/guest_u_default_contexts	2009-01-19 18:50:31.000000000 +0100
 @@ -0,0 +1,4 @@
 +system_r:local_login_t	guest_r:guest_t
 +system_r:remote_login_t	guest_r:guest_t
@@ -221,7 +221,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.5.13/config/appconfig-standard/root_default_contexts
 --- nsaserefpolicy/config/appconfig-standard/root_default_contexts	2008-10-17 14:49:10.000000000 +0200
-+++ serefpolicy-3.5.13/config/appconfig-standard/root_default_contexts	2009-01-12 17:40:37.000000000 +0100
++++ serefpolicy-3.5.13/config/appconfig-standard/root_default_contexts	2009-01-19 18:50:31.000000000 +0100
 @@ -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
@@ -237,7 +237,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/staff_u_default_contexts serefpolicy-3.5.13/config/appconfig-standard/staff_u_default_contexts
 --- nsaserefpolicy/config/appconfig-standard/staff_u_default_contexts	2008-10-17 14:49:10.000000000 +0200
-+++ serefpolicy-3.5.13/config/appconfig-standard/staff_u_default_contexts	2009-01-12 17:40:37.000000000 +0100
++++ serefpolicy-3.5.13/config/appconfig-standard/staff_u_default_contexts	2009-01-19 18:50:31.000000000 +0100
 @@ -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
@@ -249,7 +249,7 @@
  staff_r:staff_sudo_t		staff_r:staff_t
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-standard/user_u_default_contexts serefpolicy-3.5.13/config/appconfig-standard/user_u_default_contexts
 --- nsaserefpolicy/config/appconfig-standard/user_u_default_contexts	2008-10-17 14:49:10.000000000 +0200
-+++ serefpolicy-3.5.13/config/appconfig-standard/user_u_default_contexts	2009-01-12 17:40:37.000000000 +0100
++++ serefpolicy-3.5.13/config/appconfig-standard/user_u_default_contexts	2009-01-19 18:50:31.000000000 +0100
 @@ -1,7 +1,7 @@
  system_r:local_login_t		user_r:user_t
  system_r:remote_login_t		user_r:user_t
@@ -261,7 +261,7 @@
  user_r:user_sudo_t		user_r:user_t
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-standard/xguest_u_default_contexts serefpolicy-3.5.13/config/appconfig-standard/xguest_u_default_contexts
 --- nsaserefpolicy/config/appconfig-standard/xguest_u_default_contexts	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.5.13/config/appconfig-standard/xguest_u_default_contexts	2009-01-12 17:40:37.000000000 +0100
++++ serefpolicy-3.5.13/config/appconfig-standard/xguest_u_default_contexts	2009-01-19 18:50:31.000000000 +0100
 @@ -0,0 +1,5 @@
 +system_r:local_login_t	xguest_r:xguest_t
 +system_r:remote_login_t	xguest_r:xguest_t
@@ -270,7 +270,7 @@
 +system_r:xdm_t		xguest_r:xguest_t
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/Makefile serefpolicy-3.5.13/Makefile
 --- nsaserefpolicy/Makefile	2008-10-17 14:49:11.000000000 +0200
-+++ serefpolicy-3.5.13/Makefile	2009-01-12 17:40:37.000000000 +0100
++++ serefpolicy-3.5.13/Makefile	2009-01-19 18:50:31.000000000 +0100
[...4023 lines suppressed...]
  
  ########################################
@@ -31836,7 +32101,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.te serefpolicy-3.5.13/policy/modules/system/selinuxutil.te
 --- nsaserefpolicy/policy/modules/system/selinuxutil.te	2008-10-17 14:49:13.000000000 +0200
-+++ serefpolicy-3.5.13/policy/modules/system/selinuxutil.te	2009-01-12 17:40:37.000000000 +0100
++++ serefpolicy-3.5.13/policy/modules/system/selinuxutil.te	2009-01-19 18:50:31.000000000 +0100
 @@ -23,6 +23,9 @@
  type selinux_config_t;
  files_type(selinux_config_t)
@@ -32193,7 +32458,7 @@
  ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/setrans.if serefpolicy-3.5.13/policy/modules/system/setrans.if
 --- nsaserefpolicy/policy/modules/system/setrans.if	2008-10-17 14:49:13.000000000 +0200
-+++ serefpolicy-3.5.13/policy/modules/system/setrans.if	2009-01-12 17:40:37.000000000 +0100
++++ serefpolicy-3.5.13/policy/modules/system/setrans.if	2009-01-19 18:50:31.000000000 +0100
 @@ -21,3 +21,23 @@
  	stream_connect_pattern($1,setrans_var_run_t,setrans_var_run_t,setrans_t)
  	files_list_pids($1)
@@ -32220,7 +32485,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/sysnetwork.fc serefpolicy-3.5.13/policy/modules/system/sysnetwork.fc
 --- nsaserefpolicy/policy/modules/system/sysnetwork.fc	2008-10-17 14:49:13.000000000 +0200
-+++ serefpolicy-3.5.13/policy/modules/system/sysnetwork.fc	2009-01-12 17:40:37.000000000 +0100
++++ serefpolicy-3.5.13/policy/modules/system/sysnetwork.fc	2009-01-19 18:50:31.000000000 +0100
 @@ -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)
@@ -32245,7 +32510,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.5.13/policy/modules/system/sysnetwork.if
 --- nsaserefpolicy/policy/modules/system/sysnetwork.if	2008-10-17 14:49:13.000000000 +0200
-+++ serefpolicy-3.5.13/policy/modules/system/sysnetwork.if	2009-01-12 17:40:37.000000000 +0100
++++ serefpolicy-3.5.13/policy/modules/system/sysnetwork.if	2009-01-19 18:50:31.000000000 +0100
 @@ -198,7 +198,25 @@
  		type dhcpc_state_t;
  	')
@@ -32357,7 +32622,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/sysnetwork.te serefpolicy-3.5.13/policy/modules/system/sysnetwork.te
 --- nsaserefpolicy/policy/modules/system/sysnetwork.te	2008-10-17 14:49:13.000000000 +0200
-+++ serefpolicy-3.5.13/policy/modules/system/sysnetwork.te	2009-01-12 17:40:37.000000000 +0100
++++ serefpolicy-3.5.13/policy/modules/system/sysnetwork.te	2009-01-19 18:50:31.000000000 +0100
 @@ -20,6 +20,9 @@
  init_daemon_domain(dhcpc_t,dhcpc_exec_t)
  role system_r types dhcpc_t;
@@ -32547,7 +32812,7 @@
  	xen_append_log(ifconfig_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/udev.fc serefpolicy-3.5.13/policy/modules/system/udev.fc
 --- nsaserefpolicy/policy/modules/system/udev.fc	2008-10-17 14:49:13.000000000 +0200
-+++ serefpolicy-3.5.13/policy/modules/system/udev.fc	2009-01-12 17:40:37.000000000 +0100
++++ serefpolicy-3.5.13/policy/modules/system/udev.fc	2009-01-19 18:50:31.000000000 +0100
 @@ -13,8 +13,11 @@
  /sbin/start_udev --	gen_context(system_u:object_r:udev_exec_t,s0)
  /sbin/udev	--	gen_context(system_u:object_r:udev_exec_t,s0)
@@ -32562,7 +32827,7 @@
 +/var/run/PackageKit/udev(/.*)?		gen_context(system_u:object_r:udev_var_run_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/udev.if serefpolicy-3.5.13/policy/modules/system/udev.if
 --- nsaserefpolicy/policy/modules/system/udev.if	2008-10-17 14:49:13.000000000 +0200
-+++ serefpolicy-3.5.13/policy/modules/system/udev.if	2009-01-12 17:40:37.000000000 +0100
++++ serefpolicy-3.5.13/policy/modules/system/udev.if	2009-01-19 18:50:31.000000000 +0100
 @@ -96,6 +96,24 @@
  
  ########################################
@@ -32618,7 +32883,7 @@
  ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/udev.te serefpolicy-3.5.13/policy/modules/system/udev.te
 --- nsaserefpolicy/policy/modules/system/udev.te	2008-10-17 14:49:13.000000000 +0200
-+++ serefpolicy-3.5.13/policy/modules/system/udev.te	2009-01-12 17:40:37.000000000 +0100
++++ serefpolicy-3.5.13/policy/modules/system/udev.te	2009-01-19 18:50:31.000000000 +0100
 @@ -83,6 +83,7 @@
  kernel_rw_unix_dgram_sockets(udev_t)
  kernel_dgram_send(udev_t)
@@ -32677,7 +32942,7 @@
  ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.fc serefpolicy-3.5.13/policy/modules/system/unconfined.fc
 --- nsaserefpolicy/policy/modules/system/unconfined.fc	2008-10-17 14:49:13.000000000 +0200
-+++ serefpolicy-3.5.13/policy/modules/system/unconfined.fc	2009-01-12 17:40:37.000000000 +0100
++++ serefpolicy-3.5.13/policy/modules/system/unconfined.fc	2009-01-19 18:50:31.000000000 +0100
 @@ -2,15 +2,31 @@
  # e.g.:
  # /usr/local/bin/appsrv		--	gen_context(system_u:object_r:unconfined_exec_t,s0)
@@ -32721,7 +32986,7 @@
 +#/usr/lib(64)?/gcl-[^/]+/unixport/saved_.* 	--	gen_context(system_u:object_r:execmem_exec_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.if serefpolicy-3.5.13/policy/modules/system/unconfined.if
 --- nsaserefpolicy/policy/modules/system/unconfined.if	2008-10-17 14:49:13.000000000 +0200
-+++ serefpolicy-3.5.13/policy/modules/system/unconfined.if	2009-01-12 17:40:37.000000000 +0100
++++ serefpolicy-3.5.13/policy/modules/system/unconfined.if	2009-01-19 18:50:31.000000000 +0100
 @@ -12,14 +12,13 @@
  #
  interface(`unconfined_domain_noaudit',`
@@ -33071,7 +33336,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.te serefpolicy-3.5.13/policy/modules/system/unconfined.te
 --- nsaserefpolicy/policy/modules/system/unconfined.te	2008-10-17 14:49:13.000000000 +0200
-+++ serefpolicy-3.5.13/policy/modules/system/unconfined.te	2009-01-12 17:40:37.000000000 +0100
++++ serefpolicy-3.5.13/policy/modules/system/unconfined.te	2009-01-19 18:50:31.000000000 +0100
 @@ -6,35 +6,77 @@
  # Declarations
  #
@@ -33436,7 +33701,7 @@
 +gen_user(unconfined_u, user, unconfined_r system_r, s0, s0 - mls_systemhigh, mcs_allcats)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.fc serefpolicy-3.5.13/policy/modules/system/userdomain.fc
 --- nsaserefpolicy/policy/modules/system/userdomain.fc	2008-10-17 14:49:13.000000000 +0200
-+++ serefpolicy-3.5.13/policy/modules/system/userdomain.fc	2009-01-12 17:40:37.000000000 +0100
++++ serefpolicy-3.5.13/policy/modules/system/userdomain.fc	2009-01-19 18:50:31.000000000 +0100
 @@ -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)
@@ -33449,7 +33714,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.5.13/policy/modules/system/userdomain.if
 --- nsaserefpolicy/policy/modules/system/userdomain.if	2008-10-17 14:49:13.000000000 +0200
-+++ serefpolicy-3.5.13/policy/modules/system/userdomain.if	2009-01-12 17:40:37.000000000 +0100
++++ serefpolicy-3.5.13/policy/modules/system/userdomain.if	2009-01-19 18:50:31.000000000 +0100
 @@ -28,10 +28,14 @@
  		class context contains;
  	')
@@ -36202,7 +36467,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-3.5.13/policy/modules/system/userdomain.te
 --- nsaserefpolicy/policy/modules/system/userdomain.te	2008-10-17 14:49:13.000000000 +0200
-+++ serefpolicy-3.5.13/policy/modules/system/userdomain.te	2009-01-12 17:40:37.000000000 +0100
++++ serefpolicy-3.5.13/policy/modules/system/userdomain.te	2009-01-19 18:50:31.000000000 +0100
 @@ -8,13 +8,6 @@
  
  ## <desc>
@@ -36322,7 +36587,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.fc serefpolicy-3.5.13/policy/modules/system/xen.fc
 --- nsaserefpolicy/policy/modules/system/xen.fc	2008-10-17 14:49:13.000000000 +0200
-+++ serefpolicy-3.5.13/policy/modules/system/xen.fc	2009-01-12 17:40:37.000000000 +0100
++++ serefpolicy-3.5.13/policy/modules/system/xen.fc	2009-01-19 18:50:31.000000000 +0100
 @@ -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)
@@ -36333,7 +36598,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.if serefpolicy-3.5.13/policy/modules/system/xen.if
 --- nsaserefpolicy/policy/modules/system/xen.if	2008-10-17 14:49:13.000000000 +0200
-+++ serefpolicy-3.5.13/policy/modules/system/xen.if	2009-01-12 17:40:37.000000000 +0100
++++ serefpolicy-3.5.13/policy/modules/system/xen.if	2009-01-19 18:50:31.000000000 +0100
 @@ -155,7 +155,7 @@
  	stream_connect_pattern($1,xenstored_var_run_t,xenstored_var_run_t,xenstored_t)
  ')
@@ -36386,7 +36651,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.te serefpolicy-3.5.13/policy/modules/system/xen.te
 --- nsaserefpolicy/policy/modules/system/xen.te	2008-10-17 14:49:13.000000000 +0200
-+++ serefpolicy-3.5.13/policy/modules/system/xen.te	2009-01-12 17:40:37.000000000 +0100
++++ serefpolicy-3.5.13/policy/modules/system/xen.te	2009-01-19 18:50:31.000000000 +0100
 @@ -6,6 +6,13 @@
  # Declarations
  #
@@ -36620,7 +36885,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/policy_capabilities serefpolicy-3.5.13/policy/policy_capabilities
 --- nsaserefpolicy/policy/policy_capabilities	2008-10-17 14:49:14.000000000 +0200
-+++ serefpolicy-3.5.13/policy/policy_capabilities	2009-01-12 17:40:37.000000000 +0100
++++ serefpolicy-3.5.13/policy/policy_capabilities	2009-01-19 18:50:31.000000000 +0100
 @@ -29,4 +29,4 @@
  # chr_file: open
  # blk_file: open
@@ -36629,7 +36894,7 @@
 +#policycap open_perms;
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/support/obj_perm_sets.spt serefpolicy-3.5.13/policy/support/obj_perm_sets.spt
 --- nsaserefpolicy/policy/support/obj_perm_sets.spt	2008-10-17 14:49:14.000000000 +0200
-+++ serefpolicy-3.5.13/policy/support/obj_perm_sets.spt	2009-01-12 17:40:37.000000000 +0100
++++ serefpolicy-3.5.13/policy/support/obj_perm_sets.spt	2009-01-19 18:50:31.000000000 +0100
 @@ -59,22 +59,22 @@
  # 
  # Permissions for executing files.
@@ -36779,7 +37044,7 @@
 +define(`manage_key_perms', `{ create link read search setattr view write } ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/users serefpolicy-3.5.13/policy/users
 --- nsaserefpolicy/policy/users	2008-10-17 14:49:11.000000000 +0200
-+++ serefpolicy-3.5.13/policy/users	2009-01-12 17:40:37.000000000 +0100
++++ serefpolicy-3.5.13/policy/users	2009-01-19 18:50:31.000000000 +0100
 @@ -25,11 +25,8 @@
  # permit any access to such users, then remove this entry.
  #
@@ -36806,7 +37071,7 @@
 +gen_user(root, user, unconfined_r sysadm_r staff_r ifdef(`enable_mls',`secadm_r auditadm_r') system_r, s0, s0 - mls_systemhigh, mcs_allcats)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/Rules.modular serefpolicy-3.5.13/Rules.modular
 --- nsaserefpolicy/Rules.modular	2008-10-17 14:49:14.000000000 +0200
-+++ serefpolicy-3.5.13/Rules.modular	2009-01-12 17:40:37.000000000 +0100
++++ serefpolicy-3.5.13/Rules.modular	2009-01-19 18:50:31.000000000 +0100
 @@ -73,8 +73,8 @@
  $(tmpdir)/%.mod: $(m4support) $(tmpdir)/generated_definitions.conf $(tmpdir)/all_interfaces.conf %.te
  	@echo "Compliling $(NAME) $(@F) module"
@@ -36855,7 +37120,7 @@
  $(appdir)/customizable_types: $(base_conf)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/support/Makefile.devel serefpolicy-3.5.13/support/Makefile.devel
 --- nsaserefpolicy/support/Makefile.devel	2008-10-17 14:49:14.000000000 +0200
-+++ serefpolicy-3.5.13/support/Makefile.devel	2009-01-12 17:40:37.000000000 +0100
++++ serefpolicy-3.5.13/support/Makefile.devel	2009-01-19 18:50:31.000000000 +0100
 @@ -181,8 +181,7 @@
  tmp/%.mod: $(m4support) tmp/all_interfaces.conf %.te
  	@$(EINFO) "Compiling $(NAME) $(basename $(@F)) module"


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-10/selinux-policy.spec,v
retrieving revision 1.767
retrieving revision 1.768
diff -u -r1.767 -r1.768
--- selinux-policy.spec	12 Jan 2009 18:03:15 -0000	1.767
+++ selinux-policy.spec	19 Jan 2009 19:02:35 -0000	1.768
@@ -20,7 +20,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.5.13
-Release: 39%{?dist}
+Release: 40%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -459,6 +459,11 @@
 %endif
 
 %changelog
+* Mon Jan 19 2009 Miroslav Grepl <mgrepl at redhat.com> 3.5.13-40
+- Allow kismet read generic files in /usr
+- Add execstack for Podslueth policy  
+- Allow qemu use generic ptys and ptmx
+
 * Mon Jan 12 2009 Miroslav Grepl <mgrepl at redhat.com> 3.5.13-39
 - Allow cups_pdf_t mananage nfs files/dirs
 - Add read_lnk_files to postfix_domain_template



From rjones at fedoraproject.org  Mon Jan 19 19:08:31 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Mon, 19 Jan 2009 19:08:31 +0000 (UTC)
Subject: rpms/mingw32-zlib/devel mingw32-zlib.spec,1.1,1.2
Message-ID: <20090119190831.CBB57700F8@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/mingw32-zlib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24936

Modified Files:
	mingw32-zlib.spec 
Log Message:
Force rebuild to test maintenance account.


Index: mingw32-zlib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-zlib/devel/mingw32-zlib.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mingw32-zlib.spec	21 Dec 2008 11:13:20 -0000	1.1
+++ mingw32-zlib.spec	19 Jan 2009 19:08:01 -0000	1.2
@@ -6,7 +6,7 @@
 
 Name:           mingw32-zlib
 Version:        1.2.3
-Release:        11%{?dist}
+Release:        12%{?dist}
 Summary:        MinGW Windows zlib compression library
 
 License:        zlib
@@ -89,6 +89,9 @@
 
 
 %changelog
+* Mon Jan 19 2009 Richard W.M. Jones <rjones at redhat.com> - 1.2.3-12
+- Force rebuild to test maintenance account.
+
 * Thu Dec 18 2008 Richard W.M. Jones <rjones at redhat.com> - 1.2.3-11
 - Pass correct CFLAGS to build.
 



From mgrepl at fedoraproject.org  Mon Jan 19 19:25:43 2009
From: mgrepl at fedoraproject.org (Miroslav Grepl)
Date: Mon, 19 Jan 2009 19:25:43 +0000 (UTC)
Subject: rpms/selinux-policy/F-10 policy-20080710.patch,1.121,1.122
Message-ID: <20090119192543.A8879700F8@cvs1.fedora.phx.redhat.com>

Author: mgrepl

Update of /cvs/extras/rpms/selinux-policy/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27374

Modified Files:
	policy-20080710.patch 
Log Message:
- Fix rsync



policy-20080710.patch:

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.121 -r 1.122 policy-20080710.patch
Index: policy-20080710.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-10/policy-20080710.patch,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -r1.121 -r1.122
--- policy-20080710.patch	19 Jan 2009 19:02:34 -0000	1.121
+++ policy-20080710.patch	19 Jan 2009 19:25:42 -0000	1.122
@@ -1,6 +1,6 @@
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/default_contexts serefpolicy-3.5.13/config/appconfig-mcs/default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/default_contexts	2008-10-17 14:49:10.000000000 +0200
-+++ serefpolicy-3.5.13/config/appconfig-mcs/default_contexts	2009-01-19 18:50:31.000000000 +0100
++++ serefpolicy-3.5.13/config/appconfig-mcs/default_contexts	2009-01-19 20:07:59.000000000 +0100
 @@ -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
@@ -24,13 +24,13 @@
 +system_r:xdm_t:s0		user_r:user_t:s0
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/failsafe_context serefpolicy-3.5.13/config/appconfig-mcs/failsafe_context
 --- nsaserefpolicy/config/appconfig-mcs/failsafe_context	2008-10-17 14:49:10.000000000 +0200
-+++ serefpolicy-3.5.13/config/appconfig-mcs/failsafe_context	2009-01-19 18:50:31.000000000 +0100
++++ serefpolicy-3.5.13/config/appconfig-mcs/failsafe_context	2009-01-19 20:07:59.000000000 +0100
 @@ -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.5.13/config/appconfig-mcs/guest_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/guest_u_default_contexts	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.5.13/config/appconfig-mcs/guest_u_default_contexts	2009-01-19 18:50:31.000000000 +0100
++++ serefpolicy-3.5.13/config/appconfig-mcs/guest_u_default_contexts	2009-01-19 20:07:59.000000000 +0100
 @@ -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
@@ -40,7 +40,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.5.13/config/appconfig-mcs/root_default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/root_default_contexts	2008-10-17 14:49:10.000000000 +0200
-+++ serefpolicy-3.5.13/config/appconfig-mcs/root_default_contexts	2009-01-19 18:50:31.000000000 +0100
++++ serefpolicy-3.5.13/config/appconfig-mcs/root_default_contexts	2009-01-19 20:07:59.000000000 +0100
 @@ -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
@@ -57,7 +57,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/seusers serefpolicy-3.5.13/config/appconfig-mcs/seusers
 --- nsaserefpolicy/config/appconfig-mcs/seusers	2008-10-17 14:49:10.000000000 +0200
-+++ serefpolicy-3.5.13/config/appconfig-mcs/seusers	2009-01-19 19:09:10.000000000 +0100
++++ serefpolicy-3.5.13/config/appconfig-mcs/seusers	2009-01-19 20:07:59.000000000 +0100
 @@ -1,3 +1,3 @@
  system_u:system_u:s0-mcs_systemhigh
 -root:root:s0-mcs_systemhigh
@@ -66,7 +66,7 @@
 +__default__:unconfined_u:s0-mcs_systemhigh
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/staff_u_default_contexts serefpolicy-3.5.13/config/appconfig-mcs/staff_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/staff_u_default_contexts	2008-10-17 14:49:10.000000000 +0200
-+++ serefpolicy-3.5.13/config/appconfig-mcs/staff_u_default_contexts	2009-01-19 18:50:31.000000000 +0100
++++ serefpolicy-3.5.13/config/appconfig-mcs/staff_u_default_contexts	2009-01-19 20:07:59.000000000 +0100
 @@ -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
@@ -83,7 +83,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/unconfined_u_default_contexts serefpolicy-3.5.13/config/appconfig-mcs/unconfined_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/unconfined_u_default_contexts	2008-10-17 14:49:10.000000000 +0200
-+++ serefpolicy-3.5.13/config/appconfig-mcs/unconfined_u_default_contexts	2009-01-19 18:50:31.000000000 +0100
++++ serefpolicy-3.5.13/config/appconfig-mcs/unconfined_u_default_contexts	2009-01-19 20:07:59.000000000 +0100
 @@ -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
@@ -93,13 +93,13 @@
  system_r:xdm_t:s0		unconfined_r:unconfined_t:s0
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/userhelper_context serefpolicy-3.5.13/config/appconfig-mcs/userhelper_context
 --- nsaserefpolicy/config/appconfig-mcs/userhelper_context	2008-10-17 14:49:10.000000000 +0200
-+++ serefpolicy-3.5.13/config/appconfig-mcs/userhelper_context	2009-01-19 18:50:31.000000000 +0100
++++ serefpolicy-3.5.13/config/appconfig-mcs/userhelper_context	2009-01-19 20:07:59.000000000 +0100
 @@ -1 +1 @@
 -system_u:sysadm_r:sysadm_t:s0
 +system_u:system_r:unconfined_t:s0	
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/user_u_default_contexts serefpolicy-3.5.13/config/appconfig-mcs/user_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/user_u_default_contexts	2008-10-17 14:49:10.000000000 +0200
-+++ serefpolicy-3.5.13/config/appconfig-mcs/user_u_default_contexts	2009-01-19 18:50:31.000000000 +0100
++++ serefpolicy-3.5.13/config/appconfig-mcs/user_u_default_contexts	2009-01-19 20:07:59.000000000 +0100
 @@ -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
@@ -114,7 +114,7 @@
 +user_r:user_t:s0		user_r:user_t:s0
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/xguest_u_default_contexts serefpolicy-3.5.13/config/appconfig-mcs/xguest_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/xguest_u_default_contexts	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.5.13/config/appconfig-mcs/xguest_u_default_contexts	2009-01-19 18:50:31.000000000 +0100
++++ serefpolicy-3.5.13/config/appconfig-mcs/xguest_u_default_contexts	2009-01-19 20:07:59.000000000 +0100
 @@ -0,0 +1,7 @@
 +system_r:local_login_t	xguest_r:xguest_t:s0
 +system_r:remote_login_t	xguest_r:xguest_t:s0
@@ -125,7 +125,7 @@
 +xguest_r:xguest_t:s0	xguest_r:xguest_t:s0
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/default_contexts serefpolicy-3.5.13/config/appconfig-mls/default_contexts
 --- nsaserefpolicy/config/appconfig-mls/default_contexts	2008-10-17 14:49:10.000000000 +0200
-+++ serefpolicy-3.5.13/config/appconfig-mls/default_contexts	2009-01-19 18:50:31.000000000 +0100
++++ serefpolicy-3.5.13/config/appconfig-mls/default_contexts	2009-01-19 20:07:59.000000000 +0100
 @@ -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
@@ -149,7 +149,7 @@
 +system_r:xdm_t:s0		user_r:user_t:s0
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/guest_u_default_contexts serefpolicy-3.5.13/config/appconfig-mls/guest_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mls/guest_u_default_contexts	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.5.13/config/appconfig-mls/guest_u_default_contexts	2009-01-19 18:50:31.000000000 +0100
++++ serefpolicy-3.5.13/config/appconfig-mls/guest_u_default_contexts	2009-01-19 20:07:59.000000000 +0100
 @@ -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
@@ -157,7 +157,7 @@
 +system_r:crond_t:s0		guest_r:guest_t:s0
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/root_default_contexts serefpolicy-3.5.13/config/appconfig-mls/root_default_contexts
 --- nsaserefpolicy/config/appconfig-mls/root_default_contexts	2008-10-17 14:49:10.000000000 +0200
-+++ serefpolicy-3.5.13/config/appconfig-mls/root_default_contexts	2009-01-19 18:50:31.000000000 +0100
++++ serefpolicy-3.5.13/config/appconfig-mls/root_default_contexts	2009-01-19 20:07:59.000000000 +0100
 @@ -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
@@ -178,7 +178,7 @@
 +#system_r:sshd_t:s0		sysadm_r:sysadm_t:s0 staff_r:staff_t:s0
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/staff_u_default_contexts serefpolicy-3.5.13/config/appconfig-mls/staff_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mls/staff_u_default_contexts	2008-10-17 14:49:10.000000000 +0200
-+++ serefpolicy-3.5.13/config/appconfig-mls/staff_u_default_contexts	2009-01-19 18:50:31.000000000 +0100
++++ serefpolicy-3.5.13/config/appconfig-mls/staff_u_default_contexts	2009-01-19 20:07:59.000000000 +0100
 @@ -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
@@ -190,7 +190,7 @@
  staff_r:staff_sudo_t:s0		staff_r:staff_t:s0
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/user_u_default_contexts serefpolicy-3.5.13/config/appconfig-mls/user_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mls/user_u_default_contexts	2008-10-17 14:49:10.000000000 +0200
-+++ serefpolicy-3.5.13/config/appconfig-mls/user_u_default_contexts	2009-01-19 18:50:31.000000000 +0100
++++ serefpolicy-3.5.13/config/appconfig-mls/user_u_default_contexts	2009-01-19 20:07:59.000000000 +0100
 @@ -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
@@ -202,7 +202,7 @@
  user_r:user_sudo_t:s0		user_r:user_t:s0
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/xguest_u_default_contexts serefpolicy-3.5.13/config/appconfig-mls/xguest_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mls/xguest_u_default_contexts	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.5.13/config/appconfig-mls/xguest_u_default_contexts	2009-01-19 18:50:31.000000000 +0100
++++ serefpolicy-3.5.13/config/appconfig-mls/xguest_u_default_contexts	2009-01-19 20:07:59.000000000 +0100
 @@ -0,0 +1,7 @@
 +system_r:local_login_t	xguest_r:xguest_t:s0
 +system_r:remote_login_t	xguest_r:xguest_t:s0
@@ -213,7 +213,7 @@
 +xguest_r:xguest_t:s0	xguest_r:xguest_t:s0
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-standard/guest_u_default_contexts serefpolicy-3.5.13/config/appconfig-standard/guest_u_default_contexts
 --- nsaserefpolicy/config/appconfig-standard/guest_u_default_contexts	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.5.13/config/appconfig-standard/guest_u_default_contexts	2009-01-19 18:50:31.000000000 +0100
++++ serefpolicy-3.5.13/config/appconfig-standard/guest_u_default_contexts	2009-01-19 20:07:59.000000000 +0100
 @@ -0,0 +1,4 @@
 +system_r:local_login_t	guest_r:guest_t
 +system_r:remote_login_t	guest_r:guest_t
@@ -221,7 +221,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.5.13/config/appconfig-standard/root_default_contexts
 --- nsaserefpolicy/config/appconfig-standard/root_default_contexts	2008-10-17 14:49:10.000000000 +0200
-+++ serefpolicy-3.5.13/config/appconfig-standard/root_default_contexts	2009-01-19 18:50:31.000000000 +0100
++++ serefpolicy-3.5.13/config/appconfig-standard/root_default_contexts	2009-01-19 20:07:59.000000000 +0100
 @@ -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
@@ -237,7 +237,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/staff_u_default_contexts serefpolicy-3.5.13/config/appconfig-standard/staff_u_default_contexts
 --- nsaserefpolicy/config/appconfig-standard/staff_u_default_contexts	2008-10-17 14:49:10.000000000 +0200
-+++ serefpolicy-3.5.13/config/appconfig-standard/staff_u_default_contexts	2009-01-19 18:50:31.000000000 +0100
++++ serefpolicy-3.5.13/config/appconfig-standard/staff_u_default_contexts	2009-01-19 20:07:59.000000000 +0100
 @@ -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
@@ -249,7 +249,7 @@
  staff_r:staff_sudo_t		staff_r:staff_t
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-standard/user_u_default_contexts serefpolicy-3.5.13/config/appconfig-standard/user_u_default_contexts
 --- nsaserefpolicy/config/appconfig-standard/user_u_default_contexts	2008-10-17 14:49:10.000000000 +0200
-+++ serefpolicy-3.5.13/config/appconfig-standard/user_u_default_contexts	2009-01-19 18:50:31.000000000 +0100
++++ serefpolicy-3.5.13/config/appconfig-standard/user_u_default_contexts	2009-01-19 20:07:59.000000000 +0100
 @@ -1,7 +1,7 @@
  system_r:local_login_t		user_r:user_t
  system_r:remote_login_t		user_r:user_t
@@ -261,7 +261,7 @@
  user_r:user_sudo_t		user_r:user_t
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-standard/xguest_u_default_contexts serefpolicy-3.5.13/config/appconfig-standard/xguest_u_default_contexts
 --- nsaserefpolicy/config/appconfig-standard/xguest_u_default_contexts	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.5.13/config/appconfig-standard/xguest_u_default_contexts	2009-01-19 18:50:31.000000000 +0100
++++ serefpolicy-3.5.13/config/appconfig-standard/xguest_u_default_contexts	2009-01-19 20:07:59.000000000 +0100
 @@ -0,0 +1,5 @@
 +system_r:local_login_t	xguest_r:xguest_t
 +system_r:remote_login_t	xguest_r:xguest_t
@@ -270,7 +270,7 @@
 +system_r:xdm_t		xguest_r:xguest_t
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/Makefile serefpolicy-3.5.13/Makefile
 --- nsaserefpolicy/Makefile	2008-10-17 14:49:11.000000000 +0200
-+++ serefpolicy-3.5.13/Makefile	2009-01-19 18:50:31.000000000 +0100
++++ serefpolicy-3.5.13/Makefile	2009-01-19 20:07:59.000000000 +0100
 @@ -311,20 +311,22 @@
  
[...3343 lines suppressed...]
  
  ########################################
@@ -32101,7 +32123,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.te serefpolicy-3.5.13/policy/modules/system/selinuxutil.te
 --- nsaserefpolicy/policy/modules/system/selinuxutil.te	2008-10-17 14:49:13.000000000 +0200
-+++ serefpolicy-3.5.13/policy/modules/system/selinuxutil.te	2009-01-19 18:50:31.000000000 +0100
++++ serefpolicy-3.5.13/policy/modules/system/selinuxutil.te	2009-01-19 20:07:59.000000000 +0100
 @@ -23,6 +23,9 @@
  type selinux_config_t;
  files_type(selinux_config_t)
@@ -32458,7 +32480,7 @@
  ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/setrans.if serefpolicy-3.5.13/policy/modules/system/setrans.if
 --- nsaserefpolicy/policy/modules/system/setrans.if	2008-10-17 14:49:13.000000000 +0200
-+++ serefpolicy-3.5.13/policy/modules/system/setrans.if	2009-01-19 18:50:31.000000000 +0100
++++ serefpolicy-3.5.13/policy/modules/system/setrans.if	2009-01-19 20:07:59.000000000 +0100
 @@ -21,3 +21,23 @@
  	stream_connect_pattern($1,setrans_var_run_t,setrans_var_run_t,setrans_t)
  	files_list_pids($1)
@@ -32485,7 +32507,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/sysnetwork.fc serefpolicy-3.5.13/policy/modules/system/sysnetwork.fc
 --- nsaserefpolicy/policy/modules/system/sysnetwork.fc	2008-10-17 14:49:13.000000000 +0200
-+++ serefpolicy-3.5.13/policy/modules/system/sysnetwork.fc	2009-01-19 18:50:31.000000000 +0100
++++ serefpolicy-3.5.13/policy/modules/system/sysnetwork.fc	2009-01-19 20:07:59.000000000 +0100
 @@ -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)
@@ -32510,7 +32532,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.5.13/policy/modules/system/sysnetwork.if
 --- nsaserefpolicy/policy/modules/system/sysnetwork.if	2008-10-17 14:49:13.000000000 +0200
-+++ serefpolicy-3.5.13/policy/modules/system/sysnetwork.if	2009-01-19 18:50:31.000000000 +0100
++++ serefpolicy-3.5.13/policy/modules/system/sysnetwork.if	2009-01-19 20:07:59.000000000 +0100
 @@ -198,7 +198,25 @@
  		type dhcpc_state_t;
  	')
@@ -32622,7 +32644,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/sysnetwork.te serefpolicy-3.5.13/policy/modules/system/sysnetwork.te
 --- nsaserefpolicy/policy/modules/system/sysnetwork.te	2008-10-17 14:49:13.000000000 +0200
-+++ serefpolicy-3.5.13/policy/modules/system/sysnetwork.te	2009-01-19 18:50:31.000000000 +0100
++++ serefpolicy-3.5.13/policy/modules/system/sysnetwork.te	2009-01-19 20:07:59.000000000 +0100
 @@ -20,6 +20,9 @@
  init_daemon_domain(dhcpc_t,dhcpc_exec_t)
  role system_r types dhcpc_t;
@@ -32812,7 +32834,7 @@
  	xen_append_log(ifconfig_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/udev.fc serefpolicy-3.5.13/policy/modules/system/udev.fc
 --- nsaserefpolicy/policy/modules/system/udev.fc	2008-10-17 14:49:13.000000000 +0200
-+++ serefpolicy-3.5.13/policy/modules/system/udev.fc	2009-01-19 18:50:31.000000000 +0100
++++ serefpolicy-3.5.13/policy/modules/system/udev.fc	2009-01-19 20:07:59.000000000 +0100
 @@ -13,8 +13,11 @@
  /sbin/start_udev --	gen_context(system_u:object_r:udev_exec_t,s0)
  /sbin/udev	--	gen_context(system_u:object_r:udev_exec_t,s0)
@@ -32827,7 +32849,7 @@
 +/var/run/PackageKit/udev(/.*)?		gen_context(system_u:object_r:udev_var_run_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/udev.if serefpolicy-3.5.13/policy/modules/system/udev.if
 --- nsaserefpolicy/policy/modules/system/udev.if	2008-10-17 14:49:13.000000000 +0200
-+++ serefpolicy-3.5.13/policy/modules/system/udev.if	2009-01-19 18:50:31.000000000 +0100
++++ serefpolicy-3.5.13/policy/modules/system/udev.if	2009-01-19 20:07:59.000000000 +0100
 @@ -96,6 +96,24 @@
  
  ########################################
@@ -32883,7 +32905,7 @@
  ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/udev.te serefpolicy-3.5.13/policy/modules/system/udev.te
 --- nsaserefpolicy/policy/modules/system/udev.te	2008-10-17 14:49:13.000000000 +0200
-+++ serefpolicy-3.5.13/policy/modules/system/udev.te	2009-01-19 18:50:31.000000000 +0100
++++ serefpolicy-3.5.13/policy/modules/system/udev.te	2009-01-19 20:07:59.000000000 +0100
 @@ -83,6 +83,7 @@
  kernel_rw_unix_dgram_sockets(udev_t)
  kernel_dgram_send(udev_t)
@@ -32942,7 +32964,7 @@
  ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.fc serefpolicy-3.5.13/policy/modules/system/unconfined.fc
 --- nsaserefpolicy/policy/modules/system/unconfined.fc	2008-10-17 14:49:13.000000000 +0200
-+++ serefpolicy-3.5.13/policy/modules/system/unconfined.fc	2009-01-19 18:50:31.000000000 +0100
++++ serefpolicy-3.5.13/policy/modules/system/unconfined.fc	2009-01-19 20:07:59.000000000 +0100
 @@ -2,15 +2,31 @@
  # e.g.:
  # /usr/local/bin/appsrv		--	gen_context(system_u:object_r:unconfined_exec_t,s0)
@@ -32986,7 +33008,7 @@
 +#/usr/lib(64)?/gcl-[^/]+/unixport/saved_.* 	--	gen_context(system_u:object_r:execmem_exec_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.if serefpolicy-3.5.13/policy/modules/system/unconfined.if
 --- nsaserefpolicy/policy/modules/system/unconfined.if	2008-10-17 14:49:13.000000000 +0200
-+++ serefpolicy-3.5.13/policy/modules/system/unconfined.if	2009-01-19 18:50:31.000000000 +0100
++++ serefpolicy-3.5.13/policy/modules/system/unconfined.if	2009-01-19 20:07:59.000000000 +0100
 @@ -12,14 +12,13 @@
  #
  interface(`unconfined_domain_noaudit',`
@@ -33336,7 +33358,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.te serefpolicy-3.5.13/policy/modules/system/unconfined.te
 --- nsaserefpolicy/policy/modules/system/unconfined.te	2008-10-17 14:49:13.000000000 +0200
-+++ serefpolicy-3.5.13/policy/modules/system/unconfined.te	2009-01-19 18:50:31.000000000 +0100
++++ serefpolicy-3.5.13/policy/modules/system/unconfined.te	2009-01-19 20:07:59.000000000 +0100
 @@ -6,35 +6,77 @@
  # Declarations
  #
@@ -33701,7 +33723,7 @@
 +gen_user(unconfined_u, user, unconfined_r system_r, s0, s0 - mls_systemhigh, mcs_allcats)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.fc serefpolicy-3.5.13/policy/modules/system/userdomain.fc
 --- nsaserefpolicy/policy/modules/system/userdomain.fc	2008-10-17 14:49:13.000000000 +0200
-+++ serefpolicy-3.5.13/policy/modules/system/userdomain.fc	2009-01-19 18:50:31.000000000 +0100
++++ serefpolicy-3.5.13/policy/modules/system/userdomain.fc	2009-01-19 20:07:59.000000000 +0100
 @@ -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)
@@ -33714,7 +33736,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.5.13/policy/modules/system/userdomain.if
 --- nsaserefpolicy/policy/modules/system/userdomain.if	2008-10-17 14:49:13.000000000 +0200
-+++ serefpolicy-3.5.13/policy/modules/system/userdomain.if	2009-01-19 18:50:31.000000000 +0100
++++ serefpolicy-3.5.13/policy/modules/system/userdomain.if	2009-01-19 20:07:59.000000000 +0100
 @@ -28,10 +28,14 @@
  		class context contains;
  	')
@@ -36467,7 +36489,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-3.5.13/policy/modules/system/userdomain.te
 --- nsaserefpolicy/policy/modules/system/userdomain.te	2008-10-17 14:49:13.000000000 +0200
-+++ serefpolicy-3.5.13/policy/modules/system/userdomain.te	2009-01-19 18:50:31.000000000 +0100
++++ serefpolicy-3.5.13/policy/modules/system/userdomain.te	2009-01-19 20:07:59.000000000 +0100
 @@ -8,13 +8,6 @@
  
  ## <desc>
@@ -36587,7 +36609,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.fc serefpolicy-3.5.13/policy/modules/system/xen.fc
 --- nsaserefpolicy/policy/modules/system/xen.fc	2008-10-17 14:49:13.000000000 +0200
-+++ serefpolicy-3.5.13/policy/modules/system/xen.fc	2009-01-19 18:50:31.000000000 +0100
++++ serefpolicy-3.5.13/policy/modules/system/xen.fc	2009-01-19 20:07:59.000000000 +0100
 @@ -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)
@@ -36598,7 +36620,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.if serefpolicy-3.5.13/policy/modules/system/xen.if
 --- nsaserefpolicy/policy/modules/system/xen.if	2008-10-17 14:49:13.000000000 +0200
-+++ serefpolicy-3.5.13/policy/modules/system/xen.if	2009-01-19 18:50:31.000000000 +0100
++++ serefpolicy-3.5.13/policy/modules/system/xen.if	2009-01-19 20:07:59.000000000 +0100
 @@ -155,7 +155,7 @@
  	stream_connect_pattern($1,xenstored_var_run_t,xenstored_var_run_t,xenstored_t)
  ')
@@ -36651,7 +36673,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.te serefpolicy-3.5.13/policy/modules/system/xen.te
 --- nsaserefpolicy/policy/modules/system/xen.te	2008-10-17 14:49:13.000000000 +0200
-+++ serefpolicy-3.5.13/policy/modules/system/xen.te	2009-01-19 18:50:31.000000000 +0100
++++ serefpolicy-3.5.13/policy/modules/system/xen.te	2009-01-19 20:07:59.000000000 +0100
 @@ -6,6 +6,13 @@
  # Declarations
  #
@@ -36885,7 +36907,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/policy_capabilities serefpolicy-3.5.13/policy/policy_capabilities
 --- nsaserefpolicy/policy/policy_capabilities	2008-10-17 14:49:14.000000000 +0200
-+++ serefpolicy-3.5.13/policy/policy_capabilities	2009-01-19 18:50:31.000000000 +0100
++++ serefpolicy-3.5.13/policy/policy_capabilities	2009-01-19 20:07:59.000000000 +0100
 @@ -29,4 +29,4 @@
  # chr_file: open
  # blk_file: open
@@ -36894,7 +36916,7 @@
 +#policycap open_perms;
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/support/obj_perm_sets.spt serefpolicy-3.5.13/policy/support/obj_perm_sets.spt
 --- nsaserefpolicy/policy/support/obj_perm_sets.spt	2008-10-17 14:49:14.000000000 +0200
-+++ serefpolicy-3.5.13/policy/support/obj_perm_sets.spt	2009-01-19 18:50:31.000000000 +0100
++++ serefpolicy-3.5.13/policy/support/obj_perm_sets.spt	2009-01-19 20:07:59.000000000 +0100
 @@ -59,22 +59,22 @@
  # 
  # Permissions for executing files.
@@ -37044,7 +37066,7 @@
 +define(`manage_key_perms', `{ create link read search setattr view write } ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/users serefpolicy-3.5.13/policy/users
 --- nsaserefpolicy/policy/users	2008-10-17 14:49:11.000000000 +0200
-+++ serefpolicy-3.5.13/policy/users	2009-01-19 18:50:31.000000000 +0100
++++ serefpolicy-3.5.13/policy/users	2009-01-19 20:07:59.000000000 +0100
 @@ -25,11 +25,8 @@
  # permit any access to such users, then remove this entry.
  #
@@ -37071,7 +37093,7 @@
 +gen_user(root, user, unconfined_r sysadm_r staff_r ifdef(`enable_mls',`secadm_r auditadm_r') system_r, s0, s0 - mls_systemhigh, mcs_allcats)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/Rules.modular serefpolicy-3.5.13/Rules.modular
 --- nsaserefpolicy/Rules.modular	2008-10-17 14:49:14.000000000 +0200
-+++ serefpolicy-3.5.13/Rules.modular	2009-01-19 18:50:31.000000000 +0100
++++ serefpolicy-3.5.13/Rules.modular	2009-01-19 20:07:59.000000000 +0100
 @@ -73,8 +73,8 @@
  $(tmpdir)/%.mod: $(m4support) $(tmpdir)/generated_definitions.conf $(tmpdir)/all_interfaces.conf %.te
  	@echo "Compliling $(NAME) $(@F) module"
@@ -37120,7 +37142,7 @@
  $(appdir)/customizable_types: $(base_conf)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/support/Makefile.devel serefpolicy-3.5.13/support/Makefile.devel
 --- nsaserefpolicy/support/Makefile.devel	2008-10-17 14:49:14.000000000 +0200
-+++ serefpolicy-3.5.13/support/Makefile.devel	2009-01-19 18:50:31.000000000 +0100
++++ serefpolicy-3.5.13/support/Makefile.devel	2009-01-19 20:07:59.000000000 +0100
 @@ -181,8 +181,7 @@
  tmp/%.mod: $(m4support) tmp/all_interfaces.conf %.te
  	@$(EINFO) "Compiling $(NAME) $(basename $(@F)) module"



From rathann at fedoraproject.org  Mon Jan 19 19:41:44 2009
From: rathann at fedoraproject.org (Dominik Mierzejewski)
Date: Mon, 19 Jan 2009 19:41:44 +0000 (UTC)
Subject: rpms/mkvtoolnix/devel mkvtoolnix-git18da82.patch, NONE,
	1.1 mkvtoolnix-git706fa5.patch, NONE,
	1.1 mkvtoolnix-git7429ba.patch, NONE,
	1.1 mkvtoolnix-gita58727.patch, NONE, 1.1 .cvsignore, 1.8,
	1.9 mkvtoolnix.spec, 1.19, 1.20 sources, 1.8, 1.9
Message-ID: <20090119194144.96B39700F8@cvs1.fedora.phx.redhat.com>

Author: rathann

Update of /cvs/pkgs/rpms/mkvtoolnix/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30022

Modified Files:
	.cvsignore mkvtoolnix.spec sources 
Added Files:
	mkvtoolnix-git18da82.patch mkvtoolnix-git706fa5.patch 
	mkvtoolnix-git7429ba.patch mkvtoolnix-gita58727.patch 
Log Message:
* Mon Jan 19 2009 Dominik Mierzejewski <rpm at greysector.net> 2.4.2-1
- updated to 2.4.2
- dropped obsolete boost detection patch
- fixed segmentation fault in mmg (bug #477857)
- backported some minor fixes from current git


mkvtoolnix-git18da82.patch:

--- NEW FILE mkvtoolnix-git18da82.patch ---
From: Moritz Bunkus <moritz at bunkus.org>
Date: Sun, 18 Jan 2009 18:59:55 +0000 (+0100)
Subject: Removed extra % from output
X-Git-Url: https://www.bunkus.org/cgi-bin/gitweb.cgi?p=mkvtoolnix.git;a=commitdiff_plain;h=cdcb7a3f03285cf815db95a5b715a98b2718da82

Removed extra % from output

The strings are not passed through boost::filter; therefore one % is enough.
---

diff --git a/src/extract/mkvextract.cpp b/src/extract/mkvextract.cpp
index 03f6aef..6b2eac0 100644
--- a/src/extract/mkvextract.cpp
+++ b/src/extract/mkvextract.cpp
@@ -356,7 +356,7 @@ main(int argc,
     extract_tracks(input_file.c_str(), tracks);
 
     if (0 == verbose)
-      mxinfo(Y("Progress: 100%%\n"));
+      mxinfo(Y("Progress: 100%\n"));
 
   } else if (MODE_TAGS == mode)
     extract_tags(input_file.c_str(), s_parse_fully);
diff --git a/src/extract/timecodes_v2.cpp b/src/extract/timecodes_v2.cpp
index 175fa32..782f809 100644
--- a/src/extract/timecodes_v2.cpp
+++ b/src/extract/timecodes_v2.cpp
@@ -355,7 +355,7 @@ extract_timecodes(const string &file_name,
     close_timecode_files();
 
     if (0 == verbose)
-      mxinfo(Y("Progress: 100%%\n"));
+      mxinfo(Y("Progress: 100%\n"));
 
   } catch (...) {
     show_error(Y("Caught exception"));

mkvtoolnix-git706fa5.patch:

--- NEW FILE mkvtoolnix-git706fa5.patch ---
From: Moritz Bunkus <moritz at bunkus.org>
Date: Sun, 18 Jan 2009 16:42:19 +0000 (+0100)
Subject: Removed extra % from output
X-Git-Url: https://www.bunkus.org/cgi-bin/gitweb.cgi?p=mkvtoolnix.git;a=commitdiff_plain;h=9ddc19609e5daa9de51975c43b3a612f31706fa5

Removed extra % from output

The string is not passed through boost::filter; therefore one % is enough.
---

diff --git a/src/input/r_flac.cpp b/src/input/r_flac.cpp
index 2b4839a..6977337 100644
--- a/src/input/r_flac.cpp
+++ b/src/input/r_flac.cpp
@@ -384,7 +384,7 @@ flac_reader_c::parse_file() {
 #endif  // HAVE_FLAC_DECODER_SKIP
   }
 
-  mxinfo(Y("+-> Pre-parsing FLAC file: 100%%\n"));
+  mxinfo(Y("+-> Pre-parsing FLAC file: 100%\n"));
 
   if ((blocks.size() == 0) || (blocks[0].type != FLAC_BLOCK_TYPE_HEADERS))
     mxerror(Y("flac_reader: Could not read all header packets.\n"));

mkvtoolnix-git7429ba.patch:

--- NEW FILE mkvtoolnix-git7429ba.patch ---
From: Moritz Bunkus <moritz at bunkus.org>
Date: Sun, 18 Jan 2009 19:42:40 +0000 (+0100)
Subject: mkvextract: do not output timecodes in scientific notation
X-Git-Url: https://www.bunkus.org/cgi-bin/gitweb.cgi?p=mkvtoolnix.git;a=commitdiff_plain;h=b816b838a448e0c8eb8d284716afc1a95c7429ba

mkvextract: do not output timecodes in scientific notation

Huge timecodes were output in scientific notation because floating
point numbers were used. Now mkvextract creates the decimal and fractional
parts of the output itself so that the scientific notation will not be used.
---

diff --git a/ChangeLog b/ChangeLog
index 100b36a..dd8f205 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-01-18  Moritz Bunkus  <moritz at bunkus.org>
+
+	* mkvextract: bug fix: During timecode extraction mkvextract wrote
+	large timecodes in scientific notation.
+
 2009-01-17  Moritz Bunkus  <moritz at bunkus.org>
 
 	* Released v2.4.2.
diff --git a/src/extract/timecodes_v2.cpp b/src/extract/timecodes_v2.cpp
index 782f809..33f3440 100644
--- a/src/extract/timecodes_v2.cpp
+++ b/src/extract/timecodes_v2.cpp
@@ -58,6 +58,24 @@ static vector<timecode_extractor_t> timecode_extractors;
 
 // ------------------------------------------------------------------------
 
+static std::string
+format_timecode_for_timecode_file(int64_t timecode) {
+  std::string output      = (boost::format("%1%") % (int64_t)(timecode / 1000000)).str();
+  int64_t fractional_part = timecode % 1000000;
+
+  if (0 != fractional_part) {
+    output                       += (boost::format(".%06d") % fractional_part).str();
+    std::string::iterator zeroes  = output.end() - 1;
+
+    while (*zeroes == '0')
+      --zeroes;
+
+    output.erase(zeroes + 1, output.end());
+  }
+
+  return output;
+}
+
 static void
 close_timecode_files() {
   vector<timecode_extractor_t>::iterator extractor;
@@ -68,7 +86,7 @@ close_timecode_files() {
 
     sort(timecodes.begin(), timecodes.end());
     mxforeach(timecode, timecodes)
-      extractor->m_file->puts(boost::format("%1%\n") % (((double)(*timecode)) / 1000000.0));
+      extractor->m_file->puts(boost::format("%1%\n") % format_timecode_for_timecode_file(*timecode));
     delete extractor->m_file;
   }
   timecode_extractors.clear();

mkvtoolnix-gita58727.patch:

--- NEW FILE mkvtoolnix-gita58727.patch ---
From: Moritz Bunkus <moritz at bunkus.org>
Date: Mon, 19 Jan 2009 12:53:05 +0000 (+0100)
Subject: Test for NULL.
X-Git-Url: https://www.bunkus.org/cgi-bin/gitweb.cgi?p=mkvtoolnix.git;a=commitdiff_plain;h=f86b13a873eb6edce668a77601488439dca58727

Test for NULL.

The chapter editor does not assign an item data element to the root
element. Therefore the function should check if said item data element
is NULL before using it causing a crash otherwise.
---

diff --git a/ChangeLog b/ChangeLog
index dd8f205..0ff23b1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-01-19  Moritz Bunkus  <moritz at bunkus.org>
+
+	* mmg: bug fix: It was possible to crash mmg by clicking onto the
+	root element in the chapter editor.
+
 2009-01-18  Moritz Bunkus  <moritz at bunkus.org>
 
 	* mkvextract: bug fix: During timecode extraction mkvextract wrote
diff --git a/src/mmg/tab_chapters.cpp b/src/mmg/tab_chapters.cpp
index 3fefb3e..868567f 100644
--- a/src/mmg/tab_chapters.cpp
+++ b/src/mmg/tab_chapters.cpp
@@ -1703,7 +1703,7 @@ tab_chapters::on_chapter_name_selected(wxCommandEvent &evt) {
   if (!id.IsOk())
     return;
   t = (chapter_node_data_c *)tc_chapters->GetItemData(id);
-  if (!t->is_atom)
+  if (!t || !t->is_atom)
     return;
   cdisplay = NULL;
   n = 0;


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mkvtoolnix/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	19 Jan 2009 18:11:26 -0000	1.8
+++ .cvsignore	19 Jan 2009 19:41:44 -0000	1.9
@@ -1 +1 @@
-mkvtoolnix-2.4.1.tar.bz2
+mkvtoolnix-2.4.2.tar.bz2


Index: mkvtoolnix.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mkvtoolnix/devel/mkvtoolnix.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- mkvtoolnix.spec	19 Jan 2009 18:11:26 -0000	1.19
+++ mkvtoolnix.spec	19 Jan 2009 19:41:44 -0000	1.20
@@ -1,12 +1,16 @@
 Summary: Matroska container manipulation utilities
 Name: mkvtoolnix
-Version: 2.4.1
+Version: 2.4.2
 Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/Multimedia
 Source0: http://www.bunkus.org/videotools/mkvtoolnix/sources/%{name}-%{version}.tar.bz2
 Source1: mmg.desktop
 Source2: mkvinfo.desktop
+Patch0: %{name}-git18da82.patch
+Patch1: %{name}-git706fa5.patch
+Patch2: %{name}-git7429ba.patch
+Patch3: %{name}-gita58727.patch
 URL: http://www.bunkus.org/videotools/mkvtoolnix/index.html
 BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
 BuildRequires: boost-devel
@@ -37,6 +41,10 @@
 
 %prep
 %setup -q
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
 sed -i -e 's/"-O3"/""/' configure*
 for file in AUTHORS ChangeLog ; do
   iconv -f iso8859-1 -t utf8 $file >$file.utf && \
@@ -111,9 +119,11 @@
 %{_datadir}/icons/hicolor/32x32/apps/mmg.xpm
 
 %changelog
-* Mon Jan 19 2009 Dominik Mierzejewski <rpm at greysector.net> 2.4.1-1
-- updated to 2.4.1
+* Mon Jan 19 2009 Dominik Mierzejewski <rpm at greysector.net> 2.4.2-1
+- updated to 2.4.2
 - dropped obsolete boost detection patch
+- fixed segmentation fault in mmg (bug #477857)
+- backported some minor fixes from current git
 
 * Wed Dec 17 2008 Benjamin Kosnik  <bkoz at redhat.com> 2.4.0-4
 - Rebuild for boost-1.37.0.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mkvtoolnix/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	19 Jan 2009 18:11:26 -0000	1.8
+++ sources	19 Jan 2009 19:41:44 -0000	1.9
@@ -1 +1 @@
-b3f3763e3bc09aa797f6d65ad4974108  mkvtoolnix-2.4.1.tar.bz2
+050bc9019cfa10e243f17b5e84f5a05f  mkvtoolnix-2.4.2.tar.bz2



From rathann at fedoraproject.org  Mon Jan 19 19:46:33 2009
From: rathann at fedoraproject.org (Dominik Mierzejewski)
Date: Mon, 19 Jan 2009 19:46:33 +0000 (UTC)
Subject: rpms/mkvtoolnix/F-10 mkvtoolnix-git18da82.patch, NONE,
	1.1 mkvtoolnix-git706fa5.patch, NONE,
	1.1 mkvtoolnix-git7429ba.patch, NONE,
	1.1 mkvtoolnix-gita58727.patch, NONE, 1.1 .cvsignore, 1.7,
	1.8 mkvtoolnix.spec, 1.8, 1.9 sources, 1.7,
	1.8 mkvtoolnix-boost-lib64.patch, 1.1, NONE
Message-ID: <20090119194633.E0955700F8@cvs1.fedora.phx.redhat.com>

Author: rathann

Update of /cvs/pkgs/rpms/mkvtoolnix/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30744

Modified Files:
	.cvsignore mkvtoolnix.spec sources 
Added Files:
	mkvtoolnix-git18da82.patch mkvtoolnix-git706fa5.patch 
	mkvtoolnix-git7429ba.patch mkvtoolnix-gita58727.patch 
Removed Files:
	mkvtoolnix-boost-lib64.patch 
Log Message:
* Mon Jan 19 2009 Dominik Mierzejewski <rpm at greysector.net> 2.4.2-1
- updated to 2.4.2
- dropped obsolete boost detection patch
- fixed segmentation fault in mmg (bug #477857)
- backported some minor fixes from current git


mkvtoolnix-git18da82.patch:

--- NEW FILE mkvtoolnix-git18da82.patch ---
From: Moritz Bunkus <moritz at bunkus.org>
Date: Sun, 18 Jan 2009 18:59:55 +0000 (+0100)
Subject: Removed extra % from output
X-Git-Url: https://www.bunkus.org/cgi-bin/gitweb.cgi?p=mkvtoolnix.git;a=commitdiff_plain;h=cdcb7a3f03285cf815db95a5b715a98b2718da82

Removed extra % from output

The strings are not passed through boost::filter; therefore one % is enough.
---

diff --git a/src/extract/mkvextract.cpp b/src/extract/mkvextract.cpp
index 03f6aef..6b2eac0 100644
--- a/src/extract/mkvextract.cpp
+++ b/src/extract/mkvextract.cpp
@@ -356,7 +356,7 @@ main(int argc,
     extract_tracks(input_file.c_str(), tracks);
 
     if (0 == verbose)
-      mxinfo(Y("Progress: 100%%\n"));
+      mxinfo(Y("Progress: 100%\n"));
 
   } else if (MODE_TAGS == mode)
     extract_tags(input_file.c_str(), s_parse_fully);
diff --git a/src/extract/timecodes_v2.cpp b/src/extract/timecodes_v2.cpp
index 175fa32..782f809 100644
--- a/src/extract/timecodes_v2.cpp
+++ b/src/extract/timecodes_v2.cpp
@@ -355,7 +355,7 @@ extract_timecodes(const string &file_name,
     close_timecode_files();
 
     if (0 == verbose)
-      mxinfo(Y("Progress: 100%%\n"));
+      mxinfo(Y("Progress: 100%\n"));
 
   } catch (...) {
     show_error(Y("Caught exception"));

mkvtoolnix-git706fa5.patch:

--- NEW FILE mkvtoolnix-git706fa5.patch ---
From: Moritz Bunkus <moritz at bunkus.org>
Date: Sun, 18 Jan 2009 16:42:19 +0000 (+0100)
Subject: Removed extra % from output
X-Git-Url: https://www.bunkus.org/cgi-bin/gitweb.cgi?p=mkvtoolnix.git;a=commitdiff_plain;h=9ddc19609e5daa9de51975c43b3a612f31706fa5

Removed extra % from output

The string is not passed through boost::filter; therefore one % is enough.
---

diff --git a/src/input/r_flac.cpp b/src/input/r_flac.cpp
index 2b4839a..6977337 100644
--- a/src/input/r_flac.cpp
+++ b/src/input/r_flac.cpp
@@ -384,7 +384,7 @@ flac_reader_c::parse_file() {
 #endif  // HAVE_FLAC_DECODER_SKIP
   }
 
-  mxinfo(Y("+-> Pre-parsing FLAC file: 100%%\n"));
+  mxinfo(Y("+-> Pre-parsing FLAC file: 100%\n"));
 
   if ((blocks.size() == 0) || (blocks[0].type != FLAC_BLOCK_TYPE_HEADERS))
     mxerror(Y("flac_reader: Could not read all header packets.\n"));

mkvtoolnix-git7429ba.patch:

--- NEW FILE mkvtoolnix-git7429ba.patch ---
From: Moritz Bunkus <moritz at bunkus.org>
Date: Sun, 18 Jan 2009 19:42:40 +0000 (+0100)
Subject: mkvextract: do not output timecodes in scientific notation
X-Git-Url: https://www.bunkus.org/cgi-bin/gitweb.cgi?p=mkvtoolnix.git;a=commitdiff_plain;h=b816b838a448e0c8eb8d284716afc1a95c7429ba

mkvextract: do not output timecodes in scientific notation

Huge timecodes were output in scientific notation because floating
point numbers were used. Now mkvextract creates the decimal and fractional
parts of the output itself so that the scientific notation will not be used.
---

diff --git a/ChangeLog b/ChangeLog
index 100b36a..dd8f205 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-01-18  Moritz Bunkus  <moritz at bunkus.org>
+
+	* mkvextract: bug fix: During timecode extraction mkvextract wrote
+	large timecodes in scientific notation.
+
 2009-01-17  Moritz Bunkus  <moritz at bunkus.org>
 
 	* Released v2.4.2.
diff --git a/src/extract/timecodes_v2.cpp b/src/extract/timecodes_v2.cpp
index 782f809..33f3440 100644
--- a/src/extract/timecodes_v2.cpp
+++ b/src/extract/timecodes_v2.cpp
@@ -58,6 +58,24 @@ static vector<timecode_extractor_t> timecode_extractors;
 
 // ------------------------------------------------------------------------
 
+static std::string
+format_timecode_for_timecode_file(int64_t timecode) {
+  std::string output      = (boost::format("%1%") % (int64_t)(timecode / 1000000)).str();
+  int64_t fractional_part = timecode % 1000000;
+
+  if (0 != fractional_part) {
+    output                       += (boost::format(".%06d") % fractional_part).str();
+    std::string::iterator zeroes  = output.end() - 1;
+
+    while (*zeroes == '0')
+      --zeroes;
+
+    output.erase(zeroes + 1, output.end());
+  }
+
+  return output;
+}
+
 static void
 close_timecode_files() {
   vector<timecode_extractor_t>::iterator extractor;
@@ -68,7 +86,7 @@ close_timecode_files() {
 
     sort(timecodes.begin(), timecodes.end());
     mxforeach(timecode, timecodes)
-      extractor->m_file->puts(boost::format("%1%\n") % (((double)(*timecode)) / 1000000.0));
+      extractor->m_file->puts(boost::format("%1%\n") % format_timecode_for_timecode_file(*timecode));
     delete extractor->m_file;
   }
   timecode_extractors.clear();

mkvtoolnix-gita58727.patch:

--- NEW FILE mkvtoolnix-gita58727.patch ---
From: Moritz Bunkus <moritz at bunkus.org>
Date: Mon, 19 Jan 2009 12:53:05 +0000 (+0100)
Subject: Test for NULL.
X-Git-Url: https://www.bunkus.org/cgi-bin/gitweb.cgi?p=mkvtoolnix.git;a=commitdiff_plain;h=f86b13a873eb6edce668a77601488439dca58727

Test for NULL.

The chapter editor does not assign an item data element to the root
element. Therefore the function should check if said item data element
is NULL before using it causing a crash otherwise.
---

diff --git a/ChangeLog b/ChangeLog
index dd8f205..0ff23b1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-01-19  Moritz Bunkus  <moritz at bunkus.org>
+
+	* mmg: bug fix: It was possible to crash mmg by clicking onto the
+	root element in the chapter editor.
+
 2009-01-18  Moritz Bunkus  <moritz at bunkus.org>
 
 	* mkvextract: bug fix: During timecode extraction mkvextract wrote
diff --git a/src/mmg/tab_chapters.cpp b/src/mmg/tab_chapters.cpp
index 3fefb3e..868567f 100644
--- a/src/mmg/tab_chapters.cpp
+++ b/src/mmg/tab_chapters.cpp
@@ -1703,7 +1703,7 @@ tab_chapters::on_chapter_name_selected(wxCommandEvent &evt) {
   if (!id.IsOk())
     return;
   t = (chapter_node_data_c *)tc_chapters->GetItemData(id);
-  if (!t->is_atom)
+  if (!t || !t->is_atom)
     return;
   cdisplay = NULL;
   n = 0;


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mkvtoolnix/F-10/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	1 Dec 2008 21:06:46 -0000	1.7
+++ .cvsignore	19 Jan 2009 19:46:03 -0000	1.8
@@ -1 +1 @@
-mkvtoolnix-2.4.0.tar.bz2
+mkvtoolnix-2.4.2.tar.bz2


Index: mkvtoolnix.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mkvtoolnix/F-10/mkvtoolnix.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- mkvtoolnix.spec	1 Dec 2008 21:02:23 -0000	1.8
+++ mkvtoolnix.spec	19 Jan 2009 19:46:03 -0000	1.9
@@ -1,13 +1,16 @@
 Summary: Matroska container manipulation utilities
 Name: mkvtoolnix
-Version: 2.4.0
+Version: 2.4.2
 Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/Multimedia
 Source0: http://www.bunkus.org/videotools/mkvtoolnix/sources/%{name}-%{version}.tar.bz2
 Source1: mmg.desktop
 Source2: mkvinfo.desktop
-Patch1: %{name}-boost-lib64.patch
+Patch0: %{name}-git18da82.patch
+Patch1: %{name}-git706fa5.patch
+Patch2: %{name}-git7429ba.patch
+Patch3: %{name}-gita58727.patch
 URL: http://www.bunkus.org/videotools/mkvtoolnix/index.html
 BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
 BuildRequires: boost-devel
@@ -38,7 +41,10 @@
 
 %prep
 %setup -q
-%patch1 -p1 -b .lib64
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
 sed -i -e 's/"-O3"/""/' configure*
 for file in AUTHORS ChangeLog ; do
   iconv -f iso8859-1 -t utf8 $file >$file.utf && \
@@ -113,6 +119,12 @@
 %{_datadir}/icons/hicolor/32x32/apps/mmg.xpm
 
 %changelog
+* Mon Jan 19 2009 Dominik Mierzejewski <rpm at greysector.net> 2.4.2-1
+- updated to 2.4.2
+- dropped obsolete boost detection patch
+- fixed segmentation fault in mmg (bug #477857)
+- backported some minor fixes from current git
+
 * Mon Dec 01 2008 Dominik Mierzejewski <rpm at greysector.net> 2.4.0-1
 - dropped obsolete mkvtoolnix-gcc43.patch
 - fixed boost detection on ppc64 (and sparc64) (bug #473976)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mkvtoolnix/F-10/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	1 Dec 2008 21:06:46 -0000	1.7
+++ sources	19 Jan 2009 19:46:03 -0000	1.8
@@ -1 +1 @@
-125a6305de16236754d7554fa5b597cf  mkvtoolnix-2.4.0.tar.bz2
+050bc9019cfa10e243f17b5e84f5a05f  mkvtoolnix-2.4.2.tar.bz2


--- mkvtoolnix-boost-lib64.patch DELETED ---



From rathann at fedoraproject.org  Mon Jan 19 19:48:55 2009
From: rathann at fedoraproject.org (Dominik Mierzejewski)
Date: Mon, 19 Jan 2009 19:48:55 +0000 (UTC)
Subject: rpms/mkvtoolnix/F-9 mkvtoolnix-git18da82.patch, NONE,
	1.1 mkvtoolnix-git706fa5.patch, NONE,
	1.1 mkvtoolnix-git7429ba.patch, NONE,
	1.1 mkvtoolnix-gita58727.patch, NONE, 1.1 .cvsignore, 1.7,
	1.8 mkvtoolnix.spec, 1.8, 1.9 sources, 1.7,
	1.8 mkvtoolnix-boost-lib64.patch, 1.1, NONE
Message-ID: <20090119194855.686EC700F8@cvs1.fedora.phx.redhat.com>

Author: rathann

Update of /cvs/pkgs/rpms/mkvtoolnix/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31105

Modified Files:
	.cvsignore mkvtoolnix.spec sources 
Added Files:
	mkvtoolnix-git18da82.patch mkvtoolnix-git706fa5.patch 
	mkvtoolnix-git7429ba.patch mkvtoolnix-gita58727.patch 
Removed Files:
	mkvtoolnix-boost-lib64.patch 
Log Message:
* Mon Jan 19 2009 Dominik Mierzejewski <rpm at greysector.net> 2.4.2-1
- updated to 2.4.2
- dropped obsolete boost detection patch
- fixed segmentation fault in mmg (bug #477857)
- backported some minor fixes from current git


mkvtoolnix-git18da82.patch:

--- NEW FILE mkvtoolnix-git18da82.patch ---
From: Moritz Bunkus <moritz at bunkus.org>
Date: Sun, 18 Jan 2009 18:59:55 +0000 (+0100)
Subject: Removed extra % from output
X-Git-Url: https://www.bunkus.org/cgi-bin/gitweb.cgi?p=mkvtoolnix.git;a=commitdiff_plain;h=cdcb7a3f03285cf815db95a5b715a98b2718da82

Removed extra % from output

The strings are not passed through boost::filter; therefore one % is enough.
---

diff --git a/src/extract/mkvextract.cpp b/src/extract/mkvextract.cpp
index 03f6aef..6b2eac0 100644
--- a/src/extract/mkvextract.cpp
+++ b/src/extract/mkvextract.cpp
@@ -356,7 +356,7 @@ main(int argc,
     extract_tracks(input_file.c_str(), tracks);
 
     if (0 == verbose)
-      mxinfo(Y("Progress: 100%%\n"));
+      mxinfo(Y("Progress: 100%\n"));
 
   } else if (MODE_TAGS == mode)
     extract_tags(input_file.c_str(), s_parse_fully);
diff --git a/src/extract/timecodes_v2.cpp b/src/extract/timecodes_v2.cpp
index 175fa32..782f809 100644
--- a/src/extract/timecodes_v2.cpp
+++ b/src/extract/timecodes_v2.cpp
@@ -355,7 +355,7 @@ extract_timecodes(const string &file_name,
     close_timecode_files();
 
     if (0 == verbose)
-      mxinfo(Y("Progress: 100%%\n"));
+      mxinfo(Y("Progress: 100%\n"));
 
   } catch (...) {
     show_error(Y("Caught exception"));

mkvtoolnix-git706fa5.patch:

--- NEW FILE mkvtoolnix-git706fa5.patch ---
From: Moritz Bunkus <moritz at bunkus.org>
Date: Sun, 18 Jan 2009 16:42:19 +0000 (+0100)
Subject: Removed extra % from output
X-Git-Url: https://www.bunkus.org/cgi-bin/gitweb.cgi?p=mkvtoolnix.git;a=commitdiff_plain;h=9ddc19609e5daa9de51975c43b3a612f31706fa5

Removed extra % from output

The string is not passed through boost::filter; therefore one % is enough.
---

diff --git a/src/input/r_flac.cpp b/src/input/r_flac.cpp
index 2b4839a..6977337 100644
--- a/src/input/r_flac.cpp
+++ b/src/input/r_flac.cpp
@@ -384,7 +384,7 @@ flac_reader_c::parse_file() {
 #endif  // HAVE_FLAC_DECODER_SKIP
   }
 
-  mxinfo(Y("+-> Pre-parsing FLAC file: 100%%\n"));
+  mxinfo(Y("+-> Pre-parsing FLAC file: 100%\n"));
 
   if ((blocks.size() == 0) || (blocks[0].type != FLAC_BLOCK_TYPE_HEADERS))
     mxerror(Y("flac_reader: Could not read all header packets.\n"));

mkvtoolnix-git7429ba.patch:

--- NEW FILE mkvtoolnix-git7429ba.patch ---
From: Moritz Bunkus <moritz at bunkus.org>
Date: Sun, 18 Jan 2009 19:42:40 +0000 (+0100)
Subject: mkvextract: do not output timecodes in scientific notation
X-Git-Url: https://www.bunkus.org/cgi-bin/gitweb.cgi?p=mkvtoolnix.git;a=commitdiff_plain;h=b816b838a448e0c8eb8d284716afc1a95c7429ba

mkvextract: do not output timecodes in scientific notation

Huge timecodes were output in scientific notation because floating
point numbers were used. Now mkvextract creates the decimal and fractional
parts of the output itself so that the scientific notation will not be used.
---

diff --git a/ChangeLog b/ChangeLog
index 100b36a..dd8f205 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-01-18  Moritz Bunkus  <moritz at bunkus.org>
+
+	* mkvextract: bug fix: During timecode extraction mkvextract wrote
+	large timecodes in scientific notation.
+
 2009-01-17  Moritz Bunkus  <moritz at bunkus.org>
 
 	* Released v2.4.2.
diff --git a/src/extract/timecodes_v2.cpp b/src/extract/timecodes_v2.cpp
index 782f809..33f3440 100644
--- a/src/extract/timecodes_v2.cpp
+++ b/src/extract/timecodes_v2.cpp
@@ -58,6 +58,24 @@ static vector<timecode_extractor_t> timecode_extractors;
 
 // ------------------------------------------------------------------------
 
+static std::string
+format_timecode_for_timecode_file(int64_t timecode) {
+  std::string output      = (boost::format("%1%") % (int64_t)(timecode / 1000000)).str();
+  int64_t fractional_part = timecode % 1000000;
+
+  if (0 != fractional_part) {
+    output                       += (boost::format(".%06d") % fractional_part).str();
+    std::string::iterator zeroes  = output.end() - 1;
+
+    while (*zeroes == '0')
+      --zeroes;
+
+    output.erase(zeroes + 1, output.end());
+  }
+
+  return output;
+}
+
 static void
 close_timecode_files() {
   vector<timecode_extractor_t>::iterator extractor;
@@ -68,7 +86,7 @@ close_timecode_files() {
 
     sort(timecodes.begin(), timecodes.end());
     mxforeach(timecode, timecodes)
-      extractor->m_file->puts(boost::format("%1%\n") % (((double)(*timecode)) / 1000000.0));
+      extractor->m_file->puts(boost::format("%1%\n") % format_timecode_for_timecode_file(*timecode));
     delete extractor->m_file;
   }
   timecode_extractors.clear();

mkvtoolnix-gita58727.patch:

--- NEW FILE mkvtoolnix-gita58727.patch ---
From: Moritz Bunkus <moritz at bunkus.org>
Date: Mon, 19 Jan 2009 12:53:05 +0000 (+0100)
Subject: Test for NULL.
X-Git-Url: https://www.bunkus.org/cgi-bin/gitweb.cgi?p=mkvtoolnix.git;a=commitdiff_plain;h=f86b13a873eb6edce668a77601488439dca58727

Test for NULL.

The chapter editor does not assign an item data element to the root
element. Therefore the function should check if said item data element
is NULL before using it causing a crash otherwise.
---

diff --git a/ChangeLog b/ChangeLog
index dd8f205..0ff23b1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-01-19  Moritz Bunkus  <moritz at bunkus.org>
+
+	* mmg: bug fix: It was possible to crash mmg by clicking onto the
+	root element in the chapter editor.
+
 2009-01-18  Moritz Bunkus  <moritz at bunkus.org>
 
 	* mkvextract: bug fix: During timecode extraction mkvextract wrote
diff --git a/src/mmg/tab_chapters.cpp b/src/mmg/tab_chapters.cpp
index 3fefb3e..868567f 100644
--- a/src/mmg/tab_chapters.cpp
+++ b/src/mmg/tab_chapters.cpp
@@ -1703,7 +1703,7 @@ tab_chapters::on_chapter_name_selected(wxCommandEvent &evt) {
   if (!id.IsOk())
     return;
   t = (chapter_node_data_c *)tc_chapters->GetItemData(id);
-  if (!t->is_atom)
+  if (!t || !t->is_atom)
     return;
   cdisplay = NULL;
   n = 0;


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mkvtoolnix/F-9/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	1 Dec 2008 21:08:43 -0000	1.7
+++ .cvsignore	19 Jan 2009 19:48:24 -0000	1.8
@@ -1 +1 @@
-mkvtoolnix-2.4.0.tar.bz2
+mkvtoolnix-2.4.2.tar.bz2


Index: mkvtoolnix.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mkvtoolnix/F-9/mkvtoolnix.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- mkvtoolnix.spec	1 Dec 2008 21:04:19 -0000	1.8
+++ mkvtoolnix.spec	19 Jan 2009 19:48:25 -0000	1.9
@@ -1,13 +1,16 @@
 Summary: Matroska container manipulation utilities
 Name: mkvtoolnix
-Version: 2.4.0
+Version: 2.4.2
 Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/Multimedia
 Source0: http://www.bunkus.org/videotools/mkvtoolnix/sources/%{name}-%{version}.tar.bz2
 Source1: mmg.desktop
 Source2: mkvinfo.desktop
-Patch1: %{name}-boost-lib64.patch
+Patch0: %{name}-git18da82.patch
+Patch1: %{name}-git706fa5.patch
+Patch2: %{name}-git7429ba.patch
+Patch3: %{name}-gita58727.patch
 URL: http://www.bunkus.org/videotools/mkvtoolnix/index.html
 BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
 BuildRequires: boost-devel
@@ -38,7 +41,10 @@
 
 %prep
 %setup -q
-%patch1 -p1 -b .lib64
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
 sed -i -e 's/"-O3"/""/' configure*
 for file in AUTHORS ChangeLog ; do
   iconv -f iso8859-1 -t utf8 $file >$file.utf && \
@@ -113,6 +119,12 @@
 %{_datadir}/icons/hicolor/32x32/apps/mmg.xpm
 
 %changelog
+* Mon Jan 19 2009 Dominik Mierzejewski <rpm at greysector.net> 2.4.2-1
+- updated to 2.4.2
+- dropped obsolete boost detection patch
+- fixed segmentation fault in mmg (bug #477857)
+- backported some minor fixes from current git
+
 * Mon Dec 01 2008 Dominik Mierzejewski <rpm at greysector.net> 2.4.0-1
 - dropped obsolete mkvtoolnix-gcc43.patch
 - fixed boost detection on ppc64 (and sparc64) (bug #473976)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mkvtoolnix/F-9/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	1 Dec 2008 21:08:43 -0000	1.7
+++ sources	19 Jan 2009 19:48:25 -0000	1.8
@@ -1 +1 @@
-125a6305de16236754d7554fa5b597cf  mkvtoolnix-2.4.0.tar.bz2
+050bc9019cfa10e243f17b5e84f5a05f  mkvtoolnix-2.4.2.tar.bz2


--- mkvtoolnix-boost-lib64.patch DELETED ---



From than at fedoraproject.org  Mon Jan 19 19:58:04 2009
From: than at fedoraproject.org (Than Ngo)
Date: Mon, 19 Jan 2009 19:58:04 +0000 (UTC)
Subject: rpms/kdesdk/devel kdesdk-4.1.96-boost-1.37.patch, NONE,
	1.1 kdesdk.spec, 1.131,
	1.132 kdesdk-4.1.96-boost137-workaround.patch, 1.1, NONE
Message-ID: <20090119195804.36796700F8@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdesdk/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32358

Modified Files:
	kdesdk.spec 
Added Files:
	kdesdk-4.1.96-boost-1.37.patch 
Removed Files:
	kdesdk-4.1.96-boost137-workaround.patch 
Log Message:
apply patch to fix  build against Boost 1.37.0


kdesdk-4.1.96-boost-1.37.patch:

--- NEW FILE kdesdk-4.1.96-boost-1.37.patch ---
--- kdesdk/umbrello/umbrello/codeimport/kdevcppparser/lexer.h	2009/01/19 15:43:21	913606
+++ kdesdk/umbrello/umbrello/codeimport/kdevcppparser/lexer.h	2009/01/19 15:46:29	913607
@@ -105,8 +105,8 @@
     QChar currentChar() const {
       return m_ptr != m_endPtr ? *m_ptr : QChar::null;
     }
-    bool eof() const {return m_ptr >= m_endPtr;}
-    int length() const {return m_endPtr - m_ptr;}
+    bool eof() const {return m_ptr == m_endPtr;}
+    int length() const {return std::distance(m_ptr, m_endPtr);}
     void nextChar() {
       QChar l_current = *m_ptr++;
       switch( l_current.toAscii()) {
--- kdesdk/umbrello/umbrello/codeimport/kdevcppparser/preprocesslexer.h	2009/01/19 15:43:21	913606
+++ kdesdk/umbrello/umbrello/codeimport/kdevcppparser/preprocesslexer.h	2009/01/19 15:46:29	913607
@@ -264,8 +264,8 @@
     QChar currentChar() const {
       return m_ptr != m_endPtr ? *m_ptr : QChar::null;
     }
-    bool eof() const {return m_ptr >= m_endPtr;}
-    int length() const {return m_endPtr - m_ptr;}
+    bool eof() const {return m_ptr == m_endPtr;}
+    int length() const {return std::distance(m_ptr, m_endPtr);}
     void nextChar() {
       QChar l_current = *m_ptr++;
     }


Index: kdesdk.spec
===================================================================
RCS file: /cvs/extras/rpms/kdesdk/devel/kdesdk.spec,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -r1.131 -r1.132
--- kdesdk.spec	13 Jan 2009 17:09:30 -0000	1.131
+++ kdesdk.spec	19 Jan 2009 19:57:33 -0000	1.132
@@ -1,6 +1,6 @@
 Name:           kdesdk
 Version:        4.1.96
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        The KDE Software Development Kit (SDK)
 
 Group:          User Interface/Desktops
@@ -8,8 +8,8 @@
 License:        GPLv2
 URL:            http://www.kde.org/
 Source0:        ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/%{name}-%{version}.tar.bz2
-# Fix build with Boost 1.37 (but does not look like the correct fix to me) -- Kevin
-Patch0:         kdesdk-4.1.96-boost137-workaround.patch
+# upstream patches
+Patch100:       kdesdk-4.1.96-boost-1.37.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  kdepimlibs-devel >= %{version}
@@ -81,10 +81,9 @@
 
 %prep
 %setup -q
-%if 0%{?fedora} >= 11
-%patch0 -p1 -b .boost137-workaround
-%endif
 
+# upstream patches
+%patch100 -p1 -b .boost-1.37
 
 %build
 mkdir -p %{_target_platform}
@@ -218,6 +217,9 @@
 
 
 %changelog
+* Mon Jan 19 2009 Than Ngo <than at redhat.com> - 4.1.96-4
+- apply patch to fix  build against Boost 1.37.0 
+
 * Tue Jan 13 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.96-3
 - F11+: add workaround to fix build against Boost 1.37.0
 


--- kdesdk-4.1.96-boost137-workaround.patch DELETED ---



From rathann at fedoraproject.org  Mon Jan 19 20:19:41 2009
From: rathann at fedoraproject.org (Dominik Mierzejewski)
Date: Mon, 19 Jan 2009 20:19:41 +0000 (UTC)
Subject: rpms/mkvtoolnix/devel mkvtoolnix-ppc64.patch, NONE,
	1.1 mkvtoolnix.spec, 1.20, 1.21
Message-ID: <20090119201941.E915F700F8@cvs1.fedora.phx.redhat.com>

Author: rathann

Update of /cvs/pkgs/rpms/mkvtoolnix/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2989

Modified Files:
	mkvtoolnix.spec 
Added Files:
	mkvtoolnix-ppc64.patch 
Log Message:
- fixed build on ppc64 again

mkvtoolnix-ppc64.patch:

--- NEW FILE mkvtoolnix-ppc64.patch ---
diff -up mkvtoolnix-2.4.2/ac/ax_boost_base.m4.ppc64 mkvtoolnix-2.4.2/ac/ax_boost_base.m4
--- mkvtoolnix-2.4.2/ac/ax_boost_base.m4.ppc64	2009-01-17 22:07:31.000000000 +0100
+++ mkvtoolnix-2.4.2/ac/ax_boost_base.m4	2009-01-19 21:15:17.000000000 +0100
@@ -87,7 +87,7 @@ AC_DEFUN([AX_BOOST_BASE],
     dnl or if you install boost with RPM
     if test "$ac_boost_path" != ""; then
         case $target in
-             ppc64*|sparc64*|x86_64*) BOOST_LDFLAGS="-L$ac_boost_path/lib64" ;;
+             powerpc64*|ppc64*|sparc64*|x86_64*) BOOST_LDFLAGS="-L$ac_boost_path/lib64" ;;
              *)                       BOOST_LDFLAGS="-L$ac_boost_path/lib" ;;
         esac
         BOOST_CPPFLAGS="-I$ac_boost_path/include"
@@ -95,7 +95,7 @@ AC_DEFUN([AX_BOOST_BASE],
         for ac_boost_path_tmp in /usr /usr/local /opt /opt/local ; do
             if test -d "$ac_boost_path_tmp/include/boost" && test -r "$ac_boost_path_tmp/include/boost"; then
                 case $target in
-                     ppc64*|sparc64*|x86_64*) BOOST_LDFLAGS="-L$ac_boost_path_tmp/lib64" ;;
+                     powerpc64*|ppc64*|sparc64*|x86_64*) BOOST_LDFLAGS="-L$ac_boost_path_tmp/lib64" ;;
                      *)                       BOOST_LDFLAGS="-L$ac_boost_path_tmp/lib" ;;
                 esac
                 BOOST_CPPFLAGS="-I$ac_boost_path_tmp/include"
@@ -172,7 +172,7 @@ AC_DEFUN([AX_BOOST_BASE],
             if test "$ac_boost_lib_path" = ""
             then
                 case $target in
-                     ppc64*|sparc64*|x86_64*) BOOST_LDFLAGS="-L$best_path/lib64" ;;
+                     powerpc64*|ppc64*|sparc64*|x86_64*) BOOST_LDFLAGS="-L$best_path/lib64" ;;
                      *)                       BOOST_LDFLAGS="-L$best_path/lib" ;;
                 esac
             fi
diff -up mkvtoolnix-2.4.2/configure.ppc64 mkvtoolnix-2.4.2/configure
--- mkvtoolnix-2.4.2/configure.ppc64	2009-01-19 20:26:17.000000000 +0100
+++ mkvtoolnix-2.4.2/configure	2009-01-19 21:15:37.000000000 +0100
@@ -10095,7 +10095,7 @@ echo $ECHO_N "checking for boostlib >= $
 
                 if test "$ac_boost_path" != ""; then
         case $target in
-             ppc64*|sparc64*|x86_64*) BOOST_LDFLAGS="-L$ac_boost_path/lib64" ;;
+             powerpc64*|ppc64*|sparc64*|x86_64*) BOOST_LDFLAGS="-L$ac_boost_path/lib64" ;;
              *)                       BOOST_LDFLAGS="-L$ac_boost_path/lib" ;;
         esac
         BOOST_CPPFLAGS="-I$ac_boost_path/include"
@@ -10103,7 +10103,7 @@ echo $ECHO_N "checking for boostlib >= $
         for ac_boost_path_tmp in /usr /usr/local /opt /opt/local ; do
             if test -d "$ac_boost_path_tmp/include/boost" && test -r "$ac_boost_path_tmp/include/boost"; then
                 case $target in
-                     ppc64*|sparc64*|x86_64*) BOOST_LDFLAGS="-L$ac_boost_path_tmp/lib64" ;;
+                     powerpc64*|ppc64*|sparc64*|x86_64*) BOOST_LDFLAGS="-L$ac_boost_path_tmp/lib64" ;;
                      *)                       BOOST_LDFLAGS="-L$ac_boost_path_tmp/lib" ;;
                 esac
                 BOOST_CPPFLAGS="-I$ac_boost_path_tmp/include"
@@ -10227,7 +10227,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
             if test "$ac_boost_lib_path" = ""
             then
                 case $target in
-                     ppc64*|sparc64*|x86_64*) BOOST_LDFLAGS="-L$best_path/lib64" ;;
+                     powerpc64*|ppc64*|sparc64*|x86_64*) BOOST_LDFLAGS="-L$best_path/lib64" ;;
                      *)                       BOOST_LDFLAGS="-L$best_path/lib" ;;
                 esac
             fi


Index: mkvtoolnix.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mkvtoolnix/devel/mkvtoolnix.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- mkvtoolnix.spec	19 Jan 2009 19:41:44 -0000	1.20
+++ mkvtoolnix.spec	19 Jan 2009 20:19:11 -0000	1.21
@@ -11,6 +11,7 @@
 Patch1: %{name}-git706fa5.patch
 Patch2: %{name}-git7429ba.patch
 Patch3: %{name}-gita58727.patch
+Patch4: %{name}-ppc64.patch
 URL: http://www.bunkus.org/videotools/mkvtoolnix/index.html
 BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
 BuildRequires: boost-devel
@@ -45,6 +46,7 @@
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1 -b .ppc64
 sed -i -e 's/"-O3"/""/' configure*
 for file in AUTHORS ChangeLog ; do
   iconv -f iso8859-1 -t utf8 $file >$file.utf && \
@@ -124,6 +126,7 @@
 - dropped obsolete boost detection patch
 - fixed segmentation fault in mmg (bug #477857)
 - backported some minor fixes from current git
+- fixed build on ppc64 again
 
 * Wed Dec 17 2008 Benjamin Kosnik  <bkoz at redhat.com> 2.4.0-4
 - Rebuild for boost-1.37.0.



From rathann at fedoraproject.org  Mon Jan 19 20:58:39 2009
From: rathann at fedoraproject.org (Dominik Mierzejewski)
Date: Mon, 19 Jan 2009 20:58:39 +0000 (UTC)
Subject: rpms/mkvtoolnix/F-10 mkvtoolnix-ppc64.patch, NONE,
	1.1 mkvtoolnix.spec, 1.9, 1.10
Message-ID: <20090119205839.32A9B700F8@cvs1.fedora.phx.redhat.com>

Author: rathann

Update of /cvs/pkgs/rpms/mkvtoolnix/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7235

Modified Files:
	mkvtoolnix.spec 
Added Files:
	mkvtoolnix-ppc64.patch 
Log Message:
- fixed build on ppc64 again

mkvtoolnix-ppc64.patch:

--- NEW FILE mkvtoolnix-ppc64.patch ---
diff -up mkvtoolnix-2.4.2/ac/ax_boost_base.m4.ppc64 mkvtoolnix-2.4.2/ac/ax_boost_base.m4
--- mkvtoolnix-2.4.2/ac/ax_boost_base.m4.ppc64	2009-01-17 22:07:31.000000000 +0100
+++ mkvtoolnix-2.4.2/ac/ax_boost_base.m4	2009-01-19 21:15:17.000000000 +0100
@@ -87,7 +87,7 @@ AC_DEFUN([AX_BOOST_BASE],
     dnl or if you install boost with RPM
     if test "$ac_boost_path" != ""; then
         case $target in
-             ppc64*|sparc64*|x86_64*) BOOST_LDFLAGS="-L$ac_boost_path/lib64" ;;
+             powerpc64*|ppc64*|sparc64*|x86_64*) BOOST_LDFLAGS="-L$ac_boost_path/lib64" ;;
              *)                       BOOST_LDFLAGS="-L$ac_boost_path/lib" ;;
         esac
         BOOST_CPPFLAGS="-I$ac_boost_path/include"
@@ -95,7 +95,7 @@ AC_DEFUN([AX_BOOST_BASE],
         for ac_boost_path_tmp in /usr /usr/local /opt /opt/local ; do
             if test -d "$ac_boost_path_tmp/include/boost" && test -r "$ac_boost_path_tmp/include/boost"; then
                 case $target in
-                     ppc64*|sparc64*|x86_64*) BOOST_LDFLAGS="-L$ac_boost_path_tmp/lib64" ;;
+                     powerpc64*|ppc64*|sparc64*|x86_64*) BOOST_LDFLAGS="-L$ac_boost_path_tmp/lib64" ;;
                      *)                       BOOST_LDFLAGS="-L$ac_boost_path_tmp/lib" ;;
                 esac
                 BOOST_CPPFLAGS="-I$ac_boost_path_tmp/include"
@@ -172,7 +172,7 @@ AC_DEFUN([AX_BOOST_BASE],
             if test "$ac_boost_lib_path" = ""
             then
                 case $target in
-                     ppc64*|sparc64*|x86_64*) BOOST_LDFLAGS="-L$best_path/lib64" ;;
+                     powerpc64*|ppc64*|sparc64*|x86_64*) BOOST_LDFLAGS="-L$best_path/lib64" ;;
                      *)                       BOOST_LDFLAGS="-L$best_path/lib" ;;
                 esac
             fi
diff -up mkvtoolnix-2.4.2/configure.ppc64 mkvtoolnix-2.4.2/configure
--- mkvtoolnix-2.4.2/configure.ppc64	2009-01-19 20:26:17.000000000 +0100
+++ mkvtoolnix-2.4.2/configure	2009-01-19 21:15:37.000000000 +0100
@@ -10095,7 +10095,7 @@ echo $ECHO_N "checking for boostlib >= $
 
                 if test "$ac_boost_path" != ""; then
         case $target in
-             ppc64*|sparc64*|x86_64*) BOOST_LDFLAGS="-L$ac_boost_path/lib64" ;;
+             powerpc64*|ppc64*|sparc64*|x86_64*) BOOST_LDFLAGS="-L$ac_boost_path/lib64" ;;
              *)                       BOOST_LDFLAGS="-L$ac_boost_path/lib" ;;
         esac
         BOOST_CPPFLAGS="-I$ac_boost_path/include"
@@ -10103,7 +10103,7 @@ echo $ECHO_N "checking for boostlib >= $
         for ac_boost_path_tmp in /usr /usr/local /opt /opt/local ; do
             if test -d "$ac_boost_path_tmp/include/boost" && test -r "$ac_boost_path_tmp/include/boost"; then
                 case $target in
-                     ppc64*|sparc64*|x86_64*) BOOST_LDFLAGS="-L$ac_boost_path_tmp/lib64" ;;
+                     powerpc64*|ppc64*|sparc64*|x86_64*) BOOST_LDFLAGS="-L$ac_boost_path_tmp/lib64" ;;
                      *)                       BOOST_LDFLAGS="-L$ac_boost_path_tmp/lib" ;;
                 esac
                 BOOST_CPPFLAGS="-I$ac_boost_path_tmp/include"
@@ -10227,7 +10227,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
             if test "$ac_boost_lib_path" = ""
             then
                 case $target in
-                     ppc64*|sparc64*|x86_64*) BOOST_LDFLAGS="-L$best_path/lib64" ;;
+                     powerpc64*|ppc64*|sparc64*|x86_64*) BOOST_LDFLAGS="-L$best_path/lib64" ;;
                      *)                       BOOST_LDFLAGS="-L$best_path/lib" ;;
                 esac
             fi


Index: mkvtoolnix.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mkvtoolnix/F-10/mkvtoolnix.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- mkvtoolnix.spec	19 Jan 2009 19:46:03 -0000	1.9
+++ mkvtoolnix.spec	19 Jan 2009 20:58:08 -0000	1.10
@@ -11,6 +11,7 @@
 Patch1: %{name}-git706fa5.patch
 Patch2: %{name}-git7429ba.patch
 Patch3: %{name}-gita58727.patch
+Patch4: %{name}-ppc64.patch
 URL: http://www.bunkus.org/videotools/mkvtoolnix/index.html
 BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
 BuildRequires: boost-devel
@@ -45,6 +46,7 @@
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1 -b .ppc64
 sed -i -e 's/"-O3"/""/' configure*
 for file in AUTHORS ChangeLog ; do
   iconv -f iso8859-1 -t utf8 $file >$file.utf && \
@@ -124,6 +126,7 @@
 - dropped obsolete boost detection patch
 - fixed segmentation fault in mmg (bug #477857)
 - backported some minor fixes from current git
+- fixed build on ppc64 again
 
 * Mon Dec 01 2008 Dominik Mierzejewski <rpm at greysector.net> 2.4.0-1
 - dropped obsolete mkvtoolnix-gcc43.patch



From rathann at fedoraproject.org  Mon Jan 19 21:20:48 2009
From: rathann at fedoraproject.org (Dominik Mierzejewski)
Date: Mon, 19 Jan 2009 21:20:48 +0000 (UTC)
Subject: rpms/mkvtoolnix/F-9 mkvtoolnix-ppc64.patch, NONE,
	1.1 mkvtoolnix.spec, 1.9, 1.10
Message-ID: <20090119212048.67D4F700F8@cvs1.fedora.phx.redhat.com>

Author: rathann

Update of /cvs/pkgs/rpms/mkvtoolnix/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10441

Modified Files:
	mkvtoolnix.spec 
Added Files:
	mkvtoolnix-ppc64.patch 
Log Message:
- fixed build on ppc64 again

mkvtoolnix-ppc64.patch:

--- NEW FILE mkvtoolnix-ppc64.patch ---
diff -up mkvtoolnix-2.4.2/ac/ax_boost_base.m4.ppc64 mkvtoolnix-2.4.2/ac/ax_boost_base.m4
--- mkvtoolnix-2.4.2/ac/ax_boost_base.m4.ppc64	2009-01-17 22:07:31.000000000 +0100
+++ mkvtoolnix-2.4.2/ac/ax_boost_base.m4	2009-01-19 21:15:17.000000000 +0100
@@ -87,7 +87,7 @@ AC_DEFUN([AX_BOOST_BASE],
     dnl or if you install boost with RPM
     if test "$ac_boost_path" != ""; then
         case $target in
-             ppc64*|sparc64*|x86_64*) BOOST_LDFLAGS="-L$ac_boost_path/lib64" ;;
+             powerpc64*|ppc64*|sparc64*|x86_64*) BOOST_LDFLAGS="-L$ac_boost_path/lib64" ;;
              *)                       BOOST_LDFLAGS="-L$ac_boost_path/lib" ;;
         esac
         BOOST_CPPFLAGS="-I$ac_boost_path/include"
@@ -95,7 +95,7 @@ AC_DEFUN([AX_BOOST_BASE],
         for ac_boost_path_tmp in /usr /usr/local /opt /opt/local ; do
             if test -d "$ac_boost_path_tmp/include/boost" && test -r "$ac_boost_path_tmp/include/boost"; then
                 case $target in
-                     ppc64*|sparc64*|x86_64*) BOOST_LDFLAGS="-L$ac_boost_path_tmp/lib64" ;;
+                     powerpc64*|ppc64*|sparc64*|x86_64*) BOOST_LDFLAGS="-L$ac_boost_path_tmp/lib64" ;;
                      *)                       BOOST_LDFLAGS="-L$ac_boost_path_tmp/lib" ;;
                 esac
                 BOOST_CPPFLAGS="-I$ac_boost_path_tmp/include"
@@ -172,7 +172,7 @@ AC_DEFUN([AX_BOOST_BASE],
             if test "$ac_boost_lib_path" = ""
             then
                 case $target in
-                     ppc64*|sparc64*|x86_64*) BOOST_LDFLAGS="-L$best_path/lib64" ;;
+                     powerpc64*|ppc64*|sparc64*|x86_64*) BOOST_LDFLAGS="-L$best_path/lib64" ;;
                      *)                       BOOST_LDFLAGS="-L$best_path/lib" ;;
                 esac
             fi
diff -up mkvtoolnix-2.4.2/configure.ppc64 mkvtoolnix-2.4.2/configure
--- mkvtoolnix-2.4.2/configure.ppc64	2009-01-19 20:26:17.000000000 +0100
+++ mkvtoolnix-2.4.2/configure	2009-01-19 21:15:37.000000000 +0100
@@ -10095,7 +10095,7 @@ echo $ECHO_N "checking for boostlib >= $
 
                 if test "$ac_boost_path" != ""; then
         case $target in
-             ppc64*|sparc64*|x86_64*) BOOST_LDFLAGS="-L$ac_boost_path/lib64" ;;
+             powerpc64*|ppc64*|sparc64*|x86_64*) BOOST_LDFLAGS="-L$ac_boost_path/lib64" ;;
              *)                       BOOST_LDFLAGS="-L$ac_boost_path/lib" ;;
         esac
         BOOST_CPPFLAGS="-I$ac_boost_path/include"
@@ -10103,7 +10103,7 @@ echo $ECHO_N "checking for boostlib >= $
         for ac_boost_path_tmp in /usr /usr/local /opt /opt/local ; do
             if test -d "$ac_boost_path_tmp/include/boost" && test -r "$ac_boost_path_tmp/include/boost"; then
                 case $target in
-                     ppc64*|sparc64*|x86_64*) BOOST_LDFLAGS="-L$ac_boost_path_tmp/lib64" ;;
+                     powerpc64*|ppc64*|sparc64*|x86_64*) BOOST_LDFLAGS="-L$ac_boost_path_tmp/lib64" ;;
                      *)                       BOOST_LDFLAGS="-L$ac_boost_path_tmp/lib" ;;
                 esac
                 BOOST_CPPFLAGS="-I$ac_boost_path_tmp/include"
@@ -10227,7 +10227,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
             if test "$ac_boost_lib_path" = ""
             then
                 case $target in
-                     ppc64*|sparc64*|x86_64*) BOOST_LDFLAGS="-L$best_path/lib64" ;;
+                     powerpc64*|ppc64*|sparc64*|x86_64*) BOOST_LDFLAGS="-L$best_path/lib64" ;;
                      *)                       BOOST_LDFLAGS="-L$best_path/lib" ;;
                 esac
             fi


Index: mkvtoolnix.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mkvtoolnix/F-9/mkvtoolnix.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- mkvtoolnix.spec	19 Jan 2009 19:48:25 -0000	1.9
+++ mkvtoolnix.spec	19 Jan 2009 21:20:18 -0000	1.10
@@ -11,6 +11,7 @@
 Patch1: %{name}-git706fa5.patch
 Patch2: %{name}-git7429ba.patch
 Patch3: %{name}-gita58727.patch
+Patch4: %{name}-ppc64.patch
 URL: http://www.bunkus.org/videotools/mkvtoolnix/index.html
 BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
 BuildRequires: boost-devel
@@ -45,6 +46,7 @@
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1 -b .ppc64
 sed -i -e 's/"-O3"/""/' configure*
 for file in AUTHORS ChangeLog ; do
   iconv -f iso8859-1 -t utf8 $file >$file.utf && \
@@ -124,6 +126,7 @@
 - dropped obsolete boost detection patch
 - fixed segmentation fault in mmg (bug #477857)
 - backported some minor fixes from current git
+- fixed build on ppc64 again
 
 * Mon Dec 01 2008 Dominik Mierzejewski <rpm at greysector.net> 2.4.0-1
 - dropped obsolete mkvtoolnix-gcc43.patch



From cwickert at fedoraproject.org  Mon Jan 19 21:25:07 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Mon, 19 Jan 2009 21:25:07 +0000 (UTC)
Subject: rpms/xfce4-clipman-plugin/devel xfce4-clipman-plugin.spec, 1.15,
	1.16
Message-ID: <20090119212507.EED2B700F8@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/xfce4-clipman-plugin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11317

Modified Files:
	xfce4-clipman-plugin.spec 
Log Message:
BR exo-devel


Index: xfce4-clipman-plugin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-clipman-plugin/devel/xfce4-clipman-plugin.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- xfce4-clipman-plugin.spec	19 Jan 2009 14:44:26 -0000	1.15
+++ xfce4-clipman-plugin.spec	19 Jan 2009 21:24:37 -0000	1.16
@@ -9,8 +9,9 @@
 Source0:	http://goodies.xfce.org/releases/%{name}/%{name}-%{version}.tar.bz2
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:	xfce4-panel-devel >= 4.3.99.2, libxfcegui4-devel >= 4.3.99.2, libxml2-devel
-BuildRequires:	libXt-devel, gettext, intltool
+BuildRequires:	xfce4-panel-devel >= 4.4.0, libxfcegui4-devel >= 4.4.0
+BuildRequires:	exo-devel >= 0.3.0
+BuildRequires:	libXt-devel, gettext, intltool, libxml2-devel
 Requires:	xfce4-panel >= 4.4.0
 
 %description



From slankes at fedoraproject.org  Mon Jan 19 21:26:06 2009
From: slankes at fedoraproject.org (Sven Lankes)
Date: Mon, 19 Jan 2009 21:26:06 +0000 (UTC)
Subject: rpms/pympdtouchgui/devel pympdtouchgui-fixpath.patch, NONE,
	1.1 .cvsignore, 1.2, 1.3 pympdtouchgui.spec, 1.2, 1.3 sources,
	1.2, 1.3 pympdtouchgui-setuppy.patch, 1.1, NONE
Message-ID: <20090119212606.43E27700F8@cvs1.fedora.phx.redhat.com>

Author: slankes

Update of /cvs/pkgs/rpms/pympdtouchgui/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11421

Modified Files:
	.cvsignore pympdtouchgui.spec sources 
Added Files:
	pympdtouchgui-fixpath.patch 
Removed Files:
	pympdtouchgui-setuppy.patch 
Log Message:
new upstream release, minor setup fixes, reworked patch (most of the previous patch is upstream now)


pympdtouchgui-fixpath.patch:

--- NEW FILE pympdtouchgui-fixpath.patch ---
diff --git a/pympdtouchgui b/pympdtouchgui
index 13fc7ad..21a4eb9 100755
--- a/pympdtouchgui
+++ b/pympdtouchgui
@@ -819,7 +819,7 @@ class Config:
 		self.Sizes = None
 		self.Theme = None
 		self.AlarmClock = None
-		self.ClockStateFile = "/var/lib/mpdtouchgui/clock-state"
+		self.ClockStateFile = "/var/lib/pympdtouchgui/clock-state"
 
 		# Defaults for ServerOptions
 		self.ConnectHost = "127.0.0.1"
@@ -833,7 +833,7 @@ class Config:
 		self.AmazonID = "0MR5G85VBCCM2KS8RK82"
 
 		# Defaults for MiscOptions
-		self.ThemeDir = os.path.expanduser("/usr/share/mpdtouchgui/themes/default")
+		self.ThemeDir = os.path.expanduser("/usr/share/pympdtouchgui/themes/default")
 		self.CommandlineConfigFile = ""
 		self.AllowQuit = True
 		self.PowerOffTimeoutEnabled = False
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pympdtouchgui/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	5 Nov 2008 23:50:46 -0000	1.2
+++ .cvsignore	19 Jan 2009 21:25:35 -0000	1.3
@@ -1 +1 @@
-pympdtouchgui-0.302.tgz
+pympdtouchgui-0.309.tgz


Index: pympdtouchgui.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pympdtouchgui/devel/pympdtouchgui.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- pympdtouchgui.spec	22 Dec 2008 20:04:23 -0000	1.2
+++ pympdtouchgui.spec	19 Jan 2009 21:25:36 -0000	1.3
@@ -1,17 +1,17 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:       pympdtouchgui
-Version:    0.302
-Release:    6%{?dist}
+Version:    0.309
+Release:    1%{?dist}
 Summary:    PyMPDTouchGUI is a client for MPD that is usable via touchscreen    
 
 Group:      Applications/Multimedia    
 License:    GPLv2
 URL:        http://www.spida.net/projects/pympdtouchgui/    
-Source0:    http://www.spida.net/projects/pympdtouchgui/pympdtouchgui-0.302.tgz
+Source0:    http://www.spida.net/projects/pympdtouchgui/pympdtouchgui-0.309.tgz
 Source1:    pympdtouchgui.desktop
 Source2:    pympdtouchgui.png
-Patch0:     pympdtouchgui-setuppy.patch
+Patch0:     pympdtouchgui-fixpath.patch
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:  noarch
 
@@ -28,8 +28,7 @@
 
 %prep
 %setup -q
-%patch0 -p1 
-
+%patch0 -p1
 
 %build
 %{__python} setup.py build
@@ -66,6 +65,9 @@
 
 
 %changelog
+* Mon Jan 19 2009 Sven Lankes <sven at lank.es> - 0.309-1
+- new upstream release
+
 * Mon Dec 22 2008 Sven Lankes <sven at lank.es> - 0.302-6
 - rebuild for python 2.6
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pympdtouchgui/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	5 Nov 2008 23:50:47 -0000	1.2
+++ sources	19 Jan 2009 21:25:36 -0000	1.3
@@ -1 +1 @@
-8193912ed9ed7d70f7764adeecf7eca0  pympdtouchgui-0.302.tgz
+bcb6f5f1fac1efa8856c7eb86a5ce0e9  pympdtouchgui-0.309.tgz


--- pympdtouchgui-setuppy.patch DELETED ---



From dwalsh at fedoraproject.org  Mon Jan 19 21:48:47 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Mon, 19 Jan 2009 21:48:47 +0000 (UTC)
Subject: rpms/selinux-policy/devel policy-20090105.patch, 1.9,
	1.10 selinux-policy.spec, 1.768, 1.769
Message-ID: <20090119214847.6D62C700F8@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14912

Modified Files:
	policy-20090105.patch selinux-policy.spec 
Log Message:
* Mon Jan 19 2009 Dan Walsh <dwalsh at redhat.com> 3.6.3-2
- Add devicekit policy


policy-20090105.patch:

Index: policy-20090105.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-20090105.patch,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- policy-20090105.patch	19 Jan 2009 18:37:38 -0000	1.9
+++ policy-20090105.patch	19 Jan 2009 21:48:16 -0000	1.10
@@ -4262,7 +4262,7 @@
  network_port(xfs, tcp,7100,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.fc serefpolicy-3.6.3/policy/modules/kernel/devices.fc
 --- nsaserefpolicy/policy/modules/kernel/devices.fc	2008-10-08 21:42:58.000000000 -0400
-+++ serefpolicy-3.6.3/policy/modules/kernel/devices.fc	2009-01-19 13:10:02.000000000 -0500
++++ serefpolicy-3.6.3/policy/modules/kernel/devices.fc	2009-01-19 14:33:15.000000000 -0500
 @@ -1,7 +1,7 @@
  
  /dev			-d	gen_context(system_u:object_r:device_t,s0)
@@ -4350,15 +4350,16 @@
  /dev/vmmon		-c	gen_context(system_u:object_r:vmware_device_t,s0)
  /dev/vmnet.*		-c	gen_context(system_u:object_r:vmware_device_t,s0)
  /dev/video.*		-c	gen_context(system_u:object_r:v4l_device_t,s0)
-@@ -91,6 +108,7 @@
+@@ -91,20 +108,32 @@
  
  /dev/cmx.*		-c	gen_context(system_u:object_r:smartcard_device_t,s0)
  
+-/dev/cpu/.*		-c	gen_context(system_u:object_r:cpu_device_t,s0)
 +/dev/cpu_dma_latency	-c	gen_context(system_u:object_r:netcontrol_device_t,s0)
- /dev/cpu/.*		-c	gen_context(system_u:object_r:cpu_device_t,s0)
++/dev/cpu.*		-c	gen_context(system_u:object_r:cpu_device_t,s0)
  /dev/cpu/mtrr		-c	gen_context(system_u:object_r:mtrr_device_t,s0)
  
-@@ -98,13 +116,23 @@
+ /dev/dri/.+		-c	gen_context(system_u:object_r:dri_device_t,s0)
  
  /dev/dvb/.*		-c	gen_context(system_u:object_r:v4l_device_t,s0)
  
@@ -4378,6 +4379,7 @@
  
  /dev/mapper/control	-c	gen_context(system_u:object_r:lvm_control_t,s0)
 +/dev/mga_vid.*		-c	gen_context(system_u:object_r:xserver_misc_device_t,s0)
++/dev/msr.*		-c	gen_context(system_u:object_r:cpu_device_t,s0)
 +/dev/mvideo/.*		-c	gen_context(system_u:object_r:xserver_misc_device_t,s0)
  
  /dev/pts(/.*)?			<<none>>
@@ -5404,6 +5406,12 @@
  
  ########################################
  #
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/filesystem.fc serefpolicy-3.6.3/policy/modules/kernel/filesystem.fc
+--- nsaserefpolicy/policy/modules/kernel/filesystem.fc	2008-08-07 11:15:01.000000000 -0400
++++ serefpolicy-3.6.3/policy/modules/kernel/filesystem.fc	2009-01-19 13:53:22.000000000 -0500
+@@ -1 +1 @@
+-# This module currently does not have any file contexts.
++/dev/shm		-d	gen_context(system_u:object_r:tmpfs_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/filesystem.if serefpolicy-3.6.3/policy/modules/kernel/filesystem.if
 --- nsaserefpolicy/policy/modules/kernel/filesystem.if	2009-01-05 15:39:38.000000000 -0500
 +++ serefpolicy-3.6.3/policy/modules/kernel/filesystem.if	2009-01-19 13:10:02.000000000 -0500
@@ -6040,7 +6048,7 @@
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/storage.fc serefpolicy-3.6.3/policy/modules/kernel/storage.fc
 --- nsaserefpolicy/policy/modules/kernel/storage.fc	2008-10-08 19:00:23.000000000 -0400
-+++ serefpolicy-3.6.3/policy/modules/kernel/storage.fc	2009-01-19 13:10:02.000000000 -0500
++++ serefpolicy-3.6.3/policy/modules/kernel/storage.fc	2009-01-19 13:53:59.000000000 -0500
 @@ -36,7 +36,7 @@
  /dev/pg[0-3]		-c	gen_context(system_u:object_r:removable_device_t,s0)
  /dev/ps3d.*		-b	gen_context(system_u:object_r:fixed_disk_device_t,mls_systemhigh)
@@ -6050,6 +6058,15 @@
  /dev/rd.*		-b	gen_context(system_u:object_r:fixed_disk_device_t,mls_systemhigh)
  ifdef(`distro_redhat', `
  /dev/root		-b	gen_context(system_u:object_r:fixed_disk_device_t,mls_systemhigh)
+@@ -67,6 +67,8 @@
+ /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/device-mapper	-c	gen_context(system_u:object_r:fixed_disk_device_t,mls_systemhigh)
++
+ /dev/raw/raw[0-9]+	-c	gen_context(system_u:object_r:fixed_disk_device_t,mls_systemhigh)
+ 
+ /dev/scramdisk/.*	-b	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/kernel/terminal.if serefpolicy-3.6.3/policy/modules/kernel/terminal.if
 --- nsaserefpolicy/policy/modules/kernel/terminal.if	2008-11-11 16:13:41.000000000 -0500
 +++ serefpolicy-3.6.3/policy/modules/kernel/terminal.if	2009-01-19 13:10:02.000000000 -0500
@@ -8332,7 +8349,7 @@
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.te serefpolicy-3.6.3/policy/modules/services/apache.te
 --- nsaserefpolicy/policy/modules/services/apache.te	2009-01-19 11:06:49.000000000 -0500
-+++ serefpolicy-3.6.3/policy/modules/services/apache.te	2009-01-19 13:10:02.000000000 -0500
++++ serefpolicy-3.6.3/policy/modules/services/apache.te	2009-01-19 15:38:07.000000000 -0500
 @@ -19,6 +19,8 @@
  # Declarations
  #
@@ -8427,15 +8444,33 @@
  type httpd_tmp_t;
  files_tmp_file(httpd_tmp_t)
  
-@@ -196,6 +242,7 @@
- userdom_user_home_content(httpd_user_script_rw_t)
+@@ -187,15 +233,22 @@
+ files_tmpfs_file(httpd_tmpfs_t)
+ 
+ apache_content_template(user)
++
+ ubac_constrained(httpd_user_script_t)
++typeattribue httpd_user_content_t, httpdcontent;
++typeattribue httpd_user_content_rw_t, httpdcontent;
++typeattribue httpd_user_content_ra_t, httpdcontent;
++typeattribue httpd_user_script_exec_t, httpdcontent;
++
+ userdom_user_home_content(httpd_user_content_t)
+ userdom_user_home_content(httpd_user_htaccess_t)
+ userdom_user_home_content(httpd_user_script_exec_t)
+-userdom_user_home_content(httpd_user_script_ra_t)
+-userdom_user_home_content(httpd_user_script_ro_t)
+-userdom_user_home_content(httpd_user_script_rw_t)
++userdom_user_home_content(httpd_user_content_ra_t)
++userdom_user_home_content(httpd_user_content_ro_t)
++userdom_user_home_content(httpd_user_content_rw_t)
  typeattribute httpd_user_script_t httpd_script_domains;
  typealias httpd_user_content_t alias { httpd_staff_content_t httpd_sysadm_content_t };
 +typealias httpd_user_content_t alias httpd_unconfined_content_t;
  typealias httpd_user_content_t alias { httpd_auditadm_content_t httpd_secadm_content_t };
  typealias httpd_user_htaccess_t alias { httpd_staff_htaccess_t httpd_sysadm_htaccess_t };
  typealias httpd_user_htaccess_t alias { httpd_auditadm_htaccess_t httpd_secadm_htaccess_t };
-@@ -230,7 +277,7 @@
+@@ -230,7 +283,7 @@
  # Apache server local policy
  #
  
@@ -8444,7 +8479,7 @@
  dontaudit httpd_t self:capability { net_admin sys_tty_config };
  allow httpd_t self:process ~{ ptrace setcurrent setexec setfscreate setrlimit execmem execstack execheap };
  allow httpd_t self:fd use;
-@@ -272,6 +319,7 @@
+@@ -272,6 +325,7 @@
  allow httpd_t httpd_modules_t:dir list_dir_perms;
  mmap_files_pattern(httpd_t, httpd_modules_t, httpd_modules_t)
  read_files_pattern(httpd_t, httpd_modules_t, httpd_modules_t)
@@ -8452,7 +8487,7 @@
  
  apache_domtrans_rotatelogs(httpd_t)
  # Apache-httpd needs to be able to send signals to the log rotate procs.
-@@ -283,9 +331,9 @@
+@@ -283,9 +337,9 @@
  
  allow httpd_t httpd_suexec_exec_t:file read_file_perms;
  
@@ -8465,7 +8500,7 @@
  
  manage_dirs_pattern(httpd_t, httpd_tmp_t, httpd_tmp_t)
  manage_files_pattern(httpd_t, httpd_tmp_t, httpd_tmp_t)
-@@ -301,6 +349,7 @@
+@@ -301,6 +355,7 @@
  manage_files_pattern(httpd_t, httpd_var_lib_t, httpd_var_lib_t)
  files_var_lib_filetrans(httpd_t, httpd_var_lib_t, file)
  
@@ -8473,7 +8508,7 @@
  manage_files_pattern(httpd_t, httpd_var_run_t, httpd_var_run_t)
  manage_sock_files_pattern(httpd_t, httpd_var_run_t, httpd_var_run_t)
  files_pid_filetrans(httpd_t, httpd_var_run_t, { file sock_file })
-@@ -312,6 +361,7 @@
+@@ -312,6 +367,7 @@
  kernel_read_kernel_sysctls(httpd_t)
  # for modules that want to access /proc/meminfo
  kernel_read_system_state(httpd_t)
@@ -8481,7 +8516,7 @@
  
  corenet_all_recvfrom_unlabeled(httpd_t)
  corenet_all_recvfrom_netlabel(httpd_t)
-@@ -322,6 +372,7 @@
+@@ -322,6 +378,7 @@
  corenet_tcp_sendrecv_all_ports(httpd_t)
  corenet_udp_sendrecv_all_ports(httpd_t)
  corenet_tcp_bind_generic_node(httpd_t)
@@ -8489,7 +8524,7 @@
  corenet_tcp_bind_http_port(httpd_t)
  corenet_tcp_bind_http_cache_port(httpd_t)
  corenet_sendrecv_http_server_packets(httpd_t)
-@@ -335,12 +386,12 @@
+@@ -335,12 +392,12 @@
  
  fs_getattr_all_fs(httpd_t)
  fs_search_auto_mountpoints(httpd_t)
@@ -8505,7 +8540,7 @@
  
  domain_use_interactive_fds(httpd_t)
  
-@@ -358,6 +409,10 @@
+@@ -358,6 +415,10 @@
  files_read_var_lib_symlinks(httpd_t)
  
  fs_search_auto_mountpoints(httpd_sys_script_t)
@@ -8516,7 +8551,7 @@
  
  libs_read_lib_files(httpd_t)
  
-@@ -372,18 +427,33 @@
+@@ -372,18 +433,33 @@
  
  userdom_use_unpriv_users_fds(httpd_t)
  
@@ -8554,7 +8589,7 @@
  ')
  ')
  
-@@ -391,20 +461,54 @@
+@@ -391,20 +467,54 @@
  	corenet_tcp_connect_all_ports(httpd_t)
  ')
  
@@ -8610,7 +8645,7 @@
  
  	manage_dirs_pattern(httpd_t, httpdcontent, httpdcontent)
  	manage_files_pattern(httpd_t, httpdcontent, httpdcontent)
-@@ -415,20 +519,28 @@
+@@ -415,20 +525,28 @@
  	corenet_tcp_bind_ftp_port(httpd_t)
  ')
  
@@ -8643,7 +8678,7 @@
  tunable_policy(`httpd_ssi_exec',`
  	corecmd_shell_domtrans(httpd_t,httpd_sys_script_t)
  	allow httpd_sys_script_t httpd_t:fd use;
-@@ -459,8 +571,13 @@
+@@ -459,8 +577,13 @@
  ')
  
  optional_policy(`
@@ -8659,7 +8694,7 @@
  ')
  
  optional_policy(`
-@@ -472,18 +589,13 @@
+@@ -472,18 +595,13 @@
  ')
  
  optional_policy(`
@@ -8679,7 +8714,7 @@
  ')
  
  optional_policy(`
-@@ -493,6 +605,12 @@
+@@ -493,6 +611,12 @@
  	openca_kill(httpd_t)
  ')
  
@@ -8692,7 +8727,7 @@
  optional_policy(`
  	# Allow httpd to work with postgresql
  	postgresql_stream_connect(httpd_t)
-@@ -500,6 +618,7 @@
+@@ -500,6 +624,7 @@
  
  	tunable_policy(`httpd_can_network_connect_db',`
  		postgresql_tcp_connect(httpd_t)
@@ -8700,7 +8735,7 @@
  	')
  ')
  
-@@ -508,6 +627,7 @@
+@@ -508,6 +633,7 @@
  ')
  
  optional_policy(`
@@ -8708,7 +8743,7 @@
  	snmp_dontaudit_read_snmp_var_lib_files(httpd_t)
  	snmp_dontaudit_write_snmp_var_lib_files(httpd_t)
  ')
-@@ -535,6 +655,22 @@
+@@ -535,6 +661,22 @@
  
  userdom_use_user_terminals(httpd_helper_t)
  
@@ -8731,7 +8766,7 @@
  ########################################
  #
  # Apache PHP script local policy
-@@ -564,20 +700,25 @@
+@@ -564,20 +706,25 @@
  
  fs_search_auto_mountpoints(httpd_php_t)
  
@@ -8763,7 +8798,7 @@
  ')
  
  ########################################
-@@ -595,23 +736,24 @@
+@@ -595,23 +742,24 @@
  append_files_pattern(httpd_suexec_t, httpd_log_t, httpd_log_t)
  read_files_pattern(httpd_suexec_t, httpd_log_t, httpd_log_t)
  
@@ -8792,7 +8827,15 @@
  
  files_read_etc_files(httpd_suexec_t)
  files_read_usr_files(httpd_suexec_t)
-@@ -641,12 +783,25 @@
+@@ -624,6 +772,7 @@
+ logging_send_syslog_msg(httpd_suexec_t)
+ 
+ miscfiles_read_localization(httpd_suexec_t)
++miscfiles_read_public_files(httpd_suexec_t)
+ 
+ tunable_policy(`httpd_can_network_connect',`
+ 	allow httpd_suexec_t self:tcp_socket create_stream_socket_perms;
+@@ -641,12 +790,25 @@
  	corenet_sendrecv_all_client_packets(httpd_suexec_t)
  ')
  
@@ -8821,7 +8864,7 @@
  ')
  
  tunable_policy(`httpd_enable_homedirs && use_nfs_home_dirs',`
-@@ -655,6 +810,12 @@
+@@ -655,6 +817,12 @@
  	fs_exec_nfs_files(httpd_suexec_t)
  ')
  
@@ -8834,7 +8877,7 @@
  tunable_policy(`httpd_enable_homedirs && use_samba_home_dirs',`
  	fs_read_cifs_files(httpd_suexec_t)
  	fs_read_cifs_symlinks(httpd_suexec_t)
-@@ -672,15 +833,14 @@
+@@ -672,15 +840,14 @@
  	dontaudit httpd_suexec_t httpd_t:unix_stream_socket { read write };
  ')
  
@@ -8853,7 +8896,7 @@
  allow httpd_sys_script_t httpd_t:tcp_socket { read write };
  
  dontaudit httpd_sys_script_t httpd_config_t:dir search;
-@@ -699,12 +859,24 @@
+@@ -699,12 +866,24 @@
  # Should we add a boolean?
  apache_domtrans_rotatelogs(httpd_sys_script_t)
  
@@ -8880,7 +8923,7 @@
  ')
  
  tunable_policy(`httpd_enable_homedirs && use_nfs_home_dirs',`
-@@ -712,6 +884,35 @@
+@@ -712,6 +891,35 @@
  	fs_read_nfs_symlinks(httpd_sys_script_t)
  ')
  
@@ -8916,7 +8959,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)
-@@ -724,6 +925,10 @@
+@@ -724,6 +932,10 @@
  optional_policy(`
  	mysql_stream_connect(httpd_sys_script_t)
  	mysql_rw_db_sockets(httpd_sys_script_t)
@@ -8927,7 +8970,7 @@
  ')
  
  optional_policy(`
-@@ -735,6 +940,8 @@
+@@ -735,6 +947,8 @@
  # httpd_rotatelogs local policy
  #
  
@@ -8936,7 +8979,17 @@
  manage_files_pattern(httpd_rotatelogs_t, httpd_log_t, httpd_log_t)
  
  kernel_read_kernel_sysctls(httpd_rotatelogs_t)
-@@ -762,3 +969,66 @@
+@@ -754,6 +968,9 @@
+ 
+ tunable_policy(`httpd_enable_cgi && httpd_unified',`
+ 	allow httpd_user_script_t httpdcontent:file entrypoint;
++	manage_dirs_pattern(httpd_user_script_t, httpd_user_content_t, httpd_user_content_t)
++	manage_files_pattern(httpd_user_script_t, httpd_user_content_t, httpd_user_content_t)
++	manage_files_pattern(httpd_user_script_t, httpd_user_content_ra_t, httpd_user_content_ra_t)
+ ')
+ 
+ # allow accessing files/dirs below the users home dir
+@@ -762,3 +979,66 @@
  	userdom_search_user_home_dirs(httpd_suexec_t)
  	userdom_search_user_home_dirs(httpd_user_script_t)
  ')
@@ -9811,7 +9864,7 @@
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/consolekit.te serefpolicy-3.6.3/policy/modules/services/consolekit.te
 --- nsaserefpolicy/policy/modules/services/consolekit.te	2009-01-05 15:39:43.000000000 -0500
-+++ serefpolicy-3.6.3/policy/modules/services/consolekit.te	2009-01-19 13:10:02.000000000 -0500
++++ serefpolicy-3.6.3/policy/modules/services/consolekit.te	2009-01-19 14:46:22.000000000 -0500
 @@ -13,6 +13,9 @@
  type consolekit_var_run_t;
  files_pid_file(consolekit_var_run_t)
@@ -9889,11 +9942,12 @@
  
  	optional_policy(`
  		unconfined_dbus_chat(consolekit_t)
-@@ -61,6 +93,29 @@
+@@ -61,6 +93,30 @@
  ')
  
  optional_policy(`
 +	polkit_domtrans_auth(consolekit_t)
++	polkit_read_lib(consolekit_t)
 +	polkit_read_reload(consolekit_t)
 +')
 +
@@ -12187,8 +12241,8 @@
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/gnomeclock.te serefpolicy-3.6.3/policy/modules/services/gnomeclock.te
 --- nsaserefpolicy/policy/modules/services/gnomeclock.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.3/policy/modules/services/gnomeclock.te	2009-01-19 13:10:02.000000000 -0500
-@@ -0,0 +1,50 @@
++++ serefpolicy-3.6.3/policy/modules/services/gnomeclock.te	2009-01-19 14:46:31.000000000 -0500
+@@ -0,0 +1,51 @@
 +policy_module(gnomeclock, 1.0.0)
 +########################################
 +#
@@ -12236,6 +12290,7 @@
 +
 +optional_policy(`
 +	polkit_domtrans_auth(gnomeclock_t)
++	polkit_read_lib(gnomeclock_t)
 +	polkit_read_reload(gnomeclock_t)
 +')
 +
@@ -12267,7 +12322,7 @@
  ########################################
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.te serefpolicy-3.6.3/policy/modules/services/hal.te
 --- nsaserefpolicy/policy/modules/services/hal.te	2009-01-19 11:06:49.000000000 -0500
-+++ serefpolicy-3.6.3/policy/modules/services/hal.te	2009-01-19 13:10:02.000000000 -0500
++++ serefpolicy-3.6.3/policy/modules/services/hal.te	2009-01-19 14:46:49.000000000 -0500
 @@ -49,6 +49,15 @@
  type hald_var_lib_t;
  files_type(hald_var_lib_t)
@@ -12309,12 +12364,13 @@
  
  userdom_dontaudit_use_unpriv_user_fds(hald_t)
  userdom_dontaudit_search_user_home_dirs(hald_t)
-@@ -277,6 +292,12 @@
+@@ -277,6 +292,13 @@
  ')
  
  optional_policy(`
 +	polkit_domtrans_auth(hald_t)
 +	polkit_domtrans_resolve(hald_t)
++	polkit_read_lib(hald_t)
 +	polkit_read_reload(hald_t)
 +')
 +
@@ -12322,7 +12378,7 @@
  	rpc_search_nfs_state_data(hald_t)
  ')
  
-@@ -301,12 +322,16 @@
+@@ -301,12 +323,16 @@
  	virt_manage_images(hald_t)
  ')
  
@@ -12340,7 +12396,7 @@
  allow hald_acl_t self:process { getattr signal };
  allow hald_acl_t self:fifo_file rw_fifo_file_perms;
  
-@@ -321,6 +346,7 @@
+@@ -321,6 +347,7 @@
  manage_dirs_pattern(hald_acl_t, hald_var_run_t, hald_var_run_t)
  manage_files_pattern(hald_acl_t, hald_var_run_t, hald_var_run_t)
  files_pid_filetrans(hald_acl_t, hald_var_run_t, { dir file })
@@ -12348,7 +12404,7 @@
  
  corecmd_exec_bin(hald_acl_t)
  
-@@ -339,6 +365,8 @@
+@@ -339,6 +366,8 @@
  
  storage_getattr_removable_dev(hald_acl_t)
  storage_setattr_removable_dev(hald_acl_t)
@@ -12357,12 +12413,13 @@
  
  auth_use_nsswitch(hald_acl_t)
  
-@@ -346,12 +374,17 @@
+@@ -346,12 +375,18 @@
  
  miscfiles_read_localization(hald_acl_t)
  
 +optional_policy(`
 +	polkit_domtrans_auth(hald_acl_t)
++	polkit_read_lib(hald_acl_t)
 +	polkit_read_reload(hald_acl_t)
 +')
 +
@@ -12376,7 +12433,7 @@
  
  domtrans_pattern(hald_t, hald_mac_exec_t, hald_mac_t)
  allow hald_t hald_mac_t:process signal;
-@@ -418,3 +451,49 @@
+@@ -418,3 +453,49 @@
  files_read_usr_files(hald_keymap_t)
  
  miscfiles_read_localization(hald_keymap_t)
@@ -12896,7 +12953,7 @@
  ## <param name="domain">
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mailman.te serefpolicy-3.6.3/policy/modules/services/mailman.te
 --- nsaserefpolicy/policy/modules/services/mailman.te	2009-01-19 11:06:49.000000000 -0500
-+++ serefpolicy-3.6.3/policy/modules/services/mailman.te	2009-01-19 13:10:02.000000000 -0500
++++ serefpolicy-3.6.3/policy/modules/services/mailman.te	2009-01-19 15:30:18.000000000 -0500
 @@ -53,10 +53,8 @@
  	apache_use_fds(mailman_cgi_t)
  	apache_dontaudit_append_log(mailman_cgi_t)
@@ -12910,7 +12967,7 @@
  ')
  
  ########################################
-@@ -65,15 +63,22 @@
+@@ -65,15 +63,27 @@
  #
  
  allow mailman_mail_t self:unix_dgram_socket create_socket_perms;
@@ -12920,6 +12977,7 @@
 +
 +files_search_spool(mailman_mail_t)
 +fs_rw_anon_inodefs_files(mailman_mail_t)
++fs_list_inotifyfs(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)
@@ -12933,12 +12991,15 @@
 -	allow mailman_mail_t qmail_spool_t:file { read ioctl getattr };
 -	# do we really need this?
 -	allow mailman_mail_t qmail_lspawn_t:fifo_file write;
--')
 +	postfix_search_spool(mailman_mail_t)
  ')
++
++optional_policy(`
++        cron_read_pipes(mailman_mail_t)
+ ')
  
  ########################################
-@@ -99,11 +104,15 @@
+@@ -99,11 +109,15 @@
  # for su
  seutil_dontaudit_search_config(mailman_queue_t)
  
@@ -13813,7 +13874,7 @@
  ## <param name="domain">
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/networkmanager.te serefpolicy-3.6.3/policy/modules/services/networkmanager.te
 --- nsaserefpolicy/policy/modules/services/networkmanager.te	2009-01-19 11:07:34.000000000 -0500
-+++ serefpolicy-3.6.3/policy/modules/services/networkmanager.te	2009-01-19 13:10:02.000000000 -0500
++++ serefpolicy-3.6.3/policy/modules/services/networkmanager.te	2009-01-19 14:46:55.000000000 -0500
 @@ -33,9 +33,9 @@
  
  # networkmanager will ptrace itself if gdb is installed
@@ -13956,7 +14017,7 @@
  ')
  
  optional_policy(`
-@@ -155,23 +199,48 @@
+@@ -155,23 +199,49 @@
  ')
  
  optional_policy(`
@@ -13987,6 +14048,7 @@
 +
 +optional_policy(`
 +	polkit_domtrans_auth(NetworkManager_t)
++	polkit_read_lib(NetworkManager_t)
 +	polkit_read_reload(NetworkManager_t)
  ')
  
@@ -14007,7 +14069,7 @@
  ')
  
  optional_policy(`
-@@ -184,7 +253,9 @@
+@@ -184,7 +254,9 @@
  
  optional_policy(`
  	vpn_domtrans(NetworkManager_t)
@@ -15974,8 +16036,8 @@
 +/var/lib/misc/PolicyKit.reload			gen_context(system_u:object_r:polkit_reload_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/polkit.if serefpolicy-3.6.3/policy/modules/services/polkit.if
 --- nsaserefpolicy/policy/modules/services/polkit.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.3/policy/modules/services/polkit.if	2009-01-19 13:10:02.000000000 -0500
-@@ -0,0 +1,240 @@
++++ serefpolicy-3.6.3/policy/modules/services/polkit.if	2009-01-19 14:47:07.000000000 -0500
+@@ -0,0 +1,241 @@
 +
 +## <summary>policy for polkit_auth</summary>
 +
@@ -16193,6 +16255,7 @@
 +template(`polkit_role',`
 +	polkit_run_auth($2, $1)
 +	polkit_run_grant($2, $1)
++	polkit_read_lib($2)
 +	polkit_read_reload($2)
 +')
 +
@@ -20250,17 +20313,18 @@
  ## <param name="domain">
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/squid.te serefpolicy-3.6.3/policy/modules/services/squid.te
 --- nsaserefpolicy/policy/modules/services/squid.te	2009-01-19 11:06:49.000000000 -0500
-+++ serefpolicy-3.6.3/policy/modules/services/squid.te	2009-01-19 13:10:02.000000000 -0500
-@@ -118,6 +118,8 @@
++++ serefpolicy-3.6.3/policy/modules/services/squid.te	2009-01-19 15:16:22.000000000 -0500
+@@ -118,6 +118,9 @@
  
  fs_getattr_all_fs(squid_t)
  fs_search_auto_mountpoints(squid_t)
 +#squid requires the following when run in diskd mode, the recommended setting
 +fs_rw_tmpfs_files(squid_t)
++fs_list_inotify(squid_t)
  
  selinux_dontaudit_getattr_dir(squid_t)
  
-@@ -185,8 +187,3 @@
+@@ -185,8 +188,3 @@
  optional_policy(`
  	udev_read_db(squid_t)
  ')
@@ -21444,7 +21508,7 @@
  ##	display.
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.te serefpolicy-3.6.3/policy/modules/services/xserver.te
 --- nsaserefpolicy/policy/modules/services/xserver.te	2009-01-19 11:06:49.000000000 -0500
-+++ serefpolicy-3.6.3/policy/modules/services/xserver.te	2009-01-19 13:10:02.000000000 -0500
++++ serefpolicy-3.6.3/policy/modules/services/xserver.te	2009-01-19 14:47:14.000000000 -0500
 @@ -34,6 +34,13 @@
  
  ## <desc>
@@ -21810,11 +21874,12 @@
  	hostname_exec(xdm_t)
  ')
  
-@@ -542,6 +622,18 @@
+@@ -542,6 +622,19 @@
  ')
  
  optional_policy(`
 +	polkit_domtrans_auth(xdm_t)
++	polkit_read_lib(xdm_t)
 +	polkit_read_reload(xdm_t)
 +')
 +
@@ -21829,7 +21894,7 @@
  	seutil_sigchld_newrole(xdm_t)
  ')
  
-@@ -550,8 +642,8 @@
+@@ -550,8 +643,8 @@
  ')
  
  optional_policy(`
@@ -21839,7 +21904,7 @@
  
  	ifndef(`distro_redhat',`
  		allow xdm_t self:process { execheap execmem };
-@@ -571,6 +663,10 @@
+@@ -571,6 +664,10 @@
  ')
  
  optional_policy(`
@@ -21850,7 +21915,7 @@
  	xfs_stream_connect(xdm_t)
  ')
  
-@@ -635,6 +731,15 @@
+@@ -635,6 +732,15 @@
  manage_lnk_files_pattern(xserver_t, xkb_var_lib_t, xkb_var_lib_t)
  files_search_var_lib(xserver_t)
  
@@ -21866,7 +21931,7 @@
  # Create files in /var/log with the xserver_log_t type.
  manage_files_pattern(xserver_t, xserver_log_t, xserver_log_t)
  logging_log_filetrans(xserver_t, xserver_log_t,file)
-@@ -682,6 +787,7 @@
+@@ -682,6 +788,7 @@
  dev_rw_input_dev(xserver_t)
  dev_rwx_zero(xserver_t)
  
@@ -21874,7 +21939,7 @@
  domain_mmap_low(xserver_t)
  
  files_read_etc_files(xserver_t)
-@@ -697,6 +803,7 @@
+@@ -697,6 +804,7 @@
  fs_search_nfs(xserver_t)
  fs_search_auto_mountpoints(xserver_t)
  fs_search_ramfs(xserver_t)
@@ -21882,7 +21947,7 @@
  
  mls_xwin_read_to_clearance(xserver_t)
  
-@@ -806,7 +913,7 @@
+@@ -806,7 +914,7 @@
  allow xserver_t xdm_var_lib_t:file { getattr read };
  dontaudit xserver_t xdm_var_lib_t:dir search;
  
@@ -21891,7 +21956,7 @@
  
  # Label pid and temporary files with derived types.
  manage_files_pattern(xserver_t, xdm_tmp_t, xdm_tmp_t)
-@@ -830,6 +937,10 @@
+@@ -830,6 +938,10 @@
  
  xserver_use_user_fonts(xserver_t)
  
@@ -21902,7 +21967,7 @@
  tunable_policy(`use_nfs_home_dirs',`
  	fs_manage_nfs_dirs(xserver_t)
  	fs_manage_nfs_files(xserver_t)
-@@ -844,11 +955,14 @@
+@@ -844,11 +956,14 @@
  
  optional_policy(`
  	dbus_system_bus_client(xserver_t)
@@ -21918,7 +21983,7 @@
  ')
  
  optional_policy(`
-@@ -856,6 +970,11 @@
+@@ -856,6 +971,11 @@
  	rhgb_rw_tmpfs_files(xserver_t)
  ')
  
@@ -21930,7 +21995,7 @@
  ########################################
  #
  # Rules common to all X window domains
-@@ -972,6 +1091,37 @@
+@@ -972,6 +1092,37 @@
  allow xserver_unconfined_type { x_domain xserver_t }:x_resource *;
  allow xserver_unconfined_type xevent_type:{ x_event x_synthetic_event } *;
  
@@ -21968,7 +22033,7 @@
  ifdef(`TODO',`
  tunable_policy(`allow_polyinstantiation',`
  # xdm needs access for linking .X11-unix to poly /tmp
-@@ -986,3 +1136,13 @@
+@@ -986,3 +1137,13 @@
  #
  allow xdm_t user_home_type:file unlink;
  ') dnl end TODO


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.768
retrieving revision 1.769
diff -u -r1.768 -r1.769
--- selinux-policy.spec	19 Jan 2009 17:35:43 -0000	1.768
+++ selinux-policy.spec	19 Jan 2009 21:48:16 -0000	1.769
@@ -20,7 +20,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.6.3
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -445,6 +445,9 @@
 %endif
 
 %changelog
+* Mon Jan 19 2009 Dan Walsh <dwalsh at redhat.com> 3.6.3-2
+- Add devicekit policy
+
 * Mon Jan 19 2009 Dan Walsh <dwalsh at redhat.com> 3.6.3-1
 - Update to upstream
 



From cebbert at fedoraproject.org  Mon Jan 19 21:55:17 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Mon, 19 Jan 2009 21:55:17 +0000 (UTC)
Subject: rpms/kernel/F-10
	linux-2.6-net-sctp-avoid-memory-overflow-while-FWD-TSN-chunk-is-r.patch,
	NONE, 1.1 kernel.spec, 1.1218, 1.1219
Message-ID: <20090119215517.0EAAA700F8@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15711

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-net-sctp-avoid-memory-overflow-while-FWD-TSN-chunk-is-r.patch 
Log Message:
CVE-2009-0065: buffer overflow in net/sctp/sm_statefuns.c
  in the Stream Control Transmission Protocol

linux-2.6-net-sctp-avoid-memory-overflow-while-FWD-TSN-chunk-is-r.patch:

--- NEW FILE linux-2.6-net-sctp-avoid-memory-overflow-while-FWD-TSN-chunk-is-r.patch ---
From: Wei Yongjun <yjwei at cn.fujitsu.com>
Date: Fri, 26 Dec 2008 00:58:11 +0000 (-0800)
Subject: sctp: Avoid memory overflow while FWD-TSN chunk is received with bad stream ID
X-Git-Tag: v2.6.29-rc1~581^2~75
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=9fcb95a105758b81ef0131cd18e2db5149f13e95

sctp: Avoid memory overflow while FWD-TSN chunk is received with bad stream ID

If FWD-TSN chunk is received with bad stream ID, the sctp will not do the
validity check, this may cause memory overflow when overwrite the TSN of
the stream ID.

The FORWARD-TSN chunk is like this:

FORWARD-TSN chunk
  Type                       = 192
  Flags                      = 0
  Length                     = 172
  NewTSN                     = 99
  Stream                     = 10000
  StreamSequence             = 0xFFFF

This patch fix this problem by discard the chunk if stream ID is not
less than MIS.

Signed-off-by: Wei Yongjun <yjwei at cn.fujitsu.com>
Signed-off-by: Vlad Yasevich <vladislav.yasevich at hp.com>
Signed-off-by: David S. Miller <davem at davemloft.net>
---

diff --git a/net/sctp/sm_statefuns.c b/net/sctp/sm_statefuns.c
index 9f2a3eb..1c4e5d6 100644
--- a/net/sctp/sm_statefuns.c
+++ b/net/sctp/sm_statefuns.c
@@ -3689,6 +3689,7 @@ sctp_disposition_t sctp_sf_eat_fwd_tsn(const struct sctp_endpoint *ep,
 {
 	struct sctp_chunk *chunk = arg;
 	struct sctp_fwdtsn_hdr *fwdtsn_hdr;
+	struct sctp_fwdtsn_skip *skip;
 	__u16 len;
 	__u32 tsn;
 
@@ -3718,6 +3719,12 @@ sctp_disposition_t sctp_sf_eat_fwd_tsn(const struct sctp_endpoint *ep,
 	if (sctp_tsnmap_check(&asoc->peer.tsn_map, tsn) < 0)
 		goto discard_noforce;
 
+	/* Silently discard the chunk if stream-id is not valid */
+	sctp_walk_fwdtsn(skip, chunk) {
+		if (ntohs(skip->stream) >= asoc->c.sinit_max_instreams)
+			goto discard_noforce;
+	}
+
 	sctp_add_cmd_sf(commands, SCTP_CMD_REPORT_FWDTSN, SCTP_U32(tsn));
 	if (len > sizeof(struct sctp_fwdtsn_hdr))
 		sctp_add_cmd_sf(commands, SCTP_CMD_PROCESS_FWDTSN,
@@ -3749,6 +3756,7 @@ sctp_disposition_t sctp_sf_eat_fwd_tsn_fast(
 {
 	struct sctp_chunk *chunk = arg;
 	struct sctp_fwdtsn_hdr *fwdtsn_hdr;
+	struct sctp_fwdtsn_skip *skip;
 	__u16 len;
 	__u32 tsn;
 
@@ -3778,6 +3786,12 @@ sctp_disposition_t sctp_sf_eat_fwd_tsn_fast(
 	if (sctp_tsnmap_check(&asoc->peer.tsn_map, tsn) < 0)
 		goto gen_shutdown;
 
+	/* Silently discard the chunk if stream-id is not valid */
+	sctp_walk_fwdtsn(skip, chunk) {
+		if (ntohs(skip->stream) >= asoc->c.sinit_max_instreams)
+			goto gen_shutdown;
+	}
+
 	sctp_add_cmd_sf(commands, SCTP_CMD_REPORT_FWDTSN, SCTP_U32(tsn));
 	if (len > sizeof(struct sctp_fwdtsn_hdr))
 		sctp_add_cmd_sf(commands, SCTP_CMD_PROCESS_FWDTSN,


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/kernel.spec,v
retrieving revision 1.1218
retrieving revision 1.1219
diff -u -r1.1218 -r1.1219
--- kernel.spec	19 Jan 2009 06:21:31 -0000	1.1218
+++ kernel.spec	19 Jan 2009 21:54:46 -0000	1.1219
@@ -657,6 +657,9 @@
 # Fix DEBUG_SHIRQ problem in tulip driver.  (454575)
 Patch2030: linux-2.6-net-tulip-interrupt.patch
 
+# CVE-2009-0065
+Patch2031: linux-2.6-net-sctp-avoid-memory-overflow-while-FWD-TSN-chunk-is-r.patch
+
 # olpc fixes
 Patch2040: linux-2.6-olpc-speaker-out.patch
 
@@ -1175,6 +1178,8 @@
 
 ApplyPatch linux-2.6-net-tulip-interrupt.patch
 
+ApplyPatch linux-2.6-net-sctp-avoid-memory-overflow-while-FWD-TSN-chunk-is-r.patch
+
 ApplyPatch linux-2.6-olpc-speaker-out.patch
 
 ApplyPatch linux-2.6-serial.patch
@@ -1776,6 +1781,10 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Mon Jan 19 2009 Chuck Ebbert <cebbert at redhat.com>
+- CVE-2009-0065: buffer overflow in net/sctp/sm_statefuns.c
+  in the Stream Control Transmission Protocol
+
 * Mon Jan 19 2009 Kyle McMartin <kyle at redhat.com>
 - execshield fixes: should no longer generate spurious handled GPFs,
   fixes randomization of executables. also some clean ups.



From snirkel at fedoraproject.org  Mon Jan 19 21:56:33 2009
From: snirkel at fedoraproject.org (Linus Walleij)
Date: Mon, 19 Jan 2009 21:56:33 +0000 (UTC)
Subject: rpms/gnomad2/F-9 .cvsignore, 1.14, 1.15 gnomad2.spec, 1.27,
	1.28 sources, 1.14, 1.15
Message-ID: <20090119215633.E0BF0700F8@cvs1.fedora.phx.redhat.com>

Author: snirkel

Update of /cvs/extras/rpms/gnomad2/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15828

Modified Files:
	.cvsignore gnomad2.spec sources 
Log Message:
Bumping release to 2.9.3 to get latest bug fixes.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnomad2/F-9/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	28 Jan 2008 22:22:22 -0000	1.14
+++ .cvsignore	19 Jan 2009 21:56:03 -0000	1.15
@@ -1 +1 @@
-gnomad2-2.9.1.tar.gz
+gnomad2-2.9.3.tar.gz


Index: gnomad2.spec
===================================================================
RCS file: /cvs/extras/rpms/gnomad2/F-9/gnomad2.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- gnomad2.spec	11 Feb 2008 08:27:13 -0000	1.27
+++ gnomad2.spec	19 Jan 2009 21:56:03 -0000	1.28
@@ -1,8 +1,8 @@
 # SPEC file for gnomad2, main target is Fedora.
 
 Name:		gnomad2
-Version:    	2.9.1
-Release:	2%{?dist}
+Version:    	2.9.3
+Release:	1%{?dist}
 
 Summary:	A GNOME 2.0 client for the Creative Jukeboxes and Dell DJs
 License:	GPLv2+
@@ -63,6 +63,10 @@
 %doc AUTHORS NEWS README COPYING ChangeLog
 
 %changelog
+* Mon Jan 19 2009 Linus Walleij <triad at df.lth.se> 2.9.3-1
+- New upstream, compiles with libmtp < 0.3.0 also (for F-9)
+* Thu Aug 7 2008 Linus Walleij <triad at df.lth.se> 2.9.2-1
+- New upstream to catch up with libmtp 0.3.0.
 * Mon Feb 11 2008 Linus Walleij <triad at df.lth.se> 2.9.1-2
 - Rebuild for GCC 4.3.
 * Mon Jan 28 2008 Linus Walleij <triad at df.lth.se> 2.9.1-1


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnomad2/F-9/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	28 Jan 2008 22:22:22 -0000	1.14
+++ sources	19 Jan 2009 21:56:03 -0000	1.15
@@ -1 +1 @@
-817888f2e952525ad649027e4e4baf38  gnomad2-2.9.1.tar.gz
+4007d2e52806a54e775f066b48ad4378  gnomad2-2.9.3.tar.gz



From snirkel at fedoraproject.org  Mon Jan 19 22:04:09 2009
From: snirkel at fedoraproject.org (Linus Walleij)
Date: Mon, 19 Jan 2009 22:04:09 +0000 (UTC)
Subject: rpms/gnomad2/devel .cvsignore, 1.15, 1.16 gnomad2.spec, 1.28,
	1.29 sources, 1.15, 1.16
Message-ID: <20090119220409.57925700F8@cvs1.fedora.phx.redhat.com>

Author: snirkel

Update of /cvs/extras/rpms/gnomad2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16759

Modified Files:
	.cvsignore gnomad2.spec sources 
Log Message:
New upstream version.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnomad2/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	7 Aug 2008 20:02:41 -0000	1.15
+++ .cvsignore	19 Jan 2009 22:03:39 -0000	1.16
@@ -1 +1 @@
-gnomad2-2.9.2.tar.gz
+gnomad2-2.9.3.tar.gz


Index: gnomad2.spec
===================================================================
RCS file: /cvs/extras/rpms/gnomad2/devel/gnomad2.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- gnomad2.spec	7 Aug 2008 20:02:41 -0000	1.28
+++ gnomad2.spec	19 Jan 2009 22:03:39 -0000	1.29
@@ -1,7 +1,7 @@
 # SPEC file for gnomad2, main target is Fedora.
 
 Name:		gnomad2
-Version:    	2.9.2
+Version:    	2.9.3
 Release:	1%{?dist}
 
 Summary:	A GNOME 2.0 client for the Creative Jukeboxes and Dell DJs
@@ -63,6 +63,8 @@
 %doc AUTHORS NEWS README COPYING ChangeLog
 
 %changelog
+* Mon Jan 19 2009 Linus Walleij <triad at df.lth.se> 2.9.3-1
+- New upstream, compiles with libmtp < 0.3.0 also (for F-9)
 * Thu Aug 7 2008 Linus Walleij <triad at df.lth.se> 2.9.2-1
 - New upstream to catch up with libmtp 0.3.0.
 * Mon Feb 11 2008 Linus Walleij <triad at df.lth.se> 2.9.1-2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnomad2/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	7 Aug 2008 20:02:41 -0000	1.15
+++ sources	19 Jan 2009 22:03:39 -0000	1.16
@@ -1 +1 @@
-39ca24bec8b8a28ee73e88eabddf59fb  gnomad2-2.9.2.tar.gz
+4007d2e52806a54e775f066b48ad4378  gnomad2-2.9.3.tar.gz



From snirkel at fedoraproject.org  Mon Jan 19 22:08:38 2009
From: snirkel at fedoraproject.org (Linus Walleij)
Date: Mon, 19 Jan 2009 22:08:38 +0000 (UTC)
Subject: rpms/gnomad2/F-10 .cvsignore, 1.15, 1.16 gnomad2.spec, 1.28,
	1.29 sources, 1.15, 1.16
Message-ID: <20090119220838.4FECF700F8@cvs1.fedora.phx.redhat.com>

Author: snirkel

Update of /cvs/extras/rpms/gnomad2/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17305

Modified Files:
	.cvsignore gnomad2.spec sources 
Log Message:
New upstream version.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnomad2/F-10/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	7 Aug 2008 20:02:41 -0000	1.15
+++ .cvsignore	19 Jan 2009 22:08:07 -0000	1.16
@@ -1 +1 @@
-gnomad2-2.9.2.tar.gz
+gnomad2-2.9.3.tar.gz


Index: gnomad2.spec
===================================================================
RCS file: /cvs/extras/rpms/gnomad2/F-10/gnomad2.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- gnomad2.spec	7 Aug 2008 20:02:41 -0000	1.28
+++ gnomad2.spec	19 Jan 2009 22:08:07 -0000	1.29
@@ -1,7 +1,7 @@
 # SPEC file for gnomad2, main target is Fedora.
 
 Name:		gnomad2
-Version:    	2.9.2
+Version:    	2.9.3
 Release:	1%{?dist}
 
 Summary:	A GNOME 2.0 client for the Creative Jukeboxes and Dell DJs
@@ -63,6 +63,8 @@
 %doc AUTHORS NEWS README COPYING ChangeLog
 
 %changelog
+* Mon Jan 19 2009 Linus Walleij <triad at df.lth.se> 2.9.3-1
+- New upstream, compiles with libmtp < 0.3.0 also (for F-9)
 * Thu Aug 7 2008 Linus Walleij <triad at df.lth.se> 2.9.2-1
 - New upstream to catch up with libmtp 0.3.0.
 * Mon Feb 11 2008 Linus Walleij <triad at df.lth.se> 2.9.1-2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnomad2/F-10/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	7 Aug 2008 20:02:41 -0000	1.15
+++ sources	19 Jan 2009 22:08:07 -0000	1.16
@@ -1 +1 @@
-39ca24bec8b8a28ee73e88eabddf59fb  gnomad2-2.9.2.tar.gz
+4007d2e52806a54e775f066b48ad4378  gnomad2-2.9.3.tar.gz



From notting at fedoraproject.org  Mon Jan 19 22:10:35 2009
From: notting at fedoraproject.org (Bill Nottingham)
Date: Mon, 19 Jan 2009 22:10:35 +0000 (UTC)
Subject: rpms/initscripts/devel .cvsignore, 1.156, 1.157 initscripts.spec,
	1.183, 1.184 sources, 1.174, 1.175
Message-ID: <20090119221035.F248E700F8@cvs1.fedora.phx.redhat.com>

Author: notting

Update of /cvs/extras/rpms/initscripts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17731

Modified Files:
	.cvsignore initscripts.spec sources 
Log Message:
8.87-1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/initscripts/devel/.cvsignore,v
retrieving revision 1.156
retrieving revision 1.157
diff -u -r1.156 -r1.157
--- .cvsignore	1 Nov 2008 04:30:22 -0000	1.156
+++ .cvsignore	19 Jan 2009 22:10:05 -0000	1.157
@@ -1 +1 @@
-initscripts-8.85.tar.bz2
+initscripts-8.87.tar.bz2


Index: initscripts.spec
===================================================================
RCS file: /cvs/extras/rpms/initscripts/devel/initscripts.spec,v
retrieving revision 1.183
retrieving revision 1.184
diff -u -r1.183 -r1.184
--- initscripts.spec	1 Nov 2008 04:30:22 -0000	1.183
+++ initscripts.spec	19 Jan 2009 22:10:05 -0000	1.184
@@ -2,7 +2,7 @@
 
 Summary: The inittab file and the /etc/init.d scripts
 Name: initscripts
-Version: 8.85
+Version: 8.87
 # ppp-watch is GPLv2+, everything else is GPLv2
 License: GPLv2 and GPLv2+
 Group: System Environment/Base
@@ -142,7 +142,7 @@
 /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
+%config(noreplace) /etc/sysconfig/network-scripts/ifcfg-lo
 /etc/sysconfig/network-scripts/ifup-ipx
 /etc/sysconfig/network-scripts/ifup-post
 /etc/sysconfig/network-scripts/ifdown-ppp
@@ -250,6 +250,27 @@
 /etc/profile.d/debug*
 
 %changelog
+* Mon Jan 19 2009 Bill Nottingham <notting at redhat.com> - 8.87-1
+- rename_device: be much faster in the presence of many devices (#480687, <danms at us.ibm.com>)
+- fix switching from targeted to MLS policy (#479054, <dwalsh at redhat.com>)
+- rc.sysinit: don't set $(uname -r) or $(uname -m); they're not used
+- network-functions-ipv6: set MTU correctly for 6to4. (#477976, <ackistler at yahoo.com>)
+- add more entries to rwtab (#476799, <harald at redhat.com>)
+- net.hotplug: Bail out sooner if the network service isn't running
+- init.d/halt: determine reboot/halt via existing INIT_HALT environment variable. (#475227)
+- event.d/serial: add some docs
+- init.d/functions: __pids_var_run: Handle multi-line pid files correctly (#473287)
+- remove support for no longer existing 'brctl setgcint' command. (#360471)
+- add %config back for ifcfg-lo (#472761)
+- rcS/rcS-sulogin: don't match commented lines when finding runlevel (#472717)
+- updated translations: de, sk
+
+* Tue Nov 11 2008 Bill Nottingham <notting at redhat.com> - 8.86-1
+- stop plymouth before stopping the runlevel (#467207)
+- fix get_config_by_subchannel (#459044, <harald at redhat.com>)
+- use blkid -l to pick a single most appropriate device (#470027)
+- don't mkswap on halt, as it breaks swap-by-label/UUID (#469823)
+
 * Fri Oct 31 2008 Bill Nottingham <notting at redhat.com> - 8.85-1
 - add some error handling/hiding to netfs NM dispatcher script (#469197)
 - halt: fix code that causes a syntax error on multiple sound cards (#469156)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/initscripts/devel/sources,v
retrieving revision 1.174
retrieving revision 1.175
diff -u -r1.174 -r1.175
--- sources	1 Nov 2008 04:30:22 -0000	1.174
+++ sources	19 Jan 2009 22:10:05 -0000	1.175
@@ -1 +1 @@
-1b7863eca343cc9eb54ef86182b36422  initscripts-8.85.tar.bz2
+44aa49864ab9f4ea65d09a7ec1040ef0  initscripts-8.87.tar.bz2



From dwalsh at fedoraproject.org  Mon Jan 19 22:10:42 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Mon, 19 Jan 2009 22:10:42 +0000 (UTC)
Subject: rpms/selinux-policy/devel modules-minimum.conf, 1.9,
	1.10 modules-targeted.conf, 1.111, 1.112 policy-20090105.patch,
	1.10, 1.11
Message-ID: <20090119221042.64ED6700F8@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17783

Modified Files:
	modules-minimum.conf modules-targeted.conf 
	policy-20090105.patch 
Log Message:
* Mon Jan 19 2009 Dan Walsh <dwalsh at redhat.com> 3.6.3-2
- Add devicekit policy



Index: modules-minimum.conf
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/modules-minimum.conf,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- modules-minimum.conf	12 Jan 2009 16:59:00 -0000	1.9
+++ modules-minimum.conf	19 Jan 2009 22:10:11 -0000	1.10
@@ -340,6 +340,13 @@
 # 
 ddcprobe = off
 
+# Layer: services
+# Module: devicekit
+#
+# devicekit-daemon
+# 
+devicekit = module
+
 # Layer: kernel
 # Module: devices
 # Required in base


Index: modules-targeted.conf
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/modules-targeted.conf,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -r1.111 -r1.112
--- modules-targeted.conf	12 Jan 2009 16:59:00 -0000	1.111
+++ modules-targeted.conf	19 Jan 2009 22:10:11 -0000	1.112
@@ -340,6 +340,13 @@
 # 
 ddcprobe = off
 
+# Layer: services
+# Module: devicekit
+#
+# devicekit-daemon
+# 
+devicekit = module
+
 # Layer: kernel
 # Module: devices
 # Required in base

policy-20090105.patch:

Index: policy-20090105.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-20090105.patch,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- policy-20090105.patch	19 Jan 2009 21:48:16 -0000	1.10
+++ policy-20090105.patch	19 Jan 2009 22:10:11 -0000	1.11
@@ -11412,6 +11412,216 @@
  corenet_udp_sendrecv_generic_if(dcc_client_t)
  corenet_udp_sendrecv_generic_node(dcc_client_t)
  corenet_udp_sendrecv_all_ports(dcc_client_t)
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/devicekit.fc serefpolicy-3.6.3/policy/modules/services/devicekit.fc
+--- nsaserefpolicy/policy/modules/services/devicekit.fc	1969-12-31 19:00:00.000000000 -0500
++++ serefpolicy-3.6.3/policy/modules/services/devicekit.fc	2009-01-19 17:04:16.000000000 -0500
+@@ -0,0 +1,4 @@
++
++/usr/libexec/devkit-daemon	--	gen_context(system_u:object_r:devicekit_exec_t,s0)
++/usr/libexec/devkit-power-daemon	--	gen_context(system_u:object_r:devicekit_power_exec_t,s0)
++/var/run/devkit(/.*)?			gen_context(system_u:object_r:devicekit_var_run_t,s0)
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/devicekit.if serefpolicy-3.6.3/policy/modules/services/devicekit.if
+--- nsaserefpolicy/policy/modules/services/devicekit.if	1969-12-31 19:00:00.000000000 -0500
++++ serefpolicy-3.6.3/policy/modules/services/devicekit.if	2009-01-19 17:09:09.000000000 -0500
+@@ -0,0 +1,139 @@
++
++## <summary>policy for devicekit</summary>
++
++########################################
++## <summary>
++##	Execute a domain transition to run devicekit.
++## </summary>
++## <param name="domain">
++## <summary>
++##	Domain allowed to transition.
++## </summary>
++## </param>
++#
++interface(`devicekit_domtrans',`
++	gen_require(`
++		type devicekit_t;
++                type devicekit_exec_t;
++	')
++
++	domtrans_pattern($1,devicekit_exec_t,devicekit_t)
++')
++
++
++########################################
++## <summary>
++##	Read devicekit PID files.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`devicekit_read_pid_files',`
++	gen_require(`
++		type devicekit_var_run_t;
++	')
++
++	files_search_pids($1)
++	allow $1 devicekit_var_run_t:file read_file_perms;
++')
++
++########################################
++## <summary>
++##	Manage devicekit var_run files.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`devicekit_manage_var_run',`
++	gen_require(`
++		type devicekit_var_run_t;
++	')
++
++         manage_dirs_pattern($1,devicekit_var_run_t,devicekit_var_run_t)
++         manage_files_pattern($1,devicekit_var_run_t,devicekit_var_run_t)
++         manage_lnk_files_pattern($1,devicekit_var_run_t,devicekit_var_run_t)
++')
++
++
++########################################
++## <summary>
++##	Send and receive messages from
++##	devicekit over dbus.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`devicekit_dbus_chat',`
++	gen_require(`
++		type devicekit_t;
++		class dbus send_msg;
++	')
++
++	allow $1 devicekit_t:dbus send_msg;
++	allow devicekit_t $1:dbus send_msg;
++')
++
++########################################
++## <summary>
++##	Send and receive messages from
++##	devicekit power over dbus.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`devicekit_power_dbus_chat',`
++	gen_require(`
++		type devicekit_t;
++		class dbus send_msg;
++	')
++
++	allow $1 devicekit_power_t:dbus send_msg;
++	allow devicekit_power_t $1:dbus send_msg;
++')
++
++########################################
++## <summary>
++##	All of the rules required to administrate 
++##	an devicekit environment
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++## <param name="role">
++##	<summary>
++##	The role to be allowed to manage the devicekit domain.
++##	</summary>
++## </param>
++## <param name="terminal">
++##	<summary>
++##	The type of the user terminal.
++##	</summary>
++## </param>
++## <rolecap/>
++#
++interface(`devicekit_admin',`
++	gen_require(`
++		type devicekit_t;
++	')
++
++	allow $1 devicekit_t:process { ptrace signal_perms getattr };
++	read_files_pattern($1, devicekit_t, devicekit_t)
++	        
++
++	devicekit_manage_var_run($1)
++
++')
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/devicekit.te serefpolicy-3.6.3/policy/modules/services/devicekit.te
+--- nsaserefpolicy/policy/modules/services/devicekit.te	1969-12-31 19:00:00.000000000 -0500
++++ serefpolicy-3.6.3/policy/modules/services/devicekit.te	2009-01-19 17:06:44.000000000 -0500
+@@ -0,0 +1,55 @@
++policy_module(devicekit,1.0.0)
++
++########################################
++#
++# Declarations
++#
++
++type devicekit_t;
++type devicekit_exec_t;
++dbus_system_domain(devicekit_t, devicekit_exec_t)
++
++permissive devicekit_t;
++
++type devicekit_power_t;
++type devicekit_power_exec_t;
++dbus_system_domain(devicekit_power_t, devicekit_power_exec_t)
++
++permissive devicekit_power_t;
++
++type devicekit_var_run_t;
++files_pid_file(devicekit_var_run_t)
++
++#
++# DeviceKit local policy
++#
++
++manage_dirs_pattern(devicekit_t, devicekit_var_run_t,  devicekit_var_run_t)
++manage_files_pattern(devicekit_t, devicekit_var_run_t,  devicekit_var_run_t)
++files_pid_filetrans(devicekit_t,devicekit_var_run_t, { file dir })
++
++fs_list_inotifyfs(devicekit_t)
++
++optional_policy(`
++	dbus_system_bus_client(devicekit_t)
++')
++
++#
++# DeviceKit-Power local policy
++#
++
++dev_rw_netcontrol(devicekit_power_t)
++files_read_etc_files(devicekit_power_t)
++fs_list_inotifyfs(devicekit_power_t)
++
++optional_policy(`
++	polkit_read_reload(devicekit_power_t)
++')
++
++optional_policy(`
++	dbus_system_bus_client(devicekit_power_t)
++	allow devicekit_power_t devicekit_t:dbus send_msg;
++	allow devicekit_t devicekit_power_t:dbus send_msg;
++')
++
++
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dhcp.if serefpolicy-3.6.3/policy/modules/services/dhcp.if
 --- nsaserefpolicy/policy/modules/services/dhcp.if	2008-11-18 18:57:20.000000000 -0500
 +++ serefpolicy-3.6.3/policy/modules/services/dhcp.if	2009-01-19 13:10:02.000000000 -0500
@@ -21508,7 +21718,7 @@
  ##	display.
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.te serefpolicy-3.6.3/policy/modules/services/xserver.te
 --- nsaserefpolicy/policy/modules/services/xserver.te	2009-01-19 11:06:49.000000000 -0500
-+++ serefpolicy-3.6.3/policy/modules/services/xserver.te	2009-01-19 14:47:14.000000000 -0500
++++ serefpolicy-3.6.3/policy/modules/services/xserver.te	2009-01-19 17:08:51.000000000 -0500
 @@ -34,6 +34,13 @@
  
  ## <desc>
@@ -21838,7 +22048,7 @@
  ')
  
  optional_policy(`
-@@ -515,12 +572,35 @@
+@@ -515,12 +572,41 @@
  ')
  
  optional_policy(`
@@ -21852,14 +22062,20 @@
 +	dbus_system_bus_client(xdm_t)
 +
 +	optional_policy(`
++		devicekit_power_dbus_chat(xdm_t)
++	')
++
++	optional_policy(`
 +		hal_dbus_chat(xdm_t)
 +	')
 +
 +	optional_policy(`
 +		networkmanager_dbus_chat(xdm_t)
 +	')
++
 +')
 +
++
 +optional_policy(`
  	# Talk to the console mouse server.
  	gpm_stream_connect(xdm_t)
@@ -21874,7 +22090,7 @@
  	hostname_exec(xdm_t)
  ')
  
-@@ -542,6 +622,19 @@
+@@ -542,6 +628,19 @@
  ')
  
  optional_policy(`
@@ -21894,7 +22110,7 @@
  	seutil_sigchld_newrole(xdm_t)
  ')
  
-@@ -550,8 +643,8 @@
+@@ -550,8 +649,8 @@
  ')
  
  optional_policy(`
@@ -21904,7 +22120,7 @@
  
  	ifndef(`distro_redhat',`
  		allow xdm_t self:process { execheap execmem };
-@@ -571,6 +664,10 @@
+@@ -571,6 +670,10 @@
  ')
  
  optional_policy(`
@@ -21915,7 +22131,7 @@
  	xfs_stream_connect(xdm_t)
  ')
  
-@@ -635,6 +732,15 @@
+@@ -635,6 +738,15 @@
  manage_lnk_files_pattern(xserver_t, xkb_var_lib_t, xkb_var_lib_t)
  files_search_var_lib(xserver_t)
  
@@ -21931,7 +22147,7 @@
  # Create files in /var/log with the xserver_log_t type.
  manage_files_pattern(xserver_t, xserver_log_t, xserver_log_t)
  logging_log_filetrans(xserver_t, xserver_log_t,file)
-@@ -682,6 +788,7 @@
+@@ -682,6 +794,7 @@
  dev_rw_input_dev(xserver_t)
  dev_rwx_zero(xserver_t)
  
@@ -21939,7 +22155,7 @@
  domain_mmap_low(xserver_t)
  
  files_read_etc_files(xserver_t)
-@@ -697,6 +804,7 @@
+@@ -697,6 +810,7 @@
  fs_search_nfs(xserver_t)
  fs_search_auto_mountpoints(xserver_t)
  fs_search_ramfs(xserver_t)
@@ -21947,7 +22163,7 @@
  
  mls_xwin_read_to_clearance(xserver_t)
  
-@@ -806,7 +914,7 @@
+@@ -806,7 +920,7 @@
  allow xserver_t xdm_var_lib_t:file { getattr read };
  dontaudit xserver_t xdm_var_lib_t:dir search;
  
@@ -21956,7 +22172,7 @@
  
  # Label pid and temporary files with derived types.
  manage_files_pattern(xserver_t, xdm_tmp_t, xdm_tmp_t)
-@@ -830,6 +938,10 @@
+@@ -830,6 +944,10 @@
  
  xserver_use_user_fonts(xserver_t)
  
@@ -21967,7 +22183,7 @@
  tunable_policy(`use_nfs_home_dirs',`
  	fs_manage_nfs_dirs(xserver_t)
  	fs_manage_nfs_files(xserver_t)
-@@ -844,11 +956,14 @@
+@@ -844,11 +962,14 @@
  
  optional_policy(`
  	dbus_system_bus_client(xserver_t)
@@ -21983,7 +22199,7 @@
  ')
  
  optional_policy(`
-@@ -856,6 +971,11 @@
+@@ -856,6 +977,11 @@
  	rhgb_rw_tmpfs_files(xserver_t)
  ')
  
@@ -21995,7 +22211,7 @@
  ########################################
  #
  # Rules common to all X window domains
-@@ -972,6 +1092,37 @@
+@@ -972,6 +1098,37 @@
  allow xserver_unconfined_type { x_domain xserver_t }:x_resource *;
  allow xserver_unconfined_type xevent_type:{ x_event x_synthetic_event } *;
  
@@ -22033,7 +22249,7 @@
  ifdef(`TODO',`
  tunable_policy(`allow_polyinstantiation',`
  # xdm needs access for linking .X11-unix to poly /tmp
-@@ -986,3 +1137,13 @@
+@@ -986,3 +1143,13 @@
  #
  allow xdm_t user_home_type:file unlink;
  ') dnl end TODO
@@ -26194,7 +26410,7 @@
 +/dev/shm/mono.*		gen_context(system_u:object_r:user_tmpfs_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-3.6.3/policy/modules/system/userdomain.if
 --- nsaserefpolicy/policy/modules/system/userdomain.if	2009-01-19 11:07:34.000000000 -0500
-+++ serefpolicy-3.6.3/policy/modules/system/userdomain.if	2009-01-19 13:10:02.000000000 -0500
++++ serefpolicy-3.6.3/policy/modules/system/userdomain.if	2009-01-19 17:08:20.000000000 -0500
 @@ -30,8 +30,9 @@
  	')
  
@@ -26594,7 +26810,7 @@
  
  	##############################
  	#
-@@ -512,189 +525,194 @@
+@@ -512,189 +525,198 @@
  	dontaudit $1_t self:netlink_socket { create ioctl read getattr write setattr append bind connect getopt setopt shutdown };
  	dontaudit $1_t self:netlink_route_socket { create ioctl read getattr write setattr append bind connect getopt setopt shutdown nlmsg_read nlmsg_write };
  
@@ -26763,54 +26979,57 @@
  
  		optional_policy(`
 -			hal_dbus_chat($1_t)
-+			evolution_dbus_chat($1_usertype)
-+			evolution_alarm_dbus_chat($1_usertype)
++			devkit_power_dbus_chat($1_usertype)
  		')
  
  		optional_policy(`
 -			networkmanager_dbus_chat($1_t)
 -		')
-+			hal_dbus_chat($1_usertype)
++			evolution_dbus_chat($1_usertype)
++			evolution_alarm_dbus_chat($1_usertype)
  	')
  
  	optional_policy(`
 -		inetd_use_fds($1_t)
 -		inetd_rw_tcp_sockets($1_t)
-+			networkmanager_dbus_chat($1_usertype)
++			hal_dbus_chat($1_usertype)
  	')
  
  	optional_policy(`
 -		inn_read_config($1_t)
 -		inn_read_news_lib($1_t)
 -		inn_read_news_spool($1_t)
-+			vpnc_dbus_chat($1_usertype)
-+		')
++			networkmanager_dbus_chat($1_usertype)
  	')
  
  	optional_policy(`
 -		locate_read_lib_files($1_t)
-+		inetd_use_fds($1_usertype)
-+		inetd_rw_tcp_sockets($1_usertype)
++			vpnc_dbus_chat($1_usertype)
++		')
  	')
  
 -	# for running depmod as part of the kernel packaging process
  	optional_policy(`
 -		modutils_read_module_config($1_t)
-+		inn_read_config($1_usertype)
-+		inn_read_news_lib($1_usertype)
-+		inn_read_news_spool($1_usertype)
++		inetd_use_fds($1_usertype)
++		inetd_rw_tcp_sockets($1_usertype)
  	')
  
  	optional_policy(`
 -		mta_rw_spool($1_t)
-+		locate_read_lib_files($1_usertype)
++		inn_read_config($1_usertype)
++		inn_read_news_lib($1_usertype)
++		inn_read_news_spool($1_usertype)
  	')
  
-+	# for running depmod as part of the kernel packaging process
  	optional_policy(`
 -		tunable_policy(`allow_user_mysql_connect',`
 -			mysql_stream_connect($1_t)
--		')
++		locate_read_lib_files($1_usertype)
+ 		')
++
++	# for running depmod as part of the kernel packaging process
++	optional_policy(`
 +		modutils_read_module_config($1_usertype)
  	')
  
@@ -26832,16 +27051,16 @@
 -			postgresql_stream_connect($1_t)
 -			postgresql_tcp_connect($1_t)
 +			postgresql_stream_connect($1_usertype)
++		')
  		')
++
++	optional_policy(`
++		# to allow monitoring of pcmcia status
++		pcmcia_read_pid($1_usertype)
  	')
  
  	optional_policy(`
 -		resmgr_stream_connect($1_t)
-+		# to allow monitoring of pcmcia status
-+		pcmcia_read_pid($1_usertype)
-+	')
-+
-+	optional_policy(`
 +		pcscd_read_pub_files($1_usertype)
 +		pcscd_stream_connect($1_usertype)
  	')
@@ -26871,7 +27090,7 @@
  ')
  
  #######################################
-@@ -722,15 +740,29 @@
+@@ -722,15 +744,29 @@
  
  	userdom_base_user_template($1)
  
@@ -26907,7 +27126,7 @@
  
  	##############################
  	#
-@@ -746,70 +778,72 @@
+@@ -746,70 +782,72 @@
  
  	allow $1_t self:context contains;
  
@@ -27013,7 +27232,7 @@
  	')
  ')
  
-@@ -846,6 +880,28 @@
+@@ -846,6 +884,28 @@
  	# Local policy
  	#
  
@@ -27042,7 +27261,7 @@
  	optional_policy(`
  		loadkeys_run($1_t,$1_r)
  	')
-@@ -876,7 +932,7 @@
+@@ -876,7 +936,7 @@
  
  	userdom_restricted_user_template($1)
  
@@ -27051,17 +27270,17 @@
  
  	##############################
  	#
-@@ -884,14 +940,18 @@
+@@ -884,14 +944,18 @@
  	#
  
  	auth_role($1_r, $1_t)
 -	auth_search_pam_console_data($1_t)
 +	auth_search_pam_console_data($1_usertype)
-+
-+	xserver_role($1_r, $1_t)
  
 -	dev_read_sound($1_t)
 -	dev_write_sound($1_t)
++	xserver_role($1_r, $1_t)
++
 +	dev_read_sound($1_usertype)
 +	dev_write_sound($1_usertype)
  	# gnome keyring wants to read this.
@@ -27075,7 +27294,7 @@
  	logging_dontaudit_send_audit_msgs($1_t)
  
  	# Need to to this just so screensaver will work. Should be moved to screensaver domain
-@@ -899,28 +959,24 @@
+@@ -899,28 +963,24 @@
  	selinux_get_enforce_mode($1_t)
  
  	optional_policy(`
@@ -27110,7 +27329,7 @@
  	')
  ')
  
-@@ -931,8 +987,7 @@
+@@ -931,8 +991,7 @@
  ## </summary>
  ## <desc>
  ##	<p>
@@ -27120,7 +27339,7 @@
  ##	</p>
  ##	<p>
  ##	This template creates a user domain, types, and
-@@ -954,8 +1009,8 @@
+@@ -954,8 +1013,8 @@
  	# Declarations
  	#
  
@@ -27130,7 +27349,7 @@
  	userdom_common_user_template($1)
  
  	##############################
-@@ -964,11 +1019,10 @@
+@@ -964,11 +1023,10 @@
  	#
  
  	# port access is audited even if dac would not have allowed it, so dontaudit it here
@@ -27143,7 +27362,7 @@
  	# cjp: why?
  	files_read_kernel_symbol_table($1_t)
  
-@@ -986,37 +1040,47 @@
+@@ -986,37 +1044,47 @@
  		')
  	')
  
@@ -27194,17 +27413,17 @@
 +
 +	optional_policy(`
 +		mount_run($1_t, $1_r)
-+	')
+ 	')
 +
 +	# Run pppd in pppd_t by default for user
 +	optional_policy(`
 +		ppp_run_cond($1_t, $1_r)
- 	')
++	')
 +
  ')
  
  #######################################
-@@ -1050,7 +1114,7 @@
+@@ -1050,7 +1118,7 @@
  #
  template(`userdom_admin_user_template',`
  	gen_require(`
@@ -27213,7 +27432,7 @@
  	')
  
  	##############################
-@@ -1059,8 +1123,7 @@
+@@ -1059,8 +1127,7 @@
  	#
  
  	# Inherit rules for ordinary users.
@@ -27223,7 +27442,7 @@
  
  	domain_obj_id_change_exemption($1_t)
  	role system_r types $1_t;
-@@ -1083,7 +1146,8 @@
+@@ -1083,7 +1150,8 @@
  	# Skip authentication when pam_rootok is specified.
  	allow $1_t self:passwd rootok;
  
@@ -27233,7 +27452,7 @@
  
  	kernel_read_software_raid_state($1_t)
  	kernel_getattr_core_if($1_t)
-@@ -1106,8 +1170,6 @@
+@@ -1106,8 +1174,6 @@
  
  	dev_getattr_generic_blk_files($1_t)
  	dev_getattr_generic_chr_files($1_t)
@@ -27242,7 +27461,7 @@
  	# Allow MAKEDEV to work
  	dev_create_all_blk_files($1_t)
  	dev_create_all_chr_files($1_t)
-@@ -1162,20 +1224,6 @@
+@@ -1162,20 +1228,6 @@
  	# But presently necessary for installing the file_contexts file.
  	seutil_manage_bin_policy($1_t)
  
@@ -27263,7 +27482,7 @@
  	optional_policy(`
  		postgresql_unconfined($1_t)
  	')
-@@ -1221,6 +1269,7 @@
+@@ -1221,6 +1273,7 @@
  	dev_relabel_all_dev_nodes($1)
  
  	files_create_boot_flag($1)
@@ -27271,7 +27490,7 @@
  
  	# Necessary for managing /boot/efi
  	fs_manage_dos_files($1)
-@@ -1286,11 +1335,15 @@
+@@ -1286,11 +1339,15 @@
  interface(`userdom_user_home_content',`
  	gen_require(`
  		type user_home_t;
@@ -27287,7 +27506,7 @@
  ')
  
  ########################################
-@@ -1387,7 +1440,7 @@
+@@ -1387,7 +1444,7 @@
  
  ########################################
  ## <summary>
@@ -27296,7 +27515,7 @@
  ## </summary>
  ## <param name="domain">
  ##	<summary>
-@@ -1420,6 +1473,14 @@
+@@ -1420,6 +1477,14 @@
  
  	allow $1 user_home_dir_t:dir list_dir_perms;
  	files_search_home($1)
@@ -27311,7 +27530,7 @@
  ')
  
  ########################################
-@@ -1435,9 +1496,11 @@
+@@ -1435,9 +1500,11 @@
  interface(`userdom_dontaudit_list_user_home_dirs',`
  	gen_require(`
  		type user_home_dir_t;
@@ -27323,7 +27542,7 @@
  ')
  
  ########################################
-@@ -1494,6 +1557,25 @@
+@@ -1494,6 +1561,25 @@
  	allow $1 user_home_dir_t:dir relabelto;
  ')
  
@@ -27349,7 +27568,7 @@
  ########################################
  ## <summary>
  ##	Create directories in the home dir root with
-@@ -1547,9 +1629,9 @@
+@@ -1547,9 +1633,9 @@
  		type user_home_dir_t, user_home_t;
  	')
  
@@ -27361,7 +27580,7 @@
  ')
  
  ########################################
-@@ -1568,6 +1650,8 @@
+@@ -1568,6 +1654,8 @@
  	')
  
  	dontaudit $1 user_home_t:dir search_dir_perms;
@@ -27370,7 +27589,7 @@
  ')
  
  ########################################
-@@ -1643,6 +1727,7 @@
+@@ -1643,6 +1731,7 @@
  		type user_home_dir_t, user_home_t;
  	')
  
@@ -27378,7 +27597,7 @@
  	read_files_pattern($1, { user_home_dir_t user_home_t }, user_home_t)
  	files_search_home($1)
  ')
-@@ -1741,6 +1826,62 @@
+@@ -1741,6 +1830,62 @@
  
  ########################################
  ## <summary>
@@ -27441,7 +27660,7 @@
  ##	Execute user home files.
  ## </summary>
  ## <param name="domain">
-@@ -1757,14 +1898,6 @@
+@@ -1757,14 +1902,6 @@
  
  	files_search_home($1)
  	exec_files_pattern($1, { user_home_dir_t user_home_t }, user_home_t)
@@ -27456,7 +27675,7 @@
  ')
  
  ########################################
-@@ -1787,6 +1920,46 @@
+@@ -1787,6 +1924,46 @@
  
  ########################################
  ## <summary>
@@ -27503,7 +27722,7 @@
  ##	Create, read, write, and delete files
  ##	in a user home subdirectory.
  ## </summary>
-@@ -2819,6 +2992,24 @@
+@@ -2819,6 +2996,24 @@
  
  ########################################
  ## <summary>
@@ -27528,7 +27747,7 @@
  ##	Do not audit attempts to use user ttys.
  ## </summary>
  ## <param name="domain">
-@@ -2851,6 +3042,7 @@
+@@ -2851,6 +3046,7 @@
  	')
  
  	read_files_pattern($1,userdomain,userdomain)
@@ -27536,7 +27755,7 @@
  	kernel_search_proc($1)
  ')
  
-@@ -2965,6 +3157,24 @@
+@@ -2965,6 +3161,24 @@
  
  ########################################
  ## <summary>
@@ -27561,7 +27780,7 @@
  ##	Send a dbus message to all user domains.
  ## </summary>
  ## <param name="domain">
-@@ -2981,3 +3191,264 @@
+@@ -2981,3 +3195,264 @@
  
  	allow $1 userdomain:dbus send_msg;
  ')



From dwalsh at fedoraproject.org  Mon Jan 19 22:11:49 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Mon, 19 Jan 2009 22:11:49 +0000 (UTC)
Subject: rpms/selinux-policy/devel policy-20090105.patch,1.11,1.12
Message-ID: <20090119221149.908A4700F8@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18319

Modified Files:
	policy-20090105.patch 
Log Message:
* Mon Jan 19 2009 Dan Walsh <dwalsh at redhat.com> 3.6.3-2
- Add devicekit policy


policy-20090105.patch:

Index: policy-20090105.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-20090105.patch,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- policy-20090105.patch	19 Jan 2009 22:10:11 -0000	1.11
+++ policy-20090105.patch	19 Jan 2009 22:11:49 -0000	1.12
@@ -8349,7 +8349,7 @@
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.te serefpolicy-3.6.3/policy/modules/services/apache.te
 --- nsaserefpolicy/policy/modules/services/apache.te	2009-01-19 11:06:49.000000000 -0500
-+++ serefpolicy-3.6.3/policy/modules/services/apache.te	2009-01-19 15:38:07.000000000 -0500
++++ serefpolicy-3.6.3/policy/modules/services/apache.te	2009-01-19 17:10:55.000000000 -0500
 @@ -19,6 +19,8 @@
  # Declarations
  #
@@ -8450,10 +8450,10 @@
  apache_content_template(user)
 +
  ubac_constrained(httpd_user_script_t)
-+typeattribue httpd_user_content_t, httpdcontent;
-+typeattribue httpd_user_content_rw_t, httpdcontent;
-+typeattribue httpd_user_content_ra_t, httpdcontent;
-+typeattribue httpd_user_script_exec_t, httpdcontent;
++typeattribute httpd_user_content_t, httpdcontent;
++typeattribute httpd_user_content_rw_t, httpdcontent;
++typeattribute httpd_user_content_ra_t, httpdcontent;
++typeattribute httpd_user_script_exec_t, httpdcontent;
 +
  userdom_user_home_content(httpd_user_content_t)
  userdom_user_home_content(httpd_user_htaccess_t)



From behdad at fedoraproject.org  Mon Jan 19 22:11:54 2009
From: behdad at fedoraproject.org (Behdad Esfahbod)
Date: Mon, 19 Jan 2009 22:11:54 +0000 (UTC)
Subject: rpms/fontconfig/devel .cvsignore, 1.31, 1.32 fontconfig.spec, 1.113,
	1.114 sources, 1.32, 1.33
Message-ID: <20090119221154.161B7700F8@cvs1.fedora.phx.redhat.com>

Author: behdad

Update of /cvs/pkgs/rpms/fontconfig/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18177

Modified Files:
	.cvsignore fontconfig.spec sources 
Log Message:
* Mon Jan 19 2009 Behdad Esfahbod <besfahbo at redhat.com> -
* 2.6.91-1.git.64.g9feaf34
- Update to 2.6.91-1.git.64.g9feaf34




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fontconfig/devel/.cvsignore,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- .cvsignore	16 Jan 2009 05:44:55 -0000	1.31
+++ .cvsignore	19 Jan 2009 22:11:23 -0000	1.32
@@ -1 +1 @@
-fontconfig-2.6.90.tar.gz
+fontconfig-2.6.91.tar.gz


Index: fontconfig.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fontconfig/devel/fontconfig.spec,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -r1.113 -r1.114
--- fontconfig.spec	16 Jan 2009 05:58:10 -0000	1.113
+++ fontconfig.spec	19 Jan 2009 22:11:23 -0000	1.114
@@ -2,8 +2,8 @@
 
 Summary: Font configuration and customization library
 Name: fontconfig
-Version: 2.6.90
-Release: 3.git.63.g6bb4b9a%{?dist}
+Version: 2.6.91
+Release: 1.git.64.g9feaf34%{?dist}
 License: MIT
 Group: System Environment/Libraries
 Source: http://fontconfig.org/release/fontconfig-%{version}.tar.gz
@@ -131,6 +131,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Mon Jan 19 2009 Behdad Esfahbod <besfahbo at redhat.com> - 2.6.91-1.git.64.g9feaf34
+- Update to 2.6.91-1.git.64.g9feaf34
+
 * Fri Jan 16 2009 Behdad Esfahbod <besfahbo at redhat.com> - 2.6.90-3.git.63.g6bb4b9a
 - Install fc-scan and fc-query
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fontconfig/devel/sources,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- sources	16 Jan 2009 05:44:55 -0000	1.32
+++ sources	19 Jan 2009 22:11:23 -0000	1.33
@@ -1 +1 @@
-c907dd0ebec0e95ddae1f5f65b1ada4e  fontconfig-2.6.90.tar.gz
+b7698d79afb8d3d01b206b9a4eea9ff2  fontconfig-2.6.91.tar.gz



From cebbert at fedoraproject.org  Mon Jan 19 22:16:06 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Mon, 19 Jan 2009 22:16:06 +0000 (UTC)
Subject: rpms/kernel/F-9
	linux-2.6-net-sctp-avoid-memory-overflow-while-FWD-TSN-chunk-is-r.patch,
	NONE, 1.1.2.1 kernel.spec, 1.891.2.6, 1.891.2.7
Message-ID: <20090119221606.7004E700F8@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19756

Modified Files:
      Tag: private-fedora-9-2_6_27-branch
	kernel.spec 
Added Files:
      Tag: private-fedora-9-2_6_27-branch
	linux-2.6-net-sctp-avoid-memory-overflow-while-FWD-TSN-chunk-is-r.patch 
Log Message:
Fix CVE-2009-0065: SCTP buffer overflow

linux-2.6-net-sctp-avoid-memory-overflow-while-FWD-TSN-chunk-is-r.patch:

--- NEW FILE linux-2.6-net-sctp-avoid-memory-overflow-while-FWD-TSN-chunk-is-r.patch ---
From: Wei Yongjun <yjwei at cn.fujitsu.com>
Date: Fri, 26 Dec 2008 00:58:11 +0000 (-0800)
Subject: sctp: Avoid memory overflow while FWD-TSN chunk is received with bad stream ID
X-Git-Tag: v2.6.29-rc1~581^2~75
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=9fcb95a105758b81ef0131cd18e2db5149f13e95

sctp: Avoid memory overflow while FWD-TSN chunk is received with bad stream ID

If FWD-TSN chunk is received with bad stream ID, the sctp will not do the
validity check, this may cause memory overflow when overwrite the TSN of
the stream ID.

The FORWARD-TSN chunk is like this:

FORWARD-TSN chunk
  Type                       = 192
  Flags                      = 0
  Length                     = 172
  NewTSN                     = 99
  Stream                     = 10000
  StreamSequence             = 0xFFFF

This patch fix this problem by discard the chunk if stream ID is not
less than MIS.

Signed-off-by: Wei Yongjun <yjwei at cn.fujitsu.com>
Signed-off-by: Vlad Yasevich <vladislav.yasevich at hp.com>
Signed-off-by: David S. Miller <davem at davemloft.net>
---

diff --git a/net/sctp/sm_statefuns.c b/net/sctp/sm_statefuns.c
index 9f2a3eb..1c4e5d6 100644
--- a/net/sctp/sm_statefuns.c
+++ b/net/sctp/sm_statefuns.c
@@ -3635,6 +3635,7 @@ sctp_disposition_t sctp_sf_eat_fwd_tsn(const struct sctp_endpoint *ep,
 {
 	struct sctp_chunk *chunk = arg;
 	struct sctp_fwdtsn_hdr *fwdtsn_hdr;
+	struct sctp_fwdtsn_skip *skip;
 	__u16 len;
 	__u32 tsn;
 
@@ -3664,6 +3665,12 @@ sctp_disposition_t sctp_sf_eat_fwd_tsn(const struct sctp_endpoint *ep,
 	if (sctp_tsnmap_check(&asoc->peer.tsn_map, tsn) < 0)
 		goto discard_noforce;
 
+	/* Silently discard the chunk if stream-id is not valid */
+	sctp_walk_fwdtsn(skip, chunk) {
+		if (ntohs(skip->stream) >= asoc->c.sinit_max_instreams)
+			goto discard_noforce;
+	}
+
 	sctp_add_cmd_sf(commands, SCTP_CMD_REPORT_FWDTSN, SCTP_U32(tsn));
 	if (len > sizeof(struct sctp_fwdtsn_hdr))
 		sctp_add_cmd_sf(commands, SCTP_CMD_PROCESS_FWDTSN,
@@ -3695,6 +3702,7 @@ sctp_disposition_t sctp_sf_eat_fwd_tsn_fast(
 {
 	struct sctp_chunk *chunk = arg;
 	struct sctp_fwdtsn_hdr *fwdtsn_hdr;
+	struct sctp_fwdtsn_skip *skip;
 	__u16 len;
 	__u32 tsn;
 
@@ -3724,6 +3732,12 @@ sctp_disposition_t sctp_sf_eat_fwd_tsn_fast(
 	if (sctp_tsnmap_check(&asoc->peer.tsn_map, tsn) < 0)
 		goto gen_shutdown;
 
+	/* Silently discard the chunk if stream-id is not valid */
+	sctp_walk_fwdtsn(skip, chunk) {
+		if (ntohs(skip->stream) >= asoc->c.sinit_max_instreams)
+			goto gen_shutdown;
+	}
+
 	sctp_add_cmd_sf(commands, SCTP_CMD_REPORT_FWDTSN, SCTP_U32(tsn));
 	if (len > sizeof(struct sctp_fwdtsn_hdr))
 		sctp_add_cmd_sf(commands, SCTP_CMD_PROCESS_FWDTSN,


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/kernel.spec,v
retrieving revision 1.891.2.6
retrieving revision 1.891.2.7
diff -u -r1.891.2.6 -r1.891.2.7
--- kernel.spec	19 Jan 2009 16:30:45 -0000	1.891.2.6
+++ kernel.spec	19 Jan 2009 22:15:35 -0000	1.891.2.7
@@ -712,6 +712,9 @@
 
 Patch2030: linux-2.6-net-tulip-interrupt.patch
 
+# CVE-2009-0065 SCTP buffer overflow
+Patch2031: linux-2.6-net-sctp-avoid-memory-overflow-while-FWD-TSN-chunk-is-r.patch
+
 # linux1394 git patches
 Patch2200: linux-2.6-firewire-git-update.patch
 Patch2201: linux-2.6-firewire-git-pending.patch
@@ -1283,6 +1286,8 @@
 
 ApplyPatch linux-2.6-net-tulip-interrupt.patch
 
+ApplyPatch linux-2.6-net-sctp-avoid-memory-overflow-while-FWD-TSN-chunk-is-r.patch
+
 # Nouveau DRM + drm fixes
 ApplyPatch drm-fedora9-rollup.patch
 ApplyPatch drm-mm-readd-nopfn.patch
@@ -1905,6 +1910,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 Jan 19 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.27.12-78.2.6
+- Fix CVE-2009-0065: SCTP buffer overflow
+
 * Mon Jan 19 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.27.12-78.2.5
 - Revert ALSA to what is upstream in 2.6.27.
 



From laxathom at fedoraproject.org  Mon Jan 19 22:33:22 2009
From: laxathom at fedoraproject.org (Xavier LAMIEN)
Date: Mon, 19 Jan 2009 22:33:22 +0000 (UTC)
Subject: rpms/specto/devel .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 specto.spec,
	1.8, 1.9
Message-ID: <20090119223322.ADB42700F8@cvs1.fedora.phx.redhat.com>

Author: laxathom

Update of /cvs/pkgs/rpms/specto/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21858

Modified Files:
	.cvsignore sources specto.spec 
Log Message:
Update release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/specto/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	2 Aug 2007 21:31:31 -0000	1.3
+++ .cvsignore	19 Jan 2009 22:32:52 -0000	1.4
@@ -1 +1 @@
-specto-0.2.2.tar.gz
+specto-0.3rc1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/specto/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	2 Aug 2007 21:31:31 -0000	1.3
+++ sources	19 Jan 2009 22:32:52 -0000	1.4
@@ -1 +1 @@
-2212c1a6e2e72eb2f13c632745330c9f  specto-0.2.2.tar.gz
+1ebb626631bacab3356ab46773b95152  specto-0.3rc1.tar.gz


Index: specto.spec
===================================================================
RCS file: /cvs/pkgs/rpms/specto/devel/specto.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- specto.spec	30 Nov 2008 00:53:25 -0000	1.8
+++ specto.spec	19 Jan 2009 22:32:52 -0000	1.9
@@ -1,14 +1,14 @@
 %define python_sitelib %(%{__python} -c 'from distutils import sysconfig; print sysconfig.get_python_lib()')
 
 Name:		specto
-Version:	0.2.2        
-Release:	4%{?dist}
+Version:	0.3      
+Release:	0.1.rc1%{?dist}
 Summary:	An desktop application that will watch configurable events        
 
 Group:		Applications/System
 License:	GPLv2+
 URL:		http://specto.sourceforge.net/            
-Source0:	http://specto.googlecode.com/files/%{name}-%{version}.tar.gz
+Source0:	http://specto.googlecode.com/files/%{name}-%{version}rc1.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:	noarch
@@ -30,7 +30,7 @@
 of events instead of having to look out for them.
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{version}rc1
 
 
 %build
@@ -81,10 +81,13 @@
 %{_datadir}/%{name}
 %{_datadir}/applications/%{name}.desktop
 %{python_sitelib}/spectlib
-%{python_sitelib}/%{name}-%{version}-py?.?.egg-info
+%{python_sitelib}/%{name}-%{version}rc1-py?.?.egg-info
 
 
 %changelog
+* Mon Jan 19 2009 Xavier Lamien <lxtnow at gmail.com> - 0.3-0.1.rc1
+- Update release.
+
 * Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 0.2.2-4
 - Fix locations for Python 2.6
 



From dwalsh at fedoraproject.org  Mon Jan 19 22:34:57 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Mon, 19 Jan 2009 22:34:57 +0000 (UTC)
Subject: rpms/selinux-policy/devel policy-20090105.patch,1.12,1.13
Message-ID: <20090119223457.581EE700F8@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22095

Modified Files:
	policy-20090105.patch 
Log Message:
* Mon Jan 19 2009 Dan Walsh <dwalsh at redhat.com> 3.6.3-2
- Add devicekit policy


policy-20090105.patch:

Index: policy-20090105.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-20090105.patch,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- policy-20090105.patch	19 Jan 2009 22:11:49 -0000	1.12
+++ policy-20090105.patch	19 Jan 2009 22:34:56 -0000	1.13
@@ -8349,7 +8349,7 @@
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.te serefpolicy-3.6.3/policy/modules/services/apache.te
 --- nsaserefpolicy/policy/modules/services/apache.te	2009-01-19 11:06:49.000000000 -0500
-+++ serefpolicy-3.6.3/policy/modules/services/apache.te	2009-01-19 17:10:55.000000000 -0500
++++ serefpolicy-3.6.3/policy/modules/services/apache.te	2009-01-19 17:34:22.000000000 -0500
 @@ -19,6 +19,8 @@
  # Declarations
  #
@@ -8444,16 +8444,15 @@
  type httpd_tmp_t;
  files_tmp_file(httpd_tmp_t)
  
-@@ -187,15 +233,22 @@
+@@ -187,15 +233,20 @@
  files_tmpfs_file(httpd_tmpfs_t)
  
  apache_content_template(user)
 +
  ubac_constrained(httpd_user_script_t)
-+typeattribute httpd_user_content_t, httpdcontent;
-+typeattribute httpd_user_content_rw_t, httpdcontent;
-+typeattribute httpd_user_content_ra_t, httpdcontent;
-+typeattribute httpd_user_script_exec_t, httpdcontent;
++typeattribute httpd_user_content_t httpdcontent;
++typeattribute httpd_user_content_rw_t httpdcontent;
++typeattribute httpd_user_content_ra_t httpdcontent;
 +
  userdom_user_home_content(httpd_user_content_t)
  userdom_user_home_content(httpd_user_htaccess_t)
@@ -8462,7 +8461,6 @@
 -userdom_user_home_content(httpd_user_script_ro_t)
 -userdom_user_home_content(httpd_user_script_rw_t)
 +userdom_user_home_content(httpd_user_content_ra_t)
-+userdom_user_home_content(httpd_user_content_ro_t)
 +userdom_user_home_content(httpd_user_content_rw_t)
  typeattribute httpd_user_script_t httpd_script_domains;
  typealias httpd_user_content_t alias { httpd_staff_content_t httpd_sysadm_content_t };
@@ -8470,7 +8468,7 @@
  typealias httpd_user_content_t alias { httpd_auditadm_content_t httpd_secadm_content_t };
  typealias httpd_user_htaccess_t alias { httpd_staff_htaccess_t httpd_sysadm_htaccess_t };
  typealias httpd_user_htaccess_t alias { httpd_auditadm_htaccess_t httpd_secadm_htaccess_t };
-@@ -230,7 +283,7 @@
+@@ -230,7 +281,7 @@
  # Apache server local policy
  #
  
@@ -8479,7 +8477,7 @@
  dontaudit httpd_t self:capability { net_admin sys_tty_config };
  allow httpd_t self:process ~{ ptrace setcurrent setexec setfscreate setrlimit execmem execstack execheap };
  allow httpd_t self:fd use;
-@@ -272,6 +325,7 @@
+@@ -272,6 +323,7 @@
  allow httpd_t httpd_modules_t:dir list_dir_perms;
  mmap_files_pattern(httpd_t, httpd_modules_t, httpd_modules_t)
  read_files_pattern(httpd_t, httpd_modules_t, httpd_modules_t)
@@ -8487,7 +8485,7 @@
  
  apache_domtrans_rotatelogs(httpd_t)
  # Apache-httpd needs to be able to send signals to the log rotate procs.
-@@ -283,9 +337,9 @@
+@@ -283,9 +335,9 @@
  
  allow httpd_t httpd_suexec_exec_t:file read_file_perms;
  
@@ -8500,7 +8498,7 @@
  
  manage_dirs_pattern(httpd_t, httpd_tmp_t, httpd_tmp_t)
  manage_files_pattern(httpd_t, httpd_tmp_t, httpd_tmp_t)
-@@ -301,6 +355,7 @@
+@@ -301,6 +353,7 @@
  manage_files_pattern(httpd_t, httpd_var_lib_t, httpd_var_lib_t)
  files_var_lib_filetrans(httpd_t, httpd_var_lib_t, file)
  
@@ -8508,7 +8506,7 @@
  manage_files_pattern(httpd_t, httpd_var_run_t, httpd_var_run_t)
  manage_sock_files_pattern(httpd_t, httpd_var_run_t, httpd_var_run_t)
  files_pid_filetrans(httpd_t, httpd_var_run_t, { file sock_file })
-@@ -312,6 +367,7 @@
+@@ -312,6 +365,7 @@
  kernel_read_kernel_sysctls(httpd_t)
  # for modules that want to access /proc/meminfo
  kernel_read_system_state(httpd_t)
@@ -8516,7 +8514,7 @@
  
  corenet_all_recvfrom_unlabeled(httpd_t)
  corenet_all_recvfrom_netlabel(httpd_t)
-@@ -322,6 +378,7 @@
+@@ -322,6 +376,7 @@
  corenet_tcp_sendrecv_all_ports(httpd_t)
  corenet_udp_sendrecv_all_ports(httpd_t)
  corenet_tcp_bind_generic_node(httpd_t)
@@ -8524,7 +8522,7 @@
  corenet_tcp_bind_http_port(httpd_t)
  corenet_tcp_bind_http_cache_port(httpd_t)
  corenet_sendrecv_http_server_packets(httpd_t)
-@@ -335,12 +392,12 @@
+@@ -335,12 +390,12 @@
  
  fs_getattr_all_fs(httpd_t)
  fs_search_auto_mountpoints(httpd_t)
@@ -8540,7 +8538,7 @@
  
  domain_use_interactive_fds(httpd_t)
  
-@@ -358,6 +415,10 @@
+@@ -358,6 +413,10 @@
  files_read_var_lib_symlinks(httpd_t)
  
  fs_search_auto_mountpoints(httpd_sys_script_t)
@@ -8551,7 +8549,7 @@
  
  libs_read_lib_files(httpd_t)
  
-@@ -372,18 +433,33 @@
+@@ -372,18 +431,33 @@
  
  userdom_use_unpriv_users_fds(httpd_t)
  
@@ -8589,7 +8587,7 @@
  ')
  ')
  
-@@ -391,20 +467,54 @@
+@@ -391,20 +465,54 @@
  	corenet_tcp_connect_all_ports(httpd_t)
  ')
  
@@ -8645,7 +8643,7 @@
  
  	manage_dirs_pattern(httpd_t, httpdcontent, httpdcontent)
  	manage_files_pattern(httpd_t, httpdcontent, httpdcontent)
-@@ -415,20 +525,28 @@
+@@ -415,20 +523,28 @@
  	corenet_tcp_bind_ftp_port(httpd_t)
  ')
  
@@ -8678,7 +8676,7 @@
  tunable_policy(`httpd_ssi_exec',`
  	corecmd_shell_domtrans(httpd_t,httpd_sys_script_t)
  	allow httpd_sys_script_t httpd_t:fd use;
-@@ -459,8 +577,13 @@
+@@ -459,8 +575,13 @@
  ')
  
  optional_policy(`
@@ -8694,7 +8692,7 @@
  ')
  
  optional_policy(`
-@@ -472,18 +595,13 @@
+@@ -472,18 +593,13 @@
  ')
  
  optional_policy(`
@@ -8714,7 +8712,7 @@
  ')
  
  optional_policy(`
-@@ -493,6 +611,12 @@
+@@ -493,6 +609,12 @@
  	openca_kill(httpd_t)
  ')
  
@@ -8727,7 +8725,7 @@
  optional_policy(`
  	# Allow httpd to work with postgresql
  	postgresql_stream_connect(httpd_t)
-@@ -500,6 +624,7 @@
+@@ -500,6 +622,7 @@
  
  	tunable_policy(`httpd_can_network_connect_db',`
  		postgresql_tcp_connect(httpd_t)
@@ -8735,7 +8733,7 @@
  	')
  ')
  
-@@ -508,6 +633,7 @@
+@@ -508,6 +631,7 @@
  ')
  
  optional_policy(`
@@ -8743,7 +8741,7 @@
  	snmp_dontaudit_read_snmp_var_lib_files(httpd_t)
  	snmp_dontaudit_write_snmp_var_lib_files(httpd_t)
  ')
-@@ -535,6 +661,22 @@
+@@ -535,6 +659,22 @@
  
  userdom_use_user_terminals(httpd_helper_t)
  
@@ -8766,7 +8764,7 @@
  ########################################
  #
  # Apache PHP script local policy
-@@ -564,20 +706,25 @@
+@@ -564,20 +704,25 @@
  
  fs_search_auto_mountpoints(httpd_php_t)
  
@@ -8798,7 +8796,7 @@
  ')
  
  ########################################
-@@ -595,23 +742,24 @@
+@@ -595,23 +740,24 @@
  append_files_pattern(httpd_suexec_t, httpd_log_t, httpd_log_t)
  read_files_pattern(httpd_suexec_t, httpd_log_t, httpd_log_t)
  
@@ -8827,7 +8825,7 @@
  
  files_read_etc_files(httpd_suexec_t)
  files_read_usr_files(httpd_suexec_t)
-@@ -624,6 +772,7 @@
+@@ -624,6 +770,7 @@
  logging_send_syslog_msg(httpd_suexec_t)
  
  miscfiles_read_localization(httpd_suexec_t)
@@ -8835,20 +8833,18 @@
  
  tunable_policy(`httpd_can_network_connect',`
  	allow httpd_suexec_t self:tcp_socket create_stream_socket_perms;
-@@ -641,12 +790,25 @@
+@@ -641,12 +788,23 @@
  	corenet_sendrecv_all_client_packets(httpd_suexec_t)
  ')
  
 +read_files_pattern(httpd_suexec_t, httpd_user_content_t, httpd_user_content_t)
 +read_files_pattern(httpd_suexec_t, httpd_user_script_rw_t, httpd_user_script_rw_t)
-+read_files_pattern(httpd_suexec_t, httpd_user_script_ro_t, httpd_user_script_ro_t)
 +read_files_pattern(httpd_suexec_t, httpd_user_script_ra_t, httpd_user_script_ra_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)
 +	domtrans_pattern(httpd_suexec_t, httpd_user_content_t, httpd_user_script_t)
-+	domtrans_pattern(httpd_suexec_t, httpd_user_script_ro_t, httpd_user_script_t)
 +	domtrans_pattern(httpd_suexec_t, httpd_user_script_ra_t, httpd_user_script_t)
 +	domtrans_pattern(httpd_suexec_t, httpd_user_script_rw_t, httpd_user_script_t)
 +
@@ -8864,7 +8860,7 @@
  ')
  
  tunable_policy(`httpd_enable_homedirs && use_nfs_home_dirs',`
-@@ -655,6 +817,12 @@
+@@ -655,6 +813,12 @@
  	fs_exec_nfs_files(httpd_suexec_t)
  ')
  
@@ -8877,7 +8873,7 @@
  tunable_policy(`httpd_enable_homedirs && use_samba_home_dirs',`
  	fs_read_cifs_files(httpd_suexec_t)
  	fs_read_cifs_symlinks(httpd_suexec_t)
-@@ -672,15 +840,14 @@
+@@ -672,15 +836,14 @@
  	dontaudit httpd_suexec_t httpd_t:unix_stream_socket { read write };
  ')
  
@@ -8896,7 +8892,7 @@
  allow httpd_sys_script_t httpd_t:tcp_socket { read write };
  
  dontaudit httpd_sys_script_t httpd_config_t:dir search;
-@@ -699,12 +866,24 @@
+@@ -699,12 +862,24 @@
  # Should we add a boolean?
  apache_domtrans_rotatelogs(httpd_sys_script_t)
  
@@ -8923,7 +8919,7 @@
  ')
  
  tunable_policy(`httpd_enable_homedirs && use_nfs_home_dirs',`
-@@ -712,6 +891,35 @@
+@@ -712,6 +887,35 @@
  	fs_read_nfs_symlinks(httpd_sys_script_t)
  ')
  
@@ -8959,7 +8955,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)
-@@ -724,6 +932,10 @@
+@@ -724,6 +928,10 @@
  optional_policy(`
  	mysql_stream_connect(httpd_sys_script_t)
  	mysql_rw_db_sockets(httpd_sys_script_t)
@@ -8970,7 +8966,7 @@
  ')
  
  optional_policy(`
-@@ -735,6 +947,8 @@
+@@ -735,6 +943,8 @@
  # httpd_rotatelogs local policy
  #
  
@@ -8979,7 +8975,7 @@
  manage_files_pattern(httpd_rotatelogs_t, httpd_log_t, httpd_log_t)
  
  kernel_read_kernel_sysctls(httpd_rotatelogs_t)
-@@ -754,6 +968,9 @@
+@@ -754,6 +964,9 @@
  
  tunable_policy(`httpd_enable_cgi && httpd_unified',`
  	allow httpd_user_script_t httpdcontent:file entrypoint;
@@ -8989,7 +8985,7 @@
  ')
  
  # allow accessing files/dirs below the users home dir
-@@ -762,3 +979,66 @@
+@@ -762,3 +975,66 @@
  	userdom_search_user_home_dirs(httpd_suexec_t)
  	userdom_search_user_home_dirs(httpd_user_script_t)
  ')
@@ -11422,7 +11418,7 @@
 +/var/run/devkit(/.*)?			gen_context(system_u:object_r:devicekit_var_run_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/devicekit.if serefpolicy-3.6.3/policy/modules/services/devicekit.if
 --- nsaserefpolicy/policy/modules/services/devicekit.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.3/policy/modules/services/devicekit.if	2009-01-19 17:09:09.000000000 -0500
++++ serefpolicy-3.6.3/policy/modules/services/devicekit.if	2009-01-19 17:17:14.000000000 -0500
 @@ -0,0 +1,139 @@
 +
 +## <summary>policy for devicekit</summary>
@@ -11521,7 +11517,7 @@
 +#
 +interface(`devicekit_power_dbus_chat',`
 +	gen_require(`
-+		type devicekit_t;
++		type devicekit_power_t;
 +		class dbus send_msg;
 +	')
 +
@@ -20523,14 +20519,14 @@
  ## <param name="domain">
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/squid.te serefpolicy-3.6.3/policy/modules/services/squid.te
 --- nsaserefpolicy/policy/modules/services/squid.te	2009-01-19 11:06:49.000000000 -0500
-+++ serefpolicy-3.6.3/policy/modules/services/squid.te	2009-01-19 15:16:22.000000000 -0500
++++ serefpolicy-3.6.3/policy/modules/services/squid.te	2009-01-19 17:24:18.000000000 -0500
 @@ -118,6 +118,9 @@
  
  fs_getattr_all_fs(squid_t)
  fs_search_auto_mountpoints(squid_t)
 +#squid requires the following when run in diskd mode, the recommended setting
 +fs_rw_tmpfs_files(squid_t)
-+fs_list_inotify(squid_t)
++fs_list_inotifyfs(squid_t)
  
  selinux_dontaudit_getattr_dir(squid_t)
  
@@ -26410,7 +26406,7 @@
 +/dev/shm/mono.*		gen_context(system_u:object_r:user_tmpfs_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-3.6.3/policy/modules/system/userdomain.if
 --- nsaserefpolicy/policy/modules/system/userdomain.if	2009-01-19 11:07:34.000000000 -0500
-+++ serefpolicy-3.6.3/policy/modules/system/userdomain.if	2009-01-19 17:08:20.000000000 -0500
++++ serefpolicy-3.6.3/policy/modules/system/userdomain.if	2009-01-19 17:15:36.000000000 -0500
 @@ -30,8 +30,9 @@
  	')
  
@@ -26979,7 +26975,7 @@
  
  		optional_policy(`
 -			hal_dbus_chat($1_t)
-+			devkit_power_dbus_chat($1_usertype)
++			devicekit_power_dbus_chat($1_usertype)
  		')
  
  		optional_policy(`



From cebbert at fedoraproject.org  Mon Jan 19 22:37:43 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Mon, 19 Jan 2009 22:37:43 +0000 (UTC)
Subject: rpms/kernel/F-9 kernel.spec,1.891.2.7,1.891.2.8
Message-ID: <20090119223743.0934E700F8@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22431

Modified Files:
      Tag: private-fedora-9-2_6_27-branch
	kernel.spec 
Log Message:
fix version in changelog


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/kernel.spec,v
retrieving revision 1.891.2.7
retrieving revision 1.891.2.8
diff -u -r1.891.2.7 -r1.891.2.8
--- kernel.spec	19 Jan 2009 22:15:35 -0000	1.891.2.7
+++ kernel.spec	19 Jan 2009 22:37:12 -0000	1.891.2.8
@@ -1910,7 +1910,7 @@
 %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 Jan 19 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.27.12-78.2.6
+* Mon Jan 19 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.27.12-78.2.8
 - Fix CVE-2009-0065: SCTP buffer overflow
 
 * Mon Jan 19 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.27.12-78.2.5



From cebbert at fedoraproject.org  Mon Jan 19 22:41:02 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Mon, 19 Jan 2009 22:41:02 +0000 (UTC)
Subject: rpms/kernel/F-10 kernel.spec,1.1219,1.1220
Message-ID: <20090119224102.4B1BF700F8@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22932

Modified Files:
	kernel.spec 
Log Message:
add version to log before building


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/kernel.spec,v
retrieving revision 1.1219
retrieving revision 1.1220
diff -u -r1.1219 -r1.1220
--- kernel.spec	19 Jan 2009 21:54:46 -0000	1.1219
+++ kernel.spec	19 Jan 2009 22:40:31 -0000	1.1220
@@ -1781,11 +1781,11 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
-* Mon Jan 19 2009 Chuck Ebbert <cebbert at redhat.com>
+* Mon Jan 19 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.28.1-13
 - CVE-2009-0065: buffer overflow in net/sctp/sm_statefuns.c
   in the Stream Control Transmission Protocol
 
-* Mon Jan 19 2009 Kyle McMartin <kyle at redhat.com>
+* Mon Jan 19 2009 Kyle McMartin <kyle at redhat.com> 2.6.28.1-11
 - execshield fixes: should no longer generate spurious handled GPFs,
   fixes randomization of executables. also some clean ups.
 



From rhughes at fedoraproject.org  Mon Jan 19 22:45:09 2009
From: rhughes at fedoraproject.org (Richard Hughes)
Date: Mon, 19 Jan 2009 22:45:09 +0000 (UTC)
Subject: rpms/PackageKit/devel .cvsignore, 1.37, 1.38 PackageKit.spec, 1.87, 
	1.88 sources, 1.38, 1.39
Message-ID: <20090119224509.65AD6700F8@cvs1.fedora.phx.redhat.com>

Author: rhughes

Update of /cvs/pkgs/rpms/PackageKit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24274

Modified Files:
	.cvsignore PackageKit.spec sources 
Log Message:
* Mon Jan 19 2009 Richard Hughes  <rhughes at redhat.com> - 0.4.2-1
- New upstream version
- Enable time estimation by default
- Remove the udev helper from PackageKit now the core functionality is in
  udev itself
- Lots of bug fixes



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/PackageKit/devel/.cvsignore,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- .cvsignore	9 Dec 2008 09:40:43 -0000	1.37
+++ .cvsignore	19 Jan 2009 22:44:38 -0000	1.38
@@ -1 +1 @@
-PackageKit-0.4.0.tar.gz
+PackageKit-0.4.2.tar.gz


Index: PackageKit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/PackageKit/devel/PackageKit.spec,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -r1.87 -r1.88
--- PackageKit.spec	9 Dec 2008 09:40:44 -0000	1.87
+++ PackageKit.spec	19 Jan 2009 22:44:39 -0000	1.88
@@ -7,7 +7,7 @@
 
 Summary:   Package management service
 Name:      PackageKit
-Version:   0.4.0
+Version:   0.4.2
 Release:   1%{?dist}
 License:   GPLv2+
 Group:     System Environment/Libraries
@@ -22,12 +22,13 @@
 Requires: dbus >= %{dbus_version}
 Requires: dbus-glib >= %{dbus_glib_version}
 Requires: PackageKit-glib = %{version}-%{release}
-Requires: PackageKit-udev-helper = %{version}-%{release}
+Requires: PackageKit-gtk-module = %{version}-%{release}
 Requires: PackageKit-yum-plugin = %{version}-%{release}
 Requires: PackageKit-yum = %{version}-%{release}
 Requires: shared-mime-info
 Requires: python-sqlite2
 Requires: comps-extras
+Requires: preupgrade
 
 BuildRequires: glib2-devel >= %{glib2_version}
 BuildRequires: dbus-devel  >= %{dbus_version}
@@ -55,6 +56,10 @@
 BuildRequires: pango-devel
 BuildRequires: fontconfig-devel
 
+# functionality moved to udev itself
+Obsoletes: PackageKit-udev-helper < %{version}-%{release}
+Obsoletes: udev-packagekit < %{version}-%{release}
+
 %description
 PackageKit is a D-Bus abstraction layer that allows the session user
 to manage packages in a secure way using a cross-distro,
@@ -86,18 +91,6 @@
 %description docs
 API docs for PackageKit.
 
-%package udev-helper
-Summary: Tell PackageKit to install firmware that udev requires
-Group: System Environment/Base
-Requires: udev
-Requires: PackageKit
-Obsoletes: udev-packagekit < %{version}-%{release}
-
-%description udev-helper
-PackageKit-udev-helper tells PackageKit that firmware was not available and was
-needed. This allows PackageKit to do the right thing and prompt for
-the firmware to be installed.
-
 %package yum-plugin
 Summary: Tell PackageKit to check for updates when yum exits
 Group: System Environment/Base
@@ -224,7 +217,7 @@
 %patch0 -p1
 
 %build
-%configure --enable-yum --enable-smart --with-default-backend=yum --disable-local
+%configure --enable-yum --enable-smart --with-default-backend=yum --disable-local --disable-ruck
 
 make %{?_smp_mflags}
 
@@ -343,14 +336,6 @@
 %config(noreplace) %{_sysconfdir}/yum/pluginconf.d/refresh-packagekit.conf
 /usr/lib/yum-plugins/refresh-packagekit.*
 
-%files udev-helper
-%defattr(-, root, root)
-%dir %{_localstatedir}/run/PackageKit
-%dir %{_localstatedir}/run/PackageKit/udev
-%doc README AUTHORS NEWS COPYING
-%{_sysconfdir}/udev/rules.d/*.rules
-/lib/udev/*.sh
-
 %files glib
 %defattr(-,root,root,-)
 %doc README AUTHORS NEWS COPYING
@@ -417,6 +402,18 @@
 %{_includedir}/PackageKit/backend/*.h
 
 %changelog
+* Mon Jan 19 2009 Richard Hughes  <rhughes at redhat.com> - 0.4.2-1
+- New upstream version
+- Enable time estimation by default
+- Remove the udev helper from PackageKit now the core functionality is in
+  udev itself
+- Lots of bug fixes
+
+* Thu Jan 08 2009 Richard Hughes  <rhughes at redhat.com> - 0.4.1-1
+- New upstream version
+- Use NetworkManager to get the network device type for session policy decisions
+- Lots of bug fixes
+
 * Tue Dec 09 2008 Richard Hughes  <rhughes at redhat.com> - 0.4.0-1
 - New upstream version
 - Now integrates with BASH suggesting replacements and offering to install


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/PackageKit/devel/sources,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- sources	9 Dec 2008 09:40:44 -0000	1.38
+++ sources	19 Jan 2009 22:44:39 -0000	1.39
@@ -1 +1 @@
-8402588f2a1b6f6706d81d08cc1577f6  PackageKit-0.4.0.tar.gz
+a491930e9e05bab9c77b4f449431a22c  PackageKit-0.4.2.tar.gz



From rhughes at fedoraproject.org  Mon Jan 19 22:45:13 2009
From: rhughes at fedoraproject.org (Richard Hughes)
Date: Mon, 19 Jan 2009 22:45:13 +0000 (UTC)
Subject: rpms/gnome-packagekit/devel .cvsignore, 1.36,
	1.37 gnome-packagekit.spec, 1.69, 1.70 sources, 1.36, 1.37
Message-ID: <20090119224513.B7EDA700F8@cvs1.fedora.phx.redhat.com>

Author: rhughes

Update of /cvs/pkgs/rpms/gnome-packagekit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24302

Modified Files:
	.cvsignore gnome-packagekit.spec sources 
Log Message:
* Mon Jan 19 2009 Richard Hughes  <rhughes at redhat.com> - 0.4.2-1
- New upstream version
- Lots of bug fixes



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-packagekit/devel/.cvsignore,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- .cvsignore	9 Dec 2008 09:40:34 -0000	1.36
+++ .cvsignore	19 Jan 2009 22:44:43 -0000	1.37
@@ -1 +1 @@
-gnome-packagekit-0.4.0.tar.gz
+gnome-packagekit-0.4.2.tar.gz


Index: gnome-packagekit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-packagekit/devel/gnome-packagekit.spec,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- gnome-packagekit.spec	12 Dec 2008 13:50:52 -0000	1.69
+++ gnome-packagekit.spec	19 Jan 2009 22:44:43 -0000	1.70
@@ -5,8 +5,8 @@
 
 Summary:   Session applications to manage packages
 Name:      gnome-packagekit
-Version:   0.4.0
-Release:   2%{?dist}
+Version:   0.4.2
+Release:   1%{?dist}
 License:   GPLv2+
 Group:     Applications/System
 URL:       http://www.packagekit.org
@@ -212,6 +212,22 @@
 %{_datadir}/applications/gpk-service-pack.desktop
 
 %changelog
+* Mon Jan 19 2009 Richard Hughes  <rhughes at redhat.com> - 0.4.2-1
+- New upstream version
+- Lots of bug fixes
+
+* Thu Jan 08 2009 Richard Hughes  <rhughes at redhat.com> - 0.4.1-1
+- New upstream version
+- Add an option to the prefs dialog to prevent checking for updates when
+  using mobile broadband connections
+- Allow the admin to restrict getting updates when on WiFi connections
+- Set the default search mode to details (not name) and preserve the search
+  type in GConf if changed in the UI
+- Add a simple markdown parser and use it in all applications.
+- Send different errors when we fail a method on the session DBus interface
+- Support setting timeouts via the interaction mode from the DBus interface
+- Lots of bugfixes
+
 * Fri Dec 12 2008 Richard Hughes  <rhughes at redhat.com> - 0.4.0-2
 - Depend on PackageKit-gtk-module so the auto-font installation can be
   turned on in F11.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-packagekit/devel/sources,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- sources	9 Dec 2008 09:40:34 -0000	1.36
+++ sources	19 Jan 2009 22:44:43 -0000	1.37
@@ -1 +1 @@
-05f33303e70c9bc8b65073f3b2a76af6  gnome-packagekit-0.4.0.tar.gz
+29e58987ec83b6c233cc346302ad82c4  gnome-packagekit-0.4.2.tar.gz



From pkgdb at fedoraproject.org  Mon Jan 19 22:55:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 22:55:09 +0000
Subject: [pkgdb] cups-pk-helper was added for mkasik
Message-ID: <20090119225509.BC1E0208469@bastion.fedora.phx.redhat.com>

kevin has added Package cups-pk-helper with summary A helper that makes system-config-printer use PolicyKit
kevin has approved Package cups-pk-helper
kevin has added a Fedora devel branch for cups-pk-helper with an owner of mkasik
kevin has approved cups-pk-helper in Fedora devel
kevin has approved Package cups-pk-helper
kevin has set commit to Approved for provenpackager on cups-pk-helper (Fedora devel)
kevin has set build to Approved for provenpackager on cups-pk-helper (Fedora devel)
kevin has set checkout to Approved for provenpackager on cups-pk-helper (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cups-pk-helper



From kevin at fedoraproject.org  Mon Jan 19 22:56:09 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 19 Jan 2009 22:56:09 +0000 (UTC)
Subject: rpms/cups-pk-helper - New directory
Message-ID: <20090119225609.2B5CA700F8@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/cups-pk-helper
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsb25843/rpms/cups-pk-helper

Log Message:
Directory /cvs/pkgs/rpms/cups-pk-helper added to the repository




From kevin at fedoraproject.org  Mon Jan 19 22:56:09 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 19 Jan 2009 22:56:09 +0000 (UTC)
Subject: rpms/cups-pk-helper/devel - New directory
Message-ID: <20090119225609.65236700F8@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/cups-pk-helper/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsb25843/rpms/cups-pk-helper/devel

Log Message:
Directory /cvs/pkgs/rpms/cups-pk-helper/devel added to the repository




From kevin at fedoraproject.org  Mon Jan 19 22:56:24 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 19 Jan 2009 22:56:24 +0000 (UTC)
Subject: rpms/cups-pk-helper Makefile,NONE,1.1
Message-ID: <20090119225624.2F19E700F8@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/cups-pk-helper
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsb25843/rpms/cups-pk-helper

Added Files:
	Makefile 
Log Message:
Setup of module cups-pk-helper


--- NEW FILE Makefile ---
# Top level Makefile for module cups-pk-helper
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Mon Jan 19 22:56:24 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 19 Jan 2009 22:56:24 +0000 (UTC)
Subject: rpms/cups-pk-helper/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090119225624.6B736700F8@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/cups-pk-helper/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsb25843/rpms/cups-pk-helper/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module cups-pk-helper


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: cups-pk-helper
# $Id: Makefile,v 1.1 2009/01/19 22:56:24 kevin Exp $
NAME := cups-pk-helper
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Mon Jan 19 22:58:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 22:58:30 +0000
Subject: [pkgdb] gupnp-igd was added for bpepple
Message-ID: <20090119225830.564DF208467@bastion.fedora.phx.redhat.com>

kevin has added Package gupnp-igd with summary Library to handle UPnP IGD port mapping
kevin has approved Package gupnp-igd
kevin has added a Fedora devel branch for gupnp-igd with an owner of bpepple
kevin has approved gupnp-igd in Fedora devel
kevin has approved Package gupnp-igd
kevin has set commit to Approved for provenpackager on gupnp-igd (Fedora devel)
kevin has set build to Approved for provenpackager on gupnp-igd (Fedora devel)
kevin has set checkout to Approved for provenpackager on gupnp-igd (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gupnp-igd



From kevin at fedoraproject.org  Mon Jan 19 22:58:46 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 19 Jan 2009 22:58:46 +0000 (UTC)
Subject: rpms/gupnp-igd - New directory
Message-ID: <20090119225846.22799700F8@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/gupnp-igd
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsJ26258/rpms/gupnp-igd

Log Message:
Directory /cvs/pkgs/rpms/gupnp-igd added to the repository




From kevin at fedoraproject.org  Mon Jan 19 22:58:46 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 19 Jan 2009 22:58:46 +0000 (UTC)
Subject: rpms/gupnp-igd/devel - New directory
Message-ID: <20090119225846.588F8700F8@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/gupnp-igd/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsJ26258/rpms/gupnp-igd/devel

Log Message:
Directory /cvs/pkgs/rpms/gupnp-igd/devel added to the repository




From kevin at fedoraproject.org  Mon Jan 19 22:59:01 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 19 Jan 2009 22:59:01 +0000 (UTC)
Subject: rpms/gupnp-igd Makefile,NONE,1.1
Message-ID: <20090119225901.48BEB700F8@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/gupnp-igd
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsJ26258/rpms/gupnp-igd

Added Files:
	Makefile 
Log Message:
Setup of module gupnp-igd


--- NEW FILE Makefile ---
# Top level Makefile for module gupnp-igd
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Jan 19 22:59:01 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 19 Jan 2009 22:59:01 +0000 (UTC)
Subject: rpms/gupnp-igd/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090119225901.814D5700F8@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/gupnp-igd/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsJ26258/rpms/gupnp-igd/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module gupnp-igd


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: gupnp-igd
# $Id: Makefile,v 1.1 2009/01/19 22:59:01 kevin Exp $
NAME := gupnp-igd
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Jan 19 22:59:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 22:59:42 +0000
Subject: [pkgdb] rubygem-nokogiri was added for mtasaka
Message-ID: <20090119225942.46A1B208469@bastion.fedora.phx.redhat.com>

kevin has added Package rubygem-nokogiri with summary An HTML, XML, SAX, and Reader parser
kevin has approved Package rubygem-nokogiri
kevin has added a Fedora devel branch for rubygem-nokogiri with an owner of mtasaka
kevin has approved rubygem-nokogiri in Fedora devel
kevin has approved Package rubygem-nokogiri
kevin has set commit to Approved for provenpackager on rubygem-nokogiri (Fedora devel)
kevin has set build to Approved for provenpackager on rubygem-nokogiri (Fedora devel)
kevin has set checkout to Approved for provenpackager on rubygem-nokogiri (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rubygem-nokogiri



From pkgdb at fedoraproject.org  Mon Jan 19 22:59:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 22:59:44 +0000
Subject: [pkgdb] rubygem-nokogiri (Fedora, 9) updated by kevin
Message-ID: <20090119225944.E1B1C208471@bastion.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for rubygem-nokogiri
kevin has set commit to Approved for provenpackager on rubygem-nokogiri (Fedora 9)
kevin has set build to Approved for provenpackager on rubygem-nokogiri (Fedora 9)
kevin has set checkout to Approved for provenpackager on rubygem-nokogiri (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rubygem-nokogiri



From kevin at fedoraproject.org  Mon Jan 19 22:59:58 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 19 Jan 2009 22:59:58 +0000 (UTC)
Subject: rpms/rubygem-nokogiri - New directory
Message-ID: <20090119225958.22314700F8@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/rubygem-nokogiri
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsd26454/rpms/rubygem-nokogiri

Log Message:
Directory /cvs/pkgs/rpms/rubygem-nokogiri added to the repository




From pkgdb at fedoraproject.org  Mon Jan 19 22:59:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 22:59:44 +0000
Subject: [pkgdb] rubygem-nokogiri (Fedora, 10) updated by kevin
Message-ID: <20090119225944.EF14E208474@bastion.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for rubygem-nokogiri
kevin has set commit to Approved for provenpackager on rubygem-nokogiri (Fedora 10)
kevin has set build to Approved for provenpackager on rubygem-nokogiri (Fedora 10)
kevin has set checkout to Approved for provenpackager on rubygem-nokogiri (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rubygem-nokogiri



From kevin at fedoraproject.org  Mon Jan 19 22:59:58 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 19 Jan 2009 22:59:58 +0000 (UTC)
Subject: rpms/rubygem-nokogiri/devel - New directory
Message-ID: <20090119225958.52A1E70144@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/rubygem-nokogiri/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsd26454/rpms/rubygem-nokogiri/devel

Log Message:
Directory /cvs/pkgs/rpms/rubygem-nokogiri/devel added to the repository




From kevin at fedoraproject.org  Mon Jan 19 23:00:12 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 19 Jan 2009 23:00:12 +0000 (UTC)
Subject: rpms/rubygem-nokogiri Makefile,NONE,1.1
Message-ID: <20090119230012.6B07B700F8@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/rubygem-nokogiri
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsd26454/rpms/rubygem-nokogiri

Added Files:
	Makefile 
Log Message:
Setup of module rubygem-nokogiri


--- NEW FILE Makefile ---
# Top level Makefile for module rubygem-nokogiri
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Jan 19 23:00:12 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 19 Jan 2009 23:00:12 +0000 (UTC)
Subject: rpms/rubygem-nokogiri/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090119230012.A533270141@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/rubygem-nokogiri/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsd26454/rpms/rubygem-nokogiri/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module rubygem-nokogiri


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: rubygem-nokogiri
# $Id: Makefile,v 1.1 2009/01/19 23:00:12 kevin Exp $
NAME := rubygem-nokogiri
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Jan 19 23:00:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 23:00:53 +0000
Subject: [pkgdb] urlwatch was added for fab
Message-ID: <20090119230053.BCB4020846E@bastion.fedora.phx.redhat.com>

kevin has added Package urlwatch with summary A tool for monitoring webpages for updates
kevin has approved Package urlwatch
kevin has added a Fedora devel branch for urlwatch with an owner of fab
kevin has approved urlwatch in Fedora devel
kevin has approved Package urlwatch
kevin has set commit to Approved for provenpackager on urlwatch (Fedora devel)
kevin has set build to Approved for provenpackager on urlwatch (Fedora devel)
kevin has set checkout to Approved for provenpackager on urlwatch (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/urlwatch



From kevin at fedoraproject.org  Mon Jan 19 23:01:07 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 19 Jan 2009 23:01:07 +0000 (UTC)
Subject: rpms/urlwatch - New directory
Message-ID: <20090119230107.26268700F8@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/urlwatch
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsr26742/rpms/urlwatch

Log Message:
Directory /cvs/pkgs/rpms/urlwatch added to the repository




From pkgdb at fedoraproject.org  Mon Jan 19 23:00:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 23:00:56 +0000
Subject: [pkgdb] urlwatch (Fedora, 9) updated by kevin
Message-ID: <20090119230056.845B5208476@bastion.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for urlwatch
kevin has set commit to Approved for provenpackager on urlwatch (Fedora 9)
kevin has set build to Approved for provenpackager on urlwatch (Fedora 9)
kevin has set checkout to Approved for provenpackager on urlwatch (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/urlwatch



From pkgdb at fedoraproject.org  Mon Jan 19 23:00:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 23:00:56 +0000
Subject: [pkgdb] urlwatch (Fedora, 10) updated by kevin
Message-ID: <20090119230057.CB8E5208479@bastion.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for urlwatch
kevin has set commit to Approved for provenpackager on urlwatch (Fedora 10)
kevin has set build to Approved for provenpackager on urlwatch (Fedora 10)
kevin has set checkout to Approved for provenpackager on urlwatch (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/urlwatch



From kevin at fedoraproject.org  Mon Jan 19 23:01:07 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 19 Jan 2009 23:01:07 +0000 (UTC)
Subject: rpms/urlwatch/devel - New directory
Message-ID: <20090119230107.6BBF670143@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/urlwatch/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsr26742/rpms/urlwatch/devel

Log Message:
Directory /cvs/pkgs/rpms/urlwatch/devel added to the repository




From robert at fedoraproject.org  Mon Jan 19 23:02:54 2009
From: robert at fedoraproject.org (Robert Scheck)
Date: Mon, 19 Jan 2009 23:02:54 +0000 (UTC)
Subject: rpms/phpMyAdmin/F-10 .cvsignore, 1.32, 1.33 phpMyAdmin.spec, 1.36, 
	1.37 sources, 1.32, 1.33
Message-ID: <20090119230254.C71FB700F8@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/pkgs/rpms/phpMyAdmin/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27075/F-10

Modified Files:
	.cvsignore phpMyAdmin.spec sources 
Log Message:
Upstream released 3.1.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/phpMyAdmin/F-10/.cvsignore,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- .cvsignore	11 Dec 2008 10:07:40 -0000	1.32
+++ .cvsignore	19 Jan 2009 23:02:24 -0000	1.33
@@ -1 +1 @@
-phpMyAdmin-3.1.1-all-languages.tar.bz2
+phpMyAdmin-3.1.2-all-languages.tar.bz2


Index: phpMyAdmin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/phpMyAdmin/F-10/phpMyAdmin.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- phpMyAdmin.spec	11 Dec 2008 10:07:40 -0000	1.36
+++ phpMyAdmin.spec	19 Jan 2009 23:02:24 -0000	1.37
@@ -1,5 +1,5 @@
 Name: phpMyAdmin
-Version: 3.1.1
+Version: 3.1.2
 Release: 1%{?dist}
 Summary: Web based MySQL browser written in php
 
@@ -54,6 +54,9 @@
 %config(noreplace) %{_sysconfdir}/%{name}
 
 %changelog
+* Tue Jan 20 2009 Robert Scheck <robert at fedoraproject.org> 3.1.2-1
+- Upstream released 3.1.2
+
 * Thu Dec 11 2008 Robert Scheck <robert at fedoraproject.org> 3.1.1-1
 - Upstream released 3.1.1 (#475954)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/phpMyAdmin/F-10/sources,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- sources	11 Dec 2008 10:07:40 -0000	1.32
+++ sources	19 Jan 2009 23:02:24 -0000	1.33
@@ -1 +1 @@
-ddfaae7496828983fca2f849ddf3d869  phpMyAdmin-3.1.1-all-languages.tar.bz2
+cb6a6db5d684f94e71f864071b5b0d7a  phpMyAdmin-3.1.2-all-languages.tar.bz2



From robert at fedoraproject.org  Mon Jan 19 23:02:55 2009
From: robert at fedoraproject.org (Robert Scheck)
Date: Mon, 19 Jan 2009 23:02:55 +0000 (UTC)
Subject: rpms/phpMyAdmin/F-9 .cvsignore, 1.32, 1.33 phpMyAdmin.spec, 1.36,
	1.37 sources, 1.32, 1.33
Message-ID: <20090119230255.06BA2700F8@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/pkgs/rpms/phpMyAdmin/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27075/F-9

Modified Files:
	.cvsignore phpMyAdmin.spec sources 
Log Message:
Upstream released 3.1.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/phpMyAdmin/F-9/.cvsignore,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- .cvsignore	11 Dec 2008 10:07:41 -0000	1.32
+++ .cvsignore	19 Jan 2009 23:02:24 -0000	1.33
@@ -1 +1 @@
-phpMyAdmin-3.1.1-all-languages.tar.bz2
+phpMyAdmin-3.1.2-all-languages.tar.bz2


Index: phpMyAdmin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/phpMyAdmin/F-9/phpMyAdmin.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- phpMyAdmin.spec	11 Dec 2008 10:07:41 -0000	1.36
+++ phpMyAdmin.spec	19 Jan 2009 23:02:24 -0000	1.37
@@ -1,5 +1,5 @@
 Name: phpMyAdmin
-Version: 3.1.1
+Version: 3.1.2
 Release: 1%{?dist}
 Summary: Web based MySQL browser written in php
 
@@ -54,6 +54,9 @@
 %config(noreplace) %{_sysconfdir}/%{name}
 
 %changelog
+* Tue Jan 20 2009 Robert Scheck <robert at fedoraproject.org> 3.1.2-1
+- Upstream released 3.1.2
+
 * Thu Dec 11 2008 Robert Scheck <robert at fedoraproject.org> 3.1.1-1
 - Upstream released 3.1.1 (#475954)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/phpMyAdmin/F-9/sources,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- sources	11 Dec 2008 10:07:41 -0000	1.32
+++ sources	19 Jan 2009 23:02:24 -0000	1.33
@@ -1 +1 @@
-ddfaae7496828983fca2f849ddf3d869  phpMyAdmin-3.1.1-all-languages.tar.bz2
+cb6a6db5d684f94e71f864071b5b0d7a  phpMyAdmin-3.1.2-all-languages.tar.bz2



From robert at fedoraproject.org  Mon Jan 19 23:02:55 2009
From: robert at fedoraproject.org (Robert Scheck)
Date: Mon, 19 Jan 2009 23:02:55 +0000 (UTC)
Subject: rpms/phpMyAdmin/devel .cvsignore, 1.32, 1.33 phpMyAdmin.spec, 1.36, 
	1.37 sources, 1.32, 1.33
Message-ID: <20090119230255.3FD90700F8@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/pkgs/rpms/phpMyAdmin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27075/devel

Modified Files:
	.cvsignore phpMyAdmin.spec sources 
Log Message:
Upstream released 3.1.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/phpMyAdmin/devel/.cvsignore,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- .cvsignore	11 Dec 2008 10:07:41 -0000	1.32
+++ .cvsignore	19 Jan 2009 23:02:25 -0000	1.33
@@ -1 +1 @@
-phpMyAdmin-3.1.1-all-languages.tar.bz2
+phpMyAdmin-3.1.2-all-languages.tar.bz2


Index: phpMyAdmin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/phpMyAdmin/devel/phpMyAdmin.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- phpMyAdmin.spec	11 Dec 2008 10:07:41 -0000	1.36
+++ phpMyAdmin.spec	19 Jan 2009 23:02:25 -0000	1.37
@@ -1,5 +1,5 @@
 Name: phpMyAdmin
-Version: 3.1.1
+Version: 3.1.2
 Release: 1%{?dist}
 Summary: Web based MySQL browser written in php
 
@@ -54,6 +54,9 @@
 %config(noreplace) %{_sysconfdir}/%{name}
 
 %changelog
+* Tue Jan 20 2009 Robert Scheck <robert at fedoraproject.org> 3.1.2-1
+- Upstream released 3.1.2
+
 * Thu Dec 11 2008 Robert Scheck <robert at fedoraproject.org> 3.1.1-1
 - Upstream released 3.1.1 (#475954)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/phpMyAdmin/devel/sources,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- sources	11 Dec 2008 10:07:41 -0000	1.32
+++ sources	19 Jan 2009 23:02:25 -0000	1.33
@@ -1 +1 @@
-ddfaae7496828983fca2f849ddf3d869  phpMyAdmin-3.1.1-all-languages.tar.bz2
+cb6a6db5d684f94e71f864071b5b0d7a  phpMyAdmin-3.1.2-all-languages.tar.bz2



From kevin at fedoraproject.org  Mon Jan 19 23:19:56 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 19 Jan 2009 23:19:56 +0000 (UTC)
Subject: rpms/radial - New directory
Message-ID: <20090119231956.20CFC700F8@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/radial
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsH30404/rpms/radial

Log Message:
Directory /cvs/pkgs/rpms/radial added to the repository




From kevin at fedoraproject.org  Mon Jan 19 23:19:56 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 19 Jan 2009 23:19:56 +0000 (UTC)
Subject: rpms/radial/devel - New directory
Message-ID: <20090119231956.567EE700F8@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/radial/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsH30404/rpms/radial/devel

Log Message:
Directory /cvs/pkgs/rpms/radial/devel added to the repository




From pkgdb at fedoraproject.org  Mon Jan 19 23:19:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 23:19:44 +0000
Subject: [pkgdb] radial was added for mkasik
Message-ID: <20090119231944.697DE208467@bastion.fedora.phx.redhat.com>

kevin has added Package radial with summary A simple program for calculating radial velocities of stars in a binary system
kevin has approved Package radial
kevin has added a Fedora devel branch for radial with an owner of mkasik
kevin has approved radial in Fedora devel
kevin has approved Package radial
kevin has set commit to Approved for provenpackager on radial (Fedora devel)
kevin has set build to Approved for provenpackager on radial (Fedora devel)
kevin has set checkout to Approved for provenpackager on radial (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/radial



From kevin at fedoraproject.org  Mon Jan 19 23:20:10 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 19 Jan 2009 23:20:10 +0000 (UTC)
Subject: rpms/radial Makefile,NONE,1.1
Message-ID: <20090119232010.6270D700F8@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/radial
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsH30404/rpms/radial

Added Files:
	Makefile 
Log Message:
Setup of module radial


--- NEW FILE Makefile ---
# Top level Makefile for module radial
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Jan 19 23:20:10 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 19 Jan 2009 23:20:10 +0000 (UTC)
Subject: rpms/radial/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <20090119232010.9A246700F8@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/radial/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsH30404/rpms/radial/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module radial


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: radial
# $Id: Makefile,v 1.1 2009/01/19 23:20:10 kevin Exp $
NAME := radial
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Jan 19 23:20:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 23:20:47 +0000
Subject: [pkgdb] gaupol was added for lucilanga
Message-ID: <20090119232047.C0DC1208467@bastion.fedora.phx.redhat.com>

kevin has added Package gaupol with summary Subtitle editor
kevin has approved Package gaupol
kevin has added a Fedora devel branch for gaupol with an owner of lucilanga
kevin has approved gaupol in Fedora devel
kevin has approved Package gaupol
kevin has set commit to Approved for provenpackager on gaupol (Fedora devel)
kevin has set build to Approved for provenpackager on gaupol (Fedora devel)
kevin has set checkout to Approved for provenpackager on gaupol (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gaupol



From pkgdb at fedoraproject.org  Mon Jan 19 23:20:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 23:20:49 +0000
Subject: [pkgdb] gaupol (Fedora, 9) updated by kevin
Message-ID: <20090119232050.46FD5208472@bastion.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for gaupol
kevin has set commit to Approved for provenpackager on gaupol (Fedora 9)
kevin has set build to Approved for provenpackager on gaupol (Fedora 9)
kevin has set checkout to Approved for provenpackager on gaupol (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gaupol



From pkgdb at fedoraproject.org  Mon Jan 19 23:20:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 23:20:49 +0000
Subject: [pkgdb] gaupol (Fedora, 10) updated by kevin
Message-ID: <20090119232050.881D6208475@bastion.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for gaupol
kevin has set commit to Approved for provenpackager on gaupol (Fedora 10)
kevin has set build to Approved for provenpackager on gaupol (Fedora 10)
kevin has set checkout to Approved for provenpackager on gaupol (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gaupol



From kevin at fedoraproject.org  Mon Jan 19 23:21:05 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 19 Jan 2009 23:21:05 +0000 (UTC)
Subject: rpms/gaupol - New directory
Message-ID: <20090119232105.25989700F8@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/gaupol
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsr30549/rpms/gaupol

Log Message:
Directory /cvs/pkgs/rpms/gaupol added to the repository




From kevin at fedoraproject.org  Mon Jan 19 23:21:05 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 19 Jan 2009 23:21:05 +0000 (UTC)
Subject: rpms/gaupol/devel - New directory
Message-ID: <20090119232105.5FCE1700F8@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/gaupol/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsr30549/rpms/gaupol/devel

Log Message:
Directory /cvs/pkgs/rpms/gaupol/devel added to the repository




From pkgdb at fedoraproject.org  Mon Jan 19 23:20:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 23:20:49 +0000
Subject: [pkgdb] gaupol (Fedora EPEL, 5) updated by kevin
Message-ID: <20090119232050.9F169208478@bastion.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for gaupol
kevin has set commit to Approved for provenpackager on gaupol (Fedora EPEL 5)
kevin has set build to Approved for provenpackager on gaupol (Fedora EPEL 5)
kevin has set checkout to Approved for provenpackager on gaupol (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gaupol



From kevin at fedoraproject.org  Mon Jan 19 23:21:19 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 19 Jan 2009 23:21:19 +0000 (UTC)
Subject: rpms/gaupol Makefile,NONE,1.1
Message-ID: <20090119232119.D0B39700F8@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/gaupol
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsr30549/rpms/gaupol

Added Files:
	Makefile 
Log Message:
Setup of module gaupol


--- NEW FILE Makefile ---
# Top level Makefile for module gaupol
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Jan 19 23:21:20 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 19 Jan 2009 23:21:20 +0000 (UTC)
Subject: rpms/gaupol/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <20090119232120.18CBD700F8@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/gaupol/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsr30549/rpms/gaupol/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module gaupol


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: gaupol
# $Id: Makefile,v 1.1 2009/01/19 23:21:19 kevin Exp $
NAME := gaupol
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From rrankin at fedoraproject.org  Mon Jan 19 23:21:35 2009
From: rrankin at fedoraproject.org (Roy Rankin)
Date: Mon, 19 Jan 2009 23:21:35 +0000 (UTC)
Subject: comps comps-f11.xml.in,1.64,1.65
Message-ID: <20090119232135.DCB06700F8@cvs1.fedora.phx.redhat.com>

Author: rrankin

Update of /cvs/pkgs/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30355

Modified Files:
	comps-f11.xml.in 
Log Message:
Font split out of denemo (bugzilla 477375)



Index: comps-f11.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f11.xml.in,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- comps-f11.xml.in	19 Jan 2009 08:18:14 -0000	1.64
+++ comps-f11.xml.in	19 Jan 2009 23:21:05 -0000	1.65
@@ -1504,6 +1504,7 @@
       <packagereq type="optional">dejavu-lgc-sans-fonts</packagereq>
       <packagereq type="optional">dejavu-lgc-sans-mono-fonts</packagereq>
       <packagereq type="optional">dejavu-lgc-serif-fonts</packagereq>
+      <packagereq type="optional">denenmo-music-fonts</packagereq>
       <packagereq type="optional">doulos-fonts</packagereq>
       <packagereq type="optional">dustin-dustismo-fonts</packagereq>
       <packagereq type="optional">ecolier-court-fonts</packagereq>



From pkgdb at fedoraproject.org  Mon Jan 19 23:21:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 23:21:30 +0000
Subject: [pkgdb] mythes-it was added for caolanm
Message-ID: <20090119232130.B4EEE208473@bastion.fedora.phx.redhat.com>

kevin has added Package mythes-it with summary Italian Thesaurus
kevin has approved Package mythes-it
kevin has added a Fedora devel branch for mythes-it with an owner of caolanm
kevin has approved mythes-it in Fedora devel
kevin has approved Package mythes-it
kevin has set commit to Approved for provenpackager on mythes-it (Fedora devel)
kevin has set build to Approved for provenpackager on mythes-it (Fedora devel)
kevin has set checkout to Approved for provenpackager on mythes-it (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mythes-it



From kevin at fedoraproject.org  Mon Jan 19 23:21:46 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 19 Jan 2009 23:21:46 +0000 (UTC)
Subject: rpms/mythes-it - New directory
Message-ID: <20090119232146.221F0700F8@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/mythes-it
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsq30797/rpms/mythes-it

Log Message:
Directory /cvs/pkgs/rpms/mythes-it added to the repository




From kevin at fedoraproject.org  Mon Jan 19 23:21:46 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 19 Jan 2009 23:21:46 +0000 (UTC)
Subject: rpms/mythes-it/devel - New directory
Message-ID: <20090119232146.57966700F8@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/mythes-it/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsq30797/rpms/mythes-it/devel

Log Message:
Directory /cvs/pkgs/rpms/mythes-it/devel added to the repository




From kevin at fedoraproject.org  Mon Jan 19 23:22:02 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 19 Jan 2009 23:22:02 +0000 (UTC)
Subject: rpms/mythes-it Makefile,NONE,1.1
Message-ID: <20090119232202.A83DD700F8@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/mythes-it
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsq30797/rpms/mythes-it

Added Files:
	Makefile 
Log Message:
Setup of module mythes-it


--- NEW FILE Makefile ---
# Top level Makefile for module mythes-it
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Jan 19 23:22:02 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 19 Jan 2009 23:22:02 +0000 (UTC)
Subject: rpms/mythes-it/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090119232202.E942B700F8@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/mythes-it/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsq30797/rpms/mythes-it/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module mythes-it


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: mythes-it
# $Id: Makefile,v 1.1 2009/01/19 23:22:02 kevin Exp $
NAME := mythes-it
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out 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 Jan 19 23:22:28 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 19 Jan 2009 23:22:28 +0000 (UTC)
Subject: rpms/mythes-mi - New directory
Message-ID: <20090119232228.25614700F8@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/mythes-mi
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsP30907/rpms/mythes-mi

Log Message:
Directory /cvs/pkgs/rpms/mythes-mi added to the repository




From pkgdb at fedoraproject.org  Mon Jan 19 23:22:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 23:22:11 +0000
Subject: [pkgdb] mythes-mi was added for caolanm
Message-ID: <20090119232211.70207208467@bastion.fedora.phx.redhat.com>

kevin has added Package mythes-mi with summary Maori Thesaurus
kevin has approved Package mythes-mi
kevin has added a Fedora devel branch for mythes-mi with an owner of caolanm
kevin has approved mythes-mi in Fedora devel
kevin has approved Package mythes-mi
kevin has set commit to Approved for provenpackager on mythes-mi (Fedora devel)
kevin has set build to Approved for provenpackager on mythes-mi (Fedora devel)
kevin has set checkout to Approved for provenpackager on mythes-mi (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mythes-mi



From kevin at fedoraproject.org  Mon Jan 19 23:22:28 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 19 Jan 2009 23:22:28 +0000 (UTC)
Subject: rpms/mythes-mi/devel - New directory
Message-ID: <20090119232228.54C4E700F8@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/mythes-mi/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsP30907/rpms/mythes-mi/devel

Log Message:
Directory /cvs/pkgs/rpms/mythes-mi/devel added to the repository




From kevin at fedoraproject.org  Mon Jan 19 23:22:43 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 19 Jan 2009 23:22:43 +0000 (UTC)
Subject: rpms/mythes-mi Makefile,NONE,1.1
Message-ID: <20090119232243.4D678700F8@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/mythes-mi
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsP30907/rpms/mythes-mi

Added Files:
	Makefile 
Log Message:
Setup of module mythes-mi


--- NEW FILE Makefile ---
# Top level Makefile for module mythes-mi
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Jan 19 23:22:43 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 19 Jan 2009 23:22:43 +0000 (UTC)
Subject: rpms/mythes-mi/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090119232243.95752700F8@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/mythes-mi/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsP30907/rpms/mythes-mi/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module mythes-mi


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: mythes-mi
# $Id: Makefile,v 1.1 2009/01/19 23:22:43 kevin Exp $
NAME := mythes-mi
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Jan 19 23:23:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 23:23:05 +0000
Subject: [pkgdb] msmtp (Fedora EPEL, 5) updated by kevin
Message-ID: <20090119232306.25751208467@bastion.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for msmtp
kevin has set commit to Approved for provenpackager on msmtp (Fedora EPEL 5)
kevin has set build to Approved for provenpackager on msmtp (Fedora EPEL 5)
kevin has set checkout to Approved for provenpackager on msmtp (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/msmtp



From pkgdb at fedoraproject.org  Mon Jan 19 23:23:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 23:23:33 +0000
Subject: [pkgdb] libntlm (Fedora EPEL, 5) updated by kevin
Message-ID: <20090119232333.B40A4208467@bastion.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for libntlm
kevin has set commit to Approved for provenpackager on libntlm (Fedora EPEL 5)
kevin has set build to Approved for provenpackager on libntlm (Fedora EPEL 5)
kevin has set checkout to Approved for provenpackager on libntlm (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libntlm



From pkgdb at fedoraproject.org  Mon Jan 19 23:24:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 19 Jan 2009 23:24:41 +0000
Subject: [pkgdb] libgsasl (Fedora EPEL, 5) updated by kevin
Message-ID: <20090119232441.B82C8208470@bastion.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for libgsasl
kevin has set commit to Approved for provenpackager on libgsasl (Fedora EPEL 5)
kevin has set build to Approved for provenpackager on libgsasl (Fedora EPEL 5)
kevin has set checkout to Approved for provenpackager on libgsasl (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libgsasl



From caolanm at fedoraproject.org  Mon Jan 19 23:32:23 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Mon, 19 Jan 2009 23:32:23 +0000 (UTC)
Subject: rpms/mythes-it/devel import.log, NONE, 1.1 mythes-it.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090119233223.6A0F8700F8@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/mythes-it/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv666/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log mythes-it.spec 
Log Message:



--- NEW FILE import.log ---
mythes-it-2_0_9l-1_fc10:HEAD:mythes-it-2.0.9l-1.fc10.src.rpm:1232407882


--- NEW FILE mythes-it.spec ---
Name: mythes-it
Summary: Italian thesaurus
Version: 2.0.9l
Release: 1%{?dist}
Source: http://downloads.sourceforge.net/sourceforge/linguistico/thesaurus2_it_02_09_l_2008_11_29.zip
Group: Applications/Text
URL: http://linguistico.sourceforge.net/pages/thesaurus_italiano.html
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
License: AGPLv3
BuildArch: noarch

%description
Italian thesaurus.

%prep
%setup -q -c

%build
for i in th_it_IT_README th_it_IT_ChangeLog th_it_IT_AUTHORS; 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}/mythes
cp -p th_it_IT.dat $RPM_BUILD_ROOT/%{_datadir}/mythes/th_it_IT_v2.dat
cp -p th_it_IT.idx $RPM_BUILD_ROOT/%{_datadir}/mythes/th_it_IT_v2.idx

pushd $RPM_BUILD_ROOT/%{_datadir}/mythes/
it_IT_aliases="it_CH"
for lang in $it_IT_aliases; do
        ln -s th_it_IT_v2.dat "th_"$lang"_v2.dat"
        ln -s th_it_IT_v2.idx "th_"$lang"_v2.idx"
done

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc th_it_IT_README th_it_IT_ChangeLog th_it_IT_COPYING th_it_IT_INSTALL th_it_IT_copyright_licenza.txt th_it_IT_lettera_in_inglese.txt  th_it_IT_AUTHORS
%dir %{_datadir}/mythes
%{_datadir}/mythes/*

%changelog
* Fri Jan 16 2009 Caolan McNamara <caolanm at redhat.com> - 2.0.9l-1
- initial version


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mythes-it/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	19 Jan 2009 23:22:02 -0000	1.1
+++ .cvsignore	19 Jan 2009 23:31:53 -0000	1.2
@@ -0,0 +1 @@
+thesaurus2_it_02_09_l_2008_11_29.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mythes-it/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	19 Jan 2009 23:22:02 -0000	1.1
+++ sources	19 Jan 2009 23:31:53 -0000	1.2
@@ -0,0 +1 @@
+e3df0f7a03df3b4bf0525f6b6548e129  thesaurus2_it_02_09_l_2008_11_29.zip



From caolanm at fedoraproject.org  Mon Jan 19 23:32:27 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Mon, 19 Jan 2009 23:32:27 +0000 (UTC)
Subject: rpms/mythes-mi/devel import.log, NONE, 1.1 mythes-mi.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090119233227.D1B67700F8@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/mythes-mi/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv687/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log mythes-mi.spec 
Log Message:



--- NEW FILE import.log ---
mythes-mi-0_20080630-1_fc10:HEAD:mythes-mi-0.20080630-1.fc10.src.rpm:1232407884


--- NEW FILE mythes-mi.spec ---
Name: mythes-mi
Summary: Maori thesaurus
%define upstreamid 20080630
Version: 0.%{upstreamid}
Release: 1%{?dist}
Source: http://packages.papakupu.maori.nz/mythes/mythes-mi-0.1.%{upstreamid}-beta.tar.gz
Group: Applications/Text
URL: http://papakupu.maori.nz/
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
License: Public Domain
BuildArch: noarch

%description
Maori thesaurus.

%prep
%setup -q -c

%build

%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT/%{_datadir}/mythes
cp -p mi.dat $RPM_BUILD_ROOT/%{_datadir}/mythes/th_mi_NZ_v2.dat
cp -p mi.idx $RPM_BUILD_ROOT/%{_datadir}/mythes/th_mi_NZ_v2.idx

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc mi.AUTHORS mi.README mi.LICENSE
%dir %{_datadir}/mythes
%{_datadir}/mythes/*

%changelog
* Fri Jan 16 2009 Caolan McNamara <caolanm at redhat.com> - 0.20080630-1
- initial version


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mythes-mi/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	19 Jan 2009 23:22:43 -0000	1.1
+++ .cvsignore	19 Jan 2009 23:31:57 -0000	1.2
@@ -0,0 +1 @@
+mythes-mi-0.1.20080630-beta.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mythes-mi/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	19 Jan 2009 23:22:43 -0000	1.1
+++ sources	19 Jan 2009 23:31:57 -0000	1.2
@@ -0,0 +1 @@
+54fbd8b9705dd004bd9909e47119156b  mythes-mi-0.1.20080630-beta.tar.gz



From rrankin at fedoraproject.org  Mon Jan 19 23:33:32 2009
From: rrankin at fedoraproject.org (Roy Rankin)
Date: Mon, 19 Jan 2009 23:33:32 +0000 (UTC)
Subject: rpms/denemo/devel denemo-0.8.0-font.patch, NONE, 1.1 denemo.spec,
	1.3, 1.4 denemo-binreloc.patch, 1.1, NONE denemo-block_debug.patch,
	1.1, NONE denemo-undo-assert.patch, 1.1, NONE
Message-ID: <20090119233332.1CDB9700F8@cvs1.fedora.phx.redhat.com>

Author: rrankin

Update of /cvs/pkgs/rpms/denemo/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv387

Modified Files:
	denemo.spec 
Added Files:
	denemo-0.8.0-font.patch 
Removed Files:
	denemo-binreloc.patch denemo-block_debug.patch 
	denemo-undo-assert.patch 
Log Message:
Font packages as seperate RPM as per bugzilla 477375


denemo-0.8.0-font.patch:

--- NEW FILE denemo-0.8.0-font.patch ---
diff --git a/LICENSE_OFL.txt b/LICENSE_OFL.txt
index e69de29..e6c5fe8 100644
--- a/LICENSE_OFL.txt
+++ b/LICENSE_OFL.txt
@@ -0,0 +1,100 @@
+LICENSE FOR FONTS MusiQwik, MusiQwikB, MusiSync.
+
+
+Copyright (c) 2001, 2008, Robert Allgeyer http://www.icogitate.com/~ergosum/fonts/musicfonts.htm,
+with Reserved Font Name "MusiQwik".
+
+Copyright (c) 2001, 2008, Robert Allgeyer http://www.icogitate.com/~ergosum/fonts/musicfonts.htm,
+with Reserved Font Name "MusiSync".
+
+This Font Software is licensed under the SIL Open Font License, Version 1.1.
+This license is copied below, and is also available with a FAQ at:
+http://scripts.sil.org/OFL
+
+
+-----------------------------------------------------------
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+-----------------------------------------------------------
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font creation
+efforts of academic and linguistic communities, and to provide a free and
+open framework in which fonts may be shared and improved in partnership
+with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded, 
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply
+to any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software components as
+distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to, deleting,
+or substituting -- in part or in whole -- any of the components of the
+Original Version, by changing formats or by porting the Font Software to a
+new environment.
+
+"Author" refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+PERMISSION & CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed, modify,
+redistribute, and sell modified and unmodified copies of the Font
+Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components,
+in Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+in the appropriate machine-readable metadata fields within text or
+binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+Name(s) unless explicit written permission is granted by the corresponding
+Copyright Holder. This restriction only applies to the primary font name as
+presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+Software shall not be used to promote, endorse or advertise any
+Modified Version, except to acknowledge the contribution(s) of the
+Copyright Holder(s) and the Author(s) or with their explicit written
+permission.
+
+5) The Font Software, modified or unmodified, in part or in whole,
+must be distributed entirely under this license, and must not be
+distributed under any other license. The requirement for fonts to
+remain under this license does not apply to any document created
+using the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are
+not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.
diff --git a/Makefile.am b/Makefile.am
index da242e7..956ebf2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,7 +6,7 @@ dist_sysconf_DATA = denemo.conf
 
 EXTRA_DIST = mkinstalldirs  actions/menus doc/DESIGN doc/GOALS @PACKAGE at .spec.in  \
 	     doc/DESIGN.lilypond README.lilypond include actions \
-	     guile-1.8.pc
+	     guile-1.8.pc LICENSE_OFL.txt
 
 MAINTAINERCLEANFILES =  Makefile.in aclocal.m4 configure config.h.in \
 	stamp-h.in \
diff --git a/Makefile.in b/Makefile.in
index e72b16f..015c91b 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -191,7 +191,7 @@ dist_sysconf_DATA = denemo.conf
 
 EXTRA_DIST = mkinstalldirs  actions/menus doc/DESIGN doc/GOALS @PACKAGE at .spec.in  \
 	     doc/DESIGN.lilypond README.lilypond include actions \
-	     guile-1.8.pc
+	     guile-1.8.pc LICENSE_OFL.txt
 
 
 MAINTAINERCLEANFILES = Makefile.in aclocal.m4 configure config.h.in \


Index: denemo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/denemo/devel/denemo.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- denemo.spec	7 Jan 2009 11:32:16 -0000	1.3
+++ denemo.spec	19 Jan 2009 23:33:01 -0000	1.4
@@ -1,11 +1,16 @@
 Summary: Graphical music notation program
 Name: denemo
 Version: 0.8.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2
 Group: Applications/Multimedia
 Source: http://download.savannah.gnu.org/releases/denemo/%{name}-%{version}.tar.gz
+
+
+#This patch fixes the base Makefile to allow RPMs to be built
 Patch0: %{name}-0.8.0-make.patch
+#This patch adds the font license 
+Patch1: %{name}-0.8.0-font.patch
 
 URL: http://www.denemo.org/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -13,7 +18,18 @@
 BuildRequires: portaudio-devel aubio-devel gtk2-devel guile-devel
 BuildRequires: gettext libxml2-devel fftw-devel desktop-file-utils
 BuildRequires: libtool-ltdl-devel
+BuildRequires: chrpath fontpackages-devel
+
 Requires: bug-buddy
+Requires: denemo-music-fonts
+
+%package music-fonts
+Summary:	Music notation fonts used in Denemo
+Group: 		Fonts
+License: 	OFL
+Version: 	4.10
+Requires:	fontpackages-filesystem
+
 
 
 %description
@@ -25,21 +41,37 @@
 (http://www.cs.uu.nl/hanwen/lilypond/), but is adaptable to other
 computer-music-related purposes as well. 
 
+%description music-fonts
+This font set witten by Robert Allgeyer is the 2001 legacy version
+of MusiSync. It is a musical notations font set which was reordered 
+by Richard Shann for Denemo. 
+
+This font set is used by Denemo.
+
 %prep
 %setup -q
 %patch0 -p0
+%patch1 -p1
 
 %build
 %configure 
+# these files need to be removed upstream
+find actions -name \*~ -exec rm -f {} +
 make %{?_smp_mflags}
+chrpath -d src/denemo
 
 %install
 rm -rf %{buildroot}
 make install DESTDIR=%{buildroot}
-desktop-file-install --vendor="" \
-        --dir=%{buildroot}/%{_datadir}/applications     \
-        %{buildroot}/%{_datadir}/applications/denemo.desktop
+desktop-file-install --vendor=""\
+	--dir=%{buildroot}/%{_datadir}/applications\
+	%{buildroot}/%{_datadir}/applications/denemo.desktop
 %find_lang %{name}
+install -m 0755 -d %{buildroot}%{_fontdir}
+
+# move the location of the music font
+install -m 0644 -p fonts/*.ttf %{buildroot}%{_fontdir}
+rm -rf %{buildroot}/%{_datadir}/fonts/truetype
 
 %clean
 rm -rf %{buildroot}
@@ -50,12 +82,21 @@
 %config(noreplace) %{_sysconfdir}/denemo/denemo.conf
 %{_datadir}/denemo
 %{_datadir}/icons/denemo.png
-%{_datadir}/fonts/truetype/denemo
 %{_datadir}/applications/denemo.desktop
 %{_bindir}/denemo
 %doc COPYING README README.lilypond ChangeLog 
 
+
+
+
+%_font_pkg -n music *.ttf
+%doc LICENSE_OFL.txt
+
+
 %changelog
+* Tue Jan 20 2009 Roy Rankin <rrankin at ihug.com.au> - 0.8.0-2
+-Font split into seperate RPM package (Bugzilla 477375)
+
 * Sun Nov 30 2008 Roy Rankin <rrankin at ihug.com.au> - 0.8.0-1
 -Update for Denemo release 0.8.0
 


--- denemo-binreloc.patch DELETED ---


--- denemo-block_debug.patch DELETED ---


--- denemo-undo-assert.patch DELETED ---



From cebbert at fedoraproject.org  Mon Jan 19 23:35:01 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Mon, 19 Jan 2009 23:35:01 +0000 (UTC)
Subject: rpms/kernel/F-10 config-generic, 1.205, 1.206 kernel.spec, 1.1220, 
	1.1221
Message-ID: <20090119233501.B6511700F8@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1184

Modified Files:
	config-generic kernel.spec 
Log Message:
Fix up some config options:
  CONFIG_USB_SERIAL_GARMIN is not set
  CONFIG_SND_AC97_POWER_SAVE_DEFAULT=0
  CONFIG_CGROUP_MEM_RES_CTLR is not set
  CONFIG_NETFILTER_XT_MATCH_RECENT_PROC_COMPAT=y


Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/config-generic,v
retrieving revision 1.205
retrieving revision 1.206
diff -u -r1.205 -r1.206
--- config-generic	14 Jan 2009 16:01:01 -0000	1.205
+++ config-generic	19 Jan 2009 23:34:31 -0000	1.206
@@ -2527,7 +2527,7 @@
 CONFIG_SND_MPU401=m
 CONFIG_SND_PORTMAN2X4=m
 CONFIG_SND_AC97_POWER_SAVE=y
-CONFIG_SND_AC97_POWER_SAVE_DEFAULT=5
+CONFIG_SND_AC97_POWER_SAVE_DEFAULT=0
 
 CONFIG_SND_DRIVERS=y
 
@@ -2832,7 +2832,7 @@
 CONFIG_USB_SERIAL_EMPEG=m
 CONFIG_USB_SERIAL_FTDI_SIO=m
 CONFIG_USB_SERIAL_FUNSOFT=m
-CONFIG_USB_SERIAL_GARMIN=m
+# CONFIG_USB_SERIAL_GARMIN is not set
 CONFIG_USB_SERIAL_HP4X=m
 CONFIG_USB_SERIAL_IPAQ=m
 CONFIG_USB_SERIAL_IPW=m
@@ -3380,7 +3380,8 @@
 CONFIG_GROUP_SCHED=y
 CONFIG_RT_GROUP_SCHED=y
 CONFIG_CGROUP_SCHED=y
-CONFIG_CGROUP_MEM_RES_CTLR=y
+# NOTE: Before changing the below, take notice that page struct will grow past a cacheline on 32bit.
+# CONFIG_CGROUP_MEM_RES_CTLR is not set
 
 CONFIG_CPUSETS=y
 CONFIG_CGROUPS=y
@@ -3746,7 +3747,7 @@
 CONFIG_NETFILTER_TPROXY=m
 CONFIG_NETFILTER_XT_TARGET_TPROXY=m
 CONFIG_NETFILTER_XT_MATCH_RECENT=m
-# CONFIG_NETFILTER_XT_MATCH_RECENT_PROC_COMPAT is not set
+CONFIG_NETFILTER_XT_MATCH_RECENT_PROC_COMPAT=y
 CONFIG_NETFILTER_XT_MATCH_SOCKET=m
 
 # CONFIG_IP_VS_IPV6 is not set


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/kernel.spec,v
retrieving revision 1.1220
retrieving revision 1.1221
diff -u -r1.1220 -r1.1221
--- kernel.spec	19 Jan 2009 22:40:31 -0000	1.1220
+++ kernel.spec	19 Jan 2009 23:34:31 -0000	1.1221
@@ -1781,6 +1781,13 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Mon Jan 19 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.28.1-14
+- Fix up some config options:
+  CONFIG_USB_SERIAL_GARMIN is not set
+  CONFIG_SND_AC97_POWER_SAVE_DEFAULT=0
+  CONFIG_CGROUP_MEM_RES_CTLR is not set
+  CONFIG_NETFILTER_XT_MATCH_RECENT_PROC_COMPAT=y
+
 * Mon Jan 19 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.28.1-13
 - CVE-2009-0065: buffer overflow in net/sctp/sm_statefuns.c
   in the Stream Control Transmission Protocol



From behdad at fedoraproject.org  Mon Jan 19 23:56:06 2009
From: behdad at fedoraproject.org (Behdad Esfahbod)
Date: Mon, 19 Jan 2009 23:56:06 +0000 (UTC)
Subject: rpms/fontconfig/devel .cvsignore, 1.32, 1.33 fontconfig.spec, 1.114,
	1.115 sources, 1.33, 1.34
Message-ID: <20090119235606.B677770031@cvs1.fedora.phx.redhat.com>

Author: behdad

Update of /cvs/pkgs/rpms/fontconfig/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5431

Modified Files:
	.cvsignore fontconfig.spec sources 
Log Message:
* Mon Jan 19 2009 Behdad Esfahbod <besfahbo at redhat.com> -
* 2.6.92-1.git.64.g167bb82
- Update to 2.6.91-1.git.64.g167bb82




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fontconfig/devel/.cvsignore,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- .cvsignore	19 Jan 2009 22:11:23 -0000	1.32
+++ .cvsignore	19 Jan 2009 23:55:36 -0000	1.33
@@ -1 +1 @@
-fontconfig-2.6.91.tar.gz
+fontconfig-2.6.92.tar.gz


Index: fontconfig.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fontconfig/devel/fontconfig.spec,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -r1.114 -r1.115
--- fontconfig.spec	19 Jan 2009 22:11:23 -0000	1.114
+++ fontconfig.spec	19 Jan 2009 23:55:36 -0000	1.115
@@ -2,8 +2,8 @@
 
 Summary: Font configuration and customization library
 Name: fontconfig
-Version: 2.6.91
-Release: 1.git.64.g9feaf34%{?dist}
+Version: 2.6.92
+Release: 1.git.64.g167bb82%{?dist}
 License: MIT
 Group: System Environment/Libraries
 Source: http://fontconfig.org/release/fontconfig-%{version}.tar.gz
@@ -131,6 +131,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Mon Jan 19 2009 Behdad Esfahbod <besfahbo at redhat.com> - 2.6.92-1.git.64.g167bb82
+- Update to 2.6.91-1.git.64.g167bb82
+
 * Mon Jan 19 2009 Behdad Esfahbod <besfahbo at redhat.com> - 2.6.91-1.git.64.g9feaf34
 - Update to 2.6.91-1.git.64.g9feaf34
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fontconfig/devel/sources,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- sources	19 Jan 2009 22:11:23 -0000	1.33
+++ sources	19 Jan 2009 23:55:36 -0000	1.34
@@ -1 +1 @@
-b7698d79afb8d3d01b206b9a4eea9ff2  fontconfig-2.6.91.tar.gz
+3aef92ac30c2ed24ea89a5007ecbf588  fontconfig-2.6.92.tar.gz



From oget at fedoraproject.org  Tue Jan 20 00:09:27 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Tue, 20 Jan 2009 00:09:27 +0000 (UTC)
Subject: rpms/deco/devel .cvsignore, 1.2, 1.3 deco.spec, 1.1, 1.2 sources,
	1.2, 1.3
Message-ID: <20090120000927.33C25700F9@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/deco/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7162

Modified Files:
	.cvsignore deco.spec sources 
Log Message:
* Mon Jan 19 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 1.6-1
- Version update. Change in work flow for failed extractions.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/deco/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	4 Dec 2008 01:48:29 -0000	1.2
+++ .cvsignore	20 Jan 2009 00:08:56 -0000	1.3
@@ -1 +1 @@
-deco-1.5.7.tar.gz
+deco-1.6.tar.gz


Index: deco.spec
===================================================================
RCS file: /cvs/pkgs/rpms/deco/devel/deco.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- deco.spec	4 Dec 2008 01:48:29 -0000	1.1
+++ deco.spec	20 Jan 2009 00:08:56 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           deco
-Version:        1.5.7
-Release:        2%{?dist}
+Version:        1.6
+Release:        1%{?dist}
 Summary:        Extractor for various archive file formats
 Group:          Applications/Archiving
 License:        GPLv3
@@ -38,17 +38,20 @@
 %dir %{_var}/lib/%{name}
 
 %changelog
-* Thu Nov 20 2008 Orcan Ogetbil <orcanbahri [AT] yahoo [DOT] com> 1.5.7-2
+* Mon Jan 19 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 1.6-1
+- Version update. Change in work flow for failed extractions.
+
+* Thu Nov 20 2008 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 1.5.7-2
 - License is GPLv3.
 - The extraction scripts will be inside %%{_var}/lib/%%{name}.
 
-* Wed Nov 19 2008 Orcan Ogetbil <orcanbahri [AT] yahoo [DOT] com> 1.5.7-1
+* Wed Nov 19 2008 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 1.5.7-1
 - Version update
 
-* Wed Oct 29 2008 Orcan Ogetbil <orcanbahri [AT] yahoo [DOT] com> 1.5.6-2
+* Wed Oct 29 2008 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 1.5.6-2
 - Package deco-archive separately
 
-* Tue Oct 28 2008 Orcan Ogetbil <orcanbahri [AT] yahoo [DOT] com> 1.5.6-1
+* Tue Oct 28 2008 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 1.5.6-1
 - Rebuild with version 1.5.6
 
 * Mon Apr 28 2008 Steve 'Ashcrow' Milner <stevem at gnulinux.net> - 0.8.1-2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/deco/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	4 Dec 2008 01:48:29 -0000	1.2
+++ sources	20 Jan 2009 00:08:56 -0000	1.3
@@ -1 +1 @@
-3dc4b91ede16b038877c9d2bd3a781a7  deco-1.5.7.tar.gz
+db5ed81f32e2d4f51db62edc2dcbc58c  deco-1.6.tar.gz



From cebbert at fedoraproject.org  Tue Jan 20 00:11:54 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Tue, 20 Jan 2009 00:11:54 +0000 (UTC)
Subject: rpms/kernel/F-10 config-generic, 1.206, 1.207 kernel.spec, 1.1221, 
	1.1222
Message-ID: <20090120001154.616EF700F9@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7590

Modified Files:
	config-generic kernel.spec 
Log Message:
CONFIG_CGROUP_MEM_RES_CTLR=y: the overhead for this option is minimal now


Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/config-generic,v
retrieving revision 1.206
retrieving revision 1.207
diff -u -r1.206 -r1.207
--- config-generic	19 Jan 2009 23:34:31 -0000	1.206
+++ config-generic	20 Jan 2009 00:11:24 -0000	1.207
@@ -3380,8 +3380,7 @@
 CONFIG_GROUP_SCHED=y
 CONFIG_RT_GROUP_SCHED=y
 CONFIG_CGROUP_SCHED=y
-# NOTE: Before changing the below, take notice that page struct will grow past a cacheline on 32bit.
-# CONFIG_CGROUP_MEM_RES_CTLR is not set
+CONFIG_CGROUP_MEM_RES_CTLR=y
 
 CONFIG_CPUSETS=y
 CONFIG_CGROUPS=y


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/kernel.spec,v
retrieving revision 1.1221
retrieving revision 1.1222
diff -u -r1.1221 -r1.1222
--- kernel.spec	19 Jan 2009 23:34:31 -0000	1.1221
+++ kernel.spec	20 Jan 2009 00:11:24 -0000	1.1222
@@ -1781,6 +1781,9 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Mon Jan 19 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.28.1-15
+- CONFIG_CGROUP_MEM_RES_CTLR=y: the overhead for this option is minimal now
+
 * Mon Jan 19 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.28.1-14
 - Fix up some config options:
   CONFIG_USB_SERIAL_GARMIN is not set



From jgu at fedoraproject.org  Tue Jan 20 00:17:03 2009
From: jgu at fedoraproject.org (Jonathan G. Underwood)
Date: Tue, 20 Jan 2009 00:17:03 +0000 (UTC)
Subject: rpms/dvipdfmx/devel .cvsignore, 1.4, 1.5 dvipdfmx.spec, 1.6,
	1.7 sources, 1.4, 1.5
Message-ID: <20090120001703.C0B8E700F9@cvs1.fedora.phx.redhat.com>

Author: jgu

Update of /cvs/extras/rpms/dvipdfmx/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8781

Modified Files:
	.cvsignore dvipdfmx.spec sources 
Log Message:
* Tue Jan 20 2009 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 0-0.26.20090115cvs
- Update to 20090115 snapshot



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/dvipdfmx/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	17 Jun 2008 22:14:55 -0000	1.4
+++ .cvsignore	20 Jan 2009 00:16:33 -0000	1.5
@@ -1 +1 @@
-dvipdfmx-20080617.tar.gz
+dvipdfmx-20090115.tar.gz


Index: dvipdfmx.spec
===================================================================
RCS file: /cvs/extras/rpms/dvipdfmx/devel/dvipdfmx.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- dvipdfmx.spec	17 Jun 2008 22:43:44 -0000	1.6
+++ dvipdfmx.spec	20 Jan 2009 00:16:33 -0000	1.7
@@ -6,11 +6,11 @@
 %{!?_texmf_main: %define _texmf_main %{_datadir}/texmf}
 %{!?_texmf_conf: %define _texmf_conf %{_sysconfdir}/texmf}
 
-%define snapshot 20080617
+%define snapshot 20090115
 
 Name:           dvipdfmx
 Version:        0
-Release:        0.25.%{snapshot}cvs%{?dist}
+Release:        0.26.%{snapshot}cvs%{?dist}
 Summary:        A DVI to PDF translator
 
 Group:          Applications/Publishing
@@ -22,7 +22,7 @@
 # dvipdfm package. 
 # htps://bugzilla.redhat.com/show_bug.cgi?id=448347
 # Reported to upstream on 26th May 2008 via email
-Patch0:		dvipdfmx-%{snapshot}-ebb-to-ebbx.patch
+Patch0:		dvipdfmx-20080617-ebb-to-ebbx.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -98,6 +98,9 @@
 
 
 %changelog
+* Tue Jan 20 2009 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 0-0.26.20090115cvs
+- Update to 20090115 snapshot
+
 * Tue Jun 17 2008 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 0-0.25.20080617cvs
 - Rework ebb-to-ebbx patch for latest CVS snapshot
 - Fix files section


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/dvipdfmx/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	17 Jun 2008 22:14:55 -0000	1.4
+++ sources	20 Jan 2009 00:16:33 -0000	1.5
@@ -1 +1 @@
-189cca330fa680b226d0190e37c91748  dvipdfmx-20080617.tar.gz
+098cef238de53adc5e98fe56a451f6f7  dvipdfmx-20090115.tar.gz



From jgu at fedoraproject.org  Tue Jan 20 00:18:31 2009
From: jgu at fedoraproject.org (Jonathan G. Underwood)
Date: Tue, 20 Jan 2009 00:18:31 +0000 (UTC)
Subject: rpms/dvipdfmx/F-10 dvipdfmx.spec,1.6,1.7 sources,1.4,1.5
Message-ID: <20090120001831.54F33700F9@cvs1.fedora.phx.redhat.com>

Author: jgu

Update of /cvs/extras/rpms/dvipdfmx/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9006

Modified Files:
	dvipdfmx.spec sources 
Log Message:
* Tue Jan 20 2009 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 0-0.26.20090115cvs
- Update to 20090115 snapshot



Index: dvipdfmx.spec
===================================================================
RCS file: /cvs/extras/rpms/dvipdfmx/F-10/dvipdfmx.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- dvipdfmx.spec	17 Jun 2008 22:43:44 -0000	1.6
+++ dvipdfmx.spec	20 Jan 2009 00:18:01 -0000	1.7
@@ -6,11 +6,11 @@
 %{!?_texmf_main: %define _texmf_main %{_datadir}/texmf}
 %{!?_texmf_conf: %define _texmf_conf %{_sysconfdir}/texmf}
 
-%define snapshot 20080617
+%define snapshot 20090115
 
 Name:           dvipdfmx
 Version:        0
-Release:        0.25.%{snapshot}cvs%{?dist}
+Release:        0.26.%{snapshot}cvs%{?dist}
 Summary:        A DVI to PDF translator
 
 Group:          Applications/Publishing
@@ -22,7 +22,7 @@
 # dvipdfm package. 
 # htps://bugzilla.redhat.com/show_bug.cgi?id=448347
 # Reported to upstream on 26th May 2008 via email
-Patch0:		dvipdfmx-%{snapshot}-ebb-to-ebbx.patch
+Patch0:		dvipdfmx-20080617-ebb-to-ebbx.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -98,6 +98,9 @@
 
 
 %changelog
+* Tue Jan 20 2009 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 0-0.26.20090115cvs
+- Update to 20090115 snapshot
+
 * Tue Jun 17 2008 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 0-0.25.20080617cvs
 - Rework ebb-to-ebbx patch for latest CVS snapshot
 - Fix files section


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/dvipdfmx/F-10/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	17 Jun 2008 22:14:55 -0000	1.4
+++ sources	20 Jan 2009 00:18:01 -0000	1.5
@@ -1 +1 @@
-189cca330fa680b226d0190e37c91748  dvipdfmx-20080617.tar.gz
+098cef238de53adc5e98fe56a451f6f7  dvipdfmx-20090115.tar.gz



From oget at fedoraproject.org  Tue Jan 20 00:29:56 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Tue, 20 Jan 2009 00:29:56 +0000 (UTC)
Subject: rpms/deco/F-10 .cvsignore, 1.2, 1.3 deco.spec, 1.1, 1.2 sources, 1.2,
	1.3
Message-ID: <20090120002956.693C3700F9@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/deco/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10187

Modified Files:
	.cvsignore deco.spec sources 
Log Message:
* Mon Jan 19 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 1.6-1
- Version update. Change in work flow for failed extractions.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/deco/F-10/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	4 Dec 2008 01:50:15 -0000	1.2
+++ .cvsignore	20 Jan 2009 00:29:26 -0000	1.3
@@ -1 +1 @@
-deco-1.5.7.tar.gz
+deco-1.6.tar.gz


Index: deco.spec
===================================================================
RCS file: /cvs/pkgs/rpms/deco/F-10/deco.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- deco.spec	4 Dec 2008 01:50:15 -0000	1.1
+++ deco.spec	20 Jan 2009 00:29:26 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           deco
-Version:        1.5.7
-Release:        2%{?dist}
+Version:        1.6
+Release:        1%{?dist}
 Summary:        Extractor for various archive file formats
 Group:          Applications/Archiving
 License:        GPLv3
@@ -38,17 +38,20 @@
 %dir %{_var}/lib/%{name}
 
 %changelog
-* Thu Nov 20 2008 Orcan Ogetbil <orcanbahri [AT] yahoo [DOT] com> 1.5.7-2
+* Mon Jan 19 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 1.6-1
+- Version update. Change in work flow for failed extractions.
+
+* Thu Nov 20 2008 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 1.5.7-2
 - License is GPLv3.
 - The extraction scripts will be inside %%{_var}/lib/%%{name}.
 
-* Wed Nov 19 2008 Orcan Ogetbil <orcanbahri [AT] yahoo [DOT] com> 1.5.7-1
+* Wed Nov 19 2008 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 1.5.7-1
 - Version update
 
-* Wed Oct 29 2008 Orcan Ogetbil <orcanbahri [AT] yahoo [DOT] com> 1.5.6-2
+* Wed Oct 29 2008 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 1.5.6-2
 - Package deco-archive separately
 
-* Tue Oct 28 2008 Orcan Ogetbil <orcanbahri [AT] yahoo [DOT] com> 1.5.6-1
+* Tue Oct 28 2008 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 1.5.6-1
 - Rebuild with version 1.5.6
 
 * Mon Apr 28 2008 Steve 'Ashcrow' Milner <stevem at gnulinux.net> - 0.8.1-2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/deco/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	4 Dec 2008 01:50:15 -0000	1.2
+++ sources	20 Jan 2009 00:29:26 -0000	1.3
@@ -1 +1 @@
-3dc4b91ede16b038877c9d2bd3a781a7  deco-1.5.7.tar.gz
+db5ed81f32e2d4f51db62edc2dcbc58c  deco-1.6.tar.gz



From oget at fedoraproject.org  Tue Jan 20 00:47:05 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Tue, 20 Jan 2009 00:47:05 +0000 (UTC)
Subject: rpms/deco/F-9 .cvsignore,1.2,1.3 deco.spec,1.2,1.3 sources,1.2,1.3
Message-ID: <20090120004705.8DAAD700F9@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/deco/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12162

Modified Files:
	.cvsignore deco.spec sources 
Log Message:
* Mon Jan 19 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 1.6-1
- Version update. Change in work flow for failed extractions.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/deco/F-9/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	4 Dec 2008 01:51:55 -0000	1.2
+++ .cvsignore	20 Jan 2009 00:46:35 -0000	1.3
@@ -1 +1 @@
-deco-1.5.7.tar.gz
+deco-1.6.tar.gz


Index: deco.spec
===================================================================
RCS file: /cvs/pkgs/rpms/deco/F-9/deco.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- deco.spec	4 Dec 2008 04:37:15 -0000	1.2
+++ deco.spec	20 Jan 2009 00:46:35 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           deco
-Version:        1.5.7
-Release:        2%{?dist}.1
+Version:        1.6
+Release:        1%{?dist}
 Summary:        Extractor for various archive file formats
 Group:          Applications/Archiving
 License:        GPLv3
@@ -38,20 +38,23 @@
 %dir %{_var}/lib/%{name}
 
 %changelog
-* Wed Dec 03 2008 Orcan Ogetbil <orcanbahri [AT] yahoo [DOT] com> 1.5.7-2.fc9.1
+* Mon Jan 19 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 1.6-1
+- Version update. Change in work flow for failed extractions.
+
+* Wed Dec 03 2008 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 1.5.7-2.fc9.1
 - Rebuild
 
-* Thu Nov 20 2008 Orcan Ogetbil <orcanbahri [AT] yahoo [DOT] com> 1.5.7-2
+* Thu Nov 20 2008 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 1.5.7-2
 - License is GPLv3.
 - The extraction scripts will be inside %%{_var}/lib/%%{name}.
 
-* Wed Nov 19 2008 Orcan Ogetbil <orcanbahri [AT] yahoo [DOT] com> 1.5.7-1
+* Wed Nov 19 2008 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 1.5.7-1
 - Version update
 
-* Wed Oct 29 2008 Orcan Ogetbil <orcanbahri [AT] yahoo [DOT] com> 1.5.6-2
+* Wed Oct 29 2008 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 1.5.6-2
 - Package deco-archive separately
 
-* Tue Oct 28 2008 Orcan Ogetbil <orcanbahri [AT] yahoo [DOT] com> 1.5.6-1
+* Tue Oct 28 2008 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 1.5.6-1
 - Rebuild with version 1.5.6
 
 * Mon Apr 28 2008 Steve 'Ashcrow' Milner <stevem at gnulinux.net> - 0.8.1-2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/deco/F-9/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	4 Dec 2008 01:51:55 -0000	1.2
+++ sources	20 Jan 2009 00:46:35 -0000	1.3
@@ -1 +1 @@
-3dc4b91ede16b038877c9d2bd3a781a7  deco-1.5.7.tar.gz
+db5ed81f32e2d4f51db62edc2dcbc58c  deco-1.6.tar.gz



From bpepple at fedoraproject.org  Tue Jan 20 01:03:34 2009
From: bpepple at fedoraproject.org (Brian Pepple)
Date: Tue, 20 Jan 2009 01:03:34 +0000 (UTC)
Subject: rpms/gupnp-igd/devel gupnp-igd.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090120010334.83F63700F9@cvs1.fedora.phx.redhat.com>

Author: bpepple

Update of /cvs/pkgs/rpms/gupnp-igd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14800/devel

Modified Files:
	.cvsignore sources 
Added Files:
	gupnp-igd.spec import.log 
Log Message:
Initial import.



--- NEW FILE gupnp-igd.spec ---
%define gupnp_ver 0.12.3
%define glib2_ver 2.14

Name:           gupnp-igd
Version:        0.1.1
Release:        2%{?dist}
Summary:	Library to handle UPnP IGD port mapping        

Group:          System Environment/Libraries
License:	LGPLv2+
URL:            http://www.gupnp.org/
Source0:        http://www.gupnp.org/sources/%{name}/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  glib2-devel >= %{glib2_ver}
BuildRequires:	gupnp-devel >= %{gupnp_ver}


%description
%{name} is a library to handle UPnP IGD port mapping.


%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
# quite rpmlint error about unused-direct-shlib-dependency
sed -i -e 's! -shared ! -Wl,--as-needed\0!g' libtool
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'


%clean
rm -rf $RPM_BUILD_ROOT


%post -p /sbin/ldconfig


%postun -p /sbin/ldconfig


%files
%defattr(-,root,root,-)
%doc README COPYING
%{_libdir}/*.so.*


%files devel
%defattr(-,root,root,-)
%{_includedir}/*
%{_libdir}/*.so
%{_libdir}/pkgconfig/%{name}-1.0*.pc
%{_datadir}/gtk-doc/html/%{name}/


%changelog
* Sun Jan 18 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.1.1-2
- Quite rpmlint error about unused-direct-shlib-dependency.

* Wed Dec 31 2008 Brian Pepple <bpepple at fedoraproject.org> - 0.1.1-1
- Initial Fedora spec.



--- NEW FILE import.log ---
gupnp-igd-0_1_1-2_fc10:HEAD:gupnp-igd-0.1.1-2.fc10.src.rpm:1232413374


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gupnp-igd/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	19 Jan 2009 22:59:01 -0000	1.1
+++ .cvsignore	20 Jan 2009 01:03:04 -0000	1.2
@@ -0,0 +1 @@
+gupnp-igd-0.1.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gupnp-igd/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	19 Jan 2009 22:59:01 -0000	1.1
+++ sources	20 Jan 2009 01:03:04 -0000	1.2
@@ -0,0 +1 @@
+9db86ff97c54ca89150c81009a8694d6  gupnp-igd-0.1.1.tar.gz



From mbarnes at fedoraproject.org  Tue Jan 20 01:08:46 2009
From: mbarnes at fedoraproject.org (Matthew Barnes)
Date: Tue, 20 Jan 2009 01:08:46 +0000 (UTC)
Subject: rpms/gtkhtml3/devel .cvsignore, 1.87, 1.88 gtkhtml3.spec, 1.138,
	1.139 sources, 1.87, 1.88 gtkhtml-3.25.4-compiler-warnings.patch,
	1.1, NONE
Message-ID: <20090120010846.E038D700F9@cvs1.fedora.phx.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/gtkhtml3/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15562

Modified Files:
	.cvsignore gtkhtml3.spec sources 
Removed Files:
	gtkhtml-3.25.4-compiler-warnings.patch 
Log Message:

* Mon Jan 19 2009 Matthew Barnes <mbarnes at redhat.com> - 3.25.5-1.fc11
- Update to 3.25.5



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gtkhtml3/devel/.cvsignore,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -r1.87 -r1.88
--- .cvsignore	5 Jan 2009 19:59:12 -0000	1.87
+++ .cvsignore	20 Jan 2009 01:08:16 -0000	1.88
@@ -1 +1 @@
-gtkhtml-3.25.4.tar.bz2
+gtkhtml-3.25.5.tar.bz2


Index: gtkhtml3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtkhtml3/devel/gtkhtml3.spec,v
retrieving revision 1.138
retrieving revision 1.139
diff -u -r1.138 -r1.139
--- gtkhtml3.spec	5 Jan 2009 19:59:12 -0000	1.138
+++ gtkhtml3.spec	20 Jan 2009 01:08:16 -0000	1.139
@@ -9,7 +9,7 @@
 ### Abstract ###
 
 Name: gtkhtml3
-Version: 3.25.4
+Version: 3.25.5
 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
 
-# Upstream carelessness.
-Patch2: gtkhtml-3.25.4-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 Jan 19 2009 Matthew Barnes <mbarnes at redhat.com> - 3.25.5-1.fc11
+- Update to 3.25.5
+
 * Mon Jan 05 2009 Matthew Barnes <mbarnes at redhat.com> - 3.25.4-1.fc11
 - Update to 3.25.4
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gtkhtml3/devel/sources,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -r1.87 -r1.88
--- sources	5 Jan 2009 19:59:12 -0000	1.87
+++ sources	20 Jan 2009 01:08:16 -0000	1.88
@@ -1 +1 @@
-fc91d5dd7c64b268b97d040f6c4fa07c  gtkhtml-3.25.4.tar.bz2
+25eb1b786c1772085c61eddf8607e5a4  gtkhtml-3.25.5.tar.bz2


--- gtkhtml-3.25.4-compiler-warnings.patch DELETED ---



From mbarnes at fedoraproject.org  Tue Jan 20 01:10:55 2009
From: mbarnes at fedoraproject.org (Matthew Barnes)
Date: Tue, 20 Jan 2009 01:10:55 +0000 (UTC)
Subject: rpms/gtkhtml3/devel gtkhtml3.spec,1.139,1.140
Message-ID: <20090120011055.E4428700F9@cvs1.fedora.phx.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/gtkhtml3/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15828

Modified Files:
	gtkhtml3.spec 
Log Message:

* Mon Jan 19 2009 Matthew Barnes <mbarnes at redhat.com> - 3.25.5-1.fc11
- Update to 3.25.5
- Bump gtk2_version to 2.14.0



Index: gtkhtml3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtkhtml3/devel/gtkhtml3.spec,v
retrieving revision 1.139
retrieving revision 1.140
diff -u -r1.139 -r1.140
--- gtkhtml3.spec	20 Jan 2009 01:08:16 -0000	1.139
+++ gtkhtml3.spec	20 Jan 2009 01:10:25 -0000	1.140
@@ -1,5 +1,5 @@
 %define gnome_icon_theme_version 2.22.0
-%define gtk2_version 2.12.0
+%define gtk2_version 2.14.0
 %define intltool_version 0.35.5
 %define gtkhtml_major 3.14
 
@@ -125,6 +125,7 @@
 %changelog
 * Mon Jan 19 2009 Matthew Barnes <mbarnes at redhat.com> - 3.25.5-1.fc11
 - Update to 3.25.5
+- Bump gtk2_version to 2.14.0
 
 * Mon Jan 05 2009 Matthew Barnes <mbarnes at redhat.com> - 3.25.4-1.fc11
 - Update to 3.25.4



From mbarnes at fedoraproject.org  Tue Jan 20 01:21:01 2009
From: mbarnes at fedoraproject.org (Matthew Barnes)
Date: Tue, 20 Jan 2009 01:21:01 +0000 (UTC)
Subject: rpms/evolution-data-server/devel .cvsignore, 1.99,
	1.100 evolution-data-server.spec, 1.244, 1.245 sources, 1.99, 1.100
Message-ID: <20090120012101.E76E8700F9@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-serv17601

Modified Files:
	.cvsignore evolution-data-server.spec sources 
Log Message:

* Mon Jan 19 2009 Matthew Barnes <mbarnes at redhat.com> - 2.25.5-1.fc11
- Update to 2.25.5
- Bump gtk2_version to 2.14.0.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-data-server/devel/.cvsignore,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -r1.99 -r1.100
--- .cvsignore	6 Jan 2009 01:53:33 -0000	1.99
+++ .cvsignore	20 Jan 2009 01:20:31 -0000	1.100
@@ -1 +1 @@
-evolution-data-server-2.25.4.tar.bz2
+evolution-data-server-2.25.5.tar.bz2


Index: evolution-data-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-data-server/devel/evolution-data-server.spec,v
retrieving revision 1.244
retrieving revision 1.245
diff -u -r1.244 -r1.245
--- evolution-data-server.spec	16 Jan 2009 11:45:43 -0000	1.244
+++ evolution-data-server.spec	20 Jan 2009 01:20:31 -0000	1.245
@@ -5,7 +5,7 @@
 %define nntp_support 1
 
 %define glib2_version 2.16.1
-%define gtk2_version 2.10.0
+%define gtk2_version 2.14.0
 %define gtk_doc_version 1.9
 %define intltool_version 0.35.5
 %define libbonobo_version 2.20.3
@@ -29,8 +29,8 @@
 ### Abstract ###
 
 Name: evolution-data-server
-Version: 2.25.4
-Release: 2%{?dist}
+Version: 2.25.5
+Release: 1%{?dist}
 License: LGPLv2
 Group: System Environment/Libraries
 Summary: Backend data server for Evolution
@@ -380,6 +380,10 @@
 %{_datadir}/gtk-doc/html/libedataserverui
 
 %changelog
+* Mon Jan 19 2009 Matthew Barnes <mbarnes at redhat.com> - 2.25.5-1.fc11
+- Update to 2.25.5
+- Bump gtk2_version to 2.14.0.
+
 * Fri Jan 16 2009 Tomas Mraz <tmraz at redhat.com> - 2.25.4-2.fc11
 - rebuild with new openssl
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-data-server/devel/sources,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -r1.99 -r1.100
--- sources	6 Jan 2009 01:53:33 -0000	1.99
+++ sources	20 Jan 2009 01:20:31 -0000	1.100
@@ -1 +1 @@
-714baf1349f75b8a94b7dc0a8e594781  evolution-data-server-2.25.4.tar.bz2
+5f13cc08d257a049ff0475ad0a2f027b  evolution-data-server-2.25.5.tar.bz2



From mbarnes at fedoraproject.org  Tue Jan 20 01:37:37 2009
From: mbarnes at fedoraproject.org (Matthew Barnes)
Date: Tue, 20 Jan 2009 01:37:37 +0000 (UTC)
Subject: rpms/evolution/devel .cvsignore, 1.104, 1.105 evolution.spec, 1.366,
	1.367 sources, 1.104, 1.105
Message-ID: <20090120013737.C4219700F9@cvs1.fedora.phx.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/evolution/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19512

Modified Files:
	.cvsignore evolution.spec sources 
Log Message:

* Mon Jan 19 2009 Matthew Barnes <mbarnes at redhat.com> - 2.25.5-1.fc11
- Update to 2.25.5
- Ditch eds_version and use our own version.  This will keep evolution
  and evolution-data-server versions in lockstep from now on.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/.cvsignore,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -r1.104 -r1.105
--- .cvsignore	6 Jan 2009 13:53:56 -0000	1.104
+++ .cvsignore	20 Jan 2009 01:37:07 -0000	1.105
@@ -1 +1 @@
-evolution-2.25.4.tar.bz2
+evolution-2.25.5.tar.bz2


Index: evolution.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/evolution.spec,v
retrieving revision 1.366
retrieving revision 1.367
diff -u -r1.366 -r1.367
--- evolution.spec	6 Jan 2009 13:53:56 -0000	1.366
+++ evolution.spec	20 Jan 2009 01:37:07 -0000	1.367
@@ -1,6 +1,5 @@
 %define dbus_glib_version 0.70
 %define dbus_version 1.0
-%define eds_version 2.25.4
 %define glib2_version 2.16.0
 %define gnome_doc_utils_version 0.8.0
 %define gnome_icon_theme_version 2.19.91
@@ -45,7 +44,7 @@
 ### Abstract ###
 
 Name: evolution
-Version: 2.25.4
+Version: 2.25.5
 Release: 1%{?dist}
 License: GPLv2 and GFDL
 Group: Applications/Productivity
@@ -89,7 +88,7 @@
 Requires(postun): scrollkeeper >= %{scrollkeeper_version}
 
 # Don't trust evolution-data-server to maintain accurate sonames.
-Requires: evolution-data-server >= %{eds_version}
+Requires: evolution-data-server >= %{version}
 
 Requires: gnome-icon-theme >= %{gnome_icon_theme_version}
 Requires: gnome-themes
@@ -106,7 +105,7 @@
 BuildRequires: dbus-devel >= %{dbus_version}
 BuildRequires: dbus-glib-devel >= %{dbus_glib_version}
 BuildRequires: desktop-file-utils
-BuildRequires: evolution-data-server-devel >= %{eds_version}
+BuildRequires: evolution-data-server-devel >= %{version}
 BuildRequires: flex
 BuildRequires: gettext
 BuildRequires: glib2-devel >= %{glib2_version}
@@ -172,7 +171,7 @@
 Group: Development/Libraries
 Summary: Development files for building against %{name}
 Requires: %{name} = %{version}-%{release}
-Requires: evolution-data-server-devel >= %{eds_version}
+Requires: evolution-data-server-devel >= %{version}
 Requires: gtk2-devel >= %{gtk2_version}
 Requires: gtkhtml3-devel >= %{gtkhtml_version}
 Requires: libbonobo-devel >= %{libbonobo_version}
@@ -704,6 +703,11 @@
 %{_libexecdir}/evolution/%{evo_major}/evolution-addressbook-clean
 
 %changelog
+* Mon Jan 19 2009 Matthew Barnes <mbarnes at redhat.com> - 2.25.5-1.fc11
+- Update to 2.25.5
+- Ditch eds_version and use our own version.  This will keep evolution
+  and evolution-data-server versions in lockstep from now on.
+
 * Mon Jan 05 2009 Matthew Barnes <mbarnes at redhat.com> - 2.25.4-1.fc11
 - Update to 2.25.4
 - Bump eds_version to 2.25.4.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/sources,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -r1.104 -r1.105
--- sources	6 Jan 2009 13:53:57 -0000	1.104
+++ sources	20 Jan 2009 01:37:07 -0000	1.105
@@ -1 +1 @@
-8f9d4fb91c10c9d5ba8cc032c1129ee6  evolution-2.25.4.tar.bz2
+99172fb2a973a35cb5d60b39a2a3683f  evolution-2.25.5.tar.bz2



From mbarnes at fedoraproject.org  Tue Jan 20 01:38:10 2009
From: mbarnes at fedoraproject.org (Matthew Barnes)
Date: Tue, 20 Jan 2009 01:38:10 +0000 (UTC)
Subject: rpms/evolution-exchange/devel .cvsignore, 1.35,
	1.36 evolution-exchange.spec, 1.51, 1.52 sources, 1.35,
	1.36 evolution-exchange-2.25.4-compiler-warnings.patch, 1.1, NONE
Message-ID: <20090120013810.CBC64700F9@cvs1.fedora.phx.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/evolution-exchange/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19588

Modified Files:
	.cvsignore evolution-exchange.spec sources 
Removed Files:
	evolution-exchange-2.25.4-compiler-warnings.patch 
Log Message:

* Mon Jan 19 2009 Matthew Barnes <mbarnes at redhat.com> - 2.25.5-1.fc11
- Update to 2.25.5
- Ditch eds_version and evo_version and use our own version.  This will
  keep evolution, evolution-exchange and evolution-data-server versions
  in lockstep from now on.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-exchange/devel/.cvsignore,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- .cvsignore	6 Jan 2009 15:45:31 -0000	1.35
+++ .cvsignore	20 Jan 2009 01:37:40 -0000	1.36
@@ -1 +1 @@
-evolution-exchange-2.25.4.tar.bz2
+evolution-exchange-2.25.5.tar.bz2


Index: evolution-exchange.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-exchange/devel/evolution-exchange.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- evolution-exchange.spec	16 Jan 2009 11:46:08 -0000	1.51
+++ evolution-exchange.spec	20 Jan 2009 01:37:40 -0000	1.52
@@ -1,5 +1,3 @@
-%define evo_version 2.25.1
-%define eds_version 2.25.1
 %define intltool_version 0.35.5
 %define libsoup_version 2.3.0
 
@@ -22,8 +20,8 @@
 ### Abstract ###
 
 Name: evolution-exchange
-Version: 2.25.4
-Release: 2%{?dist}
+Version: 2.25.5
+Release: 1%{?dist}
 License: GPLv2
 Group: Applications/Productivity
 Summary: Evolution plugin to interact with MS Exchange Server
@@ -44,8 +42,6 @@
 # GNOME bug #443022
 Patch13: evolution-exchange-2.11.2-fix-library-order.patch
 
-Patch14: evolution-exchange-2.25.4-compiler-warnings.patch
-
 ### Dependencies ###
 
 Requires: gnutls
@@ -56,8 +52,8 @@
 BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: db4-devel
-BuildRequires: evolution-data-server-devel >= %{eds_version}
-BuildRequires: evolution-devel >= %{evo_version}
+BuildRequires: evolution-data-server-devel >= %{version}
+BuildRequires: evolution-devel >= %{version}
 BuildRequires: gettext
 BuildRequires: gnutls-devel
 BuildRequires: gtk-doc
@@ -77,7 +73,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"
@@ -159,6 +154,12 @@
 %{_sysconfdir}/gconf/schemas/apps_exchange_addressbook-%{evo_major}.schemas
 
 %changelog
+* Mon Jan 19 2009 Matthew Barnes <mbarnes at redhat.com> - 2.25.5-1.fc11
+- Update to 2.25.5
+- Ditch eds_version and evo_version and use our own version.  This will
+  keep evolution, evolution-exchange and evolution-data-server versions
+  in lockstep from now on.
+
 * Fri Jan 16 2009 Tomas Mraz <tmraz at redhat.com> - 2.25.4-2.fc11
 - rebuild with new openssl
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-exchange/devel/sources,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- sources	6 Jan 2009 15:45:31 -0000	1.35
+++ sources	20 Jan 2009 01:37:40 -0000	1.36
@@ -1 +1 @@
-d408c90c60752841b07751b0200b797a  evolution-exchange-2.25.4.tar.bz2
+3551d79e8dc40ce928e5f3e4a6965ca3  evolution-exchange-2.25.5.tar.bz2


--- evolution-exchange-2.25.4-compiler-warnings.patch DELETED ---



From pkgdb at fedoraproject.org  Tue Jan 20 01:40:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Jan 2009 01:40:21 +0000
Subject: [pkgdb] ocaml-facile had acl change status
Message-ID: <20090120014022.B1047208471@bastion.fedora.phx.redhat.com>

kkofler has set the watchbugzilla acl on ocaml-facile (Fedora devel) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-facile



From pkgdb at fedoraproject.org  Tue Jan 20 01:40:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Jan 2009 01:40:28 +0000
Subject: [pkgdb] ocaml-facile had acl change status
Message-ID: <20090120014029.01CD4208475@bastion.fedora.phx.redhat.com>

kkofler has set the watchcommits acl on ocaml-facile (Fedora devel) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-facile



From pkgdb at fedoraproject.org  Tue Jan 20 01:40:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Jan 2009 01:40:37 +0000
Subject: [pkgdb] ocaml-facile had acl change status
Message-ID: <20090120014037.2E517208472@bastion.fedora.phx.redhat.com>

kkofler has set the watchbugzilla acl on ocaml-facile (Fedora 10) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-facile



From pkgdb at fedoraproject.org  Tue Jan 20 01:40:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Jan 2009 01:40:38 +0000
Subject: [pkgdb] ocaml-facile had acl change status
Message-ID: <20090120014038.4FB60208478@bastion.fedora.phx.redhat.com>

kkofler has set the watchcommits acl on ocaml-facile (Fedora 10) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-facile



From pkgdb at fedoraproject.org  Tue Jan 20 01:40:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Jan 2009 01:40:41 +0000
Subject: [pkgdb] ocaml-facile had acl change status
Message-ID: <20090120014041.4F66120847B@bastion.fedora.phx.redhat.com>

kkofler has set the watchbugzilla acl on ocaml-facile (Fedora 9) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-facile



From pkgdb at fedoraproject.org  Tue Jan 20 01:40:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Jan 2009 01:40:44 +0000
Subject: [pkgdb] ocaml-facile had acl change status
Message-ID: <20090120014044.32DED208473@bastion.fedora.phx.redhat.com>

kkofler has set the watchcommits acl on ocaml-facile (Fedora 9) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ocaml-facile



From mbarnes at fedoraproject.org  Tue Jan 20 01:43:42 2009
From: mbarnes at fedoraproject.org (Matthew Barnes)
Date: Tue, 20 Jan 2009 01:43:42 +0000 (UTC)
Subject: rpms/devhelp/devel .cvsignore, 1.22, 1.23 devhelp.spec, 1.101,
	1.102 sources, 1.22, 1.23
Message-ID: <20090120014342.11F7C700F9@cvs1.fedora.phx.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/devhelp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20495

Modified Files:
	.cvsignore devhelp.spec sources 
Log Message:

* Mon Jan 19 2009 Matthew Barnes <mbarnes at redhat.com> - 0.23-1
- Update to 0.23



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/devhelp/devel/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- .cvsignore	1 Dec 2008 20:27:10 -0000	1.22
+++ .cvsignore	20 Jan 2009 01:43:11 -0000	1.23
@@ -1 +1 @@
-devhelp-0.22.tar.bz2
+devhelp-0.23.tar.bz2


Index: devhelp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/devhelp/devel/devhelp.spec,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -r1.101 -r1.102
--- devhelp.spec	5 Dec 2008 15:06:58 -0000	1.101
+++ devhelp.spec	20 Jan 2009 01:43:11 -0000	1.102
@@ -5,8 +5,8 @@
 ### Abstract ###
 
 Name: devhelp
-Version: 0.22
-Release: 2%{?dist}
+Version: 0.23
+Release: 1%{?dist}
 License: GPLv2+
 Group: Development/Tools
 Summary: API documention browser
@@ -134,7 +134,10 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
-* Fri Dec 05 2008 Matthew Barnes <mbarnes at redhat.com> - 0.22.2
+* Mon Jan 19 2009 Matthew Barnes <mbarnes at redhat.com> - 0.23-1
+- Update to 0.23
+
+* Fri Dec 05 2008 Matthew Barnes <mbarnes at redhat.com> - 0.22-2
 - Drop the gecko requirement, since it uses WebKit now.
 
 * Mon Dec 01 2008 Matthew Barnes <mbarnes at redhat.com> - 0.22-1


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/devhelp/devel/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- sources	1 Dec 2008 20:27:10 -0000	1.22
+++ sources	20 Jan 2009 01:43:11 -0000	1.23
@@ -1 +1 @@
-7cdd0688dba0184b6dd2688532af24cb  devhelp-0.22.tar.bz2
+704c0c90616aeb1c52ca3af1df93fde6  devhelp-0.23.tar.bz2



From mbarnes at fedoraproject.org  Tue Jan 20 01:46:16 2009
From: mbarnes at fedoraproject.org (Matthew Barnes)
Date: Tue, 20 Jan 2009 01:46:16 +0000 (UTC)
Subject: rpms/evolution-sharp/devel evolution-sharp.spec,1.57,1.58
Message-ID: <20090120014616.B9A9C700F9@cvs1.fedora.phx.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/evolution-sharp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20790

Modified Files:
	evolution-sharp.spec 
Log Message:

* Mon Jan 19 2009 Matthew Barnes <mbarnes at redhat.com> - 0.19.1-1.fc11
- Update to 0.19.1



Index: evolution-sharp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-sharp/devel/evolution-sharp.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- evolution-sharp.spec	25 Sep 2008 14:36:07 -0000	1.57
+++ evolution-sharp.spec	20 Jan 2009 01:45:46 -0000	1.58
@@ -1,7 +1,7 @@
 ### Abstract ###
 
 Name: evolution-sharp
-Version: 0.18.0
+Version: 0.19.1
 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
+* Mon Jan 19 2009 Matthew Barnes <mbarnes at redhat.com> - 0.19.1-1.fc11
+- Update to 0.19.1
+
 * Thu Sep 25 2008 Matthew Barnes <mbarnes at redhat.com> - 0.18.0-1.fc10
 - Update to 0.18.0
 



From rstrode at fedoraproject.org  Tue Jan 20 01:49:36 2009
From: rstrode at fedoraproject.org (Ray Strode)
Date: Tue, 20 Jan 2009 01:49:36 +0000 (UTC)
Subject: rpms/gnome-desktop/devel .cvsignore, 1.77, 1.78 gnome-desktop.spec, 
	1.196, 1.197 sources, 1.77,
	1.78 gnome-desktop-2.25.1.1-fade.patch, 1.6, NONE
Message-ID: <20090120014936.7AF47700F9@cvs1.fedora.phx.redhat.com>

Author: rstrode

Update of /cvs/pkgs/rpms/gnome-desktop/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21826

Modified Files:
	.cvsignore gnome-desktop.spec sources 
Removed Files:
	gnome-desktop-2.25.1.1-fade.patch 
Log Message:
- Update to 2.25.5



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-desktop/devel/.cvsignore,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- .cvsignore	6 Jan 2009 17:01:16 -0000	1.77
+++ .cvsignore	20 Jan 2009 01:49:06 -0000	1.78
@@ -1 +1 @@
-gnome-desktop-2.25.4.tar.bz2
+gnome-desktop-2.25.5.tar.bz2


Index: gnome-desktop.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-desktop/devel/gnome-desktop.spec,v
retrieving revision 1.196
retrieving revision 1.197
diff -u -r1.196 -r1.197
--- gnome-desktop.spec	6 Jan 2009 17:01:16 -0000	1.196
+++ gnome-desktop.spec	20 Jan 2009 01:49:06 -0000	1.197
@@ -11,7 +11,7 @@
 
 Summary: Package containing code shared among gnome-panel, gnome-session, nautilus, etc
 Name: gnome-desktop
-Version: 2.25.4
+Version: 2.25.5
 Release: 1%{?dist}
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/gnome-desktop/2.25/%{name}-%{version}.tar.bz2
@@ -19,9 +19,6 @@
 Group: System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-# http://bugzilla.gnome.org/show_bug.cgi?id=552856
-Patch4: gnome-desktop-2.25.1.1-fade.patch
-
 Requires: redhat-menus
 Requires: pycairo
 Requires: pygtk2
@@ -76,7 +73,6 @@
 
 %prep
 %setup -q
-%patch4 -p1 -b .fade
 
 autoreconf -i -f
 
@@ -124,6 +120,9 @@
 %doc %{_datadir}/gtk-doc/html/gnome-desktop/
 
 %changelog
+* Mon Jan 19 2009 Ray Strode <rstrode at redhat.com> - 2.25.5-1
+- Update to 2.25.5
+
 * Tue Jan  6 2009 Matthias Clasen <mclasen at redhat.com> - 2.25.4-1
 - Update to 2.25.4
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-desktop/devel/sources,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- sources	6 Jan 2009 17:01:16 -0000	1.77
+++ sources	20 Jan 2009 01:49:06 -0000	1.78
@@ -1 +1 @@
-34949b416ba1b4cf72c763f05ecf3380  gnome-desktop-2.25.4.tar.bz2
+675f094ffd22a93ae3b64acbadae300e  gnome-desktop-2.25.5.tar.bz2


--- gnome-desktop-2.25.1.1-fade.patch DELETED ---



From dp67 at fedoraproject.org  Tue Jan 20 02:00:26 2009
From: dp67 at fedoraproject.org (Randy Berry)
Date: Tue, 20 Jan 2009 02:00:26 +0000 (UTC)
Subject: rpms/fldigi/devel import.log, NONE, 1.1 .cvsignore, 1.7,
	1.8 fldigi.spec, 1.8, 1.9 sources, 1.7, 1.8
Message-ID: <20090120020026.3C736700F9@cvs1.fedora.phx.redhat.com>

Author: dp67

Update of /cvs/pkgs/rpms/fldigi/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23324/devel

Modified Files:
	.cvsignore fldigi.spec sources 
Added Files:
	import.log 
Log Message:
Upstream update 3.10


--- NEW FILE import.log ---
fldigi-3_10-1_fc10:HEAD:fldigi-3.10-1.fc10.src.rpm:1232416769


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fldigi/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	13 Dec 2008 09:14:30 -0000	1.7
+++ .cvsignore	20 Jan 2009 01:59:55 -0000	1.8
@@ -1 +1 @@
-fldigi-3.03.tar.gz
+fldigi-3.10.tar.gz


Index: fldigi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fldigi/devel/fldigi.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- fldigi.spec	13 Dec 2008 09:14:30 -0000	1.8
+++ fldigi.spec	20 Jan 2009 01:59:55 -0000	1.9
@@ -1,13 +1,13 @@
-Name:           fldigi
-Version:        3.03
-Release:        1%{?dist}
-Summary:        Digital modem program for Linux
-
-Group:          Applications/Communications
-License:        GPLv2+	
-URL:            http://www.w1hkj.com/fldigi-distro/
-Source0:        http://www.w1hkj.com/fldigi-distro/%{name}-%{version}.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Name:		fldigi
+Version:	3.10
+Release:	1%{?dist}
+Summary:	Digital modem program for Linux
+
+Group:		Applications/Communications
+License:	GPLv2+	
+URL:		http://www.w1hkj.com/fldigi-distro/
+Source0:	http://www.w1hkj.com/fldigi-distro/%{name}-%{version}.tar.gz
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  hamlib-devel, fltk-devel, libjpeg-devel, libpng-devel
 BuildRequires:  portaudio-devel >= 19-4, libsndfile-devel , desktop-file-utils
@@ -23,24 +23,24 @@
 %prep
 %setup -q
 
-
 %build
 %configure
-make %{?_smp_mflags}
-
+make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS"
 
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 desktop-file-install --vendor="" \
-  --dir=${RPM_BUILD_ROOT}%{_datadir}/applications \
+	--dir=${RPM_BUILD_ROOT}%{_datadir}/applications \
   $RPM_BUILD_ROOT%{_datadir}/applications/fldigi.desktop
+# --vendor obsolete per new guidlines but leaving it in because
+# this is an existing package with vendor previously installed
+%find_lang %{name}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-
-%files
+%files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING README
 %{_bindir}/*
@@ -48,10 +48,11 @@
 %attr(0644,root,root) %{_datadir}/applications/%{name}.desktop
 
 %changelog
+* Mon Jan 19 2009 Randall J Berry 'Dp67' <dp67 at fedoraproject.org> 3.10-1
+- New upstream release
 * Thu Dec 14 2008 Sindre Pedersen Bj??rdal <sindrepb at fedoraproject.org> 3.03-1
 - New upstream release
 - Remove explicit libsamplerate dependency
-
 * Fri Aug 22 2008 Steve Conklin <fedora at conklinhouse.com> - 3.01-1
 - Latest upstream
 * Mon Apr  7 2008 Steve Conklin <steve at conklinhouse.com> - 2.10.3-1


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fldigi/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	13 Dec 2008 09:14:30 -0000	1.7
+++ sources	20 Jan 2009 01:59:55 -0000	1.8
@@ -1 +1 @@
-0e457ce794ceaeb87a5513fa331d2c6d  fldigi-3.03.tar.gz
+eb8eb8ff6d750eadfaa8804998d733c2  fldigi-3.10.tar.gz



From oget at fedoraproject.org  Tue Jan 20 02:01:10 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Tue, 20 Jan 2009 02:01:10 +0000 (UTC)
Subject: rpms/deco-archive/devel deco-archive-shn.diff, NONE, 1.1 .cvsignore,
	1.3, 1.4 deco-archive.spec, 1.2, 1.3 sources, 1.3, 1.4
Message-ID: <20090120020110.72304700F9@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/deco-archive/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23530

Modified Files:
	.cvsignore deco-archive.spec sources 
Added Files:
	deco-archive-shn.diff 
Log Message:
* Mon Jan 19 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 1.4
- Version update. New extensions: gem and tbz2
- Handle .shn format (shorten) with ffmpeg (if installed)
- Handle .alz format with unalz (if installed)


deco-archive-shn.diff:

--- NEW FILE deco-archive-shn.diff ---
diff -rupN deco-archive-1.4.old/shn/extract deco-archive-1.4/shn/extract
--- deco-archive-1.4.old/shn/extract	2009-01-18 08:04:29.000000000 -0500
+++ deco-archive-1.4/shn/extract	2009-01-19 11:14:07.000000000 -0500
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-exec shorten -x "$1"
+exec ffmpeg -i "$1" "$Name".wav 2>/dev/null


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/deco-archive/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	13 Dec 2008 22:37:17 -0000	1.3
+++ .cvsignore	20 Jan 2009 02:00:40 -0000	1.4
@@ -1 +1 @@
-deco-archive-1.3.1.tar.gz
+deco-archive-1.4.tar.gz


Index: deco-archive.spec
===================================================================
RCS file: /cvs/pkgs/rpms/deco-archive/devel/deco-archive.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- deco-archive.spec	13 Dec 2008 22:37:17 -0000	1.2
+++ deco-archive.spec	20 Jan 2009 02:00:40 -0000	1.3
@@ -1,5 +1,5 @@
 Name:           deco-archive
-Version:        1.3.1
+Version:        1.4
 Release:        1%{?dist}
 Summary:        Extraction scripts for various archive formats for use of deco
 Group:          Applications/Archiving
@@ -9,6 +9,9 @@
 # Use ffmpeg instead of wine+Monkey's Audio for converting ape to wav.
 # Patch sent to upstream via email
 Patch0:         deco-archive-ape.diff
+# Use ffmpeg instead of non-free shorten decoder, which is not available
+# in Fedora
+Patch1:         deco-archive-shn.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
@@ -22,6 +25,7 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 echo "Nothing to build."
@@ -40,7 +44,7 @@
    if [[ -d $i || -h $i ]] ; then
       ln -s ../../..%{_datadir}/%{name}/"$i" %{buildroot}/%{_var}/lib/deco
       case $i in
-         bz2|cpio|gz|rpm|z|tar|"tar\.bz2"|"tar\.gz"|"tar\.z"|taz|tbz|tgz)
+         bz2|cpio|gem|gz|rpm|z|tar|"tar\.bz2"|"tar\.gz"|"tar\.z"|taz|tbz|tbz2|tgz)
             echo "%{_var}/lib/deco/$i" >> %{name}-links.list ;;
          *)
             echo "%ghost %{_var}/lib/deco/$i" >> %{name}-ghosts.list ;;
@@ -57,7 +61,7 @@
 %define do_triggerun() ( [ $2 -gt 0 ] && [ $1 -gt 0 ] ) || (for i in %1; do ( rm -f %{_var}/lib/deco/$i || : ); done;)
 
 # Not handled (yet?):
-# alz (unalz), dpkg-deb (deb,udeb), shn (shorten), zoo
+# dpkg-deb (deb,udeb), zoo
 
 %triggerin -- binutils
 %do_triggerin {a,ar}
@@ -75,9 +79,9 @@
 %do_triggerun "ace|[c0-9][0-9]{2}"
 
 %triggerin -- ffmpeg
-%do_triggerin ape
+%do_triggerin {ape,shn}
 %triggerun -- ffmpeg
-%do_triggerun ape
+%do_triggerun {ape,shn}
 
 %triggerin -- arc
 %do_triggerin {arc,ark,sue}
@@ -139,33 +143,43 @@
 %triggerun -- rzip
 %do_triggerun {rz,"tar\.rz"}
 
+%triggerin -- unalz
+%do_triggerin alz
+%triggerun -- unalz
+%do_triggerun alz
+
 %files -f %{name}.files
 %defattr(-,root,root,-)
 %doc LICENSE CREDITS NEWS README
 %{_datadir}/%{name}
 
 %changelog
-* Fri Dec 12 2008 Orcan Ogetbil <orcanbahri [AT] yahoo [DOT] com> 1.3.1-1
+* Mon Jan 19 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 1.4
+- Version update. New extensions: gem and tbz2
+- Handle .shn format (shorten) with ffmpeg (if installed)
+- Handle .alz format with unalz (if installed)
+
+* Fri Dec 12 2008 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 1.3.1-1
 - Version update
 - Use ffmpeg instead of wine+Monkey's Audio for converting ape to wav
 
-* Mon Dec 01 2008 Orcan Ogetbil <orcanbahri [AT] yahoo [DOT] com> 1.2-6
+* Mon Dec 01 2008 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 1.2-6
 - Code cleanup
 
-* Sun Nov 30 2008 Orcan Ogetbil <orcanbahri [AT] yahoo [DOT] com> 1.2-5
+* Sun Nov 30 2008 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 1.2-5
 - Workaround for the "broken ghosts".
 
-* Sun Nov 30 2008 Orcan Ogetbil <orcanbahri [AT] yahoo [DOT] com> 1.2-4
+* Sun Nov 30 2008 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 1.2-4
 - Fixed a typo in the %%do_trigger* of tar\.lzma
 - Added rpm to the default list
 - Attempted to mark the non-default archivers as ghosts
 
-* Thu Nov 20 2008 Orcan Ogetbil <orcanbahri [AT] yahoo [DOT] com> 1.2-3
+* Thu Nov 20 2008 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 1.2-3
 - License is GPLv3.
 - Install the scripts in %%{_datadir}/%%{name} and the symlinks in %%{var}/lib/deco.
 
-* Wed Nov 19 2008 Orcan Ogetbil <orcanbahri [AT] yahoo [DOT] com> 1.2-2
+* Wed Nov 19 2008 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 1.2-2
 - Added conditionals to the trigger functions to suppress warnings on updates.
 
-* Wed Oct 29 2008 Orcan Ogetbil <orcanbahri [AT] yahoo [DOT] com> 1.2-1
+* Wed Oct 29 2008 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 1.2-1
 - Initial build.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/deco-archive/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	13 Dec 2008 22:37:17 -0000	1.3
+++ sources	20 Jan 2009 02:00:40 -0000	1.4
@@ -1 +1 @@
-a1ede492c99803bdd134bff280256074  deco-archive-1.3.1.tar.gz
+b48cd159fb73a65a4d6e491351c2e57e  deco-archive-1.4.tar.gz



From rstrode at fedoraproject.org  Tue Jan 20 02:04:55 2009
From: rstrode at fedoraproject.org (Ray Strode)
Date: Tue, 20 Jan 2009 02:04:55 +0000 (UTC)
Subject: rpms/gnome-settings-daemon/devel
	gnome-settings-daemon-2.25.2-fade.patch, 1.1,
	1.2 gnome-settings-daemon.spec, 1.90, 1.91
Message-ID: <20090120020455.F32E3700F9@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-serv24105

Modified Files:
	gnome-settings-daemon-2.25.2-fade.patch 
	gnome-settings-daemon.spec 
Log Message:
- Update fade patch for new gnome-desktop release


gnome-settings-daemon-2.25.2-fade.patch:

Index: gnome-settings-daemon-2.25.2-fade.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-settings-daemon/devel/gnome-settings-daemon-2.25.2-fade.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gnome-settings-daemon-2.25.2-fade.patch	4 Dec 2008 19:50:11 -0000	1.1
+++ gnome-settings-daemon-2.25.2-fade.patch	20 Jan 2009 02:04:25 -0000	1.2
@@ -45,7 +45,7 @@
 +                if (use_crossfade) {
 +                        GnomeBGCrossfade *fade;
 +
-+                        fade = gnome_bg_set_pixmap_as_root_with_crossfade (screen, pixmap, NULL);
++                        fade = gnome_bg_set_pixmap_as_root_with_crossfade (screen, pixmap);
 +                        g_signal_connect (fade, "finished",
 +                                          G_CALLBACK (g_object_unref), NULL);
 +                } else {


Index: gnome-settings-daemon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-settings-daemon/devel/gnome-settings-daemon.spec,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -r1.90 -r1.91
--- gnome-settings-daemon.spec	18 Dec 2008 19:22:35 -0000	1.90
+++ gnome-settings-daemon.spec	20 Jan 2009 02:04:25 -0000	1.91
@@ -1,6 +1,6 @@
 Name:		gnome-settings-daemon
 Version:	2.25.3
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	The daemon sharing settings from GNOME to GTK+/KDE applications
 
 Group:		System Environment/Daemons
@@ -170,6 +170,9 @@
 %{_libdir}/pkgconfig/gnome-settings-daemon.pc
 
 %changelog
+* Mon Jan 19 2009 - Ray Strode <rstrode at redhat.com> - 2.25.3-4
+- Update fade patch for new gnome-desktop release
+
 * Thu Dec 18 2008 - Bastien Nocera <bnocera at redhat.com> - 2.25.3-3
 - Rebuild
 



From oget at fedoraproject.org  Tue Jan 20 02:10:06 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Tue, 20 Jan 2009 02:10:06 +0000 (UTC)
Subject: rpms/deco-archive/F-10 deco-archive-shn.diff, NONE, 1.1 .cvsignore, 
	1.3, 1.4 deco-archive.spec, 1.3, 1.4 sources, 1.3, 1.4
Message-ID: <20090120021006.D71A8700F9@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/deco-archive/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24898

Modified Files:
	.cvsignore deco-archive.spec sources 
Added Files:
	deco-archive-shn.diff 
Log Message:
* Mon Jan 19 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 1.4
- Version update. New extensions: gem and tbz2
- Handle .shn format (shorten) with ffmpeg (if installed)
- Handle .alz format with unalz (if installed)


deco-archive-shn.diff:

--- NEW FILE deco-archive-shn.diff ---
diff -rupN deco-archive-1.4.old/shn/extract deco-archive-1.4/shn/extract
--- deco-archive-1.4.old/shn/extract	2009-01-18 08:04:29.000000000 -0500
+++ deco-archive-1.4/shn/extract	2009-01-19 11:14:07.000000000 -0500
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-exec shorten -x "$1"
+exec ffmpeg -i "$1" "$Name".wav 2>/dev/null


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/deco-archive/F-10/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	13 Dec 2008 22:47:30 -0000	1.3
+++ .cvsignore	20 Jan 2009 02:09:36 -0000	1.4
@@ -1 +1 @@
-deco-archive-1.3.1.tar.gz
+deco-archive-1.4.tar.gz


Index: deco-archive.spec
===================================================================
RCS file: /cvs/pkgs/rpms/deco-archive/F-10/deco-archive.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- deco-archive.spec	13 Dec 2008 22:52:17 -0000	1.3
+++ deco-archive.spec	20 Jan 2009 02:09:36 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           deco-archive
-Version:        1.3.1
-Release:        1%{?dist}.1
+Version:        1.4
+Release:        1%{?dist}
 Summary:        Extraction scripts for various archive formats for use of deco
 Group:          Applications/Archiving
 License:        GPLv3
@@ -9,6 +9,9 @@
 # Use ffmpeg instead of wine+Monkey's Audio for converting ape to wav.
 # Patch sent to upstream via email
 Patch0:         deco-archive-ape.diff
+# Use ffmpeg instead of non-free shorten decoder, which is not available
+# in Fedora
+Patch1:         deco-archive-shn.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
@@ -22,6 +25,7 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 echo "Nothing to build."
@@ -40,7 +44,7 @@
    if [[ -d $i || -h $i ]] ; then
       ln -s ../../..%{_datadir}/%{name}/"$i" %{buildroot}/%{_var}/lib/deco
       case $i in
-         bz2|cpio|gz|rpm|z|tar|"tar\.bz2"|"tar\.gz"|"tar\.z"|taz|tbz|tgz)
+         bz2|cpio|gem|gz|rpm|z|tar|"tar\.bz2"|"tar\.gz"|"tar\.z"|taz|tbz|tbz2|tgz)
             echo "%{_var}/lib/deco/$i" >> %{name}-links.list ;;
          *)
             echo "%ghost %{_var}/lib/deco/$i" >> %{name}-ghosts.list ;;
@@ -57,7 +61,7 @@
 %define do_triggerun() ( [ $2 -gt 0 ] && [ $1 -gt 0 ] ) || (for i in %1; do ( rm -f %{_var}/lib/deco/$i || : ); done;)
 
 # Not handled (yet?):
-# alz (unalz), dpkg-deb (deb,udeb), shn (shorten), zoo
+# dpkg-deb (deb,udeb), zoo
 
 %triggerin -- binutils
 %do_triggerin {a,ar}
@@ -75,9 +79,9 @@
 %do_triggerun "ace|[c0-9][0-9]{2}"
 
 %triggerin -- ffmpeg
-%do_triggerin ape
+%do_triggerin {ape,shn}
 %triggerun -- ffmpeg
-%do_triggerun ape
+%do_triggerun {ape,shn}
 
 %triggerin -- arc
 %do_triggerin {arc,ark,sue}
@@ -139,36 +143,46 @@
 %triggerun -- rzip
 %do_triggerun {rz,"tar\.rz"}
 
+%triggerin -- unalz
+%do_triggerin alz
+%triggerun -- unalz
+%do_triggerun alz
+
 %files -f %{name}.files
 %defattr(-,root,root,-)
 %doc LICENSE CREDITS NEWS README
 %{_datadir}/%{name}
 
 %changelog
-* Fri Dec 12 2008 Orcan Ogetbil <orcanbahri [AT] yahoo [DOT] com> 1.3.1-1.1
+* Mon Jan 19 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 1.4
+- Version update. New extensions: gem and tbz2
+- Handle .shn format (shorten) with ffmpeg (if installed)
+- Handle .alz format with unalz (if installed)
+
+* Fri Dec 12 2008 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 1.3.1-1.1
 - Rebuild
 
-* Fri Dec 12 2008 Orcan Ogetbil <orcanbahri [AT] yahoo [DOT] com> 1.3.1-1
+* Fri Dec 12 2008 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 1.3.1-1
 - Version update
 - Use ffmpeg instead of wine+Monkey's Audio for converting ape to wav
 
-* Mon Dec 01 2008 Orcan Ogetbil <orcanbahri [AT] yahoo [DOT] com> 1.2-6
+* Mon Dec 01 2008 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 1.2-6
 - Code cleanup
 
-* Sun Nov 30 2008 Orcan Ogetbil <orcanbahri [AT] yahoo [DOT] com> 1.2-5
+* Sun Nov 30 2008 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 1.2-5
 - Workaround for the "broken ghosts".
 
-* Sun Nov 30 2008 Orcan Ogetbil <orcanbahri [AT] yahoo [DOT] com> 1.2-4
+* Sun Nov 30 2008 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 1.2-4
 - Fixed a typo in the %%do_trigger* of tar\.lzma
 - Added rpm to the default list
 - Attempted to mark the non-default archivers as ghosts
 
-* Thu Nov 20 2008 Orcan Ogetbil <orcanbahri [AT] yahoo [DOT] com> 1.2-3
+* Thu Nov 20 2008 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 1.2-3
 - License is GPLv3.
 - Install the scripts in %%{_datadir}/%%{name} and the symlinks in %%{var}/lib/deco.
 
-* Wed Nov 19 2008 Orcan Ogetbil <orcanbahri [AT] yahoo [DOT] com> 1.2-2
+* Wed Nov 19 2008 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 1.2-2
 - Added conditionals to the trigger functions to suppress warnings on updates.
 
-* Wed Oct 29 2008 Orcan Ogetbil <orcanbahri [AT] yahoo [DOT] com> 1.2-1
+* Wed Oct 29 2008 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 1.2-1
 - Initial build.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/deco-archive/F-10/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	13 Dec 2008 22:47:30 -0000	1.3
+++ sources	20 Jan 2009 02:09:36 -0000	1.4
@@ -1 +1 @@
-a1ede492c99803bdd134bff280256074  deco-archive-1.3.1.tar.gz
+b48cd159fb73a65a4d6e491351c2e57e  deco-archive-1.4.tar.gz



From oget at fedoraproject.org  Tue Jan 20 02:13:29 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Tue, 20 Jan 2009 02:13:29 +0000 (UTC)
Subject: rpms/deco-archive/F-9 deco-archive-shn.diff, NONE, 1.1 .cvsignore,
	1.3, 1.4 deco-archive.spec, 1.2, 1.3 sources, 1.3, 1.4
Message-ID: <20090120021329.49390700F9@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/deco-archive/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25516

Modified Files:
	.cvsignore deco-archive.spec sources 
Added Files:
	deco-archive-shn.diff 
Log Message:
* Mon Jan 19 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 1.4
- Version update. New extensions: gem and tbz2
- Handle .shn format (shorten) with ffmpeg (if installed)
- Handle .alz format with unalz (if installed)


deco-archive-shn.diff:

--- NEW FILE deco-archive-shn.diff ---
diff -rupN deco-archive-1.4.old/shn/extract deco-archive-1.4/shn/extract
--- deco-archive-1.4.old/shn/extract	2009-01-18 08:04:29.000000000 -0500
+++ deco-archive-1.4/shn/extract	2009-01-19 11:14:07.000000000 -0500
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-exec shorten -x "$1"
+exec ffmpeg -i "$1" "$Name".wav 2>/dev/null


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/deco-archive/F-9/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	13 Dec 2008 22:59:21 -0000	1.3
+++ .cvsignore	20 Jan 2009 02:12:58 -0000	1.4
@@ -1 +1 @@
-deco-archive-1.3.1.tar.gz
+deco-archive-1.4.tar.gz


Index: deco-archive.spec
===================================================================
RCS file: /cvs/pkgs/rpms/deco-archive/F-9/deco-archive.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- deco-archive.spec	13 Dec 2008 22:59:22 -0000	1.2
+++ deco-archive.spec	20 Jan 2009 02:12:58 -0000	1.3
@@ -1,5 +1,5 @@
 Name:           deco-archive
-Version:        1.3.1
+Version:        1.4
 Release:        1%{?dist}
 Summary:        Extraction scripts for various archive formats for use of deco
 Group:          Applications/Archiving
@@ -9,6 +9,9 @@
 # Use ffmpeg instead of wine+Monkey's Audio for converting ape to wav.
 # Patch sent to upstream via email
 Patch0:         deco-archive-ape.diff
+# Use ffmpeg instead of non-free shorten decoder, which is not available
+# in Fedora
+Patch1:         deco-archive-shn.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
@@ -22,6 +25,7 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 echo "Nothing to build."
@@ -40,7 +44,7 @@
    if [[ -d $i || -h $i ]] ; then
       ln -s ../../..%{_datadir}/%{name}/"$i" %{buildroot}/%{_var}/lib/deco
       case $i in
-         bz2|cpio|gz|rpm|z|tar|"tar\.bz2"|"tar\.gz"|"tar\.z"|taz|tbz|tgz)
+         bz2|cpio|gem|gz|rpm|z|tar|"tar\.bz2"|"tar\.gz"|"tar\.z"|taz|tbz|tbz2|tgz)
             echo "%{_var}/lib/deco/$i" >> %{name}-links.list ;;
          *)
             echo "%ghost %{_var}/lib/deco/$i" >> %{name}-ghosts.list ;;
@@ -57,7 +61,7 @@
 %define do_triggerun() ( [ $2 -gt 0 ] && [ $1 -gt 0 ] ) || (for i in %1; do ( rm -f %{_var}/lib/deco/$i || : ); done;)
 
 # Not handled (yet?):
-# alz (unalz), dpkg-deb (deb,udeb), shn (shorten), zoo
+# dpkg-deb (deb,udeb), zoo
 
 %triggerin -- binutils
 %do_triggerin {a,ar}
@@ -75,9 +79,9 @@
 %do_triggerun "ace|[c0-9][0-9]{2}"
 
 %triggerin -- ffmpeg
-%do_triggerin ape
+%do_triggerin {ape,shn}
 %triggerun -- ffmpeg
-%do_triggerun ape
+%do_triggerun {ape,shn}
 
 %triggerin -- arc
 %do_triggerin {arc,ark,sue}
@@ -139,33 +143,43 @@
 %triggerun -- rzip
 %do_triggerun {rz,"tar\.rz"}
 
+%triggerin -- unalz
+%do_triggerin alz
+%triggerun -- unalz
+%do_triggerun alz
+
 %files -f %{name}.files
 %defattr(-,root,root,-)
 %doc LICENSE CREDITS NEWS README
 %{_datadir}/%{name}
 
 %changelog
-* Fri Dec 12 2008 Orcan Ogetbil <orcanbahri [AT] yahoo [DOT] com> 1.3.1-1
+* Mon Jan 19 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 1.4
+- Version update. New extensions: gem and tbz2
+- Handle .shn format (shorten) with ffmpeg (if installed)
+- Handle .alz format with unalz (if installed)
+
+* Fri Dec 12 2008 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 1.3.1-1
 - Version update
 - Use ffmpeg instead of wine+Monkey's Audio for converting ape to wav
 
-* Mon Dec 01 2008 Orcan Ogetbil <orcanbahri [AT] yahoo [DOT] com> 1.2-6
+* Mon Dec 01 2008 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 1.2-6
 - Code cleanup
 
-* Sun Nov 30 2008 Orcan Ogetbil <orcanbahri [AT] yahoo [DOT] com> 1.2-5
+* Sun Nov 30 2008 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 1.2-5
 - Workaround for the "broken ghosts".
 
-* Sun Nov 30 2008 Orcan Ogetbil <orcanbahri [AT] yahoo [DOT] com> 1.2-4
+* Sun Nov 30 2008 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 1.2-4
 - Fixed a typo in the %%do_trigger* of tar\.lzma
 - Added rpm to the default list
 - Attempted to mark the non-default archivers as ghosts
 
-* Thu Nov 20 2008 Orcan Ogetbil <orcanbahri [AT] yahoo [DOT] com> 1.2-3
+* Thu Nov 20 2008 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 1.2-3
 - License is GPLv3.
 - Install the scripts in %%{_datadir}/%%{name} and the symlinks in %%{var}/lib/deco.
 
-* Wed Nov 19 2008 Orcan Ogetbil <orcanbahri [AT] yahoo [DOT] com> 1.2-2
+* Wed Nov 19 2008 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 1.2-2
 - Added conditionals to the trigger functions to suppress warnings on updates.
 
-* Wed Oct 29 2008 Orcan Ogetbil <orcanbahri [AT] yahoo [DOT] com> 1.2-1
+* Wed Oct 29 2008 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 1.2-1
 - Initial build.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/deco-archive/F-9/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	13 Dec 2008 22:59:22 -0000	1.3
+++ sources	20 Jan 2009 02:12:58 -0000	1.4
@@ -1 +1 @@
-a1ede492c99803bdd134bff280256074  deco-archive-1.3.1.tar.gz
+b48cd159fb73a65a4d6e491351c2e57e  deco-archive-1.4.tar.gz



From dp67 at fedoraproject.org  Tue Jan 20 02:14:50 2009
From: dp67 at fedoraproject.org (Randy Berry)
Date: Tue, 20 Jan 2009 02:14:50 +0000 (UTC)
Subject: rpms/fldigi/F-10 .cvsignore, 1.6, 1.7 fldigi.spec, 1.8, 1.9 sources,
	1.7, 1.8
Message-ID: <20090120021450.482D2700F9@cvs1.fedora.phx.redhat.com>

Author: dp67

Update of /cvs/pkgs/rpms/fldigi/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25687

Modified Files:
	.cvsignore fldigi.spec sources 
Log Message:

Upstream update 3.10



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fldigi/F-10/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	24 Aug 2008 00:18:53 -0000	1.6
+++ .cvsignore	20 Jan 2009 02:14:20 -0000	1.7
@@ -1,5 +1 @@
-fldigi-2.09.tar.gz
-fldigi-2.10.tar.gz
-fldigi-2.10.2.tar.gz
-fldigi-2.10.3.tar.gz
-fldigi-3.01.tar.gz
+fldigi-3.10.tar.gz


Index: fldigi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fldigi/F-10/fldigi.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- fldigi.spec	13 Dec 2008 09:35:45 -0000	1.8
+++ fldigi.spec	20 Jan 2009 02:14:20 -0000	1.9
@@ -1,13 +1,13 @@
-Name:           fldigi
-Version:        3.03
-Release:        1%{?dist}
-Summary:        Digital modem program for Linux
-
-Group:          Applications/Communications
-License:        GPLv2+	
-URL:            http://www.w1hkj.com/fldigi-distro/
-Source0:        http://www.w1hkj.com/fldigi-distro/%{name}-%{version}.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Name:		fldigi
+Version:	3.10
+Release:	1%{?dist}
+Summary:	Digital modem program for Linux
+
+Group:		Applications/Communications
+License:	GPLv2+	
+URL:		http://www.w1hkj.com/fldigi-distro/
+Source0:	http://www.w1hkj.com/fldigi-distro/%{name}-%{version}.tar.gz
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  hamlib-devel, fltk-devel, libjpeg-devel, libpng-devel
 BuildRequires:  portaudio-devel >= 19-4, libsndfile-devel , desktop-file-utils
@@ -23,24 +23,24 @@
 %prep
 %setup -q
 
-
 %build
 %configure
-make %{?_smp_mflags}
-
+make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS"
 
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 desktop-file-install --vendor="" \
-  --dir=${RPM_BUILD_ROOT}%{_datadir}/applications \
+	--dir=${RPM_BUILD_ROOT}%{_datadir}/applications \
   $RPM_BUILD_ROOT%{_datadir}/applications/fldigi.desktop
+# --vendor obsolete per new guidlines but leaving it in because
+# this is an existing package with vendor previously installed
+%find_lang %{name}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-
-%files
+%files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING README
 %{_bindir}/*
@@ -48,10 +48,11 @@
 %attr(0644,root,root) %{_datadir}/applications/%{name}.desktop
 
 %changelog
+* Mon Jan 19 2009 Randall J Berry 'Dp67' <dp67 at fedoraproject.org> 3.10-1
+- New upstream release
 * Thu Dec 14 2008 Sindre Pedersen Bj??rdal <sindrepb at fedoraproject.org> 3.03-1
 - New upstream release
 - Remove explicit libsamplerate dependency
-
 * Fri Aug 22 2008 Steve Conklin <fedora at conklinhouse.com> - 3.01-1
 - Latest upstream
 * Mon Apr  7 2008 Steve Conklin <steve at conklinhouse.com> - 2.10.3-1


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fldigi/F-10/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	13 Dec 2008 09:35:45 -0000	1.7
+++ sources	20 Jan 2009 02:14:20 -0000	1.8
@@ -1 +1 @@
-0e457ce794ceaeb87a5513fa331d2c6d  fldigi-3.03.tar.gz
+eb8eb8ff6d750eadfaa8804998d733c2  fldigi-3.10.tar.gz



From rstrode at fedoraproject.org  Tue Jan 20 02:22:53 2009
From: rstrode at fedoraproject.org (Ray Strode)
Date: Tue, 20 Jan 2009 02:22:53 +0000 (UTC)
Subject: rpms/nautilus/devel eel-2.24.0-fade.patch, 1.2, 1.3 nautilus.spec, 
	1.250, 1.251
Message-ID: <20090120022253.8AAD7700F9@cvs1.fedora.phx.redhat.com>

Author: rstrode

Update of /cvs/pkgs/rpms/nautilus/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27507

Modified Files:
	eel-2.24.0-fade.patch nautilus.spec 
Log Message:
- Update fade patch to work with updated gnome-desktop api
- Fix fade start pixmap


eel-2.24.0-fade.patch:

Index: eel-2.24.0-fade.patch
===================================================================
RCS file: /cvs/pkgs/rpms/nautilus/devel/eel-2.24.0-fade.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- eel-2.24.0-fade.patch	7 Jan 2009 20:45:30 -0000	1.2
+++ eel-2.24.0-fade.patch	20 Jan 2009 02:22:22 -0000	1.3
@@ -324,7 +324,7 @@
 +	}
 +
 +	if (!gnome_bg_crossfade_is_started (background->details->fade)) {
-+		gnome_bg_crossfade_start (background->details->fade, window, NULL);
++		gnome_bg_crossfade_start (background->details->fade, window);
 +		if (background->details->is_desktop) {
 +			g_signal_connect_swapped (background->details->fade,
 +					          "finished",
@@ -375,7 +375,7 @@
  		set_root_pixmap (background, window);
  	}
  	
-@@ -720,6 +772,36 @@ on_background_changed (EelBackground *background)
+@@ -720,6 +772,44 @@ on_background_changed (EelBackground *background)
  }
  
  static void
@@ -403,8 +403,16 @@
 +	}
 +
 +	if (background->details->fade != NULL && !gnome_bg_crossfade_is_started (background->details->fade)) {
++		GdkPixmap *start_pixmap;
++
++		if (background->details->background_pixmap == NULL) {
++			start_pixmap = gnome_bg_get_pixmap_from_root (gtk_widget_get_screen (widget));
++		} else {
++			start_pixmap = g_object_ref (background->details->background_pixmap);
++		}
 +		gnome_bg_crossfade_set_start_pixmap (background->details->fade,
-+						     background->details->background_pixmap);
++						     start_pixmap);
++                g_object_unref (start_pixmap);
 +	}
 +}
 +
@@ -412,3 +420,12 @@
  eel_widget_queue_background_change (GtkWidget *widget)
  {
  	EelBackground *background;
+@@ -782,6 +872,8 @@ widget_realized_setup (GtkWidget *widget, gpointer data)
+ 		} else {
+ 			background->details->use_common_pixmap = FALSE;
+ 		}
++
++		init_fade (background, widget);
+ 	}
+ }
+ 


Index: nautilus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nautilus/devel/nautilus.spec,v
retrieving revision 1.250
retrieving revision 1.251
diff -u -r1.250 -r1.251
--- nautilus.spec	7 Jan 2009 20:45:30 -0000	1.250
+++ nautilus.spec	20 Jan 2009 02:22:22 -0000	1.251
@@ -16,7 +16,7 @@
 Name:		nautilus
 Summary:        File manager for GNOME
 Version: 	2.25.2
-Release:	6%{?dist}
+Release:	7%{?dist}
 License: 	GPLv2+
 Group:          User Interface/Desktops
 Source: 	http://download.gnome.org/sources/%{name}/2.25/%{name}-%{version}.tar.bz2
@@ -265,6 +265,10 @@
 
 
 %changelog
+* Mon Jan 19 2009 Ray Strode <rstrode at redhat.com> - 2.25.2-7
+- Update fade patch to work with updated gnome-desktop api
+- Fix fade start pixmap
+
 * Wed Jan  7 2009 Ray Strode <rstrode at redhat.com> - 2.25.2-6
 - Don't crash when closing spatial window very quickly after
   opening it (gnome bug 552859)



From dp67 at fedoraproject.org  Tue Jan 20 02:27:32 2009
From: dp67 at fedoraproject.org (Randy Berry)
Date: Tue, 20 Jan 2009 02:27:32 +0000 (UTC)
Subject: rpms/fldigi/F-9 .cvsignore, 1.6, 1.7 fldigi.spec, 1.8, 1.9 sources, 
	1.7, 1.8
Message-ID: <20090120022732.359C5700F9@cvs1.fedora.phx.redhat.com>

Author: dp67

Update of /cvs/pkgs/rpms/fldigi/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28129

Modified Files:
	.cvsignore fldigi.spec sources 
Log Message:

Upstream update to 3.10




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fldigi/F-9/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	24 Aug 2008 00:59:14 -0000	1.6
+++ .cvsignore	20 Jan 2009 02:27:01 -0000	1.7
@@ -1,5 +1 @@
-fldigi-2.09.tar.gz
-fldigi-2.10.tar.gz
-fldigi-2.10.2.tar.gz
-fldigi-2.10.3.tar.gz
-fldigi-3.01.tar.gz
+fldigi-3.10.tar.gz


Index: fldigi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fldigi/F-9/fldigi.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- fldigi.spec	13 Dec 2008 10:29:33 -0000	1.8
+++ fldigi.spec	20 Jan 2009 02:27:01 -0000	1.9
@@ -1,13 +1,13 @@
-Name:           fldigi
-Version:        3.03
-Release:        1%{?dist}
-Summary:        Digital modem program for Linux
-
-Group:          Applications/Communications
-License:        GPLv2+	
-URL:            http://www.w1hkj.com/fldigi-distro/
-Source0:        http://www.w1hkj.com/fldigi-distro/%{name}-%{version}.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Name:		fldigi
+Version:	3.10
+Release:	1%{?dist}
+Summary:	Digital modem program for Linux
+
+Group:		Applications/Communications
+License:	GPLv2+	
+URL:		http://www.w1hkj.com/fldigi-distro/
+Source0:	http://www.w1hkj.com/fldigi-distro/%{name}-%{version}.tar.gz
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  hamlib-devel, fltk-devel, libjpeg-devel, libpng-devel
 BuildRequires:  portaudio-devel >= 19-4, libsndfile-devel , desktop-file-utils
@@ -23,24 +23,24 @@
 %prep
 %setup -q
 
-
 %build
 %configure
-make %{?_smp_mflags}
-
+make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS"
 
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 desktop-file-install --vendor="" \
-  --dir=${RPM_BUILD_ROOT}%{_datadir}/applications \
+	--dir=${RPM_BUILD_ROOT}%{_datadir}/applications \
   $RPM_BUILD_ROOT%{_datadir}/applications/fldigi.desktop
+# --vendor obsolete per new guidlines but leaving it in because
+# this is an existing package with vendor previously installed
+%find_lang %{name}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-
-%files
+%files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING README
 %{_bindir}/*
@@ -48,10 +48,11 @@
 %attr(0644,root,root) %{_datadir}/applications/%{name}.desktop
 
 %changelog
+* Mon Jan 19 2009 Randall J Berry 'Dp67' <dp67 at fedoraproject.org> 3.10-1
+- New upstream release
 * Thu Dec 14 2008 Sindre Pedersen Bj??rdal <sindrepb at fedoraproject.org> 3.03-1
 - New upstream release
 - Remove explicit libsamplerate dependency
-
 * Fri Aug 22 2008 Steve Conklin <fedora at conklinhouse.com> - 3.01-1
 - Latest upstream
 * Mon Apr  7 2008 Steve Conklin <steve at conklinhouse.com> - 2.10.3-1


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fldigi/F-9/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	13 Dec 2008 10:29:33 -0000	1.7
+++ sources	20 Jan 2009 02:27:01 -0000	1.8
@@ -1 +1 @@
-0e457ce794ceaeb87a5513fa331d2c6d  fldigi-3.03.tar.gz
+eb8eb8ff6d750eadfaa8804998d733c2  fldigi-3.10.tar.gz



From cchance at fedoraproject.org  Tue Jan 20 02:33:32 2009
From: cchance at fedoraproject.org (Caius Chance)
Date: Tue, 20 Jan 2009 02:33:32 +0000 (UTC)
Subject: rpms/liberation-fonts/devel liberation-fonts.spec,1.29,1.30
Message-ID: <20090120023332.CE131700F9@cvs1.fedora.phx.redhat.com>

Author: cchance

Update of /cvs/pkgs/rpms/liberation-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29125

Modified Files:
	liberation-fonts.spec 
Log Message:
* Tue Jan 20 2009 Caius Chance <cchance at redhat.com> - 1.04.93-5.fc11
- Resolved: rhbz#477410
- Refined .spec file based on Mailhot's review on rhbz.




Index: liberation-fonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/liberation-fonts/devel/liberation-fonts.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- liberation-fonts.spec	19 Jan 2009 06:08:16 -0000	1.29
+++ liberation-fonts.spec	20 Jan 2009 02:33:02 -0000	1.30
@@ -18,18 +18,12 @@
 # GPLv3. This license is Free, but GPLv2 and GPLv3 incompatible.
 License:          Liberation
 Group:            User Interface/X
-URL:              https://www.redhat.com/promo/fonts/
+URL:              https://fedorahosted.org/liberation-fonts/
 Source0:          liberation-fonts-1.04.93.devel.tar.gz
-Source1:          65-liberation-sans.conf
-Source2:          65-liberation-serif.conf
-Source3:          65-liberation-mono.conf
-
-Requires:         %{name}-sans >= %{version}-%{release}
-Requires:         %{name}-serif >= %{version}-%{release}
-Requires:         %{name}-mono >= %{version}-%{release}
-Obsoletes:        liberation-fonts-sans < %{version}-%{release}
-Obsoletes:        liberation-fonts-serif < %{version}-%{release}
-Obsoletes:        liberation-fonts-mono < %{version}-%{release}
+
+Obsoletes:        liberation-fonts-sans < 1.04.93-4
+Obsoletes:        liberation-fonts-serif < 1.04.93-4 
+Obsoletes:        liberation-fonts-mono < 1.04.93-4 
 BuildRoot:        %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildArch:        noarch
 Buildrequires:    fontpackages-devel >= 1.13, xorg-x11-font-utils
@@ -43,18 +37,17 @@
 %files
 %{nil}
 
-%package -n %{fontname}-common-fonts
+%package -n %{fontname}-fonts-common
 Summary:          Shared common files of Liberation font families.
-License:          Liberation
 Group:            User Interface/X
 Requires:         fontpackages-filesystem >= 1.13
 
-%description -n %{fontname}-common-fonts
+%description -n %{fontname}-fonts-common
 %common_desc
 
 Shared common files of Liberation font families.
 
-%files -n %{fontname}-common-fonts
+%files -n %{fontname}-fonts-common
 %defattr(0644,root,root,0755)
 %doc AUTHORS ChangeLog COPYING License.txt README
 %dir %{_fontdir}
@@ -63,42 +56,33 @@
 %{catalogue}/%{name}
 
 %package -n %{fontname}-sans-fonts
-Summary:      Sans fonts to replace commonly used Microsoft Arial
-License:      Liberation
+Summary:      Sans-serif fonts to replace commonly used Microsoft Arial
 Group:        User Interface/X
-Obsoletes:    %{name}-sans < %{version}-%{release}
-Requires:     fontpackages-filesystem >= 1.13
 Requires:     %{fontname}-common-fonts = %{version}-%{release}
 
 %description -n %{fontname}-sans-fonts
 %common_desc
 
-This is Sans TrueType fonts that replaced commonly used Microsoft Arial.
+This is Sans-serif TrueType fonts that replaced commonly used Microsoft Arial.
 
-%_font_pkg -n sans -f 65-%{fontname}-sans.conf LiberationSans-*.ttf
+%_font_pkg -n sans LiberationSans-*.ttf
 
 %package -n %{fontname}-serif-fonts
-Summary:      San-serif fonts to replace commonly used Microsoft Times New Roman
-License:      Liberation
+Summary:      Serif fonts to replace commonly used Microsoft Times New Roman
 Group:        User Interface/X
-Obsoletes:    %{name}-serif < %{version}-%{release}
-Requires:     fontpackages-filesystem >= 1.13
 Requires:     %{fontname}-common-fonts = %{version}-%{release}
 
 %description -n %{fontname}-serif-fonts
 %common_desc
 
-This is Sans-serif TrueType fonts that replaced commonly used Microsoft Times \
-New Roman.
+This is Serif TrueType fonts that replaced commonly used Microsoft Times New \
+Roman.
 
-%_font_pkg -n serif -f 65-%{fontname}-serif.conf LiberationSerif-*.ttf
+%_font_pkg -n serif LiberationSerif-*.ttf
 
 %package -n %{fontname}-mono-fonts
 Summary:      Monospace fonts to replace commonly used Microsoft Courier New
-License:      Liberation
 Group:        User Interface/X
-Obsoletes:    %{name}-sans < %{version}-%{release}
-Requires:     fontpackages-filesystem >= 1.13
 Requires:     %{fontname}-common-fonts = %{version}-%{release}
 
 %description -n %{fontname}-mono-fonts
@@ -107,7 +91,7 @@
 This is Monospace TrueType fonts that replaced commonly used Microsoft Courier \
 New.
 
-%_font_pkg -n mono -f 65-%{fontname}-mono.conf LiberationMono-*.ttf
+%_font_pkg -n mono LiberationMono-*.ttf
 
 %prep
 %setup -q -n %{name}-%{version}.devel
@@ -119,20 +103,9 @@
 rm -rf %{buildroot}
 # fonts .ttf
 install -m 0755 -d %{buildroot}%{_fontdir}
-install -m 0644 *.ttf %{buildroot}%{_fontdir}
-# fontconfig .conf
-%__install -m 0755 -d %{buildroot}%{_fontconfig_templatedir}
-%__install -m 0755 -d %{buildroot}%{_fontconfig_confdir}
-cd ../
-for fconf in %{SOURCE1} %{SOURCE2} %{SOURCE3}
-do
-    %__install -m 0644 $fconf %{buildroot}%{_fontconfig_templatedir}/
-    %__ln_s %{_fontconfig_templatedir}/`basename $fconf` \
-        %{buildroot}%{_fontconfig_confdir}/`basename $fconf`
-done
-cd -
+install -m 0644 -p *.ttf %{buildroot}%{_fontdir}
 # catalogue
-install -d %{buildroot}%{catalogue}
+install -m 0755 -d %{buildroot}%{catalogue}
 ln -sf %{_fontdir} %{buildroot}%{catalogue}/%{name}
 # fonts.{dir,scale}
 mkfontdir %{buildroot}%{_fontdir}
@@ -142,6 +115,10 @@
 rm -rf %{buildroot}
 
 %changelog
+* Tue Jan 20 2009 Caius Chance <cchance at redhat.com> - 1.04.93-5.fc11
+- Resolved: rhbz#477410
+- Refined .spec file based on Mailhot's review on rhbz.
+
 * Mon Jan 19 2009 Caius Chance <cchance at redhat.com> - 1.04.93-4.fc11
 - Resolves: thbz#477410
 - Package renaming for post-1.13 fontpackages macros.



From corsepiu at fedoraproject.org  Tue Jan 20 02:35:56 2009
From: corsepiu at fedoraproject.org (=?utf-8?q?Ralf_Cors=C3=A9pius?=)
Date: Tue, 20 Jan 2009 02:35:56 +0000 (UTC)
Subject: rpms/perl-Set-Scalar/devel .cvsignore, 1.3, 1.4 perl-Set-Scalar.spec,
	1.4, 1.5 sources, 1.3, 1.4
Message-ID: <20090120023556.B37FA700F9@cvs1.fedora.phx.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-Set-Scalar/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29499

Modified Files:
	.cvsignore perl-Set-Scalar.spec sources 
Log Message:
* Mon Jan 19 2009 Ralf Cors??pius <corsepiu at fedoraproject.org> - 1.23-1
- Upstream update.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Set-Scalar/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	19 Dec 2007 19:04:08 -0000	1.3
+++ .cvsignore	20 Jan 2009 02:35:26 -0000	1.4
@@ -1 +1 @@
-Set-Scalar-1.22.tar.gz
+Set-Scalar-1.23.tar.gz


Index: perl-Set-Scalar.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Set-Scalar/devel/perl-Set-Scalar.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-Set-Scalar.spec	4 Mar 2008 05:00:24 -0000	1.4
+++ perl-Set-Scalar.spec	20 Jan 2009 02:35:26 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           perl-Set-Scalar
-Version:        1.22
-Release:        2%{?dist}
+Version:        1.23
+Release:        1%{?dist}
 Summary:        Basic set operations
 
 Group:          Development/Libraries
@@ -50,6 +50,9 @@
 
 
 %changelog
+* Mon Jan 19 2009 Ralf Cors??pius <corsepiu at fedoraproject.org> - 1.23-1
+- Upstream update.
+
 * Mon Mar  3 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1.22-2
 - rebuild for new perl
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Set-Scalar/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	19 Dec 2007 19:04:08 -0000	1.3
+++ sources	20 Jan 2009 02:35:26 -0000	1.4
@@ -1 +1 @@
-28906c7f21874e4746f36cb544d885a1  Set-Scalar-1.22.tar.gz
+90ed899a31b99eb05a0cb95886b0d0df  Set-Scalar-1.23.tar.gz



From cchance at fedoraproject.org  Tue Jan 20 02:36:54 2009
From: cchance at fedoraproject.org (Caius Chance)
Date: Tue, 20 Jan 2009 02:36:54 +0000 (UTC)
Subject: rpms/liberation-fonts/devel liberation-fonts.spec,1.30,1.31
Message-ID: <20090120023654.8D577700F9@cvs1.fedora.phx.redhat.com>

Author: cchance

Update of /cvs/pkgs/rpms/liberation-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29669

Modified Files:
	liberation-fonts.spec 
Log Message:
updated release num



Index: liberation-fonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/liberation-fonts/devel/liberation-fonts.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- liberation-fonts.spec	20 Jan 2009 02:33:02 -0000	1.30
+++ liberation-fonts.spec	20 Jan 2009 02:36:24 -0000	1.31
@@ -10,7 +10,7 @@
 Name:             %{fontname}-fonts
 Summary:          Fonts to replace commonly used Microsoft Windows fonts
 Version:          1.04.93
-Release:          4%{?dist}
+Release:          5%{?dist}
 # The license of the Liberation Fonts is a EULA that contains GPLv2 and two 
 # exceptions:
 # The first exception is the standard FSF font exception.



From cchance at fedoraproject.org  Tue Jan 20 02:43:49 2009
From: cchance at fedoraproject.org (Caius Chance)
Date: Tue, 20 Jan 2009 02:43:49 +0000 (UTC)
Subject: rpms/liberation-fonts/devel 65-liberation-mono.conf, 1.1,
	NONE 65-liberation-sans.conf, 1.1, NONE 65-liberation-serif.conf,
	1.1, NONE
Message-ID: <20090120024349.BEE99700F9@cvs1.fedora.phx.redhat.com>

Author: cchance

Update of /cvs/pkgs/rpms/liberation-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31036

Removed Files:
	65-liberation-mono.conf 65-liberation-sans.conf 
	65-liberation-serif.conf 
Log Message:
removed uncessary fontconfig files



--- 65-liberation-mono.conf DELETED ---


--- 65-liberation-sans.conf DELETED ---


--- 65-liberation-serif.conf DELETED ---



From cchance at fedoraproject.org  Tue Jan 20 02:55:29 2009
From: cchance at fedoraproject.org (Caius Chance)
Date: Tue, 20 Jan 2009 02:55:29 +0000 (UTC)
Subject: rpms/baekmuk-ttf-fonts/devel baekmuk-ttf-fonts.spec,1.9,1.10
Message-ID: <20090120025529.8BFF9700F9@cvs1.fedora.phx.redhat.com>

Author: cchance

Update of /cvs/pkgs/rpms/baekmuk-ttf-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv765

Modified Files:
	baekmuk-ttf-fonts.spec 
Log Message:
* Tue Jan 20 2009 Caius Chance <cchance at redhat.com> - 2.2-14.fc11
- Resolves: rhbz#477332
- Refined according to Mailhot's comments (477410) on liberaton fonts.




Index: baekmuk-ttf-fonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/baekmuk-ttf-fonts/devel/baekmuk-ttf-fonts.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- baekmuk-ttf-fonts.spec	19 Jan 2009 04:40:23 -0000	1.9
+++ baekmuk-ttf-fonts.spec	20 Jan 2009 02:54:59 -0000	1.10
@@ -8,7 +8,7 @@
 
 Name:           %{fontname}-fonts
 Version:        2.2
-Release:        13%{?dist}
+Release:        14%{?dist}
 Summary:        Free Korean TrueType fonts
 
 Group:          User Interface/X
@@ -34,11 +34,9 @@
 
 %package -n %{fontname}-batang-fonts
 Summary:        Korean Baekmuk TrueType Batang typeface
-License:        Baekmuk
 Group:          User Interface/X
 Obsoletes:      ttfonts-ko < 1.0.11-33, fonts-korean < 2.2-6
-Obsoletes:      %{name}-batang < %{version}-%{release}
-Requires:       fontpackages-filesystem >= 1.13
+Obsoletes:      %{name}-batang < 2.2-13
 Requires:       %{fontname}-common-fonts = %{version}-%{release}
 
 %description -n %{fontname}-batang-fonts
@@ -50,11 +48,9 @@
 
 %package -n %{fontname}-dotum-fonts
 Summary:        Korean Baekmuk TrueType Dotum typeface
-License:        Baekmuk
 Group:          User Interface/X
 Obsoletes:      ttfonts-ko < 1.0.11-33, fonts-korean < 2.2-6
-Obsoletes:      %{name}-dotum < %{version}-%{release}
-Requires:       fontpackages-filesystem >= 1.13
+Obsoletes:      %{name}-dotum < 2.2-13 
 Requires:       %{fontname}-common-fonts = %{version}-%{release}
 
 %description -n %{fontname}-dotum-fonts
@@ -66,11 +62,9 @@
 
 %package -n %{fontname}-gulim-fonts
 Summary:        Korean Baekmuk TrueType Gulim typeface
-License:        Baekmuk
 Group:          User Interface/X
 Obsoletes:      ttfonts-ko < 1.0.11-33, fonts-korean < 2.2-6
-Obsoletes:      %{name}-gulim < %{version}-%{release}
-Requires:       fontpackages-filesystem >= 1.13
+Obsoletes:      %{name}-gulim < 2.2-13
 Requires:       %{fontname}-common-fonts = %{version}-%{release}
 
 %description -n %{fontname}-gulim-fonts
@@ -82,11 +76,9 @@
 
 %package -n %{fontname}-hline-fonts
 Summary:        Korean Baekmuk TrueType Headline typeface
-License:        Baekmuk
 Group:          User Interface/X
 Obsoletes:      ttfonts-ko < 1.0.11-33, fonts-korean < 2.2-6
-Obsoletes:      %{name}-hline < %{version}-%{release}
-Requires:       fontpackages-filesystem >= 1.13
+Obsoletes:      %{name}-hline < 2.2-13 
 Requires:       %{fontname}-common-fonts = %{version}-%{release}
 
 %description -n %{fontname}-hline-fonts
@@ -96,19 +88,17 @@
 
 %_font_pkg -n hline -f *-%{fontname}-hline*.conf hline.ttf
 
-%package -n %{fontname}-common-fonts
+%package -n %{fontname}-fonts-common
 Summary:        Common files for Korean Baekmuk TrueType fonts
-License:        Baekmuk
 Group:          User Interface/X
-Requires:       fontpackages-filesystem >= 1.13
 Conflicts:      fonts-korean < 2.2-5
 
-%description -n %{fontname}-common-fonts
+%description -n %{fontname}-fonts-common
 %common_desc
 
 This is common files for Baekmuk Korean TrueType fonts.
 
-%files -n %{fontname}-common-fonts
+%files -n %{fontname}-fonts-common
 %defattr(0644,root,root,0755)
 %verify(not md5 size mtime) %{_fontdir}/fonts.dir
 %verify(not md5 size mtime) %{_fontdir}/fonts.scale
@@ -164,6 +154,10 @@
 %__rm -rf %{buildroot}
 
 %changelog
+* Tue Jan 20 2009 Caius Chance <cchance at redhat.com> - 2.2-14.fc11
+- Resolves: rhbz#477332
+- Refined according to Mailhot's comments (477410) on liberaton fonts.
+
 * Mon Jan 19 2009 Caius Chance <cchance at redhat.com> - 2.2-13.fc11
 - Resolves: rhbz#477332
 - Package renaming for post-1.13 fontpackages.



From rstrode at fedoraproject.org  Tue Jan 20 03:10:05 2009
From: rstrode at fedoraproject.org (Ray Strode)
Date: Tue, 20 Jan 2009 03:10:05 +0000 (UTC)
Subject: rpms/gnome-desktop/devel gnome-desktop.spec,1.197,1.198
Message-ID: <20090120031005.2507F700F9@cvs1.fedora.phx.redhat.com>

Author: rstrode

Update of /cvs/pkgs/rpms/gnome-desktop/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2512

Modified Files:
	gnome-desktop.spec 
Log Message:
- Rebuild so i can chain-build



Index: gnome-desktop.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-desktop/devel/gnome-desktop.spec,v
retrieving revision 1.197
retrieving revision 1.198
diff -u -r1.197 -r1.198
--- gnome-desktop.spec	20 Jan 2009 01:49:06 -0000	1.197
+++ gnome-desktop.spec	20 Jan 2009 03:09:34 -0000	1.198
@@ -12,7 +12,7 @@
 Summary: Package containing code shared among gnome-panel, gnome-session, nautilus, etc
 Name: gnome-desktop
 Version: 2.25.5
-Release: 1%{?dist}
+Release: 2%{?dist}
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/gnome-desktop/2.25/%{name}-%{version}.tar.bz2
 License: GPLv2+ and LGPLv2+
@@ -120,6 +120,9 @@
 %doc %{_datadir}/gtk-doc/html/gnome-desktop/
 
 %changelog
+* Mon Jan 19 2009 Ray Strode <rstrode at redhat.com> - 2.25.5-2
+- Rebuild so i can chain-build
+
 * Mon Jan 19 2009 Ray Strode <rstrode at redhat.com> - 2.25.5-1
 - Update to 2.25.5
 



From corsepiu at fedoraproject.org  Tue Jan 20 03:27:21 2009
From: corsepiu at fedoraproject.org (=?utf-8?q?Ralf_Cors=C3=A9pius?=)
Date: Tue, 20 Jan 2009 03:27:21 +0000 (UTC)
Subject: rpms/perl-Test-File/devel .cvsignore, 1.3, 1.4 perl-Test-File.spec, 
	1.5, 1.6 sources, 1.3, 1.4
Message-ID: <20090120032721.50AA1700F9@cvs1.fedora.phx.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-Test-File/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5382

Modified Files:
	.cvsignore perl-Test-File.spec sources 
Log Message:
* Tue Jan 20 2009 Ralf Cors??pius <corsepiu at fedoraproject.org> - 1.25-1
- Upstream update.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-File/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	3 Mar 2008 22:52:26 -0000	1.3
+++ .cvsignore	20 Jan 2009 03:26:50 -0000	1.4
@@ -1 +1 @@
-Test-File-1.22.tar.gz
+Test-File-1.25.tar.gz


Index: perl-Test-File.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-File/devel/perl-Test-File.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perl-Test-File.spec	3 Mar 2008 22:52:26 -0000	1.5
+++ perl-Test-File.spec	20 Jan 2009 03:26:50 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           perl-Test-File
-Version:        1.22
-Release:        3%{?dist}
+Version:        1.25
+Release:        1%{?dist}
 Summary:        Test file attributes
 
 Group:          Development/Libraries
@@ -13,6 +13,7 @@
 BuildRequires:  perl(Test::Builder) >= 0.33
 BuildRequires:  perl(Test::Builder::Tester) >= 1.04
 BuildRequires:  perl(Test::Prereq) >= 1.0
+BuildRequires:  perl(Test::Manifest) >= 1.14
 BuildRequires:  perl(Test::Pod)
 BuildRequires:  perl(Test::Pod::Coverage)
 BuildRequires:  perl(Test::More) >= 0.65
@@ -55,6 +56,9 @@
 
 
 %changelog
+* Tue Jan 20 2009 Ralf Cors??pius <corsepiu at fedoraproject.org> - 1.25-1
+- Upstream update.
+
 * Mon Mar  3 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1.22-3
 - helps if you upload new source
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-File/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	3 Mar 2008 22:52:26 -0000	1.3
+++ sources	20 Jan 2009 03:26:50 -0000	1.4
@@ -1 +1 @@
-9b757d50c8fd6526ac21c5c389bba2a1  Test-File-1.22.tar.gz
+eb995de00c18bccc6919bdc00847244e  Test-File-1.25.tar.gz



From corsepiu at fedoraproject.org  Tue Jan 20 03:32:34 2009
From: corsepiu at fedoraproject.org (=?utf-8?q?Ralf_Cors=C3=A9pius?=)
Date: Tue, 20 Jan 2009 03:32:34 +0000 (UTC)
Subject: rpms/perl-Test-File/F-10 .cvsignore, 1.3, 1.4 perl-Test-File.spec,
	1.5, 1.6 sources, 1.3, 1.4
Message-ID: <20090120033234.6CD04700F9@cvs1.fedora.phx.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-Test-File/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6003/F-10

Modified Files:
	.cvsignore perl-Test-File.spec sources 
Log Message:
* Tue Jan 20 2009 Ralf Cors??pius <corsepiu at fedoraproject.org> - 1.25-1
- Upstream update.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-File/F-10/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	3 Mar 2008 22:52:26 -0000	1.3
+++ .cvsignore	20 Jan 2009 03:32:03 -0000	1.4
@@ -1 +1 @@
-Test-File-1.22.tar.gz
+Test-File-1.25.tar.gz


Index: perl-Test-File.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-File/F-10/perl-Test-File.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perl-Test-File.spec	3 Mar 2008 22:52:26 -0000	1.5
+++ perl-Test-File.spec	20 Jan 2009 03:32:03 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           perl-Test-File
-Version:        1.22
-Release:        3%{?dist}
+Version:        1.25
+Release:        1%{?dist}
 Summary:        Test file attributes
 
 Group:          Development/Libraries
@@ -13,6 +13,7 @@
 BuildRequires:  perl(Test::Builder) >= 0.33
 BuildRequires:  perl(Test::Builder::Tester) >= 1.04
 BuildRequires:  perl(Test::Prereq) >= 1.0
+BuildRequires:  perl(Test::Manifest) >= 1.14
 BuildRequires:  perl(Test::Pod)
 BuildRequires:  perl(Test::Pod::Coverage)
 BuildRequires:  perl(Test::More) >= 0.65
@@ -55,6 +56,9 @@
 
 
 %changelog
+* Tue Jan 20 2009 Ralf Cors??pius <corsepiu at fedoraproject.org> - 1.25-1
+- Upstream update.
+
 * Mon Mar  3 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1.22-3
 - helps if you upload new source
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-File/F-10/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	3 Mar 2008 22:52:26 -0000	1.3
+++ sources	20 Jan 2009 03:32:03 -0000	1.4
@@ -1 +1 @@
-9b757d50c8fd6526ac21c5c389bba2a1  Test-File-1.22.tar.gz
+eb995de00c18bccc6919bdc00847244e  Test-File-1.25.tar.gz



From corsepiu at fedoraproject.org  Tue Jan 20 03:32:34 2009
From: corsepiu at fedoraproject.org (=?utf-8?q?Ralf_Cors=C3=A9pius?=)
Date: Tue, 20 Jan 2009 03:32:34 +0000 (UTC)
Subject: rpms/perl-Test-File/F-9 .cvsignore, 1.3, 1.4 perl-Test-File.spec,
	1.5, 1.6 sources, 1.3, 1.4
Message-ID: <20090120033234.7088E70142@cvs1.fedora.phx.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-Test-File/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6003/F-9

Modified Files:
	.cvsignore perl-Test-File.spec sources 
Log Message:
* Tue Jan 20 2009 Ralf Cors??pius <corsepiu at fedoraproject.org> - 1.25-1
- Upstream update.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-File/F-9/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	3 Mar 2008 22:52:26 -0000	1.3
+++ .cvsignore	20 Jan 2009 03:32:04 -0000	1.4
@@ -1 +1 @@
-Test-File-1.22.tar.gz
+Test-File-1.25.tar.gz


Index: perl-Test-File.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-File/F-9/perl-Test-File.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perl-Test-File.spec	3 Mar 2008 22:52:26 -0000	1.5
+++ perl-Test-File.spec	20 Jan 2009 03:32:04 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           perl-Test-File
-Version:        1.22
-Release:        3%{?dist}
+Version:        1.25
+Release:        1%{?dist}
 Summary:        Test file attributes
 
 Group:          Development/Libraries
@@ -13,6 +13,7 @@
 BuildRequires:  perl(Test::Builder) >= 0.33
 BuildRequires:  perl(Test::Builder::Tester) >= 1.04
 BuildRequires:  perl(Test::Prereq) >= 1.0
+BuildRequires:  perl(Test::Manifest) >= 1.14
 BuildRequires:  perl(Test::Pod)
 BuildRequires:  perl(Test::Pod::Coverage)
 BuildRequires:  perl(Test::More) >= 0.65
@@ -55,6 +56,9 @@
 
 
 %changelog
+* Tue Jan 20 2009 Ralf Cors??pius <corsepiu at fedoraproject.org> - 1.25-1
+- Upstream update.
+
 * Mon Mar  3 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1.22-3
 - helps if you upload new source
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-File/F-9/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	3 Mar 2008 22:52:26 -0000	1.3
+++ sources	20 Jan 2009 03:32:04 -0000	1.4
@@ -1 +1 @@
-9b757d50c8fd6526ac21c5c389bba2a1  Test-File-1.22.tar.gz
+eb995de00c18bccc6919bdc00847244e  Test-File-1.25.tar.gz



From clumens at fedoraproject.org  Tue Jan 20 03:48:56 2009
From: clumens at fedoraproject.org (Christopher Edward Lumens)
Date: Tue, 20 Jan 2009 03:48:56 +0000 (UTC)
Subject: rpms/anaconda/devel .cvsignore, 1.599, 1.600 anaconda.spec, 1.743, 
	1.744 sources, 1.734, 1.735
Message-ID: <20090120034856.B6862700F9@cvs1.fedora.phx.redhat.com>

Author: clumens

Update of /cvs/pkgs/rpms/anaconda/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7721

Modified Files:
	.cvsignore anaconda.spec sources 
Log Message:
New version.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/devel/.cvsignore,v
retrieving revision 1.599
retrieving revision 1.600
diff -u -r1.599 -r1.600
--- .cvsignore	17 Jan 2009 04:53:35 -0000	1.599
+++ .cvsignore	20 Jan 2009 03:48:26 -0000	1.600
@@ -1,2 +1,3 @@
 anaconda-11.5.0.8.tar.bz2
 anaconda-11.5.0.9.tar.bz2
+anaconda-11.5.0.10.tar.bz2


Index: anaconda.spec
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/devel/anaconda.spec,v
retrieving revision 1.743
retrieving revision 1.744
diff -u -r1.743 -r1.744
--- anaconda.spec	17 Jan 2009 04:53:35 -0000	1.743
+++ anaconda.spec	20 Jan 2009 03:48:26 -0000	1.744
@@ -2,7 +2,7 @@
 
 Summary: Graphical system installer
 Name:    anaconda
-Version: 11.5.0.9
+Version: 11.5.0.10
 Release: 1
 License: GPLv2+
 Group:   Applications/System
@@ -204,6 +204,13 @@
 %endif
 
 %changelog
+* Mon Jan 19 2009 Chris Lumens <clumens at redhat.com> - 11.5.0.10-1
+- btrfs install support (sandeen)
+- Default / to be ext4 (katzj)
+- Allow live installs to use ext4 as root and make the error message clearer
+  (katzj)
+- Add support for Maithili and Nepali (#473209). (clumens)
+
 * Fri Jan 16 2009 Chris Lumens <clumens at redhat.com> - 11.5.0.9-1
 - Cracklib moved locations, account for this in our keepfiles. (jkeating)
 - Look in the right path for kernel module lists. (jkeating)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/devel/sources,v
retrieving revision 1.734
retrieving revision 1.735
diff -u -r1.734 -r1.735
--- sources	17 Jan 2009 04:53:35 -0000	1.734
+++ sources	20 Jan 2009 03:48:26 -0000	1.735
@@ -1 +1 @@
-886a92d1d01fa2d5853b508d6c77681d  anaconda-11.5.0.9.tar.bz2
+50f5ac4610bf4e67cac2b2f27d276f35  anaconda-11.5.0.10.tar.bz2



From rstrode at fedoraproject.org  Tue Jan 20 03:49:46 2009
From: rstrode at fedoraproject.org (Ray Strode)
Date: Tue, 20 Jan 2009 03:49:46 +0000 (UTC)
Subject: rpms/gnome-settings-daemon/devel gnome-settings-daemon.spec, 1.91, 
	1.92
Message-ID: <20090120034946.88572700F9@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-serv7831

Modified Files:
	gnome-settings-daemon.spec 
Log Message:
Bump minimum version for gnome-desktop



Index: gnome-settings-daemon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-settings-daemon/devel/gnome-settings-daemon.spec,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -r1.91 -r1.92
--- gnome-settings-daemon.spec	20 Jan 2009 02:04:25 -0000	1.91
+++ gnome-settings-daemon.spec	20 Jan 2009 03:49:16 -0000	1.92
@@ -17,7 +17,7 @@
 BuildRequires:	GConf2-devel
 BuildRequires:	gtk2-devel
 BuildRequires:	gnome-vfs2-devel
-BuildRequires:	gnome-desktop-devel >= 2.23.91-3
+BuildRequires:	gnome-desktop-devel >= 2.25.5-2
 BuildRequires:	libglade2-devel
 BuildRequires:	libgnomeui-devel
 BuildRequires:	libgnome-devel



From rstrode at fedoraproject.org  Tue Jan 20 03:51:27 2009
From: rstrode at fedoraproject.org (Ray Strode)
Date: Tue, 20 Jan 2009 03:51:27 +0000 (UTC)
Subject: rpms/nautilus/devel nautilus.spec,1.251,1.252
Message-ID: <20090120035127.1E50D70141@cvs1.fedora.phx.redhat.com>

Author: rstrode

Update of /cvs/pkgs/rpms/nautilus/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8078

Modified Files:
	nautilus.spec 
Log Message:
Update minimum version req for gnome-desktop



Index: nautilus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nautilus/devel/nautilus.spec,v
retrieving revision 1.251
retrieving revision 1.252
diff -u -r1.251 -r1.252
--- nautilus.spec	20 Jan 2009 02:22:22 -0000	1.251
+++ nautilus.spec	20 Jan 2009 03:50:56 -0000	1.252
@@ -5,7 +5,7 @@
 %define libxml2_version 2.4.20
 %define desktop_backgrounds_version 2.0-4
 %define desktop_file_utils_version 0.7
-%define gnome_desktop_version 2.9.91
+%define gnome_desktop_version 2.25.2
 %define redhat_menus_version 0.25
 %define startup_notification_version 0.5
 %define libexif_version 0.5.12



From rstrode at fedoraproject.org  Tue Jan 20 03:58:14 2009
From: rstrode at fedoraproject.org (Ray Strode)
Date: Tue, 20 Jan 2009 03:58:14 +0000 (UTC)
Subject: rpms/gnome-settings-daemon/devel gnome-settings-daemon.spec, 1.92, 
	1.93
Message-ID: <20090120035814.693D9700F9@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-serv9661

Modified Files:
	gnome-settings-daemon.spec 
Log Message:
Be slightly less picky about gnome-desktop version req



Index: gnome-settings-daemon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-settings-daemon/devel/gnome-settings-daemon.spec,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -r1.92 -r1.93
--- gnome-settings-daemon.spec	20 Jan 2009 03:49:16 -0000	1.92
+++ gnome-settings-daemon.spec	20 Jan 2009 03:57:44 -0000	1.93
@@ -17,7 +17,7 @@
 BuildRequires:	GConf2-devel
 BuildRequires:	gtk2-devel
 BuildRequires:	gnome-vfs2-devel
-BuildRequires:	gnome-desktop-devel >= 2.25.5-2
+BuildRequires:	gnome-desktop-devel >= 2.25.5
 BuildRequires:	libglade2-devel
 BuildRequires:	libgnomeui-devel
 BuildRequires:	libgnome-devel



From rstrode at fedoraproject.org  Tue Jan 20 04:04:45 2009
From: rstrode at fedoraproject.org (Ray Strode)
Date: Tue, 20 Jan 2009 04:04:45 +0000 (UTC)
Subject: rpms/nautilus/devel nautilus.spec,1.252,1.253
Message-ID: <20090120040445.406A9700F9@cvs1.fedora.phx.redhat.com>

Author: rstrode

Update of /cvs/pkgs/rpms/nautilus/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10477

Modified Files:
	nautilus.spec 
Log Message:
One more try at adding a proper gnome-desktop version req



Index: nautilus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nautilus/devel/nautilus.spec,v
retrieving revision 1.252
retrieving revision 1.253
diff -u -r1.252 -r1.253
--- nautilus.spec	20 Jan 2009 03:50:56 -0000	1.252
+++ nautilus.spec	20 Jan 2009 04:04:14 -0000	1.253
@@ -5,7 +5,7 @@
 %define libxml2_version 2.4.20
 %define desktop_backgrounds_version 2.0-4
 %define desktop_file_utils_version 0.7
-%define gnome_desktop_version 2.25.2
+%define gnome_desktop_version 2.25.5
 %define redhat_menus_version 0.25
 %define startup_notification_version 0.5
 %define libexif_version 0.5.12



From mtasaka at fedoraproject.org  Tue Jan 20 04:07:34 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Tue, 20 Jan 2009 04:07:34 +0000 (UTC)
Subject: rpms/jd/F-10 .cvsignore, 1.338, 1.339 jd.spec, 1.393, 1.394 sources,
	1.339, 1.340
Message-ID: <20090120040734.E8890700F9@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11140/F-10

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
* Tue Jan 20 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
- rev 2631



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/F-10/.cvsignore,v
retrieving revision 1.338
retrieving revision 1.339
diff -u -r1.338 -r1.339
--- .cvsignore	18 Jan 2009 04:51:13 -0000	1.338
+++ .cvsignore	20 Jan 2009 04:07:04 -0000	1.339
@@ -1 +1 @@
-jd-2.2.0-svn2628_trunk.tgz
+jd-2.2.0-svn2631_trunk.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/F-10/jd.spec,v
retrieving revision 1.393
retrieving revision 1.394
diff -u -r1.393 -r1.394
--- jd.spec	18 Jan 2009 04:57:50 -0000	1.393
+++ jd.spec	20 Jan 2009 04:07:04 -0000	1.394
@@ -10,7 +10,7 @@
 # Defined by upsteam
 #
 %define         main_ver      2.2.0
-%define         strtag        svn2628_trunk
+%define         strtag        svn2631_trunk
 %define         repoid        36802
 # Define this if this is pre-version
 %define         pre_release   1
@@ -45,7 +45,7 @@
 
 Name:           jd
 Version:        %{main_ver}
-Release:        %{rel}.1
+Release:        %{rel}
 Summary:        A 2ch browser
 
 Group:          Applications/Internet
@@ -133,8 +133,8 @@
 %{icondir}/%{name}.png
 
 %changelog
-* Sun Jan 18 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
-- rev 2628
+* Tue Jan 20 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- rev 2631
 
 * Tue Dec 30 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.1.0-2
 - Workaround for the issue on res 868 in JD 6 thread (segv when


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/F-10/sources,v
retrieving revision 1.339
retrieving revision 1.340
diff -u -r1.339 -r1.340
--- sources	18 Jan 2009 04:51:13 -0000	1.339
+++ sources	20 Jan 2009 04:07:04 -0000	1.340
@@ -1 +1 @@
-db32c6c454eb59ba1b2c50aa7b93bf43  jd-2.2.0-svn2628_trunk.tgz
+b4d02a885d675cd4dbfd5455a4e892a1  jd-2.2.0-svn2631_trunk.tgz



From mtasaka at fedoraproject.org  Tue Jan 20 04:07:35 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Tue, 20 Jan 2009 04:07:35 +0000 (UTC)
Subject: rpms/jd/F-9 .cvsignore, 1.338, 1.339 jd.spec, 1.384, 1.385 sources, 
	1.339, 1.340
Message-ID: <20090120040735.90C86700F9@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11140/F-9

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
* Tue Jan 20 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
- rev 2631



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/F-9/.cvsignore,v
retrieving revision 1.338
retrieving revision 1.339
diff -u -r1.338 -r1.339
--- .cvsignore	18 Jan 2009 04:51:14 -0000	1.338
+++ .cvsignore	20 Jan 2009 04:07:05 -0000	1.339
@@ -1 +1 @@
-jd-2.2.0-svn2628_trunk.tgz
+jd-2.2.0-svn2631_trunk.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/F-9/jd.spec,v
retrieving revision 1.384
retrieving revision 1.385
diff -u -r1.384 -r1.385
--- jd.spec	18 Jan 2009 04:57:50 -0000	1.384
+++ jd.spec	20 Jan 2009 04:07:05 -0000	1.385
@@ -10,7 +10,7 @@
 # Defined by upsteam
 #
 %define         main_ver      2.2.0
-%define         strtag        svn2628_trunk
+%define         strtag        svn2631_trunk
 %define         repoid        36802
 # Define this if this is pre-version
 %define         pre_release   1
@@ -45,7 +45,7 @@
 
 Name:           jd
 Version:        %{main_ver}
-Release:        %{rel}.1
+Release:        %{rel}
 Summary:        A 2ch browser
 
 Group:          Applications/Internet
@@ -133,8 +133,8 @@
 %{icondir}/%{name}.png
 
 %changelog
-* Sun Jan 18 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
-- rev 2628
+* Tue Jan 20 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- rev 2631
 
 * Tue Dec 30 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.1.0-2
 - Workaround for the issue on res 868 in JD 6 thread (segv when


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/F-9/sources,v
retrieving revision 1.339
retrieving revision 1.340
diff -u -r1.339 -r1.340
--- sources	18 Jan 2009 04:51:14 -0000	1.339
+++ sources	20 Jan 2009 04:07:05 -0000	1.340
@@ -1 +1 @@
-db32c6c454eb59ba1b2c50aa7b93bf43  jd-2.2.0-svn2628_trunk.tgz
+b4d02a885d675cd4dbfd5455a4e892a1  jd-2.2.0-svn2631_trunk.tgz



From mtasaka at fedoraproject.org  Tue Jan 20 04:07:36 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Tue, 20 Jan 2009 04:07:36 +0000 (UTC)
Subject: rpms/jd/devel .cvsignore, 1.329, 1.330 jd.spec, 1.385, 1.386 sources,
	1.330, 1.331
Message-ID: <20090120040736.19678700F9@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11140/devel

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
* Tue Jan 20 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
- rev 2631



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/.cvsignore,v
retrieving revision 1.329
retrieving revision 1.330
diff -u -r1.329 -r1.330
--- .cvsignore	18 Jan 2009 04:26:07 -0000	1.329
+++ .cvsignore	20 Jan 2009 04:07:05 -0000	1.330
@@ -1 +1 @@
-jd-2.2.0-svn2628_trunk.tgz
+jd-2.2.0-svn2631_trunk.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/jd.spec,v
retrieving revision 1.385
retrieving revision 1.386
diff -u -r1.385 -r1.386
--- jd.spec	18 Jan 2009 04:16:19 -0000	1.385
+++ jd.spec	20 Jan 2009 04:07:05 -0000	1.386
@@ -10,7 +10,7 @@
 # Defined by upsteam
 #
 %define         main_ver      2.2.0
-%define         strtag        svn2628_trunk
+%define         strtag        svn2631_trunk
 %define         repoid        36802
 # Define this if this is pre-version
 %define         pre_release   1
@@ -133,8 +133,8 @@
 %{icondir}/%{name}.png
 
 %changelog
-* Sun Jan 18 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
-- rev 2628
+* Tue Jan 20 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- rev 2631
 
 * Tue Dec 30 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.1.0-2
 - Workaround for the issue on res 868 in JD 6 thread (segv when


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/sources,v
retrieving revision 1.330
retrieving revision 1.331
diff -u -r1.330 -r1.331
--- sources	18 Jan 2009 04:26:07 -0000	1.330
+++ sources	20 Jan 2009 04:07:05 -0000	1.331
@@ -1 +1 @@
-db32c6c454eb59ba1b2c50aa7b93bf43  jd-2.2.0-svn2628_trunk.tgz
+b4d02a885d675cd4dbfd5455a4e892a1  jd-2.2.0-svn2631_trunk.tgz



From mtasaka at fedoraproject.org  Tue Jan 20 04:07:35 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Tue, 20 Jan 2009 04:07:35 +0000 (UTC)
Subject: rpms/jd/F-8 .cvsignore, 1.330, 1.331 jd.spec, 1.372, 1.373 sources, 
	1.331, 1.332
Message-ID: <20090120040735.2497D700F9@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11140/F-8

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
* Tue Jan 20 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
- rev 2631



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/F-8/.cvsignore,v
retrieving revision 1.330
retrieving revision 1.331
diff -u -r1.330 -r1.331
--- .cvsignore	28 Dec 2008 15:37:57 -0000	1.330
+++ .cvsignore	20 Jan 2009 04:07:04 -0000	1.331
@@ -1 +1 @@
-jd-2.1.0-081228.tgz
+jd-2.2.0-svn2631_trunk.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/F-8/jd.spec,v
retrieving revision 1.372
retrieving revision 1.373
diff -u -r1.372 -r1.373
--- jd.spec	30 Dec 2008 02:13:22 -0000	1.372
+++ jd.spec	20 Jan 2009 04:07:04 -0000	1.373
@@ -9,17 +9,17 @@
 ##########################################
 # Defined by upsteam
 #
-%define         main_ver      2.1.0
-%define         strtag        081228
+%define         main_ver      2.2.0
+%define         strtag        svn2631_trunk
 %define         repoid        36802
 # Define this if this is pre-version
-%define         pre_release   0
+%define         pre_release   1
 ##########################################
 
 ##########################################
 # Defined by vendor
 #
-%define         vendor_rel    2
+%define         vendor_rel    1
 %define         extra_rel     %{nil}
 # Tag name changed from vendor to vendorname so as not to
 # overwrite Vendor entry in Summary
@@ -53,7 +53,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-2.1.0-issue-jd6-868.patch 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  %{gtkmmdevel}
@@ -79,7 +78,6 @@
 
 %prep
 %setup -q -n %{name}-%{main_ver}-%{strtag}
-%patch0 -p0 -b .issue868
 #find . -name .svn | sort -r | xargs %{__rm} -rf
 
 sh autogen.sh
@@ -135,6 +133,9 @@
 %{icondir}/%{name}.png
 
 %changelog
+* Tue Jan 20 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- rev 2631
+
 * Tue Dec 30 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.1.0-2
 - Workaround for the issue on res 868 in JD 6 thread (segv when
   bookmarking when bookmark is empty)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/F-8/sources,v
retrieving revision 1.331
retrieving revision 1.332
diff -u -r1.331 -r1.332
--- sources	28 Dec 2008 15:37:58 -0000	1.331
+++ sources	20 Jan 2009 04:07:04 -0000	1.332
@@ -1 +1 @@
-e5d2294bf3635cd81b530bedbbcf0016  jd-2.1.0-081228.tgz
+b4d02a885d675cd4dbfd5455a4e892a1  jd-2.2.0-svn2631_trunk.tgz



From mtasaka at fedoraproject.org  Tue Jan 20 04:07:41 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Tue, 20 Jan 2009 04:07:41 +0000 (UTC)
Subject: rpms/rubygem-nokogiri/F-10 jd.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090120040741.8E1A9700F9@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/rubygem-nokogiri/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11189/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	jd.spec 
Log Message:
Initial commit


--- NEW FILE jd.spec ---
##########################################
# For using svn: do
# export SVNROOT="http://svn.sourceforge.jp/svnroot/jd4linux/jd"
# svn checkout $SVNROOT/trunk
# mv trunk jd-%%{main_ver}-%%{strtag}
# tar czf jd-%%{main_ver}-%%{strtag}.tgz jd-%%{main_ver}-%%{strtag}
##########################################

##########################################
# Defined by upsteam
#
%define         main_ver      2.2.0
%define         strtag        svn2631_trunk
%define         repoid        36802
# Define this if this is pre-version
%define         pre_release   1
##########################################

##########################################
# Defined by vendor
#
%define         vendor_rel    1
%define         extra_rel     %{nil}
# Tag name changed from vendor to vendorname so as not to
# overwrite Vendor entry in Summary
%define         vendorname    fedora
%define         gtkmmdevel    gtkmm24-devel
%define         fontpackage   mona-fonts-VLGothic
%define         icondir       %{_datadir}/icons/hicolor/96x96/apps/
##########################################

##########################################
%if %{pre_release}
%define         rel           0.%{vendor_rel}.%{strtag}%{?extra_rel}%{?dist}
%else
%define         rel           %{vendor_rel}%{?dist}
%endif

# By default, Migemo support is disabled.
%if             0%{?fedora} >= 5
%define         _with_migemo  1
%endif
%define         migemo_dict   %{_datadir}/cmigemo/utf-8/migemo-dict
##########################################

Name:           jd
Version:        %{main_ver}
Release:        %{rel}
Summary:        A 2ch browser

Group:          Applications/Internet
License:        GPLv2
URL:            http://jd4linux.sourceforge.jp/
Source0:        http://downloads.sourceforge.jp/jd4linux/%{repoid}/%{name}-%{main_ver}-%{strtag}.tgz
#Source0:	%{name}-%{main_ver}-%{strtag}.tgz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  %{gtkmmdevel}
BuildRequires:  libtool automake
BuildRequires:  gnutls-devel
BuildRequires:  desktop-file-utils
BuildRequires:  libSM-devel
%if 0%{?_with_migemo} >= 1
BuildRequires:  cmigemo-devel
%endif
BuildRequires:  alsa-lib-devel
%if 0%{?fedora} > 8
BuildRequires:  oniguruma-devel
%endif
%if %{pre_release}
BuildRequires:	subversion
%endif
Requires:       %{fontpackage}


%description
JD is a 2ch browser based on gtkmm2.

%prep
%setup -q -n %{name}-%{main_ver}-%{strtag}
#find . -name .svn | sort -r | xargs %{__rm} -rf

sh autogen.sh

%build
# set TZ for __TIME__
export TZ='Asia/Tokyo'

%configure \
   --with-alsa \
%if 0%{?fedora} > 8
   --with-oniguruma \
%endif
   --with-xdgopen \
%if 0%{?_with_migemo} >= 1
   --with-migemo \
   --with-migemodict=%{migemo_dict}
%endif

%{__make} %{?_smp_mflags}


%install
%{__rm} -rf $RPM_BUILD_ROOT
%{__make} install DESTDIR=$RPM_BUILD_ROOT

%{__mkdir_p} $RPM_BUILD_ROOT%{icondir}
%{__install} -p -m 644 %{name}.png $RPM_BUILD_ROOT%{icondir}

desktop-file-install \
   --vendor %{vendorname} \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
   --delete-original \
   $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop

%clean
%{__rm} -rf $RPM_BUILD_ROOT

%post
touch --no-create %{_datadir}/icons/hicolor || :
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :

%postun
touch --no-create %{_datadir}/icons/hicolor || :
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :

%files
%defattr(-,root,root,-)
%doc COPYING ChangeLog README
%{_bindir}/%{name}
%{_datadir}/applications/%{vendorname}-%{name}.desktop
%{_datadir}/pixmaps/%{name}.png
%{icondir}/%{name}.png

%changelog
* Tue Jan 20 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
- rev 2631

* Tue Dec 30 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.1.0-2
- Workaround for the issue on res 868 in JD 6 thread (segv when
  bookmarking when bookmark is empty)

* Mon Dec 29 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.1.0-1
- 2.1.0

* Sun Dec 28 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
- rev 2608 (patched against previous rc)

* Tue Dec 23 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.1.0-0.5.rc081223
- 2.1.0 rc 081223

* Sat Dec 20 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
- rev 2579
- Use oniguruma on F-9+ for regex

* Tue Dec 16 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.1.0-0.2.beta081216
- 2.1.0 beta 081216

* Mon Nov 24 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.0.3-1
- 2.0.3

* Tue Nov 18 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.0.3-0.3.rc081117
- 2.0.3 rc 081117

* Mon Nov 10 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.0.3-0.2.beta081110
- 2.0.3 beta 081110

* 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

* 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

* 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

* 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

* Mon Jul 28 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.0.0-2
- Change Japanese fonts Requires (F-10+)

* Wed Jul 23 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.0.0-1
- 2.0.0

* Mon Jul 14 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.0.0-0.8.rc080714
- 2.0.0 rc 080714

* Thu Jul  3 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.0.0-0.7.beta20080702
- 2.0.0 beta 20080702

* Tue Jun 24 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
- F-10: rebuild against new gnutls
- F-10: kill subversion tagging until dependency is solved.

* Mon Jun  2 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.0.0-0.6.beta20080601
- 2.0.0 beta 20080601

* Mon Jun  2 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.0.0-0.5.svn2081_trunk
- Workarround for bug 449225

* Sun May 25 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.0.0-0.5.svn2066_trunk
- Enable alsa

* Fri Apr 18 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.0.0-0.4.beta080418
- 2.0.0 beta 080418

* Tue Apr 15 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.9.9-1
- 1.9.9

* Wed Apr  9 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.9.9-0.3.rc080408
- 1.9.9 rc 080408

* Sun Mar 23 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> 
- Workaround for bug 438600

* Mon Feb 25 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.9.9-0.3.beta080225
- 1.9.9 beta 080225

* Sat Feb  9 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
- Remove patch for gcc43 (applied by upstream)
- Remove workarround for libsigc++ side bug

* Fri Feb  8 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.0.0-0.2.svn1774
- Patch to make jd happy with gcc43
- Workarround for libsigc++ side bug (bug 431017)

* Fri Dec 28 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.9.8-1
- 1.9.8

* Sun Dec 23 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.9.8-0.5.rc071223
- 1.9.8 rc 071223

* Tue Dec 18 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.9.8-0.4,beta071218
- 1.9.8 beta 071218

* Mon Dec 10 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.9.8-0.3.beta071210
- 1.9.8 beta 071210

* Sun Dec  9 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
- Switch from openssl to gnutls

* Thu Nov 22 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.9.7-1
- 1.9.7

* Thu Nov 15 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.9.7-0.4.rc071105
- 1.9.7 rc 071115

* Fri Nov  9 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.9.7-0.3.beta071109
- 1.9.7 beta 071109

* Fri Nov  2 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyoa.c.jp> - 1.9.7-0.2.beta071101
- 1.9.7 beta 071101

* Fri Oct  5 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.9.6-1
- 1.9.6

* Sun Sep 30 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.9.6-0.6.rc070930
- 1.9.6 rc 070930

* Tue Sep 18 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.9.6-0.5.beta070918
- 1.9.6 beta 070918

* Sun Aug  5 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.9.6-0.2.beta070804
- 1.9.6 beta 070804 release 2

* Sat Aug  4 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.9.6-0.1.beta070804
- 1.9.6 beta 070804

* Sat Jun 30 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.9.5-1
- 1.9.5

* Mon Jun 25 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.9.5-0.6.rc070625
- 1.9.5 rc 070625

* Sat Jun 16 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.9.5-0.5.beta070616
- 1.9.5 beta 070616

* Mon Jun 11 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.9.5-0.4.beta070611
- 1.9.5 beta 070611

* Mon May 28 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.9.5-0.3.beta070528
- 1.9.5 beta 070528

* Tue May 22 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.9.5-0.2.beta070516
- Support C/Migemo search

* Tue May 15 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.9.5-0.1.beta070516
- 1.9.5 beta 070516

* Tue Apr  3 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.8.8-1
- 1.8.8

* Fri Mar 30 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.8.8-0.3.rc070330
- 1.8.8 rc 070330

* Fri Mar 23 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.8.8-0.3.beta070324
- 1.8.8 beta 070324

* Sat Mar 17 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.8.8-0.2.beta070317
- 1.8.8 beta 070317

* Sun Feb 18 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.8.8-0.1.beta070218
- 1.8.8 beta 070218

* Fri Feb  2 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.8.5-1
- 1.8.5

* Sun Jan 21 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.8.5-0.3.rc071121
- 1.8.5 rc 071121

* Sun Jan 14 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.8.5-0.3.beta071114
- 1.8.5 beta 070114

* Sun Jan  7 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.8.5-0.2.beta061227
- Add fix for zero-inserted dat problem

* Tue Dec 26 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.8.5-0.1.beta061227
- 1.8.5 beta 061227

* Sun Dec 17 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.8.1-1
- 1.8.1

* Tue Dec 12 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.8.1-0.2.rc061213
- 1.8.1 rc 061213

* Sat Dec  2 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.8.1-0.2.beta061202
- 1.8.1 beta 061202

* Tue Nov 14 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.8.0-1
- 1.8.0

* Wed Nov  8 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.8.0-0.5.rc061108
- 1.8.0 rc 061108

* Fri Nov  3 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.8.0-0.5.beta061103
- 1.8.0 beta 061103

* Sat Oct 28 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.8.0-0.4.cvs061028
- Detect libSM and libICE for x86_64.
- cvs 061028 (23:59 JST)

* Wed Oct 25 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.8.0-0.3.beta061023
- Remove some category from desktop files due to
  desktop-file-utils change.

* Tue Oct 24 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.8.0-0.2.beta061023
- 1.8.0 beta 061023

* Sun Oct 22 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.8.0-0.1.cvs061022
- cvs 061022 (23:59 JST)

* Mon Oct  9 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.8.0-0.1.beta061009
- 1.8.0 beta 061009

* Sat Oct  7 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.7.0-2
- Add libSM-devel to BuildRequires.

* Wed Sep 27 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.7.0-1
- 1.7.0

* Mon Sep 25 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.7.0-0.1.rc060921
- Import to Fedora Extras.

* Sun Mar  9 2006 Houritsuchu <houritsuchu at hotmail.com>
- Version up.
- add icon

* Sat Feb 25 2006 Houritsuchu <houritsuchu at hotmail.com>
- first


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rubygem-nokogiri/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	19 Jan 2009 23:00:12 -0000	1.1
+++ .cvsignore	20 Jan 2009 04:07:11 -0000	1.2
@@ -0,0 +1 @@
+nokogiri-1.1.1.gem


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rubygem-nokogiri/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	19 Jan 2009 23:00:12 -0000	1.1
+++ sources	20 Jan 2009 04:07:11 -0000	1.2
@@ -0,0 +1 @@
+b19b59f23eba388bd907c6cf3786289d  nokogiri-1.1.1.gem



From mtasaka at fedoraproject.org  Tue Jan 20 04:07:41 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Tue, 20 Jan 2009 04:07:41 +0000 (UTC)
Subject: rpms/rubygem-nokogiri/F-9 jd.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090120040741.D287B700F9@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/rubygem-nokogiri/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11189/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	jd.spec 
Log Message:
Initial commit


--- NEW FILE jd.spec ---
##########################################
# For using svn: do
# export SVNROOT="http://svn.sourceforge.jp/svnroot/jd4linux/jd"
# svn checkout $SVNROOT/trunk
# mv trunk jd-%%{main_ver}-%%{strtag}
# tar czf jd-%%{main_ver}-%%{strtag}.tgz jd-%%{main_ver}-%%{strtag}
##########################################

##########################################
# Defined by upsteam
#
%define         main_ver      2.2.0
%define         strtag        svn2631_trunk
%define         repoid        36802
# Define this if this is pre-version
%define         pre_release   1
##########################################

##########################################
# Defined by vendor
#
%define         vendor_rel    1
%define         extra_rel     %{nil}
# Tag name changed from vendor to vendorname so as not to
# overwrite Vendor entry in Summary
%define         vendorname    fedora
%define         gtkmmdevel    gtkmm24-devel
%define         fontpackage   mona-fonts-VLGothic
%define         icondir       %{_datadir}/icons/hicolor/96x96/apps/
##########################################

##########################################
%if %{pre_release}
%define         rel           0.%{vendor_rel}.%{strtag}%{?extra_rel}%{?dist}
%else
%define         rel           %{vendor_rel}%{?dist}
%endif

# By default, Migemo support is disabled.
%if             0%{?fedora} >= 5
%define         _with_migemo  1
%endif
%define         migemo_dict   %{_datadir}/cmigemo/utf-8/migemo-dict
##########################################

Name:           jd
Version:        %{main_ver}
Release:        %{rel}
Summary:        A 2ch browser

Group:          Applications/Internet
License:        GPLv2
URL:            http://jd4linux.sourceforge.jp/
Source0:        http://downloads.sourceforge.jp/jd4linux/%{repoid}/%{name}-%{main_ver}-%{strtag}.tgz
#Source0:	%{name}-%{main_ver}-%{strtag}.tgz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  %{gtkmmdevel}
BuildRequires:  libtool automake
BuildRequires:  gnutls-devel
BuildRequires:  desktop-file-utils
BuildRequires:  libSM-devel
%if 0%{?_with_migemo} >= 1
BuildRequires:  cmigemo-devel
%endif
BuildRequires:  alsa-lib-devel
%if 0%{?fedora} > 8
BuildRequires:  oniguruma-devel
%endif
%if %{pre_release}
BuildRequires:	subversion
%endif
Requires:       %{fontpackage}


%description
JD is a 2ch browser based on gtkmm2.

%prep
%setup -q -n %{name}-%{main_ver}-%{strtag}
#find . -name .svn | sort -r | xargs %{__rm} -rf

sh autogen.sh

%build
# set TZ for __TIME__
export TZ='Asia/Tokyo'

%configure \
   --with-alsa \
%if 0%{?fedora} > 8
   --with-oniguruma \
%endif
   --with-xdgopen \
%if 0%{?_with_migemo} >= 1
   --with-migemo \
   --with-migemodict=%{migemo_dict}
%endif

%{__make} %{?_smp_mflags}


%install
%{__rm} -rf $RPM_BUILD_ROOT
%{__make} install DESTDIR=$RPM_BUILD_ROOT

%{__mkdir_p} $RPM_BUILD_ROOT%{icondir}
%{__install} -p -m 644 %{name}.png $RPM_BUILD_ROOT%{icondir}

desktop-file-install \
   --vendor %{vendorname} \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
   --delete-original \
   $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop

%clean
%{__rm} -rf $RPM_BUILD_ROOT

%post
touch --no-create %{_datadir}/icons/hicolor || :
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :

%postun
touch --no-create %{_datadir}/icons/hicolor || :
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :

%files
%defattr(-,root,root,-)
%doc COPYING ChangeLog README
%{_bindir}/%{name}
%{_datadir}/applications/%{vendorname}-%{name}.desktop
%{_datadir}/pixmaps/%{name}.png
%{icondir}/%{name}.png

%changelog
* Tue Jan 20 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
- rev 2631

* Tue Dec 30 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.1.0-2
- Workaround for the issue on res 868 in JD 6 thread (segv when
  bookmarking when bookmark is empty)

* Mon Dec 29 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.1.0-1
- 2.1.0

* Sun Dec 28 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
- rev 2608 (patched against previous rc)

* Tue Dec 23 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.1.0-0.5.rc081223
- 2.1.0 rc 081223

* Sat Dec 20 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
- rev 2579
- Use oniguruma on F-9+ for regex

* Tue Dec 16 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.1.0-0.2.beta081216
- 2.1.0 beta 081216

* Mon Nov 24 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.0.3-1
- 2.0.3

* Tue Nov 18 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.0.3-0.3.rc081117
- 2.0.3 rc 081117

* Mon Nov 10 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.0.3-0.2.beta081110
- 2.0.3 beta 081110

* 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

* 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

* 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

* 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

* Mon Jul 28 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.0.0-2
- Change Japanese fonts Requires (F-10+)

* Wed Jul 23 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.0.0-1
- 2.0.0

* Mon Jul 14 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.0.0-0.8.rc080714
- 2.0.0 rc 080714

* Thu Jul  3 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.0.0-0.7.beta20080702
- 2.0.0 beta 20080702

* Tue Jun 24 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
- F-10: rebuild against new gnutls
- F-10: kill subversion tagging until dependency is solved.

* Mon Jun  2 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.0.0-0.6.beta20080601
- 2.0.0 beta 20080601

* Mon Jun  2 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.0.0-0.5.svn2081_trunk
- Workarround for bug 449225

* Sun May 25 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.0.0-0.5.svn2066_trunk
- Enable alsa

* Fri Apr 18 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.0.0-0.4.beta080418
- 2.0.0 beta 080418

* Tue Apr 15 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.9.9-1
- 1.9.9

* Wed Apr  9 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.9.9-0.3.rc080408
- 1.9.9 rc 080408

* Sun Mar 23 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> 
- Workaround for bug 438600

* Mon Feb 25 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.9.9-0.3.beta080225
- 1.9.9 beta 080225

* Sat Feb  9 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
- Remove patch for gcc43 (applied by upstream)
- Remove workarround for libsigc++ side bug

* Fri Feb  8 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.0.0-0.2.svn1774
- Patch to make jd happy with gcc43
- Workarround for libsigc++ side bug (bug 431017)

* Fri Dec 28 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.9.8-1
- 1.9.8

* Sun Dec 23 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.9.8-0.5.rc071223
- 1.9.8 rc 071223

* Tue Dec 18 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.9.8-0.4,beta071218
- 1.9.8 beta 071218

* Mon Dec 10 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.9.8-0.3.beta071210
- 1.9.8 beta 071210

* Sun Dec  9 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
- Switch from openssl to gnutls

* Thu Nov 22 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.9.7-1
- 1.9.7

* Thu Nov 15 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.9.7-0.4.rc071105
- 1.9.7 rc 071115

* Fri Nov  9 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.9.7-0.3.beta071109
- 1.9.7 beta 071109

* Fri Nov  2 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyoa.c.jp> - 1.9.7-0.2.beta071101
- 1.9.7 beta 071101

* Fri Oct  5 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.9.6-1
- 1.9.6

* Sun Sep 30 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.9.6-0.6.rc070930
- 1.9.6 rc 070930

* Tue Sep 18 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.9.6-0.5.beta070918
- 1.9.6 beta 070918

* Sun Aug  5 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.9.6-0.2.beta070804
- 1.9.6 beta 070804 release 2

* Sat Aug  4 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.9.6-0.1.beta070804
- 1.9.6 beta 070804

* Sat Jun 30 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.9.5-1
- 1.9.5

* Mon Jun 25 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.9.5-0.6.rc070625
- 1.9.5 rc 070625

* Sat Jun 16 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.9.5-0.5.beta070616
- 1.9.5 beta 070616

* Mon Jun 11 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.9.5-0.4.beta070611
- 1.9.5 beta 070611

* Mon May 28 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.9.5-0.3.beta070528
- 1.9.5 beta 070528

* Tue May 22 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.9.5-0.2.beta070516
- Support C/Migemo search

* Tue May 15 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.9.5-0.1.beta070516
- 1.9.5 beta 070516

* Tue Apr  3 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.8.8-1
- 1.8.8

* Fri Mar 30 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.8.8-0.3.rc070330
- 1.8.8 rc 070330

* Fri Mar 23 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.8.8-0.3.beta070324
- 1.8.8 beta 070324

* Sat Mar 17 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.8.8-0.2.beta070317
- 1.8.8 beta 070317

* Sun Feb 18 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.8.8-0.1.beta070218
- 1.8.8 beta 070218

* Fri Feb  2 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.8.5-1
- 1.8.5

* Sun Jan 21 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.8.5-0.3.rc071121
- 1.8.5 rc 071121

* Sun Jan 14 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.8.5-0.3.beta071114
- 1.8.5 beta 070114

* Sun Jan  7 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.8.5-0.2.beta061227
- Add fix for zero-inserted dat problem

* Tue Dec 26 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.8.5-0.1.beta061227
- 1.8.5 beta 061227

* Sun Dec 17 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.8.1-1
- 1.8.1

* Tue Dec 12 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.8.1-0.2.rc061213
- 1.8.1 rc 061213

* Sat Dec  2 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.8.1-0.2.beta061202
- 1.8.1 beta 061202

* Tue Nov 14 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.8.0-1
- 1.8.0

* Wed Nov  8 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.8.0-0.5.rc061108
- 1.8.0 rc 061108

* Fri Nov  3 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.8.0-0.5.beta061103
- 1.8.0 beta 061103

* Sat Oct 28 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.8.0-0.4.cvs061028
- Detect libSM and libICE for x86_64.
- cvs 061028 (23:59 JST)

* Wed Oct 25 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.8.0-0.3.beta061023
- Remove some category from desktop files due to
  desktop-file-utils change.

* Tue Oct 24 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.8.0-0.2.beta061023
- 1.8.0 beta 061023

* Sun Oct 22 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.8.0-0.1.cvs061022
- cvs 061022 (23:59 JST)

* Mon Oct  9 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.8.0-0.1.beta061009
- 1.8.0 beta 061009

* Sat Oct  7 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.7.0-2
- Add libSM-devel to BuildRequires.

* Wed Sep 27 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.7.0-1
- 1.7.0

* Mon Sep 25 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.7.0-0.1.rc060921
- Import to Fedora Extras.

* Sun Mar  9 2006 Houritsuchu <houritsuchu at hotmail.com>
- Version up.
- add icon

* Sat Feb 25 2006 Houritsuchu <houritsuchu at hotmail.com>
- first


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rubygem-nokogiri/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	19 Jan 2009 23:00:12 -0000	1.1
+++ .cvsignore	20 Jan 2009 04:07:11 -0000	1.2
@@ -0,0 +1 @@
+nokogiri-1.1.1.gem


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rubygem-nokogiri/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	19 Jan 2009 23:00:12 -0000	1.1
+++ sources	20 Jan 2009 04:07:11 -0000	1.2
@@ -0,0 +1 @@
+b19b59f23eba388bd907c6cf3786289d  nokogiri-1.1.1.gem



From mtasaka at fedoraproject.org  Tue Jan 20 04:07:42 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Tue, 20 Jan 2009 04:07:42 +0000 (UTC)
Subject: rpms/rubygem-nokogiri/devel jd.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090120040742.217F0700F9@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/rubygem-nokogiri/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11189/devel

Modified Files:
	.cvsignore sources 
Added Files:
	jd.spec 
Log Message:
Initial commit


--- NEW FILE jd.spec ---
##########################################
# For using svn: do
# export SVNROOT="http://svn.sourceforge.jp/svnroot/jd4linux/jd"
# svn checkout $SVNROOT/trunk
# mv trunk jd-%%{main_ver}-%%{strtag}
# tar czf jd-%%{main_ver}-%%{strtag}.tgz jd-%%{main_ver}-%%{strtag}
##########################################

##########################################
# Defined by upsteam
#
%define         main_ver      2.2.0
%define         strtag        svn2631_trunk
%define         repoid        36802
# Define this if this is pre-version
%define         pre_release   1
##########################################

##########################################
# Defined by vendor
#
%define         vendor_rel    1
%define         extra_rel     %{nil}
# Tag name changed from vendor to vendorname so as not to
# overwrite Vendor entry in Summary
%define         vendorname    fedora
%define         gtkmmdevel    gtkmm24-devel
%define         fontpackage   mona-fonts-VLGothic
%define         icondir       %{_datadir}/icons/hicolor/96x96/apps/
##########################################

##########################################
%if %{pre_release}
%define         rel           0.%{vendor_rel}.%{strtag}%{?extra_rel}%{?dist}
%else
%define         rel           %{vendor_rel}%{?dist}
%endif

# By default, Migemo support is disabled.
%if             0%{?fedora} >= 5
%define         _with_migemo  1
%endif
%define         migemo_dict   %{_datadir}/cmigemo/utf-8/migemo-dict
##########################################

Name:           jd
Version:        %{main_ver}
Release:        %{rel}
Summary:        A 2ch browser

Group:          Applications/Internet
License:        GPLv2
URL:            http://jd4linux.sourceforge.jp/
Source0:        http://downloads.sourceforge.jp/jd4linux/%{repoid}/%{name}-%{main_ver}-%{strtag}.tgz
#Source0:	%{name}-%{main_ver}-%{strtag}.tgz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  %{gtkmmdevel}
BuildRequires:  libtool automake
BuildRequires:  gnutls-devel
BuildRequires:  desktop-file-utils
BuildRequires:  libSM-devel
%if 0%{?_with_migemo} >= 1
BuildRequires:  cmigemo-devel
%endif
BuildRequires:  alsa-lib-devel
%if 0%{?fedora} > 8
BuildRequires:  oniguruma-devel
%endif
%if %{pre_release}
BuildRequires:	subversion
%endif
Requires:       %{fontpackage}


%description
JD is a 2ch browser based on gtkmm2.

%prep
%setup -q -n %{name}-%{main_ver}-%{strtag}
#find . -name .svn | sort -r | xargs %{__rm} -rf

sh autogen.sh

%build
# set TZ for __TIME__
export TZ='Asia/Tokyo'

%configure \
   --with-alsa \
%if 0%{?fedora} > 8
   --with-oniguruma \
%endif
   --with-xdgopen \
%if 0%{?_with_migemo} >= 1
   --with-migemo \
   --with-migemodict=%{migemo_dict}
%endif

%{__make} %{?_smp_mflags}


%install
%{__rm} -rf $RPM_BUILD_ROOT
%{__make} install DESTDIR=$RPM_BUILD_ROOT

%{__mkdir_p} $RPM_BUILD_ROOT%{icondir}
%{__install} -p -m 644 %{name}.png $RPM_BUILD_ROOT%{icondir}

desktop-file-install \
   --vendor %{vendorname} \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
   --delete-original \
   $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop

%clean
%{__rm} -rf $RPM_BUILD_ROOT

%post
touch --no-create %{_datadir}/icons/hicolor || :
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :

%postun
touch --no-create %{_datadir}/icons/hicolor || :
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :

%files
%defattr(-,root,root,-)
%doc COPYING ChangeLog README
%{_bindir}/%{name}
%{_datadir}/applications/%{vendorname}-%{name}.desktop
%{_datadir}/pixmaps/%{name}.png
%{icondir}/%{name}.png

%changelog
* Tue Jan 20 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
- rev 2631

* Tue Dec 30 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.1.0-2
- Workaround for the issue on res 868 in JD 6 thread (segv when
  bookmarking when bookmark is empty)

* Mon Dec 29 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.1.0-1
- 2.1.0

* Sun Dec 28 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
- rev 2608 (patched against previous rc)

* Tue Dec 23 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.1.0-0.5.rc081223
- 2.1.0 rc 081223

* Sat Dec 20 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
- rev 2579
- Use oniguruma on F-9+ for regex

* Tue Dec 16 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.1.0-0.2.beta081216
- 2.1.0 beta 081216

* Mon Nov 24 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.0.3-1
- 2.0.3

* Tue Nov 18 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.0.3-0.3.rc081117
- 2.0.3 rc 081117

* Mon Nov 10 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.0.3-0.2.beta081110
- 2.0.3 beta 081110

* 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

* 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

* 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

* 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

* Mon Jul 28 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.0.0-2
- Change Japanese fonts Requires (F-10+)

* Wed Jul 23 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.0.0-1
- 2.0.0

* Mon Jul 14 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.0.0-0.8.rc080714
- 2.0.0 rc 080714

* Thu Jul  3 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.0.0-0.7.beta20080702
- 2.0.0 beta 20080702

* Tue Jun 24 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
- F-10: rebuild against new gnutls
- F-10: kill subversion tagging until dependency is solved.

* Mon Jun  2 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.0.0-0.6.beta20080601
- 2.0.0 beta 20080601

* Mon Jun  2 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.0.0-0.5.svn2081_trunk
- Workarround for bug 449225

* Sun May 25 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.0.0-0.5.svn2066_trunk
- Enable alsa

* Fri Apr 18 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.0.0-0.4.beta080418
- 2.0.0 beta 080418

* Tue Apr 15 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.9.9-1
- 1.9.9

* Wed Apr  9 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.9.9-0.3.rc080408
- 1.9.9 rc 080408

* Sun Mar 23 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> 
- Workaround for bug 438600

* Mon Feb 25 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.9.9-0.3.beta080225
- 1.9.9 beta 080225

* Sat Feb  9 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
- Remove patch for gcc43 (applied by upstream)
- Remove workarround for libsigc++ side bug

* Fri Feb  8 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.0.0-0.2.svn1774
- Patch to make jd happy with gcc43
- Workarround for libsigc++ side bug (bug 431017)

* Fri Dec 28 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.9.8-1
- 1.9.8

* Sun Dec 23 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.9.8-0.5.rc071223
- 1.9.8 rc 071223

* Tue Dec 18 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.9.8-0.4,beta071218
- 1.9.8 beta 071218

* Mon Dec 10 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.9.8-0.3.beta071210
- 1.9.8 beta 071210

* Sun Dec  9 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
- Switch from openssl to gnutls

* Thu Nov 22 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.9.7-1
- 1.9.7

* Thu Nov 15 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.9.7-0.4.rc071105
- 1.9.7 rc 071115

* Fri Nov  9 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.9.7-0.3.beta071109
- 1.9.7 beta 071109

* Fri Nov  2 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyoa.c.jp> - 1.9.7-0.2.beta071101
- 1.9.7 beta 071101

* Fri Oct  5 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.9.6-1
- 1.9.6

* Sun Sep 30 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.9.6-0.6.rc070930
- 1.9.6 rc 070930

* Tue Sep 18 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.9.6-0.5.beta070918
- 1.9.6 beta 070918

* Sun Aug  5 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.9.6-0.2.beta070804
- 1.9.6 beta 070804 release 2

* Sat Aug  4 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.9.6-0.1.beta070804
- 1.9.6 beta 070804

* Sat Jun 30 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.9.5-1
- 1.9.5

* Mon Jun 25 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.9.5-0.6.rc070625
- 1.9.5 rc 070625

* Sat Jun 16 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.9.5-0.5.beta070616
- 1.9.5 beta 070616

* Mon Jun 11 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.9.5-0.4.beta070611
- 1.9.5 beta 070611

* Mon May 28 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.9.5-0.3.beta070528
- 1.9.5 beta 070528

* Tue May 22 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.9.5-0.2.beta070516
- Support C/Migemo search

* Tue May 15 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.9.5-0.1.beta070516
- 1.9.5 beta 070516

* Tue Apr  3 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.8.8-1
- 1.8.8

* Fri Mar 30 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.8.8-0.3.rc070330
- 1.8.8 rc 070330

* Fri Mar 23 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.8.8-0.3.beta070324
- 1.8.8 beta 070324

* Sat Mar 17 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.8.8-0.2.beta070317
- 1.8.8 beta 070317

* Sun Feb 18 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.8.8-0.1.beta070218
- 1.8.8 beta 070218

* Fri Feb  2 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.8.5-1
- 1.8.5

* Sun Jan 21 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.8.5-0.3.rc071121
- 1.8.5 rc 071121

* Sun Jan 14 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.8.5-0.3.beta071114
- 1.8.5 beta 070114

* Sun Jan  7 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.8.5-0.2.beta061227
- Add fix for zero-inserted dat problem

* Tue Dec 26 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.8.5-0.1.beta061227
- 1.8.5 beta 061227

* Sun Dec 17 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.8.1-1
- 1.8.1

* Tue Dec 12 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.8.1-0.2.rc061213
- 1.8.1 rc 061213

* Sat Dec  2 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.8.1-0.2.beta061202
- 1.8.1 beta 061202

* Tue Nov 14 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.8.0-1
- 1.8.0

* Wed Nov  8 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.8.0-0.5.rc061108
- 1.8.0 rc 061108

* Fri Nov  3 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.8.0-0.5.beta061103
- 1.8.0 beta 061103

* Sat Oct 28 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.8.0-0.4.cvs061028
- Detect libSM and libICE for x86_64.
- cvs 061028 (23:59 JST)

* Wed Oct 25 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.8.0-0.3.beta061023
- Remove some category from desktop files due to
  desktop-file-utils change.

* Tue Oct 24 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.8.0-0.2.beta061023
- 1.8.0 beta 061023

* Sun Oct 22 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.8.0-0.1.cvs061022
- cvs 061022 (23:59 JST)

* Mon Oct  9 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.8.0-0.1.beta061009
- 1.8.0 beta 061009

* Sat Oct  7 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.7.0-2
- Add libSM-devel to BuildRequires.

* Wed Sep 27 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.7.0-1
- 1.7.0

* Mon Sep 25 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.7.0-0.1.rc060921
- Import to Fedora Extras.

* Sun Mar  9 2006 Houritsuchu <houritsuchu at hotmail.com>
- Version up.
- add icon

* Sat Feb 25 2006 Houritsuchu <houritsuchu at hotmail.com>
- first


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rubygem-nokogiri/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	19 Jan 2009 23:00:12 -0000	1.1
+++ .cvsignore	20 Jan 2009 04:07:11 -0000	1.2
@@ -0,0 +1 @@
+nokogiri-1.1.1.gem


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rubygem-nokogiri/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	19 Jan 2009 23:00:12 -0000	1.1
+++ sources	20 Jan 2009 04:07:11 -0000	1.2
@@ -0,0 +1 @@
+b19b59f23eba388bd907c6cf3786289d  nokogiri-1.1.1.gem



From mtasaka at fedoraproject.org  Tue Jan 20 04:10:53 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Tue, 20 Jan 2009 04:10:53 +0000 (UTC)
Subject: rpms/rubygem-nokogiri/F-9 rubygem-nokogiri.spec, NONE, 1.1 jd.spec, 
	1.1, NONE
Message-ID: <20090120041053.7BD3970141@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/rubygem-nokogiri/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11989/F-9

Added Files:
	rubygem-nokogiri.spec 
Removed Files:
	jd.spec 
Log Message:
It seems that I did a big mistake...


--- NEW FILE rubygem-nokogiri.spec ---
%define	ruby_sitelib		%(ruby -rrbconfig -e "puts Config::CONFIG['sitelibdir']")
%define	ruby_sitearch		%(ruby -rrbconfig -e "puts Config::CONFIG['sitearchdir']")
%define	rubyabi		1.8

%define	gemdir			%(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null)
%define	gemname		nokogiri
%define	geminstdir		%{gemdir}/gems/%{gemname}-%{version}

Summary:	An HTML, XML, SAX, and Reader parser
Name:		rubygem-%{gemname}
Version:	1.1.1
Release:	1%{?dist}
Group:		Development/Languages
License:	MIT
URL:		http://nokogiri.rubyforge.org/nokogiri/
Source0:	http://gems.rubyforge.org/gems/%{gemname}-%{version}.gem

BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:	ruby(abi) = %{rubyabi}
BuildRequires:	ruby(rubygems)
BuildRequires:	rubygem(rake)
BuildRequires:	libxml2-devel
BuildRequires:	libxslt-devel
BuildRequires:	ruby-devel
Requires:	ruby(abi) = %{rubyabi}
Requires:	ruby(rubygems)
Provides:	rubygem(%{gemname}) = %{version}-%{release}

%description
Nokogiri parses and searches XML/HTML very quickly, and also has
correctly implemented CSS3 selector support as well as XPath support.

Nokogiri also features an Hpricot compatibility layer to help ease the change
to using correct CSS and XPath.

%package	doc
Summary:	Documentation for %{name}
Group:		Documentation
# Directory ownership issue
Requires:	%{name} = %{version}-%{release}
Requires:	ruby(rubygems)

%description	doc
This package contains documentation for %{name}.

%package	-n ruby-%{gemname}
Summary:	Non-Gem support package for %{gemname}
Group:		Development/Languages
Requires:	%{name} = %{version}-%{release}
Provides:	ruby(%{gemname}) = %{version}-%{release}

%description	-n ruby-%{gemname}
This package provides non-Gem support for %{gemname}.

%prep
%setup -q -T -c

%build
mkdir -p ./%{gemdir}
export CONFIGURE_ARGS="--with-cflags='%{optflags}'"
gem install \
	--local \
	--install-dir ./%{gemdir} \
	-V --force \
	%{SOURCE0}

# cflags wrong (-O3 passed), recompiling
pushd ./%{geminstdir}
sed -i.flags -e 's|-O3||' ext/nokogiri/extconf.rb
find . -name \*.so -or -name \*.o -exec rm -f {} \;
rake -v ext/nokogiri/native.so

%install
rm -rf %{buildroot}
mkdir -p %{buildroot}%{gemdir}
cp -a ./%{gemdir}/* %{buildroot}%{gemdir}

# move arch dependent files to %%ruby_sitearch
mkdir -p %{buildroot}%{ruby_sitearch}/%{gemname}
mv %{buildroot}%{geminstdir}/lib/%{gemname}/*.so \
	%{buildroot}%{ruby_sitearch}/%{gemname}/

# remove all shebang
for f in $(find %{buildroot}%{geminstdir} -name \*.rb)
do
	sed -i -e '/^#!/d' $f
	chmod 0644 $f
done

# cleanups
rm -rf %{buildroot}%{geminstdir}/ext
rm -f %{buildroot}%{geminstdir}/{.require_paths,Rakefile}

# only needed by Rakefile, removing
## First remove only files, then check if the directory
## is empty
rm -f %{buildroot}/%{geminstdir}/vendor/hoe.rb
rmdir %{buildroot}/%{geminstdir}/vendor/

# The following method is completely copied from rubygem-gettext
# spec file
#
# Create symlinks
##
## Note that before switching to gem %%{ruby_sitelib}/%%{gemname}
## already existed as a directory, so this cannot be replaced
## by symlink (cpio fails)
## Similarly, all directories under %%{ruby_sitelib} cannot be
## replaced by symlink
#

create_symlink_rec(){

ORIGBASEDIR=$1
TARGETBASEDIR=$2

## First calculate relative path of ORIGBASEDIR 
## from TARGETBASEDIR
TMPDIR=$TARGETBASEDIR
BACKDIR=
DOWNDIR=
num=0
nnum=0
while true
do
	num=$((num+1))
	TMPDIR=$(echo $TMPDIR | sed -e 's|/[^/][^/]*$||')
	DOWNDIR=$(echo $ORIGBASEDIR | sed -e "s|^$TMPDIR||")
	if [ x$DOWNDIR != x$ORIGBASEDIR ]
	then
		nnum=0
		while [ $nnum -lt $num ]
		do
			BACKDIR="../$BACKDIR"
			nnum=$((nnum+1))
		done
		break
	fi
done

RELBASEDIR=$( echo $BACKDIR/$DOWNDIR | sed -e 's|//*|/|g' )

## Next actually create symlink
pushd %{buildroot}/$ORIGBASEDIR
find . -type f | while read f
do
	DIRNAME=$(dirname $f)
	BACK2DIR=$(echo $DIRNAME | sed -e 's|/[^/][^/]*|/..|g')
	mkdir -p %{buildroot}${TARGETBASEDIR}/$DIRNAME
	LNNAME=$(echo $BACK2DIR/$RELBASEDIR/$f | \
		sed -e 's|^\./||' | sed -e 's|//|/|g' | \
		sed -e 's|/\./|/|' )
	ln -s -f $LNNAME %{buildroot}${TARGETBASEDIR}/$f
done
popd

}

create_symlink_rec %{geminstdir}/lib %{ruby_sitelib}


%clean
rm -rf %{buildroot}

%files
%defattr(-,root, root,-)
%{ruby_sitearch}/%{gemname}/
%dir	%{geminstdir}/
%doc	%{geminstdir}/[A-Z]*
%{geminstdir}/[a-l]*/
%{gemdir}/cache/%{gemname}-%{version}.gem
%{gemdir}/specifications/%{gemname}-%{version}.gemspec

%files	doc
%defattr(-,root,root,-)
%{geminstdir}/test/
%{gemdir}/doc/%{gemname}-%{version}/

%files	-n ruby-%{gemname}
%defattr(-,root,root,-)
%{ruby_sitelib}/*%{gemname}.rb
%{ruby_sitelib}/%{gemname}/

%changelog
* Thu Jan 15 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.1.1-1
- 1.1.1

* Thu Dec 25 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.1.0-1
- Initial packaging



--- jd.spec DELETED ---



From mtasaka at fedoraproject.org  Tue Jan 20 04:10:53 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Tue, 20 Jan 2009 04:10:53 +0000 (UTC)
Subject: rpms/rubygem-nokogiri/F-10 rubygem-nokogiri.spec, NONE, 1.1 jd.spec,
	1.1, NONE
Message-ID: <20090120041053.56A3D700F9@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/rubygem-nokogiri/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11989/F-10

Added Files:
	rubygem-nokogiri.spec 
Removed Files:
	jd.spec 
Log Message:
It seems that I did a big mistake...


--- NEW FILE rubygem-nokogiri.spec ---
%define	ruby_sitelib		%(ruby -rrbconfig -e "puts Config::CONFIG['sitelibdir']")
%define	ruby_sitearch		%(ruby -rrbconfig -e "puts Config::CONFIG['sitearchdir']")
%define	rubyabi		1.8

%define	gemdir			%(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null)
%define	gemname		nokogiri
%define	geminstdir		%{gemdir}/gems/%{gemname}-%{version}

Summary:	An HTML, XML, SAX, and Reader parser
Name:		rubygem-%{gemname}
Version:	1.1.1
Release:	1%{?dist}
Group:		Development/Languages
License:	MIT
URL:		http://nokogiri.rubyforge.org/nokogiri/
Source0:	http://gems.rubyforge.org/gems/%{gemname}-%{version}.gem

BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:	ruby(abi) = %{rubyabi}
BuildRequires:	ruby(rubygems)
BuildRequires:	rubygem(rake)
BuildRequires:	libxml2-devel
BuildRequires:	libxslt-devel
BuildRequires:	ruby-devel
Requires:	ruby(abi) = %{rubyabi}
Requires:	ruby(rubygems)
Provides:	rubygem(%{gemname}) = %{version}-%{release}

%description
Nokogiri parses and searches XML/HTML very quickly, and also has
correctly implemented CSS3 selector support as well as XPath support.

Nokogiri also features an Hpricot compatibility layer to help ease the change
to using correct CSS and XPath.

%package	doc
Summary:	Documentation for %{name}
Group:		Documentation
# Directory ownership issue
Requires:	%{name} = %{version}-%{release}
Requires:	ruby(rubygems)

%description	doc
This package contains documentation for %{name}.

%package	-n ruby-%{gemname}
Summary:	Non-Gem support package for %{gemname}
Group:		Development/Languages
Requires:	%{name} = %{version}-%{release}
Provides:	ruby(%{gemname}) = %{version}-%{release}

%description	-n ruby-%{gemname}
This package provides non-Gem support for %{gemname}.

%prep
%setup -q -T -c

%build
mkdir -p ./%{gemdir}
export CONFIGURE_ARGS="--with-cflags='%{optflags}'"
gem install \
	--local \
	--install-dir ./%{gemdir} \
	-V --force \
	%{SOURCE0}

# cflags wrong (-O3 passed), recompiling
pushd ./%{geminstdir}
sed -i.flags -e 's|-O3||' ext/nokogiri/extconf.rb
find . -name \*.so -or -name \*.o -exec rm -f {} \;
rake -v ext/nokogiri/native.so

%install
rm -rf %{buildroot}
mkdir -p %{buildroot}%{gemdir}
cp -a ./%{gemdir}/* %{buildroot}%{gemdir}

# move arch dependent files to %%ruby_sitearch
mkdir -p %{buildroot}%{ruby_sitearch}/%{gemname}
mv %{buildroot}%{geminstdir}/lib/%{gemname}/*.so \
	%{buildroot}%{ruby_sitearch}/%{gemname}/

# remove all shebang
for f in $(find %{buildroot}%{geminstdir} -name \*.rb)
do
	sed -i -e '/^#!/d' $f
	chmod 0644 $f
done

# cleanups
rm -rf %{buildroot}%{geminstdir}/ext
rm -f %{buildroot}%{geminstdir}/{.require_paths,Rakefile}

# only needed by Rakefile, removing
## First remove only files, then check if the directory
## is empty
rm -f %{buildroot}/%{geminstdir}/vendor/hoe.rb
rmdir %{buildroot}/%{geminstdir}/vendor/

# The following method is completely copied from rubygem-gettext
# spec file
#
# Create symlinks
##
## Note that before switching to gem %%{ruby_sitelib}/%%{gemname}
## already existed as a directory, so this cannot be replaced
## by symlink (cpio fails)
## Similarly, all directories under %%{ruby_sitelib} cannot be
## replaced by symlink
#

create_symlink_rec(){

ORIGBASEDIR=$1
TARGETBASEDIR=$2

## First calculate relative path of ORIGBASEDIR 
## from TARGETBASEDIR
TMPDIR=$TARGETBASEDIR
BACKDIR=
DOWNDIR=
num=0
nnum=0
while true
do
	num=$((num+1))
	TMPDIR=$(echo $TMPDIR | sed -e 's|/[^/][^/]*$||')
	DOWNDIR=$(echo $ORIGBASEDIR | sed -e "s|^$TMPDIR||")
	if [ x$DOWNDIR != x$ORIGBASEDIR ]
	then
		nnum=0
		while [ $nnum -lt $num ]
		do
			BACKDIR="../$BACKDIR"
			nnum=$((nnum+1))
		done
		break
	fi
done

RELBASEDIR=$( echo $BACKDIR/$DOWNDIR | sed -e 's|//*|/|g' )

## Next actually create symlink
pushd %{buildroot}/$ORIGBASEDIR
find . -type f | while read f
do
	DIRNAME=$(dirname $f)
	BACK2DIR=$(echo $DIRNAME | sed -e 's|/[^/][^/]*|/..|g')
	mkdir -p %{buildroot}${TARGETBASEDIR}/$DIRNAME
	LNNAME=$(echo $BACK2DIR/$RELBASEDIR/$f | \
		sed -e 's|^\./||' | sed -e 's|//|/|g' | \
		sed -e 's|/\./|/|' )
	ln -s -f $LNNAME %{buildroot}${TARGETBASEDIR}/$f
done
popd

}

create_symlink_rec %{geminstdir}/lib %{ruby_sitelib}


%clean
rm -rf %{buildroot}

%files
%defattr(-,root, root,-)
%{ruby_sitearch}/%{gemname}/
%dir	%{geminstdir}/
%doc	%{geminstdir}/[A-Z]*
%{geminstdir}/[a-l]*/
%{gemdir}/cache/%{gemname}-%{version}.gem
%{gemdir}/specifications/%{gemname}-%{version}.gemspec

%files	doc
%defattr(-,root,root,-)
%{geminstdir}/test/
%{gemdir}/doc/%{gemname}-%{version}/

%files	-n ruby-%{gemname}
%defattr(-,root,root,-)
%{ruby_sitelib}/*%{gemname}.rb
%{ruby_sitelib}/%{gemname}/

%changelog
* Thu Jan 15 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.1.1-1
- 1.1.1

* Thu Dec 25 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.1.0-1
- Initial packaging



--- jd.spec DELETED ---



From mtasaka at fedoraproject.org  Tue Jan 20 04:10:53 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Tue, 20 Jan 2009 04:10:53 +0000 (UTC)
Subject: rpms/rubygem-nokogiri/devel rubygem-nokogiri.spec, NONE, 1.1 jd.spec,
	1.1, NONE
Message-ID: <20090120041053.B8BD3700F9@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/rubygem-nokogiri/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11989/devel

Added Files:
	rubygem-nokogiri.spec 
Removed Files:
	jd.spec 
Log Message:
It seems that I did a big mistake...


--- NEW FILE rubygem-nokogiri.spec ---
%define	ruby_sitelib		%(ruby -rrbconfig -e "puts Config::CONFIG['sitelibdir']")
%define	ruby_sitearch		%(ruby -rrbconfig -e "puts Config::CONFIG['sitearchdir']")
%define	rubyabi		1.8

%define	gemdir			%(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null)
%define	gemname		nokogiri
%define	geminstdir		%{gemdir}/gems/%{gemname}-%{version}

Summary:	An HTML, XML, SAX, and Reader parser
Name:		rubygem-%{gemname}
Version:	1.1.1
Release:	1%{?dist}
Group:		Development/Languages
License:	MIT
URL:		http://nokogiri.rubyforge.org/nokogiri/
Source0:	http://gems.rubyforge.org/gems/%{gemname}-%{version}.gem

BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:	ruby(abi) = %{rubyabi}
BuildRequires:	ruby(rubygems)
BuildRequires:	rubygem(rake)
BuildRequires:	libxml2-devel
BuildRequires:	libxslt-devel
BuildRequires:	ruby-devel
Requires:	ruby(abi) = %{rubyabi}
Requires:	ruby(rubygems)
Provides:	rubygem(%{gemname}) = %{version}-%{release}

%description
Nokogiri parses and searches XML/HTML very quickly, and also has
correctly implemented CSS3 selector support as well as XPath support.

Nokogiri also features an Hpricot compatibility layer to help ease the change
to using correct CSS and XPath.

%package	doc
Summary:	Documentation for %{name}
Group:		Documentation
# Directory ownership issue
Requires:	%{name} = %{version}-%{release}
Requires:	ruby(rubygems)

%description	doc
This package contains documentation for %{name}.

%package	-n ruby-%{gemname}
Summary:	Non-Gem support package for %{gemname}
Group:		Development/Languages
Requires:	%{name} = %{version}-%{release}
Provides:	ruby(%{gemname}) = %{version}-%{release}

%description	-n ruby-%{gemname}
This package provides non-Gem support for %{gemname}.

%prep
%setup -q -T -c

%build
mkdir -p ./%{gemdir}
export CONFIGURE_ARGS="--with-cflags='%{optflags}'"
gem install \
	--local \
	--install-dir ./%{gemdir} \
	-V --force \
	%{SOURCE0}

# cflags wrong (-O3 passed), recompiling
pushd ./%{geminstdir}
sed -i.flags -e 's|-O3||' ext/nokogiri/extconf.rb
find . -name \*.so -or -name \*.o -exec rm -f {} \;
rake -v ext/nokogiri/native.so

%install
rm -rf %{buildroot}
mkdir -p %{buildroot}%{gemdir}
cp -a ./%{gemdir}/* %{buildroot}%{gemdir}

# move arch dependent files to %%ruby_sitearch
mkdir -p %{buildroot}%{ruby_sitearch}/%{gemname}
mv %{buildroot}%{geminstdir}/lib/%{gemname}/*.so \
	%{buildroot}%{ruby_sitearch}/%{gemname}/

# remove all shebang
for f in $(find %{buildroot}%{geminstdir} -name \*.rb)
do
	sed -i -e '/^#!/d' $f
	chmod 0644 $f
done

# cleanups
rm -rf %{buildroot}%{geminstdir}/ext
rm -f %{buildroot}%{geminstdir}/{.require_paths,Rakefile}

# only needed by Rakefile, removing
## First remove only files, then check if the directory
## is empty
rm -f %{buildroot}/%{geminstdir}/vendor/hoe.rb
rmdir %{buildroot}/%{geminstdir}/vendor/

# The following method is completely copied from rubygem-gettext
# spec file
#
# Create symlinks
##
## Note that before switching to gem %%{ruby_sitelib}/%%{gemname}
## already existed as a directory, so this cannot be replaced
## by symlink (cpio fails)
## Similarly, all directories under %%{ruby_sitelib} cannot be
## replaced by symlink
#

create_symlink_rec(){

ORIGBASEDIR=$1
TARGETBASEDIR=$2

## First calculate relative path of ORIGBASEDIR 
## from TARGETBASEDIR
TMPDIR=$TARGETBASEDIR
BACKDIR=
DOWNDIR=
num=0
nnum=0
while true
do
	num=$((num+1))
	TMPDIR=$(echo $TMPDIR | sed -e 's|/[^/][^/]*$||')
	DOWNDIR=$(echo $ORIGBASEDIR | sed -e "s|^$TMPDIR||")
	if [ x$DOWNDIR != x$ORIGBASEDIR ]
	then
		nnum=0
		while [ $nnum -lt $num ]
		do
			BACKDIR="../$BACKDIR"
			nnum=$((nnum+1))
		done
		break
	fi
done

RELBASEDIR=$( echo $BACKDIR/$DOWNDIR | sed -e 's|//*|/|g' )

## Next actually create symlink
pushd %{buildroot}/$ORIGBASEDIR
find . -type f | while read f
do
	DIRNAME=$(dirname $f)
	BACK2DIR=$(echo $DIRNAME | sed -e 's|/[^/][^/]*|/..|g')
	mkdir -p %{buildroot}${TARGETBASEDIR}/$DIRNAME
	LNNAME=$(echo $BACK2DIR/$RELBASEDIR/$f | \
		sed -e 's|^\./||' | sed -e 's|//|/|g' | \
		sed -e 's|/\./|/|' )
	ln -s -f $LNNAME %{buildroot}${TARGETBASEDIR}/$f
done
popd

}

create_symlink_rec %{geminstdir}/lib %{ruby_sitelib}


%clean
rm -rf %{buildroot}

%files
%defattr(-,root, root,-)
%{ruby_sitearch}/%{gemname}/
%dir	%{geminstdir}/
%doc	%{geminstdir}/[A-Z]*
%{geminstdir}/[a-l]*/
%{gemdir}/cache/%{gemname}-%{version}.gem
%{gemdir}/specifications/%{gemname}-%{version}.gemspec

%files	doc
%defattr(-,root,root,-)
%{geminstdir}/test/
%{gemdir}/doc/%{gemname}-%{version}/

%files	-n ruby-%{gemname}
%defattr(-,root,root,-)
%{ruby_sitelib}/*%{gemname}.rb
%{ruby_sitelib}/%{gemname}/

%changelog
* Thu Jan 15 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.1.1-1
- 1.1.1

* Thu Dec 25 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.1.0-1
- Initial packaging



--- jd.spec DELETED ---



From airlied at fedoraproject.org  Tue Jan 20 05:11:52 2009
From: airlied at fedoraproject.org (Dave Airlie)
Date: Tue, 20 Jan 2009 05:11:52 +0000 (UTC)
Subject: rpms/kernel/F-10 drm-modesetting-radeon.patch, 1.69,
	1.70 kernel.spec, 1.1222, 1.1223 drm-next.patch, 1.11, NONE
Message-ID: <20090120051152.B656A700F9@cvs1.fedora.phx.redhat.com>

Author: airlied

Update of /cvs/pkgs/rpms/kernel/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20032

Modified Files:
	drm-modesetting-radeon.patch kernel.spec 
Removed Files:
	drm-next.patch 
Log Message:
* Tue Jan 20 2009 Dave Airlie <airlied at redhat.com> 2.6.28.1-16
- rebase radeon modesetting onto 2.6.28


drm-modesetting-radeon.patch:

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.69 -r 1.70 drm-modesetting-radeon.patch
Index: drm-modesetting-radeon.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/drm-modesetting-radeon.patch,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- drm-modesetting-radeon.patch	12 Jan 2009 19:51:27 -0000	1.69
+++ drm-modesetting-radeon.patch	20 Jan 2009 05:11:51 -0000	1.70
@@ -1,55 +1,42 @@
-commit 3ef2b914f9667c70a9711fa31ff95d639ccc8e2e
+commit ea9f35fbb0ad27833bb78e29d1118516855fb819
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Fri Dec 19 11:01:33 2008 +1000
+
+    drm: fix problem with master enable
+
+commit 6361ff89314f0e48c6a70c71f836bcfe2a1083ee
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Thu Dec 18 23:01:12 2008 +1000
 
     drm: don't set cached bits on pages from uncached allocator.
     
     This should make AGP no corrupt itself to all buggery
-    (cherry picked from commit 55c0a3f1d3693cb5c3b65f37d4bb6e8a3c025460)
-
-commit be5f7447cc492545e225170be38e5e65d7de37d9
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Tue Dec 2 16:38:04 2008 +1000
-
-    drop old CS
-
-commit 91bfed87127c1bd17098803184e43783d55f35e5
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Mon Dec 1 15:09:27 2008 +1000
 
-    radeon: update with latest CS bits
-
-commit a7f6175e3610651b1f84a1b8aa1f61a9a4f3bdb6
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Wed Dec 17 06:56:36 2008 +1000
-
-    fixups post rebase
-
-commit cd29f247278a5949956adbfb75229dc9bad19f8e
+commit 353c7a5dbb898188407d8e54fd6983a2006b16ad
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Thu Dec 11 01:35:09 2008 +1000
 
     radeon: fix agp mode when kms isn't enabled
 
-commit 0d0f9c970263750a68131b5f88735c59f605c69f
+commit 017e784508024b64217d0d4e31aa580261d83331
 Author: Dave Airlie <airlied at ppcg5.localdomain>
 Date:   Wed Dec 3 17:22:07 2008 +1100
 
     radeon: add support for accessing disabled ROMs.
 
-commit 840d823d6f33c1852b92791093b23b1ce7af25ac
+commit d3c95991acabea7873a6675a6ff6d386465cf4c3
 Author: Dave Airlie <airlied at ppcg5.localdomain>
 Date:   Wed Dec 3 17:19:02 2008 +1100
 
     radeon: make cail do pll read/write via actual PLL functions
 
-commit 049d865d47cf229234cd7dd0ef8927a41a142b0e
+commit b842e47ab42035dad7a521b2fc8c6105c7208151
 Author: Dave Airlie <airlied at ppcg5.localdomain>
 Date:   Wed Dec 3 16:36:00 2008 +1100
 
     radeon: atom fixes for endianness
 
-commit df08dc63cbbd19a8ea0659bdc379147a59201b4c
+commit d948ab5e334cb9046fade3fefac793efc1290699
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Wed Dec 3 20:28:05 2008 +1000
 
@@ -59,7 +46,7 @@
     Limit the AGP aperture to the GART size, and init the registers
     in the right place
 
-commit 79d6ac96108c29dbce90ce605b01dd6b71673092
+commit 60a11e6a15441b1d67d09965fa389ba0373b7acd
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Tue Dec 2 12:49:17 2008 +1000
 
@@ -68,7 +55,7 @@
     1. Proper PCIE fallback on PCIE cards.
     2. Setup agp base + location regs properly
 
-commit e6a1353d11f485c99371e0b89c669da0c23e8af4
+commit 39106b8526ff66acdb2076b4623cd2bea3d28c76
 Author: Michal Schmidt <mschmidt at redhat.com>
 Date:   Tue Dec 2 08:06:59 2008 +1000
 
@@ -76,13 +63,21 @@
     
     fedora bz 473895
 
-commit d879f36aca29ece7c3bfada452266e82df3f2392
+commit aaa952a952eb64206b29d61ccc128298a45d9c2b
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Fri Nov 28 09:19:47 2008 +1000
+
+    drm: cleanup exit path mess using a linked list.
+    
+    Just keep a list of devices per driver and cleanup on exit
+
+commit 0dfc2a5fffbd76713ddbbb7c126294d08c1b30e0
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Thu Nov 27 17:14:40 2008 +1000
 
     radeon: post any GPUs that aren't posted
 
-commit d04c4750aba2b0bd306ab36a0002f2609ed6cc9a
+commit c9f53c74f29866a2fadddf3b707919234fad4b80
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Mon Nov 24 15:18:31 2008 +1000
 
@@ -93,13 +88,13 @@
     
     Default to 512MB gart.
 
-commit ae7c33fa98bf4921292f6dffb6e60dd2b85cddfa
+commit 7a6f7c80bae14c04a65ed4928f57f7de2b600cf3
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Mon Nov 24 15:17:49 2008 +1000
 
     radeon: add some missing feature checks for modesetting
 
-commit 54fd140cc8c63d5c65fbcdf21259025fd8a431e8
+commit 5465b46ca8abfeb61f39b8b1ca538f04b8e2fe7b
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Mon Nov 24 11:41:06 2008 +1100
 
@@ -108,43 +103,49 @@
     we really need to read back to make sure the invalidate has happened
     before continuing along happily in life.
 
-commit 5e418cef1bfca7e8e0821d6e44a1e1a78e015b17
+commit b45ca3c31577279e17e17ccd1540c90400d175ac
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Sun Nov 23 19:19:02 2008 +1000
 
     drm: we have discardable now so don't do special cases
 
-commit 87e2de7aef77b96a8be3532358b6ceb9540d622a
+commit bdedddaf3f368728f377d32bf937bb03f35c7ba4
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Fri Nov 21 14:52:25 2008 +1000
 
     atom: fix bug in parser for MC reads
 
-commit 52eccc11083a1c0636337520187a4e2cf9bfe989
+commit a992cf31c94ac486eb8405952161d2502f417a44
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Mon Nov 17 18:14:28 2008 +1000
 
     radeon: turn of VRAM zeroing by default for now - needs work
 
-commit 7a32efbc88ed749c0cd44a95bb4888cd2bc806c0
+commit 81c801b34d01255649ef2bc231f43e7344d6ff90
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Mon Nov 17 16:59:00 2008 +1000
+
+    drm: make 800x600 be standard not 640x480
+
+commit 81e18dc62a8f0469f1ed04f694fc814a65ed72dd
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Mon Nov 17 09:03:36 2008 +1000
 
     radeon: fix return value for no relocs
 
-commit 5a47b4d8a97949288ebe8f2f3437637e405d1db8
+commit 6054ddc84d750bb70874f4f1dcd0cd3abd8a3967
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Mon Nov 17 09:03:01 2008 +1000
 
     ttm: add discard for VRAM buffers
 
-commit 160794bbbb90088a86acc96ca5268bc46255582d
+commit 38294b6249209590c1a6ec58918d667059b74fbf
 Author: Dave Airlie <airlied at dhcp-1-203.bne.redhat.com>
 Date:   Fri Nov 14 15:52:32 2008 +1000
 
     drm: fix the exit path of the bo unlocking
 
-commit 1ea46b5e3dc7e75afe1936594e0e085c9dc8665d
+commit 61326321f05996df4a7f5c99448e381ae7f040f0
 Author: Dave Airlie <airlied at dhcp-1-203.bne.redhat.com>
 Date:   Fri Nov 14 15:51:44 2008 +1000
 
@@ -152,49 +153,55 @@
     
     Fixup failure paths and make EAGAIN work
 
-commit e16a76e302eba9b53858457054059985ec0ef9df
+commit d02319fbc7734c82c596528c77df5e4fde8d1903
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Thu Nov 13 17:22:26 2008 +1100
 
[...13165 lines suppressed...]
+ /* SAREA area needs to be at least a page */
+ #if defined(__alpha__)
+-#define SAREA_MAX                       0x2000
++#define SAREA_MAX                       0x2000UL
+ #elif defined(__ia64__)
+-#define SAREA_MAX                       0x10000	/* 64kB */
++#define SAREA_MAX                       0x10000UL	/* 64kB */
+ #else
+ /* Intel 830M driver needs at least 8k SAREA */
+-#define SAREA_MAX                       0x2000
++#define SAREA_MAX                       0x2000UL
+ #endif
+ 
+ /** Maximum number of drawables in the SAREA */
 diff --git a/include/drm/i915_drm.h b/include/drm/i915_drm.h
-index b3bcf72..181d9de 100644
+index 152b34d..13c91fc 100644
 --- a/include/drm/i915_drm.h
 +++ b/include/drm/i915_drm.h
-@@ -187,7 +187,7 @@ typedef struct _drm_i915_sarea {
+@@ -63,7 +63,7 @@ typedef struct _drm_i915_init {
+ 	unsigned int chipset;
+ } drm_i915_init_t;
+ 
+-typedef struct _drm_i915_sarea {
++typedef struct drm_i915_sarea {
+ 	struct drm_tex_region texList[I915_NR_TEX_REGIONS + 1];
+ 	int last_upload;	/* last time texture was uploaded */
+ 	int last_enqueue;	/* last time a buffer was enqueued */
+@@ -105,14 +105,26 @@ typedef struct _drm_i915_sarea {
+ 	unsigned int rotated_tiled;
+ 	unsigned int rotated2_tiled;
+ 
+-	int pipeA_x;
+-	int pipeA_y;
+-	int pipeA_w;
+-	int pipeA_h;
+-	int pipeB_x;
+-	int pipeB_y;
+-	int pipeB_w;
+-	int pipeB_h;
++	int planeA_x;
++	int planeA_y;
++	int planeA_w;
++	int planeA_h;
++	int planeB_x;
++	int planeB_y;
++	int planeB_w;
++	int planeB_h;
++
++	/* triple buffering - not in kernel */
++	drm_handle_t third_handle;
++	int third_offset;
++	int third_size;
++	unsigned int third_tiled;
++
++	/* buffer object handles for static buffers */
++	unsigned int front_bo_handle;
++	unsigned int back_bo_handle;
++	unsigned int third_bo_handle;
++	unsigned int depth_bo_handle;
+ } drm_i915_sarea_t;
+ 
+ /* Flags for perf_boxes
+@@ -163,7 +175,7 @@ typedef struct _drm_i915_sarea {
  
  #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)
@@ -36034,7 +45303,16 @@
  #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)
-@@ -220,6 +220,18 @@ typedef struct _drm_i915_sarea {
+@@ -177,6 +189,8 @@ 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)
++#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)
+ #define DRM_IOCTL_I915_GEM_PIN		DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_GEM_PIN, struct drm_i915_gem_pin)
+ #define DRM_IOCTL_I915_GEM_UNPIN	DRM_IOW(DRM_COMMAND_BASE + DRM_I915_GEM_UNPIN, struct drm_i915_gem_unpin)
+ #define DRM_IOCTL_I915_GEM_BUSY		DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_GEM_BUSY, struct drm_i915_gem_busy)
+@@ -193,10 +207,22 @@ typedef struct _drm_i915_sarea {
  #define DRM_IOCTL_I915_GEM_GET_TILING	DRM_IOWR (DRM_COMMAND_BASE + DRM_I915_GEM_GET_TILING, struct drm_i915_gem_get_tiling)
  #define DRM_IOCTL_I915_GEM_GET_APERTURE	DRM_IOR  (DRM_COMMAND_BASE + DRM_I915_GEM_GET_APERTURE, struct drm_i915_gem_get_aperture)
  
@@ -36053,8 +45331,13 @@
  /* Allow drivers to submit batchbuffers directly to hardware, relying
   * on the security mechanisms provided by hardware.
   */
+-typedef struct _drm_i915_batchbuffer {
++typedef struct drm_i915_batchbuffer {
+ 	int start;		/* agp offset */
+ 	int used;		/* nr bytes in use */
+ 	int DR1;		/* hw flags for GFX_OP_DRAWRECT_INFO */
 diff --git a/include/drm/radeon_drm.h b/include/drm/radeon_drm.h
-index 73ff51f..e4f5897 100644
+index 73ff51f..770f6f0 100644
 --- a/include/drm/radeon_drm.h
 +++ b/include/drm/radeon_drm.h
 @@ -453,6 +453,15 @@ typedef struct {
@@ -36073,7 +45356,7 @@
  } drm_radeon_sarea_t;
  
  /* WARNING: If you change any of these defines, make sure to change the
-@@ -493,6 +502,18 @@ typedef struct {
+@@ -493,6 +502,19 @@ typedef struct {
  #define DRM_RADEON_SURF_ALLOC 0x1a
  #define DRM_RADEON_SURF_FREE  0x1b
  
@@ -36087,12 +45370,13 @@
 +#define DRM_RADEON_GEM_SET_DOMAIN 0x23
 +#define DRM_RADEON_GEM_WAIT_RENDERING 0x24
 +
-+#define DRM_RADEON_CS       0x26
++#define DRM_RADEON_CS           0x25
++#define DRM_RADEON_CS2       0x26
 +
  #define DRM_IOCTL_RADEON_CP_INIT    DRM_IOW( DRM_COMMAND_BASE + DRM_RADEON_CP_INIT, drm_radeon_init_t)
  #define DRM_IOCTL_RADEON_CP_START   DRM_IO(  DRM_COMMAND_BASE + DRM_RADEON_CP_START)
  #define DRM_IOCTL_RADEON_CP_STOP    DRM_IOW( DRM_COMMAND_BASE + DRM_RADEON_CP_STOP, drm_radeon_cp_stop_t)
-@@ -521,6 +542,18 @@ typedef struct {
+@@ -521,6 +543,19 @@ typedef struct {
  #define DRM_IOCTL_RADEON_SURF_ALLOC DRM_IOW( DRM_COMMAND_BASE + DRM_RADEON_SURF_ALLOC, drm_radeon_surface_alloc_t)
  #define DRM_IOCTL_RADEON_SURF_FREE  DRM_IOW( DRM_COMMAND_BASE + DRM_RADEON_SURF_FREE, drm_radeon_surface_free_t)
  
@@ -36106,12 +45390,13 @@
 +#define DRM_IOCTL_RADEON_GEM_SET_DOMAIN  DRM_IOWR(DRM_COMMAND_BASE + DRM_RADEON_GEM_SET_DOMAIN, struct drm_radeon_gem_set_domain)
 +#define DRM_IOCTL_RADEON_GEM_WAIT_RENDERING DRM_IOW(DRM_COMMAND_BASE + DRM_RADEON_GEM_WAIT_RENDERING, struct drm_radeon_gem_wait_rendering) 
 +#define DRM_IOCTL_RADEON_CS DRM_IOWR(DRM_COMMAND_BASE + DRM_RADEON_CS, struct drm_radeon_cs)
++#define DRM_IOCTL_RADEON_CS2 DRM_IOWR(DRM_COMMAND_BASE + DRM_RADEON_CS2, struct drm_radeon_cs2)
 +
 +
  typedef struct drm_radeon_init {
  	enum {
  		RADEON_INIT_CP = 0x01,
-@@ -677,6 +710,7 @@ typedef struct drm_radeon_indirect {
+@@ -677,6 +712,7 @@ typedef struct drm_radeon_indirect {
  #define RADEON_PARAM_VBLANK_CRTC           13   /* VBLANK CRTC */
  #define RADEON_PARAM_FB_LOCATION           14   /* FB location */
  #define RADEON_PARAM_NUM_GB_PIPES          15   /* num GB pipes */
@@ -36119,7 +45404,7 @@
  
  typedef struct drm_radeon_getparam {
  	int param;
-@@ -731,6 +765,7 @@ typedef struct drm_radeon_setparam {
+@@ -731,6 +767,7 @@ typedef struct drm_radeon_setparam {
  #define RADEON_SETPARAM_NEW_MEMMAP 4		/* Use new memory map */
  #define RADEON_SETPARAM_PCIGART_TABLE_SIZE 5    /* PCI GART Table Size */
  #define RADEON_SETPARAM_VBLANK_CRTC 6           /* VBLANK CRTC */
@@ -36127,7 +45412,7 @@
  /* 1.14: Clients can allocate/free a surface
   */
  typedef struct drm_radeon_surface_alloc {
-@@ -746,4 +781,106 @@ typedef struct drm_radeon_surface_free {
+@@ -746,4 +783,114 @@ typedef struct drm_radeon_surface_free {
  #define	DRM_RADEON_VBLANK_CRTC1		1
  #define	DRM_RADEON_VBLANK_CRTC2		2
  
@@ -36215,6 +45500,14 @@
 +
 +/* New interface which obsolete all previous interface.
 + */
++
++
++struct drm_radeon_cs {
++	uint32_t            dwords;
++	uint32_t            cs_id;
++	uint64_t            packets;
++};
++
 +#define RADEON_CHUNK_ID_RELOCS 0x01
 +#define RADEON_CHUNK_ID_IB     0x02
 +#define RADEON_CHUNK_ID_OLD 0xff
@@ -36225,7 +45518,7 @@
 +	uint64_t chunk_data;
 +};
 +
-+struct drm_radeon_cs {
++struct drm_radeon_cs2 {
 +	uint32_t	num_chunks;
 +	uint32_t        cs_id;
 +	uint64_t	chunks; /* this points to uint64_t * which point to
@@ -36234,3 +45527,16 @@
 +
 +
  #endif
+diff --git a/include/linux/console.h b/include/linux/console.h
+index 248e6e3..a67a90c 100644
+--- a/include/linux/console.h
++++ b/include/linux/console.h
+@@ -153,4 +153,8 @@ void vcs_remove_sysfs(struct tty_struct *tty);
+ #define VESA_HSYNC_SUSPEND      2
+ #define VESA_POWERDOWN          3
+ 
++#ifdef CONFIG_VGA_CONSOLE
++extern bool vgacon_text_force(void);
++#endif
++
+ #endif /* _LINUX_CONSOLE_H */


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/kernel.spec,v
retrieving revision 1.1222
retrieving revision 1.1223
diff -u -r1.1222 -r1.1223
--- kernel.spec	20 Jan 2009 00:11:24 -0000	1.1222
+++ kernel.spec	20 Jan 2009 05:11:51 -0000	1.1223
@@ -644,7 +644,6 @@
 Patch1550: linux-2.6-cdrom-door-status.patch
 
 # nouveau + drm fixes
-Patch1811: drm-next.patch
 Patch1812: drm-modesetting-radeon.patch
 Patch1814: drm-nouveau.patch
 
@@ -1185,7 +1184,6 @@
 ApplyPatch linux-2.6-serial.patch
 
 # Nouveau DRM + drm fixes
-ApplyPatch drm-next.patch
 ApplyPatch drm-modesetting-radeon.patch
 ApplyPatch drm-nouveau.patch
 
@@ -1781,6 +1779,9 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Tue Jan 20 2009 Dave Airlie <airlied at redhat.com> 2.6.28.1-16
+- rebase radeon modesetting onto 2.6.28
+
 * Mon Jan 19 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.28.1-15
 - CONFIG_CGROUP_MEM_RES_CTLR=y: the overhead for this option is minimal now
 


--- drm-next.patch DELETED ---



From mtasaka at fedoraproject.org  Tue Jan 20 05:15:21 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Tue, 20 Jan 2009 05:15:21 +0000 (UTC)
Subject: rpms/cairo-dock/devel .cvsignore, 1.102, 1.103 cairo-dock.spec,
	1.138, 1.139 sources, 1.102, 1.103
Message-ID: <20090120051521.1B5A0700F9@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/cairo-dock/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20500

Modified Files:
	.cvsignore cairo-dock.spec sources 
Log Message:
* Tue Jan 20 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
- rev 1491



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cairo-dock/devel/.cvsignore,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -r1.102 -r1.103
--- .cvsignore	18 Jan 2009 05:12:14 -0000	1.102
+++ .cvsignore	20 Jan 2009 05:14:50 -0000	1.103
@@ -1 +1 @@
-cairo-dock-sources-svn1488_trunk.tar.bz2
+cairo-dock-sources-svn1491_trunk.tar.bz2


Index: cairo-dock.spec
===================================================================
RCS file: /cvs/extras/rpms/cairo-dock/devel/cairo-dock.spec,v
retrieving revision 1.138
retrieving revision 1.139
diff -u -r1.138 -r1.139
--- cairo-dock.spec	18 Jan 2009 05:12:14 -0000	1.138
+++ cairo-dock.spec	20 Jan 2009 05:14:50 -0000	1.139
@@ -11,7 +11,7 @@
 %undefine		betaver		
 %define		build_webkit	1
 %define		build_xfce	1
-%define		tarballver	svn1488_trunk
+%define		tarballver	svn1491_trunk
 
 %define		fedora_main_rel	3
 
@@ -642,8 +642,8 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
-* Sun Jan 18 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
-- rev 1488
+* Tue Jan 20 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- rev 1491
 
 * Thu Jan 15 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
 - rev 1484


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cairo-dock/devel/sources,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -r1.102 -r1.103
--- sources	18 Jan 2009 05:12:14 -0000	1.102
+++ sources	20 Jan 2009 05:14:50 -0000	1.103
@@ -1 +1 @@
-259beb12f95210f826179ec3631b6736  cairo-dock-sources-svn1488_trunk.tar.bz2
+676a658fb3c3d2d73058b8bb10172190  cairo-dock-sources-svn1491_trunk.tar.bz2



From paragn at fedoraproject.org  Tue Jan 20 05:35:57 2009
From: paragn at fedoraproject.org (Parag Ashok Nemade)
Date: Tue, 20 Jan 2009 05:35:57 +0000 (UTC)
Subject: rpms/iok/devel kn-kgp_keymap.patch,NONE,1.1 iok.spec,1.4,1.5
Message-ID: <20090120053557.CE169700F9@cvs1.fedora.phx.redhat.com>

Author: paragn

Update of /cvs/pkgs/rpms/iok/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23431

Modified Files:
	iok.spec 
Added Files:
	kn-kgp_keymap.patch 
Log Message:

* Tue Jan 20 2009 Parag Nemade <panemade at gmail.com>- 1.2.0-2
- Resolves: rh#480289



kn-kgp_keymap.patch:

--- NEW FILE kn-kgp_keymap.patch ---
--- src/interface.c.orig	2009-01-16 16:39:54.000000000 +0530
+++ src/interface.c	2009-01-20 10:48:07.000000000 +0530
@@ -1074,7 +1074,7 @@
 
         int pat=0;
         pline=strchr(line,'(');
-        if (pline != NULL){
+        if (pline != NULL && strstr(pline,"\(\"V\") \(\"W\"\) \(\"Y\") \(\"Z\")")== NULL){
             for (pat=0;pat<4;pat++)
             {
                 pline=strchr(pline+1,'(');


Index: iok.spec
===================================================================
RCS file: /cvs/pkgs/rpms/iok/devel/iok.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- iok.spec	19 Jan 2009 04:26:24 -0000	1.4
+++ iok.spec	20 Jan 2009 05:35:27 -0000	1.5
@@ -1,11 +1,12 @@
 Name:           iok
 Version:        1.2.0
-Release:        1%{?dist}
+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
+Patch0:         kn-kgp_keymap.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  desktop-file-utils libXtst-devel
 BuildRequires:  gtk2-devel gettext
@@ -17,6 +18,7 @@
 
 %prep
 %setup -q
+%patch0 -p0
 
 %build
 %configure
@@ -46,6 +48,9 @@
 %{_datadir}/pixmaps/iok.xpm
 
 %changelog
+* Tue Jan 20 2009 Parag Nemade <panemade at gmail.com>- 1.2.0-2
+- Resolves: rh#480289
+
 * Mon Jan 19 2009 Parag Nemade <panemade at gmail.com>- 1.2.0-1
 - Update to Next release 1.2.0
 



From lucilanga at fedoraproject.org  Tue Jan 20 05:41:05 2009
From: lucilanga at fedoraproject.org (Lucian Langa)
Date: Tue, 20 Jan 2009 05:41:05 +0000 (UTC)
Subject: rpms/gaupol/devel gaupol.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090120054105.2E3B7700F9@cvs1.fedora.phx.redhat.com>

Author: lucilanga

Update of /cvs/pkgs/rpms/gaupol/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24084

Modified Files:
	.cvsignore sources 
Added Files:
	gaupol.spec 
Log Message:
initial import


--- NEW FILE gaupol.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
Name:		gaupol
Version:	0.13.1
Release:	1%{?dist}
Summary:	Subtitle editor

Group:		Applications/Multimedia
License:	GPLv3+
URL:		http://home.gna.org/gaupol
Source0:	http://download.gna.org/gaupol/0.13/%{name}-%{version}.tar.gz
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:	noarch


BuildRequires:	python, desktop-file-utils, gettext, doxygen, intltool
BuildRequires:	python-setuptools-devel
Requires:	python-enchant

%description
Editor for text-based subtitle files. It supports multiple subtitle file 
formats and provides means of correcting texts and timing subtitles to match
video. The user interface is designed with attention to batch processing of
multiple documents and convenience of translating.


%prep
%setup -q
sed -i -e "s/Encoding=UTF-8//" data/%{name}.desktop.in


%build
%{__python} setup.py build




%install
rm -rf $RPM_BUILD_ROOT
%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
%find_lang %{name}
desktop-file-install					\
--dir=${RPM_BUILD_ROOT}%{_datadir}/applications		\
$RPM_BUILD_ROOT/%{_datadir}/applications/%{name}.desktop
#not entirely sure this is needed, keeping rpmlint happy
rm -f $RPM_BUILD_ROOT/%{_datadir}/%{name}/headers/microdvd



%clean
rm -rf $RPM_BUILD_ROOT


%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING CREDITS README NEWS TODO
%{_bindir}/gaupol
%{python_sitelib}/*
%{_datadir}/%{name}
%{_datadir}/applications/%{name}.desktop
%{_datadir}/icons/*/*/apps/%{name}.*
%{_mandir}/man1/gaupol.1*




%changelog
* Thu Jan 15 2009 Lucian Langa <cooly at gnome.eu.org> - 0.13.1-1
- initial package




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gaupol/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	19 Jan 2009 23:21:19 -0000	1.1
+++ .cvsignore	20 Jan 2009 05:40:34 -0000	1.2
@@ -0,0 +1 @@
+gaupol-0.13.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gaupol/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	19 Jan 2009 23:21:19 -0000	1.1
+++ sources	20 Jan 2009 05:40:34 -0000	1.2
@@ -0,0 +1 @@
+11c62f478bcd9cd10a88752e4545e1d2  gaupol-0.13.1.tar.gz



From mtasaka at fedoraproject.org  Tue Jan 20 05:41:31 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Tue, 20 Jan 2009 05:41:31 +0000 (UTC)
Subject: rpms/jd/devel jd.spec,1.386,1.387
Message-ID: <20090120054131.D8B6E700F9@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24160

Modified Files:
	jd.spec 
Log Message:
Try to kill oniguruma on F-11


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/jd.spec,v
retrieving revision 1.386
retrieving revision 1.387
diff -u -r1.386 -r1.387
--- jd.spec	20 Jan 2009 04:07:05 -0000	1.386
+++ jd.spec	20 Jan 2009 05:41:01 -0000	1.387
@@ -19,7 +19,7 @@
 ##########################################
 # Defined by vendor
 #
-%define         vendor_rel    1
+%define         vendor_rel    2
 %define         extra_rel     %{nil}
 # Tag name changed from vendor to vendorname so as not to
 # overwrite Vendor entry in Summary
@@ -65,8 +65,10 @@
 %endif
 BuildRequires:  alsa-lib-devel
 %if 0%{?fedora} > 8
+%if 0%{?fedora} < 11
 BuildRequires:  oniguruma-devel
 %endif
+%endif
 %if %{pre_release}
 BuildRequires:	subversion
 %endif
@@ -89,8 +91,10 @@
 %configure \
    --with-alsa \
 %if 0%{?fedora} > 8
+%if 0%{?fedora} < 11
    --with-oniguruma \
 %endif
+%endif
    --with-xdgopen \
 %if 0%{?_with_migemo} >= 1
    --with-migemo \
@@ -136,6 +140,10 @@
 * Tue Jan 20 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
 - rev 2631
 
+* Tue Jan 20 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- Try to kill oniguruma support on F-11 (seemingly behaving badly
+  with cmigemo)
+
 * Tue Dec 30 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.1.0-2
 - Workaround for the issue on res 868 in JD 6 thread (segv when
   bookmarking when bookmark is empty)



From lucilanga at fedoraproject.org  Tue Jan 20 05:48:17 2009
From: lucilanga at fedoraproject.org (Lucian Langa)
Date: Tue, 20 Jan 2009 05:48:17 +0000 (UTC)
Subject: rpms/gaupol/F-9 gaupol.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <20090120054817.6229F700F9@cvs1.fedora.phx.redhat.com>

Author: lucilanga

Update of /cvs/pkgs/rpms/gaupol/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24937

Modified Files:
	.cvsignore sources 
Added Files:
	gaupol.spec 
Log Message:
initial import


--- NEW FILE gaupol.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
Name:		gaupol
Version:	0.13.1
Release:	1%{?dist}
Summary:	Subtitle editor

Group:		Applications/Multimedia
License:	GPLv3+
URL:		http://home.gna.org/gaupol
Source0:	http://download.gna.org/gaupol/0.13/%{name}-%{version}.tar.gz
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:	noarch


BuildRequires:	python, desktop-file-utils, gettext, doxygen, intltool
BuildRequires:	python-setuptools-devel
Requires:	python-enchant

%description
Editor for text-based subtitle files. It supports multiple subtitle file 
formats and provides means of correcting texts and timing subtitles to match
video. The user interface is designed with attention to batch processing of
multiple documents and convenience of translating.


%prep
%setup -q
sed -i -e "s/Encoding=UTF-8//" data/%{name}.desktop.in


%build
%{__python} setup.py build




%install
rm -rf $RPM_BUILD_ROOT
%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
%find_lang %{name}
desktop-file-install					\
--dir=${RPM_BUILD_ROOT}%{_datadir}/applications		\
$RPM_BUILD_ROOT/%{_datadir}/applications/%{name}.desktop
#not entirely sure this is needed, keeping rpmlint happy
rm -f $RPM_BUILD_ROOT/%{_datadir}/%{name}/headers/microdvd



%clean
rm -rf $RPM_BUILD_ROOT


%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING CREDITS README NEWS TODO
%{_bindir}/gaupol
%{python_sitelib}/*
%{_datadir}/%{name}
%{_datadir}/applications/%{name}.desktop
%{_datadir}/icons/*/*/apps/%{name}.*
%{_mandir}/man1/gaupol.1*




%changelog
* Thu Jan 15 2009 Lucian Langa <cooly at gnome.eu.org> - 0.13.1-1
- initial package




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gaupol/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	19 Jan 2009 23:21:19 -0000	1.1
+++ .cvsignore	20 Jan 2009 05:47:46 -0000	1.2
@@ -0,0 +1 @@
+gaupol-0.13.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gaupol/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	19 Jan 2009 23:21:19 -0000	1.1
+++ sources	20 Jan 2009 05:47:47 -0000	1.2
@@ -0,0 +1 @@
+11c62f478bcd9cd10a88752e4545e1d2  gaupol-0.13.1.tar.gz



From lucilanga at fedoraproject.org  Tue Jan 20 05:48:55 2009
From: lucilanga at fedoraproject.org (Lucian Langa)
Date: Tue, 20 Jan 2009 05:48:55 +0000 (UTC)
Subject: rpms/gaupol/F-10 gaupol.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <20090120054855.19867700F9@cvs1.fedora.phx.redhat.com>

Author: lucilanga

Update of /cvs/pkgs/rpms/gaupol/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25050

Modified Files:
	.cvsignore sources 
Added Files:
	gaupol.spec 
Log Message:
initial import


--- NEW FILE gaupol.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
Name:		gaupol
Version:	0.13.1
Release:	1%{?dist}
Summary:	Subtitle editor

Group:		Applications/Multimedia
License:	GPLv3+
URL:		http://home.gna.org/gaupol
Source0:	http://download.gna.org/gaupol/0.13/%{name}-%{version}.tar.gz
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:	noarch


BuildRequires:	python, desktop-file-utils, gettext, doxygen, intltool
BuildRequires:	python-setuptools-devel
Requires:	python-enchant

%description
Editor for text-based subtitle files. It supports multiple subtitle file 
formats and provides means of correcting texts and timing subtitles to match
video. The user interface is designed with attention to batch processing of
multiple documents and convenience of translating.


%prep
%setup -q
sed -i -e "s/Encoding=UTF-8//" data/%{name}.desktop.in


%build
%{__python} setup.py build




%install
rm -rf $RPM_BUILD_ROOT
%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
%find_lang %{name}
desktop-file-install					\
--dir=${RPM_BUILD_ROOT}%{_datadir}/applications		\
$RPM_BUILD_ROOT/%{_datadir}/applications/%{name}.desktop
#not entirely sure this is needed, keeping rpmlint happy
rm -f $RPM_BUILD_ROOT/%{_datadir}/%{name}/headers/microdvd



%clean
rm -rf $RPM_BUILD_ROOT


%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING CREDITS README NEWS TODO
%{_bindir}/gaupol
%{python_sitelib}/*
%{_datadir}/%{name}
%{_datadir}/applications/%{name}.desktop
%{_datadir}/icons/*/*/apps/%{name}.*
%{_mandir}/man1/gaupol.1*




%changelog
* Thu Jan 15 2009 Lucian Langa <cooly at gnome.eu.org> - 0.13.1-1
- initial package




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gaupol/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	19 Jan 2009 23:21:19 -0000	1.1
+++ .cvsignore	20 Jan 2009 05:48:24 -0000	1.2
@@ -0,0 +1 @@
+gaupol-0.13.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gaupol/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	19 Jan 2009 23:21:19 -0000	1.1
+++ sources	20 Jan 2009 05:48:24 -0000	1.2
@@ -0,0 +1 @@
+11c62f478bcd9cd10a88752e4545e1d2  gaupol-0.13.1.tar.gz



From mmaslano at fedoraproject.org  Tue Jan 20 07:42:49 2009
From: mmaslano at fedoraproject.org (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?=)
Date: Tue, 20 Jan 2009 07:42:49 +0000 (UTC)
Subject: rpms/perl/F-9 perl-5.10.0-PerlIO-via-change34025.patch, NONE,
	1.1 perl.spec, 1.185, 1.186
Message-ID: <20090120074249.72F55700F9@cvs1.fedora.phx.redhat.com>

Author: mmaslano

Update of /cvs/pkgs/rpms/perl/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4402

Modified Files:
	perl.spec 
Added Files:
	perl-5.10.0-PerlIO-via-change34025.patch 
Log Message:
* Mon Jan 19 2009 Marcela Ma??l????ov?? <mmaslano at redhat.com> - 4:5.10.0-40
- 455410 http://rt.perl.org/rt3/Public/Bug/Display.html?id=54934
  Attempt to free unreferenced scalar fiddling with the symbol table
  Keep the refcount of the globs generated by PerlIO::via balanced.


perl-5.10.0-PerlIO-via-change34025.patch:

--- NEW FILE perl-5.10.0-PerlIO-via-change34025.patch ---
Change 34025 by rgs at scipion on 2008/06/08 14:00:59

Fix for bug [perl #54934] Attempt to free unreferenced scalar
fiddling with the symbol table
Keep the refcount of the globs generated by PerlIO::via balanced.

Affected files ...

... //depot/perl/ext/PerlIO/via/via.pm#9 edit
... //depot/perl/ext/PerlIO/via/via.xs#17 edit

Differences ...
diff -up perl-5.10.0/ext/PerlIO/via/via.xs.34025 perl-5.10.0/ext/PerlIO/via/via.xs
--- perl-5.10.0/ext/PerlIO/via/via.xs.34025	2007-12-18 11:47:07.000000000 +0100
+++ perl-5.10.0/ext/PerlIO/via/via.xs	2009-01-19 09:15:46.000000000 +0100
@@ -89,7 +89,7 @@ PerlIOVia_method(pTHX_ PerlIO * f, char 
 	    if (!s->fh) {
 		GV *gv = newGVgen(HvNAME_get(s->stash));
 		GvIOp(gv) = newIO();
-		s->fh = newRV_noinc((SV *) gv);
+		s->fh = newRV((SV *) gv);
 		s->io = GvIOp(gv);
 	    }
 	    IoIFP(s->io) = PerlIONext(f);


Index: perl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl/F-9/perl.spec,v
retrieving revision 1.185
retrieving revision 1.186
diff -u -r1.185 -r1.186
--- perl.spec	29 Nov 2008 00:10:09 -0000	1.185
+++ perl.spec	20 Jan 2009 07:42:17 -0000	1.186
@@ -16,7 +16,7 @@
 
 Name:           perl
 Version:        %{perl_version}
-Release:        39%{?dist}
+Release:        40%{?dist}
 Epoch:          %{perl_epoch}
 Summary:        Practical Extraction and Report Language
 Group:          Development/Languages
@@ -125,6 +125,7 @@
 # http://www.nntp.perl.org/group/perl.perl5.changes/2008/05/msg21733.html
 Patch29:    perl-5.10.0-Change33897.patch
 
+Patch30:	perl-5.10.0-PerlIO-via-change34025.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{perl_version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  tcsh, dos2unix, man, groff
@@ -861,6 +862,7 @@
 %patch27 -p1
 %patch28 -p1
 %patch29 -p1
+%patch30 -p1
 
 #
 # Candidates for doc recoding (need case by case review):
@@ -1089,6 +1091,7 @@
 perl -x patchlevel.h '33881 Integrate Changes 33825, 33826, 33829'
 perl -x patchlevel.h '33896 Eliminate POSIX::int_macro_int, and all the complex AUTOLOAD fandango'
 perl -x patchlevel.h '33897 Replaced the WEXITSTATUS, WIFEXITED, WIFSIGNALED, WIFSTOPPED, WSTOPSIG'
+perl -x patchlevel.h '54934 Change 34025 refcount of the globs generated by PerlIO::via balanced'
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -1694,6 +1697,11 @@
 
 # Old changelog entries are preserved in CVS.
 %changelog
+* Mon Jan 19 2009 Marcela Ma??l????ov?? <mmaslano at redhat.com> - 4:5.10.0-40
+- 455410 http://rt.perl.org/rt3/Public/Bug/Display.html?id=54934
+  Attempt to free unreferenced scalar fiddling with the symbol table
+  Keep the refcount of the globs generated by PerlIO::via balanced.
+
 * Fri Nov 28 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 4:5.10.0-39
 - to fix Fedora bz 473223, which is really perl bug #54186 (http://rt.perl.org/rt3//Public/Bug/Display.html?id=54186)
   we apply Changes 33640, 33881, 33896, 33897



From mgrepl at fedoraproject.org  Tue Jan 20 08:00:05 2009
From: mgrepl at fedoraproject.org (Miroslav Grepl)
Date: Tue, 20 Jan 2009 08:00:05 +0000 (UTC)
Subject: rpms/selinux-policy/F-10 policy-20080710.patch,1.122,1.123
Message-ID: <20090120080005.51DF4700F9@cvs1.fedora.phx.redhat.com>

Author: mgrepl

Update of /cvs/extras/rpms/selinux-policy/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6293

Modified Files:
	policy-20080710.patch 
Log Message:
- Fix apache policy



policy-20080710.patch:

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.122 -r 1.123 policy-20080710.patch
Index: policy-20080710.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-10/policy-20080710.patch,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -r1.122 -r1.123
--- policy-20080710.patch	19 Jan 2009 19:25:42 -0000	1.122
+++ policy-20080710.patch	20 Jan 2009 08:00:02 -0000	1.123
@@ -1,6 +1,6 @@
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/default_contexts serefpolicy-3.5.13/config/appconfig-mcs/default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/default_contexts	2008-10-17 14:49:10.000000000 +0200
-+++ serefpolicy-3.5.13/config/appconfig-mcs/default_contexts	2009-01-19 20:07:59.000000000 +0100
++++ serefpolicy-3.5.13/config/appconfig-mcs/default_contexts	2009-01-19 22:44:15.000000000 +0100
 @@ -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
@@ -24,13 +24,13 @@
 +system_r:xdm_t:s0		user_r:user_t:s0
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/failsafe_context serefpolicy-3.5.13/config/appconfig-mcs/failsafe_context
 --- nsaserefpolicy/config/appconfig-mcs/failsafe_context	2008-10-17 14:49:10.000000000 +0200
-+++ serefpolicy-3.5.13/config/appconfig-mcs/failsafe_context	2009-01-19 20:07:59.000000000 +0100
++++ serefpolicy-3.5.13/config/appconfig-mcs/failsafe_context	2009-01-19 22:44:15.000000000 +0100
 @@ -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.5.13/config/appconfig-mcs/guest_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/guest_u_default_contexts	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.5.13/config/appconfig-mcs/guest_u_default_contexts	2009-01-19 20:07:59.000000000 +0100
++++ serefpolicy-3.5.13/config/appconfig-mcs/guest_u_default_contexts	2009-01-19 22:44:15.000000000 +0100
 @@ -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
@@ -40,7 +40,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.5.13/config/appconfig-mcs/root_default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/root_default_contexts	2008-10-17 14:49:10.000000000 +0200
-+++ serefpolicy-3.5.13/config/appconfig-mcs/root_default_contexts	2009-01-19 20:07:59.000000000 +0100
++++ serefpolicy-3.5.13/config/appconfig-mcs/root_default_contexts	2009-01-19 22:44:15.000000000 +0100
 @@ -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
@@ -57,7 +57,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/seusers serefpolicy-3.5.13/config/appconfig-mcs/seusers
 --- nsaserefpolicy/config/appconfig-mcs/seusers	2008-10-17 14:49:10.000000000 +0200
-+++ serefpolicy-3.5.13/config/appconfig-mcs/seusers	2009-01-19 20:07:59.000000000 +0100
++++ serefpolicy-3.5.13/config/appconfig-mcs/seusers	2009-01-19 22:44:15.000000000 +0100
 @@ -1,3 +1,3 @@
  system_u:system_u:s0-mcs_systemhigh
 -root:root:s0-mcs_systemhigh
@@ -66,7 +66,7 @@
 +__default__:unconfined_u:s0-mcs_systemhigh
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/staff_u_default_contexts serefpolicy-3.5.13/config/appconfig-mcs/staff_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/staff_u_default_contexts	2008-10-17 14:49:10.000000000 +0200
-+++ serefpolicy-3.5.13/config/appconfig-mcs/staff_u_default_contexts	2009-01-19 20:07:59.000000000 +0100
++++ serefpolicy-3.5.13/config/appconfig-mcs/staff_u_default_contexts	2009-01-19 22:44:15.000000000 +0100
 @@ -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
@@ -83,7 +83,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/unconfined_u_default_contexts serefpolicy-3.5.13/config/appconfig-mcs/unconfined_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/unconfined_u_default_contexts	2008-10-17 14:49:10.000000000 +0200
-+++ serefpolicy-3.5.13/config/appconfig-mcs/unconfined_u_default_contexts	2009-01-19 20:07:59.000000000 +0100
++++ serefpolicy-3.5.13/config/appconfig-mcs/unconfined_u_default_contexts	2009-01-19 22:44:15.000000000 +0100
 @@ -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
@@ -93,13 +93,13 @@
  system_r:xdm_t:s0		unconfined_r:unconfined_t:s0
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/userhelper_context serefpolicy-3.5.13/config/appconfig-mcs/userhelper_context
 --- nsaserefpolicy/config/appconfig-mcs/userhelper_context	2008-10-17 14:49:10.000000000 +0200
-+++ serefpolicy-3.5.13/config/appconfig-mcs/userhelper_context	2009-01-19 20:07:59.000000000 +0100
++++ serefpolicy-3.5.13/config/appconfig-mcs/userhelper_context	2009-01-19 22:44:15.000000000 +0100
 @@ -1 +1 @@
 -system_u:sysadm_r:sysadm_t:s0
 +system_u:system_r:unconfined_t:s0	
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/user_u_default_contexts serefpolicy-3.5.13/config/appconfig-mcs/user_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/user_u_default_contexts	2008-10-17 14:49:10.000000000 +0200
-+++ serefpolicy-3.5.13/config/appconfig-mcs/user_u_default_contexts	2009-01-19 20:07:59.000000000 +0100
++++ serefpolicy-3.5.13/config/appconfig-mcs/user_u_default_contexts	2009-01-19 22:44:15.000000000 +0100
 @@ -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
@@ -114,7 +114,7 @@
 +user_r:user_t:s0		user_r:user_t:s0
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/xguest_u_default_contexts serefpolicy-3.5.13/config/appconfig-mcs/xguest_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/xguest_u_default_contexts	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.5.13/config/appconfig-mcs/xguest_u_default_contexts	2009-01-19 20:07:59.000000000 +0100
++++ serefpolicy-3.5.13/config/appconfig-mcs/xguest_u_default_contexts	2009-01-19 22:44:15.000000000 +0100
 @@ -0,0 +1,7 @@
 +system_r:local_login_t	xguest_r:xguest_t:s0
 +system_r:remote_login_t	xguest_r:xguest_t:s0
@@ -125,7 +125,7 @@
 +xguest_r:xguest_t:s0	xguest_r:xguest_t:s0
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/default_contexts serefpolicy-3.5.13/config/appconfig-mls/default_contexts
 --- nsaserefpolicy/config/appconfig-mls/default_contexts	2008-10-17 14:49:10.000000000 +0200
-+++ serefpolicy-3.5.13/config/appconfig-mls/default_contexts	2009-01-19 20:07:59.000000000 +0100
++++ serefpolicy-3.5.13/config/appconfig-mls/default_contexts	2009-01-19 22:44:15.000000000 +0100
 @@ -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
@@ -149,7 +149,7 @@
 +system_r:xdm_t:s0		user_r:user_t:s0
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/guest_u_default_contexts serefpolicy-3.5.13/config/appconfig-mls/guest_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mls/guest_u_default_contexts	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.5.13/config/appconfig-mls/guest_u_default_contexts	2009-01-19 20:07:59.000000000 +0100
++++ serefpolicy-3.5.13/config/appconfig-mls/guest_u_default_contexts	2009-01-19 22:44:15.000000000 +0100
 @@ -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
@@ -157,7 +157,7 @@
 +system_r:crond_t:s0		guest_r:guest_t:s0
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/root_default_contexts serefpolicy-3.5.13/config/appconfig-mls/root_default_contexts
 --- nsaserefpolicy/config/appconfig-mls/root_default_contexts	2008-10-17 14:49:10.000000000 +0200
-+++ serefpolicy-3.5.13/config/appconfig-mls/root_default_contexts	2009-01-19 20:07:59.000000000 +0100
++++ serefpolicy-3.5.13/config/appconfig-mls/root_default_contexts	2009-01-19 22:44:15.000000000 +0100
 @@ -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
@@ -178,7 +178,7 @@
 +#system_r:sshd_t:s0		sysadm_r:sysadm_t:s0 staff_r:staff_t:s0
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/staff_u_default_contexts serefpolicy-3.5.13/config/appconfig-mls/staff_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mls/staff_u_default_contexts	2008-10-17 14:49:10.000000000 +0200
-+++ serefpolicy-3.5.13/config/appconfig-mls/staff_u_default_contexts	2009-01-19 20:07:59.000000000 +0100
++++ serefpolicy-3.5.13/config/appconfig-mls/staff_u_default_contexts	2009-01-19 22:44:15.000000000 +0100
 @@ -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
@@ -190,7 +190,7 @@
  staff_r:staff_sudo_t:s0		staff_r:staff_t:s0
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/user_u_default_contexts serefpolicy-3.5.13/config/appconfig-mls/user_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mls/user_u_default_contexts	2008-10-17 14:49:10.000000000 +0200
-+++ serefpolicy-3.5.13/config/appconfig-mls/user_u_default_contexts	2009-01-19 20:07:59.000000000 +0100
++++ serefpolicy-3.5.13/config/appconfig-mls/user_u_default_contexts	2009-01-19 22:44:15.000000000 +0100
 @@ -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
@@ -202,7 +202,7 @@
  user_r:user_sudo_t:s0		user_r:user_t:s0
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/xguest_u_default_contexts serefpolicy-3.5.13/config/appconfig-mls/xguest_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mls/xguest_u_default_contexts	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.5.13/config/appconfig-mls/xguest_u_default_contexts	2009-01-19 20:07:59.000000000 +0100
++++ serefpolicy-3.5.13/config/appconfig-mls/xguest_u_default_contexts	2009-01-19 22:44:15.000000000 +0100
 @@ -0,0 +1,7 @@
 +system_r:local_login_t	xguest_r:xguest_t:s0
 +system_r:remote_login_t	xguest_r:xguest_t:s0
@@ -213,7 +213,7 @@
 +xguest_r:xguest_t:s0	xguest_r:xguest_t:s0
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-standard/guest_u_default_contexts serefpolicy-3.5.13/config/appconfig-standard/guest_u_default_contexts
 --- nsaserefpolicy/config/appconfig-standard/guest_u_default_contexts	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.5.13/config/appconfig-standard/guest_u_default_contexts	2009-01-19 20:07:59.000000000 +0100
++++ serefpolicy-3.5.13/config/appconfig-standard/guest_u_default_contexts	2009-01-19 22:44:15.000000000 +0100
 @@ -0,0 +1,4 @@
 +system_r:local_login_t	guest_r:guest_t
 +system_r:remote_login_t	guest_r:guest_t
@@ -221,7 +221,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.5.13/config/appconfig-standard/root_default_contexts
 --- nsaserefpolicy/config/appconfig-standard/root_default_contexts	2008-10-17 14:49:10.000000000 +0200
-+++ serefpolicy-3.5.13/config/appconfig-standard/root_default_contexts	2009-01-19 20:07:59.000000000 +0100
++++ serefpolicy-3.5.13/config/appconfig-standard/root_default_contexts	2009-01-19 22:44:15.000000000 +0100
 @@ -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
@@ -237,7 +237,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/staff_u_default_contexts serefpolicy-3.5.13/config/appconfig-standard/staff_u_default_contexts
 --- nsaserefpolicy/config/appconfig-standard/staff_u_default_contexts	2008-10-17 14:49:10.000000000 +0200
-+++ serefpolicy-3.5.13/config/appconfig-standard/staff_u_default_contexts	2009-01-19 20:07:59.000000000 +0100
++++ serefpolicy-3.5.13/config/appconfig-standard/staff_u_default_contexts	2009-01-19 22:44:15.000000000 +0100
 @@ -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
@@ -249,7 +249,7 @@
  staff_r:staff_sudo_t		staff_r:staff_t
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-standard/user_u_default_contexts serefpolicy-3.5.13/config/appconfig-standard/user_u_default_contexts
 --- nsaserefpolicy/config/appconfig-standard/user_u_default_contexts	2008-10-17 14:49:10.000000000 +0200
-+++ serefpolicy-3.5.13/config/appconfig-standard/user_u_default_contexts	2009-01-19 20:07:59.000000000 +0100
++++ serefpolicy-3.5.13/config/appconfig-standard/user_u_default_contexts	2009-01-19 22:44:15.000000000 +0100
 @@ -1,7 +1,7 @@
  system_r:local_login_t		user_r:user_t
  system_r:remote_login_t		user_r:user_t
@@ -261,7 +261,7 @@
  user_r:user_sudo_t		user_r:user_t
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-standard/xguest_u_default_contexts serefpolicy-3.5.13/config/appconfig-standard/xguest_u_default_contexts
 --- nsaserefpolicy/config/appconfig-standard/xguest_u_default_contexts	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.5.13/config/appconfig-standard/xguest_u_default_contexts	2009-01-19 20:07:59.000000000 +0100
++++ serefpolicy-3.5.13/config/appconfig-standard/xguest_u_default_contexts	2009-01-19 22:44:15.000000000 +0100
 @@ -0,0 +1,5 @@
 +system_r:local_login_t	xguest_r:xguest_t
 +system_r:remote_login_t	xguest_r:xguest_t
@@ -270,7 +270,7 @@
 +system_r:xdm_t		xguest_r:xguest_t
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/Makefile serefpolicy-3.5.13/Makefile
 --- nsaserefpolicy/Makefile	2008-10-17 14:49:11.000000000 +0200
-+++ serefpolicy-3.5.13/Makefile	2009-01-19 20:07:59.000000000 +0100
++++ serefpolicy-3.5.13/Makefile	2009-01-19 22:44:15.000000000 +0100
 @@ -311,20 +311,22 @@
  
[...3616 lines suppressed...]
  
  ########################################
@@ -32123,7 +32163,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.te serefpolicy-3.5.13/policy/modules/system/selinuxutil.te
 --- nsaserefpolicy/policy/modules/system/selinuxutil.te	2008-10-17 14:49:13.000000000 +0200
-+++ serefpolicy-3.5.13/policy/modules/system/selinuxutil.te	2009-01-19 20:07:59.000000000 +0100
++++ serefpolicy-3.5.13/policy/modules/system/selinuxutil.te	2009-01-19 22:44:15.000000000 +0100
 @@ -23,6 +23,9 @@
  type selinux_config_t;
  files_type(selinux_config_t)
@@ -32480,7 +32520,7 @@
  ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/setrans.if serefpolicy-3.5.13/policy/modules/system/setrans.if
 --- nsaserefpolicy/policy/modules/system/setrans.if	2008-10-17 14:49:13.000000000 +0200
-+++ serefpolicy-3.5.13/policy/modules/system/setrans.if	2009-01-19 20:07:59.000000000 +0100
++++ serefpolicy-3.5.13/policy/modules/system/setrans.if	2009-01-19 22:44:15.000000000 +0100
 @@ -21,3 +21,23 @@
  	stream_connect_pattern($1,setrans_var_run_t,setrans_var_run_t,setrans_t)
  	files_list_pids($1)
@@ -32507,7 +32547,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/sysnetwork.fc serefpolicy-3.5.13/policy/modules/system/sysnetwork.fc
 --- nsaserefpolicy/policy/modules/system/sysnetwork.fc	2008-10-17 14:49:13.000000000 +0200
-+++ serefpolicy-3.5.13/policy/modules/system/sysnetwork.fc	2009-01-19 20:07:59.000000000 +0100
++++ serefpolicy-3.5.13/policy/modules/system/sysnetwork.fc	2009-01-19 22:44:15.000000000 +0100
 @@ -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)
@@ -32532,7 +32572,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.5.13/policy/modules/system/sysnetwork.if
 --- nsaserefpolicy/policy/modules/system/sysnetwork.if	2008-10-17 14:49:13.000000000 +0200
-+++ serefpolicy-3.5.13/policy/modules/system/sysnetwork.if	2009-01-19 20:07:59.000000000 +0100
++++ serefpolicy-3.5.13/policy/modules/system/sysnetwork.if	2009-01-19 22:44:15.000000000 +0100
 @@ -198,7 +198,25 @@
  		type dhcpc_state_t;
  	')
@@ -32644,7 +32684,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/sysnetwork.te serefpolicy-3.5.13/policy/modules/system/sysnetwork.te
 --- nsaserefpolicy/policy/modules/system/sysnetwork.te	2008-10-17 14:49:13.000000000 +0200
-+++ serefpolicy-3.5.13/policy/modules/system/sysnetwork.te	2009-01-19 20:07:59.000000000 +0100
++++ serefpolicy-3.5.13/policy/modules/system/sysnetwork.te	2009-01-19 22:44:15.000000000 +0100
 @@ -20,6 +20,9 @@
  init_daemon_domain(dhcpc_t,dhcpc_exec_t)
  role system_r types dhcpc_t;
@@ -32834,7 +32874,7 @@
  	xen_append_log(ifconfig_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/udev.fc serefpolicy-3.5.13/policy/modules/system/udev.fc
 --- nsaserefpolicy/policy/modules/system/udev.fc	2008-10-17 14:49:13.000000000 +0200
-+++ serefpolicy-3.5.13/policy/modules/system/udev.fc	2009-01-19 20:07:59.000000000 +0100
++++ serefpolicy-3.5.13/policy/modules/system/udev.fc	2009-01-19 22:44:15.000000000 +0100
 @@ -13,8 +13,11 @@
  /sbin/start_udev --	gen_context(system_u:object_r:udev_exec_t,s0)
  /sbin/udev	--	gen_context(system_u:object_r:udev_exec_t,s0)
@@ -32849,7 +32889,7 @@
 +/var/run/PackageKit/udev(/.*)?		gen_context(system_u:object_r:udev_var_run_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/udev.if serefpolicy-3.5.13/policy/modules/system/udev.if
 --- nsaserefpolicy/policy/modules/system/udev.if	2008-10-17 14:49:13.000000000 +0200
-+++ serefpolicy-3.5.13/policy/modules/system/udev.if	2009-01-19 20:07:59.000000000 +0100
++++ serefpolicy-3.5.13/policy/modules/system/udev.if	2009-01-19 22:44:15.000000000 +0100
 @@ -96,6 +96,24 @@
  
  ########################################
@@ -32905,7 +32945,7 @@
  ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/udev.te serefpolicy-3.5.13/policy/modules/system/udev.te
 --- nsaserefpolicy/policy/modules/system/udev.te	2008-10-17 14:49:13.000000000 +0200
-+++ serefpolicy-3.5.13/policy/modules/system/udev.te	2009-01-19 20:07:59.000000000 +0100
++++ serefpolicy-3.5.13/policy/modules/system/udev.te	2009-01-19 22:44:15.000000000 +0100
 @@ -83,6 +83,7 @@
  kernel_rw_unix_dgram_sockets(udev_t)
  kernel_dgram_send(udev_t)
@@ -32964,7 +33004,7 @@
  ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.fc serefpolicy-3.5.13/policy/modules/system/unconfined.fc
 --- nsaserefpolicy/policy/modules/system/unconfined.fc	2008-10-17 14:49:13.000000000 +0200
-+++ serefpolicy-3.5.13/policy/modules/system/unconfined.fc	2009-01-19 20:07:59.000000000 +0100
++++ serefpolicy-3.5.13/policy/modules/system/unconfined.fc	2009-01-19 22:44:15.000000000 +0100
 @@ -2,15 +2,31 @@
  # e.g.:
  # /usr/local/bin/appsrv		--	gen_context(system_u:object_r:unconfined_exec_t,s0)
@@ -33008,7 +33048,7 @@
 +#/usr/lib(64)?/gcl-[^/]+/unixport/saved_.* 	--	gen_context(system_u:object_r:execmem_exec_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.if serefpolicy-3.5.13/policy/modules/system/unconfined.if
 --- nsaserefpolicy/policy/modules/system/unconfined.if	2008-10-17 14:49:13.000000000 +0200
-+++ serefpolicy-3.5.13/policy/modules/system/unconfined.if	2009-01-19 20:07:59.000000000 +0100
++++ serefpolicy-3.5.13/policy/modules/system/unconfined.if	2009-01-19 22:44:15.000000000 +0100
 @@ -12,14 +12,13 @@
  #
  interface(`unconfined_domain_noaudit',`
@@ -33358,7 +33398,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.te serefpolicy-3.5.13/policy/modules/system/unconfined.te
 --- nsaserefpolicy/policy/modules/system/unconfined.te	2008-10-17 14:49:13.000000000 +0200
-+++ serefpolicy-3.5.13/policy/modules/system/unconfined.te	2009-01-19 20:07:59.000000000 +0100
++++ serefpolicy-3.5.13/policy/modules/system/unconfined.te	2009-01-19 22:44:15.000000000 +0100
 @@ -6,35 +6,77 @@
  # Declarations
  #
@@ -33723,7 +33763,7 @@
 +gen_user(unconfined_u, user, unconfined_r system_r, s0, s0 - mls_systemhigh, mcs_allcats)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.fc serefpolicy-3.5.13/policy/modules/system/userdomain.fc
 --- nsaserefpolicy/policy/modules/system/userdomain.fc	2008-10-17 14:49:13.000000000 +0200
-+++ serefpolicy-3.5.13/policy/modules/system/userdomain.fc	2009-01-19 20:07:59.000000000 +0100
++++ serefpolicy-3.5.13/policy/modules/system/userdomain.fc	2009-01-19 22:44:15.000000000 +0100
 @@ -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)
@@ -33736,7 +33776,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.5.13/policy/modules/system/userdomain.if
 --- nsaserefpolicy/policy/modules/system/userdomain.if	2008-10-17 14:49:13.000000000 +0200
-+++ serefpolicy-3.5.13/policy/modules/system/userdomain.if	2009-01-19 20:07:59.000000000 +0100
++++ serefpolicy-3.5.13/policy/modules/system/userdomain.if	2009-01-19 22:44:15.000000000 +0100
 @@ -28,10 +28,14 @@
  		class context contains;
  	')
@@ -36489,7 +36529,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-3.5.13/policy/modules/system/userdomain.te
 --- nsaserefpolicy/policy/modules/system/userdomain.te	2008-10-17 14:49:13.000000000 +0200
-+++ serefpolicy-3.5.13/policy/modules/system/userdomain.te	2009-01-19 20:07:59.000000000 +0100
++++ serefpolicy-3.5.13/policy/modules/system/userdomain.te	2009-01-19 22:44:15.000000000 +0100
 @@ -8,13 +8,6 @@
  
  ## <desc>
@@ -36609,7 +36649,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.fc serefpolicy-3.5.13/policy/modules/system/xen.fc
 --- nsaserefpolicy/policy/modules/system/xen.fc	2008-10-17 14:49:13.000000000 +0200
-+++ serefpolicy-3.5.13/policy/modules/system/xen.fc	2009-01-19 20:07:59.000000000 +0100
++++ serefpolicy-3.5.13/policy/modules/system/xen.fc	2009-01-19 22:44:15.000000000 +0100
 @@ -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)
@@ -36620,7 +36660,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.if serefpolicy-3.5.13/policy/modules/system/xen.if
 --- nsaserefpolicy/policy/modules/system/xen.if	2008-10-17 14:49:13.000000000 +0200
-+++ serefpolicy-3.5.13/policy/modules/system/xen.if	2009-01-19 20:07:59.000000000 +0100
++++ serefpolicy-3.5.13/policy/modules/system/xen.if	2009-01-19 22:44:15.000000000 +0100
 @@ -155,7 +155,7 @@
  	stream_connect_pattern($1,xenstored_var_run_t,xenstored_var_run_t,xenstored_t)
  ')
@@ -36673,7 +36713,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.te serefpolicy-3.5.13/policy/modules/system/xen.te
 --- nsaserefpolicy/policy/modules/system/xen.te	2008-10-17 14:49:13.000000000 +0200
-+++ serefpolicy-3.5.13/policy/modules/system/xen.te	2009-01-19 20:07:59.000000000 +0100
++++ serefpolicy-3.5.13/policy/modules/system/xen.te	2009-01-19 22:44:15.000000000 +0100
 @@ -6,6 +6,13 @@
  # Declarations
  #
@@ -36907,7 +36947,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/policy_capabilities serefpolicy-3.5.13/policy/policy_capabilities
 --- nsaserefpolicy/policy/policy_capabilities	2008-10-17 14:49:14.000000000 +0200
-+++ serefpolicy-3.5.13/policy/policy_capabilities	2009-01-19 20:07:59.000000000 +0100
++++ serefpolicy-3.5.13/policy/policy_capabilities	2009-01-19 22:44:15.000000000 +0100
 @@ -29,4 +29,4 @@
  # chr_file: open
  # blk_file: open
@@ -36916,7 +36956,7 @@
 +#policycap open_perms;
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/support/obj_perm_sets.spt serefpolicy-3.5.13/policy/support/obj_perm_sets.spt
 --- nsaserefpolicy/policy/support/obj_perm_sets.spt	2008-10-17 14:49:14.000000000 +0200
-+++ serefpolicy-3.5.13/policy/support/obj_perm_sets.spt	2009-01-19 20:07:59.000000000 +0100
++++ serefpolicy-3.5.13/policy/support/obj_perm_sets.spt	2009-01-19 22:44:15.000000000 +0100
 @@ -59,22 +59,22 @@
  # 
  # Permissions for executing files.
@@ -37066,7 +37106,7 @@
 +define(`manage_key_perms', `{ create link read search setattr view write } ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/users serefpolicy-3.5.13/policy/users
 --- nsaserefpolicy/policy/users	2008-10-17 14:49:11.000000000 +0200
-+++ serefpolicy-3.5.13/policy/users	2009-01-19 20:07:59.000000000 +0100
++++ serefpolicy-3.5.13/policy/users	2009-01-19 22:44:15.000000000 +0100
 @@ -25,11 +25,8 @@
  # permit any access to such users, then remove this entry.
  #
@@ -37093,7 +37133,7 @@
 +gen_user(root, user, unconfined_r sysadm_r staff_r ifdef(`enable_mls',`secadm_r auditadm_r') system_r, s0, s0 - mls_systemhigh, mcs_allcats)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/Rules.modular serefpolicy-3.5.13/Rules.modular
 --- nsaserefpolicy/Rules.modular	2008-10-17 14:49:14.000000000 +0200
-+++ serefpolicy-3.5.13/Rules.modular	2009-01-19 20:07:59.000000000 +0100
++++ serefpolicy-3.5.13/Rules.modular	2009-01-19 22:44:15.000000000 +0100
 @@ -73,8 +73,8 @@
  $(tmpdir)/%.mod: $(m4support) $(tmpdir)/generated_definitions.conf $(tmpdir)/all_interfaces.conf %.te
  	@echo "Compliling $(NAME) $(@F) module"
@@ -37142,7 +37182,7 @@
  $(appdir)/customizable_types: $(base_conf)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/support/Makefile.devel serefpolicy-3.5.13/support/Makefile.devel
 --- nsaserefpolicy/support/Makefile.devel	2008-10-17 14:49:14.000000000 +0200
-+++ serefpolicy-3.5.13/support/Makefile.devel	2009-01-19 20:07:59.000000000 +0100
++++ serefpolicy-3.5.13/support/Makefile.devel	2009-01-19 22:44:15.000000000 +0100
 @@ -181,8 +181,7 @@
  tmp/%.mod: $(m4support) tmp/all_interfaces.conf %.te
  	@$(EINFO) "Compiling $(NAME) $(basename $(@F)) module"



From corsepiu at fedoraproject.org  Tue Jan 20 08:19:33 2009
From: corsepiu at fedoraproject.org (=?utf-8?q?Ralf_Cors=C3=A9pius?=)
Date: Tue, 20 Jan 2009 08:19:33 +0000 (UTC)
Subject: rpms/perl-Log-Log4perl/devel Log-Log4perl-1.01-032JRollFile.t.patch,
	1.1, NONE Log-Log4perl-1.01-Watch.pm.patch, 1.1, NONE
Message-ID: <20090120081933.1925B700F9@cvs1.fedora.phx.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-Log-Log4perl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8034

Removed Files:
	Log-Log4perl-1.01-032JRollFile.t.patch 
	Log-Log4perl-1.01-Watch.pm.patch 
Log Message:
Remove (unused).


--- Log-Log4perl-1.01-032JRollFile.t.patch DELETED ---


--- Log-Log4perl-1.01-Watch.pm.patch DELETED ---



From corsepiu at fedoraproject.org  Tue Jan 20 08:20:38 2009
From: corsepiu at fedoraproject.org (=?utf-8?q?Ralf_Cors=C3=A9pius?=)
Date: Tue, 20 Jan 2009 08:20:38 +0000 (UTC)
Subject: rpms/perl-Log-Log4perl/devel .cvsignore, 1.12,
	1.13 perl-Log-Log4perl.spec, 1.18, 1.19 sources, 1.12, 1.13
Message-ID: <20090120082038.0C362700F9@cvs1.fedora.phx.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-Log-Log4perl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8123

Modified Files:
	.cvsignore perl-Log-Log4perl.spec sources 
Log Message:
* Tue Jan 20 2009 Ralf Cors??pius <corsepiu at fedoraproject.org> - 1.20-1
- Upstream update.
- Reactivate testsuite.
- Remove examples (eg, ldap) from %doc.
- Don't chmod -x eg/*.
- Remove BR: perl(IPC::Shareable).



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Log-Log4perl/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	17 Oct 2007 13:52:05 -0000	1.12
+++ .cvsignore	20 Jan 2009 08:20:07 -0000	1.13
@@ -1 +1 @@
-Log-Log4perl-1.13.tar.gz
+Log-Log4perl-1.20.tar.gz


Index: perl-Log-Log4perl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Log-Log4perl/devel/perl-Log-Log4perl.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- perl-Log-Log4perl.spec	6 Mar 2008 18:18:08 -0000	1.18
+++ perl-Log-Log4perl.spec	20 Jan 2009 08:20:07 -0000	1.19
@@ -1,6 +1,6 @@
 Name:           perl-Log-Log4perl
-Version:        1.13
-Release:        2%{?dist}
+Version:        1.20
+Release:        1%{?dist}
 Summary:        Log4j implementation for Perl
 
 Group:          Development/Libraries
@@ -11,7 +11,6 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
-BuildRequires:  perl(IPC::Shareable)
 BuildRequires:  perl(Log::Dispatch)
 BuildRequires:  perl(Log::Dispatch::FileRotate) >= 1.10
 BuildRequires:  perl(SQL::Statement)
@@ -32,27 +31,22 @@
 %prep
 %setup -q -n Log-Log4perl-%{version}
 find lib -name "*.pm" -exec chmod -c a-x {} ';'
-%{__perl} -pi -e 's|^#!/usr/local/bin/perl|#!%{__perl}|' eg/newsyslog-test
-chmod -c a-x eg/* 
-
+%{__perl} -pi -e 's|^#!/usr/local/bin/perl|#!%{__perl}|' eg/newsyslog-test eg/benchmarks/simple
 
 %build
 %{__perl} Makefile.PL INSTALLDIRS=vendor
 make %{?_smp_mflags}
 
-
 %install
 rm -rf $RPM_BUILD_ROOT
 make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
 find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';'
 find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null ';'
-chmod -R u+w $RPM_BUILD_ROOT/*
+%{_fixperms} $RPM_BUILD_ROOT/*
 
 
 %check
-# These tests fail in the Fedora buildsystem. 
-# No clue as to why. They work fine in local testing.
-# make test L4P_ALL_TESTS=1
+make test L4P_ALL_TESTS=1
 
 
 %clean
@@ -61,12 +55,19 @@
 
 %files
 %defattr(-,root,root,-)
-%doc Changes LICENSE README eg/ ldap/
+%doc Changes LICENSE README
 %{perl_vendorlib}/Log/
 %{_mandir}/man3/*.3pm*
 
 
 %changelog
+* Tue Jan 20 2009 Ralf Cors??pius <corsepiu at fedoraproject.org> - 1.20-1
+- Upstream update.
+- Reactivate testsuite.
+- Remove examples (eg, ldap) from %%doc.
+- Don't chmod -x eg/*.
+- Remove BR: perl(IPC::Shareable).
+
 * Thu Mar  6 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1.13-2
 - rebuild for new perl
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Log-Log4perl/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	17 Oct 2007 13:52:05 -0000	1.12
+++ sources	20 Jan 2009 08:20:07 -0000	1.13
@@ -1 +1 @@
-ba0eff06d756834a9f549f3ece8c3f88  Log-Log4perl-1.13.tar.gz
+f60a1f8633fb7544fdc4d1e842564a8b  Log-Log4perl-1.20.tar.gz



From mgrepl at fedoraproject.org  Tue Jan 20 08:22:00 2009
From: mgrepl at fedoraproject.org (Miroslav Grepl)
Date: Tue, 20 Jan 2009 08:22:00 +0000 (UTC)
Subject: rpms/selinux-policy/F-10 policy-20080710.patch,1.123,1.124
Message-ID: <20090120082200.A5CC9700F9@cvs1.fedora.phx.redhat.com>

Author: mgrepl

Update of /cvs/extras/rpms/selinux-policy/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8338

Modified Files:
	policy-20080710.patch 
Log Message:
- Fix apache policy



policy-20080710.patch:

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.123 -r 1.124 policy-20080710.patch
Index: policy-20080710.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-10/policy-20080710.patch,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -r1.123 -r1.124
--- policy-20080710.patch	20 Jan 2009 08:00:02 -0000	1.123
+++ policy-20080710.patch	20 Jan 2009 08:21:59 -0000	1.124
@@ -1,6 +1,6 @@
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/default_contexts serefpolicy-3.5.13/config/appconfig-mcs/default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/default_contexts	2008-10-17 14:49:10.000000000 +0200
-+++ serefpolicy-3.5.13/config/appconfig-mcs/default_contexts	2009-01-19 22:44:15.000000000 +0100
++++ serefpolicy-3.5.13/config/appconfig-mcs/default_contexts	2009-01-20 09:09:46.000000000 +0100
 @@ -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
@@ -24,13 +24,13 @@
 +system_r:xdm_t:s0		user_r:user_t:s0
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/failsafe_context serefpolicy-3.5.13/config/appconfig-mcs/failsafe_context
 --- nsaserefpolicy/config/appconfig-mcs/failsafe_context	2008-10-17 14:49:10.000000000 +0200
-+++ serefpolicy-3.5.13/config/appconfig-mcs/failsafe_context	2009-01-19 22:44:15.000000000 +0100
++++ serefpolicy-3.5.13/config/appconfig-mcs/failsafe_context	2009-01-20 09:09:46.000000000 +0100
 @@ -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.5.13/config/appconfig-mcs/guest_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/guest_u_default_contexts	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.5.13/config/appconfig-mcs/guest_u_default_contexts	2009-01-19 22:44:15.000000000 +0100
++++ serefpolicy-3.5.13/config/appconfig-mcs/guest_u_default_contexts	2009-01-20 09:09:46.000000000 +0100
 @@ -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
@@ -40,7 +40,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.5.13/config/appconfig-mcs/root_default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/root_default_contexts	2008-10-17 14:49:10.000000000 +0200
-+++ serefpolicy-3.5.13/config/appconfig-mcs/root_default_contexts	2009-01-19 22:44:15.000000000 +0100
++++ serefpolicy-3.5.13/config/appconfig-mcs/root_default_contexts	2009-01-20 09:09:46.000000000 +0100
 @@ -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
@@ -57,7 +57,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/seusers serefpolicy-3.5.13/config/appconfig-mcs/seusers
 --- nsaserefpolicy/config/appconfig-mcs/seusers	2008-10-17 14:49:10.000000000 +0200
-+++ serefpolicy-3.5.13/config/appconfig-mcs/seusers	2009-01-19 22:44:15.000000000 +0100
++++ serefpolicy-3.5.13/config/appconfig-mcs/seusers	2009-01-20 09:09:46.000000000 +0100
 @@ -1,3 +1,3 @@
  system_u:system_u:s0-mcs_systemhigh
 -root:root:s0-mcs_systemhigh
@@ -66,7 +66,7 @@
 +__default__:unconfined_u:s0-mcs_systemhigh
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/staff_u_default_contexts serefpolicy-3.5.13/config/appconfig-mcs/staff_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/staff_u_default_contexts	2008-10-17 14:49:10.000000000 +0200
-+++ serefpolicy-3.5.13/config/appconfig-mcs/staff_u_default_contexts	2009-01-19 22:44:15.000000000 +0100
++++ serefpolicy-3.5.13/config/appconfig-mcs/staff_u_default_contexts	2009-01-20 09:09:46.000000000 +0100
 @@ -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
@@ -83,7 +83,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/unconfined_u_default_contexts serefpolicy-3.5.13/config/appconfig-mcs/unconfined_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/unconfined_u_default_contexts	2008-10-17 14:49:10.000000000 +0200
-+++ serefpolicy-3.5.13/config/appconfig-mcs/unconfined_u_default_contexts	2009-01-19 22:44:15.000000000 +0100
++++ serefpolicy-3.5.13/config/appconfig-mcs/unconfined_u_default_contexts	2009-01-20 09:09:46.000000000 +0100
 @@ -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
@@ -93,13 +93,13 @@
  system_r:xdm_t:s0		unconfined_r:unconfined_t:s0
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/userhelper_context serefpolicy-3.5.13/config/appconfig-mcs/userhelper_context
 --- nsaserefpolicy/config/appconfig-mcs/userhelper_context	2008-10-17 14:49:10.000000000 +0200
-+++ serefpolicy-3.5.13/config/appconfig-mcs/userhelper_context	2009-01-19 22:44:15.000000000 +0100
++++ serefpolicy-3.5.13/config/appconfig-mcs/userhelper_context	2009-01-20 09:09:46.000000000 +0100
 @@ -1 +1 @@
 -system_u:sysadm_r:sysadm_t:s0
 +system_u:system_r:unconfined_t:s0	
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/user_u_default_contexts serefpolicy-3.5.13/config/appconfig-mcs/user_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/user_u_default_contexts	2008-10-17 14:49:10.000000000 +0200
-+++ serefpolicy-3.5.13/config/appconfig-mcs/user_u_default_contexts	2009-01-19 22:44:15.000000000 +0100
++++ serefpolicy-3.5.13/config/appconfig-mcs/user_u_default_contexts	2009-01-20 09:09:46.000000000 +0100
 @@ -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
@@ -114,7 +114,7 @@
 +user_r:user_t:s0		user_r:user_t:s0
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/xguest_u_default_contexts serefpolicy-3.5.13/config/appconfig-mcs/xguest_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/xguest_u_default_contexts	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.5.13/config/appconfig-mcs/xguest_u_default_contexts	2009-01-19 22:44:15.000000000 +0100
++++ serefpolicy-3.5.13/config/appconfig-mcs/xguest_u_default_contexts	2009-01-20 09:09:46.000000000 +0100
 @@ -0,0 +1,7 @@
 +system_r:local_login_t	xguest_r:xguest_t:s0
 +system_r:remote_login_t	xguest_r:xguest_t:s0
@@ -125,7 +125,7 @@
 +xguest_r:xguest_t:s0	xguest_r:xguest_t:s0
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/default_contexts serefpolicy-3.5.13/config/appconfig-mls/default_contexts
 --- nsaserefpolicy/config/appconfig-mls/default_contexts	2008-10-17 14:49:10.000000000 +0200
-+++ serefpolicy-3.5.13/config/appconfig-mls/default_contexts	2009-01-19 22:44:15.000000000 +0100
++++ serefpolicy-3.5.13/config/appconfig-mls/default_contexts	2009-01-20 09:09:46.000000000 +0100
 @@ -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
@@ -149,7 +149,7 @@
 +system_r:xdm_t:s0		user_r:user_t:s0
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/guest_u_default_contexts serefpolicy-3.5.13/config/appconfig-mls/guest_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mls/guest_u_default_contexts	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.5.13/config/appconfig-mls/guest_u_default_contexts	2009-01-19 22:44:15.000000000 +0100
++++ serefpolicy-3.5.13/config/appconfig-mls/guest_u_default_contexts	2009-01-20 09:09:46.000000000 +0100
 @@ -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
@@ -157,7 +157,7 @@
 +system_r:crond_t:s0		guest_r:guest_t:s0
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/root_default_contexts serefpolicy-3.5.13/config/appconfig-mls/root_default_contexts
 --- nsaserefpolicy/config/appconfig-mls/root_default_contexts	2008-10-17 14:49:10.000000000 +0200
-+++ serefpolicy-3.5.13/config/appconfig-mls/root_default_contexts	2009-01-19 22:44:15.000000000 +0100
++++ serefpolicy-3.5.13/config/appconfig-mls/root_default_contexts	2009-01-20 09:09:46.000000000 +0100
 @@ -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
@@ -178,7 +178,7 @@
 +#system_r:sshd_t:s0		sysadm_r:sysadm_t:s0 staff_r:staff_t:s0
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/staff_u_default_contexts serefpolicy-3.5.13/config/appconfig-mls/staff_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mls/staff_u_default_contexts	2008-10-17 14:49:10.000000000 +0200
-+++ serefpolicy-3.5.13/config/appconfig-mls/staff_u_default_contexts	2009-01-19 22:44:15.000000000 +0100
++++ serefpolicy-3.5.13/config/appconfig-mls/staff_u_default_contexts	2009-01-20 09:09:46.000000000 +0100
 @@ -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
@@ -190,7 +190,7 @@
  staff_r:staff_sudo_t:s0		staff_r:staff_t:s0
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/user_u_default_contexts serefpolicy-3.5.13/config/appconfig-mls/user_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mls/user_u_default_contexts	2008-10-17 14:49:10.000000000 +0200
-+++ serefpolicy-3.5.13/config/appconfig-mls/user_u_default_contexts	2009-01-19 22:44:15.000000000 +0100
++++ serefpolicy-3.5.13/config/appconfig-mls/user_u_default_contexts	2009-01-20 09:09:46.000000000 +0100
 @@ -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
@@ -202,7 +202,7 @@
  user_r:user_sudo_t:s0		user_r:user_t:s0
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/xguest_u_default_contexts serefpolicy-3.5.13/config/appconfig-mls/xguest_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mls/xguest_u_default_contexts	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.5.13/config/appconfig-mls/xguest_u_default_contexts	2009-01-19 22:44:15.000000000 +0100
++++ serefpolicy-3.5.13/config/appconfig-mls/xguest_u_default_contexts	2009-01-20 09:09:46.000000000 +0100
 @@ -0,0 +1,7 @@
 +system_r:local_login_t	xguest_r:xguest_t:s0
 +system_r:remote_login_t	xguest_r:xguest_t:s0
@@ -213,7 +213,7 @@
 +xguest_r:xguest_t:s0	xguest_r:xguest_t:s0
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-standard/guest_u_default_contexts serefpolicy-3.5.13/config/appconfig-standard/guest_u_default_contexts
 --- nsaserefpolicy/config/appconfig-standard/guest_u_default_contexts	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.5.13/config/appconfig-standard/guest_u_default_contexts	2009-01-19 22:44:15.000000000 +0100
++++ serefpolicy-3.5.13/config/appconfig-standard/guest_u_default_contexts	2009-01-20 09:09:46.000000000 +0100
 @@ -0,0 +1,4 @@
 +system_r:local_login_t	guest_r:guest_t
 +system_r:remote_login_t	guest_r:guest_t
@@ -221,7 +221,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.5.13/config/appconfig-standard/root_default_contexts
 --- nsaserefpolicy/config/appconfig-standard/root_default_contexts	2008-10-17 14:49:10.000000000 +0200
-+++ serefpolicy-3.5.13/config/appconfig-standard/root_default_contexts	2009-01-19 22:44:15.000000000 +0100
++++ serefpolicy-3.5.13/config/appconfig-standard/root_default_contexts	2009-01-20 09:09:46.000000000 +0100
 @@ -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
@@ -237,7 +237,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/staff_u_default_contexts serefpolicy-3.5.13/config/appconfig-standard/staff_u_default_contexts
 --- nsaserefpolicy/config/appconfig-standard/staff_u_default_contexts	2008-10-17 14:49:10.000000000 +0200
-+++ serefpolicy-3.5.13/config/appconfig-standard/staff_u_default_contexts	2009-01-19 22:44:15.000000000 +0100
++++ serefpolicy-3.5.13/config/appconfig-standard/staff_u_default_contexts	2009-01-20 09:09:46.000000000 +0100
 @@ -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
@@ -249,7 +249,7 @@
  staff_r:staff_sudo_t		staff_r:staff_t
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-standard/user_u_default_contexts serefpolicy-3.5.13/config/appconfig-standard/user_u_default_contexts
 --- nsaserefpolicy/config/appconfig-standard/user_u_default_contexts	2008-10-17 14:49:10.000000000 +0200
-+++ serefpolicy-3.5.13/config/appconfig-standard/user_u_default_contexts	2009-01-19 22:44:15.000000000 +0100
++++ serefpolicy-3.5.13/config/appconfig-standard/user_u_default_contexts	2009-01-20 09:09:46.000000000 +0100
 @@ -1,7 +1,7 @@
  system_r:local_login_t		user_r:user_t
  system_r:remote_login_t		user_r:user_t
@@ -261,7 +261,7 @@
  user_r:user_sudo_t		user_r:user_t
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-standard/xguest_u_default_contexts serefpolicy-3.5.13/config/appconfig-standard/xguest_u_default_contexts
 --- nsaserefpolicy/config/appconfig-standard/xguest_u_default_contexts	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.5.13/config/appconfig-standard/xguest_u_default_contexts	2009-01-19 22:44:15.000000000 +0100
++++ serefpolicy-3.5.13/config/appconfig-standard/xguest_u_default_contexts	2009-01-20 09:09:46.000000000 +0100
 @@ -0,0 +1,5 @@
 +system_r:local_login_t	xguest_r:xguest_t
 +system_r:remote_login_t	xguest_r:xguest_t
@@ -270,7 +270,7 @@
 +system_r:xdm_t		xguest_r:xguest_t
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/Makefile serefpolicy-3.5.13/Makefile
 --- nsaserefpolicy/Makefile	2008-10-17 14:49:11.000000000 +0200
-+++ serefpolicy-3.5.13/Makefile	2009-01-19 22:44:15.000000000 +0100
++++ serefpolicy-3.5.13/Makefile	2009-01-20 09:09:46.000000000 +0100
 @@ -311,20 +311,22 @@
  
[...3328 lines suppressed...]
  
  ########################################
@@ -32163,7 +32163,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.te serefpolicy-3.5.13/policy/modules/system/selinuxutil.te
 --- nsaserefpolicy/policy/modules/system/selinuxutil.te	2008-10-17 14:49:13.000000000 +0200
-+++ serefpolicy-3.5.13/policy/modules/system/selinuxutil.te	2009-01-19 22:44:15.000000000 +0100
++++ serefpolicy-3.5.13/policy/modules/system/selinuxutil.te	2009-01-20 09:09:46.000000000 +0100
 @@ -23,6 +23,9 @@
  type selinux_config_t;
  files_type(selinux_config_t)
@@ -32520,7 +32520,7 @@
  ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/setrans.if serefpolicy-3.5.13/policy/modules/system/setrans.if
 --- nsaserefpolicy/policy/modules/system/setrans.if	2008-10-17 14:49:13.000000000 +0200
-+++ serefpolicy-3.5.13/policy/modules/system/setrans.if	2009-01-19 22:44:15.000000000 +0100
++++ serefpolicy-3.5.13/policy/modules/system/setrans.if	2009-01-20 09:09:46.000000000 +0100
 @@ -21,3 +21,23 @@
  	stream_connect_pattern($1,setrans_var_run_t,setrans_var_run_t,setrans_t)
  	files_list_pids($1)
@@ -32547,7 +32547,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/sysnetwork.fc serefpolicy-3.5.13/policy/modules/system/sysnetwork.fc
 --- nsaserefpolicy/policy/modules/system/sysnetwork.fc	2008-10-17 14:49:13.000000000 +0200
-+++ serefpolicy-3.5.13/policy/modules/system/sysnetwork.fc	2009-01-19 22:44:15.000000000 +0100
++++ serefpolicy-3.5.13/policy/modules/system/sysnetwork.fc	2009-01-20 09:09:46.000000000 +0100
 @@ -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)
@@ -32572,7 +32572,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.5.13/policy/modules/system/sysnetwork.if
 --- nsaserefpolicy/policy/modules/system/sysnetwork.if	2008-10-17 14:49:13.000000000 +0200
-+++ serefpolicy-3.5.13/policy/modules/system/sysnetwork.if	2009-01-19 22:44:15.000000000 +0100
++++ serefpolicy-3.5.13/policy/modules/system/sysnetwork.if	2009-01-20 09:09:46.000000000 +0100
 @@ -198,7 +198,25 @@
  		type dhcpc_state_t;
  	')
@@ -32684,7 +32684,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/sysnetwork.te serefpolicy-3.5.13/policy/modules/system/sysnetwork.te
 --- nsaserefpolicy/policy/modules/system/sysnetwork.te	2008-10-17 14:49:13.000000000 +0200
-+++ serefpolicy-3.5.13/policy/modules/system/sysnetwork.te	2009-01-19 22:44:15.000000000 +0100
++++ serefpolicy-3.5.13/policy/modules/system/sysnetwork.te	2009-01-20 09:09:46.000000000 +0100
 @@ -20,6 +20,9 @@
  init_daemon_domain(dhcpc_t,dhcpc_exec_t)
  role system_r types dhcpc_t;
@@ -32874,7 +32874,7 @@
  	xen_append_log(ifconfig_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/udev.fc serefpolicy-3.5.13/policy/modules/system/udev.fc
 --- nsaserefpolicy/policy/modules/system/udev.fc	2008-10-17 14:49:13.000000000 +0200
-+++ serefpolicy-3.5.13/policy/modules/system/udev.fc	2009-01-19 22:44:15.000000000 +0100
++++ serefpolicy-3.5.13/policy/modules/system/udev.fc	2009-01-20 09:09:46.000000000 +0100
 @@ -13,8 +13,11 @@
  /sbin/start_udev --	gen_context(system_u:object_r:udev_exec_t,s0)
  /sbin/udev	--	gen_context(system_u:object_r:udev_exec_t,s0)
@@ -32889,7 +32889,7 @@
 +/var/run/PackageKit/udev(/.*)?		gen_context(system_u:object_r:udev_var_run_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/udev.if serefpolicy-3.5.13/policy/modules/system/udev.if
 --- nsaserefpolicy/policy/modules/system/udev.if	2008-10-17 14:49:13.000000000 +0200
-+++ serefpolicy-3.5.13/policy/modules/system/udev.if	2009-01-19 22:44:15.000000000 +0100
++++ serefpolicy-3.5.13/policy/modules/system/udev.if	2009-01-20 09:09:46.000000000 +0100
 @@ -96,6 +96,24 @@
  
  ########################################
@@ -32945,7 +32945,7 @@
  ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/udev.te serefpolicy-3.5.13/policy/modules/system/udev.te
 --- nsaserefpolicy/policy/modules/system/udev.te	2008-10-17 14:49:13.000000000 +0200
-+++ serefpolicy-3.5.13/policy/modules/system/udev.te	2009-01-19 22:44:15.000000000 +0100
++++ serefpolicy-3.5.13/policy/modules/system/udev.te	2009-01-20 09:09:46.000000000 +0100
 @@ -83,6 +83,7 @@
  kernel_rw_unix_dgram_sockets(udev_t)
  kernel_dgram_send(udev_t)
@@ -33004,7 +33004,7 @@
  ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.fc serefpolicy-3.5.13/policy/modules/system/unconfined.fc
 --- nsaserefpolicy/policy/modules/system/unconfined.fc	2008-10-17 14:49:13.000000000 +0200
-+++ serefpolicy-3.5.13/policy/modules/system/unconfined.fc	2009-01-19 22:44:15.000000000 +0100
++++ serefpolicy-3.5.13/policy/modules/system/unconfined.fc	2009-01-20 09:09:46.000000000 +0100
 @@ -2,15 +2,31 @@
  # e.g.:
  # /usr/local/bin/appsrv		--	gen_context(system_u:object_r:unconfined_exec_t,s0)
@@ -33048,7 +33048,7 @@
 +#/usr/lib(64)?/gcl-[^/]+/unixport/saved_.* 	--	gen_context(system_u:object_r:execmem_exec_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.if serefpolicy-3.5.13/policy/modules/system/unconfined.if
 --- nsaserefpolicy/policy/modules/system/unconfined.if	2008-10-17 14:49:13.000000000 +0200
-+++ serefpolicy-3.5.13/policy/modules/system/unconfined.if	2009-01-19 22:44:15.000000000 +0100
++++ serefpolicy-3.5.13/policy/modules/system/unconfined.if	2009-01-20 09:09:46.000000000 +0100
 @@ -12,14 +12,13 @@
  #
  interface(`unconfined_domain_noaudit',`
@@ -33398,7 +33398,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.te serefpolicy-3.5.13/policy/modules/system/unconfined.te
 --- nsaserefpolicy/policy/modules/system/unconfined.te	2008-10-17 14:49:13.000000000 +0200
-+++ serefpolicy-3.5.13/policy/modules/system/unconfined.te	2009-01-19 22:44:15.000000000 +0100
++++ serefpolicy-3.5.13/policy/modules/system/unconfined.te	2009-01-20 09:09:46.000000000 +0100
 @@ -6,35 +6,77 @@
  # Declarations
  #
@@ -33763,7 +33763,7 @@
 +gen_user(unconfined_u, user, unconfined_r system_r, s0, s0 - mls_systemhigh, mcs_allcats)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.fc serefpolicy-3.5.13/policy/modules/system/userdomain.fc
 --- nsaserefpolicy/policy/modules/system/userdomain.fc	2008-10-17 14:49:13.000000000 +0200
-+++ serefpolicy-3.5.13/policy/modules/system/userdomain.fc	2009-01-19 22:44:15.000000000 +0100
++++ serefpolicy-3.5.13/policy/modules/system/userdomain.fc	2009-01-20 09:09:46.000000000 +0100
 @@ -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)
@@ -33776,7 +33776,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.5.13/policy/modules/system/userdomain.if
 --- nsaserefpolicy/policy/modules/system/userdomain.if	2008-10-17 14:49:13.000000000 +0200
-+++ serefpolicy-3.5.13/policy/modules/system/userdomain.if	2009-01-19 22:44:15.000000000 +0100
++++ serefpolicy-3.5.13/policy/modules/system/userdomain.if	2009-01-20 09:09:46.000000000 +0100
 @@ -28,10 +28,14 @@
  		class context contains;
  	')
@@ -36529,7 +36529,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-3.5.13/policy/modules/system/userdomain.te
 --- nsaserefpolicy/policy/modules/system/userdomain.te	2008-10-17 14:49:13.000000000 +0200
-+++ serefpolicy-3.5.13/policy/modules/system/userdomain.te	2009-01-19 22:44:15.000000000 +0100
++++ serefpolicy-3.5.13/policy/modules/system/userdomain.te	2009-01-20 09:09:46.000000000 +0100
 @@ -8,13 +8,6 @@
  
  ## <desc>
@@ -36649,7 +36649,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.fc serefpolicy-3.5.13/policy/modules/system/xen.fc
 --- nsaserefpolicy/policy/modules/system/xen.fc	2008-10-17 14:49:13.000000000 +0200
-+++ serefpolicy-3.5.13/policy/modules/system/xen.fc	2009-01-19 22:44:15.000000000 +0100
++++ serefpolicy-3.5.13/policy/modules/system/xen.fc	2009-01-20 09:09:46.000000000 +0100
 @@ -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)
@@ -36660,7 +36660,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.if serefpolicy-3.5.13/policy/modules/system/xen.if
 --- nsaserefpolicy/policy/modules/system/xen.if	2008-10-17 14:49:13.000000000 +0200
-+++ serefpolicy-3.5.13/policy/modules/system/xen.if	2009-01-19 22:44:15.000000000 +0100
++++ serefpolicy-3.5.13/policy/modules/system/xen.if	2009-01-20 09:09:46.000000000 +0100
 @@ -155,7 +155,7 @@
  	stream_connect_pattern($1,xenstored_var_run_t,xenstored_var_run_t,xenstored_t)
  ')
@@ -36713,7 +36713,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.te serefpolicy-3.5.13/policy/modules/system/xen.te
 --- nsaserefpolicy/policy/modules/system/xen.te	2008-10-17 14:49:13.000000000 +0200
-+++ serefpolicy-3.5.13/policy/modules/system/xen.te	2009-01-19 22:44:15.000000000 +0100
++++ serefpolicy-3.5.13/policy/modules/system/xen.te	2009-01-20 09:09:46.000000000 +0100
 @@ -6,6 +6,13 @@
  # Declarations
  #
@@ -36947,7 +36947,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/policy_capabilities serefpolicy-3.5.13/policy/policy_capabilities
 --- nsaserefpolicy/policy/policy_capabilities	2008-10-17 14:49:14.000000000 +0200
-+++ serefpolicy-3.5.13/policy/policy_capabilities	2009-01-19 22:44:15.000000000 +0100
++++ serefpolicy-3.5.13/policy/policy_capabilities	2009-01-20 09:09:46.000000000 +0100
 @@ -29,4 +29,4 @@
  # chr_file: open
  # blk_file: open
@@ -36956,7 +36956,7 @@
 +#policycap open_perms;
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/support/obj_perm_sets.spt serefpolicy-3.5.13/policy/support/obj_perm_sets.spt
 --- nsaserefpolicy/policy/support/obj_perm_sets.spt	2008-10-17 14:49:14.000000000 +0200
-+++ serefpolicy-3.5.13/policy/support/obj_perm_sets.spt	2009-01-19 22:44:15.000000000 +0100
++++ serefpolicy-3.5.13/policy/support/obj_perm_sets.spt	2009-01-20 09:09:46.000000000 +0100
 @@ -59,22 +59,22 @@
  # 
  # Permissions for executing files.
@@ -37106,7 +37106,7 @@
 +define(`manage_key_perms', `{ create link read search setattr view write } ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/users serefpolicy-3.5.13/policy/users
 --- nsaserefpolicy/policy/users	2008-10-17 14:49:11.000000000 +0200
-+++ serefpolicy-3.5.13/policy/users	2009-01-19 22:44:15.000000000 +0100
++++ serefpolicy-3.5.13/policy/users	2009-01-20 09:09:46.000000000 +0100
 @@ -25,11 +25,8 @@
  # permit any access to such users, then remove this entry.
  #
@@ -37133,7 +37133,7 @@
 +gen_user(root, user, unconfined_r sysadm_r staff_r ifdef(`enable_mls',`secadm_r auditadm_r') system_r, s0, s0 - mls_systemhigh, mcs_allcats)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/Rules.modular serefpolicy-3.5.13/Rules.modular
 --- nsaserefpolicy/Rules.modular	2008-10-17 14:49:14.000000000 +0200
-+++ serefpolicy-3.5.13/Rules.modular	2009-01-19 22:44:15.000000000 +0100
++++ serefpolicy-3.5.13/Rules.modular	2009-01-20 09:09:46.000000000 +0100
 @@ -73,8 +73,8 @@
  $(tmpdir)/%.mod: $(m4support) $(tmpdir)/generated_definitions.conf $(tmpdir)/all_interfaces.conf %.te
  	@echo "Compliling $(NAME) $(@F) module"
@@ -37182,7 +37182,7 @@
  $(appdir)/customizable_types: $(base_conf)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/support/Makefile.devel serefpolicy-3.5.13/support/Makefile.devel
 --- nsaserefpolicy/support/Makefile.devel	2008-10-17 14:49:14.000000000 +0200
-+++ serefpolicy-3.5.13/support/Makefile.devel	2009-01-19 22:44:15.000000000 +0100
++++ serefpolicy-3.5.13/support/Makefile.devel	2009-01-20 09:09:46.000000000 +0100
 @@ -181,8 +181,7 @@
  tmp/%.mod: $(m4support) tmp/all_interfaces.conf %.te
  	@$(EINFO) "Compiling $(NAME) $(basename $(@F)) module"



From corsepiu at fedoraproject.org  Tue Jan 20 08:32:10 2009
From: corsepiu at fedoraproject.org (=?utf-8?q?Ralf_Cors=C3=A9pius?=)
Date: Tue, 20 Jan 2009 08:32:10 +0000 (UTC)
Subject: rpms/perl-Log-Log4perl/F-10 Log-Log4perl-1.01-032JRollFile.t.patch, 
	1.1, NONE Log-Log4perl-1.01-Watch.pm.patch, 1.1, NONE
Message-ID: <20090120083210.3D1E7700F9@cvs1.fedora.phx.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-Log-Log4perl/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10292

Removed Files:
	Log-Log4perl-1.01-032JRollFile.t.patch 
	Log-Log4perl-1.01-Watch.pm.patch 
Log Message:
Remove (unused).


--- Log-Log4perl-1.01-032JRollFile.t.patch DELETED ---


--- Log-Log4perl-1.01-Watch.pm.patch DELETED ---



From corsepiu at fedoraproject.org  Tue Jan 20 08:33:24 2009
From: corsepiu at fedoraproject.org (=?utf-8?q?Ralf_Cors=C3=A9pius?=)
Date: Tue, 20 Jan 2009 08:33:24 +0000 (UTC)
Subject: rpms/perl-Log-Log4perl/F-10 .cvsignore, 1.12,
	1.13 perl-Log-Log4perl.spec, 1.18, 1.19 sources, 1.12, 1.13
Message-ID: <20090120083324.191DF700F9@cvs1.fedora.phx.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-Log-Log4perl/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10395

Modified Files:
	.cvsignore perl-Log-Log4perl.spec sources 
Log Message:
* Tue Jan 20 2009 Ralf Cors??pius <corsepiu at fedoraproject.org> - 1.20-1
- Upstream update.
- Reactivate testsuite.
- Remove examples (eg, ldap) from %doc.
- Don't chmod -x eg/*.
- Remove BR: perl(IPC::Shareable).



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Log-Log4perl/F-10/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	17 Oct 2007 13:52:05 -0000	1.12
+++ .cvsignore	20 Jan 2009 08:32:53 -0000	1.13
@@ -1 +1 @@
-Log-Log4perl-1.13.tar.gz
+Log-Log4perl-1.20.tar.gz


Index: perl-Log-Log4perl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Log-Log4perl/F-10/perl-Log-Log4perl.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- perl-Log-Log4perl.spec	6 Mar 2008 18:18:08 -0000	1.18
+++ perl-Log-Log4perl.spec	20 Jan 2009 08:32:53 -0000	1.19
@@ -1,6 +1,6 @@
 Name:           perl-Log-Log4perl
-Version:        1.13
-Release:        2%{?dist}
+Version:        1.20
+Release:        1%{?dist}
 Summary:        Log4j implementation for Perl
 
 Group:          Development/Libraries
@@ -11,7 +11,6 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
-BuildRequires:  perl(IPC::Shareable)
 BuildRequires:  perl(Log::Dispatch)
 BuildRequires:  perl(Log::Dispatch::FileRotate) >= 1.10
 BuildRequires:  perl(SQL::Statement)
@@ -32,27 +31,22 @@
 %prep
 %setup -q -n Log-Log4perl-%{version}
 find lib -name "*.pm" -exec chmod -c a-x {} ';'
-%{__perl} -pi -e 's|^#!/usr/local/bin/perl|#!%{__perl}|' eg/newsyslog-test
-chmod -c a-x eg/* 
-
+%{__perl} -pi -e 's|^#!/usr/local/bin/perl|#!%{__perl}|' eg/newsyslog-test eg/benchmarks/simple
 
 %build
 %{__perl} Makefile.PL INSTALLDIRS=vendor
 make %{?_smp_mflags}
 
-
 %install
 rm -rf $RPM_BUILD_ROOT
 make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
 find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';'
 find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null ';'
-chmod -R u+w $RPM_BUILD_ROOT/*
+%{_fixperms} $RPM_BUILD_ROOT/*
 
 
 %check
-# These tests fail in the Fedora buildsystem. 
-# No clue as to why. They work fine in local testing.
-# make test L4P_ALL_TESTS=1
+make test L4P_ALL_TESTS=1
 
 
 %clean
@@ -61,12 +55,19 @@
 
 %files
 %defattr(-,root,root,-)
-%doc Changes LICENSE README eg/ ldap/
+%doc Changes LICENSE README
 %{perl_vendorlib}/Log/
 %{_mandir}/man3/*.3pm*
 
 
 %changelog
+* Tue Jan 20 2009 Ralf Cors??pius <corsepiu at fedoraproject.org> - 1.20-1
+- Upstream update.
+- Reactivate testsuite.
+- Remove examples (eg, ldap) from %%doc.
+- Don't chmod -x eg/*.
+- Remove BR: perl(IPC::Shareable).
+
 * Thu Mar  6 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1.13-2
 - rebuild for new perl
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Log-Log4perl/F-10/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	17 Oct 2007 13:52:05 -0000	1.12
+++ sources	20 Jan 2009 08:32:53 -0000	1.13
@@ -1 +1 @@
-ba0eff06d756834a9f549f3ece8c3f88  Log-Log4perl-1.13.tar.gz
+f60a1f8633fb7544fdc4d1e842564a8b  Log-Log4perl-1.20.tar.gz



From corsepiu at fedoraproject.org  Tue Jan 20 08:40:39 2009
From: corsepiu at fedoraproject.org (=?utf-8?q?Ralf_Cors=C3=A9pius?=)
Date: Tue, 20 Jan 2009 08:40:39 +0000 (UTC)
Subject: rpms/perl-Log-Log4perl/F-9 Log-Log4perl-1.01-032JRollFile.t.patch,
	1.1, NONE Log-Log4perl-1.01-Watch.pm.patch, 1.1, NONE
Message-ID: <20090120084039.C87D8700F9@cvs1.fedora.phx.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-Log-Log4perl/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11287

Removed Files:
	Log-Log4perl-1.01-032JRollFile.t.patch 
	Log-Log4perl-1.01-Watch.pm.patch 
Log Message:
Remove (unused).


--- Log-Log4perl-1.01-032JRollFile.t.patch DELETED ---


--- Log-Log4perl-1.01-Watch.pm.patch DELETED ---



From corsepiu at fedoraproject.org  Tue Jan 20 08:41:33 2009
From: corsepiu at fedoraproject.org (=?utf-8?q?Ralf_Cors=C3=A9pius?=)
Date: Tue, 20 Jan 2009 08:41:33 +0000 (UTC)
Subject: rpms/perl-Log-Log4perl/F-9 .cvsignore, 1.12,
	1.13 perl-Log-Log4perl.spec, 1.18, 1.19 sources, 1.12, 1.13
Message-ID: <20090120084133.63344700F9@cvs1.fedora.phx.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-Log-Log4perl/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11373

Modified Files:
	.cvsignore perl-Log-Log4perl.spec sources 
Log Message:
* Tue Jan 20 2009 Ralf Cors??pius <corsepiu at fedoraproject.org> - 1.20-1
- Upstream update.
- Reactivate testsuite.
- Remove examples (eg, ldap) from %doc.
- Don't chmod -x eg/*.
- Remove BR: perl(IPC::Shareable).



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Log-Log4perl/F-9/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	17 Oct 2007 13:52:05 -0000	1.12
+++ .cvsignore	20 Jan 2009 08:41:03 -0000	1.13
@@ -1 +1 @@
-Log-Log4perl-1.13.tar.gz
+Log-Log4perl-1.20.tar.gz


Index: perl-Log-Log4perl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Log-Log4perl/F-9/perl-Log-Log4perl.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- perl-Log-Log4perl.spec	6 Mar 2008 18:18:08 -0000	1.18
+++ perl-Log-Log4perl.spec	20 Jan 2009 08:41:03 -0000	1.19
@@ -1,6 +1,6 @@
 Name:           perl-Log-Log4perl
-Version:        1.13
-Release:        2%{?dist}
+Version:        1.20
+Release:        1%{?dist}
 Summary:        Log4j implementation for Perl
 
 Group:          Development/Libraries
@@ -11,7 +11,6 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
-BuildRequires:  perl(IPC::Shareable)
 BuildRequires:  perl(Log::Dispatch)
 BuildRequires:  perl(Log::Dispatch::FileRotate) >= 1.10
 BuildRequires:  perl(SQL::Statement)
@@ -32,27 +31,22 @@
 %prep
 %setup -q -n Log-Log4perl-%{version}
 find lib -name "*.pm" -exec chmod -c a-x {} ';'
-%{__perl} -pi -e 's|^#!/usr/local/bin/perl|#!%{__perl}|' eg/newsyslog-test
-chmod -c a-x eg/* 
-
+%{__perl} -pi -e 's|^#!/usr/local/bin/perl|#!%{__perl}|' eg/newsyslog-test eg/benchmarks/simple
 
 %build
 %{__perl} Makefile.PL INSTALLDIRS=vendor
 make %{?_smp_mflags}
 
-
 %install
 rm -rf $RPM_BUILD_ROOT
 make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
 find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';'
 find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null ';'
-chmod -R u+w $RPM_BUILD_ROOT/*
+%{_fixperms} $RPM_BUILD_ROOT/*
 
 
 %check
-# These tests fail in the Fedora buildsystem. 
-# No clue as to why. They work fine in local testing.
-# make test L4P_ALL_TESTS=1
+make test L4P_ALL_TESTS=1
 
 
 %clean
@@ -61,12 +55,19 @@
 
 %files
 %defattr(-,root,root,-)
-%doc Changes LICENSE README eg/ ldap/
+%doc Changes LICENSE README
 %{perl_vendorlib}/Log/
 %{_mandir}/man3/*.3pm*
 
 
 %changelog
+* Tue Jan 20 2009 Ralf Cors??pius <corsepiu at fedoraproject.org> - 1.20-1
+- Upstream update.
+- Reactivate testsuite.
+- Remove examples (eg, ldap) from %%doc.
+- Don't chmod -x eg/*.
+- Remove BR: perl(IPC::Shareable).
+
 * Thu Mar  6 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1.13-2
 - rebuild for new perl
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Log-Log4perl/F-9/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	17 Oct 2007 13:52:05 -0000	1.12
+++ sources	20 Jan 2009 08:41:03 -0000	1.13
@@ -1 +1 @@
-ba0eff06d756834a9f549f3ece8c3f88  Log-Log4perl-1.13.tar.gz
+f60a1f8633fb7544fdc4d1e842564a8b  Log-Log4perl-1.20.tar.gz



From sergiopr at fedoraproject.org  Tue Jan 20 08:59:56 2009
From: sergiopr at fedoraproject.org (Sergio Pascual)
Date: Tue, 20 Jan 2009 08:59:56 +0000 (UTC)
Subject: rpms/blitz/devel blitz-gcc43.patch,1.1,1.2 blitz.spec,1.5,1.6
Message-ID: <20090120085956.E23F5700F9@cvs1.fedora.phx.redhat.com>

Author: sergiopr

Update of /cvs/pkgs/rpms/blitz/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14116

Modified Files:
	blitz-gcc43.patch blitz.spec 
Log Message:
* Tue Jan 20 2009 Sergio Pascual <sergiopr at fedoraproject.org> - 0.9-8
- New patch (from upstream) to build with gcc4.3 


blitz-gcc43.patch:

Index: blitz-gcc43.patch
===================================================================
RCS file: /cvs/pkgs/rpms/blitz/devel/blitz-gcc43.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- blitz-gcc43.patch	17 Mar 2008 20:29:49 -0000	1.1
+++ blitz-gcc43.patch	20 Jan 2009 08:59:26 -0000	1.2
@@ -1,126 +1,14 @@
-diff -ur blitz-0.9/blitz/array/methods.cc blitz-0.9.gcc43/blitz/array/methods.cc
---- blitz-0.9/blitz/array/methods.cc	2004-09-17 01:50:26.000000000 +0200
-+++ blitz-0.9.gcc43/blitz/array/methods.cc	2008-03-04 07:58:07.000000000 +0100
-@@ -158,7 +158,7 @@
+diff -ur blitz-0.9/blitz/blitz.h blitz-0.9.gcc43/blitz/blitz.h
+--- blitz-0.9/blitz/blitz.h	2005-05-19 01:35:55.000000000 +0200
++++ blitz-0.9.gcc43/blitz/blitz.h	2009-01-20 09:54:00.000000000 +0100
+@@ -61,8 +61,10 @@
+ 
+ #ifdef BZ_MATH_FN_IN_NAMESPACE_STD 
+   #include <cmath>
++  #include <cstdlib>
+ #else
+   #include <math.h>
++  #include <stdlib.h>
+ #endif
  
-     for (int i=0; i < N_rank; ++i)
-     {
--        int stride = BZ_MATHFN_SCOPE(abs)(stride_[i]);
-+        int stride = abs(stride_[i]);
-         if (stride == 1)
-             haveUnitStride = true;
- 
-@@ -166,7 +166,7 @@
- 
-         int j = 0;
-         for (j=0; j < N_rank; ++j)
--            if (BZ_MATHFN_SCOPE(abs)(stride_[j]) == vi)
-+            if (abs(stride_[j]) == vi)
-                 break;
- 
-         if (j == N_rank)
-diff -ur blitz-0.9/blitz/funcs.h blitz-0.9.gcc43/blitz/funcs.h
---- blitz-0.9/blitz/funcs.h	2005-10-08 03:22:55.000000000 +0200
-+++ blitz-0.9.gcc43/blitz/funcs.h	2008-03-03 23:48:55.000000000 +0100
-@@ -93,7 +93,7 @@
- BZ_DEFINE_UNARY_FUNC(Fn_cos,BZ_MATHFN_SCOPE(cos))
- BZ_DEFINE_UNARY_FUNC(Fn_cosh,BZ_MATHFN_SCOPE(cosh))
- BZ_DEFINE_UNARY_FUNC(Fn_exp,BZ_MATHFN_SCOPE(exp))
--BZ_DEFINE_UNARY_FUNC(Fn_fabs,BZ_MATHFN_SCOPE(fabs))
-+BZ_DEFINE_UNARY_FUNC(Fn_fabs,fabs)
- BZ_DEFINE_UNARY_FUNC(Fn_floor,BZ_MATHFN_SCOPE(floor))
- BZ_DEFINE_UNARY_FUNC(Fn_log,BZ_MATHFN_SCOPE(log))
- BZ_DEFINE_UNARY_FUNC(Fn_log10,BZ_MATHFN_SCOPE(log10))
-@@ -506,7 +506,7 @@
-     
-     static inline T_numtype
-     apply(T_numtype1 a)
--    { return BZ_MATHFN_SCOPE(abs)(a); }
-+    { return abs(a); }
-     
-     template<typename T1>
-     static inline void prettyPrint(BZ_STD_SCOPE(string) &str,
-@@ -527,7 +527,7 @@
-     
-     static inline T_numtype
-     apply(T_numtype1 a)
--    { return BZ_MATHFN_SCOPE(labs)(a); }
-+    { return labs(a); }
-     
-     template<typename T1>
-     static inline void prettyPrint(BZ_STD_SCOPE(string) &str,
-@@ -548,7 +548,7 @@
-     
-     static inline T_numtype
-     apply(T_numtype1 a)
--    { return BZ_MATHFN_SCOPE(fabs)(a); }
-+    { return fabs(a); }
-     
-     template<typename T1>
-     static inline void prettyPrint(BZ_STD_SCOPE(string) &str,
-@@ -569,7 +569,7 @@
-     
-     static inline T_numtype
-     apply(T_numtype1 a)
--    { return BZ_MATHFN_SCOPE(fabs)(a); }
-+    { return fabs(a); }
-     
-     template<typename T1>
-     static inline void prettyPrint(BZ_STD_SCOPE(string) &str,
-@@ -590,7 +590,7 @@
-     
-     static inline T_numtype
-     apply(T_numtype1 a)
--    { return BZ_MATHFN_SCOPE(fabs)(a); }
-+    { return fabs(a); }
-     
-     template<typename T1>
-     static inline void prettyPrint(BZ_STD_SCOPE(string) &str,
-diff -ur blitz-0.9/blitz/mathfunc.h blitz-0.9.gcc43/blitz/mathfunc.h
---- blitz-0.9/blitz/mathfunc.h	2005-05-18 22:22:38.000000000 +0200
-+++ blitz-0.9.gcc43/blitz/mathfunc.h	2008-03-03 23:36:00.000000000 +0100
-@@ -22,7 +22,7 @@
-     typedef P_numtype1 T_numtype;
- 
-     static inline T_numtype apply(T_numtype1 x)
--    { return BZ_MATHFN_SCOPE(abs)(x); }
-+    { return abs(x); }
- 
-     template<typename T1>
-     static void prettyPrint(BZ_STD_SCOPE(string) &str, prettyPrintFormat& format,
-@@ -42,7 +42,7 @@
-     typedef long T_numtype;
- 
-     static inline T_numtype apply(T_numtype1 x)
--    { return BZ_MATHFN_SCOPE(labs)((long)x); }
-+    { return labs((long)x); }
- 
-     template<typename T1>
-     static void prettyPrint(BZ_STD_SCOPE(string) &str, prettyPrintFormat& format,
-@@ -62,7 +62,7 @@
-     typedef float T_numtype;
- 
-     static inline T_numtype apply(T_numtype1 x)
--    { return BZ_MATHFN_SCOPE(fabs)((float)x); }
-+    { return fabs((float)x); }
- 
-     template<typename T1>
-     static void prettyPrint(BZ_STD_SCOPE(string) &str, prettyPrintFormat& format,
-@@ -82,7 +82,7 @@
-     typedef double T_numtype;
- 
-     static inline T_numtype apply(T_numtype1 x)
--    { return BZ_MATHFN_SCOPE(fabs)((double)x); }
-+    { return fabs((double)x); }
- 
-     template<typename T1>
-     static void prettyPrint(BZ_STD_SCOPE(string) &str, prettyPrintFormat& format,
-@@ -102,7 +102,7 @@
-     typedef long double T_numtype;
- 
-     static inline T_numtype apply(T_numtype1 x)
--    { return BZ_MATHFN_SCOPE(fabs)((long double)x); }
-+    { return fabs((long double)x); }
- 
-     template<typename T1>
-     static void prettyPrint(BZ_STD_SCOPE(string) &str, prettyPrintFormat& format,
+ #ifdef BZ_HAVE_COMPLEX


Index: blitz.spec
===================================================================
RCS file: /cvs/pkgs/rpms/blitz/devel/blitz.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- blitz.spec	12 Mar 2008 16:02:40 -0000	1.5
+++ blitz.spec	20 Jan 2009 08:59:26 -0000	1.6
@@ -1,6 +1,6 @@
 Name: blitz
 Version: 0.9
-Release: 7%{?dist}
+Release: 8%{?dist}
 Summary: C++ class library for matrix scientific computing
 
 Group: Development/Libraries
@@ -105,7 +105,10 @@
 
 
 %changelog
-* Mon Mar 03 2008 Sergio Pascual <spr at astrax.fis.ucm.es> 0.9-7
+* Tue Jan 20 2009 Sergio Pascual <sergiopr at fedoraproject.org> - 0.9-8
+- New patch (from upstream) to build with gcc4.3 
+
+* Mon Mar 03 2008 Sergio Pascual <spr at astrax.fis.ucm.es> - 0.9-7
 - Patch to build with gcc4.3
 
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.9-6



From pbrobinson at fedoraproject.org  Tue Jan 20 09:07:24 2009
From: pbrobinson at fedoraproject.org (Peter Robinson)
Date: Tue, 20 Jan 2009 09:07:24 +0000 (UTC)
Subject: rpms/SDL_mixer/devel SDL_mixer.spec,1.25,1.26
Message-ID: <20090120090724.CAEF1700F9@cvs1.fedora.phx.redhat.com>

Author: pbrobinson

Update of /cvs/pkgs/rpms/SDL_mixer/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15868

Modified Files:
	SDL_mixer.spec 
Log Message:
- Add Provides: SDL_mixer-midi in prep for moving samples to sub-package


Index: SDL_mixer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/SDL_mixer/devel/SDL_mixer.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- SDL_mixer.spec	10 Aug 2008 17:51:50 -0000	1.25
+++ SDL_mixer.spec	20 Jan 2009 09:06:54 -0000	1.26
@@ -1,6 +1,6 @@
 Name:		SDL_mixer
 Version:	1.2.8
-Release: 	9%{?dist}
+Release: 	10%{?dist}
 Summary:	Simple DirectMedia Layer - Sample Mixer Library
 
 Group:		System Environment/Libraries
@@ -16,6 +16,7 @@
 Requires:	timidity++-patches
 # Require libvorbis since we build it with dynamically load support.
 Requires:	libvorbis
+Provides:	SDL_mixer-midi
 
 
 %description
@@ -79,6 +80,9 @@
 
 
 %changelog
+* Tue Jan 20 2009 Peter Robinson <pbrobinson at gmail.com> - 1.2.8-10
+- Add Provides: SDL_mixer-midi in prep for moving samples to sub-package
+
 * Sun Aug 10 2008 Brian Pepple <bpepple at fedoraproject.org> - 1.2.8-9
 - Add requires on libvorbis.
 



From dwayne at fedoraproject.org  Tue Jan 20 09:10:05 2009
From: dwayne at fedoraproject.org (Dwayne Bailey)
Date: Tue, 20 Jan 2009 09:10:05 +0000 (UTC)
Subject: comps comps-el5.xml.in,1.22,1.23
Message-ID: <20090120091005.83752700F9@cvs1.fedora.phx.redhat.com>

Author: dwayne

Update of /cvs/pkgs/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16375

Modified Files:
	comps-el5.xml.in 
Log Message:
Fix sort



Index: comps-el5.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-el5.xml.in,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- comps-el5.xml.in	15 Jan 2009 14:10:31 -0000	1.22
+++ comps-el5.xml.in	20 Jan 2009 09:09:35 -0000	1.23
@@ -326,8 +326,8 @@
     <packagelist>
       <packagereq type="optional">akode</packagereq>
       <packagereq type="optional">amarok</packagereq>
-      <packagereq type="optional">ushare</packagereq>
       <packagereq type="optional">qmmp</packagereq>
+      <packagereq type="optional">ushare</packagereq>
     </packagelist>
   </group>
   <group>



From tbzatek at fedoraproject.org  Tue Jan 20 09:16:51 2009
From: tbzatek at fedoraproject.org (Tomas Bzatek)
Date: Tue, 20 Jan 2009 09:16:51 +0000 (UTC)
Subject: rpms/gvfs/devel .cvsignore, 1.32, 1.33 gvfs.spec, 1.103,
	1.104 sources, 1.32, 1.33 gvfs-1.1.1-ftp-pasv.patch, 1.1,
	NONE gvfs-dav+sd-mount.patch, 1.1, NONE
Message-ID: <20090120091652.05113700F9@cvs1.fedora.phx.redhat.com>

Author: tbzatek

Update of /cvs/extras/rpms/gvfs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17253

Modified Files:
	.cvsignore gvfs.spec sources 
Removed Files:
	gvfs-1.1.1-ftp-pasv.patch gvfs-dav+sd-mount.patch 
Log Message:
* Tue Jan 20 2009 Tomas Bzatek <tbzatek at redhat.com> - 1.1.4-1
- Update to 1.1.4



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gvfs/devel/.cvsignore,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- .cvsignore	6 Jan 2009 16:50:27 -0000	1.32
+++ .cvsignore	20 Jan 2009 09:16:21 -0000	1.33
@@ -1 +1 @@
-gvfs-1.1.3.tar.bz2
+gvfs-1.1.4.tar.bz2


Index: gvfs.spec
===================================================================
RCS file: /cvs/extras/rpms/gvfs/devel/gvfs.spec,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -r1.103 -r1.104
--- gvfs.spec	13 Jan 2009 12:09:20 -0000	1.103
+++ gvfs.spec	20 Jan 2009 09:16:21 -0000	1.104
@@ -1,7 +1,7 @@
 Summary: Backends for the gio framework in GLib
 Name: gvfs
-Version: 1.1.3
-Release: 4%{?dist}
+Version: 1.1.4
+Release: 1%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 URL: http://www.gtk.org
@@ -34,9 +34,6 @@
 # http://bugzilla.gnome.org/show_bug.cgi?id=565041
 Patch2: gvfs-burn-move.patch
 
-# fixed correctly upstream
-Patch3: gvfs-dav+sd-mount.patch
-
 %description
 The gvfs package provides backend implementations for the gio 
 framework in GLib. It includes ftp, sftp, cifs. 
@@ -119,7 +116,6 @@
 %setup -q
 %patch1 -p0 -b .archive-integration
 %patch2 -p0 -b .burn-move
-%patch3 -p1 -b .dav+sd-mount
 
 %build
 
@@ -260,6 +256,9 @@
 
 
 %changelog
+* Tue Jan 20 2009 Tomas Bzatek <tbzatek at redhat.com> - 1.1.4-1
+- Update to 1.1.4
+
 * Tue Jan 13 2009 Adrian Reber <adrian at lisas.de> - 1.1.3-4
 - Rebuild for libcdio-0.81
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gvfs/devel/sources,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- sources	6 Jan 2009 16:50:28 -0000	1.32
+++ sources	20 Jan 2009 09:16:21 -0000	1.33
@@ -1 +1 @@
-0ea4075dc9d1e3734805f5c43825c6eb  gvfs-1.1.3.tar.bz2
+cc539eee1b504b2dd770cce81740e08c  gvfs-1.1.4.tar.bz2


--- gvfs-1.1.1-ftp-pasv.patch DELETED ---


--- gvfs-dav+sd-mount.patch DELETED ---



From dwayne at fedoraproject.org  Tue Jan 20 09:17:53 2009
From: dwayne at fedoraproject.org (Dwayne Bailey)
Date: Tue, 20 Jan 2009 09:17:53 +0000 (UTC)
Subject: comps comps-f11.xml.in,1.65,1.66
Message-ID: <20090120091753.146CF700F9@cvs1.fedora.phx.redhat.com>

Author: dwayne

Update of /cvs/pkgs/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17399

Modified Files:
	comps-f11.xml.in 
Log Message:
Fix sort order post ibus commit



Index: comps-f11.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f11.xml.in,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- comps-f11.xml.in	19 Jan 2009 23:21:05 -0000	1.65
+++ comps-f11.xml.in	20 Jan 2009 09:17:22 -0000	1.66
@@ -126,8 +126,8 @@
       <packagereq type="mandatory">lohit-fonts-bengali</packagereq>
       <packagereq type="mandatory">m17n-contrib-assamese</packagereq>
       <packagereq type="mandatory">m17n-db-assamese</packagereq>
-      <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-as_IN</packagereq>
       <packagereq type="conditional" requires="xorg-x11-server-Xorg">ibus-m17n</packagereq>
+      <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-as_IN</packagereq>
       <packagereq type="default">iok</packagereq>
     </packagelist>
   </group>
@@ -423,10 +423,10 @@
       <packagereq type="mandatory">m17n-db-bengali</packagereq>
       <packagereq type="conditional" requires="aspell">aspell-bn</packagereq>
       <packagereq type="conditional" requires="hunspell">hunspell-bn</packagereq>
+      <packagereq type="conditional" requires="xorg-x11-server-Xorg">ibus-m17n</packagereq>
       <packagereq type="conditional" requires="kdelibs3">kde-i18n-Bengali</packagereq>
       <packagereq type="conditional" requires="moodle">moodle-bn</packagereq>
       <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-bn</packagereq>
-      <packagereq type="conditional" requires="xorg-x11-server-Xorg">ibus-m17n</packagereq>
       <packagereq type="default">iok</packagereq>
     </packagelist>
   </group>
@@ -592,6 +592,9 @@
       <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="xorg-x11-server-Xorg">ibus-chewing</packagereq>
+      <packagereq type="conditional" requires="xorg-x11-server-Xorg">ibus-pinyin</packagereq>
+      <packagereq type="conditional" requires="xorg-x11-server-Xorg">ibus-table-chinese</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>
@@ -602,9 +605,6 @@
       <packagereq type="conditional" requires="moodle">moodle-zh_tw</packagereq>
       <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-zh_CN</packagereq>
       <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-zh_TW</packagereq>
-      <packagereq type="conditional" requires="xorg-x11-server-Xorg">ibus-chewing</packagereq>
-      <packagereq type="conditional" requires="xorg-x11-server-Xorg">ibus-pinyin</packagereq>
-      <packagereq type="conditional" requires="xorg-x11-server-Xorg">ibus-table-chinese</packagereq>
       <packagereq type="default">taipeifonts</packagereq>
       <packagereq type="default">wqy-bitmap-fonts</packagereq>
       <packagereq type="optional">gcin</packagereq>
@@ -2418,9 +2418,9 @@
       <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="xorg-x11-server-Xorg">ibus-m17n</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">ibus-m17n</packagereq>
       <packagereq type="default">iok</packagereq>
       <packagereq type="default">samyak-fonts-gujarati</packagereq>
     </packagelist>
@@ -2533,11 +2533,11 @@
       <packagereq type="conditional" requires="aspell">aspell-hi</packagereq>
       <packagereq type="conditional" requires="gcompris">gcompris-sound-hi</packagereq>
       <packagereq type="conditional" requires="hunspell">hunspell-hi</packagereq>
+      <packagereq type="conditional" requires="xorg-x11-server-Xorg">ibus-m17n</packagereq>
       <packagereq type="conditional" requires="kdelibs3">kde-i18n-Hindi</packagereq>
       <packagereq type="conditional" requires="kdelibs">kde-l10n-Hindi</packagereq>
       <packagereq type="conditional" requires="moodle">moodle-hi</packagereq>
       <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-hi_IN</packagereq>
-      <packagereq type="conditional" requires="xorg-x11-server-Xorg">ibus-m17n</packagereq>
       <packagereq type="default">iok</packagereq>
       <packagereq type="default">samyak-fonts-devanagari</packagereq>
       <packagereq type="default">sarai-fonts</packagereq>
@@ -2600,9 +2600,9 @@
     <default>true</default>
     <uservisible>true</uservisible>
     <packagelist>
-      <packagereq type="conditional" requires="xfce-utils">imsettings-xfce</packagereq>
       <packagereq type="conditional" requires="gtk2">ibus-gtk</packagereq>
       <packagereq type="conditional" requires="qt">ibus-qt</packagereq>
+      <packagereq type="conditional" requires="xfce-utils">imsettings-xfce</packagereq>
       <packagereq type="default">ibus-anthy</packagereq>
       <packagereq type="default">ibus-chewing</packagereq>
       <packagereq type="default">ibus-hangul</packagereq>
@@ -2770,13 +2770,13 @@
     <packagelist>
       <packagereq type="mandatory">VLGothic-fonts</packagereq>
       <packagereq type="conditional" requires="eclipse-platform">eclipse-nls-ja</packagereq>
+      <packagereq type="conditional" requires="xorg-x11-server-Xorg">ibus-anthy</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>
       <packagereq type="conditional" requires="man-pages">man-pages-ja</packagereq>
       <packagereq type="conditional" requires="moodle">moodle-ja</packagereq>
       <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-ja_JP</packagereq>
-      <packagereq type="conditional" requires="xorg-x11-server-Xorg">ibus-anthy</packagereq>
       <packagereq type="conditional" requires="uim">uim-anthy</packagereq>
       <packagereq type="default">japanese-bitmap-fonts</packagereq>
       <packagereq type="default">sazanami-fonts-gothic</packagereq>
@@ -2789,7 +2789,6 @@
       <packagereq type="optional">eblook</packagereq>
       <packagereq type="optional">ebview</packagereq>
       <packagereq type="optional">hanazono-fonts</packagereq>
-      <packagereq type="optional">ibus-anthy</packagereq>
       <packagereq type="optional">jfbterm</packagereq>
       <packagereq type="optional">jisksp16-1990-fonts</packagereq>
       <packagereq type="optional">kcc</packagereq>
@@ -2969,9 +2968,9 @@
       <packagereq type="mandatory">lohit-fonts-kannada</packagereq>
       <packagereq type="mandatory">m17n-contrib-kannada</packagereq>
       <packagereq type="mandatory">m17n-db-kannada</packagereq>
+      <packagereq type="conditional" requires="xorg-x11-server-Xorg">ibus-m17n</packagereq>
       <packagereq type="conditional" requires="moodle">moodle-kn</packagereq>
       <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-kn_IN</packagereq>
-      <packagereq type="conditional" requires="xorg-x11-server-Xorg">ibus-m17n</packagereq>
       <packagereq type="default">iok</packagereq>
     </packagelist>
   </group>
@@ -3186,12 +3185,12 @@
     <packagelist>
       <packagereq type="mandatory">un-core-fonts-dotum</packagereq>
       <packagereq type="conditional" requires="eclipse-platform">eclipse-nls-ko</packagereq>
+      <packagereq type="conditional" requires="xorg-x11-server-Xorg">ibus-hangul</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>
       <packagereq type="conditional" requires="moodle">moodle-ko</packagereq>
       <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-ko_KR</packagereq>
-      <packagereq type="conditional" requires="xorg-x11-server-Xorg">ibus-hangul</packagereq>
       <packagereq type="default">baekmuk-bdf-fonts</packagereq>
       <packagereq type="default">baekmuk-ttf-fonts-batang</packagereq>
       <packagereq type="default">baekmuk-ttf-fonts-dotum</packagereq>
@@ -3214,7 +3213,6 @@
       <packagereq type="default">un-extra-fonts-taza</packagereq>
       <packagereq type="default">un-extra-fonts-vada</packagereq>
       <packagereq type="default">un-extra-fonts-yetgul</packagereq>
-      <packagereq type="optional">ibus-hangul</packagereq>
       <packagereq type="optional">lv</packagereq>
       <packagereq type="optional">m17n-db-korean</packagereq>
       <packagereq type="optional">nabi</packagereq>
@@ -3514,9 +3512,9 @@
       <packagereq type="mandatory">m17n-db-malayalam</packagereq>
       <packagereq type="conditional" requires="aspell">aspell-ml</packagereq>
       <packagereq type="conditional" requires="hunspell">hunspell-ml</packagereq>
+      <packagereq type="conditional" requires="xorg-x11-server-Xorg">ibus-m17n</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">ibus-m17n</packagereq>
       <packagereq type="default">iok</packagereq>
       <packagereq type="default">lohit-fonts-malayalam</packagereq>
       <packagereq type="default">samyak-fonts-malayalam</packagereq>
@@ -3555,8 +3553,8 @@
       <packagereq type="conditional" requires="aspell">aspell-mr</packagereq>
       <packagereq type="conditional" requires="gcompris">gcompris-sound-mr</packagereq>
       <packagereq type="conditional" requires="hunspell">hunspell-mr</packagereq>
-      <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-mr_IN</packagereq>
       <packagereq type="conditional" requires="xorg-x11-server-Xorg">ibus-m17n</packagereq>
+      <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-mr_IN</packagereq>
       <packagereq type="default">iok</packagereq>
       <packagereq type="default">samyak-fonts-devanagari</packagereq>
     </packagelist>
@@ -3608,9 +3606,9 @@
       <packagereq type="mandatory">m17n-contrib-nepali</packagereq>
       <packagereq type="mandatory">madan-fonts</packagereq>
       <packagereq type="conditional" requires="hunspell">hunspell-ne</packagereq>
+      <packagereq type="conditional" requires="xorg-x11-server-Xorg">ibus-m17n</packagereq>
       <packagereq type="conditional" requires="kdelibs">kde-l10n-Nepali</packagereq>
       <packagereq type="conditional" requires="koffice-core">koffice-langpack-ne</packagereq>
-      <packagereq type="conditional" requires="xorg-x11-server-Xorg">ibus-m17n</packagereq>
       <packagereq type="optional">scim-tables-nepali</packagereq>
     </packagelist>
   </group>
@@ -3828,8 +3826,8 @@
       <packagereq type="mandatory">m17n-db-oriya</packagereq>
       <packagereq type="conditional" requires="aspell">aspell-or</packagereq>
       <packagereq type="conditional" requires="hunspell">hunspell-or</packagereq>
-      <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-or_IN</packagereq>
       <packagereq type="conditional" requires="xorg-x11-server-Xorg">ibus-m17n</packagereq>
+      <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-or_IN</packagereq>
       <packagereq type="default">iok</packagereq>
       <packagereq type="default">samyak-fonts-oriya</packagereq>
     </packagelist>
@@ -3926,10 +3924,10 @@
       <packagereq type="mandatory">m17n-db-punjabi</packagereq>
       <packagereq type="conditional" requires="aspell">aspell-pa</packagereq>
       <packagereq type="conditional" requires="hunspell">hunspell-pa</packagereq>
+      <packagereq type="conditional" requires="xorg-x11-server-Xorg">ibus-m17n</packagereq>
       <packagereq type="conditional" requires="kdelibs3">kde-i18n-Punjabi</packagereq>
       <packagereq type="conditional" requires="kdelibs">kde-l10n-Punjabi</packagereq>
       <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-pa_IN</packagereq>
-      <packagereq type="conditional" requires="xorg-x11-server-Xorg">ibus-m17n</packagereq>
       <packagereq type="default">iok</packagereq>
     </packagelist>
   </group>
@@ -4072,8 +4070,8 @@
       <packagereq type="mandatory">lklug-fonts</packagereq>
       <packagereq type="mandatory">m17n-contrib-sinhala</packagereq>
       <packagereq type="mandatory">m17n-db-sinhala</packagereq>
-      <packagereq type="conditional" requires="moodle">moodle-si</packagereq>
       <packagereq type="conditional" requires="xorg-x11-server-Xorg">ibus-m17n</packagereq>
+      <packagereq type="conditional" requires="moodle">moodle-si</packagereq>
       <packagereq type="optional">scim-sayura</packagereq>
     </packagelist>
   </group>
@@ -4619,12 +4617,12 @@
       <packagereq type="mandatory">m17n-db-tamil</packagereq>
       <packagereq type="conditional" requires="aspell">aspell-ta</packagereq>
       <packagereq type="conditional" requires="hunspell">hunspell-ta</packagereq>
+      <packagereq type="conditional" requires="xorg-x11-server-Xorg">ibus-m17n</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>
-      <packagereq type="conditional" requires="xorg-x11-server-Xorg">ibus-m17n</packagereq>
       <packagereq type="default">iok</packagereq>
       <packagereq type="default">samyak-fonts-tamil</packagereq>
       <packagereq type="optional">serafettin-cartoon-fonts</packagereq>
@@ -4643,8 +4641,8 @@
       <packagereq type="mandatory">m17n-db-telugu</packagereq>
       <packagereq type="conditional" requires="aspell">aspell-te</packagereq>
       <packagereq type="conditional" requires="hunspell">hunspell-te</packagereq>
-      <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-te_IN</packagereq>
       <packagereq type="conditional" requires="xorg-x11-server-Xorg">ibus-m17n</packagereq>
+      <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-te_IN</packagereq>
       <packagereq type="default">iok</packagereq>
     </packagelist>
   </group>
@@ -4705,10 +4703,10 @@
       <packagereq type="mandatory">m17n-db-thai</packagereq>
       <packagereq type="mandatory">thaifonts-scalable</packagereq>
       <packagereq type="conditional" requires="hunspell">hunspell-th</packagereq>
+      <packagereq type="conditional" requires="xorg-x11-server-Xorg">ibus-m17n</packagereq>
       <packagereq type="conditional" requires="kdelibs">kde-l10n-Thai</packagereq>
       <packagereq type="conditional" requires="moodle">moodle-th</packagereq>
       <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-th_TH</packagereq>
-      <packagereq type="conditional" requires="xorg-x11-server-Xorg">ibus-m17n</packagereq>
       <packagereq type="optional">scim-tables-thai</packagereq>
     </packagelist>
   </group>



From jwrdegoede at fedoraproject.org  Tue Jan 20 09:20:48 2009
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Tue, 20 Jan 2009 09:20:48 +0000 (UTC)
Subject: rpms/wordwarvi/devel .cvsignore, 1.14, 1.15 sources, 1.14,
	1.15 wordwarvi.spec, 1.15, 1.16
Message-ID: <20090120092048.B4A77700F9@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/wordwarvi/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17897

Modified Files:
	.cvsignore sources wordwarvi.spec 
Log Message:
* Tue Jan 20 2009 Hans de Goede <hdegoede at redhat.com> 0.25-1
- New upstream release 0.25



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/wordwarvi/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	16 Dec 2008 20:07:51 -0000	1.14
+++ .cvsignore	20 Jan 2009 09:20:18 -0000	1.15
@@ -1 +1 @@
-wordwarvi-0.24.tar.gz
+wordwarvi-0.25.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wordwarvi/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	16 Dec 2008 20:07:51 -0000	1.14
+++ sources	20 Jan 2009 09:20:18 -0000	1.15
@@ -1 +1 @@
-0b756bfe634455adaf49a08983228e05  wordwarvi-0.24.tar.gz
+f327d32fca05a034ac3102e833ed545b  wordwarvi-0.25.tar.gz


Index: wordwarvi.spec
===================================================================
RCS file: /cvs/extras/rpms/wordwarvi/devel/wordwarvi.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- wordwarvi.spec	16 Dec 2008 20:07:52 -0000	1.15
+++ wordwarvi.spec	20 Jan 2009 09:20:18 -0000	1.16
@@ -1,5 +1,5 @@
 Name:           wordwarvi
-Version:        0.24
+Version:        0.25
 Release:        1%{?dist}
 Summary:        Side-scrolling shoot 'em up '80s style arcade game
 Group:          Amusements/Games
@@ -74,6 +74,9 @@
 
 
 %changelog
+* Tue Jan 20 2009 Hans de Goede <hdegoede at redhat.com> 0.25-1
+- New upstream release 0.25
+
 * Tue Dec 16 2008 Hans de Goede <hdegoede at redhat.com> 0.24-1
 - New upstream release 0.24
 - Drop upstreamed patches



From mkasik at fedoraproject.org  Tue Jan 20 09:46:07 2009
From: mkasik at fedoraproject.org (=?utf-8?b?TWFyZWsgS2HFocOtaw==?=)
Date: Tue, 20 Jan 2009 09:46:07 +0000 (UTC)
Subject: rpms/radial/devel radial-1.0.f,NONE,1.1 radial.spec,NONE,1.1
Message-ID: <20090120094608.07F61700F9@cvs1.fedora.phx.redhat.com>

Author: mkasik

Update of /cvs/pkgs/rpms/radial/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21945

Added Files:
	radial-1.0.f radial.spec 
Log Message:
* Fri Sep 05 2008 Marek Kasik <mkasik at redhat.com>  1.0-1
- Initial Fedora Release



--- NEW FILE radial-1.0.f ---
	program radial3
	print*, " "
	print*, " "
	print*, "------------------------------------------------------"
	print*, " "
	print*, "                Welcome to  Jamie's                   "
	print*, "          FABULOUS RADIAL VELOCITY PROGRAM!           "
	print*, "                                                      "
	print*, "   This program calculates the radial velocities of   "
	print*, "   both stars in a binary system, allowing for user   "
	print*, "   configuration of stellar masses, semimajor axis,   "
	print*, "  inclination of orbital plane, orbital eccentricity, "
	print*, "   time to collect data, and calculation frequency.   "
	print*, "   "
	print*, "   For your convenience, default values have been"
	print*, "   added to the program, so you can run it with"
	print*, "   nothing other than variable eccentricity, if you like."
	print*, " "
	print*, "   This program is free, but donations are welcome. :)"
	print*, " "
	print*, "   Have fun!"
	print*, " "
	print*, "------------------------------------------------------"
	print*, " "
   10	print*, " "
	print*, "Would you like to accept this program's default values"
	print*, "or run a custom configuration?"
	print*, ""
	print*, "            1 - Accept Default Values"
	print*, "            2 - Custom Configuration"
	print*, "           "
	read*, cust
	print*, " "
	print*, " "
c	
c  DEFAULT VALUES:
c	
		pi = 3.141592654
		units = 4.74017744
		wt1 = 0.5
		wt2 = 2.0
		axis = 2.0
		yrs = 5
		q = 4
		tilt = 30
		what2chg = 0
c 	
	    if (cust.eq.1) goto 70
   20		print*, "STELLAR MASSES ..."
           	print*, " "
		print*, "     How massive would you like your stars to be?"
		print*, "     (In Solar Masses)"
		print*, " "
		print*, "Star 1:"
		read*, wt1
		print*, "Star 2:"
		read*, wt2
		print*, " "
		print*, " "
		    if (what2chg.eq.1) goto 80
   30		print*, "SEMIMAJOR AXIS ..."
		print*, "     "
		print*, "     Please specify a semimajor axis. (In AU)"
		print*, " "
		read*, axis
		print*, " "
		print*, " "
		    if (what2chg.eq.2) goto 80
   40		print*, "ORBITAL INCLINATION ..."
		print*, "     "
		print*, "     How far would you like your orbital plane to"
		print*, "     be inclined? (degrees)"
		print*, " "
		read*, tilt
		print*, " "
		print*, " "
		    if (what2chg.eq.3) goto 80
   50		print*, "LENGTH OF TIME FOR WHICH TO CALCULATE ... "
		print*, " "
		print*, "     For how many years would you like to watch?"
		print*, " "
		read*, yrs
		print*, " "
		print*, " "
		    if (what2chg.eq.4) goto 80
   60		print*, "FREQUENCY OF CALCULATIONS ..."
		print*, " "
		print*, "     How many times per year should I calculate?"
		print*, " "
		read*, q
		    if (what2chg.eq.5) goto 80
	print*, " "
	print*, " "
   70	print*, "ORBITAL ECCENTRICITY ..."
	print*, " "
	print*, "     Please enter an orbital eccentricity."
	print*, "     (Must be less than 1. Use 0 for circular orbit.)"
	print*, " "
	read*, ecc
	print*, " "
   80	print*, " "	
c
c COMPUTE axrat, A1, A2, and SEE
c
		axrat = wt1/wt2	
		ax1 = axis/(1+axrat)
		ax2 = (axis*axrat)/(1+axrat)
		see = 1/q
		tilt = (6.283185/360)*tilt
c
	print*, "Here are the values you have chosen:"
	print*, " "
	print*, "-------------------------------------------------------"
	print*, "       Mass of star 1:  ",wt1," Solar Masses"
	print*, "       Mass of star 2:  ",wt2," Solar Masses"
	print*, " "
	print*, "       Semimajor axis:  ",axis," AU"
	print*, "	     for star1:  ",ax1," AU"
	print*, "            for star2:  ",ax2," AU"
	print*, " "
	print*, "       Orbital Eccentricity:  ",ecc
	print*, "        Orbital Inclination:  ",tilt
	print*, " "
	print*, "          sin(tilt) = ",sin(tilt)	
	print*, " "
	print*, "       Time to watch:  ",yrs," yrs"
	print*, "                       ",q," times per year"
	print*, "-------------------------------------------------------"
	print*, " "
	print*, "Are these values OK?"
	print*, " "
	print*, "             1 - These are good, calculate!"
	print*, "             2 - I want to change something."
	print*, " "
	read*, change
	print*, " "
	    if (change.eq.2) then
	    	print*, " "
	    	print*, "What would you like to change?"
		print*, " "
		print*, "              1 - Stellar Masses"
		print*, "              2 - Semimajor Axis"
		print*, "              3 - Orbital Inclination"
		print*, "              4 - Time to Watch"
		print*, "              5 - Frequency of Calculation"
		print*, "	       6 - Orbital Eccentricity"
		print*, "              7 - Everything"
		print*, "              0 - Nothing, I lied. Calculate!"
		print*, " "
		read*, what2chg
		print*, " "
		print*, " "
		    if (what2chg.eq.1) goto 20
		    if (what2chg.eq.2) goto 30
		    if (what2chg.eq.3) goto 40
		    if (what2chg.eq.4) goto 50
		    if (what2chg.eq.5) goto 60
		    if (what2chg.eq.6) goto 70
		    if (what2chg.eq.7) goto 10
	    endif
	    what2chg = 0
	print*, "Processing input, calculating velocities ... please wait."
	print*, " "
	print*, " "
	print*, " Time (yrs)    V1r (km/s)       V2r (km/s)     theta (deg)"
	print*, "=========================================================="         
c
c CALCULATE THE VELOCITIES
c
	do p=0.00, yrs, see
		theta = 2*pi*(axis**(-3/2))*p
		tht = 360*(axis**(-3/2))*p
		top = 2*pi*ax1*(1-(ecc**2))*(sin(tilt))*units
		bot = (axis**(3/2))*(1+(ecc*(cos(theta))))
		v1r = (top*(cos(theta)))/bot
		v2r = (top*axrat*(cos(theta+pi)))/bot
c debugging	print*, top," ",brt," ",bot
		print*, "  ",p,"      ",v1r,"         ",v2r,"      ",tht
	enddo
	print*, "==========================================================="
	print*, " "	
	print*, " "
	print*, "  Would you like to play again?"
	print*, " "
	print*, "                1 - Yes, this was fun! Do it again!"
	print*, "                2 - No, it was lame. I want to leave."
	print*, " "
	read*, play
		if (play.eq.1) goto 10
	print*, " "
	print*, " "
	print*, "Thanks for using Jamie's Fabulous Radial Velocity Program!"
	print*, " "
	print*, "Send questions, comments, money, food, clothing, books,"
	print*, "or anything else to:   hegarty at nhn.ou.edu"
	print*, " "
	print*, "Bye!"
	print*, " "
	print*, " "
	end


--- NEW FILE radial.spec ---
Summary: A simple program for calculating radial velocities of stars in a binary system
Name: radial
Version: 1.0
Release: 1%{?dist}
License: Freely redistributable without restriction
Group: Applications/Engineering
Url: http://www.nhn.ou.edu/~hegarty/radial/
Source0: http://www.nhn.ou.edu/~hegarty/radial/%{name}-%{version}.tar.gz
Source1: http://www.nhn.ou.edu/~hegarty/radial/%{name}-%{version}.f

Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: gcc-gfortran

%description
This program calculates the radial velocities of
both stars in a binary system, allowing for user
configuration of stellar masses, semimajor axis,
inclination of orbital plane, orbital eccentricity,
time to collect data, and calculation frequency.

For your convenience, default values have been
added to the program, so you can run it with
nothing other than variable eccentricity, if you like.

%prep
%setup -q -c
cp -a %{SOURCE1} .

%build
gfortran %{optflags} -ffixed-line-length-none -o radial %{name}-%{version}.f

%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_bindir}
install -p -m 0755 %{name} $RPM_BUILD_ROOT%{_bindir}/%{name}

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc README INSTALL
%{_bindir}/radial

%changelog
* Fri Sep 05 2008 Marek Kasik <mkasik at redhat.com>  1.0-1
- Initial Fedora Release



From jwrdegoede at fedoraproject.org  Tue Jan 20 09:48:49 2009
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Tue, 20 Jan 2009 09:48:49 +0000 (UTC)
Subject: rpms/egoboo-data/devel egoboo-data.spec,1.5,1.6
Message-ID: <20090120094849.B1DA8700F9@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/egoboo-data/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22366

Modified Files:
	egoboo-data.spec 
Log Message:
* Tue Jan 20 2009 Hans de Goede <hdegoede at redhat.com> 2.7.5-4
- Fix dejavu font Requires (again) (#480448)



Index: egoboo-data.spec
===================================================================
RCS file: /cvs/extras/rpms/egoboo-data/devel/egoboo-data.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- egoboo-data.spec	27 Dec 2008 11:30:23 -0000	1.5
+++ egoboo-data.spec	20 Jan 2009 09:48:19 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           egoboo-data
 Version:        2.7.5
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Data files for the Egoboo RPG
 Group:          Amusements/Games
 License:        GPL+
@@ -15,7 +15,7 @@
 BuildRequires:  ImageMagick
 BuildArch:      noarch
 # dejavu gets used as a replacement for the non free fonts
-Requires:       dejavu-fonts-sans hicolor-icon-theme
+Requires:       dejavu-sans-fonts hicolor-icon-theme
 # so that we get uninstalled together with egoboo
 Requires:       egoboo >= %{version}
 
@@ -71,6 +71,9 @@
 
 
 %changelog
+* Tue Jan 20 2009 Hans de Goede <hdegoede at redhat.com> 2.7.5-4
+- Fix dejavu font Requires (again) (#480448)
+
 * Sat Dec 27 2008 Hans de Goede <hdegoede at redhat.com> 2.7.5-3
 - Fix dejavu font Requires
 



From jwrdegoede at fedoraproject.org  Tue Jan 20 09:48:58 2009
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Tue, 20 Jan 2009 09:48:58 +0000 (UTC)
Subject: rpms/ogre/devel ogre.spec,1.42,1.43
Message-ID: <20090120094858.8F26D700F9@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/ogre/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22410

Modified Files:
	ogre.spec 
Log Message:
* Tue Jan 20 2009 Hans de Goede <hdegoede at redhat.com> 1.6.0-5
- Adjust font requires for font rename (rh 480465)
use regular (full) instead of lgc dejavu fonts for the demos (rh 477434)



Index: ogre.spec
===================================================================
RCS file: /cvs/extras/rpms/ogre/devel/ogre.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- ogre.spec	10 Jan 2009 21:54:52 -0000	1.42
+++ ogre.spec	20 Jan 2009 09:48:28 -0000	1.43
@@ -1,6 +1,6 @@
 Name:           ogre
 Version:        1.6.0
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Object-Oriented Graphics Rendering Engine
 # CC-BY-SA is for devel docs
 License:        LGPLv2+ and CC-BY-SA
@@ -59,7 +59,7 @@
 %package samples
 Summary:        Ogre samples executables and media
 Group:          Development/Libraries
-Requires:       %{name} = %{version}-%{release}, dejavu-fonts-sans
+Requires:       %{name} = %{version}-%{release}, dejavu-sans-fonts
 
 %description samples
 This package contains the compiled (not the source) sample applications coming
@@ -206,6 +206,10 @@
 
 
 %changelog
+* Tue Jan 20 2009 Hans de Goede <hdegoede at redhat.com> 1.6.0-5
+- Adjust font requires for font rename (rh 480465)
+use regular (full) instead of lgc dejavu fonts for the demos (rh 477434)
+
 * Sat Jan 10 2009 Hans de Goede <hdegoede at redhat.com> 1.6.0-4
 - use regular (full) instead of lgc dejavu fonts for the demos (rh 477434)
 



From jwrdegoede at fedoraproject.org  Tue Jan 20 09:49:14 2009
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Tue, 20 Jan 2009 09:49:14 +0000 (UTC)
Subject: rpms/hedgewars/devel .cvsignore, 1.10, 1.11 hedgewars.spec, 1.16,
	1.17 sources, 1.10, 1.11
Message-ID: <20090120094914.1E2AF700F9@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/hedgewars/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22467

Modified Files:
	.cvsignore hedgewars.spec sources 
Log Message:
* Tue Jan 20 2009 Hans de Goede <hdegoede at redhat.com> 0.9.9-1
- New upstream release 0.9.9
- Fix dejavu font Requires (again) (rh 480458)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/hedgewars/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	11 Jan 2009 11:02:58 -0000	1.10
+++ .cvsignore	20 Jan 2009 09:48:43 -0000	1.11
@@ -1 +1 @@
-hedgewars-src-0.9.8.tar.bz2
+hedgewars-src-0.9.9.tar.bz2


Index: hedgewars.spec
===================================================================
RCS file: /cvs/extras/rpms/hedgewars/devel/hedgewars.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- hedgewars.spec	16 Jan 2009 17:47:30 -0000	1.16
+++ hedgewars.spec	20 Jan 2009 09:48:43 -0000	1.17
@@ -1,6 +1,6 @@
 Name:           hedgewars
-Version:        0.9.8
-Release:        2%{?dist}
+Version:        0.9.9
+Release:        1%{?dist}
 Summary:        2D tankbattle game with the tanks replaced by hedgehogs
 Group:          Amusements/Games
 License:        GPL+
@@ -12,7 +12,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  fpc qt4-devel SDL_mixer-devel SDL_net-devel SDL_image-devel
 BuildRequires:  SDL_ttf-devel openssl-devel cmake desktop-file-utils
-Requires:       dejavu-fonts-sans hicolor-icon-theme
+Requires:       dejavu-sans-fonts hicolor-icon-theme
 
 %description
 Hedgewars is a turn based strategy game but the real buzz is from watching the
@@ -83,6 +83,10 @@
 
 
 %changelog
+* Tue Jan 20 2009 Hans de Goede <hdegoede at redhat.com> 0.9.9-1
+- New upstream release 0.9.9
+- Fix dejavu font Requires (again) (rh 480458)
+
 * Fri Jan 16 2009 Tomas Mraz <tmraz at redhat.com> 0.9.8-2
 - rebuild with new openssl
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/hedgewars/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	11 Jan 2009 11:02:58 -0000	1.10
+++ sources	20 Jan 2009 09:48:43 -0000	1.11
@@ -1 +1 @@
-4ba627156e21800382833d9e85ab3835  hedgewars-src-0.9.8.tar.bz2
+5f76525345ead28ee1d04c1ae258395e  hedgewars-src-0.9.9.tar.bz2



From tbzatek at fedoraproject.org  Tue Jan 20 09:49:57 2009
From: tbzatek at fedoraproject.org (Tomas Bzatek)
Date: Tue, 20 Jan 2009 09:49:57 +0000 (UTC)
Subject: rpms/gnome-keyring/devel .cvsignore, 1.55, 1.56 gnome-keyring.spec, 
	1.107, 1.108 sources, 1.55, 1.56
Message-ID: <20090120094957.50168700F9@cvs1.fedora.phx.redhat.com>

Author: tbzatek

Update of /cvs/extras/rpms/gnome-keyring/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22760

Modified Files:
	.cvsignore gnome-keyring.spec sources 
Log Message:
* Tue Jan 20 2009 Tomas Bzatek <tbzatek at redhat.com> - 2.25.5-1
- Update to 2.25.5



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-keyring/devel/.cvsignore,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- .cvsignore	9 Jan 2009 03:49:12 -0000	1.55
+++ .cvsignore	20 Jan 2009 09:49:26 -0000	1.56
@@ -1 +1 @@
-gnome-keyring-2.25.4.2.tar.bz2
+gnome-keyring-2.25.5.tar.gz


Index: gnome-keyring.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-keyring/devel/gnome-keyring.spec,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -r1.107 -r1.108
--- gnome-keyring.spec	9 Jan 2009 03:49:12 -0000	1.107
+++ gnome-keyring.spec	20 Jan 2009 09:49:26 -0000	1.108
@@ -7,11 +7,11 @@
 
 Summary: Framework for managing passwords and other secrets
 Name: gnome-keyring
-Version: 2.25.4.2
+Version: 2.25.5
 Release: 1%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Libraries
-Source: http://download.gnome.org/sources/gnome-keyring/2.25/gnome-keyring-%{version}.tar.bz2
+Source: http://download.gnome.org/sources/gnome-keyring/2.25/gnome-keyring-%{version}.tar.gz
 URL: http://www.gnome.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 BuildRequires: glib2-devel >= %{glib2_version}
@@ -83,6 +83,7 @@
 rm $RPM_BUILD_ROOT%{_libdir}/*.la
 rm $RPM_BUILD_ROOT%{_libdir}/gnome-keyring/*.la
 rm $RPM_BUILD_ROOT%{_libdir}/gnome-keyring/devel/*.la
+rm $RPM_BUILD_ROOT%{_libdir}/gnome-keyring/standalone/*.la
 
 %find_lang gnome-keyring
 
@@ -116,6 +117,7 @@
 %dir %{_libdir}/gnome-keyring
 %{_libdir}/gnome-keyring/gnome-keyring-pkcs11.so
 %{_libdir}/gnome-keyring/devel/*.so
+%{_libdir}/gnome-keyring/standalone/*.so
 # GPL
 %{_bindir}/*
 %{_libexecdir}/*
@@ -137,6 +139,9 @@
 
 
 %changelog
+* Tue Jan 20 2009 Tomas Bzatek <tbzatek at redhat.com> - 2.25.5-1
+- Update to 2.25.5
+
 * Thu Jan  8 2009 Matthias Clasen <mclasen at redhat.com> - 2.25.4.2-1
 - Update to 2.25.4.2
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-keyring/devel/sources,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- sources	9 Jan 2009 03:49:13 -0000	1.55
+++ sources	20 Jan 2009 09:49:27 -0000	1.56
@@ -1 +1 @@
-1a9cff25e516b0e588be7a6d2bb1577e  gnome-keyring-2.25.4.2.tar.bz2
+eb201708593a9486a6b6a7974d52a281  gnome-keyring-2.25.5.tar.gz



From jwrdegoede at fedoraproject.org  Tue Jan 20 09:50:54 2009
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Tue, 20 Jan 2009 09:50:54 +0000 (UTC)
Subject: rpms/ogre/devel ogre.spec,1.43,1.44
Message-ID: <20090120095054.B41FE700F9@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/ogre/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23001

Modified Files:
	ogre.spec 
Log Message:
Fixup changelog


Index: ogre.spec
===================================================================
RCS file: /cvs/extras/rpms/ogre/devel/ogre.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- ogre.spec	20 Jan 2009 09:48:28 -0000	1.43
+++ ogre.spec	20 Jan 2009 09:50:24 -0000	1.44
@@ -208,7 +208,6 @@
 %changelog
 * Tue Jan 20 2009 Hans de Goede <hdegoede at redhat.com> 1.6.0-5
 - Adjust font requires for font rename (rh 480465)
-use regular (full) instead of lgc dejavu fonts for the demos (rh 477434)
 
 * Sat Jan 10 2009 Hans de Goede <hdegoede at redhat.com> 1.6.0-4
 - use regular (full) instead of lgc dejavu fonts for the demos (rh 477434)



From jwrdegoede at fedoraproject.org  Tue Jan 20 09:52:36 2009
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Tue, 20 Jan 2009 09:52:36 +0000 (UTC)
Subject: rpms/scorched3d/devel scorched3d.spec,1.33,1.34
Message-ID: <20090120095236.481B2700F9@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/scorched3d/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23214

Modified Files:
	scorched3d.spec 
Log Message:
* Tue Jan 20 2009 Hans de Goede <hdegoede at redhat.com> 41.3-5
- Adjust font requires for font rename (rh 480471)



Index: scorched3d.spec
===================================================================
RCS file: /cvs/extras/rpms/scorched3d/devel/scorched3d.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- scorched3d.spec	27 Dec 2008 15:16:51 -0000	1.33
+++ scorched3d.spec	20 Jan 2009 09:52:05 -0000	1.34
@@ -1,6 +1,6 @@
 Name:           scorched3d
 Version:        41.3
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Game based loosely on the classic DOS game Scorched Earth
 Group:          Amusements/Games
 License:        GPLv2+
@@ -21,7 +21,7 @@
 BuildRequires:  expat-devel libvorbis-devel glew-devel fftw-devel libjpeg-devel
 BuildRequires:  ImageMagick desktop-file-utils
 Requires:       hicolor-icon-theme opengl-games-utils
-Requires:       dejavu-fonts-sans dejavu-fonts-sans-mono
+Requires:       dejavu-sans-fonts dejavu-sans-mono-fonts
 # Upstream naming compatibility
 Provides:       Scorched3D = %{version}-%{release}
 
@@ -120,6 +120,9 @@
 
 
 %changelog
+* Tue Jan 20 2009 Hans de Goede <hdegoede at redhat.com> 41.3-5
+- Adjust font requires for font rename (rh 480471)
+
 * Sat Dec 27 2008 Hans de Goede <hdegoede at redhat.com> 41.3-4
 - Replace included vera font with symlinks to dejavu (rh 477454)
 



From jwrdegoede at fedoraproject.org  Tue Jan 20 09:53:55 2009
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Tue, 20 Jan 2009 09:53:55 +0000 (UTC)
Subject: rpms/seahorse-adventures/devel seahorse-adventures.spec,1.3,1.4
Message-ID: <20090120095355.53BC5700F9@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/seahorse-adventures/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23504

Modified Files:
	seahorse-adventures.spec 
Log Message:
* Tue Jan 20 2009 Hans de Goede <hdegoede at redhat.com> 1.0-4
- Adjust font requires for font rename (rh 480472)



Index: seahorse-adventures.spec
===================================================================
RCS file: /cvs/extras/rpms/seahorse-adventures/devel/seahorse-adventures.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- seahorse-adventures.spec	27 Dec 2008 14:48:04 -0000	1.3
+++ seahorse-adventures.spec	20 Jan 2009 09:53:25 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           seahorse-adventures
 Version:        1.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Help barbie the seahorse float on bubbles to the moon
 Group:          Amusements/Games
 License:        GPL+
@@ -12,7 +12,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  desktop-file-utils
 BuildArch:      noarch
-Requires:       hicolor-icon-theme pygame dejavu-fonts-sans
+Requires:       hicolor-icon-theme pygame dejavu-sans-fonts
 
 %description
 Help barbie the seahorse float on bubbles to the moon. This is a retro-side
@@ -82,6 +82,9 @@
 
 
 %changelog
+* Tue Jan 20 2009 Hans de Goede <hdegoede at redhat.com> 1.0-4
+- Adjust font requires for font rename (rh 480472)
+
 * Sat Dec 27 2008 Hans de Goede <hdegoede at redhat.com> 1.0-3
 - Replace included vera font copies with symlinks to dejavu (rh 477456)
 



From jwrdegoede at fedoraproject.org  Tue Jan 20 09:55:12 2009
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Tue, 20 Jan 2009 09:55:12 +0000 (UTC)
Subject: rpms/TnL-data/devel TnL-data.spec,1.3,1.4
Message-ID: <20090120095512.509DA700F9@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/TnL-data/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23767

Modified Files:
	TnL-data.spec 
Log Message:
* Tue Jan 20 2009 Hans de Goede <hdegoede at redhat.com> 071111-3
- Adjust font requires for font rename (rh 480475)



Index: TnL-data.spec
===================================================================
RCS file: /cvs/extras/rpms/TnL-data/devel/TnL-data.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- TnL-data.spec	27 Dec 2008 15:47:31 -0000	1.3
+++ TnL-data.spec	20 Jan 2009 09:54:42 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           TnL-data
 Version:        071111
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Datafiles for Thunder and Lightning
 Group:          Amusements/Games
 License:        GPL+
@@ -12,7 +12,7 @@
 BuildArch:      noarch
 Requires:       hicolor-icon-theme
 # So that we get uninstalled when TnL gets uninstalled
-Requires:       TnL >= %{version}, dejavu-fonts-sans
+Requires:       TnL >= %{version}, dejavu-sans-fonts
 
 %description
 Datafiles for Thunder and Lightning.
@@ -61,6 +61,9 @@
 
 
 %changelog
+* Tue Jan 20 2009 Hans de Goede <hdegoede at redhat.com> 071111-3
+- Adjust font requires for font rename (rh 480475)
+
 * Sat Dec 27 2008 Hans de Goede <hdegoede at redhat.com> 071111-2
 - Remove the non free Gunship and Commonwealth fonts (rh #477469)
 



From jwrdegoede at fedoraproject.org  Tue Jan 20 09:57:18 2009
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Tue, 20 Jan 2009 09:57:18 +0000 (UTC)
Subject: rpms/trackballs/devel trackballs.spec,1.10,1.11
Message-ID: <20090120095719.0291D700F9@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/trackballs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24100

Modified Files:
	trackballs.spec 
Log Message:
* Tue Jan 20 2009 Hans de Goede <hdegoede at redhat.com> 1.1.4-8
- Adjust font requires for font rename (rh 480476)



Index: trackballs.spec
===================================================================
RCS file: /cvs/extras/rpms/trackballs/devel/trackballs.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- trackballs.spec	27 Dec 2008 15:17:21 -0000	1.10
+++ trackballs.spec	20 Jan 2009 09:56:48 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           trackballs
 Version:        1.1.4
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Steer a marble ball through a labyrinth
 Group:          Amusements/Games
 License:        GPLv2+
@@ -12,7 +12,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  guile-devel libGLU-devel zlib-devel desktop-file-utils
 BuildRequires:  SDL_ttf-devel SDL_mixer-devel SDL_image-devel
-Requires:       hicolor-icon-theme opengl-games-utils dejavu-fonts-sans
+Requires:       hicolor-icon-theme opengl-games-utils dejavu-sans-fonts
 
 %description
 Trackballs is a game in which you steer a marble ball through tracks of varying
@@ -81,6 +81,9 @@
 
 
 %changelog
+* Tue Jan 20 2009 Hans de Goede <hdegoede at redhat.com> 1.1.4-8
+- Adjust font requires for font rename (rh 480476)
+
 * Sat Dec 27 2008 Hans de Goede <hdegoede at redhat.com> 1.1.4-7
 - Replace included gnu freefont copy with a symlink to dejavu (rh 477470)
 



From caolanm at fedoraproject.org  Tue Jan 20 10:00:38 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Tue, 20 Jan 2009 10:00:38 +0000 (UTC)
Subject: rpms/openoffice.org/devel openoffice.org.spec,1.1766,1.1767
Message-ID: <20090120100038.86684700F9@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24559

Modified Files:
	openoffice.org.spec 
Log Message:
Resolves: rhbz#477435 my hatred of these stupid font macros now knows no bounds


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1766
retrieving revision 1.1767
diff -u -r1.1766 -r1.1767
--- openoffice.org.spec	19 Jan 2009 13:22:30 -0000	1.1766
+++ openoffice.org.spec	20 Jan 2009 10:00:07 -0000	1.1767
@@ -142,7 +142,7 @@
 %define sdkinstdir %{baseinstdir}/basis3.0/sdk
 %define oooinstdir %{instdir}/openoffice.org3
 %define brinstdir %{instdir}/broffice.org3
-%define fontname %{name}
+%define fontname opensymbol
 %define OFFICEUPD 300
 %define UPD %nil
 %define SOPOST l*
@@ -164,7 +164,7 @@
 %package core
 Summary: Core modules for %{name}
 Group: Applications/Productivity
-Requires: %{name}-fonts
+Requires: %{name}-%{fontname}-fonts
 Requires: liberation-sans-fonts, liberation-serif-fonts, liberation-mono-fonts
 Requires: dejavu-sans-fonts, dejavu-serif-fonts, dejavu-sans-mono-fonts
 Requires: hunspell-en, hyphen-en
@@ -355,12 +355,12 @@
 The PDF Importer imports PDF into drawing documents to preserve layout
 and enable basic editing of PDF documents.
 
-%package fonts
+%package %{fontname}-fonts
 Summary: %{name} dingbats font
 Group: User Interface/X
 Requires: fontpackages-filesystem
 
-%description fonts
+%description %{fontname}-fonts
 A dingbats font, OpenSymbol, suitable for use by %{name} for bullets and
 mathematical symbols. 
 
@@ -909,7 +909,7 @@
 Summary: Italian language pack for %{name}
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
-Requires: hunspell-it, hyphen-it
+Requires: hunspell-it, hyphen-it, mythes-it
 Obsoletes: openoffice.org-i18n < 1.9.0
 Obsoletes: openoffice.org2-langpack-it < 1:3.0.0
 
@@ -3238,7 +3238,7 @@
     # clear disk cache
     unopkg list --shared > /dev/null 2>&1 || :
 
-%_font_pkg opens___.ttf
+%_font_pkg -n %{fontname} opens___.ttf
 
 %files calc-core
 %defattr(-,root,root,-)
@@ -3828,9 +3828,12 @@
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
-* Mon Jan 19 2009 Caol??n McNamara <caolanm at redhat.com> - 1:3.0.1-15.3
+* Tue Jan 20 2009 Caol??n McNamara <caolanm at redhat.com> - 1:3.0.1-15.3
 - Resolves: rhbz#480362 add
   openoffice.org-3.0.1.ooo98240.sc.basicworkaround.patch
+- add mythes-it
+- rhbz#477435 tweak to get font packaging macros to give a usable
+  package
 
 * Mon Jan 19 2009 Caol??n McNamara <caolanm at redhat.com> - 1:3.0.1-15.2
 - Resolves: rhbz#479624 add



From mhlavink at fedoraproject.org  Tue Jan 20 10:09:04 2009
From: mhlavink at fedoraproject.org (Michal Hlavinka)
Date: Tue, 20 Jan 2009 10:09:04 +0000 (UTC)
Subject: rpms/pciutils/devel .cvsignore, 1.19,
	1.20 pciutils-2.1.99-gcc4.patch, 
	1.2, 1.3 pciutils-dir-d.patch, 1.4, 1.5 pciutils.spec, 1.64,
	1.65 sources, 1.19, 1.20
Message-ID: <20090120100904.DE869700F9@cvs1.fedora.phx.redhat.com>

Author: mhlavink

Update of /cvs/extras/rpms/pciutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26296

Modified Files:
	.cvsignore pciutils-2.1.99-gcc4.patch pciutils-dir-d.patch 
	pciutils.spec sources 
Log Message:
update to 3.1.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pciutils/devel/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- .cvsignore	9 Dec 2008 18:12:14 -0000	1.19
+++ .cvsignore	20 Jan 2009 10:08:34 -0000	1.20
@@ -1 +1 @@
-pciutils-3.0.3.tar.gz
+pciutils-3.1.0.tar.gz

pciutils-2.1.99-gcc4.patch:

Index: pciutils-2.1.99-gcc4.patch
===================================================================
RCS file: /cvs/extras/rpms/pciutils/devel/pciutils-2.1.99-gcc4.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- pciutils-2.1.99-gcc4.patch	1 Sep 2008 13:18:55 -0000	1.2
+++ pciutils-2.1.99-gcc4.patch	20 Jan 2009 10:08:34 -0000	1.3
@@ -1,8 +1,8 @@
-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++)
+diff -up pciutils-3.1.0/lib/i386-ports.c.glibcmacros pciutils-3.1.0/lib/i386-ports.c
+--- pciutils-3.1.0/lib/i386-ports.c.glibcmacros	2008-11-21 22:00:38.000000000 +0100
++++ pciutils-3.1.0/lib/i386-ports.c	2009-01-20 10:43:04.766937947 +0100
+@@ -72,9 +72,9 @@ intel_sanity_check(struct pci_access *a,
+   for (d.dev = 0; d.dev < 32; d.dev++)
      {
        u16 class, vendor;
 -      if (m->read(&d, PCI_CLASS_DEVICE, (byte *) &class, sizeof(class)) &&

pciutils-dir-d.patch:

Index: pciutils-dir-d.patch
===================================================================
RCS file: /cvs/extras/rpms/pciutils/devel/pciutils-dir-d.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- pciutils-dir-d.patch	1 Sep 2008 13:18:55 -0000	1.4
+++ pciutils-dir-d.patch	20 Jan 2009 10:08:34 -0000	1.5
@@ -60,7 +60,7 @@
 +  int lino, tempsize;
 +  const char *err;
 +  char *temp;
-+  char new_id_path[PATH_MAX] = {0,};
++  char new_id_path[PATH_MAX+1] = {0,};
 +  DIR *pci_ids_dir;
 +  struct dirent *dp;
 +  


Index: pciutils.spec
===================================================================
RCS file: /cvs/extras/rpms/pciutils/devel/pciutils.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- pciutils.spec	9 Dec 2008 18:12:14 -0000	1.64
+++ pciutils.spec	20 Jan 2009 10:08:34 -0000	1.65
@@ -1,12 +1,11 @@
 Name:		pciutils
-Version:	3.0.3
+Version:	3.1.0
 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.2-multilib.patch
 Patch9: 	pciutils-dir-d.patch
 Patch10:	pciutils-2.2.10-sparc-support.patch
@@ -49,7 +48,6 @@
 %patch2 -p1 -b .scan
 %patch3 -p1 -b .pread
 %patch6 -p1 -b .idpath
-%patch7 -p1 -b .glibcmacros
 %patch8 -p1 -b .multilib
 %patch9 -p1 -b .dird
 %patch10 -p1 -b .sparc
@@ -114,6 +112,9 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Mon Jan 19 2009 Michal Hlavinka <mhlavink at redhat.com> 3.1.0-1
+- version 3.1.0
+
 * Tue Dec 09 2008 Michal Hlavinka <mhlavink at redhat.com> 3.0.3-1
 - version 3.0.3
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pciutils/devel/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources	9 Dec 2008 18:12:14 -0000	1.19
+++ sources	20 Jan 2009 10:08:34 -0000	1.20
@@ -1 +1 @@
-d07da501bb11e6af40acd036536c2e9a  pciutils-3.0.3.tar.gz
+4b6e4f2b107a534b21c22400f5db9bf4  pciutils-3.1.0.tar.gz



From jwrdegoede at fedoraproject.org  Tue Jan 20 10:16:47 2009
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Tue, 20 Jan 2009 10:16:47 +0000 (UTC)
Subject: rpms/freecol/devel freecol.spec,1.9,1.10
Message-ID: <20090120101647.D44C4700F9@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/freecol/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27480

Modified Files:
	freecol.spec 
Log Message:
Fix building with latest fontpackages-devel


Index: freecol.spec
===================================================================
RCS file: /cvs/extras/rpms/freecol/devel/freecol.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- freecol.spec	15 Jan 2009 10:03:15 -0000	1.9
+++ freecol.spec	20 Jan 2009 10:16:17 -0000	1.10
@@ -138,7 +138,7 @@
 %doc doc/FreeCol.pdf doc/FreeCol.html doc/FreeCol.css doc/images
 
 
-%_font_pkg -n %{fontname}-fonts ShadowedBlack.ttf
+%_font_pkg -n %{fontname} ShadowedBlack.ttf
 
 %doc data/fonts/README
 %dir %{_fontdir}



From perex at fedoraproject.org  Tue Jan 20 10:17:21 2009
From: perex at fedoraproject.org (Jaroslav Kysela)
Date: Tue, 20 Jan 2009 10:17:21 +0000 (UTC)
Subject: rpms/alsa-lib/devel .cvsignore, 1.35, 1.36 alsa-lib.spec, 1.79,
	1.80 sources, 1.39, 1.40
Message-ID: <20090120101721.429FF700F9@cvs1.fedora.phx.redhat.com>

Author: perex

Update of /cvs/pkgs/rpms/alsa-lib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27552

Modified Files:
	.cvsignore alsa-lib.spec sources 
Log Message:
alsa-lib 1.0.19 final


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/alsa-lib/devel/.cvsignore,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- .cvsignore	4 Nov 2008 09:18:04 -0000	1.35
+++ .cvsignore	20 Jan 2009 10:16:50 -0000	1.36
@@ -22,3 +22,4 @@
 alsa-lib-1.0.17a.tar.bz2
 alsa-lib-1.0.18rc3.tar.bz2
 alsa-lib-1.0.18.tar.bz2
+alsa-lib-1.0.19.tar.bz2


Index: alsa-lib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/alsa-lib/devel/alsa-lib.spec,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- alsa-lib.spec	4 Nov 2008 09:18:11 -0000	1.79
+++ alsa-lib.spec	20 Jan 2009 10:16:50 -0000	1.80
@@ -4,8 +4,8 @@
 
 Summary: The Advanced Linux Sound Architecture (ALSA) library
 Name:    alsa-lib
-Version: 1.0.18
-Release: 7%{?prever_dot}%{?dist}
+Version: 1.0.19
+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
@@ -93,6 +93,9 @@
 %{_datadir}/aclocal/alsa.m4
 
 %changelog
+* Tue Jan 20 2009 Jaroslav Kysela <jkysela at redhat.com> - 1.0.19-1
+- Updated to 1.0.19 final
+
 * Wed Nov  4 2008 Jaroslav Kysela <jkysela at redhat.com> - 1.0.18-7
 - Updated to 1.0.18 final
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/alsa-lib/devel/sources,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- sources	4 Nov 2008 09:18:11 -0000	1.39
+++ sources	20 Jan 2009 10:16:50 -0000	1.40
@@ -1 +1 @@
-de60df7541fafe8c6a3397e0f105ff0e  alsa-lib-1.0.18.tar.bz2
+73db3666c211e5fb023bb77450cf430d  alsa-lib-1.0.19.tar.bz2



From nphilipp at fedoraproject.org  Tue Jan 20 10:18:08 2009
From: nphilipp at fedoraproject.org (Nils Philippsen)
Date: Tue, 20 Jan 2009 10:18:08 +0000 (UTC)
Subject: rpms/xsane/devel xsane.spec,1.62,1.63
Message-ID: <20090120101808.6F0EF700F9@cvs1.fedora.phx.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/xsane/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27683

Modified Files:
	xsane.spec 
Log Message:
BR: lcms-devel



Index: xsane.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xsane/devel/xsane.spec,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- xsane.spec	18 Jan 2009 19:38:00 -0000	1.62
+++ xsane.spec	20 Jan 2009 10:17:38 -0000	1.63
@@ -3,7 +3,7 @@
 Name: xsane
 Summary: X Window System front-end for the SANE scanner interface
 Version: 0.996
-Release: 1%{?dist}
+Release: 2%{?dist}
 Source0: http://www.xsane.org/download/%{name}-%{version}.tar.gz
 Source1: xsane.desktop
 Source2: xsane.conf.in
@@ -14,7 +14,11 @@
 URL: http://www.xsane.org/
 Group: Applications/Multimedia
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%__id_u -n)
-BuildRequires: sane-backends-devel gimp-devel libpng-devel libjpeg-devel
+BuildRequires: gimp-devel
+BuildRequires: lcms-devel
+BuildRequires: libjpeg-devel
+BuildRequires: libpng-devel
+BuildRequires: sane-backends-devel
 BuildRequires: desktop-file-utils >= 0.2.92
 BuildRequires: libtiff-devel
 BuildRequires: gettext-devel
@@ -109,6 +113,9 @@
 %config(noreplace) %{_sysconfdir}/gimp/plugins.d/xsane.conf
 
 %changelog
+* Tue Jan 20 2009 Nils Philippsen <nphilipp at redhat.com> - 0.996-2
+- BR: lcms-devel
+
 * Sun Jan 18 2009 Nils Philippsen <nphilipp at redhat.com> - 0.996-1
 - version 0.996
 - don't use %%makeinstall



From perex at fedoraproject.org  Tue Jan 20 10:21:44 2009
From: perex at fedoraproject.org (Jaroslav Kysela)
Date: Tue, 20 Jan 2009 10:21:44 +0000 (UTC)
Subject: rpms/alsa-lib/F-10 .cvsignore, 1.35, 1.36 alsa-lib.spec, 1.79,
	1.80 sources, 1.39, 1.40
Message-ID: <20090120102144.7B72B700F9@cvs1.fedora.phx.redhat.com>

Author: perex

Update of /cvs/pkgs/rpms/alsa-lib/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28507

Modified Files:
	.cvsignore alsa-lib.spec sources 
Log Message:
alsa-lib 1.0.19 final


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/alsa-lib/F-10/.cvsignore,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- .cvsignore	4 Nov 2008 09:18:04 -0000	1.35
+++ .cvsignore	20 Jan 2009 10:21:13 -0000	1.36
@@ -22,3 +22,4 @@
 alsa-lib-1.0.17a.tar.bz2
 alsa-lib-1.0.18rc3.tar.bz2
 alsa-lib-1.0.18.tar.bz2
+alsa-lib-1.0.19.tar.bz2


Index: alsa-lib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/alsa-lib/F-10/alsa-lib.spec,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- alsa-lib.spec	4 Nov 2008 09:18:11 -0000	1.79
+++ alsa-lib.spec	20 Jan 2009 10:21:14 -0000	1.80
@@ -4,8 +4,8 @@
 
 Summary: The Advanced Linux Sound Architecture (ALSA) library
 Name:    alsa-lib
-Version: 1.0.18
-Release: 7%{?prever_dot}%{?dist}
+Version: 1.0.19
+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
@@ -93,6 +93,9 @@
 %{_datadir}/aclocal/alsa.m4
 
 %changelog
+* Tue Jan 20 2009 Jaroslav Kysela <jkysela at redhat.com> - 1.0.19-1
+- Updated to 1.0.19 final
+
 * Wed Nov  4 2008 Jaroslav Kysela <jkysela at redhat.com> - 1.0.18-7
 - Updated to 1.0.18 final
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/alsa-lib/F-10/sources,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- sources	4 Nov 2008 09:18:11 -0000	1.39
+++ sources	20 Jan 2009 10:21:14 -0000	1.40
@@ -1 +1 @@
-de60df7541fafe8c6a3397e0f105ff0e  alsa-lib-1.0.18.tar.bz2
+73db3666c211e5fb023bb77450cf430d  alsa-lib-1.0.19.tar.bz2



From nphilipp at fedoraproject.org  Tue Jan 20 10:22:16 2009
From: nphilipp at fedoraproject.org (Nils Philippsen)
Date: Tue, 20 Jan 2009 10:22:16 +0000 (UTC)
Subject: rpms/xsane/F-10 .cvsignore, 1.17, 1.18 sources, 1.17,
	1.18 xsane.spec, 1.58, 1.59
Message-ID: <20090120102216.20BA9700F9@cvs1.fedora.phx.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/xsane/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28538

Modified Files:
	.cvsignore sources xsane.spec 
Log Message:
version 0.996
don't use %makeinstall
use shipped xsane.xpm as application icon
BR: lcms-devel



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xsane/F-10/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- .cvsignore	23 Nov 2007 11:03:41 -0000	1.17
+++ .cvsignore	20 Jan 2009 10:21:45 -0000	1.18
@@ -1 +1 @@
-xsane-0.995.tar.gz
+xsane-0.996.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xsane/F-10/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources	23 Nov 2007 11:03:41 -0000	1.17
+++ sources	20 Jan 2009 10:21:45 -0000	1.18
@@ -1 +1 @@
-5aaedb75973c3b13b136edec714e3fe8  xsane-0.995.tar.gz
+7dcbcdf0e83322d7c0a543672d9ca2d8  xsane-0.996.tar.gz


Index: xsane.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xsane/F-10/xsane.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- xsane.spec	18 Jul 2008 14:13:01 -0000	1.58
+++ xsane.spec	20 Jan 2009 10:21:45 -0000	1.59
@@ -2,8 +2,8 @@
 
 Name: xsane
 Summary: X Window System front-end for the SANE scanner interface
-Version: 0.995
-Release: 5%{?dist}
+Version: 0.996
+Release: 2%{?dist}
 Source0: http://www.xsane.org/download/%{name}-%{version}.tar.gz
 Source1: xsane.desktop
 Source2: xsane.conf.in
@@ -14,7 +14,11 @@
 URL: http://www.xsane.org/
 Group: Applications/Multimedia
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%__id_u -n)
-BuildRequires: sane-backends-devel gimp-devel libpng-devel libjpeg-devel
+BuildRequires: gimp-devel
+BuildRequires: lcms-devel
+BuildRequires: libjpeg-devel
+BuildRequires: libpng-devel
+BuildRequires: sane-backends-devel
 BuildRequires: desktop-file-utils >= 0.2.92
 BuildRequires: libtiff-devel
 BuildRequires: gettext-devel
@@ -58,11 +62,12 @@
 
 %install
 rm -rf %{buildroot}
-%makeinstall
+make DESTDIR=%{buildroot} install
 
 install src/xsane-gimp %{buildroot}%{_bindir}
 
-mkdir %{buildroot}%{_datadir}/applications
+# use our own desktop file
+rm %{buildroot}%{_datadir}/applications/xsane.desktop
 desktop-file-install --vendor %{desktop_vendor}         \
     --dir %{buildroot}%{_datadir}/applications          \
     %{SOURCE1}
@@ -95,6 +100,7 @@
 %{_datadir}/sane
 %dir %{_datadir}/applications
 %{_datadir}/applications/%{desktop_vendor}-xsane.desktop
+%{_datadir}/pixmaps/xsane.xpm
 
 %files gimp
 %defattr(-,root,root)
@@ -107,6 +113,14 @@
 %config(noreplace) %{_sysconfdir}/gimp/plugins.d/xsane.conf
 
 %changelog
+* Tue Jan 20 2009 Nils Philippsen <nphilipp at redhat.com> - 0.996-2
+- BR: lcms-devel
+
+* Sun Jan 18 2009 Nils Philippsen <nphilipp at redhat.com> - 0.996-1
+- version 0.996
+- don't use %%makeinstall
+- use shipped xsane.xpm as application icon
+
 * Fri Jul 18 2008 Nils Philippsen <nphilipp at redhat.com> - 0.995-5
 - fix fd leak prevention (#455450)
 



From nphilipp at fedoraproject.org  Tue Jan 20 10:22:28 2009
From: nphilipp at fedoraproject.org (Nils Philippsen)
Date: Tue, 20 Jan 2009 10:22:28 +0000 (UTC)
Subject: rpms/xsane/F-9 .cvsignore, 1.17, 1.18 sources, 1.17, 1.18 xsane.spec,
	1.56, 1.57
Message-ID: <20090120102228.7C69E700F9@cvs1.fedora.phx.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/xsane/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28646

Modified Files:
	.cvsignore sources xsane.spec 
Log Message:
version 0.996
don't use %makeinstall
use shipped xsane.xpm as application icon
BR: lcms-devel



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xsane/F-9/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- .cvsignore	23 Nov 2007 11:03:41 -0000	1.17
+++ .cvsignore	20 Jan 2009 10:21:58 -0000	1.18
@@ -1 +1 @@
-xsane-0.995.tar.gz
+xsane-0.996.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xsane/F-9/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources	23 Nov 2007 11:03:41 -0000	1.17
+++ sources	20 Jan 2009 10:21:58 -0000	1.18
@@ -1 +1 @@
-5aaedb75973c3b13b136edec714e3fe8  xsane-0.995.tar.gz
+7dcbcdf0e83322d7c0a543672d9ca2d8  xsane-0.996.tar.gz


Index: xsane.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xsane/F-9/xsane.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- xsane.spec	19 Feb 2008 16:29:16 -0000	1.56
+++ xsane.spec	20 Jan 2009 10:21:58 -0000	1.57
@@ -2,18 +2,23 @@
 
 Name: xsane
 Summary: X Window System front-end for the SANE scanner interface
-Version: 0.995
-Release: 3%{?dist}
+Version: 0.996
+Release: 2%{?dist}
 Source0: http://www.xsane.org/download/%{name}-%{version}.tar.gz
 Source1: xsane.desktop
 Source2: xsane.conf.in
 Patch0: xsane-0.995-xdg-open.patch
 Patch1: xsane-0.995-eula-license-size.patch
+Patch2: xsane-0.995-close-fds.patch
 License: GPLv2+
 URL: http://www.xsane.org/
 Group: Applications/Multimedia
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%__id_u -n)
-BuildRequires: sane-backends-devel gimp-devel libpng-devel libjpeg-devel
+BuildRequires: gimp-devel
+BuildRequires: lcms-devel
+BuildRequires: libjpeg-devel
+BuildRequires: libpng-devel
+BuildRequires: sane-backends-devel
 BuildRequires: desktop-file-utils >= 0.2.92
 BuildRequires: libtiff-devel
 BuildRequires: gettext-devel
@@ -41,6 +46,7 @@
 %setup -q
 %patch0 -p1 -b .xdg-open
 %patch1 -p1 -b .eula-license-size
+%patch2 -p1 -b .close-fds
 
 %build
 %configure --enable-gimp
@@ -56,11 +62,12 @@
 
 %install
 rm -rf %{buildroot}
-%makeinstall
+make DESTDIR=%{buildroot} install
 
 install src/xsane-gimp %{buildroot}%{_bindir}
 
-mkdir %{buildroot}%{_datadir}/applications
+# use our own desktop file
+rm %{buildroot}%{_datadir}/applications/xsane.desktop
 desktop-file-install --vendor %{desktop_vendor}         \
     --dir %{buildroot}%{_datadir}/applications          \
     %{SOURCE1}
@@ -93,6 +100,7 @@
 %{_datadir}/sane
 %dir %{_datadir}/applications
 %{_datadir}/applications/%{desktop_vendor}-xsane.desktop
+%{_datadir}/pixmaps/xsane.xpm
 
 %files gimp
 %defattr(-,root,root)
@@ -105,6 +113,20 @@
 %config(noreplace) %{_sysconfdir}/gimp/plugins.d/xsane.conf
 
 %changelog
+* Tue Jan 20 2009 Nils Philippsen <nphilipp at redhat.com> - 0.996-2
+- BR: lcms-devel
+
+* Sun Jan 18 2009 Nils Philippsen <nphilipp at redhat.com> - 0.996-1
+- version 0.996
+- don't use %%makeinstall
+- use shipped xsane.xpm as application icon
+
+* Fri Jul 18 2008 Nils Philippsen <nphilipp at redhat.com> - 0.995-5
+- fix fd leak prevention (#455450)
+
+* Tue Jul 15 2008 Nils Philippsen <nphilipp at redhat.com> - 0.995-4
+- don't leak file descriptors to help browser process (#455450)
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.995-3
 - Autorebuild for GCC 4.3
 



From pkgdb at fedoraproject.org  Tue Jan 20 10:26:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Jan 2009 10:26:35 +0000
Subject: [pkgdb] perl-HTTP-Server-Simple: corsepiu has requested
	watchbugzilla
Message-ID: <20090120102635.4CBB2208467@bastion.fedora.phx.redhat.com>

corsepiu has requested the watchbugzilla acl on perl-HTTP-Server-Simple (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-HTTP-Server-Simple



From pkgdb at fedoraproject.org  Tue Jan 20 10:26:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Jan 2009 10:26:35 +0000
Subject: [pkgdb] perl-HTTP-Server-Simple: corsepiu has requested commit
Message-ID: <20090120102636.2CD37208472@bastion.fedora.phx.redhat.com>

corsepiu has requested the commit acl on perl-HTTP-Server-Simple (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-HTTP-Server-Simple



From pkgdb at fedoraproject.org  Tue Jan 20 10:26:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Jan 2009 10:26:41 +0000
Subject: [pkgdb] perl-HTTP-Server-Simple: corsepiu has requested approveacls
Message-ID: <20090120102641.B1ADA208478@bastion.fedora.phx.redhat.com>

corsepiu has requested the approveacls acl on perl-HTTP-Server-Simple (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-HTTP-Server-Simple



From pkgdb at fedoraproject.org  Tue Jan 20 10:26:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Jan 2009 10:26:38 +0000
Subject: [pkgdb] perl-HTTP-Server-Simple: corsepiu has requested watchcommits
Message-ID: <20090120102641.A0A07208475@bastion.fedora.phx.redhat.com>

corsepiu has requested the watchcommits acl on perl-HTTP-Server-Simple (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-HTTP-Server-Simple



From pkgdb at fedoraproject.org  Tue Jan 20 10:26:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Jan 2009 10:26:50 +0000
Subject: [pkgdb] perl-HTTP-Server-Simple: corsepiu has requested
	watchbugzilla
Message-ID: <20090120102650.47171208467@bastion.fedora.phx.redhat.com>

corsepiu has requested the watchbugzilla acl on perl-HTTP-Server-Simple (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-HTTP-Server-Simple



From pkgdb at fedoraproject.org  Tue Jan 20 10:26:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Jan 2009 10:26:52 +0000
Subject: [pkgdb] perl-HTTP-Server-Simple: corsepiu has requested watchcommits
Message-ID: <20090120102652.3BFE020847E@bastion.fedora.phx.redhat.com>

corsepiu has requested the watchcommits acl on perl-HTTP-Server-Simple (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-HTTP-Server-Simple



From pkgdb at fedoraproject.org  Tue Jan 20 10:26:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Jan 2009 10:26:53 +0000
Subject: [pkgdb] perl-HTTP-Server-Simple: corsepiu has requested commit
Message-ID: <20090120102654.34911208481@bastion.fedora.phx.redhat.com>

corsepiu has requested the commit acl on perl-HTTP-Server-Simple (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-HTTP-Server-Simple



From pkgdb at fedoraproject.org  Tue Jan 20 10:27:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Jan 2009 10:27:00 +0000
Subject: [pkgdb] perl-HTTP-Server-Simple: corsepiu has requested approveacls
Message-ID: <20090120102700.EAF33208471@bastion.fedora.phx.redhat.com>

corsepiu has requested the approveacls acl on perl-HTTP-Server-Simple (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-HTTP-Server-Simple



From pkgdb at fedoraproject.org  Tue Jan 20 10:27:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Jan 2009 10:27:09 +0000
Subject: [pkgdb] perl-HTTP-Server-Simple: corsepiu has requested
	watchbugzilla
Message-ID: <20090120102709.8BD48208486@bastion.fedora.phx.redhat.com>

corsepiu has requested the watchbugzilla acl on perl-HTTP-Server-Simple (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-HTTP-Server-Simple



From pkgdb at fedoraproject.org  Tue Jan 20 10:27:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Jan 2009 10:27:10 +0000
Subject: [pkgdb] perl-HTTP-Server-Simple: corsepiu has requested commit
Message-ID: <20090120102710.B7FE4208476@bastion.fedora.phx.redhat.com>

corsepiu has requested the commit acl on perl-HTTP-Server-Simple (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-HTTP-Server-Simple



From pkgdb at fedoraproject.org  Tue Jan 20 10:27:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Jan 2009 10:27:15 +0000
Subject: [pkgdb] perl-HTTP-Server-Simple: corsepiu has requested watchcommits
Message-ID: <20090120102715.85ADF208485@bastion.fedora.phx.redhat.com>

corsepiu has requested the watchcommits acl on perl-HTTP-Server-Simple (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-HTTP-Server-Simple



From pkgdb at fedoraproject.org  Tue Jan 20 10:27:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Jan 2009 10:27:17 +0000
Subject: [pkgdb] perl-HTTP-Server-Simple: corsepiu has requested approveacls
Message-ID: <20090120102717.D3CFE208489@bastion.fedora.phx.redhat.com>

corsepiu has requested the approveacls acl on perl-HTTP-Server-Simple (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-HTTP-Server-Simple



From tbzatek at fedoraproject.org  Tue Jan 20 10:27:40 2009
From: tbzatek at fedoraproject.org (Tomas Bzatek)
Date: Tue, 20 Jan 2009 10:27:40 +0000 (UTC)
Subject: rpms/nautilus/devel .cvsignore, 1.87, 1.88 nautilus.spec, 1.253,
	1.254 sources, 1.91, 1.92
Message-ID: <20090120102740.171AE700F9@cvs1.fedora.phx.redhat.com>

Author: tbzatek

Update of /cvs/extras/rpms/nautilus/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29512

Modified Files:
	.cvsignore nautilus.spec sources 
Log Message:
* Tue Jan 20 2009 Tomas Bzatek <tbzatek at redhat.com> - 2.25.3-1
- Update to 2.25.3



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/nautilus/devel/.cvsignore,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -r1.87 -r1.88
--- .cvsignore	16 Dec 2008 07:10:06 -0000	1.87
+++ .cvsignore	20 Jan 2009 10:27:09 -0000	1.88
@@ -1 +1 @@
-nautilus-2.25.2.tar.bz2
+nautilus-2.25.3.tar.bz2


Index: nautilus.spec
===================================================================
RCS file: /cvs/extras/rpms/nautilus/devel/nautilus.spec,v
retrieving revision 1.253
retrieving revision 1.254
diff -u -r1.253 -r1.254
--- nautilus.spec	20 Jan 2009 04:04:14 -0000	1.253
+++ nautilus.spec	20 Jan 2009 10:27:09 -0000	1.254
@@ -15,8 +15,8 @@
 
 Name:		nautilus
 Summary:        File manager for GNOME
-Version: 	2.25.2
-Release:	7%{?dist}
+Version: 	2.25.3
+Release:	1%{?dist}
 License: 	GPLv2+
 Group:          User Interface/Desktops
 Source: 	http://download.gnome.org/sources/%{name}/2.25/%{name}-%{version}.tar.bz2
@@ -265,6 +265,9 @@
 
 
 %changelog
+* Tue Jan 20 2009 Tomas Bzatek <tbzatek at redhat.com> - 2.25.3-1
+- Update to 2.25.3
+
 * Mon Jan 19 2009 Ray Strode <rstrode at redhat.com> - 2.25.2-7
 - Update fade patch to work with updated gnome-desktop api
 - Fix fade start pixmap


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nautilus/devel/sources,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -r1.91 -r1.92
--- sources	16 Dec 2008 07:10:06 -0000	1.91
+++ sources	20 Jan 2009 10:27:09 -0000	1.92
@@ -1 +1 @@
-7102f476e8c75095021636d39a08bd68  nautilus-2.25.2.tar.bz2
+5ae9a75b0d998e59f0bec3c4e5c446a2  nautilus-2.25.3.tar.bz2



From nphilipp at fedoraproject.org  Tue Jan 20 10:41:22 2009
From: nphilipp at fedoraproject.org (Nils Philippsen)
Date: Tue, 20 Jan 2009 10:41:22 +0000 (UTC)
Subject: rpms/xsane/F-9 xsane-0.995-close-fds.patch, NONE, 1.1 xsane.desktop,
	1.3, 1.4 xsane.spec, 1.57, 1.58
Message-ID: <20090120104122.D02D3700F9@cvs1.fedora.phx.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/xsane/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32156

Modified Files:
	xsane.desktop xsane.spec 
Added Files:
	xsane-0.995-close-fds.patch 
Log Message:
rebuild to pickup changed desktop file, close-fds patch in F9, F10


xsane-0.995-close-fds.patch:

--- NEW FILE xsane-0.995-close-fds.patch ---
diff -up xsane-0.995/src/xsane.c.close-fds xsane-0.995/src/xsane.c
--- xsane-0.995/src/xsane.c.close-fds	2007-09-28 17:24:56.000000000 +0200
+++ xsane-0.995/src/xsane.c	2008-07-18 16:10:30.000000000 +0200
@@ -48,6 +48,8 @@
 
 #include <sys/wait.h>
 
+#include <stdarg.h>
+
 /* ---------------------------------------------------------------------------------------------------------------------- */
 
 struct option long_options[] =
@@ -3673,6 +3675,41 @@ static void xsane_show_gpl(GtkWidget *wi
 
 /* ---------------------------------------------------------------------------------------------------------------------- */
 
+static void xsane_close_fds_for_exec(signed int first_fd_to_leave_open, ...)
+{
+ int open_max;
+ signed int i;
+
+ va_list ap;
+ unsigned char *close_fds;
+
+  open_max = (int) sysconf (_SC_OPEN_MAX);
+
+  close_fds = malloc (open_max);
+
+  memset (close_fds, 1, open_max);
+
+  va_start (ap, first_fd_to_leave_open);
+
+  for (i = first_fd_to_leave_open; i >= 0; i = va_arg (ap, signed int)) {
+    if (i < open_max)
+      close_fds[i] = 0;
+  }
+
+  va_end (ap);
+
+  DBG(DBG_info, "closing unneeded file descriptors\n");
+
+  for (i = 0; i < open_max; i++) {
+    if (close_fds[i])
+      close (i);
+  }
+
+  free (close_fds);
+}
+
+/* ---------------------------------------------------------------------------------------------------------------------- */
+
 static void xsane_show_doc_via_nsr(GtkWidget *widget, gpointer data) /* show via netscape remote */
 {
  char *name = (char *) data;
@@ -3725,6 +3762,8 @@ static void xsane_show_doc_via_nsr(GtkWi
         ipc_file = fdopen(xsane.ipc_pipefd[1], "w");
       }
 
+      xsane_close_fds_for_exec (1, 2, xsane.ipc_pipefd[1], -1);
+
       DBG(DBG_info, "trying to change user id for new subprocess:\n");
       DBG(DBG_info, "old effective uid = %d\n", (int) geteuid());
       setuid(getuid());
@@ -3767,6 +3806,8 @@ static void xsane_show_doc_via_nsr(GtkWi
         ipc_file = fdopen(xsane.ipc_pipefd[1], "w");
       }
 
+      xsane_close_fds_for_exec (1, 2, xsane.ipc_pipefd[1], -1);
+
       DBG(DBG_info, "trying to change user id for new subprocess:\n");
       DBG(DBG_info, "old effective uid = %d\n", (int) geteuid());
       setuid(getuid());
@@ -3888,6 +3929,8 @@ static void xsane_show_doc(GtkWidget *wi
         ipc_file = fdopen(xsane.ipc_pipefd[1], "w");
       }
 
+      xsane_close_fds_for_exec (1, 2, xsane.ipc_pipefd[1], -1);
+
       DBG(DBG_info, "trying to change user id for new subprocess:\n");
       DBG(DBG_info, "old effective uid = %d\n", (int) geteuid());
       setuid(getuid());


Index: xsane.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/xsane/F-9/xsane.desktop,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xsane.desktop	27 Sep 2007 13:46:17 -0000	1.3
+++ xsane.desktop	20 Jan 2009 10:40:52 -0000	1.4
@@ -8,7 +8,7 @@
 Comment=Scan images to view, copy, fax or email them
 Exec=xsane
 TryExec=xsane
-Icon=/usr/share/sane/xsane/xsane-logo.xpm
+Icon=xsane
 Terminal=false
 Categories=Graphics;2DGraphics;RasterGraphics;Scanning;GTK;
 StartupNotify=true


Index: xsane.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xsane/F-9/xsane.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- xsane.spec	20 Jan 2009 10:21:58 -0000	1.57
+++ xsane.spec	20 Jan 2009 10:40:52 -0000	1.58
@@ -113,6 +113,9 @@
 %config(noreplace) %{_sysconfdir}/gimp/plugins.d/xsane.conf
 
 %changelog
+* Tue Jan 20 2009 Nils Philippsen <nphilipp at redhat.com> - 0.996-3
+- pickup changed desktop file, close-fds patch in F9, F10
+
 * Tue Jan 20 2009 Nils Philippsen <nphilipp at redhat.com> - 0.996-2
 - BR: lcms-devel
 



From nphilipp at fedoraproject.org  Tue Jan 20 10:41:33 2009
From: nphilipp at fedoraproject.org (Nils Philippsen)
Date: Tue, 20 Jan 2009 10:41:33 +0000 (UTC)
Subject: rpms/xsane/F-10 xsane.desktop,1.3,1.4 xsane.spec,1.59,1.60
Message-ID: <20090120104133.51DDE700F9@cvs1.fedora.phx.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/xsane/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32211

Modified Files:
	xsane.desktop xsane.spec 
Log Message:
rebuild to pickup changed desktop file, close-fds patch in F9, F10



Index: xsane.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/xsane/F-10/xsane.desktop,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xsane.desktop	27 Sep 2007 13:46:17 -0000	1.3
+++ xsane.desktop	20 Jan 2009 10:41:02 -0000	1.4
@@ -8,7 +8,7 @@
 Comment=Scan images to view, copy, fax or email them
 Exec=xsane
 TryExec=xsane
-Icon=/usr/share/sane/xsane/xsane-logo.xpm
+Icon=xsane
 Terminal=false
 Categories=Graphics;2DGraphics;RasterGraphics;Scanning;GTK;
 StartupNotify=true


Index: xsane.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xsane/F-10/xsane.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- xsane.spec	20 Jan 2009 10:21:45 -0000	1.59
+++ xsane.spec	20 Jan 2009 10:41:03 -0000	1.60
@@ -113,6 +113,9 @@
 %config(noreplace) %{_sysconfdir}/gimp/plugins.d/xsane.conf
 
 %changelog
+* Tue Jan 20 2009 Nils Philippsen <nphilipp at redhat.com> - 0.996-3
+- pickup changed desktop file, close-fds patch in F9, F10
+
 * Tue Jan 20 2009 Nils Philippsen <nphilipp at redhat.com> - 0.996-2
 - BR: lcms-devel
 



From nphilipp at fedoraproject.org  Tue Jan 20 10:42:27 2009
From: nphilipp at fedoraproject.org (Nils Philippsen)
Date: Tue, 20 Jan 2009 10:42:27 +0000 (UTC)
Subject: rpms/xsane/devel xsane.spec,1.63,1.64
Message-ID: <20090120104227.9B4A8700F9@cvs1.fedora.phx.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/xsane/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32468

Modified Files:
	xsane.spec 
Log Message:
rebuild to pickup changed desktop file, close-fds patch in F9, F10



Index: xsane.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xsane/devel/xsane.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- xsane.spec	20 Jan 2009 10:17:38 -0000	1.63
+++ xsane.spec	20 Jan 2009 10:41:57 -0000	1.64
@@ -3,7 +3,7 @@
 Name: xsane
 Summary: X Window System front-end for the SANE scanner interface
 Version: 0.996
-Release: 2%{?dist}
+Release: 3%{?dist}
 Source0: http://www.xsane.org/download/%{name}-%{version}.tar.gz
 Source1: xsane.desktop
 Source2: xsane.conf.in
@@ -113,6 +113,9 @@
 %config(noreplace) %{_sysconfdir}/gimp/plugins.d/xsane.conf
 
 %changelog
+* Tue Jan 20 2009 Nils Philippsen <nphilipp at redhat.com> - 0.996-3
+- pickup changed desktop file, close-fds patch in F9, F10
+
 * Tue Jan 20 2009 Nils Philippsen <nphilipp at redhat.com> - 0.996-2
 - BR: lcms-devel
 



From nphilipp at fedoraproject.org  Tue Jan 20 10:43:28 2009
From: nphilipp at fedoraproject.org (Nils Philippsen)
Date: Tue, 20 Jan 2009 10:43:28 +0000 (UTC)
Subject: rpms/xsane/F-10 xsane.spec,1.60,1.61
Message-ID: <20090120104328.61EC3700F9@cvs1.fedora.phx.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/xsane/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv314

Modified Files:
	xsane.spec 
Log Message:
bump release


Index: xsane.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xsane/F-10/xsane.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- xsane.spec	20 Jan 2009 10:41:03 -0000	1.60
+++ xsane.spec	20 Jan 2009 10:42:58 -0000	1.61
@@ -3,7 +3,7 @@
 Name: xsane
 Summary: X Window System front-end for the SANE scanner interface
 Version: 0.996
-Release: 2%{?dist}
+Release: 3%{?dist}
 Source0: http://www.xsane.org/download/%{name}-%{version}.tar.gz
 Source1: xsane.desktop
 Source2: xsane.conf.in



From nphilipp at fedoraproject.org  Tue Jan 20 10:43:32 2009
From: nphilipp at fedoraproject.org (Nils Philippsen)
Date: Tue, 20 Jan 2009 10:43:32 +0000 (UTC)
Subject: rpms/xsane/F-9 xsane.spec,1.58,1.59
Message-ID: <20090120104332.48013700F9@cvs1.fedora.phx.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/xsane/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv340

Modified Files:
	xsane.spec 
Log Message:
bump release


Index: xsane.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xsane/F-9/xsane.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- xsane.spec	20 Jan 2009 10:40:52 -0000	1.58
+++ xsane.spec	20 Jan 2009 10:43:02 -0000	1.59
@@ -3,7 +3,7 @@
 Name: xsane
 Summary: X Window System front-end for the SANE scanner interface
 Version: 0.996
-Release: 2%{?dist}
+Release: 3%{?dist}
 Source0: http://www.xsane.org/download/%{name}-%{version}.tar.gz
 Source1: xsane.desktop
 Source2: xsane.conf.in



From sarantis at fedoraproject.org  Tue Jan 20 10:55:53 2009
From: sarantis at fedoraproject.org (Sarantis Paskalis)
Date: Tue, 20 Jan 2009 10:55:53 +0000 (UTC)
Subject: rpms/mgopen-fonts/devel mgopen-fonts.spec, 1.10, 1.11 sources, 1.3,
	1.4
Message-ID: <20090120105553.2BD27700F9@cvs1.fedora.phx.redhat.com>

Author: sarantis

Update of /cvs/extras/rpms/mgopen-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1909

Modified Files:
	mgopen-fonts.spec sources 
Log Message:
- Fix comments from https://bugzilla.redhat.com/show_bug.cgi?id=477425#c5
  (thanks Nicolas Mailhot)
  - remove requires: fontpackages-filesystem from the main package, add it
    to the -common subpackage.
  - put space around "<" in  Obsoletes to make rpm understand it
  - provide fontconfig substitution rules for all the families (according to 
    http://www.ellak.gr/fonts/mgopen/index.en.html)




Index: mgopen-fonts.spec
===================================================================
RCS file: /cvs/extras/rpms/mgopen-fonts/devel/mgopen-fonts.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- mgopen-fonts.spec	19 Jan 2009 10:17:58 -0000	1.10
+++ mgopen-fonts.spec	20 Jan 2009 10:55:22 -0000	1.11
@@ -19,7 +19,7 @@
 
 Name:      %{fontname}-fonts
 Version:   0.%{upstream_date}
-Release:   10%{?dist}
+Release:   11%{?dist}
 Summary:   Truetype greek fonts
 Group:     User Interface/X
 License:   MgOpen
@@ -34,7 +34,6 @@
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildArch: noarch
 BuildRequires: fontpackages-devel
-Requires:  fontpackages-filesystem
 %description
 %common_desc
 
@@ -42,6 +41,7 @@
 %package common
 Summary:  Truetype greek fonts, common files (documentation???)
 Group:    User Interface/X
+Requires: fontpackages-fileysystem
 %description common
 %common_desc
 This package consists of files used by other MgOpen packages.
@@ -51,7 +51,7 @@
 %package compat
 Summary: Truetype greek fonts, compatibility package
 Group:     User Interface/X
-Obsoletes: mgopen-fonts<0.20050515-8
+Obsoletes: mgopen-fonts < 0.20050515-8
 Requires: %{fontname}-canonica-fonts, %{fontname}-cosmetica-fonts,
 Requires: %{fontname}-modata-fonts, %{fontname}-moderna-fonts
 %description compat
@@ -157,7 +157,16 @@
 %files compat
 
 %changelog
-* Mon Jan 19 2009 Sarantis Paskalis <paskalis at di.uoa.gr> - 0.20050515-9
+* Tue Jan 20 2009 Sarantis Paskalis <paskalis at di.uoa.gr> - 0.20050515-11
+- Fix comments from https://bugzilla.redhat.com/show_bug.cgi?id=477425#c5
+  (thanks Nicolas Mailhot)
+  - remove requires: fontpackages-filesystem from the main package, add it
+    to the -common subpackage.
+  - put space around "<" in  Obsoletes to make rpm understand it
+  - provide fontconfig substitution rules for all the families (according to 
+    http://www.ellak.gr/fonts/mgopen/index.en.html)
+
+* Mon Jan 19 2009 Sarantis Paskalis <paskalis at di.uoa.gr> - 0.20050515-10
 - Rename subpackages according to 
   http://fedoraproject.org/wiki/PackagingDrafts/Font_package_naming_(2009-01-13)
 - Differentiate between macro and variable (fontconf->fconf)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mgopen-fonts/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	30 Dec 2008 14:07:38 -0000	1.3
+++ sources	20 Jan 2009 10:55:22 -0000	1.4
@@ -1,3 +1,3 @@
 9ad4bba3d173e92734320286bfff4c8e  MgOpen-20050515.tar.gz
 eb667a1458a92bc4d4e9a1f5924f6e61  MgOpen-20050515-doc.tar.gz
-c01d7492aa697128799b5c2cc8dd1997  mgopen-fontconfig.tar.gz
+99aed78f4c58e3ca4b7502f0adff7075  mgopen-fontconfig.tar.gz



From perex at fedoraproject.org  Tue Jan 20 11:05:35 2009
From: perex at fedoraproject.org (Jaroslav Kysela)
Date: Tue, 20 Jan 2009 11:05:35 +0000 (UTC)
Subject: rpms/alsa-utils/F-10 .cvsignore, 1.26, 1.27 alsa-utils.spec, 1.77, 
	1.78 sources, 1.30, 1.31 alsactl-fix-restore1.patch, 1.1, NONE
Message-ID: <20090120110535.BC49B700F9@cvs1.fedora.phx.redhat.com>

Author: perex

Update of /cvs/pkgs/rpms/alsa-utils/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3779

Modified Files:
	.cvsignore alsa-utils.spec sources 
Removed Files:
	alsactl-fix-restore1.patch 
Log Message:
alsa-utils 1.0.19 final


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/alsa-utils/F-10/.cvsignore,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- .cvsignore	4 Nov 2008 09:46:31 -0000	1.26
+++ .cvsignore	20 Jan 2009 11:05:04 -0000	1.27
@@ -19,3 +19,4 @@
 alsa-utils-1.0.17.tar.bz2
 alsa-utils-1.0.18rc3.tar.bz2
 alsa-utils-1.0.18.tar.bz2
+alsa-utils-1.0.19.tar.bz2


Index: alsa-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/alsa-utils/F-10/alsa-utils.spec,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- alsa-utils.spec	21 Nov 2008 14:12:27 -0000	1.77
+++ alsa-utils.spec	20 Jan 2009 11:05:04 -0000	1.78
@@ -3,8 +3,8 @@
 
 Summary: Advanced Linux Sound Architecture (ALSA) utilities
 Name:    alsa-utils
-Version: 1.0.18
-Release: 6%{?prever_dot}%{?dist}
+Version: 1.0.19
+Release: 1%{?prever_dot}%{?dist}
 License: GPLv2+
 Group:   Applications/Multimedia
 URL:     http://www.alsa-project.org/
@@ -13,7 +13,6 @@
 Source6: alsa-info.sh
 Source10: alsa.rules
 Source11: alsactl.conf
-Patch0:	 alsactl-fix-restore1.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: alsa-lib-devel >= %{version}
 BuildRequires: ncurses-devel
@@ -27,7 +26,6 @@
 
 %prep
 %setup -q -n %{name}-%{version}%{?prever}
-%patch0 -p1 -b .restore1
 
 %build
 %configure CFLAGS="$RPM_OPT_FLAGS -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64" --sbindir=/sbin --disable-alsaconf
@@ -92,6 +90,9 @@
 fi
 
 %changelog
+* Tue Jan 20 2009 Jaroslav Kysela <jkysela at redhat.com> 1.0.19-1
+- updated to 1.0.19 final
+
 * Fri Nov 21 2008 Jaroslav Kysela <jkysela at redhat.com> 1.0.18-6
 - fix alsactl restore when driver has more controls than asound.state file
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/alsa-utils/F-10/sources,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- sources	4 Nov 2008 09:46:31 -0000	1.30
+++ sources	20 Jan 2009 11:05:04 -0000	1.31
@@ -1 +1,2 @@
 0a6b26d27cc2adfd591d91d8c155fdb7  alsa-utils-1.0.18.tar.bz2
+5ff0379c707c1a29083233edc9ab4e06  alsa-utils-1.0.19.tar.bz2


--- alsactl-fix-restore1.patch DELETED ---



From perex at fedoraproject.org  Tue Jan 20 11:09:03 2009
From: perex at fedoraproject.org (Jaroslav Kysela)
Date: Tue, 20 Jan 2009 11:09:03 +0000 (UTC)
Subject: rpms/alsa-utils/devel .cvsignore, 1.26, 1.27 alsa-utils.spec, 1.76, 
	1.77 sources, 1.30, 1.31 alsactl-add-ignore-option.patch, 1.1,
	NONE alsactl-fix-card-parsing.patch, 1.1, NONE
Message-ID: <20090120110903.D66AA700F9@cvs1.fedora.phx.redhat.com>

Author: perex

Update of /cvs/pkgs/rpms/alsa-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4345

Modified Files:
	.cvsignore alsa-utils.spec sources 
Removed Files:
	alsactl-add-ignore-option.patch alsactl-fix-card-parsing.patch 
Log Message:
alsa-utils 1.0.19 final


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/alsa-utils/devel/.cvsignore,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- .cvsignore	4 Nov 2008 09:46:31 -0000	1.26
+++ .cvsignore	20 Jan 2009 11:08:32 -0000	1.27
@@ -19,3 +19,4 @@
 alsa-utils-1.0.17.tar.bz2
 alsa-utils-1.0.18rc3.tar.bz2
 alsa-utils-1.0.18.tar.bz2
+alsa-utils-1.0.19.tar.bz2


Index: alsa-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/alsa-utils/devel/alsa-utils.spec,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- alsa-utils.spec	4 Nov 2008 09:58:22 -0000	1.76
+++ alsa-utils.spec	20 Jan 2009 11:08:32 -0000	1.77
@@ -3,8 +3,8 @@
 
 Summary: Advanced Linux Sound Architecture (ALSA) utilities
 Name:    alsa-utils
-Version: 1.0.18
-Release: 5%{?prever_dot}%{?dist}
+Version: 1.0.19
+Release: 1%{?prever_dot}%{?dist}
 License: GPLv2+
 Group:   Applications/Multimedia
 URL:     http://www.alsa-project.org/
@@ -90,6 +90,9 @@
 fi
 
 %changelog
+* Tue Jan 20 2009 Jaroslav Kysela <jkysela at redhat.com> 1.0.19-1
+- updated to 1.0.19 final
+
 * Tue Nov 04 2008 Jaroslav Kysela <jkysela at redhat.com> 1.0.18-5
 - fixed building
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/alsa-utils/devel/sources,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- sources	4 Nov 2008 09:46:31 -0000	1.30
+++ sources	20 Jan 2009 11:08:32 -0000	1.31
@@ -1 +1,2 @@
 0a6b26d27cc2adfd591d91d8c155fdb7  alsa-utils-1.0.18.tar.bz2
+5ff0379c707c1a29083233edc9ab4e06  alsa-utils-1.0.19.tar.bz2


--- alsactl-add-ignore-option.patch DELETED ---


--- alsactl-fix-card-parsing.patch DELETED ---



From hadess at fedoraproject.org  Tue Jan 20 11:14:11 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Tue, 20 Jan 2009 11:14:11 +0000 (UTC)
Subject: rpms/control-center/F-10 gcc-set-https-handler.patch, NONE,
	1.1 control-center.spec, 1.408, 1.409
Message-ID: <20090120111411.E3C47700F9@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/control-center/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4876

Modified Files:
	control-center.spec 
Added Files:
	gcc-set-https-handler.patch 
Log Message:
* Tue Jan 20 2009 - Bastien Nocera <bnocera at redhat.com> - 2.24.0.1-12
- Set HTTPS handler correctly when changing default browser (#480707)


gcc-set-https-handler.patch:

--- NEW FILE gcc-set-https-handler.patch ---
Index: capplets/default-applications/gnome-da-capplet.c
===================================================================
--- capplets/default-applications/gnome-da-capplet.c	(revision 9201)
+++ capplets/default-applications/gnome-da-capplet.c	(working copy)
@@ -90,6 +90,8 @@
 
     gconf_client_set_string (capplet->gconf, DEFAULT_APPS_KEY_HTTP_EXEC, command, &error);
 
+    gtk_entry_set_text (GTK_ENTRY (capplet->web_browser_command_entry), command);
+
     if (error != NULL) {
 	g_warning (_("Error saving configuration: %s"), error->message);
 	g_error_free (error);
@@ -124,6 +126,8 @@
     gtk_widget_set_sensitive (capplet->web_browser_command_entry, is_custom_active);
     gtk_widget_set_sensitive (capplet->web_browser_command_label, is_custom_active);
     gtk_widget_set_sensitive (capplet->web_browser_terminal_checkbutton, is_custom_active);
+
+    web_radiobutton_toggled_cb (NULL, capplet);
 }
 
 /* FIXME: Refactor these two functions below into one... */
@@ -450,6 +454,7 @@
 
     ret = gconf_value_new (GCONF_VALUE_INT);
     gconf_value_set_int (ret, index);
+
     return ret;
 }
 


Index: control-center.spec
===================================================================
RCS file: /cvs/pkgs/rpms/control-center/F-10/control-center.spec,v
retrieving revision 1.408
retrieving revision 1.409
diff -u -r1.408 -r1.409
--- control-center.spec	17 Jan 2009 06:01:17 -0000	1.408
+++ control-center.spec	20 Jan 2009 11:13:40 -0000	1.409
@@ -22,7 +22,7 @@
 Summary: GNOME Control Center
 Name: control-center
 Version: 2.24.0.1
-Release: 11%{?dist}
+Release: 12%{?dist}
 Epoch: 1
 License: GPLv2+ and GFDL
 Group: User Interface/Desktops
@@ -41,6 +41,9 @@
 # https://bugzilla.redhat.com/show_bug.cgi?id=466342
 Patch10: gcc-sound-props-remove-oss.patch
 
+# http://bugzilla.gnome.org/show_bug.cgi?id=568408
+Patch11: gcc-set-https-handler.patch
+
 # http://bugzilla.gnome.org/show_bug.cgi?id=545075 
 Patch22: slab-icon-names.patch
 
@@ -189,6 +192,7 @@
 %patch8 -p1 -b .gtkmarshal
 %patch9 -p0 -b .default-dir
 %patch10 -p0 -b .no-oss
+%patch11 -p0 -b .set-https
 %patch22 -p0 -b .slab-icon-names
 %patch25 -p1 -b .ta-schema
 %patch28 -p1 -b .capplet-help
@@ -366,6 +370,9 @@
 %dir %{_datadir}/gnome-control-center/keybindings
 
 %changelog
+* Tue Jan 20 2009 - Bastien Nocera <bnocera at redhat.com> - 2.24.0.1-12
+- Set HTTPS handler correctly when changing default browser (#480707)
+
 * Sat Jan 17 2009 Matthias Clasen <mclasen at redhat.com> - 2.24.0.1-11
 - Make notification theme setting work better 
 



From harald at fedoraproject.org  Tue Jan 20 11:16:58 2009
From: harald at fedoraproject.org (Harald Hoyer)
Date: Tue, 20 Jan 2009 11:16:58 +0000 (UTC)
Subject: rpms/udev/devel start_udev,1.79,1.80
Message-ID: <20090120111658.EC524700F9@cvs1.fedora.phx.redhat.com>

Author: harald

Update of /cvs/pkgs/rpms/udev/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5533

Modified Files:
	start_udev 
Log Message:
test for restorecon before using it


Index: start_udev
===================================================================
RCS file: /cvs/pkgs/rpms/udev/devel/start_udev,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- start_udev	16 Dec 2008 09:31:55 -0000	1.79
+++ start_udev	20 Jan 2009 11:16:28 -0000	1.80
@@ -128,7 +128,7 @@
 	/bin/chown root:lp /dev/lp2
 	/bin/mknod -m 0660 /dev/lp3 c 6 3
 	/bin/chown root:lp /dev/lp3
-	/sbin/restorecon /dev/loop0 /dev/loop1 /dev/loop2 /dev/loop3 /dev/loop4 /dev/loop5 /dev/loop6 /dev/loop7 /dev/net/tun /dev/ppp /dev/lp0 /dev/lp1 /dev/lp2 /dev/lp3
+	[ -x /sbin/restorecon ] && /sbin/restorecon /dev/loop0 /dev/loop1 /dev/loop2 /dev/loop3 /dev/loop4 /dev/loop5 /dev/loop6 /dev/loop7 /dev/net/tun /dev/ppp /dev/lp0 /dev/lp1 /dev/lp2 /dev/lp3
 
 	if [ -x "$MAKEDEV" ]; then
 		for i in /etc/udev/makedev.d/*.nodes; do



From hadess at fedoraproject.org  Tue Jan 20 11:21:06 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Tue, 20 Jan 2009 11:21:06 +0000 (UTC)
Subject: rpms/control-center/devel gcc-set-https-handler.patch, NONE,
	1.1 control-center.spec, 1.427, 1.428
Message-ID: <20090120112106.8B9CA700F9@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/control-center/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6005

Modified Files:
	control-center.spec 
Added Files:
	gcc-set-https-handler.patch 
Log Message:
* Tue Jan 20 2009 - Bastien Nocera <bnocera at redhat.com> - 2.25.3-4
- Set HTTPS handler correctly when changing default browser (#480707)


gcc-set-https-handler.patch:

--- NEW FILE gcc-set-https-handler.patch ---
Index: capplets/default-applications/gnome-da-capplet.c
===================================================================
--- capplets/default-applications/gnome-da-capplet.c	(revision 9201)
+++ capplets/default-applications/gnome-da-capplet.c	(working copy)
@@ -90,6 +90,8 @@
 
     gconf_client_set_string (capplet->gconf, DEFAULT_APPS_KEY_HTTP_EXEC, command, &error);
 
+    gtk_entry_set_text (GTK_ENTRY (capplet->web_browser_command_entry), command);
+
     if (error != NULL) {
 	g_warning (_("Error saving configuration: %s"), error->message);
 	g_error_free (error);
@@ -124,6 +126,8 @@
     gtk_widget_set_sensitive (capplet->web_browser_command_entry, is_custom_active);
     gtk_widget_set_sensitive (capplet->web_browser_command_label, is_custom_active);
     gtk_widget_set_sensitive (capplet->web_browser_terminal_checkbutton, is_custom_active);
+
+    web_radiobutton_toggled_cb (NULL, capplet);
 }
 
 /* FIXME: Refactor these two functions below into one... */
@@ -450,6 +454,7 @@
 
     ret = gconf_value_new (GCONF_VALUE_INT);
     gconf_value_set_int (ret, index);
+
     return ret;
 }
 


Index: control-center.spec
===================================================================
RCS file: /cvs/pkgs/rpms/control-center/devel/control-center.spec,v
retrieving revision 1.427
retrieving revision 1.428
diff -u -r1.427 -r1.428
--- control-center.spec	17 Jan 2009 06:01:48 -0000	1.427
+++ control-center.spec	20 Jan 2009 11:20:35 -0000	1.428
@@ -22,7 +22,7 @@
 Summary: Utilities to configure the GNOME desktop
 Name: control-center
 Version: 2.25.3
-Release: 3%{?dist}
+Release: 4%{?dist}
 Epoch: 1
 License: GPLv2+ and GFDL
 Group: User Interface/Desktops
@@ -35,6 +35,9 @@
 # minor build breakage in gtk, will be fixed in the next gtk release
 Patch8: gtkmarshal.patch
 
+# http://bugzilla.gnome.org/show_bug.cgi?id=568408
+Patch9: gcc-set-https-handler.patch
+
 # http://bugzilla.gnome.org/show_bug.cgi?id=545075 
 Patch22: slab-icon-names.patch
 
@@ -165,6 +168,7 @@
 
 %patch3 -p1 -b .no-gnome-common
 %patch8 -p1 -b .gtkmarshal
+%patch9 -p0 -b .set-https
 %patch22 -p0 -b .slab-icon-names
 %patch25 -p1 -b .ta-schema
 %patch30 -p1 -b .default-layout-toggle
@@ -344,6 +348,9 @@
 %dir %{_datadir}/gnome-control-center/keybindings
 
 %changelog
+* Tue Jan 20 2009 - Bastien Nocera <bnocera at redhat.com> - 2.25.3-4
+- Set HTTPS handler correctly when changing default browser (#480707)
+
 * Sat Jan 17 2009 Matthias Clasen  <mclasen at redhat.com> - 2.25.3-3
 - Make notification theme changing work better
 



From pkgdb at fedoraproject.org  Tue Jan 20 11:32:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Jan 2009 11:32:21 +0000
Subject: [pkgdb] collectd had acl change status
Message-ID: <20090120113221.F26FB208471@bastion.fedora.phx.redhat.com>

lkundrak has set the watchbugzilla acl on collectd (Fedora EPEL 5) to Approved for virtmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/collectd



From pkgdb at fedoraproject.org  Tue Jan 20 11:32:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Jan 2009 11:32:24 +0000
Subject: [pkgdb] collectd had acl change status
Message-ID: <20090120113225.4BDBE208476@bastion.fedora.phx.redhat.com>

lkundrak has set the watchcommits acl on collectd (Fedora EPEL 5) to Approved for virtmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/collectd



From denis at fedoraproject.org  Tue Jan 20 11:33:09 2009
From: denis at fedoraproject.org (Denis Leroy)
Date: Tue, 20 Jan 2009 11:33:09 +0000 (UTC)
Subject: rpms/brasero/devel .cvsignore, 1.15, 1.16 brasero.spec, 1.32,
	1.33 sources, 1.15, 1.16
Message-ID: <20090120113309.BD529700F9@cvs1.fedora.phx.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/brasero/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7597

Modified Files:
	.cvsignore brasero.spec sources 
Log Message:
Update to upstream 0.9.1. Added development package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/brasero/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	17 Dec 2008 06:24:17 -0000	1.15
+++ .cvsignore	20 Jan 2009 11:32:38 -0000	1.16
@@ -1 +1 @@
-brasero-0.8.4.tar.bz2
+brasero-0.9.1.tar.bz2


Index: brasero.spec
===================================================================
RCS file: /cvs/pkgs/rpms/brasero/devel/brasero.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- brasero.spec	17 Dec 2008 06:24:17 -0000	1.32
+++ brasero.spec	20 Jan 2009 11:32:38 -0000	1.33
@@ -1,12 +1,12 @@
 
 Name:      brasero
-Version:   0.8.4
+Version:   0.9.1
 Release:   1%{?dist}
 Summary:   Gnome CD/DVD burning application
 Group:     Applications/Multimedia
 License:   GPLv2+
 URL:       http://www.gnome.org/projects/brasero/
-Source0:   http://ftp.gnome.org/pub/GNOME/sources/brasero/0.8/%{name}-%{version}.tar.bz2
+Source0:   http://ftp.gnome.org/pub/GNOME/sources/brasero/0.9/%{name}-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  glib2-devel >= 2.15.6
@@ -26,10 +26,12 @@
 BuildRequires:  dbus-glib-devel >= 0.7.2
 BuildRequires:  gnome-doc-utils >= 0.3.2
 BuildRequires:  scrollkeeper
+BuildRequires:  libxslt
 BuildRequires:  libburn-devel >= 0.4.0
 BuildRequires:  libisofs-devel >= 0.6.4
 BuildRequires:  nautilus-devel >= 2.22.2
 BuildRequires:  eel2-devel >= 2.13.3
+BuildRequires:  libSM-devel
 
 Requires:  dvd+rw-tools
 Requires:  cdrecord
@@ -49,19 +51,30 @@
 desktop.
 
 
+%package        devel
+Summary:        Headers for developing programs that will use %{name}
+Group:          Development/Libraries
+Requires:       %{name} = %{version}-%{release}
+Requires:       pkgconfig
+
+
+%description devel
+This package contains the static libraries and header files needed for
+developing brasero applications.
+
+
 %prep
 %setup -q
 
 
 %build
 %configure \
-	--enable-dbus \
-	--enable-nautilus \
-	--enable-preview \
-	--disable-caches \
-	--disable-static \
-	--disable-schemas-install
-
+        --enable-nautilus \
+        --enable-preview \
+        --disable-caches \
+        --disable-static \
+        --disable-schemas-install
+sed -i -e 's! -shared ! -Wl,--as-needed\0!g' libtool
 make %{?_smp_mflags}
 
 
@@ -85,6 +98,7 @@
 
 %post
 umask 022
+/sbin/ldconfig
 update-mime-database %{_datadir}/mime &> /dev/null || :
 touch --no-create %{_datadir}/icons/hicolor || :
 if [ -x %{_bindir}/gtk-update-icon-cache ]; then
@@ -109,6 +123,7 @@
   gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/%{name}.schemas >/dev/null || :
   killall -HUP gconfd-2 &>/dev/null || :
 fi
+/sbin/ldconfig
 
 
 %preun
@@ -124,6 +139,7 @@
 %doc AUTHORS COPYING ChangeLog NEWS README
 %{_mandir}/man1/%{name}.*
 %{_bindir}/*
+%{_libdir}/*.so.*
 %{_libdir}/%{name}
 %{_libdir}/nautilus/extensions-2.0/*.so
 %{_datadir}/%{name}
@@ -135,7 +151,19 @@
 %config %{_sysconfdir}/gconf/schemas/%{name}.schemas
 
 
+%files devel
+%defattr(-,root,root,-)
+%doc %{_datadir}/gtk-doc/html/brasero
+%{_includedir}/brasero
+%{_libdir}/*.so
+%{_libdir}/pkgconfig/*.pc
+
+
 %changelog
+* Tue Jan 20 2009 Denis Leroy <denis at poolshark.org> - 0.9.1-1
+- Update to upstream 0.9.1
+- Added development package
+
 * Tue Dec 16 2008 Denis Leroy <denis at poolshark.org> - 0.8.3-1
 - Update to upstream 0.8.4
 - Enabled nautilus extension


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/brasero/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	17 Dec 2008 06:24:17 -0000	1.15
+++ sources	20 Jan 2009 11:32:38 -0000	1.16
@@ -1 +1 @@
-5d0ad796e1f7b68a31f8757f1b3f9aef  brasero-0.8.4.tar.bz2
+1b9432a5ac81a7b6d09b68887994f5c5  brasero-0.9.1.tar.bz2



From steved at fedoraproject.org  Tue Jan 20 11:34:59 2009
From: steved at fedoraproject.org (Steve Dickson)
Date: Tue, 20 Jan 2009 11:34:59 +0000 (UTC)
Subject: rpms/nfs-utils/devel nfs-utils-1.1.4-tcpwrap-rulecheck.patch, NONE, 
	1.1 nfs-utils.spec, 1.207, 1.208
Message-ID: <20090120113459.6B9CC700F9@cvs1.fedora.phx.redhat.com>

Author: steved

Update of /cvs/pkgs/rpms/nfs-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8095

Modified Files:
	nfs-utils.spec 
Added Files:
	nfs-utils-1.1.4-tcpwrap-rulecheck.patch 
Log Message:
mountd: Don't do tcp wrapper check when there are no rules (bz 448898)


nfs-utils-1.1.4-tcpwrap-rulecheck.patch:

--- NEW FILE nfs-utils-1.1.4-tcpwrap-rulecheck.patch ---
commit 5f09a2bacb4bf0a906e2d19931568b91fb6c5088
Author: Steve Dickson <steved at redhat.com>
Date:   Tue Jan 20 06:16:56 2009 -0500

    mountd: Don't do tcp wrapper check when there are no rules
    
    If there are no rules in either /etc/hosts.deny or
    /etc/hosts.allow there is no need to do the host validation.
    
    Signed-off-by: Steve Dickson <steved at redhat.com>

diff -up nfs-utils-1.1.4/support/misc/tcpwrapper.c.orig nfs-utils-1.1.4/support/misc/tcpwrapper.c
--- nfs-utils-1.1.4/support/misc/tcpwrapper.c.orig	2009-01-07 12:56:07.000000000 -0500
+++ nfs-utils-1.1.4/support/misc/tcpwrapper.c	2009-01-20 06:00:38.000000000 -0500
@@ -34,6 +34,7 @@
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
+#include <stdio.h>
 #include <tcpwrapper.h>
 #include <unistd.h>
 #include <string.h>
@@ -55,6 +56,8 @@
 #include <rpc/rpcent.h>
 #endif
 
+static int check_files(void);
+static int check_rules(void);
 static void logit(int severity, struct sockaddr_in *addr,
 		  u_long procnum, u_long prognum, char *text);
 static void toggle_verboselog(int sig);
@@ -261,8 +264,40 @@ void    check_startup(void)
     (void) signal(SIGINT, toggle_verboselog);
 }
 
-/* check_files - check to see if either access files have changed */
+/*
+ * check_rules - check to see if any entries exist in
+ * either hosts file.
+ */
+int check_rules()
+{
+	FILE *fp;
+	char buf[BUFSIZ];
+
+	if ((fp = fopen("/etc/hosts.allow", "r")) == NULL)
+		return 0;
+
+	while (fgets(buf, BUFSIZ, fp) != NULL) {
+		if (buf[0] == '#')
+			continue;
+		fclose(fp);
+		return 1;
+	}
+	fclose(fp);
+
+	if ((fp = fopen("/etc/hosts.deny", "r")) == NULL)
+		return 0;
+
+	while (fgets(buf, BUFSIZ, fp) != NULL) {
+		if (buf[0] == '#')
+			continue;
+		fclose(fp);
+		return 1;
+	}
+	fclose(fp);
+	return 0;
+}
 
+/* check_files - check to see if either access files have changed */
 int check_files()
 {
 	static time_t allow_mtime, deny_mtime;
@@ -304,6 +339,13 @@ u_long  prog;
 	if (acc && changed == 0)
 		return (acc->access);
 
+	/*
+	 * See if there are any rules to be applied,
+	 * if not, no need to check the address
+	 */
+	if (check_rules() == 0)
+		goto done;
+
 	if (!(from_local(addr) || good_client(daemon, addr))) {
 		log_bad_host(addr, proc, prog);
 		if (acc)
@@ -315,10 +357,12 @@ u_long  prog;
 	if (verboselog)
 		log_client(addr, proc, prog);
 
+done:
 	if (acc)
 		acc->access = TRUE;
 	else 
 		haccess_add(addr, proc, prog, TRUE);
+
     return (TRUE);
 }
 


Index: nfs-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nfs-utils/devel/nfs-utils.spec,v
retrieving revision 1.207
retrieving revision 1.208
diff -u -r1.207 -r1.208
--- nfs-utils.spec	7 Jan 2009 17:58:48 -0000	1.207
+++ nfs-utils.spec	20 Jan 2009 11:34:28 -0000	1.208
@@ -2,7 +2,7 @@
 Name: nfs-utils
 URL: http://sourceforge.net/projects/nfs
 Version: 1.1.4
-Release: 12%{?dist}
+Release: 13%{?dist}
 Epoch: 1
 
 # group all 32bit related archs
@@ -44,6 +44,7 @@
 Patch115: nfs-utils-1.1.4-mount-addrconfig.patch
 Patch116: nfs-utils-1.1.4-configure-uuid.patch
 Patch117: nfs-utils-1.1.4-configure-tirpc.patch
+Patch118: nfs-utils-1.1.4-tcpwrap-rulecheck.patch
 
 %if %{enablefscache}
 Patch90: nfs-utils-1.1.0-mount-fsc.patch
@@ -116,6 +117,7 @@
 %patch115 -p1
 %patch116 -p1
 %patch117 -p1
+%patch118 -p1
 
 %if %{enablefscache}
 %patch90 -p1
@@ -279,6 +281,9 @@
 %attr(4755,root,root)   /sbin/umount.nfs4
 
 %changelog
+* Tue Jan 20 2009 Steve Dickson <steved at redhat.com> 1.1.4-13
+- mountd: Don't do tcp wrapper check when there are no rules (bz 448898)
+
 * Wed Jan  7 2009 Steve Dickson <steved at redhat.com> 1.1.4-12
 - configure: Remove inet_ntop(3) check from configure.ac
 - configure: Add new build option "--enable-tirpc"



From mkasik at fedoraproject.org  Tue Jan 20 11:45:36 2009
From: mkasik at fedoraproject.org (=?utf-8?b?TWFyZWsgS2HFocOtaw==?=)
Date: Tue, 20 Jan 2009 11:45:36 +0000 (UTC)
Subject: rpms/radial/devel radial-1.0.f,1.1,NONE radial.spec,1.1,NONE
Message-ID: <20090120114536.9FBD9700F9@cvs1.fedora.phx.redhat.com>

Author: mkasik

Update of /cvs/pkgs/rpms/radial/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9915

Removed Files:
	radial-1.0.f radial.spec 
Log Message:
* Fri Sep 05 2008 Marek Kasik <mkasik at redhat.com>  1.0-1
- Revert of previous commit



--- radial-1.0.f DELETED ---


--- radial.spec DELETED ---



From erikos at fedoraproject.org  Tue Jan 20 11:55:24 2009
From: erikos at fedoraproject.org (Simon Schampijer)
Date: Tue, 20 Jan 2009 11:55:24 +0000 (UTC)
Subject: rpms/sugar-artwork/OLPC-4 .cvsignore, 1.12, 1.13 sources, 1.12,
	1.13 sugar-artwork.spec, 1.15, 1.16
Message-ID: <20090120115524.C42CF700F9@cvs1.fedora.phx.redhat.com>

Author: erikos

Update of /cvs/pkgs/rpms/sugar-artwork/OLPC-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11109

Modified Files:
	.cvsignore sources sugar-artwork.spec 
Log Message:
* Tue Jan 20 2009 Simon Schampijer <simon at laptop.org> - 0.83.3-1
- add activity-journal icon to artwork
- add system-logout icon (part of #207)
- add everything needed for the colorpicker. That is a small icon and a bit in the gtkrc.
- fix triangular arrows by looking at the parent_bg_color option
- add icons for object transfers




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-artwork/OLPC-4/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	22 Dec 2008 14:20:52 -0000	1.12
+++ .cvsignore	20 Jan 2009 11:54:54 -0000	1.13
@@ -1 +1 @@
-sugar-artwork-0.83.2.tar.bz2
+sugar-artwork-0.83.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-artwork/OLPC-4/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	22 Dec 2008 14:20:52 -0000	1.12
+++ sources	20 Jan 2009 11:54:54 -0000	1.13
@@ -1 +1 @@
-89219be4549bc6cb6a59062d06bec1e4  sugar-artwork-0.83.2.tar.bz2
+997a79f3a80ee77fa9335b20b2f3c321  sugar-artwork-0.83.3.tar.bz2


Index: sugar-artwork.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-artwork/OLPC-4/sugar-artwork.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sugar-artwork.spec	22 Dec 2008 14:20:52 -0000	1.15
+++ sugar-artwork.spec	20 Jan 2009 11:54:54 -0000	1.16
@@ -3,7 +3,7 @@
 
 Summary: Artwork for Sugar look-and-feel
 Name: sugar-artwork
-Version: 0.83.2
+Version: 0.83.3
 Release: 1%{?dist}
 #Release: 1.%{alphatag}%{?dist}
 URL: http://sugarlabs.org
@@ -64,6 +64,13 @@
 %{_libdir}/gtk-2.0/*/engines/*.so
 
 %changelog
+* Tue Jan 20 2009 Simon Schampijer <simon at laptop.org> - 0.83.3-1
+- add activity-journal icon to artwork
+- add system-logout icon (part of #207)
+- add everything needed for the colorpicker. That is a small icon and a bit in the gtkrc.
+- fix triangular arrows by looking at the parent_bg_color option
+- add icons for object transfers 
+
 * Mon Dec 22 2008 Simon Schampijer <simon at laptop.org> - 0.83.2-1
 - New icon for the wired network
 



From harald at fedoraproject.org  Tue Jan 20 11:59:24 2009
From: harald at fedoraproject.org (Harald Hoyer)
Date: Tue, 20 Jan 2009 11:59:24 +0000 (UTC)
Subject: rpms/udev/devel .cvsignore, 1.55, 1.56 sources, 1.55, 1.56 udev.spec,
	1.258, 1.259
Message-ID: <20090120115924.3F12B700F9@cvs1.fedora.phx.redhat.com>

Author: harald

Update of /cvs/pkgs/rpms/udev/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11767

Modified Files:
	.cvsignore sources udev.spec 
Log Message:
* Tue Jan 20 2009 Harald Hoyer <harald at redhat.com> 136-1
- test for restorecon in start_udev before it is used (bug #480608)
- added groups video audio cdrom tape dialout in post
  (might be moved to MAKEDEV)
- version 136



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/udev/devel/.cvsignore,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- .cvsignore	2 Dec 2008 10:22:49 -0000	1.55
+++ .cvsignore	20 Jan 2009 11:58:53 -0000	1.56
@@ -1 +1 @@
-udev-135.tar.bz2
+udev-136.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/udev/devel/sources,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- sources	2 Dec 2008 10:22:49 -0000	1.55
+++ sources	20 Jan 2009 11:58:53 -0000	1.56
@@ -1 +1 @@
-661b9df34e1304dad10f595d95b472bb  udev-135.tar.bz2
+9a27ccd96cf8d529c4e424520547b72a  udev-136.tar.bz2


Index: udev.spec
===================================================================
RCS file: /cvs/pkgs/rpms/udev/devel/udev.spec,v
retrieving revision 1.258
retrieving revision 1.259
diff -u -r1.258 -r1.259
--- udev.spec	16 Dec 2008 16:04:52 -0000	1.258
+++ udev.spec	20 Jan 2009 11:58:53 -0000	1.259
@@ -5,8 +5,8 @@
 
 Summary: A userspace implementation of devfs
 Name: udev
-Version: 135
-Release: 3%{?dist}
+Version: 136
+Release: 1%{?dist}
 License: GPLv2
 Group: System Environment/Base
 Provides: udev-persistent = %{version}-%{release}
@@ -18,14 +18,13 @@
 Source4: fw_unit_symlinks.sh
 Source5: udev.sysconfig
 
-Patch1: udev-135-sepol.patch
 Patch102: udev-118-sysconf.patch
 
 ExclusiveOS: Linux
 URL: http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires(pre): /bin/sh fileutils /sbin/chkconfig /sbin/service
-Requires(pre): MAKEDEV >= 0:3.11
+Requires(pre): MAKEDEV >= 0:3.11 /usr/bin/getent /usr/sbin/groupadd
 BuildRequires: sed libselinux-devel >= 0:1.17.9-2 flex libsepol-devel
 BuildRequires: glib2-devel bison findutils MAKEDEV
 %if %{with_static}
@@ -89,19 +88,13 @@
 This package contains the development files for the library libudev, a
 dynamic library, which provides access to udev device information.
 
-
 %prep
 %setup -q  
-%if %{with_static}
-%patch1 -p1 -b .sepol
-%endif
 %patch102 -p1 -b .sysconf
 rm rules/redhat/95-pam-console.rules
 
 %build
 %if %{with_static}
-libtoolize -f
-autoreconf 
 %configure --with-selinux  --prefix=%{_prefix} --exec-prefix="" --sysconfdir=%{_sysconfdir} --with-libdir-name=%{_lib}  --sbindir="/sbin" --enable-static
 make LDFLAGS="-all-static" %{?_smp_mflags}
 for i in udev/udevd \
@@ -117,6 +110,8 @@
 	mv $i $i.static
 done
 make clean
+%else
+%configure --with-selinux  --prefix=%{_prefix} --exec-prefix="" --sysconfdir=%{_sysconfdir} --with-libdir-name=%{_lib}  --sbindir="/sbin" 
 %endif
 make %{?_smp_mflags}
 
@@ -232,6 +227,15 @@
 fi
 
 /sbin/chkconfig --add udev-post
+
+# to be removed after F10 EOL (and for RHEL-6)
+getent group video >/dev/null || /usr/sbin/groupadd -g 39 video || :
+getent group audio >/dev/null || /usr/sbin/groupadd -g 63 audio || :
+# to be kept
+getent group cdrom >/dev/null || /usr/sbin/groupadd -g 11 cdrom || :
+getent group tape >/dev/null || /usr/sbin/groupadd -g 33 tape || :
+getent group dialout >/dev/null || /usr/sbin/groupadd -g 87 dialout || :
+
 exit 0
 
 %triggerpostun -- dev <= 0:3.12-1
@@ -374,6 +378,12 @@
 
 
 %changelog
+* Tue Jan 20 2009 Harald Hoyer <harald at redhat.com> 136-1
+- test for restorecon in start_udev before it is used (bug #480608)
+- added groups video audio cdrom tape dialout in post
+  (might be moved to MAKEDEV)
+- version 136
+
 * Tue Dec 16 2008 Harald Hoyer <harald at redhat.com> 135-3
 - added sepol patch
 



From mkasik at fedoraproject.org  Tue Jan 20 12:00:24 2009
From: mkasik at fedoraproject.org (=?utf-8?b?TWFyZWsgS2HFocOtaw==?=)
Date: Tue, 20 Jan 2009 12:00:24 +0000 (UTC)
Subject: rpms/radial/devel import.log, NONE, 1.1 radial-1.0.f, 1.2,
	1.3 radial.spec, 1.2, 1.3 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090120120024.8EF38700F9@cvs1.fedora.phx.redhat.com>

Author: mkasik

Update of /cvs/pkgs/rpms/radial/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11548/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log radial-1.0.f radial.spec 
Log Message:
* Fri Sep 05 2008 Marek Kasik <mkasik at redhat.com>  1.0-1
- Initial Fedora Release
- Modified Files:
    devel/.cvsignore devel/sources 
- Added Files:
    devel/import.log devel/radial-1.0.f devel/radial.spec 




--- NEW FILE import.log ---
radial-1_0-1_fc10:HEAD:radial-1.0-1.src.rpm:1232452179


Index: radial-1.0.f
===================================================================
RCS file: radial-1.0.f
diff -N radial-1.0.f
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ radial-1.0.f	20 Jan 2009 11:59:54 -0000	1.3
@@ -0,0 +1,200 @@
+	program radial3
+	print*, " "
+	print*, " "
+	print*, "------------------------------------------------------"
+	print*, " "
+	print*, "                Welcome to  Jamie's                   "
+	print*, "          FABULOUS RADIAL VELOCITY PROGRAM!           "
+	print*, "                                                      "
+	print*, "   This program calculates the radial velocities of   "
+	print*, "   both stars in a binary system, allowing for user   "
+	print*, "   configuration of stellar masses, semimajor axis,   "
+	print*, "  inclination of orbital plane, orbital eccentricity, "
+	print*, "   time to collect data, and calculation frequency.   "
+	print*, "   "
+	print*, "   For your convenience, default values have been"
+	print*, "   added to the program, so you can run it with"
+	print*, "   nothing other than variable eccentricity, if you like."
+	print*, " "
+	print*, "   This program is free, but donations are welcome. :)"
+	print*, " "
+	print*, "   Have fun!"
+	print*, " "
+	print*, "------------------------------------------------------"
+	print*, " "
+   10	print*, " "
+	print*, "Would you like to accept this program's default values"
+	print*, "or run a custom configuration?"
+	print*, ""
+	print*, "            1 - Accept Default Values"
+	print*, "            2 - Custom Configuration"
+	print*, "           "
+	read*, cust
+	print*, " "
+	print*, " "
+c	
+c  DEFAULT VALUES:
+c	
+		pi = 3.141592654
+		units = 4.74017744
+		wt1 = 0.5
+		wt2 = 2.0
+		axis = 2.0
+		yrs = 5
+		q = 4
+		tilt = 30
+		what2chg = 0
+c 	
+	    if (cust.eq.1) goto 70
+   20		print*, "STELLAR MASSES ..."
+           	print*, " "
+		print*, "     How massive would you like your stars to be?"
+		print*, "     (In Solar Masses)"
+		print*, " "
+		print*, "Star 1:"
+		read*, wt1
+		print*, "Star 2:"
+		read*, wt2
+		print*, " "
+		print*, " "
+		    if (what2chg.eq.1) goto 80
+   30		print*, "SEMIMAJOR AXIS ..."
+		print*, "     "
+		print*, "     Please specify a semimajor axis. (In AU)"
+		print*, " "
+		read*, axis
+		print*, " "
+		print*, " "
+		    if (what2chg.eq.2) goto 80
+   40		print*, "ORBITAL INCLINATION ..."
+		print*, "     "
+		print*, "     How far would you like your orbital plane to"
+		print*, "     be inclined? (degrees)"
+		print*, " "
+		read*, tilt
+		print*, " "
+		print*, " "
+		    if (what2chg.eq.3) goto 80
+   50		print*, "LENGTH OF TIME FOR WHICH TO CALCULATE ... "
+		print*, " "
+		print*, "     For how many years would you like to watch?"
+		print*, " "
+		read*, yrs
+		print*, " "
+		print*, " "
+		    if (what2chg.eq.4) goto 80
+   60		print*, "FREQUENCY OF CALCULATIONS ..."
+		print*, " "
+		print*, "     How many times per year should I calculate?"
+		print*, " "
+		read*, q
+		    if (what2chg.eq.5) goto 80
+	print*, " "
+	print*, " "
+   70	print*, "ORBITAL ECCENTRICITY ..."
+	print*, " "
+	print*, "     Please enter an orbital eccentricity."
+	print*, "     (Must be less than 1. Use 0 for circular orbit.)"
+	print*, " "
+	read*, ecc
+	print*, " "
+   80	print*, " "	
+c
+c COMPUTE axrat, A1, A2, and SEE
+c
+		axrat = wt1/wt2	
+		ax1 = axis/(1+axrat)
+		ax2 = (axis*axrat)/(1+axrat)
+		see = 1/q
+		tilt = (6.283185/360)*tilt
+c
+	print*, "Here are the values you have chosen:"
+	print*, " "
+	print*, "-------------------------------------------------------"
+	print*, "       Mass of star 1:  ",wt1," Solar Masses"
+	print*, "       Mass of star 2:  ",wt2," Solar Masses"
+	print*, " "
+	print*, "       Semimajor axis:  ",axis," AU"
+	print*, "	     for star1:  ",ax1," AU"
+	print*, "            for star2:  ",ax2," AU"
+	print*, " "
+	print*, "       Orbital Eccentricity:  ",ecc
+	print*, "        Orbital Inclination:  ",tilt
+	print*, " "
+	print*, "          sin(tilt) = ",sin(tilt)	
+	print*, " "
+	print*, "       Time to watch:  ",yrs," yrs"
+	print*, "                       ",q," times per year"
+	print*, "-------------------------------------------------------"
+	print*, " "
+	print*, "Are these values OK?"
+	print*, " "
+	print*, "             1 - These are good, calculate!"
+	print*, "             2 - I want to change something."
+	print*, " "
+	read*, change
+	print*, " "
+	    if (change.eq.2) then
+	    	print*, " "
+	    	print*, "What would you like to change?"
+		print*, " "
+		print*, "              1 - Stellar Masses"
+		print*, "              2 - Semimajor Axis"
+		print*, "              3 - Orbital Inclination"
+		print*, "              4 - Time to Watch"
+		print*, "              5 - Frequency of Calculation"
+		print*, "	       6 - Orbital Eccentricity"
+		print*, "              7 - Everything"
+		print*, "              0 - Nothing, I lied. Calculate!"
+		print*, " "
+		read*, what2chg
+		print*, " "
+		print*, " "
+		    if (what2chg.eq.1) goto 20
+		    if (what2chg.eq.2) goto 30
+		    if (what2chg.eq.3) goto 40
+		    if (what2chg.eq.4) goto 50
+		    if (what2chg.eq.5) goto 60
+		    if (what2chg.eq.6) goto 70
+		    if (what2chg.eq.7) goto 10
+	    endif
+	    what2chg = 0
+	print*, "Processing input, calculating velocities ... please wait."
+	print*, " "
+	print*, " "
+	print*, " Time (yrs)    V1r (km/s)       V2r (km/s)     theta (deg)"
+	print*, "=========================================================="         
+c
+c CALCULATE THE VELOCITIES
+c
+	do p=0.00, yrs, see
+		theta = 2*pi*(axis**(-3/2))*p
+		tht = 360*(axis**(-3/2))*p
+		top = 2*pi*ax1*(1-(ecc**2))*(sin(tilt))*units
+		bot = (axis**(3/2))*(1+(ecc*(cos(theta))))
+		v1r = (top*(cos(theta)))/bot
+		v2r = (top*axrat*(cos(theta+pi)))/bot
+c debugging	print*, top," ",brt," ",bot
+		print*, "  ",p,"      ",v1r,"         ",v2r,"      ",tht
+	enddo
+	print*, "==========================================================="
+	print*, " "	
+	print*, " "
+	print*, "  Would you like to play again?"
+	print*, " "
+	print*, "                1 - Yes, this was fun! Do it again!"
+	print*, "                2 - No, it was lame. I want to leave."
+	print*, " "
+	read*, play
+		if (play.eq.1) goto 10
+	print*, " "
+	print*, " "
+	print*, "Thanks for using Jamie's Fabulous Radial Velocity Program!"
+	print*, " "
+	print*, "Send questions, comments, money, food, clothing, books,"
+	print*, "or anything else to:   hegarty at nhn.ou.edu"
+	print*, " "
+	print*, "Bye!"
+	print*, " "
+	print*, " "
+	end


Index: radial.spec
===================================================================
RCS file: radial.spec
diff -N radial.spec
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ radial.spec	20 Jan 2009 11:59:54 -0000	1.3
@@ -0,0 +1,47 @@
+Summary: A simple program for calculating radial velocities of stars in a binary system
+Name: radial
+Version: 1.0
+Release: 1%{?dist}
+License: Freely redistributable without restriction
+Group: Applications/Engineering
+Url: http://www.nhn.ou.edu/~hegarty/radial/
+Source0: http://www.nhn.ou.edu/~hegarty/radial/%{name}-%{version}.tar.gz
+Source1: http://www.nhn.ou.edu/~hegarty/radial/%{name}-%{version}.f
+
+Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires: gcc-gfortran
+
+%description
+This program calculates the radial velocities of
+both stars in a binary system, allowing for user
+configuration of stellar masses, semimajor axis,
+inclination of orbital plane, orbital eccentricity,
+time to collect data, and calculation frequency.
+
+For your convenience, default values have been
+added to the program, so you can run it with
+nothing other than variable eccentricity, if you like.
+
+%prep
+%setup -q -c
+cp -a %{SOURCE1} .
+
+%build
+gfortran %{optflags} -ffixed-line-length-none -o radial %{name}-%{version}.f
+
+%install
+rm -rf $RPM_BUILD_ROOT
+mkdir -p $RPM_BUILD_ROOT%{_bindir}
+install -p -m 0755 %{name} $RPM_BUILD_ROOT%{_bindir}/%{name}
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%files
+%defattr(-,root,root,-)
+%doc README INSTALL
+%{_bindir}/radial
+
+%changelog
+* Fri Sep 05 2008 Marek Kasik <mkasik at redhat.com>  1.0-1
+- Initial Fedora Release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/radial/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	19 Jan 2009 23:20:10 -0000	1.1
+++ .cvsignore	20 Jan 2009 11:59:54 -0000	1.2
@@ -0,0 +1 @@
+radial-1.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/radial/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	19 Jan 2009 23:20:10 -0000	1.1
+++ sources	20 Jan 2009 11:59:54 -0000	1.2
@@ -0,0 +1 @@
+ae4117da57e19b74db72df2d94ccb1fd  radial-1.0.tar.gz



From erikos at fedoraproject.org  Tue Jan 20 12:05:19 2009
From: erikos at fedoraproject.org (Simon Schampijer)
Date: Tue, 20 Jan 2009 12:05:19 +0000 (UTC)
Subject: rpms/sugar-datastore/OLPC-4 .cvsignore, 1.8, 1.9 sources, 1.8,
	1.9 sugar-datastore.spec, 1.9, 1.10
Message-ID: <20090120120519.E634C70141@cvs1.fedora.phx.redhat.com>

Author: erikos

Update of /cvs/pkgs/rpms/sugar-datastore/OLPC-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12833

Modified Files:
	.cvsignore sources sugar-datastore.spec 
Log Message:
* Tue Jan 20 2009 Simon Schampijer <simon at laptop.org> - 0.83.2-1
- #181 replace deprecated os.popen by subprocess
- #140 crash when joining a shared Read




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-datastore/OLPC-4/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	22 Dec 2008 14:48:32 -0000	1.8
+++ .cvsignore	20 Jan 2009 12:04:48 -0000	1.9
@@ -1 +1 @@
-sugar-datastore-0.83.1.tar.bz2
+sugar-datastore-0.83.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-datastore/OLPC-4/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	22 Dec 2008 14:48:32 -0000	1.8
+++ sources	20 Jan 2009 12:04:48 -0000	1.9
@@ -1 +1 @@
-31f1b45406d42207ffcec8f3829dc12b  sugar-datastore-0.83.1.tar.bz2
+814f81e10266e85c89ae3e5550d7fa69  sugar-datastore-0.83.2.tar.bz2


Index: sugar-datastore.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-datastore/OLPC-4/sugar-datastore.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sugar-datastore.spec	22 Dec 2008 14:48:32 -0000	1.9
+++ sugar-datastore.spec	20 Jan 2009 12:04:48 -0000	1.10
@@ -1,7 +1,7 @@
 %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")
 
 Name: sugar-datastore
-Version: 0.83.1
+Version: 0.83.2
 Release: 1%{?dist}
 Summary: Sugar Datastore
 
@@ -46,6 +46,10 @@
 %{_datadir}/dbus-1/services/*.service
 
 %changelog
+* Tue Jan 20 2009 Simon Schampijer <simon at laptop.org> - 0.83.2-1
+- #181 replace deprecated os.popen by subprocess
+- #140 crash when joining a shared Read
+
 * Mon Dec 22 2008 Simon Schampijer <simon at laptop.org> - 0.83.1-1
 - contains a bunch of stability and robustness improvements 
 



From mtasaka at fedoraproject.org  Tue Jan 20 12:06:17 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Tue, 20 Jan 2009 12:06:17 +0000 (UTC)
Subject: rpms/cmigemo/devel cmigemo.spec,1.6,1.7
Message-ID: <20090120120617.E5A8B70141@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/cmigemo/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13123/devel

Modified Files:
	cmigemo.spec 
Log Message:
* Tue Jan 20 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.3-0.7.c_MIT
- Also install zen2han (JD 6 comment 976)



Index: cmigemo.spec
===================================================================
RCS file: /cvs/extras/rpms/cmigemo/devel/cmigemo.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- cmigemo.spec	9 Feb 2008 04:20:52 -0000	1.6
+++ cmigemo.spec	20 Jan 2009 12:06:16 -0000	1.7
@@ -2,7 +2,7 @@
 %define		minorver	c-MIT
 %define		prerelease	1
 
-%define		fedorarel	6
+%define		fedorarel	7
 
 
 %define		uprel		%(echo %{?minorver} | %{__sed} -e 's|^--*||' | %{__sed} -e 's|-|_|g' )
@@ -14,7 +14,7 @@
 
 Name:		cmigemo
 Version:	%{mainver}
-Release:	%{rel}%{?dist}.2
+Release:	%{rel}%{?dist}
 Summary:	C interface of Ruby/Migemo Japanese incremental search tool
 
 Group:		System Environment/Libraries
@@ -47,7 +47,7 @@
 %patch1 -p1 -b .escape
 
 # Change default command for configure
-%{__sed} -i.bak \
+%{__sed} -i.command \
 	-e 's|curl|true|' \
 	-e 's|nkf|true|' \
 	-e 's|install\"|install -p"|' \
@@ -79,6 +79,11 @@
 	-e 's|\$(prefix)/lib|$(prefix)/%{_lib}|' \
 	config.mk compile/config.mk.in compile/config_default.mk
 
+# Also install zen2han
+%{__sed} -i.han \
+	-e 's|^\(.*\)\(han2zen\)\(.*\)$|\1\2\3\n\1zen2han\3|' \
+	compile/unix.mak
+
 %{__chmod} 0644 tools/*
 
 %build
@@ -132,6 +137,9 @@
 %{_libdir}/libmigemo.so
 
 %changelog
+* Tue Jan 20 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.3-0.7.c_MIT
+- Also install zen2han (JD 6 comment 976)
+
 * Sat Feb  9 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
 - Rebuild against gcc43
 



From mtasaka at fedoraproject.org  Tue Jan 20 12:06:46 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Tue, 20 Jan 2009 12:06:46 +0000 (UTC)
Subject: rpms/cmigemo/F-10 cmigemo.spec,1.6,1.7
Message-ID: <20090120120646.214B6700F9@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/cmigemo/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13123/F-10

Modified Files:
	cmigemo.spec 
Log Message:
* Tue Jan 20 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.3-0.7.c_MIT
- Also install zen2han (JD 6 comment 976)



Index: cmigemo.spec
===================================================================
RCS file: /cvs/extras/rpms/cmigemo/F-10/cmigemo.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- cmigemo.spec	9 Feb 2008 04:20:52 -0000	1.6
+++ cmigemo.spec	20 Jan 2009 12:06:15 -0000	1.7
@@ -2,7 +2,7 @@
 %define		minorver	c-MIT
 %define		prerelease	1
 
-%define		fedorarel	6
+%define		fedorarel	7
 
 
 %define		uprel		%(echo %{?minorver} | %{__sed} -e 's|^--*||' | %{__sed} -e 's|-|_|g' )
@@ -14,7 +14,7 @@
 
 Name:		cmigemo
 Version:	%{mainver}
-Release:	%{rel}%{?dist}.2
+Release:	%{rel}%{?dist}
 Summary:	C interface of Ruby/Migemo Japanese incremental search tool
 
 Group:		System Environment/Libraries
@@ -47,7 +47,7 @@
 %patch1 -p1 -b .escape
 
 # Change default command for configure
-%{__sed} -i.bak \
+%{__sed} -i.command \
 	-e 's|curl|true|' \
 	-e 's|nkf|true|' \
 	-e 's|install\"|install -p"|' \
@@ -79,6 +79,11 @@
 	-e 's|\$(prefix)/lib|$(prefix)/%{_lib}|' \
 	config.mk compile/config.mk.in compile/config_default.mk
 
+# Also install zen2han
+%{__sed} -i.han \
+	-e 's|^\(.*\)\(han2zen\)\(.*\)$|\1\2\3\n\1zen2han\3|' \
+	compile/unix.mak
+
 %{__chmod} 0644 tools/*
 
 %build
@@ -132,6 +137,9 @@
 %{_libdir}/libmigemo.so
 
 %changelog
+* Tue Jan 20 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.3-0.7.c_MIT
+- Also install zen2han (JD 6 comment 976)
+
 * Sat Feb  9 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
 - Rebuild against gcc43
 



From mtasaka at fedoraproject.org  Tue Jan 20 12:06:46 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Tue, 20 Jan 2009 12:06:46 +0000 (UTC)
Subject: rpms/cmigemo/F-9 cmigemo.spec,1.6,1.7
Message-ID: <20090120120646.BA8EC700F9@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/cmigemo/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13123/F-9

Modified Files:
	cmigemo.spec 
Log Message:
* Tue Jan 20 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.3-0.7.c_MIT
- Also install zen2han (JD 6 comment 976)



Index: cmigemo.spec
===================================================================
RCS file: /cvs/extras/rpms/cmigemo/F-9/cmigemo.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- cmigemo.spec	9 Feb 2008 04:20:52 -0000	1.6
+++ cmigemo.spec	20 Jan 2009 12:06:16 -0000	1.7
@@ -2,7 +2,7 @@
 %define		minorver	c-MIT
 %define		prerelease	1
 
-%define		fedorarel	6
+%define		fedorarel	7
 
 
 %define		uprel		%(echo %{?minorver} | %{__sed} -e 's|^--*||' | %{__sed} -e 's|-|_|g' )
@@ -14,7 +14,7 @@
 
 Name:		cmigemo
 Version:	%{mainver}
-Release:	%{rel}%{?dist}.2
+Release:	%{rel}%{?dist}
 Summary:	C interface of Ruby/Migemo Japanese incremental search tool
 
 Group:		System Environment/Libraries
@@ -47,7 +47,7 @@
 %patch1 -p1 -b .escape
 
 # Change default command for configure
-%{__sed} -i.bak \
+%{__sed} -i.command \
 	-e 's|curl|true|' \
 	-e 's|nkf|true|' \
 	-e 's|install\"|install -p"|' \
@@ -79,6 +79,11 @@
 	-e 's|\$(prefix)/lib|$(prefix)/%{_lib}|' \
 	config.mk compile/config.mk.in compile/config_default.mk
 
+# Also install zen2han
+%{__sed} -i.han \
+	-e 's|^\(.*\)\(han2zen\)\(.*\)$|\1\2\3\n\1zen2han\3|' \
+	compile/unix.mak
+
 %{__chmod} 0644 tools/*
 
 %build
@@ -132,6 +137,9 @@
 %{_libdir}/libmigemo.so
 
 %changelog
+* Tue Jan 20 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.3-0.7.c_MIT
+- Also install zen2han (JD 6 comment 976)
+
 * Sat Feb  9 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
 - Rebuild against gcc43
 



From steved at fedoraproject.org  Tue Jan 20 12:06:53 2009
From: steved at fedoraproject.org (Steve Dickson)
Date: Tue, 20 Jan 2009 12:06:53 +0000 (UTC)
Subject: rpms/nfs-utils/F-10 nfs-utils-1.1.4-tcpwrap-rulecheck.patch, NONE, 
	1.1 nfs-utils.spec, 1.198, 1.199
Message-ID: <20090120120653.E106B700F9@cvs1.fedora.phx.redhat.com>

Author: steved

Update of /cvs/pkgs/rpms/nfs-utils/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13507

Modified Files:
	nfs-utils.spec 
Added Files:
	nfs-utils-1.1.4-tcpwrap-rulecheck.patch 
Log Message:
mountd: Don't do tcp wrapper check when there are no rules (bz 448898)


nfs-utils-1.1.4-tcpwrap-rulecheck.patch:

--- NEW FILE nfs-utils-1.1.4-tcpwrap-rulecheck.patch ---
commit 5f09a2bacb4bf0a906e2d19931568b91fb6c5088
Author: Steve Dickson <steved at redhat.com>
Date:   Tue Jan 20 06:16:56 2009 -0500

    mountd: Don't do tcp wrapper check when there are no rules
    
    If there are no rules in either /etc/hosts.deny or
    /etc/hosts.allow there is no need to do the host validation.
    
    Signed-off-by: Steve Dickson <steved at redhat.com>

diff -up nfs-utils-1.1.4/support/misc/tcpwrapper.c.orig nfs-utils-1.1.4/support/misc/tcpwrapper.c
--- nfs-utils-1.1.4/support/misc/tcpwrapper.c.orig	2009-01-07 12:56:07.000000000 -0500
+++ nfs-utils-1.1.4/support/misc/tcpwrapper.c	2009-01-20 06:00:38.000000000 -0500
@@ -34,6 +34,7 @@
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
+#include <stdio.h>
 #include <tcpwrapper.h>
 #include <unistd.h>
 #include <string.h>
@@ -55,6 +56,8 @@
 #include <rpc/rpcent.h>
 #endif
 
+static int check_files(void);
+static int check_rules(void);
 static void logit(int severity, struct sockaddr_in *addr,
 		  u_long procnum, u_long prognum, char *text);
 static void toggle_verboselog(int sig);
@@ -261,8 +264,40 @@ void    check_startup(void)
     (void) signal(SIGINT, toggle_verboselog);
 }
 
-/* check_files - check to see if either access files have changed */
+/*
+ * check_rules - check to see if any entries exist in
+ * either hosts file.
+ */
+int check_rules()
+{
+	FILE *fp;
+	char buf[BUFSIZ];
+
+	if ((fp = fopen("/etc/hosts.allow", "r")) == NULL)
+		return 0;
+
+	while (fgets(buf, BUFSIZ, fp) != NULL) {
+		if (buf[0] == '#')
+			continue;
+		fclose(fp);
+		return 1;
+	}
+	fclose(fp);
+
+	if ((fp = fopen("/etc/hosts.deny", "r")) == NULL)
+		return 0;
+
+	while (fgets(buf, BUFSIZ, fp) != NULL) {
+		if (buf[0] == '#')
+			continue;
+		fclose(fp);
+		return 1;
+	}
+	fclose(fp);
+	return 0;
+}
 
+/* check_files - check to see if either access files have changed */
 int check_files()
 {
 	static time_t allow_mtime, deny_mtime;
@@ -304,6 +339,13 @@ u_long  prog;
 	if (acc && changed == 0)
 		return (acc->access);
 
+	/*
+	 * See if there are any rules to be applied,
+	 * if not, no need to check the address
+	 */
+	if (check_rules() == 0)
+		goto done;
+
 	if (!(from_local(addr) || good_client(daemon, addr))) {
 		log_bad_host(addr, proc, prog);
 		if (acc)
@@ -315,10 +357,12 @@ u_long  prog;
 	if (verboselog)
 		log_client(addr, proc, prog);
 
+done:
 	if (acc)
 		acc->access = TRUE;
 	else 
 		haccess_add(addr, proc, prog, TRUE);
+
     return (TRUE);
 }
 


Index: nfs-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nfs-utils/F-10/nfs-utils.spec,v
retrieving revision 1.198
retrieving revision 1.199
diff -u -r1.198 -r1.199
--- nfs-utils.spec	5 Jan 2009 19:33:04 -0000	1.198
+++ nfs-utils.spec	20 Jan 2009 12:06:23 -0000	1.199
@@ -2,7 +2,7 @@
 Name: nfs-utils
 URL: http://sourceforge.net/projects/nfs
 Version: 1.1.4
-Release: 6%{?dist}
+Release: 7%{?dist}
 Epoch: 1
 
 # group all 32bit related archs
@@ -30,6 +30,7 @@
 Patch05: nfs-utils-1.1.4-tcpwrapper-update.patch
 Patch06: nfs-utils-1.1.4-tcpwrap-warn.patch
 Patch07: nfs-utils-1.1.4-gssd-verbosity.patch
+Patch08: nfs-utils-1.1.4-tcpwrap-rulecheck.patch
 
 %if %{enablefscache}
 Patch90: nfs-utils-1.1.0-mount-fsc.patch
@@ -88,6 +89,7 @@
 %patch05 -p1
 %patch06 -p1
 %patch07 -p1
+%patch08 -p1
 
 %if %{enablefscache}
 %patch90 -p1
@@ -251,6 +253,9 @@
 %attr(4755,root,root)   /sbin/umount.nfs4
 
 %changelog
+* Tue Jan 20 2009 Steve Dickson <steved at redhat.com> 1.1.4-7
+- mountd: Don't do tcp wrapper check when there are no rules (bz 448898)
+
 * Mon Jan  5 2009 Steve Dickson <steved at redhat.com> 1.1.4-6
 - Added warnings to tcp wrapper code when mounts are 
   denied due to misconfigured DNS configurations.



From mhlavink at fedoraproject.org  Tue Jan 20 12:08:26 2009
From: mhlavink at fedoraproject.org (Michal Hlavinka)
Date: Tue, 20 Jan 2009 12:08:26 +0000 (UTC)
Subject: rpms/ksh/devel .cvsignore, 1.15, 1.16 ksh.spec, 1.41, 1.42 sources, 
	1.15, 1.16
Message-ID: <20090120120826.40D19700F9@cvs1.fedora.phx.redhat.com>

Author: mhlavink

Update of /cvs/extras/rpms/ksh/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14003

Modified Files:
	.cvsignore ksh.spec sources 
Log Message:
- update to 2008-11-04
- don't use obsolete ast-ksh-locales



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ksh/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	28 Jul 2008 06:55:21 -0000	1.15
+++ .cvsignore	20 Jan 2009 12:07:54 -0000	1.16
@@ -1,3 +1,2 @@
-INIT.2008-07-25.tgz
-ast-ksh.2008-07-25.tgz
-ast-ksh-locale.2008-07-25.tgz
+INIT.2008-11-04.tgz
+ast-ksh.2008-11-04.tgz


Index: ksh.spec
===================================================================
RCS file: /cvs/extras/rpms/ksh/devel/ksh.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- ksh.spec	21 Oct 2008 17:16:49 -0000	1.41
+++ ksh.spec	20 Jan 2009 12:07:54 -0000	1.42
@@ -1,29 +1,20 @@
-#ExclusiveArch:  x86_64
-%define       releasedate   2008-07-25
-#ExcludeArch:  ia64
+%define       releasedate   2008-11-04
 
 Name:         ksh
 Summary:      The Original ATT Korn Shell
 URL:          http://www.kornshell.com/
 Group:        System Environment/Shells
 License:      CPL
-Version:      20080725
-Release:      4%{?dist}
+Version:      20081104
+Release:      1%{?dist}
 Source0:      http://www.research.att.com/~gsf/download/tgz/ast-ksh.%{releasedate}.tgz
 Source1:      http://www.research.att.com/~gsf/download/tgz/INIT.%{releasedate}.tgz
-Source2:      http://www.research.att.com/~gsf/download/tgz/ast-ksh-locale.%{releasedate}.tgz
 Source3:      kshrc.rhs
 Source4:      dotkshrc
-#Patch0:       ksh-20041225-gcc4.patch
-Patch1:       ksh-20070328-uname.patch
-Patch2:       ksh-20070328-useex.patch
-Patch3:       ksh-20070328-builtins.patch
-Patch4:       ksh-20080725-ttou.patch
-Patch5:       ksh-20070628-unaligned.patch
-# for debugging only:
-#Patch100:     ksh-20060124-iffedebug.patch
 
-#   build information
+#don't use not wanted/needed builtins
+Patch1:       ksh-20070328-builtins.patch
+
 BuildRoot:    %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Provides:     ksh93
 Obsoletes:    ksh93
@@ -42,14 +33,7 @@
 %prep
 %setup -q -c
 %setup -q -T -D -a 1
-%setup -q -T -D -a 2
-#%patch0 -p1 -b .gcc4
-%patch1 -p1 -b .uname
-%patch2 -p1 -b .use_ex
-%patch3 -p1 -b .builtins
-#%patch4 -p1 -b .ttou
-%patch5 -p1 -b .unaligned
-#patch100 -p1 -b .iffedebug
+%patch1 -p1 -b .builtins
 
 %build
 ./bin/package "read" ||:
@@ -60,15 +44,10 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT{/bin,/usr/bin,%{_mandir}/man1}
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/locale/{C,pt,fr,de,it,es}/LC_MESSAGES
+mkdir -p $RPM_BUILD_ROOT{/bin,%{_bindir},%{_mandir}/man1}
 install -c -m 755 arch/*/bin/ksh $RPM_BUILD_ROOT/bin/ksh
 install -c -m 644 arch/*/man/man1/sh.1 $RPM_BUILD_ROOT%{_mandir}/man1/ksh.1
-for i in C pt fr de it es; do
-install -m 644 share/lib/locale/$i/LC_MESSAGES/* \
-               $RPM_BUILD_ROOT%{_datadir}/locale/$i/LC_MESSAGES/
-done
-ln -sf /bin/ksh $RPM_BUILD_ROOT/usr/bin/ksh
+ln -sf ../../bin/ksh $RPM_BUILD_ROOT%{_bindir}/ksh
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/skel
 install -m 644 %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/skel/.kshrc
 install -m 644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/kshrc
@@ -101,9 +80,8 @@
 %files 
 %defattr(-, root, root,-)
 %doc README LICENSE
-/bin/*
-/usr//bin/ksh
-%{_datadir}/locale/*/LC_MESSAGES/*
+/bin/ksh
+%{_bindir}/ksh
 %{_mandir}/man1/*
 %config(noreplace) %{_sysconfdir}/skel/.kshrc
 %config(noreplace) %{_sysconfdir}/kshrc
@@ -113,6 +91,10 @@
 
 %changelog
 * Tue Oct 21 2008 Michal Hlavinka <mhlavink at redhat.com> 20080202-4
+- update to 2008-11-04
+- ast-ksh-locales are not useable remove them
+
+* Tue Oct 21 2008 Michal Hlavinka <mhlavink at redhat.com> 20080202-4
 - fix #467025 - Ksh fails to initialise environment when login from graphic console
 
 * Wed Aug 06 2008 Tomas Smetana <tsmetana at redhat.com> 20080725-3


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ksh/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	28 Jul 2008 06:55:21 -0000	1.15
+++ sources	20 Jan 2009 12:07:55 -0000	1.16
@@ -1,3 +1,2 @@
-59bd2850ce70bd93db3760578e237449  INIT.2008-07-25.tgz
-aa6031753184ce6a5d08a8abc8c0ab92  ast-ksh.2008-07-25.tgz
-cd5b1720c1c0584e13cc689e75b4baf2  ast-ksh-locale.2008-07-25.tgz
+adb05b9940046d3ca6b4b24038131725  INIT.2008-11-04.tgz
+630096418741335fd757cda3f054aa11  ast-ksh.2008-11-04.tgz



From mhlavink at fedoraproject.org  Tue Jan 20 12:10:52 2009
From: mhlavink at fedoraproject.org (Michal Hlavinka)
Date: Tue, 20 Jan 2009 12:10:52 +0000 (UTC)
Subject: rpms/ksh/devel ksh-20041225-gcc4.patch, 1.1,
	NONE ksh-20060124-iffedebug.patch, 1.1,
	NONE ksh-20070328-uname.patch, 1.1,
	NONE ksh-20070328-useex.patch, 1.1,
	NONE ksh-20070628-unaligned.patch, 1.1,
	NONE ksh-20080725-ttou.patch, 1.1, NONE
Message-ID: <20090120121052.316E7700F9@cvs1.fedora.phx.redhat.com>

Author: mhlavink

Update of /cvs/extras/rpms/ksh/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14497

Removed Files:
	ksh-20041225-gcc4.patch ksh-20060124-iffedebug.patch 
	ksh-20070328-uname.patch ksh-20070328-useex.patch 
	ksh-20070628-unaligned.patch ksh-20080725-ttou.patch 
Log Message:
remove obsoleted patches



--- ksh-20041225-gcc4.patch DELETED ---


--- ksh-20060124-iffedebug.patch DELETED ---


--- ksh-20070328-uname.patch DELETED ---


--- ksh-20070328-useex.patch DELETED ---


--- ksh-20070628-unaligned.patch DELETED ---


--- ksh-20080725-ttou.patch DELETED ---



From erikos at fedoraproject.org  Tue Jan 20 12:11:12 2009
From: erikos at fedoraproject.org (Simon Schampijer)
Date: Tue, 20 Jan 2009 12:11:12 +0000 (UTC)
Subject: rpms/sugar-base/OLPC-4 .cvsignore, 1.8, 1.9 sources, 1.8,
	1.9 sugar-base.spec, 1.11, 1.12
Message-ID: <20090120121112.834BE700F9@cvs1.fedora.phx.redhat.com>

Author: erikos

Update of /cvs/pkgs/rpms/sugar-base/OLPC-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14469

Modified Files:
	.cvsignore sources sugar-base.spec 
Log Message:
* Tue Jan 20 2009 Simon Schampijer <simon at schampijer.de> - 0.83.3-1
- Don't print logs to tty instead of shell.log in the emulator
- Trivial port to GIO instead of GnomeVFS




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-base/OLPC-4/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	22 Dec 2008 14:32:18 -0000	1.8
+++ .cvsignore	20 Jan 2009 12:10:42 -0000	1.9
@@ -1 +1 @@
-sugar-base-0.83.2.tar.bz2
+sugar-base-0.83.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-base/OLPC-4/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	22 Dec 2008 14:32:19 -0000	1.8
+++ sources	20 Jan 2009 12:10:42 -0000	1.9
@@ -1 +1 @@
-0f05d95eaf0f8e3174a3b3e3b0afe995  sugar-base-0.83.2.tar.bz2
+7ca87f1131e2ad027aca4f41a1a7135b  sugar-base-0.83.3.tar.bz2


Index: sugar-base.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-base/OLPC-4/sugar-base.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sugar-base.spec	22 Dec 2008 14:40:13 -0000	1.11
+++ sugar-base.spec	20 Jan 2009 12:10:42 -0000	1.12
@@ -4,8 +4,8 @@
 
 Summary: Base Sugar library
 Name: sugar-base
-Version: 0.83.2
-Release: 2%{?dist}
+Version: 0.83.3
+Release: 1%{?dist}
 #Release: 2.%{alphatag}%{?dist}
 URL: http://sugarlabs.org/
 # git clone git://dev.laptop.org/sugar-base
@@ -51,6 +51,10 @@
 %{python_sitelib}/*
 
 %changelog
+* Tue Jan 20 2009 Simon Schampijer <simon at schampijer.de> - 0.83.3-1
+- Don't print logs to tty instead of shell.log in the emulator
+- Trivial port to GIO instead of GnomeVFS
+
 * Mon Dec 22 2008 Simon Schampijer <simon at schampijer.de> - 0.83.2-2
 - add intltool as build dep
 



From erikos at fedoraproject.org  Tue Jan 20 12:14:36 2009
From: erikos at fedoraproject.org (Simon Schampijer)
Date: Tue, 20 Jan 2009 12:14:36 +0000 (UTC)
Subject: rpms/sugar-toolkit/OLPC-4 .cvsignore, 1.23, 1.24 sources, 1.26,
	1.27 sugar-toolkit.spec, 1.35, 1.36
Message-ID: <20090120121436.290A2700F9@cvs1.fedora.phx.redhat.com>

Author: erikos

Update of /cvs/pkgs/rpms/sugar-toolkit/OLPC-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15288

Modified Files:
	.cvsignore sources sugar-toolkit.spec 
Log Message:
* Tue Jan 20 2009 Simon Schampijer <simon at laptop.org> - 0.83.4-1
- separate debug settings from xsession #163
- show an alert on activity close for suggesting the user to set properties of the entry #215
- add a colorpicker to Sugar, only the ColorToolButton is public for now
- move the palette to new style gobject properties
- #3060 Add the possibility of filtering the object chooser by data type
- fix uninstallling of activities that use symlinks #171
- remove the hacks for asking the X server for screenshots and use gtk.Widget.get_snapshot() instead




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-toolkit/OLPC-4/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- .cvsignore	22 Dec 2008 12:27:02 -0000	1.23
+++ .cvsignore	20 Jan 2009 12:14:05 -0000	1.24
@@ -1 +1 @@
-sugar-toolkit-0.83.3.tar.bz2
+sugar-toolkit-0.83.4.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-toolkit/OLPC-4/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- sources	22 Dec 2008 12:27:02 -0000	1.26
+++ sources	20 Jan 2009 12:14:05 -0000	1.27
@@ -1 +1 @@
-f6882ee56ed327c6680738133e911bf3  sugar-toolkit-0.83.3.tar.bz2
+f7390f7e0acac6b645ceab523565ec95  sugar-toolkit-0.83.4.tar.bz2


Index: sugar-toolkit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-toolkit/OLPC-4/sugar-toolkit.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- sugar-toolkit.spec	22 Dec 2008 14:10:30 -0000	1.35
+++ sugar-toolkit.spec	20 Jan 2009 12:14:05 -0000	1.36
@@ -5,8 +5,8 @@
 
 Summary: Sugar toolkit
 Name: sugar-toolkit
-Version: 0.83.3
-Release: 2%{?dist}
+Version: 0.83.4
+Release: 1%{?dist}
 #Release: 1.%{alphatag}%{?dist}
 URL: http://sugarlabs.org
 # git clone git://dev.laptop.org/sugar
@@ -67,6 +67,15 @@
 %{_sysconfdir}/rpm/macros.sugar
 
 %changelog
+* Tue Jan 20 2009 Simon Schampijer <simon at laptop.org> - 0.83.4-1
+- separate debug settings from xsession #163
+- show an alert on activity close for suggesting the user to set properties of the entry #215
+- add a colorpicker to Sugar, only the ColorToolButton is public for now
+- move the palette to new style gobject properties
+- #3060 Add the possibility of filtering the object chooser by data type
+- fix uninstallling of activities that use symlinks #171
+- remove the hacks for asking the X server for screenshots and use gtk.Widget.get_snapshot() instead 
+
 * Mon Dec 22 2008 Simon Schampijer <simon at laptop.org> - 0.83.3-2
 - new download url
 



From steved at fedoraproject.org  Tue Jan 20 12:15:02 2009
From: steved at fedoraproject.org (Steve Dickson)
Date: Tue, 20 Jan 2009 12:15:02 +0000 (UTC)
Subject: rpms/nfs-utils/F-9 nfs-utils-1.1.2-tcpwrap-rulecheck.patch, NONE,
	1.1 nfs-utils.spec, 1.179, 1.180
Message-ID: <20090120121502.9B088700F9@cvs1.fedora.phx.redhat.com>

Author: steved

Update of /cvs/pkgs/rpms/nfs-utils/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15344

Modified Files:
	nfs-utils.spec 
Added Files:
	nfs-utils-1.1.2-tcpwrap-rulecheck.patch 
Log Message:
mountd: Don't do tcp wrapper check when there are no rules (bz 448898)


nfs-utils-1.1.2-tcpwrap-rulecheck.patch:

--- NEW FILE nfs-utils-1.1.2-tcpwrap-rulecheck.patch ---
commit 5f09a2bacb4bf0a906e2d19931568b91fb6c5088
Author: Steve Dickson <steved at redhat.com>
Date:   Tue Jan 20 06:16:56 2009 -0500

    mountd: Don't do tcp wrapper check when there are no rules
    
    If there are no rules in either /etc/hosts.deny or
    /etc/hosts.allow there is no need to do the host validation.
    
    Signed-off-by: Steve Dickson <steved at redhat.com>

diff -up nfs-utils-1.1.4/support/misc/tcpwrapper.c.orig nfs-utils-1.1.4/support/misc/tcpwrapper.c
--- nfs-utils-1.1.4/support/misc/tcpwrapper.c.orig	2009-01-07 12:56:07.000000000 -0500
+++ nfs-utils-1.1.4/support/misc/tcpwrapper.c	2009-01-20 06:00:38.000000000 -0500
@@ -34,6 +34,7 @@
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
+#include <stdio.h>
 #include <tcpwrapper.h>
 #include <unistd.h>
 #include <string.h>
@@ -55,6 +56,8 @@
 #include <rpc/rpcent.h>
 #endif
 
+static int check_files(void);
+static int check_rules(void);
 static void logit(int severity, struct sockaddr_in *addr,
 		  u_long procnum, u_long prognum, char *text);
 static void toggle_verboselog(int sig);
@@ -261,8 +264,40 @@ void    check_startup(void)
     (void) signal(SIGINT, toggle_verboselog);
 }
 
-/* check_files - check to see if either access files have changed */
+/*
+ * check_rules - check to see if any entries exist in
+ * either hosts file.
+ */
+int check_rules()
+{
+	FILE *fp;
+	char buf[BUFSIZ];
+
+	if ((fp = fopen("/etc/hosts.allow", "r")) == NULL)
+		return 0;
+
+	while (fgets(buf, BUFSIZ, fp) != NULL) {
+		if (buf[0] == '#')
+			continue;
+		fclose(fp);
+		return 1;
+	}
+	fclose(fp);
+
+	if ((fp = fopen("/etc/hosts.deny", "r")) == NULL)
+		return 0;
+
+	while (fgets(buf, BUFSIZ, fp) != NULL) {
+		if (buf[0] == '#')
+			continue;
+		fclose(fp);
+		return 1;
+	}
+	fclose(fp);
+	return 0;
+}
 
+/* check_files - check to see if either access files have changed */
 int check_files()
 {
 	static time_t allow_mtime, deny_mtime;
@@ -304,6 +339,13 @@ u_long  prog;
 	if (acc && changed == 0)
 		return (acc->access);
 
+	/*
+	 * See if there are any rules to be applied,
+	 * if not, no need to check the address
+	 */
+	if (check_rules() == 0)
+		goto done;
+
 	if (!(from_local(addr) || good_client(daemon, addr))) {
 		log_bad_host(addr, proc, prog);
 		if (acc)
@@ -315,10 +357,12 @@ u_long  prog;
 	if (verboselog)
 		log_client(addr, proc, prog);
 
+done:
 	if (acc)
 		acc->access = TRUE;
 	else 
 		haccess_add(addr, proc, prog, TRUE);
+
     return (TRUE);
 }
 


Index: nfs-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nfs-utils/F-9/nfs-utils.spec,v
retrieving revision 1.179
retrieving revision 1.180
diff -u -r1.179 -r1.180
--- nfs-utils.spec	5 Jan 2009 19:48:50 -0000	1.179
+++ nfs-utils.spec	20 Jan 2009 12:14:32 -0000	1.180
@@ -2,7 +2,7 @@
 Name: nfs-utils
 URL: http://sourceforge.net/projects/nfs
 Version: 1.1.2
-Release: 9%{?dist}
+Release: 10%{?dist}
 Epoch: 1
 
 # group all 32bit related archs
@@ -36,6 +36,7 @@
 Patch11: nfs-utils-1.1.2-tcpwrapper-update.patch
 Patch12: nfs-utils-1.1.2-tcpwrap-warn.patch
 Patch13: nfs-utils-1.1.2-gssd-verbosity.patch
+Patch14: nfs-utils-1.1.2-tcpwrap-rulecheck.patch
 
 %if %{enablefscache}
 Patch90: nfs-utils-1.1.0-mount-fsc.patch
@@ -100,6 +101,7 @@
 %patch11 -p1
 %patch12 -p1
 %patch13 -p1
+%patch14 -p1
 
 %if %{enablefscache}
 %patch90 -p1
@@ -263,6 +265,9 @@
 %attr(4755,root,root)   /sbin/umount.nfs4
 
 %changelog
+* Tue Jan 20 2009 Steve Dickson <steved at redhat.com> 1.1.2-10
+- mountd: Don't do tcp wrapper check when there are no rules (bz 448898)
+
 * Mon Jan  5 2009 Steve Dickson <steved at redhat.com> 1.1.2-9
 - Added warnings to tcp wrapper code when mounts are 
   denied due to misconfigured DNS configurations.



From harald at fedoraproject.org  Tue Jan 20 12:17:44 2009
From: harald at fedoraproject.org (Harald Hoyer)
Date: Tue, 20 Jan 2009 12:17:44 +0000 (UTC)
Subject: rpms/udev/devel udev-136-cdrom.patch, NONE, 1.1 udev-136-tape.patch,
	NONE, 1.1 udev-136-video.patch, NONE, 1.1 udev.spec, 1.259, 1.260
Message-ID: <20090120121744.BDD57700F9@cvs1.fedora.phx.redhat.com>

Author: harald

Update of /cvs/pkgs/rpms/udev/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16106

Modified Files:
	udev.spec 
Added Files:
	udev-136-cdrom.patch udev-136-tape.patch udev-136-video.patch 
Log Message:
* Tue Jan 20 2009 Harald Hoyer <harald at redhat.com> 136-2
- added some rule fixes, which will be in udev-137


udev-136-cdrom.patch:

--- NEW FILE udev-136-cdrom.patch ---
commit 18cff5c3b2e3591fa46107288ea2d7026a15ccf3
Author: Kay Sievers <kay.sievers at vrfy.org>
Date:   Sat Jan 10 17:44:09 2009 +0100

    rules: fix typo in ide cd rule
    
    Thanks to Scott, who found that.

diff --git a/rules/rules.d/50-udev-default.rules b/rules/rules.d/50-udev-default.rules
index 119941b..7730f0d 100644
--- a/rules/rules.d/50-udev-default.rules
+++ b/rules/rules.d/50-udev-default.rules
@@ -68,7 +68,7 @@ KERNEL=="hd*", SUBSYSTEMS=="ide", ATTRS{media}=="floppy", OPTIONS+="all_partitio
 
 # cdrom
 SUBSYSTEM=="block", KERNEL=="sr[0-9]*", SYMLINK+="scd%n", GROUP="cdrom"
-SUBSYSTEM=="block", KERNEL=="hd[0-9]*", SUBSYSTEMS=="ide", ATTRS{media}=="cdrom", GROUP="cdrom"
+SUBSYSTEM=="block", KERNEL=="hd*", SUBSYSTEMS=="ide", ATTRS{media}=="cdrom", GROUP="cdrom"
 SUBSYSTEMS=="scsi", ATTRS{type}=="4|5", GROUP="cdrom"
 KERNEL=="pktcdvd[0-9]*", NAME="pktcdvd/%k", GROUP="cdrom"
 KERNEL=="pktcdvd", NAME="pktcdvd/control", GROUP="cdrom"

udev-136-tape.patch:

--- NEW FILE udev-136-tape.patch ---
commit 8b739dec53f8bca23e46e2d2a9732abee9b8d591
Author: Lennart Poettering <lennart at poettering.net>
Date:   Sat Jan 10 01:37:03 2009 +0100

    fix naming for tape nst devices in /dev/tape/by-path/
    
    $env{ID_PATH} includes the "-nst" suffix anyway, so we shouldn't append
    it a second time as part of the rule creating the device file symlink.
    
    Signed-off-by: Lennart Poettering <lennart at poettering.net>

diff --git a/rules/rules.d/60-persistent-storage-tape.rules b/rules/rules.d/60-persistent-storage-tape.rules
index d3226f1..8d53888 100644
--- a/rules/rules.d/60-persistent-storage-tape.rules
+++ b/rules/rules.d/60-persistent-storage-tape.rules
@@ -19,6 +19,6 @@ KERNEL=="nst*[0-9]", ENV{ID_SERIAL}=="?*", SYMLINK+="tape/by-id/$env{ID_BUS}-$en
 # by-path (parent device path)
 KERNEL=="st*[0-9]|nst*[0-9]", IMPORT{program}="path_id %p"
 KERNEL=="st*[0-9]", ENV{ID_PATH}=="?*", SYMLINK+="tape/by-path/$env{ID_PATH}"
-KERNEL=="nst*[0-9]", ENV{ID_PATH}=="?*", SYMLINK+="tape/by-path/$env{ID_PATH}-nst"
+KERNEL=="nst*[0-9]", ENV{ID_PATH}=="?*", SYMLINK+="tape/by-path/$env{ID_PATH}"
 
 LABEL="persistent_storage_tape_end"

udev-136-video.patch:

--- NEW FILE udev-136-video.patch ---
commit 66d9b44f8302efe383ada6a52d8431655614bf76
Author: Kay Sievers <kay.sievers at vrfy.org>
Date:   Thu Jan 15 17:06:14 2009 +0100

    rules: add drm devices to group "video"
    
    https://bugs.launchpad.net/bugs/317430

diff --git a/rules/rules.d/50-udev-default.rules b/rules/rules.d/50-udev-default.rules
index 7730f0d..95d82d7 100644
--- a/rules/rules.d/50-udev-default.rules
+++ b/rules/rules.d/50-udev-default.rules
@@ -38,6 +38,7 @@ KERNEL=="card[0-9]*",		NAME="dri/%k"
 KERNEL=="pmu",			GROUP="video"
 KERNEL=="nvidia*|nvidiactl*",	GROUP="video"
 SUBSYSTEM=="graphics",		GROUP="video"
+SUBSYSTEM=="drm",		GROUP="video"
 
 # DVB (video)
 SUBSYSTEM=="dvb", ENV{DVB_ADAPTER_NUM}=="?*", NAME="dvb/adapter$env{DVB_ADAPTER_NUM}/$env{DVB_DEVICE_TYPE}$env{DVB_DEVICE_NUM}", GROUP="video"


Index: udev.spec
===================================================================
RCS file: /cvs/pkgs/rpms/udev/devel/udev.spec,v
retrieving revision 1.259
retrieving revision 1.260
diff -u -r1.259 -r1.260
--- udev.spec	20 Jan 2009 11:58:53 -0000	1.259
+++ udev.spec	20 Jan 2009 12:17:14 -0000	1.260
@@ -6,7 +6,7 @@
 Summary: A userspace implementation of devfs
 Name: udev
 Version: 136
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2
 Group: System Environment/Base
 Provides: udev-persistent = %{version}-%{release}
@@ -18,6 +18,10 @@
 Source4: fw_unit_symlinks.sh
 Source5: udev.sysconfig
 
+Patch1: udev-136-tape.patch
+Patch2: udev-136-cdrom.patch
+Patch3: udev-136-video.patch
+
 Patch102: udev-118-sysconf.patch
 
 ExclusiveOS: Linux
@@ -90,6 +94,10 @@
 
 %prep
 %setup -q  
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+
 %patch102 -p1 -b .sysconf
 rm rules/redhat/95-pam-console.rules
 
@@ -378,6 +386,9 @@
 
 
 %changelog
+* Tue Jan 20 2009 Harald Hoyer <harald at redhat.com> 136-2
+- added some rule fixes, which will be in udev-137
+
 * Tue Jan 20 2009 Harald Hoyer <harald at redhat.com> 136-1
 - test for restorecon in start_udev before it is used (bug #480608)
 - added groups video audio cdrom tape dialout in post



From morgan at fedoraproject.org  Tue Jan 20 12:18:05 2009
From: morgan at fedoraproject.org (Morgan Collett)
Date: Tue, 20 Jan 2009 12:18:05 +0000 (UTC)
Subject: rpms/sugar-presence-service/OLPC-4 .cvsignore, 1.11, 1.12 sources, 
	1.11, 1.12 sugar-presence-service.spec, 1.13, 1.14
Message-ID: <20090120121805.DA742700F9@cvs1.fedora.phx.redhat.com>

Author: morgan

Update of /cvs/pkgs/rpms/sugar-presence-service/OLPC-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16173

Modified Files:
	.cvsignore sources sugar-presence-service.spec 
Log Message:
Update to 0.83.3


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-presence-service/OLPC-4/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	22 Dec 2008 14:22:09 -0000	1.11
+++ .cvsignore	20 Jan 2009 12:17:35 -0000	1.12
@@ -1 +1 @@
-sugar-presence-service-0.83.2.tar.bz2
+sugar-presence-service-0.83.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-presence-service/OLPC-4/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	22 Dec 2008 14:22:09 -0000	1.11
+++ sources	20 Jan 2009 12:17:35 -0000	1.12
@@ -1 +1 @@
-16062ac6a45177c3f739e4fc637789b4  sugar-presence-service-0.83.2.tar.bz2
+571f9225a974b17c2fa0d31dac9c3eec  sugar-presence-service-0.83.3.tar.bz2


Index: sugar-presence-service.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-presence-service/OLPC-4/sugar-presence-service.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sugar-presence-service.spec	22 Dec 2008 14:22:09 -0000	1.13
+++ sugar-presence-service.spec	20 Jan 2009 12:17:35 -0000	1.14
@@ -2,7 +2,7 @@
 #%define commitid 76984f3f28
 
 Name: sugar-presence-service
-Version: 0.83.2
+Version: 0.83.3
 Release: 1%{?dist}
 Summary: The Sugar presence service
 
@@ -48,6 +48,10 @@
 %{_datadir}/dbus-1/services/org.laptop.Sugar.Presence.service
 
 %changelog
+* Tue Jan 20 2009 Morgan Collett <morgan.collett at gmail.com> - 0.83.3-1
+- Update to 0.83.3
+- #142 Restart a server-based collaboration session / switch servers on the fly
+
 * Mon Dec 22 2008 Morgan Collett <morgan.collett at gmail.com> - 0.83.2-1
 - Remove NM 0.7 patch - included in release
 - Update to 0.83.2



From mlichvar at fedoraproject.org  Tue Jan 20 12:20:57 2009
From: mlichvar at fedoraproject.org (Miroslav Lichvar)
Date: Tue, 20 Jan 2009 12:20:57 +0000 (UTC)
Subject: rpms/tcpdump/devel tcpdump.spec,1.72,1.73
Message-ID: <20090120122057.9B877700F9@cvs1.fedora.phx.redhat.com>

Author: mlichvar

Update of /cvs/pkgs/rpms/tcpdump/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16644

Modified Files:
	tcpdump.spec 
Log Message:
- rebuild for new openssl
- convert CREDITS to UTF-8 (#226481)



Index: tcpdump.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tcpdump/devel/tcpdump.spec,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- tcpdump.spec	29 Aug 2008 12:30:41 -0000	1.72
+++ tcpdump.spec	20 Jan 2009 12:20:27 -0000	1.73
@@ -2,7 +2,7 @@
 Name: tcpdump
 Epoch: 14
 Version: 3.9.8
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: BSD with advertising
 URL: http://www.tcpdump.org
 Group: Applications/Internet
@@ -49,6 +49,11 @@
 
 find . -name '*.c' -o -name '*.h' | xargs chmod 644
 
+for f in CREDITS; do
+	iconv -f iso8859-1 -t utf8 -o ${f}{_,} &&
+		touch -r ${f}{,_} && mv -f ${f}{_,}
+done
+
 %build
 export CFLAGS="$RPM_OPT_FLAGS $(getconf LFS_CFLAGS) -fno-strict-aliasing"
 
@@ -98,6 +103,10 @@
 %{_mandir}/man8/tcpdump.8*
 
 %changelog
+* Tue Jan 20 2009 Miroslav Lichvar <mlichvar at redhat.com> - 14:3.9.8-7
+- rebuild for new openssl
+- convert CREDITS to UTF-8 (#226481)
+
 * Fri Aug 29 2008 Miroslav Lichvar <mlichvar at redhat.com> - 14:3.9.8-6
 - rediff patches with fuzz
 - add -fno-strict-aliasing to CFLAGS



From erikos at fedoraproject.org  Tue Jan 20 12:24:29 2009
From: erikos at fedoraproject.org (Simon Schampijer)
Date: Tue, 20 Jan 2009 12:24:29 +0000 (UTC)
Subject: rpms/sugar/OLPC-4 .cvsignore, 1.26, 1.27 sources, 1.27,
	1.28 sugar.spec, 1.36, 1.37
Message-ID: <20090120122429.0BB0F700F9@cvs1.fedora.phx.redhat.com>

Author: erikos

Update of /cvs/pkgs/rpms/sugar/OLPC-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17176

Modified Files:
	.cvsignore sources sugar.spec 
Log Message:
* Tue Jan 20 2009 Simon Schampijer <simon at laptop.org> - 0.83.5-1
- make the journal entries in the favorites palette resumable
- simplify the constants used to identify favorite layouts
- separate debug settings from xsession #163
- add logout option #207 to xomenu (sayamindu, icon by eben)
- change jabber server without sugar restart #142
- About my XO -> About my Computer
- #196 Fix setting the timezone in Debian
- autoconnect to AP that we connected to last #8
- add a favorites mode setting for deciding if the favorites view resumes by default or not
- resume by default the last activity from the favorites view
- implement filtering by file type for removable devices
- #132 Filter by timestamp, not by mtime
- add support for text queries on removable devices
- dont abort if we cannot read a file from a removable device
- add a favorite filter to the journal toolbar
- sanitize the file name when we copy to removable devices
- #36 Refresh the detailed view when the entry changes
- #38 Refresh full metadata when editing so we do not lose properties
- Focus Search is not exposed via dbus anymore #89
- #131 'open with' does not work for clipboard item
- #165 Install bundles when they get into the journal
- add Resume item to the file transfer palette
- #126 Fix erase button in the journal
- following eben's spec for the device positions




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sugar/OLPC-4/.cvsignore,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- .cvsignore	22 Dec 2008 12:40:58 -0000	1.26
+++ .cvsignore	20 Jan 2009 12:23:58 -0000	1.27
@@ -1 +1 @@
-sugar-0.83.4.tar.bz2
+sugar-0.83.5.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sugar/OLPC-4/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- sources	22 Dec 2008 12:40:58 -0000	1.27
+++ sources	20 Jan 2009 12:23:58 -0000	1.28
@@ -1 +1 @@
-6b981c63bb5d8b23b43831ece79884e6  sugar-0.83.4.tar.bz2
+8d90769ce80efdb95f635b17943ac985  sugar-0.83.5.tar.bz2


Index: sugar.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar/OLPC-4/sugar.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- sugar.spec	22 Dec 2008 13:48:47 -0000	1.36
+++ sugar.spec	20 Jan 2009 12:23:58 -0000	1.37
@@ -5,8 +5,8 @@
 
 Summary: OLPC desktop environment
 Name: sugar
-Version: 0.83.4
-Release: 2%{?dist}
+Version: 0.83.5
+Release: 1%{?dist}
 #Release: 2.%{alphatag}%{?dist}
 URL: http://sugarlabs.org
 # git clone git://dev.laptop.org/sugar
@@ -117,6 +117,32 @@
 %{_bindir}/sugar-emulator
 
 %changelog
+* Tue Jan 20 2009 Simon Schampijer <simon at laptop.org> - 0.83.5-1
+- make the journal entries in the favorites palette resumable
+- simplify the constants used to identify favorite layouts
+- separate debug settings from xsession #163
+- add logout option #207 to xomenu (sayamindu, icon by eben)
+- change jabber server without sugar restart #142
+- About my XO -> About my Computer
+- #196 Fix setting the timezone in Debian
+- autoconnect to AP that we connected to last #8
+- add a favorites mode setting for deciding if the favorites view resumes by default or not
+- resume by default the last activity from the favorites view
+- implement filtering by file type for removable devices
+- #132 Filter by timestamp, not by mtime
+- add support for text queries on removable devices
+- dont abort if we cannot read a file from a removable device
+- add a favorite filter to the journal toolbar
+- sanitize the file name when we copy to removable devices
+- #36 Refresh the detailed view when the entry changes
+- #38 Refresh full metadata when editing so we do not lose properties
+- Focus Search is not exposed via dbus anymore #89
+- #131 'open with' does not work for clipboard item
+- #165 Install bundles when they get into the journal
+- add Resume item to the file transfer palette
+- #126 Fix erase button in the journal
+- following eben's spec for the device positions
+
 * Mon Dec 22 2008 Simon Schampijer <simon at laptop.org> - 0.83.4-2
 - new download url
 



From mkasik at fedoraproject.org  Tue Jan 20 12:30:52 2009
From: mkasik at fedoraproject.org (=?utf-8?b?TWFyZWsgS2HFocOtaw==?=)
Date: Tue, 20 Jan 2009 12:30:52 +0000 (UTC)
Subject: rpms/cups-pk-helper/devel cups-pk-helper.spec, NONE,
	1.1 dependencies.patch, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090120123052.24817700F9@cvs1.fedora.phx.redhat.com>

Author: mkasik

Update of /cvs/pkgs/rpms/cups-pk-helper/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17914/devel

Modified Files:
	.cvsignore sources 
Added Files:
	cups-pk-helper.spec dependencies.patch import.log 
Log Message:
* Tue Jan 13 2009 Marek Kasik <mkasik at redhat.com> 0.0.3-1
- Initial Fedora Release
- Modified Files:
    devel/.cvsignore devel/sources 
- Added Files:
    devel/cups-pk-helper.spec devel/dependencies.patch 
    devel/import.log 




--- NEW FILE cups-pk-helper.spec ---
Name:           cups-pk-helper
Version:        0.0.3
Release:        1%{?dist}
Summary:        A helper that makes system-config-printer use PolicyKit

Group:          System Environment/Base
License:        GPLv2+
URL:            http://www.vuntz.net/download/cups-pk-helper/
Source0:        http://www.vuntz.net/download/cups-pk-helper/cups-pk-helper-%{version}.tar.bz2

Patch0:         dependencies.patch

BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  cups-devel >= 1.2
BuildRequires:  python-devel >= 2.4
BuildRequires:  glib2-devel >= 2.14.0
BuildRequires:  gtk2-devel >= 2.12.0
BuildRequires:  dbus-glib-devel >= 0.74
BuildRequires:  PolicyKit-devel >= 0.8
BuildRequires:  intltool >= 0.40.0
BuildRequires:  gettext-devel >= 0.17

Requires:       python >= 2.4


%description
cups-pk-helper is an application which makes cups configuration
interfaces available under control of PolicyKit.

%prep
%setup -q

%patch0 -p0 -b .dependencies

%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,-)
%{_libexecdir}/cups-pk-helper-mechanism
%config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.opensuse.CupsPkHelper.Mechanism.conf
%{_datadir}/dbus-1/system-services/org.opensuse.CupsPkHelper.Mechanism.service
%{_datadir}/PolicyKit/policy/org.opensuse.cupspkhelper.mechanism.policy
%doc AUTHORS COPYING NEWS



%changelog

* Tue Jan 13 2009 Marek Kasik <mkasik at redhat.com> 0.0.3-1
- Initial spec file.

dependencies.patch:

--- NEW FILE dependencies.patch ---
diff -up ./configure.ac.orig ./configure.ac
--- ./configure.ac.orig	2008-11-21 07:33:43.000000000 +0100
+++ ./configure.ac	2009-01-14 13:49:17.000000000 +0100
@@ -56,9 +56,9 @@ PKG_CHECK_MODULES(CUPS_PK, glib-2.0 >= $
 AC_SUBST(CUPS_PK_CFLAGS)
 AC_SUBST(CUPS_PK_LIBS)
 
-PKG_CHECK_MODULES(CUPS_PK_GNOME, gtk+-2.0 >= $GTK_REQUIRED \
-				 dbus-1 >= $DBUS_REQUIRED \
-				 dbus-glib-1 >= $DBUS_GLIB_REQUIRED)
+PKG_CHECK_MODULES(CUPS_PK_GNOME, gtk2 >= $GTK_REQUIRED \
+				 dbus >= $DBUS_REQUIRED \
+				 dbus-glib >= $DBUS_GLIB_REQUIRED)
 AC_SUBST(CUPS_PK_GNOME_CFLAGS)
 AC_SUBST(CUPS_PK_GNOME_LIBS)
 


--- NEW FILE import.log ---
cups-pk-helper-0_0_3-1_fc11:HEAD:cups-pk-helper-0.0.3-1.fc11.src.rpm:1232454368


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cups-pk-helper/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	19 Jan 2009 22:56:24 -0000	1.1
+++ .cvsignore	20 Jan 2009 12:30:21 -0000	1.2
@@ -0,0 +1 @@
+cups-pk-helper-0.0.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cups-pk-helper/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	19 Jan 2009 22:56:24 -0000	1.1
+++ sources	20 Jan 2009 12:30:21 -0000	1.2
@@ -0,0 +1 @@
+db1c91dcb3c9f7ef3270fe29c25178a4  cups-pk-helper-0.0.3.tar.bz2



From mhlavink at fedoraproject.org  Tue Jan 20 12:32:12 2009
From: mhlavink at fedoraproject.org (Michal Hlavinka)
Date: Tue, 20 Jan 2009 12:32:12 +0000 (UTC)
Subject: rpms/ksh/devel ksh.spec,1.42,1.43
Message-ID: <20090120123212.C4B6D700F9@cvs1.fedora.phx.redhat.com>

Author: mhlavink

Update of /cvs/extras/rpms/ksh/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18289

Modified Files:
	ksh.spec 
Log Message:
fix changelog
fix:rpmlint:dangerous-command-in-%postun 



Index: ksh.spec
===================================================================
RCS file: /cvs/extras/rpms/ksh/devel/ksh.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- ksh.spec	20 Jan 2009 12:07:54 -0000	1.42
+++ ksh.spec	20 Jan 2009 12:31:42 -0000	1.43
@@ -63,9 +63,7 @@
 
 %postun
 if [ ! -f /bin/ksh ]; then
-        grep -v '^/bin/ksh$' /etc/shells >/etc/shells.new
-        mv /etc/shells.new /etc/shells
-        chmod 644 /etc/shells
+	sed -i '/^\/bin\/ksh$/ d' /etc/shells
 fi
 
 %verifyscript
@@ -90,7 +88,7 @@
     rm -rf $RPM_BUILD_ROOT
 
 %changelog
-* Tue Oct 21 2008 Michal Hlavinka <mhlavink at redhat.com> 20080202-4
+* Tue Jan 20 2009 Michal Hlavinka <mhlavink at redhat.com> 20091104-1
 - update to 2008-11-04
 - ast-ksh-locales are not useable remove them
 



From tmraz at fedoraproject.org  Tue Jan 20 13:17:06 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Tue, 20 Jan 2009 13:17:06 +0000 (UTC)
Subject: rpms/openct/devel openct.spec,1.32,1.33
Message-ID: <20090120131706.21490700F9@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/openct/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24978

Modified Files:
	openct.spec 
Log Message:
* Tue Jan 20 2009 Tomas Mraz <tmraz at redhat.com> - 0.6.15-2
- fix usrsbindir in configure (fix by Oskari Saarenmaa) (#480756)



Index: openct.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openct/devel/openct.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- openct.spec	2 Sep 2008 12:35:02 -0000	1.32
+++ openct.spec	20 Jan 2009 13:16:35 -0000	1.33
@@ -4,7 +4,7 @@
 
 Name:           openct
 Version:        0.6.15
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Middleware framework for smart card terminals
 
 Group:          System Environment/Libraries
@@ -59,7 +59,10 @@
 %prep
 %setup -q
 %patch1 -p1
-sed -i -e 's|/lib /usr/lib\b|/%{_lib} %{_libdir}|' configure # lib64 std rpaths
+# fix lib64 std rpaths and other weirdness
+sed -i -e 's|/lib /usr/lib\b|/%{_lib} %{_libdir}|' \
+       -e 's|^usrsbindir=.*$|usrsbindir="%{_sbindir}"|' \
+       -e 's|^usrlibdir=.*$|usrlibdir="%{_libdir}"|' configure 
 sed -i -e 's|^\([A-Z]\)|# \1|' etc/reader.conf.in
 
 
@@ -173,6 +176,9 @@
 
 
 %changelog
+* Tue Jan 20 2009 Tomas Mraz <tmraz at redhat.com> - 0.6.15-2
+- fix usrsbindir in configure (fix by Oskari Saarenmaa) (#480756)
+
 * Tue Sep  2 2008 Tomas Mraz <tmraz at redhat.com> - 0.6.15-1
 - Update to latest upstream
 



From tmraz at fedoraproject.org  Tue Jan 20 13:24:00 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Tue, 20 Jan 2009 13:24:00 +0000 (UTC)
Subject: rpms/openct/devel openct.spec,1.33,1.34
Message-ID: <20090120132400.CF65E700F9@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/openct/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25997

Modified Files:
	openct.spec 
Log Message:
- release bump due to bad tag



Index: openct.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openct/devel/openct.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- openct.spec	20 Jan 2009 13:16:35 -0000	1.33
+++ openct.spec	20 Jan 2009 13:23:30 -0000	1.34
@@ -4,7 +4,7 @@
 
 Name:           openct
 Version:        0.6.15
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Middleware framework for smart card terminals
 
 Group:          System Environment/Libraries
@@ -176,7 +176,7 @@
 
 
 %changelog
-* Tue Jan 20 2009 Tomas Mraz <tmraz at redhat.com> - 0.6.15-2
+* Tue Jan 20 2009 Tomas Mraz <tmraz at redhat.com> - 0.6.15-3
 - fix usrsbindir in configure (fix by Oskari Saarenmaa) (#480756)
 
 * Tue Sep  2 2008 Tomas Mraz <tmraz at redhat.com> - 0.6.15-1



From hadess at fedoraproject.org  Tue Jan 20 13:31:20 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Tue, 20 Jan 2009 13:31:20 +0000 (UTC)
Subject: rpms/rhythmbox/devel rhythmbox.spec,1.223,1.224
Message-ID: <20090120133120.4CF9B700F9@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/rhythmbox/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27066

Modified Files:
	rhythmbox.spec 
Log Message:
* Tue Jan 20 2009 - Bastien Nocera <bnocera at redhat.com> - 0.11.6-23.r6096
- Fix UPNP plugin for use with external Louie (#480036)



Index: rhythmbox.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rhythmbox/devel/rhythmbox.spec,v
retrieving revision 1.223
retrieving revision 1.224
diff -u -r1.223 -r1.224
--- rhythmbox.spec	19 Jan 2009 16:18:43 -0000	1.223
+++ rhythmbox.spec	20 Jan 2009 13:30:49 -0000	1.224
@@ -3,7 +3,7 @@
 Name: rhythmbox
 Summary: Music Management Application 
 Version: 0.11.6
-Release: 22.r6096%{?dist}
+Release: 23.r6096%{?dist}
 License: GPLv2+ with exceptions and GFDL
 Group: Applications/Multimedia
 URL: http://projects.gnome.org/rhythmbox/
@@ -92,6 +92,9 @@
 %patch0 -p0 -b .dont-disable-suspend
 %patch1 -p1 -b .avahi-assertion
 
+# Use the installed louie, not the one in Coherence
+find plugins/coherence/upnp_coherence/ -type f -exec sed -i 's/coherence.extern.louie as louie/louie/' '{}' ';'
+
 %build
 
 # work around a gstreamer bug
@@ -224,6 +227,9 @@
 %{_libdir}/rhythmbox/plugins/upnp_coherence
 
 %changelog
+* Tue Jan 20 2009 - Bastien Nocera <bnocera at redhat.com> - 0.11.6-23.r6096
+- Fix UPNP plugin for use with external Louie (#480036)
+
 * Mon Jan 19 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.11.6-22.r6096
 - Backport patch to fix avahi assertion in DAAP plugin.
 



From ovasik at fedoraproject.org  Tue Jan 20 13:36:44 2009
From: ovasik at fedoraproject.org (Ondrej Vasik)
Date: Tue, 20 Jan 2009 13:36:44 +0000 (UTC)
Subject: rpms/setup/devel .cvsignore, 1.56, 1.57 setup.spec, 1.66,
	1.67 sources, 1.57, 1.58 setup-2.7.5.patch, 1.2, NONE
Message-ID: <20090120133644.13E8B700F9@cvs1.fedora.phx.redhat.com>

Author: ovasik

Update of /cvs/extras/rpms/setup/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27907

Modified Files:
	.cvsignore setup.spec sources 
Removed Files:
	setup-2.7.5.patch 
Log Message:
make uidgid file better parseable, reserve gids for groups cdrom (:11), tape (:33) and dialout (:87) in uidgid file (#480762)


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/setup/devel/.cvsignore,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- .cvsignore	27 Nov 2008 12:16:25 -0000	1.56
+++ .cvsignore	20 Jan 2009 13:36:13 -0000	1.57
@@ -1 +1 @@
-setup-2.7.5.tar.bz2
+setup-2.7.6.tar.bz2


Index: setup.spec
===================================================================
RCS file: /cvs/extras/rpms/setup/devel/setup.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- setup.spec	7 Jan 2009 11:43:41 -0000	1.66
+++ setup.spec	20 Jan 2009 13:36:13 -0000	1.67
@@ -1,12 +1,11 @@
 Summary: A set of system configuration and setup files
 Name: setup
-Version: 2.7.5
-Release: 4%{?dist}
+Version: 2.7.6
+Release: 1%{?dist}
 License: Public Domain
 Group: System Environment/Base
 URL: https://fedorahosted.org/setup/
 Source: setup-%{version}.tar.bz2
-Patch1: setup-2.7.5.patch
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 BuildRequires: bash tcsh perl
@@ -19,7 +18,6 @@
 
 %prep
 %setup -q
-%patch1 -p1
 
 %build
 
@@ -89,6 +87,12 @@
 %ghost %verify(not md5 size mtime) %config(noreplace,missingok) /etc/mtab
 
 %changelog
+* Tue Jan 20 2009 Ondrej Vasik <ovasik at redhat.com> 2.7.6-1
+- make uidgid file better parseable (synchronize tabs)
+- reserve gid 11 for group cdrom (udev,MAKEDEV)
+- reserve gid 33 for group tape (udev,MAKEDEV)
+- reserve gid 87 for group dialout (udev,MAKEDEV)
+
 * Tue Jan 06 2009 Ondrej Vasik <ovasik at redhat.com> 2.7.5-4
 - use lua language in post to prevent additional
   dependencies


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/setup/devel/sources,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- sources	27 Nov 2008 12:16:25 -0000	1.57
+++ sources	20 Jan 2009 13:36:13 -0000	1.58
@@ -1 +1 @@
-86d0e073194683d55595e4516f967cf0  setup-2.7.5.tar.bz2
+c59aafd91d123db95f2260edeca679ee  setup-2.7.6.tar.bz2


--- setup-2.7.5.patch DELETED ---



From firewing at fedoraproject.org  Tue Jan 20 13:47:38 2009
From: firewing at fedoraproject.org (Stewart Adam)
Date: Tue, 20 Jan 2009 13:47:38 +0000 (UTC)
Subject: rpms/wxsvg/devel dead.package, NONE, 1.1 Makefile, 1.1, NONE sources,
	1.8, NONE wxsvg-1.0-internal_expat.patch, 1.2, NONE wxsvg.spec,
	1.13, NONE
Message-ID: <20090120134738.B45AC700F9@cvs1.fedora.phx.redhat.com>

Author: firewing

Update of /cvs/extras/rpms/wxsvg/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29786/devel

Added Files:
	dead.package 
Removed Files:
	Makefile sources wxsvg-1.0-internal_expat.patch wxsvg.spec 
Log Message:
Retire package



--- NEW FILE dead.package ---
No software uses wxsvg without its ffmpeg extensions - see https://www.redhat.com/archives/fedora-devel-list/2009-January/msg00871.html for more information. Because of this, it is being removed.


--- Makefile DELETED ---


--- sources DELETED ---


--- wxsvg-1.0-internal_expat.patch DELETED ---


--- wxsvg.spec DELETED ---



From firewing at fedoraproject.org  Tue Jan 20 13:47:37 2009
From: firewing at fedoraproject.org (Stewart Adam)
Date: Tue, 20 Jan 2009 13:47:37 +0000 (UTC)
Subject: rpms/wxsvg/F-10 dead.package, NONE, 1.1 Makefile, 1.1, NONE branch, 
	1.1, NONE sources, 1.7, NONE wxsvg-1.0-internal_expat.patch, 1.2,
	NONE wxsvg.spec, 1.12, NONE
Message-ID: <20090120134737.F28C3700F9@cvs1.fedora.phx.redhat.com>

Author: firewing

Update of /cvs/extras/rpms/wxsvg/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29786/F-10

Added Files:
	dead.package 
Removed Files:
	Makefile branch sources wxsvg-1.0-internal_expat.patch 
	wxsvg.spec 
Log Message:
Retire package



--- NEW FILE dead.package ---
No software uses wxsvg without its ffmpeg extensions - see https://www.redhat.com/archives/fedora-devel-list/2009-January/msg00871.html for more information. Because of this, it is being removed.


--- Makefile DELETED ---


--- branch DELETED ---


--- sources DELETED ---


--- wxsvg-1.0-internal_expat.patch DELETED ---


--- wxsvg.spec DELETED ---



From firewing at fedoraproject.org  Tue Jan 20 13:47:38 2009
From: firewing at fedoraproject.org (Stewart Adam)
Date: Tue, 20 Jan 2009 13:47:38 +0000 (UTC)
Subject: rpms/wxsvg/F-9 dead.package, NONE, 1.1 Makefile, 1.1, NONE branch,
	1.1, NONE sources, 1.6, NONE wxsvg-1.0-internal_expat.patch, 1.2,
	NONE wxsvg.spec, 1.10, NONE
Message-ID: <20090120134738.5B412700F9@cvs1.fedora.phx.redhat.com>

Author: firewing

Update of /cvs/extras/rpms/wxsvg/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29786/F-9

Added Files:
	dead.package 
Removed Files:
	Makefile branch sources wxsvg-1.0-internal_expat.patch 
	wxsvg.spec 
Log Message:
Retire package



--- NEW FILE dead.package ---
No software uses wxsvg without its ffmpeg extensions - see https://www.redhat.com/archives/fedora-devel-list/2009-January/msg00871.html for more information. Because of this, it is being removed.


--- Makefile DELETED ---


--- branch DELETED ---


--- sources DELETED ---


--- wxsvg-1.0-internal_expat.patch DELETED ---


--- wxsvg.spec DELETED ---



From firewing at fedoraproject.org  Tue Jan 20 13:47:37 2009
From: firewing at fedoraproject.org (Stewart Adam)
Date: Tue, 20 Jan 2009 13:47:37 +0000 (UTC)
Subject: rpms/wxsvg/EL-5 dead.package, NONE, 1.1 Makefile, 1.1, NONE branch, 
	1.1, NONE ltmain.sh, 1.1, NONE sources, 1.2, NONE wxsvg.spec,
	1.1, NONE
Message-ID: <20090120134737.A340A700F9@cvs1.fedora.phx.redhat.com>

Author: firewing

Update of /cvs/extras/rpms/wxsvg/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29786/EL-5

Added Files:
	dead.package 
Removed Files:
	Makefile branch ltmain.sh sources wxsvg.spec 
Log Message:
Retire package



--- NEW FILE dead.package ---
No software uses wxsvg without its ffmpeg extensions - see https://www.redhat.com/archives/fedora-devel-list/2009-January/msg00871.html for more information. Because of this, it is being removed.


--- Makefile DELETED ---


--- branch DELETED ---


--- ltmain.sh DELETED ---


--- sources DELETED ---


--- wxsvg.spec DELETED ---



From hadess at fedoraproject.org  Tue Jan 20 14:00:52 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Tue, 20 Jan 2009 14:00:52 +0000 (UTC)
Subject: rpms/python-Coherence/devel python-Coherence.spec,1.8,1.9
Message-ID: <20090120140052.C8FAC700F9@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/python-Coherence/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31091

Modified Files:
	python-Coherence.spec 
Log Message:
* Tue Jan 20 2009 - Bastien Nocera <bnocera at redhat.com> 0.6.0-2
- Install the D-Bus service file so that the Totem plugin can work



Index: python-Coherence.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-Coherence/devel/python-Coherence.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- python-Coherence.spec	2 Jan 2009 18:56:18 -0000	1.8
+++ python-Coherence.spec	20 Jan 2009 14:00:22 -0000	1.9
@@ -3,7 +3,7 @@
 Summary: Python framework to participate in digital living networks
 Name: python-Coherence
 Version: 0.6.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: MIT
 Group: Development/Languages
 URL: https://coherence.beebits.net/
@@ -48,6 +48,9 @@
     --single-version-externally-managed \
     -O1 --skip-build --root %{buildroot}
 
+# Install the D-Bus service file properly
+mkdir -p %{buildroot}/%{_datadir}/dbus-1/services
+cp -a misc/org.Coherence.service %{buildroot}/%{_datadir}/dbus-1/services
 
 %clean
 %{__rm} -rf %{buildroot}
@@ -58,6 +61,7 @@
 %doc LICENCE README docs/*
 %exclude %{_bindir}/applet-coherence
 %{_bindir}/coherence
+%{_datadir}/dbus-1/services/*
 %{python_sitelib}/Coherence-*.egg-info/
 %{python_sitelib}/coherence/
 # We don't want this in the package
@@ -65,6 +69,9 @@
 
 
 %changelog
+* Tue Jan 20 2009 - Bastien Nocera <bnocera at redhat.com> 0.6.0-2
+- Install the D-Bus service file so that the Totem plugin can work
+
 * Fri Jan  2 2009 Matthias Saou <http://freshrpms.net/> 0.6.0-1
 - Update to 0.6.0.
 - Remove bundled internal louie and require external + trivial sed to use it.



From pkgdb at fedoraproject.org  Tue Jan 20 14:04:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Jan 2009 14:04:35 +0000
Subject: [pkgdb] milter-greylist: kanarip has requested watchbugzilla
Message-ID: <20090120140435.E6D05208471@bastion.fedora.phx.redhat.com>

kanarip has requested the watchbugzilla acl on milter-greylist (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/milter-greylist



From pkgdb at fedoraproject.org  Tue Jan 20 14:04:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Jan 2009 14:04:37 +0000
Subject: [pkgdb] milter-greylist: kanarip has requested watchcommits
Message-ID: <20090120140438.0F43C208474@bastion.fedora.phx.redhat.com>

kanarip has requested the watchcommits acl on milter-greylist (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/milter-greylist



From pkgdb at fedoraproject.org  Tue Jan 20 14:04:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Jan 2009 14:04:39 +0000
Subject: [pkgdb] milter-greylist: kanarip has requested commit
Message-ID: <20090120140439.40CDC208477@bastion.fedora.phx.redhat.com>

kanarip has requested the commit acl on milter-greylist (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/milter-greylist



From pkgdb at fedoraproject.org  Tue Jan 20 14:04:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Jan 2009 14:04:41 +0000
Subject: [pkgdb] milter-greylist: kanarip has requested approveacls
Message-ID: <20090120140441.577CE20847A@bastion.fedora.phx.redhat.com>

kanarip has requested the approveacls acl on milter-greylist (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/milter-greylist



From pkgdb at fedoraproject.org  Tue Jan 20 14:04:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Jan 2009 14:04:53 +0000
Subject: [pkgdb] milter-greylist: kanarip has requested approveacls
Message-ID: <20090120140453.6834120847B@bastion.fedora.phx.redhat.com>

kanarip has requested the approveacls acl on milter-greylist (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/milter-greylist



From pkgdb at fedoraproject.org  Tue Jan 20 14:04:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Jan 2009 14:04:54 +0000
Subject: [pkgdb] milter-greylist: kanarip has requested commit
Message-ID: <20090120140454.78AEB20847F@bastion.fedora.phx.redhat.com>

kanarip has requested the commit acl on milter-greylist (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/milter-greylist



From pkgdb at fedoraproject.org  Tue Jan 20 14:05:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Jan 2009 14:05:01 +0000
Subject: [pkgdb] milter-greylist: kanarip has requested watchcommits
Message-ID: <20090120140503.54BFF208474@bastion.fedora.phx.redhat.com>

kanarip has requested the watchcommits acl on milter-greylist (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/milter-greylist



From pkgdb at fedoraproject.org  Tue Jan 20 14:05:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Jan 2009 14:05:03 +0000
Subject: [pkgdb] milter-greylist: kanarip has requested watchbugzilla
Message-ID: <20090120140503.8C059208482@bastion.fedora.phx.redhat.com>

kanarip has requested the watchbugzilla acl on milter-greylist (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/milter-greylist



From pkgdb at fedoraproject.org  Tue Jan 20 14:05:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Jan 2009 14:05:03 +0000
Subject: [pkgdb] milter-greylist: kanarip has requested watchcommits
Message-ID: <20090120140503.8EDE2208483@bastion.fedora.phx.redhat.com>

kanarip has requested the watchcommits acl on milter-greylist (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/milter-greylist



From pkgdb at fedoraproject.org  Tue Jan 20 14:05:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Jan 2009 14:05:08 +0000
Subject: [pkgdb] milter-greylist: kanarip has requested approveacls
Message-ID: <20090120140508.D1792208487@bastion.fedora.phx.redhat.com>

kanarip has requested the approveacls acl on milter-greylist (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/milter-greylist



From pkgdb at fedoraproject.org  Tue Jan 20 14:05:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Jan 2009 14:05:10 +0000
Subject: [pkgdb] milter-greylist: kanarip has requested commit
Message-ID: <20090120140510.3EFA220848A@bastion.fedora.phx.redhat.com>

kanarip has requested the commit acl on milter-greylist (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/milter-greylist



From pkgdb at fedoraproject.org  Tue Jan 20 14:05:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Jan 2009 14:05:12 +0000
Subject: [pkgdb] milter-greylist: kanarip has requested watchbugzilla
Message-ID: <20090120140512.55E56208479@bastion.fedora.phx.redhat.com>

kanarip has requested the watchbugzilla acl on milter-greylist (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/milter-greylist



From dwalsh at fedoraproject.org  Tue Jan 20 14:58:18 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Tue, 20 Jan 2009 14:58:18 +0000 (UTC)
Subject: rpms/policycoreutils/devel policycoreutils-gui.patch, 1.81,
	1.82 policycoreutils-po.patch, 1.44, 1.45 policycoreutils.spec,
	1.584, 1.585
Message-ID: <20090120145818.0C20B700F9@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/policycoreutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5764

Modified Files:
	policycoreutils-gui.patch policycoreutils-po.patch 
	policycoreutils.spec 
Log Message:
* Tue Jan 20 2009 Dan Walsh <dwalsh at redhat.com> 2.0.61-3
- Add Domains Page to system-config-selinux
- Add ability to create dbus confined applications to polgen


policycoreutils-gui.patch:

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.81 -r 1.82 policycoreutils-gui.patch
Index: policycoreutils-gui.patch
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils-gui.patch,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- policycoreutils-gui.patch	4 Jan 2009 19:46:52 -0000	1.81
+++ policycoreutils-gui.patch	20 Jan 2009 14:58:13 -0000	1.82
@@ -1,6 +1,6 @@
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/booleansPage.py policycoreutils-2.0.60/gui/booleansPage.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/booleansPage.py policycoreutils-2.0.61/gui/booleansPage.py
 --- nsapolicycoreutils/gui/booleansPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.60/gui/booleansPage.py	2008-12-15 15:34:54.000000000 -0500
++++ policycoreutils-2.0.61/gui/booleansPage.py	2009-01-14 10:05:38.000000000 -0500
 @@ -0,0 +1,247 @@
 +#
 +# booleansPage.py - GUI for Booleans page in system-config-securitylevel
@@ -249,9 +249,167 @@
 +        self.load(self.filter)
 +        return True
 +        
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/fcontextPage.py policycoreutils-2.0.60/gui/fcontextPage.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/domainsPage.py policycoreutils-2.0.61/gui/domainsPage.py
+--- nsapolicycoreutils/gui/domainsPage.py	1969-12-31 19:00:00.000000000 -0500
++++ policycoreutils-2.0.61/gui/domainsPage.py	2009-01-20 09:47:52.000000000 -0500
+@@ -0,0 +1,154 @@
++## domainsPage.py - show selinux domains
++## Copyright (C) 2009 Red Hat, Inc.
++
++## This program is free software; you can redistribute it and/or modify
++## it under the terms of the GNU General Public License as published by
++## the Free Software Foundation; either version 2 of the License, or
++## (at your option) any later version.
++
++## This program is distributed in the hope that it will be useful,
++## but WITHOUT ANY WARRANTY; without even the implied warranty of
++## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++## GNU General Public License for more details.
++
++## You should have received a copy of the GNU General Public License
++## along with this program; if not, write to the Free Software
++## Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++
++## Author: Dan Walsh
++import string
++import gtk
++import gtk.glade
++import os
++import commands
++import gobject
++import sys
++import seobject
++import selinux
++from semanagePage import *;
++import polgen
++
++##
++## I18N
++## 
++PROGNAME="policycoreutils"
++import gettext
++gettext.bindtextdomain(PROGNAME, "/usr/share/locale")
++gettext.textdomain(PROGNAME)
++try:
++    gettext.install(PROGNAME,
++                    localedir="/usr/share/locale",
++                    unicode=False,
++                    codeset = 'utf-8')
++except IOError:
++    import __builtin__
++    __builtin__.__dict__['_'] = unicode
++
++class domainsPage(semanagePage):
++    def __init__(self, xml):
++        semanagePage.__init__(self, xml, "domains", _("Process Domain"))
++        self.domain_filter = xml.get_widget("domainsFilterEntry")
++        self.domain_filter.connect("focus_out_event", self.filter_changed)
++        self.domain_filter.connect("activate", self.filter_changed)
++
++        self.store = gtk.ListStore(gobject.TYPE_STRING, gobject.TYPE_STRING)
++        self.view.set_model(self.store)
++        self.store.set_sort_column_id(0, gtk.SORT_ASCENDING)        
++        col = gtk.TreeViewColumn(_("Domain Name"), gtk.CellRendererText(), text = 0)
++        col.set_sort_column_id(0)
++        col.set_resizable(True)
++        self.view.append_column(col)
++        self.store.set_sort_column_id(0, gtk.SORT_ASCENDING)
++        col = gtk.TreeViewColumn(_("Mode"), gtk.CellRendererText(), text = 1)
++        col.set_sort_column_id(1)
++        col.set_resizable(True)
++        self.view.append_column(col)
++        self.view.get_selection().connect("changed", self.itemSelected)
++
++        self.permissive_button = xml.get_widget("permissiveButton")
++        self.enforcing_button = xml.get_widget("enforcingButton")
++
++        self.domains=polgen.get_all_domains()
++        self.load()
++        
++    def get_modules(self):
++        modules=[]
++        fd=os.popen("semodule -l")
++        mods = fd.readlines()
++        fd.close()
++        for l in mods:
++            modules.append(l.split()[0])
++        return modules
++
++    def load(self, filter=""):
++        self.filter=filter            
++        self.store.clear()
++        try:
++            modules=self.get_modules()
++            for domain in self.domains:
++                if not self.match(domain, filter):
++                    continue
++                iter = self.store.append()
++                self.store.set_value(iter, 0, domain)
++                t = "permissive_%s_t" % domain 
++                if t in modules:
++                    self.store.set_value(iter, 1, _("Permissive"))
++                else:
++                    self.store.set_value(iter, 1, "")
++        except:
++            pass
++        self.view.get_selection().select_path ((0,))
++    
++    def itemSelected(self, selection):
++        store, iter = selection.get_selected()
++        if iter == None:
++            return
++        p = store.get_value(iter, 1) == _("Permissive")
++        self.permissive_button.set_sensitive(not p)
++        self.enforcing_button.set_sensitive(p)
++
++    def deleteDialog(self):
++        # Do nothing
++        return self.delete()
++    
++    def delete(self):
++        selection = self.view.get_selection()
++        store, iter = selection.get_selected()
++        domain = store.get_value(iter, 0)
++        try:
++            self.wait()
++            status, output = commands.getstatusoutput("semanage permissive -d %s_t" % domain)
++            self.ready()
++            if status != 0:
++                self.error(output)
++            else:
++                domain = store.set_value(iter, 1, "")
++                self.itemSelected(selection)
++                
++        except ValueError, e:
++            self.error(e.args[0])
++
++    def propertiesDialog(self):
++        # Do nothing
++        return
++    
++    def addDialog(self):
++        # Do nothing
++        return self.add()
++    
++    def add(self):
++        selection = self.view.get_selection()
++        store, iter = selection.get_selected()
++        domain = store.get_value(iter, 0)
++        try:
++            self.wait()
++            status, output = commands.getstatusoutput("semanage permissive -a %s_t" % domain)
++            self.ready()
++            if status != 0:
++                self.error(output)
++            else:
++                domain = store.set_value(iter, 1, _("Permissive"))
++                self.itemSelected(selection)
++                
++        except ValueError, e:
++            self.error(e.args[0])
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/fcontextPage.py policycoreutils-2.0.61/gui/fcontextPage.py
 --- nsapolicycoreutils/gui/fcontextPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.60/gui/fcontextPage.py	2008-12-15 15:34:54.000000000 -0500
++++ policycoreutils-2.0.61/gui/fcontextPage.py	2009-01-14 10:05:38.000000000 -0500
 @@ -0,0 +1,223 @@
 +## fcontextPage.py - show selinux mappings
 +## Copyright (C) 2006 Red Hat, Inc.
@@ -476,9 +634,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.60/gui/html_util.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/html_util.py policycoreutils-2.0.61/gui/html_util.py
 --- nsapolicycoreutils/gui/html_util.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.60/gui/html_util.py	2008-12-15 15:34:54.000000000 -0500
++++ policycoreutils-2.0.61/gui/html_util.py	2009-01-14 10:05:38.000000000 -0500
 @@ -0,0 +1,164 @@
 +# Authors: John Dennis <jdennis at redhat.com>
 +#
@@ -644,9 +802,9 @@
[...4117 lines suppressed...]
 +type TEMPLATETYPE_t;
 +type TEMPLATETYPE_exec_t;
 +inetd_service_domain(TEMPLATETYPE_t, TEMPLATETYPE_exec_t)
++
++permissive TEMPLATETYPE_t;
 +"""
 +
 +te_userapp_types="""\
@@ -11681,6 +15422,7 @@
 +application_domain(TEMPLATETYPE_t, TEMPLATETYPE_exec_t)
 +role system_r types TEMPLATETYPE_t;
 +
++permissive TEMPLATETYPE_t;
 +"""
 +
 +te_cgi_types="""\
@@ -11692,6 +15434,8 @@
 +#
 +
 +apache_content_template(TEMPLATETYPE)
++
++permissive http_TEMPLATETYPE_script_t;
 +"""
 +
 +te_daemon_rules="""
@@ -11719,6 +15463,9 @@
 +te_inetd_rules="""
 +"""
 +
++te_dbusd_rules="""
++"""
++
 +te_userapp_rules="""
 +########################################
 +#
@@ -11759,7 +15506,7 @@
 +
 +te_dbus_rules="""
 +optional_policy(`
-+	dbus_system_bus_client_template(TEMPLATETYPE,TEMPLATETYPE_t)
++	dbus_system_bus_client(TEMPLATETYPE_t)
 +	dbus_connect_system_bus(TEMPLATETYPE_t)
 +')
 +"""
@@ -11942,9 +15689,9 @@
 +EXECUTABLE	--	gen_context(system_u:object_r:TEMPLATETYPE_script_exec_t,s0)
 +"""
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/__init__.py policycoreutils-2.0.60/gui/templates/__init__.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/__init__.py policycoreutils-2.0.61/gui/templates/__init__.py
 --- nsapolicycoreutils/gui/templates/__init__.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.60/gui/templates/__init__.py	2008-12-15 15:34:55.000000000 -0500
++++ policycoreutils-2.0.61/gui/templates/__init__.py	2009-01-14 10:05:39.000000000 -0500
 @@ -0,0 +1,18 @@
 +#
 +# Copyright (C) 2007 Red Hat, Inc.
@@ -11964,9 +15711,9 @@
 +# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 +#
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/network.py policycoreutils-2.0.60/gui/templates/network.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/network.py policycoreutils-2.0.61/gui/templates/network.py
 --- nsapolicycoreutils/gui/templates/network.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.60/gui/templates/network.py	2008-12-15 15:34:55.000000000 -0500
++++ policycoreutils-2.0.61/gui/templates/network.py	2009-01-14 10:05:39.000000000 -0500
 @@ -0,0 +1,80 @@
 +te_port_types="""
 +type TEMPLATETYPE_port_t;
@@ -12048,9 +15795,9 @@
 +corenet_udp_bind_all_unreserved_ports(TEMPLATETYPE_t)
 +"""
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/rw.py policycoreutils-2.0.60/gui/templates/rw.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/rw.py policycoreutils-2.0.61/gui/templates/rw.py
 --- nsapolicycoreutils/gui/templates/rw.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.60/gui/templates/rw.py	2008-12-15 15:34:55.000000000 -0500
++++ policycoreutils-2.0.61/gui/templates/rw.py	2009-01-14 10:05:39.000000000 -0500
 @@ -0,0 +1,128 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -12180,9 +15927,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.60/gui/templates/script.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/script.py policycoreutils-2.0.61/gui/templates/script.py
 --- nsapolicycoreutils/gui/templates/script.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.60/gui/templates/script.py	2008-12-15 15:34:55.000000000 -0500
++++ policycoreutils-2.0.61/gui/templates/script.py	2009-01-14 10:05:39.000000000 -0500
 @@ -0,0 +1,105 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -12289,9 +16036,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.60/gui/templates/semodule.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/semodule.py policycoreutils-2.0.61/gui/templates/semodule.py
 --- nsapolicycoreutils/gui/templates/semodule.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.60/gui/templates/semodule.py	2008-12-15 15:34:55.000000000 -0500
++++ policycoreutils-2.0.61/gui/templates/semodule.py	2009-01-14 10:05:39.000000000 -0500
 @@ -0,0 +1,41 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -12334,9 +16081,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.60/gui/templates/tmp.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/tmp.py policycoreutils-2.0.61/gui/templates/tmp.py
 --- nsapolicycoreutils/gui/templates/tmp.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.60/gui/templates/tmp.py	2008-12-15 15:34:55.000000000 -0500
++++ policycoreutils-2.0.61/gui/templates/tmp.py	2009-01-14 10:05:39.000000000 -0500
 @@ -0,0 +1,97 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -12435,9 +16182,9 @@
 +	TEMPLATETYPE_manage_tmp($1)
 +"""
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/user.py policycoreutils-2.0.60/gui/templates/user.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/user.py policycoreutils-2.0.61/gui/templates/user.py
 --- nsapolicycoreutils/gui/templates/user.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.60/gui/templates/user.py	2008-12-15 15:34:55.000000000 -0500
++++ policycoreutils-2.0.61/gui/templates/user.py	2009-01-14 10:05:39.000000000 -0500
 @@ -0,0 +1,182 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -12621,9 +16368,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.60/gui/templates/var_lib.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_lib.py policycoreutils-2.0.61/gui/templates/var_lib.py
 --- nsapolicycoreutils/gui/templates/var_lib.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.60/gui/templates/var_lib.py	2008-12-15 15:34:55.000000000 -0500
++++ policycoreutils-2.0.61/gui/templates/var_lib.py	2009-01-14 10:05:39.000000000 -0500
 @@ -0,0 +1,158 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -12783,9 +16530,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.60/gui/templates/var_log.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_log.py policycoreutils-2.0.61/gui/templates/var_log.py
 --- nsapolicycoreutils/gui/templates/var_log.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.60/gui/templates/var_log.py	2008-12-15 15:34:55.000000000 -0500
++++ policycoreutils-2.0.61/gui/templates/var_log.py	2009-01-14 10:05:39.000000000 -0500
 @@ -0,0 +1,110 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -12897,9 +16644,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.60/gui/templates/var_run.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_run.py policycoreutils-2.0.61/gui/templates/var_run.py
 --- nsapolicycoreutils/gui/templates/var_run.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.60/gui/templates/var_run.py	2008-12-15 15:34:55.000000000 -0500
++++ policycoreutils-2.0.61/gui/templates/var_run.py	2009-01-14 10:05:39.000000000 -0500
 @@ -0,0 +1,118 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -13019,9 +16766,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.60/gui/templates/var_spool.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_spool.py policycoreutils-2.0.61/gui/templates/var_spool.py
 --- nsapolicycoreutils/gui/templates/var_spool.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.60/gui/templates/var_spool.py	2008-12-15 15:34:55.000000000 -0500
++++ policycoreutils-2.0.61/gui/templates/var_spool.py	2009-01-14 10:05:39.000000000 -0500
 @@ -0,0 +1,129 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -13152,9 +16899,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.60/gui/translationsPage.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/translationsPage.py policycoreutils-2.0.61/gui/translationsPage.py
 --- nsapolicycoreutils/gui/translationsPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.60/gui/translationsPage.py	2008-12-15 15:34:55.000000000 -0500
++++ policycoreutils-2.0.61/gui/translationsPage.py	2009-01-14 10:05:39.000000000 -0500
 @@ -0,0 +1,118 @@
 +## translationsPage.py - show selinux translations
 +## Copyright (C) 2006 Red Hat, Inc.
@@ -13274,9 +17021,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.60/gui/usersPage.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/usersPage.py policycoreutils-2.0.61/gui/usersPage.py
 --- nsapolicycoreutils/gui/usersPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.60/gui/usersPage.py	2008-12-15 15:34:55.000000000 -0500
++++ policycoreutils-2.0.61/gui/usersPage.py	2009-01-14 10:05:39.000000000 -0500
 @@ -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.44 -r 1.45 policycoreutils-po.patch
Index: policycoreutils-po.patch
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils-po.patch,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- policycoreutils-po.patch	10 Dec 2008 14:19:50 -0000	1.44
+++ policycoreutils-po.patch	20 Jan 2009 14:58:13 -0000	1.45
@@ -1,34221 +1,138171 @@
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/as.po policycoreutils-2.0.60/po/as.po
---- nsapolicycoreutils/po/as.po	2008-09-22 13:25:06.000000000 -0400
-+++ policycoreutils-2.0.60/po/as.po	2008-12-10 09:17:41.000000000 -0500
-@@ -1,4 +1,4 @@
--# translation of as.po to Assamese
-+# translation of policycoreutils.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 ""
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/af.po policycoreutils-2.0.61/po/af.po
+--- nsapolicycoreutils/po/af.po	2008-09-22 13:25:06.000000000 -0400
++++ policycoreutils-2.0.61/po/af.po	2009-01-20 09:33:29.000000000 -0500
+@@ -8,7 +8,7 @@
  msgstr ""
--"Project-Id-Version: as\n"
-+"Project-Id-Version: policycoreutils.HEAD\n"
+ "Project-Id-Version: PACKAGE VERSION\n"
  "Report-Msgid-Bugs-To: \n"
 -"POT-Creation-Date: 2008-09-09 13:24-0400\n"
--"PO-Revision-Date: 2008-01-31 12:04+0530\n"
-+"POT-Creation-Date: 2008-09-24 01:16+0000\n"
-+"PO-Revision-Date: 2008-09-24 12:55+0530\n"
- "Last-Translator: Amitakhya Phukan <aphukan at fedoraproject.org>\n"
- "Language-Team: Assamese\n"
- "MIME-Version: 1.0\n"
-@@ -19,6 +19,7 @@
- "X-Generator: KBabel 1.11.4\n"
- "Plural-Forms: nplurals=2; plural=(n!=1)\n"
- 
-+#. USAGE_STRING describes the command-line args of this program.
- #: ../run_init/run_init.c:67
- msgid ""
- "USAGE: run_init <script> <args ...>\n"
-@@ -91,14 +92,26 @@
++"POT-Creation-Date: 2009-01-20 09:33-0500\n"
+ "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+ "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
+ "Language-Team: LANGUAGE <LL at li.org>\n"
+@@ -85,818 +85,819 @@
  msgid "To make this policy package active, execute:"
- msgstr "????????????????????? ??????????????? ????????????????????? ?????????????????? ???????????? ????????????, ????????????????????? ?????????:"
+ msgstr ""
  
-+#: ../audit2allow/audit2allow:219
-+#, c-format
-+msgid ""
-+"\n"
-+"\n"
-+"semodule -i %s\n"
-+"\n"
-+msgstr ""
-+"\n"
-+"\n"
-+"semodule -i %s\n"
-+"\n"
-+
- #: ../semanage/seobject.py:49
+-#: ../semanage/seobject.py:49
++#: ../semanage/seobject.py:48
  msgid "Could not create semanage handle"
- msgstr "semanage ????????????????????? ????????????????????? ????????? ???????????????"
+ msgstr ""
  
- #: ../semanage/seobject.py:56
+-#: ../semanage/seobject.py:56
++#: ../semanage/seobject.py:55
  msgid "SELinux policy is not managed or store cannot be accessed."
--msgstr ""
--"SELinux ???????????????????????? ???????????????????????? ???????????????????????? ????????? ???????????? ?????????????????????????????? ????????????????????? ????????? ??????????????? ????????? ???"
-+msgstr "SELinux ???????????????????????? ???????????????????????? ???????????????????????? ????????? ???????????? ?????????????????????????????? ????????????????????? ????????? ??????????????? ????????? ???"
+ msgstr ""
  
- #: ../semanage/seobject.py:61
+-#: ../semanage/seobject.py:61
++#: ../semanage/seobject.py:60
  msgid "Cannot read policy store."
-@@ -110,22 +123,22 @@
+ msgstr ""
  
- #: ../semanage/seobject.py:137 ../semanage/seobject.py:141
- msgid "global"
--msgstr ""
-+msgstr "?????????????????????????????????"
+-#: ../semanage/seobject.py:66
++#: ../semanage/seobject.py:65
+ msgid "Could not establish semanage connection"
+ msgstr ""
  
- #: ../semanage/seobject.py:196
- msgid "translations not supported on non-MLS machines"
- msgstr "MLS-??????????????? ????????????????????? ?????????????????? ?????????????????? ????????? ?????????"
+-#: ../semanage/seobject.py:137 ../semanage/seobject.py:141
+-msgid "global"
++#: ../semanage/seobject.py:70
++msgid "Could not test MLS enabled status"
+ msgstr ""
  
- #: ../semanage/seobject.py:203
--#, fuzzy, python-format
-+#, python-format
+-#: ../semanage/seobject.py:196
+-msgid "translations not supported on non-MLS machines"
++#: ../semanage/seobject.py:142 ../semanage/seobject.py:146
++msgid "global"
+ msgstr ""
+ 
+-#: ../semanage/seobject.py:203
++#: ../semanage/seobject.py:206
+ #, python-format
  msgid "Unable to open %s: translations not supported on non-MLS machines: %s"
--msgstr "%s ????????????????????? ??????????????????: MLS-??????????????? ????????????????????? ?????????????????? ?????????????????? ????????? ?????????"
-+msgstr "%s ????????????????????? ??????????????????: MLS-??????????????? ????????????????????? ?????????????????? ?????????????????? ????????? ?????????: %s"
+ msgstr ""
  
- #: ../semanage/seobject.py:236
+-#: ../semanage/seobject.py:236
++#: ../semanage/seobject.py:239
  msgid "Level"
- msgstr "????????????"
+ msgstr ""
  
 -#: ../semanage/seobject.py:236 ../gui/system-config-selinux.glade:651
-+#: ../semanage/seobject.py:236 ../gui/system-config-selinux.glade.h:60
++#: ../semanage/seobject.py:239 ../gui/system-config-selinux.glade:651
  #: ../gui/translationsPage.py:43 ../gui/translationsPage.py:59
  msgid "Translation"
- msgstr "??????????????????"
-@@ -164,9 +177,8 @@
- msgstr "semanage ????????????-?????????????????? ??????????????? ????????? ???????????????"
- 
- #: ../semanage/seobject.py:311
--#, fuzzy
- msgid "Could not list SELinux modules"
--msgstr "SELinux ??????????????????????????????????????????????????? ?????????????????? ????????????????????? ????????? ???????????????"
-+msgstr "SELinux ???????????? ?????????????????? ????????????????????? ????????? ???????????????"
- 
- #: ../semanage/seobject.py:322
- msgid "Permissive Types"
-@@ -204,9 +216,9 @@
- msgstr "%s'??? ???????????????????????? ?????????????????? ??????????????? ???????????????????????? ???????????????????????? ??????????????????????????? ????????????"
+ msgstr ""
  
- #: ../semanage/seobject.py:403
--#, fuzzy, python-format
-+#, python-format
- msgid "Linux Group %s does not exist"
--msgstr "Linux ??????????????????????????????????????? %s ???????????????????????? ????????????????????? ?????????"
-+msgstr "Linux ?????????????????? %s ????????????????????? ?????????"
+-#: ../semanage/seobject.py:244 ../semanage/seobject.py:258
++#: ../semanage/seobject.py:247 ../semanage/seobject.py:261
+ #, python-format
+ msgid "Translations can not contain spaces '%s' "
+ msgstr ""
  
- #: ../semanage/seobject.py:408
+-#: ../semanage/seobject.py:247
++#: ../semanage/seobject.py:250
  #, python-format
-@@ -264,8 +276,7 @@
- #: ../semanage/seobject.py:510
+ msgid "Invalid Level '%s' "
+ msgstr ""
+ 
+-#: ../semanage/seobject.py:250
++#: ../semanage/seobject.py:253
  #, python-format
- msgid "Login mapping for %s is defined in policy, cannot be deleted"
--msgstr ""
--"%s'??? ???????????? ?????????????????? ??????????????? ???????????????????????? ??????????????????????????? ??????????????????????????? ??????????????? ????????? ????????????????????? ??????????????? ?????????"
-+msgstr "%s'??? ???????????? ?????????????????? ??????????????? ???????????????????????? ??????????????????????????? ??????????????????????????? ??????????????? ????????? ????????????????????? ??????????????? ?????????"
+ msgid "%s already defined in translations"
+ msgstr ""
  
- #: ../semanage/seobject.py:514
+-#: ../semanage/seobject.py:262
++#: ../semanage/seobject.py:265
  #, python-format
-@@ -277,19 +288,17 @@
- msgstr "?????????????????? ??????????????? ????????????????????????????????? ????????? ???????????????"
+ msgid "%s not defined in translations"
+ msgstr ""
  
- #: ../semanage/seobject.py:550 ../semanage/seobject.py:555
--#: ../gui/system-config-selinux.glade:100
-+#: ../gui/system-config-selinux.glade.h:32
- msgid "Login Name"
- msgstr "?????????????????? ?????????"
+-#: ../semanage/seobject.py:288
[...181832 lines suppressed...]
+ msgstr ""
  
--#: ../gui/portsPage.py:85
--msgid ""
--"SELinux Port\n"
--"Type"
--msgstr ""
--"SELinux ?????????\n"
--"??????"
-+#: ../gui/statusPage.py:75
-+msgid "Disabled"
-+msgstr "??????"
+-#: ../gui/polgen.py:830
++#: ../gui/polgen.py:848
+ msgid "Type Enforcement file"
+ msgstr ""
  
--#: ../gui/portsPage.py:91 ../gui/system-config-selinux.glade.h:42
--msgid "Protocol"
--msgstr "????????????"
-+#: ../gui/statusPage.py:94
-+msgid "Status"
-+msgstr "??????"
+-#: ../gui/polgen.py:831
++#: ../gui/polgen.py:849
+ msgid "Interface file"
+ msgstr ""
  
--#: ../gui/portsPage.py:96 ../gui/system-config-selinux.glade.h:34
-+#: ../gui/statusPage.py:133
- msgid ""
--"MLS/MCS\n"
--"Level"
--msgstr ""
--"MLS/MCS\n"
--"??????"
--
--#: ../gui/portsPage.py:101
--msgid "Port"
--msgstr "?????????"
-+"Changing the policy type will cause a relabel of the entire file system on "
-+"the next boot. Relabeling takes a long time depending on the size of the "
-+"file system.  Do you wish to continue?"
-+msgstr "???????????????????????????????????????????????????????????????????????????????????????relabeling????????????????????????????????????????????????????????????????????????????????????????????????????????????"
+-#: ../gui/polgen.py:832
++#: ../gui/polgen.py:850
+ msgid "File Contexts file"
+ msgstr ""
  
--#: ../gui/portsPage.py:207
--#, python-format
--msgid "Port number \"%s\" is not valid.  0 < PORT_NUMBER < 65536 "
--msgstr "???????????????%s????????????0 < PORT_NUMBER < 65536 "
-+#: ../gui/statusPage.py:147
-+msgid ""
-+"Changing to SELinux disabled requires a reboot.  It is not recommended.  If "
-+"you later decide to turn SELinux back on, the system will be required to "
-+"relabel.  If you just want to see if SELinux is causing a problem on your "
-+"system, you can go to permissive mode which will only log errors and not "
-+"enforce SELinux policy.  Permissive mode does not require a reboot    Do you "
-+"wish to continue?"
-+msgstr "????????? SELinux ???????????????????????????????????????????????????????????????????????????????????????????????? SELinux ???????????????????????????????????????????????????????????????????????? SELinux ????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? SELinux ?????????????????????????????????????????????    ?????????????????????????????????"
+-#: ../gui/polgen.py:833
++#: ../gui/polgen.py:851
+ msgid "Setup Script"
+ msgstr ""
  
--#: ../gui/portsPage.py:252
--msgid "List View"
--msgstr "????????????"
-+#: ../gui/statusPage.py:152
-+msgid ""
-+"Changing to SELinux enabled will cause a relabel of the entire file system "
-+"on the next boot. Relabeling takes a long time depending on the size of the "
-+"file system.  Do you wish to continue?"
-+msgstr "?????? SELinux ???????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????"
+@@ -2999,16 +3004,16 @@
+ msgid "Add %s"
+ msgstr ""
  
--#: ../gui/portsPage.py:255 ../gui/system-config-selinux.glade.h:29
--msgid "Group View"
--msgstr "????????????"
-+#: ../gui/system-config-selinux.glade.h:1
-+msgid "<b>Select:</b>"
-+msgstr "<b>?????????</b>"
+-#: ../gui/semanagePage.py:149
++#: ../gui/semanagePage.py:148
+ #, python-format
+ msgid "Modify %s"
+ msgstr ""
  
- #: ../gui/system-config-selinux.glade.h:2
- msgid "Add"
-@@ -3155,7 +3130,15 @@
+-#: ../gui/statusPage.py:69
++#: ../gui/statusPage.py:69 ../gui/system-config-selinux.glade:3210
+ msgid "Permissive"
+ msgstr ""
  
- #: ../gui/system-config-selinux.glade.h:9
- msgid "Add Translation"
--msgstr "????????????s"
-+msgstr "????????????"
-+
-+#: ../gui/system-config-selinux.glade.h:10
-+msgid ""
-+"Copyright (c)2006 Red Hat, Inc.\n"
-+"Copyright (c) 2006 Dan Walsh <dwalsh at redhat.com>"
-+msgstr ""
-+"Copyright???c???2006 Red Hat, Inc.\n"
-+"Copyright???c???2006 Dan Walsh <dwalsh at redhat.com>"
+-#: ../gui/statusPage.py:70
++#: ../gui/statusPage.py:70 ../gui/system-config-selinux.glade:3228
+ msgid "Enforcing"
+ msgstr ""
  
- #: ../gui/system-config-selinux.glade.h:12
- msgid "Current Enforcing Mode"
-@@ -3273,6 +3256,10 @@
+@@ -3069,12 +3074,6 @@
  msgid "SELinux Type"
- msgstr "SELinux ??????"
+ msgstr ""
  
-+#: ../gui/system-config-selinux.glade.h:53
-+msgid "Select Management Object"
-+msgstr "??????????????????"
-+
- #: ../gui/system-config-selinux.glade.h:54
+-#: ../gui/system-config-selinux.glade:440
+-msgid ""
+-"tcp\n"
+-"udp"
+-msgstr ""
+-
+ #: ../gui/system-config-selinux.glade:622
  msgid ""
- "Select if you wish to relabel then entire file system on next reboot.  "
-@@ -3307,7 +3294,7 @@
+ "SELinux MLS/MCS\n"
+@@ -3193,6 +3192,7 @@
+ #: ../gui/system-config-selinux.glade:2618
+ #: ../gui/system-config-selinux.glade:2860
+ #: ../gui/system-config-selinux.glade:3084
++#: ../gui/system-config-selinux.glade:3258
+ msgid "Filter"
+ msgstr ""
  
- #: ../gui/system-config-selinux.glade.h:62
- msgid "_Properties"
--msgstr "?????????_P???"
-+msgstr "?????????_P???"
+@@ -3286,10 +3286,12 @@
+ msgstr ""
  
- #: ../gui/system-config-selinux.glade.h:63
- msgid ""
-@@ -3329,6 +3316,10 @@
- "????????????\n"
- "named ??????\n"
+ #: ../gui/system-config-selinux.glade:3001
++#: ../gui/system-config-selinux.glade:3209
+ msgid "Load policy module"
+ msgstr ""
  
-+#: ../gui/system-config-selinux.glade.h:72
-+msgid "system-config-selinux"
-+msgstr "system-config-selinux"
-+
- #: ../gui/system-config-selinux.glade.h:73
- msgid ""
- "tcp\n"
-@@ -3337,3 +3328,12 @@
- "tcp\n"
- "udp"
+ #: ../gui/system-config-selinux.glade:3017
++#: ../gui/system-config-selinux.glade:3227
+ msgid "Remove loadable policy module"
+ msgstr ""
  
-+#: ../gui/translationsPage.py:53
-+msgid "Sensitvity Level"
-+msgstr "?????????"
-+
-+#: ../gui/usersPage.py:138
-+#, python-format
-+msgid "SELinux user '%s' is required"
-+msgstr "?????? SELinux ?????????%s???"
+@@ -3303,6 +3305,10 @@
+ msgid "label44"
+ msgstr ""
+ 
++#: ../gui/system-config-selinux.glade:3346
++msgid "label59"
++msgstr ""
 +
+ #: ../gui/translationsPage.py:53
+ msgid "Sensitvity Level"
+ msgstr ""


Index: policycoreutils.spec
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils.spec,v
retrieving revision 1.584
retrieving revision 1.585
diff -u -r1.584 -r1.585
--- policycoreutils.spec	14 Jan 2009 15:00:08 -0000	1.584
+++ policycoreutils.spec	20 Jan 2009 14:58:16 -0000	1.585
@@ -6,7 +6,7 @@
 Summary: SELinux policy core utilities
 Name:	 policycoreutils
 Version: 2.0.61
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+
 Group:	 System Environment/Base
 Source:	 http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@@ -206,6 +206,10 @@
 fi
 
 %changelog
+* Tue Jan 20 2009 Dan Walsh <dwalsh at redhat.com> 2.0.61-3
+- Add Domains Page to system-config-selinux
+- Add ability to create dbus confined applications to polgen
+
 * Wed Jan 14 2009 Dan Walsh <dwalsh at redhat.com> 2.0.61-2
 - Split python into a separate package
 



From mbarnes at fedoraproject.org  Tue Jan 20 14:58:51 2009
From: mbarnes at fedoraproject.org (Matthew Barnes)
Date: Tue, 20 Jan 2009 14:58:51 +0000 (UTC)
Subject: rpms/evolution-sharp/devel .cvsignore,1.24,1.25 sources,1.24,1.25
Message-ID: <20090120145851.1BF47700F9@cvs1.fedora.phx.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/evolution-sharp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5841

Modified Files:
	.cvsignore sources 
Log Message:
Commit sources.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-sharp/devel/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- .cvsignore	25 Sep 2008 14:36:07 -0000	1.24
+++ .cvsignore	20 Jan 2009 14:58:20 -0000	1.25
@@ -1 +1 @@
-evolution-sharp-0.18.0.tar.bz2
+evolution-sharp-0.19.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-sharp/devel/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- sources	25 Sep 2008 14:36:07 -0000	1.24
+++ sources	20 Jan 2009 14:58:20 -0000	1.25
@@ -1 +1 @@
-705d355b205e147e95a30e8e431db3bf  evolution-sharp-0.18.0.tar.bz2
+d6b3d5988d1a082724ac8ff7463202af  evolution-sharp-0.19.1.tar.bz2



From dwalsh at fedoraproject.org  Tue Jan 20 15:12:31 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Tue, 20 Jan 2009 15:12:31 +0000 (UTC)
Subject: rpms/selinux-policy/devel policy-20090105.patch,1.13,1.14
Message-ID: <20090120151231.09E57700F9@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8078

Modified Files:
	policy-20090105.patch 
Log Message:
* Mon Jan 19 2009 Dan Walsh <dwalsh at redhat.com> 3.6.3-2
- Add devicekit policy


policy-20090105.patch:

Index: policy-20090105.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-20090105.patch,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- policy-20090105.patch	19 Jan 2009 22:34:56 -0000	1.13
+++ policy-20090105.patch	20 Jan 2009 15:12:00 -0000	1.14
@@ -8349,7 +8349,7 @@
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.te serefpolicy-3.6.3/policy/modules/services/apache.te
 --- nsaserefpolicy/policy/modules/services/apache.te	2009-01-19 11:06:49.000000000 -0500
-+++ serefpolicy-3.6.3/policy/modules/services/apache.te	2009-01-19 17:34:22.000000000 -0500
++++ serefpolicy-3.6.3/policy/modules/services/apache.te	2009-01-20 07:55:29.000000000 -0500
 @@ -19,6 +19,8 @@
  # Declarations
  #
@@ -8833,7 +8833,7 @@
  
  tunable_policy(`httpd_can_network_connect',`
  	allow httpd_suexec_t self:tcp_socket create_stream_socket_perms;
-@@ -641,12 +788,23 @@
+@@ -641,12 +788,19 @@
  	corenet_sendrecv_all_client_packets(httpd_suexec_t)
  ')
  
@@ -8844,10 +8844,6 @@
 +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)
-+	domtrans_pattern(httpd_suexec_t, httpd_user_content_t, httpd_user_script_t)
-+	domtrans_pattern(httpd_suexec_t, httpd_user_script_ra_t, httpd_user_script_t)
-+	domtrans_pattern(httpd_suexec_t, httpd_user_script_rw_t, httpd_user_script_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)
@@ -8860,7 +8856,7 @@
  ')
  
  tunable_policy(`httpd_enable_homedirs && use_nfs_home_dirs',`
-@@ -655,6 +813,12 @@
+@@ -655,6 +809,12 @@
  	fs_exec_nfs_files(httpd_suexec_t)
  ')
  
@@ -8873,7 +8869,7 @@
  tunable_policy(`httpd_enable_homedirs && use_samba_home_dirs',`
  	fs_read_cifs_files(httpd_suexec_t)
  	fs_read_cifs_symlinks(httpd_suexec_t)
-@@ -672,15 +836,14 @@
+@@ -672,15 +832,14 @@
  	dontaudit httpd_suexec_t httpd_t:unix_stream_socket { read write };
  ')
  
@@ -8892,7 +8888,7 @@
  allow httpd_sys_script_t httpd_t:tcp_socket { read write };
  
  dontaudit httpd_sys_script_t httpd_config_t:dir search;
-@@ -699,12 +862,24 @@
+@@ -699,12 +858,24 @@
  # Should we add a boolean?
  apache_domtrans_rotatelogs(httpd_sys_script_t)
  
@@ -8919,7 +8915,7 @@
  ')
  
  tunable_policy(`httpd_enable_homedirs && use_nfs_home_dirs',`
-@@ -712,6 +887,35 @@
+@@ -712,6 +883,35 @@
  	fs_read_nfs_symlinks(httpd_sys_script_t)
  ')
  
@@ -8955,7 +8951,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)
-@@ -724,6 +928,10 @@
+@@ -724,6 +924,10 @@
  optional_policy(`
  	mysql_stream_connect(httpd_sys_script_t)
  	mysql_rw_db_sockets(httpd_sys_script_t)
@@ -8966,7 +8962,7 @@
  ')
  
  optional_policy(`
-@@ -735,6 +943,8 @@
+@@ -735,6 +939,8 @@
  # httpd_rotatelogs local policy
  #
  
@@ -8975,17 +8971,20 @@
  manage_files_pattern(httpd_rotatelogs_t, httpd_log_t, httpd_log_t)
  
  kernel_read_kernel_sysctls(httpd_rotatelogs_t)
-@@ -754,6 +964,9 @@
+@@ -754,6 +960,12 @@
  
  tunable_policy(`httpd_enable_cgi && httpd_unified',`
  	allow httpd_user_script_t httpdcontent:file entrypoint;
 +	manage_dirs_pattern(httpd_user_script_t, httpd_user_content_t, httpd_user_content_t)
 +	manage_files_pattern(httpd_user_script_t, httpd_user_content_t, httpd_user_content_t)
++	manage_dirs_pattern(httpd_user_script_t, httpd_user_content_ra_t, httpd_user_content_ra_t)
 +	manage_files_pattern(httpd_user_script_t, httpd_user_content_ra_t, httpd_user_content_ra_t)
++	manage_dirs_pattern(httpd_user_script_t, httpd_user_content_rw_t, httpd_user_content_rw_t)
++	manage_files_pattern(httpd_user_script_t, httpd_user_content_rw_t, httpd_user_content_rw_t)
  ')
  
  # allow accessing files/dirs below the users home dir
-@@ -762,3 +975,66 @@
+@@ -762,3 +974,66 @@
  	userdom_search_user_home_dirs(httpd_suexec_t)
  	userdom_search_user_home_dirs(httpd_user_script_t)
  ')



From jmoyer at fedoraproject.org  Tue Jan 20 15:16:42 2009
From: jmoyer at fedoraproject.org (Jeffrey E. Moyer)
Date: Tue, 20 Jan 2009 15:16:42 +0000 (UTC)
Subject: rpms/libaio/devel libaio-install-to-slash.patch, 1.1,
	1.2 libaio.spec, 1.29, 1.30
Message-ID: <20090120151642.3DC97700F9@cvs1.fedora.phx.redhat.com>

Author: jmoyer

Update of /cvs/pkgs/rpms/libaio/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8518

Modified Files:
	libaio-install-to-slash.patch libaio.spec 
Log Message:
Fix the install to / patch.  It didn't put the .so.1 in the right place
previously, which resulted in applications not finding the library.


libaio-install-to-slash.patch:

Index: libaio-install-to-slash.patch
===================================================================
RCS file: /cvs/pkgs/rpms/libaio/devel/libaio-install-to-slash.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libaio-install-to-slash.patch	3 Sep 2008 20:17:42 -0000	1.1
+++ libaio-install-to-slash.patch	20 Jan 2009 15:16:41 -0000	1.2
@@ -1,6 +1,6 @@
 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
+--- libaio-0.3.107/src/Makefile.orig	2009-01-20 10:07:31.520105235 -0500
++++ libaio-0.3.107/src/Makefile	2009-01-20 10:08:51.199104930 -0500
 @@ -1,6 +1,7 @@
  prefix=/usr
 -includedir=$(prefix)/include
@@ -23,7 +23,7 @@
 +	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)$(libdir)/$(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.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- libaio.spec	2 Oct 2008 02:48:29 -0000	1.29
+++ libaio.spec	20 Jan 2009 15:16:41 -0000	1.30
@@ -1,6 +1,6 @@
 Name: libaio
 Version: 0.3.107
-Release: 6%{?dist}
+Release: 7%{?dist}
 Summary: Linux-native asynchronous I/O access library
 License: LGPLv2+
 Group:  System Environment/Libraries
@@ -73,6 +73,9 @@
 %attr(0644,root,root) %{_libdir}/libaio.a
 
 %changelog
+* Tue Jan 20 2009 Jeff Moyer <jmoyer at redhat.com> - 0.3.107-7
+- Fix the install to / patch.
+
 * Wed Oct 01 2008 Dennis Gilmore <dennis at ausil.us> - 0.3.107-6
 - add patch with sparc support
 



From dwalsh at fedoraproject.org  Tue Jan 20 15:23:34 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Tue, 20 Jan 2009 15:23:34 +0000 (UTC)
Subject: rpms/policycoreutils/F-10 policycoreutils.spec,1.574,1.575
Message-ID: <20090120152334.AB526700F9@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/policycoreutils/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9328

Modified Files:
	policycoreutils.spec 
Log Message:
add make


Index: policycoreutils.spec
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/F-10/policycoreutils.spec,v
retrieving revision 1.574
retrieving revision 1.575
diff -u -r1.574 -r1.575
--- policycoreutils.spec	4 Jan 2009 19:25:21 -0000	1.574
+++ policycoreutils.spec	20 Jan 2009 15:23:04 -0000	1.575
@@ -113,7 +113,7 @@
 Requires: usermode-gtk 
 Requires: setools-console
 Requires: selinux-policy-devel
-Requires: python >= 2.4
+Requires: python >= 2.6 /usr/bin/make
 BuildRequires: desktop-file-utils
 
 %description gui



From pkgdb at fedoraproject.org  Tue Jan 20 15:23:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Jan 2009 15:23:37 +0000
Subject: [pkgdb] libifp: linuxpham has requested watchbugzilla
Message-ID: <20090120152337.8290E208467@bastion.fedora.phx.redhat.com>

linuxpham has requested the watchbugzilla acl on libifp (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libifp



From pkgdb at fedoraproject.org  Tue Jan 20 15:23:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Jan 2009 15:23:44 +0000
Subject: [pkgdb] libifp: linuxpham has requested watchcommits
Message-ID: <20090120152344.E3A88208473@bastion.fedora.phx.redhat.com>

linuxpham has requested the watchcommits acl on libifp (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libifp



From sharkcz at fedoraproject.org  Tue Jan 20 15:24:04 2009
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Tue, 20 Jan 2009 15:24:04 +0000 (UTC)
Subject: rpms/collectl/devel .cvsignore, 1.5, 1.6 collectl.spec, 1.4,
	1.5 sources, 1.5, 1.6
Message-ID: <20090120152404.6788D700F9@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/collectl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9410

Modified Files:
	.cvsignore collectl.spec sources 
Log Message:
* Tue Jan 20 2009 Dan Horak <dan[at]danny.cz> 3.1.2-1
- upgrade to upstream version 3.1.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/collectl/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	8 Nov 2008 12:47:16 -0000	1.5
+++ .cvsignore	20 Jan 2009 15:23:34 -0000	1.6
@@ -1 +1 @@
-collectl-3.1.1.src.tar.gz
+collectl-3.1.2.src.tar.gz


Index: collectl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/collectl/devel/collectl.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- collectl.spec	8 Nov 2008 12:47:16 -0000	1.4
+++ collectl.spec	20 Jan 2009 15:23:34 -0000	1.5
@@ -1,6 +1,6 @@
 Summary: A utility to collect various linux performance data
 Name: collectl
-Version: 3.1.1
+Version: 3.1.2
 Release: 1%{?dist}
 License: GPLv2+ or Artistic
 Group: Applications/System
@@ -94,6 +94,9 @@
 %{_localstatedir}/log/%{name}
 
 %changelog
+* Tue Jan 20 2009 Dan Horak <dan[at]danny.cz> 3.1.2-1
+- upgrade to upstream version 3.1.2
+
 * Sat Nov  8 2008 Dan Horak <dan[at]danny.cz> 3.1.1-1
 - upgrade to upstream version 3.1.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/collectl/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	8 Nov 2008 12:47:16 -0000	1.5
+++ sources	20 Jan 2009 15:23:34 -0000	1.6
@@ -1 +1 @@
-6194341e62685aabf9c33dea3ec1cf1d  collectl-3.1.1.src.tar.gz
+161d47dcbff551c353020cef4990efc8  collectl-3.1.2.src.tar.gz



From sharkcz at fedoraproject.org  Tue Jan 20 15:27:48 2009
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Tue, 20 Jan 2009 15:27:48 +0000 (UTC)
Subject: rpms/collectl/F-10 .cvsignore, 1.5, 1.6 collectl.spec, 1.4,
	1.5 sources, 1.5, 1.6
Message-ID: <20090120152748.7A6C6700F9@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/collectl/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9771

Modified Files:
	.cvsignore collectl.spec sources 
Log Message:
* Tue Jan 20 2009 Dan Horak <dan[at]danny.cz> 3.1.2-1
- upgrade to upstream version 3.1.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/collectl/F-10/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	8 Nov 2008 12:49:36 -0000	1.5
+++ .cvsignore	20 Jan 2009 15:27:18 -0000	1.6
@@ -1 +1 @@
-collectl-3.1.1.src.tar.gz
+collectl-3.1.2.src.tar.gz


Index: collectl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/collectl/F-10/collectl.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- collectl.spec	8 Nov 2008 12:49:36 -0000	1.4
+++ collectl.spec	20 Jan 2009 15:27:18 -0000	1.5
@@ -1,6 +1,6 @@
 Summary: A utility to collect various linux performance data
 Name: collectl
-Version: 3.1.1
+Version: 3.1.2
 Release: 1%{?dist}
 License: GPLv2+ or Artistic
 Group: Applications/System
@@ -94,6 +94,9 @@
 %{_localstatedir}/log/%{name}
 
 %changelog
+* Tue Jan 20 2009 Dan Horak <dan[at]danny.cz> 3.1.2-1
+- upgrade to upstream version 3.1.2
+
 * Sat Nov  8 2008 Dan Horak <dan[at]danny.cz> 3.1.1-1
 - upgrade to upstream version 3.1.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/collectl/F-10/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	8 Nov 2008 12:49:36 -0000	1.5
+++ sources	20 Jan 2009 15:27:18 -0000	1.6
@@ -1 +1 @@
-6194341e62685aabf9c33dea3ec1cf1d  collectl-3.1.1.src.tar.gz
+161d47dcbff551c353020cef4990efc8  collectl-3.1.2.src.tar.gz



From sharkcz at fedoraproject.org  Tue Jan 20 15:29:22 2009
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Tue, 20 Jan 2009 15:29:22 +0000 (UTC)
Subject: rpms/collectl/F-9 .cvsignore, 1.5, 1.6 collectl.spec, 1.4,
	1.5 sources, 1.5, 1.6
Message-ID: <20090120152922.45009700F9@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/collectl/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10092

Modified Files:
	.cvsignore collectl.spec sources 
Log Message:
* Tue Jan 20 2009 Dan Horak <dan[at]danny.cz> 3.1.2-1
- upgrade to upstream version 3.1.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/collectl/F-9/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	8 Nov 2008 12:50:57 -0000	1.5
+++ .cvsignore	20 Jan 2009 15:28:51 -0000	1.6
@@ -1 +1 @@
-collectl-3.1.1.src.tar.gz
+collectl-3.1.2.src.tar.gz


Index: collectl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/collectl/F-9/collectl.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- collectl.spec	8 Nov 2008 12:50:57 -0000	1.4
+++ collectl.spec	20 Jan 2009 15:28:51 -0000	1.5
@@ -1,6 +1,6 @@
 Summary: A utility to collect various linux performance data
 Name: collectl
-Version: 3.1.1
+Version: 3.1.2
 Release: 1%{?dist}
 License: GPLv2+ or Artistic
 Group: Applications/System
@@ -94,6 +94,9 @@
 %{_localstatedir}/log/%{name}
 
 %changelog
+* Tue Jan 20 2009 Dan Horak <dan[at]danny.cz> 3.1.2-1
+- upgrade to upstream version 3.1.2
+
 * Sat Nov  8 2008 Dan Horak <dan[at]danny.cz> 3.1.1-1
 - upgrade to upstream version 3.1.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/collectl/F-9/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	8 Nov 2008 12:50:57 -0000	1.5
+++ sources	20 Jan 2009 15:28:51 -0000	1.6
@@ -1 +1 @@
-6194341e62685aabf9c33dea3ec1cf1d  collectl-3.1.1.src.tar.gz
+161d47dcbff551c353020cef4990efc8  collectl-3.1.2.src.tar.gz



From mpg at fedoraproject.org  Tue Jan 20 15:29:50 2009
From: mpg at fedoraproject.org (Marco Pesenti Gritti)
Date: Tue, 20 Jan 2009 15:29:50 +0000 (UTC)
Subject: rpms/sugar-toolkit/devel .cvsignore, 1.20, 1.21 sources, 1.24,
	1.25 sugar-toolkit.spec, 1.33, 1.34
Message-ID: <20090120152950.5AC15700F9@cvs1.fedora.phx.redhat.com>

Author: mpg

Update of /cvs/pkgs/rpms/sugar-toolkit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10150

Modified Files:
	.cvsignore sources sugar-toolkit.spec 
Log Message:
* Tue Jan 20 2009 Marco Pesenti Gritti <mpg at redhat.com> - 0.83.4-1
- separate debug settings from xsession #163
- show an alert on activity close for suggesting the user to set properties of the entry #215
- add a colorpicker to Sugar, only the ColorToolButton is public for now
- move the palette to new style gobject properties
- #3060 Add the possibility of filtering the object chooser by data type
- fix uninstallling of activities that use symlinks #171
- remove the hacks for asking the X server for screenshots and use gtk.Widget.get_snapshot() instead 




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-toolkit/devel/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- .cvsignore	4 Jan 2009 22:08:32 -0000	1.20
+++ .cvsignore	20 Jan 2009 15:29:19 -0000	1.21
@@ -1 +1 @@
-sugar-toolkit-0.83.3.tar.bz2
+sugar-toolkit-0.83.4.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-toolkit/devel/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- sources	4 Jan 2009 22:08:32 -0000	1.24
+++ sources	20 Jan 2009 15:29:20 -0000	1.25
@@ -1 +1 @@
-f6882ee56ed327c6680738133e911bf3  sugar-toolkit-0.83.3.tar.bz2
+f7390f7e0acac6b645ceab523565ec95  sugar-toolkit-0.83.4.tar.bz2


Index: sugar-toolkit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-toolkit/devel/sugar-toolkit.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- sugar-toolkit.spec	4 Jan 2009 22:08:32 -0000	1.33
+++ sugar-toolkit.spec	20 Jan 2009 15:29:20 -0000	1.34
@@ -2,7 +2,7 @@
 
 Summary: Sugar toolkit
 Name: sugar-toolkit
-Version: 0.83.3
+Version: 0.83.4
 Release: 1%{?dist}
 URL: http://sugarlabs.org
 Source0: http://download.sugarlabs.org/sources/sucrose/glucose/%{name}/%{name}-%{version}.tar.bz2
@@ -61,6 +61,15 @@
 %{_sysconfdir}/rpm/macros.sugar
 
 %changelog
+* Tue Jan 20 2009 Marco Pesenti Gritti <mpg at redhat.com> - 0.83.4-1
+- separate debug settings from xsession #163
+- show an alert on activity close for suggesting the user to set properties of the entry #215
+- add a colorpicker to Sugar, only the ColorToolButton is public for now
+- move the palette to new style gobject properties
+- #3060 Add the possibility of filtering the object chooser by data type
+- fix uninstallling of activities that use symlinks #171
+- remove the hacks for asking the X server for screenshots and use gtk.Widget.get_snapshot() instead 
+
 * Sun Jan 04 2009 Simon Schampijer <simon at laptop.org> - 0.83.3-1
 - remove session shutdown patch
 - add intltool as build requires



From sharkcz at fedoraproject.org  Tue Jan 20 15:30:51 2009
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Tue, 20 Jan 2009 15:30:51 +0000 (UTC)
Subject: rpms/collectl/EL-5 .cvsignore, 1.5, 1.6 collectl.spec, 1.4,
	1.5 sources, 1.5, 1.6
Message-ID: <20090120153051.E4BD8700F9@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/collectl/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10469

Modified Files:
	.cvsignore collectl.spec sources 
Log Message:
* Tue Jan 20 2009 Dan Horak <dan[at]danny.cz> 3.1.2-1
- upgrade to upstream version 3.1.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/collectl/EL-5/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	8 Nov 2008 19:42:48 -0000	1.5
+++ .cvsignore	20 Jan 2009 15:30:21 -0000	1.6
@@ -1 +1 @@
-collectl-3.1.1.src.tar.gz
+collectl-3.1.2.src.tar.gz


Index: collectl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/collectl/EL-5/collectl.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- collectl.spec	8 Nov 2008 19:42:48 -0000	1.4
+++ collectl.spec	20 Jan 2009 15:30:21 -0000	1.5
@@ -1,6 +1,6 @@
 Summary: A utility to collect various linux performance data
 Name: collectl
-Version: 3.1.1
+Version: 3.1.2
 Release: 1%{?dist}
 License: GPLv2+ or Artistic
 Group: Applications/System
@@ -94,6 +94,9 @@
 %{_localstatedir}/log/%{name}
 
 %changelog
+* Tue Jan 20 2009 Dan Horak <dan[at]danny.cz> 3.1.2-1
+- upgrade to upstream version 3.1.2
+
 * Sat Nov  8 2008 Dan Horak <dan[at]danny.cz> 3.1.1-1
 - upgrade to upstream version 3.1.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/collectl/EL-5/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	8 Nov 2008 19:42:48 -0000	1.5
+++ sources	20 Jan 2009 15:30:21 -0000	1.6
@@ -1 +1 @@
-6194341e62685aabf9c33dea3ec1cf1d  collectl-3.1.1.src.tar.gz
+161d47dcbff551c353020cef4990efc8  collectl-3.1.2.src.tar.gz



From mhlavink at fedoraproject.org  Tue Jan 20 15:31:32 2009
From: mhlavink at fedoraproject.org (Michal Hlavinka)
Date: Tue, 20 Jan 2009 15:31:32 +0000 (UTC)
Subject: rpms/squirrelmail/devel squirrelmail.conf, 1.2,
	1.3 squirrelmail.spec, 
	1.59, 1.60 squirrelmail-1.4.8-CVE-2006-6142-draft_composesess.patch, 
	1.1, NONE squirrelmail-1.4.8-CVE-2006-6142-mailto.patch, 1.1,
	NONE squirrelmail-1.4.8-CVE-2006-6142-mime.php.patch, 1.1, NONE
Message-ID: <20090120153132.18074700F9@cvs1.fedora.phx.redhat.com>

Author: mhlavink

Update of /cvs/extras/rpms/squirrelmail/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10554

Modified Files:
	squirrelmail.conf squirrelmail.spec 
Removed Files:
	squirrelmail-1.4.8-CVE-2006-6142-draft_composesess.patch 
	squirrelmail-1.4.8-CVE-2006-6142-mailto.patch 
	squirrelmail-1.4.8-CVE-2006-6142-mime.php.patch 
Log Message:
spec clean-up



Index: squirrelmail.conf
===================================================================
RCS file: /cvs/extras/rpms/squirrelmail/devel/squirrelmail.conf,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- squirrelmail.conf	9 Sep 2004 12:37:51 -0000	1.2
+++ squirrelmail.conf	20 Jan 2009 15:31:01 -0000	1.3
@@ -3,3 +3,8 @@
 #
 
 Alias /webmail /usr/share/squirrelmail
+
+<Directory "/usr/share/squirrelmail/plugins/squirrelspell/modules">
+  Deny from all
+</Directory>
+


Index: squirrelmail.spec
===================================================================
RCS file: /cvs/extras/rpms/squirrelmail/devel/squirrelmail.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- squirrelmail.spec	4 Dec 2008 14:00:18 -0000	1.59
+++ squirrelmail.spec	20 Jan 2009 15:31:01 -0000	1.60
@@ -17,25 +17,17 @@
 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
+Patch2:  squirrelmail-1.4.6-japanese-multibyte-view-text.patch
+Patch3:  squirrelmail-1.4.6-japanese-multibyte-view-body.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
-#Patch102:  squirrelmail-1.4.8-CVE-2006-6142-mime.php.patch
+Patch4:  squirrelmail-1.4.15-tr-fix.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 BuildRequires: gettext
 Requires: httpd, php >= 4.0.4, php-mbstring, perl, tmpwatch >= 2.8, aspell
 Requires: /usr/sbin/sendmail
-Prereq: httpd, perl
-Provides: squirrelmail-i18n
 
 %description
 SquirrelMail is a basic webmail package written in PHP4. It
@@ -47,33 +39,26 @@
 %prep
 %setup -q -n squirrelmail-%{version}
 %patch1 -p1
-#%patch2 -p1
+%patch2 -p1
 %patch3 -p1
-%patch4 -p1
-
-# CVE-2006-6142
-#%patch100 -p0
-#%patch101 -p0
-#%patch102 -p1
 
 mkdir locale_tempdir
 cd locale_tempdir
 tar xfj %SOURCE4
-#%patch6 -p2
-%patch7 -p2
+%patch4 -p2
 
 %build
 rm -f plugins/make_archive.pl
 
-# Clean up .orig files
-find -name '*.orig' -exec rm -f \{\} \;
+## Clean up .orig files
+#find -name '*.orig' -exec rm -f \{\} \;
 
 # Rearrange the documentation
 mv AUTHORS ChangeLog COPYING INSTALL README UPGRADE doc/
 mv ReleaseNotes doc/ReleaseNotes.txt
 mv themes/README.themes doc/
 for f in `find plugins -name "README*" -or -name INSTALL \
-		   -or -name CHANGES -or -name HISTORY`; do
+                   -or -name CHANGES -or -name HISTORY`; do
     mkdir -p doc/`dirname $f`
     mv $f $_
 done
@@ -88,7 +73,7 @@
 echo "left_refresh=300" >> data/default_pref
 for f in contrib/RPM/squirrelmail.cron contrib/RPM/config.php.redhat; do
     perl -pi -e "s|__ATTDIR__|%{_localstatedir}/spool/squirrelmail/attach/|g;"\
-	 -e "s|__PREFSDIR__|%{_localstatedir}/lib/squirrelmail/prefs/|g;" $f
+         -e "s|__PREFSDIR__|%{_localstatedir}/lib/squirrelmail/prefs/|g;" $f
 done
 
 # Fix the version
@@ -128,34 +113,34 @@
 for LOCALE in `ls locale/` ; do
     SKIPINVALID=
     case $LOCALE in
-	ja_JP)
-	    # ja_JP uses iso2022-jp for email but euc-jp in its interface.
+        ja_JP)
+            # ja_JP uses iso2022-jp for email but euc-jp in its interface.
             # But why!?!?
-	    CHARSET=euc-jp
-	    ;;
-	ko_KR)
-	    # ko_KR has broken help files in indeterminate charset. 
-	    # Assume it's _mostly_ EUC-KR as it's supposed to be, and let
-	    # iconv drop invalid characters from the input.
-	    SKIPINVALID=-c
-	    CHARSET=`grep CHARSET locale/$LOCALE/setup.php | cut -f6 -d\'`
-	    ;;
-	*)
-	    CHARSET=`grep CHARSET locale/$LOCALE/setup.php | cut -f6 -d\'`
-	    ;;
+            CHARSET=euc-jp
+            ;;
+        ko_KR)
+            # ko_KR has broken help files in indeterminate charset. 
+            # Assume it's _mostly_ EUC-KR as it's supposed to be, and let
+            # iconv drop invalid characters from the input.
+            SKIPINVALID=-c
+            CHARSET=`grep CHARSET locale/$LOCALE/setup.php | cut -f6 -d\'`
+            ;;
+        *)
+            CHARSET=`grep CHARSET locale/$LOCALE/setup.php | cut -f6 -d\'`
+            ;;
     esac
 
     # Check for locales where CHARSET isn't in LOCALE.
     grep LOCALE locale/$LOCALE/setup.php | grep -vi $CHARSET  || :
 
     if [ "$CHARSET" != "utf-8" -a "$CHARSET" != "UTF-8" ]; then
-	for a in `ls help/$LOCALE/ 2>/dev/null` ; do
+        for a in `ls help/$LOCALE/ 2>/dev/null` ; do
             if [ "$LOCALE" == "ja_JP" ]; then continue; fi
-	    iconv $SKIPINVALID -f $CHARSET -t utf-8 help/$LOCALE/$a > $a.new && mv $a.new help/$LOCALE/$a
-	done
-	sed -e "s/CHARSET..[ ]*= [^;]*;/CHARSET'] = 'utf-8';/" \
-	    -e "s/LOCALE..[ ]*= [^;]*;/LOCALE'] = '$LOCALE.UTF-8';/" \
-	    locale/$LOCALE/setup.php  > setup.php.new ; mv setup.php.new locale/$LOCALE/setup.php
+            iconv $SKIPINVALID -f $CHARSET -t utf-8 help/$LOCALE/$a > $a.new && mv $a.new help/$LOCALE/$a
+        done
+        sed -e "s/CHARSET..[ ]*= [^;]*;/CHARSET'] = 'utf-8';/" \
+            -e "s/LOCALE..[ ]*= [^;]*;/LOCALE'] = '$LOCALE.UTF-8';/" \
+            locale/$LOCALE/setup.php  > setup.php.new ; mv setup.php.new locale/$LOCALE/setup.php
     fi
 done
 
@@ -163,7 +148,7 @@
 for POFILE in `find locale -name \*.po` ; do 
     CHARSET=`grep charset= $POFILE | cut -f2 -d= | cut -f1 -d\\\\`
     if [ "$CHARSET" != "utf-8" -a "$CHARSET" != "UTF-8" ]; then
-	sed s/charset=$CHARSET/charset=utf-8/ $POFILE | iconv -f $CHARSET -t utf-8 > $POFILE.new && mv $POFILE.new $POFILE
+        sed s/charset=$CHARSET/charset=utf-8/ $POFILE | iconv -f $CHARSET -t utf-8 > $POFILE.new && mv $POFILE.new $POFILE
     fi
 done
 for POFILE in `find . -name \*.po` ; do
@@ -214,8 +199,7 @@
 
 # install the config file
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d
-install -m 644 $RPM_SOURCE_DIR/squirrelmail.conf \
-   $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/
+install -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/
 
 # move sqspell plugin config to /etc
 rm -f $RPM_BUILD_ROOT%{_datadir}/squirrelmail/plugins/squirrelspell/sqspell_config.php
@@ -231,6 +215,15 @@
 cd ..
 rm $RPM_BUILD_ROOT%{_datadir}/squirrelmail/locale/README.locales
 
+#remove '\r' where needed
+sed -i 's/\r//' doc/ReleaseNotes/1.4/Notes-1.4.12.txt
+sed -i 's/\r//' doc/ReleaseNotes/1.4/Notes-1.4.13.txt
+
+#remove unwanted files
+rm $RPM_BUILD_ROOT%{_datadir}/squirrelmail/plugins/filters/bulkquery/bulkquery.c
+rm $RPM_BUILD_ROOT%{_datadir}/squirrelmail/locale/es_ES/LC_MESSAGES/serversidefilter.po.new
+rm $RPM_BUILD_ROOT%{_datadir}/squirrelmail/plugins/squirrelspell/modules/.htaccess
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 


--- squirrelmail-1.4.8-CVE-2006-6142-draft_composesess.patch DELETED ---


--- squirrelmail-1.4.8-CVE-2006-6142-mailto.patch DELETED ---


--- squirrelmail-1.4.8-CVE-2006-6142-mime.php.patch DELETED ---



From mpg at fedoraproject.org  Tue Jan 20 15:36:12 2009
From: mpg at fedoraproject.org (Marco Pesenti Gritti)
Date: Tue, 20 Jan 2009 15:36:12 +0000 (UTC)
Subject: rpms/sugar/devel .cvsignore, 1.23, 1.24 sources, 1.25,
	1.26 sugar.spec, 1.41, 1.42
Message-ID: <20090120153613.09F67700F9@cvs1.fedora.phx.redhat.com>

Author: mpg

Update of /cvs/pkgs/rpms/sugar/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11141

Modified Files:
	.cvsignore sources sugar.spec 
Log Message:
* Tue Jan 20 2009 Marco Pesenti Gritti <mpg at redhat.com> - 0.83.5-1
- make the journal entries in the favorites palette resumable
- simplify the constants used to identify favorite layouts
- separate debug settings from xsession #163
- add logout option #207 to xomenu (sayamindu, icon by eben)
- change jabber server without sugar restart #142
- About my XO -> About my Computer
- #196 Fix setting the timezone in debian
- autoconnect to AP that we connected to last #8
- add a favorites mode setting for deciding if the favorites view resumes by default or not
- resume by default the last activity from the favorites view
- implement filtering by file type for removable devices
- #132 Filter by timestamp, not by mtime
- add support for text queries on removable devices
- dont abort if we cannot read a file from a removable device
- add a favorite filter to the journal toolbar
- sanitize the file name when we copy to removable devices
- #36 Refresh the detailed view when the entry changes
- #38 Refresh full metadata when editing so we dont lose properties
- Focus Search is not exposed via dbus anymore #89
- #131 'open with' does not work for clipboard item
- #165 Install bundles when they get into the journal
- add Resume item to the file transfer palette
- #126 Fix erase button in the journal
- following eben's spec for the device positions 




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sugar/devel/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- .cvsignore	4 Jan 2009 21:23:26 -0000	1.23
+++ .cvsignore	20 Jan 2009 15:35:42 -0000	1.24
@@ -1 +1 @@
-sugar-0.83.4.tar.bz2
+sugar-0.83.5.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sugar/devel/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- sources	4 Jan 2009 21:23:26 -0000	1.25
+++ sources	20 Jan 2009 15:35:42 -0000	1.26
@@ -1 +1 @@
-6b981c63bb5d8b23b43831ece79884e6  sugar-0.83.4.tar.bz2
+8d90769ce80efdb95f635b17943ac985  sugar-0.83.5.tar.bz2


Index: sugar.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar/devel/sugar.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- sugar.spec	4 Jan 2009 21:46:29 -0000	1.41
+++ sugar.spec	20 Jan 2009 15:35:42 -0000	1.42
@@ -5,8 +5,8 @@
 
 Summary: Constructionist learning platform
 Name: sugar
-Version: 0.83.4
-Release: 2%{?dist}
+Version: 0.83.5
+Release: 1%{?dist}
 URL: http://sugarlabs.org/
 Source0: http://download.sugarlabs.org/sources/sucrose/glucose/%{name}/%{name}-%{version}.tar.bz2
 License: GPLv2+
@@ -131,6 +131,32 @@
 %{_bindir}/sugar-emulator
 
 %changelog
+* Tue Jan 20 2009 Marco Pesenti Gritti <mpg at redhat.com> - 0.83.5-1
+- make the journal entries in the favorites palette resumable
+- simplify the constants used to identify favorite layouts
+- separate debug settings from xsession #163
+- add logout option #207 to xomenu (sayamindu, icon by eben)
+- change jabber server without sugar restart #142
+- About my XO -> About my Computer
+- #196 Fix setting the timezone in debian
+- autoconnect to AP that we connected to last #8
+- add a favorites mode setting for deciding if the favorites view resumes by default or not
+- resume by default the last activity from the favorites view
+- implement filtering by file type for removable devices
+- #132 Filter by timestamp, not by mtime
+- add support for text queries on removable devices
+- dont abort if we cannot read a file from a removable device
+- add a favorite filter to the journal toolbar
+- sanitize the file name when we copy to removable devices
+- #36 Refresh the detailed view when the entry changes
+- #38 Refresh full metadata when editing so we dont lose properties
+- Focus Search is not exposed via dbus anymore #89
+- #131 'open with' does not work for clipboard item
+- #165 Install bundles when they get into the journal
+- add Resume item to the file transfer palette
+- #126 Fix erase button in the journal
+- following eben's spec for the device positions 
+
 * Sun Jan 04 2009 Simon Schampijer <simon at laptop.org> - 0.83.4-2
 - add intltool build require
 



From mgrepl at fedoraproject.org  Tue Jan 20 15:38:54 2009
From: mgrepl at fedoraproject.org (Miroslav Grepl)
Date: Tue, 20 Jan 2009 15:38:54 +0000 (UTC)
Subject: rpms/selinux-policy/F-10 policy-20080710.patch,1.124,1.125
Message-ID: <20090120153854.5B44C700F9@cvs1.fedora.phx.redhat.com>

Author: mgrepl

Update of /cvs/extras/rpms/selinux-policy/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11428

Modified Files:
	policy-20080710.patch 
Log Message:
- Fix apache



policy-20080710.patch:

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.124 -r 1.125 policy-20080710.patch
Index: policy-20080710.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-10/policy-20080710.patch,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -r1.124 -r1.125
--- policy-20080710.patch	20 Jan 2009 08:21:59 -0000	1.124
+++ policy-20080710.patch	20 Jan 2009 15:38:23 -0000	1.125
@@ -1,6 +1,6 @@
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/default_contexts serefpolicy-3.5.13/config/appconfig-mcs/default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/default_contexts	2008-10-17 14:49:10.000000000 +0200
-+++ serefpolicy-3.5.13/config/appconfig-mcs/default_contexts	2009-01-20 09:09:46.000000000 +0100
++++ serefpolicy-3.5.13/config/appconfig-mcs/default_contexts	2009-01-20 14:10:14.000000000 +0100
 @@ -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
@@ -24,13 +24,13 @@
 +system_r:xdm_t:s0		user_r:user_t:s0
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/failsafe_context serefpolicy-3.5.13/config/appconfig-mcs/failsafe_context
 --- nsaserefpolicy/config/appconfig-mcs/failsafe_context	2008-10-17 14:49:10.000000000 +0200
-+++ serefpolicy-3.5.13/config/appconfig-mcs/failsafe_context	2009-01-20 09:09:46.000000000 +0100
++++ serefpolicy-3.5.13/config/appconfig-mcs/failsafe_context	2009-01-20 14:10:14.000000000 +0100
 @@ -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.5.13/config/appconfig-mcs/guest_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/guest_u_default_contexts	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.5.13/config/appconfig-mcs/guest_u_default_contexts	2009-01-20 09:09:46.000000000 +0100
++++ serefpolicy-3.5.13/config/appconfig-mcs/guest_u_default_contexts	2009-01-20 14:10:14.000000000 +0100
 @@ -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
@@ -40,7 +40,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.5.13/config/appconfig-mcs/root_default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/root_default_contexts	2008-10-17 14:49:10.000000000 +0200
-+++ serefpolicy-3.5.13/config/appconfig-mcs/root_default_contexts	2009-01-20 09:09:46.000000000 +0100
++++ serefpolicy-3.5.13/config/appconfig-mcs/root_default_contexts	2009-01-20 14:10:14.000000000 +0100
 @@ -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
@@ -57,7 +57,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/seusers serefpolicy-3.5.13/config/appconfig-mcs/seusers
 --- nsaserefpolicy/config/appconfig-mcs/seusers	2008-10-17 14:49:10.000000000 +0200
-+++ serefpolicy-3.5.13/config/appconfig-mcs/seusers	2009-01-20 09:09:46.000000000 +0100
++++ serefpolicy-3.5.13/config/appconfig-mcs/seusers	2009-01-20 14:10:14.000000000 +0100
 @@ -1,3 +1,3 @@
  system_u:system_u:s0-mcs_systemhigh
 -root:root:s0-mcs_systemhigh
@@ -66,7 +66,7 @@
 +__default__:unconfined_u:s0-mcs_systemhigh
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/staff_u_default_contexts serefpolicy-3.5.13/config/appconfig-mcs/staff_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/staff_u_default_contexts	2008-10-17 14:49:10.000000000 +0200
-+++ serefpolicy-3.5.13/config/appconfig-mcs/staff_u_default_contexts	2009-01-20 09:09:46.000000000 +0100
++++ serefpolicy-3.5.13/config/appconfig-mcs/staff_u_default_contexts	2009-01-20 14:10:14.000000000 +0100
 @@ -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
@@ -83,7 +83,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/unconfined_u_default_contexts serefpolicy-3.5.13/config/appconfig-mcs/unconfined_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/unconfined_u_default_contexts	2008-10-17 14:49:10.000000000 +0200
-+++ serefpolicy-3.5.13/config/appconfig-mcs/unconfined_u_default_contexts	2009-01-20 09:09:46.000000000 +0100
++++ serefpolicy-3.5.13/config/appconfig-mcs/unconfined_u_default_contexts	2009-01-20 14:10:14.000000000 +0100
 @@ -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
@@ -93,13 +93,13 @@
  system_r:xdm_t:s0		unconfined_r:unconfined_t:s0
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/userhelper_context serefpolicy-3.5.13/config/appconfig-mcs/userhelper_context
 --- nsaserefpolicy/config/appconfig-mcs/userhelper_context	2008-10-17 14:49:10.000000000 +0200
-+++ serefpolicy-3.5.13/config/appconfig-mcs/userhelper_context	2009-01-20 09:09:46.000000000 +0100
++++ serefpolicy-3.5.13/config/appconfig-mcs/userhelper_context	2009-01-20 14:10:14.000000000 +0100
 @@ -1 +1 @@
 -system_u:sysadm_r:sysadm_t:s0
 +system_u:system_r:unconfined_t:s0	
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/user_u_default_contexts serefpolicy-3.5.13/config/appconfig-mcs/user_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/user_u_default_contexts	2008-10-17 14:49:10.000000000 +0200
-+++ serefpolicy-3.5.13/config/appconfig-mcs/user_u_default_contexts	2009-01-20 09:09:46.000000000 +0100
++++ serefpolicy-3.5.13/config/appconfig-mcs/user_u_default_contexts	2009-01-20 14:10:14.000000000 +0100
 @@ -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
@@ -114,7 +114,7 @@
 +user_r:user_t:s0		user_r:user_t:s0
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/xguest_u_default_contexts serefpolicy-3.5.13/config/appconfig-mcs/xguest_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/xguest_u_default_contexts	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.5.13/config/appconfig-mcs/xguest_u_default_contexts	2009-01-20 09:09:46.000000000 +0100
++++ serefpolicy-3.5.13/config/appconfig-mcs/xguest_u_default_contexts	2009-01-20 14:10:14.000000000 +0100
 @@ -0,0 +1,7 @@
 +system_r:local_login_t	xguest_r:xguest_t:s0
 +system_r:remote_login_t	xguest_r:xguest_t:s0
@@ -125,7 +125,7 @@
 +xguest_r:xguest_t:s0	xguest_r:xguest_t:s0
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/default_contexts serefpolicy-3.5.13/config/appconfig-mls/default_contexts
 --- nsaserefpolicy/config/appconfig-mls/default_contexts	2008-10-17 14:49:10.000000000 +0200
-+++ serefpolicy-3.5.13/config/appconfig-mls/default_contexts	2009-01-20 09:09:46.000000000 +0100
++++ serefpolicy-3.5.13/config/appconfig-mls/default_contexts	2009-01-20 14:10:14.000000000 +0100
 @@ -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
@@ -149,7 +149,7 @@
 +system_r:xdm_t:s0		user_r:user_t:s0
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/guest_u_default_contexts serefpolicy-3.5.13/config/appconfig-mls/guest_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mls/guest_u_default_contexts	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.5.13/config/appconfig-mls/guest_u_default_contexts	2009-01-20 09:09:46.000000000 +0100
++++ serefpolicy-3.5.13/config/appconfig-mls/guest_u_default_contexts	2009-01-20 14:10:14.000000000 +0100
 @@ -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
@@ -157,7 +157,7 @@
 +system_r:crond_t:s0		guest_r:guest_t:s0
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/root_default_contexts serefpolicy-3.5.13/config/appconfig-mls/root_default_contexts
 --- nsaserefpolicy/config/appconfig-mls/root_default_contexts	2008-10-17 14:49:10.000000000 +0200
-+++ serefpolicy-3.5.13/config/appconfig-mls/root_default_contexts	2009-01-20 09:09:46.000000000 +0100
++++ serefpolicy-3.5.13/config/appconfig-mls/root_default_contexts	2009-01-20 14:10:14.000000000 +0100
 @@ -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
@@ -178,7 +178,7 @@
 +#system_r:sshd_t:s0		sysadm_r:sysadm_t:s0 staff_r:staff_t:s0
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/staff_u_default_contexts serefpolicy-3.5.13/config/appconfig-mls/staff_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mls/staff_u_default_contexts	2008-10-17 14:49:10.000000000 +0200
-+++ serefpolicy-3.5.13/config/appconfig-mls/staff_u_default_contexts	2009-01-20 09:09:46.000000000 +0100
++++ serefpolicy-3.5.13/config/appconfig-mls/staff_u_default_contexts	2009-01-20 14:10:14.000000000 +0100
 @@ -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
@@ -190,7 +190,7 @@
  staff_r:staff_sudo_t:s0		staff_r:staff_t:s0
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/user_u_default_contexts serefpolicy-3.5.13/config/appconfig-mls/user_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mls/user_u_default_contexts	2008-10-17 14:49:10.000000000 +0200
-+++ serefpolicy-3.5.13/config/appconfig-mls/user_u_default_contexts	2009-01-20 09:09:46.000000000 +0100
++++ serefpolicy-3.5.13/config/appconfig-mls/user_u_default_contexts	2009-01-20 14:10:14.000000000 +0100
 @@ -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
@@ -202,7 +202,7 @@
  user_r:user_sudo_t:s0		user_r:user_t:s0
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/xguest_u_default_contexts serefpolicy-3.5.13/config/appconfig-mls/xguest_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mls/xguest_u_default_contexts	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.5.13/config/appconfig-mls/xguest_u_default_contexts	2009-01-20 09:09:46.000000000 +0100
++++ serefpolicy-3.5.13/config/appconfig-mls/xguest_u_default_contexts	2009-01-20 14:10:14.000000000 +0100
 @@ -0,0 +1,7 @@
 +system_r:local_login_t	xguest_r:xguest_t:s0
 +system_r:remote_login_t	xguest_r:xguest_t:s0
@@ -213,7 +213,7 @@
 +xguest_r:xguest_t:s0	xguest_r:xguest_t:s0
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-standard/guest_u_default_contexts serefpolicy-3.5.13/config/appconfig-standard/guest_u_default_contexts
 --- nsaserefpolicy/config/appconfig-standard/guest_u_default_contexts	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.5.13/config/appconfig-standard/guest_u_default_contexts	2009-01-20 09:09:46.000000000 +0100
++++ serefpolicy-3.5.13/config/appconfig-standard/guest_u_default_contexts	2009-01-20 14:10:14.000000000 +0100
 @@ -0,0 +1,4 @@
 +system_r:local_login_t	guest_r:guest_t
 +system_r:remote_login_t	guest_r:guest_t
@@ -221,7 +221,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.5.13/config/appconfig-standard/root_default_contexts
 --- nsaserefpolicy/config/appconfig-standard/root_default_contexts	2008-10-17 14:49:10.000000000 +0200
-+++ serefpolicy-3.5.13/config/appconfig-standard/root_default_contexts	2009-01-20 09:09:46.000000000 +0100
++++ serefpolicy-3.5.13/config/appconfig-standard/root_default_contexts	2009-01-20 14:10:14.000000000 +0100
 @@ -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
@@ -237,7 +237,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/staff_u_default_contexts serefpolicy-3.5.13/config/appconfig-standard/staff_u_default_contexts
 --- nsaserefpolicy/config/appconfig-standard/staff_u_default_contexts	2008-10-17 14:49:10.000000000 +0200
-+++ serefpolicy-3.5.13/config/appconfig-standard/staff_u_default_contexts	2009-01-20 09:09:46.000000000 +0100
++++ serefpolicy-3.5.13/config/appconfig-standard/staff_u_default_contexts	2009-01-20 14:10:14.000000000 +0100
 @@ -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
@@ -249,7 +249,7 @@
  staff_r:staff_sudo_t		staff_r:staff_t
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-standard/user_u_default_contexts serefpolicy-3.5.13/config/appconfig-standard/user_u_default_contexts
 --- nsaserefpolicy/config/appconfig-standard/user_u_default_contexts	2008-10-17 14:49:10.000000000 +0200
-+++ serefpolicy-3.5.13/config/appconfig-standard/user_u_default_contexts	2009-01-20 09:09:46.000000000 +0100
++++ serefpolicy-3.5.13/config/appconfig-standard/user_u_default_contexts	2009-01-20 14:10:14.000000000 +0100
 @@ -1,7 +1,7 @@
  system_r:local_login_t		user_r:user_t
  system_r:remote_login_t		user_r:user_t
@@ -261,7 +261,7 @@
  user_r:user_sudo_t		user_r:user_t
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-standard/xguest_u_default_contexts serefpolicy-3.5.13/config/appconfig-standard/xguest_u_default_contexts
 --- nsaserefpolicy/config/appconfig-standard/xguest_u_default_contexts	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.5.13/config/appconfig-standard/xguest_u_default_contexts	2009-01-20 09:09:46.000000000 +0100
++++ serefpolicy-3.5.13/config/appconfig-standard/xguest_u_default_contexts	2009-01-20 14:10:14.000000000 +0100
 @@ -0,0 +1,5 @@
 +system_r:local_login_t	xguest_r:xguest_t
 +system_r:remote_login_t	xguest_r:xguest_t
@@ -270,7 +270,7 @@
 +system_r:xdm_t		xguest_r:xguest_t
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/Makefile serefpolicy-3.5.13/Makefile
 --- nsaserefpolicy/Makefile	2008-10-17 14:49:11.000000000 +0200
-+++ serefpolicy-3.5.13/Makefile	2009-01-20 09:09:46.000000000 +0100
++++ serefpolicy-3.5.13/Makefile	2009-01-20 14:10:14.000000000 +0100
 @@ -311,20 +311,22 @@
  
[...3552 lines suppressed...]
  
  ########################################
@@ -32163,7 +32173,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.te serefpolicy-3.5.13/policy/modules/system/selinuxutil.te
 --- nsaserefpolicy/policy/modules/system/selinuxutil.te	2008-10-17 14:49:13.000000000 +0200
-+++ serefpolicy-3.5.13/policy/modules/system/selinuxutil.te	2009-01-20 09:09:46.000000000 +0100
++++ serefpolicy-3.5.13/policy/modules/system/selinuxutil.te	2009-01-20 14:10:14.000000000 +0100
 @@ -23,6 +23,9 @@
  type selinux_config_t;
  files_type(selinux_config_t)
@@ -32520,7 +32530,7 @@
  ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/setrans.if serefpolicy-3.5.13/policy/modules/system/setrans.if
 --- nsaserefpolicy/policy/modules/system/setrans.if	2008-10-17 14:49:13.000000000 +0200
-+++ serefpolicy-3.5.13/policy/modules/system/setrans.if	2009-01-20 09:09:46.000000000 +0100
++++ serefpolicy-3.5.13/policy/modules/system/setrans.if	2009-01-20 14:10:14.000000000 +0100
 @@ -21,3 +21,23 @@
  	stream_connect_pattern($1,setrans_var_run_t,setrans_var_run_t,setrans_t)
  	files_list_pids($1)
@@ -32547,7 +32557,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/sysnetwork.fc serefpolicy-3.5.13/policy/modules/system/sysnetwork.fc
 --- nsaserefpolicy/policy/modules/system/sysnetwork.fc	2008-10-17 14:49:13.000000000 +0200
-+++ serefpolicy-3.5.13/policy/modules/system/sysnetwork.fc	2009-01-20 09:09:46.000000000 +0100
++++ serefpolicy-3.5.13/policy/modules/system/sysnetwork.fc	2009-01-20 14:10:14.000000000 +0100
 @@ -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)
@@ -32572,7 +32582,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.5.13/policy/modules/system/sysnetwork.if
 --- nsaserefpolicy/policy/modules/system/sysnetwork.if	2008-10-17 14:49:13.000000000 +0200
-+++ serefpolicy-3.5.13/policy/modules/system/sysnetwork.if	2009-01-20 09:09:46.000000000 +0100
++++ serefpolicy-3.5.13/policy/modules/system/sysnetwork.if	2009-01-20 14:10:14.000000000 +0100
 @@ -198,7 +198,25 @@
  		type dhcpc_state_t;
  	')
@@ -32684,7 +32694,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/sysnetwork.te serefpolicy-3.5.13/policy/modules/system/sysnetwork.te
 --- nsaserefpolicy/policy/modules/system/sysnetwork.te	2008-10-17 14:49:13.000000000 +0200
-+++ serefpolicy-3.5.13/policy/modules/system/sysnetwork.te	2009-01-20 09:09:46.000000000 +0100
++++ serefpolicy-3.5.13/policy/modules/system/sysnetwork.te	2009-01-20 14:10:14.000000000 +0100
 @@ -20,6 +20,9 @@
  init_daemon_domain(dhcpc_t,dhcpc_exec_t)
  role system_r types dhcpc_t;
@@ -32874,7 +32884,7 @@
  	xen_append_log(ifconfig_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/udev.fc serefpolicy-3.5.13/policy/modules/system/udev.fc
 --- nsaserefpolicy/policy/modules/system/udev.fc	2008-10-17 14:49:13.000000000 +0200
-+++ serefpolicy-3.5.13/policy/modules/system/udev.fc	2009-01-20 09:09:46.000000000 +0100
++++ serefpolicy-3.5.13/policy/modules/system/udev.fc	2009-01-20 14:10:14.000000000 +0100
 @@ -13,8 +13,11 @@
  /sbin/start_udev --	gen_context(system_u:object_r:udev_exec_t,s0)
  /sbin/udev	--	gen_context(system_u:object_r:udev_exec_t,s0)
@@ -32889,7 +32899,7 @@
 +/var/run/PackageKit/udev(/.*)?		gen_context(system_u:object_r:udev_var_run_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/udev.if serefpolicy-3.5.13/policy/modules/system/udev.if
 --- nsaserefpolicy/policy/modules/system/udev.if	2008-10-17 14:49:13.000000000 +0200
-+++ serefpolicy-3.5.13/policy/modules/system/udev.if	2009-01-20 09:09:46.000000000 +0100
++++ serefpolicy-3.5.13/policy/modules/system/udev.if	2009-01-20 14:10:14.000000000 +0100
 @@ -96,6 +96,24 @@
  
  ########################################
@@ -32945,7 +32955,7 @@
  ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/udev.te serefpolicy-3.5.13/policy/modules/system/udev.te
 --- nsaserefpolicy/policy/modules/system/udev.te	2008-10-17 14:49:13.000000000 +0200
-+++ serefpolicy-3.5.13/policy/modules/system/udev.te	2009-01-20 09:09:46.000000000 +0100
++++ serefpolicy-3.5.13/policy/modules/system/udev.te	2009-01-20 14:10:14.000000000 +0100
 @@ -83,6 +83,7 @@
  kernel_rw_unix_dgram_sockets(udev_t)
  kernel_dgram_send(udev_t)
@@ -33004,7 +33014,7 @@
  ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.fc serefpolicy-3.5.13/policy/modules/system/unconfined.fc
 --- nsaserefpolicy/policy/modules/system/unconfined.fc	2008-10-17 14:49:13.000000000 +0200
-+++ serefpolicy-3.5.13/policy/modules/system/unconfined.fc	2009-01-20 09:09:46.000000000 +0100
++++ serefpolicy-3.5.13/policy/modules/system/unconfined.fc	2009-01-20 14:10:14.000000000 +0100
 @@ -2,15 +2,31 @@
  # e.g.:
  # /usr/local/bin/appsrv		--	gen_context(system_u:object_r:unconfined_exec_t,s0)
@@ -33048,7 +33058,7 @@
 +#/usr/lib(64)?/gcl-[^/]+/unixport/saved_.* 	--	gen_context(system_u:object_r:execmem_exec_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.if serefpolicy-3.5.13/policy/modules/system/unconfined.if
 --- nsaserefpolicy/policy/modules/system/unconfined.if	2008-10-17 14:49:13.000000000 +0200
-+++ serefpolicy-3.5.13/policy/modules/system/unconfined.if	2009-01-20 09:09:46.000000000 +0100
++++ serefpolicy-3.5.13/policy/modules/system/unconfined.if	2009-01-20 14:10:14.000000000 +0100
 @@ -12,14 +12,13 @@
  #
  interface(`unconfined_domain_noaudit',`
@@ -33398,7 +33408,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.te serefpolicy-3.5.13/policy/modules/system/unconfined.te
 --- nsaserefpolicy/policy/modules/system/unconfined.te	2008-10-17 14:49:13.000000000 +0200
-+++ serefpolicy-3.5.13/policy/modules/system/unconfined.te	2009-01-20 09:09:46.000000000 +0100
++++ serefpolicy-3.5.13/policy/modules/system/unconfined.te	2009-01-20 14:10:14.000000000 +0100
 @@ -6,35 +6,77 @@
  # Declarations
  #
@@ -33763,7 +33773,7 @@
 +gen_user(unconfined_u, user, unconfined_r system_r, s0, s0 - mls_systemhigh, mcs_allcats)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.fc serefpolicy-3.5.13/policy/modules/system/userdomain.fc
 --- nsaserefpolicy/policy/modules/system/userdomain.fc	2008-10-17 14:49:13.000000000 +0200
-+++ serefpolicy-3.5.13/policy/modules/system/userdomain.fc	2009-01-20 09:09:46.000000000 +0100
++++ serefpolicy-3.5.13/policy/modules/system/userdomain.fc	2009-01-20 14:10:14.000000000 +0100
 @@ -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)
@@ -33776,7 +33786,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.5.13/policy/modules/system/userdomain.if
 --- nsaserefpolicy/policy/modules/system/userdomain.if	2008-10-17 14:49:13.000000000 +0200
-+++ serefpolicy-3.5.13/policy/modules/system/userdomain.if	2009-01-20 09:09:46.000000000 +0100
++++ serefpolicy-3.5.13/policy/modules/system/userdomain.if	2009-01-20 14:10:14.000000000 +0100
 @@ -28,10 +28,14 @@
  		class context contains;
  	')
@@ -36529,7 +36539,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-3.5.13/policy/modules/system/userdomain.te
 --- nsaserefpolicy/policy/modules/system/userdomain.te	2008-10-17 14:49:13.000000000 +0200
-+++ serefpolicy-3.5.13/policy/modules/system/userdomain.te	2009-01-20 09:09:46.000000000 +0100
++++ serefpolicy-3.5.13/policy/modules/system/userdomain.te	2009-01-20 14:10:14.000000000 +0100
 @@ -8,13 +8,6 @@
  
  ## <desc>
@@ -36649,7 +36659,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.fc serefpolicy-3.5.13/policy/modules/system/xen.fc
 --- nsaserefpolicy/policy/modules/system/xen.fc	2008-10-17 14:49:13.000000000 +0200
-+++ serefpolicy-3.5.13/policy/modules/system/xen.fc	2009-01-20 09:09:46.000000000 +0100
++++ serefpolicy-3.5.13/policy/modules/system/xen.fc	2009-01-20 14:10:14.000000000 +0100
 @@ -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)
@@ -36660,7 +36670,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.if serefpolicy-3.5.13/policy/modules/system/xen.if
 --- nsaserefpolicy/policy/modules/system/xen.if	2008-10-17 14:49:13.000000000 +0200
-+++ serefpolicy-3.5.13/policy/modules/system/xen.if	2009-01-20 09:09:46.000000000 +0100
++++ serefpolicy-3.5.13/policy/modules/system/xen.if	2009-01-20 14:10:14.000000000 +0100
 @@ -155,7 +155,7 @@
  	stream_connect_pattern($1,xenstored_var_run_t,xenstored_var_run_t,xenstored_t)
  ')
@@ -36713,7 +36723,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.te serefpolicy-3.5.13/policy/modules/system/xen.te
 --- nsaserefpolicy/policy/modules/system/xen.te	2008-10-17 14:49:13.000000000 +0200
-+++ serefpolicy-3.5.13/policy/modules/system/xen.te	2009-01-20 09:09:46.000000000 +0100
++++ serefpolicy-3.5.13/policy/modules/system/xen.te	2009-01-20 14:10:14.000000000 +0100
 @@ -6,6 +6,13 @@
  # Declarations
  #
@@ -36947,7 +36957,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/policy_capabilities serefpolicy-3.5.13/policy/policy_capabilities
 --- nsaserefpolicy/policy/policy_capabilities	2008-10-17 14:49:14.000000000 +0200
-+++ serefpolicy-3.5.13/policy/policy_capabilities	2009-01-20 09:09:46.000000000 +0100
++++ serefpolicy-3.5.13/policy/policy_capabilities	2009-01-20 14:10:14.000000000 +0100
 @@ -29,4 +29,4 @@
  # chr_file: open
  # blk_file: open
@@ -36956,7 +36966,7 @@
 +#policycap open_perms;
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/support/obj_perm_sets.spt serefpolicy-3.5.13/policy/support/obj_perm_sets.spt
 --- nsaserefpolicy/policy/support/obj_perm_sets.spt	2008-10-17 14:49:14.000000000 +0200
-+++ serefpolicy-3.5.13/policy/support/obj_perm_sets.spt	2009-01-20 09:09:46.000000000 +0100
++++ serefpolicy-3.5.13/policy/support/obj_perm_sets.spt	2009-01-20 14:10:14.000000000 +0100
 @@ -59,22 +59,22 @@
  # 
  # Permissions for executing files.
@@ -37106,7 +37116,7 @@
 +define(`manage_key_perms', `{ create link read search setattr view write } ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/users serefpolicy-3.5.13/policy/users
 --- nsaserefpolicy/policy/users	2008-10-17 14:49:11.000000000 +0200
-+++ serefpolicy-3.5.13/policy/users	2009-01-20 09:09:46.000000000 +0100
++++ serefpolicy-3.5.13/policy/users	2009-01-20 14:10:14.000000000 +0100
 @@ -25,11 +25,8 @@
  # permit any access to such users, then remove this entry.
  #
@@ -37133,7 +37143,7 @@
 +gen_user(root, user, unconfined_r sysadm_r staff_r ifdef(`enable_mls',`secadm_r auditadm_r') system_r, s0, s0 - mls_systemhigh, mcs_allcats)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/Rules.modular serefpolicy-3.5.13/Rules.modular
 --- nsaserefpolicy/Rules.modular	2008-10-17 14:49:14.000000000 +0200
-+++ serefpolicy-3.5.13/Rules.modular	2009-01-20 09:09:46.000000000 +0100
++++ serefpolicy-3.5.13/Rules.modular	2009-01-20 14:10:14.000000000 +0100
 @@ -73,8 +73,8 @@
  $(tmpdir)/%.mod: $(m4support) $(tmpdir)/generated_definitions.conf $(tmpdir)/all_interfaces.conf %.te
  	@echo "Compliling $(NAME) $(@F) module"
@@ -37182,7 +37192,7 @@
  $(appdir)/customizable_types: $(base_conf)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/support/Makefile.devel serefpolicy-3.5.13/support/Makefile.devel
 --- nsaserefpolicy/support/Makefile.devel	2008-10-17 14:49:14.000000000 +0200
-+++ serefpolicy-3.5.13/support/Makefile.devel	2009-01-20 09:09:46.000000000 +0100
++++ serefpolicy-3.5.13/support/Makefile.devel	2009-01-20 14:10:14.000000000 +0100
 @@ -181,8 +181,7 @@
  tmp/%.mod: $(m4support) tmp/all_interfaces.conf %.te
  	@$(EINFO) "Compiling $(NAME) $(basename $(@F)) module"



From rdieter at fedoraproject.org  Tue Jan 20 15:47:18 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Tue, 20 Jan 2009 15:47:18 +0000 (UTC)
Subject: rpms/poppler/devel poppler.spec,1.79,1.80
Message-ID: <20090120154718.9F24C700F9@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/poppler/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12835

Modified Files:
	poppler.spec 
Log Message:
* Tue Jan 20 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.10.3-2
- add needed scriptlets
- nuke rpaths



Index: poppler.spec
===================================================================
RCS file: /cvs/pkgs/rpms/poppler/devel/poppler.spec,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- poppler.spec	13 Jan 2009 05:04:55 -0000	1.79
+++ poppler.spec	20 Jan 2009 15:46:48 -0000	1.80
@@ -3,7 +3,7 @@
 Summary: PDF rendering library
 Name: poppler
 Version: 0.10.3
-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
@@ -14,6 +14,7 @@
 Patch0: poppler-ObjStream.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
+BuildRequires: automake libtool
 BuildRequires: gtk2-devel
 BuildRequires: cairo-devel
 BuildRequires: qt3-devel
@@ -28,7 +29,6 @@
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
 Requires: pkgconfig
-
 %description devel
 You should install the poppler-devel package if you would like to
 compile applications based on poppler.
@@ -37,7 +37,6 @@
 Summary: Glib wrapper for poppler
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
-
 %description glib
 %{summary}.
 
@@ -47,11 +46,9 @@
 Requires: %{name}-glib = %{version}-%{release}
 Requires: %{name}-devel = %{version}-%{release}
 Requires: gtk-doc
-
 %description glib-devel
 %{summary}.
 
-
 %package qt
 Summary: Qt3 wrapper for poppler
 Group:   System Environment/Libraries
@@ -85,7 +82,7 @@
 %{summary}.
 
 %package utils
-Summary: Command line utilities for converting PDF files.
+Summary: Command line utilities for converting PDF files
 Group: Applications/Text
 Requires: %{name} = %{version}-%{release}
 Conflicts: xpdf <= 1:3.01-8
@@ -108,6 +105,8 @@
 %setup -c -q -a1
 pushd %{name}-%{version}
 %patch0 -p0 -b .objstream
+# hammer to nuke rpaths, recheck on new releases
+autoreconf -i -f
 popd
 
 %build
@@ -137,9 +136,27 @@
 rm $RPM_BUILD_ROOT%{_libdir}/lib*.la
 
 
+%post -p /sbin/ldconfig
+
+%postun -p /sbin/ldconfig
+
+%post glib -p /sbin/ldconfig
+
+%postun glib -p /sbin/ldconfig
+
+%post qt -p /sbin/ldconfig
+
+%postun qt -p /sbin/ldconfig
+
+%post qt4 -p /sbin/ldconfig
+
+%postun qt4 -p /sbin/ldconfig
+
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+
 %files
 %defattr(-,root,root,-)
 %doc %{name}-%{version}/README
@@ -194,7 +211,12 @@
 %{_bindir}/*
 %{_mandir}/man1/*
 
+
 %changelog
+* Tue Jan 20 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.10.3-2
+- add needed scriptlets
+- nuke rpaths
+
 * Tue Jan 13 2009 Matthias Clasen <mclasen at redhat.com> - 0.10.3-1
 - Update to 0.10.3
 



From mpg at fedoraproject.org  Tue Jan 20 15:48:33 2009
From: mpg at fedoraproject.org (Marco Pesenti Gritti)
Date: Tue, 20 Jan 2009 15:48:33 +0000 (UTC)
Subject: rpms/sugar-artwork/devel .cvsignore, 1.11, 1.12 sources, 1.11,
	1.12 sugar-artwork.spec, 1.14, 1.15
Message-ID: <20090120154833.9C7A2700F9@cvs1.fedora.phx.redhat.com>

Author: mpg

Update of /cvs/pkgs/rpms/sugar-artwork/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13058

Modified Files:
	.cvsignore sources sugar-artwork.spec 
Log Message:
* Tue Jan 20 2009 Marco Pesenti Gritti <mpg at redhat.com> - 0.83.3-1
- add activity-journal icon to artwork
- add system-logout icon (part of #207)
- add everything needed for the colorpicker. That is a small icon and a bit in the gtkrc.
- fix triangular arrows by looking at the parent_bg_color option
- add icons for object transfers 




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-artwork/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	4 Jan 2009 22:45:44 -0000	1.11
+++ .cvsignore	20 Jan 2009 15:48:03 -0000	1.12
@@ -1 +1 @@
-sugar-artwork-0.83.2.tar.bz2
+sugar-artwork-0.83.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-artwork/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	4 Jan 2009 22:45:44 -0000	1.11
+++ sources	20 Jan 2009 15:48:03 -0000	1.12
@@ -1 +1 @@
-89219be4549bc6cb6a59062d06bec1e4  sugar-artwork-0.83.2.tar.bz2
+997a79f3a80ee77fa9335b20b2f3c321  sugar-artwork-0.83.3.tar.bz2


Index: sugar-artwork.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-artwork/devel/sugar-artwork.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sugar-artwork.spec	4 Jan 2009 22:45:44 -0000	1.14
+++ sugar-artwork.spec	20 Jan 2009 15:48:03 -0000	1.15
@@ -3,7 +3,7 @@
 
 Summary: Artwork for Sugar look-and-feel
 Name: sugar-artwork
-Version: 0.83.2
+Version: 0.83.3
 Release: 1%{?dist}
 #Release: 2.%{alphatag}%{?dist}
 URL: http://sugarlabs.org
@@ -64,6 +64,13 @@
 %{_libdir}/gtk-2.0/*/engines/*.so
 
 %changelog
+* Tue Jan 20 2009 Marco Pesenti Gritti <mpg at redhat.com> - 0.83.3-1
+- add activity-journal icon to artwork
+- add system-logout icon (part of #207)
+- add everything needed for the colorpicker. That is a small icon and a bit in the gtkrc.
+- fix triangular arrows by looking at the parent_bg_color option
+- add icons for object transfers 
+
 * Sun Jan 04 2009 Simon Schampijer <simon at laptop.org> - 0.83.2-1
 - New icon for the wired network
 



From till at fedoraproject.org  Tue Jan 20 15:54:31 2009
From: till at fedoraproject.org (Till Maas)
Date: Tue, 20 Jan 2009 15:54:31 +0000 (UTC)
Subject: rpms/libHX/devel .cvsignore, 1.8, 1.9 libHX.spec, 1.12, 1.13 sources,
	1.8, 1.9
Message-ID: <20090120155431.813FF700F9@cvs1.fedora.phx.redhat.com>

Author: till

Update of /cvs/pkgs/rpms/libHX/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13762

Modified Files:
	.cvsignore libHX.spec sources 
Log Message:
* Tue Jan 20 2009 Till Maas <opensource at till.name> - 2.3-1
- Update to new release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libHX/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	11 Sep 2008 16:23:56 -0000	1.8
+++ .cvsignore	20 Jan 2009 15:54:00 -0000	1.9
@@ -1 +1,2 @@
-libHX-1.25.tar.bz2
+libHX-2.3.tar.bz2
+libHX-2.3.tar.bz2.asc


Index: libHX.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libHX/devel/libHX.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- libHX.spec	20 Dec 2008 11:21:00 -0000	1.12
+++ libHX.spec	20 Jan 2009 15:54:00 -0000	1.13
@@ -1,12 +1,13 @@
 Name:           libHX
-Version:        1.25
-Release:        3%{?dist}
+Version:        2.3
+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/files/libHX/
 Source0:        http://jengelh.hopto.org/files/libHX/libHX-%{version}.tar.bz2
+Source1:        http://jengelh.hopto.org/files/libHX/libHX-%{version}.tar.bz2.asc
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  perl gcc-c++
@@ -87,6 +88,12 @@
 
 
 %changelog
+* Tue Jan 20 2009 Till Maas <opensource at till.name> - 2.3-1
+- Update to new release
+
+* Mon Dec 29 2008 Till Maas <opensource at till.name> - 2.1-1
+- Update to new release
+
 * Sat Dec 20 2008 Till Maas <opensource at till.name> - 1.25-3
 - Fix .so symlink
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libHX/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	11 Sep 2008 16:23:56 -0000	1.8
+++ sources	20 Jan 2009 15:54:00 -0000	1.9
@@ -1 +1,2 @@
-6f19ce48a03f729c3cab32a42924ed2f  libHX-1.25.tar.bz2
+cf100330b7ed4f2be17602dba7080077  libHX-2.3.tar.bz2
+04f7f54ba07e38c0580e92e82c2878b0  libHX-2.3.tar.bz2.asc



From mpg at fedoraproject.org  Tue Jan 20 15:58:17 2009
From: mpg at fedoraproject.org (Marco Pesenti Gritti)
Date: Tue, 20 Jan 2009 15:58:17 +0000 (UTC)
Subject: rpms/sugar-base/devel sugar-base.spec,1.11,1.12
Message-ID: <20090120155817.D1557700F9@cvs1.fedora.phx.redhat.com>

Author: mpg

Update of /cvs/pkgs/rpms/sugar-base/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14079

Modified Files:
	sugar-base.spec 
Log Message:
* Tue Jan 20 2009 Marco Pesenti Gritti <mpg at redhat.com> - 0.83.3-1
- Don't print logs to tty instead of shell.log in the emulator
- Trivial port to GIO instead of GnomeVFS    




Index: sugar-base.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-base/devel/sugar-base.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sugar-base.spec	4 Jan 2009 22:28:00 -0000	1.11
+++ sugar-base.spec	20 Jan 2009 15:57:47 -0000	1.12
@@ -2,7 +2,7 @@
 
 Summary: Base Sugar library
 Name: sugar-base
-Version: 0.83.2
+Version: 0.83.3
 Release: 1%{?dist}
 #Release: 2.%{alphatag}%{?dist}
 URL: http://sugarlabs.org/
@@ -45,6 +45,10 @@
 %{python_sitelib}/*
 
 %changelog
+* Tue Jan 20 2009 Marco Pesenti Gritti <mpg at redhat.com> - 0.83.3-1
+- Don't print logs to tty instead of shell.log in the emulator
+- Trivial port to GIO instead of GnomeVFS 
+
 * Sun Jan 04 2009 Simon Schampijer <simon at schampijer.de> - 0.83.2-1
 - add intltool as build dep
 - new download url



From rdieter at fedoraproject.org  Tue Jan 20 16:00:49 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Tue, 20 Jan 2009 16:00:49 +0000 (UTC)
Subject: rpms/poppler/devel poppler-0.8.0-ocg-crash.patch, 1.4,
	NONE poppler-qt3-check.patch, 1.3, NONE
Message-ID: <20090120160049.A0139700F9@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/poppler/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14638

Removed Files:
	poppler-0.8.0-ocg-crash.patch poppler-qt3-check.patch 
Log Message:
drop unused patches



--- poppler-0.8.0-ocg-crash.patch DELETED ---


--- poppler-qt3-check.patch DELETED ---



From rdieter at fedoraproject.org  Tue Jan 20 16:01:21 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Tue, 20 Jan 2009 16:01:21 +0000 (UTC)
Subject: rpms/poppler/F-10 poppler-qt3-check.patch, 1.3,
	NONE poppler-0.8.0-ocg-crash.patch, 1.4, NONE
Message-ID: <20090120160121.1B610700F9@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/poppler/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14698

Removed Files:
	poppler-qt3-check.patch poppler-0.8.0-ocg-crash.patch 
Log Message:
drop unused patches



--- poppler-qt3-check.patch DELETED ---


--- poppler-0.8.0-ocg-crash.patch DELETED ---



From rdieter at fedoraproject.org  Tue Jan 20 16:02:16 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Tue, 20 Jan 2009 16:02:16 +0000 (UTC)
Subject: rpms/poppler/F-10 poppler-0.8.7-qt4psprint.patch, NONE,
	1.1 poppler.spec, 1.78, 1.79
Message-ID: <20090120160216.9B0B4700F9@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/poppler/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14784

Modified Files:
	poppler.spec 
Added Files:
	poppler-0.8.7-qt4psprint.patch 
Log Message:
* Tue Jan 20 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.8.7-5
- patch to workaround okular rendering hyperlinks (#480357)
- add needed scriptlets
- nuke rpaths


poppler-0.8.7-qt4psprint.patch:

--- NEW FILE poppler-0.8.7-qt4psprint.patch ---
diff -up poppler-0.8.7/qt4/src/poppler-ps-converter.cc.qt4psprint poppler-0.8.7/qt4/src/poppler-ps-converter.cc
--- poppler-0.8.7/qt4/src/poppler-ps-converter.cc.qt4psprint	2008-03-26 14:38:52.000000000 -0500
+++ poppler-0.8.7/qt4/src/poppler-ps-converter.cc	2009-01-16 13:35:45.000000000 -0600
@@ -192,7 +192,7 @@ bool PSConverter::convert()
 	{
 		foreach(int page, d->pageList)
 		{
-			d->document->doc->displayPage(psOut, page, d->hDPI, d->vDPI, d->rotate, gFalse, gTrue, gFalse);
+			d->document->doc->displayPage(psOut, page, d->hDPI, d->vDPI, d->rotate, gFalse, gTrue, gTrue);
 		}
 		delete psOut;
 		d->closeDevice();


Index: poppler.spec
===================================================================
RCS file: /cvs/pkgs/rpms/poppler/F-10/poppler.spec,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- poppler.spec	4 Jan 2009 05:55:23 -0000	1.78
+++ poppler.spec	20 Jan 2009 16:01:46 -0000	1.79
@@ -3,7 +3,7 @@
 Summary: PDF rendering library
 Name: poppler
 Version: 0.8.7
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPLv2 and Redistributable, no modification permitted
 # the code is GPLv2
 # the charmap data in /usr/share/poppler is redistributable
@@ -14,8 +14,11 @@
 Patch0: poppler-ObjStream.patch
 # fix from upstream
 Patch1: pdftops-large-image.patch
+# http://bugzilla.redhat.com/480357
+Patch2: poppler-0.8.7-qt4psprint.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
+BuildRequires: automake libtool
 BuildRequires: gtk2-devel
 BuildRequires: cairo-devel
 BuildRequires: qt3-devel
@@ -39,7 +42,6 @@
 Summary: Glib wrapper for poppler
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
-
 %description glib
 %{summary}.
 
@@ -49,11 +51,9 @@
 Requires: %{name}-glib = %{version}-%{release}
 Requires: %{name}-devel = %{version}-%{release}
 Requires: gtk-doc
-
 %description glib-devel
 %{summary}.
 
-
 %package qt
 Summary: Qt3 wrapper for poppler
 Group:   System Environment/Libraries
@@ -87,7 +87,7 @@
 %{summary}.
 
 %package utils
-Summary: Command line utilities for converting PDF files.
+Summary: Command line utilities for converting PDF files
 Group: Applications/Text
 Requires: %{name} = %{version}-%{release}
 Conflicts: xpdf <= 1:3.01-8
@@ -111,6 +111,9 @@
 pushd %{name}-%{version}
 %patch0 -p0 -b .objstream
 %patch1 -p1 -b .large-image
+%patch2 -p1 -b .qt4psprint
+# hammer to nuke rpaths, recheck on new releases
+autoreconf -i -f
 popd
 
 %build
@@ -140,9 +143,27 @@
 rm $RPM_BUILD_ROOT%{_libdir}/lib*.la
 
 
+%post -p /sbin/ldconfig
+
+%postun -p /sbin/ldconfig
+
+%post glib -p /sbin/ldconfig
+
+%postun glib -p /sbin/ldconfig
+
+%post qt -p /sbin/ldconfig
+
+%postun qt -p /sbin/ldconfig
+
+%post qt4 -p /sbin/ldconfig
+
+%postun qt4 -p /sbin/ldconfig
+
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+
 %files
 %defattr(-,root,root,-)
 %doc %{name}-%{version}/README
@@ -197,7 +218,13 @@
 %{_bindir}/*
 %{_mandir}/man1/*
 
+
 %changelog
+* Tue Jan 20 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.8.7-5
+- patch to workaround okular rendering hyperlinks (#480357)
+- add needed scriptlets
+- nuke rpaths
+
 * Sun Jan  4 2009 Matthias Clasen  <mclasen at redhat.com> - 0.8.7-4
 - Fix a problem with large images
 



From mpg at fedoraproject.org  Tue Jan 20 16:02:40 2009
From: mpg at fedoraproject.org (Marco Pesenti Gritti)
Date: Tue, 20 Jan 2009 16:02:40 +0000 (UTC)
Subject: rpms/sugar-base/devel .cvsignore, 1.8, 1.9 sources, 1.8,
	1.9 sugar-base.spec, 1.12, 1.13
Message-ID: <20090120160240.1E777700F9@cvs1.fedora.phx.redhat.com>

Author: mpg

Update of /cvs/pkgs/rpms/sugar-base/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14849

Modified Files:
	.cvsignore sources sugar-base.spec 
Log Message:
Upload new sources.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-base/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	4 Jan 2009 22:28:00 -0000	1.8
+++ .cvsignore	20 Jan 2009 16:02:09 -0000	1.9
@@ -1 +1 @@
-sugar-base-0.83.2.tar.bz2
+sugar-base-0.83.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-base/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	4 Jan 2009 22:28:00 -0000	1.8
+++ sources	20 Jan 2009 16:02:09 -0000	1.9
@@ -1 +1 @@
-0f05d95eaf0f8e3174a3b3e3b0afe995  sugar-base-0.83.2.tar.bz2
+7ca87f1131e2ad027aca4f41a1a7135b  sugar-base-0.83.3.tar.bz2


Index: sugar-base.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-base/devel/sugar-base.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sugar-base.spec	20 Jan 2009 15:57:47 -0000	1.12
+++ sugar-base.spec	20 Jan 2009 16:02:09 -0000	1.13
@@ -3,7 +3,7 @@
 Summary: Base Sugar library
 Name: sugar-base
 Version: 0.83.3
-Release: 1%{?dist}
+Release: 2%{?dist}
 #Release: 2.%{alphatag}%{?dist}
 URL: http://sugarlabs.org/
 Source0: http://download.sugarlabs.org/sources/sucrose/glucose/%{name}/%{name}-%{version}.tar.bz2
@@ -45,7 +45,7 @@
 %{python_sitelib}/*
 
 %changelog
-* Tue Jan 20 2009 Marco Pesenti Gritti <mpg at redhat.com> - 0.83.3-1
+* Tue Jan 20 2009 Marco Pesenti Gritti <mpg at redhat.com> - 0.83.3-2
 - Don't print logs to tty instead of shell.log in the emulator
 - Trivial port to GIO instead of GnomeVFS 
 



From pkgdb at fedoraproject.org  Tue Jan 20 16:05:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Jan 2009 16:05:12 +0000
Subject: [pkgdb] goocanvas had acl change status
Message-ID: <20090120160512.DD191208470@bastion.fedora.phx.redhat.com>

bjohnson has set the watchcommits acl on goocanvas (Fedora 10) to Approved for denis

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/goocanvas



From pkgdb at fedoraproject.org  Tue Jan 20 16:05:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Jan 2009 16:05:17 +0000
Subject: [pkgdb] goocanvas had acl change status
Message-ID: <20090120160517.22592208472@bastion.fedora.phx.redhat.com>

bjohnson has set the watchbugzilla acl on goocanvas (Fedora 10) to Approved for denis

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/goocanvas



From pkgdb at fedoraproject.org  Tue Jan 20 16:05:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Jan 2009 16:05:19 +0000
Subject: [pkgdb] goocanvas had acl change status
Message-ID: <20090120160520.05365208475@bastion.fedora.phx.redhat.com>

bjohnson has set the commit acl on goocanvas (Fedora 10) to Approved for denis

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/goocanvas



From pkgdb at fedoraproject.org  Tue Jan 20 16:05:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Jan 2009 16:05:28 +0000
Subject: [pkgdb] goocanvas had acl change status
Message-ID: <20090120160529.1C888208467@bastion.fedora.phx.redhat.com>

bjohnson has set the watchbugzilla acl on goocanvas (Fedora devel) to Approved for denis

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/goocanvas



From pkgdb at fedoraproject.org  Tue Jan 20 16:05:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Jan 2009 16:05:31 +0000
Subject: [pkgdb] goocanvas had acl change status
Message-ID: <20090120160531.326AA208477@bastion.fedora.phx.redhat.com>

bjohnson has set the watchcommits acl on goocanvas (Fedora devel) to Approved for denis

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/goocanvas



From pkgdb at fedoraproject.org  Tue Jan 20 16:05:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Jan 2009 16:05:40 +0000
Subject: [pkgdb] goocanvas had acl change status
Message-ID: <20090120160541.01497208474@bastion.fedora.phx.redhat.com>

bjohnson has set the commit acl on goocanvas (Fedora devel) to Approved for denis

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/goocanvas



From hadess at fedoraproject.org  Tue Jan 20 16:13:41 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Tue, 20 Jan 2009 16:13:41 +0000 (UTC)
Subject: rpms/gstreamer/devel .cvsignore, 1.35,
	1.36 gstreamer-inspect-rpm-format.patch, 1.2, 1.3 gstreamer.spec,
	1.92, 1.93 sources, 1.36,
	1.37 gstreamer-0.10.21-fixgnomebz555631.patch, 1.1,
	NONE gstreamer-fix-bison-check.patch, 1.1, NONE
Message-ID: <20090120161341.89101700F9@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/gstreamer/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16446

Modified Files:
	.cvsignore gstreamer-inspect-rpm-format.patch gstreamer.spec 
	sources 
Removed Files:
	gstreamer-0.10.21-fixgnomebz555631.patch 
	gstreamer-fix-bison-check.patch 
Log Message:
* Tue Jan 20 2009 - Bastien Nocera <bnocera at redhat.com> - 0.10.22-1
- Update to 0.10.22
- Remove upstreamed patches, update rpm provides patch



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamer/devel/.cvsignore,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- .cvsignore	3 Oct 2008 08:12:48 -0000	1.35
+++ .cvsignore	20 Jan 2009 16:13:10 -0000	1.36
@@ -1 +1 @@
-gstreamer-0.10.21.tar.bz2
+gstreamer-0.10.22.tar.bz2

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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gstreamer-inspect-rpm-format.patch	11 Sep 2008 23:48:12 -0000	1.2
+++ gstreamer-inspect-rpm-format.patch	20 Jan 2009 16:13:11 -0000	1.3
@@ -1,11 +1,11 @@
 Index: gst-inspect.c
 ===================================================================
 RCS file: /cvs/gstreamer/gstreamer/tools/gst-inspect.c,v
-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 * 
+retrieving revision 1.144
+diff -u -p -u -p -r1.144 gst-inspect.c
+--- gst-inspect.c	17 Nov 2008 15:48:14 -0000	1.144
++++ gst-inspect.c	20 Jan 2009 16:11:05 -0000
+@@ -1262,9 +1262,219 @@ print_element_info (GstElementFactory * 
    return 0;
  }
  
@@ -226,7 +226,7 @@
  {
    GstPadDirection direction;
    const gchar *type_name;
-@@ -1251,15 +1461,19 @@ print_plugin_automatic_install_info_code
+@@ -1325,15 +1535,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,7 @@
  {
    gchar **protocols, **p;
  
-@@ -1268,11 +1482,17 @@ print_plugin_automatic_install_info_prot
+@@ -1342,11 +1556,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)
@@ -270,7 +270,7 @@
          break;
        default:
          break;
-@@ -1282,7 +1502,7 @@ print_plugin_automatic_install_info_prot
+@@ -1356,7 +1576,7 @@ print_plugin_automatic_install_info_prot
  }
  
  static void
@@ -279,7 +279,7 @@
  {
    const gchar *plugin_name;
    GList *features, *l;
-@@ -1302,11 +1522,12 @@ print_plugin_automatic_install_info (Gst
+@@ -1376,11 +1596,12 @@ print_plugin_automatic_install_info (Gst
      if (g_str_equal (plugin_name, feature->plugin_name)) {
        GstElementFactory *factory;
  
@@ -295,25 +295,25 @@
      }
    }
  
-@@ -1319,6 +1540,7 @@ main (int argc, char *argv[])
- {
+@@ -1394,6 +1615,7 @@ main (int argc, char *argv[])
    gboolean print_all = FALSE;
+   gboolean plugin_name = FALSE;
    gboolean print_aii = FALSE;
 +  gboolean print_aii_rpm = FALSE;
+   gboolean uri_handlers = FALSE;
    GOptionEntry options[] = {
      {"print-all", 'a', 0, G_OPTION_ARG_NONE, &print_all,
-         N_("Print all elements"), NULL},
-@@ -1327,6 +1549,9 @@ main (int argc, char *argv[])
+@@ -1403,6 +1625,9 @@ main (int argc, char *argv[])
                "provides.\n                                       "
                "Useful in connection with external automatic plugin "
                "installation mechanisms"), NULL},
 +    {"rpm", '\0', 0, G_OPTION_ARG_NONE, &print_aii_rpm,
 +       N_("Print the machine-parsable list of features of a plugin in RPM "
 +       	  "Provides compatible-format"), NULL},
-     GST_TOOLS_GOPTION_VERSION,
-     {NULL}
-   };
-@@ -1384,7 +1609,7 @@ main (int argc, char *argv[])
+     {"plugin", '\0', 0, G_OPTION_ARG_NONE, &plugin_name,
+         N_("List the plugin contents"), NULL},
+     {"uri-handlers", 'u', 0, G_OPTION_ARG_NONE, &uri_handlers,
+@@ -1478,7 +1703,7 @@ main (int argc, char *argv[])
        /* if there is such a plugin, print out info */
        if (plugin) {
          if (print_aii) {
@@ -322,7 +322,7 @@
          } else {
            print_plugin_info (plugin);
            print_plugin_features (plugin);
-@@ -1397,13 +1622,16 @@ main (int argc, char *argv[])
+@@ -1491,13 +1716,16 @@ main (int argc, char *argv[])
  
            if (plugin) {
              if (print_aii) {


Index: gstreamer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamer/devel/gstreamer.spec,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -r1.92 -r1.93
--- gstreamer.spec	5 Jan 2009 15:53:56 -0000	1.92
+++ gstreamer.spec	20 Jan 2009 16:13:11 -0000	1.93
@@ -5,8 +5,8 @@
 %define 	_libxml2	2.4.0
 
 Name: 		%{gstreamer}
-Version: 	0.10.21
-Release: 	4%{?dist}
+Version: 	0.10.22
+Release: 	1%{?dist}
 Summary: 	GStreamer streaming media framework runtime
 
 Group: 		Applications/Multimedia
@@ -38,10 +38,6 @@
 Patch1:		gstreamer-inspect-rpm-format.patch
 Source1:	gstreamer.prov
 Source2:	macros.gstreamer
-# From: http://bugzilla.gnome.org/show_bug.cgi?id=555631
-Patch2:		gstreamer-0.10.21-fixgnomebz555631.patch
-# From http://bugzilla.gnome.org/show_bug.cgi?id=564507
-Patch3:		gstreamer-fix-bison-check.patch
 
 ### documentation requirements
 BuildRequires:  python2
@@ -108,12 +104,8 @@
 pushd tools/
 %patch1 -p0 -b .rpm-provides
 popd
-%patch2 -p1 -b .gnomebz555631
-%patch3 -p0 -b .bison-check
 
 %build
-autoreconf
-libtoolize -f
 # 0.10.0: manuals do not build due to an openjade error; disable for now
 %configure \
   --with-package-name='Fedora Core gstreamer package' \
@@ -223,6 +215,10 @@
 %{_sysconfdir}/rpm/macros.gstreamer
 
 %changelog
+* Tue Jan 20 2009 - Bastien Nocera <bnocera at redhat.com> - 0.10.22-1
+- Update to 0.10.22
+- Remove upstreamed patches, update rpm provides patch
+
 * Mon Jan 05 2009 - Bastien Nocera <bnocera at redhat.com> - 0.10.21-4
 - Fix build with newer version of bison
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamer/devel/sources,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- sources	3 Oct 2008 08:12:48 -0000	1.36
+++ sources	20 Jan 2009 16:13:11 -0000	1.37
@@ -1 +1 @@
-7bad90af3fd81a1535363cf85359125c  gstreamer-0.10.21.tar.bz2
+35dd8598837af4074753afe5b59e8ef2  gstreamer-0.10.22.tar.bz2


--- gstreamer-0.10.21-fixgnomebz555631.patch DELETED ---


--- gstreamer-fix-bison-check.patch DELETED ---



From mclasen at fedoraproject.org  Tue Jan 20 16:19:15 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 20 Jan 2009 16:19:15 +0000 (UTC)
Subject: rpms/evince/devel .cvsignore, 1.56, 1.57 evince.spec, 1.145,
	1.146 sources, 1.55, 1.56
Message-ID: <20090120161915.5A3AF700F9@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/evince/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17748

Modified Files:
	.cvsignore evince.spec sources 
Log Message:
2.25.5



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/evince/devel/.cvsignore,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- .cvsignore	7 Jan 2009 03:55:12 -0000	1.56
+++ .cvsignore	20 Jan 2009 16:18:44 -0000	1.57
@@ -1 +1 @@
-evince-2.25.4.tar.bz2
+evince-2.25.5.tar.bz2


Index: evince.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evince/devel/evince.spec,v
retrieving revision 1.145
retrieving revision 1.146
diff -u -r1.145 -r1.146
--- evince.spec	17 Jan 2009 09:52:33 -0000	1.145
+++ evince.spec	20 Jan 2009 16:18:44 -0000	1.146
@@ -5,8 +5,8 @@
 %define theme_version 2.17.1
 
 Name:		evince
-Version:	2.25.4
-Release:	2%{?dist}
+Version:	2.25.5
+Release:	1%{?dist}
 Summary:	Document viewer
 
 License:	GPLv2+ and GFDL
@@ -237,6 +237,9 @@
 %{_libdir}/evince/backends/djvudocument.evince-backend
 
 %changelog
+* Tue Jan 20 2009 Matthias Clasen  <mclasen at redhat.com> - 2.25.5-1
+- Update to 2.25.5
+
 * Sat Jan 17 2009 Rakesh Pandit <rakesh at fedoraproject.org> - 2.25.4-2
 - Rebuild with mew djvulibre
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/evince/devel/sources,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- sources	7 Jan 2009 03:55:12 -0000	1.55
+++ sources	20 Jan 2009 16:18:44 -0000	1.56
@@ -1 +1 @@
-851bfed355d0010ddcdc530f50c0147f  evince-2.25.4.tar.bz2
+9c89013ff48a577d7fbd35a2c7d25f70  evince-2.25.5.tar.bz2



From hadess at fedoraproject.org  Tue Jan 20 16:20:45 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Tue, 20 Jan 2009 16:20:45 +0000 (UTC)
Subject: rpms/gstreamer-plugins-base/devel .cvsignore, 1.19,
	1.20 gstreamer-plugins-base.spec, 1.68, 1.69 sources, 1.20,
	1.21 gstpb-pulse-hang-bz556986.patch, 1.1, NONE
Message-ID: <20090120162045.CA504700F9@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-serv17902

Modified Files:
	.cvsignore gstreamer-plugins-base.spec sources 
Removed Files:
	gstpb-pulse-hang-bz556986.patch 
Log Message:
* Tue Jan 20 2009 - Bastien Nocera <bnocera at redhat.com> - 0.10.22-1
- Update to 0.10.22
- Remove upstreamed patches



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamer-plugins-base/devel/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- .cvsignore	3 Oct 2008 08:14:29 -0000	1.19
+++ .cvsignore	20 Jan 2009 16:20:15 -0000	1.20
@@ -1 +1 @@
-gst-plugins-base-0.10.21.tar.bz2
+gst-plugins-base-0.10.22.tar.bz2


Index: gstreamer-plugins-base.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamer-plugins-base/devel/gstreamer-plugins-base.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- gstreamer-plugins-base.spec	13 Jan 2009 18:37:30 -0000	1.68
+++ gstreamer-plugins-base.spec	20 Jan 2009 16:20:15 -0000	1.69
@@ -1,11 +1,11 @@
 %define         gstreamer       gstreamer
 %define         majorminor      0.10
 
-%define         _gst            0.10.21
+%define         _gst            0.10.22
 
 Name: 		%{gstreamer}-plugins-base
-Version: 	0.10.21
-Release:  	4%{?dist}	
+Version: 	0.10.22
+Release:  	1%{?dist}
 Summary: 	GStreamer streaming media framework base plug-ins
 
 Group: 		Applications/Multimedia
@@ -15,8 +15,6 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Patch0:		gstpb-0.10.15-cd-speed.patch
-# http://bugzilla.gnome.org/show_bug.cgi?id=556986
-Patch1:		gstpb-pulse-hang-bz556986.patch
 
 Requires:       %{gstreamer} >= %{_gst}
 Requires:	liboil >= 0.3.12-9
@@ -55,7 +53,6 @@
 %prep
 %setup -q -n gst-plugins-base-%{version}
 %patch0 -p1 -b .cd-speed
-%patch1 -p0 -b .pulse-hang
 
 %build
 %configure \
@@ -241,10 +238,14 @@
 %doc %{_datadir}/gtk-doc/html/gst-plugins-base-plugins-%{majorminor}
 
 %changelog
-* Tue Jan 13 2009 - Bastien Nocera <bnocera at redhat.com> - 0.10.2-4
+* Tue Jan 20 2009 - Bastien Nocera <bnocera at redhat.com> - 0.10.22-1
+- Update to 0.10.22
+- Remove upstreamed patches
+
+* Tue Jan 13 2009 - Bastien Nocera <bnocera at redhat.com> - 0.10.21-4
 - Avoid deadlocks when PulseAudio disappears
 
-* Thu Jan 1 2009 - Rex Dieter <rdieter at fedoraproject.org> - 0.10.2-3
+* Thu Jan 1 2009 - Rex Dieter <rdieter at fedoraproject.org> - 0.10.21-3
 - rebuild for pkgconfig deps (#478577)
 
 * Fri Oct 03 2008 - Bastien Nocera <bnocera at redhat.com> - 0.10.21-2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamer-plugins-base/devel/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources	3 Oct 2008 08:14:29 -0000	1.20
+++ sources	20 Jan 2009 16:20:15 -0000	1.21
@@ -1 +1 @@
-0e0cd485311502ad1c0c028148e3186a  gst-plugins-base-0.10.21.tar.bz2
+5d0f1e07f8f6db564971b50f75261e8a  gst-plugins-base-0.10.22.tar.bz2


--- gstpb-pulse-hang-bz556986.patch DELETED ---



From caolanm at fedoraproject.org  Tue Jan 20 16:28:31 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Tue, 20 Jan 2009 16:28:31 +0000 (UTC)
Subject: rpms/openoffice.org/devel
	openoffice.org-3.0.1.ooo98288.ucb.neonchange.patch, NONE,
	1.1 openoffice.org.spec, 1.1767, 1.1768
Message-ID: <20090120162831.76B9570141@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18915/devel

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-3.0.1.ooo98288.ucb.neonchange.patch 
Log Message:
Resolves: rhbz#480057 add openoffice.org-3.0.1.ooo98288.ucb.neonchange.patch

openoffice.org-3.0.1.ooo98288.ucb.neonchange.patch:

--- NEW FILE openoffice.org-3.0.1.ooo98288.ucb.neonchange.patch ---
Index: source/ucp/webdav/NeonPropFindRequest.cxx
===================================================================
RCS file: /cvs/ucb/ucb/source/ucp/webdav/NeonPropFindRequest.cxx,v
retrieving revision 1.24
diff -u -r1.24 NeonPropFindRequest.cxx
--- openoffice.org.orig/ucb/source/ucp/webdav/NeonPropFindRequest.cxx	10 Apr 2008 15:40:55 -0000	1.24
+++ openoffice.org/ucb/source/ucp/webdav/NeonPropFindRequest.cxx	20 Jan 2009 16:21:07 -0000
@@ -103,8 +104,12 @@
 			if ( aValue.getLength() )
 			{
                 aValue = aValue.toAsciiLowerCase();
-				if ( aValue.compareTo(
-						RTL_CONSTASCII_STRINGPARAM( "<collection" ) ) == 0 )
+				if (
+				    ( aValue.compareTo(
+						RTL_CONSTASCII_STRINGPARAM( "<collection" ) ) == 0 ) ||
+				    ( aValue.compareTo(
+						RTL_CONSTASCII_STRINGPARAM( "<dav:collection" ) ) == 0 )
+				   )
 				{
 					thePropertyValue.Value
 						<<= OUString::createFromAscii( "collection" );


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1767
retrieving revision 1.1768
diff -u -r1.1767 -r1.1768
--- openoffice.org.spec	20 Jan 2009 10:00:07 -0000	1.1767
+++ openoffice.org.spec	20 Jan 2009 16:28:01 -0000	1.1768
@@ -1,6 +1,6 @@
 %define oootag OOO300
 %define ooomilestone 15
-%define rh_rpm_release 3
+%define rh_rpm_release 4
 
 # rhbz#465664 jar-repacking breaks help by reordering META-INF/MANIFEST.MF
 %define __jar_repack %{nil}
@@ -133,6 +133,7 @@
 Patch62: workspace.fwk99.patch
 Patch63: openoffice.org-3.1.0.ooo98137.filter.redeclared-variables.patch
 Patch64: openoffice.org-3.0.1.ooo98240.sc.basicworkaround.patch
+Patch65: openoffice.org-3.0.1.ooo98288.ucb.neonchange.patch
 
 %define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
 %define instdir %{_libdir}
@@ -1418,6 +1419,7 @@
 %patch62 -p1 -b .workspace.fwk99.patch
 %patch63 -p1 -b .ooo98137.filter.redeclared-variables.patch
 %patch64 -p1 -b .ooo98240.sc.basicworkaround.patch
+%patch65 -p1 -b .ooo98288.ucb.neonchange.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -3828,6 +3830,9 @@
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
+* Tue Jan 20 2009 Caol??n McNamara <caolanm at redhat.com> - 1:3.0.1-15.4
+- Resolves: rhbz#480057 add openoffice.org-3.0.1.ooo98288.ucb.neonchange.patch
+
 * Tue Jan 20 2009 Caol??n McNamara <caolanm at redhat.com> - 1:3.0.1-15.3
 - Resolves: rhbz#480362 add
   openoffice.org-3.0.1.ooo98240.sc.basicworkaround.patch



From caolanm at fedoraproject.org  Tue Jan 20 16:28:31 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Tue, 20 Jan 2009 16:28:31 +0000 (UTC)
Subject: rpms/openoffice.org/F-10
	openoffice.org-3.0.1.ooo98288.ucb.neonchange.patch, NONE,
	1.1 openoffice.org.spec, 1.1712, 1.1713
Message-ID: <20090120162831.27F07700F9@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18915/F-10

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-3.0.1.ooo98288.ucb.neonchange.patch 
Log Message:
Resolves: rhbz#480057 add openoffice.org-3.0.1.ooo98288.ucb.neonchange.patch

openoffice.org-3.0.1.ooo98288.ucb.neonchange.patch:

--- NEW FILE openoffice.org-3.0.1.ooo98288.ucb.neonchange.patch ---
Index: source/ucp/webdav/NeonPropFindRequest.cxx
===================================================================
RCS file: /cvs/ucb/ucb/source/ucp/webdav/NeonPropFindRequest.cxx,v
retrieving revision 1.24
diff -u -r1.24 NeonPropFindRequest.cxx
--- openoffice.org.orig/ucb/source/ucp/webdav/NeonPropFindRequest.cxx	10 Apr 2008 15:40:55 -0000	1.24
+++ openoffice.org/ucb/source/ucp/webdav/NeonPropFindRequest.cxx	20 Jan 2009 16:21:07 -0000
@@ -103,8 +104,12 @@
 			if ( aValue.getLength() )
 			{
                 aValue = aValue.toAsciiLowerCase();
-				if ( aValue.compareTo(
-						RTL_CONSTASCII_STRINGPARAM( "<collection" ) ) == 0 )
+				if (
+				    ( aValue.compareTo(
+						RTL_CONSTASCII_STRINGPARAM( "<collection" ) ) == 0 ) ||
+				    ( aValue.compareTo(
+						RTL_CONSTASCII_STRINGPARAM( "<dav:collection" ) ) == 0 )
+				   )
 				{
 					thePropertyValue.Value
 						<<= OUString::createFromAscii( "collection" );


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-10/openoffice.org.spec,v
retrieving revision 1.1712
retrieving revision 1.1713
diff -u -r1.1712 -r1.1713
--- openoffice.org.spec	19 Jan 2009 13:24:42 -0000	1.1712
+++ openoffice.org.spec	20 Jan 2009 16:28:00 -0000	1.1713
@@ -135,6 +135,7 @@
 Patch62: openoffice.org-3.0.1.ooo98024.vcl.emboldenoverlap.patch
 Patch63: openoffice.org-3.1.0.ooo98137.filter.redeclared-variables.patch
 Patch64: openoffice.org-3.0.1.ooo98240.sc.basicworkaround.patch
+Patch65: openoffice.org-3.0.1.ooo98288.ucb.neonchange.patch
 
 %define instdir %{_libdir}
 %define baseinstdir %{instdir}/openoffice.org
@@ -1394,6 +1395,7 @@
 %patch62 -p1 -b .ooo98024.vcl.emboldenoverlap.patch
 %patch63 -p1 -b .ooo98137.filter.redeclared-variables.patch
 %patch64 -p1 -b .ooo98240.sc.basicworkaround.patch
+%patch65 -p1 -b .ooo98288.ucb.neonchange.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -3760,13 +3762,15 @@
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
-* Mon Jan 19 2009 Caol??n McNamara <caolanm at redhat.com> - 1:3.0.1-15.2
+* Tue Jan 20 2009 Caol??n McNamara <caolanm at redhat.com> - 1:3.0.1-15.2
 - Resolves: rhbz#479624 add
   openoffice.org-3.0.1.ooo98024.vcl.emboldenoverlap.patch
 - Resolves: rhbz#480121 add
   openoffice.org-3.1.0.ooo98137.filter.redeclared-variables.patch
 - Resolves: rhbz#480362
   openoffice.org-3.0.1.ooo98240.sc.basicworkaround.patch
+- Resolves: rhbz#480057 add 
+  openoffice.org-3.0.1.ooo98288.ucb.neonchange.patch
 
 * Mon Jan 12 2009 Caol??n McNamara <caolanm at redhat.com> - 1:3.0.1-15.1
 - Resolves: rhbz#470302 g_file_input_stream_query_info doesn't do anything 



From mgrepl at fedoraproject.org  Tue Jan 20 16:30:17 2009
From: mgrepl at fedoraproject.org (Miroslav Grepl)
Date: Tue, 20 Jan 2009 16:30:17 +0000 (UTC)
Subject: rpms/selinux-policy/F-10 policy-20080710.patch,1.125,1.126
Message-ID: <20090120163017.22BF6700F9@cvs1.fedora.phx.redhat.com>

Author: mgrepl

Update of /cvs/extras/rpms/selinux-policy/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18754

Modified Files:
	policy-20080710.patch 
Log Message:
- Allow hald_mac_t send system log messages



policy-20080710.patch:

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.125 -r 1.126 policy-20080710.patch
Index: policy-20080710.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-10/policy-20080710.patch,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -r1.125 -r1.126
--- policy-20080710.patch	20 Jan 2009 15:38:23 -0000	1.125
+++ policy-20080710.patch	20 Jan 2009 16:30:16 -0000	1.126
@@ -1,6 +1,6 @@
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/default_contexts serefpolicy-3.5.13/config/appconfig-mcs/default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/default_contexts	2008-10-17 14:49:10.000000000 +0200
-+++ serefpolicy-3.5.13/config/appconfig-mcs/default_contexts	2009-01-20 14:10:14.000000000 +0100
++++ serefpolicy-3.5.13/config/appconfig-mcs/default_contexts	2009-01-20 17:15:52.000000000 +0100
 @@ -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
@@ -24,13 +24,13 @@
 +system_r:xdm_t:s0		user_r:user_t:s0
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/failsafe_context serefpolicy-3.5.13/config/appconfig-mcs/failsafe_context
 --- nsaserefpolicy/config/appconfig-mcs/failsafe_context	2008-10-17 14:49:10.000000000 +0200
-+++ serefpolicy-3.5.13/config/appconfig-mcs/failsafe_context	2009-01-20 14:10:14.000000000 +0100
++++ serefpolicy-3.5.13/config/appconfig-mcs/failsafe_context	2009-01-20 17:15:52.000000000 +0100
 @@ -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.5.13/config/appconfig-mcs/guest_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/guest_u_default_contexts	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.5.13/config/appconfig-mcs/guest_u_default_contexts	2009-01-20 14:10:14.000000000 +0100
++++ serefpolicy-3.5.13/config/appconfig-mcs/guest_u_default_contexts	2009-01-20 17:15:52.000000000 +0100
 @@ -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
@@ -40,7 +40,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.5.13/config/appconfig-mcs/root_default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/root_default_contexts	2008-10-17 14:49:10.000000000 +0200
-+++ serefpolicy-3.5.13/config/appconfig-mcs/root_default_contexts	2009-01-20 14:10:14.000000000 +0100
++++ serefpolicy-3.5.13/config/appconfig-mcs/root_default_contexts	2009-01-20 17:15:52.000000000 +0100
 @@ -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
@@ -57,7 +57,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/seusers serefpolicy-3.5.13/config/appconfig-mcs/seusers
 --- nsaserefpolicy/config/appconfig-mcs/seusers	2008-10-17 14:49:10.000000000 +0200
-+++ serefpolicy-3.5.13/config/appconfig-mcs/seusers	2009-01-20 14:10:14.000000000 +0100
++++ serefpolicy-3.5.13/config/appconfig-mcs/seusers	2009-01-20 17:15:52.000000000 +0100
 @@ -1,3 +1,3 @@
  system_u:system_u:s0-mcs_systemhigh
 -root:root:s0-mcs_systemhigh
@@ -66,7 +66,7 @@
 +__default__:unconfined_u:s0-mcs_systemhigh
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/staff_u_default_contexts serefpolicy-3.5.13/config/appconfig-mcs/staff_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/staff_u_default_contexts	2008-10-17 14:49:10.000000000 +0200
-+++ serefpolicy-3.5.13/config/appconfig-mcs/staff_u_default_contexts	2009-01-20 14:10:14.000000000 +0100
++++ serefpolicy-3.5.13/config/appconfig-mcs/staff_u_default_contexts	2009-01-20 17:15:52.000000000 +0100
 @@ -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
@@ -83,7 +83,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/unconfined_u_default_contexts serefpolicy-3.5.13/config/appconfig-mcs/unconfined_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/unconfined_u_default_contexts	2008-10-17 14:49:10.000000000 +0200
-+++ serefpolicy-3.5.13/config/appconfig-mcs/unconfined_u_default_contexts	2009-01-20 14:10:14.000000000 +0100
++++ serefpolicy-3.5.13/config/appconfig-mcs/unconfined_u_default_contexts	2009-01-20 17:15:52.000000000 +0100
 @@ -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
@@ -93,13 +93,13 @@
  system_r:xdm_t:s0		unconfined_r:unconfined_t:s0
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/userhelper_context serefpolicy-3.5.13/config/appconfig-mcs/userhelper_context
 --- nsaserefpolicy/config/appconfig-mcs/userhelper_context	2008-10-17 14:49:10.000000000 +0200
-+++ serefpolicy-3.5.13/config/appconfig-mcs/userhelper_context	2009-01-20 14:10:14.000000000 +0100
++++ serefpolicy-3.5.13/config/appconfig-mcs/userhelper_context	2009-01-20 17:15:52.000000000 +0100
 @@ -1 +1 @@
 -system_u:sysadm_r:sysadm_t:s0
 +system_u:system_r:unconfined_t:s0	
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/user_u_default_contexts serefpolicy-3.5.13/config/appconfig-mcs/user_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/user_u_default_contexts	2008-10-17 14:49:10.000000000 +0200
-+++ serefpolicy-3.5.13/config/appconfig-mcs/user_u_default_contexts	2009-01-20 14:10:14.000000000 +0100
++++ serefpolicy-3.5.13/config/appconfig-mcs/user_u_default_contexts	2009-01-20 17:15:52.000000000 +0100
 @@ -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
@@ -114,7 +114,7 @@
 +user_r:user_t:s0		user_r:user_t:s0
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/xguest_u_default_contexts serefpolicy-3.5.13/config/appconfig-mcs/xguest_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/xguest_u_default_contexts	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.5.13/config/appconfig-mcs/xguest_u_default_contexts	2009-01-20 14:10:14.000000000 +0100
++++ serefpolicy-3.5.13/config/appconfig-mcs/xguest_u_default_contexts	2009-01-20 17:15:52.000000000 +0100
 @@ -0,0 +1,7 @@
 +system_r:local_login_t	xguest_r:xguest_t:s0
 +system_r:remote_login_t	xguest_r:xguest_t:s0
@@ -125,7 +125,7 @@
 +xguest_r:xguest_t:s0	xguest_r:xguest_t:s0
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/default_contexts serefpolicy-3.5.13/config/appconfig-mls/default_contexts
 --- nsaserefpolicy/config/appconfig-mls/default_contexts	2008-10-17 14:49:10.000000000 +0200
-+++ serefpolicy-3.5.13/config/appconfig-mls/default_contexts	2009-01-20 14:10:14.000000000 +0100
++++ serefpolicy-3.5.13/config/appconfig-mls/default_contexts	2009-01-20 17:15:52.000000000 +0100
 @@ -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
@@ -149,7 +149,7 @@
 +system_r:xdm_t:s0		user_r:user_t:s0
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/guest_u_default_contexts serefpolicy-3.5.13/config/appconfig-mls/guest_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mls/guest_u_default_contexts	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.5.13/config/appconfig-mls/guest_u_default_contexts	2009-01-20 14:10:14.000000000 +0100
++++ serefpolicy-3.5.13/config/appconfig-mls/guest_u_default_contexts	2009-01-20 17:15:52.000000000 +0100
 @@ -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
@@ -157,7 +157,7 @@
 +system_r:crond_t:s0		guest_r:guest_t:s0
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/root_default_contexts serefpolicy-3.5.13/config/appconfig-mls/root_default_contexts
 --- nsaserefpolicy/config/appconfig-mls/root_default_contexts	2008-10-17 14:49:10.000000000 +0200
-+++ serefpolicy-3.5.13/config/appconfig-mls/root_default_contexts	2009-01-20 14:10:14.000000000 +0100
++++ serefpolicy-3.5.13/config/appconfig-mls/root_default_contexts	2009-01-20 17:15:52.000000000 +0100
 @@ -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
@@ -178,7 +178,7 @@
 +#system_r:sshd_t:s0		sysadm_r:sysadm_t:s0 staff_r:staff_t:s0
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/staff_u_default_contexts serefpolicy-3.5.13/config/appconfig-mls/staff_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mls/staff_u_default_contexts	2008-10-17 14:49:10.000000000 +0200
-+++ serefpolicy-3.5.13/config/appconfig-mls/staff_u_default_contexts	2009-01-20 14:10:14.000000000 +0100
++++ serefpolicy-3.5.13/config/appconfig-mls/staff_u_default_contexts	2009-01-20 17:15:52.000000000 +0100
 @@ -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
@@ -190,7 +190,7 @@
  staff_r:staff_sudo_t:s0		staff_r:staff_t:s0
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/user_u_default_contexts serefpolicy-3.5.13/config/appconfig-mls/user_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mls/user_u_default_contexts	2008-10-17 14:49:10.000000000 +0200
-+++ serefpolicy-3.5.13/config/appconfig-mls/user_u_default_contexts	2009-01-20 14:10:14.000000000 +0100
++++ serefpolicy-3.5.13/config/appconfig-mls/user_u_default_contexts	2009-01-20 17:15:52.000000000 +0100
 @@ -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
@@ -202,7 +202,7 @@
  user_r:user_sudo_t:s0		user_r:user_t:s0
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/xguest_u_default_contexts serefpolicy-3.5.13/config/appconfig-mls/xguest_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mls/xguest_u_default_contexts	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.5.13/config/appconfig-mls/xguest_u_default_contexts	2009-01-20 14:10:14.000000000 +0100
++++ serefpolicy-3.5.13/config/appconfig-mls/xguest_u_default_contexts	2009-01-20 17:15:52.000000000 +0100
 @@ -0,0 +1,7 @@
 +system_r:local_login_t	xguest_r:xguest_t:s0
 +system_r:remote_login_t	xguest_r:xguest_t:s0
@@ -213,7 +213,7 @@
 +xguest_r:xguest_t:s0	xguest_r:xguest_t:s0
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-standard/guest_u_default_contexts serefpolicy-3.5.13/config/appconfig-standard/guest_u_default_contexts
 --- nsaserefpolicy/config/appconfig-standard/guest_u_default_contexts	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.5.13/config/appconfig-standard/guest_u_default_contexts	2009-01-20 14:10:14.000000000 +0100
++++ serefpolicy-3.5.13/config/appconfig-standard/guest_u_default_contexts	2009-01-20 17:15:52.000000000 +0100
 @@ -0,0 +1,4 @@
 +system_r:local_login_t	guest_r:guest_t
 +system_r:remote_login_t	guest_r:guest_t
@@ -221,7 +221,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.5.13/config/appconfig-standard/root_default_contexts
 --- nsaserefpolicy/config/appconfig-standard/root_default_contexts	2008-10-17 14:49:10.000000000 +0200
-+++ serefpolicy-3.5.13/config/appconfig-standard/root_default_contexts	2009-01-20 14:10:14.000000000 +0100
++++ serefpolicy-3.5.13/config/appconfig-standard/root_default_contexts	2009-01-20 17:15:52.000000000 +0100
 @@ -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
@@ -237,7 +237,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/staff_u_default_contexts serefpolicy-3.5.13/config/appconfig-standard/staff_u_default_contexts
 --- nsaserefpolicy/config/appconfig-standard/staff_u_default_contexts	2008-10-17 14:49:10.000000000 +0200
-+++ serefpolicy-3.5.13/config/appconfig-standard/staff_u_default_contexts	2009-01-20 14:10:14.000000000 +0100
++++ serefpolicy-3.5.13/config/appconfig-standard/staff_u_default_contexts	2009-01-20 17:15:52.000000000 +0100
 @@ -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
@@ -249,7 +249,7 @@
  staff_r:staff_sudo_t		staff_r:staff_t
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-standard/user_u_default_contexts serefpolicy-3.5.13/config/appconfig-standard/user_u_default_contexts
 --- nsaserefpolicy/config/appconfig-standard/user_u_default_contexts	2008-10-17 14:49:10.000000000 +0200
-+++ serefpolicy-3.5.13/config/appconfig-standard/user_u_default_contexts	2009-01-20 14:10:14.000000000 +0100
++++ serefpolicy-3.5.13/config/appconfig-standard/user_u_default_contexts	2009-01-20 17:15:52.000000000 +0100
 @@ -1,7 +1,7 @@
  system_r:local_login_t		user_r:user_t
  system_r:remote_login_t		user_r:user_t
@@ -261,7 +261,7 @@
  user_r:user_sudo_t		user_r:user_t
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-standard/xguest_u_default_contexts serefpolicy-3.5.13/config/appconfig-standard/xguest_u_default_contexts
 --- nsaserefpolicy/config/appconfig-standard/xguest_u_default_contexts	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.5.13/config/appconfig-standard/xguest_u_default_contexts	2009-01-20 14:10:14.000000000 +0100
++++ serefpolicy-3.5.13/config/appconfig-standard/xguest_u_default_contexts	2009-01-20 17:15:52.000000000 +0100
 @@ -0,0 +1,5 @@
 +system_r:local_login_t	xguest_r:xguest_t
 +system_r:remote_login_t	xguest_r:xguest_t
@@ -270,7 +270,7 @@
 +system_r:xdm_t		xguest_r:xguest_t
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/Makefile serefpolicy-3.5.13/Makefile
 --- nsaserefpolicy/Makefile	2008-10-17 14:49:11.000000000 +0200
-+++ serefpolicy-3.5.13/Makefile	2009-01-20 14:10:14.000000000 +0100
++++ serefpolicy-3.5.13/Makefile	2009-01-20 17:15:52.000000000 +0100
 @@ -311,20 +311,22 @@
  
[...3391 lines suppressed...]
  
  ########################################
@@ -32173,7 +32188,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.te serefpolicy-3.5.13/policy/modules/system/selinuxutil.te
 --- nsaserefpolicy/policy/modules/system/selinuxutil.te	2008-10-17 14:49:13.000000000 +0200
-+++ serefpolicy-3.5.13/policy/modules/system/selinuxutil.te	2009-01-20 14:10:14.000000000 +0100
++++ serefpolicy-3.5.13/policy/modules/system/selinuxutil.te	2009-01-20 17:15:52.000000000 +0100
 @@ -23,6 +23,9 @@
  type selinux_config_t;
  files_type(selinux_config_t)
@@ -32530,7 +32545,7 @@
  ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/setrans.if serefpolicy-3.5.13/policy/modules/system/setrans.if
 --- nsaserefpolicy/policy/modules/system/setrans.if	2008-10-17 14:49:13.000000000 +0200
-+++ serefpolicy-3.5.13/policy/modules/system/setrans.if	2009-01-20 14:10:14.000000000 +0100
++++ serefpolicy-3.5.13/policy/modules/system/setrans.if	2009-01-20 17:15:52.000000000 +0100
 @@ -21,3 +21,23 @@
  	stream_connect_pattern($1,setrans_var_run_t,setrans_var_run_t,setrans_t)
  	files_list_pids($1)
@@ -32557,7 +32572,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/sysnetwork.fc serefpolicy-3.5.13/policy/modules/system/sysnetwork.fc
 --- nsaserefpolicy/policy/modules/system/sysnetwork.fc	2008-10-17 14:49:13.000000000 +0200
-+++ serefpolicy-3.5.13/policy/modules/system/sysnetwork.fc	2009-01-20 14:10:14.000000000 +0100
++++ serefpolicy-3.5.13/policy/modules/system/sysnetwork.fc	2009-01-20 17:15:52.000000000 +0100
 @@ -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)
@@ -32582,7 +32597,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.5.13/policy/modules/system/sysnetwork.if
 --- nsaserefpolicy/policy/modules/system/sysnetwork.if	2008-10-17 14:49:13.000000000 +0200
-+++ serefpolicy-3.5.13/policy/modules/system/sysnetwork.if	2009-01-20 14:10:14.000000000 +0100
++++ serefpolicy-3.5.13/policy/modules/system/sysnetwork.if	2009-01-20 17:15:52.000000000 +0100
 @@ -198,7 +198,25 @@
  		type dhcpc_state_t;
  	')
@@ -32694,7 +32709,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/sysnetwork.te serefpolicy-3.5.13/policy/modules/system/sysnetwork.te
 --- nsaserefpolicy/policy/modules/system/sysnetwork.te	2008-10-17 14:49:13.000000000 +0200
-+++ serefpolicy-3.5.13/policy/modules/system/sysnetwork.te	2009-01-20 14:10:14.000000000 +0100
++++ serefpolicy-3.5.13/policy/modules/system/sysnetwork.te	2009-01-20 17:15:52.000000000 +0100
 @@ -20,6 +20,9 @@
  init_daemon_domain(dhcpc_t,dhcpc_exec_t)
  role system_r types dhcpc_t;
@@ -32884,7 +32899,7 @@
  	xen_append_log(ifconfig_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/udev.fc serefpolicy-3.5.13/policy/modules/system/udev.fc
 --- nsaserefpolicy/policy/modules/system/udev.fc	2008-10-17 14:49:13.000000000 +0200
-+++ serefpolicy-3.5.13/policy/modules/system/udev.fc	2009-01-20 14:10:14.000000000 +0100
++++ serefpolicy-3.5.13/policy/modules/system/udev.fc	2009-01-20 17:15:52.000000000 +0100
 @@ -13,8 +13,11 @@
  /sbin/start_udev --	gen_context(system_u:object_r:udev_exec_t,s0)
  /sbin/udev	--	gen_context(system_u:object_r:udev_exec_t,s0)
@@ -32899,7 +32914,7 @@
 +/var/run/PackageKit/udev(/.*)?		gen_context(system_u:object_r:udev_var_run_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/udev.if serefpolicy-3.5.13/policy/modules/system/udev.if
 --- nsaserefpolicy/policy/modules/system/udev.if	2008-10-17 14:49:13.000000000 +0200
-+++ serefpolicy-3.5.13/policy/modules/system/udev.if	2009-01-20 14:10:14.000000000 +0100
++++ serefpolicy-3.5.13/policy/modules/system/udev.if	2009-01-20 17:15:52.000000000 +0100
 @@ -96,6 +96,24 @@
  
  ########################################
@@ -32955,7 +32970,7 @@
  ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/udev.te serefpolicy-3.5.13/policy/modules/system/udev.te
 --- nsaserefpolicy/policy/modules/system/udev.te	2008-10-17 14:49:13.000000000 +0200
-+++ serefpolicy-3.5.13/policy/modules/system/udev.te	2009-01-20 14:10:14.000000000 +0100
++++ serefpolicy-3.5.13/policy/modules/system/udev.te	2009-01-20 17:15:52.000000000 +0100
 @@ -83,6 +83,7 @@
  kernel_rw_unix_dgram_sockets(udev_t)
  kernel_dgram_send(udev_t)
@@ -33014,7 +33029,7 @@
  ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.fc serefpolicy-3.5.13/policy/modules/system/unconfined.fc
 --- nsaserefpolicy/policy/modules/system/unconfined.fc	2008-10-17 14:49:13.000000000 +0200
-+++ serefpolicy-3.5.13/policy/modules/system/unconfined.fc	2009-01-20 14:10:14.000000000 +0100
++++ serefpolicy-3.5.13/policy/modules/system/unconfined.fc	2009-01-20 17:15:52.000000000 +0100
 @@ -2,15 +2,31 @@
  # e.g.:
  # /usr/local/bin/appsrv		--	gen_context(system_u:object_r:unconfined_exec_t,s0)
@@ -33058,7 +33073,7 @@
 +#/usr/lib(64)?/gcl-[^/]+/unixport/saved_.* 	--	gen_context(system_u:object_r:execmem_exec_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.if serefpolicy-3.5.13/policy/modules/system/unconfined.if
 --- nsaserefpolicy/policy/modules/system/unconfined.if	2008-10-17 14:49:13.000000000 +0200
-+++ serefpolicy-3.5.13/policy/modules/system/unconfined.if	2009-01-20 14:10:14.000000000 +0100
++++ serefpolicy-3.5.13/policy/modules/system/unconfined.if	2009-01-20 17:15:52.000000000 +0100
 @@ -12,14 +12,13 @@
  #
  interface(`unconfined_domain_noaudit',`
@@ -33408,7 +33423,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.te serefpolicy-3.5.13/policy/modules/system/unconfined.te
 --- nsaserefpolicy/policy/modules/system/unconfined.te	2008-10-17 14:49:13.000000000 +0200
-+++ serefpolicy-3.5.13/policy/modules/system/unconfined.te	2009-01-20 14:10:14.000000000 +0100
++++ serefpolicy-3.5.13/policy/modules/system/unconfined.te	2009-01-20 17:15:52.000000000 +0100
 @@ -6,35 +6,77 @@
  # Declarations
  #
@@ -33773,7 +33788,7 @@
 +gen_user(unconfined_u, user, unconfined_r system_r, s0, s0 - mls_systemhigh, mcs_allcats)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.fc serefpolicy-3.5.13/policy/modules/system/userdomain.fc
 --- nsaserefpolicy/policy/modules/system/userdomain.fc	2008-10-17 14:49:13.000000000 +0200
-+++ serefpolicy-3.5.13/policy/modules/system/userdomain.fc	2009-01-20 14:10:14.000000000 +0100
++++ serefpolicy-3.5.13/policy/modules/system/userdomain.fc	2009-01-20 17:15:52.000000000 +0100
 @@ -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)
@@ -33786,7 +33801,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.5.13/policy/modules/system/userdomain.if
 --- nsaserefpolicy/policy/modules/system/userdomain.if	2008-10-17 14:49:13.000000000 +0200
-+++ serefpolicy-3.5.13/policy/modules/system/userdomain.if	2009-01-20 14:10:14.000000000 +0100
++++ serefpolicy-3.5.13/policy/modules/system/userdomain.if	2009-01-20 17:15:52.000000000 +0100
 @@ -28,10 +28,14 @@
  		class context contains;
  	')
@@ -36539,7 +36554,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-3.5.13/policy/modules/system/userdomain.te
 --- nsaserefpolicy/policy/modules/system/userdomain.te	2008-10-17 14:49:13.000000000 +0200
-+++ serefpolicy-3.5.13/policy/modules/system/userdomain.te	2009-01-20 14:10:14.000000000 +0100
++++ serefpolicy-3.5.13/policy/modules/system/userdomain.te	2009-01-20 17:15:52.000000000 +0100
 @@ -8,13 +8,6 @@
  
  ## <desc>
@@ -36659,7 +36674,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.fc serefpolicy-3.5.13/policy/modules/system/xen.fc
 --- nsaserefpolicy/policy/modules/system/xen.fc	2008-10-17 14:49:13.000000000 +0200
-+++ serefpolicy-3.5.13/policy/modules/system/xen.fc	2009-01-20 14:10:14.000000000 +0100
++++ serefpolicy-3.5.13/policy/modules/system/xen.fc	2009-01-20 17:15:52.000000000 +0100
 @@ -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)
@@ -36670,7 +36685,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.if serefpolicy-3.5.13/policy/modules/system/xen.if
 --- nsaserefpolicy/policy/modules/system/xen.if	2008-10-17 14:49:13.000000000 +0200
-+++ serefpolicy-3.5.13/policy/modules/system/xen.if	2009-01-20 14:10:14.000000000 +0100
++++ serefpolicy-3.5.13/policy/modules/system/xen.if	2009-01-20 17:15:52.000000000 +0100
 @@ -155,7 +155,7 @@
  	stream_connect_pattern($1,xenstored_var_run_t,xenstored_var_run_t,xenstored_t)
  ')
@@ -36723,7 +36738,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.te serefpolicy-3.5.13/policy/modules/system/xen.te
 --- nsaserefpolicy/policy/modules/system/xen.te	2008-10-17 14:49:13.000000000 +0200
-+++ serefpolicy-3.5.13/policy/modules/system/xen.te	2009-01-20 14:10:14.000000000 +0100
++++ serefpolicy-3.5.13/policy/modules/system/xen.te	2009-01-20 17:15:52.000000000 +0100
 @@ -6,6 +6,13 @@
  # Declarations
  #
@@ -36957,7 +36972,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/policy_capabilities serefpolicy-3.5.13/policy/policy_capabilities
 --- nsaserefpolicy/policy/policy_capabilities	2008-10-17 14:49:14.000000000 +0200
-+++ serefpolicy-3.5.13/policy/policy_capabilities	2009-01-20 14:10:14.000000000 +0100
++++ serefpolicy-3.5.13/policy/policy_capabilities	2009-01-20 17:15:52.000000000 +0100
 @@ -29,4 +29,4 @@
  # chr_file: open
  # blk_file: open
@@ -36966,7 +36981,7 @@
 +#policycap open_perms;
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/support/obj_perm_sets.spt serefpolicy-3.5.13/policy/support/obj_perm_sets.spt
 --- nsaserefpolicy/policy/support/obj_perm_sets.spt	2008-10-17 14:49:14.000000000 +0200
-+++ serefpolicy-3.5.13/policy/support/obj_perm_sets.spt	2009-01-20 14:10:14.000000000 +0100
++++ serefpolicy-3.5.13/policy/support/obj_perm_sets.spt	2009-01-20 17:15:52.000000000 +0100
 @@ -59,22 +59,22 @@
  # 
  # Permissions for executing files.
@@ -37116,7 +37131,7 @@
 +define(`manage_key_perms', `{ create link read search setattr view write } ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/users serefpolicy-3.5.13/policy/users
 --- nsaserefpolicy/policy/users	2008-10-17 14:49:11.000000000 +0200
-+++ serefpolicy-3.5.13/policy/users	2009-01-20 14:10:14.000000000 +0100
++++ serefpolicy-3.5.13/policy/users	2009-01-20 17:15:52.000000000 +0100
 @@ -25,11 +25,8 @@
  # permit any access to such users, then remove this entry.
  #
@@ -37143,7 +37158,7 @@
 +gen_user(root, user, unconfined_r sysadm_r staff_r ifdef(`enable_mls',`secadm_r auditadm_r') system_r, s0, s0 - mls_systemhigh, mcs_allcats)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/Rules.modular serefpolicy-3.5.13/Rules.modular
 --- nsaserefpolicy/Rules.modular	2008-10-17 14:49:14.000000000 +0200
-+++ serefpolicy-3.5.13/Rules.modular	2009-01-20 14:10:14.000000000 +0100
++++ serefpolicy-3.5.13/Rules.modular	2009-01-20 17:15:52.000000000 +0100
 @@ -73,8 +73,8 @@
  $(tmpdir)/%.mod: $(m4support) $(tmpdir)/generated_definitions.conf $(tmpdir)/all_interfaces.conf %.te
  	@echo "Compliling $(NAME) $(@F) module"
@@ -37192,7 +37207,7 @@
  $(appdir)/customizable_types: $(base_conf)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/support/Makefile.devel serefpolicy-3.5.13/support/Makefile.devel
 --- nsaserefpolicy/support/Makefile.devel	2008-10-17 14:49:14.000000000 +0200
-+++ serefpolicy-3.5.13/support/Makefile.devel	2009-01-20 14:10:14.000000000 +0100
++++ serefpolicy-3.5.13/support/Makefile.devel	2009-01-20 17:15:52.000000000 +0100
 @@ -181,8 +181,7 @@
  tmp/%.mod: $(m4support) tmp/all_interfaces.conf %.te
  	@$(EINFO) "Compiling $(NAME) $(basename $(@F)) module"



From mpg at fedoraproject.org  Tue Jan 20 16:32:43 2009
From: mpg at fedoraproject.org (Marco Pesenti Gritti)
Date: Tue, 20 Jan 2009 16:32:43 +0000 (UTC)
Subject: rpms/sugar-datastore/devel .cvsignore, 1.8, 1.9 sources, 1.8,
	1.9 sugar-datastore.spec, 1.10, 1.11
Message-ID: <20090120163243.B6C94700F9@cvs1.fedora.phx.redhat.com>

Author: mpg

Update of /cvs/pkgs/rpms/sugar-datastore/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19447

Modified Files:
	.cvsignore sources sugar-datastore.spec 
Log Message:
* Tue Jan 20 2009 Marco Pesenti Gritti <mpg at redhat.com> - 0.83.2-1
- #181 Replace deprecated os.popen by subprocess
- #140 Crash when joining a shared Read 



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-datastore/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	4 Jan 2009 22:59:24 -0000	1.8
+++ .cvsignore	20 Jan 2009 16:32:13 -0000	1.9
@@ -1 +1 @@
-sugar-datastore-0.83.1.tar.bz2
+sugar-datastore-0.83.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-datastore/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	4 Jan 2009 22:59:24 -0000	1.8
+++ sources	20 Jan 2009 16:32:13 -0000	1.9
@@ -1 +1 @@
-31f1b45406d42207ffcec8f3829dc12b  sugar-datastore-0.83.1.tar.bz2
+814f81e10266e85c89ae3e5550d7fa69  sugar-datastore-0.83.2.tar.bz2


Index: sugar-datastore.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-datastore/devel/sugar-datastore.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sugar-datastore.spec	4 Jan 2009 22:59:24 -0000	1.10
+++ sugar-datastore.spec	20 Jan 2009 16:32:13 -0000	1.11
@@ -1,7 +1,7 @@
 %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")
 
 Name: sugar-datastore
-Version: 0.83.1
+Version: 0.83.2
 Release: 1%{?dist}
 Summary: Sugar Datastore
 
@@ -46,6 +46,10 @@
 %{_datadir}/dbus-1/services/*.service
 
 %changelog
+* Tue Jan 20 2009 Marco Pesenti Gritti <mpg at redhat.com> - 0.83.2-1
+- #181 Replace deprecated os.popen by subprocess
+- #140 Crash when joining a shared Read 
+
 * Sun Jan 04 2009 Simon Schampijer <simon at laptop.org> - 0.83.1-1
 - contains a bunch of stability and robustness improvements 
 



From bpepple at fedoraproject.org  Tue Jan 20 16:34:19 2009
From: bpepple at fedoraproject.org (Brian Pepple)
Date: Tue, 20 Jan 2009 16:34:19 +0000 (UTC)
Subject: rpms/telepathy-glib/devel .cvsignore, 1.23, 1.24 sources, 1.23,
	1.24 telepathy-glib.spec, 1.30, 1.31
Message-ID: <20090120163419.3AA80700F9@cvs1.fedora.phx.redhat.com>

Author: bpepple

Update of /cvs/pkgs/rpms/telepathy-glib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19831

Modified Files:
	.cvsignore sources telepathy-glib.spec 
Log Message:
* Tue Jan 20 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.7.23-1
- Update to 0.7.23.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-glib/devel/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- .cvsignore	13 Jan 2009 20:39:25 -0000	1.23
+++ .cvsignore	20 Jan 2009 16:33:48 -0000	1.24
@@ -1 +1 @@
-telepathy-glib-0.7.22.tar.gz
+telepathy-glib-0.7.23.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-glib/devel/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sources	13 Jan 2009 20:39:25 -0000	1.23
+++ sources	20 Jan 2009 16:33:48 -0000	1.24
@@ -1 +1 @@
-558d463816ca71955ca27fdcddf715c2  telepathy-glib-0.7.22.tar.gz
+d27958be1f0fdcc4801839ed121171e8  telepathy-glib-0.7.23.tar.gz


Index: telepathy-glib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-glib/devel/telepathy-glib.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- telepathy-glib.spec	13 Jan 2009 20:39:25 -0000	1.30
+++ telepathy-glib.spec	20 Jan 2009 16:33:48 -0000	1.31
@@ -3,7 +3,7 @@
 %define	glib_ver	2.16
 
 Name:           telepathy-glib
-Version:        0.7.22
+Version:        0.7.23
 Release:        1%{?dist}
 Summary:        GLib bindings for Telepathy
 
@@ -89,6 +89,9 @@
 
 
 %changelog
+* Tue Jan 20 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.7.23-1
+- Update to 0.7.23.
+
 * Tue Jan 13 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.7.22-1
 - Update to 0.7.22.
 



From cebbert at fedoraproject.org  Tue Jan 20 16:34:37 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Tue, 20 Jan 2009 16:34:37 +0000 (UTC)
Subject: rpms/kernel/F-10 config-generic, 1.207, 1.208 config-x86_64-generic,
	1.56, 1.57 kernel.spec, 1.1223, 1.1224
Message-ID: <20090120163437.26112700F9@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19918

Modified Files:
	config-generic config-x86_64-generic kernel.spec 
Log Message:
Set CONFIG_CAPI_EICON on x86_64, re-enable Radeon kernel modesetting.
Change remaining config options from '=n' to 'is not set'.


Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/config-generic,v
retrieving revision 1.207
retrieving revision 1.208
diff -u -r1.207 -r1.208
--- config-generic	20 Jan 2009 00:11:24 -0000	1.207
+++ config-generic	20 Jan 2009 16:34:06 -0000	1.208
@@ -1233,7 +1233,7 @@
 CONFIG_R8169=m
 CONFIG_R8169_NAPI=y
 CONFIG_R8169_VLAN=y
-CONFIG_SFC=n
+# CONFIG_SFC is not set
 # CONFIG_SK98LIN is not set
 CONFIG_SKGE=m
 # CONFIG_SKGE_DEBUG is not set
@@ -1471,7 +1471,7 @@
 CONFIG_BPQETHER=m
 CONFIG_SCC=m
 CONFIG_DMASCC=m
-CONFIG_SCC_DELAY=n
+# CONFIG_SCC_DELAY is not set
 CONFIG_SCC_TRXECHO=y
 CONFIG_BAYCOM_SER_FDX=m
 CONFIG_BAYCOM_SER_HDX=m
@@ -2122,14 +2122,14 @@
 CONFIG_DRM_TDFX=m
 CONFIG_DRM_R128=m
 CONFIG_DRM_RADEON=m
-CONFIG_DRM_RADEON_KMS=n
+CONFIG_DRM_RADEON_KMS=y
 CONFIG_DRM_I810=m
 CONFIG_DRM_I830=m
 CONFIG_DRM_MGA=m
 CONFIG_DRM_SIS=m
 CONFIG_DRM_SAVAGE=m
 CONFIG_DRM_I915=m
-CONFIG_DRM_I915_KMS=n
+# CONFIG_DRM_I915_KMS is not set
 CONFIG_DRM_VIA=m
 CONFIG_DRM_NOUVEAU=m
 
@@ -2934,7 +2934,7 @@
 CONFIG_USB_UVCVIDEO=m
 CONFIG_USB_W9968CF=m
 CONFIG_USB_XUSBATM=m
-CONFIG_USB_ZC0301=n
+# CONFIG_USB_ZC0301 is not set
 CONFIG_USB_ZERO=m
 
 CONFIG_USB_ANNOUNCE_NEW_DEVICES=y


Index: config-x86_64-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/config-x86_64-generic,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- config-x86_64-generic	13 Jan 2009 15:30:14 -0000	1.56
+++ config-x86_64-generic	20 Jan 2009 16:34:06 -0000	1.57
@@ -46,6 +46,8 @@
 
 CONFIG_SECCOMP=y
 
+CONFIG_CAPI_EICON=y
+
 CONFIG_GENERIC_ISA_DMA=y
 CONFIG_SCHED_SMT=y
 CONFIG_SUSPEND=y


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/kernel.spec,v
retrieving revision 1.1223
retrieving revision 1.1224
diff -u -r1.1223 -r1.1224
--- kernel.spec	20 Jan 2009 05:11:51 -0000	1.1223
+++ kernel.spec	20 Jan 2009 16:34:06 -0000	1.1224
@@ -1779,6 +1779,10 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Tue Jan 20 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.28.1-17
+- Set CONFIG_CAPI_EICON on x86_64, re-enable Radeon kernel modesetting.
+- Change remaining config options from '=n' to 'is not set'.
+
 * Tue Jan 20 2009 Dave Airlie <airlied at redhat.com> 2.6.28.1-16
 - rebase radeon modesetting onto 2.6.28
 



From mclasen at fedoraproject.org  Tue Jan 20 16:40:03 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 20 Jan 2009 16:40:03 +0000 (UTC)
Subject: rpms/glib2/devel .cvsignore, 1.101, 1.102 glib2.spec, 1.193,
	1.194 sources, 1.103, 1.104
Message-ID: <20090120164003.16019700F9@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/glib2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20661

Modified Files:
	.cvsignore glib2.spec sources 
Log Message:
2.19.5



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/glib2/devel/.cvsignore,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -r1.101 -r1.102
--- .cvsignore	5 Jan 2009 18:38:45 -0000	1.101
+++ .cvsignore	20 Jan 2009 16:39:32 -0000	1.102
@@ -1 +1 @@
-glib-2.19.4.tar.bz2
+glib-2.19.5.tar.bz2


Index: glib2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/glib2/devel/glib2.spec,v
retrieving revision 1.193
retrieving revision 1.194
diff -u -r1.193 -r1.194
--- glib2.spec	5 Jan 2009 18:38:45 -0000	1.193
+++ glib2.spec	20 Jan 2009 16:39:32 -0000	1.194
@@ -2,7 +2,7 @@
 
 Summary: A library of handy utility functions
 Name: glib2
-Version: 2.19.4
+Version: 2.19.5
 Release: 1%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
@@ -133,6 +133,9 @@
 %{_libdir}/lib*.a
 
 %changelog
+* Tue Jan 20 2009 Matthias Clasen <mclasen at redhat.com> - 2.19.5-1
+- Update to 2.19.5
+
 * Mon Jan  5 2009 Matthias Clasen <mclasen at redhat.com> - 2.19.4-1
 - Update to 2.19.4
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/glib2/devel/sources,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -r1.103 -r1.104
--- sources	5 Jan 2009 18:38:45 -0000	1.103
+++ sources	20 Jan 2009 16:39:32 -0000	1.104
@@ -1 +1 @@
-1eefaadb07e66df90418fe7cc775e9f7  glib-2.19.4.tar.bz2
+b9f8453dd38266108641c448ea8d5bee  glib-2.19.5.tar.bz2



From mtasaka at fedoraproject.org  Tue Jan 20 16:42:01 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Tue, 20 Jan 2009 16:42:01 +0000 (UTC)
Subject: rpms/wallpapoz/devel daemon_wallpapoz-wrapper, NONE,
	1.1 wallpapoz.spec, 1.20, 1.21
Message-ID: <20090120164201.90EE1700F9@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/wallpapoz/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21072

Modified Files:
	wallpapoz.spec 
Added Files:
	daemon_wallpapoz-wrapper 
Log Message:
* Wed Jan 21 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.4.1-8.svn87_trunk
- Always once kill daemon_wallpapoz process if it exists before start



--- NEW FILE daemon_wallpapoz-wrapper ---
#!/bin/sh

pgrep -U $(id -u) -f daemon_wallpapoz | while read daemon_pid
do
	pgrep -U $(id -u) -f python | while read python_pid
	do
		if [ $daemon_pid = $python_pid ]
		then
			/usr/bin/kill -SIGTERM $daemon_pid
		fi
	done
done
exec /usr/libexec/daemon_wallpapoz "$@"


Index: wallpapoz.spec
===================================================================
RCS file: /cvs/extras/rpms/wallpapoz/devel/wallpapoz.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- wallpapoz.spec	1 Dec 2008 15:00:55 -0000	1.20
+++ wallpapoz.spec	20 Jan 2009 16:41:31 -0000	1.21
@@ -8,19 +8,20 @@
 %define         mainver         0.4.1
 %undefine         betaver
 %define         svnver          svn87_trunk
-%define         fedorarel       7
+%define         fedorarel       8
 
 %define         rel             %{?betaver:0.}%{fedorarel}%{?svnver:.%svnver}%{?betaver:.%betaver}
 
 Name:           wallpapoz
 Version:        %{mainver}
-Release:        %{rel}%{?dist}.1
+Release:        %{rel}%{?dist}
 Summary:        Gnome Multi Backgrounds and Wallpapers Configuration Tool
 
 Group:          User Interface/Desktops
 License:        GPLv2+
 URL:            %{srcurl}
 Source0:        %{srcurl}files/%{name}-%{mainver}%{?svnver:-%svnver}%{?betaver:%betaver}.tar.bz2
+Source10:       daemon_wallpapoz-wrapper
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -69,6 +70,14 @@
    --delete-original \
    $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
 
+# Install daemon_wallpapoz-wrapper, move the original one
+# to %%_libexecdir
+%{__mkdir_p} $RPM_BUILD_ROOT%{_libexecdir}
+%{__mv} $RPM_BUILD_ROOT%{_bindir}/daemon_wallpapoz \
+	$RPM_BUILD_ROOT%{_libexecdir}/
+%{__install} -cpm 0755 %{SOURCE10} \
+	$RPM_BUILD_ROOT%{_bindir}/daemon_wallpapoz
+
 %{find_lang} %{name}
 
 %clean
@@ -78,6 +87,7 @@
 %defattr(-,root,root,-)
 %doc COPYING README
 %{_bindir}/*%{name}
+%{_libexecdir}/daemon_wallpapoz
 
 %{_datadir}/%{name}/
 %{_datadir}/gnome/help/%{name}/
@@ -86,8 +96,11 @@
 %{_datadir}/applications/fedora-%{name}.desktop
 
 %changelog
-* Mon Dec 01 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 0.4.1-7.svn87_trunk.1
-- Rebuild for Python 2.6
+* Wed Jan 21 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.4.1-8.svn87_trunk
+- Always once kill daemon_wallpapoz process if it exists before start
+
+* Mon Dec 01 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com>
+- F-11: Rebuild for Python 2.6
 
 * Wed Aug 27 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.4.1-7.svn87_trunk
 - F-10+: Add (Build)Requires: gnome-python2-gnome (bug 456122, 460022)



From mpg at fedoraproject.org  Tue Jan 20 16:44:46 2009
From: mpg at fedoraproject.org (Marco Pesenti Gritti)
Date: Tue, 20 Jan 2009 16:44:46 +0000 (UTC)
Subject: rpms/sugar-presence-service/devel sugar-presence-service.spec, 1.15,
	1.16
Message-ID: <20090120164446.48AFF700F9@cvs1.fedora.phx.redhat.com>

Author: mpg

Update of /cvs/pkgs/rpms/sugar-presence-service/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21791

Modified Files:
	sugar-presence-service.spec 
Log Message:
* Tue Jan 20 2009 Marco Pesenti Gritti <mpg at redhat.com> - 0.83.3-1
- #142 Restart a server-based collaboration session / switch servers on the fly



Index: sugar-presence-service.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-presence-service/devel/sugar-presence-service.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sugar-presence-service.spec	22 Dec 2008 14:33:50 -0000	1.15
+++ sugar-presence-service.spec	20 Jan 2009 16:44:15 -0000	1.16
@@ -1,5 +1,5 @@
 Name: sugar-presence-service
-Version: 0.83.2
+Version: 0.83.3
 Release: 1%{?dist}
 Summary: The Sugar presence service
 
@@ -42,6 +42,9 @@
 %{_datadir}/dbus-1/services/org.laptop.Sugar.Presence.service
 
 %changelog
+* Tue Jan 20 2009 Marco Pesenti Gritti <mpg at redhat.com> - 0.83.3-1
+- #142 Restart a server-based collaboration session / switch servers on the fly 
+
 * Mon Dec 22 2008 Morgan Collett <morgan.collett at gmail.com> - 0.83.2-1
 - Remove NM 0.7 patch - included in release
 - Update to 0.83.2



From mclasen at fedoraproject.org  Tue Jan 20 16:45:59 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 20 Jan 2009 16:45:59 +0000 (UTC)
Subject: rpms/evince/devel evince.spec,1.146,1.147
Message-ID: <20090120164559.58638700F9@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/evince/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22151

Modified Files:
	evince.spec 
Log Message:
fix spec



Index: evince.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evince/devel/evince.spec,v
retrieving revision 1.146
retrieving revision 1.147
diff -u -r1.146 -r1.147
--- evince.spec	20 Jan 2009 16:18:44 -0000	1.146
+++ evince.spec	20 Jan 2009 16:45:29 -0000	1.147
@@ -225,7 +225,7 @@
 
 
 %files devel
-%{_includedir}/evince-2.20
+%{_includedir}/evince-2.25
 %{_libdir}/libevbackend.so
 
 %files dvi



From mpg at fedoraproject.org  Tue Jan 20 16:52:52 2009
From: mpg at fedoraproject.org (Marco Pesenti Gritti)
Date: Tue, 20 Jan 2009 16:52:52 +0000 (UTC)
Subject: rpms/sugar-presence-service/devel .cvsignore, 1.11, 1.12 sources,
	1.11, 1.12 sugar-presence-service.spec, 1.16, 1.17
Message-ID: <20090120165252.83CAE700F9@cvs1.fedora.phx.redhat.com>

Author: mpg

Update of /cvs/pkgs/rpms/sugar-presence-service/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23088

Modified Files:
	.cvsignore sources sugar-presence-service.spec 
Log Message:
upload sources


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-presence-service/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	22 Dec 2008 14:33:49 -0000	1.11
+++ .cvsignore	20 Jan 2009 16:52:21 -0000	1.12
@@ -1 +1 @@
-sugar-presence-service-0.83.2.tar.bz2
+sugar-presence-service-0.83.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-presence-service/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	22 Dec 2008 14:33:50 -0000	1.11
+++ sources	20 Jan 2009 16:52:22 -0000	1.12
@@ -1 +1 @@
-16062ac6a45177c3f739e4fc637789b4  sugar-presence-service-0.83.2.tar.bz2
+571f9225a974b17c2fa0d31dac9c3eec  sugar-presence-service-0.83.3.tar.bz2


Index: sugar-presence-service.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-presence-service/devel/sugar-presence-service.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sugar-presence-service.spec	20 Jan 2009 16:44:15 -0000	1.16
+++ sugar-presence-service.spec	20 Jan 2009 16:52:22 -0000	1.17
@@ -1,6 +1,6 @@
 Name: sugar-presence-service
 Version: 0.83.3
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: The Sugar presence service
 
 Group: System Environment/Libraries
@@ -42,7 +42,7 @@
 %{_datadir}/dbus-1/services/org.laptop.Sugar.Presence.service
 
 %changelog
-* Tue Jan 20 2009 Marco Pesenti Gritti <mpg at redhat.com> - 0.83.3-1
+* Tue Jan 20 2009 Marco Pesenti Gritti <mpg at redhat.com> - 0.83.3-2
 - #142 Restart a server-based collaboration session / switch servers on the fly 
 
 * Mon Dec 22 2008 Morgan Collett <morgan.collett at gmail.com> - 0.83.2-1



From mclasen at fedoraproject.org  Tue Jan 20 16:54:40 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 20 Jan 2009 16:54:40 +0000 (UTC)
Subject: rpms/gcalctool/devel .cvsignore, 1.53, 1.54 gcalctool.spec, 1.80,
	1.81 sources, 1.54, 1.55
Message-ID: <20090120165440.1F0A3700F9@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gcalctool/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23457

Modified Files:
	.cvsignore gcalctool.spec sources 
Log Message:
2.25.5



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gcalctool/devel/.cvsignore,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- .cvsignore	6 Jan 2009 07:15:13 -0000	1.53
+++ .cvsignore	20 Jan 2009 16:54:09 -0000	1.54
@@ -1 +1 @@
-gcalctool-5.25.4.tar.bz2
+gcalctool-5.25.5.tar.bz2


Index: gcalctool.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gcalctool/devel/gcalctool.spec,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- gcalctool.spec	6 Jan 2009 07:15:13 -0000	1.80
+++ gcalctool.spec	20 Jan 2009 16:54:09 -0000	1.81
@@ -1,5 +1,5 @@
 Name:           gcalctool
-Version:        5.25.4
+Version:        5.25.5
 Release:        1%{?dist}
 Summary:        A desktop calculator
 
@@ -99,6 +99,9 @@
 
 
 %changelog
+* Tue Jan 20 2009 Matthias Clasen <mclasen at redhat.com> - 5.25.5-1
+- Update to 2.25.5
+
 * Tue Jan  6 2009 Matthias Clasen <mclasen at redhat.com> - 5.25.4-1
 - Update to 5.25.4
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gcalctool/devel/sources,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- sources	6 Jan 2009 07:15:13 -0000	1.54
+++ sources	20 Jan 2009 16:54:09 -0000	1.55
@@ -1 +1 @@
-13998f97ba1815db3dae5b4b1ed864cf  gcalctool-5.25.4.tar.bz2
+86a2d412d8a66b118fdf6d3fe753f69f  gcalctool-5.25.5.tar.bz2



From mclasen at fedoraproject.org  Tue Jan 20 16:57:37 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 20 Jan 2009 16:57:37 +0000 (UTC)
Subject: rpms/evince/devel evince.spec,1.147,1.148
Message-ID: <20090120165737.C2408700F9@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/evince/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23865

Modified Files:
	evince.spec 
Log Message:
fix file list



Index: evince.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evince/devel/evince.spec,v
retrieving revision 1.147
retrieving revision 1.148
diff -u -r1.147 -r1.148
--- evince.spec	20 Jan 2009 16:45:29 -0000	1.147
+++ evince.spec	20 Jan 2009 16:57:07 -0000	1.148
@@ -225,7 +225,7 @@
 
 
 %files devel
-%{_includedir}/evince-2.25
+%{_includedir}/evince/2.25
 %{_libdir}/libevbackend.so
 
 %files dvi



From mpg at fedoraproject.org  Tue Jan 20 16:58:05 2009
From: mpg at fedoraproject.org (Marco Pesenti Gritti)
Date: Tue, 20 Jan 2009 16:58:05 +0000 (UTC)
Subject: rpms/sugar-browse/devel .cvsignore, 1.2, 1.3 sources, 1.2,
	1.3 sugar-browse.spec, 1.2, 1.3
Message-ID: <20090120165805.582DC700F9@cvs1.fedora.phx.redhat.com>

Author: mpg

Update of /cvs/pkgs/rpms/sugar-browse/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24052

Modified Files:
	.cvsignore sources sugar-browse.spec 
Log Message:
* Tue Jan 20 2008 Marco Pesenti Gritti <mpg at redhat.com> - 103-1
- use cjson instead of json (nirbheek)
- new translations    




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-browse/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	11 Oct 2008 07:45:09 -0000	1.2
+++ .cvsignore	20 Jan 2009 16:57:35 -0000	1.3
@@ -1 +1 @@
-Browse-99.tar.bz2
+Browse-103.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-browse/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	11 Oct 2008 07:45:09 -0000	1.2
+++ sources	20 Jan 2009 16:57:35 -0000	1.3
@@ -1 +1 @@
-8b5b7014b6a3fc6ebba625822cec2187  Browse-99.tar.bz2
+67f0af58d715e83cc4ae7fc43e7dbd0a  Browse-103.tar.bz2


Index: sugar-browse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-browse/devel/sugar-browse.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sugar-browse.spec	1 Dec 2008 15:00:43 -0000	1.2
+++ sugar-browse.spec	20 Jan 2009 16:57:35 -0000	1.3
@@ -1,6 +1,6 @@
 Name: sugar-browse
-Version: 99
-Release: 2%{?dist}
+Version: 103
+Release: 1%{?dist}
 Summary: Browse activity for Sugar
 Group: Sugar/Activities
 License: GPLv2+
@@ -40,6 +40,10 @@
 
 
 %changelog
+* Tue Jan 20 2008 Marco Pesenti Gritti <mpg at redhat.com> - 103-1
+- use cjson instead of json (nirbheek)
+- new translations 
+
 * Mon Dec 01 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 99-2
 - Rebuild for Python 2.6
 



From mpg at fedoraproject.org  Tue Jan 20 17:00:06 2009
From: mpg at fedoraproject.org (Marco Pesenti Gritti)
Date: Tue, 20 Jan 2009 17:00:06 +0000 (UTC)
Subject: rpms/sugar-browse/devel sugar-browse.spec,1.3,1.4
Message-ID: <20090120170006.E8AD6700F9@cvs1.fedora.phx.redhat.com>

Author: mpg

Update of /cvs/pkgs/rpms/sugar-browse/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24316

Modified Files:
	sugar-browse.spec 
Log Message:
correct date


Index: sugar-browse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-browse/devel/sugar-browse.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sugar-browse.spec	20 Jan 2009 16:57:35 -0000	1.3
+++ sugar-browse.spec	20 Jan 2009 16:59:36 -0000	1.4
@@ -40,7 +40,7 @@
 
 
 %changelog
-* Tue Jan 20 2008 Marco Pesenti Gritti <mpg at redhat.com> - 103-1
+* Tue Jan 20 2009 Marco Pesenti Gritti <mpg at redhat.com> - 103-1
 - use cjson instead of json (nirbheek)
 - new translations 
 



From mclasen at fedoraproject.org  Tue Jan 20 17:04:04 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 20 Jan 2009 17:04:04 +0000 (UTC)
Subject: rpms/at-spi/devel .cvsignore, 1.57, 1.58 at-spi.spec, 1.111,
	1.112 sources, 1.57, 1.58
Message-ID: <20090120170404.A3D8F700F9@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/at-spi/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25015

Modified Files:
	.cvsignore at-spi.spec sources 
Log Message:
1.25.5



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/at-spi/devel/.cvsignore,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- .cvsignore	6 Jan 2009 06:23:23 -0000	1.57
+++ .cvsignore	20 Jan 2009 17:03:34 -0000	1.58
@@ -1 +1 @@
-at-spi-1.25.4.tar.bz2
+at-spi-1.25.5.tar.bz2


Index: at-spi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/at-spi/devel/at-spi.spec,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -r1.111 -r1.112
--- at-spi.spec	6 Jan 2009 06:39:01 -0000	1.111
+++ at-spi.spec	20 Jan 2009 17:03:34 -0000	1.112
@@ -9,8 +9,8 @@
 
 Summary: Assistive Technology Service Provider Interface 
 Name: at-spi
-Version: 1.25.4
-Release: 2%{?dist}
+Version: 1.25.5
+Release: 1%{?dist}
 URL: http://developer.gnome.org/projects/gap/
 Source0: http://download.gnome.org/sources/at-spi/1.25/%{name}-%{version}.tar.bz2
 
@@ -153,6 +153,9 @@
 
 
 %changelog
+* Tue Jan 20 2009 Matthias Clasen <mclasen at redhat.com> - 1.25.5-1
+- Update to 2.25.5
+
 * Tue Jan  6 2009 Matthias Clasen <mclasen at redhat.com> - 1.25.4-2
 - Update to 1.25.4
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/at-spi/devel/sources,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- sources	6 Jan 2009 06:23:23 -0000	1.57
+++ sources	20 Jan 2009 17:03:34 -0000	1.58
@@ -1 +1 @@
-6ba94371ecf4b4d2d8fbb97ca973cb97  at-spi-1.25.4.tar.bz2
+9d9b6ad01c0dc8a6aff8b948368bddff  at-spi-1.25.5.tar.bz2



From mlichvar at fedoraproject.org  Tue Jan 20 17:08:26 2009
From: mlichvar at fedoraproject.org (Miroslav Lichvar)
Date: Tue, 20 Jan 2009 17:08:26 +0000 (UTC)
Subject: rpms/sendmail/devel sendmail-8.14.3-sharedmilter.patch, NONE,
	1.1 sendmail.spec, 1.97, 1.98
Message-ID: <20090120170826.3AEB5700F9@cvs1.fedora.phx.redhat.com>

Author: mlichvar

Update of /cvs/pkgs/rpms/sendmail/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25338

Modified Files:
	sendmail.spec 
Added Files:
	sendmail-8.14.3-sharedmilter.patch 
Log Message:
- build shared libmilter (#309281)
- drop static libraries
- convert RELEASE_NOTES to UTF-8


sendmail-8.14.3-sharedmilter.patch:

--- NEW FILE sendmail-8.14.3-sharedmilter.patch ---
diff -up sendmail-8.14.3/devtools/M4/UNIX/sharedlibrary.m4.sharedmilter sendmail-8.14.3/devtools/M4/UNIX/sharedlibrary.m4
--- sendmail-8.14.3/devtools/M4/UNIX/sharedlibrary.m4.sharedmilter	2009-01-20 15:19:34.000000000 +0100
+++ sendmail-8.14.3/devtools/M4/UNIX/sharedlibrary.m4	2009-01-20 15:19:34.000000000 +0100
@@ -15,22 +15,23 @@ divert(-1)
 divert(0)dnl
 include(confBUILDTOOLSDIR`/M4/'bldM4_TYPE_DIR`/links.m4')dnl
 bldLIST_PUSH_ITEM(`bldC_PRODUCTS', bldCURRENT_PRODUCT)dnl
-bldPUSH_TARGET(bldCURRENT_PRODUCT`.a')dnl
+bldPUSH_TARGET(bldCURRENT_PRODUCT.so.confSOVER.confSOPLVL)dnl
 bldPUSH_INSTALL_TARGET(`install-'bldCURRENT_PRODUCT)dnl
 bldPUSH_CLEAN_TARGET(bldCURRENT_PRODUCT`-clean')dnl
 
 include(confBUILDTOOLSDIR`/M4/'bldM4_TYPE_DIR`/defines.m4')
 divert(bldTARGETS_SECTION)
-bldCURRENT_PRODUCT.a: ${BEFORE} ${bldCURRENT_PRODUCT`OBJS'}
-	${AR} ${AROPTS} bldCURRENT_PRODUCT.a ${bldCURRENT_PRODUCT`OBJS'}
-	${RANLIB} ${RANLIBOPTS} bldCURRENT_PRODUCT.a
+bldCURRENT_PRODUCT.so.confSOVER.confSOPLVL: ${BEFORE} ${bldCURRENT_PRODUCT`OBJS'}
+	${CC} ${CFLAGS} ${LDOPTS_SO} -o bldCURRENT_PRODUCT.so.confSOVER.confSOPLVL `-Wl,'confSONAME`,'bldCURRENT_PRODUCT`.so.'confSOVER ${bldCURRENT_PRODUCT`OBJS'}
 ifdef(`bldLINK_SOURCES', `bldMAKE_SOURCE_LINKS(bldLINK_SOURCES)')
 
-install-`'bldCURRENT_PRODUCT: bldCURRENT_PRODUCT.a
+install-`'bldCURRENT_PRODUCT: bldCURRENT_PRODUCT.so.confSOVER.confSOPLVL
 ifdef(`bldINSTALLABLE', `	ifdef(`confMKDIR', `if [ ! -d ${DESTDIR}${bldINSTALL_DIR`'LIBDIR} ]; then confMKDIR -p ${DESTDIR}${bldINSTALL_DIR`'LIBDIR}; else :; fi ')
-	${INSTALL} -c -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} bldCURRENT_PRODUCT.a ${DESTDIR}${LIBDIR}')
+	${LN} ${LNOPTS} bldCURRENT_PRODUCT.so.confSOVER.confSOPLVL ${DESTDIR}${LIBDIR}/bldCURRENT_PRODUCT.so.confSOVER
+	${LN} ${LNOPTS} bldCURRENT_PRODUCT.so.confSOVER ${DESTDIR}${LIBDIR}/bldCURRENT_PRODUCT.so
+	${INSTALL} -c -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} bldCURRENT_PRODUCT.so.confSOVER`.'confSOPLVL ${DESTDIR}${LIBDIR}')
 
 bldCURRENT_PRODUCT-clean:
-	rm -f ${OBJS} bldCURRENT_PRODUCT.a ${MANPAGES}
+	rm -f ${OBJS} bldCURRENT_PRODUCT.so* ${MANPAGES}
 
 divert(0)
diff -up sendmail-8.14.3/libmilter/Makefile.m4.sharedmilter sendmail-8.14.3/libmilter/Makefile.m4
--- sendmail-8.14.3/libmilter/Makefile.m4.sharedmilter	2008-04-08 07:23:44.000000000 +0200
+++ sendmail-8.14.3/libmilter/Makefile.m4	2009-01-20 15:26:05.000000000 +0100
@@ -9,7 +9,11 @@ define(`confMT', `true')
 SMSRCDIR=ifdef(`confSMSRCDIR', `confSMSRCDIR', `${SRCDIR}/sendmail')
 PREPENDDEF(`confINCDIRS', `-I${SMSRCDIR} ')
 
-bldPRODUCT_START(`library', `libmilter')
+APPENDDEF(`confOPTIMIZE', `-fno-pie -fPIC')
+define(`runCtest', `esyscmd(`echo -e "#include <stdio.h>\n#include \"../include/libmilter/mfapi.h\"\nint main(){'$1`;return 0;}" | gcc -x c -I../include -o ctest - && ./ctest && rm -f ctest')')dnl
+define(`confSOVER', runCtest(`printf(\"%d.%d\", SM_LM_VRS_MAJOR(SMFI_VERSION), SM_LM_VRS_MINOR(SMFI_VERSION))'))dnl
+define(`confSOPLVL', runCtest(`printf(\"%d\", SM_LM_VRS_PLVL(SMFI_VERSION))'))dnl
+bldPRODUCT_START(`sharedlibrary', `libmilter')
 define(`bldINSTALLABLE', `true')
 define(`LIBMILTER_EXTRAS', `errstring.c strl.c')
 APPENDDEF(`confENVDEF', `-DNOT_SENDMAIL -Dsm_snprintf=snprintf')


Index: sendmail.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sendmail/devel/sendmail.spec,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -r1.97 -r1.98
--- sendmail.spec	19 Dec 2008 13:23:41 -0000	1.97
+++ sendmail.spec	20 Jan 2009 17:07:55 -0000	1.98
@@ -15,7 +15,7 @@
 Summary: A widely used Mail Transport Agent (MTA)
 Name: sendmail
 Version: 8.14.3
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: Sendmail
 Group: System Environment/Daemons
 URL: http://www.sendmail.org/
@@ -49,6 +49,7 @@
 Patch14: sendmail-8.13.7-vacation.patch
 Patch15: sendmail-8.14.1-noversion.patch
 Patch16: sendmail-8.13.1-localdomain.patch
+Patch17: sendmail-8.14.3-sharedmilter.patch
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: tcp_wrappers-devel
 BuildRequires: db4-devel
@@ -109,6 +110,7 @@
 Summary: Extra development include files and development files
 Group: Development/Libraries
 Requires: sendmail = %{version}-%{release}
+Requires: sendmail-milter = %{version}-%{release}
 
 %description devel
 Include files and devel libraries for e.g. the milter addons as part
@@ -126,6 +128,17 @@
 the sendmail-cf package if you ever need to reconfigure and rebuild
 your sendmail.cf file.
 
+%package milter
+Summary: The sendmail milter library
+Group: System Environment/Libraries
+
+%description milter
+The sendmail Mail Filter API (Milter) is designed to allow third-party
+programs access to mail messages as they are being processed in order to
+filter meta-information and content.
+
+This package includes the milter shared library.
+
 %prep
 %setup -q
 
@@ -142,6 +155,14 @@
 %patch15 -p1 -b .noversion
 %patch16 -p1 -b .localdomain
 
+cp devtools/M4/UNIX/{,shared}library.m4
+%patch17 -p1 -b .sharedmilter
+
+for f in RELEASE_NOTES; do
+	iconv -f iso8859-1 -t utf8 -o ${f}{_,} &&
+		touch -r ${f}{,_} && mv -f ${f}{_,}
+done
+
 %build
 # generate redhat config file
 cat > redhat.config.m4 << EOF
@@ -254,7 +275,9 @@
 Make() {
 	make $@ \
 		DESTDIR=%{buildroot} \
+		LIBDIR=%{_libdir} \
 		MANROOT=%{_mandir}/man \
+		LIBMODE=0755 INCMODE=0644 \
 		SBINOWN=${nameuser} SBINGRP=${namegroup} \
 		UBINOWN=${nameuser} UBINGRP=${namegroup} \
 		MANOWN=${nameuser} MANGRP=${namegroup} \
@@ -268,7 +291,6 @@
 OBJDIR=obj.$(uname -s).$(uname -r).$(uname -m)
 
 Make install -C $OBJDIR/libmilter
-Make install -C $OBJDIR/libsmutil
 Make install -C $OBJDIR/sendmail
 Make install -C $OBJDIR/mailstats
 Make force-install -C $OBJDIR/rmail
@@ -276,16 +298,6 @@
 Make install -C $OBJDIR/smrsh
 Make install -C $OBJDIR/makemap
 
-# install libraries
-install -m 644 $OBJDIR/libmilter/libmilter.a %{buildroot}%{_libdir}
-install -m 644 $OBJDIR/libsmutil/libsmutil.a %{buildroot}%{_libdir}
-install -m 644 $OBJDIR/libsm/libsm.a %{buildroot}%{_libdir}
-
-%if "%{_lib}" == "lib64"
-# libmilter.a is 64 bit, not usable in /usr/lib for 32 bit build
-rm -fr %{buildroot}/usr/lib/libmilter.a
-%endif
-
 # replace absolute with relative symlinks
 ln -sf ../sbin/makemap %{buildroot}%{_bindir}/makemap
 for f in hoststat mailq newaliases purgestat ; do
@@ -441,6 +453,10 @@
 fi
 exit 0
 
+%post milter -p /sbin/ldconfig
+
+%postun milter -p /sbin/ldconfig
+
 %files
 %defattr(-,root,root)
 %dir %{_docdir}/sendmail-%{version}
@@ -526,9 +542,12 @@
 %doc libmilter/docs/*
 %dir %{_includedir}/libmilter
 %{_includedir}/libmilter/*.h
-%{_libdir}/libmilter.a
-%{_libdir}/libsmutil.a
-%{_libdir}/libsm.a
+%{_libdir}/libmilter.so
+
+%files milter
+%defattr(-,root,root)
+%{_libdir}/libmilter.so.[0-9].[0-9]
+%{_libdir}/libmilter.so.[0-9].[0-9].[0-9]
 
 %files doc
 %defattr(-,root,root)
@@ -544,6 +563,11 @@
 
 
 %changelog
+* Tue Jan 20 2009 Miroslav Lichvar <mlichvar at redhat.com> 8.14.3-4
+- build shared libmilter (#309281)
+- drop static libraries
+- convert RELEASE_NOTES to UTF-8
+
 * Fri Dec 19 2008 Miroslav Lichvar <mlichvar at redhat.com> 8.14.3-3
 - run newaliases only when necessary
 



From mclasen at fedoraproject.org  Tue Jan 20 17:16:00 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 20 Jan 2009 17:16:00 +0000 (UTC)
Subject: rpms/evince/devel evince.spec,1.148,1.149
Message-ID: <20090120171600.6FE8F700F9@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/evince/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26238

Modified Files:
	evince.spec 
Log Message:
try again



Index: evince.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evince/devel/evince.spec,v
retrieving revision 1.148
retrieving revision 1.149
diff -u -r1.148 -r1.149
--- evince.spec	20 Jan 2009 16:57:07 -0000	1.148
+++ evince.spec	20 Jan 2009 17:15:30 -0000	1.149
@@ -212,6 +212,7 @@
 %{_datadir}/icons/hicolor/*/apps/evince.*
 %{_mandir}/man1/evince.1.gz
 %{_libdir}/libevbackend.so.*
+%{_libdir}/libevview.so.*
 %dir %{_libdir}/evince
 %dir %{_libdir}/evince/backends
 %{_libdir}/evince/backends/libpdfdocument.so
@@ -227,6 +228,7 @@
 %files devel
 %{_includedir}/evince/2.25
 %{_libdir}/libevbackend.so
+%{_libdir}/libevview.so
 
 %files dvi
 %{_libdir}/evince/backends/libdvidocument.so*



From mpg at fedoraproject.org  Tue Jan 20 17:02:14 2009
From: mpg at fedoraproject.org (Marco Pesenti Gritti)
Date: Tue, 20 Jan 2009 17:02:14 +0000 (UTC)
Subject: rpms/sugar-browse/devel sugar-browse.spec,1.4,1.5
Message-ID: <20090120170214.4A54C700F9@cvs1.fedora.phx.redhat.com>

Author: mpg

Update of /cvs/pkgs/rpms/sugar-browse/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24712

Modified Files:
	sugar-browse.spec 
Log Message:
Bump release


Index: sugar-browse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-browse/devel/sugar-browse.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sugar-browse.spec	20 Jan 2009 16:59:36 -0000	1.4
+++ sugar-browse.spec	20 Jan 2009 17:01:43 -0000	1.5
@@ -1,6 +1,6 @@
 Name: sugar-browse
 Version: 103
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: Browse activity for Sugar
 Group: Sugar/Activities
 License: GPLv2+
@@ -40,7 +40,7 @@
 
 
 %changelog
-* Tue Jan 20 2009 Marco Pesenti Gritti <mpg at redhat.com> - 103-1
+* Tue Jan 20 2009 Marco Pesenti Gritti <mpg at redhat.com> - 103-2
 - use cjson instead of json (nirbheek)
 - new translations 
 



From limb at fedoraproject.org  Tue Jan 20 17:19:59 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Tue, 20 Jan 2009 17:19:59 +0000 (UTC)
Subject: rpms/lilypond/devel lilypond.spec,1.34,1.35
Message-ID: <20090120171959.2F163700F9@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/lilypond/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27323

Modified Files:
	lilypond.spec 
Log Message:
New fonts attempt.



Index: lilypond.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lilypond/devel/lilypond.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- lilypond.spec	7 Jan 2009 13:31:06 -0000	1.34
+++ lilypond.spec	20 Jan 2009 17:19:28 -0000	1.35
@@ -1,6 +1,6 @@
 Name:		lilypond
 Version:	2.12.1
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	A typesetting system for music notation
 
 Group:		Applications/Publishing
@@ -14,7 +14,12 @@
 Requires:	ghostscript >= 8.15
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
-Requires: 	lilypond-fonts = %{version}-%{release}
+Obsoletes: 	lilypond-fonts <= 2.12.1-1
+Provides:	lilypond-fonts <= 2.12.1-1
+Requires:	lilypond-aybabtu-fonts = %{version}-%{release}
+Requires:	lilypond-centuryschl-fonts = %{version}-%{release}
+Requires:	lilypond-emmentaler-fonts = %{version}-%{release}
+Requires:	lilypond-feta-fonts = %{version}-%{release}
 
 Buildrequires:  t1utils bison flex ImageMagick gettext tetex
 BuildRequires:  python-devel >= 2.4.0
@@ -23,23 +28,77 @@
 BuildRequires:  guile-devel >= 1.8
 BuildRequires:  ghostscript >= 8.15
 BuildRequires:  pango-devel >= 1.12.0
+BuildRequires:  fontpackages-devel
 
-%package fonts
-Summary:	Fonts for lilypond
-Group:		Applications/Publishing
+%description
+LilyPond is an automated music engraving system. It formats music
+beautifully and automatically, and has a friendly syntax for its input
+files.
+
+%package aybabtu-fonts
+Summary:	Lilypond aybabtu font
+Group:          User Interface/X
+Requires:       fontpackages-filesystem
 Requires:	lilypond = %{version}-%{release}
 
-%description
+%description aybabtu-fonts 
+LilyPond is an automated music engraving system. It formats music
+beautifully and automatically, and has a friendly syntax for its input
+files.
+
+This is the aybabtu font included in the package.
+
+%package centuryschl-fonts
+Summary:        Lilypond CenturySchL fonts
+Group:          User Interface/X
+Requires:       fontpackages-filesystem
+Requires:	lilypond = %{version}-%{release}
+
+%description centuryschl-fonts 
+LilyPond is an automated music engraving system. It formats music
+beautifully and automatically, and has a friendly syntax for its input
+files.
+
+These are the CenturySchL fonts included in the package.
+
+%package emmentaler-fonts
+Summary:        Lilypond emmentaler fonts
+Group:          User Interface/X
+Requires:       fontpackages-filesystem
+Requires:	lilypond = %{version}-%{release}
+
+%description emmentaler-fonts 
+LilyPond is an automated music engraving system. It formats music
+beautifully and automatically, and has a friendly syntax for its input
+files.
+
+These are the emmentaler fonts included in the package.
+
+%package feta-fonts
+Summary:        Lilypond feta fonts
+Group:          User Interface/X
+Requires:       fontpackages-filesystem
+Requires:	lilypond = %{version}-%{release}
+
+%description feta-fonts 
 LilyPond is an automated music engraving system. It formats music
 beautifully and automatically, and has a friendly syntax for its input
 files.
 
-%description fonts
+These are the feta fonts included in the package.
+
+%package fonts-common
+Summary:        Lilypond fonts common dir
+Group:          User Interface/X
+Requires:       fontpackages-filesystem
+Requires:	lilypond = %{version}-%{release}
+
+%description fonts-common
 LilyPond is an automated music engraving system. It formats music
 beautifully and automatically, and has a friendly syntax for its input
 files.
 
-These are the fonts included in the package.
+This contains teh directory common to all lilypond fonts.
 
 %prep
 %setup -q
@@ -77,6 +136,11 @@
 
 %find_lang %{name}
 
+mkdir -p $RPM_BUILD_ROOT%{_fontdir}
+mv $RPM_BUILD_ROOT%{_datadir}/lilypond/%{version}/fonts/otf/*.otf $RPM_BUILD_ROOT%{_fontdir}
+rmdir $RPM_BUILD_ROOT%{_datadir}/lilypond/%{version}/fonts/otf
+ln -s %{_fontdir} $RPM_BUILD_ROOT%{_datadir}/lilypond/%{version}/fonts/otf
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -106,11 +170,24 @@
 %{_mandir}/man1/*
 %{_datadir}/omf/lilypond
 
-%files fonts
-%defattr(-,root,root,-)
-%{_datadir}/lilypond/%{version}/fonts
+%_font_pkg -n aybabtu aybabtu.otf
+
+%_font_pkg -n centuryschl CenturySchL*otf
+
+%_font_pkg -n emmentaler emmentaler*otf
+
+
+%files fonts-common
+%defattr(0644,root,root,0755)
+%doc 
+
+%dir %{_fontdir}
+
 
 %changelog
+* Wed Jan 14 2009 Jon Ciesla <limb at jcomserv.net> - 2.12.1-2
+- Implementing font_pkg.
+
 * Tue Jan 06 2009 Jon Ciesla <limb at jcomserv.net> - 2.12.1-1
 - Update to 2.12.1.
 - Droppedn parse-scm patch, applied upstream.



From mclasen at fedoraproject.org  Tue Jan 20 17:25:47 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 20 Jan 2009 17:25:47 +0000 (UTC)
Subject: rpms/alacarte/devel .cvsignore, 1.12, 1.13 alacarte.spec, 1.47,
	1.48 sources, 1.12, 1.13
Message-ID: <20090120172547.6D7C1700F9@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/alacarte/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28019

Modified Files:
	.cvsignore alacarte.spec sources 
Log Message:
0.11.7



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/alacarte/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	23 Sep 2008 03:46:56 -0000	1.12
+++ .cvsignore	20 Jan 2009 17:25:16 -0000	1.13
@@ -1 +1 @@
-alacarte-0.11.6.tar.bz2
+alacarte-0.11.7.tar.bz2


Index: alacarte.spec
===================================================================
RCS file: /cvs/pkgs/rpms/alacarte/devel/alacarte.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- alacarte.spec	29 Nov 2008 16:36:35 -0000	1.47
+++ alacarte.spec	20 Jan 2009 17:25:16 -0000	1.48
@@ -1,8 +1,8 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           alacarte
-Version:        0.11.6
-Release:        6%{?dist}
+Version:        0.11.7
+Release:        1%{?dist}
 Summary:        Menu editor for the GNOME desktop
 
 Group:          Applications/System
@@ -12,7 +12,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
-BuildRequires:  python, python-devel, perl(XML::Parser), gettext
+BuildRequires:  python, python-devel, gettext
 BuildRequires:  pygtk2-devel
 BuildRequires:  pkgconfig
 BuildRequires:  gnome-menus-devel >= 2.15.4
@@ -71,6 +71,9 @@
 %{_datadir}/icons/hicolor/256x256/apps/alacarte.png
 
 %changelog
+* Tue Jan 20 2009 Matthias Clasen <mclasen at redhat.com> - 0.11.7-1
+- Update to 0.11.7
+
 * Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 0.11.6-6
 - Rebuild for Python 2.6
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/alacarte/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	23 Sep 2008 03:46:56 -0000	1.12
+++ sources	20 Jan 2009 17:25:16 -0000	1.13
@@ -1 +1 @@
-de6535f728a8000795753623c46e8378  alacarte-0.11.6.tar.bz2
+021759e89188ca27710fedff93fb7920  alacarte-0.11.7.tar.bz2



From mclasen at fedoraproject.org  Tue Jan 20 17:33:24 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 20 Jan 2009 17:33:24 +0000 (UTC)
Subject: rpms/gnome-themes/devel .cvsignore, 1.70, 1.71 gnome-themes.spec,
	1.125, 1.126 sources, 1.75, 1.76
Message-ID: <20090120173324.6C373700F9@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-themes/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28982

Modified Files:
	.cvsignore gnome-themes.spec sources 
Log Message:
2.25.5



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-themes/devel/.cvsignore,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- .cvsignore	17 Dec 2008 06:18:09 -0000	1.70
+++ .cvsignore	20 Jan 2009 17:32:53 -0000	1.71
@@ -1 +1 @@
-gnome-themes-2.25.3.tar.bz2
+gnome-themes-2.25.5.tar.bz2


Index: gnome-themes.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-themes/devel/gnome-themes.spec,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -r1.125 -r1.126
--- gnome-themes.spec	17 Dec 2008 06:18:09 -0000	1.125
+++ gnome-themes.spec	20 Jan 2009 17:32:53 -0000	1.126
@@ -1,6 +1,6 @@
 Summary: Themes for GNOME
 Name: gnome-themes
-Version: 2.25.3
+Version: 2.25.5
 Release:1%{?dist}
 URL: http://download.gnome.org/sources/gnome-themes/
 Source: http://download.gnome.org/sources/gnome-themes/2.25/%{name}-%{version}.tar.bz2
@@ -97,6 +97,9 @@
 %doc AUTHORS COPYING NEWS README
 
 %changelog
+* Tue Jan 20 2009 Matthias Clasen <mclasen at redhat.com> - 2.25.5-1
+- Update to 2.25.5
+
 * Wed Dec 17 2008 Matthias Clasen <mclasen at redhat.com> - 2.25.3-1
 - Update to 2.25.3
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-themes/devel/sources,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- sources	17 Dec 2008 06:18:09 -0000	1.75
+++ sources	20 Jan 2009 17:32:53 -0000	1.76
@@ -1 +1 @@
-517dd9aee348b5cbe9afd819623183db  gnome-themes-2.25.3.tar.bz2
+554b7354d49892e0100311f4e60f0e5d  gnome-themes-2.25.5.tar.bz2



From linville at fedoraproject.org  Tue Jan 20 17:36:30 2009
From: linville at fedoraproject.org (John W. Linville)
Date: Tue, 20 Jan 2009 17:36:30 +0000 (UTC)
Subject: rpms/kernel/F-10 linux-2.6-rtl8187b-tx-status-feedback.patch, NONE, 
	1.1 kernel.spec, 1.1224, 1.1225
Message-ID: <20090120173630.1EA8D700F9@cvs1.fedora.phx.redhat.com>

Author: linville

Update of /cvs/pkgs/rpms/kernel/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29420

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-rtl8187b-tx-status-feedback.patch 
Log Message:
rtl8187: feedback transmitted packets using tx close descriptor for 8187B

linux-2.6-rtl8187b-tx-status-feedback.patch:

--- NEW FILE linux-2.6-rtl8187b-tx-status-feedback.patch ---
Back-ported from the following commit:

commit 3517afdefc3ad335b276eb5f8691841f48097abf
Author: Herton Ronaldo Krzesinski <herton at mandriva.com.br>
Date:   Thu Nov 13 10:39:16 2008 -0500

    rtl8187: feedback transmitted packets using tx close descriptor for 8187B
    
    Realtek 8187B has a receive command queue to feedback beacon interrupt
    and transmitted packet status. Use it to feedback mac80211 about status
    of transmitted packets. Unfortunately in the course of testing I found
    that the sequence number reported by hardware includes entire sequence
    control in a 12 bit only field, so a workaround is done to check only
    lowest bits.
    
    Tested-by: Larry Finger <Larry.Finger at lwfinger.net>
    Tested-by: Hin-Tak Leung <htl10 at users.sourceforge.net>
    Signed-off-by: Herton Ronaldo Krzesinski <herton at mandriva.com.br>
    Signed-off-by: John W. Linville <linville at tuxdriver.com>

diff -up linux-2.6.28.noarch/drivers/net/wireless/rtl8187.h.orig linux-2.6.28.noarch/drivers/net/wireless/rtl8187.h
--- linux-2.6.28.noarch/drivers/net/wireless/rtl8187.h.orig	2008-12-24 18:26:37.000000000 -0500
+++ linux-2.6.28.noarch/drivers/net/wireless/rtl8187.h	2009-01-20 11:46:40.000000000 -0500
@@ -112,6 +112,11 @@ struct rtl8187_priv {
 	u8 signal;
 	u8 quality;
 	u8 noise;
+	struct {
+		__le64 buf;
+		struct urb *urb;
+		struct sk_buff_head queue;
+	} b_tx_status;
 };
 
 void rtl8187_write_phy(struct ieee80211_hw *dev, u8 addr, u32 data);
diff -up linux-2.6.28.noarch/drivers/net/wireless/rtl8187_dev.c.orig linux-2.6.28.noarch/drivers/net/wireless/rtl8187_dev.c
--- linux-2.6.28.noarch/drivers/net/wireless/rtl8187_dev.c.orig	2008-12-24 18:26:37.000000000 -0500
+++ linux-2.6.28.noarch/drivers/net/wireless/rtl8187_dev.c	2009-01-20 11:51:33.000000000 -0500
@@ -170,8 +170,27 @@ static void rtl8187_tx_cb(struct urb *ur
 	skb_pull(skb, priv->is_rtl8187b ? sizeof(struct rtl8187b_tx_hdr) :
 					  sizeof(struct rtl8187_tx_hdr));
 	memset(&info->status, 0, sizeof(info->status));
-	info->flags |= IEEE80211_TX_STAT_ACK;
-	ieee80211_tx_status_irqsafe(hw, skb);
+
+	if (!urb->status &&
+	    !(info->flags & IEEE80211_TX_CTL_NO_ACK) &&
+	    priv->is_rtl8187b) {
+		skb_queue_tail(&priv->b_tx_status.queue, skb);
+
+		/* queue is "full", discard last items */
+		while (skb_queue_len(&priv->b_tx_status.queue) > 5) {
+			struct sk_buff *old_skb;
+
+			dev_dbg(&priv->udev->dev,
+				"transmit status queue full\n");
+
+			old_skb = skb_dequeue(&priv->b_tx_status.queue);
+			ieee80211_tx_status_irqsafe(hw, old_skb);
+		}
+	} else {
+		if (!(info->flags & IEEE80211_TX_CTL_NO_ACK) && !urb->status)
+			info->flags |= IEEE80211_TX_STAT_ACK;
+		ieee80211_tx_status_irqsafe(hw, skb);
+	}
 }
 
 static int rtl8187_tx(struct ieee80211_hw *dev, struct sk_buff *skb)
@@ -412,6 +431,111 @@ static int rtl8187_init_urbs(struct ieee
 	return 0;
 }
 
+static void rtl8187b_status_cb(struct urb *urb)
+{
+	struct ieee80211_hw *hw = (struct ieee80211_hw *)urb->context;
+	struct rtl8187_priv *priv = hw->priv;
+	u64 val;
+	unsigned int cmd_type;
+
+	if (unlikely(urb->status)) {
+		usb_free_urb(urb);
+		return;
+	}
+
+	/*
+	 * Read from status buffer:
+	 *
+	 * bits [30:31] = cmd type:
+	 * - 0 indicates tx beacon interrupt
+	 * - 1 indicates tx close descriptor
+	 *
+	 * In the case of tx beacon interrupt:
+	 * [0:9] = Last Beacon CW
+	 * [10:29] = reserved
+	 * [30:31] = 00b
+	 * [32:63] = Last Beacon TSF
+	 *
+	 * If it's tx close descriptor:
+	 * [0:7] = Packet Retry Count
+	 * [8:14] = RTS Retry Count
+	 * [15] = TOK
+	 * [16:27] = Sequence No
+	 * [28] = LS
+	 * [29] = FS
+	 * [30:31] = 01b
+	 * [32:47] = unused (reserved?)
+	 * [48:63] = MAC Used Time
+	 */
+	val = le64_to_cpu(priv->b_tx_status.buf);
+
+	cmd_type = (val >> 30) & 0x3;
+	if (cmd_type == 1) {
+		unsigned int pkt_rc, seq_no;
+		bool tok;
+		struct sk_buff *skb;
+		struct ieee80211_hdr *ieee80211hdr;
+		unsigned long flags;
+
+		pkt_rc = val & 0xFF;
+		tok = val & (1 << 15);
+		seq_no = (val >> 16) & 0xFFF;
+
+		spin_lock_irqsave(&priv->b_tx_status.queue.lock, flags);
+		skb_queue_reverse_walk(&priv->b_tx_status.queue, skb) {
+			ieee80211hdr = (struct ieee80211_hdr *)skb->data;
+
+			/*
+			 * While testing, it was discovered that the seq_no
+			 * doesn't actually contains the sequence number.
+			 * Instead of returning just the 12 bits of sequence
+			 * number, hardware is returning entire sequence control
+			 * (fragment number plus sequence number) in a 12 bit
+			 * only field overflowing after some time. As a
+			 * workaround, just consider the lower bits, and expect
+			 * it's unlikely we wrongly ack some sent data
+			 */
+			if ((le16_to_cpu(ieee80211hdr->seq_ctrl)
+			    & 0xFFF) == seq_no)
+				break;
+		}
+		if (skb != (struct sk_buff *) &priv->b_tx_status.queue) {
+			struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);
+
+			__skb_unlink(skb, &priv->b_tx_status.queue);
+			if (tok)
+				info->flags |= IEEE80211_TX_STAT_ACK;
+                       else
+                               info->status.excessive_retries = 1;
+                       info->status.retry_count = pkt_rc;
+
+			ieee80211_tx_status_irqsafe(hw, skb);
+		}
+		spin_unlock_irqrestore(&priv->b_tx_status.queue.lock, flags);
+	}
+
+	usb_submit_urb(urb, GFP_ATOMIC);
+}
+
+static int rtl8187b_init_status_urb(struct ieee80211_hw *dev)
+{
+	struct rtl8187_priv *priv = dev->priv;
+	struct urb *entry;
+
+	entry = usb_alloc_urb(0, GFP_KERNEL);
+	if (!entry)
+		return -ENOMEM;
+	priv->b_tx_status.urb = entry;
+
+	usb_fill_bulk_urb(entry, priv->udev, usb_rcvbulkpipe(priv->udev, 9),
+			  &priv->b_tx_status.buf, sizeof(priv->b_tx_status.buf),
+			  rtl8187b_status_cb, dev);
+
+	usb_submit_urb(entry, GFP_KERNEL);
+
+	return 0;
+}
+
 static int rtl8187_cmd_reset(struct ieee80211_hw *dev)
 {
 	struct rtl8187_priv *priv = dev->priv;
@@ -757,6 +879,7 @@ static int rtl8187_start(struct ieee8021
 				  (7 << 0  /* long retry limit */) |
 				  (7 << 21 /* MAX TX DMA */));
 		rtl8187_init_urbs(dev);
+		rtl8187b_init_status_urb(dev);
 		mutex_unlock(&priv->conf_mutex);
 		return 0;
 	}
@@ -833,6 +956,9 @@ static void rtl8187_stop(struct ieee8021
 		usb_kill_urb(info->urb);
 		kfree_skb(skb);
 	}
+	while ((skb = skb_dequeue(&priv->b_tx_status.queue)))
+		dev_kfree_skb_any(skb);
+	usb_kill_urb(priv->b_tx_status.urb);
 	mutex_unlock(&priv->conf_mutex);
 }
 
@@ -1211,6 +1337,7 @@ static int __devinit rtl8187_probe(struc
 		goto err_free_dev;
 	}
 	mutex_init(&priv->conf_mutex);
+	skb_queue_head_init(&priv->b_tx_status.queue);
 
 	printk(KERN_INFO "%s: hwaddr %s, %s V%d + %s\n",
 	       wiphy_name(dev->wiphy), print_mac(mac, dev->wiphy->perm_addr),


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/kernel.spec,v
retrieving revision 1.1224
retrieving revision 1.1225
diff -u -r1.1224 -r1.1225
--- kernel.spec	20 Jan 2009 16:34:06 -0000	1.1224
+++ kernel.spec	20 Jan 2009 17:35:59 -0000	1.1225
@@ -628,7 +628,8 @@
 
 Patch670: linux-2.6-ata-quirk.patch
 
-Patch682: iwlwifi-intel-bug-1822.patch
+Patch680: iwlwifi-intel-bug-1822.patch
+Patch681: linux-2.6-rtl8187b-tx-status-feedback.patch
 
 Patch690: linux-2.6-at76.patch
 
@@ -1154,6 +1155,9 @@
 # iwlwifi: avoid rs_get_rate warnings
 ApplyPatch iwlwifi-intel-bug-1822.patch
 
+# rtl8187: feedback transmitted packets using tx close descriptor for 8187B
+ApplyPatch linux-2.6-rtl8187b-tx-status-feedback.patch
+
 # Add misc wireless bits from upstream wireless tree
 ApplyPatch linux-2.6-at76.patch
 
@@ -1779,6 +1783,9 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Tue Jan 20 2009 John W. Linville <linville at redhat.com> 2.6.28.1-18
+- rtl8187: feedback transmitted packets using tx close descriptor for 8187B
+
 * Tue Jan 20 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.28.1-17
 - Set CONFIG_CAPI_EICON on x86_64, re-enable Radeon kernel modesetting.
 - Change remaining config options from '=n' to 'is not set'.



From mclasen at fedoraproject.org  Tue Jan 20 17:36:47 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 20 Jan 2009 17:36:47 +0000 (UTC)
Subject: rpms/orca/devel orca.spec,1.76,1.77
Message-ID: <20090120173647.12DED700F9@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/orca/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29237

Modified Files:
	orca.spec 
Log Message:
2.25.5



Index: orca.spec
===================================================================
RCS file: /cvs/pkgs/rpms/orca/devel/orca.spec,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- orca.spec	6 Jan 2009 07:00:34 -0000	1.76
+++ orca.spec	20 Jan 2009 17:36:16 -0000	1.77
@@ -16,7 +16,7 @@
 %define control_center_version 2.16.0-5
 
 Name:		orca
-Version:	2.25.4
+Version:	2.25.5
 Release: 	1%{?dist}
 Summary:	Assistive technology for people with visual impairments
 
@@ -105,6 +105,9 @@
 
 
 %changelog
+* Tue Jan 20 2009 Matthias Clasen <mclasen at redhat.com> - 2.25.5-1
+- Update to 2.25.5
+
 * Tue Jan  6 2009 Matthias Clasen <mclasen at redhat.com> - 2.25.4-1
 - Update to 2.25.4
 



From mclasen at fedoraproject.org  Tue Jan 20 17:44:02 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 20 Jan 2009 17:44:02 +0000 (UTC)
Subject: rpms/orca/devel .cvsignore,1.45,1.46 sources,1.46,1.47
Message-ID: <20090120174402.52C04700F9@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/orca/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30221

Modified Files:
	.cvsignore sources 
Log Message:
fix sources



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/orca/devel/.cvsignore,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- .cvsignore	6 Jan 2009 07:00:33 -0000	1.45
+++ .cvsignore	20 Jan 2009 17:43:31 -0000	1.46
@@ -1 +1 @@
-orca-2.25.4.tar.bz2
+orca-2.25.5.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/orca/devel/sources,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- sources	6 Jan 2009 07:00:34 -0000	1.46
+++ sources	20 Jan 2009 17:43:31 -0000	1.47
@@ -1 +1 @@
-093adf1da8670c1fdb377d0aee22130c  orca-2.25.4.tar.bz2
+7a19b8cefdb42d129c87d09dab450870  orca-2.25.5.tar.bz2



From mclasen at fedoraproject.org  Tue Jan 20 17:46:41 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 20 Jan 2009 17:46:41 +0000 (UTC)
Subject: rpms/libwnck/devel .cvsignore, 1.69, 1.70 libwnck.spec, 1.104,
	1.105 sources, 1.69, 1.70
Message-ID: <20090120174641.0B763700F9@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/libwnck/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30861

Modified Files:
	.cvsignore libwnck.spec sources 
Log Message:
2.25.5



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libwnck/devel/.cvsignore,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- .cvsignore	17 Dec 2008 02:40:42 -0000	1.69
+++ .cvsignore	20 Jan 2009 17:46:10 -0000	1.70
@@ -1 +1 @@
-libwnck-2.25.3.tar.bz2
+libwnck-2.25.5.tar.bz2


Index: libwnck.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libwnck/devel/libwnck.spec,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -r1.104 -r1.105
--- libwnck.spec	17 Dec 2008 02:40:42 -0000	1.104
+++ libwnck.spec	20 Jan 2009 17:46:10 -0000	1.105
@@ -5,7 +5,7 @@
 
 Summary: Window Navigator Construction Kit
 Name: libwnck
-Version: 2.25.3
+Version: 2.25.5
 Release: 1%{?dist}
 URL: http://download.gnome.org/sources/libwnck/
 Source0: http://download.gnome.org/sources/libwnck/2.25/%{name}-%{version}.tar.bz2
@@ -93,6 +93,9 @@
 %doc %{_datadir}/gtk-doc/html/libwnck
 
 %changelog
+* Tue Jan 20 2009 Matthias Clasen <mclasen at redhat.com> - 2.25.5-1
+- Update to 2.25.5
+
 * Tue Dec 16 2008 Matthias Clasen <mclasen at redhat.com> - 2.25.3-1
 - Update to 2.25.3
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libwnck/devel/sources,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- sources	17 Dec 2008 02:40:42 -0000	1.69
+++ sources	20 Jan 2009 17:46:10 -0000	1.70
@@ -1 +1 @@
-a54b348b57fdcdb3ff2ed022fd30d043  libwnck-2.25.3.tar.bz2
+b19f52e50e6743666debc1d909627be7  libwnck-2.25.5.tar.bz2



From mgrepl at fedoraproject.org  Tue Jan 20 17:47:05 2009
From: mgrepl at fedoraproject.org (Miroslav Grepl)
Date: Tue, 20 Jan 2009 17:47:05 +0000 (UTC)
Subject: rpms/selinux-policy/F-10 policy-20080710.patch,1.126,1.127
Message-ID: <20090120174705.62406700F9@cvs1.fedora.phx.redhat.com>

Author: mgrepl

Update of /cvs/extras/rpms/selinux-policy/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31355

Modified Files:
	policy-20080710.patch 
Log Message:
- Allow hald_mac_t send system log messages



policy-20080710.patch:

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.126 -r 1.127 policy-20080710.patch
Index: policy-20080710.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-10/policy-20080710.patch,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -r1.126 -r1.127
--- policy-20080710.patch	20 Jan 2009 16:30:16 -0000	1.126
+++ policy-20080710.patch	20 Jan 2009 17:47:04 -0000	1.127
@@ -1,6 +1,6 @@
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/default_contexts serefpolicy-3.5.13/config/appconfig-mcs/default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/default_contexts	2008-10-17 14:49:10.000000000 +0200
-+++ serefpolicy-3.5.13/config/appconfig-mcs/default_contexts	2009-01-20 17:15:52.000000000 +0100
++++ serefpolicy-3.5.13/config/appconfig-mcs/default_contexts	2009-01-20 17:50:35.000000000 +0100
 @@ -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
@@ -24,13 +24,13 @@
 +system_r:xdm_t:s0		user_r:user_t:s0
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/failsafe_context serefpolicy-3.5.13/config/appconfig-mcs/failsafe_context
 --- nsaserefpolicy/config/appconfig-mcs/failsafe_context	2008-10-17 14:49:10.000000000 +0200
-+++ serefpolicy-3.5.13/config/appconfig-mcs/failsafe_context	2009-01-20 17:15:52.000000000 +0100
++++ serefpolicy-3.5.13/config/appconfig-mcs/failsafe_context	2009-01-20 17:50:35.000000000 +0100
 @@ -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.5.13/config/appconfig-mcs/guest_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/guest_u_default_contexts	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.5.13/config/appconfig-mcs/guest_u_default_contexts	2009-01-20 17:15:52.000000000 +0100
++++ serefpolicy-3.5.13/config/appconfig-mcs/guest_u_default_contexts	2009-01-20 17:50:35.000000000 +0100
 @@ -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
@@ -40,7 +40,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.5.13/config/appconfig-mcs/root_default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/root_default_contexts	2008-10-17 14:49:10.000000000 +0200
-+++ serefpolicy-3.5.13/config/appconfig-mcs/root_default_contexts	2009-01-20 17:15:52.000000000 +0100
++++ serefpolicy-3.5.13/config/appconfig-mcs/root_default_contexts	2009-01-20 17:50:35.000000000 +0100
 @@ -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
@@ -57,7 +57,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/seusers serefpolicy-3.5.13/config/appconfig-mcs/seusers
 --- nsaserefpolicy/config/appconfig-mcs/seusers	2008-10-17 14:49:10.000000000 +0200
-+++ serefpolicy-3.5.13/config/appconfig-mcs/seusers	2009-01-20 17:15:52.000000000 +0100
++++ serefpolicy-3.5.13/config/appconfig-mcs/seusers	2009-01-20 17:50:35.000000000 +0100
 @@ -1,3 +1,3 @@
  system_u:system_u:s0-mcs_systemhigh
 -root:root:s0-mcs_systemhigh
@@ -66,7 +66,7 @@
 +__default__:unconfined_u:s0-mcs_systemhigh
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/staff_u_default_contexts serefpolicy-3.5.13/config/appconfig-mcs/staff_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/staff_u_default_contexts	2008-10-17 14:49:10.000000000 +0200
-+++ serefpolicy-3.5.13/config/appconfig-mcs/staff_u_default_contexts	2009-01-20 17:15:52.000000000 +0100
++++ serefpolicy-3.5.13/config/appconfig-mcs/staff_u_default_contexts	2009-01-20 17:50:35.000000000 +0100
 @@ -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
@@ -83,7 +83,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/unconfined_u_default_contexts serefpolicy-3.5.13/config/appconfig-mcs/unconfined_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/unconfined_u_default_contexts	2008-10-17 14:49:10.000000000 +0200
-+++ serefpolicy-3.5.13/config/appconfig-mcs/unconfined_u_default_contexts	2009-01-20 17:15:52.000000000 +0100
++++ serefpolicy-3.5.13/config/appconfig-mcs/unconfined_u_default_contexts	2009-01-20 17:50:35.000000000 +0100
 @@ -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
@@ -93,13 +93,13 @@
  system_r:xdm_t:s0		unconfined_r:unconfined_t:s0
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/userhelper_context serefpolicy-3.5.13/config/appconfig-mcs/userhelper_context
 --- nsaserefpolicy/config/appconfig-mcs/userhelper_context	2008-10-17 14:49:10.000000000 +0200
-+++ serefpolicy-3.5.13/config/appconfig-mcs/userhelper_context	2009-01-20 17:15:52.000000000 +0100
++++ serefpolicy-3.5.13/config/appconfig-mcs/userhelper_context	2009-01-20 17:50:35.000000000 +0100
 @@ -1 +1 @@
 -system_u:sysadm_r:sysadm_t:s0
 +system_u:system_r:unconfined_t:s0	
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/user_u_default_contexts serefpolicy-3.5.13/config/appconfig-mcs/user_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/user_u_default_contexts	2008-10-17 14:49:10.000000000 +0200
-+++ serefpolicy-3.5.13/config/appconfig-mcs/user_u_default_contexts	2009-01-20 17:15:52.000000000 +0100
++++ serefpolicy-3.5.13/config/appconfig-mcs/user_u_default_contexts	2009-01-20 17:50:35.000000000 +0100
 @@ -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
@@ -114,7 +114,7 @@
 +user_r:user_t:s0		user_r:user_t:s0
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/xguest_u_default_contexts serefpolicy-3.5.13/config/appconfig-mcs/xguest_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/xguest_u_default_contexts	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.5.13/config/appconfig-mcs/xguest_u_default_contexts	2009-01-20 17:15:52.000000000 +0100
++++ serefpolicy-3.5.13/config/appconfig-mcs/xguest_u_default_contexts	2009-01-20 17:50:35.000000000 +0100
 @@ -0,0 +1,7 @@
 +system_r:local_login_t	xguest_r:xguest_t:s0
 +system_r:remote_login_t	xguest_r:xguest_t:s0
@@ -125,7 +125,7 @@
 +xguest_r:xguest_t:s0	xguest_r:xguest_t:s0
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/default_contexts serefpolicy-3.5.13/config/appconfig-mls/default_contexts
 --- nsaserefpolicy/config/appconfig-mls/default_contexts	2008-10-17 14:49:10.000000000 +0200
-+++ serefpolicy-3.5.13/config/appconfig-mls/default_contexts	2009-01-20 17:15:52.000000000 +0100
++++ serefpolicy-3.5.13/config/appconfig-mls/default_contexts	2009-01-20 17:50:35.000000000 +0100
 @@ -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
@@ -149,7 +149,7 @@
 +system_r:xdm_t:s0		user_r:user_t:s0
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/guest_u_default_contexts serefpolicy-3.5.13/config/appconfig-mls/guest_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mls/guest_u_default_contexts	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.5.13/config/appconfig-mls/guest_u_default_contexts	2009-01-20 17:15:52.000000000 +0100
++++ serefpolicy-3.5.13/config/appconfig-mls/guest_u_default_contexts	2009-01-20 17:50:35.000000000 +0100
 @@ -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
@@ -157,7 +157,7 @@
 +system_r:crond_t:s0		guest_r:guest_t:s0
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/root_default_contexts serefpolicy-3.5.13/config/appconfig-mls/root_default_contexts
 --- nsaserefpolicy/config/appconfig-mls/root_default_contexts	2008-10-17 14:49:10.000000000 +0200
-+++ serefpolicy-3.5.13/config/appconfig-mls/root_default_contexts	2009-01-20 17:15:52.000000000 +0100
++++ serefpolicy-3.5.13/config/appconfig-mls/root_default_contexts	2009-01-20 17:50:35.000000000 +0100
 @@ -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
@@ -178,7 +178,7 @@
 +#system_r:sshd_t:s0		sysadm_r:sysadm_t:s0 staff_r:staff_t:s0
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/staff_u_default_contexts serefpolicy-3.5.13/config/appconfig-mls/staff_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mls/staff_u_default_contexts	2008-10-17 14:49:10.000000000 +0200
-+++ serefpolicy-3.5.13/config/appconfig-mls/staff_u_default_contexts	2009-01-20 17:15:52.000000000 +0100
++++ serefpolicy-3.5.13/config/appconfig-mls/staff_u_default_contexts	2009-01-20 17:50:35.000000000 +0100
 @@ -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
@@ -190,7 +190,7 @@
  staff_r:staff_sudo_t:s0		staff_r:staff_t:s0
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/user_u_default_contexts serefpolicy-3.5.13/config/appconfig-mls/user_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mls/user_u_default_contexts	2008-10-17 14:49:10.000000000 +0200
-+++ serefpolicy-3.5.13/config/appconfig-mls/user_u_default_contexts	2009-01-20 17:15:52.000000000 +0100
++++ serefpolicy-3.5.13/config/appconfig-mls/user_u_default_contexts	2009-01-20 17:50:35.000000000 +0100
 @@ -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
@@ -202,7 +202,7 @@
  user_r:user_sudo_t:s0		user_r:user_t:s0
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/xguest_u_default_contexts serefpolicy-3.5.13/config/appconfig-mls/xguest_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mls/xguest_u_default_contexts	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.5.13/config/appconfig-mls/xguest_u_default_contexts	2009-01-20 17:15:52.000000000 +0100
++++ serefpolicy-3.5.13/config/appconfig-mls/xguest_u_default_contexts	2009-01-20 17:50:35.000000000 +0100
 @@ -0,0 +1,7 @@
 +system_r:local_login_t	xguest_r:xguest_t:s0
 +system_r:remote_login_t	xguest_r:xguest_t:s0
@@ -213,7 +213,7 @@
 +xguest_r:xguest_t:s0	xguest_r:xguest_t:s0
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-standard/guest_u_default_contexts serefpolicy-3.5.13/config/appconfig-standard/guest_u_default_contexts
 --- nsaserefpolicy/config/appconfig-standard/guest_u_default_contexts	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.5.13/config/appconfig-standard/guest_u_default_contexts	2009-01-20 17:15:52.000000000 +0100
++++ serefpolicy-3.5.13/config/appconfig-standard/guest_u_default_contexts	2009-01-20 17:50:35.000000000 +0100
 @@ -0,0 +1,4 @@
 +system_r:local_login_t	guest_r:guest_t
 +system_r:remote_login_t	guest_r:guest_t
@@ -221,7 +221,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.5.13/config/appconfig-standard/root_default_contexts
 --- nsaserefpolicy/config/appconfig-standard/root_default_contexts	2008-10-17 14:49:10.000000000 +0200
-+++ serefpolicy-3.5.13/config/appconfig-standard/root_default_contexts	2009-01-20 17:15:52.000000000 +0100
++++ serefpolicy-3.5.13/config/appconfig-standard/root_default_contexts	2009-01-20 17:50:35.000000000 +0100
 @@ -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
@@ -237,7 +237,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/staff_u_default_contexts serefpolicy-3.5.13/config/appconfig-standard/staff_u_default_contexts
 --- nsaserefpolicy/config/appconfig-standard/staff_u_default_contexts	2008-10-17 14:49:10.000000000 +0200
-+++ serefpolicy-3.5.13/config/appconfig-standard/staff_u_default_contexts	2009-01-20 17:15:52.000000000 +0100
++++ serefpolicy-3.5.13/config/appconfig-standard/staff_u_default_contexts	2009-01-20 17:50:35.000000000 +0100
 @@ -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
@@ -249,7 +249,7 @@
  staff_r:staff_sudo_t		staff_r:staff_t
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-standard/user_u_default_contexts serefpolicy-3.5.13/config/appconfig-standard/user_u_default_contexts
 --- nsaserefpolicy/config/appconfig-standard/user_u_default_contexts	2008-10-17 14:49:10.000000000 +0200
-+++ serefpolicy-3.5.13/config/appconfig-standard/user_u_default_contexts	2009-01-20 17:15:52.000000000 +0100
++++ serefpolicy-3.5.13/config/appconfig-standard/user_u_default_contexts	2009-01-20 17:50:35.000000000 +0100
 @@ -1,7 +1,7 @@
  system_r:local_login_t		user_r:user_t
  system_r:remote_login_t		user_r:user_t
@@ -261,7 +261,7 @@
  user_r:user_sudo_t		user_r:user_t
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-standard/xguest_u_default_contexts serefpolicy-3.5.13/config/appconfig-standard/xguest_u_default_contexts
 --- nsaserefpolicy/config/appconfig-standard/xguest_u_default_contexts	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.5.13/config/appconfig-standard/xguest_u_default_contexts	2009-01-20 17:15:52.000000000 +0100
++++ serefpolicy-3.5.13/config/appconfig-standard/xguest_u_default_contexts	2009-01-20 17:50:35.000000000 +0100
 @@ -0,0 +1,5 @@
 +system_r:local_login_t	xguest_r:xguest_t
 +system_r:remote_login_t	xguest_r:xguest_t
@@ -270,7 +270,7 @@
 +system_r:xdm_t		xguest_r:xguest_t
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/Makefile serefpolicy-3.5.13/Makefile
 --- nsaserefpolicy/Makefile	2008-10-17 14:49:11.000000000 +0200
-+++ serefpolicy-3.5.13/Makefile	2009-01-20 17:15:52.000000000 +0100
++++ serefpolicy-3.5.13/Makefile	2009-01-20 17:50:35.000000000 +0100
 @@ -311,20 +311,22 @@
  
[...3359 lines suppressed...]
  
  ########################################
@@ -32188,7 +32186,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.te serefpolicy-3.5.13/policy/modules/system/selinuxutil.te
 --- nsaserefpolicy/policy/modules/system/selinuxutil.te	2008-10-17 14:49:13.000000000 +0200
-+++ serefpolicy-3.5.13/policy/modules/system/selinuxutil.te	2009-01-20 17:15:52.000000000 +0100
++++ serefpolicy-3.5.13/policy/modules/system/selinuxutil.te	2009-01-20 17:50:35.000000000 +0100
 @@ -23,6 +23,9 @@
  type selinux_config_t;
  files_type(selinux_config_t)
@@ -32545,7 +32543,7 @@
  ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/setrans.if serefpolicy-3.5.13/policy/modules/system/setrans.if
 --- nsaserefpolicy/policy/modules/system/setrans.if	2008-10-17 14:49:13.000000000 +0200
-+++ serefpolicy-3.5.13/policy/modules/system/setrans.if	2009-01-20 17:15:52.000000000 +0100
++++ serefpolicy-3.5.13/policy/modules/system/setrans.if	2009-01-20 17:50:35.000000000 +0100
 @@ -21,3 +21,23 @@
  	stream_connect_pattern($1,setrans_var_run_t,setrans_var_run_t,setrans_t)
  	files_list_pids($1)
@@ -32572,7 +32570,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/sysnetwork.fc serefpolicy-3.5.13/policy/modules/system/sysnetwork.fc
 --- nsaserefpolicy/policy/modules/system/sysnetwork.fc	2008-10-17 14:49:13.000000000 +0200
-+++ serefpolicy-3.5.13/policy/modules/system/sysnetwork.fc	2009-01-20 17:15:52.000000000 +0100
++++ serefpolicy-3.5.13/policy/modules/system/sysnetwork.fc	2009-01-20 17:50:35.000000000 +0100
 @@ -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)
@@ -32597,7 +32595,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.5.13/policy/modules/system/sysnetwork.if
 --- nsaserefpolicy/policy/modules/system/sysnetwork.if	2008-10-17 14:49:13.000000000 +0200
-+++ serefpolicy-3.5.13/policy/modules/system/sysnetwork.if	2009-01-20 17:15:52.000000000 +0100
++++ serefpolicy-3.5.13/policy/modules/system/sysnetwork.if	2009-01-20 17:50:35.000000000 +0100
 @@ -198,7 +198,25 @@
  		type dhcpc_state_t;
  	')
@@ -32709,7 +32707,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/sysnetwork.te serefpolicy-3.5.13/policy/modules/system/sysnetwork.te
 --- nsaserefpolicy/policy/modules/system/sysnetwork.te	2008-10-17 14:49:13.000000000 +0200
-+++ serefpolicy-3.5.13/policy/modules/system/sysnetwork.te	2009-01-20 17:15:52.000000000 +0100
++++ serefpolicy-3.5.13/policy/modules/system/sysnetwork.te	2009-01-20 17:50:35.000000000 +0100
 @@ -20,6 +20,9 @@
  init_daemon_domain(dhcpc_t,dhcpc_exec_t)
  role system_r types dhcpc_t;
@@ -32899,7 +32897,7 @@
  	xen_append_log(ifconfig_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/udev.fc serefpolicy-3.5.13/policy/modules/system/udev.fc
 --- nsaserefpolicy/policy/modules/system/udev.fc	2008-10-17 14:49:13.000000000 +0200
-+++ serefpolicy-3.5.13/policy/modules/system/udev.fc	2009-01-20 17:15:52.000000000 +0100
++++ serefpolicy-3.5.13/policy/modules/system/udev.fc	2009-01-20 17:50:35.000000000 +0100
 @@ -13,8 +13,11 @@
  /sbin/start_udev --	gen_context(system_u:object_r:udev_exec_t,s0)
  /sbin/udev	--	gen_context(system_u:object_r:udev_exec_t,s0)
@@ -32914,7 +32912,7 @@
 +/var/run/PackageKit/udev(/.*)?		gen_context(system_u:object_r:udev_var_run_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/udev.if serefpolicy-3.5.13/policy/modules/system/udev.if
 --- nsaserefpolicy/policy/modules/system/udev.if	2008-10-17 14:49:13.000000000 +0200
-+++ serefpolicy-3.5.13/policy/modules/system/udev.if	2009-01-20 17:15:52.000000000 +0100
++++ serefpolicy-3.5.13/policy/modules/system/udev.if	2009-01-20 17:50:35.000000000 +0100
 @@ -96,6 +96,24 @@
  
  ########################################
@@ -32970,7 +32968,7 @@
  ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/udev.te serefpolicy-3.5.13/policy/modules/system/udev.te
 --- nsaserefpolicy/policy/modules/system/udev.te	2008-10-17 14:49:13.000000000 +0200
-+++ serefpolicy-3.5.13/policy/modules/system/udev.te	2009-01-20 17:15:52.000000000 +0100
++++ serefpolicy-3.5.13/policy/modules/system/udev.te	2009-01-20 17:50:35.000000000 +0100
 @@ -83,6 +83,7 @@
  kernel_rw_unix_dgram_sockets(udev_t)
  kernel_dgram_send(udev_t)
@@ -33029,7 +33027,7 @@
  ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.fc serefpolicy-3.5.13/policy/modules/system/unconfined.fc
 --- nsaserefpolicy/policy/modules/system/unconfined.fc	2008-10-17 14:49:13.000000000 +0200
-+++ serefpolicy-3.5.13/policy/modules/system/unconfined.fc	2009-01-20 17:15:52.000000000 +0100
++++ serefpolicy-3.5.13/policy/modules/system/unconfined.fc	2009-01-20 17:50:35.000000000 +0100
 @@ -2,15 +2,31 @@
  # e.g.:
  # /usr/local/bin/appsrv		--	gen_context(system_u:object_r:unconfined_exec_t,s0)
@@ -33073,7 +33071,7 @@
 +#/usr/lib(64)?/gcl-[^/]+/unixport/saved_.* 	--	gen_context(system_u:object_r:execmem_exec_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.if serefpolicy-3.5.13/policy/modules/system/unconfined.if
 --- nsaserefpolicy/policy/modules/system/unconfined.if	2008-10-17 14:49:13.000000000 +0200
-+++ serefpolicy-3.5.13/policy/modules/system/unconfined.if	2009-01-20 17:15:52.000000000 +0100
++++ serefpolicy-3.5.13/policy/modules/system/unconfined.if	2009-01-20 17:50:35.000000000 +0100
 @@ -12,14 +12,13 @@
  #
  interface(`unconfined_domain_noaudit',`
@@ -33423,7 +33421,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.te serefpolicy-3.5.13/policy/modules/system/unconfined.te
 --- nsaserefpolicy/policy/modules/system/unconfined.te	2008-10-17 14:49:13.000000000 +0200
-+++ serefpolicy-3.5.13/policy/modules/system/unconfined.te	2009-01-20 17:15:52.000000000 +0100
++++ serefpolicy-3.5.13/policy/modules/system/unconfined.te	2009-01-20 17:50:35.000000000 +0100
 @@ -6,35 +6,77 @@
  # Declarations
  #
@@ -33788,7 +33786,7 @@
 +gen_user(unconfined_u, user, unconfined_r system_r, s0, s0 - mls_systemhigh, mcs_allcats)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.fc serefpolicy-3.5.13/policy/modules/system/userdomain.fc
 --- nsaserefpolicy/policy/modules/system/userdomain.fc	2008-10-17 14:49:13.000000000 +0200
-+++ serefpolicy-3.5.13/policy/modules/system/userdomain.fc	2009-01-20 17:15:52.000000000 +0100
++++ serefpolicy-3.5.13/policy/modules/system/userdomain.fc	2009-01-20 17:50:35.000000000 +0100
 @@ -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)
@@ -33801,7 +33799,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.5.13/policy/modules/system/userdomain.if
 --- nsaserefpolicy/policy/modules/system/userdomain.if	2008-10-17 14:49:13.000000000 +0200
-+++ serefpolicy-3.5.13/policy/modules/system/userdomain.if	2009-01-20 17:15:52.000000000 +0100
++++ serefpolicy-3.5.13/policy/modules/system/userdomain.if	2009-01-20 17:50:35.000000000 +0100
 @@ -28,10 +28,14 @@
  		class context contains;
  	')
@@ -36554,7 +36552,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-3.5.13/policy/modules/system/userdomain.te
 --- nsaserefpolicy/policy/modules/system/userdomain.te	2008-10-17 14:49:13.000000000 +0200
-+++ serefpolicy-3.5.13/policy/modules/system/userdomain.te	2009-01-20 17:15:52.000000000 +0100
++++ serefpolicy-3.5.13/policy/modules/system/userdomain.te	2009-01-20 17:50:35.000000000 +0100
 @@ -8,13 +8,6 @@
  
  ## <desc>
@@ -36674,7 +36672,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.fc serefpolicy-3.5.13/policy/modules/system/xen.fc
 --- nsaserefpolicy/policy/modules/system/xen.fc	2008-10-17 14:49:13.000000000 +0200
-+++ serefpolicy-3.5.13/policy/modules/system/xen.fc	2009-01-20 17:15:52.000000000 +0100
++++ serefpolicy-3.5.13/policy/modules/system/xen.fc	2009-01-20 17:50:35.000000000 +0100
 @@ -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)
@@ -36685,7 +36683,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.if serefpolicy-3.5.13/policy/modules/system/xen.if
 --- nsaserefpolicy/policy/modules/system/xen.if	2008-10-17 14:49:13.000000000 +0200
-+++ serefpolicy-3.5.13/policy/modules/system/xen.if	2009-01-20 17:15:52.000000000 +0100
++++ serefpolicy-3.5.13/policy/modules/system/xen.if	2009-01-20 17:50:35.000000000 +0100
 @@ -155,7 +155,7 @@
  	stream_connect_pattern($1,xenstored_var_run_t,xenstored_var_run_t,xenstored_t)
  ')
@@ -36738,7 +36736,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.te serefpolicy-3.5.13/policy/modules/system/xen.te
 --- nsaserefpolicy/policy/modules/system/xen.te	2008-10-17 14:49:13.000000000 +0200
-+++ serefpolicy-3.5.13/policy/modules/system/xen.te	2009-01-20 17:15:52.000000000 +0100
++++ serefpolicy-3.5.13/policy/modules/system/xen.te	2009-01-20 17:50:35.000000000 +0100
 @@ -6,6 +6,13 @@
  # Declarations
  #
@@ -36972,7 +36970,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/policy_capabilities serefpolicy-3.5.13/policy/policy_capabilities
 --- nsaserefpolicy/policy/policy_capabilities	2008-10-17 14:49:14.000000000 +0200
-+++ serefpolicy-3.5.13/policy/policy_capabilities	2009-01-20 17:15:52.000000000 +0100
++++ serefpolicy-3.5.13/policy/policy_capabilities	2009-01-20 17:50:35.000000000 +0100
 @@ -29,4 +29,4 @@
  # chr_file: open
  # blk_file: open
@@ -36981,7 +36979,7 @@
 +#policycap open_perms;
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/support/obj_perm_sets.spt serefpolicy-3.5.13/policy/support/obj_perm_sets.spt
 --- nsaserefpolicy/policy/support/obj_perm_sets.spt	2008-10-17 14:49:14.000000000 +0200
-+++ serefpolicy-3.5.13/policy/support/obj_perm_sets.spt	2009-01-20 17:15:52.000000000 +0100
++++ serefpolicy-3.5.13/policy/support/obj_perm_sets.spt	2009-01-20 17:50:35.000000000 +0100
 @@ -59,22 +59,22 @@
  # 
  # Permissions for executing files.
@@ -37131,7 +37129,7 @@
 +define(`manage_key_perms', `{ create link read search setattr view write } ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/users serefpolicy-3.5.13/policy/users
 --- nsaserefpolicy/policy/users	2008-10-17 14:49:11.000000000 +0200
-+++ serefpolicy-3.5.13/policy/users	2009-01-20 17:15:52.000000000 +0100
++++ serefpolicy-3.5.13/policy/users	2009-01-20 17:50:35.000000000 +0100
 @@ -25,11 +25,8 @@
  # permit any access to such users, then remove this entry.
  #
@@ -37158,7 +37156,7 @@
 +gen_user(root, user, unconfined_r sysadm_r staff_r ifdef(`enable_mls',`secadm_r auditadm_r') system_r, s0, s0 - mls_systemhigh, mcs_allcats)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/Rules.modular serefpolicy-3.5.13/Rules.modular
 --- nsaserefpolicy/Rules.modular	2008-10-17 14:49:14.000000000 +0200
-+++ serefpolicy-3.5.13/Rules.modular	2009-01-20 17:15:52.000000000 +0100
++++ serefpolicy-3.5.13/Rules.modular	2009-01-20 17:50:35.000000000 +0100
 @@ -73,8 +73,8 @@
  $(tmpdir)/%.mod: $(m4support) $(tmpdir)/generated_definitions.conf $(tmpdir)/all_interfaces.conf %.te
  	@echo "Compliling $(NAME) $(@F) module"
@@ -37207,7 +37205,7 @@
  $(appdir)/customizable_types: $(base_conf)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/support/Makefile.devel serefpolicy-3.5.13/support/Makefile.devel
 --- nsaserefpolicy/support/Makefile.devel	2008-10-17 14:49:14.000000000 +0200
-+++ serefpolicy-3.5.13/support/Makefile.devel	2009-01-20 17:15:52.000000000 +0100
++++ serefpolicy-3.5.13/support/Makefile.devel	2009-01-20 17:50:35.000000000 +0100
 @@ -181,8 +181,7 @@
  tmp/%.mod: $(m4support) tmp/all_interfaces.conf %.te
  	@$(EINFO) "Compiling $(NAME) $(basename $(@F)) module"



From sergiopr at fedoraproject.org  Tue Jan 20 17:48:57 2009
From: sergiopr at fedoraproject.org (Sergio Pascual)
Date: Tue, 20 Jan 2009 17:48:57 +0000 (UTC)
Subject: rpms/python-numdisplay/devel python-numdisplay.spec,1.3,1.4
Message-ID: <20090120174857.55CC3700F9@cvs1.fedora.phx.redhat.com>

Author: sergiopr

Update of /cvs/pkgs/rpms/python-numdisplay/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31706

Modified Files:
	python-numdisplay.spec 
Log Message:
* Tue Jan 22 2009 Sergio Pascual <sergiopr at fedoraproject.org> - 1.5.3-2
- Removing LICENSE.txt from sitelib



Index: python-numdisplay.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-numdisplay/devel/python-numdisplay.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- python-numdisplay.spec	22 Dec 2008 19:17:12 -0000	1.3
+++ python-numdisplay.spec	20 Jan 2009 17:48:26 -0000	1.4
@@ -3,7 +3,7 @@
 
 Name: python-numdisplay
 Version: 1.5.3
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: Visualize numpy array objects in ds9
 
 Group: Development/Languages
@@ -41,8 +41,12 @@
 %defattr(-,root,root,-)
 %doc lib/LICENSE.txt 
 %{python_sitelib}/*
+%exclude %{python_sitelib}/LICENSE.txt
 
 %changelog
+* Tue Jan 22 2009 Sergio Pascual <sergiopr at fedoraproject.org> - 1.5.3-2
+- Removing LICENSE.txt from sitelib
+
 * Mon Dec 22 2008 Sergio Pascual <sergiopr at fedoraproject.org> - 1.5.3-1
 - New upstream version
 - Docs aren't in the tarball, removed



From mclasen at fedoraproject.org  Tue Jan 20 17:55:54 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 20 Jan 2009 17:55:54 +0000 (UTC)
Subject: rpms/gnome-terminal/devel .cvsignore, 1.56, 1.57 gnome-terminal.spec,
	1.114, 1.115 sources, 1.57, 1.58
Message-ID: <20090120175554.1175A700F9@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-terminal/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32025

Modified Files:
	.cvsignore gnome-terminal.spec sources 
Log Message:
2.25.5



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-terminal/devel/.cvsignore,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- .cvsignore	17 Dec 2008 17:45:35 -0000	1.56
+++ .cvsignore	20 Jan 2009 17:55:23 -0000	1.57
@@ -1 +1 @@
-gnome-terminal-2.25.3.tar.bz2
+gnome-terminal-2.25.5.tar.bz2


Index: gnome-terminal.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-terminal/devel/gnome-terminal.spec,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -r1.114 -r1.115
--- gnome-terminal.spec	17 Dec 2008 23:21:51 -0000	1.114
+++ gnome-terminal.spec	20 Jan 2009 17:55:23 -0000	1.115
@@ -10,8 +10,8 @@
 
 Summary: Terminal emulator for GNOME
 Name: gnome-terminal
-Version: 2.25.3
-Release: 2%{?dist}
+Version: 2.25.5
+Release: 1%{?dist}
 URL: http://www.gnome.org/
 Source0: http://download.gnome.org/sources/gnome-terminal/2.25/gnome-terminal-%{version}.tar.bz2
 # Fix gnome.org Bug 338913 ??? Terminal resized when switching tabs
@@ -132,6 +132,9 @@
 %{_sysconfdir}/gconf/schemas/gnome-terminal.schemas
 
 %changelog
+* Tue Jan 20 2009 Matthias Clasen <mclasen at redhat.com> - 2.25.5-1
+- Update to 2.25.5
+
 * Wed Dec 17 2008 Matthias Clasen <mclasen at redhat.com> - 2.25.3-2
 - Update to 2.25.3
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-terminal/devel/sources,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- sources	17 Dec 2008 17:45:35 -0000	1.57
+++ sources	20 Jan 2009 17:55:23 -0000	1.58
@@ -1 +1 @@
-a71c20d958098cb20bdec02a974abdc4  gnome-terminal-2.25.3.tar.bz2
+56ab9c259693e15007e088bc8d72538e  gnome-terminal-2.25.5.tar.bz2



From rdieter at fedoraproject.org  Tue Jan 20 18:00:28 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Tue, 20 Jan 2009 18:00:28 +0000 (UTC)
Subject: comps comps-f10.xml.in, 1.206, 1.207 comps-f11.xml.in, 1.66,
	1.67 comps-f9.xml.in, 1.431, 1.432
Message-ID: <20090120180028.4C6E4700F9@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv642

Modified Files:
	comps-f10.xml.in comps-f11.xml.in comps-f9.xml.in 
Log Message:
kde-desktop: +kdelibs (mandatory)



Index: comps-f10.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f10.xml.in,v
retrieving revision 1.206
retrieving revision 1.207
diff -u -r1.206 -r1.207
--- comps-f10.xml.in	15 Jan 2009 14:10:31 -0000	1.206
+++ comps-f10.xml.in	20 Jan 2009 17:59:57 -0000	1.207
@@ -2926,6 +2926,7 @@
     <uservisible>true</uservisible>
     <packagelist>
       <packagereq type="mandatory">kdebase-workspace</packagereq>
+      <packagereq type="mandatory">kdelibs</packagereq>
       <packagereq type="conditional" requires="ibus">ibus-qt</packagereq>
       <packagereq type="conditional" requires="scim">scim-bridge-qt</packagereq>
       <packagereq type="default">amarok</packagereq>


Index: comps-f11.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f11.xml.in,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- comps-f11.xml.in	20 Jan 2009 09:17:22 -0000	1.66
+++ comps-f11.xml.in	20 Jan 2009 17:59:57 -0000	1.67
@@ -3008,6 +3008,7 @@
     <uservisible>true</uservisible>
     <packagelist>
       <packagereq type="mandatory">kdebase-workspace</packagereq>
+      <packagereq type="mandatory">kdelibs</packagereq>
       <packagereq type="conditional" requires="ibus">ibus-qt</packagereq>
       <packagereq type="conditional" requires="scim">scim-bridge-qt</packagereq>
       <packagereq type="default">amarok</packagereq>


Index: comps-f9.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f9.xml.in,v
retrieving revision 1.431
retrieving revision 1.432
diff -u -r1.431 -r1.432
--- comps-f9.xml.in	14 Jan 2009 01:04:04 -0000	1.431
+++ comps-f9.xml.in	20 Jan 2009 17:59:57 -0000	1.432
@@ -2626,6 +2626,7 @@
     <uservisible>true</uservisible>
     <packagelist>
       <packagereq type="mandatory">kdebase-workspace</packagereq>
+      <packagereq type="mandatory">kdelibs</packagereq>
       <packagereq type="conditional" requires="scim">scim-bridge-qt</packagereq>
       <packagereq type="default">amarok</packagereq>
       <packagereq type="default">digikam</packagereq>



From mclasen at fedoraproject.org  Tue Jan 20 18:02:22 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 20 Jan 2009 18:02:22 +0000 (UTC)
Subject: rpms/libgweather/devel .cvsignore, 1.18, 1.19 libgweather.spec, 1.33,
	1.34 sources, 1.18, 1.19
Message-ID: <20090120180222.C44CC700F9@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/libgweather/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv926

Modified Files:
	.cvsignore libgweather.spec sources 
Log Message:
2.25.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libgweather/devel/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- .cvsignore	6 Jan 2009 01:32:42 -0000	1.18
+++ .cvsignore	20 Jan 2009 18:01:52 -0000	1.19
@@ -1 +1 @@
-libgweather-2.25.4.tar.bz2
+libgweather-2.25.5.tar.bz2


Index: libgweather.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libgweather/devel/libgweather.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- libgweather.spec	6 Jan 2009 01:32:42 -0000	1.33
+++ libgweather.spec	20 Jan 2009 18:01:52 -0000	1.34
@@ -1,5 +1,5 @@
 Name:           libgweather
-Version:        2.25.4
+Version:        2.25.5
 Release:        1%{?dist}
 Summary:        A library for weather information 
 
@@ -123,6 +123,9 @@
 
 
 %changelog
+* Tue Jan 20 2009 Matthias Clasen <mclasen at redhat.com> 2.25.5-1
+- Upate to 2.25.5
+
 * Mon Jan 05 2009 Matthew Barnes <mbarnes at redhat.com> 2.25.4-1
 - Update to 2.25.4
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libgweather/devel/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources	6 Jan 2009 01:32:42 -0000	1.18
+++ sources	20 Jan 2009 18:01:52 -0000	1.19
@@ -1 +1 @@
-21caa3ec85fe270bf95a59303390244a  libgweather-2.25.4.tar.bz2
+c234e06d394d856dec1964f00dc82133  libgweather-2.25.5.tar.bz2



From mclasen at fedoraproject.org  Tue Jan 20 18:07:56 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 20 Jan 2009 18:07:56 +0000 (UTC)
Subject: rpms/gedit/devel .cvsignore, 1.83, 1.84 gedit.spec, 1.182,
	1.183 sources, 1.85, 1.86
Message-ID: <20090120180756.F28A1700F9@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gedit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1553

Modified Files:
	.cvsignore gedit.spec sources 
Log Message:
2.25.5



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gedit/devel/.cvsignore,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- .cvsignore	6 Jan 2009 06:32:38 -0000	1.83
+++ .cvsignore	20 Jan 2009 18:07:26 -0000	1.84
@@ -1 +1 @@
-gedit-2.25.4.tar.bz2
+gedit-2.25.5.tar.bz2


Index: gedit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gedit/devel/gedit.spec,v
retrieving revision 1.182
retrieving revision 1.183
diff -u -r1.182 -r1.183
--- gedit.spec	6 Jan 2009 06:39:58 -0000	1.182
+++ gedit.spec	20 Jan 2009 18:07:26 -0000	1.183
@@ -17,8 +17,8 @@
 
 Summary:	Text editor for the GNOME desktop
 Name:		gedit
-Version: 	2.25.4
-Release: 	2%{?dist}
+Version: 	2.25.5
+Release: 	1%{?dist}
 Epoch:		1
 License:	GPLv2+ and GFDL
 Group:		Applications/Editors
@@ -62,7 +62,6 @@
 BuildRequires: gnome-doc-utils >= %{gnome_doc_utils_version}
 BuildRequires: which
 BuildRequires: autoconf, automake, libtool
-BuildRequires: perl(XML::Parser)
 BuildRequires: intltool
 
 Requires: pygtk2 >= %{pygtk_version}
@@ -221,6 +220,9 @@
 
 
 %changelog
+* Tue Jan 20 2009 Matthias Clasen <mclasen at redhat.com> - 1:2.25.5-1
+- Update to 2.25.5
+
 * Tue Jan  6 2009 Matthias Clasen <mclasen at redhat.com> - 1:2.25.4-2
 - Update to 2.25.4
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gedit/devel/sources,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -r1.85 -r1.86
--- sources	6 Jan 2009 06:32:39 -0000	1.85
+++ sources	20 Jan 2009 18:07:26 -0000	1.86
@@ -1 +1 @@
-31f4ad2cc3a0148c433c1dc5048503e5  gedit-2.25.4.tar.bz2
+14734f7f9d50170d434fb050b41175a8  gedit-2.25.5.tar.bz2



From markmc at fedoraproject.org  Tue Jan 20 18:11:21 2009
From: markmc at fedoraproject.org (Mark McLoughlin)
Date: Tue, 20 Jan 2009 18:11:21 +0000 (UTC)
Subject: rpms/virt-manager/devel virt-manager-0.6.0-ignore-sighup.patch, NONE,
	1.1 virt-manager.spec, 1.41, 1.42
Message-ID: <20090120181121.3FD17700F9@cvs1.fedora.phx.redhat.com>

Author: markmc

Update of /cvs/pkgs/rpms/virt-manager/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2082

Modified Files:
	virt-manager.spec 
Added Files:
	virt-manager-0.6.0-ignore-sighup.patch 
Log Message:
* Tue Jan 20 2009 Mark McLoughlin <markmc at redhat.com> - 0.6.0-7
- Add patch to ignore fix crash on force-poweroff with serial console (#470548)


virt-manager-0.6.0-ignore-sighup.patch:

--- NEW FILE virt-manager-0.6.0-ignore-sighup.patch ---
# HG changeset patch
# User "Cole Robinson <crobinso at redhat.com>"
# Date 1228753553 18000
# Node ID fb3a203a72d7d0cedf0a499df3950a9187c282c5
# Parent  d402778935079ead0d1e049efa026dd8d4bd5a51
Ignore SIGHUP if we fork off, otherwise a dropped serial console kills the whole app. (bz 470548)

diff -r d40277893507 -r fb3a203a72d7 src/virt-manager.py.in
--- a/src/virt-manager.py.in	Mon Dec 08 11:14:54 2008 -0500
+++ b/src/virt-manager.py.in	Mon Dec 08 11:25:53 2008 -0500
@@ -31,6 +31,7 @@
 import logging.handlers
 import threading
 import traceback
+import signal
 from optparse import OptionParser, OptionValueError
 
 # These are substituted into code based on --prefix given to configure
@@ -282,6 +283,9 @@
         drop_tty()
         drop_stdio()
 
+        # Ignore SIGHUP, otherwise a serial console closing drops the whole app
+        signal.signal(signal.SIGHUP, signal.SIG_IGN)
+
     from virtManager.engine import vmmEngine
     from virtManager.remote import vmmRemote
 


Index: virt-manager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/virt-manager/devel/virt-manager.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- virt-manager.spec	7 Dec 2008 21:24:11 -0000	1.41
+++ virt-manager.spec	20 Jan 2009 18:10:50 -0000	1.42
@@ -8,7 +8,7 @@
 
 Name: virt-manager
 Version: 0.6.0
-Release: 6%{_extra_release}
+Release: 7%{_extra_release}
 Summary: Virtual Machine Manager
 
 Group: Applications/Emulators
@@ -26,6 +26,7 @@
 Patch7: %{name}-%{version}-vol-copy-popup.patch
 Patch8: %{name}-%{version}-connect-variable-typo.patch
 Patch9: %{name}-%{version}-fix-virt-type-desc.patch
+Patch10: %{name}-%{version}-ignore-sighup.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # These two are just the oldest version tested
@@ -104,6 +105,7 @@
 %patch7 -p1
 %patch8 -p1
 %patch9 -p1
+%patch10 -p1
 
 %build
 %configure
@@ -193,6 +195,9 @@
 %{_datadir}/dbus-1/services/%{name}.service
 
 %changelog
+* Tue Jan 20 2009 Mark McLoughlin <markmc at redhat.com> - 0.6.0-7
+- Add patch to ignore fix crash on force-poweroff with serial console (#470548)
+
 * Thu Dec 04 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 0.6.0-6
 - Rebuild for Python 2.6
 



From mclasen at fedoraproject.org  Tue Jan 20 18:13:25 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 20 Jan 2009 18:13:25 +0000 (UTC)
Subject: rpms/gnome-menus/devel .cvsignore, 1.50, 1.51 gnome-menus.spec, 1.95,
	1.96 sources, 1.50, 1.51
Message-ID: <20090120181325.12FC6700F9@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-menus/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2140

Modified Files:
	.cvsignore gnome-menus.spec sources 
Log Message:
2.25.5



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-menus/devel/.cvsignore,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- .cvsignore	3 Dec 2008 06:12:20 -0000	1.50
+++ .cvsignore	20 Jan 2009 18:12:54 -0000	1.51
@@ -1 +1 @@
-gnome-menus-2.25.2.tar.bz2
+gnome-menus-2.25.5.tar.bz2


Index: gnome-menus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-menus/devel/gnome-menus.spec,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -r1.95 -r1.96
--- gnome-menus.spec	4 Dec 2008 17:21:50 -0000	1.95
+++ gnome-menus.spec	20 Jan 2009 18:12:54 -0000	1.96
@@ -5,8 +5,8 @@
 
 Summary:  A menu system for the GNOME project
 Name: gnome-menus
-Version: 2.25.2
-Release: 3%{?dist}
+Version: 2.25.5
+Release: 1%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 URL: http://www.gnome.org/
@@ -102,6 +102,9 @@
 %{_includedir}/gnome-menus
 
 %changelog
+* Tue Jan 20 2009 Matthias Clasen <mclasen at redhat.com> 2.25.5-1
+- Update to 2.25.5
+
 * Thu Dec  4 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 2.25.2-3
 - Rebuild for Python 2.6
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-menus/devel/sources,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- sources	3 Dec 2008 06:12:20 -0000	1.50
+++ sources	20 Jan 2009 18:12:54 -0000	1.51
@@ -1 +1 @@
-69e217f15ca5136cedcfda76d9883d40  gnome-menus-2.25.2.tar.bz2
+9a6910a04f1a4cc138564981df3240b1  gnome-menus-2.25.5.tar.bz2



From mclasen at fedoraproject.org  Tue Jan 20 18:17:39 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 20 Jan 2009 18:17:39 +0000 (UTC)
Subject: rpms/mousetweaks/devel .cvsignore, 1.15, 1.16 mousetweaks.spec, 1.20,
	1.21 sources, 1.15, 1.16
Message-ID: <20090120181739.D8A6D700F9@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/mousetweaks/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2956

Modified Files:
	.cvsignore mousetweaks.spec sources 
Log Message:
2.25.5



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mousetweaks/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	6 Jan 2009 06:50:29 -0000	1.15
+++ .cvsignore	20 Jan 2009 18:17:09 -0000	1.16
@@ -1 +1 @@
-mousetweaks-2.25.4.tar.bz2
+mousetweaks-2.25.5.tar.bz2


Index: mousetweaks.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mousetweaks/devel/mousetweaks.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- mousetweaks.spec	6 Jan 2009 06:50:29 -0000	1.20
+++ mousetweaks.spec	20 Jan 2009 18:17:09 -0000	1.21
@@ -1,5 +1,5 @@
 Name:		mousetweaks
-Version:	2.25.4
+Version:	2.25.5
 Release:	1%{?dist}
 Summary:	Mouse accessibility support for the GNOME desktop
 Group:		User Interface/Desktops
@@ -9,7 +9,6 @@
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	gettext
-BuildRequires:  perl(XML::Parser)
 BuildRequires:  gnome-doc-utils
 BuildRequires:  pkgconfig
 BuildRequires:  GConf2-devel
@@ -109,6 +108,9 @@
 %doc %{_mandir}/man1/*
 
 %changelog
+* Tue Jan 20 2009 Matthias Clasen <mclasen at redhat.com> - 2.25.5-1
+- Update to 2.25.5
+
 * Tue Jan  6 2009 Matthias Clasen <mclasen at redhat.com> - 2.25.4-1
 - Update to 2.25.4
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mousetweaks/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	6 Jan 2009 06:50:29 -0000	1.15
+++ sources	20 Jan 2009 18:17:09 -0000	1.16
@@ -1 +1 @@
-3884d1434e1892fc2fce5f8ba8b41e33  mousetweaks-2.25.4.tar.bz2
+23bb2d2ec05fe9f4bcb71068cf1c9684  mousetweaks-2.25.5.tar.bz2



From mclasen at fedoraproject.org  Tue Jan 20 18:20:36 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 20 Jan 2009 18:20:36 +0000 (UTC)
Subject: rpms/gtksourceview2/devel .cvsignore, 1.21, 1.22 gtksourceview2.spec,
	1.23, 1.24 sources, 1.21, 1.22
Message-ID: <20090120182036.53DD1700F9@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gtksourceview2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3980

Modified Files:
	.cvsignore gtksourceview2.spec sources 
Log Message:
2.5.3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gtksourceview2/devel/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- .cvsignore	6 Jan 2009 06:56:26 -0000	1.21
+++ .cvsignore	20 Jan 2009 18:20:05 -0000	1.22
@@ -1 +1 @@
-gtksourceview-2.5.2.tar.bz2
+gtksourceview-2.5.3.tar.bz2


Index: gtksourceview2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtksourceview2/devel/gtksourceview2.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- gtksourceview2.spec	6 Jan 2009 06:56:27 -0000	1.23
+++ gtksourceview2.spec	20 Jan 2009 18:20:05 -0000	1.24
@@ -5,7 +5,7 @@
 
 Summary: A library for viewing source files
 Name: gtksourceview2
-Version: 2.5.2
+Version: 2.5.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
+* Tue Jan 20 2009 Matthias Clasen <mclasen at redhat.com> - 2.5.3-1
+- Update to 2.5.3
+
 * Tue Jan  6 2009 Matthias Clasen <mclasen at redhat.com> - 2.5.2-1
 - Update to 2.5.2
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gtksourceview2/devel/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sources	6 Jan 2009 06:56:27 -0000	1.21
+++ sources	20 Jan 2009 18:20:05 -0000	1.22
@@ -1 +1 @@
-a108e40cb5022864c0e1b1c605b0fe71  gtksourceview-2.5.2.tar.bz2
+a1bd6e215da2e75b207c096df776341b  gtksourceview-2.5.3.tar.bz2



From limb at fedoraproject.org  Tue Jan 20 18:23:26 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Tue, 20 Jan 2009 18:23:26 +0000 (UTC)
Subject: rpms/xmoto/devel xmoto.spec,1.46,1.47
Message-ID: <20090120182326.B9D78700F9@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/xmoto/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4466

Modified Files:
	xmoto.spec 
Log Message:
Font requires change.



Index: xmoto.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xmoto/devel/xmoto.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- xmoto.spec	31 Dec 2008 16:04:56 -0000	1.46
+++ xmoto.spec	20 Jan 2009 18:22:56 -0000	1.47
@@ -1,6 +1,6 @@
 Name:		xmoto
 Version:	0.5.0
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	Challenging 2D Motocross Platform Game
 
 Group:		Amusements/Games
@@ -33,7 +33,7 @@
 %if "0%{?dist}" == "0.fc10"
 Requires: dejavu-fonts
 %else
-Requires: dejavu-fonts-sans
+Requires: dejavu-sans-fonts
 %endif
 
 
@@ -115,6 +115,9 @@
 %{_mandir}/man6/xmoto.6.gz
 
 %changelog
+* Tue Jan 20 2009 Jon Ciesla <limb at jcomserv.net> 0.5.0-4
+- Font requires change for BZ 480480, dejavu rename.
+
 * Tue Dec 30 2008 Jon Ciesla <limb at jcomserv.net> 0.5.0-3
 - Symlink to system font, BZ 477485.
 - Dropped extension from icon in .desktop.



From mclasen at fedoraproject.org  Tue Jan 20 18:27:11 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 20 Jan 2009 18:27:11 +0000 (UTC)
Subject: rpms/gnome-session/devel .cvsignore, 1.68, 1.69 gnome-session.spec, 
	1.217, 1.218 sources, 1.72, 1.73
Message-ID: <20090120182711.734CF700F9@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-session/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5249

Modified Files:
	.cvsignore gnome-session.spec sources 
Log Message:
2.25.5



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-session/devel/.cvsignore,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- .cvsignore	17 Dec 2008 05:54:23 -0000	1.68
+++ .cvsignore	20 Jan 2009 18:26:40 -0000	1.69
@@ -1 +1 @@
-gnome-session-2.25.3.tar.bz2
+gnome-session-2.25.5.tar.bz2


Index: gnome-session.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-session/devel/gnome-session.spec,v
retrieving revision 1.217
retrieving revision 1.218
diff -u -r1.217 -r1.218
--- gnome-session.spec	17 Dec 2008 05:54:23 -0000	1.217
+++ gnome-session.spec	20 Jan 2009 18:26:40 -0000	1.218
@@ -11,7 +11,7 @@
 
 Summary: GNOME session manager
 Name: gnome-session
-Version: 2.25.3
+Version: 2.25.5
 Release: 1%{?dist}
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/gnome-session/2.25/%{name}-%{version}.tar.bz2
@@ -174,6 +174,9 @@
 
 
 %changelog
+* Tue Jan 20 2009 Matthias Clasen  <mclasen at redhat.com> - 2.25.5-1
+- Update to 2.25.5
+
 * Wed Dec 17 2008 Matthias Clasen  <mclasen at redhat.com> - 2.25.3-1
 - Update to 2.25.3
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-session/devel/sources,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- sources	17 Dec 2008 05:54:23 -0000	1.72
+++ sources	20 Jan 2009 18:26:41 -0000	1.73
@@ -1 +1 @@
-9e666716d93b95e519ca9d90479f7b80  gnome-session-2.25.3.tar.bz2
+8a78e037dd87b31601847fc8e211e44e  gnome-session-2.25.5.tar.bz2



From mclasen at fedoraproject.org  Tue Jan 20 18:28:52 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 20 Jan 2009 18:28:52 +0000 (UTC)
Subject: rpms/gok/devel gok.spec,1.64,1.65
Message-ID: <20090120182852.77626700F9@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gok/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5034

Modified Files:
	gok.spec 
Log Message:
2.25.3



Index: gok.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gok/devel/gok.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- gok.spec	4 Dec 2008 04:11:38 -0000	1.64
+++ gok.spec	20 Jan 2009 18:28:22 -0000	1.65
@@ -2,7 +2,7 @@
 
 Summary: GNOME Onscreen Keyboard
 Name: gok
-Version: 2.25.2
+Version: 2.25.3
 Release: 1%{?dist}
 License: LGPLv2+
 Group: Desktop/Accessibility
@@ -136,6 +136,9 @@
 %{_datadir}/gtk-doc/html/gok
 
 %changelog
+* Tue Jan 20 2009 Matthias Clasen <mclasen at redhat.com> - 2.25.3-1
+- Update to 2.25.3
+
 * Wed Dec  3 2008 Matthias Clasen <mclasen at redhat.com> - 2.25.2-1
 - Update to 2.25.2
 



From mclasen at fedoraproject.org  Tue Jan 20 18:33:37 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 20 Jan 2009 18:33:37 +0000 (UTC)
Subject: rpms/gnome-session/devel gnome-session.spec,1.218,1.219
Message-ID: <20090120183337.411A9700F9@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-session/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6140

Modified Files:
	gnome-session.spec 
Log Message:
Fix BuildRequires



Index: gnome-session.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-session/devel/gnome-session.spec,v
retrieving revision 1.218
retrieving revision 1.219
diff -u -r1.218 -r1.219
--- gnome-session.spec	20 Jan 2009 18:26:40 -0000	1.218
+++ gnome-session.spec	20 Jan 2009 18:33:06 -0000	1.219
@@ -12,7 +12,7 @@
 Summary: GNOME session manager
 Name: gnome-session
 Version: 2.25.5
-Release: 1%{?dist}
+Release: 2%{?dist}
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/gnome-session/2.25/%{name}-%{version}.tar.bz2
 Source1: redhat-default-session
@@ -57,6 +57,7 @@
 BuildRequires: gettext
 BuildRequires: libX11-devel libXt-devel
 BuildRequires: libXrandr-devel
+BuildRequires: libXtest-devel
 BuildRequires: PolicyKit-gnome-devel
 BuildRequires: xmlto
 
@@ -174,8 +175,9 @@
 
 
 %changelog
-* Tue Jan 20 2009 Matthias Clasen  <mclasen at redhat.com> - 2.25.5-1
+* Tue Jan 20 2009 Matthias Clasen  <mclasen at redhat.com> - 2.25.5-2
 - Update to 2.25.5
+- Fix BuildRequires
 
 * Wed Dec 17 2008 Matthias Clasen  <mclasen at redhat.com> - 2.25.3-1
 - Update to 2.25.3



From mclasen at fedoraproject.org  Tue Jan 20 18:33:56 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 20 Jan 2009 18:33:56 +0000 (UTC)
Subject: rpms/gok/devel .cvsignore,1.33,1.34 sources,1.33,1.34
Message-ID: <20090120183356.2A96C700F9@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gok/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6205

Modified Files:
	.cvsignore sources 
Log Message:
2.25.3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gok/devel/.cvsignore,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- .cvsignore	4 Dec 2008 04:11:38 -0000	1.33
+++ .cvsignore	20 Jan 2009 18:33:25 -0000	1.34
@@ -1 +1 @@
-gok-2.25.2.tar.bz2
+gok-2.25.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gok/devel/sources,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- sources	4 Dec 2008 04:11:38 -0000	1.33
+++ sources	20 Jan 2009 18:33:25 -0000	1.34
@@ -1 +1 @@
-2ec7a9d0096a9aa9e5383a78fb9fccb4  gok-2.25.2.tar.bz2
+1bd9074f5d2b5a44686d051ea5225f5f  gok-2.25.3.tar.bz2



From mclasen at fedoraproject.org  Tue Jan 20 18:37:15 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 20 Jan 2009 18:37:15 +0000 (UTC)
Subject: rpms/gnome-system-monitor/devel .cvsignore, 1.73,
	1.74 gnome-system-monitor.spec, 1.132, 1.133 sources, 1.73, 1.74
Message-ID: <20090120183715.A7C8B700F9@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-system-monitor/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6800

Modified Files:
	.cvsignore gnome-system-monitor.spec sources 
Log Message:
2.24.4



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-system-monitor/devel/.cvsignore,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- .cvsignore	16 Jan 2009 05:05:46 -0000	1.73
+++ .cvsignore	20 Jan 2009 18:36:44 -0000	1.74
@@ -1 +1 @@
-gnome-system-monitor-2.24.3.tar.bz2
+gnome-system-monitor-2.24.4.tar.bz2


Index: gnome-system-monitor.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-system-monitor/devel/gnome-system-monitor.spec,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -r1.132 -r1.133
--- gnome-system-monitor.spec	16 Jan 2009 05:05:46 -0000	1.132
+++ gnome-system-monitor.spec	20 Jan 2009 18:36:44 -0000	1.133
@@ -12,7 +12,7 @@
 
 Summary: Process and resource monitor
 Name: gnome-system-monitor
-Version: 2.24.3
+Version: 2.24.4
 Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/System
@@ -145,6 +145,9 @@
 
 
 %changelog
+* Tue Jan 20 2009 Matthias Clasen <mclasen at redhat.com> - 2.24.4-1
+- Update to 2.24.4
+
 * Fri Jan 16 2009 Matthias Clasen <mclasen at redhat.com> - 2.24.3-1
 - Update to 2.24.3
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-system-monitor/devel/sources,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- sources	16 Jan 2009 05:05:46 -0000	1.73
+++ sources	20 Jan 2009 18:36:45 -0000	1.74
@@ -1 +1 @@
-be4bdef29897ff786aff38a86ea42ac0  gnome-system-monitor-2.24.3.tar.bz2
+870bff7aac0b39cb33ac5078ef576639  gnome-system-monitor-2.24.4.tar.bz2



From notting at fedoraproject.org  Tue Jan 20 18:40:24 2009
From: notting at fedoraproject.org (Bill Nottingham)
Date: Tue, 20 Jan 2009 18:40:24 +0000 (UTC)
Subject: rpms/chkconfig/devel .cvsignore, 1.42, 1.43 chkconfig.spec, 1.52,
	1.53 sources, 1.43, 1.44
Message-ID: <20090120184024.BE5C9700F9@cvs1.fedora.phx.redhat.com>

Author: notting

Update of /cvs/extras/rpms/chkconfig/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7249

Modified Files:
	.cvsignore chkconfig.spec sources 
Log Message:
1.3.41-1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/chkconfig/devel/.cvsignore,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- .cvsignore	5 Dec 2008 05:05:11 -0000	1.42
+++ .cvsignore	20 Jan 2009 18:39:54 -0000	1.43
@@ -1 +1 @@
-chkconfig-1.3.40.tar.bz2
+chkconfig-1.3.41.tar.bz2


Index: chkconfig.spec
===================================================================
RCS file: /cvs/extras/rpms/chkconfig/devel/chkconfig.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- chkconfig.spec	5 Dec 2008 05:05:11 -0000	1.52
+++ chkconfig.spec	20 Jan 2009 18:39:54 -0000	1.53
@@ -1,6 +1,6 @@
 Summary: A system tool for maintaining the /etc/rc*.d hierarchy
 Name: chkconfig
-Version: 1.3.40
+Version: 1.3.41
 Release: 1
 License: GPLv2
 Group: System Environment/Base
@@ -74,6 +74,9 @@
 %{_mandir}/*/ntsysv.8*
 
 %changelog
+* Tue Jan 20 2009 Bill Nottingham <notting at redhat.com> 1.3.41-1
+- restore return code & error on unconfigured services (#480805)
+
 * Fri Dec  5 2008 Bill Nottingham <notting at redhat.com> 1.3.40-1
 - fix some overflows. (#176944)
 - add --type parameter to specify either xinetd or sysv services.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/chkconfig/devel/sources,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- sources	5 Dec 2008 05:05:11 -0000	1.43
+++ sources	20 Jan 2009 18:39:54 -0000	1.44
@@ -1 +1 @@
-89177c622959e24287b9738b0227b01d  chkconfig-1.3.40.tar.bz2
+9f6708c058adc77d1fe7537983633ad7  chkconfig-1.3.41.tar.bz2



From mclasen at fedoraproject.org  Tue Jan 20 18:41:16 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 20 Jan 2009 18:41:16 +0000 (UTC)
Subject: rpms/gnome-session/devel gnome-session.spec,1.219,1.220
Message-ID: <20090120184116.BD18D700F9@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-session/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7352

Modified Files:
	gnome-session.spec 
Log Message:
fix BRs



Index: gnome-session.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-session/devel/gnome-session.spec,v
retrieving revision 1.219
retrieving revision 1.220
diff -u -r1.219 -r1.220
--- gnome-session.spec	20 Jan 2009 18:33:06 -0000	1.219
+++ gnome-session.spec	20 Jan 2009 18:40:46 -0000	1.220
@@ -56,8 +56,7 @@
 BuildRequires: libtool
 BuildRequires: gettext
 BuildRequires: libX11-devel libXt-devel
-BuildRequires: libXrandr-devel
-BuildRequires: libXtest-devel
+BuildRequires: libXtst-devel
 BuildRequires: PolicyKit-gnome-devel
 BuildRequires: xmlto
 



From mlichvar at fedoraproject.org  Tue Jan 20 18:45:54 2009
From: mlichvar at fedoraproject.org (Miroslav Lichvar)
Date: Tue, 20 Jan 2009 18:45:54 +0000 (UTC)
Subject: rpms/sendmail/devel sendmail.spec,1.98,1.99
Message-ID: <20090120184554.D0B2C700F9@cvs1.fedora.phx.redhat.com>

Author: mlichvar

Update of /cvs/pkgs/rpms/sendmail/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7927

Modified Files:
	sendmail.spec 
Log Message:
- fix building on ppc



Index: sendmail.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sendmail/devel/sendmail.spec,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -r1.98 -r1.99
--- sendmail.spec	20 Jan 2009 17:07:55 -0000	1.98
+++ sendmail.spec	20 Jan 2009 18:45:23 -0000	1.99
@@ -167,7 +167,7 @@
 # generate redhat config file
 cat > redhat.config.m4 << EOF
 define(\`confMAPDEF', \`-DNEWDB -DNIS -DHESIOD -DMAP_REGEX -DSOCKETMAP -DNAMED_BIND=1')
-define(\`confOPTIMIZE', \`\`\`${RPM_OPT_FLAGS}''')
+define(\`confOPTIMIZE', \`\`\`\`${RPM_OPT_FLAGS}'''')
 define(\`confENVDEF', \`-I%{_includedir}/db4 -I/usr/kerberos/include -Wall -DXDEBUG=0 -DTCPWRAPPERS -DNETINET6 -DHES_GETMAILHOST -DUSE_VENDOR_CF_PATH=1 -D_FFR_TLS_1')
 define(\`confLIBDIRS', \`-L/usr/kerberos/%{_lib}')
 define(\`confLIBS', \`-lnsl -lwrap -lhesiod -lcrypt -ldb')
@@ -181,12 +181,15 @@
 define(\`STATUS_FILE', \`%{stdir}/statistics')
 define(\`confLIBSEARCH', \`db resolv 44bsd')
 EOF
+#'
 
-%ifarch ppc ppc64 s390x
 cat >> redhat.config.m4 << EOF
+%ifarch ppc ppc64 s390x
 APPENDDEF(\`confOPTIMIZE', \`-DSM_CONF_SHM=0')
-EOF
+%else
+APPENDDEF(\`confOPTIMIZE', \`')
 %endif
+EOF
 
 %if "%{enable_pie}" == "yes"
 %ifarch s390 s390x sparc sparcv9 sparc64



From limb at fedoraproject.org  Tue Jan 20 18:48:38 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Tue, 20 Jan 2009 18:48:38 +0000 (UTC)
Subject: rpms/gnubg/devel gnubg.spec,1.26,1.27
Message-ID: <20090120184838.BF307700F9@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/gnubg/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8594

Modified Files:
	gnubg.spec 
Log Message:
Fix for dejavu font rename.



Index: gnubg.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnubg/devel/gnubg.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- gnubg.spec	9 Jan 2009 19:01:05 -0000	1.26
+++ gnubg.spec	20 Jan 2009 18:48:08 -0000	1.27
@@ -4,7 +4,7 @@
 Summary:       A backgammon game and analyser
 Epoch:         1
 Version:       0.9.0.1
-Release:       5%{?dist}
+Release:       6%{?dist}
 Source0:       http://gnubg.org/media/sources/gnubg-0.9.0-1.tar.gz
 Source1:       gnubg.weights
 Source2:       gnubg.desktop
@@ -48,8 +48,8 @@
 %if "0%{?dist}" == "0.fc10"
 Requires: dejavu-fonts
 %else
-Requires: dejavu-fonts-sans
-Requires: dejavu-fonts-serif
+Requires: dejavu-sans-fonts
+Requires: dejavu-serif-fonts
 %endif
 
 
@@ -165,6 +165,8 @@
 %{_datadir}/gnubg/gnubg_ts0.bd
 
 %changelog
+* Tue Jan 20 2009 Jon Ciesla <limb at jcomserv.net> - 1:0.9.0.1-6
+- Fix for dejavu renaming, BZ 480456.
 * Fri Jan 09 2009 Jon Ciesla <limb at jcomserv.net> - 1:0.9.0.1-5
 - Switch to dejavu fonts.
 * Fri Jan 02 2009 Jon Ciesla <limb at jcomserv.net> - 1:0.9.0.1-4.1



From ruben at fedoraproject.org  Tue Jan 20 18:49:02 2009
From: ruben at fedoraproject.org (Ruben Kerkhof)
Date: Tue, 20 Jan 2009 18:49:02 +0000 (UTC)
Subject: rpms/perl-mogilefs-server/EL-5 .cvsignore, 1.2, 1.3 sources, 1.3,
	1.4 mogilefs-dont_delete_valid_files_during_cleanup.patch, 1.1, NONE
Message-ID: <20090120184902.05659700F9@cvs1.fedora.phx.redhat.com>

Author: ruben

Update of /cvs/pkgs/rpms/perl-mogilefs-server/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9122

Modified Files:
	.cvsignore sources 
Removed Files:
	mogilefs-dont_delete_valid_files_during_cleanup.patch 
Log Message:
Add sources


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-mogilefs-server/EL-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	2 Nov 2008 19:14:36 -0000	1.2
+++ .cvsignore	20 Jan 2009 18:48:31 -0000	1.3
@@ -1 +1 @@
-mogilefs-server-2.20.tar.gz
+mogilefs-server-2.30.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-mogilefs-server/EL-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	2 Nov 2008 19:14:36 -0000	1.3
+++ sources	20 Jan 2009 18:48:31 -0000	1.4
@@ -1 +1 @@
-129ab60bb7a060626add89ee0ba92c19  mogilefs-server-2.20.tar.gz
+be0fdae8699dba12c17b15e4327dd45e  mogilefs-server-2.30.tar.gz


--- mogilefs-dont_delete_valid_files_during_cleanup.patch DELETED ---



From mclasen at fedoraproject.org  Tue Jan 20 18:51:03 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 20 Jan 2009 18:51:03 +0000 (UTC)
Subject: rpms/gok/devel gok.spec,1.65,1.66
Message-ID: <20090120185103.114A3700F9@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gok/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9261

Modified Files:
	gok.spec 
Log Message:
fix BRs



Index: gok.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gok/devel/gok.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- gok.spec	20 Jan 2009 18:28:22 -0000	1.65
+++ gok.spec	20 Jan 2009 18:50:32 -0000	1.66
@@ -30,6 +30,7 @@
 BuildRequires:  perl(XML::Parser)
 BuildRequires:  libXt-devel
 BuildRequires:  libXevie-devel
+BuildRequires:  esound-devel
 
 %description
 The gok project aims to enable users to control their computer without



From mclasen at fedoraproject.org  Tue Jan 20 18:51:08 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 20 Jan 2009 18:51:08 +0000 (UTC)
Subject: rpms/gnome-system-monitor/devel gnome-system-monitor.spec, 1.133,
	1.134
Message-ID: <20090120185108.706D9700F9@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-system-monitor/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9564

Modified Files:
	gnome-system-monitor.spec 
Log Message:
libtool ftw



Index: gnome-system-monitor.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-system-monitor/devel/gnome-system-monitor.spec,v
retrieving revision 1.133
retrieving revision 1.134
diff -u -r1.133 -r1.134
--- gnome-system-monitor.spec	20 Jan 2009 18:36:44 -0000	1.133
+++ gnome-system-monitor.spec	20 Jan 2009 18:50:38 -0000	1.134
@@ -66,7 +66,7 @@
 %patch1 -p1 -b .session
 
 %build
-autoreconf
+autoreconf -i -f
 %configure --enable-selinux --disable-scrollkeeper --enable-polkit
 # dunno why the deps are not picked up correctly here
 make -C src gnome-system-monitor-mechanism-glue.h gnome-system-monitor-mechanism-client-glue.h



From mclasen at fedoraproject.org  Tue Jan 20 18:56:59 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 20 Jan 2009 18:56:59 +0000 (UTC)
Subject: rpms/tomboy/devel .cvsignore, 1.37, 1.38 sources, 1.37,
	1.38 tomboy.spec, 1.101, 1.102
Message-ID: <20090120185659.628C0700F9@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/tomboy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10377

Modified Files:
	.cvsignore sources tomboy.spec 
Log Message:
0.13.3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/tomboy/devel/.cvsignore,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- .cvsignore	17 Dec 2008 17:13:38 -0000	1.37
+++ .cvsignore	20 Jan 2009 18:56:28 -0000	1.38
@@ -1 +1 @@
-tomboy-0.13.2.tar.bz2
+tomboy-0.13.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tomboy/devel/sources,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- sources	17 Dec 2008 17:13:38 -0000	1.37
+++ sources	20 Jan 2009 18:56:28 -0000	1.38
@@ -1 +1 @@
-376e04b00ddbef1b8429b71a9a27c8e5  tomboy-0.13.2.tar.bz2
+05513c92f63da9bbc59b34cf5b5c26e8  tomboy-0.13.3.tar.bz2


Index: tomboy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tomboy/devel/tomboy.spec,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -r1.101 -r1.102
--- tomboy.spec	18 Dec 2008 03:21:51 -0000	1.101
+++ tomboy.spec	20 Jan 2009 18:56:28 -0000	1.102
@@ -1,6 +1,6 @@
 Name:           tomboy
-Version:        0.13.2
-Release: 	3%{?dist}
+Version:        0.13.3
+Release: 	1%{?dist}
 Summary:        Note-taking application
 
 Group:          User Interface/Desktops
@@ -135,6 +135,9 @@
 
 
 %changelog
+* Tue Jan 20 2009 Matthias Clasen <mclasen at redhat.com> - 0.13.3-1
+- Update to 0.13.3
+
 * Wed Dec 17 2008 Matthias Clasen <mclasen at redhat.com> - 0.13.2-3
 - Update to 0.13.2
 



From mclasen at fedoraproject.org  Tue Jan 20 18:57:02 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 20 Jan 2009 18:57:02 +0000 (UTC)
Subject: rpms/gok/devel gok.spec,1.66,1.67
Message-ID: <20090120185702.3E32E700F9@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gok/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10428

Modified Files:
	gok.spec 
Log Message:
fix BRs



Index: gok.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gok/devel/gok.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- gok.spec	20 Jan 2009 18:50:32 -0000	1.66
+++ gok.spec	20 Jan 2009 18:56:32 -0000	1.67
@@ -3,7 +3,7 @@
 Summary: GNOME Onscreen Keyboard
 Name: gok
 Version: 2.25.3
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: LGPLv2+
 Group: Desktop/Accessibility
 URL: http://www.gok.ca/
@@ -137,7 +137,7 @@
 %{_datadir}/gtk-doc/html/gok
 
 %changelog
-* Tue Jan 20 2009 Matthias Clasen <mclasen at redhat.com> - 2.25.3-1
+* Tue Jan 20 2009 Matthias Clasen <mclasen at redhat.com> - 2.25.3-2
 - Update to 2.25.3
 
 * Wed Dec  3 2008 Matthias Clasen <mclasen at redhat.com> - 2.25.2-1



From turki at fedoraproject.org  Tue Jan 20 19:00:24 2009
From: turki at fedoraproject.org (Nikolay Vladimirov)
Date: Tue, 20 Jan 2009 19:00:24 +0000 (UTC)
Subject: rpms/libntlm/EL-5 .cvsignore, 1.2, 1.3 libntlm.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <20090120190024.6BC13700F9@cvs1.fedora.phx.redhat.com>

Author: turki

Update of /cvs/pkgs/rpms/libntlm/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11113

Modified Files:
	.cvsignore libntlm.spec sources 
Log Message:
Initial commit for EPEL5


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libntlm/EL-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	26 Jun 2007 00:28:00 -0000	1.2
+++ .cvsignore	20 Jan 2009 18:59:53 -0000	1.3
@@ -1 +1 @@
-libntlm-0.3.13.tar.gz
+libntlm-1.0.tar.gz


Index: libntlm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libntlm/EL-5/libntlm.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libntlm.spec	26 Jun 2007 00:28:00 -0000	1.1
+++ libntlm.spec	20 Jan 2009 18:59:53 -0000	1.2
@@ -1,10 +1,10 @@
 Name:           libntlm
-Version:        0.3.13 
-Release:        3%{?dist}
+Version:        1.0
+Release:        1%{?dist}
 Summary:        NTLM authentication library 
 
 Group:          System Environment/Libraries
-License:        LGPL
+License:        LGPLv2+
 URL:            http://josefsson.org/libntlm/
 Source0:        http://josefsson.org/libntlm/releases/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -65,12 +65,5 @@
 
 
 %changelog
-* Thu Jun 21 2007 Nikolay Vladimirov <nikolay at vladimiroff.com> - 0.3.13-3
-- minor mixed-use-of-spaces-and-tabs fix
-* Thu Jun 21 2007 Nikolay Vladimirov <nikolay at vladimiroff.com> - 0.3.13-2
-- fixed summary
-- fixed requires and buildrequires for pkgconfig
-- fixed the timestamp of ntlm.h
-* Wed Jun 20 2007 Nikolay Vladimirov <nikolay at vladimiroff.com> - 0.3.13-1
-- initial release
-
+* Tue Jan 20 2009 Nikolay Vladimirov <nikolay at vladimiroff.com> - 1.0-1
+- initial EL-5 build


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libntlm/EL-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	26 Jun 2007 00:28:00 -0000	1.2
+++ sources	20 Jan 2009 18:59:53 -0000	1.3
@@ -1 +1 @@
-14e8aa077e032ae353b885a6d82ee668  libntlm-0.3.13.tar.gz
+83dc36023ce36de0f0d2f98294c040c1  libntlm-1.0.tar.gz



From mclasen at fedoraproject.org  Tue Jan 20 19:01:13 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 20 Jan 2009 19:01:13 +0000 (UTC)
Subject: rpms/eog/devel .cvsignore, 1.75, 1.76 eog.spec, 1.135, 1.136 sources,
	1.75, 1.76
Message-ID: <20090120190113.0096A700F9@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/eog/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10927

Modified Files:
	.cvsignore eog.spec sources 
Log Message:
2.25.5



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/eog/devel/.cvsignore,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- .cvsignore	6 Jan 2009 16:17:15 -0000	1.75
+++ .cvsignore	20 Jan 2009 19:00:42 -0000	1.76
@@ -1 +1 @@
-eog-2.25.4.tar.bz2
+eog-2.25.5.tar.bz2


Index: eog.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eog/devel/eog.spec,v
retrieving revision 1.135
retrieving revision 1.136
diff -u -r1.135 -r1.136
--- eog.spec	6 Jan 2009 16:17:15 -0000	1.135
+++ eog.spec	20 Jan 2009 19:00:42 -0000	1.136
@@ -12,7 +12,7 @@
 
 Summary: Eye of GNOME image viewer
 Name:    eog
-Version: 2.25.4
+Version: 2.25.5
 Release: 1%{?dist}
 URL: http://projects.gnome.org/eog/
 Source: http://download.gnome.org/sources/eog/2.25/%{name}-%{version}.tar.bz2
@@ -24,7 +24,6 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 BuildRequires: glib2-devel >= %{glib2_version}
 BuildRequires: gtk2-devel >= %{gtk2_version}
-BuildRequires: libgnomeui-devel >= %{libgnomeui_version}
 BuildRequires: libglade2-devel >= %{libglade_version}
 BuildRequires: gail-devel >= %{gail_version}
 BuildRequires: gnome-vfs2-devel >= %{gnome_vfs2_version}
@@ -68,9 +67,7 @@
 Requires: pkgconfig
 Requires: gtk-doc
 Requires: gtk2-devel
-Requires: libgnomeui-devel
 Requires: libglade2-devel
-Requires: gnome-vfs2-devel
 Requires: GConf2-devel
 
 %description devel
@@ -181,6 +178,9 @@
 %{_datadir}/gtk-doc/html/eog
 
 %changelog
+* Tue Jan 20 2009 Matthias Clasen <mclasen at redhat.com> - 2.25.5-1
+- Update to 2.25.5
+
 * Tue Jan  6 2009 Matthias Clasen <mclasen at redhat.com> - 2.25.4-1
 - Update to 2.25.4
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eog/devel/sources,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- sources	6 Jan 2009 16:17:15 -0000	1.75
+++ sources	20 Jan 2009 19:00:42 -0000	1.76
@@ -1 +1 @@
-9fd02dae4c731e2fe2fb16ae8c09baf3  eog-2.25.4.tar.bz2
+cb6c2be6a4e97b8047c15f6e8b705f13  eog-2.25.5.tar.bz2



From mclasen at fedoraproject.org  Tue Jan 20 19:02:16 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 20 Jan 2009 19:02:16 +0000 (UTC)
Subject: rpms/file-roller/devel .cvsignore, 1.80, 1.81 file-roller.spec,
	1.139, 1.140 sources, 1.80, 1.81
Message-ID: <20090120190216.299CC700F9@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/file-roller/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11599

Modified Files:
	.cvsignore file-roller.spec sources 
Log Message:
2.25.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/file-roller/devel/.cvsignore,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- .cvsignore	6 Jan 2009 07:08:37 -0000	1.80
+++ .cvsignore	20 Jan 2009 19:01:45 -0000	1.81
@@ -1 +1 @@
-file-roller-2.25.1.tar.bz2
+file-roller-2.25.2.tar.bz2


Index: file-roller.spec
===================================================================
RCS file: /cvs/pkgs/rpms/file-roller/devel/file-roller.spec,v
retrieving revision 1.139
retrieving revision 1.140
diff -u -r1.139 -r1.140
--- file-roller.spec	6 Jan 2009 07:46:33 -0000	1.139
+++ file-roller.spec	20 Jan 2009 19:01:45 -0000	1.140
@@ -10,8 +10,8 @@
 
 Summary:	Tool for viewing and creating archives
 Name:		file-roller
-Version:	2.25.1
-Release: 	5%{?dist}
+Version:	2.25.2
+Release: 	1%{?dist}
 License:	GPLv2+
 Group:		Applications/Archiving
 URL:		http://download.gnome.org/sources/file-roller/
@@ -129,6 +129,9 @@
 %{_datadir}/icons/hicolor/scalable/apps/file-roller.svg
 
 %changelog
+* Tue Jan 20 2009 Matthias Clasen <mclasen at redhat.com> - 2.25.2-1
+- Update to 2.25.2
+
 * Tue Jan  6 2009 Matthias Clasen <mclasen at redhat.com> - 2.25.1-5
 - Update to 2.25.1
 - Clean up BRs


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/file-roller/devel/sources,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- sources	6 Jan 2009 07:08:37 -0000	1.80
+++ sources	20 Jan 2009 19:01:45 -0000	1.81
@@ -1 +1 @@
-75efc66b734e8accee40353fc7a6fa62  file-roller-2.25.1.tar.bz2
+558a4a649192dd4650892b2ec7d03959  file-roller-2.25.2.tar.bz2



From toshio at fedoraproject.org  Tue Jan 20 19:14:13 2009
From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=)
Date: Tue, 20 Jan 2009 19:14:13 +0000 (UTC)
Subject: rpms/python-sqlalchemy/F-10 .cvsignore, 1.22,
	1.23 python-sqlalchemy.spec, 1.34, 1.35 sources, 1.23, 1.24
Message-ID: <20090120191413.A5F54700F9@cvs1.fedora.phx.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/python-sqlalchemy/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12726/F-10

Modified Files:
	.cvsignore python-sqlalchemy.spec sources 
Log Message:

* Tue Jan 20 2009 Toshio Kuratomi <toshio at fedoraproject.org> 0.4.8-1
- Update to 0.4.8 which fixes bz#478519



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-sqlalchemy/F-10/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- .cvsignore	27 Jul 2008 22:42:17 -0000	1.22
+++ .cvsignore	20 Jan 2009 19:13:43 -0000	1.23
@@ -1 +1 @@
-SQLAlchemy-0.4.7.tar.gz
+SQLAlchemy-0.4.8.tar.gz


Index: python-sqlalchemy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-sqlalchemy/F-10/python-sqlalchemy.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- python-sqlalchemy.spec	27 Jul 2008 22:42:17 -0000	1.34
+++ python-sqlalchemy.spec	20 Jan 2009 19:13:43 -0000	1.35
@@ -4,7 +4,7 @@
 %define srcname SQLAlchemy
 
 Name:           python-sqlalchemy
-Version:        0.4.7
+Version:        0.4.8
 Release:        1%{?dist}
 Summary:        Modular and flexible ORM library for python
 
@@ -56,6 +56,9 @@
 %{python_sitelib}/*
 
 %changelog
+* Tue Jan 20 2009 Toshio Kuratomi <toshio at fedoraproject.org> 0.4.8-1
+- Update to 0.4.8 which fixes bz#478519
+
 * Sun Jul 27 2008 Toshio Kuratomi <toshio at fedoraproject.org> 0.4.7-1
 - Update to 0.4.7.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-sqlalchemy/F-10/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sources	27 Jul 2008 22:42:17 -0000	1.23
+++ sources	20 Jan 2009 19:13:43 -0000	1.24
@@ -1 +1 @@
-05ca8a49c3e34fa2ed4d679c640ec65d  SQLAlchemy-0.4.7.tar.gz
+2377e8f87d60e5040e2efc67bfd240b0  SQLAlchemy-0.4.8.tar.gz



From mclasen at fedoraproject.org  Tue Jan 20 19:14:06 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 20 Jan 2009 19:14:06 +0000 (UTC)
Subject: rpms/eog/devel eog.spec,1.136,1.137
Message-ID: <20090120191406.0C6DB700F9@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/eog/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12749

Modified Files:
	eog.spec 
Log Message:
2.25.5



Index: eog.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eog/devel/eog.spec,v
retrieving revision 1.136
retrieving revision 1.137
diff -u -r1.136 -r1.137
--- eog.spec	20 Jan 2009 19:00:42 -0000	1.136
+++ eog.spec	20 Jan 2009 19:13:35 -0000	1.137
@@ -41,8 +41,6 @@
 BuildRequires: gnome-icon-theme >= %{gnome_icon_theme_version}
 BuildRequires: libXt-devel
 BuildRequires: libxml2-devel
-# for libxml.patch
-BuildRequires: autoconf, automake libtool
 
 Requires(post): desktop-file-utils >= %{desktop_file_utils_version}
 Requires(post): scrollkeeper
@@ -77,10 +75,6 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .libxml
-
-# Patch 0 patches configure.ac
-autoconf
 
 echo "NoDisplay=true" >> data/eog.desktop.in
 # just in case



From toshio at fedoraproject.org  Tue Jan 20 19:14:13 2009
From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=)
Date: Tue, 20 Jan 2009 19:14:13 +0000 (UTC)
Subject: rpms/python-sqlalchemy/F-9 .cvsignore, 1.22,
	1.23 python-sqlalchemy.spec, 1.34, 1.35 sources, 1.23, 1.24
Message-ID: <20090120191413.EDF48700F9@cvs1.fedora.phx.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/python-sqlalchemy/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12726/F-9

Modified Files:
	.cvsignore python-sqlalchemy.spec sources 
Log Message:

* Tue Jan 20 2009 Toshio Kuratomi <toshio at fedoraproject.org> 0.4.8-1
- Update to 0.4.8 which fixes bz#478519



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-sqlalchemy/F-9/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- .cvsignore	27 Jul 2008 22:53:23 -0000	1.22
+++ .cvsignore	20 Jan 2009 19:13:43 -0000	1.23
@@ -1 +1 @@
-SQLAlchemy-0.4.7.tar.gz
+SQLAlchemy-0.4.8.tar.gz


Index: python-sqlalchemy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-sqlalchemy/F-9/python-sqlalchemy.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- python-sqlalchemy.spec	27 Jul 2008 22:53:23 -0000	1.34
+++ python-sqlalchemy.spec	20 Jan 2009 19:13:43 -0000	1.35
@@ -4,7 +4,7 @@
 %define srcname SQLAlchemy
 
 Name:           python-sqlalchemy
-Version:        0.4.7
+Version:        0.4.8
 Release:        1%{?dist}
 Summary:        Modular and flexible ORM library for python
 
@@ -56,6 +56,9 @@
 %{python_sitelib}/*
 
 %changelog
+* Tue Jan 20 2009 Toshio Kuratomi <toshio at fedoraproject.org> 0.4.8-1
+- Update to 0.4.8 which fixes bz#478519
+
 * Sun Jul 27 2008 Toshio Kuratomi <toshio at fedoraproject.org> 0.4.7-1
 - Update to 0.4.7.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-sqlalchemy/F-9/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sources	27 Jul 2008 22:53:23 -0000	1.23
+++ sources	20 Jan 2009 19:13:43 -0000	1.24
@@ -1 +1 @@
-05ca8a49c3e34fa2ed4d679c640ec65d  SQLAlchemy-0.4.7.tar.gz
+2377e8f87d60e5040e2efc67bfd240b0  SQLAlchemy-0.4.8.tar.gz



From hadess at fedoraproject.org  Tue Jan 20 19:15:44 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Tue, 20 Jan 2009 19:15:44 +0000 (UTC)
Subject: rpms/gstreamer-plugins-base/devel gstreamer-plugins-base.spec, 1.69,
	1.70
Message-ID: <20090120191544.82FED700F9@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-serv12873

Modified Files:
	gstreamer-plugins-base.spec 
Log Message:
multichannel-enumtypes.h is gone now



Index: gstreamer-plugins-base.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamer-plugins-base/devel/gstreamer-plugins-base.spec,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- gstreamer-plugins-base.spec	20 Jan 2009 16:20:15 -0000	1.69
+++ gstreamer-plugins-base.spec	20 Jan 2009 19:15:14 -0000	1.70
@@ -155,7 +155,6 @@
 %{_includedir}/gstreamer-%{majorminor}/gst/audio/gstbaseaudiosrc.h
 %{_includedir}/gstreamer-%{majorminor}/gst/audio/gstringbuffer.h
 %{_includedir}/gstreamer-%{majorminor}/gst/audio/mixerutils.h
-%{_includedir}/gstreamer-%{majorminor}/gst/audio/multichannel-enumtypes.h
 %{_includedir}/gstreamer-%{majorminor}/gst/audio/multichannel.h
 %dir %{_includedir}/gstreamer-%{majorminor}/gst/cdda
 %{_includedir}/gstreamer-%{majorminor}/gst/cdda/gstcddabasesrc.h



From mclasen at fedoraproject.org  Tue Jan 20 19:18:40 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 20 Jan 2009 19:18:40 +0000 (UTC)
Subject: rpms/gnome-applets/devel .cvsignore, 1.74, 1.75 gnome-applets.spec, 
	1.321, 1.322 sources, 1.83, 1.84
Message-ID: <20090120191840.F34B670141@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-applets/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13225

Modified Files:
	.cvsignore gnome-applets.spec sources 
Log Message:
2.25.4



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-applets/devel/.cvsignore,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- .cvsignore	6 Jan 2009 18:22:32 -0000	1.74
+++ .cvsignore	20 Jan 2009 19:18:10 -0000	1.75
@@ -1 +1 @@
-gnome-applets-2.25.3.tar.bz2
+gnome-applets-2.25.4.tar.bz2


Index: gnome-applets.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-applets/devel/gnome-applets.spec,v
retrieving revision 1.321
retrieving revision 1.322
diff -u -r1.321 -r1.322
--- gnome-applets.spec	11 Jan 2009 19:24:13 -0000	1.321
+++ gnome-applets.spec	20 Jan 2009 19:18:10 -0000	1.322
@@ -34,8 +34,8 @@
 
 Summary:        Small applications for the GNOME panel
 Name:		gnome-applets
-Version:	2.25.3
-Release: 	3%{?dist}
+Version:	2.25.4
+Release: 	1%{?dist}
 Epoch:          1
 License:	GPLv2+ and GFDL
 Group:          User Interface/Desktops
@@ -58,9 +58,6 @@
 # do the nullapplet dance for battstat
 Patch40:	gnome-applets-null-battstat.patch
 
-# still doesn't build !@#$!%#
-Patch41:	mini-commander.patch
-
 BuildRequires:  glib2-devel >= %{glib2_version}
 BuildRequires:  gtk2-devel >= %{gtk2_version}
 BuildRequires:  libgnomeui-devel >= %{libgnomeui_version}
@@ -152,8 +149,6 @@
 %patch3 -p1 -b .ppp-command
 %patch34 -p1 -b .ppp-includes
 
-%patch41 -p1 -b .mini-commander
-
 intltoolize --force
 autoreconf
 
@@ -339,6 +334,9 @@
 %{_datadir}/PolicyKit/policy/org.gnome.cpufreqselector.policy
 
 %changelog
+* Tue Jan 20 2009 Matthias Clasen <mclasen at redhat.com> - 1:2.25.4-1
+- Update to 2.25.4
+
 * Sun Jan 11 2009 Matthias Clasen <mclasen at redhat.com> - 1:2.25.3-3
 - Fix the nullappletification of the mixer applet
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-applets/devel/sources,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- sources	6 Jan 2009 20:02:32 -0000	1.83
+++ sources	20 Jan 2009 19:18:10 -0000	1.84
@@ -1,2 +1,2 @@
-ddd99d0281df4fa4458408e6cdd19cd1  gnome-applets-2.25.3.tar.bz2
+a9e69b2625137950a175d1e1d134f81e  gnome-applets-2.25.4.tar.bz2
 ccd89d3a58076214e2f34216388c9621  gnome-applets-2.9.3.1-modemlights.tar.bz2



From pkgdb at fedoraproject.org  Tue Jan 20 19:22:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Jan 2009 19:22:06 +0000
Subject: [pkgdb] libifp had acl change status
Message-ID: <20090120192206.20B2C208470@bastion.fedora.phx.redhat.com>

abompard has set the watchbugzilla acl on libifp (Fedora 10) to Approved for linuxpham

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libifp



From pkgdb at fedoraproject.org  Tue Jan 20 19:22:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Jan 2009 19:22:08 +0000
Subject: [pkgdb] libifp had acl change status
Message-ID: <20090120192208.E05FF208473@bastion.fedora.phx.redhat.com>

abompard has set the watchcommits acl on libifp (Fedora 10) to Approved for linuxpham

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libifp



From jakub at fedoraproject.org  Tue Jan 20 19:25:03 2009
From: jakub at fedoraproject.org (Jakub Jelinek)
Date: Tue, 20 Jan 2009 19:25:03 +0000 (UTC)
Subject: rpms/gcc/devel gcc.spec,1.4,1.5
Message-ID: <20090120192503.A72BA700F9@cvs1.fedora.phx.redhat.com>

Author: jakub

Update of /cvs/pkgs/rpms/gcc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14600

Modified Files:
	gcc.spec 
Log Message:
4.4.0-0.4


Index: gcc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/devel/gcc.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gcc.spec	17 Jan 2009 23:16:41 -0000	1.4
+++ gcc.spec	20 Jan 2009 19:24:33 -0000	1.5
@@ -486,15 +486,9 @@
 mkdir gnat_hacks
 cd gnat_hacks
 tar xjf %{SOURCE100}
+sed -i -e 's/gnat\*)/gnat*|*.ad[sb]\\ *|*.ad[sb])/' bin/gcc
 export PATH=`pwd`/bin${PATH:+:$PATH}
 cd ..
-which gcc
-gnatgcc --version || :
-gcc --version || :
-gcc --version -gnatg || :
-gnatgcc -print-multi-os-directory || :
-gcc -print-multi-os-directory || :
-gcc -print-multi-os-directory -gnatg || :
 %endif
 
 %if %{build_java}
@@ -1728,7 +1722,7 @@
 %doc rpm.doc/changelogs/libmudflap/ChangeLog*
 
 %changelog
-* Sat Jan 17 2009 Jakub Jelinek <jakub at redhat.com> 4.4.0-0.4
+* Tue Jan 20 2009 Jakub Jelinek <jakub at redhat.com> 4.4.0-0.4
 - attempt to enable Ada support on ppc64
 
 * Fri Jan 16 2009 Jakub Jelinek <jakub at redhat.com> 4.4.0-0.3



From jakub at fedoraproject.org  Tue Jan 20 19:28:38 2009
From: jakub at fedoraproject.org (Jakub Jelinek)
Date: Tue, 20 Jan 2009 19:28:38 +0000 (UTC)
Subject: rpms/gcc/devel gcc.spec,1.5,1.6
Message-ID: <20090120192838.429D9700F9@cvs1.fedora.phx.redhat.com>

Author: jakub

Update of /cvs/pkgs/rpms/gcc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15114

Modified Files:
	gcc.spec 
Log Message:
4.4.0-0.5


Index: gcc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/devel/gcc.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- gcc.spec	20 Jan 2009 19:24:33 -0000	1.5
+++ gcc.spec	20 Jan 2009 19:28:07 -0000	1.6
@@ -3,7 +3,7 @@
 %define gcc_version 4.4.0
 # 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 0.4
+%define gcc_release 0.5
 %define _unpackaged_files_terminate_build 0
 %define multilib_64_archs sparc64 ppc64 s390x x86_64
 %define include_gappletviewer 1
@@ -1722,7 +1722,7 @@
 %doc rpm.doc/changelogs/libmudflap/ChangeLog*
 
 %changelog
-* Tue Jan 20 2009 Jakub Jelinek <jakub at redhat.com> 4.4.0-0.4
+* Tue Jan 20 2009 Jakub Jelinek <jakub at redhat.com> 4.4.0-0.5
 - attempt to enable Ada support on ppc64
 
 * Fri Jan 16 2009 Jakub Jelinek <jakub at redhat.com> 4.4.0-0.3



From georgiou at fedoraproject.org  Tue Jan 20 19:31:23 2009
From: georgiou at fedoraproject.org (Kostas Georgiou)
Date: Tue, 20 Jan 2009 19:31:23 +0000 (UTC)
Subject: rpms/ganglia/devel ganglia.spec, 1.23, 1.24 gmetad-bof-dos.patch,
	1.1, 1.2
Message-ID: <20090120193123.78D4C700F9@cvs1.fedora.phx.redhat.com>

Author: georgiou

Update of /cvs/extras/rpms/ganglia/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15332

Modified Files:
	ganglia.spec gmetad-bof-dos.patch 
Log Message:
Additional security fixes from #480236



Index: ganglia.spec
===================================================================
RCS file: /cvs/extras/rpms/ganglia/devel/ganglia.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- ganglia.spec	14 Jan 2009 21:14:20 -0000	1.23
+++ ganglia.spec	20 Jan 2009 19:30:52 -0000	1.24
@@ -1,6 +1,6 @@
 Name:               ganglia
 Version:            3.1.1
-Release:            3%{?svnrev:.r%{svnrev}}%{?dist}
+Release:            4%{?svnrev:.r%{svnrev}}%{?dist}
 Summary:            Ganglia Distributed Monitoring System
 
 Group:              Applications/Internet
@@ -271,6 +271,10 @@
 %{_datadir}/%{name}
 
 %changelog
+* Tue Jan 20 2009 Kostas Georgiou <k.georgiou at imperial.ac.uk> - 3.1.1-4
+- [480236] Updated patch for the buffer overflow from upstream with
+  additional fixes
+
 * Wed Jan 14 2009 Kostas Georgiou <k.georgiou at imperial.ac.uk> - 3.1.1-3
 - Fix for gmetad server buffer overflow
 - The private_clusters file should not be readable by everyone

gmetad-bof-dos.patch:

Index: gmetad-bof-dos.patch
===================================================================
RCS file: /cvs/extras/rpms/ganglia/devel/gmetad-bof-dos.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gmetad-bof-dos.patch	14 Jan 2009 21:14:21 -0000	1.1
+++ gmetad-bof-dos.patch	20 Jan 2009 19:30:53 -0000	1.2
@@ -1,5 +1,5 @@
---- gmetad/server.c.orig	2009-01-09 00:30:10.000000000 +0800
-+++ gmetad/server.c	2009-01-09 00:42:52.000000000 +0800
+--- gmetad/server.c.orig
++++ gmetad/server.c
 @@ -11,6 +11,7 @@
  #include "dtd.h"
  #include "gmetad.h"
@@ -8,7 +8,15 @@
  
  extern g_tcp_socket *server_socket;
  extern pthread_mutex_t  server_socket_mutex;
-@@ -377,7 +378,7 @@
+@@ -370,14 +371,13 @@ tree_report(datum_t *key, datum_t *val, void *arg)
+    
+ /* sacerdoti: This function does a tree walk while respecting the filter path.
+  * Will return valid XML even if we have chosen a subtree. Since tree depth is
+- * bounded, this function guarantees O(1) search time. The recursive structure 
+- * does not require any memory allocations. 
++ * bounded, this function guarantees O(1) search time.
+  */
+ static int
  process_path (client_t *client, char *path, datum_t *myroot, datum_t *key)
  {
     char *p, *q, *pathend;
@@ -17,16 +25,18 @@
     int rc, len;
     datum_t *found;
     datum_t findkey;
-@@ -419,6 +420,8 @@
+@@ -419,6 +419,10 @@ process_path (client_t *client, char *path, datum_t *myroot, datum_t *key)
           if (!q) q=pathend;
        
           len = q-p;
-+         /* +1 not needed as q-p is already accounting for that */
-+         element = malloc(len);
++         element = malloc(len + 1);
++         if ( element == NULL )
++             return 1;
++
           strncpy(element, p, len);
           element[len] = '\0';
        
-@@ -435,10 +438,13 @@
+@@ -435,10 +439,13 @@ process_path (client_t *client, char *path, datum_t *myroot, datum_t *key)
                 rc = process_path(client, q, found, &findkey);
                 
                 datum_free(found);
@@ -41,7 +51,16 @@
              }
        }
     if (rc) return 1;
-@@ -600,8 +606,8 @@
+@@ -537,7 +544,7 @@ server_thread (void *arg)
+    socklen_t len;
+    client_t client;
+    char remote_ip[16];
+-   char request[REQUESTLEN];
++   char request[REQUESTLEN + 1];
+    llist_entry *le;
+    datum_t rootdatum;
+ 
+@@ -600,8 +607,8 @@ server_thread (void *arg)
                 if (process_request(&client, request))
                    {
                       err_msg("Got a malformed path request from %s", remote_ip);



From mclasen at fedoraproject.org  Tue Jan 20 19:38:22 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 20 Jan 2009 19:38:22 +0000 (UTC)
Subject: rpms/gnome-panel/devel .cvsignore, 1.87, 1.88 applet-error.patch,
	1.2, 1.3 gnome-panel.spec, 1.341, 1.342 sources, 1.90, 1.91
Message-ID: <20090120193822.A0141700F9@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-panel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16203

Modified Files:
	.cvsignore applet-error.patch gnome-panel.spec sources 
Log Message:
drop lost of patches



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-panel/devel/.cvsignore,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -r1.87 -r1.88
--- .cvsignore	18 Dec 2008 00:07:30 -0000	1.87
+++ .cvsignore	20 Jan 2009 19:37:52 -0000	1.88
@@ -1 +1 @@
-gnome-panel-2.25.3.tar.bz2
+gnome-panel-2.25.5.tar.bz2

applet-error.patch:

Index: applet-error.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-panel/devel/applet-error.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- applet-error.patch	14 Feb 2008 02:13:40 -0000	1.2
+++ applet-error.patch	20 Jan 2009 19:37:52 -0000	1.3
@@ -1,7 +1,7 @@
-diff -up gnome-panel-2.21.91/gnome-panel/panel-applet-frame.c.applet-error gnome-panel-2.21.91/gnome-panel/panel-applet-frame.c
---- gnome-panel-2.21.91/gnome-panel/panel-applet-frame.c.applet-error	2008-02-11 16:15:47.000000000 -0500
-+++ gnome-panel-2.21.91/gnome-panel/panel-applet-frame.c	2008-02-13 20:35:59.000000000 -0500
-@@ -1242,6 +1242,21 @@ panel_applet_frame_event_listener (Bonob
+diff -up gnome-panel-2.25.5/gnome-panel/panel-applet-frame.c.applet-error gnome-panel-2.25.5/gnome-panel/panel-applet-frame.c
+--- gnome-panel-2.25.5/gnome-panel/panel-applet-frame.c.applet-error	2009-01-20 09:04:47.000000000 -0500
++++ gnome-panel-2.25.5/gnome-panel/panel-applet-frame.c	2009-01-20 14:22:33.000000000 -0500
+@@ -1246,6 +1246,21 @@ panel_applet_frame_event_listener (Bonob
  		panel_applet_frame_set_size_hints_from_any (frame, any);
  }
  
@@ -23,14 +23,14 @@
  static void
  panel_applet_frame_activated (CORBA_Object  object,
  			      const char   *error_reason,
-@@ -1266,7 +1281,9 @@ panel_applet_frame_activated (CORBA_Obje
- 	if (error_reason != NULL || object == CORBA_OBJECT_NIL) {
- 		g_warning (G_STRLOC ": failed to load applet %s:\n%s",
- 			   frame->priv->iid, error_reason);
--		panel_applet_frame_loading_failed (frame, frame_act->id);
-+		if (!in_default_panel_config (frame_act->id)) {
-+			panel_applet_frame_loading_failed (frame, frame_act->id);
-+		}
- 		g_free (frame_act->id);
- 		g_free (frame_act);
- 		return;
+@@ -1425,7 +1440,9 @@ panel_applet_frame_activated (CORBA_Obje
+ 	return;
+ 
+ error_out:
+-	panel_applet_frame_loading_failed (frame, frame_act->id);
++	if (!in_default_panel_config (frame_act->id)) {
++		panel_applet_frame_loading_failed (frame, frame_act->id);
++	}
+ 	if (widget)
+ 		g_object_unref (widget);
+ 	panel_applet_stop_loading (frame_act->id);


Index: gnome-panel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-panel/devel/gnome-panel.spec,v
retrieving revision 1.341
retrieving revision 1.342
diff -u -r1.341 -r1.342
--- gnome-panel.spec	16 Jan 2009 19:26:05 -0000	1.341
+++ gnome-panel.spec	20 Jan 2009 19:37:52 -0000	1.342
@@ -22,8 +22,8 @@
 
 Summary: GNOME panel
 Name: gnome-panel
-Version: 2.25.3
-Release: 5%{?dist}
+Version: 2.25.5
+Release: 1%{?dist}
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/gnome-panel/2.25/%{name}-%{version}.tar.bz2
 
@@ -113,15 +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.1-smoother-slide-in.patch
-
-# http://bugzilla.gnome.org/show_bug.cgi?id=536915
-Patch26: gnome-panel-2.24.0-hide-shutdown-if-unavailable.patch
-
 Patch35: clock-wakeups.patch
-# http://bugzilla.gnome.org/show_bug.cgi?id=555710
-Patch36: tryexec.patch
 
 Conflicts: gnome-power-manager < 2.15.3
 
@@ -168,10 +160,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
-%patch26 -p1 -b .hide-shutdown-item-if-unavailable
 %patch35 -p1 -b .clock-wakeups
-%patch36 -p1 -b .tryexec
 
 libtoolize --force --copy
 
@@ -373,6 +362,9 @@
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Tue Jan 20 2009 Matthias Clasen <mclasen at redhat.com> - 2.25.5-1
+- Update to 2.25.5
+
 * Fri Jan 16 2009 Matthias Clasen <mclasen at redhat.com> - 2.25.3-4
 - And don't write %s into desktop files
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-panel/devel/sources,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -r1.90 -r1.91
--- sources	18 Dec 2008 00:07:30 -0000	1.90
+++ sources	20 Jan 2009 19:37:52 -0000	1.91
@@ -1 +1 @@
-72173f5fe7775cf9c432e2e60ef856df  gnome-panel-2.25.3.tar.bz2
+ca67bbaa5e109d8e86424e2ace8e8683  gnome-panel-2.25.5.tar.bz2



From jjohnstn at fedoraproject.org  Tue Jan 20 19:39:09 2009
From: jjohnstn at fedoraproject.org (Jeff Johnston)
Date: Tue, 20 Jan 2009 19:39:09 +0000 (UTC)
Subject: rpms/eclipse-changelog/F-10 eclipse-changelog-post-2_6_6.patch, NONE,
	1.1 .cvsignore, 1.20, 1.21 eclipse-changelog.spec, 1.74,
	1.75 fetch-changelog.sh, 1.2, 1.3 sources, 1.29, 1.30
Message-ID: <20090120193909.1D037700F9@cvs1.fedora.phx.redhat.com>

Author: jjohnstn

Update of /cvs/pkgs/rpms/eclipse-changelog/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16294

Modified Files:
	.cvsignore eclipse-changelog.spec fetch-changelog.sh sources 
Added Files:
	eclipse-changelog-post-2_6_6.patch 
Log Message:

 Mon Jan 19 2009 Jeff Johnston <jjohnstn at redhat.com> 2.6.6-1
- 2.6.6.
- Fixes #260719, #260722, #261694, #261379




eclipse-changelog-post-2_6_6.patch:

--- NEW FILE eclipse-changelog-post-2_6_6.patch ---
diff -up ./src/org/eclipse/linuxtools/changelog/core/actions/PrepareChangeLogAction.java.fix ./src/org/eclipse/linuxtools/changelog/core/actions/PrepareChangeLogAction.java
--- ./src/org/eclipse/linuxtools/changelog/core/actions/PrepareChangeLogAction.java.fix	2009-01-20 14:30:41.000000000 -0500
+++ ./src/org/eclipse/linuxtools/changelog/core/actions/PrepareChangeLogAction.java	2009-01-20 14:33:26.000000000 -0500
@@ -359,8 +359,10 @@ public class PrepareChangeLogAction exte
 		int unitwork = 250 / patchFileInfoList.length;
 		for (PatchFile pf: patchFileInfoList) {
 			// for each file
-			String[] funcGuessList = guessFunctionNames(pf);
-			outputMultipleEntryChangeLog(pf, funcGuessList);
+			if (pf != null) { // changes to ChangeLogs will have null entries
+				String[] funcGuessList = guessFunctionNames(pf);
+				outputMultipleEntryChangeLog(pf, funcGuessList);
+			}
 			monitor.worked(unitwork);
 		}
 	}
@@ -543,4 +545,4 @@ public class PrepareChangeLogAction exte
 		}
 		return fnames;
 	}
-}
\ No newline at end of file
+}
diff -up ./src/org/eclipse/linuxtools/changelog/core/editors/ChangeLogDocumentProvider.java.fix ./src/org/eclipse/linuxtools/changelog/core/editors/ChangeLogDocumentProvider.java
--- ./src/org/eclipse/linuxtools/changelog/core/editors/ChangeLogDocumentProvider.java.fix	2009-01-20 14:30:56.000000000 -0500
+++ ./src/org/eclipse/linuxtools/changelog/core/editors/ChangeLogDocumentProvider.java	2009-01-20 14:34:16.000000000 -0500
@@ -12,16 +12,16 @@ package org.eclipse.linuxtools.changelog
 
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.jface.text.IDocument;
-import org.eclipse.ui.editors.text.FileDocumentProvider;
+import org.eclipse.ui.editors.text.TextFileDocumentProvider;
 
 /**
  * @author klee (Kyu Lee)
  */
-public class ChangeLogDocumentProvider extends FileDocumentProvider {
-
-	protected IDocument createDocument(Object element) throws CoreException {
-
-		return super.createDocument(element);
+public class ChangeLogDocumentProvider extends TextFileDocumentProvider {
 
+	@Override
+	public IDocument getDocument(Object element) {
+		return super.getDocument(element);
 	}
+
 }


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-changelog/F-10/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- .cvsignore	10 Dec 2008 19:30:22 -0000	1.20
+++ .cvsignore	20 Jan 2009 19:38:38 -0000	1.21
@@ -4,3 +4,5 @@
 eclipse-changelog-src-2.6.2.zip
 eclipse-changelog-src-2.6.3.zip
 eclipse-changelog-src-2.6.4.zip
+eclipse-changelog-src-2.6.5.zip
+eclipse-changelog-src-2.6.6.zip


Index: eclipse-changelog.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-changelog/F-10/eclipse-changelog.spec,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- eclipse-changelog.spec	10 Dec 2008 20:21:50 -0000	1.74
+++ eclipse-changelog.spec	20 Jan 2009 19:38:38 -0000	1.75
@@ -3,7 +3,7 @@
 %define eclipse_base    %{_libdir}/eclipse
 
 Name:           eclipse-changelog
-Version:        2.6.4
+Version:        2.6.6
 Release:        1%{?dist}
 Summary:        Eclipse ChangeLog plug-in
 
@@ -21,6 +21,9 @@
 Source0:        http://sourceware.org/eclipse/changelog/%{name}-src-%{version}.zip
 Source1:		fetch-changelog.sh
 
+# Patch to add some fixes made post 2.6.6.  Resolves #261694, #261379
+Patch1:		eclipse-changelog-post-2_6_6.patch
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:          eclipse-pde >= 1:3.3.0
@@ -42,6 +45,9 @@
 
 %prep
 %setup -q -c -n eclipse-changelog-%{version}
+pushd org.eclipse.linuxtools.changelog.core
+%patch1
+popd
 
 %build
 %{eclipse_base}/buildscripts/pdebuild -d cdt \
@@ -65,6 +71,14 @@
 %{eclipse_base}/dropins/changelog
 
 %changelog
+* Mon Jan 19 2009 Jeff Johnston <jjohnstn at redhat.com> 2.6.6-1
+- 2.6.6.
+- Fixes #260719, #260722, #261694, #261379
+
+* Thu Jan 09 2009 Jeff Johnston <jjohnstn at redhat.com> 2.6.5-1
+- 2.6.5.
+- Fixes #260393
+
 * Wed Dec 10 2008 Jeff Johnston <jjohnstn at redhat.com> 2.6.4-1
 - 2.6.4.
 - Add javacSource and javacTarget parameters to pdebuild call.


Index: fetch-changelog.sh
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-changelog/F-10/fetch-changelog.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- fetch-changelog.sh	10 Dec 2008 19:30:22 -0000	1.2
+++ fetch-changelog.sh	20 Jan 2009 19:38:38 -0000	1.3
@@ -1,7 +1,7 @@
 #! /bin/sh
 
-mkdir eclipse-changelog-src-2.6.4
-cd eclipse-changelog-src-2.6.4
+mkdir eclipse-changelog-src-2.6.6
+cd eclipse-changelog-src-2.6.6
 for f in \
  org.eclipse.linuxtools.changelog.core \
  org.eclipse.linuxtools.changelog.doc \
@@ -10,6 +10,6 @@
  org.eclipse.linuxtools.changelog-feature \
  ;
  do 
-  svn export svn://anonymous at dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/changelog/tags/R2_6_4/$f
+  svn export svn://anonymous at dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/changelog/tags/R2_6_6/$f
  done
-zip -r eclipse-changelog-src-2.6.4.zip *
+zip -r eclipse-changelog-src-2.6.6.zip *


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-changelog/F-10/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- sources	10 Dec 2008 19:30:22 -0000	1.29
+++ sources	20 Jan 2009 19:38:38 -0000	1.30
@@ -1 +1 @@
-0c42fc06b6b5703528d560a40bf1e112  eclipse-changelog-src-2.6.4.zip
+250c5c8306d457e92efff42e673ec24b  eclipse-changelog-src-2.6.6.zip



From jjohnstn at fedoraproject.org  Tue Jan 20 19:41:32 2009
From: jjohnstn at fedoraproject.org (Jeff Johnston)
Date: Tue, 20 Jan 2009 19:41:32 +0000 (UTC)
Subject: rpms/eclipse-changelog/devel eclipse-changelog-post-2_6_6.patch,
	NONE, 
	1.1 eclipse-changelog.spec, 1.72, 1.73 fetch-changelog.sh, 1.2,
	1.3 sources, 1.29, 1.30
Message-ID: <20090120194132.CC714700F9@cvs1.fedora.phx.redhat.com>

Author: jjohnstn

Update of /cvs/pkgs/rpms/eclipse-changelog/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16565

Modified Files:
	eclipse-changelog.spec fetch-changelog.sh sources 
Added Files:
	eclipse-changelog-post-2_6_6.patch 
Log Message:

 Mon Jan 19 2009 Jeff Johnston <jjohnstn at redhat.com> 2.6.6-1
- 2.6.6.
- Fixes #260719, #260722, #261694, #261379




eclipse-changelog-post-2_6_6.patch:

--- NEW FILE eclipse-changelog-post-2_6_6.patch ---
diff -up ./src/org/eclipse/linuxtools/changelog/core/actions/PrepareChangeLogAction.java.fix ./src/org/eclipse/linuxtools/changelog/core/actions/PrepareChangeLogAction.java
--- ./src/org/eclipse/linuxtools/changelog/core/actions/PrepareChangeLogAction.java.fix	2009-01-20 14:30:41.000000000 -0500
+++ ./src/org/eclipse/linuxtools/changelog/core/actions/PrepareChangeLogAction.java	2009-01-20 14:33:26.000000000 -0500
@@ -359,8 +359,10 @@ public class PrepareChangeLogAction exte
 		int unitwork = 250 / patchFileInfoList.length;
 		for (PatchFile pf: patchFileInfoList) {
 			// for each file
-			String[] funcGuessList = guessFunctionNames(pf);
-			outputMultipleEntryChangeLog(pf, funcGuessList);
+			if (pf != null) { // changes to ChangeLogs will have null entries
+				String[] funcGuessList = guessFunctionNames(pf);
+				outputMultipleEntryChangeLog(pf, funcGuessList);
+			}
 			monitor.worked(unitwork);
 		}
 	}
@@ -543,4 +545,4 @@ public class PrepareChangeLogAction exte
 		}
 		return fnames;
 	}
-}
\ No newline at end of file
+}
diff -up ./src/org/eclipse/linuxtools/changelog/core/editors/ChangeLogDocumentProvider.java.fix ./src/org/eclipse/linuxtools/changelog/core/editors/ChangeLogDocumentProvider.java
--- ./src/org/eclipse/linuxtools/changelog/core/editors/ChangeLogDocumentProvider.java.fix	2009-01-20 14:30:56.000000000 -0500
+++ ./src/org/eclipse/linuxtools/changelog/core/editors/ChangeLogDocumentProvider.java	2009-01-20 14:34:16.000000000 -0500
@@ -12,16 +12,16 @@ package org.eclipse.linuxtools.changelog
 
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.jface.text.IDocument;
-import org.eclipse.ui.editors.text.FileDocumentProvider;
+import org.eclipse.ui.editors.text.TextFileDocumentProvider;
 
 /**
  * @author klee (Kyu Lee)
  */
-public class ChangeLogDocumentProvider extends FileDocumentProvider {
-
-	protected IDocument createDocument(Object element) throws CoreException {
-
-		return super.createDocument(element);
+public class ChangeLogDocumentProvider extends TextFileDocumentProvider {
 
+	@Override
+	public IDocument getDocument(Object element) {
+		return super.getDocument(element);
 	}
+
 }


Index: eclipse-changelog.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-changelog/devel/eclipse-changelog.spec,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- eclipse-changelog.spec	10 Dec 2008 20:24:07 -0000	1.72
+++ eclipse-changelog.spec	20 Jan 2009 19:41:02 -0000	1.73
@@ -3,7 +3,7 @@
 %define eclipse_base    %{_libdir}/eclipse
 
 Name:           eclipse-changelog
-Version:        2.6.4
+Version:        2.6.6
 Release:        1%{?dist}
 Summary:        Eclipse ChangeLog plug-in
 
@@ -21,6 +21,9 @@
 Source0:        http://sourceware.org/eclipse/changelog/%{name}-src-%{version}.zip
 Source1:		fetch-changelog.sh
 
+# Patch to add some fixes made post 2.6.6.  Resolves #261694, #261379
+Patch1:		eclipse-changelog-post-2_6_6.patch
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:          eclipse-pde >= 1:3.3.0
@@ -42,6 +45,9 @@
 
 %prep
 %setup -q -c -n eclipse-changelog-%{version}
+pushd org.eclipse.linuxtools.changelog.core
+%patch1
+popd
 
 %build
 %{eclipse_base}/buildscripts/pdebuild -d cdt \
@@ -65,6 +71,14 @@
 %{eclipse_base}/dropins/changelog
 
 %changelog
+* Mon Jan 19 2009 Jeff Johnston <jjohnstn at redhat.com> 2.6.6-1
+- 2.6.6.
+- Fixes #260719, #260722, #261694, #261379
+
+* Thu Jan 09 2009 Jeff Johnston <jjohnstn at redhat.com> 2.6.5-1
+- 2.6.5.
+- Fixes #260393
+
 * Wed Dec 10 2008 Jeff Johnston <jjohnstn at redhat.com> 2.6.4-1
 - 2.6.4.
 - Add javacSource and javacTarget parameters to pdebuild call.


Index: fetch-changelog.sh
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-changelog/devel/fetch-changelog.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- fetch-changelog.sh	10 Dec 2008 20:24:07 -0000	1.2
+++ fetch-changelog.sh	20 Jan 2009 19:41:02 -0000	1.3
@@ -1,7 +1,7 @@
 #! /bin/sh
 
-mkdir eclipse-changelog-src-2.6.4
-cd eclipse-changelog-src-2.6.4
+mkdir eclipse-changelog-src-2.6.6
+cd eclipse-changelog-src-2.6.6
 for f in \
  org.eclipse.linuxtools.changelog.core \
  org.eclipse.linuxtools.changelog.doc \
@@ -10,6 +10,6 @@
  org.eclipse.linuxtools.changelog-feature \
  ;
  do 
-  svn export svn://anonymous at dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/changelog/tags/R2_6_4/$f
+  svn export svn://anonymous at dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/changelog/tags/R2_6_6/$f
  done
-zip -r eclipse-changelog-src-2.6.4.zip *
+zip -r eclipse-changelog-src-2.6.6.zip *


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-changelog/devel/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- sources	10 Dec 2008 20:24:07 -0000	1.29
+++ sources	20 Jan 2009 19:41:02 -0000	1.30
@@ -1 +1 @@
-0c42fc06b6b5703528d560a40bf1e112  eclipse-changelog-src-2.6.4.zip
+250c5c8306d457e92efff42e673ec24b  eclipse-changelog-src-2.6.6.zip



From hadess at fedoraproject.org  Tue Jan 20 19:44:23 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Tue, 20 Jan 2009 19:44:23 +0000 (UTC)
Subject: rpms/gstreamer-plugins-base/devel gstreamer-plugins-base.spec, 1.70,
	1.71
Message-ID: <20090120194423.A1605700F9@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-serv16863

Modified Files:
	gstreamer-plugins-base.spec 
Log Message:
Update filelist



Index: gstreamer-plugins-base.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamer-plugins-base/devel/gstreamer-plugins-base.spec,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- gstreamer-plugins-base.spec	20 Jan 2009 19:15:14 -0000	1.70
+++ gstreamer-plugins-base.spec	20 Jan 2009 19:43:53 -0000	1.71
@@ -99,6 +99,7 @@
 %{_libdir}/libgstpbutils-%{majorminor}.so.*
 %{_libdir}/libgstrtsp-%{majorminor}.so.*
 %{_libdir}/libgstsdp-%{majorminor}.so.*
+%{_libdir}/libgstapp-%{majorminor}.so.*
 
 # base plugins without external dependencies
 %{_libdir}/gstreamer-%{majorminor}/libgstadder.so
@@ -121,6 +122,7 @@
 %{_libdir}/gstreamer-%{majorminor}/libgstgdp.so
 %{_libdir}/gstreamer-%{majorminor}/libgstqueue2.so
 %{_libdir}/gstreamer-%{majorminor}/libgstgio.so
+%{_libdir}/gstreamer-%{majorminor}/libgstapp.so
 
 # base plugins with dependencies
 %{_libdir}/gstreamer-%{majorminor}/libgstalsa.so
@@ -145,8 +147,13 @@
 %files devel
 %defattr(-, root, root)
 # plugin helper library headers
+%dir %{_includedir}/gstreamer-%{majorminor}/gst/app
+%{_includedir}/gstreamer-%{majorminor}/gst/app/gstappbuffer.h
+%{_includedir}/gstreamer-%{majorminor}/gst/app/gstappsink.h
+%{_includedir}/gstreamer-%{majorminor}/gst/app/gstappsrc.h
 %dir %{_includedir}/gstreamer-%{majorminor}/gst/audio
 %{_includedir}/gstreamer-%{majorminor}/gst/audio/audio.h
+%{_includedir}/gstreamer-%{majorminor}/gst/audio/audio-enumtypes.h
 %{_includedir}/gstreamer-%{majorminor}/gst/audio/gstaudioclock.h
 %{_includedir}/gstreamer-%{majorminor}/gst/audio/gstaudiofilter.h
 %{_includedir}/gstreamer-%{majorminor}/gst/audio/gstaudiosink.h
@@ -215,6 +222,7 @@
 %{_includedir}/gstreamer-%{majorminor}/gst/video/gstvideofilter.h
 %{_includedir}/gstreamer-%{majorminor}/gst/video/gstvideosink.h
 %{_includedir}/gstreamer-%{majorminor}/gst/video/video.h
+%{_includedir}/gstreamer-%{majorminor}/gst/video/video-enumtypes.h
 
 %{_libdir}/libgstaudio-%{majorminor}.so
 %{_libdir}/libgstinterfaces-%{majorminor}.so
@@ -228,6 +236,7 @@
 %{_libdir}/libgstrtsp-%{majorminor}.so
 %{_libdir}/libgstsdp-%{majorminor}.so
 %{_libdir}/libgstfft-%{majorminor}.so
+%{_libdir}/libgstapp-%{majorminor}.so
 
 # pkg-config files
 %{_libdir}/pkgconfig/*.pc



From jakub at fedoraproject.org  Tue Jan 20 19:45:54 2009
From: jakub at fedoraproject.org (Jakub Jelinek)
Date: Tue, 20 Jan 2009 19:45:54 +0000 (UTC)
Subject: rpms/gcc/devel gcc.spec,1.6,1.7
Message-ID: <20090120194554.5A7D0700F9@cvs1.fedora.phx.redhat.com>

Author: jakub

Update of /cvs/pkgs/rpms/gcc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17079

Modified Files:
	gcc.spec 
Log Message:
4.4.0-0.6


Index: gcc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/devel/gcc.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- gcc.spec	20 Jan 2009 19:28:07 -0000	1.6
+++ gcc.spec	20 Jan 2009 19:45:24 -0000	1.7
@@ -3,7 +3,7 @@
 %define gcc_version 4.4.0
 # 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 0.5
+%define gcc_release 0.6
 %define _unpackaged_files_terminate_build 0
 %define multilib_64_archs sparc64 ppc64 s390x x86_64
 %define include_gappletviewer 1
@@ -486,7 +486,9 @@
 mkdir gnat_hacks
 cd gnat_hacks
 tar xjf %{SOURCE100}
-sed -i -e 's/gnat\*)/gnat*|*.ad[sb]\\ *|*.ad[sb])/' bin/gcc
+#sed -i -e 's/gnat\*)/gnat*|*.ad[sb]\\ *|*.ad[sb])/' bin/gcc
+rm bin/gcc
+ln -sf gnatgcc bin/gcc
 export PATH=`pwd`/bin${PATH:+:$PATH}
 cd ..
 %endif
@@ -1722,7 +1724,7 @@
 %doc rpm.doc/changelogs/libmudflap/ChangeLog*
 
 %changelog
-* Tue Jan 20 2009 Jakub Jelinek <jakub at redhat.com> 4.4.0-0.5
+* Tue Jan 20 2009 Jakub Jelinek <jakub at redhat.com> 4.4.0-0.6
 - attempt to enable Ada support on ppc64
 
 * Fri Jan 16 2009 Jakub Jelinek <jakub at redhat.com> 4.4.0-0.3



From mclasen at fedoraproject.org  Tue Jan 20 19:50:11 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 20 Jan 2009 19:50:11 +0000 (UTC)
Subject: rpms/gnome-applets/devel modemlights-libgnome.patch, NONE,
	1.1 gnome-applets.spec, 1.322, 1.323 mini-commander.patch, 1.4, NONE
Message-ID: <20090120195011.B466070142@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-applets/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17368

Modified Files:
	gnome-applets.spec 
Added Files:
	modemlights-libgnome.patch 
Removed Files:
	mini-commander.patch 
Log Message:
fix modemlights build


modemlights-libgnome.patch:

--- NEW FILE modemlights-libgnome.patch ---
diff -up gnome-applets-2.25.3/modemlights/Makefile.am.mini-commander gnome-applets-2.25.3/modemlights/Makefile.am
--- gnome-applets-2.25.3/modemlights/Makefile.am.mini-commander	2009-01-06 22:00:00.000000000 -0500
+++ gnome-applets-2.25.3/modemlights/Makefile.am	2009-01-06 21:59:20.000000000 -0500
@@ -2,6 +2,7 @@ SUBDIRS = docs
 
 INCLUDES = -I. -I$(srcdir) 				\
 	$(GNOME_APPLETS_CFLAGS)				\
+	$(GNOME_LIBS2_CFLAGS)				\
 	-DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" 	\
 	-DVERSION=\""$(VERSION)"\"
 
@@ -13,6 +14,7 @@ modemlights_applet2_SOURCES = \
 	properties.c
 
 modemlights_applet2_LDADD = \
+		$(GNOME_LIBS2_LIBS)	\
 		     $(GNOME_APPLETS_LIBS)
 
 uidir		= $(datadir)/gnome-2.0/ui


Index: gnome-applets.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-applets/devel/gnome-applets.spec,v
retrieving revision 1.322
retrieving revision 1.323
diff -u -r1.322 -r1.323
--- gnome-applets.spec	20 Jan 2009 19:18:10 -0000	1.322
+++ gnome-applets.spec	20 Jan 2009 19:49:41 -0000	1.323
@@ -54,6 +54,7 @@
 Patch31:        gnome-applets-2.18.0-fix-find.patch
 
 Patch34:        ppp-includes.patch
+Patch35:        modemlights-libgnome.patch
 
 # do the nullapplet dance for battstat
 Patch40:	gnome-applets-null-battstat.patch
@@ -148,6 +149,7 @@
 
 %patch3 -p1 -b .ppp-command
 %patch34 -p1 -b .ppp-includes
+%patch35 -p1 -b .modemlights-libgnome
 
 intltoolize --force
 autoreconf


--- mini-commander.patch DELETED ---



From limb at fedoraproject.org  Tue Jan 20 20:28:22 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Tue, 20 Jan 2009 20:28:22 +0000 (UTC)
Subject: rpms/nexuiz/devel nexuiz.spec,1.28,1.29
Message-ID: <20090120202822.97555700F9@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/nexuiz/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22289

Modified Files:
	nexuiz.spec 
Log Message:
Hopeful icon fix.



Index: nexuiz.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nexuiz/devel/nexuiz.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- nexuiz.spec	2 Sep 2008 13:53:44 -0000	1.28
+++ nexuiz.spec	20 Jan 2009 20:27:52 -0000	1.29
@@ -1,7 +1,7 @@
 Summary: Multiplayer, deathmatch oriented first person shooter
 Name: nexuiz
 Version: 2.4.2
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2+
 Group: Amusements/Games
 URL: http://www.nexuiz.com/
@@ -128,6 +128,9 @@
 
 
 %changelog
+* Tue Jan 20 2009 Jon Ciesla <limb at jcomserv.net> - 2.4.2-4
+- Rebuild to fix odd icon issue, BZ 480686.
+
 * Tue Sep 02 2008 Jon Ciesla <limb at jcomserv.net> - 2.4.2-3
 - Fix .desktop category, BZ 460785.
 



From pkgdb at fedoraproject.org  Tue Jan 20 20:34:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Jan 2009 20:34:30 +0000
Subject: [pkgdb] php-pecl-imagick was added for hubbitus
Message-ID: <20090120203430.7C445208471@bastion.fedora.phx.redhat.com>

kevin has added Package php-pecl-imagick with summary Provides a wrapper to the ImageMagick library
kevin has approved Package php-pecl-imagick
kevin has added a Fedora devel branch for php-pecl-imagick with an owner of hubbitus
kevin has approved php-pecl-imagick in Fedora devel
kevin has approved Package php-pecl-imagick
kevin has set commit to Approved for provenpackager on php-pecl-imagick (Fedora devel)
kevin has set build to Approved for provenpackager on php-pecl-imagick (Fedora devel)
kevin has set checkout to Approved for provenpackager on php-pecl-imagick (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/php-pecl-imagick



From pkgdb at fedoraproject.org  Tue Jan 20 20:34:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Jan 2009 20:34:35 +0000
Subject: [pkgdb] php-pecl-imagick (Fedora, 9) updated by kevin
Message-ID: <20090120203436.12E0C208474@bastion.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for php-pecl-imagick
kevin has set commit to Approved for provenpackager on php-pecl-imagick (Fedora 9)
kevin has set build to Approved for provenpackager on php-pecl-imagick (Fedora 9)
kevin has set checkout to Approved for provenpackager on php-pecl-imagick (Fedora 9)
kevin approved watchbugzilla on php-pecl-imagick (Fedora 9) for remi
kevin approved watchcommits on php-pecl-imagick (Fedora 9) for remi

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/php-pecl-imagick



From pkgdb at fedoraproject.org  Tue Jan 20 20:34:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Jan 2009 20:34:35 +0000
Subject: [pkgdb] php-pecl-imagick (Fedora, 10) updated by kevin
Message-ID: <20090120203436.36956208477@bastion.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for php-pecl-imagick
kevin has set commit to Approved for provenpackager on php-pecl-imagick (Fedora 10)
kevin has set build to Approved for provenpackager on php-pecl-imagick (Fedora 10)
kevin has set checkout to Approved for provenpackager on php-pecl-imagick (Fedora 10)
kevin approved watchbugzilla on php-pecl-imagick (Fedora 10) for remi
kevin approved watchcommits on php-pecl-imagick (Fedora 10) for remi

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/php-pecl-imagick



From pkgdb at fedoraproject.org  Tue Jan 20 20:34:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Jan 2009 20:34:35 +0000
Subject: [pkgdb] php-pecl-imagick (Fedora, devel) updated by kevin
Message-ID: <20090120203436.41A8B20847A@bastion.fedora.phx.redhat.com>

kevin approved watchbugzilla on php-pecl-imagick (Fedora devel) for remi
kevin approved watchcommits on php-pecl-imagick (Fedora devel) for remi

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/php-pecl-imagick



From kevin at fedoraproject.org  Tue Jan 20 20:35:20 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 20 Jan 2009 20:35:20 +0000 (UTC)
Subject: rpms/php-pecl-imagick - New directory
Message-ID: <20090120203520.40375700F9@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/php-pecl-imagick
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsb23231/rpms/php-pecl-imagick

Log Message:
Directory /cvs/pkgs/rpms/php-pecl-imagick added to the repository




From kevin at fedoraproject.org  Tue Jan 20 20:35:20 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 20 Jan 2009 20:35:20 +0000 (UTC)
Subject: rpms/php-pecl-imagick/devel - New directory
Message-ID: <20090120203520.8656370143@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/php-pecl-imagick/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsb23231/rpms/php-pecl-imagick/devel

Log Message:
Directory /cvs/pkgs/rpms/php-pecl-imagick/devel added to the repository




From kevin at fedoraproject.org  Tue Jan 20 20:35:38 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 20 Jan 2009 20:35:38 +0000 (UTC)
Subject: rpms/php-pecl-imagick Makefile,NONE,1.1
Message-ID: <20090120203538.75329700F9@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/php-pecl-imagick
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsb23231/rpms/php-pecl-imagick

Added Files:
	Makefile 
Log Message:
Setup of module php-pecl-imagick


--- NEW FILE Makefile ---
# Top level Makefile for module php-pecl-imagick
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Jan 20 20:35:38 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 20 Jan 2009 20:35:38 +0000 (UTC)
Subject: rpms/php-pecl-imagick/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090120203538.CAEE0700F9@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/php-pecl-imagick/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsb23231/rpms/php-pecl-imagick/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module php-pecl-imagick


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: php-pecl-imagick
# $Id: Makefile,v 1.1 2009/01/20 20:35:38 kevin Exp $
NAME := php-pecl-imagick
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Jan 20 20:36:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Jan 2009 20:36:21 +0000
Subject: [pkgdb] udev-extras was added for harald
Message-ID: <20090120203621.9EE08208471@bastion.fedora.phx.redhat.com>

kevin has added Package udev-extras with summary extra rules and tools for udev
kevin has approved Package udev-extras
kevin has added a Fedora devel branch for udev-extras with an owner of harald
kevin has approved udev-extras in Fedora devel
kevin has approved Package udev-extras
kevin has set commit to Approved for provenpackager on udev-extras (Fedora devel)
kevin has set build to Approved for provenpackager on udev-extras (Fedora devel)
kevin has set checkout to Approved for provenpackager on udev-extras (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/udev-extras



From limb at fedoraproject.org  Tue Jan 20 20:41:15 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Tue, 20 Jan 2009 20:41:15 +0000 (UTC)
Subject: rpms/nexuiz/F-10 nexuiz.spec,1.28,1.29
Message-ID: <20090120204115.63468700F9@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/nexuiz/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24004

Modified Files:
	nexuiz.spec 
Log Message:
Odd icon issue fix.



Index: nexuiz.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nexuiz/F-10/nexuiz.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- nexuiz.spec	2 Sep 2008 13:53:44 -0000	1.28
+++ nexuiz.spec	20 Jan 2009 20:40:44 -0000	1.29
@@ -1,7 +1,7 @@
 Summary: Multiplayer, deathmatch oriented first person shooter
 Name: nexuiz
 Version: 2.4.2
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2+
 Group: Amusements/Games
 URL: http://www.nexuiz.com/
@@ -128,6 +128,9 @@
 
 
 %changelog
+* Tue Jan 20 2009 Jon Ciesla <limb at jcomserv.net> - 2.4.2-4
+- Rebuild to fix odd icon issue, BZ 480686.
+
 * Tue Sep 02 2008 Jon Ciesla <limb at jcomserv.net> - 2.4.2-3
 - Fix .desktop category, BZ 460785.
 



From krh at fedoraproject.org  Tue Jan 20 20:43:50 2009
From: krh at fedoraproject.org (=?utf-8?q?Kristian_H=C3=B8gsberg?=)
Date: Tue, 20 Jan 2009 20:43:50 +0000 (UTC)
Subject: rpms/mesa/devel .cvsignore, 1.31, 1.32 mesa.spec, 1.213,
	1.214 sources, 1.31, 1.32
Message-ID: <20090120204351.04698700F9@cvs1.fedora.phx.redhat.com>

Author: krh

Update of /cvs/pkgs/rpms/mesa/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24363

Modified Files:
	.cvsignore mesa.spec sources 
Log Message:
* Tue Jan 20 2009 Kristian H??gsberg <krh at redhat.com> 7.3-0.5
- Update to 7.3.0 rc3.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mesa/devel/.cvsignore,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- .cvsignore	20 Dec 2008 06:58:13 -0000	1.31
+++ .cvsignore	20 Jan 2009 20:43:20 -0000	1.32
@@ -1,3 +1,4 @@
 xdriinfo-1.0.2.tar.bz2
 gl-manpages-1.0.1.tar.bz2
-mesa-20081220.tar.bz2
+MesaLib-7.3-rc3.tar.gz
+MesaDemos-7.3-rc3.tar.gz


Index: mesa.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mesa/devel/mesa.spec,v
retrieving revision 1.213
retrieving revision 1.214
diff -u -r1.213 -r1.214
--- mesa.spec	22 Dec 2008 02:14:32 -0000	1.213
+++ mesa.spec	20 Jan 2009 20:43:20 -0000	1.214
@@ -14,20 +14,21 @@
 %define manpages gl-manpages-1.0.1
 %define xdriinfo xdriinfo-1.0.2
 %define gitdate 20081220
+%define snapshot -rc3
 
 Summary: Mesa graphics libraries
 Name: mesa
 Version: 7.3
-Release: 0.4%{?dist}
+Release: 0.5%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.mesa3d.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-#Source0: http://internap.dl.sourceforge.net/sourceforge/mesa3d/MesaLib-7.1pre.tar.bz2
-#Source1: http://internap.dl.sourceforge.net/sourceforge/mesa3d/MesaDemos-7.1pre.tar.bz2
-Source0: %{name}-%{gitdate}.tar.bz2
-Source2: %{manpages}.tar.bz2
+Source0: http://www.mesa3d.org/beta/MesaLib-7.3-rc3.tar.gz
+Source1: http://www.mesa3d.org/beta/MesaDemos-7.3-rc3.tar.gz
+#Source0: %{name}-%{gitdate}.tar.bz2
+#Source2: %{manpages}.tar.bz2
 Source3: make-git-snapshot.sh
 
 Source5: http://www.x.org/pub/individual/app/%{xdriinfo}.tar.bz2
@@ -42,8 +43,6 @@
 Patch9: intel-revert-vbl.patch
 
 Patch12: mesa-7.1-disable-intel-classic-warn.patch
-Patch13: intel-triple-remove.patch
-Patch14: intel-fix-sarea-define.patch
 
 BuildRequires: pkgconfig autoconf automake
 %if %{with_dri}
@@ -168,21 +167,15 @@
 
 
 %prep
-#%setup -q -n Mesa-%{version}pre -b1 -b2
-%setup -q -n mesa-%{gitdate} -b2 -b5
+%setup -q -n Mesa-%{version}%{snapshot} -b0 -b1
+#%setup -q -n mesa-%{gitdate} -b2 -b5
 %patch0 -p1 -b .osmesa
 %patch2 -p1 -b .intel-glthread
 %patch3 -p0 -b .no-mach64
-%patch5 -p1 -b .r300-bufmgr
+#%patch5 -p1 -b .r300-bufmgr
 %patch7 -p1 -b .dricore
 %patch9 -p1 -b .intel-vbl
 %patch12 -p1 -b .intel-nowarn
-%patch13 -p1 -b .triple-remove
-%patch14 -p1 -b .sarea
-
-# WARNING: The following files are copyright "Mark J. Kilgard" under the GLUT
-# license and are not open source/free software, so we remove them.
-rm -f include/GL/uglglutshapes.h
 
 # Hack the demos to use installed data files
 sed -i 's,../images,%{_libdir}/mesa-demos-data,' progs/demos/*.c
@@ -269,7 +262,7 @@
 
 # strip out undesirable headers
 pushd $RPM_BUILD_ROOT%{_includedir}/GL 
-rm [a-fh-np-wyz]*.h gg*.h glf*.h glut*.h
+rm [a-fh-np-wyz]*.h gg*.h glf*.h
 popd
 
 # XXX demos, since they don't install automatically.  should fix that.
@@ -328,9 +321,6 @@
 %{_includedir}/GL/glx.h
 %{_includedir}/GL/glx_mangle.h
 %{_includedir}/GL/glxext.h
-%{_includedir}/GL/xmesa.h
-%{_includedir}/GL/xmesa_x.h
-%{_includedir}/GL/xmesa_xf86.h
 %dir %{_includedir}/GL/internal
 %{_includedir}/GL/internal/dri_interface.h
 %{_libdir}/libGL.so
@@ -430,6 +420,9 @@
 %{_libdir}/mesa-demos-data
 
 %changelog
+* Tue Jan 20 2009 Kristian H??gsberg <krh at redhat.com> 7.3-0.5
+- Update to 7.3.0 rc3.
+
 * Mon Dec 22 2008 Dave Airlie <airlied at redhat.com> 7.3-0.4
 - r300-bufmgr.patch: remove start/end offset properly + r500 FP
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mesa/devel/sources,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- sources	20 Dec 2008 06:58:13 -0000	1.31
+++ sources	20 Jan 2009 20:43:20 -0000	1.32
@@ -1,3 +1,4 @@
 a5ec51ed9f0a55dc3462d90d52ff899c  xdriinfo-1.0.2.tar.bz2
 6ae05158e678f4594343f32c2ca50515  gl-manpages-1.0.1.tar.bz2
-b19670958386915cec8826aec505d01a  mesa-20081220.tar.bz2
+0623e9c84a355cc8c196fedb6ff5fc8c  MesaLib-7.3-rc3.tar.gz
+eb96f9833604f84d15a432ed7ae6723f  MesaDemos-7.3-rc3.tar.gz



From scop at fedoraproject.org  Tue Jan 20 20:45:24 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Tue, 20 Jan 2009 20:45:24 +0000 (UTC)
Subject: rpms/rpmlint/devel rpmlint.config,1.28,1.29 rpmlint.spec,1.56,1.57
Message-ID: <20090120204524.94D53700F9@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/rpmlint/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24579

Modified Files:
	rpmlint.config rpmlint.spec 
Log Message:
Filter out symlink-should-be-* warnings by default.


Index: rpmlint.config
===================================================================
RCS file: /cvs/pkgs/rpms/rpmlint/devel/rpmlint.config,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- rpmlint.config	13 Jan 2009 23:24:27 -0000	1.28
+++ rpmlint.config	20 Jan 2009 20:44:54 -0000	1.29
@@ -256,3 +256,4 @@
 addFilter("not-standard-release-extension")
 addFilter("explicit-lib-dependency (liberation-fonts|libertas-.*-firmware)")
 addFilter("filename-too-long-for-joliet")
+addFilter("symlink-should-be-")


Index: rpmlint.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rpmlint/devel/rpmlint.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- rpmlint.spec	13 Jan 2009 23:24:27 -0000	1.56
+++ rpmlint.spec	20 Jan 2009 20:44:54 -0000	1.57
@@ -70,8 +70,9 @@
 
 
 %changelog
-* Wed Jan 14 2009 Ville Skytt?? <ville.skytta at iki.fi>
-- Mute filename-too-long-for-joliet warnings in default config.
+* Tue Jan 20 2009 Ville Skytt?? <ville.skytta at iki.fi>
+- Filter out filename-too-long-for-joliet and symlink-should-be-* warnings in
+  default config.
 
 * Mon Dec 01 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 0.85-3
 - Rebuild for Python 2.6



From kevin at fedoraproject.org  Tue Jan 20 20:36:44 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 20 Jan 2009 20:36:44 +0000 (UTC)
Subject: rpms/udev-extras - New directory
Message-ID: <20090120203644.2F316700F9@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/udev-extras
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsL23485/rpms/udev-extras

Log Message:
Directory /cvs/pkgs/rpms/udev-extras added to the repository




From kevin at fedoraproject.org  Tue Jan 20 20:36:44 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 20 Jan 2009 20:36:44 +0000 (UTC)
Subject: rpms/udev-extras/devel - New directory
Message-ID: <20090120203644.71906700F9@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/udev-extras/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsL23485/rpms/udev-extras/devel

Log Message:
Directory /cvs/pkgs/rpms/udev-extras/devel added to the repository




From pkgdb at fedoraproject.org  Tue Jan 20 20:36:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Jan 2009 20:36:23 +0000
Subject: [pkgdb] udev-extras (Fedora, 10) updated by kevin
Message-ID: <20090120203623.8A232208474@bastion.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for udev-extras
kevin has set commit to Approved for provenpackager on udev-extras (Fedora 10)
kevin has set build to Approved for provenpackager on udev-extras (Fedora 10)
kevin has set checkout to Approved for provenpackager on udev-extras (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/udev-extras



From kevin at fedoraproject.org  Tue Jan 20 20:37:03 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 20 Jan 2009 20:37:03 +0000 (UTC)
Subject: rpms/udev-extras Makefile,NONE,1.1
Message-ID: <20090120203703.485F4700F9@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/udev-extras
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsL23485/rpms/udev-extras

Added Files:
	Makefile 
Log Message:
Setup of module udev-extras


--- NEW FILE Makefile ---
# Top level Makefile for module udev-extras
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Tue Jan 20 20:37:03 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 20 Jan 2009 20:37:03 +0000 (UTC)
Subject: rpms/udev-extras/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090120203703.8A890700F9@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/udev-extras/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsL23485/rpms/udev-extras/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module udev-extras


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: udev-extras
# $Id: Makefile,v 1.1 2009/01/20 20:37:03 kevin Exp $
NAME := udev-extras
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From scop at fedoraproject.org  Tue Jan 20 20:56:06 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Tue, 20 Jan 2009 20:56:06 +0000 (UTC)
Subject: rpms/rpmlint/devel rpmlint.config,1.29,1.30 rpmlint.spec,1.57,1.58
Message-ID: <20090120205606.C78BA700F9@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/rpmlint/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26354

Modified Files:
	rpmlint.config rpmlint.spec 
Log Message:
Sync Fedora license list with Wiki revision 1.34.


Index: rpmlint.config
===================================================================
RCS file: /cvs/pkgs/rpms/rpmlint/devel/rpmlint.config,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- rpmlint.config	20 Jan 2009 20:44:54 -0000	1.29
+++ rpmlint.config	20 Jan 2009 20:55:36 -0000	1.30
@@ -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 "1.20, 30 Oct 2008" of that page.
+    # Last synced with revision "1.34, 22 Dec 2008" of that page.
     'AAL',
     'Adobe',
     'ADSL',
@@ -63,6 +63,7 @@
     'Copyright only',
     'Crystal Stacker',
     'DOC',
+    'dvipdfm',
     'ECL 1.0',
     'ECL 2.0',
     'eCos',
@@ -72,6 +73,7 @@
     'EPL',
     'ERPL',
     'EU Datagrid',
+    'Eurosym',
     'Fair',
     'FTL',
     'Giftware',
@@ -130,6 +132,7 @@
     'Naumen',
     'Netscape',
     'Nokia',
+    'Noweb',
     'OpenLDAP',
     'OpenPBS',
     'OReilly',
@@ -147,6 +150,7 @@
     'OReilly',
     'Phorum',
     'PHP',
+    'PlainTeX',
     'psutils',
     'Public Domain',
     'Python',
@@ -164,12 +168,14 @@
     'TCL',
     'Teeworlds',
     'TMate',
+    'TPL',
     'UCD',
     'VOSTROM',
     'Vim',
     'VNLSL',
     'VSL',
     'W3C',
+    'Webmin',
     'WTFPL',
     'wxWidgets',
     'Xerox',
@@ -196,10 +202,12 @@
     'CC-BY',
     'CC-BY-SA',
     'CC-BY-ND',
+    'DMTF',
     'DSL',
     'EFML',
     'Free Art',
     'GeoGratis',
+    'Green OpenMusic',
     'OAL',
     # Font licenses
     'Arphic',


Index: rpmlint.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rpmlint/devel/rpmlint.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- rpmlint.spec	20 Jan 2009 20:44:54 -0000	1.57
+++ rpmlint.spec	20 Jan 2009 20:55:36 -0000	1.58
@@ -71,6 +71,7 @@
 
 %changelog
 * Tue Jan 20 2009 Ville Skytt?? <ville.skytta at iki.fi>
+- Sync Fedora license list with Wiki revision 1.34.
 - Filter out filename-too-long-for-joliet and symlink-should-be-* warnings in
   default config.
 



From kevin at fedoraproject.org  Tue Jan 20 20:59:09 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 20 Jan 2009 20:59:09 +0000 (UTC)
Subject: rpms/ctan-cm-lgc-fonts - New directory
Message-ID: <20090120205909.250BA700F9@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/ctan-cm-lgc-fonts
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsL26634/rpms/ctan-cm-lgc-fonts

Log Message:
Directory /cvs/pkgs/rpms/ctan-cm-lgc-fonts added to the repository




From kevin at fedoraproject.org  Tue Jan 20 20:59:09 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 20 Jan 2009 20:59:09 +0000 (UTC)
Subject: rpms/ctan-cm-lgc-fonts/devel - New directory
Message-ID: <20090120205909.6048B700F9@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/ctan-cm-lgc-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsL26634/rpms/ctan-cm-lgc-fonts/devel

Log Message:
Directory /cvs/pkgs/rpms/ctan-cm-lgc-fonts/devel added to the repository




From pkgdb at fedoraproject.org  Tue Jan 20 20:58:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Jan 2009 20:58:51 +0000
Subject: [pkgdb] ctan-cm-lgc-fonts was added for sarantis
Message-ID: <20090120205854.5D827208470@bastion.fedora.phx.redhat.com>

kevin has added Package ctan-cm-lgc-fonts with summary CM-LGC Type1 fonts for LaTeX
kevin has approved Package ctan-cm-lgc-fonts
kevin has added a Fedora devel branch for ctan-cm-lgc-fonts with an owner of sarantis
kevin has approved ctan-cm-lgc-fonts in Fedora devel
kevin has approved Package ctan-cm-lgc-fonts
kevin has set commit to Approved for provenpackager on ctan-cm-lgc-fonts (Fedora devel)
kevin has set build to Approved for provenpackager on ctan-cm-lgc-fonts (Fedora devel)
kevin has set checkout to Approved for provenpackager on ctan-cm-lgc-fonts (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ctan-cm-lgc-fonts



From kevin at fedoraproject.org  Tue Jan 20 20:59:25 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 20 Jan 2009 20:59:25 +0000 (UTC)
Subject: rpms/ctan-cm-lgc-fonts Makefile,NONE,1.1
Message-ID: <20090120205925.EDC9A700F9@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/ctan-cm-lgc-fonts
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsL26634/rpms/ctan-cm-lgc-fonts

Added Files:
	Makefile 
Log Message:
Setup of module ctan-cm-lgc-fonts


--- NEW FILE Makefile ---
# Top level Makefile for module ctan-cm-lgc-fonts
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Tue Jan 20 20:59:26 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 20 Jan 2009 20:59:26 +0000 (UTC)
Subject: rpms/ctan-cm-lgc-fonts/devel .cvsignore, NONE, 1.1 Makefile, NONE, 
	1.1 sources, NONE, 1.1
Message-ID: <20090120205926.3AB2770143@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/ctan-cm-lgc-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsL26634/rpms/ctan-cm-lgc-fonts/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module ctan-cm-lgc-fonts


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: ctan-cm-lgc-fonts
# $Id: Makefile,v 1.1 2009/01/20 20:59:26 kevin Exp $
NAME := ctan-cm-lgc-fonts
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From anyremote at fedoraproject.org  Tue Jan 20 21:03:54 2009
From: anyremote at fedoraproject.org (Mikhail Fedotov)
Date: Tue, 20 Jan 2009 21:03:54 +0000 (UTC)
Subject: rpms/ganyremote/F-9 .cvsignore, 1.12, 1.13 ganyremote.spec, 1.11,
	1.12 import.log, 1.8, 1.9 sources, 1.13, 1.14
Message-ID: <20090120210354.BB053700F9@cvs1.fedora.phx.redhat.com>

Author: anyremote

Update of /cvs/pkgs/rpms/ganyremote/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27259/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.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	21 Dec 2008 12:26:13 -0000	1.12
+++ .cvsignore	20 Jan 2009 21:03:24 -0000	1.13
@@ -1 +1 @@
-ganyremote-5.5.1.tar.gz
+ganyremote-5.6.tar.gz


Index: ganyremote.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ganyremote/F-9/ganyremote.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ganyremote.spec	21 Dec 2008 12:26:13 -0000	1.11
+++ ganyremote.spec	20 Jan 2009 21:03:24 -0000	1.12
@@ -1,14 +1,15 @@
 Summary: GTK frontend for anyRemote
 Name: ganyremote
-Version: 5.5.1
+Version: 5.6
 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.35, anyremote >= 4.13
+Requires: pygtk2 >= 2.10, pybluez >= 0.9.1, bluez-utils >= 3.35, anyremote >= 4.14
 BuildRequires: desktop-file-utils, gettext-devel
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 
 %description
@@ -38,6 +39,9 @@
 
 %changelog
 
+* Mon Jan 19 2009 Mikhail Fedotov <anyremote at mail.ru> - 5.6-1
+- Check java client version on the web site
+
 * Sun Dec 21 2008 Mikhail Fedotov <anyremote at mail.ru> - 5.5.1-1
 - Fix upload from web feature
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/ganyremote/F-9/import.log,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- import.log	21 Dec 2008 12:26:14 -0000	1.8
+++ import.log	20 Jan 2009 21:03:24 -0000	1.9
@@ -6,3 +6,4 @@
 ganyremote-5_4_2-1_fc10:F-9:ganyremote-5.4.2-1.fc10.src.rpm:1228337801
 ganyremote-5_5-1_fc10:F-9:ganyremote-5.5-1.fc10.src.rpm:1229628189
 ganyremote-5_5_1-1_fc10:F-9:ganyremote-5.5.1-1.fc10.src.rpm:1229862296
+ganyremote-5_6-1_fc10:F-9:ganyremote-5.6-1.fc10.src.rpm:1232485379


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ganyremote/F-9/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	21 Dec 2008 12:26:14 -0000	1.13
+++ sources	20 Jan 2009 21:03:24 -0000	1.14
@@ -1 +1 @@
-96b182b31977f4ce21e433ff1c93a27d  ganyremote-5.5.1.tar.gz
+3ce0880197f779e698a8dfdde1a98d9e  ganyremote-5.6.tar.gz



From pkgdb at fedoraproject.org  Tue Jan 20 21:04:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Jan 2009 21:04:01 +0000
Subject: [pkgdb] tunneler was added for lkundrak
Message-ID: <20090120210401.47AFF208467@bastion.fedora.phx.redhat.com>

kevin has added Package tunneler with summary Clone of legendary Tunneler game
kevin has approved Package tunneler
kevin has added a Fedora devel branch for tunneler with an owner of lkundrak
kevin has approved tunneler in Fedora devel
kevin has approved Package tunneler
kevin has set commit to Approved for provenpackager on tunneler (Fedora devel)
kevin has set build to Approved for provenpackager on tunneler (Fedora devel)
kevin has set checkout to Approved for provenpackager on tunneler (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/tunneler



From pkgdb at fedoraproject.org  Tue Jan 20 21:04:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Jan 2009 21:04:03 +0000
Subject: [pkgdb] tunneler (Fedora EPEL, 5) updated by kevin
Message-ID: <20090120210403.16D63208472@bastion.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for tunneler
kevin has set commit to Approved for provenpackager on tunneler (Fedora EPEL 5)
kevin has set build to Approved for provenpackager on tunneler (Fedora EPEL 5)
kevin has set checkout to Approved for provenpackager on tunneler (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/tunneler



From kevin at fedoraproject.org  Tue Jan 20 21:04:18 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 20 Jan 2009 21:04:18 +0000 (UTC)
Subject: rpms/tunneler - New directory
Message-ID: <20090120210418.2F0EF700F9@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/tunneler
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsb27449/rpms/tunneler

Log Message:
Directory /cvs/pkgs/rpms/tunneler added to the repository




From kevin at fedoraproject.org  Tue Jan 20 21:04:18 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 20 Jan 2009 21:04:18 +0000 (UTC)
Subject: rpms/tunneler/devel - New directory
Message-ID: <20090120210418.69EDC700F9@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/tunneler/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsb27449/rpms/tunneler/devel

Log Message:
Directory /cvs/pkgs/rpms/tunneler/devel added to the repository




From pkgdb at fedoraproject.org  Tue Jan 20 21:04:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Jan 2009 21:04:03 +0000
Subject: [pkgdb] tunneler (Fedora, 10) updated by kevin
Message-ID: <20090120210403.26BC3208474@bastion.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for tunneler
kevin has set commit to Approved for provenpackager on tunneler (Fedora 10)
kevin has set build to Approved for provenpackager on tunneler (Fedora 10)
kevin has set checkout to Approved for provenpackager on tunneler (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/tunneler



From kevin at fedoraproject.org  Tue Jan 20 21:04:33 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 20 Jan 2009 21:04:33 +0000 (UTC)
Subject: rpms/tunneler Makefile,NONE,1.1
Message-ID: <20090120210433.B9272700F9@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/tunneler
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsb27449/rpms/tunneler

Added Files:
	Makefile 
Log Message:
Setup of module tunneler


--- NEW FILE Makefile ---
# Top level Makefile for module tunneler
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Jan 20 21:04:34 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 20 Jan 2009 21:04:34 +0000 (UTC)
Subject: rpms/tunneler/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090120210434.1491D700F9@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/tunneler/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsb27449/rpms/tunneler/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module tunneler


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: tunneler
# $Id: Makefile,v 1.1 2009/01/20 21:04:33 kevin Exp $
NAME := tunneler
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From anyremote at fedoraproject.org  Tue Jan 20 21:04:43 2009
From: anyremote at fedoraproject.org (Mikhail Fedotov)
Date: Tue, 20 Jan 2009 21:04:43 +0000 (UTC)
Subject: rpms/ganyremote/F-10 .cvsignore, 1.12, 1.13 ganyremote.spec, 1.11, 
	1.12 import.log, 1.8, 1.9 sources, 1.13, 1.14
Message-ID: <20090120210443.A9DB3700F9@cvs1.fedora.phx.redhat.com>

Author: anyremote

Update of /cvs/pkgs/rpms/ganyremote/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27416/F-10

Modified Files:
	.cvsignore ganyremote.spec import.log sources 
Log Message:
build


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ganyremote/F-10/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	21 Dec 2008 12:26:15 -0000	1.12
+++ .cvsignore	20 Jan 2009 21:04:13 -0000	1.13
@@ -1 +1 @@
-ganyremote-5.5.1.tar.gz
+ganyremote-5.6.tar.gz


Index: ganyremote.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ganyremote/F-10/ganyremote.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ganyremote.spec	21 Dec 2008 12:26:15 -0000	1.11
+++ ganyremote.spec	20 Jan 2009 21:04:13 -0000	1.12
@@ -1,14 +1,15 @@
 Summary: GTK frontend for anyRemote
 Name: ganyremote
-Version: 5.5.1
+Version: 5.6
 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.35, anyremote >= 4.13
+Requires: pygtk2 >= 2.10, pybluez >= 0.9.1, bluez-utils >= 3.35, anyremote >= 4.14
 BuildRequires: desktop-file-utils, gettext-devel
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 
 %description
@@ -38,6 +39,9 @@
 
 %changelog
 
+* Mon Jan 19 2009 Mikhail Fedotov <anyremote at mail.ru> - 5.6-1
+- Check java client version on the web site
+
 * Sun Dec 21 2008 Mikhail Fedotov <anyremote at mail.ru> - 5.5.1-1
 - Fix upload from web feature
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/ganyremote/F-10/import.log,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- import.log	21 Dec 2008 12:26:15 -0000	1.8
+++ import.log	20 Jan 2009 21:04:13 -0000	1.9
@@ -6,3 +6,4 @@
 ganyremote-5_4_2-1_fc10:F-10:ganyremote-5.4.2-1.fc10.src.rpm:1228337807
 ganyremote-5_5-1_fc10:F-10:ganyremote-5.5-1.fc10.src.rpm:1229628185
 ganyremote-5_5_1-1_fc10:F-10:ganyremote-5.5.1-1.fc10.src.rpm:1229862299
+ganyremote-5_6-1_fc10:F-10:ganyremote-5.6-1.fc10.src.rpm:1232485406


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ganyremote/F-10/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	21 Dec 2008 12:26:15 -0000	1.13
+++ sources	20 Jan 2009 21:04:13 -0000	1.14
@@ -1 +1 @@
-96b182b31977f4ce21e433ff1c93a27d  ganyremote-5.5.1.tar.gz
+3ce0880197f779e698a8dfdde1a98d9e  ganyremote-5.6.tar.gz



From anyremote at fedoraproject.org  Tue Jan 20 21:04:47 2009
From: anyremote at fedoraproject.org (Mikhail Fedotov)
Date: Tue, 20 Jan 2009 21:04:47 +0000 (UTC)
Subject: rpms/ganyremote/devel .cvsignore, 1.12, 1.13 ganyremote.spec, 1.11, 
	1.12 import.log, 1.8, 1.9 sources, 1.13, 1.14
Message-ID: <20090120210447.1FED9700F9@cvs1.fedora.phx.redhat.com>

Author: anyremote

Update of /cvs/pkgs/rpms/ganyremote/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27457/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.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	21 Dec 2008 12:26:16 -0000	1.12
+++ .cvsignore	20 Jan 2009 21:04:16 -0000	1.13
@@ -1 +1 @@
-ganyremote-5.5.1.tar.gz
+ganyremote-5.6.tar.gz


Index: ganyremote.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ganyremote/devel/ganyremote.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ganyremote.spec	21 Dec 2008 12:26:16 -0000	1.11
+++ ganyremote.spec	20 Jan 2009 21:04:16 -0000	1.12
@@ -1,14 +1,15 @@
 Summary: GTK frontend for anyRemote
 Name: ganyremote
-Version: 5.5.1
+Version: 5.6
 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.35, anyremote >= 4.13
+Requires: pygtk2 >= 2.10, pybluez >= 0.9.1, bluez-utils >= 3.35, anyremote >= 4.14
 BuildRequires: desktop-file-utils, gettext-devel
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 
 %description
@@ -38,6 +39,9 @@
 
 %changelog
 
+* Mon Jan 19 2009 Mikhail Fedotov <anyremote at mail.ru> - 5.6-1
+- Check java client version on the web site
+
 * Sun Dec 21 2008 Mikhail Fedotov <anyremote at mail.ru> - 5.5.1-1
 - Fix upload from web feature
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/ganyremote/devel/import.log,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- import.log	21 Dec 2008 12:26:16 -0000	1.8
+++ import.log	20 Jan 2009 21:04:16 -0000	1.9
@@ -6,3 +6,4 @@
 ganyremote-5_4_2-1_fc10:HEAD:ganyremote-5.4.2-1.fc10.src.rpm:1228337836
 ganyremote-5_5-1_fc10:HEAD:ganyremote-5.5-1.fc10.src.rpm:1229628194
 ganyremote-5_5_1-1_fc10:HEAD:ganyremote-5.5.1-1.fc10.src.rpm:1229862313
+ganyremote-5_6-1_fc10:HEAD:ganyremote-5.6-1.fc10.src.rpm:1232485432


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ganyremote/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	21 Dec 2008 12:26:17 -0000	1.13
+++ sources	20 Jan 2009 21:04:16 -0000	1.14
@@ -1 +1 @@
-96b182b31977f4ce21e433ff1c93a27d  ganyremote-5.5.1.tar.gz
+3ce0880197f779e698a8dfdde1a98d9e  ganyremote-5.6.tar.gz



From jcollie at fedoraproject.org  Tue Jan 20 20:27:31 2009
From: jcollie at fedoraproject.org (Jeffrey C. Ollie)
Date: Tue, 20 Jan 2009 20:27:31 +0000 (UTC)
Subject: rpms/gramps/F-10 .cvsignore, 1.24, 1.25 gramps.spec, 1.39,
	1.40 sources, 1.24, 1.25 gramps-3.0.3-dbcrash.patch, 1.1, NONE
Message-ID: <20090120202731.0E0EB700F9@cvs1.fedora.phx.redhat.com>

Author: jcollie

Update of /cvs/pkgs/rpms/gramps/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22177

Modified Files:
	.cvsignore gramps.spec sources 
Removed Files:
	gramps-3.0.3-dbcrash.patch 
Log Message:
* Sun Dec  7 2008 Jeffrey C. Ollie <jeff at ocjtech.us> - 3.0.4-1
- Update to 3.0.4



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gramps/F-10/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- .cvsignore	22 Nov 2008 01:44:40 -0000	1.24
+++ .cvsignore	20 Jan 2009 20:27:00 -0000	1.25
@@ -1 +1 @@
-gramps-3.0.3.tar.gz
+gramps-3.0.4.tar.gz


Index: gramps.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gramps/F-10/gramps.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- gramps.spec	22 Nov 2008 01:44:40 -0000	1.39
+++ gramps.spec	20 Jan 2009 20:27:00 -0000	1.40
@@ -1,13 +1,12 @@
 Name:           gramps
-Version:        3.0.3
-Release:        0%{?dist}
+Version:        3.0.4
+Release:        1%{?dist}
 Summary:        Genealogical Research and Analysis Management Programming System
 
 Group:          Applications/Productivity
 License:        GPLv2+
 URL:            http://gramps.sourceforge.net/
 Source0:        http://download.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
-Patch0:         gramps-3.0.3-dbcrash.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:	noarch
 
@@ -58,7 +57,6 @@
 
 %prep
 %setup -q
-%patch0
 
 %build
 %configure --enable-packager-mode
@@ -116,6 +114,12 @@
 %{_mandir}/man1/%{name}.1.gz
 
 %changelog
+* Sun Dec  7 2008 Jeffrey C. Ollie <jeff at ocjtech.us> - 3.0.4-1
+- Update to 3.0.4
+
+* Mon Dec 01 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 3.0.3-1
+- Rebuild for Python 2.6
+
 * Thu Nov 20 2008 Russell Harrison <rharrison at fedoraproject.org> - 3.0.3-0
 - Update to 3.0.3.
 - Changed build arguments to "--enable-packager-mode" from "--disable-schemas-install --disable-scrollkeeper --disable-mime-install".


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gramps/F-10/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- sources	22 Nov 2008 01:44:40 -0000	1.24
+++ sources	20 Jan 2009 20:27:00 -0000	1.25
@@ -1 +1 @@
-fd8657124fff8f520c50ce513b2c94c9  gramps-3.0.3.tar.gz
+7d27020f391ba333b8a9bd490e5bf56e  gramps-3.0.4.tar.gz


--- gramps-3.0.3-dbcrash.patch DELETED ---



From pkgdb at fedoraproject.org  Tue Jan 20 21:06:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Jan 2009 21:06:24 +0000
Subject: [pkgdb] gtkparasite was added for ivazquez
Message-ID: <20090120210624.CF98F208470@bastion.fedora.phx.redhat.com>

kevin has added Package gtkparasite with summary A GUI debugging tool for GTK+ applications
kevin has approved Package gtkparasite
kevin has added a Fedora devel branch for gtkparasite with an owner of ivazquez
kevin has approved gtkparasite in Fedora devel
kevin has approved Package gtkparasite
kevin has set commit to Approved for provenpackager on gtkparasite (Fedora devel)
kevin has set build to Approved for provenpackager on gtkparasite (Fedora devel)
kevin has set checkout to Approved for provenpackager on gtkparasite (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gtkparasite



From pkgdb at fedoraproject.org  Tue Jan 20 21:06:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Jan 2009 21:06:26 +0000
Subject: [pkgdb] gtkparasite (Fedora, 9) updated by kevin
Message-ID: <20090120210626.DEB3C208473@bastion.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for gtkparasite
kevin has set commit to Approved for provenpackager on gtkparasite (Fedora 9)
kevin has set build to Approved for provenpackager on gtkparasite (Fedora 9)
kevin has set checkout to Approved for provenpackager on gtkparasite (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gtkparasite



From kevin at fedoraproject.org  Tue Jan 20 21:06:39 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 20 Jan 2009 21:06:39 +0000 (UTC)
Subject: rpms/gtkparasite - New directory
Message-ID: <20090120210639.26E91700F9@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/gtkparasite
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsy28002/rpms/gtkparasite

Log Message:
Directory /cvs/pkgs/rpms/gtkparasite added to the repository




From pkgdb at fedoraproject.org  Tue Jan 20 21:06:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Jan 2009 21:06:26 +0000
Subject: [pkgdb] gtkparasite (Fedora, 10) updated by kevin
Message-ID: <20090120210626.E5710208477@bastion.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for gtkparasite
kevin has set commit to Approved for provenpackager on gtkparasite (Fedora 10)
kevin has set build to Approved for provenpackager on gtkparasite (Fedora 10)
kevin has set checkout to Approved for provenpackager on gtkparasite (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gtkparasite



From kevin at fedoraproject.org  Tue Jan 20 21:06:39 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 20 Jan 2009 21:06:39 +0000 (UTC)
Subject: rpms/gtkparasite/devel - New directory
Message-ID: <20090120210639.60BE970143@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/gtkparasite/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsy28002/rpms/gtkparasite/devel

Log Message:
Directory /cvs/pkgs/rpms/gtkparasite/devel added to the repository




From pkgdb at fedoraproject.org  Tue Jan 20 21:07:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Jan 2009 21:07:28 +0000
Subject: [pkgdb] pywebdav (Fedora, 10) updated by kevin
Message-ID: <20090120210728.A9E70208477@bastion.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for pywebdav
kevin has set commit to Approved for provenpackager on pywebdav (Fedora 10)
kevin has set build to Approved for provenpackager on pywebdav (Fedora 10)
kevin has set checkout to Approved for provenpackager on pywebdav (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pywebdav



From pkgdb at fedoraproject.org  Tue Jan 20 21:07:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Jan 2009 21:07:28 +0000
Subject: [pkgdb] pywebdav (Fedora EPEL, 5) updated by kevin
Message-ID: <20090120210728.B620D20847A@bastion.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for pywebdav
kevin has set commit to Approved for provenpackager on pywebdav (Fedora EPEL 5)
kevin has set build to Approved for provenpackager on pywebdav (Fedora EPEL 5)
kevin has set checkout to Approved for provenpackager on pywebdav (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pywebdav



From kevin at fedoraproject.org  Tue Jan 20 21:07:41 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 20 Jan 2009 21:07:41 +0000 (UTC)
Subject: rpms/pywebdav - New directory
Message-ID: <20090120210741.340B3700F9@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/pywebdav
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvss28317/rpms/pywebdav

Log Message:
Directory /cvs/pkgs/rpms/pywebdav added to the repository




From kevin at fedoraproject.org  Tue Jan 20 21:07:41 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 20 Jan 2009 21:07:41 +0000 (UTC)
Subject: rpms/pywebdav/devel - New directory
Message-ID: <20090120210741.9569B700F9@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/pywebdav/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvss28317/rpms/pywebdav/devel

Log Message:
Directory /cvs/pkgs/rpms/pywebdav/devel added to the repository




From kevin at fedoraproject.org  Tue Jan 20 21:07:57 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 20 Jan 2009 21:07:57 +0000 (UTC)
Subject: rpms/pywebdav Makefile,NONE,1.1
Message-ID: <20090120210757.9FB73700F9@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/pywebdav
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvss28317/rpms/pywebdav

Added Files:
	Makefile 
Log Message:
Setup of module pywebdav


--- NEW FILE Makefile ---
# Top level Makefile for module pywebdav
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Jan 20 21:07:57 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 20 Jan 2009 21:07:57 +0000 (UTC)
Subject: rpms/pywebdav/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090120210757.F2FE8700F9@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/pywebdav/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvss28317/rpms/pywebdav/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module pywebdav


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: pywebdav
# $Id: Makefile,v 1.1 2009/01/20 21:07:57 kevin Exp $
NAME := pywebdav
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From beuc at fedoraproject.org  Tue Jan 20 21:11:01 2009
From: beuc at fedoraproject.org (Sylvain Beucler)
Date: Tue, 20 Jan 2009 21:11:01 +0000 (UTC)
Subject: rpms/freedink/devel .cvsignore, 1.3, 1.4 freedink.spec, 1.4,
	1.5 sources, 1.3, 1.4
Message-ID: <20090120211101.448CA700F9@cvs1.fedora.phx.redhat.com>

Author: beuc

Update of /cvs/pkgs/rpms/freedink/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28703

Modified Files:
	.cvsignore freedink.spec sources 
Log Message:
Update to 1.08.20090120


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/freedink/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	9 Jan 2009 21:59:17 -0000	1.3
+++ .cvsignore	20 Jan 2009 21:10:30 -0000	1.4
@@ -1 +1 @@
-freedink-1.08.20090109.tar.gz
+freedink-1.08.20090120.tar.gz


Index: freedink.spec
===================================================================
RCS file: /cvs/pkgs/rpms/freedink/devel/freedink.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- freedink.spec	9 Jan 2009 22:22:27 -0000	1.4
+++ freedink.spec	20 Jan 2009 21:10:30 -0000	1.5
@@ -1,6 +1,6 @@
 Name:		freedink
-Version:	1.08.20090109
-Release:	2%{?dist}
+Version:	1.08.20090120
+Release:	1%{?dist}
 Summary:	Adventure and role-playing game
 
 Group:		Amusements/Games
@@ -103,6 +103,9 @@
 
 
 %changelog
+* Tue Jan 20 2009 Sylvain Beucler <beuc at beuc.net> - 1.08.20090120-1
+- New upstream release (fix engine freeze in some DinkC scripts)
+
 * Wed Jan  9 2009 Sylvain Beucler <beuc at beuc.net> - 1.08.20090109-2
 - Bump version to fix build tag issue
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/freedink/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	9 Jan 2009 21:59:17 -0000	1.3
+++ sources	20 Jan 2009 21:10:30 -0000	1.4
@@ -1 +1 @@
-2f9854aec73f4ea7b47bceb0757c3be8  freedink-1.08.20090109.tar.gz
+4c877567c85ac3433cc9ae9c2fc54135  freedink-1.08.20090120.tar.gz



From pkgdb at fedoraproject.org  Tue Jan 20 21:16:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Jan 2009 21:16:16 +0000
Subject: [pkgdb] cpphs was added for konradm
Message-ID: <20090120211616.A1F9D208470@bastion.fedora.phx.redhat.com>

kevin has added Package cpphs with summary A liberalised re-implementation of cpp, the C pre-processor
kevin has approved Package cpphs
kevin has added a Fedora devel branch for cpphs with an owner of konradm
kevin has approved cpphs in Fedora devel
kevin has approved Package cpphs
kevin has set commit to Approved for provenpackager on cpphs (Fedora devel)
kevin has set build to Approved for provenpackager on cpphs (Fedora devel)
kevin has set checkout to Approved for provenpackager on cpphs (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cpphs



From pkgdb at fedoraproject.org  Tue Jan 20 21:16:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Jan 2009 21:16:22 +0000
Subject: [pkgdb] cpphs (Fedora, 9) updated by kevin
Message-ID: <20090120211622.90221208479@bastion.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for cpphs
kevin has set commit to Approved for provenpackager on cpphs (Fedora 9)
kevin has set build to Approved for provenpackager on cpphs (Fedora 9)
kevin has set checkout to Approved for provenpackager on cpphs (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cpphs



From pkgdb at fedoraproject.org  Tue Jan 20 21:18:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Jan 2009 21:18:06 +0000
Subject: [pkgdb] mldonkey was added for peter
Message-ID: <20090120211806.CA573208470@bastion.fedora.phx.redhat.com>

kevin has added Package mldonkey with summary Client for several P2P networks
kevin has approved Package mldonkey
kevin has added a Fedora devel branch for mldonkey with an owner of peter
kevin has approved mldonkey in Fedora devel
kevin has approved Package mldonkey
kevin has set commit to Approved for provenpackager on mldonkey (Fedora devel)
kevin has set build to Approved for provenpackager on mldonkey (Fedora devel)
kevin has set checkout to Approved for provenpackager on mldonkey (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mldonkey



From pkgdb at fedoraproject.org  Tue Jan 20 21:18:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Jan 2009 21:18:12 +0000
Subject: [pkgdb] mldonkey (Fedora, 9) updated by kevin
Message-ID: <20090120211812.3FF3C208474@bastion.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for mldonkey
kevin has set commit to Approved for provenpackager on mldonkey (Fedora 9)
kevin has set build to Approved for provenpackager on mldonkey (Fedora 9)
kevin has set checkout to Approved for provenpackager on mldonkey (Fedora 9)
kevin approved watchbugzilla on mldonkey (Fedora 9) for rjones
kevin approved watchcommits on mldonkey (Fedora 9) for rjones
kevin approved commit on mldonkey (Fedora 9) for rjones
kevin approved build on mldonkey (Fedora 9) for rjones
kevin approved approveacls on mldonkey (Fedora 9) for rjones

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mldonkey



From pkgdb at fedoraproject.org  Tue Jan 20 21:18:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Jan 2009 21:18:12 +0000
Subject: [pkgdb] mldonkey (Fedora, devel) updated by kevin
Message-ID: <20090120211812.4E6BE208478@bastion.fedora.phx.redhat.com>

kevin approved watchbugzilla on mldonkey (Fedora devel) for rjones
kevin approved watchcommits on mldonkey (Fedora devel) for rjones
kevin approved commit on mldonkey (Fedora devel) for rjones
kevin approved build on mldonkey (Fedora devel) for rjones
kevin approved approveacls on mldonkey (Fedora devel) for rjones

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mldonkey



From pkgdb at fedoraproject.org  Tue Jan 20 21:18:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Jan 2009 21:18:12 +0000
Subject: [pkgdb] mldonkey (Fedora, 10) updated by kevin
Message-ID: <20090120211812.5605D20847E@bastion.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for mldonkey
kevin has set commit to Approved for provenpackager on mldonkey (Fedora 10)
kevin has set build to Approved for provenpackager on mldonkey (Fedora 10)
kevin has set checkout to Approved for provenpackager on mldonkey (Fedora 10)
kevin approved watchbugzilla on mldonkey (Fedora 10) for rjones
kevin approved watchcommits on mldonkey (Fedora 10) for rjones
kevin approved commit on mldonkey (Fedora 10) for rjones
kevin approved build on mldonkey (Fedora 10) for rjones
kevin approved approveacls on mldonkey (Fedora 10) for rjones

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mldonkey



From pkgdb at fedoraproject.org  Tue Jan 20 21:18:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Jan 2009 21:18:12 +0000
Subject: [pkgdb] mldonkey (Fedora EPEL, 4) updated by kevin
Message-ID: <20090120211812.641B1208481@bastion.fedora.phx.redhat.com>

kevin added a Fedora EPEL 4 branch for mldonkey
kevin has set commit to Approved for provenpackager on mldonkey (Fedora EPEL 4)
kevin has set build to Approved for provenpackager on mldonkey (Fedora EPEL 4)
kevin has set checkout to Approved for provenpackager on mldonkey (Fedora EPEL 4)
kevin approved watchbugzilla on mldonkey (Fedora EPEL 4) for rjones
kevin approved watchcommits on mldonkey (Fedora EPEL 4) for rjones
kevin approved commit on mldonkey (Fedora EPEL 4) for rjones
kevin approved build on mldonkey (Fedora EPEL 4) for rjones
kevin approved approveacls on mldonkey (Fedora EPEL 4) for rjones

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mldonkey



From kevin at fedoraproject.org  Tue Jan 20 21:18:24 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 20 Jan 2009 21:18:24 +0000 (UTC)
Subject: rpms/mldonkey - New directory
Message-ID: <20090120211824.2734C700F9@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/mldonkey
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsm29432/rpms/mldonkey

Log Message:
Directory /cvs/pkgs/rpms/mldonkey added to the repository




From kevin at fedoraproject.org  Tue Jan 20 21:18:24 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 20 Jan 2009 21:18:24 +0000 (UTC)
Subject: rpms/mldonkey/devel - New directory
Message-ID: <20090120211824.5EB16700F9@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/mldonkey/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsm29432/rpms/mldonkey/devel

Log Message:
Directory /cvs/pkgs/rpms/mldonkey/devel added to the repository




From kevin at fedoraproject.org  Tue Jan 20 21:18:40 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 20 Jan 2009 21:18:40 +0000 (UTC)
Subject: rpms/mldonkey/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090120211840.D22D5700F9@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/mldonkey/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsm29432/rpms/mldonkey/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module mldonkey


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: mldonkey
# $Id: Makefile,v 1.1 2009/01/20 21:18:40 kevin Exp $
NAME := mldonkey
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Jan 20 21:18:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Jan 2009 21:18:12 +0000
Subject: [pkgdb] mldonkey (Fedora EPEL, 5) updated by kevin
Message-ID: <20090120211812.79C2A208485@bastion.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for mldonkey
kevin has set commit to Approved for provenpackager on mldonkey (Fedora EPEL 5)
kevin has set build to Approved for provenpackager on mldonkey (Fedora EPEL 5)
kevin has set checkout to Approved for provenpackager on mldonkey (Fedora EPEL 5)
kevin approved watchbugzilla on mldonkey (Fedora EPEL 5) for rjones
kevin approved watchcommits on mldonkey (Fedora EPEL 5) for rjones
kevin approved commit on mldonkey (Fedora EPEL 5) for rjones
kevin approved build on mldonkey (Fedora EPEL 5) for rjones
kevin approved approveacls on mldonkey (Fedora EPEL 5) for rjones

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mldonkey



From kevin at fedoraproject.org  Tue Jan 20 21:18:40 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 20 Jan 2009 21:18:40 +0000 (UTC)
Subject: rpms/mldonkey Makefile,NONE,1.1
Message-ID: <20090120211840.92605700F9@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/mldonkey
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsm29432/rpms/mldonkey

Added Files:
	Makefile 
Log Message:
Setup of module mldonkey


--- NEW FILE Makefile ---
# Top level Makefile for module mldonkey
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout 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 Jan 20 21:19:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Jan 2009 21:19:22 +0000
Subject: [pkgdb] jrosetta was added for kwizart
Message-ID: <20090120211922.233C4208476@bastion.fedora.phx.redhat.com>

kevin has added Package jrosetta with summary A common base to build a graphical console
kevin has approved Package jrosetta
kevin has added a Fedora devel branch for jrosetta with an owner of kwizart
kevin has approved jrosetta in Fedora devel
kevin has approved Package jrosetta
kevin has set commit to Approved for provenpackager on jrosetta (Fedora devel)
kevin has set build to Approved for provenpackager on jrosetta (Fedora devel)
kevin has set checkout to Approved for provenpackager on jrosetta (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/jrosetta



From pkgdb at fedoraproject.org  Tue Jan 20 21:19:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Jan 2009 21:19:23 +0000
Subject: [pkgdb] jrosetta (Fedora EPEL, 5) updated by kevin
Message-ID: <20090120211923.8DAAA208479@bastion.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for jrosetta
kevin has set commit to Approved for provenpackager on jrosetta (Fedora EPEL 5)
kevin has set build to Approved for provenpackager on jrosetta (Fedora EPEL 5)
kevin has set checkout to Approved for provenpackager on jrosetta (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/jrosetta



From pkgdb at fedoraproject.org  Tue Jan 20 21:19:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Jan 2009 21:19:23 +0000
Subject: [pkgdb] jrosetta (Fedora, 10) updated by kevin
Message-ID: <20090120211923.A0F7E20847D@bastion.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for jrosetta
kevin has set commit to Approved for provenpackager on jrosetta (Fedora 10)
kevin has set build to Approved for provenpackager on jrosetta (Fedora 10)
kevin has set checkout to Approved for provenpackager on jrosetta (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/jrosetta



From kevin at fedoraproject.org  Tue Jan 20 21:16:36 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 20 Jan 2009 21:16:36 +0000 (UTC)
Subject: rpms/cpphs - New directory
Message-ID: <20090120211636.21307700F9@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/cpphs
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsF29206/rpms/cpphs

Log Message:
Directory /cvs/pkgs/rpms/cpphs added to the repository




From kevin at fedoraproject.org  Tue Jan 20 21:16:36 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 20 Jan 2009 21:16:36 +0000 (UTC)
Subject: rpms/cpphs/devel - New directory
Message-ID: <20090120211636.5947C700F9@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/cpphs/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsF29206/rpms/cpphs/devel

Log Message:
Directory /cvs/pkgs/rpms/cpphs/devel added to the repository




From pkgdb at fedoraproject.org  Tue Jan 20 21:16:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Jan 2009 21:16:22 +0000
Subject: [pkgdb] cpphs (Fedora, 10) updated by kevin
Message-ID: <20090120211622.9B28120847D@bastion.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for cpphs
kevin has set commit to Approved for provenpackager on cpphs (Fedora 10)
kevin has set build to Approved for provenpackager on cpphs (Fedora 10)
kevin has set checkout to Approved for provenpackager on cpphs (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cpphs



From pkgdb at fedoraproject.org  Tue Jan 20 21:07:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Jan 2009 21:07:28 +0000
Subject: [pkgdb] pywebdav (Fedora, 9) updated by kevin
Message-ID: <20090120210728.976B9208474@bastion.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for pywebdav
kevin has set commit to Approved for provenpackager on pywebdav (Fedora 9)
kevin has set build to Approved for provenpackager on pywebdav (Fedora 9)
kevin has set checkout to Approved for provenpackager on pywebdav (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pywebdav



From kevin at fedoraproject.org  Tue Jan 20 21:16:52 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 20 Jan 2009 21:16:52 +0000 (UTC)
Subject: rpms/cpphs Makefile,NONE,1.1
Message-ID: <20090120211652.3CA90700F9@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/cpphs
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsF29206/rpms/cpphs

Added Files:
	Makefile 
Log Message:
Setup of module cpphs


--- NEW FILE Makefile ---
# Top level Makefile for module cpphs
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Jan 20 21:06:55 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 20 Jan 2009 21:06:55 +0000 (UTC)
Subject: rpms/gtkparasite Makefile,NONE,1.1
Message-ID: <20090120210655.A5AC7700F9@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/gtkparasite
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsy28002/rpms/gtkparasite

Added Files:
	Makefile 
Log Message:
Setup of module gtkparasite


--- NEW FILE Makefile ---
# Top level Makefile for module gtkparasite
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout 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 Jan 20 21:07:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Jan 2009 21:07:26 +0000
Subject: [pkgdb] pywebdav was added for sharkcz
Message-ID: <20090120210726.E2E9D208471@bastion.fedora.phx.redhat.com>

kevin has added Package pywebdav with summary WebDAV library for Python
kevin has approved Package pywebdav
kevin has added a Fedora devel branch for pywebdav with an owner of sharkcz
kevin has approved pywebdav in Fedora devel
kevin has approved Package pywebdav
kevin has set commit to Approved for provenpackager on pywebdav (Fedora devel)
kevin has set build to Approved for provenpackager on pywebdav (Fedora devel)
kevin has set checkout to Approved for provenpackager on pywebdav (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pywebdav



From kevin at fedoraproject.org  Tue Jan 20 21:19:36 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 20 Jan 2009 21:19:36 +0000 (UTC)
Subject: rpms/jrosetta - New directory
Message-ID: <20090120211936.29E4A700F9@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/jrosetta
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsm29771/rpms/jrosetta

Log Message:
Directory /cvs/pkgs/rpms/jrosetta added to the repository




From kevin at fedoraproject.org  Tue Jan 20 21:19:36 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 20 Jan 2009 21:19:36 +0000 (UTC)
Subject: rpms/jrosetta/devel - New directory
Message-ID: <20090120211936.6E236700F9@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/jrosetta/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsm29771/rpms/jrosetta/devel

Log Message:
Directory /cvs/pkgs/rpms/jrosetta/devel added to the repository




From kevin at fedoraproject.org  Tue Jan 20 21:16:52 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 20 Jan 2009 21:16:52 +0000 (UTC)
Subject: rpms/cpphs/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <20090120211652.90C76700F9@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/cpphs/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsF29206/rpms/cpphs/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module cpphs


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: cpphs
# $Id: Makefile,v 1.1 2009/01/20 21:16:52 kevin Exp $
NAME := cpphs
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out 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 Jan 20 21:19:53 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 20 Jan 2009 21:19:53 +0000 (UTC)
Subject: rpms/jrosetta Makefile,NONE,1.1
Message-ID: <20090120211953.AE406700F9@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/jrosetta
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsm29771/rpms/jrosetta

Added Files:
	Makefile 
Log Message:
Setup of module jrosetta


--- NEW FILE Makefile ---
# Top level Makefile for module jrosetta
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Jan 20 21:19:53 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 20 Jan 2009 21:19:53 +0000 (UTC)
Subject: rpms/jrosetta/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090120211953.ED43B700F9@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/jrosetta/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsm29771/rpms/jrosetta/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module jrosetta


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: jrosetta
# $Id: Makefile,v 1.1 2009/01/20 21:19:53 kevin Exp $
NAME := jrosetta
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out 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 Jan 20 21:06:55 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 20 Jan 2009 21:06:55 +0000 (UTC)
Subject: rpms/gtkparasite/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090120210655.EDFA0700F9@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/gtkparasite/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsy28002/rpms/gtkparasite/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module gtkparasite


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: gtkparasite
# $Id: Makefile,v 1.1 2009/01/20 21:06:55 kevin Exp $
NAME := gtkparasite
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Jan 20 21:21:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Jan 2009 21:21:00 +0000
Subject: [pkgdb] python-ldaphelper was added for jstanley
Message-ID: <20090120212100.77D30208470@bastion.fedora.phx.redhat.com>

kevin has added Package python-ldaphelper with summary A wrapper around LDAP search results
kevin has approved Package python-ldaphelper
kevin has added a Fedora devel branch for python-ldaphelper with an owner of jstanley
kevin has approved python-ldaphelper in Fedora devel
kevin has approved Package python-ldaphelper
kevin has set commit to Approved for provenpackager on python-ldaphelper (Fedora devel)
kevin has set build to Approved for provenpackager on python-ldaphelper (Fedora devel)
kevin has set checkout to Approved for provenpackager on python-ldaphelper (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-ldaphelper



From pkgdb at fedoraproject.org  Tue Jan 20 21:21:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Jan 2009 21:21:01 +0000
Subject: [pkgdb] python-ldaphelper (Fedora, 9) updated by kevin
Message-ID: <20090120212101.E0D2A208474@bastion.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for python-ldaphelper
kevin has set commit to Approved for provenpackager on python-ldaphelper (Fedora 9)
kevin has set build to Approved for provenpackager on python-ldaphelper (Fedora 9)
kevin has set checkout to Approved for provenpackager on python-ldaphelper (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-ldaphelper



From pkgdb at fedoraproject.org  Tue Jan 20 21:21:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Jan 2009 21:21:01 +0000
Subject: [pkgdb] python-ldaphelper (Fedora EPEL, 5) updated by kevin
Message-ID: <20090120212101.E65E8208477@bastion.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for python-ldaphelper
kevin has set commit to Approved for provenpackager on python-ldaphelper (Fedora EPEL 5)
kevin has set build to Approved for provenpackager on python-ldaphelper (Fedora EPEL 5)
kevin has set checkout to Approved for provenpackager on python-ldaphelper (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-ldaphelper



From pkgdb at fedoraproject.org  Tue Jan 20 21:21:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Jan 2009 21:21:01 +0000
Subject: [pkgdb] python-ldaphelper (Fedora, 10) updated by kevin
Message-ID: <20090120212101.F11CE20847A@bastion.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for python-ldaphelper
kevin has set commit to Approved for provenpackager on python-ldaphelper (Fedora 10)
kevin has set build to Approved for provenpackager on python-ldaphelper (Fedora 10)
kevin has set checkout to Approved for provenpackager on python-ldaphelper (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-ldaphelper



From kevin at fedoraproject.org  Tue Jan 20 21:21:19 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 20 Jan 2009 21:21:19 +0000 (UTC)
Subject: rpms/python-ldaphelper - New directory
Message-ID: <20090120212119.2A2E7700F9@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/python-ldaphelper
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsb30115/rpms/python-ldaphelper

Log Message:
Directory /cvs/pkgs/rpms/python-ldaphelper added to the repository




From kevin at fedoraproject.org  Tue Jan 20 21:21:19 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 20 Jan 2009 21:21:19 +0000 (UTC)
Subject: rpms/python-ldaphelper/devel - New directory
Message-ID: <20090120212119.71736700F9@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/python-ldaphelper/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsb30115/rpms/python-ldaphelper/devel

Log Message:
Directory /cvs/pkgs/rpms/python-ldaphelper/devel added to the repository




From pkgdb at fedoraproject.org  Tue Jan 20 21:21:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Jan 2009 21:21:01 +0000
Subject: [pkgdb] python-ldaphelper (Fedora EPEL, 4) updated by kevin
Message-ID: <20090120212102.08E3A20847E@bastion.fedora.phx.redhat.com>

kevin added a Fedora EPEL 4 branch for python-ldaphelper
kevin has set commit to Approved for provenpackager on python-ldaphelper (Fedora EPEL 4)
kevin has set build to Approved for provenpackager on python-ldaphelper (Fedora EPEL 4)
kevin has set checkout to Approved for provenpackager on python-ldaphelper (Fedora EPEL 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-ldaphelper



From kevin at fedoraproject.org  Tue Jan 20 21:21:38 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 20 Jan 2009 21:21:38 +0000 (UTC)
Subject: rpms/python-ldaphelper Makefile,NONE,1.1
Message-ID: <20090120212138.36863700F9@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/python-ldaphelper
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsb30115/rpms/python-ldaphelper

Added Files:
	Makefile 
Log Message:
Setup of module python-ldaphelper


--- NEW FILE Makefile ---
# Top level Makefile for module python-ldaphelper
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Jan 20 21:21:38 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 20 Jan 2009 21:21:38 +0000 (UTC)
Subject: rpms/python-ldaphelper/devel .cvsignore, NONE, 1.1 Makefile, NONE, 
	1.1 sources, NONE, 1.1
Message-ID: <20090120212138.80369700F9@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/python-ldaphelper/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsb30115/rpms/python-ldaphelper/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module python-ldaphelper


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: python-ldaphelper
# $Id: Makefile,v 1.1 2009/01/20 21:21:38 kevin Exp $
NAME := python-ldaphelper
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From georgiou at fedoraproject.org  Tue Jan 20 21:29:11 2009
From: georgiou at fedoraproject.org (Kostas Georgiou)
Date: Tue, 20 Jan 2009 21:29:11 +0000 (UTC)
Subject: rpms/ganglia/F-10 ganglia.spec, 1.22, 1.23 gmetad-bof-dos.patch, 1.1,
	1.2
Message-ID: <20090120212911.E486E700F9@cvs1.fedora.phx.redhat.com>

Author: georgiou

Update of /cvs/extras/rpms/ganglia/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31908

Modified Files:
	ganglia.spec gmetad-bof-dos.patch 
Log Message:
Additional security fixes from #480236



Index: ganglia.spec
===================================================================
RCS file: /cvs/extras/rpms/ganglia/F-10/ganglia.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- ganglia.spec	14 Jan 2009 23:53:39 -0000	1.22
+++ ganglia.spec	20 Jan 2009 21:28:41 -0000	1.23
@@ -1,6 +1,6 @@
 Name:               ganglia
 Version:            3.1.1
-Release:            2%{?svnrev:.r%{svnrev}}%{?dist}
+Release:            3%{?svnrev:.r%{svnrev}}%{?dist}
 Summary:            Ganglia Distributed Monitoring System
 
 Group:              Applications/Internet
@@ -271,6 +271,10 @@
 %{_datadir}/%{name}
 
 %changelog
+* Tue Jan 20 2009 Kostas Georgiou <k.georgiou at imperial.ac.uk> - 3.1.1-3
+- [480236] Updated patch for the buffer overflow from upstream with
+  additional fixes
+
 * Wed Jan 14 2009 Kostas Georgiou <k.georgiou at imperial.ac.uk> - 3.1.1-2
 - Fix for gmetad server buffer overflow
 - The private_clusters file should not be readable by everyone

gmetad-bof-dos.patch:

Index: gmetad-bof-dos.patch
===================================================================
RCS file: /cvs/extras/rpms/ganglia/F-10/gmetad-bof-dos.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gmetad-bof-dos.patch	14 Jan 2009 23:53:39 -0000	1.1
+++ gmetad-bof-dos.patch	20 Jan 2009 21:28:41 -0000	1.2
@@ -1,5 +1,5 @@
---- gmetad/server.c.orig	2009-01-09 00:30:10.000000000 +0800
-+++ gmetad/server.c	2009-01-09 00:42:52.000000000 +0800
+--- gmetad/server.c.orig
++++ gmetad/server.c
 @@ -11,6 +11,7 @@
  #include "dtd.h"
  #include "gmetad.h"
@@ -8,7 +8,15 @@
  
  extern g_tcp_socket *server_socket;
  extern pthread_mutex_t  server_socket_mutex;
-@@ -377,7 +378,7 @@
+@@ -370,14 +371,13 @@ tree_report(datum_t *key, datum_t *val, void *arg)
+    
+ /* sacerdoti: This function does a tree walk while respecting the filter path.
+  * Will return valid XML even if we have chosen a subtree. Since tree depth is
+- * bounded, this function guarantees O(1) search time. The recursive structure 
+- * does not require any memory allocations. 
++ * bounded, this function guarantees O(1) search time.
+  */
+ static int
  process_path (client_t *client, char *path, datum_t *myroot, datum_t *key)
  {
     char *p, *q, *pathend;
@@ -17,16 +25,18 @@
     int rc, len;
     datum_t *found;
     datum_t findkey;
-@@ -419,6 +420,8 @@
+@@ -419,6 +419,10 @@ process_path (client_t *client, char *path, datum_t *myroot, datum_t *key)
           if (!q) q=pathend;
        
           len = q-p;
-+         /* +1 not needed as q-p is already accounting for that */
-+         element = malloc(len);
++         element = malloc(len + 1);
++         if ( element == NULL )
++             return 1;
++
           strncpy(element, p, len);
           element[len] = '\0';
        
-@@ -435,10 +438,13 @@
+@@ -435,10 +439,13 @@ process_path (client_t *client, char *path, datum_t *myroot, datum_t *key)
                 rc = process_path(client, q, found, &findkey);
                 
                 datum_free(found);
@@ -41,7 +51,16 @@
              }
        }
     if (rc) return 1;
-@@ -600,8 +606,8 @@
+@@ -537,7 +544,7 @@ server_thread (void *arg)
+    socklen_t len;
+    client_t client;
+    char remote_ip[16];
+-   char request[REQUESTLEN];
++   char request[REQUESTLEN + 1];
+    llist_entry *le;
+    datum_t rootdatum;
+ 
+@@ -600,8 +607,8 @@ server_thread (void *arg)
                 if (process_request(&client, request))
                    {
                       err_msg("Got a malformed path request from %s", remote_ip);



From sergiopr at fedoraproject.org  Tue Jan 20 21:38:58 2009
From: sergiopr at fedoraproject.org (Sergio Pascual)
Date: Tue, 20 Jan 2009 21:38:58 +0000 (UTC)
Subject: rpms/tkimg/devel tkimg.spec,1.10,1.11
Message-ID: <20090120213858.6EBE9700F9@cvs1.fedora.phx.redhat.com>

Author: sergiopr

Update of /cvs/pkgs/rpms/tkimg/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv605

Modified Files:
	tkimg.spec 
Log Message:
* Tue Jan 20 2009 Sergio Pascual <sergiopr at fedoraproject.org>  1.4-0.2.20081115svn
- Reverting patches to fix bz #468357



Index: tkimg.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tkimg/devel/tkimg.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- tkimg.spec	16 Nov 2008 12:23:43 -0000	1.10
+++ tkimg.spec	20 Jan 2009 21:38:28 -0000	1.11
@@ -5,7 +5,7 @@
 
 Name: tkimg
 Version: 1.4
-Release: 0.1.%{svnversion}svn%{?dist}
+Release: 0.2.%{svnversion}svn%{?dist}
 Summary: More Image Formats for Tk
 
 Group: Development/Libraries
@@ -20,10 +20,6 @@
 Source0: %{name}-%{svnversion}.tar.gz
 # A request to allow building with system libraries has been submitted
 # https://sourceforge.net/tracker/index.php?func=detail&aid=2292032&group_id=52039&atid=465495
-Patch0: tkimg-20081115-syslibs-zlib.patch
-Patch1: tkimg-20081115-syslibs-png.patch
-Patch2: tkimg-20081115-syslibs-tiff.patch
-Patch3: tkimg-20081115-syslibs-jpg.patch
 
 Buildroot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
@@ -49,10 +45,6 @@
 
 %prep
 %setup -q -n %{name}-%{svnversion}
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
 
 %build
 %configure --with-tcl=%{tcl_sitearch} --with-tk=%{_libdir} --libdir=%{tcl_sitearch}
@@ -97,6 +89,9 @@
 %{tcl_sitearch}/Img1.4/*.a
 
 %changelog
+* Tue Jan 20 2009 Sergio Pascual <sergiopr at fedoraproject.org>  1.4-0.2.20081115svn
+- Reverting patches to fix bz #468357
+
 * Sat Nov 15 2008 Sergio Pascual <sergiopr at fedoraproject.org>  1.4-0.1.20081115svn
 - New upstream source, version 173 from trunk, release 1.4
 - Relative links in libdir



From georgiou at fedoraproject.org  Tue Jan 20 21:43:25 2009
From: georgiou at fedoraproject.org (Kostas Georgiou)
Date: Tue, 20 Jan 2009 21:43:25 +0000 (UTC)
Subject: rpms/ganglia/F-9 ganglia.spec, 1.14, 1.15 gmetad-bof-dos.patch, 1.1,
	1.2
Message-ID: <20090120214325.F0704700F9@cvs1.fedora.phx.redhat.com>

Author: georgiou

Update of /cvs/extras/rpms/ganglia/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1267

Modified Files:
	ganglia.spec gmetad-bof-dos.patch 
Log Message:
Additional security fixes from #480236



Index: ganglia.spec
===================================================================
RCS file: /cvs/extras/rpms/ganglia/F-9/ganglia.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- ganglia.spec	15 Jan 2009 00:06:26 -0000	1.14
+++ ganglia.spec	20 Jan 2009 21:42:55 -0000	1.15
@@ -1,6 +1,6 @@
 Name:               ganglia
 Version:            3.0.7
-Release:            3%{?dist}
+Release:            4%{?dist}
 Summary:            Ganglia Distributed Monitoring System
 
 Group:              Applications/Internet
@@ -207,6 +207,10 @@
 %{_datadir}/%{name}
 
 %changelog
+* Tue Jan 20 2009 Kostas Georgiou <k.georgiou at imperial.ac.uk> - 3.0.7-4
+- [480236] Updated patch for the buffer overflow from upstream with
+  additional fixes
+
 * Wed Jan 14 2009 Kostas Georgiou <k.georgiou at imperial.ac.uk> - 3.0.7-3
 - Fix for gmetad server buffer overflow 
 

gmetad-bof-dos.patch:

Index: gmetad-bof-dos.patch
===================================================================
RCS file: /cvs/extras/rpms/ganglia/F-9/gmetad-bof-dos.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gmetad-bof-dos.patch	15 Jan 2009 00:06:26 -0000	1.1
+++ gmetad-bof-dos.patch	20 Jan 2009 21:42:55 -0000	1.2
@@ -1,5 +1,5 @@
---- gmetad/server.c.orig	2009-01-09 00:30:10.000000000 +0800
-+++ gmetad/server.c	2009-01-09 00:42:52.000000000 +0800
+--- gmetad/server.c.orig
++++ gmetad/server.c
 @@ -11,6 +11,7 @@
  #include "dtd.h"
  #include "gmetad.h"
@@ -8,7 +8,15 @@
  
  extern g_tcp_socket *server_socket;
  extern pthread_mutex_t  server_socket_mutex;
-@@ -377,7 +378,7 @@
+@@ -370,14 +371,13 @@ tree_report(datum_t *key, datum_t *val, void *arg)
+    
+ /* sacerdoti: This function does a tree walk while respecting the filter path.
+  * Will return valid XML even if we have chosen a subtree. Since tree depth is
+- * bounded, this function guarantees O(1) search time. The recursive structure 
+- * does not require any memory allocations. 
++ * bounded, this function guarantees O(1) search time.
+  */
+ static int
  process_path (client_t *client, char *path, datum_t *myroot, datum_t *key)
  {
     char *p, *q, *pathend;
@@ -17,16 +25,18 @@
     int rc, len;
     datum_t *found;
     datum_t findkey;
-@@ -419,6 +420,8 @@
+@@ -419,6 +419,10 @@ process_path (client_t *client, char *path, datum_t *myroot, datum_t *key)
           if (!q) q=pathend;
        
           len = q-p;
-+         /* +1 not needed as q-p is already accounting for that */
-+         element = malloc(len);
++         element = malloc(len + 1);
++         if ( element == NULL )
++             return 1;
++
           strncpy(element, p, len);
           element[len] = '\0';
        
-@@ -435,10 +438,13 @@
+@@ -435,10 +439,13 @@ process_path (client_t *client, char *path, datum_t *myroot, datum_t *key)
                 rc = process_path(client, q, found, &findkey);
                 
                 datum_free(found);
@@ -41,7 +51,16 @@
              }
        }
     if (rc) return 1;
-@@ -600,8 +606,8 @@
+@@ -537,7 +544,7 @@ server_thread (void *arg)
+    socklen_t len;
+    client_t client;
+    char remote_ip[16];
+-   char request[REQUESTLEN];
++   char request[REQUESTLEN + 1];
+    llist_entry *le;
+    datum_t rootdatum;
+ 
+@@ -600,8 +607,8 @@ server_thread (void *arg)
                 if (process_request(&client, request))
                    {
                       err_msg("Got a malformed path request from %s", remote_ip);



From krh at fedoraproject.org  Tue Jan 20 21:44:28 2009
From: krh at fedoraproject.org (=?utf-8?q?Kristian_H=C3=B8gsberg?=)
Date: Tue, 20 Jan 2009 21:44:28 +0000 (UTC)
Subject: rpms/xorg-x11-drv-i810/devel .cvsignore, 1.33, 1.34 sources, 1.34, 
	1.35 xorg-x11-drv-i810.spec, 1.120,
	1.121 intel-2.5.99-master.diff, 1.1, NONE intel-fix-flip.patch,
	1.1, NONE intel-stub.c, 1.5, NONE
Message-ID: <20090120214428.273D7700F9@cvs1.fedora.phx.redhat.com>

Author: krh

Update of /cvs/pkgs/rpms/xorg-x11-drv-i810/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1505

Modified Files:
	.cvsignore sources xorg-x11-drv-i810.spec 
Removed Files:
	intel-2.5.99-master.diff intel-fix-flip.patch intel-stub.c 
Log Message:
* Tue Jan 20 2009 Kristian H??gsberg <krh at kabuto.bos.redhat.com> 2.6.0-1
- Update to 2.6.0.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-i810/devel/.cvsignore,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- .cvsignore	20 Dec 2008 22:39:32 -0000	1.33
+++ .cvsignore	20 Jan 2009 21:43:57 -0000	1.34
@@ -1 +1 @@
-xf86-video-intel-2.5.99.1.tar.bz2
+xf86-video-intel-2.6.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-i810/devel/sources,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- sources	20 Dec 2008 22:39:35 -0000	1.34
+++ sources	20 Jan 2009 21:43:57 -0000	1.35
@@ -1 +1 @@
-fb7a7d9e068682aecdd077f2b99a9106  xf86-video-intel-2.5.99.1.tar.bz2
+70f23db0f5178f63b4d688e6fc4a43de  xf86-video-intel-2.6.0.tar.bz2


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.120
retrieving revision 1.121
diff -u -r1.120 -r1.121
--- xorg-x11-drv-i810.spec	29 Dec 2008 01:18:54 -0000	1.120
+++ xorg-x11-drv-i810.spec	20 Jan 2009 21:43:57 -0000	1.121
@@ -5,8 +5,8 @@
 
 Summary:   Xorg X11 Intel video driver(s)
 Name:      xorg-x11-drv-i810
-Version:   2.5.99.1
-Release:   0.3%{?dist}
+Version:   2.6.0
+Release:   1%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -18,11 +18,9 @@
 # the intel-batchbuffer branch.
 #Source1:   xf86-video-intel-%{batchbuffer_version}.tar.bz2 
 Source2:   i810.xinf
-Source3:   intel-stub.c
 
-Patch1: intel-2.5.99-master.diff
+Patch1: intel-2.6.0-to-7db3201.patch
 Patch3: intel-2.1.1-fix-xv-reset.patch
-Patch4: intel-fix-flip.patch
 Patch5: intel-2.5.0-no-legacy-3d.patch
 Patch6: intel-2.5.0-no-gem-legacy-3d.patch
 
@@ -100,6 +98,9 @@
 %{_libdir}/libIntelXvMC.so
 
 %changelog
+* Tue Jan 20 2009 Kristian H??gsberg <krh at kabuto.bos.redhat.com> 2.6.0-1
+- Update to 2.6.0.
+
 * Mon Dec 29 2008 Dave Airlie <airlied at redhat.com> 2.5.99.1-0.3
 - enable KMS code in driver
 


--- intel-2.5.99-master.diff DELETED ---


--- intel-fix-flip.patch DELETED ---


--- intel-stub.c DELETED ---



From ivazquez at fedoraproject.org  Tue Jan 20 21:48:47 2009
From: ivazquez at fedoraproject.org (Ignacio Vazquez-Abrams)
Date: Tue, 20 Jan 2009 21:48:47 +0000 (UTC)
Subject: rpms/gtkparasite/F-10 COPYING.gtkparasite, NONE,
	1.1 gtkparasite-noconfigure.patch, NONE, 1.1 gtkparasite.spec,
	NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090120214847.0A601700F9@cvs1.fedora.phx.redhat.com>

Author: ivazquez

Update of /cvs/pkgs/rpms/gtkparasite/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2463/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	COPYING.gtkparasite gtkparasite-noconfigure.patch 
	gtkparasite.spec import.log 
Log Message:
Initial import


--- NEW FILE COPYING.gtkparasite ---
Copyright (c) 2008-2009 Christian Hammond, David Trowbridge

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.

gtkparasite-noconfigure.patch:

--- NEW FILE gtkparasite-noconfigure.patch ---
diff -up chipx86-gtkparasite-f485897dce3c0a9b7d3fc52bc6856b25fb52e267/autogen.sh.noconfigure chipx86-gtkparasite-f485897dce3c0a9b7d3fc52bc6856b25fb52e267/autogen.sh
--- chipx86-gtkparasite-f485897dce3c0a9b7d3fc52bc6856b25fb52e267/autogen.sh.noconfigure	2009-01-20 08:29:48.000000000 -0500
+++ chipx86-gtkparasite-f485897dce3c0a9b7d3fc52bc6856b25fb52e267/autogen.sh	2009-01-20 08:30:22.000000000 -0500
@@ -46,13 +46,4 @@ autoconf
 
 if [ -x config.status -a -z "$*" ]; then
 	./config.status --recheck
-else
-	if test -z "$*"; then
-		echo "I am going to run ./configure with no arguments - if you wish"
-		echo "to pass any to it, please specify them on the $0  command line."
-		echo "If you do not wish to run ./configure, press  Ctrl-C now."
-		trap 'echo "configure aborted" ; exit 0' 1 2 15
-		sleep 1
-	fi
-	./configure "$@";
 fi


--- NEW FILE gtkparasite.spec ---
%define githash 928494e56f2ab3fef807fde28e888e33ddb94c6a
%define shorthash %(echo "%githash" | cut -c -8)

Name:           gtkparasite
Version:        0
Release:        0.2.20090120git%{shorthash}%{?dist}
Summary:        A GUI debugging tool for GTK+ applications

Group:          Development/Tools
License:        MIT
URL:            http://chipx86.github.com/gtkparasite/
# http://github.com/chipx86/gtkparasite/tarball/master/%{githash}
Source0:        chipx86-gtkparasite-%{githash}.tar.gz
Source1:        COPYING.gtkparasite
Patch0:         gtkparasite-noconfigure.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  gtk2-devel pygtk2-devel
BuildRequires:  autoconf libtool automake
#Requires:       

%description
Parasite is a debugging and development tool that runs inside your GTK+
application's process. It can inspect your application, giving you detailed
information on your UI, such as the hierarchy, X window IDs, widget
properties, and more. You can modify properties on the fly in order to
experiment with the look of your UI.

Parasite includes an embedded Python shell that lets you write new code that
directly interacts with your application's UI, regardless of the language the
application is written in. Create new dialogs, attach temporary signal
handlers to buttons, test out new logic, and gather additional debug
information.

%prep
%setup -qn chipx86-gtkparasite-%{githash}
%patch0 -p1 -b .noconfigure
./autogen.sh
rm COPYING
cp -a %{SOURCE1} COPYING

%build
%configure
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
rm $RPM_BUILD_ROOT%{_libdir}/gtk-2.0/modules/*a

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc COPYING
%{_libdir}/gtk-2.0/modules/libgtkparasite.so

%changelog
* Tue Jan 20 2009 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> 0-0.2.20090120git928494e5
- Rename package
- Update to latest release
- Drop upstreamed patch

* Mon Jan 19 2009 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> 0-0.1.gitf485897d
- Initial RPM release


--- NEW FILE import.log ---
gtkparasite-0-0_2_20090120git928494e5:F-10:gtkparasite-0-0.2.20090120git928494e5.src.rpm:1232488079


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gtkparasite/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	20 Jan 2009 21:06:55 -0000	1.1
+++ .cvsignore	20 Jan 2009 21:48:16 -0000	1.2
@@ -0,0 +1 @@
+chipx86-gtkparasite-928494e56f2ab3fef807fde28e888e33ddb94c6a.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gtkparasite/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	20 Jan 2009 21:06:55 -0000	1.1
+++ sources	20 Jan 2009 21:48:16 -0000	1.2
@@ -0,0 +1 @@
+351ffc4fa8d15105c1f63364bd444f7f  chipx86-gtkparasite-928494e56f2ab3fef807fde28e888e33ddb94c6a.tar.gz



From ivazquez at fedoraproject.org  Tue Jan 20 21:52:44 2009
From: ivazquez at fedoraproject.org (Ignacio Vazquez-Abrams)
Date: Tue, 20 Jan 2009 21:52:44 +0000 (UTC)
Subject: rpms/gtkparasite/F-9 COPYING.gtkparasite, NONE,
	1.1 gtkparasite-noconfigure.patch, NONE, 1.1 gtkparasite.spec,
	NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090120215244.18714700F9@cvs1.fedora.phx.redhat.com>

Author: ivazquez

Update of /cvs/pkgs/rpms/gtkparasite/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3275/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	COPYING.gtkparasite gtkparasite-noconfigure.patch 
	gtkparasite.spec import.log 
Log Message:
Initial import


--- NEW FILE COPYING.gtkparasite ---
Copyright (c) 2008-2009 Christian Hammond, David Trowbridge

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.

gtkparasite-noconfigure.patch:

--- NEW FILE gtkparasite-noconfigure.patch ---
diff -up chipx86-gtkparasite-f485897dce3c0a9b7d3fc52bc6856b25fb52e267/autogen.sh.noconfigure chipx86-gtkparasite-f485897dce3c0a9b7d3fc52bc6856b25fb52e267/autogen.sh
--- chipx86-gtkparasite-f485897dce3c0a9b7d3fc52bc6856b25fb52e267/autogen.sh.noconfigure	2009-01-20 08:29:48.000000000 -0500
+++ chipx86-gtkparasite-f485897dce3c0a9b7d3fc52bc6856b25fb52e267/autogen.sh	2009-01-20 08:30:22.000000000 -0500
@@ -46,13 +46,4 @@ autoconf
 
 if [ -x config.status -a -z "$*" ]; then
 	./config.status --recheck
-else
-	if test -z "$*"; then
-		echo "I am going to run ./configure with no arguments - if you wish"
-		echo "to pass any to it, please specify them on the $0  command line."
-		echo "If you do not wish to run ./configure, press  Ctrl-C now."
-		trap 'echo "configure aborted" ; exit 0' 1 2 15
-		sleep 1
-	fi
-	./configure "$@";
 fi


--- NEW FILE gtkparasite.spec ---
%define githash 928494e56f2ab3fef807fde28e888e33ddb94c6a
%define shorthash %(echo "%githash" | cut -c -8)

Name:           gtkparasite
Version:        0
Release:        0.2.20090120git%{shorthash}%{?dist}
Summary:        A GUI debugging tool for GTK+ applications

Group:          Development/Tools
License:        MIT
URL:            http://chipx86.github.com/gtkparasite/
# http://github.com/chipx86/gtkparasite/tarball/master/%{githash}
Source0:        chipx86-gtkparasite-%{githash}.tar.gz
Source1:        COPYING.gtkparasite
Patch0:         gtkparasite-noconfigure.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  gtk2-devel pygtk2-devel
BuildRequires:  autoconf libtool automake
#Requires:       

%description
Parasite is a debugging and development tool that runs inside your GTK+
application's process. It can inspect your application, giving you detailed
information on your UI, such as the hierarchy, X window IDs, widget
properties, and more. You can modify properties on the fly in order to
experiment with the look of your UI.

Parasite includes an embedded Python shell that lets you write new code that
directly interacts with your application's UI, regardless of the language the
application is written in. Create new dialogs, attach temporary signal
handlers to buttons, test out new logic, and gather additional debug
information.

%prep
%setup -qn chipx86-gtkparasite-%{githash}
%patch0 -p1 -b .noconfigure
./autogen.sh
rm COPYING
cp -a %{SOURCE1} COPYING

%build
%configure
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
rm $RPM_BUILD_ROOT%{_libdir}/gtk-2.0/modules/*a

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc COPYING
%{_libdir}/gtk-2.0/modules/libgtkparasite.so

%changelog
* Tue Jan 20 2009 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> 0-0.2.20090120git928494e5
- Rename package
- Update to latest release
- Drop upstreamed patch

* Mon Jan 19 2009 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> 0-0.1.gitf485897d
- Initial RPM release


--- NEW FILE import.log ---
gtkparasite-0-0_2_20090120git928494e5:F-9:gtkparasite-0-0.2.20090120git928494e5.src.rpm:1232488313


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gtkparasite/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	20 Jan 2009 21:06:55 -0000	1.1
+++ .cvsignore	20 Jan 2009 21:52:13 -0000	1.2
@@ -0,0 +1 @@
+chipx86-gtkparasite-928494e56f2ab3fef807fde28e888e33ddb94c6a.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gtkparasite/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	20 Jan 2009 21:06:55 -0000	1.1
+++ sources	20 Jan 2009 21:52:13 -0000	1.2
@@ -0,0 +1 @@
+351ffc4fa8d15105c1f63364bd444f7f  chipx86-gtkparasite-928494e56f2ab3fef807fde28e888e33ddb94c6a.tar.gz



From sandeen at fedoraproject.org  Tue Jan 20 21:53:15 2009
From: sandeen at fedoraproject.org (Eric Sandeen)
Date: Tue, 20 Jan 2009 21:53:15 +0000 (UTC)
Subject: rpms/e2fsprogs/devel e2fsprogs-1.41.3-resize2fs-fixes.patch, NONE, 
	1.1 e2fsprogs.spec, 1.125, 1.126
Message-ID: <20090120215315.C8CB470142@cvs1.fedora.phx.redhat.com>

Author: sandeen

Update of /cvs/pkgs/rpms/e2fsprogs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3379

Modified Files:
	e2fsprogs.spec 
Added Files:
	e2fsprogs-1.41.3-resize2fs-fixes.patch 
Log Message:
* Tue Jan 20 2009 Eric Sandeen <sandeen at redhat.com> 1.41.3-4
- resize2fs fixes, esp. for ext4


e2fsprogs-1.41.3-resize2fs-fixes.patch:

--- NEW FILE e2fsprogs-1.41.3-resize2fs-fixes.patch ---
commit c58a08e673a10d0e5fa4855ca58ab2cbf48fd029
Author: Theodore Ts'o <tytso at mit.edu>
Date:   Mon Jan 19 08:43:36 2009 -0500

    resize2fs: Move all required blocks for ext4 filesystems
    
    In the function blocks_to_move(), when checking to see if a block
    group's block bitmap is initialized, we need to check the old_fs's
    block group descriptors, not the new file system's (already truncated)
    group descriptor data structures.  Otherwise we will end up
    derferencing past the end of the array boundary, and the resulting
    garbage value may indicate that the bitmap is uninitialized, and so
    all of the blocks in that block group will be skipped, resulting in
    some blocks not getting marked as needing relocation.
    
    This showed up in the following test case:
    
         mke2fs -t ext4 -b 1024 test.img 1048576
         resize2fs test.img 80000
    
    The journal inode after the resize operation looked like this:
    
    debugfs:  stat <8>
    Inode: 8   Type: regular    Mode:  0600   Flags: 0x80000
    ...
    BLOCKS:
    (IND):35385, (0-5836):2356-8192, (5837-21959):8454-24576, (21960-32506):24838-35
    384, (32507-32767):434177-434437
    TOTAL: 32769
    
    The blocks 434177-434437 were not moved because block group 53 was
    wrongly thought to have an unitialized block group.
    
    Signed-off-by: "Theodore Ts'o" <tytso at mit.edu>

diff --git a/resize/resize2fs.c b/resize/resize2fs.c
index abe05f5..e7a08da 100644
--- a/resize/resize2fs.c
+++ b/resize/resize2fs.c
@@ -745,7 +745,7 @@ static errcode_t blocks_to_move(ext2_resize_t rfs)
 		g = ext2fs_group_of_blk(fs, blk);
 		if (EXT2_HAS_RO_COMPAT_FEATURE(fs->super,
 					       EXT4_FEATURE_RO_COMPAT_GDT_CSUM) &&
-		    (fs->group_desc[g].bg_flags & EXT2_BG_BLOCK_UNINIT)) {
+		    (old_fs->group_desc[g].bg_flags & EXT2_BG_BLOCK_UNINIT)) {
 			/*
 			 * The block bitmap is uninitialized, so skip
 			 * to the next block group.

commit 9227c5bbbd0861878ae73f7dceb4deb9e9f06a3c
Author: Theodore Ts'o <tytso at mit.edu>
Date:   Mon Jan 19 09:02:55 2009 -0500

    resize2fs: Release bitmap and itable blocks in flex_bg filesystems
    
    Previously resize2fs assumed that bitmap and inode table blocks were
    always located in their respective block group.  However, this is no
    longer true with flex_bg.  So it is necessary to check all of the
    block groups which will be truncated to see if they have metadata
    blocks that need to be marked as no longer being in use in the new,
    shrunk filesystem.
    
    This bug fixes resize2fs -M, which would otherwise fail because
    without the released blocks, there would not be enough space in the
    filesystem.  This bug also avoids (mostly harmless) filesystem
    corruptions reported by e2fsck regarding blocks marked in use but not
    actually used (these being the bitmap and inode table blocks
    associated with the truncated block groups).
    
    Note: in theory it is possible to have block group N utilize bitmap
    and inode table blocks in block group N+X with flex_bg.  At the moment
    neither mke2fs nor e2fsck will create filesystems like this, which is
    good, because resize2fs doesn't handle this case correctly.
    
    Signed-off-by: "Theodore Ts'o" <tytso at mit.edu>

diff --git a/resize/resize2fs.c b/resize/resize2fs.c
index e7a08da..df4dac7 100644
--- a/resize/resize2fs.c
+++ b/resize/resize2fs.c
@@ -232,6 +232,35 @@ static void fix_uninit_block_bitmaps(ext2_filsys fs)
  */
 
 /*
+ * If the group descriptor's bitmap and inode table blocks are valid,
+ * release them in the specified filesystem data structure
+ */
+static void free_gdp_blocks(ext2_filsys fs, struct ext2_group_desc *gdp)
+{
+	blk_t	blk;
+	int	j;
+
+	if (gdp->bg_block_bitmap &&
+	    (gdp->bg_block_bitmap < fs->super->s_blocks_count))
+		ext2fs_block_alloc_stats(fs, gdp->bg_block_bitmap, -1);
+
+	if (gdp->bg_inode_bitmap &&
+	    (gdp->bg_inode_bitmap < fs->super->s_blocks_count))
+		ext2fs_block_alloc_stats(fs, gdp->bg_inode_bitmap, -1);
+
+	if (gdp->bg_inode_table == 0 ||
+	    (gdp->bg_inode_table >= fs->super->s_blocks_count))
+		return;
+
+	for (blk = gdp->bg_inode_table, j = 0;
+	     j < fs->inode_blocks_per_group; j++, blk++) {
+		if (blk >= fs->super->s_blocks_count)
+			break;
+		ext2fs_block_alloc_stats(fs, blk, -1);
+	}
+}
+
+/*
  * This routine is shared by the online and offline resize routines.
  * All of the information which is adjusted in memory is done here.
  */
@@ -374,6 +403,14 @@ retry:
 	 * can exit now.
 	 */
 	if (old_fs->group_desc_count > fs->group_desc_count) {
+		/*
+		 * Check the block groups that we are chopping off
+		 * and free any blocks associated with their metadata
+		 */
+		for (i = fs->group_desc_count;
+		     i < old_fs->group_desc_count; i++) {
+			free_gdp_blocks(fs, &old_fs->group_desc[i]);
+		}
 		retval = 0;
 		goto errout;
 	}

commit d3a8fc5ae68477118e32813230518bf4ccc73bf9
Author: Theodore Ts'o <tytso at mit.edu>
Date:   Mon Jan 19 14:22:52 2009 -0500

    ext2fs_block_iterate2: Reflect errors from ext2fs_extent_set_bmap to caller
    
    If the callback function tries to change a block, and
    ext2fs_extent_set_bmap() fails for some reason (for example, there
    isn't enough disk space to split a node and expand the extent tree,
    make sure that error is reflected back up to the caller.
    
    Signed-off-by: "Theodore Ts'o" <tytso at mit.edu>

diff --git a/lib/ext2fs/block.c b/lib/ext2fs/block.c
index b19c450..51fdd9a 100644
--- a/lib/ext2fs/block.c
+++ b/lib/ext2fs/block.c
@@ -434,7 +434,7 @@ errcode_t ext2fs_block_iterate2(ext2_filsys fs,
 						       (blk64_t) blockcnt,
 						       (blk64_t) new_blk, 0);
 					if (ctx.errcode)
-						break;
+						goto extent_errout;
 				}
 				if (ret & BLOCK_ABORT)
 					break;

commit 07f1a070ff45c8381c3ddf8552c726525104e1ee
Author: Theodore Ts'o <tytso at mit.edu>
Date:   Mon Jan 19 19:30:59 2009 -0500

    ext2fs_block_iterate2: Preserve the uninit flag in extents
    
    When modifying a block via the block_iterate interface, preserve the
    uninit flag in the extent.  Resize2fs uses this interface, so we have
    to preserve the uninit status when relocating a block.
    
    Signed-off-by: "Theodore Ts'o" <tytso at mit.edu>

diff --git a/lib/ext2fs/block.c b/lib/ext2fs/block.c
index 51fdd9a..6ac9379 100644
--- a/lib/ext2fs/block.c
+++ b/lib/ext2fs/block.c
@@ -364,6 +364,7 @@ errcode_t ext2fs_block_iterate2(ext2_filsys fs,
 		e2_blkcnt_t		blockcnt = 0;
 		blk_t			blk, new_blk;
 		int			op = EXT2_EXTENT_ROOT;
+		int			uninit;
 		unsigned int		j;
 
 		ctx.errcode = ext2fs_extent_open(fs, ino, &handle);
@@ -419,6 +420,9 @@ errcode_t ext2fs_block_iterate2(ext2_filsys fs,
 				}
 				continue;
 			}
+			uninit = 0;
+			if (extent.e_flags & EXT2_EXTENT_FLAGS_UNINIT)
+				uninit = EXT2_EXTENT_SET_BMAP_UNINIT;
 			for (blockcnt = extent.e_lblk, j = 0;
 			     j < extent.e_len;
 			     blk++, blockcnt++, j++) {
@@ -432,7 +436,8 @@ errcode_t ext2fs_block_iterate2(ext2_filsys fs,
 					ctx.errcode =
 						ext2fs_extent_set_bmap(handle,
 						       (blk64_t) blockcnt,
-						       (blk64_t) new_blk, 0);
+						       (blk64_t) new_blk,
+						       uninit);
 					if (ctx.errcode)
 						goto extent_errout;
 				}

commit 793a04a0719d5688a0033e4bda3cf267f57ea760
Author: Theodore Ts'o <tytso at mit.edu>
Date:   Tue Jan 20 00:46:06 2009 -0500

    resize2fs: Reserve some extra space for -P/-M for ext4 filesystems
    
    Some extra blocks may be needed to expand some extent allocation trees
    while we are shrinking the filesystem.  We don't know exactly how
    much, so we use a hueristic.
    
    Signed-off-by: "Theodore Ts'o" <tytso at mit.edu>

diff --git a/resize/resize2fs.c b/resize/resize2fs.c
index df4dac7..b7c42ce 100644
--- a/resize/resize2fs.c
+++ b/resize/resize2fs.c
@@ -1954,5 +1954,13 @@ blk_t calculate_minimum_resize_size(ext2_filsys fs)
 	blks_needed = (groups-1) * EXT2_BLOCKS_PER_GROUP(fs->super);
 	blks_needed += overhead;
 
+	/*
+	 * We need to reserve a few extra blocks if extents are
+	 * enabled, in case we need to grow the extent tree.  The more
+	 * we shrink the file system, the more space we need.
+	 */
+	if (fs->super->s_feature_incompat & EXT3_FEATURE_INCOMPAT_EXTENTS)
+		blks_needed += (fs->super->s_blocks_count - blks_needed)/500;
+
 	return blks_needed;
 }


Index: e2fsprogs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/e2fsprogs/devel/e2fsprogs.spec,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -r1.125 -r1.126
--- e2fsprogs.spec	10 Jan 2009 16:40:49 -0000	1.125
+++ e2fsprogs.spec	20 Jan 2009 21:52:45 -0000	1.126
@@ -4,7 +4,7 @@
 Summary: Utilities for managing the second and third extended (ext2/ext3) filesystems
 Name: e2fsprogs
 Version: 1.41.3
-Release: 3%{?dist}
+Release: 4%{?dist}
 # License based on upstream-modified COPYING file,
 # which clearly states "V2" intent.
 License: GPLv2
@@ -16,6 +16,7 @@
 Patch1: e2fsprogs-1.38-etcblkid.patch
 Patch2: e2fsprogs-1.40.4-sb_feature_check_ignore.patch
 Patch3: e2fsprogs-1.41.3-blkid-btrfs.patch
+Patch4: e2fsprogs-1.41.3-resize2fs-fixes.patch
 
 Url: http://e2fsprogs.sourceforge.net/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -94,6 +95,8 @@
 %patch2 -p1 -b .featurecheck
 # Only change the journal placement for ext4, for now.
 %patch3 -p1 -b .journalmove
+# Fix some resize2fs issues
+%patch4 -p1 -b .resize2fs
 
 %build
 %configure --enable-elf-shlibs --enable-nls --disable-e2initrd-helper  --enable-blkid-devmapper --enable-blkid-selinux
@@ -292,6 +295,9 @@
 %dir %attr(2775, uuidd, uuidd) /var/lib/libuuid
 
 %changelog
+* Tue Jan 20 2009 Eric Sandeen <sandeen at redhat.com> 1.41.3-4
+- resize2fs fixes, esp. for ext4
+
 * Sat Jan 10 2009 Eric Sandeen <sandeen at redhat.com> 1.41.3-3
 - Remove conservative "don't change journal location" patch for F11
 - Add btrfs recognition to blkid



From pwouters at fedoraproject.org  Tue Jan 20 21:58:29 2009
From: pwouters at fedoraproject.org (Paul Wouters)
Date: Tue, 20 Jan 2009 21:58:29 +0000 (UTC)
Subject: rpms/unbound/F-9 unbound.spec,1.2,1.3
Message-ID: <20090120215829.CA283700F9@cvs1.fedora.phx.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/unbound/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4764

Modified Files:
	unbound.spec 
Log Message:
update version



Index: unbound.spec
===================================================================
RCS file: /cvs/extras/rpms/unbound/F-9/unbound.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- unbound.spec	20 Jan 2009 21:56:11 -0000	1.2
+++ unbound.spec	20 Jan 2009 21:57:59 -0000	1.3
@@ -1,7 +1,7 @@
 Summary: Validating, recursive, and caching DNS(SEC) resolver
 Name: unbound
-Version: 1.0.2
-Release: 5%{?dist}
+Version: 1.2.0
+Release: 1%{?dist}
 License: BSD
 Url: http://www.nlnetlabs.nl/unbound/
 Source: http://www.unbound.net/downloads/%{name}-%{version}.tar.gz



From sergiopr at fedoraproject.org  Tue Jan 20 21:59:06 2009
From: sergiopr at fedoraproject.org (Sergio Pascual)
Date: Tue, 20 Jan 2009 21:59:06 +0000 (UTC)
Subject: rpms/tkimg/devel tkimg.spec,1.11,1.12
Message-ID: <20090120215906.7B66C700F9@cvs1.fedora.phx.redhat.com>

Author: sergiopr

Update of /cvs/pkgs/rpms/tkimg/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4881

Modified Files:
	tkimg.spec 
Log Message:
* Tue Jan 20 2009 Sergio Pascual <sergiopr at fedoraproject.org>  1.4-0.3.20081115svn
- Adding libXft-devel to build requires



Index: tkimg.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tkimg/devel/tkimg.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- tkimg.spec	20 Jan 2009 21:38:28 -0000	1.11
+++ tkimg.spec	20 Jan 2009 21:58:36 -0000	1.12
@@ -5,7 +5,7 @@
 
 Name: tkimg
 Version: 1.4
-Release: 0.2.%{svnversion}svn%{?dist}
+Release: 0.3.%{svnversion}svn%{?dist}
 Summary: More Image Formats for Tk
 
 Group: Development/Libraries
@@ -24,7 +24,7 @@
 Buildroot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 BuildRequires: tcl-devel tk-devel
-BuildRequires: libtiff-devel libpng-devel libjpeg-devel zlib-devel
+BuildRequires: libtiff-devel libpng-devel libjpeg-devel zlib-devel libXft-devel
 
 Requires: tcl(abi) = 8.5
 
@@ -89,6 +89,9 @@
 %{tcl_sitearch}/Img1.4/*.a
 
 %changelog
+* Tue Jan 20 2009 Sergio Pascual <sergiopr at fedoraproject.org>  1.4-0.3.20081115svn
+- Adding libXft-devel to build requires
+
 * Tue Jan 20 2009 Sergio Pascual <sergiopr at fedoraproject.org>  1.4-0.2.20081115svn
 - Reverting patches to fix bz #468357
 



From georgiou at fedoraproject.org  Tue Jan 20 22:01:03 2009
From: georgiou at fedoraproject.org (Kostas Georgiou)
Date: Tue, 20 Jan 2009 22:01:03 +0000 (UTC)
Subject: rpms/ganglia/EL-5 .cvsignore, 1.4, 1.5 ganglia.spec, 1.7,
	1.8 sources, 1.4, 1.5
Message-ID: <20090120220103.55880700F9@cvs1.fedora.phx.redhat.com>

Author: georgiou

Update of /cvs/extras/rpms/ganglia/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5236

Modified Files:
	.cvsignore ganglia.spec sources 
Log Message:
Update to latest release and security fixes from #480236



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ganglia/EL-5/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	19 Dec 2007 15:51:14 -0000	1.4
+++ .cvsignore	20 Jan 2009 22:00:32 -0000	1.5
@@ -1,2 +1 @@
-ganglia-3.0.5.tar.gz
-ganglia-3.0.6.tar.gz
+ganglia-3.0.7.tar.gz


Index: ganglia.spec
===================================================================
RCS file: /cvs/extras/rpms/ganglia/EL-5/ganglia.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ganglia.spec	19 Dec 2007 15:51:14 -0000	1.7
+++ ganglia.spec	20 Jan 2009 22:00:32 -0000	1.8
@@ -1,5 +1,5 @@
 Name:               ganglia
-Version:            3.0.6
+Version:            3.0.7
 Release:            1%{?dist}
 Summary:            Ganglia Distributed Monitoring System
 
@@ -7,6 +7,7 @@
 License:            BSD
 URL:                http://ganglia.sourceforge.net/
 Source0:            http://dl.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.gz
+Patch0:             gmetad-bof-dos.patch
 Buildroot:          %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:      rrdtool-devel
@@ -70,6 +71,7 @@
 
 %prep 
 %setup -q
+%patch0 -p0
 ## Hey, those shouldn't be executable...
 chmod -x lib/*.{h,x}
 
@@ -205,6 +207,10 @@
 %{_datadir}/%{name}
 
 %changelog
+* Tue Jan 20 2009 Kostas Georgiou <k.georgiou at imperial.ac.uk> - 3.0.7-1
+- New upstream release
+- [480236] fix for a buffer overflow and an off-by-one bug in gmetad
+
 * Mon Dec 17 2007 Jarod Wilson <jwilson at redhat.com> 3.0.6-1
 - New upstream release (security fix for web frontend
   cross-scripting vulnerability)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ganglia/EL-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	19 Dec 2007 15:51:14 -0000	1.4
+++ sources	20 Jan 2009 22:00:32 -0000	1.5
@@ -1 +1 @@
-f2fecaae424be95ddf8b2cc6247be31d  ganglia-3.0.6.tar.gz
+20c210ed33061737e2496fee9243b1f4  ganglia-3.0.7.tar.gz



From georgiou at fedoraproject.org  Tue Jan 20 22:01:38 2009
From: georgiou at fedoraproject.org (Kostas Georgiou)
Date: Tue, 20 Jan 2009 22:01:38 +0000 (UTC)
Subject: rpms/ganglia/EL-5 gmetad-bof-dos.patch,NONE,1.1
Message-ID: <20090120220138.30070700F9@cvs1.fedora.phx.redhat.com>

Author: georgiou

Update of /cvs/extras/rpms/ganglia/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5575

Added Files:
	gmetad-bof-dos.patch 
Log Message:
The patch


gmetad-bof-dos.patch:

--- NEW FILE gmetad-bof-dos.patch ---
--- gmetad/server.c.orig
+++ gmetad/server.c
@@ -11,6 +11,7 @@
 #include "dtd.h"
 #include "gmetad.h"
 #include "my_inet_ntop.h"
+#include <stdlib.h>
 
 extern g_tcp_socket *server_socket;
 extern pthread_mutex_t  server_socket_mutex;
@@ -370,14 +371,13 @@ tree_report(datum_t *key, datum_t *val, void *arg)
    
 /* sacerdoti: This function does a tree walk while respecting the filter path.
  * Will return valid XML even if we have chosen a subtree. Since tree depth is
- * bounded, this function guarantees O(1) search time. The recursive structure 
- * does not require any memory allocations. 
+ * bounded, this function guarantees O(1) search time.
  */
 static int
 process_path (client_t *client, char *path, datum_t *myroot, datum_t *key)
 {
    char *p, *q, *pathend;
-   char element[256];
+   char *element;
    int rc, len;
    datum_t *found;
    datum_t findkey;
@@ -419,6 +419,10 @@ process_path (client_t *client, char *path, datum_t *myroot, datum_t *key)
          if (!q) q=pathend;
       
          len = q-p;
+         element = malloc(len + 1);
+         if ( element == NULL )
+             return 1;
+
          strncpy(element, p, len);
          element[len] = '\0';
       
@@ -435,10 +439,13 @@ process_path (client_t *client, char *path, datum_t *myroot, datum_t *key)
                rc = process_path(client, q, found, &findkey);
                
                datum_free(found);
+               free(element);
             }
          else
             {
-               rc = process_path(client, 0, myroot, NULL);
+               /* element not found */
+               free(element);
+               return 1;
             }
       }
    if (rc) return 1;
@@ -537,7 +544,7 @@ server_thread (void *arg)
    socklen_t len;
    client_t client;
    char remote_ip[16];
-   char request[REQUESTLEN];
+   char request[REQUESTLEN + 1];
    llist_entry *le;
    datum_t rootdatum;
 
@@ -600,8 +607,8 @@ server_thread (void *arg)
                if (process_request(&client, request))
                   {
                      err_msg("Got a malformed path request from %s", remote_ip);
-                     /* Send them the entire tree to discourage attacks. */
-                     strcpy(request, "/");
+                     close(client.fd);
+                     continue;
                   }
             }
          else



From georgiou at fedoraproject.org  Tue Jan 20 22:08:31 2009
From: georgiou at fedoraproject.org (Kostas Georgiou)
Date: Tue, 20 Jan 2009 22:08:31 +0000 (UTC)
Subject: rpms/ganglia/EL-4 gmetad-bof-dos.patch, NONE, 1.1 .cvsignore, 1.4, 
	1.5 ganglia.spec, 1.5, 1.6 sources, 1.4, 1.5
Message-ID: <20090120220831.0A42F700F9@cvs1.fedora.phx.redhat.com>

Author: georgiou

Update of /cvs/extras/rpms/ganglia/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6844

Modified Files:
	.cvsignore ganglia.spec sources 
Added Files:
	gmetad-bof-dos.patch 
Log Message:
Update to latest release and security fixes from #480236


gmetad-bof-dos.patch:

--- NEW FILE gmetad-bof-dos.patch ---
--- gmetad/server.c.orig
+++ gmetad/server.c
@@ -11,6 +11,7 @@
 #include "dtd.h"
 #include "gmetad.h"
 #include "my_inet_ntop.h"
+#include <stdlib.h>
 
 extern g_tcp_socket *server_socket;
 extern pthread_mutex_t  server_socket_mutex;
@@ -370,14 +371,13 @@ tree_report(datum_t *key, datum_t *val, void *arg)
    
 /* sacerdoti: This function does a tree walk while respecting the filter path.
  * Will return valid XML even if we have chosen a subtree. Since tree depth is
- * bounded, this function guarantees O(1) search time. The recursive structure 
- * does not require any memory allocations. 
+ * bounded, this function guarantees O(1) search time.
  */
 static int
 process_path (client_t *client, char *path, datum_t *myroot, datum_t *key)
 {
    char *p, *q, *pathend;
-   char element[256];
+   char *element;
    int rc, len;
    datum_t *found;
    datum_t findkey;
@@ -419,6 +419,10 @@ process_path (client_t *client, char *path, datum_t *myroot, datum_t *key)
          if (!q) q=pathend;
       
          len = q-p;
+         element = malloc(len + 1);
+         if ( element == NULL )
+             return 1;
+
          strncpy(element, p, len);
          element[len] = '\0';
       
@@ -435,10 +439,13 @@ process_path (client_t *client, char *path, datum_t *myroot, datum_t *key)
                rc = process_path(client, q, found, &findkey);
                
                datum_free(found);
+               free(element);
             }
          else
             {
-               rc = process_path(client, 0, myroot, NULL);
+               /* element not found */
+               free(element);
+               return 1;
             }
       }
    if (rc) return 1;
@@ -537,7 +544,7 @@ server_thread (void *arg)
    socklen_t len;
    client_t client;
    char remote_ip[16];
-   char request[REQUESTLEN];
+   char request[REQUESTLEN + 1];
    llist_entry *le;
    datum_t rootdatum;
 
@@ -600,8 +607,8 @@ server_thread (void *arg)
                if (process_request(&client, request))
                   {
                      err_msg("Got a malformed path request from %s", remote_ip);
-                     /* Send them the entire tree to discourage attacks. */
-                     strcpy(request, "/");
+                     close(client.fd);
+                     continue;
                   }
             }
          else


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ganglia/EL-4/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	19 Dec 2007 15:55:29 -0000	1.4
+++ .cvsignore	20 Jan 2009 22:08:00 -0000	1.5
@@ -1,2 +1 @@
-ganglia-3.0.5.tar.gz
-ganglia-3.0.6.tar.gz
+ganglia-3.0.7.tar.gz


Index: ganglia.spec
===================================================================
RCS file: /cvs/extras/rpms/ganglia/EL-4/ganglia.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ganglia.spec	19 Dec 2007 15:55:29 -0000	1.5
+++ ganglia.spec	20 Jan 2009 22:08:00 -0000	1.6
@@ -1,5 +1,5 @@
 Name:               ganglia
-Version:            3.0.6
+Version:            3.0.7
 Release:            1%{?dist}
 Summary:            Ganglia Distributed Monitoring System
 
@@ -7,6 +7,7 @@
 License:            BSD
 URL:                http://ganglia.sourceforge.net/
 Source0:            http://dl.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.gz
+Patch0:             gmetad-bof-dos.patch
 Buildroot:          %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:      rrdtool-devel
@@ -70,6 +71,7 @@
 
 %prep 
 %setup -q
+%patch0 -p0
 ## Hey, those shouldn't be executable...
 chmod -x lib/*.{h,x}
 
@@ -205,6 +207,10 @@
 %{_datadir}/%{name}
 
 %changelog
+* Tue Jan 20 2009 Kostas Georgiou <k.georgiou at imperial.ac.uk> - 3.0.7-1
+- New upstream release
+- [480236] fix for a buffer overflow and an off-by-one bug in gmetad
+
 * Mon Dec 17 2007 Jarod Wilson <jwilson at redhat.com> 3.0.6-1
 - New upstream release (security fix for web frontend
   cross-scripting vulnerability)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ganglia/EL-4/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	19 Dec 2007 15:55:29 -0000	1.4
+++ sources	20 Jan 2009 22:08:00 -0000	1.5
@@ -1 +1 @@
-f2fecaae424be95ddf8b2cc6247be31d  ganglia-3.0.6.tar.gz
+20c210ed33061737e2496fee9243b1f4  ganglia-3.0.7.tar.gz



From konradm at fedoraproject.org  Tue Jan 20 22:11:22 2009
From: konradm at fedoraproject.org (Conrad Meyer)
Date: Tue, 20 Jan 2009 22:11:22 +0000 (UTC)
Subject: rpms/cpphs/devel cpphs.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090120221122.BED02700F9@cvs1.fedora.phx.redhat.com>

Author: konradm

Update of /cvs/pkgs/rpms/cpphs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7414/devel

Modified Files:
	.cvsignore sources 
Added Files:
	cpphs.spec import.log 
Log Message:
Initial import.



--- NEW FILE cpphs.spec ---
%define ghc_version 6.10.1

%define pkg_libdir %{_libdir}/ghc-%{ghc_version}/%{name}-%{version}
%define pkg_docdir %{_docdir}/ghc/libraries/%{name}-%{version}

%bcond_without prof
%bcond_without doc

# ghc does not emit debug information
%define debug_package %{nil}

Name:           cpphs
Version:        1.6
Release:        4%{?dist}
Summary:        C pre-processor for Haskell
Group:          Development/Languages
License:        GPL+ and LGPLv2+
URL:            http://hackage.haskell.org/cgi-bin/hackage-scripts/package/%{name}
Source0:        http://hackage.haskell.org/packages/archive/%{name}/%{version}/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# ghc has only been bootstrapped on the following archs:
ExclusiveArch:  i386 x86_64 ppc
BuildRequires:  ghc = %{ghc_version}
%if %{with prof}
BuildRequires:  ghc-prof = %{ghc_version}
%endif

%description
Cpphs is a re-implementation of the C pre-processor that is both more
compatible with Haskell, and itself written in Haskell so that it can be
distributed with compilers.

This version of the C pre-processor is pretty-much feature-complete and
compatible with traditional (K&R) pre-processors. Additional features
include: a plain-text mode; an option to unlit literate code files; and
an option to turn off macro-expansion.


%package -n ghc-%{name}
Summary:        Libraries for %{name}
Group:          Development/Libraries
License:        LGPLv2+
Provides:       ghc-%{name}-devel = %{version}-%{release}
Requires:       ghc = %{ghc_version}
Requires(post): ghc = %{ghc_version}
Requires(preun): ghc = %{ghc_version}

%description -n ghc-%{name}
Haskell %{name} library for ghc.

%if %{with doc}
%package -n ghc-%{name}-doc
Summary: Documentation for %{name}
Group: Development/Libraries
Requires: ghc-doc = %{ghc_version}
Requires(postun): ghc-doc = %{ghc_version}

%description -n ghc-%{name}-doc
This package contains development documentation files for the %{name}
library.
%endif

%if %{with prof}
%package -n ghc-%{name}-prof
Summary:        Profiling libraries for %{name}
Group:          Development/Libraries
License:        LGPLv2+
Requires:       ghc-%{name} = %{version}-%{release}
Requires:       ghc-prof = %{ghc_version}

%description -n ghc-%{name}-prof
This package contains profiling libraries for %{name}.
%endif


%prep
%setup -q


%build
%cabal_configure --ghc %{!?without_prof:-p}
%cabal build
%if %{with doc}
%cabal haddock
%endif
%ghc_gen_scripts


%install
rm -rf $RPM_BUILD_ROOT
%cabal_install
%ghc_install_scripts
%ghc_gen_filelists ghc-%{name}


%clean
rm -rf $RPM_BUILD_ROOT


%post -n ghc-%{name}
%ghc_register_pkg


%if %{with doc}
%post -n ghc-%{name}-doc
%ghc_reindex_haddock
%endif


%preun -n ghc-%{name}
if [ "$1" -eq 0 ] ; then
  %ghc_unregister_pkg
fi


%if %{with doc}
%postun -n ghc-%{name}-doc
if [ "$1" -eq 0 ] ; then
  %ghc_reindex_haddock
fi
%endif


%files
%defattr(-,root,root,-)
%doc docs/index.html
%{_bindir}/%{name}


%files -n ghc-%{name} -f ghc-%{name}.files
%defattr(-,root,root,-)
%doc LICENCE-LGPL


%if %{with doc}
%files -n ghc-%{name}-doc
%defattr(-,root,root,-)
%{pkg_docdir}
%endif


%if %{with prof}
%files -n ghc-%{name}-prof -f ghc-%{name}-prof.files
%defattr(-,root,root,-)
%endif


%changelog
* Mon Jan 19 2009 Conrad Meyer <konrad at tylerc.org> - 1.6-4
- update to new template (haskell-packaging 0.4-1)

* Wed Jan 14 2009 Jens Petersen <petersen at redhat.com> - 1.6-3
- simplify summaries
- move lgpl license file to ghc-cpphs
- add html doc

* Tue Jan 13 2009 Jens Petersen <petersen at redhat.com> - 1.6-2
- make this a proper binlib package
- use bcond

* Mon Jan 12 2009 Conrad Meyer <konrad at tylerc.org> - 1.6-1
- initial packaging for Fedora created by cabal2spec


--- NEW FILE import.log ---
cpphs-1_6-4_fc9:HEAD:cpphs-1.6-4.fc9.src.rpm:1232489431


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cpphs/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	20 Jan 2009 21:16:52 -0000	1.1
+++ .cvsignore	20 Jan 2009 22:10:52 -0000	1.2
@@ -0,0 +1 @@
+cpphs-1.6.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cpphs/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	20 Jan 2009 21:16:52 -0000	1.1
+++ sources	20 Jan 2009 22:10:52 -0000	1.2
@@ -0,0 +1 @@
+8a7565ff3b2d7bdb594af4c10c594951  cpphs-1.6.tar.gz



From nsantos at fedoraproject.org  Tue Jan 20 22:14:02 2009
From: nsantos at fedoraproject.org (Nuno Santos)
Date: Tue, 20 Jan 2009 22:14:02 +0000 (UTC)
Subject: rpms/qpidc/devel qpidc.spec,1.63,1.64
Message-ID: <20090120221402.9DE9B700F9@cvs1.fedora.phx.redhat.com>

Author: nsantos

Update of /cvs/extras/rpms/qpidc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7870

Modified Files:
	qpidc.spec 
Log Message:
BZ474614 and BZ474613 - qpidc/rhm unowned directories


Index: qpidc.spec
===================================================================
RCS file: /cvs/extras/rpms/qpidc/devel/qpidc.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- qpidc.spec	20 Jan 2009 22:11:59 -0000	1.63
+++ qpidc.spec	20 Jan 2009 22:13:32 -0000	1.64
@@ -7,7 +7,7 @@
 
 Name:           qpidc
 Version:        0.4.734452
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Libraries for Qpid C++ client applications
 Group:          System Environment/Libraries
 License:        ASL 2.0
@@ -374,6 +374,9 @@
 %postun -n qmf -p /sbin/ldconfig
 
 %changelog
+* Tue Jan 20 2009 Nuno Santos <nsantos at redhat.com> - 0.4.734452-2
+- BZ474614 and BZ474613 - qpidc/rhm unowned directories
+
 * Thu Jan 15 2009 Nuno Santos <nsantos at redhat.com> - 0.4.734452-1
 - Rebased to svn rev 734452
 



From pwouters at fedoraproject.org  Tue Jan 20 22:14:42 2009
From: pwouters at fedoraproject.org (Paul Wouters)
Date: Tue, 20 Jan 2009 22:14:42 +0000 (UTC)
Subject: rpms/unbound/F-9 unbound-libevent-r1441.patch,NONE,1.1
Message-ID: <20090120221442.620BF700F9@cvs1.fedora.phx.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/unbound/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8088

Added Files:
	unbound-libevent-r1441.patch 
Log Message:
patch taken from svn r1441 to fix crasher when using libevent < 1.4


unbound-libevent-r1441.patch:

--- NEW FILE unbound-libevent-r1441.patch ---
Index: util/netevent.c
===================================================================
--- util/netevent.c	(revision 1440)
+++ util/netevent.c	(revision 1441)
@@ -169,12 +169,14 @@
 		return NULL;
 	}
 	comm_base_now(b);
+	/* avoid event_get_method call which causes crashes even when
+	 * not printing, because its result is passed */
 	verbose(VERB_ALGO, "libevent %s uses %s method.", 
 		event_get_version(), 
 #ifdef HAVE_EVENT_BASE_GET_METHOD
 		event_base_get_method(b->eb->base)
 #else
-		event_get_method()
+		"not_obtainable"
 #endif
 	);
 	return b;



From anyremote at fedoraproject.org  Tue Jan 20 21:26:42 2009
From: anyremote at fedoraproject.org (Mikhail Fedotov)
Date: Tue, 20 Jan 2009 21:26:42 +0000 (UTC)
Subject: rpms/kanyremote/F-9 .cvsignore, 1.11, 1.12 import.log, 1.10,
	1.11 kanyremote.spec, 1.13, 1.14 sources, 1.14, 1.15
Message-ID: <20090120212642.6107A700F9@cvs1.fedora.phx.redhat.com>

Author: anyremote

Update of /cvs/pkgs/rpms/kanyremote/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31559/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.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	21 Dec 2008 12:39:59 -0000	1.11
+++ .cvsignore	20 Jan 2009 21:26:11 -0000	1.12
@@ -1 +1 @@
-kanyremote-5.5.1.tar.gz
+kanyremote-5.6.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/kanyremote/F-9/import.log,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- import.log	21 Dec 2008 14:25:58 -0000	1.10
+++ import.log	20 Jan 2009 21:26:11 -0000	1.11
@@ -8,3 +8,4 @@
 kanyremote-5_5_1-1_fc10:F-9:kanyremote-5.5.1-1.fc10.src.rpm:1229863018
 kanyremote-5_5_1-2_fc10:F-9:kanyremote-5.5.1-2.fc10.src.rpm:1229864429
 kanyremote-5_5_1-3_fc10:F-9:kanyremote-5.5.1-3.fc10.src.rpm:1229869440
+kanyremote-5_6-1_fc10:F-9:kanyremote-5.6-1.fc10.src.rpm:1232486741


Index: kanyremote.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kanyremote/F-9/kanyremote.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- kanyremote.spec	21 Dec 2008 14:25:58 -0000	1.13
+++ kanyremote.spec	20 Jan 2009 21:26:11 -0000	1.14
@@ -1,11 +1,11 @@
 Summary: KDE frontend for anyRemote
 Name: kanyremote
-Version: 5.5.1
-Release: 3%{?dist}
+Version: 5.6
+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, bluez-utils >= 3.35, anyremote >= 4.13
+Requires: PyKDE >= 3.16, PyQt >= 3.17, pybluez >= 0.9.1, bluez-utils >= 3.35, anyremote >= 4.14
 BuildRequires: desktop-file-utils
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 URL: http://anyremote.sourceforge.net/
@@ -38,8 +38,8 @@
 
 %changelog
 
-* Sun Dec 21 2008 Mikhail Fedotov <anyremote at mail.ru> - 5.5.1-2
-- Rebuild
+* Mon Jan 19 2009 Mikhail Fedotov <anyremote at mail.ru> - 5.6-1
+- Check java client version on the web site
 
 * Sun Dec 21 2008 Mikhail Fedotov <anyremote at mail.ru> - 5.5.1-1
 - Fix upload from web feature


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kanyremote/F-9/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	21 Dec 2008 14:25:58 -0000	1.14
+++ sources	20 Jan 2009 21:26:11 -0000	1.15
@@ -1 +1 @@
-31ab093451eb5745d69bd0d2fc22438f  kanyremote-5.5.1.tar.gz
+3e3d9a6c90bbd3bf5bc9ac7be5e62afc  kanyremote-5.6.tar.gz



From anyremote at fedoraproject.org  Tue Jan 20 21:26:44 2009
From: anyremote at fedoraproject.org (Mikhail Fedotov)
Date: Tue, 20 Jan 2009 21:26:44 +0000 (UTC)
Subject: rpms/kanyremote/F-10 .cvsignore, 1.11, 1.12 import.log, 1.11,
	1.12 kanyremote.spec, 1.12, 1.13 sources, 1.14, 1.15
Message-ID: <20090120212644.610CD700F9@cvs1.fedora.phx.redhat.com>

Author: anyremote

Update of /cvs/pkgs/rpms/kanyremote/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31580/F-10

Modified Files:
	.cvsignore import.log kanyremote.spec sources 
Log Message:
build


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kanyremote/F-10/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	21 Dec 2008 12:39:57 -0000	1.11
+++ .cvsignore	20 Jan 2009 21:26:13 -0000	1.12
@@ -1 +1 @@
-kanyremote-5.5.1.tar.gz
+kanyremote-5.6.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/kanyremote/F-10/import.log,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- import.log	21 Dec 2008 15:07:10 -0000	1.11
+++ import.log	20 Jan 2009 21:26:14 -0000	1.12
@@ -9,3 +9,4 @@
 kanyremote-5_5-1_fc10:F-10:kanyremote-5.5-1.fc10.src.rpm:1229629390
 kanyremote-5_5_1-1_fc10:F-10:kanyremote-5.5.1-1.fc10.src.rpm:1229863027
 kanyremote-5_5_1-3_fc10:F-10:kanyremote-5.5.1-3.fc10.src.rpm:1229871847
+kanyremote-5_6-1_fc10:F-10:kanyremote-5.6-1.fc10.src.rpm:1232486740


Index: kanyremote.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kanyremote/F-10/kanyremote.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- kanyremote.spec	21 Dec 2008 15:07:10 -0000	1.12
+++ kanyremote.spec	20 Jan 2009 21:26:14 -0000	1.13
@@ -1,11 +1,11 @@
 Summary: KDE frontend for anyRemote
 Name: kanyremote
-Version: 5.5.1
-Release: 3%{?dist}
+Version: 5.6
+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, bluez-utils >= 3.35, anyremote >= 4.13
+Requires: PyKDE >= 3.16, PyQt >= 3.17, pybluez >= 0.9.1, bluez-utils >= 3.35, anyremote >= 4.14
 BuildRequires: desktop-file-utils
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 URL: http://anyremote.sourceforge.net/
@@ -38,8 +38,8 @@
 
 %changelog
 
-* Sun Dec 21 2008 Mikhail Fedotov <anyremote at mail.ru> - 5.5.1-2
-- Rebuild
+* Mon Jan 19 2009 Mikhail Fedotov <anyremote at mail.ru> - 5.6-1
+- Check java client version on the web site
 
 * Sun Dec 21 2008 Mikhail Fedotov <anyremote at mail.ru> - 5.5.1-1
 - Fix upload from web feature


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kanyremote/F-10/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	21 Dec 2008 15:07:10 -0000	1.14
+++ sources	20 Jan 2009 21:26:14 -0000	1.15
@@ -1 +1 @@
-31ab093451eb5745d69bd0d2fc22438f  kanyremote-5.5.1.tar.gz
+3e3d9a6c90bbd3bf5bc9ac7be5e62afc  kanyremote-5.6.tar.gz



From anyremote at fedoraproject.org  Tue Jan 20 21:26:45 2009
From: anyremote at fedoraproject.org (Mikhail Fedotov)
Date: Tue, 20 Jan 2009 21:26:45 +0000 (UTC)
Subject: rpms/kanyremote/devel .cvsignore, 1.11, 1.12 import.log, 1.11,
	1.12 kanyremote.spec, 1.12, 1.13 sources, 1.14, 1.15
Message-ID: <20090120212645.AE773700F9@cvs1.fedora.phx.redhat.com>

Author: anyremote

Update of /cvs/pkgs/rpms/kanyremote/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31601/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.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	21 Dec 2008 12:39:55 -0000	1.11
+++ .cvsignore	20 Jan 2009 21:26:15 -0000	1.12
@@ -1 +1 @@
-kanyremote-5.5.1.tar.gz
+kanyremote-5.6.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/kanyremote/devel/import.log,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- import.log	21 Dec 2008 15:28:14 -0000	1.11
+++ import.log	20 Jan 2009 21:26:15 -0000	1.12
@@ -9,3 +9,4 @@
 kanyremote-5_5-1_fc10:HEAD:kanyremote-5.5-1.fc10.src.rpm:1229629736
 kanyremote-5_5_1-1_fc10:HEAD:kanyremote-5.5.1-1.fc10.src.rpm:1229863038
 kanyremote-5_5_1-3_fc10:HEAD:kanyremote-5.5.1-3.fc10.src.rpm:1229872727
+kanyremote-5_6-1_fc10:HEAD:kanyremote-5.6-1.fc10.src.rpm:1232486746


Index: kanyremote.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kanyremote/devel/kanyremote.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- kanyremote.spec	21 Dec 2008 15:28:14 -0000	1.12
+++ kanyremote.spec	20 Jan 2009 21:26:15 -0000	1.13
@@ -1,11 +1,11 @@
 Summary: KDE frontend for anyRemote
 Name: kanyremote
-Version: 5.5.1
-Release: 3%{?dist}
+Version: 5.6
+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, bluez-utils >= 3.35, anyremote >= 4.13
+Requires: PyKDE >= 3.16, PyQt >= 3.17, pybluez >= 0.9.1, bluez-utils >= 3.35, anyremote >= 4.14
 BuildRequires: desktop-file-utils
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 URL: http://anyremote.sourceforge.net/
@@ -38,8 +38,8 @@
 
 %changelog
 
-* Sun Dec 21 2008 Mikhail Fedotov <anyremote at mail.ru> - 5.5.1-2
-- Rebuild
+* Mon Jan 19 2009 Mikhail Fedotov <anyremote at mail.ru> - 5.6-1
+- Check java client version on the web site
 
 * Sun Dec 21 2008 Mikhail Fedotov <anyremote at mail.ru> - 5.5.1-1
 - Fix upload from web feature


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kanyremote/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	21 Dec 2008 15:28:14 -0000	1.14
+++ sources	20 Jan 2009 21:26:15 -0000	1.15
@@ -1 +1 @@
-31ab093451eb5745d69bd0d2fc22438f  kanyremote-5.5.1.tar.gz
+3e3d9a6c90bbd3bf5bc9ac7be5e62afc  kanyremote-5.6.tar.gz



From ivazquez at fedoraproject.org  Tue Jan 20 21:47:18 2009
From: ivazquez at fedoraproject.org (Ignacio Vazquez-Abrams)
Date: Tue, 20 Jan 2009 21:47:18 +0000 (UTC)
Subject: rpms/gtkparasite/devel COPYING.gtkparasite, NONE,
	1.1 gtkparasite-noconfigure.patch, NONE, 1.1 gtkparasite.spec,
	NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090120214718.903D6700F9@cvs1.fedora.phx.redhat.com>

Author: ivazquez

Update of /cvs/pkgs/rpms/gtkparasite/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2062/devel

Modified Files:
	.cvsignore sources 
Added Files:
	COPYING.gtkparasite gtkparasite-noconfigure.patch 
	gtkparasite.spec import.log 
Log Message:
Initial import


--- NEW FILE COPYING.gtkparasite ---
Copyright (c) 2008-2009 Christian Hammond, David Trowbridge

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.

gtkparasite-noconfigure.patch:

--- NEW FILE gtkparasite-noconfigure.patch ---
diff -up chipx86-gtkparasite-f485897dce3c0a9b7d3fc52bc6856b25fb52e267/autogen.sh.noconfigure chipx86-gtkparasite-f485897dce3c0a9b7d3fc52bc6856b25fb52e267/autogen.sh
--- chipx86-gtkparasite-f485897dce3c0a9b7d3fc52bc6856b25fb52e267/autogen.sh.noconfigure	2009-01-20 08:29:48.000000000 -0500
+++ chipx86-gtkparasite-f485897dce3c0a9b7d3fc52bc6856b25fb52e267/autogen.sh	2009-01-20 08:30:22.000000000 -0500
@@ -46,13 +46,4 @@ autoconf
 
 if [ -x config.status -a -z "$*" ]; then
 	./config.status --recheck
-else
-	if test -z "$*"; then
-		echo "I am going to run ./configure with no arguments - if you wish"
-		echo "to pass any to it, please specify them on the $0  command line."
-		echo "If you do not wish to run ./configure, press  Ctrl-C now."
-		trap 'echo "configure aborted" ; exit 0' 1 2 15
-		sleep 1
-	fi
-	./configure "$@";
 fi


--- NEW FILE gtkparasite.spec ---
%define githash 928494e56f2ab3fef807fde28e888e33ddb94c6a
%define shorthash %(echo "%githash" | cut -c -8)

Name:           gtkparasite
Version:        0
Release:        0.2.20090120git%{shorthash}%{?dist}
Summary:        A GUI debugging tool for GTK+ applications

Group:          Development/Tools
License:        MIT
URL:            http://chipx86.github.com/gtkparasite/
# http://github.com/chipx86/gtkparasite/tarball/master/%{githash}
Source0:        chipx86-gtkparasite-%{githash}.tar.gz
Source1:        COPYING.gtkparasite
Patch0:         gtkparasite-noconfigure.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  gtk2-devel pygtk2-devel
BuildRequires:  autoconf libtool automake
#Requires:       

%description
Parasite is a debugging and development tool that runs inside your GTK+
application's process. It can inspect your application, giving you detailed
information on your UI, such as the hierarchy, X window IDs, widget
properties, and more. You can modify properties on the fly in order to
experiment with the look of your UI.

Parasite includes an embedded Python shell that lets you write new code that
directly interacts with your application's UI, regardless of the language the
application is written in. Create new dialogs, attach temporary signal
handlers to buttons, test out new logic, and gather additional debug
information.

%prep
%setup -qn chipx86-gtkparasite-%{githash}
%patch0 -p1 -b .noconfigure
./autogen.sh
rm COPYING
cp -a %{SOURCE1} COPYING

%build
%configure
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
rm $RPM_BUILD_ROOT%{_libdir}/gtk-2.0/modules/*a

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc COPYING
%{_libdir}/gtk-2.0/modules/libgtkparasite.so

%changelog
* Tue Jan 20 2009 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> 0-0.2.20090120git928494e5
- Rename package
- Update to latest release
- Drop upstreamed patch

* Mon Jan 19 2009 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> 0-0.1.gitf485897d
- Initial RPM release


--- NEW FILE import.log ---
gtkparasite-0-0_2_20090120git928494e5:HEAD:gtkparasite-0-0.2.20090120git928494e5.src.rpm:1232487990


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gtkparasite/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	20 Jan 2009 21:06:55 -0000	1.1
+++ .cvsignore	20 Jan 2009 21:46:48 -0000	1.2
@@ -0,0 +1 @@
+chipx86-gtkparasite-928494e56f2ab3fef807fde28e888e33ddb94c6a.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gtkparasite/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	20 Jan 2009 21:06:55 -0000	1.1
+++ sources	20 Jan 2009 21:46:48 -0000	1.2
@@ -0,0 +1 @@
+351ffc4fa8d15105c1f63364bd444f7f  chipx86-gtkparasite-928494e56f2ab3fef807fde28e888e33ddb94c6a.tar.gz



From pwouters at fedoraproject.org  Tue Jan 20 22:18:20 2009
From: pwouters at fedoraproject.org (Paul Wouters)
Date: Tue, 20 Jan 2009 22:18:20 +0000 (UTC)
Subject: rpms/unbound/F-9 unbound.conf,1.3,1.4
Message-ID: <20090120221820.D2748700F9@cvs1.fedora.phx.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/unbound/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8485

Modified Files:
	unbound.conf 
Log Message:
fixed commented include line to show new style include



Index: unbound.conf
===================================================================
RCS file: /cvs/extras/rpms/unbound/F-9/unbound.conf,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- unbound.conf	20 Jan 2009 21:56:11 -0000	1.3
+++ unbound.conf	20 Jan 2009 22:17:50 -0000	1.4
@@ -12,7 +12,7 @@
 
 	# To enable DNSSEC trust anchors, install the dnssec-keys package and
 	# uncomment the line below, or run dnssec-configure -h for more options
-	# trusted-keys-file: "/etc/pki/dnssec/production.conf"
+	# trusted-keys-file: "/etc/pki/dnssec/production/*.conf"
 
 	# To enable DLV trust anchor with DLV, install the dnssec-keys package
 	# and uncomment the line below, or run dnssec-configure -h for more



From pkgdb at fedoraproject.org  Tue Jan 20 22:19:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Jan 2009 22:19:25 +0000
Subject: [pkgdb] mysql-connector-java: jmbox has requested watchbugzilla
Message-ID: <20090120221925.C2537208472@bastion.fedora.phx.redhat.com>

jmbox has requested the watchbugzilla acl on mysql-connector-java (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mysql-connector-java



From pwouters at fedoraproject.org  Tue Jan 20 22:19:40 2009
From: pwouters at fedoraproject.org (Paul Wouters)
Date: Tue, 20 Jan 2009 22:19:40 +0000 (UTC)
Subject: rpms/unbound/F-9 unbound.init,1.1,1.2 unbound.spec,1.3,1.4
Message-ID: <20090120221940.5D12F700F9@cvs1.fedora.phx.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/unbound/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8598

Modified Files:
	unbound.init unbound.spec 
Log Message:
updated init script to remove chroot. Fixed spec to allow compile for
older libevent.



Index: unbound.init
===================================================================
RCS file: /cvs/extras/rpms/unbound/F-9/unbound.init,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- unbound.init	1 Nov 2008 16:58:24 -0000	1.1
+++ unbound.init	20 Jan 2009 22:19:10 -0000	1.2
@@ -22,7 +22,7 @@
 . /etc/rc.d/init.d/functions
 
 exec="/usr/sbin/unbound"
-config="/var/lib/unbound/unbound.conf"
+config="/etc/unbound/unbound.conf"
 rootdir="/var/lib/unbound"
 pidfile="/var/run/unbound/unbound.pid"
 
@@ -33,17 +33,17 @@
 start() {
     [ -x $exec ] || exit 5
     [ -f $config ] || exit 6
-    echo -n $"Starting unbound: "
 
-	if [ ! -e ${rootdir}/etc/resolv.conf ] || /usr/bin/cmp -s /etc/resolv.conf ${rootdir}/etc/resolv.conf; then
-	    cp -fp /etc/resolv.conf ${rootdir}/etc/resolv.conf
-	fi;
-	if [ ! -e ${rootdir}/etc/localtime ] || /usr/bin/cmp -s /etc/localtime ${rootdir}/etc/localtime; then
-	    cp -fp /etc/localtime ${rootdir}/etc/localtime
-	fi;
-	mount --bind -n /dev/log ${rootdir}/dev/log >/dev/null 2>&1;
-	mount --bind -n /dev/random ${rootdir}/dev/random >/dev/null 2>&1;
-	mount --bind -n /var/run/unbound ${rootdir}/var/run/unbound >/dev/null 2>&1;
+    if [ ! -f /etc/unbound/unbound_control.key ]
+    then
+	echo -n $"Generating unbound control key and certificate: "
+	/usr/sbin/unbound-control-setup -d /etc/unbound/ > /dev/null 2> /dev/null
+	[ -x /usr/sbin/selinuxenabled ] && /usr/sbin/selinuxenabled && \
+	    [ -x /sbin/restorecon ] && /sbin/restorecon /etc/unbound/*
+	echo
+    fi
+
+    echo -n $"Starting unbound: "
 
     # if not running, start it up here
     daemon $exec
@@ -58,12 +58,6 @@
     killproc -p $pidfile unbound
     retval=$?
     [ $retval -eq 0 ] && rm -f $lockfile
-    for mountfile in /dev/log /dev/random /etc/localtime /etc/resolv.conf /var/run/unbound
-    do
-    if egrep -q '^/[^[:space:]]+[[:space:]]+'${rootdir}''${mountfile}'' /proc/mounts; then
-	umount ${rootdir}$mountfile >/dev/null 2>&1
-    fi;
-    done
     echo
 }
 


Index: unbound.spec
===================================================================
RCS file: /cvs/extras/rpms/unbound/F-9/unbound.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- unbound.spec	20 Jan 2009 21:57:59 -0000	1.3
+++ unbound.spec	20 Jan 2009 22:19:10 -0000	1.4
@@ -8,9 +8,11 @@
 Source1: unbound.init
 Source2: unbound.conf
 Source3: unbound.munin
+Patch0: unbound-libevent-r1441.patch
 Group: System Environment/Daemons
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: flex, openssl-devel >= 0.9.8g-9.12, ldns-devel >= 1.4.0
+BuildRequires: libevent-devel
 Requires(post): chkconfig
 Requires(preun): chkconfig
 Requires(preun): initscripts
@@ -60,9 +62,10 @@
 
 %prep
 %setup -q 
+%patch0 -p0 
 
 %build
-%configure  --with-ldns= --without-libevent --with-pthreads --with-ssl \
+%configure  --with-ldns= --with-libevent --with-pthreads --with-ssl \
             --disable-rpath --enable-debug --disable-static \
             --with-conf-file=%{_sysconfdir}/%{name}/unbound.conf \
             --with-pidfile=%{_localstatedir}/run/%{name}/%{name}.pid
@@ -148,7 +151,7 @@
 - Updated to 1.2.0
 - Added dependancy on minimum SSL for CVE-2008-5077
 - Added munin package and dependancies
-- Compile without libevent, as the version in F-9 causes crashes
+- Added svn patch r1441 required for using libevent < 1.4
 - Enable options as per draft-wijngaards-dnsext-resolver-side-mitigation-00.txt
 - Enable unwanted-reply-threshold to mitigate against a Kaminsky attack
 - Enable val-clean-additional to drop addition unsigned data from signed



From pkgdb at fedoraproject.org  Tue Jan 20 22:19:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Jan 2009 22:19:58 +0000
Subject: [pkgdb] mysql-connector-java: jmbox has given up watchbugzilla
Message-ID: <20090120221958.451F2208471@bastion.fedora.phx.redhat.com>

jmbox has given up the watchbugzilla acl on mysql-connector-java (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mysql-connector-java



From pkgdb at fedoraproject.org  Tue Jan 20 22:20:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Jan 2009 22:20:30 +0000
Subject: [pkgdb] mysql-connector-java: jmbox has requested watchbugzilla
Message-ID: <20090120222033.ED349208471@bastion.fedora.phx.redhat.com>

jmbox has requested the watchbugzilla acl on mysql-connector-java (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mysql-connector-java



From pkgdb at fedoraproject.org  Tue Jan 20 22:21:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Jan 2009 22:21:14 +0000
Subject: [pkgdb] mysql-connector-java: jmbox has requested watchcommits
Message-ID: <20090120222114.E689B208471@bastion.fedora.phx.redhat.com>

jmbox has requested the watchcommits acl on mysql-connector-java (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mysql-connector-java



From pwouters at fedoraproject.org  Tue Jan 20 22:22:26 2009
From: pwouters at fedoraproject.org (Paul Wouters)
Date: Tue, 20 Jan 2009 22:22:26 +0000 (UTC)
Subject: rpms/unbound/F-9 unbound.spec,1.4,1.5
Message-ID: <20090120222226.703A3700F9@cvs1.fedora.phx.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/unbound/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9248

Modified Files:
	unbound.spec 
Log Message:
bump version



Index: unbound.spec
===================================================================
RCS file: /cvs/extras/rpms/unbound/F-9/unbound.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- unbound.spec	20 Jan 2009 22:19:10 -0000	1.4
+++ unbound.spec	20 Jan 2009 22:21:56 -0000	1.5
@@ -1,7 +1,7 @@
 Summary: Validating, recursive, and caching DNS(SEC) resolver
 Name: unbound
 Version: 1.2.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: BSD
 Url: http://www.nlnetlabs.nl/unbound/
 Source: http://www.unbound.net/downloads/%{name}-%{version}.tar.gz
@@ -148,10 +148,12 @@
 
 %changelog
 * Tue Jan 20 2009 Paul Wouters <paul at xelerance.com - 1.2.0-1
+- Added svn patch r1441 required for using libevent < 1.4
+
+* Tue Jan 20 2009 Paul Wouters <paul at xelerance.com - 1.2.0-1
 - Updated to 1.2.0
 - Added dependancy on minimum SSL for CVE-2008-5077
 - Added munin package and dependancies
-- Added svn patch r1441 required for using libevent < 1.4
 - Enable options as per draft-wijngaards-dnsext-resolver-side-mitigation-00.txt
 - Enable unwanted-reply-threshold to mitigate against a Kaminsky attack
 - Enable val-clean-additional to drop addition unsigned data from signed



From nsantos at fedoraproject.org  Tue Jan 20 22:12:29 2009
From: nsantos at fedoraproject.org (Nuno Santos)
Date: Tue, 20 Jan 2009 22:12:29 +0000 (UTC)
Subject: rpms/qpidc/devel qpidc.spec,1.62,1.63
Message-ID: <20090120221229.71DBB700F9@cvs1.fedora.phx.redhat.com>

Author: nsantos

Update of /cvs/extras/rpms/qpidc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7658

Modified Files:
	qpidc.spec 
Log Message:
BZ474614 and BZ474613 - qpidc/rhm unowned directories


Index: qpidc.spec
===================================================================
RCS file: /cvs/extras/rpms/qpidc/devel/qpidc.spec,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- qpidc.spec	15 Jan 2009 16:35:13 -0000	1.62
+++ qpidc.spec	20 Jan 2009 22:11:59 -0000	1.63
@@ -240,6 +240,8 @@
 %_libdir/libqpidcommon.so.0.1.0
 %_libdir/libqpidclient.so.0
 %_libdir/libqpidclient.so.0.1.0
+%_libdir/qpid/client
+%_sysconfdir/qpid
 %config(noreplace) %_sysconfdir/qpid/qpidc.conf
 
 %files devel
@@ -253,6 +255,7 @@
 %_includedir/qpid/log
 %_includedir/qpid/management
 %_includedir/qpid/agent
+%_includedir/qpid
 %_includedir/qmf
 %_libdir/libqpidcommon.so
 %_libdir/libqpidclient.so
@@ -267,6 +270,7 @@
 %config(noreplace) %_sysconfdir/qpidd.conf
 %config(noreplace) %_sysconfdir/sasl2/qpidd.conf
 %{_initrddir}/qpidd
+%_libdir/qpid/daemon
 %attr(755, qpidd, qpidd) %_localstatedir/lib/qpidd
 %attr(755, qpidd, qpidd) %_libdir/qpidd
 %attr(755, qpidd, qpidd) /var/run/qpidd



From cwickert at fedoraproject.org  Tue Jan 20 22:30:08 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Tue, 20 Jan 2009 22:30:08 +0000 (UTC)
Subject: rpms/Thunar/devel Thunar.spec,1.19,1.20
Message-ID: <20090120223008.3E25B700F9@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/Thunar/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10952

Modified Files:
	Thunar.spec 
Log Message:
fix changelog


Index: Thunar.spec
===================================================================
RCS file: /cvs/pkgs/rpms/Thunar/devel/Thunar.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- Thunar.spec	17 Jan 2009 08:04:20 -0000	1.19
+++ Thunar.spec	20 Jan 2009 22:29:37 -0000	1.20
@@ -198,8 +198,8 @@
 %{_datadir}/gtk-doc/html/*
 
 %changelog
-* Tue Jan 13 2009 Kevin Fenzi <kevin at tummy.com> - 4.5.93-1
-- Update to 4.5.93
+* Tue Jan 13 2009 Kevin Fenzi <kevin at tummy.com> - 0.9.93-1
+- Update to 0.9.93
 
 * Fri Dec 26 2008 Kevin Fenzi <kevin at tummy.com> - 0.9.92-1
 - Update to 0.9.92



From pwouters at fedoraproject.org  Tue Jan 20 22:36:25 2009
From: pwouters at fedoraproject.org (Paul Wouters)
Date: Tue, 20 Jan 2009 22:36:25 +0000 (UTC)
Subject: rpms/unbound/F-9 unbound-1.2-glob.patch, NONE, 1.1 unbound.spec, 1.5,
	1.6
Message-ID: <20090120223625.2DA2C700F9@cvs1.fedora.phx.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/unbound/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11748

Modified Files:
	unbound.spec 
Added Files:
	unbound-1.2-glob.patch 
Log Message:
Added glob patch


unbound-1.2-glob.patch:

--- NEW FILE unbound-1.2-glob.patch ---
diff -Naur unbound-1.2.0/validator/val_anchor.c unbound-1.2.0.new/validator/val_anchor.c
--- unbound-1.2.0/validator/val_anchor.c	2009-01-07 07:24:34.000000000 -0500
+++ unbound-1.2.0.new/validator/val_anchor.c	2009-01-20 17:31:43.000000000 -0500
@@ -718,7 +718,8 @@
 			log_err("wildcard trusted-keys-file %s: expansion "
 				"failed (%s)", pat, strerror(errno));
 		}
-		return 0;
+		/* ignore globs that yield no files */
+		return 1;
 	}
 	/* process files found, if any */
 	for(i=0; i<(size_t)g.gl_pathc; i++) {


Index: unbound.spec
===================================================================
RCS file: /cvs/extras/rpms/unbound/F-9/unbound.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- unbound.spec	20 Jan 2009 22:21:56 -0000	1.5
+++ unbound.spec	20 Jan 2009 22:35:54 -0000	1.6
@@ -9,6 +9,7 @@
 Source2: unbound.conf
 Source3: unbound.munin
 Patch0: unbound-libevent-r1441.patch
+Patch1: unbound-1.2-glob.patch
 Group: System Environment/Daemons
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: flex, openssl-devel >= 0.9.8g-9.12, ldns-devel >= 1.4.0
@@ -63,6 +64,7 @@
 %prep
 %setup -q 
 %patch0 -p0 
+%patch1 -p1
 
 %build
 %configure  --with-ldns= --with-libevent --with-pthreads --with-ssl \



From pwouters at fedoraproject.org  Tue Jan 20 22:38:38 2009
From: pwouters at fedoraproject.org (Paul Wouters)
Date: Tue, 20 Jan 2009 22:38:38 +0000 (UTC)
Subject: rpms/unbound/F-9 unbound.spec,1.6,1.7
Message-ID: <20090120223838.9444F700F9@cvs1.fedora.phx.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/unbound/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12154

Modified Files:
	unbound.spec 
Log Message:
* Tue Jan 20 2009 Paul Wouters <paul at xelerance.com - 1.2.0-3
- Patch to allow missing files from includes using wildcards



Index: unbound.spec
===================================================================
RCS file: /cvs/extras/rpms/unbound/F-9/unbound.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- unbound.spec	20 Jan 2009 22:35:54 -0000	1.6
+++ unbound.spec	20 Jan 2009 22:38:08 -0000	1.7
@@ -1,7 +1,7 @@
 Summary: Validating, recursive, and caching DNS(SEC) resolver
 Name: unbound
 Version: 1.2.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: BSD
 Url: http://www.nlnetlabs.nl/unbound/
 Source: http://www.unbound.net/downloads/%{name}-%{version}.tar.gz
@@ -149,7 +149,10 @@
 %postun libs -p /sbin/ldconfig
 
 %changelog
-* Tue Jan 20 2009 Paul Wouters <paul at xelerance.com - 1.2.0-1
+* Tue Jan 20 2009 Paul Wouters <paul at xelerance.com - 1.2.0-3
+- Patch to allow missing files from includes using wildcards
+
+* Tue Jan 20 2009 Paul Wouters <paul at xelerance.com - 1.2.0-2
 - Added svn patch r1441 required for using libevent < 1.4
 
 * Tue Jan 20 2009 Paul Wouters <paul at xelerance.com - 1.2.0-1



From cwickert at fedoraproject.org  Tue Jan 20 22:39:32 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Tue, 20 Jan 2009 22:39:32 +0000 (UTC)
Subject: rpms/thunar-media-tags-plugin/devel thunar-media-tags-plugin.spec,
	1.5, 1.6
Message-ID: <20090120223932.C8D82700F9@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/thunar-media-tags-plugin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12369

Modified Files:
	thunar-media-tags-plugin.spec 
Log Message:
* Tue Jan 20 2009 Christoph Wickert <fedora christoph-wickert de> - 0.1.2-5
- Rebuild for Thunar 0.9.93 (Xfce 4.6. Beta 3)



Index: thunar-media-tags-plugin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/thunar-media-tags-plugin/devel/thunar-media-tags-plugin.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- thunar-media-tags-plugin.spec	18 Feb 2008 23:39:23 -0000	1.5
+++ thunar-media-tags-plugin.spec	20 Jan 2009 22:39:02 -0000	1.6
@@ -1,8 +1,8 @@
-%define thunarver 0.8.0
+%define thunarver 0.9.0
 
 Name:           thunar-media-tags-plugin
 Version:        0.1.2
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Media Tags plugin for the Thunar file manager
 
 Group:          User Interface/Desktops
@@ -50,6 +50,9 @@
 
 
 %changelog
+* Tue Jan 20 2009 Christoph Wickert <fedora christoph-wickert de> - 0.1.2-5
+- Rebuild for Thunar 0.9.93 (Xfce 4.6. Beta 3)
+
 * Mon Feb 18 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.1.2-4
 - Autorebuild for GCC 4.3
 



From cwickert at fedoraproject.org  Tue Jan 20 22:47:11 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Tue, 20 Jan 2009 22:47:11 +0000 (UTC)
Subject: rpms/thunar-media-tags-plugin/devel thunar-media-tags-plugin.spec,
	1.6, 1.7
Message-ID: <20090120224711.68C6B700F9@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/thunar-media-tags-plugin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13358

Modified Files:
	thunar-media-tags-plugin.spec 
Log Message:
fix email address


Index: thunar-media-tags-plugin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/thunar-media-tags-plugin/devel/thunar-media-tags-plugin.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- thunar-media-tags-plugin.spec	20 Jan 2009 22:39:02 -0000	1.6
+++ thunar-media-tags-plugin.spec	20 Jan 2009 22:46:40 -0000	1.7
@@ -50,20 +50,20 @@
 
 
 %changelog
-* Tue Jan 20 2009 Christoph Wickert <fedora christoph-wickert de> - 0.1.2-5
+* Tue Jan 20 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.1.2-5
 - Rebuild for Thunar 0.9.93 (Xfce 4.6. Beta 3)
 
 * Mon Feb 18 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.1.2-4
 - Autorebuild for GCC 4.3
 
-* Tue Aug 21 2007 Christoph Wickert <fedora christoph-wickert de> - 0.1.2-3
+* Tue Aug 21 2007 Christoph Wickert <cwickert at fedoraproject.org> - 0.1.2-3
 - Rebuild for BuildID feature
 
-* Mon Jan 22 2007 Christoph Wickert <fedora christoph-wickert de> - 0.1.2-2
+* Mon Jan 22 2007 Christoph Wickert <cwickert at fedoraproject.org> - 0.1.2-2
 - Rebuild for Thunar 0.8.0.
 
-* Sat Jan 20 2007 Christoph Wickert <fedora christoph-wickert de> - 0.1.2-1
+* Sat Jan 20 2007 Christoph Wickert <cwickert at fedoraproject.org> - 0.1.2-1
 - Update to 0.1.2.
 
-* Sat Nov 11 2006 Christoph Wickert <fedora christoph-wickert de> - 0.1.1-1
+* Sat Nov 11 2006 Christoph Wickert <cwickert at fedoraproject.org> - 0.1.1-1
 - Initial Fedora Extras Version.



From hadess at fedoraproject.org  Tue Jan 20 22:07:34 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Tue, 20 Jan 2009 22:07:34 +0000 (UTC)
Subject: rpms/gnome-media/devel .cvsignore, 1.48, 1.49 gnome-media.spec,
	1.150, 1.151 sources, 1.47, 1.48
Message-ID: <20090120220734.20E4A700F9@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/gnome-media/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6524

Modified Files:
	.cvsignore gnome-media.spec sources 
Log Message:
* Tue Jan 20 2009 - Bastien Nocera <bnocera at redhat.com> - 2.25.5-1
- Update to 2.25.5



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-media/devel/.cvsignore,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- .cvsignore	17 Dec 2008 22:27:27 -0000	1.48
+++ .cvsignore	20 Jan 2009 22:07:03 -0000	1.49
@@ -1 +1 @@
-gnome-media-2.25.1.tar.bz2
+gnome-media-2.25.5.tar.bz2


Index: gnome-media.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-media/devel/gnome-media.spec,v
retrieving revision 1.150
retrieving revision 1.151
diff -u -r1.150 -r1.151
--- gnome-media.spec	13 Jan 2009 17:32:06 -0000	1.150
+++ gnome-media.spec	20 Jan 2009 22:07:03 -0000	1.151
@@ -13,8 +13,8 @@
 
 Summary:        GNOME media programs
 Name:           gnome-media
-Version:        2.25.1
-Release:        6%{?dist}
+Version:        2.25.5
+Release:        1%{?dist}
 License:        GPLv2+ and GFDL
 Group:          Applications/Multimedia
 Source:         http://download.gnome.org/sources/gnome-media/2.25/gnome-media-%{version}.tar.bz2
@@ -245,6 +245,9 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Tue Jan 20 2009 - Bastien Nocera <bnocera at redhat.com> - 2.25.5-1
+- Update to 2.25.5
+
 * Tue Jan 13 2009 - Bastien Nocera <bnocera at redhat.com> - 2.25.1-6
 - I get paid by the commit, more fixing the scriptlets
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-media/devel/sources,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- sources	17 Dec 2008 22:27:27 -0000	1.47
+++ sources	20 Jan 2009 22:07:03 -0000	1.48
@@ -1 +1 @@
-cabeb9ffee54914bbef9f6d48a686ee9  gnome-media-2.25.1.tar.bz2
+03985c7331f53c283286bc46962f702b  gnome-media-2.25.5.tar.bz2



From krh at fedoraproject.org  Tue Jan 20 21:51:40 2009
From: krh at fedoraproject.org (=?utf-8?q?Kristian_H=C3=B8gsberg?=)
Date: Tue, 20 Jan 2009 21:51:40 +0000 (UTC)
Subject: rpms/xorg-x11-drv-i810/devel intel-2.6.0-to-7db3201.patch,NONE,1.1
Message-ID: <20090120215140.0B843700F9@cvs1.fedora.phx.redhat.com>

Author: krh

Update of /cvs/pkgs/rpms/xorg-x11-drv-i810/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2994

Added Files:
	intel-2.6.0-to-7db3201.patch 
Log Message:
* Tue Jan 20 2009 Kristian H??gsberg <krh at kabuto.bos.redhat.com> 2.6.0-1
- Update to 2.6.0.


intel-2.6.0-to-7db3201.patch:

--- NEW FILE intel-2.6.0-to-7db3201.patch ---
diff --git a/configure.ac b/configure.ac
index bb69f72..38d373e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
 
 AC_PREREQ(2.57)
 AC_INIT([xf86-video-intel],
-        2.6.0,
+        2.6.99.1,
         [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
         xf86-video-intel)
 
@@ -105,8 +105,6 @@ if test x$DRI != xno; then
                       [have_sarea_h="yes"], [have_sarea_h="no"])
         AC_CHECK_FILE([${sdkdir}/dristruct.h],
                       [have_dristruct_h="yes"], [have_dristruct_h="no"])
-	AC_CHECK_FILE([${sdkdir}/damage.h],
-                      [have_damage_h="yes"], [have_damage_h="no"])
 fi
 AC_MSG_CHECKING([whether to include DRI support])
 if test x$DRI = xauto; then
@@ -215,9 +213,6 @@ if test "$DRI" = yes; then
         PKG_CHECK_MODULES(DRI, [xf86driproto glproto])
         AC_DEFINE(XF86DRI,1,[Enable DRI driver support])
         AC_DEFINE(XF86DRI_DEVEL,1,[Enable developmental DRI driver support])
-	if test "$have_damage_h" = yes; then
-		AC_DEFINE(DAMAGE,1,[Use Damage extension])
-	fi
 fi
 
 dnl exaGetPixmapDriverPrivate required for DRM_MODE.
diff --git a/man/intel.man b/man/intel.man
index 00aa1be..65d1114 100644
--- a/man/intel.man
+++ b/man/intel.man
@@ -150,26 +150,6 @@ pool.  On systems with a working GEM environment, this can be disabled to
 increase the memory pool available to other graphics tasks.
 Default for i830 and newer: Enabled.
 Default for i810: this option is not used.
-.BI "Option \*qPageFlip\*q \*q" boolean \*q
-Enable support for page flipping. This should improve 3D performance at the
-potential cost of worse performance with mixed 2D/3D. Also note that this gives
-no benefit without corresponding support in the Mesa 3D driver and may not give
-the full benefit without triple buffering (see
-.B "Option \*qTripleBuffer\*q"
-).
-Default for i810: The option is not used.
-Default for i830 and above: Disabled (This option is currently unstable).
-.TP
-.BI "Option \*qTripleBuffer\*q \*q" boolean \*q
-Enable support for triple buffering. This should improve 3D performance at the
-potential cost of worse performance with mixed 2D/3D. Also note that this gives
-no benefit without corresponding support in the Mesa 3D driver and may not give
-any benefit without page flipping either (see
-.B "Option \*qPageFlip\*q"
-).
-Default for i810: The option is not used.
-Default for i830 and above: Disabled.
-.TP
 .BI "Option \*qAccelMethod\*q \*q" string \*q
 Choose acceleration architecture, either "XAA" or "EXA".  XAA is the old
 XFree86 based acceleration architecture.  EXA is a newer and simpler
diff --git a/src/bios_reader/bios_reader.c b/src/bios_reader/bios_reader.c
index 717f5bf..4b20e0d 100644
--- a/src/bios_reader/bios_reader.c
+++ b/src/bios_reader/bios_reader.c
@@ -299,6 +299,9 @@ static void dump_lvds_data(void)
     struct bdb_lvds_lfp_data *lvds_data;
     int num_entries;
     int i;
+    int hdisplay, hsyncstart, hsyncend, htotal;
+    int vdisplay, vsyncstart, vsyncend, vtotal;
+    float clock;
 
     block = find_section(BDB_LVDS_LFP_DATA);
     if (!block) {
@@ -322,6 +325,17 @@ static void dump_lvds_data(void)
 	else
 	    marker = ' ';
 
+	hdisplay   = _H_ACTIVE(timing_data);
+	hsyncstart = hdisplay + _H_SYNC_OFF(timing_data);
+	hsyncend   = hsyncstart + _H_SYNC_WIDTH(timing_data);
+	htotal     = hdisplay + _H_BLANK(timing_data);
+
+	vdisplay   = _V_ACTIVE(timing_data);
+	vsyncstart = vdisplay + _V_SYNC_OFF(timing_data);
+	vsyncend   = vsyncstart + _V_SYNC_WIDTH(timing_data);
+	vtotal     = vdisplay + _V_BLANK(timing_data);
+	clock      = _PIXEL_CLOCK(timing_data) / 1000;
+
 	printf("%c\tpanel type %02i: %dx%d clock %d\n", marker,
 	       i, lfp_data->fp_timing.x_res, lfp_data->fp_timing.y_res,
 	       _PIXEL_CLOCK(timing_data));
@@ -336,15 +350,11 @@ static void dump_lvds_data(void)
 	       (unsigned long)lfp_data->fp_timing.pp_cycle_reg_val);
 	printf("\t\t  PFIT: 0x%08lx\n",
 	       (unsigned long)lfp_data->fp_timing.pfit_reg_val);
-	printf("\t\ttimings: %d %d %d %d %d %d %d %d\n",
-	       _H_ACTIVE(timing_data),
-	       _H_BLANK(timing_data),
-	       _H_SYNC_OFF(timing_data),
-	       _H_SYNC_WIDTH(timing_data),
-	       _V_ACTIVE(timing_data),
-	       _V_BLANK(timing_data),
-	       _V_SYNC_OFF(timing_data),
-	       _V_SYNC_WIDTH(timing_data));
+	printf("\t\ttimings: %d %d %d %d %d %d %d %d %.2f (%s)\n",
+	       hdisplay, hsyncstart, hsyncend, htotal,
+	       vdisplay, vsyncstart, vsyncend, vtotal, clock,
+	       (hsyncend > htotal || vsyncend > vtotal) ?
+	       "BAD!" : "good");
     }
     free(block);
 }
diff --git a/src/i830.h b/src/i830.h
index dd5555d..b726dd6 100644
--- a/src/i830.h
+++ b/src/i830.h
@@ -72,9 +72,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "dri.h"
 #include "GL/glxint.h"
 #include "i830_dri.h"
-#ifdef DAMAGE
-#include "damage.h"
-#endif
 #include "drmmode_display.h"
 #endif
 #include "intel_bufmgr.h"
@@ -95,6 +92,7 @@ void i830_uxa_block_handler (ScreenPtr pScreen);
 
 #if defined(I830_USE_UXA) || defined(I830_USE_EXA)
 dri_bo *i830_get_pixmap_bo (PixmapPtr pixmap);
+void i830_set_pixmap_bo(PixmapPtr pixmap, dri_bo *bo);
 #endif
 
 #ifdef I830_USE_XAA
@@ -141,6 +139,8 @@ enum tile_format {
     TILE_YMAJOR
 };
 
+#define PITCH_NONE 0
+
 /** Record of a linear allocation in the aperture. */
 typedef struct _i830_memory i830_memory;
 struct _i830_memory {
@@ -265,6 +265,8 @@ typedef struct _I830CrtcPrivateRec {
     
     int			    dpms_mode;
     
+    int			    x, y;
+
     /* Lookup table values to be set when the CRTC is enabled */
     uint8_t lut_r[256], lut_g[256], lut_b[256];
 
@@ -437,6 +439,10 @@ typedef struct _I830Rec {
    /** Number of bytes to be emitted in the current BEGIN_BATCH. */
    uint32_t batch_emitting;
    dri_bo *batch_bo;
+   /** Whether we're in a section of code that can't tolerate flushing */
+   Bool in_batch_atomic;
+   /** Ending batch_used that was verified by i830_start_batch_atomic() */
+   int batch_atomic_limit;
 
 #ifdef I830_XV
    /* For Xvideo */
@@ -452,13 +458,10 @@ typedef struct _I830Rec {
    void (*PointerMoved)(int, int, int);
    CreateScreenResourcesProcPtr    CreateScreenResources;
 
-   i830_memory *logical_context;
-
    i830_memory *power_context;
 
 #ifdef XF86DRI
    i830_memory *back_buffer;
-   i830_memory *third_buffer;
    i830_memory *depth_buffer;
    i830_memory *textures;		/**< Compatibility texture memory */
    i830_memory *memory_manager;		/**< DRI memory manager aperture */
@@ -468,18 +471,14 @@ typedef struct _I830Rec {
    int drmMinor;
    Bool allocate_classic_textures;
 
+   Bool can_resize;
+
    Bool want_vblank_interrupts;
-#ifdef DAMAGE
-   DamagePtr pDamage;
-   RegionRec driRegion;
-#endif
 #endif
 
    Bool need_mi_flush;
 
    Bool NeedRingBufferLow;
-   Bool allowPageFlip;
-   Bool TripleBuffer;
[...2321 lines suppressed...]
+++ b/src/i915_render.c
@@ -315,39 +315,69 @@ i915_prepare_composite(int op, PicturePtr pSrcPicture,
 {
     ScrnInfoPtr pScrn = xf86Screens[pSrcPicture->pDrawable->pScreen->myNum];
     I830Ptr pI830 = I830PTR(pScrn);
-    uint32_t dst_format, dst_pitch;
-    uint32_t blendctl;
-    int out_reg = FS_OC;
-    FS_LOCALS(20);
-    Bool is_affine_src, is_affine_mask;
-    Bool is_nearest = FALSE;
 
     i830_exa_check_pitch_3d(pSrc);
     if (pMask)
 	i830_exa_check_pitch_3d(pMask);
     i830_exa_check_pitch_3d(pDst);
 
-    IntelEmitInvarientState(pScrn);
-    *pI830->last_3d = LAST_3D_RENDER;
-
-    if (!i915_get_dest_format(pDstPicture, &dst_format))
+    if (!i915_get_dest_format(pDstPicture,
+			      &pI830->i915_render_state.dst_format))
 	return FALSE;
-    dst_pitch = intel_get_pixmap_pitch(pDst);
 
+    pI830->i915_render_state.is_nearest = FALSE;
     if (!i915_texture_setup(pSrcPicture, pSrc, 0))
 	I830FALLBACK("fail to setup src texture\n");
     if (pSrcPicture->filter == PictFilterNearest)
-	is_nearest = TRUE;
+	pI830->i915_render_state.is_nearest = TRUE;
     if (pMask != NULL) {
 	if (!i915_texture_setup(pMaskPicture, pMask, 1))
 	    I830FALLBACK("fail to setup mask texture\n");
 	if (pMaskPicture->filter == PictFilterNearest)
-	    is_nearest = TRUE;
+	    pI830->i915_render_state.is_nearest = TRUE;
     } else {
 	pI830->transform[1] = NULL;
 	pI830->scale_units[1][0] = -1;
 	pI830->scale_units[1][1] = -1;
     }
+
+    pI830->i915_render_state.op = op;
+    pI830->i915_render_state.pSrcPicture = pSrcPicture;
+    pI830->i915_render_state.pMaskPicture = pMaskPicture;
+    pI830->i915_render_state.pDstPicture = pDstPicture;
+    pI830->i915_render_state.pSrc = pSrc;
+    pI830->i915_render_state.pMask = pMask;
+    pI830->i915_render_state.pDst = pDst;
+    pI830->i915_render_state.needs_emit = TRUE;
+
+    return TRUE;
+}
+
+static void
+i915_emit_composite_setup(ScrnInfoPtr pScrn)
+{
+    I830Ptr pI830 = I830PTR(pScrn);
+    int op = pI830->i915_render_state.op;
+    PicturePtr pSrcPicture = pI830->i915_render_state.pSrcPicture;
+    PicturePtr pMaskPicture = pI830->i915_render_state.pMaskPicture;
+    PicturePtr pDstPicture = pI830->i915_render_state.pDstPicture;
+    PixmapPtr pSrc = pI830->i915_render_state.pSrc;
+    PixmapPtr pMask = pI830->i915_render_state.pMask;
+    PixmapPtr pDst = pI830->i915_render_state.pDst;
+    uint32_t dst_format = pI830->i915_render_state.dst_format, dst_pitch;
+    uint32_t blendctl;
+    int out_reg = FS_OC;
+    FS_LOCALS(20);
+    Bool is_affine_src, is_affine_mask;
+    Bool is_nearest = pI830->i915_render_state.is_nearest;
+
+    pI830->i915_render_state.needs_emit = FALSE;
+
+    IntelEmitInvarientState(pScrn);
+    *pI830->last_3d = LAST_3D_RENDER;
+
+    dst_pitch = intel_get_pixmap_pitch(pDst);
+
     is_affine_src = i830_transform_is_affine (pI830->transform[0]);
     is_affine_mask = i830_transform_is_affine (pI830->transform[1]);
 
@@ -503,6 +533,29 @@ i915_prepare_composite(int op, PicturePtr pSrcPicture,
 	i915_fs_mov(FS_OC, i915_fs_operand(out_reg, W, W, W, W));
 
     FS_END();
+}
 
-    return TRUE;
+void
+i915_composite(PixmapPtr pDst, int srcX, int srcY, int maskX, int maskY,
+	       int dstX, int dstY, int w, int h)
+{
+    ScrnInfoPtr pScrn = xf86Screens[pDst->drawable.pScreen->myNum];
+    I830Ptr pI830 = I830PTR(pScrn);
+
+    intel_batch_start_atomic(pScrn, 150);
+
+    if (pI830->i915_render_state.needs_emit)
+	i915_emit_composite_setup(pScrn);
+
+    i830_composite(pDst, srcX, srcY, maskX, maskY, dstX, dstY, w, h);
+
+    intel_batch_end_atomic(pScrn);
+}
+
+void
+i915_batch_flush_notify(ScrnInfoPtr pScrn)
+{
+    I830Ptr pI830 = I830PTR(pScrn);
+
+    pI830->i915_render_state.needs_emit = TRUE;
 }
diff --git a/src/i915_video.c b/src/i915_video.c
index 7761a45..b903b5e 100644
--- a/src/i915_video.c
+++ b/src/i915_video.c
@@ -49,8 +49,9 @@ I915DisplayVideoTextured(ScrnInfoPtr pScrn, I830PortPrivPtr pPriv, int id,
 {
    I830Ptr pI830 = I830PTR(pScrn);
    uint32_t format, ms3, s5;
-   BoxPtr pbox;
-   int nbox, dxo, dyo, pix_xoff, pix_yoff;
+   BoxPtr pbox = REGION_RECTS(dstRegion);
+   int nbox = REGION_NUM_RECTS(dstRegion);
+   int dxo, dyo, pix_xoff, pix_yoff;
    Bool planar;
 
 #if 0
@@ -72,6 +73,8 @@ I915DisplayVideoTextured(ScrnInfoPtr pScrn, I830PortPrivPtr pPriv, int id,
       return;
    }
 
+   intel_batch_start_atomic(pScrn, 200 + 20 * nbox);
+
    IntelEmitInvarientState(pScrn);
    *pI830->last_3d = LAST_3D_VIDEO;
 
@@ -362,8 +365,6 @@ I915DisplayVideoTextured(ScrnInfoPtr pScrn, I830PortPrivPtr pPriv, int id,
    dxo = dstRegion->extents.x1;
    dyo = dstRegion->extents.y1;
 
-   pbox = REGION_RECTS(dstRegion);
-   nbox = REGION_NUM_RECTS(dstRegion);
    while (nbox--)
    {
       int box_x1 = pbox->x1;
@@ -412,6 +413,8 @@ I915DisplayVideoTextured(ScrnInfoPtr pScrn, I830PortPrivPtr pPriv, int id,
       ADVANCE_BATCH();
    }
 
+   intel_batch_end_atomic(pScrn);
+
    i830MarkSync(pScrn);
 }
 
diff --git a/src/i965_hwmc.c b/src/i965_hwmc.c
index 1c293d1..99e86f5 100644
--- a/src/i965_hwmc.c
+++ b/src/i965_hwmc.c
@@ -49,7 +49,7 @@ static int alloc_drm_memory_tiled(ScrnInfoPtr pScrn,
 	char *name, size_t size, unsigned long pitch, unsigned long alignment)
 {
     I830Ptr pI830 = I830PTR(pScrn);
-    if ((mem->buffer = i830_allocate_memory_tiled(pScrn, 
+    if ((mem->buffer = i830_allocate_memory(pScrn,
 	    name, size, pitch,
 	    GTT_PAGE_SIZE, ALIGN_BOTH_ENDS, TILE_XMAJOR)) == NULL) {
 	ErrorF("Fail to alloc \n");
@@ -75,8 +75,8 @@ static int alloc_drm_memory(ScrnInfoPtr pScrn,
 {
     I830Ptr pI830 = I830PTR(pScrn);
     if ((mem->buffer = i830_allocate_memory(pScrn, 
-	    name, size, 
-	    GTT_PAGE_SIZE, ALIGN_BOTH_ENDS)) == NULL) {
+	    name, size, PITCH_NONE, GTT_PAGE_SIZE,
+	    ALIGN_BOTH_ENDS, TILE_NONE)) == NULL) {
 	ErrorF("Fail to alloc \n");
 	return BadAlloc;
     }
diff --git a/src/xvmc/intel_xvmc.c b/src/xvmc/intel_xvmc.c
index dbde22f..4b73caa 100644
--- a/src/xvmc/intel_xvmc.c
+++ b/src/xvmc/intel_xvmc.c
@@ -757,13 +757,6 @@ _X_EXPORT Status XvMCPutSurface(Display *display,XvMCSurface *surface,
     }
     intel_surf->last_draw = draw;
     /* fill intel_surf->data */
-    if (0)
-    {
-	drmVBlank vbl;
-	vbl.request.type = DRM_VBLANK_RELATIVE;
-	vbl.request.sequence = 1;
-	drmWaitVBlank(xvmc_driver->fd, &vbl);
-    }
     ret = (xvmc_driver->put_surface)(display, surface, draw, srcx, srcy,
 	    srcw, srch, destx, desty, destw, desth, flags, &intel_surf->data);
     if (ret) {



From pwouters at fedoraproject.org  Tue Jan 20 21:56:42 2009
From: pwouters at fedoraproject.org (Paul Wouters)
Date: Tue, 20 Jan 2009 21:56:42 +0000 (UTC)
Subject: rpms/unbound/F-9 unbound.munin, NONE, 1.1 sources, 1.2,
	1.3 unbound.conf, 1.2, 1.3 unbound.spec, 1.1, 1.2
Message-ID: <20090120215642.2368E700F9@cvs1.fedora.phx.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/unbound/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3650

Modified Files:
	sources unbound.conf unbound.spec 
Added Files:
	unbound.munin 
Log Message:
* Tue Jan 20 2009 Paul Wouters <paul at xelerance.com - 1.2.0-1
- Updated to 1.2.0
- Added dependancy on minimum SSL for CVE-2008-5077
- Added munin package and dependancies
- Compile without libevent, as the version in F-9 causes crashes
- Enable options as per draft-wijngaards-dnsext-resolver-side-mitigation-00.txt
- Enable unwanted-reply-threshold to mitigate against a Kaminsky attack
- Enable val-clean-additional to drop addition unsigned data from signed
  response.



--- NEW FILE unbound.munin ---
#
# For this plugin to work, unbound.conf needs to have:
# remote-control:	control-enable: yes
# 
[unbound*]
user root
env.statefile /var/lib/munin/plugin-state/unbound-state
env.unbound_conf /etc/unbound/unbound.conf
env.unbound_control /usr/sbin/unbound-control
env.spoof_warn 1000
env.spoof_crit 100000


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/unbound/F-9/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	1 Nov 2008 16:58:24 -0000	1.2
+++ sources	20 Jan 2009 21:56:11 -0000	1.3
@@ -1 +1 @@
-01b08a9c0d24be981de64b6e4e25ecbe  unbound-1.0.2.tar.gz
+2517f811ec4939c0ea602c99a6fdea23  unbound-1.2.0.tar.gz


Index: unbound.conf
===================================================================
RCS file: /cvs/extras/rpms/unbound/F-9/unbound.conf,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- unbound.conf	15 Nov 2008 05:46:06 -0000	1.2
+++ unbound.conf	20 Jan 2009 21:56:11 -0000	1.3
@@ -1,5 +1,4 @@
 #
-#
 # See unbound.conf(5) man page.
 #
 # this is a comment.
@@ -7,26 +6,35 @@
 #Use this to include other text into the file.
 #include: "otherfile.conf"
 
-#
 # The server clause sets the main parameters. 
 server:
 	# whitespace is not necessary, but looks cleaner.
 
 	# To enable DNSSEC trust anchors, install the dnssec-keys package and
-	# uncomment the line below - note chroot breaks this
-	# trusted-keys-file: "/etc/pki/dnssec/allkeys.conf"
+	# uncomment the line below, or run dnssec-configure -h for more options
+	# trusted-keys-file: "/etc/pki/dnssec/production.conf"
+
+	# To enable DLV trust anchor with DLV, install the dnssec-keys package
+	# and uncomment the line below, or run dnssec-configure -h for more
+	# options
+	# dlv-anchor-file: "/etc/pki/dnssec-keys/dlv/dlv.isc.org.key"
 
 	# verbosity number, 0 is least verbose. 1 is default.
 	verbosity: 1
 
 	# print statistics to the log (for every thread) every N seconds.
 	# Set to "" or 0 to disable. Default is disabled.
+	# Needed for munin plugin
 	statistics-interval: 0
 	
 	# enable cumulative statistics, without clearing them after printing.
+	# Needed for munin plugin
 	statistics-cumulative: no
 
-	 extended-statistics: yes
+	# enable extended statistics (query types, answer codes, status)
+	# printed from unbound-control. default off, because of speed.
+	# Needed for munin plugin
+	extended-statistics: yes
 
 	# number of threads to create. 1 disables threading.
 	num-threads: 2
@@ -36,17 +44,18 @@
 	# specify 0.0.0.0 and ::0 to bind to all available interfaces.
 	# specify every interface on a new 'interface:' labelled line.
 	# The listen interfaces are not changed on reload, only on restart.
+	# interface: 0.0.0.0
+	# interface: ::0
 	# interface: 192.0.2.153
 	# interface: 192.0.2.154
 	# interface: 2001:DB8::5
-	#
-	# interface: 0.0.0.0
-	# interface: ::0
 	
 	# enable this feature to copy the source address of queries to reply.
-	# Socket options not be supported on all platforms. experimental. 
+	# Socket options are not supported on all platforms. experimental. 
 	# NOTE: Enable this option when specifying interface 0.0.0.0 or ::0 
+	# NOTE: Disabled per Fedora policy not to listen to * on default install
 	# interface-automatic: yes
+	interface-automatic: no
 
 	# port to answer queries from
 	# port: 53
@@ -95,6 +104,9 @@
 	# the number of queries that a thread gets to service.
 	# num-queries-per-thread: 1024
 
+	# if very busy, 50% queries run to completion, 50% get timeout in msec
+	# jostle-timeout: 200
+
 	# the amount of memory to use for the RRset cache.
 	# plain value in bytes or you can append k, m or G. default is "4Mb". 
 	# rrset-cache-size: 4m
@@ -144,13 +156,14 @@
 	# control which clients are allowed to make (recursive) queries
 	# to this server. Specify classless netblocks with /size and action.
 	# By default everything is refused, except for localhost.
-	# Choose deny (drop message), refuse (polite error reply), allow.
+	# Choose deny (drop message), refuse (polite error reply),
+	# allow (recursive ok), allow_snoop (recursive and nonrecursive ok)
 	# access-control: 0.0.0.0/0 refuse
 	# access-control: 127.0.0.0/8 allow
 	# access-control: ::0/0 refuse
 	# access-control: ::1 allow
 	# access-control: ::ffff:127.0.0.1 allow
-	
+
 	# if given, a chroot(2) is done to the given directory.
 	# i.e. you can chroot to the working directory, for example,
 	# for extra security, but make sure all files are in that directory.
@@ -160,19 +173,22 @@
 	# chroot has been performed the now defunct portion of the config 
 	# file path is removed to be able to reread the config after a reload. 
 	#
-	# All other file paths (working dir, pidfile, logfile, roothints,
+	# All other file paths (working dir, logfile, roothints, and
 	# key files) can be specified in several ways:
 	# 	o as an absolute path relative to the new root.
 	# 	o as a relative path to the working directory.
 	# 	o as an absolute path relative to the original root.
 	# In the last case the path is adjusted to remove the unused portion.
 	#
-	# Additionally, unbound may need to access /dev/random (for entropy)
-	# and to /dev/log (if you use syslog) from inside the chroot.
+	# The pid file can be absolute and outside of the chroot, it is 
+	# written just prior to performing the chroot and dropping permissions.
+	#
+	# Additionally, unbound may need to access /dev/random (for entropy).
 	# How to do this is specific to your OS.
 	#
 	# If you give "" no chroot is performed. The path must not end in a /.
-	chroot: "/var/lib/unbound"
+	# chroot: "/var/lib/unbound"
+	chroot: ""
 
 	# if given, user privileges are dropped (after binding port),
 	# and the given username is assumed. Default is user "unbound".
@@ -182,7 +198,7 @@
 	# the working directory. The relative files in this config are 
 	# relative to this directory. If you give "" the working directory
 	# is not changed.
-	# directory: "/var/lib/unbound"
+	directory: "/etc/unbound"
 
 	# the log file, "" means log to stderr. 
 	# Use of this option sets use-syslog to "no".
@@ -192,7 +208,7 @@
 	# log to, with identity "unbound". If yes, it overrides the logfile.
 	# use-syslog: yes 
 
-	# the pid file.
+	# the pid file. Can be an absolute path outside of chroot/work dir.
 	pidfile: "/var/run/unbound/unbound.pid"
 	
 	# file to read root hints from.
@@ -235,15 +251,40 @@
 	# trigger insecure mode for that zone (like without a trustanchor).
 	# Default on, which insists on dnssec data for trust-anchored zones.
 	harden-dnssec-stripped: yes
-	
+
+        # Harden the referral path by performing additional queries for
+	# infrastructure data.  Validates the replies (if possible).
+	# Default off, because the lookups burden the server.  Experimental 
+	# implementation of draft-wijngaards-dnsext-resolver-side-mitigation.
+	harden-referral-path: yes
+
 	# Use 0x20-encoded random bits in the query to foil spoof attempts.
-	# Disabled by default, because some caching forwarders may not
-	# support this (if you have forward-zones). Most authority servers do.
 	# This feature is an experimental implementation of draft dns-0x20.
-	# It is known that some authority servers do not support 0x20, and
-	# resolution will fail for them. A solution is on the TODO list.
-	use-caps-for-id: no
+	use-caps-for-id: yes
 	
+	# Enforce privacy of these addresses. Strips them away from answers. 
+	# It may cause DNSSEC validation to additionally mark it as bogus. 
+	# Protects against 'DNS Rebinding' (uses browser as network proxy). 
+	# Only 'private-domain' and 'local-data' names are allowed to have 
+	# these private addresses. No default.
+	# private-address: 10.0.0.0/8
+	# private-address: 172.16.0.0/12
+	# private-address: 192.168.0.0/16
+	# private-address: 192.254.0.0/16
+	# private-address: fd00::/8
+	# private-address: fe80::/10
+
+	# Allow the domain (and its subdomains) to contain private addresses.
+	# local-data statements are allowed to contain private addresses too.
+	# private-domain: "example.com"
+	
+	# If nonzero, unwanted replies are not only reported in statistics,
+	# but also a running total is kept per thread. If it reaches the
+	# threshold, a warning is printed and a defensive action is taken,
+	# the cache is cleared to flush potential poison out of it.
+	# A suggested value is 10000000, the default is 0 (turned off).
+	unwanted-reply-threshold: 10000000
+
 	# Do not query the following addresses. No DNS queries are sent there.
 	# List one address per entry. List classless netblocks with /size,
 	# do-not-query-address: 127.0.0.1/8
@@ -257,11 +298,16 @@
 	# separated by spaces. "iterator" or "validator iterator"
 	# module-config: "validator iterator"
 	
+	# File with DLV trusted keys. Same format as trust-anchor-file.
+	# There can be only one DLV configured, it is trusted from root down.
+	# Download https://secure.isc.org/ops/dlv/dlv.isc.org.key
+	# dlv-anchor-file: "/etc/pki/dnssec-keys/dlv.isc.org.key"
+
 	# File with trusted keys for validation. Specify more than one file
 	# with several entries, one file per entry.
 	# Zone file format, with DS and DNSKEY entries.
 	# trust-anchor-file: ""
-	
+
 	# Trusted key for validation. DS or DNSKEY. specify the RR on a
 	# single line, surrounded by "". TTL is ignored. class is IN default.
 	# (These examples are from August 2007 and may not be valid anymore).
@@ -273,7 +319,7 @@
 	# but has a different file format. Format is BIND-9 style format, 
 	# the trusted-keys { name flag proto algo "key"; }; clauses are read.
 	# trusted-keys-file: ""
-
+	
 	# Override the date for validation with a specific fixed date.
 	# Do not set this unless you are debugging signature inception
 	# and expiration. "" or "0" turns the feature off. 
@@ -281,19 +327,20 @@
 	
 	# The time to live for bogus data, rrsets and messages. This avoids
 	# some of the revalidation, until the time interval expires. in secs.
-	# val-bogus-ttl: 900
+	# val-bogus-ttl: 60
 	
 	# Should additional section of secure message also be kept clean of
 	# unsecure data. Useful to shield the users of this validator from
 	# potential bogus data in the additional section. All unsigned data 
 	# in the additional section is removed from secure messages.
-	# val-clean-additional: yes
+	val-clean-additional: yes
 	
 	# Turn permissive mode on to permit bogus messages. Thus, messages
 	# for which security checks failed will be returned to clients,
 	# instead of SERVFAIL. It still performs the security checks, which
 	# result in interesting log files and possibly the AD bit in
 	# replies if the message is found secure. The default is off.
+	# NOTE: TURNING THIS ON DISABLES ALL DNSSEC SECURITY
 	val-permissive-mode: no
 	
 	# It is possible to configure NSEC3 maximum iteration counts per
@@ -310,6 +357,10 @@
 	# the number of slabs must be a power of 2.
 	# more slabs reduce lock contention, but fragment memory usage.
 	# key-cache-slabs: 4
+	
+	# the amount of memory to use for the negative cache (used for DLV).
+	# plain value in bytes or you can append k, m or G. default is "1Mb". 
+	# neg-cache-size: 1m
 
 	# a number of locally served zones can be configured.
 	# 	local-zone: <zone> <type>
@@ -340,15 +391,48 @@
 	# (this makes example.com, www.example.com, etc, all go to 192.0.2.3)
 	# local-zone: "example.com" redirect
 	# local-data: "example.com A 192.0.2.3"
+	#
+	# Shorthand to make PTR records, "IPv4 name" or "IPv6 name".
+	# You can also add PTR records using local-data directly, but then
+	# you need to do the reverse notation yourself.
+	# local-data-ptr: "192.0.2.3 www.example.com"
+
+# Remote control config section. 
+remote-control:
+	# Enable remote control with unbound-control(8) here.
+	# set up the keys and certificates with unbound-control-setup.
+	# Note: required for unbound-munin package
+	control-enable: yes
+
+	# what interfaces are listened to for remote control.
+	# give 0.0.0.0 and ::0 to listen to all interfaces.
+	# control-interface: 127.0.0.1
+	# control-interface: ::1
+
+	# port number for remote control operations.
+	# control-port: 953
+
+	# unbound server key file.
+	server-key-file: "/etc/unbound/unbound_server.key"
+
+	# unbound server certificate file.
+	server-cert-file: "/etc/unbound/unbound_server.pem"
+
+	# unbound-control key file.
+	control-key-file: "/etc/unbound/unbound_control.key"
 
+	# unbound-control certificate file.
+	control-cert-file: "/etc/unbound/unbound_control.pem"
 
 # Stub zones.
 # Create entries like below, to make all queries for 'example.com' and 
 # 'example.org' go to the given list of nameservers. list zero or more 
-# nameservers by hostname or by ipaddress.
+# nameservers by hostname or by ipaddress. If you set stub-prime to yes, 
+# the list is treated as priming hints (default is no).
 # stub-zone:
 #	name: "example.com"
 #	stub-addr: 192.0.2.68
+#	stub-prime: "no"
 # stub-zone:
 #	name: "example.org"
 #	stub-host: ns.example.com.


Index: unbound.spec
===================================================================
RCS file: /cvs/extras/rpms/unbound/F-9/unbound.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- unbound.spec	1 Nov 2008 16:58:24 -0000	1.1
+++ unbound.spec	20 Jan 2009 21:56:11 -0000	1.2
@@ -7,14 +7,15 @@
 Source: http://www.unbound.net/downloads/%{name}-%{version}.tar.gz
 Source1: unbound.init
 Source2: unbound.conf
+Source3: unbound.munin
 Group: System Environment/Daemons
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: flex, openssl-devel, ldns-devel >= 1.3.0, libevent-devel
+BuildRequires: flex, openssl-devel >= 0.9.8g-9.12, ldns-devel >= 1.4.0
 Requires(post): chkconfig
 Requires(preun): chkconfig
 Requires(preun): initscripts
 Requires(postun): initscripts
-Requires: ldns >= 1.3.0
+Requires: ldns >= 1.4.0
 Requires(pre): shadow-utils
 # Is this obsolete?
 #Provides: caching-nameserver
@@ -30,11 +31,20 @@
 DNSSEC (secure DNS) validation and stub-resolvers (that do not run
 as a server, but are linked into an application) are easily possible.
 
+%package munin
+Summary: Plugin for the munin / munin-node monitoring package
+Group:     System Environment/Daemons
+Requires: munin-node
+Requires: %{name} = %{version}-%{release}, bc
+
+%description munin
+Plugin for the munin / munin-node monitoring package
+
+
 %package devel
 Summary: Development package that includes the unbound header files
 Group: Development/Libraries
 Requires: %{name}-libs = %{version}-%{release}, openssl-devel, ldns-devel
-Requires: libevent-devel
 
 %description devel
 The devel package contains the unbound library and the include files
@@ -52,38 +62,30 @@
 %setup -q 
 
 %build
-%configure  --with-ldns= --with-libevent --with-pthreads --with-ssl \
+%configure  --with-ldns= --without-libevent --with-pthreads --with-ssl \
             --disable-rpath --enable-debug --disable-static \
-            --with-run-dir=%{_localstatedir}/lib/%{name}\
-            --with-conf-file=%{_localstatedir}/lib/%{name}/unbound.conf \
+            --with-conf-file=%{_sysconfdir}/%{name}/unbound.conf \
             --with-pidfile=%{_localstatedir}/run/%{name}/%{name}.pid
 %{__make} CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE" QUIET=no %{?_smp_mflags}
 
 %install
 rm -rf %{buildroot}
 %{__make} DESTDIR=%{buildroot} install
-install -d 0755 %{buildroot}%{_localstatedir}/lib/%{name}
 install -d 0755 %{buildroot}%{_initrddir}
-#install -m 0755 contrib/unbound.init %{buildroot}%{_initrddir}/unbound
 install -m 0755 %{SOURCE1} %{buildroot}%{_initrddir}/unbound
-#overwrite stock unbound.conf with our own
-install -m 0755 %{SOURCE2} %{buildroot}%{_localstatedir}/lib/%{name}
-
-# add symbolic link from /etc/unbound.conf -> /var/unbound/unbound.conf
+install -m 0755 %{SOURCE2} %{buildroot}%{_sysconfdir}/unbound
+# Install munin plugin and its softlinks
+install -d 0755 %{buildroot}%{_sysconfdir}/munin/plugin-conf.d
+install -m 0644 %{SOURCE3} %{buildroot}%{_sysconfdir}/munin/plugin-conf.d/unbound
+install -d 0755 %{buildroot}%{_datadir}/munin/plugins/
+install -m 0755 contrib/unbound_munin_ %{buildroot}%{_datadir}/munin/plugins/unbound
+for plugin in unbound_munin_hits unbound_munin_queue unbound_munin_memory unbound_munin_by_type unbound_munin_by_class unbound_munin_by_opcode unbound_munin_by_rcode unbound_munin_by_flags unbound_munin_histogram; do
+    ln -s unbound %{buildroot}%{_datadir}/munin/plugins/$plugin
+done
 
-( cd %{buildroot}%{_sysconfdir}/ ; ln -s ..%{_localstatedir}/lib/unbound/unbound.conf )
 # remove static library from install (fedora packaging guidelines)
 rm -rf %{buildroot}%{_libdir}/*.la
 
-# The chroot needs /dev/log, /dev/random, /etc/resolv.conf and /etc/localtime
-# but the init script uses mount --bind, so just create empty files
-mkdir -p %{buildroot}%{_localstatedir}/lib/unbound/etc \
-         %{buildroot}%{_localstatedir}/lib/unbound/dev 
-echo "Used for mount --bind in initscript" >  %{buildroot}%{_localstatedir}/lib/unbound/etc/resolv.conf 
-echo "Used for mount --bind in initscript" > %{buildroot}%{_localstatedir}/lib/unbound/etc/localtime
-echo "Used for mount --bind in initscript" > %{buildroot}%{_localstatedir}/lib/unbound/dev/log 
-echo "Used for mount --bind in initscript" > %{buildroot}%{_localstatedir}/lib/unbound/dev/random
-mkdir -p %{buildroot}%{_localstatedir}/lib/unbound/var/run/unbound
 mkdir -p %{buildroot}%{_localstatedir}/run/unbound
 
 %clean
@@ -93,21 +95,17 @@
 %defattr(-,root,root,-)
 %doc doc/README doc/CREDITS doc/LICENSE doc/FEATURES
 %attr(0755,root,root) %{_initrddir}/%{name}
-# the chroot env
-%attr(0755,root,root) %dir %{_localstatedir}/lib/%{name}
+%attr(0755,root,root) %dir %{_sysconfdir}/%{name}
 %attr(0755,unbound,unbound) %dir %{_localstatedir}/run/%{name}
-%attr(0755,root,root) %dir %{_localstatedir}/lib/%{name}/dev
-%attr(0755,root,root) %dir %{_localstatedir}/lib/%{name}/etc
-%attr(0755,root,root) %dir %{_localstatedir}/lib/%{name}/var
-%attr(0755,root,root) %dir %{_localstatedir}/lib/%{name}/var/run
-%attr(0755,root,root) %dir %{_localstatedir}/lib/%{name}/var/run/unbound
-%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/unbound.conf
-%attr(0644,root,root) %config(noreplace) %{_localstatedir}/lib/%{name}/unbound.conf
-%attr(0644,root,root) %{_localstatedir}/lib/%{name}/dev/*
-%attr(0644,root,root) %{_localstatedir}/lib/%{name}/etc/*
+%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/%{name}/unbound.conf
 %{_sbindir}/*
 %{_mandir}/*/*
 
+%files munin
+%defattr(-,root,root,-)
+%config(noreplace) %{_sysconfdir}/munin/plugin-conf.d/unbound
+%{_datadir}/munin/plugins/unbound*
+
 %files devel
 %defattr(-,root,root,-)
 %{_libdir}/libunbound.so
@@ -133,7 +131,7 @@
 
 
 %preun
-if [ $1 -eq 0 ]; then
+if [ "$1" -eq 0 ]; then
         /sbin/service %{name} stop >/dev/null 2>&1
         /sbin/chkconfig --del %{name} 
 fi
@@ -146,6 +144,16 @@
 %postun libs -p /sbin/ldconfig
 
 %changelog
+* Tue Jan 20 2009 Paul Wouters <paul at xelerance.com - 1.2.0-1
+- Updated to 1.2.0
+- Added dependancy on minimum SSL for CVE-2008-5077
+- Added munin package and dependancies
+- Compile without libevent, as the version in F-9 causes crashes
+- Enable options as per draft-wijngaards-dnsext-resolver-side-mitigation-00.txt
+- Enable unwanted-reply-threshold to mitigate against a Kaminsky attack
+- Enable val-clean-additional to drop addition unsigned data from signed
+  response.
+
 * Wed Oct 22 2008 Paul Wouters <paul at xelerance.com> - 1.0.2-5
 - Only call ldconfig in -libs package
 - Move configure into build section



From mclasen at fedoraproject.org  Tue Jan 20 22:54:14 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 20 Jan 2009 22:54:14 +0000 (UTC)
Subject: rpms/liberation-fonts/devel liberation-fonts.spec,1.31,1.32
Message-ID: <20090120225414.52578700F9@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/liberation-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14119

Modified Files:
	liberation-fonts.spec 
Log Message:
Fix busted inter-subpackage dependencies. Yay, font activism



Index: liberation-fonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/liberation-fonts/devel/liberation-fonts.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- liberation-fonts.spec	20 Jan 2009 02:36:24 -0000	1.31
+++ liberation-fonts.spec	20 Jan 2009 22:53:43 -0000	1.32
@@ -10,7 +10,7 @@
 Name:             %{fontname}-fonts
 Summary:          Fonts to replace commonly used Microsoft Windows fonts
 Version:          1.04.93
-Release:          5%{?dist}
+Release:          6%{?dist}
 # The license of the Liberation Fonts is a EULA that contains GPLv2 and two 
 # exceptions:
 # The first exception is the standard FSF font exception.
@@ -58,7 +58,7 @@
 %package -n %{fontname}-sans-fonts
 Summary:      Sans-serif fonts to replace commonly used Microsoft Arial
 Group:        User Interface/X
-Requires:     %{fontname}-common-fonts = %{version}-%{release}
+Requires:     %{fontname}-fonts-common = %{version}-%{release}
 
 %description -n %{fontname}-sans-fonts
 %common_desc
@@ -70,7 +70,7 @@
 %package -n %{fontname}-serif-fonts
 Summary:      Serif fonts to replace commonly used Microsoft Times New Roman
 Group:        User Interface/X
-Requires:     %{fontname}-common-fonts = %{version}-%{release}
+Requires:     %{fontname}-fonts-common = %{version}-%{release}
 
 %description -n %{fontname}-serif-fonts
 %common_desc
@@ -83,7 +83,7 @@
 %package -n %{fontname}-mono-fonts
 Summary:      Monospace fonts to replace commonly used Microsoft Courier New
 Group:        User Interface/X
-Requires:     %{fontname}-common-fonts = %{version}-%{release}
+Requires:     %{fontname}-fonts-common = %{version}-%{release}
 
 %description -n %{fontname}-mono-fonts
 %common_desc
@@ -115,6 +115,9 @@
 rm -rf %{buildroot}
 
 %changelog
+* Tue Jan 20 2009 Matthias Clasen <mclasen at redhat.com> - 1.04.93-6.fc11
+- Fix busted inter-subpackage dependencies
+
 * Tue Jan 20 2009 Caius Chance <cchance at redhat.com> - 1.04.93-5.fc11
 - Resolved: rhbz#477410
 - Refined .spec file based on Mailhot's review on rhbz.



From mclasen at fedoraproject.org  Tue Jan 20 22:57:31 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 20 Jan 2009 22:57:31 +0000 (UTC)
Subject: rpms/baekmuk-ttf-fonts/devel baekmuk-ttf-fonts.spec,1.10,1.11
Message-ID: <20090120225732.03582700F9@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/baekmuk-ttf-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14804

Modified Files:
	baekmuk-ttf-fonts.spec 
Log Message:
fix busted inter-subpackage dependencies



Index: baekmuk-ttf-fonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/baekmuk-ttf-fonts/devel/baekmuk-ttf-fonts.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- baekmuk-ttf-fonts.spec	20 Jan 2009 02:54:59 -0000	1.10
+++ baekmuk-ttf-fonts.spec	20 Jan 2009 22:57:01 -0000	1.11
@@ -8,7 +8,7 @@
 
 Name:           %{fontname}-fonts
 Version:        2.2
-Release:        14%{?dist}
+Release:        15%{?dist}
 Summary:        Free Korean TrueType fonts
 
 Group:          User Interface/X
@@ -37,7 +37,7 @@
 Group:          User Interface/X
 Obsoletes:      ttfonts-ko < 1.0.11-33, fonts-korean < 2.2-6
 Obsoletes:      %{name}-batang < 2.2-13
-Requires:       %{fontname}-common-fonts = %{version}-%{release}
+Requires:       %{fontname}-fonts-common = %{version}-%{release}
 
 %description -n %{fontname}-batang-fonts
 %common_desc
@@ -51,7 +51,7 @@
 Group:          User Interface/X
 Obsoletes:      ttfonts-ko < 1.0.11-33, fonts-korean < 2.2-6
 Obsoletes:      %{name}-dotum < 2.2-13 
-Requires:       %{fontname}-common-fonts = %{version}-%{release}
+Requires:       %{fontname}-fonts-common = %{version}-%{release}
 
 %description -n %{fontname}-dotum-fonts
 %common_desc
@@ -65,7 +65,7 @@
 Group:          User Interface/X
 Obsoletes:      ttfonts-ko < 1.0.11-33, fonts-korean < 2.2-6
 Obsoletes:      %{name}-gulim < 2.2-13
-Requires:       %{fontname}-common-fonts = %{version}-%{release}
+Requires:       %{fontname}-fonts-common = %{version}-%{release}
 
 %description -n %{fontname}-gulim-fonts
 %common_desc
@@ -79,7 +79,7 @@
 Group:          User Interface/X
 Obsoletes:      ttfonts-ko < 1.0.11-33, fonts-korean < 2.2-6
 Obsoletes:      %{name}-hline < 2.2-13 
-Requires:       %{fontname}-common-fonts = %{version}-%{release}
+Requires:       %{fontname}-fonts-common = %{version}-%{release}
 
 %description -n %{fontname}-hline-fonts
 %common_desc
@@ -154,6 +154,9 @@
 %__rm -rf %{buildroot}
 
 %changelog
+* Tue Jan 20 2009 Matthias Clasen <mclasen at redhat.com> - 2.2-15.fc11
+- Fix busted inter-subpackage dependencies
+
 * Tue Jan 20 2009 Caius Chance <cchance at redhat.com> - 2.2-14.fc11
 - Resolves: rhbz#477332
 - Refined according to Mailhot's comments (477410) on liberaton fonts.



From hadess at fedoraproject.org  Tue Jan 20 22:58:02 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Tue, 20 Jan 2009 22:58:02 +0000 (UTC)
Subject: rpms/gnome-media/devel gnome-media.spec,1.151,1.152
Message-ID: <20090120225802.7D00C700F9@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/gnome-media/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15498

Modified Files:
	gnome-media.spec 
Log Message:
more debug



Index: gnome-media.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-media/devel/gnome-media.spec,v
retrieving revision 1.151
retrieving revision 1.152
diff -u -r1.151 -r1.152
--- gnome-media.spec	20 Jan 2009 22:07:03 -0000	1.151
+++ gnome-media.spec	20 Jan 2009 22:57:32 -0000	1.152
@@ -77,7 +77,7 @@
 %build
 # try to work around a problem where gst-inspect does 
 # not find playbin the first time around
-DBUS_FATAL_WARNINGS=0 /usr/bin/gst-inspect-0.10 --print-all > /dev/null
+DBUS_FATAL_WARNINGS=0 /usr/bin/gst-inspect-0.10 --print-all # > /dev/null
 %configure --disable-schemas-install --enable-gnomecd=no --enable-cddbslave=no
 make #%{?_smp_mflags}
 



From wtogami at fedoraproject.org  Tue Jan 20 23:03:45 2009
From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=)
Date: Tue, 20 Jan 2009 23:03:45 +0000 (UTC)
Subject: rpms/kvm/devel kvm.spec,1.82,1.83
Message-ID: <20090120230345.721B0700F9@cvs1.fedora.phx.redhat.com>

Author: wtogami

Update of /cvs/pkgs/rpms/kvm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16726

Modified Files:
	kvm.spec 
Log Message:
sdl sound output to avoid grabbing OSS and causing pulseaudio failure



Index: kvm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kvm/devel/kvm.spec,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -r1.82 -r1.83
--- kvm.spec	15 Jan 2009 17:24:44 -0000	1.82
+++ kvm.spec	20 Jan 2009 23:03:14 -0000	1.83
@@ -1,7 +1,7 @@
 Summary: Kernel-based Virtual Machine
 Name: kvm
 Version: 83
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: Development/Tools
 URL: http://%{name}.sf.net
@@ -77,7 +77,10 @@
    --prefix=%{_prefix} \
    --qemu-ldflags=$qemuldflags \
    --disable-blobs \
-   --audio-drv-list=oss,alsa
+   --audio-drv-list=sdl,alsa,oss
+# sdl outputs to alsa or pulseaudio directly depending on what the system has configured
+# alsa works, but causes huge CPU load due to bugs
+# oss works, but is very problematic because it grabs exclusive control of the device causing other apps to go haywire
 
 # build the bios, and fix it's makefile
 sed -i 's/gcc -m32/gcc/' bios/Makefile
@@ -172,6 +175,9 @@
 
 
 %changelog
+* Tue Jan 20 2009 Warren Togami <wtogami at redhat.com> - 83-2
+- sdl sound output to avoid grabbing OSS and causing pulseaudio failure
+
 * Thu Jan 15 2009 Mark McLoughlin <markmc at redhat.com> - 83-1
 - Update to kvm-83
 - Change how we delete pre-built blobs now that qemu/pc-bios has



From pwouters at fedoraproject.org  Tue Jan 20 23:07:18 2009
From: pwouters at fedoraproject.org (Paul Wouters)
Date: Tue, 20 Jan 2009 23:07:18 +0000 (UTC)
Subject: rpms/unbound/F-10 sources, 1.2, 1.3 unbound.conf, 1.2,
	1.3 unbound.init, 1.1, 1.2 unbound.spec, 1.1, 1.2
Message-ID: <20090120230719.0C3EB700F9@cvs1.fedora.phx.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/unbound/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17245

Modified Files:
	sources unbound.conf unbound.init unbound.spec 
Log Message:
* Wed Jan 20 2009 Paul Wouters <paul at xelerance.com - 1.2.0-1
- Updated to 1.2.0
- Patch to allow missing files from includes using wildcards
- Added dependancy on minimum SSL for CVE-2008-5077
- Added unbound-munin and its dependancies
- Added minimum requirement of libevent 1.4.5. Crashes with older versions
- Enable options as per draft-wijngaards-dnsext-resolver-side-mitigation-00.txt
- Enable unwanted-reply-threshold to mitigate against a Kaminsky attack
- Enable val-clean-additional to drop addition unsigned data from signed
  response.



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/unbound/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	1 Nov 2008 16:53:23 -0000	1.2
+++ sources	20 Jan 2009 23:06:48 -0000	1.3
@@ -1 +1 @@
-01b08a9c0d24be981de64b6e4e25ecbe  unbound-1.0.2.tar.gz
+2517f811ec4939c0ea602c99a6fdea23  unbound-1.2.0.tar.gz


Index: unbound.conf
===================================================================
RCS file: /cvs/extras/rpms/unbound/F-10/unbound.conf,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- unbound.conf	15 Nov 2008 05:46:06 -0000	1.2
+++ unbound.conf	20 Jan 2009 23:06:48 -0000	1.3
@@ -1,5 +1,4 @@
 #
-#
 # See unbound.conf(5) man page.
 #
 # this is a comment.
@@ -7,26 +6,35 @@
 #Use this to include other text into the file.
 #include: "otherfile.conf"
 
-#
 # The server clause sets the main parameters. 
 server:
 	# whitespace is not necessary, but looks cleaner.
 
 	# To enable DNSSEC trust anchors, install the dnssec-keys package and
-	# uncomment the line below - note chroot breaks this
-	# trusted-keys-file: "/etc/pki/dnssec/allkeys.conf"
+	# uncomment the line below, or run dnssec-configure -h for more options
+	# trusted-keys-file: "/etc/pki/dnssec/production.conf"
+
+	# To enable DLV trust anchor with DLV, install the dnssec-keys package
+	# and uncomment the line below, or run dnssec-configure -h for more
+	# options
+	# dlv-anchor-file: "/etc/pki/dnssec-keys/dlv/dlv.isc.org.key"
 
 	# verbosity number, 0 is least verbose. 1 is default.
 	verbosity: 1
 
 	# print statistics to the log (for every thread) every N seconds.
 	# Set to "" or 0 to disable. Default is disabled.
+	# Needed for munin plugin
 	statistics-interval: 0
 	
 	# enable cumulative statistics, without clearing them after printing.
+	# Needed for munin plugin
 	statistics-cumulative: no
 
-	 extended-statistics: yes
+	# enable extended statistics (query types, answer codes, status)
+	# printed from unbound-control. default off, because of speed.
+	# Needed for munin plugin
+	extended-statistics: yes
 
 	# number of threads to create. 1 disables threading.
 	num-threads: 2
@@ -36,17 +44,18 @@
 	# specify 0.0.0.0 and ::0 to bind to all available interfaces.
 	# specify every interface on a new 'interface:' labelled line.
 	# The listen interfaces are not changed on reload, only on restart.
+	# interface: 0.0.0.0
+	# interface: ::0
 	# interface: 192.0.2.153
 	# interface: 192.0.2.154
 	# interface: 2001:DB8::5
-	#
-	# interface: 0.0.0.0
-	# interface: ::0
 	
 	# enable this feature to copy the source address of queries to reply.
-	# Socket options not be supported on all platforms. experimental. 
+	# Socket options are not supported on all platforms. experimental. 
 	# NOTE: Enable this option when specifying interface 0.0.0.0 or ::0 
+	# NOTE: Disabled per Fedora policy not to listen to * on default install
 	# interface-automatic: yes
+	interface-automatic: no
 
 	# port to answer queries from
 	# port: 53
@@ -95,6 +104,9 @@
 	# the number of queries that a thread gets to service.
 	# num-queries-per-thread: 1024
 
+	# if very busy, 50% queries run to completion, 50% get timeout in msec
+	# jostle-timeout: 200
+
 	# the amount of memory to use for the RRset cache.
 	# plain value in bytes or you can append k, m or G. default is "4Mb". 
 	# rrset-cache-size: 4m
@@ -144,13 +156,14 @@
 	# control which clients are allowed to make (recursive) queries
 	# to this server. Specify classless netblocks with /size and action.
 	# By default everything is refused, except for localhost.
-	# Choose deny (drop message), refuse (polite error reply), allow.
+	# Choose deny (drop message), refuse (polite error reply),
+	# allow (recursive ok), allow_snoop (recursive and nonrecursive ok)
 	# access-control: 0.0.0.0/0 refuse
 	# access-control: 127.0.0.0/8 allow
 	# access-control: ::0/0 refuse
 	# access-control: ::1 allow
 	# access-control: ::ffff:127.0.0.1 allow
-	
+
 	# if given, a chroot(2) is done to the given directory.
 	# i.e. you can chroot to the working directory, for example,
 	# for extra security, but make sure all files are in that directory.
@@ -160,19 +173,22 @@
 	# chroot has been performed the now defunct portion of the config 
 	# file path is removed to be able to reread the config after a reload. 
 	#
-	# All other file paths (working dir, pidfile, logfile, roothints,
+	# All other file paths (working dir, logfile, roothints, and
 	# key files) can be specified in several ways:
 	# 	o as an absolute path relative to the new root.
 	# 	o as a relative path to the working directory.
 	# 	o as an absolute path relative to the original root.
 	# In the last case the path is adjusted to remove the unused portion.
 	#
-	# Additionally, unbound may need to access /dev/random (for entropy)
-	# and to /dev/log (if you use syslog) from inside the chroot.
+	# The pid file can be absolute and outside of the chroot, it is 
+	# written just prior to performing the chroot and dropping permissions.
+	#
+	# Additionally, unbound may need to access /dev/random (for entropy).
 	# How to do this is specific to your OS.
 	#
 	# If you give "" no chroot is performed. The path must not end in a /.
-	chroot: "/var/lib/unbound"
+	# chroot: "/var/lib/unbound"
+	chroot: ""
 
 	# if given, user privileges are dropped (after binding port),
 	# and the given username is assumed. Default is user "unbound".
@@ -182,7 +198,7 @@
 	# the working directory. The relative files in this config are 
 	# relative to this directory. If you give "" the working directory
 	# is not changed.
-	# directory: "/var/lib/unbound"
+	directory: "/etc/unbound"
 
 	# the log file, "" means log to stderr. 
 	# Use of this option sets use-syslog to "no".
@@ -192,7 +208,7 @@
 	# log to, with identity "unbound". If yes, it overrides the logfile.
 	# use-syslog: yes 
 
-	# the pid file.
+	# the pid file. Can be an absolute path outside of chroot/work dir.
 	pidfile: "/var/run/unbound/unbound.pid"
 	
 	# file to read root hints from.
@@ -235,15 +251,40 @@
 	# trigger insecure mode for that zone (like without a trustanchor).
 	# Default on, which insists on dnssec data for trust-anchored zones.
 	harden-dnssec-stripped: yes
-	
+
+        # Harden the referral path by performing additional queries for
+	# infrastructure data.  Validates the replies (if possible).
+	# Default off, because the lookups burden the server.  Experimental 
+	# implementation of draft-wijngaards-dnsext-resolver-side-mitigation.
+	harden-referral-path: yes
+
 	# Use 0x20-encoded random bits in the query to foil spoof attempts.
-	# Disabled by default, because some caching forwarders may not
-	# support this (if you have forward-zones). Most authority servers do.
 	# This feature is an experimental implementation of draft dns-0x20.
-	# It is known that some authority servers do not support 0x20, and
-	# resolution will fail for them. A solution is on the TODO list.
-	use-caps-for-id: no
+	use-caps-for-id: yes
 	
+	# Enforce privacy of these addresses. Strips them away from answers. 
+	# It may cause DNSSEC validation to additionally mark it as bogus. 
+	# Protects against 'DNS Rebinding' (uses browser as network proxy). 
+	# Only 'private-domain' and 'local-data' names are allowed to have 
+	# these private addresses. No default.
+	# private-address: 10.0.0.0/8
+	# private-address: 172.16.0.0/12
+	# private-address: 192.168.0.0/16
+	# private-address: 192.254.0.0/16
+	# private-address: fd00::/8
+	# private-address: fe80::/10
+
+	# Allow the domain (and its subdomains) to contain private addresses.
+	# local-data statements are allowed to contain private addresses too.
+	# private-domain: "example.com"
+	
+	# If nonzero, unwanted replies are not only reported in statistics,
+	# but also a running total is kept per thread. If it reaches the
+	# threshold, a warning is printed and a defensive action is taken,
+	# the cache is cleared to flush potential poison out of it.
+	# A suggested value is 10000000, the default is 0 (turned off).
+	unwanted-reply-threshold: 10000000
+
 	# Do not query the following addresses. No DNS queries are sent there.
 	# List one address per entry. List classless netblocks with /size,
 	# do-not-query-address: 127.0.0.1/8
@@ -257,11 +298,16 @@
 	# separated by spaces. "iterator" or "validator iterator"
 	# module-config: "validator iterator"
 	
+	# File with DLV trusted keys. Same format as trust-anchor-file.
+	# There can be only one DLV configured, it is trusted from root down.
+	# Download https://secure.isc.org/ops/dlv/dlv.isc.org.key
+	# dlv-anchor-file: "/etc/pki/dnssec-keys/dlv.isc.org.key"
+
 	# File with trusted keys for validation. Specify more than one file
 	# with several entries, one file per entry.
 	# Zone file format, with DS and DNSKEY entries.
 	# trust-anchor-file: ""
-	
+
 	# Trusted key for validation. DS or DNSKEY. specify the RR on a
 	# single line, surrounded by "". TTL is ignored. class is IN default.
 	# (These examples are from August 2007 and may not be valid anymore).
@@ -273,7 +319,7 @@
 	# but has a different file format. Format is BIND-9 style format, 
 	# the trusted-keys { name flag proto algo "key"; }; clauses are read.
 	# trusted-keys-file: ""
-
+	
 	# Override the date for validation with a specific fixed date.
 	# Do not set this unless you are debugging signature inception
 	# and expiration. "" or "0" turns the feature off. 
@@ -281,19 +327,20 @@
 	
 	# The time to live for bogus data, rrsets and messages. This avoids
 	# some of the revalidation, until the time interval expires. in secs.
-	# val-bogus-ttl: 900
+	# val-bogus-ttl: 60
 	
 	# Should additional section of secure message also be kept clean of
 	# unsecure data. Useful to shield the users of this validator from
 	# potential bogus data in the additional section. All unsigned data 
 	# in the additional section is removed from secure messages.
-	# val-clean-additional: yes
+	val-clean-additional: yes
 	
 	# Turn permissive mode on to permit bogus messages. Thus, messages
 	# for which security checks failed will be returned to clients,
 	# instead of SERVFAIL. It still performs the security checks, which
 	# result in interesting log files and possibly the AD bit in
 	# replies if the message is found secure. The default is off.
+	# NOTE: TURNING THIS ON DISABLES ALL DNSSEC SECURITY
 	val-permissive-mode: no
 	
 	# It is possible to configure NSEC3 maximum iteration counts per
@@ -310,6 +357,10 @@
 	# the number of slabs must be a power of 2.
 	# more slabs reduce lock contention, but fragment memory usage.
 	# key-cache-slabs: 4
+	
+	# the amount of memory to use for the negative cache (used for DLV).
+	# plain value in bytes or you can append k, m or G. default is "1Mb". 
+	# neg-cache-size: 1m
 
 	# a number of locally served zones can be configured.
 	# 	local-zone: <zone> <type>
@@ -340,15 +391,48 @@
 	# (this makes example.com, www.example.com, etc, all go to 192.0.2.3)
 	# local-zone: "example.com" redirect
 	# local-data: "example.com A 192.0.2.3"
+	#
+	# Shorthand to make PTR records, "IPv4 name" or "IPv6 name".
+	# You can also add PTR records using local-data directly, but then
+	# you need to do the reverse notation yourself.
+	# local-data-ptr: "192.0.2.3 www.example.com"
+
+# Remote control config section. 
+remote-control:
+	# Enable remote control with unbound-control(8) here.
+	# set up the keys and certificates with unbound-control-setup.
+	# Note: required for unbound-munin package
+	control-enable: yes
+
+	# what interfaces are listened to for remote control.
+	# give 0.0.0.0 and ::0 to listen to all interfaces.
+	# control-interface: 127.0.0.1
+	# control-interface: ::1
+
+	# port number for remote control operations.
+	# control-port: 953
+
+	# unbound server key file.
+	server-key-file: "/etc/unbound/unbound_server.key"
+
+	# unbound server certificate file.
+	server-cert-file: "/etc/unbound/unbound_server.pem"
+
+	# unbound-control key file.
+	control-key-file: "/etc/unbound/unbound_control.key"
 
+	# unbound-control certificate file.
+	control-cert-file: "/etc/unbound/unbound_control.pem"
 
 # Stub zones.
 # Create entries like below, to make all queries for 'example.com' and 
 # 'example.org' go to the given list of nameservers. list zero or more 
-# nameservers by hostname or by ipaddress.
+# nameservers by hostname or by ipaddress. If you set stub-prime to yes, 
+# the list is treated as priming hints (default is no).
 # stub-zone:
 #	name: "example.com"
 #	stub-addr: 192.0.2.68
+#	stub-prime: "no"
 # stub-zone:
 #	name: "example.org"
 #	stub-host: ns.example.com.


Index: unbound.init
===================================================================
RCS file: /cvs/extras/rpms/unbound/F-10/unbound.init,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- unbound.init	1 Nov 2008 16:53:23 -0000	1.1
+++ unbound.init	20 Jan 2009 23:06:48 -0000	1.2
@@ -22,7 +22,7 @@
 . /etc/rc.d/init.d/functions
 
 exec="/usr/sbin/unbound"
-config="/var/lib/unbound/unbound.conf"
+config="/etc/unbound/unbound.conf"
 rootdir="/var/lib/unbound"
 pidfile="/var/run/unbound/unbound.pid"
 
@@ -33,17 +33,17 @@
 start() {
     [ -x $exec ] || exit 5
     [ -f $config ] || exit 6
-    echo -n $"Starting unbound: "
 
-	if [ ! -e ${rootdir}/etc/resolv.conf ] || /usr/bin/cmp -s /etc/resolv.conf ${rootdir}/etc/resolv.conf; then
-	    cp -fp /etc/resolv.conf ${rootdir}/etc/resolv.conf
-	fi;
-	if [ ! -e ${rootdir}/etc/localtime ] || /usr/bin/cmp -s /etc/localtime ${rootdir}/etc/localtime; then
-	    cp -fp /etc/localtime ${rootdir}/etc/localtime
-	fi;
-	mount --bind -n /dev/log ${rootdir}/dev/log >/dev/null 2>&1;
-	mount --bind -n /dev/random ${rootdir}/dev/random >/dev/null 2>&1;
-	mount --bind -n /var/run/unbound ${rootdir}/var/run/unbound >/dev/null 2>&1;
+    if [ ! -f /etc/unbound/unbound_control.key ]
+    then
+	echo -n $"Generating unbound control key and certificate: "
+	/usr/sbin/unbound-control-setup -d /etc/unbound/ > /dev/null 2> /dev/null
+	[ -x /usr/sbin/selinuxenabled ] && /usr/sbin/selinuxenabled && \
+	    [ -x /sbin/restorecon ] && /sbin/restorecon /etc/unbound/*
+	echo
+    fi
+
+    echo -n $"Starting unbound: "
 
     # if not running, start it up here
     daemon $exec
@@ -58,12 +58,6 @@
     killproc -p $pidfile unbound
     retval=$?
     [ $retval -eq 0 ] && rm -f $lockfile
-    for mountfile in /dev/log /dev/random /etc/localtime /etc/resolv.conf /var/run/unbound
-    do
-    if egrep -q '^/[^[:space:]]+[[:space:]]+'${rootdir}''${mountfile}'' /proc/mounts; then
-	umount ${rootdir}$mountfile >/dev/null 2>&1
-    fi;
-    done
     echo
 }
 


Index: unbound.spec
===================================================================
RCS file: /cvs/extras/rpms/unbound/F-10/unbound.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- unbound.spec	1 Nov 2008 16:53:23 -0000	1.1
+++ unbound.spec	20 Jan 2009 23:06:48 -0000	1.2
@@ -1,20 +1,23 @@
 Summary: Validating, recursive, and caching DNS(SEC) resolver
 Name: unbound
-Version: 1.0.2
-Release: 5%{?dist}
+Version: 1.2.0
+Release: 1%{?dist}
 License: BSD
 Url: http://www.nlnetlabs.nl/unbound/
 Source: http://www.unbound.net/downloads/%{name}-%{version}.tar.gz
 Source1: unbound.init
 Source2: unbound.conf
+Source3: unbound.munin
+Patch0: unbound-1.2-glob.patch
 Group: System Environment/Daemons
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: flex, openssl-devel, ldns-devel >= 1.3.0, libevent-devel
+BuildRequires: flex, openssl-devel >= 0.9.8g-12, ldns-devel >= 1.4.0, 
+BuildRequires: libevent-devel >= 1.4.5
 Requires(post): chkconfig
 Requires(preun): chkconfig
 Requires(preun): initscripts
 Requires(postun): initscripts
-Requires: ldns >= 1.3.0
+Requires: ldns >= 1.4.0
 Requires(pre): shadow-utils
 # Is this obsolete?
 #Provides: caching-nameserver
@@ -30,11 +33,19 @@
 DNSSEC (secure DNS) validation and stub-resolvers (that do not run
 as a server, but are linked into an application) are easily possible.
 
+%package munin
+Summary: Plugin for the munin / munin-node monitoring package
+Group:     System Environment/Daemons
+Requires: munin-node
+Requires: %{name} = %{version}-%{release}, bc
+
+%description munin
+Plugin for the munin / munin-node monitoring package
+
 %package devel
 Summary: Development package that includes the unbound header files
 Group: Development/Libraries
 Requires: %{name}-libs = %{version}-%{release}, openssl-devel, ldns-devel
-Requires: libevent-devel
 
 %description devel
 The devel package contains the unbound library and the include files
@@ -44,46 +55,40 @@
 Group: Applications/System
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
+Requires: openssl >= 0.9.8g-12
 
 %description libs
 Contains libraries used by the unbound server and client applications
 
 %prep
 %setup -q 
+%patch0 -p1
 
 %build
-%configure  --with-ldns= --with-libevent --with-pthreads --with-ssl \
+%configure  --with-ldns= -with-libevent --with-pthreads --with-ssl \
             --disable-rpath --enable-debug --disable-static \
-            --with-run-dir=%{_localstatedir}/lib/%{name}\
-            --with-conf-file=%{_localstatedir}/lib/%{name}/unbound.conf \
+            --with-conf-file=%{_sysconfdir}/%{name}/unbound.conf \
             --with-pidfile=%{_localstatedir}/run/%{name}/%{name}.pid
 %{__make} CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE" QUIET=no %{?_smp_mflags}
 
 %install
 rm -rf %{buildroot}
 %{__make} DESTDIR=%{buildroot} install
-install -d 0755 %{buildroot}%{_localstatedir}/lib/%{name}
 install -d 0755 %{buildroot}%{_initrddir}
-#install -m 0755 contrib/unbound.init %{buildroot}%{_initrddir}/unbound
 install -m 0755 %{SOURCE1} %{buildroot}%{_initrddir}/unbound
-#overwrite stock unbound.conf with our own
-install -m 0755 %{SOURCE2} %{buildroot}%{_localstatedir}/lib/%{name}
+install -m 0755 %{SOURCE2} %{buildroot}%{_sysconfdir}/unbound
+# Install munin plugin and its softlinks
+install -d 0755 %{buildroot}%{_sysconfdir}/munin/plugin-conf.d
+install -m 0644 %{SOURCE3} %{buildroot}%{_sysconfdir}/munin/plugin-conf.d/unbound
+install -d 0755 %{buildroot}%{_datadir}/munin/plugins/
+install -m 0755 contrib/unbound_munin_ %{buildroot}%{_datadir}/munin/plugins/unbound
+for plugin in unbound_munin_hits unbound_munin_queue unbound_munin_memory unbound_munin_by_type unbound_munin_by_class unbound_munin_by_opcode unbound_munin_by_rcode unbound_munin_by_flags unbound_munin_histogram; do
+    ln -s unbound %{buildroot}%{_datadir}/munin/plugins/$plugin
+done 
 
-# add symbolic link from /etc/unbound.conf -> /var/unbound/unbound.conf
-
-( cd %{buildroot}%{_sysconfdir}/ ; ln -s ..%{_localstatedir}/lib/unbound/unbound.conf )
 # remove static library from install (fedora packaging guidelines)
 rm -rf %{buildroot}%{_libdir}/*.la
 
-# The chroot needs /dev/log, /dev/random, /etc/resolv.conf and /etc/localtime
-# but the init script uses mount --bind, so just create empty files
-mkdir -p %{buildroot}%{_localstatedir}/lib/unbound/etc \
-         %{buildroot}%{_localstatedir}/lib/unbound/dev 
-echo "Used for mount --bind in initscript" >  %{buildroot}%{_localstatedir}/lib/unbound/etc/resolv.conf 
-echo "Used for mount --bind in initscript" > %{buildroot}%{_localstatedir}/lib/unbound/etc/localtime
-echo "Used for mount --bind in initscript" > %{buildroot}%{_localstatedir}/lib/unbound/dev/log 
-echo "Used for mount --bind in initscript" > %{buildroot}%{_localstatedir}/lib/unbound/dev/random
-mkdir -p %{buildroot}%{_localstatedir}/lib/unbound/var/run/unbound
 mkdir -p %{buildroot}%{_localstatedir}/run/unbound
 
 %clean
@@ -93,21 +98,17 @@
 %defattr(-,root,root,-)
 %doc doc/README doc/CREDITS doc/LICENSE doc/FEATURES
 %attr(0755,root,root) %{_initrddir}/%{name}
-# the chroot env
-%attr(0755,root,root) %dir %{_localstatedir}/lib/%{name}
+%attr(0755,root,root) %dir %{_sysconfdir}/%{name}
 %attr(0755,unbound,unbound) %dir %{_localstatedir}/run/%{name}
-%attr(0755,root,root) %dir %{_localstatedir}/lib/%{name}/dev
-%attr(0755,root,root) %dir %{_localstatedir}/lib/%{name}/etc
-%attr(0755,root,root) %dir %{_localstatedir}/lib/%{name}/var
-%attr(0755,root,root) %dir %{_localstatedir}/lib/%{name}/var/run
-%attr(0755,root,root) %dir %{_localstatedir}/lib/%{name}/var/run/unbound
-%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/unbound.conf
-%attr(0644,root,root) %config(noreplace) %{_localstatedir}/lib/%{name}/unbound.conf
-%attr(0644,root,root) %{_localstatedir}/lib/%{name}/dev/*
-%attr(0644,root,root) %{_localstatedir}/lib/%{name}/etc/*
+%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/%{name}/unbound.conf
 %{_sbindir}/*
 %{_mandir}/*/*
 
+%files munin
+%defattr(-,root,root,-)
+%config(noreplace) %{_sysconfdir}/munin/plugin-conf.d/unbound
+%{_datadir}/munin/plugins/unbound*
+
 %files devel
 %defattr(-,root,root,-)
 %{_libdir}/libunbound.so
@@ -122,7 +123,7 @@
 %pre
 getent group unbound >/dev/null || groupadd -r unbound
 getent passwd unbound >/dev/null || \
-useradd -r -g unbound -d %{_localstatedir}/lib/%{name} -s /sbin/nologin \
+useradd -r -g unbound -d %{_sysconfdir}/unbound -s /sbin/nologin \
 -c "Unbound DNS resolver" unbound
 exit 0
 
@@ -133,7 +134,7 @@
 
 
 %preun
-if [ $1 -eq 0 ]; then
+if [ "$1" -eq 0 ]; then
         /sbin/service %{name} stop >/dev/null 2>&1
         /sbin/chkconfig --del %{name} 
 fi
@@ -146,6 +147,17 @@
 %postun libs -p /sbin/ldconfig
 
 %changelog
+* Wed Jan 20 2009 Paul Wouters <paul at xelerance.com - 1.2.0-1
+- Updated to 1.2.0
+- Patch to allow missing files from includes using wildcards
+- Added dependancy on minimum SSL for CVE-2008-5077
+- Added unbound-munin and its dependancies
+- Added minimum requirement of libevent 1.4.5. Crashes with older versions
+- Enable options as per draft-wijngaards-dnsext-resolver-side-mitigation-00.txt
+- Enable unwanted-reply-threshold to mitigate against a Kaminsky attack
+- Enable val-clean-additional to drop addition unsigned data from signed
+  response.
+
 * Wed Oct 22 2008 Paul Wouters <paul at xelerance.com> - 1.0.2-5
 - Only call ldconfig in -libs package
 - Move configure into build section
@@ -181,5 +193,3 @@
 * Wed Apr 23 2008 Wouter Wijngaards <wouter at nlnetlabs.nl> - 0.11
 - Initial version.
 
-
-



From pwouters at fedoraproject.org  Tue Jan 20 23:28:45 2009
From: pwouters at fedoraproject.org (Paul Wouters)
Date: Tue, 20 Jan 2009 23:28:45 +0000 (UTC)
Subject: rpms/unbound/F-10 unbound-1.2-glob.patch,NONE,1.1
Message-ID: <20090120232845.E513E700F9@cvs1.fedora.phx.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/unbound/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20932

Added Files:
	unbound-1.2-glob.patch 
Log Message:
added patch


unbound-1.2-glob.patch:

--- NEW FILE unbound-1.2-glob.patch ---
diff -Naur unbound-1.2.0/validator/val_anchor.c unbound-1.2.0.new/validator/val_anchor.c
--- unbound-1.2.0/validator/val_anchor.c	2009-01-07 07:24:34.000000000 -0500
+++ unbound-1.2.0.new/validator/val_anchor.c	2009-01-20 17:31:43.000000000 -0500
@@ -718,7 +718,8 @@
 			log_err("wildcard trusted-keys-file %s: expansion "
 				"failed (%s)", pat, strerror(errno));
 		}
-		return 0;
+		/* ignore globs that yield no files */
+		return 1;
 	}
 	/* process files found, if any */
 	for(i=0; i<(size_t)g.gl_pathc; i++) {



From pwouters at fedoraproject.org  Tue Jan 20 23:30:54 2009
From: pwouters at fedoraproject.org (Paul Wouters)
Date: Tue, 20 Jan 2009 23:30:54 +0000 (UTC)
Subject: rpms/unbound/F-10 unbound.munin,NONE,1.1
Message-ID: <20090120233054.8293F700F9@cvs1.fedora.phx.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/unbound/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21412

Added Files:
	unbound.munin 
Log Message:
added munin resource



--- NEW FILE unbound.munin ---
#
# For this plugin to work, unbound.conf needs to have:
# remote-control:	control-enable: yes
# 
[unbound*]
user root
env.statefile /var/lib/munin/plugin-state/unbound-state
env.unbound_conf /etc/unbound/unbound.conf
env.unbound_control /usr/sbin/unbound-control
env.spoof_warn 1000
env.spoof_crit 100000



From pkgdb at fedoraproject.org  Tue Jan 20 23:37:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Jan 2009 23:37:37 +0000
Subject: [pkgdb] dirvish: fab has requested watchcommits
Message-ID: <20090120233737.31E4F2081FA@bastion.fedora.phx.redhat.com>

fab has requested the watchcommits acl on dirvish (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/dirvish



From pkgdb at fedoraproject.org  Tue Jan 20 23:37:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Jan 2009 23:37:37 +0000
Subject: [pkgdb] dirvish: fab has requested watchbugzilla
Message-ID: <20090120233737.7269F208471@bastion.fedora.phx.redhat.com>

fab has requested the watchbugzilla acl on dirvish (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/dirvish



From pkgdb at fedoraproject.org  Tue Jan 20 23:37:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Jan 2009 23:37:37 +0000
Subject: [pkgdb] dirvish: fab has requested commit
Message-ID: <20090120233738.1D279208474@bastion.fedora.phx.redhat.com>

fab has requested the commit acl on dirvish (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/dirvish



From pkgdb at fedoraproject.org  Tue Jan 20 23:37:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Jan 2009 23:37:45 +0000
Subject: [pkgdb] dirvish: fab has requested watchbugzilla
Message-ID: <20090120233745.2C78C208477@bastion.fedora.phx.redhat.com>

fab has requested the watchbugzilla acl on dirvish (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/dirvish



From pkgdb at fedoraproject.org  Tue Jan 20 23:37:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Jan 2009 23:37:47 +0000
Subject: [pkgdb] dirvish: fab has requested watchcommits
Message-ID: <20090120233747.5A10420847A@bastion.fedora.phx.redhat.com>

fab has requested the watchcommits acl on dirvish (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/dirvish



From pkgdb at fedoraproject.org  Tue Jan 20 23:37:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Jan 2009 23:37:48 +0000
Subject: [pkgdb] dirvish: fab has requested commit
Message-ID: <20090120233748.7885920847E@bastion.fedora.phx.redhat.com>

fab has requested the commit acl on dirvish (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/dirvish



From pkgdb at fedoraproject.org  Tue Jan 20 23:37:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Jan 2009 23:37:51 +0000
Subject: [pkgdb] dirvish: fab has requested approveacls
Message-ID: <20090120233751.326042081FA@bastion.fedora.phx.redhat.com>

fab has requested the approveacls acl on dirvish (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/dirvish



From pkgdb at fedoraproject.org  Tue Jan 20 23:37:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 20 Jan 2009 23:37:53 +0000
Subject: [pkgdb] dirvish: fab has requested approveacls
Message-ID: <20090120233753.F192E208483@bastion.fedora.phx.redhat.com>

fab has requested the approveacls acl on dirvish (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/dirvish



From hadess at fedoraproject.org  Tue Jan 20 23:38:39 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Tue, 20 Jan 2009 23:38:39 +0000 (UTC)
Subject: rpms/gnome-media/devel gnome-media.spec,1.152,1.153
Message-ID: <20090120233839.25128700F9@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/gnome-media/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22314

Modified Files:
	gnome-media.spec 
Log Message:
more debug



Index: gnome-media.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-media/devel/gnome-media.spec,v
retrieving revision 1.152
retrieving revision 1.153
diff -u -r1.152 -r1.153
--- gnome-media.spec	20 Jan 2009 22:57:32 -0000	1.152
+++ gnome-media.spec	20 Jan 2009 23:38:08 -0000	1.153
@@ -77,6 +77,7 @@
 %build
 # try to work around a problem where gst-inspect does 
 # not find playbin the first time around
+DBUS_FATAL_WARNINGS=0 /usr/bin/gst-inspect-0.10 cairotextoverlay
 DBUS_FATAL_WARNINGS=0 /usr/bin/gst-inspect-0.10 --print-all # > /dev/null
 %configure --disable-schemas-install --enable-gnomecd=no --enable-cddbslave=no
 make #%{?_smp_mflags}



From petersen at fedoraproject.org  Wed Jan 21 00:18:33 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Wed, 21 Jan 2009 00:18:33 +0000 (UTC)
Subject: comps comps-f11.xml.in,1.67,1.68
Message-ID: <20090121001833.D3BAE70141@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/extras/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28176

Modified Files:
	comps-f11.xml.in 
Log Message:
add cpphs to @haskell


Index: comps-f11.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-f11.xml.in,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- comps-f11.xml.in	20 Jan 2009 17:59:57 -0000	1.67
+++ comps-f11.xml.in	21 Jan 2009 00:18:03 -0000	1.68
@@ -2483,6 +2483,7 @@
       <packagereq type="default">ghc</packagereq>
       <packagereq type="default">ghc-doc</packagereq>
       <packagereq type="default">happy</packagereq>
+      <packagereq type="optional">cpphs</packagereq>
       <packagereq type="optional">ghc-gtk2hs</packagereq>
       <packagereq type="optional">ghc-gtk2hs-doc</packagereq>
       <packagereq type="optional">ghc-prof</packagereq>



From jakub at fedoraproject.org  Wed Jan 21 00:19:48 2009
From: jakub at fedoraproject.org (Jakub Jelinek)
Date: Wed, 21 Jan 2009 00:19:48 +0000 (UTC)
Subject: rpms/gcc/devel gcc.spec,1.7,1.8
Message-ID: <20090121001948.102FA70141@cvs1.fedora.phx.redhat.com>

Author: jakub

Update of /cvs/pkgs/rpms/gcc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28336

Modified Files:
	gcc.spec 
Log Message:
4.4.0-0.7


Index: gcc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/devel/gcc.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- gcc.spec	20 Jan 2009 19:45:24 -0000	1.7
+++ gcc.spec	21 Jan 2009 00:19:17 -0000	1.8
@@ -3,7 +3,7 @@
 %define gcc_version 4.4.0
 # 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 0.6
+%define gcc_release 0.7
 %define _unpackaged_files_terminate_build 0
 %define multilib_64_archs sparc64 ppc64 s390x x86_64
 %define include_gappletviewer 1
@@ -546,7 +546,7 @@
 exec /usr/bin/gcc -m64 "$@"
 EOF
   chmod +x gcc64
-  CC=`pwd`/gcc64
+#  CC=`pwd`/gcc64
 fi
 %endif
 OPT_FLAGS=`echo "$OPT_FLAGS" | sed -e 's/[[:blank:]]\+/ /g'`
@@ -1724,7 +1724,7 @@
 %doc rpm.doc/changelogs/libmudflap/ChangeLog*
 
 %changelog
-* Tue Jan 20 2009 Jakub Jelinek <jakub at redhat.com> 4.4.0-0.6
+* Tue Jan 20 2009 Jakub Jelinek <jakub at redhat.com> 4.4.0-0.7
 - attempt to enable Ada support on ppc64
 
 * Fri Jan 16 2009 Jakub Jelinek <jakub at redhat.com> 4.4.0-0.3



From jakub at fedoraproject.org  Wed Jan 21 00:39:16 2009
From: jakub at fedoraproject.org (Jakub Jelinek)
Date: Wed, 21 Jan 2009 00:39:16 +0000 (UTC)
Subject: rpms/gcc/devel gcc.spec,1.8,1.9
Message-ID: <20090121003916.95E9A7012F@cvs1.fedora.phx.redhat.com>

Author: jakub

Update of /cvs/pkgs/rpms/gcc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31595

Modified Files:
	gcc.spec 
Log Message:
4.4.0-0.8


Index: gcc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/devel/gcc.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- gcc.spec	21 Jan 2009 00:19:17 -0000	1.8
+++ gcc.spec	21 Jan 2009 00:38:46 -0000	1.9
@@ -3,7 +3,7 @@
 %define gcc_version 4.4.0
 # 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 0.7
+%define gcc_release 0.8
 %define _unpackaged_files_terminate_build 0
 %define multilib_64_archs sparc64 ppc64 s390x x86_64
 %define include_gappletviewer 1
@@ -486,9 +486,7 @@
 mkdir gnat_hacks
 cd gnat_hacks
 tar xjf %{SOURCE100}
-#sed -i -e 's/gnat\*)/gnat*|*.ad[sb]\\ *|*.ad[sb])/' bin/gcc
-rm bin/gcc
-ln -sf gnatgcc bin/gcc
+sed -i -e 's/gnat\*)/gnat*|*.ad[sb]\\ *|*.ad[sb])/' bin/gcc
 export PATH=`pwd`/bin${PATH:+:$PATH}
 cd ..
 %endif
@@ -1724,7 +1722,7 @@
 %doc rpm.doc/changelogs/libmudflap/ChangeLog*
 
 %changelog
-* Tue Jan 20 2009 Jakub Jelinek <jakub at redhat.com> 4.4.0-0.7
+* Tue Jan 20 2009 Jakub Jelinek <jakub at redhat.com> 4.4.0-0.8
 - attempt to enable Ada support on ppc64
 
 * Fri Jan 16 2009 Jakub Jelinek <jakub at redhat.com> 4.4.0-0.3



From pwouters at fedoraproject.org  Wed Jan 21 00:42:39 2009
From: pwouters at fedoraproject.org (Paul Wouters)
Date: Wed, 21 Jan 2009 00:42:39 +0000 (UTC)
Subject: rpms/unbound/F-10 .cvsignore,1.1,1.2
Message-ID: <20090121004239.456207012F@cvs1.fedora.phx.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/unbound/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32111

Modified Files:
	.cvsignore 
Log Message:
n/a



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/unbound/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	31 Oct 2008 16:59:08 -0000	1.1
+++ .cvsignore	21 Jan 2009 00:42:08 -0000	1.2
@@ -0,0 +1 @@
+unbound-1.2.0.tar.gz



From pwouters at fedoraproject.org  Wed Jan 21 00:47:14 2009
From: pwouters at fedoraproject.org (Paul Wouters)
Date: Wed, 21 Jan 2009 00:47:14 +0000 (UTC)
Subject: rpms/unbound/F-10 unbound.spec,1.2,1.3
Message-ID: <20090121004714.E69237012F@cvs1.fedora.phx.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/unbound/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv346

Modified Files:
	unbound.spec 
Log Message:
bump



Index: unbound.spec
===================================================================
RCS file: /cvs/extras/rpms/unbound/F-10/unbound.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- unbound.spec	20 Jan 2009 23:06:48 -0000	1.2
+++ unbound.spec	21 Jan 2009 00:46:44 -0000	1.3
@@ -1,7 +1,7 @@
 Summary: Validating, recursive, and caching DNS(SEC) resolver
 Name: unbound
 Version: 1.2.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: BSD
 Url: http://www.nlnetlabs.nl/unbound/
 Source: http://www.unbound.net/downloads/%{name}-%{version}.tar.gz
@@ -147,6 +147,9 @@
 %postun libs -p /sbin/ldconfig
 
 %changelog
+* Wed Jan 20 2009 Paul Wouters <paul at xelerance.com - 1.2.0-2
+- Added missing patch
+
 * Wed Jan 20 2009 Paul Wouters <paul at xelerance.com - 1.2.0-1
 - Updated to 1.2.0
 - Patch to allow missing files from includes using wildcards



From hadess at fedoraproject.org  Wed Jan 21 00:48:31 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Wed, 21 Jan 2009 00:48:31 +0000 (UTC)
Subject: rpms/gstreamer-plugins-good/devel gstreamer-plugins-good.spec, 1.80,
	1.81
Message-ID: <20090121004831.7D2B27012F@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-serv524

Modified Files:
	gstreamer-plugins-good.spec 
Log Message:
* Wed Jan 21 2009 - Bastien Nocera <bnocera at redhat.com> - 0.10.11-5
- Rebuild for new gstreamer base library



Index: gstreamer-plugins-good.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamer-plugins-good/devel/gstreamer-plugins-good.spec,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- gstreamer-plugins-good.spec	15 Jan 2009 03:26:50 -0000	1.80
+++ gstreamer-plugins-good.spec	21 Jan 2009 00:48:01 -0000	1.81
@@ -6,7 +6,7 @@
 
 Name: 		%{gstreamer}-plugins-good
 Version: 	0.10.11
-Release:  	4%{?dist}
+Release:  	5%{?dist}
 Summary: 	GStreamer plug-ins with good code and licensing
 
 Group: 		Applications/Multimedia
@@ -257,6 +257,9 @@
 gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/gstreamer-%{majorminor}.schemas > /dev/null || :
 
 %changelog
+* Wed Jan 21 2009 - Bastien Nocera <bnocera at redhat.com> - 0.10.11-5
+- Rebuild for new gstreamer base library
+
 * Wed Jan 14 2009 Warren Togami <wtogami at redhat.com> 0.10.11-4
 - Bug #477877 Fix multilib conflict in -devel
 - Bug #478449 Fix ladspa on lib64 



From mclasen at fedoraproject.org  Wed Jan 21 00:54:49 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Wed, 21 Jan 2009 00:54:49 +0000 (UTC)
Subject: rpms/nautilus/devel nautilus.spec,1.254,1.255
Message-ID: <20090121005449.AFEBB7012F@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/nautilus/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1540

Modified Files:
	nautilus.spec 
Log Message:
Reenable translation size reduction



Index: nautilus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nautilus/devel/nautilus.spec,v
retrieving revision 1.254
retrieving revision 1.255
diff -u -r1.254 -r1.255
--- nautilus.spec	20 Jan 2009 10:27:09 -0000	1.254
+++ nautilus.spec	21 Jan 2009 00:54:19 -0000	1.255
@@ -16,7 +16,7 @@
 Name:		nautilus
 Summary:        File manager for GNOME
 Version: 	2.25.3
-Release:	1%{?dist}
+Release:	2%{?dist}
 License: 	GPLv2+
 Group:          User Interface/Desktops
 Source: 	http://download.gnome.org/sources/%{name}/2.25/%{name}-%{version}.tar.bz2
@@ -148,7 +148,6 @@
 export tagname=CC
 LANG=en_US make %{?_smp_mflags}
 
-%if 0
 # strip unneeded translations from .mo files
 cd po
 grep -v ".*[.]desktop[.]in.*\|.*[.]server[.]in$\|.*[.]schemas[.]in$" POTFILES.in > POTFILES.keep
@@ -158,7 +157,6 @@
   msgmerge $p nautilus.pot > $p.out
   msgfmt -o `basename $p .po`.gmo $p.out
 done
-%endif
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -265,6 +263,9 @@
 
 
 %changelog
+* Tue Jan 20 2009 Matthias Clasen <mclasen at redhat.com>- 2.25.3-2
+- Reenable the translation size reduction
+
 * Tue Jan 20 2009 Tomas Bzatek <tbzatek at redhat.com> - 2.25.3-1
 - Update to 2.25.3
 



From behdad at fedoraproject.org  Wed Jan 21 01:17:53 2009
From: behdad at fedoraproject.org (Behdad Esfahbod)
Date: Wed, 21 Jan 2009 01:17:53 +0000 (UTC)
Subject: rpms/fontconfig/devel .cvsignore, 1.33, 1.34 fontconfig.spec, 1.115,
	1.116 sources, 1.34, 1.35
Message-ID: <20090121011753.96C477012F@cvs1.fedora.phx.redhat.com>

Author: behdad

Update of /cvs/pkgs/rpms/fontconfig/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5572

Modified Files:
	.cvsignore fontconfig.spec sources 
Log Message:
* Mon Jan 20 2009 Behdad Esfahbod <besfahbo at redhat.com> -
* 2.6.93-1.git.64.g6aa4dce
- Update to 2.6.93-1.git.64.g6aa4dce




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fontconfig/devel/.cvsignore,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- .cvsignore	19 Jan 2009 23:55:36 -0000	1.33
+++ .cvsignore	21 Jan 2009 01:17:23 -0000	1.34
@@ -1 +1 @@
-fontconfig-2.6.92.tar.gz
+fontconfig-2.6.93.tar.gz


Index: fontconfig.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fontconfig/devel/fontconfig.spec,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -r1.115 -r1.116
--- fontconfig.spec	19 Jan 2009 23:55:36 -0000	1.115
+++ fontconfig.spec	21 Jan 2009 01:17:23 -0000	1.116
@@ -2,8 +2,8 @@
 
 Summary: Font configuration and customization library
 Name: fontconfig
-Version: 2.6.92
-Release: 1.git.64.g167bb82%{?dist}
+Version: 2.6.93
+Release: 1.git.64.g6aa4dce%{?dist}
 License: MIT
 Group: System Environment/Libraries
 Source: http://fontconfig.org/release/fontconfig-%{version}.tar.gz
@@ -131,8 +131,11 @@
 %{_mandir}/man3/*
 
 %changelog
+* Mon Jan 20 2009 Behdad Esfahbod <besfahbo at redhat.com> - 2.6.93-1.git.64.g6aa4dce
+- Update to 2.6.93-1.git.64.g6aa4dce
+
 * Mon Jan 19 2009 Behdad Esfahbod <besfahbo at redhat.com> - 2.6.92-1.git.64.g167bb82
-- Update to 2.6.91-1.git.64.g167bb82
+- Update to 2.6.92-1.git.64.g167bb82
 
 * Mon Jan 19 2009 Behdad Esfahbod <besfahbo at redhat.com> - 2.6.91-1.git.64.g9feaf34
 - Update to 2.6.91-1.git.64.g9feaf34


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fontconfig/devel/sources,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- sources	19 Jan 2009 23:55:36 -0000	1.34
+++ sources	21 Jan 2009 01:17:23 -0000	1.35
@@ -1 +1 @@
-3aef92ac30c2ed24ea89a5007ecbf588  fontconfig-2.6.92.tar.gz
+f5050687560a61a87781c34fdf6a65d9  fontconfig-2.6.93.tar.gz



From cwickert at fedoraproject.org  Wed Jan 21 01:22:43 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Wed, 21 Jan 2009 01:22:43 +0000 (UTC)
Subject: comps comps-f11.xml.in,1.68,1.69
Message-ID: <20090121012243.7A81B7012F@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6323

Modified Files:
	comps-f11.xml.in 
Log Message:
Xfce 4.6 update


Index: comps-f11.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f11.xml.in,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- comps-f11.xml.in	21 Jan 2009 00:18:03 -0000	1.68
+++ comps-f11.xml.in	21 Jan 2009 01:22:13 -0000	1.69
@@ -5099,13 +5099,15 @@
     <uservisible>true</uservisible>
     <packagelist>
       <packagereq type="mandatory">desktop-backgrounds-compat</packagereq>
-      <packagereq type="mandatory">libxfce4mcs</packagereq>
+      <packagereq type="mandatory">libxfce4menu</packagereq>
       <packagereq type="mandatory">libxfce4util</packagereq>
       <packagereq type="mandatory">libxfcegui4</packagereq>
       <packagereq type="mandatory">Thunar</packagereq>
       <packagereq type="mandatory">xfce-utils</packagereq>
       <packagereq type="mandatory">xfce4-panel</packagereq>
       <packagereq type="mandatory">xfce4-session</packagereq>
+      <packagereq type="mandatory">xfce4-settings</packagereq>
+      <packagereq type="mandatory">xfconf</packagereq>
       <packagereq type="mandatory">xfdesktop</packagereq>
       <packagereq type="mandatory">xfwm4</packagereq>
       <packagereq type="conditional" requires="imsettings">imsettings-xfce</packagereq>
@@ -5114,8 +5116,6 @@
       <packagereq type="default">thunar-archive-plugin</packagereq>
       <packagereq type="default">thunar-volman</packagereq>
       <packagereq type="default">xarchiver</packagereq>
-      <packagereq type="default">xfce-mcs-manager</packagereq>
-      <packagereq type="default">xfce-mcs-plugins</packagereq>
       <packagereq type="default">xfce4-appfinder</packagereq>
       <packagereq type="default">xfce4-icon-theme</packagereq>
       <packagereq type="default">xfce4-mailwatch-plugin</packagereq>
@@ -5128,8 +5128,6 @@
       <packagereq type="optional">thunar-media-tags-plugin</packagereq>
       <packagereq type="optional">thunar-shares</packagereq>
       <packagereq type="optional">xfbib</packagereq>
-      <packagereq type="optional">xfce-mcs-plugin-gsynaptics</packagereq>
-      <packagereq type="optional">xfce-mcs-plugins-extra</packagereq>
       <packagereq type="optional">xfce4-battery-plugin</packagereq>
       <packagereq type="optional">xfce4-clipman-plugin</packagereq>
       <packagereq type="optional">xfce4-cpugraph-plugin</packagereq>
@@ -5161,7 +5159,6 @@
       <packagereq type="optional">xfce4-websearch-plugin</packagereq>
       <packagereq type="optional">xfce4-xfapplet-plugin</packagereq>
       <packagereq type="optional">xfce4-xkb-plugin</packagereq>
-      <packagereq type="optional">xfce4-xmms-plugin</packagereq>
       <packagereq type="optional">xfmpc</packagereq>
       <packagereq type="optional">xfprint</packagereq>
       <packagereq type="optional">xfwm4-themes</packagereq>
@@ -5177,12 +5174,13 @@
       <groupreq>x-software-development</groupreq>
     </grouplist>
     <packagelist>
-      <packagereq type="mandatory">libxfce4mcs-devel</packagereq>
+      <packagereq type="mandatory">libxfce4menu-devel</packagereq>
       <packagereq type="mandatory">libxfce4util-devel</packagereq>
       <packagereq type="mandatory">libxfcegui4-devel</packagereq>
-      <packagereq type="mandatory">xfce-mcs-manager-devel</packagereq>
       <packagereq type="mandatory">xfce4-panel-devel</packagereq>
       <packagereq type="mandatory">xfce4-session-devel</packagereq>
+      <packagereq type="mandatory">xfconf-devel</packagereq>
+      <packagereq type="default">exo-devel</packagereq>
       <packagereq type="default">Thunar-devel</packagereq>
       <packagereq type="optional">xfce4-dev-tools</packagereq>
     </packagelist>



From cwickert at fedoraproject.org  Wed Jan 21 01:25:47 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Wed, 21 Jan 2009 01:25:47 +0000 (UTC)
Subject: comps comps-f10.xml.in,1.207,1.208 comps-f9.xml.in,1.432,1.433
Message-ID: <20090121012547.AD3897012F@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6720

Modified Files:
	comps-f10.xml.in comps-f9.xml.in 
Log Message:
add exo-devel


Index: comps-f10.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f10.xml.in,v
retrieving revision 1.207
retrieving revision 1.208
diff -u -r1.207 -r1.208
--- comps-f10.xml.in	20 Jan 2009 17:59:57 -0000	1.207
+++ comps-f10.xml.in	21 Jan 2009 01:25:17 -0000	1.208
@@ -5046,6 +5046,7 @@
       <packagereq type="mandatory">xfce-mcs-manager-devel</packagereq>
       <packagereq type="mandatory">xfce4-panel-devel</packagereq>
       <packagereq type="mandatory">xfce4-session-devel</packagereq>
+      <packagereq type="default">exo-devel</packagereq>
       <packagereq type="default">Thunar-devel</packagereq>
       <packagereq type="optional">xfce4-dev-tools</packagereq>
     </packagelist>


Index: comps-f9.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f9.xml.in,v
retrieving revision 1.432
retrieving revision 1.433
diff -u -r1.432 -r1.433
--- comps-f9.xml.in	20 Jan 2009 17:59:57 -0000	1.432
+++ comps-f9.xml.in	21 Jan 2009 01:25:17 -0000	1.433
@@ -4564,6 +4564,7 @@
       <packagereq type="mandatory">xfce-mcs-manager-devel</packagereq>
       <packagereq type="mandatory">xfce4-panel-devel</packagereq>
       <packagereq type="mandatory">xfce4-session-devel</packagereq>
+      <packagereq type="default">exo-devel</packagereq>
       <packagereq type="default">Thunar-devel</packagereq>
       <packagereq type="optional">xfce4-dev-tools</packagereq>
     </packagelist>



From pwouters at fedoraproject.org  Wed Jan 21 01:34:17 2009
From: pwouters at fedoraproject.org (Paul Wouters)
Date: Wed, 21 Jan 2009 01:34:17 +0000 (UTC)
Subject: rpms/unbound/EL-5 unbound-1.2-glob.patch, NONE,
	1.1 unbound-libevent-r1441.patch, NONE, 1.1 unbound.munin, NONE,
	1.1 sources, 1.2, 1.3 unbound.conf, 1.2, 1.3 unbound.init, 1.1,
	1.2 unbound.spec, 1.1, 1.2
Message-ID: <20090121013417.7425A7012F@cvs1.fedora.phx.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/unbound/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8483

Modified Files:
	sources unbound.conf unbound.init unbound.spec 
Added Files:
	unbound-1.2-glob.patch unbound-libevent-r1441.patch 
	unbound.munin 
Log Message:
* Tue Jan 20 2009 Paul Wouters <paul at xelerance.com - 1.2.0-1
- Updated to 1.2.0
- Patch to allow missing files from includes using wildcards
- Added svn patch r1441 required for using libevent < 1.4
- Added dependancy on minimum SSL for CVE-2008-5077
- Added munin package and dependancies
- Enable options as per draft-wijngaards-dnsext-resolver-side-mitigation-00.txt
- Enable unwanted-reply-threshold to mitigate against a Kaminsky attack
- Enable val-clean-additional to drop addition unsigned data from signed
  response.


unbound-1.2-glob.patch:

--- NEW FILE unbound-1.2-glob.patch ---
diff -Naur unbound-1.2.0/validator/val_anchor.c unbound-1.2.0.new/validator/val_anchor.c
--- unbound-1.2.0/validator/val_anchor.c	2009-01-07 07:24:34.000000000 -0500
+++ unbound-1.2.0.new/validator/val_anchor.c	2009-01-20 17:31:43.000000000 -0500
@@ -718,7 +718,8 @@
 			log_err("wildcard trusted-keys-file %s: expansion "
 				"failed (%s)", pat, strerror(errno));
 		}
-		return 0;
+		/* ignore globs that yield no files */
+		return 1;
 	}
 	/* process files found, if any */
 	for(i=0; i<(size_t)g.gl_pathc; i++) {

unbound-libevent-r1441.patch:

--- NEW FILE unbound-libevent-r1441.patch ---
Index: util/netevent.c
===================================================================
--- util/netevent.c	(revision 1440)
+++ util/netevent.c	(revision 1441)
@@ -169,12 +169,14 @@
 		return NULL;
 	}
 	comm_base_now(b);
+	/* avoid event_get_method call which causes crashes even when
+	 * not printing, because its result is passed */
 	verbose(VERB_ALGO, "libevent %s uses %s method.", 
 		event_get_version(), 
 #ifdef HAVE_EVENT_BASE_GET_METHOD
 		event_base_get_method(b->eb->base)
 #else
-		event_get_method()
+		"not_obtainable"
 #endif
 	);
 	return b;


--- NEW FILE unbound.munin ---
#
# For this plugin to work, unbound.conf needs to have:
# remote-control:	control-enable: yes
# 
[unbound*]
user root
env.statefile /var/lib/munin/plugin-state/unbound-state
env.unbound_conf /etc/unbound/unbound.conf
env.unbound_control /usr/sbin/unbound-control
env.spoof_warn 1000
env.spoof_crit 100000


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/unbound/EL-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	1 Nov 2008 17:02:06 -0000	1.2
+++ sources	21 Jan 2009 01:33:46 -0000	1.3
@@ -1 +1 @@
-01b08a9c0d24be981de64b6e4e25ecbe  unbound-1.0.2.tar.gz
+2517f811ec4939c0ea602c99a6fdea23  unbound-1.2.0.tar.gz


Index: unbound.conf
===================================================================
RCS file: /cvs/extras/rpms/unbound/EL-5/unbound.conf,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- unbound.conf	15 Nov 2008 05:46:06 -0000	1.2
+++ unbound.conf	21 Jan 2009 01:33:47 -0000	1.3
@@ -1,5 +1,4 @@
 #
-#
 # See unbound.conf(5) man page.
 #
 # this is a comment.
@@ -7,26 +6,35 @@
 #Use this to include other text into the file.
 #include: "otherfile.conf"
 
-#
 # The server clause sets the main parameters. 
 server:
 	# whitespace is not necessary, but looks cleaner.
 
 	# To enable DNSSEC trust anchors, install the dnssec-keys package and
-	# uncomment the line below - note chroot breaks this
-	# trusted-keys-file: "/etc/pki/dnssec/allkeys.conf"
+	# uncomment the line below, or run dnssec-configure -h for more options
+	# trusted-keys-file: "/etc/pki/dnssec/production.conf"
+
+	# To enable DLV trust anchor with DLV, install the dnssec-keys package
+	# and uncomment the line below, or run dnssec-configure -h for more
+	# options
+	# dlv-anchor-file: "/etc/pki/dnssec-keys/dlv/dlv.isc.org.key"
 
 	# verbosity number, 0 is least verbose. 1 is default.
 	verbosity: 1
 
 	# print statistics to the log (for every thread) every N seconds.
 	# Set to "" or 0 to disable. Default is disabled.
+	# Needed for munin plugin
 	statistics-interval: 0
 	
 	# enable cumulative statistics, without clearing them after printing.
+	# Needed for munin plugin
 	statistics-cumulative: no
 
-	 extended-statistics: yes
+	# enable extended statistics (query types, answer codes, status)
+	# printed from unbound-control. default off, because of speed.
+	# Needed for munin plugin
+	extended-statistics: yes
 
 	# number of threads to create. 1 disables threading.
 	num-threads: 2
@@ -36,17 +44,18 @@
 	# specify 0.0.0.0 and ::0 to bind to all available interfaces.
 	# specify every interface on a new 'interface:' labelled line.
 	# The listen interfaces are not changed on reload, only on restart.
+	# interface: 0.0.0.0
+	# interface: ::0
 	# interface: 192.0.2.153
 	# interface: 192.0.2.154
 	# interface: 2001:DB8::5
-	#
-	# interface: 0.0.0.0
-	# interface: ::0
 	
 	# enable this feature to copy the source address of queries to reply.
-	# Socket options not be supported on all platforms. experimental. 
+	# Socket options are not supported on all platforms. experimental. 
 	# NOTE: Enable this option when specifying interface 0.0.0.0 or ::0 
+	# NOTE: Disabled per Fedora policy not to listen to * on default install
 	# interface-automatic: yes
+	interface-automatic: no
 
 	# port to answer queries from
 	# port: 53
@@ -95,6 +104,9 @@
 	# the number of queries that a thread gets to service.
 	# num-queries-per-thread: 1024
 
+	# if very busy, 50% queries run to completion, 50% get timeout in msec
+	# jostle-timeout: 200
+
 	# the amount of memory to use for the RRset cache.
 	# plain value in bytes or you can append k, m or G. default is "4Mb". 
 	# rrset-cache-size: 4m
@@ -144,13 +156,14 @@
 	# control which clients are allowed to make (recursive) queries
 	# to this server. Specify classless netblocks with /size and action.
 	# By default everything is refused, except for localhost.
-	# Choose deny (drop message), refuse (polite error reply), allow.
+	# Choose deny (drop message), refuse (polite error reply),
+	# allow (recursive ok), allow_snoop (recursive and nonrecursive ok)
 	# access-control: 0.0.0.0/0 refuse
 	# access-control: 127.0.0.0/8 allow
 	# access-control: ::0/0 refuse
 	# access-control: ::1 allow
 	# access-control: ::ffff:127.0.0.1 allow
-	
+
 	# if given, a chroot(2) is done to the given directory.
 	# i.e. you can chroot to the working directory, for example,
 	# for extra security, but make sure all files are in that directory.
@@ -160,19 +173,22 @@
 	# chroot has been performed the now defunct portion of the config 
 	# file path is removed to be able to reread the config after a reload. 
 	#
-	# All other file paths (working dir, pidfile, logfile, roothints,
+	# All other file paths (working dir, logfile, roothints, and
 	# key files) can be specified in several ways:
 	# 	o as an absolute path relative to the new root.
 	# 	o as a relative path to the working directory.
 	# 	o as an absolute path relative to the original root.
 	# In the last case the path is adjusted to remove the unused portion.
 	#
-	# Additionally, unbound may need to access /dev/random (for entropy)
-	# and to /dev/log (if you use syslog) from inside the chroot.
+	# The pid file can be absolute and outside of the chroot, it is 
+	# written just prior to performing the chroot and dropping permissions.
+	#
+	# Additionally, unbound may need to access /dev/random (for entropy).
 	# How to do this is specific to your OS.
 	#
 	# If you give "" no chroot is performed. The path must not end in a /.
-	chroot: "/var/lib/unbound"
+	# chroot: "/var/lib/unbound"
+	chroot: ""
 
 	# if given, user privileges are dropped (after binding port),
 	# and the given username is assumed. Default is user "unbound".
@@ -182,7 +198,7 @@
 	# the working directory. The relative files in this config are 
 	# relative to this directory. If you give "" the working directory
 	# is not changed.
-	# directory: "/var/lib/unbound"
+	directory: "/etc/unbound"
 
 	# the log file, "" means log to stderr. 
 	# Use of this option sets use-syslog to "no".
@@ -192,7 +208,7 @@
 	# log to, with identity "unbound". If yes, it overrides the logfile.
 	# use-syslog: yes 
 
-	# the pid file.
+	# the pid file. Can be an absolute path outside of chroot/work dir.
 	pidfile: "/var/run/unbound/unbound.pid"
 	
 	# file to read root hints from.
@@ -235,15 +251,40 @@
 	# trigger insecure mode for that zone (like without a trustanchor).
 	# Default on, which insists on dnssec data for trust-anchored zones.
 	harden-dnssec-stripped: yes
-	
+
+        # Harden the referral path by performing additional queries for
+	# infrastructure data.  Validates the replies (if possible).
+	# Default off, because the lookups burden the server.  Experimental 
+	# implementation of draft-wijngaards-dnsext-resolver-side-mitigation.
+	harden-referral-path: yes
+
 	# Use 0x20-encoded random bits in the query to foil spoof attempts.
-	# Disabled by default, because some caching forwarders may not
-	# support this (if you have forward-zones). Most authority servers do.
 	# This feature is an experimental implementation of draft dns-0x20.
-	# It is known that some authority servers do not support 0x20, and
-	# resolution will fail for them. A solution is on the TODO list.
-	use-caps-for-id: no
+	use-caps-for-id: yes
 	
+	# Enforce privacy of these addresses. Strips them away from answers. 
+	# It may cause DNSSEC validation to additionally mark it as bogus. 
+	# Protects against 'DNS Rebinding' (uses browser as network proxy). 
+	# Only 'private-domain' and 'local-data' names are allowed to have 
+	# these private addresses. No default.
+	# private-address: 10.0.0.0/8
+	# private-address: 172.16.0.0/12
+	# private-address: 192.168.0.0/16
+	# private-address: 192.254.0.0/16
+	# private-address: fd00::/8
+	# private-address: fe80::/10
+
+	# Allow the domain (and its subdomains) to contain private addresses.
+	# local-data statements are allowed to contain private addresses too.
+	# private-domain: "example.com"
+	
+	# If nonzero, unwanted replies are not only reported in statistics,
+	# but also a running total is kept per thread. If it reaches the
+	# threshold, a warning is printed and a defensive action is taken,
+	# the cache is cleared to flush potential poison out of it.
+	# A suggested value is 10000000, the default is 0 (turned off).
+	unwanted-reply-threshold: 10000000
+
 	# Do not query the following addresses. No DNS queries are sent there.
 	# List one address per entry. List classless netblocks with /size,
 	# do-not-query-address: 127.0.0.1/8
@@ -257,11 +298,16 @@
 	# separated by spaces. "iterator" or "validator iterator"
 	# module-config: "validator iterator"
 	
+	# File with DLV trusted keys. Same format as trust-anchor-file.
+	# There can be only one DLV configured, it is trusted from root down.
+	# Download https://secure.isc.org/ops/dlv/dlv.isc.org.key
+	# dlv-anchor-file: "/etc/pki/dnssec-keys/dlv.isc.org.key"
+
 	# File with trusted keys for validation. Specify more than one file
 	# with several entries, one file per entry.
 	# Zone file format, with DS and DNSKEY entries.
 	# trust-anchor-file: ""
-	
+
 	# Trusted key for validation. DS or DNSKEY. specify the RR on a
 	# single line, surrounded by "". TTL is ignored. class is IN default.
 	# (These examples are from August 2007 and may not be valid anymore).
@@ -273,7 +319,7 @@
 	# but has a different file format. Format is BIND-9 style format, 
 	# the trusted-keys { name flag proto algo "key"; }; clauses are read.
 	# trusted-keys-file: ""
-
+	
 	# Override the date for validation with a specific fixed date.
 	# Do not set this unless you are debugging signature inception
 	# and expiration. "" or "0" turns the feature off. 
@@ -281,19 +327,20 @@
 	
 	# The time to live for bogus data, rrsets and messages. This avoids
 	# some of the revalidation, until the time interval expires. in secs.
-	# val-bogus-ttl: 900
+	# val-bogus-ttl: 60
 	
 	# Should additional section of secure message also be kept clean of
 	# unsecure data. Useful to shield the users of this validator from
 	# potential bogus data in the additional section. All unsigned data 
 	# in the additional section is removed from secure messages.
-	# val-clean-additional: yes
+	val-clean-additional: yes
 	
 	# Turn permissive mode on to permit bogus messages. Thus, messages
 	# for which security checks failed will be returned to clients,
 	# instead of SERVFAIL. It still performs the security checks, which
 	# result in interesting log files and possibly the AD bit in
 	# replies if the message is found secure. The default is off.
+	# NOTE: TURNING THIS ON DISABLES ALL DNSSEC SECURITY
 	val-permissive-mode: no
 	
 	# It is possible to configure NSEC3 maximum iteration counts per
@@ -310,6 +357,10 @@
 	# the number of slabs must be a power of 2.
 	# more slabs reduce lock contention, but fragment memory usage.
 	# key-cache-slabs: 4
+	
+	# the amount of memory to use for the negative cache (used for DLV).
+	# plain value in bytes or you can append k, m or G. default is "1Mb". 
+	# neg-cache-size: 1m
 
 	# a number of locally served zones can be configured.
 	# 	local-zone: <zone> <type>
@@ -340,15 +391,48 @@
 	# (this makes example.com, www.example.com, etc, all go to 192.0.2.3)
 	# local-zone: "example.com" redirect
 	# local-data: "example.com A 192.0.2.3"
+	#
+	# Shorthand to make PTR records, "IPv4 name" or "IPv6 name".
+	# You can also add PTR records using local-data directly, but then
+	# you need to do the reverse notation yourself.
+	# local-data-ptr: "192.0.2.3 www.example.com"
+
+# Remote control config section. 
+remote-control:
+	# Enable remote control with unbound-control(8) here.
+	# set up the keys and certificates with unbound-control-setup.
+	# Note: required for unbound-munin package
+	control-enable: yes
+
+	# what interfaces are listened to for remote control.
+	# give 0.0.0.0 and ::0 to listen to all interfaces.
+	# control-interface: 127.0.0.1
+	# control-interface: ::1
+
+	# port number for remote control operations.
+	# control-port: 953
+
+	# unbound server key file.
+	server-key-file: "/etc/unbound/unbound_server.key"
+
+	# unbound server certificate file.
+	server-cert-file: "/etc/unbound/unbound_server.pem"
+
+	# unbound-control key file.
+	control-key-file: "/etc/unbound/unbound_control.key"
 
+	# unbound-control certificate file.
+	control-cert-file: "/etc/unbound/unbound_control.pem"
 
 # Stub zones.
 # Create entries like below, to make all queries for 'example.com' and 
 # 'example.org' go to the given list of nameservers. list zero or more 
-# nameservers by hostname or by ipaddress.
+# nameservers by hostname or by ipaddress. If you set stub-prime to yes, 
+# the list is treated as priming hints (default is no).
 # stub-zone:
 #	name: "example.com"
 #	stub-addr: 192.0.2.68
+#	stub-prime: "no"
 # stub-zone:
 #	name: "example.org"
 #	stub-host: ns.example.com.


Index: unbound.init
===================================================================
RCS file: /cvs/extras/rpms/unbound/EL-5/unbound.init,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- unbound.init	1 Nov 2008 17:02:06 -0000	1.1
+++ unbound.init	21 Jan 2009 01:33:47 -0000	1.2
@@ -22,7 +22,7 @@
 . /etc/rc.d/init.d/functions
 
 exec="/usr/sbin/unbound"
-config="/var/lib/unbound/unbound.conf"
+config="/etc/unbound/unbound.conf"
 rootdir="/var/lib/unbound"
 pidfile="/var/run/unbound/unbound.pid"
 
@@ -33,17 +33,17 @@
 start() {
     [ -x $exec ] || exit 5
     [ -f $config ] || exit 6
-    echo -n $"Starting unbound: "
 
-	if [ ! -e ${rootdir}/etc/resolv.conf ] || /usr/bin/cmp -s /etc/resolv.conf ${rootdir}/etc/resolv.conf; then
-	    cp -fp /etc/resolv.conf ${rootdir}/etc/resolv.conf
-	fi;
-	if [ ! -e ${rootdir}/etc/localtime ] || /usr/bin/cmp -s /etc/localtime ${rootdir}/etc/localtime; then
-	    cp -fp /etc/localtime ${rootdir}/etc/localtime
-	fi;
-	mount --bind -n /dev/log ${rootdir}/dev/log >/dev/null 2>&1;
-	mount --bind -n /dev/random ${rootdir}/dev/random >/dev/null 2>&1;
-	mount --bind -n /var/run/unbound ${rootdir}/var/run/unbound >/dev/null 2>&1;
+    if [ ! -f /etc/unbound/unbound_control.key ]
+    then
+	echo -n $"Generating unbound control key and certificate: "
+	/usr/sbin/unbound-control-setup -d /etc/unbound/ > /dev/null 2> /dev/null
+	[ -x /usr/sbin/selinuxenabled ] && /usr/sbin/selinuxenabled && \
+	    [ -x /sbin/restorecon ] && /sbin/restorecon /etc/unbound/*
+	echo
+    fi
+
+    echo -n $"Starting unbound: "
 
     # if not running, start it up here
     daemon $exec
@@ -58,12 +58,6 @@
     killproc -p $pidfile unbound
     retval=$?
     [ $retval -eq 0 ] && rm -f $lockfile
-    for mountfile in /dev/log /dev/random /etc/localtime /etc/resolv.conf /var/run/unbound
-    do
-    if egrep -q '^/[^[:space:]]+[[:space:]]+'${rootdir}''${mountfile}'' /proc/mounts; then
-	umount ${rootdir}$mountfile >/dev/null 2>&1
-    fi;
-    done
     echo
 }
 


Index: unbound.spec
===================================================================
RCS file: /cvs/extras/rpms/unbound/EL-5/unbound.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- unbound.spec	1 Nov 2008 17:02:06 -0000	1.1
+++ unbound.spec	21 Jan 2009 01:33:47 -0000	1.2
@@ -1,20 +1,22 @@
 Summary: Validating, recursive, and caching DNS(SEC) resolver
 Name: unbound
-Version: 1.0.2
-Release: 5%{?dist}
+Version: 1.2.0
+Release: 1%{?dist}
 License: BSD
 Url: http://www.nlnetlabs.nl/unbound/
 Source: http://www.unbound.net/downloads/%{name}-%{version}.tar.gz
 Source1: unbound.init
 Source2: unbound.conf
+Patch0: unbound-libevent-r1441.patch
+Patch1: unbound-1.2-glob.patch
 Group: System Environment/Daemons
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: flex, openssl-devel, ldns-devel >= 1.3.0, libevent-devel
+BuildRequires: flex, openssl-devel, ldns-devel >= 1.4.0, libevent-devel
 Requires(post): chkconfig
 Requires(preun): chkconfig
 Requires(preun): initscripts
 Requires(postun): initscripts
-Requires: ldns >= 1.3.0
+Requires: ldns >= 1.4.0
 Requires(pre): shadow-utils
 # Is this obsolete?
 #Provides: caching-nameserver
@@ -30,6 +32,15 @@
 DNSSEC (secure DNS) validation and stub-resolvers (that do not run
 as a server, but are linked into an application) are easily possible.
 
+%package munin
+Summary: Plugin for the munin / munin-node monitoring package
+Group:     System Environment/Daemons
+Requires: munin-node
+Requires: %{name} = %{version}-%{release}, bc
+
+%description munin
+Plugin for the munin / munin-node monitoring package
+
 %package devel
 Summary: Development package that includes the unbound header files
 Group: Development/Libraries
@@ -50,42 +61,34 @@
 
 %prep
 %setup -q 
+%patch0 -p0
+%patch1 -p1
 
 %build
 %configure  --with-ldns= --with-libevent --with-pthreads --with-ssl \
             --disable-rpath --enable-debug --disable-static \
-            --with-run-dir=%{_localstatedir}/lib/%{name}\
-            --with-conf-file=%{_localstatedir}/lib/%{name}/unbound.conf \
+            --with-conf-file=%{_sysconfdir}/%{name}/unbound.conf \
             --with-pidfile=%{_localstatedir}/run/%{name}/%{name}.pid
 %{__make} CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE" QUIET=no %{?_smp_mflags}
 
 %install
 rm -rf %{buildroot}
 %{__make} DESTDIR=%{buildroot} install
-install -d 0755 %{buildroot}%{_localstatedir}/lib/%{name}
 install -d 0755 %{buildroot}%{_initrddir}
-#install -m 0755 contrib/unbound.init %{buildroot}%{_initrddir}/unbound
 install -m 0755 %{SOURCE1} %{buildroot}%{_initrddir}/unbound
-#overwrite stock unbound.conf with our own
-install -m 0755 %{SOURCE2} %{buildroot}%{_localstatedir}/lib/%{name}
+install -m 0755 %{SOURCE2} %{buildroot}%{_sysconfdir}/unbound
+# Install munin plugin and its softlinks
+install -d 0755 %{buildroot}%{_sysconfdir}/munin/plugin-conf.d
+install -m 0644 %{SOURCE3} %{buildroot}%{_sysconfdir}/munin/plugin-conf.d/unbound
+install -d 0755 %{buildroot}%{_datadir}/munin/plugins/
+install -m 0755 contrib/unbound_munin_ %{buildroot}%{_datadir}/munin/plugins/unbound
+for plugin in unbound_munin_hits unbound_munin_queue unbound_munin_memory unbound_munin_by_type unbound_munin_by_class unbound_munin_by_opcode unbound_munin_by_rcode unbound_munin_by_flags unbound_munin_histogram; do
+    ln -s unbound %{buildroot}%{_datadir}/munin/plugins/$plugin
+done
 
-# add symbolic link from /etc/unbound.conf -> /var/unbound/unbound.conf
-
-( cd %{buildroot}%{_sysconfdir}/ ; ln -s ..%{_localstatedir}/lib/unbound/unbound.conf )
 # remove static library from install (fedora packaging guidelines)
 rm -rf %{buildroot}%{_libdir}/*.la
 
-# The chroot needs /dev/log, /dev/random, /etc/resolv.conf and /etc/localtime
-# but the init script uses mount --bind, so just create empty files
-mkdir -p %{buildroot}%{_localstatedir}/lib/unbound/etc \
-         %{buildroot}%{_localstatedir}/lib/unbound/dev 
-echo "Used for mount --bind in initscript" >  %{buildroot}%{_localstatedir}/lib/unbound/etc/resolv.conf 
-echo "Used for mount --bind in initscript" > %{buildroot}%{_localstatedir}/lib/unbound/etc/localtime
-echo "Used for mount --bind in initscript" > %{buildroot}%{_localstatedir}/lib/unbound/dev/log 
-echo "Used for mount --bind in initscript" > %{buildroot}%{_localstatedir}/lib/unbound/dev/random
-mkdir -p %{buildroot}%{_localstatedir}/lib/unbound/var/run/unbound
-mkdir -p %{buildroot}%{_localstatedir}/run/unbound
-
 %clean
 rm -rf ${RPM_BUILD_ROOT}
 
@@ -93,21 +96,17 @@
 %defattr(-,root,root,-)
 %doc doc/README doc/CREDITS doc/LICENSE doc/FEATURES
 %attr(0755,root,root) %{_initrddir}/%{name}
-# the chroot env
-%attr(0755,root,root) %dir %{_localstatedir}/lib/%{name}
+%attr(0755,root,root) %dir %{_sysconfdir}/%{name}
 %attr(0755,unbound,unbound) %dir %{_localstatedir}/run/%{name}
-%attr(0755,root,root) %dir %{_localstatedir}/lib/%{name}/dev
-%attr(0755,root,root) %dir %{_localstatedir}/lib/%{name}/etc
-%attr(0755,root,root) %dir %{_localstatedir}/lib/%{name}/var
-%attr(0755,root,root) %dir %{_localstatedir}/lib/%{name}/var/run
-%attr(0755,root,root) %dir %{_localstatedir}/lib/%{name}/var/run/unbound
-%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/unbound.conf
-%attr(0644,root,root) %config(noreplace) %{_localstatedir}/lib/%{name}/unbound.conf
-%attr(0644,root,root) %{_localstatedir}/lib/%{name}/dev/*
-%attr(0644,root,root) %{_localstatedir}/lib/%{name}/etc/*
+%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/%{name}/unbound.conf
 %{_sbindir}/*
 %{_mandir}/*/*
 
+%files munin
+%defattr(-,root,root,-)
+%config(noreplace) %{_sysconfdir}/munin/plugin-conf.d/unbound
+%{_datadir}/munin/plugins/unbound*
+
 %files devel
 %defattr(-,root,root,-)
 %{_libdir}/libunbound.so
@@ -133,7 +132,7 @@
 
 
 %preun
-if [ $1 -eq 0 ]; then
+if [ "$1" -eq 0 ]; then
         /sbin/service %{name} stop >/dev/null 2>&1
         /sbin/chkconfig --del %{name} 
 fi
@@ -146,6 +145,17 @@
 %postun libs -p /sbin/ldconfig
 
 %changelog
+* Tue Jan 20 2009 Paul Wouters <paul at xelerance.com - 1.2.0-1
+- Updated to 1.2.0
+- Patch to allow missing files from includes using wildcards
+- Added svn patch r1441 required for using libevent < 1.4
+- Added dependancy on minimum SSL for CVE-2008-5077
+- Added munin package and dependancies
+- Enable options as per draft-wijngaards-dnsext-resolver-side-mitigation-00.txt
+- Enable unwanted-reply-threshold to mitigate against a Kaminsky attack
+- Enable val-clean-additional to drop addition unsigned data from signed
+  response.
+
 * Wed Oct 22 2008 Paul Wouters <paul at xelerance.com> - 1.0.2-5
 - Only call ldconfig in -libs package
 - Move configure into build section



From jamatos at fedoraproject.org  Wed Jan 21 01:37:34 2009
From: jamatos at fedoraproject.org (=?utf-8?q?Jos=C3=A9_Ab=C3=ADlio_Oliveira_Matos?=)
Date: Wed, 21 Jan 2009 01:37:34 +0000 (UTC)
Subject: rpms/pygsl/devel pygsl.spec,1.18,1.19
Message-ID: <20090121013734.0F8EC7012F@cvs1.fedora.phx.redhat.com>

Author: jamatos

Update of /cvs/pkgs/rpms/pygsl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8992

Modified Files:
	pygsl.spec 
Log Message:
* Wed Jan 21 2009 Jos?? Matos <jamatos at fc.up.pt> - 0.9.3-3
- Rebuild for new gsl (F11+).



Index: pygsl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pygsl/devel/pygsl.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- pygsl.spec	29 Nov 2008 18:16:47 -0000	1.18
+++ pygsl.spec	21 Jan 2009 01:37:03 -0000	1.19
@@ -7,7 +7,7 @@
 Summary:       GNU Scientific Library Interface for python
 Name:          pygsl
 Version:       0.9.3
-Release:       2%{?dist}
+Release:       3%{?dist}
 # The package is mostly GPL+ but there are two scripts
 # GLPv2+: pygsl/odeiv.py and examples/siman_tsp.py
 License:       GPLv2+
@@ -66,6 +66,9 @@
 
 
 %changelog
+* Wed Jan 21 2009 Jos?? Matos <jamatos at fc.up.pt> - 0.9.3-3
+- Rebuild for new gsl (F11+).
+
 * Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 0.9.3-2
 - Rebuild for Python 2.6
 



From pkgdb at fedoraproject.org  Wed Jan 21 02:15:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 21 Jan 2009 02:15:23 +0000
Subject: [pkgdb] asciidoc: vonbrand has requested watchcommits
Message-ID: <20090121021523.681AF208474@bastion.fedora.phx.redhat.com>

vonbrand has requested the watchcommits acl on asciidoc (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/asciidoc



From pkgdb at fedoraproject.org  Wed Jan 21 02:15:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 21 Jan 2009 02:15:20 +0000
Subject: [pkgdb] asciidoc: vonbrand has requested watchbugzilla
Message-ID: <20090121021520.72632208472@bastion.fedora.phx.redhat.com>

vonbrand has requested the watchbugzilla acl on asciidoc (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/asciidoc



From pkgdb at fedoraproject.org  Wed Jan 21 02:16:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 21 Jan 2009 02:16:06 +0000
Subject: [pkgdb] asciidoc: vonbrand has requested watchbugzilla
Message-ID: <20090121021606.53712208472@bastion.fedora.phx.redhat.com>

vonbrand has requested the watchbugzilla acl on asciidoc (Fedora EPEL 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/asciidoc



From pkgdb at fedoraproject.org  Wed Jan 21 02:16:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 21 Jan 2009 02:16:07 +0000
Subject: [pkgdb] asciidoc: vonbrand has requested watchcommits
Message-ID: <20090121021607.A9AD5208476@bastion.fedora.phx.redhat.com>

vonbrand has requested the watchcommits acl on asciidoc (Fedora EPEL 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/asciidoc



From pkgdb at fedoraproject.org  Wed Jan 21 02:16:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 21 Jan 2009 02:16:14 +0000
Subject: [pkgdb] asciidoc: vonbrand has requested watchbugzilla
Message-ID: <20090121021614.6F8DB20847B@bastion.fedora.phx.redhat.com>

vonbrand has requested the watchbugzilla acl on asciidoc (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/asciidoc



From pkgdb at fedoraproject.org  Wed Jan 21 02:16:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 21 Jan 2009 02:16:14 +0000
Subject: [pkgdb] asciidoc: vonbrand has requested watchcommits
Message-ID: <20090121021614.E4AE3208480@bastion.fedora.phx.redhat.com>

vonbrand has requested the watchcommits acl on asciidoc (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/asciidoc



From pkgdb at fedoraproject.org  Wed Jan 21 02:16:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 21 Jan 2009 02:16:34 +0000
Subject: [pkgdb] asciidoc: vonbrand has requested watchbugzilla
Message-ID: <20090121021634.788A3208472@bastion.fedora.phx.redhat.com>

vonbrand has requested the watchbugzilla acl on asciidoc (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/asciidoc



From pkgdb at fedoraproject.org  Wed Jan 21 02:16:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 21 Jan 2009 02:16:36 +0000
Subject: [pkgdb] asciidoc: vonbrand has requested watchcommits
Message-ID: <20090121021636.4E01E208475@bastion.fedora.phx.redhat.com>

vonbrand has requested the watchcommits acl on asciidoc (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/asciidoc



From pkgdb at fedoraproject.org  Wed Jan 21 02:16:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 21 Jan 2009 02:16:45 +0000
Subject: [pkgdb] asciidoc: vonbrand has requested watchbugzilla
Message-ID: <20090121021645.926C7208477@bastion.fedora.phx.redhat.com>

vonbrand has requested the watchbugzilla acl on asciidoc (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/asciidoc



From pkgdb at fedoraproject.org  Wed Jan 21 02:16:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 21 Jan 2009 02:16:47 +0000
Subject: [pkgdb] asciidoc: vonbrand has requested watchcommits
Message-ID: <20090121021647.B486F208481@bastion.fedora.phx.redhat.com>

vonbrand has requested the watchcommits acl on asciidoc (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/asciidoc



From ivazquez at fedoraproject.org  Wed Jan 21 02:26:38 2009
From: ivazquez at fedoraproject.org (Ignacio Vazquez-Abrams)
Date: Wed, 21 Jan 2009 02:26:38 +0000 (UTC)
Subject: comps comps-f10.xml.in, 1.208, 1.209 comps-f11.xml.in, 1.69,
	1.70 comps-f9.xml.in, 1.433, 1.434
Message-ID: <20090121022638.E8ECB7012F@cvs1.fedora.phx.redhat.com>

Author: ivazquez

Update of /cvs/pkgs/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15482

Modified Files:
	comps-f10.xml.in comps-f11.xml.in comps-f9.xml.in 
Log Message:
+gtkparasite


Index: comps-f10.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f10.xml.in,v
retrieving revision 1.208
retrieving revision 1.209
diff -u -r1.208 -r1.209
--- comps-f10.xml.in	21 Jan 2009 01:25:17 -0000	1.208
+++ comps-f10.xml.in	21 Jan 2009 02:26:07 -0000	1.209
@@ -2087,6 +2087,7 @@
       <packagereq type="optional">gtk2hs</packagereq>
       <packagereq type="optional">gtkdatabox-devel</packagereq>
       <packagereq type="optional">gtkmm24-devel</packagereq>
+      <packagereq type="optional">gtkparasite</packagereq>
       <packagereq type="optional">libgconf-java</packagereq>
       <packagereq type="optional">libglade-java</packagereq>
       <packagereq type="optional">libglademm24-devel</packagereq>


Index: comps-f11.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f11.xml.in,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- comps-f11.xml.in	21 Jan 2009 01:22:13 -0000	1.69
+++ comps-f11.xml.in	21 Jan 2009 02:26:07 -0000	1.70
@@ -2186,6 +2186,7 @@
       <packagereq type="optional">gtk2hs</packagereq>
       <packagereq type="optional">gtkdatabox-devel</packagereq>
       <packagereq type="optional">gtkmm24-devel</packagereq>
+      <packagereq type="optional">gtkparasite</packagereq>
       <packagereq type="optional">libgconf-java</packagereq>
       <packagereq type="optional">libglade-java</packagereq>
       <packagereq type="optional">libglademm24-devel</packagereq>


Index: comps-f9.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f9.xml.in,v
retrieving revision 1.433
retrieving revision 1.434
diff -u -r1.433 -r1.434
--- comps-f9.xml.in	21 Jan 2009 01:25:17 -0000	1.433
+++ comps-f9.xml.in	21 Jan 2009 02:26:07 -0000	1.434
@@ -1981,6 +1981,7 @@
       <packagereq type="optional">gtk2hs</packagereq>
       <packagereq type="optional">gtkdatabox-devel</packagereq>
       <packagereq type="optional">gtkmm24-devel</packagereq>
+      <packagereq type="optional">gtkparasite</packagereq>
       <packagereq type="optional">libgconf-java</packagereq>
       <packagereq type="optional">libglade-java</packagereq>
       <packagereq type="optional">libglademm24-devel</packagereq>



From pkgdb at fedoraproject.org  Wed Jan 21 03:00:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 21 Jan 2009 03:00:56 +0000
Subject: [pkgdb] cjkuni-fonts was added for cchance
Message-ID: <20090121030056.B65BE208470@bastion.fedora.phx.redhat.com>

petersen has added Package cjkuni-fonts with summary Chinese TrueType fonts
petersen has approved Package cjkuni-fonts
petersen has added a Fedora devel branch for cjkuni-fonts with an owner of cchance
petersen has approved cjkuni-fonts in Fedora devel
petersen has approved Package cjkuni-fonts
petersen has set commit to Approved for provenpackager on cjkuni-fonts (Fedora devel)
petersen has set build to Approved for provenpackager on cjkuni-fonts (Fedora devel)
petersen has set checkout to Approved for provenpackager on cjkuni-fonts (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cjkuni-fonts



From pkgdb at fedoraproject.org  Wed Jan 21 03:00:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 21 Jan 2009 03:00:57 +0000
Subject: [pkgdb] cjkuni-fonts (Fedora, devel) updated by petersen
Message-ID: <20090121030058.3F2A7208474@bastion.fedora.phx.redhat.com>

petersen approved watchbugzilla on cjkuni-fonts (Fedora devel) for fonts-sig
petersen approved watchcommits on cjkuni-fonts (Fedora devel) for fonts-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cjkuni-fonts



From petersen at fedoraproject.org  Wed Jan 21 03:02:00 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Wed, 21 Jan 2009 03:02:00 +0000 (UTC)
Subject: rpms/cjkuni-fonts - New directory
Message-ID: <20090121030200.29F5E7012F@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/cjkuni-fonts
In directory cvs1.fedora.phx.redhat.com:/home/fedora/petersen/admin/tmpcvsr21071/rpms/cjkuni-fonts

Log Message:
Directory /cvs/pkgs/rpms/cjkuni-fonts added to the repository




From petersen at fedoraproject.org  Wed Jan 21 03:02:00 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Wed, 21 Jan 2009 03:02:00 +0000 (UTC)
Subject: rpms/cjkuni-fonts/devel - New directory
Message-ID: <20090121030200.5A5AB7012F@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/cjkuni-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/petersen/admin/tmpcvsr21071/rpms/cjkuni-fonts/devel

Log Message:
Directory /cvs/pkgs/rpms/cjkuni-fonts/devel added to the repository




From petersen at fedoraproject.org  Wed Jan 21 03:02:14 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Wed, 21 Jan 2009 03:02:14 +0000 (UTC)
Subject: rpms/cjkuni-fonts Makefile,NONE,1.1
Message-ID: <20090121030214.C256B7012F@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/cjkuni-fonts
In directory cvs1.fedora.phx.redhat.com:/home/fedora/petersen/admin/tmpcvsr21071/rpms/cjkuni-fonts

Added Files:
	Makefile 
Log Message:
Setup of module cjkuni-fonts


--- NEW FILE Makefile ---
# Top level Makefile for module cjkuni-fonts
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From petersen at fedoraproject.org  Wed Jan 21 03:02:15 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Wed, 21 Jan 2009 03:02:15 +0000 (UTC)
Subject: rpms/cjkuni-fonts/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090121030215.062877012F@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/cjkuni-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/petersen/admin/tmpcvsr21071/rpms/cjkuni-fonts/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module cjkuni-fonts


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: cjkuni-fonts
# $Id: Makefile,v 1.1 2009/01/21 03:02:14 petersen Exp $
NAME := cjkuni-fonts
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From ianweller at fedoraproject.org  Wed Jan 21 03:10:30 2009
From: ianweller at fedoraproject.org (Ian Weller)
Date: Wed, 21 Jan 2009 03:10:30 +0000 (UTC)
Subject: rpms/terminator/devel .cvsignore, 1.2, 1.3 import.log, 1.1,
	1.2 sources, 1.2, 1.3 terminator.spec, 1.1,
	1.2 terminator-0.11-desktop.patch, 1.1, NONE
Message-ID: <20090121031030.5644E7012F@cvs1.fedora.phx.redhat.com>

Author: ianweller

Update of /cvs/pkgs/rpms/terminator/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23195/devel

Modified Files:
	.cvsignore import.log sources terminator.spec 
Removed Files:
	terminator-0.11-desktop.patch 
Log Message:
importing terminator-0.12-1 in devel


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/terminator/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	18 Dec 2008 01:41:03 -0000	1.2
+++ .cvsignore	21 Jan 2009 03:09:59 -0000	1.3
@@ -1 +1 @@
-terminator_0.11.tar.gz
+terminator_0.12.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/terminator/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	18 Dec 2008 01:41:03 -0000	1.1
+++ import.log	21 Jan 2009 03:09:59 -0000	1.2
@@ -1 +1,2 @@
 terminator-0_11-3_fc9:HEAD:terminator-0.11-3.fc9.src.rpm:1229564425
+terminator-0_12-1_fc10:HEAD:terminator-0.12-1.fc10.src.rpm:1232507338


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/terminator/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	18 Dec 2008 01:41:03 -0000	1.2
+++ sources	21 Jan 2009 03:10:00 -0000	1.3
@@ -1 +1 @@
-cff08bbe8b600b99fa5256083bb7e167  terminator_0.11.tar.gz
+259b2b1f88de822644e4d57abf857cb7  terminator_0.12.tar.gz


Index: terminator.spec
===================================================================
RCS file: /cvs/pkgs/rpms/terminator/devel/terminator.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- terminator.spec	18 Dec 2008 01:41:04 -0000	1.1
+++ terminator.spec	21 Jan 2009 03:10:00 -0000	1.2
@@ -1,15 +1,14 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           terminator
-Version:        0.11
-Release:        3%{?dist}
+Version:        0.12
+Release:        1%{?dist}
 Summary:        Store and run multiple GNOME terminals in one window
 
 Group:          User Interface/Desktops
 License:        GPLv2
 URL:            http://www.tenshu.net/terminator
 Source0:        http://code.launchpad.net/terminator/trunk/%{version}/+download/terminator_%{version}.tar.gz
-Patch0:         terminator-0.11-desktop.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -26,7 +25,6 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .desktop
 sed -i '/#! \?\/usr.*/d' terminatorlib/*.py
 sed -i.versionbump -e "s/0.10/0.11/" terminatorlib/version.py
 
@@ -70,6 +68,10 @@
 
 
 %changelog
+* Tue Jan 20 2009 Ian Weller <ianweller at gmail.com> 0.12-1
+- New upstream release
+- Upstream fixed desktop file, removing patch0
+
 * Mon Dec 08 2008 Ian Weller <ianweller at gmail.com> 0.11-3
 - Patch version in terminatorlib/verison.py to the one we think it is
 - Fix License tag
@@ -91,12 +93,12 @@
 - Complete/restandardize file list
 - Get rid of she-bangs in python_sitelib
 
-* Sat Sep 13 2008 - Max Spevack <mspevack AT redhat DOT com> 0.10
+* Sat Sep 13 2008 Max Spevack <mspevack AT redhat DOT com> 0.10
 - New upstream release.
 - Tried to make sure the spec file matches guidelines on Fedora wiki.
 
-* Fri Jul 08 2008 - chantra AatT rpm-based DdOoTt org 0.9.fc9.rb
+* Fri Jul 08 2008 chantra AatT rpm-based DdOoTt org 0.9.fc9.rb
 - New upstream release
 
-* Sat May 17 2008 - chantra AatT rpm-based DdOoTt org 0.8.1.fc9.rb
+* Sat May 17 2008 chantra AatT rpm-based DdOoTt org 0.8.1.fc9.rb
 - Initial release for Fedora 9.


--- terminator-0.11-desktop.patch DELETED ---



From ianweller at fedoraproject.org  Wed Jan 21 03:11:37 2009
From: ianweller at fedoraproject.org (Ian Weller)
Date: Wed, 21 Jan 2009 03:11:37 +0000 (UTC)
Subject: rpms/terminator/F-10 .cvsignore, 1.2, 1.3 import.log, 1.1,
	1.2 sources, 
	1.2, 1.3 terminator.spec, 1.1, 1.2 terminator-0.11-desktop.patch,
	1.1, NONE
Message-ID: <20090121031137.8FB047012F@cvs1.fedora.phx.redhat.com>

Author: ianweller

Update of /cvs/pkgs/rpms/terminator/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23520/F-10

Modified Files:
	.cvsignore import.log sources terminator.spec 
Removed Files:
	terminator-0.11-desktop.patch 
Log Message:
importing terminator-0.12-1 in F-10


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/terminator/F-10/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	18 Dec 2008 01:42:23 -0000	1.2
+++ .cvsignore	21 Jan 2009 03:11:07 -0000	1.3
@@ -1 +1 @@
-terminator_0.11.tar.gz
+terminator_0.12.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/terminator/F-10/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	18 Dec 2008 01:42:23 -0000	1.1
+++ import.log	21 Jan 2009 03:11:07 -0000	1.2
@@ -1 +1,2 @@
 terminator-0_11-3_fc9:F-10:terminator-0.11-3.fc9.src.rpm:1229564523
+terminator-0_12-1_fc10:F-10:terminator-0.12-1.fc10.src.rpm:1232507449


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/terminator/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	18 Dec 2008 01:42:23 -0000	1.2
+++ sources	21 Jan 2009 03:11:07 -0000	1.3
@@ -1 +1 @@
-cff08bbe8b600b99fa5256083bb7e167  terminator_0.11.tar.gz
+259b2b1f88de822644e4d57abf857cb7  terminator_0.12.tar.gz


Index: terminator.spec
===================================================================
RCS file: /cvs/pkgs/rpms/terminator/F-10/terminator.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- terminator.spec	18 Dec 2008 01:42:23 -0000	1.1
+++ terminator.spec	21 Jan 2009 03:11:07 -0000	1.2
@@ -1,15 +1,14 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           terminator
-Version:        0.11
-Release:        3%{?dist}
+Version:        0.12
+Release:        1%{?dist}
 Summary:        Store and run multiple GNOME terminals in one window
 
 Group:          User Interface/Desktops
 License:        GPLv2
 URL:            http://www.tenshu.net/terminator
 Source0:        http://code.launchpad.net/terminator/trunk/%{version}/+download/terminator_%{version}.tar.gz
-Patch0:         terminator-0.11-desktop.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -26,7 +25,6 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .desktop
 sed -i '/#! \?\/usr.*/d' terminatorlib/*.py
 sed -i.versionbump -e "s/0.10/0.11/" terminatorlib/version.py
 
@@ -70,6 +68,10 @@
 
 
 %changelog
+* Tue Jan 20 2009 Ian Weller <ianweller at gmail.com> 0.12-1
+- New upstream release
+- Upstream fixed desktop file, removing patch0
+
 * Mon Dec 08 2008 Ian Weller <ianweller at gmail.com> 0.11-3
 - Patch version in terminatorlib/verison.py to the one we think it is
 - Fix License tag
@@ -91,12 +93,12 @@
 - Complete/restandardize file list
 - Get rid of she-bangs in python_sitelib
 
-* Sat Sep 13 2008 - Max Spevack <mspevack AT redhat DOT com> 0.10
+* Sat Sep 13 2008 Max Spevack <mspevack AT redhat DOT com> 0.10
 - New upstream release.
 - Tried to make sure the spec file matches guidelines on Fedora wiki.
 
-* Fri Jul 08 2008 - chantra AatT rpm-based DdOoTt org 0.9.fc9.rb
+* Fri Jul 08 2008 chantra AatT rpm-based DdOoTt org 0.9.fc9.rb
 - New upstream release
 
-* Sat May 17 2008 - chantra AatT rpm-based DdOoTt org 0.8.1.fc9.rb
+* Sat May 17 2008 chantra AatT rpm-based DdOoTt org 0.8.1.fc9.rb
 - Initial release for Fedora 9.


--- terminator-0.11-desktop.patch DELETED ---



From ianweller at fedoraproject.org  Wed Jan 21 03:13:12 2009
From: ianweller at fedoraproject.org (Ian Weller)
Date: Wed, 21 Jan 2009 03:13:12 +0000 (UTC)
Subject: rpms/terminator/F-9 .cvsignore, 1.2, 1.3 import.log, 1.1,
	1.2 sources, 
	1.2, 1.3 terminator.spec, 1.1, 1.2 terminator-0.11-desktop.patch,
	1.1, NONE
Message-ID: <20090121031312.E662D7012F@cvs1.fedora.phx.redhat.com>

Author: ianweller

Update of /cvs/pkgs/rpms/terminator/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23882/F-9

Modified Files:
	.cvsignore import.log sources terminator.spec 
Removed Files:
	terminator-0.11-desktop.patch 
Log Message:
importing terminator-0.12-1 in F-9


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/terminator/F-9/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	18 Dec 2008 01:43:49 -0000	1.2
+++ .cvsignore	21 Jan 2009 03:12:42 -0000	1.3
@@ -1 +1 @@
-terminator_0.11.tar.gz
+terminator_0.12.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/terminator/F-9/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	18 Dec 2008 01:43:49 -0000	1.1
+++ import.log	21 Jan 2009 03:12:42 -0000	1.2
@@ -1 +1,2 @@
 terminator-0_11-3_fc9:F-9:terminator-0.11-3.fc9.src.rpm:1229564606
+terminator-0_12-1_fc10:F-9:terminator-0.12-1.fc10.src.rpm:1232507515


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/terminator/F-9/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	18 Dec 2008 01:43:49 -0000	1.2
+++ sources	21 Jan 2009 03:12:42 -0000	1.3
@@ -1 +1 @@
-cff08bbe8b600b99fa5256083bb7e167  terminator_0.11.tar.gz
+259b2b1f88de822644e4d57abf857cb7  terminator_0.12.tar.gz


Index: terminator.spec
===================================================================
RCS file: /cvs/pkgs/rpms/terminator/F-9/terminator.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- terminator.spec	18 Dec 2008 01:43:49 -0000	1.1
+++ terminator.spec	21 Jan 2009 03:12:42 -0000	1.2
@@ -1,15 +1,14 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           terminator
-Version:        0.11
-Release:        3%{?dist}
+Version:        0.12
+Release:        1%{?dist}
 Summary:        Store and run multiple GNOME terminals in one window
 
 Group:          User Interface/Desktops
 License:        GPLv2
 URL:            http://www.tenshu.net/terminator
 Source0:        http://code.launchpad.net/terminator/trunk/%{version}/+download/terminator_%{version}.tar.gz
-Patch0:         terminator-0.11-desktop.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -26,7 +25,6 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .desktop
 sed -i '/#! \?\/usr.*/d' terminatorlib/*.py
 sed -i.versionbump -e "s/0.10/0.11/" terminatorlib/version.py
 
@@ -70,6 +68,10 @@
 
 
 %changelog
+* Tue Jan 20 2009 Ian Weller <ianweller at gmail.com> 0.12-1
+- New upstream release
+- Upstream fixed desktop file, removing patch0
+
 * Mon Dec 08 2008 Ian Weller <ianweller at gmail.com> 0.11-3
 - Patch version in terminatorlib/verison.py to the one we think it is
 - Fix License tag
@@ -91,12 +93,12 @@
 - Complete/restandardize file list
 - Get rid of she-bangs in python_sitelib
 
-* Sat Sep 13 2008 - Max Spevack <mspevack AT redhat DOT com> 0.10
+* Sat Sep 13 2008 Max Spevack <mspevack AT redhat DOT com> 0.10
 - New upstream release.
 - Tried to make sure the spec file matches guidelines on Fedora wiki.
 
-* Fri Jul 08 2008 - chantra AatT rpm-based DdOoTt org 0.9.fc9.rb
+* Fri Jul 08 2008 chantra AatT rpm-based DdOoTt org 0.9.fc9.rb
 - New upstream release
 
-* Sat May 17 2008 - chantra AatT rpm-based DdOoTt org 0.8.1.fc9.rb
+* Sat May 17 2008 chantra AatT rpm-based DdOoTt org 0.8.1.fc9.rb
 - Initial release for Fedora 9.


--- terminator-0.11-desktop.patch DELETED ---



From pwouters at fedoraproject.org  Wed Jan 21 03:32:26 2009
From: pwouters at fedoraproject.org (Paul Wouters)
Date: Wed, 21 Jan 2009 03:32:26 +0000 (UTC)
Subject: rpms/socat/devel .cvsignore, 1.3, 1.4 socat.spec, 1.11, 1.12 sources,
	1.3, 1.4
Message-ID: <20090121033226.20FAD7012F@cvs1.fedora.phx.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/socat/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26802

Modified Files:
	.cvsignore socat.spec sources 
Log Message:
* Tue Jan 20 2009 Paul Wouters <paul at xelerance.com 1.7.0.0-1
- Updated to new upstream version
- utf8 the CHANGES file



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/socat/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	4 Sep 2008 20:59:20 -0000	1.3
+++ .cvsignore	21 Jan 2009 03:31:55 -0000	1.4
@@ -1 +1,2 @@
 socat-1.6.0.1.tar.bz2
+socat-1.7.0.0.tar.bz2


Index: socat.spec
===================================================================
RCS file: /cvs/extras/rpms/socat/devel/socat.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- socat.spec	18 Jan 2009 12:21:42 -0000	1.11
+++ socat.spec	21 Jan 2009 03:31:55 -0000	1.12
@@ -1,7 +1,12 @@
 Summary: Bidirectional data relay between two data channels ('netcat++')
 Name: socat
+<<<<<<< socat.spec
+Version: 1.7.0.0
+Release: 1%{?dist}
+=======
 Version: 1.6.0.1
 Release: 3%{?dist}
+>>>>>>> 1.11
 License: GPLv2
 Url:  http://www.dest-unreach.org/%{name}
 Source: http://www.dest-unreach.org/socat/download/%{name}-%{version}.tar.bz2
@@ -19,10 +24,12 @@
 
 %prep
 %setup -q 
+iconv -f iso8859-1 -t utf-8 CHANGES > CHANGES.utf8
+mv CHANGES.utf8 CHANGES
 
 %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 \
@@ -56,6 +63,10 @@
 %doc %{_mandir}/man1/socat.1*
 
 %changelog
+* Tue Jan 20 2009 Paul Wouters <paul at xelerance.com 1.7.0.0-1
+- Updated to new upstream version
+- utf8 the CHANGES file
+
 * Sun Jan 18 2009 Tomas Mraz <tmraz at redhat.com> 1.6.0.1-3
 - disable the upstream openssl fips support
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/socat/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	4 Sep 2008 20:59:20 -0000	1.3
+++ sources	21 Jan 2009 03:31:55 -0000	1.4
@@ -1 +1 @@
-6a0dd33cde2a18eb382433aca8f76ce2  socat-1.6.0.1.tar.bz2
+be5f942c44dafefa58365e9dc3ada81f  socat-1.7.0.0.tar.bz2



From pwouters at fedoraproject.org  Wed Jan 21 03:33:31 2009
From: pwouters at fedoraproject.org (Paul Wouters)
Date: Wed, 21 Jan 2009 03:33:31 +0000 (UTC)
Subject: rpms/socat/devel socat.spec,1.12,1.13
Message-ID: <20090121033331.275AF70142@cvs1.fedora.phx.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/socat/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26962

Modified Files:
	socat.spec 
Log Message:
fix cvs anomaly



Index: socat.spec
===================================================================
RCS file: /cvs/extras/rpms/socat/devel/socat.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- socat.spec	21 Jan 2009 03:31:55 -0000	1.12
+++ socat.spec	21 Jan 2009 03:33:00 -0000	1.13
@@ -1,12 +1,7 @@
 Summary: Bidirectional data relay between two data channels ('netcat++')
 Name: socat
-<<<<<<< socat.spec
 Version: 1.7.0.0
 Release: 1%{?dist}
-=======
-Version: 1.6.0.1
-Release: 3%{?dist}
->>>>>>> 1.11
 License: GPLv2
 Url:  http://www.dest-unreach.org/%{name}
 Source: http://www.dest-unreach.org/socat/download/%{name}-%{version}.tar.bz2



From notting at fedoraproject.org  Wed Jan 21 03:38:19 2009
From: notting at fedoraproject.org (Bill Nottingham)
Date: Wed, 21 Jan 2009 03:38:19 +0000 (UTC)
Subject: rpms/initscripts/devel .cvsignore,1.157,1.158 sources,1.175,1.176
Message-ID: <20090121033819.5FDD47012F@cvs1.fedora.phx.redhat.com>

Author: notting

Update of /cvs/extras/rpms/initscripts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28545

Modified Files:
	.cvsignore sources 
Log Message:
8.88-1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/initscripts/devel/.cvsignore,v
retrieving revision 1.157
retrieving revision 1.158
diff -u -r1.157 -r1.158
--- .cvsignore	19 Jan 2009 22:10:05 -0000	1.157
+++ .cvsignore	21 Jan 2009 03:37:48 -0000	1.158
@@ -1 +1 @@
-initscripts-8.87.tar.bz2
+initscripts-8.88.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/initscripts/devel/sources,v
retrieving revision 1.175
retrieving revision 1.176
diff -u -r1.175 -r1.176
--- sources	19 Jan 2009 22:10:05 -0000	1.175
+++ sources	21 Jan 2009 03:37:49 -0000	1.176
@@ -1 +1 @@
-44aa49864ab9f4ea65d09a7ec1040ef0  initscripts-8.87.tar.bz2
+06455e42d38d18ebc2904faf3d934621  initscripts-8.88.tar.bz2



From cchance at fedoraproject.org  Wed Jan 21 03:38:12 2009
From: cchance at fedoraproject.org (Caius Chance)
Date: Wed, 21 Jan 2009 03:38:12 +0000 (UTC)
Subject: rpms/cjkuni-fonts/devel CIDFnmap.zh_CN, NONE, 1.1 CIDFnmap.zh_TW,
	NONE, 1.1 FAPIcidfmap.zh_CN, NONE, 1.1 FAPIcidfmap.zh_TW, NONE,
	1.1 cidfmap.zh_CN, NONE, 1.1 cidfmap.zh_TW, NONE,
	1.1 cjkuni-fonts.spec, NONE,
	1.1 cjkunifonts-0.2.20080216.1-2.patch, NONE, 1.1 import.log,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090121033812.3A97B7012F@cvs1.fedora.phx.redhat.com>

Author: cchance

Update of /cvs/pkgs/rpms/cjkuni-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28457/devel

Modified Files:
	.cvsignore sources 
Added Files:
	CIDFnmap.zh_CN CIDFnmap.zh_TW FAPIcidfmap.zh_CN 
	FAPIcidfmap.zh_TW cidfmap.zh_CN cidfmap.zh_TW 
	cjkuni-fonts.spec cjkunifonts-0.2.20080216.1-2.patch 
	import.log 
Log Message:
renamed from cjkunifonts



--- NEW FILE CIDFnmap.zh_CN ---
%!
% Copyright (C) 2001 Taiji Yamada and gs-cjk project
%
% This file is part of GNU Ghostscript.
% 
% GNU Ghostscript is distributed in the hope that it will be useful, but
% WITHOUT ANY WARRANTY.  No author or distributor accepts responsibility
% to anyone for the consequences of using it or for whether it serves any
% particular purpose or works at all, unless he says so in writing. Refer
% to the GNU General Public License for full details.
% 
% Everyone is granted permission to copy, modify and redistribute GNU
% Ghostscript, but only under the conditions described in the GNU General
% Public License.  A copy of this license is supposed to have been given
% to you along with GNU Ghostscript so you can know your rights and
% responsibilities.  It should be in a file named COPYING.  Among other
% things, the copyright notice and this notice must be preserved on all
% copies.

% $Id: CIDFnmap.zh_CN,v 1.2 2003/05/23 04:42:46 llch Exp $
% CID fontmap for the Arphic trutype fonts

% See ftp://ftp.gnu.org/pub/non-gnu/chinese-fonts-truetype/LICENSE
% for license information regarding these fonts.

% Adobe-GB1

/BousungEG-Light-GB	(/usr/share/fonts/cjkunifonts-uming/uming.ttf)	;
/GBZenKai-Medium	(/usr/share/fonts/cjkunifonts-ukai/ukai.ttf)	;

/Adobe-GB1		/BousungEG-Light-GB	;
/MSungGBK-Light		/BousungEG-Light-GB	;


--- NEW FILE CIDFnmap.zh_TW ---
%!
% Copyright (C) 2001 Taiji Yamada and gs-cjk project
%
% This file is part of GNU Ghostscript.
% 
% GNU Ghostscript is distributed in the hope that it will be useful, but
% WITHOUT ANY WARRANTY.  No author or distributor accepts responsibility
% to anyone for the consequences of using it or for whether it serves any
% particular purpose or works at all, unless he says so in writing. Refer
% to the GNU General Public License for full details.
% 
% Everyone is granted permission to copy, modify and redistribute GNU
% Ghostscript, but only under the conditions described in the GNU General
% Public License.  A copy of this license is supposed to have been given
% to you along with GNU Ghostscript so you can know your rights and
% responsibilities.  It should be in a file named COPYING.  Among other
% things, the copyright notice and this notice must be preserved on all
% copies.

% $Id: CIDFnmap.zh_TW,v 1.1 2003/03/31 15:44:38 tagoh Exp $
% CID fontmap for the Arphic trutype fonts

% See ftp://ftp.gnu.org/pub/non-gnu/chinese-fonts-truetype/LICENSE
% for license information regarding these fonts.

% Adobe-CNS1

/ZenKai-Medium		(/usr/share/fonts/cjkunifonts-ukai/ukai.ttf)	;
/ShanHeiSun-Light	(/usr/share/fonts/cjkunifonts-uming/uming.ttf)	;

/Adobe-CNS1		/ShanHeiSun-Light	;



--- NEW FILE FAPIcidfmap.zh_CN ---
%!
% The map is a set of records like this :
%
%  /CIDfont_name options_dict ;
%
% where options_dict is a dictionary with the following entries :
%
% Key         Type      Description
% Path        string    Absolute path to font file, or relative path to font file from
%                       the GS_EXTFONTPATH value.
% CIDFontType integer   PostScript type for this CID font. Only 0 is currently allowed.
%                       Note that this is unrelated to the real type of the font file -
%                       the bridge will perform format conversion.
% FAPI        name      Name of the renderer to be used with the font. /AgfaUFST and
%                       /FreeType is now allowed -- depends on which options Ghostscript
%                       was built with.
% SubfontId   integer   (optional) Index of the font in font collection, such as FCO or TTC.
%                       It is being ignored if /Path doesn't specify a collection.
% CSI         array     Must have strongly 2 elements.
%                       The first element of the array specifies Ordering of CIDSystemInfo.
%                       The second element specifies Supplement of CIDSystemInfo.
%
% Use regular Postscript syntax.
%
/BousungEG-Light-GB	<< /Path (/usr/share/fonts/cjkunifonts-uming/uming.ttf) /CIDFontType 0 /FAPI /FreeType /CSI [(GB1) 4] >> ;
/GBZenKai-Medium	<< /Path (/usr/share/fonts/cjkunifonts-ukai/ukai.ttf) /CIDFontType 0 /FAPI /FreeType /CSI [(GB1) 4] >> ;
%
/MSungGBK-Light		<< /Path (/usr/share/fonts/cjkunifonts-uming/uming.ttf) /CIDFontType 0 /FAPI /FreeType /CSI [(GB1) 4] >> ;
/Adobe-GB1		<< /Path (/usr/share/fonts/cjkunifonts-uming/uming.ttf) /CIDFontType 0 /FAPI /FreeType /CSI [(GB1) 4] >> ;


--- NEW FILE FAPIcidfmap.zh_TW ---
%!
% The map is a set of records like this :
%
%  /CIDfont_name options_dict ;
%
% where options_dict is a dictionary with the following entries :
%
% Key         Type      Description
% Path        string    Absolute path to font file, or relative path to font file from
%                       the GS_EXTFONTPATH value.
% CIDFontType integer   PostScript type for this CID font. Only 0 is currently allowed.
%                       Note that this is unrelated to the real type of the font file -
%                       the bridge will perform format conversion.
% FAPI        name      Name of the renderer to be used with the font. /AgfaUFST and
%                       /FreeType is now allowed -- depends on which options Ghostscript
%                       was built with.
% SubfontId   integer   (optional) Index of the font in font collection, such as FCO or TTC.
%                       It is being ignored if /Path doesn't specify a collection.
% CSI         array     Must have strongly 2 elements.
%                       The first element of the array specifies Ordering of CIDSystemInfo.
%                       The second element specifies Supplement of CIDSystemInfo.
%
% Use regular Postscript syntax.
%
/ZenKai-Medium		<< /Path (/usr/share/fonts/chinese/cjkunifonts-ukai/ukai.ttf) /CIDFontType 0 /FAPI /FreeType /CSI [(CNS1) 4] >> ;
/ShanHeiSun-Light	<< /Path (/usr/share/fonts/chinese/cjkunifonts-uming/uming.ttf) /CIDFontType 0 /FAPI /FreeType /CSI [(CNS1) 4] >> ;
%
/Adobe-CNS1		<< /Path (/usr/share/fonts/chinese/cjkunifonts-uming/uming.ttf) /CIDFontType 0 /FAPI /FreeType /CSI [(CNS1) 4] >> ;


--- NEW FILE cidfmap.zh_CN ---
/BousungEG-Light-GB	<< /FileType /TrueType /Path (/usr/share/fonts/cjkunifonts-uming/uming.ttf) /CSI [(GB1) 4] >> ;
/GBZenKai-Medium	<< /FileType /TrueType /Path (/usr/share/fonts/cjkunifonts-ukai/ukai.ttf) /CSI [(GB1) 4] >> ;
/MSungGBK-Light		/BousungEG-Light-GB ;
/Adobe-GB1		/BousungEG-Light-GB ;



--- NEW FILE cidfmap.zh_TW ---
/ZenKai-Medium		<< /FileType /TrueType /Path (/usr/share/fonts/cjkunifonts-ukai/ukai.ttf) /CSI [(CNS1) 4] >> ;
/ShanHeiSun-Light	<< /FileType /TrueType /Path (/usr/share/fonts/cjkunifonts-uming/uming.ttf) /CSI [(CNS1) 4] >> ;
/Adobe-CNS1		/ShanHeiSun-Light ;



--- NEW FILE cjkuni-fonts.spec ---
%define fontname cjkuni
%define common_desc \
CJK Unifonts are Unicode TrueType fonts derived from original fonts made \
available by Arphic Technology under "Arphic Public License" and extended by \
the CJK Unifonts project.

%define gsdir           %{_datadir}/ghostscript/conf.d
%define catalogue       %{_sysconfdir}/X11/fontpath.d

%define umingbuilddir   %{name}-uming-%{version}
%define ukaibuilddir    %{name}-ukai-%{version}

Name:        %{fontname}-fonts
Version:     0.2.20080216.1
Release:     16%{?dist}
Summary:     Chinese Unicode TrueType fonts in Ming and Kai face.
License:     Arphic
Group:       User Interface/X
URL:         http://www.freedesktop.org/wiki/Software/CJKUnifonts

Source1:    http://ftp.debian.org/debian/pool/main/t/ttf-arphic-uming/ttf-arphic-uming_%{version}.orig.tar.gz
Source2:    http://ftp.debian.org/debian/pool/main/t/ttf-arphic-ukai/ttf-arphic-ukai_%{version}.orig.tar.gz
Source3:    FAPIcidfmap.zh_TW
Source4:    FAPIcidfmap.zh_CN
Source5:    cidfmap.zh_TW
Source6:    cidfmap.zh_CN
Source7:    CIDFnmap.zh_TW
Source8:    CIDFnmap.zh_CN
Patch1:     cjkunifonts-0.2.20080216.1-2.patch

BuildRoot:        %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildArch:        noarch
BuildRequires:    fontpackages-devel >= 1.13, xorg-x11-font-utils, ttmkfdir

%description
%common_desc

%package -n %{fontname}-uming-fonts
Summary:      Chinese Unicode TrueType font in Ming face.
Group:        User Interface/X
Requires:     %{fontname}-fonts-common = %{version}-%{release}
Conflicts:    fonts-chinese <= 3.03-9.fc8
Obsoletes:    fonts-chinese < 3.03-13
Obsoletes:    ttfonts-zh_CN <= 2.14-10, ttfonts-zh_TW <= 2.11-28
Obsoletes:    %{name}-uming < 0.2.20080216.1-16

%description -n %{fontname}-uming-fonts
%common_desc

CJK Unifonts in Ming face.

%_font_pkg -n uming -f *-ttf-arphic-uming*.conf uming.ttc

# remaining uming files
%doc ../%{umingbuilddir}/license
%doc ../%{umingbuilddir}/CONTRIBUTERS
%doc ../%{umingbuilddir}/Font_Comparison_ShanHeiSun_UMing.odt
%doc ../%{umingbuilddir}/Font_Comparison_ShanHeiSun_UMing.pdf
%doc ../%{umingbuilddir}/FONTLOG
%doc ../%{umingbuilddir}/INSTALL
%doc ../%{umingbuilddir}/KNOWN_ISSUES
%doc ../%{umingbuilddir}/NEWS
%doc ../%{umingbuilddir}/README
%doc ../%{umingbuilddir}/TODO

%package -n %{fontname}-ukai-fonts
Summary:      Chinese Unicode TrueType font in Kai face.
Group:        User Interface/X
Requires:     %{fontname}-fonts-common = %{version}-%{release}
Conflicts:    fonts-chinese <= 3.03-9.fc8
Obsoletes:    fonts-chinese < 3.03-13
Obsoletes:    ttfonts-zh_CN <= 2.14-10, ttfonts-zh_TW <= 2.11-28
Obsoletes:    %{name}-ukai < 0.2.20080216.1-16

%description -n %{fontname}-ukai-fonts
%common_desc

CJK Unifonts in Kai face.

%_font_pkg -n ukai -f *-ttf-arphic-ukai*.conf ukai.ttc

# remaining ukai files
%doc ../%{ukaibuilddir}/license
%doc ../%{ukaibuilddir}/CONTRIBUTERS
%doc ../%{ukaibuilddir}/Font_Comparison_ZenKai_UKai.odt
%doc ../%{ukaibuilddir}/Font_Comparison_ZenKai_UKai.pdf
%doc ../%{ukaibuilddir}/FONTLOG
%doc ../%{ukaibuilddir}/INSTALL
%doc ../%{ukaibuilddir}/KNOWN_ISSUES
%doc ../%{ukaibuilddir}/NEWS
%doc ../%{ukaibuilddir}/README
%doc ../%{ukaibuilddir}/TODO

%package -n %{fontname}-fonts-common
Summary:      Chinese Unicode TrueType font common files.
Group:        User Interface/X
Requires:     fontpackages-filesystem >= 1.13
Conflicts:    fonts-chinese <= 3.03-9.fc8
Obsoletes:    fonts-chinese < 3.03-13
Obsoletes:    ttfonts-zh_CN <= 2.14-10, ttfonts-zh_TW <= 2.11-28
Obsoletes:    %{name}-common < 0.2.20080216.1-16 

%description -n %{fontname}-fonts-common
%common_desc

CJK Unifonts common files.

%files -n %{fontname}-fonts-common
%defattr(0644,root,root,0755)
%{gsdir}/FAPIcidfmap.zh_TW
%{gsdir}/FAPIcidfmap.zh_CN
%{gsdir}/cidfmap.zh_TW
%{gsdir}/cidfmap.zh_CN
%{gsdir}/CIDFnmap.zh_TW
%{gsdir}/CIDFnmap.zh_CN
%verify(not md5 size mtime) %{_fontdir}/fonts.dir
%verify(not md5 size mtime) %{_fontdir}/fonts.scale
%{catalogue}/%{name}

%package -n %{fontname}-fonts-compat
Summary:      Chinese Unicode TrueType font compatibility files.
Group:        User Interface/X
Requires:     %{fontname}-uming-fonts = %{version}-%{release}
Conflicts:    fonts-chinese <= 3.03-9.fc8
Obsoletes:    fonts-chinese < 3.03-13
Obsoletes:    ttfonts-zh_CN <= 2.14-10, ttfonts-zh_TW <= 2.11-28
Obsoletes:    %{name}-compat < 0.2.20080216.1-16 

%description -n %{fontname}-fonts-compat
%common_desc

CJK Unifonts compatibility files.

%files -n %{fontname}-fonts-compat
%defattr(0644,root,root,0755)
%verify(not md5 size mtime) %{_datadir}/fonts/zh_CN/TrueType/zysong.ttf
%verify(not md5 size mtime) %{_datadir}/fonts/zh_TW/TrueType/bsmi00lp.ttf

%prep
%setup -q -c -T -a1 -n %{umingbuilddir}
%patch1 -p1 -b .1-rhbz466667
%setup -q -c -T -a2 -n %{ukaibuilddir}

%build
%{nil}

%install
%__rm -rf %{buildroot}

# *.ttc(ttf)
%__install -m 0755 -d %{buildroot}%{_fontdir}
%__install -m 0644 ../%{umingbuilddir}/uming.ttc %{buildroot}%{_fontdir}/
%__install -m 0644 ../%{ukaibuilddir}/ukai.ttc %{buildroot}%{_fontdir}/

# fonts.{scale,dir}
%{_bindir}/ttmkfdir -d %{buildroot}%{_fontdir} \
    -o %{buildroot}%{_fontdir}/fonts.scale
%{_bindir}/mkfontdir %{buildroot}%{_fontdir}

# *.conf
%__install -m 0755 -d %{buildroot}%{_fontconfig_templatedir}
%__install -m 0755 -d %{buildroot}%{_fontconfig_confdir}
cd ../%{umingbuilddir}
for fconf in `ls *-ttf-arphic-uming*.conf`
do
    %__install -m 0644 $fconf %{buildroot}%{_fontconfig_templatedir}/
    %__ln_s %{_fontconfig_templatedir}/$fconf \
        %{buildroot}%{_fontconfig_confdir}/$fconf
done
cd ../%{ukaibuilddir}
for fconf in `ls *-ttf-arphic-ukai*.conf`
do
    %__install -m 0644 $fconf %{buildroot}%{_fontconfig_templatedir}/
    %__ln_s %{_fontconfig_templatedir}/$fconf \
        %{buildroot}%{_fontconfig_confdir}/$fconf
done
cd -

# ghostscript
%__install -m 0755 -d %{buildroot}%{gsdir}
%__install -m 0644 %{SOURCE3} %{buildroot}%{gsdir}/
%__install -m 0644 %{SOURCE4} %{buildroot}%{gsdir}/
%__install -m 0644 %{SOURCE5} %{buildroot}%{gsdir}/
%__install -m 0644 %{SOURCE6} %{buildroot}%{gsdir}/
%__install -m 0644 %{SOURCE7} %{buildroot}%{gsdir}/
%__install -m 0644 %{SOURCE8} %{buildroot}%{gsdir}/

# catalogue
%__install -m 0755 -d %{buildroot}%{catalogue}
%__ln_s %{_fontdir} %{buildroot}%{catalogue}/%{name}

# backward compat to obsoleted ttf
%__install -m 0755 -d %{buildroot}%{_datadir}/fonts/zh_CN/TrueType
%__install -m 0755 -d %{buildroot}%{_datadir}/fonts/zh_TW/TrueType
%__ln_s ../../%{name}/uming.ttc \
    %{buildroot}%{_datadir}/fonts/zh_CN/TrueType/zysong.ttf
%__ln_s ../../%{name}/uming.ttc \
    %{buildroot}%{_datadir}/fonts/zh_TW/TrueType/bsmi00lp.ttf

%clean
%__rm -fr %{buildroot}

%changelog
* Mon Jan 19 2009 Caius Chance <cchance at redhat.com> - 0.2.20080216.1-15.fc11
- Resolves: rhbz#477373
- Updated font renaming for post-1.13 fontpackages.

* Mon Jan 19 2009 Caius Chance <cchance at redhat.com> - 0.2.20080216.1-14.fc11
- Resolves: rhbz#477373
- Used _fontdir macro instead of self-definition.
- Created common subpackage for common files.
- Created compat subpackage for uming backward compatibility.
- Refined descriptions.

* Wed Jan 14 2009 Caius Chance <cchance at redhat.com> - 0.2.20080216.1-13.fc11
- Resolves: rhbz#477373
- Included _font_pkg macro to conform new font packaging guidelines.
- Tidy up .spec file.

* Tue Jan 06 2009 Caius Chance <cchance at redhat.com> - 0.2.20080216.1-12.fc11
- Resolves: rhbz#477373 (Converted to new font packaging guidelines.)

* Sun Dec  7 2008 Behdad Esfahbod <besfahbo at redhat.com> - 0.2.20080216.1-10.fc11
- Don't umask before fc-cache.
- Add -f to fc-cache.

* Wed Oct 29 2008 Caius Chance <cchance at redhat.com> - 0.2.20080216.1-9.2.fc11
- Resolves: rhbz#466667 (Reverted to 0.2.20080216.1-4 without conf.avail.)

* Tue Oct 07 2008 Caius Chance <cchance at redhat.com> - 0.2.20080216.1-6.fc10
- Resolves: rhbz#465900 (Symlinks of fontconfig .conf files are inaccurated.)
- Macro'ed all __ln_s.

* Wed Oct 01 2008 Caius Chance <cchance at redhat.com> - 0.2.20080216.1-5.fc10
- Resolves: rhbz#459680 (Unsymlinked 25-ttf-arphic-uming-bitmaps.conf.)

* Tue 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)

* 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#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.

* Mon Jun 30 2008 Caius Chance <cchance at redhat.com> - 0.1.20060928-5.fc10
- Resolved: rhbz#453078 (fonts-chinese is deprecated and should be removed.)

* Fri Aug 31 2007 Jens Petersen <petersen at redhat.com>
- remove superfluous ttfmkdir requires

* Fri Aug 30 2007 Caius Chance <cchance at redhat.com> - 0.1.20060928-4.fc8
- Resolved: rhbz#253813 (New package separated from fonts-chinese)
-- Added requires and buildrequires ttfmkdir.

* Wed Aug 30 2007 Caius Chance <cchance at redhat.com> - 0.1.20060928-3.fc8
- Resolved: rhbz#253813 (New package separated from fonts-chinese)
-- Fixed cidmap directory and package requirements.

* Wed Aug 29 2007 Caius Chance <cchance at redhat.com> - 0.1.20060928-2.fc8
- Resolved: rhbz#253813 (New package separated from fonts-chinese)
-- Moved uming and ukai into sub-packages.
-- Moved fc-cache from post section to install section.
-- Fixed ghostscript directory and backward compatibilities symlinks.
-- Refined .spec literal, license, versioning contents.

* Wed Aug 22 2007 Caius Chance <cchance at redhat.com> - 0.1.20060928-1.fc8
- Resolved: rhbz#253813 (New package separated from fonts-chinese)
-- Review preparation.

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-10-13 12:46:43.000000000 +1000
+++ cjkunifonts-uming-0.2.20080216.1/25-ttf-arphic-uming-bitmaps.conf	2008-10-13 12:47:28.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>
-	</match>
-
 </fontconfig>


--- NEW FILE import.log ---
cjkuni-fonts-0_2_20080216_1-16_fc11:HEAD:cjkuni-fonts-0.2.20080216.1-16.fc11.src.rpm:1232479883


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cjkuni-fonts/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	21 Jan 2009 03:02:14 -0000	1.1
+++ .cvsignore	21 Jan 2009 03:37:41 -0000	1.2
@@ -0,0 +1,2 @@
+ttf-arphic-ukai_0.2.20080216.1.orig.tar.gz
+ttf-arphic-uming_0.2.20080216.1.orig.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cjkuni-fonts/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	21 Jan 2009 03:02:14 -0000	1.1
+++ sources	21 Jan 2009 03:37:41 -0000	1.2
@@ -0,0 +1,2 @@
+4d3beb55db000bfedd18c9c7d6e631d8  ttf-arphic-ukai_0.2.20080216.1.orig.tar.gz
+d219fcaf953f3eb1889399955a00379f  ttf-arphic-uming_0.2.20080216.1.orig.tar.gz



From notting at fedoraproject.org  Wed Jan 21 03:39:36 2009
From: notting at fedoraproject.org (Bill Nottingham)
Date: Wed, 21 Jan 2009 03:39:36 +0000 (UTC)
Subject: rpms/initscripts/devel initscripts.spec,1.184,1.185
Message-ID: <20090121033936.38E3E7012F@cvs1.fedora.phx.redhat.com>

Author: notting

Update of /cvs/extras/rpms/initscripts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28888

Modified Files:
	initscripts.spec 
Log Message:
8.88-1



Index: initscripts.spec
===================================================================
RCS file: /cvs/extras/rpms/initscripts/devel/initscripts.spec,v
retrieving revision 1.184
retrieving revision 1.185
diff -u -r1.184 -r1.185
--- initscripts.spec	19 Jan 2009 22:10:05 -0000	1.184
+++ initscripts.spec	21 Jan 2009 03:39:05 -0000	1.185
@@ -2,7 +2,7 @@
 
 Summary: The inittab file and the /etc/init.d scripts
 Name: initscripts
-Version: 8.87
+Version: 8.88
 # ppp-watch is GPLv2+, everything else is GPLv2
 License: GPLv2 and GPLv2+
 Group: System Environment/Base
@@ -250,6 +250,10 @@
 /etc/profile.d/debug*
 
 %changelog
+* Tue Jan 20 2009 Bill Nottingham <notting at redhat.com> - 8.88-1
+- init.d/network: return success/failure correctly (#480677)
+- init.d/halt: fix typo (#480799)
+
 * Mon Jan 19 2009 Bill Nottingham <notting at redhat.com> - 8.87-1
 - rename_device: be much faster in the presence of many devices (#480687, <danms at us.ibm.com>)
 - fix switching from targeted to MLS policy (#479054, <dwalsh at redhat.com>)



From lkundrak at fedoraproject.org  Wed Jan 21 04:46:49 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Wed, 21 Jan 2009 04:46:49 +0000 (UTC)
Subject: rpms/tunneler/devel tunneler.desktop, NONE, 1.1 tunneler.spec, NONE,
	1.1 tunneler.svg, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090121044649.ACD147012F@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/tunneler/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5393

Modified Files:
	.cvsignore sources 
Added Files:
	tunneler.desktop tunneler.spec tunneler.svg 
Log Message:
Initial import


--- NEW FILE tunneler.desktop ---
[Desktop Entry]
Encoding=UTF-8
Type=Application
Name=Tunneler
Exec=tunneler
Icon=tunneler
Categories=Game;
Terminal=false


--- NEW FILE tunneler.spec ---
Name:           tunneler
Version:        1.1.1
Release:        1%{?dist}
Summary:        Clone of legendary Tunneler game

Group:          Amusements/Games
License:        GPLv2+
URL:            http://users.jyu.fi/~tvkalvas/code/tunneler/
Source0:        http://users.jyu.fi/~tvkalvas/code/tunneler/%{name}-%{version}.tar.gz
Source1:        tunneler.svg
Source2:        tunneler.desktop
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  desktop-file-utils
BuildRequires:  SDL-devel

%description
A clone of legendary game made by Geoffrey Silverton in 1991. In the game
two players using the same keyboard and the same screen each control an
underground tank. Goal is to find and destroy the opponent's tank. Since
only small part of the map is displayed on the split screen, you might
actually have some searching to do.


%prep
%setup -q


%build
%configure
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/scalable/apps/
install -m 644 -p %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/scalable/apps/
desktop-file-install --vendor=fedora %{SOURCE2} \
        --dir=${RPM_BUILD_ROOT}%{_datadir}/applications


%clean
rm -rf $RPM_BUILD_ROOT


%post
touch --no-create %{_datadir}/icons/hicolor || :
[ -x %{_bindir}/gtk-update-icon-cache ] &&
       %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :


%postun
touch --no-create %{_datadir}/icons/hicolor || :
[ -x %{_bindir}/gtk-update-icon-cache ] &&
       %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :


%files
%defattr(-,root,root,-)
%{_bindir}/tunneler
%{_datadir}/icons/hicolor/scalable/apps/tunneler.svg
%{_datadir}/applications/*.desktop
%doc COPYING INSTALL README


%changelog
* Tue Jan 20 2009 Lubomir Rintel <lkundrak at v3.sk> 1.1.1-1
- Initial packaging


--- NEW FILE tunneler.svg ---
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
   xmlns:dc="http://purl.org/dc/elements/1.1/"
   xmlns:cc="http://creativecommons.org/ns#"
   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
   xmlns:svg="http://www.w3.org/2000/svg"
   xmlns="http://www.w3.org/2000/svg"
   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
   width="64"
   height="64"
   id="svg2"
   sodipodi:version="0.32"
   inkscape:version="0.46"
   sodipodi:docname="tuneller.svg"
   inkscape:output_extension="org.inkscape.output.svg.inkscape"
   version="1.0">
  <defs
     id="defs4">
    <inkscape:perspective
       sodipodi:type="inkscape:persp3d"
       inkscape:vp_x="0 : 526.18109 : 1"
       inkscape:vp_y="0 : 1000 : 0"
       inkscape:vp_z="744.09448 : 526.18109 : 1"
       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
       id="perspective10" />
    <inkscape:perspective
       id="perspective2390"
       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
       inkscape:vp_z="744.09448 : 526.18109 : 1"
       inkscape:vp_y="0 : 1000 : 0"
       inkscape:vp_x="0 : 526.18109 : 1"
       sodipodi:type="inkscape:persp3d" />
    <inkscape:perspective
       id="perspective2403"
       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
       inkscape:vp_z="744.09448 : 526.18109 : 1"
       inkscape:vp_y="0 : 1000 : 0"
       inkscape:vp_x="0 : 526.18109 : 1"
       sodipodi:type="inkscape:persp3d" />
    <filter
       id="filter3211"
       inkscape:label="filter1">
      <feGaussianBlur
         stdDeviation="1"
         id="feGaussianBlur3213" />
    </filter>
  </defs>
  <sodipodi:namedview
     id="base"
     pagecolor="#ffffff"
     bordercolor="#666666"
     borderopacity="1.0"
     gridtolerance="10000"
     guidetolerance="10"
     objecttolerance="10"
     inkscape:pageopacity="0.0"
     inkscape:pageshadow="2"
     inkscape:zoom="9.703125"
     inkscape:cx="32"
     inkscape:cy="35.039257"
     inkscape:document-units="px"
     inkscape:current-layer="layer1"
     showgrid="false"
     inkscape:window-width="1440"
     inkscape:window-height="829"
     inkscape:window-x="0"
     inkscape:window-y="25">
    <inkscape:grid
       type="xygrid"
       id="grid3183"
       visible="true"
       enabled="true" />
  </sodipodi:namedview>
  <metadata
     id="metadata7">
    <rdf:RDF>
      <cc:Work
         rdf:about="">
        <dc:format>image/svg+xml</dc:format>
        <dc:type
           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
      </cc:Work>
    </rdf:RDF>
  </metadata>
  <g
     inkscape:label="Layer 1"
     inkscape:groupmode="layer"
     id="layer1"
     transform="translate(-363.17991,-505.19355)">
    <g
       id="g3255"
       transform="matrix(1.1574138,0,0,1.1264179,-54.225714,-59.536996)">
      <g
         style="fill:#241f1c;filter:url(#filter3211)"
         id="g3201"
         transform="matrix(0.4507446,0.892653,-0.892653,0.4507446,662.57075,-93.095901)">
        <rect
           y="513.36218"
           x="421"
           height="26"
           width="19"
           id="rect3203"
           style="fill:#241f1c;fill-opacity:1" />
        <rect
           y="507.36218"
           x="415"
           height="38"
           width="6"
           id="rect3205"
           style="fill:#241f1c;fill-opacity:1" />
        <rect
           style="fill:#241f1c;fill-opacity:1"
           id="rect3207"
           width="6"
           height="38"
           x="440"
           y="507.36218" />
        <rect
           y="500.36218"
           x="428"
           height="26"
           width="6"
           id="rect3209"
           style="fill:#241f1c;fill-opacity:1" />
      </g>
      <g
         transform="matrix(0.4507446,0.892653,-0.892653,0.4507446,662.94009,-93.948213)"
         id="g3195">
        <rect
           style="fill:#00fc00;fill-opacity:1"
           id="rect3189"
           width="19"
           height="26"
           x="421"
           y="513.36218" />
        <rect
           style="fill:#008800;fill-opacity:1"
           id="rect3185"
           width="6"
           height="38"
           x="415"
           y="507.36218" />
        <rect
           y="507.36218"
           x="440"
           height="38"
           width="6"
           id="rect3187"
           style="fill:#008800;fill-opacity:1" />
        <rect
           style="fill:#f8fc00;fill-opacity:1"
           id="rect3193"
           width="6"
           height="26"
           x="428"
           y="500.36218" />
      </g>
    </g>
  </g>
</svg>


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/tunneler/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	20 Jan 2009 21:04:33 -0000	1.1
+++ .cvsignore	21 Jan 2009 04:46:18 -0000	1.2
@@ -0,0 +1 @@
+tunneler-1.1.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tunneler/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	20 Jan 2009 21:04:33 -0000	1.1
+++ sources	21 Jan 2009 04:46:18 -0000	1.2
@@ -0,0 +1 @@
+80a40b18737a9e679cd1a3cca5abba67  tunneler-1.1.1.tar.gz



From lkundrak at fedoraproject.org  Wed Jan 21 04:50:11 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Wed, 21 Jan 2009 04:50:11 +0000 (UTC)
Subject: rpms/tunneler/EL-5 tunneler.desktop, NONE, 1.1 tunneler.spec, NONE, 
	1.1 tunneler.svg, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090121045011.B2E4B7012F@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/tunneler/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5817/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	tunneler.desktop tunneler.spec tunneler.svg 
Log Message:
Import tunneler into branches


--- NEW FILE tunneler.desktop ---
[Desktop Entry]
Encoding=UTF-8
Type=Application
Name=Tunneler
Exec=tunneler
Icon=tunneler
Categories=Game;
Terminal=false


--- NEW FILE tunneler.spec ---
Name:           tunneler
Version:        1.1.1
Release:        1%{?dist}
Summary:        Clone of legendary Tunneler game

Group:          Amusements/Games
License:        GPLv2+
URL:            http://users.jyu.fi/~tvkalvas/code/tunneler/
Source0:        http://users.jyu.fi/~tvkalvas/code/tunneler/%{name}-%{version}.tar.gz
Source1:        tunneler.svg
Source2:        tunneler.desktop
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  desktop-file-utils
BuildRequires:  SDL-devel

%description
A clone of legendary game made by Geoffrey Silverton in 1991. In the game
two players using the same keyboard and the same screen each control an
underground tank. Goal is to find and destroy the opponent's tank. Since
only small part of the map is displayed on the split screen, you might
actually have some searching to do.


%prep
%setup -q


%build
%configure
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/scalable/apps/
install -m 644 -p %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/scalable/apps/
desktop-file-install --vendor=fedora %{SOURCE2} \
        --dir=${RPM_BUILD_ROOT}%{_datadir}/applications


%clean
rm -rf $RPM_BUILD_ROOT


%post
touch --no-create %{_datadir}/icons/hicolor || :
[ -x %{_bindir}/gtk-update-icon-cache ] &&
       %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :


%postun
touch --no-create %{_datadir}/icons/hicolor || :
[ -x %{_bindir}/gtk-update-icon-cache ] &&
       %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :


%files
%defattr(-,root,root,-)
%{_bindir}/tunneler
%{_datadir}/icons/hicolor/scalable/apps/tunneler.svg
%{_datadir}/applications/*.desktop
%doc COPYING INSTALL README


%changelog
* Tue Jan 20 2009 Lubomir Rintel <lkundrak at v3.sk> 1.1.1-1
- Initial packaging


--- NEW FILE tunneler.svg ---
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
   xmlns:dc="http://purl.org/dc/elements/1.1/"
   xmlns:cc="http://creativecommons.org/ns#"
   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
   xmlns:svg="http://www.w3.org/2000/svg"
   xmlns="http://www.w3.org/2000/svg"
   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
   width="64"
   height="64"
   id="svg2"
   sodipodi:version="0.32"
   inkscape:version="0.46"
   sodipodi:docname="tuneller.svg"
   inkscape:output_extension="org.inkscape.output.svg.inkscape"
   version="1.0">
  <defs
     id="defs4">
    <inkscape:perspective
       sodipodi:type="inkscape:persp3d"
       inkscape:vp_x="0 : 526.18109 : 1"
       inkscape:vp_y="0 : 1000 : 0"
       inkscape:vp_z="744.09448 : 526.18109 : 1"
       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
       id="perspective10" />
    <inkscape:perspective
       id="perspective2390"
       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
       inkscape:vp_z="744.09448 : 526.18109 : 1"
       inkscape:vp_y="0 : 1000 : 0"
       inkscape:vp_x="0 : 526.18109 : 1"
       sodipodi:type="inkscape:persp3d" />
    <inkscape:perspective
       id="perspective2403"
       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
       inkscape:vp_z="744.09448 : 526.18109 : 1"
       inkscape:vp_y="0 : 1000 : 0"
       inkscape:vp_x="0 : 526.18109 : 1"
       sodipodi:type="inkscape:persp3d" />
    <filter
       id="filter3211"
       inkscape:label="filter1">
      <feGaussianBlur
         stdDeviation="1"
         id="feGaussianBlur3213" />
    </filter>
  </defs>
  <sodipodi:namedview
     id="base"
     pagecolor="#ffffff"
     bordercolor="#666666"
     borderopacity="1.0"
     gridtolerance="10000"
     guidetolerance="10"
     objecttolerance="10"
     inkscape:pageopacity="0.0"
     inkscape:pageshadow="2"
     inkscape:zoom="9.703125"
     inkscape:cx="32"
     inkscape:cy="35.039257"
     inkscape:document-units="px"
     inkscape:current-layer="layer1"
     showgrid="false"
     inkscape:window-width="1440"
     inkscape:window-height="829"
     inkscape:window-x="0"
     inkscape:window-y="25">
    <inkscape:grid
       type="xygrid"
       id="grid3183"
       visible="true"
       enabled="true" />
  </sodipodi:namedview>
  <metadata
     id="metadata7">
    <rdf:RDF>
      <cc:Work
         rdf:about="">
        <dc:format>image/svg+xml</dc:format>
        <dc:type
           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
      </cc:Work>
    </rdf:RDF>
  </metadata>
  <g
     inkscape:label="Layer 1"
     inkscape:groupmode="layer"
     id="layer1"
     transform="translate(-363.17991,-505.19355)">
    <g
       id="g3255"
       transform="matrix(1.1574138,0,0,1.1264179,-54.225714,-59.536996)">
      <g
         style="fill:#241f1c;filter:url(#filter3211)"
         id="g3201"
         transform="matrix(0.4507446,0.892653,-0.892653,0.4507446,662.57075,-93.095901)">
        <rect
           y="513.36218"
           x="421"
           height="26"
           width="19"
           id="rect3203"
           style="fill:#241f1c;fill-opacity:1" />
        <rect
           y="507.36218"
           x="415"
           height="38"
           width="6"
           id="rect3205"
           style="fill:#241f1c;fill-opacity:1" />
        <rect
           style="fill:#241f1c;fill-opacity:1"
           id="rect3207"
           width="6"
           height="38"
           x="440"
           y="507.36218" />
        <rect
           y="500.36218"
           x="428"
           height="26"
           width="6"
           id="rect3209"
           style="fill:#241f1c;fill-opacity:1" />
      </g>
      <g
         transform="matrix(0.4507446,0.892653,-0.892653,0.4507446,662.94009,-93.948213)"
         id="g3195">
        <rect
           style="fill:#00fc00;fill-opacity:1"
           id="rect3189"
           width="19"
           height="26"
           x="421"
           y="513.36218" />
        <rect
           style="fill:#008800;fill-opacity:1"
           id="rect3185"
           width="6"
           height="38"
           x="415"
           y="507.36218" />
        <rect
           y="507.36218"
           x="440"
           height="38"
           width="6"
           id="rect3187"
           style="fill:#008800;fill-opacity:1" />
        <rect
           style="fill:#f8fc00;fill-opacity:1"
           id="rect3193"
           width="6"
           height="26"
           x="428"
           y="500.36218" />
      </g>
    </g>
  </g>
</svg>


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/tunneler/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	20 Jan 2009 21:04:33 -0000	1.1
+++ .cvsignore	21 Jan 2009 04:49:41 -0000	1.2
@@ -0,0 +1 @@
+tunneler-1.1.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tunneler/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	20 Jan 2009 21:04:33 -0000	1.1
+++ sources	21 Jan 2009 04:49:41 -0000	1.2
@@ -0,0 +1 @@
+80a40b18737a9e679cd1a3cca5abba67  tunneler-1.1.1.tar.gz



From lkundrak at fedoraproject.org  Wed Jan 21 04:50:11 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Wed, 21 Jan 2009 04:50:11 +0000 (UTC)
Subject: rpms/tunneler/F-10 tunneler.desktop, NONE, 1.1 tunneler.spec, NONE, 
	1.1 tunneler.svg, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090121045011.D3ACC70141@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/tunneler/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5817/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	tunneler.desktop tunneler.spec tunneler.svg 
Log Message:
Import tunneler into branches


--- NEW FILE tunneler.desktop ---
[Desktop Entry]
Encoding=UTF-8
Type=Application
Name=Tunneler
Exec=tunneler
Icon=tunneler
Categories=Game;
Terminal=false


--- NEW FILE tunneler.spec ---
Name:           tunneler
Version:        1.1.1
Release:        1%{?dist}
Summary:        Clone of legendary Tunneler game

Group:          Amusements/Games
License:        GPLv2+
URL:            http://users.jyu.fi/~tvkalvas/code/tunneler/
Source0:        http://users.jyu.fi/~tvkalvas/code/tunneler/%{name}-%{version}.tar.gz
Source1:        tunneler.svg
Source2:        tunneler.desktop
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  desktop-file-utils
BuildRequires:  SDL-devel

%description
A clone of legendary game made by Geoffrey Silverton in 1991. In the game
two players using the same keyboard and the same screen each control an
underground tank. Goal is to find and destroy the opponent's tank. Since
only small part of the map is displayed on the split screen, you might
actually have some searching to do.


%prep
%setup -q


%build
%configure
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/scalable/apps/
install -m 644 -p %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/scalable/apps/
desktop-file-install --vendor=fedora %{SOURCE2} \
        --dir=${RPM_BUILD_ROOT}%{_datadir}/applications


%clean
rm -rf $RPM_BUILD_ROOT


%post
touch --no-create %{_datadir}/icons/hicolor || :
[ -x %{_bindir}/gtk-update-icon-cache ] &&
       %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :


%postun
touch --no-create %{_datadir}/icons/hicolor || :
[ -x %{_bindir}/gtk-update-icon-cache ] &&
       %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :


%files
%defattr(-,root,root,-)
%{_bindir}/tunneler
%{_datadir}/icons/hicolor/scalable/apps/tunneler.svg
%{_datadir}/applications/*.desktop
%doc COPYING INSTALL README


%changelog
* Tue Jan 20 2009 Lubomir Rintel <lkundrak at v3.sk> 1.1.1-1
- Initial packaging


--- NEW FILE tunneler.svg ---
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
   xmlns:dc="http://purl.org/dc/elements/1.1/"
   xmlns:cc="http://creativecommons.org/ns#"
   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
   xmlns:svg="http://www.w3.org/2000/svg"
   xmlns="http://www.w3.org/2000/svg"
   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
   width="64"
   height="64"
   id="svg2"
   sodipodi:version="0.32"
   inkscape:version="0.46"
   sodipodi:docname="tuneller.svg"
   inkscape:output_extension="org.inkscape.output.svg.inkscape"
   version="1.0">
  <defs
     id="defs4">
    <inkscape:perspective
       sodipodi:type="inkscape:persp3d"
       inkscape:vp_x="0 : 526.18109 : 1"
       inkscape:vp_y="0 : 1000 : 0"
       inkscape:vp_z="744.09448 : 526.18109 : 1"
       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
       id="perspective10" />
    <inkscape:perspective
       id="perspective2390"
       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
       inkscape:vp_z="744.09448 : 526.18109 : 1"
       inkscape:vp_y="0 : 1000 : 0"
       inkscape:vp_x="0 : 526.18109 : 1"
       sodipodi:type="inkscape:persp3d" />
    <inkscape:perspective
       id="perspective2403"
       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
       inkscape:vp_z="744.09448 : 526.18109 : 1"
       inkscape:vp_y="0 : 1000 : 0"
       inkscape:vp_x="0 : 526.18109 : 1"
       sodipodi:type="inkscape:persp3d" />
    <filter
       id="filter3211"
       inkscape:label="filter1">
      <feGaussianBlur
         stdDeviation="1"
         id="feGaussianBlur3213" />
    </filter>
  </defs>
  <sodipodi:namedview
     id="base"
     pagecolor="#ffffff"
     bordercolor="#666666"
     borderopacity="1.0"
     gridtolerance="10000"
     guidetolerance="10"
     objecttolerance="10"
     inkscape:pageopacity="0.0"
     inkscape:pageshadow="2"
     inkscape:zoom="9.703125"
     inkscape:cx="32"
     inkscape:cy="35.039257"
     inkscape:document-units="px"
     inkscape:current-layer="layer1"
     showgrid="false"
     inkscape:window-width="1440"
     inkscape:window-height="829"
     inkscape:window-x="0"
     inkscape:window-y="25">
    <inkscape:grid
       type="xygrid"
       id="grid3183"
       visible="true"
       enabled="true" />
  </sodipodi:namedview>
  <metadata
     id="metadata7">
    <rdf:RDF>
      <cc:Work
         rdf:about="">
        <dc:format>image/svg+xml</dc:format>
        <dc:type
           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
      </cc:Work>
    </rdf:RDF>
  </metadata>
  <g
     inkscape:label="Layer 1"
     inkscape:groupmode="layer"
     id="layer1"
     transform="translate(-363.17991,-505.19355)">
    <g
       id="g3255"
       transform="matrix(1.1574138,0,0,1.1264179,-54.225714,-59.536996)">
      <g
         style="fill:#241f1c;filter:url(#filter3211)"
         id="g3201"
         transform="matrix(0.4507446,0.892653,-0.892653,0.4507446,662.57075,-93.095901)">
        <rect
           y="513.36218"
           x="421"
           height="26"
           width="19"
           id="rect3203"
           style="fill:#241f1c;fill-opacity:1" />
        <rect
           y="507.36218"
           x="415"
           height="38"
           width="6"
           id="rect3205"
           style="fill:#241f1c;fill-opacity:1" />
        <rect
           style="fill:#241f1c;fill-opacity:1"
           id="rect3207"
           width="6"
           height="38"
           x="440"
           y="507.36218" />
        <rect
           y="500.36218"
           x="428"
           height="26"
           width="6"
           id="rect3209"
           style="fill:#241f1c;fill-opacity:1" />
      </g>
      <g
         transform="matrix(0.4507446,0.892653,-0.892653,0.4507446,662.94009,-93.948213)"
         id="g3195">
        <rect
           style="fill:#00fc00;fill-opacity:1"
           id="rect3189"
           width="19"
           height="26"
           x="421"
           y="513.36218" />
        <rect
           style="fill:#008800;fill-opacity:1"
           id="rect3185"
           width="6"
           height="38"
           x="415"
           y="507.36218" />
        <rect
           y="507.36218"
           x="440"
           height="38"
           width="6"
           id="rect3187"
           style="fill:#008800;fill-opacity:1" />
        <rect
           style="fill:#f8fc00;fill-opacity:1"
           id="rect3193"
           width="6"
           height="26"
           x="428"
           y="500.36218" />
      </g>
    </g>
  </g>
</svg>


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/tunneler/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	20 Jan 2009 21:04:33 -0000	1.1
+++ .cvsignore	21 Jan 2009 04:49:41 -0000	1.2
@@ -0,0 +1 @@
+tunneler-1.1.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tunneler/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	20 Jan 2009 21:04:33 -0000	1.1
+++ sources	21 Jan 2009 04:49:41 -0000	1.2
@@ -0,0 +1 @@
+80a40b18737a9e679cd1a3cca5abba67  tunneler-1.1.1.tar.gz



From rishi at fedoraproject.org  Wed Jan 21 05:11:14 2009
From: rishi at fedoraproject.org (Debarshi Ray)
Date: Wed, 21 Jan 2009 05:11:14 +0000 (UTC)
Subject: rpms/httrack/F-9 httrack-3.43.2-desktop.patch, NONE,
	1.1 httrack-3.43.2-openssl.patch, NONE,
	1.1 httrack-3.43.2-utf-8.patch, NONE, 1.1 .cvsignore, 1.3,
	1.4 httrack.spec, 1.9, 1.10 sources, 1.3,
	1.4 httrack-3.42.93-desktop.patch, 1.1,
	NONE httrack-3.42.93-utf-8.patch, 1.1, NONE
Message-ID: <20090121051114.B8B447012F@cvs1.fedora.phx.redhat.com>

Author: rishi

Update of /cvs/pkgs/rpms/httrack/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9380

Modified Files:
	.cvsignore httrack.spec sources 
Added Files:
	httrack-3.43.2-desktop.patch httrack-3.43.2-openssl.patch 
	httrack-3.43.2-utf-8.patch 
Removed Files:
	httrack-3.42.93-desktop.patch httrack-3.42.93-utf-8.patch 
Log Message:
* Tue Jan 20 2009 Debarshi Ray <rishi at fedoraproject.org> - 3.43.2-1
- Version bump to 3.43.2. Closes Red Hat Bugzilla bug #476110.
- Updated 'Requires: openssl = 0.9.8j' and fixed the sources for Rawhide.


httrack-3.43.2-desktop.patch:

--- NEW FILE httrack-3.43.2-desktop.patch ---
diff -urNp httrack-3.43.2.orig/html/server/div/WebHTTrack.desktop httrack-3.43.2/html/server/div/WebHTTrack.desktop
--- httrack-3.43.2.orig/html/server/div/WebHTTrack.desktop	2008-12-15 02:55:45.065046535 +0530
+++ httrack-3.43.2/html/server/div/WebHTTrack.desktop	2008-12-15 03:00:53.439047073 +0530
@@ -7,4 +7,4 @@ Terminal=false
 Name=WebHTTrack Website Copier
 Comment=Copy websites to your computer
 Exec=webhttrack
-Icon=/usr/share/httrack/icons/webhttrack.xpm
+Icon=webhttrack
diff -urNp httrack-3.43.2.orig/html/server/div/WebHTTrack-Websites.desktop httrack-3.43.2/html/server/div/WebHTTrack-Websites.desktop
--- httrack-3.43.2.orig/html/server/div/WebHTTrack-Websites.desktop	2008-12-15 02:55:45.065046535 +0530
+++ httrack-3.43.2/html/server/div/WebHTTrack-Websites.desktop	2008-12-15 03:01:18.262046434 +0530
@@ -7,4 +7,4 @@ Terminal=false
 Name=Browse Mirrored Websites
 Comment=Browse Websites Mirrored by WebHTTrack
 Exec=webhttrack browse
-Icon=/usr/share/httrack/icons/webhttrack.xpm
+Icon=webhttrack

httrack-3.43.2-openssl.patch:

--- NEW FILE httrack-3.43.2-openssl.patch ---
diff -urNp httrack-3.43.2.orig/src/htsmodules.c httrack-3.43.2/src/htsmodules.c
--- httrack-3.43.2.orig/src/htsmodules.c	2008-12-31 22:41:53.000000000 +0530
+++ httrack-3.43.2/src/htsmodules.c	2009-01-20 22:42:30.000000000 +0530
@@ -263,7 +263,10 @@ void htspe_init(void) {
       handle = LoadLibraryA((char*)"ssleay32");
 #else
       /* We are compatible with 0.9.6/7/8/8b and potentially above */
-      handle = dlopen("libssl.so.0.9.8g", RTLD_LAZY);  /* added 8g release too (Debarshi Ray) */
+      handle = dlopen("libssl.so.0.9.8j", RTLD_LAZY);  /* added 8j release too (Debarshi Ray) */
+      if (handle == NULL) {
+		handle = dlopen("libssl.so.0.9.8g", RTLD_LAZY);
+	  }
       if (handle == NULL) {
 		handle = dlopen("libssl.so.0.9.8b", RTLD_LAZY);
 	  }

httrack-3.43.2-utf-8.patch:

--- NEW FILE httrack-3.43.2-utf-8.patch ---
diff -urNp httrack-3.43.2.orig/html/contact.html httrack-3.43.2/html/contact.html
--- httrack-3.43.2.orig/html/contact.html	2008-12-15 02:55:45.049072368 +0530
+++ httrack-3.43.2/html/contact.html	2008-12-15 03:07:40.608796440 +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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	9 Sep 2008 21:12:13 -0000	1.3
+++ .cvsignore	21 Jan 2009 05:10:44 -0000	1.4
@@ -1 +1 @@
-httrack-3.43-BETA-4.tar.gz
+httrack-3.43-2.tar.gz


Index: httrack.spec
===================================================================
RCS file: /cvs/pkgs/rpms/httrack/F-9/httrack.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- httrack.spec	9 Sep 2008 21:12:13 -0000	1.9
+++ httrack.spec	21 Jan 2009 05:10:44 -0000	1.10
@@ -1,7 +1,7 @@
-%if 0%{?fc7}%{?fc8}
-  %define _openssl_version 0.9.8b
-%else
+%if 0%{?fc9}%{?fc10}
   %define _openssl_version 0.9.8g
+%else
+  %define _openssl_version 0.9.8j
 %endif
 
 %if 0%{?fc7}
@@ -11,15 +11,16 @@
 
 Summary:	Website copier and offline browser
 Name:		httrack
-Version:	3.42.93
+Version:	3.43.2
 Release:	1%{?dist}
 License:	GPLv2+
 Group:		Applications/Internet
 URL:		http://www.httrack.com/
-Source0:	http://www.httrack.com/%{name}-3.43-BETA-4.tar.gz
+Source0:	http://www.httrack.com/%{name}-3.43-2.tar.gz
 
 Patch0:		%{name}-%{version}-desktop.patch
 Patch1:		%{name}-%{version}-utf-8.patch
+Patch2:		%{name}-%{version}-openssl.patch
 
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
@@ -51,32 +52,12 @@
 This package contains development files for %{name}.
 
 %prep
-%setup -q -n %{name}-3.42.93
+%setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 # Suppress rpmlint error.
-chmod 644 `find . -name "*.c" -perm /111 -print`
-chmod 644 `find . -name "*.h" -perm /111 -print`
-dos2unix ./AUTHORS
-dos2unix ./README
-dos2unix ./gpl.txt
-dos2unix ./gpl-fr.txt
-dos2unix ./greetings.txt
-dos2unix ./history.txt
-dos2unix ./html/step3.html
-dos2unix ./%{name}-doc.html
-dos2unix ./libtest/*.c
-dos2unix ./libtest/example.h
-dos2unix ./libtest/readme.txt
-dos2unix ./license.txt
-dos2unix ./templates/*.html
-iconv --from-code ISO8859-1 --to-code UTF-8 ./gpl-fr.txt \
-  --output gpl-fr.utf-8 && mv gpl-fr.utf-8 ./gpl-fr.txt
-iconv --from-code ISO8859-1 --to-code UTF-8 ./greetings.txt \
-  --output greetings.utf-8 && mv greetings.utf-8 ./greetings.txt
-iconv --from-code ISO8859-1 --to-code UTF-8 ./history.txt \
-  --output history.utf-8 && mv history.utf-8 ./history.txt
 iconv --from-code ISO8859-1 --to-code UTF-8 ./html/contact.html \
   --output contact.utf-8 && mv contact.utf-8 ./html/contact.html
 
@@ -149,7 +130,10 @@
 %doc README
 %doc gpl.txt
 %doc gpl-fr.txt
+%doc greetings.txt
+%doc history.txt
 %doc html
+%doc license.txt
 %doc %{name}-doc.html
 %doc templates
 %doc %{_mandir}/man1/htsserver.1*
@@ -180,9 +164,13 @@
 %{_includedir}/%{name}/*
 
 %changelog
+* Tue Jan 20 2009 Debarshi Ray <rishi at fedoraproject.org> - 3.43.2-1
+- Version bump to 3.43.2. Closes Red Hat Bugzilla bug #476110.
+- Updated 'Requires: openssl = 0.9.8j' and fixed the sources for Rawhide.
+
 * 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.
+  (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.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/httrack/F-9/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	9 Sep 2008 21:12:13 -0000	1.3
+++ sources	21 Jan 2009 05:10:44 -0000	1.4
@@ -1 +1 @@
-fe3fbd3129ac96761bab34a5b1a77aa8  httrack-3.43-BETA-4.tar.gz
+a6debc9fe8b7049e5de986357c7dadd8  httrack-3.43-2.tar.gz


--- httrack-3.42.93-desktop.patch DELETED ---


--- httrack-3.42.93-utf-8.patch DELETED ---



From mtasaka at fedoraproject.org  Wed Jan 21 05:11:18 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Wed, 21 Jan 2009 05:11:18 +0000 (UTC)
Subject: rpms/cairo-dock/devel .cvsignore, 1.103, 1.104 cairo-dock.spec,
	1.139, 1.140 sources, 1.103, 1.104
Message-ID: <20090121051118.0D9737012F@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/cairo-dock/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9411

Modified Files:
	.cvsignore cairo-dock.spec sources 
Log Message:
* Wed Jan 21 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
- rev 1494



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cairo-dock/devel/.cvsignore,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -r1.103 -r1.104
--- .cvsignore	20 Jan 2009 05:14:50 -0000	1.103
+++ .cvsignore	21 Jan 2009 05:10:47 -0000	1.104
@@ -1 +1 @@
-cairo-dock-sources-svn1491_trunk.tar.bz2
+cairo-dock-sources-svn1494_trunk.tar.bz2


Index: cairo-dock.spec
===================================================================
RCS file: /cvs/extras/rpms/cairo-dock/devel/cairo-dock.spec,v
retrieving revision 1.139
retrieving revision 1.140
diff -u -r1.139 -r1.140
--- cairo-dock.spec	20 Jan 2009 05:14:50 -0000	1.139
+++ cairo-dock.spec	21 Jan 2009 05:10:47 -0000	1.140
@@ -11,7 +11,7 @@
 %undefine		betaver		
 %define		build_webkit	1
 %define		build_xfce	1
-%define		tarballver	svn1491_trunk
+%define		tarballver	svn1494_trunk
 
 %define		fedora_main_rel	3
 
@@ -642,8 +642,8 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
-* Tue Jan 20 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
-- rev 1491
+* Wed Jan 21 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- rev 1494
 
 * Thu Jan 15 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
 - rev 1484


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cairo-dock/devel/sources,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -r1.103 -r1.104
--- sources	20 Jan 2009 05:14:50 -0000	1.103
+++ sources	21 Jan 2009 05:10:47 -0000	1.104
@@ -1 +1 @@
-676a658fb3c3d2d73058b8bb10172190  cairo-dock-sources-svn1491_trunk.tar.bz2
+9f62c0cf733b113e9ad3b9e43067b2fc  cairo-dock-sources-svn1494_trunk.tar.bz2



From rishi at fedoraproject.org  Wed Jan 21 05:13:30 2009
From: rishi at fedoraproject.org (Debarshi Ray)
Date: Wed, 21 Jan 2009 05:13:30 +0000 (UTC)
Subject: rpms/httrack/F-10 httrack-3.43.2-desktop.patch, NONE,
	1.1 httrack-3.43.2-openssl.patch, NONE,
	1.1 httrack-3.43.2-utf-8.patch, NONE, 1.1 .cvsignore, 1.3,
	1.4 httrack.spec, 1.9, 1.10 sources, 1.3,
	1.4 httrack-3.42.93-desktop.patch, 1.1,
	NONE httrack-3.42.93-utf-8.patch, 1.1, NONE
Message-ID: <20090121051330.BB2917012F@cvs1.fedora.phx.redhat.com>

Author: rishi

Update of /cvs/pkgs/rpms/httrack/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9961

Modified Files:
	.cvsignore httrack.spec sources 
Added Files:
	httrack-3.43.2-desktop.patch httrack-3.43.2-openssl.patch 
	httrack-3.43.2-utf-8.patch 
Removed Files:
	httrack-3.42.93-desktop.patch httrack-3.42.93-utf-8.patch 
Log Message:
* Tue Jan 20 2009 Debarshi Ray <rishi at fedoraproject.org> - 3.43.2-1
- Version bump to 3.43.2. Closes Red Hat Bugzilla bug #476110.
- Updated 'Requires: openssl = 0.9.8j' and fixed the sources for Rawhide.


httrack-3.43.2-desktop.patch:

--- NEW FILE httrack-3.43.2-desktop.patch ---
diff -urNp httrack-3.43.2.orig/html/server/div/WebHTTrack.desktop httrack-3.43.2/html/server/div/WebHTTrack.desktop
--- httrack-3.43.2.orig/html/server/div/WebHTTrack.desktop	2008-12-15 02:55:45.065046535 +0530
+++ httrack-3.43.2/html/server/div/WebHTTrack.desktop	2008-12-15 03:00:53.439047073 +0530
@@ -7,4 +7,4 @@ Terminal=false
 Name=WebHTTrack Website Copier
 Comment=Copy websites to your computer
 Exec=webhttrack
-Icon=/usr/share/httrack/icons/webhttrack.xpm
+Icon=webhttrack
diff -urNp httrack-3.43.2.orig/html/server/div/WebHTTrack-Websites.desktop httrack-3.43.2/html/server/div/WebHTTrack-Websites.desktop
--- httrack-3.43.2.orig/html/server/div/WebHTTrack-Websites.desktop	2008-12-15 02:55:45.065046535 +0530
+++ httrack-3.43.2/html/server/div/WebHTTrack-Websites.desktop	2008-12-15 03:01:18.262046434 +0530
@@ -7,4 +7,4 @@ Terminal=false
 Name=Browse Mirrored Websites
 Comment=Browse Websites Mirrored by WebHTTrack
 Exec=webhttrack browse
-Icon=/usr/share/httrack/icons/webhttrack.xpm
+Icon=webhttrack

httrack-3.43.2-openssl.patch:

--- NEW FILE httrack-3.43.2-openssl.patch ---
diff -urNp httrack-3.43.2.orig/src/htsmodules.c httrack-3.43.2/src/htsmodules.c
--- httrack-3.43.2.orig/src/htsmodules.c	2008-12-31 22:41:53.000000000 +0530
+++ httrack-3.43.2/src/htsmodules.c	2009-01-20 22:42:30.000000000 +0530
@@ -263,7 +263,10 @@ void htspe_init(void) {
       handle = LoadLibraryA((char*)"ssleay32");
 #else
       /* We are compatible with 0.9.6/7/8/8b and potentially above */
-      handle = dlopen("libssl.so.0.9.8g", RTLD_LAZY);  /* added 8g release too (Debarshi Ray) */
+      handle = dlopen("libssl.so.0.9.8j", RTLD_LAZY);  /* added 8j release too (Debarshi Ray) */
+      if (handle == NULL) {
+		handle = dlopen("libssl.so.0.9.8g", RTLD_LAZY);
+	  }
       if (handle == NULL) {
 		handle = dlopen("libssl.so.0.9.8b", RTLD_LAZY);
 	  }

httrack-3.43.2-utf-8.patch:

--- NEW FILE httrack-3.43.2-utf-8.patch ---
diff -urNp httrack-3.43.2.orig/html/contact.html httrack-3.43.2/html/contact.html
--- httrack-3.43.2.orig/html/contact.html	2008-12-15 02:55:45.049072368 +0530
+++ httrack-3.43.2/html/contact.html	2008-12-15 03:07:40.608796440 +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-10/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	9 Sep 2008 21:15:36 -0000	1.3
+++ .cvsignore	21 Jan 2009 05:13:00 -0000	1.4
@@ -1 +1 @@
-httrack-3.43-BETA-4.tar.gz
+httrack-3.43-2.tar.gz


Index: httrack.spec
===================================================================
RCS file: /cvs/pkgs/rpms/httrack/F-10/httrack.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- httrack.spec	9 Sep 2008 21:15:36 -0000	1.9
+++ httrack.spec	21 Jan 2009 05:13:00 -0000	1.10
@@ -1,7 +1,7 @@
-%if 0%{?fc7}%{?fc8}
-  %define _openssl_version 0.9.8b
-%else
+%if 0%{?fc9}%{?fc10}
   %define _openssl_version 0.9.8g
+%else
+  %define _openssl_version 0.9.8j
 %endif
 
 %if 0%{?fc7}
@@ -11,15 +11,16 @@
 
 Summary:	Website copier and offline browser
 Name:		httrack
-Version:	3.42.93
+Version:	3.43.2
 Release:	1%{?dist}
 License:	GPLv2+
 Group:		Applications/Internet
 URL:		http://www.httrack.com/
-Source0:	http://www.httrack.com/%{name}-3.43-BETA-4.tar.gz
+Source0:	http://www.httrack.com/%{name}-3.43-2.tar.gz
 
 Patch0:		%{name}-%{version}-desktop.patch
 Patch1:		%{name}-%{version}-utf-8.patch
+Patch2:		%{name}-%{version}-openssl.patch
 
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
@@ -51,32 +52,12 @@
 This package contains development files for %{name}.
 
 %prep
-%setup -q -n %{name}-3.42.93
+%setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 # Suppress rpmlint error.
-chmod 644 `find . -name "*.c" -perm /111 -print`
-chmod 644 `find . -name "*.h" -perm /111 -print`
-dos2unix ./AUTHORS
-dos2unix ./README
-dos2unix ./gpl.txt
-dos2unix ./gpl-fr.txt
-dos2unix ./greetings.txt
-dos2unix ./history.txt
-dos2unix ./html/step3.html
-dos2unix ./%{name}-doc.html
-dos2unix ./libtest/*.c
-dos2unix ./libtest/example.h
-dos2unix ./libtest/readme.txt
-dos2unix ./license.txt
-dos2unix ./templates/*.html
-iconv --from-code ISO8859-1 --to-code UTF-8 ./gpl-fr.txt \
-  --output gpl-fr.utf-8 && mv gpl-fr.utf-8 ./gpl-fr.txt
-iconv --from-code ISO8859-1 --to-code UTF-8 ./greetings.txt \
-  --output greetings.utf-8 && mv greetings.utf-8 ./greetings.txt
-iconv --from-code ISO8859-1 --to-code UTF-8 ./history.txt \
-  --output history.utf-8 && mv history.utf-8 ./history.txt
 iconv --from-code ISO8859-1 --to-code UTF-8 ./html/contact.html \
   --output contact.utf-8 && mv contact.utf-8 ./html/contact.html
 
@@ -149,7 +130,10 @@
 %doc README
 %doc gpl.txt
 %doc gpl-fr.txt
+%doc greetings.txt
+%doc history.txt
 %doc html
+%doc license.txt
 %doc %{name}-doc.html
 %doc templates
 %doc %{_mandir}/man1/htsserver.1*
@@ -180,9 +164,13 @@
 %{_includedir}/%{name}/*
 
 %changelog
+* Tue Jan 20 2009 Debarshi Ray <rishi at fedoraproject.org> - 3.43.2-1
+- Version bump to 3.43.2. Closes Red Hat Bugzilla bug #476110.
+- Updated 'Requires: openssl = 0.9.8j' and fixed the sources for Rawhide.
+
 * 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.
+  (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.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/httrack/F-10/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	9 Sep 2008 21:15:36 -0000	1.3
+++ sources	21 Jan 2009 05:13:00 -0000	1.4
@@ -1 +1 @@
-fe3fbd3129ac96761bab34a5b1a77aa8  httrack-3.43-BETA-4.tar.gz
+a6debc9fe8b7049e5de986357c7dadd8  httrack-3.43-2.tar.gz


--- httrack-3.42.93-desktop.patch DELETED ---


--- httrack-3.42.93-utf-8.patch DELETED ---



From rishi at fedoraproject.org  Wed Jan 21 05:15:57 2009
From: rishi at fedoraproject.org (Debarshi Ray)
Date: Wed, 21 Jan 2009 05:15:57 +0000 (UTC)
Subject: rpms/httrack/devel httrack-3.43.2-desktop.patch, NONE,
	1.1 httrack-3.43.2-openssl.patch, NONE,
	1.1 httrack-3.43.2-utf-8.patch, NONE, 1.1 .cvsignore, 1.3,
	1.4 httrack.spec, 1.9, 1.10 sources, 1.3,
	1.4 httrack-3.42.93-desktop.patch, 1.1,
	NONE httrack-3.42.93-utf-8.patch, 1.1, NONE
Message-ID: <20090121051557.AEE037012F@cvs1.fedora.phx.redhat.com>

Author: rishi

Update of /cvs/pkgs/rpms/httrack/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10451

Modified Files:
	.cvsignore httrack.spec sources 
Added Files:
	httrack-3.43.2-desktop.patch httrack-3.43.2-openssl.patch 
	httrack-3.43.2-utf-8.patch 
Removed Files:
	httrack-3.42.93-desktop.patch httrack-3.42.93-utf-8.patch 
Log Message:
* Tue Jan 20 2009 Debarshi Ray <rishi at fedoraproject.org> - 3.43.2-1
- Version bump to 3.43.2. Closes Red Hat Bugzilla bug #476110.
- Updated 'Requires: openssl = 0.9.8j' and fixed the sources for Rawhide.


httrack-3.43.2-desktop.patch:

--- NEW FILE httrack-3.43.2-desktop.patch ---
diff -urNp httrack-3.43.2.orig/html/server/div/WebHTTrack.desktop httrack-3.43.2/html/server/div/WebHTTrack.desktop
--- httrack-3.43.2.orig/html/server/div/WebHTTrack.desktop	2008-12-15 02:55:45.065046535 +0530
+++ httrack-3.43.2/html/server/div/WebHTTrack.desktop	2008-12-15 03:00:53.439047073 +0530
@@ -7,4 +7,4 @@ Terminal=false
 Name=WebHTTrack Website Copier
 Comment=Copy websites to your computer
 Exec=webhttrack
-Icon=/usr/share/httrack/icons/webhttrack.xpm
+Icon=webhttrack
diff -urNp httrack-3.43.2.orig/html/server/div/WebHTTrack-Websites.desktop httrack-3.43.2/html/server/div/WebHTTrack-Websites.desktop
--- httrack-3.43.2.orig/html/server/div/WebHTTrack-Websites.desktop	2008-12-15 02:55:45.065046535 +0530
+++ httrack-3.43.2/html/server/div/WebHTTrack-Websites.desktop	2008-12-15 03:01:18.262046434 +0530
@@ -7,4 +7,4 @@ Terminal=false
 Name=Browse Mirrored Websites
 Comment=Browse Websites Mirrored by WebHTTrack
 Exec=webhttrack browse
-Icon=/usr/share/httrack/icons/webhttrack.xpm
+Icon=webhttrack

httrack-3.43.2-openssl.patch:

--- NEW FILE httrack-3.43.2-openssl.patch ---
diff -urNp httrack-3.43.2.orig/src/htsmodules.c httrack-3.43.2/src/htsmodules.c
--- httrack-3.43.2.orig/src/htsmodules.c	2008-12-31 22:41:53.000000000 +0530
+++ httrack-3.43.2/src/htsmodules.c	2009-01-20 22:42:30.000000000 +0530
@@ -263,7 +263,10 @@ void htspe_init(void) {
       handle = LoadLibraryA((char*)"ssleay32");
 #else
       /* We are compatible with 0.9.6/7/8/8b and potentially above */
-      handle = dlopen("libssl.so.0.9.8g", RTLD_LAZY);  /* added 8g release too (Debarshi Ray) */
+      handle = dlopen("libssl.so.0.9.8j", RTLD_LAZY);  /* added 8j release too (Debarshi Ray) */
+      if (handle == NULL) {
+		handle = dlopen("libssl.so.0.9.8g", RTLD_LAZY);
+	  }
       if (handle == NULL) {
 		handle = dlopen("libssl.so.0.9.8b", RTLD_LAZY);
 	  }

httrack-3.43.2-utf-8.patch:

--- NEW FILE httrack-3.43.2-utf-8.patch ---
diff -urNp httrack-3.43.2.orig/html/contact.html httrack-3.43.2/html/contact.html
--- httrack-3.43.2.orig/html/contact.html	2008-12-15 02:55:45.049072368 +0530
+++ httrack-3.43.2/html/contact.html	2008-12-15 03:07:40.608796440 +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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	9 Sep 2008 21:15:36 -0000	1.3
+++ .cvsignore	21 Jan 2009 05:15:27 -0000	1.4
@@ -1 +1 @@
-httrack-3.43-BETA-4.tar.gz
+httrack-3.43-2.tar.gz


Index: httrack.spec
===================================================================
RCS file: /cvs/pkgs/rpms/httrack/devel/httrack.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- httrack.spec	9 Sep 2008 21:15:36 -0000	1.9
+++ httrack.spec	21 Jan 2009 05:15:27 -0000	1.10
@@ -1,7 +1,7 @@
-%if 0%{?fc7}%{?fc8}
-  %define _openssl_version 0.9.8b
-%else
+%if 0%{?fc9}%{?fc10}
   %define _openssl_version 0.9.8g
+%else
+  %define _openssl_version 0.9.8j
 %endif
 
 %if 0%{?fc7}
@@ -11,15 +11,16 @@
 
 Summary:	Website copier and offline browser
 Name:		httrack
-Version:	3.42.93
+Version:	3.43.2
 Release:	1%{?dist}
 License:	GPLv2+
 Group:		Applications/Internet
 URL:		http://www.httrack.com/
-Source0:	http://www.httrack.com/%{name}-3.43-BETA-4.tar.gz
+Source0:	http://www.httrack.com/%{name}-3.43-2.tar.gz
 
 Patch0:		%{name}-%{version}-desktop.patch
 Patch1:		%{name}-%{version}-utf-8.patch
+Patch2:		%{name}-%{version}-openssl.patch
 
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
@@ -51,32 +52,12 @@
 This package contains development files for %{name}.
 
 %prep
-%setup -q -n %{name}-3.42.93
+%setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 # Suppress rpmlint error.
-chmod 644 `find . -name "*.c" -perm /111 -print`
-chmod 644 `find . -name "*.h" -perm /111 -print`
-dos2unix ./AUTHORS
-dos2unix ./README
-dos2unix ./gpl.txt
-dos2unix ./gpl-fr.txt
-dos2unix ./greetings.txt
-dos2unix ./history.txt
-dos2unix ./html/step3.html
-dos2unix ./%{name}-doc.html
-dos2unix ./libtest/*.c
-dos2unix ./libtest/example.h
-dos2unix ./libtest/readme.txt
-dos2unix ./license.txt
-dos2unix ./templates/*.html
-iconv --from-code ISO8859-1 --to-code UTF-8 ./gpl-fr.txt \
-  --output gpl-fr.utf-8 && mv gpl-fr.utf-8 ./gpl-fr.txt
-iconv --from-code ISO8859-1 --to-code UTF-8 ./greetings.txt \
-  --output greetings.utf-8 && mv greetings.utf-8 ./greetings.txt
-iconv --from-code ISO8859-1 --to-code UTF-8 ./history.txt \
-  --output history.utf-8 && mv history.utf-8 ./history.txt
 iconv --from-code ISO8859-1 --to-code UTF-8 ./html/contact.html \
   --output contact.utf-8 && mv contact.utf-8 ./html/contact.html
 
@@ -149,7 +130,10 @@
 %doc README
 %doc gpl.txt
 %doc gpl-fr.txt
+%doc greetings.txt
+%doc history.txt
 %doc html
+%doc license.txt
 %doc %{name}-doc.html
 %doc templates
 %doc %{_mandir}/man1/htsserver.1*
@@ -180,9 +164,13 @@
 %{_includedir}/%{name}/*
 
 %changelog
+* Tue Jan 20 2009 Debarshi Ray <rishi at fedoraproject.org> - 3.43.2-1
+- Version bump to 3.43.2. Closes Red Hat Bugzilla bug #476110.
+- Updated 'Requires: openssl = 0.9.8j' and fixed the sources for Rawhide.
+
 * 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.
+  (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.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/httrack/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	9 Sep 2008 21:15:36 -0000	1.3
+++ sources	21 Jan 2009 05:15:27 -0000	1.4
@@ -1 +1 @@
-fe3fbd3129ac96761bab34a5b1a77aa8  httrack-3.43-BETA-4.tar.gz
+a6debc9fe8b7049e5de986357c7dadd8  httrack-3.43-2.tar.gz


--- httrack-3.42.93-desktop.patch DELETED ---


--- httrack-3.42.93-utf-8.patch DELETED ---



From mtasaka at fedoraproject.org  Wed Jan 21 05:38:26 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Wed, 21 Jan 2009 05:38:26 +0000 (UTC)
Subject: rpms/cairo-dock/devel cairo-dock.spec,1.140,1.141
Message-ID: <20090121053826.B597870141@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/cairo-dock/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13700

Modified Files:
	cairo-dock.spec 
Log Message:
Some comments clean up


Index: cairo-dock.spec
===================================================================
RCS file: /cvs/extras/rpms/cairo-dock/devel/cairo-dock.spec,v
retrieving revision 1.140
retrieving revision 1.141
diff -u -r1.140 -r1.141
--- cairo-dock.spec	21 Jan 2009 05:10:47 -0000	1.140
+++ cairo-dock.spec	21 Jan 2009 05:37:56 -0000	1.141
@@ -1,10 +1,13 @@
+# NOTE!
+# Now for weblet plug-ins now cairo-dock uses WebKit, not Gecko.
+
 # For svn
 # svn checkout http://svn.berlios.de/svnroot/repos/cairo-dock/trunk
 # cd trunk
 # tar cjf ../cairo-dock-sources-%%{tag}.tar.bz2 .
 
 %define		released	0
-# For now build only stable plugin
+# Set the below to 1 when building unstable plug-ins
 %define		build_other	1
 
 %define		mainver		2.0.0
@@ -22,11 +25,10 @@
 %define		fedora_rel	%{fedora_main_rel}%{?betaver:.%betaver}
 %endif
 
-
-# released tarball does not ship weblets
 %if 0%{?released} >= 1
 %define		build_other	0
 %endif
+# Now WebKit plug-in is (will be) included in released tarball
 %if %{build_other} < 1
 %define		build_webkit	1
 %endif
@@ -45,7 +47,9 @@
 %else
 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
+# Some trademarked icons under Cairo-Penguin should be removed
+#Source2:	http://download.berlios.de/cairo-dock/%{name}-plugins-%{mainver}%{?betaver:-%betaver}.tar.bz2
+Source2:	%{name}-plugins-%{mainver}%{?betaver:-%betaver}-modified.tar.bz2
 %endif
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -157,14 +161,12 @@
 %else
 
 ###
-### This changed again....
 %setup -q -c -a 1 -a 2
 %{__ln_s} -f cairo-dock-%{mainver}%{?betaver:-%betaver} cairo-dock
 %{__ln_s} -f cairo-dock-plugins-%{mainver}%{?betaver:-%betaver} plug-ins
 %{__ln_s} -f cairo-dock-themes-%{mainver}%{?betaver:-%betaver} themes
 %endif
 ###
-###
 
 %if 0
 find . -type d -name \.svn | sort -r | xargs %{__rm} -rf
@@ -202,15 +204,6 @@
 # C. plug-ins
 cd ../plug-ins
 
-#
-# Note:
-# * gnome-integration requires gio-2.0.pc, which is in F-9+ glib2-devel
-# * Now for weblet plugin, webkit is used on Fedora
-# * mail plug-ins is GPLv2 only, 
-#   however source codes include "cairo-dock.h", which includes "cairo-dock-log.h",
-#   which is GPLv3+, which makes license conflict.
-#
-
 # permission
 %if 0%{?released} < 1
 %{__chmod} 0644 Applets.stable
@@ -220,7 +213,8 @@
 # source code fix
 
 # Cairo-Penguin
-## The following directories are also removed from the tarball
+## Removing trademarked icons
+## The following directories are (should be) also removed from the tarball
 %{__sed} -i.icon \
 	-e '/The_Simpsons/d' \
 	-e '/Mario/d' \
@@ -241,6 +235,10 @@
 	configure.ac
 
 # mail: license conflict
+# * mail plug-ins is GPLv2 only, 
+#   however source codes include "cairo-dock.h", which includes "cairo-dock-log.h",
+#   which is GPLv3+, which makes license conflict.
+#
 %{__rm} -rf mail/
 %if 0%{?released} < 1
 %{__sed} -i.mail \
@@ -261,6 +259,7 @@
 %{__rm} -rf template/
 
 # weblets
+# Now for weblet plugin, webkit is used on Fedora, not gecko
 cd weblets/
 %{__sed} -i.gettext \
 	-e '/^GETTEXT_PACKAGE/s|@GETTEXT_PACKAGE@|@GETTEXT_WEBLETS@|' \
@@ -355,12 +354,11 @@
 cd ../plug-ins
 
 # First deal with subdirs in topdir configure.ac, then else
+
+# gnome-integration requires gio-2.0.pc, which is in F-9+ glib2-devel
+# (and now we are all F-9+...)
 %configure \
-%if 0%{?fedora} < 9
-	--disable-gnome-integration \
-%else
 	--enable-gio \
-%endif
 	--enable-weblets \
 
 # Parallel make fails some times, but it is gerenally fast



From cebbert at fedoraproject.org  Wed Jan 21 05:47:29 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Wed, 21 Jan 2009 05:47:29 +0000 (UTC)
Subject: rpms/kernel/F-10 kernel.spec, 1.1206.2.2,
	1.1206.2.3 linux-2.6-alsa-backport-beep-switch.patch, 1.1, NONE
	linux-2.6-alsa-hda-remove-broken-headphone-control-for-dell-laptops.patch,
	1.1, NONE
	linux-2.6-alsa-hda-revert-remove-unneeded-hp-nid-references.patch,
	1.1, NONE linux-2.6-alsa-hda-stac-dell-m6-eapd.patch, 1.1,
	NONE linux-2.6-defaults-alsa-hda-beep-off.patch, 1.1,
	NONE linux-2.6.27.7-alsa-driver-fixups.patch, 1.2,
	NONE linux-2.6.27.9-alsa-driver-1.0.18a.patch, 1.1.2.1,
	NONE linux-2.6.27.9-alsa-hda-add-a-quirk-for-dell-studio-15.patch,
	1.1, NONE linux-2.6.27.9-alsa-hda-mark-dell-studio-1535-quirk.patch, 
	1.1, NONE
	linux-2.6.27.9-alsa-hda-no-headphone-as-line-out-swich-without-line-outs.patch,
	1.1, NONE
Message-ID: <20090121054729.7B4977012F@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15365

Modified Files:
      Tag: private-fedora-10-2_6_27
	kernel.spec 
Removed Files:
      Tag: private-fedora-10-2_6_27
	linux-2.6-alsa-backport-beep-switch.patch 
	linux-2.6-alsa-hda-remove-broken-headphone-control-for-dell-laptops.patch 
	linux-2.6-alsa-hda-revert-remove-unneeded-hp-nid-references.patch 
	linux-2.6-alsa-hda-stac-dell-m6-eapd.patch 
	linux-2.6-defaults-alsa-hda-beep-off.patch 
	linux-2.6.27.7-alsa-driver-fixups.patch 
	linux-2.6.27.9-alsa-driver-1.0.18a.patch 
	linux-2.6.27.9-alsa-hda-add-a-quirk-for-dell-studio-15.patch 
	linux-2.6.27.9-alsa-hda-mark-dell-studio-1535-quirk.patch 
	linux-2.6.27.9-alsa-hda-no-headphone-as-line-out-swich-without-line-outs.patch 
Log Message:
Revert ALSA to what is upstream in 2.6.27.


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/kernel.spec,v
retrieving revision 1.1206.2.2
retrieving revision 1.1206.2.3
diff -u -r1.1206.2.2 -r1.1206.2.3
--- kernel.spec	19 Jan 2009 07:35:12 -0000	1.1206.2.2
+++ kernel.spec	21 Jan 2009 05:46:55 -0000	1.1206.2.3
@@ -624,17 +624,6 @@
 
 Patch400: linux-2.6-scsi-cpqarray-set-master.patch
 
-Patch410: linux-2.6.27.9-alsa-driver-1.0.18a.patch
-Patch411: linux-2.6.27.7-alsa-driver-fixups.patch
-Patch412: linux-2.6.27.9-alsa-hda-add-a-quirk-for-dell-studio-15.patch
-Patch413: linux-2.6.27.9-alsa-hda-no-headphone-as-line-out-swich-without-line-outs.patch
-Patch414: linux-2.6.27.9-alsa-hda-mark-dell-studio-1535-quirk.patch
-Patch415: linux-2.6-alsa-backport-beep-switch.patch
-Patch416: linux-2.6-defaults-alsa-hda-beep-off.patch
-Patch417: linux-2.6-alsa-hda-stac-dell-m6-eapd.patch
-Patch418: linux-2.6-alsa-hda-revert-remove-unneeded-hp-nid-references.patch
-Patch419: linux-2.6-alsa-hda-remove-broken-headphone-control-for-dell-laptops.patch
-
 Patch429: linux-2.6-squashfs.patch
 Patch430: linux-2.6-net-silence-noisy-printks.patch
 Patch450: linux-2.6-input-kill-stupid-messages.patch
@@ -1214,16 +1203,6 @@
 ApplyPatch linux-2.6-scsi-cpqarray-set-master.patch
 
 # ALSA
-ApplyPatch linux-2.6.27.9-alsa-driver-1.0.18a.patch
-ApplyPatch linux-2.6.27.7-alsa-driver-fixups.patch
-ApplyPatch linux-2.6.27.9-alsa-hda-add-a-quirk-for-dell-studio-15.patch
-ApplyPatch linux-2.6.27.9-alsa-hda-no-headphone-as-line-out-swich-without-line-outs.patch
-ApplyPatch linux-2.6.27.9-alsa-hda-mark-dell-studio-1535-quirk.patch
-ApplyPatch linux-2.6-alsa-backport-beep-switch.patch
-ApplyPatch linux-2.6-defaults-alsa-hda-beep-off.patch
-ApplyPatch linux-2.6-alsa-hda-stac-dell-m6-eapd.patch
-ApplyPatch linux-2.6-alsa-hda-revert-remove-unneeded-hp-nid-references.patch
-ApplyPatch linux-2.6-alsa-hda-remove-broken-headphone-control-for-dell-laptops.patch
 
 # Filesystem patches.
 # Squashfs
@@ -1925,6 +1904,9 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Tue Jan 20 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.27.12-170.2.3
+- Revert ALSA to what is upstream in 2.6.27.
+
 * Mon Jan 19 2009 Kyle McMartin <kyle at redhat.com>
 - Linux 2.6.27.12
 - linux-2.6-iwlagn-downgrade-BUG_ON-in-interrupt.patch: merged


--- linux-2.6-alsa-backport-beep-switch.patch DELETED ---


--- linux-2.6-alsa-hda-remove-broken-headphone-control-for-dell-laptops.patch DELETED ---


--- linux-2.6-alsa-hda-revert-remove-unneeded-hp-nid-references.patch DELETED ---


--- linux-2.6-alsa-hda-stac-dell-m6-eapd.patch DELETED ---


--- linux-2.6-defaults-alsa-hda-beep-off.patch DELETED ---


--- linux-2.6.27.7-alsa-driver-fixups.patch DELETED ---


--- linux-2.6.27.9-alsa-driver-1.0.18a.patch DELETED ---


--- linux-2.6.27.9-alsa-hda-add-a-quirk-for-dell-studio-15.patch DELETED ---


--- linux-2.6.27.9-alsa-hda-mark-dell-studio-1535-quirk.patch DELETED ---


--- linux-2.6.27.9-alsa-hda-no-headphone-as-line-out-swich-without-line-outs.patch DELETED ---



From cebbert at fedoraproject.org  Wed Jan 21 05:51:41 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Wed, 21 Jan 2009 05:51:41 +0000 (UTC)
Subject: rpms/kernel/F-10
	linux-2.6-net-sctp-avoid-memory-overflow-while-FWD-TSN-chunk-is-r.patch,
	NONE, 1.1.2.2 kernel.spec, 1.1206.2.3, 1.1206.2.4
Message-ID: <20090121055141.AE72C7012F@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15955

Modified Files:
      Tag: private-fedora-10-2_6_27
	kernel.spec 
Added Files:
      Tag: private-fedora-10-2_6_27
	linux-2.6-net-sctp-avoid-memory-overflow-while-FWD-TSN-chunk-is-r.patch 
Log Message:
Fix CVE-2009-0065: SCTP buffer overflow

linux-2.6-net-sctp-avoid-memory-overflow-while-FWD-TSN-chunk-is-r.patch:

--- NEW FILE linux-2.6-net-sctp-avoid-memory-overflow-while-FWD-TSN-chunk-is-r.patch ---
From: Wei Yongjun <yjwei at cn.fujitsu.com>
Date: Fri, 26 Dec 2008 00:58:11 +0000 (-0800)
Subject: sctp: Avoid memory overflow while FWD-TSN chunk is received with bad stream ID
X-Git-Tag: v2.6.29-rc1~581^2~75
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=9fcb95a105758b81ef0131cd18e2db5149f13e95

sctp: Avoid memory overflow while FWD-TSN chunk is received with bad stream ID

If FWD-TSN chunk is received with bad stream ID, the sctp will not do the
validity check, this may cause memory overflow when overwrite the TSN of
the stream ID.

The FORWARD-TSN chunk is like this:

FORWARD-TSN chunk
  Type                       = 192
  Flags                      = 0
  Length                     = 172
  NewTSN                     = 99
  Stream                     = 10000
  StreamSequence             = 0xFFFF

This patch fix this problem by discard the chunk if stream ID is not
less than MIS.

Signed-off-by: Wei Yongjun <yjwei at cn.fujitsu.com>
Signed-off-by: Vlad Yasevich <vladislav.yasevich at hp.com>
Signed-off-by: David S. Miller <davem at davemloft.net>
---

diff --git a/net/sctp/sm_statefuns.c b/net/sctp/sm_statefuns.c
index 9f2a3eb..1c4e5d6 100644
--- a/net/sctp/sm_statefuns.c
+++ b/net/sctp/sm_statefuns.c
@@ -3635,6 +3635,7 @@ sctp_disposition_t sctp_sf_eat_fwd_tsn(const struct sctp_endpoint *ep,
 {
 	struct sctp_chunk *chunk = arg;
 	struct sctp_fwdtsn_hdr *fwdtsn_hdr;
+	struct sctp_fwdtsn_skip *skip;
 	__u16 len;
 	__u32 tsn;
 
@@ -3664,6 +3665,12 @@ sctp_disposition_t sctp_sf_eat_fwd_tsn(const struct sctp_endpoint *ep,
 	if (sctp_tsnmap_check(&asoc->peer.tsn_map, tsn) < 0)
 		goto discard_noforce;
 
+	/* Silently discard the chunk if stream-id is not valid */
+	sctp_walk_fwdtsn(skip, chunk) {
+		if (ntohs(skip->stream) >= asoc->c.sinit_max_instreams)
+			goto discard_noforce;
+	}
+
 	sctp_add_cmd_sf(commands, SCTP_CMD_REPORT_FWDTSN, SCTP_U32(tsn));
 	if (len > sizeof(struct sctp_fwdtsn_hdr))
 		sctp_add_cmd_sf(commands, SCTP_CMD_PROCESS_FWDTSN,
@@ -3695,6 +3702,7 @@ sctp_disposition_t sctp_sf_eat_fwd_tsn_fast(
 {
 	struct sctp_chunk *chunk = arg;
 	struct sctp_fwdtsn_hdr *fwdtsn_hdr;
+	struct sctp_fwdtsn_skip *skip;
 	__u16 len;
 	__u32 tsn;
 
@@ -3724,6 +3732,12 @@ sctp_disposition_t sctp_sf_eat_fwd_tsn_fast(
 	if (sctp_tsnmap_check(&asoc->peer.tsn_map, tsn) < 0)
 		goto gen_shutdown;
 
+	/* Silently discard the chunk if stream-id is not valid */
+	sctp_walk_fwdtsn(skip, chunk) {
+		if (ntohs(skip->stream) >= asoc->c.sinit_max_instreams)
+			goto gen_shutdown;
+	}
+
 	sctp_add_cmd_sf(commands, SCTP_CMD_REPORT_FWDTSN, SCTP_U32(tsn));
 	if (len > sizeof(struct sctp_fwdtsn_hdr))
 		sctp_add_cmd_sf(commands, SCTP_CMD_PROCESS_FWDTSN,


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/kernel.spec,v
retrieving revision 1.1206.2.3
retrieving revision 1.1206.2.4
diff -u -r1.1206.2.3 -r1.1206.2.4
--- kernel.spec	21 Jan 2009 05:46:55 -0000	1.1206.2.3
+++ kernel.spec	21 Jan 2009 05:51:11 -0000	1.1206.2.4
@@ -693,6 +693,9 @@
 
 Patch2031: linux-2.6-net-qla-silence-debug-printks.patch
 
+# CVE-2009-0065 SCTP buffer overflow
+Patch2032: linux-2.6-net-sctp-avoid-memory-overflow-while-FWD-TSN-chunk-is-r.patch
+
 # olpc fixes
 Patch2041: linux-2.6-olpc-touchpad.patch
 Patch2042: linux-2.6-quieter-mmc.patch
@@ -1286,6 +1289,8 @@
 
 ApplyPatch linux-2.6-net-qla-silence-debug-printks.patch
 
+ApplyPatch linux-2.6-net-sctp-avoid-memory-overflow-while-FWD-TSN-chunk-is-r.patch
+
 ApplyPatch linux-2.6-olpc-touchpad.patch
 ApplyPatch linux-2.6-quieter-mmc.patch
 
@@ -1904,6 +1909,9 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Tue Jan 20 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.27.12-170.2.4
+- Fix CVE-2009-0065: SCTP buffer overflow
+
 * Tue Jan 20 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.27.12-170.2.3
 - Revert ALSA to what is upstream in 2.6.27.
 



From cebbert at fedoraproject.org  Wed Jan 21 06:17:13 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Wed, 21 Jan 2009 06:17:13 +0000 (UTC)
Subject: rpms/kernel/F-10 linux-2.6-rtl8187b-tx-status-feedback.patch, NONE, 
	1.1.2.2
	linux-2.6.27-ath5k-ignore-the-return-value-of-ath5k_hw_noise_floor_calibration.patch,
	NONE, 1.1.2.1 kernel.spec, 1.1206.2.4, 1.1206.2.5
Message-ID: <20090121061713.3EA477012F@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19706

Modified Files:
      Tag: private-fedora-10-2_6_27
	kernel.spec 
Added Files:
      Tag: private-fedora-10-2_6_27
	linux-2.6-rtl8187b-tx-status-feedback.patch 
	linux-2.6.27-ath5k-ignore-the-return-value-of-ath5k_hw_noise_floor_calibration.patch 
Log Message:
ath5k: ignore the return value of ath5k_hw_noise_floor_calibration
  (backport to 2.6.27)
rtl8187: feedback transmitted packets using tx close descriptor for 8187B

linux-2.6-rtl8187b-tx-status-feedback.patch:

--- NEW FILE linux-2.6-rtl8187b-tx-status-feedback.patch ---
Back-ported from the following commit:

commit 3517afdefc3ad335b276eb5f8691841f48097abf
Author: Herton Ronaldo Krzesinski <herton at mandriva.com.br>
Date:   Thu Nov 13 10:39:16 2008 -0500

    rtl8187: feedback transmitted packets using tx close descriptor for 8187B
    
    Realtek 8187B has a receive command queue to feedback beacon interrupt
    and transmitted packet status. Use it to feedback mac80211 about status
    of transmitted packets. Unfortunately in the course of testing I found
    that the sequence number reported by hardware includes entire sequence
    control in a 12 bit only field, so a workaround is done to check only
    lowest bits.
    
    Tested-by: Larry Finger <Larry.Finger at lwfinger.net>
    Tested-by: Hin-Tak Leung <htl10 at users.sourceforge.net>
    Signed-off-by: Herton Ronaldo Krzesinski <herton at mandriva.com.br>
    Signed-off-by: John W. Linville <linville at tuxdriver.com>

diff -up linux-2.6.28.noarch/drivers/net/wireless/rtl8187.h.orig linux-2.6.28.noarch/drivers/net/wireless/rtl8187.h
--- linux-2.6.28.noarch/drivers/net/wireless/rtl8187.h.orig	2008-12-24 18:26:37.000000000 -0500
+++ linux-2.6.28.noarch/drivers/net/wireless/rtl8187.h	2009-01-20 11:46:40.000000000 -0500
@@ -112,6 +112,11 @@ struct rtl8187_priv {
 	u8 signal;
 	u8 quality;
 	u8 noise;
+	struct {
+		__le64 buf;
+		struct urb *urb;
+		struct sk_buff_head queue;
+	} b_tx_status;
 };
 
 void rtl8187_write_phy(struct ieee80211_hw *dev, u8 addr, u32 data);
diff -up linux-2.6.28.noarch/drivers/net/wireless/rtl8187_dev.c.orig linux-2.6.28.noarch/drivers/net/wireless/rtl8187_dev.c
--- linux-2.6.28.noarch/drivers/net/wireless/rtl8187_dev.c.orig	2008-12-24 18:26:37.000000000 -0500
+++ linux-2.6.28.noarch/drivers/net/wireless/rtl8187_dev.c	2009-01-20 11:51:33.000000000 -0500
@@ -170,8 +170,27 @@ static void rtl8187_tx_cb(struct urb *ur
 	skb_pull(skb, priv->is_rtl8187b ? sizeof(struct rtl8187b_tx_hdr) :
 					  sizeof(struct rtl8187_tx_hdr));
 	memset(&info->status, 0, sizeof(info->status));
-	info->flags |= IEEE80211_TX_STAT_ACK;
-	ieee80211_tx_status_irqsafe(hw, skb);
+
+	if (!urb->status &&
+	    !(info->flags & IEEE80211_TX_CTL_NO_ACK) &&
+	    priv->is_rtl8187b) {
+		skb_queue_tail(&priv->b_tx_status.queue, skb);
+
+		/* queue is "full", discard last items */
+		while (skb_queue_len(&priv->b_tx_status.queue) > 5) {
+			struct sk_buff *old_skb;
+
+			dev_dbg(&priv->udev->dev,
+				"transmit status queue full\n");
+
+			old_skb = skb_dequeue(&priv->b_tx_status.queue);
+			ieee80211_tx_status_irqsafe(hw, old_skb);
+		}
+	} else {
+		if (!(info->flags & IEEE80211_TX_CTL_NO_ACK) && !urb->status)
+			info->flags |= IEEE80211_TX_STAT_ACK;
+		ieee80211_tx_status_irqsafe(hw, skb);
+	}
 }
 
 static int rtl8187_tx(struct ieee80211_hw *dev, struct sk_buff *skb)
@@ -412,6 +431,111 @@ static int rtl8187_init_urbs(struct ieee
 	return 0;
 }
 
+static void rtl8187b_status_cb(struct urb *urb)
+{
+	struct ieee80211_hw *hw = (struct ieee80211_hw *)urb->context;
+	struct rtl8187_priv *priv = hw->priv;
+	u64 val;
+	unsigned int cmd_type;
+
+	if (unlikely(urb->status)) {
+		usb_free_urb(urb);
+		return;
+	}
+
+	/*
+	 * Read from status buffer:
+	 *
+	 * bits [30:31] = cmd type:
+	 * - 0 indicates tx beacon interrupt
+	 * - 1 indicates tx close descriptor
+	 *
+	 * In the case of tx beacon interrupt:
+	 * [0:9] = Last Beacon CW
+	 * [10:29] = reserved
+	 * [30:31] = 00b
+	 * [32:63] = Last Beacon TSF
+	 *
+	 * If it's tx close descriptor:
+	 * [0:7] = Packet Retry Count
+	 * [8:14] = RTS Retry Count
+	 * [15] = TOK
+	 * [16:27] = Sequence No
+	 * [28] = LS
+	 * [29] = FS
+	 * [30:31] = 01b
+	 * [32:47] = unused (reserved?)
+	 * [48:63] = MAC Used Time
+	 */
+	val = le64_to_cpu(priv->b_tx_status.buf);
+
+	cmd_type = (val >> 30) & 0x3;
+	if (cmd_type == 1) {
+		unsigned int pkt_rc, seq_no;
+		bool tok;
+		struct sk_buff *skb;
+		struct ieee80211_hdr *ieee80211hdr;
+		unsigned long flags;
+
+		pkt_rc = val & 0xFF;
+		tok = val & (1 << 15);
+		seq_no = (val >> 16) & 0xFFF;
+
+		spin_lock_irqsave(&priv->b_tx_status.queue.lock, flags);
+		skb_queue_reverse_walk(&priv->b_tx_status.queue, skb) {
+			ieee80211hdr = (struct ieee80211_hdr *)skb->data;
+
+			/*
+			 * While testing, it was discovered that the seq_no
+			 * doesn't actually contains the sequence number.
+			 * Instead of returning just the 12 bits of sequence
+			 * number, hardware is returning entire sequence control
+			 * (fragment number plus sequence number) in a 12 bit
+			 * only field overflowing after some time. As a
+			 * workaround, just consider the lower bits, and expect
+			 * it's unlikely we wrongly ack some sent data
+			 */
+			if ((le16_to_cpu(ieee80211hdr->seq_ctrl)
+			    & 0xFFF) == seq_no)
+				break;
+		}
+		if (skb != (struct sk_buff *) &priv->b_tx_status.queue) {
+			struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);
+
+			__skb_unlink(skb, &priv->b_tx_status.queue);
+			if (tok)
+				info->flags |= IEEE80211_TX_STAT_ACK;
+                       else
+                               info->status.excessive_retries = 1;
+                       info->status.retry_count = pkt_rc;
+
+			ieee80211_tx_status_irqsafe(hw, skb);
+		}
+		spin_unlock_irqrestore(&priv->b_tx_status.queue.lock, flags);
+	}
+
+	usb_submit_urb(urb, GFP_ATOMIC);
+}
+
+static int rtl8187b_init_status_urb(struct ieee80211_hw *dev)
+{
+	struct rtl8187_priv *priv = dev->priv;
+	struct urb *entry;
+
+	entry = usb_alloc_urb(0, GFP_KERNEL);
+	if (!entry)
+		return -ENOMEM;
+	priv->b_tx_status.urb = entry;
+
+	usb_fill_bulk_urb(entry, priv->udev, usb_rcvbulkpipe(priv->udev, 9),
+			  &priv->b_tx_status.buf, sizeof(priv->b_tx_status.buf),
+			  rtl8187b_status_cb, dev);
+
+	usb_submit_urb(entry, GFP_KERNEL);
+
+	return 0;
+}
+
 static int rtl8187_cmd_reset(struct ieee80211_hw *dev)
 {
 	struct rtl8187_priv *priv = dev->priv;
@@ -757,6 +879,7 @@ static int rtl8187_start(struct ieee8021
 				  (7 << 0  /* long retry limit */) |
 				  (7 << 21 /* MAX TX DMA */));
 		rtl8187_init_urbs(dev);
+		rtl8187b_init_status_urb(dev);
 		mutex_unlock(&priv->conf_mutex);
 		return 0;
 	}
@@ -833,6 +956,9 @@ static void rtl8187_stop(struct ieee8021
 		usb_kill_urb(info->urb);
 		kfree_skb(skb);
 	}
+	while ((skb = skb_dequeue(&priv->b_tx_status.queue)))
+		dev_kfree_skb_any(skb);
+	usb_kill_urb(priv->b_tx_status.urb);
 	mutex_unlock(&priv->conf_mutex);
 }
 
@@ -1211,6 +1337,7 @@ static int __devinit rtl8187_probe(struc
 		goto err_free_dev;
 	}
 	mutex_init(&priv->conf_mutex);
+	skb_queue_head_init(&priv->b_tx_status.queue);
 
 	printk(KERN_INFO "%s: hwaddr %s, %s V%d + %s\n",
 	       wiphy_name(dev->wiphy), print_mac(mac, dev->wiphy->perm_addr),

linux-2.6.27-ath5k-ignore-the-return-value-of-ath5k_hw_noise_floor_calibration.patch:

--- NEW FILE linux-2.6.27-ath5k-ignore-the-return-value-of-ath5k_hw_noise_floor_calibration.patch ---
>From 8b0162a3dc5c30e862b7a73da29e32de3170f5e4 Mon Sep 17 00:00:00 2001
From: Felix Fietkau <nbd at openwrt.org>
Date: Mon, 3 Nov 2008 11:27:38 +0100
Subject: ath5k: ignore the return value of ath5k_hw_noise_floor_calibration

From: Felix Fietkau <nbd at openwrt.org>

commit 8b0162a3dc5c30e862b7a73da29e32de3170f5e4 upstream.

Noise floor calibration occasionally fails on Atheros hardware.
This is not fatal and can happen if there's simply too much
noise on the air. Ignoring the calibration error is the right
thing to do here, because when the error is ignored, the hardware
will still work, whereas if the error causes the driver to bail out
of a bigger configuration function and does not configure the tx
queues or the IMR (as is the case in reset.c), the hw no longer
works properly until the next reset.

Signed-off-by: Felix Fietkau <nbd at openwrt.org>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
Cc: Bob Copeland <me at bobcopeland.com>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>

---
 drivers/net/wireless/ath5k/phy.c   |    4 +---
 drivers/net/wireless/ath5k/reset.c |    4 +---
 2 files changed, 2 insertions(+), 6 deletions(-)

--- a/drivers/net/wireless/ath5k/phy.c
+++ b/drivers/net/wireless/ath5k/phy.c
@@ -2193,9 +2193,7 @@ static int ath5k_hw_rf5110_calibrate(str
 		return ret;
 	}
 
-	ret = ath5k_hw_noise_floor_calibration(ah, channel->center_freq);
-	if (ret)
-		return ret;
+	ath5k_hw_noise_floor_calibration(ah, channel->center_freq);
 
 	/*
 	 * Re-enable RX/TX and beacons
--- a/drivers/net/wireless/ath5k/hw.c
+++ b/drivers/net/wireless/ath5k/hw.c
@@ -1131,9 +1131,7 @@ int ath5k_hw_reset(struct ath5k_hw *ah, 
 	 *
 	 * XXX: Find an interval that's OK for all cards...
 	 */
-	ret = ath5k_hw_noise_floor_calibration(ah, channel->center_freq);
-	if (ret)
-		return ret;
+	ath5k_hw_noise_floor_calibration(ah, channel->center_freq);
 
 	/*
 	 * Reset queues and start beacon timers at the end of the reset routine


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/kernel.spec,v
retrieving revision 1.1206.2.4
retrieving revision 1.1206.2.5
diff -u -r1.1206.2.4 -r1.1206.2.5
--- kernel.spec	21 Jan 2009 05:51:11 -0000	1.1206.2.4
+++ kernel.spec	21 Jan 2009 06:16:42 -0000	1.1206.2.5
@@ -644,7 +644,9 @@
 
 Patch681: linux-2.6-iwl3945-ibss-tsf-fix.patch
 Patch682: linux-2.6-wireless-ath9k-dma-fixes.patch
-Patch690: linux-2.6-at76.patch
+Patch683: linux-2.6-at76.patch
+Patch684: linux-2.6.27-ath5k-ignore-the-return-value-of-ath5k_hw_noise_floor_calibration.patch
+Patch685: linux-2.6-rtl8187b-tx-status-feedback.patch
 
 Patch700: linux-2.6-nfs-client-mounts-hang.patch
 
@@ -1252,6 +1254,11 @@
 # Add misc wireless bits from upstream wireless tree
 ApplyPatch linux-2.6-at76.patch
 
+# ignore calibration so driver will work in noisy areas
+ApplyPatch linux-2.6.27-ath5k-ignore-the-return-value-of-ath5k_hw_noise_floor_calibration.patch
+
+ApplyPatch linux-2.6-rtl8187b-tx-status-feedback.patch
+
 # NFS Client mounts hang when exported directory do not exist
 ApplyPatch linux-2.6-nfs-client-mounts-hang.patch
 
@@ -1909,6 +1916,11 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Tue Jan 20 2009 Chuck Ebbert <cebbert at redhat.com>
+- ath5k: ignore the return value of ath5k_hw_noise_floor_calibration
+  (backport to 2.6.27)
+- rtl8187: feedback transmitted packets using tx close descriptor for 8187B
+
 * Tue Jan 20 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.27.12-170.2.4
 - Fix CVE-2009-0065: SCTP buffer overflow
 



From petersen at fedoraproject.org  Wed Jan 21 06:28:39 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Wed, 21 Jan 2009 06:28:39 +0000 (UTC)
Subject: rpms/darcs/F-10 .cvsignore, 1.12, 1.13 darcs.spec, 1.40,
	1.41 sources, 1.12, 1.13
Message-ID: <20090121062839.7BDE17012F@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/darcs/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21048

Modified Files:
	.cvsignore darcs.spec sources 
Log Message:
backport 2.2.0 from devel branch


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/darcs/F-10/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	11 Nov 2008 08:02:39 -0000	1.12
+++ .cvsignore	21 Jan 2009 06:28:09 -0000	1.13
@@ -1 +1 @@
-darcs-2.1.0.tar.gz
+darcs-2.2.0.tar.gz


Index: darcs.spec
===================================================================
RCS file: /cvs/extras/rpms/darcs/F-10/darcs.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- darcs.spec	11 Nov 2008 08:00:36 -0000	1.40
+++ darcs.spec	21 Jan 2009 06:28:09 -0000	1.41
@@ -1,5 +1,5 @@
 Name:           darcs
-Version:        2.1.0
+Version:        2.2.0
 Release:        1%{?dist}
 Summary:        David's advanced revision control system
 
@@ -68,11 +68,10 @@
 
 
 %prep
-%setup -q -n %{name}-%{version}
+%setup -q
 
 
 %build
-%{__autoconf}
 %configure --libexecdir=%{_localstatedir}/www
 make all
 
@@ -90,7 +89,7 @@
     iconv --from-code ISO8859-1 --to-code UTF-8 --output $textfile $textfile.old
     rm -fv $textfile.old
 done 
-make DESTDIR=$RPM_BUILD_ROOT installbin installserver installdocs
+make DESTDIR=$RPM_BUILD_ROOT install installserver install-html
 
 
 %clean
@@ -123,10 +122,16 @@
 %{_datadir}/darcs
 
 
-
 %changelog
-* Tue Nov 11 2008 Jens Petersen <petersen at redhat.com> - 2.1.0-1
-- update to 2.1.0
+* Fri Jan 16 2009 Jens Petersen <petersen at redhat.com> - 2.2.0-1
+- update to 2.2.0
+- update install targets
+
+* Wed Dec 10 2008 Jens Petersen <petersen at redhat.com> - 2.1.2-1
+- update to 2.1.2
+
+* Tue Nov 11 2008 Jens Petersen <petersen at redhat.com> - 2.1.1-0.1.rc2
+- update to 2.1.1rc2 which builds with ghc-6.10.1
 - try to run all tests again
 
 * Mon Sep 22 2008 Jens Petersen <petersen at redhat.com> - 2.0.2-3


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/darcs/F-10/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	11 Nov 2008 08:02:39 -0000	1.12
+++ sources	21 Jan 2009 06:28:09 -0000	1.13
@@ -1 +1 @@
-81c1400f45391347e3f0df487e779fdd  darcs-2.1.0.tar.gz
+8f0a5eba5971e7cf324c63664cde59e2  darcs-2.2.0.tar.gz



From petersen at fedoraproject.org  Wed Jan 21 07:06:03 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Wed, 21 Jan 2009 07:06:03 +0000 (UTC)
Subject: rpms/darcs/F-9 .cvsignore, 1.9, 1.10 darcs.spec, 1.34, 1.35 sources,
	1.9, 1.10 darcs-error_xml-missing.patch, 1.1,
	NONE darcs-ghc-6_8-compat.patch, 1.1, NONE
Message-ID: <20090121070603.993B17012F@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/darcs/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25862

Modified Files:
	.cvsignore darcs.spec sources 
Removed Files:
	darcs-error_xml-missing.patch darcs-ghc-6_8-compat.patch 
Log Message:
backport latest 2.2.0 release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/darcs/F-9/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	28 Jun 2007 03:23:54 -0000	1.9
+++ .cvsignore	21 Jan 2009 07:05:33 -0000	1.10
@@ -1 +1 @@
-darcs-1.0.9.tar.gz
+darcs-2.2.0.tar.gz


Index: darcs.spec
===================================================================
RCS file: /cvs/extras/rpms/darcs/F-9/darcs.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- darcs.spec	19 Feb 2008 06:16:57 -0000	1.34
+++ darcs.spec	21 Jan 2009 07:05:33 -0000	1.35
@@ -1,6 +1,6 @@
 Name:           darcs
-Version:        1.0.9
-Release:        11%{?dist}
+Version:        2.2.0
+Release:        1%{?dist}
 Summary:        David's advanced revision control system
 
 Group:          Development/Tools
@@ -12,16 +12,12 @@
 BuildRequires:  autoconf, ghc, %{_sbindir}/sendmail, curl-devel, ncurses-devel, zlib-devel
 # for make check
 BuildRequires:  which
-# need chcon
-Requires(post): coreutils
+# for building the manual
+BuildRequires: latex2html
+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
-ExcludeArch:    alpha ppc64 
-
-# allows darcs to be compiled by GHC 6.8
-Patch0:         darcs-ghc-6_8-compat.patch
-Patch1:         darcs-error_xml-missing.patch
+# we have only bootstrapped ghc on the following archs:
+ExclusiveArch:	i386 x86_64 ppc
 
 %description
 Darcs is a revision control system, along the lines of CVS
@@ -34,11 +30,28 @@
 fully functional branch, and 2) underlying darcs is a
 consistent and powerful theory of patches.
 
+%package doc
+Summary: David's advanced revision control system Server
+Group: Documentation
+
+%description doc
+Darcs is a revision control system, along the lines of CVS
+or arch. That means that it keeps track of various revisions
+and branches of your project, allows for changes to
+propagate from one branch to another. Darcs is intended to
+be an ``advanced'' revision control system. Darcs has two
+particularly distinctive features which differ from other
+revision control systems: 1) each copy of the source is a
+fully functional branch, and 2) underlying darcs is a
+consistent and powerful theory of patches.
+
+This package contains the darcs manual.
+
 
 %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
@@ -55,39 +68,28 @@
 
 
 %prep
-%setup -q -n %{name}-%{version}
-%patch0 -p1
-%patch1 -p1
-# skip test currently failing in buildsystem
-mv tests/send.sh{,-disabled}
+%setup -q
 
 
 %build
-# the patch above patches aclocal.m4 and configure.ac 
-# therefore autoconf must be rerun
-%{__autoconf}
 %configure --libexecdir=%{_localstatedir}/www
 make all
 
+
 %check
-make test_unit
-#make check
+make test
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make DESTDIR=$RPM_BUILD_ROOT installbin installserver manual/index.html
-
-cp darcs_completion bash_completion
-rm -r %buildroot%{_sysconfdir}/bash_completion.d
-
 # convert text files to utf-8
-for textfile in zsh_completion_new AUTHORS
+for textfile in tools/zsh_completion_new AUTHORS
 do
-    mv $textfile $textfile.old
+    mv -v $textfile $textfile.old
     iconv --from-code ISO8859-1 --to-code UTF-8 --output $textfile $textfile.old
-    rm -f $textfile.old
+    rm -fv $textfile.old
 done 
+make DESTDIR=$RPM_BUILD_ROOT install installserver install-html
 
 
 %clean
@@ -95,17 +97,23 @@
 
 
 %post
-semanage fcontext -a -t unconfined_execmem_exec_t %{_bindir}/darcs >/dev/null 2>&1 || :
-restorecon -v %{_bindir}/darcs
+semanage fcontext -a -t unconfined_execmem_exec_t %{_bindir}/%{name} >/dev/null 2>&1
+restorecon %{_bindir}/%{name}
 
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING ChangeLog manual bash_completion zsh_completion_*
+%doc AUTHORS COPYING ChangeLog tools/zsh_completion_*
+%config(noreplace) %{_sysconfdir}/bash_completion.d/darcs
 %{_bindir}/darcs
 %{_mandir}/man1/*
 
 
+%files doc
+%defattr(-,root,root,-)
+%{_docdir}/darcs
+
+
 %files server
 %defattr(-,root,root,-)
 %doc COPYING AUTHORS ChangeLog
@@ -115,6 +123,37 @@
 
 
 %changelog
+* Fri Jan 16 2009 Jens Petersen <petersen at redhat.com> - 2.2.0-1
+- update to 2.2.0
+- update install targets
+
+* Wed Dec 10 2008 Jens Petersen <petersen at redhat.com> - 2.1.2-1
+- update to 2.1.2
+
+* Tue Nov 11 2008 Jens Petersen <petersen at redhat.com> - 2.1.1-0.1.rc2
+- update to 2.1.1rc2 which builds with ghc-6.10.1
+- try to run all tests again
+
+* 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)
+
+* 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
+- switch to make test
+- remove skipping of tests - it doesn't appear to apply anymore
+
+* Mon Jun 23 2008 Jens Petersen <petersen at redhat.com> - 2.0.0-1.fc10
+- update to 2.0.0
+- no longer require darcs-ghc-6_8-compat.patch and darcs-error_xml-missing.patch
+- move utf-8 conversion to prep
+- disable check for now
+- manual is now doc and shell completion config lives in tools
+- install bash completion
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1.0.9-11
 - Autorebuild for GCC 4.3
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/darcs/F-9/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	28 Jun 2007 03:23:54 -0000	1.9
+++ sources	21 Jan 2009 07:05:33 -0000	1.10
@@ -1 +1 @@
-07222cd3c500aa31e3332847573a4ab2  darcs-1.0.9.tar.gz
+8f0a5eba5971e7cf324c63664cde59e2  darcs-2.2.0.tar.gz


--- darcs-error_xml-missing.patch DELETED ---


--- darcs-ghc-6_8-compat.patch DELETED ---



From jakub at fedoraproject.org  Wed Jan 21 07:11:09 2009
From: jakub at fedoraproject.org (Jakub Jelinek)
Date: Wed, 21 Jan 2009 07:11:09 +0000 (UTC)
Subject: rpms/gcc/devel .cvsignore, 1.248, 1.249 gcc.spec, 1.9, 1.10 sources,
	1.251, 1.252
Message-ID: <20090121071109.51CBB7012F@cvs1.fedora.phx.redhat.com>

Author: jakub

Update of /cvs/pkgs/rpms/gcc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26799

Modified Files:
	.cvsignore gcc.spec sources 
Log Message:
4.4.0-0.9


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/devel/.cvsignore,v
retrieving revision 1.248
retrieving revision 1.249
diff -u -r1.248 -r1.249
--- .cvsignore	17 Jan 2009 00:44:35 -0000	1.248
+++ .cvsignore	21 Jan 2009 07:10:38 -0000	1.249
@@ -1,3 +1,2 @@
 fastjar-0.97.tar.gz
 gcc-4.4.0-20090115.tar.bz2
-ppc64gnat.tar.bz2


Index: gcc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/devel/gcc.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- gcc.spec	21 Jan 2009 00:38:46 -0000	1.9
+++ gcc.spec	21 Jan 2009 07:10:38 -0000	1.10
@@ -3,7 +3,7 @@
 %define gcc_version 4.4.0
 # 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 0.8
+%define gcc_release 0.9
 %define _unpackaged_files_terminate_build 0
 %define multilib_64_archs sparc64 ppc64 s390x x86_64
 %define include_gappletviewer 1
@@ -50,8 +50,6 @@
 Source3: protoize.1
 %define fastjar_ver 0.97
 Source4: http://download.savannah.nongnu.org/releases/fastjar/fastjar-%{fastjar_ver}.tar.gz
-# Temporary bootstrap stuff.
-Source100: ppc64gnat.tar.bz2
 URL: http://gcc.gnu.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # Need binutils with -pie support >= 2.14.90.0.4-4
@@ -85,11 +83,9 @@
 BuildRequires: /lib/libc.so.6 /usr/lib/libc.so /lib64/libc.so.6 /usr/lib64/libc.so
 %endif
 %if %{build_ada}
-%ifnarch ppc64
 # Ada requires Ada to build
 BuildRequires: gcc-gnat >= 3.1, libgnat >= 3.1
 %endif
-%endif
 %ifarch ia64
 BuildRequires: libunwind >= 0.98
 %endif
@@ -482,15 +478,6 @@
 mkdir obj-%{gcc_target_platform}
 cd obj-%{gcc_target_platform}
 
-%ifarch ppc64
-mkdir gnat_hacks
-cd gnat_hacks
-tar xjf %{SOURCE100}
-sed -i -e 's/gnat\*)/gnat*|*.ad[sb]\\ *|*.ad[sb])/' bin/gcc
-export PATH=`pwd`/bin${PATH:+:$PATH}
-cd ..
-%endif
-
 %if %{build_java}
 %if !%{bootstrap_java}
 # If we don't have gjavah in $PATH, try to build it with the old gij
@@ -544,7 +531,7 @@
 exec /usr/bin/gcc -m64 "$@"
 EOF
   chmod +x gcc64
-#  CC=`pwd`/gcc64
+  CC=`pwd`/gcc64
 fi
 %endif
 OPT_FLAGS=`echo "$OPT_FLAGS" | sed -e 's/[[:blank:]]\+/ /g'`
@@ -1722,6 +1709,9 @@
 %doc rpm.doc/changelogs/libmudflap/ChangeLog*
 
 %changelog
+* Wed Jan 21 2009 Jakub Jelinek <jakub at redhat.com> 4.4.0-0.9
+- rebuilt without ppc64 ada bootstrap hacks
+
 * Tue Jan 20 2009 Jakub Jelinek <jakub at redhat.com> 4.4.0-0.8
 - attempt to enable Ada support on ppc64
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/devel/sources,v
retrieving revision 1.251
retrieving revision 1.252
diff -u -r1.251 -r1.252
--- sources	17 Jan 2009 00:44:35 -0000	1.251
+++ sources	21 Jan 2009 07:10:38 -0000	1.252
@@ -1,3 +1,2 @@
 2659f09c2e43ef8b7d4406321753f1b2  fastjar-0.97.tar.gz
 0fafcb0d23d420c978ab253702094ada  gcc-4.4.0-20090115.tar.bz2
-8ebb9e69b2e356829451316d9af92eee  ppc64gnat.tar.bz2



From petersen at fedoraproject.org  Wed Jan 21 07:14:18 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Wed, 21 Jan 2009 07:14:18 +0000 (UTC)
Subject: rpms/ghc/F-10 .cvsignore, 1.15, 1.16 ghc-rpm-macros.ghc, 1.6,
	1.7 ghc.spec, 1.55, 1.56
Message-ID: <20090121071418.D9FD27012F@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/ghc/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27806

Modified Files:
	.cvsignore ghc-rpm-macros.ghc ghc.spec 
Log Message:
backport ghc-6.10.1 and newest macros.ghc from devel branch


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ghc/F-10/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	13 Oct 2008 08:00:50 -0000	1.15
+++ .cvsignore	21 Jan 2009 07:13:48 -0000	1.16
@@ -1,2 +1,2 @@
-ghc-6.8.3-src-extralibs.tar.bz2
-ghc-6.8.3-src.tar.bz2
+ghc-6.10.1-src.tar.bz2
+ghc-6.10.1-src-extralibs.tar.bz2


Index: ghc-rpm-macros.ghc
===================================================================
RCS file: /cvs/extras/rpms/ghc/F-10/ghc-rpm-macros.ghc,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ghc-rpm-macros.ghc	23 Oct 2008 08:31:20 -0000	1.6
+++ ghc-rpm-macros.ghc	21 Jan 2009 07:13:48 -0000	1.7
@@ -1,60 +1,31 @@
-%cabal %{_bindir}/runhaskell Setup
+%cabal %{_bindir}/runghc Setup
 
 %cabal_configure \
 %cabal configure --prefix=%{_prefix} --libdir=%{_libdir} --docdir=%{_docdir}/%{name}-%{version} --htmldir=%{pkg_docdir} --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} -v \
-%{nil}
+%cabal_install %cabal copy --destdir=${RPM_BUILD_ROOT} -v
 
 %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 \
+echo '%defattr(-,root,root,-)' > %1-prof.files \
+find ${RPM_BUILD_ROOT}%{pkg_libdir} \\( -name '*_p.a' -o -name '*.p_hi' \\) >> %1-prof.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_gen_scripts %cabal register --gen-script ; %cabal unregister --gen-script
 
-%ghc_install_scripts \
-install -m 755 register.sh unregister.sh ${RPM_BUILD_ROOT}%{pkg_libdir} \
-%{nil}
+%ghc_install_scripts install -m 755 register.sh unregister.sh ${RPM_BUILD_ROOT}%{pkg_libdir}
 
-%ghc_preinst_script \
-[ "$1" = 2 ] && %{pkg_libdir}/unregister.sh >&/dev/null || : \
-%{nil}
+%ghc_register_pkg %{pkg_libdir}/register.sh >/dev/null
 
-%ghc_postinst_script \
-%{pkg_libdir}/register.sh >&/dev/null \
-%{nil}
+%ghc_unregister_pkg %{pkg_libdir}/unregister.sh >/dev/null
 
-%ghc_preun_script \
-%{pkg_libdir}/unregister.sh >&/dev/null \
-%{nil}
-
-%ghc_postun_script \
-[ "$1" = 1 ] && %{pkg_libdir}/register.sh >& /dev/null || : \
-%{nil}
-
-%ghc_reindex_haddock \
-( cd %{_docdir}/ghc/libraries && [ -x "./gen_contents_index" ] && ./gen_contents_index ) || : \
-%{nil}
+%ghc_reindex_haddock ( cd %{_docdir}/ghc/libraries && [ -x "./gen_contents_index" ] && ./gen_contents_index ) || :


Index: ghc.spec
===================================================================
RCS file: /cvs/extras/rpms/ghc/F-10/ghc.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- ghc.spec	7 Nov 2008 16:28:18 -0000	1.55
+++ ghc.spec	21 Jan 2009 07:13:48 -0000	1.56
@@ -16,7 +16,7 @@
 
 Name:		ghc
 Version:	6.10.1
-Release:	1%{?dist}
+Release:	7%{?dist}
 Summary:	Glasgow Haskell Compilation system
 # See https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=239713
 ExcludeArch:	alpha ppc64
@@ -31,12 +31,15 @@
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Obsoletes:      ghc682, ghc681, ghc661, ghc66, haddock <= 2.0.0.0
 # introduced for f11 and to be removed for f13:
-Provides:       haddock = 2.2.2
+Provides:       haddock = 2.3.0
 BuildRequires:  ghc, happy, sed
 BuildRequires:  gmp-devel, libedit-devel
+# editline package requires ncurses to configure
+BuildRequires:  ncurses-devel
 %if %{build_doc}
 BuildRequires: libxslt, docbook-style-xsl
 %endif
+Patch1:        ghc-6.10.1-gen_contexts_index.patch
 
 %description
 GHC is a state-of-the-art programming suite for Haskell, a purely
@@ -66,7 +69,7 @@
 Group:		Development/Languages
 Requires:	%{name} = %{version}-%{release}
 # for haddock
-Requires(post): %{name} = %{version}-%{release}
+Requires(posttrans): %{name} = %{version}-%{release}
 
 %description doc
 Preformatted documentation for the Glorious Glasgow Haskell
@@ -78,6 +81,7 @@
 
 %prep
 %setup -q -n %{name}-%{version} -b1
+%patch1 -p1 -b .orig
 
 %build
 # hack for building a local test package quickly from a prebuilt tree 
@@ -124,7 +128,7 @@
 # install rpm macros
 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
@@ -137,7 +141,7 @@
 
 cat rpm-dir.files rpm-lib.files > rpm-base-filelist
 %if %{build_prof}
-cat rpm-dir.files rpm-prof.files > rpm-prof-filelist
+cat rpm-prof.files > rpm-prof-filelist
 %endif
 
 # these are handled as alternatives
@@ -173,11 +177,12 @@
 update-alternatives --install %{_bindir}/hsc2hs hsc2hs \
   %{_bindir}/hsc2hs-ghc 500
 
-%post doc
+# posttrans to make sure any old documentation has been removed first
+%posttrans doc
 ( cd %{_docdir}/ghc/libraries && ./gen_contents_index ) || :
 
 %preun
-if test "$1" = 0; then
+if [ "$1" = 0 ]; then
   update-alternatives --remove runhaskell %{_bindir}/runghc
   update-alternatives --remove hsc2hs     %{_bindir}/hsc2hs-ghc
 fi
@@ -214,7 +219,39 @@
 %endif
 
 %changelog
-* Fri Nov 07 2008 Bryan O'Sullivan <bos at serpentine.com> - 6.10.1-1
+* Mon Jan 19 2009 Jens Petersen <petersen at redhat.com> - 6.10.1-7
+- buildrequire ncurses-devel to fix build of missing editline package needed
+  for ghci line-editing (#478466)
+- move spec templates to a haskell-packaging for easy updating
+- provide correct haddock version
+
+* Mon Dec  1 2008 Jens Petersen <petersen at redhat.com> - 6.10.1-6
+- update macros.ghc to latest proposed revised packaging guidelines:
+  - use runghc
+  - drop trivial cabal_build and cabal_haddock macros
+  - ghc_register_pkg and ghc_unregister_pkg replace ghc_preinst_script,
+    ghc_postinst_script, ghc_preun_script, and ghc_postun_script
+- library templates prof subpackage requires main library again
+- make cabal2spec work on .cabal files too, and
+  read and check name and version directly from .cabal file
+- ghc-prof does not need to own libraries dirs owned by main package
+
+* Tue Nov 25 2008 Jens Petersen <petersen at redhat.com> - 6.10.1-5
+- add cabal2spec and template files for easy cabal hackage packaging
+- simplify script macros: make ghc_preinst_script and ghc_postun_script no-ops
+  and ghc_preun_script only unregister for uninstall
+
+* Tue Nov 11 2008 Jens Petersen <petersen at redhat.com> - 6.10.1-4
+- fix broken urls to haddock docs created by gen_contents_index script
+- avoid haddock errors when upgrading by making doc post script posttrans
+
+* Wed Nov 05 2008 Bryan O'Sullivan <bos at serpentine.com> - 6.10.1-3
+- libraries/prologue.txt should not have been ghosted
+
+* Tue Nov 04 2008 Bryan O'Sullivan <bos at serpentine.com> - 6.10.1-2
+- Fix a minor packaging glitch
+
+* Tue Nov 04 2008 Bryan O'Sullivan <bos at serpentine.com> - 6.10.1-1
 - Update to 6.10.1
 
 * Thu Oct 23 2008 Jens Petersen <petersen at redhat.com> - 6.10.0.20081007-9



From petersen at fedoraproject.org  Wed Jan 21 07:16:46 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Wed, 21 Jan 2009 07:16:46 +0000 (UTC)
Subject: rpms/ghc/F-10 ghc-6.10.1-gen_contexts_index.patch,NONE,1.1
Message-ID: <20090121071646.53C177012F@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/ghc/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28321

Added Files:
	ghc-6.10.1-gen_contexts_index.patch 
Log Message:
 add patch

ghc-6.10.1-gen_contexts_index.patch:

--- NEW FILE ghc-6.10.1-gen_contexts_index.patch ---
diff -u ghc/libraries/gen_contents_index~ ghc/libraries/gen_contents_index
--- ghc-6.10.1/libraries/gen_contents_index~	2008-11-06 11:18:45.000000000 +1000
+++ ghc-6.10.1/libraries/gen_contents_index	2008-11-10 17:53:12.000000000 +1000
@@ -23,7 +23,7 @@
 
 for HADDOCK_FILE in $HADDOCK_FILES
 do
-    NAME=` echo "$HADDOCK_FILE" | sed 's#/dist/.*##' | sed 's#.*/##' `
+    NAME=` echo "$HADDOCK_FILE" | sed 's#/dist/.*##' | sed 's#.*/##' | sed 's#\.haddock##' `
     HADDOCK_ARGS="$HADDOCK_ARGS --read-interface=$NAME,$HADDOCK_FILE"
     NAMES="$NAMES $NAME"
 done



From jnovy at fedoraproject.org  Wed Jan 21 07:25:54 2009
From: jnovy at fedoraproject.org (Jindrich Novy)
Date: Wed, 21 Jan 2009 07:25:54 +0000 (UTC)
Subject: rpms/netpbm/devel netpbm-10.35-pnmtofiasco-stdin.patch, NONE,
	1.1 netpbm.spec, 1.127, 1.128
Message-ID: <20090121072554.C26837012F@cvs1.fedora.phx.redhat.com>

Author: jnovy

Update of /cvs/pkgs/rpms/netpbm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29657

Modified Files:
	netpbm.spec 
Added Files:
	netpbm-10.35-pnmtofiasco-stdin.patch 
Log Message:
* Wed Jan 21 2009 Jindrich Novy <jnovy at redhat.com> 10.35.58-2
- fix pnmtofiasco to accept image from stdin (#476989, #227283)


netpbm-10.35-pnmtofiasco-stdin.patch:

--- NEW FILE netpbm-10.35-pnmtofiasco-stdin.patch ---
diff -up netpbm-10.35.58/converter/other/fiasco/codec/coder.c.pnmtofiasco-stdin netpbm-10.35.58/converter/other/fiasco/codec/coder.c
--- netpbm-10.35.58/converter/other/fiasco/codec/coder.c.pnmtofiasco-stdin	2009-01-19 09:23:57.000000000 +0100
+++ netpbm-10.35.58/converter/other/fiasco/codec/coder.c	2009-01-21 08:03:00.000000000 +0100
@@ -213,15 +213,14 @@ alloc_coder (char const * const *inputna
     */
    {
       char     *filename;
-      int   	width, w = 0, height, h = 0;
+      int   	width, w = 0, height, h = 0, format;
       bool_t	color, c = NO;
+      xelval maxval;
       unsigned 	n;
       
       for (n = 0; (filename = get_input_image_name (inputname, n)); n++)
       {
           FILE *file;
-          xelval maxval;
-          int format;
           if (filename == NULL)
               file = stdin;
           else
@@ -251,6 +250,8 @@ alloc_coder (char const * const *inputna
       wi->width  = w;
       wi->height = h;
       wi->color  = c;
+      wi->format = format;
+      wi->maxval = maxval;
    }
 
    /*
@@ -642,7 +643,18 @@ video_coder (char const * const *image_t
        */
       future_frame   = frame == future_display;
       c->mt->number   = frame;
-      c->mt->original = read_image (image_name);
+      if (strcmp(image_name, "-")) {
+         c->mt->original = read_image (image_name);
+      } else { /* stdin is not seekable - read image contents without rewind */
+	 int width = wfa->wfainfo->width;
+	 int height = wfa->wfainfo->height;
+	 int color = wfa->wfainfo->color;
+	 int format = wfa->wfainfo->format;
+	 xelval maxval = wfa->wfainfo->maxval;
+
+	 c->mt->original = alloc_image(width, height, color, FORMAT_4_4_4);
+	 read_image_data(c->mt->original, stdin, color, width, height, maxval, format);
+      }
       if (c->tiling->exponent && type == I_FRAME) 
 	 perform_tiling (c->mt->original, c->tiling);
 
diff -up netpbm-10.35.58/converter/other/fiasco/codec/wfa.h.pnmtofiasco-stdin netpbm-10.35.58/converter/other/fiasco/codec/wfa.h
--- netpbm-10.35.58/converter/other/fiasco/codec/wfa.h.pnmtofiasco-stdin	2009-01-19 09:23:57.000000000 +0100
+++ netpbm-10.35.58/converter/other/fiasco/codec/wfa.h	2009-01-21 08:03:28.000000000 +0100
@@ -75,6 +75,7 @@ typedef struct range_info
    unsigned level;			/* bintree level of range */
 } range_info_t;
 
+#include "pnm.h"
 #include "image.h"
 #include "rpf.h"
 #include "bit-io.h"
@@ -93,6 +94,8 @@ typedef struct wfa_info
    unsigned  width;			/* image width */
    unsigned  height;			/* image height */
    unsigned  level;			/* image level */
+   unsigned  format;			/* image format */
+   xelval    maxval;			/* image maximal pixel intensity value */
    rpf_t    *rpf;			/* Standard reduced precision format */
    rpf_t    *dc_rpf;			/* DC reduced precision format */
    rpf_t    *d_rpf;			/* Delta reduced precision format */
diff -up netpbm-10.35.58/converter/other/fiasco/lib/image.c.pnmtofiasco-stdin netpbm-10.35.58/converter/other/fiasco/lib/image.c
--- netpbm-10.35.58/converter/other/fiasco/lib/image.c.pnmtofiasco-stdin	2009-01-19 09:23:57.000000000 +0100
+++ netpbm-10.35.58/converter/other/fiasco/lib/image.c	2009-01-21 08:01:53.000000000 +0100
@@ -273,7 +273,7 @@ free_image (image_t *image)
 }
 
 
-static void 
+void 
 read_image_data(image_t * const image, FILE *input, const bool_t color,
                 const int width, const int height, const xelval maxval,
                 const int format) {
diff -up netpbm-10.35.58/converter/other/fiasco/lib/image.h.pnmtofiasco-stdin netpbm-10.35.58/converter/other/fiasco/lib/image.h
--- netpbm-10.35.58/converter/other/fiasco/lib/image.h.pnmtofiasco-stdin	2009-01-19 09:23:57.000000000 +0100
+++ netpbm-10.35.58/converter/other/fiasco/lib/image.h	2009-01-21 08:02:29.000000000 +0100
@@ -17,6 +17,8 @@
 #ifndef _IMAGE_H
 #define _IMAGE_H
 
+#include "pnm.h"
+
 #include <stdio.h>
 #include "types.h"
 #include "fiasco.h"
@@ -51,6 +53,10 @@ read_pnmheader (const char *image_name, 
 image_t *
 read_image (const char *image_name);
 void
+read_image_data(image_t * const image, FILE *input, const bool_t color,
+                const int width, const int height, const xelval maxval,
+                const int format);
+void
 write_image (const char *image_name, const image_t *image);
 bool_t
 same_image_type (const image_t *img1, const image_t *img2);


Index: netpbm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/netpbm/devel/netpbm.spec,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -r1.127 -r1.128
--- netpbm.spec	19 Jan 2009 08:54:39 -0000	1.127
+++ netpbm.spec	21 Jan 2009 07:25:24 -0000	1.128
@@ -1,7 +1,7 @@
 Summary: A library for handling different graphics file formats
 Name: netpbm
 Version: 10.35.58
-Release: 1%{?dist}
+Release: 2%{?dist}
 # See copyright_summary for details
 License: BSD and GPLv2 and IJG and MIT and Public Domain
 Group: System Environment/Libraries
@@ -32,6 +32,7 @@
 Patch20: netpbm-10.35-rgbtxt.patch
 Patch21: netpbm-10.35-pamtosvgsegfault.patch
 Patch22: netpbm-10.35-pnmmontagefix.patch
+Patch23: netpbm-10.35-pnmtofiasco-stdin.patch
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: libjpeg-devel, libpng-devel, libtiff-devel, flex
 BuildRequires: libX11-devel, python, jasper-devel
@@ -94,6 +95,7 @@
 %patch20 -p1 -b .rgbtxt
 %patch21 -p1 -b .pamtosvgsegfault
 %patch22 -p1 -b .pnmmontagefix
+%patch23 -p1 -b .pnmtofiasco-stdin
 
 ##mv shhopt/shhopt.h shhopt/pbmshhopt.h
 ##perl -pi -e 's|shhopt.h|pbmshhopt.h|g' `find -name "*.c" -o -name "*.h"` ./GNUmakefile
@@ -221,6 +223,9 @@
 %{_datadir}/netpbm/
 
 %changelog
+* Wed Jan 21 2009 Jindrich Novy <jnovy at redhat.com> 10.35.58-2
+- fix pnmtofiasco to accept image from stdin (#476989, #227283)
+
 * Mon Jan 19 2009 Jindrich Novy <jnovy at redhat.com> 10.35.58-1
 - update to 10.35.38
 - fixes crashes in picttoppm, pbmtomrf, mrftopbm



From sharkcz at fedoraproject.org  Wed Jan 21 07:55:53 2009
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Wed, 21 Jan 2009 07:55:53 +0000 (UTC)
Subject: rpms/pywebdav/devel pywebdav.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090121075553.E07237012F@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/pywebdav/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1580

Modified Files:
	.cvsignore sources 
Added Files:
	pywebdav.spec 
Log Message:
initital import


--- NEW FILE pywebdav.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

Name:           pywebdav
Version:        0.8
Release:        2%{?dist}
Summary:        WebDAV library

Group:          Development/Languages
License:        LGPLv2+
URL:            http://www.webdav.de/
Source0:        http://pypi.python.org/packages/source/P/PyWebDAV/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  python-devel
Requires:       PyXML

%description
WebDAV library for Python. WebDAV is an extension to the normal HTTP/1.1
protocol allowing the user to upload data, create collections of objects,
store properties for objects, etc.


%prep
%setup -q

# remove the shebang lines
pushd DAV
for f in AuthServer.py BufferingHTTPServer.py INI_Parse.py davcopy.py davmove.py delete.py errors.py propfind.py utils.py
do
    sed -i -e '1d' $f
done
popd

chmod a-x PyDAVServer/server.py


%build
%{__python} setup.py build


%install
rm -rf $RPM_BUILD_ROOT
%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT

 
%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc ARCHITECTURE Changes INSTALL LICENSE README TODO
%doc PyDAVServer
%{python_sitelib}/*


%changelog
* Tue Jan 20 2009 Dan Hor??k <dan[at]danny.cz> 0.8-2
- add PyDAVServer as an example into docs

* Mon Dec 22 2008 Dan Hor??k <dan[at]danny.cz> 0.8-1
- initial Fedora version


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pywebdav/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	20 Jan 2009 21:07:57 -0000	1.1
+++ .cvsignore	21 Jan 2009 07:55:23 -0000	1.2
@@ -0,0 +1 @@
+pywebdav-0.8.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pywebdav/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	20 Jan 2009 21:07:57 -0000	1.1
+++ sources	21 Jan 2009 07:55:23 -0000	1.2
@@ -0,0 +1 @@
+68d46887f9d8b25fb5ce1f2540f0cd4c  pywebdav-0.8.tar.gz



From jskala at fedoraproject.org  Wed Jan 21 07:59:54 2009
From: jskala at fedoraproject.org (Jiri Skala)
Date: Wed, 21 Jan 2009 07:59:54 +0000 (UTC)
Subject: rpms/lftp/devel .cvsignore, 1.36, 1.37 lftp.spec, 1.73, 1.74 sources,
	1.36, 1.37
Message-ID: <20090121075954.688507012F@cvs1.fedora.phx.redhat.com>

Author: jskala

Update of /cvs/extras/rpms/lftp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2167

Modified Files:
	.cvsignore lftp.spec sources 
Log Message:
* Wed Jan 14 2009 Jiri Skala <jskala at redhat.com> - 3.7.7-1
- rebase to latest upstream version
- resolves license conflict GPLv2 -> GPLv3+ due to gnulib



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/lftp/devel/.cvsignore,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- .cvsignore	2 Oct 2008 13:49:50 -0000	1.36
+++ .cvsignore	21 Jan 2009 07:59:23 -0000	1.37
@@ -1,2 +1 @@
-lftp-3.7.1.tar.gz
-lftp-3.7.4.tar.gz
+lftp-3.7.7.tar.gz


Index: lftp.spec
===================================================================
RCS file: /cvs/extras/rpms/lftp/devel/lftp.spec,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- lftp.spec	7 Oct 2008 15:17:24 -0000	1.73
+++ lftp.spec	21 Jan 2009 07:59:23 -0000	1.74
@@ -1,8 +1,8 @@
 Summary:	A sophisticated file transfer program
 Name:		lftp
-Version:	3.7.4
+Version:	3.7.7
 Release:	1%{?dist}
-License:	GPLv2+
+License:	GPLv3+
 Group:		Applications/Internet
 Source0:	ftp://ftp.yar.ru/lftp/lftp-%{version}.tar.gz
 URL:		http://lftp.yar.ru/
@@ -74,6 +74,10 @@
 %{_libdir}/liblftp-tasks.so.*
 
 %changelog
+* Wed Jan 14 2009 Jiri Skala <jskala at redhat.com> - 3.7.7-1
+- rebase to latest upstream version
+- resolves license conflict GPLv2 -> GPLv3+ due to gnulib
+
 * Mon Sep 29 2008 Jiri Skala <jskala at redhat.com> - 3.7.4-1
 - Resolves: #464420 re-base to 3.7.4
 - replaced usage of OpenSSL by GNUTLS due to license conflict


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/lftp/devel/sources,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- sources	2 Oct 2008 13:49:50 -0000	1.36
+++ sources	21 Jan 2009 07:59:24 -0000	1.37
@@ -1 +1 @@
-628381272905a26165d90d3630b07c7c  lftp-3.7.4.tar.gz
+7b7aebf99e862fa4b9dcf892b7b45d82  lftp-3.7.7.tar.gz



From pkgdb at fedoraproject.org  Wed Jan 21 08:10:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 21 Jan 2009 08:10:12 +0000
Subject: [pkgdb] cpphs (Fedora, 10) updated by petersen
Message-ID: <20090121081013.09974208470@bastion.fedora.phx.redhat.com>

petersen approved watchbugzilla on cpphs (Fedora 10) for haskell-sig
petersen approved watchcommits on cpphs (Fedora 10) for haskell-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cpphs



From pkgdb at fedoraproject.org  Wed Jan 21 08:10:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 21 Jan 2009 08:10:12 +0000
Subject: [pkgdb] cpphs (Fedora, devel) updated by petersen
Message-ID: <20090121081013.48096208474@bastion.fedora.phx.redhat.com>

petersen approved watchbugzilla on cpphs (Fedora devel) for haskell-sig
petersen approved watchcommits on cpphs (Fedora devel) for haskell-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cpphs



From pkgdb at fedoraproject.org  Wed Jan 21 08:10:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 21 Jan 2009 08:10:12 +0000
Subject: [pkgdb] cpphs (Fedora, 9) updated by petersen
Message-ID: <20090121081013.5CFA2208477@bastion.fedora.phx.redhat.com>

petersen approved watchbugzilla on cpphs (Fedora 9) for haskell-sig
petersen approved watchcommits on cpphs (Fedora 9) for haskell-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cpphs



From sharkcz at fedoraproject.org  Wed Jan 21 08:18:14 2009
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Wed, 21 Jan 2009 08:18:14 +0000 (UTC)
Subject: rpms/pywebdav/F-10 pywebdav.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090121081814.1B7FD7012F@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/pywebdav/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7029

Modified Files:
	.cvsignore sources 
Added Files:
	pywebdav.spec 
Log Message:
initital import


--- NEW FILE pywebdav.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

Name:           pywebdav
Version:        0.8
Release:        2%{?dist}
Summary:        WebDAV library

Group:          Development/Languages
License:        LGPLv2+
URL:            http://www.webdav.de/
Source0:        http://pypi.python.org/packages/source/P/PyWebDAV/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  python-devel
Requires:       PyXML

%description
WebDAV library for Python. WebDAV is an extension to the normal HTTP/1.1
protocol allowing the user to upload data, create collections of objects,
store properties for objects, etc.


%prep
%setup -q

# remove the shebang lines
pushd DAV
for f in AuthServer.py BufferingHTTPServer.py INI_Parse.py davcopy.py davmove.py delete.py errors.py propfind.py utils.py
do
    sed -i -e '1d' $f
done
popd

chmod a-x PyDAVServer/server.py


%build
%{__python} setup.py build


%install
rm -rf $RPM_BUILD_ROOT
%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT

 
%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc ARCHITECTURE Changes INSTALL LICENSE README TODO
%doc PyDAVServer
%{python_sitelib}/*


%changelog
* Tue Jan 20 2009 Dan Hor??k <dan[at]danny.cz> 0.8-2
- add PyDAVServer as an example into docs

* Mon Dec 22 2008 Dan Hor??k <dan[at]danny.cz> 0.8-1
- initial Fedora version


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pywebdav/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	20 Jan 2009 21:07:57 -0000	1.1
+++ .cvsignore	21 Jan 2009 08:17:43 -0000	1.2
@@ -0,0 +1 @@
+pywebdav-0.8.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pywebdav/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	20 Jan 2009 21:07:57 -0000	1.1
+++ sources	21 Jan 2009 08:17:43 -0000	1.2
@@ -0,0 +1 @@
+68d46887f9d8b25fb5ce1f2540f0cd4c  pywebdav-0.8.tar.gz



From sergiopr at fedoraproject.org  Wed Jan 21 08:19:43 2009
From: sergiopr at fedoraproject.org (Sergio Pascual)
Date: Wed, 21 Jan 2009 08:19:43 +0000 (UTC)
Subject: rpms/tkimg/F-10 tkimg.spec,1.10,1.11
Message-ID: <20090121081943.21FFA7012F@cvs1.fedora.phx.redhat.com>

Author: sergiopr

Update of /cvs/pkgs/rpms/tkimg/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7585

Modified Files:
	tkimg.spec 
Log Message:
* Wed Jan 21 2009 Sergio Pascual <sergiopr at fedoraproject.org>  1.4-0.2.20081115svn
- Reverting patches to fix bz #468357



Index: tkimg.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tkimg/F-10/tkimg.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- tkimg.spec	16 Nov 2008 12:41:13 -0000	1.10
+++ tkimg.spec	21 Jan 2009 08:19:12 -0000	1.11
@@ -5,7 +5,7 @@
 
 Name: tkimg
 Version: 1.4
-Release: 0.1.%{svnversion}svn%{?dist}
+Release: 0.2.%{svnversion}svn%{?dist}
 Summary: More Image Formats for Tk
 
 Group: Development/Libraries
@@ -20,15 +20,11 @@
 Source0: %{name}-%{svnversion}.tar.gz
 # A request to allow building with system libraries has been submitted
 # https://sourceforge.net/tracker/index.php?func=detail&aid=2292032&group_id=52039&atid=465495
-Patch0: tkimg-20081115-syslibs-zlib.patch
-Patch1: tkimg-20081115-syslibs-png.patch
-Patch2: tkimg-20081115-syslibs-tiff.patch
-Patch3: tkimg-20081115-syslibs-jpg.patch
 
 Buildroot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 BuildRequires: tcl-devel tk-devel
-BuildRequires: libtiff-devel libpng-devel libjpeg-devel zlib-devel
+BuildRequires: libtiff-devel libpng-devel libjpeg-devel zlib-devel libXft-devel
 
 Requires: tcl(abi) = 8.5
 
@@ -49,10 +45,6 @@
 
 %prep
 %setup -q -n %{name}-%{svnversion}
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
 
 %build
 %configure --with-tcl=%{tcl_sitearch} --with-tk=%{_libdir} --libdir=%{tcl_sitearch}
@@ -97,6 +89,9 @@
 %{tcl_sitearch}/Img1.4/*.a
 
 %changelog
+* Wed Jan 21 2009 Sergio Pascual <sergiopr at fedoraproject.org>  1.4-0.2.20081115svn
+- Reverting patches to fix bz #468357
+
 * Sat Nov 15 2008 Sergio Pascual <sergiopr at fedoraproject.org>  1.4-0.1.20081115svn
 - New upstream source, version 173 from trunk, release 1.4
 - Relative links in libdir



From sharkcz at fedoraproject.org  Wed Jan 21 08:20:57 2009
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Wed, 21 Jan 2009 08:20:57 +0000 (UTC)
Subject: rpms/pywebdav/F-9 pywebdav.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090121082057.2EC1C7012F@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/pywebdav/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8115

Modified Files:
	.cvsignore sources 
Added Files:
	pywebdav.spec 
Log Message:
initital import


--- NEW FILE pywebdav.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

Name:           pywebdav
Version:        0.8
Release:        2%{?dist}
Summary:        WebDAV library

Group:          Development/Languages
License:        LGPLv2+
URL:            http://www.webdav.de/
Source0:        http://pypi.python.org/packages/source/P/PyWebDAV/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  python-devel
Requires:       PyXML

%description
WebDAV library for Python. WebDAV is an extension to the normal HTTP/1.1
protocol allowing the user to upload data, create collections of objects,
store properties for objects, etc.


%prep
%setup -q

# remove the shebang lines
pushd DAV
for f in AuthServer.py BufferingHTTPServer.py INI_Parse.py davcopy.py davmove.py delete.py errors.py propfind.py utils.py
do
    sed -i -e '1d' $f
done
popd

chmod a-x PyDAVServer/server.py


%build
%{__python} setup.py build


%install
rm -rf $RPM_BUILD_ROOT
%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT

 
%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc ARCHITECTURE Changes INSTALL LICENSE README TODO
%doc PyDAVServer
%{python_sitelib}/*


%changelog
* Tue Jan 20 2009 Dan Hor??k <dan[at]danny.cz> 0.8-2
- add PyDAVServer as an example into docs

* Mon Dec 22 2008 Dan Hor??k <dan[at]danny.cz> 0.8-1
- initial Fedora version


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pywebdav/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	20 Jan 2009 21:07:57 -0000	1.1
+++ .cvsignore	21 Jan 2009 08:20:26 -0000	1.2
@@ -0,0 +1 @@
+pywebdav-0.8.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pywebdav/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	20 Jan 2009 21:07:57 -0000	1.1
+++ sources	21 Jan 2009 08:20:26 -0000	1.2
@@ -0,0 +1 @@
+68d46887f9d8b25fb5ce1f2540f0cd4c  pywebdav-0.8.tar.gz



From sharkcz at fedoraproject.org  Wed Jan 21 08:26:13 2009
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Wed, 21 Jan 2009 08:26:13 +0000 (UTC)
Subject: rpms/pywebdav/EL-5 pywebdav.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090121082613.9DEC47012F@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/pywebdav/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10187

Modified Files:
	.cvsignore sources 
Added Files:
	pywebdav.spec 
Log Message:
initital import


--- NEW FILE pywebdav.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

Name:           pywebdav
Version:        0.8
Release:        2%{?dist}
Summary:        WebDAV library

Group:          Development/Languages
License:        LGPLv2+
URL:            http://www.webdav.de/
Source0:        http://pypi.python.org/packages/source/P/PyWebDAV/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  python-devel
Requires:       PyXML

%description
WebDAV library for Python. WebDAV is an extension to the normal HTTP/1.1
protocol allowing the user to upload data, create collections of objects,
store properties for objects, etc.


%prep
%setup -q

# remove the shebang lines
pushd DAV
for f in AuthServer.py BufferingHTTPServer.py INI_Parse.py davcopy.py davmove.py delete.py errors.py propfind.py utils.py
do
    sed -i -e '1d' $f
done
popd

chmod a-x PyDAVServer/server.py


%build
%{__python} setup.py build


%install
rm -rf $RPM_BUILD_ROOT
%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT

 
%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc ARCHITECTURE Changes INSTALL LICENSE README TODO
%doc PyDAVServer
%{python_sitelib}/*


%changelog
* Tue Jan 20 2009 Dan Hor??k <dan[at]danny.cz> 0.8-2
- add PyDAVServer as an example into docs

* Mon Dec 22 2008 Dan Hor??k <dan[at]danny.cz> 0.8-1
- initial Fedora version


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pywebdav/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	20 Jan 2009 21:07:57 -0000	1.1
+++ .cvsignore	21 Jan 2009 08:25:43 -0000	1.2
@@ -0,0 +1 @@
+pywebdav-0.8.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pywebdav/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	20 Jan 2009 21:07:57 -0000	1.1
+++ sources	21 Jan 2009 08:25:43 -0000	1.2
@@ -0,0 +1 @@
+68d46887f9d8b25fb5ce1f2540f0cd4c  pywebdav-0.8.tar.gz



From jskala at fedoraproject.org  Wed Jan 21 08:58:35 2009
From: jskala at fedoraproject.org (Jiri Skala)
Date: Wed, 21 Jan 2009 08:58:35 +0000 (UTC)
Subject: rpms/lftp/F-10 .cvsignore, 1.36, 1.37 lftp.spec, 1.73, 1.74 sources,
	1.36, 1.37
Message-ID: <20090121085835.4BF3E7012F@cvs1.fedora.phx.redhat.com>

Author: jskala

Update of /cvs/extras/rpms/lftp/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22391

Modified Files:
	.cvsignore lftp.spec sources 
Log Message:
* Wed Jan 21 2009 Jiri Skala <jskala at redhat.com> - 3.7.7-1
- re-base to latest upstream
- fixed license conflict (GPL2 -> GPLv3+) due to new gnulib



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/lftp/F-10/.cvsignore,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- .cvsignore	2 Oct 2008 13:49:50 -0000	1.36
+++ .cvsignore	21 Jan 2009 08:58:04 -0000	1.37
@@ -1,2 +1 @@
-lftp-3.7.1.tar.gz
-lftp-3.7.4.tar.gz
+lftp-3.7.7.tar.gz


Index: lftp.spec
===================================================================
RCS file: /cvs/extras/rpms/lftp/F-10/lftp.spec,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- lftp.spec	7 Oct 2008 15:17:24 -0000	1.73
+++ lftp.spec	21 Jan 2009 08:58:04 -0000	1.74
@@ -1,8 +1,8 @@
 Summary:	A sophisticated file transfer program
 Name:		lftp
-Version:	3.7.4
+Version:	3.7.7
 Release:	1%{?dist}
-License:	GPLv2+
+License:	GPLv3+
 Group:		Applications/Internet
 Source0:	ftp://ftp.yar.ru/lftp/lftp-%{version}.tar.gz
 URL:		http://lftp.yar.ru/
@@ -74,6 +74,10 @@
 %{_libdir}/liblftp-tasks.so.*
 
 %changelog
+* Wed Jan 21 2009 Jiri Skala <jskala at redhat.com> - 3.7.7-1
+- re-base to latest upstream
+- fixed license conflict (GPL2 -> GPLv3+) due to new gnulib
+
 * Mon Sep 29 2008 Jiri Skala <jskala at redhat.com> - 3.7.4-1
 - Resolves: #464420 re-base to 3.7.4
 - replaced usage of OpenSSL by GNUTLS due to license conflict


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/lftp/F-10/sources,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- sources	2 Oct 2008 13:49:50 -0000	1.36
+++ sources	21 Jan 2009 08:58:04 -0000	1.37
@@ -1 +1 @@
-628381272905a26165d90d3630b07c7c  lftp-3.7.4.tar.gz
+7b7aebf99e862fa4b9dcf892b7b45d82  lftp-3.7.7.tar.gz



From mhlavink at fedoraproject.org  Wed Jan 21 09:17:47 2009
From: mhlavink at fedoraproject.org (Michal Hlavinka)
Date: Wed, 21 Jan 2009 09:17:47 +0000 (UTC)
Subject: rpms/ksh/devel ksh.spec,1.43,1.44
Message-ID: <20090121091747.0AF0C7012F@cvs1.fedora.phx.redhat.com>

Author: mhlavink

Update of /cvs/extras/rpms/ksh/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29832

Modified Files:
	ksh.spec 
Log Message:
spec cleanup



Index: ksh.spec
===================================================================
RCS file: /cvs/extras/rpms/ksh/devel/ksh.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- ksh.spec	20 Jan 2009 12:31:42 -0000	1.43
+++ ksh.spec	21 Jan 2009 09:17:16 -0000	1.44
@@ -16,8 +16,6 @@
 Patch1:       ksh-20070328-builtins.patch
 
 BuildRoot:    %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Provides:     ksh93
-Obsoletes:    ksh93
 Conflicts:    pdksh
 Requires: coreutils, glibc-common, diffutils
 BuildRequires: bison
@@ -47,7 +45,6 @@
 mkdir -p $RPM_BUILD_ROOT{/bin,%{_bindir},%{_mandir}/man1}
 install -c -m 755 arch/*/bin/ksh $RPM_BUILD_ROOT/bin/ksh
 install -c -m 644 arch/*/man/man1/sh.1 $RPM_BUILD_ROOT%{_mandir}/man1/ksh.1
-ln -sf ../../bin/ksh $RPM_BUILD_ROOT%{_bindir}/ksh
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/skel
 install -m 644 %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/skel/.kshrc
 install -m 644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/kshrc
@@ -79,7 +76,6 @@
 %defattr(-, root, root,-)
 %doc README LICENSE
 /bin/ksh
-%{_bindir}/ksh
 %{_mandir}/man1/*
 %config(noreplace) %{_sysconfdir}/skel/.kshrc
 %config(noreplace) %{_sysconfdir}/kshrc
@@ -88,7 +84,7 @@
     rm -rf $RPM_BUILD_ROOT
 
 %changelog
-* Tue Jan 20 2009 Michal Hlavinka <mhlavink at redhat.com> 20091104-1
+* Tue Jan 21 2009 Michal Hlavinka <mhlavink at redhat.com> 20091104-1
 - update to 2008-11-04
 - ast-ksh-locales are not useable remove them
 



From sarantis at fedoraproject.org  Wed Jan 21 10:19:28 2009
From: sarantis at fedoraproject.org (Sarantis Paskalis)
Date: Wed, 21 Jan 2009 10:19:28 +0000 (UTC)
Subject: rpms/ctan-cm-lgc-fonts/devel ctan-cm-lgc-fonts.spec, NONE,
	1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090121101929.02C607012F@cvs1.fedora.phx.redhat.com>

Author: sarantis

Update of /cvs/extras/rpms/ctan-cm-lgc-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20826/devel

Modified Files:
	.cvsignore sources 
Added Files:
	ctan-cm-lgc-fonts.spec import.log 
Log Message:
Renaming tetex-font-cm-lgc to ctan-cm-lgc-fonts.



--- NEW FILE ctan-cm-lgc-fonts.spec ---
%define foundryname  ctan
%define fontpkg      cm-lgc
%define fontname     %{foundryname}-%{fontpkg}
%define fontconf     64-%{fontname}
%define ctan_date    20051007
%define texfonts     %{_texmf_main}/fonts
%define texfontpath  public/%{fontpkg}


# Common description
%define common_desc The CM-LGC PostScript Type 1 fonts are converted from the METAFONT \
sources of the Computer Modern font families. CM-LGC supports the T1, T2A, \
LGR, and TS1 encodings, i.e. Latin, Cyrillic, and Greek.


Name:           ctan-cm-lgc-fonts
Version:        0.5
Release:        15%{?dist}
Summary:        CM-LGC Type1 fonts
Group:          Applications/Publishing
# 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
# ftp://tug.ctan.org/pub/tex-archive/fonts/ps-type1/cm-lgc.zip
Source1:        %{fontname}-fontconfig.tar.gz
# Tarball of fontconfig files for each font
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  fontpackages-devel, texlive-texmf
BuildArch:      noarch
%description
%{common_desc} 


%package common
Summary:  CM-LGC Type 1 fonts, common files (documentation???)
Group:    User Interface/X
Requires: fontpackages-filesystem
%description common
%common_desc
This package consists of files used by other ctan-cm-lgc-fonts packages.


%define romanfonts %{fontname}-roman-fonts
%package -n %{romanfonts}
Summary:   CM-LGC Type 1 fonts, serif font faces
Group:     User Interface/X
Requires:  %{name}-common = %{version}-%{release}
%description -n %{romanfonts}
%common_desc
This package contains the CM-LGC serif typeface based on Computer Modern.

%_font_pkg -n roman -f %{fontconf}-roman.conf fcm*


%define sansfonts %{fontname}-sans-fonts
%package -n %{sansfonts}
Summary:   CM-LGC Type 1 fonts, sans-serif font faces
Group:     User Interface/X
Requires:  %{name}-common = %{version}-%{release}
%description -n %{sansfonts}
%common_desc
This package contains the CM-LGC sans-serif typeface based on Computer Modern.

%_font_pkg -n sans -f %{fontconf}-sans.conf fcs*


%define typewriterfonts %{fontname}-typewriter-fonts
%package -n %{typewriterfonts}
Summary:   CM-LGC Type 1 fonts, typewriter font faces
Group:     User Interface/X
Requires:  %{name}-common = %{version}-%{release}
%description -n %{typewriterfonts}
%common_desc
This package contains the CM-LGC serif typeface based on Computer Modern.

%_font_pkg -n typewriter -f %{fontconf}-typewriter.conf fct*


%define texfontpkg tex-cm-lgc
%package -n %{texfontpkg}
Summary:  CM-LGC Type1 fonts, TeX support files
Group:    User Interface/X
Requires: %{romanfonts} = %{version}-%{release}, %{sansfonts} = %{version}-%{release}, %{typewriterfonts} = %{version}-%{release}
Requires: tex(latex)
Provides: tetex-font-cm-lgc = %{version}-%{release}
Obsoletes: tetex-font-cm-lgc < 0.5-12
%description -n %{texfontpkg}
%{common_desc}
TeX support files.


%prep
%setup -q -a1 -n %{fontpkg}


%build


%install
rm -rf %{buildroot}

mkdir -p %{buildroot}%{_texmf_main}/tex/latex/%{fontpkg}
mkdir -p %{buildroot}%{texfonts}/{afm,ofm,ovf,type1,tfm,vf}/%{texfontpath}
mkdir -p %{buildroot}%{texfonts}/{enc,map}/dvips/%{fontpkg}

install -m 644 -p tex/latex/%{fontpkg}/* %{buildroot}%{_texmf_main}/tex/latex/%{fontpkg}/
install -m 644 -p fonts/ofm/%{texfontpath}/* %{buildroot}%{texfonts}/ofm/%{texfontpath}/
install -m 644 -p fonts/ovf/%{texfontpath}/* %{buildroot}%{texfonts}/ovf/%{texfontpath}/
install -m 644 -p fonts/tfm/%{texfontpath}/* %{buildroot}%{texfonts}/tfm/%{texfontpath}/
install -m 644 -p fonts/vf/%{texfontpath}/* %{buildroot}%{texfonts}/vf/%{texfontpath}/
install -m 644 -p dvips/base/* %{buildroot}%{texfonts}/enc/dvips/%{fontpkg}/
install -m 644 -p dvips/config/* %{buildroot}%{texfonts}/map/dvips/%{fontpkg}/

#install .pfb and .afm files in %{_fontdir} as per the fedora font guidelines
install -m 0755 -d %{buildroot}%{_fontdir}
install -m 0644 -p fonts/type1/%{texfontpath}/* %{buildroot}%{_fontdir}
install -m 0644 -p fonts/afm/%{texfontpath}/* %{buildroot}%{_fontdir}

pushd %{buildroot}%{_fontdir}
for pfb_file in *.pfb ;  do
    ln -s %{_fontdir}/$pfb_file %{buildroot}%{texfonts}/type1/%{texfontpath}/$pfb_file
done
for afm_file in *.afm ;  do
    ln -s %{_fontdir}/$afm_file %{buildroot}%{texfonts}/afm/%{texfontpath}/$afm_file
done
popd


# fontconfig stuff (see spectemplate-fonts-multi.spec)
install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} \
                   %{buildroot}%{_fontconfig_confdir}

install -m 0644 -p fontconfig/%{fontname}-roman.conf \
         %{buildroot}%{_fontconfig_templatedir}/%{fontconf}-roman.conf
install -m 0644 -p fontconfig/%{fontname}-sans.conf \
         %{buildroot}%{_fontconfig_templatedir}/%{fontconf}-sans.conf
install -m 0644 -p fontconfig/%{fontname}-typewriter.conf \
         %{buildroot}%{_fontconfig_templatedir}/%{fontconf}-typewriter.conf

for fconf in %{fontconf}-roman.conf \
             %{fontconf}-sans.conf \
             %{fontconf}-typewriter.conf ; do
  ln -s %{_fontconfig_templatedir}/$fconf \
        %{buildroot}%{_fontconfig_confdir}/$fconf
done



%clean
rm -rf %{buildroot}


%post -n %{texfontpkg}
texhash
conffile="$(texconfig-sys conf | grep updmap.cfg)"
if [ "$1" -eq "1" ]; then
    updmap-sys --quiet --nohash --cnffile ${conffile} --enable Map %{fontpkg}.map
fi



%postun -n %{texfontpkg}
conffile="$(texconfig-sys conf | grep updmap.cfg)"
if [ "$1" -eq "0" ]; then
  updmap-sys --quiet --nohash --cnffile ${conffile} --disable %{fontpkg}.map
fi
texhash



%files common
%defattr(0644,root,root,0755)
%doc COPYING HISTORY README
%dir %{_fontdir}


%files -n %{texfontpkg}
%defattr(0644,root,root,0755)
%{_texmf_main}/tex/latex/%{fontpkg}
%{texfonts}/afm/%{texfontpath}
%{texfonts}/ofm/%{texfontpath}
%{texfonts}/ovf/%{texfontpath}
%{texfonts}/tfm/%{texfontpath}
%{texfonts}/type1/%{texfontpath}
%{texfonts}/vf/%{texfontpath}
%{texfonts}/enc/dvips/%{fontpkg}
%{texfonts}/map/dvips/%{fontpkg}



%changelog
* Tue Jan 20 2009 Sarantis Paskalis <paskalis at di.uoa.gr> - 0.5-15
- Address comments in https://bugzilla.redhat.com/show_bug.cgi?id=480589#c2
  (thanks Nicolas Mailhot)
    - Add a buildrequires for texlive-texmf
    - Remove Requires: fontpackages-filesystem from main and add to common
      subpackage.

* Fri Jan 16 2009 Sarantis Paskalis <paskalis at di.uoa.gr> - 0.5-14
- Rename the package to ctan-cm-lgc-fonts
- Name the subpackages according to 
  http://fedoraproject.org/wiki/PackagingDrafts/Font_package_naming_(2009-01-13)
- Update to fontpackages-* >= 1.15

* Tue Jan 13 2009 Sarantis Paskalis <paskalis at di.uoa.gr> - 0.5-13
- Divide font families into subpackages (roman, sans, typewriter)

* Mon Jan 12 2009 Sarantis Paskalis <paskalis at di.uoa.gr> - 0.5-12
- Minor package description enhancement.
- Explicit vr Requires to the subpackage.

* Mon Jan 12 2009 Sarantis Paskalis <paskalis at di.uoa.gr> - 0.5-11
- Restructure spec file according to
  https://fedoraproject.org/wiki/Fonts_SIG_Fedora_11_packaging_changes
  (bug #477461)
- Split package to cm-lgc-fonts (.pfb and .afm) and tetex-font-cm-lgc 
  (TeX stuff)
- Include .afm files (forgotten in the previous versions)

* 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.

* Tue Aug 29 2006 Sarantis Paskalis <paskalis at di.uoa.gr> - 0.5-8
- Bump release for FC6 rebuild.

* Mon Feb 20 2006 Sarantis Paskalis <paskalis at di.uoa.gr> - 0.5-6
- Rebuild for FC5.

* Sun Nov  6 2005 Sarantis Paskalis <paskalis at di.uoa.gr> - 0.5-6
- Use run-time define updmap.cfg (Michal Jaegermann, bug #172491).

* Wed Nov  2 2005 Sarantis Paskalis <paskalis at di.uoa.gr> - 0.5-5
- Use absolute path commands in post and postun.

* Wed Nov  2 2005 Sarantis Paskalis <paskalis at di.uoa.gr> - 0.5-4
- Remove explicit outputdir for updmap-sys (bug #172268)
- Readd texhash in post and postun.

* Fri Oct  7 2005 Sarantis Paskalis <paskalis at di.uoa.gr> - 0.5-3
- Require tetex-fonts.
- Drop cm-lgc-test.tex.
- Use ctan zip soure.
- Other cleanups.

* Wed Jul  6 2005 Sarantis Paskalis <paskalis at di.uoa.gr> - 0.5-2
- Run updmap-sys only when installing, not when updating

* Wed Jun 15 2005 Sarantis Paskalis <paskalis at di.uoa.gr> - 0.5-1
- update to 0.5 (#160464)
- make the package tetex-3 compliant (use updmap-sys instead of updmap,
  update location for .enc and .map files).

* Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
- rebuilt

* Sun Nov 28 2004 Michael Schwendt <mschwendt[AT]users.sf.net>
- Make tarball file name unique.

* Sun Oct 17 2004 Marius L. J??hndal <mariuslj at ifi.uio.no> - 0:0.3.1-1
- Updated to 0.3.1.

* Sat Jun  5 2004 Marius L. J??hndal <mariuslj at ifi.uio.no> - 0:0.3-0.fdr.1
- Updated to 0.3.

* Wed May  5 2004 Marius L. J??hndal <mariuslj at ifi.uio.no> - 0:0.2.1-0.fdr.2
- Removed INSTALL file (bug 997).
- Added cm-lgc-test.tex test document (bug 997).
- Moved preun script to postun (bug 997).
- Split Requires(post,postun) into separate Require statements (bug 997).

* Sun Nov 16 2003 Marius L. J??hndal <mariuslj at ifi.uio.no> - 0:0.2.1-0.fdr.1
- Initial Fedora RPM release.


--- NEW FILE import.log ---
ctan-cm-lgc-fonts-0_5-15_fc11:HEAD:ctan-cm-lgc-fonts-0.5-15.fc11.src.rpm:1232533024


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ctan-cm-lgc-fonts/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	20 Jan 2009 20:59:26 -0000	1.1
+++ .cvsignore	21 Jan 2009 10:18:57 -0000	1.2
@@ -0,0 +1,2 @@
+cm-lgc-20051007.zip
+ctan-cm-lgc-fontconfig.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ctan-cm-lgc-fonts/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	20 Jan 2009 20:59:26 -0000	1.1
+++ sources	21 Jan 2009 10:18:58 -0000	1.2
@@ -0,0 +1,2 @@
+ba8e5a5b5bda6caa9a1c33cd9c3634de  cm-lgc-20051007.zip
+6c6255c274fd300eaa28efa83e160d69  ctan-cm-lgc-fontconfig.tar.gz



From sarantis at fedoraproject.org  Wed Jan 21 10:32:54 2009
From: sarantis at fedoraproject.org (Sarantis Paskalis)
Date: Wed, 21 Jan 2009 10:32:54 +0000 (UTC)
Subject: rpms/mgopen-fonts/devel mgopen-fonts.spec,1.11,1.12
Message-ID: <20090121103254.E5F207012F@cvs1.fedora.phx.redhat.com>

Author: sarantis

Update of /cvs/extras/rpms/mgopen-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25641

Modified Files:
	mgopen-fonts.spec 
Log Message:
- Fix typo in provides: fontpackages-filesystem
- Add provides mgopen-fonts to the -compat subpackage.



Index: mgopen-fonts.spec
===================================================================
RCS file: /cvs/extras/rpms/mgopen-fonts/devel/mgopen-fonts.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- mgopen-fonts.spec	20 Jan 2009 10:55:22 -0000	1.11
+++ mgopen-fonts.spec	21 Jan 2009 10:32:24 -0000	1.12
@@ -19,7 +19,7 @@
 
 Name:      %{fontname}-fonts
 Version:   0.%{upstream_date}
-Release:   11%{?dist}
+Release:   12%{?dist}
 Summary:   Truetype greek fonts
 Group:     User Interface/X
 License:   MgOpen
@@ -41,7 +41,7 @@
 %package common
 Summary:  Truetype greek fonts, common files (documentation???)
 Group:    User Interface/X
-Requires: fontpackages-fileysystem
+Requires: fontpackages-filesystem
 %description common
 %common_desc
 This package consists of files used by other MgOpen packages.
@@ -49,11 +49,12 @@
 
 
 %package compat
-Summary: Truetype greek fonts, compatibility package
+Summary:   Truetype greek fonts, compatibility package
 Group:     User Interface/X
 Obsoletes: mgopen-fonts < 0.20050515-8
-Requires: %{fontname}-canonica-fonts, %{fontname}-cosmetica-fonts,
-Requires: %{fontname}-modata-fonts, %{fontname}-moderna-fonts
+Provides:  mgopen-fonts = %{version}-%{release}
+Requires:  %{fontname}-canonica-fonts, %{fontname}-cosmetica-fonts,
+Requires:  %{fontname}-modata-fonts, %{fontname}-moderna-fonts
 %description compat
 %common_desc
 %compat_desc
@@ -157,6 +158,10 @@
 %files compat
 
 %changelog
+* Wed Jan 21 2009 Sarantis Paskalis <paskalis at di.uoa.gr> - 0.20050515-12
+- Fix typo in provides: fontpackages-filesystem
+- Add provides mgopen-fonts to the -compat subpackage.
+
 * Tue Jan 20 2009 Sarantis Paskalis <paskalis at di.uoa.gr> - 0.20050515-11
 - Fix comments from https://bugzilla.redhat.com/show_bug.cgi?id=477425#c5
   (thanks Nicolas Mailhot)



From sarantis at fedoraproject.org  Wed Jan 21 10:49:28 2009
From: sarantis at fedoraproject.org (Sarantis Paskalis)
Date: Wed, 21 Jan 2009 10:49:28 +0000 (UTC)
Subject: rpms/tetex-font-cm-lgc/devel dead.package, NONE,
	1.1 tetex-font-cm-lgc.spec, 1.15, NONE
Message-ID: <20090121104928.BA7A97012F@cvs1.fedora.phx.redhat.com>

Author: sarantis

Update of /cvs/extras/rpms/tetex-font-cm-lgc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32719

Added Files:
	dead.package 
Removed Files:
	tetex-font-cm-lgc.spec 
Log Message:
tetex-font-cm-lgc renamed to ctan-cm-lgc-fonts




--- NEW FILE dead.package ---
Renamed to ctan-cm-lgc-fonts


--- tetex-font-cm-lgc.spec DELETED ---



From sarantis at fedoraproject.org  Wed Jan 21 10:52:12 2009
From: sarantis at fedoraproject.org (Sarantis Paskalis)
Date: Wed, 21 Jan 2009 10:52:12 +0000 (UTC)
Subject: rpms/tetex-font-cm-lgc/devel .cvsignore,1.4,NONE
Message-ID: <20090121105212.DB06E7012F@cvs1.fedora.phx.redhat.com>

Author: sarantis

Update of /cvs/extras/rpms/tetex-font-cm-lgc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1395

Removed Files:
	.cvsignore 
Log Message:



--- .cvsignore DELETED ---



From sarantis at fedoraproject.org  Wed Jan 21 10:56:51 2009
From: sarantis at fedoraproject.org (Sarantis Paskalis)
Date: Wed, 21 Jan 2009 10:56:51 +0000 (UTC)
Subject: rpms/tetex-font-cm-lgc/devel Makefile,1.2,NONE sources,1.5,NONE
Message-ID: <20090121105651.951847012F@cvs1.fedora.phx.redhat.com>

Author: sarantis

Update of /cvs/extras/rpms/tetex-font-cm-lgc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3242

Removed Files:
	Makefile sources 
Log Message:
Renamed to ctan-cm-lgc-fonts



--- Makefile DELETED ---


--- sources DELETED ---



From sarantis at fedoraproject.org  Wed Jan 21 11:13:40 2009
From: sarantis at fedoraproject.org (Sarantis Paskalis)
Date: Wed, 21 Jan 2009 11:13:40 +0000 (UTC)
Subject: rpms/mgopen-fonts/devel mgopen-fonts.spec,1.12,1.13
Message-ID: <20090121111340.8B17C7012F@cvs1.fedora.phx.redhat.com>

Author: sarantis

Update of /cvs/extras/rpms/mgopen-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9209

Modified Files:
	mgopen-fonts.spec 
Log Message:
Drop provides mgopen-fonts for the -compat subpackage



Index: mgopen-fonts.spec
===================================================================
RCS file: /cvs/extras/rpms/mgopen-fonts/devel/mgopen-fonts.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- mgopen-fonts.spec	21 Jan 2009 10:32:24 -0000	1.12
+++ mgopen-fonts.spec	21 Jan 2009 11:13:08 -0000	1.13
@@ -19,7 +19,7 @@
 
 Name:      %{fontname}-fonts
 Version:   0.%{upstream_date}
-Release:   12%{?dist}
+Release:   13%{?dist}
 Summary:   Truetype greek fonts
 Group:     User Interface/X
 License:   MgOpen
@@ -52,7 +52,6 @@
 Summary:   Truetype greek fonts, compatibility package
 Group:     User Interface/X
 Obsoletes: mgopen-fonts < 0.20050515-8
-Provides:  mgopen-fonts = %{version}-%{release}
 Requires:  %{fontname}-canonica-fonts, %{fontname}-cosmetica-fonts,
 Requires:  %{fontname}-modata-fonts, %{fontname}-moderna-fonts
 %description compat
@@ -158,6 +157,9 @@
 %files compat
 
 %changelog
+* Wed Jan 21 2009 Sarantis Paskalis <paskalis at di.uoa.gr> - 0.20050515-13
+- Drop provides mgopen-fonts for the -compat subpackage.
+
 * Wed Jan 21 2009 Sarantis Paskalis <paskalis at di.uoa.gr> - 0.20050515-12
 - Fix typo in provides: fontpackages-filesystem
 - Add provides mgopen-fonts to the -compat subpackage.



From pkgdb at fedoraproject.org  Wed Jan 21 11:17:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 21 Jan 2009 11:17:13 +0000
Subject: [pkgdb] xen had acl change status
Message-ID: <20090121111714.09EE2208473@bastion.fedora.phx.redhat.com>

berrange has set the watchbugzilla acl on xen (Fedora devel) to Approved for virtmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/xen



From pkgdb at fedoraproject.org  Wed Jan 21 11:17:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 21 Jan 2009 11:17:14 +0000
Subject: [pkgdb] xen had acl change status
Message-ID: <20090121111714.E0D1E208477@bastion.fedora.phx.redhat.com>

berrange has set the watchcommits acl on xen (Fedora devel) to Approved for virtmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/xen



From pkgdb at fedoraproject.org  Wed Jan 21 11:17:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 21 Jan 2009 11:17:16 +0000
Subject: [pkgdb] xen had acl change status
Message-ID: <20090121111716.DE9D920847B@bastion.fedora.phx.redhat.com>

berrange has set the watchbugzilla acl on xen (Fedora 7) to Approved for virtmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/xen



From pkgdb at fedoraproject.org  Wed Jan 21 11:17:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 21 Jan 2009 11:17:18 +0000
Subject: [pkgdb] xen had acl change status
Message-ID: <20090121111718.7BB9F208481@bastion.fedora.phx.redhat.com>

berrange has set the watchcommits acl on xen (Fedora 7) to Approved for virtmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/xen



From pkgdb at fedoraproject.org  Wed Jan 21 11:17:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 21 Jan 2009 11:17:20 +0000
Subject: [pkgdb] xen had acl change status
Message-ID: <20090121111720.D7762208485@bastion.fedora.phx.redhat.com>

berrange has set the watchbugzilla acl on xen (Fedora 8) to Approved for virtmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/xen



From pkgdb at fedoraproject.org  Wed Jan 21 11:17:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 21 Jan 2009 11:17:22 +0000
Subject: [pkgdb] xen had acl change status
Message-ID: <20090121111722.8A5F6208489@bastion.fedora.phx.redhat.com>

berrange has set the watchcommits acl on xen (Fedora 8) to Approved for virtmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/xen



From pkgdb at fedoraproject.org  Wed Jan 21 11:17:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 21 Jan 2009 11:17:24 +0000
Subject: [pkgdb] xen had acl change status
Message-ID: <20090121111725.00DBE20848D@bastion.fedora.phx.redhat.com>

berrange has set the watchbugzilla acl on xen (Fedora 9) to Approved for virtmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/xen



From pkgdb at fedoraproject.org  Wed Jan 21 11:17:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 21 Jan 2009 11:17:26 +0000
Subject: [pkgdb] xen had acl change status
Message-ID: <20090121111726.4C72520848F@bastion.fedora.phx.redhat.com>

berrange has set the watchcommits acl on xen (Fedora 9) to Approved for virtmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/xen



From pkgdb at fedoraproject.org  Wed Jan 21 11:17:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 21 Jan 2009 11:17:32 +0000
Subject: [pkgdb] xen had acl change status
Message-ID: <20090121111732.3BA99208493@bastion.fedora.phx.redhat.com>

berrange has set the watchbugzilla acl on xen (Fedora 10) to Approved for virtmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/xen



From pkgdb at fedoraproject.org  Wed Jan 21 11:17:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 21 Jan 2009 11:17:33 +0000
Subject: [pkgdb] xen had acl change status
Message-ID: <20090121111733.7C6D2208497@bastion.fedora.phx.redhat.com>

berrange has set the watchcommits acl on xen (Fedora 10) to Approved for virtmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/xen



From pkgdb at fedoraproject.org  Wed Jan 21 11:18:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 21 Jan 2009 11:18:04 +0000
Subject: [pkgdb] virt-manager had acl change status
Message-ID: <20090121111805.53672208474@bastion.fedora.phx.redhat.com>

berrange has set the watchbugzilla acl on virt-manager (Fedora devel) to Approved for virtmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/virt-manager



From pkgdb at fedoraproject.org  Wed Jan 21 11:18:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 21 Jan 2009 11:18:06 +0000
Subject: [pkgdb] virt-manager had acl change status
Message-ID: <20090121111806.66C0F20847A@bastion.fedora.phx.redhat.com>

berrange has set the watchcommits acl on virt-manager (Fedora devel) to Approved for virtmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/virt-manager



From pkgdb at fedoraproject.org  Wed Jan 21 11:18:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 21 Jan 2009 11:18:09 +0000
Subject: [pkgdb] virt-manager had acl change status
Message-ID: <20090121111810.1DFB32084B7@bastion.fedora.phx.redhat.com>

berrange has set the watchbugzilla acl on virt-manager (Fedora 7) to Approved for virtmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/virt-manager



From pkgdb at fedoraproject.org  Wed Jan 21 11:18:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 21 Jan 2009 11:18:11 +0000
Subject: [pkgdb] virt-manager had acl change status
Message-ID: <20090121111811.F3E5C208484@bastion.fedora.phx.redhat.com>

berrange has set the watchcommits acl on virt-manager (Fedora 7) to Approved for virtmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/virt-manager



From pkgdb at fedoraproject.org  Wed Jan 21 11:18:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 21 Jan 2009 11:18:12 +0000
Subject: [pkgdb] virt-manager had acl change status
Message-ID: <20090121111812.D550C208678@bastion.fedora.phx.redhat.com>

berrange has set the watchbugzilla acl on virt-manager (Fedora 8) to Approved for virtmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/virt-manager



From pkgdb at fedoraproject.org  Wed Jan 21 11:18:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 21 Jan 2009 11:18:13 +0000
Subject: [pkgdb] virt-manager had acl change status
Message-ID: <20090121111814.0CC15208701@bastion.fedora.phx.redhat.com>

berrange has set the watchcommits acl on virt-manager (Fedora 8) to Approved for virtmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/virt-manager



From pkgdb at fedoraproject.org  Wed Jan 21 11:18:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 21 Jan 2009 11:18:19 +0000
Subject: [pkgdb] virt-manager had acl change status
Message-ID: <20090121111819.93304208771@bastion.fedora.phx.redhat.com>

berrange has set the watchbugzilla acl on virt-manager (Fedora 9) to Approved for virtmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/virt-manager



From pkgdb at fedoraproject.org  Wed Jan 21 11:18:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 21 Jan 2009 11:18:20 +0000
Subject: [pkgdb] virt-manager had acl change status
Message-ID: <20090121111820.F0693208977@bastion.fedora.phx.redhat.com>

berrange has set the watchcommits acl on virt-manager (Fedora 9) to Approved for virtmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/virt-manager



From pkgdb at fedoraproject.org  Wed Jan 21 11:18:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 21 Jan 2009 11:18:24 +0000
Subject: [pkgdb] virt-manager had acl change status
Message-ID: <20090121111824.64799208487@bastion.fedora.phx.redhat.com>

berrange has set the watchcommits acl on virt-manager (Fedora 10) to Approved for virtmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/virt-manager



From pkgdb at fedoraproject.org  Wed Jan 21 11:18:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 21 Jan 2009 11:18:24 +0000
Subject: [pkgdb] virt-manager had acl change status
Message-ID: <20090121111824.D75A2208D1F@bastion.fedora.phx.redhat.com>

berrange has set the watchbugzilla acl on virt-manager (Fedora 10) to Approved for virtmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/virt-manager



From pkgdb at fedoraproject.org  Wed Jan 21 11:18:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 21 Jan 2009 11:18:53 +0000
Subject: [pkgdb] virt-viewer had acl change status
Message-ID: <20090121111853.E05F6208491@bastion.fedora.phx.redhat.com>

berrange has set the watchcommits acl on virt-viewer (Fedora devel) to Approved for virtmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/virt-viewer



From pkgdb at fedoraproject.org  Wed Jan 21 11:18:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 21 Jan 2009 11:18:55 +0000
Subject: [pkgdb] virt-viewer had acl change status
Message-ID: <20090121111855.84844208DDF@bastion.fedora.phx.redhat.com>

berrange has set the commit acl on virt-viewer (Fedora devel) to Approved for quintela

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/virt-viewer



From pkgdb at fedoraproject.org  Wed Jan 21 11:18:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 21 Jan 2009 11:18:57 +0000
Subject: [pkgdb] virt-viewer had acl change status
Message-ID: <20090121111858.299A2208497@bastion.fedora.phx.redhat.com>

berrange has set the watchbugzilla acl on virt-viewer (Fedora devel) to Approved for virtmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/virt-viewer



From pkgdb at fedoraproject.org  Wed Jan 21 11:19:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 21 Jan 2009 11:19:01 +0000
Subject: [pkgdb] virt-viewer had acl change status
Message-ID: <20090121111901.8C8BE208DE5@bastion.fedora.phx.redhat.com>

berrange has set the watchbugzilla acl on virt-viewer (Fedora 7) to Approved for virtmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/virt-viewer



From pkgdb at fedoraproject.org  Wed Jan 21 11:19:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 21 Jan 2009 11:19:03 +0000
Subject: [pkgdb] virt-viewer had acl change status
Message-ID: <20090121111903.61C9E208DE9@bastion.fedora.phx.redhat.com>

berrange has set the watchcommits acl on virt-viewer (Fedora 7) to Approved for virtmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/virt-viewer



From pkgdb at fedoraproject.org  Wed Jan 21 11:19:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 21 Jan 2009 11:19:04 +0000
Subject: [pkgdb] virt-viewer had acl change status
Message-ID: <20090121111904.C775F208DEC@bastion.fedora.phx.redhat.com>

berrange has set the watchbugzilla acl on virt-viewer (Fedora 8) to Approved for virtmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/virt-viewer



From pkgdb at fedoraproject.org  Wed Jan 21 11:19:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 21 Jan 2009 11:19:06 +0000
Subject: [pkgdb] virt-viewer had acl change status
Message-ID: <20090121111906.86B25208DEE@bastion.fedora.phx.redhat.com>

berrange has set the watchcommits acl on virt-viewer (Fedora 8) to Approved for virtmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/virt-viewer



From pkgdb at fedoraproject.org  Wed Jan 21 11:19:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 21 Jan 2009 11:19:11 +0000
Subject: [pkgdb] virt-viewer had acl change status
Message-ID: <20090121111911.9B768208DEF@bastion.fedora.phx.redhat.com>

berrange has set the commit acl on virt-viewer (Fedora 9) to Approved for quintela

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/virt-viewer



From pkgdb at fedoraproject.org  Wed Jan 21 11:19:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 21 Jan 2009 11:19:12 +0000
Subject: [pkgdb] virt-viewer had acl change status
Message-ID: <20090121111913.134F4208DF3@bastion.fedora.phx.redhat.com>

berrange has set the watchcommits acl on virt-viewer (Fedora 9) to Approved for virtmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/virt-viewer



From pkgdb at fedoraproject.org  Wed Jan 21 11:19:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 21 Jan 2009 11:19:13 +0000
Subject: [pkgdb] virt-viewer had acl change status
Message-ID: <20090121111913.89DD3208DF6@bastion.fedora.phx.redhat.com>

berrange has set the watchbugzilla acl on virt-viewer (Fedora 9) to Approved for virtmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/virt-viewer



From pkgdb at fedoraproject.org  Wed Jan 21 11:19:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 21 Jan 2009 11:19:14 +0000
Subject: [pkgdb] virt-viewer had acl change status
Message-ID: <20090121111914.F282A208DFA@bastion.fedora.phx.redhat.com>

berrange has set the watchbugzilla acl on virt-viewer (Fedora 10) to Approved for virtmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/virt-viewer



From pkgdb at fedoraproject.org  Wed Jan 21 11:19:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 21 Jan 2009 11:19:20 +0000
Subject: [pkgdb] virt-viewer had acl change status
Message-ID: <20090121111920.B6D0C208DFB@bastion.fedora.phx.redhat.com>

berrange has set the commit acl on virt-viewer (Fedora 10) to Approved for quintela

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/virt-viewer



From pkgdb at fedoraproject.org  Wed Jan 21 11:19:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 21 Jan 2009 11:19:18 +0000
Subject: [pkgdb] virt-viewer had acl change status
Message-ID: <20090121111919.B6633208478@bastion.fedora.phx.redhat.com>

berrange has set the watchcommits acl on virt-viewer (Fedora 10) to Approved for virtmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/virt-viewer



From pkgdb at fedoraproject.org  Wed Jan 21 11:19:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 21 Jan 2009 11:19:37 +0000
Subject: [pkgdb] python-virtinst had acl change status
Message-ID: <20090121111937.40EBC208DFE@bastion.fedora.phx.redhat.com>

berrange has set the watchbugzilla acl on python-virtinst (Fedora devel) to Approved for virtmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-virtinst



From pkgdb at fedoraproject.org  Wed Jan 21 11:19:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 21 Jan 2009 11:19:37 +0000
Subject: [pkgdb] python-virtinst had acl change status
Message-ID: <20090121111938.6B078208E02@bastion.fedora.phx.redhat.com>

berrange has set the watchcommits acl on python-virtinst (Fedora devel) to Approved for virtmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-virtinst



From pkgdb at fedoraproject.org  Wed Jan 21 11:19:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 21 Jan 2009 11:19:39 +0000
Subject: [pkgdb] python-virtinst had acl change status
Message-ID: <20090121111939.DD4EB2084B7@bastion.fedora.phx.redhat.com>

berrange has set the commit acl on python-virtinst (Fedora devel) to Approved for quintela

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-virtinst



From pkgdb at fedoraproject.org  Wed Jan 21 11:19:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 21 Jan 2009 11:19:46 +0000
Subject: [pkgdb] python-virtinst had acl change status
Message-ID: <20090121111946.76980208E07@bastion.fedora.phx.redhat.com>

berrange has set the watchbugzilla acl on python-virtinst (Fedora 7) to Approved for virtmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-virtinst



From pkgdb at fedoraproject.org  Wed Jan 21 11:19:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 21 Jan 2009 11:19:47 +0000
Subject: [pkgdb] python-virtinst had acl change status
Message-ID: <20090121111947.8426D208E0B@bastion.fedora.phx.redhat.com>

berrange has set the watchcommits acl on python-virtinst (Fedora 7) to Approved for virtmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-virtinst



From pkgdb at fedoraproject.org  Wed Jan 21 11:19:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 21 Jan 2009 11:19:50 +0000
Subject: [pkgdb] python-virtinst had acl change status
Message-ID: <20090121111950.4A00A208E0F@bastion.fedora.phx.redhat.com>

berrange has set the watchcommits acl on python-virtinst (Fedora 8) to Approved for virtmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-virtinst



From pkgdb at fedoraproject.org  Wed Jan 21 11:19:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 21 Jan 2009 11:19:53 +0000
Subject: [pkgdb] python-virtinst had acl change status
Message-ID: <20090121111953.C69EA2084BD@bastion.fedora.phx.redhat.com>

berrange has set the watchbugzilla acl on python-virtinst (Fedora 9) to Approved for virtmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-virtinst



From pkgdb at fedoraproject.org  Wed Jan 21 11:19:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 21 Jan 2009 11:19:55 +0000
Subject: [pkgdb] python-virtinst had acl change status
Message-ID: <20090121111955.8D5E8208E13@bastion.fedora.phx.redhat.com>

berrange has set the watchcommits acl on python-virtinst (Fedora 9) to Approved for virtmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-virtinst



From pkgdb at fedoraproject.org  Wed Jan 21 11:19:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 21 Jan 2009 11:19:56 +0000
Subject: [pkgdb] python-virtinst had acl change status
Message-ID: <20090121111956.B3636208E17@bastion.fedora.phx.redhat.com>

berrange has set the commit acl on python-virtinst (Fedora 9) to Approved for quintela

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-virtinst



From pkgdb at fedoraproject.org  Wed Jan 21 11:19:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 21 Jan 2009 11:19:58 +0000
Subject: [pkgdb] python-virtinst had acl change status
Message-ID: <20090121111958.7024D208E1C@bastion.fedora.phx.redhat.com>

berrange has set the watchbugzilla acl on python-virtinst (Fedora 8) to Approved for virtmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-virtinst



From pkgdb at fedoraproject.org  Wed Jan 21 11:20:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 21 Jan 2009 11:20:01 +0000
Subject: [pkgdb] python-virtinst had acl change status
Message-ID: <20090121112001.D5FA6208E20@bastion.fedora.phx.redhat.com>

berrange has set the commit acl on python-virtinst (Fedora 10) to Approved for quintela

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-virtinst



From pkgdb at fedoraproject.org  Wed Jan 21 11:20:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 21 Jan 2009 11:20:04 +0000
Subject: [pkgdb] python-virtinst had acl change status
Message-ID: <20090121112004.6B1EA208E22@bastion.fedora.phx.redhat.com>

berrange has set the watchcommits acl on python-virtinst (Fedora 10) to Approved for virtmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-virtinst



From pkgdb at fedoraproject.org  Wed Jan 21 11:20:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 21 Jan 2009 11:20:04 +0000
Subject: [pkgdb] python-virtinst had acl change status
Message-ID: <20090121112004.DF7D2208E26@bastion.fedora.phx.redhat.com>

berrange has set the watchbugzilla acl on python-virtinst (Fedora 10) to Approved for virtmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-virtinst



From pkgdb at fedoraproject.org  Wed Jan 21 11:31:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 21 Jan 2009 11:31:39 +0000
Subject: [pkgdb] mldonkey: ocamlmaint has requested watchbugzilla
Message-ID: <20090121113140.3E197208475@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchbugzilla acl on mldonkey (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mldonkey



From pkgdb at fedoraproject.org  Wed Jan 21 11:31:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 21 Jan 2009 11:31:40 +0000
Subject: [pkgdb] mldonkey: ocamlmaint has requested watchcommits
Message-ID: <20090121113141.BF6E8208479@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchcommits acl on mldonkey (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mldonkey



From pkgdb at fedoraproject.org  Wed Jan 21 11:31:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 21 Jan 2009 11:31:42 +0000
Subject: [pkgdb] mldonkey: ocamlmaint has requested watchbugzilla
Message-ID: <20090121113142.96EF020847E@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchbugzilla acl on mldonkey (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mldonkey



From pkgdb at fedoraproject.org  Wed Jan 21 11:31:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 21 Jan 2009 11:31:44 +0000
Subject: [pkgdb] mldonkey: ocamlmaint has requested watchcommits
Message-ID: <20090121113145.04DC4208481@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchcommits acl on mldonkey (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mldonkey



From pkgdb at fedoraproject.org  Wed Jan 21 11:31:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 21 Jan 2009 11:31:45 +0000
Subject: [pkgdb] mldonkey: ocamlmaint has requested watchbugzilla
Message-ID: <20090121113145.E4B18208485@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchbugzilla acl on mldonkey (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mldonkey



From pkgdb at fedoraproject.org  Wed Jan 21 11:31:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 21 Jan 2009 11:31:49 +0000
Subject: [pkgdb] mldonkey: ocamlmaint has requested watchbugzilla
Message-ID: <20090121113149.1F0A1208488@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchbugzilla acl on mldonkey (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mldonkey



From pkgdb at fedoraproject.org  Wed Jan 21 11:31:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 21 Jan 2009 11:31:50 +0000
Subject: [pkgdb] mldonkey: ocamlmaint has requested watchcommits
Message-ID: <20090121113151.615B820848D@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchcommits acl on mldonkey (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mldonkey



From pkgdb at fedoraproject.org  Wed Jan 21 11:31:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 21 Jan 2009 11:31:51 +0000
Subject: [pkgdb] mldonkey: ocamlmaint has requested watchcommits
Message-ID: <20090121113152.149D4208490@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchcommits acl on mldonkey (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mldonkey



From pkgdb at fedoraproject.org  Wed Jan 21 11:31:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 21 Jan 2009 11:31:52 +0000
Subject: [pkgdb] mldonkey: ocamlmaint has requested watchcommits
Message-ID: <20090121113153.5D3F2208494@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchcommits acl on mldonkey (Fedora EPEL 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mldonkey



From pkgdb at fedoraproject.org  Wed Jan 21 11:31:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 21 Jan 2009 11:31:58 +0000
Subject: [pkgdb] mldonkey: ocamlmaint has requested watchbugzilla
Message-ID: <20090121113159.459F7208497@bastion.fedora.phx.redhat.com>

ocamlmaint has requested the watchbugzilla acl on mldonkey (Fedora EPEL 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mldonkey



From pkgdb at fedoraproject.org  Wed Jan 21 11:32:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 21 Jan 2009 11:32:18 +0000
Subject: [pkgdb] mldonkey had acl change status
Message-ID: <20090121113218.863F420847B@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on mldonkey (Fedora devel) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mldonkey



From pkgdb at fedoraproject.org  Wed Jan 21 11:32:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 21 Jan 2009 11:32:19 +0000
Subject: [pkgdb] mldonkey had acl change status
Message-ID: <20090121113219.83DE62084B6@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on mldonkey (Fedora devel) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mldonkey



From pkgdb at fedoraproject.org  Wed Jan 21 11:32:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 21 Jan 2009 11:32:20 +0000
Subject: [pkgdb] mldonkey had acl change status
Message-ID: <20090121113221.E6C27208467@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on mldonkey (Fedora 10) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mldonkey



From pkgdb at fedoraproject.org  Wed Jan 21 11:32:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 21 Jan 2009 11:32:22 +0000
Subject: [pkgdb] mldonkey had acl change status
Message-ID: <20090121113222.F17CB208678@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on mldonkey (Fedora 10) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mldonkey



From pkgdb at fedoraproject.org  Wed Jan 21 11:32:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 21 Jan 2009 11:32:23 +0000
Subject: [pkgdb] mldonkey had acl change status
Message-ID: <20090121113223.9E49F208700@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on mldonkey (Fedora 9) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mldonkey



From pkgdb at fedoraproject.org  Wed Jan 21 11:32:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 21 Jan 2009 11:32:23 +0000
Subject: [pkgdb] mldonkey had acl change status
Message-ID: <20090121113223.F11B020873D@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on mldonkey (Fedora 9) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mldonkey



From pkgdb at fedoraproject.org  Wed Jan 21 11:32:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 21 Jan 2009 11:32:26 +0000
Subject: [pkgdb] mldonkey had acl change status
Message-ID: <20090121113227.3530A20874B@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on mldonkey (Fedora EPEL 5) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mldonkey



From pkgdb at fedoraproject.org  Wed Jan 21 11:32:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 21 Jan 2009 11:32:26 +0000
Subject: [pkgdb] mldonkey had acl change status
Message-ID: <20090121113227.7645720876B@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on mldonkey (Fedora EPEL 5) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mldonkey



From pkgdb at fedoraproject.org  Wed Jan 21 11:32:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 21 Jan 2009 11:32:29 +0000
Subject: [pkgdb] mldonkey had acl change status
Message-ID: <20090121113229.8A49E208974@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on mldonkey (Fedora EPEL 4) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mldonkey



From pkgdb at fedoraproject.org  Wed Jan 21 11:32:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 21 Jan 2009 11:32:29 +0000
Subject: [pkgdb] mldonkey had acl change status
Message-ID: <20090121113229.91E9E20897A@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on mldonkey (Fedora EPEL 4) to Approved for ocamlmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mldonkey



From harald at fedoraproject.org  Wed Jan 21 11:47:32 2009
From: harald at fedoraproject.org (Harald Hoyer)
Date: Wed, 21 Jan 2009 11:47:32 +0000 (UTC)
Subject: rpms/udev-extras/devel udev-extras.spec, NONE, 1.1 .cvsignore, 1.1, 
	1.2 sources, 1.1, 1.2
Message-ID: <20090121114732.F2E177012F@cvs1.fedora.phx.redhat.com>

Author: harald

Update of /cvs/pkgs/rpms/udev-extras/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22545

Modified Files:
	.cvsignore sources 
Added Files:
	udev-extras.spec 
Log Message:
* Tue Jan 20 2009 Harald Hoyer <harald at redhat.com> 20081230-0.2.20090120git
- added BuildRequires
- README and ChangeLog left out for now (zero size)
- fixed License

* Tue Jan 20 2009 Harald Hoyer <harald at redhat.com> 20081230-0.1.20090120git
- initial version




--- NEW FILE udev-extras.spec ---
%define udev_scriptdir /lib/udev

Summary: Extra rules and tools for udev
Name: udev-extras
Version: 20081230
Release: 0.2.20090120git%{?dist}
# Source from http://git.kernel.org/?p=linux/hotplug/udev-extras.git
Source: udev-extras-20081230-git20090120.tar.bz2
License: GPLv2 and GPLv2+
Group: System Environment/Base

ExclusiveOS: Linux
URL: http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: udev >= 135
BuildRequires: glib2-devel
BuildRequires: libusb-devel
BuildRequires: libxslt

%description
The udev-extras package contains an additional rules and tools
to create and identify devices.

%prep
%setup -q  

%build
%configure --with-selinux  --prefix=%{_prefix} --exec-prefix="" --sysconfdir=%{_sysconfdir} --with-libdir-name=%{_lib}  --sbindir="/sbin" 
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT

make install DESTDIR=$RPM_BUILD_ROOT

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(0644, root, root, 0755)
%doc COPYING TODO 
#%doc README ChangeLog
%attr(0755,root,root) %{udev_scriptdir}/modem-modeswitch
%attr(0755,root,root) %{udev_scriptdir}/probe-modem
%attr(0755,root,root) %{udev_scriptdir}/usbdev_id
%attr(0644,root,root) %{udev_scriptdir}/rules.d/*.rules
%attr(0644,root,root) %{_mandir}/man8/modem-modeswitch*.8*
%attr(0644,root,root) %{_mandir}/man8/probe-modem*.8*

%changelog
* Tue Jan 20 2009 Harald Hoyer <harald at redhat.com> 20081230-0.2.20090120git
- added BuildRequires
- README and ChangeLog left out for now (zero size)
- fixed License

* Tue Jan 20 2009 Harald Hoyer <harald at redhat.com> 20081230-0.1.20090120git
- initial version




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/udev-extras/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	20 Jan 2009 20:37:03 -0000	1.1
+++ .cvsignore	21 Jan 2009 11:47:02 -0000	1.2
@@ -0,0 +1 @@
+udev-extras-20081230-git20090120.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/udev-extras/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	20 Jan 2009 20:37:03 -0000	1.1
+++ sources	21 Jan 2009 11:47:02 -0000	1.2
@@ -0,0 +1 @@
+98f3772f3d5a01d99dd30bbe45156f1a  udev-extras-20081230-git20090120.tar.bz2



From mgrepl at fedoraproject.org  Wed Jan 21 11:59:16 2009
From: mgrepl at fedoraproject.org (Miroslav Grepl)
Date: Wed, 21 Jan 2009 11:59:16 +0000 (UTC)
Subject: rpms/selinux-policy/F-9 policy-20071130.patch, 1.248,
	1.249 selinux-policy.spec, 1.733, 1.734
Message-ID: <20090121115916.573977012F@cvs1.fedora.phx.redhat.com>

Author: mgrepl

Update of /cvs/extras/rpms/selinux-policy/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27091

Modified Files:
	policy-20071130.patch selinux-policy.spec 
Log Message:
- Add execstack for Podsleuth policy
- Allow ssh read generic symbolic links in /var/lib



policy-20071130.patch:

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.248 -r 1.249 policy-20071130.patch
Index: policy-20071130.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-9/policy-20071130.patch,v
retrieving revision 1.248
retrieving revision 1.249
diff -u -r1.248 -r1.249
--- policy-20071130.patch	14 Jan 2009 13:18:13 -0000	1.248
+++ policy-20071130.patch	21 Jan 2009 11:59:11 -0000	1.249
@@ -1,15 +1,12 @@
-Binary files nsaserefpolicy/amtu.pp and serefpolicy-3.3.1/amtu.pp differ
-Binary files nsaserefpolicy/auditadm.pp and serefpolicy-3.3.1/auditadm.pp differ
-Binary files nsaserefpolicy/base.pp and serefpolicy-3.3.1/base.pp differ
 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-02-26 14:23:12.000000000 +0100
-+++ serefpolicy-3.3.1/config/appconfig-mcs/failsafe_context	2009-01-14 11:05:46.000000000 +0100
++++ serefpolicy-3.3.1/config/appconfig-mcs/failsafe_context	2009-01-21 00:13:29.000000000 +0100
 @@ -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	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.3.1/config/appconfig-mcs/guest_u_default_contexts	2009-01-14 11:05:46.000000000 +0100
++++ serefpolicy-3.3.1/config/appconfig-mcs/guest_u_default_contexts	2009-01-21 00:13:29.000000000 +0100
 @@ -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
@@ -19,7 +16,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-02-26 14:23:12.000000000 +0100
-+++ serefpolicy-3.3.1/config/appconfig-mcs/root_default_contexts	2009-01-14 11:05:46.000000000 +0100
++++ serefpolicy-3.3.1/config/appconfig-mcs/root_default_contexts	2009-01-21 00:13:29.000000000 +0100
 @@ -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
@@ -35,7 +32,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-02-26 14:23:12.000000000 +0100
-+++ serefpolicy-3.3.1/config/appconfig-mcs/staff_u_default_contexts	2009-01-14 11:05:46.000000000 +0100
++++ serefpolicy-3.3.1/config/appconfig-mcs/staff_u_default_contexts	2009-01-21 00:13:29.000000000 +0100
 @@ -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
@@ -47,7 +44,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	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.3.1/config/appconfig-mcs/unconfined_u_default_contexts	2009-01-14 11:05:46.000000000 +0100
++++ serefpolicy-3.3.1/config/appconfig-mcs/unconfined_u_default_contexts	2009-01-21 00:13:29.000000000 +0100
 @@ -0,0 +1,11 @@
 +system_r:crond_t:s0		unconfined_r:unconfined_t:s0
 +system_r:initrc_t:s0		unconfined_r:unconfined_t:s0
@@ -62,13 +59,13 @@
 +system_r:xdm_t:s0		unconfined_r:unconfined_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-02-26 14:23:12.000000000 +0100
-+++ serefpolicy-3.3.1/config/appconfig-mcs/userhelper_context	2009-01-14 11:05:46.000000000 +0100
++++ serefpolicy-3.3.1/config/appconfig-mcs/userhelper_context	2009-01-21 00:13:29.000000000 +0100
 @@ -1 +1 @@
 -system_u:sysadm_r:sysadm_t:s0
 +system_u:system_r:unconfined_t:s0	
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/user_u_default_contexts serefpolicy-3.3.1/config/appconfig-mcs/user_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/user_u_default_contexts	2008-02-26 14:23:12.000000000 +0100
-+++ serefpolicy-3.3.1/config/appconfig-mcs/user_u_default_contexts	2009-01-14 11:05:46.000000000 +0100
++++ serefpolicy-3.3.1/config/appconfig-mcs/user_u_default_contexts	2009-01-21 00:13:29.000000000 +0100
 @@ -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
@@ -78,7 +75,7 @@
 +user_r:user_t:s0		user_r:user_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	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.3.1/config/appconfig-mcs/x_contexts	2009-01-14 11:05:46.000000000 +0100
++++ serefpolicy-3.3.1/config/appconfig-mcs/x_contexts	2009-01-21 00:13:29.000000000 +0100
 @@ -0,0 +1,188 @@
 +#
 +# Config file for XSELinux extension
@@ -270,7 +267,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	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.3.1/config/appconfig-mcs/xguest_u_default_contexts	2009-01-14 11:05:46.000000000 +0100
++++ serefpolicy-3.3.1/config/appconfig-mcs/xguest_u_default_contexts	2009-01-21 00:13:29.000000000 +0100
 @@ -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,7 +278,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	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.3.1/config/appconfig-mls/guest_u_default_contexts	2009-01-14 11:05:46.000000000 +0100
++++ serefpolicy-3.3.1/config/appconfig-mls/guest_u_default_contexts	2009-01-21 00:13:29.000000000 +0100
 @@ -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
@@ -289,7 +286,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	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.3.1/config/appconfig-mls/x_contexts	2009-01-14 11:05:46.000000000 +0100
++++ serefpolicy-3.3.1/config/appconfig-mls/x_contexts	2009-01-21 00:13:29.000000000 +0100
 @@ -0,0 +1,188 @@
 +#
 +# Config file for XSELinux extension
@@ -481,7 +478,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	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.3.1/config/appconfig-standard/guest_u_default_contexts	2009-01-14 11:05:46.000000000 +0100
++++ serefpolicy-3.3.1/config/appconfig-standard/guest_u_default_contexts	2009-01-21 00:13:29.000000000 +0100
 @@ -0,0 +1,4 @@
 +system_r:local_login_t	guest_r:guest_t
 +system_r:remote_login_t	guest_r:guest_t
@@ -489,7 +486,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-02-26 14:23:12.000000000 +0100
-+++ serefpolicy-3.3.1/config/appconfig-standard/root_default_contexts	2009-01-14 11:05:46.000000000 +0100
++++ serefpolicy-3.3.1/config/appconfig-standard/root_default_contexts	2009-01-21 00:13:29.000000000 +0100
 @@ -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
@@ -505,7 +502,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	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.3.1/config/appconfig-standard/x_contexts	2009-01-14 11:05:46.000000000 +0100
++++ serefpolicy-3.3.1/config/appconfig-standard/x_contexts	2009-01-21 00:13:29.000000000 +0100
 @@ -0,0 +1,188 @@
 +#
 +# Config file for XSELinux extension
@@ -697,17 +694,16 @@
 +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	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.3.1/config/appconfig-standard/xguest_u_default_contexts	2009-01-14 11:05:46.000000000 +0100
++++ serefpolicy-3.3.1/config/appconfig-standard/xguest_u_default_contexts	2009-01-21 00:13:29.000000000 +0100
 @@ -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
-Binary files nsaserefpolicy/courier.pp and serefpolicy-3.3.1/courier.pp differ
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/doc/global_booleans.xml serefpolicy-3.3.1/doc/global_booleans.xml
 --- nsaserefpolicy/doc/global_booleans.xml	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.3.1/doc/global_booleans.xml	2009-01-14 11:07:04.000000000 +0100
++++ serefpolicy-3.3.1/doc/global_booleans.xml	2009-01-21 00:13:29.000000000 +0100
 @@ -0,0 +1,25 @@
 +<bool name="secure_mode" dftval="false">
 +<desc>
@@ -736,7 +732,7 @@
 +</bool>
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/doc/global_tunables.xml serefpolicy-3.3.1/doc/global_tunables.xml
 --- nsaserefpolicy/doc/global_tunables.xml	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.3.1/doc/global_tunables.xml	2009-01-14 11:07:04.000000000 +0100
++++ serefpolicy-3.3.1/doc/global_tunables.xml	2009-01-21 00:13:29.000000000 +0100
 @@ -0,0 +1,124 @@
 +<tunable name="allow_execheap" dftval="false">
 +<desc>
@@ -864,7 +860,7 @@
 +</tunable>
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/doc/html/admin_acct.html serefpolicy-3.3.1/doc/html/admin_acct.html
 --- nsaserefpolicy/doc/html/admin_acct.html	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.3.1/doc/html/admin_acct.html	2009-01-14 11:07:45.000000000 +0100
++++ serefpolicy-3.3.1/doc/html/admin_acct.html	2009-01-21 00:13:29.000000000 +0100
 @@ -0,0 +1,376 @@
 +<html>
 +<head>
@@ -1244,7 +1240,7 @@
 +</html>
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/doc/html/admin_alsa.html serefpolicy-3.3.1/doc/html/admin_alsa.html
 --- nsaserefpolicy/doc/html/admin_alsa.html	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.3.1/doc/html/admin_alsa.html	2009-01-14 11:07:45.000000000 +0100
++++ serefpolicy-3.3.1/doc/html/admin_alsa.html	2009-01-21 00:13:29.000000000 +0100
 @@ -0,0 +1,418 @@
 +<html>
 +<head>
@@ -1666,7 +1662,7 @@
 +</html>
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/doc/html/admin_amanda.html serefpolicy-3.3.1/doc/html/admin_amanda.html
 --- nsaserefpolicy/doc/html/admin_amanda.html	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.3.1/doc/html/admin_amanda.html	2009-01-14 11:07:45.000000000 +0100
++++ serefpolicy-3.3.1/doc/html/admin_amanda.html	2009-01-21 00:13:29.000000000 +0100
 @@ -0,0 +1,581 @@
 +<html>
 +<head>
@@ -2251,7 +2247,7 @@
 +</html>
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/doc/html/admin_amtu.html serefpolicy-3.3.1/doc/html/admin_amtu.html
 --- nsaserefpolicy/doc/html/admin_amtu.html	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.3.1/doc/html/admin_amtu.html	2009-01-14 11:07:45.000000000 +0100
++++ serefpolicy-3.3.1/doc/html/admin_amtu.html	2009-01-21 00:13:29.000000000 +0100
 @@ -0,0 +1,329 @@
 +<html>
 +<head>
@@ -2584,7 +2580,7 @@
 +</html>
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/doc/html/admin_anaconda.html serefpolicy-3.3.1/doc/html/admin_anaconda.html
[...7173 lines suppressed...]
 +# 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	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.3.1/policy/modules/users/guest.if	2009-01-14 11:05:46.000000000 +0100
++++ serefpolicy-3.3.1/policy/modules/users/guest.if	2009-01-21 00:13:29.000000000 +0100
 @@ -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	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.3.1/policy/modules/users/guest.te	2009-01-14 11:05:46.000000000 +0100
++++ serefpolicy-3.3.1/policy/modules/users/guest.te	2009-01-21 00:13:29.000000000 +0100
 @@ -0,0 +1,33 @@
 +policy_module(guest,1.0.1)
 +userdom_restricted_user_template(guest)
@@ -677757,17 +677794,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	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.3.1/policy/modules/users/logadm.fc	2009-01-14 11:05:46.000000000 +0100
++++ serefpolicy-3.3.1/policy/modules/users/logadm.fc	2009-01-21 00:13:29.000000000 +0100
 @@ -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	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.3.1/policy/modules/users/logadm.if	2009-01-14 11:05:46.000000000 +0100
++++ serefpolicy-3.3.1/policy/modules/users/logadm.if	2009-01-21 00:13:29.000000000 +0100
 @@ -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	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.3.1/policy/modules/users/logadm.te	2009-01-14 11:05:46.000000000 +0100
++++ serefpolicy-3.3.1/policy/modules/users/logadm.te	2009-01-21 00:13:29.000000000 +0100
 @@ -0,0 +1,11 @@
 +policy_module(logadm,1.0.0)
 +
@@ -677782,22 +677819,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	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.3.1/policy/modules/users/metadata.xml	2009-01-14 11:05:46.000000000 +0100
++++ serefpolicy-3.3.1/policy/modules/users/metadata.xml	2009-01-21 00:13:29.000000000 +0100
 @@ -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	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.3.1/policy/modules/users/secadm.fc	2009-01-14 11:05:46.000000000 +0100
++++ serefpolicy-3.3.1/policy/modules/users/secadm.fc	2009-01-21 00:13:29.000000000 +0100
 @@ -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	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.3.1/policy/modules/users/secadm.if	2009-01-14 11:05:46.000000000 +0100
++++ serefpolicy-3.3.1/policy/modules/users/secadm.if	2009-01-21 00:13:29.000000000 +0100
 @@ -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	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.3.1/policy/modules/users/secadm.te	2009-01-14 11:05:46.000000000 +0100
++++ serefpolicy-3.3.1/policy/modules/users/secadm.te	2009-01-21 00:13:29.000000000 +0100
 @@ -0,0 +1,39 @@
 +policy_module(secadm,1.0.1)
 +gen_require(`
@@ -677840,17 +677877,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	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.3.1/policy/modules/users/staff.fc	2009-01-14 11:05:46.000000000 +0100
++++ serefpolicy-3.3.1/policy/modules/users/staff.fc	2009-01-21 00:13:29.000000000 +0100
 @@ -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	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.3.1/policy/modules/users/staff.if	2009-01-14 11:05:46.000000000 +0100
++++ serefpolicy-3.3.1/policy/modules/users/staff.if	2009-01-21 00:13:29.000000000 +0100
 @@ -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	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.3.1/policy/modules/users/staff.te	2009-01-14 11:05:46.000000000 +0100
++++ serefpolicy-3.3.1/policy/modules/users/staff.te	2009-01-21 00:13:29.000000000 +0100
 @@ -0,0 +1,30 @@
 +policy_module(staff,1.0.1)
 +userdom_admin_login_user_template(staff)
@@ -677884,17 +677921,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	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.3.1/policy/modules/users/user.fc	2009-01-14 11:05:46.000000000 +0100
++++ serefpolicy-3.3.1/policy/modules/users/user.fc	2009-01-21 00:13:29.000000000 +0100
 @@ -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	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.3.1/policy/modules/users/user.if	2009-01-14 11:05:46.000000000 +0100
++++ serefpolicy-3.3.1/policy/modules/users/user.if	2009-01-21 00:13:29.000000000 +0100
 @@ -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	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.3.1/policy/modules/users/user.te	2009-01-14 11:05:46.000000000 +0100
++++ serefpolicy-3.3.1/policy/modules/users/user.te	2009-01-21 00:13:29.000000000 +0100
 @@ -0,0 +1,18 @@
 +policy_module(user,1.0.1)
 +userdom_unpriv_user_template(user)
@@ -677916,17 +677953,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	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.3.1/policy/modules/users/webadm.fc	2009-01-14 11:05:46.000000000 +0100
++++ serefpolicy-3.3.1/policy/modules/users/webadm.fc	2009-01-21 00:13:29.000000000 +0100
 @@ -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	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.3.1/policy/modules/users/webadm.if	2009-01-14 11:05:46.000000000 +0100
++++ serefpolicy-3.3.1/policy/modules/users/webadm.if	2009-01-21 00:13:29.000000000 +0100
 @@ -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	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.3.1/policy/modules/users/webadm.te	2009-01-14 11:05:46.000000000 +0100
++++ serefpolicy-3.3.1/policy/modules/users/webadm.te	2009-01-21 00:13:29.000000000 +0100
 @@ -0,0 +1,41 @@
 +policy_module(webadm,1.0.0)
 +
@@ -677971,17 +678008,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	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.3.1/policy/modules/users/xguest.fc	2009-01-14 11:05:46.000000000 +0100
++++ serefpolicy-3.3.1/policy/modules/users/xguest.fc	2009-01-21 00:13:29.000000000 +0100
 @@ -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	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.3.1/policy/modules/users/xguest.if	2009-01-14 11:05:46.000000000 +0100
++++ serefpolicy-3.3.1/policy/modules/users/xguest.if	2009-01-21 00:13:29.000000000 +0100
 @@ -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	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.3.1/policy/modules/users/xguest.te	2009-01-14 11:05:46.000000000 +0100
++++ serefpolicy-3.3.1/policy/modules/users/xguest.te	2009-01-21 00:13:29.000000000 +0100
 @@ -0,0 +1,69 @@
 +policy_module(xguest,1.0.1)
 +
@@ -678054,7 +678091,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-02-26 14:23:09.000000000 +0100
-+++ serefpolicy-3.3.1/policy/support/file_patterns.spt	2009-01-14 11:05:46.000000000 +0100
++++ serefpolicy-3.3.1/policy/support/file_patterns.spt	2009-01-21 00:13:29.000000000 +0100
 @@ -537,3 +537,23 @@
  	allow $1 $2:dir rw_dir_perms;
  	type_transition $1 $2:$4 $3;
@@ -678081,7 +678118,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-02-26 14:23:09.000000000 +0100
-+++ serefpolicy-3.3.1/policy/support/obj_perm_sets.spt	2009-01-14 11:05:46.000000000 +0100
++++ serefpolicy-3.3.1/policy/support/obj_perm_sets.spt	2009-01-21 00:13:29.000000000 +0100
 @@ -193,7 +193,7 @@
  define(`create_dir_perms',`{ getattr create }')
  define(`rename_dir_perms',`{ getattr rename }')
@@ -678161,7 +678198,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-02-26 14:23:12.000000000 +0100
-+++ serefpolicy-3.3.1/policy/users	2009-01-14 11:05:46.000000000 +0100
++++ serefpolicy-3.3.1/policy/users	2009-01-21 00:13:29.000000000 +0100
 @@ -16,7 +16,7 @@
  # and a user process should never be assigned the system user
  # identity.
@@ -678195,11 +678232,9 @@
 -	gen_user(root, sysadm, sysadm_r staff_r ifdef(`enable_mls',`secadm_r auditadm_r'), s0, s0 - mls_systemhigh, mcs_allcats)
 -')
 +gen_user(root, user, unconfined_r sysadm_r staff_r ifdef(`enable_mls',`secadm_r auditadm_r') system_r, s0, s0 - mls_systemhigh, mcs_allcats)
-Binary files nsaserefpolicy/prelude.pp and serefpolicy-3.3.1/prelude.pp differ
-Binary files nsaserefpolicy/rpcbind.pp and serefpolicy-3.3.1/rpcbind.pp differ
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/Rules.modular serefpolicy-3.3.1/Rules.modular
 --- nsaserefpolicy/Rules.modular	2008-02-26 14:23:12.000000000 +0100
-+++ serefpolicy-3.3.1/Rules.modular	2009-01-14 11:05:46.000000000 +0100
++++ serefpolicy-3.3.1/Rules.modular	2009-01-21 00:13:29.000000000 +0100
 @@ -73,8 +73,8 @@
  $(tmpdir)/%.mod: $(m4support) $(tmpdir)/generated_definitions.conf $(tmpdir)/all_interfaces.conf %.te
  	@echo "Compliling $(NAME) $(@F) module"
@@ -678231,7 +678266,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-02-26 14:23:13.000000000 +0100
-+++ serefpolicy-3.3.1/Rules.monolithic	2009-01-14 11:05:46.000000000 +0100
++++ serefpolicy-3.3.1/Rules.monolithic	2009-01-21 00:13:29.000000000 +0100
 @@ -96,7 +96,7 @@
  #
  # Load the binary policy
@@ -678241,4 +678276,3 @@
  	@echo "Loading $(NAME) $(loadpath)"
  	$(verbose) $(LOADPOLICY) -q $(loadpath)
  	@touch $(tmpdir)/load
-Binary files nsaserefpolicy/secadm.pp and serefpolicy-3.3.1/secadm.pp differ


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-9/selinux-policy.spec,v
retrieving revision 1.733
retrieving revision 1.734
diff -u -r1.733 -r1.734
--- selinux-policy.spec	13 Jan 2009 18:49:48 -0000	1.733
+++ selinux-policy.spec	21 Jan 2009 11:59:13 -0000	1.734
@@ -20,7 +20,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.3.1
-Release: 118%{?dist}
+Release: 119%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -443,6 +443,10 @@
 %endif
 
 %changelog
+* Wed Jan 21 2009 Miroslav Grepl <mgrepl at redhat.com> 3.3.1-119
+- Add execstack for Podsleuth policy
+- Allow ssh read generic symbolic links in /var/lib
+
 * Tue Jan 13 2009 Miroslav Grepl <mgrepl at redhat.com> 3.3.1-118
 - Allow kismet read generic files in /usr
 - Lots of fixes for munin



From sharkcz at fedoraproject.org  Wed Jan 21 13:00:11 2009
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Wed, 21 Jan 2009 13:00:11 +0000 (UTC)
Subject: rpms/trytond/devel trytond.spec,1.2,1.3
Message-ID: <20090121130011.2802D7012F@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/trytond/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18000

Modified Files:
	trytond.spec 
Log Message:
* Wed Jan 21 2009 Dan Hor??k <dan[at]danny.cz> 1.0.2-2
- add modular support for webdav



Index: trytond.spec
===================================================================
RCS file: /cvs/pkgs/rpms/trytond/devel/trytond.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- trytond.spec	9 Jan 2009 10:46:11 -0000	1.2
+++ trytond.spec	21 Jan 2009 12:59:40 -0000	1.3
@@ -4,7 +4,7 @@
 
 Name:           trytond
 Version:        1.0.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Server for the Tryton application framework
 
 Group:          System Environment/Daemons
@@ -55,6 +55,16 @@
 OpenOffice.org support for Tryton Server.
 
 
+%package webdav
+Summary:        WebDAV support for Tryton Server
+Group:          System Environment/Libraries
+Requires:       %{name} = %{version}-%{release}
+Requires:       pywebdav
+
+%description webdav
+WebDAV support for Tryton Server.
+
+
 %prep
 %setup -q
 
@@ -122,8 +132,14 @@
 %files openoffice
 %defattr(-,root,root,-)
 
+%files webdav
+%defattr(-,root,root,-)
+
 
 %changelog
+* Wed Jan 21 2009 Dan Hor??k <dan[at]danny.cz> 1.0.2-2
+- add modular support for webdav
+
 * Thu Jan  8 2009 Dan Hor??k <dan[at]danny.cz> 1.0.2-1
 - modularize the openoffice.org support
 - update to upstream version 1.0.2



From mcpierce at fedoraproject.org  Wed Jan 21 13:02:48 2009
From: mcpierce at fedoraproject.org (Darryl L. Pierce)
Date: Wed, 21 Jan 2009 13:02:48 +0000 (UTC)
Subject: rpms/rubygem-hoe/devel .cvsignore, 1.8, 1.9 rubygem-hoe.spec, 1.11, 
	1.12 sources, 1.8, 1.9
Message-ID: <20090121130248.792627012F@cvs1.fedora.phx.redhat.com>

Author: mcpierce

Update of /cvs/pkgs/rpms/rubygem-hoe/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19169

Modified Files:
	.cvsignore rubygem-hoe.spec sources 
Log Message:
Release 1.8.3 of Hoe.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-hoe/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	27 Oct 2008 13:46:46 -0000	1.8
+++ .cvsignore	21 Jan 2009 13:02:17 -0000	1.9
@@ -1 +1 @@
-hoe-1.8.2.gem
+hoe-1.8.3.gem


Index: rubygem-hoe.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-hoe/devel/rubygem-hoe.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- rubygem-hoe.spec	27 Oct 2008 13:46:46 -0000	1.11
+++ rubygem-hoe.spec	21 Jan 2009 13:02:18 -0000	1.12
@@ -5,7 +5,7 @@
 
 Summary:    	Hoe is a simple rake/rubygems helper for project Rakefiles
 Name:       	rubygem-%{gemname}
-Version:    	1.8.2
+Version:    	1.8.3
 Release:    	1%{?dist}
 Group:      	Development/Languages
 License:    	MIT
@@ -14,7 +14,7 @@
 BuildRoot:  	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:   	ruby(abi) = 1.8
 Requires:   	rubygems
-Requires:   	rubygem(rubyforge) >= 1.0.1
+Requires:   	rubygem(rubyforge) >= 1.0.2
 Requires:   	rubygem(rake) >= 0.8.3
 BuildRequires:  rubygems
 BuildArch:  	noarch
@@ -82,6 +82,9 @@
 
 
 %changelog
+* Wed Jan 21 2009 Darryl Pierce <dpierce at redhat.com> - 1.8.3-1
+- Release 1.8.3 of Hoe.
+
 * Mon Oct 27 2008 Darryl Pierce <dpierce at redhat.com> - 1.8.2-1
 - Release 1.8.2 of Hoe.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-hoe/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	27 Oct 2008 13:46:46 -0000	1.8
+++ sources	21 Jan 2009 13:02:18 -0000	1.9
@@ -1 +1 @@
-86559db603b4e2891a01e7cb01b6f663  hoe-1.8.2.gem
+95f603835ebc7a892c06a0aaea4f119b  hoe-1.8.3.gem



From robmv at fedoraproject.org  Wed Jan 21 13:03:59 2009
From: robmv at fedoraproject.org (Robert Marcano)
Date: Wed, 21 Jan 2009 13:03:59 +0000 (UTC)
Subject: rpms/dirvish/F-9 dirvish.spec,1.2,1.3
Message-ID: <20090121130359.2F1D37012F@cvs1.fedora.phx.redhat.com>

Author: robmv

Update of /cvs/extras/rpms/dirvish/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19584

Modified Files:
	dirvish.spec 
Log Message:
update license tag from F-10 and devel branches



Index: dirvish.spec
===================================================================
RCS file: /cvs/extras/rpms/dirvish/F-9/dirvish.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- dirvish.spec	6 Oct 2006 01:26:13 -0000	1.2
+++ dirvish.spec	21 Jan 2009 13:03:28 -0000	1.3
@@ -1,10 +1,10 @@
 Name:           dirvish
 Version:        1.2.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Fast, disk based, rotating network backup system
 
 Group:          Applications/Archiving
-License:        OSL
+License:        OSL 2.0
 URL:            http://www.dirvish.org/
 Source0:        http://www.dirvish.org/dirvish-%{version}.tgz
 # converts the installer to work in unattended mode
@@ -46,6 +46,9 @@
 
 
 %changelog
+* Wed Jul 16 2008 Tom "spot" Callaway <tcallawa at redhat.com> 1.2.1-3
+- fix license tag
+
 * Thu Oct 05 2006 Robert Marcano <robert at marcanoonline.com> 1.2.1-2
 - Fix License field
 - Add license text



From limb at fedoraproject.org  Wed Jan 21 13:07:22 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Wed, 21 Jan 2009 13:07:22 +0000 (UTC)
Subject: rpms/moodle/devel moodle.spec,1.34,1.35
Message-ID: <20090121130722.D66CD7012F@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/moodle/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21004

Modified Files:
	moodle.spec 
Log Message:
Security fix, initial font work.



Index: moodle.spec
===================================================================
RCS file: /cvs/pkgs/rpms/moodle/devel/moodle.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- moodle.spec	18 Dec 2008 13:03:50 -0000	1.34
+++ moodle.spec	21 Jan 2009 13:06:52 -0000	1.35
@@ -7,7 +7,7 @@
 
 Name:           moodle
 Version:        1.9.3
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        A Course Management System
 
 Group:          Applications/Publishing
@@ -91,8 +91,10 @@
 Source73:       http://download.moodle.org/lang16/gu_utf8.zip
 Source74:       http://download.moodle.org/lang16/lo_utf8.zip
 Source75:       http://download.moodle.org/lang16/to_utf8.zip
+# Font removed, license violation.
 Source76:       http://download.moodle.org/lang16/mi_wwow_utf8.zip
 Source77:       http://download.moodle.org/lang16/sm_utf8.zip
+# Font removed, license violation.
 Source78:       http://download.moodle.org/lang16/ta_utf8.zip
 Source79:       http://download.moodle.org/lang16/hy_utf8.zip
 Source80:       http://download.moodle.org/lang16/mk_utf8.zip
@@ -110,6 +112,7 @@
 Requires:	php-Smarty
 Requires:	php-adodb
 Requires:	php-magpierss
+Requires:	freefont 
 Requires(post): /sbin/chkconfig
 Requires(preun): /sbin/chkconfig
 Requires(preun): /sbin/service
@@ -1095,6 +1098,7 @@
 Summary:        Moodle language pack for Samoan
 Group:          Applications/Publishing
 Requires:       moodle = %{version}-%{release}
+Requires:	dejavu-sans-fonts
 
 %description    sm
 This package contains the files needed to display Moodle in Samoan.
@@ -1253,6 +1257,7 @@
 Summary:        Moodle language pack for Tonga
 Group:          Applications/Publishing
 Requires:       moodle = %{version}-%{release}
+Requires:	dejavu-sans-fonts
 
 %description    to
 This package contains the files needed to display Moodle in Tonga.
@@ -1473,6 +1478,9 @@
 rm lib/editor/tinymce/jscripts/tiny_mce/themes/advanced/langs/tw.js
 rm lib/phpmailer/language/phpmailer.lang-fo.php
 
+#Drop spell-check-logic.cgi, CVE-2008-5153, per upstream.
+rm lib/editor/htmlarea/plugins/SpellChecker/spell-check-logic.cgi
+
 %install
 rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT%{moodlewebdir}
@@ -1498,6 +1506,14 @@
 rm -rf $RPM_BUILD_ROOT/var/www/moodle/web/lib/magpie
 ln -s /usr/share/php/magpierss/ $RPM_BUILD_ROOT/var/www/moodle/web/lib/magpie
 
+#symlinks for illegal fonts
+ln -s /usr/share/fonts/dejavu/DejaVuSans.ttf $RPM_BUILD_ROOT%{moodlewebdir}/lang/sm_utf8/fonts/default.ttf
+ln -s /usr/share/fonts/dejavu/DejaVuSans.ttf $RPM_BUILD_ROOT%{moodlewebdir}/lang/to_utf8/fonts/default.ttf
+
+#Symlink to FreeSans, to save space.
+rm -f $RPM_BUILD_ROOT%{moodlewebdir}/lib/default.ttf
+ln -s /usr/share/fonts/freefont/FreeSans.ttf $RPM_BUILD_ROOT%{moodlewebdir}/lib/default.ttf
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -1650,6 +1666,11 @@
 %{_sbindir}/%{name}-cron
 
 %changelog
+* Thu Jan 20 2009 Jon Ciesla <limb at jcomserv.net> - 1.9.3-5
+- Dropped and symlinked illegal sm and to fonts.
+- Symlinking to FreeSans.
+- Drop spell-check-logic.cgi, CVE-2008-5153, per upstream, BZ 472117, 472119, 472120.
+
 * Wed Dec 17 2008 Jon Ciesla <limb at jcomserv.net> - 1.9.3-4
 - Texed fix, BZ 476709.
 



From atkac at fedoraproject.org  Wed Jan 21 13:13:10 2009
From: atkac at fedoraproject.org (Adam Tkac)
Date: Wed, 21 Jan 2009 13:13:10 +0000 (UTC)
Subject: rpms/bind/devel bind.spec,1.298,1.299
Message-ID: <20090121131310.E16157012F@cvs1.fedora.phx.redhat.com>

Author: atkac

Update of /cvs/pkgs/rpms/bind/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23376

Modified Files:
	bind.spec 
Log Message:
- rebuild against new openssl



Index: bind.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bind/devel/bind.spec,v
retrieving revision 1.298
retrieving revision 1.299
diff -u -r1.298 -r1.299
--- bind.spec	8 Jan 2009 14:05:03 -0000	1.298
+++ bind.spec	21 Jan 2009 13:12:40 -0000	1.299
@@ -21,7 +21,7 @@
 Name:     bind
 License:  ISC
 Version:  9.6.0
-Release:  2.%{PATCHVER}%{?dist}
+Release:  3.%{PATCHVER}%{?dist}
 Epoch:    32
 Url:      http://www.isc.org/products/BIND/
 Buildroot:%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -602,6 +602,9 @@
 %ghost %{chroot_prefix}/etc/localtime
 
 %changelog
+* Wed Jan 21 2009 Adam Tkac <atkac redhat com> 32:9.6.0-3.P1
+- rebuild against new openssl
+
 * Thu Jan 08 2009 Adam Tkac <atkac redhat com> 32:9.6.0-2.P1
 - 9.6.0-P1 release (CVE-2009-0025)
 



From mcpierce at fedoraproject.org  Wed Jan 21 13:15:12 2009
From: mcpierce at fedoraproject.org (Darryl L. Pierce)
Date: Wed, 21 Jan 2009 13:15:12 +0000 (UTC)
Subject: rpms/rubygem-hoe/F-9 .cvsignore, 1.8, 1.9 rubygem-hoe.spec, 1.8,
	1.9 sources, 1.8, 1.9
Message-ID: <20090121131512.B1CEE7012F@cvs1.fedora.phx.redhat.com>

Author: mcpierce

Update of /cvs/pkgs/rpms/rubygem-hoe/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24333

Modified Files:
	.cvsignore rubygem-hoe.spec sources 
Log Message:
Release 1.8.3 of Hoe.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-hoe/F-9/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	27 Oct 2008 14:38:36 -0000	1.8
+++ .cvsignore	21 Jan 2009 13:14:42 -0000	1.9
@@ -1 +1 @@
-hoe-1.8.2.gem
+hoe-1.8.3.gem


Index: rubygem-hoe.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-hoe/F-9/rubygem-hoe.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- rubygem-hoe.spec	27 Oct 2008 14:38:36 -0000	1.8
+++ rubygem-hoe.spec	21 Jan 2009 13:14:42 -0000	1.9
@@ -5,7 +5,7 @@
 
 Summary:    Hoe is a simple rake/rubygems helper for project Rakefiles
 Name:       rubygem-%{gemname}
-Version:    1.8.2
+Version:    1.8.3
 Release:    1%{?dist}
 Group:      Development/Languages
 License:    MIT
@@ -14,7 +14,7 @@
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:   ruby(abi) = 1.8
 Requires:   rubygems
-Requires:   rubygem(rubyforge) >= 1.0.0
+Requires:   rubygem(rubyforge) >= 1.0.2
 Requires:   rubygem(rake) >= 0.8.3
 BuildRequires:  rubygems
 BuildArch:  noarch
@@ -82,6 +82,9 @@
 
 
 %changelog
+* Wed Jan 21 2009 Darryl Pierce <dpierce at redhat.com> - 1.8.3-1
+- Release 1.8.3 of Hoe.
+
 * Mon Oct 27 2008 Darryl Pierce <dpierce at redhat.com> - 1.8.2-1
 - Release 1.8.2 of Hoe.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-hoe/F-9/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	27 Oct 2008 14:38:36 -0000	1.8
+++ sources	21 Jan 2009 13:14:42 -0000	1.9
@@ -1 +1 @@
-86559db603b4e2891a01e7cb01b6f663  hoe-1.8.2.gem
+95f603835ebc7a892c06a0aaea4f119b  hoe-1.8.3.gem



From limb at fedoraproject.org  Wed Jan 21 13:16:10 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Wed, 21 Jan 2009 13:16:10 +0000 (UTC)
Subject: rpms/moodle/F-10 moodle.spec,1.34,1.35
Message-ID: <20090121131610.A44637012F@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/moodle/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24454

Modified Files:
	moodle.spec 
Log Message:
Security fix.



Index: moodle.spec
===================================================================
RCS file: /cvs/pkgs/rpms/moodle/F-10/moodle.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- moodle.spec	18 Dec 2008 13:39:06 -0000	1.34
+++ moodle.spec	21 Jan 2009 13:15:40 -0000	1.35
@@ -7,7 +7,7 @@
 
 Name:           moodle
 Version:        1.9.3
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        A Course Management System
 
 Group:          Applications/Publishing
@@ -91,8 +91,10 @@
 Source73:       http://download.moodle.org/lang16/gu_utf8.zip
 Source74:       http://download.moodle.org/lang16/lo_utf8.zip
 Source75:       http://download.moodle.org/lang16/to_utf8.zip
+# Font removed, license violation.
 Source76:       http://download.moodle.org/lang16/mi_wwow_utf8.zip
 Source77:       http://download.moodle.org/lang16/sm_utf8.zip
+# Font removed, license violation.
 Source78:       http://download.moodle.org/lang16/ta_utf8.zip
 Source79:       http://download.moodle.org/lang16/hy_utf8.zip
 Source80:       http://download.moodle.org/lang16/mk_utf8.zip
@@ -110,6 +112,7 @@
 Requires:	php-Smarty
 Requires:	php-adodb
 Requires:	php-magpierss
+Requires:	freefont 
 Requires(post): /sbin/chkconfig
 Requires(preun): /sbin/chkconfig
 Requires(preun): /sbin/service
@@ -1095,6 +1098,7 @@
 Summary:        Moodle language pack for Samoan
 Group:          Applications/Publishing
 Requires:       moodle = %{version}-%{release}
+Requires:	dejavu-fonts
 
 %description    sm
 This package contains the files needed to display Moodle in Samoan.
@@ -1253,6 +1257,7 @@
 Summary:        Moodle language pack for Tonga
 Group:          Applications/Publishing
 Requires:       moodle = %{version}-%{release}
+Requires:	dejavu-fonts
 
 %description    to
 This package contains the files needed to display Moodle in Tonga.
@@ -1473,6 +1478,9 @@
 rm lib/editor/tinymce/jscripts/tiny_mce/themes/advanced/langs/tw.js
 rm lib/phpmailer/language/phpmailer.lang-fo.php
 
+#Drop spell-check-logic.cgi, CVE-2008-5153, per upstream.
+rm lib/editor/htmlarea/plugins/SpellChecker/spell-check-logic.cgi
+
 %install
 rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT%{moodlewebdir}
@@ -1498,6 +1506,14 @@
 rm -rf $RPM_BUILD_ROOT/var/www/moodle/web/lib/magpie
 ln -s /usr/share/php/magpierss/ $RPM_BUILD_ROOT/var/www/moodle/web/lib/magpie
 
+#symlinks for illegal fonts
+ln -s /usr/share/fonts/dejavu/DejaVuSans.ttf $RPM_BUILD_ROOT%{moodlewebdir}/lang/sm_utf8/fonts/default.ttf
+ln -s /usr/share/fonts/dejavu/DejaVuSans.ttf $RPM_BUILD_ROOT%{moodlewebdir}/lang/to_utf8/fonts/default.ttf
+
+#Symlink to FreeSans, to save space.
+rm -f $RPM_BUILD_ROOT%{moodlewebdir}/lib/default.ttf
+ln -s /usr/share/fonts/freefont/FreeSans.ttf $RPM_BUILD_ROOT%{moodlewebdir}/lib/default.ttf
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -1650,6 +1666,11 @@
 %{_sbindir}/%{name}-cron
 
 %changelog
+* Thu Jan 20 2009 Jon Ciesla <limb at jcomserv.net> - 1.9.3-5
+- Dropped and symlinked illegal sm and to fonts.
+- Symlinking to FreeSans.
+- Drop spell-check-logic.cgi, CVE-2008-5153, per upstream, BZ 472117, 472119, 472120.
+
 * Wed Dec 17 2008 Jon Ciesla <limb at jcomserv.net> - 1.9.3-4
 - Texed fix, BZ 476709.
 



From karsten at fedoraproject.org  Wed Jan 21 13:16:15 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Wed, 21 Jan 2009 13:16:15 +0000 (UTC)
Subject: rpms/hwdata/devel .cvsignore, 1.98, 1.99 hwdata.spec, 1.106,
	1.107 sources, 1.101, 1.102
Message-ID: <20090121131615.DBFA47012F@cvs1.fedora.phx.redhat.com>

Author: karsten

Update of /cvs/extras/rpms/hwdata/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24670

Modified Files:
	.cvsignore hwdata.spec sources 
Log Message:
- update usb.ids pci.ids oui.txt
- add new monitor entries from Mandriva hardware database (Thierry Vignaud)
- make generic entries have properly formated frequencies (Thierry Vignaud)
- remove duplicate Dell monitor entries (Thierry Vignaud)
- more vendor name fixes
- fix extra field in 'Compudyne KD-1500N' definition (Thierry Vignaud)
- make Dell monitors case consistent (Thierry Vignaud)
- make all GoldStar monitors have the same vendor name (Thierry Vignaud)
- add URL of git repository
- fix spacing (Thierry Vignaud)
- sort MonitorDB file with LANG=C sort -f -t ";" -k1,2
- add Samsung SyncMaster 2443BWX (Marc van den Dikkenberg)
- add some Lenovo monitors (Im Sza)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/hwdata/devel/.cvsignore,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -r1.98 -r1.99
--- .cvsignore	23 Jul 2008 10:20:23 -0000	1.98
+++ .cvsignore	21 Jan 2009 13:15:45 -0000	1.99
@@ -1 +1 @@
-hwdata-0.220.tar.bz2
+hwdata-0.221.tar.bz2


Index: hwdata.spec
===================================================================
RCS file: /cvs/extras/rpms/hwdata/devel/hwdata.spec,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -r1.106 -r1.107
--- hwdata.spec	23 Jul 2008 10:20:23 -0000	1.106
+++ hwdata.spec	21 Jan 2009 13:15:45 -0000	1.107
@@ -1,10 +1,11 @@
 Name: hwdata
 Summary: Hardware identification and configuration data
-Version: 0.220
+Version: 0.221
 Release: 1%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Base
 Source: hwdata-%{version}.tar.bz2
+URL:    http://git.fedorahosted.org/git/hwdata.git
 BuildArch: noarch
 Conflicts: Xconfigurator, system-config-display < 1.0.31, pcmcia-cs, kudzu < 1.2.0
 Requires: module-init-tools >= 3.2
@@ -36,6 +37,23 @@
 %{_datadir}/%{name}/*
 
 %changelog
+* Wed Jan 21 2009 Karsten Hopp <karsten at redhat.com> 0.221-1
+- update usb.ids pci.ids oui.txt
+
+* Tue Dec 02 2008 Karsten Hopp <karsten at redhat.com> 0.220-1
+- add new monitor entries from Mandriva hardware database (Thierry Vignaud)
+- make generic entries have properly formated frequencies (Thierry Vignaud)
+- remove duplicate Dell monitor entries (Thierry Vignaud)
+- more vendor name fixes
+- fix extra field in 'Compudyne KD-1500N' definition (Thierry Vignaud)
+- make Dell monitors case consistent (Thierry Vignaud)
+- make all GoldStar monitors have the same vendor name (Thierry Vignaud)
+- add URL of git repository
+- fix spacing (Thierry Vignaud)
+- sort MonitorDB file with LANG=C sort -f -t ";" -k1,2
+- add Samsung SyncMaster 2443BWX (Marc van den Dikkenberg)
+- add some Lenovo monitors (Im Sza)
+
 * Wed Jul 23 2008 Karsten Hopp <karsten at redhat.com> 0.220-1
 - update pci.ids, usb.ids, oui.txt
 - MonitorsDB: add some Samsung monitors (Ronald Warsow)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/hwdata/devel/sources,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -r1.101 -r1.102
--- sources	23 Jul 2008 10:20:23 -0000	1.101
+++ sources	21 Jan 2009 13:15:45 -0000	1.102
@@ -1 +1 @@
-80b74064c7bae6a18013b5525c6ceae6  hwdata-0.220.tar.bz2
+75b0f190c5b9ec165c0a793a2e298f49  hwdata-0.221.tar.bz2



From limb at fedoraproject.org  Wed Jan 21 13:19:25 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Wed, 21 Jan 2009 13:19:25 +0000 (UTC)
Subject: rpms/moodle/F-9 moodle.spec,1.26,1.27
Message-ID: <20090121131925.E4A2D7012F@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/moodle/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26184

Modified Files:
	moodle.spec 
Log Message:
Security fix.



Index: moodle.spec
===================================================================
RCS file: /cvs/pkgs/rpms/moodle/F-9/moodle.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- moodle.spec	18 Dec 2008 13:39:07 -0000	1.26
+++ moodle.spec	21 Jan 2009 13:18:55 -0000	1.27
@@ -7,7 +7,7 @@
 
 Name:           moodle
 Version:        1.9.3
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        A Course Management System
 
 Group:          Applications/Publishing
@@ -91,8 +91,10 @@
 Source73:       http://download.moodle.org/lang16/gu_utf8.zip
 Source74:       http://download.moodle.org/lang16/lo_utf8.zip
 Source75:       http://download.moodle.org/lang16/to_utf8.zip
+# Font removed, license violation.
 Source76:       http://download.moodle.org/lang16/mi_wwow_utf8.zip
 Source77:       http://download.moodle.org/lang16/sm_utf8.zip
+# Font removed, license violation.
 Source78:       http://download.moodle.org/lang16/ta_utf8.zip
 Source79:       http://download.moodle.org/lang16/hy_utf8.zip
 Source80:       http://download.moodle.org/lang16/mk_utf8.zip
@@ -110,6 +112,7 @@
 Requires:	php-Smarty
 Requires:	php-adodb
 Requires:	php-magpierss
+Requires:	freefont 
 Requires(post): /sbin/chkconfig
 Requires(preun): /sbin/chkconfig
 Requires(preun): /sbin/service
@@ -1095,6 +1098,7 @@
 Summary:        Moodle language pack for Samoan
 Group:          Applications/Publishing
 Requires:       moodle = %{version}-%{release}
+Requires:	dejavu-fonts
 
 %description    sm
 This package contains the files needed to display Moodle in Samoan.
@@ -1253,6 +1257,7 @@
 Summary:        Moodle language pack for Tonga
 Group:          Applications/Publishing
 Requires:       moodle = %{version}-%{release}
+Requires:	dejavu-fonts
 
 %description    to
 This package contains the files needed to display Moodle in Tonga.
@@ -1473,6 +1478,9 @@
 rm lib/editor/tinymce/jscripts/tiny_mce/themes/advanced/langs/tw.js
 rm lib/phpmailer/language/phpmailer.lang-fo.php
 
+#Drop spell-check-logic.cgi, CVE-2008-5153, per upstream.
+rm lib/editor/htmlarea/plugins/SpellChecker/spell-check-logic.cgi
+
 %install
 rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT%{moodlewebdir}
@@ -1498,6 +1506,14 @@
 rm -rf $RPM_BUILD_ROOT/var/www/moodle/web/lib/magpie
 ln -s /usr/share/php/magpierss/ $RPM_BUILD_ROOT/var/www/moodle/web/lib/magpie
 
+#symlinks for illegal fonts
+ln -s /usr/share/fonts/dejavu/DejaVuSans.ttf $RPM_BUILD_ROOT%{moodlewebdir}/lang/sm_utf8/fonts/default.ttf
+ln -s /usr/share/fonts/dejavu/DejaVuSans.ttf $RPM_BUILD_ROOT%{moodlewebdir}/lang/to_utf8/fonts/default.ttf
+
+#Symlink to FreeSans, to save space.
+rm -f $RPM_BUILD_ROOT%{moodlewebdir}/lib/default.ttf
+ln -s /usr/share/fonts/freefont/FreeSans.ttf $RPM_BUILD_ROOT%{moodlewebdir}/lib/default.ttf
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -1650,6 +1666,11 @@
 %{_sbindir}/%{name}-cron
 
 %changelog
+* Thu Jan 20 2009 Jon Ciesla <limb at jcomserv.net> - 1.9.3-5
+- Dropped and symlinked illegal sm and to fonts.
+- Symlinking to FreeSans.
+- Drop spell-check-logic.cgi, CVE-2008-5153, per upstream, BZ 472117, 472119, 472120.
+
 * Wed Dec 17 2008 Jon Ciesla <limb at jcomserv.net> - 1.9.3-4
 - Texed fix, BZ 476709.
 



From karsten at fedoraproject.org  Wed Jan 21 13:33:02 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Wed, 21 Jan 2009 13:33:02 +0000 (UTC)
Subject: rpms/automake/devel automake.spec,1.38,1.39
Message-ID: <20090121133302.C06C17012F@cvs1.fedora.phx.redhat.com>

Author: karsten

Update of /cvs/extras/rpms/automake/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31931

Modified Files:
	automake.spec 
Log Message:
- convert NEWS file to UTF-8 (#225302)


Index: automake.spec
===================================================================
RCS file: /cvs/extras/rpms/automake/devel/automake.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- automake.spec	14 Jan 2009 12:44:08 -0000	1.38
+++ automake.spec	21 Jan 2009 13:32:32 -0000	1.39
@@ -3,7 +3,7 @@
 Summary:    A GNU tool for automatically creating Makefiles
 Name:       automake
 Version:    %{api_version}.2
-Release:    1
+Release:    2
 License:    GPLv2+ and GFDL and MIT 
 Group:      Development/Tools
 Source:     http://ftp.gnu.org/gnu/automake/automake-%{version}.tar.bz2
@@ -40,6 +40,8 @@
    --bindir=%{_bindir} --datadir=%{_datadir} --libdir=%{_libdir} \
    --docdir=%{_docdir}/%{name}-%{version}
 make %{?_smp_mflags}
+mv -f NEWS NEWS_
+iconv -f ISO_8859-15 -t UTF-8 NEWS_ -o NEWS
 
 %install
 rm -rf ${RPM_BUILD_ROOT}
@@ -78,6 +80,9 @@
 %dir %{_datadir}/aclocal
 
 %changelog
+* Wed Jan 21 2009 Karsten Hopp <karsten at redhat.com> 1.10.2-2
+- convert NEWS file to UTF-8 (#225302)
+
 * Wed Jan 14 2009 Karsten Hopp <karsten at redhat.com> 1.10.2-1
 - version 1.10.2
 



From morgan at fedoraproject.org  Wed Jan 21 13:39:55 2009
From: morgan at fedoraproject.org (Morgan Collett)
Date: Wed, 21 Jan 2009 13:39:55 +0000 (UTC)
Subject: rpms/telepathy-gabble/OLPC-4 .cvsignore, 1.36,
	1.37 gabble-chmod-unix-socket.patch, 1.1, 1.2 sources, 1.36,
	1.37 telepathy-gabble.spec, 1.47, 1.48
Message-ID: <20090121133955.EA14D7012F@cvs1.fedora.phx.redhat.com>

Author: morgan

Update of /cvs/pkgs/rpms/telepathy-gabble/OLPC-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2178

Modified Files:
	.cvsignore gabble-chmod-unix-socket.patch sources 
	telepathy-gabble.spec 
Log Message:
Update to 0.7.18, update gabble chmod patch


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-gabble/OLPC-4/.cvsignore,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- .cvsignore	15 Dec 2008 07:32:58 -0000	1.36
+++ .cvsignore	21 Jan 2009 13:39:25 -0000	1.37
@@ -1 +1 @@
-telepathy-gabble-0.7.17.tar.gz
+telepathy-gabble-0.7.18.tar.gz

gabble-chmod-unix-socket.patch:

Index: gabble-chmod-unix-socket.patch
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-gabble/OLPC-4/gabble-chmod-unix-socket.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gabble-chmod-unix-socket.patch	27 Nov 2008 10:40:03 -0000	1.1
+++ gabble-chmod-unix-socket.patch	21 Jan 2009 13:39:25 -0000	1.2
@@ -1,14 +1,11 @@
-diff -rN -u old-telepathy-gabble-rainbow/src/tube-stream.c new-telepathy-gabble-rainbow/src/tube-stream.c
---- old-telepathy-gabble-rainbow/src/tube-stream.c	2007-12-11 16:28:48.000000000 +0100
-+++ new-telepathy-gabble-rainbow/src/tube-stream.c	2007-12-11 16:28:48.000000000 +0100
-@@ -650,6 +650,9 @@
-               "Error binding socket: %s", g_strerror (errno));
+--- a/src/tube-stream.c
++++ b/src/tube-stream.c
+@@ -667,6 +667,8 @@ tube_stream_open (GabbleTubeStream *self,
+           g_free (path);
            return FALSE;
          }
-+
 +      /* Everyone can use the socket */
-+      chmod (addr.sun_path, 0777);
++      chmod (path, 0777);
+       g_free (path);
      }
    else if (priv->address_type == TP_SOCKET_ADDRESS_TYPE_IPV4)
-     {
-


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-gabble/OLPC-4/sources,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- sources	15 Dec 2008 07:32:58 -0000	1.36
+++ sources	21 Jan 2009 13:39:25 -0000	1.37
@@ -1 +1 @@
-bc1fd0729c7011a2cbaa1ae29e9b60b5  telepathy-gabble-0.7.17.tar.gz
+807260037be70882be3bcdb6b26ff031  telepathy-gabble-0.7.18.tar.gz


Index: telepathy-gabble.spec
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-gabble/OLPC-4/telepathy-gabble.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- telepathy-gabble.spec	15 Dec 2008 07:32:58 -0000	1.47
+++ telepathy-gabble.spec	21 Jan 2009 13:39:25 -0000	1.48
@@ -1,5 +1,5 @@
 Name:           telepathy-gabble
-Version:        0.7.17
+Version:        0.7.18
 Release:        1%{?dist}
 Summary:        A Jabber/XMPP connection manager
 
@@ -61,6 +61,10 @@
 
 
 %changelog
+* Wed Jan 21 2009 Morgan Collett <morgan.collett at gmail.com> - 0.7.18-1
+- Update to 0.7.18
+- Adapt gabble-chmod-unix-socket.patch to upstream changes
+
 * Mon Dec 15 2008 Morgan Collett <morgan.collett at gmail.com> - 0.7.17-1
 - Update to 0.7.17
 



From morgan at fedoraproject.org  Wed Jan 21 13:41:59 2009
From: morgan at fedoraproject.org (Morgan Collett)
Date: Wed, 21 Jan 2009 13:41:59 +0000 (UTC)
Subject: rpms/telepathy-salut/OLPC-4 .cvsignore, 1.16, 1.17 sources, 1.16,
	1.17 telepathy-salut.spec, 1.22, 1.23
Message-ID: <20090121134159.CA1C97012F@cvs1.fedora.phx.redhat.com>

Author: morgan

Update of /cvs/pkgs/rpms/telepathy-salut/OLPC-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3098

Modified Files:
	.cvsignore sources telepathy-salut.spec 
Log Message:
Update to 0.3.7


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-salut/OLPC-4/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore	15 Dec 2008 09:51:38 -0000	1.16
+++ .cvsignore	21 Jan 2009 13:41:29 -0000	1.17
@@ -1 +1 @@
-telepathy-salut-0.3.6.tar.gz
+telepathy-salut-0.3.7.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-salut/OLPC-4/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources	15 Dec 2008 09:51:38 -0000	1.16
+++ sources	21 Jan 2009 13:41:29 -0000	1.17
@@ -1 +1 @@
-ccd02baafbbd708c11e4f770715065f4  telepathy-salut-0.3.6.tar.gz
+0019eb92a06edf4e61b7a4cb8bc88d40  telepathy-salut-0.3.7.tar.gz


Index: telepathy-salut.spec
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-salut/OLPC-4/telepathy-salut.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- telepathy-salut.spec	15 Dec 2008 09:51:38 -0000	1.22
+++ telepathy-salut.spec	21 Jan 2009 13:41:29 -0000	1.23
@@ -1,5 +1,5 @@
 Name:           telepathy-salut
-Version:        0.3.6
+Version:        0.3.7
 Release:        1%{?dist}
 Summary:        Link-local XMPP telepathy connection manager
 
@@ -64,6 +64,9 @@
 %{_mandir}/man8/%{name}.8.gz
 
 %changelog
+* Web Jan 21 2009 Morgan Collett <morgan.collett at gmail.com> - 0.3.7-1
+- Update to 0.3.7
+
 * Mon Dec 15 2008 Morgan Collett <morgan.collett at gmail.com> - 0.3.6-1
 - Update to 0.3.6
 - Add --enable-ssl from devel packaging



From mcpierce at fedoraproject.org  Wed Jan 21 13:44:56 2009
From: mcpierce at fedoraproject.org (Darryl L. Pierce)
Date: Wed, 21 Jan 2009 13:44:56 +0000 (UTC)
Subject: rpms/rubygem-hoe/F-10 .cvsignore, 1.8, 1.9 rubygem-hoe.spec, 1.11, 
	1.12 sources, 1.8, 1.9
Message-ID: <20090121134456.CFC3A7012F@cvs1.fedora.phx.redhat.com>

Author: mcpierce

Update of /cvs/pkgs/rpms/rubygem-hoe/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4180

Modified Files:
	.cvsignore rubygem-hoe.spec sources 
Log Message:
Release 1.8.3 of Hoe.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-hoe/F-10/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	27 Oct 2008 13:46:46 -0000	1.8
+++ .cvsignore	21 Jan 2009 13:44:26 -0000	1.9
@@ -1 +1 @@
-hoe-1.8.2.gem
+hoe-1.8.3.gem


Index: rubygem-hoe.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-hoe/F-10/rubygem-hoe.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- rubygem-hoe.spec	27 Oct 2008 13:46:46 -0000	1.11
+++ rubygem-hoe.spec	21 Jan 2009 13:44:26 -0000	1.12
@@ -5,7 +5,7 @@
 
 Summary:    	Hoe is a simple rake/rubygems helper for project Rakefiles
 Name:       	rubygem-%{gemname}
-Version:    	1.8.2
+Version:    	1.8.3
 Release:    	1%{?dist}
 Group:      	Development/Languages
 License:    	MIT
@@ -14,7 +14,7 @@
 BuildRoot:  	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:   	ruby(abi) = 1.8
 Requires:   	rubygems
-Requires:   	rubygem(rubyforge) >= 1.0.1
+Requires:   	rubygem(rubyforge) >= 1.0.2
 Requires:   	rubygem(rake) >= 0.8.3
 BuildRequires:  rubygems
 BuildArch:  	noarch
@@ -82,6 +82,9 @@
 
 
 %changelog
+* Wed Jan 21 2009 Darryl Pierce <dpierce at redhat.com> - 1.8.3-1
+- Release 1.8.3 of Hoe.
+
 * Mon Oct 27 2008 Darryl Pierce <dpierce at redhat.com> - 1.8.2-1
 - Release 1.8.2 of Hoe.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-hoe/F-10/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	27 Oct 2008 13:46:46 -0000	1.8
+++ sources	21 Jan 2009 13:44:26 -0000	1.9
@@ -1 +1 @@
-86559db603b4e2891a01e7cb01b6f663  hoe-1.8.2.gem
+95f603835ebc7a892c06a0aaea4f119b  hoe-1.8.3.gem



From morgan at fedoraproject.org  Wed Jan 21 13:45:47 2009
From: morgan at fedoraproject.org (Morgan Collett)
Date: Wed, 21 Jan 2009 13:45:47 +0000 (UTC)
Subject: rpms/telepathy-salut/OLPC-4 telepathy-salut.spec,1.23,1.24
Message-ID: <20090121134547.AD15D7012F@cvs1.fedora.phx.redhat.com>

Author: morgan

Update of /cvs/pkgs/rpms/telepathy-salut/OLPC-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4622

Modified Files:
	telepathy-salut.spec 
Log Message:
Fix date


Index: telepathy-salut.spec
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-salut/OLPC-4/telepathy-salut.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- telepathy-salut.spec	21 Jan 2009 13:41:29 -0000	1.23
+++ telepathy-salut.spec	21 Jan 2009 13:45:17 -0000	1.24
@@ -64,7 +64,7 @@
 %{_mandir}/man8/%{name}.8.gz
 
 %changelog
-* Web Jan 21 2009 Morgan Collett <morgan.collett at gmail.com> - 0.3.7-1
+* Wed Jan 21 2009 Morgan Collett <morgan.collett at gmail.com> - 0.3.7-1
 - Update to 0.3.7
 
 * Mon Dec 15 2008 Morgan Collett <morgan.collett at gmail.com> - 0.3.6-1



From mhlavink at fedoraproject.org  Wed Jan 21 13:50:37 2009
From: mhlavink at fedoraproject.org (Michal Hlavinka)
Date: Wed, 21 Jan 2009 13:50:37 +0000 (UTC)
Subject: rpms/cyrus-imapd/devel cyrus-imapd-2.3.1-authid_normalize.patch, 1.2,
	1.3 cyrus-imapd.spec, 1.45, 1.46
Message-ID: <20090121135037.80E997012F@cvs1.fedora.phx.redhat.com>

Author: mhlavink

Update of /cvs/extras/rpms/cyrus-imapd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6706

Modified Files:
	cyrus-imapd-2.3.1-authid_normalize.patch cyrus-imapd.spec 
Log Message:
fix: #480138 - assertion failed: libcyr_cfg.c: cyrus_options[opt].opt == opt


cyrus-imapd-2.3.1-authid_normalize.patch:

Index: cyrus-imapd-2.3.1-authid_normalize.patch
===================================================================
RCS file: /cvs/extras/rpms/cyrus-imapd/devel/cyrus-imapd-2.3.1-authid_normalize.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- cyrus-imapd-2.3.1-authid_normalize.patch	13 Jan 2009 19:26:23 -0000	1.2
+++ cyrus-imapd-2.3.1-authid_normalize.patch	21 Jan 2009 13:50:36 -0000	1.3
@@ -1,14 +1,14 @@
 --- cyrus-imapd-2.3.13/lib/libcyr_cfg.h.authid_normalize	2008-07-30 18:03:39.000000000 +0200
 +++ cyrus-imapd-2.3.13/lib/libcyr_cfg.h	2009-01-13 11:41:59.000000000 +0100
-@@ -100,6 +100,8 @@
-     CYRUSOPT_BERKELEY_TXNS_MAX,
-     /* RFC 2086 right which allows DELETE ("c") */
-     CYRUSOPT_DELETERIGHT,
+@@ -112,6 +112,8 @@ enum cyrus_opt {
+     CYRUSOPT_SQL_PASSWD,
+     /* Secure SQL connection (OFF) */
+     CYRUSOPT_SQL_USESSL,
 +    /* Lowercase uid and strip leading and trailing blanks (OFF) */
 +    CYRUSOPT_NORMALIZEUID,
-     /* SQL database */
-     CYRUSOPT_SQL_DATABASE,
-     /* SQL engine ("mysql") */
+ 
+     CYRUSOPT_LAST
+     
 --- cyrus-imapd-2.3.13/lib/auth_unix.c.authid_normalize	2009-01-13 11:38:08.000000000 +0100
 +++ cyrus-imapd-2.3.13/lib/auth_unix.c	2009-01-13 11:38:08.000000000 +0100
 @@ -155,10 +155,12 @@


Index: cyrus-imapd.spec
===================================================================
RCS file: /cvs/extras/rpms/cyrus-imapd/devel/cyrus-imapd.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- cyrus-imapd.spec	13 Jan 2009 19:26:24 -0000	1.45
+++ cyrus-imapd.spec	21 Jan 2009 13:50:36 -0000	1.46
@@ -1,7 +1,7 @@
 %define upstream_ver 2.3.13
 Name: cyrus-imapd
 Version: 2.3.13
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 # ********************** BUILD TIME OPTIONS START **********************
 
@@ -786,6 +786,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Wed Jan 21 2009 Michal Hlavinka <mhlavink at redhat.com> - 2.3.13-2
+- fix: #480138 - assertion failed: libcyr_cfg.c: cyrus_options[opt].opt == opt
+
 * Tue Jan 13 2009 Michal Hlavinka <mhlavink at redhat.com> - 2.3.13-1
 - updated to 2.3.13
 



From limb at fedoraproject.org  Wed Jan 21 13:51:48 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Wed, 21 Jan 2009 13:51:48 +0000 (UTC)
Subject: rpms/moodle/devel sources,1.18,1.19
Message-ID: <20090121135148.721737012F@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/moodle/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7030

Modified Files:
	sources 
Log Message:
Sources oops.



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/moodle/devel/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources	7 Nov 2008 15:14:38 -0000	1.18
+++ sources	21 Jan 2009 13:51:18 -0000	1.19
@@ -59,7 +59,7 @@
 f71043a06d109c41ac4b8e15ede00227  si_utf8.zip
 689b858b77c1db3915dc32b61d6fccc6  sk_utf8.zip
 0df008f4b865f2fdbc3ec31ef40c1899  sl_utf8.zip
-80ebcd2e8438e71849655b178907c652  sm_utf8.zip
+2c3e3b4155575f94b10438338f8a330c  sm_utf8.zip
 844874f29faa55b8ab0272d35fada64e  so_utf8.zip
 43d9d26a9298048ea0f90fa48ca2a8bb  sq_utf8.zip
 7fbdea7fdf0922f93f4865ddf6d389c4  sr_cr_bo_utf8.zip
@@ -70,7 +70,7 @@
 6017938ee311e0ac9b5c72a66a546e6f  ta_utf8.zip
 406609dd5034cdbf6405dbba53be1dae  th_utf8.zip
 1e9a9df6798d03a22dec96b052e65ca7  tl_utf8.zip
-67d775be32c00802772d2b2c3ce044d9  to_utf8.zip
+6d202edcba00c09fa7cb09aee8dd32c3  to_utf8.zip
 3677cacaaf37e493abc36fbc29c19823  tr_utf8.zip
 7c10ddba1cd7110c00bcd100b35c0ad8  uk_utf8.zip
 9ca04547794a5b5e88247e8915624775  uz_utf8.zip



From morgan at fedoraproject.org  Wed Jan 21 13:56:49 2009
From: morgan at fedoraproject.org (Morgan Collett)
Date: Wed, 21 Jan 2009 13:56:49 +0000 (UTC)
Subject: rpms/telepathy-salut/OLPC-4 telepathy-salut.spec,1.24,1.25
Message-ID: <20090121135649.2B0627012F@cvs1.fedora.phx.redhat.com>

Author: morgan

Update of /cvs/pkgs/rpms/telepathy-salut/OLPC-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9674

Modified Files:
	telepathy-salut.spec 
Log Message:
Fix dep on libsoup-devel


Index: telepathy-salut.spec
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-salut/OLPC-4/telepathy-salut.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- telepathy-salut.spec	21 Jan 2009 13:45:17 -0000	1.24
+++ telepathy-salut.spec	21 Jan 2009 13:56:18 -0000	1.25
@@ -1,6 +1,6 @@
 Name:           telepathy-salut
 Version:        0.3.7
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Link-local XMPP telepathy connection manager
 
 Group:          Applications/Communications
@@ -21,7 +21,7 @@
 BuildRequires:	libxslt
 BuildRequires:	libasyncns-devel >= 0.3
 BuildRequires:	telepathy-glib-devel >= 0.7.17
-BuildRequires:	libsoup22-devel
+BuildRequires:	libsoup-devel
 BuildRequires:	check-devel >= 0.9.4
 
 Requires:	telepathy-filesystem
@@ -64,6 +64,9 @@
 %{_mandir}/man8/%{name}.8.gz
 
 %changelog
+* Wed Jan 21 2009 Morgan Collett <morgan.collett at gmail.com> - 0.3.7-2
+- Fix dep on libsoup 2.4
+
 * Wed Jan 21 2009 Morgan Collett <morgan.collett at gmail.com> - 0.3.7-1
 - Update to 0.3.7
 



From sarantis at fedoraproject.org  Wed Jan 21 14:03:47 2009
From: sarantis at fedoraproject.org (Sarantis Paskalis)
Date: Wed, 21 Jan 2009 14:03:47 +0000 (UTC)
Subject: comps comps-f11.xml.in,1.70,1.71
Message-ID: <20090121140347.423827012F@cvs1.fedora.phx.redhat.com>

Author: sarantis

Update of /cvs/extras/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11859

Modified Files:
	comps-f11.xml.in 
Log Message:
Replace tetex-font-cm-lgc with tex-cm-lgc
Add new optional greek TeX support with tex-cm-lgc
Add new optional greek support with ctan-cm-lgc-*-fonts



Index: comps-f11.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-f11.xml.in,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- comps-f11.xml.in	21 Jan 2009 02:26:07 -0000	1.70
+++ comps-f11.xml.in	21 Jan 2009 14:03:16 -0000	1.71
@@ -138,7 +138,7 @@
     <default>false</default>
     <uservisible>true</uservisible>
     <packagelist>
-      <packagereq type="conditional" requires="texlive">tetex-font-cm-lgc</packagereq>
+      <packagereq type="conditional" requires="texlive">tex-cm-lgc</packagereq>
       <packagereq type="default">docbook-slides</packagereq>
       <packagereq type="default">docbook-style-dsssl</packagereq>
       <packagereq type="default">docbook-style-xsl</packagereq>
@@ -2382,7 +2382,11 @@
       <packagereq type="conditional" requires="koffice-core">koffice-langpack-el</packagereq>
       <packagereq type="conditional" requires="moodle">moodle-el</packagereq>
       <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-el_GR</packagereq>
+      <packagereq type="conditional" requires="texlive">tex-cm-lgc</packagereq>
       <packagereq type="conditional" requires="texlive">tetex-font-kerkis</packagereq>
+      <packagereq type="optional">ctan-cm-lgc-roman-fonts</packagereq>
+      <packagereq type="optional">ctan-cm-lgc-sans-fonts</packagereq>
+      <packagereq type="optional">ctan-cm-lgc-typewriter-fonts</packagereq>
       <packagereq type="optional">gfs-ambrosia-fonts</packagereq>
       <packagereq type="optional">gfs-artemisia-fonts</packagereq>
       <packagereq type="optional">gfs-baskerville-fonts</packagereq>



From limb at fedoraproject.org  Wed Jan 21 14:06:42 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Wed, 21 Jan 2009 14:06:42 +0000 (UTC)
Subject: rpms/moodle/F-9 sources,1.17,1.18
Message-ID: <20090121140642.1547C70141@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/moodle/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13186/F-9

Modified Files:
	sources 
Log Message:
Sources oops.



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/moodle/F-9/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources	7 Nov 2008 15:50:42 -0000	1.17
+++ sources	21 Jan 2009 14:06:11 -0000	1.18
@@ -59,7 +59,7 @@
 f71043a06d109c41ac4b8e15ede00227  si_utf8.zip
 689b858b77c1db3915dc32b61d6fccc6  sk_utf8.zip
 0df008f4b865f2fdbc3ec31ef40c1899  sl_utf8.zip
-80ebcd2e8438e71849655b178907c652  sm_utf8.zip
+2c3e3b4155575f94b10438338f8a330c  sm_utf8.zip
 844874f29faa55b8ab0272d35fada64e  so_utf8.zip
 43d9d26a9298048ea0f90fa48ca2a8bb  sq_utf8.zip
 7fbdea7fdf0922f93f4865ddf6d389c4  sr_cr_bo_utf8.zip
@@ -70,7 +70,7 @@
 6017938ee311e0ac9b5c72a66a546e6f  ta_utf8.zip
 406609dd5034cdbf6405dbba53be1dae  th_utf8.zip
 1e9a9df6798d03a22dec96b052e65ca7  tl_utf8.zip
-67d775be32c00802772d2b2c3ce044d9  to_utf8.zip
+6d202edcba00c09fa7cb09aee8dd32c3  to_utf8.zip
 3677cacaaf37e493abc36fbc29c19823  tr_utf8.zip
 7c10ddba1cd7110c00bcd100b35c0ad8  uk_utf8.zip
 9ca04547794a5b5e88247e8915624775  uz_utf8.zip



From limb at fedoraproject.org  Wed Jan 21 14:06:41 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Wed, 21 Jan 2009 14:06:41 +0000 (UTC)
Subject: rpms/moodle/F-10 sources,1.18,1.19
Message-ID: <20090121140641.E99977012F@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/moodle/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13186/F-10

Modified Files:
	sources 
Log Message:
Sources oops.



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/moodle/F-10/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources	7 Nov 2008 15:50:41 -0000	1.18
+++ sources	21 Jan 2009 14:06:11 -0000	1.19
@@ -59,7 +59,7 @@
 f71043a06d109c41ac4b8e15ede00227  si_utf8.zip
 689b858b77c1db3915dc32b61d6fccc6  sk_utf8.zip
 0df008f4b865f2fdbc3ec31ef40c1899  sl_utf8.zip
-80ebcd2e8438e71849655b178907c652  sm_utf8.zip
+2c3e3b4155575f94b10438338f8a330c  sm_utf8.zip
 844874f29faa55b8ab0272d35fada64e  so_utf8.zip
 43d9d26a9298048ea0f90fa48ca2a8bb  sq_utf8.zip
 7fbdea7fdf0922f93f4865ddf6d389c4  sr_cr_bo_utf8.zip
@@ -70,7 +70,7 @@
 6017938ee311e0ac9b5c72a66a546e6f  ta_utf8.zip
 406609dd5034cdbf6405dbba53be1dae  th_utf8.zip
 1e9a9df6798d03a22dec96b052e65ca7  tl_utf8.zip
-67d775be32c00802772d2b2c3ce044d9  to_utf8.zip
+6d202edcba00c09fa7cb09aee8dd32c3  to_utf8.zip
 3677cacaaf37e493abc36fbc29c19823  tr_utf8.zip
 7c10ddba1cd7110c00bcd100b35c0ad8  uk_utf8.zip
 9ca04547794a5b5e88247e8915624775  uz_utf8.zip



From sarantis at fedoraproject.org  Wed Jan 21 14:10:16 2009
From: sarantis at fedoraproject.org (Sarantis Paskalis)
Date: Wed, 21 Jan 2009 14:10:16 +0000 (UTC)
Subject: comps comps-f11.xml.in,1.71,1.72
Message-ID: <20090121141016.613E37012F@cvs1.fedora.phx.redhat.com>

Author: sarantis

Update of /cvs/extras/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14577

Modified Files:
	comps-f11.xml.in 
Log Message:
whitespace fix



Index: comps-f11.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-f11.xml.in,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- comps-f11.xml.in	21 Jan 2009 14:03:16 -0000	1.71
+++ comps-f11.xml.in	21 Jan 2009 14:09:46 -0000	1.72
@@ -2382,8 +2382,8 @@
       <packagereq type="conditional" requires="koffice-core">koffice-langpack-el</packagereq>
       <packagereq type="conditional" requires="moodle">moodle-el</packagereq>
       <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-el_GR</packagereq>
-      <packagereq type="conditional" requires="texlive">tex-cm-lgc</packagereq>
       <packagereq type="conditional" requires="texlive">tetex-font-kerkis</packagereq>
+      <packagereq type="conditional" requires="texlive">tex-cm-lgc</packagereq>
       <packagereq type="optional">ctan-cm-lgc-roman-fonts</packagereq>
       <packagereq type="optional">ctan-cm-lgc-sans-fonts</packagereq>
       <packagereq type="optional">ctan-cm-lgc-typewriter-fonts</packagereq>



From sarantis at fedoraproject.org  Wed Jan 21 14:15:15 2009
From: sarantis at fedoraproject.org (Sarantis Paskalis)
Date: Wed, 21 Jan 2009 14:15:15 +0000 (UTC)
Subject: comps comps-f11.xml.in,1.72,1.73
Message-ID: <20090121141515.5FAF07012F@cvs1.fedora.phx.redhat.com>

Author: sarantis

Update of /cvs/extras/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16448

Modified Files:
	comps-f11.xml.in 
Log Message:
add ctan-cm-lgc-*-fonts to the fonts group



Index: comps-f11.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-f11.xml.in,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- comps-f11.xml.in	21 Jan 2009 14:09:46 -0000	1.72
+++ comps-f11.xml.in	21 Jan 2009 14:14:44 -0000	1.73
@@ -1500,6 +1500,9 @@
       <packagereq type="optional">brettfont-fonts</packagereq>
       <packagereq type="optional">charis-fonts</packagereq>
       <packagereq type="optional">cjkunifonts-ukai</packagereq>
+      <packagereq type="optional">ctan-cm-lgc-roman-fonts</packagereq>
+      <packagereq type="optional">ctan-cm-lgc-sans-fonts</packagereq>
+      <packagereq type="optional">ctan-cm-lgc-typewriter-fonts</packagereq>
       <packagereq type="optional">darkgarden-fonts</packagereq>
       <packagereq type="optional">dejavu-lgc-sans-fonts</packagereq>
       <packagereq type="optional">dejavu-lgc-sans-mono-fonts</packagereq>



From rdieter at fedoraproject.org  Wed Jan 21 14:29:28 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed, 21 Jan 2009 14:29:28 +0000 (UTC)
Subject: rpms/kdebase3/F-9 kdebase3.spec,1.69,1.70
Message-ID: <20090121142928.E59037012F@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdebase3/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22252/F-9

Modified Files:
	kdebase3.spec 
Log Message:
* Mon Dec 22 2008 Rex Dieter <rdieter at fedoraproject.org> - 3.5.10-4
- omit (nonfunctional) kdesu (F9+)

* Mon Dec 08 2008 Rex Dieter <rdieter at fedoraproject.org> - 3.5.10-3
- omit kate.png conflicts (w/kdesdk42)



Index: kdebase3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase3/F-9/kdebase3.spec,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- kdebase3.spec	8 Oct 2008 10:01:55 -0000	1.69
+++ kdebase3.spec	21 Jan 2009 14:28:58 -0000	1.70
@@ -14,7 +14,7 @@
 %define _with_samba --with-samba
 
 Version: 3.5.10
-Release: 2%{?dist}.1
+Release: 4%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdebase3
@@ -355,13 +355,13 @@
 unset QTDIR && . /etc/profile.d/qt.sh
 
 %if "%{name}" != "kdebase"
-export DO_NOT_COMPILE="kappfinder kdesktop klipper kdm kmenuedit kpager kpersonalizer ktip nsplugins"
+export DO_NOT_COMPILE="kappfinder kdesktop kdesu klipper kdm kmenuedit kpager kpersonalizer ktip nsplugins"
 export DO_NOT_COMPILE="$DO_NOT_COMPILE konqueror kscreensaver ksysguard knetattach kwin"
 export DO_NOT_COMPILE="$DO_NOT_COMPILE kdialog kicker ksplashml khelpcenter kxkb"
 export DO_NOT_COMPILE="$DO_NOT_COMPILE khotkeys kdepasswd kcheckpass drkonqi"
-# Keep these (kcontrol for kcms, konsole for KonsolePart, kioslave for ioslaves,
-# kate for kscope, kdesu until we figure out what to do about it)
-# export DO_NOT_COMPILE="$DO_NOT_COMPILE kcontrol konsole kioslave kate kdesu"
+# Keep these (kcontrol for kcms, konsole for KonsolePart, kioslave for ioslaves
+# kate for kscope
+# export DO_NOT_COMPILE="$DO_NOT_COMPILE kcontrol konsole kioslave kate"
 %endif
 
 %configure \
@@ -564,6 +564,7 @@
 
 # hicolor
 rm -rf %{buildroot}%{_datadir}/icons/hicolor/*/apps/kappfinder.*
+rm -rf %{buildroot}%{_datadir}/icons/hicolor/*/apps/kate.*
 rm -rf %{buildroot}%{_datadir}/icons/hicolor/*/apps/khelpcenter.*
 rm -rf %{buildroot}%{_datadir}/icons/hicolor/*/apps/knetattach.*
 rm -rf %{buildroot}%{_datadir}/icons/hicolor/*/apps/kfind.*
@@ -710,6 +711,8 @@
 %{_bindir}/kdebugdialog
 %{_bindir}/kdeinstallktheme
 %{_bindir}/kdepasswd
+%{_bindir}/kdesu
+%attr(0755,root,root) %{_bindir}/kdesud
 %{_bindir}/kdialog
 %{_bindir}/kdm
 %{_bindir}/kdmctl
@@ -797,8 +800,6 @@
 %{_bindir}/kio_system_documenthelper
 %{_bindir}/kdcop
 %{_bindir}/kdeprintfax
-%{_bindir}/kdesu
-%attr(0755,root,root) %{_bindir}/kdesud
 %{_bindir}/kjobviewer
 %{_bindir}/klocaldomainurifilterhelper
 %{_bindir}/kprinter
@@ -863,6 +864,12 @@
 
 
 %changelog
+* Mon Dec 22 2008 Rex Dieter <rdieter at fedoraproject.org> - 3.5.10-4
+- omit (nonfunctional) kdesu (F9+)
+
+* Mon Dec 08 2008 Rex Dieter <rdieter at fedoraproject.org> - 3.5.10-3
+- omit kate.png conflicts (w/kdesdk42)
+
 * Wed Oct 08 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> - 3.5.10-2.1
 - add upstream patch to support decimal comma in the minicli calculator
 



From rdieter at fedoraproject.org  Wed Jan 21 14:29:29 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed, 21 Jan 2009 14:29:29 +0000 (UTC)
Subject: rpms/kdebase3/F-10 kdebase3.spec,1.72,1.73
Message-ID: <20090121142929.3744270142@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdebase3/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22252/F-10

Modified Files:
	kdebase3.spec 
Log Message:
* Mon Dec 22 2008 Rex Dieter <rdieter at fedoraproject.org> - 3.5.10-4
- omit (nonfunctional) kdesu (F9+)

* Mon Dec 08 2008 Rex Dieter <rdieter at fedoraproject.org> - 3.5.10-3
- omit kate.png conflicts (w/kdesdk42)



Index: kdebase3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase3/F-10/kdebase3.spec,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- kdebase3.spec	8 Oct 2008 10:01:55 -0000	1.72
+++ kdebase3.spec	21 Jan 2009 14:28:58 -0000	1.73
@@ -14,7 +14,7 @@
 %define _with_samba --with-samba
 
 Version: 3.5.10
-Release: 2%{?dist}.1
+Release: 4%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdebase3
@@ -355,13 +355,13 @@
 unset QTDIR && . /etc/profile.d/qt.sh
 
 %if "%{name}" != "kdebase"
-export DO_NOT_COMPILE="kappfinder kdesktop klipper kdm kmenuedit kpager kpersonalizer ktip nsplugins"
+export DO_NOT_COMPILE="kappfinder kdesktop kdesu klipper kdm kmenuedit kpager kpersonalizer ktip nsplugins"
 export DO_NOT_COMPILE="$DO_NOT_COMPILE konqueror kscreensaver ksysguard knetattach kwin"
 export DO_NOT_COMPILE="$DO_NOT_COMPILE kdialog kicker ksplashml khelpcenter kxkb"
 export DO_NOT_COMPILE="$DO_NOT_COMPILE khotkeys kdepasswd kcheckpass drkonqi"
-# Keep these (kcontrol for kcms, konsole for KonsolePart, kioslave for ioslaves,
-# kate for kscope, kdesu until we figure out what to do about it)
-# export DO_NOT_COMPILE="$DO_NOT_COMPILE kcontrol konsole kioslave kate kdesu"
+# Keep these (kcontrol for kcms, konsole for KonsolePart, kioslave for ioslaves
+# kate for kscope
+# export DO_NOT_COMPILE="$DO_NOT_COMPILE kcontrol konsole kioslave kate"
 %endif
 
 %configure \
@@ -564,6 +564,7 @@
 
 # hicolor
 rm -rf %{buildroot}%{_datadir}/icons/hicolor/*/apps/kappfinder.*
+rm -rf %{buildroot}%{_datadir}/icons/hicolor/*/apps/kate.*
 rm -rf %{buildroot}%{_datadir}/icons/hicolor/*/apps/khelpcenter.*
 rm -rf %{buildroot}%{_datadir}/icons/hicolor/*/apps/knetattach.*
 rm -rf %{buildroot}%{_datadir}/icons/hicolor/*/apps/kfind.*
@@ -710,6 +711,8 @@
 %{_bindir}/kdebugdialog
 %{_bindir}/kdeinstallktheme
 %{_bindir}/kdepasswd
+%{_bindir}/kdesu
+%attr(0755,root,root) %{_bindir}/kdesud
 %{_bindir}/kdialog
 %{_bindir}/kdm
 %{_bindir}/kdmctl
@@ -797,8 +800,6 @@
 %{_bindir}/kio_system_documenthelper
 %{_bindir}/kdcop
 %{_bindir}/kdeprintfax
-%{_bindir}/kdesu
-%attr(0755,root,root) %{_bindir}/kdesud
 %{_bindir}/kjobviewer
 %{_bindir}/klocaldomainurifilterhelper
 %{_bindir}/kprinter
@@ -863,6 +864,12 @@
 
 
 %changelog
+* Mon Dec 22 2008 Rex Dieter <rdieter at fedoraproject.org> - 3.5.10-4
+- omit (nonfunctional) kdesu (F9+)
+
+* Mon Dec 08 2008 Rex Dieter <rdieter at fedoraproject.org> - 3.5.10-3
+- omit kate.png conflicts (w/kdesdk42)
+
 * Wed Oct 08 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> - 3.5.10-2.1
 - add upstream patch to support decimal comma in the minicli calculator
 



From nsantos at fedoraproject.org  Wed Jan 21 14:46:55 2009
From: nsantos at fedoraproject.org (Nuno Santos)
Date: Wed, 21 Jan 2009 14:46:55 +0000 (UTC)
Subject: rpms/qpidc/F-10 qpidc.spec,1.58,1.59
Message-ID: <20090121144655.270567012F@cvs1.fedora.phx.redhat.com>

Author: nsantos

Update of /cvs/extras/rpms/qpidc/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28399

Modified Files:
	qpidc.spec 
Log Message:
BZ474614 and BZ474613 - qpidc/rhm unowned directories


Index: qpidc.spec
===================================================================
RCS file: /cvs/extras/rpms/qpidc/F-10/qpidc.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- qpidc.spec	15 Jan 2009 01:39:09 -0000	1.58
+++ qpidc.spec	21 Jan 2009 14:46:24 -0000	1.59
@@ -7,7 +7,7 @@
 
 Name:           qpidc
 Version:        0.4.734452
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Libraries for Qpid C++ client applications
 Group:          System Environment/Libraries
 License:        ASL 2.0
@@ -190,7 +190,7 @@
 %configure --disable-static --with-cpg --without-graphviz --without-help2man
 make #%{?_smp_mflags}
 # Remove this generated perl file, we don't need it and it upsets rpmlint.
-# This is generating an error as of 21 Nov 08 becausethe file doesn't exist .
+# This is generating an error as of 21 Nov 08 because the file doesn't exist.
 # rm docs/api/html/installdox
 
 # Make perftest utilities
@@ -238,6 +238,8 @@
 %_libdir/libqpidcommon.so.0.1.0
 %_libdir/libqpidclient.so.0
 %_libdir/libqpidclient.so.0.1.0
+%_libdir/qpid/client
+%_sysconfdir/qpid
 %config(noreplace) %_sysconfdir/qpid/qpidc.conf
 
 %files devel
@@ -251,6 +253,7 @@
 %_includedir/qpid/log
 %_includedir/qpid/management
 %_includedir/qpid/agent
+%_includedir/qpid
 %_includedir/qmf
 %_libdir/libqpidcommon.so
 %_libdir/libqpidclient.so
@@ -265,6 +268,7 @@
 %config(noreplace) %_sysconfdir/qpidd.conf
 %config(noreplace) %_sysconfdir/sasl2/qpidd.conf
 %{_initrddir}/qpidd
+%_libdir/qpid/daemon
 %attr(755, qpidd, qpidd) %_localstatedir/lib/qpidd
 %attr(755, qpidd, qpidd) %_libdir/qpidd
 %attr(755, qpidd, qpidd) /var/run/qpidd
@@ -368,7 +372,10 @@
 %postun -n qmf -p /sbin/ldconfig
 
 %changelog
-* Wed Jan 14 2009 Nuno Santos <nsantos at redhat.com> - 0.4.734452-1
+* Tue Jan 20 2009 Nuno Santos <nsantos at redhat.com> - 0.4.734452-2
+- BZ474614 and BZ474613 - qpidc/rhm unowned directories
+
+* Thu Jan 15 2009 Nuno Santos <nsantos at redhat.com> - 0.4.734452-1
 - Rebased to svn rev 734452
 
 * Tue Dec 23 2008 Nuno Santos <nsantos at redhat.com> - 0.4.728142-1



From mhlavink at fedoraproject.org  Wed Jan 21 14:47:52 2009
From: mhlavink at fedoraproject.org (Michal Hlavinka)
Date: Wed, 21 Jan 2009 14:47:52 +0000 (UTC)
Subject: rpms/cyrus-imapd/F-10 cyrus-imapd-2.3.1-authid_normalize.patch, 1.2,
	1.3 cyrus-imapd.spec, 1.45, 1.46
Message-ID: <20090121144752.6C5017012F@cvs1.fedora.phx.redhat.com>

Author: mhlavink

Update of /cvs/extras/rpms/cyrus-imapd/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28765

Modified Files:
	cyrus-imapd-2.3.1-authid_normalize.patch cyrus-imapd.spec 
Log Message:
fix: #480138 - assertion failed: libcyr_cfg.c: cyrus_options[opt].opt == opt


cyrus-imapd-2.3.1-authid_normalize.patch:

Index: cyrus-imapd-2.3.1-authid_normalize.patch
===================================================================
RCS file: /cvs/extras/rpms/cyrus-imapd/F-10/cyrus-imapd-2.3.1-authid_normalize.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- cyrus-imapd-2.3.1-authid_normalize.patch	13 Jan 2009 19:32:30 -0000	1.2
+++ cyrus-imapd-2.3.1-authid_normalize.patch	21 Jan 2009 14:47:22 -0000	1.3
@@ -1,14 +1,14 @@
 --- cyrus-imapd-2.3.13/lib/libcyr_cfg.h.authid_normalize	2008-07-30 18:03:39.000000000 +0200
 +++ cyrus-imapd-2.3.13/lib/libcyr_cfg.h	2009-01-13 11:41:59.000000000 +0100
-@@ -100,6 +100,8 @@
-     CYRUSOPT_BERKELEY_TXNS_MAX,
-     /* RFC 2086 right which allows DELETE ("c") */
-     CYRUSOPT_DELETERIGHT,
+@@ -112,6 +112,8 @@ enum cyrus_opt {
+     CYRUSOPT_SQL_PASSWD,
+     /* Secure SQL connection (OFF) */
+     CYRUSOPT_SQL_USESSL,
 +    /* Lowercase uid and strip leading and trailing blanks (OFF) */
 +    CYRUSOPT_NORMALIZEUID,
-     /* SQL database */
-     CYRUSOPT_SQL_DATABASE,
-     /* SQL engine ("mysql") */
+ 
+     CYRUSOPT_LAST
+     
 --- cyrus-imapd-2.3.13/lib/auth_unix.c.authid_normalize	2009-01-13 11:38:08.000000000 +0100
 +++ cyrus-imapd-2.3.13/lib/auth_unix.c	2009-01-13 11:38:08.000000000 +0100
 @@ -155,10 +155,12 @@


Index: cyrus-imapd.spec
===================================================================
RCS file: /cvs/extras/rpms/cyrus-imapd/F-10/cyrus-imapd.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- cyrus-imapd.spec	13 Jan 2009 19:32:30 -0000	1.45
+++ cyrus-imapd.spec	21 Jan 2009 14:47:22 -0000	1.46
@@ -1,7 +1,7 @@
 %define upstream_ver 2.3.13
 Name: cyrus-imapd
 Version: 2.3.13
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 # ********************** BUILD TIME OPTIONS START **********************
 
@@ -786,6 +786,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Wed Jan 21 2009 Michal Hlavinka <mhlavink at redhat.com> - 2.3.13-2
+- fix: #480138 - assertion failed: libcyr_cfg.c: cyrus_options[opt].opt == opt
+
 * Tue Jan 13 2009 Michal Hlavinka <mhlavink at redhat.com> - 2.3.13-1
 - updated to 2.3.13
 



From limb at fedoraproject.org  Wed Jan 21 15:39:31 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Wed, 21 Jan 2009 15:39:31 +0000 (UTC)
Subject: rpms/calcurse/devel .cvsignore, 1.7, 1.8 calcurse.spec, 1.7,
	1.8 sources, 1.7, 1.8
Message-ID: <20090121153931.B67337012F@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/calcurse/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16203

Modified Files:
	.cvsignore calcurse.spec sources 
Log Message:
New upstream.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/calcurse/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	22 Oct 2008 19:46:15 -0000	1.7
+++ .cvsignore	21 Jan 2009 15:39:01 -0000	1.8
@@ -1 +1 @@
-calcurse-2.3.tar.gz
+calcurse-2.4.tar.gz


Index: calcurse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/calcurse/devel/calcurse.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- calcurse.spec	22 Oct 2008 19:46:16 -0000	1.7
+++ calcurse.spec	21 Jan 2009 15:39:01 -0000	1.8
@@ -1,5 +1,5 @@
 Name:           calcurse
-Version:        2.3
+Version:        2.4
 Release:        1%{?dist}
 Summary:        Text-based personal organizer
 
@@ -47,6 +47,9 @@
 
 
 %changelog
+* Wed Jan 21 2009 Jon Ciesla <limb at jcomserv.net> 2.4-1
+- Update to 2.4.
+
 * Wed Oct 22 2008 Jon Ciesla <limb at jcomserv.net> 2.3-1
 - Update to 2.3.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/calcurse/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	22 Oct 2008 19:46:16 -0000	1.7
+++ sources	21 Jan 2009 15:39:01 -0000	1.8
@@ -1 +1 @@
-3aaa2f788238a837df0cf137f3657567  calcurse-2.3.tar.gz
+90e31917bdd1c8b6a700e762a3ce46b9  calcurse-2.4.tar.gz



From limb at fedoraproject.org  Wed Jan 21 15:40:18 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Wed, 21 Jan 2009 15:40:18 +0000 (UTC)
Subject: rpms/lilypond/devel lilypond.spec,1.35,1.36
Message-ID: <20090121154018.DCF5D7012F@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/lilypond/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16727

Modified Files:
	lilypond.spec 
Log Message:
Deps fix.



Index: lilypond.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lilypond/devel/lilypond.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- lilypond.spec	20 Jan 2009 17:19:28 -0000	1.35
+++ lilypond.spec	21 Jan 2009 15:39:48 -0000	1.36
@@ -1,6 +1,6 @@
 Name:		lilypond
 Version:	2.12.1
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	A typesetting system for music notation
 
 Group:		Applications/Publishing
@@ -19,7 +19,6 @@
 Requires:	lilypond-aybabtu-fonts = %{version}-%{release}
 Requires:	lilypond-centuryschl-fonts = %{version}-%{release}
 Requires:	lilypond-emmentaler-fonts = %{version}-%{release}
-Requires:	lilypond-feta-fonts = %{version}-%{release}
 
 Buildrequires:  t1utils bison flex ImageMagick gettext tetex
 BuildRequires:  python-devel >= 2.4.0
@@ -74,19 +73,6 @@
 
 These are the emmentaler fonts included in the package.
 
-%package feta-fonts
-Summary:        Lilypond feta fonts
-Group:          User Interface/X
-Requires:       fontpackages-filesystem
-Requires:	lilypond = %{version}-%{release}
-
-%description feta-fonts 
-LilyPond is an automated music engraving system. It formats music
-beautifully and automatically, and has a friendly syntax for its input
-files.
-
-These are the feta fonts included in the package.
-
 %package fonts-common
 Summary:        Lilypond fonts common dir
 Group:          User Interface/X
@@ -185,6 +171,9 @@
 
 
 %changelog
+* Wed Jan 21 2009 Jon Ciesla <limb at jcomserv.net> - 2.12.1-3
+- Drop feta-fonts package cruft.
+
 * Wed Jan 14 2009 Jon Ciesla <limb at jcomserv.net> - 2.12.1-2
 - Implementing font_pkg.
 



From mclasen at fedoraproject.org  Wed Jan 21 15:43:44 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Wed, 21 Jan 2009 15:43:44 +0000 (UTC)
Subject: rpms/gnome-applets/devel trash-init.patch, NONE,
	1.1 gnome-applets.spec, 1.323, 1.324
Message-ID: <20090121154345.060E67012F@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-applets/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18855

Modified Files:
	gnome-applets.spec 
Added Files:
	trash-init.patch 
Log Message:
fix trash applet startup


trash-init.patch:

--- NEW FILE trash-init.patch ---
diff -up gnome-applets-2.25.4/trashapplet/src/trashapplet.c.trash-init gnome-applets-2.25.4/trashapplet/src/trashapplet.c
--- gnome-applets-2.25.4/trashapplet/src/trashapplet.c.trash-init	2009-01-21 10:39:43.000000000 -0500
+++ gnome-applets-2.25.4/trashapplet/src/trashapplet.c	2009-01-21 10:41:09.000000000 -0500
@@ -611,6 +611,10 @@ trash_applet_factory (PanelApplet *apple
 
   if (!strcmp (iid, "OAFIID:GNOME_Panel_TrashApplet"))
     {
+      g_set_application_name (_("Trash Applet"));
+
+      gtk_window_set_default_icon_name ("user-trash");
+
       /* Set up the menu */
       panel_applet_setup_menu_from_file (applet,
                                          DATADIR,
@@ -627,13 +631,8 @@ trash_applet_factory (PanelApplet *apple
   return retval;
 }
 
-int
-main (int argc, char *argv [])
-{
-  gtk_window_set_default_icon_name ("user-trash");
-  g_set_application_name (_("Trash Applet"));
-
-  return panel_applet_factory_main
-          ("OAFIID:GNOME_Panel_TrashApplet_Factory", TRASH_TYPE_APPLET,
-           trash_applet_factory, NULL);
-}
+PANEL_APPLET_BONOBO_FACTORY ("OAFIID:GNOME_Panel_TrashApplet_Factory",
+                             TRASH_TYPE_APPLET,
+                             "TrashApplet", "0",
+                             trash_applet_factory,
+                             NULL)


Index: gnome-applets.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-applets/devel/gnome-applets.spec,v
retrieving revision 1.323
retrieving revision 1.324
diff -u -r1.323 -r1.324
--- gnome-applets.spec	20 Jan 2009 19:49:41 -0000	1.323
+++ gnome-applets.spec	21 Jan 2009 15:43:14 -0000	1.324
@@ -35,7 +35,7 @@
 Summary:        Small applications for the GNOME panel
 Name:		gnome-applets
 Version:	2.25.4
-Release: 	1%{?dist}
+Release: 	2%{?dist}
 Epoch:          1
 License:	GPLv2+ and GFDL
 Group:          User Interface/Desktops
@@ -59,6 +59,9 @@
 # do the nullapplet dance for battstat
 Patch40:	gnome-applets-null-battstat.patch
 
+# upstream fix
+Patch41:	trash-init.patch
+
 BuildRequires:  glib2-devel >= %{glib2_version}
 BuildRequires:  gtk2-devel >= %{gtk2_version}
 BuildRequires:  libgnomeui-devel >= %{libgnomeui_version}
@@ -142,6 +145,7 @@
 
 %patch31 -p1 -b .fix-find
 %patch40 -p1 -b .battstat-null
+%patch41 -p1 -b .trash-init
 
 # We don't ship gnome-system-tools
 rm -rf modemlights
@@ -336,6 +340,9 @@
 %{_datadir}/PolicyKit/policy/org.gnome.cpufreqselector.policy
 
 %changelog
+* Wed Jan 21 2009 Matthias Clasen <mclasen at redhat.com> - 1:2.25.4-2
+- Fix trash applet not starting up
+
 * Tue Jan 20 2009 Matthias Clasen <mclasen at redhat.com> - 1:2.25.4-1
 - Update to 2.25.4
 



From limb at fedoraproject.org  Wed Jan 21 15:44:24 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Wed, 21 Jan 2009 15:44:24 +0000 (UTC)
Subject: rpms/calcurse/F-10 calcurse.spec,1.7,1.8 sources,1.7,1.8
Message-ID: <20090121154424.692847012F@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/calcurse/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19369

Modified Files:
	calcurse.spec sources 
Log Message:
New upstream.



Index: calcurse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/calcurse/F-10/calcurse.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- calcurse.spec	22 Oct 2008 19:46:16 -0000	1.7
+++ calcurse.spec	21 Jan 2009 15:43:54 -0000	1.8
@@ -1,5 +1,5 @@
 Name:           calcurse
-Version:        2.3
+Version:        2.4
 Release:        1%{?dist}
 Summary:        Text-based personal organizer
 
@@ -47,6 +47,9 @@
 
 
 %changelog
+* Wed Jan 21 2009 Jon Ciesla <limb at jcomserv.net> 2.4-1
+- Update to 2.4.
+
 * Wed Oct 22 2008 Jon Ciesla <limb at jcomserv.net> 2.3-1
 - Update to 2.3.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/calcurse/F-10/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	22 Oct 2008 19:46:16 -0000	1.7
+++ sources	21 Jan 2009 15:43:54 -0000	1.8
@@ -1 +1 @@
-3aaa2f788238a837df0cf137f3657567  calcurse-2.3.tar.gz
+90e31917bdd1c8b6a700e762a3ce46b9  calcurse-2.4.tar.gz



From nsantos at fedoraproject.org  Wed Jan 21 15:50:18 2009
From: nsantos at fedoraproject.org (Nuno Santos)
Date: Wed, 21 Jan 2009 15:50:18 +0000 (UTC)
Subject: rpms/qpidc/F-9 qpidc.spec,1.44,1.45
Message-ID: <20090121155018.1CDF77012F@cvs1.fedora.phx.redhat.com>

Author: nsantos

Update of /cvs/extras/rpms/qpidc/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21779

Modified Files:
	qpidc.spec 
Log Message:
BZ474614 and BZ474613 - qpidc/rhm unowned directories


Index: qpidc.spec
===================================================================
RCS file: /cvs/extras/rpms/qpidc/F-9/qpidc.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- qpidc.spec	15 Jan 2009 20:03:48 -0000	1.44
+++ qpidc.spec	21 Jan 2009 15:49:47 -0000	1.45
@@ -7,7 +7,7 @@
 
 Name:           qpidc
 Version:        0.4.734452
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Libraries for Qpid C++ client applications
 Group:          System Environment/Libraries
 License:        ASL 2.0
@@ -190,7 +190,7 @@
 %configure --disable-static --with-cpg --without-graphviz --without-help2man
 make #%{?_smp_mflags}
 # Remove this generated perl file, we don't need it and it upsets rpmlint.
-# This is generating an error as of 21 Nov 08 becausethe file doesn't exist .
+# This is generating an error as of 21 Nov 08 because the file doesn't exist.
 # rm docs/api/html/installdox
 
 # Make perftest utilities
@@ -238,6 +238,8 @@
 %_libdir/libqpidcommon.so.0.1.0
 %_libdir/libqpidclient.so.0
 %_libdir/libqpidclient.so.0.1.0
+%_libdir/qpid/client
+%_sysconfdir/qpid
 %config(noreplace) %_sysconfdir/qpid/qpidc.conf
 
 %files devel
@@ -251,6 +253,7 @@
 %_includedir/qpid/log
 %_includedir/qpid/management
 %_includedir/qpid/agent
+%_includedir/qpid
 %_includedir/qmf
 %_libdir/libqpidcommon.so
 %_libdir/libqpidclient.so
@@ -265,6 +268,7 @@
 %config(noreplace) %_sysconfdir/qpidd.conf
 %config(noreplace) %_sysconfdir/sasl2/qpidd.conf
 %{_initrddir}/qpidd
+%_libdir/qpid/daemon
 %attr(755, qpidd, qpidd) %_localstatedir/lib/qpidd
 %attr(755, qpidd, qpidd) %_libdir/qpidd
 %attr(755, qpidd, qpidd) /var/run/qpidd
@@ -368,6 +372,9 @@
 %postun -n qmf -p /sbin/ldconfig
 
 %changelog
+* Tue Jan 20 2009 Nuno Santos <nsantos at redhat.com> - 0.4.734452-2
+- BZ474614 and BZ474613 - qpidc/rhm unowned directories
+
 * Thu Jan 15 2009 Nuno Santos <nsantos at redhat.com> - 0.4.734452-1
 - Rebased to svn rev 734452
 



From dwalsh at fedoraproject.org  Wed Jan 21 15:53:48 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Wed, 21 Jan 2009 15:53:48 +0000 (UTC)
Subject: rpms/setroubleshoot/devel .cvsignore, 1.89, 1.90 setroubleshoot.spec,
	1.116, 1.117 sources, 1.100, 1.101
Message-ID: <20090121155348.EF32F7012F@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/setroubleshoot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23208

Modified Files:
	.cvsignore setroubleshoot.spec sources 
Log Message:
* Wed Jan 21 2009 Dan Walsh <dwalsh at redhat.com> - 2.1.2-1
- Fixes missing dbus config files



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/setroubleshoot/devel/.cvsignore,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -r1.89 -r1.90
--- .cvsignore	16 Jan 2009 21:31:22 -0000	1.89
+++ .cvsignore	21 Jan 2009 15:53:18 -0000	1.90
@@ -5,3 +5,4 @@
 setroubleshoot-2.0.11.tar.gz
 setroubleshoot-2.0.12.tar.gz
 setroubleshoot-2.1.1.tar.gz
+setroubleshoot-2.1.2.tar.gz


Index: setroubleshoot.spec
===================================================================
RCS file: /cvs/extras/rpms/setroubleshoot/devel/setroubleshoot.spec,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -r1.116 -r1.117
--- setroubleshoot.spec	19 Jan 2009 18:27:30 -0000	1.116
+++ setroubleshoot.spec	21 Jan 2009 15:53:18 -0000	1.117
@@ -1,6 +1,6 @@
 Summary: Helps troubleshoot SELinux problems
 Name: setroubleshoot
-Version: 2.1.1
+Version: 2.1.2
 Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/System
@@ -182,8 +182,12 @@
 %ghost %attr(0644,root,root) %{pkgvardatadir}/email_alert_recipients
 %{_mandir}/man8/sealert.8.gz
 /etc/audisp/plugins.d/sedispatch.conf
+%{_datadir}/dbus-1/system-services/org.fedoraproject.Setroubleshootd.service
 
 %changelog
+* Wed Jan 21 2009 Dan Walsh <dwalsh at redhat.com> - 2.1.2-1
+- Fixes missing dbus config files
+
 * Fri Jan 16 2009 Dan Walsh <dwalsh at redhat.com> - 2.1.1-1
 - Switch to C Based applet
 - Use dbus for messaging.  Only run setroubleshoot when 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/setroubleshoot/devel/sources,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -r1.100 -r1.101
--- sources	16 Jan 2009 21:31:22 -0000	1.100
+++ sources	21 Jan 2009 15:53:18 -0000	1.101
@@ -1 +1 @@
-f98fc013d1d371bbf043f9ba832b97f6  setroubleshoot-2.1.1.tar.gz
+6efd77ae82fb3d95f67d0e0f5c73537f  setroubleshoot-2.1.2.tar.gz



From somlo at fedoraproject.org  Wed Jan 21 16:08:44 2009
From: somlo at fedoraproject.org (Gabriel L. Somlo)
Date: Wed, 21 Jan 2009 16:08:44 +0000 (UTC)
Subject: rpms/wmx/F-10 wmx-7-composite.patch, NONE, 1.1 wmx-7-cfg.patch, 1.2,
	1.3 wmx.spec, 1.17, 1.18
Message-ID: <20090121160844.13F667012F@cvs1.fedora.phx.redhat.com>

Author: somlo

Update of /cvs/pkgs/rpms/wmx/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29316/F-10

Modified Files:
	wmx-7-cfg.patch wmx.spec 
Added Files:
	wmx-7-composite.patch 
Log Message:
patch and buildreq for libXcomposite

wmx-7-composite.patch:

--- NEW FILE wmx-7-composite.patch ---
diff -NarU5 wmx-7.orig/Config.h wm2-wmx-trunk/wmx/Config.h
--- wmx-7.orig/Config.h	2009-01-09 06:18:03.000000000 -0500
+++ wm2-wmx-trunk/wmx/Config.h	2009-01-19 13:49:50.000000000 -0500
@@ -146,10 +146,18 @@
 // if False, behaviour will be as in wm2 (stretching the background
 // image only).
 
 #define CONFIG_RESIZE_UPDATE      True
 
+// If USE_COMPOSITE is true, wmx will enable composite redirects for
+// all windows if the Composite extension is present.  This should
+// make no difference at all to the appearance or behaviour of wmx,
+// but it may make it substantially faster with modern video cards
+// that optimise rendering more than old-fashioned window operations.
+
+#define CONFIG_USE_COMPOSITE      True
+
 // If RAISELOWER_ON_CLICK is True, clicking on the title of the
 // topmost window will lower instead of raising it (patch due to
 // Kazushi (Jam) Marukawa)
 
 #define CONFIG_RAISELOWER_ON_CLICK	False
@@ -253,14 +261,12 @@
 // at all, define it to CONFIG_NO_BUTTON.
 #define CONFIG_NO_BUTTON 999
 #define CONFIG_CLIENTMENU_BUTTON  Button1
 #define CONFIG_COMMANDMENU_BUTTON Button2
 #define CONFIG_CIRCULATE_BUTTON   Button3 // switch window, when over frame
-#define CONFIG_PREVCHANNEL_BUTTON CONFIG_NO_BUTTON // flip channel, when over frame
-#define CONFIG_NEXTCHANNEL_BUTTON CONFIG_NO_BUTTON
-//#define CONFIG_PREVCHANNEL_BUTTON CONFIG_NO_BUTTON
-//#define CONFIG_NEXTCHANNEL_BUTTON CONFIG_NO_BUTTON
+#define CONFIG_PREVCHANNEL_BUTTON Button5 // flip channel, when over frame
+#define CONFIG_NEXTCHANNEL_BUTTON Button4 // flip channel, when over frame
 
 
 // ==============================
 // Section III. Colours and fonts
 // ==============================
diff -NarU5 wmx-7.orig/configure wm2-wmx-trunk/wmx/configure
--- wmx-7.orig/configure	2009-01-09 06:18:03.000000000 -0500
+++ wm2-wmx-trunk/wmx/configure	2009-01-19 11:57:15.000000000 -0500
@@ -3018,10 +3018,87 @@
 
 fi
 
 
 
+{ echo "$as_me:$LINENO: checking for XCompositeQueryExtension in -lXcomposite" >&5
+echo $ECHO_N "checking for XCompositeQueryExtension in -lXcomposite... $ECHO_C" >&6; }
+if test "${ac_cv_lib_Xcomposite_XCompositeQueryExtension+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lXcomposite  $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 XCompositeQueryExtension ();
+int
+main ()
+{
+return XCompositeQueryExtension ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
+  ac_cv_lib_Xcomposite_XCompositeQueryExtension=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_lib_Xcomposite_XCompositeQueryExtension=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_Xcomposite_XCompositeQueryExtension" >&5
+echo "${ECHO_T}$ac_cv_lib_Xcomposite_XCompositeQueryExtension" >&6; }
+if test $ac_cv_lib_Xcomposite_XCompositeQueryExtension = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBXCOMPOSITE 1
+_ACEOF
+
+  LIBS="-lXcomposite $LIBS"
+
+else
+
+    echo "Warning: Xcomposite library not found"
+    echo "Please either install the Xcomposite library and headers, or ensure you have CONFIG_USE_COMPOSITE set to False in Config.h"
+
+fi
+
+
+
 { echo "$as_me:$LINENO: checking for SmcOpenConnection in -lSM" >&5
 echo $ECHO_N "checking for SmcOpenConnection in -lSM... $ECHO_C" >&6; }
 if test "${ac_cv_lib_SM_SmcOpenConnection+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
diff -NarU5 wmx-7.orig/configure.in wm2-wmx-trunk/wmx/configure.in
--- wmx-7.orig/configure.in	2009-01-09 06:18:03.000000000 -0500
+++ wm2-wmx-trunk/wmx/configure.in	2009-01-19 11:57:15.000000000 -0500
@@ -37,10 +37,16 @@
 AC_CHECK_LIB(Xpm, XpmCreatePixmapFromData, [], [
     echo "Warning: Xpm library not found"
     echo "Please either install the Xpm library and headers, or ensure you have CONFIG_USE_PIXMAPS set to False in Config.h"
     ])
 
+dnl Composite is necessary if CONFIG_USE_COMPOSITE
+AC_CHECK_LIB(Xcomposite, XCompositeQueryExtension, [], [
+    echo "Warning: Xcomposite library not found"
+    echo "Please either install the Xcomposite library and headers, or ensure you have CONFIG_USE_COMPOSITE set to False in Config.h"
+    ])
+
 dnl SM and ICE are necessary if CONFIG_USE_SESSION_MANAGER
 AC_CHECK_LIB(SM, SmcOpenConnection)
 AC_CHECK_LIB(ICE, IceConnectionNumber)
 
 dnl Freetype: actually only needed if CONFIG_USE_XFT
diff -NarU5 wmx-7.orig/Makefile.in wm2-wmx-trunk/wmx/Makefile.in
--- wmx-7.orig/Makefile.in	2009-01-09 06:18:03.000000000 -0500
+++ wm2-wmx-trunk/wmx/Makefile.in	2009-01-19 14:12:30.000000000 -0500
@@ -43,10 +43,15 @@
 	cp wmx @bindir@/wmx
 	-chmod 0755 @bindir@/wmx
 	-chown root:wheel @bindir@/wmx
 	-rm -f @bindir@/wmx.old
 
+install-rpm:
+	mkdir -p $(DESTDIR)/usr/bin/
+	cp wmx $(DESTDIR)/usr/bin/wmx
+
+
 # DO NOT DELETE -- make depend depends on it
 Border.o: Border.C Border.h General.h Config.h Rotated.h Client.h \
  Manager.h listmacro.h background.xpm
 Buttons.o: Buttons.C Manager.h General.h Config.h listmacro.h Client.h \
  Border.h Rotated.h Menu.h
diff -NarU5 wmx-7.orig/Manager.C wm2-wmx-trunk/wmx/Manager.C
--- wmx-7.orig/Manager.C	2009-01-09 06:18:03.000000000 -0500
+++ wm2-wmx-trunk/wmx/Manager.C	2009-01-19 13:49:50.000000000 -0500
@@ -13,10 +13,14 @@
 #include <sys/wait.h>
 
 #include "Cursors.h"
 #include <X11/cursorfont.h>
 
+#ifdef CONFIG_USE_COMPOSITE
+#include <X11/extensions/Xcomposite.h>
+#endif
+
 Atom    Atoms::wm_state;
 Atom    Atoms::wm_changeState;
 Atom    Atoms::wm_protocols;
 Atom    Atoms::wm_delete;
 Atom    Atoms::wm_takeFocus;
@@ -242,10 +246,21 @@
     if (!m_display) fatal("can't open display");
 
     m_shell = (char *)getenv("SHELL");
     if (!m_shell) m_shell = NewString("/bin/sh");
 
+#ifdef CONFIG_USE_COMPOSITE
+    int ev, er;
+    if (XCompositeQueryExtension(m_display, &ev, &er)) {
+        fprintf(stderr, "\n     Enabling composite extension.\n");
+        for (int i = 0; i < m_screensTotal; ++i) {
+            XCompositeRedirectSubwindows(m_display, RootWindow(m_display, i),
+                                         CompositeRedirectAutomatic);
+        }
+    }
+#endif
+
     // find out what the Alt keycode and thus modifier mask are
     int kpk = 0;
     int kmin = 0;
     int kmax = 0;
     XDisplayKeycodes(m_display, &kmin, &kmax);
diff -NarU5 wmx-7.orig/Menu.C wm2-wmx-trunk/wmx/Menu.C
--- wmx-7.orig/Menu.C	2009-01-09 06:18:03.000000000 -0500
+++ wm2-wmx-trunk/wmx/Menu.C	2009-01-19 14:12:30.000000000 -0500
@@ -54,10 +54,14 @@
 	    tokstr = 0;
 	    
 	    FcPattern *pattern = FcPatternCreate();
 	    FcPatternAddString(pattern, FC_FAMILY, (FcChar8 *)fi);
 	    FcPatternAddInteger(pattern, FC_SLANT, FC_SLANT_ROMAN);
+
+#ifndef FC_WEIGHT_REGULAR
+#define FC_WEIGHT_REGULAR FC_WEIGHT_MEDIUM
+#endif
 	    FcPatternAddInteger(pattern, FC_WEIGHT, FC_WEIGHT_REGULAR);
 	    FcPatternAddInteger(pattern, FC_PIXEL_SIZE, CONFIG_MENU_FONT_SIZE);
 	    FcConfigSubstitute(FcConfigGetCurrent(), pattern, FcMatchPattern);
 
 	    FcResult result = FcResultMatch;

wmx-7-cfg.patch:

Index: wmx-7-cfg.patch
===================================================================
RCS file: /cvs/pkgs/rpms/wmx/F-10/wmx-7-cfg.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- wmx-7-cfg.patch	13 Jan 2009 18:33:35 -0000	1.2
+++ wmx-7-cfg.patch	21 Jan 2009 16:08:13 -0000	1.3
@@ -40,21 +40,6 @@
  // modifier is pressed; they're keysyms as defined in <X11/keysym.h>
  // and <X11/keysymdef.h>
  
-@@ -253,12 +253,12 @@
- // at all, define it to CONFIG_NO_BUTTON.
- #define CONFIG_NO_BUTTON 999
- #define CONFIG_CLIENTMENU_BUTTON  Button1
- #define CONFIG_COMMANDMENU_BUTTON Button2
- #define CONFIG_CIRCULATE_BUTTON   Button3 // switch window, when over frame
--#define CONFIG_PREVCHANNEL_BUTTON CONFIG_NO_BUTTON // flip channel, when over frame
--#define CONFIG_NEXTCHANNEL_BUTTON CONFIG_NO_BUTTON
-+#define CONFIG_PREVCHANNEL_BUTTON Button4 // flip channel, when over frame
-+#define CONFIG_NEXTCHANNEL_BUTTON Button5
- //#define CONFIG_PREVCHANNEL_BUTTON CONFIG_NO_BUTTON
- //#define CONFIG_NEXTCHANNEL_BUTTON CONFIG_NO_BUTTON
- 
- 
- // ==============================
 @@ -329,11 +329,11 @@
  #define CONFIG_MENU_BORDERS       "black"
  


Index: wmx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wmx/F-10/wmx.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- wmx.spec	13 Jan 2009 18:33:35 -0000	1.17
+++ wmx.spec	21 Jan 2009 16:08:13 -0000	1.18
@@ -1,6 +1,6 @@
 Name: wmx
 Version: 7
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: A really simple window manager for X
 License: BSD
 Group: User Interface/X
@@ -11,9 +11,10 @@
 Source3: wmx.desktop
 Source4: Xclients.wmx.sh
 Source5: xnodecor.c
-Patch0: wmx-7-cfg.patch
+Patch0: wmx-7-composite.patch
+Patch1: wmx-7-cfg.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: xorg-x11-proto-devel libX11-devel libXpm-devel libXext-devel libXaw-devel libXt-devel freetype-devel libXft-devel
+BuildRequires: xorg-x11-proto-devel libX11-devel libXpm-devel libXext-devel libXaw-devel libXt-devel libXcomposite-devel freetype-devel libXft-devel
 
 %description
 A really simple window manager for X, based on wm2, with a minimal set of
@@ -24,6 +25,7 @@
 %setup -q -a 1
 %{__install} -p -m 0644 %{SOURCE2} .
 %patch0 -p1
+%patch1 -p1
 
 %build
 %configure --x-libraries=%{_libdir} --x-includes=%{_includedir}/X11
@@ -51,10 +53,14 @@
 %{_sysconfdir}/X11/xinit/Xclients.d/*
 
 %changelog
-* Tue Jan 13 2009 Gabriel Somlo <somlo at cmu.edu> 7-2 
+* Mon Jan 19 2009 Gabriel Somlo <somlo at cmu.edu> 7-3
+- applied patch for use of compositing offscreen storage to speed up rendering
+- added buildreq for libxcomposite-devel
+
+* Tue Jan 13 2009 Gabriel Somlo <somlo at cmu.edu> 7-2
 - re-enabled scroll-wheel-cycles-channels feature
 
-* Sat Jan 10 2009 Gabriel Somlo <somlo at cmu.edu> 7-1 
+* Sat Jan 10 2009 Gabriel Somlo <somlo at cmu.edu> 7-1
 - update to 7
 
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 6pl1-18
@@ -118,7 +124,7 @@
 - spec file fixes as per P. Lemenkov and I. Vazquez
 - default menu entries now go in /usr/share/wmx/menu
 - example wmx .xsession file added to doc
-- gave up on using /usr/X11R6/bin -- using bindir instead 
+- gave up on using /usr/X11R6/bin -- using bindir instead
 
 * Wed Dec 14 2005 Gabriel Somlo <somlo at cmu.edu> 6pl1-2
 - increased bump-distance parameter for easier placement at edge of screen



From somlo at fedoraproject.org  Wed Jan 21 16:08:44 2009
From: somlo at fedoraproject.org (Gabriel L. Somlo)
Date: Wed, 21 Jan 2009 16:08:44 +0000 (UTC)
Subject: rpms/wmx/F-9 wmx-7-composite.patch, NONE, 1.1 wmx-7-cfg.patch, 1.2, 
	1.3 wmx.spec, 1.17, 1.18
Message-ID: <20090121160844.3E8577012F@cvs1.fedora.phx.redhat.com>

Author: somlo

Update of /cvs/pkgs/rpms/wmx/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29316/F-9

Modified Files:
	wmx-7-cfg.patch wmx.spec 
Added Files:
	wmx-7-composite.patch 
Log Message:
patch and buildreq for libXcomposite

wmx-7-composite.patch:

--- NEW FILE wmx-7-composite.patch ---
diff -NarU5 wmx-7.orig/Config.h wm2-wmx-trunk/wmx/Config.h
--- wmx-7.orig/Config.h	2009-01-09 06:18:03.000000000 -0500
+++ wm2-wmx-trunk/wmx/Config.h	2009-01-19 13:49:50.000000000 -0500
@@ -146,10 +146,18 @@
 // if False, behaviour will be as in wm2 (stretching the background
 // image only).
 
 #define CONFIG_RESIZE_UPDATE      True
 
+// If USE_COMPOSITE is true, wmx will enable composite redirects for
+// all windows if the Composite extension is present.  This should
+// make no difference at all to the appearance or behaviour of wmx,
+// but it may make it substantially faster with modern video cards
+// that optimise rendering more than old-fashioned window operations.
+
+#define CONFIG_USE_COMPOSITE      True
+
 // If RAISELOWER_ON_CLICK is True, clicking on the title of the
 // topmost window will lower instead of raising it (patch due to
 // Kazushi (Jam) Marukawa)
 
 #define CONFIG_RAISELOWER_ON_CLICK	False
@@ -253,14 +261,12 @@
 // at all, define it to CONFIG_NO_BUTTON.
 #define CONFIG_NO_BUTTON 999
 #define CONFIG_CLIENTMENU_BUTTON  Button1
 #define CONFIG_COMMANDMENU_BUTTON Button2
 #define CONFIG_CIRCULATE_BUTTON   Button3 // switch window, when over frame
-#define CONFIG_PREVCHANNEL_BUTTON CONFIG_NO_BUTTON // flip channel, when over frame
-#define CONFIG_NEXTCHANNEL_BUTTON CONFIG_NO_BUTTON
-//#define CONFIG_PREVCHANNEL_BUTTON CONFIG_NO_BUTTON
-//#define CONFIG_NEXTCHANNEL_BUTTON CONFIG_NO_BUTTON
+#define CONFIG_PREVCHANNEL_BUTTON Button5 // flip channel, when over frame
+#define CONFIG_NEXTCHANNEL_BUTTON Button4 // flip channel, when over frame
 
 
 // ==============================
 // Section III. Colours and fonts
 // ==============================
diff -NarU5 wmx-7.orig/configure wm2-wmx-trunk/wmx/configure
--- wmx-7.orig/configure	2009-01-09 06:18:03.000000000 -0500
+++ wm2-wmx-trunk/wmx/configure	2009-01-19 11:57:15.000000000 -0500
@@ -3018,10 +3018,87 @@
 
 fi
 
 
 
+{ echo "$as_me:$LINENO: checking for XCompositeQueryExtension in -lXcomposite" >&5
+echo $ECHO_N "checking for XCompositeQueryExtension in -lXcomposite... $ECHO_C" >&6; }
+if test "${ac_cv_lib_Xcomposite_XCompositeQueryExtension+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lXcomposite  $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 XCompositeQueryExtension ();
+int
+main ()
+{
+return XCompositeQueryExtension ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
+  ac_cv_lib_Xcomposite_XCompositeQueryExtension=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_lib_Xcomposite_XCompositeQueryExtension=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_Xcomposite_XCompositeQueryExtension" >&5
+echo "${ECHO_T}$ac_cv_lib_Xcomposite_XCompositeQueryExtension" >&6; }
+if test $ac_cv_lib_Xcomposite_XCompositeQueryExtension = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBXCOMPOSITE 1
+_ACEOF
+
+  LIBS="-lXcomposite $LIBS"
+
+else
+
+    echo "Warning: Xcomposite library not found"
+    echo "Please either install the Xcomposite library and headers, or ensure you have CONFIG_USE_COMPOSITE set to False in Config.h"
+
+fi
+
+
+
 { echo "$as_me:$LINENO: checking for SmcOpenConnection in -lSM" >&5
 echo $ECHO_N "checking for SmcOpenConnection in -lSM... $ECHO_C" >&6; }
 if test "${ac_cv_lib_SM_SmcOpenConnection+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
diff -NarU5 wmx-7.orig/configure.in wm2-wmx-trunk/wmx/configure.in
--- wmx-7.orig/configure.in	2009-01-09 06:18:03.000000000 -0500
+++ wm2-wmx-trunk/wmx/configure.in	2009-01-19 11:57:15.000000000 -0500
@@ -37,10 +37,16 @@
 AC_CHECK_LIB(Xpm, XpmCreatePixmapFromData, [], [
     echo "Warning: Xpm library not found"
     echo "Please either install the Xpm library and headers, or ensure you have CONFIG_USE_PIXMAPS set to False in Config.h"
     ])
 
+dnl Composite is necessary if CONFIG_USE_COMPOSITE
+AC_CHECK_LIB(Xcomposite, XCompositeQueryExtension, [], [
+    echo "Warning: Xcomposite library not found"
+    echo "Please either install the Xcomposite library and headers, or ensure you have CONFIG_USE_COMPOSITE set to False in Config.h"
+    ])
+
 dnl SM and ICE are necessary if CONFIG_USE_SESSION_MANAGER
 AC_CHECK_LIB(SM, SmcOpenConnection)
 AC_CHECK_LIB(ICE, IceConnectionNumber)
 
 dnl Freetype: actually only needed if CONFIG_USE_XFT
diff -NarU5 wmx-7.orig/Makefile.in wm2-wmx-trunk/wmx/Makefile.in
--- wmx-7.orig/Makefile.in	2009-01-09 06:18:03.000000000 -0500
+++ wm2-wmx-trunk/wmx/Makefile.in	2009-01-19 14:12:30.000000000 -0500
@@ -43,10 +43,15 @@
 	cp wmx @bindir@/wmx
 	-chmod 0755 @bindir@/wmx
 	-chown root:wheel @bindir@/wmx
 	-rm -f @bindir@/wmx.old
 
+install-rpm:
+	mkdir -p $(DESTDIR)/usr/bin/
+	cp wmx $(DESTDIR)/usr/bin/wmx
+
+
 # DO NOT DELETE -- make depend depends on it
 Border.o: Border.C Border.h General.h Config.h Rotated.h Client.h \
  Manager.h listmacro.h background.xpm
 Buttons.o: Buttons.C Manager.h General.h Config.h listmacro.h Client.h \
  Border.h Rotated.h Menu.h
diff -NarU5 wmx-7.orig/Manager.C wm2-wmx-trunk/wmx/Manager.C
--- wmx-7.orig/Manager.C	2009-01-09 06:18:03.000000000 -0500
+++ wm2-wmx-trunk/wmx/Manager.C	2009-01-19 13:49:50.000000000 -0500
@@ -13,10 +13,14 @@
 #include <sys/wait.h>
 
 #include "Cursors.h"
 #include <X11/cursorfont.h>
 
+#ifdef CONFIG_USE_COMPOSITE
+#include <X11/extensions/Xcomposite.h>
+#endif
+
 Atom    Atoms::wm_state;
 Atom    Atoms::wm_changeState;
 Atom    Atoms::wm_protocols;
 Atom    Atoms::wm_delete;
 Atom    Atoms::wm_takeFocus;
@@ -242,10 +246,21 @@
     if (!m_display) fatal("can't open display");
 
     m_shell = (char *)getenv("SHELL");
     if (!m_shell) m_shell = NewString("/bin/sh");
 
+#ifdef CONFIG_USE_COMPOSITE
+    int ev, er;
+    if (XCompositeQueryExtension(m_display, &ev, &er)) {
+        fprintf(stderr, "\n     Enabling composite extension.\n");
+        for (int i = 0; i < m_screensTotal; ++i) {
+            XCompositeRedirectSubwindows(m_display, RootWindow(m_display, i),
+                                         CompositeRedirectAutomatic);
+        }
+    }
+#endif
+
     // find out what the Alt keycode and thus modifier mask are
     int kpk = 0;
     int kmin = 0;
     int kmax = 0;
     XDisplayKeycodes(m_display, &kmin, &kmax);
diff -NarU5 wmx-7.orig/Menu.C wm2-wmx-trunk/wmx/Menu.C
--- wmx-7.orig/Menu.C	2009-01-09 06:18:03.000000000 -0500
+++ wm2-wmx-trunk/wmx/Menu.C	2009-01-19 14:12:30.000000000 -0500
@@ -54,10 +54,14 @@
 	    tokstr = 0;
 	    
 	    FcPattern *pattern = FcPatternCreate();
 	    FcPatternAddString(pattern, FC_FAMILY, (FcChar8 *)fi);
 	    FcPatternAddInteger(pattern, FC_SLANT, FC_SLANT_ROMAN);
+
+#ifndef FC_WEIGHT_REGULAR
+#define FC_WEIGHT_REGULAR FC_WEIGHT_MEDIUM
+#endif
 	    FcPatternAddInteger(pattern, FC_WEIGHT, FC_WEIGHT_REGULAR);
 	    FcPatternAddInteger(pattern, FC_PIXEL_SIZE, CONFIG_MENU_FONT_SIZE);
 	    FcConfigSubstitute(FcConfigGetCurrent(), pattern, FcMatchPattern);
 
 	    FcResult result = FcResultMatch;

wmx-7-cfg.patch:

Index: wmx-7-cfg.patch
===================================================================
RCS file: /cvs/pkgs/rpms/wmx/F-9/wmx-7-cfg.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- wmx-7-cfg.patch	13 Jan 2009 18:33:35 -0000	1.2
+++ wmx-7-cfg.patch	21 Jan 2009 16:08:13 -0000	1.3
@@ -40,21 +40,6 @@
  // modifier is pressed; they're keysyms as defined in <X11/keysym.h>
  // and <X11/keysymdef.h>
  
-@@ -253,12 +253,12 @@
- // at all, define it to CONFIG_NO_BUTTON.
- #define CONFIG_NO_BUTTON 999
- #define CONFIG_CLIENTMENU_BUTTON  Button1
- #define CONFIG_COMMANDMENU_BUTTON Button2
- #define CONFIG_CIRCULATE_BUTTON   Button3 // switch window, when over frame
--#define CONFIG_PREVCHANNEL_BUTTON CONFIG_NO_BUTTON // flip channel, when over frame
--#define CONFIG_NEXTCHANNEL_BUTTON CONFIG_NO_BUTTON
-+#define CONFIG_PREVCHANNEL_BUTTON Button4 // flip channel, when over frame
-+#define CONFIG_NEXTCHANNEL_BUTTON Button5
- //#define CONFIG_PREVCHANNEL_BUTTON CONFIG_NO_BUTTON
- //#define CONFIG_NEXTCHANNEL_BUTTON CONFIG_NO_BUTTON
- 
- 
- // ==============================
 @@ -329,11 +329,11 @@
  #define CONFIG_MENU_BORDERS       "black"
  


Index: wmx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wmx/F-9/wmx.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- wmx.spec	13 Jan 2009 18:33:35 -0000	1.17
+++ wmx.spec	21 Jan 2009 16:08:13 -0000	1.18
@@ -1,6 +1,6 @@
 Name: wmx
 Version: 7
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: A really simple window manager for X
 License: BSD
 Group: User Interface/X
@@ -11,9 +11,10 @@
 Source3: wmx.desktop
 Source4: Xclients.wmx.sh
 Source5: xnodecor.c
-Patch0: wmx-7-cfg.patch
+Patch0: wmx-7-composite.patch
+Patch1: wmx-7-cfg.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: xorg-x11-proto-devel libX11-devel libXpm-devel libXext-devel libXaw-devel libXt-devel freetype-devel libXft-devel
+BuildRequires: xorg-x11-proto-devel libX11-devel libXpm-devel libXext-devel libXaw-devel libXt-devel libXcomposite-devel freetype-devel libXft-devel
 
 %description
 A really simple window manager for X, based on wm2, with a minimal set of
@@ -24,6 +25,7 @@
 %setup -q -a 1
 %{__install} -p -m 0644 %{SOURCE2} .
 %patch0 -p1
+%patch1 -p1
 
 %build
 %configure --x-libraries=%{_libdir} --x-includes=%{_includedir}/X11
@@ -51,10 +53,14 @@
 %{_sysconfdir}/X11/xinit/Xclients.d/*
 
 %changelog
-* Tue Jan 13 2009 Gabriel Somlo <somlo at cmu.edu> 7-2 
+* Mon Jan 19 2009 Gabriel Somlo <somlo at cmu.edu> 7-3
+- applied patch for use of compositing offscreen storage to speed up rendering
+- added buildreq for libxcomposite-devel
+
+* Tue Jan 13 2009 Gabriel Somlo <somlo at cmu.edu> 7-2
 - re-enabled scroll-wheel-cycles-channels feature
 
-* Sat Jan 10 2009 Gabriel Somlo <somlo at cmu.edu> 7-1 
+* Sat Jan 10 2009 Gabriel Somlo <somlo at cmu.edu> 7-1
 - update to 7
 
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 6pl1-18
@@ -118,7 +124,7 @@
 - spec file fixes as per P. Lemenkov and I. Vazquez
 - default menu entries now go in /usr/share/wmx/menu
 - example wmx .xsession file added to doc
-- gave up on using /usr/X11R6/bin -- using bindir instead 
+- gave up on using /usr/X11R6/bin -- using bindir instead
 
 * Wed Dec 14 2005 Gabriel Somlo <somlo at cmu.edu> 6pl1-2
 - increased bump-distance parameter for easier placement at edge of screen



From somlo at fedoraproject.org  Wed Jan 21 16:08:44 2009
From: somlo at fedoraproject.org (Gabriel L. Somlo)
Date: Wed, 21 Jan 2009 16:08:44 +0000 (UTC)
Subject: rpms/wmx/devel wmx-7-composite.patch, NONE, 1.1 wmx-7-cfg.patch, 1.2,
	1.3 wmx.spec, 1.17, 1.18
Message-ID: <20090121160844.9052F7012F@cvs1.fedora.phx.redhat.com>

Author: somlo

Update of /cvs/pkgs/rpms/wmx/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29316/devel

Modified Files:
	wmx-7-cfg.patch wmx.spec 
Added Files:
	wmx-7-composite.patch 
Log Message:
patch and buildreq for libXcomposite

wmx-7-composite.patch:

--- NEW FILE wmx-7-composite.patch ---
diff -NarU5 wmx-7.orig/Config.h wm2-wmx-trunk/wmx/Config.h
--- wmx-7.orig/Config.h	2009-01-09 06:18:03.000000000 -0500
+++ wm2-wmx-trunk/wmx/Config.h	2009-01-19 13:49:50.000000000 -0500
@@ -146,10 +146,18 @@
 // if False, behaviour will be as in wm2 (stretching the background
 // image only).
 
 #define CONFIG_RESIZE_UPDATE      True
 
+// If USE_COMPOSITE is true, wmx will enable composite redirects for
+// all windows if the Composite extension is present.  This should
+// make no difference at all to the appearance or behaviour of wmx,
+// but it may make it substantially faster with modern video cards
+// that optimise rendering more than old-fashioned window operations.
+
+#define CONFIG_USE_COMPOSITE      True
+
 // If RAISELOWER_ON_CLICK is True, clicking on the title of the
 // topmost window will lower instead of raising it (patch due to
 // Kazushi (Jam) Marukawa)
 
 #define CONFIG_RAISELOWER_ON_CLICK	False
@@ -253,14 +261,12 @@
 // at all, define it to CONFIG_NO_BUTTON.
 #define CONFIG_NO_BUTTON 999
 #define CONFIG_CLIENTMENU_BUTTON  Button1
 #define CONFIG_COMMANDMENU_BUTTON Button2
 #define CONFIG_CIRCULATE_BUTTON   Button3 // switch window, when over frame
-#define CONFIG_PREVCHANNEL_BUTTON CONFIG_NO_BUTTON // flip channel, when over frame
-#define CONFIG_NEXTCHANNEL_BUTTON CONFIG_NO_BUTTON
-//#define CONFIG_PREVCHANNEL_BUTTON CONFIG_NO_BUTTON
-//#define CONFIG_NEXTCHANNEL_BUTTON CONFIG_NO_BUTTON
+#define CONFIG_PREVCHANNEL_BUTTON Button5 // flip channel, when over frame
+#define CONFIG_NEXTCHANNEL_BUTTON Button4 // flip channel, when over frame
 
 
 // ==============================
 // Section III. Colours and fonts
 // ==============================
diff -NarU5 wmx-7.orig/configure wm2-wmx-trunk/wmx/configure
--- wmx-7.orig/configure	2009-01-09 06:18:03.000000000 -0500
+++ wm2-wmx-trunk/wmx/configure	2009-01-19 11:57:15.000000000 -0500
@@ -3018,10 +3018,87 @@
 
 fi
 
 
 
+{ echo "$as_me:$LINENO: checking for XCompositeQueryExtension in -lXcomposite" >&5
+echo $ECHO_N "checking for XCompositeQueryExtension in -lXcomposite... $ECHO_C" >&6; }
+if test "${ac_cv_lib_Xcomposite_XCompositeQueryExtension+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lXcomposite  $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 XCompositeQueryExtension ();
+int
+main ()
+{
+return XCompositeQueryExtension ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
+  ac_cv_lib_Xcomposite_XCompositeQueryExtension=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_lib_Xcomposite_XCompositeQueryExtension=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_Xcomposite_XCompositeQueryExtension" >&5
+echo "${ECHO_T}$ac_cv_lib_Xcomposite_XCompositeQueryExtension" >&6; }
+if test $ac_cv_lib_Xcomposite_XCompositeQueryExtension = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBXCOMPOSITE 1
+_ACEOF
+
+  LIBS="-lXcomposite $LIBS"
+
+else
+
+    echo "Warning: Xcomposite library not found"
+    echo "Please either install the Xcomposite library and headers, or ensure you have CONFIG_USE_COMPOSITE set to False in Config.h"
+
+fi
+
+
+
 { echo "$as_me:$LINENO: checking for SmcOpenConnection in -lSM" >&5
 echo $ECHO_N "checking for SmcOpenConnection in -lSM... $ECHO_C" >&6; }
 if test "${ac_cv_lib_SM_SmcOpenConnection+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
diff -NarU5 wmx-7.orig/configure.in wm2-wmx-trunk/wmx/configure.in
--- wmx-7.orig/configure.in	2009-01-09 06:18:03.000000000 -0500
+++ wm2-wmx-trunk/wmx/configure.in	2009-01-19 11:57:15.000000000 -0500
@@ -37,10 +37,16 @@
 AC_CHECK_LIB(Xpm, XpmCreatePixmapFromData, [], [
     echo "Warning: Xpm library not found"
     echo "Please either install the Xpm library and headers, or ensure you have CONFIG_USE_PIXMAPS set to False in Config.h"
     ])
 
+dnl Composite is necessary if CONFIG_USE_COMPOSITE
+AC_CHECK_LIB(Xcomposite, XCompositeQueryExtension, [], [
+    echo "Warning: Xcomposite library not found"
+    echo "Please either install the Xcomposite library and headers, or ensure you have CONFIG_USE_COMPOSITE set to False in Config.h"
+    ])
+
 dnl SM and ICE are necessary if CONFIG_USE_SESSION_MANAGER
 AC_CHECK_LIB(SM, SmcOpenConnection)
 AC_CHECK_LIB(ICE, IceConnectionNumber)
 
 dnl Freetype: actually only needed if CONFIG_USE_XFT
diff -NarU5 wmx-7.orig/Makefile.in wm2-wmx-trunk/wmx/Makefile.in
--- wmx-7.orig/Makefile.in	2009-01-09 06:18:03.000000000 -0500
+++ wm2-wmx-trunk/wmx/Makefile.in	2009-01-19 14:12:30.000000000 -0500
@@ -43,10 +43,15 @@
 	cp wmx @bindir@/wmx
 	-chmod 0755 @bindir@/wmx
 	-chown root:wheel @bindir@/wmx
 	-rm -f @bindir@/wmx.old
 
+install-rpm:
+	mkdir -p $(DESTDIR)/usr/bin/
+	cp wmx $(DESTDIR)/usr/bin/wmx
+
+
 # DO NOT DELETE -- make depend depends on it
 Border.o: Border.C Border.h General.h Config.h Rotated.h Client.h \
  Manager.h listmacro.h background.xpm
 Buttons.o: Buttons.C Manager.h General.h Config.h listmacro.h Client.h \
  Border.h Rotated.h Menu.h
diff -NarU5 wmx-7.orig/Manager.C wm2-wmx-trunk/wmx/Manager.C
--- wmx-7.orig/Manager.C	2009-01-09 06:18:03.000000000 -0500
+++ wm2-wmx-trunk/wmx/Manager.C	2009-01-19 13:49:50.000000000 -0500
@@ -13,10 +13,14 @@
 #include <sys/wait.h>
 
 #include "Cursors.h"
 #include <X11/cursorfont.h>
 
+#ifdef CONFIG_USE_COMPOSITE
+#include <X11/extensions/Xcomposite.h>
+#endif
+
 Atom    Atoms::wm_state;
 Atom    Atoms::wm_changeState;
 Atom    Atoms::wm_protocols;
 Atom    Atoms::wm_delete;
 Atom    Atoms::wm_takeFocus;
@@ -242,10 +246,21 @@
     if (!m_display) fatal("can't open display");
 
     m_shell = (char *)getenv("SHELL");
     if (!m_shell) m_shell = NewString("/bin/sh");
 
+#ifdef CONFIG_USE_COMPOSITE
+    int ev, er;
+    if (XCompositeQueryExtension(m_display, &ev, &er)) {
+        fprintf(stderr, "\n     Enabling composite extension.\n");
+        for (int i = 0; i < m_screensTotal; ++i) {
+            XCompositeRedirectSubwindows(m_display, RootWindow(m_display, i),
+                                         CompositeRedirectAutomatic);
+        }
+    }
+#endif
+
     // find out what the Alt keycode and thus modifier mask are
     int kpk = 0;
     int kmin = 0;
     int kmax = 0;
     XDisplayKeycodes(m_display, &kmin, &kmax);
diff -NarU5 wmx-7.orig/Menu.C wm2-wmx-trunk/wmx/Menu.C
--- wmx-7.orig/Menu.C	2009-01-09 06:18:03.000000000 -0500
+++ wm2-wmx-trunk/wmx/Menu.C	2009-01-19 14:12:30.000000000 -0500
@@ -54,10 +54,14 @@
 	    tokstr = 0;
 	    
 	    FcPattern *pattern = FcPatternCreate();
 	    FcPatternAddString(pattern, FC_FAMILY, (FcChar8 *)fi);
 	    FcPatternAddInteger(pattern, FC_SLANT, FC_SLANT_ROMAN);
+
+#ifndef FC_WEIGHT_REGULAR
+#define FC_WEIGHT_REGULAR FC_WEIGHT_MEDIUM
+#endif
 	    FcPatternAddInteger(pattern, FC_WEIGHT, FC_WEIGHT_REGULAR);
 	    FcPatternAddInteger(pattern, FC_PIXEL_SIZE, CONFIG_MENU_FONT_SIZE);
 	    FcConfigSubstitute(FcConfigGetCurrent(), pattern, FcMatchPattern);
 
 	    FcResult result = FcResultMatch;

wmx-7-cfg.patch:

Index: wmx-7-cfg.patch
===================================================================
RCS file: /cvs/pkgs/rpms/wmx/devel/wmx-7-cfg.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- wmx-7-cfg.patch	13 Jan 2009 18:33:36 -0000	1.2
+++ wmx-7-cfg.patch	21 Jan 2009 16:08:14 -0000	1.3
@@ -40,21 +40,6 @@
  // modifier is pressed; they're keysyms as defined in <X11/keysym.h>
  // and <X11/keysymdef.h>
  
-@@ -253,12 +253,12 @@
- // at all, define it to CONFIG_NO_BUTTON.
- #define CONFIG_NO_BUTTON 999
- #define CONFIG_CLIENTMENU_BUTTON  Button1
- #define CONFIG_COMMANDMENU_BUTTON Button2
- #define CONFIG_CIRCULATE_BUTTON   Button3 // switch window, when over frame
--#define CONFIG_PREVCHANNEL_BUTTON CONFIG_NO_BUTTON // flip channel, when over frame
--#define CONFIG_NEXTCHANNEL_BUTTON CONFIG_NO_BUTTON
-+#define CONFIG_PREVCHANNEL_BUTTON Button4 // flip channel, when over frame
-+#define CONFIG_NEXTCHANNEL_BUTTON Button5
- //#define CONFIG_PREVCHANNEL_BUTTON CONFIG_NO_BUTTON
- //#define CONFIG_NEXTCHANNEL_BUTTON CONFIG_NO_BUTTON
- 
- 
- // ==============================
 @@ -329,11 +329,11 @@
  #define CONFIG_MENU_BORDERS       "black"
  


Index: wmx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wmx/devel/wmx.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- wmx.spec	13 Jan 2009 18:33:36 -0000	1.17
+++ wmx.spec	21 Jan 2009 16:08:14 -0000	1.18
@@ -1,6 +1,6 @@
 Name: wmx
 Version: 7
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: A really simple window manager for X
 License: BSD
 Group: User Interface/X
@@ -11,9 +11,10 @@
 Source3: wmx.desktop
 Source4: Xclients.wmx.sh
 Source5: xnodecor.c
-Patch0: wmx-7-cfg.patch
+Patch0: wmx-7-composite.patch
+Patch1: wmx-7-cfg.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: xorg-x11-proto-devel libX11-devel libXpm-devel libXext-devel libXaw-devel libXt-devel freetype-devel libXft-devel
+BuildRequires: xorg-x11-proto-devel libX11-devel libXpm-devel libXext-devel libXaw-devel libXt-devel libXcomposite-devel freetype-devel libXft-devel
 
 %description
 A really simple window manager for X, based on wm2, with a minimal set of
@@ -24,6 +25,7 @@
 %setup -q -a 1
 %{__install} -p -m 0644 %{SOURCE2} .
 %patch0 -p1
+%patch1 -p1
 
 %build
 %configure --x-libraries=%{_libdir} --x-includes=%{_includedir}/X11
@@ -51,10 +53,14 @@
 %{_sysconfdir}/X11/xinit/Xclients.d/*
 
 %changelog
-* Tue Jan 13 2009 Gabriel Somlo <somlo at cmu.edu> 7-2 
+* Mon Jan 19 2009 Gabriel Somlo <somlo at cmu.edu> 7-3
+- applied patch for use of compositing offscreen storage to speed up rendering
+- added buildreq for libxcomposite-devel
+
+* Tue Jan 13 2009 Gabriel Somlo <somlo at cmu.edu> 7-2
 - re-enabled scroll-wheel-cycles-channels feature
 
-* Sat Jan 10 2009 Gabriel Somlo <somlo at cmu.edu> 7-1 
+* Sat Jan 10 2009 Gabriel Somlo <somlo at cmu.edu> 7-1
 - update to 7
 
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 6pl1-18
@@ -118,7 +124,7 @@
 - spec file fixes as per P. Lemenkov and I. Vazquez
 - default menu entries now go in /usr/share/wmx/menu
 - example wmx .xsession file added to doc
-- gave up on using /usr/X11R6/bin -- using bindir instead 
+- gave up on using /usr/X11R6/bin -- using bindir instead
 
 * Wed Dec 14 2005 Gabriel Somlo <somlo at cmu.edu> 6pl1-2
 - increased bump-distance parameter for easier placement at edge of screen



From vpv at fedoraproject.org  Wed Jan 21 16:13:47 2009
From: vpv at fedoraproject.org (Ville-Pekka Vainio)
Date: Wed, 21 Jan 2009 16:13:47 +0000 (UTC)
Subject: rpms/openoffice.org-voikko/devel .cvsignore, 1.7,
	1.8 openoffice.org-voikko.spec, 1.15, 1.16 sources, 1.7, 1.8
Message-ID: <20090121161347.3A9C67012F@cvs1.fedora.phx.redhat.com>

Author: vpv

Update of /cvs/pkgs/rpms/openoffice.org-voikko/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31578

Modified Files:
	.cvsignore openoffice.org-voikko.spec sources 
Log Message:
* Wed Jan 21 2009 Ville-Pekka Vainio <vpivaini AT cs.helsinki.fi> - 3.0.1-1
- openoffice.org-voikko 3.0.1
- Drop integrated OOO 3.0.1 compatibility patch
- Require OOO 3.0.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org-voikko/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	28 Aug 2008 18:21:03 -0000	1.7
+++ .cvsignore	21 Jan 2009 16:13:16 -0000	1.8
@@ -1 +1 @@
-openoffice.org-voikko-3.0.tar.gz
+openoffice.org-voikko-3.0.1.tar.gz


Index: openoffice.org-voikko.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org-voikko/devel/openoffice.org-voikko.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- openoffice.org-voikko.spec	28 Dec 2008 00:04:27 -0000	1.15
+++ openoffice.org-voikko.spec	21 Jan 2009 16:13:16 -0000	1.16
@@ -1,6 +1,6 @@
 Name:           openoffice.org-voikko
-Version:        3.0 
-Release:        5%{?dist}
+Version:        3.0.1 
+Release:        1%{?dist}
 Summary:        Finnish spellchecker and hyphenator extension for OpenOffice.org
 
 Group:          Applications/Productivity
@@ -8,18 +8,16 @@
 URL:            http://voikko.sourceforge.net/
 # The usual format of stable release URLs
 Source0:        http://downloads.sourceforge.net/voikko/%{name}-%{version}.tar.gz
-# Fix building of the grammar checking code, patch from upstream
-Patch0:         OOO300_m14-fix-grammar-check-build.patch
 # The usual format of test release URLs
 #Source0:        http://www.puimula.org/htp/testing/%{name}-%{version}rc1.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:    openoffice.org-sdk >= 1:3.0.0
+BuildRequires:    openoffice.org-sdk >= 1:3.0.1
 BuildRequires:    libvoikko-devel >= 2.0
-Requires(pre):    openoffice.org-core >= 1:3.0.0
-Requires(post):   openoffice.org-core >= 1:3.0.0
-Requires(preun):  openoffice.org-core >= 1:3.0.0
-Requires(postun): openoffice.org-core >= 1:3.0.0
+Requires(pre):    openoffice.org-core >= 1:3.0.1
+Requires(post):   openoffice.org-core >= 1:3.0.1
+Requires(preun):  openoffice.org-core >= 1:3.0.1
+Requires(postun): openoffice.org-core >= 1:3.0.1
 # Rpmbuild only detects libvoikko.so.1 automatically, which is
 # too general for openoffice.org-voikko.
 Requires:         libvoikko >= 2.0
@@ -39,7 +37,6 @@
 
 %prep
 %setup -q
-%patch0 -p0
 
 
 # Make install-unpacked also builds before installing, leave the build section
@@ -88,6 +85,11 @@
 
 
 %changelog
+* Wed Jan 21 2009 Ville-Pekka Vainio <vpivaini AT cs.helsinki.fi> - 3.0.1-1
+- openoffice.org-voikko 3.0.1
+- Drop integrated OOO 3.0.1 compatibility patch
+- Require OOO 3.0.1
+
 * Sun Dec 28 2008 Ville-Pekka Vainio <vpivaini AT cs.helsinki.fi> - 3.0-5
 - Add patch from upstream to fix FTBFS with OOO300_m14, the grammar
   checking framework was changed


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org-voikko/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	28 Aug 2008 18:21:03 -0000	1.7
+++ sources	21 Jan 2009 16:13:16 -0000	1.8
@@ -1 +1 @@
-73c1666dd11915d37cf8f404221a4298  openoffice.org-voikko-3.0.tar.gz
+327a3fbc5712ed28550319e93fa0a35e  openoffice.org-voikko-3.0.1.tar.gz



From dwalsh at fedoraproject.org  Wed Jan 21 16:18:11 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Wed, 21 Jan 2009 16:18:11 +0000 (UTC)
Subject: rpms/selinux-policy/devel modules-mls.conf, 1.44,
	1.45 policy-20090105.patch, 1.14, 1.15 selinux-policy.spec,
	1.769, 1.770
Message-ID: <20090121161811.A222B7012F@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv784

Modified Files:
	modules-mls.conf policy-20090105.patch selinux-policy.spec 
Log Message:
* Tue Jan 20 2009 Dan Walsh <dwalsh at redhat.com> 3.6.3-3
- Fixed for DeviceKit



Index: modules-mls.conf
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/modules-mls.conf,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- modules-mls.conf	19 Jan 2009 13:51:13 -0000	1.44
+++ modules-mls.conf	21 Jan 2009 16:17:40 -0000	1.45
@@ -340,6 +340,13 @@
 # 
 ddcprobe = off
 
+# Layer: services
+# Module: devicekit
+#
+# devicekit-daemon
+# 
+devicekit = module
+
 # Layer: kernel
 # Module: devices
 # Required in base
@@ -1672,6 +1679,28 @@
 podsleuth = module
 
 # Layer: role
+# Module: logadm
+#
+# logadm account on tty logins
+# 
+logadm = module
+
+# Layer: role
+# Module: secadm
+#
+# secadm account on tty logins
+# 
+secadm = module
+
+# Layer: role
+# Module: auditadm
+#
+# auditadm account on tty logins
+# 
+auditadm = module
+
+#
+# Layer: role
 # Module: guest
 #
 # Minimally privs guest account on tty logins

policy-20090105.patch:

Index: policy-20090105.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-20090105.patch,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- policy-20090105.patch	20 Jan 2009 15:12:00 -0000	1.14
+++ policy-20090105.patch	21 Jan 2009 16:17:40 -0000	1.15
@@ -523,6 +523,17 @@
  	samba_read_log(logwatch_t)
 +	samba_read_share_files(logwatch_t)
  ')
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/mrtg.te serefpolicy-3.6.3/policy/modules/admin/mrtg.te
+--- nsaserefpolicy/policy/modules/admin/mrtg.te	2009-01-19 11:07:34.000000000 -0500
++++ serefpolicy-3.6.3/policy/modules/admin/mrtg.te	2009-01-20 16:16:42.000000000 -0500
+@@ -116,6 +116,7 @@
+ userdom_use_user_terminals(mrtg_t)
+ userdom_dontaudit_read_user_home_content_files(mrtg_t)
+ userdom_dontaudit_use_unpriv_user_fds(mrtg_t)
++userdom_dontaudit_list_admin_dir(mrtg_t)
+ 
+ ifdef(`enable_mls',`
+ 	corenet_udp_sendrecv_lo_if(mrtg_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/netutils.te serefpolicy-3.6.3/policy/modules/admin/netutils.te
 --- nsaserefpolicy/policy/modules/admin/netutils.te	2009-01-19 11:07:34.000000000 -0500
 +++ serefpolicy-3.6.3/policy/modules/admin/netutils.te	2009-01-19 13:10:02.000000000 -0500
@@ -4053,8 +4064,17 @@
 +xserver_user_x_domain_template(user, wm_t, wm_tmpfs_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corecommands.fc serefpolicy-3.6.3/policy/modules/kernel/corecommands.fc
 --- nsaserefpolicy/policy/modules/kernel/corecommands.fc	2009-01-05 15:39:38.000000000 -0500
-+++ serefpolicy-3.6.3/policy/modules/kernel/corecommands.fc	2009-01-19 13:10:02.000000000 -0500
-@@ -130,6 +130,8 @@
++++ serefpolicy-3.6.3/policy/modules/kernel/corecommands.fc	2009-01-20 14:46:23.000000000 -0500
+@@ -58,6 +58,8 @@
+ 
+ /etc/init\.d/functions		--	gen_context(system_u:object_r:bin_t,s0)
+ 
++/etc/mail/make			--	gen_context(system_u:object_r:bin_t,s0)
++
+ /etc/netplug\.d(/.*)? 	 		gen_context(system_u:object_r:bin_t,s0)
+ 
+ /etc/ppp/ip-down\..*		--	gen_context(system_u:object_r:bin_t,s0)
+@@ -130,6 +132,8 @@
  /opt/vmware/workstation/lib/lib/wrapper-gtk24\.sh -- gen_context(system_u:object_r:bin_t,s0)
  ')
  
@@ -4063,7 +4083,7 @@
  #
  # /usr
  #
-@@ -203,6 +205,7 @@
+@@ -203,6 +207,7 @@
  /usr/share/hal/device-manager/hal-device-manager -- gen_context(system_u:object_r:bin_t,s0)
  /usr/share/hal/scripts(/.*)?		gen_context(system_u:object_r:bin_t,s0)
  /usr/share/mc/extfs/.*		--	gen_context(system_u:object_r:bin_t,s0)
@@ -4071,7 +4091,7 @@
  /usr/share/printconf/util/print\.py --	gen_context(system_u:object_r:bin_t,s0)
  /usr/share/selinux/devel/policygentool -- gen_context(system_u:object_r:bin_t,s0)
  /usr/share/turboprint/lib(/.*)?	--	gen_context(system_u:object_r:bin_t,s0)
-@@ -223,14 +226,15 @@
+@@ -223,14 +228,15 @@
  /usr/lib64/.*/program(/.*)?		gen_context(system_u:object_r:bin_t,s0)
  /usr/lib/bluetooth(/.*)?	--	gen_context(system_u:object_r:bin_t,s0)
  /usr/lib64/bluetooth(/.*)?	--	gen_context(system_u:object_r:bin_t,s0)
@@ -4089,7 +4109,7 @@
  /usr/share/fedora-usermgmt/wrapper --	gen_context(system_u:object_r:bin_t,s0)
  /usr/share/hplip/[^/]*		--	gen_context(system_u:object_r:bin_t,s0)
  /usr/share/hwbrowser/hwbrowser --	gen_context(system_u:object_r:bin_t,s0)
-@@ -293,3 +297,8 @@
+@@ -293,3 +299,8 @@
  ifdef(`distro_suse',`
  /var/lib/samba/bin/.+			gen_context(system_u:object_r:bin_t,s0)
  ')
@@ -4386,7 +4406,7 @@
  
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.if serefpolicy-3.6.3/policy/modules/kernel/devices.if
 --- nsaserefpolicy/policy/modules/kernel/devices.if	2009-01-05 15:39:38.000000000 -0500
-+++ serefpolicy-3.6.3/policy/modules/kernel/devices.if	2009-01-19 13:10:02.000000000 -0500
++++ serefpolicy-3.6.3/policy/modules/kernel/devices.if	2009-01-20 16:50:48.000000000 -0500
 @@ -65,7 +65,7 @@
  
  	relabelfrom_dirs_pattern($1, device_t, device_node)
@@ -4532,7 +4552,7 @@
  ##	Read and write generic the USB devices.
  ## </summary>
  ## <param name="domain">
-@@ -2785,6 +2879,97 @@
+@@ -2785,6 +2879,115 @@
  
  ########################################
  ## <summary>
@@ -4591,6 +4611,24 @@
 +
 +########################################
 +## <summary>
++##	Read the kernel messages
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`dev_read_kmsg',`
++	gen_require(`
++		type device_t, kmsg_device_t;
++	')
++
++	read_chr_files_pattern($1, device_t, kmsg_device_t)
++')
++
++########################################
++## <summary>
 +##	Read the kvm devices.
 +## </summary>
 +## <param name="domain">
@@ -4630,7 +4668,7 @@
  ##	Mount a usbfs filesystem.
  ## </summary>
  ## <param name="domain">
-@@ -3320,3 +3505,223 @@
+@@ -3320,3 +3523,223 @@
  
  	typeattribute $1 devices_unconfined_type;
  ')
@@ -5414,7 +5452,7 @@
 +/dev/shm		-d	gen_context(system_u:object_r:tmpfs_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/filesystem.if serefpolicy-3.6.3/policy/modules/kernel/filesystem.if
 --- nsaserefpolicy/policy/modules/kernel/filesystem.if	2009-01-05 15:39:38.000000000 -0500
-+++ serefpolicy-3.6.3/policy/modules/kernel/filesystem.if	2009-01-19 13:10:02.000000000 -0500
++++ serefpolicy-3.6.3/policy/modules/kernel/filesystem.if	2009-01-20 14:57:41.000000000 -0500
 @@ -534,6 +534,24 @@
  
  ########################################
@@ -5858,7 +5896,7 @@
  #
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/kernel.if serefpolicy-3.6.3/policy/modules/kernel/kernel.if
 --- nsaserefpolicy/policy/modules/kernel/kernel.if	2009-01-05 15:39:38.000000000 -0500
-+++ serefpolicy-3.6.3/policy/modules/kernel/kernel.if	2009-01-19 13:10:02.000000000 -0500
++++ serefpolicy-3.6.3/policy/modules/kernel/kernel.if	2009-01-20 16:17:37.000000000 -0500
 @@ -1197,6 +1197,7 @@
  	')
  
@@ -5939,9 +5977,33 @@
  ##	Unconfined access to kernel module resources.
  ## </summary>
  ## <param name="domain">
+@@ -2595,3 +2637,23 @@
+ 
+ 	typeattribute $1 kern_unconfined;
+ ')
++
++########################################
++## <summary>
++##	Allow the specified domain to connect to
++##	the kernel with a unix socket.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`kernel_stream_connect',`
++	gen_require(`
++		type kernel_t;
++	')
++
++	allow $1 kernel_t:unix_stream_socket connectto;
++')
++
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/kernel.te serefpolicy-3.6.3/policy/modules/kernel/kernel.te
 --- nsaserefpolicy/policy/modules/kernel/kernel.te	2009-01-19 11:03:28.000000000 -0500
-+++ serefpolicy-3.6.3/policy/modules/kernel/kernel.te	2009-01-19 13:10:02.000000000 -0500
++++ serefpolicy-3.6.3/policy/modules/kernel/kernel.te	2009-01-20 17:15:33.000000000 -0500
 @@ -63,6 +63,15 @@
  genfscon debugfs / gen_context(system_u:object_r:debugfs_t,s0)
  
@@ -5977,7 +6039,44 @@
  
  # These initial sids are no longer used, and can be removed:
  sid any_socket		gen_context(system_u:object_r:unlabeled_t,mls_systemhigh)
-@@ -273,6 +287,8 @@
+@@ -198,6 +212,8 @@
+ allow kernel_t self:sock_file read_sock_file_perms;
+ allow kernel_t self:fd use;
+ 
++allow kernel_t debugfs_t:dir search;
++
+ allow kernel_t proc_t:dir list_dir_perms;
+ allow kernel_t proc_t:file read_file_perms;
+ allow kernel_t proc_t:lnk_file read_lnk_file_perms;
+@@ -246,7 +263,8 @@
+ 
+ selinux_load_policy(kernel_t)
+ 
+-term_use_console(kernel_t)
++term_use_all_terms(kernel_t)
++term_use_ptmx(kernel_t)
+ 
+ corecmd_exec_shell(kernel_t)
+ corecmd_list_bin(kernel_t)
+@@ -260,6 +278,8 @@
+ files_list_etc(kernel_t)
+ files_list_home(kernel_t)
+ files_read_usr_files(kernel_t)
++files_manage_mounttab(kernel_t)
++files_manage_generic_spool_dirs(kernel_t)
+ 
+ mcs_process_set_categories(kernel_t)
+ 
+@@ -267,12 +287,17 @@
+ mls_process_write_down(kernel_t)
+ mls_file_write_all_levels(kernel_t)
+ mls_file_read_all_levels(kernel_t) 
++mls_socket_write_all_levels(kernel_t) 
++
++logging_manage_generic_logs(kernel_t)
+ 
+ ifdef(`distro_redhat',`
+ 	# Bugzilla 222337
  	fs_rw_tmpfs_chr_files(kernel_t)
  ')
  
@@ -5986,6 +6085,17 @@
  tunable_policy(`read_default_t',`
  	files_list_default(kernel_t)
  	files_read_default_files(kernel_t)
+@@ -357,6 +382,10 @@
+ 	unconfined_domain(kernel_t)
+ ')
+ 
++optional_policy(`
++	xserver_xdm_manage_spool(kernel_t)
++')
++
+ ########################################
+ #
+ # Unlabeled process local policy
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/selinux.if serefpolicy-3.6.3/policy/modules/kernel/selinux.if
 --- nsaserefpolicy/policy/modules/kernel/selinux.if	2009-01-19 11:03:28.000000000 -0500
 +++ serefpolicy-3.6.3/policy/modules/kernel/selinux.if	2009-01-19 13:32:33.000000000 -0500
@@ -6069,7 +6179,16 @@
  /dev/scramdisk/.*	-b	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/kernel/terminal.if serefpolicy-3.6.3/policy/modules/kernel/terminal.if
 --- nsaserefpolicy/policy/modules/kernel/terminal.if	2008-11-11 16:13:41.000000000 -0500
-+++ serefpolicy-3.6.3/policy/modules/kernel/terminal.if	2009-01-19 13:10:02.000000000 -0500
++++ serefpolicy-3.6.3/policy/modules/kernel/terminal.if	2009-01-20 14:48:49.000000000 -0500
+@@ -173,7 +173,7 @@
+ 
+ 	dev_list_all_dev_nodes($1)
+ 	allow $1 devpts_t:dir list_dir_perms;
+-	allow $1 { console_device_t tty_device_t ttynode ptynode }:chr_file rw_chr_file_perms;
++	allow $1 { devpts_t console_device_t tty_device_t ttynode ptynode }:chr_file rw_chr_file_perms;
+ ')
+ 
+ ########################################
 @@ -250,9 +250,11 @@
  interface(`term_dontaudit_use_console',`
  	gen_require(`
@@ -8349,7 +8468,7 @@
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.te serefpolicy-3.6.3/policy/modules/services/apache.te
 --- nsaserefpolicy/policy/modules/services/apache.te	2009-01-19 11:06:49.000000000 -0500
-+++ serefpolicy-3.6.3/policy/modules/services/apache.te	2009-01-20 07:55:29.000000000 -0500
++++ serefpolicy-3.6.3/policy/modules/services/apache.te	2009-01-21 11:01:33.000000000 -0500
 @@ -19,6 +19,8 @@
  # Declarations
  #
@@ -10010,7 +10129,7 @@
 +/var/log/rpmpkgs.*		--	gen_context(system_u:object_r:cron_log_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cron.if serefpolicy-3.6.3/policy/modules/services/cron.if
 --- nsaserefpolicy/policy/modules/services/cron.if	2008-11-11 16:13:47.000000000 -0500
-+++ serefpolicy-3.6.3/policy/modules/services/cron.if	2009-01-19 13:10:02.000000000 -0500
++++ serefpolicy-3.6.3/policy/modules/services/cron.if	2009-01-20 15:16:32.000000000 -0500
 @@ -12,6 +12,10 @@
  ## </param>
  #
@@ -10048,7 +10167,15 @@
  
  	miscfiles_read_localization($1_t)
  
-@@ -343,6 +357,24 @@
+@@ -261,6 +275,7 @@
+ 	allow $1 system_cronjob_t:fifo_file rw_file_perms;
+ 	allow $1 system_cronjob_t:process sigchld;
+ 
++	domain_auto_trans(crond_t, $2, $1)
+ 	allow $1 crond_t:fifo_file rw_file_perms;
+ 	allow $1 crond_t:fd use;
+ 	allow $1 crond_t:process sigchld;
+@@ -343,6 +358,24 @@
  
  ########################################
  ## <summary>
@@ -10073,7 +10200,7 @@
  ##	Read and write a cron daemon unnamed pipe.
  ## </summary>
  ## <param name="domain">
-@@ -361,7 +393,7 @@
+@@ -361,7 +394,7 @@
  
  ########################################
  ## <summary>
@@ -10082,7 +10209,7 @@
  ## </summary>
  ## <param name="domain">
  ##	<summary>
-@@ -369,7 +401,7 @@
+@@ -369,7 +402,7 @@
  ##	</summary>
  ## </param>
  #
@@ -10091,7 +10218,7 @@
  	gen_require(`
  		type crond_t;
  	')
-@@ -481,11 +513,14 @@
+@@ -481,11 +514,14 @@
  #
  interface(`cron_read_system_job_tmp_files',`
  	gen_require(`
@@ -10107,7 +10234,7 @@
  ')
  
  ########################################
-@@ -506,3 +541,82 @@
+@@ -506,3 +542,82 @@
  
  	dontaudit $1 system_cronjob_tmp_t:file append;
  ')
@@ -10192,7 +10319,7 @@
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cron.te serefpolicy-3.6.3/policy/modules/services/cron.te
 --- nsaserefpolicy/policy/modules/services/cron.te	2009-01-19 11:06:49.000000000 -0500
-+++ serefpolicy-3.6.3/policy/modules/services/cron.te	2009-01-19 13:10:02.000000000 -0500
++++ serefpolicy-3.6.3/policy/modules/services/cron.te	2009-01-20 16:52:23.000000000 -0500
 @@ -38,6 +38,10 @@
  type cron_var_lib_t;
  files_type(cron_var_lib_t)
@@ -10249,7 +10376,7 @@
  dontaudit crond_t self:capability { sys_resource sys_tty_config };
  allow crond_t self:process ~{ ptrace setcurrent setexec setfscreate setrlimit execmem execstack execheap };
  allow crond_t self:process { setexec setfscreate };
-@@ -149,15 +163,14 @@
+@@ -149,19 +163,19 @@
  allow crond_t crond_var_run_t:file manage_file_perms;
  files_pid_filetrans(crond_t,crond_var_run_t,file)
  
@@ -10268,7 +10395,12 @@
  
  kernel_read_kernel_sysctls(crond_t)
  kernel_search_key(crond_t)
-@@ -183,6 +196,8 @@
+ 
++dev_read_kmsg(crond_t)
+ dev_read_sysfs(crond_t)
+ selinux_get_fs_mount(crond_t)
+ selinux_validate_context(crond_t)
+@@ -183,6 +197,8 @@
  corecmd_read_bin_symlinks(crond_t)
  
  domain_use_interactive_fds(crond_t)
@@ -10277,7 +10409,7 @@
  
  files_read_etc_files(crond_t)
  files_read_generic_spool(crond_t)
-@@ -192,10 +207,13 @@
+@@ -192,10 +208,13 @@
  files_search_default(crond_t)
  
  init_rw_utmp(crond_t)
@@ -10291,7 +10423,7 @@
  
  seutil_read_config(crond_t)
  seutil_read_default_contexts(crond_t)
-@@ -208,6 +226,7 @@
+@@ -208,6 +227,7 @@
  userdom_list_user_home_dirs(crond_t)
  
  mta_send_mail(crond_t)
@@ -10299,7 +10431,7 @@
  
  ifdef(`distro_debian',`
  	# pam_limits is used
-@@ -227,21 +246,45 @@
+@@ -227,21 +247,45 @@
  	')
  ')
  
@@ -10346,7 +10478,7 @@
  ')
  
  optional_policy(`
-@@ -283,6 +326,9 @@
+@@ -283,7 +327,14 @@
  allow system_cronjob_t cron_var_lib_t:file manage_file_perms;
  files_var_lib_filetrans(system_cronjob_t, cron_var_lib_t, file)
  
@@ -10354,9 +10486,14 @@
 +files_pid_filetrans(system_cronjob_t, cron_var_run_t, file)
 +
  allow system_cronjob_t system_cron_spool_t:file read_file_perms;
++
++# anacron forces the following
++allow system_cronjob_t system_cron_spool_t:file { write setattr };
++
  # The entrypoint interface is not used as this is not
  # a regular entrypoint.  Since crontab files are
-@@ -314,9 +360,13 @@
+ # not directly executed, crond must ensure that
+@@ -314,9 +365,13 @@
  filetrans_pattern(system_cronjob_t, crond_tmp_t, system_cronjob_tmp_t, { file lnk_file })
  files_tmp_filetrans(system_cronjob_t, system_cronjob_tmp_t, file)
  
@@ -10371,7 +10508,7 @@
  
  kernel_read_kernel_sysctls(system_cronjob_t)
  kernel_read_system_state(system_cronjob_t)
-@@ -370,7 +420,8 @@
+@@ -370,7 +425,8 @@
  init_read_utmp(system_cronjob_t)
  init_dontaudit_rw_utmp(system_cronjob_t)
  # prelink tells init to restart it self, we either need to allow or dontaudit
@@ -10381,7 +10518,7 @@
  
  auth_use_nsswitch(system_cronjob_t)
  
-@@ -378,6 +429,7 @@
+@@ -378,6 +434,7 @@
  libs_exec_ld_so(system_cronjob_t)
  
  logging_read_generic_logs(system_cronjob_t)
@@ -10389,7 +10526,7 @@
  logging_send_syslog_msg(system_cronjob_t)
  
  miscfiles_read_localization(system_cronjob_t)
-@@ -428,11 +480,20 @@
+@@ -428,11 +485,20 @@
  ')
  
  optional_policy(`
@@ -10410,7 +10547,7 @@
  ')
  
  optional_policy(`
-@@ -460,8 +521,7 @@
+@@ -460,8 +526,7 @@
  ')
  
  optional_policy(`
@@ -10420,7 +10557,7 @@
  ')
  
  optional_policy(`
-@@ -469,24 +529,17 @@
+@@ -469,24 +534,17 @@
  ')
  
  optional_policy(`
@@ -10429,16 +10566,16 @@
 +	unconfined_domain(crond_t)
  	unconfined_domain(system_cronjob_t)
 -	userdom_user_home_dir_filetrans_user_home_content(system_cronjob_t, { dir file lnk_file fifo_file sock_file })
--')
--
+ ')
+ 
 -ifdef(`TODO',`
 -ifdef(`mta.te', `
 -allow system_cronjob_t mail_spool_t:lnk_file read;
 -allow mta_user_agent system_cronjob_t:fd use;
 -r_dir_file(system_mail_t, crond_tmp_t)
- ')
+-')
 -') dnl end TODO
- 
+-
  ########################################
  #
  # User cronjobs local policy
@@ -10448,6 +10585,16 @@
  allow cronjob_t self:process { signal_perms setsched };
  allow cronjob_t self:fifo_file rw_fifo_file_perms;
  allow cronjob_t self:unix_stream_socket create_stream_socket_perms;
+@@ -570,6 +628,9 @@
+ userdom_manage_user_home_content_sockets(cronjob_t)
+ #userdom_user_home_dir_filetrans_user_home_content(cronjob_t, notdevfile_class_set)
+ 
++list_dirs_pattern(crond_t, user_cron_spool_t, user_cron_spool_t)
++read_files_pattern(crond_t, user_cron_spool_t, user_cron_spool_t)
++
+ tunable_policy(`fcron_crond', `
+ 	allow crond_t user_cron_spool_t:file manage_file_perms;
+ ')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.fc serefpolicy-3.6.3/policy/modules/services/cups.fc
 --- nsaserefpolicy/policy/modules/services/cups.fc	2008-08-07 11:15:11.000000000 -0400
 +++ serefpolicy-3.6.3/policy/modules/services/cups.fc	2009-01-19 13:10:02.000000000 -0500
@@ -11417,8 +11564,8 @@
 +/var/run/devkit(/.*)?			gen_context(system_u:object_r:devicekit_var_run_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/devicekit.if serefpolicy-3.6.3/policy/modules/services/devicekit.if
 --- nsaserefpolicy/policy/modules/services/devicekit.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.3/policy/modules/services/devicekit.if	2009-01-19 17:17:14.000000000 -0500
-@@ -0,0 +1,139 @@
++++ serefpolicy-3.6.3/policy/modules/services/devicekit.if	2009-01-20 17:22:44.000000000 -0500
+@@ -0,0 +1,157 @@
 +
 +## <summary>policy for devicekit</summary>
 +
@@ -11458,7 +11605,7 @@
 +	')
 +
 +	files_search_pids($1)
-+	allow $1 devicekit_var_run_t:file read_file_perms;
++	read_files_pattern($1, devicekit_var_run_t, devicekit_var_run_t)
 +')
 +
 +########################################
@@ -11505,6 +11652,24 @@
 +
 +########################################
 +## <summary>
++##	Send signal devicekit power
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`devicekit_power_signal',`
++	gen_require(`
++		type devicekit_power_t;
++	')
++
++	allow $1 devicekit_power_t:process signal;
++')
++
++########################################
++## <summary>
 +##	Send and receive messages from
 +##	devicekit power over dbus.
 +## </summary>
@@ -11560,8 +11725,8 @@
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/devicekit.te serefpolicy-3.6.3/policy/modules/services/devicekit.te
 --- nsaserefpolicy/policy/modules/services/devicekit.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.3/policy/modules/services/devicekit.te	2009-01-19 17:06:44.000000000 -0500
-@@ -0,0 +1,55 @@
++++ serefpolicy-3.6.3/policy/modules/services/devicekit.te	2009-01-20 17:10:23.000000000 -0500
+@@ -0,0 +1,71 @@
 +policy_module(devicekit,1.0.0)
 +
 +########################################
@@ -11587,13 +11752,21 @@
 +#
 +# DeviceKit local policy
 +#
++allow devicekit_t self:unix_dgram_socket create_socket_perms;
 +
 +manage_dirs_pattern(devicekit_t, devicekit_var_run_t,  devicekit_var_run_t)
 +manage_files_pattern(devicekit_t, devicekit_var_run_t,  devicekit_var_run_t)
 +files_pid_filetrans(devicekit_t,devicekit_var_run_t, { file dir })
 +
++dev_read_sysfs(devicekit_t)
++dev_read_urand(devicekit_t)
++
++files_read_etc_files(devicekit_t)
++
 +fs_list_inotifyfs(devicekit_t)
 +
++miscfiles_read_localization(devicekit_t)
++
 +optional_policy(`
 +	dbus_system_bus_client(devicekit_t)
 +')
@@ -11601,11 +11774,18 @@
 +#
 +# DeviceKit-Power local policy
 +#
++allow devicekit_power_t self:unix_dgram_socket create_socket_perms;
 +
++dev_rw_generic_usb_dev(devicekit_power_t)
 +dev_rw_netcontrol(devicekit_power_t)
++dev_read_sysfs(devicekit_power_t)
++
 +files_read_etc_files(devicekit_power_t)
++
 +fs_list_inotifyfs(devicekit_power_t)
 +
++miscfiles_read_localization(devicekit_power_t)
++
 +optional_policy(`
 +	polkit_read_reload(devicekit_power_t)
 +')
@@ -11614,9 +11794,10 @@
 +	dbus_system_bus_client(devicekit_power_t)
 +	allow devicekit_power_t devicekit_t:dbus send_msg;
 +	allow devicekit_t devicekit_power_t:dbus send_msg;
++	optional_policy(`
++		consolekit_dbus_chat(devicekit_power_t)
++	')
 +')
-+
-+
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dhcp.if serefpolicy-3.6.3/policy/modules/services/dhcp.if
 --- nsaserefpolicy/policy/modules/services/dhcp.if	2008-11-18 18:57:20.000000000 -0500
 +++ serefpolicy-3.6.3/policy/modules/services/dhcp.if	2009-01-19 13:10:02.000000000 -0500
@@ -12512,7 +12693,7 @@
  /usr/libexec/hald-addon-macbookpro-backlight --	gen_context(system_u:object_r:hald_mac_exec_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.if serefpolicy-3.6.3/policy/modules/services/hal.if
 --- nsaserefpolicy/policy/modules/services/hal.if	2008-11-19 11:51:44.000000000 -0500
-+++ serefpolicy-3.6.3/policy/modules/services/hal.if	2009-01-19 13:10:02.000000000 -0500
++++ serefpolicy-3.6.3/policy/modules/services/hal.if	2009-01-20 15:29:07.000000000 -0500
 @@ -51,10 +51,7 @@
  		type hald_t;
  	')
@@ -12527,7 +12708,7 @@
  ########################################
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.te serefpolicy-3.6.3/policy/modules/services/hal.te
 --- nsaserefpolicy/policy/modules/services/hal.te	2009-01-19 11:06:49.000000000 -0500
-+++ serefpolicy-3.6.3/policy/modules/services/hal.te	2009-01-19 14:46:49.000000000 -0500
++++ serefpolicy-3.6.3/policy/modules/services/hal.te	2009-01-20 11:41:48.000000000 -0500
 @@ -49,6 +49,15 @@
  type hald_var_lib_t;
  files_type(hald_var_lib_t)
@@ -12638,7 +12819,16 @@
  
  domtrans_pattern(hald_t, hald_mac_exec_t, hald_mac_t)
  allow hald_t hald_mac_t:process signal;
-@@ -418,3 +453,49 @@
+@@ -374,6 +409,8 @@
+ 
+ auth_use_nsswitch(hald_mac_t)
+ 
++logging_send_syslog_msg(hald_mac_t)
++
+ miscfiles_read_localization(hald_mac_t)
+ 
+ ########################################
+@@ -418,3 +455,49 @@
  files_read_usr_files(hald_keymap_t)
  
  miscfiles_read_localization(hald_keymap_t)
@@ -19908,7 +20098,7 @@
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/setroubleshoot.te serefpolicy-3.6.3/policy/modules/services/setroubleshoot.te
 --- nsaserefpolicy/policy/modules/services/setroubleshoot.te	2009-01-19 11:06:49.000000000 -0500
-+++ serefpolicy-3.6.3/policy/modules/services/setroubleshoot.te	2009-01-19 13:10:02.000000000 -0500
++++ serefpolicy-3.6.3/policy/modules/services/setroubleshoot.te	2009-01-21 11:01:41.000000000 -0500
 @@ -11,6 +11,9 @@
  domain_type(setroubleshootd_t)
  init_daemon_domain(setroubleshootd_t, setroubleshootd_exec_t)
@@ -19941,7 +20131,7 @@
  
  corecmd_exec_bin(setroubleshootd_t)
  corecmd_exec_shell(setroubleshootd_t)
-@@ -68,16 +74,23 @@
+@@ -68,16 +74,24 @@
  
  dev_read_urand(setroubleshootd_t)
  dev_read_sysfs(setroubleshootd_t)
@@ -19963,10 +20153,11 @@
 +fs_read_fusefs_symlinks(setroubleshootd_t)
 +fs_dontaudit_read_nfs_files(setroubleshootd_t)
 +fs_dontaudit_read_cifs_files(setroubleshootd_t)
++fs_list_inotifyfs(setroubleshootd_t)
  
  selinux_get_enforce_mode(setroubleshootd_t)
  selinux_validate_context(setroubleshootd_t)
-@@ -94,22 +107,24 @@
+@@ -94,22 +108,24 @@
  
  locallogin_dontaudit_use_fds(setroubleshootd_t)
  
@@ -21174,7 +21365,16 @@
  optional_policy(`
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/virt.te serefpolicy-3.6.3/policy/modules/services/virt.te
 --- nsaserefpolicy/policy/modules/services/virt.te	2009-01-19 11:06:49.000000000 -0500
-+++ serefpolicy-3.6.3/policy/modules/services/virt.te	2009-01-19 13:10:02.000000000 -0500
++++ serefpolicy-3.6.3/policy/modules/services/virt.te	2009-01-20 14:57:03.000000000 -0500
+@@ -53,7 +53,7 @@
+ # virtd local policy
+ #
+ 
+-allow virtd_t self:capability { dac_override kill net_admin setgid sys_nice sys_ptrace };
++allow virtd_t self:capability { dac_override kill net_admin  net_raw setuid setgid sys_nice sys_ptrace };
+ allow virtd_t self:process { getsched sigkill signal execmem };
+ allow virtd_t self:fifo_file rw_file_perms;
+ allow virtd_t self:unix_stream_socket create_stream_socket_perms;
 @@ -96,7 +96,7 @@
  corenet_tcp_sendrecv_generic_node(virtd_t)
  corenet_tcp_sendrecv_all_ports(virtd_t)
@@ -21192,7 +21392,16 @@
  files_read_etc_runtime_files(virtd_t)
  files_search_all(virtd_t)
  files_list_kernel_modules(virtd_t)
-@@ -173,16 +174,17 @@
+@@ -129,6 +130,8 @@
+ 
+ logging_send_syslog_msg(virtd_t)
+ 
++sysnet_domtrans_ifconfig(virtd_t)
++
+ userdom_read_all_users_state(virtd_t)
+ 
+ tunable_policy(`virt_use_nfs',`
+@@ -173,16 +176,17 @@
  	iptables_domtrans(virtd_t)
  ')
  
@@ -21305,8 +21514,16 @@
  /var/lib/pam_devperm/:0	--	gen_context(system_u:object_r:xdm_var_lib_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.if serefpolicy-3.6.3/policy/modules/services/xserver.if
 --- nsaserefpolicy/policy/modules/services/xserver.if	2009-01-05 15:39:43.000000000 -0500
-+++ serefpolicy-3.6.3/policy/modules/services/xserver.if	2009-01-19 13:10:02.000000000 -0500
-@@ -156,7 +156,7 @@
++++ serefpolicy-3.6.3/policy/modules/services/xserver.if	2009-01-21 11:14:55.000000000 -0500
+@@ -116,6 +116,7 @@
+ 	# setattr: gnome-settings-daemon X11:GrabKey
+ 	# manage: metacity X11:ChangeWindowAttributes
+ 	allow $2 rootwindow_t:x_drawable { read write manage setattr };
++	allow $2 $2:x_drawable all_x_drawable_perms;
+ 
+ 	# setattr: metacity X11:InstallColormap
+ 	allow $2 xserver_t:x_screen { saver_getattr saver_setattr setattr };
+@@ -156,7 +157,7 @@
  	allow $1 xserver_t:process signal;
  
  	# Read /tmp/.X0-lock
@@ -21315,7 +21532,7 @@
  
  	# Client read xserver shm
  	allow $1 xserver_t:fd use;
-@@ -219,12 +219,12 @@
+@@ -219,12 +220,12 @@
  	allow $1 self:unix_stream_socket { connectto create_stream_socket_perms };
  
  	# Read .Xauthority file
@@ -21331,7 +21548,7 @@
  	allow $1 xdm_tmp_t:dir search;
  	allow $1 xdm_tmp_t:sock_file { read write };
  	dontaudit $1 xdm_t:tcp_socket { read write };
-@@ -397,11 +397,12 @@
+@@ -397,11 +398,12 @@
  	gen_require(`
  		type xdm_t, xdm_tmp_t;
  		type xauth_home_t, iceauth_home_t, xserver_t, xserver_tmpfs_t;
@@ -21347,7 +21564,7 @@
  
  	# Read .Xauthority file
  	allow $2 xauth_home_t:file read_file_perms;
-@@ -409,7 +410,7 @@
+@@ -409,7 +411,7 @@
  
  	# for when /tmp/.X11-unix is created by the system
  	allow $2 xdm_t:fd use;
@@ -21356,7 +21573,7 @@
  	allow $2 xdm_tmp_t:dir search_dir_perms;
  	allow $2 xdm_tmp_t:sock_file { read write };
  	dontaudit $2 xdm_t:tcp_socket { read write };
-@@ -437,6 +438,10 @@
+@@ -437,6 +439,10 @@
  		allow $2 xserver_t:shm rw_shm_perms;
  		allow $2 xserver_tmpfs_t:file rw_file_perms;
  	')
@@ -21367,7 +21584,7 @@
  ')
  
  ########################################
-@@ -639,7 +644,7 @@
+@@ -639,7 +645,7 @@
  		type xdm_t;
  	')
  
@@ -21376,7 +21593,7 @@
  ')
  
  ########################################
-@@ -738,6 +743,7 @@
+@@ -738,6 +744,7 @@
  	files_search_tmp($1)
  	allow $1 xdm_tmp_t:dir list_dir_perms;
  	create_sock_files_pattern($1, xdm_tmp_t, xdm_tmp_t)
@@ -21384,7 +21601,7 @@
  ')
  
  ########################################
-@@ -756,7 +762,26 @@
+@@ -756,7 +763,26 @@
  	')
  
  	files_search_pids($1)
@@ -21412,7 +21629,7 @@
  ')
  
  ########################################
-@@ -779,6 +804,31 @@
+@@ -779,6 +805,31 @@
  
  ########################################
  ## <summary>
@@ -21444,7 +21661,7 @@
  ##	Make an X session script an entrypoint for the specified domain.
  ## </summary>
  ## <param name="domain">
-@@ -1018,10 +1068,11 @@
+@@ -1018,10 +1069,11 @@
  #
  interface(`xserver_domtrans',`
  	gen_require(`
@@ -21457,7 +21674,7 @@
  	domtrans_pattern($1, xserver_exec_t, xserver_t)
  ')
  
-@@ -1159,6 +1210,253 @@
+@@ -1159,6 +1211,272 @@
  
  ########################################
  ## <summary>
@@ -21690,6 +21907,25 @@
 +
 +########################################
 +## <summary>
++##	Manage the xdm_spool files
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`xserver_xdm_manage_spool',`
++	gen_require(`
++		type xdm_spool_t;
++	')
++
++	files_search_spool($1)
++	manage_files_pattern($1, xdm_spool_t, xdm_spool_t)
++')
++
++########################################
++## <summary>
 +##	Ptrace XDM 
 +## </summary>
 +## <param name="domain">
@@ -21713,7 +21949,7 @@
  ##	display.
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.te serefpolicy-3.6.3/policy/modules/services/xserver.te
 --- nsaserefpolicy/policy/modules/services/xserver.te	2009-01-19 11:06:49.000000000 -0500
-+++ serefpolicy-3.6.3/policy/modules/services/xserver.te	2009-01-19 17:08:51.000000000 -0500
++++ serefpolicy-3.6.3/policy/modules/services/xserver.te	2009-01-21 11:00:16.000000000 -0500
 @@ -34,6 +34,13 @@
  
  ## <desc>
@@ -22126,7 +22362,24 @@
  	xfs_stream_connect(xdm_t)
  ')
  
-@@ -635,6 +738,15 @@
+@@ -587,7 +690,7 @@
+ # execheap needed until the X module loader is fixed.
+ # NVIDIA Needs execstack
+ 
+-allow xserver_t self:capability { dac_override fowner fsetid setgid setuid ipc_owner sys_rawio sys_admin sys_nice sys_tty_config mknod net_bind_service };
++allow xserver_t self:capability { dac_override fowner fsetid setgid setuid ipc_owner sys_ptrace sys_rawio sys_admin sys_nice sys_tty_config mknod net_bind_service };
+ dontaudit xserver_t self:capability chown;
+ allow xserver_t self:process ~{ ptrace setcurrent setexec setfscreate setrlimit execmem execstack execheap };
+ allow xserver_t self:memprotect mmap_zero;
+@@ -602,6 +705,7 @@
+ allow xserver_t self:unix_stream_socket { create_stream_socket_perms connectto };
+ allow xserver_t self:tcp_socket create_stream_socket_perms;
+ allow xserver_t self:udp_socket create_socket_perms;
++allow xserver_t self:netlink_selinux_socket create_socket_perms;
+ 
+ # Device rules
+ allow x_domain xserver_t:x_device { read getattr use setattr setfocus grab bell };
+@@ -635,6 +739,15 @@
  manage_lnk_files_pattern(xserver_t, xkb_var_lib_t, xkb_var_lib_t)
  files_search_var_lib(xserver_t)
  
@@ -22142,15 +22395,21 @@
  # Create files in /var/log with the xserver_log_t type.
  manage_files_pattern(xserver_t, xserver_log_t, xserver_log_t)
  logging_log_filetrans(xserver_t, xserver_log_t,file)
-@@ -682,6 +794,7 @@
+@@ -680,9 +793,13 @@
+ dev_rw_xserver_misc(xserver_t)
+ # read events - the synaptics touchpad driver reads raw events
  dev_rw_input_dev(xserver_t)
++dev_read_raw_memory(xserver_t)
++dev_write_raw_memory(xserver_t)
  dev_rwx_zero(xserver_t)
  
 +domain_mmap_low_type(xserver_t)
  domain_mmap_low(xserver_t)
++domain_dontaudit_read_all_domains_state(xserver_t)
  
  files_read_etc_files(xserver_t)
-@@ -697,6 +810,7 @@
+ files_read_etc_runtime_files(xserver_t)
+@@ -697,6 +814,7 @@
  fs_search_nfs(xserver_t)
  fs_search_auto_mountpoints(xserver_t)
  fs_search_ramfs(xserver_t)
@@ -22158,7 +22417,26 @@
  
  mls_xwin_read_to_clearance(xserver_t)
  
-@@ -806,7 +920,7 @@
+@@ -720,6 +838,7 @@
+ 
+ miscfiles_read_localization(xserver_t)
+ miscfiles_read_fonts(xserver_t)
++miscfiles_read_hwdata(xserver_t)
+ 
+ modutils_domtrans_insmod(xserver_t)
+ 
+@@ -774,6 +893,10 @@
+ ')
+ 
+ optional_policy(`
++	devicekit_power_signal(xserver_t)
++')
++
++optional_policy(`
+ 	rhgb_getpgid(xserver_t)
+ 	rhgb_signal(xserver_t)
+ ')
+@@ -806,7 +929,7 @@
  allow xserver_t xdm_var_lib_t:file { getattr read };
  dontaudit xserver_t xdm_var_lib_t:dir search;
  
@@ -22167,7 +22445,7 @@
  
  # Label pid and temporary files with derived types.
  manage_files_pattern(xserver_t, xdm_tmp_t, xdm_tmp_t)
-@@ -830,6 +944,10 @@
+@@ -830,6 +953,10 @@
  
  xserver_use_user_fonts(xserver_t)
  
@@ -22178,7 +22456,7 @@
  tunable_policy(`use_nfs_home_dirs',`
  	fs_manage_nfs_dirs(xserver_t)
  	fs_manage_nfs_files(xserver_t)
-@@ -844,11 +962,14 @@
+@@ -844,11 +971,14 @@
  
  optional_policy(`
  	dbus_system_bus_client(xserver_t)
@@ -22194,7 +22472,7 @@
  ')
  
  optional_policy(`
-@@ -856,6 +977,11 @@
+@@ -856,6 +986,11 @@
  	rhgb_rw_tmpfs_files(xserver_t)
  ')
  
@@ -22206,7 +22484,7 @@
  ########################################
  #
  # Rules common to all X window domains
-@@ -972,6 +1098,37 @@
+@@ -972,6 +1107,37 @@
  allow xserver_unconfined_type { x_domain xserver_t }:x_resource *;
  allow xserver_unconfined_type xevent_type:{ x_event x_synthetic_event } *;
  
@@ -22244,7 +22522,7 @@
  ifdef(`TODO',`
  tunable_policy(`allow_polyinstantiation',`
  # xdm needs access for linking .X11-unix to poly /tmp
-@@ -986,3 +1143,13 @@
+@@ -986,3 +1152,13 @@
  #
  allow xdm_t user_home_type:file unlink;
  ') dnl end TODO
@@ -22398,7 +22676,7 @@
 +/var/cache/coolkey(/.*)?	gen_context(system_u:object_r:auth_cache_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/authlogin.if serefpolicy-3.6.3/policy/modules/system/authlogin.if
 --- nsaserefpolicy/policy/modules/system/authlogin.if	2008-11-11 16:13:48.000000000 -0500
-+++ serefpolicy-3.6.3/policy/modules/system/authlogin.if	2009-01-19 13:10:02.000000000 -0500
++++ serefpolicy-3.6.3/policy/modules/system/authlogin.if	2009-01-20 10:57:35.000000000 -0500
 @@ -43,6 +43,7 @@
  interface(`auth_login_pgm_domain',`
  	gen_require(`
@@ -22717,7 +22995,7 @@
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/authlogin.te serefpolicy-3.6.3/policy/modules/system/authlogin.te
 --- nsaserefpolicy/policy/modules/system/authlogin.te	2008-11-11 16:13:48.000000000 -0500
-+++ serefpolicy-3.6.3/policy/modules/system/authlogin.te	2009-01-19 13:10:02.000000000 -0500
++++ serefpolicy-3.6.3/policy/modules/system/authlogin.te	2009-01-20 10:58:05.000000000 -0500
 @@ -12,7 +12,7 @@
  
  type chkpwd_t, can_read_shadow_passwords;
@@ -22737,7 +23015,7 @@
  #
  # var_auth_t is the type of /var/lib/auth, usually
  # used for auth data in pam_able
-@@ -121,6 +124,11 @@
+@@ -121,9 +124,18 @@
  ')
  
  optional_policy(`
@@ -22749,7 +23027,14 @@
  	kerberos_use(chkpwd_t)
  ')
  
-@@ -168,6 +176,11 @@
++optional_policy(`
++	nis_authenticate(chkpwd_t)
++')
++
+ ########################################
+ #
+ # PAM local policy
+@@ -168,6 +180,11 @@
  
  logging_send_syslog_msg(pam_t)
  
@@ -22761,7 +23046,7 @@
  ifdef(`distro_ubuntu',`
  	optional_policy(`
  		unconfined_domain(pam_t)
-@@ -183,7 +196,7 @@
+@@ -183,7 +200,7 @@
  # PAM console local policy
  #
  
@@ -22770,7 +23055,7 @@
  dontaudit pam_console_t self:capability sys_tty_config;
  
  allow pam_console_t self:process { sigchld sigkill sigstop signull signal };
-@@ -201,6 +214,8 @@
+@@ -201,6 +218,8 @@
  dev_read_sysfs(pam_console_t)
  dev_getattr_apm_bios_dev(pam_console_t)
  dev_setattr_apm_bios_dev(pam_console_t)
@@ -22779,7 +23064,7 @@
  dev_getattr_dri_dev(pam_console_t)
  dev_setattr_dri_dev(pam_console_t)
  dev_getattr_input_dev(pam_console_t)
-@@ -225,6 +240,10 @@
+@@ -225,6 +244,10 @@
  dev_setattr_video_dev(pam_console_t)
  dev_getattr_xserver_misc_dev(pam_console_t)
  dev_setattr_xserver_misc_dev(pam_console_t)
@@ -22868,7 +23153,7 @@
  #
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.if serefpolicy-3.6.3/policy/modules/system/init.if
 --- nsaserefpolicy/policy/modules/system/init.if	2009-01-05 15:39:43.000000000 -0500
-+++ serefpolicy-3.6.3/policy/modules/system/init.if	2009-01-19 13:10:02.000000000 -0500
++++ serefpolicy-3.6.3/policy/modules/system/init.if	2009-01-20 14:42:59.000000000 -0500
 @@ -280,6 +280,27 @@
  			kernel_dontaudit_use_fds($1)
  		')
@@ -23049,7 +23334,7 @@
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.te serefpolicy-3.6.3/policy/modules/system/init.te
 --- nsaserefpolicy/policy/modules/system/init.te	2009-01-19 11:07:34.000000000 -0500
-+++ serefpolicy-3.6.3/policy/modules/system/init.te	2009-01-19 13:10:02.000000000 -0500
++++ serefpolicy-3.6.3/policy/modules/system/init.te	2009-01-20 17:11:43.000000000 -0500
 @@ -17,6 +17,20 @@
  ## </desc>
  gen_tunable(init_upstart,false)
@@ -23152,11 +23437,15 @@
  
  can_exec(initrc_t,initrc_tmp_t)
  allow initrc_t initrc_tmp_t:file manage_file_perms;
-@@ -251,13 +280,14 @@
+@@ -249,15 +278,18 @@
+ kernel_rw_all_sysctls(initrc_t)
+ # for lsof which is used by alsa shutdown:
  kernel_dontaudit_getattr_message_if(initrc_t)
++kernel_stream_connect(initrc_t)
  
  files_read_kernel_symbol_table(initrc_t)
 +files_exec_etc_files(initrc_t)
++fs_list_inotifyfs(initrc_t)
  
  corenet_all_recvfrom_unlabeled(initrc_t)
  corenet_all_recvfrom_netlabel(initrc_t)
@@ -23171,7 +23460,7 @@
  corenet_tcp_sendrecv_all_ports(initrc_t)
  corenet_udp_sendrecv_all_ports(initrc_t)
  corenet_tcp_connect_all_ports(initrc_t)
-@@ -274,7 +304,7 @@
+@@ -274,7 +306,7 @@
  dev_read_sound_mixer(initrc_t)
  dev_write_sound_mixer(initrc_t)
  dev_setattr_all_chr_files(initrc_t)
@@ -23180,7 +23469,7 @@
  dev_delete_lvm_control_dev(initrc_t)
  dev_manage_generic_symlinks(initrc_t)
  dev_manage_generic_files(initrc_t)
-@@ -328,7 +358,7 @@
+@@ -328,7 +360,7 @@
  domain_sigchld_all_domains(initrc_t)
  domain_read_all_domains_state(initrc_t)
  domain_getattr_all_domains(initrc_t)
@@ -23189,7 +23478,7 @@
  domain_getsession_all_domains(initrc_t)
  domain_use_interactive_fds(initrc_t)
  # for lsof which is used by alsa shutdown:
-@@ -367,6 +397,7 @@
+@@ -367,6 +399,7 @@
  libs_rw_ld_so_cache(initrc_t)
  libs_exec_lib_files(initrc_t)
  
@@ -23197,7 +23486,7 @@
  logging_send_syslog_msg(initrc_t)
  logging_manage_generic_logs(initrc_t)
  logging_read_all_logs(initrc_t)
-@@ -498,6 +529,7 @@
+@@ -498,6 +531,7 @@
  	optional_policy(`
  		#for /etc/rc.d/init.d/nfs to create /etc/exports
  		rpc_write_exports(initrc_t)
@@ -23205,7 +23494,7 @@
  	')
  
  	optional_policy(`
-@@ -516,6 +548,31 @@
+@@ -516,6 +550,31 @@
  	')
  ')
  
@@ -23237,7 +23526,7 @@
  optional_policy(`
  	amavis_search_lib(initrc_t)
  	amavis_setattr_pid_files(initrc_t)
-@@ -570,6 +627,10 @@
+@@ -570,6 +629,10 @@
  	dbus_read_config(initrc_t)
  
  	optional_policy(`
@@ -23248,7 +23537,7 @@
  		networkmanager_dbus_chat(initrc_t)
  	')
  ')
-@@ -655,12 +716,6 @@
+@@ -655,12 +718,6 @@
  	mta_read_config(initrc_t)
  	mta_dontaudit_read_spool_symlinks(initrc_t)
  ')
@@ -23261,7 +23550,7 @@
  
  optional_policy(`
  	ifdef(`distro_redhat',`
-@@ -721,6 +776,9 @@
+@@ -721,6 +778,9 @@
  
  	# why is this needed:
  	rpm_manage_db(initrc_t)
@@ -23271,7 +23560,7 @@
  ')
  
  optional_policy(`
-@@ -733,10 +791,12 @@
+@@ -733,10 +793,12 @@
  	squid_manage_logs(initrc_t)
  ')
  
@@ -23284,7 +23573,7 @@
  
  optional_policy(`
  	ssh_dontaudit_read_server_keys(initrc_t)
-@@ -754,6 +814,11 @@
+@@ -754,6 +816,11 @@
  	uml_setattr_util_sockets(initrc_t)
  ')
  
@@ -23296,7 +23585,7 @@
  optional_policy(`
  	unconfined_domain(initrc_t)
  
-@@ -768,6 +833,10 @@
+@@ -768,6 +835,10 @@
  ')
  
  optional_policy(`
@@ -23307,7 +23596,7 @@
  	vmware_read_system_config(initrc_t)
  	vmware_append_system_config(initrc_t)
  ')
-@@ -790,3 +859,11 @@
+@@ -790,3 +861,11 @@
  optional_policy(`
  	zebra_read_config(initrc_t)
  ')
@@ -23820,7 +24109,7 @@
  ########################################
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/logging.te serefpolicy-3.6.3/policy/modules/system/logging.te
 --- nsaserefpolicy/policy/modules/system/logging.te	2009-01-19 11:07:34.000000000 -0500
-+++ serefpolicy-3.6.3/policy/modules/system/logging.te	2009-01-19 13:10:02.000000000 -0500
++++ serefpolicy-3.6.3/policy/modules/system/logging.te	2009-01-20 16:07:48.000000000 -0500
 @@ -126,7 +126,7 @@
  allow auditd_t self:process { signal_perms setpgid setsched };
  allow auditd_t self:file rw_file_perms;
@@ -23852,7 +24141,7 @@
  allow audisp_t self:unix_stream_socket create_stream_socket_perms;
  allow audisp_t self:unix_dgram_socket create_socket_perms;
  
-@@ -226,20 +228,32 @@
+@@ -226,13 +228,18 @@
  manage_sock_files_pattern(audisp_t, audisp_var_run_t, audisp_var_run_t)
  files_pid_filetrans(audisp_t, audisp_var_run_t, sock_file)
  
@@ -23866,12 +24155,13 @@
 +files_read_etc_runtime_files(audisp_t)
  
  mls_file_write_all_levels(audisp_t)
- 
-+auth_use_nsswitch(audisp_t)
++mls_dbus_send_all_levels(audisp_t)
 +
++auth_use_nsswitch(audisp_t)
+ 
  logging_send_syslog_msg(audisp_t)
  
- miscfiles_read_localization(audisp_t)
+@@ -240,6 +247,14 @@
  
  sysnet_dns_name_resolve(audisp_t)
  
@@ -23886,7 +24176,7 @@
  ########################################
  #
  # Audit remote logger local policy
-@@ -253,11 +267,16 @@
+@@ -253,11 +268,16 @@
  corenet_tcp_sendrecv_generic_node(audisp_remote_t)
  corenet_tcp_connect_audit_port(audisp_remote_t)
  corenet_sendrecv_audit_client_packets(audisp_remote_t)
@@ -23903,7 +24193,7 @@
  miscfiles_read_localization(audisp_remote_t)
  
  sysnet_dns_name_resolve(audisp_remote_t)
-@@ -337,7 +356,7 @@
+@@ -337,7 +357,7 @@
  allow syslogd_t self:unix_dgram_socket create_socket_perms;
  allow syslogd_t self:unix_stream_socket create_stream_socket_perms;
  allow syslogd_t self:unix_dgram_socket sendto;
@@ -23930,7 +24220,7 @@
 +/var/run/dmevent.*		gen_context(system_u:object_r:lvm_var_run_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/lvm.te serefpolicy-3.6.3/policy/modules/system/lvm.te
 --- nsaserefpolicy/policy/modules/system/lvm.te	2009-01-19 11:07:34.000000000 -0500
-+++ serefpolicy-3.6.3/policy/modules/system/lvm.te	2009-01-19 13:10:02.000000000 -0500
++++ serefpolicy-3.6.3/policy/modules/system/lvm.te	2009-01-20 15:26:33.000000000 -0500
 @@ -10,6 +10,9 @@
  type clvmd_exec_t;
  init_daemon_domain(clvmd_t,clvmd_exec_t)
@@ -24071,7 +24361,15 @@
  
  kernel_read_system_state(lvm_t)
  kernel_read_kernel_sysctls(lvm_t)
-@@ -221,6 +256,7 @@
+@@ -192,6 +227,7 @@
+ kernel_read_kernel_sysctls(lvm_t)
+ # it has no reason to need this
+ kernel_dontaudit_getattr_core_if(lvm_t)
++kernel_use_fds(lvm_t)
+ 
+ selinux_get_fs_mount(lvm_t)
+ selinux_validate_context(lvm_t)
+@@ -221,6 +257,7 @@
  dev_dontaudit_getattr_generic_blk_files(lvm_t)
  dev_dontaudit_getattr_generic_pipes(lvm_t)
  dev_create_generic_dirs(lvm_t)
@@ -24079,14 +24377,13 @@
  
  fs_getattr_xattr_fs(lvm_t)
  fs_search_auto_mountpoints(lvm_t)
-@@ -239,12 +275,17 @@
+@@ -239,12 +276,16 @@
  storage_dev_filetrans_fixed_disk(lvm_t)
  # Access raw devices and old /dev/lvm (c 109,0).  Is this needed?
  storage_manage_fixed_disk(lvm_t)
 +mls_file_read_all_levels(lvm_t)
 +
-+term_getattr_all_user_ttys(lvm_t)
-+term_list_ptys(lvm_t)
++term_use_all_terms(lvm_t)
  
  corecmd_exec_bin(lvm_t)
  corecmd_exec_shell(lvm_t)
@@ -24167,7 +24464,7 @@
  ## <param name="domain">
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/modutils.te serefpolicy-3.6.3/policy/modules/system/modutils.te
 --- nsaserefpolicy/policy/modules/system/modutils.te	2009-01-05 15:39:43.000000000 -0500
-+++ serefpolicy-3.6.3/policy/modules/system/modutils.te	2009-01-19 13:10:02.000000000 -0500
++++ serefpolicy-3.6.3/policy/modules/system/modutils.te	2009-01-21 10:30:56.000000000 -0500
 @@ -42,7 +42,7 @@
  # insmod local policy
  #
@@ -24216,10 +24513,12 @@
  
  logging_send_syslog_msg(insmod_t)
  logging_search_logs(insmod_t)
-@@ -110,18 +113,29 @@
+@@ -109,19 +112,30 @@
+ 
  seutil_read_file_contexts(insmod_t)
  
- userdom_use_user_terminals(insmod_t)
+-userdom_use_user_terminals(insmod_t)
++term_use_all_terms(insmod_t)
 +userdom_dontaudit_search_user_home_dirs(insmod_t)
  
 -ifdef(`distro_ubuntu',`
@@ -25370,7 +25669,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.6.3/policy/modules/system/sysnetwork.if
 --- nsaserefpolicy/policy/modules/system/sysnetwork.if	2009-01-19 11:07:34.000000000 -0500
-+++ serefpolicy-3.6.3/policy/modules/system/sysnetwork.if	2009-01-19 13:10:02.000000000 -0500
++++ serefpolicy-3.6.3/policy/modules/system/sysnetwork.if	2009-01-20 14:55:03.000000000 -0500
 @@ -192,7 +192,25 @@
  		type dhcpc_state_t;
  	')
@@ -25724,8 +26023,8 @@
  ')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/udev.te serefpolicy-3.6.3/policy/modules/system/udev.te
 --- nsaserefpolicy/policy/modules/system/udev.te	2009-01-05 15:39:43.000000000 -0500
-+++ serefpolicy-3.6.3/policy/modules/system/udev.te	2009-01-19 13:10:02.000000000 -0500
-@@ -83,6 +83,7 @@
++++ serefpolicy-3.6.3/policy/modules/system/udev.te	2009-01-20 15:21:24.000000000 -0500
+@@ -83,10 +83,12 @@
  kernel_rw_unix_dgram_sockets(udev_t)
  kernel_dgram_send(udev_t)
  kernel_signal(udev_t)
@@ -25733,7 +26032,12 @@
  
  #https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=235182
  kernel_rw_net_sysctls(udev_t)
-@@ -139,6 +140,7 @@
+ kernel_read_network_state(udev_t)
++kernel_read_software_raid_state(udev_t)
+ 
+ corecmd_exec_all_executables(udev_t)
+ 
+@@ -139,6 +141,7 @@
  
  logging_search_logs(udev_t)
  logging_send_syslog_msg(udev_t)
@@ -25741,7 +26045,7 @@
  
  miscfiles_read_localization(udev_t)
  
-@@ -186,6 +188,7 @@
+@@ -186,6 +189,7 @@
  
  optional_policy(`
  	alsa_domtrans(udev_t)
@@ -25749,7 +26053,7 @@
  	alsa_read_rw_config(udev_t)
  ')
  
-@@ -194,6 +197,10 @@
+@@ -194,6 +198,10 @@
  ')
  
  optional_policy(`
@@ -25760,7 +26064,18 @@
  	consoletype_exec(udev_t)
  ')
  
-@@ -230,6 +237,10 @@
+@@ -202,6 +210,10 @@
+ ')
+ 
+ optional_policy(`
++	devicekit_read_pid_files(udev_t)
++')
++
++optional_policy(`
+ 	fstools_domtrans(udev_t)
+ ')
+ 
+@@ -230,6 +242,10 @@
  ')
  
  optional_policy(`
@@ -25771,7 +26086,7 @@
  	kernel_write_xen_state(udev_t)
  	kernel_read_xen_state(udev_t)
  	xen_manage_log(udev_t)
-@@ -237,5 +248,9 @@
+@@ -237,5 +253,9 @@
  ')
  
  optional_policy(`
@@ -26405,7 +26720,7 @@
 +/dev/shm/mono.*		gen_context(system_u:object_r:user_tmpfs_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-3.6.3/policy/modules/system/userdomain.if
 --- nsaserefpolicy/policy/modules/system/userdomain.if	2009-01-19 11:07:34.000000000 -0500
-+++ serefpolicy-3.6.3/policy/modules/system/userdomain.if	2009-01-19 17:15:36.000000000 -0500
++++ serefpolicy-3.6.3/policy/modules/system/userdomain.if	2009-01-20 16:18:13.000000000 -0500
 @@ -30,8 +30,9 @@
  	')
  
@@ -27447,7 +27762,15 @@
  
  	kernel_read_software_raid_state($1_t)
  	kernel_getattr_core_if($1_t)
-@@ -1106,8 +1174,6 @@
+@@ -1099,6 +1167,7 @@
+ 	kernel_sigstop_unlabeled($1_t)
+ 	kernel_signull_unlabeled($1_t)
+ 	kernel_sigchld_unlabeled($1_t)
++	kernel_signal($1_t)
+ 
+ 	corenet_tcp_bind_generic_port($1_t)
+ 	# allow setting up tunnels
+@@ -1106,8 +1175,6 @@
  
  	dev_getattr_generic_blk_files($1_t)
  	dev_getattr_generic_chr_files($1_t)
@@ -27456,7 +27779,7 @@
  	# Allow MAKEDEV to work
  	dev_create_all_blk_files($1_t)
  	dev_create_all_chr_files($1_t)
-@@ -1162,20 +1228,6 @@
+@@ -1162,20 +1229,6 @@
  	# But presently necessary for installing the file_contexts file.
  	seutil_manage_bin_policy($1_t)
  
@@ -27477,7 +27800,7 @@
  	optional_policy(`
  		postgresql_unconfined($1_t)
  	')
-@@ -1221,6 +1273,7 @@
+@@ -1221,6 +1274,7 @@
  	dev_relabel_all_dev_nodes($1)
  
  	files_create_boot_flag($1)
@@ -27485,7 +27808,7 @@
  
  	# Necessary for managing /boot/efi
  	fs_manage_dos_files($1)
-@@ -1286,11 +1339,15 @@
+@@ -1286,11 +1340,15 @@
  interface(`userdom_user_home_content',`
  	gen_require(`
  		type user_home_t;
@@ -27501,7 +27824,7 @@
  ')
  
  ########################################
-@@ -1387,7 +1444,7 @@
+@@ -1387,7 +1445,7 @@
  
  ########################################
  ## <summary>
@@ -27510,7 +27833,7 @@
  ## </summary>
  ## <param name="domain">
  ##	<summary>
-@@ -1420,6 +1477,14 @@
+@@ -1420,6 +1478,14 @@
  
  	allow $1 user_home_dir_t:dir list_dir_perms;
  	files_search_home($1)
@@ -27525,7 +27848,7 @@
  ')
  
  ########################################
-@@ -1435,9 +1500,11 @@
+@@ -1435,9 +1501,11 @@
  interface(`userdom_dontaudit_list_user_home_dirs',`
  	gen_require(`
  		type user_home_dir_t;
@@ -27537,7 +27860,7 @@
  ')
  
  ########################################
-@@ -1494,6 +1561,25 @@
+@@ -1494,6 +1562,25 @@
  	allow $1 user_home_dir_t:dir relabelto;
  ')
  
@@ -27563,7 +27886,7 @@
  ########################################
  ## <summary>
  ##	Create directories in the home dir root with
-@@ -1547,9 +1633,9 @@
+@@ -1547,9 +1634,9 @@
  		type user_home_dir_t, user_home_t;
  	')
  
@@ -27575,7 +27898,7 @@
  ')
  
  ########################################
-@@ -1568,6 +1654,8 @@
+@@ -1568,6 +1655,8 @@
  	')
  
  	dontaudit $1 user_home_t:dir search_dir_perms;
@@ -27584,7 +27907,7 @@
  ')
  
  ########################################
-@@ -1643,6 +1731,7 @@
+@@ -1643,6 +1732,7 @@
  		type user_home_dir_t, user_home_t;
  	')
  
@@ -27592,7 +27915,7 @@
  	read_files_pattern($1, { user_home_dir_t user_home_t }, user_home_t)
  	files_search_home($1)
  ')
-@@ -1741,6 +1830,62 @@
+@@ -1741,6 +1831,62 @@
  
  ########################################
  ## <summary>
@@ -27655,7 +27978,7 @@
  ##	Execute user home files.
  ## </summary>
  ## <param name="domain">
-@@ -1757,14 +1902,6 @@
+@@ -1757,14 +1903,6 @@
  
  	files_search_home($1)
  	exec_files_pattern($1, { user_home_dir_t user_home_t }, user_home_t)
@@ -27670,7 +27993,7 @@
  ')
  
  ########################################
-@@ -1787,6 +1924,46 @@
+@@ -1787,6 +1925,46 @@
  
  ########################################
  ## <summary>
@@ -27717,7 +28040,7 @@
  ##	Create, read, write, and delete files
  ##	in a user home subdirectory.
  ## </summary>
-@@ -2819,6 +2996,24 @@
+@@ -2819,6 +2997,24 @@
  
  ########################################
  ## <summary>
@@ -27742,7 +28065,7 @@
  ##	Do not audit attempts to use user ttys.
  ## </summary>
  ## <param name="domain">
-@@ -2851,6 +3046,7 @@
+@@ -2851,6 +3047,7 @@
  	')
  
  	read_files_pattern($1,userdomain,userdomain)
@@ -27750,7 +28073,7 @@
  	kernel_search_proc($1)
  ')
  
-@@ -2965,6 +3161,24 @@
+@@ -2965,6 +3162,24 @@
  
  ########################################
  ## <summary>
@@ -27775,7 +28098,7 @@
  ##	Send a dbus message to all user domains.
  ## </summary>
  ## <param name="domain">
-@@ -2981,3 +3195,264 @@
+@@ -2981,3 +3196,264 @@
  
  	allow $1 userdomain:dbus send_msg;
  ')
@@ -27857,7 +28180,7 @@
 +#
 +template(`userdom_admin_login_user_template',`
 +					      
-+  userdom_unpriv_user_template($1)
++  userdom_admin_user_template($1)
 +
 +  domain_read_all_domains_state($1_t)
 +  domain_getattr_all_domains($1_t)


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.769
retrieving revision 1.770
diff -u -r1.769 -r1.770
--- selinux-policy.spec	19 Jan 2009 21:48:16 -0000	1.769
+++ selinux-policy.spec	21 Jan 2009 16:17:40 -0000	1.770
@@ -20,7 +20,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.6.3
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -445,6 +445,9 @@
 %endif
 
 %changelog
+* Tue Jan 20 2009 Dan Walsh <dwalsh at redhat.com> 3.6.3-3
+- Fixed for DeviceKit
+
 * Mon Jan 19 2009 Dan Walsh <dwalsh at redhat.com> 3.6.3-2
 - Add devicekit policy
 



From pkgdb at fedoraproject.org  Wed Jan 21 16:19:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 21 Jan 2009 16:19:17 +0000
Subject: [pkgdb] asciidoc had acl change status
Message-ID: <20090121161917.A062D20847E@bastion.fedora.phx.redhat.com>

chrisw has set the watchbugzilla acl on asciidoc (Fedora devel) to Approved for vonbrand

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/asciidoc



From pkgdb at fedoraproject.org  Wed Jan 21 16:19:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 21 Jan 2009 16:19:20 +0000
Subject: [pkgdb] asciidoc had acl change status
Message-ID: <20090121161920.D2DB6208481@bastion.fedora.phx.redhat.com>

chrisw has set the watchcommits acl on asciidoc (Fedora devel) to Approved for vonbrand

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/asciidoc



From pkgdb at fedoraproject.org  Wed Jan 21 16:19:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 21 Jan 2009 16:19:25 +0000
Subject: [pkgdb] asciidoc had acl change status
Message-ID: <20090121161926.72A2C208485@bastion.fedora.phx.redhat.com>

chrisw has set the watchbugzilla acl on asciidoc (Fedora EPEL 4) to Approved for vonbrand

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/asciidoc



From pkgdb at fedoraproject.org  Wed Jan 21 16:19:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 21 Jan 2009 16:19:27 +0000
Subject: [pkgdb] asciidoc had acl change status
Message-ID: <20090121161927.5AE86208488@bastion.fedora.phx.redhat.com>

chrisw has set the watchcommits acl on asciidoc (Fedora EPEL 4) to Approved for vonbrand

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/asciidoc



From pkgdb at fedoraproject.org  Wed Jan 21 16:19:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 21 Jan 2009 16:19:31 +0000
Subject: [pkgdb] asciidoc had acl change status
Message-ID: <20090121161931.4C75220848A@bastion.fedora.phx.redhat.com>

chrisw has set the watchbugzilla acl on asciidoc (Fedora EPEL 5) to Approved for vonbrand

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/asciidoc



From pkgdb at fedoraproject.org  Wed Jan 21 16:19:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 21 Jan 2009 16:19:32 +0000
Subject: [pkgdb] asciidoc had acl change status
Message-ID: <20090121161932.F3E1A20848D@bastion.fedora.phx.redhat.com>

chrisw has set the watchcommits acl on asciidoc (Fedora EPEL 5) to Approved for vonbrand

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/asciidoc



From pkgdb at fedoraproject.org  Wed Jan 21 16:19:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 21 Jan 2009 16:19:42 +0000
Subject: [pkgdb] asciidoc had acl change status
Message-ID: <20090121161943.8BC3A20847F@bastion.fedora.phx.redhat.com>

chrisw has set the watchbugzilla acl on asciidoc (Fedora 9) to Approved for vonbrand

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/asciidoc



From pkgdb at fedoraproject.org  Wed Jan 21 16:19:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 21 Jan 2009 16:19:45 +0000
Subject: [pkgdb] asciidoc had acl change status
Message-ID: <20090121161945.5A3B1208490@bastion.fedora.phx.redhat.com>

chrisw has set the watchcommits acl on asciidoc (Fedora 9) to Approved for vonbrand

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/asciidoc



From pkgdb at fedoraproject.org  Wed Jan 21 16:19:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 21 Jan 2009 16:19:56 +0000
Subject: [pkgdb] asciidoc had acl change status
Message-ID: <20090121161956.567FA208484@bastion.fedora.phx.redhat.com>

chrisw has set the watchbugzilla acl on asciidoc (Fedora 10) to Approved for vonbrand

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/asciidoc



From pkgdb at fedoraproject.org  Wed Jan 21 16:19:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 21 Jan 2009 16:19:58 +0000
Subject: [pkgdb] asciidoc had acl change status
Message-ID: <20090121161958.CFD34208487@bastion.fedora.phx.redhat.com>

chrisw has set the watchcommits acl on asciidoc (Fedora 10) to Approved for vonbrand

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/asciidoc



From caolanm at fedoraproject.org  Wed Jan 21 16:24:30 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Wed, 21 Jan 2009 16:24:30 +0000 (UTC)
Subject: rpms/mythes-ga/devel mythes-ga.spec,1.2,1.3
Message-ID: <20090121162430.4E7237012F@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/mythes-ga/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3266

Modified Files:
	mythes-ga.spec 
Log Message:
fix typos


Index: mythes-ga.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mythes-ga/devel/mythes-ga.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mythes-ga.spec	15 Jan 2009 14:10:58 -0000	1.2
+++ mythes-ga.spec	21 Jan 2009 16:23:59 -0000	1.3
@@ -12,7 +12,7 @@
 BuildArch: noarch
 
 %description
-German thesaurus.
+Irish thesaurus.
 
 %prep
 %setup -q -c
@@ -36,5 +36,8 @@
 %{_datadir}/mythes/*
 
 %changelog
+* Wed Jan 21 2009 Caolan McNamara <caolanm at redhat.com> - 0.20071001-2
+- fix typos
+
 * Thu Dec 11 2008 Caolan McNamara <caolanm at redhat.com> - 0.20071001-1
 - initial version



From caolanm at fedoraproject.org  Wed Jan 21 16:25:45 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Wed, 21 Jan 2009 16:25:45 +0000 (UTC)
Subject: rpms/mythes-ga/devel mythes-ga.spec,1.3,1.4
Message-ID: <20090121162545.F39597012F@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/mythes-ga/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3727

Modified Files:
	mythes-ga.spec 
Log Message:
fix typos


Index: mythes-ga.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mythes-ga/devel/mythes-ga.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- mythes-ga.spec	21 Jan 2009 16:23:59 -0000	1.3
+++ mythes-ga.spec	21 Jan 2009 16:25:15 -0000	1.4
@@ -2,7 +2,7 @@
 Summary: Irish thesaurus
 %define upstreamid 20071001
 Version: 0.%{upstreamid}
-Release: 1%{?dist}
+Release: 2%{?dist}
 Source: http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/dictionaries/thes_ga_IE_v2.zip
 Group: Applications/Text
 URL: http://borel.slu.edu/lsg/index-en.html



From vpv at fedoraproject.org  Wed Jan 21 16:26:46 2009
From: vpv at fedoraproject.org (Ville-Pekka Vainio)
Date: Wed, 21 Jan 2009 16:26:46 +0000 (UTC)
Subject: rpms/openoffice.org-voikko/devel
	OOO300_m14-fix-grammar-check-build.patch, 1.1, NONE
Message-ID: <20090121162646.C6CAD70142@cvs1.fedora.phx.redhat.com>

Author: vpv

Update of /cvs/pkgs/rpms/openoffice.org-voikko/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4658

Removed Files:
	OOO300_m14-fix-grammar-check-build.patch 
Log Message:
remove integrated patch


--- OOO300_m14-fix-grammar-check-build.patch DELETED ---



From rdieter at fedoraproject.org  Wed Jan 21 16:28:00 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed, 21 Jan 2009 16:28:00 +0000 (UTC)
Subject: rpms/libggz/F-10 libggz-branch-ggz-0-0-14.diff, NONE, 1.1 .cvsignore,
	1.4, 1.5 libggz.spec, 1.6, 1.7 sources, 1.4,
	1.5 libggz-snapshot-0.99.4-pkgconfig.patch, 1.1, NONE
Message-ID: <20090121162800.63FCE7012F@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/libggz/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5495

Modified Files:
	.cvsignore libggz.spec sources 
Added Files:
	libggz-branch-ggz-0-0-14.diff 
Removed Files:
	libggz-snapshot-0.99.4-pkgconfig.patch 
Log Message:
* Wed Jan 21 2009 Rex Dieter <rdieter at fedoraproject.org> - 1:0.0.14.1-3
- Epoch'd downgrade to 0.0.14.1 (at upstream request)
- upstream branch patch


libggz-branch-ggz-0-0-14.diff:

--- NEW FILE libggz-branch-ggz-0-0-14.diff ---
Index: m4/tls.m4
===================================================================
--- m4/tls.m4	(revision 9744)
+++ m4/tls.m4	(revision 10862)
@@ -363,7 +363,7 @@
 [
 AC_ARG_WITH([gcrypt],
   AS_HELP_STRING([--with-gcrypt], [Add encryption support]),
-  [enable_gcrypt=$enableval],
+  [enable_gcrypt=$withval],
   [enable_gcrypt=auto])
 
 if test "$enable_gcrypt" != "no"; then

Property changes on: m4
___________________________________________________________________
Name: svn:externals
   + ggz svn://svn.ggzgamingzone.org/svn/trunk/base-libs/m4/ggz





Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libggz/F-10/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	24 Aug 2008 19:21:10 -0000	1.4
+++ .cvsignore	21 Jan 2009 16:27:30 -0000	1.5
@@ -1 +1 @@
-libggz-snapshot-0.99.4.tar.gz
+libggz-0.0.14.1.tar.gz


Index: libggz.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libggz/F-10/libggz.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- libggz.spec	24 Aug 2008 19:21:20 -0000	1.6
+++ libggz.spec	21 Jan 2009 16:27:30 -0000	1.7
@@ -1,23 +1,27 @@
 
 Summary: Library for client-server games
 Name: libggz
-Version: 0.99.4
-Release: 1%{?dist}
+%if 0%{?fedora} > 9
+Epoch: 1
+%endif
+Version: 0.0.14.1
+Release: 3%{?dist}
 
 License: LGPLv2+
 Group: Development/Libraries
 URL: http://www.ggzgamingzone.org/
 
-#Source0: http://ftp.belnet.be/packages/ggzgamingzone/ggz/%{version}/libggz-%{version}.tar.gz
-Source0: http://mirrors.ibiblio.org/pub/mirrors/ggzgamingzone/ggz/snapshots/libggz-snapshot-0.99.4.tar.gz
+Source: http://ftp.belnet.be/packages/ggzgamingzone/ggz/%{version}/libggz-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Patch1: libggz-snapshot-0.99.4-pkgconfig.patch
+# upstream patches
+Patch100: http://hq.ggzgamingzone.org/~josef/diffs/0.0.14.1/libggz-branch-ggz-0-0-14.diff
 
+BuildRequires: automake libtool
 BuildRequires: libgcrypt-devel
+## tls support: openssl (l)gpl compat?  not sure, use gnutls for now -- Rex 
+#BuildRequires: openssl-devel
 BuildRequires: gnutls-devel
-# nss support broken: FIXME
-#BuildRequires: nss-devel
 
 %description
 GGZ (which is a recursive acronym for GGZ Gaming Zone) develops libraries,
@@ -27,16 +31,17 @@
 %package devel
 Summary: Development files for %{name}
 Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
-Requires: pkgconfig
+Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
 %description devel
 %{summary}.
 
 
 %prep
-%setup -q -n %{name}-snapshot-%{version}
+%setup -q
 
-%patch1 -p1 -b .pkgconfig
+%patch100 -p0 -b .upstream
+
+autoreconf -i -f
 
 
 %build
@@ -54,7 +59,7 @@
 
 make install DESTDIR=%{buildroot}
 
-rm -f %{buildroot}/%{_libdir}/*.la
+rm -f %{buildroot}%{_libdir}/lib*.la
 
 
 %post -p /sbin/ldconfig
@@ -69,16 +74,22 @@
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING NEWS README
-%{_libdir}/libggz.so.*
+%{_libdir}/libggz.so.2*
 
 %files devel
 %{_includedir}/ggz*.h
 %{_libdir}/libggz.so
-%{_libdir}/pkgconfig/libggz.pc
 %{_mandir}/man3/ggz*
 
 
 %changelog
+* Wed Jan 21 2009 Rex Dieter <rdieter at fedoraproject.org> - 1:0.0.14.1-3
+- Epoch'd downgrade to 0.0.14.1 (at upstream request)
+- upstream branch patch
+
+* Fri Dec 12 2008 Rex Dieter <rdieter at fedoraproject.org> - 0.99.4-2
+- rebuild for pkgconfig deps
+
 * Sun Aug 24 2008 Rex Dieter <rdieter at fedoraproject.org> - 0.99.4-1
 - libgzz-snapshot-0.99.4
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libggz/F-10/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	24 Aug 2008 19:21:10 -0000	1.4
+++ sources	21 Jan 2009 16:27:30 -0000	1.5
@@ -1 +1 @@
-d4eb8a410e69455b9f7e8e45d3313e3e  libggz-snapshot-0.99.4.tar.gz
+603739504648833779aa13b0327a1c3d  libggz-0.0.14.1.tar.gz


--- libggz-snapshot-0.99.4-pkgconfig.patch DELETED ---



From caolanm at fedoraproject.org  Wed Jan 21 16:30:53 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Wed, 21 Jan 2009 16:30:53 +0000 (UTC)
Subject: rpms/hunspell-ru/devel hunspell-ru.spec,1.2,1.3
Message-ID: <20090121163053.3D08A7012F@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/hunspell-ru/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6663

Modified Files:
	hunspell-ru.spec 
Log Message:
add an alias


Index: hunspell-ru.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-ru/devel/hunspell-ru.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- hunspell-ru.spec	21 Aug 2007 11:14:40 -0000	1.2
+++ hunspell-ru.spec	21 Jan 2009 16:30:22 -0000	1.3
@@ -1,7 +1,7 @@
 Name: hunspell-ru
 Summary: Russian hunspell dictionaries
 Version: 0.99f7
-Release: 1%{?dist}
+Release: 2%{?dist}
 Epoch: 1
 Source: ftp://ftp.vsu.ru/mirrors/scon155.phys.msu.su/pub/russian/ispell/myspell/rus-myspell-%{version}.tar.gz
 Group: Applications/Text
@@ -26,6 +26,12 @@
 mkdir -p $RPM_BUILD_ROOT/%{_datadir}/myspell
 cp -p ru_myspell.dict $RPM_BUILD_ROOT/%{_datadir}/myspell/ru_RU.dic
 cp -p ru_RU.koi8r.aff $RPM_BUILD_ROOT/%{_datadir}/myspell/ru_RU.aff
+pushd $RPM_BUILD_ROOT/%{_datadir}/myspell/
+ru_RU_aliases="ru_UA"
+for lang in $ru_RU_aliases; do
+        ln -s ru_RU.aff $lang.aff
+        ln -s ru_RU.dic $lang.dic
+done
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -36,6 +42,9 @@
 %{_datadir}/myspell/*
 
 %changelog
+* Wed Jan 21 2009 Caolan McNamara <caolanm at redhat.com> - 1:0.99f7-2
+- add alias
+
 * Tue Aug 21 2007 Caolan McNamara <caolanm at redhat.com> - 1:0.99f7-1
 - clarify licence
 - canonical upstream source



From caolanm at fedoraproject.org  Wed Jan 21 16:32:41 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Wed, 21 Jan 2009 16:32:41 +0000 (UTC)
Subject: rpms/hyphen-ru/devel hyphen-ru.spec,1.1,1.2
Message-ID: <20090121163241.5AF327012F@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/hyphen-ru/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7415

Modified Files:
	hyphen-ru.spec 
Log Message:
add an alias


Index: hyphen-ru.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hyphen-ru/devel/hyphen-ru.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- hyphen-ru.spec	26 Nov 2007 20:30:21 -0000	1.1
+++ hyphen-ru.spec	21 Jan 2009 16:32:10 -0000	1.2
@@ -2,7 +2,7 @@
 Summary: Russian hyphenation rules
 %define upstreamid 20020727 
 Version: 0.%{upstreamid}
-Release: 1%{?dist}
+Release: 2%{?dist}
 Source: http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/dictionaries/hyph_ru_RU.zip
 Group: Applications/Text
 URL: http://wiki.services.openoffice.org/wiki/Dictionaries
@@ -24,6 +24,11 @@
 rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT/%{_datadir}/hyphen
 cp -p hyph_ru_RU.dic $RPM_BUILD_ROOT/%{_datadir}/hyphen
+pushd $RPM_BUILD_ROOT/%{_datadir}/hyphen/
+ru_RU_aliases="ru_UA"
+for lang in $ru_RU_aliases; do
+        ln -s hyph_ru_RU.dic hyph_$lang.dic
+done
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -34,5 +39,8 @@
 %{_datadir}/hyphen/*
 
 %changelog
+* Wed Jan 21 2009 Caolan McNamara <caolanm at redhat.com> - 0.20020727-2
+- add an alias
+
 * Fri Nov 23 2007 Caolan McNamara <caolanm at redhat.com> - 0.20020727-1
 - initial version



From pgordon at fedoraproject.org  Wed Jan 21 16:55:05 2009
From: pgordon at fedoraproject.org (Peter Gordon)
Date: Wed, 21 Jan 2009 16:55:05 +0000 (UTC)
Subject: rpms/gnome-applet-music/devel .cvsignore, 1.13,
	1.14 gnome-applet-music.spec, 1.28, 1.29 sources, 1.13, 1.14
Message-ID: <20090121165505.6118D7012F@cvs1.fedora.phx.redhat.com>

Author: pgordon

Update of /cvs/pkgs/rpms/gnome-applet-music/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15471/devel

Modified Files:
	.cvsignore gnome-applet-music.spec sources 
Log Message:
Update to 2.5.1 (bug fixes)


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-applet-music/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	7 Jan 2009 08:39:37 -0000	1.13
+++ .cvsignore	21 Jan 2009 16:54:34 -0000	1.14
@@ -1 +1 @@
-music-applet-2.5.0.tar.gz
+music-applet-2.5.1.tar.gz


Index: gnome-applet-music.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-applet-music/devel/gnome-applet-music.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- gnome-applet-music.spec	7 Jan 2009 08:39:37 -0000	1.28
+++ gnome-applet-music.spec	21 Jan 2009 16:54:34 -0000	1.29
@@ -3,7 +3,7 @@
 %global	python_module_name	musicapplet
 
 Name:		gnome-applet-music
-Version:	2.5.0
+Version:	2.5.1
 Release:	1%{?dist}
 Summary:	A GNOME panel applet to control various music players
 Summary(es):	Miniaplicaci??n del panel GNOME para controlar reproductores de m??sica
@@ -149,6 +149,11 @@
 
 
 %changelog
+* Wed Jan 21 2009 Peter Gordon <peter at thecodergeek.com> - 2.5.1-1
+- Update to new upstream release (2.5.1), which fixes the applet hanging when
+  the player is closed, and processing of album art from Rhythmbox so that it
+  is shown properly in the information tooltip.
+
 * Wed Jan 07 2009 Peter Gordon <peter at thecodergeek.com> - 2.5.0-1
 - Update to new upstream release (2.5.0), which adds support for Amarok 2,
   fixes uncontrolled growth in applet with long metadata strings (#452420),


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-applet-music/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	7 Jan 2009 08:39:37 -0000	1.13
+++ sources	21 Jan 2009 16:54:34 -0000	1.14
@@ -1 +1 @@
-01c85378fbbacea334fa009f94243f78  music-applet-2.5.0.tar.gz
+2cd43e4b6d93d8ca552fa239c44c65d3  music-applet-2.5.1.tar.gz



From rdieter at fedoraproject.org  Wed Jan 21 17:01:40 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed, 21 Jan 2009 17:01:40 +0000 (UTC)
Subject: rpms/ggz-client-libs/F-10 ggz-client-libs-branch-ggz-0-0-14.diff,
	NONE, 
	1.1 .cvsignore, 1.4, 1.5 ggz-client-libs.spec, 1.6, 1.7 sources,
	1.4, 1.5 ggz-client-libs-snapshot-0.99.4-pkgconfig.patch, 1.1,
	NONE libggz-snapshot-0.99.4-pkgconfig.patch, 1.1, NONE
Message-ID: <20090121170140.D476C7012F@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/ggz-client-libs/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18652

Modified Files:
	.cvsignore ggz-client-libs.spec sources 
Added Files:
	ggz-client-libs-branch-ggz-0-0-14.diff 
Removed Files:
	ggz-client-libs-snapshot-0.99.4-pkgconfig.patch 
	libggz-snapshot-0.99.4-pkgconfig.patch 
Log Message:
* Wed Jan 21 2009 Rex Dieter <rdieter at fedoraproject.org> - 1:0.0.14.1-2
- Epoch'd downgrade to 0.0.14.1 (at upstream request)


ggz-client-libs-branch-ggz-0-0-14.diff:

--- NEW FILE ggz-client-libs-branch-ggz-0-0-14.diff ---

Property changes on: m4
___________________________________________________________________
Name: svn:externals
   - ggz svn://svn.ggzgamingzone.org/svn/trunk/libggz/m4/ggz

   + ggz svn://svn.ggzgamingzone.org/svn/trunk/base-libs/m4/ggz


Index: ggz-config/ggz-config.c
===================================================================
--- ggz-config/ggz-config.c	(revision 9744)
+++ ggz-config/ggz-config.c	(revision 10862)
@@ -455,17 +455,19 @@
 			     + strlen(copydir)
 			     + strlen(modname)
 			     + strlen(suffix) + 3];
+	char dir_pathname[(moddest ? strlen(destdir) : 0)
+			     + strlen(copydir) + 2];
 	char fixedmodname[strlen(modname) + 1];
 	unsigned int i;
 
 	if(moddest)
-		sprintf(global_pathname, "%s/%s", destdir, copydir);
+		sprintf(dir_pathname, "%s/%s", destdir, copydir);
 	else
-		sprintf(global_pathname, "%s", copydir);
+		sprintf(dir_pathname, "%s", copydir);
 
-	if (ggz_make_path(global_pathname) != 0) {
+	if (ggz_make_path(dir_pathname) != 0) {
 		fprintf(stderr, _("Directory cannot be created (%s)\n"),
-			global_pathname);
+			dir_pathname);
 		return -1;
 	}
 
@@ -473,7 +475,7 @@
 	for(i = 0; i < strlen(fixedmodname); i++) {
 		if(fixedmodname[i] == '/') fixedmodname[i] = '_';
 	}
-	sprintf(global_pathname, "%s/%s%s", global_pathname, fixedmodname, suffix);
+	sprintf(global_pathname, "%s/%s%s", dir_pathname, fixedmodname, suffix);
 
 	printf(_("Preserving %s as %s...\n"), modfile, global_pathname);
 	return filecopy(modfile, global_pathname);
Index: ggzcore/game.c
===================================================================
--- ggzcore/game.c	(revision 9744)
+++ ggzcore/game.c	(revision 10862)
@@ -240,7 +240,7 @@
 void ggzcore_game_set_server_fd(GGZGame *game, unsigned int fd)
 {
 	if (game)
-		return _ggzcore_game_set_server_fd(game, fd);
+		_ggzcore_game_set_server_fd(game, fd);
 }
 
 
Index: man/Makefile.am
===================================================================
--- man/Makefile.am	(revision 9744)
+++ man/Makefile.am	(revision 10862)
@@ -1,3 +1,7 @@
+if COND_GGZWRAP
+ggzwrap_man = ggzwrap.1 ggz-wrapper.6
+endif
+
 man_MANS = \
 	ggz-config.6 \
 	ggz.modules.5 \
@@ -3,12 +7,10 @@
 	ggzcore_h.3 \
 	ggzmod_h.3 \
-	ggz-wrapper.6 \
-	ggzwrap.1 \
 	ggz.7 \
-	ggz.6
+	ggz.6 \
+	$(ggzwrap_man)
 
 EXTRA_DIST = \
-	ggz-wrapper.6 \
-	ggzwrap.1 \
 	ggz.7 \
-	ggz.6
+	ggz.6 \
+	$(ggzwrap_man)


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ggz-client-libs/F-10/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	24 Aug 2008 19:24:21 -0000	1.4
+++ .cvsignore	21 Jan 2009 17:01:10 -0000	1.5
@@ -1 +1 @@
-ggz-client-libs-snapshot-0.99.4.tar.gz
+ggz-client-libs-0.0.14.1.tar.gz


Index: ggz-client-libs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ggz-client-libs/F-10/ggz-client-libs.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ggz-client-libs.spec	24 Aug 2008 19:27:44 -0000	1.6
+++ ggz-client-libs.spec	21 Jan 2009 17:01:10 -0000	1.7
@@ -1,27 +1,29 @@
 
-#define _enable_ggzwrap --enable-ggzwrap
-
 Summary: Client libraries for GGZ gaming zone
 Name:    ggz-client-libs
-Version: 0.99.4
-Release: 1%{?dist}
+%if 0%{?fedora} > 9
+Epoch: 1
+%endif
+Version: 0.0.14.1
+Release: 2%{?dist}
 
 License: LGPLv2+ and GPLv2+
 Group:   System Environment/Libraries
 URL: http://www.ggzgamingzone.org/
-#Source0: http://ftp.belnet.be/packages/ggzgamingzone/ggz/%{version}/ggz-client-libs-%{version}.tar.gz
-Source0: http://mirrors.ibiblio.org/pub/mirrors/ggzgamingzone/ggz/snapshots/ggz-client-libs-snapshot-0.99.4.tar.gz
+Source0: http://ftp.belnet.be/packages/ggzgamingzone/ggz/%{version}/ggz-client-libs-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Patch1: ggz-client-libs-snapshot-0.99.4-pkgconfig.patch
+# upstream patches
+Patch100: http://hq.ggzgamingzone.org/~josef/diffs/0.0.14.1/ggz-client-libs-branch-ggz-0-0-14.diff
 
 Source1: ggz.modules
-# FIXME: add reference to ggz packaging guidelines
+# See https://fedoraproject.org/wiki/PackagingDrafts/GGZ
 Source2: macros.ggz
 
+BuildRequires: automake libtool
 BuildRequires: expat-devel
 BuildRequires: gettext
-BuildRequires: libggz-devel >= %{version}
+BuildRequires: libggz-devel = %{?epoch:%{epoch}:}%{version}
 
 %description
 GGZ (which is a recursive acronym for GGZ Gaming Zone) develops libraries,
@@ -31,9 +33,8 @@
 %package devel
 Summary: Development files for %{name}
 Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
-Requires: libggz-devel >= %{version}
-Requires: pkgconfig
+Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: libggz-devel = %{?epoch:%{epoch}:}%{version}
 # %{_sysconfdir}/rpm ownership
 Requires: rpm
 %description devel
@@ -41,21 +42,19 @@
 
 
 %prep
-%setup -q -n %{name}-snapshot-%{version}
+%setup -q 
 
-%patch1 -p1 -b .pkgconfig
+%patch100 -p0 -b .upstream
 
-# Avoid lib64 rpaths, FIXME better.
-%if "%{_libdir}" != "/usr/lib"
-sed -i -e 's|"/lib /usr/lib|"/%{_lib} %{_libdir}|' configure
-%endif
+rm -f m4/libtool.m4
+autoreconf -i -f
 
 
 %build
 %configure \
   --disable-debug \
   --disable-static \
-  %{?_enable_ggzwrap} %{?!_enable_ggzwrap:--disable-ggzwrap}
+  --disable-ggzwrap
 
 make %{?_smp_mflags}
 
@@ -74,13 +73,12 @@
 # RPM macros
 install -D -m644 -p %{SOURCE2} %{buildroot}%{_sysconfdir}/rpm/macros.ggz
 
-%find_lang ggzcore_snapshot-%{version}
+%find_lang ggzcore
 %find_lang ggz-config
 cat ggz*.lang >> all.lang
 
 # unpackaged files
 rm -f %{buildroot}%{_libdir}/lib*.la
-%{!?_enable_ggzwrap:rm -f %{buildroot}%{_mandir}/man1/ggzwrap.1*}
 
 
 %post -p /sbin/ldconfig
@@ -98,17 +96,12 @@
 %config(noreplace) %{_sysconfdir}/ggz.modules
 # GPLv2+
 %{_bindir}/ggz-config
-%if 0%{?_enable_ggzwrap:1}
-%{_bindir}/ggz
-%{_bindir}/ggz-wrapper
-%{_mandir}/man1/ggzwrap.1*
-%endif
 %dir %{_datadir}/ggz
 %dir %{_libdir}/ggz
-%{_libdir}/libggzmod.so.*
+%{_libdir}/libggzmod.so.4*
 %{_mandir}/man5/ggz.modules.5*
 # LGPLv2+
-%{_libdir}/libggzcore.so.*
+%{_libdir}/libggzcore.so.9*
 %{_mandir}/man6/ggz*
 %{_mandir}/man7/ggz*
 %{_sysconfdir}/xdg/menus/applications-merged/ggz.merge.menu
@@ -121,16 +114,17 @@
 # GPLv2+
 %{_includedir}/ggzmod.h
 %{_libdir}/libggzmod.so
-%{_libdir}/pkgconfig/ggzmod.pc
 %{_mandir}/man3/ggzmod_h.3*
 # LGPLv2+
 %{_includedir}/ggzcore.h
 %{_libdir}/libggzcore.so
-%{_libdir}/pkgconfig/ggzcore.pc
 %{_mandir}/man3/ggzcore_h.3*
 
 
 %changelog
+* Wed Jan 21 2009 Rex Dieter <rdieter at fedoraproject.org> - 1:0.0.14.1-2
+- Epoch'd downgrade to 0.0.14.1 (at upstream request)
+
 * Sun Aug 24 2008 Rex Dieter <rdieter at fedoraproject.org> 0.99.4-1
 - ggz-client-libs-snapshot-0.99.4
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ggz-client-libs/F-10/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	24 Aug 2008 19:24:21 -0000	1.4
+++ sources	21 Jan 2009 17:01:10 -0000	1.5
@@ -1 +1 @@
-9be065d5b757079a092a97f6d750b3a5  ggz-client-libs-snapshot-0.99.4.tar.gz
+299eaa93721b1d867b5bf7dc6ac764b0  ggz-client-libs-0.0.14.1.tar.gz


--- ggz-client-libs-snapshot-0.99.4-pkgconfig.patch DELETED ---


--- libggz-snapshot-0.99.4-pkgconfig.patch DELETED ---



From rdieter at fedoraproject.org  Wed Jan 21 17:23:32 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed, 21 Jan 2009 17:23:32 +0000 (UTC)
Subject: rpms/gnome-games/F-10 gnome-games.spec,1.189,1.190
Message-ID: <20090121172332.3D13A7012F@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/gnome-games/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26337

Modified Files:
	gnome-games.spec 
Log Message:
* Wed Jan 21 2009 Rex Dieter <rdieter at fedoraproject.org> - 1:2.24.3-2
- rebuild for ggz-stack update/downgrade, omitting .ggz-api-changes.patch 
  (see also gnome bug #551455)



Index: gnome-games.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-games/F-10/gnome-games.spec,v
retrieving revision 1.189
retrieving revision 1.190
diff -u -r1.189 -r1.190
--- gnome-games.spec	16 Jan 2009 05:00:55 -0000	1.189
+++ gnome-games.spec	21 Jan 2009 17:23:01 -0000	1.190
@@ -44,7 +44,7 @@
 Summary: GNOME games
 Name: gnome-games
 Version: 2.24.3
-Release: 1%{?dist}
+Release: 2%{?dist}
 Epoch: 1
 License: GPLv2+ and GFDL
 Group: Amusements/Games
@@ -123,7 +123,7 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .ggz-api-changes
+#patch0 -p1 -b .ggz-api-changes
 # rebrand gnometris as some think the name is to similar to a trademark
 %patch1 -p1 -b .rebrand
 
@@ -360,6 +360,10 @@
 %{_datadir}/omf/*
 
 %changelog
+* Wed Jan 21 2009 Rex Dieter <rdieter at fedoraproject.org> - 1:2.24.3-2
+- rebuild for ggz-stack update/downgrade, omitting .ggz-api-changes.patch 
+  (see also gnome bug #551455)
+
 * Thu Jan 15 2009 Matthias Clasen <mclasen at redhat.com> - 1:2.24.3-1
 - Update to 2.24.3
 



From atkac at fedoraproject.org  Wed Jan 21 18:41:17 2009
From: atkac at fedoraproject.org (Adam Tkac)
Date: Wed, 21 Jan 2009 18:41:17 +0000 (UTC)
Subject: rpms/mtools/devel mtools400-rh480112.patch, NONE, 1.1 mtools.spec, 
	1.40, 1.41
Message-ID: <20090121184117.E1EE67012F@cvs1.fedora.phx.redhat.com>

Author: atkac

Update of /cvs/pkgs/rpms/mtools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23540

Modified Files:
	mtools.spec 
Added Files:
	mtools400-rh480112.patch 
Log Message:
- fixed off-by-two error in unix_name function (#480112)


mtools400-rh480112.patch:

--- NEW FILE mtools400-rh480112.patch ---
diff -up mtools-4.0.0/file_name.c.rh480112 mtools-4.0.0/file_name.c
--- mtools-4.0.0/file_name.c.rh480112	2009-01-21 19:35:08.000000000 +0100
+++ mtools-4.0.0/file_name.c	2009-01-21 19:35:36.000000000 +0100
@@ -145,7 +145,7 @@ void dos_name(doscp_t *toDos, const char
 wchar_t *unix_name(doscp_t *dosCp,
 		   const char *base, const char *ext, char Case, wchar_t *ret)
 {
-	char *s, tname[9], text[4], ans[11];
+	char *s, tname[9], text[4], ans[13];
 	int i;
 
 	strncpy(tname, base, 8);


Index: mtools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mtools/devel/mtools.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- mtools.spec	12 Jan 2009 14:10:04 -0000	1.40
+++ mtools.spec	21 Jan 2009 18:40:47 -0000	1.41
@@ -1,7 +1,7 @@
 Summary: Programs for accessing MS-DOS disks without mounting the disks
 Name: mtools
 Version: 4.0.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+
 Group: Applications/System
 Source: http://mtools.linux.lu/mtools-%{version}.tar.bz2
@@ -9,6 +9,7 @@
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Patch0: mtools-3.9.6-config.patch
 Patch3: mtools-3.9.7-bigdisk.patch
+Patch4: mtools400-rh480112.patch
 Requires: info
 
 BuildRequires: texinfo, autoconf
@@ -25,6 +26,7 @@
 %setup -q -n %{name}-%{version}
 %patch0 -p1
 %patch3 -p1 -b .big
+%patch4 -p1 -b .rh480112
 
 # Correct system paths
 for all in mtools.5 mtools.texi; do
@@ -69,6 +71,9 @@
 %{_infodir}/%{name}.info.gz
 
 %changelog
+* Wed Jan 21 2009 Adam Tkac <atkac redhat com> 4.0.0-3
+- fixed off-by-two error in unix_name function (#480112)
+
 * Mon Jan 12 2009 Adam Tkac <atkac redhat com> 4.0.0-2
 - don't ship infodir/dir.gz (#478322)
 



From limb at fedoraproject.org  Wed Jan 21 18:41:37 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Wed, 21 Jan 2009 18:41:37 +0000 (UTC)
Subject: rpms/inksmoto/devel .cvsignore, 1.4, 1.5 inksmoto.spec, 1.6,
	1.7 sources, 1.4, 1.5
Message-ID: <20090121184137.5A0847012F@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/inksmoto/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23721

Modified Files:
	.cvsignore inksmoto.spec sources 
Log Message:
Final 0.5.0.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/inksmoto/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	13 Jan 2009 14:22:43 -0000	1.4
+++ .cvsignore	21 Jan 2009 18:41:07 -0000	1.5
@@ -1 +1 @@
-inksmoto-0.5.0~rc2.tar.gz
+inksmoto-0.5.0.tar.gz


Index: inksmoto.spec
===================================================================
RCS file: /cvs/pkgs/rpms/inksmoto/devel/inksmoto.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- inksmoto.spec	13 Jan 2009 14:44:37 -0000	1.6
+++ inksmoto.spec	21 Jan 2009 18:41:07 -0000	1.7
@@ -1,12 +1,12 @@
 Name: inksmoto
 Version: 0.5.0
-Release:  3.rc2%{?dist}
+Release:  4%{?dist}
 Summary: The new xmoto level editor for Inkscape
 
 Group: Amusements/Games 
 License: GPLv2
 URL: http://xmoto.sourceforge.net/
-Source0: http://download.tuxfamily.org/xmoto/svg2lvl/%{version}~rc1/inksmoto-%{version}~rc2.tar.gz       
+Source0: http://download.tuxfamily.org/xmoto/svg2lvl/%{version}/inksmoto-%{version}.tar.gz       
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root%(%{__id_u} -n)
 Requires: xmoto, inkscape, PyXML, tkinter, python-imaging-tk
 BuildArch: noarch
@@ -44,6 +44,9 @@
 %doc AUTHORS COPYING INSTALL README
 
 %changelog
+* Wed Jan 21 2009 Jon Ciesla <limb at jcomserv.net> - 0.5.0-4
+- New upstream, 0.5.0 final.
+
 * Tue Jan 13 2009 Jon Ciesla <limb at jcomserv.net> - 0.5.0-3.rc2
 - New upstream.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/inksmoto/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	13 Jan 2009 14:22:43 -0000	1.4
+++ sources	21 Jan 2009 18:41:07 -0000	1.5
@@ -1 +1 @@
-c79bbb45c8e1632c8f631f599c882bb1  inksmoto-0.5.0~rc2.tar.gz
+7fbd374da121b0d1ca42fdb530610400  inksmoto-0.5.0.tar.gz



From limb at fedoraproject.org  Wed Jan 21 18:47:16 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Wed, 21 Jan 2009 18:47:16 +0000 (UTC)
Subject: rpms/inksmoto/F-10 inksmoto.spec,1.3,1.4 sources,1.3,1.4
Message-ID: <20090121184716.8FFA37012F@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/inksmoto/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25988

Modified Files:
	inksmoto.spec sources 
Log Message:
0.5.0 final.



Index: inksmoto.spec
===================================================================
RCS file: /cvs/pkgs/rpms/inksmoto/F-10/inksmoto.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- inksmoto.spec	19 Dec 2008 17:37:25 -0000	1.3
+++ inksmoto.spec	21 Jan 2009 18:46:45 -0000	1.4
@@ -1,12 +1,12 @@
 Name: inksmoto
 Version: 0.5.0
-Release:  2.rc1%{?dist}
+Release:  4%{?dist}
 Summary: The new xmoto level editor for Inkscape
 
 Group: Amusements/Games 
 License: GPLv2
 URL: http://xmoto.sourceforge.net/
-Source0: http://download.tuxfamily.org/xmoto/svg2lvl/%{version}~rc1/inksmoto-%{version}~rc1.tar.gz       
+Source0: http://download.tuxfamily.org/xmoto/svg2lvl/%{version}/inksmoto-%{version}.tar.gz       
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root%(%{__id_u} -n)
 Requires: xmoto, inkscape, PyXML, tkinter, python-imaging-tk
 BuildArch: noarch
@@ -44,6 +44,12 @@
 %doc AUTHORS COPYING INSTALL README
 
 %changelog
+* Wed Jan 21 2009 Jon Ciesla <limb at jcomserv.net> - 0.5.0-4
+- New upstream, 0.5.0 final.
+
+* Tue Jan 13 2009 Jon Ciesla <limb at jcomserv.net> - 0.5.0-3.rc2
+- New upstream.
+
 * Thu Dec 18 2008 Jon Ciesla <limb at jcomserv.net> - 0.5.0-2.rc1
 - Added xmoto_install and xmoto_bitmap.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/inksmoto/F-10/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	18 Dec 2008 15:37:29 -0000	1.3
+++ sources	21 Jan 2009 18:46:45 -0000	1.4
@@ -1 +1 @@
-89c404359917abfcc698d8d6cc484e24  inksmoto-0.5.0~rc1.tar.gz
+7fbd374da121b0d1ca42fdb530610400  inksmoto-0.5.0.tar.gz



From rdieter at fedoraproject.org  Wed Jan 21 18:54:33 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed, 21 Jan 2009 18:54:33 +0000 (UTC)
Subject: rpms/akonadi/devel .cvsignore, 1.8, 1.9 akonadi.spec, 1.21,
	1.22 sources, 1.8, 1.9
Message-ID: <20090121185433.703A97012F@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/akonadi/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28542

Modified Files:
	.cvsignore akonadi.spec sources 
Log Message:
* Wed Jan 21 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.1.1-1
- 1.1.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/akonadi/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	4 Jan 2009 21:25:24 -0000	1.8
+++ .cvsignore	21 Jan 2009 18:54:02 -0000	1.9
@@ -1 +1 @@
-akonadi-1.1.0.tar.bz2
+akonadi-1.1.1.tar.bz2


Index: akonadi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/akonadi/devel/akonadi.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- akonadi.spec	4 Jan 2009 21:54:46 -0000	1.21
+++ akonadi.spec	21 Jan 2009 18:54:02 -0000	1.22
@@ -1,6 +1,6 @@
 Summary: PIM Storage Service
 Name:    akonadi
-Version: 1.1.0
+Version: 1.1.1
 Release: 1%{?dist}
 
 Group:   System Environment/Libraries
@@ -105,6 +105,9 @@
 
 
 %changelog
+* Wed Jan 21 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.1.1-1
+- 1.1.1
+
 * Sun Jan 04 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.1.0-1
 - 1.1.0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/akonadi/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	4 Jan 2009 21:25:24 -0000	1.8
+++ sources	21 Jan 2009 18:54:02 -0000	1.9
@@ -1 +1 @@
-de54155bdc4f15d30e889a6245779a2c  akonadi-1.1.0.tar.bz2
+2e98b42cec9ec4e60a2e3c096f1a3106  akonadi-1.1.1.tar.bz2



From astokes at fedoraproject.org  Wed Jan 21 18:57:40 2009
From: astokes at fedoraproject.org (Adam Stokes)
Date: Wed, 21 Jan 2009 18:57:40 +0000 (UTC)
Subject: rpms/cas/EL-4 cas.spec,1.1,1.2
Message-ID: <20090121185740.2E71C7012F@cvs1.fedora.phx.redhat.com>

Author: astokes

Update of /cvs/pkgs/rpms/cas/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29710

Modified Files:
	cas.spec 
Log Message:
add excludearch for ppc and ppc64



Index: cas.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cas/EL-4/cas.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cas.spec	15 Jan 2009 18:45:49 -0000	1.1
+++ cas.spec	21 Jan 2009 18:57:09 -0000	1.2
@@ -3,7 +3,7 @@
 Name: cas
 Summary: Tool to analyze and configure core file environment
 Version: 0.13
-Release: 118%{?dist}
+Release: 119%{?dist}
 Source0: https://fedorahosted.org/releases/c/a/cas/%{name}-%{version}.tar.gz
 License: GPLv3+
 Group: Development/Libraries
@@ -12,6 +12,7 @@
 Url: http://fedorahosted.org/cas
 BuildRequires: python-devel
 Requires: crash
+ExcludeArch: ppc ppc64
 
 %description
 CAS provides a user the ability to configure an environment for core analysis
@@ -42,6 +43,9 @@
 %doc LICENSE README PKG-INFO
 
 %changelog
+* Wed Jan 21 2009 Adam Stokes <ajs at redhat dot com> - 0.13-119
+- ExcludeArch ppc since crash is not available in this scenario
+
 * Wed Jan 7 2009 Adam Stokes <ajs at redhat dot com> - 0.13-116
 - support for extracting kernel modules
 - support for analyzing x86 cores on x86_64 system



From anyremote at fedoraproject.org  Wed Jan 21 18:58:25 2009
From: anyremote at fedoraproject.org (Mikhail Fedotov)
Date: Wed, 21 Jan 2009 18:58:25 +0000 (UTC)
Subject: rpms/kanyremote/F-10 .cvsignore, 1.12, 1.13 import.log, 1.12,
	1.13 kanyremote.spec, 1.13, 1.14 sources, 1.15, 1.16
Message-ID: <20090121185825.672A37012F@cvs1.fedora.phx.redhat.com>

Author: anyremote

Update of /cvs/pkgs/rpms/kanyremote/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30258/F-10

Modified Files:
	.cvsignore import.log kanyremote.spec sources 
Log Message:
build


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kanyremote/F-10/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	20 Jan 2009 21:26:13 -0000	1.12
+++ .cvsignore	21 Jan 2009 18:57:55 -0000	1.13
@@ -1 +1 @@
-kanyremote-5.6.tar.gz
+kanyremote-5.6.1.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/kanyremote/F-10/import.log,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- import.log	20 Jan 2009 21:26:14 -0000	1.12
+++ import.log	21 Jan 2009 18:57:55 -0000	1.13
@@ -10,3 +10,4 @@
 kanyremote-5_5_1-1_fc10:F-10:kanyremote-5.5.1-1.fc10.src.rpm:1229863027
 kanyremote-5_5_1-3_fc10:F-10:kanyremote-5.5.1-3.fc10.src.rpm:1229871847
 kanyremote-5_6-1_fc10:F-10:kanyremote-5.6-1.fc10.src.rpm:1232486740
+kanyremote-5_6_1-1_fc10:F-10:kanyremote-5.6.1-1.fc10.src.rpm:1232564252


Index: kanyremote.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kanyremote/F-10/kanyremote.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- kanyremote.spec	20 Jan 2009 21:26:14 -0000	1.13
+++ kanyremote.spec	21 Jan 2009 18:57:55 -0000	1.14
@@ -1,6 +1,6 @@
 Summary: KDE frontend for anyRemote
 Name: kanyremote
-Version: 5.6
+Version: 5.6.1
 Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/System
@@ -38,6 +38,9 @@
 
 %changelog
 
+* Wed Jan 21 2009 Mikhail Fedotov <anyremote at mail.ru> - 5.6.1-1
+- Minor bugfix
+
 * Mon Jan 19 2009 Mikhail Fedotov <anyremote at mail.ru> - 5.6-1
 - Check java client version on the web site
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kanyremote/F-10/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	20 Jan 2009 21:26:14 -0000	1.15
+++ sources	21 Jan 2009 18:57:55 -0000	1.16
@@ -1 +1 @@
-3e3d9a6c90bbd3bf5bc9ac7be5e62afc  kanyremote-5.6.tar.gz
+881d4c221f1aac598277066f1e69f559  kanyremote-5.6.1.tar.gz



From anyremote at fedoraproject.org  Wed Jan 21 18:58:26 2009
From: anyremote at fedoraproject.org (Mikhail Fedotov)
Date: Wed, 21 Jan 2009 18:58:26 +0000 (UTC)
Subject: rpms/kanyremote/F-9 .cvsignore, 1.12, 1.13 import.log, 1.11,
	1.12 kanyremote.spec, 1.14, 1.15 sources, 1.15, 1.16
Message-ID: <20090121185826.F1DDE7012F@cvs1.fedora.phx.redhat.com>

Author: anyremote

Update of /cvs/pkgs/rpms/kanyremote/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30275/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.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	20 Jan 2009 21:26:11 -0000	1.12
+++ .cvsignore	21 Jan 2009 18:57:56 -0000	1.13
@@ -1 +1 @@
-kanyremote-5.6.tar.gz
+kanyremote-5.6.1.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/kanyremote/F-9/import.log,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- import.log	20 Jan 2009 21:26:11 -0000	1.11
+++ import.log	21 Jan 2009 18:57:56 -0000	1.12
@@ -9,3 +9,4 @@
 kanyremote-5_5_1-2_fc10:F-9:kanyremote-5.5.1-2.fc10.src.rpm:1229864429
 kanyremote-5_5_1-3_fc10:F-9:kanyremote-5.5.1-3.fc10.src.rpm:1229869440
 kanyremote-5_6-1_fc10:F-9:kanyremote-5.6-1.fc10.src.rpm:1232486741
+kanyremote-5_6_1-1_fc10:F-9:kanyremote-5.6.1-1.fc10.src.rpm:1232564250


Index: kanyremote.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kanyremote/F-9/kanyremote.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- kanyremote.spec	20 Jan 2009 21:26:11 -0000	1.14
+++ kanyremote.spec	21 Jan 2009 18:57:56 -0000	1.15
@@ -1,6 +1,6 @@
 Summary: KDE frontend for anyRemote
 Name: kanyremote
-Version: 5.6
+Version: 5.6.1
 Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/System
@@ -38,6 +38,9 @@
 
 %changelog
 
+* Wed Jan 21 2009 Mikhail Fedotov <anyremote at mail.ru> - 5.6.1-1
+- Minor bugfix
+
 * Mon Jan 19 2009 Mikhail Fedotov <anyremote at mail.ru> - 5.6-1
 - Check java client version on the web site
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kanyremote/F-9/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	20 Jan 2009 21:26:11 -0000	1.15
+++ sources	21 Jan 2009 18:57:56 -0000	1.16
@@ -1 +1 @@
-3e3d9a6c90bbd3bf5bc9ac7be5e62afc  kanyremote-5.6.tar.gz
+881d4c221f1aac598277066f1e69f559  kanyremote-5.6.1.tar.gz



From anyremote at fedoraproject.org  Wed Jan 21 18:58:37 2009
From: anyremote at fedoraproject.org (Mikhail Fedotov)
Date: Wed, 21 Jan 2009 18:58:37 +0000 (UTC)
Subject: rpms/kanyremote/devel .cvsignore, 1.12, 1.13 import.log, 1.12,
	1.13 kanyremote.spec, 1.13, 1.14 sources, 1.15, 1.16
Message-ID: <20090121185837.910BF7012F@cvs1.fedora.phx.redhat.com>

Author: anyremote

Update of /cvs/pkgs/rpms/kanyremote/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30426/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.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	20 Jan 2009 21:26:15 -0000	1.12
+++ .cvsignore	21 Jan 2009 18:58:07 -0000	1.13
@@ -1 +1 @@
-kanyremote-5.6.tar.gz
+kanyremote-5.6.1.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/kanyremote/devel/import.log,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- import.log	20 Jan 2009 21:26:15 -0000	1.12
+++ import.log	21 Jan 2009 18:58:07 -0000	1.13
@@ -10,3 +10,4 @@
 kanyremote-5_5_1-1_fc10:HEAD:kanyremote-5.5.1-1.fc10.src.rpm:1229863038
 kanyremote-5_5_1-3_fc10:HEAD:kanyremote-5.5.1-3.fc10.src.rpm:1229872727
 kanyremote-5_6-1_fc10:HEAD:kanyremote-5.6-1.fc10.src.rpm:1232486746
+kanyremote-5_6_1-1_fc10:HEAD:kanyremote-5.6.1-1.fc10.src.rpm:1232564258


Index: kanyremote.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kanyremote/devel/kanyremote.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- kanyremote.spec	20 Jan 2009 21:26:15 -0000	1.13
+++ kanyremote.spec	21 Jan 2009 18:58:07 -0000	1.14
@@ -1,6 +1,6 @@
 Summary: KDE frontend for anyRemote
 Name: kanyremote
-Version: 5.6
+Version: 5.6.1
 Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/System
@@ -38,6 +38,9 @@
 
 %changelog
 
+* Wed Jan 21 2009 Mikhail Fedotov <anyremote at mail.ru> - 5.6.1-1
+- Minor bugfix
+
 * Mon Jan 19 2009 Mikhail Fedotov <anyremote at mail.ru> - 5.6-1
 - Check java client version on the web site
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kanyremote/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	20 Jan 2009 21:26:15 -0000	1.15
+++ sources	21 Jan 2009 18:58:07 -0000	1.16
@@ -1 +1 @@
-3e3d9a6c90bbd3bf5bc9ac7be5e62afc  kanyremote-5.6.tar.gz
+881d4c221f1aac598277066f1e69f559  kanyremote-5.6.1.tar.gz



From astokes at fedoraproject.org  Wed Jan 21 18:59:17 2009
From: astokes at fedoraproject.org (Adam Stokes)
Date: Wed, 21 Jan 2009 18:59:17 +0000 (UTC)
Subject: rpms/cas/EL-5 cas.spec,1.1,1.2
Message-ID: <20090121185917.B91EE7012F@cvs1.fedora.phx.redhat.com>

Author: astokes

Update of /cvs/pkgs/rpms/cas/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30635

Modified Files:
	cas.spec 
Log Message:
add excludearch for ppc and ppc64



Index: cas.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cas/EL-5/cas.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cas.spec	15 Jan 2009 18:44:32 -0000	1.1
+++ cas.spec	21 Jan 2009 18:58:47 -0000	1.2
@@ -3,7 +3,7 @@
 Name: cas
 Summary: Tool to analyze and configure core file environment
 Version: 0.13
-Release: 118%{?dist}
+Release: 119%{?dist}
 Source0: https://fedorahosted.org/releases/c/a/cas/%{name}-%{version}.tar.gz
 License: GPLv3+
 Group: Development/Libraries
@@ -12,6 +12,7 @@
 Url: http://fedorahosted.org/cas
 BuildRequires: python-devel
 Requires: crash
+ExcludeArch: ppc ppc64
 
 %description
 CAS provides a user the ability to configure an environment for core analysis
@@ -42,6 +43,9 @@
 %doc LICENSE README PKG-INFO
 
 %changelog
+* Wed Jan 21 2009 Adam Stokes <ajs at redhat dot com> - 0.13-119
+- ExcludeArch ppc since crash is not available in this scenario
+
 * Wed Jan 7 2009 Adam Stokes <ajs at redhat dot com> - 0.13-116
 - support for extracting kernel modules
 - support for analyzing x86 cores on x86_64 system



From atkac at fedoraproject.org  Wed Jan 21 19:02:02 2009
From: atkac at fedoraproject.org (Adam Tkac)
Date: Wed, 21 Jan 2009 19:02:02 +0000 (UTC)
Subject: rpms/vnc/devel dead.package, NONE, 1.1 Makefile, 1.2,
	NONE Makefile.am, 
	1.4, NONE sources, 1.25, NONE vnc-102434.patch, 1.2,
	NONE vnc-16x16.png, 1.1, NONE vnc-24bit.patch, 1.1,
	NONE vnc-24x24.png, 1.1, NONE vnc-48x48.png, 1.1,
	NONE vnc-64bit.patch, 1.1, NONE vnc-allocate.patch, 1.1,
	NONE vnc-always_use_fb.patch, 1.2, NONE vnc-authentication.patch,
	1.1, NONE vnc-autotools-compile.patch, 1.1,
	NONE vnc-autotools.patch, 1.3, NONE vnc-bounds.patch, 1.1,
	NONE vnc-clipboard.patch, 1.1, NONE vnc-config.patch, 1.1,
	NONE vnc-cookie.patch, 1.8, NONE vnc-gcc4.patch, 1.1,
	NONE vnc-gcc43.patch, 1.2, NONE vnc-idle.patch, 1.2,
	NONE vnc-includes.patch, 1.1, NONE vnc-manminor.patch, 1.1,
	NONE vnc-mieq.patch, 1.1, NONE vnc-modular-xorg.patch, 1.13,
	NONE vnc-newfbsize.patch, 1.1, NONE vnc-nohttpd.patch, 1.1,
	NONE vnc-noxorg.patch, 1.1, NONE vnc-paint.patch, 1.1,
	NONE vnc-privates.patch, 1.1, NONE vnc-render.patch, 1.20,
	NONE vnc-restart.patch, 1.2, NONE vnc-rh212985.patch, 1.1,
	NONE vnc-scrollbars.patch, 1.1, NONE vnc-select.patch, 1.1,
	NONE vnc-selections.patch, 1.1, NONE vnc-use-fb.patch, 1.5,
	NONE vnc-via.patch, 1.6, NONE vnc-viewer-reparent.patch, 1.1,
	NONE vnc-viewerIPv6.patch, 1.2, NONE vnc-vncpasswd.patch, 1.1,
	NONE vnc-vsnprintf.patch, 1.1, NONE vnc-xclients.patch, 1.4,
	NONE vnc-xorg.patch, 1.5, NONE vnc.spec, 1.204,
	NONE vncserver.init, 1.13, NONE
Message-ID: <20090121190202.C115270141@cvs1.fedora.phx.redhat.com>

Author: atkac

Update of /cvs/pkgs/rpms/vnc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31500

Added Files:
	dead.package 
Removed Files:
	Makefile Makefile.am sources vnc-102434.patch vnc-16x16.png 
	vnc-24bit.patch vnc-24x24.png vnc-48x48.png vnc-64bit.patch 
	vnc-allocate.patch vnc-always_use_fb.patch 
	vnc-authentication.patch vnc-autotools-compile.patch 
	vnc-autotools.patch vnc-bounds.patch vnc-clipboard.patch 
	vnc-config.patch vnc-cookie.patch vnc-gcc4.patch 
	vnc-gcc43.patch vnc-idle.patch vnc-includes.patch 
	vnc-manminor.patch vnc-mieq.patch vnc-modular-xorg.patch 
	vnc-newfbsize.patch vnc-nohttpd.patch vnc-noxorg.patch 
	vnc-paint.patch vnc-privates.patch vnc-render.patch 
	vnc-restart.patch vnc-rh212985.patch vnc-scrollbars.patch 
	vnc-select.patch vnc-selections.patch vnc-use-fb.patch 
	vnc-via.patch vnc-viewer-reparent.patch vnc-viewerIPv6.patch 
	vnc-vncpasswd.patch vnc-vsnprintf.patch vnc-xclients.patch 
	vnc-xorg.patch vnc.spec vncserver.init 
Log Message:
vnc has been retired in favor of tightvnc



--- NEW FILE dead.package ---
RealVNC has been replaced by TightVNC. Checkout "tightvnc" module if you want
current Fedora source.


--- Makefile DELETED ---


--- Makefile.am DELETED ---


--- sources DELETED ---


--- vnc-102434.patch DELETED ---


--- vnc-24bit.patch DELETED ---


--- vnc-64bit.patch DELETED ---


--- vnc-allocate.patch DELETED ---


--- vnc-always_use_fb.patch DELETED ---


--- vnc-authentication.patch DELETED ---


--- vnc-autotools-compile.patch DELETED ---


--- vnc-autotools.patch DELETED ---


--- vnc-bounds.patch DELETED ---


--- vnc-clipboard.patch DELETED ---


--- vnc-config.patch DELETED ---


--- vnc-cookie.patch DELETED ---


--- vnc-gcc4.patch DELETED ---


--- vnc-gcc43.patch DELETED ---


--- vnc-idle.patch DELETED ---


--- vnc-includes.patch DELETED ---


--- vnc-manminor.patch DELETED ---


--- vnc-mieq.patch DELETED ---


--- vnc-modular-xorg.patch DELETED ---


--- vnc-newfbsize.patch DELETED ---


--- vnc-nohttpd.patch DELETED ---


--- vnc-noxorg.patch DELETED ---


--- vnc-paint.patch DELETED ---


--- vnc-privates.patch DELETED ---


--- vnc-render.patch DELETED ---


--- vnc-restart.patch DELETED ---


--- vnc-rh212985.patch DELETED ---


--- vnc-scrollbars.patch DELETED ---


--- vnc-select.patch DELETED ---


--- vnc-selections.patch DELETED ---


--- vnc-use-fb.patch DELETED ---


--- vnc-via.patch DELETED ---


--- vnc-viewer-reparent.patch DELETED ---


--- vnc-viewerIPv6.patch DELETED ---


--- vnc-vncpasswd.patch DELETED ---


--- vnc-vsnprintf.patch DELETED ---


--- vnc-xclients.patch DELETED ---


--- vnc-xorg.patch DELETED ---


--- vnc.spec DELETED ---


--- vncserver.init DELETED ---



From wtogami at fedoraproject.org  Wed Jan 21 19:02:27 2009
From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=)
Date: Wed, 21 Jan 2009 19:02:27 +0000 (UTC)
Subject: rpms/ltsp/F-10 .cvsignore, 1.22, 1.23 ltsp.spec, 1.28, 1.29 sources,
	1.26, 1.27
Message-ID: <20090121190227.919037012F@cvs1.fedora.phx.redhat.com>

Author: wtogami

Update of /cvs/pkgs/rpms/ltsp/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32268

Modified Files:
	.cvsignore ltsp.spec sources 
Log Message:
ltsp-genmenu replaces menu entries in the XDG menu with localapps transparently



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ltsp/F-10/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- .cvsignore	15 Jan 2009 18:32:33 -0000	1.22
+++ .cvsignore	21 Jan 2009 19:01:57 -0000	1.23
@@ -1 +1 @@
-ltsp-5.1.48.tar.bz2
+ltsp-5.1.49.tar.bz2


Index: ltsp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ltsp/F-10/ltsp.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- ltsp.spec	15 Jan 2009 18:32:33 -0000	1.28
+++ ltsp.spec	21 Jan 2009 19:01:57 -0000	1.29
@@ -1,7 +1,7 @@
 Name:           ltsp
-Version:        5.1.48
-%define _datestamp .20090115.13
-#Release:        2%{_datestamp}%{?dist}
+Version:        5.1.49
+%define _datestamp .20090121.13
+#Release:        0%{_datestamp}%{?dist}
 Release:        1%{?dist}
 Summary:        Linux Terminal Server Project Server and Client
 Group:          User Interface/Desktops
@@ -155,6 +155,7 @@
     make install DESTDIR=$RPM_BUILD_ROOT
 popd
 install -m 0755 localapps/ltsp-localappsd $RPM_BUILD_ROOT/%{_bindir}/
+install -m 0755 localapps/ltsp-genmenu $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/
@@ -327,6 +328,7 @@
 %{_datadir}/ltsp/ltsp-chroot-setup
 %{_datadir}/ltsp/chroot-setup.d/
 %{_bindir}/ltsp-localappsd
+%{_bindir}/ltsp-genmenu
 %{_sysconfdir}/sysconfig/mkinitrd.ltsp-template
 %{_sysconfdir}/kernel/postinst.d/ltsp
 %{_sysconfdir}/kernel/prerm.d/ltsp
@@ -417,6 +419,9 @@
 %endif
 
 %changelog
+* Wed Jan 21 2009 Warren Togami <wtogami at redhat.com> - 5.1.49-1
+- ltsp-genmenu replaces menu entries in the XDG menu with localapps transparently
+
 * Thu Jan 15 2009 Warren Togami <wtogami at redhat.com> - 5.1.48-1
 - More bug fixes
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ltsp/F-10/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- sources	15 Jan 2009 18:32:33 -0000	1.26
+++ sources	21 Jan 2009 19:01:57 -0000	1.27
@@ -1 +1 @@
-036db37af33c64ef60d23d0c50868424  ltsp-5.1.48.tar.bz2
+504f94d0a35361b772d8b2facc242645  ltsp-5.1.49.tar.bz2



From wtogami at fedoraproject.org  Wed Jan 21 19:04:14 2009
From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=)
Date: Wed, 21 Jan 2009 19:04:14 +0000 (UTC)
Subject: rpms/ltsp/F-9 .cvsignore, 1.32, 1.33 ltsp.spec, 1.43, 1.44 sources, 
	1.36, 1.37
Message-ID: <20090121190414.4270E7012F@cvs1.fedora.phx.redhat.com>

Author: wtogami

Update of /cvs/pkgs/rpms/ltsp/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1086

Modified Files:
	.cvsignore ltsp.spec sources 
Log Message:
ltsp-genmenu replaces menu entries in the XDG menu with localapps transparently



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ltsp/F-9/.cvsignore,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- .cvsignore	30 Dec 2008 00:26:09 -0000	1.32
+++ .cvsignore	21 Jan 2009 19:03:43 -0000	1.33
@@ -1 +1 @@
-ltsp-5.1.44.tar.bz2
+ltsp-5.1.49.tar.bz2


Index: ltsp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ltsp/F-9/ltsp.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- ltsp.spec	30 Dec 2008 00:26:10 -0000	1.43
+++ ltsp.spec	21 Jan 2009 19:03:43 -0000	1.44
@@ -1,7 +1,7 @@
 Name:           ltsp
-Version:        5.1.44
-%define _datestamp .20081224.19
-#Release:        2%{_datestamp}%{?dist}
+Version:        5.1.49
+%define _datestamp .20090121.13
+#Release:        0%{_datestamp}%{?dist}
 Release:        1%{?dist}
 Summary:        Linux Terminal Server Project Server and Client
 Group:          User Interface/Desktops
@@ -155,6 +155,7 @@
     make install DESTDIR=$RPM_BUILD_ROOT
 popd
 install -m 0755 localapps/ltsp-localappsd $RPM_BUILD_ROOT/%{_bindir}/
+install -m 0755 localapps/ltsp-genmenu $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/
@@ -327,6 +328,7 @@
 %{_datadir}/ltsp/ltsp-chroot-setup
 %{_datadir}/ltsp/chroot-setup.d/
 %{_bindir}/ltsp-localappsd
+%{_bindir}/ltsp-genmenu
 %{_sysconfdir}/sysconfig/mkinitrd.ltsp-template
 %{_sysconfdir}/kernel/postinst.d/ltsp
 %{_sysconfdir}/kernel/prerm.d/ltsp
@@ -417,6 +419,12 @@
 %endif
 
 %changelog
+* Wed Jan 21 2009 Warren Togami <wtogami at redhat.com> - 5.1.49-1
+- ltsp-genmenu replaces menu entries in the XDG menu with localapps transparently
+
+* Thu Jan 15 2009 Warren Togami <wtogami at redhat.com> - 5.1.48-1
+- More bug fixes
+
 * Mon Dec 29 2008 Warren Togami <wtogami at redhat.com> - 5.1.44-1
 - More bug fixes
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ltsp/F-9/sources,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- sources	30 Dec 2008 00:26:10 -0000	1.36
+++ sources	21 Jan 2009 19:03:43 -0000	1.37
@@ -1 +1 @@
-bbf30387acf5143ec6086ccb5cf457a1  ltsp-5.1.44.tar.bz2
+504f94d0a35361b772d8b2facc242645  ltsp-5.1.49.tar.bz2



From anyremote at fedoraproject.org  Wed Jan 21 19:24:29 2009
From: anyremote at fedoraproject.org (Mikhail Fedotov)
Date: Wed, 21 Jan 2009 19:24:29 +0000 (UTC)
Subject: rpms/kanyremote/devel import.log, 1.13, 1.14 kanyremote.spec, 1.14, 
	1.15 sources, 1.16, 1.17
Message-ID: <20090121192429.B4D537012F@cvs1.fedora.phx.redhat.com>

Author: anyremote

Update of /cvs/pkgs/rpms/kanyremote/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7796/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.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- import.log	21 Jan 2009 18:58:07 -0000	1.13
+++ import.log	21 Jan 2009 19:23:59 -0000	1.14
@@ -11,3 +11,4 @@
 kanyremote-5_5_1-3_fc10:HEAD:kanyremote-5.5.1-3.fc10.src.rpm:1229872727
 kanyremote-5_6-1_fc10:HEAD:kanyremote-5.6-1.fc10.src.rpm:1232486746
 kanyremote-5_6_1-1_fc10:HEAD:kanyremote-5.6.1-1.fc10.src.rpm:1232564258
+kanyremote-5_6_1-2_fc10:HEAD:kanyremote-5.6.1-2.fc10.src.rpm:1232565777


Index: kanyremote.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kanyremote/devel/kanyremote.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- kanyremote.spec	21 Jan 2009 18:58:07 -0000	1.14
+++ kanyremote.spec	21 Jan 2009 19:23:59 -0000	1.15
@@ -1,7 +1,7 @@
 Summary: KDE frontend for anyRemote
 Name: kanyremote
 Version: 5.6.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Group: Applications/System
 Source0: http://downloads.sourceforge.net/anyremote/%{name}-%{version}.tar.gz
@@ -38,6 +38,9 @@
 
 %changelog
 
+* Wed Jan 21 2009 Mikhail Fedotov <anyremote at mail.ru> - 5.6.1-2
+- correct spec
+
 * Wed Jan 21 2009 Mikhail Fedotov <anyremote at mail.ru> - 5.6.1-1
 - Minor bugfix
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kanyremote/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources	21 Jan 2009 18:58:07 -0000	1.16
+++ sources	21 Jan 2009 19:23:59 -0000	1.17
@@ -1 +1 @@
-881d4c221f1aac598277066f1e69f559  kanyremote-5.6.1.tar.gz
+f08bd3cc293cf56fb40ee4a784072a7e  kanyremote-5.6.1.tar.gz



From wtogami at fedoraproject.org  Wed Jan 21 19:31:00 2009
From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=)
Date: Wed, 21 Jan 2009 19:31:00 +0000 (UTC)
Subject: rpms/ldm/F-10 .cvsignore, 1.15, 1.16 ldm.spec, 1.23, 1.24 sources, 
	1.19, 1.20
Message-ID: <20090121193100.882CC7012F@cvs1.fedora.phx.redhat.com>

Author: wtogami

Update of /cvs/pkgs/rpms/ldm/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10237

Modified Files:
	.cvsignore ldm.spec sources 
Log Message:
More bug fixes



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ldm/F-10/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	25 Dec 2008 00:59:22 -0000	1.15
+++ .cvsignore	21 Jan 2009 19:30:29 -0000	1.16
@@ -1,2 +1,2 @@
 k12linux-theme-1.0.2.tar.bz2
-ldm-2.0.27.tar.bz2
+ldm-2.0.29.tar.bz2


Index: ldm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ldm/F-10/ldm.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- ldm.spec	25 Dec 2008 00:51:05 -0000	1.23
+++ ldm.spec	21 Jan 2009 19:30:30 -0000	1.24
@@ -1,5 +1,5 @@
 Name:           ldm
-Version:        2.0.27
+Version:        2.0.29
 %define _datestamp .20081218.19
 #Release:        2%{_datestamp}%{?dist}
 Release:        1%{?dist}
@@ -93,6 +93,9 @@
 %config(noreplace) %{_sysconfdir}/ltsp/ldm-global-dmrc
 
 %changelog
+* Wed Dec 24 2008 Warren Togami <wtogami at redhat.com> - 2.0.29-1
+- More bug fixes 
+
 * Wed Dec 24 2008 Warren Togami <wtogami at redhat.com> - 2.0.27-1
 - More bug fixes 
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ldm/F-10/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources	25 Dec 2008 00:59:22 -0000	1.19
+++ sources	21 Jan 2009 19:30:30 -0000	1.20
@@ -1,2 +1,2 @@
 620e0ae9f5db3c40ade7e17681b97a08  k12linux-theme-1.0.2.tar.bz2
-e40df8161aabd872582219d4b5d0eaf7  ldm-2.0.27.tar.bz2
+beb797066c1f5523921ab89404b35778  ldm-2.0.29.tar.bz2



From somlo at fedoraproject.org  Wed Jan 21 19:31:52 2009
From: somlo at fedoraproject.org (Gabriel L. Somlo)
Date: Wed, 21 Jan 2009 19:31:52 +0000 (UTC)
Subject: rpms/iperf/devel import.log, NONE, 1.1 iperf-2.0.4-debuginfo.patch, 
	NONE, 1.1 iperf-2.0.4-tcpdual.patch, NONE, 1.1 .cvsignore, 1.2,
	1.3 iperf.spec, 1.6, 1.7 sources, 1.2,
	1.3 iperf-2.0.2-debug.patch, 1.1, NONE iperf-2.0.2-usleep.patch,
	1.1, NONE
Message-ID: <20090121193152.2A1FE7012F@cvs1.fedora.phx.redhat.com>

Author: somlo

Update of /cvs/pkgs/rpms/iperf/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10761/devel

Modified Files:
	.cvsignore iperf.spec sources 
Added Files:
	import.log iperf-2.0.4-debuginfo.patch 
	iperf-2.0.4-tcpdual.patch 
Removed Files:
	iperf-2.0.2-debug.patch iperf-2.0.2-usleep.patch 
Log Message:
update to 2.0.4



--- NEW FILE import.log ---
iperf-2_0_4-1_fc10:HEAD:iperf-2.0.4-1.fc10.src.rpm:1232566252

iperf-2.0.4-debuginfo.patch:

--- NEW FILE iperf-2.0.4-debuginfo.patch ---
diff -NarU5 iperf-2.0.4.orig/configure iperf-2.0.4/configure
--- iperf-2.0.4.orig/configure	2008-04-07 22:47:37.000000000 -0400
+++ iperf-2.0.4/configure	2008-04-09 10:02:34.000000000 -0400
@@ -3085,11 +3085,11 @@
   am__fastdepCXX_TRUE='#'
   am__fastdepCXX_FALSE=
 fi
 
 
-CXXFLAGS=`echo " $CXXFLAGS " | sed -e "s/ -g / /"` # do not want it implicitly
+#CXXFLAGS=`echo " $CXXFLAGS " | sed -e "s/ -g / /"` # do not want it implicitly
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
@@ -3956,11 +3956,11 @@
   am__fastdepCC_TRUE='#'
   am__fastdepCC_FALSE=
 fi
 
 
-CFLAGS=`echo " $CFLAGS " | sed -e "s/ -g / /"` # do not want it implicitly
+#CFLAGS=`echo " $CFLAGS " | sed -e "s/ -g / /"` # do not want it implicitly
 
 
         { 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

iperf-2.0.4-tcpdual.patch:

--- NEW FILE iperf-2.0.4-tcpdual.patch ---
diff -NarU5 iperf-2.0.4.orig/src/Client.cpp iperf-2.0.4/src/Client.cpp
--- iperf-2.0.4.orig/src/Client.cpp	2008-04-07 22:37:54.000000000 -0400
+++ iperf-2.0.4/src/Client.cpp	2009-01-21 14:10:33.000000000 -0500
@@ -205,14 +205,14 @@
     int adjust = 0; 
 
     char* readAt = mBuf;
 
 #if HAVE_THREAD
-    if ( !isUDP( mSettings ) ) {
-	RunTCP();
-	return;
-    }
+//    if ( !isUDP( mSettings ) ) {
+//	RunTCP();
+//	return;
+//    }
 #endif
     
     // Indicates if the stream is readable 
     bool canRead = true, mMode_Time = isModeTime( mSettings ); 
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/iperf/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	22 Apr 2006 19:52:57 -0000	1.2
+++ .cvsignore	21 Jan 2009 19:31:21 -0000	1.3
@@ -1 +1 @@
-iperf-2.0.2.tar.gz
+iperf-2.0.4.tar.gz


Index: iperf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/iperf/devel/iperf.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- iperf.spec	20 Feb 2008 00:41:05 -0000	1.6
+++ iperf.spec	21 Jan 2009 19:31:21 -0000	1.7
@@ -1,13 +1,13 @@
 Name: iperf
-Version: 2.0.2
-Release: 5%{?dist}
+Version: 2.0.4
+Release: 1%{?dist}
 Summary: Measurement tool for TCP/UDP bandwidth performance
 License: BSD
 Group: Applications/Internet
-URL: http://dast.nlanr.net/Projects/Iperf/
-Source: http://dast.nlanr.net/Projects/Iperf2.0/%{name}-%{version}.tar.gz
-Patch0: iperf-2.0.2-debug.patch
-Patch1: iperf-2.0.2-usleep.patch
+URL: http://iperf.sourceforge.net
+Source: http://prdownloads.sourceforge.net/iperf/%{name}-%{version}.tar.gz
+Patch0: iperf-2.0.4-debuginfo.patch
+Patch1: iperf-2.0.4-tcpdual.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -33,12 +33,13 @@
 
 %files
 %defattr(-,root,root)
-%doc README doc/*.gif doc/*.html
+%doc AUTHORS ChangeLog COPYING README doc/*.gif doc/*.html
 %{_bindir}/iperf
 
 %changelog
-* Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 2.0.2-5
-- Autorebuild for GCC 4.3
+* Wed Jan 21 2009 Gabriel Somlo <somlo at cmu.edu> 2.0.4-1
+- update to 2.0.4
+- patch to avoid tcp/dualtest server from quitting (bugzilla #449796), also submitted to iperf sourceforge ticket tracker (#1983829)
 
 * Sat Oct 27 2007 Gabriel Somlo <somlo at cmu.edu> 2.0.2-4
 - replace usleep with sched_yield to avoid hogging CPU (bugzilla #355211)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/iperf/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	22 Apr 2006 19:52:57 -0000	1.2
+++ sources	21 Jan 2009 19:31:21 -0000	1.3
@@ -1 +1 @@
-bb658aba58a5af0356f5b1342dfe8f53  iperf-2.0.2.tar.gz
+8c5bc14cc2ea55f18f22afe3c23e3dcb  iperf-2.0.4.tar.gz


--- iperf-2.0.2-debug.patch DELETED ---


--- iperf-2.0.2-usleep.patch DELETED ---



From somlo at fedoraproject.org  Wed Jan 21 19:33:43 2009
From: somlo at fedoraproject.org (Gabriel L. Somlo)
Date: Wed, 21 Jan 2009 19:33:43 +0000 (UTC)
Subject: rpms/iperf/F-9 import.log, NONE, 1.1 iperf-2.0.4-debuginfo.patch,
	NONE, 1.1 iperf-2.0.4-tcpdual.patch, NONE, 1.1 .cvsignore, 1.2,
	1.3 iperf.spec, 1.6, 1.7 sources, 1.2,
	1.3 iperf-2.0.2-debug.patch, 1.1, NONE iperf-2.0.2-usleep.patch,
	1.1, NONE
Message-ID: <20090121193343.2A3887012F@cvs1.fedora.phx.redhat.com>

Author: somlo

Update of /cvs/pkgs/rpms/iperf/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12342/F-9

Modified Files:
	.cvsignore iperf.spec sources 
Added Files:
	import.log iperf-2.0.4-debuginfo.patch 
	iperf-2.0.4-tcpdual.patch 
Removed Files:
	iperf-2.0.2-debug.patch iperf-2.0.2-usleep.patch 
Log Message:
update to 2.0.4



--- NEW FILE import.log ---
iperf-2_0_4-1_fc10:F-9:iperf-2.0.4-1.fc10.src.rpm:1232566358

iperf-2.0.4-debuginfo.patch:

--- NEW FILE iperf-2.0.4-debuginfo.patch ---
diff -NarU5 iperf-2.0.4.orig/configure iperf-2.0.4/configure
--- iperf-2.0.4.orig/configure	2008-04-07 22:47:37.000000000 -0400
+++ iperf-2.0.4/configure	2008-04-09 10:02:34.000000000 -0400
@@ -3085,11 +3085,11 @@
   am__fastdepCXX_TRUE='#'
   am__fastdepCXX_FALSE=
 fi
 
 
-CXXFLAGS=`echo " $CXXFLAGS " | sed -e "s/ -g / /"` # do not want it implicitly
+#CXXFLAGS=`echo " $CXXFLAGS " | sed -e "s/ -g / /"` # do not want it implicitly
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
@@ -3956,11 +3956,11 @@
   am__fastdepCC_TRUE='#'
   am__fastdepCC_FALSE=
 fi
 
 
-CFLAGS=`echo " $CFLAGS " | sed -e "s/ -g / /"` # do not want it implicitly
+#CFLAGS=`echo " $CFLAGS " | sed -e "s/ -g / /"` # do not want it implicitly
 
 
         { 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

iperf-2.0.4-tcpdual.patch:

--- NEW FILE iperf-2.0.4-tcpdual.patch ---
diff -NarU5 iperf-2.0.4.orig/src/Client.cpp iperf-2.0.4/src/Client.cpp
--- iperf-2.0.4.orig/src/Client.cpp	2008-04-07 22:37:54.000000000 -0400
+++ iperf-2.0.4/src/Client.cpp	2009-01-21 14:10:33.000000000 -0500
@@ -205,14 +205,14 @@
     int adjust = 0; 
 
     char* readAt = mBuf;
 
 #if HAVE_THREAD
-    if ( !isUDP( mSettings ) ) {
-	RunTCP();
-	return;
-    }
+//    if ( !isUDP( mSettings ) ) {
+//	RunTCP();
+//	return;
+//    }
 #endif
     
     // Indicates if the stream is readable 
     bool canRead = true, mMode_Time = isModeTime( mSettings ); 
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/iperf/F-9/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	22 Apr 2006 19:52:57 -0000	1.2
+++ .cvsignore	21 Jan 2009 19:33:12 -0000	1.3
@@ -1 +1 @@
-iperf-2.0.2.tar.gz
+iperf-2.0.4.tar.gz


Index: iperf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/iperf/F-9/iperf.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- iperf.spec	20 Feb 2008 00:41:05 -0000	1.6
+++ iperf.spec	21 Jan 2009 19:33:12 -0000	1.7
@@ -1,13 +1,13 @@
 Name: iperf
-Version: 2.0.2
-Release: 5%{?dist}
+Version: 2.0.4
+Release: 1%{?dist}
 Summary: Measurement tool for TCP/UDP bandwidth performance
 License: BSD
 Group: Applications/Internet
-URL: http://dast.nlanr.net/Projects/Iperf/
-Source: http://dast.nlanr.net/Projects/Iperf2.0/%{name}-%{version}.tar.gz
-Patch0: iperf-2.0.2-debug.patch
-Patch1: iperf-2.0.2-usleep.patch
+URL: http://iperf.sourceforge.net
+Source: http://prdownloads.sourceforge.net/iperf/%{name}-%{version}.tar.gz
+Patch0: iperf-2.0.4-debuginfo.patch
+Patch1: iperf-2.0.4-tcpdual.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -33,12 +33,13 @@
 
 %files
 %defattr(-,root,root)
-%doc README doc/*.gif doc/*.html
+%doc AUTHORS ChangeLog COPYING README doc/*.gif doc/*.html
 %{_bindir}/iperf
 
 %changelog
-* Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 2.0.2-5
-- Autorebuild for GCC 4.3
+* Wed Jan 21 2009 Gabriel Somlo <somlo at cmu.edu> 2.0.4-1
+- update to 2.0.4
+- patch to avoid tcp/dualtest server from quitting (bugzilla #449796), also submitted to iperf sourceforge ticket tracker (#1983829)
 
 * Sat Oct 27 2007 Gabriel Somlo <somlo at cmu.edu> 2.0.2-4
 - replace usleep with sched_yield to avoid hogging CPU (bugzilla #355211)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/iperf/F-9/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	22 Apr 2006 19:52:57 -0000	1.2
+++ sources	21 Jan 2009 19:33:12 -0000	1.3
@@ -1 +1 @@
-bb658aba58a5af0356f5b1342dfe8f53  iperf-2.0.2.tar.gz
+8c5bc14cc2ea55f18f22afe3c23e3dcb  iperf-2.0.4.tar.gz


--- iperf-2.0.2-debug.patch DELETED ---


--- iperf-2.0.2-usleep.patch DELETED ---



From somlo at fedoraproject.org  Wed Jan 21 19:35:45 2009
From: somlo at fedoraproject.org (Gabriel L. Somlo)
Date: Wed, 21 Jan 2009 19:35:45 +0000 (UTC)
Subject: rpms/iperf/F-10 import.log, NONE, 1.1 iperf-2.0.4-debuginfo.patch, 
	NONE, 1.1 iperf-2.0.4-tcpdual.patch, NONE, 1.1 .cvsignore, 1.2,
	1.3 iperf.spec, 1.6, 1.7 sources, 1.2,
	1.3 iperf-2.0.2-debug.patch, 1.1, NONE iperf-2.0.2-usleep.patch,
	1.1, NONE
Message-ID: <20090121193545.ADBF27012F@cvs1.fedora.phx.redhat.com>

Author: somlo

Update of /cvs/pkgs/rpms/iperf/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13397/F-10

Modified Files:
	.cvsignore iperf.spec sources 
Added Files:
	import.log iperf-2.0.4-debuginfo.patch 
	iperf-2.0.4-tcpdual.patch 
Removed Files:
	iperf-2.0.2-debug.patch iperf-2.0.2-usleep.patch 
Log Message:
update to 2.0.4



--- NEW FILE import.log ---
iperf-2_0_4-1_fc10:F-10:iperf-2.0.4-1.fc10.src.rpm:1232566481

iperf-2.0.4-debuginfo.patch:

--- NEW FILE iperf-2.0.4-debuginfo.patch ---
diff -NarU5 iperf-2.0.4.orig/configure iperf-2.0.4/configure
--- iperf-2.0.4.orig/configure	2008-04-07 22:47:37.000000000 -0400
+++ iperf-2.0.4/configure	2008-04-09 10:02:34.000000000 -0400
@@ -3085,11 +3085,11 @@
   am__fastdepCXX_TRUE='#'
   am__fastdepCXX_FALSE=
 fi
 
 
-CXXFLAGS=`echo " $CXXFLAGS " | sed -e "s/ -g / /"` # do not want it implicitly
+#CXXFLAGS=`echo " $CXXFLAGS " | sed -e "s/ -g / /"` # do not want it implicitly
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
@@ -3956,11 +3956,11 @@
   am__fastdepCC_TRUE='#'
   am__fastdepCC_FALSE=
 fi
 
 
-CFLAGS=`echo " $CFLAGS " | sed -e "s/ -g / /"` # do not want it implicitly
+#CFLAGS=`echo " $CFLAGS " | sed -e "s/ -g / /"` # do not want it implicitly
 
 
         { 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

iperf-2.0.4-tcpdual.patch:

--- NEW FILE iperf-2.0.4-tcpdual.patch ---
diff -NarU5 iperf-2.0.4.orig/src/Client.cpp iperf-2.0.4/src/Client.cpp
--- iperf-2.0.4.orig/src/Client.cpp	2008-04-07 22:37:54.000000000 -0400
+++ iperf-2.0.4/src/Client.cpp	2009-01-21 14:10:33.000000000 -0500
@@ -205,14 +205,14 @@
     int adjust = 0; 
 
     char* readAt = mBuf;
 
 #if HAVE_THREAD
-    if ( !isUDP( mSettings ) ) {
-	RunTCP();
-	return;
-    }
+//    if ( !isUDP( mSettings ) ) {
+//	RunTCP();
+//	return;
+//    }
 #endif
     
     // Indicates if the stream is readable 
     bool canRead = true, mMode_Time = isModeTime( mSettings ); 
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/iperf/F-10/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	22 Apr 2006 19:52:57 -0000	1.2
+++ .cvsignore	21 Jan 2009 19:35:15 -0000	1.3
@@ -1 +1 @@
-iperf-2.0.2.tar.gz
+iperf-2.0.4.tar.gz


Index: iperf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/iperf/F-10/iperf.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- iperf.spec	20 Feb 2008 00:41:05 -0000	1.6
+++ iperf.spec	21 Jan 2009 19:35:15 -0000	1.7
@@ -1,13 +1,13 @@
 Name: iperf
-Version: 2.0.2
-Release: 5%{?dist}
+Version: 2.0.4
+Release: 1%{?dist}
 Summary: Measurement tool for TCP/UDP bandwidth performance
 License: BSD
 Group: Applications/Internet
-URL: http://dast.nlanr.net/Projects/Iperf/
-Source: http://dast.nlanr.net/Projects/Iperf2.0/%{name}-%{version}.tar.gz
-Patch0: iperf-2.0.2-debug.patch
-Patch1: iperf-2.0.2-usleep.patch
+URL: http://iperf.sourceforge.net
+Source: http://prdownloads.sourceforge.net/iperf/%{name}-%{version}.tar.gz
+Patch0: iperf-2.0.4-debuginfo.patch
+Patch1: iperf-2.0.4-tcpdual.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -33,12 +33,13 @@
 
 %files
 %defattr(-,root,root)
-%doc README doc/*.gif doc/*.html
+%doc AUTHORS ChangeLog COPYING README doc/*.gif doc/*.html
 %{_bindir}/iperf
 
 %changelog
-* Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 2.0.2-5
-- Autorebuild for GCC 4.3
+* Wed Jan 21 2009 Gabriel Somlo <somlo at cmu.edu> 2.0.4-1
+- update to 2.0.4
+- patch to avoid tcp/dualtest server from quitting (bugzilla #449796), also submitted to iperf sourceforge ticket tracker (#1983829)
 
 * Sat Oct 27 2007 Gabriel Somlo <somlo at cmu.edu> 2.0.2-4
 - replace usleep with sched_yield to avoid hogging CPU (bugzilla #355211)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/iperf/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	22 Apr 2006 19:52:57 -0000	1.2
+++ sources	21 Jan 2009 19:35:15 -0000	1.3
@@ -1 +1 @@
-bb658aba58a5af0356f5b1342dfe8f53  iperf-2.0.2.tar.gz
+8c5bc14cc2ea55f18f22afe3c23e3dcb  iperf-2.0.4.tar.gz


--- iperf-2.0.2-debug.patch DELETED ---


--- iperf-2.0.2-usleep.patch DELETED ---



From wtogami at fedoraproject.org  Wed Jan 21 19:36:13 2009
From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=)
Date: Wed, 21 Jan 2009 19:36:13 +0000 (UTC)
Subject: rpms/ldm/F-9 .cvsignore, 1.21, 1.22 ldm.spec, 1.28, 1.29 sources,
	1.25, 1.26 ldm-rearrange-stuff.patch, 1.4, NONE
Message-ID: <20090121193613.837D47012F@cvs1.fedora.phx.redhat.com>

Author: wtogami

Update of /cvs/pkgs/rpms/ldm/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13659

Modified Files:
	.cvsignore ldm.spec sources 
Removed Files:
	ldm-rearrange-stuff.patch 
Log Message:
More bug fixes



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ldm/F-9/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- .cvsignore	25 Dec 2008 01:03:55 -0000	1.21
+++ .cvsignore	21 Jan 2009 19:35:43 -0000	1.22
@@ -1,2 +1,2 @@
 k12linux-theme-1.0.2.tar.bz2
-ldm-2.0.27.tar.bz2
+ldm-2.0.29.tar.bz2


Index: ldm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ldm/F-9/ldm.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- ldm.spec	25 Dec 2008 01:03:55 -0000	1.28
+++ ldm.spec	21 Jan 2009 19:35:43 -0000	1.29
@@ -1,5 +1,5 @@
 Name:           ldm
-Version:        2.0.27
+Version:        2.0.29
 %define _datestamp .20081218.19
 #Release:        2%{_datestamp}%{?dist}
 Release:        1%{?dist}
@@ -93,6 +93,9 @@
 %config(noreplace) %{_sysconfdir}/ltsp/ldm-global-dmrc
 
 %changelog
+* Wed Dec 24 2008 Warren Togami <wtogami at redhat.com> - 2.0.29-1
+- More bug fixes 
+
 * Wed Dec 24 2008 Warren Togami <wtogami at redhat.com> - 2.0.27-1
 - More bug fixes 
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ldm/F-9/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- sources	25 Dec 2008 01:03:55 -0000	1.25
+++ sources	21 Jan 2009 19:35:43 -0000	1.26
@@ -1,2 +1,2 @@
 620e0ae9f5db3c40ade7e17681b97a08  k12linux-theme-1.0.2.tar.bz2
-e40df8161aabd872582219d4b5d0eaf7  ldm-2.0.27.tar.bz2
+beb797066c1f5523921ab89404b35778  ldm-2.0.29.tar.bz2


--- ldm-rearrange-stuff.patch DELETED ---



From somlo at fedoraproject.org  Wed Jan 21 19:38:24 2009
From: somlo at fedoraproject.org (Gabriel L. Somlo)
Date: Wed, 21 Jan 2009 19:38:24 +0000 (UTC)
Subject: rpms/iperf/EL-5 import.log, NONE, 1.1 iperf-2.0.4-debuginfo.patch, 
	NONE, 1.1 iperf-2.0.4-tcpdual.patch, NONE, 1.1 .cvsignore, 1.2,
	1.3 iperf.spec, 1.7, 1.8 sources, 1.2,
	1.3 iperf-2.0.2-debug.patch, 1.1, NONE iperf-2.0.2-usleep.patch,
	1.1, NONE
Message-ID: <20090121193824.0C7687012F@cvs1.fedora.phx.redhat.com>

Author: somlo

Update of /cvs/pkgs/rpms/iperf/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14593/EL-5

Modified Files:
	.cvsignore iperf.spec sources 
Added Files:
	import.log iperf-2.0.4-debuginfo.patch 
	iperf-2.0.4-tcpdual.patch 
Removed Files:
	iperf-2.0.2-debug.patch iperf-2.0.2-usleep.patch 
Log Message:
update to 2.0.4



--- NEW FILE import.log ---
iperf-2_0_4-1_fc10:EL-5:iperf-2.0.4-1.fc10.src.rpm:1232566614

iperf-2.0.4-debuginfo.patch:

--- NEW FILE iperf-2.0.4-debuginfo.patch ---
diff -NarU5 iperf-2.0.4.orig/configure iperf-2.0.4/configure
--- iperf-2.0.4.orig/configure	2008-04-07 22:47:37.000000000 -0400
+++ iperf-2.0.4/configure	2008-04-09 10:02:34.000000000 -0400
@@ -3085,11 +3085,11 @@
   am__fastdepCXX_TRUE='#'
   am__fastdepCXX_FALSE=
 fi
 
 
-CXXFLAGS=`echo " $CXXFLAGS " | sed -e "s/ -g / /"` # do not want it implicitly
+#CXXFLAGS=`echo " $CXXFLAGS " | sed -e "s/ -g / /"` # do not want it implicitly
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
@@ -3956,11 +3956,11 @@
   am__fastdepCC_TRUE='#'
   am__fastdepCC_FALSE=
 fi
 
 
-CFLAGS=`echo " $CFLAGS " | sed -e "s/ -g / /"` # do not want it implicitly
+#CFLAGS=`echo " $CFLAGS " | sed -e "s/ -g / /"` # do not want it implicitly
 
 
         { 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

iperf-2.0.4-tcpdual.patch:

--- NEW FILE iperf-2.0.4-tcpdual.patch ---
diff -NarU5 iperf-2.0.4.orig/src/Client.cpp iperf-2.0.4/src/Client.cpp
--- iperf-2.0.4.orig/src/Client.cpp	2008-04-07 22:37:54.000000000 -0400
+++ iperf-2.0.4/src/Client.cpp	2009-01-21 14:10:33.000000000 -0500
@@ -205,14 +205,14 @@
     int adjust = 0; 
 
     char* readAt = mBuf;
 
 #if HAVE_THREAD
-    if ( !isUDP( mSettings ) ) {
-	RunTCP();
-	return;
-    }
+//    if ( !isUDP( mSettings ) ) {
+//	RunTCP();
+//	return;
+//    }
 #endif
     
     // Indicates if the stream is readable 
     bool canRead = true, mMode_Time = isModeTime( mSettings ); 
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/iperf/EL-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	22 Apr 2006 19:52:57 -0000	1.2
+++ .cvsignore	21 Jan 2009 19:37:53 -0000	1.3
@@ -1 +1 @@
-iperf-2.0.2.tar.gz
+iperf-2.0.4.tar.gz


Index: iperf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/iperf/EL-5/iperf.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- iperf.spec	16 Jun 2008 14:11:10 -0000	1.7
+++ iperf.spec	21 Jan 2009 19:37:53 -0000	1.8
@@ -1,13 +1,13 @@
 Name: iperf
-Version: 2.0.2
-Release: 4.2%{?dist}
+Version: 2.0.4
+Release: 1%{?dist}
 Summary: Measurement tool for TCP/UDP bandwidth performance
 License: BSD
 Group: Applications/Internet
-URL: http://dast.nlanr.net/Projects/Iperf/
-Source: http://dast.nlanr.net/Projects/Iperf2.0/%{name}-%{version}.tar.gz
-Patch0: iperf-2.0.2-debug.patch
-Patch1: iperf-2.0.2-usleep.patch
+URL: http://iperf.sourceforge.net
+Source: http://prdownloads.sourceforge.net/iperf/%{name}-%{version}.tar.gz
+Patch0: iperf-2.0.4-debuginfo.patch
+Patch1: iperf-2.0.4-tcpdual.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -33,15 +33,13 @@
 
 %files
 %defattr(-,root,root)
-%doc README doc/*.gif doc/*.html
+%doc AUTHORS ChangeLog COPYING README doc/*.gif doc/*.html
 %{_bindir}/iperf
 
 %changelog
-* Mon Jun 16 2008 Gabriel Somlo <somlo at cmu.edu> 2.0.2-4.2
-- rebuild for EL-5
-
-* Mon Dec 10 2007 Gabriel Somlo <somlo at cmu.edu> 2.0.2-4.1
-- rebuild for EL-5
+* Wed Jan 21 2009 Gabriel Somlo <somlo at cmu.edu> 2.0.4-1
+- update to 2.0.4
+- patch to avoid tcp/dualtest server from quitting (bugzilla #449796), also submitted to iperf sourceforge ticket tracker (#1983829)
 
 * Sat Oct 27 2007 Gabriel Somlo <somlo at cmu.edu> 2.0.2-4
 - replace usleep with sched_yield to avoid hogging CPU (bugzilla #355211)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/iperf/EL-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	22 Apr 2006 19:52:57 -0000	1.2
+++ sources	21 Jan 2009 19:37:53 -0000	1.3
@@ -1 +1 @@
-bb658aba58a5af0356f5b1342dfe8f53  iperf-2.0.2.tar.gz
+8c5bc14cc2ea55f18f22afe3c23e3dcb  iperf-2.0.4.tar.gz


--- iperf-2.0.2-debug.patch DELETED ---


--- iperf-2.0.2-usleep.patch DELETED ---



From rdieter at fedoraproject.org  Wed Jan 21 19:50:41 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed, 21 Jan 2009 19:50:41 +0000 (UTC)
Subject: rpms/kipi-plugins/devel kipi-plugins.spec,1.77,1.78
Message-ID: <20090121195041.5FD757012F@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kipi-plugins/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18938

Modified Files:
	kipi-plugins.spec 
Log Message:
* Wed Jan 21 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.2.0-0.12.beta6
- update %description
- License: +Adobe (DNGConverter)



Index: kipi-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kipi-plugins/devel/kipi-plugins.spec,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- kipi-plugins.spec	5 Jan 2009 14:58:44 -0000	1.77
+++ kipi-plugins.spec	21 Jan 2009 19:50:10 -0000	1.78
@@ -5,9 +5,9 @@
 Name:    kipi-plugins
 Summary: Plugins to use with Kipi
 Version: 0.2.0
-Release: 0.11.%{beta}%{?dist}
+Release: 0.12.%{beta}%{?dist}
 
-License: GPLv2+
+License: GPLv2+ and Adobe
 Group:   Applications/Multimedia
 Url:	 http://www.kipi-plugins.org/
 Source0: http://downloads.sourceforge.net/kipi/kipi-plugins-%{version}%{?beta:-%{beta}}.tar.bz2
@@ -42,21 +42,26 @@
 %description
 This package contains plugins to use with Kipi, the KDE Image Plugin
 Interface.  Currently implemented plugins are:
- * AcquireImages      : Acquire images interface
- * BatchProcessImages : Batch process images: rename, convert, borders,
-                        filters, colors, effects, resize, recompress
- * RawConverter       : Raw image converter for digital cameras
- * FbExport           : Export images to a remote Facebook web service
- * FlickrExport       : Export images to a remote Flickr web service
- * HTMLExport         : Export images collections into HTML page
- * JpegLossLess       : process JPEG images without losing quality
- * MetadataEdit       : Edit EXIF and IPTC pictures metadata
- * PicasaWebExport    : Export pictures to Picasa web service
- * SendImages         : Send images by email
- * SimpleViewerExport : Export images to SimpleViewer
- * SlideShow          : Slideshow with effects
- * SmugExport         : SmugMug web service 
- * TimeAdjust         : Adjust image file Time and Date
+AcquireImages      : acquire images using flat scanner
+Calendar           : create calendars
+DngConverter       : convert Raw Image to Digital NeGative
+FlickrExport       : export images to a remote Flickr web service
+GalleryExport      : export images to a remote Gallery server
+GPSSync            : geolocalize pictures
+HTMLExport         : export images collections into a static XHTML page
+ImageViewer        : preview images using OpenGL
+JpegLossLess       : rotate/flip images without losing quality
+MetadataEdit       : edit EXIF, IPTC and XMP metadata
+PicasaWebExport    : export images to a remote Picasa web service
+RawConverter       : convert Raw Image to JPEG/PNG/TIFF
+RemoveRedEyes      : remove red eyes on image automatically
+SendImages         : send images by e-mail
+SimpleViewerExport : export images to Flash using SimpleViewer
+SlideShow          : slide images with 2D and 3D effects using OpenGL
+SmugExport         : export images to a remote SmugMug web service
+FbExport           : export images to a remote Facebook web service
+TimeAdjust         : adjust date and time
+PrintWizard        : print images in various format
 
 
 %prep
@@ -133,18 +138,22 @@
 %{_kde4_libdir}/kde4/kipiplugin_slideshow.so
 %{_kde4_libdir}/kde4/kipiplugin_smugexport.so
 %{_kde4_libdir}/kde4/kipiplugin_timeadjust.so
-%{_kde4_appsdir}/kipiplugin_galleryexport
-%{_kde4_appsdir}/kipiplugin_htmlexport
-%{_kde4_appsdir}/kipiplugin_imageviewer
-%{_kde4_appsdir}/kipiplugin_metadataedit  
-%{_kde4_appsdir}/kipiplugin_simpleviewerexport
-%{_kde4_appsdir}/kipiplugin_slideshow
+%{_kde4_appsdir}/kipiplugin_galleryexport/
+%{_kde4_appsdir}/kipiplugin_htmlexport/
+%{_kde4_appsdir}/kipiplugin_imageviewer/
+%{_kde4_appsdir}/kipiplugin_metadataedit/
+%{_kde4_appsdir}/kipiplugin_simpleviewerexport/
+%{_kde4_appsdir}/kipiplugin_slideshow/
 %{_kde4_datadir}/applications/kde4/dngconverter.desktop
 %{_kde4_datadir}/kde4/services/*.desktop
 %{_kde4_iconsdir}/hicolor/*/*/*
 
 
 %changelog
+* Wed Jan 21 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.2.0-0.12.beta6
+- update %%description
+- License: +Adobe (DNGConverter)
+
 * Mon Jan 05 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.2.0-0.11.beta6
 - kipi-plugins-0.2.0-beta6
 



From rdieter at fedoraproject.org  Wed Jan 21 19:57:21 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed, 21 Jan 2009 19:57:21 +0000 (UTC)
Subject: rpms/kdepim/F-10 bug_169166_fix.patch, NONE, 1.1 kdepim.spec, 1.200,
	1.201
Message-ID: <20090121195721.4BA6B7012F@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdepim/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21433

Modified Files:
	kdepim.spec 
Added Files:
	bug_169166_fix.patch 
Log Message:
* Wed Jan 21 2009 Rex Dieter <rdieter at fedoraproject.org. 4.1.4-2
- KMail would lose account settings (kde#169166)


bug_169166_fix.patch:

--- NEW FILE bug_169166_fix.patch ---
Index: accountmanager.h
===================================================================
--- accountmanager.h	(revision 914004)
+++ accountmanager.h	(revision 914005)
@@ -80,13 +80,6 @@
     KMAccount *find( const uint id ) const;
 
     /**
-      @return true if account with ID @p id is enabled. 
-      Accounts can be disabled by setting "enabled" flag to false 
-      in "Account #" groups of kmailrc.
-    */
-    bool isEnabled( const uint id ) const { return !mDisabledAccounts.contains(id); }
-
-    /**
       Physically remove account. Also deletes the given account object !
       Returns false and does nothing if the account cannot be removed.
     */
@@ -163,6 +156,12 @@
      */
     uint createId();
 
+    /**
+     * Return a list of config group names of all config groups that store
+     * receiving accounts.
+     */
+    QStringList accountGroups() const;
+
     AccountList   mAcctList;
     AccountList::Iterator mPtrListInterfaceProxyIterator;
     AccountList   mAcctChecking;
@@ -176,9 +175,6 @@
 
     // if a summary should be displayed
     bool mDisplaySummary;
-
-    // IDs of disabled accounts, used in AccountManager::writeConfig()
-    QSet<uint> mDisabledAccounts;
 };
 
 } // namespace KMail
Index: kmkernel.cpp
===================================================================
--- kmkernel.cpp	(revision 914004)
+++ kmkernel.cpp	(revision 914005)
@@ -1480,8 +1480,7 @@
   {
     KMFolderNode *node = *it;
     if (node->isDir() || ((acct = the_acctMgr->find(node->id()))
-                          && ( acct->type() == KAccount::Imap ))
-                      || !the_acctMgr->isEnabled( node->id() ))
+                          && ( acct->type() == KAccount::Imap )))
     {
       ++it;
     } else {
Index: accountmanager.cpp
===================================================================
--- accountmanager.cpp	(revision 914004)
+++ accountmanager.cpp	(revision 914005)
@@ -39,88 +39,68 @@
   qDeleteAll(mAcctList);
 }
 
+//-----------------------------------------------------------------------------
+QStringList AccountManager::accountGroups() const
+{
+  return KMKernel::config()->groupList().filter( QRegExp( "Account \\d+" ) );
+}
 
 //-----------------------------------------------------------------------------
 void AccountManager::writeConfig( bool withSync )
 {
   KConfig* config = KMKernel::config();
 
-  // Delete all accounts for groups in the config file not having 
-  // Enabled=false flag (accountGroups) 
-  // and replace them with account groups existing in memory (mAcctList)
-  uint accounts = 0;
-  QStringList accountGroups =
-    config->groupList().filter( QRegExp( "Account \\d+" ) );
-  AccountList::ConstIterator enabledAccountIt = mAcctList.constBegin();
-  for ( QStringList::ConstIterator it = accountGroups.constBegin() ;; ) {
-    QString groupName;
-    bool appendNewGroup = false;
-    if ( it == accountGroups.constEnd() ) {
-      if ( enabledAccountIt == mAcctList.constEnd() )
-        break;
-      appendNewGroup = true;
-      groupName.sprintf( "Account %d", accounts + 1 );
-    }
-    else {
-      groupName = *it;
-      ++it;
-    }
+  QStringList accountGroupsInConfig = accountGroups();
+  QStringList accountGroupsToKeep;
 
-    KConfigGroup group(config, groupName);
-    uint id = group.readEntry( "Id", 0 );
-    if ( mDisabledAccounts.contains( id ) )
-      accounts++; // do not modify disabled account - skip
-    else {
-      if ( appendNewGroup ) {
-        (*enabledAccountIt)->writeConfig( group );
-        ++enabledAccountIt;
-        accounts++;
-      }
-      else // no such account on the list - disabled / enabled
-        config->deleteGroup( groupName );
-    }
+  // Write all account config groups to the config file and remember
+  // the config group names
+  foreach( KMAccount *account, mAcctList ) {
+    uint accountId = account->id();
+    QString groupName = QString( "Account %1" ).arg( accountId );
+    accountGroupsToKeep += groupName;
+    KConfigGroup group( config, groupName );
+    account->writeConfig( group );
   }
 
-  KConfigGroup group(config, "General");
-  group.writeEntry("accounts", accounts);
+  // Now, delete all config groups with "Account" in them which don't
+  // belong to the accounts we just saved (these are deleted accounts, then
+  // NOTE: This has to be done _after_ writing out the accounts, otherwise
+  //       there is the risk of data loss, see bug 169166
+  foreach( const QString &groupName, accountGroupsInConfig ) {
+    if ( !accountGroupsToKeep.contains( groupName ) )
+      config->deleteGroup( groupName );
+  }
 
-  if (withSync) config->sync();
+  if ( withSync )
+    config->sync();
 }
 
 
 //-----------------------------------------------------------------------------
 void AccountManager::readConfig(void)
 {
-  KConfig* config = KMKernel::config();
-  KMAccount* acct;
-  QString acctName;
-  QString groupName;
-  int i, num;
-
+  // Delete all in-memory accounts
   for ( AccountList::Iterator it( mAcctList.begin() ), end( mAcctList.end() ); it != end; ++it )
       delete *it;
   mAcctList.clear();
 
-  KConfigGroup general(config, "General");
-  num = general.readEntry( "accounts", 0 );
-
-  for (i=1; i<=num; i++)
-  {
-    groupName.sprintf("Account %d", i);
-    KConfigGroup group(config, groupName);
+  // Now loop over all account groups and load the accounts in them
+  KConfig* config = KMKernel::config();
+  QStringList accountGroupNames = accountGroups();
+  int accountNum = 1;
+  foreach( const QString &accountGroupName, accountGroupNames ) {
+    KConfigGroup group( config, accountGroupName );
     uint id = group.readEntry( "Id", 0 );
-    if ( !group.readEntry("Enabled", true) ) {
-      mDisabledAccounts += id;
-      continue;
-    }
-
     KAccount::Type acctType = KAccount::typeForName( group.readEntry( "Type" ) );
-    acctName = group.readEntry("Name");
-    if (acctName.isEmpty()) acctName = i18n("Account %1", i);
-    acct = create(acctType, acctName, id);
-    if (!acct) continue;
-    add(acct);
-    acct->readConfig(group);
+    QString accountName = group.readEntry( "Name" );
+    if ( accountName.isEmpty() )
+      accountName = i18n( "Account %1", accountNum++ );
+    KMAccount *account = create( acctType, accountName, id );
+    if ( !account )
+      continue;
+    add( account );
+    account->readConfig( group );
   }
 }
 


Index: kdepim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdepim/F-10/kdepim.spec,v
retrieving revision 1.200
retrieving revision 1.201
diff -u -r1.200 -r1.201
--- kdepim.spec	9 Jan 2009 05:09:16 -0000	1.200
+++ kdepim.spec	21 Jan 2009 19:56:50 -0000	1.201
@@ -7,7 +7,7 @@
 Summary: PIM (Personal Information Manager) applications
 Epoch:   6
 Version: 4.1.4
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPLv2
 Group:   Applications/Productivity
@@ -16,6 +16,10 @@
 Patch0:  kdepim-4.1.2-kabcdistlistupdater.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+## upstream patches
+# http://websvn.kde.org/?view=rev&revision=914005
+Patch100: bug_169166_fix.patch
+
 Provides: kdepim4 = %{version}-%{release}
 
 Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}
@@ -93,6 +97,10 @@
 %patch0 -p1
 
 # upstream patches
+pushd kmail
+%patch100 -p0 -b .kde#169166
+popd
+
 
 %build
 
@@ -180,6 +188,9 @@
 
 
 %changelog
+* Wed Jan 21 2009 Rex Dieter <rdieter at fedoraproject.org. 4.1.4-2
+- KMail would lose account settings (kde#169166)
+
 * Fri Jan 09 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.4-1
 - 4.1.4
 - BR libical-devel



From nsantos at fedoraproject.org  Wed Jan 21 19:58:18 2009
From: nsantos at fedoraproject.org (Nuno Santos)
Date: Wed, 21 Jan 2009 19:58:18 +0000 (UTC)
Subject: rpms/qpidc/F-9 qpidc.spec,1.45,1.46
Message-ID: <20090121195818.338907012F@cvs1.fedora.phx.redhat.com>

Author: nsantos

Update of /cvs/extras/rpms/qpidc/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21845

Modified Files:
	qpidc.spec 
Log Message:
BZ474614 and BZ474613 - qpidc/rhm unowned directories


Index: qpidc.spec
===================================================================
RCS file: /cvs/extras/rpms/qpidc/F-9/qpidc.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- qpidc.spec	21 Jan 2009 15:49:47 -0000	1.45
+++ qpidc.spec	21 Jan 2009 19:57:47 -0000	1.46
@@ -7,7 +7,7 @@
 
 Name:           qpidc
 Version:        0.4.734452
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Libraries for Qpid C++ client applications
 Group:          System Environment/Libraries
 License:        ASL 2.0
@@ -238,8 +238,8 @@
 %_libdir/libqpidcommon.so.0.1.0
 %_libdir/libqpidclient.so.0
 %_libdir/libqpidclient.so.0.1.0
-%_libdir/qpid/client
-%_sysconfdir/qpid
+%dir %_libdir/qpid/client
+%dir %_sysconfdir/qpid
 %config(noreplace) %_sysconfdir/qpid/qpidc.conf
 
 %files devel
@@ -268,7 +268,7 @@
 %config(noreplace) %_sysconfdir/qpidd.conf
 %config(noreplace) %_sysconfdir/sasl2/qpidd.conf
 %{_initrddir}/qpidd
-%_libdir/qpid/daemon
+%dir %_libdir/qpid/daemon
 %attr(755, qpidd, qpidd) %_localstatedir/lib/qpidd
 %attr(755, qpidd, qpidd) %_libdir/qpidd
 %attr(755, qpidd, qpidd) /var/run/qpidd
@@ -372,7 +372,7 @@
 %postun -n qmf -p /sbin/ldconfig
 
 %changelog
-* Tue Jan 20 2009 Nuno Santos <nsantos at redhat.com> - 0.4.734452-2
+* Tue Jan 20 2009 Nuno Santos <nsantos at redhat.com> - 0.4.734452-3
 - BZ474614 and BZ474613 - qpidc/rhm unowned directories
 
 * Thu Jan 15 2009 Nuno Santos <nsantos at redhat.com> - 0.4.734452-1



From mmcgrath at fedoraproject.org  Wed Jan 21 19:58:58 2009
From: mmcgrath at fedoraproject.org (Mike McGrath)
Date: Wed, 21 Jan 2009 19:58:58 +0000 (UTC)
Subject: rpms/smolt/devel smolt.spec,1.59,1.60
Message-ID: <20090121195858.B85EB7012F@cvs1.fedora.phx.redhat.com>

Author: mmcgrath

Update of /cvs/pkgs/rpms/smolt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22071

Modified Files:
	smolt.spec 
Log Message:
Added os_detect to rpm


Index: smolt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/smolt/devel/smolt.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- smolt.spec	1 Dec 2008 15:00:42 -0000	1.59
+++ smolt.spec	21 Jan 2009 19:58:28 -0000	1.60
@@ -1,7 +1,7 @@
 Name: smolt
 Summary: Fedora hardware profiler
 Version: 1.2
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+
 Group: Applications/Internet
 URL: http://fedorahosted.org/smolt
@@ -80,6 +80,7 @@
 %{__cp} -adv smoon/* %{buildroot}/%{_datadir}/%{name}/smoon/
 %{__cp} -adv client/simplejson %{buildroot}/%{_datadir}/%{name}/client/
 %{__cp} client/scan.py %{buildroot}/%{_datadir}/%{name}/client/
+%{__cp} client/os_detect.py %{buildroot}/%{_datadir}/%{name}/client/
 %{__cp} client/fs_util.py %{buildroot}/%{_datadir}/%{name}/client/
 %{__cp} client/man/* %{buildroot}/%{_mandir}/man1/
 
@@ -175,6 +176,9 @@
 %{_bindir}/smoltGui
 
 %changelog
+* Wed Jan 21 2009 Mike McGrath <mmcgrath at redhat.com> - 1.2-3
+- Added os_detect.py as it is now required.
+
 * Mon Dec 01 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 1.2-2
 - Rebuild for Python 2.6
 



From dwalsh at fedoraproject.org  Wed Jan 21 20:39:48 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Wed, 21 Jan 2009 20:39:48 +0000 (UTC)
Subject: rpms/selinux-policy/devel modules-minimum.conf, 1.10,
	1.11 modules-mls.conf, 1.45, 1.46 modules-targeted.conf, 1.112,
	1.113 policy-20090105.patch, 1.15, 1.16 selinux-policy.spec,
	1.770, 1.771
Message-ID: <20090121203948.1F5277012F@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4779

Modified Files:
	modules-minimum.conf modules-mls.conf modules-targeted.conf 
	policy-20090105.patch selinux-policy.spec 
Log Message:
* Wed Jan 21 2009 Dan Walsh <dwalsh at redhat.com> 3.6.3-4
- Add wm policy



Index: modules-minimum.conf
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/modules-minimum.conf,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- modules-minimum.conf	19 Jan 2009 22:10:11 -0000	1.10
+++ modules-minimum.conf	21 Jan 2009 20:39:17 -0000	1.11
@@ -527,6 +527,13 @@
 # 
 polkit = module
 
+# Layer: services
+# Module: psad
+#
+# Analyze iptables log for hostile traffic
+# 
+psad = module
+
 # Layer: system
 # Module: hostname
 #


Index: modules-mls.conf
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/modules-mls.conf,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- modules-mls.conf	21 Jan 2009 16:17:40 -0000	1.45
+++ modules-mls.conf	21 Jan 2009 20:39:17 -0000	1.46
@@ -527,6 +527,13 @@
 # 
 polkit = module
 
+# Layer: services
+# Module: psad
+#
+# Analyze iptables log for hostile traffic
+# 
+psad = module
+
 # Layer: system
 # Module: hostname
 #
@@ -1329,13 +1336,6 @@
 # 
 wine = module
 
-# Layer: apps
-# Module: wm
-#
-# X windows window manager
-# 
-#wm = module
-
 # Layer: admin
 # Module: tzdata
 #
@@ -1767,3 +1767,11 @@
 # 
 # 
 milter = module
+
+# Layer: apps
+# Module: wm
+#
+# X windows window manager
+# 
+wm = module
+


Index: modules-targeted.conf
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/modules-targeted.conf,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -r1.112 -r1.113
--- modules-targeted.conf	19 Jan 2009 22:10:11 -0000	1.112
+++ modules-targeted.conf	21 Jan 2009 20:39:17 -0000	1.113
@@ -527,6 +527,13 @@
 # 
 polkit = module
 
+# Layer: services
+# Module: psad
+#
+# Analyze iptables log for hostile traffic
+# 
+psad = module
+
 # Layer: system
 # Module: hostname
 #

policy-20090105.patch:

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.15 -r 1.16 policy-20090105.patch
Index: policy-20090105.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-20090105.patch,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- policy-20090105.patch	21 Jan 2009 16:17:40 -0000	1.15
+++ policy-20090105.patch	21 Jan 2009 20:39:17 -0000	1.16
@@ -2194,7 +2194,7 @@
 +seutil_domtrans_setfiles_mac(livecd_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/mono.if serefpolicy-3.6.3/policy/modules/apps/mono.if
 --- nsaserefpolicy/policy/modules/apps/mono.if	2008-08-07 11:15:02.000000000 -0400
-+++ serefpolicy-3.6.3/policy/modules/apps/mono.if	2009-01-19 13:10:02.000000000 -0500
++++ serefpolicy-3.6.3/policy/modules/apps/mono.if	2009-01-21 12:26:56.000000000 -0500
 @@ -21,6 +21,103 @@
  
  ########################################
@@ -3933,8 +3933,8 @@
 +/usr/bin/metacity	--	gen_context(system_u:object_r:wm_exec_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/wm.if serefpolicy-3.6.3/policy/modules/apps/wm.if
 --- nsaserefpolicy/policy/modules/apps/wm.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.3/policy/modules/apps/wm.if	2009-01-19 13:10:02.000000000 -0500
-@@ -0,0 +1,19 @@
++++ serefpolicy-3.6.3/policy/modules/apps/wm.if	2009-01-21 14:33:42.000000000 -0500
+@@ -0,0 +1,108 @@
 +## <summary>Window Manager.</summary>
 +
 +########################################
@@ -3954,114 +3954,108 @@
 +
 +	can_exec($1, wm_exec_t)
 +')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/wm.te serefpolicy-3.6.3/policy/modules/apps/wm.te
---- nsaserefpolicy/policy/modules/apps/wm.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.3/policy/modules/apps/wm.te	2009-01-19 13:10:02.000000000 -0500
-@@ -0,0 +1,104 @@
-+policy_module(wm,0.0.4)
 +
-+########################################
-+#
-+# Declarations
++#######################################
++## <summary>
++##	The role template for the wm module.
++## </summary>
++## <desc>
++##	<p>
++##	This template creates a derived domains which are used
++##	for wm applications.
++##	</p>
++## </desc>
++## <param name="role_prefix">
++##	<summary>
++##	The prefix of the user domain (e.g., user
++##	is the prefix for user_t).
++##	</summary>
++## </param>
++## <param name="user_role">
++##	<summary>
++##	The role associated with the user domain.
++##	</summary>
++## </param>
++## <param name="user_domain">
++##	<summary>
++##	The type of the user domain.
++##	</summary>
++## </param>
 +#
++template(`wm_role_template',`
++	gen_require(`
++		type wm_exec_t;
++	')
 +
-+type wm_t;
-+type wm_exec_t;
-+domain_type(wm_t)
-+domain_entry_file(wm_t,wm_exec_t)
-+role user_r types wm_t;
-+
-+type wm_tmpfs_t;
-+
-+files_read_etc_files(wm_t)
-+
-+nscd_dontaudit_search_pid(wm_t)
-+
-+miscfiles_read_localization(wm_t)
-+
-+dev_read_urand(wm_t)
-+
-+files_list_tmp(wm_t)
++	type $1_wm_t;
++	domain_type($1_wm_t)
++	domain_entry_file($1_wm_t, wm_exec_t)
++	role $2 types $1_wm_t;
 +
-+allow wm_t proc_t:file { read getattr };
++	domtrans_pattern($3, wm_exec_t, $1_wm_t)
 +
-+allow wm_t info_xproperty_t:x_property { write create };
++	corecmd_bin_domtrans($1_wm_t, $1_t)
++	corecmd_shell_domtrans($1_wm_t, $1_t)
 +
-+allow wm_t self:process getsched;
-+allow wm_t self:x_drawable blend;
++	ifdef(`enable_mls',`
++		mls_file_read_all_levels($1_wm_t)
++		mls_file_write_all_levels($1_wm_t)
++		mls_xwin_read_all_levels($1_wm_t)
++		mls_xwin_write_all_levels($1_wm_t)
++		mls_fd_use_all_levels($1_wm_t)
++	')
 +
-+allow wm_t tmpfs_t:file { read write };
++	files_read_etc_files($1_wm_t)
++	files_read_usr_files($1_wm_t)
 +
-+allow wm_t usr_t:file { read getattr };
-+allow wm_t usr_t:lnk_file read;
++	miscfiles_read_fonts($1_wm_t)
++	miscfiles_read_localization($1_wm_t)
 +
-+allow wm_t user_tmp_t:dir { write search setattr remove_name getattr add_name };
-+allow wm_t user_tmp_t:sock_file { write create unlink };
++	optional_policy(`
++		gnome_read_config($1_wm_t)
++		gnome_read_gconf_config($1_wm_t)
++	')
 +
-+allow wm_t user_t:unix_stream_socket connectto;
-+allow wm_t self:fifo_file { write read };
++	auth_use_nsswitch($1_wm_t)
 +
++	kernel_read_system_state($1_wm_t)
 +
-+allow wm_t client_xevent_t:x_synthetic_event send;
-+allow wm_t focus_xevent_t:x_event receive;
-+allow wm_t input_xevent_t:x_event receive;
-+allow wm_t manage_xevent_t:x_event receive;
-+allow wm_t manage_xevent_t:x_synthetic_event { receive send };
-+allow wm_t property_xevent_t:x_event receive;
-+allow wm_t xproperty_t:x_property { read write destroy };
-+allow wm_t rootwindow_t:x_colormap { install uninstall use add_color remove_color read };
-+allow wm_t rootwindow_t:x_drawable { read write manage setattr get_property hide show receive set_property create send add_child remove_child getattr list_property blend list_child destroy override };
-+allow wm_t xproperty_t:x_property { write read };
-+allow wm_t xserver_t:x_device { force_cursor setfocus use setattr grab manage getattr freeze write };
-+allow wm_t xserver_t:x_resource { read write };
-+allow wm_t xserver_t:x_screen setattr;
-+allow wm_t xselection_t:x_selection setattr;
++	allow $1_wm_t self:fifo_file rw_fifo_file_perms;
++	allow $1_wm_t self:process getsched;
++	allow $1_wm_t self:shm create_shm_perms;
 +
-+allow wm_t :x_drawable { get_property setattr show receive manage send read getattr list_child set_property };
-+allow wm_t $2_t:x_resource { read write };
++	allow $1_wm_t $1_t:unix_stream_socket connectto;
 +
-+ifdef(`enable_mls',`
-+	mls_file_read_all_levels(wm_t)
-+	mls_file_write_all_levels(wm_t)
-+	mls_xwin_read_all_levels(wm_t)
-+	mls_xwin_write_all_levels(wm_t)
-+	mls_fd_use_all_levels(wm_t)
-+')
++	optional_policy(`
++		dbus_system_bus_client($1_wm_t)
++	')
 +
-+corecmd_exec_bin(wm_t)
-+can_exec(wm_t, { shell_exec_t })
-+domtrans_pattern(wm_t,bin_t,user_t)
++	userdom_unpriv_usertype($1, $1_wm_t)
 +
-+allow user_t wm_t:unix_stream_socket connectto;
-+allow user_t wm_t:x_drawable { receive get_property getattr list_child };
++	userdom_manage_home_role($1_r, $1_wm_t)
++	userdom_manage_tmpfs_role($1_r, $1_wm_t)
++	userdom_manage_tmp_role($1_r, $1_wm_t)
 +
-+allow user_t wm_t:process signal;
++	dev_read_urand($1_wm_t)
 +
-+optional_policy(`
-+	dbus_system_bus_client(wm_t)
-+	dbus_user_bus_client(user,wm_t)
++	optional_policy(`
++		xserver_role($1_r, $1_wm_t)
++		xserver_use_xdm($1_wm_t)
++	')
 +')
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/wm.te serefpolicy-3.6.3/policy/modules/apps/wm.te
+--- nsaserefpolicy/policy/modules/apps/wm.te	1969-12-31 19:00:00.000000000 -0500
++++ serefpolicy-3.6.3/policy/modules/apps/wm.te	2009-01-21 12:37:15.000000000 -0500
+@@ -0,0 +1,9 @@
++policy_module(wm,0.0.4)
 +
-+allow wm_t user_home_t:dir { search getattr };
-+allow wm_t user_xproperty_t:x_property { read write destroy };
-+allow wm_t default_t:dir search;
-+allow wm_t home_root_t:dir search;
-+allow wm_t user_home_dir_t:dir search;
[...1664 lines suppressed...]
  	kernel_sigchld_unlabeled($1_t)
@@ -27770,7 +28407,7 @@
  
  	corenet_tcp_bind_generic_port($1_t)
  	# allow setting up tunnels
-@@ -1106,8 +1175,6 @@
+@@ -1106,8 +1184,6 @@
  
  	dev_getattr_generic_blk_files($1_t)
  	dev_getattr_generic_chr_files($1_t)
@@ -27779,7 +28416,7 @@
  	# Allow MAKEDEV to work
  	dev_create_all_blk_files($1_t)
  	dev_create_all_chr_files($1_t)
-@@ -1162,20 +1229,6 @@
+@@ -1162,20 +1238,6 @@
  	# But presently necessary for installing the file_contexts file.
  	seutil_manage_bin_policy($1_t)
  
@@ -27800,7 +28437,7 @@
  	optional_policy(`
  		postgresql_unconfined($1_t)
  	')
-@@ -1221,6 +1274,7 @@
+@@ -1221,6 +1283,7 @@
  	dev_relabel_all_dev_nodes($1)
  
  	files_create_boot_flag($1)
@@ -27808,7 +28445,7 @@
  
  	# Necessary for managing /boot/efi
  	fs_manage_dos_files($1)
-@@ -1286,11 +1340,15 @@
+@@ -1286,11 +1349,15 @@
  interface(`userdom_user_home_content',`
  	gen_require(`
  		type user_home_t;
@@ -27824,7 +28461,7 @@
  ')
  
  ########################################
-@@ -1387,7 +1445,7 @@
+@@ -1387,7 +1454,7 @@
  
  ########################################
  ## <summary>
@@ -27833,7 +28470,7 @@
  ## </summary>
  ## <param name="domain">
  ##	<summary>
-@@ -1420,6 +1478,14 @@
+@@ -1420,6 +1487,14 @@
  
  	allow $1 user_home_dir_t:dir list_dir_perms;
  	files_search_home($1)
@@ -27848,7 +28485,7 @@
  ')
  
  ########################################
-@@ -1435,9 +1501,11 @@
+@@ -1435,9 +1510,11 @@
  interface(`userdom_dontaudit_list_user_home_dirs',`
  	gen_require(`
  		type user_home_dir_t;
@@ -27860,7 +28497,7 @@
  ')
  
  ########################################
-@@ -1494,6 +1562,25 @@
+@@ -1494,6 +1571,25 @@
  	allow $1 user_home_dir_t:dir relabelto;
  ')
  
@@ -27886,7 +28523,7 @@
  ########################################
  ## <summary>
  ##	Create directories in the home dir root with
-@@ -1547,9 +1634,9 @@
+@@ -1547,9 +1643,9 @@
  		type user_home_dir_t, user_home_t;
  	')
  
@@ -27898,7 +28535,7 @@
  ')
  
  ########################################
-@@ -1568,6 +1655,8 @@
+@@ -1568,6 +1664,8 @@
  	')
  
  	dontaudit $1 user_home_t:dir search_dir_perms;
@@ -27907,7 +28544,7 @@
  ')
  
  ########################################
-@@ -1643,6 +1732,7 @@
+@@ -1643,6 +1741,7 @@
  		type user_home_dir_t, user_home_t;
  	')
  
@@ -27915,7 +28552,7 @@
  	read_files_pattern($1, { user_home_dir_t user_home_t }, user_home_t)
  	files_search_home($1)
  ')
-@@ -1741,6 +1831,62 @@
+@@ -1741,6 +1840,62 @@
  
  ########################################
  ## <summary>
@@ -27978,7 +28615,7 @@
  ##	Execute user home files.
  ## </summary>
  ## <param name="domain">
-@@ -1757,14 +1903,6 @@
+@@ -1757,14 +1912,6 @@
  
  	files_search_home($1)
  	exec_files_pattern($1, { user_home_dir_t user_home_t }, user_home_t)
@@ -27993,7 +28630,7 @@
  ')
  
  ########################################
-@@ -1787,6 +1925,46 @@
+@@ -1787,6 +1934,46 @@
  
  ########################################
  ## <summary>
@@ -28040,7 +28677,44 @@
  ##	Create, read, write, and delete files
  ##	in a user home subdirectory.
  ## </summary>
-@@ -2819,6 +2997,24 @@
+@@ -1921,6 +2108,36 @@
+ 
+ ########################################
+ ## <summary>
++##	Create objects in the /root directory
++##	with an automatic type transition to
++##	a specified private type.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++## <param name="private_type">
++##	<summary>
++##	The type of the object to create.
++##	</summary>
++## </param>
++## <param name="object_class">
++##	<summary>
++##	The class of the object to be created.
++##	</summary>
++## </param>
++#
++interface(`userdom_admin_home_dir_filetrans',`
++	gen_require(`
++		type admin_home_t;
++	')
++
++	filetrans_pattern($1, admin_home_t, $2, $3)
++')
++
++########################################
++## <summary>
+ ##	Create objects in a user home directory
+ ##	with an automatic type transition to
+ ##	a specified private type.
+@@ -2819,6 +3036,24 @@
  
  ########################################
  ## <summary>
@@ -28065,7 +28739,7 @@
  ##	Do not audit attempts to use user ttys.
  ## </summary>
  ## <param name="domain">
-@@ -2851,6 +3047,7 @@
+@@ -2851,6 +3086,7 @@
  	')
  
  	read_files_pattern($1,userdomain,userdomain)
@@ -28073,7 +28747,7 @@
  	kernel_search_proc($1)
  ')
  
-@@ -2965,6 +3162,24 @@
+@@ -2965,6 +3201,24 @@
  
  ########################################
  ## <summary>
@@ -28098,7 +28772,7 @@
  ##	Send a dbus message to all user domains.
  ## </summary>
  ## <param name="domain">
-@@ -2981,3 +3196,264 @@
+@@ -2981,3 +3235,264 @@
  
  	allow $1 userdomain:dbus send_msg;
  ')


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.770
retrieving revision 1.771
diff -u -r1.770 -r1.771
--- selinux-policy.spec	21 Jan 2009 16:17:40 -0000	1.770
+++ selinux-policy.spec	21 Jan 2009 20:39:17 -0000	1.771
@@ -20,7 +20,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.6.3
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -445,6 +445,9 @@
 %endif
 
 %changelog
+* Wed Jan 21 2009 Dan Walsh <dwalsh at redhat.com> 3.6.3-4
+- Add wm policy
+
 * Tue Jan 20 2009 Dan Walsh <dwalsh at redhat.com> 3.6.3-3
 - Fixed for DeviceKit
 



From robert at fedoraproject.org  Wed Jan 21 20:51:49 2009
From: robert at fedoraproject.org (Robert Scheck)
Date: Wed, 21 Jan 2009 20:51:49 +0000 (UTC)
Subject: rpms/python-boto/EL-4 python-boto-1.0a-python23.patch, NONE,
	1.1 python-boto.spec, 1.5, 1.6 python-boto-0.9b-python23.patch,
	1.1, NONE
Message-ID: <20090121205149.CC0E37012F@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/pkgs/rpms/python-boto/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8565

Modified Files:
	python-boto.spec 
Added Files:
	python-boto-1.0a-python23.patch 
Removed Files:
	python-boto-0.9b-python23.patch 
Log Message:
* Wed Jan 21 2009 Robert Scheck <robert at fedoraproject.org> 1.0a-1.1
- Added patch from Matthew Farrellee to get S3 and EC2 working


python-boto-1.0a-python23.patch:

--- NEW FILE python-boto-1.0a-python23.patch ---
Patch by Robert Scheck <robert at fedoraproject.org> which makes boto >= 0.9b working
by using the older Python 2.3, that doesn't support the non-decorator syntax, which
is used at @staticmethod.

The huge patch of this patch was contributed by Matthew Farrellee <matt at redhat.com>
for boto >= 1.0a to get it actually work for S3 and EC2 on RHEL 4. He changed the
base64.b64encode to base64.encodestring(str).replace('\n','') and the sort args and
removed extra Content-Length header, a bug in httplib.HTTPConnection.

--- boto-0.9b/boto/mturk/connection.py			2007-06-04 23:19:27.000000000 +0200
+++ boto-0.9b/boto/mturk/connection.py.python23		2007-08-30 12:53:24.000000000 +0200
@@ -171,7 +171,6 @@
         else:
             raise EC2ResponseError(response.status, response.reason, body)
     
-    @staticmethod
     def get_keywords_as_string(keywords):
         """
         Returns a comma+space-separated string of keywords from either a list or a string
@@ -185,8 +184,8 @@
         else:
             raise TypeError("keywords argument must be a string or a list of strings; got a %s" % type(keywords))
         return final_keywords
+    get_keywords_as_string = staticmethod(get_keywords_as_string)
     
-    @staticmethod
     def get_price_as_price(reward):
         """
         Returns a Price data structure from either a float or a Price
@@ -196,3 +195,4 @@
         else:
             final_price = Price(reward)
         return final_price
+    get_price_as_price = staticmethod(get_price_as_price)
--- boto-1.0a/boto/connection.py			2008-12-04 23:35:22.923959413 -0600
+++ boto-1.0a/boto/connection.py.python23		2008-12-04 23:38:41.195926510 -0600
@@ -149,8 +149,11 @@
             headers = {}
         if metadata == None:
             metadata = {}
-        if not headers.has_key('Content-Length'):
-            headers['Content-Length'] = len(data)
+# This header is not needed for HMAC-SHA1 calculation and is added by
+# the HTTPConnection anyway, and in python2.3 a second
+# 'Content-Length' is added causing "400 Bad Request" responses.
+#       if not headers.has_key('Content-Length'):
+#           headers['Content-Length'] = len(data) 
         final_headers = boto.utils.merge_meta(headers, metadata);
         # add auth header
         self.add_aws_auth_header(final_headers, method, path)
@@ -205,13 +208,13 @@
         params['SignatureVersion'] = self.SignatureVersion
         params['Timestamp'] = time.strftime("%Y-%m-%dT%H:%M:%S", time.gmtime())
         keys = params.keys()
-        keys.sort(cmp = lambda x, y: cmp(x.lower(), y.lower()))
+        keys.sort(lambda x, y: cmp(x.lower(), y.lower()))
         qs = ''
         for key in keys:
             h.update(key)
             h.update(str(params[key]))
             qs += key + '=' + urllib.quote(str(params[key])) + '&'
-        signature = base64.b64encode(h.digest())
+        signature = base64.encodestring(h.digest()).replace('\n', '')
         qs = path + '?' + qs + 'Signature=' + urllib.quote(signature)
         
         if self.use_proxy:
--- boto-1.0a/boto/ec2/connection.py			2007-10-16 20:04:24.000000000 -0500
+++ boto-1.0a/boto/ec2/connection.py.python2		2008-12-04 23:38:41.186926414 -0600
@@ -170,7 +170,7 @@
                     l.append(group)
             self.build_list_params(params, l, 'SecurityGroup')
         if user_data:
-            params['UserData'] = base64.b64encode(user_data)
+            params['UserData'] = base64.encodestring(user_data).replace('\n', '')
         if addressing_type:
             params['AddressingType'] = addressing_type
         if instance_type:
--- boto-1.0a/boto/ec2/instance.py			2007-10-16 06:28:03.000000000 -0500
+++ boto-1.0a/boto/ec2/instance.py.python23		2008-12-04 23:38:41.186926414 -0600
@@ -180,6 +180,6 @@
         if name == 'instanceId':
             self.instance_id = value
         elif name == 'output':
-            self.output = base64.b64decode(value)
+            self.output = base64.decodestring(value)
         else:
             setattr(self, name, value)
--- boto-1.0a/boto/mturk/notification.py		2007-04-02 14:28:42.000000000 -0500
+++ boto-1.0a/boto/mturk/notification.py.python23	2008-12-04 23:38:41.188926754 -0600
@@ -75,7 +75,7 @@
         verification_input = NotificationMessage.SERVICE_NAME + NotificationMessage.OPERATION_NAME + self.timestamp
         h = hmac.new(key=secret_key, digestmod=sha)
         h.update(verification_input)
-        signature_calc = base64.b64encode(h.digest())
+        signature_calc = base64.encodestring(h.digest()).replace('\n', '')
         return self.signature == signature_calc
 
 class Event:
--- boto-1.0a/boto/sqs/message.py			2007-07-24 21:35:26.000000000 -0500
+++ boto-1.0a/boto/sqs/message.py.python23		2008-12-04 23:38:41.194925398 -0600
@@ -102,7 +102,7 @@
     def endElement(self, name, value, connection):
         if name == 'MessageBody':
             # Decode the message body returned from SQS using base64
-            self.set_body(base64.b64decode(value))
+            self.set_body(base64.decodestring(value))
         elif name == 'MessageId':
             self.id = value
         else:
@@ -114,7 +114,7 @@
         this private method used by queue.write needs to perform the
         encoding.
         """
-        return base64.b64encode(self.get_body())
+        return base64.encodestring(self.get_body()).replace('\n', '')
 
 class MHMessage(Message):
     """


Index: python-boto.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-boto/EL-4/python-boto.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- python-boto.spec	9 Feb 2008 22:08:36 -0000	1.5
+++ python-boto.spec	21 Jan 2009 20:51:19 -0000	1.6
@@ -4,12 +4,12 @@
 Summary:	A simple lightweight interface to Amazon Web Services
 Name:		python-boto
 Version:	1.0a
-Release:	1%{?dist}
+Release:	1%{?dist}.1
 License:	MIT
 Group:		Development/Languages
 URL:		http://code.google.com/p/%{pkgname}/
 Source:		http://boto.googlecode.com/files/%{pkgname}-%{version}.tar.gz
-Patch:		python-boto-0.9b-python23.patch
+Patch:		python-boto-1.0a-python23.patch
 %if 0%{?rhel} <= 4
 Requires:	python-abi = %(%{__python} -c "import sys; print sys.version[:3]")
 %endif
@@ -47,6 +47,9 @@
 %{python_sitelib}/*
 
 %changelog
+* Wed Jan 21 2009 Robert Scheck <robert at fedoraproject.org> 1.0a-1.1
+- Added patch from Matthew Farrellee to get S3 and EC2 working
+
 * Sat Feb 09 2008 Robert Scheck <robert at fedoraproject.org> 1.0a-1
 - Upgrade to 1.0a
 


--- python-boto-0.9b-python23.patch DELETED ---



From rjones at fedoraproject.org  Wed Jan 21 20:57:27 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Wed, 21 Jan 2009 20:57:27 +0000 (UTC)
Subject: rpms/ocaml-cil/devel ocaml-cil.spec,1.6,1.7
Message-ID: <20090121205727.37BB27012F@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/ocaml-cil/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10429

Modified Files:
	ocaml-cil.spec 
Log Message:
Fix prelink configuration file.


Index: ocaml-cil.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-cil/devel/ocaml-cil.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ocaml-cil.spec	5 Dec 2008 17:14:25 -0000	1.6
+++ ocaml-cil.spec	21 Jan 2009 20:56:56 -0000	1.7
@@ -6,7 +6,7 @@
 
 Name:           ocaml-cil
 Version:        1.3.6
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        CIL - Infrastructure for C Program Analysis and Transformation
 
 Group:          Development/Libraries
@@ -144,7 +144,7 @@
 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
+echo '-b /usr/libexec/cil' > $DESTDIR/etc/prelink.conf.d/ocaml-cil-cilly.conf
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -193,6 +193,9 @@
 
 
 %changelog
+* Wed Jan 21 2009 Richard W.M. Jones <rjones at redhat.com> - 1.3.6-10
+- Fix prelink configuration file.
+
 * Fri Dec  5 2008 Richard W.M. Jones <rjones at redhat.com> - 1.3.6-9
 - Patch to fix stricter -output-obj checks in OCaml 3.11.0.
 



From rjones at fedoraproject.org  Wed Jan 21 20:58:38 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Wed, 21 Jan 2009 20:58:38 +0000 (UTC)
Subject: rpms/ocaml-ocamlnet/devel ocaml-ocamlnet.spec,1.9,1.10
Message-ID: <20090121205838.E939A7012F@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/ocaml-ocamlnet/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10859

Modified Files:
	ocaml-ocamlnet.spec 
Log Message:
Fix prelink configuration file.


Index: ocaml-ocamlnet.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-ocamlnet/devel/ocaml-ocamlnet.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ocaml-ocamlnet.spec	4 Dec 2008 19:30:19 -0000	1.9
+++ ocaml-ocamlnet.spec	21 Jan 2009 20:58:08 -0000	1.10
@@ -6,7 +6,7 @@
 
 Name:           ocaml-ocamlnet
 Version:        2.2.9
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        Network protocols for OCaml
 
 Group:          Development/Libraries
@@ -161,7 +161,7 @@
 # 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' \
+echo -e '-b /usr/bin/netplex-admin\n-b /usr/bin/ocamlrpcgen' \
   > $RPM_BUILD_ROOT/etc/prelink.conf.d/ocaml-ocamlnet.conf
 
 
@@ -242,6 +242,9 @@
 
 
 %changelog
+* Wed Jan 21 2009 Richard W.M. Jones <rjones at redhat.com> - 2.2.9-10
+- Fix prelink configuration file.
+
 * Wed Nov 26 2008 Richard W.M. Jones <rjones at redhat.com> - 2.2.9-9
 - Rebuild for OCaml 3.11.0+rc1.
 



From nsantos at fedoraproject.org  Wed Jan 21 21:06:44 2009
From: nsantos at fedoraproject.org (Nuno Santos)
Date: Wed, 21 Jan 2009 21:06:44 +0000 (UTC)
Subject: rpms/qpidc/F-10 qpidc.spec,1.59,1.60
Message-ID: <20090121210644.D76057012F@cvs1.fedora.phx.redhat.com>

Author: nsantos

Update of /cvs/extras/rpms/qpidc/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14223

Modified Files:
	qpidc.spec 
Log Message:
BZ474614 and BZ474613 - qpidc/rhm unowned directories


Index: qpidc.spec
===================================================================
RCS file: /cvs/extras/rpms/qpidc/F-10/qpidc.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- qpidc.spec	21 Jan 2009 14:46:24 -0000	1.59
+++ qpidc.spec	21 Jan 2009 21:06:14 -0000	1.60
@@ -7,7 +7,7 @@
 
 Name:           qpidc
 Version:        0.4.734452
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Libraries for Qpid C++ client applications
 Group:          System Environment/Libraries
 License:        ASL 2.0
@@ -238,8 +238,8 @@
 %_libdir/libqpidcommon.so.0.1.0
 %_libdir/libqpidclient.so.0
 %_libdir/libqpidclient.so.0.1.0
-%_libdir/qpid/client
-%_sysconfdir/qpid
+%dir %_libdir/qpid/client
+%dir %_sysconfdir/qpid
 %config(noreplace) %_sysconfdir/qpid/qpidc.conf
 
 %files devel
@@ -268,7 +268,7 @@
 %config(noreplace) %_sysconfdir/qpidd.conf
 %config(noreplace) %_sysconfdir/sasl2/qpidd.conf
 %{_initrddir}/qpidd
-%_libdir/qpid/daemon
+%dir %_libdir/qpid/daemon
 %attr(755, qpidd, qpidd) %_localstatedir/lib/qpidd
 %attr(755, qpidd, qpidd) %_libdir/qpidd
 %attr(755, qpidd, qpidd) /var/run/qpidd
@@ -372,7 +372,7 @@
 %postun -n qmf -p /sbin/ldconfig
 
 %changelog
-* Tue Jan 20 2009 Nuno Santos <nsantos at redhat.com> - 0.4.734452-2
+* Tue Jan 20 2009 Nuno Santos <nsantos at redhat.com> - 0.4.734452-3
 - BZ474614 and BZ474613 - qpidc/rhm unowned directories
 
 * Thu Jan 15 2009 Nuno Santos <nsantos at redhat.com> - 0.4.734452-1



From linville at fedoraproject.org  Wed Jan 21 21:16:32 2009
From: linville at fedoraproject.org (John W. Linville)
Date: Wed, 21 Jan 2009 21:16:32 +0000 (UTC)
Subject: rpms/kernel/F-10 linux-2.6-rt2x00-asus-leds.patch, NONE,
	1.1 kernel.spec, 1.1225, 1.1226
Message-ID: <20090121211632.B704E7012F@cvs1.fedora.phx.redhat.com>

Author: linville

Update of /cvs/pkgs/rpms/kernel/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17353

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-rt2x00-asus-leds.patch 
Log Message:
rt2x00: back-port activity LED init patches

linux-2.6-rt2x00-asus-leds.patch:

--- NEW FILE linux-2.6-rt2x00-asus-leds.patch ---
Back-port of the following two patches from wireless-testing...

commit 5a2e156203294d61d7963877286b2763cbc02cf7
Author: Ivo van Doorn <ivdoorn at gmail.com>
Date:   Sat Jan 17 20:44:08 2009 +0100

    rt2x00: Add LED_MODE_ASUS support
    
    When the led mode is asus, the activity led mode must
    be registered otherwise the second LED will not be enabled.
    
    Signed-off-by: Ivo van Doorn <IvDoorn at gmail.com>
    Signed-off-by: John W. Linville <linville at tuxdriver.com>

commit a064405c724484f80eefdb6754e8f782144e1f91
Author: Andrew Price <andy at andrewprice.me.uk>
Date:   Sat Jan 10 19:38:05 2009 +0000

    rt2400,rt2500: init led_qual for LED_MODE_DEFAULT
    
    Add a check for LED_MODE_DEFAULT so that we use the link LED for rt2400
    and rt2500 devices.
    
    Signed-off-by: Andrew Price <andy at andrewprice.me.uk>
    Acked-by: Ivo van Doorn <IvDoorn at gmail.com>
    Signed-off-by: John W. Linville <linville at tuxdriver.com>

diff -up linux-2.6.28.noarch/drivers/net/wireless/rt2x00/rt2400pci.c.orig linux-2.6.28.noarch/drivers/net/wireless/rt2x00/rt2400pci.c
--- linux-2.6.28.noarch/drivers/net/wireless/rt2x00/rt2400pci.c.orig	2008-12-24 18:26:37.000000000 -0500
+++ linux-2.6.28.noarch/drivers/net/wireless/rt2x00/rt2400pci.c	2009-01-21 16:06:08.000000000 -0500
@@ -1378,7 +1378,9 @@ static int rt2400pci_init_eeprom(struct 
 	value = rt2x00_get_field16(eeprom, EEPROM_ANTENNA_LED_MODE);
 
 	rt2400pci_init_led(rt2x00dev, &rt2x00dev->led_radio, LED_TYPE_RADIO);
-	if (value == LED_MODE_TXRX_ACTIVITY)
+	if (value == LED_MODE_TXRX_ACTIVITY ||
+	    value == LED_MODE_DEFAULT ||
+	    value == LED_MODE_ASUS)
 		rt2400pci_init_led(rt2x00dev, &rt2x00dev->led_qual,
 				   LED_TYPE_ACTIVITY);
 #endif /* CONFIG_RT2X00_LIB_LEDS */
diff -up linux-2.6.28.noarch/drivers/net/wireless/rt2x00/rt2500usb.c.orig linux-2.6.28.noarch/drivers/net/wireless/rt2x00/rt2500usb.c
--- linux-2.6.28.noarch/drivers/net/wireless/rt2x00/rt2500usb.c.orig	2008-12-24 18:26:37.000000000 -0500
+++ linux-2.6.28.noarch/drivers/net/wireless/rt2x00/rt2500usb.c	2009-01-21 16:06:08.000000000 -0500
@@ -1477,7 +1477,9 @@ static int rt2500usb_init_eeprom(struct 
 	value = rt2x00_get_field16(eeprom, EEPROM_ANTENNA_LED_MODE);
 
 	rt2500usb_init_led(rt2x00dev, &rt2x00dev->led_radio, LED_TYPE_RADIO);
-	if (value == LED_MODE_TXRX_ACTIVITY)
+	if (value == LED_MODE_TXRX_ACTIVITY ||
+	    value == LED_MODE_DEFAULT ||
+	    value == LED_MODE_ASUS)
 		rt2500usb_init_led(rt2x00dev, &rt2x00dev->led_qual,
 				   LED_TYPE_ACTIVITY);
 #endif /* CONFIG_RT2X00_LIB_LEDS */
diff -up linux-2.6.28.noarch/drivers/net/wireless/rt2x00/rt2500pci.c.orig linux-2.6.28.noarch/drivers/net/wireless/rt2x00/rt2500pci.c
--- linux-2.6.28.noarch/drivers/net/wireless/rt2x00/rt2500pci.c.orig	2008-12-24 18:26:37.000000000 -0500
+++ linux-2.6.28.noarch/drivers/net/wireless/rt2x00/rt2500pci.c	2009-01-21 16:06:08.000000000 -0500
@@ -1537,7 +1537,9 @@ static int rt2500pci_init_eeprom(struct 
 	value = rt2x00_get_field16(eeprom, EEPROM_ANTENNA_LED_MODE);
 
 	rt2500pci_init_led(rt2x00dev, &rt2x00dev->led_radio, LED_TYPE_RADIO);
-	if (value == LED_MODE_TXRX_ACTIVITY)
+	if (value == LED_MODE_TXRX_ACTIVITY ||
+	    value == LED_MODE_DEFAULT ||
+	    value == LED_MODE_ASUS)
 		rt2500pci_init_led(rt2x00dev, &rt2x00dev->led_qual,
 				   LED_TYPE_ACTIVITY);
 #endif /* CONFIG_RT2X00_LIB_LEDS */


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/kernel.spec,v
retrieving revision 1.1225
retrieving revision 1.1226
diff -u -r1.1225 -r1.1226
--- kernel.spec	20 Jan 2009 17:35:59 -0000	1.1225
+++ kernel.spec	21 Jan 2009 21:16:02 -0000	1.1226
@@ -630,6 +630,7 @@
 
 Patch680: iwlwifi-intel-bug-1822.patch
 Patch681: linux-2.6-rtl8187b-tx-status-feedback.patch
+Patch682: linux-2.6-rt2x00-asus-leds.patch
 
 Patch690: linux-2.6-at76.patch
 
@@ -1158,6 +1159,9 @@
 # rtl8187: feedback transmitted packets using tx close descriptor for 8187B
 ApplyPatch linux-2.6-rtl8187b-tx-status-feedback.patch
 
+# rt2x00: back-port activity LED init patches
+ApplyPatch linux-2.6-rt2x00-asus-leds.patch
+
 # Add misc wireless bits from upstream wireless tree
 ApplyPatch linux-2.6-at76.patch
 
@@ -1783,6 +1787,9 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Wed Jan 21 2009 John W. Linville <linville at redhat.com> 2.6.28.1-19
+- rt2x00: back-port activity LED init patches
+
 * Tue Jan 20 2009 John W. Linville <linville at redhat.com> 2.6.28.1-18
 - rtl8187: feedback transmitted packets using tx close descriptor for 8187B
 



From dwalsh at fedoraproject.org  Wed Jan 21 21:22:11 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Wed, 21 Jan 2009 21:22:11 +0000 (UTC)
Subject: rpms/selinux-policy/devel policy-20090105.patch, 1.16,
	1.17 selinux-policy.spec, 1.771, 1.772
Message-ID: <20090121212211.CF01B7012F@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19272

Modified Files:
	policy-20090105.patch selinux-policy.spec 
Log Message:
* Wed Jan 21 2009 Dan Walsh <dwalsh at redhat.com> 3.6.3-5
- Add wm policy
- Make mls work in graphics mode


policy-20090105.patch:

Index: policy-20090105.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-20090105.patch,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- policy-20090105.patch	21 Jan 2009 20:39:17 -0000	1.16
+++ policy-20090105.patch	21 Jan 2009 21:22:11 -0000	1.17
@@ -22565,7 +22565,7 @@
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.te serefpolicy-3.6.3/policy/modules/services/xserver.te
 --- nsaserefpolicy/policy/modules/services/xserver.te	2009-01-19 11:06:49.000000000 -0500
-+++ serefpolicy-3.6.3/policy/modules/services/xserver.te	2009-01-21 14:02:11.000000000 -0500
++++ serefpolicy-3.6.3/policy/modules/services/xserver.te	2009-01-21 16:14:47.000000000 -0500
 @@ -34,6 +34,13 @@
  
  ## <desc>
@@ -23034,7 +23034,7 @@
  
  files_read_etc_files(xserver_t)
  files_read_etc_runtime_files(xserver_t)
-@@ -697,8 +817,12 @@
+@@ -697,8 +817,13 @@
  fs_search_nfs(xserver_t)
  fs_search_auto_mountpoints(xserver_t)
  fs_search_ramfs(xserver_t)
@@ -23043,11 +23043,12 @@
  
  mls_xwin_read_to_clearance(xserver_t)
 +mls_process_write_to_clearance(xserver_t)
-+mls_file_write_to_clearance(xserver_t)
++mls_file_read_to_clearance(xserver_t)
++mls_file_write_all_levels(xserver_t)
  
  selinux_validate_context(xserver_t)
  selinux_compute_access_vector(xserver_t)
-@@ -720,6 +844,7 @@
+@@ -720,6 +845,7 @@
  
  miscfiles_read_localization(xserver_t)
  miscfiles_read_fonts(xserver_t)
@@ -23055,7 +23056,7 @@
  
  modutils_domtrans_insmod(xserver_t)
  
-@@ -774,6 +899,10 @@
+@@ -774,6 +900,10 @@
  ')
  
  optional_policy(`
@@ -23066,7 +23067,7 @@
  	rhgb_getpgid(xserver_t)
  	rhgb_signal(xserver_t)
  ')
-@@ -806,7 +935,7 @@
+@@ -806,7 +936,7 @@
  allow xserver_t xdm_var_lib_t:file { getattr read };
  dontaudit xserver_t xdm_var_lib_t:dir search;
  
@@ -23075,7 +23076,7 @@
  
  # Label pid and temporary files with derived types.
  manage_files_pattern(xserver_t, xdm_tmp_t, xdm_tmp_t)
-@@ -830,6 +959,10 @@
+@@ -830,6 +960,10 @@
  
  xserver_use_user_fonts(xserver_t)
  
@@ -23086,7 +23087,7 @@
  tunable_policy(`use_nfs_home_dirs',`
  	fs_manage_nfs_dirs(xserver_t)
  	fs_manage_nfs_files(xserver_t)
-@@ -844,11 +977,14 @@
+@@ -844,11 +978,14 @@
  
  optional_policy(`
  	dbus_system_bus_client(xserver_t)
@@ -23102,7 +23103,7 @@
  ')
  
  optional_policy(`
-@@ -856,6 +992,11 @@
+@@ -856,6 +993,11 @@
  	rhgb_rw_tmpfs_files(xserver_t)
  ')
  
@@ -23114,7 +23115,7 @@
  ########################################
  #
  # Rules common to all X window domains
-@@ -972,6 +1113,37 @@
+@@ -972,6 +1114,37 @@
  allow xserver_unconfined_type { x_domain xserver_t }:x_resource *;
  allow xserver_unconfined_type xevent_type:{ x_event x_synthetic_event } *;
  
@@ -23152,7 +23153,7 @@
  ifdef(`TODO',`
  tunable_policy(`allow_polyinstantiation',`
  # xdm needs access for linking .X11-unix to poly /tmp
-@@ -986,3 +1158,13 @@
+@@ -986,3 +1159,13 @@
  #
  allow xdm_t user_home_type:file unlink;
  ') dnl end TODO
@@ -23783,7 +23784,7 @@
  #
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.if serefpolicy-3.6.3/policy/modules/system/init.if
 --- nsaserefpolicy/policy/modules/system/init.if	2009-01-05 15:39:43.000000000 -0500
-+++ serefpolicy-3.6.3/policy/modules/system/init.if	2009-01-20 14:42:59.000000000 -0500
++++ serefpolicy-3.6.3/policy/modules/system/init.if	2009-01-21 16:19:55.000000000 -0500
 @@ -280,6 +280,27 @@
  			kernel_dontaudit_use_fds($1)
  		')
@@ -23812,6 +23813,15 @@
  ')
  
  ########################################
+@@ -546,7 +567,7 @@
+ 
+ 		# upstart uses a datagram socket instead of initctl pipe
+ 		allow $1 self:unix_dgram_socket create_socket_perms;
+-		allow $1 init_t:unix_dgram_socket sendto;
++		init_chat($1)
+ 	')
+ ')
+ 
 @@ -619,18 +640,19 @@
  #
  interface(`init_spec_domtrans_script',`
@@ -27350,7 +27360,7 @@
 +/dev/shm/mono.*		gen_context(system_u:object_r:user_tmpfs_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-3.6.3/policy/modules/system/userdomain.if
 --- nsaserefpolicy/policy/modules/system/userdomain.if	2009-01-19 11:07:34.000000000 -0500
-+++ serefpolicy-3.6.3/policy/modules/system/userdomain.if	2009-01-21 15:37:07.000000000 -0500
++++ serefpolicy-3.6.3/policy/modules/system/userdomain.if	2009-01-21 16:19:30.000000000 -0500
 @@ -30,8 +30,9 @@
  	')
  


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.771
retrieving revision 1.772
diff -u -r1.771 -r1.772
--- selinux-policy.spec	21 Jan 2009 20:39:17 -0000	1.771
+++ selinux-policy.spec	21 Jan 2009 21:22:11 -0000	1.772
@@ -20,7 +20,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.6.3
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -445,8 +445,9 @@
 %endif
 
 %changelog
-* Wed Jan 21 2009 Dan Walsh <dwalsh at redhat.com> 3.6.3-4
+* Wed Jan 21 2009 Dan Walsh <dwalsh at redhat.com> 3.6.3-5
 - Add wm policy
+- Make mls work in graphics mode
 
 * Tue Jan 20 2009 Dan Walsh <dwalsh at redhat.com> 3.6.3-3
 - Fixed for DeviceKit



From verdurin at fedoraproject.org  Wed Jan 21 21:24:08 2009
From: verdurin at fedoraproject.org (Adam Huffman)
Date: Wed, 21 Jan 2009 21:24:08 +0000 (UTC)
Subject: rpms/gnomint/devel .cvsignore, 1.3, 1.4 gnomint.spec, 1.2,
	1.3 sources, 1.3, 1.4
Message-ID: <20090121212408.891567012F@cvs1.fedora.phx.redhat.com>

Author: verdurin

Update of /cvs/pkgs/rpms/gnomint/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19699

Modified Files:
	.cvsignore gnomint.spec sources 
Log Message:
Update to latest upstream with new command-line interface



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnomint/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	5 Dec 2008 18:59:20 -0000	1.3
+++ .cvsignore	21 Jan 2009 21:23:38 -0000	1.4
@@ -1 +1 @@
-gnomint-0.6.0.tar.gz
+gnomint-0.9.1.tar.gz


Index: gnomint.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnomint/devel/gnomint.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gnomint.spec	5 Dec 2008 18:59:20 -0000	1.2
+++ gnomint.spec	21 Jan 2009 21:23:38 -0000	1.3
@@ -1,5 +1,5 @@
 Name:		gnomint
-Version:	0.6.0
+Version:	0.9.1
 Release:	1%{?dist}
 Summary:	Graphical x509 Certification Authority management tool
 
@@ -17,6 +17,7 @@
 BuildRequires:	perl(XML::Parser)
 BuildRequires:	sqlite-devel >= 3
 BuildRequires:	intltool
+BuildRequires:	readline-devel
 
 Requires(pre):	GConf2
 Requires(post):	GConf2
@@ -82,6 +83,7 @@
 %doc README AUTHORS COPYING NEWS MAINTAINERS 
 %doc ChangeLog
 %{_bindir}/%{name}
+%{_bindir}/%{name}-cli
 %{_bindir}/%{name}-upgrade-db
 %dir %{_datadir}/%{name}
 %{_datadir}/%{name}/*.png
@@ -92,6 +94,10 @@
 %{_sysconfdir}/gconf/schemas/%{name}.schemas
 
 %changelog
+* Wed Jan 21 2009 Adam Huffman <bloch at verdurin.com> - 0.9.1-1
+- new upstream release including command-line interface
+- thanks to Seva Epsteyn for spec patch
+
 * Fri Nov 21 2008 Adam Huffman <bloch at verdurin.com> - 0.6.0-1
 - new upstream release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnomint/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	5 Dec 2008 18:59:20 -0000	1.3
+++ sources	21 Jan 2009 21:23:38 -0000	1.4
@@ -1 +1 @@
-dbb7c27d8edd2046e070015fae91b800  gnomint-0.6.0.tar.gz
+a8dd7536131c29a7c4d75f255d7e6b52  gnomint-0.9.1.tar.gz



From lennart at fedoraproject.org  Wed Jan 21 21:26:17 2009
From: lennart at fedoraproject.org (Lennart Poettering)
Date: Wed, 21 Jan 2009 21:26:17 +0000 (UTC)
Subject: rpms/libcanberra/devel .cvsignore, 1.9, 1.10 libcanberra.spec, 1.18,
	1.19 sources, 1.10,
	1.11 0001-Run-lc-l-s-in-Application-phase-of-gnome-session.patch,
	1.1, NONE
Message-ID: <20090121212617.AD3457012F@cvs1.fedora.phx.redhat.com>

Author: lennart

Update of /cvs/pkgs/rpms/libcanberra/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20762

Modified Files:
	.cvsignore libcanberra.spec sources 
Removed Files:
	0001-Run-lc-l-s-in-Application-phase-of-gnome-session.patch 
Log Message:
new release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libcanberra/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	6 Oct 2008 02:36:30 -0000	1.9
+++ .cvsignore	21 Jan 2009 21:25:47 -0000	1.10
@@ -1 +1 @@
-libcanberra-0.10.tar.gz
+libcanberra-0.11.tar.gz


Index: libcanberra.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libcanberra/devel/libcanberra.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- libcanberra.spec	14 Dec 2008 21:41:01 -0000	1.18
+++ libcanberra.spec	21 Jan 2009 21:25:47 -0000	1.19
@@ -1,6 +1,6 @@
 Name: libcanberra
-Version: 0.10
-Release: 4%{?dist}
+Version: 0.11
+Release: 5%{?dist}
 Summary: Portable Sound Event Library
 Group: System Environment/Libraries
 Source0: http://0pointer.de/lennart/projects/libcanberra/libcanberra-%{version}.tar.gz
@@ -18,7 +18,6 @@
 BuildRequires: GConf2-devel
 Requires: sound-theme-freedesktop
 Requires: pulseaudio-libs >= 0.9.11-1
-Patch1: 0001-Run-lc-l-s-in-Application-phase-of-gnome-session.patch
 
 %description
 A small and lightweight implementation of the XDG Sound Theme Specification
@@ -69,7 +68,6 @@
 
 %prep
 %setup -q
-%patch1 -p1 -b .0001-Run-lc-l-s-in-Application-phase-of-gnome-session
 
 %build
 %configure --disable-static --disable-rpath --enable-pulse --enable-alsa --enable-null --with-builtin=dso
@@ -88,13 +86,13 @@
 %defattr(-,root,root)
 %doc README LGPL
 %{_libdir}/libcanberra.so.*
-%dir %{_libdir}/libcanberra
-%{_libdir}/libcanberra/libcanberra-alsa.so
-%{_libdir}/libcanberra/libcanberra-pulse.so
-%{_libdir}/libcanberra/libcanberra-null.so
-%{_libdir}/libcanberra/libcanberra-multi.so
-%{_libdir}/libcanberra/libcanberra-oss.so
-%{_libdir}/libcanberra/libcanberra-gstreamer.so
+%dir %{_libdir}/libcanberra-%{version}
+%{_libdir}/libcanberra-%{version}/libcanberra-alsa.so
+%{_libdir}/libcanberra-%{version}/libcanberra-pulse.so
+%{_libdir}/libcanberra-%{version}/libcanberra-null.so
+%{_libdir}/libcanberra-%{version}/libcanberra-multi.so
+%{_libdir}/libcanberra-%{version}/libcanberra-oss.so
+%{_libdir}/libcanberra-%{version}/libcanberra-gstreamer.so
 
 %files gtk2
 %defattr(-,root,root)
@@ -116,6 +114,9 @@
 %{_libdir}/pkgconfig/libcanberra.pc
 
 %changelog
+* Wed Jan 21 2009 Lennart Poettering <lpoetter at redhat.com> 0.11-1
+- New version
+
 * Sun Dec 14 2008 Lennart Poettering <lpoetter at redhat.com> 0.10-4
 - Moved login sound to "Application" startup phase.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libcanberra/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	6 Oct 2008 02:36:30 -0000	1.10
+++ sources	21 Jan 2009 21:25:47 -0000	1.11
@@ -1 +1 @@
-2623370bfcecaeecaeb85e5ec445f340  libcanberra-0.10.tar.gz
+c661db14cb0b1fe9b6963defacc3bba6  libcanberra-0.11.tar.gz


--- 0001-Run-lc-l-s-in-Application-phase-of-gnome-session.patch DELETED ---



From katzj at fedoraproject.org  Wed Jan 21 21:26:28 2009
From: katzj at fedoraproject.org (Jeremy Katz)
Date: Wed, 21 Jan 2009 21:26:28 +0000 (UTC)
Subject: rpms/livecd-tools/F-10 livecd-tools.spec, 1.18, 1.19 sources, 1.18,
	1.19
Message-ID: <20090121212628.BBAD47012F@cvs1.fedora.phx.redhat.com>

Author: katzj

Update of /cvs/pkgs/rpms/livecd-tools/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20853

Modified Files:
	livecd-tools.spec sources 
Log Message:
sync to 021 from devel


Index: livecd-tools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/livecd-tools/F-10/livecd-tools.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- livecd-tools.spec	12 Nov 2008 22:01:13 -0000	1.18
+++ livecd-tools.spec	21 Jan 2009 21:25:58 -0000	1.19
@@ -4,7 +4,7 @@
 
 Summary: Tools for building live CD's
 Name: livecd-tools
-Version: 020
+Version: 021
 Release: 1%{?dist}
 License: GPLv2
 Group: System Environment/Base
@@ -21,6 +21,7 @@
 Requires: dosfstools >= 2.11-8
 Requires: isomd5sum
 Requires: rhpl
+Requires: python-urlgrabber
 %ifarch %{ix86} x86_64
 Requires: syslinux
 %endif
@@ -64,6 +65,21 @@
 %{python_sitelib}/imgcreate/*.pyc
 
 %changelog
+* Mon Jan 19 2009 Jeremy Katz <katzj at redhat.com> - 021-1
+- Start of support for hybrid GPT/MBR usb sticks (Stewart Adam)
+- Fix for udev deprecated syntax (#480109)
+- Keep cache with --cache (Jan Kratochvil, #479716)
+- Use absolute path to cachedir (#479716)
+- Support UDF for large ISO spins (Bruno Wolf, #476696)
+- Improvements for encrypted /home setup (mdomsch, #475399)
+- Don't allow spaces in labels (#475834)
+- Fix --tmpdir relative path (dhuff)
+- Support ext4 rootfs
+- Fix device command version check (apevec)
+- Allow URLs for specifying the kickstart config (bkearney)
+- Fix macro name for excludedocs (bkearney)
+- Fix up --base-on (#471656)
+
 * Wed Nov 12 2008 Jeremy Katz <katzj at redhat.com> - 020-1
 - Support setting up a swap file
 - Verify integer args in livecd-iso-to-disk (#467257)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/livecd-tools/F-10/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources	12 Nov 2008 22:01:13 -0000	1.18
+++ sources	21 Jan 2009 21:25:58 -0000	1.19
@@ -1 +1 @@
-007196b230f4c529b351d729918d1a4f  livecd-tools-020.tar.bz2
+92d8706282f51ab188c09d2bc4461532  livecd-tools-021.tar.bz2



From liquidat at fedoraproject.org  Wed Jan 21 21:27:05 2009
From: liquidat at fedoraproject.org (Roland Wolters)
Date: Wed, 21 Jan 2009 21:27:05 +0000 (UTC)
Subject: rpms/rsibreak/F-9 .cvsignore, 1.3, 1.4 rsibreak.spec, 1.8,
	1.9 sources, 1.3, 1.4
Message-ID: <20090121212705.7937C7012F@cvs1.fedora.phx.redhat.com>

Author: liquidat

Update of /cvs/extras/rpms/rsibreak/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21124

Modified Files:
	.cvsignore rsibreak.spec sources 
Log Message:
Update to KDE 4 version.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rsibreak/F-9/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	13 Oct 2006 21:45:32 -0000	1.3
+++ .cvsignore	21 Jan 2009 21:26:35 -0000	1.4
@@ -1 +1 @@
-Rsibreak-0.8.0.tar.bz2
+rsibreak-0.9.0.tar.bz2


Index: rsibreak.spec
===================================================================
RCS file: /cvs/extras/rpms/rsibreak/F-9/rsibreak.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- rsibreak.spec	22 Feb 2008 11:20:42 -0000	1.8
+++ rsibreak.spec	21 Jan 2009 21:26:35 -0000	1.9
@@ -1,16 +1,18 @@
-%define desktopvendor fedora
 
 Name:           rsibreak
-Version:        0.8.0
-Release:        5%{?dist}
+Version:        0.9.0
+Release:        3%{?dist}
 Summary:        A small utility which bothers you at certain intervals
 Group:          Amusements/Graphics
 License:        GPLv2+
 URL:            http://www.rsibreak.org
-Source0:        http://www.rsibreak.org/images/e/e0/Rsibreak-0.8.0.tar.bz2
+Source0:        http://rsibreak.org/files/rsibreak-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  kdelibs3-devel libXScrnSaver-devel desktop-file-utils gettext
+# note, build fails with kde >= 4.2, since plasma moved into kdelibs and
+# CMakeLists.txt macros/usage need updating
+BuildRequires:  kdelibs4-devel desktop-file-utils gettext
+BuildRequires:  plasma-devel
 
 %description
 RSIBreak is a small utility which bothers you at certain intervals. The
@@ -23,30 +25,31 @@
 %setup -q
 
 %build
-%configure	--disable-rpath
-make %{?_smp_mflags}
+mkdir -p %{_target_platform}
+pushd %{_target_platform}
+%{cmake_kde4} ..
+popd
+
+make %{?_smp_mflags} -C %{_target_platform}
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
-%find_lang %{name}
+%{__rm} -rf %{buildroot}
+make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
-/usr/bin/desktop-file-install --vendor=""                       \
-        --dir=${RPM_BUILD_ROOT}%{_datadir}/applications/kde     \
-        --add-category=X-Fedora                                 \
-        %{buildroot}%{_datadir}/applications/kde/rsibreak.desktop
+%find_lang %{name} --with-kde
+%find_lang plasma_applet_%{name}
+cat plasma_applet_%{name}.lang >> %{name}.lang
+
+# validate desktop file
+desktop-file-install --vendor ""                          \
+        --dir %{buildroot}%{_datadir}/applications/kde4   \
+        %{buildroot}%{_datadir}/applications/kde4/%{name}.desktop
 
 %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
+xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
 
 %postun
-touch --no-create %{_datadir}/icons/hicolor || :
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-fi
+xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -54,17 +57,31 @@
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING NEWS TODO
+# These could/should be updated to %%_kde4_* equivalents, 
+# see /etc/rpm/macros.kde4 -- Rex
 %{_bindir}/rsibreak
-%{_datadir}/applications/kde/rsibreak.desktop
-%{_datadir}/apps/rsibreak
 %{_datadir}/autostart/rsibreak.desktop
-%{_datadir}/icons/hicolor/128x128/apps/rsibreak.png
-%{_datadir}/icons/hicolor/16x16/apps/rsibreak.png
-%{_datadir}/icons/hicolor/22x22/apps/rsibreak.png
-%{_datadir}/icons/hicolor/32x32/apps/rsibreak.png
-%{_docdir}/HTML/*/rsibreak
+%{_datadir}/applications/kde4/rsibreak.desktop
+%{_datadir}/dbus-1/interfaces/org.rsibreak.rsiwidget.xml
+%{_datadir}/icons/hicolor/*/apps/rsibreak*.png
+%{_datadir}/icons/hicolor/*/actions/rsibreak*.png
+%{_datadir}/icons/hicolor/32x32/actions/duringbreaks.png                                                                                                                          
+%{_datadir}/icons/hicolor/32x32/actions/timings.png 
+%{_datadir}/kde4/apps/rsibreak/rsibreak.notifyrc
+%{_datadir}/kde4/apps/desktoptheme/default/widgets/rsibreak.svg 
+%{_datadir}/kde4/services/plasma-engine-rsibreak.desktop           
+%{_datadir}/kde4/services/plasma-applet-rsibreak.desktop           
+%{_libdir}/kde4/plasma_engine_rsibreak.so                         
+%{_libdir}/kde4/plasma_applet_rsibreak.so                         
 
 %changelog
+* Wed Jan 14 2009 Rex Dieter <rdieter at fedoraproject.org> 0.9.0-3
+- fix %%find_lang usage
+- BR: kdelibs4-devel plasma-devel
+
+* Fri Nov 28 2008 Roland Wolters <wolters.liste at gmx.net> 0.9.0-2
+- update to version 0.9 featuring a KDE 4 version
+
 * Fri Feb 22 2008 Roland Wolters <wolters.liste at gmx.net> 0.8.0-5
 - rebuild after dbug bug has been fixed in devel branch
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rsibreak/F-9/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	13 Oct 2006 21:45:32 -0000	1.3
+++ sources	21 Jan 2009 21:26:35 -0000	1.4
@@ -1 +1 @@
-62a62ff2f405461cfbf978484fb2d62c  Rsibreak-0.8.0.tar.bz2
+cf1e35c1b7d419559298a7fb5d1232be  rsibreak-0.9.0.tar.bz2



From pkgdb at fedoraproject.org  Wed Jan 21 21:28:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 21 Jan 2009 21:28:02 +0000
Subject: [pkgdb] bacula had acl change status
Message-ID: <20090121212802.F21E4208DDC@bastion.fedora.phx.redhat.com>

ixs has set the approveacls acl on bacula (Fedora EPEL 4) to Approved for fschwarz

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bacula



From pkgdb at fedoraproject.org  Wed Jan 21 21:28:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 21 Jan 2009 21:28:04 +0000
Subject: [pkgdb] bacula had acl change status
Message-ID: <20090121212805.08A91208DE1@bastion.fedora.phx.redhat.com>

ixs has set the approveacls acl on bacula (Fedora EPEL 5) to Approved for fschwarz

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bacula



From lennart at fedoraproject.org  Wed Jan 21 21:32:12 2009
From: lennart at fedoraproject.org (Lennart Poettering)
Date: Wed, 21 Jan 2009 21:32:12 +0000 (UTC)
Subject: rpms/libcanberra/devel libcanberra.spec,1.19,1.20
Message-ID: <20090121213212.434277012F@cvs1.fedora.phx.redhat.com>

Author: lennart

Update of /cvs/pkgs/rpms/libcanberra/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22812

Modified Files:
	libcanberra.spec 
Log Message:
i accidentaly forgot to reset the release back to 1, but now its already tagged, so lets go ahaead with it


Index: libcanberra.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libcanberra/devel/libcanberra.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- libcanberra.spec	21 Jan 2009 21:25:47 -0000	1.19
+++ libcanberra.spec	21 Jan 2009 21:31:41 -0000	1.20
@@ -114,7 +114,7 @@
 %{_libdir}/pkgconfig/libcanberra.pc
 
 %changelog
-* Wed Jan 21 2009 Lennart Poettering <lpoetter at redhat.com> 0.11-1
+* Wed Jan 21 2009 Lennart Poettering <lpoetter at redhat.com> 0.11-5
 - New version
 
 * Sun Dec 14 2008 Lennart Poettering <lpoetter at redhat.com> 0.10-4



From liquidat at fedoraproject.org  Wed Jan 21 21:33:18 2009
From: liquidat at fedoraproject.org (Roland Wolters)
Date: Wed, 21 Jan 2009 21:33:18 +0000 (UTC)
Subject: rpms/rsibreak/F-9 rsibreak.spec,1.9,1.10
Message-ID: <20090121213318.A6B4D7012F@cvs1.fedora.phx.redhat.com>

Author: liquidat

Update of /cvs/extras/rpms/rsibreak/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22985

Modified Files:
	rsibreak.spec 
Log Message:
Tagging problem.


Index: rsibreak.spec
===================================================================
RCS file: /cvs/extras/rpms/rsibreak/F-9/rsibreak.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- rsibreak.spec	21 Jan 2009 21:26:35 -0000	1.9
+++ rsibreak.spec	21 Jan 2009 21:32:48 -0000	1.10
@@ -1,7 +1,7 @@
 
 Name:           rsibreak
 Version:        0.9.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        A small utility which bothers you at certain intervals
 Group:          Amusements/Graphics
 License:        GPLv2+



From linville at fedoraproject.org  Wed Jan 21 21:33:31 2009
From: linville at fedoraproject.org (John W. Linville)
Date: Wed, 21 Jan 2009 21:33:31 +0000 (UTC)
Subject: rpms/kernel/devel linux-2.6-rt2x00-asus-leds.patch, NONE,
	1.1 kernel.spec, 1.1223, 1.1224
Message-ID: <20090121213331.E40727012F@cvs1.fedora.phx.redhat.com>

Author: linville

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23023

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-rt2x00-asus-leds.patch 
Log Message:
rt2x00: back-port activity LED init patches

linux-2.6-rt2x00-asus-leds.patch:

--- NEW FILE linux-2.6-rt2x00-asus-leds.patch ---
Back-port of the following two patches from wireless-testing...

commit 5a2e156203294d61d7963877286b2763cbc02cf7
Author: Ivo van Doorn <ivdoorn at gmail.com>
Date:   Sat Jan 17 20:44:08 2009 +0100

    rt2x00: Add LED_MODE_ASUS support
    
    When the led mode is asus, the activity led mode must
    be registered otherwise the second LED will not be enabled.
    
    Signed-off-by: Ivo van Doorn <IvDoorn at gmail.com>
    Signed-off-by: John W. Linville <linville at tuxdriver.com>

commit a064405c724484f80eefdb6754e8f782144e1f91
Author: Andrew Price <andy at andrewprice.me.uk>
Date:   Sat Jan 10 19:38:05 2009 +0000

    rt2400,rt2500: init led_qual for LED_MODE_DEFAULT
    
    Add a check for LED_MODE_DEFAULT so that we use the link LED for rt2400
    and rt2500 devices.
    
    Signed-off-by: Andrew Price <andy at andrewprice.me.uk>
    Acked-by: Ivo van Doorn <IvDoorn at gmail.com>
    Signed-off-by: John W. Linville <linville at tuxdriver.com>

diff -up linux-2.6.28.noarch/drivers/net/wireless/rt2x00/rt2400pci.c.orig linux-2.6.28.noarch/drivers/net/wireless/rt2x00/rt2400pci.c
--- linux-2.6.28.noarch/drivers/net/wireless/rt2x00/rt2400pci.c.orig	2008-12-24 18:26:37.000000000 -0500
+++ linux-2.6.28.noarch/drivers/net/wireless/rt2x00/rt2400pci.c	2009-01-21 16:06:08.000000000 -0500
@@ -1378,7 +1378,9 @@ static int rt2400pci_init_eeprom(struct 
 	value = rt2x00_get_field16(eeprom, EEPROM_ANTENNA_LED_MODE);
 
 	rt2400pci_init_led(rt2x00dev, &rt2x00dev->led_radio, LED_TYPE_RADIO);
-	if (value == LED_MODE_TXRX_ACTIVITY)
+	if (value == LED_MODE_TXRX_ACTIVITY ||
+	    value == LED_MODE_DEFAULT ||
+	    value == LED_MODE_ASUS)
 		rt2400pci_init_led(rt2x00dev, &rt2x00dev->led_qual,
 				   LED_TYPE_ACTIVITY);
 #endif /* CONFIG_RT2X00_LIB_LEDS */
diff -up linux-2.6.28.noarch/drivers/net/wireless/rt2x00/rt2500usb.c.orig linux-2.6.28.noarch/drivers/net/wireless/rt2x00/rt2500usb.c
--- linux-2.6.28.noarch/drivers/net/wireless/rt2x00/rt2500usb.c.orig	2008-12-24 18:26:37.000000000 -0500
+++ linux-2.6.28.noarch/drivers/net/wireless/rt2x00/rt2500usb.c	2009-01-21 16:06:08.000000000 -0500
@@ -1477,7 +1477,9 @@ static int rt2500usb_init_eeprom(struct 
 	value = rt2x00_get_field16(eeprom, EEPROM_ANTENNA_LED_MODE);
 
 	rt2500usb_init_led(rt2x00dev, &rt2x00dev->led_radio, LED_TYPE_RADIO);
-	if (value == LED_MODE_TXRX_ACTIVITY)
+	if (value == LED_MODE_TXRX_ACTIVITY ||
+	    value == LED_MODE_DEFAULT ||
+	    value == LED_MODE_ASUS)
 		rt2500usb_init_led(rt2x00dev, &rt2x00dev->led_qual,
 				   LED_TYPE_ACTIVITY);
 #endif /* CONFIG_RT2X00_LIB_LEDS */
diff -up linux-2.6.28.noarch/drivers/net/wireless/rt2x00/rt2500pci.c.orig linux-2.6.28.noarch/drivers/net/wireless/rt2x00/rt2500pci.c
--- linux-2.6.28.noarch/drivers/net/wireless/rt2x00/rt2500pci.c.orig	2008-12-24 18:26:37.000000000 -0500
+++ linux-2.6.28.noarch/drivers/net/wireless/rt2x00/rt2500pci.c	2009-01-21 16:06:08.000000000 -0500
@@ -1537,7 +1537,9 @@ static int rt2500pci_init_eeprom(struct 
 	value = rt2x00_get_field16(eeprom, EEPROM_ANTENNA_LED_MODE);
 
 	rt2500pci_init_led(rt2x00dev, &rt2x00dev->led_radio, LED_TYPE_RADIO);
-	if (value == LED_MODE_TXRX_ACTIVITY)
+	if (value == LED_MODE_TXRX_ACTIVITY ||
+	    value == LED_MODE_DEFAULT ||
+	    value == LED_MODE_ASUS)
 		rt2500pci_init_led(rt2x00dev, &rt2x00dev->led_qual,
 				   LED_TYPE_ACTIVITY);
 #endif /* CONFIG_RT2X00_LIB_LEDS */


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1223
retrieving revision 1.1224
diff -u -r1.1223 -r1.1224
--- kernel.spec	19 Jan 2009 06:23:28 -0000	1.1223
+++ kernel.spec	21 Jan 2009 21:33:01 -0000	1.1224
@@ -623,6 +623,8 @@
 
 Patch670: linux-2.6-ata-quirk.patch
 
+Patch680: linux-2.6-rt2x00-asus-leds.patch
+
 Patch690: linux-2.6-at76.patch
 
 # webcam fixes
@@ -1118,6 +1120,9 @@
 # ia64 ata quirk
 ApplyPatch linux-2.6-ata-quirk.patch
 
+# rt2x00: back-port activity LED init patches
+ApplyPatch linux-2.6-rt2x00-asus-leds.patch
+
 # Add misc wireless bits from upstream wireless tree
 ApplyPatch linux-2.6-at76.patch
 
@@ -1735,6 +1740,9 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Wed Jan 21 2009 John W. Linville <linville at redhat.com>
+- rt2x00: back-port activity LED init patches
+
 * Mon Jan 19 2009 Kyle McMartin <kyle at redhat.com>
 - execshield fixes: should no longer generate spurious handled GPFs,
   fixes randomization of executables. also some clean ups.



From liquidat at fedoraproject.org  Wed Jan 21 21:35:19 2009
From: liquidat at fedoraproject.org (Roland Wolters)
Date: Wed, 21 Jan 2009 21:35:19 +0000 (UTC)
Subject: rpms/rsibreak/devel .cvsignore, 1.3, 1.4 rsibreak.spec, 1.8,
	1.9 sources, 1.3, 1.4
Message-ID: <20090121213519.D814E7012F@cvs1.fedora.phx.redhat.com>

Author: liquidat

Update of /cvs/extras/rpms/rsibreak/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23264

Modified Files:
	.cvsignore rsibreak.spec sources 
Log Message:
Update to new KDE 4 version.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rsibreak/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	13 Oct 2006 21:45:32 -0000	1.3
+++ .cvsignore	21 Jan 2009 21:34:49 -0000	1.4
@@ -1 +1 @@
-Rsibreak-0.8.0.tar.bz2
+rsibreak-0.9.0.tar.bz2


Index: rsibreak.spec
===================================================================
RCS file: /cvs/extras/rpms/rsibreak/devel/rsibreak.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- rsibreak.spec	22 Feb 2008 11:20:42 -0000	1.8
+++ rsibreak.spec	21 Jan 2009 21:34:49 -0000	1.9
@@ -1,16 +1,18 @@
-%define desktopvendor fedora
 
 Name:           rsibreak
-Version:        0.8.0
-Release:        5%{?dist}
+Version:        0.9.0
+Release:        3%{?dist}
 Summary:        A small utility which bothers you at certain intervals
 Group:          Amusements/Graphics
 License:        GPLv2+
 URL:            http://www.rsibreak.org
-Source0:        http://www.rsibreak.org/images/e/e0/Rsibreak-0.8.0.tar.bz2
+Source0:        http://rsibreak.org/files/rsibreak-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  kdelibs3-devel libXScrnSaver-devel desktop-file-utils gettext
+# note, build fails with kde >= 4.2, since plasma moved into kdelibs and
+# CMakeLists.txt macros/usage need updating
+BuildRequires:  kdelibs4-devel desktop-file-utils gettext
+BuildRequires:  plasma-devel
 
 %description
 RSIBreak is a small utility which bothers you at certain intervals. The
@@ -23,30 +25,31 @@
 %setup -q
 
 %build
-%configure	--disable-rpath
-make %{?_smp_mflags}
+mkdir -p %{_target_platform}
+pushd %{_target_platform}
+%{cmake_kde4} ..
+popd
+
+make %{?_smp_mflags} -C %{_target_platform}
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
-%find_lang %{name}
+%{__rm} -rf %{buildroot}
+make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
-/usr/bin/desktop-file-install --vendor=""                       \
-        --dir=${RPM_BUILD_ROOT}%{_datadir}/applications/kde     \
-        --add-category=X-Fedora                                 \
-        %{buildroot}%{_datadir}/applications/kde/rsibreak.desktop
+%find_lang %{name} --with-kde
+%find_lang plasma_applet_%{name}
+cat plasma_applet_%{name}.lang >> %{name}.lang
+
+# validate desktop file
+desktop-file-install --vendor ""                          \
+        --dir %{buildroot}%{_datadir}/applications/kde4   \
+        %{buildroot}%{_datadir}/applications/kde4/%{name}.desktop
 
 %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
+xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
 
 %postun
-touch --no-create %{_datadir}/icons/hicolor || :
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-fi
+xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -54,17 +57,31 @@
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING NEWS TODO
+# These could/should be updated to %%_kde4_* equivalents, 
+# see /etc/rpm/macros.kde4 -- Rex
 %{_bindir}/rsibreak
-%{_datadir}/applications/kde/rsibreak.desktop
-%{_datadir}/apps/rsibreak
 %{_datadir}/autostart/rsibreak.desktop
-%{_datadir}/icons/hicolor/128x128/apps/rsibreak.png
-%{_datadir}/icons/hicolor/16x16/apps/rsibreak.png
-%{_datadir}/icons/hicolor/22x22/apps/rsibreak.png
-%{_datadir}/icons/hicolor/32x32/apps/rsibreak.png
-%{_docdir}/HTML/*/rsibreak
+%{_datadir}/applications/kde4/rsibreak.desktop
+%{_datadir}/dbus-1/interfaces/org.rsibreak.rsiwidget.xml
+%{_datadir}/icons/hicolor/*/apps/rsibreak*.png
+%{_datadir}/icons/hicolor/*/actions/rsibreak*.png
+%{_datadir}/icons/hicolor/32x32/actions/duringbreaks.png                                                                                                                          
+%{_datadir}/icons/hicolor/32x32/actions/timings.png 
+%{_datadir}/kde4/apps/rsibreak/rsibreak.notifyrc
+%{_datadir}/kde4/apps/desktoptheme/default/widgets/rsibreak.svg 
+%{_datadir}/kde4/services/plasma-engine-rsibreak.desktop           
+%{_datadir}/kde4/services/plasma-applet-rsibreak.desktop           
+%{_libdir}/kde4/plasma_engine_rsibreak.so                         
+%{_libdir}/kde4/plasma_applet_rsibreak.so                         
 
 %changelog
+* Wed Jan 14 2009 Rex Dieter <rdieter at fedoraproject.org> 0.9.0-3
+- fix %%find_lang usage
+- BR: kdelibs4-devel plasma-devel
+
+* Fri Nov 28 2008 Roland Wolters <wolters.liste at gmx.net> 0.9.0-2
+- update to version 0.9 featuring a KDE 4 version
+
 * Fri Feb 22 2008 Roland Wolters <wolters.liste at gmx.net> 0.8.0-5
 - rebuild after dbug bug has been fixed in devel branch
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rsibreak/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	13 Oct 2006 21:45:32 -0000	1.3
+++ sources	21 Jan 2009 21:34:49 -0000	1.4
@@ -1 +1 @@
-62a62ff2f405461cfbf978484fb2d62c  Rsibreak-0.8.0.tar.bz2
+cf1e35c1b7d419559298a7fb5d1232be  rsibreak-0.9.0.tar.bz2



From verdurin at fedoraproject.org  Wed Jan 21 21:40:46 2009
From: verdurin at fedoraproject.org (Adam Huffman)
Date: Wed, 21 Jan 2009 21:40:46 +0000 (UTC)
Subject: rpms/gnomint/F-10 .cvsignore, 1.3, 1.4 gnomint.spec, 1.2,
	1.3 sources, 1.3, 1.4
Message-ID: <20090121214046.D8ADF7012F@cvs1.fedora.phx.redhat.com>

Author: verdurin

Update of /cvs/pkgs/rpms/gnomint/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24748

Modified Files:
	.cvsignore gnomint.spec sources 
Log Message:
Update to latest upstream with command-line interface


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnomint/F-10/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	5 Dec 2008 19:01:41 -0000	1.3
+++ .cvsignore	21 Jan 2009 21:40:16 -0000	1.4
@@ -1 +1 @@
-gnomint-0.6.0.tar.gz
+gnomint-0.9.1.tar.gz


Index: gnomint.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnomint/F-10/gnomint.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gnomint.spec	5 Dec 2008 19:01:41 -0000	1.2
+++ gnomint.spec	21 Jan 2009 21:40:16 -0000	1.3
@@ -1,5 +1,5 @@
 Name:		gnomint
-Version:	0.6.0
+Version:	0.9.1
 Release:	1%{?dist}
 Summary:	Graphical x509 Certification Authority management tool
 
@@ -17,6 +17,7 @@
 BuildRequires:	perl(XML::Parser)
 BuildRequires:	sqlite-devel >= 3
 BuildRequires:	intltool
+BuildRequires:	readline-devel
 
 Requires(pre):	GConf2
 Requires(post):	GConf2
@@ -82,6 +83,7 @@
 %doc README AUTHORS COPYING NEWS MAINTAINERS 
 %doc ChangeLog
 %{_bindir}/%{name}
+%{_bindir}/%{name}-cli
 %{_bindir}/%{name}-upgrade-db
 %dir %{_datadir}/%{name}
 %{_datadir}/%{name}/*.png
@@ -92,6 +94,10 @@
 %{_sysconfdir}/gconf/schemas/%{name}.schemas
 
 %changelog
+* Wed Jan 21 2009 Adam Huffman <bloch at verdurin.com> - 0.9.1-1
+- new upstream release including command-line interface
+- thanks to Seva Epsteyn for spec patch
+
 * Fri Nov 21 2008 Adam Huffman <bloch at verdurin.com> - 0.6.0-1
 - new upstream release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnomint/F-10/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	5 Dec 2008 19:01:41 -0000	1.3
+++ sources	21 Jan 2009 21:40:16 -0000	1.4
@@ -1 +1 @@
-dbb7c27d8edd2046e070015fae91b800  gnomint-0.6.0.tar.gz
+a8dd7536131c29a7c4d75f255d7e6b52  gnomint-0.9.1.tar.gz



From rdieter at fedoraproject.org  Wed Jan 21 21:44:03 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed, 21 Jan 2009 21:44:03 +0000 (UTC)
Subject: rpms/k3b/devel k3b.spec,1.66,1.67
Message-ID: <20090121214403.DFD687012F@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/k3b/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25396

Modified Files:
	k3b.spec 
Log Message:
* Wed Jan 21 2009 Rex Dieter <rdieter at fedoraproject.org> - 0:1.0.5-7
- Summary: omit "for KDE"
- add rhel portability to .spec



Index: k3b.spec
===================================================================
RCS file: /cvs/pkgs/rpms/k3b/devel/k3b.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- k3b.spec	1 Oct 2008 17:07:15 -0000	1.66
+++ k3b.spec	21 Jan 2009 21:43:33 -0000	1.67
@@ -4,9 +4,17 @@
 %define _with_hal --with-hal
 %endif
 
+%if 0%{?fedora} > 6
+%define kdelibs3 kdelibs3
+%else
+%define kdelibs3 kdelibs
+BuildRequires: libutempter-devel
+%endif
+
 # include -devel subpkg or not? 1=yes
 %define devel 1
 
+
 %if 0%{?fedora} > 9
 # -libs subpkg
 %define libs 1
@@ -16,10 +24,10 @@
 %define i18n 1
 
 Name:    k3b
-Summary: CD/DVD burning application for KDE
+Summary: CD/DVD burning application
 Epoch:   0
 Version: 1.0.5
-Release: 6%{?dist}
+Release: 7%{?dist}
 
 Group:   Applications/Archiving
 License: GPLv2+
@@ -45,7 +53,7 @@
 # upstreamed 2008-08-27
 Patch105: k3b-1.0.5-hidden.patch
 
-BuildRequires: kdelibs3-devel 
+BuildRequires: %{kdelibs3}-devel
 BuildRequires: desktop-file-utils
 BuildRequires: alsa-lib-devel
 BuildRequires: audiofile-devel
@@ -271,6 +279,10 @@
 
 
 %changelog
+* Wed Jan 21 2009 Rex Dieter <rdieter at fedoraproject.org> - 0:1.0.5-7
+- Summary: omit "for KDE"
+- add rhel portability to .spec
+
 * Wed Oct 01 2008 Rex Dieter <rdieter at fedoraproject.org> - 0:1.0.5-6
 - revert libdvdread header changes, fix build (#465115)
 - (re)enable -devel on f9



From nim at fedoraproject.org  Wed Jan 21 21:45:47 2009
From: nim at fedoraproject.org (Nicolas Mailhot)
Date: Wed, 21 Jan 2009 21:45:47 +0000 (UTC)
Subject: rpms/fontpackages/devel .cvsignore, 1.6, 1.7 fontpackages.spec, 1.6,
	1.7 import.log, 1.6, 1.7 sources, 1.6, 1.7
Message-ID: <20090121214547.63A407012F@cvs1.fedora.phx.redhat.com>

Author: nim

Update of /cvs/extras/rpms/fontpackages/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25555/devel

Modified Files:
	.cvsignore fontpackages.spec import.log sources 
Log Message:
1.16


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fontpackages/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	15 Jan 2009 22:20:48 -0000	1.6
+++ .cvsignore	21 Jan 2009 21:45:16 -0000	1.7
@@ -1 +1 @@
-fontpackages-1.15.tar.bz2
+fontpackages-1.16.tar.bz2


Index: fontpackages.spec
===================================================================
RCS file: /cvs/extras/rpms/fontpackages/devel/fontpackages.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- fontpackages.spec	15 Jan 2009 22:20:48 -0000	1.6
+++ fontpackages.spec	21 Jan 2009 21:45:16 -0000	1.7
@@ -3,7 +3,7 @@
 %define rpmmacrodir     %{_sysconfdir}/rpm/
 
 Name:    fontpackages
-Version: 1.15
+Version: 1.16
 Release: 1%{?dist}
 Summary: Common directory and macro definitions used by font packages
 
@@ -97,6 +97,9 @@
 
 
 %changelog
+* Wed Jan 22 2009 Nicolas Mailhot <nim at fedoraproject dot org>
+- 1.16-1
+
 * Thu Jan 15 2009 Nicolas Mailhot <nim at fedoraproject dot org>
 - 1.15-1
 ??? lua-ize the main macro


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/fontpackages/devel/import.log,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- import.log	15 Jan 2009 22:20:48 -0000	1.6
+++ import.log	21 Jan 2009 21:45:16 -0000	1.7
@@ -4,3 +4,4 @@
 fontpackages-1_13-1_fc11:HEAD:fontpackages-1.13-1.fc11.src.rpm:1229949018
 fontpackages-1_14-1_fc11:HEAD:fontpackages-1.14-1.fc11.src.rpm:1231978787
 fontpackages-1_15-1_fc11:HEAD:fontpackages-1.15-1.fc11.src.rpm:1232058014
+fontpackages-1_16-1_fc11:HEAD:fontpackages-1.16-1.fc11.src.rpm:1232573931


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fontpackages/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	15 Jan 2009 22:20:48 -0000	1.6
+++ sources	21 Jan 2009 21:45:16 -0000	1.7
@@ -1 +1 @@
-69359230ae56bc40320bbe3df61f71d4  fontpackages-1.15.tar.bz2
+9d449121a0762b0e08cd1fdf99c10e92  fontpackages-1.16.tar.bz2



From jmoyer at fedoraproject.org  Wed Jan 21 21:52:07 2009
From: jmoyer at fedoraproject.org (Jeffrey E. Moyer)
Date: Wed, 21 Jan 2009 21:52:07 +0000 (UTC)
Subject: rpms/autofs/devel autofs-5.0.4-fix-program-map-quoted-output.patch, 
	NONE, 1.1 autofs.spec, 1.262, 1.263
Message-ID: <20090121215207.BC8497012F@cvs1.fedora.phx.redhat.com>

Author: jmoyer

Update of /cvs/pkgs/rpms/autofs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26262

Modified Files:
	autofs.spec 
Added Files:
	autofs-5.0.4-fix-program-map-quoted-output.patch 
Log Message:
- fix a bug in the program map parsing routine
- Resolves: bz#481008



autofs-5.0.4-fix-program-map-quoted-output.patch:

--- NEW FILE autofs-5.0.4-fix-program-map-quoted-output.patch ---
diff -up autofs-5.0.4/modules/lookup_program.c.orig autofs-5.0.4/modules/lookup_program.c
--- autofs-5.0.4/modules/lookup_program.c.orig	2009-01-21 14:33:50.000000000 -0500
+++ autofs-5.0.4/modules/lookup_program.c	2009-01-21 14:39:35.113105023 -0500
@@ -341,6 +341,7 @@ cont:
 				/* Eat characters till there's no more output */
 				break;
 			}
+			quoted = 0;
 			goto cont;
 		}
 		quoted = 0;


Index: autofs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/autofs/devel/autofs.spec,v
retrieving revision 1.262
retrieving revision 1.263
diff -u -r1.262 -r1.263
--- autofs.spec	15 Jan 2009 03:47:47 -0000	1.262
+++ autofs.spec	21 Jan 2009 21:51:36 -0000	1.263
@@ -4,7 +4,7 @@
 Summary: A tool for automatically mounting and unmounting filesystems
 Name: autofs
 Version: 5.0.4
-Release: 5
+Release: 6
 Epoch: 1
 License: GPLv2+
 Group: System Environment/Daemons
@@ -17,6 +17,7 @@
 Patch5: autofs-5.0.4-use-CLOEXEC-flag.patch
 Patch6: autofs-5.0.4-fix-select-fd-limit.patch
 Patch7: autofs-5.0.4-make-hash-table-scale-to-thousands-of-entries.patch
+Patch8: autofs-5.0.4-fix-program-map-quoted-output.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
@@ -65,6 +66,7 @@
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
+%patch8 -p1
 
 %build
 #CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=/usr --libdir=%{_libdir}
@@ -117,6 +119,9 @@
 %{_libdir}/autofs/
 
 %changelog
+* Wed Jan 21 2009 Jeff Moyer <jmoyer at redhat.com> - 5.0.4-6
+- fix a bug in the program map parsing routine
+
 * Thu Jan 15 2009 Ian Kent <kent at redhat.com> - 5.0.4-5
 - fix negative caching of non-existent keys.
 - fix ldap library detection in configure.



From liquidat at fedoraproject.org  Wed Jan 21 21:52:19 2009
From: liquidat at fedoraproject.org (Roland Wolters)
Date: Wed, 21 Jan 2009 21:52:19 +0000 (UTC)
Subject: rpms/rsibreak/F-9 rsibreak.spec,1.10,1.11
Message-ID: <20090121215219.0264B7012F@cvs1.fedora.phx.redhat.com>

Author: liquidat

Update of /cvs/extras/rpms/rsibreak/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26348

Modified Files:
	rsibreak.spec 
Log Message:
Smaller spec updates.


Index: rsibreak.spec
===================================================================
RCS file: /cvs/extras/rpms/rsibreak/F-9/rsibreak.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- rsibreak.spec	21 Jan 2009 21:32:48 -0000	1.10
+++ rsibreak.spec	21 Jan 2009 21:51:48 -0000	1.11
@@ -1,7 +1,7 @@
 
 Name:           rsibreak
 Version:        0.9.0
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        A small utility which bothers you at certain intervals
 Group:          Amusements/Graphics
 License:        GPLv2+
@@ -65,16 +65,20 @@
 %{_datadir}/dbus-1/interfaces/org.rsibreak.rsiwidget.xml
 %{_datadir}/icons/hicolor/*/apps/rsibreak*.png
 %{_datadir}/icons/hicolor/*/actions/rsibreak*.png
-%{_datadir}/icons/hicolor/32x32/actions/duringbreaks.png                                                                                                                          
+%{_datadir}/icons/hicolor/32x32/actions/duringbreaks.png 
 %{_datadir}/icons/hicolor/32x32/actions/timings.png 
 %{_datadir}/kde4/apps/rsibreak/rsibreak.notifyrc
 %{_datadir}/kde4/apps/desktoptheme/default/widgets/rsibreak.svg 
 %{_datadir}/kde4/services/plasma-engine-rsibreak.desktop           
 %{_datadir}/kde4/services/plasma-applet-rsibreak.desktop           
+%{_datadir}/doc/HTML/*/rsibreak
 %{_libdir}/kde4/plasma_engine_rsibreak.so                         
 %{_libdir}/kde4/plasma_applet_rsibreak.so                         
 
 %changelog
+* Wed Jan 21 2009 Roland Wolters <wolters.liste at gmx.net> 0.9.0-5
+- added doc/HTML dir
+
 * Wed Jan 14 2009 Rex Dieter <rdieter at fedoraproject.org> 0.9.0-3
 - fix %%find_lang usage
 - BR: kdelibs4-devel plasma-devel



From verdurin at fedoraproject.org  Wed Jan 21 22:05:36 2009
From: verdurin at fedoraproject.org (Adam Huffman)
Date: Wed, 21 Jan 2009 22:05:36 +0000 (UTC)
Subject: rpms/gnomint/F-9 .cvsignore, 1.3, 1.4 gnomint.spec, 1.2, 1.3 sources,
	1.3, 1.4
Message-ID: <20090121220536.E26107012F@cvs1.fedora.phx.redhat.com>

Author: verdurin

Update of /cvs/pkgs/rpms/gnomint/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27974

Modified Files:
	.cvsignore gnomint.spec sources 
Log Message:
Update to latest upstream with command-line interface


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnomint/F-9/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	5 Dec 2008 19:03:10 -0000	1.3
+++ .cvsignore	21 Jan 2009 22:05:06 -0000	1.4
@@ -1 +1 @@
-gnomint-0.6.0.tar.gz
+gnomint-0.9.1.tar.gz


Index: gnomint.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnomint/F-9/gnomint.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gnomint.spec	5 Dec 2008 19:03:10 -0000	1.2
+++ gnomint.spec	21 Jan 2009 22:05:06 -0000	1.3
@@ -1,5 +1,5 @@
 Name:		gnomint
-Version:	0.6.0
+Version:	0.9.1
 Release:	1%{?dist}
 Summary:	Graphical x509 Certification Authority management tool
 
@@ -17,6 +17,7 @@
 BuildRequires:	perl(XML::Parser)
 BuildRequires:	sqlite-devel >= 3
 BuildRequires:	intltool
+BuildRequires:	readline-devel
 
 Requires(pre):	GConf2
 Requires(post):	GConf2
@@ -82,6 +83,7 @@
 %doc README AUTHORS COPYING NEWS MAINTAINERS 
 %doc ChangeLog
 %{_bindir}/%{name}
+%{_bindir}/%{name}-cli
 %{_bindir}/%{name}-upgrade-db
 %dir %{_datadir}/%{name}
 %{_datadir}/%{name}/*.png
@@ -92,6 +94,10 @@
 %{_sysconfdir}/gconf/schemas/%{name}.schemas
 
 %changelog
+* Wed Jan 21 2009 Adam Huffman <bloch at verdurin.com> - 0.9.1-1
+- new upstream release including command-line interface
+- thanks to Seva Epsteyn for spec patch
+
 * Fri Nov 21 2008 Adam Huffman <bloch at verdurin.com> - 0.6.0-1
 - new upstream release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnomint/F-9/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	5 Dec 2008 19:03:10 -0000	1.3
+++ sources	21 Jan 2009 22:05:06 -0000	1.4
@@ -1 +1 @@
-dbb7c27d8edd2046e070015fae91b800  gnomint-0.6.0.tar.gz
+a8dd7536131c29a7c4d75f255d7e6b52  gnomint-0.9.1.tar.gz



From nsantos at fedoraproject.org  Wed Jan 21 22:05:47 2009
From: nsantos at fedoraproject.org (Nuno Santos)
Date: Wed, 21 Jan 2009 22:05:47 +0000 (UTC)
Subject: rpms/qpidc/devel qpidc.spec,1.64,1.65
Message-ID: <20090121220547.266CC7012F@cvs1.fedora.phx.redhat.com>

Author: nsantos

Update of /cvs/extras/rpms/qpidc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28014

Modified Files:
	qpidc.spec 
Log Message:
BZ474614 and BZ474613 - qpidc/rhm unowned directories


Index: qpidc.spec
===================================================================
RCS file: /cvs/extras/rpms/qpidc/devel/qpidc.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- qpidc.spec	20 Jan 2009 22:13:32 -0000	1.64
+++ qpidc.spec	21 Jan 2009 22:05:16 -0000	1.65
@@ -7,7 +7,7 @@
 
 Name:           qpidc
 Version:        0.4.734452
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Libraries for Qpid C++ client applications
 Group:          System Environment/Libraries
 License:        ASL 2.0
@@ -240,8 +240,8 @@
 %_libdir/libqpidcommon.so.0.1.0
 %_libdir/libqpidclient.so.0
 %_libdir/libqpidclient.so.0.1.0
-%_libdir/qpid/client
-%_sysconfdir/qpid
+%dir %_libdir/qpid/client
+%dir %_sysconfdir/qpid
 %config(noreplace) %_sysconfdir/qpid/qpidc.conf
 
 %files devel
@@ -270,7 +270,7 @@
 %config(noreplace) %_sysconfdir/qpidd.conf
 %config(noreplace) %_sysconfdir/sasl2/qpidd.conf
 %{_initrddir}/qpidd
-%_libdir/qpid/daemon
+%dir %_libdir/qpid/daemon
 %attr(755, qpidd, qpidd) %_localstatedir/lib/qpidd
 %attr(755, qpidd, qpidd) %_libdir/qpidd
 %attr(755, qpidd, qpidd) /var/run/qpidd
@@ -374,7 +374,7 @@
 %postun -n qmf -p /sbin/ldconfig
 
 %changelog
-* Tue Jan 20 2009 Nuno Santos <nsantos at redhat.com> - 0.4.734452-2
+* Tue Jan 20 2009 Nuno Santos <nsantos at redhat.com> - 0.4.734452-3
 - BZ474614 and BZ474613 - qpidc/rhm unowned directories
 
 * Thu Jan 15 2009 Nuno Santos <nsantos at redhat.com> - 0.4.734452-1



From dwalsh at fedoraproject.org  Wed Jan 21 22:16:39 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Wed, 21 Jan 2009 22:16:39 +0000 (UTC)
Subject: rpms/policycoreutils/devel policycoreutils-gui.patch, 1.82,
	1.83 policycoreutils-po.patch, 1.45, 1.46 policycoreutils.spec,
	1.585, 1.586
Message-ID: <20090121221639.F39AB7012F@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/policycoreutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29518

Modified Files:
	policycoreutils-gui.patch policycoreutils-po.patch 
	policycoreutils.spec 
Log Message:
* Tue Jan 21 2009 Dan Walsh <dwalsh at redhat.com> 2.0.61-4
- Fix Translations


policycoreutils-gui.patch:

Index: policycoreutils-gui.patch
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils-gui.patch,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -r1.82 -r1.83
--- policycoreutils-gui.patch	20 Jan 2009 14:58:13 -0000	1.82
+++ policycoreutils-gui.patch	21 Jan 2009 22:15:52 -0000	1.83
@@ -1,6 +1,6 @@
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/booleansPage.py policycoreutils-2.0.61/gui/booleansPage.py
 --- nsapolicycoreutils/gui/booleansPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.61/gui/booleansPage.py	2009-01-14 10:05:38.000000000 -0500
++++ policycoreutils-2.0.61/gui/booleansPage.py	2009-01-20 09:49:03.000000000 -0500
 @@ -0,0 +1,247 @@
 +#
 +# booleansPage.py - GUI for Booleans page in system-config-securitylevel
@@ -251,7 +251,7 @@
 +        
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/domainsPage.py policycoreutils-2.0.61/gui/domainsPage.py
 --- nsapolicycoreutils/gui/domainsPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.61/gui/domainsPage.py	2009-01-20 09:47:52.000000000 -0500
++++ policycoreutils-2.0.61/gui/domainsPage.py	2009-01-20 09:49:03.000000000 -0500
 @@ -0,0 +1,154 @@
 +## domainsPage.py - show selinux domains
 +## Copyright (C) 2009 Red Hat, Inc.
@@ -409,7 +409,7 @@
 +            self.error(e.args[0])
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/fcontextPage.py policycoreutils-2.0.61/gui/fcontextPage.py
 --- nsapolicycoreutils/gui/fcontextPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.61/gui/fcontextPage.py	2009-01-14 10:05:38.000000000 -0500
++++ policycoreutils-2.0.61/gui/fcontextPage.py	2009-01-20 09:49:03.000000000 -0500
 @@ -0,0 +1,223 @@
 +## fcontextPage.py - show selinux mappings
 +## Copyright (C) 2006 Red Hat, Inc.
@@ -636,7 +636,7 @@
 +        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.61/gui/html_util.py
 --- nsapolicycoreutils/gui/html_util.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.61/gui/html_util.py	2009-01-14 10:05:38.000000000 -0500
++++ policycoreutils-2.0.61/gui/html_util.py	2009-01-20 09:49:03.000000000 -0500
 @@ -0,0 +1,164 @@
 +# Authors: John Dennis <jdennis at redhat.com>
 +#
@@ -804,7 +804,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/lockdown.glade policycoreutils-2.0.61/gui/lockdown.glade
 --- nsapolicycoreutils/gui/lockdown.glade	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.61/gui/lockdown.glade	2009-01-14 10:05:38.000000000 -0500
++++ policycoreutils-2.0.61/gui/lockdown.glade	2009-01-20 09:49:03.000000000 -0500
 @@ -0,0 +1,771 @@
 +<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
 +<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
@@ -1579,7 +1579,7 @@
 +</glade-interface>
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/lockdown.gladep policycoreutils-2.0.61/gui/lockdown.gladep
 --- nsapolicycoreutils/gui/lockdown.gladep	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.61/gui/lockdown.gladep	2009-01-14 10:05:38.000000000 -0500
++++ policycoreutils-2.0.61/gui/lockdown.gladep	2009-01-20 09:49:03.000000000 -0500
 @@ -0,0 +1,7 @@
 +<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
 +<!DOCTYPE glade-project SYSTEM "http://glade.gnome.org/glade-project-2.0.dtd">
@@ -1590,7 +1590,7 @@
 +</glade-project>
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/lockdown.py policycoreutils-2.0.61/gui/lockdown.py
 --- nsapolicycoreutils/gui/lockdown.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.61/gui/lockdown.py	2009-01-14 10:05:38.000000000 -0500
++++ policycoreutils-2.0.61/gui/lockdown.py	2009-01-20 09:49:03.000000000 -0500
 @@ -0,0 +1,382 @@
 +#!/usr/bin/python
 +#
@@ -1976,7 +1976,7 @@
 +    app.stand_alone()
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/loginsPage.py policycoreutils-2.0.61/gui/loginsPage.py
 --- nsapolicycoreutils/gui/loginsPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.61/gui/loginsPage.py	2009-01-14 10:05:38.000000000 -0500
++++ policycoreutils-2.0.61/gui/loginsPage.py	2009-01-20 09:49:03.000000000 -0500
 @@ -0,0 +1,185 @@
 +## loginsPage.py - show selinux mappings
 +## Copyright (C) 2006 Red Hat, Inc.
@@ -2165,7 +2165,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/Makefile policycoreutils-2.0.61/gui/Makefile
 --- nsapolicycoreutils/gui/Makefile	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.61/gui/Makefile	2009-01-20 09:33:19.000000000 -0500
++++ policycoreutils-2.0.61/gui/Makefile	2009-01-20 09:49:03.000000000 -0500
 @@ -0,0 +1,38 @@
 +# Installation directories.
 +PREFIX ?= ${DESTDIR}/usr
@@ -2207,7 +2207,7 @@
 +relabel:
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/mappingsPage.py policycoreutils-2.0.61/gui/mappingsPage.py
 --- nsapolicycoreutils/gui/mappingsPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.61/gui/mappingsPage.py	2009-01-14 10:05:38.000000000 -0500
++++ policycoreutils-2.0.61/gui/mappingsPage.py	2009-01-20 09:49:03.000000000 -0500
 @@ -0,0 +1,56 @@
 +## mappingsPage.py - show selinux mappings
 +## Copyright (C) 2006 Red Hat, Inc.
@@ -2267,7 +2267,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/modulesPage.py policycoreutils-2.0.61/gui/modulesPage.py
 --- nsapolicycoreutils/gui/modulesPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.61/gui/modulesPage.py	2009-01-20 09:29:24.000000000 -0500
++++ policycoreutils-2.0.61/gui/modulesPage.py	2009-01-20 09:49:03.000000000 -0500
 @@ -0,0 +1,190 @@
 +## modulesPage.py - show selinux mappings
 +## Copyright (C) 2006-2009 Red Hat, Inc.
@@ -2461,7 +2461,7 @@
 +            self.error(e.args[0])
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.glade policycoreutils-2.0.61/gui/polgen.glade
 --- nsapolicycoreutils/gui/polgen.glade	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.61/gui/polgen.glade	2009-01-19 14:29:36.000000000 -0500
++++ policycoreutils-2.0.61/gui/polgen.glade	2009-01-20 09:49:03.000000000 -0500
 @@ -0,0 +1,3305 @@
 +<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
 +<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
@@ -5770,7 +5770,7 @@
 +</glade-interface>
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.glade.bak policycoreutils-2.0.61/gui/polgen.glade.bak
 --- nsapolicycoreutils/gui/polgen.glade.bak	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.61/gui/polgen.glade.bak	2009-01-19 14:29:36.000000000 -0500
++++ policycoreutils-2.0.61/gui/polgen.glade.bak	2009-01-20 09:49:03.000000000 -0500
 @@ -0,0 +1,3305 @@
 +<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
 +<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
@@ -9079,7 +9079,7 @@
 +</glade-interface>
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.gladep policycoreutils-2.0.61/gui/polgen.gladep
 --- nsapolicycoreutils/gui/polgen.gladep	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.61/gui/polgen.gladep	2009-01-19 14:29:36.000000000 -0500
++++ policycoreutils-2.0.61/gui/polgen.gladep	2009-01-20 09:49:03.000000000 -0500
 @@ -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">
@@ -9090,7 +9090,7 @@
 +</glade-project>
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.gladep.bak policycoreutils-2.0.61/gui/polgen.gladep.bak
 --- nsapolicycoreutils/gui/polgen.gladep.bak	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.61/gui/polgen.gladep.bak	2009-01-19 14:29:36.000000000 -0500
++++ policycoreutils-2.0.61/gui/polgen.gladep.bak	2009-01-20 09:49:03.000000000 -0500
 @@ -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">
@@ -9101,7 +9101,7 @@
 +</glade-project>
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgengui.py policycoreutils-2.0.61/gui/polgengui.py
 --- nsapolicycoreutils/gui/polgengui.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.61/gui/polgengui.py	2009-01-20 09:28:47.000000000 -0500
++++ policycoreutils-2.0.61/gui/polgengui.py	2009-01-20 09:49:03.000000000 -0500
 @@ -0,0 +1,626 @@
 +#!/usr/bin/python -E
 +#
@@ -9729,10 +9729,9 @@
 +
 +    app = childWindow()
 +    app.stand_alone()
-Binary files nsapolicycoreutils/gui/polgengui.pyo and policycoreutils-2.0.61/gui/polgengui.pyo differ
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.py policycoreutils-2.0.61/gui/polgen.py
 --- nsapolicycoreutils/gui/polgen.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.61/gui/polgen.py	2009-01-20 09:28:32.000000000 -0500
++++ policycoreutils-2.0.61/gui/polgen.py	2009-01-20 09:49:03.000000000 -0500
 @@ -0,0 +1,954 @@
 +#!/usr/bin/python
 +#
@@ -10688,10 +10687,9 @@
 +    sys.exit(0)
 +    
 +	
-Binary files nsapolicycoreutils/gui/polgen.pyo and policycoreutils-2.0.61/gui/polgen.pyo differ
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/portsPage.py policycoreutils-2.0.61/gui/portsPage.py
 --- nsapolicycoreutils/gui/portsPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.61/gui/portsPage.py	2009-01-14 10:05:39.000000000 -0500
++++ policycoreutils-2.0.61/gui/portsPage.py	2009-01-21 17:12:32.000000000 -0500
 @@ -0,0 +1,259 @@
 +## portsPage.py - show selinux mappings
 +## Copyright (C) 2006 Red Hat, Inc.
@@ -10743,7 +10741,7 @@
 +
 +class portsPage(semanagePage):
 +    def __init__(self, xml):
-+        semanagePage.__init__(self, xml, "ports", "Network Port")
++        semanagePage.__init__(self, xml, "ports", _("Network Port"))
 +        xml.signal_connect("on_group_clicked", self.on_group_clicked)
 +        self.group = False
 +        self.ports_filter = xml.get_widget("portsFilterEntry")
@@ -10954,7 +10952,7 @@
 +        
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/selinux.tbl policycoreutils-2.0.61/gui/selinux.tbl
 --- nsapolicycoreutils/gui/selinux.tbl	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.61/gui/selinux.tbl	2009-01-14 10:05:39.000000000 -0500
++++ policycoreutils-2.0.61/gui/selinux.tbl	2009-01-20 09:49:03.000000000 -0500
 @@ -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 /")
@@ -11192,7 +11190,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/semanagePage.py policycoreutils-2.0.61/gui/semanagePage.py
 --- nsapolicycoreutils/gui/semanagePage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.61/gui/semanagePage.py	2009-01-20 09:25:54.000000000 -0500
++++ policycoreutils-2.0.61/gui/semanagePage.py	2009-01-20 09:49:03.000000000 -0500
 @@ -0,0 +1,168 @@
 +## semanagePage.py - show selinux mappings
 +## Copyright (C) 2006 Red Hat, Inc.
@@ -11364,7 +11362,7 @@
 +        
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/statusPage.py policycoreutils-2.0.61/gui/statusPage.py
 --- nsapolicycoreutils/gui/statusPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.61/gui/statusPage.py	2009-01-20 09:29:07.000000000 -0500
++++ policycoreutils-2.0.61/gui/statusPage.py	2009-01-20 09:49:03.000000000 -0500
 @@ -0,0 +1,190 @@
 +# statusPage.py - show selinux status
 +## Copyright (C) 2006-2009 Red Hat, Inc.
@@ -11558,7 +11556,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/system-config-selinux.glade policycoreutils-2.0.61/gui/system-config-selinux.glade
 --- nsapolicycoreutils/gui/system-config-selinux.glade	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.61/gui/system-config-selinux.glade	2009-01-20 09:47:14.000000000 -0500
++++ policycoreutils-2.0.61/gui/system-config-selinux.glade	2009-01-20 09:49:03.000000000 -0500
 @@ -0,0 +1,3403 @@
 +<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
 +<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
@@ -14965,7 +14963,7 @@
 +</glade-interface>
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/system-config-selinux.py policycoreutils-2.0.61/gui/system-config-selinux.py
 --- nsapolicycoreutils/gui/system-config-selinux.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.61/gui/system-config-selinux.py	2009-01-20 09:22:25.000000000 -0500
++++ policycoreutils-2.0.61/gui/system-config-selinux.py	2009-01-20 09:49:03.000000000 -0500
 @@ -0,0 +1,189 @@
 +#!/usr/bin/python
 +#
@@ -15158,7 +15156,7 @@
 +    app.stand_alone()
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/boolean.py policycoreutils-2.0.61/gui/templates/boolean.py
 --- nsapolicycoreutils/gui/templates/boolean.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.61/gui/templates/boolean.py	2009-01-14 10:05:39.000000000 -0500
++++ policycoreutils-2.0.61/gui/templates/boolean.py	2009-01-20 09:49:03.000000000 -0500
 @@ -0,0 +1,40 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -15202,7 +15200,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/etc_rw.py policycoreutils-2.0.61/gui/templates/etc_rw.py
 --- nsapolicycoreutils/gui/templates/etc_rw.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.61/gui/templates/etc_rw.py	2009-01-14 10:05:39.000000000 -0500
++++ policycoreutils-2.0.61/gui/templates/etc_rw.py	2009-01-20 09:49:03.000000000 -0500
 @@ -0,0 +1,129 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -15335,7 +15333,7 @@
 +"""
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/executable.py policycoreutils-2.0.61/gui/templates/executable.py
 --- nsapolicycoreutils/gui/templates/executable.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.61/gui/templates/executable.py	2009-01-19 14:29:58.000000000 -0500
++++ policycoreutils-2.0.61/gui/templates/executable.py	2009-01-20 09:49:03.000000000 -0500
 @@ -0,0 +1,352 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -15691,7 +15689,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/__init__.py policycoreutils-2.0.61/gui/templates/__init__.py
 --- nsapolicycoreutils/gui/templates/__init__.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.61/gui/templates/__init__.py	2009-01-14 10:05:39.000000000 -0500
++++ policycoreutils-2.0.61/gui/templates/__init__.py	2009-01-20 09:49:03.000000000 -0500
 @@ -0,0 +1,18 @@
 +#
 +# Copyright (C) 2007 Red Hat, Inc.
@@ -15713,7 +15711,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/network.py policycoreutils-2.0.61/gui/templates/network.py
 --- nsapolicycoreutils/gui/templates/network.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.61/gui/templates/network.py	2009-01-14 10:05:39.000000000 -0500
++++ policycoreutils-2.0.61/gui/templates/network.py	2009-01-20 09:49:03.000000000 -0500
 @@ -0,0 +1,80 @@
 +te_port_types="""
 +type TEMPLATETYPE_port_t;
@@ -15797,7 +15795,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/rw.py policycoreutils-2.0.61/gui/templates/rw.py
 --- nsapolicycoreutils/gui/templates/rw.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.61/gui/templates/rw.py	2009-01-14 10:05:39.000000000 -0500
++++ policycoreutils-2.0.61/gui/templates/rw.py	2009-01-20 09:49:03.000000000 -0500
 @@ -0,0 +1,128 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -15929,7 +15927,7 @@
 +"""
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/script.py policycoreutils-2.0.61/gui/templates/script.py
 --- nsapolicycoreutils/gui/templates/script.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.61/gui/templates/script.py	2009-01-14 10:05:39.000000000 -0500
++++ policycoreutils-2.0.61/gui/templates/script.py	2009-01-20 09:49:03.000000000 -0500
 @@ -0,0 +1,105 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -16038,7 +16036,7 @@
 +"""
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/semodule.py policycoreutils-2.0.61/gui/templates/semodule.py
 --- nsapolicycoreutils/gui/templates/semodule.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.61/gui/templates/semodule.py	2009-01-14 10:05:39.000000000 -0500
++++ policycoreutils-2.0.61/gui/templates/semodule.py	2009-01-20 09:49:03.000000000 -0500
 @@ -0,0 +1,41 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -16083,7 +16081,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/tmp.py policycoreutils-2.0.61/gui/templates/tmp.py
 --- nsapolicycoreutils/gui/templates/tmp.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.61/gui/templates/tmp.py	2009-01-14 10:05:39.000000000 -0500
++++ policycoreutils-2.0.61/gui/templates/tmp.py	2009-01-20 09:49:03.000000000 -0500
 @@ -0,0 +1,97 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -16184,7 +16182,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/user.py policycoreutils-2.0.61/gui/templates/user.py
 --- nsapolicycoreutils/gui/templates/user.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.61/gui/templates/user.py	2009-01-14 10:05:39.000000000 -0500
++++ policycoreutils-2.0.61/gui/templates/user.py	2009-01-20 09:49:03.000000000 -0500
 @@ -0,0 +1,182 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -16370,7 +16368,7 @@
 +"""
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_lib.py policycoreutils-2.0.61/gui/templates/var_lib.py
 --- nsapolicycoreutils/gui/templates/var_lib.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.61/gui/templates/var_lib.py	2009-01-14 10:05:39.000000000 -0500
++++ policycoreutils-2.0.61/gui/templates/var_lib.py	2009-01-20 09:49:03.000000000 -0500
 @@ -0,0 +1,158 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -16532,7 +16530,7 @@
 +"""
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_log.py policycoreutils-2.0.61/gui/templates/var_log.py
 --- nsapolicycoreutils/gui/templates/var_log.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.61/gui/templates/var_log.py	2009-01-14 10:05:39.000000000 -0500
++++ policycoreutils-2.0.61/gui/templates/var_log.py	2009-01-20 09:49:03.000000000 -0500
 @@ -0,0 +1,110 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -16646,7 +16644,7 @@
 +"""
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_run.py policycoreutils-2.0.61/gui/templates/var_run.py
 --- nsapolicycoreutils/gui/templates/var_run.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.61/gui/templates/var_run.py	2009-01-14 10:05:39.000000000 -0500
++++ policycoreutils-2.0.61/gui/templates/var_run.py	2009-01-20 09:49:03.000000000 -0500
 @@ -0,0 +1,118 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -16768,7 +16766,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_spool.py policycoreutils-2.0.61/gui/templates/var_spool.py
 --- nsapolicycoreutils/gui/templates/var_spool.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.61/gui/templates/var_spool.py	2009-01-14 10:05:39.000000000 -0500
++++ policycoreutils-2.0.61/gui/templates/var_spool.py	2009-01-20 09:49:03.000000000 -0500
 @@ -0,0 +1,129 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -16901,7 +16899,7 @@
 +"""
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/translationsPage.py policycoreutils-2.0.61/gui/translationsPage.py
 --- nsapolicycoreutils/gui/translationsPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.61/gui/translationsPage.py	2009-01-14 10:05:39.000000000 -0500
++++ policycoreutils-2.0.61/gui/translationsPage.py	2009-01-20 09:49:03.000000000 -0500
 @@ -0,0 +1,118 @@
 +## translationsPage.py - show selinux translations
 +## Copyright (C) 2006 Red Hat, Inc.
@@ -17023,7 +17021,7 @@
 +        self.store.set_value(iter, 1, translation)
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/usersPage.py policycoreutils-2.0.61/gui/usersPage.py
 --- nsapolicycoreutils/gui/usersPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.61/gui/usersPage.py	2009-01-14 10:05:39.000000000 -0500
++++ policycoreutils-2.0.61/gui/usersPage.py	2009-01-21 17:12:14.000000000 -0500
 @@ -0,0 +1,150 @@
 +## usersPage.py - show selinux mappings
 +## Copyright (C) 2006,2007,2008 Red Hat, Inc.
@@ -17068,7 +17066,7 @@
 +
 +class usersPage(semanagePage):
 +    def __init__(self, xml):
-+        semanagePage.__init__(self, xml, "users", "SELinux User")
++        semanagePage.__init__(self, xml, "users", _("SELinux User"))
 +
 +        self.store = gtk.ListStore(gobject.TYPE_STRING, gobject.TYPE_STRING, gobject.TYPE_STRING, gobject.TYPE_STRING, gobject.TYPE_STRING)
 +        self.view.set_model(self.store)

policycoreutils-po.patch:

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.45 -r 1.46 policycoreutils-po.patch
Index: policycoreutils-po.patch
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils-po.patch,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- policycoreutils-po.patch	20 Jan 2009 14:58:13 -0000	1.45
+++ policycoreutils-po.patch	21 Jan 2009 22:15:53 -0000	1.46
@@ -1,16 +1,16 @@
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/af.po policycoreutils-2.0.61/po/af.po
 --- nsapolicycoreutils/po/af.po	2008-09-22 13:25:06.000000000 -0400
-+++ policycoreutils-2.0.61/po/af.po	2009-01-20 09:33:29.000000000 -0500
++++ policycoreutils-2.0.61/po/af.po	2009-01-21 17:13:12.000000000 -0500
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
  "Report-Msgid-Bugs-To: \n"
 -"POT-Creation-Date: 2008-09-09 13:24-0400\n"
-+"POT-Creation-Date: 2009-01-20 09:33-0500\n"
++"POT-Creation-Date: 2009-01-21 17:13-0500\n"
  "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
  "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
  "Language-Team: LANGUAGE <LL at li.org>\n"
-@@ -85,818 +85,819 @@
+@@ -85,818 +85,821 @@
  msgid "To make this policy package active, execute:"
  msgstr ""
  
@@ -58,8 +58,10 @@
  msgstr ""
  
 -#: ../semanage/seobject.py:236 ../gui/system-config-selinux.glade:651
+-#: ../gui/translationsPage.py:43 ../gui/translationsPage.py:59
 +#: ../semanage/seobject.py:239 ../gui/system-config-selinux.glade:651
- #: ../gui/translationsPage.py:43 ../gui/translationsPage.py:59
++#: ../gui/system-config-selinux.glade:2683 ../gui/translationsPage.py:43
++#: ../gui/translationsPage.py:59
  msgid "Translation"
  msgstr ""
  
@@ -253,6 +255,7 @@
 +#: ../semanage/seobject.py:767 ../semanage/seobject.py:772
  #: ../gui/system-config-selinux.glade:128
  #: ../gui/system-config-selinux.glade:1107
++#: ../gui/system-config-selinux.glade:2496 ../gui/usersPage.py:44
  msgid "SELinux User"
  msgstr ""
  
@@ -1024,7 +1027,7 @@
  #: ../gui/polgengui.py:169
  msgid "Description"
  msgstr ""
-@@ -938,7 +939,7 @@
+@@ -938,7 +941,7 @@
  
  #: ../newrole/newrole.c:556 ../newrole/newrole.c:634
  #, c-format
@@ -1033,7 +1036,7 @@
  msgstr ""
  
  #: ../newrole/newrole.c:564 ../newrole/newrole.c:640
-@@ -1208,76 +1209,76 @@
+@@ -1208,83 +1211,83 @@
  msgid "Can not combine +/- with other types of categories"
  msgstr ""
  
@@ -1112,7 +1115,7 @@
  msgstr ""
  
 -#: ../gui/booleansPage.py:184
-+#: ../gui/booleansPage.py:186
++#: ../gui/booleansPage.py:186 ../gui/system-config-selinux.glade:1917
  msgid "Boolean"
  msgstr ""
  
@@ -1124,9 +1127,46 @@
 -#: ../gui/booleansPage.py:233 ../gui/semanagePage.py:165
 +#: ../gui/booleansPage.py:243 ../gui/semanagePage.py:164
  #: ../gui/system-config-selinux.glade:1808
- #: ../gui/system-config-selinux.glade:2030
- #: ../gui/system-config-selinux.glade:2830
-@@ -1397,7 +1398,7 @@
+-#: ../gui/system-config-selinux.glade:2030
+-#: ../gui/system-config-selinux.glade:2830
++#: ../gui/system-config-selinux.glade:2031
++#: ../gui/system-config-selinux.glade:2835
+ msgid "Customized"
+ msgstr ""
+ 
+-#: ../gui/fcontextPage.py:64
++#: ../gui/fcontextPage.py:64 ../gui/system-config-selinux.glade:2122
+ msgid "File Labeling"
+ msgstr ""
+ 
+@@ -1306,7 +1309,7 @@
+ "Type"
+ msgstr ""
+ 
+-#: ../gui/loginsPage.py:48
++#: ../gui/loginsPage.py:48 ../gui/system-config-selinux.glade:2309
+ msgid "User Mapping"
+ msgstr ""
+ 
+@@ -1333,7 +1336,7 @@
+ msgid "Login '%s' is required"
+ msgstr ""
+ 
+-#: ../gui/modulesPage.py:48
++#: ../gui/modulesPage.py:48 ../gui/system-config-selinux.glade:3151
+ msgid "Policy Module"
+ msgstr ""
+ 
+@@ -1349,7 +1352,7 @@
+ msgid "Disable Audit"
+ msgstr ""
+ 
+-#: ../gui/modulesPage.py:137 ../gui/system-config-selinux.glade:3054
++#: ../gui/modulesPage.py:137 ../gui/system-config-selinux.glade:3060
+ msgid "Enable Audit"
+ msgstr ""
+ 
+@@ -1397,7 +1400,7 @@
  msgid "<b>Applications</b>"
  msgstr ""
  
@@ -1135,7 +1175,7 @@
  msgid ""
  "Standard Init Daemon are daemons started on boot via init scripts.  Usually "
  "requires a script in /etc/rc.d/init.d"
-@@ -1407,300 +1408,304 @@
+@@ -1407,300 +1410,304 @@
  msgid "Standard Init Daemon"
  msgstr ""
  
@@ -1509,7 +1549,7 @@
  msgid ""
  "This tool will generate the following: \n"
  "Type Enforcement(te), File Context(fc), Interface(if), Shell Script(sh)\n"
-@@ -1712,7 +1717,7 @@
+@@ -1712,7 +1719,7 @@
  "Use audit2allow -R to generate additional rules for the te file.\n"
  msgstr ""
  
@@ -1518,7 +1558,7 @@
  msgid ""
  "This tool will generate the following: \n"
  "Type Enforcement(te), File Context(fc), Interface(if), Shell Script(sh)\n"
-@@ -1723,11 +1728,11 @@
+@@ -1723,11 +1730,11 @@
  "Use audit2allow -R to generate additional rules for the te file.\n"
  msgstr ""
  
@@ -1532,7 +1572,7 @@
  msgid "Boolean Name"
  msgstr ""
  
-@@ -1748,102 +1753,102 @@
+@@ -1748,105 +1755,109 @@
  msgid "%s must be a directory"
  msgstr ""
  
@@ -1658,7 +1698,23 @@
  msgid "Setup Script"
  msgstr ""
  
-@@ -2999,16 +3004,16 @@
++#: ../gui/portsPage.py:51 ../gui/system-config-selinux.glade:2926
++msgid "Network Port"
++msgstr ""
++
+ #: ../gui/portsPage.py:85
+ msgid ""
+ "SELinux Port\n"
+@@ -1876,7 +1887,7 @@
+ msgid "List View"
+ msgstr ""
+ 
+-#: ../gui/portsPage.py:255 ../gui/system-config-selinux.glade:2812
++#: ../gui/portsPage.py:255 ../gui/system-config-selinux.glade:2817
+ msgid "Group View"
+ msgstr ""
+ 
+@@ -2999,16 +3010,16 @@
  msgid "Add %s"
  msgstr ""
  
@@ -1669,16 +1725,16 @@
  msgstr ""
  
 -#: ../gui/statusPage.py:69
-+#: ../gui/statusPage.py:69 ../gui/system-config-selinux.glade:3210
++#: ../gui/statusPage.py:69 ../gui/system-config-selinux.glade:3217
  msgid "Permissive"
  msgstr ""
  
 -#: ../gui/statusPage.py:70
-+#: ../gui/statusPage.py:70 ../gui/system-config-selinux.glade:3228
++#: ../gui/statusPage.py:70 ../gui/system-config-selinux.glade:3235
  msgid "Enforcing"
  msgstr ""
[...38393 lines suppressed...]
- #: ../gui/system-config-selinux.glade:3084
-+#: ../gui/system-config-selinux.glade:3258
+@@ -3106,8 +3111,6 @@
+ msgstr ""
+ 
+ #: ../gui/system-config-selinux.glade:1029
+-#: ../gui/system-config-selinux.glade:2557
+-#: ../gui/system-config-selinux.glade:2589
+ msgid "Add SELinux User"
+ msgstr ""
+ 
+@@ -3187,122 +3190,147 @@
+ msgstr ""
+ 
+ #: ../gui/system-config-selinux.glade:1856
+-#: ../gui/system-config-selinux.glade:2060
+-#: ../gui/system-config-selinux.glade:2246
+-#: ../gui/system-config-selinux.glade:2432
+-#: ../gui/system-config-selinux.glade:2618
+-#: ../gui/system-config-selinux.glade:2860
+-#: ../gui/system-config-selinux.glade:3084
++#: ../gui/system-config-selinux.glade:2061
++#: ../gui/system-config-selinux.glade:2248
++#: ../gui/system-config-selinux.glade:2435
++#: ../gui/system-config-selinux.glade:2622
++#: ../gui/system-config-selinux.glade:2865
++#: ../gui/system-config-selinux.glade:3090
++#: ../gui/system-config-selinux.glade:3265
  msgid "Filter"
  msgstr ""
  
-@@ -3286,10 +3286,12 @@
+-#: ../gui/system-config-selinux.glade:1944
++#: ../gui/system-config-selinux.glade:1945
+ msgid "label50"
+ msgstr ""
+ 
+-#: ../gui/system-config-selinux.glade:1981
++#: ../gui/system-config-selinux.glade:1982
+ msgid "Add File Context"
+ msgstr ""
+ 
+-#: ../gui/system-config-selinux.glade:1997
++#: ../gui/system-config-selinux.glade:1998
+ msgid "Modify File Context"
+ msgstr ""
+ 
+-#: ../gui/system-config-selinux.glade:2013
++#: ../gui/system-config-selinux.glade:2014
+ msgid "Delete File Context"
+ msgstr ""
+ 
+-#: ../gui/system-config-selinux.glade:2029
++#: ../gui/system-config-selinux.glade:2030
+ msgid "Toggle between all and customized file context"
+ msgstr ""
+ 
+-#: ../gui/system-config-selinux.glade:2148
++#: ../gui/system-config-selinux.glade:2150
+ msgid "label38"
+ msgstr ""
+ 
+-#: ../gui/system-config-selinux.glade:2185
++#: ../gui/system-config-selinux.glade:2187
+ msgid "Add SELinux User Mapping"
+ msgstr ""
+ 
+-#: ../gui/system-config-selinux.glade:2201
++#: ../gui/system-config-selinux.glade:2203
+ msgid "Modify SELinux User Mapping"
+ msgstr ""
+ 
+-#: ../gui/system-config-selinux.glade:2217
++#: ../gui/system-config-selinux.glade:2219
+ msgid "Delete SELinux User Mapping"
+ msgstr ""
+ 
+-#: ../gui/system-config-selinux.glade:2334
++#: ../gui/system-config-selinux.glade:2337
+ msgid "label39"
+ msgstr ""
+ 
+-#: ../gui/system-config-selinux.glade:2371
+-msgid "Add Translation"
++#: ../gui/system-config-selinux.glade:2374
++msgid "Add User"
+ msgstr ""
+ 
+-#: ../gui/system-config-selinux.glade:2387
+-msgid "Modify Translation"
++#: ../gui/system-config-selinux.glade:2390
++msgid "Modify User"
+ msgstr ""
+ 
+-#: ../gui/system-config-selinux.glade:2403
+-msgid "Delete Translation"
++#: ../gui/system-config-selinux.glade:2406
++msgid "Delete User"
+ msgstr ""
+ 
+-#: ../gui/system-config-selinux.glade:2520
++#: ../gui/system-config-selinux.glade:2524
+ msgid "label41"
+ msgstr ""
+ 
+-#: ../gui/system-config-selinux.glade:2573
+-msgid "Modify SELinux User"
++#: ../gui/system-config-selinux.glade:2561
++msgid "Add Translation"
+ msgstr ""
+ 
+-#: ../gui/system-config-selinux.glade:2706
++#: ../gui/system-config-selinux.glade:2577
++msgid "Modify Translation"
++msgstr ""
++
++#: ../gui/system-config-selinux.glade:2593
++msgid "Delete Translation"
++msgstr ""
++
++#: ../gui/system-config-selinux.glade:2711
+ msgid "label40"
+ msgstr ""
+ 
+-#: ../gui/system-config-selinux.glade:2743
++#: ../gui/system-config-selinux.glade:2748
+ msgid "Add Network Port"
+ msgstr ""
+ 
+-#: ../gui/system-config-selinux.glade:2759
++#: ../gui/system-config-selinux.glade:2764
+ msgid "Edit Network Port"
  msgstr ""
  
- #: ../gui/system-config-selinux.glade:3001
-+#: ../gui/system-config-selinux.glade:3209
+-#: ../gui/system-config-selinux.glade:2775
++#: ../gui/system-config-selinux.glade:2780
+ msgid "Delete Network Port"
+ msgstr ""
+ 
+-#: ../gui/system-config-selinux.glade:2811
+-#: ../gui/system-config-selinux.glade:2829
++#: ../gui/system-config-selinux.glade:2816
++#: ../gui/system-config-selinux.glade:2834
+ msgid "Toggle between Customized and All Ports"
+ msgstr ""
+ 
+-#: ../gui/system-config-selinux.glade:2948
++#: ../gui/system-config-selinux.glade:2954
+ msgid "label42"
+ msgstr ""
+ 
+-#: ../gui/system-config-selinux.glade:2985
++#: ../gui/system-config-selinux.glade:2991
+ msgid "Generate new policy module"
+ msgstr ""
+ 
+-#: ../gui/system-config-selinux.glade:3001
++#: ../gui/system-config-selinux.glade:3007
  msgid "Load policy module"
  msgstr ""
  
- #: ../gui/system-config-selinux.glade:3017
-+#: ../gui/system-config-selinux.glade:3227
+-#: ../gui/system-config-selinux.glade:3017
++#: ../gui/system-config-selinux.glade:3023
  msgid "Remove loadable policy module"
  msgstr ""
  
-@@ -3303,6 +3305,10 @@
+-#: ../gui/system-config-selinux.glade:3053
++#: ../gui/system-config-selinux.glade:3059
+ msgid ""
+ "Enable/Disable additional audit rules, that are normally not reported in the "
+ "log files."
+ msgstr ""
+ 
+-#: ../gui/system-config-selinux.glade:3172
++#: ../gui/system-config-selinux.glade:3179
  msgid "label44"
  msgstr ""
  
-+#: ../gui/system-config-selinux.glade:3346
++#: ../gui/system-config-selinux.glade:3216
++msgid "Change process mode to permissive."
++msgstr ""
++
++#: ../gui/system-config-selinux.glade:3234
++msgid "Change process mode to enforcing"
++msgstr ""
++
++#: ../gui/system-config-selinux.glade:3326
++msgid "Process Domain"
++msgstr ""
++
++#: ../gui/system-config-selinux.glade:3354
 +msgid "label59"
 +msgstr ""
 +


Index: policycoreutils.spec
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils.spec,v
retrieving revision 1.585
retrieving revision 1.586
diff -u -r1.585 -r1.586
--- policycoreutils.spec	20 Jan 2009 14:58:16 -0000	1.585
+++ policycoreutils.spec	21 Jan 2009 22:16:06 -0000	1.586
@@ -6,7 +6,7 @@
 Summary: SELinux policy core utilities
 Name:	 policycoreutils
 Version: 2.0.61
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2+
 Group:	 System Environment/Base
 Source:	 http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@@ -206,6 +206,9 @@
 fi
 
 %changelog
+* Tue Jan 21 2009 Dan Walsh <dwalsh at redhat.com> 2.0.61-4
+- Fix Translations
+
 * Tue Jan 20 2009 Dan Walsh <dwalsh at redhat.com> 2.0.61-3
 - Add Domains Page to system-config-selinux
 - Add ability to create dbus confined applications to polgen



From dwalsh at fedoraproject.org  Wed Jan 21 22:49:25 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Wed, 21 Jan 2009 22:49:25 +0000 (UTC)
Subject: rpms/selinux-policy/devel policy-20090105.patch, 1.17,
	1.18 selinux-policy.spec, 1.772, 1.773
Message-ID: <20090121224925.D09D17012F@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv777

Modified Files:
	policy-20090105.patch selinux-policy.spec 
Log Message:
* Wed Jan 21 2009 Dan Walsh <dwalsh at redhat.com> 3.6.3-6
- Add wm policy
- Make mls work in graphics mode


policy-20090105.patch:

Index: policy-20090105.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-20090105.patch,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- policy-20090105.patch	21 Jan 2009 21:22:11 -0000	1.17
+++ policy-20090105.patch	21 Jan 2009 22:49:23 -0000	1.18
@@ -5130,7 +5130,7 @@
  /var/lib/nfs/rpc_pipefs(/.*)?	<<none>>
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.if serefpolicy-3.6.3/policy/modules/kernel/files.if
 --- nsaserefpolicy/policy/modules/kernel/files.if	2009-01-05 15:39:38.000000000 -0500
-+++ serefpolicy-3.6.3/policy/modules/kernel/files.if	2009-01-19 13:10:02.000000000 -0500
++++ serefpolicy-3.6.3/policy/modules/kernel/files.if	2009-01-21 17:33:03.000000000 -0500
 @@ -110,6 +110,11 @@
  ## </param>
  #
@@ -5340,7 +5340,7 @@
  	')
  ')
  
-@@ -4921,3 +5036,71 @@
+@@ -4921,3 +5036,95 @@
  
  	typeattribute $1 files_unconfined_type;
  ')
@@ -5412,6 +5412,30 @@
 +
 +	manage_lnk_files_pattern($1,var_run_t,var_run_t)
 +')
++
++########################################
++## <summary>
++##	manage generic symbolic links
++##	in the /var/run directory.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`files_boot',`
++	gen_require(`
++		type root_t;
++	')
++
++	allow $1 root_t:blk_file manage_blk_file_perms;
++	allow $1 root_t:chr_file manage_chr_file_perms;
++	manage_dirs_pattern($1, root_t, root_t)
++	manage_files_pattern($1, root_t, root_t)
++	manage_lnk_files_pattern($1, root_t, root_t)
++	can_exec(kernel_t, root_t)
++')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.te serefpolicy-3.6.3/policy/modules/kernel/files.te
 --- nsaserefpolicy/policy/modules/kernel/files.te	2009-01-05 15:39:38.000000000 -0500
 +++ serefpolicy-3.6.3/policy/modules/kernel/files.te	2009-01-19 13:10:02.000000000 -0500
@@ -5890,7 +5914,7 @@
  #
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/kernel.if serefpolicy-3.6.3/policy/modules/kernel/kernel.if
 --- nsaserefpolicy/policy/modules/kernel/kernel.if	2009-01-05 15:39:38.000000000 -0500
-+++ serefpolicy-3.6.3/policy/modules/kernel/kernel.if	2009-01-20 16:17:37.000000000 -0500
++++ serefpolicy-3.6.3/policy/modules/kernel/kernel.if	2009-01-21 17:29:54.000000000 -0500
 @@ -1197,6 +1197,7 @@
  	')
  
@@ -5997,7 +6021,7 @@
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/kernel.te serefpolicy-3.6.3/policy/modules/kernel/kernel.te
 --- nsaserefpolicy/policy/modules/kernel/kernel.te	2009-01-19 11:03:28.000000000 -0500
-+++ serefpolicy-3.6.3/policy/modules/kernel/kernel.te	2009-01-20 17:15:33.000000000 -0500
++++ serefpolicy-3.6.3/policy/modules/kernel/kernel.te	2009-01-21 17:46:13.000000000 -0500
 @@ -63,6 +63,15 @@
  genfscon debugfs / gen_context(system_u:object_r:debugfs_t,s0)
  
@@ -6061,11 +6085,12 @@
  
  mcs_process_set_categories(kernel_t)
  
-@@ -267,12 +287,17 @@
+@@ -267,12 +287,18 @@
  mls_process_write_down(kernel_t)
  mls_file_write_all_levels(kernel_t)
  mls_file_read_all_levels(kernel_t) 
 +mls_socket_write_all_levels(kernel_t) 
++mls_fd_share_all_levels(kernel_t) 
 +
 +logging_manage_generic_logs(kernel_t)
  
@@ -6079,7 +6104,7 @@
  tunable_policy(`read_default_t',`
  	files_list_default(kernel_t)
  	files_read_default_files(kernel_t)
-@@ -357,6 +382,10 @@
+@@ -357,6 +383,10 @@
  	unconfined_domain(kernel_t)
  ')
  
@@ -6090,6 +6115,12 @@
  ########################################
  #
  # Unlabeled process local policy
+@@ -386,3 +416,5 @@
+ allow kern_unconfined unlabeled_t:association *;
+ allow kern_unconfined unlabeled_t:packet *;
+ allow kern_unconfined unlabeled_t:process ~{ transition dyntransition execmem execstack execheap };
++
++files_boot(kernel_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/selinux.if serefpolicy-3.6.3/policy/modules/kernel/selinux.if
 --- nsaserefpolicy/policy/modules/kernel/selinux.if	2009-01-19 11:03:28.000000000 -0500
 +++ serefpolicy-3.6.3/policy/modules/kernel/selinux.if	2009-01-19 13:32:33.000000000 -0500
@@ -6197,8 +6228,17 @@
  ########################################
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/roles/auditadm.te serefpolicy-3.6.3/policy/modules/roles/auditadm.te
 --- nsaserefpolicy/policy/modules/roles/auditadm.te	2008-11-11 16:13:47.000000000 -0500
-+++ serefpolicy-3.6.3/policy/modules/roles/auditadm.te	2009-01-19 13:10:02.000000000 -0500
-@@ -32,158 +32,18 @@
++++ serefpolicy-3.6.3/policy/modules/roles/auditadm.te	2009-01-21 17:30:16.000000000 -0500
+@@ -17,6 +17,8 @@
+ 
+ allow auditadm_t self:capability { dac_read_search dac_override };
+ 
++kernel_read_ring_buffer(auditadm_t)
++
+ corecmd_exec_shell(auditadm_t)
+ 
+ domain_kill_all_domains(auditadm_t)
+@@ -32,158 +34,18 @@
  seutil_read_bin_policy(auditadm_t)
  
  optional_policy(`
@@ -21808,13 +21848,13 @@
  optional_policy(`
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/virt.te serefpolicy-3.6.3/policy/modules/services/virt.te
 --- nsaserefpolicy/policy/modules/services/virt.te	2009-01-19 11:06:49.000000000 -0500
-+++ serefpolicy-3.6.3/policy/modules/services/virt.te	2009-01-21 13:00:55.000000000 -0500
++++ serefpolicy-3.6.3/policy/modules/services/virt.te	2009-01-21 16:53:49.000000000 -0500
 @@ -53,7 +53,7 @@
  # virtd local policy
  #
  
 -allow virtd_t self:capability { dac_override kill net_admin setgid sys_nice sys_ptrace };
-+allow virtd_t self:capability { dac_override kill net_admin  net_raw setuid setgid sys_nice sys_ptrace };
++allow virtd_t self:capability { dac_override kill net_admin net_raw setuid setgid sys_admin sys_nice sys_ptrace };
  allow virtd_t self:process { getsched sigkill signal execmem };
  allow virtd_t self:fifo_file rw_file_perms;
  allow virtd_t self:unix_stream_socket create_stream_socket_perms;
@@ -23974,7 +24014,7 @@
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.te serefpolicy-3.6.3/policy/modules/system/init.te
 --- nsaserefpolicy/policy/modules/system/init.te	2009-01-19 11:07:34.000000000 -0500
-+++ serefpolicy-3.6.3/policy/modules/system/init.te	2009-01-20 17:11:43.000000000 -0500
++++ serefpolicy-3.6.3/policy/modules/system/init.te	2009-01-21 17:45:29.000000000 -0500
 @@ -17,6 +17,20 @@
  ## </desc>
  gen_tunable(init_upstart,false)
@@ -24077,11 +24117,12 @@
  
  can_exec(initrc_t,initrc_tmp_t)
  allow initrc_t initrc_tmp_t:file manage_file_perms;
-@@ -249,15 +278,18 @@
+@@ -249,15 +278,19 @@
  kernel_rw_all_sysctls(initrc_t)
  # for lsof which is used by alsa shutdown:
  kernel_dontaudit_getattr_message_if(initrc_t)
 +kernel_stream_connect(initrc_t)
++files_read_kernel_modules(initrc_t)
  
  files_read_kernel_symbol_table(initrc_t)
 +files_exec_etc_files(initrc_t)
@@ -24100,7 +24141,7 @@
  corenet_tcp_sendrecv_all_ports(initrc_t)
  corenet_udp_sendrecv_all_ports(initrc_t)
  corenet_tcp_connect_all_ports(initrc_t)
-@@ -274,7 +306,7 @@
+@@ -274,7 +307,7 @@
  dev_read_sound_mixer(initrc_t)
  dev_write_sound_mixer(initrc_t)
  dev_setattr_all_chr_files(initrc_t)
@@ -24109,7 +24150,7 @@
  dev_delete_lvm_control_dev(initrc_t)
  dev_manage_generic_symlinks(initrc_t)
  dev_manage_generic_files(initrc_t)
-@@ -328,7 +360,7 @@
+@@ -328,7 +361,7 @@
  domain_sigchld_all_domains(initrc_t)
  domain_read_all_domains_state(initrc_t)
  domain_getattr_all_domains(initrc_t)
@@ -24118,7 +24159,7 @@
  domain_getsession_all_domains(initrc_t)
  domain_use_interactive_fds(initrc_t)
  # for lsof which is used by alsa shutdown:
-@@ -367,6 +399,7 @@
+@@ -367,6 +400,7 @@
  libs_rw_ld_so_cache(initrc_t)
  libs_exec_lib_files(initrc_t)
  
@@ -24126,7 +24167,16 @@
  logging_send_syslog_msg(initrc_t)
  logging_manage_generic_logs(initrc_t)
  logging_read_all_logs(initrc_t)
-@@ -498,6 +531,7 @@
+@@ -451,7 +485,7 @@
+ 
+ 	# Red Hat systems seem to have a stray
+ 	# fd open from the initrd
+-	kernel_dontaudit_use_fds(initrc_t)
++	kernel_use_fds(initrc_t)
+ 	files_dontaudit_read_root_files(initrc_t)
+ 
+ 	selinux_set_enforce_mode(initrc_t)
+@@ -498,6 +532,7 @@
  	optional_policy(`
  		#for /etc/rc.d/init.d/nfs to create /etc/exports
  		rpc_write_exports(initrc_t)
@@ -24134,7 +24184,7 @@
  	')
  
  	optional_policy(`
-@@ -516,6 +550,31 @@
+@@ -516,6 +551,31 @@
  	')
  ')
  
@@ -24166,7 +24216,7 @@
  optional_policy(`
  	amavis_search_lib(initrc_t)
  	amavis_setattr_pid_files(initrc_t)
-@@ -570,6 +629,10 @@
+@@ -570,6 +630,10 @@
  	dbus_read_config(initrc_t)
  
  	optional_policy(`
@@ -24177,7 +24227,7 @@
  		networkmanager_dbus_chat(initrc_t)
  	')
  ')
-@@ -655,12 +718,6 @@
+@@ -655,12 +719,6 @@
  	mta_read_config(initrc_t)
  	mta_dontaudit_read_spool_symlinks(initrc_t)
  ')
@@ -24190,7 +24240,7 @@
  
  optional_policy(`
  	ifdef(`distro_redhat',`
-@@ -721,6 +778,9 @@
+@@ -721,6 +779,9 @@
  
  	# why is this needed:
  	rpm_manage_db(initrc_t)
@@ -24200,7 +24250,7 @@
  ')
  
  optional_policy(`
-@@ -733,10 +793,12 @@
+@@ -733,10 +794,12 @@
  	squid_manage_logs(initrc_t)
  ')
  
@@ -24213,7 +24263,7 @@
  
  optional_policy(`
  	ssh_dontaudit_read_server_keys(initrc_t)
-@@ -754,6 +816,11 @@
+@@ -754,6 +817,11 @@
  	uml_setattr_util_sockets(initrc_t)
  ')
  
@@ -24225,7 +24275,7 @@
  optional_policy(`
  	unconfined_domain(initrc_t)
  
-@@ -768,6 +835,10 @@
+@@ -768,6 +836,10 @@
  ')
  
  optional_policy(`
@@ -24236,7 +24286,7 @@
  	vmware_read_system_config(initrc_t)
  	vmware_append_system_config(initrc_t)
  ')
-@@ -790,3 +861,11 @@
+@@ -790,3 +862,11 @@
  optional_policy(`
  	zebra_read_config(initrc_t)
  ')
@@ -25246,7 +25296,7 @@
  
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/mount.te serefpolicy-3.6.3/policy/modules/system/mount.te
 --- nsaserefpolicy/policy/modules/system/mount.te	2009-01-05 15:39:43.000000000 -0500
-+++ serefpolicy-3.6.3/policy/modules/system/mount.te	2009-01-19 13:10:02.000000000 -0500
++++ serefpolicy-3.6.3/policy/modules/system/mount.te	2009-01-21 17:47:52.000000000 -0500
 @@ -18,17 +18,18 @@
  init_system_domain(mount_t,mount_exec_t)
  role system_r types mount_t;
@@ -25279,7 +25329,7 @@
  
  allow mount_t mount_loopback_t:file read_file_perms;
  
-@@ -47,12 +49,18 @@
+@@ -47,12 +49,19 @@
  
  files_tmp_filetrans(mount_t,mount_tmp_t,{ file dir })
  
@@ -25291,6 +25341,7 @@
  kernel_dontaudit_getattr_core_if(mount_t)
 +kernel_search_debugfs(mount_t)
 +kernel_setsched(mount_t)
++kernel_use_fds(mount_t)
  
  dev_getattr_all_blk_files(mount_t)
  dev_list_all_dev_nodes(mount_t)
@@ -25298,7 +25349,7 @@
  dev_rw_lvm_control(mount_t)
  dev_dontaudit_getattr_all_chr_files(mount_t)
  dev_dontaudit_getattr_memory_dev(mount_t)
-@@ -62,16 +70,19 @@
+@@ -62,16 +71,19 @@
  storage_raw_write_fixed_disk(mount_t)
  storage_raw_read_removable_device(mount_t)
  storage_raw_write_removable_device(mount_t)
@@ -25321,7 +25372,7 @@
  
  term_use_all_terms(mount_t)
  
-@@ -79,6 +90,7 @@
+@@ -79,6 +91,7 @@
  corecmd_exec_bin(mount_t)
  
  domain_use_interactive_fds(mount_t)
@@ -25329,7 +25380,7 @@
  
  files_search_all(mount_t)
  files_read_etc_files(mount_t)
-@@ -87,7 +99,7 @@
+@@ -87,7 +100,7 @@
  files_mounton_all_mountpoints(mount_t)
  files_unmount_rootfs(mount_t)
  # These rules need to be generalized.  Only admin, initrc should have it:
@@ -25338,7 +25389,7 @@
  files_mount_all_file_type_fs(mount_t)
  files_unmount_all_file_type_fs(mount_t)
  # for when /etc/mtab loses its type
-@@ -100,6 +112,8 @@
+@@ -100,6 +113,8 @@
  init_use_fds(mount_t)
  init_use_script_ptys(mount_t)
  init_dontaudit_getattr_initctl(mount_t)
@@ -25347,7 +25398,7 @@
  
  auth_use_nsswitch(mount_t)
  
-@@ -116,6 +130,7 @@
+@@ -116,6 +131,7 @@
  seutil_read_config(mount_t)
  
  userdom_use_all_users_fds(mount_t)
@@ -25355,7 +25406,7 @@
  
  ifdef(`distro_redhat',`
  	optional_policy(`
-@@ -133,7 +148,7 @@
+@@ -133,7 +149,7 @@
  
  tunable_policy(`allow_mount_anyfile',`
  	auth_read_all_dirs_except_shadow(mount_t)
@@ -25364,7 +25415,7 @@
  	files_mounton_non_security(mount_t)
  ')
  
-@@ -141,16 +156,16 @@
+@@ -141,16 +157,16 @@
  	# for nfs
  	corenet_all_recvfrom_unlabeled(mount_t)
  	corenet_all_recvfrom_netlabel(mount_t)
@@ -25389,7 +25440,7 @@
  	corenet_tcp_bind_generic_port(mount_t)
  	corenet_udp_bind_generic_port(mount_t)
  	corenet_tcp_bind_reserved_port(mount_t)
-@@ -164,6 +179,8 @@
+@@ -164,6 +180,8 @@
  	fs_search_rpc(mount_t)
  
  	rpc_stub(mount_t)
@@ -25398,7 +25449,7 @@
  ')
  
  optional_policy(`
-@@ -171,6 +188,15 @@
+@@ -171,6 +189,15 @@
  ')
  
  optional_policy(`
@@ -25414,7 +25465,7 @@
  	ifdef(`hide_broken_symptoms',`
  		# for a bug in the X server
  		rhgb_dontaudit_rw_stream_sockets(mount_t)
-@@ -178,6 +204,11 @@
+@@ -178,6 +205,11 @@
  	')
  ')
  
@@ -25426,7 +25477,7 @@
  # for kernel package installation
  optional_policy(`
  	rpm_rw_pipes(mount_t)
-@@ -185,6 +216,7 @@
+@@ -185,6 +217,7 @@
  
  optional_policy(`
  	samba_domtrans_smbmount(mount_t)
@@ -25434,7 +25485,7 @@
  ')
  
  ########################################
-@@ -195,4 +227,26 @@
+@@ -195,4 +228,26 @@
  optional_policy(`
  	files_etc_filetrans_etc_runtime(unconfined_mount_t,file)
  	unconfined_domain(unconfined_mount_t)


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.772
retrieving revision 1.773
diff -u -r1.772 -r1.773
--- selinux-policy.spec	21 Jan 2009 21:22:11 -0000	1.772
+++ selinux-policy.spec	21 Jan 2009 22:49:23 -0000	1.773
@@ -20,7 +20,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.6.3
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -445,7 +445,7 @@
 %endif
 
 %changelog
-* Wed Jan 21 2009 Dan Walsh <dwalsh at redhat.com> 3.6.3-5
+* Wed Jan 21 2009 Dan Walsh <dwalsh at redhat.com> 3.6.3-6
 - Add wm policy
 - Make mls work in graphics mode
 



From emaldonado at fedoraproject.org  Wed Jan 21 23:26:48 2009
From: emaldonado at fedoraproject.org (Elio Maldonado)
Date: Wed, 21 Jan 2009 23:26:48 +0000 (UTC)
Subject: rpms/crypto-utils/devel certwatch.c,1.17,1.18
Message-ID: <20090121232648.961997012F@cvs1.fedora.phx.redhat.com>

Author: emaldonado

Update of /cvs/extras/rpms/crypto-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4574

Modified Files:
	certwatch.c 
Log Message:
Fixed time calculations for cert expiry warnings (#473860)


Index: certwatch.c
===================================================================
RCS file: /cvs/extras/rpms/crypto-utils/devel/certwatch.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- certwatch.c	29 Dec 2008 01:20:53 -0000	1.17
+++ certwatch.c	21 Jan 2009 23:26:17 -0000	1.18
@@ -149,39 +149,11 @@
     return buf;
 }
 
-/* A leap year is divisible by 4 but not by 100 or divisible by 400 */
-static int leap_year(int year) {
-    return ((year % 4 == 0 && year % 100 != 0) || year % 400 == 0) ? 1 : 0;
-}
-
 /* Computes the day difference among two PRTime's */
 static int diff_time_days(PRTime aT, PRTime bT)
 {
-    PRTime am1, one;
-    PRExplodedTime a, b;
-    int years, days = 0;
-
-    LL_I2L(one, 1);
-
-    do {
-        PR_ExplodeTime(aT, PR_GMTParameters, &a);
-        PR_ExplodeTime(bT, PR_GMTParameters, &b);
-
-        years = a.tm_year - b.tm_year;
-        if (years < 0)
-            break;
-
-	    if (years == 0) {
-            days += (a.tm_yday - b.tm_yday);
-	    } else if (a.tm_year == b.tm_year + 1) {
-            days += (365 + leap_year(b.tm_year) - b.tm_yday + a.tm_yday);
-	    } else {
-            LL_SUB(am1, aT, one);
-            aT = am1;
-	    }
-    } while (0);
-
-    return days;
+    PRInt64 secs = (aT - bT) / PR_USEC_PER_SEC;
+    return secs / 86400L;
 }
 
 /* Print a warning message that the certificate in 'filename', issued



From emaldonado at fedoraproject.org  Wed Jan 21 23:30:17 2009
From: emaldonado at fedoraproject.org (Elio Maldonado)
Date: Wed, 21 Jan 2009 23:30:17 +0000 (UTC)
Subject: rpms/crypto-utils/devel crypto-utils.spec,1.50,1.51
Message-ID: <20090121233017.E1E0C7012F@cvs1.fedora.phx.redhat.com>

Author: emaldonado

Update of /cvs/extras/rpms/crypto-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5101

Modified Files:
	crypto-utils.spec 
Log Message:
Fixed cert expiry time warnings (#473860)


Index: crypto-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/crypto-utils/devel/crypto-utils.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- crypto-utils.spec	5 Jan 2009 23:55:03 -0000	1.50
+++ crypto-utils.spec	21 Jan 2009 23:29:47 -0000	1.51
@@ -4,7 +4,7 @@
 Summary: SSL certificate and key management utilities
 Name: crypto-utils
 Version: 2.4.1
-Release: 6
+Release: 7
 Source: crypto-rand-%{crver}.tar.gz
 Source1: genkey.pl
 Source2: certwatch.c
@@ -131,6 +131,9 @@
 %{perl_vendorarch}/auto/Crypt
 
 %changelog
+* Wed Jan 21 2009 Elio Maldonado <emaldona at redhat.com> - 2.4.1-7
+- certwatch: Fixed cert expiry time warnings (#473860)
+
 * Mon Jan 05 2009 Elio Maldonado <emaldona at redhat.com> - 2.4.1-6
 - genkey: fix ca key name extension
 



From astokes at fedoraproject.org  Wed Jan 21 23:36:12 2009
From: astokes at fedoraproject.org (Adam Stokes)
Date: Wed, 21 Jan 2009 23:36:12 +0000 (UTC)
Subject: rpms/sos/devel sos.spec,1.7,1.8 sources,1.4,1.5
Message-ID: <20090121233612.5867F7012F@cvs1.fedora.phx.redhat.com>

Author: astokes

Update of /cvs/pkgs/rpms/sos/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5846

Modified Files:
	sos.spec sources 
Log Message:
resolves bz434626, bz436053


Index: sos.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sos/devel/sos.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sos.spec	12 Jan 2009 23:51:22 -0000	1.7
+++ sos.spec	21 Jan 2009 23:35:41 -0000	1.8
@@ -5,7 +5,7 @@
 Summary: A set of tools to gather troubleshooting information from a system
 Name: sos
 Version: 1.8
-Release: 6%{?dist}
+Release: 9%{?dist}
 Group: Application/Tools
 Source0: https://fedorahosted.org/releases/s/o/sos/%{name}-%{version}.tar.gz
 License: GPLv2+
@@ -31,30 +31,32 @@
 
 %install
 rm -rf ${RPM_BUILD_ROOT}
-install -D -m644 gpgkeys/rhsupport.pub ${RPM_BUILD_ROOT}/usr/share/sos/rhsupport.pub
+install -D -m644 gpgkeys/rhsupport.pub ${RPM_BUILD_ROOT}/%{_datadir}/%{name}/rhsupport.pub
+install -D -m644 extras/sysreport/sysreport.legacy ${RPM_BUILD_ROOT}/%{_datadir}/%{name}/sysreport
 %{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
 ln -s /usr/sbin/sosreport $RPM_BUILD_ROOT/usr/sbin/sysreport
+%find_lang %{name}
 
 %clean
 rm -rf ${RPM_BUILD_ROOT}
 
-%files
+%files -f %{name}.lang
 %defattr(-,root,root,-)
 %{_bindir}/rh-upload-core
 %{_sbindir}/sosreport
 %{_sbindir}/sysreport
 %{_sbindir}/sysreport.legacy
-/usr/share/sysreport
-/usr/share/sos/rhsupport.pub
+%{_datadir}/%{name}
+%{_datadir}/sysreport
 %{python_sitelib}/*
 %{_mandir}/man1/sosreport.1.gz
-%{_localedir}/*/LC_MESSAGES/sos.mo
 %doc README README.rh-upload-core TODO LICENSE ChangeLog
 %config %{_sysconfdir}/sos.conf
 
 %changelog
-* Mon Jan 12 2009 Adam Stokes <ajs at redhat dot com> - 1.8-6
-- updated spec to include setuptools/egg file
+* Wed Jan 21 2009 Adam Stokes <ajs at redhat dot com> - 1.8-9
+- Resolves: bz436053 /usr/share/sos is not owned by any package 
+- Resolves: bz434626 Wrong directory structure for translations 
 
 * Mon Dec 29 2008 Adam Stokes <ajs at redhat dot com> - 1.8-5
 - removed source defines as python manifest handles this


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sos/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	12 Jan 2009 18:25:27 -0000	1.4
+++ sources	21 Jan 2009 23:35:42 -0000	1.5
@@ -1 +1 @@
-04ad06ffb0bc24f96f5704c0c577aaf8  sos-1.8.tar.gz
+75f91e5380dd1d31ccd6f7a2a9d242c4  sos-1.8.tar.gz



From astokes at fedoraproject.org  Wed Jan 21 23:37:36 2009
From: astokes at fedoraproject.org (Adam Stokes)
Date: Wed, 21 Jan 2009 23:37:36 +0000 (UTC)
Subject: rpms/sos/F-10 sos.spec,1.6,1.7 sources,1.4,1.5
Message-ID: <20090121233736.774357012F@cvs1.fedora.phx.redhat.com>

Author: astokes

Update of /cvs/pkgs/rpms/sos/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6047

Modified Files:
	sos.spec sources 
Log Message:
resolves bz434626, bz436053


Index: sos.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sos/F-10/sos.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sos.spec	12 Jan 2009 23:46:03 -0000	1.6
+++ sos.spec	21 Jan 2009 23:37:06 -0000	1.7
@@ -5,7 +5,7 @@
 Summary: A set of tools to gather troubleshooting information from a system
 Name: sos
 Version: 1.8
-Release: 6%{?dist}
+Release: 9%{?dist}
 Group: Application/Tools
 Source0: https://fedorahosted.org/releases/s/o/sos/%{name}-%{version}.tar.gz
 License: GPLv2+
@@ -31,30 +31,32 @@
 
 %install
 rm -rf ${RPM_BUILD_ROOT}
-install -D -m644 gpgkeys/rhsupport.pub ${RPM_BUILD_ROOT}/usr/share/sos/rhsupport.pub
+install -D -m644 gpgkeys/rhsupport.pub ${RPM_BUILD_ROOT}/%{_datadir}/%{name}/rhsupport.pub
+install -D -m644 extras/sysreport/sysreport.legacy ${RPM_BUILD_ROOT}/%{_datadir}/%{name}/sysreport
 %{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
 ln -s /usr/sbin/sosreport $RPM_BUILD_ROOT/usr/sbin/sysreport
+%find_lang %{name}
 
 %clean
 rm -rf ${RPM_BUILD_ROOT}
 
-%files
+%files -f %{name}.lang
 %defattr(-,root,root,-)
 %{_bindir}/rh-upload-core
 %{_sbindir}/sosreport
 %{_sbindir}/sysreport
 %{_sbindir}/sysreport.legacy
-/usr/share/sysreport
-/usr/share/sos/rhsupport.pub
+%{_datadir}/%{name}
+%{_datadir}/sysreport
 %{python_sitelib}/*
 %{_mandir}/man1/sosreport.1.gz
-%{_localedir}/*/LC_MESSAGES/sos.mo
 %doc README README.rh-upload-core TODO LICENSE ChangeLog
 %config %{_sysconfdir}/sos.conf
 
 %changelog
-* Mon Jan 12 2009 Adam Stokes <ajs at redhat dot com> - 1.8-6
-- updated spec to include setuptools/egg file
+* Wed Jan 21 2009 Adam Stokes <ajs at redhat dot com> - 1.8-9
+- Resolves: bz436053 /usr/share/sos is not owned by any package 
+- Resolves: bz434626 Wrong directory structure for translations 
 
 * Mon Dec 29 2008 Adam Stokes <ajs at redhat dot com> - 1.8-5
 - removed source defines as python manifest handles this


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sos/F-10/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	12 Jan 2009 18:31:32 -0000	1.4
+++ sources	21 Jan 2009 23:37:06 -0000	1.5
@@ -1 +1 @@
-04ad06ffb0bc24f96f5704c0c577aaf8  sos-1.8.tar.gz
+75f91e5380dd1d31ccd6f7a2a9d242c4  sos-1.8.tar.gz



From astokes at fedoraproject.org  Wed Jan 21 23:39:08 2009
From: astokes at fedoraproject.org (Adam Stokes)
Date: Wed, 21 Jan 2009 23:39:08 +0000 (UTC)
Subject: rpms/sos/F-9 sos.spec,1.4,1.5 sources,1.4,1.5
Message-ID: <20090121233908.8965B7012F@cvs1.fedora.phx.redhat.com>

Author: astokes

Update of /cvs/pkgs/rpms/sos/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6255

Modified Files:
	sos.spec sources 
Log Message:
resolves bz434626, bz436053


Index: sos.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sos/F-9/sos.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sos.spec	12 Jan 2009 18:47:00 -0000	1.4
+++ sos.spec	21 Jan 2009 23:38:38 -0000	1.5
@@ -5,7 +5,7 @@
 Summary: A set of tools to gather troubleshooting information from a system
 Name: sos
 Version: 1.8
-Release: 6%{?dist}
+Release: 9%{?dist}
 Group: Application/Tools
 Source0: https://fedorahosted.org/releases/s/o/sos/%{name}-%{version}.tar.gz
 License: GPLv2+
@@ -31,30 +31,32 @@
 
 %install
 rm -rf ${RPM_BUILD_ROOT}
-install -D -m644 gpgkeys/rhsupport.pub ${RPM_BUILD_ROOT}/usr/share/sos/rhsupport.pub
+install -D -m644 gpgkeys/rhsupport.pub ${RPM_BUILD_ROOT}/%{_datadir}/%{name}/rhsupport.pub
+install -D -m644 extras/sysreport/sysreport.legacy ${RPM_BUILD_ROOT}/%{_datadir}/%{name}/sysreport
 %{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
 ln -s /usr/sbin/sosreport $RPM_BUILD_ROOT/usr/sbin/sysreport
+%find_lang %{name}
 
 %clean
 rm -rf ${RPM_BUILD_ROOT}
 
-%files
+%files -f %{name}.lang
 %defattr(-,root,root,-)
 %{_bindir}/rh-upload-core
 %{_sbindir}/sosreport
 %{_sbindir}/sysreport
 %{_sbindir}/sysreport.legacy
-/usr/share/sysreport
-/usr/share/sos/rhsupport.pub
+%{_datadir}/%{name}
+%{_datadir}/sysreport
 %{python_sitelib}/*
 %{_mandir}/man1/sosreport.1.gz
-%{_localedir}/*/LC_MESSAGES/sos.mo
 %doc README README.rh-upload-core TODO LICENSE ChangeLog
 %config %{_sysconfdir}/sos.conf
 
 %changelog
-* Mon Jan 12 2009 Adam Stokes <ajs at redhat dot com> - 1.8-6
-- updated spec to include setuptools/egg file
+* Wed Jan 21 2009 Adam Stokes <ajs at redhat dot com> - 1.8-9
+- Resolves: bz436053 /usr/share/sos is not owned by any package 
+- Resolves: bz434626 Wrong directory structure for translations 
 
 * Mon Dec 29 2008 Adam Stokes <ajs at redhat dot com> - 1.8-5
 - removed source defines as python manifest handles this


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sos/F-9/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	12 Jan 2009 18:32:58 -0000	1.4
+++ sources	21 Jan 2009 23:38:38 -0000	1.5
@@ -1 +1 @@
-04ad06ffb0bc24f96f5704c0c577aaf8  sos-1.8.tar.gz
+75f91e5380dd1d31ccd6f7a2a9d242c4  sos-1.8.tar.gz



From jkeating at fedoraproject.org  Wed Jan 21 23:43:46 2009
From: jkeating at fedoraproject.org (Jesse Keating)
Date: Wed, 21 Jan 2009 23:43:46 +0000 (UTC)
Subject: fedora-release fedora-rawhide.repo, 1.3,
	1.4 fedora-updates-testing.repo, 1.11, 1.12 fedora-updates.repo,
	1.15, 1.16 fedora.repo, 1.13, 1.14
Message-ID: <20090121234346.603E47012F@cvs1.fedora.phx.redhat.com>

Author: jkeating

Update of /cvs/fedora/fedora-release
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7488

Modified Files:
	fedora-rawhide.repo fedora-updates-testing.repo 
	fedora-updates.repo fedora.repo 
Log Message:
Use metalink for getting mirrors



Index: fedora-rawhide.repo
===================================================================
RCS file: /cvs/fedora/fedora-release/fedora-rawhide.repo,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- fedora-rawhide.repo	16 Sep 2008 00:07:48 -0000	1.3
+++ fedora-rawhide.repo	21 Jan 2009 23:43:46 -0000	1.4
@@ -22,7 +22,8 @@
 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
+#mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=$basearch
+metalink=https://mirrors.fedoraproject.org/metalink?repo=rawhide&arch=$basearch
 enabled=1
 gpgcheck=0
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-test-$basearch file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$basearch
@@ -31,7 +32,8 @@
 name=Fedora - Rawhide - Debug
 failovermethod=priority
 #baseurl=http://download.fedoraproject.org/pub/fedora/linux/development/$basearch/debug/
-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide-debug&arch=$basearch
+#mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide-debug&arch=$basearch
+metalink=https://mirrors.fedoraproject.org/metalink?repo=rawhide-debug&arch=$basearch
 enabled=0
 gpgcheck=0
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-test-$basearch file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$basearch
@@ -40,7 +42,8 @@
 name=Fedora - Rawhide - Source
 failovermethod=priority
 #baseurl=http://download.fedoraproject.org/pub/fedora/linux/development/source/SRPMS/
-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide-source&arch=$basearch
+#mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide-source&arch=$basearch
+metalink=https://mirrors.fedoraproject.org/metalink?repo=rawhide-source&arch=$basearch
 enabled=0
 gpgcheck=0
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-test-$basearch file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$basearch


Index: fedora-updates-testing.repo
===================================================================
RCS file: /cvs/fedora/fedora-release/fedora-updates-testing.repo,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- fedora-updates-testing.repo	23 Jun 2008 20:24:13 -0000	1.11
+++ fedora-updates-testing.repo	21 Jan 2009 23:43:46 -0000	1.12
@@ -2,7 +2,8 @@
 name=Fedora $releasever - $basearch - Test Updates
 failovermethod=priority
 #baseurl=http://download.fedoraproject.org/pub/fedora/linux/updates/testing/$releasever/$basearch/
-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-testing-f$releasever&arch=$basearch
+#mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-testing-f$releasever&arch=$basearch
+metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-testing-f$releasever&arch=$basearch
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-test-$basearch
@@ -11,7 +12,8 @@
 name=Fedora $releasever - $basearch - Test Updates Debug
 failovermethod=priority
 #baseurl=http://download.fedoraproject.org/pub/fedora/linux/updates/testing/$releasever/$basearch/debug/
-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-testing-debug-f$releasever&arch=$basearch
+#mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-testing-debug-f$releasever&arch=$basearch
+metalink=http://mirrors.fedoraproject.org/metalink?repo=updates-testing-debug-f$releasever&arch=$basearch
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-test-$basearch
@@ -20,7 +22,8 @@
 name=Fedora $releasever - Test Updates Source
 failovermethod=priority
 #baseurl=http://download.fedoraproject.org/pub/fedora/linux/updates/testing/$releasever/SRPMS/
-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-testing-source-f$releasever&arch=$basearch
+#mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-testing-source-f$releasever&arch=$basearch
+metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-testing-source-f$releasever&arch=$basearch
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-test-$basearch


Index: fedora-updates.repo
===================================================================
RCS file: /cvs/fedora/fedora-release/fedora-updates.repo,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- fedora-updates.repo	23 Jun 2008 20:24:13 -0000	1.15
+++ fedora-updates.repo	21 Jan 2009 23:43:46 -0000	1.16
@@ -2,7 +2,8 @@
 name=Fedora $releasever - $basearch - Updates
 failovermethod=priority
 #baseurl=http://download.fedoraproject.org/pub/fedora/linux/updates/$releasever/$basearch/
-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f$releasever&arch=$basearch
+#mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f$releasever&arch=$basearch
+metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-f$releasever&arch=$basearch
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$basearch
@@ -11,7 +12,8 @@
 name=Fedora $releasever - $basearch - Updates - Debug
 failovermethod=priority
 #baseurl=http://download.fedoraproject.org/pub/fedora/linux/updates/$releasever/$basearch/debug/
-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-debug-f$releasever&arch=$basearch
+#mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-debug-f$releasever&arch=$basearch
+metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-debug-f$releasever&arch=$basearch
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$basearch
@@ -20,7 +22,8 @@
 name=Fedora $releasever - Updates Source
 failovermethod=priority
 #baseurl=http://download.fedoraproject.org/pub/fedora/linux/updates/$releasever/SRPMS/
-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-source-f$releasever&arch=$basearch
+#mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-source-f$releasever&arch=$basearch
+metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-source-f$releasever&arch=$basearch
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$basearch


Index: fedora.repo
===================================================================
RCS file: /cvs/fedora/fedora-release/fedora.repo,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- fedora.repo	23 Jun 2008 20:24:13 -0000	1.13
+++ fedora.repo	21 Jan 2009 23:43:46 -0000	1.14
@@ -2,7 +2,8 @@
 name=Fedora $releasever - $basearch
 failovermethod=priority
 #baseurl=http://download.fedoraproject.org/pub/fedora/linux/releases/$releasever/Everything/$basearch/os/
-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-$releasever&arch=$basearch
+#mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-$releasever&arch=$basearch
+metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&arch=$basearch
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$basearch
@@ -11,7 +12,8 @@
 name=Fedora $releasever - $basearch - Debug
 failovermethod=priority
 #baseurl=http://download.fedoraproject.org/pub/fedora/linux/releases/$releasever/Everything/$basearch/debug/
-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-debug-$releasever&arch=$basearch
+#mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-debug-$releasever&arch=$basearch
+metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-debug-$releasever&arch=$basearch
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$basearch
@@ -20,7 +22,8 @@
 name=Fedora $releasever - Source
 failovermethod=priority
 #baseurl=http://download.fedoraproject.org/pub/fedora/linux/releases/$releasever/Everything/source/SRPMS/
-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-source-$releasever&arch=$basearch
+#mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-source-$releasever&arch=$basearch
+metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-source-$releasever&arch=$basearch
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$basearch



From pkgdb at fedoraproject.org  Wed Jan 21 23:46:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 21 Jan 2009 23:46:03 +0000
Subject: [pkgdb] grads: deji has requested watchcommits
Message-ID: <20090121234603.C8B5E20847E@bastion.fedora.phx.redhat.com>

deji has requested the watchcommits acl on grads (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/grads



From pkgdb at fedoraproject.org  Wed Jan 21 23:46:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 21 Jan 2009 23:46:03 +0000
Subject: [pkgdb] grads: deji has requested commit
Message-ID: <20090121234603.E4889208481@bastion.fedora.phx.redhat.com>

deji has requested the commit acl on grads (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/grads



From pkgdb at fedoraproject.org  Wed Jan 21 23:46:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 21 Jan 2009 23:46:06 +0000
Subject: [pkgdb] grads: deji has requested approveacls
Message-ID: <20090121234606.65EE5208483@bastion.fedora.phx.redhat.com>

deji has requested the approveacls acl on grads (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/grads



From jkeating at fedoraproject.org  Wed Jan 21 23:46:35 2009
From: jkeating at fedoraproject.org (Jesse Keating)
Date: Wed, 21 Jan 2009 23:46:35 +0000 (UTC)
Subject: fedora-release fedora-release.spec,1.67,1.68
Message-ID: <20090121234635.D47FE7012F@cvs1.fedora.phx.redhat.com>

Author: jkeating

Update of /cvs/fedora/fedora-release
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8012

Modified Files:
	fedora-release.spec 
Log Message:
Update for f11 alpha



Index: fedora-release.spec
===================================================================
RCS file: /cvs/fedora/fedora-release/fedora-release.spec,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- fedora-release.spec	1 Oct 2008 23:01:22 -0000	1.67
+++ fedora-release.spec	21 Jan 2009 23:46:35 -0000	1.68
@@ -3,7 +3,7 @@
 
 Summary:	Fedora release files
 Name:		fedora-release
-Version:	10.90
+Version:	10.91
 Release:	1
 License:	GPLv2
 Group:		System Environment/Base
@@ -12,7 +12,7 @@
 Obsoletes:	redhat-release
 Provides:	redhat-release
 Provides:	system-release = %{version}-%{release}
-Requires:	fedora-release-notes >= 8
+Requires:	fedora-release-notes >= 10
 # 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
@@ -97,6 +97,10 @@
 /etc/pki/rpm-gpg/*
 
 %changelog
+* Wed Jan 21 2009 Jesse Keating <jkeating at redhat.com> - 10.91-1
+- Update for Fedora 11 Alpha
+- Use metalink urls to get mirror information
+
 * Wed Oct 01 2008 Jesse Keating <jkeating at redhat.com> - 10.90-1
 - Initial build for Fedora 11.
 



From jkeating at fedoraproject.org  Wed Jan 21 23:50:28 2009
From: jkeating at fedoraproject.org (Jesse Keating)
Date: Wed, 21 Jan 2009 23:50:28 +0000 (UTC)
Subject: rpms/fedora-release/devel .cvsignore, 1.35, 1.36 fedora-release.spec,
	1.69, 1.70 sources, 1.57, 1.58
Message-ID: <20090121235028.592C67012F@cvs1.fedora.phx.redhat.com>

Author: jkeating

Update of /cvs/pkgs/rpms/fedora-release/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8511

Modified Files:
	.cvsignore fedora-release.spec sources 
Log Message:
* Wed Jan 21 2009 Jesse Keating <jkeating at redhat.com> - 10.91-1
- Update for Fedora 11 Alpha
- Use metalink urls to get mirror information



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-release/devel/.cvsignore,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- .cvsignore	1 Oct 2008 23:03:31 -0000	1.35
+++ .cvsignore	21 Jan 2009 23:49:57 -0000	1.36
@@ -1 +1 @@
-fedora-release-10.90.tar.gz
+fedora-release-10.91.tar.gz


Index: fedora-release.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-release/devel/fedora-release.spec,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- fedora-release.spec	1 Oct 2008 23:03:31 -0000	1.69
+++ fedora-release.spec	21 Jan 2009 23:49:57 -0000	1.70
@@ -3,7 +3,7 @@
 
 Summary:	Fedora release files
 Name:		fedora-release
-Version:	10.90
+Version:	10.91
 Release:	1
 License:	GPLv2
 Group:		System Environment/Base
@@ -12,7 +12,7 @@
 Obsoletes:	redhat-release
 Provides:	redhat-release
 Provides:	system-release = %{version}-%{release}
-Requires:	fedora-release-notes >= 8
+Requires:	fedora-release-notes >= 10
 # 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
@@ -97,6 +97,10 @@
 /etc/pki/rpm-gpg/*
 
 %changelog
+* Wed Jan 21 2009 Jesse Keating <jkeating at redhat.com> - 10.91-1
+- Update for Fedora 11 Alpha
+- Use metalink urls to get mirror information
+
 * Wed Oct 01 2008 Jesse Keating <jkeating at redhat.com> - 10.90-1
 - Initial build for Fedora 11.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-release/devel/sources,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- sources	1 Oct 2008 23:03:31 -0000	1.57
+++ sources	21 Jan 2009 23:49:57 -0000	1.58
@@ -1 +1 @@
-0540864813d57e71bb9f84171afdfd23  fedora-release-10.90.tar.gz
+d042c02fb14dfd77da65c907eec5062a  fedora-release-10.91.tar.gz



From cwickert at fedoraproject.org  Wed Jan 21 23:57:24 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Wed, 21 Jan 2009 23:57:24 +0000 (UTC)
Subject: rpms/xfconf/devel xfconf.spec,1.3,1.4
Message-ID: <20090121235724.B916470032@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/xfconf/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9269

Modified Files:
	xfconf.spec 
Log Message:
* Tue Jan 13 2009 Christoph Wickert <cwickert at fedoraproject.org> - 4.5.93-2
- Add Obsoletes for mcs devel package



Index: xfconf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfconf/devel/xfconf.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xfconf.spec	18 Jan 2009 23:43:06 -0000	1.3
+++ xfconf.spec	21 Jan 2009 23:56:54 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           xfconf
 Version:        4.5.93
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Hierarchical configuration system for Xfce
 
 Group:          User Interface/Desktops
@@ -36,6 +36,7 @@
 Requires: dbus-glib-devel
 Requires: glib2-devel
 Obsoletes: libxfce4mcs-devel < 4.4.3-2
+Obsoletes: xfce-mcs-manager-devel < 4.4.3-2
 
 %description devel
 This package includes the libraries and header files you will need
@@ -107,6 +108,9 @@
 %{_mandir}/man3/*.3*
 
 %changelog
+* Tue Jan 13 2009 Christoph Wickert <cwickert at fedoraproject.org> - 4.5.93-2
+- Add Obsoletes for mcs devel package
+
 * Tue Jan 13 2009 Kevin Fenzi <kevin at tummy.com> - 4.5.93-1
 - Update to 4.5.93
 



From snirkel at fedoraproject.org  Thu Jan 22 00:11:08 2009
From: snirkel at fedoraproject.org (Linus Walleij)
Date: Thu, 22 Jan 2009 00:11:08 +0000 (UTC)
Subject: rpms/libmtp/devel .cvsignore, 1.21, 1.22 libmtp.spec, 1.30,
	1.31 sources, 1.21, 1.22
Message-ID: <20090122001108.6459C70141@cvs1.fedora.phx.redhat.com>

Author: snirkel

Update of /cvs/extras/rpms/libmtp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10477

Modified Files:
	.cvsignore libmtp.spec sources 
Log Message:
New upstream bugfix release.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libmtp/devel/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- .cvsignore	21 Dec 2008 13:26:59 -0000	1.21
+++ .cvsignore	22 Jan 2009 00:10:37 -0000	1.22
@@ -1 +1 @@
-libmtp-0.3.5.tar.gz
+libmtp-0.3.6.tar.gz


Index: libmtp.spec
===================================================================
RCS file: /cvs/extras/rpms/libmtp/devel/libmtp.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- libmtp.spec	21 Dec 2008 13:26:59 -0000	1.30
+++ libmtp.spec	22 Jan 2009 00:10:38 -0000	1.31
@@ -2,7 +2,7 @@
 # RPM repository.
 
 Name:           libmtp
-Version:        0.3.5
+Version:        0.3.6
 Release:        1%{?dist}
 Summary:        A software library for MTP media players
 URL:            http://libmtp.sourceforge.net/
@@ -106,6 +106,9 @@
 
 
 %changelog
+* Thu Jan 22 2009 Linus Walleij <triad at df.lth.se> 0.3.6-1
+- New upstream bugfix release.
+
 * Sun Dec 21 2008 Linus Walleij <triad at df.lth.se> 0.3.5-1
 - New upstream bugfix release.
 - Nuke documentation again. Multilib no like.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libmtp/devel/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sources	21 Dec 2008 13:27:00 -0000	1.21
+++ sources	22 Jan 2009 00:10:38 -0000	1.22
@@ -1 +1 @@
-f0f81936f26908456e2a21f61ae32dbb  libmtp-0.3.5.tar.gz
+a45d9d058757c047661481e7e341ac9b  libmtp-0.3.6.tar.gz



From snirkel at fedoraproject.org  Thu Jan 22 00:12:40 2009
From: snirkel at fedoraproject.org (Linus Walleij)
Date: Thu, 22 Jan 2009 00:12:40 +0000 (UTC)
Subject: rpms/libmtp/F-10 .cvsignore, 1.21, 1.22 libmtp.spec, 1.30,
	1.31 sources, 1.21, 1.22
Message-ID: <20090122001240.DF12270033@cvs1.fedora.phx.redhat.com>

Author: snirkel

Update of /cvs/extras/rpms/libmtp/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11366

Modified Files:
	.cvsignore libmtp.spec sources 
Log Message:
New upstream bugfix release.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libmtp/F-10/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- .cvsignore	21 Dec 2008 13:28:43 -0000	1.21
+++ .cvsignore	22 Jan 2009 00:12:10 -0000	1.22
@@ -1 +1 @@
-libmtp-0.3.5.tar.gz
+libmtp-0.3.6.tar.gz


Index: libmtp.spec
===================================================================
RCS file: /cvs/extras/rpms/libmtp/F-10/libmtp.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- libmtp.spec	21 Dec 2008 13:28:43 -0000	1.30
+++ libmtp.spec	22 Jan 2009 00:12:10 -0000	1.31
@@ -2,7 +2,7 @@
 # RPM repository.
 
 Name:           libmtp
-Version:        0.3.5
+Version:        0.3.6
 Release:        1%{?dist}
 Summary:        A software library for MTP media players
 URL:            http://libmtp.sourceforge.net/
@@ -106,6 +106,9 @@
 
 
 %changelog
+* Thu Jan 22 2009 Linus Walleij <triad at df.lth.se> 0.3.6-1
+- New upstream bugfix release.
+
 * Sun Dec 21 2008 Linus Walleij <triad at df.lth.se> 0.3.5-1
 - New upstream bugfix release.
 - Nuke documentation again. Multilib no like.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libmtp/F-10/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sources	21 Dec 2008 13:28:43 -0000	1.21
+++ sources	22 Jan 2009 00:12:10 -0000	1.22
@@ -1 +1 @@
-f0f81936f26908456e2a21f61ae32dbb  libmtp-0.3.5.tar.gz
+a45d9d058757c047661481e7e341ac9b  libmtp-0.3.6.tar.gz



From cwickert at fedoraproject.org  Thu Jan 22 00:29:53 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Thu, 22 Jan 2009 00:29:53 +0000 (UTC)
Subject: rpms/xfconf/devel xfconf.spec,1.4,1.5
Message-ID: <20090122002953.6A9E870033@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/xfconf/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12886

Modified Files:
	xfconf.spec 
Log Message:
fix date in changelog


Index: xfconf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfconf/devel/xfconf.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- xfconf.spec	21 Jan 2009 23:56:54 -0000	1.4
+++ xfconf.spec	22 Jan 2009 00:29:23 -0000	1.5
@@ -108,7 +108,7 @@
 %{_mandir}/man3/*.3*
 
 %changelog
-* Tue Jan 13 2009 Christoph Wickert <cwickert at fedoraproject.org> - 4.5.93-2
+* Thu Jan 22 2009 Christoph Wickert <cwickert at fedoraproject.org> - 4.5.93-2
 - Add Obsoletes for mcs devel package
 
 * Tue Jan 13 2009 Kevin Fenzi <kevin at tummy.com> - 4.5.93-1



From dcantrel at fedoraproject.org  Thu Jan 22 00:32:37 2009
From: dcantrel at fedoraproject.org (David Cantrell)
Date: Thu, 22 Jan 2009 00:32:37 +0000 (UTC)
Subject: rpms/anaconda/devel .cvsignore, 1.600, 1.601 anaconda.spec, 1.744, 
	1.745 sources, 1.735, 1.736
Message-ID: <20090122003237.9FE9F70033@cvs1.fedora.phx.redhat.com>

Author: dcantrel

Update of /cvs/pkgs/rpms/anaconda/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13180

Modified Files:
	.cvsignore anaconda.spec sources 
Log Message:
* Wed Jan 21 2009 David Cantrell <dcantrell at redhat.com> - 11.5.0.11-1
- Fix a logic problem with network file write outs. (480769) (jkeating)
- Only run selectBestKernel, selectBootloader, etc. for new installs.
  (wwoods)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/devel/.cvsignore,v
retrieving revision 1.600
retrieving revision 1.601
diff -u -r1.600 -r1.601
--- .cvsignore	20 Jan 2009 03:48:26 -0000	1.600
+++ .cvsignore	22 Jan 2009 00:32:07 -0000	1.601
@@ -1,3 +1 @@
-anaconda-11.5.0.8.tar.bz2
-anaconda-11.5.0.9.tar.bz2
-anaconda-11.5.0.10.tar.bz2
+anaconda-11.5.0.11.tar.bz2


Index: anaconda.spec
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/devel/anaconda.spec,v
retrieving revision 1.744
retrieving revision 1.745
diff -u -r1.744 -r1.745
--- anaconda.spec	20 Jan 2009 03:48:26 -0000	1.744
+++ anaconda.spec	22 Jan 2009 00:32:07 -0000	1.745
@@ -2,7 +2,7 @@
 
 Summary: Graphical system installer
 Name:    anaconda
-Version: 11.5.0.10
+Version: 11.5.0.11
 Release: 1
 License: GPLv2+
 Group:   Applications/System
@@ -204,6 +204,11 @@
 %endif
 
 %changelog
+* Wed Jan 21 2009 David Cantrell <dcantrell at redhat.com> - 11.5.0.11-1
+- Fix a logic problem with network file write outs. (480769) (jkeating)
+- Only run selectBestKernel, selectBootloader, etc. for new installs.
+  (wwoods)
+
 * Mon Jan 19 2009 Chris Lumens <clumens at redhat.com> - 11.5.0.10-1
 - btrfs install support (sandeen)
 - Default / to be ext4 (katzj)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/devel/sources,v
retrieving revision 1.735
retrieving revision 1.736
diff -u -r1.735 -r1.736
--- sources	20 Jan 2009 03:48:26 -0000	1.735
+++ sources	22 Jan 2009 00:32:07 -0000	1.736
@@ -1 +1 @@
-50f5ac4610bf4e67cac2b2f27d276f35  anaconda-11.5.0.10.tar.bz2
+41cd7433c70bf80a85d6fc17a227d2c1  anaconda-11.5.0.11.tar.bz2



From nsantos at fedoraproject.org  Thu Jan 22 00:58:50 2009
From: nsantos at fedoraproject.org (Nuno Santos)
Date: Thu, 22 Jan 2009 00:58:50 +0000 (UTC)
Subject: rpms/qpidc/F-9 qpidc.spec,1.46,1.47
Message-ID: <20090122005850.AE54E70033@cvs1.fedora.phx.redhat.com>

Author: nsantos

Update of /cvs/extras/rpms/qpidc/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15871

Modified Files:
	qpidc.spec 
Log Message:
BZ474614 and BZ474613 - qpidc/rhm unowned directories


Index: qpidc.spec
===================================================================
RCS file: /cvs/extras/rpms/qpidc/F-9/qpidc.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- qpidc.spec	21 Jan 2009 19:57:47 -0000	1.46
+++ qpidc.spec	22 Jan 2009 00:58:20 -0000	1.47
@@ -7,7 +7,7 @@
 
 Name:           qpidc
 Version:        0.4.734452
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Libraries for Qpid C++ client applications
 Group:          System Environment/Libraries
 License:        ASL 2.0



From nsantos at fedoraproject.org  Thu Jan 22 01:00:17 2009
From: nsantos at fedoraproject.org (Nuno Santos)
Date: Thu, 22 Jan 2009 01:00:17 +0000 (UTC)
Subject: rpms/qpidc/F-10 qpidc.spec,1.60,1.61
Message-ID: <20090122010017.D08E770033@cvs1.fedora.phx.redhat.com>

Author: nsantos

Update of /cvs/extras/rpms/qpidc/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16095

Modified Files:
	qpidc.spec 
Log Message:
BZ474614 and BZ474613 - qpidc/rhm unowned directories


Index: qpidc.spec
===================================================================
RCS file: /cvs/extras/rpms/qpidc/F-10/qpidc.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- qpidc.spec	21 Jan 2009 21:06:14 -0000	1.60
+++ qpidc.spec	22 Jan 2009 00:59:47 -0000	1.61
@@ -7,7 +7,7 @@
 
 Name:           qpidc
 Version:        0.4.734452
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Libraries for Qpid C++ client applications
 Group:          System Environment/Libraries
 License:        ASL 2.0



From ianweller at fedoraproject.org  Thu Jan 22 01:34:21 2009
From: ianweller at fedoraproject.org (Ian Weller)
Date: Thu, 22 Jan 2009 01:34:21 +0000 (UTC)
Subject: rpms/fedora-business-cards/devel fedora-business-cards.spec, 1.8,
	1.9
Message-ID: <20090122013421.A9A4C70033@cvs1.fedora.phx.redhat.com>

Author: ianweller

Update of /cvs/pkgs/rpms/fedora-business-cards/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19059

Modified Files:
	fedora-business-cards.spec 
Log Message:
update spec to 0.2.4-3 to fix dependency on MgOpen fonts


Index: fedora-business-cards.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-business-cards/devel/fedora-business-cards.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- fedora-business-cards.spec	31 Dec 2008 16:26:12 -0000	1.8
+++ fedora-business-cards.spec	22 Jan 2009 01:33:51 -0000	1.9
@@ -2,7 +2,7 @@
 
 Name:           fedora-business-cards
 Version:        0.2.4
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        The Fedora business card generator
 
 Group:          Applications/Multimedia
@@ -17,7 +17,7 @@
 %if 0%{fedora} < 11
 Requires:       mgopen-fonts
 %else
-Requires:       mgopen-fonts-modata mgopen-fonts-moderna
+Requires:       mgopen-modata-fonts mgopen-moderna-fonts
 %endif
 
 
@@ -54,6 +54,9 @@
 
 
 %changelog
+* Wed Jan 21 2009 Ian Weller <ianweller at gmail.com> 0.2.4-3
+- Fix F11 dependency on the MgOpen fonts (again)
+
 * Wed Dec 31 2008 Ian Weller <ianweller at gmail.com> 0.2.4-2
 - Fix F11 dependency on the MgOpen fonts
 



From cchance at fedoraproject.org  Thu Jan 22 02:17:09 2009
From: cchance at fedoraproject.org (Caius Chance)
Date: Thu, 22 Jan 2009 02:17:09 +0000 (UTC)
Subject: rpms/cjkuni-fonts/devel cjkuni-fonts.spec,1.1,1.2
Message-ID: <20090122021709.D097970033@cvs1.fedora.phx.redhat.com>

Author: cchance

Update of /cvs/pkgs/rpms/cjkuni-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23502

Modified Files:
	cjkuni-fonts.spec 
Log Message:
* Thu Jan 22 2009 Caius Chance <cchance at redhat.com> - 0.2.20080216.1-17.fc11
- Resolves: rhbz#477373
- Refined package dependencies and compat font symlinks.



Index: cjkuni-fonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cjkuni-fonts/devel/cjkuni-fonts.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cjkuni-fonts.spec	21 Jan 2009 03:37:41 -0000	1.1
+++ cjkuni-fonts.spec	22 Jan 2009 02:16:39 -0000	1.2
@@ -7,12 +7,12 @@
 %define gsdir           %{_datadir}/ghostscript/conf.d
 %define catalogue       %{_sysconfdir}/X11/fontpath.d
 
-%define umingbuilddir   %{name}-uming-%{version}
-%define ukaibuilddir    %{name}-ukai-%{version}
+%define umingbuilddir   %{fontname}-uming-fonts-%{version}
+%define ukaibuilddir    %{fontname}-ukai-fonts-%{version}
 
 Name:        %{fontname}-fonts
 Version:     0.2.20080216.1
-Release:     16%{?dist}
+Release:     17%{?dist}
 Summary:     Chinese Unicode TrueType fonts in Ming and Kai face.
 License:     Arphic
 Group:       User Interface/X
@@ -39,10 +39,7 @@
 Summary:      Chinese Unicode TrueType font in Ming face.
 Group:        User Interface/X
 Requires:     %{fontname}-fonts-common = %{version}-%{release}
-Conflicts:    fonts-chinese <= 3.03-9.fc8
-Obsoletes:    fonts-chinese < 3.03-13
-Obsoletes:    ttfonts-zh_CN <= 2.14-10, ttfonts-zh_TW <= 2.11-28
-Obsoletes:    %{name}-uming < 0.2.20080216.1-16
+Obsoletes:    cjkunifonts-uming < 0.2.20080216.1-16
 
 %description -n %{fontname}-uming-fonts
 %common_desc
@@ -67,10 +64,7 @@
 Summary:      Chinese Unicode TrueType font in Kai face.
 Group:        User Interface/X
 Requires:     %{fontname}-fonts-common = %{version}-%{release}
-Conflicts:    fonts-chinese <= 3.03-9.fc8
-Obsoletes:    fonts-chinese < 3.03-13
-Obsoletes:    ttfonts-zh_CN <= 2.14-10, ttfonts-zh_TW <= 2.11-28
-Obsoletes:    %{name}-ukai < 0.2.20080216.1-16
+Obsoletes:    cjkunifonts-ukai < 0.2.20080216.1-16
 
 %description -n %{fontname}-ukai-fonts
 %common_desc
@@ -98,7 +92,7 @@
 Conflicts:    fonts-chinese <= 3.03-9.fc8
 Obsoletes:    fonts-chinese < 3.03-13
 Obsoletes:    ttfonts-zh_CN <= 2.14-10, ttfonts-zh_TW <= 2.11-28
-Obsoletes:    %{name}-common < 0.2.20080216.1-16 
+Obsoletes:    cjkunifonts-common < 0.2.20080216.1-16 
 
 %description -n %{fontname}-fonts-common
 %common_desc
@@ -121,10 +115,7 @@
 Summary:      Chinese Unicode TrueType font compatibility files.
 Group:        User Interface/X
 Requires:     %{fontname}-uming-fonts = %{version}-%{release}
-Conflicts:    fonts-chinese <= 3.03-9.fc8
-Obsoletes:    fonts-chinese < 3.03-13
-Obsoletes:    ttfonts-zh_CN <= 2.14-10, ttfonts-zh_TW <= 2.11-28
-Obsoletes:    %{name}-compat < 0.2.20080216.1-16 
+Obsoletes:    cjkunifonts-compat < 0.2.20080216.1-16 
 
 %description -n %{fontname}-fonts-compat
 %common_desc
@@ -192,15 +183,24 @@
 # backward compat to obsoleted ttf
 %__install -m 0755 -d %{buildroot}%{_datadir}/fonts/zh_CN/TrueType
 %__install -m 0755 -d %{buildroot}%{_datadir}/fonts/zh_TW/TrueType
-%__ln_s ../../%{name}/uming.ttc \
+%__ln_s %{_fontdir}/uming.ttc \
     %{buildroot}%{_datadir}/fonts/zh_CN/TrueType/zysong.ttf
-%__ln_s ../../%{name}/uming.ttc \
+%__ln_s %{_fontdir}/uming.ttc \
     %{buildroot}%{_datadir}/fonts/zh_TW/TrueType/bsmi00lp.ttf
 
 %clean
 %__rm -fr %{buildroot}
 
 %changelog
+* Thu Jan 22 2009 Caius Chance <cchance at redhat.com> - 0.2.20080216.1-17.fc11
+- Resolves: rhbz#477373
+- Refined package dependencies and compat font symlinks.
+
+* Wed Jan 21 2009 Caius Chance <cchance at redhat.com> - 0.2.20080216.1-16.fc11
+- Resolves: rhbz#253813
+- Renamed from cjkunifonts to cjkuni-fonts according to new font packaging
+  guidelines.
+
 * Mon Jan 19 2009 Caius Chance <cchance at redhat.com> - 0.2.20080216.1-15.fc11
 - Resolves: rhbz#477373
 - Updated font renaming for post-1.13 fontpackages.



From allisson at fedoraproject.org  Thu Jan 22 02:51:09 2009
From: allisson at fedoraproject.org (Allisson Azevedo)
Date: Thu, 22 Jan 2009 02:51:09 +0000 (UTC)
Subject: rpms/ruby-openid/devel .cvsignore, 1.4, 1.5 import.log, 1.1,
	1.2 ruby-openid.spec, 1.3, 1.4 sources, 1.4, 1.5
Message-ID: <20090122025109.647ED70033@cvs1.fedora.phx.redhat.com>

Author: allisson

Update of /cvs/pkgs/rpms/ruby-openid/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26666/devel

Modified Files:
	.cvsignore import.log ruby-openid.spec sources 
Log Message:

Update to 2.1.4



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ruby-openid/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	9 Sep 2008 11:58:39 -0000	1.4
+++ .cvsignore	22 Jan 2009 02:50:38 -0000	1.5
@@ -1 +1 @@
-ruby-openid-2.1.2.tar.bz2
+ruby-openid-2.1.4.tar.bz2


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/ruby-openid/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	9 Sep 2008 11:58:39 -0000	1.1
+++ import.log	22 Jan 2009 02:50:39 -0000	1.2
@@ -1 +1,2 @@
 ruby-openid-2_1_2-1_fc9:HEAD:ruby-openid-2.1.2-1.fc9.src.rpm:1220961512
+ruby-openid-2_1_4-1_fc10:HEAD:ruby-openid-2.1.4-1.fc10.src.rpm:1232592481


Index: ruby-openid.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ruby-openid/devel/ruby-openid.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ruby-openid.spec	9 Sep 2008 11:58:39 -0000	1.3
+++ ruby-openid.spec	22 Jan 2009 02:50:39 -0000	1.4
@@ -2,7 +2,7 @@
 #%{!?ruby_sitearch: %define ruby_sitearch %(ruby -rrbconfig -e "puts Config::CONFIG['sitearchdir']")}
 
 Name:           ruby-openid
-Version:        2.1.2
+Version:        2.1.4
 Release:        1%{?dist}
 Summary:        Ruby library for verifying and serving OpenID identities
 
@@ -74,6 +74,9 @@
 
 %changelog
 
+* Wed Jan 21 2009 Allisson Azevedo <allisson at gmail.com> 2.1.4-1
+- Update to 2.1.4
+
 * Tue Sep  9 2008 Allisson Azevedo <allisson at gmail.com> 2.1.2-1
 - Update to 2.1.2
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ruby-openid/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	9 Sep 2008 11:58:39 -0000	1.4
+++ sources	22 Jan 2009 02:50:39 -0000	1.5
@@ -1 +1 @@
-7586171b8eef8a0785871a8944e50396  ruby-openid-2.1.2.tar.bz2
+e46ffaa4cd69e7bfa92dc30101e99474  ruby-openid-2.1.4.tar.bz2



From petersen at fedoraproject.org  Thu Jan 22 02:54:46 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Thu, 22 Jan 2009 02:54:46 +0000 (UTC)
Subject: comps comps-f11.xml.in,1.73,1.74
Message-ID: <20090122025446.9E86F70033@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/extras/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27054

Modified Files:
	comps-f11.xml.in 
Log Message:
cjkunifonts-* renamed to cjkuni-*-fonts


Index: comps-f11.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-f11.xml.in,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- comps-f11.xml.in	21 Jan 2009 14:14:44 -0000	1.73
+++ comps-f11.xml.in	22 Jan 2009 02:54:16 -0000	1.74
@@ -588,8 +588,8 @@
     <uservisible>false</uservisible>
     <langonly>zh</langonly>
     <packagelist>
-      <packagereq type="mandatory">cjkunifonts-ukai</packagereq>
-      <packagereq type="mandatory">cjkunifonts-uming</packagereq>
+      <packagereq type="mandatory">cjkuni-ukai-fonts</packagereq>
+      <packagereq type="mandatory">cjkuni-uming-fonts</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="xorg-x11-server-Xorg">ibus-chewing</packagereq>
@@ -1462,7 +1462,7 @@
     <uservisible>true</uservisible>
     <packagelist>
       <packagereq type="default">abyssinica-fonts</packagereq>
-      <packagereq type="default">cjkunifonts-uming</packagereq>
+      <packagereq type="default">cjkuni-uming-fonts</packagereq>
       <packagereq type="default">dejavu-sans-fonts</packagereq>
       <packagereq type="default">dejavu-sans-mono-fonts</packagereq>
       <packagereq type="default">dejavu-serif-fonts</packagereq>
@@ -1499,7 +1499,7 @@
       <packagereq type="optional">bitstream-vera-serif-fonts</packagereq>
       <packagereq type="optional">brettfont-fonts</packagereq>
       <packagereq type="optional">charis-fonts</packagereq>
-      <packagereq type="optional">cjkunifonts-ukai</packagereq>
+      <packagereq type="optional">cjkuni-ukai-fonts</packagereq>
       <packagereq type="optional">ctan-cm-lgc-roman-fonts</packagereq>
       <packagereq type="optional">ctan-cm-lgc-sans-fonts</packagereq>
       <packagereq type="optional">ctan-cm-lgc-typewriter-fonts</packagereq>



From cchance at fedoraproject.org  Thu Jan 22 03:27:07 2009
From: cchance at fedoraproject.org (Caius Chance)
Date: Thu, 22 Jan 2009 03:27:07 +0000 (UTC)
Subject: rpms/cjkunifonts/devel CIDFnmap.zh_CN, 1.1, NONE CIDFnmap.zh_TW, 1.1,
	NONE FAPIcidfmap.zh_CN, 1.1, NONE FAPIcidfmap.zh_TW, 1.1,
	NONE Makefile, 1.1, NONE cidfmap.zh_CN, 1.1, NONE cidfmap.zh_TW,
	1.1, NONE cjkunifonts-0.2.20080216.1-2.patch, 1.3,
	NONE cjkunifonts.spec, 1.32, NONE sources, 1.3, NONE
Message-ID: <20090122032707.348A770033@cvs1.fedora.phx.redhat.com>

Author: cchance

Update of /cvs/pkgs/rpms/cjkunifonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30246

Removed Files:
	CIDFnmap.zh_CN CIDFnmap.zh_TW FAPIcidfmap.zh_CN 
	FAPIcidfmap.zh_TW Makefile cidfmap.zh_CN cidfmap.zh_TW 
	cjkunifonts-0.2.20080216.1-2.patch cjkunifonts.spec sources 
Log Message:
resolves: rhbz# 253813
renamed to cjkuni-fonts



--- CIDFnmap.zh_CN DELETED ---


--- CIDFnmap.zh_TW DELETED ---


--- FAPIcidfmap.zh_CN DELETED ---


--- FAPIcidfmap.zh_TW DELETED ---


--- Makefile DELETED ---


--- cidfmap.zh_CN DELETED ---


--- cidfmap.zh_TW DELETED ---


--- cjkunifonts-0.2.20080216.1-2.patch DELETED ---


--- cjkunifonts.spec DELETED ---


--- sources DELETED ---



From cchance at fedoraproject.org  Thu Jan 22 03:28:36 2009
From: cchance at fedoraproject.org (Caius Chance)
Date: Thu, 22 Jan 2009 03:28:36 +0000 (UTC)
Subject: rpms/cjkunifonts/devel dead.package,NONE,1.1
Message-ID: <20090122032836.1E17F70033@cvs1.fedora.phx.redhat.com>

Author: cchance

Update of /cvs/pkgs/rpms/cjkunifonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30412

Added Files:
	dead.package 
Log Message:
dead.package indicator for package rename



--- NEW FILE dead.package ---
renamed to cjkuni-fonts



From allisson at fedoraproject.org  Thu Jan 22 03:39:30 2009
From: allisson at fedoraproject.org (Allisson Azevedo)
Date: Thu, 22 Jan 2009 03:39:30 +0000 (UTC)
Subject: rpms/clutter/devel .cvsignore, 1.11, 1.12 clutter.spec, 1.12,
	1.13 import.log, 1.3, 1.4 sources, 1.11,
	1.12 clutter-0.8.0-clutter-fixed.patch, 1.1, NONE
Message-ID: <20090122033930.7C90370033@cvs1.fedora.phx.redhat.com>

Author: allisson

Update of /cvs/pkgs/rpms/clutter/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31281/devel

Modified Files:
	.cvsignore clutter.spec import.log sources 
Removed Files:
	clutter-0.8.0-clutter-fixed.patch 
Log Message:

- Update to 0.8.6



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/clutter/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	7 Oct 2008 01:46:58 -0000	1.11
+++ .cvsignore	22 Jan 2009 03:39:00 -0000	1.12
@@ -1 +1 @@
-clutter-0.8.2.tar.gz
+clutter-0.8.6.tar.bz2


Index: clutter.spec
===================================================================
RCS file: /cvs/pkgs/rpms/clutter/devel/clutter.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- clutter.spec	7 Oct 2008 01:46:58 -0000	1.12
+++ clutter.spec	22 Jan 2009 03:39:00 -0000	1.13
@@ -1,13 +1,12 @@
 Name:           clutter
-Version:        0.8.2
+Version:        0.8.6
 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.8/%{name}-%{version}.tar.gz
-Patch0:         clutter-0.8.0-clutter-fixed.patch
+Source0:        http://www.clutter-project.org/sources/%{name}/0.8/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  glib2-devel mesa-libGL-devel gtk2-devel pkgconfig pango-devel
@@ -32,7 +31,6 @@
 
 %prep
 %setup -q
-#%patch0 -p1 -b .orig
 
 %build
 %configure --enable-gtk-doc
@@ -66,6 +64,9 @@
 
 %changelog
 
+* Wed Jan 21 2009 Allisson Azevedo <allisson at gmail.com> 0.8.6-1
+- Update to 0.8.6
+
 * Mon Oct  6 2008 Allisson Azevedo <allisson at gmail.com> 0.8.2-1
 - Update to 0.8.2
 - Removed clutter-0.8.0-clutter-fixed.patch


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/clutter/devel/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- import.log	7 Oct 2008 01:46:58 -0000	1.3
+++ import.log	22 Jan 2009 03:39:00 -0000	1.4
@@ -1,3 +1,4 @@
 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
 clutter-0_8_2-1_fc9:HEAD:clutter-0.8.2-1.fc9.src.rpm:1223343853
+clutter-0_8_6-1_fc10:HEAD:clutter-0.8.6-1.fc10.src.rpm:1232595301


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/clutter/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	7 Oct 2008 01:46:58 -0000	1.11
+++ sources	22 Jan 2009 03:39:00 -0000	1.12
@@ -1 +1 @@
-2e86641254260b355d235ee202918b1c  clutter-0.8.2.tar.gz
+f5ce02b3092898b648a63625a7f7c553  clutter-0.8.6.tar.bz2


--- clutter-0.8.0-clutter-fixed.patch DELETED ---



From wtogami at fedoraproject.org  Thu Jan 22 03:56:41 2009
From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=)
Date: Thu, 22 Jan 2009 03:56:41 +0000 (UTC)
Subject: rpms/ltsp/F-10 .cvsignore, 1.23, 1.24 ltsp.spec, 1.29, 1.30 sources,
	1.27, 1.28
Message-ID: <20090122035641.393FE70033@cvs1.fedora.phx.redhat.com>

Author: wtogami

Update of /cvs/pkgs/rpms/ltsp/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv853

Modified Files:
	.cvsignore ltsp.spec sources 
Log Message:
Fedora 11 support and more bug fixes



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ltsp/F-10/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- .cvsignore	21 Jan 2009 19:01:57 -0000	1.23
+++ .cvsignore	22 Jan 2009 03:56:10 -0000	1.24
@@ -1 +1 @@
-ltsp-5.1.49.tar.bz2
+ltsp-5.1.51.tar.bz2


Index: ltsp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ltsp/F-10/ltsp.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- ltsp.spec	21 Jan 2009 19:01:57 -0000	1.29
+++ ltsp.spec	22 Jan 2009 03:56:10 -0000	1.30
@@ -1,7 +1,7 @@
 Name:           ltsp
-Version:        5.1.49
-%define _datestamp .20090121.13
-#Release:        0%{_datestamp}%{?dist}
+Version:        5.1.51
+%define _datestamp .20090121.17
+#Release:        2%{_datestamp}%{?dist}
 Release:        1%{?dist}
 Summary:        Linux Terminal Server Project Server and Client
 Group:          User Interface/Desktops
@@ -148,8 +148,6 @@
 mkdir -p $RPM_BUILD_ROOT%{_tftpdir}/ltsp/ppc/
 mkdir -p $RPM_BUILD_ROOT%{_tftpdir}/ltsp/ppc64/
 
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/ltsp/live-config/
-
 ###### client install
 pushd localapps
     make install DESTDIR=$RPM_BUILD_ROOT
@@ -215,7 +213,6 @@
 install -m 0755 server/scripts/k12linux/dhcpd-update $RPM_BUILD_ROOT/%{_datadir}/ltsp/scripts/
 cp -p server/scripts/k12linux/scripts.d/*   $RPM_BUILD_ROOT%{_datadir}/ltsp/scripts.d/
 cp -p server/scripts/k12linux/chkconfig.d/* $RPM_BUILD_ROOT%{_datadir}/ltsp/chkconfig.d/
-cp -a server/configs/k12linux/live-config/* $RPM_BUILD_ROOT%{_sysconfdir}/ltsp/live-config/
 install -m 0644 server/scripts/k12linux/mksquashfs-exclude $RPM_BUILD_ROOT/%{_datadir}/ltsp/
 
 # Remove irrelevant plugins from package
@@ -360,7 +357,6 @@
 %config(noreplace) %{_tftpdir}/ltsp/ppc/yaboot.conf
 %config(noreplace) %{_tftpdir}/ltsp/ppc64/yaboot.conf
 %{_bindir}/ltsp-localapps
-%{_sysconfdir}/ltsp/live-config/
 
 %dir /opt/ltsp
 %dir /opt/ltsp/images
@@ -395,15 +391,7 @@
 %config(noreplace) %{_sysconfdir}/ltsp/ltsp-server.conf
 %config(noreplace) %{_sysconfdir}/ltsp/dhcpd.conf
 %config(noreplace) %{_sysconfdir}/ltsp/ltsp-update-kernels.conf
-%dir %{_sysconfdir}/ltsp/kickstart/
-%dir %{_sysconfdir}/ltsp/kickstart/Fedora/
-%{_sysconfdir}/ltsp/kickstart/Fedora/common.ks
-%{_sysconfdir}/ltsp/kickstart/Fedora/common-i386.ks
-%{_sysconfdir}/ltsp/kickstart/Fedora/common-ppc.ks
-%{_sysconfdir}/ltsp/kickstart/Fedora/common-i686.ks
-%{_sysconfdir}/ltsp/kickstart/Fedora/common-x86_64.ks
-%dir %{_sysconfdir}/ltsp/kickstart/Fedora/9/
-%{_sysconfdir}/ltsp/kickstart/*/*/*.ks
+%{_sysconfdir}/ltsp/kickstart/
 %dir %{_sysconfdir}/ltsp/mkinitrd/
 %{_sysconfdir}/ltsp/mkinitrd/*
 %config(noreplace) %{_tftpdir}/ltsp/*/lts.conf
@@ -419,6 +407,9 @@
 %endif
 
 %changelog
+* Wed Jan 21 2009 Warren Togami <wtogami at redhat.com> - 5.1.51-1
+- Fedora 11 support and more bug fixes
+
 * Wed Jan 21 2009 Warren Togami <wtogami at redhat.com> - 5.1.49-1
 - ltsp-genmenu replaces menu entries in the XDG menu with localapps transparently
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ltsp/F-10/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- sources	21 Jan 2009 19:01:57 -0000	1.27
+++ sources	22 Jan 2009 03:56:10 -0000	1.28
@@ -1 +1 @@
-504f94d0a35361b772d8b2facc242645  ltsp-5.1.49.tar.bz2
+a939ff6e95b9dd20c24515d87672daaa  ltsp-5.1.51.tar.bz2



From wtogami at fedoraproject.org  Thu Jan 22 04:05:07 2009
From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=)
Date: Thu, 22 Jan 2009 04:05:07 +0000 (UTC)
Subject: rpms/ltsp/F-9 .cvsignore, 1.33, 1.34 ltsp.spec, 1.44, 1.45 sources, 
	1.37, 1.38
Message-ID: <20090122040507.34E1970033@cvs1.fedora.phx.redhat.com>

Author: wtogami

Update of /cvs/pkgs/rpms/ltsp/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1628

Modified Files:
	.cvsignore ltsp.spec sources 
Log Message:
Fedora 11 support and more bug fixes



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ltsp/F-9/.cvsignore,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- .cvsignore	21 Jan 2009 19:03:43 -0000	1.33
+++ .cvsignore	22 Jan 2009 04:04:36 -0000	1.34
@@ -1 +1 @@
-ltsp-5.1.49.tar.bz2
+ltsp-5.1.51.tar.bz2


Index: ltsp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ltsp/F-9/ltsp.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- ltsp.spec	21 Jan 2009 19:03:43 -0000	1.44
+++ ltsp.spec	22 Jan 2009 04:04:36 -0000	1.45
@@ -1,7 +1,7 @@
 Name:           ltsp
-Version:        5.1.49
-%define _datestamp .20090121.13
-#Release:        0%{_datestamp}%{?dist}
+Version:        5.1.51
+%define _datestamp .20090121.17
+#Release:        2%{_datestamp}%{?dist}
 Release:        1%{?dist}
 Summary:        Linux Terminal Server Project Server and Client
 Group:          User Interface/Desktops
@@ -148,8 +148,6 @@
 mkdir -p $RPM_BUILD_ROOT%{_tftpdir}/ltsp/ppc/
 mkdir -p $RPM_BUILD_ROOT%{_tftpdir}/ltsp/ppc64/
 
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/ltsp/live-config/
-
 ###### client install
 pushd localapps
     make install DESTDIR=$RPM_BUILD_ROOT
@@ -215,7 +213,6 @@
 install -m 0755 server/scripts/k12linux/dhcpd-update $RPM_BUILD_ROOT/%{_datadir}/ltsp/scripts/
 cp -p server/scripts/k12linux/scripts.d/*   $RPM_BUILD_ROOT%{_datadir}/ltsp/scripts.d/
 cp -p server/scripts/k12linux/chkconfig.d/* $RPM_BUILD_ROOT%{_datadir}/ltsp/chkconfig.d/
-cp -a server/configs/k12linux/live-config/* $RPM_BUILD_ROOT%{_sysconfdir}/ltsp/live-config/
 install -m 0644 server/scripts/k12linux/mksquashfs-exclude $RPM_BUILD_ROOT/%{_datadir}/ltsp/
 
 # Remove irrelevant plugins from package
@@ -360,7 +357,6 @@
 %config(noreplace) %{_tftpdir}/ltsp/ppc/yaboot.conf
 %config(noreplace) %{_tftpdir}/ltsp/ppc64/yaboot.conf
 %{_bindir}/ltsp-localapps
-%{_sysconfdir}/ltsp/live-config/
 
 %dir /opt/ltsp
 %dir /opt/ltsp/images
@@ -395,15 +391,7 @@
 %config(noreplace) %{_sysconfdir}/ltsp/ltsp-server.conf
 %config(noreplace) %{_sysconfdir}/ltsp/dhcpd.conf
 %config(noreplace) %{_sysconfdir}/ltsp/ltsp-update-kernels.conf
-%dir %{_sysconfdir}/ltsp/kickstart/
-%dir %{_sysconfdir}/ltsp/kickstart/Fedora/
-%{_sysconfdir}/ltsp/kickstart/Fedora/common.ks
-%{_sysconfdir}/ltsp/kickstart/Fedora/common-i386.ks
-%{_sysconfdir}/ltsp/kickstart/Fedora/common-ppc.ks
-%{_sysconfdir}/ltsp/kickstart/Fedora/common-i686.ks
-%{_sysconfdir}/ltsp/kickstart/Fedora/common-x86_64.ks
-%dir %{_sysconfdir}/ltsp/kickstart/Fedora/9/
-%{_sysconfdir}/ltsp/kickstart/*/*/*.ks
+%{_sysconfdir}/ltsp/kickstart/
 %dir %{_sysconfdir}/ltsp/mkinitrd/
 %{_sysconfdir}/ltsp/mkinitrd/*
 %config(noreplace) %{_tftpdir}/ltsp/*/lts.conf
@@ -419,6 +407,9 @@
 %endif
 
 %changelog
+* Wed Jan 21 2009 Warren Togami <wtogami at redhat.com> - 5.1.51-1
+- Fedora 11 support and more bug fixes
+
 * Wed Jan 21 2009 Warren Togami <wtogami at redhat.com> - 5.1.49-1
 - ltsp-genmenu replaces menu entries in the XDG menu with localapps transparently
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ltsp/F-9/sources,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- sources	21 Jan 2009 19:03:43 -0000	1.37
+++ sources	22 Jan 2009 04:04:36 -0000	1.38
@@ -1 +1 @@
-504f94d0a35361b772d8b2facc242645  ltsp-5.1.49.tar.bz2
+a939ff6e95b9dd20c24515d87672daaa  ltsp-5.1.51.tar.bz2



From oget at fedoraproject.org  Thu Jan 22 04:09:54 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Thu, 22 Jan 2009 04:09:54 +0000 (UTC)
Subject: rpms/pdf-renderer/devel .cvsignore, 1.2, 1.3 pdf-renderer.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <20090122040954.7CE3E70033@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/pdf-renderer/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2147

Modified Files:
	.cvsignore pdf-renderer.spec sources 
Log Message:
* Mon Jan 21 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 0-0.4.20090118cvs
- New cvs checkout



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pdf-renderer/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	13 Oct 2008 03:31:07 -0000	1.2
+++ .cvsignore	22 Jan 2009 04:09:24 -0000	1.3
@@ -1 +1 @@
-PDFRenderer-2008_10_05-src.zip
+PDFRenderer-2009_01_18-src.zip


Index: pdf-renderer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pdf-renderer/devel/pdf-renderer.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pdf-renderer.spec	13 Oct 2008 03:31:08 -0000	1.1
+++ pdf-renderer.spec	22 Jan 2009 04:09:24 -0000	1.2
@@ -1,7 +1,7 @@
 %define with_gcj %{!?_without_gcj:1}%{?_without_gcj:0}
 %define alternate_name PDFRenderer
-%define cvs_version 2008_10_05
-%define release_number 0.3.20081005cvs%{?dist}
+%define cvs_version 2009_01_18
+%define release_number 0.4.20090118cvs%{?dist}
 
 Summary:        A 100% Java PDF renderer and viewer
 Name:           pdf-renderer
@@ -10,7 +10,7 @@
 License:        LGPLv2+
 URL:            https://pdf-renderer.dev.java.net/
 Group:          Development/Libraries
-Source0:        https://pdf-renderer.dev.java.net/files/documents/6008/113009/%{alternate_name}-%{cvs_version}-src.zip
+Source0:        https://pdf-renderer.dev.java.net/files/documents/6008/124103/%{alternate_name}-%{cvs_version}-src.zip
 BuildRequires:  ant
 BuildRequires:  ant-apache-regexp
 BuildRequires:  java-devel >= 1.5
@@ -139,14 +139,17 @@
 # -----------------------------------------------------------------------------
 
 %changelog
-* Sat Oct 11 2008 Orcan Ogetbil <orcanbahri[AT]yahoo[DOT].com> 0-0.3.20081005cvs
+* Mon Jan 21 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 0-0.4.20090118cvs
+- New cvs checkout
+
+* Sat Oct 11 2008 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 0-0.3.20081005cvs
 - The license is changed to LGPLv2+.
 - Fixed sizes of the font files on src/com/sun/pdfview/font/res/BaseFonts.properties
 - BuildRequired urw-fonts
 
-* Fri Oct 10 2008 Orcan Ogetbil <orcanbahri[AT]yahoo[DOT].com> 0-0.2.20081005cvs
+* Fri Oct 10 2008 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 0-0.2.20081005cvs
 - Removed pre-shipped fonts and told the program to use system-wide urw-fonts.
 - The license is changed to LGPLv2+ and GPL+.
 
-* Thu Oct 09 2008 Orcan Ogetbil <orcanbahri[AT]yahoo[DOT].com> 0-0.1.20081005cvs
+* Thu Oct 09 2008 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 0-0.1.20081005cvs
 - Initial Release


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pdf-renderer/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	13 Oct 2008 03:31:08 -0000	1.2
+++ sources	22 Jan 2009 04:09:24 -0000	1.3
@@ -1 +1 @@
-faa078e3900d22a1f5f0202a414a62fc  PDFRenderer-2008_10_05-src.zip
+fedbda92569aa9846279c5c1be86a0c4  PDFRenderer-2009_01_18-src.zip



From mbarnes at fedoraproject.org  Thu Jan 22 04:20:26 2009
From: mbarnes at fedoraproject.org (Matthew Barnes)
Date: Thu, 22 Jan 2009 04:20:26 +0000 (UTC)
Subject: rpms/gnome-python2-extras/devel .cvsignore, 1.14,
	1.15 gnome-python2-extras.spec, 1.39, 1.40 sources, 1.14, 1.15
Message-ID: <20090122042026.1D82F70033@cvs1.fedora.phx.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/gnome-python2-extras/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3527

Modified Files:
	.cvsignore gnome-python2-extras.spec sources 
Log Message:

* Wed Jan 21 2009 Matthew Barnes <mbarnes at redhat.com> - 2.25.1-1
- Update to 2.25.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-python2-extras/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	5 Jun 2007 21:15:22 -0000	1.14
+++ .cvsignore	22 Jan 2009 04:19:55 -0000	1.15
@@ -1 +1 @@
-gnome-python-extras-2.19.1.tar.bz2
+gnome-python-extras-2.25.1.tar.bz2


Index: gnome-python2-extras.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-python2-extras/devel/gnome-python2-extras.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- gnome-python2-extras.spec	25 Dec 2008 03:28:55 -0000	1.39
+++ gnome-python2-extras.spec	22 Jan 2009 04:19:55 -0000	1.40
@@ -13,8 +13,8 @@
 ### Abstract ###
 
 Name: gnome-python2-extras
-Version: 2.19.1
-Release: 28%{?dist}
+Version: 2.25.1
+Release: 1%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: Development/Languages
 Summary: The sources for additional. PyGNOME Python extension modules.
@@ -191,6 +191,9 @@
 %{_libdir}/pkgconfig/pygda-3.0.pc
 
 %changelog
+* Wed Jan 21 2009 Matthew Barnes <mbarnes at redhat.com> - 2.25.1-1
+- Update to 2.25.1
+
 * Wed Dec  24 2008 Deji Akingunola <dakingun at gmail.com> - 2.19.1-28
 - Fix the gecko-lib version
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-python2-extras/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	5 Jun 2007 21:15:22 -0000	1.14
+++ sources	22 Jan 2009 04:19:55 -0000	1.15
@@ -1 +1 @@
-08896c63d71ce44d20fafbaf9c0edc78  gnome-python-extras-2.19.1.tar.bz2
+80be52db42a6ad5804d3cc432efe2590  gnome-python-extras-2.25.1.tar.bz2



From rayvd at fedoraproject.org  Thu Jan 22 04:31:10 2009
From: rayvd at fedoraproject.org (Ray Van Dolson)
Date: Thu, 22 Jan 2009 04:31:10 +0000 (UTC)
Subject: rpms/freehoo/devel .cvsignore, 1.2, 1.3 freehoo.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <20090122043110.D10F570033@cvs1.fedora.phx.redhat.com>

Author: rayvd

Update of /cvs/pkgs/rpms/freehoo/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4334

Modified Files:
	.cvsignore freehoo.spec sources 
Log Message:
Upstream released 3.5.3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/freehoo/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	3 Jul 2008 04:33:25 -0000	1.2
+++ .cvsignore	22 Jan 2009 04:30:40 -0000	1.3
@@ -1 +1 @@
-freehoo-3.5.2.tar.gz
+freehoo-3.5.3.tar.gz


Index: freehoo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/freehoo/devel/freehoo.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- freehoo.spec	3 Jul 2008 04:33:25 -0000	1.1
+++ freehoo.spec	22 Jan 2009 04:30:40 -0000	1.2
@@ -1,6 +1,6 @@
 Name:             freehoo
-Version:          3.5.2
-Release:          2%{?dist}
+Version:          3.5.3
+Release:          1%{?dist}
 Summary:          Freehoo is a free console based messenger for Yahoo IM Service
 Group:            Applications/Internet
 License:          GPLv2+
@@ -65,6 +65,9 @@
 %{_mandir}/man?/*
 
 %changelog
+* Wed Jan 21 2009 Ray Van Dolson <rayvd at fedoraproject.org> - 3.5.3-1
+- Upstream released 3.5.3
+
 * Sat Jun 28 2008 Ray Van Dolson <rayvd at fedoraproject.org> - 3.5.2-2
 - Removed extra non-needed Requires; added 'words'
 - No longer converting freehoo.1 to UTF-8 (unneeded)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/freehoo/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	3 Jul 2008 04:33:25 -0000	1.2
+++ sources	22 Jan 2009 04:30:40 -0000	1.3
@@ -1 +1 @@
-587884c08f8867381288107cb69f9243  freehoo-3.5.2.tar.gz
+727a97f07f7b7c471ac8162173eed1d8  freehoo-3.5.3.tar.gz



From rayvd at fedoraproject.org  Thu Jan 22 04:33:01 2009
From: rayvd at fedoraproject.org (Ray Van Dolson)
Date: Thu, 22 Jan 2009 04:33:01 +0000 (UTC)
Subject: rpms/freehoo/EL-5 .cvsignore, 1.1, 1.2 freehoo.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <20090122043301.E7D1D70033@cvs1.fedora.phx.redhat.com>

Author: rayvd

Update of /cvs/pkgs/rpms/freehoo/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4592

Modified Files:
	.cvsignore freehoo.spec sources 
Log Message:
Upstream released 3.5.3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/freehoo/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	30 Jun 2008 15:55:24 -0000	1.1
+++ .cvsignore	22 Jan 2009 04:32:31 -0000	1.2
@@ -0,0 +1 @@
+freehoo-3.5.3.tar.gz


Index: freehoo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/freehoo/EL-5/freehoo.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- freehoo.spec	3 Jul 2008 04:47:40 -0000	1.1
+++ freehoo.spec	22 Jan 2009 04:32:31 -0000	1.2
@@ -1,6 +1,6 @@
 Name:             freehoo
-Version:          3.5.2
-Release:          2%{?dist}
+Version:          3.5.3
+Release:          1%{?dist}
 Summary:          Freehoo is a free console based messenger for Yahoo IM Service
 Group:            Applications/Internet
 License:          GPLv2+
@@ -65,6 +65,9 @@
 %{_mandir}/man?/*
 
 %changelog
+* Wed Jan 21 2009 Ray Van Dolson <rayvd at fedoraproject.org> - 3.5.3-1
+- Upstream released 3.5.3
+
 * Sat Jun 28 2008 Ray Van Dolson <rayvd at fedoraproject.org> - 3.5.2-2
 - Removed extra non-needed Requires; added 'words'
 - No longer converting freehoo.1 to UTF-8 (unneeded)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/freehoo/EL-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	3 Jul 2008 04:47:40 -0000	1.2
+++ sources	22 Jan 2009 04:32:31 -0000	1.3
@@ -1 +1 @@
-587884c08f8867381288107cb69f9243  freehoo-3.5.2.tar.gz
+727a97f07f7b7c471ac8162173eed1d8  freehoo-3.5.3.tar.gz



From jstanley at fedoraproject.org  Thu Jan 22 04:37:57 2009
From: jstanley at fedoraproject.org (Jon Stanley)
Date: Thu, 22 Jan 2009 04:37:57 +0000 (UTC)
Subject: rpms/python-ldaphelper/devel import.log, NONE,
	1.1 python-ldaphelper.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090122043757.DC14A70033@cvs1.fedora.phx.redhat.com>

Author: jstanley

Update of /cvs/pkgs/rpms/python-ldaphelper/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5182/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log python-ldaphelper.spec 
Log Message:
initial commit



--- NEW FILE import.log ---
python-ldaphelper-1_0_1-1_fc10:HEAD:python-ldaphelper-1.0.1-1.fc10.src.rpm:1232599022


--- NEW FILE python-ldaphelper.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

Name:           python-ldaphelper
Version:        1.0.1
Release:        1%{?dist}
Summary:        A python wrapper for LDAP search results

Group:          Development/Languages
License:        MIT or GPLv2
URL:            https://fedorahosted.org/ldaphelper
Source0:        http://fedorahosted.org/releases/l/d/ldaphelper/ldaphelper-%{version}.tgz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  python

Requires:       python-ldap

%description
A wrapper for search results from python-ldap, which introduces an
LDAPSearchResults class, with various methods to make use of the
data.

%prep
%setup -q -n ldaphelper-%{version}


%build

%install
rm -rf $RPM_BUILD_ROOT
install -dm 755 $RPM_BUILD_ROOT/%{python_sitelib}
install -pm 644 src/ldaphelper.py $RPM_BUILD_ROOT/%{python_sitelib}

%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc README.txt GPL.txt MIT.txt
%{python_sitelib}/ldaphelper.py*


%changelog
* Sat Jan 3 2009 Jon Stanley <jonstanley at gmail.com> - 1.0.1-1
- update to 1.0.1 and new upstream

* Sun Dec 7 2008 Jon Stanley <jonstanley at gmail.com> - 1-1
- Initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-ldaphelper/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	20 Jan 2009 21:21:38 -0000	1.1
+++ .cvsignore	22 Jan 2009 04:37:27 -0000	1.2
@@ -0,0 +1 @@
+ldaphelper-1.0.1.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-ldaphelper/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	20 Jan 2009 21:21:38 -0000	1.1
+++ sources	22 Jan 2009 04:37:27 -0000	1.2
@@ -0,0 +1 @@
+bc2a427b8c8f7f9f0e11911844eaefd3  ldaphelper-1.0.1.tgz



From jstanley at fedoraproject.org  Thu Jan 22 04:41:40 2009
From: jstanley at fedoraproject.org (Jon Stanley)
Date: Thu, 22 Jan 2009 04:41:40 +0000 (UTC)
Subject: rpms/python-ldaphelper/EL-4 python-ldaphelper.spec, NONE,
	1.1 sources, 1.1, 1.2
Message-ID: <20090122044140.7611D70033@cvs1.fedora.phx.redhat.com>

Author: jstanley

Update of /cvs/pkgs/rpms/python-ldaphelper/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5731/EL-4

Modified Files:
	sources 
Added Files:
	python-ldaphelper.spec 
Log Message:
copy to other branches



--- NEW FILE python-ldaphelper.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

Name:           python-ldaphelper
Version:        1.0.1
Release:        1%{?dist}
Summary:        A python wrapper for LDAP search results

Group:          Development/Languages
License:        MIT or GPLv2
URL:            https://fedorahosted.org/ldaphelper
Source0:        http://fedorahosted.org/releases/l/d/ldaphelper/ldaphelper-%{version}.tgz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  python

Requires:       python-ldap

%description
A wrapper for search results from python-ldap, which introduces an
LDAPSearchResults class, with various methods to make use of the
data.

%prep
%setup -q -n ldaphelper-%{version}


%build

%install
rm -rf $RPM_BUILD_ROOT
install -dm 755 $RPM_BUILD_ROOT/%{python_sitelib}
install -pm 644 src/ldaphelper.py $RPM_BUILD_ROOT/%{python_sitelib}

%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc README.txt GPL.txt MIT.txt
%{python_sitelib}/ldaphelper.py*


%changelog
* Sat Jan 3 2009 Jon Stanley <jonstanley at gmail.com> - 1.0.1-1
- update to 1.0.1 and new upstream

* Sun Dec 7 2008 Jon Stanley <jonstanley at gmail.com> - 1-1
- Initial package


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-ldaphelper/EL-4/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	20 Jan 2009 21:21:38 -0000	1.1
+++ sources	22 Jan 2009 04:41:10 -0000	1.2
@@ -0,0 +1 @@
+bc2a427b8c8f7f9f0e11911844eaefd3  ldaphelper-1.0.1.tgz



From jstanley at fedoraproject.org  Thu Jan 22 04:41:40 2009
From: jstanley at fedoraproject.org (Jon Stanley)
Date: Thu, 22 Jan 2009 04:41:40 +0000 (UTC)
Subject: rpms/python-ldaphelper/EL-5 python-ldaphelper.spec, NONE,
	1.1 sources, 1.1, 1.2
Message-ID: <20090122044140.A1CAF70141@cvs1.fedora.phx.redhat.com>

Author: jstanley

Update of /cvs/pkgs/rpms/python-ldaphelper/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5731/EL-5

Modified Files:
	sources 
Added Files:
	python-ldaphelper.spec 
Log Message:
copy to other branches



--- NEW FILE python-ldaphelper.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

Name:           python-ldaphelper
Version:        1.0.1
Release:        1%{?dist}
Summary:        A python wrapper for LDAP search results

Group:          Development/Languages
License:        MIT or GPLv2
URL:            https://fedorahosted.org/ldaphelper
Source0:        http://fedorahosted.org/releases/l/d/ldaphelper/ldaphelper-%{version}.tgz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  python

Requires:       python-ldap

%description
A wrapper for search results from python-ldap, which introduces an
LDAPSearchResults class, with various methods to make use of the
data.

%prep
%setup -q -n ldaphelper-%{version}


%build

%install
rm -rf $RPM_BUILD_ROOT
install -dm 755 $RPM_BUILD_ROOT/%{python_sitelib}
install -pm 644 src/ldaphelper.py $RPM_BUILD_ROOT/%{python_sitelib}

%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc README.txt GPL.txt MIT.txt
%{python_sitelib}/ldaphelper.py*


%changelog
* Sat Jan 3 2009 Jon Stanley <jonstanley at gmail.com> - 1.0.1-1
- update to 1.0.1 and new upstream

* Sun Dec 7 2008 Jon Stanley <jonstanley at gmail.com> - 1-1
- Initial package


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-ldaphelper/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	20 Jan 2009 21:21:38 -0000	1.1
+++ sources	22 Jan 2009 04:41:10 -0000	1.2
@@ -0,0 +1 @@
+bc2a427b8c8f7f9f0e11911844eaefd3  ldaphelper-1.0.1.tgz



From jstanley at fedoraproject.org  Thu Jan 22 04:41:41 2009
From: jstanley at fedoraproject.org (Jon Stanley)
Date: Thu, 22 Jan 2009 04:41:41 +0000 (UTC)
Subject: rpms/python-ldaphelper/F-9 python-ldaphelper.spec, NONE, 1.1 sources,
	1.1, 1.2
Message-ID: <20090122044141.437CF70033@cvs1.fedora.phx.redhat.com>

Author: jstanley

Update of /cvs/pkgs/rpms/python-ldaphelper/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5731/F-9

Modified Files:
	sources 
Added Files:
	python-ldaphelper.spec 
Log Message:
copy to other branches



--- NEW FILE python-ldaphelper.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

Name:           python-ldaphelper
Version:        1.0.1
Release:        1%{?dist}
Summary:        A python wrapper for LDAP search results

Group:          Development/Languages
License:        MIT or GPLv2
URL:            https://fedorahosted.org/ldaphelper
Source0:        http://fedorahosted.org/releases/l/d/ldaphelper/ldaphelper-%{version}.tgz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  python

Requires:       python-ldap

%description
A wrapper for search results from python-ldap, which introduces an
LDAPSearchResults class, with various methods to make use of the
data.

%prep
%setup -q -n ldaphelper-%{version}


%build

%install
rm -rf $RPM_BUILD_ROOT
install -dm 755 $RPM_BUILD_ROOT/%{python_sitelib}
install -pm 644 src/ldaphelper.py $RPM_BUILD_ROOT/%{python_sitelib}

%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc README.txt GPL.txt MIT.txt
%{python_sitelib}/ldaphelper.py*


%changelog
* Sat Jan 3 2009 Jon Stanley <jonstanley at gmail.com> - 1.0.1-1
- update to 1.0.1 and new upstream

* Sun Dec 7 2008 Jon Stanley <jonstanley at gmail.com> - 1-1
- Initial package


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-ldaphelper/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	20 Jan 2009 21:21:38 -0000	1.1
+++ sources	22 Jan 2009 04:41:11 -0000	1.2
@@ -0,0 +1 @@
+bc2a427b8c8f7f9f0e11911844eaefd3  ldaphelper-1.0.1.tgz



From jstanley at fedoraproject.org  Thu Jan 22 04:41:40 2009
From: jstanley at fedoraproject.org (Jon Stanley)
Date: Thu, 22 Jan 2009 04:41:40 +0000 (UTC)
Subject: rpms/python-ldaphelper/F-10 python-ldaphelper.spec, NONE,
	1.1 sources, 1.1, 1.2
Message-ID: <20090122044140.ECC0570033@cvs1.fedora.phx.redhat.com>

Author: jstanley

Update of /cvs/pkgs/rpms/python-ldaphelper/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5731/F-10

Modified Files:
	sources 
Added Files:
	python-ldaphelper.spec 
Log Message:
copy to other branches



--- NEW FILE python-ldaphelper.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

Name:           python-ldaphelper
Version:        1.0.1
Release:        1%{?dist}
Summary:        A python wrapper for LDAP search results

Group:          Development/Languages
License:        MIT or GPLv2
URL:            https://fedorahosted.org/ldaphelper
Source0:        http://fedorahosted.org/releases/l/d/ldaphelper/ldaphelper-%{version}.tgz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  python

Requires:       python-ldap

%description
A wrapper for search results from python-ldap, which introduces an
LDAPSearchResults class, with various methods to make use of the
data.

%prep
%setup -q -n ldaphelper-%{version}


%build

%install
rm -rf $RPM_BUILD_ROOT
install -dm 755 $RPM_BUILD_ROOT/%{python_sitelib}
install -pm 644 src/ldaphelper.py $RPM_BUILD_ROOT/%{python_sitelib}

%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc README.txt GPL.txt MIT.txt
%{python_sitelib}/ldaphelper.py*


%changelog
* Sat Jan 3 2009 Jon Stanley <jonstanley at gmail.com> - 1.0.1-1
- update to 1.0.1 and new upstream

* Sun Dec 7 2008 Jon Stanley <jonstanley at gmail.com> - 1-1
- Initial package


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-ldaphelper/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	20 Jan 2009 21:21:38 -0000	1.1
+++ sources	22 Jan 2009 04:41:10 -0000	1.2
@@ -0,0 +1 @@
+bc2a427b8c8f7f9f0e11911844eaefd3  ldaphelper-1.0.1.tgz



From rayvd at fedoraproject.org  Thu Jan 22 04:43:58 2009
From: rayvd at fedoraproject.org (Ray Van Dolson)
Date: Thu, 22 Jan 2009 04:43:58 +0000 (UTC)
Subject: rpms/freehoo/EL-4 .cvsignore, 1.1, 1.2 freehoo.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <20090122044358.5BD7A70033@cvs1.fedora.phx.redhat.com>

Author: rayvd

Update of /cvs/pkgs/rpms/freehoo/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6224

Modified Files:
	.cvsignore freehoo.spec sources 
Log Message:
Upstream released 3.5.3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/freehoo/EL-4/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	30 Jun 2008 15:55:24 -0000	1.1
+++ .cvsignore	22 Jan 2009 04:43:27 -0000	1.2
@@ -0,0 +1 @@
+freehoo-3.5.3.tar.gz


Index: freehoo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/freehoo/EL-4/freehoo.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- freehoo.spec	3 Jul 2008 04:47:27 -0000	1.1
+++ freehoo.spec	22 Jan 2009 04:43:27 -0000	1.2
@@ -1,6 +1,6 @@
 Name:             freehoo
-Version:          3.5.2
-Release:          2%{?dist}
+Version:          3.5.3
+Release:          1%{?dist}
 Summary:          Freehoo is a free console based messenger for Yahoo IM Service
 Group:            Applications/Internet
 License:          GPLv2+
@@ -65,6 +65,9 @@
 %{_mandir}/man?/*
 
 %changelog
+* Wed Jan 21 2009 Ray Van Dolson <rayvd at fedoraproject.org> - 3.5.3-1
+- Upstream released 3.5.3
+
 * Sat Jun 28 2008 Ray Van Dolson <rayvd at fedoraproject.org> - 3.5.2-2
 - Removed extra non-needed Requires; added 'words'
 - No longer converting freehoo.1 to UTF-8 (unneeded)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/freehoo/EL-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	3 Jul 2008 04:47:27 -0000	1.2
+++ sources	22 Jan 2009 04:43:27 -0000	1.3
@@ -1 +1 @@
-587884c08f8867381288107cb69f9243  freehoo-3.5.2.tar.gz
+727a97f07f7b7c471ac8162173eed1d8  freehoo-3.5.3.tar.gz



From rayvd at fedoraproject.org  Thu Jan 22 04:45:55 2009
From: rayvd at fedoraproject.org (Ray Van Dolson)
Date: Thu, 22 Jan 2009 04:45:55 +0000 (UTC)
Subject: rpms/freehoo/F-10 .cvsignore, 1.2, 1.3 freehoo.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <20090122044555.7CDD770033@cvs1.fedora.phx.redhat.com>

Author: rayvd

Update of /cvs/pkgs/rpms/freehoo/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6595

Modified Files:
	.cvsignore freehoo.spec sources 
Log Message:
Upstream released 3.5.3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/freehoo/F-10/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	3 Jul 2008 04:33:25 -0000	1.2
+++ .cvsignore	22 Jan 2009 04:45:24 -0000	1.3
@@ -1 +1 @@
-freehoo-3.5.2.tar.gz
+freehoo-3.5.3.tar.gz


Index: freehoo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/freehoo/F-10/freehoo.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- freehoo.spec	3 Jul 2008 04:33:25 -0000	1.1
+++ freehoo.spec	22 Jan 2009 04:45:25 -0000	1.2
@@ -1,6 +1,6 @@
 Name:             freehoo
-Version:          3.5.2
-Release:          2%{?dist}
+Version:          3.5.3
+Release:          1%{?dist}
 Summary:          Freehoo is a free console based messenger for Yahoo IM Service
 Group:            Applications/Internet
 License:          GPLv2+
@@ -65,6 +65,9 @@
 %{_mandir}/man?/*
 
 %changelog
+* Wed Jan 21 2009 Ray Van Dolson <rayvd at fedoraproject.org> - 3.5.3-1
+- Upstream released 3.5.3
+
 * Sat Jun 28 2008 Ray Van Dolson <rayvd at fedoraproject.org> - 3.5.2-2
 - Removed extra non-needed Requires; added 'words'
 - No longer converting freehoo.1 to UTF-8 (unneeded)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/freehoo/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	3 Jul 2008 04:33:25 -0000	1.2
+++ sources	22 Jan 2009 04:45:25 -0000	1.3
@@ -1 +1 @@
-587884c08f8867381288107cb69f9243  freehoo-3.5.2.tar.gz
+727a97f07f7b7c471ac8162173eed1d8  freehoo-3.5.3.tar.gz



From mbarnes at fedoraproject.org  Thu Jan 22 04:47:12 2009
From: mbarnes at fedoraproject.org (Matthew Barnes)
Date: Thu, 22 Jan 2009 04:47:12 +0000 (UTC)
Subject: rpms/gnome-python2-extras/devel gnome-python2-extras.spec, 1.40,
	1.41
Message-ID: <20090122044712.DFB0F70033@cvs1.fedora.phx.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/gnome-python2-extras/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6801

Modified Files:
	gnome-python2-extras.spec 
Log Message:

* Wed Jan 21 2009 Matthew Barnes <mbarnes at redhat.com> - 2.25.1-1
- Update to 2.25.1
- Remove the xulrunner patches (fixed upstream).
- Remove patch for GNOME bug #553911 (fixed upstream).



Index: gnome-python2-extras.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-python2-extras/devel/gnome-python2-extras.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- gnome-python2-extras.spec	22 Jan 2009 04:19:55 -0000	1.40
+++ gnome-python2-extras.spec	22 Jan 2009 04:46:42 -0000	1.41
@@ -25,14 +25,6 @@
 Obsoletes: gnome-python2-gda <= 2.14.3-1
 Obsoletes: gnome-python2-gda-devel <= 2.14.3-1
 
-### Patches ###
-
-Patch1: gnome-python-extras-2.19.1-xulrunner.patch
-Patch2: gnome-python-extras-2.19.1-pkg-config.patch
-
-# GNOME bug #553911
-Patch3: gnome-python-extras-2.19.1-no-gdl-icons.patch
-
 ### Dependencies ###
 
 Requires: gnome-python2 >= %{gnome_python_version}
@@ -130,9 +122,6 @@
 
 %prep
 %setup -q -n gnome-python-extras-%{version}
-%patch1 -p1 -b .xulrunner
-%patch2 -p1 -b .pkg-config
-%patch3 -p1 -b .no-gdl-icons
 
 %build
 %configure --with-gtkmozembed=xulrunner
@@ -193,6 +182,8 @@
 %changelog
 * Wed Jan 21 2009 Matthew Barnes <mbarnes at redhat.com> - 2.25.1-1
 - Update to 2.25.1
+- Remove the xulrunner patches (fixed upstream).
+- Remove patch for GNOME bug #553911 (fixed upstream).
 
 * Wed Dec  24 2008 Deji Akingunola <dakingun at gmail.com> - 2.19.1-28
 - Fix the gecko-lib version



From rayvd at fedoraproject.org  Thu Jan 22 04:47:56 2009
From: rayvd at fedoraproject.org (Ray Van Dolson)
Date: Thu, 22 Jan 2009 04:47:56 +0000 (UTC)
Subject: rpms/freehoo/F-9 .cvsignore, 1.1, 1.2 freehoo.spec, 1.1, 1.2 sources,
	1.2, 1.3
Message-ID: <20090122044756.014E170033@cvs1.fedora.phx.redhat.com>

Author: rayvd

Update of /cvs/pkgs/rpms/freehoo/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6961

Modified Files:
	.cvsignore freehoo.spec sources 
Log Message:
Upstream released 3.5.3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/freehoo/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	30 Jun 2008 15:55:24 -0000	1.1
+++ .cvsignore	22 Jan 2009 04:47:25 -0000	1.2
@@ -0,0 +1 @@
+freehoo-3.5.3.tar.gz


Index: freehoo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/freehoo/F-9/freehoo.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- freehoo.spec	3 Jul 2008 04:41:12 -0000	1.1
+++ freehoo.spec	22 Jan 2009 04:47:25 -0000	1.2
@@ -1,6 +1,6 @@
 Name:             freehoo
-Version:          3.5.2
-Release:          2%{?dist}
+Version:          3.5.3
+Release:          1%{?dist}
 Summary:          Freehoo is a free console based messenger for Yahoo IM Service
 Group:            Applications/Internet
 License:          GPLv2+
@@ -65,6 +65,9 @@
 %{_mandir}/man?/*
 
 %changelog
+* Wed Jan 21 2009 Ray Van Dolson <rayvd at fedoraproject.org> - 3.5.3-1
+- Upstream released 3.5.3
+
 * Sat Jun 28 2008 Ray Van Dolson <rayvd at fedoraproject.org> - 3.5.2-2
 - Removed extra non-needed Requires; added 'words'
 - No longer converting freehoo.1 to UTF-8 (unneeded)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/freehoo/F-9/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	3 Jul 2008 04:41:12 -0000	1.2
+++ sources	22 Jan 2009 04:47:25 -0000	1.3
@@ -1 +1 @@
-587884c08f8867381288107cb69f9243  freehoo-3.5.2.tar.gz
+727a97f07f7b7c471ac8162173eed1d8  freehoo-3.5.3.tar.gz



From mtasaka at fedoraproject.org  Thu Jan 22 04:53:35 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Thu, 22 Jan 2009 04:53:35 +0000 (UTC)
Subject: rpms/cairo-dock/devel .cvsignore, 1.104, 1.105 cairo-dock.spec,
	1.141, 1.142 sources, 1.104, 1.105
Message-ID: <20090122045335.336D270033@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/cairo-dock/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8306

Modified Files:
	.cvsignore cairo-dock.spec sources 
Log Message:
* Thu Jan 22 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
- rev 1496
- Include Wanda directory in Cairo-Penguin plug-in again



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cairo-dock/devel/.cvsignore,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -r1.104 -r1.105
--- .cvsignore	21 Jan 2009 05:10:47 -0000	1.104
+++ .cvsignore	22 Jan 2009 04:53:04 -0000	1.105
@@ -1 +1 @@
-cairo-dock-sources-svn1494_trunk.tar.bz2
+cairo-dock-sources-svn1496_trunk.tar.bz2


Index: cairo-dock.spec
===================================================================
RCS file: /cvs/extras/rpms/cairo-dock/devel/cairo-dock.spec,v
retrieving revision 1.141
retrieving revision 1.142
diff -u -r1.141 -r1.142
--- cairo-dock.spec	21 Jan 2009 05:37:56 -0000	1.141
+++ cairo-dock.spec	22 Jan 2009 04:53:04 -0000	1.142
@@ -14,7 +14,7 @@
 %undefine		betaver		
 %define		build_webkit	1
 %define		build_xfce	1
-%define		tarballver	svn1494_trunk
+%define		tarballver	svn1496_trunk
 
 %define		fedora_main_rel	3
 
@@ -215,10 +215,12 @@
 # Cairo-Penguin
 ## Removing trademarked icons
 ## The following directories are (should be) also removed from the tarball
+##
+## Note:
+## This is under discussion with upstream
 %{__sed} -i.icon \
 	-e '/The_Simpsons/d' \
 	-e '/Mario/d' \
-	-e '/Wanda/d' \
 	Cairo-Penguin/data/themes/Makefile.am \
 	configure.ac
 %{__sed} -i.icon2 -e '$s|\\$||' Cairo-Penguin/data/themes/Makefile.am
@@ -640,8 +642,9 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
-* Wed Jan 21 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
-- rev 1494
+* Thu Jan 22 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- rev 1496
+- Include Wanda directory in Cairo-Penguin plug-in again
 
 * Thu Jan 15 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
 - rev 1484


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cairo-dock/devel/sources,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -r1.104 -r1.105
--- sources	21 Jan 2009 05:10:47 -0000	1.104
+++ sources	22 Jan 2009 04:53:04 -0000	1.105
@@ -1 +1 @@
-9f62c0cf733b113e9ad3b9e43067b2fc  cairo-dock-sources-svn1494_trunk.tar.bz2
+5793909618917764b46b857d3dcd2047  cairo-dock-sources-svn1496_trunk.tar.bz2



From rdieter at fedoraproject.org  Thu Jan 22 04:54:23 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu, 22 Jan 2009 04:54:23 +0000 (UTC)
Subject: rpms/kdebase-runtime/F-10 kdebase-runtime.spec,1.78,1.79
Message-ID: <20090122045423.0ECA070033@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdebase-runtime/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8437

Modified Files:
	kdebase-runtime.spec 
Log Message:
* Wed Jan 21 2009 Rex Dieter <rdieter at fedoraproject.org> 4.1.4-2
- include %_bindir/kdesu symlink



Index: kdebase-runtime.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-runtime/F-10/kdebase-runtime.spec,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- kdebase-runtime.spec	8 Jan 2009 14:16:44 -0000	1.78
+++ kdebase-runtime.spec	22 Jan 2009 04:53:52 -0000	1.79
@@ -10,7 +10,7 @@
 Name:          kdebase-runtime
 Summary:       K Desktop Environment - Runtime 
 Version:       4.1.4
-Release:       1%{?dist}
+Release:       2%{?dist}
 
 License:       GPLv2
 Group:         User Interface/Desktops
@@ -40,6 +40,9 @@
 %define rest 1
 %endif
 
+# when kdesu was removed, this is/should-be only temporary
+Conflicts: kdebase3 < 3.5.10-4
+
 Requires: %{name}-libs = %{version}-%{release}
 
 Obsoletes: kdebase4-runtime < %{version}-%{release}
@@ -143,7 +146,10 @@
 rm -rf %{buildroot}
 
 %if 0%{?rest}
-make install DESTDIR=%{buildroot} -C %{_target_platform}
+make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
+
+# kdesu symlink
+ln -s %{_kde4_libexecdir}/kdesu %{buildroot}%{_kde4_bindir}/kdesu
 %endif
 
 %if 0%{?icons}
@@ -381,6 +387,9 @@
 
 
 %changelog
+* Wed Jan 21 2009 Rex Dieter <rdieter at fedoraproject.org> 4.1.4-2
+- include %%_bindir/kdesu symlink
+
 * Thu Jan  8 2009 Luk???? Tinkl <ltinkl at redhat.com> 4.1.4-1
 - KDE 4.1.4
 



From wtogami at fedoraproject.org  Thu Jan 22 05:17:33 2009
From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=)
Date: Thu, 22 Jan 2009 05:17:33 +0000 (UTC)
Subject: rpms/ldm/F-10 .cvsignore, 1.16, 1.17 ldm.spec, 1.24, 1.25 sources, 
	1.20, 1.21
Message-ID: <20090122051733.7B84F70033@cvs1.fedora.phx.redhat.com>

Author: wtogami

Update of /cvs/pkgs/rpms/ldm/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10257

Modified Files:
	.cvsignore ldm.spec sources 
Log Message:
NBD update checker, reboots client automatically if needed



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ldm/F-10/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore	21 Jan 2009 19:30:29 -0000	1.16
+++ .cvsignore	22 Jan 2009 05:17:03 -0000	1.17
@@ -1,2 +1,2 @@
 k12linux-theme-1.0.2.tar.bz2
-ldm-2.0.29.tar.bz2
+ldm-2.0.30.tar.bz2


Index: ldm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ldm/F-10/ldm.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- ldm.spec	21 Jan 2009 19:30:30 -0000	1.24
+++ ldm.spec	22 Jan 2009 05:17:03 -0000	1.25
@@ -1,5 +1,5 @@
 Name:           ldm
-Version:        2.0.29
+Version:        2.0.30
 %define _datestamp .20081218.19
 #Release:        2%{_datestamp}%{?dist}
 Release:        1%{?dist}
@@ -93,8 +93,8 @@
 %config(noreplace) %{_sysconfdir}/ltsp/ldm-global-dmrc
 
 %changelog
-* Wed Dec 24 2008 Warren Togami <wtogami at redhat.com> - 2.0.29-1
-- More bug fixes 
+* Wed Jan 22 2008 Warren Togami <wtogami at redhat.com> - 2.0.30-1
+- NBD update checker, reboots client automatically if needed
 
 * Wed Dec 24 2008 Warren Togami <wtogami at redhat.com> - 2.0.27-1
 - More bug fixes 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ldm/F-10/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources	21 Jan 2009 19:30:30 -0000	1.20
+++ sources	22 Jan 2009 05:17:03 -0000	1.21
@@ -1,2 +1,2 @@
 620e0ae9f5db3c40ade7e17681b97a08  k12linux-theme-1.0.2.tar.bz2
-beb797066c1f5523921ab89404b35778  ldm-2.0.29.tar.bz2
+1fcfcf63c7b11d9e1c041494f8bfe88b  ldm-2.0.30.tar.bz2



From wtogami at fedoraproject.org  Thu Jan 22 05:19:25 2009
From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=)
Date: Thu, 22 Jan 2009 05:19:25 +0000 (UTC)
Subject: rpms/ldm/F-9 .cvsignore, 1.22, 1.23 ldm.spec, 1.29, 1.30 sources,
	1.26, 1.27
Message-ID: <20090122051925.0FF6C70033@cvs1.fedora.phx.redhat.com>

Author: wtogami

Update of /cvs/pkgs/rpms/ldm/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10477

Modified Files:
	.cvsignore ldm.spec sources 
Log Message:
NBD update checker, reboots client automatically if needed



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ldm/F-9/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- .cvsignore	21 Jan 2009 19:35:43 -0000	1.22
+++ .cvsignore	22 Jan 2009 05:18:54 -0000	1.23
@@ -1,2 +1,2 @@
 k12linux-theme-1.0.2.tar.bz2
-ldm-2.0.29.tar.bz2
+ldm-2.0.30.tar.bz2







From wtogami at fedoraproject.org  Thu Jan 22 05:19:50 2009
From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=)
Date: Thu, 22 Jan 2009 05:19:50 +0000 (UTC)
Subject: rpms/ldm/F-10 ldm.spec,1.25,1.26
Message-ID: <20090122051950.5C0D270033@cvs1.fedora.phx.redhat.com>

Author: wtogami

Update of /cvs/pkgs/rpms/ldm/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10528

Modified Files:
	ldm.spec 
Log Message:
bump year



Index: ldm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ldm/F-10/ldm.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- ldm.spec	22 Jan 2009 05:17:03 -0000	1.25
+++ ldm.spec	22 Jan 2009 05:19:20 -0000	1.26
@@ -93,7 +93,7 @@
 %config(noreplace) %{_sysconfdir}/ltsp/ldm-global-dmrc
 
 %changelog
-* Wed Jan 22 2008 Warren Togami <wtogami at redhat.com> - 2.0.30-1
+* Wed Jan 22 2009 Warren Togami <wtogami at redhat.com> - 2.0.30-1
 - NBD update checker, reboots client automatically if needed
 
 * Wed Dec 24 2008 Warren Togami <wtogami at redhat.com> - 2.0.27-1



From wtogami at fedoraproject.org  Thu Jan 22 05:20:20 2009
From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=)
Date: Thu, 22 Jan 2009 05:20:20 +0000 (UTC)
Subject: rpms/ldm/F-9 ldm.spec,1.30,1.31
Message-ID: <20090122052020.E50A970141@cvs1.fedora.phx.redhat.com>

Author: wtogami

Update of /cvs/pkgs/rpms/ldm/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10629

Modified Files:
	ldm.spec 
Log Message:
bump year



Index: ldm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ldm/F-9/ldm.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- ldm.spec	22 Jan 2009 05:18:54 -0000	1.30
+++ ldm.spec	22 Jan 2009 05:19:50 -0000	1.31
@@ -93,7 +93,7 @@
 %config(noreplace) %{_sysconfdir}/ltsp/ldm-global-dmrc
 
 %changelog
-* Wed Jan 22 2008 Warren Togami <wtogami at redhat.com> - 2.0.30-1
+* Wed Jan 22 2009 Warren Togami <wtogami at redhat.com> - 2.0.30-1
 - NBD update checker, reboots client automatically if needed
 
 * Wed Dec 24 2008 Warren Togami <wtogami at redhat.com> - 2.0.27-1



From mtasaka at fedoraproject.org  Thu Jan 22 05:35:28 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Thu, 22 Jan 2009 05:35:28 +0000 (UTC)
Subject: rpms/ruby-RMagick/F-10 .cvsignore, 1.17, 1.18 ruby-RMagick.spec,
	1.21, 1.22 sources, 1.17, 1.18
Message-ID: <20090122053528.9C07770033@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/ruby-RMagick/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12732/F-10

Modified Files:
	.cvsignore ruby-RMagick.spec sources 
Log Message:
* Thu Jan 22 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.9.0-1
- 2.9.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ruby-RMagick/F-10/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- .cvsignore	10 Dec 2008 14:43:11 -0000	1.17
+++ .cvsignore	22 Jan 2009 05:34:57 -0000	1.18
@@ -1 +1 @@
-RMagick-2.8.0.tar.bz2
+RMagick-2.9.0.tar.bz2


Index: ruby-RMagick.spec
===================================================================
RCS file: /cvs/extras/rpms/ruby-RMagick/F-10/ruby-RMagick.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- ruby-RMagick.spec	10 Dec 2008 14:43:11 -0000	1.21
+++ ruby-RMagick.spec	22 Jan 2009 05:34:58 -0000	1.22
@@ -8,7 +8,7 @@
 %define		rubyabi		1.8
 
 %define		modname		RMagick
-%define		repoid		47872
+%define		repoid		50276
 
 %define		IMver		6.3.5
 
@@ -99,6 +99,9 @@
 %doc DOCDIR/HTML/*
 
 %changelog
+* Thu Jan 22 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.9.0-1
+- 2.9.0
+
 * Wed Dec 10 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.8.0-1
 - 2.8.0
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ruby-RMagick/F-10/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources	10 Dec 2008 14:43:11 -0000	1.17
+++ sources	22 Jan 2009 05:34:58 -0000	1.18
@@ -1 +1 @@
-d36fcb546cf4256d7bab3f42c98a91b4  RMagick-2.8.0.tar.bz2
+9025be254238e42f9f21fb6674fd36ae  RMagick-2.9.0.tar.bz2



From mtasaka at fedoraproject.org  Thu Jan 22 05:35:28 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Thu, 22 Jan 2009 05:35:28 +0000 (UTC)
Subject: rpms/ruby-RMagick/F-9 .cvsignore, 1.17, 1.18 ruby-RMagick.spec, 1.19,
	1.20 sources, 1.17, 1.18
Message-ID: <20090122053528.CC34270033@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-serv12732/F-9

Modified Files:
	.cvsignore ruby-RMagick.spec sources 
Log Message:
* Thu Jan 22 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.9.0-1
- 2.9.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ruby-RMagick/F-9/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- .cvsignore	10 Dec 2008 14:43:12 -0000	1.17
+++ .cvsignore	22 Jan 2009 05:34:58 -0000	1.18
@@ -1 +1 @@
-RMagick-2.8.0.tar.bz2
+RMagick-2.9.0.tar.bz2


Index: ruby-RMagick.spec
===================================================================
RCS file: /cvs/extras/rpms/ruby-RMagick/F-9/ruby-RMagick.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- ruby-RMagick.spec	10 Dec 2008 14:43:12 -0000	1.19
+++ ruby-RMagick.spec	22 Jan 2009 05:34:58 -0000	1.20
@@ -8,7 +8,7 @@
 %define		rubyabi		1.8
 
 %define		modname		RMagick
-%define		repoid		47872
+%define		repoid		50276
 
 %define		IMver		6.3.5
 
@@ -99,6 +99,9 @@
 %doc DOCDIR/HTML/*
 
 %changelog
+* Thu Jan 22 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.9.0-1
+- 2.9.0
+
 * Wed Dec 10 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.8.0-1
 - 2.8.0
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ruby-RMagick/F-9/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources	10 Dec 2008 14:43:12 -0000	1.17
+++ sources	22 Jan 2009 05:34:58 -0000	1.18
@@ -1 +1 @@
-d36fcb546cf4256d7bab3f42c98a91b4  RMagick-2.8.0.tar.bz2
+9025be254238e42f9f21fb6674fd36ae  RMagick-2.9.0.tar.bz2



From mtasaka at fedoraproject.org  Thu Jan 22 05:35:29 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Thu, 22 Jan 2009 05:35:29 +0000 (UTC)
Subject: rpms/ruby-RMagick/devel .cvsignore, 1.17, 1.18 ruby-RMagick.spec,
	1.21, 1.22 sources, 1.17, 1.18
Message-ID: <20090122053529.4DB1270033@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/ruby-RMagick/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12732/devel

Modified Files:
	.cvsignore ruby-RMagick.spec sources 
Log Message:
* Thu Jan 22 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.9.0-1
- 2.9.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ruby-RMagick/devel/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- .cvsignore	10 Dec 2008 14:43:12 -0000	1.17
+++ .cvsignore	22 Jan 2009 05:34:58 -0000	1.18
@@ -1 +1 @@
-RMagick-2.8.0.tar.bz2
+RMagick-2.9.0.tar.bz2


Index: ruby-RMagick.spec
===================================================================
RCS file: /cvs/extras/rpms/ruby-RMagick/devel/ruby-RMagick.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- ruby-RMagick.spec	10 Dec 2008 14:43:12 -0000	1.21
+++ ruby-RMagick.spec	22 Jan 2009 05:34:58 -0000	1.22
@@ -8,7 +8,7 @@
 %define		rubyabi		1.8
 
 %define		modname		RMagick
-%define		repoid		47872
+%define		repoid		50276
 
 %define		IMver		6.3.5
 
@@ -99,6 +99,9 @@
 %doc DOCDIR/HTML/*
 
 %changelog
+* Thu Jan 22 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.9.0-1
+- 2.9.0
+
 * Wed Dec 10 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.8.0-1
 - 2.8.0
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ruby-RMagick/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources	10 Dec 2008 14:43:12 -0000	1.17
+++ sources	22 Jan 2009 05:34:58 -0000	1.18
@@ -1 +1 @@
-d36fcb546cf4256d7bab3f42c98a91b4  RMagick-2.8.0.tar.bz2
+9025be254238e42f9f21fb6674fd36ae  RMagick-2.9.0.tar.bz2



From mtasaka at fedoraproject.org  Thu Jan 22 05:42:15 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Thu, 22 Jan 2009 05:42:15 +0000 (UTC)
Subject: rpms/ruby-RMagick/F-10 ruby-RMagick.spec,1.22,1.23
Message-ID: <20090122054215.EBEFA70033@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/ruby-RMagick/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13395/F-10

Modified Files:
	ruby-RMagick.spec 
Log Message:
Really upgrade version


Index: ruby-RMagick.spec
===================================================================
RCS file: /cvs/extras/rpms/ruby-RMagick/F-10/ruby-RMagick.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- ruby-RMagick.spec	22 Jan 2009 05:34:58 -0000	1.22
+++ ruby-RMagick.spec	22 Jan 2009 05:41:45 -0000	1.23
@@ -12,7 +12,7 @@
 
 %define		IMver		6.3.5
 
-%define		mainver		2.8.0
+%define		mainver		2.9.0
 %undefine		betaver		
 %define		fedorarel	1
 



From mtasaka at fedoraproject.org  Thu Jan 22 05:42:16 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Thu, 22 Jan 2009 05:42:16 +0000 (UTC)
Subject: rpms/ruby-RMagick/F-9 ruby-RMagick.spec,1.20,1.21
Message-ID: <20090122054216.2C94370141@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-serv13395/F-9

Modified Files:
	ruby-RMagick.spec 
Log Message:
Really upgrade version


Index: ruby-RMagick.spec
===================================================================
RCS file: /cvs/extras/rpms/ruby-RMagick/F-9/ruby-RMagick.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- ruby-RMagick.spec	22 Jan 2009 05:34:58 -0000	1.20
+++ ruby-RMagick.spec	22 Jan 2009 05:41:45 -0000	1.21
@@ -12,7 +12,7 @@
 
 %define		IMver		6.3.5
 
-%define		mainver		2.8.0
+%define		mainver		2.9.0
 %undefine		betaver		
 %define		fedorarel	1
 



From mtasaka at fedoraproject.org  Thu Jan 22 05:42:16 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Thu, 22 Jan 2009 05:42:16 +0000 (UTC)
Subject: rpms/ruby-RMagick/devel ruby-RMagick.spec,1.22,1.23
Message-ID: <20090122054216.6122C70143@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/ruby-RMagick/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13395/devel

Modified Files:
	ruby-RMagick.spec 
Log Message:
Really upgrade version


Index: ruby-RMagick.spec
===================================================================
RCS file: /cvs/extras/rpms/ruby-RMagick/devel/ruby-RMagick.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- ruby-RMagick.spec	22 Jan 2009 05:34:58 -0000	1.22
+++ ruby-RMagick.spec	22 Jan 2009 05:41:46 -0000	1.23
@@ -12,7 +12,7 @@
 
 %define		IMver		6.3.5
 
-%define		mainver		2.8.0
+%define		mainver		2.9.0
 %undefine		betaver		
 %define		fedorarel	1
 



From cchance at fedoraproject.org  Thu Jan 22 05:49:53 2009
From: cchance at fedoraproject.org (Caius Chance)
Date: Thu, 22 Jan 2009 05:49:53 +0000 (UTC)
Subject: rpms/baekmuk-ttf-fonts/devel baekmuk-ttf-fonts.spec,1.11,1.12
Message-ID: <20090122054953.1939870033@cvs1.fedora.phx.redhat.com>

Author: cchance

Update of /cvs/pkgs/rpms/baekmuk-ttf-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14230

Modified Files:
	baekmuk-ttf-fonts.spec 
Log Message:
* Thu Jan 22 2009 Caius Chance <cchance at redhat.com> - 2.2-16.fc11
- Resolves: rhbz#477332
- Refined dependencies.



Index: baekmuk-ttf-fonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/baekmuk-ttf-fonts/devel/baekmuk-ttf-fonts.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- baekmuk-ttf-fonts.spec	20 Jan 2009 22:57:01 -0000	1.11
+++ baekmuk-ttf-fonts.spec	22 Jan 2009 05:49:22 -0000	1.12
@@ -8,7 +8,7 @@
 
 Name:           %{fontname}-fonts
 Version:        2.2
-Release:        15%{?dist}
+Release:        16%{?dist}
 Summary:        Free Korean TrueType fonts
 
 Group:          User Interface/X
@@ -35,7 +35,6 @@
 %package -n %{fontname}-batang-fonts
 Summary:        Korean Baekmuk TrueType Batang typeface
 Group:          User Interface/X
-Obsoletes:      ttfonts-ko < 1.0.11-33, fonts-korean < 2.2-6
 Obsoletes:      %{name}-batang < 2.2-13
 Requires:       %{fontname}-fonts-common = %{version}-%{release}
 
@@ -49,7 +48,6 @@
 %package -n %{fontname}-dotum-fonts
 Summary:        Korean Baekmuk TrueType Dotum typeface
 Group:          User Interface/X
-Obsoletes:      ttfonts-ko < 1.0.11-33, fonts-korean < 2.2-6
 Obsoletes:      %{name}-dotum < 2.2-13 
 Requires:       %{fontname}-fonts-common = %{version}-%{release}
 
@@ -63,7 +61,6 @@
 %package -n %{fontname}-gulim-fonts
 Summary:        Korean Baekmuk TrueType Gulim typeface
 Group:          User Interface/X
-Obsoletes:      ttfonts-ko < 1.0.11-33, fonts-korean < 2.2-6
 Obsoletes:      %{name}-gulim < 2.2-13
 Requires:       %{fontname}-fonts-common = %{version}-%{release}
 
@@ -77,7 +74,6 @@
 %package -n %{fontname}-hline-fonts
 Summary:        Korean Baekmuk TrueType Headline typeface
 Group:          User Interface/X
-Obsoletes:      ttfonts-ko < 1.0.11-33, fonts-korean < 2.2-6
 Obsoletes:      %{name}-hline < 2.2-13 
 Requires:       %{fontname}-fonts-common = %{version}-%{release}
 
@@ -92,6 +88,7 @@
 Summary:        Common files for Korean Baekmuk TrueType fonts
 Group:          User Interface/X
 Conflicts:      fonts-korean < 2.2-5
+Obsoletes:      ttfonts-ko < 1.0.11-33, fonts-korean < 2.2-5
 
 %description -n %{fontname}-fonts-common
 %common_desc
@@ -100,10 +97,10 @@
 
 %files -n %{fontname}-fonts-common
 %defattr(0644,root,root,0755)
+%doc COPYRIGHT COPYRIGHT.ko README
 %verify(not md5 size mtime) %{_fontdir}/fonts.dir
 %verify(not md5 size mtime) %{_fontdir}/fonts.scale
 %verify(not md5 size mtime) %{catalogue}/%{fontname}
-%doc COPYRIGHT COPYRIGHT.ko README
 %{gsdir}/
 
 %prep
@@ -144,7 +141,7 @@
 %__install -p -m 0644 %{SOURCE2} %{buildroot}%{gsdir}/
 
 # catalogue
-%__install -d %{buildroot}%{catalogue}
+%__install -d -m 0755 %{buildroot}%{catalogue}
 %__ln_s %{_fontdir} %{buildroot}%{catalogue}/%{fontname}
 
 # convert Korean copyright file to utf8
@@ -154,6 +151,10 @@
 %__rm -rf %{buildroot}
 
 %changelog
+* Thu Jan 22 2009 Caius Chance <cchance at redhat.com> - 2.2-16.fc11
+- Resolves: rhbz#477332
+- Refined dependencies.
+
 * Tue Jan 20 2009 Matthias Clasen <mclasen at redhat.com> - 2.2-15.fc11
 - Fix busted inter-subpackage dependencies
 



From fabbione at fedoraproject.org  Thu Jan 22 05:52:06 2009
From: fabbione at fedoraproject.org (Fabio M. Di Nitto)
Date: Thu, 22 Jan 2009 05:52:06 +0000 (UTC)
Subject: rpms/cluster/devel cluster.spec,1.31,1.32
Message-ID: <20090122055206.B9EAC70033@cvs1.fedora.phx.redhat.com>

Author: fabbione

Update of /cvs/pkgs/rpms/cluster/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14414

Modified Files:
	cluster.spec 
Log Message:
Move binaries in proper locations (/sbin -> %{_sbindir}) and kill all the
legacy around their position.



Index: cluster.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cluster/devel/cluster.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- cluster.spec	12 Jan 2009 07:27:55 -0000	1.31
+++ cluster.spec	22 Jan 2009 05:51:36 -0000	1.32
@@ -19,7 +19,7 @@
 Name: cluster
 Summary: Red Hat Cluster
 Version: 3.0.0
-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/
@@ -52,7 +52,7 @@
 %build
 # for legacy reasons, all binaries have always been installed in /sbin
 ./configure \
-  --sbindir=/sbin \
+  --sbindir=%{_sbindir} \
   --initddir=%{_sysconfdir}/rc.d/init.d \
   --libdir=%{_libdir} \
 %if %{buildvirt}
@@ -150,14 +150,14 @@
 %{_sysconfdir}/cluster/cman-notify.d/scsi_reserve_notify
 %config(noreplace) %{_sysconfdir}/udev/rules.d/*-dlm.rules
 %config(noreplace) %{_sysconfdir}/logrotate.d/cman
-/sbin/ccs*
-/sbin/cman*
-/sbin/confdb2ldif
-/sbin/dlm*
-/sbin/fence*
-/sbin/gfs_control*
-/sbin/group*
-/sbin/*qdisk*
+%{_sbindir}/ccs*
+%{_sbindir}/cman*
+%{_sbindir}/confdb2ldif
+%{_sbindir}/dlm*
+%{_sbindir}/fence*
+%{_sbindir}/gfs_control*
+%{_sbindir}/group*
+%{_sbindir}/*qdisk*
 %{_libdir}/libccs*.so.*
 %{_libdir}/libdlm*.so.*
 %{_libdir}/libfence*.so.*
@@ -257,9 +257,9 @@
 %defattr(-,root,root,-)
 %doc doc/COPYING.* doc/COPYRIGHT doc/README.licence rgmanager/README rgmanager/errors.txt
 %{_sysconfdir}/rc.d/init.d/rgmanager
-/sbin/clu*
-/sbin/rgmanager
-/sbin/rg_test
+%{_sbindir}/clu*
+%{_sbindir}/rgmanager
+%{_sbindir}/rg_test
 %{_datadir}/cluster
 %{_mandir}/man8/clu*
 
@@ -288,7 +288,8 @@
 %defattr(-,root,root,-)
 %doc doc/COPYRIGHT doc/README.licence doc/COPYING.*
 %{_sysconfdir}/rc.d/init.d/gfs2
-/sbin/*gfs2*
+/sbin/mount.gfs2
+%{_sbindir}/*gfs2*
 %{_mandir}/man8/*gfs2*
 
 %package -n gfs-utils
@@ -317,12 +318,16 @@
 %defattr(-,root,root,-)
 %doc doc/COPYRIGHT doc/README.licence doc/COPYING.*
 %{_sysconfdir}/rc.d/init.d/gfs
-/sbin/gfs_*
-/sbin/*.gfs
+/sbin/mount.gfs
+%{_sbindir}/gfs_*
+%{_sbindir}/*.gfs
 %{_mandir}/man8/gfs.*
 %{_mandir}/man8/gfs_*
 
 %changelog
+* Wed Jan 21 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 3.0.0-3.alpha2
+- Move all binaries where they belong. All the legacy stuff is now dead.
+
 * Mon Jan 12 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 3.0.0-2.alpha2
 - New upstream release (retag cvs package)
 



From iankent at fedoraproject.org  Thu Jan 22 05:53:15 2009
From: iankent at fedoraproject.org (Ian Kent)
Date: Thu, 22 Jan 2009 05:53:15 +0000 (UTC)
Subject: rpms/autofs/F-10 autofs.spec,1.258,1.259
Message-ID: <20090122055315.657AA70033@cvs1.fedora.phx.redhat.com>

Author: iankent

Update of /cvs/pkgs/rpms/autofs/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15191

Modified Files:
	autofs.spec 
Log Message:
- update spec file rev, oops!



Index: autofs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/autofs/F-10/autofs.spec,v
retrieving revision 1.258
retrieving revision 1.259
diff -u -r1.258 -r1.259
--- autofs.spec	19 Nov 2008 06:58:34 -0000	1.258
+++ autofs.spec	22 Jan 2009 05:52:45 -0000	1.259
@@ -4,7 +4,7 @@
 Summary: A tool for automatically mounting and unmounting filesystems
 Name: autofs
 Version: 5.0.3
-Release: 36
+Release: 38
 Epoch: 1
 License: GPLv2+
 Group: System Environment/Daemons
@@ -70,6 +70,7 @@
 Patch58: autofs-5.0.3-fix-master-map-lexer-eval-order.patch
 Patch59: autofs-5.0.3-fix-bad-alloca-usage.patch
 Patch60: autofs-5.0.4-fix-dumb-libxml2-check.patch
+Patch61: autofs-5.0.3-use-CLOEXEC-flag.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
@@ -171,6 +172,7 @@
 %patch58 -p1
 %patch59 -p1
 %patch60 -p1
+%patch61 -p1
 
 %build
 #CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=/usr --libdir=%{_libdir}
@@ -223,6 +225,9 @@
 %{_libdir}/autofs/
 
 %changelog
+* Wed Jan 21 2009 Ian Kent <kent at redhat.com> - 5.0.3-38
+- use CLOEXEC flag functionality if present.
+
 * Wed Nov 19 2008 Ian Kent <kent at redhat.com> - 5.0.3-36
 - fix libxml2 version check for deciding whether to use workaround.
 



From iankent at fedoraproject.org  Thu Jan 22 05:55:00 2009
From: iankent at fedoraproject.org (Ian Kent)
Date: Thu, 22 Jan 2009 05:55:00 +0000 (UTC)
Subject: rpms/autofs/F-10 autofs-5.0.3-use-CLOEXEC-flag.patch,NONE,1.1
Message-ID: <20090122055500.0935A70033@cvs1.fedora.phx.redhat.com>

Author: iankent

Update of /cvs/pkgs/rpms/autofs/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15519

Added Files:
	autofs-5.0.3-use-CLOEXEC-flag.patch 
Log Message:
- and add asscociated patch.


autofs-5.0.3-use-CLOEXEC-flag.patch:

--- NEW FILE autofs-5.0.3-use-CLOEXEC-flag.patch ---
autofs-5.0.3 - use CLOEXEC flag

From: Ian Kent <raven at themaw.net>

Update autofs to use the new CLOEXEC flag if present.
This allows us to set close on exec atomically flag when opening files,
hopefully avoiding selinux complaining about leaked file handles.
---

 daemon/automount.c        |   42 +++---------------
 daemon/direct.c           |    2 
 daemon/flag.c             |    8 +--
 daemon/indirect.c         |    2 
 daemon/lookup.c           |    1 
 daemon/module.c           |    2 
 daemon/spawn.c            |   11 ----
 include/automount.h       |  106 ++++++++++++++++++++++++++++++++++++++++++++++
 include/state.h           |    1 
 lib/cache.c               |    2 
 lib/defaults.c            |    7 +--
 lib/log.c                 |    2 
 lib/macros.c              |    1 
 lib/mounts.c              |    2 
 lib/nss_parse.y           |   13 -----
 lib/parse_subs.c          |    1 
 lib/rpc_subs.c            |   21 ++-------
 modules/cyrus-sasl.c      |    1 
 modules/lookup_file.c     |   40 ++---------------
 modules/lookup_hesiod.c   |    1 
 modules/lookup_hosts.c    |    1 
 modules/lookup_ldap.c     |    1 
 modules/lookup_multi.c    |    1 
 modules/lookup_nisplus.c  |    1 
 modules/lookup_program.c  |    5 --
 modules/lookup_userhome.c |    1 
 modules/lookup_yp.c       |    1 
 modules/mount_afs.c       |    2 
 modules/mount_autofs.c    |    2 
 modules/mount_bind.c      |    2 
 modules/mount_changer.c   |   10 ----
 modules/mount_ext2.c      |    2 
 modules/mount_generic.c   |    2 
 modules/mount_nfs.c       |    2 
 modules/parse_hesiod.c    |    1 
 modules/parse_sun.c       |    2 
 modules/replicated.c      |   13 +----
 37 files changed, 145 insertions(+), 170 deletions(-)


--- autofs-5.0.3.orig/daemon/automount.c
+++ autofs-5.0.3/daemon/automount.c
@@ -20,13 +20,11 @@
  * ----------------------------------------------------------------------- */
 
 #include <dirent.h>
-#include <fcntl.h>
 #include <getopt.h>
 #include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <unistd.h>
 #include <sys/ioctl.h>
 #include <ctype.h>
 #include <sys/types.h>
@@ -68,6 +66,9 @@ static pthread_t state_mach_thid;
 /* Pre-calculated kernel packet length */
 static size_t kpkt_len;
 
+/* Does kernel know about SOCK_CLOEXEC and friends */
+static int cloexec_works = 0;
+
 /* Attribute to create detached thread */
 pthread_attr_t thread_attr;
 
@@ -705,7 +706,7 @@ static char *automount_path_to_fifo(unsi
 static int create_logpri_fifo(struct autofs_point *ap)
 {
 	int ret = -1;
-	int fd, cl_flags;
+	int fd;
 	char *fifo_name;
 	char buf[MAX_ERR_BUF];
 
@@ -731,7 +732,7 @@ static int create_logpri_fifo(struct aut
 		goto out_free;
 	}
 
-	fd = open(fifo_name, O_RDWR|O_NONBLOCK);
+	fd = open_fd(fifo_name, O_RDWR|O_NONBLOCK);
 	if (fd < 0) {
 		char *estr = strerror_r(errno, buf, MAX_ERR_BUF);
 		crit(ap->logopt,
@@ -741,11 +742,6 @@ static int create_logpri_fifo(struct aut
 		goto out_free;
 	}
 
-	if ((cl_flags = fcntl(fd, F_GETFD, 0)) != -1) {
-		cl_flags |= FD_CLOEXEC;
-		fcntl(fd, F_SETFD, cl_flags);
-	}
-
 	ap->logpri_fifo = fd;
 
 out_free:
@@ -997,7 +993,7 @@ int do_expire(struct autofs_point *ap, c
 
 static int autofs_init_ap(struct autofs_point *ap)
 {
-	int pipefd[2], cl_flags;
+	int pipefd[2];
 
 	if ((ap->state != ST_INIT)) {
 		/* This can happen if an autofs process is already running*/
@@ -1008,7 +1004,7 @@ static int autofs_init_ap(struct autofs_
 	ap->pipefd = ap->kpipefd = ap->ioctlfd = -1;
 
 	/* Pipe for kernel communications */
-	if (pipe(pipefd) < 0) {
+	if (open_pipe(pipefd) < 0) {
 		crit(ap->logopt,
 		     "failed to create commumication pipe for autofs path %s",
 		     ap->path);
@@ -1018,18 +1014,8 @@ static int autofs_init_ap(struct autofs_
 	ap->pipefd = pipefd[0];
 	ap->kpipefd = pipefd[1];
 
-	if ((cl_flags = fcntl(ap->pipefd, F_GETFD, 0)) != -1) {
-		cl_flags |= FD_CLOEXEC;
-		fcntl(ap->pipefd, F_SETFD, cl_flags);
-	}
-
-	if ((cl_flags = fcntl(ap->kpipefd, F_GETFD, 0)) != -1) {
-		cl_flags |= FD_CLOEXEC;
-		fcntl(ap->kpipefd, F_SETFD, cl_flags);
-	}
-
 	/* Pipe state changes from signal handler to main loop */
-	if (pipe(ap->state_pipe) < 0) {
+	if (open_pipe(ap->state_pipe) < 0) {
 		crit(ap->logopt,
 		     "failed create state pipe for autofs path %s", ap->path);
 		close(ap->pipefd);
@@ -1037,16 +1023,6 @@ static int autofs_init_ap(struct autofs_
 		return -1;
 	}
 
-	if ((cl_flags = fcntl(ap->state_pipe[0], F_GETFD, 0)) != -1) {
-		cl_flags |= FD_CLOEXEC;
-		fcntl(ap->state_pipe[0], F_SETFD, cl_flags);
-	}
-
-	if ((cl_flags = fcntl(ap->state_pipe[1], F_GETFD, 0)) != -1) {
-		cl_flags |= FD_CLOEXEC;
-		fcntl(ap->state_pipe[1], F_SETFD, cl_flags);
-	}
-
 	if (create_logpri_fifo(ap) < 0) {
 		logmsg("could not create FIFO for path %s\n", ap->path);
 		logmsg("dynamic log level changes not available for %s", ap->path);
@@ -1114,7 +1090,7 @@ static void become_daemon(unsigned foreg
 		exit(0);
 	}
 
-	if (pipe(start_pipefd) < 0) {
+	if (open_pipe(start_pipefd) < 0) {
 		fprintf(stderr, "%s: failed to create start_pipefd.\n",
 			program);
 		exit(0);
--- autofs-5.0.3.orig/daemon/direct.c
+++ autofs-5.0.3/daemon/direct.c
@@ -20,12 +20,10 @@
  * ----------------------------------------------------------------------- */
 
 #include <dirent.h>
-#include <fcntl.h>
 #include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <unistd.h>
 #include <sys/ioctl.h>
 #include <sys/types.h>
 #include <sys/wait.h>
--- autofs-5.0.3.orig/daemon/flag.c
+++ autofs-5.0.3/daemon/flag.c
@@ -21,15 +21,15 @@
 #include <sys/time.h>
 #include <sys/types.h>
 #include <sys/stat.h>
-#include <fcntl.h>
 #include <time.h>
-#include <unistd.h>
 #include <string.h>
 #include <alloca.h>
 #include <stdio.h>
 #include <signal.h>
 #include <errno.h>
 
+#include "automount.h"
+
 #define MAX_PIDSIZE	20
 #define FLAG_FILE	AUTOFS_FLAG_DIR "/autofs-running"
 
@@ -129,7 +129,7 @@ int aquire_flag_file(void)
 	while (!we_created_flagfile) {
 		int errsv, i, j;
 
-		i = open(linkf, O_WRONLY|O_CREAT, 0);
+		i = open_fd_mode(linkf, O_WRONLY|O_CREAT, 0);
 		if (i < 0) {
 			release_flag_file();
 			return 0;
@@ -146,7 +146,7 @@ int aquire_flag_file(void)
 			return 0;
 		}
 
-		fd = open(FLAG_FILE, O_RDWR);
+		fd = open_fd(FLAG_FILE, O_RDWR);
 		if (fd < 0) {
 			/* Maybe the file was just deleted? */
 			if (errno == ENOENT)
--- autofs-5.0.3.orig/daemon/indirect.c
+++ autofs-5.0.3/daemon/indirect.c
@@ -20,12 +20,10 @@
  * ----------------------------------------------------------------------- */
 
 #include <dirent.h>
-#include <fcntl.h>
 #include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <unistd.h>
 #include <sys/ioctl.h>
 #include <sys/types.h>
 #include <sys/wait.h>
--- autofs-5.0.3.orig/daemon/lookup.c
+++ autofs-5.0.3/daemon/lookup.c
@@ -22,7 +22,6 @@
 #include <stdio.h>
 #include <string.h>
 #include <sys/stat.h>
-#include <unistd.h>
 #include "automount.h"
 #include "nsswitch.h"
 
--- autofs-5.0.3.orig/daemon/module.c
+++ autofs-5.0.3/daemon/module.c
@@ -31,7 +31,7 @@ int load_autofs4_module(void)
 	 * is an older version we will catch it at mount
 	 * time.
 	 */
-	fp = fopen("/proc/filesystems", "r");
+	fp = open_fopen_r("/proc/filesystems");
 	if (!fp) {
 		logerr("cannot open /proc/filesystems\n");
 		return 0;
--- autofs-5.0.3.orig/daemon/spawn.c
+++ autofs-5.0.3/daemon/spawn.c
@@ -13,7 +13,6 @@
  *
  * ----------------------------------------------------------------------- */
 
-#include <fcntl.h>
 #include <signal.h>
 #include <stdarg.h>
 #include <stdio.h>
@@ -21,7 +20,6 @@
 #include <string.h>
 #include <sys/types.h>
 #include <dirent.h>
-#include <unistd.h>
 #include <time.h>
 #include <sys/wait.h>
 #include <sys/stat.h>
@@ -125,7 +123,7 @@ static int do_spawn(unsigned logopt, uns
 	int ret, status, pipefd[2];
 	char errbuf[ERRBUFSIZ + 1], *p, *sp;
 	int errp, errn;
-	int flags, cancel_state;
+	int cancel_state;
 	unsigned int use_lock = options & SPAWN_OPT_LOCK;
 	unsigned int use_access = options & SPAWN_OPT_ACCESS;
 	sigset_t allsigs, tmpsig, oldsig;
@@ -133,7 +131,7 @@ static int do_spawn(unsigned logopt, uns
 	pid_t euid = 0;
 	gid_t egid = 0;
 
-	if (pipe(pipefd))
+	if (open_pipe(pipefd))
 		return -1;
 
 	pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &cancel_state);
@@ -213,11 +211,6 @@ static int do_spawn(unsigned logopt, uns
 			return -1;
 		}
 
-		if ((flags = fcntl(pipefd[0], F_GETFD, 0)) != -1) {
-			flags |= FD_CLOEXEC;
-			fcntl(pipefd[0], F_SETFD, flags);
-		}
-
 		errp = 0;
 		do {
 			errn = timed_read(pipefd[0],
--- autofs-5.0.3.orig/include/automount.h
+++ autofs-5.0.3/include/automount.h
@@ -17,6 +17,8 @@
 #include <pthread.h>
 #include <sched.h>
 #include <errno.h>
+#include <unistd.h>
+#include <fcntl.h>
 #include "config.h"
 #include "list.h"
 
@@ -464,5 +466,109 @@ int alarm_start_handler(void);
 int alarm_add(struct autofs_point *ap, time_t seconds);
 void alarm_delete(struct autofs_point *ap);
 
+/*
+ * Use CLOEXEC flag for open(), pipe(), fopen() (read-only case) and
+ * socket() if possible.
+ */
+static int cloexec_works;
+
+static inline void check_cloexec(int fd)
+{
+	if (cloexec_works == 0) {
+		int fl = fcntl(fd, F_GETFD);
+		cloexec_works = (fl & FD_CLOEXEC) ? 1 : -1;
+	}
+	if (cloexec_works > 0)
+		return;
+	fcntl(fd, F_SETFD, FD_CLOEXEC);
+	return;
+}
+
+static inline int open_fd(const char *path, int flags)
+{
+	int fd;
+
+#if defined(O_CLOEXEC) && defined(SOCK_CLOEXEC)
+	if (cloexec_works != -1)
+		flags |= O_CLOEXEC;
+#endif
+	fd = open(path, flags);
+	if (fd == -1)
+		return -1;
+	check_cloexec(fd);
+	return fd;
+}
+
+static inline int open_fd_mode(const char *path, int flags, int mode)
+{
+	int fd;
+
+#if defined(O_CLOEXEC) && defined(SOCK_CLOEXEC)
+	if (cloexec_works != -1)
+		flags |= O_CLOEXEC;
+#endif
+	fd = open(path, flags, mode);
+	if (fd == -1)
+		return -1;
+	check_cloexec(fd);
+	return fd;
+}
+
+static inline int open_pipe(int pipefd[2])
+{
+	int ret;
+
+#if defined(O_CLOEXEC) && defined(SOCK_CLOEXEC) && defined(__have_pipe2)
+	if (cloexec_works != -1) {
+		ret = pipe2(pipefd, O_CLOEXEC);
+		if (ret != -1)
+			return 0;
+		if (errno != EINVAL)
+			return -1;
+	}
+#endif
+	ret = pipe(pipefd);
+	if (ret == -1)
+		return -1;
+	check_cloexec(pipefd[0]);
+	check_cloexec(pipefd[1]);
+	return 0;
+}
+
+static inline int open_sock(int domain, int type, int protocol)
+{
+	int fd;
+
+#ifdef SOCK_CLOEXEC
+	if (cloexec_works != -1)
+		type |= SOCK_CLOEXEC;
+#endif
+	fd = socket(domain, type, protocol);
+	if (fd == -1)
+		return -1;
+	check_cloexec(fd);
+	return fd;
+}
+
+static inline FILE *open_fopen_r(const char *path)
+{
+	FILE *f;
+
+#if defined(O_CLOEXEC) && defined(SOCK_CLOEXEC)
+	if (cloexec_exec != -1) {
+		f = fopen(path, "re");
+		if (f != NULL) {
+			check_cloexec(fileno(f));
+			return f;
+		}
+	}
+#endif
+	f = fopen(path, "r");
+	if (f == NULL)
+		return NULL;
+	check_cloexec(fileno(f));
+	return f;
+}
+
 #endif
 
--- autofs-5.0.3.orig/include/state.h
+++ autofs-5.0.3/include/state.h
@@ -20,7 +20,6 @@
 #ifndef STATE_H
 #define STATE_H
 
-#include <unistd.h>
 #include <string.h>
 #include <stdlib.h>
 #include <signal.h>
--- autofs-5.0.3.orig/lib/cache.c
+++ autofs-5.0.3/lib/cache.c
@@ -17,10 +17,8 @@
 #include <malloc.h>
 #include <stdlib.h>
 #include <string.h>
-#include <unistd.h>
 #include <ctype.h>
 #include <stdio.h>
-#include <fcntl.h>
 #include <sys/param.h>
 #include <sys/types.h>
 #include <sys/stat.h>
--- autofs-5.0.3.orig/lib/defaults.c
+++ autofs-5.0.3/lib/defaults.c
@@ -21,6 +21,7 @@
 #include "defaults.h"
 #include "lookup_ldap.h"
 #include "log.h"
+#include "automount.h"
 
 #define DEFAULTS_CONFIG_FILE		AUTOFS_CONF_DIR "/autofs"
 #define MAX_LINE_LEN			256
@@ -255,7 +256,7 @@ struct list_head *defaults_get_uris(void
 	char *res;
 	struct list_head *list;
 
-	f = fopen(DEFAULTS_CONFIG_FILE, "r");
+	f = open_fopen_r(DEFAULTS_CONFIG_FILE);
 	if (!f)
 		return NULL;
 
@@ -298,7 +299,7 @@ unsigned int defaults_read_config(unsign
 	char buf[MAX_LINE_LEN];
 	char *res;
 
-	f = fopen(DEFAULTS_CONFIG_FILE, "r");
+	f = open_fopen_r(DEFAULTS_CONFIG_FILE);
 	if (!f)
 		return 0;
 
@@ -544,7 +545,7 @@ struct ldap_searchdn *defaults_get_searc
 	char *res;
 	struct ldap_searchdn *sdn, *last;
 
-	f = fopen(DEFAULTS_CONFIG_FILE, "r");
+	f = open_fopen_r(DEFAULTS_CONFIG_FILE);
 	if (!f)
 		return NULL;
 
--- autofs-5.0.3.orig/lib/log.c
+++ autofs-5.0.3/lib/log.c
@@ -20,8 +20,6 @@
 
 #include <stdarg.h>
 #include <stdio.h>
-#include <unistd.h>
-#include <fcntl.h>
 #include <stdlib.h>
 #include <string.h>
 
--- autofs-5.0.3.orig/lib/macros.c
+++ autofs-5.0.3/lib/macros.c
@@ -14,7 +14,6 @@
  * ----------------------------------------------------------------------- */
 
 #include <malloc.h>
-#include <unistd.h>
 #include <stdlib.h>
 #include <string.h>
 #include <limits.h>
--- autofs-5.0.3.orig/lib/mounts.c
+++ autofs-5.0.3/lib/mounts.c
@@ -14,13 +14,11 @@
 
 #include <stdlib.h>
 #include <string.h>
-#include <unistd.h>
 #include <mntent.h>
 #include <limits.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/ioctl.h>
-#include <fcntl.h>
 #include <sys/mount.h>
 #include <stdio.h>
 #include <dirent.h>
--- autofs-5.0.3.orig/lib/nss_parse.y
+++ autofs-5.0.3/lib/nss_parse.y
@@ -22,8 +22,6 @@
 #include <stdlib.h>
 #include <string.h>
 #include <memory.h>
-#include <unistd.h>
-#include <fcntl.h>
 #include <limits.h>
 
 #include "automount.h"
@@ -164,9 +162,9 @@ static void parse_close_nsswitch(void *a
 int nsswitch_parse(struct list_head *list)
 {
 	FILE *nsswitch;
-	int fd, cl_flags, status;
+	int status;
 
-	nsswitch = fopen(NSSWITCH_FILE, "r");
+	nsswitch = open_fopen_r(NSSWITCH_FILE);
 	if (!nsswitch) {
 		logerr("couldn't open %s\n", NSSWITCH_FILE);
 		return 1;
@@ -174,13 +172,6 @@ int nsswitch_parse(struct list_head *lis
 
 	pthread_cleanup_push(parse_close_nsswitch, nsswitch);
 
-	fd = fileno(nsswitch);
-
-	if ((cl_flags = fcntl(fd, F_GETFD, 0)) != -1) {
-		cl_flags |= FD_CLOEXEC;
-		fcntl(fd, F_SETFD, cl_flags);
-	}
-
 	parse_mutex_lock();
 	pthread_cleanup_push(parse_mutex_unlock, NULL);
 
--- autofs-5.0.3.orig/lib/parse_subs.c
+++ autofs-5.0.3/lib/parse_subs.c
@@ -18,7 +18,6 @@
 #include <stdlib.h>
 #include <string.h>
 #include <ctype.h>
-#include <unistd.h>
 #include "automount.h"
 
 /*
--- autofs-5.0.3.orig/lib/rpc_subs.c
+++ autofs-5.0.3/lib/rpc_subs.c
@@ -21,13 +21,11 @@
 #include <rpc/rpc.h>
 #include <rpc/pmap_prot.h>
 
-#include <unistd.h>
 #include <sys/socket.h>
 #include <netdb.h>
 #include <net/if.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
-#include <sys/fcntl.h>
 #include <rpcsvc/ypclnt.h>
 #include <errno.h>
 #include <sys/ioctl.h>
@@ -36,6 +34,7 @@
 
 #include "mount.h"
 #include "rpc_subs.h"
+#include "automount.h"
 
 /* #define STANDALONE */
 #ifdef STANDALONE
@@ -59,7 +58,7 @@ inline void dump_core(void);
  */
 static CLIENT *create_udp_client(struct conn_info *info)
 {
-	int fd, cl_flags, ret, ghn_errno;
+	int fd, ret, ghn_errno;
 	CLIENT *client;
 	struct sockaddr_in laddr, raddr;
 	struct hostent hp;
@@ -115,15 +114,10 @@ got_addr:
 		 * layer, it would bind to a reserved port, which has been shown
 		 * to exhaust the reserved port range in some situations.
 		 */
-		fd = socket(PF_INET, SOCK_DGRAM, IPPROTO_UDP);
+		fd = open_sock(PF_INET, SOCK_DGRAM, IPPROTO_UDP);
 		if (fd < 0)
 			return NULL;
 
-		if ((cl_flags = fcntl(fd, F_GETFD, 0)) != -1) {
-			cl_flags |= FD_CLOEXEC;
-			fcntl(fd, F_SETFD, cl_flags);
-		}
-
 		laddr.sin_family = AF_INET;
 		laddr.sin_port = 0;
 		laddr.sin_addr.s_addr = htonl(INADDR_ANY);
@@ -274,7 +268,7 @@ done:
  */
 static CLIENT *create_tcp_client(struct conn_info *info)
 {
-	int fd, cl_flags, ghn_errno;
+	int fd, ghn_errno;
 	CLIENT *client;
 	struct sockaddr_in addr;
 	struct hostent hp;
@@ -324,15 +318,10 @@ got_addr:
 	addr.sin_port = htons(info->port);
 
 	if (!info->client) {
-		fd = socket(PF_INET, SOCK_STREAM, info->proto->p_proto);
+		fd = open_sock(PF_INET, SOCK_STREAM, info->proto->p_proto);
 		if (fd < 0)
 			return NULL;
 
-		if ((cl_flags = fcntl(fd, F_GETFD, 0)) != -1) {
-			cl_flags |= FD_CLOEXEC;
-			fcntl(fd, F_SETFD, cl_flags);
-		}
-
 		ret = connect_nb(fd, &addr, &info->timeout);
 		if (ret < 0)
 			goto out_close;
--- autofs-5.0.3.orig/modules/cyrus-sasl.c
+++ autofs-5.0.3/modules/cyrus-sasl.c
@@ -51,7 +51,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <unistd.h>
 #include <ldap.h>
 #include <sasl/sasl.h>
 
--- autofs-5.0.3.orig/modules/lookup_file.c
+++ autofs-5.0.3/modules/lookup_file.c
@@ -17,8 +17,6 @@
 #include <malloc.h>
 #include <stdlib.h>
 #include <string.h>
-#include <unistd.h>
-#include <fcntl.h>
 #include <time.h>
 #include <ctype.h>
 #include <signal.h>
@@ -395,7 +393,7 @@ int lookup_read_master(struct master *ma
 	char *ent;
 	struct stat st;
 	FILE *f;
-	int fd, cl_flags;
+	int fd;
 	unsigned int path_len, ent_len;
 	int entry, cur_state;
 
@@ -422,7 +420,7 @@ int lookup_read_master(struct master *ma
 		return NSS_STATUS_UNAVAIL;
 	}
 
-	f = fopen(ctxt->mapname, "r");
+	f = open_fopen_r(ctxt->mapname);
 	if (!f) {
 		error(logopt,
 		      MODPREFIX "could not open master map file %s",
@@ -432,11 +430,6 @@ int lookup_read_master(struct master *ma
 
 	fd = fileno(f);
 
-	if ((cl_flags = fcntl(fd, F_GETFD, 0)) != -1) {
-		cl_flags |= FD_CLOEXEC;
-		fcntl(fd, F_SETFD, cl_flags);
-	}
-
 	while(1) {
 		entry = read_one(logopt, f, path, &path_len, ent, &ent_len);
 		if (!entry) {
@@ -651,7 +644,7 @@ int lookup_read_map(struct autofs_point 
 	char *mapent;
 	struct stat st;
 	FILE *f;
-	int fd, cl_flags;
+	int fd;
 	unsigned int k_len, m_len;
 	int entry;
 
@@ -684,7 +677,7 @@ int lookup_read_map(struct autofs_point 
 		return NSS_STATUS_UNAVAIL;
 	}
 
-	f = fopen(ctxt->mapname, "r");
+	f = open_fopen_r(ctxt->mapname);
 	if (!f) {
 		error(ap->logopt,
 		      MODPREFIX "could not open map file %s", ctxt->mapname);
@@ -693,11 +686,6 @@ int lookup_read_map(struct autofs_point 
 
 	fd = fileno(f);
 
-	if ((cl_flags = fcntl(fd, F_GETFD, 0)) != -1) {
-		cl_flags |= FD_CLOEXEC;
-		fcntl(fd, F_SETFD, cl_flags);
-	}
-
 	while(1) {
 		entry = read_one(ap->logopt, f, key, &k_len, mapent, &m_len);
 		if (!entry) {
@@ -784,7 +772,6 @@ static int lookup_one(struct autofs_poin
 	char mapent[MAPENT_MAX_LEN + 1];
 	time_t age = time(NULL);
 	FILE *f;
-	int fd, cl_flags;
 	unsigned int k_len, m_len;
 	int entry, ret;
 
@@ -794,20 +781,13 @@ static int lookup_one(struct autofs_poin
 
 	mc = source->mc;
 
-	f = fopen(ctxt->mapname, "r");
+	f = open_fopen_r(ctxt->mapname);
 	if (!f) {
 		error(ap->logopt,
 		      MODPREFIX "could not open map file %s", ctxt->mapname);
 		return CHE_FAIL;
 	}
 
-	fd = fileno(f);
-
-	if ((cl_flags = fcntl(fd, F_GETFD, 0)) != -1) {
-		cl_flags |= FD_CLOEXEC;
-		fcntl(fd, F_SETFD, cl_flags);
-	}
-
 	while(1) {
 		entry = read_one(ap->logopt, f, mkey, &k_len, mapent, &m_len);
 		if (entry) {
@@ -897,7 +877,6 @@ static int lookup_wild(struct autofs_poi
 	char mapent[MAPENT_MAX_LEN + 1];
 	time_t age = time(NULL);
 	FILE *f;
-	int fd, cl_flags;
 	unsigned int k_len, m_len;
 	int entry, ret;
 
@@ -907,20 +886,13 @@ static int lookup_wild(struct autofs_poi
 
 	mc = source->mc;
 
-	f = fopen(ctxt->mapname, "r");
+	f = open_fopen_r(ctxt->mapname);
 	if (!f) {
 		error(ap->logopt,
 		      MODPREFIX "could not open map file %s", ctxt->mapname);
 		return CHE_FAIL;
 	}
 
-	fd = fileno(f);
-
-	if ((cl_flags = fcntl(fd, F_GETFD, 0)) != -1) {
-		cl_flags |= FD_CLOEXEC;
-		fcntl(fd, F_SETFD, cl_flags);
-	}
-
 	while(1) {
 		entry = read_one(ap->logopt, f, mkey, &k_len, mapent, &m_len);
 		if (entry) {
--- autofs-5.0.3.orig/modules/lookup_hesiod.c
+++ autofs-5.0.3/modules/lookup_hesiod.c
@@ -10,7 +10,6 @@
 #include <ctype.h>
 #include <limits.h>
 #include <string.h>
-#include <unistd.h>
 #include <stdlib.h>
 #include <netinet/in.h>
 #include <arpa/nameser.h>
--- autofs-5.0.3.orig/modules/lookup_hosts.c
+++ autofs-5.0.3/modules/lookup_hosts.c
@@ -15,7 +15,6 @@
 
 #include <stdio.h>
 #include <malloc.h>
-#include <unistd.h>
 #include <sys/param.h>
 #include <sys/types.h>
 #include <sys/stat.h>
--- autofs-5.0.3.orig/modules/lookup_ldap.c
+++ autofs-5.0.3/modules/lookup_ldap.c
@@ -21,7 +21,6 @@
 #include <sys/stat.h>
 #include <ctype.h>
 #include <string.h>
-#include <unistd.h>
 #include <stdlib.h>
 #include <time.h>
 #include <signal.h>
--- autofs-5.0.3.orig/modules/lookup_multi.c
+++ autofs-5.0.3/modules/lookup_multi.c
@@ -18,7 +18,6 @@
 #include <malloc.h>
 #include <stdio.h>
 #include <string.h>
-#include <unistd.h>
 #include <sys/stat.h>
 
 #define MODULE_LOOKUP
--- autofs-5.0.3.orig/modules/lookup_nisplus.c
+++ autofs-5.0.3/modules/lookup_nisplus.c
@@ -6,7 +6,6 @@
 
 #include <stdio.h>
 #include <malloc.h>
-#include <unistd.h>
 #include <sys/param.h>
 #include <sys/types.h>
 #include <signal.h>
--- autofs-5.0.3.orig/modules/lookup_program.c
+++ autofs-5.0.3/modules/lookup_program.c
@@ -18,7 +18,6 @@
 #include <malloc.h>
 #include <stdio.h>
 #include <string.h>
-#include <unistd.h>
 #include <signal.h>
 #include <sys/param.h>
 #include <sys/stat.h>
@@ -193,12 +192,12 @@ int lookup_mount(struct autofs_point *ap
 	 * want to send stderr to the syslog, and we don't use spawnl()
 	 * because we need the pipe hooks
 	 */
-	if (pipe(pipefd)) {
+	if (open_pipe(pipefd)) {
 		char *estr = strerror_r(errno, buf, MAX_ERR_BUF);
 		logerr(MODPREFIX "pipe: %s", estr);
 		goto out_free;
 	}
-	if (pipe(epipefd)) {
+	if (open_pipe(epipefd)) {
 		close(pipefd[0]);
 		close(pipefd[1]);
 		goto out_free;
--- autofs-5.0.3.orig/modules/lookup_userhome.c
+++ autofs-5.0.3/modules/lookup_userhome.c
@@ -16,7 +16,6 @@
 #include <stdio.h>
 #include <malloc.h>
 #include <pwd.h>
-#include <unistd.h>
 #include <string.h>
 #include <sys/param.h>
 #include <sys/types.h>
--- autofs-5.0.3.orig/modules/lookup_yp.c
+++ autofs-5.0.3/modules/lookup_yp.c
@@ -16,7 +16,6 @@
 
 #include <stdio.h>
 #include <malloc.h>
-#include <unistd.h>
 #include <time.h>
 #include <signal.h>
 #include <ctype.h>
--- autofs-5.0.3.orig/modules/mount_afs.c
+++ autofs-5.0.3/modules/mount_afs.c
@@ -9,8 +9,6 @@
 
 #include <stdio.h>
 #include <malloc.h>
-#include <fcntl.h>
-#include <unistd.h>
 #include <string.h>
 #include <sys/param.h>
 #include <sys/types.h>
--- autofs-5.0.3.orig/modules/mount_autofs.c
+++ autofs-5.0.3/modules/mount_autofs.c
@@ -16,8 +16,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <malloc.h>
-#include <fcntl.h>
-#include <unistd.h>
 #include <string.h>
 #include <signal.h>
 #include <alloca.h>
--- autofs-5.0.3.orig/modules/mount_bind.c
+++ autofs-5.0.3/modules/mount_bind.c
@@ -15,8 +15,6 @@
 
 #include <stdio.h>
 #include <malloc.h>
-#include <fcntl.h>
-#include <unistd.h>
 #include <string.h>
 #include <stdlib.h>
 #include <sys/param.h>
--- autofs-5.0.3.orig/modules/mount_changer.c
+++ autofs-5.0.3/modules/mount_changer.c
@@ -19,8 +19,6 @@
 
 #include <stdio.h>
 #include <malloc.h>
-#include <fcntl.h>
-#include <unistd.h>
 #include <string.h>
 #include <sys/param.h>
 #include <sys/types.h>
@@ -142,25 +140,19 @@ int swapCD(const char *device, const cha
 {
 	int fd;			/* file descriptor for CD-ROM device */
 	int status;		/* return status for system calls */
-	int cl_flags;
 	int slot = -1;
 	int total_slots_available;
 
 	slot = atoi(slotName) - 1;
 
 	/* open device */
-	fd = open(device, O_RDONLY | O_NONBLOCK);
+	fd = open_fd(device, O_RDONLY | O_NONBLOCK);
 	if (fd < 0) {
 		logerr(MODPREFIX "Opening device %s failed : %s",
 		      device, strerror(errno));
 		return 1;
 	}
 
-	if ((cl_flags = fcntl(fd, F_GETFD, 0)) != -1) {
-		cl_flags |= FD_CLOEXEC;
-		fcntl(fd, F_SETFD, cl_flags);
-	}
-
 	/* Check CD player status */
 	total_slots_available = ioctl(fd, CDROM_CHANGER_NSLOTS);
 	if (total_slots_available <= 1) {
--- autofs-5.0.3.orig/modules/mount_ext2.c
+++ autofs-5.0.3/modules/mount_ext2.c
@@ -15,8 +15,6 @@
 
 #include <stdio.h>
 #include <malloc.h>
-#include <fcntl.h>
-#include <unistd.h>
 #include <string.h>
 #include <stdlib.h>
 #include <sys/param.h>
--- autofs-5.0.3.orig/modules/mount_generic.c
+++ autofs-5.0.3/modules/mount_generic.c
@@ -15,8 +15,6 @@
 
 #include <stdio.h>
 #include <malloc.h>
-#include <fcntl.h>
-#include <unistd.h>
 #include <string.h>
 #include <stdlib.h>
 #include <sys/param.h>
--- autofs-5.0.3.orig/modules/mount_nfs.c
+++ autofs-5.0.3/modules/mount_nfs.c
@@ -17,8 +17,6 @@
 #include <stdio.h>
 #include <malloc.h>
 #include <netdb.h>
-#include <fcntl.h>
-#include <unistd.h>
 #include <stdlib.h>
 #include <string.h>
 #include <sys/param.h>
--- autofs-5.0.3.orig/modules/parse_hesiod.c
+++ autofs-5.0.3/modules/parse_hesiod.c
@@ -7,7 +7,6 @@
 #include <sys/types.h>
 #include <ctype.h>
 #include <string.h>
-#include <unistd.h>
 #include <stdlib.h>
 #include <netinet/in.h>
 #include <arpa/nameser.h>
--- autofs-5.0.3.orig/modules/parse_sun.c
+++ autofs-5.0.3/modules/parse_sun.c
@@ -18,8 +18,6 @@
 #include <stdio.h>
 #include <malloc.h>
 #include <netdb.h>
-#include <fcntl.h>
-#include <unistd.h>
 #include <stdlib.h>
 #include <string.h>
 #include <ctype.h>
--- autofs-5.0.3.orig/modules/replicated.c
+++ autofs-5.0.3/modules/replicated.c
@@ -52,8 +52,6 @@
 #include <net/if.h>
 #include <netinet/in.h>
 #include <netdb.h>
-#include <unistd.h>
-#include <fcntl.h>
 
 #include "rpc_subs.h"
 #include "replicated.h"
@@ -82,7 +80,7 @@ void seed_random(void)
 	int fd;
 	unsigned int seed;
 
-	fd = open("/dev/urandom", O_RDONLY);
+	fd = open_fd("/dev/urandom", O_RDONLY);
 	if (fd < 0) {
 		srandom(time(NULL));
 		return;
@@ -145,7 +143,7 @@ static unsigned int get_proximity(const 
 	char tmp[20], buf[MAX_ERR_BUF], *ptr;
 	struct ifconf ifc;
 	struct ifreq *ifr, nmptr;
-	int sock, cl_flags, ret, i;
+	int sock, ret, i;
 	uint32_t mask, ha, ia;
 
 	memcpy(tmp, host_addr, addr_len);
@@ -153,18 +151,13 @@ static unsigned int get_proximity(const 
 
 	ha = ntohl((uint32_t) hst_addr->s_addr);
 
-	sock = socket(AF_INET, SOCK_DGRAM, 0);
+	sock = open_sock(AF_INET, SOCK_DGRAM, 0);
 	if (sock < 0) {
 		char *estr = strerror_r(errno, buf, MAX_ERR_BUF);
 		logerr("socket creation failed: %s", estr);
 		return PROXIMITY_ERROR;
 	}
 
-	if ((cl_flags = fcntl(sock, F_GETFD, 0)) != -1) {
-		cl_flags |= FD_CLOEXEC;
-		fcntl(sock, F_SETFD, cl_flags);
-	}
-
 	if (!alloc_ifreq(&ifc, sock)) {
 		close(sock);
 		return PROXIMITY_ERROR;



From airlied at fedoraproject.org  Thu Jan 22 06:26:06 2009
From: airlied at fedoraproject.org (Dave Airlie)
Date: Thu, 22 Jan 2009 06:26:06 +0000 (UTC)
Subject: rpms/kernel/devel drm-modesetting-radeon.patch, 1.52,
	1.53 drm-next.patch, 1.5, 1.6 kernel.spec, 1.1224, 1.1225
Message-ID: <20090122062606.58BD970033@cvs1.fedora.phx.redhat.com>

Author: airlied

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19091

Modified Files:
	drm-modesetting-radeon.patch drm-next.patch kernel.spec 
Log Message:
* Thu Jan 22 2009 Dave Airlie <airlied at redhat.com>
- rebase drm patches - nouveau TODO


drm-modesetting-radeon.patch:

Index: drm-modesetting-radeon.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/drm-modesetting-radeon.patch,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- drm-modesetting-radeon.patch	31 Dec 2008 16:26:21 -0000	1.52
+++ drm-modesetting-radeon.patch	22 Jan 2009 06:26:04 -0000	1.53
@@ -1,107 +1,1337 @@
-From 5d7812c33ee5bb352f49cdfc84251c48a25de4c7 Mon Sep 17 00:00:00 2001
-From: Kyle McMartin <kyle at treachery.i.cabal.ca>
-Date: Wed, 31 Dec 2008 11:23:28 -0500
-Subject: drm-modesetting-radeon.patch
-
----
- arch/x86/mm/pat.c                               |    2 +
- drivers/gpu/drm/Makefile                        |    5 +-
- drivers/gpu/drm/ati_pcigart.c                   |  246 +-
- drivers/gpu/drm/drm_agpsupport.c                |  171 +
- drivers/gpu/drm/drm_bo.c                        | 2162 +++++++++
- drivers/gpu/drm/drm_bo_move.c                   |  709 +++
- drivers/gpu/drm/drm_bufs.c                      |   12 +-
- drivers/gpu/drm/drm_crtc.c                      |    2 +-
- drivers/gpu/drm/drm_crtc_helper.c               |   29 +
- drivers/gpu/drm/drm_dma.c                       |    2 +
- drivers/gpu/drm/drm_drv.c                       |   35 +-
- drivers/gpu/drm/drm_fence.c                     |  540 +++
- drivers/gpu/drm/drm_fops.c                      |    5 +
- drivers/gpu/drm/drm_memory.c                    |  107 +
- drivers/gpu/drm/drm_stub.c                      |   20 +-
- drivers/gpu/drm/drm_ttm.c                       |  473 ++
- drivers/gpu/drm/drm_uncached.c                  |  138 +
- drivers/gpu/drm/drm_vm.c                        |  188 +
- drivers/gpu/drm/i915/i915_dma.c                 |   10 +
- drivers/gpu/drm/i915/i915_irq.c                 |    3 +-
- drivers/gpu/drm/i915/intel_display.c            |   16 +-
- drivers/gpu/drm/radeon/Makefile                 |    6 +-
- drivers/gpu/drm/radeon/ObjectID.h               |  518 +++
- drivers/gpu/drm/radeon/atom-bits.h              |   48 +
- drivers/gpu/drm/radeon/atom-names.h             |  100 +
- drivers/gpu/drm/radeon/atom-types.h             |   42 +
- drivers/gpu/drm/radeon/atom.c                   | 1141 +++++
- drivers/gpu/drm/radeon/atom.h                   |  150 +
- drivers/gpu/drm/radeon/atombios.h               | 5025 +++++++++++++++++++++
- drivers/gpu/drm/radeon/atombios_crtc.c          |  461 ++
- drivers/gpu/drm/radeon/r300_cmdbuf.c            |  142 +-
- drivers/gpu/drm/radeon/r300_reg.h               |  240 +-
- drivers/gpu/drm/radeon/radeon_atombios.c        |  700 +++
- drivers/gpu/drm/radeon/radeon_buffer.c          |  456 ++
- drivers/gpu/drm/radeon/radeon_combios.c         | 1404 ++++++
- drivers/gpu/drm/radeon/radeon_connectors.c      |  392 ++
- drivers/gpu/drm/radeon/radeon_cp.c              | 1477 ++++++-
- drivers/gpu/drm/radeon/radeon_cs.c              |  583 +++
- drivers/gpu/drm/radeon/radeon_cursor.c          |  247 ++
- drivers/gpu/drm/radeon/radeon_display.c         |  719 +++
- drivers/gpu/drm/radeon/radeon_drv.c             |  104 +-
- drivers/gpu/drm/radeon/radeon_drv.h             |  524 ++-
- drivers/gpu/drm/radeon/radeon_encoders.c        | 1107 +++++
- drivers/gpu/drm/radeon/radeon_fb.c              |  927 ++++
- drivers/gpu/drm/radeon/radeon_fence.c           |   99 +
- drivers/gpu/drm/radeon/radeon_gem.c             | 1548 +++++++
- drivers/gpu/drm/radeon/radeon_gem_proc.c        |  146 +
- drivers/gpu/drm/radeon/radeon_i2c.c             |  196 +
- drivers/gpu/drm/radeon/radeon_irq.c             |   29 +-
- drivers/gpu/drm/radeon/radeon_legacy_crtc.c     | 1075 +++++
- drivers/gpu/drm/radeon/radeon_legacy_encoders.c | 1371 ++++++
- drivers/gpu/drm/radeon/radeon_mem.c             |    2 +-
- drivers/gpu/drm/radeon/radeon_mode.h            |  351 ++
- drivers/gpu/drm/radeon/radeon_pm.c              |  248 ++
- drivers/gpu/drm/radeon/radeon_reg.h             | 5343 +++++++++++++++++++++++
- drivers/gpu/drm/radeon/radeon_state.c           |   75 +-
- include/drm/drm.h                               |    1 +
- include/drm/drmP.h                              |   95 +-
- include/drm/drm_crtc_helper.h                   |    2 +
- include/drm/drm_objects.h                       |  913 ++++
- include/drm/i915_drm.h                          |   14 +-
- include/drm/radeon_drm.h                        |  137 +
- 62 files changed, 32489 insertions(+), 544 deletions(-)
- create mode 100644 drivers/gpu/drm/drm_bo.c
- create mode 100644 drivers/gpu/drm/drm_bo_move.c
- create mode 100644 drivers/gpu/drm/drm_fence.c
- create mode 100644 drivers/gpu/drm/drm_ttm.c
- create mode 100644 drivers/gpu/drm/drm_uncached.c
- create mode 100644 drivers/gpu/drm/radeon/ObjectID.h
- create mode 100644 drivers/gpu/drm/radeon/atom-bits.h
- create mode 100644 drivers/gpu/drm/radeon/atom-names.h
- create mode 100644 drivers/gpu/drm/radeon/atom-types.h
- create mode 100644 drivers/gpu/drm/radeon/atom.c
- create mode 100644 drivers/gpu/drm/radeon/atom.h
- create mode 100644 drivers/gpu/drm/radeon/atombios.h
- create mode 100644 drivers/gpu/drm/radeon/atombios_crtc.c
- create mode 100644 drivers/gpu/drm/radeon/radeon_atombios.c
- create mode 100644 drivers/gpu/drm/radeon/radeon_buffer.c
- create mode 100644 drivers/gpu/drm/radeon/radeon_combios.c
- create mode 100644 drivers/gpu/drm/radeon/radeon_connectors.c
- create mode 100644 drivers/gpu/drm/radeon/radeon_cs.c
- create mode 100644 drivers/gpu/drm/radeon/radeon_cursor.c
- create mode 100644 drivers/gpu/drm/radeon/radeon_display.c
- create mode 100644 drivers/gpu/drm/radeon/radeon_encoders.c
- create mode 100644 drivers/gpu/drm/radeon/radeon_fb.c
- create mode 100644 drivers/gpu/drm/radeon/radeon_fence.c
- create mode 100644 drivers/gpu/drm/radeon/radeon_gem.c
- create mode 100644 drivers/gpu/drm/radeon/radeon_gem_proc.c
- create mode 100644 drivers/gpu/drm/radeon/radeon_i2c.c
- create mode 100644 drivers/gpu/drm/radeon/radeon_legacy_crtc.c
- create mode 100644 drivers/gpu/drm/radeon/radeon_legacy_encoders.c
- create mode 100644 drivers/gpu/drm/radeon/radeon_mode.h
- create mode 100644 drivers/gpu/drm/radeon/radeon_pm.c
- create mode 100644 drivers/gpu/drm/radeon/radeon_reg.h
- create mode 100644 include/drm/drm_objects.h
+commit fabf04e993e0d98412921b6073ff3f85fc45ab4c
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Sun Jan 11 19:50:23 2009 +1000
 
+    radeon: add missing Kconfig text
+
+commit a0dad0aeb1a8d1ad3ab2a3d2b5f71cc906e79194
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Sun Jan 11 19:47:39 2009 +1000
+
+    drm: fix merge issue that messes up irq
+
+commit 96da5b704fc484873f9088b9680d017265dd8d8d
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Sat Jan 10 12:40:42 2009 +1000
+
+    radeon: add getparam to get pci device from userspace
+
+commit 3a0d78939b79836d2752e6eeccaea525e952d7ab
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Thu Dec 18 23:01:12 2008 +1000
+
+    drm: don't set cached bits on pages from uncached allocator.
+    
+    This should make AGP no corrupt itself to all buggery
+    (cherry picked from commit 55c0a3f1d3693cb5c3b65f37d4bb6e8a3c025460)
+
+commit a3765cd4dcf51f2eb88b7504aeee502ce61d6bfa
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Tue Dec 2 16:38:04 2008 +1000
+
+    drop old CS
+
+commit 22104beca6bb2de1b854b03613e6eadeab845060
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Mon Dec 1 15:09:27 2008 +1000
+
+    radeon: update with latest CS bits
+
+commit 2ffdea015e8083eb72882413f440cd0a7972702a
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Wed Dec 17 06:56:36 2008 +1000
+
+    fixups post rebase
+
+commit a4c11f07eace4caf76f194330f6a701145f46b0f
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Thu Dec 11 01:35:09 2008 +1000
+
+    radeon: fix agp mode when kms isn't enabled
+
+commit cd6313975be73ca0a603f8d01611d76b0317dd07
+Author: Dave Airlie <airlied at ppcg5.localdomain>
+Date:   Wed Dec 3 17:22:07 2008 +1100
+
+    radeon: add support for accessing disabled ROMs.
+
+commit 58d100df04840ddedae9edf61775d8b4a4373911
+Author: Dave Airlie <airlied at ppcg5.localdomain>
+Date:   Wed Dec 3 17:19:02 2008 +1100
+
+    radeon: make cail do pll read/write via actual PLL functions
+
+commit 9300656a2ac3a2a37b22806d650ba65b6e0a1663
+Author: Dave Airlie <airlied at ppcg5.localdomain>
+Date:   Wed Dec 3 16:36:00 2008 +1100
+
+    radeon: atom fixes for endianness
+
+commit b4ea8869b74f97062c8532e67256ef718b5a9050
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Wed Dec 3 20:28:05 2008 +1000
+
+    radeon: AGP fixes round 2.
+    
+    More I can't believe its not AGP fixes.
+    Limit the AGP aperture to the GART size, and init the registers
+    in the right place
+
+commit 9434248185c63f98f1a007174727d337312c9ad9
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Tue Dec 2 12:49:17 2008 +1000
+
+    radeon: AGP fixes
+    
+    1. Proper PCIE fallback on PCIE cards.
+    2. Setup agp base + location regs properly
+
+commit 837d24fdb560c1fdee4027d80e7b66599a6f40c3
+Author: Michal Schmidt <mschmidt at redhat.com>
+Date:   Tue Dec 2 08:06:59 2008 +1000
+
+    radeon: fix IGP GART calcs
+    
+    fedora bz 473895
+
+commit 76cc2b13e393035ab833086e2f78067f8b23963d
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Thu Nov 27 17:14:40 2008 +1000
+
+    radeon: post any GPUs that aren't posted
+
+commit b3c456829fa1f28688e8f5d89e86eda54cf4cb33
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Mon Nov 24 15:18:31 2008 +1000
+
+    radeon: enable larger GART size on PCIE/IGP
+    
+    Allocate a larger GART on PCIE and IGP chipsets controlled by the gart_size
+    command line option.
+    
+    Default to 512MB gart.
+
+commit bbb6801c89ce6222827f7026967de85087d58ed2
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Mon Nov 24 15:17:49 2008 +1000
+
+    radeon: add some missing feature checks for modesetting
+
+commit 4e7e428255271524e7916a02041ea5a63f77fe7b
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Mon Nov 24 11:41:06 2008 +1100
+
+    radeon: make rs480/rs690 gart invalidate work properly.
+    
+    we really need to read back to make sure the invalidate has happened
+    before continuing along happily in life.
+
+commit 274edc5dd1f652e79012f7218517ad6be2a8f390
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Sun Nov 23 19:19:02 2008 +1000
+
+    drm: we have discardable now so don't do special cases
+
+commit 670615b961fb02c779d036eecac024bee2af6c20
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Fri Nov 21 14:52:25 2008 +1000
+
+    atom: fix bug in parser for MC reads
+
+commit d13d09fec893d35a3a811b253c3526ba62a50d20
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Mon Nov 17 18:14:28 2008 +1000
+
+    radeon: turn of VRAM zeroing by default for now - needs work
+
+commit f4c672a610f9cce1f3807b921e58cf372e76843a
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Mon Nov 17 09:03:36 2008 +1000
+
+    radeon: fix return value for no relocs
+
+commit a2a2d6edb04da35115d201cb4b6cde6d4ef41ed8
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Mon Nov 17 09:03:01 2008 +1000
+
+    ttm: add discard for VRAM buffers
+
+commit 9d8eaffc8272e870e4f0197a813a57faec2205be
+Author: Dave Airlie <airlied at dhcp-1-203.bne.redhat.com>
+Date:   Fri Nov 14 15:52:32 2008 +1000
+
+    drm: fix the exit path of the bo unlocking
+
+commit 81067ed4a7a1ad1c81e25706c6e036b656eda783
+Author: Dave Airlie <airlied at dhcp-1-203.bne.redhat.com>
+Date:   Fri Nov 14 15:51:44 2008 +1000
+
+    radeon: fixup relocate to work on locate write buffers in VRAM first.
+    
+    Fixup failure paths and make EAGAIN work
+
+commit 0318f294394a8c1eb6ba1c2d2ee66ebca96682b0
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Thu Nov 13 17:22:26 2008 +1100
+
+    radeon: fix some issues since last rebase
+
+commit e7ca0933175eb024d1697368e785b16efb842873
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Wed Nov 12 09:01:14 2008 +1000
+
+    radeon: fix more build
+
+commit 66faa9f9ff56d78986c9246a5f663205ca2d9d23
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Wed Nov 12 08:59:04 2008 +1000
+
+    radeon: fix compile
+
+commit a00e2703ef67a2357bc50be24c30b144d9f89d8d
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Mon Nov 10 15:39:25 2008 +1000
+
+    radeon: fix dumbness in cp ring check
+
+commit f6355f7bdba65ef6aaf0cfe0fc3877c0061f1c96
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Mon Nov 10 14:26:11 2008 +1000
+
+    radeon: add gart useable size to report to userspace
+
+commit 8af8549bef9dbf151d0c6c2ffba77b9939882603
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Sun Nov 9 20:34:49 2008 +1000
+
+    radeon: fix powerpc oops on rv280
+
+commit 5f3cd9859189330526d17b02ac09c20d2a712c25
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Sun Nov 9 10:23:43 2008 +1000
+
+    radeon: upgrade atom headers
+
+commit 47909abba376596a7aab995cba3385294eef6256
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Sat Nov 8 14:39:41 2008 +1000
+
+    radeon: fix fence race condition hopefully
+    
+    For some reason reading the SCRATCH reg from RAM causes some race to occur.
+    Hopefully fix this.
+
+commit eecd14d30bb788c41fae0bafcaf548960002dd65
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Sat Nov 8 11:31:03 2008 +1000
+
+    drm/radeon: add dpms connector functions
+
+commit b2b0b1e93323f3669caaa576d57b42d61e69d0ef
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Fri Nov 7 16:22:22 2008 +1000
+
+    radeon: avivo cursors are across the full surface.
+    
+    fixes cursor on second head
+
+commit 5b50020eb47c8f45495c654858eb2160d5e4d4aa
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Fri Nov 7 16:21:03 2008 +1000
+
+    modesetting: set the crtc x,y after the mode base change
+
+commit 729a2e4f6042034492489e69bfc5129664ba0d8f
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Wed Nov 5 10:23:35 2008 +1000
+
+    drm/radeon: add uncached allocator to drm ttm code.
+    
+    This allows re-use of uc/wc marked pages
+
+commit 721abc483e6ba4e56cee3026bf4de338508389cc
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Wed Nov 5 10:22:27 2008 +1000
+
+    radeon: fix ring tail overflow issue since alignment
+
+commit 707172ea02ea117314a96f6890205f02bfe2c8dc
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Tue Nov 4 13:18:02 2008 +1000
+
+    radeon: disable HDP read cache for now
+
+commit e36b8aca5e134674cb73d275854366c729087989
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Tue Nov 4 12:02:55 2008 +1000
+
+    radeon: force all ring writes to 16-dword alignment.
+    
+    Also set the fetch size to what tcore/fglrx uses.
+
+commit bb934ff77c704bebec6b863e80d51730d6a1ba6b
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Mon Nov 3 15:43:08 2008 +1000
+
+    radeon: fixup vram visible calculation to take a/c pinned objects for now
+
+commit 3d9f9d7e5e4b618f175fe9e3adeaa8d3fd7d3ba3
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Mon Nov 3 09:56:02 2008 +1100
+
+    radeon: if modesetting state is unknown make it known so pm-utils can use it
+
+commit bd85708456d83413d407c2a36ba5039397d0ca84
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Fri Oct 31 14:40:12 2008 +1000
+
+    radeon: fix ROP values for the paint ROP
+
+commit 1fb8f17a2e4782cb475aa2f3ade76bef7018f0cc
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Thu Oct 30 14:00:39 2008 +1000
+
+    radeon: add mtrr support for VRAM aperture.
+    
+    This speeds things up a bit
+
+commit 0a4fdc5ef901677e2d349e1474d97cdb1c6a429e
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Thu Oct 30 14:00:15 2008 +1000
+
+    radeon: disable AGP for certain chips if not specified until we figure it out
+
+commit e1c3d0eec7a76136cbe20aa618ae76336d2da1d8
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Wed Oct 29 15:45:47 2008 +1000
+
+    radeon: disable debugging message
+
+commit 9f306b893acba7b8f7d06f3ad72f2c3caf45541f
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Wed Oct 29 15:37:32 2008 +1000
+
+    radeon: commit ring after emitting the buffer discards
+
+commit 85fd1d17bcaac0e3c4303820859c5ee9c22f4c5d
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Wed Oct 29 17:39:27 2008 +1100
+
+    radeon: fix whitespace in encoders C file
+
+commit 97a2ff55b3c02400cb2d1905c4c3cff00d9073ac
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Wed Oct 29 17:39:08 2008 +1100
+
+    radeon: add more HDMI bits
+
+commit 2d174b6f57dcc40feac3a4f7fff07e5e92d4db06
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Thu Oct 30 01:41:34 2008 +1000
+
+    radeon: set dma bufs bo type to a kernel type
+
+commit 3ba9006eac872596c2f2bb7007da40019759effd
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Wed Oct 29 15:46:16 2008 +1100
+
+    radeon: enable DVI-D + HDMI connectors.
+    
+    This allows the rs690 to work on DVI
+
+commit 95bf25c1f4d7c22eb4f8e6a5b1584d7eaf377d0b
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Tue Oct 28 20:33:13 2008 +1000
+
+    radeon: setup isync cntl properly
+
+commit fcfd38b7cc9a004a4c41b70e716d7469e8826016
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Tue Oct 28 20:31:27 2008 +1000
+
+    radeon: add more debugging
+
+commit f4872b9bbbf8044a0ec106f8ed5fb9302c3c30bf
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Tue Oct 28 20:26:04 2008 +1000
+
+    radeon: overhaul ring interactions
+    
+    emit in 16-dword blocks, emit irqs at same time as everything else
+
+commit 509d9e1532e43ca5b4e21bc9c5736579ccf27c9d
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Tue Oct 28 16:49:09 2008 +1000
+
+    radeon: fix race in sysfs
+
+commit 483e17068cbc746ecfdf0677b04fabbc6836f160
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Tue Oct 28 16:46:47 2008 +1000
+
+    radeon: add proc debugging for interrupts/ring
+
+commit 2baefa25b5c4740ea0b506919ccf6cf03262c20f
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Tue Oct 28 16:44:54 2008 +1000
+
+    radeon: only enable dynclks if asked for
+
+commit 3404a96018c635c3481a315ee44b32e731a0deaa
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Tue Oct 28 06:35:10 2008 +1000
+
+    radeon: add wait rendering API
+
+commit 21f635d4a9bda3eb20458021a4d719793ac923ec
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Tue Oct 28 06:05:58 2008 +1000
+
+    radeon: rs480 fixes for bus mastering
+
+commit e684f06b823eb1fdb0ac149db923f50e9ac5a3cb
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Mon Oct 27 18:30:15 2008 +1000
+
+    radeon: remove unused gem indirect ioctl
+
+commit 36992266b7cb234b7ac624bbdfa181e117b22c8b
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Mon Oct 27 16:41:09 2008 +1000
+
+    radeon: fix some warnings
+
+commit 2df3aeb2033a11da3d0a59393c54eee2e03ba897
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Mon Oct 27 16:40:34 2008 +1000
+
+    radeon: fix free after refcount
+
+commit 94b8fa6cfe0d8a8a35dc1828e0012e90e47b9ee0
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Mon Oct 27 16:40:15 2008 +1000
+
+    radeon: CS2 make it all work with new relocs style
+
+commit e84c24bedf744cb37b3c15223ce7f9aff74115cc
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Mon Oct 27 16:39:12 2008 +1000
+
+    radeon: don't copy to user the cs ids
+
+commit 7cd4ee42379d89a8bb78805b0a8653b6ca9fd9b6
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Mon Oct 27 14:23:22 2008 +1000
+
+    radeon: make new CS2 command submission interface port older interface to this
+
+commit a082938f31b43d30859c78b6e921562e773854d1
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Thu Oct 23 19:13:50 2008 +1000
+
+    radeon: release agp on module unload
+
+commit ee9efed1861ed464592b5d9801f67a45463e6180
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Tue Oct 21 14:15:23 2008 +1000
+
+    radeon: add r423 bits to modesetting
+
+commit 94fa4d750cb556a7d29ae8571cab1f116e87e95b
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Tue Oct 21 14:12:38 2008 +1000
+
+    radeon: pull bus master enable into its own function
+
+commit 367adf738edd5ad14a6ab53f5fc4fa0474383385
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Mon Oct 20 14:44:23 2008 +1000
+
+    radeon: fix accessible VRAM sizing.
+    
+    We actually were passing accessible to userspace, but I thought
+    the code sized it correctly, however it doesn't seem to.
+
+commit 6626eace0701669c79b88f00a40ad21e27f83eb1
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Mon Oct 20 13:41:05 2008 +1000
+
+    radeon: update proper chip family
+
+commit 06312cbfc12555408af963da9406344cd933b159
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Mon Oct 20 12:08:50 2008 +1000
+
+    radeon: fixup scratch register interactions properly
+
+commit ef7b8f3d7ed5780f5dbe2cf742f625be2633b7b0
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Mon Oct 20 10:27:50 2008 +1000
+
+    radeon: make writeback work again
+
+commit e4eb0c1c62c067674e3ab19cfa3d3dc761f7679b
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Mon Oct 20 09:20:23 2008 +1000
+
+    drm: cleanup some warnings
+
+commit 8fcf8c1bf2f2030343032bbe13aa93f04f4707d4
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Thu Oct 16 16:29:08 2008 +1000
+
+    radeon: fix small typo in agp code
+
+commit ff20a206799107be0ea27897e8e2c4cc9633f9c6
+Author: Dave Airlie <airlied at panoply-rh.(none)>
+Date:   Thu Oct 16 16:17:01 2008 +1000
+
+    radeon: workaround failure to parse some rs48x edid
+
+commit 7d0e0de275851d3af3474f6b1bde53fe628da2cc
+Author: Dave Airlie <airlied at panoply-rh.(none)>
+Date:   Thu Oct 16 16:15:08 2008 +1000
+
+    radeon: don't enable dynclks on rs48x
+
+commit 29f3c9cf8f6dee9bbffd8a40d79882a4117e37c4
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Wed Oct 15 15:12:20 2008 +1000
+
+    radeon: allow r100/r200 modesetting to be forced on by users
+
+commit 36c197a4ee9e6a38748c3b955091b6bfa33d455e
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Thu Oct 16 22:06:00 2008 +1000
+
+    radeon: fix unused agp functionality
+
+commit e009ce15bf612db7805d4e7e1e7104f0930a4879
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Thu Oct 16 22:05:02 2008 +1000
+
+    radeon: add some more r100 support to test AGP
+
+commit e12b1afbb16c07a23324d50bdcc0a1e9bc432c56
+Author: airlied <airlied at redhat.com>
+Date:   Wed Oct 15 23:58:03 2008 +1000
+
+    radeon: add initial agp support.
+    
+    This add agpmode command line option.
+
+commit ac2dc3e0575fc854b4cb40a50a370e567b11aa89
+Author: airlied <airlied at redhat.com>
+Date:   Wed Oct 15 23:57:21 2008 +1000
+
+    radeon: add CS support for r100/r200 in 2D driver
+
+commit 790b681b38354f07b53b5482f818ce34573dc9c0
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Thu Oct 9 16:37:23 2008 +1100
+
+    radeon: fixup interrupt suspend/resume
+
+commit a39512adaa1f96b3ab50c513a4a3a4c9e2b11e24
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Wed Oct 8 16:57:12 2008 +1000
+
+    radeon: fixup suspend/resume bus master enable
+
+commit 81a4fbe62cc2ada352978183d06c3b2357c81a4b
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Wed Oct 8 16:56:04 2008 +1000
+
+    radeon: re-enable hw blits for copying from VRAM
+
+commit 8b9fe35ee8265e65133b85d90e862f70aded2afb
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Wed Oct 8 16:53:43 2008 +1000
+
+    radeon: fix buffer copying for VRAM->TT
+
+commit 4e81836d3e37b79281ce5ceb9cdaa58b77e5c455
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Wed Oct 8 16:51:58 2008 +1000
+
+    radeon: move memcpy until after CP is stopped
+
+commit c146982ac9312c0bd6d47a532082e0e5b3a1ec87
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Tue Oct 7 16:34:12 2008 +1000
+
+    drm: remove stray debug code
+
+commit 5622b6ebef242abaa16bd4840cbcc4d5a8ddab6b
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Tue Oct 7 16:31:22 2008 +1000
+
+    radeon: use discardable flags on no backing store objects
+
+commit 7734c188b2e5570b892fe3f4cce8594f8c2829c4
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Tue Oct 7 16:30:09 2008 +1000
+
+    drm: add discardable flag.
+    
+    This discards memory contents on suspend/resume with the
+    hope the upper layers know something we don't.
+
+commit 598d967566d02325fb01aabc26c5344f519ccec1
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Tue Oct 7 16:27:31 2008 +1000
+
+    drm/radeon: initial suspend/resume fix.
+    
+    This enables the evict code and also sets radeon up
+    to allow evict from VRAM to LOCAL
+
+commit e4ecd1ec002aa0bb100b4ef8ad0ce69d21927291
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Mon Oct 6 16:20:38 2008 +1000
+
+    radeon: fixup alignment between GEM and TTM
+    
+    fixup the interface between gem and ttm for alignment. makes Xv work better
+
+commit 88f1a76309df8823a610213454769ec0ecacee3c
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Wed Oct 1 11:27:02 2008 +1000
+
+    radeon: fixup GEM pinned offset retrieval for mesa
+
+commit 014150b2567074dc234eea3d39cc969045817604
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Wed Oct 1 11:25:54 2008 +1000
+
+    drm: fixup clean flag handling properly
+
+commit 12137517df80edd31f6b12ffba829adbf0bcb633
+Author: Alex Deucher <alexdeucher at gmail.com>
+Date:   Mon Sep 29 14:57:11 2008 +1000
+
+    radeon: use atom for ext tmds on r4xx
+
+commit d267e4365479324464aa9c74790f4baf46313e3c
+Author: Alex Deucher <alexdeucher at gmail.com>
+Date:   Mon Sep 29 14:56:32 2008 +1000
+
+    radeon: make atom on r4xx a module option
+    
+    default is legacy modesetting.  pass module option r4xx_atom
+    to try using atom on r4xx.
+
+commit e9c16b99ea46f123b816a83c61041665d50e40aa
+Author: Alex Deucher <alexdeucher at gmail.com>
+Date:   Mon Sep 29 14:55:16 2008 +1000
+
+    radeon: first pass at using atombios on r4xx hw
+
+commit 32cce8eeec8c915796709a0b4fa73233a602c159
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Mon Sep 29 14:50:47 2008 +1000
+
+    radeon: add r600 modesetting registers writes
+
+commit 7928f80e01dfb05bb47df169a4a612c9857fcc0c
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Mon Sep 29 14:45:11 2008 +1000
+
+    radeon: parse object tables for connectors on r600
+
+commit b05136e7bc90be8de8cc5ec6dcd881eb7c4403ce
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Tue Sep 23 16:34:55 2008 +1000
+
+    radeon: fix minor cursor disappearing issues
+
+commit 54e33fa8ace243761ac4d7742f978768adffc9cc
+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 c333d2c111abae0028990abc5bc213f955442210
+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 f67f849c4594b016736fe703260c4b27e999bb52
+Author: Dave Airlie <airlied at linux.ie>
+Date:   Sun Sep 21 09:48:51 2008 +1000
+
+    drm: fixups on top of rebase
+
+commit 1f47dfb3329c47d76d048e313aa2741e812f608d
+Author: Dave Airlie <airlied at linux.ie>
+Date:   Sat Sep 20 03:08:05 2008 +1000
+
+    radeon: rmx_fixup() fixes for legacy chips
+
+commit e61ef4082a5812cd5c0d0a8060f2a490462c90b9
+Author: Dave Airlie <airlied at linux.ie>
+Date:   Sat Sep 20 01:55:27 2008 +1000
+
+    radeon: fix combios
+
+commit 69f98d9cb79f7efcdaf08a1d355c0962e710ab16
+Author: Dave Airlie <airlied at linux.ie>
+Date:   Fri Sep 19 09:17:36 2008 +1000
+
+    radeon: port Alexs patches from modesetting-gem
+
+commit 8658360826acf2b1c6b3db5d0a3f9dd54116aa12
+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 04eb5deb4c78c8348a03b54923ab80177da61530
+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 919d4300a0310eec0dea91f5230eed4777febdfb
+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 4dca8490d06133fd3aa970f323ce544bf0f2e49b
+Author: Alex Deucher <alexdeucher at gmail.com>
+Date:   Thu Sep 18 09:55:14 2008 +1000
+
+    radeon: further LVDS fixes
+
+commit c5b7e9585bcccffdf8d1e1b0cf3662f25da74e1b
+Author: Alex Deucher <alexdeucher at gmail.com>
+Date:   Thu Sep 18 09:54:12 2008 +1000
+
+    radeon: legacy lvds updates
+
+commit 3bec58a490d6a17b5f6d4282e58234316c3d1874
+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 61c866ab5cb626c64eff8e042b9d2875dfe34aef
+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 c0c6ef14b9eef905fe2f7f9c2eee23b0110e57ac
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Thu Sep 11 17:13:32 2008 +1000
+
+    radeon: disable blit moves
+
+commit 6128a67b2b05e539f0f699491d0624e0a298e404
+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 2baf9ed316ee2fd6a8f32cc341d0ced5ab952cb9
+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 83787829d64f32cff66010178f813d954a72165a
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Wed Sep 10 14:35:08 2008 +1000
+
+    radeon: fix return value
+
+commit e0e8f18eb92f444c9da2054a6131e3436e915ab3
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Wed Sep 10 14:34:39 2008 +1000
+
+    radeon: fixup reference counting properly
+
+commit 2953d06e8bc677db4611d7c70398cb7514855267
+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 b9f23d86c70eae33119f686b36d3d9c99d392b38
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Mon Sep 8 11:37:26 2008 +1000
+
+    radeon: remove unneeded debugging
+
+commit 2e46b91a138677187c5935e499b06bf4341ddaa2
+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 3f7e1afb07a418e12b3d02d6727892094de11249
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Mon Sep 8 10:27:48 2008 +1000
+
+    radeon: disable debugging that sneaky itself on
+
+commit 739bcbf35675ddd59b559912a771093734934895
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Mon Sep 8 10:20:44 2008 +1000
+
+    radeon: make text reserve 256k
+
+commit 6af8d873aad603a7efd67955f8e2317d1c214b92
+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 b461cf38deb707f0afe797d6026af0e399470515
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Fri Sep 5 16:12:59 2008 +1000
+
+    radeon: further suspend/resume support
+
+commit 45f8c7cc94ee2815af61bea5813b07f04e3055a4
+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 b446e37474947319ad6ddade241d6c4b76272429
+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 6e3e88d1d7afabcc7c9da49a69caa7265e6b5a4b
+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 821cbaf71968f2641ee1a280273b7a686ca29484
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Thu Sep 4 11:58:08 2008 +1000
+
+    drm/radeon: fixup some avivo/rs690 checks
+
+commit 79dc0b37b6f2bbea6cafba489810072755ba2066
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Fri Aug 29 09:59:02 2008 +1000
+
+    drm: move text mode check to driver.
+    
+    also change name from text to nomodeset
+
+commit ca5b11014c39862712cb3af42c675ba5d80223fc
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Thu Aug 28 21:22:27 2008 +1000
+
+    radeon: fix up LVDS panel mode
+    
+    also don't explode on lack of DDC
+
+commit f194154331ebe89bec59cf2d05b6ea9a493c8afc
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Thu Aug 28 18:31:50 2008 +1000
+
+    drm: fix dev->master convert
+
+commit 2973ad931c307c58627e94f335fc884ad84f812c
+Author: Kristian H??gsberg <krh at redhat.com>
+Date:   Wed Aug 20 11:24:13 2008 -0400
+
+    drm: Set up a kernel side hw_lock, so userspace isn't required to do so.
+    
+    DRI2 doesn't use a user space lock, so don't require one to be set up.
+    Old DRI can still provide a lock containing map as before, which will
+    override the default kernel-side lock.
+    
+    Signed-off-by: Kristian H??gsberg <krh at redhat.com>
+
+commit e42302521c82411455952b15ef3d3b480a383aa9
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Thu Aug 28 16:38:49 2008 +1000
+
+    radeon: fix LVDS on atombios - typos
+
+commit 6a59e3be99ce037c4c7e6750ebb71941297b0283
+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 e371ca47f8cab9b02a8fcdf175ac5eb52fb452dc
+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 de311f42d559d9b6267bf12d39fb04a1ef0b0596
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Wed Aug 27 15:39:17 2008 +1000
+
+    radeon: fix after rebase
+
+commit 6ddac3240bf7c745563ec10112f4e64da22e4d94
+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 f68122d97ac2cb531a40bf00a784711b9616bd0b
+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 85a32a1ff18f03af94d5da0dfd6c72c1c87273ff
+Author: Alex Deucher <alexdeucher at gmail.com>
+Date:   Tue Aug 26 17:22:37 2008 +1000
+
+    radeon: first pass at legacy dac detect
+    
+    - done: primary dac, vga on tvdac
+    - todo: ext dac, tv on tvdac
+
+commit 5240ebb96373d6784882d6b8bf0164bee96d63e5
+Author: Alex Deucher <alexdeucher at gmail.com>
+Date:   Tue Aug 26 17:22:11 2008 +1000
+
+    radeon: first pass at bios scratch regs
+    
+    - todo: updated connected status
+
+commit b410ffa7a96dd3634aeafdf65da3535841e851b7
+Author: Alex Deucher <alexdeucher at gmail.com>
+Date:   Tue Aug 26 17:20:54 2008 +1000
+
+    radeon: remove unused legacy state
+
+commit 03ba71e8779fbb3fdce234395e39756188c5c57f
+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 158074d069e05fea9db42c50d8ec802403e85b9c
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Tue Aug 26 17:03:13 2008 +1000
+
+    x86: export pat_enabled
+
+commit ef6ff34bc3df4955c878b9ace6290b0036f5eae8
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Tue Aug 26 17:02:43 2008 +1000
+
+    drm: enable PAT and writecombining support.
+    
+    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 a888bea0ac65dac03f2ad8d80faa865263a6680f
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Tue Aug 26 17:01:35 2008 +1000
+
+    radeon: add more domain support to GEM code.
+    
+    move domain validate function to separate function
+    call it from correct places
+
+commit 746c4194898a9469685b7871457cc5b626ebe834
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Tue Aug 26 17:00:49 2008 +1000
+
+    radeon: implement zero fill for VRAM migration
+    
+    If a BO hasn't been dirtied, do a solid fill on VRAM instead of
+    migrating pages to VRAM
+
+commit a4449f0a75730329a52350df4b580ab106b3ede5
+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 9d769ad7295df7fc8a7e766d25282d826b4c9f17
+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 f3400715966e70d76edfcac679f95bd0899571d7
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Fri Aug 22 10:16:01 2008 +1000
+
+    radeon_gem: fix some misplace ==
+
+commit 26f8dd79369ef2b11639d7d6370812fad653bd89
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Fri Aug 22 10:13:25 2008 +1000
+
+    radeon: get buffer upload working
+
+commit fd4d5f1d7a59e756d71060977bdc4614fd43bf7a
+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 6aaa94d45e0857387e0b99af19776634f3f815b5
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Fri Aug 22 10:11:55 2008 +1000
+
+    drm: export buffer zeroing function for sw fallback
+    
+    We need a buffer zeroing function for before we have
+    accel running etc
+
+commit b02b9c4005c2a2936860e3c8b2a33cf1f72c9eaa
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Fri Aug 22 09:49:16 2008 +1000
+
+    ttm: add clean bo flags
+    
+    This can be used to denote a bo hasn't been mapped or validated yet.
+    
+    Primarily for the move code when we get a buffer in VRAM, we don't need
+    to copy the contents just zero them.
+
+commit 5cdcbe22b990bae5a94ed23459d7da0cbff9c5d1
+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 5772269ca5faee789888b6d88f7e004bc82c3c5c
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Fri Aug 22 09:35:26 2008 +1000
+
+    drm: remove tlb flush logic from ttm
+
+commit 2cae6ae322331b526c298327194019c35ea8884d
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Tue Aug 19 12:15:10 2008 +1000
+
+    radeon: fix bug in scratch retreival
+
+commit e151aff46f512d3affa21d863cba29d9082d9769
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Tue Aug 19 12:14:38 2008 +1000
+
+    radeon: add GTT domain
+
+commit 3dbbfb73b8dcfb7a905554686bb5aecfa528848a
+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 694234245e2a44a5e1dd993226366d7856329332
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Thu Aug 14 18:14:56 2008 +1000
+
+    disable modeset on < r300
+
+commit f4fc2f0c02bb4ba4a37dc0f9016893def2aeb8ae
+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 c39c8ba622bb1fd586c0ffa9e0196467d6409df0
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Fri Aug 15 09:35:55 2008 +1000
+
+    radeon: fix LVDS modes problem
+
+commit 65e372632a9ca30f6525a857498c7c6ed6fc7b8e
+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 8b3759c0b0ebc40568e9d4129d7417333bd28383
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Thu Aug 14 14:38:27 2008 +1000
+
+    radeon: add support for init memory map
+    
+    This gets RN50 to initialise correctly
+
+commit 464beca8505b83d9d3793ea36545a1f4c795bbdb
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Thu Aug 14 14:37:25 2008 +1000
+
+    radeon: add copy/solid regs for rn50
+
+commit 8a5df2edce3956dfa4dea93e54e9a555a8091aa7
+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 4dc9ae60710587d6eb4528adf6f9fd6d3bf98ac7
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Thu Aug 14 09:59:31 2008 +1000
+
+    radeon: add quirks from DDX
+
+commit 23bead7936fa5837857f04382fb2ead5888a651d
+Author: Alex Deucher <alexdeucher at gmail.com>
+Date:   Thu Aug 14 09:59:12 2008 +1000
+
+    radeon: fix warnings
+
+commit c7f1f3b70bb39a4c93cf62bc42e16da579579f08
+Author: Alex Deucher <alexdeucher at gmail.com>
+Date:   Thu Aug 14 09:58:47 2008 +1000
+
+    radeon: get legacy working
+    
+    - extra ~ in RADEON_WRITE_P()
+    - re-arrange crtc setup a bit
+    - add debugging for tracing calls
+    - fix pitch calculation
+
+commit b15eb2aeaa6a79567d7981be209279a65e4d5116
+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 a03e1f4e90327e311005fb2976a2bdd28343483c
+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 714c5345309568da83139f303eb0e77cf8f7ea73
+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 5c8ff762cbd904ef4ce006eb09e32e6f9aee010c
+Author: Alex Deucher <alexdeucher at gmail.com>
+Date:   Thu Aug 14 09:53:08 2008 +1000
+
+    radeon/atom: implement crtc lock
+
+commit a542e1b20c5f45ed9b51bb0a49cc9282b8c2c462
+Author: Alex Deucher <alexdeucher at gmail.com>
+Date:   Thu Aug 14 09:50:15 2008 +1000
+
+    LUT updates
+    
+    - Add gamma set for legacy chips
+    - Add 16 bpp gamma set
+
+commit 7d876277c79ad07ebab759da39578756f3944963
+Author: Alex Deucher <alexdeucher at gmail.com>
+Date:   Thu Aug 14 09:49:55 2008 +1000
+
+    radeon: various cleanups
+    
+    - white space
+    - move i2c_lock to radeon_i2c.c
+    - enable tv dac on legacy
+
+commit b519c41feb3b01ceced81ca7cb7530c9cb4896a9
+Author: Alex Deucher <alexdeucher at gmail.com>
+Date:   Thu Aug 14 09:49:30 2008 +1000
+
+    radeon: Add legacy dac detect stubs
+
+commit 758640fb5728e929f1fb4f930dd155630e2a2fa3
+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 20cf1cd244c2eb1a6a9f536d2c8943052bfaa779
+Author: Alex Deucher <alexdeucher at gmail.com>
+Date:   Thu Aug 14 09:48:50 2008 +1000
+
+    Brute force port of legacy crtc/encoder code
+    
+    - removed save/init/restore chain with set functions
+
+commit 3097d314424e7c80badc5cd2466f6a3a9c11ff8b
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Thu Aug 14 08:54:04 2008 +1000
+
+    FEDORA: radeon set gart buffers start
+
+commit 8aa9ac91119156f7d5d72cb520df90c1302d4294
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Thu Aug 14 08:52:41 2008 +1000
+
+    radeon: command submission remove debug
+
+commit bd08e1834974cb46bd32f1dec51bba23b5ff4f83
+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 21774fce3f12c8d33c0c54f83ae25e7437b8dae9
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Tue Aug 12 12:19:05 2008 +1000
+
+    radeon: hack it up so we get front/back offsets
+    
+    in the correct place in the drm so buffer swaps work again
+
+commit bb5e57c623c4aabc2789f5f16f021ace1414722c
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Tue Aug 12 12:18:08 2008 +1000
+
+    radeon: add mm supported call for userspace
+
+commit 9a0b19a7de6789f9365cba2799c98d1a2bfce240
+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 4c7cad754cca0db3add06de03349605be258ee2f
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Fri Aug 8 15:57:10 2008 +1000
+
+    radeon: add initial code to support legacy crtc/encoders.
+    
+    This adds the CRTC and PLL setting code, it doesn't work
+    yet but its all heading in the right direction.
+
+commit d8bfa6722b1940d14f2bbacef9d57cfdb8e2e2af
+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 a7d190848a64a17f194b8981e9e91ac59f20f94d
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Wed Aug 6 16:01:22 2008 +1000
+
+    radeon: set new memmap on gem enable
+
+commit 679d86cb502aebbc5e569e65689e2ef4412de72a
+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 c48fd543563acc4d997bfc1588711c8bc3dc82b7
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Wed Aug 6 15:44:38 2008 +1000
+
+    radeon: set gart table size
+
+commit 6862fa69fa8abd2b7b3663f59b8b142a42bbb5d8
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Wed Aug 6 15:44:18 2008 +1000
+
+    radeon: fix buffer evict slection
+
+commit 7b7b8f8e037ee4a85ada62d361b7a375c88f4651
+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 d5451c8890bd98c7603ddb42fbf53872e64692e9
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Tue Aug 5 11:22:24 2008 +1000
+
+    radeon: fix defines so blit works again
+
+commit 55d92569cad01c22671ce571e26a329f6d443b83
+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 f29b834f2c1c63e25c99917fb54ca8825043178c
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Mon Aug 4 14:21:22 2008 +1000
+
+    drm: fix unneeded debug
+
+commit 570fb9a4d9d77277b31e674a3ae7542a6c9fe12d
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Mon Aug 4 14:20:47 2008 +1000
+
+    radeon: add setparam for userspace to init the memory manager.
+    
+    if kms enabled memory manager will be enabled by default
+
+commit 1b187e68832c2842a32e815c770a59c9256ba7d2
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Mon Aug 4 14:20:26 2008 +1000
+
+    drm: kill bo after driver lastclose
+
+commit 878f9624518bf887ed09fd124832508da1eb5ba7
+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 7654d8e8ab46be45f554047646f137391a68886d
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Sat Aug 2 08:06:26 2008 +1000
+
+    drm: fix release locking
+
+commit ecf1ed7bba13913efbcc3150861cbcbba3e5cea3
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Fri Aug 1 16:55:34 2008 +1000
+
+    drm: add radeon modesetting support
+
+commit 8a499ba39b78eb4cf9a2af8f351f05c0b2e906e3
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Fri Aug 1 14:06:12 2008 +1000
+
+    drm: add TTM VM changes
+
+commit 13e1e589837ebbecf5f57d9835f495154bd2d8df
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Thu Jul 31 15:27:27 2008 +1000
+
+    drm: import TTM basic objects
+
+commit a033be0c17d760198bc73ad7e6924adb7074471c
+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
 diff --git a/arch/x86/mm/pat.c b/arch/x86/mm/pat.c
-index 85cbd3c..3e51065 100644
+index 8b08fb9..ae77b2f 100644
 --- a/arch/x86/mm/pat.c
 +++ b/arch/x86/mm/pat.c
 @@ -11,6 +11,7 @@
@@ -120,6 +1350,25 @@
  
  void __cpuinit pat_disable(char *reason)
  {
+diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig
+index 5130b72..19aa90c 100644
+--- a/drivers/gpu/drm/Kconfig
++++ b/drivers/gpu/drm/Kconfig
+@@ -43,6 +43,14 @@ config DRM_RADEON
+ 
+ 	  If M is selected, the module will be called radeon.
+ 
++config DRM_RADEON_KMS
++	bool "Enable modesetting on radeon by default"
++	depends on DRM_RADEON
++	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_I810
+ 	tristate "Intel I810"
+ 	depends on DRM && AGP && AGP_INTEL
 diff --git a/drivers/gpu/drm/Makefile b/drivers/gpu/drm/Makefile
 index 30022c4..9aba961 100644
 --- a/drivers/gpu/drm/Makefile
@@ -466,10 +1715,10 @@
 +}
 +EXPORT_SYMBOL(ati_pcigart_init_ttm);
 diff --git a/drivers/gpu/drm/drm_agpsupport.c b/drivers/gpu/drm/drm_agpsupport.c
-index 3d33b82..e048aa2 100644
+index 1479659..851f4c3 100644
 --- a/drivers/gpu/drm/drm_agpsupport.c
 +++ b/drivers/gpu/drm/drm_agpsupport.c
-@@ -496,6 +496,177 @@ drm_agp_bind_pages(struct drm_device *dev,
+@@ -497,6 +497,177 @@ drm_agp_bind_pages(struct drm_device *dev,
  }
  EXPORT_SYMBOL(drm_agp_bind_pages);
  
@@ -3589,10 +4838,10 @@
  			retcode = (signed long)virtual;
  			goto done;
 diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c
-index 53c8725..b45c867 100644
+index bfce099..cca1fef 100644
 --- a/drivers/gpu/drm/drm_crtc.c
 +++ b/drivers/gpu/drm/drm_crtc.c
-@@ -1507,7 +1507,7 @@ int drm_mode_setcrtc(struct drm_device *dev, void *data,
+@@ -1511,7 +1511,7 @@ int drm_mode_setcrtc(struct drm_device *dev, void *data,
  	set.mode = mode;
  	set.connectors = connector_set;
  	set.num_connectors = crtc_req->count_connectors;
@@ -3602,10 +4851,10 @@
  
  out:
 diff --git a/drivers/gpu/drm/drm_crtc_helper.c b/drivers/gpu/drm/drm_crtc_helper.c
-index d8a982b..8551bc6 100644
+index 964c5eb..92cdb19 100644
 --- a/drivers/gpu/drm/drm_crtc_helper.c
 +++ b/drivers/gpu/drm/drm_crtc_helper.c
-@@ -710,6 +710,8 @@ int drm_crtc_helper_set_config(struct drm_mode_set *set)
+@@ -766,6 +766,8 @@ int drm_crtc_helper_set_config(struct drm_mode_set *set)
  		if (set->crtc->fb != set->fb)
  			set->crtc->fb = set->fb;
  		crtc_funcs->mode_set_base(set->crtc, set->x, set->y, old_fb);
@@ -3614,7 +4863,7 @@
  	}
  
  	kfree(save_encoders);
-@@ -824,3 +826,30 @@ int drm_helper_resume_force_mode(struct drm_device *dev)
+@@ -901,3 +903,30 @@ int drm_helper_resume_force_mode(struct drm_device *dev)
  	return 0;
  }
  EXPORT_SYMBOL(drm_helper_resume_force_mode);
@@ -3666,42 +4915,23 @@
  /**
   * Free a buffer.
 diff --git a/drivers/gpu/drm/drm_drv.c b/drivers/gpu/drm/drm_drv.c
-index febb517..f36f952 100644
+index 14c7a23..c6ade45 100644
 --- a/drivers/gpu/drm/drm_drv.c
 +++ b/drivers/gpu/drm/drm_drv.c
-@@ -165,9 +165,13 @@ int drm_lastclose(struct drm_device * dev)
+@@ -165,8 +165,12 @@ int drm_lastclose(struct drm_device * dev)
  
  	if (dev->driver->lastclose)
  		dev->driver->lastclose(dev);
 +
  	DRM_DEBUG("driver lastclose completed\n");
  
- 	if (dev->irq_enabled && !drm_core_check_feature(dev, DRIVER_MODESET))
++	if (!drm_core_check_feature(dev, DRIVER_MODESET))
 +		drm_bo_driver_finish(dev);
 +
-+	if (dev->irq_enabled)
+ 	if (dev->irq_enabled && !drm_core_check_feature(dev, DRIVER_MODESET))
  		drm_irq_uninstall(dev);
  
- 	mutex_lock(&dev->struct_mutex);
-@@ -314,14 +318,14 @@ static void drm_cleanup(struct drm_device * dev)
- 		DRM_DEBUG("mtrr_del=%d\n", retval);
- 	}
- 
-+	if (dev->driver->unload)
-+		dev->driver->unload(dev);
-+
- 	if (drm_core_has_AGP(dev) && dev->agp) {
- 		drm_free(dev->agp, sizeof(*dev->agp), DRM_MEM_AGPLISTS);
- 		dev->agp = NULL;
- 	}
- 
--	if (dev->driver->unload)
--		dev->driver->unload(dev);
--
- 	drm_ht_remove(&dev->map_hash);
- 	drm_ctxbitmap_cleanup(dev);
- 
-@@ -358,9 +362,34 @@ static const struct file_operations drm_stub_fops = {
+@@ -362,9 +366,34 @@ static const struct file_operations drm_stub_fops = {
  static int __init drm_core_init(void)
  {
  	int ret = -ENOMEM;
@@ -4283,10 +5513,10 @@
 +}
 +
 diff --git a/drivers/gpu/drm/drm_fops.c b/drivers/gpu/drm/drm_fops.c
-index 3733e36..1c2ccd8 100644
+index b06a537..c08e995 100644
 --- a/drivers/gpu/drm/drm_fops.c
 +++ b/drivers/gpu/drm/drm_fops.c
-@@ -474,6 +474,10 @@ int drm_release(struct inode *inode, struct file *filp)
+@@ -478,6 +478,10 @@ int drm_release(struct inode *inode, struct file *filp)
  	}
  	mutex_unlock(&dev->ctxlist_mutex);
  
@@ -4297,7 +5527,7 @@
  	mutex_lock(&dev->struct_mutex);
  
  	if (file_priv->is_master) {
-@@ -493,6 +497,7 @@ int drm_release(struct inode *inode, struct file *filp)
+@@ -497,6 +501,7 @@ int drm_release(struct inode *inode, struct file *filp)
  	/* drop the reference held my the file priv */
  	drm_master_put(&file_priv->master);
  	file_priv->is_master = 0;
@@ -4431,7 +5661,7 @@
  #if __OS_HAS_AGP
  static void *agp_remap(unsigned long offset, unsigned long size,
 diff --git a/drivers/gpu/drm/drm_stub.c b/drivers/gpu/drm/drm_stub.c
-index 5ca132a..5b5c4c6 100644
+index 46bb923..27d9939 100644
 --- a/drivers/gpu/drm/drm_stub.c
 +++ b/drivers/gpu/drm/drm_stub.c
 @@ -101,6 +101,7 @@ struct drm_master *drm_master_create(struct drm_minor *minor)
@@ -4442,7 +5672,7 @@
  
  	list_add_tail(&master->head, &minor->master_list);
  
-@@ -138,7 +139,7 @@ static void drm_master_destroy(struct kref *kref)
+@@ -146,7 +147,7 @@ static void drm_master_destroy(struct kref *kref)
  
  	drm_ht_remove(&master->magiclist);
  
@@ -4451,7 +5681,7 @@
  		if (dev->sigdata.lock == master->lock.hw_lock)
  			dev->sigdata.lock = NULL;
  		master->lock.hw_lock = NULL;
-@@ -201,6 +202,7 @@ static int drm_fill_in_dev(struct drm_device * dev, struct pci_dev *pdev,
+@@ -209,6 +210,7 @@ static int drm_fill_in_dev(struct drm_device * dev, struct pci_dev *pdev,
  	init_timer(&dev->timer);
  	mutex_init(&dev->struct_mutex);
  	mutex_init(&dev->ctxlist_mutex);
@@ -4459,7 +5689,7 @@
  
  	idr_init(&dev->drw_idr);
  
-@@ -212,7 +214,12 @@ static int drm_fill_in_dev(struct drm_device * dev, struct pci_dev *pdev,
+@@ -220,7 +222,12 @@ static int drm_fill_in_dev(struct drm_device * dev, struct pci_dev *pdev,
  	dev->hose = pdev->sysdata;
  #endif
  
@@ -4473,7 +5703,7 @@
  		return -ENOMEM;
  	}
  
-@@ -245,7 +252,6 @@ static int drm_fill_in_dev(struct drm_device * dev, struct pci_dev *pdev,
+@@ -253,7 +260,6 @@ static int drm_fill_in_dev(struct drm_device * dev, struct pci_dev *pdev,
  		}
  	}
  
@@ -4481,7 +5711,7 @@
  	retcode = drm_ctxbitmap_init(dev);
  	if (retcode) {
  		DRM_ERROR("Cannot allocate memory for context bitmap.\n");
-@@ -261,6 +267,13 @@ static int drm_fill_in_dev(struct drm_device * dev, struct pci_dev *pdev,
+@@ -269,6 +275,13 @@ static int drm_fill_in_dev(struct drm_device * dev, struct pci_dev *pdev,
  		}
  	}
  
@@ -4495,7 +5725,7 @@
  	return 0;
  
        error_out_unreg:
-@@ -459,3 +472,4 @@ int drm_put_minor(struct drm_minor **minor_p)
+@@ -467,3 +480,4 @@ int drm_put_minor(struct drm_minor **minor_p)
  	*minor_p = NULL;
  	return 0;
  }
@@ -5364,29 +6594,8 @@
 +	drm_bo_vm_open_locked(vma);
 +	return 0;
 +}
-diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c
-index 3d7082a..fecbbbf 100644
---- a/drivers/gpu/drm/i915/i915_dma.c
-+++ b/drivers/gpu/drm/i915/i915_dma.c
-@@ -177,6 +177,16 @@ static int i915_initialize(struct drm_device * dev, drm_i915_init_t * init)
- 	drm_i915_private_t *dev_priv = dev->dev_private;
- 	struct drm_i915_master_private *master_priv = dev->primary->master->driver_priv;
- 
-+        master_priv->sarea = drm_getsarea(dev);
-+        if (!master_priv->sarea) {
-+                DRM_ERROR("can not find sarea!\n");
-+                i915_dma_cleanup(dev);
-+                return -EINVAL;
-+        }
-+
-+        master_priv->sarea_priv = (drm_i915_sarea_t *)
-+		((u8 *) master_priv->sarea->handle + init->sarea_priv_offset);
-+
- 	if (init->ring_size != 0) {
- 		if (dev_priv->ring.ring_obj != NULL) {
- 			i915_dma_cleanup(dev);
 diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
-index 0cadafb..c2049e7 100644
+index 6290219..15eee72 100644
 --- a/drivers/gpu/drm/i915/i915_irq.c
 +++ b/drivers/gpu/drm/i915/i915_irq.c
 @@ -361,7 +361,8 @@ static int i915_wait_irq(struct drm_device * dev, int irq_nr)
@@ -5400,10 +6609,10 @@
  int i915_irq_emit(struct drm_device *dev, void *data,
  			 struct drm_file *file_priv)
 diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
-index e5c1c80..b39acec 100644
+index 31c3732..6b78fd4 100644
 --- a/drivers/gpu/drm/i915/intel_display.c
 +++ b/drivers/gpu/drm/i915/intel_display.c
-@@ -448,12 +448,12 @@ intel_pipe_set_base(struct drm_crtc *crtc, int x, int y,
+@@ -450,12 +450,12 @@ intel_pipe_set_base(struct drm_crtc *crtc, int x, int y,
  
  	switch (pipe) {
  	case 0:
@@ -5420,7 +6629,7 @@
  		break;
  	default:
  		DRM_ERROR("Can't update pipe %d in SAREA\n", pipe);
-@@ -578,12 +578,12 @@ static void intel_crtc_dpms(struct drm_crtc *crtc, int mode)
+@@ -580,12 +580,12 @@ static void intel_crtc_dpms(struct drm_crtc *crtc, int mode)
  
  	switch (pipe) {
  	case 0:
@@ -33475,7 +34684,7 @@
 +
 +#endif
 diff --git a/drivers/gpu/drm/radeon/radeon_state.c b/drivers/gpu/drm/radeon/radeon_state.c
-index ef940a0..c47d4b1 100644
+index ef940a0..f5ac131 100644
 --- a/drivers/gpu/drm/radeon/radeon_state.c
 +++ b/drivers/gpu/drm/radeon/radeon_state.c
 @@ -305,8 +305,9 @@ static __inline__ int radeon_check_and_fixup_packet3(drm_radeon_private_t *
@@ -33587,17 +34796,20 @@
  		int temp;
  		temp = r300_do_cp_cmdbuf(dev, file_priv, cmdbuf);
  
-@@ -3071,6 +3081,9 @@ static int radeon_cp_getparam(struct drm_device *dev, void *data, struct drm_fil
+@@ -3071,6 +3081,12 @@ static int radeon_cp_getparam(struct drm_device *dev, void *data, struct drm_fil
  	case RADEON_PARAM_NUM_GB_PIPES:
  		value = dev_priv->num_gb_pipes;
  		break;
 +	case RADEON_PARAM_KERNEL_MM:
 +		value = dev_priv->mm_enabled;
 +		break;
++	case RADEON_PARAM_DEVICE_ID:
++		value = dev->pci_device;  /* just return the PCI device ID */
++		break;
  	default:
  		DRM_DEBUG("Invalid parameter %d\n", param->param);
  		return -EINVAL;
-@@ -3093,11 +3106,17 @@ static int radeon_cp_setparam(struct drm_device *dev, void *data, struct drm_fil
+@@ -3093,11 +3109,17 @@ static int radeon_cp_setparam(struct drm_device *dev, void *data, struct drm_fil
  
  	switch (sp->param) {
  	case RADEON_SETPARAM_FB_LOCATION:
@@ -33615,7 +34827,7 @@
  		if (sp->value == 0) {
  			DRM_DEBUG("color tiling disabled\n");
  			dev_priv->front_pitch_offset &= ~RADEON_DST_TILE_MACRO;
-@@ -3113,13 +3132,21 @@ static int radeon_cp_setparam(struct drm_device *dev, void *data, struct drm_fil
+@@ -3113,13 +3135,21 @@ static int radeon_cp_setparam(struct drm_device *dev, void *data, struct drm_fil
  		}
  		break;
  	case RADEON_SETPARAM_PCIGART_LOCATION:
@@ -33637,7 +34849,7 @@
  		dev_priv->gart_info.table_size = sp->value;
  		if (dev_priv->gart_info.table_size < RADEON_PCIGART_TABLE_SIZE)
  			dev_priv->gart_info.table_size = RADEON_PCIGART_TABLE_SIZE;
-@@ -3127,6 +3154,14 @@ static int radeon_cp_setparam(struct drm_device *dev, void *data, struct drm_fil
+@@ -3127,6 +3157,14 @@ static int radeon_cp_setparam(struct drm_device *dev, void *data, struct drm_fil
  	case RADEON_SETPARAM_VBLANK_CRTC:
  		return radeon_vblank_crtc_set(dev, sp->value);
  		break;
@@ -33652,7 +34864,7 @@
  	default:
  		DRM_DEBUG("Invalid parameter %d\n", sp->param);
  		return -EINVAL;
-@@ -3215,7 +3250,19 @@ struct drm_ioctl_desc radeon_ioctls[] = {
+@@ -3215,7 +3253,19 @@ struct drm_ioctl_desc radeon_ioctls[] = {
  	DRM_IOCTL_DEF(DRM_RADEON_IRQ_WAIT, radeon_irq_wait, DRM_AUTH),
  	DRM_IOCTL_DEF(DRM_RADEON_SETPARAM, radeon_cp_setparam, DRM_AUTH),
  	DRM_IOCTL_DEF(DRM_RADEON_SURF_ALLOC, radeon_surface_alloc, DRM_AUTH),
@@ -33874,7 +35086,7 @@
  
  #endif				/* __KERNEL__ */
 diff --git a/include/drm/drm_crtc_helper.h b/include/drm/drm_crtc_helper.h
-index 4bc04cf..4318878 100644
+index 0c6f0e1..e1f0f16 100644
 --- a/include/drm/drm_crtc_helper.h
 +++ b/include/drm/drm_crtc_helper.h
 @@ -121,4 +121,6 @@ static inline void drm_connector_helper_add(struct drm_connector *connector,
@@ -34836,7 +36048,7 @@
   * on the security mechanisms provided by hardware.
   */
 diff --git a/include/drm/radeon_drm.h b/include/drm/radeon_drm.h
-index 73ff51f..e4f5897 100644
+index 73ff51f..1f67a11 100644
 --- a/include/drm/radeon_drm.h
 +++ b/include/drm/radeon_drm.h
 @@ -453,6 +453,15 @@ typedef struct {
@@ -34893,15 +36105,16 @@
  typedef struct drm_radeon_init {
  	enum {
  		RADEON_INIT_CP = 0x01,
-@@ -677,6 +710,7 @@ typedef struct drm_radeon_indirect {
+@@ -677,6 +710,8 @@ typedef struct drm_radeon_indirect {
  #define RADEON_PARAM_VBLANK_CRTC           13   /* VBLANK CRTC */
  #define RADEON_PARAM_FB_LOCATION           14   /* FB location */
  #define RADEON_PARAM_NUM_GB_PIPES          15   /* num GB pipes */
 +#define RADEON_PARAM_KERNEL_MM             16
++#define RADEON_PARAM_DEVICE_ID		   17
  
  typedef struct drm_radeon_getparam {
  	int param;
-@@ -731,6 +765,7 @@ typedef struct drm_radeon_setparam {
+@@ -731,6 +766,7 @@ typedef struct drm_radeon_setparam {
  #define RADEON_SETPARAM_NEW_MEMMAP 4		/* Use new memory map */
  #define RADEON_SETPARAM_PCIGART_TABLE_SIZE 5    /* PCI GART Table Size */
  #define RADEON_SETPARAM_VBLANK_CRTC 6           /* VBLANK CRTC */
@@ -34909,7 +36122,7 @@
  /* 1.14: Clients can allocate/free a surface
   */
  typedef struct drm_radeon_surface_alloc {
-@@ -746,4 +781,106 @@ typedef struct drm_radeon_surface_free {
+@@ -746,4 +782,106 @@ typedef struct drm_radeon_surface_free {
  #define	DRM_RADEON_VBLANK_CRTC1		1
  #define	DRM_RADEON_VBLANK_CRTC2		2
  
@@ -35016,6 +36229,3 @@
 +
 +
  #endif
--- 
-1.6.0.6
-

drm-next.patch:

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.5 -r 1.6 drm-next.patch
Index: drm-next.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/drm-next.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- drm-next.patch	20 Dec 2008 21:51:49 -0000	1.5
+++ drm-next.patch	22 Jan 2009 06:26:05 -0000	1.6
@@ -1,21344 +1,313 @@
-diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig
-index a8b33c2..5130b72 100644
---- a/drivers/gpu/drm/Kconfig
-+++ b/drivers/gpu/drm/Kconfig
-@@ -7,6 +7,8 @@
- menuconfig DRM
- 	tristate "Direct Rendering Manager (XFree86 4.1.0 and higher DRI support)"
- 	depends on (AGP || AGP=n) && PCI && !EMULATED_CMPXCHG && MMU
-+	select I2C
-+	select I2C_ALGOBIT
- 	help
- 	  Kernel-level support for the Direct Rendering Infrastructure (DRI)
- 	  introduced in XFree86 4.0. If you say Y here, you need to select
-@@ -65,6 +67,10 @@ config DRM_I830
- 	  will load the correct one.
+commit 2906f0258770d3a9c4e65364df8acc904e148bbe
+Author: Jesse Barnes <jbarnes at virtuousgeek.org>
+Date:   Tue Jan 20 19:10:54 2009 -0800
+
+    drm/i915: Fix cursor physical address choice to match the 2D driver.
+    
+    Signed-off-by: Jesse Barnes <jbarnes at virtuousgeek.org>
+    Signed-off-by: Eric Anholt <eric at anholt.net>
+
+commit 1bb88edb7a3769992026f34fd648bb459b0469aa
+Author: Eric Anholt <eric at anholt.net>
+Date:   Thu Jan 15 01:16:25 2009 -0800
+
+    drm: stash AGP include under the do-we-have-AGP ifdef
+    
+    This fixes the MIPS with DRM build.
+    
+    Signed-off-by: Eric Anholt <eric at anholt.net>
+    Tested-by: Martin Michlmayr <tbm at cyrius.com>
+    Signed-off-by: Dave Airlie <airlied at redhat.com>
+
+commit 4942f8b23b56a3f9a713d4436338710579329ffc
+Author: Jesse Barnes <jbarnes at virtuousgeek.org>
+Date:   Thu Jan 22 22:23:53 2009 +1000
+
+    drm: don't whine about not reading EDID data
+    
+    Make this message a little quieter, since it's common and not necessarily
+    indicative of a problem.
+    
+    Signed-off-by: Jesse Barnes <jbarnes at virtuousgeek.org>
+    Signed-off-by: Dave Airlie <airlied at redhat.com>
+
+commit 335041ed31d774391d9add49824d05e7d19d93e9
+Author: Jesse Barnes <jbarnes at virtuousgeek.org>
+Date:   Thu Jan 22 22:22:06 2009 +1000
+
+    drm/i915: hook up LVDS DPMS property
+    
+    The LVDS output supports DPMS calls, but we never hooked up the property code,
+    so set property calls didn't actually do anything.  Implement a set_property
+    callback for the LVDS output so that the right thing happens.
+    
+    Signed-off-by: Jesse Barnes <jbarnes at virtuousgeek.org>
+
+commit ed2dd4b0cc1494c27478f4ea8452f68d2037a60c
+Author: Jesse Barnes <jbarnes at virtuousgeek.org>
+Date:   Thu Jan 22 22:21:16 2009 +1000
+
+    drm/i915: remove unnecessary debug output in KMS init
+    
+    We don't really need to print out the FB BAR...
+    
+    Signed-off-by: Jesse Barnes <jbarnes at virtuousgeek.org>
+    Signed-off-by: Dave Airlie <airlied at redhat.com>
+
+commit 260883c85611d3a7e27130af9aef15252856e14f
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Thu Jan 22 17:58:49 2009 +1000
+
+    i915: fix freeing path for gem phys objects.
+    
+    This off-by-one was pointed out by Jesse Barnes.
+    
+    Signed-off-by: Dave Airlie <airlied at redhat.com>
+
+commit ad2563c2e42fc67b0976aeb70e9f3faf1c1196e8
+Author: Jesse Barnes <jbarnes at virtuousgeek.org>
+Date:   Mon Jan 19 17:21:45 2009 +1000
+
+    drm: create mode_config idr lock
+    
+    Create a separate mode_config IDR lock for simplicity.  The core DRM
+    config structures (connector, mode, etc. lists) are still protected by
+    the mode_config mutex, but the CRTC IDR (used for the various identifier
+    IDs) is now protected by the mode_config idr_mutex.  Simplifies the
+    locking a bit and removes a warning.
+    
+    All objects are protected by the config mutex, we may in the future,
+    split the object further to have reference counts.
+    
+    Signed-off-by: Jesse Barnes <jbarnes at virtuousgeek.org>
+    Signed-off-by: Dave Airlie <airlied at redhat.com>
+
+commit c1ff85d97708550e634fb6fa099c463db90fc40d
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Mon Jan 19 17:17:58 2009 +1000
+
+    drm: fix leak of device mappings since multi-master changes.
+    
+    Device maps now contain a link to the master that created them, so
+    when cleaning up the master, remove any maps that are connected to it.
+    Also delete any remaining maps at driver unload time.
+    
+    Signed-off-by: Dave Airlie <airlied at redhat.com>
+diff --git a/drivers/gpu/drm/drm_agpsupport.c b/drivers/gpu/drm/drm_agpsupport.c
+index 3d33b82..1479659 100644
+--- a/drivers/gpu/drm/drm_agpsupport.c
++++ b/drivers/gpu/drm/drm_agpsupport.c
+@@ -33,10 +33,11 @@
  
- config DRM_I915
-+	select FB_CFB_FILLRECT
-+	select FB_CFB_COPYAREA
-+	select FB_CFB_IMAGEBLIT
-+	depends on FB
- 	tristate "i915 driver"
- 	help
- 	  Choose this option if you have a system that has Intel 830M, 845G,
-@@ -76,6 +82,17 @@ config DRM_I915
+ #include "drmP.h"
+ #include <linux/module.h>
+-#include <asm/agp.h>
  
- endchoice
+ #if __OS_HAS_AGP
  
-+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.  Note that this causes
-+	the driver to bind to PCI devices, which precludes loading things
-+	like intelfb.
++#include <asm/agp.h>
 +
-+
- config DRM_MGA
- 	tristate "Matrox g200/g400"
- 	depends on DRM
-diff --git a/drivers/gpu/drm/Makefile b/drivers/gpu/drm/Makefile
-index 74da994..30022c4 100644
---- a/drivers/gpu/drm/Makefile
-+++ b/drivers/gpu/drm/Makefile
-@@ -9,7 +9,8 @@ drm-y       :=	drm_auth.o drm_bufs.o drm_cache.o \
- 		drm_drv.o drm_fops.o drm_gem.o drm_ioctl.o drm_irq.o \
- 		drm_lock.o drm_memory.o drm_proc.o drm_stub.o drm_vm.o \
- 		drm_agpsupport.o drm_scatter.o ati_pcigart.o drm_pci.o \
--		drm_sysfs.o drm_hashtab.o drm_sman.o drm_mm.o
-+		drm_sysfs.o drm_hashtab.o drm_sman.o drm_mm.o \
-+		drm_crtc.o drm_crtc_helper.o drm_modes.o drm_edid.o
- 
- drm-$(CONFIG_COMPAT) += drm_ioc32.o
- 
-diff --git a/drivers/gpu/drm/drm_auth.c b/drivers/gpu/drm/drm_auth.c
-index a734627..ca7a9ef 100644
---- a/drivers/gpu/drm/drm_auth.c
-+++ b/drivers/gpu/drm/drm_auth.c
-@@ -45,14 +45,15 @@
-  * the one with matching magic number, while holding the drm_device::struct_mutex
-  * lock.
-  */
--static struct drm_file *drm_find_file(struct drm_device * dev, drm_magic_t magic)
-+static struct drm_file *drm_find_file(struct drm_master *master, drm_magic_t magic)
- {
- 	struct drm_file *retval = NULL;
- 	struct drm_magic_entry *pt;
- 	struct drm_hash_item *hash;
-+	struct drm_device *dev = master->minor->dev;
+ /**
+  * Get AGP information.
+  *
+diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c
+index 5b2cbb7..bfce099 100644
+--- a/drivers/gpu/drm/drm_crtc.c
++++ b/drivers/gpu/drm/drm_crtc.c
+@@ -194,7 +194,6 @@ char *drm_get_connector_status_name(enum drm_connector_status status)
+  * @type: object type
+  *
+  * LOCKING:
+- * Caller must hold DRM mode_config lock.
+  *
+  * Create a unique identifier based on @ptr in @dev's identifier space.  Used
+  * for tracking modes, CRTCs and connectors.
[...21229 lines suppressed...]
-+	uint32_t count_enum_blobs;
-+};
-+
-+struct drm_mode_connector_set_property {
-+	uint64_t value;
-+	uint32_t prop_id;
-+	uint32_t connector_id;
-+};
-+
-+struct drm_mode_get_blob {
-+	uint32_t blob_id;
-+	uint32_t length;
-+	uint64_t data;
-+};
-+
-+struct drm_mode_fb_cmd {
-+	uint32_t fb_id;
-+	uint32_t width, height;
-+	uint32_t pitch;
-+	uint32_t bpp;
-+	uint32_t depth;
-+	/* driver specific handle */
-+	uint32_t handle;
-+};
-+
-+struct drm_mode_mode_cmd {
-+	uint32_t connector_id;
-+	struct drm_mode_modeinfo mode;
-+};
-+
-+#define DRM_MODE_CURSOR_BO	(1<<0)
-+#define DRM_MODE_CURSOR_MOVE	(1<<1)
-+
-+/*
-+ * depending on the value in flags diffrent members are used.
-+ *
-+ * CURSOR_BO uses
-+ *    crtc
-+ *    width
-+ *    height
-+ *    handle - if 0 turns the cursor of
-+ *
-+ * CURSOR_MOVE uses
-+ *    crtc
-+ *    x
-+ *    y
-+ */
-+struct drm_mode_cursor {
-+	uint32_t flags;
-+	uint32_t crtc_id;
-+	int32_t x;
-+	int32_t y;
-+	uint32_t width;
-+	uint32_t height;
-+	/* driver specific handle */
-+	uint32_t handle;
-+};
-+
-+struct drm_mode_crtc_lut {
-+	uint32_t crtc_id;
-+	uint32_t gamma_size;
-+
-+	/* pointers to arrays */
-+	uint64_t red;
-+	uint64_t green;
-+	uint64_t blue;
-+};
-+
-+#endif
-diff --git a/include/drm/drm_sarea.h b/include/drm/drm_sarea.h
-index 4800373..ee5389d 100644
---- a/include/drm/drm_sarea.h
-+++ b/include/drm/drm_sarea.h
-@@ -36,12 +36,12 @@
- 
- /* SAREA area needs to be at least a page */
- #if defined(__alpha__)
--#define SAREA_MAX                       0x2000
-+#define SAREA_MAX                       0x2000U
- #elif defined(__ia64__)
--#define SAREA_MAX                       0x10000	/* 64kB */
-+#define SAREA_MAX                       0x10000U	/* 64kB */
- #else
- /* Intel 830M driver needs at least 8k SAREA */
--#define SAREA_MAX                       0x2000
-+#define SAREA_MAX                       0x2000U
- #endif
- 
- /** Maximum number of drawables in the SAREA */
-diff --git a/include/drm/i915_drm.h b/include/drm/i915_drm.h
-index 152b34d..b3bcf72 100644
---- a/include/drm/i915_drm.h
-+++ b/include/drm/i915_drm.h
-@@ -113,8 +113,31 @@ typedef struct _drm_i915_sarea {
- 	int pipeB_y;
- 	int pipeB_w;
- 	int pipeB_h;
-+
-+	/* fill out some space for old userspace triple buffer */
-+	drm_handle_t unused_handle;
-+	uint32_t unused1, unused2, unused3;
-+
-+	/* buffer object handles for static buffers. May change
-+	 * over the lifetime of the client.
-+	 */
-+	uint32_t front_bo_handle;
-+	uint32_t back_bo_handle;
-+	uint32_t unused_bo_handle;
-+	uint32_t depth_bo_handle;
-+
- } drm_i915_sarea_t;
- 
-+/* due to userspace building against these headers we need some compat here */
-+#define planeA_x pipeA_x
-+#define planeA_y pipeA_y
-+#define planeA_w pipeA_w
-+#define planeA_h pipeA_h
-+#define planeB_x pipeB_x
-+#define planeB_y pipeB_y
-+#define planeB_w pipeB_w
-+#define planeB_h pipeB_h
-+
- /* Flags for perf_boxes
-  */
- #define I915_BOX_RING_EMPTY    0x1
-@@ -160,6 +183,7 @@ typedef struct _drm_i915_sarea {
- #define DRM_I915_GEM_SET_TILING	0x21
- #define DRM_I915_GEM_GET_TILING	0x22
- #define DRM_I915_GEM_GET_APERTURE 0x23
-+#define DRM_I915_GEM_MMAP_GTT	0x24
- 
- #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)
-@@ -177,6 +201,8 @@ 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)
-+#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)
- #define DRM_IOCTL_I915_GEM_PIN		DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_GEM_PIN, struct drm_i915_gem_pin)
- #define DRM_IOCTL_I915_GEM_UNPIN	DRM_IOW(DRM_COMMAND_BASE + DRM_I915_GEM_UNPIN, struct drm_i915_gem_unpin)
- #define DRM_IOCTL_I915_GEM_BUSY		DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_GEM_BUSY, struct drm_i915_gem_busy)
-@@ -187,6 +213,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)
-@@ -196,7 +223,7 @@ typedef struct _drm_i915_sarea {
- /* Allow drivers to submit batchbuffers directly to hardware, relying
-  * on the security mechanisms provided by hardware.
+@@ -528,7 +528,8 @@ struct drm_mode_group {
+  *
   */
--typedef struct _drm_i915_batchbuffer {
-+typedef struct drm_i915_batchbuffer {
- 	int start;		/* agp offset */
- 	int used;		/* nr bytes in use */
- 	int DR1;		/* hw flags for GFX_OP_DRAWRECT_INFO */
-@@ -382,6 +409,18 @@ 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;
-+	/**
-+	 * Fake offset to use for subsequent mmap call
-+	 *
-+	 * This is a fixed-size type for 32/64 compatibility.
-+	 */
-+	uint64_t offset;
-+};
-+
- struct drm_i915_gem_set_domain {
- 	/** Handle for the object */
- 	uint32_t handle;
-diff --git a/include/linux/console.h b/include/linux/console.h
-index 248e6e3..a67a90c 100644
---- a/include/linux/console.h
-+++ b/include/linux/console.h
-@@ -153,4 +153,8 @@ void vcs_remove_sysfs(struct tty_struct *tty);
- #define VESA_HSYNC_SUSPEND      2
- #define VESA_POWERDOWN          3
- 
-+#ifdef CONFIG_VGA_CONSOLE
-+extern bool vgacon_text_force(void);
-+#endif
-+
- #endif /* _LINUX_CONSOLE_H */
+ struct drm_mode_config {
+-	struct mutex mutex; /* protects configuration and IDR */
++	struct mutex mutex; /* protects configuration (mode lists etc.) */
++	struct mutex idr_mutex; /* for IDR management */
+ 	struct idr crtc_idr; /* use this idr for all IDs, fb, crtc, connector, modes - just makes life easier */
+ 	/* this is limited to one for now */
+ 	int num_fb;


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1224
retrieving revision 1.1225
diff -u -r1.1224 -r1.1225
--- kernel.spec	21 Jan 2009 21:33:01 -0000	1.1224
+++ kernel.spec	22 Jan 2009 06:26:05 -0000	1.1225
@@ -1147,8 +1147,8 @@
 ApplyPatch linux-2.6-net-tulip-interrupt.patch
 
 # Nouveau DRM + drm fixes
-#ApplyPatch drm-next.patch
-#ApplyPatch drm-modesetting-radeon.patch
+ApplyPatch drm-next.patch
+ApplyPatch drm-modesetting-radeon.patch
 #ApplyPatch drm-nouveau.patch
 
 # linux1394 git patches
@@ -1740,6 +1740,9 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Thu Jan 22 2009 Dave Airlie <airlied at redhat.com>
+- rebase drm patches - nouveau TODO
+
 * Wed Jan 21 2009 John W. Linville <linville at redhat.com>
 - rt2x00: back-port activity LED init patches
 



From toshio at fedoraproject.org  Thu Jan 22 06:36:40 2009
From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=)
Date: Thu, 22 Jan 2009 06:36:40 +0000 (UTC)
Subject: rpms/python-sqlalchemy/devel .cvsignore, 1.23,
	1.24 python-sqlalchemy.spec, 1.37, 1.38 sources, 1.24,
	1.25 sqlalchemy-sqlite-unicode-test.patch, 1.1, NONE
Message-ID: <20090122063640.D8D5870033@cvs1.fedora.phx.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/python-sqlalchemy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20254

Modified Files:
	.cvsignore python-sqlalchemy.spec sources 
Removed Files:
	sqlalchemy-sqlite-unicode-test.patch 
Log Message:

* Wed Jan 21 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 0.5.1-1
- Update to 0.5.1.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-sqlalchemy/devel/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- .cvsignore	1 Dec 2008 20:42:20 -0000	1.23
+++ .cvsignore	22 Jan 2009 06:36:09 -0000	1.24
@@ -1 +1 @@
-SQLAlchemy-0.5.0rc4.tar.gz
+SQLAlchemy-0.5.1.tar.gz


Index: python-sqlalchemy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-sqlalchemy/devel/python-sqlalchemy.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- python-sqlalchemy.spec	1 Dec 2008 22:08:11 -0000	1.37
+++ python-sqlalchemy.spec	22 Jan 2009 06:36:09 -0000	1.38
@@ -2,18 +2,17 @@
 %{!?pyver: %define pyver %(%{__python} -c "import sys ; print sys.version[:3]")}
 
 %define srcname SQLAlchemy
-%define alphatag rc4
 
 Name:           python-sqlalchemy
-Version:        0.5.0
-Release:        0.1.%{alphatag}%{?dist}
+Version:        0.5.1
+Release:        1%{?dist}
 Summary:        Modular and flexible ORM library for python
 
 Group:          Development/Libraries
 License:        MIT
 URL:            http://www.sqlalchemy.org/
-Source0:        http://pypi.python.org/packages/source/S/%{srcname}/%{srcname}-%{version}%{?alphatag}.tar.gz
-Patch0: sqlalchemy-sqlite-unicode-test.patch
+Source0:        http://pypi.python.org/packages/source/S/%{srcname}/%{srcname}-%{version}.tar.gz
+#Patch0: sqlalchemy-sqlite-unicode-test.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -31,7 +30,7 @@
 
 %prep
 %setup -q -n %{srcname}-%{version}%{?alphatag}
-%patch0 -p1 -b .unicode
+#%patch0 -p1 -b .unicode
 
 %build
 CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build
@@ -58,6 +57,9 @@
 %{python_sitelib}/*
 
 %changelog
+* Wed Jan 21 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 0.5.1-1
+- Update to 0.5.1.
+
 * Mon Dec 1 2008 Toshio Kuratomi <toshio at fedoraproject.org> - 0.5-0.1.rc4
 - Update to 0.5.0rc4 which works with the new pysqlite
 - And update test cases to work with the new pysqlite


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-sqlalchemy/devel/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- sources	1 Dec 2008 20:42:20 -0000	1.24
+++ sources	22 Jan 2009 06:36:09 -0000	1.25
@@ -1 +1 @@
-f931e6d0de35b4c63b04d4daa6a4910c  SQLAlchemy-0.5.0rc4.tar.gz
+3374e8c7af39696eed26367631960d22  SQLAlchemy-0.5.1.tar.gz


--- sqlalchemy-sqlite-unicode-test.patch DELETED ---



From toshio at fedoraproject.org  Thu Jan 22 06:55:19 2009
From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=)
Date: Thu, 22 Jan 2009 06:55:19 +0000 (UTC)
Subject: rpms/gnome-common/devel .cvsignore, 1.5, 1.6 gnome-common.spec, 1.12,
	1.13 sources, 1.6, 1.7
Message-ID: <20090122065519.EBD5370033@cvs1.fedora.phx.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/gnome-common/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22491

Modified Files:
	.cvsignore gnome-common.spec sources 
Log Message:

* Wed Jan 21 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 2.24.0-1
- Update to version 2.24.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-common/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	8 Apr 2008 07:09:16 -0000	1.5
+++ .cvsignore	22 Jan 2009 06:54:49 -0000	1.6
@@ -1 +1 @@
-gnome-common-2.20.0.tar.bz2
+gnome-common-2.24.0.tar.bz2


Index: gnome-common.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-common/devel/gnome-common.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- gnome-common.spec	8 Apr 2008 07:09:16 -0000	1.12
+++ gnome-common.spec	22 Jan 2009 06:54:49 -0000	1.13
@@ -1,5 +1,5 @@
 Name:           gnome-common
-Version:        2.20.0
+Version:        2.24.0
 Release:        1%{?dist}
 Summary:        Useful things common to building gnome packages from scratch
 
@@ -7,7 +7,7 @@
 BuildArch:      noarch
 License:        GPLv2
 URL:            http://developer.gnome.org
-Source0:        http://ftp.gnome.org/pub/GNOME/sources/%{name}/2.20/%{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)
 
 # Hmmm.... gnome-common needs all of these.  But it doesn't necessarily need
@@ -55,6 +55,9 @@
 %{_datadir}/%{name}
 
 %changelog
+* Wed Jan 21 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 2.24.0-1
+- Update to version 2.24.0
+
 * Mon Apr 7 2008 Toshio Kuratomi <toshio at fedoraproject.org> - 2.20.0-1
 - Update to version 2.20.0.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-common/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	8 Apr 2008 07:09:16 -0000	1.6
+++ sources	22 Jan 2009 06:54:49 -0000	1.7
@@ -1 +1 @@
-89e47677fb72695c75d2cefac84ff9f1  gnome-common-2.20.0.tar.bz2
+f72230d19ab9f2fa8923dcb078c69e9a  gnome-common-2.24.0.tar.bz2



From pgordon at fedoraproject.org  Thu Jan 22 07:01:47 2009
From: pgordon at fedoraproject.org (Peter Gordon)
Date: Thu, 22 Jan 2009 07:01:47 +0000 (UTC)
Subject: rpms/gnome-applet-music/F-10 .cvsignore, 1.13,
	1.14 gnome-applet-music.spec, 1.27, 1.28 sources, 1.13, 1.14
Message-ID: <20090122070147.D6FDB70033@cvs1.fedora.phx.redhat.com>

Author: pgordon

Update of /cvs/pkgs/rpms/gnome-applet-music/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23507

Modified Files:
	.cvsignore gnome-applet-music.spec sources 
Log Message:
Update to 2.5.1 for bug-fixes.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-applet-music/F-10/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	7 Jan 2009 09:29:12 -0000	1.13
+++ .cvsignore	22 Jan 2009 07:01:17 -0000	1.14
@@ -1 +1 @@
-music-applet-2.5.0.tar.gz
+music-applet-2.5.1.tar.gz


Index: gnome-applet-music.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-applet-music/F-10/gnome-applet-music.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- gnome-applet-music.spec	7 Jan 2009 09:29:12 -0000	1.27
+++ gnome-applet-music.spec	22 Jan 2009 07:01:17 -0000	1.28
@@ -3,7 +3,7 @@
 %global	python_module_name	musicapplet
 
 Name:		gnome-applet-music
-Version:	2.5.0
+Version:	2.5.1
 Release:	1%{?dist}
 Summary:	A GNOME panel applet to control various music players
 Summary(es):	Miniaplicaci??n del panel GNOME para controlar reproductores de m??sica
@@ -149,6 +149,11 @@
 
 
 %changelog
+* Wed Jan 21 2009 Peter Gordon <peter at thecodergeek.com> - 2.5.1-1
+- Update to new upstream release (2.5.1), which fixes the applet hanging when
+  the player is closed, and processing of album art from Rhythmbox so that it
+  is shown properly in the information tooltip.
+
 * Wed Jan 07 2009 Peter Gordon <peter at thecodergeek.com> - 2.5.0-1
 - Update to new upstream release (2.5.0), which adds support for Amarok 2,
   fixes uncontrolled growth in applet with long metadata strings (#452420),


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-applet-music/F-10/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	7 Jan 2009 09:29:12 -0000	1.13
+++ sources	22 Jan 2009 07:01:17 -0000	1.14
@@ -1 +1 @@
-01c85378fbbacea334fa009f94243f78  music-applet-2.5.0.tar.gz
+2cd43e4b6d93d8ca552fa239c44c65d3  music-applet-2.5.1.tar.gz



From pgordon at fedoraproject.org  Thu Jan 22 07:06:18 2009
From: pgordon at fedoraproject.org (Peter Gordon)
Date: Thu, 22 Jan 2009 07:06:18 +0000 (UTC)
Subject: rpms/gnome-applet-music/F-9 .cvsignore, 1.13,
	1.14 gnome-applet-music.spec, 1.27, 1.28 sources, 1.13, 1.14
Message-ID: <20090122070618.CA9E670033@cvs1.fedora.phx.redhat.com>

Author: pgordon

Update of /cvs/pkgs/rpms/gnome-applet-music/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24112

Modified Files:
	.cvsignore gnome-applet-music.spec sources 
Log Message:
Update to 2.5.1 for bug-fixes.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-applet-music/F-9/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	7 Jan 2009 09:34:25 -0000	1.13
+++ .cvsignore	22 Jan 2009 07:05:48 -0000	1.14
@@ -1 +1 @@
-music-applet-2.5.0.tar.gz
+music-applet-2.5.1.tar.gz


Index: gnome-applet-music.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-applet-music/F-9/gnome-applet-music.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- gnome-applet-music.spec	7 Jan 2009 09:34:25 -0000	1.27
+++ gnome-applet-music.spec	22 Jan 2009 07:05:48 -0000	1.28
@@ -3,7 +3,7 @@
 %global	python_module_name	musicapplet
 
 Name:		gnome-applet-music
-Version:	2.5.0
+Version:	2.5.1
 Release:	1%{?dist}
 Summary:	A GNOME panel applet to control various music players
 Summary(es):	Miniaplicaci??n del panel GNOME para controlar reproductores de m??sica
@@ -149,6 +149,11 @@
 
 
 %changelog
+* Wed Jan 21 2009 Peter Gordon <peter at thecodergeek.com> - 2.5.1-1
+- Update to new upstream release (2.5.1), which fixes the applet hanging when
+  the player is closed, and processing of album art from Rhythmbox so that it
+  is shown properly in the information tooltip.
+
 * Wed Jan 07 2009 Peter Gordon <peter at thecodergeek.com> - 2.5.0-1
 - Update to new upstream release (2.5.0), which adds support for Amarok 2,
   fixes uncontrolled growth in applet with long metadata strings (#452420),


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-applet-music/F-9/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	7 Jan 2009 09:34:25 -0000	1.13
+++ sources	22 Jan 2009 07:05:48 -0000	1.14
@@ -1 +1 @@
-01c85378fbbacea334fa009f94243f78  music-applet-2.5.0.tar.gz
+2cd43e4b6d93d8ca552fa239c44c65d3  music-applet-2.5.1.tar.gz



From iankent at fedoraproject.org  Thu Jan 22 07:15:33 2009
From: iankent at fedoraproject.org (Ian Kent)
Date: Thu, 22 Jan 2009 07:15:33 +0000 (UTC)
Subject: rpms/autofs/F-10 autofs-5.0.3-use-CLOEXEC-flag.patch,1.1,1.2
Message-ID: <20090122071533.44F0870033@cvs1.fedora.phx.redhat.com>

Author: iankent

Update of /cvs/pkgs/rpms/autofs/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25141

Modified Files:
	autofs-5.0.3-use-CLOEXEC-flag.patch 
Log Message:
- correct typo in CLOEXEC patch.


autofs-5.0.3-use-CLOEXEC-flag.patch:

Index: autofs-5.0.3-use-CLOEXEC-flag.patch
===================================================================
RCS file: /cvs/pkgs/rpms/autofs/F-10/autofs-5.0.3-use-CLOEXEC-flag.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- autofs-5.0.3-use-CLOEXEC-flag.patch	22 Jan 2009 05:54:59 -0000	1.1
+++ autofs-5.0.3-use-CLOEXEC-flag.patch	22 Jan 2009 07:15:31 -0000	1.2
@@ -408,7 +408,7 @@
 +	FILE *f;
 +
 +#if defined(O_CLOEXEC) && defined(SOCK_CLOEXEC)
-+	if (cloexec_exec != -1) {
++	if (cloexec_works != -1) {
 +		f = fopen(path, "re");
 +		if (f != NULL) {
 +			check_cloexec(fileno(f));



From ausil at fedoraproject.org  Thu Jan 22 07:23:06 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Thu, 22 Jan 2009 07:23:06 +0000 (UTC)
Subject: rpms/postgresql/F-9 postgresql.spec,1.98,1.99
Message-ID: <20090122072307.1B59D70033@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/postgresql/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25749

Modified Files:
	postgresql.spec 
Log Message:
optimise at -O1 on sparc64



Index: postgresql.spec
===================================================================
RCS file: /cvs/pkgs/rpms/postgresql/F-9/postgresql.spec,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -r1.98 -r1.99
--- postgresql.spec	2 Nov 2008 18:47:15 -0000	1.98
+++ postgresql.spec	22 Jan 2009 07:22:36 -0000	1.99
@@ -83,7 +83,7 @@
 Summary: PostgreSQL client programs and libraries
 Name: postgresql
 Version: 8.3.5
-Release: 1%{?dist}
+Release: 1%{?dist}.1
 License: BSD
 Group: Applications/Databases
 Url: http://www.postgresql.org/ 
@@ -393,6 +393,10 @@
 
 # Strip out -ffast-math from CFLAGS....
 CFLAGS=`echo $CFLAGS|xargs -n 1|grep -v ffast-math|xargs -n 100`
+# use -O1 on sparc64
+%ifarch sparc64
+CFLAGS=`echo $CFLAGS| sed -e "s|-O2|-O1|g" `
+%endif
 
 # Use --as-needed to eliminate unnecessary link dependencies.
 # Hopefully upstream will do this for itself in some future release.
@@ -859,6 +863,9 @@
 %endif
 
 %changelog
+* Wed Jan 21 2009 Dennis Gilmore <dennis at ausil.us> 8.3.5-1.1
+- use -O1 on sparc64
+
 * Sun Nov  2 2008 Tom Lane <tgl at redhat.com> 8.3.5-1
 - Update to PostgreSQL 8.3.5.
 - Improve display from init script's initdb action, per Michael Schwendt



From ausil at fedoraproject.org  Thu Jan 22 07:31:12 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Thu, 22 Jan 2009 07:31:12 +0000 (UTC)
Subject: rpms/postgresql/F-10 postgresql.spec,1.102,1.103
Message-ID: <20090122073112.4FE5970033@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/postgresql/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27244

Modified Files:
	postgresql.spec 
Log Message:
use -O1 on sparc64



Index: postgresql.spec
===================================================================
RCS file: /cvs/pkgs/rpms/postgresql/F-10/postgresql.spec,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -r1.102 -r1.103
--- postgresql.spec	2 Nov 2008 18:23:29 -0000	1.102
+++ postgresql.spec	22 Jan 2009 07:30:41 -0000	1.103
@@ -83,7 +83,7 @@
 Summary: PostgreSQL client programs and libraries
 Name: postgresql
 Version: 8.3.5
-Release: 1%{?dist}
+Release: 1%{?dist}.1
 License: BSD
 Group: Applications/Databases
 Url: http://www.postgresql.org/ 
@@ -393,6 +393,10 @@
 
 # Strip out -ffast-math from CFLAGS....
 CFLAGS=`echo $CFLAGS|xargs -n 1|grep -v ffast-math|xargs -n 100`
+# use -O1 on sparc64
+%ifarch sparc64
+CFLAGS=`echo $CFLAGS| sed -e "s|-O2|-O1|g" `
+%endif
 
 # Use --as-needed to eliminate unnecessary link dependencies.
 # Hopefully upstream will do this for itself in some future release.
@@ -859,6 +863,9 @@
 %endif
 
 %changelog
+* Wed Jan 21 2009 Dennis Gilmore <dennis at ausil.us> 8.3.5-1.1
+- use -O1 on sparc64
+
 * Sun Nov  2 2008 Tom Lane <tgl at redhat.com> 8.3.5-1
 - Update to PostgreSQL 8.3.5.
 - Improve display from init script's initdb action, per Michael Schwendt



From ausil at fedoraproject.org  Thu Jan 22 07:36:58 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Thu, 22 Jan 2009 07:36:58 +0000 (UTC)
Subject: rpms/postgresql/devel postgresql.spec,1.104,1.105
Message-ID: <20090122073658.B9E7770033@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/postgresql/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27851

Modified Files:
	postgresql.spec 
Log Message:
build -O1 sparc64



Index: postgresql.spec
===================================================================
RCS file: /cvs/pkgs/rpms/postgresql/devel/postgresql.spec,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -r1.104 -r1.105
--- postgresql.spec	17 Jan 2009 19:46:16 -0000	1.104
+++ postgresql.spec	22 Jan 2009 07:36:28 -0000	1.105
@@ -83,7 +83,7 @@
 Summary: PostgreSQL client programs and libraries
 Name: postgresql
 Version: 8.3.5
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: BSD
 Group: Applications/Databases
 Url: http://www.postgresql.org/ 
@@ -393,6 +393,10 @@
 
 # Strip out -ffast-math from CFLAGS....
 CFLAGS=`echo $CFLAGS|xargs -n 1|grep -v ffast-math|xargs -n 100`
+# use -O1 on sparc64
+%ifarch sparc64
+CFLAGS=`echo $CFLAGS| sed -e "s|-O2|-O1|g" `
+%endif
 
 # Use --as-needed to eliminate unnecessary link dependencies.
 # Hopefully upstream will do this for itself in some future release.
@@ -859,6 +863,9 @@
 %endif
 
 %changelog
+* Wed Jan 21 2009 Dennis Gilmore <dennis at ausil.us> 8.3.5-4
+- use -O1 on sparc64
+
 * Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> - 8.3.5-3
 - rebuild with new openssl
 



From pmatilai at fedoraproject.org  Thu Jan 22 07:38:15 2009
From: pmatilai at fedoraproject.org (Panu Matilainen)
Date: Thu, 22 Jan 2009 07:38:15 +0000 (UTC)
Subject: rpms/sqlite/devel .cvsignore, 1.23, 1.24 sources, 1.23,
	1.24 sqlite.spec, 1.49, 1.50
Message-ID: <20090122073815.3AFE070033@cvs1.fedora.phx.redhat.com>

Author: pmatilai

Update of /cvs/pkgs/rpms/sqlite/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28108

Modified Files:
	.cvsignore sources sqlite.spec 
Log Message:
- update to 3.6.10



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sqlite/devel/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- .cvsignore	31 Dec 2008 08:39:40 -0000	1.23
+++ .cvsignore	22 Jan 2009 07:37:44 -0000	1.24
@@ -1 +1 @@
-sqlite-3.6.7.tar.gz
+sqlite-3.6.10.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sqlite/devel/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sources	31 Dec 2008 08:39:40 -0000	1.23
+++ sources	22 Jan 2009 07:37:44 -0000	1.24
@@ -1 +1 @@
-5223d1f459b608ed8c2c54f8847f8e1a  sqlite-3.6.7.tar.gz
+a03bdc86df4025b6881d58557e4b5bd3  sqlite-3.6.10.tar.gz


Index: sqlite.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sqlite/devel/sqlite.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- sqlite.spec	31 Dec 2008 08:39:40 -0000	1.49
+++ sqlite.spec	22 Jan 2009 07:37:44 -0000	1.50
@@ -5,7 +5,7 @@
 
 Summary: Library that implements an embeddable SQL database engine
 Name: sqlite
-Version: 3.6.7
+Version: 3.6.10
 Release: 1%{?dist}
 License: Public Domain
 Group: 	Applications/Databases
@@ -145,6 +145,9 @@
 %endif
 
 %changelog
+* Thu Jan 22 2009 Panu Matilainen <pmatilai at redhat.com> - 3.6.10-1
+- update to 3.6.10
+
 * Wed Dec 31 2008 Panu Matilainen <pmatilai at redhat.com> - 3.6.7-1
 - update to 3.6.7
 - avoid lemon ending up in main sqlite package too



From petersen at fedoraproject.org  Thu Jan 22 07:40:10 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Thu, 22 Jan 2009 07:40:10 +0000 (UTC)
Subject: rpms/ghc-paths/F-10 ghc-paths.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090122074010.D359D70033@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/pkgs/rpms/ghc-paths/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28433

Modified Files:
	.cvsignore sources 
Added Files:
	ghc-paths.spec 
Log Message:
initial import for f10


--- NEW FILE ghc-paths.spec ---
%define pkg_name ghc-paths
%define ghc_version 6.10.1

%define pkg_libdir %{_libdir}/ghc-%{ghc_version}/%{pkg_name}-%{version}
%define pkg_docdir %{_docdir}/ghc/libraries/%{pkg_name}-%{version}

# Haskell compilers do not emit debug information
%define debug_package %{nil}

Name:		%{pkg_name}
Version:	0.1.0.5
Release:	2%{?dist}
Summary:	Interface to GHC's installation directories

Group:		Development/Libraries
License:	BSD
URL:		http://hackage.haskell.org/cgi-bin/hackage-scripts/package/%{pkg_name}
Source0:	http://hackage.haskell.org/packages/archive/%{pkg_name}/%{version}/%{pkg_name}-%{version}.tar.gz
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Provides:       %{name}-devel = %{version}-%{release}
# ghc has only been bootstrapped on the following archs:
ExclusiveArch:  i386 x86_64 ppc
BuildRequires:	ghc = %{ghc_version}, ghc-prof = %{ghc_version}
Requires:	ghc = %{ghc_version}
Requires(post): ghc = %{ghc_version}
Requires(preun): ghc = %{ghc_version}
Requires(postun): ghc = %{ghc_version}

%description
This library provides an interface to reading the install directories
of the ghc compiler.


%package prof
Summary: Profiling libraries for %{name}
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
Requires: ghc-prof = %{ghc_version}

%description prof
This package contains profiling libraries for %{name}.


%prep
%setup -q


%build
%cabal_configure --ghc -p
%cabal build
%cabal haddock
%ghc_gen_scripts


%install
rm -rf $RPM_BUILD_ROOT
%cabal_install
%ghc_install_scripts
%ghc_gen_filelists %{name}


%clean
rm -rf $RPM_BUILD_ROOT


%post 
%ghc_register_pkg
%ghc_reindex_haddock


%preun 
if [ "$1" -eq 0 ] ; then
  %ghc_unregister_pkg
fi


%postun
if [ "$1" -eq 0 ] ; then
  %ghc_reindex_haddock
fi


%files -f %{name}.files
%defattr(-,root,root,-)
%doc LICENSE
%{pkg_docdir}


%files prof -f %{name}-prof.files
%defattr(-,root,root,-)


%changelog
* Tue Dec 23 2008 Jens Petersen <petersen at redhat.com> - 0.1.0.5-2
- improve summary and description (#476483)

* Mon Dec 15 2008 Jens Petersen <petersen at redhat.com> - 0.1.0.5-1
- initial packaging for Fedora


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ghc-paths/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	23 Dec 2008 01:28:26 -0000	1.1
+++ .cvsignore	22 Jan 2009 07:39:40 -0000	1.2
@@ -0,0 +1 @@
+ghc-paths-0.1.0.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ghc-paths/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	23 Dec 2008 01:28:26 -0000	1.1
+++ sources	22 Jan 2009 07:39:40 -0000	1.2
@@ -0,0 +1 @@
+8fdc122e65845d2d53734f78e22c5155  ghc-paths-0.1.0.5.tar.gz



From tsmetana at fedoraproject.org  Thu Jan 22 07:42:36 2009
From: tsmetana at fedoraproject.org (Tomas Smetana)
Date: Thu, 22 Jan 2009 07:42:36 +0000 (UTC)
Subject: rpms/freeglut/devel freeglut.spec,1.6,1.7
Message-ID: <20090122074236.F34F070033@cvs1.fedora.phx.redhat.com>

Author: tsmetana

Update of /cvs/pkgs/rpms/freeglut/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28766

Modified Files:
	freeglut.spec 
Log Message:
* Thu Jan 22 2009 Tomas Smetana <tsmetana at redhat.com> - 2.4.0-15
- fix #481049 - rebuild to pick up %{_isa} provides



Index: freeglut.spec
===================================================================
RCS file: /cvs/pkgs/rpms/freeglut/devel/freeglut.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- freeglut.spec	17 Mar 2008 19:48:12 -0000	1.6
+++ freeglut.spec	22 Jan 2009 07:42:06 -0000	1.7
@@ -1,7 +1,7 @@
 Summary:        A freely licensed alternative to the GLUT library
 Name:           freeglut
 Version:        2.4.0
-Release:        14%{?dist}
+Release:        15%{?dist}
 URL:            http://freeglut.sourceforge.net
 Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 # For the manpages
@@ -89,6 +89,9 @@
 
 
 %changelog
+* Thu Jan 22 2009 Tomas Smetana <tsmetana at redhat.com> - 2.4.0-15
+- fix #481049 - rebuild to pick up %%{_isa} provides
+
 * Mon Mar 17 2008 Jesse Keating <jkeating at redhat.com> - 2.4.0-14
 - Prevent package from obsoleting itself with matching Provides/Obsoletes.
 



From toshio at fedoraproject.org  Thu Jan 22 07:54:16 2009
From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=)
Date: Thu, 22 Jan 2009 07:54:16 +0000 (UTC)
Subject: rpms/python-decorator/devel .cvsignore, 1.2,
	1.3 python-decorator.spec, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <20090122075416.BA54370033@cvs1.fedora.phx.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/python-decorator/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30054

Modified Files:
	.cvsignore python-decorator.spec sources 
Log Message:

* Wed Jan 21 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 2.3.2-1
- Update to 2.3.2
- Enable tests via nose



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-decorator/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Apr 2008 00:07:38 -0000	1.2
+++ .cvsignore	22 Jan 2009 07:53:46 -0000	1.3
@@ -1 +1 @@
-decorator-2.2.0.zip
+decorator-2.3.2.tar.gz


Index: python-decorator.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-decorator/devel/python-decorator.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- python-decorator.spec	29 Nov 2008 15:27:22 -0000	1.2
+++ python-decorator.spec	22 Jan 2009 07:53:46 -0000	1.3
@@ -2,19 +2,20 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           python-decorator
-Version:        2.2.0
-Release:        2%{?dist}
+Version:        2.3.2
+Release:        1%{?dist}
 Summary:        Module to simplify usage of decorators
 
 Group:          Development/Languages
 License:        BSD
 URL:            http://www.phyast.pitt.edu/~micheles/python/documentation.html
-Source0:        http://www.phyast.pitt.edu/~micheles/python/decorator-%{version}.zip
+Source0:        http://pypi.python.org/packages/source/d/decorator/decorator-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
 BuildRequires:  python-devel
 BuildRequires:  python-setuptools-devel
+BuildRequires:  python-nose
 
 %description
 The aim of the decorator module is to simplify the usage of decorators for
@@ -23,8 +24,8 @@
 etc.  The core of this module is a decorator factory called decorator.
 
 %prep
-%setup -q -c -n decorator-%{version}
-chmod a-x *
+%setup -q -n decorator-%{version}
+chmod a-x *.txt *.py Makefile
 %{__sed} -i 's/\r//' README.txt
 
 %build
@@ -38,15 +39,18 @@
 rm -rf $RPM_BUILD_ROOT
 
 %check
-export PYTHONPATH=$RPM_BUILD_ROOT/%{python_sitelib}
-%{__python} doctester.py documentation.txt
+nosetests --with-doctest
 
 %files
 %defattr(-,root,root,-)
-%doc README.txt CHANGES.txt documentation.*
+%doc *.txt
 %{python_sitelib}/*
 
 %changelog
+* Wed Jan 21 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 2.3.2-1
+- Update to 2.3.2
+- Enable tests via nose
+
 * Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 2.2.0-2
 - Rebuild for Python 2.6
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-decorator/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Apr 2008 00:07:38 -0000	1.2
+++ sources	22 Jan 2009 07:53:46 -0000	1.3
@@ -1 +1 @@
-4732d42d7b9f1b19de960a84b57a63da  decorator-2.2.0.zip
+c52e22e9d8f5bc0c5d70e990dbe761e0  decorator-2.3.2.tar.gz



From alexlan at fedoraproject.org  Thu Jan 22 08:43:24 2009
From: alexlan at fedoraproject.org (Alex Lancaster)
Date: Thu, 22 Jan 2009 08:43:24 +0000 (UTC)
Subject: rpms/perl-bioperl/devel .cvsignore, 1.6, 1.7 perl-bioperl.spec, 1.18,
	1.19 sources, 1.7, 1.8
Message-ID: <20090122084324.89E3A70033@cvs1.fedora.phx.redhat.com>

Author: alexlan

Update of /cvs/extras/rpms/perl-bioperl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3096

Modified Files:
	.cvsignore perl-bioperl.spec sources 
Log Message:
- Update to 1.6.0 release candidate 4



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-bioperl/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	18 Jan 2009 08:52:02 -0000	1.6
+++ .cvsignore	22 Jan 2009 08:42:54 -0000	1.7
@@ -1 +1 @@
-BioPerl-1.5.9_3.tar.bz2
+BioPerl-1.5.9_4.tar.bz2


Index: perl-bioperl.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-bioperl/devel/perl-bioperl.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- perl-bioperl.spec	18 Jan 2009 08:52:03 -0000	1.18
+++ perl-bioperl.spec	22 Jan 2009 08:42:54 -0000	1.19
@@ -1,12 +1,12 @@
 Name:           perl-bioperl
 Version:        1.5.9
-Release:        0.4.3%{?dist}
+Release:        0.5.4%{?dist}
 Summary:        Perl tools for computational molecular biology
 
 Group:          Development/Libraries
 License:        GPL+ or Artistic
 URL:            http://www.bioperl.org/
-Source0:        http://bioperl.org/DIST/BioPerl-%{version}_3.tar.bz2
+Source0:        http://bioperl.org/DIST/BioPerl-%{version}_4.tar.bz2
 Patch0:         bioperl-1.5.9-paths.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -58,7 +58,7 @@
 many modules depend on each other to achieve a task.
 
 %prep
-%setup -q -n BioPerl-%{version}._3
+%setup -q -n BioPerl-%{version}._4
 %patch0 -p1 
 
 # temporarily remove PhyloNetwork before compiling until upstream says
@@ -70,13 +70,13 @@
 # these are the unwanted Requires for perl-bioperl-run, keeping in
 # case we need to do the temporary hack for bootstrapping again
 
-#cat << \EOF > %{_builddir}/BioPerl-%{version}._3/%{name}-req
+#cat << \EOF > %{_builddir}/BioPerl-%{version}._4/%{name}-req
 ##!/bin/sh
 #%{__perl_requires} $* |\
 #   sed -e '/perl(Bio::Tools::Run::Alignment::Clustalw)/d; /perl(Bio::Tools::Run::GenericParameters)/d; /perl(Bio::Tools::Run::Phylo::Molphy::ProtML)/d; /perl(Bio::Tools::Run::Phylo::Phylip::Neighbor)/d; /perl(Bio::Tools::Run::Phylo::Phylip::ProtDist)/d; /perl(Bio::Tools::Run::Phylo::Phylip::ProtPars)/d; /perl(Bio::Tools::Run::RemoteBlast)/d'
 #EOF
  
-#%%define __perl_requires %{_builddir}/BioPerl-%{version}._3/%{name}-req
+#%%define __perl_requires %{_builddir}/BioPerl-%{version}._4/%{name}-req
 #chmod +x %{__perl_requires}
 
 # remove all execute bits from the doc stuff
@@ -129,6 +129,9 @@
 %{_mandir}/man3/*.3*    
 
 %changelog
+* Thu Jan 22 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 1.5.9-0.5.4
+- Update to 1.6.0 release candidate 4
+
 * Sun Jan 18 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 1.5.9-0.4.3
 - Update to 1.6.0 release candidate 3
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-bioperl/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	18 Jan 2009 08:52:03 -0000	1.7
+++ sources	22 Jan 2009 08:42:54 -0000	1.8
@@ -1 +1 @@
-d4cf25074d40c6797e7eeff8c925b5d6  BioPerl-1.5.9_3.tar.bz2
+9ed4f5c69196782a71833fe43511a6a6  BioPerl-1.5.9_4.tar.bz2



From ensc at fedoraproject.org  Thu Jan 22 08:50:01 2009
From: ensc at fedoraproject.org (Enrico Scholz)
Date: Thu, 22 Jan 2009 08:50:01 +0000 (UTC)
Subject: rpms/tor/devel tor.spec, 1.26, 1.27 sources, 1.14, 1.15 lastver, 1.5,
	1.6 .cvsignore, 1.5, 1.6
Message-ID: <20090122085001.7ADCB70033@cvs1.fedora.phx.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/tor/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3972/devel

Modified Files:
	tor.spec sources lastver .cvsignore 
Log Message:
updated to 0.2.0.33 (SECURITY: fixed heap-corruption bug)



Index: tor.spec
===================================================================
RCS file: /cvs/extras/rpms/tor/devel/tor.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- tor.spec	18 Jan 2009 13:44:40 -0000	1.26
+++ tor.spec	22 Jan 2009 08:49:30 -0000	1.27
@@ -10,8 +10,8 @@
 %{!?release_func:%global release_func() %1%{?dist}}
 
 Name:		tor
-Version:	0.2.0.32
-Release:	%release_func 2
+Version:	0.2.0.33
+Release:	%release_func 1
 Group:		System Environment/Daemons
 License:	BSD
 Summary:	Anonymizing overlay network for TCP (The onion router)
@@ -198,6 +198,9 @@
 
 
 %changelog
+* Thu Jan 22 2009 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.2.0.33-1
+- updated to 0.2.0.33 (SECURITY: fixed heap-corruption bug)
+
 * Sun Jan 18 2009 Tomas Mraz <tmraz at redhat.com> - 0.2.0.32-2
 - rebuild with new openssl
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tor/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	7 Dec 2008 10:24:14 -0000	1.14
+++ sources	22 Jan 2009 08:49:30 -0000	1.15
@@ -1,2 +1,2 @@
-fd55489f7ad1ef53c0b0dac857696fc9  tor-0.2.0.32.tar.gz
-5df4502967a3cb3fe8e1c3bb57cf3426  tor-0.2.0.32.tar.gz.asc
+9ad86a956b99b1ab007d459d74348960  tor-0.2.0.33.tar.gz
+b80d82fe493b1cc0ac7d1a72ee180b47  tor-0.2.0.33.tar.gz.asc


Index: lastver
===================================================================
RCS file: /cvs/extras/rpms/tor/devel/lastver,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- lastver	7 Dec 2008 10:24:13 -0000	1.5
+++ lastver	22 Jan 2009 08:49:30 -0000	1.6
@@ -1 +1 @@
-0.2.0.32
+0.2.0.33


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tor/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	7 Dec 2008 10:24:13 -0000	1.5
+++ .cvsignore	22 Jan 2009 08:49:31 -0000	1.6
@@ -1,2 +1,2 @@
-tor-0.2.0.32.tar.gz
-tor-0.2.0.32.tar.gz.asc
+tor-0.2.0.33.tar.gz
+tor-0.2.0.33.tar.gz.asc



From ensc at fedoraproject.org  Thu Jan 22 08:50:02 2009
From: ensc at fedoraproject.org (Enrico Scholz)
Date: Thu, 22 Jan 2009 08:50:02 +0000 (UTC)
Subject: rpms/tor/F-7 tor.spec,1.16,1.17
Message-ID: <20090122085002.51AEB70033@cvs1.fedora.phx.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/tor/F-7
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3972/F-7

Modified Files:
	tor.spec 
Log Message:
updated to 0.2.0.33 (SECURITY: fixed heap-corruption bug)



Index: tor.spec
===================================================================
RCS file: /cvs/extras/rpms/tor/F-7/tor.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- tor.spec	13 Feb 2008 11:22:14 -0000	1.16
+++ tor.spec	22 Jan 2009 08:49:32 -0000	1.17
@@ -11,7 +11,7 @@
 
 Name:		tor
 Version:	0.1.2.19
-Release:	%release_func 1
+Release:	%release_func 2
 Group:		System Environment/Daemons
 License:	BSD
 Summary:	Anonymizing overlay network for TCP (The onion router)
@@ -183,6 +183,9 @@
 
 
 %changelog
+* Wed Feb 13 2008 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.1.2.19-2
+- added 'missingok' to logrotate script (#429402)
+
 * Tue Feb 12 2008 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.1.2.19-1
 - updated to 0.1.2.19
 - use file based BR for latex



From ensc at fedoraproject.org  Thu Jan 22 08:50:01 2009
From: ensc at fedoraproject.org (Enrico Scholz)
Date: Thu, 22 Jan 2009 08:50:01 +0000 (UTC)
Subject: rpms/tor/F-9 tor.spec, 1.22, 1.23 sources, 1.14, 1.15 lastver, 1.5, 
	1.6 .cvsignore, 1.5, 1.6
Message-ID: <20090122085001.B41B270033@cvs1.fedora.phx.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/tor/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3972/F-9

Modified Files:
	tor.spec sources lastver .cvsignore 
Log Message:
updated to 0.2.0.33 (SECURITY: fixed heap-corruption bug)



Index: tor.spec
===================================================================
RCS file: /cvs/extras/rpms/tor/F-9/tor.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- tor.spec	7 Dec 2008 10:32:23 -0000	1.22
+++ tor.spec	22 Jan 2009 08:49:31 -0000	1.23
@@ -10,7 +10,7 @@
 %{!?release_func:%global release_func() %1%{?dist}}
 
 Name:		tor
-Version:	0.2.0.32
+Version:	0.2.0.33
 Release:	%release_func 1
 Group:		System Environment/Daemons
 License:	BSD
@@ -197,6 +197,9 @@
 
 
 %changelog
+* Thu Jan 22 2009 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.2.0.33-1
+- updated to 0.2.0.33 (SECURITY: fixed heap-corruption bug)
+
 * Sun Dec  7 2008 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.2.0.32-1
 - updated to 0.2.0.32
 - removed -setgroups patch; supplementary groups are now set upstream


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tor/F-9/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	7 Dec 2008 10:32:22 -0000	1.14
+++ sources	22 Jan 2009 08:49:31 -0000	1.15
@@ -1,2 +1,2 @@
-fd55489f7ad1ef53c0b0dac857696fc9  tor-0.2.0.32.tar.gz
-5df4502967a3cb3fe8e1c3bb57cf3426  tor-0.2.0.32.tar.gz.asc
+9ad86a956b99b1ab007d459d74348960  tor-0.2.0.33.tar.gz
+b80d82fe493b1cc0ac7d1a72ee180b47  tor-0.2.0.33.tar.gz.asc


Index: lastver
===================================================================
RCS file: /cvs/extras/rpms/tor/F-9/lastver,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- lastver	7 Dec 2008 10:32:22 -0000	1.5
+++ lastver	22 Jan 2009 08:49:31 -0000	1.6
@@ -1 +1 @@
-0.2.0.32
+0.2.0.33


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tor/F-9/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	7 Dec 2008 10:32:22 -0000	1.5
+++ .cvsignore	22 Jan 2009 08:49:31 -0000	1.6
@@ -1,2 +1,2 @@
-tor-0.2.0.32.tar.gz
-tor-0.2.0.32.tar.gz.asc
+tor-0.2.0.33.tar.gz
+tor-0.2.0.33.tar.gz.asc



From ensc at fedoraproject.org  Thu Jan 22 08:50:02 2009
From: ensc at fedoraproject.org (Enrico Scholz)
Date: Thu, 22 Jan 2009 08:50:02 +0000 (UTC)
Subject: rpms/tor/F-8 tor.spec, 1.20, 1.21 sources, 1.14, 1.15 lastver, 1.5, 
	1.6 .cvsignore, 1.5, 1.6
Message-ID: <20090122085002.17F6870141@cvs1.fedora.phx.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/tor/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3972/F-8

Modified Files:
	tor.spec sources lastver .cvsignore 
Log Message:
updated to 0.2.0.33 (SECURITY: fixed heap-corruption bug)



Index: tor.spec
===================================================================
RCS file: /cvs/extras/rpms/tor/F-8/tor.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- tor.spec	7 Dec 2008 10:35:53 -0000	1.20
+++ tor.spec	22 Jan 2009 08:49:31 -0000	1.21
@@ -10,7 +10,7 @@
 %{!?release_func:%global release_func() %1%{?dist}}
 
 Name:		tor
-Version:	0.2.0.32
+Version:	0.2.0.33
 Release:	%release_func 1
 Group:		System Environment/Daemons
 License:	BSD
@@ -196,6 +196,9 @@
 
 
 %changelog
+* Thu Jan 22 2009 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.2.0.33-1
+- updated to 0.2.0.33 (SECURITY: fixed heap-corruption bug)
+
 * Sun Dec  7 2008 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.2.0.32-1
 - updated to 0.2.0.32
 - removed -setgroups patch; supplementary groups are now set upstream


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tor/F-8/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	7 Dec 2008 10:35:53 -0000	1.14
+++ sources	22 Jan 2009 08:49:31 -0000	1.15
@@ -1,2 +1,2 @@
-fd55489f7ad1ef53c0b0dac857696fc9  tor-0.2.0.32.tar.gz
-5df4502967a3cb3fe8e1c3bb57cf3426  tor-0.2.0.32.tar.gz.asc
+9ad86a956b99b1ab007d459d74348960  tor-0.2.0.33.tar.gz
+b80d82fe493b1cc0ac7d1a72ee180b47  tor-0.2.0.33.tar.gz.asc


Index: lastver
===================================================================
RCS file: /cvs/extras/rpms/tor/F-8/lastver,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- lastver	7 Dec 2008 10:35:53 -0000	1.5
+++ lastver	22 Jan 2009 08:49:31 -0000	1.6
@@ -1 +1 @@
-0.2.0.32
+0.2.0.33


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tor/F-8/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	7 Dec 2008 10:35:53 -0000	1.5
+++ .cvsignore	22 Jan 2009 08:49:31 -0000	1.6
@@ -1,2 +1,2 @@
-tor-0.2.0.32.tar.gz
-tor-0.2.0.32.tar.gz.asc
+tor-0.2.0.33.tar.gz
+tor-0.2.0.33.tar.gz.asc



From ensc at fedoraproject.org  Thu Jan 22 08:50:02 2009
From: ensc at fedoraproject.org (Enrico Scholz)
Date: Thu, 22 Jan 2009 08:50:02 +0000 (UTC)
Subject: rpms/tor/F-10 tor.spec, 1.25, 1.26 sources, 1.14, 1.15 lastver, 1.5,
	1.6 .cvsignore, 1.5, 1.6
Message-ID: <20090122085002.C310D70033@cvs1.fedora.phx.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/tor/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3972/F-10

Modified Files:
	tor.spec sources lastver .cvsignore 
Log Message:
updated to 0.2.0.33 (SECURITY: fixed heap-corruption bug)



Index: tor.spec
===================================================================
RCS file: /cvs/extras/rpms/tor/F-10/tor.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- tor.spec	7 Dec 2008 10:57:44 -0000	1.25
+++ tor.spec	22 Jan 2009 08:49:32 -0000	1.26
@@ -10,7 +10,7 @@
 %{!?release_func:%global release_func() %1%{?dist}}
 
 Name:		tor
-Version:	0.2.0.32
+Version:	0.2.0.33
 Release:	%release_func 1
 Group:		System Environment/Daemons
 License:	BSD
@@ -198,6 +198,9 @@
 
 
 %changelog
+* Thu Jan 22 2009 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.2.0.33-1
+- updated to 0.2.0.33 (SECURITY: fixed heap-corruption bug)
+
 * Sun Dec  7 2008 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.2.0.32-1
 - updated to 0.2.0.32
 - removed -setgroups patch; supplementary groups are now set upstream


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tor/F-10/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	7 Dec 2008 10:36:07 -0000	1.14
+++ sources	22 Jan 2009 08:49:32 -0000	1.15
@@ -1,2 +1,2 @@
-fd55489f7ad1ef53c0b0dac857696fc9  tor-0.2.0.32.tar.gz
-5df4502967a3cb3fe8e1c3bb57cf3426  tor-0.2.0.32.tar.gz.asc
+9ad86a956b99b1ab007d459d74348960  tor-0.2.0.33.tar.gz
+b80d82fe493b1cc0ac7d1a72ee180b47  tor-0.2.0.33.tar.gz.asc


Index: lastver
===================================================================
RCS file: /cvs/extras/rpms/tor/F-10/lastver,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- lastver	7 Dec 2008 10:36:06 -0000	1.5
+++ lastver	22 Jan 2009 08:49:32 -0000	1.6
@@ -1 +1 @@
-0.2.0.32
+0.2.0.33


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tor/F-10/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	7 Dec 2008 10:36:06 -0000	1.5
+++ .cvsignore	22 Jan 2009 08:49:32 -0000	1.6
@@ -1,2 +1,2 @@
-tor-0.2.0.32.tar.gz
-tor-0.2.0.32.tar.gz.asc
+tor-0.2.0.33.tar.gz
+tor-0.2.0.33.tar.gz.asc



From alexlan at fedoraproject.org  Thu Jan 22 09:20:07 2009
From: alexlan at fedoraproject.org (Alex Lancaster)
Date: Thu, 22 Jan 2009 09:20:07 +0000 (UTC)
Subject: rpms/publican/devel publican.spec,1.19,1.20
Message-ID: <20090122092007.8B40170033@cvs1.fedora.phx.redhat.com>

Author: alexlan

Update of /cvs/pkgs/rpms/publican/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7698

Modified Files:
	publican.spec 
Log Message:
* Thu Jan 22 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 0.40-1
- Font changes baekmuk-ttf-fonts-batang -> baekmuk-ttf-batang-fonts to
  fix broken deps in rawhide.



Index: publican.spec
===================================================================
RCS file: /cvs/pkgs/rpms/publican/devel/publican.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- publican.spec	16 Jan 2009 07:03:46 -0000	1.19
+++ publican.spec	22 Jan 2009 09:19:37 -0000	1.20
@@ -6,7 +6,7 @@
 Name:		publican	
 Summary:	Common files and scripts for publishing with DocBook XML
 Version:	0.40
-Release:	0%{?dist}
+Release:	1%{?dist}
 License:	GPLv2+ and GFDL
 # The following directories are licensed under the GFDL:
 #	content, Book_Template, Set_Template, Article_Template
@@ -47,12 +47,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 baekmuk-ttf-fonts-batang
+Requires:	lohit-fonts-tamil lohit-fonts-telugu liberation-fonts baekmuk-ttf-batang-fonts
 
 BuildRequires:	lohit-fonts-bengali cjkunifonts-uming lohit-fonts-gujarati
 BuildRequires:	lohit-fonts-hindi sazanami-fonts-gothic sazanami-fonts-mincho lohit-fonts-kannada
 BuildRequires:	lohit-fonts-malayalam lohit-fonts-oriya lohit-fonts-punjabi lklug-fonts
-BuildRequires:	lohit-fonts-tamil lohit-fonts-telugu liberation-fonts baekmuk-ttf-fonts-batang
+BuildRequires:	lohit-fonts-tamil lohit-fonts-telugu liberation-fonts baekmuk-ttf-batang-fonts
 %endif
 
 URL:		https://fedorahosted.org/publican
@@ -146,6 +146,10 @@
 %doc fdl.txt
 
 %changelog
+* Thu Jan 22 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 0.40-1
+- Font changes baekmuk-ttf-fonts-batang -> baekmuk-ttf-batang-fonts to
+  fix broken deps in rawhide
+
 * Mon Jan 5 2009 Jeff Fearn <jfearn at redhat.com> 0.40
 - Fix DRAFT mode in web docs.
 - Fix TOC CSS spacing.



From kwizart at fedoraproject.org  Thu Jan 22 09:22:20 2009
From: kwizart at fedoraproject.org (Chauvet Nicolas)
Date: Thu, 22 Jan 2009 09:22:20 +0000 (UTC)
Subject: rpms/jrosetta/devel import.log, NONE, 1.1 jrosetta.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090122092220.D2A1C70033@cvs1.fedora.phx.redhat.com>

Author: kwizart

Update of /cvs/pkgs/rpms/jrosetta/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8120/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log jrosetta.spec 
Log Message:
Import for Rawhide



--- NEW FILE import.log ---
jrosetta-1_0_2-1_fc10:HEAD:jrosetta-1.0.2-1.fc10.src.rpm:1232616066


--- NEW FILE jrosetta.spec ---
Name:           jrosetta
Version:        1.0.2
Release:        1%{?dist}
Summary:        A common base to build a graphical console

Group:          Development/Libraries
License:        GPLv2
URL:            http://dev.artenum.com/projects/JRosetta/
#http://dev.artenum.com/projects/JRosetta/download/JRosetta-1-0-2/data/src-gpl?action=download&nodecorator
Source0:        %{name}-%{version}-gpl.zip
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch

BuildRequires:  java-devel >= 0:1.5
BuildRequires:  jpackage-utils >= 0:1.5
BuildRequires:  ant
Requires:       java >= 0:1.5
Requires:       jpackage-utils >= 0:1.5


%description
JRosetta provides a common base for graphical component that could be used
to build a graphical console in Swing with the latest requirements, such as
command history, completion and so on for instance for scripting language
or command line.


%prep
%setup -q -n %{name}-%{version}-gpl
#wrong-file-end-of-line-encoding
cp -p CHANGE.txt CHANGE.txt.CRLF
sed -i -e 's/\r//' CHANGE.txt
touch -r CHANGE.txt.CRLF CHANGE.txt
rm CHANGE.txt.CRLF



%build
%ant make


%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_javadir}

for j in jrosetta-API jrosetta-engine ; do
  install -pm 0644 dist/${j}.jar $RPM_BUILD_ROOT%{_javadir}/${j}-%{version}.jar
  ln -fs ${j}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/${j}.jar
done


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc CHANGE.txt COPYRIGHT LICENSE.txt
%{_javadir}/jrosetta*.jar


%changelog
* Fri Jan 16 2009 kwizart < kwizart at gmail.com > - 1.0.2-1
- Fix License (GPLv2 only)
- Fix Summary
- Update to 1.0.2 - previous patch merged upstream

* Mon Oct 27 2008 kwizart < kwizart at gmail.com > - 1.0.1-1
- Initial Package 



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/jrosetta/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	20 Jan 2009 21:19:53 -0000	1.1
+++ .cvsignore	22 Jan 2009 09:21:50 -0000	1.2
@@ -0,0 +1 @@
+jrosetta-1.0.2-gpl.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/jrosetta/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	20 Jan 2009 21:19:53 -0000	1.1
+++ sources	22 Jan 2009 09:21:50 -0000	1.2
@@ -0,0 +1 @@
+3a618078c118216eb2351e5db6e14a7d  jrosetta-1.0.2-gpl.zip



From kwizart at fedoraproject.org  Thu Jan 22 09:25:32 2009
From: kwizart at fedoraproject.org (Chauvet Nicolas)
Date: Thu, 22 Jan 2009 09:25:32 +0000 (UTC)
Subject: rpms/jrosetta/F-10 import.log, NONE, 1.1 jrosetta.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090122092532.2F16A70033@cvs1.fedora.phx.redhat.com>

Author: kwizart

Update of /cvs/pkgs/rpms/jrosetta/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8523/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	import.log jrosetta.spec 
Log Message:
Import for F-10



--- NEW FILE import.log ---
jrosetta-1_0_2-1_fc10:F-10:jrosetta-1.0.2-1.fc10.src.rpm:1232616258


--- NEW FILE jrosetta.spec ---
Name:           jrosetta
Version:        1.0.2
Release:        1%{?dist}
Summary:        A common base to build a graphical console

Group:          Development/Libraries
License:        GPLv2
URL:            http://dev.artenum.com/projects/JRosetta/
#http://dev.artenum.com/projects/JRosetta/download/JRosetta-1-0-2/data/src-gpl?action=download&nodecorator
Source0:        %{name}-%{version}-gpl.zip
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch

BuildRequires:  java-devel >= 0:1.5
BuildRequires:  jpackage-utils >= 0:1.5
BuildRequires:  ant
Requires:       java >= 0:1.5
Requires:       jpackage-utils >= 0:1.5


%description
JRosetta provides a common base for graphical component that could be used
to build a graphical console in Swing with the latest requirements, such as
command history, completion and so on for instance for scripting language
or command line.


%prep
%setup -q -n %{name}-%{version}-gpl
#wrong-file-end-of-line-encoding
cp -p CHANGE.txt CHANGE.txt.CRLF
sed -i -e 's/\r//' CHANGE.txt
touch -r CHANGE.txt.CRLF CHANGE.txt
rm CHANGE.txt.CRLF



%build
%ant make


%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_javadir}

for j in jrosetta-API jrosetta-engine ; do
  install -pm 0644 dist/${j}.jar $RPM_BUILD_ROOT%{_javadir}/${j}-%{version}.jar
  ln -fs ${j}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/${j}.jar
done


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc CHANGE.txt COPYRIGHT LICENSE.txt
%{_javadir}/jrosetta*.jar


%changelog
* Fri Jan 16 2009 kwizart < kwizart at gmail.com > - 1.0.2-1
- Fix License (GPLv2 only)
- Fix Summary
- Update to 1.0.2 - previous patch merged upstream

* Mon Oct 27 2008 kwizart < kwizart at gmail.com > - 1.0.1-1
- Initial Package 



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/jrosetta/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	20 Jan 2009 21:19:53 -0000	1.1
+++ .cvsignore	22 Jan 2009 09:25:01 -0000	1.2
@@ -0,0 +1 @@
+jrosetta-1.0.2-gpl.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/jrosetta/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	20 Jan 2009 21:19:53 -0000	1.1
+++ sources	22 Jan 2009 09:25:01 -0000	1.2
@@ -0,0 +1 @@
+3a618078c118216eb2351e5db6e14a7d  jrosetta-1.0.2-gpl.zip



From kwizart at fedoraproject.org  Thu Jan 22 09:27:29 2009
From: kwizart at fedoraproject.org (Chauvet Nicolas)
Date: Thu, 22 Jan 2009 09:27:29 +0000 (UTC)
Subject: rpms/jrosetta/EL-5 import.log, NONE, 1.1 jrosetta.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090122092729.B75DD70033@cvs1.fedora.phx.redhat.com>

Author: kwizart

Update of /cvs/pkgs/rpms/jrosetta/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8845/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	import.log jrosetta.spec 
Log Message:
Import for EL-5



--- NEW FILE import.log ---
jrosetta-1_0_2-1_fc10:EL-5:jrosetta-1.0.2-1.fc10.src.rpm:1232616360


--- NEW FILE jrosetta.spec ---
Name:           jrosetta
Version:        1.0.2
Release:        1%{?dist}
Summary:        A common base to build a graphical console

Group:          Development/Libraries
License:        GPLv2
URL:            http://dev.artenum.com/projects/JRosetta/
#http://dev.artenum.com/projects/JRosetta/download/JRosetta-1-0-2/data/src-gpl?action=download&nodecorator
Source0:        %{name}-%{version}-gpl.zip
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch

BuildRequires:  java-devel >= 0:1.5
BuildRequires:  jpackage-utils >= 0:1.5
BuildRequires:  ant
Requires:       java >= 0:1.5
Requires:       jpackage-utils >= 0:1.5


%description
JRosetta provides a common base for graphical component that could be used
to build a graphical console in Swing with the latest requirements, such as
command history, completion and so on for instance for scripting language
or command line.


%prep
%setup -q -n %{name}-%{version}-gpl
#wrong-file-end-of-line-encoding
cp -p CHANGE.txt CHANGE.txt.CRLF
sed -i -e 's/\r//' CHANGE.txt
touch -r CHANGE.txt.CRLF CHANGE.txt
rm CHANGE.txt.CRLF



%build
%ant make


%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_javadir}

for j in jrosetta-API jrosetta-engine ; do
  install -pm 0644 dist/${j}.jar $RPM_BUILD_ROOT%{_javadir}/${j}-%{version}.jar
  ln -fs ${j}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/${j}.jar
done


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc CHANGE.txt COPYRIGHT LICENSE.txt
%{_javadir}/jrosetta*.jar


%changelog
* Fri Jan 16 2009 kwizart < kwizart at gmail.com > - 1.0.2-1
- Fix License (GPLv2 only)
- Fix Summary
- Update to 1.0.2 - previous patch merged upstream

* Mon Oct 27 2008 kwizart < kwizart at gmail.com > - 1.0.1-1
- Initial Package 



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/jrosetta/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	20 Jan 2009 21:19:53 -0000	1.1
+++ .cvsignore	22 Jan 2009 09:26:59 -0000	1.2
@@ -0,0 +1 @@
+jrosetta-1.0.2-gpl.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/jrosetta/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	20 Jan 2009 21:19:53 -0000	1.1
+++ sources	22 Jan 2009 09:26:59 -0000	1.2
@@ -0,0 +1 @@
+3a618078c118216eb2351e5db6e14a7d  jrosetta-1.0.2-gpl.zip



From jnovy at fedoraproject.org  Thu Jan 22 09:38:45 2009
From: jnovy at fedoraproject.org (Jindrich Novy)
Date: Thu, 22 Jan 2009 09:38:45 +0000 (UTC)
Subject: rpms/netpbm/devel netpbm-10.35-64bitfix.patch, NONE, 1.1 netpbm.spec,
	1.128, 1.129
Message-ID: <20090122093845.7644370033@cvs1.fedora.phx.redhat.com>

Author: jnovy

Update of /cvs/pkgs/rpms/netpbm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10742

Modified Files:
	netpbm.spec 
Added Files:
	netpbm-10.35-64bitfix.patch 
Log Message:
* Thu Jan 22 2009 Jindrich Novy <jnovy at redhat.com> 10.35.58-3
- fix cmuwmtopbm and other utilities by making endianess
  functions work correctly on 64bit systems (#476863)


netpbm-10.35-64bitfix.patch:

--- NEW FILE netpbm-10.35-64bitfix.patch ---
diff -up netpbm-10.35.58/lib/libpm.c.64bitfix netpbm-10.35.58/lib/libpm.c
--- netpbm-10.35.58/lib/libpm.c.64bitfix	2009-01-22 08:49:25.000000000 +0100
+++ netpbm-10.35.58/lib/libpm.c	2009-01-22 08:50:38.000000000 +0100
@@ -1069,7 +1069,7 @@
 pm_readbiglong(FILE * const ifP, 
                long * const lP) {
 
-    int c;
+    unsigned int c;
     unsigned long l;
 
     c = getc(ifP);
@@ -1148,7 +1148,7 @@
 int
 pm_readlittlelong(FILE * const ifP, 
                   long * const lP) {
-    int c;
+    unsigned int c;
     unsigned long l;
 
     c = getc(ifP);


Index: netpbm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/netpbm/devel/netpbm.spec,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -r1.128 -r1.129
--- netpbm.spec	21 Jan 2009 07:25:24 -0000	1.128
+++ netpbm.spec	22 Jan 2009 09:38:13 -0000	1.129
@@ -1,7 +1,7 @@
 Summary: A library for handling different graphics file formats
 Name: netpbm
 Version: 10.35.58
-Release: 2%{?dist}
+Release: 3%{?dist}
 # See copyright_summary for details
 License: BSD and GPLv2 and IJG and MIT and Public Domain
 Group: System Environment/Libraries
@@ -33,6 +33,7 @@
 Patch21: netpbm-10.35-pamtosvgsegfault.patch
 Patch22: netpbm-10.35-pnmmontagefix.patch
 Patch23: netpbm-10.35-pnmtofiasco-stdin.patch
+Patch24: netpbm-10.35-64bitfix.patch
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: libjpeg-devel, libpng-devel, libtiff-devel, flex
 BuildRequires: libX11-devel, python, jasper-devel
@@ -96,6 +97,7 @@
 %patch21 -p1 -b .pamtosvgsegfault
 %patch22 -p1 -b .pnmmontagefix
 %patch23 -p1 -b .pnmtofiasco-stdin
+%patch24 -p1 -b .64bitfix
 
 ##mv shhopt/shhopt.h shhopt/pbmshhopt.h
 ##perl -pi -e 's|shhopt.h|pbmshhopt.h|g' `find -name "*.c" -o -name "*.h"` ./GNUmakefile
@@ -223,6 +225,10 @@
 %{_datadir}/netpbm/
 
 %changelog
+* Thu Jan 22 2009 Jindrich Novy <jnovy at redhat.com> 10.35.58-3
+- fix cmuwmtopbm and other utilities by making endianess
+  functions work correctly on 64bit systems (#476863)
+
 * Wed Jan 21 2009 Jindrich Novy <jnovy at redhat.com> 10.35.58-2
 - fix pnmtofiasco to accept image from stdin (#476989, #227283)
 



From dnovotny at fedoraproject.org  Thu Jan 22 09:45:28 2009
From: dnovotny at fedoraproject.org (Daniel Novotny)
Date: Thu, 22 Jan 2009 09:45:28 +0000 (UTC)
Subject: rpms/emacs/F-10 emacs.spec,1.113,1.114
Message-ID: <20090122094528.5670870033@cvs1.fedora.phx.redhat.com>

Author: dnovotny

Update of /cvs/extras/rpms/emacs/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11480

Modified Files:
	emacs.spec 
Log Message:

font dependency changed from 100dpi to 75dpi



Index: emacs.spec
===================================================================
RCS file: /cvs/extras/rpms/emacs/F-10/emacs.spec,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -r1.113 -r1.114
--- emacs.spec	18 Jan 2009 16:31:17 -0000	1.113
+++ emacs.spec	22 Jan 2009 09:44:57 -0000	1.114
@@ -4,7 +4,7 @@
 Name: emacs
 Epoch: 1
 Version: 22.3
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv3+
 URL: http://www.gnu.org/software/emacs/
 Group: Applications/Editors
@@ -37,7 +37,7 @@
 %ifarch %{ix86}
 BuildRequires: setarch
 %endif
-Requires: xorg-x11-fonts-ISO8859-1-100dpi
+Requires: xorg-x11-fonts-ISO8859-1-75dpi
 Requires: emacs-common = %{epoch}:%{version}-%{release}
 Conflicts: gettext < 0.10.40
 Provides: emacs(bin)
@@ -330,6 +330,9 @@
 %dir %{_datadir}/emacs/%{version}
 
 %changelog
+* Thu Jan 22 2009 Daniel Novotny <dnovotny at redhat.com> 1:22.3-3
+- font dependency changed from 100dpi to 75dpi (the font was too large)
+
 * Sun Jan 18 2009 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 1:22.3-2
 - Add /etc/rpm/macros.emacs file
 



From than at fedoraproject.org  Thu Jan 22 09:56:48 2009
From: than at fedoraproject.org (Than Ngo)
Date: Thu, 22 Jan 2009 09:56:48 +0000 (UTC)
Subject: rpms/kdeaccessibility/devel .cvsignore, 1.35,
	1.36 kdeaccessibility.spec, 1.71, 1.72 sources, 1.36, 1.37
Message-ID: <20090122095648.30C7170033@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdeaccessibility/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12728

Modified Files:
	.cvsignore kdeaccessibility.spec sources 
Log Message:
4.2.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdeaccessibility/devel/.cvsignore,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- .cvsignore	7 Jan 2009 14:40:20 -0000	1.35
+++ .cvsignore	22 Jan 2009 09:56:17 -0000	1.36
@@ -2,3 +2,4 @@
 kdeaccessibility-4.1.80.tar.bz2
 kdeaccessibility-4.1.85.tar.bz2
 kdeaccessibility-4.1.96.tar.bz2
+kdeaccessibility-4.2.0.tar.bz2


Index: kdeaccessibility.spec
===================================================================
RCS file: /cvs/extras/rpms/kdeaccessibility/devel/kdeaccessibility.spec,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- kdeaccessibility.spec	15 Jan 2009 00:44:13 -0000	1.71
+++ kdeaccessibility.spec	22 Jan 2009 09:56:17 -0000	1.72
@@ -1,8 +1,8 @@
 Summary:        K Desktop Environment - Accessibility
 Name:           kdeaccessibility
 Epoch:          1
-Version:        4.1.96
-Release:        2%{?dist}
+Version:        4.2.0
+Release:        1%{?dist}
 
 Group:          User Interface/Desktops
 License:        GPLv2
@@ -101,6 +101,9 @@
 
 
 %changelog
+* Thu Jan 22 2009 Than Ngo <than at redhat.com> - 4.2.0-1
+- 4.2.0
+
 * Fri Jan 09 2009 Lorenzo Villani <lvillani at binaryhelix.net> - 1:4.1.96-2
 - rebuilt
 - fix file list


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdeaccessibility/devel/sources,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- sources	7 Jan 2009 14:40:20 -0000	1.36
+++ sources	22 Jan 2009 09:56:17 -0000	1.37
@@ -1 +1 @@
-13d430b62f0b345b7e53b54e9236550d  kdeaccessibility-4.1.96.tar.bz2
+f32f24c4f07906b7af39ca18d47b5e27  kdeaccessibility-4.2.0.tar.bz2



From than at fedoraproject.org  Thu Jan 22 09:59:55 2009
From: than at fedoraproject.org (Than Ngo)
Date: Thu, 22 Jan 2009 09:59:55 +0000 (UTC)
Subject: rpms/kdeadmin/devel .cvsignore, 1.56, 1.57 kdeadmin.spec, 1.121,
	1.122 sources, 1.58, 1.59
Message-ID: <20090122095955.16A1F70142@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdeadmin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13228

Modified Files:
	.cvsignore kdeadmin.spec sources 
Log Message:
4.2.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdeadmin/devel/.cvsignore,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- .cvsignore	7 Jan 2009 14:58:59 -0000	1.56
+++ .cvsignore	22 Jan 2009 09:59:24 -0000	1.57
@@ -2,3 +2,4 @@
 kdeadmin-4.1.80.tar.bz2
 kdeadmin-4.1.85.tar.bz2
 kdeadmin-4.1.96.tar.bz2
+kdeadmin-4.2.0.tar.bz2


Index: kdeadmin.spec
===================================================================
RCS file: /cvs/extras/rpms/kdeadmin/devel/kdeadmin.spec,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -r1.121 -r1.122
--- kdeadmin.spec	15 Jan 2009 01:22:34 -0000	1.121
+++ kdeadmin.spec	22 Jan 2009 09:59:24 -0000	1.122
@@ -1,7 +1,7 @@
 Name:           kdeadmin
 Epoch:          7
-Version:        4.1.96
-Release:        2%{?dist}
+Version:        4.2.0
+Release:        1%{?dist}
 Summary:        K Desktop Environment - Administrative tools
 
 Group:          User Interface/Desktops
@@ -133,6 +133,9 @@
 
 
 %changelog
+* Thu Jan 22 2009 Than Ngo <than at redhat.com> - 4.2.0-1
+- 4.2.0
+
 * Wed Jan 14 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.1.96-2
 - include system-config-printer-kde
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdeadmin/devel/sources,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- sources	7 Jan 2009 14:58:59 -0000	1.58
+++ sources	22 Jan 2009 09:59:24 -0000	1.59
@@ -1 +1 @@
-6c7af1887587a5f864344550fa6c9af0  kdeadmin-4.1.96.tar.bz2
+2c5b33477b5679bcd9fdbc1f8017e6fb  kdeadmin-4.2.0.tar.bz2



From than at fedoraproject.org  Thu Jan 22 10:04:45 2009
From: than at fedoraproject.org (Than Ngo)
Date: Thu, 22 Jan 2009 10:04:45 +0000 (UTC)
Subject: rpms/kdeartwork/devel .cvsignore, 1.54, 1.55 kdeartwork.spec, 1.97, 
	1.98 sources, 1.56, 1.57
Message-ID: <20090122100445.8988E70033@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdeartwork/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14404

Modified Files:
	.cvsignore kdeartwork.spec sources 
Log Message:
4.2.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdeartwork/devel/.cvsignore,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- .cvsignore	7 Jan 2009 15:10:05 -0000	1.54
+++ .cvsignore	22 Jan 2009 10:04:15 -0000	1.55
@@ -1,2 +1,3 @@
 kdeartwork-4.1.85.tar.bz2
 kdeartwork-4.1.96.tar.bz2
+kdeartwork-4.2.0.tar.bz2


Index: kdeartwork.spec
===================================================================
RCS file: /cvs/extras/rpms/kdeartwork/devel/kdeartwork.spec,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -r1.97 -r1.98
--- kdeartwork.spec	10 Jan 2009 22:11:24 -0000	1.97
+++ kdeartwork.spec	22 Jan 2009 10:04:15 -0000	1.98
@@ -1,6 +1,6 @@
 Name:           kdeartwork
-Version:        4.1.96
-Release:        2%{?dist}
+Version:        4.2.0
+Release:        1%{?dist}
 Summary:        Additional artwork (themes, sound themes, ...) for KDE
 
 License:        GPLv2
@@ -168,6 +168,9 @@
 
 
 %changelog
+* Thu Jan 22 2009 Than Ngo <than at redhat.com> - 4.2.0-1
+- 4.2.0
+
 * Sat Jan 10 2009 Than Ngo <than at redhat.com> - 4.1.96-2
 - fix file list
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdeartwork/devel/sources,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- sources	7 Jan 2009 15:10:05 -0000	1.56
+++ sources	22 Jan 2009 10:04:15 -0000	1.57
@@ -1 +1 @@
-2c4f0cd7bf767551df395645248d5cb8  kdeartwork-4.1.96.tar.bz2
+d81623b60c7deb314bc2e28a52254ac2  kdeartwork-4.2.0.tar.bz2



From than at fedoraproject.org  Thu Jan 22 10:06:04 2009
From: than at fedoraproject.org (Than Ngo)
Date: Thu, 22 Jan 2009 10:06:04 +0000 (UTC)
Subject: rpms/kdeartwork/devel kdeartwork.spec,1.98,1.99
Message-ID: <20090122100604.A0DF070033@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdeartwork/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14536

Modified Files:
	kdeartwork.spec 
Log Message:
4.2.0



Index: kdeartwork.spec
===================================================================
RCS file: /cvs/extras/rpms/kdeartwork/devel/kdeartwork.spec,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -r1.98 -r1.99
--- kdeartwork.spec	22 Jan 2009 10:04:15 -0000	1.98
+++ kdeartwork.spec	22 Jan 2009 10:05:34 -0000	1.99
@@ -6,7 +6,7 @@
 License:        GPLv2
 Group:          User Interface/Desktops
 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
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 #ifarch noarch



From than at fedoraproject.org  Thu Jan 22 10:08:22 2009
From: than at fedoraproject.org (Than Ngo)
Date: Thu, 22 Jan 2009 10:08:22 +0000 (UTC)
Subject: rpms/kdeaccessibility/devel kdeaccessibility.spec,1.72,1.73
Message-ID: <20090122100822.C595270033@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdeaccessibility/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14796

Modified Files:
	kdeaccessibility.spec 
Log Message:
fix url



Index: kdeaccessibility.spec
===================================================================
RCS file: /cvs/extras/rpms/kdeaccessibility/devel/kdeaccessibility.spec,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- kdeaccessibility.spec	22 Jan 2009 09:56:17 -0000	1.72
+++ kdeaccessibility.spec	22 Jan 2009 10:07:52 -0000	1.73
@@ -7,7 +7,7 @@
 Group:          User Interface/Desktops
 License:        GPLv2
 URL:            http://accessibility.kde.org/
-Source0:        ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdeaccessibility-%{version}.tar.bz2
+Source0:        ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdeaccessibility-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: alsa-lib-devel



From mhlavink at fedoraproject.org  Thu Jan 22 10:08:50 2009
From: mhlavink at fedoraproject.org (Michal Hlavinka)
Date: Thu, 22 Jan 2009 10:08:50 +0000 (UTC)
Subject: rpms/apcupsd/devel .cvsignore, 1.12, 1.13 apcupsd-3.14.3-init.patch,
	1.1, 1.2 apcupsd.spec, 1.28, 1.29 sources, 1.12, 1.13
Message-ID: <20090122100850.4103B70033@cvs1.fedora.phx.redhat.com>

Author: mhlavink

Update of /cvs/extras/rpms/apcupsd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14865

Modified Files:
	.cvsignore apcupsd-3.14.3-init.patch apcupsd.spec sources 
Log Message:
update to 3.14.5



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/apcupsd/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	28 May 2008 08:53:42 -0000	1.12
+++ .cvsignore	22 Jan 2009 10:08:19 -0000	1.13
@@ -1 +1 @@
-apcupsd-3.14.4.tar.gz
+apcupsd-3.14.5.tar.gz

apcupsd-3.14.3-init.patch:

Index: apcupsd-3.14.3-init.patch
===================================================================
RCS file: /cvs/extras/rpms/apcupsd/devel/apcupsd-3.14.3-init.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- apcupsd-3.14.3-init.patch	28 May 2008 08:53:42 -0000	1.1
+++ apcupsd-3.14.3-init.patch	22 Jan 2009 10:08:19 -0000	1.2
@@ -1,6 +1,6 @@
-diff -up apcupsd-3.14.3/platforms/redhat/apcupsd.in.init apcupsd-3.14.3/platforms/redhat/apcupsd.in
---- apcupsd-3.14.3/platforms/redhat/apcupsd.in.init	2007-04-24 01:35:33.000000000 +0200
-+++ apcupsd-3.14.3/platforms/redhat/apcupsd.in	2008-05-28 09:05:39.000000000 +0200
+diff -up apcupsd-3.14.5/platforms/redhat/apcupsd.in.init apcupsd-3.14.5/platforms/redhat/apcupsd.in
+--- apcupsd-3.14.5/platforms/redhat/apcupsd.in.init	2008-11-01 16:03:26.000000000 +0100
++++ apcupsd-3.14.5/platforms/redhat/apcupsd.in	2009-01-22 10:58:00.429886991 +0100
 @@ -3,9 +3,19 @@
  # apcupsd      This shell script takes care of starting and stopping
  #	       the apcupsd UPS monitoring daemon.
@@ -21,8 +21,8 @@
 +
  APCPID=@PIDDIR@/apcupsd.pid
  
- if test -f /etc/whitebox-release ; then
-@@ -44,9 +54,11 @@ case "$1" in
+ # Source function libarary
+@@ -30,9 +40,11 @@ case "$1" in
         ;;
      restart|force-reload)
         $0 stop
@@ -35,7 +35,7 @@
      reload)
         echo "$0: reload not implemented"
         exit 3
-@@ -62,7 +74,7 @@ case "$1" in
+@@ -48,7 +60,7 @@ case "$1" in
         fi
         ;;
      *)


Index: apcupsd.spec
===================================================================
RCS file: /cvs/extras/rpms/apcupsd/devel/apcupsd.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- apcupsd.spec	15 Jan 2009 12:37:35 -0000	1.28
+++ apcupsd.spec	22 Jan 2009 10:08:19 -0000	1.29
@@ -1,6 +1,6 @@
 Name:         apcupsd
-Version:      3.14.4
-Release:      3%{?dist}
+Version:      3.14.5
+Release:      1%{?dist}
 Summary:      APC UPS Power Control Daemon for Linux
 
 Group:        System Environment/Daemons
@@ -110,7 +110,7 @@
         ${RPM_BUILD_ROOT}%{_datadir}/applications/gapcmon.desktop
 
 # Cleanup for later %doc processing
-chmod -x examples/*.conf examples/*.c
+chmod -x examples/*.c
 rm examples/*.in
 
 
@@ -171,6 +171,9 @@
 
 
 %changelog
+* Thu Jan 22 2009 Michal Hlavinka <mhlavink at redhat.com> - 3.14.5-1
+- update to 3.14.5
+
 * Thu Jan 15 2009 Tomas Mraz <tmraz at redhat.com> - 3.14.4-3
 - rebuild with new openssl
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/apcupsd/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	28 May 2008 08:53:42 -0000	1.12
+++ sources	22 Jan 2009 10:08:19 -0000	1.13
@@ -1 +1 @@
-78811129db1a882b9a2b9afd540470b3  apcupsd-3.14.4.tar.gz
+4ac73ec91d8ab56f3fac894e172567c4  apcupsd-3.14.5.tar.gz



From than at fedoraproject.org  Thu Jan 22 10:10:33 2009
From: than at fedoraproject.org (Than Ngo)
Date: Thu, 22 Jan 2009 10:10:33 +0000 (UTC)
Subject: rpms/kdeadmin/devel kdeadmin.spec,1.122,1.123
Message-ID: <20090122101033.D336D70033@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdeadmin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15134

Modified Files:
	kdeadmin.spec 
Log Message:
fix url



Index: kdeadmin.spec
===================================================================
RCS file: /cvs/extras/rpms/kdeadmin/devel/kdeadmin.spec,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -r1.122 -r1.123
--- kdeadmin.spec	22 Jan 2009 09:59:24 -0000	1.122
+++ kdeadmin.spec	22 Jan 2009 10:10:03 -0000	1.123
@@ -7,7 +7,7 @@
 Group:          User Interface/Desktops
 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
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source1:        kuser.pam



From pkgdb at fedoraproject.org  Thu Jan 22 10:12:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Jan 2009 10:12:42 +0000
Subject: [pkgdb] fedora-rpmdevtools: psklenar has requested watchcommits
Message-ID: <20090122101242.38A1F208470@bastion.fedora.phx.redhat.com>

psklenar has requested the watchcommits acl on fedora-rpmdevtools (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fedora-rpmdevtools



From mhlavink at fedoraproject.org  Thu Jan 22 10:14:34 2009
From: mhlavink at fedoraproject.org (Michal Hlavinka)
Date: Thu, 22 Jan 2009 10:14:34 +0000 (UTC)
Subject: rpms/apcupsd/F-10 .cvsignore, 1.12, 1.13 apcupsd-3.14.3-init.patch, 
	1.1, 1.2 apcupsd.spec, 1.27, 1.28 sources, 1.12, 1.13
Message-ID: <20090122101434.752D270033@cvs1.fedora.phx.redhat.com>

Author: mhlavink

Update of /cvs/extras/rpms/apcupsd/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15743

Modified Files:
	.cvsignore apcupsd-3.14.3-init.patch apcupsd.spec sources 
Log Message:
updated to 3.14.5



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/apcupsd/F-10/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	28 May 2008 08:53:42 -0000	1.12
+++ .cvsignore	22 Jan 2009 10:14:04 -0000	1.13
@@ -1 +1 @@
-apcupsd-3.14.4.tar.gz
+apcupsd-3.14.5.tar.gz

apcupsd-3.14.3-init.patch:

Index: apcupsd-3.14.3-init.patch
===================================================================
RCS file: /cvs/extras/rpms/apcupsd/F-10/apcupsd-3.14.3-init.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- apcupsd-3.14.3-init.patch	28 May 2008 08:53:42 -0000	1.1
+++ apcupsd-3.14.3-init.patch	22 Jan 2009 10:14:04 -0000	1.2
@@ -1,6 +1,6 @@
-diff -up apcupsd-3.14.3/platforms/redhat/apcupsd.in.init apcupsd-3.14.3/platforms/redhat/apcupsd.in
---- apcupsd-3.14.3/platforms/redhat/apcupsd.in.init	2007-04-24 01:35:33.000000000 +0200
-+++ apcupsd-3.14.3/platforms/redhat/apcupsd.in	2008-05-28 09:05:39.000000000 +0200
+diff -up apcupsd-3.14.5/platforms/redhat/apcupsd.in.init apcupsd-3.14.5/platforms/redhat/apcupsd.in
+--- apcupsd-3.14.5/platforms/redhat/apcupsd.in.init	2008-11-01 16:03:26.000000000 +0100
++++ apcupsd-3.14.5/platforms/redhat/apcupsd.in	2009-01-22 10:58:00.429886991 +0100
 @@ -3,9 +3,19 @@
  # apcupsd      This shell script takes care of starting and stopping
  #	       the apcupsd UPS monitoring daemon.
@@ -21,8 +21,8 @@
 +
  APCPID=@PIDDIR@/apcupsd.pid
  
- if test -f /etc/whitebox-release ; then
-@@ -44,9 +54,11 @@ case "$1" in
+ # Source function libarary
+@@ -30,9 +40,11 @@ case "$1" in
         ;;
      restart|force-reload)
         $0 stop
@@ -35,7 +35,7 @@
      reload)
         echo "$0: reload not implemented"
         exit 3
-@@ -62,7 +74,7 @@ case "$1" in
+@@ -48,7 +60,7 @@ case "$1" in
         fi
         ;;
      *)


Index: apcupsd.spec
===================================================================
RCS file: /cvs/extras/rpms/apcupsd/F-10/apcupsd.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- apcupsd.spec	6 Jun 2008 09:52:12 -0000	1.27
+++ apcupsd.spec	22 Jan 2009 10:14:04 -0000	1.28
@@ -1,6 +1,6 @@
 Name:         apcupsd
-Version:      3.14.4
-Release:      2%{?dist}
+Version:      3.14.5
+Release:      1%{?dist}
 Summary:      APC UPS Power Control Daemon for Linux
 
 Group:        System Environment/Daemons
@@ -110,7 +110,7 @@
         ${RPM_BUILD_ROOT}%{_datadir}/applications/gapcmon.desktop
 
 # Cleanup for later %doc processing
-chmod -x examples/*.conf examples/*.c
+chmod -x examples/*.c
 rm examples/*.in
 
 
@@ -171,6 +171,9 @@
 
 
 %changelog
+* Thu Jan 22 2009 Michal Hlavinka <mhlavink at redhat.com> - 3.14.5-1
+- updated to 3.14.5
+
 * Fri Jun 06 2008 Tomas Smetana <tsmetana at redhat.com> - 3.14.4-2
 - drop useless build requirements
 - fix #448637 - hosts.conf and multimon.conf should be in apcupsd-cgi


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/apcupsd/F-10/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	28 May 2008 08:53:42 -0000	1.12
+++ sources	22 Jan 2009 10:14:04 -0000	1.13
@@ -1 +1 @@
-78811129db1a882b9a2b9afd540470b3  apcupsd-3.14.4.tar.gz
+4ac73ec91d8ab56f3fac894e172567c4  apcupsd-3.14.5.tar.gz



From jnovy at fedoraproject.org  Thu Jan 22 10:15:21 2009
From: jnovy at fedoraproject.org (Jindrich Novy)
Date: Thu, 22 Jan 2009 10:15:21 +0000 (UTC)
Subject: rpms/gphoto2/devel .cvsignore, 1.20, 1.21 gphoto2.spec, 1.97,
	1.98 sources, 1.22, 1.23
Message-ID: <20090122101521.9CA3470033@cvs1.fedora.phx.redhat.com>

Author: jnovy

Update of /cvs/pkgs/rpms/gphoto2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15942

Modified Files:
	.cvsignore gphoto2.spec sources 
Log Message:
* Thu Jan 22 2009 Jindrich Novy <jnovy at redhat.com> 2.4.4-1
- update to 2.4.4



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gphoto2/devel/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- .cvsignore	20 Oct 2008 10:25:33 -0000	1.20
+++ .cvsignore	22 Jan 2009 10:14:51 -0000	1.21
@@ -1 +1 @@
-gphoto2-2.4.3.tar.bz2
+gphoto2-2.4.4.tar.bz2


Index: gphoto2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gphoto2/devel/gphoto2.spec,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -r1.97 -r1.98
--- gphoto2.spec	20 Oct 2008 10:25:33 -0000	1.97
+++ gphoto2.spec	22 Jan 2009 10:14:51 -0000	1.98
@@ -1,6 +1,6 @@
 Summary: Software for accessing digital cameras
 Name: gphoto2
-Version: 2.4.3
+Version: 2.4.4
 Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/Multimedia
@@ -51,6 +51,9 @@
 %{_mandir}/man1/gphoto2.1*
 
 %changelog
+* Thu Jan 22 2009 Jindrich Novy <jnovy at redhat.com> 2.4.4-1
+- update to 2.4.4
+
 * Mon Oct 20 2008 Jindrich Novy <jnovy at redhat.com> 2.4.3-1
 - update to 2.4.3
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gphoto2/devel/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- sources	20 Oct 2008 10:25:33 -0000	1.22
+++ sources	22 Jan 2009 10:14:51 -0000	1.23
@@ -1 +1 @@
-561bcf2beac539431017c6302e0237a6  gphoto2-2.4.3.tar.bz2
+bcc5621e09802e114c7f72a6f6172230  gphoto2-2.4.4.tar.bz2



From than at fedoraproject.org  Thu Jan 22 10:15:36 2009
From: than at fedoraproject.org (Than Ngo)
Date: Thu, 22 Jan 2009 10:15:36 +0000 (UTC)
Subject: rpms/kdebase/devel .cvsignore, 1.82, 1.83 kdebase.spec, 1.355,
	1.356 sources, 1.105, 1.106
Message-ID: <20090122101536.EB13770033@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdebase/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15989

Modified Files:
	.cvsignore kdebase.spec sources 
Log Message:
4.2.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdebase/devel/.cvsignore,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -r1.82 -r1.83
--- .cvsignore	7 Jan 2009 15:19:45 -0000	1.82
+++ .cvsignore	22 Jan 2009 10:15:06 -0000	1.83
@@ -2,3 +2,4 @@
 kdebase-4.1.80.tar.bz2
 kdebase-4.1.85.tar.bz2
 kdebase-4.1.96.tar.bz2
+kdebase-4.2.0.tar.bz2


Index: kdebase.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebase/devel/kdebase.spec,v
retrieving revision 1.355
retrieving revision 1.356
diff -u -r1.355 -r1.356
--- kdebase.spec	8 Jan 2009 23:44:07 -0000	1.355
+++ kdebase.spec	22 Jan 2009 10:15:06 -0000	1.356
@@ -1,5 +1,5 @@
 Summary: K Desktop Environment 4 - Core Files
-Version: 4.1.96
+Version: 4.2.0
 Release: 1%{?dist}
 
 %if 0%{?fedora} > 8
@@ -21,7 +21,7 @@
 License: GPLv2
 Group: User Interface/Desktops
 URL: http://www.kde.org/
-Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdebase-%{version}.tar.bz2
+Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # fedora specific nsplugins paths
@@ -304,6 +304,9 @@
 
 
 %changelog
+* Thu Jan 22 2009 Than Ngo <than at redhat.com> - 4.2.0-1
+- 4.2.0
+
 * Wed Jan 07 2009 Than Ngo <than at redhat.com> - 4.1.96-1
 - 4.2rc1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdebase/devel/sources,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -r1.105 -r1.106
--- sources	7 Jan 2009 15:19:45 -0000	1.105
+++ sources	22 Jan 2009 10:15:06 -0000	1.106
@@ -1 +1 @@
-d9010a13848e17d6f1cef3003a035b13  kdebase-4.1.96.tar.bz2
+da86a8ad624e86eda3a7509f39272060  kdebase-4.2.0.tar.bz2



From mhlavink at fedoraproject.org  Thu Jan 22 10:16:04 2009
From: mhlavink at fedoraproject.org (Michal Hlavinka)
Date: Thu, 22 Jan 2009 10:16:04 +0000 (UTC)
Subject: rpms/apcupsd/F-9 .cvsignore, 1.12, 1.13 apcupsd-3.14.3-init.patch,
	1.1, 1.2 apcupsd.spec, 1.26, 1.27 sources, 1.12, 1.13
Message-ID: <20090122101604.1FF2270033@cvs1.fedora.phx.redhat.com>

Author: mhlavink

Update of /cvs/extras/rpms/apcupsd/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16073

Modified Files:
	.cvsignore apcupsd-3.14.3-init.patch apcupsd.spec sources 
Log Message:
updated to 3.14.5



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/apcupsd/F-9/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	28 May 2008 12:24:55 -0000	1.12
+++ .cvsignore	22 Jan 2009 10:15:33 -0000	1.13
@@ -1 +1 @@
-apcupsd-3.14.4.tar.gz
+apcupsd-3.14.5.tar.gz

apcupsd-3.14.3-init.patch:

Index: apcupsd-3.14.3-init.patch
===================================================================
RCS file: /cvs/extras/rpms/apcupsd/F-9/apcupsd-3.14.3-init.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- apcupsd-3.14.3-init.patch	28 May 2008 12:21:21 -0000	1.1
+++ apcupsd-3.14.3-init.patch	22 Jan 2009 10:15:33 -0000	1.2
@@ -1,6 +1,6 @@
-diff -up apcupsd-3.14.3/platforms/redhat/apcupsd.in.init apcupsd-3.14.3/platforms/redhat/apcupsd.in
---- apcupsd-3.14.3/platforms/redhat/apcupsd.in.init	2007-04-24 01:35:33.000000000 +0200
-+++ apcupsd-3.14.3/platforms/redhat/apcupsd.in	2008-05-28 09:05:39.000000000 +0200
+diff -up apcupsd-3.14.5/platforms/redhat/apcupsd.in.init apcupsd-3.14.5/platforms/redhat/apcupsd.in
+--- apcupsd-3.14.5/platforms/redhat/apcupsd.in.init	2008-11-01 16:03:26.000000000 +0100
++++ apcupsd-3.14.5/platforms/redhat/apcupsd.in	2009-01-22 10:58:00.429886991 +0100
 @@ -3,9 +3,19 @@
  # apcupsd      This shell script takes care of starting and stopping
  #	       the apcupsd UPS monitoring daemon.
@@ -21,8 +21,8 @@
 +
  APCPID=@PIDDIR@/apcupsd.pid
  
- if test -f /etc/whitebox-release ; then
-@@ -44,9 +54,11 @@ case "$1" in
+ # Source function libarary
+@@ -30,9 +40,11 @@ case "$1" in
         ;;
      restart|force-reload)
         $0 stop
@@ -35,7 +35,7 @@
      reload)
         echo "$0: reload not implemented"
         exit 3
-@@ -62,7 +74,7 @@ case "$1" in
+@@ -48,7 +60,7 @@ case "$1" in
         fi
         ;;
      *)


Index: apcupsd.spec
===================================================================
RCS file: /cvs/extras/rpms/apcupsd/F-9/apcupsd.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- apcupsd.spec	6 Jun 2008 10:14:21 -0000	1.26
+++ apcupsd.spec	22 Jan 2009 10:15:33 -0000	1.27
@@ -1,6 +1,6 @@
 Name:         apcupsd
-Version:      3.14.4
-Release:      2%{?dist}
+Version:      3.14.5
+Release:      1%{?dist}
 Summary:      APC UPS Power Control Daemon for Linux
 
 Group:        System Environment/Daemons
@@ -106,7 +106,7 @@
         ${RPM_BUILD_ROOT}%{_datadir}/applications/gapcmon.desktop
 
 # Cleanup for later %doc processing
-chmod -x examples/*.conf examples/*.c
+chmod -x  examples/*.c
 rm examples/*.in
 
 
@@ -167,6 +167,9 @@
 
 
 %changelog
+* Thu Jan 22 2009 Michal Hlavinka <mhlavink at redhat.com> - 3.14.5-1
+- update to 3.14.5
+
 * Fri Jun 06 2008 Tomas Smetana <tsmetana at redhat.com> - 3.14.4-2
 - drop useless cloexec patch
 - fix build requires


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/apcupsd/F-9/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	28 May 2008 12:24:55 -0000	1.12
+++ sources	22 Jan 2009 10:15:33 -0000	1.13
@@ -1 +1 @@
-78811129db1a882b9a2b9afd540470b3  apcupsd-3.14.4.tar.gz
+4ac73ec91d8ab56f3fac894e172567c4  apcupsd-3.14.5.tar.gz



From jnovy at fedoraproject.org  Thu Jan 22 10:17:48 2009
From: jnovy at fedoraproject.org (Jindrich Novy)
Date: Thu, 22 Jan 2009 10:17:48 +0000 (UTC)
Subject: rpms/libgphoto2/devel .cvsignore, 1.6, 1.7 libgphoto2.spec, 1.15,
	1.16 sources, 1.6, 1.7
Message-ID: <20090122101748.7E5CE70033@cvs1.fedora.phx.redhat.com>

Author: jnovy

Update of /cvs/pkgs/rpms/libgphoto2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16524

Modified Files:
	.cvsignore libgphoto2.spec sources 
Log Message:
* Thu Jan 22 2009 Jindrich Novy <jnovy at redhat.com> 2.4.4-1
- update to 2.4.4
- many fixes and improvements to Nikon and Canon cameras
- translation updates



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libgphoto2/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	20 Oct 2008 10:25:51 -0000	1.6
+++ .cvsignore	22 Jan 2009 10:17:18 -0000	1.7
@@ -1 +1 @@
-libgphoto2-2.4.3.tar.bz2
+libgphoto2-2.4.4.tar.bz2


Index: libgphoto2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libgphoto2/devel/libgphoto2.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- libgphoto2.spec	13 Nov 2008 16:20:41 -0000	1.15
+++ libgphoto2.spec	22 Jan 2009 10:17:18 -0000	1.16
@@ -1,7 +1,7 @@
 Summary: Library for accessing digital cameras
 Name: libgphoto2
-Version: 2.4.3
-Release: 2%{?dist}
+Version: 2.4.4
+Release: 1%{?dist}
 # GPLV2+ for the main lib (due to exif.c) and most plugins, some plugins GPLv2
 License: GPLv2+ and GPLv2
 Group: Development/Libraries
@@ -151,6 +151,11 @@
 %{_mandir}/man3/*
 
 %changelog
+* Thu Jan 22 2009 Jindrich Novy <jnovy at redhat.com> 2.4.4-1
+- update to 2.4.4
+- many fixes and improvements to Nikon and Canon cameras
+- translation updates
+
 * Thu Nov 13 2008 Rex Dieter <rdieter at fedoraproject.org> 2.4.3-2
 - respin (libtool)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libgphoto2/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	20 Oct 2008 10:25:51 -0000	1.6
+++ sources	22 Jan 2009 10:17:18 -0000	1.7
@@ -1 +1 @@
-6c23b8b3021aee4187b2c11d4bb7265b  libgphoto2-2.4.3.tar.bz2
+8aff5ac4ca72cba17de633078cf1612e  libgphoto2-2.4.4.tar.bz2



From than at fedoraproject.org  Thu Jan 22 10:27:33 2009
From: than at fedoraproject.org (Than Ngo)
Date: Thu, 22 Jan 2009 10:27:33 +0000 (UTC)
Subject: rpms/kdebase-runtime/devel .cvsignore, 1.26,
	1.27 kdebase-runtime.spec, 1.87, 1.88 sources, 1.27, 1.28
Message-ID: <20090122102733.EB61470033@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdebase-runtime/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17577

Modified Files:
	.cvsignore kdebase-runtime.spec sources 
Log Message:
4.2.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdebase-runtime/devel/.cvsignore,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- .cvsignore	13 Jan 2009 20:46:44 -0000	1.26
+++ .cvsignore	22 Jan 2009 10:27:03 -0000	1.27
@@ -1 +1,2 @@
 kdebase-runtime-4.1.96.tar.bz2
+kdebase-runtime-4.2.0.tar.bz2


Index: kdebase-runtime.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebase-runtime/devel/kdebase-runtime.spec,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -r1.87 -r1.88
--- kdebase-runtime.spec	13 Jan 2009 21:01:35 -0000	1.87
+++ kdebase-runtime.spec	22 Jan 2009 10:27:03 -0000	1.88
@@ -7,13 +7,13 @@
 
 Name:          kdebase-runtime
 Summary:       K Desktop Environment - Runtime
-Version:       4.1.96
-Release:       2%{?dist}
+Version:       4.2.0
+Release:       1%{?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
+Source0:       ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-runtime-%{version}.tar.bz2
 Source1:       khelpcenter.desktop
 Patch0:        kdebase-runtime-4.1.70-pulseaudio.patch
 Patch1:        kdebase-runtime-4.1.x-searchproviders-shortcuts.patch
@@ -336,6 +336,9 @@
 
 
 %changelog
+* Thu Jan 22 2009 Than Ngo <than at redhat.com> - 4.2.0-1
+- 4.2.0
+
 * Tue Jan 13 2009 Rex Dieter <rdieter at fedoraproject.org> 4.1.96-2
 - tarball respin
 - drop extraneous deps (that are in kdelibs)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdebase-runtime/devel/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- sources	13 Jan 2009 20:46:44 -0000	1.27
+++ sources	22 Jan 2009 10:27:03 -0000	1.28
@@ -1 +1 @@
-2c34b66f9d1e7dfc1e0fa78087ddd773  kdebase-runtime-4.1.96.tar.bz2
+9e56281e9daa579d56cfda794f1bbc10  kdebase-runtime-4.2.0.tar.bz2



From than at fedoraproject.org  Thu Jan 22 10:38:59 2009
From: than at fedoraproject.org (Than Ngo)
Date: Thu, 22 Jan 2009 10:38:59 +0000 (UTC)
Subject: rpms/kdebase-workspace/devel kdebase-workspace-4.1.96-font.patch,
	NONE, 1.1 .cvsignore, 1.25, 1.26 kdebase-workspace.spec, 1.168,
	1.169 sources, 1.30, 1.31
Message-ID: <20090122103859.23C3C70033@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdebase-workspace/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19250

Modified Files:
	.cvsignore kdebase-workspace.spec sources 
Added Files:
	kdebase-workspace-4.1.96-font.patch 
Log Message:
4.2.0


kdebase-workspace-4.1.96-font.patch:

--- NEW FILE kdebase-workspace-4.1.96-font.patch ---
diff -up kdebase-workspace-4.1.96/startkde.cmake.orig kdebase-workspace-4.1.96/startkde.cmake
--- kdebase-workspace-4.1.96/startkde.cmake.orig	2009-01-21 16:35:32.000000000 +0100
+++ kdebase-workspace-4.1.96/startkde.cmake	2009-01-21 16:35:53.000000000 +0100
@@ -214,48 +214,6 @@ else
 fi
 export QT_PLUGIN_PATH
 
-# Activate the kde font directories.
-#
-# There are 4 directories that may be used for supplying fonts for KDE.
-#
-# There are two system directories. These belong to the administrator.
-# There are two user directories, where the user may add her own fonts.
-#
-# The 'override' versions are for fonts that should come first in the list,
-# i.e. if you have a font in your 'override' directory, it will be used in
-# preference to any other.
-#
-# The preference order looks like this:
-# user override, system override, X, user, system
-#
-# Where X is the original font database that was set up before this script
-# runs.
-
-usr_odir=$HOME/.fonts/kde-override
-usr_fdir=$HOME/.fonts
-
-if test -n "$KDEDIRS"; then
-  kdedirs_first=`echo "$KDEDIRS"|sed -e 's/:.*//'`
-  sys_odir=$kdedirs_first/share/fonts/override
-  sys_fdir=$kdedirs_first/share/fonts
-else
-  sys_odir=$KDEDIR/share/fonts/override
-  sys_fdir=$KDEDIR/share/fonts
-fi
-
-# We run mkfontdir on the user's font dirs (if we have permission) to pick
-# up any new fonts they may have installed. If mkfontdir fails, we still
-# add the user's dirs to the font path, as they might simply have been made
-# read-only by the administrator, for whatever reason.
-
-test -d "$sys_odir" && xset +fp "$sys_odir"
-test -d "$usr_odir" && (mkfontdir "$usr_odir" ; xset +fp "$usr_odir")
-test -d "$usr_fdir" && (mkfontdir "$usr_fdir" ; xset fp+ "$usr_fdir")
-test -d "$sys_fdir" && xset fp+ "$sys_fdir"
-
-# Ask X11 to rebuild its font list.
-xset fp rehash
-
 # Set a left cursor instead of the standard X11 "X" cursor, since I've heard
 # from some users that they're confused and don't know what to do. This is
 # especially necessary on slow machines, where starting KDE takes one or two


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdebase-workspace/devel/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- .cvsignore	7 Jan 2009 15:40:14 -0000	1.25
+++ .cvsignore	22 Jan 2009 10:38:28 -0000	1.26
@@ -1,2 +1,3 @@
 kdebase-workspace-4.1.85.tar.bz2
 kdebase-workspace-4.1.96.tar.bz2
+kdebase-workspace-4.2.0.tar.bz2


Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebase-workspace/devel/kdebase-workspace.spec,v
retrieving revision 1.168
retrieving revision 1.169
diff -u -r1.168 -r1.169
--- kdebase-workspace.spec	16 Jan 2009 14:18:25 -0000	1.168
+++ kdebase-workspace.spec	22 Jan 2009 10:38:28 -0000	1.169
@@ -2,10 +2,10 @@
 
 Summary: K Desktop Environment - Workspace
 Name: kdebase-workspace
-Version: 4.1.96
+Version: 4.2.0
 
-Release: 4%{?dist}
-Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdebase-workspace-%{version}.tar.bz2
+Release: 1%{?dist}
+Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-workspace-%{version}.tar.bz2
 License: GPLv2
 Group: User Interface/Desktops
 URL: http://www.kde.org/
@@ -23,6 +23,7 @@
 Patch8: kdebase-workspace-4.0.72-klipper-url.patch
 Patch9: kdebase-workspace-4.1.80-session-button.patch
 Patch10: kdebase-workspace-4.1.2-ldap.patch
+Patch11: kdebase-workspace-4.1.96-font.patch
 
 # upstream patches:
 # trunk
@@ -170,6 +171,7 @@
 %patch8 -p1 -b .klipper-url
 %patch9 -p1 -b .session-button
 %patch10 -p1 -b .ldap
+%patch11 -p1 -b .font
 
 # upstream patches
 %patch100 -p1 -b .AllowExternalPaths
@@ -298,6 +300,9 @@
 
 
 %changelog
+* Thu Jan 22 2009 Than Ngo <than at redhat.com> - 4.2.0-1
+- 4.2.0
+
 * Fri Jan 16 2009 Than Ngo <than at redhat.com> - 4.1.96-4
 - backport fix from trunk to allow symlinks in wallpaper theme
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdebase-workspace/devel/sources,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- sources	7 Jan 2009 15:40:14 -0000	1.30
+++ sources	22 Jan 2009 10:38:28 -0000	1.31
@@ -1 +1 @@
-e4fd6e11f45e5099de521867797bf86b  kdebase-workspace-4.1.96.tar.bz2
+193e30b9ed0b55b0196289d9df43a904  kdebase-workspace-4.2.0.tar.bz2



From than at fedoraproject.org  Thu Jan 22 10:44:13 2009
From: than at fedoraproject.org (Than Ngo)
Date: Thu, 22 Jan 2009 10:44:13 +0000 (UTC)
Subject: rpms/kdebindings/devel .cvsignore, 1.52, 1.53 kdebindings.spec,
	1.167, 1.168 sources, 1.58, 1.59
Message-ID: <20090122104413.A91D570033@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdebindings/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19898

Modified Files:
	.cvsignore kdebindings.spec sources 
Log Message:
4.2.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdebindings/devel/.cvsignore,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- .cvsignore	7 Jan 2009 15:46:54 -0000	1.52
+++ .cvsignore	22 Jan 2009 10:43:43 -0000	1.53
@@ -2,3 +2,4 @@
 kdebindings-4.1.80.tar.bz2
 kdebindings-4.1.85.tar.bz2
 kdebindings-4.1.96.tar.bz2
+kdebindings-4.2.0.tar.bz2


Index: kdebindings.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebindings/devel/kdebindings.spec,v
retrieving revision 1.167
retrieving revision 1.168
diff -u -r1.167 -r1.168
--- kdebindings.spec	15 Jan 2009 21:07:17 -0000	1.167
+++ kdebindings.spec	22 Jan 2009 10:43:43 -0000	1.168
@@ -25,18 +25,17 @@
 %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")
 
 Name: kdebindings
-Version: 4.1.96
-Release: 5%{?dist}
+Version: 4.2.0
+Release: 1%{?dist}
 Summary: KDE bindings to non-C++ languages
 
 Group: User Interface/Desktops
 License: GPLv2
 URL: http://developer.kde.org/language-bindings/
-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
 # disable NepomukSmoke by default (-DENABLE_NEPOMUK_SMOKE=ON to enable)
 Patch0: kdebindings-4.1.85-disable-nepomuk-smoke.patch
 # upstream patches
-Patch100: kdebindings-4.1.96-akonadi.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  akonadi-devel >= 1.1.0
@@ -163,9 +162,6 @@
 %setup -q
 %patch0 -p1 -b .disable-nepomuk-smoke
 
-# upstream patches
-%patch100 -p1 -b .akonadi
-
 %build
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
@@ -299,6 +295,9 @@
 
 
 %changelog
+* Thu Jan 22 2009 Than Ngo <than at redhat.com> - 4.2.0-1
+- 4.2.0
+
 * Thu Jan 15 2009 Rex Dieter <rdieter at fedoraproject.org> 4.1.96-5
 - toggle for QtRuby/kde-plasma-ruby bootstrap
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdebindings/devel/sources,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- sources	7 Jan 2009 15:46:55 -0000	1.58
+++ sources	22 Jan 2009 10:43:43 -0000	1.59
@@ -1 +1 @@
-7669193f0ce227bd7e113aaedc131225  kdebindings-4.1.96.tar.bz2
+6eae8fd968da83fe65e592993e416adc  kdebindings-4.2.0.tar.bz2



From than at fedoraproject.org  Thu Jan 22 10:46:10 2009
From: than at fedoraproject.org (Than Ngo)
Date: Thu, 22 Jan 2009 10:46:10 +0000 (UTC)
Subject: rpms/kdebindings/devel kdebindings-4.1.96-akonadi.patch,1.1,NONE
Message-ID: <20090122104610.C994770033@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdebindings/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20143

Removed Files:
	kdebindings-4.1.96-akonadi.patch 
Log Message:
drop kdebindings-4.1.96-akonadi.patch, it's included 4.2.0



--- kdebindings-4.1.96-akonadi.patch DELETED ---



From than at fedoraproject.org  Thu Jan 22 10:53:41 2009
From: than at fedoraproject.org (Than Ngo)
Date: Thu, 22 Jan 2009 10:53:41 +0000 (UTC)
Subject: rpms/kdeedu/devel .cvsignore, 1.57, 1.58 kdeedu.spec, 1.156,
	1.157 sources, 1.61, 1.62
Message-ID: <20090122105341.9B48D70033@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdeedu/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20997

Modified Files:
	.cvsignore kdeedu.spec sources 
Log Message:
4.2.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdeedu/devel/.cvsignore,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- .cvsignore	7 Jan 2009 15:58:58 -0000	1.57
+++ .cvsignore	22 Jan 2009 10:53:11 -0000	1.58
@@ -1,2 +1,3 @@
 kdeedu-4.1.85.tar.bz2
 kdeedu-4.1.96.tar.bz2
+kdeedu-4.2.0.tar.bz2


Index: kdeedu.spec
===================================================================
RCS file: /cvs/extras/rpms/kdeedu/devel/kdeedu.spec,v
retrieving revision 1.156
retrieving revision 1.157
diff -u -r1.156 -r1.157
--- kdeedu.spec	12 Jan 2009 19:03:54 -0000	1.156
+++ kdeedu.spec	22 Jan 2009 10:53:11 -0000	1.157
@@ -13,13 +13,13 @@
 
 Name:    kdeedu
 Summary: Educational/Edutainment applications
-Version: 4.1.96
-Release: 4%{?dist}
+Version: 4.2.0
+Release: 1%{?dist}
 
 License: GPLv2
 Group:	 Amusements/Games
 URL:     http://www.kde.org/
-Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdeedu-%{version}.tar.bz2
+Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdeedu-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # http://bugzilla.redhat.com/371121
@@ -418,6 +418,9 @@
 
 
 %changelog
+* Thu Jan 22 2009 Than Ngo <than at redhat.com> - 4.2.0-1
+- 4.2.0
+
 * Mon Jan 12 2009 Rex Dieter <rdieter at fedoraproject.org> 4.1.96-4
 - drop extraneous giflib pcre deps
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdeedu/devel/sources,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- sources	7 Jan 2009 15:58:58 -0000	1.61
+++ sources	22 Jan 2009 10:53:11 -0000	1.62
@@ -1 +1 @@
-b8c1cc06d06dff0852ca16daabeec51b  kdeedu-4.1.96.tar.bz2
+aaddbdab29e1d284ad8ee67a78b4c597  kdeedu-4.2.0.tar.bz2



From karsten at fedoraproject.org  Thu Jan 22 10:59:10 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Thu, 22 Jan 2009 10:59:10 +0000 (UTC)
Subject: rpms/freeipmi/devel freeipmi-0.6.4-pathsep.patch, NONE,
	1.1 freeipmi.spec, 1.9, 1.10
Message-ID: <20090122105910.A346570033@cvs1.fedora.phx.redhat.com>

Author: karsten

Update of /cvs/extras/rpms/freeipmi/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21735

Modified Files:
	freeipmi.spec 
Added Files:
	freeipmi-0.6.4-pathsep.patch 
Log Message:
- - fix ipmiconsole log directory

freeipmi-0.6.4-pathsep.patch:

--- NEW FILE freeipmi-0.6.4-pathsep.patch ---
diff -up freeipmi-0.6.4/ipmiconsole/src/libipmiconsole/Makefile.am.pathsep freeipmi-0.6.4/ipmiconsole/src/libipmiconsole/Makefile.am
--- freeipmi-0.6.4/ipmiconsole/src/libipmiconsole/Makefile.am.pathsep	2009-01-22 11:44:25.000000000 +0100
+++ freeipmi-0.6.4/ipmiconsole/src/libipmiconsole/Makefile.am	2009-01-22 11:44:31.000000000 +0100
@@ -56,7 +56,7 @@ libipmiconsole_la_LIBADD = ../../../comm
 install-data-hook: $(INSTALL_LOGDIR)
 
 install-logdir:
-	$(INSTALL) -m 755 -d $(DESTDIR)var/log/ipmiconsole
+	$(INSTALL) -m 755 -d $(DESTDIR)/var/log/ipmiconsole
 
 EXTRA_DIST = ipmiconsole.map
 
diff -up freeipmi-0.6.4/ipmiconsole/src/libipmiconsole/Makefile.in.pathsep freeipmi-0.6.4/ipmiconsole/src/libipmiconsole/Makefile.in
--- freeipmi-0.6.4/ipmiconsole/src/libipmiconsole/Makefile.in.pathsep	2009-01-22 11:44:40.000000000 +0100
+++ freeipmi-0.6.4/ipmiconsole/src/libipmiconsole/Makefile.in	2009-01-22 11:45:05.000000000 +0100
@@ -643,7 +643,7 @@ uninstall-am: uninstall-includeHEADERS u
 install-data-hook: $(INSTALL_LOGDIR)
 
 install-logdir:
-	$(INSTALL) -m 755 -d $(DESTDIR)var/log/ipmiconsole
+	$(INSTALL) -m 755 -d $(DESTDIR)/var/log/ipmiconsole
 
 ../../../common/src/libmiscutils.la: force-dependency-check
 	$(MAKE) -C $(dir $@) $(notdir $@)


Index: freeipmi.spec
===================================================================
RCS file: /cvs/extras/rpms/freeipmi/devel/freeipmi.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- freeipmi.spec	24 Nov 2008 09:36:17 -0000	1.9
+++ freeipmi.spec	22 Jan 2009 10:58:40 -0000	1.10
@@ -5,9 +5,9 @@
 %define name freeipmi
 %define version 0.6.4
 %if %{?_with_debug:1}%{!?_with_debug:0}
-%define release 1.debug%{?dist}
+%define release 2.debug%{?dist}
 %else
-%define release 1%{?dist}
+%define release 2%{?dist}
 %endif
 
 Name: %{name}
@@ -20,6 +20,7 @@
 Patch1: freeipmi-0.5.1-regex.patch
 Patch2: freeipmi-0.6.4-silent.patch
 Patch3: freeipmi-0.6.4-argmax.patch
+Patch4: freeipmi-0.6.4-pathsep.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: libgcrypt-devel texinfo
 Requires(post): info
@@ -68,6 +69,7 @@
 %patch1 -p1 -b .regex
 %patch2 -p1 -b .silent
 %patch3 -p1 -b .argmax
+%patch4 -p1 -b .pathsep
 
 %build
 CFLAGS=-D_GNU_SOURCE %configure --program-prefix=%{?_program_prefix:%{_program_prefix}} \
@@ -259,6 +261,7 @@
 %{_mandir}/man5/ipmidetect.conf.5*
 %{_mandir}/man7/freeipmi.7*
 %dir %{_localstatedir}/cache/ipmimonitoringsdrcache
+%dir %{_localstatedir}/log/ipmiconsole
 
 %files devel
 %defattr(-,root,root)
@@ -315,6 +318,9 @@
 %{_mandir}/man8/ipmidetectd.8*
 
 %changelog
+* Thu Jan 22 2009 Karsten Hopp <karsten at redhat.com> 0.6.4-2
+- fix ipmiconsole log directory
+
 * Mon Jul 28 2008 Phil Knirsch <pknirsch at redhat.com> - 0.6.4-1
 - Update to freeipmi-0.6.4
 - Fixed unecessary logrotate message for bmc-watchdog (#456648)



From than at fedoraproject.org  Thu Jan 22 11:06:35 2009
From: than at fedoraproject.org (Than Ngo)
Date: Thu, 22 Jan 2009 11:06:35 +0000 (UTC)
Subject: rpms/kdegames/devel .cvsignore, 1.61, 1.62 kdegames.spec, 1.112,
	1.113 sources, 1.64, 1.65
Message-ID: <20090122110635.C35D170033@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdegames/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23285

Modified Files:
	.cvsignore kdegames.spec sources 
Log Message:
4.2.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdegames/devel/.cvsignore,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- .cvsignore	7 Jan 2009 16:08:49 -0000	1.61
+++ .cvsignore	22 Jan 2009 11:06:04 -0000	1.62
@@ -2,3 +2,4 @@
 kdegames-4.1.80.tar.bz2
 kdegames-4.1.85.tar.bz2
 kdegames-4.1.96.tar.bz2
+kdegames-4.2.0.tar.bz2


Index: kdegames.spec
===================================================================
RCS file: /cvs/extras/rpms/kdegames/devel/kdegames.spec,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -r1.112 -r1.113
--- kdegames.spec	7 Jan 2009 16:08:49 -0000	1.112
+++ kdegames.spec	22 Jan 2009 11:06:04 -0000	1.113
@@ -3,13 +3,13 @@
 Name:    kdegames
 Summary: K Desktop Environment 4 - Games
 Epoch:   6
-Version: 4.1.96
+Version: 4.2.0
 Release: 1%{?dist}
 
 License: GPLv2
 URL:     http://www.kde.org/
 Group:   Amusements/Games
-Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdegames-%{version}.tar.bz2
+Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdegames-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Obsoletes: kdegames4 < %{version}-%{release}
@@ -177,6 +177,9 @@
 
 
 %changelog
+* Thu Jan 22 2009 Than Ngo <than at redhat.com> - 4.2.0-1
+- 4.2.0
+
 * Wed Jan 07 2009 Than Ngo <than at redhat.com> - 4.1.96-1
 - 4.2rc1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdegames/devel/sources,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- sources	7 Jan 2009 16:08:49 -0000	1.64
+++ sources	22 Jan 2009 11:06:04 -0000	1.65
@@ -1 +1 @@
-7d9be8e33e9626774cb6893259564620  kdegames-4.1.96.tar.bz2
+68cefd627025be99ba136e5a4e35e554  kdegames-4.2.0.tar.bz2



From than at fedoraproject.org  Thu Jan 22 11:10:58 2009
From: than at fedoraproject.org (Than Ngo)
Date: Thu, 22 Jan 2009 11:10:58 +0000 (UTC)
Subject: rpms/kdegraphics/devel .cvsignore, 1.54, 1.55 kdegraphics.spec,
	1.185, 1.186 sources, 1.61, 1.62
Message-ID: <20090122111058.87E2470033@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdegraphics/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23826

Modified Files:
	.cvsignore kdegraphics.spec sources 
Log Message:
4.2.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdegraphics/devel/.cvsignore,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- .cvsignore	7 Jan 2009 16:13:19 -0000	1.54
+++ .cvsignore	22 Jan 2009 11:10:27 -0000	1.55
@@ -2,3 +2,4 @@
 kdegraphics-4.1.80.tar.bz2
 kdegraphics-4.1.85.tar.bz2
 kdegraphics-4.1.96.tar.bz2
+kdegraphics-4.2.0.tar.bz2


Index: kdegraphics.spec
===================================================================
RCS file: /cvs/extras/rpms/kdegraphics/devel/kdegraphics.spec,v
retrieving revision 1.185
retrieving revision 1.186
diff -u -r1.185 -r1.186
--- kdegraphics.spec	17 Jan 2009 09:56:48 -0000	1.185
+++ kdegraphics.spec	22 Jan 2009 11:10:27 -0000	1.186
@@ -6,8 +6,8 @@
 
 Summary:        K Desktop Environment - Graphics Applications
 Epoch:          7
-Version:        4.1.96
-Release:        2%{?dist}
+Version:        4.2.0
+Release:        1%{?dist}
 
 Name:           kdegraphics
 #Obsoletes:     kdegraphics4 < %{version}-%{release}
@@ -16,7 +16,7 @@
 Group:          Applications/Multimedia
 License:        GPLv2
 URL:            http://www.kde.org/
-Source0:        ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdegraphics-%{version}.tar.bz2
+Source0:        ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdegraphics-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 ## upstream patches
@@ -179,6 +179,9 @@
 
 
 %changelog
+* Thu Jan 22 2009 Than Ngo <than at redhat.com> - 4.2.0-1
+- 4.2.0
+
 * Sat Jan 17 2009 Rakesh Pandit <rakesh at fedoraproject.org> - 4.1.96-2
 - Updated with new djvulibre
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdegraphics/devel/sources,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- sources	7 Jan 2009 16:13:20 -0000	1.61
+++ sources	22 Jan 2009 11:10:27 -0000	1.62
@@ -1 +1 @@
-7c8d131404c8e464f553fa1515cebc40  kdegraphics-4.1.96.tar.bz2
+8beb6fe5d475d0b0245ea6d4cc7e9732  kdegraphics-4.2.0.tar.bz2



From pghmcfc at fedoraproject.org  Thu Jan 22 11:18:17 2009
From: pghmcfc at fedoraproject.org (Paul Howarth)
Date: Thu, 22 Jan 2009 11:18:17 +0000 (UTC)
Subject: rpms/perl-Date-Simple/devel .cvsignore, 1.2,
	1.3 perl-Date-Simple.spec, 1.9, 1.10 sources, 1.2, 1.3
Message-ID: <20090122111817.B6F2370033@cvs1.fedora.phx.redhat.com>

Author: pghmcfc

Update of /cvs/pkgs/rpms/perl-Date-Simple/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24630

Modified Files:
	.cvsignore perl-Date-Simple.spec sources 
Log Message:
- Update to 3.03
- Don't package Artistic license text, not included in upstream release
- New upstream maintainer -> new source URL



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Date-Simple/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	23 Aug 2005 16:40:32 -0000	1.2
+++ .cvsignore	22 Jan 2009 11:17:45 -0000	1.3
@@ -1 +1 @@
-Date-Simple-3.02.tar.gz
+Date-Simple-3.03.tar.gz


Index: perl-Date-Simple.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Date-Simple/devel/perl-Date-Simple.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- perl-Date-Simple.spec	28 Feb 2008 13:03:30 -0000	1.9
+++ perl-Date-Simple.spec	22 Jan 2009 11:17:46 -0000	1.10
@@ -1,11 +1,11 @@
 Summary:	Simple date object for perl
 Name:		perl-Date-Simple
-Version:	3.02
-Release:	9%{?dist}
+Version:	3.03
+Release:	1%{?dist}
 License:	GPL+ or Artistic
 Group:		Development/Libraries
 Url:		http://search.cpan.org/dist/Date-Simple/
-Source0:	http://search.cpan.org/CPAN/authors/id/Y/YV/YVES/Date-Simple-%{version}.tar.gz
+Source0:	http://search.cpan.org/CPAN/authors/id/I/IZ/IZUT/Date-Simple-%{version}.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 BuildRequires:	perl(ExtUtils::MakeMaker), perl(Test::More)
@@ -16,9 +16,6 @@
 %prep
 %setup -q -n Date-Simple-%{version}
 
-# Artistic license text not included in tarball
-/usr/bin/perldoc -t perlartistic > Artistic
-
 # Spurious exec permissions in files from tarball
 /usr/bin/find lib -type f -exec %{__chmod} -x {} ';'
 %{__chmod} -x ChangeLog COPYING README Simple.xs
@@ -50,12 +47,17 @@
 
 %files
 %defattr(-,root,root,-)
-%doc Artistic ChangeLog COPYING README
+%doc ChangeLog COPYING README
 %{perl_vendorarch}/Date/
 %{perl_vendorarch}/auto/Date/
 %{_mandir}/man3/Date::Simple*.3pm*
 
 %changelog
+* Thu Jan 22 2009 Paul Howarth <paul at city-fan.org> 3.03-1
+- Update to 3.03
+- Don't package Artistic license text, not included in upstream release
+- New upstream maintainer -> new source URL
+
 * Wed Feb 27 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 3.02-9
 - Rebuild for perl 5.10 (again)
 
@@ -63,7 +65,7 @@
 - Autorebuild for GCC 4.3
 
 * Tue Jan 15 2008 Tom "spot" Callaway <tcallawa at redhat.com> 3.02-7
-- rebuild for new perl
+- Rebuild for new perl
 
 * Mon Aug 13 2007 Paul Howarth <paul at city-fan.org> 3.02-6
 - Clarify license as GPL v1 or later, or Artistic (same as perl)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Date-Simple/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	23 Aug 2005 16:40:32 -0000	1.2
+++ sources	22 Jan 2009 11:17:46 -0000	1.3
@@ -1 +1 @@
-9a9559617ea27d518c282e5fb8367775  Date-Simple-3.02.tar.gz
+436049dc2c7dfd8423d8bcc807248b31  Date-Simple-3.03.tar.gz



From than at fedoraproject.org  Thu Jan 22 11:19:01 2009
From: than at fedoraproject.org (Than Ngo)
Date: Thu, 22 Jan 2009 11:19:01 +0000 (UTC)
Subject: rpms/kdelibs/devel .cvsignore, 1.65, 1.66 kdelibs.spec, 1.419,
	1.420 sources, 1.80, 1.81
Message-ID: <20090122111901.D9CAC70033@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdelibs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24766

Modified Files:
	.cvsignore kdelibs.spec sources 
Log Message:
4.2.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdelibs/devel/.cvsignore,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- .cvsignore	7 Jan 2009 16:23:23 -0000	1.65
+++ .cvsignore	22 Jan 2009 11:18:31 -0000	1.66
@@ -1,2 +1,3 @@
 kdelibs-4.1.85.tar.bz2
 kdelibs-4.1.96.tar.bz2
+kdelibs-4.2.0.tar.bz2


Index: kdelibs.spec
===================================================================
RCS file: /cvs/extras/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.419
retrieving revision 1.420
diff -u -r1.419 -r1.420
--- kdelibs.spec	16 Jan 2009 14:11:00 -0000	1.419
+++ kdelibs.spec	22 Jan 2009 11:18:31 -0000	1.420
@@ -1,6 +1,6 @@
 Summary: K Desktop Environment 4 - Libraries
-Version: 4.1.96
-Release: 9%{?dist}
+Version: 4.2.0
+Release: 1%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs
@@ -17,7 +17,7 @@
 License: LGPLv2
 URL:     http://www.kde.org/
 Group:   System Environment/Libraries
-Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdelibs-%{version}.tar.bz2
+Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdelibs-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %ifarch noarch
@@ -79,8 +79,6 @@
 Patch22: kdelibs-4.1.96-cmake.patch
 
 # upstream
-# 4.2 branch
-Patch100: kdelibs-4.1.96-crash.patch
 # 4.3 branch
 Patch101: kdelibs-4.1.96-AllowExternalPaths.patch
 
@@ -209,7 +207,6 @@
 %patch22 -p1 -b .kdepimlibs-cmake
 
 # upstream patches
-%patch100 -p1 -b .crash
 %patch101 -p1 -b .AllowExternalPaths
 
 %build
@@ -372,6 +369,9 @@
 
 
 %changelog
+* Thu Jan 22 2009 Than Ngo <than at redhat.com> - 4.2.0-1
+- 4.2.0
+
 * Fri Jan 16 2009 Than Ngo <than at redhat.com> - 4.1.96-9
 - drop kdelibs-4.1.85-plasma-default-wallpaper.patch, it's not needed
   since new plasma allows to define default wallpaper, new kde-setting


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdelibs/devel/sources,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- sources	7 Jan 2009 16:23:24 -0000	1.80
+++ sources	22 Jan 2009 11:18:31 -0000	1.81
@@ -1 +1 @@
-b9254b5afda5bf1855b8d381b6d4509b  kdelibs-4.1.96.tar.bz2
+c5ba7a8a99302bfe2c70503aa621f703  kdelibs-4.2.0.tar.bz2



From than at fedoraproject.org  Thu Jan 22 11:25:49 2009
From: than at fedoraproject.org (Than Ngo)
Date: Thu, 22 Jan 2009 11:25:49 +0000 (UTC)
Subject: rpms/kdemultimedia/devel .cvsignore, 1.58, 1.59 kdemultimedia.spec, 
	1.132, 1.133 sources, 1.60, 1.61
Message-ID: <20090122112549.8DCD470033@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdemultimedia/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25829

Modified Files:
	.cvsignore kdemultimedia.spec sources 
Log Message:
4.2.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdemultimedia/devel/.cvsignore,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- .cvsignore	7 Jan 2009 19:46:06 -0000	1.58
+++ .cvsignore	22 Jan 2009 11:25:18 -0000	1.59
@@ -2,3 +2,4 @@
 kdemultimedia-4.1.80.tar.bz2
 kdemultimedia-4.1.85.tar.bz2
 kdemultimedia-4.1.96.tar.bz2
+kdemultimedia-4.2.0.tar.bz2


Index: kdemultimedia.spec
===================================================================
RCS file: /cvs/extras/rpms/kdemultimedia/devel/kdemultimedia.spec,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -r1.132 -r1.133
--- kdemultimedia.spec	7 Jan 2009 19:46:06 -0000	1.132
+++ kdemultimedia.spec	22 Jan 2009 11:25:18 -0000	1.133
@@ -1,6 +1,6 @@
 Name: kdemultimedia
 Epoch: 6
-Version: 4.1.96
+Version: 4.2.0
 Release: 1%{?dist}
 Summary: K Desktop Environment - Multimedia applications
 
@@ -8,7 +8,7 @@
 # see also: http://techbase.kde.org/Policies/Licensing_Policy
 License:   GPLv2+
 URL:       http://www.kde.org/
-Source0:   ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdemultimedia-%{version}.tar.bz2
+Source0:   ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdemultimedia-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # This one is normal, FLAC_OGG_LIBRARY is not actually used anyway:
@@ -146,6 +146,9 @@
 
 
 %changelog
+* Thu Jan 22 2009 Than Ngo <than at redhat.com> - 4.2.0-1
+- 4.2.0
+
 * Wed Jan 07 2009 Than Ngo <than at redhat.com> - 4.1.96-1
 - 4.2rc1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdemultimedia/devel/sources,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- sources	7 Jan 2009 19:46:06 -0000	1.60
+++ sources	22 Jan 2009 11:25:18 -0000	1.61
@@ -1 +1 @@
-98d66627f6ae4376b6415ed1ad23ded4  kdemultimedia-4.1.96.tar.bz2
+3e944c87888ac1ac5b11d3722dd31f88  kdemultimedia-4.2.0.tar.bz2



From kzak at fedoraproject.org  Thu Jan 22 11:27:36 2009
From: kzak at fedoraproject.org (Karel Zak)
Date: Thu, 22 Jan 2009 11:27:36 +0000 (UTC)
Subject: rpms/util-linux-ng/F-10 util-linux-ng.spec,1.34,1.35
Message-ID: <20090122112736.C9DD870033@cvs1.fedora.phx.redhat.com>

Author: kzak

Update of /cvs/pkgs/rpms/util-linux-ng/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26146

Modified Files:
	util-linux-ng.spec 
Log Message:
* Thu Jan 22 2009 Karel Zak <kzak at redhat.com> 2.14.1-3.2
- fix #480413 - util-linux-ng doesn't include scriptreplay



Index: util-linux-ng.spec
===================================================================
RCS file: /cvs/pkgs/rpms/util-linux-ng/F-10/util-linux-ng.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- util-linux-ng.spec	21 Nov 2008 14:51:48 -0000	1.34
+++ util-linux-ng.spec	22 Jan 2009 11:27:06 -0000	1.35
@@ -2,7 +2,7 @@
 Summary: A collection of basic system utilities
 Name: util-linux-ng
 Version: 2.14.1
-Release: 3.1%{?dist}
+Release: 3.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
@@ -242,13 +242,13 @@
 # deprecated commands
 for I in /sbin/fsck.minix /sbin/mkfs.{bfs,minix} /sbin/sln \
 	/usr/bin/chkdupexe %{_bindir}/line %{_bindir}/pg %{_bindir}/newgrp \
-	/sbin/shutdown %{_bindir}/scriptreplay /usr/sbin/vipw /usr/sbin/vigr; do
+	/sbin/shutdown /usr/sbin/vipw /usr/sbin/vigr; do
 	rm -f $RPM_BUILD_ROOT$I
 done
 
 # deprecated man pages
 for I in man1/chkdupexe.1 man1/line.1 man1/pg.1 man1/newgrp.1 \
-	man8/fsck.minix.8 man8/mkfs.minix.8 man8/mkfs.bfs.8 man1/scriptreplay.1 \
+	man8/fsck.minix.8 man8/mkfs.minix.8 man8/mkfs.bfs.8  \
 	man8/vipw.8 man8/vigr; do
 	rm -rf $RPM_BUILD_ROOT%{_mandir}/${I}*
 done
@@ -428,6 +428,7 @@
 %{_bindir}/renice
 %{_bindir}/rev
 %{_bindir}/script
+%{_bindir}/scriptreplay
 %{_bindir}/setarch
 %{_bindir}/setsid
 %{_bindir}/setterm
@@ -470,6 +471,7 @@
 %{_mandir}/man1/rename.1*
 %{_mandir}/man1/rev.1*
 %{_mandir}/man1/script.1*
+%{_mandir}/man1/scriptreplay.1*
 %{_mandir}/man1/setterm.1*
 %{_mandir}/man1/tailf.1*
 %{_mandir}/man1/ul.1*
@@ -519,6 +521,9 @@
 /sbin/losetup
 
 %changelog
+* Thu Jan 22 2009 Karel Zak <kzak at redhat.com> 2.14.1-3.2
+- fix #480413 - util-linux-ng doesn't include scriptreplay
+
 * Fri Nov 21 2008 Karel Zak <kzak at redhat.com> 2.14.1-3.1
 - fix #472502 - problem with fdisk and use +sectors for the end of partition
 



From than at fedoraproject.org  Thu Jan 22 11:38:22 2009
From: than at fedoraproject.org (Than Ngo)
Date: Thu, 22 Jan 2009 11:38:22 +0000 (UTC)
Subject: rpms/kdenetwork/devel .cvsignore, 1.61, 1.62 kdenetwork.spec, 1.168,
	1.169 sources, 1.68, 1.69
Message-ID: <20090122113822.E2DA070033@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdenetwork/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28426

Modified Files:
	.cvsignore kdenetwork.spec sources 
Log Message:
4.2.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdenetwork/devel/.cvsignore,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- .cvsignore	7 Jan 2009 19:57:46 -0000	1.61
+++ .cvsignore	22 Jan 2009 11:37:52 -0000	1.62
@@ -2,3 +2,4 @@
 kdenetwork-4.1.80.tar.bz2
 kdenetwork-4.1.85.tar.bz2
 kdenetwork-4.1.96.tar.bz2
+kdenetwork-4.2.0.tar.bz2


Index: kdenetwork.spec
===================================================================
RCS file: /cvs/extras/rpms/kdenetwork/devel/kdenetwork.spec,v
retrieving revision 1.168
retrieving revision 1.169
diff -u -r1.168 -r1.169
--- kdenetwork.spec	16 Jan 2009 10:25:58 -0000	1.168
+++ kdenetwork.spec	22 Jan 2009 11:37:52 -0000	1.169
@@ -1,13 +1,13 @@
 Summary: K Desktop Environment - Network Applications
 Name: kdenetwork
 Epoch: 7
-Version: 4.1.96
-Release: 3%{?dist}
+Version: 4.2.0
+Release: 1%{?dist}
 
 License: GPLv2
 Group: Applications/Internet
 URL: http://www.kde.org
-Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/%{name}-%{version}.tar.bz2
+Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
 # build Kopete against the system libgadu (backported from 4.3)
 # http://websvn.kde.org/?view=rev&revision=909144
 # http://websvn.kde.org/?view=rev&revision=909145
@@ -162,6 +162,9 @@
 
 
 %changelog
+* Thu Jan 22 2009 Than Ngo <than at redhat.com> - 4.2.0-1
+- 4.2.0
+
 * Fri Jan 16 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.96-3
 - rebuild for new OpenSSL
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdenetwork/devel/sources,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- sources	7 Jan 2009 19:57:47 -0000	1.68
+++ sources	22 Jan 2009 11:37:52 -0000	1.69
@@ -1 +1 @@
-01c69a5982758b4939627a6c4aa8fd55  kdenetwork-4.1.96.tar.bz2
+0ea1628e11d398fdf45276a35edd3cae  kdenetwork-4.2.0.tar.bz2



From than at fedoraproject.org  Thu Jan 22 11:44:14 2009
From: than at fedoraproject.org (Than Ngo)
Date: Thu, 22 Jan 2009 11:44:14 +0000 (UTC)
Subject: rpms/kdepim/devel .cvsignore, 1.56, 1.57 kdepim.spec, 1.203,
	1.204 sources, 1.65, 1.66
Message-ID: <20090122114414.B037D70033@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdepim/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29285

Modified Files:
	.cvsignore kdepim.spec sources 
Log Message:
4.2.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdepim/devel/.cvsignore,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- .cvsignore	7 Jan 2009 20:10:07 -0000	1.56
+++ .cvsignore	22 Jan 2009 11:43:44 -0000	1.57
@@ -2,3 +2,4 @@
 kdepim-4.1.80.tar.bz2
 kdepim-4.1.85.tar.bz2
 kdepim-4.1.96.tar.bz2
+kdepim-4.2.0.tar.bz2


Index: kdepim.spec
===================================================================
RCS file: /cvs/extras/rpms/kdepim/devel/kdepim.spec,v
retrieving revision 1.203
retrieving revision 1.204
diff -u -r1.203 -r1.204
--- kdepim.spec	15 Jan 2009 03:21:16 -0000	1.203
+++ kdepim.spec	22 Jan 2009 11:43:44 -0000	1.204
@@ -5,13 +5,13 @@
 Name:    kdepim
 Summary: PIM (Personal Information Manager) applications
 Epoch:   6
-Version: 4.1.96
-Release: 3%{?dist}
+Version: 4.2.0
+Release: 1%{?dist}
 
 License: GPLv2
 Group:   Applications/Productivity
 URL:	 http://www.kde.org/
-Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/%{name}-%{version}.tar.bz2
+Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
 Patch0:  kdepim-4.1.80-libqgpgme-link-fix.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -180,6 +180,9 @@
 
 
 %changelog
+* Thu Jan 22 2009 Than Ngo <than at redhat.com> - 4.2.0-1
+- 4.2.0
+
 * Thu Jan 15 2009 Rex Dieter <rdieter at fedoraproject.org> 4.1.96-3
 - move libkpilot_*.so -devel -> main pkg
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdepim/devel/sources,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- sources	7 Jan 2009 20:10:07 -0000	1.65
+++ sources	22 Jan 2009 11:43:44 -0000	1.66
@@ -1 +1 @@
-4dceae1e430dfef40551f94495cb1f53  kdepim-4.1.96.tar.bz2
+a80631de21930b2544c86722138aaa6c  kdepim-4.2.0.tar.bz2



From than at fedoraproject.org  Thu Jan 22 11:52:22 2009
From: than at fedoraproject.org (Than Ngo)
Date: Thu, 22 Jan 2009 11:52:22 +0000 (UTC)
Subject: rpms/kdepimlibs/devel .cvsignore, 1.31, 1.32 kdepimlibs.spec, 1.67, 
	1.68 sources, 1.31, 1.32
Message-ID: <20090122115222.AE2B670033@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdepimlibs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30305

Modified Files:
	.cvsignore kdepimlibs.spec sources 
Log Message:
4.2.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdepimlibs/devel/.cvsignore,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- .cvsignore	7 Jan 2009 20:15:59 -0000	1.31
+++ .cvsignore	22 Jan 2009 11:51:52 -0000	1.32
@@ -1,2 +1,3 @@
 kdepimlibs-4.1.85.tar.bz2
 kdepimlibs-4.1.96.tar.bz2
+kdepimlibs-4.2.0.tar.bz2


Index: kdepimlibs.spec
===================================================================
RCS file: /cvs/extras/rpms/kdepimlibs/devel/kdepimlibs.spec,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- kdepimlibs.spec	8 Jan 2009 19:04:14 -0000	1.67
+++ kdepimlibs.spec	22 Jan 2009 11:51:52 -0000	1.68
@@ -11,18 +11,18 @@
 %define rest 1
 #endif
 
-%define akonadi_version 1.0.81
+%define akonadi_version 1.1.1
 
 Name: kdepimlibs
-Version: 4.1.96
-Release: 2%{?dist}
+Version: 4.2.0
+Release: 1%{?dist}
 Summary: K Desktop Environment 4 - PIM Libraries
 
 License: LGPLv2
 Group: System Environment/Libraries
 
 URL: http://www.kde.org/
-Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdepimlibs-%{version}.tar.bz2
+Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdepimlibs-%{version}.tar.bz2
 Patch0: kdepimlibs-4.1.85-debug-cmake-crash.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -180,6 +180,9 @@
 
 
 %changelog
+* Thu Jan 22 2009 Than Ngo <than at redhat.com> - 4.2.0-1
+- 4.2.0
+
 * Thu Jan 08 2009 Lorenzo Villani <lvillani at binaryhelix.net> - 4.1.96-2
 - fix build on Fedora 10 (cmake < 2.6.3 seems to have a different
   behaviour here)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdepimlibs/devel/sources,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- sources	7 Jan 2009 20:15:59 -0000	1.31
+++ sources	22 Jan 2009 11:51:52 -0000	1.32
@@ -1 +1 @@
-1ce1fd2ad92e765678c3f858c2a89fd0  kdepimlibs-4.1.96.tar.bz2
+8a91677e2dca7d4db26b33c78e239e5e  kdepimlibs-4.2.0.tar.bz2



From than at fedoraproject.org  Thu Jan 22 12:12:15 2009
From: than at fedoraproject.org (Than Ngo)
Date: Thu, 22 Jan 2009 12:12:15 +0000 (UTC)
Subject: rpms/kdeplasma-addons/devel .cvsignore, 1.9,
	1.10 kdeplasma-addons.spec, 1.21, 1.22 sources, 1.9, 1.10
Message-ID: <20090122121215.9EF1670033@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdeplasma-addons/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv915

Modified Files:
	.cvsignore kdeplasma-addons.spec sources 
Log Message:
4.2.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdeplasma-addons/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	7 Jan 2009 20:21:35 -0000	1.9
+++ .cvsignore	22 Jan 2009 12:11:45 -0000	1.10
@@ -2,3 +2,4 @@
 kdeplasma-addons-4.1.80.tar.bz2
 kdeplasma-addons-4.1.85.tar.bz2
 kdeplasma-addons-4.1.96.tar.bz2
+kdeplasma-addons-4.2.0.tar.bz2


Index: kdeplasma-addons.spec
===================================================================
RCS file: /cvs/extras/rpms/kdeplasma-addons/devel/kdeplasma-addons.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- kdeplasma-addons.spec	10 Jan 2009 21:04:19 -0000	1.21
+++ kdeplasma-addons.spec	22 Jan 2009 12:11:45 -0000	1.22
@@ -1,12 +1,12 @@
 Name:           kdeplasma-addons
-Version:        4.1.96
+Version:        4.2.0
 Release:        1%{?dist}
 Summary:        Additional plasmoids for KDE
 
 Group:          User Interface/Desktops
 License:        GPLv2
 URL:            http://www.kde.org/
-Source0:        ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdeplasma-addons-%{version}.tar.bz2
+Source0:        ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdeplasma-addons-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  boost-devel
@@ -108,6 +108,9 @@
 
 
 %changelog
+* Thu Jan 22 2009 Than Ngo <than at redhat.com> - 4.2.0-1
+- 4.2.0
+
 * Wed Jan 07 2009 Than Ngo <than at redhat.com> - 4.1.96-1
 - 4.2rc1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdeplasma-addons/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	7 Jan 2009 20:21:35 -0000	1.9
+++ sources	22 Jan 2009 12:11:45 -0000	1.10
@@ -1 +1 @@
-323cc2d3da230e1916ad2fda0784da38  kdeplasma-addons-4.1.96.tar.bz2
+d98f805f4c9b7af7278067f9e544b2ec  kdeplasma-addons-4.2.0.tar.bz2



From than at fedoraproject.org  Thu Jan 22 12:21:32 2009
From: than at fedoraproject.org (Than Ngo)
Date: Thu, 22 Jan 2009 12:21:32 +0000 (UTC)
Subject: rpms/kdesdk/devel .cvsignore, 1.53, 1.54 kdesdk.spec, 1.132,
	1.133 sources, 1.55, 1.56 kdesdk-4.1.96-boost-1.37.patch, 1.1, NONE
Message-ID: <20090122122132.E051970033@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdesdk/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2261

Modified Files:
	.cvsignore kdesdk.spec sources 
Removed Files:
	kdesdk-4.1.96-boost-1.37.patch 
Log Message:
4.2.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdesdk/devel/.cvsignore,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- .cvsignore	7 Jan 2009 20:28:57 -0000	1.53
+++ .cvsignore	22 Jan 2009 12:21:02 -0000	1.54
@@ -2,3 +2,4 @@
 kdesdk-4.1.80.tar.bz2
 kdesdk-4.1.85.tar.bz2
 kdesdk-4.1.96.tar.bz2
+kdesdk-4.2.0.tar.bz2


Index: kdesdk.spec
===================================================================
RCS file: /cvs/extras/rpms/kdesdk/devel/kdesdk.spec,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -r1.132 -r1.133
--- kdesdk.spec	19 Jan 2009 19:57:33 -0000	1.132
+++ kdesdk.spec	22 Jan 2009 12:21:02 -0000	1.133
@@ -1,15 +1,14 @@
 Name:           kdesdk
-Version:        4.1.96
-Release:        4%{?dist}
+Version:        4.2.0
+Release:        1%{?dist}
 Summary:        The KDE Software Development Kit (SDK)
 
 Group:          User Interface/Desktops
 # FIXME/TODO: Check license
 License:        GPLv2
 URL:            http://www.kde.org/
-Source0:        ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/%{name}-%{version}.tar.bz2
+Source0:        ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
 # upstream patches
-Patch100:       kdesdk-4.1.96-boost-1.37.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  kdepimlibs-devel >= %{version}
@@ -83,7 +82,6 @@
 %setup -q
 
 # upstream patches
-%patch100 -p1 -b .boost-1.37
 
 %build
 mkdir -p %{_target_platform}
@@ -217,6 +215,9 @@
 
 
 %changelog
+* Thu Jan 22 2009 Than Ngo <than at redhat.com> - 4.2.0-1
+- 4.2.0
+
 * Mon Jan 19 2009 Than Ngo <than at redhat.com> - 4.1.96-4
 - apply patch to fix  build against Boost 1.37.0 
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdesdk/devel/sources,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- sources	7 Jan 2009 20:28:57 -0000	1.55
+++ sources	22 Jan 2009 12:21:02 -0000	1.56
@@ -1 +1 @@
-19ed9d019b0dd81dcb442bffb0561457  kdesdk-4.1.96.tar.bz2
+79d01b4f10f1ecc283f7860d2c7973e9  kdesdk-4.2.0.tar.bz2


--- kdesdk-4.1.96-boost-1.37.patch DELETED ---



From than at fedoraproject.org  Thu Jan 22 12:24:30 2009
From: than at fedoraproject.org (Than Ngo)
Date: Thu, 22 Jan 2009 12:24:30 +0000 (UTC)
Subject: rpms/kdetoys/devel .cvsignore, 1.30, 1.31 kdetoys.spec, 1.42,
	1.43 sources, 1.28, 1.29
Message-ID: <20090122122430.9402C70033@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdetoys/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2773

Modified Files:
	.cvsignore kdetoys.spec sources 
Log Message:
4.2.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdetoys/devel/.cvsignore,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- .cvsignore	7 Jan 2009 20:33:35 -0000	1.30
+++ .cvsignore	22 Jan 2009 12:24:00 -0000	1.31
@@ -2,3 +2,4 @@
 kdetoys-4.1.80.tar.bz2
 kdetoys-4.1.85.tar.bz2
 kdetoys-4.1.96.tar.bz2
+kdetoys-4.2.0.tar.bz2


Index: kdetoys.spec
===================================================================
RCS file: /cvs/extras/rpms/kdetoys/devel/kdetoys.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- kdetoys.spec	10 Jan 2009 05:12:20 -0000	1.42
+++ kdetoys.spec	22 Jan 2009 12:24:00 -0000	1.43
@@ -1,13 +1,13 @@
 Name:           kdetoys
 Summary:        K Desktop Environment - Toys and Amusements
 Epoch:          7
-Version:        4.1.96
+Version:        4.2.0
 Release:        1%{?dist}
 
 License:        GPLv2
 Group:          Amusements/Graphics
 URL:            http://www.kde.org/
-Source0:        ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/%{name}-%{version}.tar.bz2
+Source0:        ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # need kdebase-workspace-devel for KTux
@@ -76,6 +76,9 @@
 
 
 %changelog
+* Thu Jan 22 2009 Than Ngo <than at redhat.com> - 4.2.0-1
+- 4.2.0
+
 * Wed Jan 07 2009 Than Ngo <than at redhat.com> - 4.1.96-1
 - 4.2rc1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdetoys/devel/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- sources	7 Jan 2009 20:33:35 -0000	1.28
+++ sources	22 Jan 2009 12:24:00 -0000	1.29
@@ -1 +1 @@
-9a822c9986bc29eab0d92a0598b12dd5  kdetoys-4.1.96.tar.bz2
+3adf538297e5dca51f15186b4acd02ce  kdetoys-4.2.0.tar.bz2



From mmaslano at fedoraproject.org  Thu Jan 22 12:26:15 2009
From: mmaslano at fedoraproject.org (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?=)
Date: Thu, 22 Jan 2009 12:26:15 +0000 (UTC)
Subject: rpms/perl-libwww-perl/F-10 .cvsignore, 1.13,
	1.14 perl-libwww-perl.spec, 1.29, 1.30 sources, 1.13,
	1.14 perl-libwww-perl-5.817-skip-message-tests.patch, 1.1,
	NONE rt-38736_taint.patch, 1.1, NONE
Message-ID: <20090122122615.25EBD70033@cvs1.fedora.phx.redhat.com>

Author: mmaslano

Update of /cvs/pkgs/rpms/perl-libwww-perl/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3296

Modified Files:
	.cvsignore perl-libwww-perl.spec sources 
Removed Files:
	perl-libwww-perl-5.817-skip-message-tests.patch 
	rt-38736_taint.patch 
Log Message:
* Thu Jan 22 2009 Marcela Ma??l????ov?? <mmaslano at redhat.com> 5.823-1
- update to 5.823



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-libwww-perl/F-10/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	13 Oct 2008 09:51:05 -0000	1.13
+++ .cvsignore	22 Jan 2009 12:25:44 -0000	1.14
@@ -1 +1 @@
-libwww-perl-5.817.tar.gz
+libwww-perl-5.823.tar.gz


Index: perl-libwww-perl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-libwww-perl/F-10/perl-libwww-perl.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- perl-libwww-perl.spec	13 Oct 2008 09:51:06 -0000	1.29
+++ perl-libwww-perl.spec	22 Jan 2009 12:25:44 -0000	1.30
@@ -1,5 +1,5 @@
 Name:           perl-libwww-perl
-Version:        5.817
+Version:        5.823
 Release:        1%{?dist}
 Summary:        A Perl interface to the World-Wide Web
 
@@ -8,13 +8,6 @@
 URL:            http://search.cpan.org/dist/libwww-perl/
 Source0:        http://www.cpan.org/authors/id/G/GA/GAAS/libwww-perl-%{version}.tar.gz
 
-# Patch to skip some tests, because they fail in mock for some reason.
-# If someone can figure out why, we can enable them again.  Since the
-# 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.
-Patch1:         perl-libwww-perl-5.817-skip-message-tests.patch
-Patch2:         rt-38736_taint.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -37,7 +30,7 @@
 
 %prep
 %setup -q -n libwww-perl-%{version} 
-%patch1 -p1
+
 
 # Filter unwanted Provides:
 cat << \EOF > %{name}-prov
@@ -114,6 +107,9 @@
 
 
 %changelog
+* Thu Jan 22 2009 Marcela Ma??l????ov?? <mmaslano at redhat.com> 5.823-1
+- update to 5.823
+
 * Mon Oct 10 2008 Marcela Ma??l????ov?? <mmaslano at redhat.com> 5.817-1
 - update to 5.817
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-libwww-perl/F-10/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	13 Oct 2008 09:51:06 -0000	1.13
+++ sources	22 Jan 2009 12:25:44 -0000	1.14
@@ -1 +1 @@
-076a83d6e5678b84c0dd3c9526686485  libwww-perl-5.817.tar.gz
+9e1d2039e5ed9ed5e0783c2c1c33db8f  libwww-perl-5.823.tar.gz


--- perl-libwww-perl-5.817-skip-message-tests.patch DELETED ---


--- rt-38736_taint.patch DELETED ---



From than at fedoraproject.org  Thu Jan 22 12:30:37 2009
From: than at fedoraproject.org (Than Ngo)
Date: Thu, 22 Jan 2009 12:30:37 +0000 (UTC)
Subject: rpms/kdeutils/devel .cvsignore, 1.57, 1.58 kdeutils.spec, 1.156,
	1.157 sources, 1.59, 1.60
Message-ID: <20090122123037.93E4570033@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdeutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4677

Modified Files:
	.cvsignore kdeutils.spec sources 
Log Message:
4.2.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdeutils/devel/.cvsignore,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- .cvsignore	7 Jan 2009 20:38:57 -0000	1.57
+++ .cvsignore	22 Jan 2009 12:30:07 -0000	1.58
@@ -2,3 +2,4 @@
 kdeutils-4.1.80.tar.bz2
 kdeutils-4.1.85.tar.bz2
 kdeutils-4.1.96.tar.bz2
+kdeutils-4.2.0.tar.bz2


Index: kdeutils.spec
===================================================================
RCS file: /cvs/extras/rpms/kdeutils/devel/kdeutils.spec,v
retrieving revision 1.156
retrieving revision 1.157
diff -u -r1.156 -r1.157
--- kdeutils.spec	15 Jan 2009 01:33:34 -0000	1.156
+++ kdeutils.spec	22 Jan 2009 12:30:07 -0000	1.157
@@ -3,26 +3,17 @@
 %define printer_applet 1
 %endif
 
-%if 0%{?fedora} == 9
-# continue including kjots here (as in 4.0) for F9 (we don't have kdepim 4.1 there)
-%define include_kjots 1
-%endif
-
 Name:           kdeutils
 Epoch:          6
-Version:        4.1.96
-Release:        2%{?dist}
+Version:        4.2.0
+Release:        1%{?dist}
 Summary:        K Desktop Environment - Utilities
 
 Group:          Applications/System
 # FIXME/TODO: Check license
 License:        GPLv2
 URL:            http://www.kde.org
-Source0:        ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/%{name}-%{version}.tar.bz2
-%if 0%{?include_kjots}
-Source1:        ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdepim-%{version}.tar.bz2
-Patch0:         kdeutils-4.0.99-kjots-without-kdepim.patch
-%endif
+Source0:        ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # FIXME/TODO: Tpctl is needed for klaptopdaemon
@@ -62,9 +53,6 @@
   * kdf (view disk usage)
   * kfloppy (floppy formatting tool)
   * kgpg (gpg gui)
-%if 0%{?include_kjots}
-  * kjots (note taker)
-%endif
   * ktimer (task scheduler)
   * kwalletmanager (kde wallet management Tool)
   * kwikdisk (removable media utility)
@@ -89,18 +77,6 @@
 
 %prep
 %setup -q
-%if 0%{?include_kjots}
-# unpack kdepim
-%setup -q -T -D -a 1
-# extract kjots
-mv -f kdepim-%{version}/kjots .
-# extract kjots documentation
-mv -f kdepim-%{version}/doc/kjots doc
-# get rid of the rest of kdepim
-rm -rf kdepim-%{version}
-# make kjots build with kdeutils
-%patch0 -p1 -b .kjots
-%endif
 
 %build
 
@@ -172,10 +148,6 @@
 %{_kde4_configdir}/*
 %{_kde4_libdir}/libkdeinit*.so
 %{_kde4_libdir}/kde4/*
-%if 0%{?include_kjots}
-%{_kde4_appsdir}/kjots/
-%{_kde4_docdir}/HTML/en/kjots/
-%endif
 %{_mandir}/man1/*
 
 %if 0
@@ -194,6 +166,9 @@
 
 
 %changelog
+* Thu Jan 22 2009 Than Ngo <than at redhat.com> - 4.2.0-1
+- 4.2.0
+
 * Wed Jan 14 2009 Rex Dieter <rdieter at fedoraproject.org> 4.1.96-2
 - (Build)Req: system-config-printer-libs
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdeutils/devel/sources,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- sources	7 Jan 2009 20:38:57 -0000	1.59
+++ sources	22 Jan 2009 12:30:07 -0000	1.60
@@ -1 +1 @@
-3e154bdb5d84501b372e2305150c4b47  kdeutils-4.1.96.tar.bz2
+f0ca24c7d3e5bb0ab55bf6b26fc6224e  kdeutils-4.2.0.tar.bz2



From than at fedoraproject.org  Thu Jan 22 12:49:20 2009
From: than at fedoraproject.org (Than Ngo)
Date: Thu, 22 Jan 2009 12:49:20 +0000 (UTC)
Subject: rpms/phonon/devel .cvsignore, 1.8, 1.9 phonon.spec, 1.21,
	1.22 sources, 1.10, 1.11
Message-ID: <20090122124920.77EA070033@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/phonon/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7800

Modified Files:
	.cvsignore phonon.spec sources 
Log Message:
4.3.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/phonon/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	8 Jan 2009 21:02:29 -0000	1.8
+++ .cvsignore	22 Jan 2009 12:48:50 -0000	1.9
@@ -1 +1,2 @@
 phonon-4.2.96.tar.bz2
+phonon-4.3.0.tar.bz2


Index: phonon.spec
===================================================================
RCS file: /cvs/extras/rpms/phonon/devel/phonon.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- phonon.spec	9 Jan 2009 01:31:53 -0000	1.21
+++ phonon.spec	22 Jan 2009 12:48:50 -0000	1.22
@@ -1,12 +1,12 @@
 Summary: Multimedia framework api
 Name:    phonon
-Version: 4.2.96
-Release: 3%{?dist}
+Version: 4.3.0
+Release: 1%{?dist}
 
 Group:   System Environment/Libraries
 License: LGPLv2+
 URL:     http://phonon.kde.org/
-Source0: ftp://ftp.kde.org/pub/kde/unstable/4.1.96/src/phonon-%{version}.tar.bz2
+Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{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
@@ -140,6 +140,9 @@
 
 
 %changelog
+* Thu Jan 22 2009 Than Ngo <than at redhat.com> - 4.3.0-1
+- 4.3.0
+
 * Thu Jan 08 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.96-3
 - new tarball
 - put icons/scriptlets into main pkg


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/phonon/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	9 Jan 2009 01:31:53 -0000	1.10
+++ sources	22 Jan 2009 12:48:50 -0000	1.11
@@ -1 +1 @@
-35b64db6e850df7d492f812a85b16982  phonon-4.2.96.tar.bz2
+f851219ec1fb4eadc7904f053b6b498d  phonon-4.3.0.tar.bz2



From pkgdb at fedoraproject.org  Thu Jan 22 12:54:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Jan 2009 12:54:57 +0000
Subject: [pkgdb] bacula: limb has requested watchcommits
Message-ID: <20090122125458.0FF9C208480@bastion.fedora.phx.redhat.com>

limb has requested the watchcommits acl on bacula (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bacula



From pkgdb at fedoraproject.org  Thu Jan 22 12:54:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Jan 2009 12:54:59 +0000
Subject: [pkgdb] bacula: limb has requested commit
Message-ID: <20090122125459.BFEDA208484@bastion.fedora.phx.redhat.com>

limb has requested the commit acl on bacula (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bacula



From pkgdb at fedoraproject.org  Thu Jan 22 12:55:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Jan 2009 12:55:00 +0000
Subject: [pkgdb] bacula: limb has requested approveacls
Message-ID: <20090122125500.8ACF9208489@bastion.fedora.phx.redhat.com>

limb has requested the approveacls acl on bacula (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bacula



From pkgdb at fedoraproject.org  Thu Jan 22 12:55:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Jan 2009 12:55:05 +0000
Subject: [pkgdb] bacula: limb has requested watchcommits
Message-ID: <20090122125505.5239E20848F@bastion.fedora.phx.redhat.com>

limb has requested the watchcommits acl on bacula (Fedora EPEL 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bacula



From pkgdb at fedoraproject.org  Thu Jan 22 12:55:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Jan 2009 12:55:06 +0000
Subject: [pkgdb] bacula: limb has requested commit
Message-ID: <20090122125506.7F0B6208495@bastion.fedora.phx.redhat.com>

limb has requested the commit acl on bacula (Fedora EPEL 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bacula



From pkgdb at fedoraproject.org  Thu Jan 22 12:55:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Jan 2009 12:55:06 +0000
Subject: [pkgdb] bacula: limb has requested approveacls
Message-ID: <20090122125506.DAF642084B7@bastion.fedora.phx.redhat.com>

limb has requested the approveacls acl on bacula (Fedora EPEL 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bacula



From jgranado at fedoraproject.org  Thu Jan 22 13:00:37 2009
From: jgranado at fedoraproject.org (Joel Andres Granados Moreno)
Date: Thu, 22 Jan 2009 13:00:37 +0000 (UTC)
Subject: rpms/parted/devel parted-1.8.8-avoid-none-stat.patch, NONE,
	1.1 parted.spec, 1.127, 1.128
Message-ID: <20090122130037.8770670033@cvs1.fedora.phx.redhat.com>

Author: jgranado

Update of /cvs/pkgs/rpms/parted/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9116

Modified Files:
	parted.spec 
Added Files:
	parted-1.8.8-avoid-none-stat.patch 
Log Message:
- Avoid the calling of stat for strings that don't begin with the "/" char (#353191).


parted-1.8.8-avoid-none-stat.patch:

--- NEW FILE parted-1.8.8-avoid-none-stat.patch ---
diff --git a/libparted/arch/linux.c b/libparted/arch/linux.c
index 83e24c8..8734ab7 100644
--- a/libparted/arch/linux.c
+++ b/libparted/arch/linux.c
@@ -2107,6 +2107,8 @@ _mount_table_search (const char* file_name, dev_t dev)
                 return 0;
         while (fgets (line, 512, file)) {
                 junk = sscanf (line, "%s", part_name);
+                if (part_name[0] != '/')
+                        continue;
                 if (stat (part_name, &part_stat) == 0) {
                         if (part_stat.st_rdev == dev) {
                                 fclose (file);


Index: parted.spec
===================================================================
RCS file: /cvs/pkgs/rpms/parted/devel/parted.spec,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -r1.127 -r1.128
--- parted.spec	13 Dec 2008 17:46:59 -0000	1.127
+++ parted.spec	22 Jan 2009 13:00:07 -0000	1.128
@@ -4,7 +4,7 @@
 Summary: The GNU disk partition manipulation program
 Name:    parted
 Version: 1.8.8
-Release: 11%{?dist}
+Release: 12%{?dist}
 License: GPLv3+
 Group:   Applications/System
 URL:     http://www.gnu.org/software/parted
@@ -21,6 +21,7 @@
 Patch8:  %{name}-1.8.8-appletv.patch
 Patch9:  %{name}-1.8.8-s390-compile.patch
 Patch10: %{name}-1.8.8-sparc-enableraid.patch
+Patch11: %{name}-1.8.8-avoid-none-stat.patch
 
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: e2fsprogs-devel
@@ -68,6 +69,7 @@
 %patch8 -p1 -b .appletv
 %patch9 -p1 -b .s390-compile
 %patch10 -p1 -b .sparc-raid
+%patch11 -p1 -b .avoid-none-stat
 
 %build
 %configure --enable-device-mapper --enable-selinux --disable-static
@@ -125,6 +127,9 @@
 %{_exec_prefix}/%{_lib}/pkgconfig/libparted.pc
 
 %changelog
+* Thu Jan 22 2009 Joel Granados <jgranado at redhat.com> - 1.8.8.-12
+- Avoid the calling of stat for strings that don't begin with the "/" char (#353191).
+
 * Sat Dec 13 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1.8.8-11
 - fix typo in last patch
 



From pkgdb at fedoraproject.org  Thu Jan 22 13:01:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Jan 2009 13:01:22 +0000
Subject: [pkgdb] bacula had acl change status
Message-ID: <20090122130122.E26A9208481@bastion.fedora.phx.redhat.com>

ixs has set the approveacls acl on bacula (Fedora devel) to Approved for limb

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bacula



From pkgdb at fedoraproject.org  Thu Jan 22 13:01:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Jan 2009 13:01:34 +0000
Subject: [pkgdb] bacula had acl change status
Message-ID: <20090122130134.4DEB7208485@bastion.fedora.phx.redhat.com>

ixs has set the approveacls acl on bacula (Fedora EPEL 4) to Approved for limb

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bacula



From pkgdb at fedoraproject.org  Thu Jan 22 13:01:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Jan 2009 13:01:36 +0000
Subject: [pkgdb] bacula had acl change status
Message-ID: <20090122130138.3F02820848C@bastion.fedora.phx.redhat.com>

ixs has set the watchcommits acl on bacula (Fedora EPEL 4) to Approved for limb

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bacula



From pkgdb at fedoraproject.org  Thu Jan 22 13:01:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Jan 2009 13:01:38 +0000
Subject: [pkgdb] bacula had acl change status
Message-ID: <20090122130138.BE4BF208482@bastion.fedora.phx.redhat.com>

ixs has set the commit acl on bacula (Fedora EPEL 4) to Approved for limb

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bacula



From pkgdb at fedoraproject.org  Thu Jan 22 13:01:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Jan 2009 13:01:44 +0000
Subject: [pkgdb] bacula had acl change status
Message-ID: <20090122130144.6D8D0208493@bastion.fedora.phx.redhat.com>

ixs has set the watchcommits acl on bacula (Fedora EPEL 5) to Approved for limb

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bacula



From pkgdb at fedoraproject.org  Thu Jan 22 13:01:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Jan 2009 13:01:46 +0000
Subject: [pkgdb] bacula had acl change status
Message-ID: <20090122130146.3349B2084A7@bastion.fedora.phx.redhat.com>

ixs has set the commit acl on bacula (Fedora EPEL 5) to Approved for limb

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bacula



From pkgdb at fedoraproject.org  Thu Jan 22 13:01:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Jan 2009 13:01:47 +0000
Subject: [pkgdb] bacula had acl change status
Message-ID: <20090122130147.8EC97208605@bastion.fedora.phx.redhat.com>

ixs has set the approveacls acl on bacula (Fedora EPEL 5) to Approved for limb

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bacula



From pkgdb at fedoraproject.org  Thu Jan 22 13:01:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Jan 2009 13:01:58 +0000
Subject: [pkgdb] bacula had acl change status
Message-ID: <20090122130158.55E24208487@bastion.fedora.phx.redhat.com>

ixs has set the commit acl on bacula (Fedora 8) to Obsolete for fschwarz

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bacula



From pkgdb at fedoraproject.org  Thu Jan 22 13:01:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Jan 2009 13:01:59 +0000
Subject: [pkgdb] bacula had acl change status
Message-ID: <20090122130159.DFB2F20848B@bastion.fedora.phx.redhat.com>

ixs has set the approveacls acl on bacula (Fedora 8) to Obsolete for fschwarz

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bacula



From pkgdb at fedoraproject.org  Thu Jan 22 13:02:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Jan 2009 13:02:03 +0000
Subject: [pkgdb] bacula had acl change status
Message-ID: <20090122130203.3D76320860C@bastion.fedora.phx.redhat.com>

ixs has set the approveacls acl on bacula (Fedora 8) to Obsolete for limb

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bacula



From pkgdb at fedoraproject.org  Thu Jan 22 13:02:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Jan 2009 13:02:07 +0000
Subject: [pkgdb] bacula had acl change status
Message-ID: <20090122130208.01C83208678@bastion.fedora.phx.redhat.com>

ixs has set the approveacls acl on bacula (Fedora 9) to Obsolete for fschwarz

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bacula



From pkgdb at fedoraproject.org  Thu Jan 22 13:02:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Jan 2009 13:02:08 +0000
Subject: [pkgdb] bacula had acl change status
Message-ID: <20090122130208.884682086F7@bastion.fedora.phx.redhat.com>

ixs has set the approveacls acl on bacula (Fedora 9) to Obsolete for limb

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bacula



From pkgdb at fedoraproject.org  Thu Jan 22 13:02:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Jan 2009 13:02:11 +0000
Subject: [pkgdb] bacula had acl change status
Message-ID: <20090122130211.8191420848C@bastion.fedora.phx.redhat.com>

ixs has set the approveacls acl on bacula (Fedora 10) to Obsolete for fschwarz

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bacula



From pkgdb at fedoraproject.org  Thu Jan 22 13:02:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Jan 2009 13:02:13 +0000
Subject: [pkgdb] bacula had acl change status
Message-ID: <20090122130213.6EA6420873D@bastion.fedora.phx.redhat.com>

ixs has set the approveacls acl on bacula (Fedora 10) to Obsolete for limb

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bacula



From fabbione at fedoraproject.org  Thu Jan 22 13:03:33 2009
From: fabbione at fedoraproject.org (Fabio M. Di Nitto)
Date: Thu, 22 Jan 2009 13:03:33 +0000 (UTC)
Subject: rpms/cman/F-9 .cvsignore, 1.34, 1.35 cman.spec, 1.112, 1.113 sources,
	1.43, 1.44
Message-ID: <20090122130333.6B91270033@cvs1.fedora.phx.redhat.com>

Author: fabbione

Update of /cvs/pkgs/rpms/cman/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9633

Modified Files:
	.cvsignore cman.spec sources 
Log Message:
New upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cman/F-9/.cvsignore,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- .cvsignore	10 Dec 2008 10:50:47 -0000	1.34
+++ .cvsignore	22 Jan 2009 13:03:02 -0000	1.35
@@ -1 +1 @@
-cluster-2.03.10.tar.gz
+cluster-2.03.11.tar.gz


Index: cman.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cman/F-9/cman.spec,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -r1.112 -r1.113
--- cman.spec	10 Dec 2008 10:50:47 -0000	1.112
+++ cman.spec	22 Jan 2009 13:03:03 -0000	1.113
@@ -18,7 +18,7 @@
 
 Name: cman
 Summary: CMAN - The Cluster Manager
-Version: 2.03.10
+Version: 2.03.11
 Release: 1%{?alphatag:.%{alphatag}}%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Base
@@ -164,6 +164,10 @@
 CMAN - The Cluster Manager development package
 
 %changelog
+* Thu Jan 22 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 2.03.11-1
+- New upstream release
+  Fix several bugs and drastically improve startup errors.
+
 * Wed Dec 10 2008 Fabio M. Di Nitto <fdinitto at redhat.com> - 2.03.10-1
 - New upstream release
   Fix several bugs and port gfs1 code to match 2.6.27 kernel.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cman/F-9/sources,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- sources	10 Dec 2008 10:50:47 -0000	1.43
+++ sources	22 Jan 2009 13:03:03 -0000	1.44
@@ -1 +1 @@
-379b560096e315d4b52e238a5c72ba4a  cluster-2.03.10.tar.gz
+712b9f583472d1de614641bc0f4a0aaf  cluster-2.03.11.tar.gz



From ovasik at fedoraproject.org  Thu Jan 22 13:15:54 2009
From: ovasik at fedoraproject.org (Ondrej Vasik)
Date: Thu, 22 Jan 2009 13:15:54 +0000 (UTC)
Subject: rpms/setup/devel .cvsignore, 1.57, 1.58 setup.spec, 1.67,
	1.68 sources, 1.58, 1.59
Message-ID: <20090122131554.3058870033@cvs1.fedora.phx.redhat.com>

Author: ovasik

Update of /cvs/extras/rpms/setup/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11977

Modified Files:
	.cvsignore setup.spec sources 
Log Message:
synchronize /etc/services with latest IANA, do not use tabs in that file to have consistent output, fixe indentation in /etc/profile and /etc/bashrc (#481074) , assign uid 36 for vdsm, gid 36 for kvm(#346151, #481021)


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/setup/devel/.cvsignore,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- .cvsignore	20 Jan 2009 13:36:13 -0000	1.57
+++ .cvsignore	22 Jan 2009 13:15:23 -0000	1.58
@@ -1 +1 @@
-setup-2.7.6.tar.bz2
+setup-2.7.7.tar.bz2


Index: setup.spec
===================================================================
RCS file: /cvs/extras/rpms/setup/devel/setup.spec,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- setup.spec	20 Jan 2009 13:36:13 -0000	1.67
+++ setup.spec	22 Jan 2009 13:15:23 -0000	1.68
@@ -1,6 +1,6 @@
 Summary: A set of system configuration and setup files
 Name: setup
-Version: 2.7.6
+Version: 2.7.7
 Release: 1%{?dist}
 License: Public Domain
 Group: System Environment/Base
@@ -87,6 +87,14 @@
 %ghost %verify(not md5 size mtime) %config(noreplace,missingok) /etc/mtab
 
 %changelog
+* Thu Jan 22 2009 Ondrej Vasik <ovasik at redhat.com> 2.7.7-1
+- synchronize /etc/services with latest IANA, do not use
+  tabs in that file to have consistent output
+- fix indentation in /etc/profile and /etc/bashrc
+  (#481074)
+- assign uid 36 for vdsm, gid 36 for kvm
+  (#346151,#481021)
+
 * Tue Jan 20 2009 Ondrej Vasik <ovasik at redhat.com> 2.7.6-1
 - make uidgid file better parseable (synchronize tabs)
 - reserve gid 11 for group cdrom (udev,MAKEDEV)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/setup/devel/sources,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- sources	20 Jan 2009 13:36:13 -0000	1.58
+++ sources	22 Jan 2009 13:15:23 -0000	1.59
@@ -1 +1 @@
-c59aafd91d123db95f2260edeca679ee  setup-2.7.6.tar.bz2
+233a73e23b7a51f57e9417b4f9c85eaf  setup-2.7.7.tar.bz2



From than at fedoraproject.org  Thu Jan 22 13:18:56 2009
From: than at fedoraproject.org (Than Ngo)
Date: Thu, 22 Jan 2009 13:18:56 +0000 (UTC)
Subject: rpms/kdeutils/devel kdeutils.spec,1.157,1.158
Message-ID: <20090122131856.7DE7270033@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdeutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12444

Modified Files:
	kdeutils.spec 
Log Message:
don't update kdepim 4.2.0 for F9



Index: kdeutils.spec
===================================================================
RCS file: /cvs/extras/rpms/kdeutils/devel/kdeutils.spec,v
retrieving revision 1.157
retrieving revision 1.158
diff -u -r1.157 -r1.158
--- kdeutils.spec	22 Jan 2009 12:30:07 -0000	1.157
+++ kdeutils.spec	22 Jan 2009 13:18:26 -0000	1.158
@@ -3,6 +3,11 @@
 %define printer_applet 1
 %endif
 
+%if 0%{?fedora} == 9
+# continue including kjots here (as in 4.0) for F9 (we don't have kdepim 4.1 there)
+%define include_kjots 1
+%endif
+
 Name:           kdeutils
 Epoch:          6
 Version:        4.2.0
@@ -14,6 +19,10 @@
 License:        GPLv2
 URL:            http://www.kde.org
 Source0:        ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
+%if 0%{?include_kjots}
+Source1:        ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdepim-%{version}.tar.bz2
+Patch0:         kdeutils-4.0.99-kjots-without-kdepim.patch
+%endif
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # FIXME/TODO: Tpctl is needed for klaptopdaemon
@@ -53,6 +62,9 @@
   * kdf (view disk usage)
   * kfloppy (floppy formatting tool)
   * kgpg (gpg gui)
+%if 0%{?include_kjots}
+  * kjots (note taker)
+%endif
   * ktimer (task scheduler)
   * kwalletmanager (kde wallet management Tool)
   * kwikdisk (removable media utility)
@@ -77,6 +89,18 @@
 
 %prep
 %setup -q
+-%if 0%{?include_kjots}
+# unpack kdepim
+%setup -q -T -D -a 1
+# extract kjots
+mv -f kdepim-%{version}/kjots .
+# extract kjots documentation
+mv -f kdepim-%{version}/doc/kjots doc
+# get rid of the rest of kdepim
+rm -rf kdepim-%{version}
+# make kjots build with kdeutils
+%patch0 -p1 -b .kjots
+%endif
 
 %build
 
@@ -148,6 +172,10 @@
 %{_kde4_configdir}/*
 %{_kde4_libdir}/libkdeinit*.so
 %{_kde4_libdir}/kde4/*
+%if 0%{?include_kjots}
+%{_kde4_appsdir}/kjots/
+%{_kde4_docdir}/HTML/en/kjots/
+%endif
 %{_mandir}/man1/*
 
 %if 0



From mschwendt at fedoraproject.org  Thu Jan 22 13:20:24 2009
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Thu, 22 Jan 2009 13:20:24 +0000 (UTC)
Subject: rpms/geeqie/devel .cvsignore, 1.5,
	1.6 geeqie-1.0alpha2-editors.patch, 
	1.1, 1.2 geeqie.spec, 1.11, 1.12 sources, 1.5,
	1.6 geeqie-1.0alpha2-float-layout.patch, 1.1,
	NONE geeqie-1.0alpha2-remote-blank.patch, 1.2, NONE
Message-ID: <20090122132024.6865F179D1E@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/pkgs/rpms/geeqie/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12787

Modified Files:
	.cvsignore geeqie-1.0alpha2-editors.patch geeqie.spec sources 
Removed Files:
	geeqie-1.0alpha2-float-layout.patch 
	geeqie-1.0alpha2-remote-blank.patch 
Log Message:
* Thu Jan 22 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.0-0.11.alpha2.1341svn
- update to svn 1341 for pre-alpha3 testing (image metadata features)
- drop obsolete patches remote-blank and float-layout



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/geeqie/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	24 Dec 2008 22:45:27 -0000	1.5
+++ .cvsignore	22 Jan 2009 13:19:53 -0000	1.6
@@ -1 +1 @@
-geeqie-1.0alpha2-svn-1307.tgz
+geeqie-1.0alpha2-svn-1341.tgz

geeqie-1.0alpha2-editors.patch:

Index: geeqie-1.0alpha2-editors.patch
===================================================================
RCS file: /cvs/pkgs/rpms/geeqie/devel/geeqie-1.0alpha2-editors.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- geeqie-1.0alpha2-editors.patch	31 Jul 2008 09:31:01 -0000	1.1
+++ geeqie-1.0alpha2-editors.patch	22 Jan 2009 13:19:53 -0000	1.2
@@ -1,19 +1,14 @@
-diff -Nur geeqie-1.0alpha2-orig/src/editors.c geeqie-1.0alpha2/src/editors.c
---- geeqie-1.0alpha2-orig/src/editors.c	2008-07-30 22:01:32.000000000 +0200
-+++ geeqie-1.0alpha2/src/editors.c	2008-07-31 10:42:04.000000000 +0200
-@@ -56,13 +56,13 @@
+diff -Nur geeqie-1.0alpha2-1341svn-orig/src/editors.c geeqie-1.0alpha2-1341svn/src/editors.c
+--- geeqie-1.0alpha2-1341svn-orig/src/editors.c	2009-01-21 16:12:56.000000000 +0100
++++ geeqie-1.0alpha2-1341svn/src/editors.c	2009-01-22 12:30:51.000000000 +0100
+@@ -57,8 +57,8 @@
  
  static Editor editor_slot_defaults[GQ_EDITOR_SLOTS] = {
- 	{ N_("The Gimp"), "gimp-remote %{.cr2;.crw;.nef;.raw;*}f" },
+ 	{ N_("The Gimp"), "gimp-remote %{%raw;*}f" },
 -	{ N_("XV"), "xv %f" },
 -	{ N_("Xpaint"), "xpaint %f" },
- 	{ N_("UFraw"), "ufraw %{.cr2;.crw;.nef;.raw}p" },
- 	{ N_("Add XMP sidecar"), "%vFILE=%{.cr2;.crw;.nef;.raw}p;XMP=`echo \"$FILE\"|sed -e 's|\\.[^.]*$|.xmp|'`; exiftool -tagsfromfile \"$FILE\" \"$XMP\"" },
- 	{ N_("Symlink"), "ln -s %p %d"},
- 	{ NULL, NULL },
- 	{ NULL, NULL },
 +	{ NULL, NULL },
 +	{ NULL, NULL },
- 	{ N_("Rotate jpeg clockwise"), "%vif jpegtran -rotate 90 -copy all -outfile %{.jpg;.jpeg}p_tmp %{.jpg;.jpeg}p; then mv %{.jpg;.jpeg}p_tmp %{.jpg;.jpeg}p;else rm %{.jpg;.jpeg}p_tmp;fi" },
- 	{ N_("Rotate jpeg counterclockwise"), "%vif jpegtran -rotate 270 -copy all -outfile %{.jpg;.jpeg}p_tmp %{.jpg;.jpeg}p; then mv %{.jpg;.jpeg}p_tmp %{.jpg;.jpeg}p;else rm %{.jpg;.jpeg}p_tmp;fi" },
- 	/* special slots */
+ 	{ N_("UFraw"), "ufraw %{%raw}p" },
+ 	{ N_("Symlink"), "ln -s %p %d"},
+ 	{ NULL, NULL },


Index: geeqie.spec
===================================================================
RCS file: /cvs/pkgs/rpms/geeqie/devel/geeqie.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- geeqie.spec	24 Dec 2008 22:45:27 -0000	1.11
+++ geeqie.spec	22 Jan 2009 13:19:53 -0000	1.12
@@ -3,21 +3,17 @@
 Summary: Image browser and viewer
 Name: geeqie
 Version: 1.0
-Release: 0.11.alpha2.1307svn%{?dist}
+Release: 0.11.alpha2.1341svn%{?dist}
 License: GPLv3
 Group: User Interface/X
 # svn + autogen
-Source: geeqie-1.0alpha2-svn-1307.tgz
+Source: geeqie-1.0alpha2-svn-1341.tgz
 #Source: http://dl.sf.net/sourceforge/geeqie/%{name}-%{upstreamversion}.tar.gz
 Patch1: geeqie-1.0alpha2-desktop.patch
 Patch2: geeqie-1.0alpha2-editors.patch
 # bz 222639
 Patch3: geeqie-1.0alpha1-print-pagesize.patch
 Patch4: geeqie-1.0alpha2-gcc-warn.patch
-# on version upgrade: remove this!
-Patch5: geeqie-1.0alpha2-remote-blank.patch
-# on version upgrade: remove this!
-Patch6: geeqie-1.0alpha2-float-layout.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n)
 URL: http://geeqie.sourceforge.net/
 BuildRequires: gtk2-devel >= 2.4.0
@@ -48,8 +44,6 @@
 %patch2 -p1 -b .editors
 %patch3 -p1 -b .print-pagesize
 %patch4 -p1 -b .gcc-warn
-%patch5 -p1 -b .remote-blank
-%patch6 -p1 -b .float-layout
 
 
 %build
@@ -98,6 +92,10 @@
 
 
 %changelog
+* Thu Jan 22 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.0-0.11.alpha2.1341svn
+- update to svn 1341 for pre-alpha3 testing (image metadata features)
+- drop obsolete patches remote-blank and float-layout
+
 * Wed Dec 24 2008 Michael Schwendt <mschwendt at fedoraproject.org> - 1.0-0.11.alpha2.1307svn
 - update to svn 1307 for "Safe delete"
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/geeqie/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	24 Dec 2008 22:45:27 -0000	1.5
+++ sources	22 Jan 2009 13:19:53 -0000	1.6
@@ -1 +1 @@
-023d3c3153c0ac267a871426a2027c3c  geeqie-1.0alpha2-svn-1307.tgz
+526efa8d2c7947772ce280800fe64ffe  geeqie-1.0alpha2-svn-1341.tgz


--- geeqie-1.0alpha2-float-layout.patch DELETED ---


--- geeqie-1.0alpha2-remote-blank.patch DELETED ---



From than at fedoraproject.org  Thu Jan 22 13:21:12 2009
From: than at fedoraproject.org (Than Ngo)
Date: Thu, 22 Jan 2009 13:21:12 +0000 (UTC)
Subject: rpms/kdeutils/devel kdeutils.spec,1.158,1.159
Message-ID: <20090122132112.5E8AB70033@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdeutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12910

Modified Files:
	kdeutils.spec 
Log Message:
fix typo



Index: kdeutils.spec
===================================================================
RCS file: /cvs/extras/rpms/kdeutils/devel/kdeutils.spec,v
retrieving revision 1.158
retrieving revision 1.159
diff -u -r1.158 -r1.159
--- kdeutils.spec	22 Jan 2009 13:18:26 -0000	1.158
+++ kdeutils.spec	22 Jan 2009 13:20:42 -0000	1.159
@@ -89,7 +89,7 @@
 
 %prep
 %setup -q
--%if 0%{?include_kjots}
+%if 0%{?include_kjots}
 # unpack kdepim
 %setup -q -T -D -a 1
 # extract kjots



From fabbione at fedoraproject.org  Thu Jan 22 13:22:06 2009
From: fabbione at fedoraproject.org (Fabio M. Di Nitto)
Date: Thu, 22 Jan 2009 13:22:06 +0000 (UTC)
Subject: rpms/gfs2-utils/F-9 .cvsignore, 1.19, 1.20 gfs2-utils.spec, 1.29,
	1.30 sources, 1.20, 1.21
Message-ID: <20090122132206.88C2870033@cvs1.fedora.phx.redhat.com>

Author: fabbione

Update of /cvs/pkgs/rpms/gfs2-utils/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13217

Modified Files:
	.cvsignore gfs2-utils.spec sources 
Log Message:
new upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gfs2-utils/F-9/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- .cvsignore	10 Dec 2008 11:03:26 -0000	1.19
+++ .cvsignore	22 Jan 2009 13:21:36 -0000	1.20
@@ -1 +1 @@
-cluster-2.03.10.tar.gz
+cluster-2.03.11.tar.gz


Index: gfs2-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gfs2-utils/F-9/gfs2-utils.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- gfs2-utils.spec	10 Dec 2008 11:03:26 -0000	1.29
+++ gfs2-utils.spec	22 Jan 2009 13:21:36 -0000	1.30
@@ -11,7 +11,7 @@
 ###############################################################################
 
 Name: gfs2-utils
-Version: 2.03.10
+Version: 2.03.11
 Release: 1%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Kernel
@@ -74,6 +74,10 @@
 %{_mandir}/man8/*gfs2*
 
 %changelog
+* Thu Jan 22 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 2.03.11-1
+- New upstream release
+  Fix several bugs and drastically improve startup errors.
+
 * Wed Dec 10 2008 Fabio M. Di Nitto <fdinitto at redhat.com> - 2.03.10-1
 - New upstream release
   Fix several bugs and port gfs1 code to match 2.6.27 kernel.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gfs2-utils/F-9/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources	10 Dec 2008 11:03:26 -0000	1.20
+++ sources	22 Jan 2009 13:21:36 -0000	1.21
@@ -1 +1 @@
-379b560096e315d4b52e238a5c72ba4a  cluster-2.03.10.tar.gz
+712b9f583472d1de614641bc0f4a0aaf  cluster-2.03.11.tar.gz



From fabbione at fedoraproject.org  Thu Jan 22 13:25:47 2009
From: fabbione at fedoraproject.org (Fabio M. Di Nitto)
Date: Thu, 22 Jan 2009 13:25:47 +0000 (UTC)
Subject: rpms/rgmanager/F-9 .cvsignore, 1.21, 1.22 rgmanager.spec, 1.51,
	1.52 sources, 1.30, 1.31
Message-ID: <20090122132547.6D14870033@cvs1.fedora.phx.redhat.com>

Author: fabbione

Update of /cvs/pkgs/rpms/rgmanager/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13942

Modified Files:
	.cvsignore rgmanager.spec sources 
Log Message:
New upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rgmanager/F-9/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- .cvsignore	10 Dec 2008 11:08:20 -0000	1.21
+++ .cvsignore	22 Jan 2009 13:25:16 -0000	1.22
@@ -1 +1 @@
-cluster-2.03.10.tar.gz
+cluster-2.03.11.tar.gz


Index: rgmanager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rgmanager/F-9/rgmanager.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- rgmanager.spec	10 Dec 2008 11:08:21 -0000	1.51
+++ rgmanager.spec	22 Jan 2009 13:25:17 -0000	1.52
@@ -12,7 +12,7 @@
 
 Name: rgmanager
 Summary: Open Source HA Resource Group Failover for Red Hat Enterprise Linux
-Version: 2.03.10
+Version: 2.03.11
 Release: 1%{?alphatag:.%{alphatag}}%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Base
@@ -80,6 +80,10 @@
 %{_mandir}/man8/clu*
 
 %changelog
+* Thu Jan 22 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 2.03.11-1
+- New upstream release
+  Fix several bugs and drastically improve startup errors.
+
 * Wed Dec 10 2008 Fabio M. Di Nitto <fdinitto at redhat.com> - 2.03.10-1
 - New upstream release
   Fix several bugs and port gfs1 code to match 2.6.27 kernel.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rgmanager/F-9/sources,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- sources	10 Dec 2008 11:08:21 -0000	1.30
+++ sources	22 Jan 2009 13:25:17 -0000	1.31
@@ -1 +1 @@
-379b560096e315d4b52e238a5c72ba4a  cluster-2.03.10.tar.gz
+712b9f583472d1de614641bc0f4a0aaf  cluster-2.03.11.tar.gz



From allisson at fedoraproject.org  Thu Jan 22 13:26:21 2009
From: allisson at fedoraproject.org (Allisson Azevedo)
Date: Thu, 22 Jan 2009 13:26:21 +0000 (UTC)
Subject: rpms/clutter/devel clutter.spec,1.13,1.14 import.log,1.4,1.5
Message-ID: <20090122132621.A736E179D1E@cvs1.fedora.phx.redhat.com>

Author: allisson

Update of /cvs/pkgs/rpms/clutter/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14125/devel

Modified Files:
	clutter.spec import.log 
Log Message:

- Added gtk-doc for cogl
- Created doc subpackage



Index: clutter.spec
===================================================================
RCS file: /cvs/pkgs/rpms/clutter/devel/clutter.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- clutter.spec	22 Jan 2009 03:39:00 -0000	1.13
+++ clutter.spec	22 Jan 2009 13:25:51 -0000	1.14
@@ -1,6 +1,6 @@
 Name:           clutter
 Version:        0.8.6
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Open Source software library for creating rich graphical user interfaces
 
 Group:          Development/Libraries
@@ -29,6 +29,22 @@
 Header files and libraries for building a extension library for the
 clutter
 
+
+%package        doc
+Summary:        Documentation for %{name}
+Group:          Documentation
+Requires:       %{name} = %{version}-%{release}
+BuildArch:      noarch
+
+%description    doc
+Clutter is an open source software library for creating fast, 
+visually rich graphical user interfaces. The most obvious example 
+of potential usage is in media center type applications. 
+We hope however it can be used for a lot more.
+
+This package contains documentation for clutter.
+
+
 %prep
 %setup -q
 
@@ -59,11 +75,21 @@
 %{_includedir}/*
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/*.pc
+
+%files doc
+%defattr(-, root, root)
+#%dir %{_datadir}/gtk-doc/html/clutter
 %{_datadir}/gtk-doc/html/clutter
-%exclude %{_datadir}/gtk-doc/html/cogl
+#%dir %{_datadir}/gtk-doc/html/cogl
+%{_datadir}/gtk-doc/html/cogl
+
 
 %changelog
 
+* Wed Jan 21 2009 Allisson Azevedo <allisson at gmail.com> 0.8.6-2
+- Added gtk-doc for cogl
+- Created doc subpackage
+
 * Wed Jan 21 2009 Allisson Azevedo <allisson at gmail.com> 0.8.6-1
 - Update to 0.8.6
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/clutter/devel/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- import.log	22 Jan 2009 03:39:00 -0000	1.4
+++ import.log	22 Jan 2009 13:25:51 -0000	1.5
@@ -2,3 +2,4 @@
 clutter-0_8_0-1_fc9:HEAD:clutter-0.8.0-1.fc9.src.rpm:1220760678
 clutter-0_8_2-1_fc9:HEAD:clutter-0.8.2-1.fc9.src.rpm:1223343853
 clutter-0_8_6-1_fc10:HEAD:clutter-0.8.6-1.fc10.src.rpm:1232595301
+clutter-0_8_6-2_fc10:HEAD:clutter-0.8.6-2.fc10.src.rpm:1232630582



From limb at fedoraproject.org  Thu Jan 22 13:51:58 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Thu, 22 Jan 2009 13:51:58 +0000 (UTC)
Subject: rpms/bacula/EL-5 bacula-config.patch, 1.1,
	1.2 bacula-director-configuration.patch, 1.1,
	1.2 bacula-gconsole.desktop, 1.1, 1.2 bacula-pamd.patch, 1.1,
	1.2 bacula-traymonitor.desktop, 1.1,
	1.2 bacula-wxconsole.desktop, 1.1, 1.2 bacula.spec, 1.3,
	1.4 sources, 1.2, 1.3
Message-ID: <20090122135158.B9BC570033@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/bacula/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19520

Modified Files:
	bacula-config.patch bacula-director-configuration.patch 
	bacula-gconsole.desktop bacula-pamd.patch 
	bacula-traymonitor.desktop bacula-wxconsole.desktop 
	bacula.spec sources 
Log Message:
2.4.4, multiple fixes.


bacula-config.patch:

Index: bacula-config.patch
===================================================================
RCS file: /cvs/pkgs/rpms/bacula/EL-5/bacula-config.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- bacula-config.patch	24 Jul 2007 20:23:33 -0000	1.1
+++ bacula-config.patch	22 Jan 2009 13:51:28 -0000	1.2
@@ -1,256 +1,122 @@
---- bacula-2.0.2/src/gnome2-console/gnome-console.conf.in.orig	2007-02-06 13:35:12.000000000 +0100
-+++ bacula-2.0.2/src/gnome2-console/gnome-console.conf.in	2007-02-06 13:35:25.000000000 +0100
-@@ -3,9 +3,9 @@
- #
- 
- Director {
+--- bacula-2.4.3/src/gnome2-console/bgnome-console.conf.in.orig	2008-12-10 10:12:18.000000000 -0600
++++ bacula-2.4.3/src/gnome2-console/bgnome-console.conf.in	2008-12-10 10:12:18.000000000 -0600
+@@ -6 +6 @@
 -  Name = @hostname at -dir
 +  Name = bacula-dir
-   DIRport = @dir_port@
+@@ -8 +8 @@
 -  address = @hostname@
 +  address = server.example.com
-   Password = "@dir_password@"
- }
- 
---- bacula-2.0.2/src/dird/bacula-dir.conf.in.orig	2007-02-06 13:33:19.000000000 +0100
-+++ bacula-2.0.2/src/dird/bacula-dir.conf.in	2007-02-06 13:34:49.000000000 +0100
-@@ -13,7 +13,7 @@
- #
- 
- Director {                            # define myself
+--- bacula-2.4.3/src/dird/bacula-dir.conf.in.orig	2008-12-10 10:17:27.000000000 -0600
++++ bacula-2.4.3/src/dird/bacula-dir.conf.in	2008-12-10 10:17:27.000000000 -0600
+@@ -16 +16 @@
 -  Name = @hostname at -dir
 +  Name = bacula-dir
-   DIRport = @dir_port@                # where we listen for UA connections
-   QueryFile = "@scriptdir@/query.sql"
-   WorkingDirectory = "@working_dir@"
-@@ -27,7 +27,7 @@
-   Name = "DefaultJob"
-   Type = Backup
-   Level = Incremental
+@@ -30 +30 @@
 -  Client = @hostname at -fd 
 +  Client = bacula-fd 
-   FileSet = "Full Set"
-   Schedule = "WeeklyCycle"
-   Storage = File
-@@ -48,7 +48,7 @@
- 
- #Job {
- #  Name = "Client2"
+@@ -51 +51 @@
 -#  Client = @hostname at 2-fd
 +#  Client = bacula2-fd
- #  JobDefs = "DefaultJob"
- #  Write Bootstrap = "@working_dir@/Client2.bsr"
- #}
-@@ -75,7 +75,7 @@
- Job {
-   Name = "RestoreFiles"
-   Type = Restore
+@@ -82 +82 @@
 -  Client=@hostname at -fd                 
 +  Client=bacula-fd                 
-   FileSet="Full Set"                  
-   Storage = File                      
-   Pool = Default
-@@ -149,8 +149,8 @@
- 
- # Client (File Services) to backup
- Client {
+@@ -157,2 +157,2 @@
 -  Name = @hostname at -fd
 -  Address = @hostname@
 +  Name = bacula-fd
 +  Address = client.example.com
-   FDPort = @fd_port@
-   Catalog = MyCatalog
-   Password = "@fd_password@"          # password for FileDaemon
-@@ -164,8 +164,8 @@
- #  You should change Name, Address, and Password before using
- #
- #Client {
+@@ -172,2 +172,2 @@
 -#  Name = @hostname at 2-fd                
 -#  Address = @hostname at 2
 +#  Name = bacula2-fd                
 +#  Address = client2.example.com
- #  FDPort = @fd_port@
- #  Catalog = MyCatalog
- #  Password = "@fd_password at 2"         # password for FileDaemon 2
-@@ -179,7 +179,7 @@
- Storage {
-   Name = File
- # Do not use "localhost" here    
+@@ -187 +187 @@
 -  Address = @hostname@                # N.B. Use a fully qualified name here
-+  Address = storage.example.com        # N.B. Use a fully qualified name here
-   SDPort = @sd_port@
-   Password = "@sd_password@"
-   Device = FileStorage
-@@ -192,7 +192,7 @@
- #Storage {
- #  Name = DDS-4    
- #  Do not use "localhost" here
++  Address = storage.example.com                # N.B. Use a fully qualified name here
+@@ -200 +200 @@
 -#  Address = @hostname@                # N.B. Use a fully qualified name here
-+#  Address = storage.example.com       # N.B. Use a fully qualified name here
- #  SDPort = @sd_port@
- #  Password = "@sd_password@"          # password for Storage daemon
- #  Device = DDS-4                      # must be same as Device in Storage daemon
-@@ -204,7 +204,7 @@
- #Storage {
- #  Name = "8mmDrive"
- #  Do not use "localhost" here
++#  Address = storage.example.com                # N.B. Use a fully qualified name here
+@@ -212 +212 @@
 -#  Address = @hostname@                # N.B. Use a fully qualified name here
-+#  Address = storage.example.com       # N.B. Use a fully qualified name here
- #  SDPort = @sd_port@
- #  Password = "@sd_password@"
- #  Device = "Exabyte 8mm"
-@@ -215,7 +215,7 @@
- #Storage {
- #  Name = "DVD"
- #  Do not use "localhost" here
++#  Address = storage.example.com                # N.B. Use a fully qualified name here
+@@ -223 +223 @@
 -#  Address = @hostname@                # N.B. Use a fully qualified name here
-+#  Address = storage.example.com       # N.B. Use a fully qualified name here
- #  SDPort = @sd_port@
- #  Password = "@sd_password@"
- #  Device = "DVD Writer"
-@@ -285,7 +285,7 @@
- # Restricted console used by tray-monitor to get the status of the director
- #
- Console {
++#  Address = storage.example.com                # N.B. Use a fully qualified name here
+@@ -299 +299 @@
 -  Name = @hostname at -mon
 +  Name = bacula-mon
-   Password = "@mon_dir_password@"
-   CommandACL = status, .status
- }
---- bacula-2.0.2/src/filed/bacula-fd.conf.in.orig	2007-02-06 13:30:59.000000000 +0100
-+++ bacula-2.0.2/src/filed/bacula-fd.conf.in	2007-02-06 13:31:25.000000000 +0100
-@@ -11,7 +11,7 @@
- # List Directors who are permitted to contact this File daemon
- #
- Director {
+--- bacula-2.4.3/src/filed/bacula-fd.conf.in.orig	2008-12-10 10:19:12.000000000 -0600
++++ bacula-2.4.3/src/filed/bacula-fd.conf.in	2008-12-10 10:19:12.000000000 -0600
+@@ -14 +14 @@
 -  Name = @hostname at -dir
 +  Name = bacula-dir
-   Password = "@fd_password@"
- }
- 
-@@ -20,7 +20,7 @@
- #   status of the file daemon
- #
- Director {
+@@ -23 +23 @@
 -  Name = @hostname at -mon
 +  Name = bacula-mon
-   Password = "@mon_fd_password@"
-   Monitor = yes
- }
-@@ -29,7 +29,7 @@
- # "Global" File daemon configuration specifications
- #
- FileDaemon {                          # this is me
+@@ -32 +32 @@
 -  Name = @hostname at -fd
 +  Name = bacula-fd
-   FDport = @fd_port@                  # where we listen for the director
-   WorkingDirectory = @working_dir@
-   Pid Directory = @piddir@
-@@ -39,5 +39,5 @@
- # Send all messages except skipped files back to Director
- Messages {
-   Name = Standard
+@@ -42 +42 @@
 -  director = @hostname at -dir = all, !skipped, !restored
 +  director = bacula-dir = all, !skipped, !restored
- }
---- bacula-2.0.2/src/console/bconsole.conf.in.orig	2007-02-06 13:32:30.000000000 +0100
-+++ bacula-2.0.2/src/console/bconsole.conf.in	2007-02-06 13:33:06.000000000 +0100
-@@ -3,8 +3,8 @@
- #
- 
- Director {
--  Name = @hostname at -dir
-+  Name = bacula-dir
-   DIRport = @dir_port@
--  address = @hostname@
-+  address = server.example.com
-   Password = "@dir_password@"
- }
---- bacula-2.0.2/src/stored/bacula-sd.conf.in.orig	2007-02-06 13:31:56.000000000 +0100
-+++ bacula-2.0.2/src/stored/bacula-sd.conf.in	2007-02-06 13:32:15.000000000 +0100
-@@ -11,7 +11,7 @@
- #
- 
- Storage {                             # definition of myself
+--- bacula-2.4.3/src/stored/bacula-sd.conf.in.orig	2008-12-10 10:21:45.000000000 -0600
++++ bacula-2.4.3/src/stored/bacula-sd.conf.in	2008-12-10 10:21:45.000000000 -0600
+@@ -14 +14 @@
 -  Name = @hostname at -sd
 +  Name = bacula-sd
-   SDPort = @sd_port@                  # Director's port      
-   WorkingDirectory = "@working_dir@"
-   Pid Directory = "@piddir@"
-@@ -22,7 +22,7 @@
- # List Directors who are permitted to contact Storage daemon
- #
- Director {
+@@ -25 +25 @@
 -  Name = @hostname at -dir
 +  Name = bacula-dir
-   Password = "@sd_password@"
- }
- 
-@@ -31,7 +31,7 @@
- #   status of the storage daemon
- #
- Director {
+@@ -34 +34 @@
 -  Name = @hostname at -mon
 +  Name = bacula-mon
-   Password = "@mon_sd_password@"
-   Monitor = yes
- }
-@@ -204,5 +204,5 @@
- #
- Messages {
-   Name = Standard
+@@ -228 +228 @@
 -  director = @hostname at -dir = all
 +  director = bacula-dir = all
- }
---- bacula-2.0.2/src/wx-console/wx-console.conf.in.orig	2007-02-06 13:37:12.000000000 +0100
-+++ bacula-2.0.2/src/wx-console/wx-console.conf.in	2007-02-06 13:47:02.000000000 +0100
-@@ -3,8 +3,8 @@
- #
- 
- Director {
+--- bacula-2.4.3/src/wx-console/bwx-console.conf.in.orig	2008-12-10 10:22:23.000000000 -0600
++++ bacula-2.4.3/src/wx-console/bwx-console.conf.in	2008-12-10 10:22:23.000000000 -0600
+@@ -6 +6 @@
 -  Name = @hostname at -dir
 +  Name = bacula-dir
-   DIRport = @dir_port@
+@@ -8 +8 @@
 -  address = @hostname@
 +  address = server.example.com
-   Password = "@dir_password@"
- }
---- bacula-2.0.2/src/tray-monitor/tray-monitor.conf.in.orig	2007-02-06 13:47:13.000000000 +0100
-+++ bacula-2.0.2/src/tray-monitor/tray-monitor.conf.in	2007-02-06 13:47:55.000000000 +0100
-@@ -3,27 +3,27 @@
- #
- 
- Monitor {
+--- bacula-2.4.3/src/tray-monitor/tray-monitor.conf.in.orig	2008-12-10 10:28:02.000000000 -0600
++++ bacula-2.4.3/src/tray-monitor/tray-monitor.conf.in	2008-12-10 10:28:02.000000000 -0600
+@@ -6 +6 @@
 -  Name = @hostname at -mon
 +  Name = bacula-mon
-   Password = "@mon_dir_password@"         # password for the Directors   
-   RefreshInterval = 5 seconds
- }
-    
- Client {
+@@ -12,2 +12,2 @@
 -  Name = @hostname at -fd
 -  Address = @hostname@
 +  Name = bacula-fd
 +  Address = client.example.com
-   FDPort = @fd_port@
-   Password = "@mon_fd_password@"          # password for FileDaemon
- }
- 
- Storage {
+@@ -19,2 +19,2 @@
 -  Name = @hostname at -sd
 -  Address = @hostname@
 +  Name = bacula-sd
 +  Address = storage.example.com
-   SDPort = @sd_port@
-   Password = "@mon_sd_password@"          # password for StorageDaemon
- }
- 
- Director {
+@@ -26 +26 @@
+-  Name = @hostname at -dir
++  Name = bacula-dir
+@@ -28 +27,0 @@
+-  address = @hostname@
+--- bacula-2.4.3/src/qt-console/bat.conf.in.orig	2008-12-10 10:27:02.000000000 -0600
++++ bacula-2.4.3/src/qt-console/bat.conf.in	2008-12-10 10:27:02.000000000 -0600
+@@ -6 +6 @@
 -  Name = @hostname at -dir
 +  Name = bacula-dir
-   DIRport = @dir_port@
+@@ -8 +8 @@
 -  address = @hostname@
--}
-\ No newline at end of file
 +  address = server.example.com
-+}
+--- bacula-2.4.3/src/stored/stored.conf.in.orig	2008-12-10 10:27:44.000000000 -0600
++++ bacula-2.4.3/src/stored/stored.conf.in	2008-12-10 10:27:44.000000000 -0600
+@@ -11 +11 @@
+-  Address = @hostname@
++  Address = storage.example.com
+@@ -22 +22 @@
+-  Name = @hostname at -dir
++  Name = bacula-dir
+@@ -54 +54 @@
+-  director = @hostname at -dir = all
++  director = bacula-dir = all

bacula-director-configuration.patch:

Index: bacula-director-configuration.patch
===================================================================
RCS file: /cvs/pkgs/rpms/bacula/EL-5/bacula-director-configuration.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- bacula-director-configuration.patch	24 Jul 2007 20:23:33 -0000	1.1
+++ bacula-director-configuration.patch	22 Jan 2009 13:51:28 -0000	1.2
@@ -1,34 +1,17 @@
---- bacula-1.38.11/src/dird/bacula-dir.conf.in.orig	2006-09-03 03:13:26.000000000 +0200
-+++ bacula-1.38.11/src/dird/bacula-dir.conf.in	2006-09-03 03:14:46.000000000 +0200
-@@ -15,7 +15,7 @@
- Director {                            # define myself
-   Name = @hostname at -dir
-   DIRport = @dir_port@                # where we listen for UA connections
+--- bacula-2.4.3/src/dird/bacula-dir.conf.in.orig	2008-12-10 08:59:18.000000000 -0600
++++ bacula-2.4.3/src/dird/bacula-dir.conf.in	2008-12-10 08:59:18.000000000 -0600
+@@ -18 +18 @@
 -  QueryFile = "@scriptdir@/query.sql"
 +  QueryFile = "/etc/bacula/query.sql"
-   WorkingDirectory = "@working_dir@"
-   PidDirectory = "@piddir@"
-   Maximum Concurrent Jobs = 1
-@@ -101,11 +101,10 @@
- #    if you have other partitons such as /usr or /home
- #    you will probably want to add them too.
- #
+@@ -108,3 +108,2 @@
 -#  By default this is defined to point to the Bacula build
 -#    directory to give a reasonable FileSet to backup to
 -#    disk storage during initial testing.
 +#  This File-directive would backup your whole filesystem.
 +#    It is disabled by default
- #
+@@ -112 +111 @@
 -    File = @BUILD_DIR@
-+#    File = /
-   }
- 
- #
-@@ -266,7 +266,7 @@
-   mailcommand = "@sbindir@/bsmtp -h @smtp_host@ -f \"\(Bacula\) %r\" -s \"Bacula daemon message\" %r"
-   mail = @job_email@ = all, !skipped
-   console = all, !skipped, !saved
++    File = /
+@@ -263 +262 @@
 -  append = "@working_dir@/log" = all, !skipped
 +  append = "/var/log/bacula.log" = all, !skipped
- }
-


Index: bacula-gconsole.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/bacula/EL-5/bacula-gconsole.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- bacula-gconsole.desktop	24 Jul 2007 20:23:33 -0000	1.1
+++ bacula-gconsole.desktop	22 Jan 2009 13:51:28 -0000	1.2
@@ -4,9 +4,9 @@
 Name=Bacula Console
 GenericName=Backup Management Console
 Comment=Control your Bacula Server
-Exec=gnome-console -c /etc/bacula/wxconsole.conf
-Icon=bacula.png
+Exec=bgnome-console -c /etc/bacula/bgnome-console.conf
+Icon=bacula
 Terminal=false
 Type=Application
-Categories=System;Application;Utility
+Categories=System;Application;
 

bacula-pamd.patch:

Index: bacula-pamd.patch
===================================================================
RCS file: /cvs/pkgs/rpms/bacula/EL-5/bacula-pamd.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- bacula-pamd.patch	24 Jul 2007 20:23:33 -0000	1.1
+++ bacula-pamd.patch	22 Jan 2009 13:51:28 -0000	1.2
@@ -9,8 +9,8 @@
  session    optional     pam_xauth.so
  session    optional     pam_timestamp.so
  account    required     pam_permit.so
---- bacula-2.0.3/scripts/gnome-console.pamd.orig        2007-07-11 18:42:33.000000000 +0200
-+++ bacula-2.0.3/scripts/gnome-console.pamd     2007-07-11 18:42:57.000000000 +0200
+--- bacula-2.0.3/scripts/bgnome-console.pamd.orig        2007-07-11 18:42:33.000000000 +0200
++++ bacula-2.0.3/scripts/bgnome-console.pamd     2007-07-11 18:42:57.000000000 +0200
 @@ -1,7 +1,7 @@
  #%PAM-1.0
  auth       sufficient   pam_rootok.so


Index: bacula-traymonitor.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/bacula/EL-5/bacula-traymonitor.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- bacula-traymonitor.desktop	24 Jul 2007 20:23:33 -0000	1.1
+++ bacula-traymonitor.desktop	22 Jan 2009 13:51:28 -0000	1.2
@@ -5,7 +5,7 @@
 GenericName=Bacula Tray Monitor
 Comment=Monitor your Bacula Backup server
 Exec=bacula-tray-monitor -c /etc/bacula/tray-monitor.conf
-Icon=bacula-tray-monitor.xpm
+Icon=bacula-tray-monitor
 Terminal=false
 Type=Application
 Categories=System;Application;Utility


Index: bacula-wxconsole.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/bacula/EL-5/bacula-wxconsole.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- bacula-wxconsole.desktop	24 Jul 2007 20:23:33 -0000	1.1
+++ bacula-wxconsole.desktop	22 Jan 2009 13:51:28 -0000	1.2
@@ -4,8 +4,8 @@
 Name=Bacula WX Console
 GenericName=Backup Management Console
 Comment=Control your Bacula Server
-Exec=wxconsole -c /etc/bacula/wxconsole.conf
-Icon=wxwin16x16.xpm
+Exec=wxconsole -c /etc/bacula/bwxconsole.conf
+Icon=wxwin16x16
 Terminal=false
 Type=Application
-Categories=System;Application;Utility
+Categories=System;Application;


Index: bacula.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bacula/EL-5/bacula.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- bacula.spec	13 Sep 2007 10:48:09 -0000	1.3
+++ bacula.spec	22 Jan 2009 13:51:28 -0000	1.4
@@ -7,12 +7,12 @@
 
 Summary: Cross platform network backup for Linux, Unix, Mac and Windows
 Name: bacula
-Version: 2.0.3
-Release: 10%{?dist}
+Version: 2.4.4
+Release: 1%{?dist}
 License: GPL
 Group: System Environment/Daemons
 Source0: http://download.sourceforge.net/bacula/bacula-%{version}.tar.gz
-Source1: http://download.sourceforge.net/bacula/bacula-docs-%{docs_version}.tar.gz
+Source1: http://download.sourceforge.net/bacula/bacula-docs-%{docs_version}.tar.bz2
 #Source2: http://download.sourceforge.net/bacula/bacula-rescue-%{rescue_version}.tar.gz
 Source3: bacula-gconsole.desktop
 Source4: bacula-wxconsole.desktop
@@ -25,15 +25,15 @@
 #Source11: bacula-web.apache
 Patch0: bacula-director-configuration.patch
 Patch1: bacula-config.patch
-Patch2: bacula-wxconsole.patch
+#Patch2: bacula-wxconsole.patch
 Patch3: bacula-pamd.patch
-Patch4: 2.0.3-ampm.patch
-Patch5: 2.0.3-maxbyteslist.patch
-Patch6: 2.0.3-maxwaittime.patch
-Patch7: 2.0.3-scheduler-next-hour.patch
-Patch8: 2.0.3-verify.patch
-Patch9: 2.0.3-tls-disconnect.patch
-Patch10: 2.0.3-restore.patch
+#Patch4: 2.0.3-ampm.patch
+#Patch5: 2.0.3-maxbyteslist.patch
+#Patch6: 2.0.3-maxwaittime.patch
+#Patch7: 2.0.3-scheduler-next-hour.patch
+#Patch8: 2.0.3-verify.patch
+#Patch9: 2.0.3-tls-disconnect.patch
+#Patch10: 2.0.3-restore.patch
 #Patch10: bacula-web-smarty.patch
 URL: http://www.bacula.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -323,15 +323,15 @@
 pushd bacula-%{version}
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
+#%patch2 -p1
 %patch3 -p1
-%patch4 -p0
-%patch5 -p0
-%patch6 -p0
-%patch7 -p0
-%patch8 -p0
-%patch9 -p0
-%patch10 -p1
+#%patch4 -p0
+#%patch5 -p0
+#%patch6 -p0
+#%patch7 -p0
+#%patch8 -p0
+#%patch9 -p0
+#%patch10 -p1
 
 # Remove execution permissions from files we're packaging as docs later on
 find examples -type f | xargs chmod -x
@@ -379,7 +379,7 @@
 	--enable-conio \
 	--enable-largefile \
 	--enable-gnome \
-	--enable-wx-console \
+	--enable-bwx-console \
 	--enable-tray-monitor \
 	--enable-build-dird \
 	--enable-build-stored \
@@ -514,27 +514,27 @@
 # Rename some manpages
 # Not needed right-now
 #mv %{buildroot}%{_mandir}/man1/bacula-tray-monitor.1 %{buildroot}%{_mandir}/man1/tray-monitor.1
-
+rm %{buildroot}%{_mandir}/man1/bat.1.gz
 
 # Fix some wrapper braindeadness
 rm -f %{buildroot}%{_libexecdir}/bacula/bconsole
 rm -f %{buildroot}%{_libexecdir}/bacula/gconsole
-mv %{buildroot}%{_sbindir}/wx-console %{buildroot}%{_sbindir}/wxconsole
-mv %{buildroot}%{_sysconfdir}/bacula/wx-console.conf %{buildroot}%{_sysconfdir}/bacula/wxconsole.conf
+mv %{buildroot}%{_sbindir}/bwx-console %{buildroot}%{_sbindir}/bwxconsole
+mv %{buildroot}%{_sysconfdir}/bacula/bwx-console.conf %{buildroot}%{_sysconfdir}/bacula/bwxconsole.conf
 
 
 # Desktop Integration for the console apps and the traymonitor
 mkdir -p %{buildroot}%{_bindir}
 install -m 644 -D bacula-sqlite/scripts/bacula.png %{buildroot}%{_datadir}/pixmaps/bacula.png
-install -m 644 -D bacula-sqlite/scripts/gnome-console.pamd %{buildroot}%{_sysconfdir}/pam.d/gnome-console
-install -m 644 -D bacula-sqlite/scripts/gnome-console.console_apps %{buildroot}%{_sysconfdir}/security/console.apps/gnome-console
+install -m 644 -D bacula-sqlite/scripts/bgnome-console.pamd %{buildroot}%{_sysconfdir}/pam.d/bgnome-console
+install -m 644 -D bacula-sqlite/scripts/bgnome-console.console_apps %{buildroot}%{_sysconfdir}/security/console.apps/bgnome-console
 install -m 644 -D bacula-sqlite/src/wx-console/wxwin16x16.xpm %{buildroot}%{_datadir}/pixmaps/wxwin16x16.xpm
 install -m 644 -D bacula-sqlite/scripts/wxconsole.pamd %{buildroot}%{_sysconfdir}/pam.d/wxconsole
-install -m 644 -D bacula-sqlite/scripts/wxconsole.desktop.consolehelper %{buildroot}%{_sysconfdir}/security/console.apps/wxconsole
+install -m 644 -D bacula-sqlite/scripts/wxconsole.desktop.consolehelper %{buildroot}%{_sysconfdir}/security/console.apps/bwxconsole
 install -m 644 -D bacula-sqlite/src/tray-monitor/generic.xpm %{buildroot}%{_datadir}/pixmaps/bacula-tray-monitor.xpm
 
-ln -sf consolehelper %{buildroot}%{_bindir}/gnome-console
-ln -sf consolehelper %{buildroot}%{_bindir}/wxconsole
+ln -sf consolehelper %{buildroot}%{_bindir}/bgnome-console
+ln -sf consolehelper %{buildroot}%{_bindir}/bwxconsole
 
 desktop-file-install --vendor="fedora" --dir=%{buildroot}%{_datadir}/applications %{SOURCE3}
 desktop-file-install --vendor="fedora" --dir=%{buildroot}%{_datadir}/applications %{SOURCE4}
@@ -621,16 +621,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 || :
@@ -659,16 +662,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
@@ -758,24 +764,24 @@
 
 %files console-gnome
 %defattr(-,root,root,-)
-%config %{_sysconfdir}/security/console.apps/gnome-console
-%config %{_sysconfdir}/pam.d/gnome-console
-%config(noreplace) %{_sysconfdir}/bacula/gnome-console.conf
-%{_bindir}/gnome-console
-%{_sbindir}/gnome-console
-%{_mandir}/man1/bacula-console-gnome.1*
+%config %{_sysconfdir}/security/console.apps/bgnome-console
+%config %{_sysconfdir}/pam.d/bgnome-console
+%config(noreplace) %{_sysconfdir}/bacula/bgnome-console.conf
+%{_bindir}/bgnome-console
+%{_sbindir}/bgnome-console
+%{_mandir}/man1/bacula-bgnome-console.1*
 %{_datadir}/applications/fedora-bacula-gconsole.desktop
 %{_datadir}/pixmaps/bacula.png
 
 
 %files console-wxwidgets
 %defattr(-,root,root,-)
-%config %{_sysconfdir}/security/console.apps/wxconsole
+%config %{_sysconfdir}/security/console.apps/bwxconsole
 %config %{_sysconfdir}/pam.d/wxconsole
-%config(noreplace) %{_sysconfdir}/bacula/wxconsole.conf
-%{_bindir}/wxconsole
-%{_sbindir}/wxconsole
-%{_mandir}/man1/bacula-wxconsole.1*
+%config(noreplace) %{_sysconfdir}/bacula/bwxconsole.conf
+%{_bindir}/bwxconsole
+%{_sbindir}/bwxconsole
+%{_mandir}/man1/bacula-bwxconsole.1*
 %{_datadir}/applications/fedora-bacula-wxconsole.desktop
 %{_datadir}/pixmaps/wxwin16x16.xpm
 
@@ -921,6 +927,9 @@
 
 
 %changelog
+* Wed Jan 14 2009 Jon Ciesla <limb at jcomserv.net> 2.4.4-1
+- Update to 2.4.4, fix alternatives.
+
 * Thu Sep 13 2007 Andreas Thienemann <andreas at bawue.net> 2.0.3-10
 - Applied restore fix to sd. #288981
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bacula/EL-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	24 Jul 2007 20:23:33 -0000	1.2
+++ sources	22 Jan 2009 13:51:28 -0000	1.3
@@ -1,2 +1,2 @@
-443d2560ace95173a0d8ba465de493ef  bacula-2.0.3.tar.gz
-dce3aed621b9e4abee51cc89aebf4a58  bacula-docs-2.0.3.tar.gz
+4eb6155b45611018af03002d37a2ffde  bacula-2.4.4.tar.gz
+d9bb3e8ca8c9a4c741b83569c21a4806  bacula-docs-2.4.4.tar.bz2



From limb at fedoraproject.org  Thu Jan 22 13:55:27 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Thu, 22 Jan 2009 13:55:27 +0000 (UTC)
Subject: rpms/bacula/EL-4 bacula-config.patch, 1.1, 1.2 bacula-pamd.patch,
	1.1, 1.2 bacula.spec, 1.5, 1.6 sources, 1.2,
	1.3 bacula-wxconsole.patch, 1.1, NONE
Message-ID: <20090122135527.245FC70033@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/bacula/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20112

Modified Files:
	bacula-config.patch bacula-pamd.patch bacula.spec sources 
Removed Files:
	bacula-wxconsole.patch 
Log Message:
2.4.4, multiple fixes.


bacula-config.patch:

Index: bacula-config.patch
===================================================================
RCS file: /cvs/pkgs/rpms/bacula/EL-4/bacula-config.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- bacula-config.patch	24 Jul 2007 20:22:57 -0000	1.1
+++ bacula-config.patch	22 Jan 2009 13:54:56 -0000	1.2
@@ -1,256 +1,122 @@
---- bacula-2.0.2/src/gnome2-console/gnome-console.conf.in.orig	2007-02-06 13:35:12.000000000 +0100
-+++ bacula-2.0.2/src/gnome2-console/gnome-console.conf.in	2007-02-06 13:35:25.000000000 +0100
-@@ -3,9 +3,9 @@
- #
- 
- Director {
+--- bacula-2.4.3/src/gnome2-console/bgnome-console.conf.in.orig	2008-12-10 10:12:18.000000000 -0600
++++ bacula-2.4.3/src/gnome2-console/bgnome-console.conf.in	2008-12-10 10:12:18.000000000 -0600
+@@ -6 +6 @@
 -  Name = @hostname at -dir
 +  Name = bacula-dir
-   DIRport = @dir_port@
+@@ -8 +8 @@
 -  address = @hostname@
 +  address = server.example.com
-   Password = "@dir_password@"
- }
- 
---- bacula-2.0.2/src/dird/bacula-dir.conf.in.orig	2007-02-06 13:33:19.000000000 +0100
-+++ bacula-2.0.2/src/dird/bacula-dir.conf.in	2007-02-06 13:34:49.000000000 +0100
-@@ -13,7 +13,7 @@
- #
- 
- Director {                            # define myself
+--- bacula-2.4.3/src/dird/bacula-dir.conf.in.orig	2008-12-10 10:17:27.000000000 -0600
++++ bacula-2.4.3/src/dird/bacula-dir.conf.in	2008-12-10 10:17:27.000000000 -0600
+@@ -16 +16 @@
 -  Name = @hostname at -dir
 +  Name = bacula-dir
-   DIRport = @dir_port@                # where we listen for UA connections
-   QueryFile = "@scriptdir@/query.sql"
-   WorkingDirectory = "@working_dir@"
-@@ -27,7 +27,7 @@
-   Name = "DefaultJob"
-   Type = Backup
-   Level = Incremental
+@@ -30 +30 @@
 -  Client = @hostname at -fd 
 +  Client = bacula-fd 
-   FileSet = "Full Set"
-   Schedule = "WeeklyCycle"
-   Storage = File
-@@ -48,7 +48,7 @@
- 
- #Job {
- #  Name = "Client2"
+@@ -51 +51 @@
 -#  Client = @hostname at 2-fd
 +#  Client = bacula2-fd
- #  JobDefs = "DefaultJob"
- #  Write Bootstrap = "@working_dir@/Client2.bsr"
- #}
-@@ -75,7 +75,7 @@
- Job {
-   Name = "RestoreFiles"
-   Type = Restore
+@@ -82 +82 @@
 -  Client=@hostname at -fd                 
 +  Client=bacula-fd                 
-   FileSet="Full Set"                  
-   Storage = File                      
-   Pool = Default
-@@ -149,8 +149,8 @@
- 
- # Client (File Services) to backup
- Client {
+@@ -157,2 +157,2 @@
 -  Name = @hostname at -fd
 -  Address = @hostname@
 +  Name = bacula-fd
 +  Address = client.example.com
-   FDPort = @fd_port@
-   Catalog = MyCatalog
-   Password = "@fd_password@"          # password for FileDaemon
-@@ -164,8 +164,8 @@
- #  You should change Name, Address, and Password before using
- #
- #Client {
+@@ -172,2 +172,2 @@
 -#  Name = @hostname at 2-fd                
 -#  Address = @hostname at 2
 +#  Name = bacula2-fd                
 +#  Address = client2.example.com
- #  FDPort = @fd_port@
- #  Catalog = MyCatalog
- #  Password = "@fd_password at 2"         # password for FileDaemon 2
-@@ -179,7 +179,7 @@
- Storage {
-   Name = File
- # Do not use "localhost" here    
+@@ -187 +187 @@
 -  Address = @hostname@                # N.B. Use a fully qualified name here
-+  Address = storage.example.com        # N.B. Use a fully qualified name here
-   SDPort = @sd_port@
-   Password = "@sd_password@"
-   Device = FileStorage
-@@ -192,7 +192,7 @@
- #Storage {
- #  Name = DDS-4    
- #  Do not use "localhost" here
++  Address = storage.example.com                # N.B. Use a fully qualified name here
+@@ -200 +200 @@
 -#  Address = @hostname@                # N.B. Use a fully qualified name here
-+#  Address = storage.example.com       # N.B. Use a fully qualified name here
- #  SDPort = @sd_port@
- #  Password = "@sd_password@"          # password for Storage daemon
- #  Device = DDS-4                      # must be same as Device in Storage daemon
-@@ -204,7 +204,7 @@
- #Storage {
- #  Name = "8mmDrive"
- #  Do not use "localhost" here
++#  Address = storage.example.com                # N.B. Use a fully qualified name here
+@@ -212 +212 @@
 -#  Address = @hostname@                # N.B. Use a fully qualified name here
-+#  Address = storage.example.com       # N.B. Use a fully qualified name here
- #  SDPort = @sd_port@
- #  Password = "@sd_password@"
- #  Device = "Exabyte 8mm"
-@@ -215,7 +215,7 @@
- #Storage {
- #  Name = "DVD"
- #  Do not use "localhost" here
++#  Address = storage.example.com                # N.B. Use a fully qualified name here
+@@ -223 +223 @@
 -#  Address = @hostname@                # N.B. Use a fully qualified name here
-+#  Address = storage.example.com       # N.B. Use a fully qualified name here
- #  SDPort = @sd_port@
- #  Password = "@sd_password@"
- #  Device = "DVD Writer"
-@@ -285,7 +285,7 @@
- # Restricted console used by tray-monitor to get the status of the director
- #
- Console {
++#  Address = storage.example.com                # N.B. Use a fully qualified name here
+@@ -299 +299 @@
 -  Name = @hostname at -mon
 +  Name = bacula-mon
-   Password = "@mon_dir_password@"
-   CommandACL = status, .status
- }
---- bacula-2.0.2/src/filed/bacula-fd.conf.in.orig	2007-02-06 13:30:59.000000000 +0100
-+++ bacula-2.0.2/src/filed/bacula-fd.conf.in	2007-02-06 13:31:25.000000000 +0100
-@@ -11,7 +11,7 @@
- # List Directors who are permitted to contact this File daemon
- #
- Director {
+--- bacula-2.4.3/src/filed/bacula-fd.conf.in.orig	2008-12-10 10:19:12.000000000 -0600
++++ bacula-2.4.3/src/filed/bacula-fd.conf.in	2008-12-10 10:19:12.000000000 -0600
+@@ -14 +14 @@
 -  Name = @hostname at -dir
 +  Name = bacula-dir
-   Password = "@fd_password@"
- }
- 
-@@ -20,7 +20,7 @@
- #   status of the file daemon
- #
- Director {
+@@ -23 +23 @@
 -  Name = @hostname at -mon
 +  Name = bacula-mon
-   Password = "@mon_fd_password@"
-   Monitor = yes
- }
-@@ -29,7 +29,7 @@
- # "Global" File daemon configuration specifications
- #
- FileDaemon {                          # this is me
+@@ -32 +32 @@
 -  Name = @hostname at -fd
 +  Name = bacula-fd
-   FDport = @fd_port@                  # where we listen for the director
-   WorkingDirectory = @working_dir@
-   Pid Directory = @piddir@
-@@ -39,5 +39,5 @@
- # Send all messages except skipped files back to Director
- Messages {
-   Name = Standard
+@@ -42 +42 @@
 -  director = @hostname at -dir = all, !skipped, !restored
 +  director = bacula-dir = all, !skipped, !restored
- }
---- bacula-2.0.2/src/console/bconsole.conf.in.orig	2007-02-06 13:32:30.000000000 +0100
-+++ bacula-2.0.2/src/console/bconsole.conf.in	2007-02-06 13:33:06.000000000 +0100
-@@ -3,8 +3,8 @@
- #
- 
- Director {
--  Name = @hostname at -dir
-+  Name = bacula-dir
-   DIRport = @dir_port@
--  address = @hostname@
-+  address = server.example.com
-   Password = "@dir_password@"
- }
---- bacula-2.0.2/src/stored/bacula-sd.conf.in.orig	2007-02-06 13:31:56.000000000 +0100
-+++ bacula-2.0.2/src/stored/bacula-sd.conf.in	2007-02-06 13:32:15.000000000 +0100
-@@ -11,7 +11,7 @@
- #
- 
- Storage {                             # definition of myself
+--- bacula-2.4.3/src/stored/bacula-sd.conf.in.orig	2008-12-10 10:21:45.000000000 -0600
++++ bacula-2.4.3/src/stored/bacula-sd.conf.in	2008-12-10 10:21:45.000000000 -0600
+@@ -14 +14 @@
 -  Name = @hostname at -sd
 +  Name = bacula-sd
-   SDPort = @sd_port@                  # Director's port      
-   WorkingDirectory = "@working_dir@"
-   Pid Directory = "@piddir@"
-@@ -22,7 +22,7 @@
- # List Directors who are permitted to contact Storage daemon
- #
- Director {
+@@ -25 +25 @@
 -  Name = @hostname at -dir
 +  Name = bacula-dir
-   Password = "@sd_password@"
- }
- 
-@@ -31,7 +31,7 @@
- #   status of the storage daemon
- #
- Director {
+@@ -34 +34 @@
 -  Name = @hostname at -mon
 +  Name = bacula-mon
-   Password = "@mon_sd_password@"
-   Monitor = yes
- }
-@@ -204,5 +204,5 @@
- #
- Messages {
-   Name = Standard
+@@ -228 +228 @@
 -  director = @hostname at -dir = all
 +  director = bacula-dir = all
- }
---- bacula-2.0.2/src/wx-console/wx-console.conf.in.orig	2007-02-06 13:37:12.000000000 +0100
-+++ bacula-2.0.2/src/wx-console/wx-console.conf.in	2007-02-06 13:47:02.000000000 +0100
-@@ -3,8 +3,8 @@
- #
- 
- Director {
+--- bacula-2.4.3/src/wx-console/bwx-console.conf.in.orig	2008-12-10 10:22:23.000000000 -0600
++++ bacula-2.4.3/src/wx-console/bwx-console.conf.in	2008-12-10 10:22:23.000000000 -0600
+@@ -6 +6 @@
 -  Name = @hostname at -dir
 +  Name = bacula-dir
-   DIRport = @dir_port@
+@@ -8 +8 @@
 -  address = @hostname@
 +  address = server.example.com
-   Password = "@dir_password@"
- }
---- bacula-2.0.2/src/tray-monitor/tray-monitor.conf.in.orig	2007-02-06 13:47:13.000000000 +0100
-+++ bacula-2.0.2/src/tray-monitor/tray-monitor.conf.in	2007-02-06 13:47:55.000000000 +0100
-@@ -3,27 +3,27 @@
- #
- 
- Monitor {
+--- bacula-2.4.3/src/tray-monitor/tray-monitor.conf.in.orig	2008-12-10 10:28:02.000000000 -0600
++++ bacula-2.4.3/src/tray-monitor/tray-monitor.conf.in	2008-12-10 10:28:02.000000000 -0600
+@@ -6 +6 @@
 -  Name = @hostname at -mon
 +  Name = bacula-mon
-   Password = "@mon_dir_password@"         # password for the Directors   
-   RefreshInterval = 5 seconds
- }
-    
- Client {
+@@ -12,2 +12,2 @@
 -  Name = @hostname at -fd
 -  Address = @hostname@
 +  Name = bacula-fd
 +  Address = client.example.com
-   FDPort = @fd_port@
-   Password = "@mon_fd_password@"          # password for FileDaemon
- }
- 
- Storage {
+@@ -19,2 +19,2 @@
 -  Name = @hostname at -sd
 -  Address = @hostname@
 +  Name = bacula-sd
 +  Address = storage.example.com
-   SDPort = @sd_port@
-   Password = "@mon_sd_password@"          # password for StorageDaemon
- }
- 
- Director {
+@@ -26 +26 @@
+-  Name = @hostname at -dir
++  Name = bacula-dir
+@@ -28 +27,0 @@
+-  address = @hostname@
+--- bacula-2.4.3/src/qt-console/bat.conf.in.orig	2008-12-10 10:27:02.000000000 -0600
++++ bacula-2.4.3/src/qt-console/bat.conf.in	2008-12-10 10:27:02.000000000 -0600
+@@ -6 +6 @@
 -  Name = @hostname at -dir
 +  Name = bacula-dir
-   DIRport = @dir_port@
+@@ -8 +8 @@
 -  address = @hostname@
--}
-\ No newline at end of file
 +  address = server.example.com
-+}
+--- bacula-2.4.3/src/stored/stored.conf.in.orig	2008-12-10 10:27:44.000000000 -0600
++++ bacula-2.4.3/src/stored/stored.conf.in	2008-12-10 10:27:44.000000000 -0600
+@@ -11 +11 @@
+-  Address = @hostname@
++  Address = storage.example.com
+@@ -22 +22 @@
+-  Name = @hostname at -dir
++  Name = bacula-dir
+@@ -54 +54 @@
+-  director = @hostname at -dir = all
++  director = bacula-dir = all

bacula-pamd.patch:

Index: bacula-pamd.patch
===================================================================
RCS file: /cvs/pkgs/rpms/bacula/EL-4/bacula-pamd.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- bacula-pamd.patch	24 Jul 2007 20:22:57 -0000	1.1
+++ bacula-pamd.patch	22 Jan 2009 13:54:56 -0000	1.2
@@ -9,8 +9,8 @@
  session    optional     pam_xauth.so
  session    optional     pam_timestamp.so
  account    required     pam_permit.so
---- bacula-2.0.3/scripts/gnome-console.pamd.orig        2007-07-11 18:42:33.000000000 +0200
-+++ bacula-2.0.3/scripts/gnome-console.pamd     2007-07-11 18:42:57.000000000 +0200
+--- bacula-2.0.3/scripts/bgnome-console.pamd.orig        2007-07-11 18:42:33.000000000 +0200
++++ bacula-2.0.3/scripts/bgnome-console.pamd     2007-07-11 18:42:57.000000000 +0200
 @@ -1,7 +1,7 @@
  #%PAM-1.0
  auth       sufficient   pam_rootok.so


Index: bacula.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bacula/EL-4/bacula.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- bacula.spec	13 Sep 2007 10:52:18 -0000	1.5
+++ bacula.spec	22 Jan 2009 13:54:56 -0000	1.6
@@ -1,6 +1,3 @@
-# NB: This spec file differs from all other branches as the
-# wxGTK dependency does not exist on RHEL4
-
 %define working_dir	/var/spool/bacula
 %define script_dir	/usr/libexec/bacula
 #%define rescue_version	2.0.0
@@ -10,15 +7,15 @@
 
 Summary: Cross platform network backup for Linux, Unix, Mac and Windows
 Name: bacula
-Version: 2.0.3
-Release: 10%{?dist}
+Version: 2.4.4
+Release: 1%{?dist}
 License: GPL
 Group: System Environment/Daemons
 Source0: http://download.sourceforge.net/bacula/bacula-%{version}.tar.gz
-Source1: http://download.sourceforge.net/bacula/bacula-docs-%{docs_version}.tar.gz
+#Source1: http://download.sourceforge.net/bacula/bacula-docs-%{docs_version}.tar.gz
 #Source2: http://download.sourceforge.net/bacula/bacula-rescue-%{rescue_version}.tar.gz
 Source3: bacula-gconsole.desktop
-Source4: bacula-wxconsole.desktop
+#Source4: bacula-wxconsole.desktop
 Source5: bacula-traymonitor.desktop
 Source6: bacula.logrotate
 Source7: bacula-fd.init
@@ -27,16 +24,16 @@
 #Source10: http://download.sourceforge.net/bacula/bacula-gui-%{gui_version}.tar.gz
 #Source11: bacula-web.apache
 Patch0: bacula-director-configuration.patch
-Patch1: bacula-config.patch
-Patch2: bacula-wxconsole.patch
-Patch3: bacula-pamd.patch
-Patch4: 2.0.3-ampm.patch
-Patch5: 2.0.3-maxbyteslist.patch
-Patch6: 2.0.3-maxwaittime.patch
-Patch7: 2.0.3-scheduler-next-hour.patch
-Patch8: 2.0.3-verify.patch
-Patch9: 2.0.3-tls-disconnect.patch
-Patch10: 2.0.3-restore.patch
+#Patch1: bacula-config.patch
+#Patch2: bacula-wxconsole.patch
+#Patch3: bacula-pamd.patch
+#Patch4: 2.0.3-ampm.patch
+#Patch5: 2.0.3-maxbyteslist.patch
+#Patch6: 2.0.3-maxwaittime.patch
+#Patch7: 2.0.3-scheduler-next-hour.patch
+#Patch8: 2.0.3-verify.patch
+#Patch9: 2.0.3-tls-disconnect.patch
+#Patch10: 2.0.3-restore.patch
 #Patch10: bacula-web-smarty.patch
 URL: http://www.bacula.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -47,7 +44,7 @@
 BuildRequires: libbonobo-devel, libbonoboui-devel, bonobo-activation-devel
 BuildRequires: mysql-devel, cdrecord, postgresql-devel
 BuildRequires: desktop-file-utils, python-devel, sqlite-devel, sed,
-BuildRequires: libacl-devel, latex2html, tetex-latex, tetex, ghostscript
+BuildRequires: libacl-devel
 
 %if "%{fedora}" >= "7"
 BuildRequires: tcp_wrappers-devel
@@ -271,7 +268,7 @@
 #Bacula is a set of programs that allow you to manage the backup,
 #recovery, and verification of computer data across a network of
 #different computers. It is based on a client/server architecture.
-
+#
 #This package contains the wxWidgets version of the bacula management 
 #console.
 
@@ -304,37 +301,38 @@
 #a management level tool for reporting Backup job status.
 
 
-%package docs
-Summary: Bacula documentation
-Group: Documentation
-
-%description docs
-Bacula is a set of programs that allow you to manage the backup,
-recovery, and verification of computer data across a network of
-different computers. It is based on a client/server architecture.
-
-This package contains the documentation for most of the bacula-packages.
+# docs can not be built for EPEL4 (see comment at the top of this spec file)
+#%package docs
+#Summary: Bacula documentation
+#Group: Documentation
+#
+#%description docs
+#Bacula is a set of programs that allow you to manage the backup,
+#recovery, and verification of computer data across a network of
+#different computers. It is based on a client/server architecture.
+#
+#This package contains the documentation for most of the bacula-packages.
 
 
 %prep
 %setup -q -c -n bacula-%{version}
-%setup -q -a 1 -D -T
+#%setup -q -a 1 -D -T
 #%setup -q -a 2 -D -T
 #%setup -q -a 10 -D -T
 
 # Patching and other source preparation
 pushd bacula-%{version}
 %patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p0
-%patch5 -p0
-%patch6 -p0
-%patch7 -p0
-%patch8 -p0
-%patch9 -p0
-%patch10 -p1
+#%patch1 -p1
+#%patch2 -p1
+#%patch3 -p1
+#%patch4 -p0
+#%patch5 -p0
+#%patch6 -p0
+#%patch7 -p0
+#%patch8 -p0
+#%patch9 -p0
+#%patch10 -p1
 
 # Remove execution permissions from files we're packaging as docs later on
 find examples -type f | xargs chmod -x
@@ -382,6 +380,7 @@
 	--enable-conio \
 	--enable-largefile \
 	--enable-gnome \
+	--enable-wx-console \
 	--enable-tray-monitor \
 	--enable-build-dird \
 	--enable-build-stored \
@@ -393,8 +392,6 @@
 	$*
 # Scratch this, it is trouble
 #	--with-readline \
-# Removed as we have no wxGTK on rhel4
-#	--enable-wx-console \
 
 if test $? != 0; then 
   tail -500 config.log
@@ -418,7 +415,7 @@
 		%endif
 	%endif
 	%if 0%{?rhel}
-		%if "%{rhel}" >=  "5"
+		%if "%{rhel}" >=  "4"
 			%define	sqlite_suffix 3
 			build --with-sqlite3
 		%else
@@ -444,10 +441,10 @@
 popd
 
 # Build the docs
-pushd bacula-docs-%{docs_version}
- %configure --with-bacula=%{_builddir}/bacula-%{version}/bacula-%{version}
- make
-popd
+#pushd bacula-docs-%{docs_version}
+# % configure --with-bacula=%{_builddir}/bacula-%{version}/bacula-%{version}
+# make
+#popd
 
 %install
 rm -rf %{buildroot}
@@ -494,10 +491,10 @@
 	done
 popd
 
-pushd bacula-docs-%{docs_version}
+#pushd bacula-docs-%{docs_version}
  # No install target anymore, we'll include the stuff directly in the %%files section
  #	make install DESTDIR=%{buildroot}
-popd
+#popd
 
 # GUI is not being packaged yet
 #pushd bacula-gui-%{gui_version}/bacula-web
@@ -523,25 +520,25 @@
 # Fix some wrapper braindeadness
 rm -f %{buildroot}%{_libexecdir}/bacula/bconsole
 rm -f %{buildroot}%{_libexecdir}/bacula/gconsole
-# mv %{buildroot}%{_sbindir}/wx-console %{buildroot}%{_sbindir}/wxconsole
-# mv %{buildroot}%{_sysconfdir}/bacula/wx-console.conf %{buildroot}%{_sysconfdir}/bacula/wxconsole.conf
+#mv %{buildroot}%{_sbindir}/wx-console %{buildroot}%{_sbindir}/wxconsole
+#mv %{buildroot}%{_sysconfdir}/bacula/wx-console.conf %{buildroot}%{_sysconfdir}/bacula/wxconsole.conf
 
 
 # Desktop Integration for the console apps and the traymonitor
 mkdir -p %{buildroot}%{_bindir}
 install -m 644 -D bacula-sqlite/scripts/bacula.png %{buildroot}%{_datadir}/pixmaps/bacula.png
-install -m 644 -D bacula-sqlite/scripts/gnome-console.pamd %{buildroot}%{_sysconfdir}/pam.d/gnome-console
-install -m 644 -D bacula-sqlite/scripts/gnome-console.console_apps %{buildroot}%{_sysconfdir}/security/console.apps/gnome-console
-# install -m 644 -D bacula-sqlite/src/wx-console/wxwin16x16.xpm %{buildroot}%{_datadir}/pixmaps/wxwin16x16.xpm
-# install -m 644 -D bacula-sqlite/scripts/wxconsole.pamd %{buildroot}%{_sysconfdir}/pam.d/wxconsole
-# install -m 644 -D bacula-sqlite/scripts/wxconsole.desktop.consolehelper %{buildroot}%{_sysconfdir}/security/console.apps/wxconsole
+install -m 644 -D bacula-sqlite/scripts/bgnome-console.pamd %{buildroot}%{_sysconfdir}/pam.d/bgnome-console
+install -m 644 -D bacula-sqlite/scripts/bgnome-console.console_apps %{buildroot}%{_sysconfdir}/security/console.apps/bgnome-console
+#install -m 644 -D bacula-sqlite/src/wx-console/wxwin16x16.xpm %{buildroot}%{_datadir}/pixmaps/wxwin16x16.xpm
+#install -m 644 -D bacula-sqlite/scripts/wxconsole.pamd %{buildroot}%{_sysconfdir}/pam.d/wxconsole
+#install -m 644 -D bacula-sqlite/scripts/wxconsole.desktop.consolehelper %{buildroot}%{_sysconfdir}/security/console.apps/wxconsole
 install -m 644 -D bacula-sqlite/src/tray-monitor/generic.xpm %{buildroot}%{_datadir}/pixmaps/bacula-tray-monitor.xpm
 
 ln -sf consolehelper %{buildroot}%{_bindir}/gnome-console
-# ln -sf consolehelper %{buildroot}%{_bindir}/wxconsole
+ln -sf consolehelper %{buildroot}%{_bindir}/wxconsole
 
 desktop-file-install --vendor="fedora" --dir=%{buildroot}%{_datadir}/applications %{SOURCE3}
-desktop-file-install --vendor="fedora" --dir=%{buildroot}%{_datadir}/applications %{SOURCE4}
+#desktop-file-install --vendor="fedora" --dir=%{buildroot}%{_datadir}/applications %{SOURCE4}
 desktop-file-install --vendor="fedora" --dir=%{buildroot}%{_datadir}/applications %{SOURCE5}
 
 
@@ -577,7 +574,9 @@
 
 # Nuke the scripts we do not need
 rm -vf %{buildroot}%{_libexecdir}/bacula/{bacula,bacula-ctl-*,startmysql,stopmysql} 
-
+# wxconsole is not available in EPEL4 so we should not ship a man page for it.
+rm %{buildroot}%{_mandir}/man1/bacula-bwxconsole.1.gz
+rm %{buildroot}%{_mandir}/man1/bat.1.gz
 
 # Fix up some perms so rpmlint does not complain too much
 chmod 755 %{buildroot}%{_sbindir}/*
@@ -625,16 +624,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 || :
@@ -663,16 +665,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
@@ -762,12 +767,12 @@
 
 %files console-gnome
 %defattr(-,root,root,-)
-%config %{_sysconfdir}/security/console.apps/gnome-console
-%config %{_sysconfdir}/pam.d/gnome-console
-%config(noreplace) %{_sysconfdir}/bacula/gnome-console.conf
+%config %{_sysconfdir}/security/console.apps/bgnome-console
+%config %{_sysconfdir}/pam.d/bgnome-console
+%config(noreplace) %{_sysconfdir}/bacula/bgnome-console.conf
 %{_bindir}/gnome-console
-%{_sbindir}/gnome-console
-%{_mandir}/man1/bacula-console-gnome.1*
+%{_sbindir}/bgnome-console
+%{_mandir}/man1/bacula-bgnome-console.1*
 %{_datadir}/applications/fedora-bacula-gconsole.desktop
 %{_datadir}/pixmaps/bacula.png
 
@@ -898,20 +903,20 @@
 
 %files traymonitor
 %defattr(-,root,root,-)
-%{_sbindir}/bacula-tray-monitor
-%config(noreplace) %{_sysconfdir}/bacula/tray-monitor.conf
+#%{_sbindir}/bacula-tray-monitor
+#%config(noreplace) %{_sysconfdir}/bacula/tray-monitor.conf
 %{_mandir}/man1/bacula-tray-monitor.1*
 %{_datadir}/applications/fedora-bacula-traymonitor.desktop
 %{_datadir}/pixmaps/bacula-tray-monitor.xpm
 
 
-%files docs
-%doc bacula-docs-%{docs_version}/bacula-web/bacula-web.pdf
-%doc bacula-docs-%{docs_version}/bacula-web/bacula-web/
-%doc bacula-docs-%{docs_version}/developers/developers.pdf
-%doc bacula-docs-%{docs_version}/developers/developers/
-%doc bacula-docs-%{docs_version}/manual/bacula.pdf
-%doc bacula-docs-%{docs_version}/manual/bacula/
+#%files docs
+#%doc bacula-docs-%{docs_version}/bacula-web/bacula-web.pdf
+#%doc bacula-docs-%{docs_version}/bacula-web/bacula-web/
+#%doc bacula-docs-%{docs_version}/developers/developers.pdf
+#%doc bacula-docs-%{docs_version}/developers/developers/
+#%doc bacula-docs-%{docs_version}/manual/bacula.pdf
+#%doc bacula-docs-%{docs_version}/manual/bacula/
 
 
 #%files web
@@ -925,6 +930,16 @@
 
 
 %changelog
+* Wed Jan 14 2009 Jon Ciesla <limb at jcomserv.net> 2.4.4-1
+- Update to 2.4.4.
+
+* Wed Jan 14 2009 Jon Ciesla <limb at jcomserv.net> 2.0.3-10.2
+- Additional fixes, more wx removal, fixed preum scripts.
+
+* Sat Dec 20 2008 Felix Schwarz <felix.schwarz at oss.schwarz.eu> 2.0.3-10.1
+- Removed docs building from this spec file so that the package can be built 
+  with EPEL4 actually.
+
 * Thu Sep 13 2007 Andreas Thienemann <andreas at bawue.net> 2.0.3-10
 - Applied restore fix to sd. #288981
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bacula/EL-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	24 Jul 2007 20:22:57 -0000	1.2
+++ sources	22 Jan 2009 13:54:56 -0000	1.3
@@ -1,2 +1,2 @@
-443d2560ace95173a0d8ba465de493ef  bacula-2.0.3.tar.gz
-dce3aed621b9e4abee51cc89aebf4a58  bacula-docs-2.0.3.tar.gz
+4eb6155b45611018af03002d37a2ffde  bacula-2.4.4.tar.gz
+d9bb3e8ca8c9a4c741b83569c21a4806  bacula-docs-2.4.4.tar.bz2


--- bacula-wxconsole.patch DELETED ---



From allisson at fedoraproject.org  Thu Jan 22 14:00:19 2009
From: allisson at fedoraproject.org (Allisson Azevedo)
Date: Thu, 22 Jan 2009 14:00:19 +0000 (UTC)
Subject: rpms/clutter/devel clutter.spec,1.14,1.15 import.log,1.5,1.6
Message-ID: <20090122140019.3429170033@cvs1.fedora.phx.redhat.com>

Author: allisson

Update of /cvs/pkgs/rpms/clutter/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20807/devel

Modified Files:
	clutter.spec import.log 
Log Message:

- Remove noarch from doc subpackage



Index: clutter.spec
===================================================================
RCS file: /cvs/pkgs/rpms/clutter/devel/clutter.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- clutter.spec	22 Jan 2009 13:25:51 -0000	1.14
+++ clutter.spec	22 Jan 2009 13:59:48 -0000	1.15
@@ -1,6 +1,6 @@
 Name:           clutter
 Version:        0.8.6
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Open Source software library for creating rich graphical user interfaces
 
 Group:          Development/Libraries
@@ -34,7 +34,6 @@
 Summary:        Documentation for %{name}
 Group:          Documentation
 Requires:       %{name} = %{version}-%{release}
-BuildArch:      noarch
 
 %description    doc
 Clutter is an open source software library for creating fast, 
@@ -86,6 +85,9 @@
 
 %changelog
 
+* Wed Jan 21 2009 Allisson Azevedo <allisson at gmail.com> 0.8.6-3
+- Remove noarch from doc subpackage
+
 * Wed Jan 21 2009 Allisson Azevedo <allisson at gmail.com> 0.8.6-2
 - Added gtk-doc for cogl
 - Created doc subpackage


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/clutter/devel/import.log,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- import.log	22 Jan 2009 13:25:51 -0000	1.5
+++ import.log	22 Jan 2009 13:59:48 -0000	1.6
@@ -3,3 +3,4 @@
 clutter-0_8_2-1_fc9:HEAD:clutter-0.8.2-1.fc9.src.rpm:1223343853
 clutter-0_8_6-1_fc10:HEAD:clutter-0.8.6-1.fc10.src.rpm:1232595301
 clutter-0_8_6-2_fc10:HEAD:clutter-0.8.6-2.fc10.src.rpm:1232630582
+clutter-0_8_6-3_fc10:HEAD:clutter-0.8.6-3.fc10.src.rpm:1232632595



From rdieter at fedoraproject.org  Thu Jan 22 14:01:35 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu, 22 Jan 2009 14:01:35 +0000 (UTC)
Subject: rpms/kde-i18n/F-10 kde-i18n.spec,1.92,1.93
Message-ID: <20090122140135.40CAC70033@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kde-i18n/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21329

Modified Files:
	kde-i18n.spec 
Log Message:
* Sun Jan 11 2009 Than Ngo <than at redhat.com> - 3.5.10-2
- remove kdgantt.mo that conflict with kde-l10n



Index: kde-i18n.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kde-i18n/F-10/kde-i18n.spec,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -r1.92 -r1.93
--- kde-i18n.spec	3 Sep 2008 09:04:53 -0000	1.92
+++ kde-i18n.spec	22 Jan 2009 14:01:04 -0000	1.93
@@ -6,7 +6,7 @@
 Name: kde-i18n
 Epoch: 1
 Version: 3.5.10
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 # GFDL, with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
 License: GFDL 
@@ -1087,6 +1087,7 @@
    rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/timezones4.mo
    rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/umbrello.mo
    rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/useraccount.mo
+   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kdgantt.mo
    rm -f %{buildroot}%{_datadir}/locale/*/entry.desktop
 
    # keep these ones because we're shipping KDE 3 kdewebdev (because of Quanta)
@@ -1849,6 +1850,9 @@
 
 
 %changelog
+* Sun Jan 11 2009 Than Ngo <than at redhat.com> - 3.5.10-2
+- remove kdgantt.mo that conflict with kde-l10n
+
 * Wed Sep 03 2008 Than Ngo <than at redhat.com> 3.5.10-1
 - 3.5.10
 



From mtasaka at fedoraproject.org  Thu Jan 22 14:03:15 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Thu, 22 Jan 2009 14:03:15 +0000 (UTC)
Subject: rpms/xscreensaver/devel xscreensaver-5.08-phosphor-segv.patch, NONE,
	1.1 xscreensaver.spec, 1.83, 1.84
Message-ID: <20090122140315.5D55870033@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/xscreensaver/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21624/devel

Modified Files:
	xscreensaver.spec 
Added Files:
	xscreensaver-5.08-phosphor-segv.patch 
Log Message:
* Thu Jan 22 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.08-5
- Fix phosphor segv when changing window size (bug 481146)


xscreensaver-5.08-phosphor-segv.patch:

--- NEW FILE xscreensaver-5.08-phosphor-segv.patch ---
--- xscreensaver-5.08/hacks/phosphor.c.debug	2008-07-31 19:01:00.000000000 +0900
+++ xscreensaver-5.08/hacks/phosphor.c	2009-01-22 22:52:11.000000000 +0900
@@ -1353,6 +1353,7 @@
 	  if (state->pid)
 	    {
 	      waitpid(state->pid, NULL, 0);
+	      state->pid = 0;
 	      fclose (state->pipe);
 	    }
 	  else
@@ -1436,7 +1437,7 @@
   resize_grid (state);
 
 # if defined(HAVE_FORKPTY) && defined(TIOCSWINSZ)
-  if (state->pid)
+  if (state->pid && state->pipe)
     {
       /* Tell the sub-process that the screen size has changed. */
       struct winsize ws;


Index: xscreensaver.spec
===================================================================
RCS file: /cvs/extras/rpms/xscreensaver/devel/xscreensaver.spec,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- xscreensaver.spec	30 Dec 2008 01:26:04 -0000	1.83
+++ xscreensaver.spec	22 Jan 2009 14:02:45 -0000	1.84
@@ -5,7 +5,7 @@
 
 
 %define modular_conf  1
-%define fedora_rel    4
+%define fedora_rel    5
 
 %define extrarel      %{nil}
 
@@ -34,6 +34,7 @@
 Patch1:          xscreensaver-5.00b5-sanitize-hacks.patch
 Patch21:         xscreensaver-5.07-webcollage-default-nonet.patch
 Patch50:         xscreensaver-5.08-po-recreate.patch
+Patch51:         xscreensaver-5.08-phosphor-segv.patch
 Requires:        xscreensaver-base = %{epoch}:%{version}-%{release}
 Requires:        xscreensaver-extras = %{epoch}:%{version}-%{release}
 Requires:        xscreensaver-gl-extras = %{epoch}:%{version}-%{release}
@@ -187,6 +188,7 @@
 %patch1 -p1 -b .sanitize-hacks
 %patch21 -p1 -b .nonet
 %patch50 -p1 -b .po
+%patch51 -p1 -b .phosphor
 
 change_option(){
    set +x
@@ -631,6 +633,9 @@
 %defattr(-,root,root,-)
 
 %changelog
+* Thu Jan 22 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.08-5
+- Fix phosphor segv when changing window size (bug 481146)
+
 * Tue Dec 30 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.08-4
 - Fix the process of "make update-po -C po", reported by jwz
 



From mtasaka at fedoraproject.org  Thu Jan 22 14:03:14 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Thu, 22 Jan 2009 14:03:14 +0000 (UTC)
Subject: rpms/xscreensaver/F-10 xscreensaver-5.08-phosphor-segv.patch, NONE, 
	1.1 xscreensaver-5.08-po-recreate.patch, NONE,
	1.1 xscreensaver.spec, 1.78, 1.79
Message-ID: <20090122140314.9FD7770033@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/xscreensaver/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21624/F-10

Modified Files:
	xscreensaver.spec 
Added Files:
	xscreensaver-5.08-phosphor-segv.patch 
	xscreensaver-5.08-po-recreate.patch 
Log Message:
* Thu Jan 22 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.08-5
- Fix phosphor segv when changing window size (bug 481146)


xscreensaver-5.08-phosphor-segv.patch:

--- NEW FILE xscreensaver-5.08-phosphor-segv.patch ---
--- xscreensaver-5.08/hacks/phosphor.c.debug	2008-07-31 19:01:00.000000000 +0900
+++ xscreensaver-5.08/hacks/phosphor.c	2009-01-22 22:52:11.000000000 +0900
@@ -1353,6 +1353,7 @@
 	  if (state->pid)
 	    {
 	      waitpid(state->pid, NULL, 0);
+	      state->pid = 0;
 	      fclose (state->pipe);
 	    }
 	  else
@@ -1436,7 +1437,7 @@
   resize_grid (state);
 
 # if defined(HAVE_FORKPTY) && defined(TIOCSWINSZ)
-  if (state->pid)
+  if (state->pid && state->pipe)
     {
       /* Tell the sub-process that the screen size has changed. */
       struct winsize ws;

xscreensaver-5.08-po-recreate.patch:

--- NEW FILE xscreensaver-5.08-po-recreate.patch ---
--- xscreensaver-5.08/aclocal.m4.po	2002-05-11 10:44:33.000000000 +0900
+++ xscreensaver-5.08/aclocal.m4	2008-12-30 04:33:01.000000000 +0900
@@ -252,7 +252,10 @@
 
     AC_OUTPUT_COMMANDS(
       [case "$CONFIG_FILES" in *po/Makefile.in*)
+         rm -f po/stamp-it po/stamp-it.tmp
+         > po/stamp-it.tmp
         sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile
+        mv po/stamp-it.tmp po/stamp-it
       esac])
 
     dnl These rules are solely for the distribution goal.  While doing this
--- xscreensaver-5.08/po/Makefile.in.in.po	2007-11-11 09:44:42.000000000 +0900
+++ xscreensaver-5.08/po/Makefile.in.in	2008-12-30 04:47:58.000000000 +0900
@@ -190,7 +190,7 @@
 all-yes: $(CATALOGS)
 all-no:
 
-$(srcdir)/$(GETTEXT_PACKAGE).pot: $(POTFILES)
+$(GETTEXT_PACKAGE).pot: $(POTFILES)
 	@INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) ; \
 	export INTLTOOL_EXTRACT ; \
 	echo top_srcdir=$(top_srcdir) $(GENPOT) ; \
@@ -274,6 +274,7 @@
 
 distclean: clean
 	rm -f Makefile Makefile.in POTFILES *.mo *.msg *.cat *.cat.m *.gmo *.pot
+	rm -f stamp-it
 
 maintainer-clean: distclean
 	@echo "This command is intended for maintainers to use;"
@@ -282,8 +283,8 @@
 
 depend:
 # fuck off.  love, jwz.
-#distdepend: generate_potfiles_in update-po $(DISTFILES)
-distdepend::
+distdepend: generate_potfiles_in update-po $(DISTFILES)
+#distdepend::
 
 
 # jwz: Generates po/POTFILES.in by examining the source tree:
@@ -292,6 +293,8 @@
 generate_potfiles_in:
 	@tmp=po.$$$$ ;				\
 	 file=POTFILES.in ;			\
+	 echo "sleeping 3 seconds..." ;\
+	 sleep 3; \
 	 ( cd $(top_srcdir);			\
 	   echo "# Auto-generated: `LANG=C date`" ;	\
 	   ( grep -l '_("' driver/*.[ch] ;	\
@@ -362,16 +365,22 @@
 	    && (sed -e '/^#/d' 						\
 		    -e "s/^\[.*\] +//" 					\
 		    -e '/^[ 	]*$$/d' 				\
-		    -e "s at .*@	$$posrcprefix& \\\\@" < $(srcdir)/$@.in	\
+		    -e "s at .*@	$$posrcprefix& \\\\@" < $@.in	\
 		| sed -e '$$s/\\$$//') > $@-t \
 	    && chmod a-w $@-t \
 	    && mv $@-t $@ )
 
+Makefile: stamp-it
+	@if test ! -f $@; then \
+		rm -f stamp-it; \
+		$(MAKE) stamp-it; \
+	fi
+
 # Please to be fucking the hell off.   This breaks "make distdepend". -jwz
-#Makefile: Makefile.in.in ../config.status POTFILES
-#	cd .. \
-#	  && CONFIG_FILES=$(subdir)/$@.in CONFIG_HEADERS= \
-#	       $(SHELL) ./config.status
+stamp-it: Makefile.in.in ../config.status POTFILES
+	cd .. \
+	  && CONFIG_FILES=$(subdir)/Makefile.in CONFIG_HEADERS= \
+	       $(SHELL) ./config.status
 
 # Tell versions [3.59,3.63) of GNU make not to export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.


Index: xscreensaver.spec
===================================================================
RCS file: /cvs/extras/rpms/xscreensaver/F-10/xscreensaver.spec,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- xscreensaver.spec	28 Dec 2008 15:24:14 -0000	1.78
+++ xscreensaver.spec	22 Jan 2009 14:02:44 -0000	1.79
@@ -5,7 +5,7 @@
 
 
 %define modular_conf  1
-%define fedora_rel    1
+%define fedora_rel    5
 
 %define extrarel      %{nil}
 
@@ -33,6 +33,8 @@
 %endif
 Patch1:          xscreensaver-5.00b5-sanitize-hacks.patch
 Patch21:         xscreensaver-5.07-webcollage-default-nonet.patch
+Patch50:         xscreensaver-5.08-po-recreate.patch
+Patch51:         xscreensaver-5.08-phosphor-segv.patch
 Requires:        xscreensaver-base = %{epoch}:%{version}-%{release}
 Requires:        xscreensaver-extras = %{epoch}:%{version}-%{release}
 Requires:        xscreensaver-gl-extras = %{epoch}:%{version}-%{release}
@@ -185,6 +187,8 @@
 
 %patch1 -p1 -b .sanitize-hacks
 %patch21 -p1 -b .nonet
+%patch50 -p1 -b .po
+%patch51 -p1 -b .phosphor
 
 change_option(){
    set +x
@@ -308,7 +312,7 @@
 sed -i.delay -e 's|60 \* 15|20|' driver/test-grab.c
 
 %build
-# autoconf
+autoconf
 
 archdir=`./config.guess`
 [ -d $archdir ] || mkdir $archdir
@@ -629,6 +633,12 @@
 %defattr(-,root,root,-)
 
 %changelog
+* Thu Jan 22 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.08-5
+- Fix phosphor segv when changing window size (bug 481146)
+
+* Tue Dec 30 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.08-4
+- Fix the process of "make update-po -C po", reported by jwz
+
 * Sun Dec 28 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.08-1
 - Update to 5.08
 - All non Fedora-specific patches went upstream



From mtasaka at fedoraproject.org  Thu Jan 22 14:03:15 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Thu, 22 Jan 2009 14:03:15 +0000 (UTC)
Subject: rpms/xscreensaver/F-9 xscreensaver-5.08-phosphor-segv.patch, NONE, 
	1.1 xscreensaver-5.08-po-recreate.patch, NONE,
	1.1 xscreensaver.spec, 1.77, 1.78
Message-ID: <20090122140315.1856E70033@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/xscreensaver/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21624/F-9

Modified Files:
	xscreensaver.spec 
Added Files:
	xscreensaver-5.08-phosphor-segv.patch 
	xscreensaver-5.08-po-recreate.patch 
Log Message:
* Thu Jan 22 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.08-5
- Fix phosphor segv when changing window size (bug 481146)


xscreensaver-5.08-phosphor-segv.patch:

--- NEW FILE xscreensaver-5.08-phosphor-segv.patch ---
--- xscreensaver-5.08/hacks/phosphor.c.debug	2008-07-31 19:01:00.000000000 +0900
+++ xscreensaver-5.08/hacks/phosphor.c	2009-01-22 22:52:11.000000000 +0900
@@ -1353,6 +1353,7 @@
 	  if (state->pid)
 	    {
 	      waitpid(state->pid, NULL, 0);
+	      state->pid = 0;
 	      fclose (state->pipe);
 	    }
 	  else
@@ -1436,7 +1437,7 @@
   resize_grid (state);
 
 # if defined(HAVE_FORKPTY) && defined(TIOCSWINSZ)
-  if (state->pid)
+  if (state->pid && state->pipe)
     {
       /* Tell the sub-process that the screen size has changed. */
       struct winsize ws;

xscreensaver-5.08-po-recreate.patch:

--- NEW FILE xscreensaver-5.08-po-recreate.patch ---
--- xscreensaver-5.08/aclocal.m4.po	2002-05-11 10:44:33.000000000 +0900
+++ xscreensaver-5.08/aclocal.m4	2008-12-30 04:33:01.000000000 +0900
@@ -252,7 +252,10 @@
 
     AC_OUTPUT_COMMANDS(
       [case "$CONFIG_FILES" in *po/Makefile.in*)
+         rm -f po/stamp-it po/stamp-it.tmp
+         > po/stamp-it.tmp
         sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile
+        mv po/stamp-it.tmp po/stamp-it
       esac])
 
     dnl These rules are solely for the distribution goal.  While doing this
--- xscreensaver-5.08/po/Makefile.in.in.po	2007-11-11 09:44:42.000000000 +0900
+++ xscreensaver-5.08/po/Makefile.in.in	2008-12-30 04:47:58.000000000 +0900
@@ -190,7 +190,7 @@
 all-yes: $(CATALOGS)
 all-no:
 
-$(srcdir)/$(GETTEXT_PACKAGE).pot: $(POTFILES)
+$(GETTEXT_PACKAGE).pot: $(POTFILES)
 	@INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) ; \
 	export INTLTOOL_EXTRACT ; \
 	echo top_srcdir=$(top_srcdir) $(GENPOT) ; \
@@ -274,6 +274,7 @@
 
 distclean: clean
 	rm -f Makefile Makefile.in POTFILES *.mo *.msg *.cat *.cat.m *.gmo *.pot
+	rm -f stamp-it
 
 maintainer-clean: distclean
 	@echo "This command is intended for maintainers to use;"
@@ -282,8 +283,8 @@
 
 depend:
 # fuck off.  love, jwz.
-#distdepend: generate_potfiles_in update-po $(DISTFILES)
-distdepend::
+distdepend: generate_potfiles_in update-po $(DISTFILES)
+#distdepend::
 
 
 # jwz: Generates po/POTFILES.in by examining the source tree:
@@ -292,6 +293,8 @@
 generate_potfiles_in:
 	@tmp=po.$$$$ ;				\
 	 file=POTFILES.in ;			\
+	 echo "sleeping 3 seconds..." ;\
+	 sleep 3; \
 	 ( cd $(top_srcdir);			\
 	   echo "# Auto-generated: `LANG=C date`" ;	\
 	   ( grep -l '_("' driver/*.[ch] ;	\
@@ -362,16 +365,22 @@
 	    && (sed -e '/^#/d' 						\
 		    -e "s/^\[.*\] +//" 					\
 		    -e '/^[ 	]*$$/d' 				\
-		    -e "s at .*@	$$posrcprefix& \\\\@" < $(srcdir)/$@.in	\
+		    -e "s at .*@	$$posrcprefix& \\\\@" < $@.in	\
 		| sed -e '$$s/\\$$//') > $@-t \
 	    && chmod a-w $@-t \
 	    && mv $@-t $@ )
 
+Makefile: stamp-it
+	@if test ! -f $@; then \
+		rm -f stamp-it; \
+		$(MAKE) stamp-it; \
+	fi
+
 # Please to be fucking the hell off.   This breaks "make distdepend". -jwz
-#Makefile: Makefile.in.in ../config.status POTFILES
-#	cd .. \
-#	  && CONFIG_FILES=$(subdir)/$@.in CONFIG_HEADERS= \
-#	       $(SHELL) ./config.status
+stamp-it: Makefile.in.in ../config.status POTFILES
+	cd .. \
+	  && CONFIG_FILES=$(subdir)/Makefile.in CONFIG_HEADERS= \
+	       $(SHELL) ./config.status
 
 # Tell versions [3.59,3.63) of GNU make not to export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.


Index: xscreensaver.spec
===================================================================
RCS file: /cvs/extras/rpms/xscreensaver/F-9/xscreensaver.spec,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- xscreensaver.spec	28 Dec 2008 15:24:15 -0000	1.77
+++ xscreensaver.spec	22 Jan 2009 14:02:44 -0000	1.78
@@ -5,7 +5,7 @@
 
 
 %define modular_conf  1
-%define fedora_rel    1
+%define fedora_rel    5
 
 %define extrarel      %{nil}
 
@@ -33,6 +33,8 @@
 %endif
 Patch1:          xscreensaver-5.00b5-sanitize-hacks.patch
 Patch21:         xscreensaver-5.07-webcollage-default-nonet.patch
+Patch50:         xscreensaver-5.08-po-recreate.patch
+Patch51:         xscreensaver-5.08-phosphor-segv.patch
 Requires:        xscreensaver-base = %{epoch}:%{version}-%{release}
 Requires:        xscreensaver-extras = %{epoch}:%{version}-%{release}
 Requires:        xscreensaver-gl-extras = %{epoch}:%{version}-%{release}
@@ -185,6 +187,8 @@
 
 %patch1 -p1 -b .sanitize-hacks
 %patch21 -p1 -b .nonet
+%patch50 -p1 -b .po
+%patch51 -p1 -b .phosphor
 
 change_option(){
    set +x
@@ -308,7 +312,7 @@
 sed -i.delay -e 's|60 \* 15|20|' driver/test-grab.c
 
 %build
-# autoconf
+autoconf
 
 archdir=`./config.guess`
 [ -d $archdir ] || mkdir $archdir
@@ -629,6 +633,12 @@
 %defattr(-,root,root,-)
 
 %changelog
+* Thu Jan 22 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.08-5
+- Fix phosphor segv when changing window size (bug 481146)
+
+* Tue Dec 30 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.08-4
+- Fix the process of "make update-po -C po", reported by jwz
+
 * Sun Dec 28 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.08-1
 - Update to 5.08
 - All non Fedora-specific patches went upstream



From rdieter at fedoraproject.org  Thu Jan 22 14:04:48 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu, 22 Jan 2009 14:04:48 +0000 (UTC)
Subject: rpms/kde-i18n/F-9 kde-i18n.spec,1.86,1.87
Message-ID: <20090122140448.8116170033@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kde-i18n/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21924

Modified Files:
	kde-i18n.spec 
Log Message:
* Sun Jan 11 2009 Than Ngo <than at redhat.com> - 3.5.10-2
- remove kdgantt.mo that conflict with kde-l10n



Index: kde-i18n.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kde-i18n/F-9/kde-i18n.spec,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -r1.86 -r1.87
--- kde-i18n.spec	3 Sep 2008 08:57:05 -0000	1.86
+++ kde-i18n.spec	22 Jan 2009 14:04:18 -0000	1.87
@@ -6,7 +6,7 @@
 Name: kde-i18n
 Epoch: 1
 Version: 3.5.10
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 # GFDL, with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
 License: GFDL 
@@ -1087,6 +1087,7 @@
    rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/timezones4.mo
    rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/umbrello.mo
    rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/useraccount.mo
+   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kdgantt.mo
    rm -f %{buildroot}%{_datadir}/locale/*/entry.desktop
 
    # keep these ones because we're shipping KDE 3 kdewebdev (because of Quanta)
@@ -1254,6 +1255,66 @@
 
    # remove obsolete KDE 3 application data translations
    rm -rf %{buildroot}%{_datadir}/apps
+
+%if 0%{?fedora} >= 10
+   # on F10+, also get rid of kdepim stuff
+   rm -rf %{buildroot}%{_docdir}/HTML/*/akregator
+   rm -rf %{buildroot}%{_docdir}/HTML/*/kaddressbook
+   rm -rf %{buildroot}%{_docdir}/HTML/*/kalarm
+   rm -rf %{buildroot}%{_docdir}/HTML/*/karm
+   rm -rf %{buildroot}%{_docdir}/HTML/*/kleopatra
+   rm -rf %{buildroot}%{_docdir}/HTML/*/kmail
+   rm -rf %{buildroot}%{_docdir}/HTML/*/knode
+   rm -rf %{buildroot}%{_docdir}/HTML/*/knotes
+   rm -rf %{buildroot}%{_docdir}/HTML/*/konsolekalendar
+   rm -rf %{buildroot}%{_docdir}/HTML/*/kontact
+   rm -rf %{buildroot}%{_docdir}/HTML/*/korganizer
+   rm -rf %{buildroot}%{_docdir}/HTML/*/korn
+   rm -rf %{buildroot}%{_docdir}/HTML/*/kpilot
+   rm -rf %{buildroot}%{_docdir}/HTML/*/ktnef
+   rm -rf %{buildroot}%{_docdir}/HTML/*/kwatchgnupg
+   rm -rf %{buildroot}%{_docdir}/HTML/*/multisynk
+
+   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/akregator.mo
+   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kabc_slox.mo
+   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kaddressbook.mo
+   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kalarm.mo
+   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kcmkabconfig.mo
+   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kcmkontactnt.mo
+   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kdepimresources.mo
+   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kdepimwizards.mo
+   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kfile_vcf.mo
+   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kio_groupwise.mo
+   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kitchensync.mo
+   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kleopatra.mo
+   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kmail.mo
+   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kmail_text_calendar_plugin.mo
+   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kmail_text_vcard_plugin.mo
+   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kmailcvt.mo
+   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/knode.mo
+   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/knotes.mo
+   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/konsolekalendar.mo
+   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kontact.mo
+   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/korganizer.mo
+   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/korn.mo
+   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kpilot.mo
+   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kres_birthday.mo
+   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kres_featureplan.mo
+   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kres_groupware.mo
+   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kres_groupwise.mo
+   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kres_kolab.mo
+   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kres_remote.mo
+   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kres_scalix.mo
+   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kres_tvanytime.mo
+   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kres_xmlrpc.mo
+   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/ktnef.mo
+   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kwatchgnupg.mo
+   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/libkdepim.mo
+   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/libkholidays.mo
+   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/libkleopatra.mo
+   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/libkpgp.mo
+   rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/libksieve.mo
+%endif
 %endif
 
 %clean
@@ -1789,9 +1850,18 @@
 
 
 %changelog
+* Sun Jan 11 2009 Than Ngo <than at redhat.com> - 3.5.10-2
+- remove kdgantt.mo that conflict with kde-l10n
+
 * 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)
+
+* Sat Jul 26 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 1:3.5.9-9
+- on F10+, remove translations for kdepim apps now part of KDE 4.1 (#456745)
+
 * Sun Jul 20 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 1:3.5.9-8
 - also remove kpovmodeler translations on F9+ (#454458)
 



From than at fedoraproject.org  Thu Jan 22 14:07:27 2009
From: than at fedoraproject.org (Than Ngo)
Date: Thu, 22 Jan 2009 14:07:27 +0000 (UTC)
Subject: rpms/kde-l10n/devel .cvsignore, 1.17, 1.18 kde-l10n.spec, 1.58,
	1.59 sources, 1.19, 1.20 subdirs-kde-l10n, 1.11, 1.12
Message-ID: <20090122140727.BB03770142@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kde-l10n/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22618

Modified Files:
	.cvsignore kde-l10n.spec sources subdirs-kde-l10n 
Log Message:
4.2.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kde-l10n/devel/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- .cvsignore	7 Jan 2009 21:05:52 -0000	1.17
+++ .cvsignore	22 Jan 2009 14:06:57 -0000	1.18
@@ -186,3 +186,49 @@
 kde-l10n-wa-4.1.96.tar.bz2
 kde-l10n-zh_CN-4.1.96.tar.bz2
 kde-l10n-zh_TW-4.1.96.tar.bz2
+kde-l10n-bg-4.2.0.tar.bz2
+kde-l10n-ca-4.2.0.tar.bz2
+kde-l10n-cs-4.2.0.tar.bz2
+kde-l10n-csb-4.2.0.tar.bz2
+kde-l10n-da-4.2.0.tar.bz2
+kde-l10n-de-4.2.0.tar.bz2
+kde-l10n-el-4.2.0.tar.bz2
+kde-l10n-en_GB-4.2.0.tar.bz2
+kde-l10n-es-4.2.0.tar.bz2
+kde-l10n-et-4.2.0.tar.bz2
+kde-l10n-fi-4.2.0.tar.bz2
+kde-l10n-fr-4.2.0.tar.bz2
+kde-l10n-ga-4.2.0.tar.bz2
+kde-l10n-gl-4.2.0.tar.bz2
+kde-l10n-hi-4.2.0.tar.bz2
+kde-l10n-hu-4.2.0.tar.bz2
+kde-l10n-it-4.2.0.tar.bz2
+kde-l10n-ja-4.2.0.tar.bz2
+kde-l10n-kk-4.2.0.tar.bz2
+kde-l10n-km-4.2.0.tar.bz2
+kde-l10n-ko-4.2.0.tar.bz2
+kde-l10n-ku-4.2.0.tar.bz2
+kde-l10n-lt-4.2.0.tar.bz2
+kde-l10n-lv-4.2.0.tar.bz2
+kde-l10n-mk-4.2.0.tar.bz2
+kde-l10n-ml-4.2.0.tar.bz2
+kde-l10n-nb-4.2.0.tar.bz2
+kde-l10n-nds-4.2.0.tar.bz2
+kde-l10n-nl-4.2.0.tar.bz2
+kde-l10n-nn-4.2.0.tar.bz2
+kde-l10n-pa-4.2.0.tar.bz2
+kde-l10n-pl-4.2.0.tar.bz2
+kde-l10n-pt-4.2.0.tar.bz2
+kde-l10n-pt_BR-4.2.0.tar.bz2
+kde-l10n-ru-4.2.0.tar.bz2
+kde-l10n-sl-4.2.0.tar.bz2
+kde-l10n-sr-4.2.0.tar.bz2
+kde-l10n-sv-4.2.0.tar.bz2
+kde-l10n-th-4.2.0.tar.bz2
+kde-l10n-tr-4.2.0.tar.bz2
+kde-l10n-uk-4.2.0.tar.bz2
+kde-l10n-wa-4.2.0.tar.bz2
+kde-l10n-zh_CN-4.2.0.tar.bz2
+kde-l10n-zh_TW-4.2.0.tar.bz2
+kde-l10n-ar-4.2.0.tar.bz2
+kde-l10n-eu-4.2.0.tar.bz2


Index: kde-l10n.spec
===================================================================
RCS file: /cvs/extras/rpms/kde-l10n/devel/kde-l10n.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- kde-l10n.spec	10 Jan 2009 21:26:03 -0000	1.58
+++ kde-l10n.spec	22 Jan 2009 14:06:57 -0000	1.59
@@ -1,15 +1,15 @@
 %define buildall 0
 
 Name: kde-l10n
-Version: 4.1.96
-Release: 2%{dist}
+Version: 4.2.0
+Release: 1%{dist}
 Url: http://www.kde.org
 Summary: Internationalization support for KDE
 Group: User Interface/Desktops
 License: LGPLv2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
-#Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-ar-%{version}.tar.bz2
+Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-ar-%{version}.tar.bz2
 #Source1: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-be-%{version}.tar.bz2
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-bg-%{version}.tar.bz2
 Source3: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-ca-%{version}.tar.bz2
@@ -22,7 +22,7 @@
 Source10: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-eo-%{version}.tar.bz2
 Source11: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-es-%{version}.tar.bz2
 Source12: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-et-%{version}.tar.bz2
-#Source13: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-eu-%{version}.tar.bz2
+Source13: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-eu-%{version}.tar.bz2
 Source14: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-fi-%{version}.tar.bz2
 Source15: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-fr-%{version}.tar.bz2
 Source16: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-ga-%{version}.tar.bz2
@@ -833,12 +833,10 @@
 %lang(af) %{_datadir}/locale/af/*
 %endif
 
-%if %{buildall}
 %files Arabic 
 %defattr(-,root,root)
 %lang(ar) %{_datadir}/locale/ar/*
 %lang(ar) %{_datadir}/kde4/apps/klettres/ar
-%endif
 
 %if %{buildall}
 %files Azerbaijani
@@ -955,11 +953,9 @@
 %lang(et) %{_kde4_appsdir}/kvtml/et
 %lang(et) %{_kde4_docdir}/HTML/et
 
-%if %{buildall}
 %files Basque
 %defattr(-,root,root)
 %lang(eu) %{_datadir}/locale/eu/*
-%endif
 
 %if %{buildall}
 %files Farsi
@@ -1310,6 +1306,9 @@
 %lang(zh_TW) %{_kde4_docdir}/HTML/zh_TW
 
 %changelog
+* Thu Jan 22 2009 Than Ngo <than at redhat.com> - 4.2.0-1
+- 4.2.0
+
 * Sat Jan 10 2009 Than Ngo <than at redhat.com> - 4.1.96-2
 - remove debug
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kde-l10n/devel/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources	9 Jan 2009 11:41:23 -0000	1.19
+++ sources	22 Jan 2009 14:06:57 -0000	1.20
@@ -1,47 +1,46 @@
-62095495040db4df27ba910e4baf1654  kde-l10n-bg-4.1.96.tar.bz2
-23e9a8fc183373884bac7f723ee0fac2  kde-l10n-ca-4.1.96.tar.bz2
-b12eb1339de5ee9a8a4306d4f78263de  kde-l10n-cs-4.1.96.tar.bz2
-af896b1c81041b40a5b192f6f8843bd0  kde-l10n-csb-4.1.96.tar.bz2
-32dc82514e6583d97541cb43d6cb1e20  kde-l10n-da-4.1.96.tar.bz2
-7d3d8e145046aa433f418a81b6e7095d  kde-l10n-el-4.1.96.tar.bz2
-d29e0ebd2b94044db2572f55efc14c56  kde-l10n-en_GB-4.1.96.tar.bz2
-59f6247d771d39abc48ec803cc0a1cfa  kde-l10n-eo-4.1.96.tar.bz2
-8c6e2507c6853809cac9aa66d3eb087f  kde-l10n-es-4.1.96.tar.bz2
-8fc95ce4d7b80927062557479d6abc24  kde-l10n-et-4.1.96.tar.bz2
-e3ef31668dd60dbd39646d55c4a34614  kde-l10n-fi-4.1.96.tar.bz2
-e48e82644ebbfe56becbd35ed21e7777  kde-l10n-fr-4.1.96.tar.bz2
-e5046259747f18c9d017f3606eda444c  kde-l10n-fy-4.1.96.tar.bz2
-f875d7f5f1d3efa984cd56eff0235784  kde-l10n-ga-4.1.96.tar.bz2
-c122bebcd1bd5ed799e3856f3a4f0cdd  kde-l10n-gl-4.1.96.tar.bz2
-4e143bc481106e01d38b396e5df44416  kde-l10n-hi-4.1.96.tar.bz2
-b153b9ba4bcfd29f55fb648acbb9e759  kde-l10n-hu-4.1.96.tar.bz2
-a26a6e3ecdbbde48aecbcffba1399cf5  kde-l10n-it-4.1.96.tar.bz2
-386aecfdbf000a507a5c0430d8906c33  kde-l10n-ja-4.1.96.tar.bz2
-c14fcfe7b1874160e8c526305a5f55d6  kde-l10n-kk-4.1.96.tar.bz2
-f8dc5ce78e5c2d1a44e60bce84279f38  kde-l10n-km-4.1.96.tar.bz2
-50d5d0c2fb064a8787f285eb7ba279b0  kde-l10n-ko-4.1.96.tar.bz2
-2ede6e6fa858bf12266244f3cdfbed0c  kde-l10n-ku-4.1.96.tar.bz2
-1b179c6f33c3ae5c18382f131d9608f9  kde-l10n-lt-4.1.96.tar.bz2
-a206b118c13b57818a76b1a3b5714916  kde-l10n-lv-4.1.96.tar.bz2
-79d31732e541070392c169c249780efd  kde-l10n-mk-4.1.96.tar.bz2
-d14930ca1f29cc9a8d60f848d32b2e5b  kde-l10n-ml-4.1.96.tar.bz2
-fb6d8dd2e74e9e0862fe2b693d522a57  kde-l10n-nb-4.1.96.tar.bz2
-39d9ac7aa022b0df2cecd9eea76cdfe4  kde-l10n-nds-4.1.96.tar.bz2
-40fa9ae5d2989291b2d1460b1598d6da  kde-l10n-nl-4.1.96.tar.bz2
-f182724525952817b5f11152d9085c94  kde-l10n-nn-4.1.96.tar.bz2
-bf879ef593a49729d8e743f2791d5df4  kde-l10n-pa-4.1.96.tar.bz2
-3fd8eb6aa9fdef775ea435e64bd9d310  kde-l10n-pl-4.1.96.tar.bz2
-81a45e66e12b5b3aaacae7c21498f834  kde-l10n-pt-4.1.96.tar.bz2
-bec1cf6f3d8870c16fe495c52a83587f  kde-l10n-pt_BR-4.1.96.tar.bz2
-b677e7bc523aa6fd75ed39dff1bcae9a  kde-l10n-ru-4.1.96.tar.bz2
-bbfb5135bf89a52765294414b51ce772  kde-l10n-sl-4.1.96.tar.bz2
-59aa3d00f5b26c2067a6f82e48f0fc78  kde-l10n-sr-4.1.96.tar.bz2
-46d4d350e862184b2ac8dd5b0ad8d815  kde-l10n-sv-4.1.96.tar.bz2
-586ccb6fa1f2ef63aa1823c57201feb1  kde-l10n-ta-4.1.96.tar.bz2
-fdf666417ed2c529cb0e3a4eb495b524  kde-l10n-th-4.1.96.tar.bz2
-0a5a3c13a01635e9060b238036f5a851  kde-l10n-tr-4.1.96.tar.bz2
-d3f1d1090c98eba59367451ee8fec601  kde-l10n-uk-4.1.96.tar.bz2
-ec57fe2c312e23c7226094ead62a24b8  kde-l10n-wa-4.1.96.tar.bz2
-33579ad111bd05d5eb4620c7eae22462  kde-l10n-zh_CN-4.1.96.tar.bz2
-61a0356a4dc25f9d388bc6696ac787c8  kde-l10n-zh_TW-4.1.96.tar.bz2
-69928e97897eb9cea1f8304484075b77  kde-l10n-de-4.1.96.tar.bz2
+fc201d9b7d85b84ed02d049309d50ec7  kde-l10n-bg-4.2.0.tar.bz2
+62b468adf048dde92abcea1cc8378ee0  kde-l10n-ca-4.2.0.tar.bz2
+3fbbda2cb209e8c773c075ed3d28f831  kde-l10n-cs-4.2.0.tar.bz2
+c9e576d85e7c8644a7f363a7dc446a47  kde-l10n-csb-4.2.0.tar.bz2
+9f6a01336b631223e13df6f82f6247ad  kde-l10n-da-4.2.0.tar.bz2
+da8184a7380795790d498c7d5e4a6b62  kde-l10n-de-4.2.0.tar.bz2
+2bbfca0b7a1366aee558804105b176cb  kde-l10n-el-4.2.0.tar.bz2
+12814406b6d35d8098a6cd16f49f827e  kde-l10n-en_GB-4.2.0.tar.bz2
+e3b9bc8ef5573f7574e296385eb130a9  kde-l10n-es-4.2.0.tar.bz2
+94b1a109b75d7bca66a3f26b0b3b61c1  kde-l10n-et-4.2.0.tar.bz2
+dc5bda4589b9a2042ade700caf8de083  kde-l10n-fi-4.2.0.tar.bz2
+ca231f7972a5269a589cad934cd4ab81  kde-l10n-fr-4.2.0.tar.bz2
+d18b399ca99aa54c936bcdb207baac0a  kde-l10n-ga-4.2.0.tar.bz2
+104815bc1b20b100509f66132df52cad  kde-l10n-gl-4.2.0.tar.bz2
+b828a209e2b370e4b3487be01dc0ea8e  kde-l10n-hi-4.2.0.tar.bz2
+b000573be5a3b6cee9ee9aa45b0931bc  kde-l10n-hu-4.2.0.tar.bz2
+42387c0b473767173ebf65622edb4278  kde-l10n-it-4.2.0.tar.bz2
+84c1dc6f18dd405b217d98312ffec6bf  kde-l10n-ja-4.2.0.tar.bz2
+a984ed36132141eb8473ab541187d296  kde-l10n-kk-4.2.0.tar.bz2
+a8aaca814f556e3e8b3cd99f04eddca6  kde-l10n-km-4.2.0.tar.bz2
+bbd68e1c9eee724c7db051657fdfb50c  kde-l10n-ko-4.2.0.tar.bz2
+3ce287f12f044c14608692518018bbef  kde-l10n-ku-4.2.0.tar.bz2
+5ffad305fb06d70f7991745b82a427e3  kde-l10n-lt-4.2.0.tar.bz2
+9d8fe83cefb273eb065337a0ab8790a5  kde-l10n-lv-4.2.0.tar.bz2
+933d60b4c535d9d6d9729bd986906e64  kde-l10n-mk-4.2.0.tar.bz2
+462763d9a71c273b7ae6f3ebd2c798e1  kde-l10n-ml-4.2.0.tar.bz2
+db0d87c5125b05c25788cbf10fd56490  kde-l10n-nb-4.2.0.tar.bz2
+378e068c4c86670788019ae7d0dda136  kde-l10n-nds-4.2.0.tar.bz2
+f9174173973b0e235a3d729b0ef2f1cf  kde-l10n-nl-4.2.0.tar.bz2
+cff7964f1c88a52d7e64df19e53c88ea  kde-l10n-nn-4.2.0.tar.bz2
+a8dded180d298489861d17a761df51f8  kde-l10n-pa-4.2.0.tar.bz2
+b04d741a53b0e1ba58d315cf118985e4  kde-l10n-pl-4.2.0.tar.bz2
+eabe2a528d1e9d5c10ecae15dea68d26  kde-l10n-pt-4.2.0.tar.bz2
+d932254d7168016819aacc45a759592e  kde-l10n-pt_BR-4.2.0.tar.bz2
+9038ce82cdddf3fcf028aff50a55932a  kde-l10n-ru-4.2.0.tar.bz2
+b24648e4fe6552ed7253acee7306f03e  kde-l10n-sl-4.2.0.tar.bz2
+8d58ae783752ba8129df1e3866e8a089  kde-l10n-sr-4.2.0.tar.bz2
+efbdb69f70e723c1ce0783e2a0693aaf  kde-l10n-sv-4.2.0.tar.bz2
+010ba3a0ed85c99cd215623f6d78fcd5  kde-l10n-th-4.2.0.tar.bz2
+850a88f8d82d9d9ab4c5ef2406eba39e  kde-l10n-tr-4.2.0.tar.bz2
+7dba32b49fe5d263103a617a49a1849e  kde-l10n-uk-4.2.0.tar.bz2
+0db1e8dc944786811cc1364df0ee4cf2  kde-l10n-wa-4.2.0.tar.bz2
+c4730babc7bef39cea255c9528607fdc  kde-l10n-zh_CN-4.2.0.tar.bz2
+08af73c8b0f82689f5ab046f0700bf9d  kde-l10n-zh_TW-4.2.0.tar.bz2
+058b0bd3a7b2ca4ef56730488a234afa  kde-l10n-ar-4.2.0.tar.bz2
+5248515b294143a7821055754b9236e4  kde-l10n-eu-4.2.0.tar.bz2


Index: subdirs-kde-l10n
===================================================================
RCS file: /cvs/extras/rpms/kde-l10n/devel/subdirs-kde-l10n,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- subdirs-kde-l10n	27 Sep 2008 03:44:24 -0000	1.11
+++ subdirs-kde-l10n	22 Jan 2009 14:06:57 -0000	1.12
@@ -1,3 +1,4 @@
+ar
 bg
 ca
 cs
@@ -9,6 +10,7 @@
 eo
 es
 et
+eu
 fi
 fr
 fy



From rdieter at fedoraproject.org  Thu Jan 22 14:08:40 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu, 22 Jan 2009 14:08:40 +0000 (UTC)
Subject: rpms/kdebase-runtime/F-9 kdebase-runtime.spec,1.61,1.62
Message-ID: <20090122140840.CEC8870033@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-serv23619

Modified Files:
	kdebase-runtime.spec 
Log Message:
* Wed Jan 21 2009 Rex Dieter <rdieter at fedoraproject.org> 4.1.4-2
- include %_bindir/kdesu symlink



Index: kdebase-runtime.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-runtime/F-9/kdebase-runtime.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- kdebase-runtime.spec	8 Jan 2009 14:16:57 -0000	1.61
+++ kdebase-runtime.spec	22 Jan 2009 14:08:10 -0000	1.62
@@ -10,7 +10,7 @@
 Name:          kdebase-runtime
 Summary:       K Desktop Environment - Runtime 
 Version:       4.1.4
-Release:       1%{?dist}
+Release:       2%{?dist}
 
 License:       GPLv2
 Group:         User Interface/Desktops
@@ -40,6 +40,9 @@
 %define rest 1
 %endif
 
+# when kdesu was removed, this is/should-be only temporary
+Conflicts: kdebase3 < 3.5.10-4
+
 Requires: %{name}-libs = %{version}-%{release}
 
 Obsoletes: kdebase4-runtime < %{version}-%{release}
@@ -143,7 +146,10 @@
 rm -rf %{buildroot}
 
 %if 0%{?rest}
-make install DESTDIR=%{buildroot} -C %{_target_platform}
+make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
+
+# kdesu symlink
+ln -s %{_kde4_libexecdir}/kdesu %{buildroot}%{_kde4_bindir}/kdesu
 %endif
 
 %if 0%{?icons}
@@ -381,10 +387,13 @@
 
 
 %changelog
+* Wed Jan 21 2009 Rex Dieter <rdieter at fedoraproject.org> 4.1.4-2
+- include %%_bindir/kdesu symlink
+
 * Thu Jan  8 2009 Luk???? Tinkl <ltinkl at redhat.com> 4.1.4-1
 - KDE 4.1.4
 
-* Wed Nov  5 2008 Luk???? Tinkl <ltinkl at redhat.com> 4.1.3-1
+* Wed Nov 12 2008 Than Ngo <than at redhat.com> 4.1.3-1
 - KDE 4.1.3
 
 * Tue Oct 14 2008 Than Ngo <than at redhat.com> 4.1.2-5



From than at fedoraproject.org  Thu Jan 22 14:13:17 2009
From: than at fedoraproject.org (Than Ngo)
Date: Thu, 22 Jan 2009 14:13:17 +0000 (UTC)
Subject: rpms/kde-l10n/devel kde-l10n.spec,1.59,1.60
Message-ID: <20090122141317.254F070033@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kde-l10n/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23993

Modified Files:
	kde-l10n.spec 
Log Message:
readd ar/eu



Index: kde-l10n.spec
===================================================================
RCS file: /cvs/extras/rpms/kde-l10n/devel/kde-l10n.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- kde-l10n.spec	22 Jan 2009 14:06:57 -0000	1.59
+++ kde-l10n.spec	22 Jan 2009 14:12:46 -0000	1.60
@@ -11,7 +11,7 @@
 BuildArch: noarch
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-ar-%{version}.tar.bz2
 #Source1: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-be-%{version}.tar.bz2
-Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-bg-%{version}.tar.bz2
+Source2: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-bg-%{version}.tar.bz2
 Source3: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-ca-%{version}.tar.bz2
 Source4: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-cs-%{version}.tar.bz2
 Source5: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-csb-%{version}.tar.bz2



From thm at fedoraproject.org  Thu Jan 22 14:14:00 2009
From: thm at fedoraproject.org (Thomas Moschny)
Date: Thu, 22 Jan 2009 14:14:00 +0000 (UTC)
Subject: rpms/botan/devel .cvsignore, 1.2, 1.3 botan.spec, 1.1,
	1.2 import.log, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20090122141400.1AFE870033@cvs1.fedora.phx.redhat.com>

Author: thm

Update of /cvs/pkgs/rpms/botan/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24475/devel

Modified Files:
	.cvsignore botan.spec import.log sources 
Log Message:
Update to 1.8.1.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/botan/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	19 Jan 2009 08:45:46 -0000	1.2
+++ .cvsignore	22 Jan 2009 14:13:29 -0000	1.3
@@ -1 +1 @@
-Botan-1.8.0.tgz
+Botan-1.8.1.tgz


Index: botan.spec
===================================================================
RCS file: /cvs/pkgs/rpms/botan/devel/botan.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- botan.spec	19 Jan 2009 08:45:46 -0000	1.1
+++ botan.spec	22 Jan 2009 14:13:29 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           botan
-Version:        1.8.0
-Release:        2%{?dist}
+Version:        1.8.1
+Release:        1%{?dist}
 Summary:        Crypto library written in C++
 
 Group:          System Environment/Libraries
@@ -43,7 +43,10 @@
 
 
 %build
-%define enable_modules alloc_mmap,egd,fd_unix,posix_rt,bzip2,zlib,pthreads,openssl
+# we have the necessary prerequisites, so enable optional modules
+%define enable_modules gnump,bzip2,zlib,openssl
+
+# fixme: maybe disable unix_procs, very slow.
 %define disable_modules %{nil}
 
 ./configure.pl \
@@ -102,6 +105,12 @@
 
 
 %changelog
+* Wed Jan 21 2009 Thomas Moschny <thomas.moschny at gmx.de> - 1.8.1-1
+- Update to 1.8.1. This is a bugfix release, see
+  http://botan.randombit.net/news/releases/1_8_1.html for changes.
+- No need to explicitly enable modules that will be enabled by
+  configure.pl anyway.
+
 * Mon Jan 19 2009 Thomas Moschny <thomas.moschny at gmx.de> - 1.8.0-2
 - Move api* and tutorial* doc files to -devel package.
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/botan/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	19 Jan 2009 08:45:46 -0000	1.1
+++ import.log	22 Jan 2009 14:13:29 -0000	1.2
@@ -1 +1,2 @@
 botan-1_8_0-2_fc10:HEAD:botan-1.8.0-2.fc10.src.rpm:1232354502
+botan-1_8_1-1_fc10:HEAD:botan-1.8.1-1.fc10.src.rpm:1232633562


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/botan/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	19 Jan 2009 08:45:46 -0000	1.2
+++ sources	22 Jan 2009 14:13:29 -0000	1.3
@@ -1 +1 @@
-827c81f42cd1c118fc9bf1891be7cde5  Botan-1.8.0.tgz
+ff5ddc348cc306d4e5674b8be12ac836  Botan-1.8.1.tgz



From thm at fedoraproject.org  Thu Jan 22 14:28:23 2009
From: thm at fedoraproject.org (Thomas Moschny)
Date: Thu, 22 Jan 2009 14:28:23 +0000 (UTC)
Subject: rpms/botan/F-10 .cvsignore, 1.2, 1.3 botan.spec, 1.1, 1.2 import.log,
	1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20090122142823.A084570033@cvs1.fedora.phx.redhat.com>

Author: thm

Update of /cvs/pkgs/rpms/botan/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26410/F-10

Modified Files:
	.cvsignore botan.spec import.log sources 
Log Message:
Update to 1.8.1.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/botan/F-10/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	19 Jan 2009 09:00:00 -0000	1.2
+++ .cvsignore	22 Jan 2009 14:27:53 -0000	1.3
@@ -1 +1 @@
-Botan-1.8.0.tgz
+Botan-1.8.1.tgz


Index: botan.spec
===================================================================
RCS file: /cvs/pkgs/rpms/botan/F-10/botan.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- botan.spec	19 Jan 2009 09:00:01 -0000	1.1
+++ botan.spec	22 Jan 2009 14:27:53 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           botan
-Version:        1.8.0
-Release:        2%{?dist}
+Version:        1.8.1
+Release:        1%{?dist}
 Summary:        Crypto library written in C++
 
 Group:          System Environment/Libraries
@@ -43,7 +43,10 @@
 
 
 %build
-%define enable_modules alloc_mmap,egd,fd_unix,posix_rt,bzip2,zlib,pthreads,openssl
+# we have the necessary prerequisites, so enable optional modules
+%define enable_modules gnump,bzip2,zlib,openssl
+
+# fixme: maybe disable unix_procs, very slow.
 %define disable_modules %{nil}
 
 ./configure.pl \
@@ -102,6 +105,12 @@
 
 
 %changelog
+* Wed Jan 21 2009 Thomas Moschny <thomas.moschny at gmx.de> - 1.8.1-1
+- Update to 1.8.1. This is a bugfix release, see
+  http://botan.randombit.net/news/releases/1_8_1.html for changes.
+- No need to explicitly enable modules that will be enabled by
+  configure.pl anyway.
+
 * Mon Jan 19 2009 Thomas Moschny <thomas.moschny at gmx.de> - 1.8.0-2
 - Move api* and tutorial* doc files to -devel package.
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/botan/F-10/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	19 Jan 2009 09:00:01 -0000	1.1
+++ import.log	22 Jan 2009 14:27:53 -0000	1.2
@@ -1 +1,2 @@
 botan-1_8_0-2_fc10:F-10:botan-1.8.0-2.fc10.src.rpm:1232355547
+botan-1_8_1-1_fc10:F-10:botan-1.8.1-1.fc10.src.rpm:1232634423


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/botan/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	19 Jan 2009 09:00:01 -0000	1.2
+++ sources	22 Jan 2009 14:27:53 -0000	1.3
@@ -1 +1 @@
-827c81f42cd1c118fc9bf1891be7cde5  Botan-1.8.0.tgz
+ff5ddc348cc306d4e5674b8be12ac836  Botan-1.8.1.tgz



From thm at fedoraproject.org  Thu Jan 22 14:35:23 2009
From: thm at fedoraproject.org (Thomas Moschny)
Date: Thu, 22 Jan 2009 14:35:23 +0000 (UTC)
Subject: rpms/botan/F-9 .cvsignore, 1.2, 1.3 botan.spec, 1.1, 1.2 import.log,
	1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20090122143523.2555170033@cvs1.fedora.phx.redhat.com>

Author: thm

Update of /cvs/pkgs/rpms/botan/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27613/F-9

Modified Files:
	.cvsignore botan.spec import.log sources 
Log Message:
Update to 1.8.1.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/botan/F-9/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	19 Jan 2009 09:18:27 -0000	1.2
+++ .cvsignore	22 Jan 2009 14:34:52 -0000	1.3
@@ -1 +1 @@
-Botan-1.8.0.tgz
+Botan-1.8.1.tgz


Index: botan.spec
===================================================================
RCS file: /cvs/pkgs/rpms/botan/F-9/botan.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- botan.spec	19 Jan 2009 09:18:27 -0000	1.1
+++ botan.spec	22 Jan 2009 14:34:52 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           botan
-Version:        1.8.0
-Release:        2%{?dist}
+Version:        1.8.1
+Release:        1%{?dist}
 Summary:        Crypto library written in C++
 
 Group:          System Environment/Libraries
@@ -43,7 +43,10 @@
 
 
 %build
-%define enable_modules alloc_mmap,egd,fd_unix,posix_rt,bzip2,zlib,pthreads,openssl
+# we have the necessary prerequisites, so enable optional modules
+%define enable_modules gnump,bzip2,zlib,openssl
+
+# fixme: maybe disable unix_procs, very slow.
 %define disable_modules %{nil}
 
 ./configure.pl \
@@ -102,6 +105,12 @@
 
 
 %changelog
+* Wed Jan 21 2009 Thomas Moschny <thomas.moschny at gmx.de> - 1.8.1-1
+- Update to 1.8.1. This is a bugfix release, see
+  http://botan.randombit.net/news/releases/1_8_1.html for changes.
+- No need to explicitly enable modules that will be enabled by
+  configure.pl anyway.
+
 * Mon Jan 19 2009 Thomas Moschny <thomas.moschny at gmx.de> - 1.8.0-2
 - Move api* and tutorial* doc files to -devel package.
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/botan/F-9/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	19 Jan 2009 09:18:27 -0000	1.1
+++ import.log	22 Jan 2009 14:34:52 -0000	1.2
@@ -1 +1,2 @@
 botan-1_8_0-2_fc10:F-9:botan-1.8.0-2.fc10.src.rpm:1232356659
+botan-1_8_1-1_fc10:F-9:botan-1.8.1-1.fc10.src.rpm:1232634850


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/botan/F-9/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	19 Jan 2009 09:18:27 -0000	1.2
+++ sources	22 Jan 2009 14:34:52 -0000	1.3
@@ -1 +1 @@
-827c81f42cd1c118fc9bf1891be7cde5  Botan-1.8.0.tgz
+ff5ddc348cc306d4e5674b8be12ac836  Botan-1.8.1.tgz



From pingou at fedoraproject.org  Thu Jan 22 14:37:54 2009
From: pingou at fedoraproject.org (Pierre-YvesChibon)
Date: Thu, 22 Jan 2009 14:37:54 +0000 (UTC)
Subject: rpms/R-affyio/devel .cvsignore, 1.5, 1.6 R-affyio.spec, 1.8,
	1.9 sources, 1.5, 1.6
Message-ID: <20090122143754.853B470141@cvs1.fedora.phx.redhat.com>

Author: pingou

Update of /cvs/pkgs/rpms/R-affyio/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28165

Modified Files:
	.cvsignore R-affyio.spec sources 
Log Message:
New update



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/R-affyio/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	27 Oct 2008 19:38:02 -0000	1.5
+++ .cvsignore	22 Jan 2009 14:37:24 -0000	1.6
@@ -1 +1 @@
-affyio_1.10.0.tar.gz
+affyio_1.10.1.tar.gz


Index: R-affyio.spec
===================================================================
RCS file: /cvs/pkgs/rpms/R-affyio/devel/R-affyio.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- R-affyio.spec	30 Nov 2008 00:12:51 -0000	1.8
+++ R-affyio.spec	22 Jan 2009 14:37:24 -0000	1.9
@@ -3,7 +3,7 @@
 %define Rversion  2.8.0
 
 Name:             R-%{packname}
-Version:          1.10.0
+Version:          1.10.1
 Release:          3%{?dist}
 Summary:          Tools for parsing Affymetrix data files
 Summary(fr):      Outils d'analyse de fichier de donn??es de puces affymetrix
@@ -72,6 +72,9 @@
 %{_libdir}/R/library/%{packname}/libs
 
 %changelog
+* Thu Jan 22 2009 pingou <pingou-at-pingoured.fr> 1.10.1-0
+- Update to newest version
+
 * Sun Nov 30 2008 pingou <pingoufc4-at-yahoo.fr> 1.10.0-3
 - Own the folder libs -- #473618
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/R-affyio/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	27 Oct 2008 19:38:02 -0000	1.5
+++ sources	22 Jan 2009 14:37:24 -0000	1.6
@@ -1 +1 @@
-817059744ef27f492a134fa5b7c888ac  affyio_1.10.0.tar.gz
+3fa52123d56559210ab02845fd6f309a  affyio_1.10.1.tar.gz



From pingou at fedoraproject.org  Thu Jan 22 14:40:15 2009
From: pingou at fedoraproject.org (Pierre-YvesChibon)
Date: Thu, 22 Jan 2009 14:40:15 +0000 (UTC)
Subject: rpms/R-affyio/F-9 R-affyio.spec,1.6,1.7 sources,1.5,1.6
Message-ID: <20090122144015.27A7570141@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-serv29243/F-9

Modified Files:
	R-affyio.spec sources 
Log Message:
New update


Index: R-affyio.spec
===================================================================
RCS file: /cvs/pkgs/rpms/R-affyio/F-9/R-affyio.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- R-affyio.spec	26 Nov 2008 20:42:15 -0000	1.6
+++ R-affyio.spec	22 Jan 2009 14:39:44 -0000	1.7
@@ -3,8 +3,8 @@
 %define Rversion  2.8.0
 
 Name:             R-%{packname}
-Version:          1.10.0
-Release:          2%{?dist}
+Version:          1.10.1
+Release:          3%{?dist}
 Summary:          Tools for parsing Affymetrix data files
 Summary(fr):      Outils d'analyse de fichier de donn??es de puces affymetrix
 
@@ -69,9 +69,15 @@
 %{_libdir}/R/library/%{packname}/R/
 %{_libdir}/R/library/%{packname}/Meta
 %{_libdir}/R/library/%{packname}/help
-%{_libdir}/R/library/%{packname}/libs/affyio.so
+%{_libdir}/R/library/%{packname}/libs
 
 %changelog
+* Thu Jan 22 2009 pingou <pingou-at-pingoured.fr> 1.10.1-0
+- Update to newest version
+
+* Sun Nov 30 2008 pingou <pingoufc4-at-yahoo.fr> 1.10.0-3
+- Own the folder libs -- #473618
+
 * Thu Nov 20 2008 pingou <pingoufc4-at-yahoo.fr> 1.10.0-2
 - Correct the Source0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/R-affyio/F-9/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	26 Nov 2008 20:42:15 -0000	1.5
+++ sources	22 Jan 2009 14:39:44 -0000	1.6
@@ -1 +1 @@
-817059744ef27f492a134fa5b7c888ac  affyio_1.10.0.tar.gz
+3fa52123d56559210ab02845fd6f309a  affyio_1.10.1.tar.gz



From kzak at fedoraproject.org  Thu Jan 22 14:40:15 2009
From: kzak at fedoraproject.org (Karel Zak)
Date: Thu, 22 Jan 2009 14:40:15 +0000 (UTC)
Subject: rpms/util-linux-ng/devel .cvsignore, 1.14, 1.15 sources, 1.14,
	1.15 util-linux-ng-login.pamd, 1.3, 1.4 util-linux-ng.spec, 1.36, 1.37
Message-ID: <20090122144015.1FCA470033@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-serv29285

Modified Files:
	.cvsignore sources util-linux-ng-login.pamd util-linux-ng.spec 
Log Message:
* Thu Jan 22 2009 Karel Zak <kzak at redhat.com> 2.14.2-0.2
- fix #480413 - util-linux-ng doesn't include scriptreplay
- fix #479002 - remove dependency on ConsoleKit-libs
- upgrade to 2.14.2-rc2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/util-linux-ng/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	23 Dec 2008 00:12:55 -0000	1.14
+++ .cvsignore	22 Jan 2009 14:39:44 -0000	1.15
@@ -1,2 +1,2 @@
-util-linux-ng-2.14.2-rc1.tar.bz2
+util-linux-ng-2.14.2-rc2.tar.bz2
 floppy-0.16.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/util-linux-ng/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	23 Dec 2008 00:12:56 -0000	1.14
+++ sources	22 Jan 2009 14:39:44 -0000	1.15
@@ -1,2 +1,2 @@
-620a0b46dd7a98d541299ac5a8772d98  util-linux-ng-2.14.2-rc1.tar.bz2
+880fff92b554b4980a8ef3a9c881ce68  util-linux-ng-2.14.2-rc2.tar.bz2
 7eeb9a6f7a258174bf0fa80f1370788d  floppy-0.16.tar.bz2


Index: util-linux-ng-login.pamd
===================================================================
RCS file: /cvs/pkgs/rpms/util-linux-ng/devel/util-linux-ng-login.pamd,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- util-linux-ng-login.pamd	12 Dec 2007 22:06:53 -0000	1.3
+++ util-linux-ng-login.pamd	22 Jan 2009 14:39:44 -0000	1.4
@@ -13,4 +13,4 @@
 session    required     pam_namespace.so
 session    optional     pam_keyinit.so force revoke
 session    include      system-auth
-session    optional     pam_ck_connector.so
+-session   optional     pam_ck_connector.so


Index: util-linux-ng.spec
===================================================================
RCS file: /cvs/pkgs/rpms/util-linux-ng/devel/util-linux-ng.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- util-linux-ng.spec	23 Dec 2008 00:12:56 -0000	1.36
+++ util-linux-ng.spec	22 Jan 2009 14:39:44 -0000	1.37
@@ -2,12 +2,12 @@
 Summary: A collection of basic system utilities
 Name: util-linux-ng
 Version: 2.14.2
-Release: 0.1%{?dist}
+Release: 0.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
 
-%define upstream_version %{version}-rc1
+%define upstream_version %{version}-rc2
 
 ### Features
 %if 0%{?rhel}
@@ -72,9 +72,8 @@
 Requires(preun): /sbin/install-info
 Requires(post): /sbin/install-info
 Requires(post): coreutils
-Requires: pam >= 0.66-4, /etc/pam.d/system-auth
+Requires: pam >= 1.0.90, /etc/pam.d/system-auth
 Requires: audit-libs >= 1.0.6
-Requires: ConsoleKit-libs
 %if %{include_raw}
 Requires: udev
 %endif
@@ -235,13 +234,13 @@
 # deprecated commands
 for I in /sbin/fsck.minix /sbin/mkfs.{bfs,minix} /sbin/sln \
 	/usr/bin/chkdupexe %{_bindir}/line %{_bindir}/pg %{_bindir}/newgrp \
-	/sbin/shutdown %{_bindir}/scriptreplay /usr/sbin/vipw /usr/sbin/vigr; do
+	/sbin/shutdown /usr/sbin/vipw /usr/sbin/vigr; do
 	rm -f $RPM_BUILD_ROOT$I
 done
 
 # deprecated man pages
 for I in man1/chkdupexe.1 man1/line.1 man1/pg.1 man1/newgrp.1 \
-	man8/fsck.minix.8 man8/mkfs.minix.8 man8/mkfs.bfs.8 man1/scriptreplay.1 \
+	man8/fsck.minix.8 man8/mkfs.minix.8 man8/mkfs.bfs.8 \
 	man8/vipw.8 man8/vigr; do
 	rm -rf $RPM_BUILD_ROOT%{_mandir}/${I}*
 done
@@ -421,6 +420,7 @@
 %{_bindir}/renice
 %{_bindir}/rev
 %{_bindir}/script
+%{_bindir}/scriptreplay
 %{_bindir}/setarch
 %{_bindir}/setsid
 %{_bindir}/setterm
@@ -463,6 +463,7 @@
 %{_mandir}/man1/rename.1*
 %{_mandir}/man1/rev.1*
 %{_mandir}/man1/script.1*
+%{_mandir}/man1/scriptreplay.1*
 %{_mandir}/man1/setterm.1*
 %{_mandir}/man1/tailf.1*
 %{_mandir}/man1/ul.1*
@@ -512,6 +513,11 @@
 /sbin/losetup
 
 %changelog
+* Thu Jan 22 2009 Karel Zak <kzak at redhat.com> 2.14.2-0.2
+- fix #480413 - util-linux-ng doesn't include scriptreplay
+- fix #479002 - remove dependency on ConsoleKit-libs
+- upgrade to 2.14.2-rc2
+
 * Mon Dec 22 2008 Karel Zak <kzak at redhat.com> 2.14.2-0.1
 - upgrade to 2.14.2-rc1
 - refresh old patches



From pingou at fedoraproject.org  Thu Jan 22 14:40:14 2009
From: pingou at fedoraproject.org (Pierre-YvesChibon)
Date: Thu, 22 Jan 2009 14:40:14 +0000 (UTC)
Subject: rpms/R-affyio/F-10 R-affyio.spec,1.6,1.7 sources,1.5,1.6
Message-ID: <20090122144014.E6E5670033@cvs1.fedora.phx.redhat.com>

Author: pingou

Update of /cvs/pkgs/rpms/R-affyio/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29243/F-10

Modified Files:
	R-affyio.spec sources 
Log Message:
New update


Index: R-affyio.spec
===================================================================
RCS file: /cvs/pkgs/rpms/R-affyio/F-10/R-affyio.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- R-affyio.spec	27 Oct 2008 19:38:02 -0000	1.6
+++ R-affyio.spec	22 Jan 2009 14:39:44 -0000	1.7
@@ -3,15 +3,15 @@
 %define Rversion  2.8.0
 
 Name:             R-%{packname}
-Version:          1.10.0
-Release:          1%{?dist}
+Version:          1.10.1
+Release:          3%{?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://www.bioconductor.org/packages/%{bioc}/bioc/src/contrib/%{packname}_%{version}.tar.gz
+Source0:          http://bioconductor.org/packages/%{bioc}/bioc/src/contrib/%{packname}_%{version}.tar.gz
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires(post):   R >= %{Rversion}
@@ -69,9 +69,18 @@
 %{_libdir}/R/library/%{packname}/R/
 %{_libdir}/R/library/%{packname}/Meta
 %{_libdir}/R/library/%{packname}/help
-%{_libdir}/R/library/%{packname}/libs/affyio.so
+%{_libdir}/R/library/%{packname}/libs
 
 %changelog
+* Thu Jan 22 2009 pingou <pingou-at-pingoured.fr> 1.10.1-0
+- Update to newest version
+
+* Sun Nov 30 2008 pingou <pingoufc4-at-yahoo.fr> 1.10.0-3
+- Own the folder libs -- #473618
+
+* Thu Nov 20 2008 pingou <pingoufc4-at-yahoo.fr> 1.10.0-2
+- Correct the Source0
+
 * Mon Oct 27 2008 pingou <pingoufc4-at-yahoo.fr> 1.10.0-1
 - Update to version 1.10.0 for R >= 2.8.0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/R-affyio/F-10/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	27 Oct 2008 19:38:02 -0000	1.5
+++ sources	22 Jan 2009 14:39:44 -0000	1.6
@@ -1 +1 @@
-817059744ef27f492a134fa5b7c888ac  affyio_1.10.0.tar.gz
+3fa52123d56559210ab02845fd6f309a  affyio_1.10.1.tar.gz



From pingou at fedoraproject.org  Thu Jan 22 14:44:46 2009
From: pingou at fedoraproject.org (Pierre-YvesChibon)
Date: Thu, 22 Jan 2009 14:44:46 +0000 (UTC)
Subject: rpms/R-affyio/F-10 R-affyio.spec,1.7,1.8
Message-ID: <20090122144446.4C0E770033@cvs1.fedora.phx.redhat.com>

Author: pingou

Update of /cvs/pkgs/rpms/R-affyio/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30219/F-10

Modified Files:
	R-affyio.spec 
Log Message:



Index: R-affyio.spec
===================================================================
RCS file: /cvs/pkgs/rpms/R-affyio/F-10/R-affyio.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- R-affyio.spec	22 Jan 2009 14:39:44 -0000	1.7
+++ R-affyio.spec	22 Jan 2009 14:44:15 -0000	1.8
@@ -4,7 +4,7 @@
 
 Name:             R-%{packname}
 Version:          1.10.1
-Release:          3%{?dist}
+Release:          2%{?dist}
 Summary:          Tools for parsing Affymetrix data files
 Summary(fr):      Outils d'analyse de fichier de donn??es de puces affymetrix
 
@@ -72,7 +72,10 @@
 %{_libdir}/R/library/%{packname}/libs
 
 %changelog
-* Thu Jan 22 2009 pingou <pingou-at-pingoured.fr> 1.10.1-0
+* Thu Jan 22 2009 pingou <pingou-at-pingoured.fr> 1.10.1-2
+- Typo on the release number
+
+* Thu Jan 22 2009 pingou <pingou-at-pingoured.fr> 1.10.1-1
 - Update to newest version
 
 * Sun Nov 30 2008 pingou <pingoufc4-at-yahoo.fr> 1.10.0-3



From pingou at fedoraproject.org  Thu Jan 22 14:44:46 2009
From: pingou at fedoraproject.org (Pierre-YvesChibon)
Date: Thu, 22 Jan 2009 14:44:46 +0000 (UTC)
Subject: rpms/R-affyio/F-9 R-affyio.spec,1.7,1.8
Message-ID: <20090122144446.5DAD670141@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-serv30219/F-9

Modified Files:
	R-affyio.spec 
Log Message:



Index: R-affyio.spec
===================================================================
RCS file: /cvs/pkgs/rpms/R-affyio/F-9/R-affyio.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- R-affyio.spec	22 Jan 2009 14:39:44 -0000	1.7
+++ R-affyio.spec	22 Jan 2009 14:44:16 -0000	1.8
@@ -4,7 +4,7 @@
 
 Name:             R-%{packname}
 Version:          1.10.1
-Release:          3%{?dist}
+Release:          2%{?dist}
 Summary:          Tools for parsing Affymetrix data files
 Summary(fr):      Outils d'analyse de fichier de donn??es de puces affymetrix
 
@@ -72,7 +72,10 @@
 %{_libdir}/R/library/%{packname}/libs
 
 %changelog
-* Thu Jan 22 2009 pingou <pingou-at-pingoured.fr> 1.10.1-0
+* Thu Jan 22 2009 pingou <pingou-at-pingoured.fr> 1.10.1-2
+- Typo on the release number
+
+* Thu Jan 22 2009 pingou <pingou-at-pingoured.fr> 1.10.1-1
 - Update to newest version
 
 * Sun Nov 30 2008 pingou <pingoufc4-at-yahoo.fr> 1.10.0-3



From pingou at fedoraproject.org  Thu Jan 22 14:44:46 2009
From: pingou at fedoraproject.org (Pierre-YvesChibon)
Date: Thu, 22 Jan 2009 14:44:46 +0000 (UTC)
Subject: rpms/R-affyio/devel R-affyio.spec,1.9,1.10
Message-ID: <20090122144446.A1CC870033@cvs1.fedora.phx.redhat.com>

Author: pingou

Update of /cvs/pkgs/rpms/R-affyio/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30219/devel

Modified Files:
	R-affyio.spec 
Log Message:



Index: R-affyio.spec
===================================================================
RCS file: /cvs/pkgs/rpms/R-affyio/devel/R-affyio.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- R-affyio.spec	22 Jan 2009 14:37:24 -0000	1.9
+++ R-affyio.spec	22 Jan 2009 14:44:16 -0000	1.10
@@ -4,7 +4,7 @@
 
 Name:             R-%{packname}
 Version:          1.10.1
-Release:          3%{?dist}
+Release:          2%{?dist}
 Summary:          Tools for parsing Affymetrix data files
 Summary(fr):      Outils d'analyse de fichier de donn??es de puces affymetrix
 
@@ -72,7 +72,10 @@
 %{_libdir}/R/library/%{packname}/libs
 
 %changelog
-* Thu Jan 22 2009 pingou <pingou-at-pingoured.fr> 1.10.1-0
+* Thu Jan 22 2009 pingou <pingou-at-pingoured.fr> 1.10.1-2
+- Typo on the release number
+
+* Thu Jan 22 2009 pingou <pingou-at-pingoured.fr> 1.10.1-1
 - Update to newest version
 
 * Sun Nov 30 2008 pingou <pingoufc4-at-yahoo.fr> 1.10.0-3



From pingou at fedoraproject.org  Thu Jan 22 14:45:55 2009
From: pingou at fedoraproject.org (Pierre-YvesChibon)
Date: Thu, 22 Jan 2009 14:45:55 +0000 (UTC)
Subject: rpms/R-Biobase/F-9 R-Biobase.spec,1.5,1.6 sources,1.4,1.5
Message-ID: <20090122144555.AE61670141@cvs1.fedora.phx.redhat.com>

Author: pingou

Update of /cvs/pkgs/rpms/R-Biobase/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30438/F-9

Modified Files:
	R-Biobase.spec sources 
Log Message:
New update


Index: R-Biobase.spec
===================================================================
RCS file: /cvs/pkgs/rpms/R-Biobase/F-9/R-Biobase.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- R-Biobase.spec	26 Nov 2008 20:44:37 -0000	1.5
+++ R-Biobase.spec	22 Jan 2009 14:45:25 -0000	1.6
@@ -3,8 +3,8 @@
 %define Rversion  2.8.0
 
 Name:             R-%{packname}
-Version:          2.2.0 
-Release:          2%{?dist}
+Version:          2.2.1 
+Release:          1%{?dist}
 Summary:          Base functions for Bioconductor
 Summary(fr):      Bibliot??que utilis?? par de nombreuses autres biblioth??ques
 
@@ -90,6 +90,9 @@
 
 
 %changelog
+* Thu Jan 22 2009 pingou <pingoufc4-at-yahoo.fr> 2.2.1-1
+- New update
+
 * Thu Nov 20 2008 pingou <pingoufc4-at-yahoo.fr> 2.2.0-2
 - Correct the Source0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/R-Biobase/F-9/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	26 Nov 2008 20:44:37 -0000	1.4
+++ sources	22 Jan 2009 14:45:25 -0000	1.5
@@ -1 +1 @@
-5a62beb8e606a8e7a06fe67017afd35e  Biobase_2.2.0.tar.gz
+2f2804179843977790763cdc68608cd6  Biobase_2.2.1.tar.gz



From pingou at fedoraproject.org  Thu Jan 22 14:45:56 2009
From: pingou at fedoraproject.org (Pierre-YvesChibon)
Date: Thu, 22 Jan 2009 14:45:56 +0000 (UTC)
Subject: rpms/R-Biobase/devel .cvsignore, 1.5, 1.6 R-Biobase.spec, 1.7,
	1.8 sources, 1.5, 1.6
Message-ID: <20090122144556.01A2770143@cvs1.fedora.phx.redhat.com>

Author: pingou

Update of /cvs/pkgs/rpms/R-Biobase/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30438/devel

Modified Files:
	.cvsignore R-Biobase.spec sources 
Log Message:
New update


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/R-Biobase/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	27 Oct 2008 18:58:07 -0000	1.5
+++ .cvsignore	22 Jan 2009 14:45:25 -0000	1.6
@@ -1 +1 @@
-Biobase_2.2.0.tar.gz
+Biobase_2.2.1.tar.gz


Index: R-Biobase.spec
===================================================================
RCS file: /cvs/pkgs/rpms/R-Biobase/devel/R-Biobase.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- R-Biobase.spec	20 Nov 2008 12:00:06 -0000	1.7
+++ R-Biobase.spec	22 Jan 2009 14:45:25 -0000	1.8
@@ -3,8 +3,8 @@
 %define Rversion  2.8.0
 
 Name:             R-%{packname}
-Version:          2.2.0 
-Release:          2%{?dist}
+Version:          2.2.1 
+Release:          1%{?dist}
 Summary:          Base functions for Bioconductor
 Summary(fr):      Bibliot??que utilis?? par de nombreuses autres biblioth??ques
 
@@ -90,6 +90,9 @@
 
 
 %changelog
+* Thu Jan 22 2009 pingou <pingoufc4-at-yahoo.fr> 2.2.1-1
+- New update
+
 * Thu Nov 20 2008 pingou <pingoufc4-at-yahoo.fr> 2.2.0-2
 - Correct the Source0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/R-Biobase/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	27 Oct 2008 18:58:07 -0000	1.5
+++ sources	22 Jan 2009 14:45:25 -0000	1.6
@@ -1 +1 @@
-5a62beb8e606a8e7a06fe67017afd35e  Biobase_2.2.0.tar.gz
+2f2804179843977790763cdc68608cd6  Biobase_2.2.1.tar.gz



From pingou at fedoraproject.org  Thu Jan 22 14:45:55 2009
From: pingou at fedoraproject.org (Pierre-YvesChibon)
Date: Thu, 22 Jan 2009 14:45:55 +0000 (UTC)
Subject: rpms/R-Biobase/F-10 R-Biobase.spec,1.6,1.7 sources,1.5,1.6
Message-ID: <20090122144555.2C6D070033@cvs1.fedora.phx.redhat.com>

Author: pingou

Update of /cvs/pkgs/rpms/R-Biobase/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30438/F-10

Modified Files:
	R-Biobase.spec sources 
Log Message:
New update


Index: R-Biobase.spec
===================================================================
RCS file: /cvs/pkgs/rpms/R-Biobase/F-10/R-Biobase.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- R-Biobase.spec	27 Oct 2008 18:58:07 -0000	1.6
+++ R-Biobase.spec	22 Jan 2009 14:45:24 -0000	1.7
@@ -3,15 +3,15 @@
 %define Rversion  2.8.0
 
 Name:             R-%{packname}
-Version:          2.2.0 
+Version:          2.2.1 
 Release:          1%{?dist}
 Summary:          Base functions for Bioconductor
 Summary(fr):      Bibliot??que utilis?? par de nombreuses autres biblioth??ques
 
 Group:            Applications/Engineering
 License:          Artistic 2.0
-URL:              http://www.bioconductor.org/packages/%{bioc}/bioc/html/Biobase.html
-Source0:          http://www.bioconductor.org/packages/%{bioc}/bioc/src/contrib/%{packname}_%{version}.tar.gz
+URL:              http://bioconductor.org/packages/%{bioc}/bioc/html/Biobase.html
+Source0:          http://bioconductor.org/packages/%{bioc}/bioc/src/contrib/%{packname}_%{version}.tar.gz
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:         R-tkWidgets
@@ -90,6 +90,12 @@
 
 
 %changelog
+* Thu Jan 22 2009 pingou <pingoufc4-at-yahoo.fr> 2.2.1-1
+- New update
+
+* Thu Nov 20 2008 pingou <pingoufc4-at-yahoo.fr> 2.2.0-2
+- Correct the Source0
+
 * Mon Oct 27 2008 pingou <pingoufc4-at-yahoo.fr> 2.2.0-1
 - Update to version 2.2.0 for R >= 2.8.0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/R-Biobase/F-10/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	27 Oct 2008 18:58:07 -0000	1.5
+++ sources	22 Jan 2009 14:45:24 -0000	1.6
@@ -1 +1 @@
-5a62beb8e606a8e7a06fe67017afd35e  Biobase_2.2.0.tar.gz
+2f2804179843977790763cdc68608cd6  Biobase_2.2.1.tar.gz



From jorton at fedoraproject.org  Thu Jan 22 14:50:27 2009
From: jorton at fedoraproject.org (Joe Orton)
Date: Thu, 22 Jan 2009 14:50:27 +0000 (UTC)
Subject: rpms/httpd/devel httpd.conf, 1.29, 1.30 httpd.init, 1.14,
	1.15 httpd.spec, 1.131, 1.132
Message-ID: <20090122145027.37CB570033@cvs1.fedora.phx.redhat.com>

Author: jorton

Update of /cvs/extras/rpms/httpd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31500

Modified Files:
	httpd.conf httpd.init httpd.spec 
Log Message:
* Thu Jan 22 2009 Joe Orton <jorton at redhat.com> 2.2.11-6
- Require: apr-util-ldap (#471898)
- init script changes: pass pidfile to status(), use status() in
  condrestart (#480602), support try-restart as alias for
  condrestart
- change /etc/httpd/run symlink to have destination /var/run/httpd,
  and restore "run/httpd.conf" as default PidFile (#478688)



Index: httpd.conf
===================================================================
RCS file: /cvs/extras/rpms/httpd/devel/httpd.conf,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- httpd.conf	27 Dec 2008 14:36:47 -0000	1.29
+++ httpd.conf	22 Jan 2009 14:49:56 -0000	1.30
@@ -60,7 +60,7 @@
 # PidFile: The file in which the server should record its process
 # identification number when it starts.
 #
-PidFile run/httpd/httpd.pid
+PidFile run/httpd.pid
 
 #
 # Timeout: The number of seconds before receives and sends time out.


Index: httpd.init
===================================================================
RCS file: /cvs/extras/rpms/httpd/devel/httpd.init,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- httpd.init	18 Dec 2008 16:30:24 -0000	1.14
+++ httpd.init	22 Jan 2009 14:49:56 -0000	1.15
@@ -91,15 +91,15 @@
 	stop
 	;;
   status)
-        status $httpd
+        status -p ${pidfile} $httpd
 	RETVAL=$?
 	;;
   restart)
 	stop
 	start
 	;;
-  condrestart)
-	if [ -f ${pidfile} ] ; then
+  condrestart|try-restart)
+	if status -p ${pidfile} $httpd >&/dev/null; then
 		stop
 		start
 	fi


Index: httpd.spec
===================================================================
RCS file: /cvs/extras/rpms/httpd/devel/httpd.spec,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -r1.131 -r1.132
--- httpd.spec	16 Jan 2009 18:20:34 -0000	1.131
+++ httpd.spec	22 Jan 2009 14:49:56 -0000	1.132
@@ -7,7 +7,7 @@
 Summary: Apache HTTP Server
 Name: httpd
 Version: 2.2.11
-Release: 5
+Release: 6
 URL: http://httpd.apache.org/
 Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz
 Source1: index.html
@@ -54,7 +54,7 @@
 Obsoletes: apache, secureweb, mod_dav, mod_gzip, stronghold-apache
 Obsoletes: stronghold-htdocs, mod_put, mod_roaming
 Conflicts: pcre < 4.0
-Requires: httpd-tools = %{version}-%{release}
+Requires: httpd-tools = %{version}-%{release}, apr-util-ldap
 
 %description
 The Apache HTTP Server is a powerful, efficient, and extensible
@@ -288,7 +288,7 @@
 
 # symlinks for /etc/httpd
 ln -s ../..%{_localstatedir}/log/httpd $RPM_BUILD_ROOT/etc/httpd/logs
-ln -s ../..%{_localstatedir}/run $RPM_BUILD_ROOT/etc/httpd/run
+ln -s ../..%{_localstatedir}/run/httpd $RPM_BUILD_ROOT/etc/httpd/run
 ln -s ../..%{_libdir}/httpd/modules $RPM_BUILD_ROOT/etc/httpd/modules
 
 # install SYSV init stuff
@@ -482,6 +482,14 @@
 %{_libdir}/httpd/build/*.sh
 
 %changelog
+* Thu Jan 22 2009 Joe Orton <jorton at redhat.com> 2.2.11-6
+- Require: apr-util-ldap (#471898)
+- init script changes: pass pidfile to status(), use status() in
+  condrestart (#480602), support try-restart as alias for
+  condrestart
+- change /etc/httpd/run symlink to have destination /var/run/httpd,
+  and restore "run/httpd.conf" as default PidFile (#478688)
+
 * Fri Jan 16 2009 Tomas Mraz <tmraz at redhat.com> 2.2.11-5
 - rebuild with new openssl
 



From pingou at fedoraproject.org  Thu Jan 22 14:56:34 2009
From: pingou at fedoraproject.org (Pierre-YvesChibon)
Date: Thu, 22 Jan 2009 14:56:34 +0000 (UTC)
Subject: rpms/R-GeneR/F-9 R-GeneR.spec,1.4,1.5 sources,1.2,1.3
Message-ID: <20090122145634.BCE2270033@cvs1.fedora.phx.redhat.com>

Author: pingou

Update of /cvs/pkgs/rpms/R-GeneR/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32487/F-9

Modified Files:
	R-GeneR.spec sources 
Log Message:
New version


Index: R-GeneR.spec
===================================================================
RCS file: /cvs/pkgs/rpms/R-GeneR/F-9/R-GeneR.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- R-GeneR.spec	26 Oct 2008 18:01:06 -0000	1.4
+++ R-GeneR.spec	22 Jan 2009 14:56:04 -0000	1.5
@@ -1,9 +1,10 @@
 %define packname  GeneR
 %define release   2.3
+%define Rversion  2.8.0
 
 Name:             R-%{packname}
-Version:          2.11.1
-Release:          5%{?dist}
+Version:          2.12.0
+Release:          1%{?dist}
 Summary:          R for genes and sequences analysis
 
 Group:            Applications/Engineering 
@@ -12,10 +13,10 @@
 Source0:          http://www.bioconductor.org/packages/%{release}/bioc/src/contrib/%{packname}_%{version}.tar.gz
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Requires:         R >= 2.6.0 
+Requires:         R >= %{Rversion}
 Requires(post):   R
 Requires(postun): R
-BuildRequires:    R-devel tetex-latex R >= 2.6.0 
+BuildRequires:    R-devel >= %{Rversion} tetex-latex R >= 2.6.0 
 
 %description
 Package manipulating nucleotidic sequences (Embl, Fasta, GenBank).
@@ -86,11 +87,8 @@
 %{_libdir}/R/library/%{packname}/libs
 
 %changelog
-* Sun Oct 26 2008  pingou <pingou at pingoured.fr> 2.11.1-5
-- Increase release
-
-* Sun Oct 26 2008  pingou <pingou at pingoured.fr> 2.11.1-4
-- Increase release
+* Mon Oct 27 2008  pingou <pingou at pingoured.fr> 2.12.0-1
+- New version 2.12.0 for R >= 2.8.0
 
 * Sun Oct 26 2008  pingou <pingou at pingoured.fr> 2.11.1-3
 - Comment the R CMD check which causes a build failed in koji


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/R-GeneR/F-9/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	26 Oct 2008 17:38:13 -0000	1.2
+++ sources	22 Jan 2009 14:56:04 -0000	1.3
@@ -1 +1 @@
-f401b22b5f94857dff1fa53081b8dc2a  GeneR_2.11.1.tar.gz
+380222186fab91529e6b734d99590422  GeneR_2.12.0.tar.gz



From rdieter at fedoraproject.org  Thu Jan 22 15:19:43 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu, 22 Jan 2009 15:19:43 +0000 (UTC)
Subject: rpms/eigen2/devel .cvsignore, 1.7, 1.8 eigen2.spec, 1.7, 1.8 sources,
	1.7, 1.8
Message-ID: <20090122151943.1842470033@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/eigen2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3577

Modified Files:
	.cvsignore eigen2.spec sources 
Log Message:
* Thu Jan 22 2009 Rex Dieter <rdieter at fedoraproject.org> 2.0-0.9.beta6
- eigen-2.0-beta6



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/eigen2/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	9 Jan 2009 20:41:28 -0000	1.7
+++ .cvsignore	22 Jan 2009 15:19:12 -0000	1.8
@@ -1 +1 @@
-eigen2-20090109svn.tar.bz2
+eigen-2.0-beta6.tar.bz2


Index: eigen2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eigen2/devel/eigen2.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- eigen2.spec	9 Jan 2009 20:56:17 -0000	1.7
+++ eigen2.spec	22 Jan 2009 15:19:12 -0000	1.8
@@ -3,8 +3,8 @@
 # http://bugzilla.redhat.com/459705
 
 %define _with_check -DEIGEN_BUILD_TESTS:BOOL=ON
-#define pre beta5
-%define snap 20090109
+%define pre beta6
+#define snap 20090109
 
 
 Name:    eigen2
@@ -14,8 +14,8 @@
 Group:   System Environment/Libraries
 License: GPLv2+ or LGPLv3+
 URL:     http://eigen.tuxfamily.org/
-#Source0: http://download.tuxfamily.org/eigen/eigen-%{version}-%{pre}.tar.bz2
-Source0: eigen2-%{snap}svn.tar.bz2
+Source0: http://download.tuxfamily.org/eigen/eigen-%{version}-%{pre}.tar.bz2
+#Source0: eigen2-%{snap}svn.tar.bz2
 Source1: eigen2-svn_checkout.sh
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
@@ -95,6 +95,9 @@
 
 
 %changelog
+* Thu Jan 22 2009 Rex Dieter <rdieter at fedoraproject.org> 2.0-0.9.beta6
+- eigen-2.0-beta6
+
 * Fri Jan 09 2009 Rex Dieter <rdieter at fedoraproject.org> 2.0-0.8.20090109svn
 - eigen2-20090109svn snapshot
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eigen2/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	9 Jan 2009 20:41:28 -0000	1.7
+++ sources	22 Jan 2009 15:19:12 -0000	1.8
@@ -1 +1 @@
-35aedd2810d3d910110baa21442961b5  eigen2-20090109svn.tar.bz2
+4274864abd64be6be1f91cf5afd905dd  eigen-2.0-beta6.tar.bz2



From tgl at fedoraproject.org  Thu Jan 22 15:24:47 2009
From: tgl at fedoraproject.org (Tom Lane)
Date: Thu, 22 Jan 2009 15:24:47 +0000 (UTC)
Subject: rpms/mysql/devel mysql.spec,1.111,1.112
Message-ID: <20090122152447.C85E970033@cvs1.fedora.phx.redhat.com>

Author: tgl

Update of /cvs/pkgs/rpms/mysql/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4222

Modified Files:
	mysql.spec 
Log Message:
Add note that this rebuild also fixes openssl dependency


Index: mysql.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mysql/devel/mysql.spec,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -r1.111 -r1.112
--- mysql.spec	16 Jan 2009 00:56:11 -0000	1.111
+++ mysql.spec	22 Jan 2009 15:24:17 -0000	1.112
@@ -631,9 +631,10 @@
 %{_mandir}/man1/mysql_client_test.1*
 
 %changelog
-* Wed Jan 14 2009 Tom Lane <tgl at redhat.com> 5.1.30-1
+* Thu Jan 22 2009 Tom Lane <tgl at redhat.com> 5.1.30-1
 - Update to MySQL 5.1.30.  Note that this includes an ABI break for
   libmysqlclient (it's now got .so major version 16).
+- This also updates mysql for new openssl build
 
 * Wed Oct  1 2008 Tom Lane <tgl at redhat.com> 5.0.67-2
 - Build the "embedded server" library, and package it in a new sub-RPM



From rdieter at fedoraproject.org  Thu Jan 22 15:25:37 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu, 22 Jan 2009 15:25:37 +0000 (UTC)
Subject: rpms/eigen2/devel eigen2.spec,1.8,1.9
Message-ID: <20090122152537.875FA70033@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/eigen2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4377

Modified Files:
	eigen2.spec 
Log Message:
unbotch Release



Index: eigen2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eigen2/devel/eigen2.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- eigen2.spec	22 Jan 2009 15:19:12 -0000	1.8
+++ eigen2.spec	22 Jan 2009 15:25:07 -0000	1.9
@@ -10,7 +10,7 @@
 Name:    eigen2
 Summary: A lightweight C++ template library for vector and matrix math
 Version: 2.0 
-Release: 0.8.%{snap}svn%{?dist} 
+Release: 0.9.%{pre}%{?dist} 
 Group:   System Environment/Libraries
 License: GPLv2+ or LGPLv3+
 URL:     http://eigen.tuxfamily.org/



From karsten at fedoraproject.org  Thu Jan 22 15:32:17 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Thu, 22 Jan 2009 15:32:17 +0000 (UTC)
Subject: rpms/dictd/devel dictd.spec,1.34,1.35
Message-ID: <20090122153217.BE61870033@cvs1.fedora.phx.redhat.com>

Author: karsten

Update of /cvs/extras/rpms/dictd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5323

Modified Files:
	dictd.spec 
Log Message:
- add postun script (#225694)
- fix file permissions (defattr)



Index: dictd.spec
===================================================================
RCS file: /cvs/extras/rpms/dictd/devel/dictd.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- dictd.spec	14 Jan 2009 13:57:37 -0000	1.34
+++ dictd.spec	22 Jan 2009 15:31:47 -0000	1.35
@@ -2,7 +2,7 @@
 Summary:   DICT protocol (RFC 2229) command-line client
 Name:      dictd
 Version:   1.11.0
-Release:   1
+Release:   2
 License:   GPL+ and zlib and MIT
 Group:     Applications/Internet
 Source0:   http://downloads.sourceforge.net/dict/%{name}-%{version}.tar.gz
@@ -12,6 +12,7 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires(post):  chkconfig
 Requires(preun): chkconfig
+Requires(postun): initscripts
 BuildRequires:   flex bison libtool libtool-libs libtool-ltdl-devel byacc
 BuildRequires:   libdbi-devel, zlib-devel, gawk
 
@@ -51,8 +52,13 @@
    /sbin/chkconfig --del dictd
 fi
 
+%postun
+%if [ $1 -ge 1 ] ; then
+   /sbin/service dictd condrestart > /dev/null 2>&1 || :
+%fi
+
 %files
-%defattr(-,root,root,0755)
+%defattr(-,root,root,-)
 %doc ANNOUNCE COPYING ChangeLog README doc/rfc2229.txt doc/security.doc
 %{_bindir}/*
 %{_sbindir}/*
@@ -61,6 +67,10 @@
 %config(noreplace) %{_sysconfdir}/sysconfig/dictd
 
 %changelog
+* Thu Jan 22 2009 Karsten Hopp <karsten at redhat.com> 1.11.0-2
+- add postun script (#225694)
+- fix file permissions (defattr)
+
 * Wed Jan 14 2009 Karsten Hopp <karsten at redhat.com> 1.11.0-1
 - update
 



From karsten at fedoraproject.org  Thu Jan 22 15:36:15 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Thu, 22 Jan 2009 15:36:15 +0000 (UTC)
Subject: rpms/dictd/devel dictd.spec,1.35,1.36
Message-ID: <20090122153615.6563B70033@cvs1.fedora.phx.redhat.com>

Author: karsten

Update of /cvs/extras/rpms/dictd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5850

Modified Files:
	dictd.spec 
Log Message:
- fix typo


Index: dictd.spec
===================================================================
RCS file: /cvs/extras/rpms/dictd/devel/dictd.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- dictd.spec	22 Jan 2009 15:31:47 -0000	1.35
+++ dictd.spec	22 Jan 2009 15:35:44 -0000	1.36
@@ -53,9 +53,9 @@
 fi
 
 %postun
-%if [ $1 -ge 1 ] ; then
+if [ $1 -ge 1 ] ; then
    /sbin/service dictd condrestart > /dev/null 2>&1 || :
-%fi
+fi
 
 %files
 %defattr(-,root,root,-)



From rstrode at fedoraproject.org  Thu Jan 22 15:48:48 2009
From: rstrode at fedoraproject.org (Ray Strode)
Date: Thu, 22 Jan 2009 15:48:48 +0000 (UTC)
Subject: rpms/gdm/devel gdm-2.25.2-append-logs.patch, NONE, 1.1 gdm.spec,
	1.436, 1.437
Message-ID: <20090122154848.6DDA770033@cvs1.fedora.phx.redhat.com>

Author: rstrode

Update of /cvs/pkgs/rpms/gdm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8167

Modified Files:
	gdm.spec 
Added Files:
	gdm-2.25.2-append-logs.patch 
Log Message:
- Open log files for append to make selinux lock down easier


gdm-2.25.2-append-logs.patch:

--- NEW FILE gdm-2.25.2-append-logs.patch ---
diff -up gdm-2.25.2/daemon/gdm-server.c.append-logs gdm-2.25.2/daemon/gdm-server.c
--- gdm-2.25.2/daemon/gdm-server.c.append-logs	2009-01-22 10:42:10.043245824 -0500
+++ gdm-2.25.2/daemon/gdm-server.c	2009-01-22 10:42:30.770530113 -0500
@@ -421,7 +421,7 @@ server_child_setup (GdmServer *server)
         g_debug ("GdmServer: Opening logfile for server %s", log_path);
 
         VE_IGNORE_EINTR (g_unlink (log_path));
-        VE_IGNORE_EINTR (logfd = open (log_path, O_CREAT|O_TRUNC|O_WRONLY|O_EXCL, 0644));
+        VE_IGNORE_EINTR (logfd = open (log_path, O_CREAT|O_APPEND|O_TRUNC|O_WRONLY|O_EXCL, 0644));
 
         g_free (log_path);
 
diff -up gdm-2.25.2/daemon/gdm-slave-proxy.c.append-logs gdm-2.25.2/daemon/gdm-slave-proxy.c
--- gdm-2.25.2/daemon/gdm-slave-proxy.c.append-logs	2009-01-22 10:44:33.915495761 -0500
+++ gdm-2.25.2/daemon/gdm-slave-proxy.c	2009-01-22 10:44:41.753495939 -0500
@@ -139,7 +139,7 @@ spawn_child_setup (SpawnChildData *data)
                 rotate_logs (data->log_file, MAX_LOGS);
 
                 VE_IGNORE_EINTR (g_unlink (data->log_file));
-                VE_IGNORE_EINTR (logfd = open (data->log_file, O_CREAT|O_TRUNC|O_WRONLY|O_EXCL, 0644));
+                VE_IGNORE_EINTR (logfd = open (data->log_file, O_CREAT|O_APPEND|O_TRUNC|O_WRONLY|O_EXCL, 0644));
 
                 if (logfd != -1) {
                         VE_IGNORE_EINTR (dup2 (logfd, 1));
diff -up gdm-2.25.2/daemon/gdm-welcome-session.c.append-logs gdm-2.25.2/daemon/gdm-welcome-session.c
--- gdm-2.25.2/daemon/gdm-welcome-session.c.append-logs	2009-01-22 10:44:05.300495464 -0500
+++ gdm-2.25.2/daemon/gdm-welcome-session.c	2009-01-22 10:44:14.903494653 -0500
@@ -482,7 +482,7 @@ spawn_child_setup (SpawnChildData *data)
                 rotate_logs (data->log_file, MAX_LOGS);
 
                 VE_IGNORE_EINTR (g_unlink (data->log_file));
-                VE_IGNORE_EINTR (logfd = open (data->log_file, O_CREAT|O_TRUNC|O_WRONLY|O_EXCL, 0644));
+                VE_IGNORE_EINTR (logfd = open (data->log_file, O_CREAT|O_APPEND|O_TRUNC|O_WRONLY|O_EXCL, 0644));
 
                 if (logfd != -1) {
                         VE_IGNORE_EINTR (dup2 (logfd, 1));


Index: gdm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdm/devel/gdm.spec,v
retrieving revision 1.436
retrieving revision 1.437
diff -u -r1.436 -r1.437
--- gdm.spec	18 Dec 2008 00:19:23 -0000	1.436
+++ gdm.spec	22 Jan 2009 15:48:17 -0000	1.437
@@ -16,7 +16,7 @@
 Summary: The GNOME Display Manager
 Name: gdm
 Version: 2.25.2
-Release: 2%{?dist}
+Release: 3%{?dist}
 Epoch: 1
 License: GPLv2+
 Group: User Interface/X
@@ -81,6 +81,7 @@
 Requires: audit-libs >= %{libauditver}
 Patch2: gdm-2.24.0-force-active-vt.patch
 Patch3: gdm-2.23.92-save-root-window.patch
+Patch4: gdm-2.25.2-append-logs.patch
 
 # uses /etc/sysconfig/keyboard and is thus not directly upstreamable
 # should probably be changed to get the system layout from the X server
@@ -108,6 +109,7 @@
 %setup -q
 %patch2 -p1 -b .force-active-vt
 %patch3 -p1 -b .save-root-window
+%patch4 -p1 -b .append-logs
 %patch13 -p1 -b .system-keyboard
 
 %patch99 -p1 -b .fedora-logo
@@ -324,6 +326,9 @@
 %{_datadir}/gnome-2.0/ui/GNOME_FastUserSwitchApplet.xml
 
 %changelog
+* Thu Jan 22 2009 Ray Strode <rstrode at redhat.com> - 1:2.25.2-3
+- Open log files for append to make selinux lock down easier
+
 * Wed Dec 17 2008 Matthias Clasen  <mclasen at redhat.com> - 1:2.25.2-2
 - Update to 2.25.2
 - Drop the xkb groups workaround to see if the issue disappeared



From pghmcfc at fedoraproject.org  Thu Jan 22 15:52:06 2009
From: pghmcfc at fedoraproject.org (Paul Howarth)
Date: Thu, 22 Jan 2009 15:52:06 +0000 (UTC)
Subject: rpms/perl-IO-Socket-SSL/devel .cvsignore, 1.13,
	1.14 perl-IO-Socket-SSL.spec, 1.16, 1.17 sources, 1.13, 1.14
Message-ID: <20090122155206.A287970033@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-serv8747

Modified Files:
	.cvsignore perl-IO-Socket-SSL.spec sources 
Log Message:
Update to latest upstream version: 1.20


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-IO-Socket-SSL/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	18 Nov 2008 09:53:54 -0000	1.13
+++ .cvsignore	22 Jan 2009 15:51:36 -0000	1.14
@@ -1 +1 @@
-IO-Socket-SSL-1.18.tar.gz
+IO-Socket-SSL-1.20.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.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- perl-IO-Socket-SSL.spec	18 Nov 2008 09:53:54 -0000	1.16
+++ perl-IO-Socket-SSL.spec	22 Jan 2009 15:51:36 -0000	1.17
@@ -4,7 +4,7 @@
 #
 
 Name:		perl-IO-Socket-SSL
-Version:	1.18
+Version:	1.20
 Release:	1%{?dist}
 Summary:	Perl library for transparent SSL
 Group:		Development/Libraries
@@ -60,6 +60,9 @@
 %{_mandir}/man3/*.3*
 
 %changelog
+* Thu Jan 22 2009 Paul Howarth <paul at city-fan.org> - 1.20-1
+- Update to latest upstream version: 1.20
+
 * Tue Nov 18 2008 Paul Howarth <paul at city-fan.org> - 1.18-1
 - Update to latest upstream version: 1.18
 - BR: perl(IO::Socket::INET6) for extra test coverage


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-IO-Socket-SSL/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	18 Nov 2008 09:53:54 -0000	1.13
+++ sources	22 Jan 2009 15:51:36 -0000	1.14
@@ -1 +1 @@
-2b278fb8784e0ba2d6d779ef7ef5f582  IO-Socket-SSL-1.18.tar.gz
+9ef155c3cb0d3ba2f6f94288c4a699f6  IO-Socket-SSL-1.20.tar.gz



From mlichvar at fedoraproject.org  Thu Jan 22 15:54:15 2009
From: mlichvar at fedoraproject.org (Miroslav Lichvar)
Date: Thu, 22 Jan 2009 15:54:15 +0000 (UTC)
Subject: rpms/postfix/devel .cvsignore, 1.30, 1.31 postfix-etc-init.d-postfix,
	1.11, 1.12 postfix.spec, 1.69, 1.70 sources, 1.30, 1.31
Message-ID: <20090122155415.8F93470033@cvs1.fedora.phx.redhat.com>

Author: mlichvar

Update of /cvs/pkgs/rpms/postfix/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9110

Modified Files:
	.cvsignore postfix-etc-init.d-postfix postfix.spec sources 
Log Message:
- update to 2.5.6 (#479108)
- rebuild /etc/aliases.db only when necessary (#327651)
- convert doc files to UTF-8



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/postfix/devel/.cvsignore,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- .cvsignore	20 Nov 2008 14:06:07 -0000	1.30
+++ .cvsignore	22 Jan 2009 15:53:45 -0000	1.31
@@ -1,2 +1,2 @@
 pflogsumm-1.1.1.tar.gz
-postfix-2.5.5.tar.gz
+postfix-2.5.6.tar.gz


Index: postfix-etc-init.d-postfix
===================================================================
RCS file: /cvs/pkgs/rpms/postfix/devel/postfix-etc-init.d-postfix,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- postfix-etc-init.d-postfix	4 Oct 2007 13:39:00 -0000	1.11
+++ postfix-etc-init.d-postfix	22 Jan 2009 15:53:45 -0000	1.12
@@ -34,6 +34,8 @@
 RETVAL=0
 prog="postfix"
 
+ALIASESDB_STAMP=/var/lib/misc/postfix.aliasesdb-stamp
+
 status master >/dev/null 2>&1
 running=$?
 
@@ -43,13 +45,28 @@
     [ -d /var/spool/postfix ] || exit 5
 }
 
+make_aliasesdb() {
+	if [ "$(/usr/sbin/postconf -h alias_database)" == "hash:/etc/aliases" ]
+	then
+		# /etc/aliases.db may be used by other MTA, make sure nothing
+		# has touched it since our last newaliases call
+		[ /etc/aliases -nt /etc/aliases.db ] ||
+			[ "$ALIASESDB_STAMP" -nt /etc/aliases.db ] ||
+			[ "$ALIASESDB_STAMP" -ot /etc/aliases.db ] || return
+		/usr/bin/newaliases
+		touch -r /etc/aliases.db "$ALIASESDB_STAMP"
+	else
+		/usr/bin/newaliases
+	fi
+}
+
 start() {
 	# Check that networking is up.
 	[ ${NETWORKING} = "no" ] && exit 1
 	conf_check
 	# Start daemons.
 	echo -n $"Starting postfix: "
-        /usr/bin/newaliases >/dev/null 2>&1
+	make_aliasesdb >/dev/null 2>&1
 	/usr/sbin/postfix start 2>/dev/null 1>&2 && success || failure $"$prog start"
 	RETVAL=$?
 	[ $RETVAL -eq 0 ] && touch /var/lock/subsys/postfix


Index: postfix.spec
===================================================================
RCS file: /cvs/pkgs/rpms/postfix/devel/postfix.spec,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- postfix.spec	20 Nov 2008 14:06:08 -0000	1.69
+++ postfix.spec	22 Jan 2009 15:53:45 -0000	1.70
@@ -39,8 +39,8 @@
 
 Name: postfix
 Summary: Postfix Mail Transport Agent
-Version: 2.5.5
-Release: 2%{?dist}
+Version: 2.5.6
+Release: 1%{?dist}
 Epoch: 2
 Group: System Environment/Daemons
 URL: http://www.postfix.org
@@ -166,6 +166,11 @@
 gzip -dc %{SOURCE53} | tar xf -
 %endif
 
+for f in README_FILES/TLS_{LEGACY_,}README; do
+	iconv -f iso8859-1 -t utf8 -o ${f}{_,} &&
+		touch -r ${f}{,_} && mv -f ${f}{_,}
+done
+
 %build
 CCARGS=-fPIC
 AUXLIBS=
@@ -255,8 +260,8 @@
        readme_directory=%{postfix_readme_dir} || exit 1
 
 # This installs into the /etc/rc.d/init.d directory
-/bin/mkdir -p $RPM_BUILD_ROOT/etc/rc.d/init.d
-install -c %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/postfix
+mkdir -p $RPM_BUILD_ROOT%{_initrddir}
+install -c %{SOURCE1} $RPM_BUILD_ROOT%{_initrddir}/postfix
 
 install -c auxiliary/rmail/rmail $RPM_BUILD_ROOT%{_bindir}/rmail.postfix
 
@@ -324,6 +329,9 @@
 inet_protocols = all
 EOF
 
+mkdir -p $RPM_BUILD_ROOT%{_var}/lib/misc
+touch $RPM_BUILD_ROOT%{_var}/lib/misc/postfix.aliasesdb-stamp
+
 %post
 /sbin/chkconfig --add postfix
 
@@ -396,7 +404,7 @@
 %config(noreplace) %{sasl_v2_lib_dir}/smtpd.conf
 %endif
 %config(noreplace) %{_sysconfdir}/pam.d/smtp.postfix
-%attr(0755, root, root) /etc/rc.d/init.d/postfix
+%attr(0755, root, root) %{_initrddir}/postfix
 
 # Misc files
 
@@ -470,6 +478,7 @@
 %attr(0755, root, root) %{_bindir}/mailq.postfix
 %attr(0755, root, root) %{_bindir}/newaliases.postfix
 %attr(0755, root, root) %{_sbindir}/sendmail.postfix
+%ghost %attr(0644, root, root) %{_var}/lib/misc/postfix.aliasesdb-stamp
 
 %files perl-scripts
 %defattr(-, root, root)
@@ -482,6 +491,11 @@
 %endif
 
 %changelog
+* Thu Jan 22 2009 Miroslav Lichvar <mlichvar at redhat.com> 2:2.5.6-1
+- update to 2.5.6 (#479108)
+- rebuild /etc/aliases.db only when necessary (#327651)
+- convert doc files to UTF-8
+
 * Thu Nov 20 2008 Miroslav Lichvar <mlichvar at redhat.com> 2:2.5.5-2
 - enable Large file support on 32-bit archs (#428996)
 - fix mailq(1) and newaliases(1) man pages (#429501)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/postfix/devel/sources,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- sources	20 Nov 2008 14:06:08 -0000	1.30
+++ sources	22 Jan 2009 15:53:45 -0000	1.31
@@ -1,2 +1,2 @@
 2f570477b2e205f9dfc1df13f00b5c0d  pflogsumm-1.1.1.tar.gz
-6b4b848bdd2239dddfc9d385e57e19ef  postfix-2.5.5.tar.gz
+ec2cb63b53f5f36c3ca91da8f3bc9407  postfix-2.5.6.tar.gz



From mbarnes at fedoraproject.org  Thu Jan 22 15:57:44 2009
From: mbarnes at fedoraproject.org (Matthew Barnes)
Date: Thu, 22 Jan 2009 15:57:44 +0000 (UTC)
Subject: rpms/gnome-python2-extras/devel gnome-python2-extras.spec, 1.41,
	1.42
Message-ID: <20090122155744.1E72370033@cvs1.fedora.phx.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/gnome-python2-extras/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9615

Modified Files:
	gnome-python2-extras.spec 
Log Message:
Trying to build gtkmozembed bindings...



Index: gnome-python2-extras.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-python2-extras/devel/gnome-python2-extras.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- gnome-python2-extras.spec	22 Jan 2009 04:46:42 -0000	1.41
+++ gnome-python2-extras.spec	22 Jan 2009 15:57:13 -0000	1.42
@@ -7,7 +7,7 @@
 %define gtkhtml2_version 2.3.1
 %define gecko_version 1.9.1
 %define gtkspell_version 2.0.7
-%define libgda_version 2.99.6
+%define libgda_version 3.99.6
 %define libgdl_version 2.24.0
 
 ### Abstract ###
@@ -124,7 +124,7 @@
 %setup -q -n gnome-python-extras-%{version}
 
 %build
-%configure --with-gtkmozembed=xulrunner
+%configure --with-gtkmozembed=mozilla
 make
 
 %install



From mlichvar at fedoraproject.org  Thu Jan 22 16:00:54 2009
From: mlichvar at fedoraproject.org (Miroslav Lichvar)
Date: Thu, 22 Jan 2009 16:00:54 +0000 (UTC)
Subject: rpms/postfix/F-9 .cvsignore, 1.29, 1.30 postfix-etc-init.d-postfix, 
	1.11, 1.12 postfix.spec, 1.69, 1.70 sources, 1.30, 1.31
Message-ID: <20090122160055.0D3EB70033@cvs1.fedora.phx.redhat.com>

Author: mlichvar

Update of /cvs/pkgs/rpms/postfix/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10152

Modified Files:
	.cvsignore postfix-etc-init.d-postfix postfix.spec sources 
Log Message:
- update to 2.5.6 (#479108)
- rebuild /etc/aliases.db only when necessary (#327651)
- convert doc files to UTF-8



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/postfix/F-9/.cvsignore,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- .cvsignore	20 Nov 2008 14:23:18 -0000	1.29
+++ .cvsignore	22 Jan 2009 16:00:24 -0000	1.30
@@ -1,2 +1,2 @@
 pflogsumm-1.1.1.tar.gz
-postfix-2.5.5.tar.gz
+postfix-2.5.6.tar.gz


Index: postfix-etc-init.d-postfix
===================================================================
RCS file: /cvs/pkgs/rpms/postfix/F-9/postfix-etc-init.d-postfix,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- postfix-etc-init.d-postfix	4 Oct 2007 13:39:00 -0000	1.11
+++ postfix-etc-init.d-postfix	22 Jan 2009 16:00:24 -0000	1.12
@@ -34,6 +34,8 @@
 RETVAL=0
 prog="postfix"
 
+ALIASESDB_STAMP=/var/lib/misc/postfix.aliasesdb-stamp
+
 status master >/dev/null 2>&1
 running=$?
 
@@ -43,13 +45,28 @@
     [ -d /var/spool/postfix ] || exit 5
 }
 
+make_aliasesdb() {
+	if [ "$(/usr/sbin/postconf -h alias_database)" == "hash:/etc/aliases" ]
+	then
+		# /etc/aliases.db may be used by other MTA, make sure nothing
+		# has touched it since our last newaliases call
+		[ /etc/aliases -nt /etc/aliases.db ] ||
+			[ "$ALIASESDB_STAMP" -nt /etc/aliases.db ] ||
+			[ "$ALIASESDB_STAMP" -ot /etc/aliases.db ] || return
+		/usr/bin/newaliases
+		touch -r /etc/aliases.db "$ALIASESDB_STAMP"
+	else
+		/usr/bin/newaliases
+	fi
+}
+
 start() {
 	# Check that networking is up.
 	[ ${NETWORKING} = "no" ] && exit 1
 	conf_check
 	# Start daemons.
 	echo -n $"Starting postfix: "
-        /usr/bin/newaliases >/dev/null 2>&1
+	make_aliasesdb >/dev/null 2>&1
 	/usr/sbin/postfix start 2>/dev/null 1>&2 && success || failure $"$prog start"
 	RETVAL=$?
 	[ $RETVAL -eq 0 ] && touch /var/lock/subsys/postfix


Index: postfix.spec
===================================================================
RCS file: /cvs/pkgs/rpms/postfix/F-9/postfix.spec,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- postfix.spec	20 Nov 2008 14:23:19 -0000	1.69
+++ postfix.spec	22 Jan 2009 16:00:24 -0000	1.70
@@ -39,8 +39,8 @@
 
 Name: postfix
 Summary: Postfix Mail Transport Agent
-Version: 2.5.5
-Release: 2%{?dist}
+Version: 2.5.6
+Release: 1%{?dist}
 Epoch: 2
 Group: System Environment/Daemons
 URL: http://www.postfix.org
@@ -166,6 +166,11 @@
 gzip -dc %{SOURCE53} | tar xf -
 %endif
 
+for f in README_FILES/TLS_{LEGACY_,}README; do
+	iconv -f iso8859-1 -t utf8 -o ${f}{_,} &&
+		touch -r ${f}{,_} && mv -f ${f}{_,}
+done
+
 %build
 CCARGS=-fPIC
 AUXLIBS=
@@ -255,8 +260,8 @@
        readme_directory=%{postfix_readme_dir} || exit 1
 
 # This installs into the /etc/rc.d/init.d directory
-/bin/mkdir -p $RPM_BUILD_ROOT/etc/rc.d/init.d
-install -c %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/postfix
+mkdir -p $RPM_BUILD_ROOT%{_initrddir}
+install -c %{SOURCE1} $RPM_BUILD_ROOT%{_initrddir}/postfix
 
 install -c auxiliary/rmail/rmail $RPM_BUILD_ROOT%{_bindir}/rmail.postfix
 
@@ -324,6 +329,9 @@
 inet_protocols = all
 EOF
 
+mkdir -p $RPM_BUILD_ROOT%{_var}/lib/misc
+touch $RPM_BUILD_ROOT%{_var}/lib/misc/postfix.aliasesdb-stamp
+
 %post
 /sbin/chkconfig --add postfix
 
@@ -396,7 +404,7 @@
 %config(noreplace) %{sasl_v2_lib_dir}/smtpd.conf
 %endif
 %config(noreplace) %{_sysconfdir}/pam.d/smtp.postfix
-%attr(0755, root, root) /etc/rc.d/init.d/postfix
+%attr(0755, root, root) %{_initrddir}/postfix
 
 # Misc files
 
@@ -470,6 +478,7 @@
 %attr(0755, root, root) %{_bindir}/mailq.postfix
 %attr(0755, root, root) %{_bindir}/newaliases.postfix
 %attr(0755, root, root) %{_sbindir}/sendmail.postfix
+%ghost %attr(0644, root, root) %{_var}/lib/misc/postfix.aliasesdb-stamp
 
 %files perl-scripts
 %defattr(-, root, root)
@@ -482,6 +491,11 @@
 %endif
 
 %changelog
+* Thu Jan 22 2009 Miroslav Lichvar <mlichvar at redhat.com> 2:2.5.6-1
+- update to 2.5.6 (#479108)
+- rebuild /etc/aliases.db only when necessary (#327651)
+- convert doc files to UTF-8
+
 * Thu Nov 20 2008 Miroslav Lichvar <mlichvar at redhat.com> 2:2.5.5-2
 - enable Large file support on 32-bit archs (#428996)
 - fix mailq(1) and newaliases(1) man pages (#429501)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/postfix/F-9/sources,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- sources	20 Nov 2008 14:23:19 -0000	1.30
+++ sources	22 Jan 2009 16:00:24 -0000	1.31
@@ -1,2 +1,2 @@
 2f570477b2e205f9dfc1df13f00b5c0d  pflogsumm-1.1.1.tar.gz
-6b4b848bdd2239dddfc9d385e57e19ef  postfix-2.5.5.tar.gz
+ec2cb63b53f5f36c3ca91da8f3bc9407  postfix-2.5.6.tar.gz



From rdieter at fedoraproject.org  Thu Jan 22 16:02:10 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu, 22 Jan 2009 16:02:10 +0000 (UTC)
Subject: rpms/kdebase-runtime/devel kdebase-runtime.spec,1.88,1.89
Message-ID: <20090122160210.44D3570033@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdebase-runtime/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10632

Modified Files:
	kdebase-runtime.spec 
Log Message:
+BR: pulseaudio-libs-devel xine-lib-devel
-BR: giflib-devel pcre-devel



Index: kdebase-runtime.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-runtime/devel/kdebase-runtime.spec,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -r1.88 -r1.89
--- kdebase-runtime.spec	22 Jan 2009 10:27:03 -0000	1.88
+++ kdebase-runtime.spec	22 Jan 2009 16:01:40 -0000	1.89
@@ -48,20 +48,20 @@
 
 BuildRequires: alsa-lib-devel
 BuildRequires: clucene-core-devel
-BuildRequires: giflib-devel
 BuildRequires: hal-devel
 BuildRequires: kdelibs4-devel >= %{version}
 BuildRequires: kdepimlibs-devel >= %{version}
 %{?_with_samba:BuildRequires: libsmbclient-devel}
+# needed for phonon-xine VideoWidget, also need xine-lib built with libxcb support
+BuildRequires: libxcb-devel
 BuildRequires: libXScrnSaver-devel
 BuildRequires: OpenEXR-devel
 BuildRequires: openssl-devel
-BuildRequires: pcre-devel
 BuildRequires: pkgconfig
+BuildRequires: pulseaudio-libs-devel
 BuildRequires: qimageblitz-devel
 BuildRequires: soprano-devel
-# needed for phonon-xine VideoWidget, also need xine-lib built with libxcb support
-BuildRequires: libxcb-devel
+BuildRequires: xine-lib-devel
 # needed?
 BuildRequires: xorg-x11-font-utils
 BuildRequires: xorg-x11-proto-devel
@@ -338,6 +338,8 @@
 %changelog
 * Thu Jan 22 2009 Than Ngo <than at redhat.com> - 4.2.0-1
 - 4.2.0
+- +BR: pulseaudio-libs-devel xine-lib-devel
+- -BR: giflib-devel pcre-devel
 
 * Tue Jan 13 2009 Rex Dieter <rdieter at fedoraproject.org> 4.1.96-2
 - tarball respin



From mlichvar at fedoraproject.org  Thu Jan 22 16:03:42 2009
From: mlichvar at fedoraproject.org (Miroslav Lichvar)
Date: Thu, 22 Jan 2009 16:03:42 +0000 (UTC)
Subject: rpms/postfix/F-10 .cvsignore, 1.30, 1.31 postfix-etc-init.d-postfix,
	1.11, 1.12 postfix.spec, 1.69, 1.70 sources, 1.30, 1.31
Message-ID: <20090122160342.1C8ED179D1E@cvs1.fedora.phx.redhat.com>

Author: mlichvar

Update of /cvs/pkgs/rpms/postfix/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11067

Modified Files:
	.cvsignore postfix-etc-init.d-postfix postfix.spec sources 
Log Message:
- update to 2.5.6 (#479108)
- rebuild /etc/aliases.db only when necessary (#327651)
- convert doc files to UTF-8



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/postfix/F-10/.cvsignore,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- .cvsignore	20 Nov 2008 14:15:41 -0000	1.30
+++ .cvsignore	22 Jan 2009 16:03:11 -0000	1.31
@@ -1,2 +1,2 @@
 pflogsumm-1.1.1.tar.gz
-postfix-2.5.5.tar.gz
+postfix-2.5.6.tar.gz


Index: postfix-etc-init.d-postfix
===================================================================
RCS file: /cvs/pkgs/rpms/postfix/F-10/postfix-etc-init.d-postfix,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- postfix-etc-init.d-postfix	4 Oct 2007 13:39:00 -0000	1.11
+++ postfix-etc-init.d-postfix	22 Jan 2009 16:03:11 -0000	1.12
@@ -34,6 +34,8 @@
 RETVAL=0
 prog="postfix"
 
+ALIASESDB_STAMP=/var/lib/misc/postfix.aliasesdb-stamp
+
 status master >/dev/null 2>&1
 running=$?
 
@@ -43,13 +45,28 @@
     [ -d /var/spool/postfix ] || exit 5
 }
 
+make_aliasesdb() {
+	if [ "$(/usr/sbin/postconf -h alias_database)" == "hash:/etc/aliases" ]
+	then
+		# /etc/aliases.db may be used by other MTA, make sure nothing
+		# has touched it since our last newaliases call
+		[ /etc/aliases -nt /etc/aliases.db ] ||
+			[ "$ALIASESDB_STAMP" -nt /etc/aliases.db ] ||
+			[ "$ALIASESDB_STAMP" -ot /etc/aliases.db ] || return
+		/usr/bin/newaliases
+		touch -r /etc/aliases.db "$ALIASESDB_STAMP"
+	else
+		/usr/bin/newaliases
+	fi
+}
+
 start() {
 	# Check that networking is up.
 	[ ${NETWORKING} = "no" ] && exit 1
 	conf_check
 	# Start daemons.
 	echo -n $"Starting postfix: "
-        /usr/bin/newaliases >/dev/null 2>&1
+	make_aliasesdb >/dev/null 2>&1
 	/usr/sbin/postfix start 2>/dev/null 1>&2 && success || failure $"$prog start"
 	RETVAL=$?
 	[ $RETVAL -eq 0 ] && touch /var/lock/subsys/postfix


Index: postfix.spec
===================================================================
RCS file: /cvs/pkgs/rpms/postfix/F-10/postfix.spec,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- postfix.spec	20 Nov 2008 14:15:42 -0000	1.69
+++ postfix.spec	22 Jan 2009 16:03:11 -0000	1.70
@@ -39,8 +39,8 @@
 
 Name: postfix
 Summary: Postfix Mail Transport Agent
-Version: 2.5.5
-Release: 2%{?dist}
+Version: 2.5.6
+Release: 1%{?dist}
 Epoch: 2
 Group: System Environment/Daemons
 URL: http://www.postfix.org
@@ -166,6 +166,11 @@
 gzip -dc %{SOURCE53} | tar xf -
 %endif
 
+for f in README_FILES/TLS_{LEGACY_,}README; do
+	iconv -f iso8859-1 -t utf8 -o ${f}{_,} &&
+		touch -r ${f}{,_} && mv -f ${f}{_,}
+done
+
 %build
 CCARGS=-fPIC
 AUXLIBS=
@@ -255,8 +260,8 @@
        readme_directory=%{postfix_readme_dir} || exit 1
 
 # This installs into the /etc/rc.d/init.d directory
-/bin/mkdir -p $RPM_BUILD_ROOT/etc/rc.d/init.d
-install -c %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/postfix
+mkdir -p $RPM_BUILD_ROOT%{_initrddir}
+install -c %{SOURCE1} $RPM_BUILD_ROOT%{_initrddir}/postfix
 
 install -c auxiliary/rmail/rmail $RPM_BUILD_ROOT%{_bindir}/rmail.postfix
 
@@ -324,6 +329,9 @@
 inet_protocols = all
 EOF
 
+mkdir -p $RPM_BUILD_ROOT%{_var}/lib/misc
+touch $RPM_BUILD_ROOT%{_var}/lib/misc/postfix.aliasesdb-stamp
+
 %post
 /sbin/chkconfig --add postfix
 
@@ -396,7 +404,7 @@
 %config(noreplace) %{sasl_v2_lib_dir}/smtpd.conf
 %endif
 %config(noreplace) %{_sysconfdir}/pam.d/smtp.postfix
-%attr(0755, root, root) /etc/rc.d/init.d/postfix
+%attr(0755, root, root) %{_initrddir}/postfix
 
 # Misc files
 
@@ -470,6 +478,7 @@
 %attr(0755, root, root) %{_bindir}/mailq.postfix
 %attr(0755, root, root) %{_bindir}/newaliases.postfix
 %attr(0755, root, root) %{_sbindir}/sendmail.postfix
+%ghost %attr(0644, root, root) %{_var}/lib/misc/postfix.aliasesdb-stamp
 
 %files perl-scripts
 %defattr(-, root, root)
@@ -482,6 +491,11 @@
 %endif
 
 %changelog
+* Thu Jan 22 2009 Miroslav Lichvar <mlichvar at redhat.com> 2:2.5.6-1
+- update to 2.5.6 (#479108)
+- rebuild /etc/aliases.db only when necessary (#327651)
+- convert doc files to UTF-8
+
 * Thu Nov 20 2008 Miroslav Lichvar <mlichvar at redhat.com> 2:2.5.5-2
 - enable Large file support on 32-bit archs (#428996)
 - fix mailq(1) and newaliases(1) man pages (#429501)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/postfix/F-10/sources,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- sources	20 Nov 2008 14:15:42 -0000	1.30
+++ sources	22 Jan 2009 16:03:11 -0000	1.31
@@ -1,2 +1,2 @@
 2f570477b2e205f9dfc1df13f00b5c0d  pflogsumm-1.1.1.tar.gz
-6b4b848bdd2239dddfc9d385e57e19ef  postfix-2.5.5.tar.gz
+ec2cb63b53f5f36c3ca91da8f3bc9407  postfix-2.5.6.tar.gz



From dwalsh at fedoraproject.org  Thu Jan 22 16:23:30 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Thu, 22 Jan 2009 16:23:30 +0000 (UTC)
Subject: rpms/xguest/devel xguest.spec,1.7,1.8
Message-ID: <20090122162330.360BA179D1E@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/xguest/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14389

Modified Files:
	xguest.spec 
Log Message:
* Thu Jan 22 2009 Dan Walsh <dwalsh at redhat.com> - 1.0.6-8
- Modify xguest to be able to be installed in a livecd



Index: xguest.spec
===================================================================
RCS file: /cvs/extras/rpms/xguest/devel/xguest.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- xguest.spec	4 Apr 2008 20:53:52 -0000	1.7
+++ xguest.spec	22 Jan 2009 16:22:59 -0000	1.8
@@ -1,7 +1,7 @@
 Summary: Creates xguest user as a locked down user 
 Name: xguest
 Version: 1.0.6
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 BuildArch: noarch
@@ -38,8 +38,8 @@
 
 %pre
 if [ $1 -eq 1 ]; then
-semanage user -a -P xguest -R xguest_r xguest_u  2> /dev/null
-(useradd -c "Guest" -Z xguest_u xguest || semanage login -a -s xguest_u xguest || semanage login -m -s xguest_u xguest) 2>/dev/null || exit 1
+semanage user -a  -S targeted -P xguest -R xguest_r xguest_u  2> /dev/null  || :
+(useradd -c "Guest" -Z xguest_u xguest || semanage login -a -S targeted -s xguest_u xguest || semanage login -m -S targeted -s xguest_u xguest) 2>/dev/null || exit 1
 
 echo -n \
 '
@@ -53,7 +53,14 @@
 
 echo "xguest:exclusive" >> /etc/security/sepermit.conf
 
-setsebool -P allow_polyinstantiation=1 browser_confine_xguest=1 browser_write_xguest_data=1 xguest_connect_network=1 xguest_mount_media=1 xguest_use_bluetooth=1
+semanage  boolean -m -S targeted -F /dev/stdin  << _EOF
+allow_polyinstantiation=1
+browser_confine_xguest=1
+browser_write_xguest_data=1
+xguest_connect_network=1
+xguest_mount_media=1
+xguest_use_bluetooth=1
+_EOF
 
 fi
 
@@ -94,6 +101,9 @@
 fi
 
 %changelog
+* Thu Jan 22 2009 Dan Walsh <dwalsh at redhat.com> - 1.0.6-8
+- Modify xguest to be able to be installed in a livecd
+
 * Fri Apr 4 2008 Dan Walsh <dwalsh at redhat.com> - 1.0.6-7
 - Require newer version of policy
 



From dwalsh at fedoraproject.org  Thu Jan 22 16:23:53 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Thu, 22 Jan 2009 16:23:53 +0000 (UTC)
Subject: rpms/xguest/F-10 xguest.spec,1.7,1.8
Message-ID: <20090122162353.949FB70033@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/xguest/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14469

Modified Files:
	xguest.spec 
Log Message:
* Thu Jan 22 2009 Dan Walsh <dwalsh at redhat.com> - 1.0.6-8
- Modify xguest to be able to be installed in a livecd



Index: xguest.spec
===================================================================
RCS file: /cvs/extras/rpms/xguest/F-10/xguest.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- xguest.spec	4 Apr 2008 20:53:52 -0000	1.7
+++ xguest.spec	22 Jan 2009 16:23:23 -0000	1.8
@@ -1,7 +1,7 @@
 Summary: Creates xguest user as a locked down user 
 Name: xguest
 Version: 1.0.6
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 BuildArch: noarch
@@ -38,8 +38,8 @@
 
 %pre
 if [ $1 -eq 1 ]; then
-semanage user -a -P xguest -R xguest_r xguest_u  2> /dev/null
-(useradd -c "Guest" -Z xguest_u xguest || semanage login -a -s xguest_u xguest || semanage login -m -s xguest_u xguest) 2>/dev/null || exit 1
+semanage user -a  -S targeted -P xguest -R xguest_r xguest_u  2> /dev/null  || :
+(useradd -c "Guest" -Z xguest_u xguest || semanage login -a -S targeted -s xguest_u xguest || semanage login -m -S targeted -s xguest_u xguest) 2>/dev/null || exit 1
 
 echo -n \
 '
@@ -53,7 +53,14 @@
 
 echo "xguest:exclusive" >> /etc/security/sepermit.conf
 
-setsebool -P allow_polyinstantiation=1 browser_confine_xguest=1 browser_write_xguest_data=1 xguest_connect_network=1 xguest_mount_media=1 xguest_use_bluetooth=1
+semanage  boolean -m -S targeted -F /dev/stdin  << _EOF
+allow_polyinstantiation=1
+browser_confine_xguest=1
+browser_write_xguest_data=1
+xguest_connect_network=1
+xguest_mount_media=1
+xguest_use_bluetooth=1
+_EOF
 
 fi
 
@@ -94,6 +101,9 @@
 fi
 
 %changelog
+* Thu Jan 22 2009 Dan Walsh <dwalsh at redhat.com> - 1.0.6-8
+- Modify xguest to be able to be installed in a livecd
+
 * Fri Apr 4 2008 Dan Walsh <dwalsh at redhat.com> - 1.0.6-7
 - Require newer version of policy
 



From langel at fedoraproject.org  Thu Jan 22 16:26:31 2009
From: langel at fedoraproject.org (Lillian Angel)
Date: Thu, 22 Jan 2009 16:26:31 +0000 (UTC)
Subject: rpms/java-1.6.0-openjdk/devel .cvsignore, 1.52,
	1.53 java-1.6.0-openjdk-makefile.patch, 1.12,
	1.13 java-1.6.0-openjdk.spec, 1.99, 1.100 sources, 1.54, 1.55
Message-ID: <20090122162631.567B470033@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-serv15009

Modified Files:
	.cvsignore java-1.6.0-openjdk-makefile.patch 
	java-1.6.0-openjdk.spec sources 
Log Message:
* Thu Jan 22 2009 Lillian Angel <langel at redhat.com> - 1:1.6.0-10.b14
- Updated to icedtea-1.4 snapshot.
- Updated release.
- Removed netbeans and visualvm.
- Resolves: rhbz#472953
- Resolves: rhbz#475081
- Resolves: rhbz#452573




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/devel/.cvsignore,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- .cvsignore	5 Dec 2008 16:48:09 -0000	1.52
+++ .cvsignore	22 Jan 2009 16:26:00 -0000	1.53
@@ -1,9 +1,6 @@
 mauve_tests
 java-access-bridge-1.23.0.tar.gz
-netbeans-profiler-visualvm_preview2.tar.gz
-netbeans-6.1-200805300101-basic_cluster-src.zip
 mauve-2008-10-22.tar.gz
-visualvm-20081031-src.tar.gz
 openjdk-6-src-b14-25_nov_2008-fedora.tar.gz
 hotspot.tar.gz
-icedtea6-1.4-7801bbe25e3a2f4edecc7d510b28de1d485010f9.tar.gz
+icedtea6-1.4.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.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- java-1.6.0-openjdk-makefile.patch	5 Dec 2008 16:45:47 -0000	1.12
+++ java-1.6.0-openjdk-makefile.patch	22 Jan 2009 16:26:00 -0000	1.13
@@ -1,61 +1,14 @@
---- oldMakefile.am	2008-12-05 11:09:32.000000000 -0500
-+++ Makefile.am	2008-12-05 11:10:34.000000000 -0500
-@@ -370,46 +370,6 @@
- endif
- endif
- endif
--if WITH_VISUALVM
--if USE_ALT_NETBEANS_BASIC_CLUSTER_SRC_ZIP
--else
--	if ! echo "$(NETBEANS_BASIC_CLUSTER_MD5SUM) $(NETBEANS_BASIC_CLUSTER_SRC_ZIP)" \
--	  | $(MD5SUM) --check ; \
--	then \
--	  if [ $(NETBEANS_BASIC_CLUSTER_SRC_ZIP) ] ; \
--	  then \
--	    mv $(NETBEANS_BASIC_CLUSTER_SRC_ZIP) $(NETBEANS_BASIC_CLUSTER_SRC_ZIP).old ; \
--	  fi ; \
--	$(WGET) $(NETBEANS_BASIC_CLUSTER_URL)$(NETBEANS_BASIC_CLUSTER_SRC_ZIP) \
--	  -O $(NETBEANS_BASIC_CLUSTER_SRC_ZIP) ; \
--	fi
--endif
--if USE_ALT_NETBEANS_PROFILER_SRC_ZIP
--else
--	if ! echo "$(NETBEANS_PROFILER_MD5SUM) $(NETBEANS_PROFILER_SRC_ZIP)" \
--	  | $(MD5SUM) --check ; \
--	then \
--	  if [ $(NETBEANS_PROFILER_SRC_ZIP) ] ; \
--	  then \
--	    mv $(NETBEANS_PROFILER_SRC_ZIP) $(NETBEANS_PROFILER_SRC_ZIP).old ; \
--	  fi ; \
--	  $(WGET) $(NETBEANS_PROFILER_URL)$(NETBEANS_PROFILER_SRC_ZIP) \
--	    -O $(NETBEANS_PROFILER_SRC_ZIP) ; \
--	fi
--endif
--if USE_ALT_VISUALVM_SRC_ZIP
--else
--	if ! echo "$(VISUALVM_MD5SUM) $(VISUALVM_SRC_ZIP)" \
--	  | $(MD5SUM) --check ; \
--	then \
--	  if [ $(VISUALVM_SRC_ZIP) ] ; \
--	  then \
--	    mv $(VISUALVM_SRC_ZIP) $(VISUALVM_SRC_ZIP).old ; \
--	  fi ; \
--	  $(WGET) $(VISUALVM_URL)$(VISUALVM_SRC_ZIP) -O $(VISUALVM_SRC_ZIP) ; \
--	fi
--endif
--endif
- 	mkdir -p stamps
- 	touch stamps/download.stamp
- 
-@@ -629,7 +589,6 @@
- 	  mkdir openjdk ; \
- 	  $(TAR) xf $(OPENJDK_SRC_ZIP) -C openjdk; \
- 	  chmod -R ug+w openjdk ; \
+--- icedtea6-1.4/Makefile.am	2009-01-20 11:33:30.000000000 -0500
++++ Makefile.am	2009-01-22 10:56:55.000000000 -0500
+@@ -623,7 +623,6 @@
+ 	  if test "x${HSBUILD}" != "xoriginal"; then \
+ 	    rm -rf openjdk/hotspot ; \
+ 	  fi ; \
 -	  sh $(abs_top_srcdir)/fsg.sh ; \
  	fi
  if WITH_ALT_HSBUILD
  	if test -e ${HOTSPOT_SRC_ZIP} ; \
-@@ -683,7 +642,7 @@
+@@ -660,7 +659,7 @@
  clean-extract:
  	rm -f stamps/extract.stamp
  


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.99
retrieving revision 1.100
diff -u -r1.99 -r1.100
--- java-1.6.0-openjdk.spec	11 Jan 2009 16:28:19 -0000	1.99
+++ java-1.6.0-openjdk.spec	22 Jan 2009 16:26:00 -0000	1.100
@@ -7,7 +7,7 @@
 %define runtests 1
 
 %define icedteaver 1.4
-%define icedteasnapshot -7801bbe25e3a2f4edecc7d510b28de1d485010f9
+%define icedteasnapshot %{nil}
 %define openjdkver b14
 %define openjdkdate 25_nov_2008
 
@@ -18,8 +18,6 @@
 %define accessver %{accessmajorver}.%{accessminorver}
 %define accessurl http://ftp.gnome.org/pub/GNOME/sources/java-access-bridge/
 
-%define visualvmurl http://icedtea.classpath.org/visualvm/
-%define netbeansurl http://nbi.netbeans.org/files/documents/210/2056/
 %define hotspoturl  http://hg.openjdk.java.net/jdk7/hotspot/hotspot/archive/
 
 %define openjdkurlbase http://www.java.net/download/openjdk/jdk7/promoted/
@@ -109,7 +107,7 @@
 
 Name:    java-%{javaver}-%{origin}
 Version: %{javaver}.%{buildver}
-Release: 9.%{openjdkver}%{?dist}
+Release: 10.%{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
@@ -132,10 +130,7 @@
 Source4:  README.src
 Source5:  mauve-%{mauvedate}.tar.gz
 Source6:  mauve_tests
-Source7:  %{netbeansurl}/netbeans-6.1-200805300101-basic_cluster-src.zip
-Source8:  %{visualvmurl}/netbeans-profiler-visualvm_preview2.tar.gz
-Source9: %{visualvmurl}/visualvm-20081031-src.tar.gz
-Source10: %{hotspoturl}/hotspot.tar.gz
+Source7: %{hotspoturl}/hotspot.tar.gz
 # FIXME: This patch needs to be fixed. optflags argument
 # -mtune=generic is being ignored because it breaks several graphical
 # applications.
@@ -202,9 +197,6 @@
 %ifnarch %{jit_arches}
 BuildRequires: libffi-devel
 %endif
-# visualvm build requirements.
-BuildRequires: netbeans
-BuildRequires: jakarta-commons-logging
 
 Requires: rhino
 Requires: libjpeg = 6b
@@ -259,8 +251,6 @@
 
 # Require base package.
 Requires:         %{name} = %{epoch}:%{version}-%{release}
-# Requirements for jvisualvm
-Requires:         netbeans-platform8
 # Post requires alternatives to install tool alternatives.
 Requires(post):   %{_sbindir}/alternatives
 # Postun requires alternatives to uninstall tool alternatives.
@@ -359,9 +349,6 @@
 cp %{SOURCE4} .
 cp %{SOURCE6} .
 cp %{SOURCE7} .
-cp %{SOURCE8} .
-cp %{SOURCE9} .
-cp %{SOURCE10} .
 
 %build
 # Build IcedTea and OpenJDK.
@@ -369,7 +356,7 @@
 export ARCH_DATA_MODEL=64
 %endif
 ./autogen.sh
-./configure %{icedteaopt} --with-openjdk-src-zip=%{SOURCE1} --enable-visualvm \
+./configure %{icedteaopt} --with-openjdk-src-zip=%{SOURCE1} \
   --with-pkgversion=fedora-%{release}-%{_arch} --enable-pulse-java \
   --with-hotspot-src-zip=hotspot.tar.gz
 %if %{gcjbootstrap}
@@ -524,8 +511,6 @@
 cp javaws.png $RPM_BUILD_ROOT%{_datadir}/pixmaps
 desktop-file-install --vendor ''\
   --dir $RPM_BUILD_ROOT%{_datadir}/applications javaws.desktop
-desktop-file-install --vendor ''\
-  --dir $RPM_BUILD_ROOT%{_datadir}/applications visualvm.desktop
 for e in jconsole policytool ; do
     desktop-file-install --vendor=fedora --mode=644 \
         --dir=$RPM_BUILD_ROOT%{_datadir}/applications $e.desktop
@@ -674,7 +659,6 @@
   --slave %{_bindir}/jstack jstack %{sdkbindir}/jstack \
   --slave %{_bindir}/jstat jstat %{sdkbindir}/jstat \
   --slave %{_bindir}/jstatd jstatd %{sdkbindir}/jstatd \
-  --slave %{_bindir}/jvisualvm jvisualvm %{sdkbindir}/jvisualvm \
   --slave %{_bindir}/native2ascii native2ascii %{sdkbindir}/native2ascii \
   --slave %{_bindir}/rmic rmic %{sdkbindir}/rmic \
   --slave %{_bindir}/schemagen schemagen %{sdkbindir}/schemagen \
@@ -880,7 +864,6 @@
 %{_mandir}/man1/wsgen-%{name}.1*
 %{_mandir}/man1/wsimport-%{name}.1*
 %{_mandir}/man1/xjc-%{name}.1*
-%{_datadir}/applications/visualvm.desktop
 
 %files demo -f %{name}-demo.files
 %defattr(-,root,root,-)
@@ -905,6 +888,14 @@
 %{_jvmdir}/%{jredir}/lib/%{archinstall}/IcedTeaPlugin.so
 
 %changelog
+* Thu Jan 22 2009 Lillian Angel <langel at redhat.com> - 1:1.6.0-10.b14
+- Updated to icedtea-1.4 snapshot.
+- Updated release.
+- Removed netbeans and visualvm.
+- Resolves: rhbz#472953
+- Resolves: rhbz#475081 
+- Resolves: rhbz#452573
+
 * Sun Jan 11 2009 Lillian Angel <langel at redhat.com> - 1:1.6.0-9.b14
 - Removed README.plugin, updated source list.
 - Updated release.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/devel/sources,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- sources	5 Dec 2008 16:48:09 -0000	1.54
+++ sources	22 Jan 2009 16:26:00 -0000	1.55
@@ -1,9 +1,6 @@
 7a0c160c03012cd40957a7a112e25038  mauve_tests
 1db4280d3228f20ad39ad22382ce2b00  java-access-bridge-1.23.0.tar.gz
-ff8e8abc42df6c6749e6b02bcf7bb0a5  netbeans-profiler-visualvm_preview2.tar.gz
-a7ea855f475fa3a982f094a45c155ab4  netbeans-6.1-200805300101-basic_cluster-src.zip
 a9cdc5f050eb6e97c1b15ddd39978710  mauve-2008-10-22.tar.gz
-0bf855574d3977e80b7943e35fabaca9  visualvm-20081031-src.tar.gz
 bd07d61915e403a55a6ef42842b0cf8c  openjdk-6-src-b14-25_nov_2008-fedora.tar.gz
 c8f78d48ac83987bc2adebeebcd354e9  hotspot.tar.gz
-1219691798c2628c5bb22f4ba2cb86af  icedtea6-1.4-7801bbe25e3a2f4edecc7d510b28de1d485010f9.tar.gz
+40720784a0409fb14b4048f602ce921b  icedtea6-1.4.tar.gz



From langel at fedoraproject.org  Thu Jan 22 16:34:13 2009
From: langel at fedoraproject.org (Lillian Angel)
Date: Thu, 22 Jan 2009 16:34:13 +0000 (UTC)
Subject: rpms/java-1.6.0-openjdk/F-10
	java-1.6.0-openjdk-java-access-bridge-security.patch, NONE,
	1.1 .cvsignore, 1.47, 1.48 java-1.6.0-openjdk-makefile.patch,
	1.11, 1.12 java-1.6.0-openjdk.spec, 1.96, 1.97 sources, 1.49,
	1.50 java-1.6.0-openjdk-dec2security.patch, 1.1,
	NONE java-1.6.0-openjdk-plugin-1219.patch, 1.2, NONE
Message-ID: <20090122163413.2C2B8179D1E@cvs1.fedora.phx.redhat.com>

Author: langel

Update of /cvs/pkgs/rpms/java-1.6.0-openjdk/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16094

Modified Files:
	.cvsignore java-1.6.0-openjdk-makefile.patch 
	java-1.6.0-openjdk.spec sources 
Added Files:
	java-1.6.0-openjdk-java-access-bridge-security.patch 
Removed Files:
	java-1.6.0-openjdk-dec2security.patch 
	java-1.6.0-openjdk-plugin-1219.patch 
Log Message:
* Thu Jan 22 2009 Lillian Angel <langel at redhat.com> - 1:1.6.0-10.b14
- Updated to icedtea-1.4 snapshot.
- Updated release.
- Removed netbeans and visualvm.
- Added hotspot source.
- Added --with-hotspot-src-zip build option.
- Set runtests to 1.
- Updated jtreg log.
- Updated openjdkver.
- Updated openjdkdate.
- Added new patch to add GNOME to java.security.
- Resolves: rhbz#472953
- Resolves: rhbz#475081
- Resolves: rhbz#452573
- Resolves: rhbz#474431
- Resolves: rhbz#474503
- Resolves: rhbz#472862



java-1.6.0-openjdk-java-access-bridge-security.patch:

--- NEW FILE java-1.6.0-openjdk-java-access-bridge-security.patch ---
--- jsorig	2008-12-05 11:43:39.000000000 -0500
+++ openjdk/jdk/src/share/lib/security/java.security	2008-12-05 11:43:45.000000000 -0500
@@ -127,7 +127,7 @@
 # passed to checkPackageAccess unless the
 # corresponding RuntimePermission ("accessClassInPackage."+package) has
 # been granted.
-package.access=sun.,com.sun.xml.internal.ws.,com.sun.xml.internal.bind.
+package.access=sun.,com.sun.xml.internal.ws.,com.sun.xml.internal.bind.,org.GNOME.Accessibility,org.GNOME.Bonobo
 
 #
 # List of comma-separated packages that start with or equal this string


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/F-10/.cvsignore,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- .cvsignore	13 Nov 2008 15:06:19 -0000	1.47
+++ .cvsignore	22 Jan 2009 16:33:42 -0000	1.48
@@ -1,8 +1,6 @@
 mauve_tests
 java-access-bridge-1.23.0.tar.gz
-openjdk-6-src-b12-28_aug_2008-fedora.tar.gz
-netbeans-profiler-visualvm_preview2.tar.gz
-netbeans-6.1-200805300101-basic_cluster-src.zip
 mauve-2008-10-22.tar.gz
-visualvm-20081031-src.tar.gz
-icedtea6-1.4-b259b240929b353ed45c9a5a3eb641ee08a4829c.tar.gz
+openjdk-6-src-b14-25_nov_2008-fedora.tar.gz
+icedtea6-1.4.tar.gz
+hotspot.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/F-10/java-1.6.0-openjdk-makefile.patch,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- java-1.6.0-openjdk-makefile.patch	22 Oct 2008 21:26:47 -0000	1.11
+++ java-1.6.0-openjdk-makefile.patch	22 Jan 2009 16:33:42 -0000	1.12
@@ -1,61 +1,14 @@
---- makefileam	2008-10-22 11:46:24.000000000 -0400
-+++ Makefile.am	2008-10-22 11:47:10.000000000 -0400
-@@ -350,46 +350,6 @@
- endif
- endif
- endif
--if WITH_VISUALVM
--if USE_ALT_NETBEANS_BASIC_CLUSTER_SRC_ZIP
--else
--	if ! echo "$(NETBEANS_BASIC_CLUSTER_MD5SUM) $(NETBEANS_BASIC_CLUSTER_SRC_ZIP)" \
--	  | $(MD5SUM) --check ; \
--	then \
--	  if [ $(NETBEANS_BASIC_CLUSTER_SRC_ZIP) ] ; \
--	  then \
--	    mv $(NETBEANS_BASIC_CLUSTER_SRC_ZIP) $(NETBEANS_BASIC_CLUSTER_SRC_ZIP).old ; \
--	  fi ; \
--	$(WGET) $(NETBEANS_BASIC_CLUSTER_URL)$(NETBEANS_BASIC_CLUSTER_SRC_ZIP) \
--	  -O $(NETBEANS_BASIC_CLUSTER_SRC_ZIP) ; \
--	fi
--endif
--if USE_ALT_NETBEANS_PROFILER_SRC_ZIP
--else
--	if ! echo "$(NETBEANS_PROFILER_MD5SUM) $(NETBEANS_PROFILER_SRC_ZIP)" \
--	  | $(MD5SUM) --check ; \
--	then \
--	  if [ $(NETBEANS_PROFILER_SRC_ZIP) ] ; \
--	  then \
--	    mv $(NETBEANS_PROFILER_SRC_ZIP) $(NETBEANS_PROFILER_SRC_ZIP).old ; \
--	  fi ; \
--	  $(WGET) $(NETBEANS_PROFILER_URL)$(NETBEANS_PROFILER_SRC_ZIP) \
--	    -O $(NETBEANS_PROFILER_SRC_ZIP) ; \
--	fi
--endif
--if USE_ALT_VISUALVM_SRC_ZIP
--else
--	if ! echo "$(VISUALVM_MD5SUM) $(VISUALVM_SRC_ZIP)" \
--	  | $(MD5SUM) --check ; \
--	then \
--	  if [ $(VISUALVM_SRC_ZIP) ] ; \
--	  then \
--	    mv $(VISUALVM_SRC_ZIP) $(VISUALVM_SRC_ZIP).old ; \
--	  fi ; \
--	  $(WGET) $(VISUALVM_URL)$(VISUALVM_SRC_ZIP) -O $(VISUALVM_SRC_ZIP) ; \
--	fi
--endif
--endif
- 	mkdir -p stamps
- 	touch stamps/download.stamp
- 
-@@ -562,7 +522,6 @@
- 	  mkdir openjdk ; \
- 	  $(TAR) xf $(OPENJDK_SRC_ZIP) -C openjdk; \
- 	  chmod -R ug+w openjdk ; \
+--- icedtea6-1.4/Makefile.am	2009-01-20 11:33:30.000000000 -0500
++++ Makefile.am	2009-01-22 10:56:55.000000000 -0500
+@@ -623,7 +623,6 @@
+ 	  if test "x${HSBUILD}" != "xoriginal"; then \
+ 	    rm -rf openjdk/hotspot ; \
+ 	  fi ; \
 -	  sh $(abs_top_srcdir)/fsg.sh ; \
  	fi
- if WITH_CACAO
- if !USE_SYSTEM_CACAO
-@@ -607,7 +566,7 @@
+ if WITH_ALT_HSBUILD
+ 	if test -e ${HOTSPOT_SRC_ZIP} ; \
+@@ -660,7 +659,7 @@
  clean-extract:
  	rm -f stamps/extract.stamp
  


Index: java-1.6.0-openjdk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/F-10/java-1.6.0-openjdk.spec,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -r1.96 -r1.97
--- java-1.6.0-openjdk.spec	11 Jan 2009 16:30:01 -0000	1.96
+++ java-1.6.0-openjdk.spec	22 Jan 2009 16:33:42 -0000	1.97
@@ -4,12 +4,12 @@
 %define gcjbootstrap 0
 
 # If runtests is 0 test suites will not be run.
-%define runtests 0
+%define runtests 1
 
 %define icedteaver 1.4
-%define icedteasnapshot -b259b240929b353ed45c9a5a3eb641ee08a4829c
-%define openjdkver b12
-%define openjdkdate 28_aug_2008
+%define icedteasnapshot %{nil}
+%define openjdkver b14
+%define openjdkdate 25_nov_2008
 
 %define genurl http://cvs.fedoraproject.org/viewcvs/devel/java-1.6.0-openjdk/
 
@@ -18,8 +18,7 @@
 %define accessver %{accessmajorver}.%{accessminorver}
 %define accessurl http://ftp.gnome.org/pub/GNOME/sources/java-access-bridge/
 
-%define visualvmurl http://icedtea.classpath.org/visualvm/
-%define netbeansurl http://nbi.netbeans.org/files/documents/210/2056/
+%define hotspoturl  http://hg.openjdk.java.net/jdk7/hotspot/hotspot/archive/
 
 %define openjdkurlbase http://www.java.net/download/openjdk/jdk7/promoted/
 %define openjdkurl %{openjdkurlbase}%{openjdkver}/
@@ -108,7 +107,7 @@
 
 Name:    java-%{javaver}-%{origin}
 Version: %{javaver}.%{buildver}
-Release: 8.%{openjdkver}%{?dist}
+Release: 9.%{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
@@ -131,9 +130,7 @@
 Source4:  README.src
 Source5:  mauve-%{mauvedate}.tar.gz
 Source6:  mauve_tests
-Source7:  %{netbeansurl}/netbeans-6.1-200805300101-basic_cluster-src.zip
-Source8:  %{visualvmurl}/netbeans-profiler-visualvm_preview2.tar.gz
-Source9:  %{visualvmurl}/visualvm-20081031-src.tar.gz
+Source7: %{hotspoturl}/hotspot.tar.gz
 # FIXME: This patch needs to be fixed. optflags argument
 # -mtune=generic is being ignored because it breaks several graphical
 # applications.
@@ -141,8 +138,7 @@
 Patch1:   java-1.6.0-openjdk-java-access-bridge-tck.patch
 Patch2:   java-1.6.0-openjdk-makefile.patch
 Patch3:   java-1.6.0-openjdk-java-access-bridge-idlj.patch
-Patch4:   java-1.6.0-openjdk-plugin-1219.patch
-Patch5:   java-1.6.0-openjdk-dec2security.patch
+Patch4:   java-1.6.0-openjdk-java-access-bridge-security.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -201,9 +197,6 @@
 %ifnarch %{jit_arches}
 BuildRequires: libffi-devel
 %endif
-# visualvm build requirements.
-BuildRequires: netbeans
-BuildRequires: jakarta-commons-logging
 
 Requires: rhino
 Requires: libjpeg = 6b
@@ -258,8 +251,6 @@
 
 # Require base package.
 Requires:         %{name} = %{epoch}:%{version}-%{release}
-# Requirements for jvisualvm
-Requires:         netbeans-platform8
 # Post requires alternatives to install tool alternatives.
 Requires(post):   %{_sbindir}/alternatives
 # Postun requires alternatives to uninstall tool alternatives.
@@ -355,24 +346,24 @@
 %setup -q -n icedtea6-%{icedteaver} -T -D -a 2
 %patch0
 %patch2
-%patch4
-%patch5
 cp %{SOURCE4} .
 cp %{SOURCE6} .
 cp %{SOURCE7} .
-cp %{SOURCE8} .
-cp %{SOURCE9} .
 
 %build
 # Build IcedTea and OpenJDK.
 %ifarch sparc64
 export ARCH_DATA_MODEL=64
 %endif
-./configure %{icedteaopt} --with-openjdk-src-zip=%{SOURCE1} --enable-visualvm \
-  --with-pkgversion=fedora-%{release}-%{_arch} --enable-pulse-java
+./autogen.sh
+./configure %{icedteaopt} --with-openjdk-src-zip=%{SOURCE1} \
+  --with-pkgversion=fedora-%{release}-%{_arch} --enable-pulse-java \
+  --with-hotspot-src-zip=hotspot.tar.gz
 %if %{gcjbootstrap}
 make stamps/patch-ecj.stamp
 %endif
+make patch
+patch -l -p0 < %{PATCH4}
 make
 
 export JAVA_HOME=$(pwd)/%{buildoutputdir}/j2sdk-image
@@ -397,7 +388,7 @@
   export DISPLAY=:20
   Xvfb :20 -screen 0 1x1x24 -ac&
   echo $! > Xvfb.pid
-  make jtregcheck -k | tee jtreg_output
+  make jtregcheck -k
   kill -9 `cat Xvfb.pid`
   unset DISPLAY
   rm -f Xvfb.pid
@@ -520,8 +511,6 @@
 cp javaws.png $RPM_BUILD_ROOT%{_datadir}/pixmaps
 desktop-file-install --vendor ''\
   --dir $RPM_BUILD_ROOT%{_datadir}/applications javaws.desktop
-desktop-file-install --vendor ''\
-  --dir $RPM_BUILD_ROOT%{_datadir}/applications visualvm.desktop
 for e in jconsole policytool ; do
     desktop-file-install --vendor=fedora --mode=644 \
         --dir=$RPM_BUILD_ROOT%{_datadir}/applications $e.desktop
@@ -670,7 +659,6 @@
   --slave %{_bindir}/jstack jstack %{sdkbindir}/jstack \
   --slave %{_bindir}/jstat jstat %{sdkbindir}/jstat \
   --slave %{_bindir}/jstatd jstatd %{sdkbindir}/jstatd \
-  --slave %{_bindir}/jvisualvm jvisualvm %{sdkbindir}/jvisualvm \
   --slave %{_bindir}/native2ascii native2ascii %{sdkbindir}/native2ascii \
   --slave %{_bindir}/rmic rmic %{sdkbindir}/rmic \
   --slave %{_bindir}/schemagen schemagen %{sdkbindir}/schemagen \
@@ -876,7 +864,6 @@
 %{_mandir}/man1/wsgen-%{name}.1*
 %{_mandir}/man1/wsimport-%{name}.1*
 %{_mandir}/man1/xjc-%{name}.1*
-%{_datadir}/applications/visualvm.desktop
 
 %files demo -f %{name}-demo.files
 %defattr(-,root,root,-)
@@ -889,7 +876,7 @@
 # FIXME: put these in a separate testresults subpackage.
 %doc mauve_tests
 %doc mauve-%{mauvedate}/mauve_output
-%doc jtreg_output
+%doc test/jtreg-summary.log
 %endif
 
 %files javadoc
@@ -901,6 +888,24 @@
 %{_jvmdir}/%{jredir}/lib/%{archinstall}/IcedTeaPlugin.so
 
 %changelog
+* Thu Jan 22 2009 Lillian Angel <langel at redhat.com> - 1:1.6.0-10.b14
+- Updated to icedtea-1.4 snapshot.
+- Updated release.
+- Removed netbeans and visualvm.
+- Added hotspot source.
+- Added --with-hotspot-src-zip build option.
+- Set runtests to 1.
+- Updated jtreg log.
+- Updated openjdkver.
+- Updated openjdkdate.
+- Added new patch to add GNOME to java.security.
+- Resolves: rhbz#472953
+- Resolves: rhbz#475081
+- Resolves: rhbz#452573
+- Resolves: rhbz#474431
+- Resolves: rhbz#474503
+- Resolves: rhbz#472862
+
 * Sun Jan 11 2009 Lillian Angel <langel at redhat.com> - 1:1.6.0-8.b12
 - Removed README.plugin, updated source list.
 - Updated release.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/F-10/sources,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- sources	13 Nov 2008 15:06:19 -0000	1.49
+++ sources	22 Jan 2009 16:33:42 -0000	1.50
@@ -1,8 +1,6 @@
 7a0c160c03012cd40957a7a112e25038  mauve_tests
 1db4280d3228f20ad39ad22382ce2b00  java-access-bridge-1.23.0.tar.gz
-482c858d25959c0cb77c1fa59161ce2a  openjdk-6-src-b12-28_aug_2008-fedora.tar.gz
-ff8e8abc42df6c6749e6b02bcf7bb0a5  netbeans-profiler-visualvm_preview2.tar.gz
-a7ea855f475fa3a982f094a45c155ab4  netbeans-6.1-200805300101-basic_cluster-src.zip
 a9cdc5f050eb6e97c1b15ddd39978710  mauve-2008-10-22.tar.gz
-0bf855574d3977e80b7943e35fabaca9  visualvm-20081031-src.tar.gz
-d5edf1e986050fe33478a0d382d51fa7  icedtea6-1.4-b259b240929b353ed45c9a5a3eb641ee08a4829c.tar.gz
+79d9511129158fa4fd3798a506757a5d  openjdk-6-src-b14-25_nov_2008-fedora.tar.gz
+40720784a0409fb14b4048f602ce921b  icedtea6-1.4.tar.gz
+c8f78d48ac83987bc2adebeebcd354e9  hotspot.tar.gz


--- java-1.6.0-openjdk-dec2security.patch DELETED ---


--- java-1.6.0-openjdk-plugin-1219.patch DELETED ---



From cwickert at fedoraproject.org  Thu Jan 22 16:36:04 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Thu, 22 Jan 2009 16:36:04 +0000 (UTC)
Subject: rpms/xfconf/devel xfconf.spec,1.5,1.6
Message-ID: <20090122163604.A275370033@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfconf/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16409

Modified Files:
	xfconf.spec 
Log Message:
* Thu Jan 22 2009 Christoph Wickert <cwickert at fedoraproject.org> - 4.5.93-3
- Let xfce4-settings Obsolete mcs manager and plugin packages



Index: xfconf.spec
===================================================================
RCS file: /cvs/extras/rpms/xfconf/devel/xfconf.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- xfconf.spec	22 Jan 2009 00:29:23 -0000	1.5
+++ xfconf.spec	22 Jan 2009 16:35:34 -0000	1.6
@@ -1,9 +1,9 @@
 Name:           xfconf
 Version:        4.5.93
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Hierarchical configuration system for Xfce
 
-Group:          User Interface/Desktops
+Group:          System Environment/Base
 License:        GPLv2
 URL:            http://www.xfce.org/
 Source0:        http://www.xfce.org/archive/xfce-%{version}/src/xfconf-%{version}.tar.bz2
@@ -17,10 +17,6 @@
 BuildRequires:  gettext
 
 Obsoletes: libxfce4mcs < 4.4.3-2
-Obsoletes: xfce-mcs-manager < 4.4.3-2
-Obsoletes: xfce-mcs-plugins < 4.4.3-2
-Obsoletes: xfce-mcs-plugins-extra < 2.0-3
-Obsoletes: xfce4-gsynaptics-mcs-plugin < 1.0.0-3
 
 %description
 Xfconf is a hierarchical (tree-like) configuration system where the
@@ -28,7 +24,7 @@
 beneath the channel nodes are called "properties."
 
 %package devel
-Summary: Developpment tools for xfconf
+Summary: Development tools for xfconf
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
 Requires: pkgconfig
@@ -108,6 +104,9 @@
 %{_mandir}/man3/*.3*
 
 %changelog
+* Thu Jan 22 2009 Christoph Wickert <cwickert at fedoraproject.org> - 4.5.93-3
+- Let xfce4-settings Obsolete mcs manager and plugin packages
+
 * Thu Jan 22 2009 Christoph Wickert <cwickert at fedoraproject.org> - 4.5.93-2
 - Add Obsoletes for mcs devel package
 



From cwickert at fedoraproject.org  Thu Jan 22 16:51:02 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Thu, 22 Jan 2009 16:51:02 +0000 (UTC)
Subject: rpms/xfce4-settings/devel xfce4-settings-4.5.93-fedora.patch, NONE, 
	1.1 xfce4-settings.spec, 1.2, 1.3
Message-ID: <20090122165102.6F62270033@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-settings/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19147

Modified Files:
	xfce4-settings.spec 
Added Files:
	xfce4-settings-4.5.93-fedora.patch 
Log Message:
* Thu Jan 22 2009 Christoph Wickert <cwickert at fedoraproject.org> - 4.5.93-2
- Add Obsoletes for mcs packages to make sure xfce4-settings gets installed
- Don't package desktop files twice
- Require xfconf
- Use Nodoka theme and Fedora icons
- Add docs


xfce4-settings-4.5.93-fedora.patch:

--- NEW FILE xfce4-settings-4.5.93-fedora.patch ---
--- xfce4-settings-4.5.93.orig/xfsettingsd/xsettings.xml	2008-11-10 10:57:46.000000000 +0100
+++ xfce4-settings-4.5.93/xfsettingsd/xsettings.xml	2009-01-22 02:49:03.000000000 +0100
@@ -2,7 +2,7 @@
 
 <channel name="xsettings" version="1.0">
   <property name="Net" type="empty">
-    <property name="ThemeName" type="string" value="Xfce"/>
-    <property name="IconThemeName" type="string" value="Rodent"/>
+    <property name="ThemeName" type="string" value="Nodoka"/>
+    <property name="IconThemeName" type="string" value="Fedora"/>
   </property>
 </channel>


Index: xfce4-settings.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-settings/devel/xfce4-settings.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xfce4-settings.spec	17 Jan 2009 07:49:42 -0000	1.2
+++ xfce4-settings.spec	22 Jan 2009 16:50:32 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           xfce4-settings
 Version:        4.5.93
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Settings Manager for Xfce
 
 Group:          User Interface/Desktops
@@ -8,6 +8,8 @@
 License:        GPLv2+ and GPLv2
 URL:            http://www.xfce.org/
 Source0:        http://www.xfce.org/archive/xfce-%{version}/src/xfce4-settings-%{version}.tar.bz2
+# use vendor's artwork
+Patch10:         xfce4-settings-4.5.93-fedora.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: gettext
@@ -22,13 +24,20 @@
 BuildRequires: libnotify-devel
 BuildRequires: libcanberra-devel
 BuildRequires: libxklavier-devel
+Requires: xfconf
+
+Obsoletes: xfce-mcs-manager < 4.4.3-2
+Obsoletes: xfce-mcs-plugins < 4.4.3-2
+Obsoletes: xfce-mcs-plugin-gsynaptics < 2.0-5
+Obsoletes: xfce-mcs-plugins-extra < 2.0-3
+Obsoletes: xfce4-gsynaptics-mcs-plugin < 1.0.0-3
 
 %description
 This package includes the settings manager applications for the Xfce desktop. 
 
 %prep
 %setup -q
-
+%patch10 -p1 -b .vendor
 
 %build
 %configure --enable-sound-settings
@@ -39,40 +48,40 @@
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
-desktop-file-install --vendor "fedora"                          \
+desktop-file-install --vendor ""                                \
         --dir ${RPM_BUILD_ROOT}%{_datadir}/applications/        \
         --delete-original                                       \
-        dialogs/display-settings/xfce-display-settings.desktop
+        ${RPM_BUILD_ROOT}%{_datadir}/applications/xfce-display-settings.desktop
 
-desktop-file-install --vendor "fedora"                          \
+desktop-file-install --vendor ""                                \
         --dir ${RPM_BUILD_ROOT}%{_datadir}/applications/        \
         --delete-original                                       \
-        dialogs/keyboard-settings/xfce-keyboard-settings.desktop
+        ${RPM_BUILD_ROOT}%{_datadir}/applications/xfce-keyboard-settings.desktop
 
-desktop-file-install --vendor "fedora"                          \
+desktop-file-install --vendor ""                                \
         --dir ${RPM_BUILD_ROOT}%{_datadir}/applications/        \
         --delete-original                                       \
-        dialogs/mouse-settings/xfce-mouse-settings.desktop
+        ${RPM_BUILD_ROOT}%{_datadir}/applications/xfce-mouse-settings.desktop
 
-desktop-file-install --vendor "fedora"                          \
+desktop-file-install --vendor ""                                \
         --dir ${RPM_BUILD_ROOT}%{_datadir}/applications/        \
         --delete-original                                       \
-        xfce4-settings-manager/xfce-settings-manager.desktop
+        ${RPM_BUILD_ROOT}%{_datadir}/applications/xfce-settings-manager.desktop
 
-desktop-file-install --vendor "fedora"                          \
+desktop-file-install --vendor ""                                \
         --dir ${RPM_BUILD_ROOT}%{_datadir}/applications/        \
         --delete-original                                       \
-        dialogs/appearance-settings/xfce-ui-settings.desktop
+        ${RPM_BUILD_ROOT}%{_datadir}/applications/xfce-ui-settings.desktop
 
-desktop-file-install --vendor "fedora"                    \
-        --dir ${RPM_BUILD_ROOT}%{_datadir}/applications/  \
+desktop-file-install --vendor ""                                \
+        --dir ${RPM_BUILD_ROOT}%{_datadir}/applications/        \
         --delete-original                                       \
-        dialogs/accessibility-settings/xfce4-accessibility-settings.desktop
+        ${RPM_BUILD_ROOT}%{_datadir}/applications/xfce4-accessibility-settings.desktop
 
-desktop-file-install --vendor "fedora"                    \
-        --dir ${RPM_BUILD_ROOT}%{_datadir}/applications/  \
+desktop-file-install --vendor ""                                \
+        --dir ${RPM_BUILD_ROOT}%{_datadir}/applications/        \
         --delete-original                                       \
-        xfce4-settings-editor/xfce4-settings-editor.desktop
+        ${RPM_BUILD_ROOT}%{_datadir}/applications/xfce4-settings-editor.desktop
 
 %find_lang %{name}
 
@@ -82,7 +91,7 @@
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-%doc
+%doc AUTHORS ChangeLog NEWS TODO COPYING
 %config(noreplace) %{_sysconfdir}/xdg/autostart/xfce4-settings-helper-autostart.desktop
 %dir %{_sysconfdir}/xdg/xfce4
 %dir %{_sysconfdir}/xdg/xfce4/xfconf/
@@ -97,9 +106,16 @@
 %{_bindir}/xfce4-settings-helper
 %{_bindir}/xfce4-settings-manager
 %{_bindir}/xfsettingsd
-%{_datadir}/applications/*.desktop
+%{_datadir}/applications/xfce*.desktop
 
 %changelog
+* Thu Jan 22 2009 Christoph Wickert <cwickert at fedoraproject.org> - 4.5.93-2
+- Add Obsoletes for mcs packages to make sure xfce4-settings gets installed
+- Don't package desktop files twice
+- Require xfconf
+- Use Nodoka theme and Fedora icons
+- Add docs
+
 * Tue Jan 13 2009 Kevin Fenzi <kevin at tummy.com> - 4.5.93-1
 - Update to 4.5.93
 



From hadess at fedoraproject.org  Thu Jan 22 17:03:56 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Thu, 22 Jan 2009 17:03:56 +0000 (UTC)
Subject: rpms/gnome-media/devel gnome-media.spec,1.153,1.154
Message-ID: <20090122170356.47DE770033@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/gnome-media/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20838

Modified Files:
	gnome-media.spec 
Log Message:
Add work-around for fontconfig crasher



Index: gnome-media.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-media/devel/gnome-media.spec,v
retrieving revision 1.153
retrieving revision 1.154
diff -u -r1.153 -r1.154
--- gnome-media.spec	20 Jan 2009 23:38:08 -0000	1.153
+++ gnome-media.spec	22 Jan 2009 17:03:25 -0000	1.154
@@ -45,6 +45,9 @@
 BuildRequires:  gnome-doc-utils
 BuildRequires:  intltool
 
+# Work-around for fontconfig bug https://bugzilla.redhat.com/show_bug.cgi?id=480928
+BuildRequires: liberation-sans-fonts
+
 %description
 This package contains a few media utilities for the GNOME desktop,
 including a sound recorder and an audio mixer.
@@ -77,8 +80,7 @@
 %build
 # try to work around a problem where gst-inspect does 
 # not find playbin the first time around
-DBUS_FATAL_WARNINGS=0 /usr/bin/gst-inspect-0.10 cairotextoverlay
-DBUS_FATAL_WARNINGS=0 /usr/bin/gst-inspect-0.10 --print-all # > /dev/null
+DBUS_FATAL_WARNINGS=0 /usr/bin/gst-inspect-0.10 --print-all > /dev/null
 %configure --disable-schemas-install --enable-gnomecd=no --enable-cddbslave=no
 make #%{?_smp_mflags}
 
@@ -232,6 +234,7 @@
 %{_datadir}/gstreamer-properties
 %{_datadir}/gnome-sound-recorder
 %{_bindir}/*
+%{_datadir}/sounds/gnome/
 
 %files libs -f %{gettext_package}.lang
 %defattr(-, root, root)
@@ -248,6 +251,7 @@
 %changelog
 * Tue Jan 20 2009 - Bastien Nocera <bnocera at redhat.com> - 2.25.5-1
 - Update to 2.25.5
+- Add work-around for fontconfig crasher
 
 * Tue Jan 13 2009 - Bastien Nocera <bnocera at redhat.com> - 2.25.1-6
 - I get paid by the commit, more fixing the scriptlets



From mbarnes at fedoraproject.org  Thu Jan 22 17:09:56 2009
From: mbarnes at fedoraproject.org (Matthew Barnes)
Date: Thu, 22 Jan 2009 17:09:56 +0000 (UTC)
Subject: rpms/gnome-python2-extras/devel gnome-python2-extras.spec, 1.42,
	1.43
Message-ID: <20090122170956.19D8B70033@cvs1.fedora.phx.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/gnome-python2-extras/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21650

Modified Files:
	gnome-python2-extras.spec 
Log Message:
Try again.



Index: gnome-python2-extras.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-python2-extras/devel/gnome-python2-extras.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- gnome-python2-extras.spec	22 Jan 2009 15:57:13 -0000	1.42
+++ gnome-python2-extras.spec	22 Jan 2009 17:09:25 -0000	1.43
@@ -157,7 +157,7 @@
 %files -n gnome-python2-gtkmozembed
 %defattr(-,root,root,-)
 %{python_sitearch}/gtk-2.0/gtkmozembed.so
-%{_datadir}/gtk-doc/html/pygtkmozembed
+%{_datadir}/gtk-doc/html/gtkmozembed
 
 %files -n gnome-python2-gtkspell
 %defattr(-,root,root,-)



From rdieter at fedoraproject.org  Thu Jan 22 17:17:24 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu, 22 Jan 2009 17:17:24 +0000 (UTC)
Subject: rpms/kdepimlibs/devel kdepimlibs.spec,1.68,1.69
Message-ID: <20090122171724.839B070033@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdepimlibs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23306

Modified Files:
	kdepimlibs.spec 
Log Message:
exclude kdepimlibs-apidocs from main pkg



Index: kdepimlibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdepimlibs/devel/kdepimlibs.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- kdepimlibs.spec	22 Jan 2009 11:51:52 -0000	1.68
+++ kdepimlibs.spec	22 Jan 2009 17:16:54 -0000	1.69
@@ -152,9 +152,12 @@
 %{_kde4_datadir}/kde4/servicetypes/*
 %{_kde4_libdir}/lib*.so.*
 %{_kde4_libdir}/kde4/*
+%exclude %{_kde4_libdir}/kde4/devel/
 %{_kde4_libdir}/gpgmepp/
 %{_kde4_docdir}/HTML/en/*
-%exclude %{_kde4_libdir}/kde4/devel/
+%if 0%{?apidocs}
+%exclude %{_kde4_docdir}/HTML/en/kdepimlibs-apidocs/
+%endif
 
 %files devel
 %defattr(-,root,root,-)
@@ -182,6 +185,7 @@
 %changelog
 * Thu Jan 22 2009 Than Ngo <than at redhat.com> - 4.2.0-1
 - 4.2.0
+- exclude kdepimlibs-apidocs from main pkg
 
 * Thu Jan 08 2009 Lorenzo Villani <lvillani at binaryhelix.net> - 4.1.96-2
 - fix build on Fedora 10 (cmake < 2.6.3 seems to have a different



From than at fedoraproject.org  Thu Jan 22 17:29:16 2009
From: than at fedoraproject.org (Than Ngo)
Date: Thu, 22 Jan 2009 17:29:16 +0000 (UTC)
Subject: rpms/kdebindings/devel kdebindings.spec, 1.168,
	1.169 kdebindings-4.1.85-disable-nepomuk-smoke.patch, 1.1, NONE
Message-ID: <20090122172916.6DD1270033@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdebindings/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24996

Modified Files:
	kdebindings.spec 
Removed Files:
	kdebindings-4.1.85-disable-nepomuk-smoke.patch 
Log Message:
enable NepomukSmoke



Index: kdebindings.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebindings/devel/kdebindings.spec,v
retrieving revision 1.168
retrieving revision 1.169
diff -u -r1.168 -r1.169
--- kdebindings.spec	22 Jan 2009 10:43:43 -0000	1.168
+++ kdebindings.spec	22 Jan 2009 17:28:46 -0000	1.169
@@ -33,8 +33,6 @@
 License: GPLv2
 URL: http://developer.kde.org/language-bindings/
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
-# disable NepomukSmoke by default (-DENABLE_NEPOMUK_SMOKE=ON to enable)
-Patch0: kdebindings-4.1.85-disable-nepomuk-smoke.patch
 # upstream patches
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -160,7 +158,6 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .disable-nepomuk-smoke
 
 %build
 mkdir -p %{_target_platform}
@@ -170,7 +167,6 @@
   %{!?csharp:-DBUILD_csharp=OFF} \
   %{!?php:-DBUILD_php=OFF} \
   %{!?ruby:-DBUILD_ruby=OFF} %{?ruby:-DRUBY_SITE_LIB_DIR=%{ruby_sitelib} -DRUBY_SITE_ARCH_DIR=%{ruby_sitearch}} \
-  %{!?smoke:-DBUILD_smoke=OFF} \
   ..
 popd
 
@@ -232,6 +228,7 @@
 %{ruby_sitelib}/okular/
 %{ruby_sitelib}/solid/
 %{ruby_sitelib}/soprano/
+%{ruby_sitelib}/nepomuk/
 %{ruby_sitearch}/akonadi.so
 %{ruby_sitearch}/khtml.so
 %{ruby_sitearch}/korundum4.so
@@ -240,6 +237,7 @@
 %{ruby_sitearch}/plasma_applet.so
 %{ruby_sitearch}/solid.so
 %{ruby_sitearch}/soprano.so
+%{ruby_sitearch}/nepomuk.so
 %{_kde4_libdir}/kde4/krubypluginfactory.so
 %{_kde4_datadir}/applications/kde4/dbpedia_references.desktop
 %{_kde4_appsdir}/dbpedia_references/


--- kdebindings-4.1.85-disable-nepomuk-smoke.patch DELETED ---



From notting at fedoraproject.org  Thu Jan 22 17:34:44 2009
From: notting at fedoraproject.org (Bill Nottingham)
Date: Thu, 22 Jan 2009 17:34:44 +0000 (UTC)
Subject: rpms/libofx/F-9 libofx-version.patch,1.2,1.3 libofx.spec,1.35,1.36
Message-ID: <20090122173445.03E4D70033@cvs1.fedora.phx.redhat.com>

Author: notting

Update of /cvs/extras/rpms/libofx/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25769

Modified Files:
	libofx-version.patch libofx.spec 
Log Message:
Fix versioning some more, using the 0.9.0 code.

This will teach me to touch this code with backports...


libofx-version.patch:

Index: libofx-version.patch
===================================================================
RCS file: /cvs/extras/rpms/libofx/F-9/libofx-version.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- libofx-version.patch	10 Sep 2008 17:55:24 -0000	1.2
+++ libofx-version.patch	22 Jan 2009 17:34:14 -0000	1.3
@@ -1,20 +1,70 @@
---- 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"
-                  "DATA:OFXSGML\r\n"
+--- libofx-0.8.3/lib/ofx_request.cpp	2009-01-22 12:31:08.000000000 -0500
++++ ../devel/libofx-0.9.0/lib/ofx_request.cpp	2009-01-22 12:30:35.000000000 -0500
+@@ -49,19 +49,35 @@
+   return string(buffer);
+ }
+ 
+-string OfxHeader(void)
+-{
+-  return string("OFXHEADER:100\r\n"
+-                 "DATA:OFXSGML\r\n"
 -                 "VERSION:102\r\n"
-+                 "VERSION:103\r\n"
-                  "SECURITY:NONE\r\n"
-                  "ENCODING:USASCII\r\n"
-                  "CHARSET:1252\r\n"
-@@ -77,7 +77,7 @@
+-                 "SECURITY:NONE\r\n"
+-                 "ENCODING:USASCII\r\n"
+-                 "CHARSET:1252\r\n"
+-                 "COMPRESSION:NONE\r\n"
+-                 "OLDFILEUID:NONE\r\n"
+-                 "NEWFILEUID:")
+-                 + time_t_to_ofxdatetime( time(NULL) )
+-                 + string("\r\n\r\n");
++string OfxHeader(const char *hver){
++  if (hver==NULL || hver[0]==0)
++    hver="102";
++
++  if (strcmp(hver, "103")==0)
++    /* TODO: check for differences in version 102 and 103 */
++    return string("OFXHEADER:100\r\n"
++		  "DATA:OFXSGML\r\n"
++		  "VERSION:103\r\n"
++		  "SECURITY:NONE\r\n"
++		  "ENCODING:USASCII\r\n"
++		  "CHARSET:1252\r\n"
++		  "COMPRESSION:NONE\r\n"
++		  "OLDFILEUID:NONE\r\n"
++		  "NEWFILEUID:")
++      + time_t_to_ofxdatetime( time(NULL) )
++      + string("\r\n\r\n");
++  else
++    return string("OFXHEADER:100\r\n"
++		  "DATA:OFXSGML\r\n"
++		  "VERSION:102\r\n"
++		  "SECURITY:NONE\r\n"
++		  "ENCODING:USASCII\r\n"
++		  "CHARSET:1252\r\n"
++		  "COMPRESSION:NONE\r\n"
++		  "OLDFILEUID:NONE\r\n"
++		  "NEWFILEUID:")
++      + time_t_to_ofxdatetime( time(NULL) )
++      + string("\r\n\r\n");
+ }
+ 
+ OfxAggregate OfxRequest::SignOnRequest(void) const
+@@ -77,9 +93,15 @@
+   sonrqTag.Add( "USERPASS", m_login.userpass);
    sonrqTag.Add( "LANGUAGE","ENG");
    sonrqTag.Add( fiTag );
-   sonrqTag.Add( "APPID","QWIN");
+-  sonrqTag.Add( "APPID","QWIN");
 -  sonrqTag.Add( "APPVER","1200");
-+  sonrqTag.Add( "APPVER","1600");
-   
+-  
++  if ( strlen(m_login.appid) > 0 )
++      sonrqTag.Add( "APPID", m_login.appid);
++  else
++      sonrqTag.Add( "APPID","QWIN");
++  if ( strlen(m_login.appver) > 0 )
++    sonrqTag.Add( "APPVER", m_login.appver);
++  else
++    sonrqTag.Add( "APPVER","1400");
++
    OfxAggregate signonmsgTag("SIGNONMSGSRQV1");
    signonmsgTag.Add( sonrqTag );
+ 


Index: libofx.spec
===================================================================
RCS file: /cvs/extras/rpms/libofx/F-9/libofx.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- libofx.spec	10 Sep 2008 17:55:24 -0000	1.35
+++ libofx.spec	22 Jan 2009 17:34:14 -0000	1.36
@@ -3,7 +3,7 @@
 Summary: A library for supporting Open Financial Exchange (OFX)
 Name: libofx
 Version: 0.8.3
-Release: 7
+Release: 8
 Source: http://downloads.sourceforge.net/libofx/%{name}-%{version}.tar.gz
 URL: http://libofx.sourceforge.net/
 Group:	System Environment/Libraries
@@ -99,6 +99,9 @@
 %{_libdir}/*.so
 
 %changelog
+* Thu Jan 22 2009 Bill Nottingham <notting at redhat.com> - 0.8.3-8
+- fix versioning, some more (#481084)
+
 * Wed Sep 10 2008 Bill Nottingham <notting at redhat.com> - 0.8.3-7
 - fix account types patch (#415961, revisited)
 



From notting at fedoraproject.org  Thu Jan 22 17:44:33 2009
From: notting at fedoraproject.org (Bill Nottingham)
Date: Thu, 22 Jan 2009 17:44:33 +0000 (UTC)
Subject: rpms/libofx/F-9 libofx-version.patch,1.3,1.4 libofx.spec,1.36,1.37
Message-ID: <20090122174433.75E9470033@cvs1.fedora.phx.redhat.com>

Author: notting

Update of /cvs/extras/rpms/libofx/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27892

Modified Files:
	libofx-version.patch libofx.spec 
Log Message:
Never mind.

libofx-version.patch:

Index: libofx-version.patch
===================================================================
RCS file: /cvs/extras/rpms/libofx/F-9/libofx-version.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- libofx-version.patch	22 Jan 2009 17:34:14 -0000	1.3
+++ libofx-version.patch	22 Jan 2009 17:44:02 -0000	1.4
@@ -1,70 +1,20 @@
---- libofx-0.8.3/lib/ofx_request.cpp	2009-01-22 12:31:08.000000000 -0500
-+++ ../devel/libofx-0.9.0/lib/ofx_request.cpp	2009-01-22 12:30:35.000000000 -0500
-@@ -49,19 +49,35 @@
-   return string(buffer);
- }
- 
--string OfxHeader(void)
--{
--  return string("OFXHEADER:100\r\n"
--                 "DATA:OFXSGML\r\n"
+--- 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"
+                  "DATA:OFXSGML\r\n"
 -                 "VERSION:102\r\n"
--                 "SECURITY:NONE\r\n"
--                 "ENCODING:USASCII\r\n"
--                 "CHARSET:1252\r\n"
--                 "COMPRESSION:NONE\r\n"
--                 "OLDFILEUID:NONE\r\n"
--                 "NEWFILEUID:")
--                 + time_t_to_ofxdatetime( time(NULL) )
--                 + string("\r\n\r\n");
-+string OfxHeader(const char *hver){
-+  if (hver==NULL || hver[0]==0)
-+    hver="102";
-+
-+  if (strcmp(hver, "103")==0)
-+    /* TODO: check for differences in version 102 and 103 */
-+    return string("OFXHEADER:100\r\n"
-+		  "DATA:OFXSGML\r\n"
-+		  "VERSION:103\r\n"
-+		  "SECURITY:NONE\r\n"
-+		  "ENCODING:USASCII\r\n"
-+		  "CHARSET:1252\r\n"
-+		  "COMPRESSION:NONE\r\n"
-+		  "OLDFILEUID:NONE\r\n"
-+		  "NEWFILEUID:")
-+      + time_t_to_ofxdatetime( time(NULL) )
-+      + string("\r\n\r\n");
-+  else
-+    return string("OFXHEADER:100\r\n"
-+		  "DATA:OFXSGML\r\n"
-+		  "VERSION:102\r\n"
-+		  "SECURITY:NONE\r\n"
-+		  "ENCODING:USASCII\r\n"
-+		  "CHARSET:1252\r\n"
-+		  "COMPRESSION:NONE\r\n"
-+		  "OLDFILEUID:NONE\r\n"
-+		  "NEWFILEUID:")
-+      + time_t_to_ofxdatetime( time(NULL) )
-+      + string("\r\n\r\n");
- }
- 
- OfxAggregate OfxRequest::SignOnRequest(void) const
-@@ -77,9 +93,15 @@
-   sonrqTag.Add( "USERPASS", m_login.userpass);
++                 "VERSION:103\r\n"
+                  "SECURITY:NONE\r\n"
+                  "ENCODING:USASCII\r\n"
+                  "CHARSET:1252\r\n"
+@@ -77,7 +77,7 @@
    sonrqTag.Add( "LANGUAGE","ENG");
    sonrqTag.Add( fiTag );
--  sonrqTag.Add( "APPID","QWIN");
+   sonrqTag.Add( "APPID","QWIN");
 -  sonrqTag.Add( "APPVER","1200");
--  
-+  if ( strlen(m_login.appid) > 0 )
-+      sonrqTag.Add( "APPID", m_login.appid);
-+  else
-+      sonrqTag.Add( "APPID","QWIN");
-+  if ( strlen(m_login.appver) > 0 )
-+    sonrqTag.Add( "APPVER", m_login.appver);
-+  else
-+    sonrqTag.Add( "APPVER","1400");
-+
++  sonrqTag.Add( "APPVER","1600");
+   
    OfxAggregate signonmsgTag("SIGNONMSGSRQV1");
    signonmsgTag.Add( sonrqTag );
- 


Index: libofx.spec
===================================================================
RCS file: /cvs/extras/rpms/libofx/F-9/libofx.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- libofx.spec	22 Jan 2009 17:34:14 -0000	1.36
+++ libofx.spec	22 Jan 2009 17:44:03 -0000	1.37
@@ -3,7 +3,7 @@
 Summary: A library for supporting Open Financial Exchange (OFX)
 Name: libofx
 Version: 0.8.3
-Release: 8
+Release: 7
 Source: http://downloads.sourceforge.net/libofx/%{name}-%{version}.tar.gz
 URL: http://libofx.sourceforge.net/
 Group:	System Environment/Libraries
@@ -99,9 +99,6 @@
 %{_libdir}/*.so
 
 %changelog
-* Thu Jan 22 2009 Bill Nottingham <notting at redhat.com> - 0.8.3-8
-- fix versioning, some more (#481084)
-
 * Wed Sep 10 2008 Bill Nottingham <notting at redhat.com> - 0.8.3-7
 - fix account types patch (#415961, revisited)
 



From rhughes at fedoraproject.org  Thu Jan 22 17:46:06 2009
From: rhughes at fedoraproject.org (Richard Hughes)
Date: Thu, 22 Jan 2009 17:46:06 +0000 (UTC)
Subject: rpms/desktop-file-utils/devel desktop_mime_type.prov, NONE,
	1.1 macros.desktop_mime_type, NONE, 1.1 desktop-file-utils.spec,
	1.50, 1.51 desktop-mime-type.prov, 1.1, NONE
Message-ID: <20090122174606.D9AE470033@cvs1.fedora.phx.redhat.com>

Author: rhughes

Update of /cvs/pkgs/rpms/desktop-file-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28140

Modified Files:
	desktop-file-utils.spec 
Added Files:
	desktop_mime_type.prov macros.desktop_mime_type 
Removed Files:
	desktop-mime-type.prov 
Log Message:
* Thu Jan 22 2009 Richard Hughes <rhughes at redhat.com> - 0.15-4
- Rename desktop-mime-type.prov to desktop_mime_type.prov and add the tiny
  macros.desktop_mime_type file so that we can trivially patch rpm to enable
  this new functionality.



--- NEW FILE desktop_mime_type.prov ---
#!/bin/sh
#
# Script to install in:
# /usr/lib/rpm/redhat/find-provides.d
#
# Transform desktop mimetype info into RPM provides
#
# Author: Richard Hughes <richard at hughsie.com>
# Based on other provides scripts from RPM
#

#!/bin/sh
OLD_IFS="$IFS"
while read instfile ; do
	case "$instfile" in
	*.desktop)
		mime=`cat $instfile | grep MimeType | cut -d'=' -f2`
                IFS=';'
		for type in $mime ; do
		        echo 'mimetype('$type')'
	        done
		;;
	esac
done
IFS=$OLD_IFS



--- NEW FILE macros.desktop_mime_type ---
%__desktop_mime_type_provides  /usr/lib/rpm/desktop_mime_type.prov


Index: desktop-file-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/desktop-file-utils/devel/desktop-file-utils.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- desktop-file-utils.spec	2 May 2008 13:25:52 -0000	1.50
+++ desktop-file-utils.spec	22 Jan 2009 17:45:36 -0000	1.51
@@ -4,7 +4,8 @@
 Release: 3%{?dist}
 URL: http://www.freedesktop.org/software/desktop-file-utils
 Source0: http://www.freedesktop.org/software/desktop-file-utils/releases/%{name}-%{version}.tar.gz
-Source1: desktop-mime-type.prov
+Source1: desktop_mime_type.prov
+Source2: macros.desktop_mime_type
 # https://bugs.freedesktop.org/show_bug.cgi?id=12018
 License: GPLv2+
 Group: Development/Tools
@@ -33,7 +34,8 @@
 make install DESTDIR=$RPM_BUILD_ROOT
 
 # add the provides script
-install -m0755 -D %{SOURCE1} $RPM_BUILD_ROOT%{_libdir}/rpm/desktop-mime-type.prov
+install -m0755 -D %{SOURCE1} $RPM_BUILD_ROOT%{_libdir}/rpm/desktop_mime_type.prov
+install -m0755 -D %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/rpm/macros.desktop_mime_type
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -43,9 +45,15 @@
 %doc AUTHORS COPYING README NEWS
 %{_bindir}/*
 %{_datadir}/emacs/site-lisp/
-%{_libdir}/rpm/desktop-mime-type.prov
+%{_libdir}/rpm/desktop_mime_type.prov
+%{_sysconfdir}/rpm/macros.desktop_mime_type
 
 %changelog
+* Thu Jan 22 2009 Richard Hughes <rhughes at redhat.com> - 0.15-4
+- Rename desktop-mime-type.prov to desktop_mime_type.prov and add the tiny
+  macros.desktop_mime_type file so that we can trivially patch rpm to enable
+  this new functionality.
+
 * Fri May 02 2008 Richard Hughes <rhughes at redhat.com> - 0.15-3
 - Add desktop-mime-type.prov so that we can automatically
   generate mimetype provides for packages at build time.


--- desktop-mime-type.prov DELETED ---



From steved at fedoraproject.org  Thu Jan 22 17:48:14 2009
From: steved at fedoraproject.org (Steve Dickson)
Date: Thu, 22 Jan 2009 17:48:14 +0000 (UTC)
Subject: rpms/libtirpc/devel libtirpc-0.1.10-C++declares.patch, NONE,
	1.1 libtirpc.spec, 1.37, 1.38
Message-ID: <20090122174814.C94FA70033@cvs1.fedora.phx.redhat.com>

Author: steved

Update of /cvs/pkgs/rpms/libtirpc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28529

Modified Files:
	libtirpc.spec 
Added Files:
	libtirpc-0.1.10-C++declares.patch 
Log Message:
Header file fixes for C++



libtirpc-0.1.10-C++declares.patch:

--- NEW FILE libtirpc-0.1.10-C++declares.patch ---
commit 12129663ddc356aed44434aeda28ff1ce2dfc786
Author: Sandeep Josh <sdjres at yahoo.com>
Date:   Thu Jan 22 12:34:19 2009 -0500

    tirpc header file fixes for C++
    
    Added a __THROW to a couple extern declarations.
    
    Signed-off-by: Steve Dickson <steved at redhat.com>

diff --git a/tirpc/rpc/rpc.h b/tirpc/rpc/rpc.h
index 23e3197..f93479e 100644
--- a/tirpc/rpc/rpc.h
+++ b/tirpc/rpc/rpc.h
@@ -83,7 +83,7 @@
 
 __BEGIN_DECLS
 extern int get_myaddress(struct sockaddr_in *);
-extern int bindresvport(int, struct sockaddr_in *);
+extern int bindresvport(int, struct sockaddr_in *) __THROW;
 extern int registerrpc(int, int, int, char *(*)(char [UDPMSGSIZE]),
     xdrproc_t, xdrproc_t);
 extern int callrpc(const char *, int, int, int, xdrproc_t, void *,
diff --git a/tirpc/rpc/rpcent.h b/tirpc/rpc/rpcent.h
index eff86aa..1cee74c 100644
--- a/tirpc/rpc/rpcent.h
+++ b/tirpc/rpc/rpcent.h
@@ -62,8 +62,8 @@ __BEGIN_DECLS
 //extern struct rpcent *getrpcbyname(char *);
 //extern struct rpcent *getrpcbynumber(int);
 //extern struct rpcent *getrpcent(void);
-extern void setrpcent(int);
-extern void endrpcent(void);
+extern void setrpcent(int) __THROW;
+extern void endrpcent(void) __THROW;
 __END_DECLS
 
 #endif /* !_RPC_CENT_H */


Index: libtirpc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libtirpc/devel/libtirpc.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- libtirpc.spec	20 Nov 2008 14:38:35 -0000	1.37
+++ libtirpc.spec	22 Jan 2009 17:47:44 -0000	1.38
@@ -1,6 +1,6 @@
 Name:		   libtirpc
 Version:		0.1.10
-Release:		1%{?dist}
+Release:		2%{?dist}
 Summary:		Transport Independent RPC Library
 Group:		  	System Environment/Libraries
 License:		SISSL
@@ -32,6 +32,7 @@
 
 Patch01: libtirpc-0.1.10-dg-unlock.patch
 Patch02: libtirpc-0.1.10-errmess-unlock.patch
+Patch03: libtirpc-0.1.10-C++declares.patch
 
 Patch100: libtirpc-0.1.7-compile.patch
 
@@ -43,6 +44,8 @@
 %prep
 %setup -q
 %patch01	-p1
+%patch02	-p1
+%patch03	-p1
 
 %patch100	-p1
 
@@ -141,6 +144,9 @@
 %{_mandir}/*/*
 
 %changelog
+* Thu Jan 22 2009 Steve Dickson  <steved at redhat.com> 0.1.10-2
+- Header file fixes for C++
+
 * Thu Nov 20 2008 Steve Dickson  <steved at redhat.com> 0.1.10-1
 - Updated to latest upstream version: 0.1.10
 



From pkgdb at fedoraproject.org  Thu Jan 22 17:48:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Jan 2009 17:48:56 +0000
Subject: [pkgdb] kvm had acl change status
Message-ID: <20090122174856.63C58208482@bastion.fedora.phx.redhat.com>

glommer has set the watchcommits acl on kvm (Fedora 9) to Approved for virtmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kvm



From pkgdb at fedoraproject.org  Thu Jan 22 17:49:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Jan 2009 17:49:38 +0000
Subject: [pkgdb] kvm had acl change status
Message-ID: <20090122174938.29EF920847E@bastion.fedora.phx.redhat.com>

glommer has set the watchcommits acl on kvm (Fedora 10) to Approved for virtmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kvm



From pkgdb at fedoraproject.org  Thu Jan 22 17:50:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Jan 2009 17:50:03 +0000
Subject: [pkgdb] kvm had acl change status
Message-ID: <20090122175003.31401208470@bastion.fedora.phx.redhat.com>

glommer has set the watchcommits acl on kvm (Fedora 10) to Approved for markmc

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kvm



From pkgdb at fedoraproject.org  Thu Jan 22 17:50:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Jan 2009 17:50:04 +0000
Subject: [pkgdb] kvm had acl change status
Message-ID: <20090122175004.C40F620847F@bastion.fedora.phx.redhat.com>

glommer has set the commit acl on kvm (Fedora 10) to Approved for markmc

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kvm



From pkgdb at fedoraproject.org  Thu Jan 22 17:50:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Jan 2009 17:50:08 +0000
Subject: [pkgdb] kvm had acl change status
Message-ID: <20090122175008.AD35C208484@bastion.fedora.phx.redhat.com>

glommer has set the approveacls acl on kvm (Fedora 10) to Approved for markmc

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kvm



From davej at fedoraproject.org  Thu Jan 22 17:51:38 2009
From: davej at fedoraproject.org (Dave Jones)
Date: Thu, 22 Jan 2009 17:51:38 +0000 (UTC)
Subject: rpms/kernel/F-10 config-powerpc-generic, 1.27, 1.28 kernel.spec,
	1.1226, 1.1227
Message-ID: <20090122175138.8B70970033@cvs1.fedora.phx.redhat.com>

Author: davej

Update of /cvs/pkgs/rpms/kernel/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29057

Modified Files:
	config-powerpc-generic kernel.spec 
Log Message:
Disable CONFIG_RELOCATABLE on powerpc[64]


Index: config-powerpc-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/config-powerpc-generic,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- config-powerpc-generic	12 Jan 2009 19:51:27 -0000	1.27
+++ config-powerpc-generic	22 Jan 2009 17:51:08 -0000	1.28
@@ -276,4 +276,5 @@
 
 CONFIG_MSI_BITMAP_SELFTEST=y
 
-CONFIG_RELOCATABLE=y
+# CONFIG_RELOCATABLE is not set
+


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/kernel.spec,v
retrieving revision 1.1226
retrieving revision 1.1227
diff -u -r1.1226 -r1.1227
--- kernel.spec	21 Jan 2009 21:16:02 -0000	1.1226
+++ kernel.spec	22 Jan 2009 17:51:08 -0000	1.1227
@@ -1787,6 +1787,9 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Thu Jan 22 2009 Dave Jones <davej at redhat.com>
+- Disable CONFIG_RELOCATABLE on powerpc[64]
+
 * Wed Jan 21 2009 John W. Linville <linville at redhat.com> 2.6.28.1-19
 - rt2x00: back-port activity LED init patches
 



From rajeeshknambiar at fedoraproject.org  Thu Jan 22 17:54:49 2009
From: rajeeshknambiar at fedoraproject.org (Rajeesh K Nambiar)
Date: Thu, 22 Jan 2009 17:54:49 +0000 (UTC)
Subject: rpms/smc-fonts/devel smc-fonts.spec,1.4,1.5
Message-ID: <20090122175449.0E73D70033@cvs1.fedora.phx.redhat.com>

Author: rajeeshknambiar

Update of /cvs/pkgs/rpms/smc-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29391

Modified Files:
	smc-fonts.spec 
Log Message:

* Thu Jan 22 2009 Rajeesh K Nambiar <rajeeshknambiar at gmail.com> 04.1-4
- change descriptions
- fix bug in kalyani font's obsoleting version number
- move _font_pkg macros next to corresponding packages



Index: smc-fonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/smc-fonts/devel/smc-fonts.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- smc-fonts.spec	17 Jan 2009 05:28:18 -0000	1.4
+++ smc-fonts.spec	22 Jan 2009 17:54:18 -0000	1.5
@@ -3,12 +3,12 @@
 
 # Common description
 %define common_desc \
-The smc-fonts package contains fonts for the display of\
+The SMC Fonts package contains fonts for the display of\
 traditional and new Malayalam Script.
 
 Name:		%{fontname}-fonts
 Version:	04.1
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	Open Type Fonts for Malayalam script
 Group:		User Interface/X
 License:	GPLv3+ with exceptions and GPLv2+ with exceptions and GPLv2+ and  GPLv2
@@ -34,88 +34,89 @@
 Group: User Interface/X 
 Requires: %{name}-common = %{version}-%{release}
 License: GPLv3+ with exceptions
-Obsoletes: %{name}-dyuthi < 04.1-3
+Obsoletes: %{name}-dyuthi < 04.1-4
 %description -n %{fontname}-dyuthi-fonts
-The smc-fonts-dyuthi package contains fonts for the display of
+The Dyuthi font package contains fonts for the display of
 traditional Malayalam Scripts.
 
+%_font_pkg -n dyuthi Dyuthi*.ttf 
+
 %package -n %{fontname}-meera-fonts
 Summary: Open Type Fonts for Malayalam script
 Group: User Interface/X 
 Requires: %{name}-common = %{version}-%{release}
 License: GPLv2+ with exceptions
-Obsoletes: %{name}-meera < 04.1-3
+Obsoletes: %{name}-meera < 04.1-4
 %description -n %{fontname}-meera-fonts
-The smc-fonts-meera package contains fonts for the display of
+The Meera font package contains fonts for the display of
 traditional Malayalam Scripts.
 
+%_font_pkg -n meera -f 90-%{fontname}-fonts.conf Meera*.ttf 
+
 
 %package -n %{fontname}-rachana-fonts
 Summary: Open Type Fonts for Malayalam script
 Group: User Interface/X 
 Requires: %{name}-common = %{version}-%{release}
 License: GPLv2+
-Obsoletes: %{name}-rachana < 04.1-3
+Obsoletes: %{name}-rachana < 04.1-4
 %description -n %{fontname}-rachana-fonts
-The smc-fonts-rachana package contains fonts for the display of
+The Rachana font package contains fonts for the display of
 traditional Malayalam Scripts.
 
+%_font_pkg -n rachana Rachana*.ttf
+
 
 %package -n %{fontname}-raghumalayalam-fonts
 Summary: Open Type Fonts for Malayalam script
 Group: User Interface/X 
 Requires: %{name}-common = %{version}-%{release}
 License: GPLv2
-Obsoletes: %{name}-raghumalayalam < 04.1-3
+Obsoletes: %{name}-raghumalayalam < 04.1-4
 %description -n %{fontname}-raghumalayalam-fonts
-The smc-fonts-malayalam package contains fonts for the display of
+The SMC Malayalam fonts package contains fonts for the display of
 new Malayalam Scripts.
 
+%_font_pkg -n raghumalayalam RaghuMalayalamSans*.ttf
+
 %package -n %{fontname}-suruma-fonts
 Summary: Open Type Fonts for Malayalam script
 Group: User Interface/X 
 Requires: %{name}-common = %{version}-%{release}
 License: GPLv3+ with exceptions
-Obsoletes: %{name}-suruma < 04.1-3
+Obsoletes: %{name}-suruma < 04.1-4
 %description -n %{fontname}-suruma-fonts
-The smc-fonts-suruma package contains fonts for the display of
+The Suruma font package contains fonts for the display of
 traditional Malayalam Scripts.
 
+%_font_pkg -n suruma suruma*.ttf
+
 %package -n %{fontname}-kalyani-fonts
 Summary: Open Type Fonts for Malayalam script
 Group: User Interface/X
 Requires: %{name}-common = %{version}-%{release}
 License: GPLv3+ with exceptions
-Obsoletes: %{name}-kalyani < 04-1.3
+Obsoletes: %{name}-kalyani < 04.1-4
 %description -n %{fontname}-kalyani-fonts
-The smc-fonts-suruma package contains fonts for the display of
+The Kalyani font package contains fonts for the display of
 new Malayalam Scripts.
 
+%_font_pkg -n kalyani Kalyani*.ttf
+
 %package -n %{fontname}-anjalioldlipi-fonts
 Summary: Open Type Fonts for Malayalam script
 Group: User Interface/X
 Requires: %{name}-common = %{version}-%{release}
 License: GPLv3+ with exceptions
-Obsoletes: %{name}-anjalioldlipi < 04.1-3
+Obsoletes: %{name}-anjalioldlipi < 04.1-4
 %description -n %{fontname}-anjalioldlipi-fonts
-The smc-fonts-suruma package contains fonts for the display of
+The Anjali OldLipi package contains fonts for the display of
 traditional Malayalam Scripts.
 
-#%{_fontdir} is shared by following packages since they all are for malayalam script only
-%_font_pkg -n dyuthi Dyuthi*.ttf 
-
-%_font_pkg -n meera -f 90-%{fontname}-fonts.conf Meera*.ttf 
-
-%_font_pkg -n rachana Rachana*.ttf
-
-%_font_pkg -n raghumalayalam RaghuMalayalamSans*.ttf
-
-%_font_pkg -n suruma suruma*.ttf
-
-%_font_pkg -n kalyani Kalyani*.ttf
-
 %_font_pkg -n anjalioldlipi AnjaliOldLipi.ttf
 
+#%{_fontdir} is shared by following packages since they all are for malayalam script only
+
 %prep
 %setup -q -n malayalam-fonts-04
 
@@ -144,6 +145,11 @@
 %dir %{_fontdir}
 
 %changelog
+* Thu Jan 22 2009 Rajeesh K Nambiar <rajeeshknambiar at gmail.com> 04.1-4
+- change descriptions
+- fix bug in kalyani font's obsoleting version number
+- move _font_pkg macros next to corresponding packages
+
 * Sat Jan 17 2009 Rajeesh K Nambiar <rajeeshknambiar at gmail.com> 04.1-3
 - update for new font guidelines
 



From pkgdb at fedoraproject.org  Thu Jan 22 17:56:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Jan 2009 17:56:55 +0000
Subject: [pkgdb] kvm had acl change status
Message-ID: <20090122175655.F302A20847E@bastion.fedora.phx.redhat.com>

glommer has set the watchcommits acl on kvm (Fedora 8) to Approved for virtmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kvm



From tgl at fedoraproject.org  Thu Jan 22 18:00:55 2009
From: tgl at fedoraproject.org (Tom Lane)
Date: Thu, 22 Jan 2009 18:00:55 +0000 (UTC)
Subject: rpms/mysql/devel mysql.spec,1.112,1.113
Message-ID: <20090122180055.32F1970033@cvs1.fedora.phx.redhat.com>

Author: tgl

Update of /cvs/pkgs/rpms/mysql/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30364

Modified Files:
	mysql.spec 
Log Message:
Fix mistaken removal of --with-innodb and --with-ndbcluster


Index: mysql.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mysql/devel/mysql.spec,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -r1.112 -r1.113
--- mysql.spec	22 Jan 2009 15:24:17 -0000	1.112
+++ mysql.spec	22 Jan 2009 18:00:24 -0000	1.113
@@ -1,6 +1,6 @@
 Name: mysql
 Version: 5.1.30
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: MySQL client programs and shared libraries
 Group: Applications/Databases
 URL: http://www.mysql.com
@@ -203,6 +203,8 @@
 	--with-mysqld-user="mysql" \
 	--with-extra-charsets=all \
 	--with-big-tables \
+	--with-innodb \
+	--with-ndbcluster \
 	--enable-local-infile \
 	--enable-largefile \
 	--enable-thread-safe-client \
@@ -631,6 +633,10 @@
 %{_mandir}/man1/mysql_client_test.1*
 
 %changelog
+* Thu Jan 22 2009 Tom Lane <tgl at redhat.com> 5.1.30-2
+- hm, apparently --with-innodb and --with-ndbcluster are still needed
+  even though no longer documented ...
+
 * Thu Jan 22 2009 Tom Lane <tgl at redhat.com> 5.1.30-1
 - Update to MySQL 5.1.30.  Note that this includes an ABI break for
   libmysqlclient (it's now got .so major version 16).



From s4504kr at fedoraproject.org  Thu Jan 22 18:06:41 2009
From: s4504kr at fedoraproject.org (Jochen Schmitt)
Date: Thu, 22 Jan 2009 18:06:41 +0000 (UTC)
Subject: rpms/ksplice/devel .cvsignore, 1.7, 1.8 ksplice.spec, 1.11,
	1.12 sources, 1.7, 1.8
Message-ID: <20090122180641.26B9B70033@cvs1.fedora.phx.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/ksplice/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31184

Modified Files:
	.cvsignore ksplice.spec sources 
Log Message:
New upstream release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ksplice/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	6 Jan 2009 16:26:48 -0000	1.7
+++ .cvsignore	22 Jan 2009 18:06:10 -0000	1.8
@@ -1 +1 @@
-ksplice-0.9.5-src.tar.gz
+ksplice-0.9.6-src.tar.gz


Index: ksplice.spec
===================================================================
RCS file: /cvs/extras/rpms/ksplice/devel/ksplice.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ksplice.spec	6 Jan 2009 16:26:48 -0000	1.11
+++ ksplice.spec	22 Jan 2009 18:06:10 -0000	1.12
@@ -1,5 +1,5 @@
 Name:		ksplice
-Version:	0.9.5
+Version:	0.9.6
 Release:	1%{?dist}
 Summary:	Patching a Linux kernel without reboot
 
@@ -84,6 +84,9 @@
 %doc COPYING README
 
 %changelog
+* Thu Jan 22 2009 Jochen Schmitt <Jochen herr-schmitt de> 0.9.6-1
+- New upstream release
+
 * Tue Jan  6 2009 Jochen Schmitt <Jochen herr-schmitt de> 0.9.5-1
 - New upstream release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ksplice/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	6 Jan 2009 16:26:48 -0000	1.7
+++ sources	22 Jan 2009 18:06:10 -0000	1.8
@@ -1 +1 @@
-05afcb035e76f2b90c49d073ae395c8c  ksplice-0.9.5-src.tar.gz
+67b9da77f2d3248d80ad9c400ba74535  ksplice-0.9.6-src.tar.gz



From s4504kr at fedoraproject.org  Thu Jan 22 18:12:46 2009
From: s4504kr at fedoraproject.org (Jochen Schmitt)
Date: Thu, 22 Jan 2009 18:12:46 +0000 (UTC)
Subject: rpms/ksplice/F-10 ksplice.spec,1.10,1.11 sources,1.7,1.8
Message-ID: <20090122181246.7AA9F70033@cvs1.fedora.phx.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/ksplice/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32033

Modified Files:
	ksplice.spec sources 
Log Message:
New upstream release


Index: ksplice.spec
===================================================================
RCS file: /cvs/extras/rpms/ksplice/F-10/ksplice.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ksplice.spec	6 Jan 2009 16:38:52 -0000	1.10
+++ ksplice.spec	22 Jan 2009 18:12:16 -0000	1.11
@@ -1,5 +1,5 @@
 Name:		ksplice
-Version:	0.9.5
+Version:	0.9.6
 Release:	1%{?dist}
 Summary:	Patching a Linux kernel without reboot
 
@@ -84,6 +84,9 @@
 %doc COPYING README
 
 %changelog
+* Thu Jan 22 2009 Jochen Schmitt <Jochen herr-schmitt de> 0.9.6-1
+- New upstream release
+
 * Tue Jan  6 2009 Jochen Schmitt <Jochen herr-schmitt de> 0.9.5-1
 - New upstream release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ksplice/F-10/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	6 Jan 2009 16:38:53 -0000	1.7
+++ sources	22 Jan 2009 18:12:16 -0000	1.8
@@ -1 +1 @@
-05afcb035e76f2b90c49d073ae395c8c  ksplice-0.9.5-src.tar.gz
+67b9da77f2d3248d80ad9c400ba74535  ksplice-0.9.6-src.tar.gz



From mbarnes at fedoraproject.org  Thu Jan 22 18:15:26 2009
From: mbarnes at fedoraproject.org (Matthew Barnes)
Date: Thu, 22 Jan 2009 18:15:26 +0000 (UTC)
Subject: rpms/gnome-python2-extras/devel gnome-python2-extras.spec, 1.43,
	1.44
Message-ID: <20090122181526.3AA6770141@cvs1.fedora.phx.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/gnome-python2-extras/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv638

Modified Files:
	gnome-python2-extras.spec 
Log Message:
Disable gtkmozembed docs for now.



Index: gnome-python2-extras.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-python2-extras/devel/gnome-python2-extras.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- gnome-python2-extras.spec	22 Jan 2009 17:09:25 -0000	1.43
+++ gnome-python2-extras.spec	22 Jan 2009 18:14:55 -0000	1.44
@@ -157,7 +157,7 @@
 %files -n gnome-python2-gtkmozembed
 %defattr(-,root,root,-)
 %{python_sitearch}/gtk-2.0/gtkmozembed.so
-%{_datadir}/gtk-doc/html/gtkmozembed
+#%{_datadir}/gtk-doc/html/gtkmozembed
 
 %files -n gnome-python2-gtkspell
 %defattr(-,root,root,-)



From limb at fedoraproject.org  Thu Jan 22 18:15:56 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Thu, 22 Jan 2009 18:15:56 +0000 (UTC)
Subject: rpms/lilypond/devel lilypond.spec,1.36,1.37
Message-ID: <20090122181556.817A270141@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/lilypond/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv722

Modified Files:
	lilypond.spec 
Log Message:
More font refinements.



Index: lilypond.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lilypond/devel/lilypond.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- lilypond.spec	21 Jan 2009 15:39:48 -0000	1.36
+++ lilypond.spec	22 Jan 2009 18:15:26 -0000	1.37
@@ -1,6 +1,6 @@
 Name:		lilypond
 Version:	2.12.1
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	A typesetting system for music notation
 
 Group:		Applications/Publishing
@@ -17,7 +17,7 @@
 Obsoletes: 	lilypond-fonts <= 2.12.1-1
 Provides:	lilypond-fonts <= 2.12.1-1
 Requires:	lilypond-aybabtu-fonts = %{version}-%{release}
-Requires:	lilypond-centuryschl-fonts = %{version}-%{release}
+Requires:	lilypond-century-schoolbook-l-fonts = %{version}-%{release}
 Requires:	lilypond-emmentaler-fonts = %{version}-%{release}
 
 Buildrequires:  t1utils bison flex ImageMagick gettext tetex
@@ -38,7 +38,7 @@
 Summary:	Lilypond aybabtu font
 Group:          User Interface/X
 Requires:       fontpackages-filesystem
-Requires:	lilypond = %{version}-%{release}
+Requires:	lilypond-fonts-common = %{version}-%{release}
 
 %description aybabtu-fonts 
 LilyPond is an automated music engraving system. It formats music
@@ -47,24 +47,25 @@
 
 This is the aybabtu font included in the package.
 
-%package centuryschl-fonts
-Summary:        Lilypond CenturySchL fonts
+%package century-schoolbook-l-fonts
+Summary:        Lilypond Century Schoolbook L fonts
 Group:          User Interface/X
 Requires:       fontpackages-filesystem
-Requires:	lilypond = %{version}-%{release}
+Requires:	lilypond-fonts-common = %{version}-%{release}
+Obsoletes:	lilypond-centuryschl-fonts <= 2.12.1-3
 
-%description centuryschl-fonts 
+%description century-schoolbook-l-fonts 
 LilyPond is an automated music engraving system. It formats music
 beautifully and automatically, and has a friendly syntax for its input
 files.
 
-These are the CenturySchL fonts included in the package.
+These are the Century Schoolbook L fonts included in the package.
 
 %package emmentaler-fonts
 Summary:        Lilypond emmentaler fonts
 Group:          User Interface/X
 Requires:       fontpackages-filesystem
-Requires:	lilypond = %{version}-%{release}
+Requires:	lilypond-fonts-common = %{version}-%{release}
 
 %description emmentaler-fonts 
 LilyPond is an automated music engraving system. It formats music
@@ -77,14 +78,14 @@
 Summary:        Lilypond fonts common dir
 Group:          User Interface/X
 Requires:       fontpackages-filesystem
-Requires:	lilypond = %{version}-%{release}
+
 
 %description fonts-common
 LilyPond is an automated music engraving system. It formats music
 beautifully and automatically, and has a friendly syntax for its input
 files.
 
-This contains teh directory common to all lilypond fonts.
+This contains the directory common to all lilypond fonts.
 
 %prep
 %setup -q
@@ -158,7 +159,7 @@
 
 %_font_pkg -n aybabtu aybabtu.otf
 
-%_font_pkg -n centuryschl CenturySchL*otf
+%_font_pkg -n century-schoolbook-l CenturySchL*otf
 
 %_font_pkg -n emmentaler emmentaler*otf
 
@@ -171,6 +172,9 @@
 
 
 %changelog
+* Thu Jan 22 2009 Jon Ciesla <limb at jcomserv.net> - 2.12.1-4
+- More font refinements.
+
 * Wed Jan 21 2009 Jon Ciesla <limb at jcomserv.net> - 2.12.1-3
 - Drop feta-fonts package cruft.
 



From s4504kr at fedoraproject.org  Thu Jan 22 18:17:21 2009
From: s4504kr at fedoraproject.org (Jochen Schmitt)
Date: Thu, 22 Jan 2009 18:17:21 +0000 (UTC)
Subject: rpms/ksplice/F-9 ksplice.spec,1.6,1.7 sources,1.7,1.8
Message-ID: <20090122181721.DCB9470141@cvs1.fedora.phx.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/ksplice/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv930

Modified Files:
	ksplice.spec sources 
Log Message:
New upstream release


Index: ksplice.spec
===================================================================
RCS file: /cvs/extras/rpms/ksplice/F-9/ksplice.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ksplice.spec	6 Jan 2009 16:47:54 -0000	1.6
+++ ksplice.spec	22 Jan 2009 18:16:51 -0000	1.7
@@ -1,5 +1,5 @@
 Name:		ksplice
-Version:	0.9.5
+Version:	0.9.6
 Release:	1%{?dist}
 Summary:	Patching a Linux kernel without reboot
 
@@ -84,6 +84,9 @@
 %doc COPYING README
 
 %changelog
+* Thu Jan 22 2009 Jochen Schmitt <Jochen herr-schmitt de> 0.9.6-1
+- New upstream release
+
 * Tue Jan  6 2009 Jochen Schmitt <Jochen herr-schmitt de> 0.9.5-1
 - New upstream release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ksplice/F-9/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	6 Jan 2009 16:47:54 -0000	1.7
+++ sources	22 Jan 2009 18:16:51 -0000	1.8
@@ -1 +1 @@
-05afcb035e76f2b90c49d073ae395c8c  ksplice-0.9.5-src.tar.gz
+67b9da77f2d3248d80ad9c400ba74535  ksplice-0.9.6-src.tar.gz



From jwboyer at fedoraproject.org  Thu Jan 22 18:34:07 2009
From: jwboyer at fedoraproject.org (Joshua W. Boyer)
Date: Thu, 22 Jan 2009 18:34:07 +0000 (UTC)
Subject: rpms/yaboot/devel yaboot-relocatable-kernel.patch, NONE,
	1.1 yaboot.spec, 1.56, 1.57
Message-ID: <20090122183407.7503070141@cvs1.fedora.phx.redhat.com>

Author: jwboyer

Update of /cvs/pkgs/rpms/yaboot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3504

Modified Files:
	yaboot.spec 
Added Files:
	yaboot-relocatable-kernel.patch 
Log Message:
* Thu Jan 22 2009 Josh Boyer <jwboyer at gmail.com> - 1.3.14-9
- Add patch to handle relocatable kernels


yaboot-relocatable-kernel.patch:

--- NEW FILE yaboot-relocatable-kernel.patch ---
PPC64 relocatable kernels (built with CONFIG_RELOCATABLE=y) have the type of
ET_DYN. But yaboot code won't load the kernel if the ELF type is not
ET_EXEC. Attached patch adds support to yaboot to load relocatable kernels
also (ie load ET_DYN type also)

Signed-off-by: M. Mohan Kumar <mohan at in.ibm.com>
---
 second/yaboot.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- yaboot-1.3.14.orig/second/yaboot.c
+++ yaboot-1.3.14/second/yaboot.c
@@ -1606,7 +1606,7 @@ is_elf64(loadinfo_t *loadinfo)
 	     e->e_ident[EI_MAG3]  == ELFMAG3	    &&
 	     e->e_ident[EI_CLASS] == ELFCLASS64  &&
 	     e->e_ident[EI_DATA]  == ELFDATA2MSB &&
-	     e->e_type            == ET_EXEC	    &&
+	     (e->e_type == ET_EXEC || e->e_type == ET_DYN) &&
 	     e->e_machine         == EM_PPC64);
 }
 


Index: yaboot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/yaboot/devel/yaboot.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- yaboot.spec	27 Nov 2008 15:38:18 -0000	1.56
+++ yaboot.spec	22 Jan 2009 18:33:36 -0000	1.57
@@ -1,7 +1,7 @@
 Summary: Linux bootloader for Power Macintosh "New World" computers.
 Name: yaboot
 Version: 1.3.14
-Release: 8%{?dist}
+Release: 9%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: http://yaboot.ozlabs.org/releases/yaboot-%{version}.tar.gz
@@ -24,6 +24,7 @@
 Patch29: yaboot-1.3.14-baseaddr.patch
 Patch30: yaboot-1.3.14-fix-bootonce-nvram.patch 
 Patch31: yaboot-1.3.14-bigger-max-token.patch
+Patch32: yaboot-relocatable-kernel.patch
 
 URL: http://yaboot.ozlabs.org/
 BuildRoot: %{_tmppath}/%{name}-root
@@ -58,6 +59,7 @@
 %patch29 -p1 -b .baseaddr
 %patch30 -p1 -b .bootonce
 %patch31 -p1 -b .maxtoken
+%patch32 -p1 -b .relocatable
 
 %build
 make VERSIONEXTRA='\ (Red Hat %version-%release)'
@@ -93,6 +95,9 @@
 %ghost %config(noreplace) %{_sysconfdir}/yaboot.conf
 
 %changelog
+* Thu Jan 22 2009 Josh Boyer <jwboyer at gmail.com> - 1.3.14-9
+- Add patch to handle relocatable kernels
+
 * Thu Nov 27 2008 Roman Rakus <rrakus at redhat.com> - 1.3.14-8
 - Bumped release, so preupgrade is now silent and go through
 



From toshio at fedoraproject.org  Thu Jan 22 18:45:40 2009
From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=)
Date: Thu, 22 Jan 2009 18:45:40 +0000 (UTC)
Subject: rpms/pygpgme/devel pygpgme.spec,1.9,1.10 sources,1.2,1.3
Message-ID: <20090122184540.82A0570033@cvs1.fedora.phx.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/pygpgme/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5488

Modified Files:
	pygpgme.spec sources 
Log Message:

* Wed Jan 21 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 0.1-10.20090121bzr54
- Update to upstream snapshot.



Index: pygpgme.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pygpgme/devel/pygpgme.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- pygpgme.spec	29 Nov 2008 04:43:11 -0000	1.9
+++ pygpgme.spec	22 Jan 2009 18:45:10 -0000	1.10
@@ -2,14 +2,29 @@
 
 Name:           pygpgme
 Version:        0.1
-Release:        9%{?dist}
+Release:        10.20090121bzr54%{?dist}
 Summary:        Python module for working with OpenPGP messages
 
 Group:          Development/Languages
 License:        LGPLv2+
 URL:            http://cheeseshop.python.org/pypi/pygpgme/0.1
-Source0:        http://cheeseshop.python.org/packages/source/p/%{name}/%{name}-%{version}.tar.gz
+# pygpgme is being developed for Ubuntu and built for Ubuntu out of
+# launchpad's source control.  So we need to create snapshots.
+# At this time, updated packages from launchpad have fixed tests and support
+# for generating keys
+#
+# Steps to create snapshot:
+# bzr branch lp:pygpgme -r54
+# cd pygpgme
+# patch -p0 < ../pygpgme-examples.patch
+# python setup.py sdist
+# tarball is in dist/pygpgme-0.1.tar.gz
+Source0:        pygpgme-0.1.tar.gz
+#Source0:        http://cheeseshop.python.org/packages/source/p/%{name}/%{name}-%{version}.tar.gz
 Patch0:         pygpgme-0.1-py23.patch
+# Patch to make generating a tarball (sdist) work.  Applied prior to creating
+# the Source0.
+Patch100:       pygpgme-examples.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  python-devel
 BuildRequires:  gpgme-devel
@@ -31,21 +46,34 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
+%{__python} setup.py install --skip-build --root $RPM_BUILD_ROOT
+chmod 0755 $RPM_BUILD_ROOT%{python_sitearch}/gpgme/_gpgme.so
 
-# No need to ship the tests
-rm -rf $RPM_BUILD_ROOT%{python_sitearch}/gpgme/tests/
- 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+### Can't enable the tests because they depend on importing a private key.
+# gpg2 on which our gpgme library depends does not import private keys so this
+# won't work.  The issue in the real world is not so big as we  don't
+# manipulate private keys outside of a keyring that often.
+#%check
+# Use the installed gpgme because it has the built compiled module
+#mv gpgme gpgme.bak
+#ln -s $RPM_BUILD_ROOT%{python_sitearch}/gpgme .
+#python test_all.py
 
 %files
 %defattr(-,root,root,-)
 %doc README PKG-INFO
 %{python_sitearch}/*
+# No need to ship the tests
+%exclude %{python_sitearch}/gpgme/tests/
+
 
 %changelog
+* Wed Jan 21 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 0.1-10.20090121bzr54
+- Update to upstream snapshot.
+
 * Fri Nov 28 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 0.1-9
 - Rebuild for Python 2.6
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pygpgme/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	16 Oct 2006 18:30:02 -0000	1.2
+++ sources	22 Jan 2009 18:45:10 -0000	1.3
@@ -1 +1 @@
-0878d866b6ee8a98a9003a81934ecee3  pygpgme-0.1.tar.gz
+8e5abdf0ec34c48ad6f9a42697704917  pygpgme-0.1.tar.gz



From geoff at fedoraproject.org  Thu Jan 22 18:51:20 2009
From: geoff at fedoraproject.org (Geoffrey Reedy)
Date: Thu, 22 Jan 2009 18:51:20 +0000 (UTC)
Subject: rpms/scala/devel .cvsignore, 1.5, 1.6 scala-buildfile.patch, 1.2,
	1.3 scala.spec, 1.5, 1.6 sources, 1.5, 1.6
Message-ID: <20090122185120.3DFA870033@cvs1.fedora.phx.redhat.com>

Author: geoff

Update of /cvs/pkgs/rpms/scala/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6731

Modified Files:
	.cvsignore scala-buildfile.patch scala.spec sources 
Log Message:
* Wed Jan 21 2009 Geoff Reedy <geoff at programmer-monk.net> - 2.7.3-1
- update to 2.7.3 final



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/scala/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	10 Nov 2008 02:52:18 -0000	1.5
+++ .cvsignore	22 Jan 2009 18:50:49 -0000	1.6
@@ -1,3 +1,3 @@
 fjbg-r15432.tar.bz2
-scala-2.7.2.final-sources.tgz
-msil-2.7.2.final.tar.bz2
+scala-2.7.3.final-sources.tgz
+msil-2.7.3.final.tar.bz2

scala-buildfile.patch:

Index: scala-buildfile.patch
===================================================================
RCS file: /cvs/pkgs/rpms/scala/devel/scala-buildfile.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- scala-buildfile.patch	10 Nov 2008 02:52:18 -0000	1.2
+++ scala-buildfile.patch	22 Jan 2009 18:50:49 -0000	1.3
@@ -1,6 +1,6 @@
---- build.xml.orig	2008-11-09 19:52:10.000000000 -0500
-+++ build.xml	2008-11-09 19:52:21.000000000 -0500
-@@ -126,15 +126,7 @@
+--- build.xml.orig	2009-01-09 09:28:25.000000000 -0700
++++ build.xml	2009-01-21 09:34:20.000000000 -0700
+@@ -160,15 +160,7 @@
      <condition property="os.win">
        <os family="windows"/>
      </condition>
@@ -17,8 +17,8 @@
      <property name="init.avail" value="yes"/>
    <!-- Generating version number -->
      <property file="${basedir}/build.number"/>
-@@ -585,7 +577,6 @@
-       <fileset dir="${build-quick.dir}/classes/compiler"/>
+@@ -627,7 +619,6 @@
+       <!-- filemode / dirmode: see trac ticket #1294 -->
        <zipfileset dirmode="755" filemode="644" src="${fjbg.jar}"/>
        <zipfileset dirmode="755" filemode="644" src="${msil.jar}"/>
 -      <zipfileset dirmode="755" filemode="644" src="${jline.jar}"/>


Index: scala.spec
===================================================================
RCS file: /cvs/pkgs/rpms/scala/devel/scala.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- scala.spec	10 Nov 2008 02:52:18 -0000	1.5
+++ scala.spec	22 Jan 2009 18:50:49 -0000	1.6
@@ -1,5 +1,5 @@
 Name:           scala
-Version:        2.7.2
+Version:        2.7.3
 %define fullversion %{version}.final
 Release:        1%{?dist}
 Summary:        A hybrid functional/object-oriented language for the JVM
@@ -15,8 +15,8 @@
 
 %define msilversion %{fullversion}
 # Exported from upstream vcs
-#   svn export http://lampsvn.epfl.ch/svn-repos/scala/msil/tags/R_2_7_2_final msil-2.7.2.final
-#   tar cjf msil-2.7.2.final.tar.bz2 msil-2.7.2.final
+#   svn export http://lampsvn.epfl.ch/svn-repos/scala/msil/tags/R_2_7_3_final msil-2.7.3.final
+#   tar cjf msil-2.7.3.final.tar.bz2 msil-2.7.3.final
 Source1:      msil-%{msilversion}.tar.bz2
 
 %define fjbgversion r15432
@@ -223,6 +223,9 @@
 %{_datadir}/scala/examples
 
 %changelog
+* Wed Jan 21 2009 Geoff Reedy <geoff at programmer-monk.net> - 2.7.3-1
+- update to 2.7.3 final
+
 * Sun Nov 09 2008 Geoff Reedy <geoff at programmer-monk.net> - 2.7.2-1
 - update to 2.7.2 final
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/scala/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	10 Nov 2008 02:52:18 -0000	1.5
+++ sources	22 Jan 2009 18:50:49 -0000	1.6
@@ -1,3 +1,3 @@
-71e093a619b28db3830c32094d58cc54  scala-2.7.2.final-sources.tgz
-3ad7472fc4709d245b3d53ad3a7aaf91  msil-2.7.2.final.tar.bz2
 b1161674aa074b85f40e8bf26fd14bbc  fjbg-r15432.tar.bz2
+dd71f96782f6e461e97df6bce7e469d2  scala-2.7.3.final-sources.tgz
+cac89cd459f9428d76406f75294f8172  msil-2.7.3.final.tar.bz2



From dwalsh at fedoraproject.org  Thu Jan 22 19:04:28 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Thu, 22 Jan 2009 19:04:28 +0000 (UTC)
Subject: rpms/policycoreutils/devel policycoreutils.spec,1.586,1.587
Message-ID: <20090122190428.45CC770033@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/policycoreutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8874

Modified Files:
	policycoreutils.spec 
Log Message:
* Thu Jan 22 2009 Dan Walsh <dwalsh at redhat.com> 2.0.61-5
- Move sepolgen-ifgen to post python



Index: policycoreutils.spec
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils.spec,v
retrieving revision 1.586
retrieving revision 1.587
diff -u -r1.586 -r1.587
--- policycoreutils.spec	21 Jan 2009 22:16:06 -0000	1.586
+++ policycoreutils.spec	22 Jan 2009 19:03:57 -0000	1.587
@@ -6,7 +6,7 @@
 Summary: SELinux policy core utilities
 Name:	 policycoreutils
 Version: 2.0.61
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPLv2+
 Group:	 System Environment/Base
 Source:	 http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@@ -98,7 +98,8 @@
 Requires: policycoreutils = %{version}-%{release} 
 Requires: libsemanage-python >= %{libsemanagever} libselinux-python
 Requires: audit-libs-python >=  %{libauditver} 
-Requires: python >= 2.6 /usr/bin/make
+Requires: /usr/bin/make
+Requires(pre): python >= 2.6
 
 %description python
 The policycoreutils-python package contains the management tools use to manage an SELinux environment.
@@ -117,6 +118,10 @@
 %dir  /var/lib/selinux
 /var/lib/sepolgen/perm_map
 
+%post python
+[ -f /usr/share/selinux/devel/include/build.conf ] && /usr/bin/sepolgen-ifgen  > /dev/null 
+exit 0
+
 %package newrole
 Summary: The newrole application for RBAC/MLS 
 Group: System Environment/Base
@@ -197,16 +202,21 @@
 
 %post
 /sbin/chkconfig --add restorecond
-[ -f /usr/share/selinux/devel/include/build.conf ] && /usr/bin/sepolgen-ifgen  > /dev/null 
 exit 0
 
 %postun
 if [ "$1" -ge "1" ]; then 
    [ -x /sbin/service ] && /sbin/service restorecond condrestart  > /dev/null
+else
+   [ -x /sbin/service ] && /sbin/service restorecond stop > /dev/null
+   /sbin/chkconfig --del restorecond
 fi
 
 %changelog
-* Tue Jan 21 2009 Dan Walsh <dwalsh at redhat.com> 2.0.61-4
+* Thu Jan 22 2009 Dan Walsh <dwalsh at redhat.com> 2.0.61-5
+- Move sepolgen-ifgen to post python
+
+* Wed Jan 21 2009 Dan Walsh <dwalsh at redhat.com> 2.0.61-4
 - Fix Translations
 
 * Tue Jan 20 2009 Dan Walsh <dwalsh at redhat.com> 2.0.61-3



From remi at fedoraproject.org  Thu Jan 22 19:23:10 2009
From: remi at fedoraproject.org (Remi Collet)
Date: Thu, 22 Jan 2009 19:23:10 +0000 (UTC)
Subject: rpms/php-pear-XML-Parser/devel .cvsignore, 1.5,
	1.6 php-pear-XML-Parser.spec, 1.6, 1.7 sources, 1.5, 1.6
Message-ID: <20090122192310.4A56B70033@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-serv12241

Modified Files:
	.cvsignore php-pear-XML-Parser.spec sources 
Log Message:
update to 1.3.2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php-pear-XML-Parser/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	30 Sep 2008 19:31:48 -0000	1.5
+++ .cvsignore	22 Jan 2009 19:22:39 -0000	1.6
@@ -1 +1 @@
-XML_Parser-1.3.1.tgz
+XML_Parser-1.3.2.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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- php-pear-XML-Parser.spec	30 Sep 2008 19:31:48 -0000	1.6
+++ php-pear-XML-Parser.spec	22 Jan 2009 19:22:39 -0000	1.7
@@ -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.1
+Version:      1.3.2
 Release:      1%{?dist}
 License:      BSD
 Group:        Development/Libraries
@@ -48,15 +48,18 @@
 l'analyseur du gestionnaire d'objets, il n'est donc plus n??cessaire d'??tendre
 XML_Parser pour analyser un document.
 
+
 %prep
 %setup -q -c
 # Package2.xml is v2
 %{_bindir}/php -n %{SOURCE2} package2.xml >CHANGELOG
 mv package2.xml %{pear_name}-%{version}/%{pear_name}.xml
 
+
 %build
 # Empty build section
 
+
 %install
 rm -rf %{buildroot} docdir
 pushd %{pear_name}-%{version}
@@ -83,17 +86,21 @@
 lst=$(find %{buildroot}%{pear_phpdir} -exec grep -q %{buildroot} {} \; -print)
 [ ! -z "$lst" ] && echo "Reference to BUILDROOT in $lst" && exit 1;
 
+
 %clean
 rm -rf %{buildroot}
 
+
 %post
 %{__pear} install --nodeps --soft --force --register-only %{pear_xmldir}/%{pear_name}.xml >/dev/null || :
 
+
 %postun
 if [ "$1" -eq "0" ]; then
     %{__pear} uninstall --nodeps --ignore-errors --register-only %{pear_name} >/dev/null || :
 fi
 
+
 %files
 %defattr(-,root,root,-)
 %doc CHANGELOG docdir/examples
@@ -104,7 +111,11 @@
 
 
 %changelog
+* Thu Jan 22 2009 Remi Collet <Fedora at FamilleCollet.com> 1.3.2-1
+- update to 1.3.2
+
 * Tue Sep 30 2008 Remi Collet <Fedora at FamilleCollet.com> 1.3.1-1
+- update to 1.3.1
 - fix in package.xml (license)
 
 * Fri Aug 29 2008 Remi Collet <Fedora at FamilleCollet.com> 1.3.0-1


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pear-XML-Parser/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	30 Sep 2008 19:31:48 -0000	1.5
+++ sources	22 Jan 2009 19:22:39 -0000	1.6
@@ -1 +1 @@
-1210e440ce8a78c406ee234bd81dfbe5  XML_Parser-1.3.1.tgz
+78d38605bdf53f6406095e76a21adff4  XML_Parser-1.3.2.tgz



From kkofler at fedoraproject.org  Thu Jan 22 19:25:18 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Thu, 22 Jan 2009 19:25:18 +0000 (UTC)
Subject: rpms/kdebindings/devel kdebindings.spec,1.169,1.170
Message-ID: <20090122192518.BCFEA179D1E@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdebindings/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12609/devel

Modified Files:
	kdebindings.spec 
Log Message:
Restore line to allow %define smoke 0 to work. (We %define smoke 1 anyway.)


Index: kdebindings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebindings/devel/kdebindings.spec,v
retrieving revision 1.169
retrieving revision 1.170
diff -u -r1.169 -r1.170
--- kdebindings.spec	22 Jan 2009 17:28:46 -0000	1.169
+++ kdebindings.spec	22 Jan 2009 19:24:48 -0000	1.170
@@ -167,6 +167,7 @@
   %{!?csharp:-DBUILD_csharp=OFF} \
   %{!?php:-DBUILD_php=OFF} \
   %{!?ruby:-DBUILD_ruby=OFF} %{?ruby:-DRUBY_SITE_LIB_DIR=%{ruby_sitelib} -DRUBY_SITE_ARCH_DIR=%{ruby_sitearch}} \
+  %{!?smoke:-DBUILD_smoke=OFF} \
   ..
 popd
 



From langel at fedoraproject.org  Thu Jan 22 19:34:31 2009
From: langel at fedoraproject.org (Lillian Angel)
Date: Thu, 22 Jan 2009 19:34:31 +0000 (UTC)
Subject: rpms/java-1.6.0-openjdk/devel java-1.6.0-openjdk.spec, 1.100,
	1.101 sources, 1.55, 1.56
Message-ID: <20090122193431.A5C23179D1E@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-serv13939

Modified Files:
	java-1.6.0-openjdk.spec sources 
Log Message:
* Thu Jan 22 2009 Lillian Angel <langel at redhat.com> - 1:1.6.0-10.b14
- Updated to icedtea-1.4 snapshot.
- Updated release.
- Removed netbeans and visualvm.
- Resolves: rhbz#472953
- Resolves: rhbz#475081
- Resolves: rhbz#452573
- Resolves: rhbz#477351
- Resolves: rhbz#475109
- Resolves: rhbz#476462




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.100
retrieving revision 1.101
diff -u -r1.100 -r1.101
--- java-1.6.0-openjdk.spec	22 Jan 2009 16:26:00 -0000	1.100
+++ java-1.6.0-openjdk.spec	22 Jan 2009 19:34:01 -0000	1.101
@@ -895,6 +895,9 @@
 - Resolves: rhbz#472953
 - Resolves: rhbz#475081 
 - Resolves: rhbz#452573
+- Resolves: rhbz#477351
+- Resolves: rhbz#475109
+- Resolves: rhbz#476462
 
 * Sun Jan 11 2009 Lillian Angel <langel at redhat.com> - 1:1.6.0-9.b14
 - Removed README.plugin, updated source list.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/devel/sources,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- sources	22 Jan 2009 16:26:00 -0000	1.55
+++ sources	22 Jan 2009 19:34:01 -0000	1.56
@@ -3,4 +3,4 @@
 a9cdc5f050eb6e97c1b15ddd39978710  mauve-2008-10-22.tar.gz
 bd07d61915e403a55a6ef42842b0cf8c  openjdk-6-src-b14-25_nov_2008-fedora.tar.gz
 c8f78d48ac83987bc2adebeebcd354e9  hotspot.tar.gz
-40720784a0409fb14b4048f602ce921b  icedtea6-1.4.tar.gz
+f685665a672e2aaf4863e368b41eac9c  icedtea6-1.4.tar.gz



From langel at fedoraproject.org  Thu Jan 22 19:34:49 2009
From: langel at fedoraproject.org (Lillian Angel)
Date: Thu, 22 Jan 2009 19:34:49 +0000 (UTC)
Subject: rpms/java-1.6.0-openjdk/F-10 java-1.6.0-openjdk.spec, 1.97,
	1.98 sources, 1.50, 1.51
Message-ID: <20090122193449.6E6A0179D1E@cvs1.fedora.phx.redhat.com>

Author: langel

Update of /cvs/pkgs/rpms/java-1.6.0-openjdk/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14001

Modified Files:
	java-1.6.0-openjdk.spec sources 
Log Message:
* Thu Jan 22 2009 Lillian Angel <langel at redhat.com> - 1:1.6.0-10.b14
- Updated to icedtea-1.4 snapshot.
- Updated release.
- Removed netbeans and visualvm.
- Added hotspot source.
- Added --with-hotspot-src-zip build option.
- Set runtests to 1.
- Updated jtreg log.
- Updated openjdkver.
- Updated openjdkdate.
- Added new patch to add GNOME to java.security.
- Resolves: rhbz#472953
- Resolves: rhbz#475081
- Resolves: rhbz#452573
- Resolves: rhbz#474431
- Resolves: rhbz#474503
- Resolves: rhbz#472862
- Resolves: rhbz#477351
- Resolves: rhbz#475109
- Resolves: rhbz#476462




Index: java-1.6.0-openjdk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/F-10/java-1.6.0-openjdk.spec,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -r1.97 -r1.98
--- java-1.6.0-openjdk.spec	22 Jan 2009 16:33:42 -0000	1.97
+++ java-1.6.0-openjdk.spec	22 Jan 2009 19:34:19 -0000	1.98
@@ -905,6 +905,9 @@
 - Resolves: rhbz#474431
 - Resolves: rhbz#474503
 - Resolves: rhbz#472862
+- Resolves: rhbz#477351
+- Resolves: rhbz#475109
+- Resolves: rhbz#476462
 
 * Sun Jan 11 2009 Lillian Angel <langel at redhat.com> - 1:1.6.0-8.b12
 - Removed README.plugin, updated source list.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/F-10/sources,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- sources	22 Jan 2009 16:33:42 -0000	1.50
+++ sources	22 Jan 2009 19:34:19 -0000	1.51
@@ -2,5 +2,5 @@
 1db4280d3228f20ad39ad22382ce2b00  java-access-bridge-1.23.0.tar.gz
 a9cdc5f050eb6e97c1b15ddd39978710  mauve-2008-10-22.tar.gz
 79d9511129158fa4fd3798a506757a5d  openjdk-6-src-b14-25_nov_2008-fedora.tar.gz
-40720784a0409fb14b4048f602ce921b  icedtea6-1.4.tar.gz
 c8f78d48ac83987bc2adebeebcd354e9  hotspot.tar.gz
+f685665a672e2aaf4863e368b41eac9c  icedtea6-1.4.tar.gz



From rdieter at fedoraproject.org  Thu Jan 22 19:38:38 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu, 22 Jan 2009 19:38:38 +0000 (UTC)
Subject: rpms/automoc/devel .cvsignore, 1.6, 1.7 automoc.spec, 1.13,
	1.14 sources, 1.6, 1.7
Message-ID: <20090122193838.82667179D1E@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/automoc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14724

Modified Files:
	.cvsignore automoc.spec sources 
Log Message:
* Thu Jan 22 2009 Rex Dieter <rdieter at fedoraproject.org> 1.0-0.11.rc3
- automoc4-0.9.88 (1.0-rc3)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/automoc/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	22 Dec 2008 00:04:43 -0000	1.6
+++ .cvsignore	22 Jan 2009 19:38:08 -0000	1.7
@@ -1 +1 @@
-automoc4-0.9.87.tar.bz2
+automoc4-0.9.88.tar.bz2


Index: automoc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/automoc/devel/automoc.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- automoc.spec	22 Dec 2008 00:05:37 -0000	1.13
+++ automoc.spec	22 Jan 2009 19:38:08 -0000	1.14
@@ -1,15 +1,15 @@
 #define snaptag .20080527svn811390
-%define beta 0.9.87
-%define beta_tag rc2
+%define beta 0.9.88
+%define beta_tag rc3
 
 Name:           automoc
 Version:        1.0
-Release:        0.9.%{?beta_tag}%{?dist}
+Release:        0.11.%{?beta_tag}%{?dist}
 Summary:        Automatic moc for Qt 4
 Group:          Development/Tools
 License:        BSD
 URL:            http://www.kde.org
-Source0:        ftp://ftp.kde.org/pub/kde/unstable/automoc4/%{beta}/automoc4-%{beta}.tar.bz2
+Source0:        ftp://ftp.kde.org/pub/kde/stable/automoc4/%{beta}/automoc4-%{beta}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Provides: automoc4 = %{beta}
@@ -56,6 +56,9 @@
 
 
 %changelog
+* Thu Jan 22 2009 Rex Dieter <rdieter at fedoraproject.org> 1.0-0.11.rc3
+- automoc4-0.9.88 (1.0-rc3)
+
 * Sat Nov 22 2008 Lorenzo Villani <lvillani at binaryhelix.net> - 1.0-0.10.rc2
 - fix package summary and descriptions (as requested by Richard Hughes)
 - match cmake minimum required version with the contents of CMakeLists.txt


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/automoc/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	22 Dec 2008 00:04:44 -0000	1.6
+++ sources	22 Jan 2009 19:38:08 -0000	1.7
@@ -1 +1 @@
-f7d7fa4e948bfdc720ae4996a1ae07ee  automoc4-0.9.87.tar.bz2
+91bf517cb940109180ecd07bc90c69ec  automoc4-0.9.88.tar.bz2



From josef at fedoraproject.org  Thu Jan 22 19:42:45 2009
From: josef at fedoraproject.org (Josef Bacik)
Date: Thu, 22 Jan 2009 19:42:45 +0000 (UTC)
Subject: rpms/btrfs-progs/devel btrfs-progs-fix-labels.patch, NONE,
	1.1 btrfs-progs.spec, 1.9, 1.10
Message-ID: <20090122194245.6719170033@cvs1.fedora.phx.redhat.com>

Author: josef

Update of /cvs/pkgs/rpms/btrfs-progs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15643

Modified Files:
	btrfs-progs.spec 
Added Files:
	btrfs-progs-fix-labels.patch 
Log Message:
add'ing patch to allow /'s in labels so you can actuall install onto btrfs


btrfs-progs-fix-labels.patch:

--- NEW FILE btrfs-progs-fix-labels.patch ---
diff --git a/mkfs.c b/mkfs.c
index d664254..5ed44cc 100644
--- a/mkfs.c
+++ b/mkfs.c
@@ -302,12 +302,6 @@ static char *parse_label(char *input)
 			BTRFS_LABEL_SIZE);
 		exit(1);
 	}
-	for (i = 0; i < len; i++) {
-		if (input[i] == '/' || input[i] == '\\') {
-			fprintf(stderr, "invalid label %s\n", input);
-			exit(1);
-		}
-	}
 	return strdup(input);
 }
 


Index: btrfs-progs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/btrfs-progs/devel/btrfs-progs.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- btrfs-progs.spec	17 Jan 2009 13:55:44 -0000	1.9
+++ btrfs-progs.spec	22 Jan 2009 19:42:15 -0000	1.10
@@ -1,12 +1,13 @@
 Name:           btrfs-progs
 Version:        0.18
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Userspace programs for btrfs
 
 Group:          System Environment/Base
 License:        GPLv2
 URL:            http://btrfs.wiki.kernel.org/index.php/Main_Page
 Source0:        http://www.kernel.org/pub/linux/kernel/people/mason/btrfs/%{name}-%{version}.tar.bz2
+Patch0: btrfs-progs-fix-labels.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  e2fsprogs-devel, zlib-devel, libacl-devel
@@ -19,6 +20,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 make CFLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags}
@@ -45,6 +47,9 @@
 %{_root_sbindir}/btrfstune
 
 %changelog
+* Thu Jan 22 2009 Josef Bacik <josef at toxicpanda.com> 0.18-2
+- add a patch to handle having /'s in labels
+
 * Sat Jan 17 2009 Josef Bacik <josef at toxicpanda.com> 0.18-1
 - updated to 0.18 because of the ioctl change in 2.6.29-rc2
 



From geoff at fedoraproject.org  Thu Jan 22 19:44:56 2009
From: geoff at fedoraproject.org (Geoffrey Reedy)
Date: Thu, 22 Jan 2009 19:44:56 +0000 (UTC)
Subject: rpms/scala/F-9 .cvsignore, 1.5, 1.6 scala-buildfile.patch, 1.2,
	1.3 scala.spec, 1.5, 1.6 sources, 1.5, 1.6
Message-ID: <20090122194456.1163D70033@cvs1.fedora.phx.redhat.com>

Author: geoff

Update of /cvs/pkgs/rpms/scala/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16187

Modified Files:
	.cvsignore scala-buildfile.patch scala.spec sources 
Log Message:
* Wed Jan 21 2009 Geoff Reedy <geoff at programmer-monk.net> - 2.7.3-1
- update to 2.7.3 final



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/scala/F-9/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	10 Nov 2008 02:58:27 -0000	1.5
+++ .cvsignore	22 Jan 2009 19:44:25 -0000	1.6
@@ -1,3 +1,3 @@
 fjbg-r15432.tar.bz2
-scala-2.7.2.final-sources.tgz
-msil-2.7.2.final.tar.bz2
+scala-2.7.3.final-sources.tgz
+msil-2.7.3.final.tar.bz2

scala-buildfile.patch:

Index: scala-buildfile.patch
===================================================================
RCS file: /cvs/pkgs/rpms/scala/F-9/scala-buildfile.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- scala-buildfile.patch	10 Nov 2008 02:58:27 -0000	1.2
+++ scala-buildfile.patch	22 Jan 2009 19:44:25 -0000	1.3
@@ -1,6 +1,6 @@
---- build.xml.orig	2008-11-09 19:52:10.000000000 -0500
-+++ build.xml	2008-11-09 19:52:21.000000000 -0500
-@@ -126,15 +126,7 @@
+--- build.xml.orig	2009-01-09 09:28:25.000000000 -0700
++++ build.xml	2009-01-21 09:34:20.000000000 -0700
+@@ -160,15 +160,7 @@
      <condition property="os.win">
        <os family="windows"/>
      </condition>
@@ -17,8 +17,8 @@
      <property name="init.avail" value="yes"/>
    <!-- Generating version number -->
      <property file="${basedir}/build.number"/>
-@@ -585,7 +577,6 @@
-       <fileset dir="${build-quick.dir}/classes/compiler"/>
+@@ -627,7 +619,6 @@
+       <!-- filemode / dirmode: see trac ticket #1294 -->
        <zipfileset dirmode="755" filemode="644" src="${fjbg.jar}"/>
        <zipfileset dirmode="755" filemode="644" src="${msil.jar}"/>
 -      <zipfileset dirmode="755" filemode="644" src="${jline.jar}"/>


Index: scala.spec
===================================================================
RCS file: /cvs/pkgs/rpms/scala/F-9/scala.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- scala.spec	10 Nov 2008 02:58:27 -0000	1.5
+++ scala.spec	22 Jan 2009 19:44:25 -0000	1.6
@@ -1,5 +1,5 @@
 Name:           scala
-Version:        2.7.2
+Version:        2.7.3
 %define fullversion %{version}.final
 Release:        1%{?dist}
 Summary:        A hybrid functional/object-oriented language for the JVM
@@ -15,8 +15,8 @@
 
 %define msilversion %{fullversion}
 # Exported from upstream vcs
-#   svn export http://lampsvn.epfl.ch/svn-repos/scala/msil/tags/R_2_7_2_final msil-2.7.2.final
-#   tar cjf msil-2.7.2.final.tar.bz2 msil-2.7.2.final
+#   svn export http://lampsvn.epfl.ch/svn-repos/scala/msil/tags/R_2_7_3_final msil-2.7.3.final
+#   tar cjf msil-2.7.3.final.tar.bz2 msil-2.7.3.final
 Source1:      msil-%{msilversion}.tar.bz2
 
 %define fjbgversion r15432
@@ -223,6 +223,9 @@
 %{_datadir}/scala/examples
 
 %changelog
+* Wed Jan 21 2009 Geoff Reedy <geoff at programmer-monk.net> - 2.7.3-1
+- update to 2.7.3 final
+
 * Sun Nov 09 2008 Geoff Reedy <geoff at programmer-monk.net> - 2.7.2-1
 - update to 2.7.2 final
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/scala/F-9/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	10 Nov 2008 02:58:27 -0000	1.5
+++ sources	22 Jan 2009 19:44:25 -0000	1.6
@@ -1,3 +1,3 @@
-71e093a619b28db3830c32094d58cc54  scala-2.7.2.final-sources.tgz
-3ad7472fc4709d245b3d53ad3a7aaf91  msil-2.7.2.final.tar.bz2
 b1161674aa074b85f40e8bf26fd14bbc  fjbg-r15432.tar.bz2
+dd71f96782f6e461e97df6bce7e469d2  scala-2.7.3.final-sources.tgz
+cac89cd459f9428d76406f75294f8172  msil-2.7.3.final.tar.bz2



From rdieter at fedoraproject.org  Thu Jan 22 19:47:26 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu, 22 Jan 2009 19:47:26 +0000 (UTC)
Subject: rpms/eigen2/F-9 eigen2-svn_checkout.sh, NONE, 1.1 .cvsignore, 1.6, 
	1.7 eigen2.spec, 1.5, 1.6 sources, 1.6, 1.7
Message-ID: <20090122194726.9A6CB70141@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/eigen2/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16885

Modified Files:
	.cvsignore eigen2.spec sources 
Added Files:
	eigen2-svn_checkout.sh 
Log Message:
* Thu Jan 22 2009 Rex Dieter <rdieter at fedoraproject.org> 2.0-0.9.beta6
- eigen-2.0-beta6



--- NEW FILE eigen2-svn_checkout.sh ---
#/bin/sh

DATE=$(date +%Y%m%d)
EXPORT_DIR=eigen2

set -x
rm -rf $EXPORT_DIR
# app
svn export svn://anonsvn.kde.org/home/kde/trunk/kdesupport/eigen2 $EXPORT_DIR/

tar cjf $EXPORT_DIR-${DATE}svn.tar.bz2 $EXPORT_DIR

# cleanup
rm -rf $EXPORT_DIR



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/eigen2/F-9/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	6 Jan 2009 15:50:15 -0000	1.6
+++ .cvsignore	22 Jan 2009 19:46:56 -0000	1.7
@@ -1 +1 @@
-eigen-2.0-beta5.tar.bz2
+eigen-2.0-beta6.tar.bz2


Index: eigen2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eigen2/F-9/eigen2.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- eigen2.spec	6 Jan 2009 15:50:15 -0000	1.5
+++ eigen2.spec	22 Jan 2009 19:46:56 -0000	1.6
@@ -2,17 +2,21 @@
 # Fedora package review
 # http://bugzilla.redhat.com/459705
 
-%define _with_check -DBUILD_TESTS=ON 
-%define pre beta5
+%define _with_check -DEIGEN_BUILD_TESTS:BOOL=ON
+%define pre beta6
+#define snap 20090109
+
 
 Name:    eigen2
 Summary: A lightweight C++ template library for vector and matrix math
 Version: 2.0 
-Release: 0.7.%{pre}%{?dist} 
+Release: 0.9.%{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
+#Source0: eigen2-%{snap}svn.tar.bz2
+Source1: eigen2-svn_checkout.sh
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 
@@ -27,7 +31,16 @@
 BuildRequires: tetex-latex
 %endif
 
-%{?_with_check:BuildRequires: qt4-devel}
+%if 0%{?_with_check:1}
+BuildRequires: blas-devel
+BuildRequires: gsl-devel
+# can't use until undefined symbols are fixed: http://bugzilla.redhat.com/475411
+#BuildRequires: suitesparse-devel
+BuildRequires: qt4-devel
+#-- Could NOT find TAUCS  (missing:  TAUCS_INCLUDES TAUCS_LIBRARIES)
+#-- Could NOT find SUPERLU  (missing:  SUPERLU_INCLUDES SUPERLU_LIBRARIES)
+#-- Could NOT find GOOGLEHASH  (missing:  GOOGLEHASH_INCLUDES)
+%endif
 
 %description
 %{summary}
@@ -82,6 +95,12 @@
 
 
 %changelog
+* Thu Jan 22 2009 Rex Dieter <rdieter at fedoraproject.org> 2.0-0.9.beta6
+- eigen-2.0-beta6
+
+* Fri Jan 09 2009 Rex Dieter <rdieter at fedoraproject.org> 2.0-0.8.20090109svn
+- eigen2-20090109svn snapshot
+
 * Tue Jan 06 2009 Rex Dieter <rdieter at fedoraproject.org> 2.0-0.7.beta5
 - eigen-2.0-beta5
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eigen2/F-9/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	6 Jan 2009 15:50:15 -0000	1.6
+++ sources	22 Jan 2009 19:46:56 -0000	1.7
@@ -1 +1 @@
-1516005412881714f692a9f2c5c061a6  eigen-2.0-beta5.tar.bz2
+4274864abd64be6be1f91cf5afd905dd  eigen-2.0-beta6.tar.bz2



From pmatilai at fedoraproject.org  Thu Jan 22 19:48:04 2009
From: pmatilai at fedoraproject.org (Panu Matilainen)
Date: Thu, 22 Jan 2009 19:48:04 +0000 (UTC)
Subject: rpms/sqlite/devel sqlite-3.6.10-keywords.patch, NONE,
	1.1 sqlite.spec, 1.50, 1.51
Message-ID: <20090122194804.DE8FB70141@cvs1.fedora.phx.redhat.com>

Author: pmatilai

Update of /cvs/pkgs/rpms/sqlite/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17540

Modified Files:
	sqlite.spec 
Added Files:
	sqlite-3.6.10-keywords.patch 
Log Message:
- upstream fix yum breakage caused by new keywords (#481189)


sqlite-3.6.10-keywords.patch:

--- NEW FILE sqlite-3.6.10-keywords.patch ---
diff -up sqlite-3.6.10/src/parse.y.keywords sqlite-3.6.10/src/parse.y
--- sqlite-3.6.10/src/parse.y.keywords	2009-01-15 16:01:46.000000000 +0200
+++ sqlite-3.6.10/src/parse.y	2009-01-22 21:38:42.000000000 +0200
@@ -183,8 +183,8 @@ id(A) ::= ID(X).         {A = X;}
   ABORT AFTER ANALYZE ASC ATTACH BEFORE BEGIN CASCADE CAST CONFLICT
   DATABASE DEFERRED DESC DETACH EACH END EXCLUSIVE EXPLAIN FAIL FOR
   IGNORE IMMEDIATE INITIALLY INSTEAD LIKE_KW MATCH PLAN
-  QUERY KEY OF OFFSET PRAGMA RAISE REPLACE RESTRICT ROW
-  TEMP TRIGGER VACUUM VIEW VIRTUAL
+  QUERY KEY OF OFFSET PRAGMA RAISE RELEASE REPLACE RESTRICT ROW
+  SAVEPOINT TEMP TRIGGER VACUUM VIEW VIRTUAL
 %ifdef SQLITE_OMIT_COMPOUND_SELECT
   EXCEPT INTERSECT UNION
 %endif SQLITE_OMIT_COMPOUND_SELECT
diff -up sqlite-3.6.10/test/table.test.keywords sqlite-3.6.10/test/table.test
--- sqlite-3.6.10/test/table.test.keywords	2008-11-06 00:38:57.000000000 +0200
+++ sqlite-3.6.10/test/table.test	2009-01-22 21:38:42.000000000 +0200
@@ -314,6 +314,14 @@ do_test table-7.3 {
     SELECT * FROM weird;
   }
 } {desc a asc b key 9 14_vac 0 fuzzy_dog_12 xyz begin hi end y'all}
+do_test table-7.3 {
+  execsql {
+    CREATE TABLE savepoint(release);
+    INSERT INTO savepoint(release) VALUES(10);
+    UPDATE savepoint SET release = 5;
+    SELECT release FROM savepoint;
+  }
+} {5}
 
 # Try out the CREATE TABLE AS syntax
 #


Index: sqlite.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sqlite/devel/sqlite.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- sqlite.spec	22 Jan 2009 07:37:44 -0000	1.50
+++ sqlite.spec	22 Jan 2009 19:47:34 -0000	1.51
@@ -6,7 +6,7 @@
 Summary: Library that implements an embeddable SQL database engine
 Name: sqlite
 Version: 3.6.10
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: Public Domain
 Group: 	Applications/Databases
 URL: http://www.sqlite.org/
@@ -15,6 +15,8 @@
 Patch1: sqlite-3.6.6.2-libdl.patch
 # Avoid insecure sprintf(), use a system path for lempar.c, patch from Debian
 Patch2: sqlite-3.6.6.2-lemon-snprintf.patch
+# Upstream fix http://www.sqlite.org/cvstrac/chngview?cn=6186
+Patch3: sqlite-3.6.10-keywords.patch
 Obsoletes: sqlite3 sqlite3-devel
 BuildRequires: ncurses-devel readline-devel glibc-devel
 %if %{with tcl}
@@ -75,6 +77,7 @@
 %setup -q
 %patch1 -p1 -b .libdl
 %patch2 -p1 -b .lemon-sprintf
+%patch3 -p1 -b .keywords
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS -DSQLITE_ENABLE_COLUMN_METADATA=1 -DSQLITE_DISABLE_DIRSYNC=1 -Wall"
@@ -145,6 +148,9 @@
 %endif
 
 %changelog
+* Thu Jan 22 2009 Panu Matilainen <pmatilai at redhat.com> - 3.6.10-2
+- upstream fix yum breakage caused by new keywords (#481189)
+
 * Thu Jan 22 2009 Panu Matilainen <pmatilai at redhat.com> - 3.6.10-1
 - update to 3.6.10
 



From rdieter at fedoraproject.org  Thu Jan 22 19:48:12 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu, 22 Jan 2009 19:48:12 +0000 (UTC)
Subject: rpms/eigen2/F-10 eigen2-svn_checkout.sh, NONE, 1.1 .cvsignore, 1.6, 
	1.7 eigen2.spec, 1.5, 1.6 sources, 1.6, 1.7
Message-ID: <20090122194812.DB1FF70141@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/eigen2/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17669

Modified Files:
	.cvsignore eigen2.spec sources 
Added Files:
	eigen2-svn_checkout.sh 
Log Message:
* Thu Jan 22 2009 Rex Dieter <rdieter at fedoraproject.org> 2.0-0.9.beta6
- eigen-2.0-beta6



--- NEW FILE eigen2-svn_checkout.sh ---
#/bin/sh

DATE=$(date +%Y%m%d)
EXPORT_DIR=eigen2

set -x
rm -rf $EXPORT_DIR
# app
svn export svn://anonsvn.kde.org/home/kde/trunk/kdesupport/eigen2 $EXPORT_DIR/

tar cjf $EXPORT_DIR-${DATE}svn.tar.bz2 $EXPORT_DIR

# cleanup
rm -rf $EXPORT_DIR



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/eigen2/F-10/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	6 Jan 2009 15:49:27 -0000	1.6
+++ .cvsignore	22 Jan 2009 19:47:42 -0000	1.7
@@ -1 +1 @@
-eigen-2.0-beta5.tar.bz2
+eigen-2.0-beta6.tar.bz2


Index: eigen2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eigen2/F-10/eigen2.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- eigen2.spec	6 Jan 2009 15:49:27 -0000	1.5
+++ eigen2.spec	22 Jan 2009 19:47:42 -0000	1.6
@@ -2,17 +2,21 @@
 # Fedora package review
 # http://bugzilla.redhat.com/459705
 
-%define _with_check -DBUILD_TESTS=ON 
-%define pre beta5
+%define _with_check -DEIGEN_BUILD_TESTS:BOOL=ON
+%define pre beta6
+#define snap 20090109
+
 
 Name:    eigen2
 Summary: A lightweight C++ template library for vector and matrix math
 Version: 2.0 
-Release: 0.7.%{pre}%{?dist} 
+Release: 0.9.%{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
+#Source0: eigen2-%{snap}svn.tar.bz2
+Source1: eigen2-svn_checkout.sh
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 
@@ -27,7 +31,16 @@
 BuildRequires: tetex-latex
 %endif
 
-%{?_with_check:BuildRequires: qt4-devel}
+%if 0%{?_with_check:1}
+BuildRequires: blas-devel
+BuildRequires: gsl-devel
+# can't use until undefined symbols are fixed: http://bugzilla.redhat.com/475411
+#BuildRequires: suitesparse-devel
+BuildRequires: qt4-devel
+#-- Could NOT find TAUCS  (missing:  TAUCS_INCLUDES TAUCS_LIBRARIES)
+#-- Could NOT find SUPERLU  (missing:  SUPERLU_INCLUDES SUPERLU_LIBRARIES)
+#-- Could NOT find GOOGLEHASH  (missing:  GOOGLEHASH_INCLUDES)
+%endif
 
 %description
 %{summary}
@@ -82,6 +95,12 @@
 
 
 %changelog
+* Thu Jan 22 2009 Rex Dieter <rdieter at fedoraproject.org> 2.0-0.9.beta6
+- eigen-2.0-beta6
+
+* Fri Jan 09 2009 Rex Dieter <rdieter at fedoraproject.org> 2.0-0.8.20090109svn
+- eigen2-20090109svn snapshot
+
 * Tue Jan 06 2009 Rex Dieter <rdieter at fedoraproject.org> 2.0-0.7.beta5
 - eigen-2.0-beta5
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eigen2/F-10/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	6 Jan 2009 15:49:27 -0000	1.6
+++ sources	22 Jan 2009 19:47:42 -0000	1.7
@@ -1 +1 @@
-1516005412881714f692a9f2c5c061a6  eigen-2.0-beta5.tar.bz2
+4274864abd64be6be1f91cf5afd905dd  eigen-2.0-beta6.tar.bz2



From geoff at fedoraproject.org  Thu Jan 22 19:51:27 2009
From: geoff at fedoraproject.org (Geoffrey Reedy)
Date: Thu, 22 Jan 2009 19:51:27 +0000 (UTC)
Subject: rpms/scala/F-10 .cvsignore, 1.5, 1.6 scala-buildfile.patch, 1.2,
	1.3 scala.spec, 1.5, 1.6 sources, 1.5, 1.6
Message-ID: <20090122195127.E523970141@cvs1.fedora.phx.redhat.com>

Author: geoff

Update of /cvs/pkgs/rpms/scala/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18577

Modified Files:
	.cvsignore scala-buildfile.patch scala.spec sources 
Log Message:
* Wed Jan 21 2009 Geoff Reedy <geoff at programmer-monk.net> - 2.7.3-1
- update to 2.7.3 final



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/scala/F-10/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	10 Nov 2008 02:57:27 -0000	1.5
+++ .cvsignore	22 Jan 2009 19:50:57 -0000	1.6
@@ -1,3 +1,3 @@
 fjbg-r15432.tar.bz2
-scala-2.7.2.final-sources.tgz
-msil-2.7.2.final.tar.bz2
+scala-2.7.3.final-sources.tgz
+msil-2.7.3.final.tar.bz2

scala-buildfile.patch:

Index: scala-buildfile.patch
===================================================================
RCS file: /cvs/pkgs/rpms/scala/F-10/scala-buildfile.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- scala-buildfile.patch	10 Nov 2008 02:57:27 -0000	1.2
+++ scala-buildfile.patch	22 Jan 2009 19:50:57 -0000	1.3
@@ -1,6 +1,6 @@
---- build.xml.orig	2008-11-09 19:52:10.000000000 -0500
-+++ build.xml	2008-11-09 19:52:21.000000000 -0500
-@@ -126,15 +126,7 @@
+--- build.xml.orig	2009-01-09 09:28:25.000000000 -0700
++++ build.xml	2009-01-21 09:34:20.000000000 -0700
+@@ -160,15 +160,7 @@
      <condition property="os.win">
        <os family="windows"/>
      </condition>
@@ -17,8 +17,8 @@
      <property name="init.avail" value="yes"/>
    <!-- Generating version number -->
      <property file="${basedir}/build.number"/>
-@@ -585,7 +577,6 @@
-       <fileset dir="${build-quick.dir}/classes/compiler"/>
+@@ -627,7 +619,6 @@
+       <!-- filemode / dirmode: see trac ticket #1294 -->
        <zipfileset dirmode="755" filemode="644" src="${fjbg.jar}"/>
        <zipfileset dirmode="755" filemode="644" src="${msil.jar}"/>
 -      <zipfileset dirmode="755" filemode="644" src="${jline.jar}"/>


Index: scala.spec
===================================================================
RCS file: /cvs/pkgs/rpms/scala/F-10/scala.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- scala.spec	10 Nov 2008 02:57:27 -0000	1.5
+++ scala.spec	22 Jan 2009 19:50:57 -0000	1.6
@@ -1,5 +1,5 @@
 Name:           scala
-Version:        2.7.2
+Version:        2.7.3
 %define fullversion %{version}.final
 Release:        1%{?dist}
 Summary:        A hybrid functional/object-oriented language for the JVM
@@ -15,8 +15,8 @@
 
 %define msilversion %{fullversion}
 # Exported from upstream vcs
-#   svn export http://lampsvn.epfl.ch/svn-repos/scala/msil/tags/R_2_7_2_final msil-2.7.2.final
-#   tar cjf msil-2.7.2.final.tar.bz2 msil-2.7.2.final
+#   svn export http://lampsvn.epfl.ch/svn-repos/scala/msil/tags/R_2_7_3_final msil-2.7.3.final
+#   tar cjf msil-2.7.3.final.tar.bz2 msil-2.7.3.final
 Source1:      msil-%{msilversion}.tar.bz2
 
 %define fjbgversion r15432
@@ -223,6 +223,9 @@
 %{_datadir}/scala/examples
 
 %changelog
+* Wed Jan 21 2009 Geoff Reedy <geoff at programmer-monk.net> - 2.7.3-1
+- update to 2.7.3 final
+
 * Sun Nov 09 2008 Geoff Reedy <geoff at programmer-monk.net> - 2.7.2-1
 - update to 2.7.2 final
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/scala/F-10/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	10 Nov 2008 02:57:27 -0000	1.5
+++ sources	22 Jan 2009 19:50:57 -0000	1.6
@@ -1,3 +1,3 @@
-71e093a619b28db3830c32094d58cc54  scala-2.7.2.final-sources.tgz
-3ad7472fc4709d245b3d53ad3a7aaf91  msil-2.7.2.final.tar.bz2
 b1161674aa074b85f40e8bf26fd14bbc  fjbg-r15432.tar.bz2
+dd71f96782f6e461e97df6bce7e469d2  scala-2.7.3.final-sources.tgz
+cac89cd459f9428d76406f75294f8172  msil-2.7.3.final.tar.bz2



From rdieter at fedoraproject.org  Thu Jan 22 19:56:58 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu, 22 Jan 2009 19:56:58 +0000 (UTC)
Subject: rpms/kipi-plugins/devel .cvsignore, 1.24, 1.25 kipi-plugins.spec,
	1.78, 1.79 sources, 1.24, 1.25
Message-ID: <20090122195658.7E54170141@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kipi-plugins/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19529

Modified Files:
	.cvsignore kipi-plugins.spec sources 
Log Message:
* Thu Jan 22 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.2.0-0.13.rc1
- kipi-plugins-0.2.0-rc1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kipi-plugins/devel/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- .cvsignore	5 Jan 2009 14:37:36 -0000	1.24
+++ .cvsignore	22 Jan 2009 19:56:27 -0000	1.25
@@ -1 +1 @@
-kipi-plugins-0.2.0-beta6.tar.bz2
+kipi-plugins-0.2.0-rc1.tar.bz2


Index: kipi-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kipi-plugins/devel/kipi-plugins.spec,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- kipi-plugins.spec	21 Jan 2009 19:50:10 -0000	1.78
+++ kipi-plugins.spec	22 Jan 2009 19:56:27 -0000	1.79
@@ -1,11 +1,11 @@
 # Fedora review: http://bugzilla.redhat.com/171504
 
-%define beta beta6
+%define beta rc1
 
 Name:    kipi-plugins
 Summary: Plugins to use with Kipi
 Version: 0.2.0
-Release: 0.12.%{beta}%{?dist}
+Release: 0.13.%{beta}%{?dist}
 
 License: GPLv2+ and Adobe
 Group:   Applications/Multimedia
@@ -150,6 +150,9 @@
 
 
 %changelog
+* Thu Jan 22 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.2.0-0.13.rc1
+- kipi-plugins-0.2.0-rc1
+
 * Wed Jan 21 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.2.0-0.12.beta6
 - update %%description
 - License: +Adobe (DNGConverter)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kipi-plugins/devel/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- sources	5 Jan 2009 14:37:36 -0000	1.24
+++ sources	22 Jan 2009 19:56:28 -0000	1.25
@@ -1 +1 @@
-0442a58f2f9a68163025c205d89269d0  kipi-plugins-0.2.0-beta6.tar.bz2
+2677dc776d0fb5f71a038056114509e8  kipi-plugins-0.2.0-rc1.tar.bz2



From turki at fedoraproject.org  Thu Jan 22 20:01:15 2009
From: turki at fedoraproject.org (Nikolay Vladimirov)
Date: Thu, 22 Jan 2009 20:01:15 +0000 (UTC)
Subject: rpms/libgsasl/EL-5 .cvsignore, 1.2, 1.3 libgsasl.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <20090122200115.96B5D70141@cvs1.fedora.phx.redhat.com>

Author: turki

Update of /cvs/pkgs/rpms/libgsasl/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20406

Modified Files:
	.cvsignore libgsasl.spec sources 
Log Message:
Initial EPEL-5 build


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libgsasl/EL-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	26 Jun 2007 02:12:33 -0000	1.2
+++ .cvsignore	22 Jan 2009 20:00:45 -0000	1.3
@@ -1 +1 @@
-libgsasl-0.2.18.tar.gz
+libgsasl-0.2.29.tar.gz


Index: libgsasl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libgsasl/EL-5/libgsasl.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libgsasl.spec	26 Jun 2007 02:12:33 -0000	1.1
+++ libgsasl.spec	22 Jan 2009 20:00:45 -0000	1.2
@@ -1,10 +1,10 @@
 Name:           libgsasl
-Version:        0.2.18 
-Release:        3%{?dist}
+Version:        0.2.29 
+Release:        1%{?dist}
 Summary:        GNU SASL library 
 
 Group:          System Environment/Libraries
-License:        LGPL     
+License:        LGPLv2+ 
 URL:            http://www.gnu.org/software/gsasl/
 Source0:        http://josefsson.org/gsasl/releases/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -71,12 +71,6 @@
 
 
 %changelog
-* Tue Jun 26 2007 Nikolay Vladimirov <nikolay at vladimiroff.com> - 0.2.18-3
-- added NTLM support
-* Fri Jun 22 2007 Nikolay Vladimirov <nikolay at vladimiroff.com> - 0.2.18-2
-- fixed mixed-use-of-spaces-and-tabs
-- fixed timestamps for header files 
-- edited summary
-* Thu Jun 21 2007 Nikolay Vladimirov <nikolay at vladimiroff.com> - 0.2.18-1
-- initial release
+* Thu Jan 22 2009 Nikolay Vladimirov <nikolay at vladimiroff.com> - 0.2.29-1
+- Initial EPEL-5 build 
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libgsasl/EL-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	26 Jun 2007 02:12:33 -0000	1.2
+++ sources	22 Jan 2009 20:00:45 -0000	1.3
@@ -1 +1 @@
-d118c5a5a9333411ec3d6cb7973b314a  libgsasl-0.2.18.tar.gz
+c38f4bc5ab488a215a09f2d915942482  libgsasl-0.2.29.tar.gz



From rdieter at fedoraproject.org  Thu Jan 22 20:02:27 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu, 22 Jan 2009 20:02:27 +0000 (UTC)
Subject: rpms/digikam/devel .cvsignore, 1.29, 1.30 digikam.spec, 1.81,
	1.82 sources, 1.29, 1.30
Message-ID: <20090122200227.4862E70141@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/digikam/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20669

Modified Files:
	.cvsignore digikam.spec sources 
Log Message:
* Thu Jan 22 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.10-0-0.14.rc1
- digikam-0.10.0-rc1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/digikam/devel/.cvsignore,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- .cvsignore	5 Jan 2009 14:37:18 -0000	1.29
+++ .cvsignore	22 Jan 2009 20:01:56 -0000	1.30
@@ -1 +1 @@
-digikam-0.10.0-beta8.tar.bz2
+digikam-0.10.0-rc1.tar.bz2


Index: digikam.spec
===================================================================
RCS file: /cvs/pkgs/rpms/digikam/devel/digikam.spec,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- digikam.spec	12 Jan 2009 19:04:32 -0000	1.81
+++ digikam.spec	22 Jan 2009 20:01:56 -0000	1.82
@@ -1,8 +1,8 @@
-%define beta beta8
+%define beta rc1 
 
 Name:	 digikam
 Version: 0.10.0
-Release: 0.13.%{beta}%{?dist}
+Release: 0.14.%{beta}%{?dist}
 Summary: A digital camera accessing & photo management application
 
 Group:	 Applications/Multimedia
@@ -19,8 +19,10 @@
 BuildRequires: libkexiv2-devel >= 0.5.0
 BuildRequires: libkipi-devel >= 0.3.0
 BuildRequires: jasper-devel
+%if 0%{?fedora} > 10
 # marble integration, http://bugzilla.redhat.com/470578 
 BuildRequires: kdeedu-devel 
+%endif
 BuildRequires: kdelibs4-devel
 #global kdelibs4_version %((kde4-config --version 2>/dev/null || echo "KDE 4.1.0") | grep ^KDE | cut -d' ' -f2)
 BuildRequires: kdepimlibs-devel
@@ -148,6 +150,9 @@
 
 
 %changelog
+* Thu Jan 22 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.10-0-0.14.rc1
+- digikam-0.10.0-rc1
+
 * Mon Jan 12 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.10-0.13.beta8
 - re-enable marble integration, kde42+ (bug #470578)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/digikam/devel/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- sources	5 Jan 2009 14:37:18 -0000	1.29
+++ sources	22 Jan 2009 20:01:56 -0000	1.30
@@ -1 +1 @@
-1e256ed34d4d7d6b90def644b66f7fa9  digikam-0.10.0-beta8.tar.bz2
+08aaf686bb79ee7aade12075ddb2aca4  digikam-0.10.0-rc1.tar.bz2



From lmacken at fedoraproject.org  Thu Jan 22 20:06:20 2009
From: lmacken at fedoraproject.org (Luke Macken)
Date: Thu, 22 Jan 2009 20:06:20 +0000 (UTC)
Subject: rpms/bodhi/devel .cvsignore, 1.21, 1.22 bodhi.spec, 1.27,
	1.28 sources, 1.23, 1.24
Message-ID: <20090122200620.C4DF970141@cvs1.fedora.phx.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/bodhi/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21252

Modified Files:
	.cvsignore bodhi.spec sources 
Log Message:
0.5.17


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bodhi/devel/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- .cvsignore	5 Jan 2009 23:52:28 -0000	1.21
+++ .cvsignore	22 Jan 2009 20:05:50 -0000	1.22
@@ -1 +1 @@
-bodhi-0.5.16.tar.bz2
+bodhi-0.5.17.tar.bz2


Index: bodhi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bodhi/devel/bodhi.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- bodhi.spec	5 Jan 2009 23:52:29 -0000	1.27
+++ bodhi.spec	22 Jan 2009 20:05:50 -0000	1.28
@@ -2,7 +2,7 @@
 %{!?pyver: %define pyver %(%{__python} -c "import sys ; print sys.version[:3]")}
 
 Name:           bodhi
-Version:        0.5.16
+Version:        0.5.17
 Release:        1%{?dist}
 Summary:        A modular framework that facilitates publishing software updates
 Group:          Applications/Internet
@@ -113,6 +113,9 @@
 
 
 %changelog
+* Thu Jan 22 2009 Luke Macken <lmacken at redhat.com> - 0.5.17-1
+- Latest upstream bugfix release.
+
 * Mon Jan 05 2009 Luke Macken <lmacken at redhat.com> - 0.5.16-1
 - Latest upstream bugfix release.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bodhi/devel/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sources	5 Jan 2009 23:52:29 -0000	1.23
+++ sources	22 Jan 2009 20:05:50 -0000	1.24
@@ -1 +1 @@
-a76e28c05ab3349f538087046b3aac28  bodhi-0.5.16.tar.bz2
+f22a298d3aff0f9e740f810971e5028f  bodhi-0.5.17.tar.bz2



From lmacken at fedoraproject.org  Thu Jan 22 20:07:26 2009
From: lmacken at fedoraproject.org (Luke Macken)
Date: Thu, 22 Jan 2009 20:07:26 +0000 (UTC)
Subject: rpms/bodhi/F-10 .cvsignore, 1.20, 1.21 bodhi.spec, 1.26,
	1.27 sources, 1.22, 1.23
Message-ID: <20090122200726.DABE770141@cvs1.fedora.phx.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/bodhi/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21559

Modified Files:
	.cvsignore bodhi.spec sources 
Log Message:
0.5.17


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bodhi/F-10/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- .cvsignore	12 Jan 2009 23:32:24 -0000	1.20
+++ .cvsignore	22 Jan 2009 20:06:56 -0000	1.21
@@ -1 +1 @@
-bodhi-0.5.16.tar.bz2
+bodhi-0.5.17.tar.bz2


Index: bodhi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bodhi/F-10/bodhi.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- bodhi.spec	12 Jan 2009 23:32:24 -0000	1.26
+++ bodhi.spec	22 Jan 2009 20:06:56 -0000	1.27
@@ -2,7 +2,7 @@
 %{!?pyver: %define pyver %(%{__python} -c "import sys ; print sys.version[:3]")}
 
 Name:           bodhi
-Version:        0.5.16
+Version:        0.5.17
 Release:        1%{?dist}
 Summary:        A modular framework that facilitates publishing software updates
 Group:          Applications/Internet
@@ -113,6 +113,9 @@
 
 
 %changelog
+* Thu Jan 22 2009 Luke Macken <lmacken at redhat.com> - 0.5.17-1
+- Latest upstream bugfix release.
+
 * Mon Jan 05 2009 Luke Macken <lmacken at redhat.com> - 0.5.16-1
 - Latest upstream bugfix release.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bodhi/F-10/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- sources	12 Jan 2009 23:32:24 -0000	1.22
+++ sources	22 Jan 2009 20:06:56 -0000	1.23
@@ -1 +1 @@
-a76e28c05ab3349f538087046b3aac28  bodhi-0.5.16.tar.bz2
+f22a298d3aff0f9e740f810971e5028f  bodhi-0.5.17.tar.bz2



From langel at fedoraproject.org  Thu Jan 22 20:08:27 2009
From: langel at fedoraproject.org (Lillian Angel)
Date: Thu, 22 Jan 2009 20:08:27 +0000 (UTC)
Subject: rpms/java-1.6.0-openjdk/devel sources,1.56,1.57
Message-ID: <20090122200827.DBD1870141@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-serv21863

Modified Files:
	sources 
Log Message:
updated sources




Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/devel/sources,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- sources	22 Jan 2009 19:34:01 -0000	1.56
+++ sources	22 Jan 2009 20:07:57 -0000	1.57
@@ -3,4 +3,4 @@
 a9cdc5f050eb6e97c1b15ddd39978710  mauve-2008-10-22.tar.gz
 bd07d61915e403a55a6ef42842b0cf8c  openjdk-6-src-b14-25_nov_2008-fedora.tar.gz
 c8f78d48ac83987bc2adebeebcd354e9  hotspot.tar.gz
-f685665a672e2aaf4863e368b41eac9c  icedtea6-1.4.tar.gz
+b7b296cf88952e5e96f70a4db8b2b8ad  icedtea6-1.4.tar.gz



From lmacken at fedoraproject.org  Thu Jan 22 20:08:29 2009
From: lmacken at fedoraproject.org (Luke Macken)
Date: Thu, 22 Jan 2009 20:08:29 +0000 (UTC)
Subject: rpms/bodhi/F-9 .cvsignore, 1.17, 1.18 bodhi.spec, 1.25, 1.26 sources,
	1.21, 1.22
Message-ID: <20090122200829.25BB770141@cvs1.fedora.phx.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/bodhi/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21922

Modified Files:
	.cvsignore bodhi.spec sources 
Log Message:
0.5.17


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bodhi/F-9/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- .cvsignore	12 Jan 2009 23:28:23 -0000	1.17
+++ .cvsignore	22 Jan 2009 20:07:58 -0000	1.18
@@ -1 +1 @@
-bodhi-0.5.16.tar.bz2
+bodhi-0.5.17.tar.bz2


Index: bodhi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bodhi/F-9/bodhi.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- bodhi.spec	12 Jan 2009 23:28:23 -0000	1.25
+++ bodhi.spec	22 Jan 2009 20:07:58 -0000	1.26
@@ -2,7 +2,7 @@
 %{!?pyver: %define pyver %(%{__python} -c "import sys ; print sys.version[:3]")}
 
 Name:           bodhi
-Version:        0.5.16
+Version:        0.5.17
 Release:        1%{?dist}
 Summary:        A modular framework that facilitates publishing software updates
 Group:          Applications/Internet
@@ -113,6 +113,9 @@
 
 
 %changelog
+* Thu Jan 22 2009 Luke Macken <lmacken at redhat.com> - 0.5.17-1
+- Latest upstream bugfix release.
+
 * Mon Jan 05 2009 Luke Macken <lmacken at redhat.com> - 0.5.16-1
 - Latest upstream bugfix release.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bodhi/F-9/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sources	12 Jan 2009 23:28:23 -0000	1.21
+++ sources	22 Jan 2009 20:07:58 -0000	1.22
@@ -1 +1 @@
-a76e28c05ab3349f538087046b3aac28  bodhi-0.5.16.tar.bz2
+f22a298d3aff0f9e740f810971e5028f  bodhi-0.5.17.tar.bz2



From langel at fedoraproject.org  Thu Jan 22 20:08:38 2009
From: langel at fedoraproject.org (Lillian Angel)
Date: Thu, 22 Jan 2009 20:08:38 +0000 (UTC)
Subject: rpms/java-1.6.0-openjdk/F-10 sources,1.51,1.52
Message-ID: <20090122200838.EF6F870141@cvs1.fedora.phx.redhat.com>

Author: langel

Update of /cvs/pkgs/rpms/java-1.6.0-openjdk/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21957

Modified Files:
	sources 
Log Message:
updated sources




Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/F-10/sources,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- sources	22 Jan 2009 19:34:19 -0000	1.51
+++ sources	22 Jan 2009 20:08:08 -0000	1.52
@@ -3,4 +3,4 @@
 a9cdc5f050eb6e97c1b15ddd39978710  mauve-2008-10-22.tar.gz
 79d9511129158fa4fd3798a506757a5d  openjdk-6-src-b14-25_nov_2008-fedora.tar.gz
 c8f78d48ac83987bc2adebeebcd354e9  hotspot.tar.gz
-f685665a672e2aaf4863e368b41eac9c  icedtea6-1.4.tar.gz
+b7b296cf88952e5e96f70a4db8b2b8ad  icedtea6-1.4.tar.gz



From pkgdb at fedoraproject.org  Thu Jan 22 20:08:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Jan 2009 20:08:52 +0000
Subject: [pkgdb] squashfs-tools ownership updated
Message-ID: <20090122200852.D74FD20847E@bastion.fedora.phx.redhat.com>

Package squashfs-tools in Fedora devel was orphaned by katzj

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/squashfs-tools



From josef at fedoraproject.org  Thu Jan 22 20:09:53 2009
From: josef at fedoraproject.org (Josef Bacik)
Date: Thu, 22 Jan 2009 20:09:53 +0000 (UTC)
Subject: rpms/btrfs-progs/devel btrfs-progs-fix-labels.patch, 1.1,
	1.2 btrfs-progs.spec, 1.10, 1.11
Message-ID: <20090122200953.EB60A70141@cvs1.fedora.phx.redhat.com>

Author: josef

Update of /cvs/pkgs/rpms/btrfs-progs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22390

Modified Files:
	btrfs-progs-fix-labels.patch btrfs-progs.spec 
Log Message:
fixed the patch so its what is upstream.


btrfs-progs-fix-labels.patch:

Index: btrfs-progs-fix-labels.patch
===================================================================
RCS file: /cvs/pkgs/rpms/btrfs-progs/devel/btrfs-progs-fix-labels.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- btrfs-progs-fix-labels.patch	22 Jan 2009 19:42:15 -0000	1.1
+++ btrfs-progs-fix-labels.patch	22 Jan 2009 20:09:53 -0000	1.2
@@ -1,8 +1,16 @@
 diff --git a/mkfs.c b/mkfs.c
-index d664254..5ed44cc 100644
+index d664254..138bcc9 100644
 --- a/mkfs.c
 +++ b/mkfs.c
-@@ -302,12 +302,6 @@ static char *parse_label(char *input)
+@@ -294,7 +294,6 @@ static u64 parse_profile(char *s)
+ 
+ static char *parse_label(char *input)
+ {
+-	int i;
+ 	int len = strlen(input);
+ 
+ 	if (len > BTRFS_LABEL_SIZE) {
+@@ -302,12 +301,6 @@ static char *parse_label(char *input)
  			BTRFS_LABEL_SIZE);
  		exit(1);
  	}


Index: btrfs-progs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/btrfs-progs/devel/btrfs-progs.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- btrfs-progs.spec	22 Jan 2009 19:42:15 -0000	1.10
+++ btrfs-progs.spec	22 Jan 2009 20:09:53 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           btrfs-progs
 Version:        0.18
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Userspace programs for btrfs
 
 Group:          System Environment/Base
@@ -47,6 +47,9 @@
 %{_root_sbindir}/btrfstune
 
 %changelog
+* Thu Jan 22 2009 Josef Bacik <josef at toxicpanda.com> 0.18-3
+- updated label patch
+
 * Thu Jan 22 2009 Josef Bacik <josef at toxicpanda.com> 0.18-2
 - add a patch to handle having /'s in labels
 



From dwalsh at fedoraproject.org  Thu Jan 22 20:11:18 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Thu, 22 Jan 2009 20:11:18 +0000 (UTC)
Subject: rpms/selinux-policy/devel selinux-policy.spec,1.773,1.774
Message-ID: <20090122201118.E5C6B70141@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22746

Modified Files:
	selinux-policy.spec 
Log Message:
* Thu Jan 22 2009 Dan Walsh <dwalsh at redhat.com> 3.6.3-7
- Remove polgen-ifgen from post and add trigger to policycoreutils-python



Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.773
retrieving revision 1.774
diff -u -r1.773 -r1.774
--- selinux-policy.spec	21 Jan 2009 22:49:23 -0000	1.773
+++ selinux-policy.spec	22 Jan 2009 20:10:48 -0000	1.774
@@ -20,7 +20,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.6.3
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -277,7 +277,6 @@
 	grep -q "^SETLOCALDEFS" /etc/selinux/config || echo -n "
 ">> /etc/selinux/config
 fi
-[ -x /usr/bin/sepolgen-ifgen ] && /usr/bin/sepolgen-ifgen 
 exit 0
 
 %postun
@@ -445,6 +444,9 @@
 %endif
 
 %changelog
+* Thu Jan 22 2009 Dan Walsh <dwalsh at redhat.com> 3.6.3-7
+- Remove polgen-ifgen from post and add trigger to policycoreutils-python
+
 * Wed Jan 21 2009 Dan Walsh <dwalsh at redhat.com> 3.6.3-6
 - Add wm policy
 - Make mls work in graphics mode



From pkgdb at fedoraproject.org  Thu Jan 22 20:17:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Jan 2009 20:17:30 +0000
Subject: [pkgdb] squashfs-tools: kyle has requested approveacls
Message-ID: <20090122201730.F14DB208482@bastion.fedora.phx.redhat.com>

kyle has requested the approveacls acl on squashfs-tools (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/squashfs-tools



From pkgdb at fedoraproject.org  Thu Jan 22 20:17:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Jan 2009 20:17:30 +0000
Subject: [pkgdb] squashfs-tools: kyle has requested commit
Message-ID: <20090122201730.CBACC20847F@bastion.fedora.phx.redhat.com>

kyle has requested the commit acl on squashfs-tools (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/squashfs-tools



From toshio at fedoraproject.org  Thu Jan 22 20:18:14 2009
From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=)
Date: Thu, 22 Jan 2009 20:18:14 +0000 (UTC)
Subject: rpms/pygpgme/devel pygpgme-examples.patch, NONE, 1.1 pygpgme.spec, 
	1.10, 1.11
Message-ID: <20090122201814.CBE1070033@cvs1.fedora.phx.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/pygpgme/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23658

Modified Files:
	pygpgme.spec 
Added Files:
	pygpgme-examples.patch 
Log Message:

* Thu Jan 22 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 0.1-11.20090121bzr54
- Add patch to cvs.


pygpgme-examples.patch:

--- NEW FILE pygpgme-examples.patch ---
=== modified file 'MANIFEST.in'
--- MANIFEST.in	2006-01-18 07:31:13 +0000
+++ MANIFEST.in	2009-01-22 07:03:54 +0000
@@ -1,6 +1,7 @@
 include Makefile
 include MANIFEST.in
 include test_all.py
+recursive-include examples *.py
 
 recursive-include gpgme *.py
 include gpgme/tests/keys/*.pub



Index: pygpgme.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pygpgme/devel/pygpgme.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- pygpgme.spec	22 Jan 2009 18:45:10 -0000	1.10
+++ pygpgme.spec	22 Jan 2009 20:17:44 -0000	1.11
@@ -2,7 +2,7 @@
 
 Name:           pygpgme
 Version:        0.1
-Release:        10.20090121bzr54%{?dist}
+Release:        11.20090121bzr54%{?dist}
 Summary:        Python module for working with OpenPGP messages
 
 Group:          Development/Languages
@@ -71,6 +71,9 @@
 
 
 %changelog
+* Thu Jan 22 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 0.1-11.20090121bzr54
+- Add patch to cvs.
+
 * Wed Jan 21 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 0.1-10.20090121bzr54
 - Update to upstream snapshot.
 



From anyremote at fedoraproject.org  Thu Jan 22 20:23:08 2009
From: anyremote at fedoraproject.org (Mikhail Fedotov)
Date: Thu, 22 Jan 2009 20:23:08 +0000 (UTC)
Subject: rpms/kanyremote/devel import.log, 1.14, 1.15 kanyremote.spec, 1.15, 
	1.16 sources, 1.17, 1.18
Message-ID: <20090122202308.2626770033@cvs1.fedora.phx.redhat.com>

Author: anyremote

Update of /cvs/pkgs/rpms/kanyremote/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25320/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.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- import.log	21 Jan 2009 19:23:59 -0000	1.14
+++ import.log	22 Jan 2009 20:22:37 -0000	1.15
@@ -12,3 +12,4 @@
 kanyremote-5_6-1_fc10:HEAD:kanyremote-5.6-1.fc10.src.rpm:1232486746
 kanyremote-5_6_1-1_fc10:HEAD:kanyremote-5.6.1-1.fc10.src.rpm:1232564258
 kanyremote-5_6_1-2_fc10:HEAD:kanyremote-5.6.1-2.fc10.src.rpm:1232565777
+kanyremote-5_6_1-1_fc10:HEAD:kanyremote-5.6.1-1.fc10.src.rpm:1232655741


Index: kanyremote.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kanyremote/devel/kanyremote.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- kanyremote.spec	21 Jan 2009 19:23:59 -0000	1.15
+++ kanyremote.spec	22 Jan 2009 20:22:37 -0000	1.16
@@ -1,7 +1,7 @@
 Summary: KDE frontend for anyRemote
 Name: kanyremote
 Version: 5.6.1
-Release: 2%{?dist}
+Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/System
 Source0: http://downloads.sourceforge.net/anyremote/%{name}-%{version}.tar.gz
@@ -38,9 +38,6 @@
 
 %changelog
 
-* Wed Jan 21 2009 Mikhail Fedotov <anyremote at mail.ru> - 5.6.1-2
-- correct spec
-
 * Wed Jan 21 2009 Mikhail Fedotov <anyremote at mail.ru> - 5.6.1-1
 - Minor bugfix
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kanyremote/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources	21 Jan 2009 19:23:59 -0000	1.17
+++ sources	22 Jan 2009 20:22:37 -0000	1.18
@@ -1 +1 @@
-f08bd3cc293cf56fb40ee4a784072a7e  kanyremote-5.6.1.tar.gz
+881d4c221f1aac598277066f1e69f559  kanyremote-5.6.1.tar.gz



From pkgdb at fedoraproject.org  Thu Jan 22 20:24:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Jan 2009 20:24:26 +0000
Subject: [pkgdb] squashfs-tools had acl change status
Message-ID: <20090122202426.3551F20847E@bastion.fedora.phx.redhat.com>

katzj has set the watchcommits acl on squashfs-tools (Fedora devel) to Approved for kyle

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/squashfs-tools



From pkgdb at fedoraproject.org  Thu Jan 22 20:24:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Jan 2009 20:24:27 +0000
Subject: [pkgdb] squashfs-tools had acl change status
Message-ID: <20090122202427.4AB9E208481@bastion.fedora.phx.redhat.com>

katzj has set the commit acl on squashfs-tools (Fedora devel) to Approved for kyle

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/squashfs-tools



From dwalsh at fedoraproject.org  Thu Jan 22 20:24:38 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Thu, 22 Jan 2009 20:24:38 +0000 (UTC)
Subject: rpms/policycoreutils/devel policycoreutils.spec,1.587,1.588
Message-ID: <20090122202438.10CAC70033@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/policycoreutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25681

Modified Files:
	policycoreutils.spec 
Log Message:
* Thu Jan 22 2009 Dan Walsh <dwalsh at redhat.com> 2.0.61-5
- Move sepolgen-ifgen to post python



Index: policycoreutils.spec
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils.spec,v
retrieving revision 1.587
retrieving revision 1.588
diff -u -r1.587 -r1.588
--- policycoreutils.spec	22 Jan 2009 19:03:57 -0000	1.587
+++ policycoreutils.spec	22 Jan 2009 20:24:07 -0000	1.588
@@ -82,14 +82,14 @@
 ln -sf consolehelper %{buildroot}%{_bindir}/system-config-selinux
 ln -sf consolehelper %{buildroot}%{_bindir}/selinux-polgengui
 
-desktop-file-install --vendor fedora \
-		     --dir ${RPM_BUILD_ROOT}%{_datadir}/applications	\
-		     --add-category Settings				\
-		     %{SOURCE3}
-
-desktop-file-install --vendor fedora \
-		     --dir ${RPM_BUILD_ROOT}%{_datadir}/applications	\
-		     %{SOURCE6}
+desktop-file-install	--vendor fedora \
+			--dir ${RPM_BUILD_ROOT}%{_datadir}/applications	\
+			--add-category Settings				\
+			%{SOURCE3}
+
+desktop-file-install	--vendor fedora \
+			--dir ${RPM_BUILD_ROOT}%{_datadir}/applications	\
+			%{SOURCE6}
 %find_lang %{name}
 
 %package python
@@ -119,7 +119,11 @@
 /var/lib/sepolgen/perm_map
 
 %post python
-[ -f /usr/share/selinux/devel/include/build.conf ] && /usr/bin/sepolgen-ifgen  > /dev/null 
+[ -f /usr/share/selinux/devel/include/build.conf ] && /usr/bin/sepolgen-ifgen 
+exit 0
+
+%triggerin python -- selinux-policy
+[ -f /usr/share/selinux/devel/include/build.conf ] && /usr/bin/sepolgen-ifgen 
 exit 0
 
 %package newrole
@@ -132,6 +136,7 @@
 or level of a logged in user.
 
 %files newrole
+%defattr(-,root,root)
 %attr(4755,root,root) %{_bindir}/newrole
 %{_mandir}/man1/newrole.1.gz
 
@@ -150,6 +155,7 @@
 system-config-selinux is a utility for managing the SELinux environment
 
 %files gui
+%defattr(-,root,root)
 %{_bindir}/system-config-selinux
 %{_bindir}/selinux-polgengui
 %{_datadir}/applications/fedora-system-config-selinux.desktop
@@ -357,7 +363,7 @@
 	* Ensure that setfiles -p output is newline terminated from Russell Coker.
 
 * Fri Aug 1 2008 Dan Walsh <dwalsh at redhat.com> 2.0.53-3
-- Allow semanage user to add group lists %groupname
+- Allow semanage user to add group lists % groupname
 
 * Tue Jul 29 2008 Dan Walsh <dwalsh at redhat.com> 2.0.53-2
 - Fix help 



From pkgdb at fedoraproject.org  Thu Jan 22 20:24:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 22 Jan 2009 20:24:28 +0000
Subject: [pkgdb] squashfs-tools had acl change status
Message-ID: <20090122202428.44A9B208484@bastion.fedora.phx.redhat.com>

katzj has set the approveacls acl on squashfs-tools (Fedora devel) to Approved for kyle

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/squashfs-tools



From dwalsh at fedoraproject.org  Thu Jan 22 20:26:15 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Thu, 22 Jan 2009 20:26:15 +0000 (UTC)
Subject: rpms/policycoreutils/devel policycoreutils.spec,1.588,1.589
Message-ID: <20090122202615.6FCBE70033@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/policycoreutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26050

Modified Files:
	policycoreutils.spec 
Log Message:
* Thu Jan 22 2009 Dan Walsh <dwalsh at redhat.com> 2.0.61-6
- Move sepolgen-ifgen to post python



Index: policycoreutils.spec
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils.spec,v
retrieving revision 1.588
retrieving revision 1.589
diff -u -r1.588 -r1.589
--- policycoreutils.spec	22 Jan 2009 20:24:07 -0000	1.588
+++ policycoreutils.spec	22 Jan 2009 20:25:45 -0000	1.589
@@ -6,7 +6,7 @@
 Summary: SELinux policy core utilities
 Name:	 policycoreutils
 Version: 2.0.61
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPLv2+
 Group:	 System Environment/Base
 Source:	 http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@@ -219,7 +219,7 @@
 fi
 
 %changelog
-* Thu Jan 22 2009 Dan Walsh <dwalsh at redhat.com> 2.0.61-5
+* Thu Jan 22 2009 Dan Walsh <dwalsh at redhat.com> 2.0.61-6
 - Move sepolgen-ifgen to post python
 
 * Wed Jan 21 2009 Dan Walsh <dwalsh at redhat.com> 2.0.61-4



From krh at fedoraproject.org  Thu Jan 22 20:49:48 2009
From: krh at fedoraproject.org (=?utf-8?q?Kristian_H=C3=B8gsberg?=)
Date: Thu, 22 Jan 2009 20:49:48 +0000 (UTC)
Subject: rpms/mesa/devel mesa.spec,1.214,1.215
Message-ID: <20090122204948.5ECDF70033@cvs1.fedora.phx.redhat.com>

Author: krh

Update of /cvs/pkgs/rpms/mesa/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30078

Modified Files:
	mesa.spec 
Log Message:
* Thu Jan 22 2009 Kristian H??gsberg <krh at redhat.com> 7.3-1
- And now, 7.3.0.



Index: mesa.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mesa/devel/mesa.spec,v
retrieving revision 1.214
retrieving revision 1.215
diff -u -r1.214 -r1.215
--- mesa.spec	20 Jan 2009 20:43:20 -0000	1.214
+++ mesa.spec	22 Jan 2009 20:49:17 -0000	1.215
@@ -1,3 +1,4 @@
+
 # When bootstrapping an arch, omit the -demos subpackage.
 
 # S390 doesn't have video cards, so it's not much use building DRI there.
@@ -14,19 +15,19 @@
 %define manpages gl-manpages-1.0.1
 %define xdriinfo xdriinfo-1.0.2
 %define gitdate 20081220
-%define snapshot -rc3
+#%define snapshot 
 
 Summary: Mesa graphics libraries
 Name: mesa
 Version: 7.3
-Release: 0.5%{?dist}
+Release: 1%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.mesa3d.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Source0: http://www.mesa3d.org/beta/MesaLib-7.3-rc3.tar.gz
-Source1: http://www.mesa3d.org/beta/MesaDemos-7.3-rc3.tar.gz
+Source0: http://www.mesa3d.org/beta/MesaLib-%{version}%{?snapshot}.tar.bz2
+Source1: http://www.mesa3d.org/beta/MesaDemos-%{version}%{?snapshot}.tar.bz2
 #Source0: %{name}-%{gitdate}.tar.bz2
 #Source2: %{manpages}.tar.bz2
 Source3: make-git-snapshot.sh
@@ -167,7 +168,7 @@
 
 
 %prep
-%setup -q -n Mesa-%{version}%{snapshot} -b0 -b1
+%setup -q -n Mesa-%{version}%{?snapshot} -b0 -b1
 #%setup -q -n mesa-%{gitdate} -b2 -b5
 %patch0 -p1 -b .osmesa
 %patch2 -p1 -b .intel-glthread
@@ -420,6 +421,9 @@
 %{_libdir}/mesa-demos-data
 
 %changelog
+* Thu Jan 22 2009 Kristian H??gsberg <krh at redhat.com> 7.3-1
+- And now, 7.3.0.
+
 * Tue Jan 20 2009 Kristian H??gsberg <krh at redhat.com> 7.3-0.5
 - Update to 7.3.0 rc3.
 



From sdz at fedoraproject.org  Thu Jan 22 20:53:10 2009
From: sdz at fedoraproject.org (Sebastian Dziallas)
Date: Thu, 22 Jan 2009 20:53:10 +0000 (UTC)
Subject: rpms/avogadro/devel avogadro.spec,1.1,1.2
Message-ID: <20090122205310.39AC870033@cvs1.fedora.phx.redhat.com>

Author: sdz

Update of /cvs/pkgs/rpms/avogadro/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30484

Modified Files:
	avogadro.spec 
Log Message:
Update to 0.9.0



Index: avogadro.spec
===================================================================
RCS file: /cvs/pkgs/rpms/avogadro/devel/avogadro.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- avogadro.spec	16 Sep 2008 05:20:08 -0000	1.1
+++ avogadro.spec	22 Jan 2009 20:52:39 -0000	1.2
@@ -1,7 +1,7 @@
 Name:           avogadro
-Version:        0.8.1
-Release:        6%{?dist}
-Summary:        Avogadro is an advanced Molecular editor
+Version:        0.9.0
+Release:        1%{?dist}
+Summary:        An advanced molecular editor for chemical purposes
 
 Group:          Applications/Editors
 License:        GPLv2
@@ -10,20 +10,19 @@
 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:  cmake >= 2.6.0
+BuildRequires:  qt-devel >= 4.4.0
+BuildRequires:  eigen2-devel >= 2.0-0.9.beta6
 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,
+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
+and related areas, which offers flexible rendering and
 a powerful plugin architecture.
 
 
@@ -109,6 +108,9 @@
 
 
 %changelog
+* Thu Jan 22 2009 Sebastian Dziallas <sebastian at when.com> 0.9.0-1
+- update to new release
+
 * Sun Sep 14 2008 Sebastian Dziallas <sebastian at when.com> 0.8.1-6
 - add handbook to docs
 



From sdz at fedoraproject.org  Thu Jan 22 21:00:29 2009
From: sdz at fedoraproject.org (Sebastian Dziallas)
Date: Thu, 22 Jan 2009 21:00:29 +0000 (UTC)
Subject: rpms/avogadro/devel .cvsignore,1.2,1.3 sources,1.2,1.3
Message-ID: <20090122210029.B9C7970033@cvs1.fedora.phx.redhat.com>

Author: sdz

Update of /cvs/pkgs/rpms/avogadro/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31246

Modified Files:
	.cvsignore sources 
Log Message:
Fix update to 0.9.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/avogadro/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	16 Sep 2008 05:20:07 -0000	1.2
+++ .cvsignore	22 Jan 2009 20:59:59 -0000	1.3
@@ -1 +1 @@
-avogadro-0.8.1.tar.bz2
+avogadro-0.9.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/avogadro/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	16 Sep 2008 05:20:08 -0000	1.2
+++ sources	22 Jan 2009 20:59:59 -0000	1.3
@@ -1 +1 @@
-a74d11a9a8240d018db8638e82dd915c  avogadro-0.8.1.tar.bz2
+ee4b33dc12c92429bee1ba45787d8b5b  avogadro-0.9.0.tar.bz2



From dwayne at fedoraproject.org  Thu Jan 22 21:01:36 2009
From: dwayne at fedoraproject.org (Dwayne Bailey)
Date: Thu, 22 Jan 2009 21:01:36 +0000 (UTC)
Subject: rpms/translate-toolkit/devel .cvsignore, 1.11, 1.12 sources, 1.12, 
	1.13 translate-toolkit.spec, 1.23, 1.24
Message-ID: <20090122210136.53C5C70033@cvs1.fedora.phx.redhat.com>

Author: dwayne

Update of /cvs/pkgs/rpms/translate-toolkit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31815

Modified Files:
	.cvsignore sources translate-toolkit.spec 
Log Message:
* Thu Jan 22 2009 Dwayne Bailey <dwayne at translate.org.za> - 1.3.0-0.1.beta1
- Update to 1.3.0 beta1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/translate-toolkit/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	6 Dec 2008 13:26:01 -0000	1.11
+++ .cvsignore	22 Jan 2009 21:01:05 -0000	1.12
@@ -1 +1 @@
-translate-toolkit-1.2.1.tar.bz2
+translate-toolkit-1.3beta1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/translate-toolkit/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	6 Dec 2008 13:26:01 -0000	1.12
+++ sources	22 Jan 2009 21:01:05 -0000	1.13
@@ -1 +1 @@
-2258bdf79d011c0e8415592363a9683e  translate-toolkit-1.2.1.tar.bz2
+4d91ad46c09c926258ac52edb1c9a993  translate-toolkit-1.3beta1.tar.bz2


Index: translate-toolkit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/translate-toolkit/devel/translate-toolkit.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- translate-toolkit.spec	6 Dec 2008 20:16:36 -0000	1.23
+++ translate-toolkit.spec	22 Jan 2009 21:01:05 -0000	1.24
@@ -1,14 +1,15 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           translate-toolkit
-Version:        1.2.1
-Release:        1%{?dist}
+Version:        1.3.0
+Release:        0.1.beta1%{?dist}
 Summary:        Tools to assist with translation and software localization
 
 Group:          Development/Tools
 License:        GPLv2+
 URL:            http://translate.sourceforge.net/wiki/toolkit/index
-Source0:        http://downloads.sourceforge.net/translate/%{name}-%{version}.tar.bz2
+#Source0:        http://downloads.sourceforge.net/translate/%{name}-%{version}.tar.bz2
+Source0:        http://translate.sourceforge.net/snapshots/translate-toolkit-1.3beta1/translate-toolkit-1.3beta1.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Patch0:         translate-toolkit-1.2.1-stoplist.patch
@@ -58,7 +59,7 @@
 
 
 %prep
-%setup -q
+%setup -q -n %{name}-1.3beta1
 %patch0 -p1
 
 
@@ -116,6 +117,9 @@
 
 
 %changelog
+* Thu Jan 22 2009 Dwayne Bailey <dwayne at translate.org.za> - 1.3.0-0.1.beta1
+- Update to 1.3.0 beta1
+
 * Sat Dec 6 2008 Dwayne Bailey <dwayne at translate.org.za> - 1.2.1-1
 - Update to 1.2.1
 - Refresh poterminology patch



From jjames at fedoraproject.org  Thu Jan 22 21:03:44 2009
From: jjames at fedoraproject.org (Jerry James)
Date: Thu, 22 Jan 2009 21:03:44 +0000 (UTC)
Subject: rpms/cudd/F-9 cudd-2.4.1-64bit.patch, NONE,
	1.1 cudd-2.4.1-init.patch, NONE, 1.1 cudd-2.4.1-retval.patch, NONE,
	1.1 cudd-2.4.1-sharedlib.patch, NONE,
	1.1 cudd-2.4.1-signedness.patch, NONE,
	1.1 cudd-2.4.1-strcat.patch, NONE, 1.1 cudd.spec, 1.1, 1.2
Message-ID: <20090122210344.12EB570033@cvs1.fedora.phx.redhat.com>

Author: jjames

Update of /cvs/pkgs/rpms/cudd/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32285/F-9

Modified Files:
	cudd.spec 
Added Files:
	cudd-2.4.1-64bit.patch cudd-2.4.1-init.patch 
	cudd-2.4.1-retval.patch cudd-2.4.1-sharedlib.patch 
	cudd-2.4.1-signedness.patch cudd-2.4.1-strcat.patch 
Log Message:
* Thu Jan 22 2009 Jerry James <loganjerry at gmail.com> - 2.4.1-3
- Add patches to address various minor build infelicities
- Build both shared and static libraries
- Install the test binary, nanotrav, and its man page
- Gather documentation from all of the subdirectories


cudd-2.4.1-64bit.patch:

--- NEW FILE cudd-2.4.1-64bit.patch ---
diff -dur cudd-2.4.1.ORIG/cudd/cudd.h cudd-2.4.1/cudd/cudd.h
--- cudd-2.4.1.ORIG/cudd/cudd.h	2005-05-18 00:08:59.000000000 -0600
+++ cudd-2.4.1/cudd/cudd.h	2007-10-18 16:44:37.000000000 -0600
@@ -61,6 +61,7 @@
 /* Nested includes                                                           */
 /*---------------------------------------------------------------------------*/
 
+#include <bits/wordsize.h>
 #include "mtr.h"
 #include "epd.h"
 
@@ -75,14 +76,22 @@
 #define CUDD_VERSION "2.4.1"
 
 #ifndef SIZEOF_VOID_P
+#if __WORDSIZE == 64
+#define SIZEOF_VOID_P 8
+#else
 #define SIZEOF_VOID_P 4
 #endif
+#endif
 #ifndef SIZEOF_INT
 #define SIZEOF_INT 4
 #endif
 #ifndef SIZEOF_LONG
+#if __WORDSIZE == 64
+#define SIZEOF_LONG 8
+#else
 #define SIZEOF_LONG 4
 #endif
+#endif
 
 #ifndef TRUE
 #define TRUE 1
diff -dur cudd-2.4.1.ORIG/mtr/mtr.h cudd-2.4.1/mtr/mtr.h
--- cudd-2.4.1.ORIG/mtr/mtr.h	2004-08-24 15:30:36.000000000 -0600
+++ cudd-2.4.1/mtr/mtr.h	2007-10-18 16:45:19.000000000 -0600
@@ -63,6 +63,8 @@
 /* Nested includes                                                           */
 /*---------------------------------------------------------------------------*/
 
+#include <bits/wordsize.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -72,8 +74,12 @@
 /*---------------------------------------------------------------------------*/
 
 #ifndef SIZEOF_VOID_P
+#if __WORDSIZE == 64
+#define SIZEOF_VOID_P 8
+#else
 #define SIZEOF_VOID_P 4
 #endif
+#endif
 #ifndef SIZEOF_INT
 #define SIZEOF_INT 4
 #endif
diff -dur cudd-2.4.1.ORIG/util/util.h cudd-2.4.1/util/util.h
--- cudd-2.4.1.ORIG/util/util.h	2004-02-05 18:15:36.000000000 -0700
+++ cudd-2.4.1/util/util.h	2007-10-18 16:45:58.000000000 -0600
@@ -3,6 +3,8 @@
 #ifndef UTIL_H
 #define UTIL_H
 
+#include <bits/wordsize.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -20,14 +22,22 @@
 #endif
 
 #ifndef SIZEOF_VOID_P
+#if __WORDSIZE == 64
+#define SIZEOF_VOID_P 8
+#else
 #define SIZEOF_VOID_P 4
 #endif
+#endif
 #ifndef SIZEOF_INT
 #define SIZEOF_INT 4
 #endif
 #ifndef SIZEOF_LONG
+#if __WORDSIZE == 64
+#define SIZEOF_LONG 8
+#else
 #define SIZEOF_LONG 4
 #endif
+#endif
 
 #if SIZEOF_VOID_P == 8 && SIZEOF_INT == 4
 typedef long util_ptrint;

cudd-2.4.1-init.patch:

--- NEW FILE cudd-2.4.1-init.patch ---
diff -dur cudd-2.4.1.ORIG/cudd/cuddAddIte.c cudd-2.4.1/cudd/cuddAddIte.c
--- cudd-2.4.1.ORIG/cudd/cuddAddIte.c	2004-08-24 15:37:42.000000000 -0600
+++ cudd-2.4.1/cudd/cuddAddIte.c	2006-07-17 16:04:43.000000000 -0600
@@ -447,7 +447,7 @@
     DdNode *one,*zero;
     DdNode *r,*Fv,*Fnv,*Gv,*Gnv,*Hv,*Hnv,*t,*e;
     unsigned int topf,topg,toph,v;
-    int index;
+    int index = 0;
 
     statLine(dd);
     /* Trivial cases. */
diff -dur cudd-2.4.1.ORIG/cudd/cuddAddWalsh.c cudd-2.4.1/cudd/cuddAddWalsh.c
--- cudd-2.4.1.ORIG/cudd/cuddAddWalsh.c	2004-08-24 15:37:42.000000000 -0600
+++ cudd-2.4.1/cudd/cuddAddWalsh.c	2006-07-17 16:04:43.000000000 -0600
@@ -298,7 +298,7 @@
   int  n)
 {
     DdNode *one, *minusone;
-    DdNode *t, *u, *t1, *u1, *v, *w;
+    DdNode *t = NULL, *u, *t1, *u1, *v, *w;
     int     i;
 
     one = DD_ONE(dd);
diff -dur cudd-2.4.1.ORIG/cudd/cuddBddIte.c cudd-2.4.1/cudd/cuddBddIte.c
--- cudd-2.4.1.ORIG/cudd/cuddBddIte.c	2004-08-24 15:37:43.000000000 -0600
+++ cudd-2.4.1/cudd/cuddBddIte.c	2006-07-17 16:04:43.000000000 -0600
@@ -635,7 +635,7 @@
     DdNode	 *one, *zero, *res;
     DdNode	 *r, *Fv, *Fnv, *Gv, *Gnv, *H, *Hv, *Hnv, *t, *e;
     unsigned int topf, topg, toph, v;
-    int		 index;
+    int		 index = 0;
     int		 comple;
 
     statLine(dd);
diff -dur cudd-2.4.1.ORIG/cudd/cuddDecomp.c cudd-2.4.1/cudd/cuddDecomp.c
--- cudd-2.4.1.ORIG/cudd/cuddDecomp.c	2004-08-24 15:37:43.000000000 -0600
+++ cudd-2.4.1/cudd/cuddDecomp.c	2006-07-17 16:04:43.000000000 -0600
@@ -1689,7 +1689,7 @@
   st_table * mintermTable)
 {
     int topid, distance;
-    Conjuncts *factorsNv, *factorsNnv, *factors;
+    Conjuncts *factorsNv = NULL, *factorsNnv = NULL, *factors;
     Conjuncts *dummy;
     DdNode *N, *Nv, *Nnv, *temp, *g1, *g2, *h1, *h2, *topv;
     double minNv = 0.0, minNnv = 0.0;
diff -dur cudd-2.4.1.ORIG/cudd/cuddGroup.c cudd-2.4.1/cudd/cuddGroup.c
--- cudd-2.4.1.ORIG/cudd/cuddGroup.c	2006-07-17 16:04:04.000000000 -0600
+++ cudd-2.4.1/cudd/cuddGroup.c	2006-07-17 16:04:43.000000000 -0600
@@ -454,7 +454,7 @@
   Cudd_ReorderingType method)
 {
     int lower;
-    int upper;
+    int upper = 0;
     int result;
     unsigned int initialSize;
 
@@ -1492,7 +1492,7 @@
     Move *move;
     int  size;
     int  i,j,xtop,xbot,xsize,ytop,ybot,ysize,newxtop;
-    int  swapx,swapy;
+    int  swapx = 0, swapy = 0;
 #if defined(DD_DEBUG) && defined(DD_VERBOSE)
     int  initialSize,bestSize;
 #endif
@@ -1672,7 +1672,7 @@
 {
     Move *move;
     int  res;
-    Move *end_move;
+    Move *end_move = NULL;
     int diff, tmp_diff;
     int index, pairlev;
 
diff -dur cudd-2.4.1.ORIG/cudd/cuddHarwell.c cudd-2.4.1/cudd/cuddHarwell.c
--- cudd-2.4.1.ORIG/cudd/cuddHarwell.c	2004-08-24 15:37:44.000000000 -0600
+++ cudd-2.4.1/cudd/cuddHarwell.c	2006-07-17 16:04:43.000000000 -0600
@@ -152,6 +152,7 @@
     int	*rhsptr, *rhsind;
 #endif
 
+    lx = ly = lxn = lyn = NULL;
     if (*nx < 0 || *ny < 0) return(0);
 
     one = DD_ONE(dd);
diff -dur cudd-2.4.1.ORIG/cudd/cuddLinear.c cudd-2.4.1/cudd/cuddLinear.c
--- cudd-2.4.1.ORIG/cudd/cuddLinear.c	2004-08-24 15:37:45.000000000 -0600
+++ cudd-2.4.1/cudd/cuddLinear.c	2006-07-17 16:04:43.000000000 -0600
@@ -373,7 +373,7 @@
     int    posn;
     int    isolated;
     DdNode *f,*f0,*f1,*f01,*f00,*f11,*f10,*newf1,*newf0;
-    DdNode *g,*next,*last;
+    DdNode *g,*next,*last = NULL;
     DdNodePtr *previousP;
     DdNode *tmp;
     DdNode *sentinel = &(table->sentinel);
diff -dur cudd-2.4.1.ORIG/cudd/cuddPriority.c cudd-2.4.1/cudd/cuddPriority.c
--- cudd-2.4.1.ORIG/cudd/cuddPriority.c	2004-08-24 15:37:45.000000000 -0600
+++ cudd-2.4.1/cudd/cuddPriority.c	2006-07-17 16:04:43.000000000 -0600
@@ -965,7 +965,7 @@
 {
     DdNode *res, *res1, *res2, *resA;
     DdNode *r, *y, *RT, *RE, *YT, *YE, *Yrest, *Ra, *Ran, *Gamma, *Alpha;
-    unsigned int topR, topY, top, index;
+    unsigned int topR, topY, top, index = 0U;
     DdNode *one = DD_ONE(dd);
 
     statLine(dd);
diff -dur cudd-2.4.1.ORIG/cudd/cuddReorder.c cudd-2.4.1/cudd/cuddReorder.c
--- cudd-2.4.1.ORIG/cudd/cuddReorder.c	2004-08-24 15:37:45.000000000 -0600
+++ cudd-2.4.1/cudd/cuddReorder.c	2006-07-17 16:04:43.000000000 -0600
@@ -606,7 +606,7 @@
     int	iterate;
     int previousSize;
     Move *moves, *move;
-    int	pivot;
+    int	pivot = 0;
     int	modulo;
     int result;
 
diff -dur cudd-2.4.1.ORIG/cudd/cuddSubsetSP.c cudd-2.4.1/cudd/cuddSubsetSP.c
--- cudd-2.4.1.ORIG/cudd/cuddSubsetSP.c	2004-08-24 15:37:45.000000000 -0600
+++ cudd-2.4.1/cudd/cuddSubsetSP.c	2006-07-17 16:04:43.000000000 -0600
@@ -1255,17 +1255,17 @@
 {
     DdNode *N, *Nv, *Nnv;
     DdNode *ThenBranch, *ElseBranch, *childBranch;
-    DdNode *child, *regChild, *regNnv, *regNv;
+    DdNode *child, *regChild, *regNnv = NULL, *regNv = NULL;
     NodeDist_t *nodeStatNv, *nodeStat, *nodeStatNnv;
     DdNode *neW, *topv, *regNew;
     char *entry;
     unsigned int topid;
-    unsigned int childPathLength, oddLen, evenLen, NnvPathLength, NvPathLength;
+    unsigned int childPathLength, oddLen, evenLen;
+    unsigned int NnvPathLength = 0U, NvPathLength = 0U;
     unsigned int NvBotDist, NnvBotDist;
     int tiebreakChild;
     int  processingDone, thenDone, elseDone;
 
-
 #ifdef DD_DEBUG
     numCalls++;
 #endif
diff -dur cudd-2.4.1.ORIG/cudd/cuddSymmetry.c cudd-2.4.1/cudd/cuddSymmetry.c
--- cudd-2.4.1.ORIG/cudd/cuddSymmetry.c	2004-08-24 15:37:46.000000000 -0600
+++ cudd-2.4.1/cudd/cuddSymmetry.c	2006-07-17 16:04:43.000000000 -0600
@@ -1472,10 +1472,10 @@
   Move ** moves)
 {
     Move *move;
-    int	 size;
+    int	 size = 0;
     int  i,j;
     int  xtop,xbot,xsize,ytop,ybot,ysize,newxtop;
-    int  swapx,swapy;
+    int  swapx = 0, swapy = 0;
 
 #if DD_DEBUG
     assert(x < y);	/* we assume that x < y */
@@ -1551,7 +1551,7 @@
   int  x,
   int  y)
 {
-    int	size;
+    int	size = 0;
     int i,j;
     int	xtop,xbot,xsize,ytop,ybot,ysize,newxtop;
 
diff -dur cudd-2.4.1.ORIG/cudd/cuddTable.c cudd-2.4.1/cudd/cuddTable.c
--- cudd-2.4.1.ORIG/cudd/cuddTable.c	2004-08-24 15:37:46.000000000 -0600
+++ cudd-2.4.1/cudd/cuddTable.c	2006-07-17 16:04:43.000000000 -0600
@@ -1726,7 +1726,7 @@
     int oldsize,newsize;
     int i,j,index,reorderSave;
     unsigned int numSlots = unique->initSlots;
-    int *newperm, *newinvperm, *newmap;
+    int *newperm, *newinvperm, *newmap = NULL;
     DdNode *one, *zero;
 
 #ifdef DD_DEBUG
@@ -2454,7 +2454,7 @@
     int oldsize,newsize;
     int i,j,reorderSave;
     int numSlots = unique->initSlots;
-    int *newperm, *newinvperm, *newmap;
+    int *newperm, *newinvperm, *newmap = NULL;
     DdNode *one, *zero;
 
     oldsize = unique->size;
diff -dur cudd-2.4.1.ORIG/cudd/cuddUtil.c cudd-2.4.1/cudd/cuddUtil.c
--- cudd-2.4.1.ORIG/cudd/cuddUtil.c	2005-05-14 11:28:01.000000000 -0600
+++ cudd-2.4.1/cudd/cuddUtil.c	2006-07-17 16:04:43.000000000 -0600
@@ -1400,7 +1400,7 @@
     DdNode **old, *neW;
     double minterms;
     char *saveString;
-    int saveFlag, savePoint, isSame;
+    int saveFlag, savePoint = 0, isSame;
 
     minterms = Cudd_CountMinterm(dd,f,n);
     if ((double)k > minterms) {
diff -dur cudd-2.4.1.ORIG/cudd/cuddZddGroup.c cudd-2.4.1/cudd/cuddZddGroup.c
--- cudd-2.4.1.ORIG/cudd/cuddZddGroup.c	2006-07-17 16:04:04.000000000 -0600
+++ cudd-2.4.1/cudd/cuddZddGroup.c	2006-07-17 16:04:43.000000000 -0600
@@ -434,7 +434,7 @@
   Cudd_ReorderingType method)
 {
     int lower;
-    int upper;
+    int upper = 0;
     int result;
     unsigned int initialSize;
 
@@ -1082,7 +1082,7 @@
     Move *move;
     int  size;
     int  i,j,xtop,xbot,xsize,ytop,ybot,ysize,newxtop;
-    int  swapx,swapy;
+    int  swapx = 0, swapy = 0;
 #if defined(DD_DEBUG) && defined(DD_VERBOSE)
     int  initialSize,bestSize;
 #endif
diff -dur cudd-2.4.1.ORIG/cudd/cuddZddReord.c cudd-2.4.1/cudd/cuddZddReord.c
--- cudd-2.4.1.ORIG/cudd/cuddZddReord.c	2004-08-24 15:37:47.000000000 -0600
+++ cudd-2.4.1/cudd/cuddZddReord.c	2006-07-17 16:04:43.000000000 -0600
@@ -491,7 +491,7 @@
     int		i;
     int		posn;
     DdNode	*f, *f1, *f0, *f11, *f10, *f01, *f00;
-    DdNode	*newf1, *newf0, *next;
+    DdNode	*newf1 = NULL, *newf0, *next;
     DdNodePtr	g, *lastP, *previousP;
 
 #ifdef DD_DEBUG
@@ -752,7 +752,7 @@
     int iterate;
     int previousSize;
     Move *moves, *move;
-    int	pivot;
+    int	pivot = 0;
     int modulo;
     int result;
 
diff -dur cudd-2.4.1.ORIG/cudd/cuddZddSymm.c cudd-2.4.1/cudd/cuddZddSymm.c
--- cudd-2.4.1.ORIG/cudd/cuddZddSymm.c	2004-08-24 15:37:47.000000000 -0600
+++ cudd-2.4.1/cudd/cuddZddSymm.c	2006-07-17 16:04:43.000000000 -0600
@@ -1483,7 +1483,7 @@
     Move	*move;
     int		size;
     int		i, temp, gxtop, gxbot, gybot, yprev;
-    int		swapx, swapy;
+    int		swapx = 0, swapy = 0;
 
 #ifdef DD_DEBUG
     assert(x < y);	/* we assume that x < y */
@@ -1586,7 +1586,7 @@
   int  x,
   int  y)
 {
-    int	       size;
+    int	       size = 0;
     int        i, temp, gxtop, gxbot, gybot, yprev;
 
 #ifdef DD_DEBUG
diff -dur cudd-2.4.1.ORIG/nanotrav/bnet.c cudd-2.4.1/nanotrav/bnet.c
--- cudd-2.4.1.ORIG/nanotrav/bnet.c	2004-08-24 15:34:48.000000000 -0600
+++ cudd-2.4.1/nanotrav/bnet.c	2006-07-17 16:04:43.000000000 -0600
@@ -1884,6 +1884,7 @@
     DdNode *func, *f, *g, *h;
     BnetNode *auxnd;
 
+    mux[0] = mux[1] = phase[0] = phase[1] = 0;
     if (nd->ninp != 3) return(0);
 
     for (line = nd->f; line != NULL; line = line->next) {
diff -dur cudd-2.4.1.ORIG/nanotrav/ntr.c cudd-2.4.1/nanotrav/ntr.c
--- cudd-2.4.1.ORIG/nanotrav/ntr.c	2004-08-24 15:34:47.000000000 -0600
+++ cudd-2.4.1/nanotrav/ntr.c	2006-07-17 16:07:12.000000000 -0600
@@ -964,7 +964,7 @@
     DdNode *neW;
     DdNode *one, *zero;
     DdNode *states, *scc;
-    DdNode *tmp;
+    DdNode *tmp = NULL;
     DdNode *SCCs[10];
     int depth;
     int nscc = 0;

cudd-2.4.1-retval.patch:

--- NEW FILE cudd-2.4.1-retval.patch ---
diff -dur cudd-2.4.1.ORIG/dddmp/dddmpDbg.c cudd-2.4.1/dddmp/dddmpDbg.c
--- cudd-2.4.1.ORIG/dddmp/dddmpDbg.c	2004-02-18 09:23:31.000000000 -0700
+++ cudd-2.4.1/dddmp/dddmpDbg.c	2006-02-20 16:05:04.000000000 -0700
@@ -97,7 +97,8 @@
   while (fgets(buf, 999,fp)!=NULL) {
     fprintf (fpo, "%s", buf);
     if (strncmp(buf, ".nnodes", 7) == 0) {
-      sscanf (buf, "%*s %d", &nnodes);
+      if (sscanf (buf, "%*s %d", &nnodes) == EOF)
+	break;
     }
     if (strncmp(buf, ".rootids", 8) == 0) {
       break;
@@ -141,7 +142,8 @@
 
   }
 
-  fgets(buf, 999,fp);
+  if (fgets(buf, 999,fp) == NULL)
+    buf[0] = '\0';
   if (strncmp(buf, ".end", 4) != 0) {
     return (0);
   }
diff -dur cudd-2.4.1.ORIG/dddmp/dddmpLoad.c cudd-2.4.1/dddmp/dddmpLoad.c
--- cudd-2.4.1.ORIG/dddmp/dddmpLoad.c	2004-02-18 09:24:00.000000000 -0700
+++ cudd-2.4.1/dddmp/dddmpLoad.c	2006-02-20 16:02:11.000000000 -0700
@@ -1109,7 +1109,8 @@
 
   /*------------------------ Deal With the File Tail -----------------------*/
 
-  fgets (buf, DDDMP_MAXSTRLEN-1,fp);
+  if (fgets (buf, DDDMP_MAXSTRLEN-1,fp) == NULL)
+    buf[0] = '\0';
   Dddmp_CheckAndGotoLabel (!matchkeywd(buf, ".end"),
     "Error .end not found.", failure);
 
@@ -1273,7 +1274,8 @@
 
     /* comment */
     if (buf[0] == '#') {
-      fgets(buf,DDDMP_MAXSTRLEN,fp);
+      if (fgets(buf,DDDMP_MAXSTRLEN,fp) == NULL)
+	buf[0] = '\0';
       continue;
     }
 
@@ -1424,7 +1426,8 @@
     }
 
     if (matchkeywd(buf, ".nodes")) {
-      fgets(buf,DDDMP_MAXSTRLEN,fp);
+      if (fgets(buf,DDDMP_MAXSTRLEN,fp) == NULL)
+	buf[0] = '\0';
       break;
     }
 
diff -dur cudd-2.4.1.ORIG/dddmp/dddmpLoadCnf.c cudd-2.4.1/dddmp/dddmpLoadCnf.c
--- cudd-2.4.1.ORIG/dddmp/dddmpLoadCnf.c	2004-02-20 01:35:56.000000000 -0700
+++ cudd-2.4.1/dddmp/dddmpLoadCnf.c	2006-02-20 16:04:02.000000000 -0700
@@ -554,7 +554,8 @@
 
     /* Init Problem Line */ 
     if (buf[0] == 'p') {
-      fscanf (fp, "%*s %d %d", &nv, &nc);
+      if (fscanf (fp, "%*s %d %d", &nv, &nc) == EOF)
+	break;
       Hdr->nVarsCnf = nv;
       Hdr->nClausesCnf = nc;
       break;
@@ -569,7 +570,8 @@
 
     /* Skip Comment? */
     if (buf[0] != '.') {
-      fgets (buf, DDDMP_MAXSTRLEN, fp);
+      if (fgets (buf, DDDMP_MAXSTRLEN, fp) == NULL)
+	buf[0] = '\0';
       continue;
     }
 
@@ -811,7 +813,8 @@
     /* Check for Comment */
     if (word[0] == 'c') {
       /* Comment Found: Skip line */
-      fgets (word, DDDMP_MAX_CNF_ROW_LENGTH-1, fp);
+      if (fgets (word, DDDMP_MAX_CNF_ROW_LENGTH-1, fp) == NULL)
+	word[0] = '\0';
       break;
     }
 
diff -dur cudd-2.4.1.ORIG/epd/epd.c cudd-2.4.1/epd/epd.c
--- cudd-2.4.1.ORIG/epd/epd.c	2004-08-24 15:33:13.000000000 -0600
+++ cudd-2.4.1/epd/epd.c	2006-02-20 16:07:56.000000000 -0700
@@ -1094,7 +1094,8 @@
 
   sprintf(str, "%E", value);
   pos = strstr(str, "E");
-  sscanf(pos, "E%d", &exponent);
+  if (sscanf(pos, "E%d", &exponent) == EOF)
+    exponent = 0;
   return(exponent);
 }
 
diff -dur cudd-2.4.1.ORIG/util/pipefork.c cudd-2.4.1/util/pipefork.c
--- cudd-2.4.1.ORIG/util/pipefork.c	2004-08-17 18:07:57.000000000 -0600
+++ cudd-2.4.1/util/pipefork.c	2006-02-20 16:07:06.000000000 -0700
@@ -39,8 +39,10 @@
      * fildes[0] for reading from command
      * fildes[1] for writing to command
      */
-    (void) pipe(topipe);
-    (void) pipe(frompipe);
+    if (pipe(topipe) < 0 || pipe(frompipe) < 0) {
+      fputs("Pipe creation failed.\n", stderr);
+      return 1;
+    }
 
 #ifdef __CYGWIN32__
     if ((forkpid = fork()) == 0) {

cudd-2.4.1-sharedlib.patch:

--- NEW FILE cudd-2.4.1-sharedlib.patch ---
diff -dur cudd-2.4.1.ORIG/cudd/doc/node3.html cudd-2.4.1/cudd/doc/node3.html
--- cudd-2.4.1.ORIG/cudd/doc/node3.html	2005-05-17 23:20:29.000000000 -0600
+++ cudd-2.4.1/cudd/doc/node3.html	2009-01-22 09:19:03.000000000 -0700
@@ -153,16 +153,18 @@
 <P>
 To build an application that uses the CUDD package, you should add
 <PRE>
-#include "util.h"
-#include "cudd.h"
+#include &lt;util.h&gt;
+#include &lt;cudd.h&gt;
 </PRE>
 <A NAME="81"></A>
-to your source files, and should link
+to your source files, compile with <CODE>-I/usr/include/cudd</CODE>, and link
 <code>libcudd.a</code><A NAME="82"></A>,
 <code>libmtr.a</code><A NAME="83"></A>,
 <code>libst.a</code><A NAME="84"></A>, and
 <code>libutil.a</code><A NAME="85"></A> to your executable. (All these
-libraries are part of the distribution.) Some
+libraries are part of the distribution.)  Note that shared library equivalents
+are also available, and are linked to one another appropriately; i.e., it is
+sufficient to add <CODE>-lcudd</CODE> to your link command.  Some
 platforms require specific compiler and linker flags.  Refer to the
 <TT>Makefile<A NAME="86"></A></TT> in the top level directory of the
 distribution.
diff -dur cudd-2.4.1.ORIG/cudd/Makefile cudd-2.4.1/cudd/Makefile
--- cudd-2.4.1.ORIG/cudd/Makefile	1999-08-19 16:34:24.000000000 -0600
+++ cudd-2.4.1/cudd/Makefile	2009-01-22 09:46:31.000000000 -0700
@@ -27,6 +27,10 @@
 
 INCLUDE = $(WHERE)/include
 
+SHLINK	= -shared -Xlinker -soname -Xlinker lib$(P).so.2 \
+	-L$(WHERE)/mtr -L$(WHERE)/st -L$(WHERE)/util -L$(WHERE)/epd \
+	-lmtr -lcuddst -lcuddutil -lepd -lm
+
 LIBS	= ./libcudd.a $(WHERE)/mtr/libmtr.a \
 	$(WHERE)/st/libst.a $(WHERE)/util/libutil.a $(WHERE)/epd/libepd.a
 
@@ -71,6 +75,11 @@
 
 #------------------------------------------------------
 
+lib$(P).so.2.4.1: $(POBJ)
+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(POBJ) $(SHLINK)
+	ln -s lib$(P).so.2.4.1 lib$(P).so.2
+	ln -s lib$(P).so.2 lib$(P).so
+
 lib$(P).a: $(POBJ)
 	ar rv $@ $?
 	$(RANLIB) $@
@@ -111,7 +120,9 @@
 tags: $(PSRC) $(PHDR)
 	ctags $(PSRC) $(PHDR)
 
-all: lib$(P).a lib$(P).b llib-l$(P).ln tags
+all: lib$(P).so.2.4.1 lib$(P).b llib-l$(P).ln tags
+
+static: lib$(P).a
 
 programs: $(TARGET) $(TARGETu) lintpgm
 
diff -dur cudd-2.4.1.ORIG/dddmp/Makefile cudd-2.4.1/dddmp/Makefile
--- cudd-2.4.1.ORIG/dddmp/Makefile	2004-02-20 09:13:24.000000000 -0700
+++ cudd-2.4.1/dddmp/Makefile	2009-01-22 09:46:18.000000000 -0700
@@ -170,6 +170,10 @@
 LINTFLAGS = -u -n
 LINTSWITCH = -o
 
+SHLINK	= -shared -Xlinker -soname -Xlinker lib$(P).so.2 \
+	-L$(WHERE)/cudd -L$(WHERE)/mtr -L$(WHERE)/st -L$(WHERE)/util \
+	-L$(WHERE)/epd -lcudd -lcuddst -lcuddutil
+
 LIBS	= ./libdddmp.a $(WHERE)/cudd/libcudd.a $(WHERE)/mtr/libmtr.a \
 	$(WHERE)/st/libst.a $(WHERE)/util/libutil.a $(WHERE)/epd/libepd.a
 
@@ -182,6 +186,11 @@
 	$(WHERE)/mtr/llib-lmtr.ln $(WHERE)/st/llib-lst.ln \
 	$(WHERE)/util/llib-lutil.ln
 
+lib$(P).so.2.4.1: $(POBJ)
+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(POBJ) $(SHLINK)
+	ln -s lib$(P).so.2.4.1 lib$(P).so.2
+	ln -s lib$(P).so.2 lib$(P).so
+
 lib$(P).a: $(POBJ)
 	ar rv $@ $?
 	$(RANLIB) $@
@@ -222,7 +231,9 @@
 tags: $(PSRC) $(PHDR)
 	ctags $(PSRC) $(PHDR)
 
-all: lib$(P).a lib$(P).b llib-l$(P).ln tags
+all: lib$(P).so.2.4.1 lib$(P).b llib-l$(P).ln tags
+
+static: lib$(P).a
 
 programs: $(TARGET) $(TARGETu) lintpgm
 
diff -dur cudd-2.4.1.ORIG/epd/Makefile cudd-2.4.1/epd/Makefile
--- cudd-2.4.1.ORIG/epd/Makefile	2003-12-31 09:31:30.000000000 -0700
+++ cudd-2.4.1/epd/Makefile	2009-01-22 09:50:20.000000000 -0700
@@ -11,6 +11,9 @@
 ICFLAGS = -g -O6 -Wall
 CFLAGS  = $(ICFLAGS) $(MFLAG) $(XCFLAGS)
 
+SHLINK	= -shared -Xlinker -soname -Xlinker lib$(P).so.2 -L$(WHERE)/util \
+	-lcuddutil -lm
+
 LINTFLAGS = -u -n
 
 # this is to create the lint library
@@ -27,6 +30,11 @@
 
 #---------------------------
 
+lib$(P).so.2.4.1: $(POBJ)
+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(POBJ) $(SHLINK)
+	ln -s lib$(P).so.2.4.1 lib$(P).so.2
+	ln -s lib$(P).so.2 lib$(P).so
+
 lib$(P).a: $(POBJ)
 	ar rv $@ $?
 	$(RANLIB) $@
@@ -55,7 +63,9 @@
 tags: $(PSRC) $(PHDR)
 	ctags $(PSRC) $(PHDR)
 
-all: lib$(P).a lib$(P).b llib-l$(P).ln tags
+all: lib$(P).so.2.4.1 lib$(P).b llib-l$(P).ln tags
+
+static: lib$(P).a
 
 clean:
 	rm -f *.o *.u .pure *.warnings
diff -dur cudd-2.4.1.ORIG/Makefile cudd-2.4.1/Makefile
--- cudd-2.4.1.ORIG/Makefile	2004-08-17 18:18:45.000000000 -0600
+++ cudd-2.4.1/Makefile	2009-01-22 13:10:24.000000000 -0700
@@ -194,7 +194,7 @@
 IDIR	= $(DDWDIR)/include
 INCLUDE = -I$(IDIR)
 
-BDIRS	= cudd dddmp mtr st util epd
+BDIRS	= util epd mtr st cudd dddmp
 DIRS	= $(BDIRS) nanotrav
 
 #------------------------------------------------------------------------
@@ -210,6 +210,7 @@
 .PHONY : testmtr
 .PHONY : lint
 .PHONY : all
+.PHONY : static
 .PHONY : clean
 .PHONY : distclean
 
@@ -219,17 +220,22 @@
 	@for dir in $(DIRS); do \
 		(cd $$dir; \
 		echo Making $$dir ...; \
-		make CC=$(CC) RANLIB=$(RANLIB) MFLAG= MNEMLIB= ICFLAGS="$(ICFLAGS)" XCFLAGS="$(XCFLAGS)" DDDEBUG="$(DDDEBUG)" MTRDEBUG="$(MTRDEBUG)" LDFLAGS="$(LDFLAGS)" PURE="$(PURE)" EXE="$(EXE)" )\
+		$(MAKE) CC=$(CC) RANLIB=$(RANLIB) MFLAG= MNEMLIB= ICFLAGS="$(ICFLAGS)" XCFLAGS="$(XCFLAGS)" DDDEBUG="$(DDDEBUG)" MTRDEBUG="$(MTRDEBUG)" LDFLAGS="$(LDFLAGS)" PURE="$(PURE)" EXE="$(EXE)" )\
 	done
 
-nanotrav: build
+cudd: mtr st util epd
+dddmp: cudd
+epd: util
+mtr: util
+nanotrav: dddmp
+st: util
 
 check_leaks:
 	sh ./setup.sh
 	@for dir in mnemosyne $(DIRS); do \
 		(cd $$dir; \
 		echo Making $$dir ...; \
-		make CC=$(CC) RANLIB=$(RANLIB) MFLAG=$(MFLAG) MNEMLIB=$(MNEMLIB) ICFLAGS="$(ICFLAGS)" XCFLAGS="$(XCFLAGS)" DDDEBUG="$(DDDEBUG)" MTRDEBUG="$(MTRDEBUG)" LDFLAGS="$(LDFLAGS)" EXE="$(EXE)" )\
+		$(MAKE) CC=$(CC) RANLIB=$(RANLIB) MFLAG=$(MFLAG) MNEMLIB=$(MNEMLIB) ICFLAGS="$(ICFLAGS)" XCFLAGS="$(XCFLAGS)" DDDEBUG="$(DDDEBUG)" MTRDEBUG="$(MTRDEBUG)" LDFLAGS="$(LDFLAGS)" EXE="$(EXE)" )\
 	done
 
 optimize_dec:
@@ -237,7 +243,7 @@
 	@for dir in $(DIRS); do \
 		(cd $$dir; \
 		echo Making $$dir ...; \
-		make CC=$(CC) RANLIB=$(RANLIB) XCFLAGS="$(XCFLAGS)" LDFLAGS="$(LDFLAGS)" optimize_dec )\
+		$(MAKE) CC=$(CC) RANLIB=$(RANLIB) XCFLAGS="$(XCFLAGS)" LDFLAGS="$(LDFLAGS)" optimize_dec )\
 	done
 
 lint:
@@ -245,7 +251,7 @@
 	@for dir in $(DIRS) obj; do \
 		(cd $$dir; \
 		echo Making lint in $$dir ...; \
-		make CC=$(CC) lint )\
+		$(MAKE) CC=$(CC) lint )\
 	done
 
 tags:
@@ -253,7 +259,7 @@
 	@for dir in $(DIRS) obj; do \
 		(cd $$dir; \
 		echo Making tags in $$dir ...; \
-		make CC=$(CC) tags )\
+		$(MAKE) CC=$(CC) tags )\
 	done
 
 all:
@@ -261,7 +267,15 @@
 	@for dir in $(DIRS); do \
 		(cd $$dir; \
 		echo Making all in $$dir ...; \
-		make CC=$(CC) RANLIB=$(RANLIB) MFLAG= MNEMLIB= ICFLAGS="$(ICFLAGS)" XCFLAGS="$(XCFLAGS)" DDDEBUG="$(DDDEBUG)" MTRDEBUG="$(MTRDEBUG)" LDFLAGS="$(LDFLAGS)" PURE="$(PURE)" EXE="$(EXE)" all )\
+		$(MAKE) CC=$(CC) RANLIB=$(RANLIB) MFLAG= MNEMLIB= ICFLAGS="$(ICFLAGS)" XCFLAGS="$(XCFLAGS)" DDDEBUG="$(DDDEBUG)" MTRDEBUG="$(MTRDEBUG)" LDFLAGS="$(LDFLAGS)" PURE="$(PURE)" EXE="$(EXE)" all )\
+	done
+
+static:
+	sh ./setup.sh
+	@for dir in $(DIRS); do \
+		(cd $$dir; \
+		echo Making static in $$dir ...; \
+		$(MAKE) CC=$(CC) RANLIB=$(RANLIB) MFLAG= MNEMLIB= ICFLAGS="$(ICFLAGS)" XCFLAGS="$(XCFLAGS)" DDDEBUG="$(DDDEBUG)" MTRDEBUG="$(MTRDEBUG)" LDFLAGS="$(LDFLAGS)" PURE="$(PURE)" EXE="$(EXE)" static )\
 	done
 
 testcudd:
@@ -269,49 +283,49 @@
 	@for dir in util st mtr epd; do \
 		(cd $$dir; \
 		echo Making $$dir ...; \
-		make CC=$(CC) RANLIB=$(RANLIB) MFLAG= MNEMLIB= ICFLAGS="$(ICFLAGS)" XCFLAGS="$(XCFLAGS)" DDDEBUG="$(DDDEBUG)" MTRDEBUG="$(MTRDEBUG)" LDFLAGS="$(LDFLAGS)" PURE="$(PURE)" EXE="$(EXE)" )\
+		$(MAKE) CC=$(CC) RANLIB=$(RANLIB) MFLAG= MNEMLIB= ICFLAGS="$(ICFLAGS)" XCFLAGS="$(XCFLAGS)" DDDEBUG="$(DDDEBUG)" MTRDEBUG="$(MTRDEBUG)" LDFLAGS="$(LDFLAGS)" PURE="$(PURE)" EXE="$(EXE)" )\
 	done
 	@(cd cudd; \
 	echo Making testcudd ...; \
-	make CC=$(CC) RANLIB=$(RANLIB) MFLAG= MNEMLIB= ICFLAGS="$(ICFLAGS)" XCFLAGS="$(XCFLAGS)" DDDEBUG="$(DDDEBUG)" MTRDEBUG="$(MTRDEBUG)" LDFLAGS="$(LDFLAGS)" PURE="$(PURE)" EXE="$(EXE)" testcudd$(EXE) )
+	$(MAKE) CC=$(CC) RANLIB=$(RANLIB) MFLAG= MNEMLIB= ICFLAGS="$(ICFLAGS)" XCFLAGS="$(XCFLAGS)" DDDEBUG="$(DDDEBUG)" MTRDEBUG="$(MTRDEBUG)" LDFLAGS="$(LDFLAGS)" PURE="$(PURE)" EXE="$(EXE)" testcudd$(EXE) )
 
 objlib:
 	sh ./setup.sh
 	@for dir in $(BDIRS); do \
 		(cd $$dir; \
 		echo Making $$dir ...; \
-		make CC=$(CC) RANLIB=$(RANLIB) MFLAG= MNEMLIB= ICFLAGS="$(ICFLAGS)" XCFLAGS="$(XCFLAGS)" DDDEBUG="$(DDDEBUG)" MTRDEBUG="$(MTRDEBUG)" LDFLAGS="$(LDFLAGS)" PURE="$(PURE)" EXE="$(EXE)" )\
+		$(MAKE) CC=$(CC) RANLIB=$(RANLIB) MFLAG= MNEMLIB= ICFLAGS="$(ICFLAGS)" XCFLAGS="$(XCFLAGS)" DDDEBUG="$(DDDEBUG)" MTRDEBUG="$(MTRDEBUG)" LDFLAGS="$(LDFLAGS)" PURE="$(PURE)" EXE="$(EXE)" )\
 	done
 	@(cd obj; \
 	echo Making obj ...; \
-	make CPP=$(CPP) CPPFLAGS=$(CPPFLAGS) RANLIB=$(RANLIB) MFLAG= MNEMLIB= ICFLAGS="$(ICFLAGS)" XCFLAGS="$(XCFLAGS)" DDDEBUG="$(DDDEBUG)" MTRDEBUG="$(MTRDEBUG)" LDFLAGS="$(LDFLAGS)" PURE="$(PURE)" EXE="$(EXE)" )
+	$(MAKE) CPP=$(CPP) CPPFLAGS=$(CPPFLAGS) RANLIB=$(RANLIB) MFLAG= MNEMLIB= ICFLAGS="$(ICFLAGS)" XCFLAGS="$(XCFLAGS)" DDDEBUG="$(DDDEBUG)" MTRDEBUG="$(MTRDEBUG)" LDFLAGS="$(LDFLAGS)" PURE="$(PURE)" EXE="$(EXE)" )
 
 testobj: objlib
 	@(cd obj; \
 	echo Making testobj ...; \
-	make CPP=$(CPP) CPPFLAGS=$(CPPFLAGS) RANLIB=$(RANLIB) MFLAG= MNEMLIB= ICFLAGS="$(ICFLAGS)" XCFLAGS="$(XCFLAGS)" DDDEBUG="$(DDDEBUG)" MTRDEBUG="$(MTRDEBUG)" LDFLAGS="$(LDFLAGS)" PURE="$(PURE)" EXE="$(EXE)" testobj$(EXE) )
+	$(MAKE) CPP=$(CPP) CPPFLAGS=$(CPPFLAGS) RANLIB=$(RANLIB) MFLAG= MNEMLIB= ICFLAGS="$(ICFLAGS)" XCFLAGS="$(XCFLAGS)" DDDEBUG="$(DDDEBUG)" MTRDEBUG="$(MTRDEBUG)" LDFLAGS="$(LDFLAGS)" PURE="$(PURE)" EXE="$(EXE)" testobj$(EXE) )
 
 testdddmp: build
 	@(cd dddmp; \
 	echo Making testdddmp ...; \
-	make CC=$(CC) RANLIB=$(RANLIB) MFLAG= MNEMLIB= ICFLAGS="$(ICFLAGS)" XCFLAGS="$(XCFLAGS)" DDDEBUG="$(DDDEBUG)" MTRDEBUG="$(MTRDEBUG)" LDFLAGS="$(LDFLAGS)" PURE="$(PURE)" EXE="$(EXE)" testdddmp$(EXE) )
+	$(MAKE) CC=$(CC) RANLIB=$(RANLIB) MFLAG= MNEMLIB= ICFLAGS="$(ICFLAGS)" XCFLAGS="$(XCFLAGS)" DDDEBUG="$(DDDEBUG)" MTRDEBUG="$(MTRDEBUG)" LDFLAGS="$(LDFLAGS)" PURE="$(PURE)" EXE="$(EXE)" testdddmp$(EXE) )
 
 testmtr: build
 	@(cd mtr; \
 	echo Making testmtr ...; \
-	make CC=$(CC) RANLIB=$(RANLIB) MFLAG= MNEMLIB= ICFLAGS="$(ICFLAGS)" XCFLAGS="$(XCFLAGS)" DDDEBUG="$(DDDEBUG)" MTRDEBUG="$(MTRDEBUG)" LDFLAGS="$(LDFLAGS)" PURE="$(PURE)" EXE="$(EXE)" testmtr$(EXE) )
+	$(MAKE) CC=$(CC) RANLIB=$(RANLIB) MFLAG= MNEMLIB= ICFLAGS="$(ICFLAGS)" XCFLAGS="$(XCFLAGS)" DDDEBUG="$(DDDEBUG)" MTRDEBUG="$(MTRDEBUG)" LDFLAGS="$(LDFLAGS)" PURE="$(PURE)" EXE="$(EXE)" testmtr$(EXE) )
 
 clean:
 	@for dir in mnemosyne $(DIRS) obj; do	\
 	    (cd $$dir; 	\
 	     echo Cleaning $$dir ...; \
-	     make -s clean	) \
+	     $(MAKE) -s clean	) \
 	done
 
 distclean:
 	@for dir in mnemosyne $(DIRS) obj; do	\
 	    (cd $$dir; 	\
 	     echo Cleaning $$dir ...; \
-	     make -s EXE="$(EXE)" distclean	) \
+	     $(MAKE) -s EXE="$(EXE)" distclean	) \
 	done
 	sh ./shutdown.sh
diff -dur cudd-2.4.1.ORIG/mnemosyne/Makefile cudd-2.4.1/mnemosyne/Makefile
--- cudd-2.4.1.ORIG/mnemosyne/Makefile	1996-07-23 14:33:34.000000000 -0600
+++ cudd-2.4.1/mnemosyne/Makefile	2009-01-22 10:04:31.000000000 -0700
@@ -8,8 +8,8 @@
 # define MALLOC_IS_VOIDSTAR if your system's malloc is declared as a (void *)
 # otherwise, it is assumed to be a (char *). a "mall_t" is typedeffed in
 # mnemconf.h and mnemosyne.h to implement this.
-#OPTNS	=	-DMALLOC_IS_VOIDSTAR
-OPTNS	=
+OPTNS	=	-DMALLOC_IS_VOIDSTAR
+#OPTNS	=
 
 CC	= cc
 RANLIB	= ranlib
@@ -19,14 +19,22 @@
 
 #loader flags
 LDFLGS	=
+SHLINK	= -shared -Xlinker -soname -Xlinker libmnem.so.2
 
 HDRS	=	mnemosyne.h mnemconf.h
 
-all: mnemalyse libmnem.a
+all: mnemalyse libmnem.so.2.4.1
+
+static: libmnem.a
 
 mnemalyse: mnemalyse.o
 	$(CC) $(LDFLGS) -o $@ mnemalyse.o
 
+libmnem.so.2.4.1: mnemosyne.o
+	$(CC) $(CFLAGS) $(LDFLAGS) $(SHLINK) -o $@ mnemosyne.o
+	ln -s libmnem.so.2.4.1 libmnem.so.2
+	ln -s libmnem.so.2 libmnem.so
+
 libmnem.a: mnemosyne.o
 	ar rcv $@ mnemosyne.o
 	$(RANLIB) $@
diff -dur cudd-2.4.1.ORIG/mtr/Makefile cudd-2.4.1/mtr/Makefile
--- cudd-2.4.1.ORIG/mtr/Makefile	2004-01-01 11:47:16.000000000 -0700
+++ cudd-2.4.1/mtr/Makefile	2009-01-22 10:08:45.000000000 -0700
@@ -39,6 +39,9 @@
 TARGET	= test$(P)$(EXE)
 TARGETu	= test$(P)-u
 
+SHLINK	= -shared -Xlinker -soname -Xlinker lib$(P).so.2 -L$(WHERE)/util \
+	-lcuddutil
+
 LIBS	= ./libmtr.a $(WHERE)/util/libutil.a
 
 BLIBS	= -kL. -klmtr -kL$(WHERE)/util -klutil
@@ -49,6 +52,11 @@
 
 #---------------------------
 
+lib$(P).so.2.4.1: $(POBJ)
+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(POBJ) $(SHLINK)
+	ln -s lib$(P).so.2.4.1 lib$(P).so.2
+	ln -s lib$(P).so.2 lib$(P).so
+
 lib$(P).a: $(POBJ)
 	ar rv $@ $?
 	$(RANLIB) $@
@@ -79,7 +87,9 @@
 tags: $(PSRC) $(PHDR)
 	ctags $(PSRC) $(PHDR)
 
-all: lib$(P).a lib$(P).b llib-l$(P).ln tags
+all: lib$(P).so.2.4.1 lib$(P).b llib-l$(P).ln tags
+
+static: lib$(P).a
 
 $(TARGET): $(POBJ) $(OBJ) $(LIBS) $(MNEMLIB)
 	$(PURE) $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJ) $(LIBS) $(MNEMLIB) -lm
diff -dur cudd-2.4.1.ORIG/nanotrav/Makefile cudd-2.4.1/nanotrav/Makefile
--- cudd-2.4.1.ORIG/nanotrav/Makefile	1999-08-31 13:12:55.000000000 -0600
+++ cudd-2.4.1/nanotrav/Makefile	2009-01-22 10:11:36.000000000 -0700
@@ -19,6 +19,14 @@
 
 INCLUDE = $(WHERE)/include
 
+SHLINK	= -L$(WHERE)/dddmp -L$(WHERE)/cudd -L$(WHERE)/mtr -L$(WHERE)/st \
+	-L$(WHERE)/util -L$(WHERE)/epd -ldddmp -lcudd -lmtr -lcuddst \
+	-lcuddutil -lepd
+
+SHLIBS	= $(WHERE)/dddmp/libdddmp.so.2.4.1 $(WHERE)/cudd/libcudd.so.2.4.1 \
+	$(WHERE)/mtr/libmtr.so.2.4.1 $(WHERE)/st/libcuddst.so.2.4.1 \
+	$(WHERE)/util/libcuddutil.so.2.4.1 $(WHERE)/epd/libepd.so.2.4.1
+
 LIBS	= $(WHERE)/dddmp/libdddmp.a $(WHERE)/cudd/libcudd.a \
 	$(WHERE)/mtr/libmtr.a $(WHERE)/st/libst.a $(WHERE)/util/libutil.a \
 	$(WHERE)/epd/libepd.a
@@ -60,8 +68,8 @@
 
 #------------------------------------------------------
 
-$(TARGET): $(SRC) $(OBJ) $(HDR) $(LIBS) $(MNEMLIB)
-	$(PURE) $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJ) $(LIBS) $(MNEMLIB) -lm
+$(TARGET): $(SRC) $(OBJ) $(HDR) $(SHLIBS) $(MNEMLIB)
+	$(PURE) $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJ) $(SHLINK) $(MNEMLIB) -lm
 
 .c.o: $(HDR)
 	$(CC) -c $< -I$(INCLUDE) $(CFLAGS) $(DDDEBUG)
@@ -87,6 +95,8 @@
 
 all: $(TARGET) $(TARGETu) lint tags
 
+static:
+
 pixie: $(TARGETu)
 	pixie $(TARGETu)
 
diff -dur cudd-2.4.1.ORIG/obj/Makefile cudd-2.4.1/obj/Makefile
--- cudd-2.4.1.ORIG/obj/Makefile	2001-03-19 00:35:09.000000000 -0700
+++ cudd-2.4.1/obj/Makefile	2009-01-22 12:58:56.000000000 -0700
@@ -27,6 +27,8 @@
 
 INCLUDE = $(WHERE)/include
 
+SHLINK	= -shared -Xlinker -soname -Xlinker lib$(P).so.2
+
 LIBS	= ./libobj.a $(WHERE)/cudd/libcudd.a $(WHERE)/mtr/libmtr.a \
 	$(WHERE)/st/libst.a $(WHERE)/util/libutil.a $(WHERE)/epd/libepd.a
 
@@ -57,6 +59,11 @@
 
 #------------------------------------------------------
 
+libs$(P).so.2.4.1: $(POBJ)
+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(POBJ) $(SHLINK)
+	ln -s lib$(P).so.2.4.1 lib$(P).so.2
+	ln -s lib$(P).so.2 lib$(P).so
+
 lib$(P).a: $(POBJ)
 	ar rv $@ $?
 	$(RANLIB) $@
@@ -97,7 +104,9 @@
 tags: $(PSRC) $(PHDR)
 	ctags $(PSRC) $(PHDR)
 
-all: lib$(P).a lib$(P).b llib-l$(P).ln tags
+all: lib$(P).so.2.4.1 lib$(P).b llib-l$(P).ln tags
+
+static: lib$(P).a
 
 programs: $(TARGET) $(TARGETu) lintpgm
 
diff -dur cudd-2.4.1.ORIG/st/Makefile cudd-2.4.1/st/Makefile
--- cudd-2.4.1.ORIG/st/Makefile	2004-01-01 09:53:24.000000000 -0700
+++ cudd-2.4.1/st/Makefile	2009-01-22 13:02:29.000000000 -0700
@@ -11,6 +11,9 @@
 ICFLAGS = -g -O6 -Wall
 CFLAGS  = $(ICFLAGS) $(MFLAG) $(XCFLAGS)
 
+SHLINK	= -shared -Xlinker -soname -Xlinker libcudd$(P).so.2 -L$(WHERE)/util \
+	-lcuddutil
+
 LINTFLAGS = -u -n
 
 # this is to create the lint library
@@ -27,6 +30,11 @@
 
 #---------------------------
 
+libcudd$(P).so.2.4.1: $(POBJ)
+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(POBJ) $(SHLINK)
+	ln -s libcudd$(P).so.2.4.1 libcudd$(P).so.2
+	ln -s libcudd$(P).so.2 libcudd$(P).so
+
 lib$(P).a: $(POBJ)
 	ar rv $@ $?
 	$(RANLIB) $@
@@ -55,7 +63,9 @@
 tags: $(PSRC) $(PHDR)
 	ctags $(PSRC) $(PHDR)
 
-all: lib$(P).a lib$(P).b llib-l$(P).ln tags
+all: libcudd$(P).so.2.4.1 lib$(P).b llib-l$(P).ln tags
+
+static: lib$(P).a
 
 clean:
 	rm -f *.o *.u .pure *.warnings
diff -dur cudd-2.4.1.ORIG/util/Makefile cudd-2.4.1/util/Makefile
--- cudd-2.4.1.ORIG/util/Makefile	2004-01-03 10:15:30.000000000 -0700
+++ cudd-2.4.1/util/Makefile	2009-01-22 13:04:48.000000000 -0700
@@ -12,6 +12,8 @@
 ICFLAGS = -g
 CFLAGS  = $(ICFLAGS) $(MFLAG) $(XCFLAGS)
 
+SHLINK	= -shared -Xlinker -soname -Xlinker libcudd$(P).so.2
+
 LINTFLAGS = -u -n
 
 # this is to create the lint library
@@ -28,6 +30,11 @@
 WHERE	= ..
 INCLUDE = $(WHERE)/include
 
+libcudd$(P).so.2.4.1: $(POBJ)
+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(POBJ) $(SHLINK)
+	ln -s libcudd$(P).so.2.4.1 libcudd$(P).so.2
+	ln -s libcudd$(P).so.2 libcudd$(P).so
+
 lib$(P).a: $(POBJ)
 	ar rv $@ $?
 	$(RANLIB) $@
@@ -56,7 +63,9 @@
 tags: $(PSRC) $(PHDR)
 	ctags $(PSRC) $(PHDR)
 
-all: lib$(P).a lib$(P).b llib-l$(P).ln tags
+all: libcudd$(P).so.2.4.1 lib$(P).b llib-l$(P).ln tags
+
+static: lib$(P).a
 
 clean:
 	rm -f *.o *.u core *.warnings

cudd-2.4.1-signedness.patch:

--- NEW FILE cudd-2.4.1-signedness.patch ---
diff -dur cudd-2.4.1.ORIG/cudd/cuddGroup.c cudd-2.4.1/cudd/cuddGroup.c
--- cudd-2.4.1.ORIG/cudd/cuddGroup.c	2004-08-24 15:37:44.000000000 -0600
+++ cudd-2.4.1/cudd/cuddGroup.c	2006-02-20 15:04:32.000000000 -0700
@@ -214,7 +214,9 @@
     ** Cudd_bddNewVarAtLevel or Cudd_addNewVarAtLevel to create new
     ** variables have to create the variables before they group them.
     */
-    level = (low < (unsigned int) dd->size) ? dd->perm[low] : low;
+    level = (low < (unsigned int) dd->size)
+      ? (unsigned int) dd->perm[low]
+      : low;
 
     if (level + size - 1> (int) MTR_MAXHIGH)
 	return(NULL);
diff -dur cudd-2.4.1.ORIG/cudd/cuddZddGroup.c cudd-2.4.1/cudd/cuddZddGroup.c
--- cudd-2.4.1.ORIG/cudd/cuddZddGroup.c	2004-08-24 15:37:47.000000000 -0600
+++ cudd-2.4.1/cudd/cuddZddGroup.c	2006-02-20 15:05:24.000000000 -0700
@@ -171,7 +171,9 @@
     ** Cudd_bddNewVarAtLevel or Cudd_addNewVarAtLevel to create new
     ** variables have to create the variables before they group them.
     */
-    level = (low < (unsigned int) dd->sizeZ) ? dd->permZ[low] : low;
+    level = (low < (unsigned int) dd->sizeZ)
+      ? (unsigned int) dd->permZ[low]
+      : low;
 
     if (level + size - 1> (int) MTR_MAXHIGH)
 	return(NULL);
diff -dur cudd-2.4.1.ORIG/st/st.c cudd-2.4.1/st/st.c
--- cudd-2.4.1.ORIG/st/st.c	2004-02-11 15:33:16.000000000 -0700
+++ cudd-2.4.1/st/st.c	2006-02-20 15:55:51.000000000 -0700
@@ -54,7 +54,7 @@
 #define st_shift 2
 #endif
 
-#define ST_PTRHASH(x,size) ((unsigned int)((unsigned long)(x)>>st_shift)%size)
+#define ST_PTRHASH(x,size) ((int)((unsigned long)(x)>>st_shift)%size)
 
 #define EQUAL(func, x, y) \
     ((((func) == st_numcmp) || ((func) == st_ptrcmp)) ?\

cudd-2.4.1-strcat.patch:

--- NEW FILE cudd-2.4.1-strcat.patch ---
diff -dur cudd-2.4.1.ORIG/util/texpand.c cudd-2.4.1/util/texpand.c
--- cudd-2.4.1.ORIG/util/texpand.c	2004-01-01 09:49:21.000000000 -0700
+++ cudd-2.4.1/util/texpand.c	2006-02-20 14:57:37.000000000 -0700
@@ -14,9 +14,6 @@
 #ifdef BSD
     struct passwd *userRecord;
     char username[256], *filename;
-#ifndef _IBMR2
-    char *strcat (char *, const char *);
-#endif
     register int i, j;
 
     filename = ALLOC(char, strlen(fname) + 256);


Index: cudd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cudd/F-9/cudd.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cudd.spec	7 Jan 2009 03:31:04 -0000	1.1
+++ cudd.spec	22 Jan 2009 21:03:13 -0000	1.2
@@ -1,14 +1,30 @@
-%define debug_package %{nil}
-# rpmbuild doesn't get useful debuginfo from .a libs
-
 Name:           cudd
 Version:        2.4.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        CU Decision Diagram Package
 Group:          Development/Libraries
 License:        BSD
 URL:            http://vlsi.colorado.edu/~fabio/CUDD/
 Source0:        ftp://vlsi.Colorado.EDU/pub/cudd-%{version}.tar.gz
+# This patch was sent upstream in September 2005.
+# Build shared libraries as well as static archives, and incidentally unbreak
+# parallel make.
+Patch0:         cudd-2.4.1-sharedlib.patch
+# This patch was sent upstream in September 2005.
+# Extern declarations of strcat get mangled by the preprocessor
+Patch1:         cudd-2.4.1-strcat.patch
+# This patch was sent upstream in September 2005.
+# Fix some mixed signed/unsigned operations
+Patch2:         cudd-2.4.1-signedness.patch
+# This patch was sent upstream in September 2005.
+# Don't ignore the return values of certain functions
+Patch3:         cudd-2.4.1-retval.patch
+# This patch was sent upstream in September 2005.
+# Fix a bunch of "used without being initialized" warnings
+Patch4:         cudd-2.4.1-init.patch
+# This patch was sent upstream in September 2005.
+# On 64 bit platforms, fix the size definitions of void * and long
+Patch5:         cudd-2.4.1-64bit.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 
@@ -19,48 +35,128 @@
 
 
 %package        devel
-Summary:        Development files for %{name}
+Summary:        Header files and man pages for %{name}
 Group:          Development/Libraries
-Provides:       %{name}-static = %{version}-%{release}
+Requires:       %{name} = %{version}-%{release}
 
 
 %description    devel
-Development headers and libraries for %{name}.
+Development headers and man pages for %{name}.
+
+
+%package        static
+Summary:        Static libraries for %{name}
+Group:          Development/Libraries
+
+
+%description    static
+Static libraries for %{name}.
 
 
 %prep
 %setup -q
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
+
+# Fix two doc files with DOS line endings
+sed -i 's/\r//' dddmp/README.dddmp
+sed -i 's/\r//' dddmp/README.testdddmp
 
 
 %build
-make %{?_smp_mflags} CPPFLAGS="%{optflags}" ICFLAGS="%{optflags}" \
-  XCFLAGS=""
+# Build the shared libraries and binaries
+make %{?_smp_mflags} CPPFLAGS="%{optflags}" ICFLAGS="%{optflags} -fPIC" \
+  XCFLAGS="-DHAVE_IEEE_754 -DBSD"
+
+# Build the static libraries
+make clean
+make %{?_smp_mflags} static CPPFLAGS="%{optflags}" ICFLAGS="%{optflags}" \
+  XCFLAGS="-DHAVE_IEEE_754 -DBSD"
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
+
+# Install the shared libraries
+mkdir -p $RPM_BUILD_ROOT%{_libdir}
+for slib in */*.so; do
+  install -p -m 755 ${slib}.2.4.1 $RPM_BUILD_ROOT%{_libdir}/
+  mv ${slib}.2 $RPM_BUILD_ROOT%{_libdir}
+  mv ${slib} $RPM_BUILD_ROOT%{_libdir}
+done
+
+# Install the static libraries
 mkdir -p $RPM_BUILD_ROOT%{_libdir}/%{name}
 for slib in */*.a; do
   install -p -m 644 ${slib} $RPM_BUILD_ROOT%{_libdir}/%{name}/
 done
+
+# Install the header files
 mkdir -p $RPM_BUILD_ROOT%{_includedir}/%{name}
 for hdr in include/*; do
   install -p -m 644 ${hdr} $RPM_BUILD_ROOT%{_includedir}/%{name}/
 done
 
+# Install the test binary
+mkdir -p $RPM_BUILD_ROOT%{_bindir}
+install -p -m 0755 nanotrav/nanotrav $RPM_BUILD_ROOT%{_bindir}
+
+# Install the test binary man page
+mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
+install -p -m 0644 nanotrav/nanotrav.1 $RPM_BUILD_ROOT%{_mandir}/man1
+
+# Put all the documentation in one place for easy installation
+mkdir doc
+mv cudd/doc doc/cudd
+mv dddmp/doc doc/dddmp
+mv dddmp/R* doc/dddmp
+mv mtr/doc doc/mtr
+mv nanotrav/doc doc/nanotrav
+mv nanotrav/README doc/nanotrav
+mv st/doc doc/st
+
+
+%post -p /sbin/ldconfig
+
+
+%postun -p /sbin/ldconfig
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 
+%files
+%defattr(-,root,root,-)
+%doc README LICENSE RELEASE.NOTES doc/nanotrav
+%{_bindir}/nanotrav
+%{_libdir}/*.so.*
+%{_mandir}/man1/*
+
+
 %files devel
 %defattr(-,root,root,-)
-%doc README LICENSE cudd/doc
-%{_libdir}/%{name}
+%doc README LICENSE doc/cudd doc/dddmp doc/mtr doc/st
 %{_includedir}/%{name}
+%{_libdir}/*.so
+
+
+%files static
+%defattr(-,root,root,-)
+%{_libdir}/%{name}
 
 
 %changelog
+* Thu Jan 22 2009 Jerry James <loganjerry at gmail.com> - 2.4.1-3
+- Add patches to address various minor build infelicities
+- Build both shared and static libraries
+- Install the test binary, nanotrav, and its man page
+- Gather documentation from all of the subdirectories
+
 * Sun Jan 4 2009 Conrad Meyer <konrad at tylerc.org> - 2.4.1-2
 - Add LICENSE, cudd/doc to docs.
 



From jjames at fedoraproject.org  Thu Jan 22 21:03:43 2009
From: jjames at fedoraproject.org (Jerry James)
Date: Thu, 22 Jan 2009 21:03:43 +0000 (UTC)
Subject: rpms/cudd/F-10 cudd-2.4.1-64bit.patch, NONE,
	1.1 cudd-2.4.1-init.patch, NONE, 1.1 cudd-2.4.1-retval.patch, NONE,
	1.1 cudd-2.4.1-sharedlib.patch, NONE,
	1.1 cudd-2.4.1-signedness.patch, NONE,
	1.1 cudd-2.4.1-strcat.patch, NONE, 1.1 cudd.spec, 1.1, 1.2
Message-ID: <20090122210343.C1B2970033@cvs1.fedora.phx.redhat.com>

Author: jjames

Update of /cvs/pkgs/rpms/cudd/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32285/F-10

Modified Files:
	cudd.spec 
Added Files:
	cudd-2.4.1-64bit.patch cudd-2.4.1-init.patch 
	cudd-2.4.1-retval.patch cudd-2.4.1-sharedlib.patch 
	cudd-2.4.1-signedness.patch cudd-2.4.1-strcat.patch 
Log Message:
* Thu Jan 22 2009 Jerry James <loganjerry at gmail.com> - 2.4.1-3
- Add patches to address various minor build infelicities
- Build both shared and static libraries
- Install the test binary, nanotrav, and its man page
- Gather documentation from all of the subdirectories


cudd-2.4.1-64bit.patch:

--- NEW FILE cudd-2.4.1-64bit.patch ---
diff -dur cudd-2.4.1.ORIG/cudd/cudd.h cudd-2.4.1/cudd/cudd.h
--- cudd-2.4.1.ORIG/cudd/cudd.h	2005-05-18 00:08:59.000000000 -0600
+++ cudd-2.4.1/cudd/cudd.h	2007-10-18 16:44:37.000000000 -0600
@@ -61,6 +61,7 @@
 /* Nested includes                                                           */
 /*---------------------------------------------------------------------------*/
 
+#include <bits/wordsize.h>
 #include "mtr.h"
 #include "epd.h"
 
@@ -75,14 +76,22 @@
 #define CUDD_VERSION "2.4.1"
 
 #ifndef SIZEOF_VOID_P
+#if __WORDSIZE == 64
+#define SIZEOF_VOID_P 8
+#else
 #define SIZEOF_VOID_P 4
 #endif
+#endif
 #ifndef SIZEOF_INT
 #define SIZEOF_INT 4
 #endif
 #ifndef SIZEOF_LONG
+#if __WORDSIZE == 64
+#define SIZEOF_LONG 8
+#else
 #define SIZEOF_LONG 4
 #endif
+#endif
 
 #ifndef TRUE
 #define TRUE 1
diff -dur cudd-2.4.1.ORIG/mtr/mtr.h cudd-2.4.1/mtr/mtr.h
--- cudd-2.4.1.ORIG/mtr/mtr.h	2004-08-24 15:30:36.000000000 -0600
+++ cudd-2.4.1/mtr/mtr.h	2007-10-18 16:45:19.000000000 -0600
@@ -63,6 +63,8 @@
 /* Nested includes                                                           */
 /*---------------------------------------------------------------------------*/
 
+#include <bits/wordsize.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -72,8 +74,12 @@
 /*---------------------------------------------------------------------------*/
 
 #ifndef SIZEOF_VOID_P
+#if __WORDSIZE == 64
+#define SIZEOF_VOID_P 8
+#else
 #define SIZEOF_VOID_P 4
 #endif
+#endif
 #ifndef SIZEOF_INT
 #define SIZEOF_INT 4
 #endif
diff -dur cudd-2.4.1.ORIG/util/util.h cudd-2.4.1/util/util.h
--- cudd-2.4.1.ORIG/util/util.h	2004-02-05 18:15:36.000000000 -0700
+++ cudd-2.4.1/util/util.h	2007-10-18 16:45:58.000000000 -0600
@@ -3,6 +3,8 @@
 #ifndef UTIL_H
 #define UTIL_H
 
+#include <bits/wordsize.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -20,14 +22,22 @@
 #endif
 
 #ifndef SIZEOF_VOID_P
+#if __WORDSIZE == 64
+#define SIZEOF_VOID_P 8
+#else
 #define SIZEOF_VOID_P 4
 #endif
+#endif
 #ifndef SIZEOF_INT
 #define SIZEOF_INT 4
 #endif
 #ifndef SIZEOF_LONG
+#if __WORDSIZE == 64
+#define SIZEOF_LONG 8
+#else
 #define SIZEOF_LONG 4
 #endif
+#endif
 
 #if SIZEOF_VOID_P == 8 && SIZEOF_INT == 4
 typedef long util_ptrint;

cudd-2.4.1-init.patch:

--- NEW FILE cudd-2.4.1-init.patch ---
diff -dur cudd-2.4.1.ORIG/cudd/cuddAddIte.c cudd-2.4.1/cudd/cuddAddIte.c
--- cudd-2.4.1.ORIG/cudd/cuddAddIte.c	2004-08-24 15:37:42.000000000 -0600
+++ cudd-2.4.1/cudd/cuddAddIte.c	2006-07-17 16:04:43.000000000 -0600
@@ -447,7 +447,7 @@
     DdNode *one,*zero;
     DdNode *r,*Fv,*Fnv,*Gv,*Gnv,*Hv,*Hnv,*t,*e;
     unsigned int topf,topg,toph,v;
-    int index;
+    int index = 0;
 
     statLine(dd);
     /* Trivial cases. */
diff -dur cudd-2.4.1.ORIG/cudd/cuddAddWalsh.c cudd-2.4.1/cudd/cuddAddWalsh.c
--- cudd-2.4.1.ORIG/cudd/cuddAddWalsh.c	2004-08-24 15:37:42.000000000 -0600
+++ cudd-2.4.1/cudd/cuddAddWalsh.c	2006-07-17 16:04:43.000000000 -0600
@@ -298,7 +298,7 @@
   int  n)
 {
     DdNode *one, *minusone;
-    DdNode *t, *u, *t1, *u1, *v, *w;
+    DdNode *t = NULL, *u, *t1, *u1, *v, *w;
     int     i;
 
     one = DD_ONE(dd);
diff -dur cudd-2.4.1.ORIG/cudd/cuddBddIte.c cudd-2.4.1/cudd/cuddBddIte.c
--- cudd-2.4.1.ORIG/cudd/cuddBddIte.c	2004-08-24 15:37:43.000000000 -0600
+++ cudd-2.4.1/cudd/cuddBddIte.c	2006-07-17 16:04:43.000000000 -0600
@@ -635,7 +635,7 @@
     DdNode	 *one, *zero, *res;
     DdNode	 *r, *Fv, *Fnv, *Gv, *Gnv, *H, *Hv, *Hnv, *t, *e;
     unsigned int topf, topg, toph, v;
-    int		 index;
+    int		 index = 0;
     int		 comple;
 
     statLine(dd);
diff -dur cudd-2.4.1.ORIG/cudd/cuddDecomp.c cudd-2.4.1/cudd/cuddDecomp.c
--- cudd-2.4.1.ORIG/cudd/cuddDecomp.c	2004-08-24 15:37:43.000000000 -0600
+++ cudd-2.4.1/cudd/cuddDecomp.c	2006-07-17 16:04:43.000000000 -0600
@@ -1689,7 +1689,7 @@
   st_table * mintermTable)
 {
     int topid, distance;
-    Conjuncts *factorsNv, *factorsNnv, *factors;
+    Conjuncts *factorsNv = NULL, *factorsNnv = NULL, *factors;
     Conjuncts *dummy;
     DdNode *N, *Nv, *Nnv, *temp, *g1, *g2, *h1, *h2, *topv;
     double minNv = 0.0, minNnv = 0.0;
diff -dur cudd-2.4.1.ORIG/cudd/cuddGroup.c cudd-2.4.1/cudd/cuddGroup.c
--- cudd-2.4.1.ORIG/cudd/cuddGroup.c	2006-07-17 16:04:04.000000000 -0600
+++ cudd-2.4.1/cudd/cuddGroup.c	2006-07-17 16:04:43.000000000 -0600
@@ -454,7 +454,7 @@
   Cudd_ReorderingType method)
 {
     int lower;
-    int upper;
+    int upper = 0;
     int result;
     unsigned int initialSize;
 
@@ -1492,7 +1492,7 @@
     Move *move;
     int  size;
     int  i,j,xtop,xbot,xsize,ytop,ybot,ysize,newxtop;
-    int  swapx,swapy;
+    int  swapx = 0, swapy = 0;
 #if defined(DD_DEBUG) && defined(DD_VERBOSE)
     int  initialSize,bestSize;
 #endif
@@ -1672,7 +1672,7 @@
 {
     Move *move;
     int  res;
-    Move *end_move;
+    Move *end_move = NULL;
     int diff, tmp_diff;
     int index, pairlev;
 
diff -dur cudd-2.4.1.ORIG/cudd/cuddHarwell.c cudd-2.4.1/cudd/cuddHarwell.c
--- cudd-2.4.1.ORIG/cudd/cuddHarwell.c	2004-08-24 15:37:44.000000000 -0600
+++ cudd-2.4.1/cudd/cuddHarwell.c	2006-07-17 16:04:43.000000000 -0600
@@ -152,6 +152,7 @@
     int	*rhsptr, *rhsind;
 #endif
 
+    lx = ly = lxn = lyn = NULL;
     if (*nx < 0 || *ny < 0) return(0);
 
     one = DD_ONE(dd);
diff -dur cudd-2.4.1.ORIG/cudd/cuddLinear.c cudd-2.4.1/cudd/cuddLinear.c
--- cudd-2.4.1.ORIG/cudd/cuddLinear.c	2004-08-24 15:37:45.000000000 -0600
+++ cudd-2.4.1/cudd/cuddLinear.c	2006-07-17 16:04:43.000000000 -0600
@@ -373,7 +373,7 @@
     int    posn;
     int    isolated;
     DdNode *f,*f0,*f1,*f01,*f00,*f11,*f10,*newf1,*newf0;
-    DdNode *g,*next,*last;
+    DdNode *g,*next,*last = NULL;
     DdNodePtr *previousP;
     DdNode *tmp;
     DdNode *sentinel = &(table->sentinel);
diff -dur cudd-2.4.1.ORIG/cudd/cuddPriority.c cudd-2.4.1/cudd/cuddPriority.c
--- cudd-2.4.1.ORIG/cudd/cuddPriority.c	2004-08-24 15:37:45.000000000 -0600
+++ cudd-2.4.1/cudd/cuddPriority.c	2006-07-17 16:04:43.000000000 -0600
@@ -965,7 +965,7 @@
 {
     DdNode *res, *res1, *res2, *resA;
     DdNode *r, *y, *RT, *RE, *YT, *YE, *Yrest, *Ra, *Ran, *Gamma, *Alpha;
-    unsigned int topR, topY, top, index;
+    unsigned int topR, topY, top, index = 0U;
     DdNode *one = DD_ONE(dd);
 
     statLine(dd);
diff -dur cudd-2.4.1.ORIG/cudd/cuddReorder.c cudd-2.4.1/cudd/cuddReorder.c
--- cudd-2.4.1.ORIG/cudd/cuddReorder.c	2004-08-24 15:37:45.000000000 -0600
+++ cudd-2.4.1/cudd/cuddReorder.c	2006-07-17 16:04:43.000000000 -0600
@@ -606,7 +606,7 @@
     int	iterate;
     int previousSize;
     Move *moves, *move;
-    int	pivot;
+    int	pivot = 0;
     int	modulo;
     int result;
 
diff -dur cudd-2.4.1.ORIG/cudd/cuddSubsetSP.c cudd-2.4.1/cudd/cuddSubsetSP.c
--- cudd-2.4.1.ORIG/cudd/cuddSubsetSP.c	2004-08-24 15:37:45.000000000 -0600
+++ cudd-2.4.1/cudd/cuddSubsetSP.c	2006-07-17 16:04:43.000000000 -0600
@@ -1255,17 +1255,17 @@
 {
     DdNode *N, *Nv, *Nnv;
     DdNode *ThenBranch, *ElseBranch, *childBranch;
-    DdNode *child, *regChild, *regNnv, *regNv;
+    DdNode *child, *regChild, *regNnv = NULL, *regNv = NULL;
     NodeDist_t *nodeStatNv, *nodeStat, *nodeStatNnv;
     DdNode *neW, *topv, *regNew;
     char *entry;
     unsigned int topid;
-    unsigned int childPathLength, oddLen, evenLen, NnvPathLength, NvPathLength;
+    unsigned int childPathLength, oddLen, evenLen;
+    unsigned int NnvPathLength = 0U, NvPathLength = 0U;
     unsigned int NvBotDist, NnvBotDist;
     int tiebreakChild;
     int  processingDone, thenDone, elseDone;
 
-
 #ifdef DD_DEBUG
     numCalls++;
 #endif
diff -dur cudd-2.4.1.ORIG/cudd/cuddSymmetry.c cudd-2.4.1/cudd/cuddSymmetry.c
--- cudd-2.4.1.ORIG/cudd/cuddSymmetry.c	2004-08-24 15:37:46.000000000 -0600
+++ cudd-2.4.1/cudd/cuddSymmetry.c	2006-07-17 16:04:43.000000000 -0600
@@ -1472,10 +1472,10 @@
   Move ** moves)
 {
     Move *move;
-    int	 size;
+    int	 size = 0;
     int  i,j;
     int  xtop,xbot,xsize,ytop,ybot,ysize,newxtop;
-    int  swapx,swapy;
+    int  swapx = 0, swapy = 0;
 
 #if DD_DEBUG
     assert(x < y);	/* we assume that x < y */
@@ -1551,7 +1551,7 @@
   int  x,
   int  y)
 {
-    int	size;
+    int	size = 0;
     int i,j;
     int	xtop,xbot,xsize,ytop,ybot,ysize,newxtop;
 
diff -dur cudd-2.4.1.ORIG/cudd/cuddTable.c cudd-2.4.1/cudd/cuddTable.c
--- cudd-2.4.1.ORIG/cudd/cuddTable.c	2004-08-24 15:37:46.000000000 -0600
+++ cudd-2.4.1/cudd/cuddTable.c	2006-07-17 16:04:43.000000000 -0600
@@ -1726,7 +1726,7 @@
     int oldsize,newsize;
     int i,j,index,reorderSave;
     unsigned int numSlots = unique->initSlots;
-    int *newperm, *newinvperm, *newmap;
+    int *newperm, *newinvperm, *newmap = NULL;
     DdNode *one, *zero;
 
 #ifdef DD_DEBUG
@@ -2454,7 +2454,7 @@
     int oldsize,newsize;
     int i,j,reorderSave;
     int numSlots = unique->initSlots;
-    int *newperm, *newinvperm, *newmap;
+    int *newperm, *newinvperm, *newmap = NULL;
     DdNode *one, *zero;
 
     oldsize = unique->size;
diff -dur cudd-2.4.1.ORIG/cudd/cuddUtil.c cudd-2.4.1/cudd/cuddUtil.c
--- cudd-2.4.1.ORIG/cudd/cuddUtil.c	2005-05-14 11:28:01.000000000 -0600
+++ cudd-2.4.1/cudd/cuddUtil.c	2006-07-17 16:04:43.000000000 -0600
@@ -1400,7 +1400,7 @@
     DdNode **old, *neW;
     double minterms;
     char *saveString;
-    int saveFlag, savePoint, isSame;
+    int saveFlag, savePoint = 0, isSame;
 
     minterms = Cudd_CountMinterm(dd,f,n);
     if ((double)k > minterms) {
diff -dur cudd-2.4.1.ORIG/cudd/cuddZddGroup.c cudd-2.4.1/cudd/cuddZddGroup.c
--- cudd-2.4.1.ORIG/cudd/cuddZddGroup.c	2006-07-17 16:04:04.000000000 -0600
+++ cudd-2.4.1/cudd/cuddZddGroup.c	2006-07-17 16:04:43.000000000 -0600
@@ -434,7 +434,7 @@
   Cudd_ReorderingType method)
 {
     int lower;
-    int upper;
+    int upper = 0;
     int result;
     unsigned int initialSize;
 
@@ -1082,7 +1082,7 @@
     Move *move;
     int  size;
     int  i,j,xtop,xbot,xsize,ytop,ybot,ysize,newxtop;
-    int  swapx,swapy;
+    int  swapx = 0, swapy = 0;
 #if defined(DD_DEBUG) && defined(DD_VERBOSE)
     int  initialSize,bestSize;
 #endif
diff -dur cudd-2.4.1.ORIG/cudd/cuddZddReord.c cudd-2.4.1/cudd/cuddZddReord.c
--- cudd-2.4.1.ORIG/cudd/cuddZddReord.c	2004-08-24 15:37:47.000000000 -0600
+++ cudd-2.4.1/cudd/cuddZddReord.c	2006-07-17 16:04:43.000000000 -0600
@@ -491,7 +491,7 @@
     int		i;
     int		posn;
     DdNode	*f, *f1, *f0, *f11, *f10, *f01, *f00;
-    DdNode	*newf1, *newf0, *next;
+    DdNode	*newf1 = NULL, *newf0, *next;
     DdNodePtr	g, *lastP, *previousP;
 
 #ifdef DD_DEBUG
@@ -752,7 +752,7 @@
     int iterate;
     int previousSize;
     Move *moves, *move;
-    int	pivot;
+    int	pivot = 0;
     int modulo;
     int result;
 
diff -dur cudd-2.4.1.ORIG/cudd/cuddZddSymm.c cudd-2.4.1/cudd/cuddZddSymm.c
--- cudd-2.4.1.ORIG/cudd/cuddZddSymm.c	2004-08-24 15:37:47.000000000 -0600
+++ cudd-2.4.1/cudd/cuddZddSymm.c	2006-07-17 16:04:43.000000000 -0600
@@ -1483,7 +1483,7 @@
     Move	*move;
     int		size;
     int		i, temp, gxtop, gxbot, gybot, yprev;
-    int		swapx, swapy;
+    int		swapx = 0, swapy = 0;
 
 #ifdef DD_DEBUG
     assert(x < y);	/* we assume that x < y */
@@ -1586,7 +1586,7 @@
   int  x,
   int  y)
 {
-    int	       size;
+    int	       size = 0;
     int        i, temp, gxtop, gxbot, gybot, yprev;
 
 #ifdef DD_DEBUG
diff -dur cudd-2.4.1.ORIG/nanotrav/bnet.c cudd-2.4.1/nanotrav/bnet.c
--- cudd-2.4.1.ORIG/nanotrav/bnet.c	2004-08-24 15:34:48.000000000 -0600
+++ cudd-2.4.1/nanotrav/bnet.c	2006-07-17 16:04:43.000000000 -0600
@@ -1884,6 +1884,7 @@
     DdNode *func, *f, *g, *h;
     BnetNode *auxnd;
 
+    mux[0] = mux[1] = phase[0] = phase[1] = 0;
     if (nd->ninp != 3) return(0);
 
     for (line = nd->f; line != NULL; line = line->next) {
diff -dur cudd-2.4.1.ORIG/nanotrav/ntr.c cudd-2.4.1/nanotrav/ntr.c
--- cudd-2.4.1.ORIG/nanotrav/ntr.c	2004-08-24 15:34:47.000000000 -0600
+++ cudd-2.4.1/nanotrav/ntr.c	2006-07-17 16:07:12.000000000 -0600
@@ -964,7 +964,7 @@
     DdNode *neW;
     DdNode *one, *zero;
     DdNode *states, *scc;
-    DdNode *tmp;
+    DdNode *tmp = NULL;
     DdNode *SCCs[10];
     int depth;
     int nscc = 0;

cudd-2.4.1-retval.patch:

--- NEW FILE cudd-2.4.1-retval.patch ---
diff -dur cudd-2.4.1.ORIG/dddmp/dddmpDbg.c cudd-2.4.1/dddmp/dddmpDbg.c
--- cudd-2.4.1.ORIG/dddmp/dddmpDbg.c	2004-02-18 09:23:31.000000000 -0700
+++ cudd-2.4.1/dddmp/dddmpDbg.c	2006-02-20 16:05:04.000000000 -0700
@@ -97,7 +97,8 @@
   while (fgets(buf, 999,fp)!=NULL) {
     fprintf (fpo, "%s", buf);
     if (strncmp(buf, ".nnodes", 7) == 0) {
-      sscanf (buf, "%*s %d", &nnodes);
+      if (sscanf (buf, "%*s %d", &nnodes) == EOF)
+	break;
     }
     if (strncmp(buf, ".rootids", 8) == 0) {
       break;
@@ -141,7 +142,8 @@
 
   }
 
-  fgets(buf, 999,fp);
+  if (fgets(buf, 999,fp) == NULL)
+    buf[0] = '\0';
   if (strncmp(buf, ".end", 4) != 0) {
     return (0);
   }
diff -dur cudd-2.4.1.ORIG/dddmp/dddmpLoad.c cudd-2.4.1/dddmp/dddmpLoad.c
--- cudd-2.4.1.ORIG/dddmp/dddmpLoad.c	2004-02-18 09:24:00.000000000 -0700
+++ cudd-2.4.1/dddmp/dddmpLoad.c	2006-02-20 16:02:11.000000000 -0700
@@ -1109,7 +1109,8 @@
 
   /*------------------------ Deal With the File Tail -----------------------*/
 
-  fgets (buf, DDDMP_MAXSTRLEN-1,fp);
+  if (fgets (buf, DDDMP_MAXSTRLEN-1,fp) == NULL)
+    buf[0] = '\0';
   Dddmp_CheckAndGotoLabel (!matchkeywd(buf, ".end"),
     "Error .end not found.", failure);
 
@@ -1273,7 +1274,8 @@
 
     /* comment */
     if (buf[0] == '#') {
-      fgets(buf,DDDMP_MAXSTRLEN,fp);
+      if (fgets(buf,DDDMP_MAXSTRLEN,fp) == NULL)
+	buf[0] = '\0';
       continue;
     }
 
@@ -1424,7 +1426,8 @@
     }
 
     if (matchkeywd(buf, ".nodes")) {
-      fgets(buf,DDDMP_MAXSTRLEN,fp);
+      if (fgets(buf,DDDMP_MAXSTRLEN,fp) == NULL)
+	buf[0] = '\0';
       break;
     }
 
diff -dur cudd-2.4.1.ORIG/dddmp/dddmpLoadCnf.c cudd-2.4.1/dddmp/dddmpLoadCnf.c
--- cudd-2.4.1.ORIG/dddmp/dddmpLoadCnf.c	2004-02-20 01:35:56.000000000 -0700
+++ cudd-2.4.1/dddmp/dddmpLoadCnf.c	2006-02-20 16:04:02.000000000 -0700
@@ -554,7 +554,8 @@
 
     /* Init Problem Line */ 
     if (buf[0] == 'p') {
-      fscanf (fp, "%*s %d %d", &nv, &nc);
+      if (fscanf (fp, "%*s %d %d", &nv, &nc) == EOF)
+	break;
       Hdr->nVarsCnf = nv;
       Hdr->nClausesCnf = nc;
       break;
@@ -569,7 +570,8 @@
 
     /* Skip Comment? */
     if (buf[0] != '.') {
-      fgets (buf, DDDMP_MAXSTRLEN, fp);
+      if (fgets (buf, DDDMP_MAXSTRLEN, fp) == NULL)
+	buf[0] = '\0';
       continue;
     }
 
@@ -811,7 +813,8 @@
     /* Check for Comment */
     if (word[0] == 'c') {
       /* Comment Found: Skip line */
-      fgets (word, DDDMP_MAX_CNF_ROW_LENGTH-1, fp);
+      if (fgets (word, DDDMP_MAX_CNF_ROW_LENGTH-1, fp) == NULL)
+	word[0] = '\0';
       break;
     }
 
diff -dur cudd-2.4.1.ORIG/epd/epd.c cudd-2.4.1/epd/epd.c
--- cudd-2.4.1.ORIG/epd/epd.c	2004-08-24 15:33:13.000000000 -0600
+++ cudd-2.4.1/epd/epd.c	2006-02-20 16:07:56.000000000 -0700
@@ -1094,7 +1094,8 @@
 
   sprintf(str, "%E", value);
   pos = strstr(str, "E");
-  sscanf(pos, "E%d", &exponent);
+  if (sscanf(pos, "E%d", &exponent) == EOF)
+    exponent = 0;
   return(exponent);
 }
 
diff -dur cudd-2.4.1.ORIG/util/pipefork.c cudd-2.4.1/util/pipefork.c
--- cudd-2.4.1.ORIG/util/pipefork.c	2004-08-17 18:07:57.000000000 -0600
+++ cudd-2.4.1/util/pipefork.c	2006-02-20 16:07:06.000000000 -0700
@@ -39,8 +39,10 @@
      * fildes[0] for reading from command
      * fildes[1] for writing to command
      */
-    (void) pipe(topipe);
-    (void) pipe(frompipe);
+    if (pipe(topipe) < 0 || pipe(frompipe) < 0) {
+      fputs("Pipe creation failed.\n", stderr);
+      return 1;
+    }
 
 #ifdef __CYGWIN32__
     if ((forkpid = fork()) == 0) {

cudd-2.4.1-sharedlib.patch:

--- NEW FILE cudd-2.4.1-sharedlib.patch ---
diff -dur cudd-2.4.1.ORIG/cudd/doc/node3.html cudd-2.4.1/cudd/doc/node3.html
--- cudd-2.4.1.ORIG/cudd/doc/node3.html	2005-05-17 23:20:29.000000000 -0600
+++ cudd-2.4.1/cudd/doc/node3.html	2009-01-22 09:19:03.000000000 -0700
@@ -153,16 +153,18 @@
 <P>
 To build an application that uses the CUDD package, you should add
 <PRE>
-#include "util.h"
-#include "cudd.h"
+#include &lt;util.h&gt;
+#include &lt;cudd.h&gt;
 </PRE>
 <A NAME="81"></A>
-to your source files, and should link
+to your source files, compile with <CODE>-I/usr/include/cudd</CODE>, and link
 <code>libcudd.a</code><A NAME="82"></A>,
 <code>libmtr.a</code><A NAME="83"></A>,
 <code>libst.a</code><A NAME="84"></A>, and
 <code>libutil.a</code><A NAME="85"></A> to your executable. (All these
-libraries are part of the distribution.) Some
+libraries are part of the distribution.)  Note that shared library equivalents
+are also available, and are linked to one another appropriately; i.e., it is
+sufficient to add <CODE>-lcudd</CODE> to your link command.  Some
 platforms require specific compiler and linker flags.  Refer to the
 <TT>Makefile<A NAME="86"></A></TT> in the top level directory of the
 distribution.
diff -dur cudd-2.4.1.ORIG/cudd/Makefile cudd-2.4.1/cudd/Makefile
--- cudd-2.4.1.ORIG/cudd/Makefile	1999-08-19 16:34:24.000000000 -0600
+++ cudd-2.4.1/cudd/Makefile	2009-01-22 09:46:31.000000000 -0700
@@ -27,6 +27,10 @@
 
 INCLUDE = $(WHERE)/include
 
+SHLINK	= -shared -Xlinker -soname -Xlinker lib$(P).so.2 \
+	-L$(WHERE)/mtr -L$(WHERE)/st -L$(WHERE)/util -L$(WHERE)/epd \
+	-lmtr -lcuddst -lcuddutil -lepd -lm
+
 LIBS	= ./libcudd.a $(WHERE)/mtr/libmtr.a \
 	$(WHERE)/st/libst.a $(WHERE)/util/libutil.a $(WHERE)/epd/libepd.a
 
@@ -71,6 +75,11 @@
 
 #------------------------------------------------------
 
+lib$(P).so.2.4.1: $(POBJ)
+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(POBJ) $(SHLINK)
+	ln -s lib$(P).so.2.4.1 lib$(P).so.2
+	ln -s lib$(P).so.2 lib$(P).so
+
 lib$(P).a: $(POBJ)
 	ar rv $@ $?
 	$(RANLIB) $@
@@ -111,7 +120,9 @@
 tags: $(PSRC) $(PHDR)
 	ctags $(PSRC) $(PHDR)
 
-all: lib$(P).a lib$(P).b llib-l$(P).ln tags
+all: lib$(P).so.2.4.1 lib$(P).b llib-l$(P).ln tags
+
+static: lib$(P).a
 
 programs: $(TARGET) $(TARGETu) lintpgm
 
diff -dur cudd-2.4.1.ORIG/dddmp/Makefile cudd-2.4.1/dddmp/Makefile
--- cudd-2.4.1.ORIG/dddmp/Makefile	2004-02-20 09:13:24.000000000 -0700
+++ cudd-2.4.1/dddmp/Makefile	2009-01-22 09:46:18.000000000 -0700
@@ -170,6 +170,10 @@
 LINTFLAGS = -u -n
 LINTSWITCH = -o
 
+SHLINK	= -shared -Xlinker -soname -Xlinker lib$(P).so.2 \
+	-L$(WHERE)/cudd -L$(WHERE)/mtr -L$(WHERE)/st -L$(WHERE)/util \
+	-L$(WHERE)/epd -lcudd -lcuddst -lcuddutil
+
 LIBS	= ./libdddmp.a $(WHERE)/cudd/libcudd.a $(WHERE)/mtr/libmtr.a \
 	$(WHERE)/st/libst.a $(WHERE)/util/libutil.a $(WHERE)/epd/libepd.a
 
@@ -182,6 +186,11 @@
 	$(WHERE)/mtr/llib-lmtr.ln $(WHERE)/st/llib-lst.ln \
 	$(WHERE)/util/llib-lutil.ln
 
+lib$(P).so.2.4.1: $(POBJ)
+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(POBJ) $(SHLINK)
+	ln -s lib$(P).so.2.4.1 lib$(P).so.2
+	ln -s lib$(P).so.2 lib$(P).so
+
 lib$(P).a: $(POBJ)
 	ar rv $@ $?
 	$(RANLIB) $@
@@ -222,7 +231,9 @@
 tags: $(PSRC) $(PHDR)
 	ctags $(PSRC) $(PHDR)
 
-all: lib$(P).a lib$(P).b llib-l$(P).ln tags
+all: lib$(P).so.2.4.1 lib$(P).b llib-l$(P).ln tags
+
+static: lib$(P).a
 
 programs: $(TARGET) $(TARGETu) lintpgm
 
diff -dur cudd-2.4.1.ORIG/epd/Makefile cudd-2.4.1/epd/Makefile
--- cudd-2.4.1.ORIG/epd/Makefile	2003-12-31 09:31:30.000000000 -0700
+++ cudd-2.4.1/epd/Makefile	2009-01-22 09:50:20.000000000 -0700
@@ -11,6 +11,9 @@
 ICFLAGS = -g -O6 -Wall
 CFLAGS  = $(ICFLAGS) $(MFLAG) $(XCFLAGS)
 
+SHLINK	= -shared -Xlinker -soname -Xlinker lib$(P).so.2 -L$(WHERE)/util \
+	-lcuddutil -lm
+
 LINTFLAGS = -u -n
 
 # this is to create the lint library
@@ -27,6 +30,11 @@
 
 #---------------------------
 
+lib$(P).so.2.4.1: $(POBJ)
+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(POBJ) $(SHLINK)
+	ln -s lib$(P).so.2.4.1 lib$(P).so.2
+	ln -s lib$(P).so.2 lib$(P).so
+
 lib$(P).a: $(POBJ)
 	ar rv $@ $?
 	$(RANLIB) $@
@@ -55,7 +63,9 @@
 tags: $(PSRC) $(PHDR)
 	ctags $(PSRC) $(PHDR)
 
-all: lib$(P).a lib$(P).b llib-l$(P).ln tags
+all: lib$(P).so.2.4.1 lib$(P).b llib-l$(P).ln tags
+
+static: lib$(P).a
 
 clean:
 	rm -f *.o *.u .pure *.warnings
diff -dur cudd-2.4.1.ORIG/Makefile cudd-2.4.1/Makefile
--- cudd-2.4.1.ORIG/Makefile	2004-08-17 18:18:45.000000000 -0600
+++ cudd-2.4.1/Makefile	2009-01-22 13:10:24.000000000 -0700
@@ -194,7 +194,7 @@
 IDIR	= $(DDWDIR)/include
 INCLUDE = -I$(IDIR)
 
-BDIRS	= cudd dddmp mtr st util epd
+BDIRS	= util epd mtr st cudd dddmp
 DIRS	= $(BDIRS) nanotrav
 
 #------------------------------------------------------------------------
@@ -210,6 +210,7 @@
 .PHONY : testmtr
 .PHONY : lint
 .PHONY : all
+.PHONY : static
 .PHONY : clean
 .PHONY : distclean
 
@@ -219,17 +220,22 @@
 	@for dir in $(DIRS); do \
 		(cd $$dir; \
 		echo Making $$dir ...; \
-		make CC=$(CC) RANLIB=$(RANLIB) MFLAG= MNEMLIB= ICFLAGS="$(ICFLAGS)" XCFLAGS="$(XCFLAGS)" DDDEBUG="$(DDDEBUG)" MTRDEBUG="$(MTRDEBUG)" LDFLAGS="$(LDFLAGS)" PURE="$(PURE)" EXE="$(EXE)" )\
+		$(MAKE) CC=$(CC) RANLIB=$(RANLIB) MFLAG= MNEMLIB= ICFLAGS="$(ICFLAGS)" XCFLAGS="$(XCFLAGS)" DDDEBUG="$(DDDEBUG)" MTRDEBUG="$(MTRDEBUG)" LDFLAGS="$(LDFLAGS)" PURE="$(PURE)" EXE="$(EXE)" )\
 	done
 
-nanotrav: build
+cudd: mtr st util epd
+dddmp: cudd
+epd: util
+mtr: util
+nanotrav: dddmp
+st: util
 
 check_leaks:
 	sh ./setup.sh
 	@for dir in mnemosyne $(DIRS); do \
 		(cd $$dir; \
 		echo Making $$dir ...; \
-		make CC=$(CC) RANLIB=$(RANLIB) MFLAG=$(MFLAG) MNEMLIB=$(MNEMLIB) ICFLAGS="$(ICFLAGS)" XCFLAGS="$(XCFLAGS)" DDDEBUG="$(DDDEBUG)" MTRDEBUG="$(MTRDEBUG)" LDFLAGS="$(LDFLAGS)" EXE="$(EXE)" )\
+		$(MAKE) CC=$(CC) RANLIB=$(RANLIB) MFLAG=$(MFLAG) MNEMLIB=$(MNEMLIB) ICFLAGS="$(ICFLAGS)" XCFLAGS="$(XCFLAGS)" DDDEBUG="$(DDDEBUG)" MTRDEBUG="$(MTRDEBUG)" LDFLAGS="$(LDFLAGS)" EXE="$(EXE)" )\
 	done
 
 optimize_dec:
@@ -237,7 +243,7 @@
 	@for dir in $(DIRS); do \
 		(cd $$dir; \
 		echo Making $$dir ...; \
-		make CC=$(CC) RANLIB=$(RANLIB) XCFLAGS="$(XCFLAGS)" LDFLAGS="$(LDFLAGS)" optimize_dec )\
+		$(MAKE) CC=$(CC) RANLIB=$(RANLIB) XCFLAGS="$(XCFLAGS)" LDFLAGS="$(LDFLAGS)" optimize_dec )\
 	done
 
 lint:
@@ -245,7 +251,7 @@
 	@for dir in $(DIRS) obj; do \
 		(cd $$dir; \
 		echo Making lint in $$dir ...; \
-		make CC=$(CC) lint )\
+		$(MAKE) CC=$(CC) lint )\
 	done
 
 tags:
@@ -253,7 +259,7 @@
 	@for dir in $(DIRS) obj; do \
 		(cd $$dir; \
 		echo Making tags in $$dir ...; \
-		make CC=$(CC) tags )\
+		$(MAKE) CC=$(CC) tags )\
 	done
 
 all:
@@ -261,7 +267,15 @@
 	@for dir in $(DIRS); do \
 		(cd $$dir; \
 		echo Making all in $$dir ...; \
-		make CC=$(CC) RANLIB=$(RANLIB) MFLAG= MNEMLIB= ICFLAGS="$(ICFLAGS)" XCFLAGS="$(XCFLAGS)" DDDEBUG="$(DDDEBUG)" MTRDEBUG="$(MTRDEBUG)" LDFLAGS="$(LDFLAGS)" PURE="$(PURE)" EXE="$(EXE)" all )\
+		$(MAKE) CC=$(CC) RANLIB=$(RANLIB) MFLAG= MNEMLIB= ICFLAGS="$(ICFLAGS)" XCFLAGS="$(XCFLAGS)" DDDEBUG="$(DDDEBUG)" MTRDEBUG="$(MTRDEBUG)" LDFLAGS="$(LDFLAGS)" PURE="$(PURE)" EXE="$(EXE)" all )\
+	done
+
+static:
+	sh ./setup.sh
+	@for dir in $(DIRS); do \
+		(cd $$dir; \
+		echo Making static in $$dir ...; \
+		$(MAKE) CC=$(CC) RANLIB=$(RANLIB) MFLAG= MNEMLIB= ICFLAGS="$(ICFLAGS)" XCFLAGS="$(XCFLAGS)" DDDEBUG="$(DDDEBUG)" MTRDEBUG="$(MTRDEBUG)" LDFLAGS="$(LDFLAGS)" PURE="$(PURE)" EXE="$(EXE)" static )\
 	done
 
 testcudd:
@@ -269,49 +283,49 @@
 	@for dir in util st mtr epd; do \
 		(cd $$dir; \
 		echo Making $$dir ...; \
-		make CC=$(CC) RANLIB=$(RANLIB) MFLAG= MNEMLIB= ICFLAGS="$(ICFLAGS)" XCFLAGS="$(XCFLAGS)" DDDEBUG="$(DDDEBUG)" MTRDEBUG="$(MTRDEBUG)" LDFLAGS="$(LDFLAGS)" PURE="$(PURE)" EXE="$(EXE)" )\
+		$(MAKE) CC=$(CC) RANLIB=$(RANLIB) MFLAG= MNEMLIB= ICFLAGS="$(ICFLAGS)" XCFLAGS="$(XCFLAGS)" DDDEBUG="$(DDDEBUG)" MTRDEBUG="$(MTRDEBUG)" LDFLAGS="$(LDFLAGS)" PURE="$(PURE)" EXE="$(EXE)" )\
 	done
 	@(cd cudd; \
 	echo Making testcudd ...; \
-	make CC=$(CC) RANLIB=$(RANLIB) MFLAG= MNEMLIB= ICFLAGS="$(ICFLAGS)" XCFLAGS="$(XCFLAGS)" DDDEBUG="$(DDDEBUG)" MTRDEBUG="$(MTRDEBUG)" LDFLAGS="$(LDFLAGS)" PURE="$(PURE)" EXE="$(EXE)" testcudd$(EXE) )
+	$(MAKE) CC=$(CC) RANLIB=$(RANLIB) MFLAG= MNEMLIB= ICFLAGS="$(ICFLAGS)" XCFLAGS="$(XCFLAGS)" DDDEBUG="$(DDDEBUG)" MTRDEBUG="$(MTRDEBUG)" LDFLAGS="$(LDFLAGS)" PURE="$(PURE)" EXE="$(EXE)" testcudd$(EXE) )
 
 objlib:
 	sh ./setup.sh
 	@for dir in $(BDIRS); do \
 		(cd $$dir; \
 		echo Making $$dir ...; \
-		make CC=$(CC) RANLIB=$(RANLIB) MFLAG= MNEMLIB= ICFLAGS="$(ICFLAGS)" XCFLAGS="$(XCFLAGS)" DDDEBUG="$(DDDEBUG)" MTRDEBUG="$(MTRDEBUG)" LDFLAGS="$(LDFLAGS)" PURE="$(PURE)" EXE="$(EXE)" )\
+		$(MAKE) CC=$(CC) RANLIB=$(RANLIB) MFLAG= MNEMLIB= ICFLAGS="$(ICFLAGS)" XCFLAGS="$(XCFLAGS)" DDDEBUG="$(DDDEBUG)" MTRDEBUG="$(MTRDEBUG)" LDFLAGS="$(LDFLAGS)" PURE="$(PURE)" EXE="$(EXE)" )\
 	done
 	@(cd obj; \
 	echo Making obj ...; \
-	make CPP=$(CPP) CPPFLAGS=$(CPPFLAGS) RANLIB=$(RANLIB) MFLAG= MNEMLIB= ICFLAGS="$(ICFLAGS)" XCFLAGS="$(XCFLAGS)" DDDEBUG="$(DDDEBUG)" MTRDEBUG="$(MTRDEBUG)" LDFLAGS="$(LDFLAGS)" PURE="$(PURE)" EXE="$(EXE)" )
+	$(MAKE) CPP=$(CPP) CPPFLAGS=$(CPPFLAGS) RANLIB=$(RANLIB) MFLAG= MNEMLIB= ICFLAGS="$(ICFLAGS)" XCFLAGS="$(XCFLAGS)" DDDEBUG="$(DDDEBUG)" MTRDEBUG="$(MTRDEBUG)" LDFLAGS="$(LDFLAGS)" PURE="$(PURE)" EXE="$(EXE)" )
 
 testobj: objlib
 	@(cd obj; \
 	echo Making testobj ...; \
-	make CPP=$(CPP) CPPFLAGS=$(CPPFLAGS) RANLIB=$(RANLIB) MFLAG= MNEMLIB= ICFLAGS="$(ICFLAGS)" XCFLAGS="$(XCFLAGS)" DDDEBUG="$(DDDEBUG)" MTRDEBUG="$(MTRDEBUG)" LDFLAGS="$(LDFLAGS)" PURE="$(PURE)" EXE="$(EXE)" testobj$(EXE) )
+	$(MAKE) CPP=$(CPP) CPPFLAGS=$(CPPFLAGS) RANLIB=$(RANLIB) MFLAG= MNEMLIB= ICFLAGS="$(ICFLAGS)" XCFLAGS="$(XCFLAGS)" DDDEBUG="$(DDDEBUG)" MTRDEBUG="$(MTRDEBUG)" LDFLAGS="$(LDFLAGS)" PURE="$(PURE)" EXE="$(EXE)" testobj$(EXE) )
 
 testdddmp: build
 	@(cd dddmp; \
 	echo Making testdddmp ...; \
-	make CC=$(CC) RANLIB=$(RANLIB) MFLAG= MNEMLIB= ICFLAGS="$(ICFLAGS)" XCFLAGS="$(XCFLAGS)" DDDEBUG="$(DDDEBUG)" MTRDEBUG="$(MTRDEBUG)" LDFLAGS="$(LDFLAGS)" PURE="$(PURE)" EXE="$(EXE)" testdddmp$(EXE) )
+	$(MAKE) CC=$(CC) RANLIB=$(RANLIB) MFLAG= MNEMLIB= ICFLAGS="$(ICFLAGS)" XCFLAGS="$(XCFLAGS)" DDDEBUG="$(DDDEBUG)" MTRDEBUG="$(MTRDEBUG)" LDFLAGS="$(LDFLAGS)" PURE="$(PURE)" EXE="$(EXE)" testdddmp$(EXE) )
 
 testmtr: build
 	@(cd mtr; \
 	echo Making testmtr ...; \
-	make CC=$(CC) RANLIB=$(RANLIB) MFLAG= MNEMLIB= ICFLAGS="$(ICFLAGS)" XCFLAGS="$(XCFLAGS)" DDDEBUG="$(DDDEBUG)" MTRDEBUG="$(MTRDEBUG)" LDFLAGS="$(LDFLAGS)" PURE="$(PURE)" EXE="$(EXE)" testmtr$(EXE) )
+	$(MAKE) CC=$(CC) RANLIB=$(RANLIB) MFLAG= MNEMLIB= ICFLAGS="$(ICFLAGS)" XCFLAGS="$(XCFLAGS)" DDDEBUG="$(DDDEBUG)" MTRDEBUG="$(MTRDEBUG)" LDFLAGS="$(LDFLAGS)" PURE="$(PURE)" EXE="$(EXE)" testmtr$(EXE) )
 
 clean:
 	@for dir in mnemosyne $(DIRS) obj; do	\
 	    (cd $$dir; 	\
 	     echo Cleaning $$dir ...; \
-	     make -s clean	) \
+	     $(MAKE) -s clean	) \
 	done
 
 distclean:
 	@for dir in mnemosyne $(DIRS) obj; do	\
 	    (cd $$dir; 	\
 	     echo Cleaning $$dir ...; \
-	     make -s EXE="$(EXE)" distclean	) \
+	     $(MAKE) -s EXE="$(EXE)" distclean	) \
 	done
 	sh ./shutdown.sh
diff -dur cudd-2.4.1.ORIG/mnemosyne/Makefile cudd-2.4.1/mnemosyne/Makefile
--- cudd-2.4.1.ORIG/mnemosyne/Makefile	1996-07-23 14:33:34.000000000 -0600
+++ cudd-2.4.1/mnemosyne/Makefile	2009-01-22 10:04:31.000000000 -0700
@@ -8,8 +8,8 @@
 # define MALLOC_IS_VOIDSTAR if your system's malloc is declared as a (void *)
 # otherwise, it is assumed to be a (char *). a "mall_t" is typedeffed in
 # mnemconf.h and mnemosyne.h to implement this.
-#OPTNS	=	-DMALLOC_IS_VOIDSTAR
-OPTNS	=
+OPTNS	=	-DMALLOC_IS_VOIDSTAR
+#OPTNS	=
 
 CC	= cc
 RANLIB	= ranlib
@@ -19,14 +19,22 @@
 
 #loader flags
 LDFLGS	=
+SHLINK	= -shared -Xlinker -soname -Xlinker libmnem.so.2
 
 HDRS	=	mnemosyne.h mnemconf.h
 
-all: mnemalyse libmnem.a
+all: mnemalyse libmnem.so.2.4.1
+
+static: libmnem.a
 
 mnemalyse: mnemalyse.o
 	$(CC) $(LDFLGS) -o $@ mnemalyse.o
 
+libmnem.so.2.4.1: mnemosyne.o
+	$(CC) $(CFLAGS) $(LDFLAGS) $(SHLINK) -o $@ mnemosyne.o
+	ln -s libmnem.so.2.4.1 libmnem.so.2
+	ln -s libmnem.so.2 libmnem.so
+
 libmnem.a: mnemosyne.o
 	ar rcv $@ mnemosyne.o
 	$(RANLIB) $@
diff -dur cudd-2.4.1.ORIG/mtr/Makefile cudd-2.4.1/mtr/Makefile
--- cudd-2.4.1.ORIG/mtr/Makefile	2004-01-01 11:47:16.000000000 -0700
+++ cudd-2.4.1/mtr/Makefile	2009-01-22 10:08:45.000000000 -0700
@@ -39,6 +39,9 @@
 TARGET	= test$(P)$(EXE)
 TARGETu	= test$(P)-u
 
+SHLINK	= -shared -Xlinker -soname -Xlinker lib$(P).so.2 -L$(WHERE)/util \
+	-lcuddutil
+
 LIBS	= ./libmtr.a $(WHERE)/util/libutil.a
 
 BLIBS	= -kL. -klmtr -kL$(WHERE)/util -klutil
@@ -49,6 +52,11 @@
 
 #---------------------------
 
+lib$(P).so.2.4.1: $(POBJ)
+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(POBJ) $(SHLINK)
+	ln -s lib$(P).so.2.4.1 lib$(P).so.2
+	ln -s lib$(P).so.2 lib$(P).so
+
 lib$(P).a: $(POBJ)
 	ar rv $@ $?
 	$(RANLIB) $@
@@ -79,7 +87,9 @@
 tags: $(PSRC) $(PHDR)
 	ctags $(PSRC) $(PHDR)
 
-all: lib$(P).a lib$(P).b llib-l$(P).ln tags
+all: lib$(P).so.2.4.1 lib$(P).b llib-l$(P).ln tags
+
+static: lib$(P).a
 
 $(TARGET): $(POBJ) $(OBJ) $(LIBS) $(MNEMLIB)
 	$(PURE) $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJ) $(LIBS) $(MNEMLIB) -lm
diff -dur cudd-2.4.1.ORIG/nanotrav/Makefile cudd-2.4.1/nanotrav/Makefile
--- cudd-2.4.1.ORIG/nanotrav/Makefile	1999-08-31 13:12:55.000000000 -0600
+++ cudd-2.4.1/nanotrav/Makefile	2009-01-22 10:11:36.000000000 -0700
@@ -19,6 +19,14 @@
 
 INCLUDE = $(WHERE)/include
 
+SHLINK	= -L$(WHERE)/dddmp -L$(WHERE)/cudd -L$(WHERE)/mtr -L$(WHERE)/st \
+	-L$(WHERE)/util -L$(WHERE)/epd -ldddmp -lcudd -lmtr -lcuddst \
+	-lcuddutil -lepd
+
+SHLIBS	= $(WHERE)/dddmp/libdddmp.so.2.4.1 $(WHERE)/cudd/libcudd.so.2.4.1 \
+	$(WHERE)/mtr/libmtr.so.2.4.1 $(WHERE)/st/libcuddst.so.2.4.1 \
+	$(WHERE)/util/libcuddutil.so.2.4.1 $(WHERE)/epd/libepd.so.2.4.1
+
 LIBS	= $(WHERE)/dddmp/libdddmp.a $(WHERE)/cudd/libcudd.a \
 	$(WHERE)/mtr/libmtr.a $(WHERE)/st/libst.a $(WHERE)/util/libutil.a \
 	$(WHERE)/epd/libepd.a
@@ -60,8 +68,8 @@
 
 #------------------------------------------------------
 
-$(TARGET): $(SRC) $(OBJ) $(HDR) $(LIBS) $(MNEMLIB)
-	$(PURE) $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJ) $(LIBS) $(MNEMLIB) -lm
+$(TARGET): $(SRC) $(OBJ) $(HDR) $(SHLIBS) $(MNEMLIB)
+	$(PURE) $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJ) $(SHLINK) $(MNEMLIB) -lm
 
 .c.o: $(HDR)
 	$(CC) -c $< -I$(INCLUDE) $(CFLAGS) $(DDDEBUG)
@@ -87,6 +95,8 @@
 
 all: $(TARGET) $(TARGETu) lint tags
 
+static:
+
 pixie: $(TARGETu)
 	pixie $(TARGETu)
 
diff -dur cudd-2.4.1.ORIG/obj/Makefile cudd-2.4.1/obj/Makefile
--- cudd-2.4.1.ORIG/obj/Makefile	2001-03-19 00:35:09.000000000 -0700
+++ cudd-2.4.1/obj/Makefile	2009-01-22 12:58:56.000000000 -0700
@@ -27,6 +27,8 @@
 
 INCLUDE = $(WHERE)/include
 
+SHLINK	= -shared -Xlinker -soname -Xlinker lib$(P).so.2
+
 LIBS	= ./libobj.a $(WHERE)/cudd/libcudd.a $(WHERE)/mtr/libmtr.a \
 	$(WHERE)/st/libst.a $(WHERE)/util/libutil.a $(WHERE)/epd/libepd.a
 
@@ -57,6 +59,11 @@
 
 #------------------------------------------------------
 
+libs$(P).so.2.4.1: $(POBJ)
+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(POBJ) $(SHLINK)
+	ln -s lib$(P).so.2.4.1 lib$(P).so.2
+	ln -s lib$(P).so.2 lib$(P).so
+
 lib$(P).a: $(POBJ)
 	ar rv $@ $?
 	$(RANLIB) $@
@@ -97,7 +104,9 @@
 tags: $(PSRC) $(PHDR)
 	ctags $(PSRC) $(PHDR)
 
-all: lib$(P).a lib$(P).b llib-l$(P).ln tags
+all: lib$(P).so.2.4.1 lib$(P).b llib-l$(P).ln tags
+
+static: lib$(P).a
 
 programs: $(TARGET) $(TARGETu) lintpgm
 
diff -dur cudd-2.4.1.ORIG/st/Makefile cudd-2.4.1/st/Makefile
--- cudd-2.4.1.ORIG/st/Makefile	2004-01-01 09:53:24.000000000 -0700
+++ cudd-2.4.1/st/Makefile	2009-01-22 13:02:29.000000000 -0700
@@ -11,6 +11,9 @@
 ICFLAGS = -g -O6 -Wall
 CFLAGS  = $(ICFLAGS) $(MFLAG) $(XCFLAGS)
 
+SHLINK	= -shared -Xlinker -soname -Xlinker libcudd$(P).so.2 -L$(WHERE)/util \
+	-lcuddutil
+
 LINTFLAGS = -u -n
 
 # this is to create the lint library
@@ -27,6 +30,11 @@
 
 #---------------------------
 
+libcudd$(P).so.2.4.1: $(POBJ)
+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(POBJ) $(SHLINK)
+	ln -s libcudd$(P).so.2.4.1 libcudd$(P).so.2
+	ln -s libcudd$(P).so.2 libcudd$(P).so
+
 lib$(P).a: $(POBJ)
 	ar rv $@ $?
 	$(RANLIB) $@
@@ -55,7 +63,9 @@
 tags: $(PSRC) $(PHDR)
 	ctags $(PSRC) $(PHDR)
 
-all: lib$(P).a lib$(P).b llib-l$(P).ln tags
+all: libcudd$(P).so.2.4.1 lib$(P).b llib-l$(P).ln tags
+
+static: lib$(P).a
 
 clean:
 	rm -f *.o *.u .pure *.warnings
diff -dur cudd-2.4.1.ORIG/util/Makefile cudd-2.4.1/util/Makefile
--- cudd-2.4.1.ORIG/util/Makefile	2004-01-03 10:15:30.000000000 -0700
+++ cudd-2.4.1/util/Makefile	2009-01-22 13:04:48.000000000 -0700
@@ -12,6 +12,8 @@
 ICFLAGS = -g
 CFLAGS  = $(ICFLAGS) $(MFLAG) $(XCFLAGS)
 
+SHLINK	= -shared -Xlinker -soname -Xlinker libcudd$(P).so.2
+
 LINTFLAGS = -u -n
 
 # this is to create the lint library
@@ -28,6 +30,11 @@
 WHERE	= ..
 INCLUDE = $(WHERE)/include
 
+libcudd$(P).so.2.4.1: $(POBJ)
+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(POBJ) $(SHLINK)
+	ln -s libcudd$(P).so.2.4.1 libcudd$(P).so.2
+	ln -s libcudd$(P).so.2 libcudd$(P).so
+
 lib$(P).a: $(POBJ)
 	ar rv $@ $?
 	$(RANLIB) $@
@@ -56,7 +63,9 @@
 tags: $(PSRC) $(PHDR)
 	ctags $(PSRC) $(PHDR)
 
-all: lib$(P).a lib$(P).b llib-l$(P).ln tags
+all: libcudd$(P).so.2.4.1 lib$(P).b llib-l$(P).ln tags
+
+static: lib$(P).a
 
 clean:
 	rm -f *.o *.u core *.warnings

cudd-2.4.1-signedness.patch:

--- NEW FILE cudd-2.4.1-signedness.patch ---
diff -dur cudd-2.4.1.ORIG/cudd/cuddGroup.c cudd-2.4.1/cudd/cuddGroup.c
--- cudd-2.4.1.ORIG/cudd/cuddGroup.c	2004-08-24 15:37:44.000000000 -0600
+++ cudd-2.4.1/cudd/cuddGroup.c	2006-02-20 15:04:32.000000000 -0700
@@ -214,7 +214,9 @@
     ** Cudd_bddNewVarAtLevel or Cudd_addNewVarAtLevel to create new
     ** variables have to create the variables before they group them.
     */
-    level = (low < (unsigned int) dd->size) ? dd->perm[low] : low;
+    level = (low < (unsigned int) dd->size)
+      ? (unsigned int) dd->perm[low]
+      : low;
 
     if (level + size - 1> (int) MTR_MAXHIGH)
 	return(NULL);
diff -dur cudd-2.4.1.ORIG/cudd/cuddZddGroup.c cudd-2.4.1/cudd/cuddZddGroup.c
--- cudd-2.4.1.ORIG/cudd/cuddZddGroup.c	2004-08-24 15:37:47.000000000 -0600
+++ cudd-2.4.1/cudd/cuddZddGroup.c	2006-02-20 15:05:24.000000000 -0700
@@ -171,7 +171,9 @@
     ** Cudd_bddNewVarAtLevel or Cudd_addNewVarAtLevel to create new
     ** variables have to create the variables before they group them.
     */
-    level = (low < (unsigned int) dd->sizeZ) ? dd->permZ[low] : low;
+    level = (low < (unsigned int) dd->sizeZ)
+      ? (unsigned int) dd->permZ[low]
+      : low;
 
     if (level + size - 1> (int) MTR_MAXHIGH)
 	return(NULL);
diff -dur cudd-2.4.1.ORIG/st/st.c cudd-2.4.1/st/st.c
--- cudd-2.4.1.ORIG/st/st.c	2004-02-11 15:33:16.000000000 -0700
+++ cudd-2.4.1/st/st.c	2006-02-20 15:55:51.000000000 -0700
@@ -54,7 +54,7 @@
 #define st_shift 2
 #endif
 
-#define ST_PTRHASH(x,size) ((unsigned int)((unsigned long)(x)>>st_shift)%size)
+#define ST_PTRHASH(x,size) ((int)((unsigned long)(x)>>st_shift)%size)
 
 #define EQUAL(func, x, y) \
     ((((func) == st_numcmp) || ((func) == st_ptrcmp)) ?\

cudd-2.4.1-strcat.patch:

--- NEW FILE cudd-2.4.1-strcat.patch ---
diff -dur cudd-2.4.1.ORIG/util/texpand.c cudd-2.4.1/util/texpand.c
--- cudd-2.4.1.ORIG/util/texpand.c	2004-01-01 09:49:21.000000000 -0700
+++ cudd-2.4.1/util/texpand.c	2006-02-20 14:57:37.000000000 -0700
@@ -14,9 +14,6 @@
 #ifdef BSD
     struct passwd *userRecord;
     char username[256], *filename;
-#ifndef _IBMR2
-    char *strcat (char *, const char *);
-#endif
     register int i, j;
 
     filename = ALLOC(char, strlen(fname) + 256);


Index: cudd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cudd/F-10/cudd.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cudd.spec	7 Jan 2009 03:26:06 -0000	1.1
+++ cudd.spec	22 Jan 2009 21:03:13 -0000	1.2
@@ -1,14 +1,30 @@
-%define debug_package %{nil}
-# rpmbuild doesn't get useful debuginfo from .a libs
-
 Name:           cudd
 Version:        2.4.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        CU Decision Diagram Package
 Group:          Development/Libraries
 License:        BSD
 URL:            http://vlsi.colorado.edu/~fabio/CUDD/
 Source0:        ftp://vlsi.Colorado.EDU/pub/cudd-%{version}.tar.gz
+# This patch was sent upstream in September 2005.
+# Build shared libraries as well as static archives, and incidentally unbreak
+# parallel make.
+Patch0:         cudd-2.4.1-sharedlib.patch
+# This patch was sent upstream in September 2005.
+# Extern declarations of strcat get mangled by the preprocessor
+Patch1:         cudd-2.4.1-strcat.patch
+# This patch was sent upstream in September 2005.
+# Fix some mixed signed/unsigned operations
+Patch2:         cudd-2.4.1-signedness.patch
+# This patch was sent upstream in September 2005.
+# Don't ignore the return values of certain functions
+Patch3:         cudd-2.4.1-retval.patch
+# This patch was sent upstream in September 2005.
+# Fix a bunch of "used without being initialized" warnings
+Patch4:         cudd-2.4.1-init.patch
+# This patch was sent upstream in September 2005.
+# On 64 bit platforms, fix the size definitions of void * and long
+Patch5:         cudd-2.4.1-64bit.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 
@@ -19,48 +35,128 @@
 
 
 %package        devel
-Summary:        Development files for %{name}
+Summary:        Header files and man pages for %{name}
 Group:          Development/Libraries
-Provides:       %{name}-static = %{version}-%{release}
+Requires:       %{name} = %{version}-%{release}
 
 
 %description    devel
-Development headers and libraries for %{name}.
+Development headers and man pages for %{name}.
+
+
+%package        static
+Summary:        Static libraries for %{name}
+Group:          Development/Libraries
+
+
+%description    static
+Static libraries for %{name}.
 
 
 %prep
 %setup -q
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
+
+# Fix two doc files with DOS line endings
+sed -i 's/\r//' dddmp/README.dddmp
+sed -i 's/\r//' dddmp/README.testdddmp
 
 
 %build
-make %{?_smp_mflags} CPPFLAGS="%{optflags}" ICFLAGS="%{optflags}" \
-  XCFLAGS=""
+# Build the shared libraries and binaries
+make %{?_smp_mflags} CPPFLAGS="%{optflags}" ICFLAGS="%{optflags} -fPIC" \
+  XCFLAGS="-DHAVE_IEEE_754 -DBSD"
+
+# Build the static libraries
+make clean
+make %{?_smp_mflags} static CPPFLAGS="%{optflags}" ICFLAGS="%{optflags}" \
+  XCFLAGS="-DHAVE_IEEE_754 -DBSD"
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
+
+# Install the shared libraries
+mkdir -p $RPM_BUILD_ROOT%{_libdir}
+for slib in */*.so; do
+  install -p -m 755 ${slib}.2.4.1 $RPM_BUILD_ROOT%{_libdir}/
+  mv ${slib}.2 $RPM_BUILD_ROOT%{_libdir}
+  mv ${slib} $RPM_BUILD_ROOT%{_libdir}
+done
+
+# Install the static libraries
 mkdir -p $RPM_BUILD_ROOT%{_libdir}/%{name}
 for slib in */*.a; do
   install -p -m 644 ${slib} $RPM_BUILD_ROOT%{_libdir}/%{name}/
 done
+
+# Install the header files
 mkdir -p $RPM_BUILD_ROOT%{_includedir}/%{name}
 for hdr in include/*; do
   install -p -m 644 ${hdr} $RPM_BUILD_ROOT%{_includedir}/%{name}/
 done
 
+# Install the test binary
+mkdir -p $RPM_BUILD_ROOT%{_bindir}
+install -p -m 0755 nanotrav/nanotrav $RPM_BUILD_ROOT%{_bindir}
+
+# Install the test binary man page
+mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
+install -p -m 0644 nanotrav/nanotrav.1 $RPM_BUILD_ROOT%{_mandir}/man1
+
+# Put all the documentation in one place for easy installation
+mkdir doc
+mv cudd/doc doc/cudd
+mv dddmp/doc doc/dddmp
+mv dddmp/R* doc/dddmp
+mv mtr/doc doc/mtr
+mv nanotrav/doc doc/nanotrav
+mv nanotrav/README doc/nanotrav
+mv st/doc doc/st
+
+
+%post -p /sbin/ldconfig
+
+
+%postun -p /sbin/ldconfig
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 
+%files
+%defattr(-,root,root,-)
+%doc README LICENSE RELEASE.NOTES doc/nanotrav
+%{_bindir}/nanotrav
+%{_libdir}/*.so.*
+%{_mandir}/man1/*
+
+
 %files devel
 %defattr(-,root,root,-)
-%doc README LICENSE cudd/doc
-%{_libdir}/%{name}
+%doc README LICENSE doc/cudd doc/dddmp doc/mtr doc/st
 %{_includedir}/%{name}
+%{_libdir}/*.so
+
+
+%files static
+%defattr(-,root,root,-)
+%{_libdir}/%{name}
 
 
 %changelog
+* Thu Jan 22 2009 Jerry James <loganjerry at gmail.com> - 2.4.1-3
+- Add patches to address various minor build infelicities
+- Build both shared and static libraries
+- Install the test binary, nanotrav, and its man page
+- Gather documentation from all of the subdirectories
+
 * Sun Jan 4 2009 Conrad Meyer <konrad at tylerc.org> - 2.4.1-2
 - Add LICENSE, cudd/doc to docs.
 



From jjames at fedoraproject.org  Thu Jan 22 21:03:44 2009
From: jjames at fedoraproject.org (Jerry James)
Date: Thu, 22 Jan 2009 21:03:44 +0000 (UTC)
Subject: rpms/cudd/devel cudd-2.4.1-64bit.patch, NONE,
	1.1 cudd-2.4.1-init.patch, NONE, 1.1 cudd-2.4.1-retval.patch,
	NONE, 1.1 cudd-2.4.1-sharedlib.patch, NONE,
	1.1 cudd-2.4.1-signedness.patch, NONE,
	1.1 cudd-2.4.1-strcat.patch, NONE, 1.1 cudd.spec, 1.1, 1.2
Message-ID: <20090122210344.65E6470142@cvs1.fedora.phx.redhat.com>

Author: jjames

Update of /cvs/pkgs/rpms/cudd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32285/devel

Modified Files:
	cudd.spec 
Added Files:
	cudd-2.4.1-64bit.patch cudd-2.4.1-init.patch 
	cudd-2.4.1-retval.patch cudd-2.4.1-sharedlib.patch 
	cudd-2.4.1-signedness.patch cudd-2.4.1-strcat.patch 
Log Message:
* Thu Jan 22 2009 Jerry James <loganjerry at gmail.com> - 2.4.1-3
- Add patches to address various minor build infelicities
- Build both shared and static libraries
- Install the test binary, nanotrav, and its man page
- Gather documentation from all of the subdirectories


cudd-2.4.1-64bit.patch:

--- NEW FILE cudd-2.4.1-64bit.patch ---
diff -dur cudd-2.4.1.ORIG/cudd/cudd.h cudd-2.4.1/cudd/cudd.h
--- cudd-2.4.1.ORIG/cudd/cudd.h	2005-05-18 00:08:59.000000000 -0600
+++ cudd-2.4.1/cudd/cudd.h	2007-10-18 16:44:37.000000000 -0600
@@ -61,6 +61,7 @@
 /* Nested includes                                                           */
 /*---------------------------------------------------------------------------*/
 
+#include <bits/wordsize.h>
 #include "mtr.h"
 #include "epd.h"
 
@@ -75,14 +76,22 @@
 #define CUDD_VERSION "2.4.1"
 
 #ifndef SIZEOF_VOID_P
+#if __WORDSIZE == 64
+#define SIZEOF_VOID_P 8
+#else
 #define SIZEOF_VOID_P 4
 #endif
+#endif
 #ifndef SIZEOF_INT
 #define SIZEOF_INT 4
 #endif
 #ifndef SIZEOF_LONG
+#if __WORDSIZE == 64
+#define SIZEOF_LONG 8
+#else
 #define SIZEOF_LONG 4
 #endif
+#endif
 
 #ifndef TRUE
 #define TRUE 1
diff -dur cudd-2.4.1.ORIG/mtr/mtr.h cudd-2.4.1/mtr/mtr.h
--- cudd-2.4.1.ORIG/mtr/mtr.h	2004-08-24 15:30:36.000000000 -0600
+++ cudd-2.4.1/mtr/mtr.h	2007-10-18 16:45:19.000000000 -0600
@@ -63,6 +63,8 @@
 /* Nested includes                                                           */
 /*---------------------------------------------------------------------------*/
 
+#include <bits/wordsize.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -72,8 +74,12 @@
 /*---------------------------------------------------------------------------*/
 
 #ifndef SIZEOF_VOID_P
+#if __WORDSIZE == 64
+#define SIZEOF_VOID_P 8
+#else
 #define SIZEOF_VOID_P 4
 #endif
+#endif
 #ifndef SIZEOF_INT
 #define SIZEOF_INT 4
 #endif
diff -dur cudd-2.4.1.ORIG/util/util.h cudd-2.4.1/util/util.h
--- cudd-2.4.1.ORIG/util/util.h	2004-02-05 18:15:36.000000000 -0700
+++ cudd-2.4.1/util/util.h	2007-10-18 16:45:58.000000000 -0600
@@ -3,6 +3,8 @@
 #ifndef UTIL_H
 #define UTIL_H
 
+#include <bits/wordsize.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -20,14 +22,22 @@
 #endif
 
 #ifndef SIZEOF_VOID_P
+#if __WORDSIZE == 64
+#define SIZEOF_VOID_P 8
+#else
 #define SIZEOF_VOID_P 4
 #endif
+#endif
 #ifndef SIZEOF_INT
 #define SIZEOF_INT 4
 #endif
 #ifndef SIZEOF_LONG
+#if __WORDSIZE == 64
+#define SIZEOF_LONG 8
+#else
 #define SIZEOF_LONG 4
 #endif
+#endif
 
 #if SIZEOF_VOID_P == 8 && SIZEOF_INT == 4
 typedef long util_ptrint;

cudd-2.4.1-init.patch:

--- NEW FILE cudd-2.4.1-init.patch ---
diff -dur cudd-2.4.1.ORIG/cudd/cuddAddIte.c cudd-2.4.1/cudd/cuddAddIte.c
--- cudd-2.4.1.ORIG/cudd/cuddAddIte.c	2004-08-24 15:37:42.000000000 -0600
+++ cudd-2.4.1/cudd/cuddAddIte.c	2006-07-17 16:04:43.000000000 -0600
@@ -447,7 +447,7 @@
     DdNode *one,*zero;
     DdNode *r,*Fv,*Fnv,*Gv,*Gnv,*Hv,*Hnv,*t,*e;
     unsigned int topf,topg,toph,v;
-    int index;
+    int index = 0;
 
     statLine(dd);
     /* Trivial cases. */
diff -dur cudd-2.4.1.ORIG/cudd/cuddAddWalsh.c cudd-2.4.1/cudd/cuddAddWalsh.c
--- cudd-2.4.1.ORIG/cudd/cuddAddWalsh.c	2004-08-24 15:37:42.000000000 -0600
+++ cudd-2.4.1/cudd/cuddAddWalsh.c	2006-07-17 16:04:43.000000000 -0600
@@ -298,7 +298,7 @@
   int  n)
 {
     DdNode *one, *minusone;
-    DdNode *t, *u, *t1, *u1, *v, *w;
+    DdNode *t = NULL, *u, *t1, *u1, *v, *w;
     int     i;
 
     one = DD_ONE(dd);
diff -dur cudd-2.4.1.ORIG/cudd/cuddBddIte.c cudd-2.4.1/cudd/cuddBddIte.c
--- cudd-2.4.1.ORIG/cudd/cuddBddIte.c	2004-08-24 15:37:43.000000000 -0600
+++ cudd-2.4.1/cudd/cuddBddIte.c	2006-07-17 16:04:43.000000000 -0600
@@ -635,7 +635,7 @@
     DdNode	 *one, *zero, *res;
     DdNode	 *r, *Fv, *Fnv, *Gv, *Gnv, *H, *Hv, *Hnv, *t, *e;
     unsigned int topf, topg, toph, v;
-    int		 index;
+    int		 index = 0;
     int		 comple;
 
     statLine(dd);
diff -dur cudd-2.4.1.ORIG/cudd/cuddDecomp.c cudd-2.4.1/cudd/cuddDecomp.c
--- cudd-2.4.1.ORIG/cudd/cuddDecomp.c	2004-08-24 15:37:43.000000000 -0600
+++ cudd-2.4.1/cudd/cuddDecomp.c	2006-07-17 16:04:43.000000000 -0600
@@ -1689,7 +1689,7 @@
   st_table * mintermTable)
 {
     int topid, distance;
-    Conjuncts *factorsNv, *factorsNnv, *factors;
+    Conjuncts *factorsNv = NULL, *factorsNnv = NULL, *factors;
     Conjuncts *dummy;
     DdNode *N, *Nv, *Nnv, *temp, *g1, *g2, *h1, *h2, *topv;
     double minNv = 0.0, minNnv = 0.0;
diff -dur cudd-2.4.1.ORIG/cudd/cuddGroup.c cudd-2.4.1/cudd/cuddGroup.c
--- cudd-2.4.1.ORIG/cudd/cuddGroup.c	2006-07-17 16:04:04.000000000 -0600
+++ cudd-2.4.1/cudd/cuddGroup.c	2006-07-17 16:04:43.000000000 -0600
@@ -454,7 +454,7 @@
   Cudd_ReorderingType method)
 {
     int lower;
-    int upper;
+    int upper = 0;
     int result;
     unsigned int initialSize;
 
@@ -1492,7 +1492,7 @@
     Move *move;
     int  size;
     int  i,j,xtop,xbot,xsize,ytop,ybot,ysize,newxtop;
-    int  swapx,swapy;
+    int  swapx = 0, swapy = 0;
 #if defined(DD_DEBUG) && defined(DD_VERBOSE)
     int  initialSize,bestSize;
 #endif
@@ -1672,7 +1672,7 @@
 {
     Move *move;
     int  res;
-    Move *end_move;
+    Move *end_move = NULL;
     int diff, tmp_diff;
     int index, pairlev;
 
diff -dur cudd-2.4.1.ORIG/cudd/cuddHarwell.c cudd-2.4.1/cudd/cuddHarwell.c
--- cudd-2.4.1.ORIG/cudd/cuddHarwell.c	2004-08-24 15:37:44.000000000 -0600
+++ cudd-2.4.1/cudd/cuddHarwell.c	2006-07-17 16:04:43.000000000 -0600
@@ -152,6 +152,7 @@
     int	*rhsptr, *rhsind;
 #endif
 
+    lx = ly = lxn = lyn = NULL;
     if (*nx < 0 || *ny < 0) return(0);
 
     one = DD_ONE(dd);
diff -dur cudd-2.4.1.ORIG/cudd/cuddLinear.c cudd-2.4.1/cudd/cuddLinear.c
--- cudd-2.4.1.ORIG/cudd/cuddLinear.c	2004-08-24 15:37:45.000000000 -0600
+++ cudd-2.4.1/cudd/cuddLinear.c	2006-07-17 16:04:43.000000000 -0600
@@ -373,7 +373,7 @@
     int    posn;
     int    isolated;
     DdNode *f,*f0,*f1,*f01,*f00,*f11,*f10,*newf1,*newf0;
-    DdNode *g,*next,*last;
+    DdNode *g,*next,*last = NULL;
     DdNodePtr *previousP;
     DdNode *tmp;
     DdNode *sentinel = &(table->sentinel);
diff -dur cudd-2.4.1.ORIG/cudd/cuddPriority.c cudd-2.4.1/cudd/cuddPriority.c
--- cudd-2.4.1.ORIG/cudd/cuddPriority.c	2004-08-24 15:37:45.000000000 -0600
+++ cudd-2.4.1/cudd/cuddPriority.c	2006-07-17 16:04:43.000000000 -0600
@@ -965,7 +965,7 @@
 {
     DdNode *res, *res1, *res2, *resA;
     DdNode *r, *y, *RT, *RE, *YT, *YE, *Yrest, *Ra, *Ran, *Gamma, *Alpha;
-    unsigned int topR, topY, top, index;
+    unsigned int topR, topY, top, index = 0U;
     DdNode *one = DD_ONE(dd);
 
     statLine(dd);
diff -dur cudd-2.4.1.ORIG/cudd/cuddReorder.c cudd-2.4.1/cudd/cuddReorder.c
--- cudd-2.4.1.ORIG/cudd/cuddReorder.c	2004-08-24 15:37:45.000000000 -0600
+++ cudd-2.4.1/cudd/cuddReorder.c	2006-07-17 16:04:43.000000000 -0600
@@ -606,7 +606,7 @@
     int	iterate;
     int previousSize;
     Move *moves, *move;
-    int	pivot;
+    int	pivot = 0;
     int	modulo;
     int result;
 
diff -dur cudd-2.4.1.ORIG/cudd/cuddSubsetSP.c cudd-2.4.1/cudd/cuddSubsetSP.c
--- cudd-2.4.1.ORIG/cudd/cuddSubsetSP.c	2004-08-24 15:37:45.000000000 -0600
+++ cudd-2.4.1/cudd/cuddSubsetSP.c	2006-07-17 16:04:43.000000000 -0600
@@ -1255,17 +1255,17 @@
 {
     DdNode *N, *Nv, *Nnv;
     DdNode *ThenBranch, *ElseBranch, *childBranch;
-    DdNode *child, *regChild, *regNnv, *regNv;
+    DdNode *child, *regChild, *regNnv = NULL, *regNv = NULL;
     NodeDist_t *nodeStatNv, *nodeStat, *nodeStatNnv;
     DdNode *neW, *topv, *regNew;
     char *entry;
     unsigned int topid;
-    unsigned int childPathLength, oddLen, evenLen, NnvPathLength, NvPathLength;
+    unsigned int childPathLength, oddLen, evenLen;
+    unsigned int NnvPathLength = 0U, NvPathLength = 0U;
     unsigned int NvBotDist, NnvBotDist;
     int tiebreakChild;
     int  processingDone, thenDone, elseDone;
 
-
 #ifdef DD_DEBUG
     numCalls++;
 #endif
diff -dur cudd-2.4.1.ORIG/cudd/cuddSymmetry.c cudd-2.4.1/cudd/cuddSymmetry.c
--- cudd-2.4.1.ORIG/cudd/cuddSymmetry.c	2004-08-24 15:37:46.000000000 -0600
+++ cudd-2.4.1/cudd/cuddSymmetry.c	2006-07-17 16:04:43.000000000 -0600
@@ -1472,10 +1472,10 @@
   Move ** moves)
 {
     Move *move;
-    int	 size;
+    int	 size = 0;
     int  i,j;
     int  xtop,xbot,xsize,ytop,ybot,ysize,newxtop;
-    int  swapx,swapy;
+    int  swapx = 0, swapy = 0;
 
 #if DD_DEBUG
     assert(x < y);	/* we assume that x < y */
@@ -1551,7 +1551,7 @@
   int  x,
   int  y)
 {
-    int	size;
+    int	size = 0;
     int i,j;
     int	xtop,xbot,xsize,ytop,ybot,ysize,newxtop;
 
diff -dur cudd-2.4.1.ORIG/cudd/cuddTable.c cudd-2.4.1/cudd/cuddTable.c
--- cudd-2.4.1.ORIG/cudd/cuddTable.c	2004-08-24 15:37:46.000000000 -0600
+++ cudd-2.4.1/cudd/cuddTable.c	2006-07-17 16:04:43.000000000 -0600
@@ -1726,7 +1726,7 @@
     int oldsize,newsize;
     int i,j,index,reorderSave;
     unsigned int numSlots = unique->initSlots;
-    int *newperm, *newinvperm, *newmap;
+    int *newperm, *newinvperm, *newmap = NULL;
     DdNode *one, *zero;
 
 #ifdef DD_DEBUG
@@ -2454,7 +2454,7 @@
     int oldsize,newsize;
     int i,j,reorderSave;
     int numSlots = unique->initSlots;
-    int *newperm, *newinvperm, *newmap;
+    int *newperm, *newinvperm, *newmap = NULL;
     DdNode *one, *zero;
 
     oldsize = unique->size;
diff -dur cudd-2.4.1.ORIG/cudd/cuddUtil.c cudd-2.4.1/cudd/cuddUtil.c
--- cudd-2.4.1.ORIG/cudd/cuddUtil.c	2005-05-14 11:28:01.000000000 -0600
+++ cudd-2.4.1/cudd/cuddUtil.c	2006-07-17 16:04:43.000000000 -0600
@@ -1400,7 +1400,7 @@
     DdNode **old, *neW;
     double minterms;
     char *saveString;
-    int saveFlag, savePoint, isSame;
+    int saveFlag, savePoint = 0, isSame;
 
     minterms = Cudd_CountMinterm(dd,f,n);
     if ((double)k > minterms) {
diff -dur cudd-2.4.1.ORIG/cudd/cuddZddGroup.c cudd-2.4.1/cudd/cuddZddGroup.c
--- cudd-2.4.1.ORIG/cudd/cuddZddGroup.c	2006-07-17 16:04:04.000000000 -0600
+++ cudd-2.4.1/cudd/cuddZddGroup.c	2006-07-17 16:04:43.000000000 -0600
@@ -434,7 +434,7 @@
   Cudd_ReorderingType method)
 {
     int lower;
-    int upper;
+    int upper = 0;
     int result;
     unsigned int initialSize;
 
@@ -1082,7 +1082,7 @@
     Move *move;
     int  size;
     int  i,j,xtop,xbot,xsize,ytop,ybot,ysize,newxtop;
-    int  swapx,swapy;
+    int  swapx = 0, swapy = 0;
 #if defined(DD_DEBUG) && defined(DD_VERBOSE)
     int  initialSize,bestSize;
 #endif
diff -dur cudd-2.4.1.ORIG/cudd/cuddZddReord.c cudd-2.4.1/cudd/cuddZddReord.c
--- cudd-2.4.1.ORIG/cudd/cuddZddReord.c	2004-08-24 15:37:47.000000000 -0600
+++ cudd-2.4.1/cudd/cuddZddReord.c	2006-07-17 16:04:43.000000000 -0600
@@ -491,7 +491,7 @@
     int		i;
     int		posn;
     DdNode	*f, *f1, *f0, *f11, *f10, *f01, *f00;
-    DdNode	*newf1, *newf0, *next;
+    DdNode	*newf1 = NULL, *newf0, *next;
     DdNodePtr	g, *lastP, *previousP;
 
 #ifdef DD_DEBUG
@@ -752,7 +752,7 @@
     int iterate;
     int previousSize;
     Move *moves, *move;
-    int	pivot;
+    int	pivot = 0;
     int modulo;
     int result;
 
diff -dur cudd-2.4.1.ORIG/cudd/cuddZddSymm.c cudd-2.4.1/cudd/cuddZddSymm.c
--- cudd-2.4.1.ORIG/cudd/cuddZddSymm.c	2004-08-24 15:37:47.000000000 -0600
+++ cudd-2.4.1/cudd/cuddZddSymm.c	2006-07-17 16:04:43.000000000 -0600
@@ -1483,7 +1483,7 @@
     Move	*move;
     int		size;
     int		i, temp, gxtop, gxbot, gybot, yprev;
-    int		swapx, swapy;
+    int		swapx = 0, swapy = 0;
 
 #ifdef DD_DEBUG
     assert(x < y);	/* we assume that x < y */
@@ -1586,7 +1586,7 @@
   int  x,
   int  y)
 {
-    int	       size;
+    int	       size = 0;
     int        i, temp, gxtop, gxbot, gybot, yprev;
 
 #ifdef DD_DEBUG
diff -dur cudd-2.4.1.ORIG/nanotrav/bnet.c cudd-2.4.1/nanotrav/bnet.c
--- cudd-2.4.1.ORIG/nanotrav/bnet.c	2004-08-24 15:34:48.000000000 -0600
+++ cudd-2.4.1/nanotrav/bnet.c	2006-07-17 16:04:43.000000000 -0600
@@ -1884,6 +1884,7 @@
     DdNode *func, *f, *g, *h;
     BnetNode *auxnd;
 
+    mux[0] = mux[1] = phase[0] = phase[1] = 0;
     if (nd->ninp != 3) return(0);
 
     for (line = nd->f; line != NULL; line = line->next) {
diff -dur cudd-2.4.1.ORIG/nanotrav/ntr.c cudd-2.4.1/nanotrav/ntr.c
--- cudd-2.4.1.ORIG/nanotrav/ntr.c	2004-08-24 15:34:47.000000000 -0600
+++ cudd-2.4.1/nanotrav/ntr.c	2006-07-17 16:07:12.000000000 -0600
@@ -964,7 +964,7 @@
     DdNode *neW;
     DdNode *one, *zero;
     DdNode *states, *scc;
-    DdNode *tmp;
+    DdNode *tmp = NULL;
     DdNode *SCCs[10];
     int depth;
     int nscc = 0;

cudd-2.4.1-retval.patch:

--- NEW FILE cudd-2.4.1-retval.patch ---
diff -dur cudd-2.4.1.ORIG/dddmp/dddmpDbg.c cudd-2.4.1/dddmp/dddmpDbg.c
--- cudd-2.4.1.ORIG/dddmp/dddmpDbg.c	2004-02-18 09:23:31.000000000 -0700
+++ cudd-2.4.1/dddmp/dddmpDbg.c	2006-02-20 16:05:04.000000000 -0700
@@ -97,7 +97,8 @@
   while (fgets(buf, 999,fp)!=NULL) {
     fprintf (fpo, "%s", buf);
     if (strncmp(buf, ".nnodes", 7) == 0) {
-      sscanf (buf, "%*s %d", &nnodes);
+      if (sscanf (buf, "%*s %d", &nnodes) == EOF)
+	break;
     }
     if (strncmp(buf, ".rootids", 8) == 0) {
       break;
@@ -141,7 +142,8 @@
 
   }
 
-  fgets(buf, 999,fp);
+  if (fgets(buf, 999,fp) == NULL)
+    buf[0] = '\0';
   if (strncmp(buf, ".end", 4) != 0) {
     return (0);
   }
diff -dur cudd-2.4.1.ORIG/dddmp/dddmpLoad.c cudd-2.4.1/dddmp/dddmpLoad.c
--- cudd-2.4.1.ORIG/dddmp/dddmpLoad.c	2004-02-18 09:24:00.000000000 -0700
+++ cudd-2.4.1/dddmp/dddmpLoad.c	2006-02-20 16:02:11.000000000 -0700
@@ -1109,7 +1109,8 @@
 
   /*------------------------ Deal With the File Tail -----------------------*/
 
-  fgets (buf, DDDMP_MAXSTRLEN-1,fp);
+  if (fgets (buf, DDDMP_MAXSTRLEN-1,fp) == NULL)
+    buf[0] = '\0';
   Dddmp_CheckAndGotoLabel (!matchkeywd(buf, ".end"),
     "Error .end not found.", failure);
 
@@ -1273,7 +1274,8 @@
 
     /* comment */
     if (buf[0] == '#') {
-      fgets(buf,DDDMP_MAXSTRLEN,fp);
+      if (fgets(buf,DDDMP_MAXSTRLEN,fp) == NULL)
+	buf[0] = '\0';
       continue;
     }
 
@@ -1424,7 +1426,8 @@
     }
 
     if (matchkeywd(buf, ".nodes")) {
-      fgets(buf,DDDMP_MAXSTRLEN,fp);
+      if (fgets(buf,DDDMP_MAXSTRLEN,fp) == NULL)
+	buf[0] = '\0';
       break;
     }
 
diff -dur cudd-2.4.1.ORIG/dddmp/dddmpLoadCnf.c cudd-2.4.1/dddmp/dddmpLoadCnf.c
--- cudd-2.4.1.ORIG/dddmp/dddmpLoadCnf.c	2004-02-20 01:35:56.000000000 -0700
+++ cudd-2.4.1/dddmp/dddmpLoadCnf.c	2006-02-20 16:04:02.000000000 -0700
@@ -554,7 +554,8 @@
 
     /* Init Problem Line */ 
     if (buf[0] == 'p') {
-      fscanf (fp, "%*s %d %d", &nv, &nc);
+      if (fscanf (fp, "%*s %d %d", &nv, &nc) == EOF)
+	break;
       Hdr->nVarsCnf = nv;
       Hdr->nClausesCnf = nc;
       break;
@@ -569,7 +570,8 @@
 
     /* Skip Comment? */
     if (buf[0] != '.') {
-      fgets (buf, DDDMP_MAXSTRLEN, fp);
+      if (fgets (buf, DDDMP_MAXSTRLEN, fp) == NULL)
+	buf[0] = '\0';
       continue;
     }
 
@@ -811,7 +813,8 @@
     /* Check for Comment */
     if (word[0] == 'c') {
       /* Comment Found: Skip line */
-      fgets (word, DDDMP_MAX_CNF_ROW_LENGTH-1, fp);
+      if (fgets (word, DDDMP_MAX_CNF_ROW_LENGTH-1, fp) == NULL)
+	word[0] = '\0';
       break;
     }
 
diff -dur cudd-2.4.1.ORIG/epd/epd.c cudd-2.4.1/epd/epd.c
--- cudd-2.4.1.ORIG/epd/epd.c	2004-08-24 15:33:13.000000000 -0600
+++ cudd-2.4.1/epd/epd.c	2006-02-20 16:07:56.000000000 -0700
@@ -1094,7 +1094,8 @@
 
   sprintf(str, "%E", value);
   pos = strstr(str, "E");
-  sscanf(pos, "E%d", &exponent);
+  if (sscanf(pos, "E%d", &exponent) == EOF)
+    exponent = 0;
   return(exponent);
 }
 
diff -dur cudd-2.4.1.ORIG/util/pipefork.c cudd-2.4.1/util/pipefork.c
--- cudd-2.4.1.ORIG/util/pipefork.c	2004-08-17 18:07:57.000000000 -0600
+++ cudd-2.4.1/util/pipefork.c	2006-02-20 16:07:06.000000000 -0700
@@ -39,8 +39,10 @@
      * fildes[0] for reading from command
      * fildes[1] for writing to command
      */
-    (void) pipe(topipe);
-    (void) pipe(frompipe);
+    if (pipe(topipe) < 0 || pipe(frompipe) < 0) {
+      fputs("Pipe creation failed.\n", stderr);
+      return 1;
+    }
 
 #ifdef __CYGWIN32__
     if ((forkpid = fork()) == 0) {

cudd-2.4.1-sharedlib.patch:

--- NEW FILE cudd-2.4.1-sharedlib.patch ---
diff -dur cudd-2.4.1.ORIG/cudd/doc/node3.html cudd-2.4.1/cudd/doc/node3.html
--- cudd-2.4.1.ORIG/cudd/doc/node3.html	2005-05-17 23:20:29.000000000 -0600
+++ cudd-2.4.1/cudd/doc/node3.html	2009-01-22 09:19:03.000000000 -0700
@@ -153,16 +153,18 @@
 <P>
 To build an application that uses the CUDD package, you should add
 <PRE>
-#include "util.h"
-#include "cudd.h"
+#include &lt;util.h&gt;
+#include &lt;cudd.h&gt;
 </PRE>
 <A NAME="81"></A>
-to your source files, and should link
+to your source files, compile with <CODE>-I/usr/include/cudd</CODE>, and link
 <code>libcudd.a</code><A NAME="82"></A>,
 <code>libmtr.a</code><A NAME="83"></A>,
 <code>libst.a</code><A NAME="84"></A>, and
 <code>libutil.a</code><A NAME="85"></A> to your executable. (All these
-libraries are part of the distribution.) Some
+libraries are part of the distribution.)  Note that shared library equivalents
+are also available, and are linked to one another appropriately; i.e., it is
+sufficient to add <CODE>-lcudd</CODE> to your link command.  Some
 platforms require specific compiler and linker flags.  Refer to the
 <TT>Makefile<A NAME="86"></A></TT> in the top level directory of the
 distribution.
diff -dur cudd-2.4.1.ORIG/cudd/Makefile cudd-2.4.1/cudd/Makefile
--- cudd-2.4.1.ORIG/cudd/Makefile	1999-08-19 16:34:24.000000000 -0600
+++ cudd-2.4.1/cudd/Makefile	2009-01-22 09:46:31.000000000 -0700
@@ -27,6 +27,10 @@
 
 INCLUDE = $(WHERE)/include
 
+SHLINK	= -shared -Xlinker -soname -Xlinker lib$(P).so.2 \
+	-L$(WHERE)/mtr -L$(WHERE)/st -L$(WHERE)/util -L$(WHERE)/epd \
+	-lmtr -lcuddst -lcuddutil -lepd -lm
+
 LIBS	= ./libcudd.a $(WHERE)/mtr/libmtr.a \
 	$(WHERE)/st/libst.a $(WHERE)/util/libutil.a $(WHERE)/epd/libepd.a
 
@@ -71,6 +75,11 @@
 
 #------------------------------------------------------
 
+lib$(P).so.2.4.1: $(POBJ)
+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(POBJ) $(SHLINK)
+	ln -s lib$(P).so.2.4.1 lib$(P).so.2
+	ln -s lib$(P).so.2 lib$(P).so
+
 lib$(P).a: $(POBJ)
 	ar rv $@ $?
 	$(RANLIB) $@
@@ -111,7 +120,9 @@
 tags: $(PSRC) $(PHDR)
 	ctags $(PSRC) $(PHDR)
 
-all: lib$(P).a lib$(P).b llib-l$(P).ln tags
+all: lib$(P).so.2.4.1 lib$(P).b llib-l$(P).ln tags
+
+static: lib$(P).a
 
 programs: $(TARGET) $(TARGETu) lintpgm
 
diff -dur cudd-2.4.1.ORIG/dddmp/Makefile cudd-2.4.1/dddmp/Makefile
--- cudd-2.4.1.ORIG/dddmp/Makefile	2004-02-20 09:13:24.000000000 -0700
+++ cudd-2.4.1/dddmp/Makefile	2009-01-22 09:46:18.000000000 -0700
@@ -170,6 +170,10 @@
 LINTFLAGS = -u -n
 LINTSWITCH = -o
 
+SHLINK	= -shared -Xlinker -soname -Xlinker lib$(P).so.2 \
+	-L$(WHERE)/cudd -L$(WHERE)/mtr -L$(WHERE)/st -L$(WHERE)/util \
+	-L$(WHERE)/epd -lcudd -lcuddst -lcuddutil
+
 LIBS	= ./libdddmp.a $(WHERE)/cudd/libcudd.a $(WHERE)/mtr/libmtr.a \
 	$(WHERE)/st/libst.a $(WHERE)/util/libutil.a $(WHERE)/epd/libepd.a
 
@@ -182,6 +186,11 @@
 	$(WHERE)/mtr/llib-lmtr.ln $(WHERE)/st/llib-lst.ln \
 	$(WHERE)/util/llib-lutil.ln
 
+lib$(P).so.2.4.1: $(POBJ)
+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(POBJ) $(SHLINK)
+	ln -s lib$(P).so.2.4.1 lib$(P).so.2
+	ln -s lib$(P).so.2 lib$(P).so
+
 lib$(P).a: $(POBJ)
 	ar rv $@ $?
 	$(RANLIB) $@
@@ -222,7 +231,9 @@
 tags: $(PSRC) $(PHDR)
 	ctags $(PSRC) $(PHDR)
 
-all: lib$(P).a lib$(P).b llib-l$(P).ln tags
+all: lib$(P).so.2.4.1 lib$(P).b llib-l$(P).ln tags
+
+static: lib$(P).a
 
 programs: $(TARGET) $(TARGETu) lintpgm
 
diff -dur cudd-2.4.1.ORIG/epd/Makefile cudd-2.4.1/epd/Makefile
--- cudd-2.4.1.ORIG/epd/Makefile	2003-12-31 09:31:30.000000000 -0700
+++ cudd-2.4.1/epd/Makefile	2009-01-22 09:50:20.000000000 -0700
@@ -11,6 +11,9 @@
 ICFLAGS = -g -O6 -Wall
 CFLAGS  = $(ICFLAGS) $(MFLAG) $(XCFLAGS)
 
+SHLINK	= -shared -Xlinker -soname -Xlinker lib$(P).so.2 -L$(WHERE)/util \
+	-lcuddutil -lm
+
 LINTFLAGS = -u -n
 
 # this is to create the lint library
@@ -27,6 +30,11 @@
 
 #---------------------------
 
+lib$(P).so.2.4.1: $(POBJ)
+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(POBJ) $(SHLINK)
+	ln -s lib$(P).so.2.4.1 lib$(P).so.2
+	ln -s lib$(P).so.2 lib$(P).so
+
 lib$(P).a: $(POBJ)
 	ar rv $@ $?
 	$(RANLIB) $@
@@ -55,7 +63,9 @@
 tags: $(PSRC) $(PHDR)
 	ctags $(PSRC) $(PHDR)
 
-all: lib$(P).a lib$(P).b llib-l$(P).ln tags
+all: lib$(P).so.2.4.1 lib$(P).b llib-l$(P).ln tags
+
+static: lib$(P).a
 
 clean:
 	rm -f *.o *.u .pure *.warnings
diff -dur cudd-2.4.1.ORIG/Makefile cudd-2.4.1/Makefile
--- cudd-2.4.1.ORIG/Makefile	2004-08-17 18:18:45.000000000 -0600
+++ cudd-2.4.1/Makefile	2009-01-22 13:10:24.000000000 -0700
@@ -194,7 +194,7 @@
 IDIR	= $(DDWDIR)/include
 INCLUDE = -I$(IDIR)
 
-BDIRS	= cudd dddmp mtr st util epd
+BDIRS	= util epd mtr st cudd dddmp
 DIRS	= $(BDIRS) nanotrav
 
 #------------------------------------------------------------------------
@@ -210,6 +210,7 @@
 .PHONY : testmtr
 .PHONY : lint
 .PHONY : all
+.PHONY : static
 .PHONY : clean
 .PHONY : distclean
 
@@ -219,17 +220,22 @@
 	@for dir in $(DIRS); do \
 		(cd $$dir; \
 		echo Making $$dir ...; \
-		make CC=$(CC) RANLIB=$(RANLIB) MFLAG= MNEMLIB= ICFLAGS="$(ICFLAGS)" XCFLAGS="$(XCFLAGS)" DDDEBUG="$(DDDEBUG)" MTRDEBUG="$(MTRDEBUG)" LDFLAGS="$(LDFLAGS)" PURE="$(PURE)" EXE="$(EXE)" )\
+		$(MAKE) CC=$(CC) RANLIB=$(RANLIB) MFLAG= MNEMLIB= ICFLAGS="$(ICFLAGS)" XCFLAGS="$(XCFLAGS)" DDDEBUG="$(DDDEBUG)" MTRDEBUG="$(MTRDEBUG)" LDFLAGS="$(LDFLAGS)" PURE="$(PURE)" EXE="$(EXE)" )\
 	done
 
-nanotrav: build
+cudd: mtr st util epd
+dddmp: cudd
+epd: util
+mtr: util
+nanotrav: dddmp
+st: util
 
 check_leaks:
 	sh ./setup.sh
 	@for dir in mnemosyne $(DIRS); do \
 		(cd $$dir; \
 		echo Making $$dir ...; \
-		make CC=$(CC) RANLIB=$(RANLIB) MFLAG=$(MFLAG) MNEMLIB=$(MNEMLIB) ICFLAGS="$(ICFLAGS)" XCFLAGS="$(XCFLAGS)" DDDEBUG="$(DDDEBUG)" MTRDEBUG="$(MTRDEBUG)" LDFLAGS="$(LDFLAGS)" EXE="$(EXE)" )\
+		$(MAKE) CC=$(CC) RANLIB=$(RANLIB) MFLAG=$(MFLAG) MNEMLIB=$(MNEMLIB) ICFLAGS="$(ICFLAGS)" XCFLAGS="$(XCFLAGS)" DDDEBUG="$(DDDEBUG)" MTRDEBUG="$(MTRDEBUG)" LDFLAGS="$(LDFLAGS)" EXE="$(EXE)" )\
 	done
 
 optimize_dec:
@@ -237,7 +243,7 @@
 	@for dir in $(DIRS); do \
 		(cd $$dir; \
 		echo Making $$dir ...; \
-		make CC=$(CC) RANLIB=$(RANLIB) XCFLAGS="$(XCFLAGS)" LDFLAGS="$(LDFLAGS)" optimize_dec )\
+		$(MAKE) CC=$(CC) RANLIB=$(RANLIB) XCFLAGS="$(XCFLAGS)" LDFLAGS="$(LDFLAGS)" optimize_dec )\
 	done
 
 lint:
@@ -245,7 +251,7 @@
 	@for dir in $(DIRS) obj; do \
 		(cd $$dir; \
 		echo Making lint in $$dir ...; \
-		make CC=$(CC) lint )\
+		$(MAKE) CC=$(CC) lint )\
 	done
 
 tags:
@@ -253,7 +259,7 @@
 	@for dir in $(DIRS) obj; do \
 		(cd $$dir; \
 		echo Making tags in $$dir ...; \
-		make CC=$(CC) tags )\
+		$(MAKE) CC=$(CC) tags )\
 	done
 
 all:
@@ -261,7 +267,15 @@
 	@for dir in $(DIRS); do \
 		(cd $$dir; \
 		echo Making all in $$dir ...; \
-		make CC=$(CC) RANLIB=$(RANLIB) MFLAG= MNEMLIB= ICFLAGS="$(ICFLAGS)" XCFLAGS="$(XCFLAGS)" DDDEBUG="$(DDDEBUG)" MTRDEBUG="$(MTRDEBUG)" LDFLAGS="$(LDFLAGS)" PURE="$(PURE)" EXE="$(EXE)" all )\
+		$(MAKE) CC=$(CC) RANLIB=$(RANLIB) MFLAG= MNEMLIB= ICFLAGS="$(ICFLAGS)" XCFLAGS="$(XCFLAGS)" DDDEBUG="$(DDDEBUG)" MTRDEBUG="$(MTRDEBUG)" LDFLAGS="$(LDFLAGS)" PURE="$(PURE)" EXE="$(EXE)" all )\
+	done
+
+static:
+	sh ./setup.sh
+	@for dir in $(DIRS); do \
+		(cd $$dir; \
+		echo Making static in $$dir ...; \
+		$(MAKE) CC=$(CC) RANLIB=$(RANLIB) MFLAG= MNEMLIB= ICFLAGS="$(ICFLAGS)" XCFLAGS="$(XCFLAGS)" DDDEBUG="$(DDDEBUG)" MTRDEBUG="$(MTRDEBUG)" LDFLAGS="$(LDFLAGS)" PURE="$(PURE)" EXE="$(EXE)" static )\
 	done
 
 testcudd:
@@ -269,49 +283,49 @@
 	@for dir in util st mtr epd; do \
 		(cd $$dir; \
 		echo Making $$dir ...; \
-		make CC=$(CC) RANLIB=$(RANLIB) MFLAG= MNEMLIB= ICFLAGS="$(ICFLAGS)" XCFLAGS="$(XCFLAGS)" DDDEBUG="$(DDDEBUG)" MTRDEBUG="$(MTRDEBUG)" LDFLAGS="$(LDFLAGS)" PURE="$(PURE)" EXE="$(EXE)" )\
+		$(MAKE) CC=$(CC) RANLIB=$(RANLIB) MFLAG= MNEMLIB= ICFLAGS="$(ICFLAGS)" XCFLAGS="$(XCFLAGS)" DDDEBUG="$(DDDEBUG)" MTRDEBUG="$(MTRDEBUG)" LDFLAGS="$(LDFLAGS)" PURE="$(PURE)" EXE="$(EXE)" )\
 	done
 	@(cd cudd; \
 	echo Making testcudd ...; \
-	make CC=$(CC) RANLIB=$(RANLIB) MFLAG= MNEMLIB= ICFLAGS="$(ICFLAGS)" XCFLAGS="$(XCFLAGS)" DDDEBUG="$(DDDEBUG)" MTRDEBUG="$(MTRDEBUG)" LDFLAGS="$(LDFLAGS)" PURE="$(PURE)" EXE="$(EXE)" testcudd$(EXE) )
+	$(MAKE) CC=$(CC) RANLIB=$(RANLIB) MFLAG= MNEMLIB= ICFLAGS="$(ICFLAGS)" XCFLAGS="$(XCFLAGS)" DDDEBUG="$(DDDEBUG)" MTRDEBUG="$(MTRDEBUG)" LDFLAGS="$(LDFLAGS)" PURE="$(PURE)" EXE="$(EXE)" testcudd$(EXE) )
 
 objlib:
 	sh ./setup.sh
 	@for dir in $(BDIRS); do \
 		(cd $$dir; \
 		echo Making $$dir ...; \
-		make CC=$(CC) RANLIB=$(RANLIB) MFLAG= MNEMLIB= ICFLAGS="$(ICFLAGS)" XCFLAGS="$(XCFLAGS)" DDDEBUG="$(DDDEBUG)" MTRDEBUG="$(MTRDEBUG)" LDFLAGS="$(LDFLAGS)" PURE="$(PURE)" EXE="$(EXE)" )\
+		$(MAKE) CC=$(CC) RANLIB=$(RANLIB) MFLAG= MNEMLIB= ICFLAGS="$(ICFLAGS)" XCFLAGS="$(XCFLAGS)" DDDEBUG="$(DDDEBUG)" MTRDEBUG="$(MTRDEBUG)" LDFLAGS="$(LDFLAGS)" PURE="$(PURE)" EXE="$(EXE)" )\
 	done
 	@(cd obj; \
 	echo Making obj ...; \
-	make CPP=$(CPP) CPPFLAGS=$(CPPFLAGS) RANLIB=$(RANLIB) MFLAG= MNEMLIB= ICFLAGS="$(ICFLAGS)" XCFLAGS="$(XCFLAGS)" DDDEBUG="$(DDDEBUG)" MTRDEBUG="$(MTRDEBUG)" LDFLAGS="$(LDFLAGS)" PURE="$(PURE)" EXE="$(EXE)" )
+	$(MAKE) CPP=$(CPP) CPPFLAGS=$(CPPFLAGS) RANLIB=$(RANLIB) MFLAG= MNEMLIB= ICFLAGS="$(ICFLAGS)" XCFLAGS="$(XCFLAGS)" DDDEBUG="$(DDDEBUG)" MTRDEBUG="$(MTRDEBUG)" LDFLAGS="$(LDFLAGS)" PURE="$(PURE)" EXE="$(EXE)" )
 
 testobj: objlib
 	@(cd obj; \
 	echo Making testobj ...; \
-	make CPP=$(CPP) CPPFLAGS=$(CPPFLAGS) RANLIB=$(RANLIB) MFLAG= MNEMLIB= ICFLAGS="$(ICFLAGS)" XCFLAGS="$(XCFLAGS)" DDDEBUG="$(DDDEBUG)" MTRDEBUG="$(MTRDEBUG)" LDFLAGS="$(LDFLAGS)" PURE="$(PURE)" EXE="$(EXE)" testobj$(EXE) )
+	$(MAKE) CPP=$(CPP) CPPFLAGS=$(CPPFLAGS) RANLIB=$(RANLIB) MFLAG= MNEMLIB= ICFLAGS="$(ICFLAGS)" XCFLAGS="$(XCFLAGS)" DDDEBUG="$(DDDEBUG)" MTRDEBUG="$(MTRDEBUG)" LDFLAGS="$(LDFLAGS)" PURE="$(PURE)" EXE="$(EXE)" testobj$(EXE) )
 
 testdddmp: build
 	@(cd dddmp; \
 	echo Making testdddmp ...; \
-	make CC=$(CC) RANLIB=$(RANLIB) MFLAG= MNEMLIB= ICFLAGS="$(ICFLAGS)" XCFLAGS="$(XCFLAGS)" DDDEBUG="$(DDDEBUG)" MTRDEBUG="$(MTRDEBUG)" LDFLAGS="$(LDFLAGS)" PURE="$(PURE)" EXE="$(EXE)" testdddmp$(EXE) )
+	$(MAKE) CC=$(CC) RANLIB=$(RANLIB) MFLAG= MNEMLIB= ICFLAGS="$(ICFLAGS)" XCFLAGS="$(XCFLAGS)" DDDEBUG="$(DDDEBUG)" MTRDEBUG="$(MTRDEBUG)" LDFLAGS="$(LDFLAGS)" PURE="$(PURE)" EXE="$(EXE)" testdddmp$(EXE) )
 
 testmtr: build
 	@(cd mtr; \
 	echo Making testmtr ...; \
-	make CC=$(CC) RANLIB=$(RANLIB) MFLAG= MNEMLIB= ICFLAGS="$(ICFLAGS)" XCFLAGS="$(XCFLAGS)" DDDEBUG="$(DDDEBUG)" MTRDEBUG="$(MTRDEBUG)" LDFLAGS="$(LDFLAGS)" PURE="$(PURE)" EXE="$(EXE)" testmtr$(EXE) )
+	$(MAKE) CC=$(CC) RANLIB=$(RANLIB) MFLAG= MNEMLIB= ICFLAGS="$(ICFLAGS)" XCFLAGS="$(XCFLAGS)" DDDEBUG="$(DDDEBUG)" MTRDEBUG="$(MTRDEBUG)" LDFLAGS="$(LDFLAGS)" PURE="$(PURE)" EXE="$(EXE)" testmtr$(EXE) )
 
 clean:
 	@for dir in mnemosyne $(DIRS) obj; do	\
 	    (cd $$dir; 	\
 	     echo Cleaning $$dir ...; \
-	     make -s clean	) \
+	     $(MAKE) -s clean	) \
 	done
 
 distclean:
 	@for dir in mnemosyne $(DIRS) obj; do	\
 	    (cd $$dir; 	\
 	     echo Cleaning $$dir ...; \
-	     make -s EXE="$(EXE)" distclean	) \
+	     $(MAKE) -s EXE="$(EXE)" distclean	) \
 	done
 	sh ./shutdown.sh
diff -dur cudd-2.4.1.ORIG/mnemosyne/Makefile cudd-2.4.1/mnemosyne/Makefile
--- cudd-2.4.1.ORIG/mnemosyne/Makefile	1996-07-23 14:33:34.000000000 -0600
+++ cudd-2.4.1/mnemosyne/Makefile	2009-01-22 10:04:31.000000000 -0700
@@ -8,8 +8,8 @@
 # define MALLOC_IS_VOIDSTAR if your system's malloc is declared as a (void *)
 # otherwise, it is assumed to be a (char *). a "mall_t" is typedeffed in
 # mnemconf.h and mnemosyne.h to implement this.
-#OPTNS	=	-DMALLOC_IS_VOIDSTAR
-OPTNS	=
+OPTNS	=	-DMALLOC_IS_VOIDSTAR
+#OPTNS	=
 
 CC	= cc
 RANLIB	= ranlib
@@ -19,14 +19,22 @@
 
 #loader flags
 LDFLGS	=
+SHLINK	= -shared -Xlinker -soname -Xlinker libmnem.so.2
 
 HDRS	=	mnemosyne.h mnemconf.h
 
-all: mnemalyse libmnem.a
+all: mnemalyse libmnem.so.2.4.1
+
+static: libmnem.a
 
 mnemalyse: mnemalyse.o
 	$(CC) $(LDFLGS) -o $@ mnemalyse.o
 
+libmnem.so.2.4.1: mnemosyne.o
+	$(CC) $(CFLAGS) $(LDFLAGS) $(SHLINK) -o $@ mnemosyne.o
+	ln -s libmnem.so.2.4.1 libmnem.so.2
+	ln -s libmnem.so.2 libmnem.so
+
 libmnem.a: mnemosyne.o
 	ar rcv $@ mnemosyne.o
 	$(RANLIB) $@
diff -dur cudd-2.4.1.ORIG/mtr/Makefile cudd-2.4.1/mtr/Makefile
--- cudd-2.4.1.ORIG/mtr/Makefile	2004-01-01 11:47:16.000000000 -0700
+++ cudd-2.4.1/mtr/Makefile	2009-01-22 10:08:45.000000000 -0700
@@ -39,6 +39,9 @@
 TARGET	= test$(P)$(EXE)
 TARGETu	= test$(P)-u
 
+SHLINK	= -shared -Xlinker -soname -Xlinker lib$(P).so.2 -L$(WHERE)/util \
+	-lcuddutil
+
 LIBS	= ./libmtr.a $(WHERE)/util/libutil.a
 
 BLIBS	= -kL. -klmtr -kL$(WHERE)/util -klutil
@@ -49,6 +52,11 @@
 
 #---------------------------
 
+lib$(P).so.2.4.1: $(POBJ)
+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(POBJ) $(SHLINK)
+	ln -s lib$(P).so.2.4.1 lib$(P).so.2
+	ln -s lib$(P).so.2 lib$(P).so
+
 lib$(P).a: $(POBJ)
 	ar rv $@ $?
 	$(RANLIB) $@
@@ -79,7 +87,9 @@
 tags: $(PSRC) $(PHDR)
 	ctags $(PSRC) $(PHDR)
 
-all: lib$(P).a lib$(P).b llib-l$(P).ln tags
+all: lib$(P).so.2.4.1 lib$(P).b llib-l$(P).ln tags
+
+static: lib$(P).a
 
 $(TARGET): $(POBJ) $(OBJ) $(LIBS) $(MNEMLIB)
 	$(PURE) $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJ) $(LIBS) $(MNEMLIB) -lm
diff -dur cudd-2.4.1.ORIG/nanotrav/Makefile cudd-2.4.1/nanotrav/Makefile
--- cudd-2.4.1.ORIG/nanotrav/Makefile	1999-08-31 13:12:55.000000000 -0600
+++ cudd-2.4.1/nanotrav/Makefile	2009-01-22 10:11:36.000000000 -0700
@@ -19,6 +19,14 @@
 
 INCLUDE = $(WHERE)/include
 
+SHLINK	= -L$(WHERE)/dddmp -L$(WHERE)/cudd -L$(WHERE)/mtr -L$(WHERE)/st \
+	-L$(WHERE)/util -L$(WHERE)/epd -ldddmp -lcudd -lmtr -lcuddst \
+	-lcuddutil -lepd
+
+SHLIBS	= $(WHERE)/dddmp/libdddmp.so.2.4.1 $(WHERE)/cudd/libcudd.so.2.4.1 \
+	$(WHERE)/mtr/libmtr.so.2.4.1 $(WHERE)/st/libcuddst.so.2.4.1 \
+	$(WHERE)/util/libcuddutil.so.2.4.1 $(WHERE)/epd/libepd.so.2.4.1
+
 LIBS	= $(WHERE)/dddmp/libdddmp.a $(WHERE)/cudd/libcudd.a \
 	$(WHERE)/mtr/libmtr.a $(WHERE)/st/libst.a $(WHERE)/util/libutil.a \
 	$(WHERE)/epd/libepd.a
@@ -60,8 +68,8 @@
 
 #------------------------------------------------------
 
-$(TARGET): $(SRC) $(OBJ) $(HDR) $(LIBS) $(MNEMLIB)
-	$(PURE) $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJ) $(LIBS) $(MNEMLIB) -lm
+$(TARGET): $(SRC) $(OBJ) $(HDR) $(SHLIBS) $(MNEMLIB)
+	$(PURE) $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJ) $(SHLINK) $(MNEMLIB) -lm
 
 .c.o: $(HDR)
 	$(CC) -c $< -I$(INCLUDE) $(CFLAGS) $(DDDEBUG)
@@ -87,6 +95,8 @@
 
 all: $(TARGET) $(TARGETu) lint tags
 
+static:
+
 pixie: $(TARGETu)
 	pixie $(TARGETu)
 
diff -dur cudd-2.4.1.ORIG/obj/Makefile cudd-2.4.1/obj/Makefile
--- cudd-2.4.1.ORIG/obj/Makefile	2001-03-19 00:35:09.000000000 -0700
+++ cudd-2.4.1/obj/Makefile	2009-01-22 12:58:56.000000000 -0700
@@ -27,6 +27,8 @@
 
 INCLUDE = $(WHERE)/include
 
+SHLINK	= -shared -Xlinker -soname -Xlinker lib$(P).so.2
+
 LIBS	= ./libobj.a $(WHERE)/cudd/libcudd.a $(WHERE)/mtr/libmtr.a \
 	$(WHERE)/st/libst.a $(WHERE)/util/libutil.a $(WHERE)/epd/libepd.a
 
@@ -57,6 +59,11 @@
 
 #------------------------------------------------------
 
+libs$(P).so.2.4.1: $(POBJ)
+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(POBJ) $(SHLINK)
+	ln -s lib$(P).so.2.4.1 lib$(P).so.2
+	ln -s lib$(P).so.2 lib$(P).so
+
 lib$(P).a: $(POBJ)
 	ar rv $@ $?
 	$(RANLIB) $@
@@ -97,7 +104,9 @@
 tags: $(PSRC) $(PHDR)
 	ctags $(PSRC) $(PHDR)
 
-all: lib$(P).a lib$(P).b llib-l$(P).ln tags
+all: lib$(P).so.2.4.1 lib$(P).b llib-l$(P).ln tags
+
+static: lib$(P).a
 
 programs: $(TARGET) $(TARGETu) lintpgm
 
diff -dur cudd-2.4.1.ORIG/st/Makefile cudd-2.4.1/st/Makefile
--- cudd-2.4.1.ORIG/st/Makefile	2004-01-01 09:53:24.000000000 -0700
+++ cudd-2.4.1/st/Makefile	2009-01-22 13:02:29.000000000 -0700
@@ -11,6 +11,9 @@
 ICFLAGS = -g -O6 -Wall
 CFLAGS  = $(ICFLAGS) $(MFLAG) $(XCFLAGS)
 
+SHLINK	= -shared -Xlinker -soname -Xlinker libcudd$(P).so.2 -L$(WHERE)/util \
+	-lcuddutil
+
 LINTFLAGS = -u -n
 
 # this is to create the lint library
@@ -27,6 +30,11 @@
 
 #---------------------------
 
+libcudd$(P).so.2.4.1: $(POBJ)
+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(POBJ) $(SHLINK)
+	ln -s libcudd$(P).so.2.4.1 libcudd$(P).so.2
+	ln -s libcudd$(P).so.2 libcudd$(P).so
+
 lib$(P).a: $(POBJ)
 	ar rv $@ $?
 	$(RANLIB) $@
@@ -55,7 +63,9 @@
 tags: $(PSRC) $(PHDR)
 	ctags $(PSRC) $(PHDR)
 
-all: lib$(P).a lib$(P).b llib-l$(P).ln tags
+all: libcudd$(P).so.2.4.1 lib$(P).b llib-l$(P).ln tags
+
+static: lib$(P).a
 
 clean:
 	rm -f *.o *.u .pure *.warnings
diff -dur cudd-2.4.1.ORIG/util/Makefile cudd-2.4.1/util/Makefile
--- cudd-2.4.1.ORIG/util/Makefile	2004-01-03 10:15:30.000000000 -0700
+++ cudd-2.4.1/util/Makefile	2009-01-22 13:04:48.000000000 -0700
@@ -12,6 +12,8 @@
 ICFLAGS = -g
 CFLAGS  = $(ICFLAGS) $(MFLAG) $(XCFLAGS)
 
+SHLINK	= -shared -Xlinker -soname -Xlinker libcudd$(P).so.2
+
 LINTFLAGS = -u -n
 
 # this is to create the lint library
@@ -28,6 +30,11 @@
 WHERE	= ..
 INCLUDE = $(WHERE)/include
 
+libcudd$(P).so.2.4.1: $(POBJ)
+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(POBJ) $(SHLINK)
+	ln -s libcudd$(P).so.2.4.1 libcudd$(P).so.2
+	ln -s libcudd$(P).so.2 libcudd$(P).so
+
 lib$(P).a: $(POBJ)
 	ar rv $@ $?
 	$(RANLIB) $@
@@ -56,7 +63,9 @@
 tags: $(PSRC) $(PHDR)
 	ctags $(PSRC) $(PHDR)
 
-all: lib$(P).a lib$(P).b llib-l$(P).ln tags
+all: libcudd$(P).so.2.4.1 lib$(P).b llib-l$(P).ln tags
+
+static: lib$(P).a
 
 clean:
 	rm -f *.o *.u core *.warnings

cudd-2.4.1-signedness.patch:

--- NEW FILE cudd-2.4.1-signedness.patch ---
diff -dur cudd-2.4.1.ORIG/cudd/cuddGroup.c cudd-2.4.1/cudd/cuddGroup.c
--- cudd-2.4.1.ORIG/cudd/cuddGroup.c	2004-08-24 15:37:44.000000000 -0600
+++ cudd-2.4.1/cudd/cuddGroup.c	2006-02-20 15:04:32.000000000 -0700
@@ -214,7 +214,9 @@
     ** Cudd_bddNewVarAtLevel or Cudd_addNewVarAtLevel to create new
     ** variables have to create the variables before they group them.
     */
-    level = (low < (unsigned int) dd->size) ? dd->perm[low] : low;
+    level = (low < (unsigned int) dd->size)
+      ? (unsigned int) dd->perm[low]
+      : low;
 
     if (level + size - 1> (int) MTR_MAXHIGH)
 	return(NULL);
diff -dur cudd-2.4.1.ORIG/cudd/cuddZddGroup.c cudd-2.4.1/cudd/cuddZddGroup.c
--- cudd-2.4.1.ORIG/cudd/cuddZddGroup.c	2004-08-24 15:37:47.000000000 -0600
+++ cudd-2.4.1/cudd/cuddZddGroup.c	2006-02-20 15:05:24.000000000 -0700
@@ -171,7 +171,9 @@
     ** Cudd_bddNewVarAtLevel or Cudd_addNewVarAtLevel to create new
     ** variables have to create the variables before they group them.
     */
-    level = (low < (unsigned int) dd->sizeZ) ? dd->permZ[low] : low;
+    level = (low < (unsigned int) dd->sizeZ)
+      ? (unsigned int) dd->permZ[low]
+      : low;
 
     if (level + size - 1> (int) MTR_MAXHIGH)
 	return(NULL);
diff -dur cudd-2.4.1.ORIG/st/st.c cudd-2.4.1/st/st.c
--- cudd-2.4.1.ORIG/st/st.c	2004-02-11 15:33:16.000000000 -0700
+++ cudd-2.4.1/st/st.c	2006-02-20 15:55:51.000000000 -0700
@@ -54,7 +54,7 @@
 #define st_shift 2
 #endif
 
-#define ST_PTRHASH(x,size) ((unsigned int)((unsigned long)(x)>>st_shift)%size)
+#define ST_PTRHASH(x,size) ((int)((unsigned long)(x)>>st_shift)%size)
 
 #define EQUAL(func, x, y) \
     ((((func) == st_numcmp) || ((func) == st_ptrcmp)) ?\

cudd-2.4.1-strcat.patch:

--- NEW FILE cudd-2.4.1-strcat.patch ---
diff -dur cudd-2.4.1.ORIG/util/texpand.c cudd-2.4.1/util/texpand.c
--- cudd-2.4.1.ORIG/util/texpand.c	2004-01-01 09:49:21.000000000 -0700
+++ cudd-2.4.1/util/texpand.c	2006-02-20 14:57:37.000000000 -0700
@@ -14,9 +14,6 @@
 #ifdef BSD
     struct passwd *userRecord;
     char username[256], *filename;
-#ifndef _IBMR2
-    char *strcat (char *, const char *);
-#endif
     register int i, j;
 
     filename = ALLOC(char, strlen(fname) + 256);


Index: cudd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cudd/devel/cudd.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cudd.spec	7 Jan 2009 03:01:55 -0000	1.1
+++ cudd.spec	22 Jan 2009 21:03:14 -0000	1.2
@@ -1,14 +1,30 @@
-%define debug_package %{nil}
-# rpmbuild doesn't get useful debuginfo from .a libs
-
 Name:           cudd
 Version:        2.4.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        CU Decision Diagram Package
 Group:          Development/Libraries
 License:        BSD
 URL:            http://vlsi.colorado.edu/~fabio/CUDD/
 Source0:        ftp://vlsi.Colorado.EDU/pub/cudd-%{version}.tar.gz
+# This patch was sent upstream in September 2005.
+# Build shared libraries as well as static archives, and incidentally unbreak
+# parallel make.
+Patch0:         cudd-2.4.1-sharedlib.patch
+# This patch was sent upstream in September 2005.
+# Extern declarations of strcat get mangled by the preprocessor
+Patch1:         cudd-2.4.1-strcat.patch
+# This patch was sent upstream in September 2005.
+# Fix some mixed signed/unsigned operations
+Patch2:         cudd-2.4.1-signedness.patch
+# This patch was sent upstream in September 2005.
+# Don't ignore the return values of certain functions
+Patch3:         cudd-2.4.1-retval.patch
+# This patch was sent upstream in September 2005.
+# Fix a bunch of "used without being initialized" warnings
+Patch4:         cudd-2.4.1-init.patch
+# This patch was sent upstream in September 2005.
+# On 64 bit platforms, fix the size definitions of void * and long
+Patch5:         cudd-2.4.1-64bit.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 
@@ -19,48 +35,128 @@
 
 
 %package        devel
-Summary:        Development files for %{name}
+Summary:        Header files and man pages for %{name}
 Group:          Development/Libraries
-Provides:       %{name}-static = %{version}-%{release}
+Requires:       %{name} = %{version}-%{release}
 
 
 %description    devel
-Development headers and libraries for %{name}.
+Development headers and man pages for %{name}.
+
+
+%package        static
+Summary:        Static libraries for %{name}
+Group:          Development/Libraries
+
+
+%description    static
+Static libraries for %{name}.
 
 
 %prep
 %setup -q
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
+
+# Fix two doc files with DOS line endings
+sed -i 's/\r//' dddmp/README.dddmp
+sed -i 's/\r//' dddmp/README.testdddmp
 
 
 %build
-make %{?_smp_mflags} CPPFLAGS="%{optflags}" ICFLAGS="%{optflags}" \
-  XCFLAGS=""
+# Build the shared libraries and binaries
+make %{?_smp_mflags} CPPFLAGS="%{optflags}" ICFLAGS="%{optflags} -fPIC" \
+  XCFLAGS="-DHAVE_IEEE_754 -DBSD"
+
+# Build the static libraries
+make clean
+make %{?_smp_mflags} static CPPFLAGS="%{optflags}" ICFLAGS="%{optflags}" \
+  XCFLAGS="-DHAVE_IEEE_754 -DBSD"
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
+
+# Install the shared libraries
+mkdir -p $RPM_BUILD_ROOT%{_libdir}
+for slib in */*.so; do
+  install -p -m 755 ${slib}.2.4.1 $RPM_BUILD_ROOT%{_libdir}/
+  mv ${slib}.2 $RPM_BUILD_ROOT%{_libdir}
+  mv ${slib} $RPM_BUILD_ROOT%{_libdir}
+done
+
+# Install the static libraries
 mkdir -p $RPM_BUILD_ROOT%{_libdir}/%{name}
 for slib in */*.a; do
   install -p -m 644 ${slib} $RPM_BUILD_ROOT%{_libdir}/%{name}/
 done
+
+# Install the header files
 mkdir -p $RPM_BUILD_ROOT%{_includedir}/%{name}
 for hdr in include/*; do
   install -p -m 644 ${hdr} $RPM_BUILD_ROOT%{_includedir}/%{name}/
 done
 
+# Install the test binary
+mkdir -p $RPM_BUILD_ROOT%{_bindir}
+install -p -m 0755 nanotrav/nanotrav $RPM_BUILD_ROOT%{_bindir}
+
+# Install the test binary man page
+mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
+install -p -m 0644 nanotrav/nanotrav.1 $RPM_BUILD_ROOT%{_mandir}/man1
+
+# Put all the documentation in one place for easy installation
+mkdir doc
+mv cudd/doc doc/cudd
+mv dddmp/doc doc/dddmp
+mv dddmp/R* doc/dddmp
+mv mtr/doc doc/mtr
+mv nanotrav/doc doc/nanotrav
+mv nanotrav/README doc/nanotrav
+mv st/doc doc/st
+
+
+%post -p /sbin/ldconfig
+
+
+%postun -p /sbin/ldconfig
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 
+%files
+%defattr(-,root,root,-)
+%doc README LICENSE RELEASE.NOTES doc/nanotrav
+%{_bindir}/nanotrav
+%{_libdir}/*.so.*
+%{_mandir}/man1/*
+
+
 %files devel
 %defattr(-,root,root,-)
-%doc README LICENSE cudd/doc
-%{_libdir}/%{name}
+%doc README LICENSE doc/cudd doc/dddmp doc/mtr doc/st
 %{_includedir}/%{name}
+%{_libdir}/*.so
+
+
+%files static
+%defattr(-,root,root,-)
+%{_libdir}/%{name}
 
 
 %changelog
+* Thu Jan 22 2009 Jerry James <loganjerry at gmail.com> - 2.4.1-3
+- Add patches to address various minor build infelicities
+- Build both shared and static libraries
+- Install the test binary, nanotrav, and its man page
+- Gather documentation from all of the subdirectories
+
 * Sun Jan 4 2009 Conrad Meyer <konrad at tylerc.org> - 2.4.1-2
 - Add LICENSE, cudd/doc to docs.
 



From hadess at fedoraproject.org  Thu Jan 22 21:06:20 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Thu, 22 Jan 2009 21:06:20 +0000 (UTC)
Subject: rpms/python-gdata/devel .cvsignore, 1.6, 1.7 python-gdata.spec, 1.9,
	1.10 sources, 1.6, 1.7
Message-ID: <20090122210620.314AE70033@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/python-gdata/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv320

Modified Files:
	.cvsignore python-gdata.spec sources 
Log Message:
* Thu Jan 22 2009 - Bastien Nocera <bnocera at redhat.com> - 1.2.4-1
- Update to 1.2.4



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-gdata/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	4 Dec 2008 10:29:47 -0000	1.6
+++ .cvsignore	22 Jan 2009 21:05:49 -0000	1.7
@@ -1 +1 @@
-gdata.py-1.2.3.tar.gz
+gdata.py-1.2.4.tar.gz


Index: python-gdata.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-gdata/devel/python-gdata.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- python-gdata.spec	4 Dec 2008 18:05:12 -0000	1.9
+++ python-gdata.spec	22 Jan 2009 21:05:49 -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:           python-gdata
-Version:        1.2.3
-Release:        2%{?dist}
+Version:        1.2.4
+Release:        1%{?dist}
 Summary:        A Python module for accessing online Google services
 
 Group:          Development/Languages
@@ -48,6 +48,9 @@
 
 
 %changelog
+* Thu Jan 22 2009 - Bastien Nocera <bnocera at redhat.com> - 1.2.4-1
+- Update to 1.2.4
+
 * Thu Dec 04 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 1.2.3-2
 - Rebuild for Python 2.6
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-gdata/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	4 Dec 2008 10:29:47 -0000	1.6
+++ sources	22 Jan 2009 21:05:49 -0000	1.7
@@ -1 +1 @@
-ab7a621f955f1a821ca82d50f9f6c990  gdata.py-1.2.3.tar.gz
+521f33a377d64f8a6505ba119415b787  gdata.py-1.2.4.tar.gz



From dwayne at fedoraproject.org  Thu Jan 22 21:08:03 2009
From: dwayne at fedoraproject.org (Dwayne Bailey)
Date: Thu, 22 Jan 2009 21:08:03 +0000 (UTC)
Subject: rpms/virtaal/devel virtaal-0.3beta1-setup_drop_MO_generation.patch, 
	NONE, 1.1 virtaal-0.3beta1-version.patch, NONE, 1.1 .cvsignore,
	1.2, 1.3 sources, 1.2, 1.3 virtaal.spec, 1.1,
	1.2 virtaal-0.2-setup_drop_MO_generation.patch, 1.1, NONE
Message-ID: <20090122210803.122DF179D1E@cvs1.fedora.phx.redhat.com>

Author: dwayne

Update of /cvs/pkgs/rpms/virtaal/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv609

Modified Files:
	.cvsignore sources virtaal.spec 
Added Files:
	virtaal-0.3beta1-setup_drop_MO_generation.patch 
	virtaal-0.3beta1-version.patch 
Removed Files:
	virtaal-0.2-setup_drop_MO_generation.patch 
Log Message:
* Thu Jan 22 2009 Dwayne Bailey <dwayne at translate.org.za> - 0.3-0.1.beta1
- Update for 0.3-beta1 release
- Refresh MO setup patch
- Add version patch to prevent dependency on Translate Toolkit 
  when building


virtaal-0.3beta1-setup_drop_MO_generation.patch:

--- NEW FILE virtaal-0.3beta1-setup_drop_MO_generation.patch ---
diff -up virtaal-0.3beta1/setup.py.setup_drop_MO_generation virtaal-0.3beta1/setup.py
--- virtaal-0.3beta1/setup.py.setup_drop_MO_generation	2009-01-22 19:32:07.000000000 +0200
+++ virtaal-0.3beta1/setup.py	2009-01-22 22:28:32.000000000 +0200
@@ -60,23 +60,6 @@ classifiers = [
 ]
 #TODO: add Natural Language classifiers
 
-# Compile .mo files from available .po files
-from translate.tools.pocompile import convertmo
-mo_files = []
-
-for po_filename in glob.glob(path.join('po', '*.po')):
-    lang = path.split(po_filename[:-3])[1] # Chop off '.po'
-    mo_filename = path.join('mo', lang, 'virtaal.mo')
-
-    if not path.exists(path.join('mo', lang)):
-        os.makedirs(path.join('mo', lang))
-
-    convertmo(open(po_filename), open(mo_filename, 'w'), None)
-
-    mo_files.append(
-        ( path.join(TARGET_DATA_DIR, 'locale', lang, 'LC_MESSAGES'), [mo_filename])
-    )
-
 # Some of these depend on some files to be built externally before running
 # setup.py, like the .xml and .desktop files
 options = {
@@ -84,7 +67,7 @@ options = {
         (path.join(TARGET_DATA_DIR, "virtaal"), glob.glob(path.join(SOURCE_DATA_DIR, "virtaal", "*.*"))),
         (path.join(TARGET_DATA_DIR, "virtaal", "autocorr"), glob.glob(path.join(SOURCE_DATA_DIR, "virtaal", "autocorr", "*"))),
         (path.join(TARGET_DATA_DIR, "icons"), glob.glob(path.join(SOURCE_DATA_DIR, "icons", "*.*"))),
-    ] + mo_files,
+    ],
     'scripts': [
         "bin/virtaal",
     ],

virtaal-0.3beta1-version.patch:

--- NEW FILE virtaal-0.3beta1-version.patch ---
--- /dev/null	2009-01-22 12:36:32.668282991 +0200
+++ virtaal-0.3beta1/__version__.py	2009-01-22 22:43:30.000000000 +0200
@@ -0,0 +1,22 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+#
+# Copyright 2008 Zuza Software Foundation
+#
+# This file is part of Virtaal.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
+
+"""This file contains the version."""
+ver = "0.3beta1"
--- virtaal-0.3beta1/setup.py.version	2009-01-22 22:45:22.000000000 +0200
+++ virtaal-0.3beta1/setup.py	2009-01-22 22:45:32.000000000 +0200
@@ -19,7 +19,7 @@
 # along with this program; if not, see <http://www.gnu.org/licenses/>.
 
 from distutils.core import setup, Distribution, Command
-from virtaal.common.__version__ import ver as virtaal_version
+from __version__ import ver as virtaal_version
 import glob
 import os
 import os.path as path


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/virtaal/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	4 Jan 2009 21:45:51 -0000	1.2
+++ .cvsignore	22 Jan 2009 21:07:32 -0000	1.3
@@ -1 +1,2 @@
 virtaal-0.2.tar.bz2
+virtaal-0.3beta1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/virtaal/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	4 Jan 2009 21:45:52 -0000	1.2
+++ sources	22 Jan 2009 21:07:32 -0000	1.3
@@ -1 +1,2 @@
 cd01398cc6c916317829a88c72af2253  virtaal-0.2.tar.bz2
+ef67448bf29f75a49709a59c05fe4230  virtaal-0.3beta1.tar.bz2


Index: virtaal.spec
===================================================================
RCS file: /cvs/pkgs/rpms/virtaal/devel/virtaal.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- virtaal.spec	4 Jan 2009 21:45:52 -0000	1.1
+++ virtaal.spec	22 Jan 2009 21:07:32 -0000	1.2
@@ -1,17 +1,19 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           virtaal
-Version:        0.2
-Release:        2%{?dist}
+Version:        0.3
+Release:        0.1.beta1%{?dist}
 Summary:        Localization and translation editor
 
 Group:          Development/Tools
 License:        GPLv2+
 URL:            http://translate.sourceforge.net/wiki/virtaal/index
-Source0:        http://downloads.sourceforge.net/translate/%{name}-%{version}.tar.bz2
+#Source0:        http://downloads.sourceforge.net/translate/%{name}-%{version}.tar.bz2
+Source0:        http://translate.sourceforge.net/snapshots/virtaal-0.3-beta1/virtaal-0.3beta1.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Patch0:         virtaal-0.2-setup_drop_MO_generation.patch
+Patch0:         virtaal-0.3beta1-setup_drop_MO_generation.patch
+Patch1:         virtaal-0.3beta1-version.patch
 
 BuildArch:      noarch
 BuildRequires:  python
@@ -19,7 +21,7 @@
 BuildRequires:  desktop-file-utils
 BuildRequires:  gettext
 BuildRequires:  intltool
-Requires:       translate-toolkit >= 1.2
+Requires:       translate-toolkit >= 1.3
 Requires:       pygtk2
 Requires:       pygtk2-libglade
 Requires:       python-lxml
@@ -42,8 +44,9 @@
  
 
 %prep
-%setup -q -n %{name}-%{version}
-%patch0 -p1
+%setup -q -n %{name}-%{version}beta1
+%patch0 -p1 -b .setup_drop_MO_generation
+%patch1 -p1 -b .version
 
 %build
 %{__python} setup.py build
@@ -103,6 +106,12 @@
 
 
 %changelog
+* Thu Jan 22 2009 Dwayne Bailey <dwayne at translate.org.za> - 0.3-0.1.beta1
+- Update for 0.3-beta1 release
+- Refresh MO setup patch
+- Add version patch to prevent dependency on Translate Toolkit 
+  when building
+
 * Sat Dec 6 2008 Dwayne Bailey <dwayne at translate.org.za> - 0.2-2
 - Cleanups from package review
 


--- virtaal-0.2-setup_drop_MO_generation.patch DELETED ---



From konradm at fedoraproject.org  Thu Jan 22 21:09:36 2009
From: konradm at fedoraproject.org (Conrad Meyer)
Date: Thu, 22 Jan 2009 21:09:36 +0000 (UTC)
Subject: rpms/cddlib/devel cddlib.spec,1.2,1.3
Message-ID: <20090122210936.46FAC70033@cvs1.fedora.phx.redhat.com>

Author: konradm

Update of /cvs/pkgs/rpms/cddlib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1147

Modified Files:
	cddlib.spec 
Log Message:
Install headers better.


Index: cddlib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cddlib/devel/cddlib.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- cddlib.spec	29 Nov 2008 04:49:43 -0000	1.2
+++ cddlib.spec	22 Jan 2009 21:09:05 -0000	1.3
@@ -3,7 +3,7 @@
 
 Name:           cddlib
 Version:        094f
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        A library for generating all vertices in convex polyhedrons
 Group:          Applications/Engineering
 License:        GPLv2+
@@ -15,6 +15,7 @@
 Source0:        %{name}-094f-free.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  gmp-devel
+BuildRequires:  texlive-latex
 
 
 %description
@@ -56,16 +57,22 @@
 rm -rf src*/.DS_Store* src*/.gdb_history examples*/.DS_Store*
 rm -rf src-gmp/~
 chmod -x -R examples*/* src*/*
+rm doc/cddlibman.pdf
 
 
 %build
 %configure
 make %{?_smp_mflags}
+cd doc
+  pdflatex cddlibman.tex
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
+mkdir $RPM_BUILD_ROOT%{_includedir}/cddlib
+mv $RPM_BUILD_ROOT%{_includedir}/{cdd,cdd_f,cddmp,cddmp_f,cddtypes,cddtypes_f,setoper}.h \
+  $RPM_BUILD_ROOT%{_includedir}/cddlib/
 
 
 %clean
@@ -76,7 +83,7 @@
 %defattr(-,root,root,-)
 %doc doc/cddlibman.pdf
 %doc examples* src*
-%{_includedir}/*.h
+%{_includedir}/cddlib
 %{_libdir}/libcdd.a
 %{_libdir}/libcddgmp.a
 
@@ -84,6 +91,8 @@
 %changelog
 * Fri Nov 28 2008 Conrad Meyer <konrad at tylerc.org> - 094f-7
 - Install headers with install -p to save timestamps.
+- Install headers to namespaced directory.
+- Generate pdf from latex source.
 
 * Fri Oct 31 2008 Conrad Meyer <konrad at tylerc.org> - 094f-6
 - Describe vividly the process whereby the non-free file is



From rdieter at fedoraproject.org  Thu Jan 22 21:10:31 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu, 22 Jan 2009 21:10:31 +0000 (UTC)
Subject: rpms/qt/devel qt.spec,1.221,1.222
Message-ID: <20090122211031.04AAD70033@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/qt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1307

Modified Files:
	qt.spec 
Log Message:
* Thu Jan 22 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.4.3-12 
- respin (mysql)



Index: qt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qt/devel/qt.spec,v
retrieving revision 1.221
retrieving revision 1.222
diff -u -r1.221 -r1.222
--- qt.spec	16 Jan 2009 10:12:51 -0000	1.221
+++ qt.spec	22 Jan 2009 21:10:00 -0000	1.222
@@ -9,7 +9,7 @@
 Name:    qt4
 %endif
 Version: 4.4.3
-Release: 11%{?dist}
+Release: 12%{?dist}
 
 # GPLv2 exceptions(see GPL_EXCEPTIONS*.txt)
 License: GPLv3 with exceptions or GPLv2 with exceptions
@@ -731,6 +731,9 @@
 
 
 %changelog
+* Thu Jan 22 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.4.3-12 
+- respin (mysql)
+
 * Fri Jan 16 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.4.3-11
 - rebuild for new OpenSSL
 



From ixs at fedoraproject.org  Thu Jan 22 21:10:50 2009
From: ixs at fedoraproject.org (Andreas Thienemann)
Date: Thu, 22 Jan 2009 21:10:50 +0000 (UTC)
Subject: rpms/munin/EL-5 munin-1.2.6-ntp_offset.patch, NONE,
	1.1 munin-1.2.6-postfix-config, NONE, 1.1 .cvsignore, 1.3,
	1.4 munin.spec, 1.13, 1.14 sources, 1.3, 1.4
Message-ID: <20090122211050.97FB570033@cvs1.fedora.phx.redhat.com>

Author: ixs

Update of /cvs/pkgs/rpms/munin/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1371

Modified Files:
	.cvsignore munin.spec sources 
Added Files:
	munin-1.2.6-ntp_offset.patch munin-1.2.6-postfix-config 
Log Message:
Rebased EPEL package to 1.2.6 based on F-10 branch

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: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/munin/EL-5/.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	22 Jan 2009 21:10:20 -0000	1.4
@@ -1 +1 @@
-munin_1.2.5.tar.gz
+munin_1.2.6.tar.gz


Index: munin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/munin/EL-5/munin.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- munin.spec	28 Dec 2007 18:34:10 -0000	1.13
+++ munin.spec	22 Jan 2009 21:10:20 -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)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/munin/EL-5/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	22 Jan 2009 21:10:20 -0000	1.4
@@ -1 +1 @@
-e863d11693c02bde1c593a6c701e64fd  munin_1.2.5.tar.gz
+45f84d58f80642ce914f147232f0d396  munin_1.2.6.tar.gz



From rdieter at fedoraproject.org  Thu Jan 22 21:12:05 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu, 22 Jan 2009 21:12:05 +0000 (UTC)
Subject: rpms/amarok/devel amarok.spec,1.130,1.131
Message-ID: <20090122211205.3ECBF179D1E@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/amarok/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1608

Modified Files:
	amarok.spec 
Log Message:
* Thu Jan 22 2009 Rex Dieter <rdieter at fedoraproject.org> - 2.0.1.1-2 
- respin (mysql)



Index: amarok.spec
===================================================================
RCS file: /cvs/pkgs/rpms/amarok/devel/amarok.spec,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -r1.130 -r1.131
--- amarok.spec	9 Jan 2009 21:14:10 -0000	1.130
+++ amarok.spec	22 Jan 2009 21:11:35 -0000	1.131
@@ -2,7 +2,7 @@
 Name:    amarok
 Summary: Media player
 Version: 2.0.1.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 Group: 	 Applications/Multimedia
 License: GPLv2+
@@ -113,6 +113,9 @@
 
 
 %changelog
+* Thu Jan 22 2009 Rex Dieter <rdieter at fedoraproject.org> - 2.0.1.1-2 
+- respin (mysql)
+
 * Fri Jan 09 2009 Rex Dieter <rdieter at fedoraproject.org> - 2.0.1.1-1
 - amarok-2.0.1.1
 



From rdieter at fedoraproject.org  Thu Jan 22 21:12:43 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu, 22 Jan 2009 21:12:43 +0000 (UTC)
Subject: rpms/koffice/devel koffice.spec,1.92,1.93
Message-ID: <20090122211243.2D5DA70033@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/koffice/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1719

Modified Files:
	koffice.spec 
Log Message:
* Thu Jan 22 2009 Rex Dieter <rdieter at fedoraproject.org> - 1:1.9.98.5-2 
- respin (mysql)



Index: koffice.spec
===================================================================
RCS file: /cvs/pkgs/rpms/koffice/devel/koffice.spec,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -r1.92 -r1.93
--- koffice.spec	9 Jan 2009 19:20:37 -0000	1.92
+++ koffice.spec	22 Jan 2009 21:12:12 -0000	1.93
@@ -8,7 +8,7 @@
 Name:           koffice
 Epoch:          1
 Version:        1.9.98.5
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        An integrated office suite
 
 Group:          Applications/Productivity
@@ -712,6 +712,9 @@
 
 
 %changelog
+* Thu Jan 22 2009 Rex Dieter <rdieter at fedoraproject.org> - 1:1.9.98.5-2 
+- respin (mysql)
+
 * Thu Jan 08 2009 Rex Dieter <rdieter at fedoraproject.org> - 1:1.9.98.5-1
 - koffice-1.9.98.5, koffice2 beta 5 (take 2)
 



From ixs at fedoraproject.org  Thu Jan 22 21:13:14 2009
From: ixs at fedoraproject.org (Andreas Thienemann)
Date: Thu, 22 Jan 2009 21:13:14 +0000 (UTC)
Subject: rpms/munin/EL-4 munin-1.2.6-ntp_offset.patch, NONE,
	1.1 munin-1.2.6-postfix-config, NONE, 1.1 .cvsignore, 1.3,
	1.4 munin.spec, 1.13, 1.14 sources, 1.3, 1.4
Message-ID: <20090122211314.3E4DD179D1E@cvs1.fedora.phx.redhat.com>

Author: ixs

Update of /cvs/pkgs/rpms/munin/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1892

Modified Files:
	.cvsignore munin.spec sources 
Added Files:
	munin-1.2.6-ntp_offset.patch munin-1.2.6-postfix-config 
Log Message:
Rebased EPEL package to 1.2.6 based on F-10 branch

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: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/munin/EL-4/.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	22 Jan 2009 21:12:43 -0000	1.4
@@ -1 +1 @@
-munin_1.2.5.tar.gz
+munin_1.2.6.tar.gz


Index: munin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/munin/EL-4/munin.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- munin.spec	28 Dec 2007 18:34:10 -0000	1.13
+++ munin.spec	22 Jan 2009 21:12:43 -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)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/munin/EL-4/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	22 Jan 2009 21:12:43 -0000	1.4
@@ -1 +1 @@
-e863d11693c02bde1c593a6c701e64fd  munin_1.2.5.tar.gz
+45f84d58f80642ce914f147232f0d396  munin_1.2.6.tar.gz



From rdieter at fedoraproject.org  Thu Jan 22 21:15:45 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu, 22 Jan 2009 21:15:45 +0000 (UTC)
Subject: rpms/redland/devel redland.spec,1.13,1.14
Message-ID: <20090122211545.4860270033@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/redland/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2341

Modified Files:
	redland.spec 
Log Message:
* Thu Jan 22 2009 Rex Dieter <rdieter at fedoraproject.org> 1.0.7-5 
- respin (mysql)



Index: redland.spec
===================================================================
RCS file: /cvs/pkgs/rpms/redland/devel/redland.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- redland.spec	16 Jan 2009 10:14:42 -0000	1.13
+++ redland.spec	22 Jan 2009 21:15:14 -0000	1.14
@@ -1,6 +1,6 @@
 Name:           redland
 Version:        1.0.7
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        RDF Application Framework
 
 Group:          System Environment/Libraries
@@ -101,6 +101,9 @@
 %postun -p /sbin/ldconfig
 
 %changelog
+* Thu Jan 22 2009 Rex Dieter <rdieter at fedoraproject.org> 1.0.7-5 
+- respin (mysql)
+
 * Fri Jan 16 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 1.0.7-4
 - rebuild for new OpenSSL
 



From sdz at fedoraproject.org  Thu Jan 22 21:17:47 2009
From: sdz at fedoraproject.org (Sebastian Dziallas)
Date: Thu, 22 Jan 2009 21:17:47 +0000 (UTC)
Subject: rpms/avogadro/F-10 .cvsignore, 1.2, 1.3 avogadro.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <20090122211747.0845470033@cvs1.fedora.phx.redhat.com>

Author: sdz

Update of /cvs/pkgs/rpms/avogadro/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2768

Modified Files:
	.cvsignore avogadro.spec sources 
Log Message:
Update to 0.9.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/avogadro/F-10/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	16 Sep 2008 05:20:07 -0000	1.2
+++ .cvsignore	22 Jan 2009 21:17:16 -0000	1.3
@@ -1 +1 @@
-avogadro-0.8.1.tar.bz2
+avogadro-0.9.0.tar.bz2


Index: avogadro.spec
===================================================================
RCS file: /cvs/pkgs/rpms/avogadro/F-10/avogadro.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- avogadro.spec	16 Sep 2008 05:20:08 -0000	1.1
+++ avogadro.spec	22 Jan 2009 21:17:16 -0000	1.2
@@ -1,7 +1,7 @@
 Name:           avogadro
-Version:        0.8.1
-Release:        6%{?dist}
-Summary:        Avogadro is an advanced Molecular editor
+Version:        0.9.0
+Release:        1%{?dist}
+Summary:        An advanced molecular editor for chemical purposes
 
 Group:          Applications/Editors
 License:        GPLv2
@@ -10,20 +10,19 @@
 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:  cmake >= 2.6.0
+BuildRequires:  qt-devel >= 4.4.0
+BuildRequires:  eigen2-devel >= 2.0-0.9.beta6
 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,
+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
+and related areas, which offers flexible rendering and
 a powerful plugin architecture.
 
 
@@ -109,6 +108,9 @@
 
 
 %changelog
+* Thu Jan 22 2009 Sebastian Dziallas <sebastian at when.com> 0.9.0-1
+- update to new release
+
 * Sun Sep 14 2008 Sebastian Dziallas <sebastian at when.com> 0.8.1-6
 - add handbook to docs
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/avogadro/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	16 Sep 2008 05:20:08 -0000	1.2
+++ sources	22 Jan 2009 21:17:16 -0000	1.3
@@ -1 +1 @@
-a74d11a9a8240d018db8638e82dd915c  avogadro-0.8.1.tar.bz2
+ee4b33dc12c92429bee1ba45787d8b5b  avogadro-0.9.0.tar.bz2



From rdieter at fedoraproject.org  Thu Jan 22 21:20:32 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu, 22 Jan 2009 21:20:32 +0000 (UTC)
Subject: rpms/qt3/devel qt3.spec,1.8,1.9
Message-ID: <20090122212032.BD88770033@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/qt3/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3795

Modified Files:
	qt3.spec 
Log Message:
* Thu Jan 22 2009 Rex Dieter <rdieter at fedoraproject.org> 3.3.8b-18
- respin (mysql)



Index: qt3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qt3/devel/qt3.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- qt3.spec	8 Oct 2008 13:06:14 -0000	1.8
+++ qt3.spec	22 Jan 2009 21:20:02 -0000	1.9
@@ -2,7 +2,7 @@
 
 Summary: The shared library for the Qt 3 GUI toolkit
 Version: 3.3.8b
-Release: 17%{?dist}
+Release: 18%{?dist}
 %if 0%{?fedora} > 8
 Name: qt3
 Obsoletes: qt < 1:%{version}-%{release}
@@ -641,6 +641,9 @@
 
 
 %changelog
+* Thu Jan 22 2009 Rex Dieter <rdieter at fedoraproject.org> 3.3.8b-18
+- respin (mysql)
+
 * Wed Oct 08 2008 Than Ngo <than at redhat.com> 3.3.8b-17
 - update qt-x11-immodule-unified-qt3 patch
 



From sdz at fedoraproject.org  Thu Jan 22 21:33:14 2009
From: sdz at fedoraproject.org (Sebastian Dziallas)
Date: Thu, 22 Jan 2009 21:33:14 +0000 (UTC)
Subject: rpms/avogadro/F-9 .cvsignore, 1.2, 1.3 avogadro.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <20090122213314.7A68C70033@cvs1.fedora.phx.redhat.com>

Author: sdz

Update of /cvs/pkgs/rpms/avogadro/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5984

Modified Files:
	.cvsignore avogadro.spec sources 
Log Message:
Update to 0.9.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/avogadro/F-9/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	16 Sep 2008 15:51:33 -0000	1.2
+++ .cvsignore	22 Jan 2009 21:32:44 -0000	1.3
@@ -1 +1 @@
-avogadro-0.8.1.tar.bz2
+avogadro-0.9.0.tar.bz2


Index: avogadro.spec
===================================================================
RCS file: /cvs/pkgs/rpms/avogadro/F-9/avogadro.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- avogadro.spec	16 Sep 2008 15:51:33 -0000	1.1
+++ avogadro.spec	22 Jan 2009 21:32:44 -0000	1.2
@@ -1,7 +1,7 @@
 Name:           avogadro
-Version:        0.8.1
-Release:        6%{?dist}
-Summary:        Avogadro is an advanced Molecular editor
+Version:        0.9.0
+Release:        1%{?dist}
+Summary:        An advanced molecular editor for chemical purposes
 
 Group:          Applications/Editors
 License:        GPLv2
@@ -10,20 +10,19 @@
 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:  cmake >= 2.6.0
+BuildRequires:  qt-devel >= 4.4.0
+BuildRequires:  eigen2-devel >= 2.0-0.9.beta6
 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,
+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
+and related areas, which offers flexible rendering and
 a powerful plugin architecture.
 
 
@@ -109,6 +108,9 @@
 
 
 %changelog
+* Thu Jan 22 2009 Sebastian Dziallas <sebastian at when.com> 0.9.0-1
+- update to new release
+
 * Sun Sep 14 2008 Sebastian Dziallas <sebastian at when.com> 0.8.1-6
 - add handbook to docs
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/avogadro/F-9/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	16 Sep 2008 15:51:33 -0000	1.2
+++ sources	22 Jan 2009 21:32:44 -0000	1.3
@@ -1 +1 @@
-a74d11a9a8240d018db8638e82dd915c  avogadro-0.8.1.tar.bz2
+ee4b33dc12c92429bee1ba45787d8b5b  avogadro-0.9.0.tar.bz2



From huff at fedoraproject.org  Thu Jan 22 21:41:05 2009
From: huff at fedoraproject.org (David Huff)
Date: Thu, 22 Jan 2009 21:41:05 +0000 (UTC)
Subject: rpms/appliance-tools/F-10 .cvsignore, 1.7, 1.8 appliance-tools.spec,
	1.12, 1.13 import.log, 1.8, 1.9 sources, 1.12, 1.13
Message-ID: <20090122214105.3E91370033@cvs1.fedora.phx.redhat.com>

Author: huff

Update of /cvs/pkgs/rpms/appliance-tools/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7369/F-10

Modified Files:
	.cvsignore appliance-tools.spec import.log sources 
Log Message:

* Thu Jan 22 2009 David Huff <dhuff at redhat.com> - 003.11
- back port patch adds self.modules to include additional modules in ramdisk
- requires livecd-tools 021




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/appliance-tools/F-10/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	16 Dec 2008 17:12:03 -0000	1.7
+++ .cvsignore	22 Jan 2009 21:40:34 -0000	1.8
@@ -1 +1 @@
-appliance-tools-003.10.tar.bz2
+appliance-tools-003.11.tar.bz2


Index: appliance-tools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/appliance-tools/F-10/appliance-tools.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- appliance-tools.spec	16 Dec 2008 17:12:03 -0000	1.12
+++ appliance-tools.spec	22 Jan 2009 21:40:34 -0000	1.13
@@ -4,7 +4,7 @@
 
 Summary: Tools for building Appliances
 Name: appliance-tools
-Version: 003.10
+Version: 003.11
 Release: 1%{?dist}
 License: GPLv2
 Group: System Environment/Base
@@ -15,7 +15,7 @@
 #  git archive --format=tar --prefix=appliance-tools-%{version} appliance-tools-%{version} | bzip2 > appliance-tools-%{version}.tar.bz2
 Source0: %{name}-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-Requires: livecd-tools >= 018 curl rsync kpartx
+Requires: livecd-tools >= 021 curl rsync kpartx
 Requires: zlib
 Requires: qemu-img
 BuildRequires: python
@@ -59,6 +59,10 @@
 %{python_sitelib}/ec2convert/*.pyc
 
 %changelog
+*Tue Jan 22 2009 David Huff <dhuff at redhat.com> - 003.11
+- back port patch adds self.modules to include additional modules in ramdisk
+- requires livecd-tools 021
+
 *Tue Dec 16 2008 David Huff <dhuff at redhat.com> - 003.10
 - Changed form ExclusiveArch to EcludeArch to fix broken deps
 - Allow the appliance-creator to use remote urls (bkearney)


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/appliance-tools/F-10/import.log,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- import.log	16 Dec 2008 17:12:03 -0000	1.8
+++ import.log	22 Jan 2009 21:40:34 -0000	1.9
@@ -6,3 +6,4 @@
 appliance-tools-003_8-1_fc10:F-10:appliance-tools-003.8-1.fc10.src.rpm:1226660476
 appliance-tools-003_9-1_fc10:F-10:appliance-tools-003.9-1.fc10.src.rpm:1226931983
 appliance-tools-003_10-1_fc10:F-10:appliance-tools-003.10-1.fc10.src.rpm:1229429431
+appliance-tools-003_11-1_fc10:F-10:appliance-tools-003.11-1.fc10.src.rpm:1232642421


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/appliance-tools/F-10/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	16 Dec 2008 17:12:03 -0000	1.12
+++ sources	22 Jan 2009 21:40:34 -0000	1.13
@@ -1 +1 @@
-506a5c9a500b2e5240764903ba3887fb  appliance-tools-003.10.tar.bz2
+311e293be8545e313c2760afb4a73580  appliance-tools-003.11.tar.bz2



From than at fedoraproject.org  Thu Jan 22 21:55:20 2009
From: than at fedoraproject.org (Than Ngo)
Date: Thu, 22 Jan 2009 21:55:20 +0000 (UTC)
Subject: rpms/kdebase-workspace/devel
	kdebase-workspace-4.2.0-show-systemsettings.patch, NONE,
	1.1 kdebase-workspace.spec, 1.169,
	1.170 kdebase-workspace-4.1.80-show-systemsettings.patch, 1.1, NONE
Message-ID: <20090122215520.538A070141@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdebase-workspace/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10543

Modified Files:
	kdebase-workspace.spec 
Added Files:
	kdebase-workspace-4.2.0-show-systemsettings.patch 
Removed Files:
	kdebase-workspace-4.1.80-show-systemsettings.patch 
Log Message:
fix


kdebase-workspace-4.2.0-show-systemsettings.patch:

--- NEW FILE kdebase-workspace-4.2.0-show-systemsettings.patch ---
diff -up kdebase-workspace-4.2.0/plasma/applets/kickoff/core/applicationmodel.cpp.show-systemsettings kdebase-workspace-4.2.0/plasma/applets/kickoff/core/applicationmodel.cpp
--- kdebase-workspace-4.2.0/plasma/applets/kickoff/core/applicationmodel.cpp.show-systemsettings	2009-01-17 12:00:26.000000000 +0100
+++ kdebase-workspace-4.2.0/plasma/applets/kickoff/core/applicationmodel.cpp	2009-01-22 22:51:03.000000000 +0100
@@ -105,7 +105,6 @@ public:
               systemApplicationPolicy(ApplicationModel::ShowSystemOnlyPolicy),
               primaryNamePolicy(ApplicationModel::GenericNamePrimary)
     {
-        systemApplications = Kickoff::systemApplicationList();
     }
 
     ~ApplicationModelPrivate()
diff -up kdebase-workspace-4.2.0/systemsettings/systemsettings.desktop.show-systemsettings kdebase-workspace-4.2.0/systemsettings/systemsettings.desktop
--- kdebase-workspace-4.2.0/systemsettings/systemsettings.desktop.show-systemsettings	2009-01-17 11:59:33.000000000 +0100
+++ kdebase-workspace-4.2.0/systemsettings/systemsettings.desktop	2009-01-22 22:47:10.000000000 +0100
@@ -151,3 +151,4 @@ Name[zh_TW]=????????????
 
 X-DBUS-StartupType=Unique
 Categories=Qt;KDE;System;
+OnlyShowIn=KDE;


Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebase-workspace/devel/kdebase-workspace.spec,v
retrieving revision 1.169
retrieving revision 1.170
diff -u -r1.169 -r1.170
--- kdebase-workspace.spec	22 Jan 2009 10:38:28 -0000	1.169
+++ kdebase-workspace.spec	22 Jan 2009 21:54:49 -0000	1.170
@@ -13,7 +13,7 @@
 
 Patch1: kdebase-workspace-4.1.82-redhat-startkde.patch
 Patch2: kdebase-workspace-4.1.72-plasma-konsole.patch
-Patch3: kdebase-workspace-4.1.80-show-systemsettings.patch
+Patch3: kdebase-workspace-4.2.0-show-systemsettings.patch
 Patch4: kdebase-workspace-4.0.72-ck-shutdown.patch
 #??434824: KDE4 System Settings - No Method To Enter Administrative Mode
 Patch5: kdebase-workspace-4.1.2-rootprivs.patch


--- kdebase-workspace-4.1.80-show-systemsettings.patch DELETED ---



From dcbw at fedoraproject.org  Thu Jan 22 22:08:18 2009
From: dcbw at fedoraproject.org (Daniel Williams)
Date: Thu, 22 Jan 2009 22:08:18 +0000 (UTC)
Subject: extras-buildsys/client client.py,1.39,1.40
Message-ID: <20090122220818.D8EFD70141@cvs1.fedora.phx.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys/client
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12627/client

Modified Files:
	client.py 
Log Message:
2008-01-22  Dan Williams <dcbw at redhat.com>

	* client/client.py
	  - Bump user cert buffer up to 20000 bytes




Index: client.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/client/client.py,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- client.py	26 Dec 2007 14:57:33 -0000	1.39
+++ client.py	22 Jan 2009 22:08:18 -0000	1.40
@@ -133,7 +133,7 @@
                 print "%s does not exist or is not readable." % certfile
                 sys.exit(1)
             f = open(certfile, "r")
-            buf = f.read(8192)
+            buf = f.read(20000)
             f.close()
             cert = OpenSSL.crypto.load_certificate(OpenSSL.crypto.FILETYPE_PEM, buf)
             cert_email = cert.get_subject().emailAddress



From dcbw at fedoraproject.org  Thu Jan 22 22:08:48 2009
From: dcbw at fedoraproject.org (Daniel Williams)
Date: Thu, 22 Jan 2009 22:08:48 +0000 (UTC)
Subject: extras-buildsys ChangeLog,1.232,1.233
Message-ID: <20090122220848.48C5170141@cvs1.fedora.phx.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12627

Modified Files:
	ChangeLog 
Log Message:
2008-01-22  Dan Williams <dcbw at redhat.com>

	* client/client.py
	  - Bump user cert buffer up to 20000 bytes




Index: ChangeLog
===================================================================
RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v
retrieving revision 1.232
retrieving revision 1.233
diff -u -r1.232 -r1.233
--- ChangeLog	9 Jan 2008 02:06:29 -0000	1.232
+++ ChangeLog	22 Jan 2009 22:08:17 -0000	1.233
@@ -1,3 +1,8 @@
+2008-01-22  Dan Williams <dcbw at redhat.com>
+
+	* client/client.py
+	  - Bump user cert buffer up to 20000 bytes
+
 2008-01-07  Michael Schwendt <mschwendt at users.sf.net>
 
 	* server/Builder.py



From snirkel at fedoraproject.org  Thu Jan 22 23:09:43 2009
From: snirkel at fedoraproject.org (Linus Walleij)
Date: Thu, 22 Jan 2009 23:09:43 +0000 (UTC)
Subject: rpms/gnomad2/devel .cvsignore, 1.16, 1.17 gnomad2.spec, 1.29,
	1.30 sources, 1.16, 1.17
Message-ID: <20090122230943.7BB0970033@cvs1.fedora.phx.redhat.com>

Author: snirkel

Update of /cvs/extras/rpms/gnomad2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22037

Modified Files:
	.cvsignore gnomad2.spec sources 
Log Message:
New upstream bug fix release.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnomad2/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore	19 Jan 2009 22:03:39 -0000	1.16
+++ .cvsignore	22 Jan 2009 23:09:12 -0000	1.17
@@ -1 +1 @@
-gnomad2-2.9.3.tar.gz
+gnomad2-2.9.4.tar.gz


Index: gnomad2.spec
===================================================================
RCS file: /cvs/extras/rpms/gnomad2/devel/gnomad2.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- gnomad2.spec	19 Jan 2009 22:03:39 -0000	1.29
+++ gnomad2.spec	22 Jan 2009 23:09:12 -0000	1.30
@@ -1,7 +1,7 @@
 # SPEC file for gnomad2, main target is Fedora.
 
 Name:		gnomad2
-Version:    	2.9.3
+Version:    	2.9.4
 Release:	1%{?dist}
 
 Summary:	A GNOME 2.0 client for the Creative Jukeboxes and Dell DJs
@@ -63,6 +63,8 @@
 %doc AUTHORS NEWS README COPYING ChangeLog
 
 %changelog
+* Fri Jan 23 2009 Linus Walleij <triad at df.lth.se> 2.9.4-1
+- New upstream, fix Fedora bug 480366
 * Mon Jan 19 2009 Linus Walleij <triad at df.lth.se> 2.9.3-1
 - New upstream, compiles with libmtp < 0.3.0 also (for F-9)
 * Thu Aug 7 2008 Linus Walleij <triad at df.lth.se> 2.9.2-1


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnomad2/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources	19 Jan 2009 22:03:39 -0000	1.16
+++ sources	22 Jan 2009 23:09:12 -0000	1.17
@@ -1 +1 @@
-4007d2e52806a54e775f066b48ad4378  gnomad2-2.9.3.tar.gz
+e47382c8cbb87b0e6630b847c464c3b2  gnomad2-2.9.4.tar.gz



From snirkel at fedoraproject.org  Thu Jan 22 23:11:15 2009
From: snirkel at fedoraproject.org (Linus Walleij)
Date: Thu, 22 Jan 2009 23:11:15 +0000 (UTC)
Subject: rpms/gnomad2/F-10 .cvsignore, 1.16, 1.17 gnomad2.spec, 1.29,
	1.30 sources, 1.16, 1.17
Message-ID: <20090122231115.B5C2870033@cvs1.fedora.phx.redhat.com>

Author: snirkel

Update of /cvs/extras/rpms/gnomad2/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22411

Modified Files:
	.cvsignore gnomad2.spec sources 
Log Message:
New upstream bug fix release.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnomad2/F-10/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore	19 Jan 2009 22:08:07 -0000	1.16
+++ .cvsignore	22 Jan 2009 23:10:45 -0000	1.17
@@ -1 +1 @@
-gnomad2-2.9.3.tar.gz
+gnomad2-2.9.4.tar.gz


Index: gnomad2.spec
===================================================================
RCS file: /cvs/extras/rpms/gnomad2/F-10/gnomad2.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- gnomad2.spec	19 Jan 2009 22:08:07 -0000	1.29
+++ gnomad2.spec	22 Jan 2009 23:10:45 -0000	1.30
@@ -1,7 +1,7 @@
 # SPEC file for gnomad2, main target is Fedora.
 
 Name:		gnomad2
-Version:    	2.9.3
+Version:    	2.9.4
 Release:	1%{?dist}
 
 Summary:	A GNOME 2.0 client for the Creative Jukeboxes and Dell DJs
@@ -63,6 +63,8 @@
 %doc AUTHORS NEWS README COPYING ChangeLog
 
 %changelog
+* Fri Jan 23 2009 Linus Walleij <triad at df.lth.se> 2.9.4-1
+- New upstream, fix Fedora bug 480366
 * Mon Jan 19 2009 Linus Walleij <triad at df.lth.se> 2.9.3-1
 - New upstream, compiles with libmtp < 0.3.0 also (for F-9)
 * Thu Aug 7 2008 Linus Walleij <triad at df.lth.se> 2.9.2-1


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnomad2/F-10/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources	19 Jan 2009 22:08:07 -0000	1.16
+++ sources	22 Jan 2009 23:10:45 -0000	1.17
@@ -1 +1 @@
-4007d2e52806a54e775f066b48ad4378  gnomad2-2.9.3.tar.gz
+e47382c8cbb87b0e6630b847c464c3b2  gnomad2-2.9.4.tar.gz



From snirkel at fedoraproject.org  Thu Jan 22 23:13:10 2009
From: snirkel at fedoraproject.org (Linus Walleij)
Date: Thu, 22 Jan 2009 23:13:10 +0000 (UTC)
Subject: rpms/gnomad2/F-9 .cvsignore, 1.15, 1.16 gnomad2.spec, 1.28,
	1.29 sources, 1.15, 1.16
Message-ID: <20090122231310.CF5E370033@cvs1.fedora.phx.redhat.com>

Author: snirkel

Update of /cvs/extras/rpms/gnomad2/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22832

Modified Files:
	.cvsignore gnomad2.spec sources 
Log Message:
New upstream bug fix release.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnomad2/F-9/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	19 Jan 2009 21:56:03 -0000	1.15
+++ .cvsignore	22 Jan 2009 23:12:40 -0000	1.16
@@ -1 +1 @@
-gnomad2-2.9.3.tar.gz
+gnomad2-2.9.4.tar.gz


Index: gnomad2.spec
===================================================================
RCS file: /cvs/extras/rpms/gnomad2/F-9/gnomad2.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- gnomad2.spec	19 Jan 2009 21:56:03 -0000	1.28
+++ gnomad2.spec	22 Jan 2009 23:12:40 -0000	1.29
@@ -1,7 +1,7 @@
 # SPEC file for gnomad2, main target is Fedora.
 
 Name:		gnomad2
-Version:    	2.9.3
+Version:    	2.9.4
 Release:	1%{?dist}
 
 Summary:	A GNOME 2.0 client for the Creative Jukeboxes and Dell DJs
@@ -63,6 +63,8 @@
 %doc AUTHORS NEWS README COPYING ChangeLog
 
 %changelog
+* Fri Jan 23 2009 Linus Walleij <triad at df.lth.se> 2.9.4-1
+- New upstream, fix Fedora bug 480366
 * Mon Jan 19 2009 Linus Walleij <triad at df.lth.se> 2.9.3-1
 - New upstream, compiles with libmtp < 0.3.0 also (for F-9)
 * Thu Aug 7 2008 Linus Walleij <triad at df.lth.se> 2.9.2-1


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnomad2/F-9/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	19 Jan 2009 21:56:03 -0000	1.15
+++ sources	22 Jan 2009 23:12:40 -0000	1.16
@@ -1 +1 @@
-4007d2e52806a54e775f066b48ad4378  gnomad2-2.9.3.tar.gz
+e47382c8cbb87b0e6630b847c464c3b2  gnomad2-2.9.4.tar.gz



From emaldonado at fedoraproject.org  Thu Jan 22 23:19:08 2009
From: emaldonado at fedoraproject.org (Elio Maldonado)
Date: Thu, 22 Jan 2009 23:19:08 +0000 (UTC)
Subject: rpms/crypto-utils/devel certwatch.c,1.18,1.19
Message-ID: <20090122231908.0D7AD70033@cvs1.fedora.phx.redhat.com>

Author: emaldonado

Update of /cvs/extras/rpms/crypto-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23712

Modified Files:
	certwatch.c 
Log Message:
Prevent unwanted truncation in diff_time_days that caused a one day error in time until exipry calculations (#473860)


Index: certwatch.c
===================================================================
RCS file: /cvs/extras/rpms/crypto-utils/devel/certwatch.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- certwatch.c	21 Jan 2009 23:26:17 -0000	1.18
+++ certwatch.c	22 Jan 2009 23:18:37 -0000	1.19
@@ -152,7 +152,7 @@
 /* Computes the day difference among two PRTime's */
 static int diff_time_days(PRTime aT, PRTime bT)
 {
-    PRInt64 secs = (aT - bT) / PR_USEC_PER_SEC;
+    PRInt64 secs = (aT/PR_USEC_PER_SEC - bT/PR_USEC_PER_SEC);
     return secs / 86400L;
 }
 



From emaldonado at fedoraproject.org  Thu Jan 22 23:38:12 2009
From: emaldonado at fedoraproject.org (Elio Maldonado)
Date: Thu, 22 Jan 2009 23:38:12 +0000 (UTC)
Subject: rpms/crypto-utils/devel crypto-utils.spec,1.51,1.52
Message-ID: <20090122233812.D69CA70033@cvs1.fedora.phx.redhat.com>

Author: emaldonado

Update of /cvs/extras/rpms/crypto-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27095

Modified Files:
	crypto-utils.spec 
Log Message:
Expiry warnings fix (#473860)


Index: crypto-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/crypto-utils/devel/crypto-utils.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- crypto-utils.spec	21 Jan 2009 23:29:47 -0000	1.51
+++ crypto-utils.spec	22 Jan 2009 23:37:42 -0000	1.52
@@ -4,7 +4,7 @@
 Summary: SSL certificate and key management utilities
 Name: crypto-utils
 Version: 2.4.1
-Release: 7
+Release: 8
 Source: crypto-rand-%{crver}.tar.gz
 Source1: genkey.pl
 Source2: certwatch.c
@@ -131,6 +131,9 @@
 %{perl_vendorarch}/auto/Crypt
 
 %changelog
+* Wed Jan 21 2009 Elio Maldonado <emaldona at redhat.com> - 2.4.1-8
+- certwatch: Fixed cert expiry time warnings off by one error (#473860)
+
 * Wed Jan 21 2009 Elio Maldonado <emaldona at redhat.com> - 2.4.1-7
 - certwatch: Fixed cert expiry time warnings (#473860)
 



From ixs at fedoraproject.org  Fri Jan 23 00:17:56 2009
From: ixs at fedoraproject.org (Andreas Thienemann)
Date: Fri, 23 Jan 2009 00:17:56 +0000 (UTC)
Subject: rpms/munin/devel munin.spec,1.21,1.22
Message-ID: <20090123001756.156A270141@cvs1.fedora.phx.redhat.com>

Author: ixs

Update of /cvs/pkgs/rpms/munin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv450

Modified Files:
	munin.spec 
Log Message:
Added /bin/mail dependency for munin-limits


Index: munin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/munin/devel/munin.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- munin.spec	17 Jan 2009 23:45:38 -0000	1.21
+++ munin.spec	23 Jan 2009 00:17:25 -0000	1.22
@@ -23,6 +23,7 @@
 Requires: perl-Net-Server perl-Net-SNMP
 Requires: rrdtool
 Requires: logrotate
+Requires: /bin/mail
 Requires(pre): shadow-utils
 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 Requires: dejavu-sans-mono-fonts



From nbecker at fedoraproject.org  Fri Jan 23 00:34:15 2009
From: nbecker at fedoraproject.org (Neal Becker)
Date: Fri, 23 Jan 2009 00:34:15 +0000 (UTC)
Subject: rpms/igraph/F-9 igraph.spec,1.19,1.20 .cvsignore,1.4,1.5
Message-ID: <20090123003415.3A1CF700FE@cvs1.fedora.phx.redhat.com>

Author: nbecker

Update of /cvs/pkgs/rpms/igraph/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3092

Modified Files:
	igraph.spec .cvsignore 
Log Message:
Update to 0.5.1



Index: igraph.spec
===================================================================
RCS file: /cvs/pkgs/rpms/igraph/F-9/igraph.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- igraph.spec	16 Nov 2008 16:57:45 -0000	1.19
+++ igraph.spec	23 Jan 2009 00:33:44 -0000	1.20
@@ -1,6 +1,6 @@
 Name:		igraph
 Version:	0.5.1
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	Library for creating and manipulating graphs
 
 Group:		System Environment/Libraries
@@ -92,6 +92,9 @@
 make check
 
 %changelog
+* Mon Dec 22 2008 Neal Becker <ndbecker2 at gmail.com> - 0.5.1-4
+- Bump tag
+
 * Sun Nov 16 2008 Neal Becker <ndbecker2 at gmail.com> - 0.5.1-2
 - Remove igraph-cstdlib.patch
 - Remove igraph-test.patch


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/igraph/F-9/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	16 Feb 2008 03:32:44 -0000	1.4
+++ .cvsignore	23 Jan 2009 00:33:44 -0000	1.5
@@ -1 +1 @@
-igraph-0.5.tar.gz
+igraph-0.5.1.tar.gz



From steve at fedoraproject.org  Fri Jan 23 00:55:04 2009
From: steve at fedoraproject.org (Steven Pritchard)
Date: Fri, 23 Jan 2009 00:55:04 +0000 (UTC)
Subject: rpms/perl-Spreadsheet-ParseExcel/devel .cvsignore, 1.8,
	1.9 perl-Spreadsheet-ParseExcel.spec, 1.15, 1.16 sources, 1.8, 1.9
Message-ID: <20090123005504.07690700FE@cvs1.fedora.phx.redhat.com>

Author: steve

Update of /cvs/pkgs/rpms/perl-Spreadsheet-ParseExcel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5587

Modified Files:
	.cvsignore perl-Spreadsheet-ParseExcel.spec sources 
Log Message:
Update to 0.47.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Spreadsheet-ParseExcel/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	17 Jan 2009 19:47:45 -0000	1.8
+++ .cvsignore	23 Jan 2009 00:54:33 -0000	1.9
@@ -1 +1 @@
-Spreadsheet-ParseExcel-0.45.tar.gz
+Spreadsheet-ParseExcel-0.47.tar.gz


Index: perl-Spreadsheet-ParseExcel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Spreadsheet-ParseExcel/devel/perl-Spreadsheet-ParseExcel.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- perl-Spreadsheet-ParseExcel.spec	17 Jan 2009 19:47:45 -0000	1.15
+++ perl-Spreadsheet-ParseExcel.spec	23 Jan 2009 00:54:33 -0000	1.16
@@ -2,10 +2,10 @@
 %define debug_package %{nil}
 
 # Avoid Epoch inflation
-%define module_version 0.45
+%define module_version 0.47
 
 Name:           perl-Spreadsheet-ParseExcel
-Version:        0.4500
+Version:        0.4700
 Release:        1%{?dist}
 Summary:        Extract information from an Excel file
 License:        GPL+ or Artistic
@@ -14,14 +14,14 @@
 Source0:        http://www.cpan.org/authors/id/J/JM/JMCNAMARA/Spreadsheet-ParseExcel-%{module_version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  perl(IO::Scalar)
+BuildRequires:  perl(Jcode)
 BuildRequires:  perl(Module::Build)
 BuildRequires:  perl(OLE::Storage_Lite) >= 0.08
 BuildRequires:  perl(Proc::ProcessTable)
-BuildRequires:  perl(Unicode::Map)
-BuildRequires:  perl(Jcode)
 BuildRequires:  perl(Spreadsheet::WriteExcel)
 BuildRequires:  perl(Test::More) >= 0.47
 BuildRequires:  perl(Test::Pod) >= 1.00
+BuildRequires:  perl(Unicode::Map)
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
@@ -64,6 +64,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Thu Jan 22 2009 Steven Pritchard <steve at kspei.com> 0.4700-1
+- Update to 0.47.
+
 * Sat Jan 17 2009 Steven Pritchard <steve at kspei.com> 0.4500-1
 - Update to 0.45.
 - s/Get/Extract/ in Summary.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Spreadsheet-ParseExcel/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	17 Jan 2009 19:47:45 -0000	1.8
+++ sources	23 Jan 2009 00:54:33 -0000	1.9
@@ -1 +1 @@
-a1340a5190c307f026c66e216d4145b4  Spreadsheet-ParseExcel-0.45.tar.gz
+42ff0ca57bc6d554e3f4df2ee85ce2f0  Spreadsheet-ParseExcel-0.47.tar.gz



From steve at fedoraproject.org  Fri Jan 23 01:21:33 2009
From: steve at fedoraproject.org (Steven Pritchard)
Date: Fri, 23 Jan 2009 01:21:33 +0000 (UTC)
Subject: rpms/perl-Test-Prereq/devel .cvsignore, 1.6,
	1.7 perl-Test-Prereq.spec, 1.7, 1.8 sources, 1.6, 1.7
Message-ID: <20090123012133.36C23700FE@cvs1.fedora.phx.redhat.com>

Author: steve

Update of /cvs/pkgs/rpms/perl-Test-Prereq/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10202

Modified Files:
	.cvsignore perl-Test-Prereq.spec sources 
Log Message:
Update to 1.036.
Add some dependencies when building with --with-check.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-Prereq/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	10 Dec 2008 17:47:33 -0000	1.6
+++ .cvsignore	23 Jan 2009 01:21:02 -0000	1.7
@@ -1 +1 @@
-Test-Prereq-1.034.tar.gz
+Test-Prereq-1.036.tar.gz


Index: perl-Test-Prereq.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-Prereq/devel/perl-Test-Prereq.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- perl-Test-Prereq.spec	10 Dec 2008 17:47:33 -0000	1.7
+++ perl-Test-Prereq.spec	23 Jan 2009 01:21:02 -0000	1.8
@@ -1,5 +1,5 @@
 Name:           perl-Test-Prereq
-Version:        1.034
+Version:        1.036
 Release:        1%{?dist}
 Summary:        Check if Makefile.PL has the right pre-requisites
 License:        GPL+ or Artistic
@@ -11,6 +11,12 @@
 BuildRequires:  perl(Module::Build)
 BuildRequires:  perl(Module::CoreList)
 BuildRequires:  perl(Module::Info)
+%{?_with_check:BuildRequires:  perl(CPAN)}
+%{?_with_check:BuildRequires:  perl(Test::Builder)}
+%{?_with_check:BuildRequires:  perl(Test::Builder::Tester)}
+%{?_with_check:BuildRequires:  perl(Test::More)}
+%{?_with_check:BuildRequires:  perl(Test::Pod)}
+%{?_with_check:BuildRequires:  perl(Test::Pod::Coverage)}
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
@@ -50,6 +56,10 @@
 %{_mandir}/man3/*
 
 %changelog
+* Thu Jan 22 2009 Steven Pritchard <steve at kspei.com> 1.036-1
+- Update to 1.036.
+- Add some dependencies when building with --with-check.
+
 * Wed Dec 10 2008 Steven Pritchard <steve at kspei.com> 1.034-1
 - Update to 1.034.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-Prereq/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	10 Dec 2008 17:47:33 -0000	1.6
+++ sources	23 Jan 2009 01:21:02 -0000	1.7
@@ -1 +1 @@
-014d355c9bf22b732149c92bac5ea34e  Test-Prereq-1.034.tar.gz
+1c5caafa0f80e2b99ec52c4957941029  Test-Prereq-1.036.tar.gz



From tgl at fedoraproject.org  Fri Jan 23 01:56:39 2009
From: tgl at fedoraproject.org (Tom Lane)
Date: Fri, 23 Jan 2009 01:56:39 +0000 (UTC)
Subject: rpms/MySQL-python/devel MySQL-python.spec,1.35,1.36
Message-ID: <20090123015639.15219700FE@cvs1.fedora.phx.redhat.com>

Author: tgl

Update of /cvs/pkgs/rpms/MySQL-python/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15170

Modified Files:
	MySQL-python.spec 
Log Message:
Rebuild for mysql 5.1


Index: MySQL-python.spec
===================================================================
RCS file: /cvs/pkgs/rpms/MySQL-python/devel/MySQL-python.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- MySQL-python.spec	29 Nov 2008 16:55:42 -0000	1.35
+++ MySQL-python.spec	23 Jan 2009 01:56:08 -0000	1.36
@@ -1,7 +1,7 @@
 Summary: An interface to MySQL
 Name: MySQL-python
 Version: 1.2.2
-Release: 8%{?dist}
+Release: 9%{?dist}
 License: GPLv2+
 Group: Development/Libraries
 URL: http://sourceforge.net/projects/mysql-python/
@@ -67,6 +67,9 @@
 %dir /usr/%{_lib}/python?.?/site-packages/MySQLdb/constants
 
 %changelog
+* Thu Jan 22 2009 Tom Lane <tgl at redhat.com> 1.2.2-9
+- Rebuild for mysql 5.1
+
 * Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 1.2.2-8
 - Rebuild for Python 2.6
 



From tgl at fedoraproject.org  Fri Jan 23 02:08:49 2009
From: tgl at fedoraproject.org (Tom Lane)
Date: Fri, 23 Jan 2009 02:08:49 +0000 (UTC)
Subject: rpms/libdbi-drivers/devel libdbi-drivers.spec,1.15,1.16
Message-ID: <20090123020849.51225700FE@cvs1.fedora.phx.redhat.com>

Author: tgl

Update of /cvs/pkgs/rpms/libdbi-drivers/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17211

Modified Files:
	libdbi-drivers.spec 
Log Message:
Rebuild for mysql 5.1


Index: libdbi-drivers.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libdbi-drivers/devel/libdbi-drivers.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- libdbi-drivers.spec	2 Sep 2008 00:19:07 -0000	1.15
+++ libdbi-drivers.spec	23 Jan 2009 02:08:18 -0000	1.16
@@ -1,7 +1,7 @@
 Summary: Database-specific drivers for libdbi
 Name: libdbi-drivers
 Version: 0.8.3
-Release: 2%{?dist}
+Release: 3%{?dist}
 Group: Development/Libraries
 License: LGPLv2+
 URL: http://libdbi-drivers.sourceforge.net/
@@ -122,6 +122,9 @@
 %{_libdir}/dbd/libdbdsqlite3.*
 
 %changelog
+* Thu Jan 22 2009 Tom Lane <tgl at redhat.com> 0.8.3-3
+- Rebuild for mysql 5.1
+
 * 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



From tgl at fedoraproject.org  Fri Jan 23 02:17:28 2009
From: tgl at fedoraproject.org (Tom Lane)
Date: Fri, 23 Jan 2009 02:17:28 +0000 (UTC)
Subject: rpms/mysql-connector-odbc/devel mysql-connector-odbc.spec, 1.15,
	1.16
Message-ID: <20090123021728.4B93A700FE@cvs1.fedora.phx.redhat.com>

Author: tgl

Update of /cvs/pkgs/rpms/mysql-connector-odbc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18261

Modified Files:
	mysql-connector-odbc.spec 
Log Message:
Adjust changelog date for actual build date.


Index: mysql-connector-odbc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mysql-connector-odbc/devel/mysql-connector-odbc.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- mysql-connector-odbc.spec	14 Jan 2009 21:10:34 -0000	1.15
+++ mysql-connector-odbc.spec	23 Jan 2009 02:16:57 -0000	1.16
@@ -80,7 +80,7 @@
 %{_libdir}/lib*so
 
 %changelog
-* Wed Jan 14 2009 Tom Lane <tgl at redhat.com> 5.1.5r1144-1
+* Thu Jan 22 2009 Tom Lane <tgl at redhat.com> 5.1.5r1144-1
 - Update to mysql-connector-odbc 5.1.5r1144, to go with MySQL 5.1.x.
   Note the library name has changed from libmyodbc3 to libmyodbc5.
 



From petersen at fedoraproject.org  Fri Jan 23 02:25:54 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Fri, 23 Jan 2009 02:25:54 +0000 (UTC)
Subject: rpms/haddock/F-10 .cvsignore, 1.5, 1.6 haddock.spec, 1.13,
	1.14 sources, 1.5, 1.6 haddock-2.0.0.0-ghc683-process.patch, 1.1, NONE
Message-ID: <20090123022554.20089700FE@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/haddock/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19403

Modified Files:
	.cvsignore haddock.spec sources 
Removed Files:
	haddock-2.0.0.0-ghc683-process.patch 
Log Message:
backport haddock-2.4.1 from rawhide



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/haddock/F-10/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	7 Jan 2008 19:02:07 -0000	1.5
+++ .cvsignore	23 Jan 2009 02:25:23 -0000	1.6
@@ -1 +1 @@
-haddock-2.0.0.0.tar.gz
+haddock-2.4.1.tar.gz


Index: haddock.spec
===================================================================
RCS file: /cvs/extras/rpms/haddock/F-10/haddock.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- haddock.spec	26 Jun 2008 05:12:44 -0000	1.13
+++ haddock.spec	23 Jan 2009 02:25:23 -0000	1.14
@@ -1,21 +1,29 @@
-%define ghc_version 6.8.3
+%define ghc_version 6.10.1
+
+%define pkg_libdir %{_libdir}/ghc-%{ghc_version}/%{name}-%{version}
+%define pkg_docdir %{_docdir}/ghc/libraries/%{name}-%{version}
+# ghc does not emit debug information
+%define debug_package %{nil}
 
 Name:           haddock
-Version:        2.0.0.0
-Release:        3%{?dist}
-Summary:        Haddock documentation tool for annotated Haskell source code
+Version:        2.4.1
+Release:        2%{?dist}
+Summary:        Haskell Documentation tool
 
 Group:          Development/Tools
 License:        BSD
 URL:            http://www.haskell.org/haddock/
-Source0:        http://www.haskell.org/haddock/dist/%{name}-%{version}.tar.gz
+Source0:        http://hackage.haskell.org/packages/archive/%{name}/%{version}/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-ExcludeArch:	alpha ppc64
-
+# ghc has only been bootstrapped on the following archs:
+ExclusiveArch:	i386 x86_64 ppc
 BuildRequires:  ghc = %{ghc_version}
-BuildRequires:  coreutils libxslt docbook-style-xsl autoconf
-Patch1:		haddock-2.0.0.0-ghc683-process.patch
+Buildrequires:  ghc-paths-devel
+# for profiling
+BuildRequires:  ghc-prof = %{ghc_version}
+BuildRequires:  ghc-paths-prof
+# for doc/
+BuildRequires:  libxslt, docbook-style-xsl, autoconf
 
 %description
 Haddock is a tool for automatically generating hyperlinked documentation from
@@ -29,6 +37,7 @@
 %package -n ghc-%{name}
 Summary:  Libraries for working with Haddock from Haskell code
 Group:    Development/Libraries
+Provides:  ghc-%{name}-devel = %{version}-%{release}
 Requires:  ghc = %{ghc_version}
 Obsoletes: ghc682-haddock < 2.0.0.0-3
 
@@ -36,21 +45,26 @@
 Libraries for working with Haddock from Haskell code.
 
 
-# don't generate an empty debuginfo subpackage
-%define debug_package %{nil}
-%define __spec_install_post /usr/lib/rpm/brp-compress
+%package -n ghc-%{name}-prof
+Summary: Profiling libraries for %{name}
+Group: Development/Libraries
+Requires: ghc-%{name} = %{version}-%{release}
+Requires: ghc-prof = %{ghc_version}
+
+%description -n ghc-%{name}-prof
+This package contains profiling libraries for %{name}.
 
 
 %prep
 %setup -q
-%patch1 -p1 -b .1-ghc682~
 
 
 %build
-runhaskell Setup.lhs configure --prefix=%{_prefix} --libdir=%{_libdir} \
-  --datadir=%{_datadir} --docdir=%{_docdir} --htmldir=%{_docdir} \
-  --libsubdir='$compiler/$pkgid'
-runhaskell Setup.lhs build
+%cabal_configure --ghc -p
+%cabal build
+%cabal haddock
+%ghc_gen_scripts
+
 cd doc
 test -f configure || autoreconf
 ./configure
@@ -59,31 +73,68 @@
 
 %install
 rm -rf ${RPM_BUILD_ROOT}
-runhaskell Setup.lhs copy --destdir=${RPM_BUILD_ROOT}
-rm ${RPM_BUILD_ROOT}/%{_docdir}/LICENSE
+%cabal_install
+%ghc_install_scripts
+%ghc_gen_filelists ghc-%{name}
+
+# version since haddock is also in ghc now
+mv ${RPM_BUILD_ROOT}/%{_bindir}/haddock{,-%{version}}
+
 
 %clean
 rm -rf ${RPM_BUILD_ROOT}
 
 
 %post
-/usr/bin/chcon -t unconfined_execmem_exec_t %{_libexecdir}/haddock.bin >/dev/null 2>&1 || :
-
-
-%files -n ghc-%{name}
-%defattr(-,root,root)
-%{_libdir}/ghc-%{ghc_version}/%{name}-%{version}
+semanage fcontext -a -t unconfined_execmem_exec_t %{_bindir}/%{name} >/dev/null 2>&1
+restorecon %{_bindir}/%{name}
 
+%post -n ghc-%{name}
+%ghc_register_pkg
+%ghc_reindex_haddock
+
+%preun -n ghc-%{name}
+if [ "$1" -eq 0 ] ; then
+  %ghc_unregister_pkg
+fi
+
+%postun -n ghc-%{name}
+if [ "$1" -eq 0 ] ; then
+  %ghc_reindex_haddock
+fi
 
 %files
-%defattr(-,root,root)
-%doc CHANGES LICENSE README TODO
+%defattr(-,root,root,-)
+%doc CHANGES LICENSE README
 %doc doc/haddock/*
-%{_bindir}/haddock
+%{_bindir}/haddock-%{version}
 %{_datadir}/haddock-%{version}
 
 
+%files -n ghc-%{name} -f ghc-%{name}.files
+%defattr(-,root,root,-)
+%{pkg_docdir}
+
+
+%files -n ghc-%{name}-prof -f ghc-%{name}-prof.files
+%defattr(-,root,root,-)
+
+
 %changelog
+* Tue Dec 23 2008 Jens Petersen <petersen at redhat.com> - 2.4.1-2
+- buildrequire ghc-paths
+- no longer need haddock-2.4.1-no-ghc-paths.patch
+
+* Mon Dec 15 2008 Jens Petersen <petersen at redhat.com> - 2.4.1-1
+- update to 2.4.1 release needed for gtk2hs
+- update source url
+- drop coreutils and autoconf from buildrequires
+- add haddock-2.4.1-no-ghc-paths.patch to workaround no ghc-paths package yet
+- provide devel package
+- use rpm macros to build and package
+- version haddock program since it is also in ghc
+- buildrequire autoconf
+
 * Thu Jun 26 2008 Jens Petersen <petersen at redhat.com> - 2.0.0.0-3.fc10
 - drop ghcver subpackage in line with ghc
 - obsolete ghc682-haddock


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/haddock/F-10/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	7 Jan 2008 19:02:07 -0000	1.5
+++ sources	23 Jan 2009 02:25:23 -0000	1.6
@@ -1 +1 @@
-ccd8b4a6f6b4fb084bdad02fbb215ca4  haddock-2.0.0.0.tar.gz
+f474065cd6996b633bbc180b32b04013  haddock-2.4.1.tar.gz


--- haddock-2.0.0.0-ghc683-process.patch DELETED ---



From rdieter at fedoraproject.org  Fri Jan 23 02:50:37 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 23 Jan 2009 02:50:37 +0000 (UTC)
Subject: rpms/perl-DBD-MySQL/devel perl-DBD-MySQL.spec,1.41,1.42
Message-ID: <20090123025037.B5897700FE@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/perl-DBD-MySQL/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23596

Modified Files:
	perl-DBD-MySQL.spec 
Log Message:
* Thu Jan 22 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.005-9
- respin (mysql)



Index: perl-DBD-MySQL.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-DBD-MySQL/devel/perl-DBD-MySQL.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- perl-DBD-MySQL.spec	2 Mar 2008 15:53:12 -0000	1.41
+++ perl-DBD-MySQL.spec	23 Jan 2009 02:50:07 -0000	1.42
@@ -1,6 +1,6 @@
 Name:           perl-DBD-MySQL
 Version:        4.005
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        A MySQL interface for perl
 
 Group:          Development/Libraries
@@ -64,6 +64,9 @@
 
 
 %changelog
+* Thu Jan 22 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.005-9
+- respin (mysql)
+
 * Wed Feb 27 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 4.005-8
 - Rebuild for perl 5.10 (again)
 



From ausil at fedoraproject.org  Fri Jan 23 03:07:22 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Fri, 23 Jan 2009 03:07:22 +0000 (UTC)
Subject: rpms/kernel/F-9 linux-2.6-niagara-DAX.patch, NONE,
	1.1.2.1 linux-2.6-sparc-cs4231-ebus-dma.patch, NONE,
	1.1.2.1 kernel.spec, 1.891.2.8, 1.891.2.9
Message-ID: <20090123030722.462AC700FE@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/kernel/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26833

Modified Files:
      Tag: private-fedora-9-2_6_27-branch
	kernel.spec 
Added Files:
      Tag: private-fedora-9-2_6_27-branch
	linux-2.6-niagara-DAX.patch 
	linux-2.6-sparc-cs4231-ebus-dma.patch 
Log Message:
add sparc fixes


linux-2.6-niagara-DAX.patch:

--- NEW FILE linux-2.6-niagara-DAX.patch ---
>From davem at davemloft.net Tue Jan 20 00:52:28 2009
Return-Path: <sparclinux-owner at vger.kernel.org>
X-Original-To: dennis at ausil.us
Delivered-To: dennis at ausil.us
Received: from localhost (unknown [127.0.0.1])
	by mail.ausil.us (Postfix) with ESMTP id 41F1011F4040
	for <dennis at ausil.us>; Tue, 20 Jan 2009 06:52:30 +0000 (UTC)
X-Virus-Scanned: amavisd-new at example.com
Received: from mail.ausil.us ([127.0.0.1])
	by localhost (anubis.ausil.us [127.0.0.1]) (amavisd-new, port 10024)
	with ESMTP id xdn3mJNfgjR9 for <dennis at ausil.us>;
	Tue, 20 Jan 2009 00:52:28 -0600 (CST)
X-Greylist: from auto-whitelisted by SQLgrey-1.7.5
Received: from vger.kernel.org (vger.kernel.org [209.132.176.167])
	by mail.ausil.us (Postfix) with ESMTP id 6F19A11F403F
	for <dennis at ausil.us>; Tue, 20 Jan 2009 00:52:28 -0600 (CST)
Received: (majordomo at vger.kernel.org) by vger.kernel.org via listexpand
	id S1751657AbZATGw1 (ORCPT <rfc822;dennis at ausil.us>);
	Tue, 20 Jan 2009 01:52:27 -0500
Received: (majordomo at vger.kernel.org) by vger.kernel.org id S1752926AbZATGw1
	(ORCPT <rfc822;sparclinux-outgoing>);
	Tue, 20 Jan 2009 01:52:27 -0500
Received: from 74-93-104-97-Washington.hfc.comcastbusiness.net ([74.93.104.97]:47414
	"EHLO sunset.davemloft.net" rhost-flags-OK-FAIL-OK-OK)
	by vger.kernel.org with ESMTP id S1751657AbZATGw0 (ORCPT
	<rfc822;sparclinux at vger.kernel.org>);
	Tue, 20 Jan 2009 01:52:26 -0500
Received: from localhost (localhost [127.0.0.1])
	by sunset.davemloft.net (Postfix) with ESMTP id 7CDA0C8C23B;
	Mon, 19 Jan 2009 22:52:28 -0800 (PST)
Date:	Mon, 19 Jan 2009 22:52:28 -0800 (PST)
Message-Id: <20090119.225228.194299431.davem at davemloft.net>
To: dgilmore at redhat.com
Cc: sparclinux at vger.kernel.org
Subject: Re: opps building sparc64 packages
From:	David Miller <davem at davemloft.net>
In-Reply-To: <20090119.223517.190558209.davem at davemloft.net>
References: <200901021435.23972.dgilmore at redhat.com>
	<20090119.223517.190558209.davem at davemloft.net>
X-Mailer: Mew version 6.1 on Emacs 22.1 / Mule 5.0 (SAKAKI)
Mime-Version: 1.0
Content-Type: Text/Plain;
  charset=us-ascii
Content-Transfer-Encoding: 7bit
Sender:	sparclinux-owner at vger.kernel.org
Precedence: bulk
List-ID: <sparclinux.vger.kernel.org>
X-Mailing-List:	sparclinux at vger.kernel.org
X-UID: 4589
X-Length: 4519
Status: R
X-Status: N
X-KMail-EncryptionState:  
X-KMail-SignatureState:  
X-KMail-MDN-Sent:  

From: David Miller <davem at davemloft.net>
Date: Mon, 19 Jan 2009 22:35:17 -0800 (PST)

> The code in sun4v_data_access_exception() needs some logic to properly
> handle the case of the kernel doing a userspace access.  Currently it
> does an OOPS unconditionally when triggered from kernel space, which
> is wrong.
> 
> I'll fix this up and post a patch.

Dennis, here is a 2.6.27 based patch that should fix this bug.

sparc64: Fix DAX handling via userspace access from kernel.

If we do a userspace access from kernel mode, and get a
data access exception, we need to check the exception
table just like a normal fault does.

The spitfire DAX handler was doing this, but such logic
was missing from the sun4v DAX code.

Reported-by: Dennis Gilmore <dgilmore at redhat.com>
Signed-off-by: David S. Miller <davem at davemloft.net>

diff --git a/arch/sparc64/kernel/traps.c b/arch/sparc64/kernel/traps.c
index c824df1..eb19724 100644
--- a/arch/sparc64/kernel/traps.c
+++ b/arch/sparc64/kernel/traps.c
@@ -1,6 +1,6 @@
 /* arch/sparc64/kernel/traps.c
  *
- * Copyright (C) 1995,1997,2008 David S. Miller (davem at davemloft.net)
+ * Copyright (C) 1995,1997,2008,2009 David S. Miller (davem at davemloft.net)
  * Copyright (C) 1997,1999,2000 Jakub Jelinek (jakub at redhat.com)
  */
 
@@ -262,6 +262,21 @@ void sun4v_data_access_exception(struct pt_regs *regs, unsigned long addr, unsig
 		return;
 
 	if (regs->tstate & TSTATE_PRIV) {
+		/* Test if this comes from uaccess places. */
+		const struct exception_table_entry *entry;
+
+		entry = search_exception_tables(regs->tpc);
+		if (entry) {
+			/* Ouch, somebody is trying VM hole tricks on us... */
+#ifdef DEBUG_EXCEPTIONS
+			printk("Exception: PC<%016lx> faddr<UNKNOWN>\n", regs->tpc);
+			printk("EX_TABLE: insn<%016lx> fixup<%016lx>\n",
+			       regs->tpc, entry->fixup);
+#endif
+			regs->tpc = entry->fixup;
+			regs->tnpc = regs->tpc + 4;
+			return;
+		}
 		printk("sun4v_data_access_exception: ADDR[%016lx] "
 		       "CTX[%04x] TYPE[%04x], going.\n",
 		       addr, ctx, type);
--
To unsubscribe from this list: send the line "unsubscribe sparclinux" in
the body of a message to majordomo at vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

linux-2.6-sparc-cs4231-ebus-dma.patch:

--- NEW FILE linux-2.6-sparc-cs4231-ebus-dma.patch ---
--- linux-2.6.27.noarch/sound/sparc/cs4231.c.BAD	2009-01-22 20:54:11.665600509 -0600
+++ linux-2.6.27.noarch/sound/sparc/cs4231.c	2009-01-22 20:54:27.130350403 -0600
@@ -36,6 +36,7 @@
 #define EBUS_SUPPORT
 #include <linux/pci.h>
 #include <asm/ebus.h>
+#include <asm/ebus_dma.h>
 #endif
 
 static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;	/* Index 0-MAX */


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/kernel.spec,v
retrieving revision 1.891.2.8
retrieving revision 1.891.2.9
diff -u -r1.891.2.8 -r1.891.2.9
--- kernel.spec	19 Jan 2009 22:37:12 -0000	1.891.2.8
+++ kernel.spec	23 Jan 2009 03:06:51 -0000	1.891.2.9
@@ -664,6 +664,9 @@
 Patch590: linux-2.6-selinux-recognise-addrlabel.patch
 # fix for ebus_dma.h
 Patch600: sparc-2.6.git-aae7fb87ec4d2df6cb551670b1765cf4e5795a3b.patch
+Patch601: linux-2.6-sparc-cs4231-ebus-dma.patch
+# sparc64: Fix DAX handling via userspace access from kernel.
+Patch610: linux-2.6-niagara-DAX.patch
 
 # libata
 Patch670: linux-2.6-ata-quirk.patch
@@ -1134,6 +1137,8 @@
 # SPARC64
 #
 ApplyPatch sparc-2.6.git-aae7fb87ec4d2df6cb551670b1765cf4e5795a3b.patch
+ApplyPatch linux-2.6-niagara-DAX.patch
+ApplyPatch linux-2.6-sparc-cs4231-ebus-dma.patch
 
 #
 # Exec shield
@@ -1910,6 +1915,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
+* Thu Jan 22 2009 Dennis Gilmore <dennis at ausil.us 2.6.27.12-78.2.9
+- fix DAX handling on niagara
+- cs4231 ebus dma fixes
+
 * Mon Jan 19 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.27.12-78.2.8
 - Fix CVE-2009-0065: SCTP buffer overflow
 



From corsepiu at fedoraproject.org  Fri Jan 23 03:41:51 2009
From: corsepiu at fedoraproject.org (=?utf-8?q?Ralf_Cors=C3=A9pius?=)
Date: Fri, 23 Jan 2009 03:41:51 +0000 (UTC)
Subject: rpms/rt3/F-9 .cvsignore, 1.9, 1.10 rt3.spec, 1.26, 1.27 sources, 1.9,
	1.10
Message-ID: <20090123034151.1E80A70141@cvs1.fedora.phx.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/rt3/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32381

Modified Files:
	.cvsignore rt3.spec sources 
Log Message:
* Fri Jan 23 2009 Ralf Cors??pius <corsepiu at fedoraproject.org> - 3.6.7-1
- Upgrade (BZ 481165 - CVE-2008-3502).
- Add --with-testdeps.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rt3/F-9/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	3 Feb 2008 17:25:12 -0000	1.9
+++ .cvsignore	23 Jan 2009 03:41:20 -0000	1.10
@@ -1 +1 @@
-rt-3.6.6.tar.gz
+rt-3.6.7.tar.gz


Index: rt3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rt3/F-9/rt3.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- rt3.spec	30 Nov 2008 06:49:08 -0000	1.26
+++ rt3.spec	23 Jan 2009 03:41:20 -0000	1.27
@@ -1,9 +1,19 @@
 #
-# Copyright (c) 2005, 2006, 2007, 2008 Ralf Corsepius, Ulm, Germany.
+# Copyright (c) 2005, 2006, 2007, 2008, 2009 Ralf Corsepius, Ulm, Germany.
 # This file and all modifications and additions to the pristine
 # package are under the same license as the package itself.
 #
 
+# --with testdeps
+#	run dependency rt3's testdeps while building
+#	Default: --with (hard-coded implict default in rt >= 3.8.0)
+%bcond_without testdeps
+
+# --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 +22,8 @@
 %define RT3_LOCALSTATEDIR	%{_localstatedir}/lib/rt3
 
 Name:		rt3
-Version:	3.6.6
-Release:	6%{?dist}
+Version:	3.6.7
+Release:	1%{?dist}
 Summary:	Request tracker 3
 
 Group:		Applications/Internet
@@ -34,6 +44,64 @@
 # For Debian compatibility
 Provides:	request-tracker3 = %{version}-%{release}
 
+%if 0%{?with_testdeps} 
+BuildRequires: perl(Apache::Session) >= 1.53
+BuildRequires: perl(Cache::Simple::TimedExpiry)
+BuildRequires: perl(Calendar::Simple)
+BuildRequires: perl(CGI::Cookie) >= 1.20
+BuildRequires: perl(Class::ReturnValue) >= 0.40
+BuildRequires: perl(CPAN)
+BuildRequires: perl(CSS::Squish) >= 0.06
+BuildRequires: perl(Date::Format)
+BuildRequires: perl(DBD::mysql) >= 2.1018
+BuildRequires: perl(DBI) >= 1.37
+BuildRequires: perl(DBIx::SearchBuilder) >= 1.53
+BuildRequires: perl(Devel::StackTrace) >= 1.20
+BuildRequires: perl(Digest::base)
+BuildRequires: perl(Digest::MD5) >= 2.27
+BuildRequires: perl(Errno)
+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(Getopt::Long) >= 2.24
+BuildRequires: perl(HTML::Entities)
+BuildRequires: perl(HTML::FormatText)
+BuildRequires: perl(HTML::Mason) >= 1.23
+BuildRequires: perl(HTML::Scrubber) >= 0.08
+BuildRequires: perl(HTML::TreeBuilder)
+BuildRequires: perl(HTTP::Request::Common)
+BuildRequires: perl(Locale::Maketext) >= 1.06
+BuildRequires: perl(Locale::Maketext::Fuzzy)
+BuildRequires: perl(Locale::Maketext::Lexicon) >= 0.32
+BuildRequires: perl(Log::Dispatch) >= 2.0
+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(Net::SMTP)
+BuildRequires: perl(Pod::Usage)
+BuildRequires: perl(Regexp::Common)
+BuildRequires: perl(Scalar::Util)
+BuildRequires: perl(Storable) >= 2.08
+BuildRequires: perl(Term::ReadKey)
+BuildRequires: perl(Term::ReadLine)
+BuildRequires: perl(Text::Autoformat)
+BuildRequires: perl(Text::ParseWords)
+BuildRequires: perl(Text::Quoted) >= 2.02
+BuildRequires: perl(Text::Template)
+BuildRequires: perl(Text::WikiFormat) >= 0.76
+BuildRequires: perl(Text::Wrapper)
+BuildRequires: perl(Time::HiRes)
+BuildRequires: perl(Time::ParseDate)
+BuildRequires: perl(Tree::Simple) >= 1.04
+BuildRequires: perl(UNIVERSAL::require)
+BuildRequires: perl(XML::RSS) >= 1.05
+%endif
+
 BuildRequires:	/usr/bin/pod2man
 BuildRequires:	/usr/sbin/apachectl
 
@@ -220,10 +288,11 @@
   -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}
+%{?with_tests:make test}
 
 %clean
 rm -rf ${RPM_BUILD_ROOT}
@@ -275,6 +344,10 @@
 %{_mandir}/man1/rt-mailgate*
 
 %changelog
+* Fri Jan 23 2009 Ralf Cors??pius <corsepiu at fedoraproject.org> - 3.6.7-1
+- Upgrade (BZ 481165 - CVE-2008-3502).
+- Add --with-testdeps.
+
 * Sun Nov 30 2008 Ralf Cors??pius <corsepiu at fedoraproject.org> - 3.6.6-6
 - Add %%defattr() to rt3-mailgate.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rt3/F-9/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	3 Feb 2008 17:25:12 -0000	1.9
+++ sources	23 Jan 2009 03:41:20 -0000	1.10
@@ -1 +1 @@
-b626c906e7b33c8d1879c15ed744f7e3  rt-3.6.6.tar.gz
+46c0b29cd14010ee6a3f181743aeb6ef  rt-3.6.7.tar.gz



From jcollie at fedoraproject.org  Fri Jan 23 05:28:36 2009
From: jcollie at fedoraproject.org (Jeffrey C. Ollie)
Date: Fri, 23 Jan 2009 05:28:36 +0000 (UTC)
Subject: rpms/libedit/devel libedit.spec,1.12,1.13
Message-ID: <20090123052836.6D605700FE@cvs1.fedora.phx.redhat.com>

Author: jcollie

Update of /cvs/pkgs/rpms/libedit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16604

Modified Files:
	libedit.spec 
Log Message:
* Thu Jan 22 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 2.11-2.20080712cvs
- Add ncurses-devel requires to -devel subpackage (BZ#481252)



Index: libedit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libedit/devel/libedit.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- libedit.spec	27 Jul 2008 18:54:30 -0000	1.12
+++ libedit.spec	23 Jan 2009 05:28:05 -0000	1.13
@@ -3,7 +3,7 @@
 Summary:	The NetBSD Editline library
 Name:		libedit
 Version:	2.11
-Release:	1.%{snap}cvs%{?dist}
+Release:	2.%{snap}cvs%{?dist}
 License:	BSD
 Group:		System Environment/Libraries
 URL:		http://www.thrysoee.dk/editline/
@@ -25,6 +25,7 @@
 
 Requires:	%{name} = %{version}-%{release}
 Requires:	pkgconfig
+Requires:	ncurses-devel
 
 %description devel
 This package contains development files for %{name}.
@@ -75,6 +76,9 @@
 %{_includedir}/editline/readline.h
 
 %changelog
+* Thu Jan 22 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 2.11-2.20080712cvs
+- Add ncurses-devel requires to -devel subpackage (BZ#481252)
+
 * Sun Jul 28 2008 Debarshi Ray <rishi at fedoraproject.org> - 2.11-1.20080712cvs
 - Version bump to 20080712-2.11.
 



From jcollie at fedoraproject.org  Fri Jan 23 05:30:54 2009
From: jcollie at fedoraproject.org (Jeffrey C. Ollie)
Date: Fri, 23 Jan 2009 05:30:54 +0000 (UTC)
Subject: rpms/libedit/F-10 libedit.spec,1.12,1.13
Message-ID: <20090123053054.CBD29700FE@cvs1.fedora.phx.redhat.com>

Author: jcollie

Update of /cvs/pkgs/rpms/libedit/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17069

Modified Files:
	libedit.spec 
Log Message:
* Thu Jan 22 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 2.11-2.20080712cvs
- Add ncurses-devel requires to -devel subpackage (BZ#481252)



Index: libedit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libedit/F-10/libedit.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- libedit.spec	27 Jul 2008 18:54:30 -0000	1.12
+++ libedit.spec	23 Jan 2009 05:30:24 -0000	1.13
@@ -3,7 +3,7 @@
 Summary:	The NetBSD Editline library
 Name:		libedit
 Version:	2.11
-Release:	1.%{snap}cvs%{?dist}
+Release:	2.%{snap}cvs%{?dist}
 License:	BSD
 Group:		System Environment/Libraries
 URL:		http://www.thrysoee.dk/editline/
@@ -25,6 +25,7 @@
 
 Requires:	%{name} = %{version}-%{release}
 Requires:	pkgconfig
+Requires:	ncurses-devel
 
 %description devel
 This package contains development files for %{name}.
@@ -75,6 +76,9 @@
 %{_includedir}/editline/readline.h
 
 %changelog
+* Thu Jan 22 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 2.11-2.20080712cvs
+- Add ncurses-devel requires to -devel subpackage (BZ#481252)
+
 * Sun Jul 28 2008 Debarshi Ray <rishi at fedoraproject.org> - 2.11-1.20080712cvs
 - Version bump to 20080712-2.11.
 



From kengert at fedoraproject.org  Fri Jan 23 05:32:42 2009
From: kengert at fedoraproject.org (Kai Engert)
Date: Fri, 23 Jan 2009 05:32:42 +0000 (UTC)
Subject: rpms/nss/F-9 .cvsignore, 1.22, 1.23 nss-enable-pem.patch, 1.1,
	1.2 nss.spec, 1.51, 1.52 sources, 1.23, 1.24
Message-ID: <20090123053242.F158F700FE@cvs1.fedora.phx.redhat.com>

Author: kengert

Update of /cvs/extras/rpms/nss/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17445

Modified Files:
	.cvsignore nss-enable-pem.patch nss.spec sources 
Log Message:
* Fri Jan 23 2009 Kai Engert <kengert at redhat.com> - 3.12.2.0-2
- Update to NSS_3_12_2_WITH_CKBI_1_73_RTM



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/nss/F-9/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- .cvsignore	19 Nov 2008 19:35:54 -0000	1.22
+++ .cvsignore	23 Jan 2009 05:32:12 -0000	1.23
@@ -1,2 +1,2 @@
 nss-pem-20080124.tar.bz2
-nss-3.12.2.0-stripped.tar.bz2
+nss-3.12.2.0-ckbi-1.73-stripped.tar.bz2

nss-enable-pem.patch:

Index: nss-enable-pem.patch
===================================================================
RCS file: /cvs/extras/rpms/nss/F-9/nss-enable-pem.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nss-enable-pem.patch	5 Sep 2007 20:00:42 -0000	1.1
+++ nss-enable-pem.patch	23 Jan 2009 05:32:12 -0000	1.2
@@ -1,11 +1,7 @@
-Index: mozilla/security/nss/lib/ckfw/manifest.mn
-===================================================================
-RCS file: /cvsroot/mozilla/security/nss/lib/ckfw/manifest.mn,v
-retrieving revision 1.9
-diff -u -r1.9 manifest.mn
---- mozilla/security/nss/lib/ckfw/manifest.mn   16 Dec 2005 00:48:01 -0000      1.9
-+++ mozilla/security/nss/lib/ckfw/manifest.mn   31 Aug 2007 17:58:23 -0000
-@@ -38,7 +38,7 @@
+diff -up ./mozilla/security/nss/lib/ckfw/manifest.mn.libpem ./mozilla/security/nss/lib/ckfw/manifest.mn
+--- ./mozilla/security/nss/lib/ckfw/manifest.mn.libpem	2007-08-15 17:29:52.000000000 +0200
++++ ./mozilla/security/nss/lib/ckfw/manifest.mn	2009-01-23 05:49:59.000000000 +0100
+@@ -38,7 +38,7 @@ MANIFEST_CVS_ID = "@(#) $RCSfile: manife
  
  CORE_DEPTH = ../../..
  
@@ -13,4 +9,4 @@
 +DIRS = builtins pem
  
  PRIVATE_EXPORTS = \
-        ck.h              \
+ 	ck.h		  \


Index: nss.spec
===================================================================
RCS file: /cvs/extras/rpms/nss/F-9/nss.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- nss.spec	19 Nov 2008 19:35:54 -0000	1.51
+++ nss.spec	23 Jan 2009 05:32:12 -0000	1.52
@@ -1,11 +1,11 @@
 %define nspr_version 4.7
 %define unsupported_tools_directory %{_libdir}/nss/unsupported-tools
-%define ckbi_version 1.72
+%define ckbi_version 1.73
 
 Summary:          Network Security Services
 Name:             nss
 Version:          3.12.2.0
-Release:          1.1%{?dist}
+Release:          2%{?dist}
 License:          MPLv1.1 or GPLv2+ or LGPLv2+
 URL:              http://www.mozilla.org/projects/security/pki/nss/
 Group:            System Environment/Libraries
@@ -20,8 +20,8 @@
 BuildRequires:    perl
 BuildRequires:    zlib-devel
 
-Source0:          %{name}-%{version}-stripped.tar.bz2
-#Source0:          %{name}-%{version}-ckbi-%{ckbi_version}-stripped.tar.bz2
+#Source0:          %{name}-%{version}-stripped.tar.bz2
+Source0:          %{name}-%{version}-ckbi-%{ckbi_version}-stripped.tar.bz2
 
 Source1:          nss.pc.in
 Source2:          nss-config.in
@@ -446,6 +446,8 @@
 
 
 %changelog
+* Fri Jan 23 2009 Kai Engert <kengert at redhat.com> - 3.12.2.0-2
+- Update to NSS_3_12_2_WITH_CKBI_1_73_RTM
 * Wed Nov 19 2008 Kai Engert <kengert at redhat.com> - 3.12.2.0-1.1
 - Update to NSS_3_12_2_RC1
 - Use system zlib


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nss/F-9/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sources	19 Nov 2008 19:35:54 -0000	1.23
+++ sources	23 Jan 2009 05:32:12 -0000	1.24
@@ -1,2 +1,2 @@
 084675e4f793ed82e1ba78f76745ada8  nss-pem-20080124.tar.bz2
-44f67ccacc95eb7cd712aadcf37ec36c  nss-3.12.2.0-stripped.tar.bz2
+19accf388ecde62343ce5e564d1f4d0b  nss-3.12.2.0-ckbi-1.73-stripped.tar.bz2



From kengert at fedoraproject.org  Fri Jan 23 05:39:52 2009
From: kengert at fedoraproject.org (Kai Engert)
Date: Fri, 23 Jan 2009 05:39:52 +0000 (UTC)
Subject: rpms/nss/F-10 .cvsignore, 1.21, 1.22 nss.spec, 1.56, 1.57 sources, 
	1.22, 1.23
Message-ID: <20090123053952.9B301700FE@cvs1.fedora.phx.redhat.com>

Author: kengert

Update of /cvs/extras/rpms/nss/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19150

Modified Files:
	.cvsignore nss.spec sources 
Log Message:
* Fri Jan 23 2009 Kai Engert <kengert at redhat.com> - 3.12.2.0-4
- Update to NSS_3_12_2_WITH_CKBI_1_73_RTM




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/nss/F-10/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- .cvsignore	22 Oct 2008 03:25:42 -0000	1.21
+++ .cvsignore	23 Jan 2009 05:39:22 -0000	1.22
@@ -1,2 +1,2 @@
 nss-pem-20080124.tar.bz2
-nss-3.12.2.0-stripped.tar.bz2
+nss-3.12.2.0-ckbi-1.73-stripped.tar.bz2


Index: nss.spec
===================================================================
RCS file: /cvs/extras/rpms/nss/F-10/nss.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- nss.spec	22 Oct 2008 03:56:43 -0000	1.56
+++ nss.spec	23 Jan 2009 05:39:22 -0000	1.57
@@ -1,10 +1,11 @@
 %define nspr_version 4.7
 %define unsupported_tools_directory %{_libdir}/nss/unsupported-tools
+%define ckbi_version 1.73
 
 Summary:          Network Security Services
 Name:             nss
 Version:          3.12.2.0
-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
@@ -19,7 +20,8 @@
 BuildRequires:    psmisc
 BuildRequires:    perl
 
-Source0:          %{name}-%{version}-stripped.tar.bz2
+#Source0:          %{name}-%{version}-stripped.tar.bz2
+Source0:          %{name}-%{version}-ckbi-%{ckbi_version}-stripped.tar.bz2
 
 Source1:          nss.pc.in
 Source2:          nss-config.in
@@ -444,6 +446,8 @@
 
 
 %changelog
+* Fri Jan 23 2009 Kai Engert <kengert at redhat.com> - 3.12.2.0-4
+- Update to NSS_3_12_2_WITH_CKBI_1_73_RTM
 * Wed Oct 22 2008 Kai Engert <kaie at redhat.com> - 3.12.2.0-3
 - update to NSS_3_12_2_RC1
 - use system zlib


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nss/F-10/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- sources	22 Oct 2008 03:25:42 -0000	1.22
+++ sources	23 Jan 2009 05:39:22 -0000	1.23
@@ -1,2 +1,2 @@
 084675e4f793ed82e1ba78f76745ada8  nss-pem-20080124.tar.bz2
-44f67ccacc95eb7cd712aadcf37ec36c  nss-3.12.2.0-stripped.tar.bz2
+19accf388ecde62343ce5e564d1f4d0b  nss-3.12.2.0-ckbi-1.73-stripped.tar.bz2



From jcollie at fedoraproject.org  Fri Jan 23 05:46:18 2009
From: jcollie at fedoraproject.org (Jeffrey C. Ollie)
Date: Fri, 23 Jan 2009 05:46:18 +0000 (UTC)
Subject: rpms/libedit/F-9 libedit.spec,1.12,1.13
Message-ID: <20090123054618.85974700FE@cvs1.fedora.phx.redhat.com>

Author: jcollie

Update of /cvs/pkgs/rpms/libedit/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20207

Modified Files:
	libedit.spec 
Log Message:
* Thu Jan 22 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 2.11-2.20080712cvs
- Add ncurses-devel requires to -devel subpackage (BZ#481252)



Index: libedit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libedit/F-9/libedit.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- libedit.spec	27 Jul 2008 18:52:17 -0000	1.12
+++ libedit.spec	23 Jan 2009 05:45:47 -0000	1.13
@@ -3,7 +3,7 @@
 Summary:	The NetBSD Editline library
 Name:		libedit
 Version:	2.11
-Release:	1.%{snap}cvs%{?dist}
+Release:	2.%{snap}cvs%{?dist}
 License:	BSD
 Group:		System Environment/Libraries
 URL:		http://www.thrysoee.dk/editline/
@@ -25,6 +25,7 @@
 
 Requires:	%{name} = %{version}-%{release}
 Requires:	pkgconfig
+Requires:	ncurses-devel
 
 %description devel
 This package contains development files for %{name}.
@@ -75,6 +76,9 @@
 %{_includedir}/editline/readline.h
 
 %changelog
+* Thu Jan 22 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 2.11-2.20080712cvs
+- Add ncurses-devel requires to -devel subpackage (BZ#481252)
+
 * Sun Jul 28 2008 Debarshi Ray <rishi at fedoraproject.org> - 2.11-1.20080712cvs
 - Version bump to 20080712-2.11.
 



From jcollie at fedoraproject.org  Fri Jan 23 05:52:06 2009
From: jcollie at fedoraproject.org (Jeffrey C. Ollie)
Date: Fri, 23 Jan 2009 05:52:06 +0000 (UTC)
Subject: rpms/libedit/EL-5 libedit.spec,1.5,1.6
Message-ID: <20090123055207.19DB0700FE@cvs1.fedora.phx.redhat.com>

Author: jcollie

Update of /cvs/pkgs/rpms/libedit/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21077

Modified Files:
	libedit.spec 
Log Message:
* Thu Jan 22 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 2.11-2.20080712cvs
- Add ncurses-devel requires to -devel subpackage (BZ#481252)



Index: libedit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libedit/EL-5/libedit.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- libedit.spec	27 Jul 2008 19:58:41 -0000	1.5
+++ libedit.spec	23 Jan 2009 05:51:34 -0000	1.6
@@ -3,7 +3,7 @@
 Summary:	The NetBSD Editline library
 Name:		libedit
 Version:	2.11
-Release:	1.%{snap}cvs%{?dist}
+Release:	2.%{snap}cvs%{?dist}
 License:	BSD
 Group:		System Environment/Libraries
 URL:		http://www.thrysoee.dk/editline/
@@ -25,6 +25,7 @@
 
 Requires:	%{name} = %{version}-%{release}
 Requires:	pkgconfig
+Requires:	ncurses-devel
 
 %description devel
 This package contains development files for %{name}.
@@ -75,6 +76,9 @@
 %{_includedir}/editline/readline.h
 
 %changelog
+* Thu Jan 22 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 2.11-2.20080712cvs
+- Add ncurses-devel requires to -devel subpackage (BZ#481252)
+
 * Sun Jul 28 2008 Debarshi Ray <rishi at fedoraproject.org> - 2.11-1.20080712cvs
 - Version bump to 20080712-2.11.
 



From pkgdb at fedoraproject.org  Fri Jan 23 07:18:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 23 Jan 2009 07:18:34 +0000
Subject: [pkgdb] qemu: markmc has requested approveacls
Message-ID: <20090123071834.F3732208480@bastion.fedora.phx.redhat.com>

markmc has requested 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  Fri Jan 23 07:18:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 23 Jan 2009 07:18:37 +0000
Subject: [pkgdb] qemu: markmc has requested approveacls
Message-ID: <20090123071837.96FEF208482@bastion.fedora.phx.redhat.com>

markmc has requested 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  Fri Jan 23 07:18:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 23 Jan 2009 07:18:42 +0000
Subject: [pkgdb] qemu: markmc has requested approveacls
Message-ID: <20090123071842.AEBBD208485@bastion.fedora.phx.redhat.com>

markmc has requested 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  Fri Jan 23 07:18:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 23 Jan 2009 07:18:49 +0000
Subject: [pkgdb] qemu: markmc has requested approveacls
Message-ID: <20090123071849.6FE06208486@bastion.fedora.phx.redhat.com>

markmc has requested 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  Fri Jan 23 07:18:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 23 Jan 2009 07:18:54 +0000
Subject: [pkgdb] qemu: markmc has requested approveacls
Message-ID: <20090123071854.590D920848B@bastion.fedora.phx.redhat.com>

markmc has requested 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  Fri Jan 23 07:18:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 23 Jan 2009 07:18:59 +0000
Subject: [pkgdb] qemu: markmc has requested approveacls
Message-ID: <20090123071859.95320208481@bastion.fedora.phx.redhat.com>

markmc has requested 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  Fri Jan 23 07:19:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 23 Jan 2009 07:19:04 +0000
Subject: [pkgdb] qemu: markmc has requested approveacls
Message-ID: <20090123071904.73D6920848E@bastion.fedora.phx.redhat.com>

markmc has requested 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  Fri Jan 23 07:19:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 23 Jan 2009 07:19:12 +0000
Subject: [pkgdb] qemu: markmc has requested approveacls
Message-ID: <20090123071912.3C8DB208485@bastion.fedora.phx.redhat.com>

markmc has requested 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  Fri Jan 23 07:19:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 23 Jan 2009 07:19:16 +0000
Subject: [pkgdb] qemu: markmc has requested approveacls
Message-ID: <20090123071916.9D35B208490@bastion.fedora.phx.redhat.com>

markmc has requested 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  Fri Jan 23 07:19:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 23 Jan 2009 07:19:21 +0000
Subject: [pkgdb] qemu: markmc has requested approveacls
Message-ID: <20090123071921.9995E208489@bastion.fedora.phx.redhat.com>

markmc has requested 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  Fri Jan 23 07:19:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 23 Jan 2009 07:19:26 +0000
Subject: [pkgdb] qemu: markmc has requested approveacls
Message-ID: <20090123071926.59B9A208493@bastion.fedora.phx.redhat.com>

markmc has requested the approveacls acl on qemu (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qemu



From petersen at fedoraproject.org  Fri Jan 23 07:24:54 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Fri, 23 Jan 2009 07:24:54 +0000 (UTC)
Subject: rpms/ghc/devel ghc.spec,1.69,1.70
Message-ID: <20090123072454.310D4700FE@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/ghc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3307

Modified Files:
	ghc.spec 
Log Message:
fix to libedit means can drop BR ncurses-devel workaround (#481252)



Index: ghc.spec
===================================================================
RCS file: /cvs/extras/rpms/ghc/devel/ghc.spec,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- ghc.spec	19 Jan 2009 10:58:49 -0000	1.69
+++ ghc.spec	23 Jan 2009 07:24:23 -0000	1.70
@@ -16,7 +16,7 @@
 
 Name:		ghc
 Version:	6.10.1
-Release:	7%{?dist}
+Release:	8%{?dist}
 Summary:	Glasgow Haskell Compilation system
 # See https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=239713
 ExcludeArch:	alpha ppc64
@@ -34,8 +34,6 @@
 Provides:       haddock = 2.3.0
 BuildRequires:  ghc, happy, sed
 BuildRequires:  gmp-devel, libedit-devel
-# editline package requires ncurses to configure
-BuildRequires:  ncurses-devel
 %if %{build_doc}
 BuildRequires: libxslt, docbook-style-xsl
 %endif
@@ -219,6 +217,9 @@
 %endif
 
 %changelog
+* Fri Jan 23 2009 Jens Petersen <petersen at redhat.com> - 6.10.1-8
+- fix to libedit means can drop ncurses-devel BR workaround (#481252)
+
 * Mon Jan 19 2009 Jens Petersen <petersen at redhat.com> - 6.10.1-7
 - buildrequire ncurses-devel to fix build of missing editline package needed
   for ghci line-editing (#478466)
@@ -252,7 +253,7 @@
 - Fix a minor packaging glitch
 
 * Tue Nov 04 2008 Bryan O'Sullivan <bos at serpentine.com> - 6.10.1-1
-- Update to 6.10.1 in observance of President Obama
+- Update to 6.10.1
 
 * Thu Oct 23 2008 Jens Petersen <petersen at redhat.com> - 6.10.0.20081007-9
 - remove redundant --haddockdir from cabal_configure



From dchen at fedoraproject.org  Fri Jan 23 07:35:36 2009
From: dchen at fedoraproject.org (Ding-Yi Chen)
Date: Fri, 23 Jan 2009 07:35:36 +0000 (UTC)
Subject: rpms/libchewing/devel import.log,1.6,1.7 libchewing.spec,1.26,1.27
Message-ID: <20090123073537.01375700FE@cvs1.fedora.phx.redhat.com>

Author: dchen

Update of /cvs/pkgs/rpms/libchewing/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5072/devel

Modified Files:
	import.log libchewing.spec 
Log Message:
touch python-<ver>/site-packages/libchewing/__init__.py


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/libchewing/devel/import.log,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- import.log	14 Jan 2009 06:28:21 -0000	1.6
+++ import.log	23 Jan 2009 07:35:06 -0000	1.7
@@ -4,3 +4,4 @@
 libchewing-0_3_2-1_fc10:HEAD:libchewing-0.3.2-1.fc10.src.rpm:1229994594
 libchewing-0_3_2-2_fc10:HEAD:libchewing-0.3.2-2.fc10.src.rpm:1230010807
 libchewing-0_3_2-3_fc10:HEAD:libchewing-0.3.2-3.fc10.src.rpm:1231914268
+libchewing-0_3_2-4_fc10:HEAD:libchewing-0.3.2-4.fc10.src.rpm:1232696067


Index: libchewing.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libchewing/devel/libchewing.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- libchewing.spec	14 Jan 2009 06:28:21 -0000	1.26
+++ libchewing.spec	23 Jan 2009 07:35:06 -0000	1.27
@@ -1,7 +1,7 @@
 
 Name:           libchewing
 Version:        0.3.2
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Intelligent phonetic input method library for Traditional Chinese
 
 Group:          System Environment/Libraries
@@ -62,9 +62,10 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 make DESTDIR=%{buildroot} install
+rm $RPM_BUILD_ROOT%{_libdir}/libchewing.la
 mkdir -p $RPM_BUILD_ROOT%{libchewing_python_dir}
 cp python/chewing.py $RPM_BUILD_ROOT%{libchewing_python_dir}
-rm $RPM_BUILD_ROOT%{_libdir}/libchewing.la
+touch $RPM_BUILD_ROOT%{libchewing_python_dir}/__init__.py
 
 %post -p /sbin/ldconfig
 
@@ -90,6 +91,10 @@
 %{_libdir}/*.so
 
 %changelog
+* Fri Jan 23 2009 Ding-Yi Chen <dchen at redhat dot com> - 0.3.2-4
+- touch python-<ver>/site-packages/libchewing/__init__.py,
+  So python thinks libchewing is a library.
+
 * Thu Jan 14 2009 Ding-Yi Chen <dchen at redhat dot com> - 0.3.2-3
 - Add python binding by copy python/chewing.py to 
   <python_dir>/site_packages/libchewing



From pkgdb at fedoraproject.org  Fri Jan 23 07:36:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 23 Jan 2009 07:36:53 +0000
Subject: [pkgdb] qemu had acl change status
Message-ID: <20090123073653.81CBD20847E@bastion.fedora.phx.redhat.com>

dwmw2 has set the approveacls acl on qemu (Fedora devel) to Approved for markmc

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qemu



From pkgdb at fedoraproject.org  Fri Jan 23 07:36:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 23 Jan 2009 07:36:59 +0000
Subject: [pkgdb] qemu had acl change status
Message-ID: <20090123073659.A3A0F208482@bastion.fedora.phx.redhat.com>

dwmw2 has set the approveacls acl on qemu (Fedora 7) to Approved for markmc

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qemu



From pkgdb at fedoraproject.org  Fri Jan 23 07:37:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 23 Jan 2009 07:37:04 +0000
Subject: [pkgdb] qemu had acl change status
Message-ID: <20090123073705.02BB4208470@bastion.fedora.phx.redhat.com>

dwmw2 has set the approveacls acl on qemu (Fedora 4) to Approved for markmc

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qemu



From pkgdb at fedoraproject.org  Fri Jan 23 07:37:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 23 Jan 2009 07:37:01 +0000
Subject: [pkgdb] qemu had acl change status
Message-ID: <20090123073701.732A9208485@bastion.fedora.phx.redhat.com>

dwmw2 has set the approveacls acl on qemu (Fedora 3) to Approved for markmc

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qemu



From pkgdb at fedoraproject.org  Fri Jan 23 07:37:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 23 Jan 2009 07:37:07 +0000
Subject: [pkgdb] qemu had acl change status
Message-ID: <20090123073707.8007320848B@bastion.fedora.phx.redhat.com>

dwmw2 has set the approveacls acl on qemu (Fedora 5) to Approved for markmc

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qemu



From pkgdb at fedoraproject.org  Fri Jan 23 07:37:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 23 Jan 2009 07:37:10 +0000
Subject: [pkgdb] qemu had acl change status
Message-ID: <20090123073710.5D1B4208490@bastion.fedora.phx.redhat.com>

dwmw2 has set the approveacls acl on qemu (Fedora 6) to Approved for markmc

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qemu



From pkgdb at fedoraproject.org  Fri Jan 23 07:37:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 23 Jan 2009 07:37:12 +0000
Subject: [pkgdb] qemu had acl change status
Message-ID: <20090123073712.D24F6208493@bastion.fedora.phx.redhat.com>

dwmw2 has set the approveacls acl on qemu (Fedora 8) to Approved for markmc

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qemu



From pkgdb at fedoraproject.org  Fri Jan 23 07:37:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 23 Jan 2009 07:37:17 +0000
Subject: [pkgdb] qemu had acl change status
Message-ID: <20090123073717.601B4208494@bastion.fedora.phx.redhat.com>

dwmw2 has set the approveacls acl on qemu (Fedora EPEL 4) to Approved for markmc

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qemu



From dchen at fedoraproject.org  Fri Jan 23 07:37:17 2009
From: dchen at fedoraproject.org (Ding-Yi Chen)
Date: Fri, 23 Jan 2009 07:37:17 +0000 (UTC)
Subject: rpms/libchewing/F-10 import.log,1.6,1.7 libchewing.spec,1.26,1.27
Message-ID: <20090123073717.B2DFA700FE@cvs1.fedora.phx.redhat.com>

Author: dchen

Update of /cvs/pkgs/rpms/libchewing/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5432/F-10

Modified Files:
	import.log libchewing.spec 
Log Message:
touch python-<ver>/site-packages/libchewing/__init__.py


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/libchewing/F-10/import.log,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- import.log	14 Jan 2009 08:16:09 -0000	1.6
+++ import.log	23 Jan 2009 07:36:47 -0000	1.7
@@ -4,3 +4,4 @@
 libchewing-0_3_2-1_fc10:F-10:libchewing-0.3.2-1.fc10.src.rpm:1229994672
 libchewing-0_3_2-2_fc10:F-10:libchewing-0.3.2-2.fc10.src.rpm:1230010931
 libchewing-0_3_2-3_fc10:F-10:libchewing-0.3.2-3.fc10.src.rpm:1231920830
+libchewing-0_3_2-4_fc10:F-10:libchewing-0.3.2-4.fc10.src.rpm:1232696161


Index: libchewing.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libchewing/F-10/libchewing.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- libchewing.spec	14 Jan 2009 08:16:09 -0000	1.26
+++ libchewing.spec	23 Jan 2009 07:36:47 -0000	1.27
@@ -1,7 +1,7 @@
 
 Name:           libchewing
 Version:        0.3.2
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Intelligent phonetic input method library for Traditional Chinese
 
 Group:          System Environment/Libraries
@@ -62,9 +62,10 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 make DESTDIR=%{buildroot} install
+rm $RPM_BUILD_ROOT%{_libdir}/libchewing.la
 mkdir -p $RPM_BUILD_ROOT%{libchewing_python_dir}
 cp python/chewing.py $RPM_BUILD_ROOT%{libchewing_python_dir}
-rm $RPM_BUILD_ROOT%{_libdir}/libchewing.la
+touch $RPM_BUILD_ROOT%{libchewing_python_dir}/__init__.py
 
 %post -p /sbin/ldconfig
 
@@ -90,6 +91,10 @@
 %{_libdir}/*.so
 
 %changelog
+* Fri Jan 23 2009 Ding-Yi Chen <dchen at redhat dot com> - 0.3.2-4
+- touch python-<ver>/site-packages/libchewing/__init__.py,
+  So python thinks libchewing is a library.
+
 * Thu Jan 14 2009 Ding-Yi Chen <dchen at redhat dot com> - 0.3.2-3
 - Add python binding by copy python/chewing.py to 
   <python_dir>/site_packages/libchewing



From pkgdb at fedoraproject.org  Fri Jan 23 07:37:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 23 Jan 2009 07:37:25 +0000
Subject: [pkgdb] qemu had acl change status
Message-ID: <20090123073726.042A3208497@bastion.fedora.phx.redhat.com>

dwmw2 has set the approveacls acl on qemu (Fedora EPEL 5) to Approved for markmc

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qemu



From pkgdb at fedoraproject.org  Fri Jan 23 07:37:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 23 Jan 2009 07:37:29 +0000
Subject: [pkgdb] qemu had acl change status
Message-ID: <20090123073730.000CD208485@bastion.fedora.phx.redhat.com>

dwmw2 has set the approveacls acl on qemu (Fedora 9) to Approved for markmc

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qemu



From pkgdb at fedoraproject.org  Fri Jan 23 07:37:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 23 Jan 2009 07:37:32 +0000
Subject: [pkgdb] qemu had acl change status
Message-ID: <20090123073732.78B3E2084A7@bastion.fedora.phx.redhat.com>

dwmw2 has set the approveacls acl on qemu (Fedora 10) to Approved for markmc

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qemu



From pkgdb at fedoraproject.org  Fri Jan 23 07:37:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 23 Jan 2009 07:37:54 +0000
Subject: [pkgdb] qemu had acl change status
Message-ID: <20090123073754.24AEA208489@bastion.fedora.phx.redhat.com>

dwmw2 has set the watchcommits acl on qemu (Fedora devel) to Approved for virtmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qemu



From pkgdb at fedoraproject.org  Fri Jan 23 07:37:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 23 Jan 2009 07:37:57 +0000
Subject: [pkgdb] qemu had acl change status
Message-ID: <20090123073757.6A240208490@bastion.fedora.phx.redhat.com>

dwmw2 has set the watchcommits acl on qemu (Fedora 7) to Approved for virtmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qemu



From pkgdb at fedoraproject.org  Fri Jan 23 07:38:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 23 Jan 2009 07:38:00 +0000
Subject: [pkgdb] qemu had acl change status
Message-ID: <20090123073800.A8D522084BD@bastion.fedora.phx.redhat.com>

dwmw2 has set the watchcommits acl on qemu (Fedora 3) to Approved for virtmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qemu



From pkgdb at fedoraproject.org  Fri Jan 23 07:38:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 23 Jan 2009 07:38:04 +0000
Subject: [pkgdb] qemu had acl change status
Message-ID: <20090123073804.0FCF0208494@bastion.fedora.phx.redhat.com>

dwmw2 has set the watchcommits acl on qemu (Fedora 4) to Approved for virtmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qemu



From pkgdb at fedoraproject.org  Fri Jan 23 07:38:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 23 Jan 2009 07:38:07 +0000
Subject: [pkgdb] qemu had acl change status
Message-ID: <20090123073807.B50F520860A@bastion.fedora.phx.redhat.com>

dwmw2 has set the watchcommits acl on qemu (Fedora 5) to Approved for virtmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qemu



From pkgdb at fedoraproject.org  Fri Jan 23 07:38:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 23 Jan 2009 07:38:09 +0000
Subject: [pkgdb] qemu had acl change status
Message-ID: <20090123073809.EB93120860E@bastion.fedora.phx.redhat.com>

dwmw2 has set the watchcommits acl on qemu (Fedora 6) to Approved for virtmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qemu



From pkgdb at fedoraproject.org  Fri Jan 23 07:38:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 23 Jan 2009 07:38:14 +0000
Subject: [pkgdb] qemu had acl change status
Message-ID: <20090123073814.2C9F2208496@bastion.fedora.phx.redhat.com>

dwmw2 has set the watchcommits acl on qemu (Fedora 8) to Approved for virtmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qemu



From pkgdb at fedoraproject.org  Fri Jan 23 07:38:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 23 Jan 2009 07:38:17 +0000
Subject: [pkgdb] qemu had acl change status
Message-ID: <20090123073817.A2C2D208679@bastion.fedora.phx.redhat.com>

dwmw2 has set the watchcommits acl on qemu (Fedora EPEL 4) to Approved for virtmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qemu



From pkgdb at fedoraproject.org  Fri Jan 23 07:38:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 23 Jan 2009 07:38:21 +0000
Subject: [pkgdb] qemu had acl change status
Message-ID: <20090123073821.200FC208739@bastion.fedora.phx.redhat.com>

dwmw2 has set the watchcommits acl on qemu (Fedora EPEL 5) to Approved for virtmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qemu



From pkgdb at fedoraproject.org  Fri Jan 23 07:38:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 23 Jan 2009 07:38:24 +0000
Subject: [pkgdb] qemu had acl change status
Message-ID: <20090123073824.4DBC0208745@bastion.fedora.phx.redhat.com>

dwmw2 has set the watchcommits acl on qemu (Fedora 9) to Approved for virtmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qemu



From dchen at fedoraproject.org  Fri Jan 23 07:38:40 2009
From: dchen at fedoraproject.org (Ding-Yi Chen)
Date: Fri, 23 Jan 2009 07:38:40 +0000 (UTC)
Subject: rpms/libchewing/F-9 import.log,1.6,1.7 libchewing.spec,1.23,1.24
Message-ID: <20090123073840.E475370142@cvs1.fedora.phx.redhat.com>

Author: dchen

Update of /cvs/pkgs/rpms/libchewing/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5777/F-9

Modified Files:
	import.log libchewing.spec 
Log Message:
touch python-<ver>/site-packages/libchewing/__init__.py


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/libchewing/F-9/import.log,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- import.log	14 Jan 2009 06:32:05 -0000	1.6
+++ import.log	23 Jan 2009 07:38:10 -0000	1.7
@@ -4,3 +4,4 @@
 libchewing-0_3_2-1_fc10:F-9:libchewing-0.3.2-1.fc10.src.rpm:1229994763
 libchewing-0_3_2-2_fc10:F-9:libchewing-0.3.2-2.fc10.src.rpm:1230011048
 libchewing-0_3_2-3_fc10:F-9:libchewing-0.3.2-3.fc10.src.rpm:1231914689
+libchewing-0_3_2-4_fc10:F-9:libchewing-0.3.2-4.fc10.src.rpm:1232696244


Index: libchewing.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libchewing/F-9/libchewing.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- libchewing.spec	14 Jan 2009 06:32:05 -0000	1.23
+++ libchewing.spec	23 Jan 2009 07:38:10 -0000	1.24
@@ -1,7 +1,7 @@
 
 Name:           libchewing
 Version:        0.3.2
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Intelligent phonetic input method library for Traditional Chinese
 
 Group:          System Environment/Libraries
@@ -62,9 +62,10 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 make DESTDIR=%{buildroot} install
+rm $RPM_BUILD_ROOT%{_libdir}/libchewing.la
 mkdir -p $RPM_BUILD_ROOT%{libchewing_python_dir}
 cp python/chewing.py $RPM_BUILD_ROOT%{libchewing_python_dir}
-rm $RPM_BUILD_ROOT%{_libdir}/libchewing.la
+touch $RPM_BUILD_ROOT%{libchewing_python_dir}/__init__.py
 
 %post -p /sbin/ldconfig
 
@@ -90,6 +91,10 @@
 %{_libdir}/*.so
 
 %changelog
+* Fri Jan 23 2009 Ding-Yi Chen <dchen at redhat dot com> - 0.3.2-4
+- touch python-<ver>/site-packages/libchewing/__init__.py,
+  So python thinks libchewing is a library.
+
 * Thu Jan 14 2009 Ding-Yi Chen <dchen at redhat dot com> - 0.3.2-3
 - Add python binding by copy python/chewing.py to 
   <python_dir>/site_packages/libchewing



From pkgdb at fedoraproject.org  Fri Jan 23 07:38:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 23 Jan 2009 07:38:29 +0000
Subject: [pkgdb] qemu had acl change status
Message-ID: <20090123073829.9390E208488@bastion.fedora.phx.redhat.com>

dwmw2 has set the watchcommits acl on qemu (Fedora 10) to Approved for virtmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qemu



From jorton at fedoraproject.org  Fri Jan 23 08:13:49 2009
From: jorton at fedoraproject.org (Joe Orton)
Date: Fri, 23 Jan 2009 08:13:49 +0000 (UTC)
Subject: rpms/apr-util/devel apr-util.spec,1.60,1.61
Message-ID: <20090123081349.93095179D1E@cvs1.fedora.phx.redhat.com>

Author: jorton

Update of /cvs/extras/rpms/apr-util/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11124

Modified Files:
	apr-util.spec 
Log Message:
* Fri Jan 23 2009 Joe Orton <jorton at redhat.com> 1.3.4-2
- rebuild for new MySQL



Index: apr-util.spec
===================================================================
RCS file: /cvs/extras/rpms/apr-util/devel/apr-util.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- apr-util.spec	23 Aug 2008 02:03:29 -0000	1.60
+++ apr-util.spec	23 Jan 2009 08:13:19 -0000	1.61
@@ -4,7 +4,7 @@
 Summary: Apache Portable Runtime Utility library
 Name: apr-util
 Version: 1.3.4
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: ASL 2.0
 Group: System Environment/Libraries
 URL: http://apr.apache.org/
@@ -185,6 +185,9 @@
 %{_datadir}/aclocal/*.m4
 
 %changelog
+* Fri Jan 23 2009 Joe Orton <jorton at redhat.com> 1.3.4-2
+- rebuild for new MySQL
+
 * Wed Aug 16 2008 Bojan Smojver <bojan at rexursive.com> - 1.3.4-1
 - bump up to 1.3.4
 - drop PostgreSQL patch, fixed upstream



From bernie at fedoraproject.org  Fri Jan 23 08:37:08 2009
From: bernie at fedoraproject.org (Bernie Innocenti)
Date: Fri, 23 Jan 2009 08:37:08 +0000 (UTC)
Subject: rpms/jabberd/devel jabberd.spec,1.24,1.25
Message-ID: <20090123083708.DDBA6179D1E@cvs1.fedora.phx.redhat.com>

Author: bernie

Update of /cvs/pkgs/rpms/jabberd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13464

Modified Files:
	jabberd.spec 
Log Message:
* Fri Jan 23 2009 Bernie Innocenti <bernie at codewiz.org> - 2.2.4-2
- Replace /etc/sysconfig/jabberd on upgrade to drop obsolete daemons
- Rebuilt for new libmysqlclient



Index: jabberd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jabberd/devel/jabberd.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- jabberd.spec	8 Oct 2008 10:01:13 -0000	1.24
+++ jabberd.spec	23 Jan 2009 08:36:38 -0000	1.25
@@ -1,7 +1,7 @@
 Summary: OpenSource server implementation of the Jabber protocols
 Name: jabberd
 Version: 2.2.4
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Group: System Environment/Daemons
 Source0: http://ftp.xiaoka.com/jabberd2/releases/jabberd-2.2.4.tar.bz2
@@ -185,11 +185,15 @@
 %{_datadir}/%{name}/
 %{_initrddir}/%{name}
 %config(noreplace) %{_sysconfdir}/pam.d/jabberd
-%config(noreplace) %{_sysconfdir}/sysconfig/jabberd
+%config %{_sysconfdir}/sysconfig/jabberd
 %attr(-, jabber, jabber) %{_var}/lib/jabberd
 %ghost %{_sysconfdir}/jabberd/server.pem
 
 %changelog
+* Fri Jan 23 2009 Bernie Innocenti <bernie at codewiz.org> - 2.2.4-2
+- Replace /etc/sysconfig/jabberd on upgrade to drop obsolete daemons
+- Rebuilt for new libmysqlclient
+
 * Tue Oct 07 2008 Adrian Reber <adrian at lisas.de> - 2.2.4-1
 - updated to 2.2.4
   (this version and pidgin 2.5.1 finally work together)



From ondrejj at fedoraproject.org  Fri Jan 23 08:43:09 2009
From: ondrejj at fedoraproject.org (=?utf-8?q?J=C3=A1n_ONDREJ?=)
Date: Fri, 23 Jan 2009 08:43:09 +0000 (UTC)
Subject: rpms/libnss-mysql/devel libnss-mysql.spec,1.2,1.3
Message-ID: <20090123084309.D86D670141@cvs1.fedora.phx.redhat.com>

Author: ondrejj

Update of /cvs/pkgs/rpms/libnss-mysql/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14931

Modified Files:
	libnss-mysql.spec 
Log Message:
MySQL rebuild.


Index: libnss-mysql.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libnss-mysql/devel/libnss-mysql.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- libnss-mysql.spec	9 Feb 2008 09:06:11 -0000	1.2
+++ libnss-mysql.spec	23 Jan 2009 08:42:39 -0000	1.3
@@ -1,7 +1,7 @@
 Summary:   NSS library for MySQL
 Name:      libnss-mysql
 Version:   1.5
-Release:   7%{?dist}
+Release:   8%{?dist}
 Source0:   http://prdownloads.sourceforge.net/libnss-mysql/libnss-mysql-%{version}.tar.gz
 Patch1:    libnss-mysql-multiarch.patch
 URL:       http://libnss-mysql.sourceforge.net
@@ -65,6 +65,9 @@
 %doc sample
 
 %changelog
+* Fri Jan 23 2008 Jan ONDREJ (SAL) <ondrejj(at)salstar.sk> - 1.5-8
+- rebuild against new mysql
+
 * Sat Feb 9 2008 Jan ONDREJ (SAL) <ondrejj(at)salstar.sk> - 1.5-7
 - rebuild against gcc4.3
 



From ondrejj at fedoraproject.org  Fri Jan 23 08:44:39 2009
From: ondrejj at fedoraproject.org (=?utf-8?q?J=C3=A1n_ONDREJ?=)
Date: Fri, 23 Jan 2009 08:44:39 +0000 (UTC)
Subject: rpms/libnss-mysql/devel libnss-mysql.spec,1.3,1.4
Message-ID: <20090123084439.EF45170141@cvs1.fedora.phx.redhat.com>

Author: ondrejj

Update of /cvs/pkgs/rpms/libnss-mysql/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15199

Modified Files:
	libnss-mysql.spec 
Log Message:
MySQL rebuild.


Index: libnss-mysql.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libnss-mysql/devel/libnss-mysql.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- libnss-mysql.spec	23 Jan 2009 08:42:39 -0000	1.3
+++ libnss-mysql.spec	23 Jan 2009 08:44:09 -0000	1.4
@@ -65,7 +65,7 @@
 %doc sample
 
 %changelog
-* Fri Jan 23 2008 Jan ONDREJ (SAL) <ondrejj(at)salstar.sk> - 1.5-8
+* Fri Jan 23 2009 Jan ONDREJ (SAL) <ondrejj(at)salstar.sk> - 1.5-8
 - rebuild against new mysql
 
 * Sat Feb 9 2008 Jan ONDREJ (SAL) <ondrejj(at)salstar.sk> - 1.5-7



From caolanm at fedoraproject.org  Fri Jan 23 08:59:58 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Fri, 23 Jan 2009 08:59:58 +0000 (UTC)
Subject: rpms/openoffice.org/devel openoffice.org.spec,1.1768,1.1769
Message-ID: <20090123085958.647CE179D1E@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16688

Modified Files:
	openoffice.org.spec 
Log Message:
cjkunifonts-uming -> cjkuni-uming-fonts


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1768
retrieving revision 1.1769
diff -u -r1.1768 -r1.1769
--- openoffice.org.spec	20 Jan 2009 16:28:01 -0000	1.1768
+++ openoffice.org.spec	23 Jan 2009 08:59:27 -0000	1.1769
@@ -1214,7 +1214,7 @@
 Summary: Simplified Chinese language pack for %{name}
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
-Requires: cjkunifonts-uming
+Requires: cjkuni-uming-fonts
 Obsoletes: openoffice.org-i18n < 1.9.0
 Obsoletes: openoffice.org-langpack-zh-CN < 1:2.0.3
 Obsoletes: openoffice.org2-langpack-zh_CN < 1:3.0.0
@@ -3830,8 +3830,9 @@
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
-* Tue Jan 20 2009 Caol??n McNamara <caolanm at redhat.com> - 1:3.0.1-15.4
+* Fri Jan 23 2009 Caol??n McNamara <caolanm at redhat.com> - 1:3.0.1-15.4
 - Resolves: rhbz#480057 add openoffice.org-3.0.1.ooo98288.ucb.neonchange.patch
+- cjkunifonts-uming -> cjkuni-uming-fonts
 
 * Tue Jan 20 2009 Caol??n McNamara <caolanm at redhat.com> - 1:3.0.1-15.3
 - Resolves: rhbz#480362 add



From ondrejj at fedoraproject.org  Fri Jan 23 09:16:31 2009
From: ondrejj at fedoraproject.org (=?utf-8?q?J=C3=A1n_ONDREJ?=)
Date: Fri, 23 Jan 2009 09:16:31 +0000 (UTC)
Subject: rpms/openser/devel openser.spec,1.26,1.27
Message-ID: <20090123091631.98201700FE@cvs1.fedora.phx.redhat.com>

Author: ondrejj

Update of /cvs/pkgs/rpms/openser/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19093

Modified Files:
	openser.spec 
Log Message:
Rebuild for new mysql.


Index: openser.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openser/devel/openser.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- openser.spec	8 Dec 2008 16:21:05 -0000	1.26
+++ openser.spec	23 Jan 2009 09:16:01 -0000	1.27
@@ -10,7 +10,7 @@
 Summary:	Open Source SIP Server
 Name:		openser
 Version:	1.3.4
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GPLv2+
 Group:		System Environment/Daemons
 Source0:	http://www.kamailio.org/pub/%{name}/%{version}/src/%{name}-%{version}-tls_src.tar.gz
@@ -837,6 +837,9 @@
 %doc docdir/README.xmpp
 
 %changelog
+* Fri Jan 23 2009 Jan ONDREJ (SAL) <ondrejj(at)salstar.sk> 1.3.4-2
+- Rebuild for new mysql.
+
 * Mon Dec  8 2008 Peter Lemenkov <lemenkov at gmail.com> 1.3.4-1
 - Ver. 1.3.4
 - Added sysconfig-file



From pkgdb at fedoraproject.org  Fri Jan 23 09:17:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 23 Jan 2009 09:17:14 +0000
Subject: [pkgdb] munin: ixs has requested watchcommits
Message-ID: <20090123091715.0063F20847E@bastion.fedora.phx.redhat.com>

ixs has requested the watchcommits acl on munin (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/munin



From pkgdb at fedoraproject.org  Fri Jan 23 09:17:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 23 Jan 2009 09:17:16 +0000
Subject: [pkgdb] munin: ixs has requested commit
Message-ID: <20090123091716.3A1A5208482@bastion.fedora.phx.redhat.com>

ixs has requested the commit acl on munin (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/munin



From pkgdb at fedoraproject.org  Fri Jan 23 09:17:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 23 Jan 2009 09:17:17 +0000
Subject: [pkgdb] munin: ixs has requested approveacls
Message-ID: <20090123091717.D3F9A208485@bastion.fedora.phx.redhat.com>

ixs has requested the approveacls acl on munin (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/munin



From pkgdb at fedoraproject.org  Fri Jan 23 09:17:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 23 Jan 2009 09:17:51 +0000
Subject: [pkgdb] munin: ixs has requested watchcommits
Message-ID: <20090123091751.AE9BA208471@bastion.fedora.phx.redhat.com>

ixs has requested the watchcommits acl on munin (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/munin



From pkgdb at fedoraproject.org  Fri Jan 23 09:17:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 23 Jan 2009 09:17:54 +0000
Subject: [pkgdb] munin: ixs has requested commit
Message-ID: <20090123091754.64C28208481@bastion.fedora.phx.redhat.com>

ixs has requested the commit acl on munin (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/munin



From pkgdb at fedoraproject.org  Fri Jan 23 09:18:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 23 Jan 2009 09:18:08 +0000
Subject: [pkgdb] munin: ixs has requested watchcommits
Message-ID: <20090123091808.DFF03208471@bastion.fedora.phx.redhat.com>

ixs has requested the watchcommits acl on munin (Fedora EPEL 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/munin



From pkgdb at fedoraproject.org  Fri Jan 23 09:17:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 23 Jan 2009 09:17:59 +0000
Subject: [pkgdb] munin: ixs has requested approveacls
Message-ID: <20090123091759.2C91F208484@bastion.fedora.phx.redhat.com>

ixs has requested the approveacls acl on munin (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/munin



From pkgdb at fedoraproject.org  Fri Jan 23 09:18:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 23 Jan 2009 09:18:13 +0000
Subject: [pkgdb] munin: ixs has requested approveacls
Message-ID: <20090123091814.7AF6B208480@bastion.fedora.phx.redhat.com>

ixs has requested the approveacls acl on munin (Fedora EPEL 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/munin



From pkgdb at fedoraproject.org  Fri Jan 23 09:18:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 23 Jan 2009 09:18:10 +0000
Subject: [pkgdb] munin: ixs has requested commit
Message-ID: <20090123091811.08AEC208488@bastion.fedora.phx.redhat.com>

ixs has requested the commit acl on munin (Fedora EPEL 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/munin



From pkgdb at fedoraproject.org  Fri Jan 23 09:18:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 23 Jan 2009 09:18:20 +0000
Subject: [pkgdb] munin: ixs has requested watchcommits
Message-ID: <20090123091820.5DF42208483@bastion.fedora.phx.redhat.com>

ixs has requested the watchcommits acl on munin (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/munin



From pkgdb at fedoraproject.org  Fri Jan 23 09:18:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 23 Jan 2009 09:18:23 +0000
Subject: [pkgdb] munin: ixs has requested approveacls
Message-ID: <20090123091823.B7BA320848F@bastion.fedora.phx.redhat.com>

ixs has requested the approveacls acl on munin (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/munin



From pkgdb at fedoraproject.org  Fri Jan 23 09:18:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 23 Jan 2009 09:18:24 +0000
Subject: [pkgdb] munin: ixs has requested commit
Message-ID: <20090123091825.C38E9208484@bastion.fedora.phx.redhat.com>

ixs has requested the commit acl on munin (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/munin



From pkgdb at fedoraproject.org  Fri Jan 23 09:18:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 23 Jan 2009 09:18:29 +0000
Subject: [pkgdb] munin: ixs has requested watchcommits
Message-ID: <20090123091829.CA15E208487@bastion.fedora.phx.redhat.com>

ixs has requested the watchcommits acl on munin (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/munin



From pkgdb at fedoraproject.org  Fri Jan 23 09:18:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 23 Jan 2009 09:18:32 +0000
Subject: [pkgdb] munin: ixs has requested commit
Message-ID: <20090123091832.F2459208492@bastion.fedora.phx.redhat.com>

ixs has requested the commit acl on munin (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/munin



From pkgdb at fedoraproject.org  Fri Jan 23 09:18:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 23 Jan 2009 09:18:35 +0000
Subject: [pkgdb] munin: ixs has requested approveacls
Message-ID: <20090123091835.9D4EE208480@bastion.fedora.phx.redhat.com>

ixs has requested the approveacls acl on munin (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/munin



From wolfy at fedoraproject.org  Fri Jan 23 09:21:08 2009
From: wolfy at fedoraproject.org (Manuel Wolfshant)
Date: Fri, 23 Jan 2009 09:21:08 +0000 (UTC)
Subject: rpms/pam_mysql/devel pam_mysql.spec,1.21,1.22
Message-ID: <20090123092108.14DE1700FE@cvs1.fedora.phx.redhat.com>

Author: wolfy

Update of /cvs/pkgs/rpms/pam_mysql/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19595

Modified Files:
	pam_mysql.spec 
Log Message:
rebuild for mysql-5.1 (libmysqlclient.so.15)


Index: pam_mysql.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pam_mysql/devel/pam_mysql.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- pam_mysql.spec	16 Jan 2009 11:25:41 -0000	1.21
+++ pam_mysql.spec	23 Jan 2009 09:20:37 -0000	1.22
@@ -1,7 +1,7 @@
 Summary:	PAM module for auth UNIX users using MySQL data base
 Name:		pam_mysql
 Version:	0.7
-Release:	0.6.rc1%{?dist}.1
+Release:	0.6.rc1%{?dist}.2
 Epoch:		1
 License:	GPLv2+
 Group:		System Environment/Base
@@ -49,6 +49,9 @@
 /%{_lib}/security/pam_mysql.so
 
 %changelog
+* Fri Jan 16 2009 Manuel "lonely wolf" Wolfshant <wolfy at nobugconsulting.ro> 0.7-0.6.rc1.2
+- rebuild for mysql-5.1 (libmysqlclient.so.15)
+
 * Fri Jan 16 2009 Manuel "lonely wolf" Wolfshant <wolfy at nobugconsulting.ro> 0.7-0.6.rc1.1
 - rebuild for newer openssl
 



From ondrejj at fedoraproject.org  Fri Jan 23 09:23:41 2009
From: ondrejj at fedoraproject.org (=?utf-8?q?J=C3=A1n_ONDREJ?=)
Date: Fri, 23 Jan 2009 09:23:41 +0000 (UTC)
Subject: rpms/libnss-mysql/devel libnss-mysql.spec,1.5,1.6
Message-ID: <20090123092341.73056700FE@cvs1.fedora.phx.redhat.com>

Author: ondrejj

Update of /cvs/pkgs/rpms/libnss-mysql/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19924

Modified Files:
	libnss-mysql.spec 
Log Message:
Fixed libtoolize and autoreconf.


Index: libnss-mysql.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libnss-mysql/devel/libnss-mysql.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- libnss-mysql.spec	23 Jan 2009 09:01:58 -0000	1.5
+++ libnss-mysql.spec	23 Jan 2009 09:23:11 -0000	1.6
@@ -1,7 +1,7 @@
 Summary:   NSS library for MySQL
 Name:      libnss-mysql
 Version:   1.5
-Release:   9%{?dist}
+Release:   10%{?dist}
 Source0:   http://prdownloads.sourceforge.net/libnss-mysql/libnss-mysql-%{version}.tar.gz
 Patch1:    libnss-mysql-multiarch.patch
 URL:       http://libnss-mysql.sourceforge.net
@@ -37,7 +37,8 @@
 %patch1 -p1
 
 %build
-#autoreconf
+libtoolize -f
+autoreconf -f
 %configure
 make %{?_smp_mflags}
 # remove non linux samples
@@ -66,6 +67,9 @@
 
 %changelog
 * Fri Jan 23 2009 Jan ONDREJ (SAL) <ondrejj(at)salstar.sk> - 1.5-9
+- added libtoolize -f and readded autoreconf -f
+
+* Fri Jan 23 2009 Jan ONDREJ (SAL) <ondrejj(at)salstar.sk> - 1.5-9
 - build fails with autoreconf, removed
 
 * Fri Jan 23 2009 Jan ONDREJ (SAL) <ondrejj(at)salstar.sk> - 1.5-8



From ondrejj at fedoraproject.org  Fri Jan 23 09:02:29 2009
From: ondrejj at fedoraproject.org (=?utf-8?q?J=C3=A1n_ONDREJ?=)
Date: Fri, 23 Jan 2009 09:02:29 +0000 (UTC)
Subject: rpms/libnss-mysql/devel libnss-mysql.spec,1.4,1.5
Message-ID: <20090123090229.2C32370141@cvs1.fedora.phx.redhat.com>

Author: ondrejj

Update of /cvs/pkgs/rpms/libnss-mysql/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17065

Modified Files:
	libnss-mysql.spec 
Log Message:
Removed autoreconf.


Index: libnss-mysql.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libnss-mysql/devel/libnss-mysql.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- libnss-mysql.spec	23 Jan 2009 08:44:09 -0000	1.4
+++ libnss-mysql.spec	23 Jan 2009 09:01:58 -0000	1.5
@@ -1,7 +1,7 @@
 Summary:   NSS library for MySQL
 Name:      libnss-mysql
 Version:   1.5
-Release:   8%{?dist}
+Release:   9%{?dist}
 Source0:   http://prdownloads.sourceforge.net/libnss-mysql/libnss-mysql-%{version}.tar.gz
 Patch1:    libnss-mysql-multiarch.patch
 URL:       http://libnss-mysql.sourceforge.net
@@ -37,7 +37,7 @@
 %patch1 -p1
 
 %build
-autoreconf
+#autoreconf
 %configure
 make %{?_smp_mflags}
 # remove non linux samples
@@ -65,6 +65,9 @@
 %doc sample
 
 %changelog
+* Fri Jan 23 2009 Jan ONDREJ (SAL) <ondrejj(at)salstar.sk> - 1.5-9
+- build fails with autoreconf, removed
+
 * Fri Jan 23 2009 Jan ONDREJ (SAL) <ondrejj(at)salstar.sk> - 1.5-8
 - rebuild against new mysql
 



From mmaslano at fedoraproject.org  Fri Jan 23 09:34:49 2009
From: mmaslano at fedoraproject.org (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?=)
Date: Fri, 23 Jan 2009 09:34:49 +0000 (UTC)
Subject: rpms/perl-libwww-perl/devel .cvsignore, 1.13,
	1.14 perl-libwww-perl.spec, 1.29, 1.30 sources, 1.13,
	1.14 perl-libwww-perl-5.817-skip-message-tests.patch, 1.1,
	NONE rt-38736_taint.patch, 1.1, NONE
Message-ID: <20090123093449.715D0700FE@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-serv20995

Modified Files:
	.cvsignore perl-libwww-perl.spec sources 
Removed Files:
	perl-libwww-perl-5.817-skip-message-tests.patch 
	rt-38736_taint.patch 
Log Message:
* Thu Jan 22 2009 Marcela Ma??l????ov?? <mmaslano at redhat.com> 5.823-1
- update to 5.823



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-libwww-perl/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	13 Oct 2008 09:51:05 -0000	1.13
+++ .cvsignore	23 Jan 2009 09:34:18 -0000	1.14
@@ -1 +1 @@
-libwww-perl-5.817.tar.gz
+libwww-perl-5.823.tar.gz


Index: perl-libwww-perl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-libwww-perl/devel/perl-libwww-perl.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- perl-libwww-perl.spec	13 Oct 2008 09:51:06 -0000	1.29
+++ perl-libwww-perl.spec	23 Jan 2009 09:34:19 -0000	1.30
@@ -1,5 +1,5 @@
 Name:           perl-libwww-perl
-Version:        5.817
+Version:        5.823
 Release:        1%{?dist}
 Summary:        A Perl interface to the World-Wide Web
 
@@ -8,13 +8,6 @@
 URL:            http://search.cpan.org/dist/libwww-perl/
 Source0:        http://www.cpan.org/authors/id/G/GA/GAAS/libwww-perl-%{version}.tar.gz
 
-# Patch to skip some tests, because they fail in mock for some reason.
-# If someone can figure out why, we can enable them again.  Since the
-# 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.
-Patch1:         perl-libwww-perl-5.817-skip-message-tests.patch
-Patch2:         rt-38736_taint.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -37,7 +30,7 @@
 
 %prep
 %setup -q -n libwww-perl-%{version} 
-%patch1 -p1
+
 
 # Filter unwanted Provides:
 cat << \EOF > %{name}-prov
@@ -114,6 +107,9 @@
 
 
 %changelog
+* Thu Jan 22 2009 Marcela Ma??l????ov?? <mmaslano at redhat.com> 5.823-1
+- update to 5.823
+
 * Mon Oct 10 2008 Marcela Ma??l????ov?? <mmaslano at redhat.com> 5.817-1
 - update to 5.817
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-libwww-perl/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	13 Oct 2008 09:51:06 -0000	1.13
+++ sources	23 Jan 2009 09:34:19 -0000	1.14
@@ -1 +1 @@
-076a83d6e5678b84c0dd3c9526686485  libwww-perl-5.817.tar.gz
+9e1d2039e5ed9ed5e0783c2c1c33db8f  libwww-perl-5.823.tar.gz


--- perl-libwww-perl-5.817-skip-message-tests.patch DELETED ---


--- rt-38736_taint.patch DELETED ---



From jorton at fedoraproject.org  Fri Jan 23 09:35:17 2009
From: jorton at fedoraproject.org (Joe Orton)
Date: Fri, 23 Jan 2009 09:35:17 +0000 (UTC)
Subject: rpms/mod_auth_mysql/devel mod_auth_mysql.spec,1.27,1.28
Message-ID: <20090123093517.1B8BE700FE@cvs1.fedora.phx.redhat.com>

Author: jorton

Update of /cvs/extras/rpms/mod_auth_mysql/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21054

Modified Files:
	mod_auth_mysql.spec 
Log Message:
* Fri Jan 23 2009 Joe Orton <jorton at redhat.com> 1:3.0.0-7
- rebuild for new MySQL



Index: mod_auth_mysql.spec
===================================================================
RCS file: /cvs/extras/rpms/mod_auth_mysql/devel/mod_auth_mysql.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- mod_auth_mysql.spec	19 Feb 2008 07:07:33 -0000	1.27
+++ mod_auth_mysql.spec	23 Jan 2009 09:34:46 -0000	1.28
@@ -1,7 +1,7 @@
 Summary: Basic authentication for the Apache web server using a MySQL database
 Name: mod_auth_mysql
 Version: 3.0.0
-Release: 6
+Release: 7
 Epoch: 1
 Group: System Environment/Daemons
 URL: http://modauthmysql.sourceforge.net/
@@ -47,6 +47,9 @@
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/*.conf
 
 %changelog
+* Fri Jan 23 2009 Joe Orton <jorton at redhat.com> 1:3.0.0-7
+- rebuild for new MySQL
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1:3.0.0-6
 - Autorebuild for GCC 4.3
 



From mmaslano at fedoraproject.org  Fri Jan 23 09:39:19 2009
From: mmaslano at fedoraproject.org (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?=)
Date: Fri, 23 Jan 2009 09:39:19 +0000 (UTC)
Subject: rpms/perl-ORLite-Migrate/devel .cvsignore,1.1,1.2 sources,1.1,1.2
Message-ID: <20090123093919.619B4700FE@cvs1.fedora.phx.redhat.com>

Author: mmaslano

Update of /cvs/pkgs/rpms/perl-ORLite-Migrate/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21618

Modified Files:
	.cvsignore sources 
Log Message:
* Mon Jan 12 2009 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-ORLite-Migrate/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	14 Jan 2009 21:26:36 -0000	1.1
+++ .cvsignore	23 Jan 2009 09:38:48 -0000	1.2
@@ -0,0 +1 @@
+ORLite-Migrate-0.01.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-ORLite-Migrate/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	14 Jan 2009 21:26:36 -0000	1.1
+++ sources	23 Jan 2009 09:38:49 -0000	1.2
@@ -0,0 +1 @@
+eec5d9e315cfb7e90658ef10f6685281  ORLite-Migrate-0.01.tar.gz



From mmaslano at fedoraproject.org  Fri Jan 23 09:40:18 2009
From: mmaslano at fedoraproject.org (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?=)
Date: Fri, 23 Jan 2009 09:40:18 +0000 (UTC)
Subject: rpms/perl-ORLite-Migrate/devel perl-ORLite-Migrate.spec,NONE,1.1
Message-ID: <20090123094018.B9912700FE@cvs1.fedora.phx.redhat.com>

Author: mmaslano

Update of /cvs/pkgs/rpms/perl-ORLite-Migrate/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21934

Added Files:
	perl-ORLite-Migrate.spec 
Log Message:
Add spec file.



--- NEW FILE perl-ORLite-Migrate.spec ---
Name:           perl-ORLite-Migrate
Version:        0.01
Release:        1%{?dist}
Summary:        Light weight SQLite-specific schema migration
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/ORLite-Migrate/
Source0:        http://www.cpan.org/authors/id/A/AD/ADAMK/ORLite-Migrate-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl >= 1:5.6.0
BuildRequires:  perl(DBD::SQLite) >= 1.14
BuildRequires:  perl(DBI) >= 1.58
BuildRequires:  perl(ExtUtils::MakeMaker)
BuildRequires:  perl(File::pushd)
BuildRequires:  perl(IPC::Run3)
BuildRequires:  perl(ORLite) >= 1.16
BuildRequires:  perl(Params::Util) >= 0.33
BuildRequires:  perl(Probe::Perl)
BuildRequires:  perl(Test::More) >= 0.47
Requires:       perl(DBD::SQLite) >= 1.14
Requires:       perl(DBI) >= 1.58
Requires:       perl(File::pushd)
Requires:       perl(IPC::Run3)
Requires:       perl(ORLite) >= 1.16
Requires:       perl(Params::Util) >= 0.33
Requires:       perl(Probe::Perl)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
THIS CODE IS EXPERIMENTAL AND SUBJECT TO CHANGE WITHOUT NOTICE
SQLite is a light weight single file SQL database that provides an excellent platform for embedded
storage of structured data. ORLite is a light weight single class Object-Relational Mapper (ORM) 
system specifically designed for (and limited to only) work with SQLite. ORLite::Migrate is a light 
weight single class Database Schema Migration enhancement for ORLite.

%prep
%setup -q -n ORLite-Migrate-%{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
* Mon Jan 12 2009 Marcela Ma??l????ov?? <mmaslano at redhat.com> 0.01-1
- Specfile autogenerated by cpanspec 1.77.



From jorton at fedoraproject.org  Fri Jan 23 09:40:21 2009
From: jorton at fedoraproject.org (Joe Orton)
Date: Fri, 23 Jan 2009 09:40:21 +0000 (UTC)
Subject: rpms/php/devel php.spec,1.166,1.167
Message-ID: <20090123094021.D913F700FE@cvs1.fedora.phx.redhat.com>

Author: jorton

Update of /cvs/extras/rpms/php/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21856

Modified Files:
	php.spec 
Log Message:
* Fri Jan 23 2009 Joe Orton <jorton at redhat.com> 5.2.8-3
- rebuild for new MySQL



Index: php.spec
===================================================================
RCS file: /cvs/extras/rpms/php/devel/php.spec,v
retrieving revision 1.166
retrieving revision 1.167
diff -u -r1.166 -r1.167
--- php.spec	13 Dec 2008 08:10:57 -0000	1.166
+++ php.spec	23 Jan 2009 09:39:51 -0000	1.167
@@ -8,7 +8,7 @@
 Summary: PHP scripting language for creating dynamic web sites
 Name: php
 Version: 5.2.8
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: PHP
 Group: Development/Languages
 URL: http://www.php.net/
@@ -469,7 +469,6 @@
 	--with-jpeg-dir=%{_prefix} \
 	--with-openssl \
 	--with-png \
-	--with-expat-dir=%{_prefix} \
         --with-pcre-regex=%{_prefix} \
 	--with-zlib \
 	--with-layout=GNU \
@@ -734,6 +733,9 @@
 %files pspell -f files.pspell
 
 %changelog
+* Fri Jan 23 2009 Joe Orton <jorton at redhat.com> 5.2.8-3
+- rebuild for new MySQL
+
 * Sat Dec 13 2008 Remi Collet <Fedora at FamilleCollet.com> 5.2.8-2
 - libtool 2 workaround for phpize (#476004)
 - add missing php_embed.h (#457777)



From mmaslano at fedoraproject.org  Fri Jan 23 09:41:44 2009
From: mmaslano at fedoraproject.org (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?=)
Date: Fri, 23 Jan 2009 09:41:44 +0000 (UTC)
Subject: rpms/perl-ORLite-Migrate/F-10 perl-ORLite-Migrate.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090123094144.3C66B700FE@cvs1.fedora.phx.redhat.com>

Author: mmaslano

Update of /cvs/pkgs/rpms/perl-ORLite-Migrate/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22225

Modified Files:
	.cvsignore sources 
Added Files:
	perl-ORLite-Migrate.spec 
Log Message:
* Mon Jan 12 2009 Marcela Ma??l????ov?? <mmaslano at redhat.com> 0.01-1
- Specfile autogenerated by cpanspec 1.77.



--- NEW FILE perl-ORLite-Migrate.spec ---
Name:           perl-ORLite-Migrate
Version:        0.01
Release:        1%{?dist}
Summary:        Light weight SQLite-specific schema migration
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/ORLite-Migrate/
Source0:        http://www.cpan.org/authors/id/A/AD/ADAMK/ORLite-Migrate-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl >= 1:5.6.0
BuildRequires:  perl(DBD::SQLite) >= 1.14
BuildRequires:  perl(DBI) >= 1.58
BuildRequires:  perl(ExtUtils::MakeMaker)
BuildRequires:  perl(File::pushd)
BuildRequires:  perl(IPC::Run3)
BuildRequires:  perl(ORLite) >= 1.16
BuildRequires:  perl(Params::Util) >= 0.33
BuildRequires:  perl(Probe::Perl)
BuildRequires:  perl(Test::More) >= 0.47
Requires:       perl(DBD::SQLite) >= 1.14
Requires:       perl(DBI) >= 1.58
Requires:       perl(File::pushd)
Requires:       perl(IPC::Run3)
Requires:       perl(ORLite) >= 1.16
Requires:       perl(Params::Util) >= 0.33
Requires:       perl(Probe::Perl)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
THIS CODE IS EXPERIMENTAL AND SUBJECT TO CHANGE WITHOUT NOTICE
SQLite is a light weight single file SQL database that provides an excellent platform for embedded
storage of structured data. ORLite is a light weight single class Object-Relational Mapper (ORM) 
system specifically designed for (and limited to only) work with SQLite. ORLite::Migrate is a light 
weight single class Database Schema Migration enhancement for ORLite.

%prep
%setup -q -n ORLite-Migrate-%{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
* Mon Jan 12 2009 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-ORLite-Migrate/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	14 Jan 2009 21:26:36 -0000	1.1
+++ .cvsignore	23 Jan 2009 09:41:13 -0000	1.2
@@ -0,0 +1 @@
+ORLite-Migrate-0.01.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-ORLite-Migrate/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	14 Jan 2009 21:26:36 -0000	1.1
+++ sources	23 Jan 2009 09:41:13 -0000	1.2
@@ -0,0 +1 @@
+eec5d9e315cfb7e90658ef10f6685281  ORLite-Migrate-0.01.tar.gz



From mlichvar at fedoraproject.org  Fri Jan 23 09:49:22 2009
From: mlichvar at fedoraproject.org (Miroslav Lichvar)
Date: Fri, 23 Jan 2009 09:49:22 +0000 (UTC)
Subject: rpms/postfix/devel postfix.spec,1.70,1.71
Message-ID: <20090123094922.78B8C700FE@cvs1.fedora.phx.redhat.com>

Author: mlichvar

Update of /cvs/pkgs/rpms/postfix/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23665

Modified Files:
	postfix.spec 
Log Message:
- rebuild for new mysql



Index: postfix.spec
===================================================================
RCS file: /cvs/pkgs/rpms/postfix/devel/postfix.spec,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- postfix.spec	22 Jan 2009 15:53:45 -0000	1.70
+++ postfix.spec	23 Jan 2009 09:49:21 -0000	1.71
@@ -40,7 +40,7 @@
 Name: postfix
 Summary: Postfix Mail Transport Agent
 Version: 2.5.6
-Release: 1%{?dist}
+Release: 2%{?dist}
 Epoch: 2
 Group: System Environment/Daemons
 URL: http://www.postfix.org
@@ -491,6 +491,9 @@
 %endif
 
 %changelog
+* Fri Jan 23 2009 Miroslav Lichvar <mlichvar at redhat.com> 2:2.5.6-2
+- rebuild for new mysql
+
 * Thu Jan 22 2009 Miroslav Lichvar <mlichvar at redhat.com> 2:2.5.6-1
 - update to 2.5.6 (#479108)
 - rebuild /etc/aliases.db only when necessary (#327651)



From rjones at fedoraproject.org  Fri Jan 23 09:52:40 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Fri, 23 Jan 2009 09:52:40 +0000 (UTC)
Subject: rpms/nekovm/devel nekovm.spec,1.1,1.2
Message-ID: <20090123095240.5DBC7700FE@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/nekovm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24254

Modified Files:
	nekovm.spec 
Log Message:
Rebuild to get updated mysql dep.


Index: nekovm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nekovm/devel/nekovm.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nekovm.spec	18 Dec 2008 10:24:06 -0000	1.1
+++ nekovm.spec	23 Jan 2009 09:52:09 -0000	1.2
@@ -5,7 +5,7 @@
 
 Name:           nekovm
 Version:        1.8.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Neko embedded scripting language and virtual machine
 
 Group:          Development/Libraries
@@ -161,6 +161,9 @@
 
 
 %changelog
+* Fri Jan 23 2009 Richard W.M. Jones <rjones at redhat.com> - 1.8.0-3
+- Rebuild to get updated mysql dep.
+
 * Tue Dec 16 2008 Richard W.M. Jones <rjones at redhat.com> - 1.8.0-2
 - New upstream release 1.8.0.
 - Use dos2unix --keepdate.



From rjones at fedoraproject.org  Fri Jan 23 09:52:45 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Fri, 23 Jan 2009 09:52:45 +0000 (UTC)
Subject: rpms/collectd/devel collectd.spec,1.13,1.14
Message-ID: <20090123095245.CACA4700FE@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/collectd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24278

Modified Files:
	collectd.spec 
Log Message:
Rebuild against new mysql client.


Index: collectd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/collectd/devel/collectd.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- collectd.spec	7 Dec 2008 20:37:28 -0000	1.13
+++ collectd.spec	23 Jan 2009 09:52:15 -0000	1.14
@@ -1,7 +1,7 @@
 Summary: Statistics collection daemon for filling RRD files
 Name: collectd
 Version: 4.5.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 URL: http://collectd.org/
@@ -380,6 +380,9 @@
 
 
 %changelog
+* Fri Jan 23 2009 Richard W.M. Jones <rjones at redhat.com> - 4.5.1-3
+- Rebuild against new mysql client.
+
 * Sun Dec 07 2008 Alan Pevec <apevec at redhat.com> 4.5.1-2.1
 - fix subpackages, bz# 475093
 



From rjones at fedoraproject.org  Fri Jan 23 09:53:55 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Fri, 23 Jan 2009 09:53:55 +0000 (UTC)
Subject: rpms/ocaml-mysql/devel ocaml-mysql.spec,1.5,1.6
Message-ID: <20090123095355.3984C700FE@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/ocaml-mysql/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24610

Modified Files:
	ocaml-mysql.spec 
Log Message:
Force another rebuild to try to get updated MySQL client deps.


Index: ocaml-mysql.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-mysql/devel/ocaml-mysql.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ocaml-mysql.spec	17 Jan 2009 14:33:55 -0000	1.5
+++ ocaml-mysql.spec	23 Jan 2009 09:53:24 -0000	1.6
@@ -3,7 +3,7 @@
 
 Name:           ocaml-mysql
 Version:        1.0.4
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        OCaml library for accessing MySQL databases
 
 Group:          Development/Libraries
@@ -96,6 +96,9 @@
 
 
 %changelog
+* Fri Jan 23 2009 Richard W.M. Jones <rjones at redhat.com> - 1.0.4-7
+- Force another rebuild to try to get updated MySQL client deps.
+
 * Sat Jan 17 2009 Richard W.M. Jones <rjones at redhat.com> - 1.0.4-6
 - Requires mysql-libs, not automatically found.
 



From than at fedoraproject.org  Fri Jan 23 10:04:59 2009
From: than at fedoraproject.org (Than Ngo)
Date: Fri, 23 Jan 2009 10:04:59 +0000 (UTC)
Subject: rpms/kdelibs/devel sources,1.81,1.82
Message-ID: <20090123100459.C4378700FE@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdelibs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25751

Modified Files:
	sources 
Log Message:
respin



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdelibs/devel/sources,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- sources	22 Jan 2009 11:18:31 -0000	1.81
+++ sources	23 Jan 2009 10:04:29 -0000	1.82
@@ -1 +1 @@
-c5ba7a8a99302bfe2c70503aa621f703  kdelibs-4.2.0.tar.bz2
+39062d37534bc236dc824f7d824266f6  kdelibs-4.2.0.tar.bz2



From robert at fedoraproject.org  Fri Jan 23 10:25:24 2009
From: robert at fedoraproject.org (Robert Scheck)
Date: Fri, 23 Jan 2009 10:25:24 +0000 (UTC)
Subject: rpms/gnokii/devel gnokii.spec,1.34,1.35
Message-ID: <20090123102524.63EAD700FE@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/pkgs/rpms/gnokii/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28653

Modified Files:
	gnokii.spec 
Log Message:
Rebuild for MySQL 5.1



Index: gnokii.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnokii/devel/gnokii.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- gnokii.spec	6 Oct 2008 07:45:32 -0000	1.34
+++ gnokii.spec	23 Jan 2009 10:24:53 -0000	1.35
@@ -2,7 +2,7 @@
 
 Name:           gnokii
 Version:        0.6.27
-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
+* Fri Jan 23 2009  Robert Scheck <robert at fedoraproject.org> 0.6.27-3
+- Rebuild for MySQL 5.1
+
 * Mon Oct 06 2008 - Bastien Nocera <bnocera at redhat.com> - 0.6.27-2
 - Fix htmlview patch
 



From robert at fedoraproject.org  Fri Jan 23 10:29:55 2009
From: robert at fedoraproject.org (Robert Scheck)
Date: Fri, 23 Jan 2009 10:29:55 +0000 (UTC)
Subject: rpms/gnokii/devel gnokii.spec,1.35,1.36
Message-ID: <20090123102955.37995700FE@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/pkgs/rpms/gnokii/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29144

Modified Files:
	gnokii.spec 
Log Message:
Whitespace fixing


Index: gnokii.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnokii/devel/gnokii.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- gnokii.spec	23 Jan 2009 10:24:53 -0000	1.35
+++ gnokii.spec	23 Jan 2009 10:29:24 -0000	1.36
@@ -227,7 +227,7 @@
 %{_libdir}/pkgconfig/xgnokii.pc
 
 %changelog
-* Fri Jan 23 2009  Robert Scheck <robert at fedoraproject.org> 0.6.27-3
+* Fri Jan 23 2009 Robert Scheck <robert at fedoraproject.org> 0.6.27-3
 - Rebuild for MySQL 5.1
 
 * Mon Oct 06 2008 - Bastien Nocera <bnocera at redhat.com> - 0.6.27-2



From than at fedoraproject.org  Fri Jan 23 10:30:10 2009
From: than at fedoraproject.org (Than Ngo)
Date: Fri, 23 Jan 2009 10:30:10 +0000 (UTC)
Subject: rpms/kcoloredit/devel .cvsignore, 1.8, 1.9 kcoloredit.spec, 1.12,
	1.13 sources, 1.9, 1.10
Message-ID: <20090123103010.5F394700FE@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kcoloredit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29177

Modified Files:
	.cvsignore kcoloredit.spec sources 
Log Message:
4.2.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kcoloredit/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	17 Nov 2008 18:29:07 -0000	1.8
+++ .cvsignore	23 Jan 2009 10:29:40 -0000	1.9
@@ -1,3 +1,4 @@
 kcoloredit-1.9.0-kde4.1.0.tar.bz2
 kcoloredit-1.9.0-kde4.1.1.tar.bz2
 kcoloredit-2.0.0-kde4.1.3.tar.bz2
+kcoloredit-2.0.0-kde4.2.0.tar.bz2


Index: kcoloredit.spec
===================================================================
RCS file: /cvs/extras/rpms/kcoloredit/devel/kcoloredit.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- kcoloredit.spec	17 Nov 2008 18:29:07 -0000	1.12
+++ kcoloredit.spec	23 Jan 2009 10:29:40 -0000	1.13
@@ -4,8 +4,8 @@
 %define iversion 2.0.0
 
 Name:           kcoloredit
-Version:        4.1.3
-Release:        2%{?dist}
+Version:        4.2.0
+Release:        1%{?dist}
 Summary:        A color palette Editor
 
 Group:          Applications/Publishing
@@ -75,6 +75,9 @@
 %{_kde4_iconsdir}/hicolor/*/*/kcoloredit.png
 
 %changelog
+* Fri Jan 23 2009 Than Ngo <than at redhat.com> - 4.2.0-1
+- 4.2.0
+
 * Mon Nov 17 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.3-2
 - dependency fixes, cosmetics
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kcoloredit/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	17 Nov 2008 18:29:07 -0000	1.9
+++ sources	23 Jan 2009 10:29:40 -0000	1.10
@@ -1 +1 @@
-f637b93ad7b6206eefed4eb2b5a862f0  kcoloredit-2.0.0-kde4.1.3.tar.bz2
+7f11e3e19cae7dec2d013cec40027e70  kcoloredit-2.0.0-kde4.2.0.tar.bz2



From than at fedoraproject.org  Fri Jan 23 10:34:28 2009
From: than at fedoraproject.org (Than Ngo)
Date: Fri, 23 Jan 2009 10:34:28 +0000 (UTC)
Subject: rpms/kgrab/devel .cvsignore, 1.6, 1.7 kgrab.spec, 1.14, 1.15 sources,
	1.6, 1.7
Message-ID: <20090123103428.4B35B700FE@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kgrab/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29868

Modified Files:
	.cvsignore kgrab.spec sources 
Log Message:
4.2.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kgrab/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	4 Oct 2008 09:16:41 -0000	1.6
+++ .cvsignore	23 Jan 2009 10:33:57 -0000	1.7
@@ -1,3 +1,4 @@
 kgrab-0.1.1-kde4.1.0.tar.bz2
 kgrab-0.1.1-kde4.1.1.tar.bz2
 kgrab-0.1.1-kde4.1.2.tar.bz2
+kgrab-0.1.1-kde4.2.0.tar.bz2


Index: kgrab.spec
===================================================================
RCS file: /cvs/extras/rpms/kgrab/devel/kgrab.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- kgrab.spec	5 Dec 2008 00:09:09 -0000	1.14
+++ kgrab.spec	23 Jan 2009 10:33:57 -0000	1.15
@@ -1,11 +1,11 @@
 # Review Request:
 # https://bugzilla.redhat.com/show_bug.cgi?id=432613
 
-%define kdeversion 4.1.2
+%define kdeversion 4.2.0
 
 Name:           kgrab
 Version:        0.1.1
-Release:        12%{?dist}
+Release:        13%{?dist}
 Summary:        A screen grabbing utility
 
 Group:          User Interface/Desktops
@@ -75,6 +75,9 @@
 
 
 %changelog
+* Fri Jan 23 2009 Than Ngo <than at redhat.com> - 0.1.1-13
+- 4.2.0
+
 * Fri Dec 05 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 0.1.1-12
 - rebuild for fixed kde-filesystem (macros.kde4) (get rid of rpaths)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kgrab/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	4 Oct 2008 09:16:41 -0000	1.6
+++ sources	23 Jan 2009 10:33:57 -0000	1.7
@@ -1 +1 @@
-dd3b7f7aae63bf53a286b21300562b23  kgrab-0.1.1-kde4.1.2.tar.bz2
+40210dae84646ab5c9b49e57ee57e774  kgrab-0.1.1-kde4.2.0.tar.bz2



From sarantis at fedoraproject.org  Fri Jan 23 10:35:50 2009
From: sarantis at fedoraproject.org (Sarantis Paskalis)
Date: Fri, 23 Jan 2009 10:35:50 +0000 (UTC)
Subject: rpms/tetex-font-kerkis/devel dead.package,NONE,1.1
Message-ID: <20090123103550.9F5EA700FE@cvs1.fedora.phx.redhat.com>

Author: sarantis

Update of /cvs/extras/rpms/tetex-font-kerkis/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30190

Added Files:
	dead.package 
Log Message:
Renamed to ctan-kerkis-fonts.



--- NEW FILE dead.package ---
Renamed to ctan-kerkis-fonts



From sarantis at fedoraproject.org  Fri Jan 23 10:37:22 2009
From: sarantis at fedoraproject.org (Sarantis Paskalis)
Date: Fri, 23 Jan 2009 10:37:22 +0000 (UTC)
Subject: rpms/tetex-font-kerkis/devel .cvsignore, 1.3, NONE Makefile, 1.2,
	NONE sources, 1.3, NONE tetex-font-kerkis.spec, 1.19, NONE
Message-ID: <20090123103722.9D70E179D1E@cvs1.fedora.phx.redhat.com>

Author: sarantis

Update of /cvs/extras/rpms/tetex-font-kerkis/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30477

Removed Files:
	.cvsignore Makefile sources tetex-font-kerkis.spec 
Log Message:
Renamed to ctan-kerkis-fonts



--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- sources DELETED ---


--- tetex-font-kerkis.spec DELETED ---



From than at fedoraproject.org  Fri Jan 23 10:41:09 2009
From: than at fedoraproject.org (Than Ngo)
Date: Fri, 23 Jan 2009 10:41:09 +0000 (UTC)
Subject: rpms/kiconedit/devel .cvsignore, 1.8, 1.9 kiconedit.spec, 1.12,
	1.13 sources, 1.9, 1.10
Message-ID: <20090123104109.48813179D1E@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kiconedit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30891

Modified Files:
	.cvsignore kiconedit.spec sources 
Log Message:
4.2.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kiconedit/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	3 Oct 2008 15:32:53 -0000	1.8
+++ .cvsignore	23 Jan 2009 10:40:38 -0000	1.9
@@ -1 +1,2 @@
 kiconedit-4.1.2.tar.bz2
+kiconedit-4.2.0.tar.bz2


Index: kiconedit.spec
===================================================================
RCS file: /cvs/extras/rpms/kiconedit/devel/kiconedit.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- kiconedit.spec	17 Nov 2008 18:14:08 -0000	1.12
+++ kiconedit.spec	23 Jan 2009 10:40:38 -0000	1.13
@@ -1,8 +1,8 @@
 # Review Request: http://bugzilla.redhat.com/432139
 
 Name:           kiconedit
-Version:        4.1.3
-Release:        2%{?dist}
+Version:        4.2.0
+Release:        1%{?dist}
 Summary:        An icon editor
 
 Group:          Applications/Publishing
@@ -73,6 +73,9 @@
 %{_kde4_iconsdir}/hicolor/*/*/kiconedit.png
 
 %changelog
+* Fri Jan 23 2009 Than Ngo <than at redhat.com> - 4.2.0-1
+- 4.2.0
+
 * Mon Nov 17 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.3-2
 - scriptlet, dependency fixes
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kiconedit/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	17 Nov 2008 18:14:08 -0000	1.9
+++ sources	23 Jan 2009 10:40:38 -0000	1.10
@@ -1 +1 @@
-2ec07cdaa6b0d63e6ea04a42184b6069  kiconedit-4.1.3.tar.bz2
+b9700b5380880d6bb857ac7594583ff3  kiconedit-4.2.0.tar.bz2



From sarantis at fedoraproject.org  Fri Jan 23 10:44:59 2009
From: sarantis at fedoraproject.org (Sarantis Paskalis)
Date: Fri, 23 Jan 2009 10:44:59 +0000 (UTC)
Subject: comps comps-f11.xml.in,1.74,1.75
Message-ID: <20090123104459.EE653179D1E@cvs1.fedora.phx.redhat.com>

Author: sarantis

Update of /cvs/extras/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31538

Modified Files:
	comps-f11.xml.in 
Log Message:
Split mgopen-fonts to different font families.



Index: comps-f11.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-f11.xml.in,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- comps-f11.xml.in	22 Jan 2009 02:54:16 -0000	1.74
+++ comps-f11.xml.in	23 Jan 2009 10:44:29 -0000	1.75
@@ -1557,7 +1557,10 @@
       <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>
+      <packagereq type="optional">mgopen-canonica-fonts</packagereq>
+      <packagereq type="optional">mgopen-cosmetica-fonts</packagereq>
+      <packagereq type="optional">mgopen-modata-fonts</packagereq>
+      <packagereq type="optional">mgopen-moderna-fonts</packagereq>
       <packagereq type="optional">mona-fonts-sazanami</packagereq>
       <packagereq type="optional">mona-fonts-VLGothic</packagereq>
       <packagereq type="optional">myanmar3-unicode-fonts</packagereq>
@@ -2410,7 +2413,10 @@
       <packagereq type="optional">gfs-solomos-fonts</packagereq>
       <packagereq type="optional">gfs-theokritos-fonts</packagereq>
       <packagereq type="optional">m17n-db-greek</packagereq>
-      <packagereq type="optional">mgopen-fonts</packagereq>
+      <packagereq type="optional">mgopen-canonica-fonts</packagereq>
+      <packagereq type="optional">mgopen-cosmetica-fonts</packagereq>
+      <packagereq type="optional">mgopen-modata-fonts</packagereq>
+      <packagereq type="optional">mgopen-moderna-fonts</packagereq>
     </packagelist>
   </group>
   <group>



From than at fedoraproject.org  Fri Jan 23 10:45:31 2009
From: than at fedoraproject.org (Than Ngo)
Date: Fri, 23 Jan 2009 10:45:31 +0000 (UTC)
Subject: rpms/konq-plugins/devel .cvsignore, 1.6, 1.7 konq-plugins.spec, 1.16,
	1.17 sources, 1.8, 1.9 konq-plugins-4.1.3-jpegorient.patch, 1.1,
	NONE konq-plugins-4.1.3-tryexec.patch, 1.1, NONE
Message-ID: <20090123104531.DB15C700FE@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/konq-plugins/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32207

Modified Files:
	.cvsignore konq-plugins.spec sources 
Removed Files:
	konq-plugins-4.1.3-jpegorient.patch 
	konq-plugins-4.1.3-tryexec.patch 
Log Message:
4.2.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/konq-plugins/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	4 Oct 2008 09:24:24 -0000	1.6
+++ .cvsignore	23 Jan 2009 10:45:01 -0000	1.7
@@ -1,3 +1,4 @@
 konq-plugins-4.1.0.tar.bz2
 konq-plugins-4.1.1.tar.bz2
 konq-plugins-4.1.2.tar.bz2
+konq-plugins-4.2.0.tar.bz2


Index: konq-plugins.spec
===================================================================
RCS file: /cvs/extras/rpms/konq-plugins/devel/konq-plugins.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- konq-plugins.spec	5 Jan 2009 21:40:10 -0000	1.16
+++ konq-plugins.spec	23 Jan 2009 10:45:01 -0000	1.17
@@ -1,8 +1,8 @@
 # Review Request: http://bugzilla.redhat.com/438126
 
 Name:           konq-plugins
-Version:        4.1.3
-Release:        4%{?dist}
+Version:        4.2.0
+Release:        1%{?dist}
 Summary:        Additional plugins that interact with konqueror
 
 Group:          Applications/Internet
@@ -12,8 +12,6 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # upstreamed
-Patch100:  konq-plugins-4.1.3-tryexec.patch
-Patch101:  konq-plugins-4.1.3-jpegorient.patch
 
 BuildRequires: kdebase4-devel >= %{version}
 BuildRequires: cmake
@@ -46,8 +44,6 @@
 
 %prep
 %setup -q
-%patch100 -p1 -b .tryexec
-%patch101 -p1 -b .jpegorient
 
 
 %build
@@ -118,6 +114,9 @@
 %lang(uk) %{_kde4_docdir}/HTML/uk/konq-plugins
 
 %changelog
+* Fri Jan 23 2009 Than Ngo <than at redhat.com> - 4.2.0-1
+- 4.2.0
+
 * Mon Jan 05 2009 Rex Dieter <rdieter at fedoraproject.org> 4.1.3-4
 - make install/fast
 - jpegorient is not installed (#478736, kdebug#178612)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/konq-plugins/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	17 Nov 2008 18:30:56 -0000	1.8
+++ sources	23 Jan 2009 10:45:01 -0000	1.9
@@ -1 +1 @@
-5270894af33dea625f1c6d9843f9d73c  konq-plugins-4.1.3.tar.bz2
+1ee6818891745af896d0d397292f759d  konq-plugins-4.2.0.tar.bz2


--- konq-plugins-4.1.3-jpegorient.patch DELETED ---


--- konq-plugins-4.1.3-tryexec.patch DELETED ---



From than at fedoraproject.org  Fri Jan 23 10:49:39 2009
From: than at fedoraproject.org (Than Ngo)
Date: Fri, 23 Jan 2009 10:49:39 +0000 (UTC)
Subject: rpms/kopete-cryptography/devel .cvsignore, 1.2,
	1.3 kopete-cryptography.spec, 1.3, 1.4 sources, 1.2, 1.3
Message-ID: <20090123104939.B53E3700FE@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kopete-cryptography/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32726

Modified Files:
	.cvsignore kopete-cryptography.spec sources 
Log Message:
4.2.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kopete-cryptography/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	4 Dec 2008 09:09:29 -0000	1.2
+++ .cvsignore	23 Jan 2009 10:49:09 -0000	1.3
@@ -1 +1,2 @@
 kopete-cryptography-1.3.0-kde4.1.3.tar.bz2
+kopete-cryptography-1.3.0-kde4.2.0.tar.bz2


Index: kopete-cryptography.spec
===================================================================
RCS file: /cvs/extras/rpms/kopete-cryptography/devel/kopete-cryptography.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- kopete-cryptography.spec	9 Dec 2008 09:06:26 -0000	1.3
+++ kopete-cryptography.spec	23 Jan 2009 10:49:09 -0000	1.4
@@ -1,9 +1,9 @@
 %define pluginversion 1.3.0
-%define kdeversion kde4.1.3
+%define kdeversion kde4.2.0
 
 Name:           kopete-cryptography
 Version:        %{pluginversion}
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Encrypts and signs messages in Kopete using the OpenPGP
 
 Group:          Applications/Internet
@@ -70,6 +70,9 @@
 %{_kde4_appsdir}/kopete_cryptography/
 
 %changelog
+* Fri Jan 23 2009 Than Ngo <than at redhat.com> - 1.3.0-6
+- 4.2.0
+
 * Tue Dec 10 2008 Jaroslav Reznik <jreznik at redhat.com> - 1.3.0-5
 - remove post and postun sections
 * Thu Dec 04 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> - 1.3.0-4


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kopete-cryptography/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	4 Dec 2008 09:09:29 -0000	1.2
+++ sources	23 Jan 2009 10:49:09 -0000	1.3
@@ -1 +1 @@
-25697c1b7f85c660f4cfc73b27c2e4c8  kopete-cryptography-1.3.0-kde4.1.3.tar.bz2
+03fa7e472784dc0f07c1165081f4dca5  kopete-cryptography-1.3.0-kde4.2.0.tar.bz2



From denis at fedoraproject.org  Fri Jan 23 10:52:21 2009
From: denis at fedoraproject.org (Denis Leroy)
Date: Fri, 23 Jan 2009 10:52:21 +0000 (UTC)
Subject: rpms/compat-libgda/devel .cvsignore, 1.4, 1.5 Makefile, 1.2,
	1.3 compat-libgda.spec, 1.5, 1.6 libgda-3.0.0-man.patch, NONE,
	1.1 libgda-3.1.2-lib64.patch, NONE,
	1.1 libgda-3.1.2-new-freetds.patch, NONE, 1.1 dead.package, 1.1, NONE
Message-ID: <20090123105221.50B1E179D1E@cvs1.fedora.phx.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/compat-libgda/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv661

Added Files:
	.cvsignore Makefile compat-libgda.spec libgda-3.0.0-man.patch 
	libgda-3.1.2-lib64.patch libgda-3.1.2-new-freetds.patch 
Removed Files:
	dead.package 
Log Message:
surrected for 3.0 API, with libgda moving on to 4.0 API


Index: .cvsignore
===================================================================
RCS file: .cvsignore
diff -N .cvsignore
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ .cvsignore	23 Jan 2009 10:51:50 -0000	1.5
@@ -0,0 +1 @@
+libgda-3.1.2.tar.bz2


Index: Makefile
===================================================================
RCS file: Makefile
diff -N Makefile
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ Makefile	23 Jan 2009 10:51:50 -0000	1.3
@@ -0,0 +1,21 @@
+# Makefile for source rpm: libgda
+# $Id$
+NAME := libgda
+SPECFILE = $(firstword $(wildcard *.spec))
+
+define find-makefile-common
+for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
+endef
+
+MAKEFILE_COMMON := $(shell $(find-makefile-common))
+
+ifeq ($(MAKEFILE_COMMON),)
+# attept a checkout
+define checkout-makefile-common
+test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
+endef
+
+MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
+endif
+
+include $(MAKEFILE_COMMON)


Index: compat-libgda.spec
===================================================================
RCS file: compat-libgda.spec
diff -N compat-libgda.spec
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ compat-libgda.spec	23 Jan 2009 10:51:50 -0000	1.6
@@ -0,0 +1,583 @@
+# Default provider build options (MySQL, Postgres, unixODBC, LDAP, FreeTDS)
+#
+# Package build options:
+# --with db2
+# --with oracle
+# --with sybase
+# --without ldap
+# --without mdb
+# --without mysql
+# --without odbc
+# --without postgres
+# --without tds
+# --without xbase
+# 
+
+%define           IBMDB2   0
+%define           ORACLE   0
+%define           SYBASE   0
+%define           LDAP     0
+%define           MDB      0
+%define           MYSQL    0
+%define           ODBC     0
+%define           POSTGRES 0
+%define           FREETDS  0
+%define           XBASE    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_tds:%define FREETDS 0}
+%{?_without_xbase:%define XBASE 0}
+
+Name:             compat-libgda
+Version:          3.1.2
+Release:          1%{?dist}
+Summary:          Library for writing gnome database programs
+Group:            System Environment/Libraries
+License:          LGPLv2+
+URL:              http://www.gnome-db.org/
+Source:           http://ftp.gnome.org/pub/GNOME/sources/%{name}/3.1/libgda-%{version}.tar.bz2
+Patch1:           libgda-3.0.0-man.patch
+Patch2:           libgda-3.1.2-new-freetds.patch
+Patch3:           libgda-3.1.2-lib64.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:    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:        libgda-sharp < 1:%{version}-%{release}
+Obsoletes:        libgda-sharp-devel < 1:%{version}-%{release}
+
+%if %{FREETDS}
+BuildRequires:    freetds-devel >= 0.82-2
+%endif
+
+%if %{MYSQL}
+BuildRequires:    mysql-devel
+%endif
+
+%if %{POSTGRES}
+BuildRequires:    postgresql-devel
+%endif
+
+%if %{ODBC}
+BuildRequires:    unixODBC-devel
+%endif
+
+%if %{MDB}
+BuildRequires:    mdbtools-devel
+%endif
+
+%if %{LDAP}
+BuildRequires:    openldap-devel
+%endif
+
+%if %{XBASE}
+BuildRequires:    xbase-devel
+%endif
+
+%description
+libgda is a library that eases the task of writing
+gnome database programs.
+
+
+%package devel
+Summary:          Development libraries and header files for libgda
+Group:            Development/Libraries
+Requires:         glib2-devel >= 2.0.0
+Requires:         libxslt-devel >= 1.0.9
+Requires:         db4-devel libxml2-devel pkgconfig
+Requires:         %{name} = %{version}-%{release}
+
+%description devel
+This package contains the header files and libraries needed to write
+or compile programs that use libgda.
+
+
+%package sqlite
+Summary:          SQLite provider for libgda
+Group:            System Environment/Libraries
+Requires:         %{name} = %{version}-%{release}
+Obsoletes:        gda-sqlite < 1:%{version}-%{release}
+Provides:         compat-gda-sqlite = %{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 = %{version}-%{release}
+%description sqlite-devel
+This package includes the pkgconfig file for the libgda SQLite provider.
+
+
+%if %{FREETDS}
+%package freetds
+Summary:          FreeTDS provider for libgda
+Group:            System Environment/Libraries
+Requires:         %{name} = %{version}-%{release}
+Obsoletes:        gda-freetds < 1:%{version}-%{release}
+Provides:         compat-gda-freetds = %{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 = %{version}-%{release}
+%description freetds-devel
+This package includes the pkgconfig file for the libgda FreeTDS provider.
+%endif
+
+%if %{IBMDB2}
+%package ibmdb2
+Summary:          IBM DB2 provider for libgda
+Group:            System Environment/Libraries
+Requires:         %{name} = %{version}-%{release}
+Obsoletes:        gda-ibmdb2 < 1:%{version}-%{release}
+Provides:         compat-gda-ibmdb2 = %{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 = %{version}-%{release}
+%description ibmdb2-devel
+This package includes the pkgconfig file for the libgda IBM DB2 provider.
+%endif
+
+%if %{MYSQL}
+%package mysql
+Summary:          MySQL provider for libgda
+Group:            System Environment/Libraries
+Requires:         %{name} = %{version}-%{release}
+Obsoletes:        gda-mysql < 1:%{version}-%{release}
+Provides:         compat-gda-mysql = %{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 = %{version}-%{release}
+%description mysql-devel
+This package includes the pkgconfig file for the libgda MySQL provider.
+%endif
+
+%if %{ODBC}
+%package odbc
+Summary:          ODBC provider for libgda
+Group:            System Environment/Libraries
+Requires:         %{name} = %{version}-%{release}
+Obsoletes:        gda-odbc < 1:%{version}-%{release}
+Provides:         compat-gda-odbc = %{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 = %{version}-%{release}
+%description odbc-devel
+This package includes the pkgconfig file for the libgda ODBC provider.
+%endif
+
+%if %{ORACLE}
+%package oracle
+Summary:          Oracle provider for libgda
+Group:            System Environment/Libraries
+Requires:         %{name} = %{version}-%{release}
+Obsoletes:        gda-oracle < 1:%{version}-%{release}
+Provides:         compat-gda-oracle = %{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 = %{version}-%{release}
+%description oracle-devel
+This package includes the pkgconfig file for the libgda Oracle provider.
+%endif
+
+%if %{POSTGRES}
+%package postgres
+Summary:          PostgreSQL provider for libgda
+Group:            System Environment/Libraries
+Requires:         %{name} = %{version}-%{release}
+Obsoletes:        gda-postgres < 1:%{version}-%{release}
+Provides:         compat-gda-postgres = %{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 = %{version}-%{release}
+%description postgres-devel
+This package includes the pkgconfig file for the libgda PostgreSQL provider.
+%endif
+
+%if %{SYBASE}
+%package sybase
+Summary:          Sybase provider for libgda
+Group:            System Environment/Libraries
+Requires:         %{name} = %{version}-%{release}
+Obsoletes:        gda-sybase < 1:%{version}-%{release}
+Provides:         compat-gda-sybase = %{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 = %{version}-%{release}
+%description sybase-devel
+This package includes the pkgconfig file for the libgda Sybase provider.
+%endif
+
+%if %{MDB}
+%package mdb
+Summary:          MDB provider for libgda
+Group:            System Environment/Libraries
+Requires:         %{name} = %{version}-%{release}
+Obsoletes:        gda-mdb < 1:%{version}-%{release}
+Provides:         compat-gda-mdb = %{version}-%{release}
+%description mdb
+This package includes the libgda MDB provider.
+
+%package mdb-devel
+Summary:          MDB provider for libgda pkgconfig file
+Group:            Development/Libraries
+Requires:         pkgconfig
+Requires:         %{name}-mdb = %{version}-%{release}
+%description mdb-devel
+This package includes the pkgconfig file for the libgda MDB provider.
+%endif
+		
+%if %{LDAP}
+%package ldap
+Summary:          LDAP provider for libgda
+Group:            System Environment/Libraries
+Requires:         %{name} = %{version}-%{release}
+Obsoletes:        gda-ldap < 1:%{version}-%{release}
+Provides:         compat-gda-ldap = %{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 = %{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} = %{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 = %{version}-%{release}, pkgconfig
+%description xbase-devel
+This package includes the pkgconfig file for the libgda XBASE provider.
+%endif
+
+
+%prep
+%setup -q -n libgda-%{version}
+%patch1 -p1 -b .man
+%patch2 -p1
+%patch3 -p1 -b .lib64
+# 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
+CONFIG="--disable-static --disable-dependency-tracking"
+
+%if %{FREETDS}
+CONFIG="$CONFIG --with-tds"
+%else
+CONFIG="$CONFIG --without-tds"
+%endif
+
+%if %{IBMDB2}
+CONFIG="$CONFIG --with-ibmdb2"
+%else
+CONFIG="$CONFIG --without-ibmdb2"
+%endif
+
+%if %{MYSQL}
+CONFIG="$CONFIG --with-mysql"
+%else
+CONFIG="$CONFIG --without-mysql"
+%endif
+
+%if %{POSTGRES}
+CONFIG="$CONFIG --with-postgres"
+%else
+CONFIG="$CONFIG --without-postgres"
+%endif
+
+%if %{ODBC}
+CONFIG="$CONFIG --with-odbc"
+%else
+CONFIG="$CONFIG --without-odbc"
+%endif
+
+%if %{ORACLE}
+CONFIG="$CONFIG --with-oracle"
+%else
+CONFIG="$CONFIG --without-oracle"
+%endif
+
+%if %{SYBASE}
+CONFIG="$CONFIG --with-sybase"
+%else
+CONFIG="$CONFIG --without-sybase"
+%endif
+
+%if %{MDB}
+CONFIG="$CONFIG --with-mdb"
+%else
+CONFIG="$CONFIG --without-mdb"
+%endif
+
+%if %{LDAP}
+CONFIG="$CONFIG --with-ldap"
+%else
+CONFIG="$CONFIG --without-ldap"
+%endif
+
+%if %{XBASE}
+CONFIG="$CONFIG --with-xbase"
+%else
+CONFIG="$CONFIG --without-xbase"
+%endif
+
+%configure $CONFIG
+# 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 $RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT
+
+# Cleanup unnecessary, unpackaged files
+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.0
+
+
+%post -p /sbin/ldconfig
+
+%post devel
+if which scrollkeeper-update >/dev/null 2>&1; then scrollkeeper-update; fi
+
+%postun -p /sbin/ldconfig
+
+%postun devel
+if which scrollkeeper-update >/dev/null 2>&1; then scrollkeeper-update; fi
+
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+
+%files -f libgda-3.0.lang
+%defattr(-,root,root,-)
+%doc AUTHORS COPYING ChangeLog README NEWS
+%config(noreplace) %{_sysconfdir}/libgda-3.0
+%{_bindir}/*
+%{_datadir}/libgda-3.0
+%{_libdir}/*.so.*
+%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-3.0/providers/libgda-bdb.so
+%{_mandir}/man1/*
+%{_mandir}/man5/*
+
+%files devel
+%defattr(-,root,root,-)
+%doc %{_datadir}/gtk-doc/html/libgda-3.0
+%{_includedir}/*
+%{_libdir}/*.so
+%{_libdir}/pkgconfig/libgda-3.0.pc
+%{_libdir}/pkgconfig/libgda-bdb-3.0.pc
+%{_libdir}/pkgconfig/libgda-report-3.0.pc
+%{_libdir}/pkgconfig/libgda-xslt-3.0.pc
+
+%files sqlite
+%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-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-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-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-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-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-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-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-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-3.0/providers/libgda-xbase.so
+
+%files xbase-devel
+%defattr(-,root,root,-)
+%{_libdir}/pkgconfig/libgda-xbase-3.0.pc
+%endif
+
+
+%changelog
+* Wed Jan 21 2009 Denis Leroy <denis at poolshark.org> - 3.1.2-1
+- Resurrected for 3.0 API, with libgda moving on to 4.0 API
+
+* Tue Jan  9 2007 Denis Leroy <denis at poolshark.org> - 1.2.4-1
+- Update to libgda 1.2.4
+
+* Fri Dec  8 2006 Denis Leroy <denis at poolshark.org> - 1.2.3-5
+- Rebuild with libpq.so.5
+
+* Mon Sep 11 2006 Denis Leroy <denis at poolshark.org> - 1.2.3-4
+- Added intltool BR
+
+* Mon Sep 11 2006 Tom "spot" Callaway <tcallawa at redhat.com> - 1.2.3-3
+- add xbase
+- enable everything we can by default (they're subpackages)
+- make sure all the libs get stripped into debuginfo
+- use URL to Source0
+- use correct license tags
+
+* Mon Jul 24 2006 Denis Leroy <denis at poolshark.org> - 1.2.3-2
+- Fixed compat configuration directory
+
+* Wed Jul  5 2006 Denis Leroy <denis at poolshark.org> - 1.2.3-1
+- First draft, based on FC-4 libgda.spec

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.1.2-lib64.patch:

--- NEW FILE libgda-3.1.2-lib64.patch ---
--- libgda-3.1.2/libgda/binreloc/gda-binreloc.c~	2007-08-31 17:11:37.000000000 +0200
+++ libgda-3.1.2/libgda/binreloc/gda-binreloc.c	2008-10-27 12:39:39.000000000 +0100
@@ -67,7 +67,11 @@
 		prefix_dir_name = "share" G_DIR_SEPARATOR_S "locale";
 		break;
 	case GDA_LIB_DIR:
+#ifdef __x86_64__
+		prefix_dir_name = "lib64";		
+#else
 		prefix_dir_name = "lib";		
+#endif
 		break;
 	case GDA_LIBEXEC_DIR:
 		prefix_dir_name = "libexec";

libgda-3.1.2-new-freetds.patch:

--- NEW FILE libgda-3.1.2-new-freetds.patch ---
diff -up libgda-3.1.2/providers/freetds/gda-freetds-recordset.c~ libgda-3.1.2/providers/freetds/gda-freetds-recordset.c
--- libgda-3.1.2/providers/freetds/gda-freetds-recordset.c~	2008-06-16 23:48:25.000000000 +0200
+++ libgda-3.1.2/providers/freetds/gda-freetds-recordset.c	2008-06-16 23:48:25.000000000 +0200
@@ -208,7 +208,7 @@ gda_freetds_get_current_row(GdaFreeTDSRe
 
 		field = gda_row_get_value (row, i);
 		col = recset->priv->res->columns[i];
-		val = &(recset->priv->res->current_row[col->column_offset]);
+		val = col->column_data;
 
 		gda_freetds_set_gdavalue (field, val, col,
 		                          recset->priv->tds_cnc);


--- dead.package DELETED ---



From than at fedoraproject.org  Fri Jan 23 10:57:04 2009
From: than at fedoraproject.org (Than Ngo)
Date: Fri, 23 Jan 2009 10:57:04 +0000 (UTC)
Subject: rpms/PolicyKit-kde/devel .cvsignore, 1.2, 1.3 PolicyKit-kde.spec,
	1.2, 1.3 sources, 1.2, 1.3
Message-ID: <20090123105704.5DCF7179D1E@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/PolicyKit-kde/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1489

Modified Files:
	.cvsignore PolicyKit-kde.spec sources 
Log Message:
4.2.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/PolicyKit-kde/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	9 Jan 2009 20:25:45 -0000	1.2
+++ .cvsignore	23 Jan 2009 10:56:33 -0000	1.3
@@ -1 +1,2 @@
 PolicyKit-kde-20081219svn.tar.bz2
+PolicyKit-kde-4.2.0.tar.bz2


Index: PolicyKit-kde.spec
===================================================================
RCS file: /cvs/extras/rpms/PolicyKit-kde/devel/PolicyKit-kde.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- PolicyKit-kde.spec	10 Jan 2009 02:07:58 -0000	1.2
+++ PolicyKit-kde.spec	23 Jan 2009 10:56:33 -0000	1.3
@@ -1,16 +1,14 @@
 %define _develpackage 0
-%define _version 0.0
-%define _svndate 20081219svn
 
 Name: PolicyKit-kde
-Version: %{_version}
-Release: 0.1.%{_svndate}%{?dist}
+Version: 4.2.0
+Release: 1%{?dist}
 Summary: PolicyKit integration for the KDE desktop
 
 Group: System Environment/Libraries
 License: GPLv2+ and LGPLv2+
 URL: http://www.kde.org
-Source0: %{name}-%{_svndate}.tar.bz2
+Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/extragear/%{name}-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  kdelibs4-devel >= 4.1
@@ -73,5 +71,8 @@
 %endif
 
 %changelog
+* Fri Jan 23 2009 Than Ngo <than at redhat.com> - 4.2.0-1
+- 4.2.0
+
 * Thu Jan 08 2009 Than Ngo <than at redhat.com> - 0.0-0.1.20081219svn
 - initial version


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/PolicyKit-kde/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	9 Jan 2009 20:25:45 -0000	1.2
+++ sources	23 Jan 2009 10:56:33 -0000	1.3
@@ -1 +1 @@
-30ba8b723282ecea8c3ee471493f90c5  PolicyKit-kde-20081219svn.tar.bz2
+36fffd4b9e7d43bd2c07cc7c1ec18cb6  PolicyKit-kde-4.2.0.tar.bz2



From denis at fedoraproject.org  Fri Jan 23 10:57:25 2009
From: denis at fedoraproject.org (Denis Leroy)
Date: Fri, 23 Jan 2009 10:57:25 +0000 (UTC)
Subject: rpms/compat-libgda/devel Makefile,1.3,1.4
Message-ID: <20090123105725.45F8C700FE@cvs1.fedora.phx.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/compat-libgda/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1574

Modified Files:
	Makefile 
Log Message:
Fixed Makefile name def


Index: Makefile
===================================================================
RCS file: /cvs/pkgs/rpms/compat-libgda/devel/Makefile,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Makefile	23 Jan 2009 10:51:50 -0000	1.3
+++ Makefile	23 Jan 2009 10:56:55 -0000	1.4
@@ -1,6 +1,6 @@
 # Makefile for source rpm: libgda
 # $Id$
-NAME := libgda
+NAME := compat-libgda
 SPECFILE = $(firstword $(wildcard *.spec))
 
 define find-makefile-common



From denis at fedoraproject.org  Fri Jan 23 10:57:27 2009
From: denis at fedoraproject.org (Denis Leroy)
Date: Fri, 23 Jan 2009 10:57:27 +0000 (UTC)
Subject: rpms/libgda/devel libgda-3.99.8-lib64.patch, NONE, 1.1 .cvsignore,
	1.5, 1.6 libgda.spec, 1.41, 1.42 sources, 1.5,
	1.6 libgda-3.1.2-lib64.patch, 1.1,
	NONE libgda-3.1.2-new-freetds.patch, 1.1, NONE
Message-ID: <20090123105727.78D51700FE@cvs1.fedora.phx.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/libgda/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1463

Modified Files:
	.cvsignore libgda.spec sources 
Added Files:
	libgda-3.99.8-lib64.patch 
Removed Files:
	libgda-3.1.2-lib64.patch libgda-3.1.2-new-freetds.patch 
Log Message:
- Switch to 4.0 ABI
- Update to upstream 3.99.8
- Patch updates (upstreamed and ported)
- Added JAVA package flag, currently disabled


libgda-3.99.8-lib64.patch:

--- NEW FILE libgda-3.99.8-lib64.patch ---
--- libgda-3.99.8/libgda/binreloc/gda-binreloc.c~	2008-12-08 09:27:26.000000000 +0100
+++ libgda-3.99.8/libgda/binreloc/gda-binreloc.c	2009-01-16 09:34:08.000000000 +0100
@@ -146,8 +146,12 @@
 		else 
 			prefix_dir_name = tmp + prefix_len + 1;
 #else
+#ifdef __x86_64__
+		prefix_dir_name = "lib64";
+#else
 		prefix_dir_name = "lib";
 #endif
+#endif
 		break;
 	case GDA_LIBEXEC_DIR:
 		tmp = LIBGDALIBEXEC;


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libgda/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	25 Jan 2008 16:30:10 -0000	1.5
+++ .cvsignore	23 Jan 2009 10:56:57 -0000	1.6
@@ -1 +1 @@
-libgda-3.1.2.tar.bz2
+libgda-3.99.8.tar.bz2


Index: libgda.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libgda/devel/libgda.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- libgda.spec	27 Oct 2008 12:30:50 -0000	1.41
+++ libgda.spec	23 Jan 2009 10:56:57 -0000	1.42
@@ -11,18 +11,20 @@
 # --without postgres
 # --without tds
 # --without xbase
+# --without java
 # 
 
 %define           IBMDB2   0
 %define           ORACLE   0
 %define           SYBASE   0
-%define           LDAP     1
+%define           LDAP     0
 %define           MDB      1
 %define           MYSQL    1
-%define           ODBC     1
+%define           ODBC     0
 %define           POSTGRES 1
-%define           FREETDS  1
-%define           XBASE    1
+%define           FREETDS  0
+%define           XBASE    0
+%define           JAVA     0
 
 %{?_with_db2:%define IBMDB2     1}
 %{?_with_oracle:%define ORACLE  1}
@@ -34,19 +36,19 @@
 %{?_without_postgres:%define POSTGRES 0}
 %{?_without_tds:%define FREETDS 0}
 %{?_without_xbase:%define XBASE 0}
+%{?_with_java:%define JAVA 1}
 
 Name:             libgda
 Epoch:            1
-Version:          3.1.2
-Release:          6%{?dist}
+Version:          3.99.8
+Release:          1%{?dist}
 Summary:          Library for writing gnome database programs
 Group:            System Environment/Libraries
 License:          LGPLv2+
 URL:              http://www.gnome-db.org/
 Source:           http://ftp.gnome.org/pub/GNOME/sources/%{name}/3.1/%{name}-%{version}.tar.bz2
 Patch1:           libgda-3.0.0-man.patch
-Patch2:           libgda-3.1.2-new-freetds.patch
-Patch3:           libgda-3.1.2-lib64.patch
+Patch3:           libgda-3.99.8-lib64.patch
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:    pkgconfig >= 0.8
 BuildRequires:    glib2-devel >= 2.0.0
@@ -58,6 +60,15 @@
 Obsoletes:        %{name}-sharp < %{epoch}:%{version}-%{release}
 Obsoletes:        %{name}-sharp-devel < %{epoch}:%{version}-%{release}
 
+Obsoletes:        %{name}-freetds < %{epoch}:3.99.0
+Obsoletes:        %{name}-freetds-devel < %{epoch}:3.99.0
+Obsoletes:        %{name}-ldap < %{epoch}:3.99.0
+Obsoletes:        %{name}-ldap-devel < %{epoch}:3.99.0
+Obsoletes:        %{name}-odbc < %{epoch}:3.99.0
+Obsoletes:        %{name}-odbc-devel < %{epoch}:3.99.0
+Obsoletes:        %{name}-xbase < %{epoch}:3.99.0
+Obsoletes:        %{name}-xbase-devel < %{epoch}:3.99.0
+
 %if %{FREETDS}
 BuildRequires:    freetds-devel >= 0.82-2
 %endif
@@ -313,7 +324,6 @@
 %prep
 %setup -q
 %patch1 -p1 -b .man
-%patch2 -p1
 %patch3 -p1 -b .lib64
 # fix ppc64 postgres detection
 sed -i 's/x86_64\* | sparc64\*) lib="lib64";;/x86_64\* | sparc64\* | powerpc64\*) lib="lib64";;/' \
@@ -386,6 +396,12 @@
 CONFIG="$CONFIG --without-xbase"
 %endif
 
+%if %{JAVA}
+CONFIG="$CONFIG --with-java"
+%else
+CONFIG="$CONFIG --without-java"
+%endif
+
 %configure $CONFIG
 # Don't use rpath!
 sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
@@ -401,11 +417,10 @@
 make install DESTDIR=$RPM_BUILD_ROOT
 
 # Cleanup unnecessary, unpackaged files
-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 $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
+rm $RPM_BUILD_ROOT/%{_sysconfdir}/libgda-4.0/sales_test.db
 
-%find_lang libgda-3.0
+%find_lang libgda-4.0
 
 
 %post -p /sbin/ldconfig
@@ -423,141 +438,146 @@
 rm -rf $RPM_BUILD_ROOT
 
 
-%files -f libgda-3.0.lang
+%files -f libgda-4.0.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog README NEWS
-%config(noreplace) %{_sysconfdir}/libgda-3.0
+%config(noreplace) %{_sysconfdir}/libgda-4.0
 %{_bindir}/*
-%{_datadir}/libgda-3.0
+%{_datadir}/libgda-4.0
 %{_libdir}/*.so.*
-%dir %{_libdir}/libgda-3.0
-%dir %{_libdir}/libgda-3.0/providers
+%dir %{_libdir}/libgda-4.0
+%dir %{_libdir}/libgda-4.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-3.0/providers/libgda-bdb.so
+%{_libdir}/libgda-4.0/providers/libgda-bdb.so
 %{_mandir}/man1/*
-%{_mandir}/man5/*
 
 %files devel
 %defattr(-,root,root,-)
-%doc %{_datadir}/gtk-doc/html/libgda-3.0
+%doc %{_datadir}/gtk-doc/html/libgda-4.0
 %{_includedir}/*
 %{_libdir}/*.so
-%{_libdir}/pkgconfig/libgda-3.0.pc
-%{_libdir}/pkgconfig/libgda-bdb-3.0.pc
-%{_libdir}/pkgconfig/libgda-report-3.0.pc
-%{_libdir}/pkgconfig/libgda-xslt-3.0.pc
+%{_libdir}/pkgconfig/libgda-4.0.pc
+%{_libdir}/pkgconfig/libgda-bdb-4.0.pc
+%{_libdir}/pkgconfig/libgda-report-4.0.pc
+%{_libdir}/pkgconfig/libgda-xslt-4.0.pc
 
 %files sqlite
 %defattr(-,root,root,-)
-%{_libdir}/libgda-3.0/providers/libgda-sqlite.so
+%{_libdir}/libgda-4.0/providers/libgda-sqlite.so
 
 %files sqlite-devel
 %defattr(-,root,root,-)
-%{_libdir}/pkgconfig/libgda-sqlite-3.0.pc
+%{_libdir}/pkgconfig/libgda-sqlite-4.0.pc
 
 %if %{FREETDS}
 %files freetds
 %defattr(-,root,root,-)
-%{_libdir}/libgda-3.0/providers/libgda-freetds.so
+%{_libdir}/libgda-4.0/providers/libgda-freetds.so
 
 %files freetds-devel
 %defattr(-,root,root,-)
-%{_libdir}/pkgconfig/libgda-freetds-3.0.pc
+%{_libdir}/pkgconfig/libgda-freetds-4.0.pc
 %endif
 
 %if %{IBMDB2}
 %files ibmdb2
 %defattr(-,root,root,-)
-%{_libdir}/libgda-3.0/providers/libgda-ibmdb2.so
+%{_libdir}/libgda-4.0/providers/libgda-ibmdb2.so
 
 %files ibmdb2-devel
 %defattr(-,root,root,-)
-%{_libdir}/pkgconfig/libgda-imdb2-3.0.pc
+%{_libdir}/pkgconfig/libgda-imdb2-4.0.pc
 %endif
 
 %if %{MYSQL}
 %files mysql
 %defattr(-,root,root,-)
-%{_libdir}/libgda-3.0/providers/libgda-mysql.so
+%{_libdir}/libgda-4.0/providers/libgda-mysql.so
 
 %files mysql-devel
 %defattr(-,root,root,-)
-%{_libdir}/pkgconfig/libgda-mysql-3.0.pc
+%{_libdir}/pkgconfig/libgda-mysql-4.0.pc
 %endif
 
 %if %{ODBC}
 %files odbc
 %defattr(-,root,root,-)
-%{_libdir}/libgda-3.0/providers/libgda-odbc.so
+%{_libdir}/libgda-4.0/providers/libgda-odbc.so
 
 %files odbc-devel
 %defattr(-,root,root,-)
-%{_libdir}/pkgconfig/libgda-odbc-3.0.pc
+%{_libdir}/pkgconfig/libgda-odbc-4.0.pc
 %endif
 
 %if %{ORACLE}
 %files oracle
 %defattr(-,root,root,-)
-%{_libdir}/libgda-3.0/providers/libgda-oracle.so
+%{_libdir}/libgda-4.0/providers/libgda-oracle.so
 
 %files oracle-devel
 %defattr(-,root,root,-)
-%{_libdir}/pkgconfig/libgda-oracle-3.0.pc
+%{_libdir}/pkgconfig/libgda-oracle-4.0.pc
 %endif
 
 %if %{POSTGRES}
 %files postgres
 %defattr(-,root,root,-)
-%{_libdir}/libgda-3.0/providers/libgda-postgres.so
+%{_libdir}/libgda-4.0/providers/libgda-postgres.so
 
 %files postgres-devel
 %defattr(-,root,root,-)
-%{_libdir}/pkgconfig/libgda-postgres-3.0.pc
+%{_libdir}/pkgconfig/libgda-postgres-4.0.pc
 %endif
 
 %if %{SYBASE}
 %files sybase
 %defattr(-,root,root,-)
-%{_libdir}/libgda-3.0/providers/libgda-sybase.so
+%{_libdir}/libgda-4.0/providers/libgda-sybase.so
 
 %files sybase-devel
 %defattr(-,root,root,-)
-%{_libdir}/pkgconfig/libgda-sybase-3.0.pc
+%{_libdir}/pkgconfig/libgda-sybase-4.0.pc
 %endif
 
 %if %{MDB}
 %files mdb
 %defattr(-,root,root,-)
-%{_libdir}/libgda-3.0/providers/libgda-mdb.so
+%{_libdir}/libgda-4.0/providers/libgda-mdb.so
 
 %files mdb-devel
 %defattr(-,root,root,-)
-%{_libdir}/pkgconfig/libgda-mdb-3.0.pc
+%{_libdir}/pkgconfig/libgda-mdb-4.0.pc
 %endif
 
 %if %{LDAP}
 %files ldap
 %defattr(-,root,root,-)
-%{_libdir}/libgda-3.0/providers/libgda-ldap.so
+%{_libdir}/libgda-4.0/providers/libgda-ldap.so
 
 %files ldap-devel
 %defattr(-,root,root,-)
-%{_libdir}/pkgconfig/libgda-ldap-3.0.pc
+%{_libdir}/pkgconfig/libgda-ldap-4.0.pc
 %endif
 
 %if %{XBASE}
 %files xbase
 %defattr(-,root,root)
-%{_libdir}/libgda-3.0/providers/libgda-xbase.so
+%{_libdir}/libgda-4.0/providers/libgda-xbase.so
 
 %files xbase-devel
 %defattr(-,root,root,-)
-%{_libdir}/pkgconfig/libgda-xbase-3.0.pc
+%{_libdir}/pkgconfig/libgda-xbase-4.0.pc
 %endif
 
 
 %changelog
+* Fri Jan 16 2009 Denis Leroy <denis at poolshark.org> - 1:3.99.8-1
+- Switch to 4.0 ABI
+- Update to upstream 3.99.8
+- Patch updates (upstreamed and ported)
+- Added JAVA package flag, currently disabled
+
 * Mon Oct 27 2008 Denis Leroy <denis at poolshark.org> - 1:3.1.2-6
 - Added patch to fix providers path on x86_64 (#468510)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libgda/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	25 Jan 2008 16:30:10 -0000	1.5
+++ sources	23 Jan 2009 10:56:57 -0000	1.6
@@ -1 +1 @@
-fe299d264ddeb7fbc36276f74f1abfdc  libgda-3.1.2.tar.bz2
+cbd6c0ccb6aba54a53a0b6d660e70d1e  libgda-3.99.8.tar.bz2


--- libgda-3.1.2-lib64.patch DELETED ---


--- libgda-3.1.2-new-freetds.patch DELETED ---



From denis at fedoraproject.org  Fri Jan 23 10:59:10 2009
From: denis at fedoraproject.org (Denis Leroy)
Date: Fri, 23 Jan 2009 10:59:10 +0000 (UTC)
Subject: rpms/compat-libgda/devel sources,1.4,1.5
Message-ID: <20090123105910.2B923700FE@cvs1.fedora.phx.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/compat-libgda/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1876

Added Files:
	sources 
Log Message:
Readding sources files


Index: sources
===================================================================
RCS file: sources
diff -N sources
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ sources	23 Jan 2009 10:58:39 -0000	1.5
@@ -0,0 +1 @@
+fe299d264ddeb7fbc36276f74f1abfdc  libgda-3.1.2.tar.bz2



From than at fedoraproject.org  Fri Jan 23 10:59:40 2009
From: than at fedoraproject.org (Than Ngo)
Date: Fri, 23 Jan 2009 10:59:40 +0000 (UTC)
Subject: rpms/PolicyKit-kde/F-10 PolicyKit-kde.spec,1.2,1.3 sources,1.2,1.3
Message-ID: <20090123105940.570B7700FE@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/PolicyKit-kde/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1948

Modified Files:
	PolicyKit-kde.spec sources 
Log Message:
4.2.0



Index: PolicyKit-kde.spec
===================================================================
RCS file: /cvs/extras/rpms/PolicyKit-kde/F-10/PolicyKit-kde.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- PolicyKit-kde.spec	10 Jan 2009 02:07:57 -0000	1.2
+++ PolicyKit-kde.spec	23 Jan 2009 10:59:10 -0000	1.3
@@ -1,16 +1,14 @@
 %define _develpackage 0
-%define _version 0.0
-%define _svndate 20081219svn
 
 Name: PolicyKit-kde
-Version: %{_version}
-Release: 0.1.%{_svndate}%{?dist}
+Version: 4.2.0
+Release: 1%{?dist}
 Summary: PolicyKit integration for the KDE desktop
 
 Group: System Environment/Libraries
 License: GPLv2+ and LGPLv2+
 URL: http://www.kde.org
-Source0: %{name}-%{_svndate}.tar.bz2
+Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/extragear/%{name}-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  kdelibs4-devel >= 4.1
@@ -73,5 +71,8 @@
 %endif
 
 %changelog
+* Fri Jan 23 2009 Than Ngo <than at redhat.com> - 4.2.0-1
+- 4.2.0
+
 * Thu Jan 08 2009 Than Ngo <than at redhat.com> - 0.0-0.1.20081219svn
 - initial version


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/PolicyKit-kde/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	9 Jan 2009 23:12:43 -0000	1.2
+++ sources	23 Jan 2009 10:59:10 -0000	1.3
@@ -1 +1 @@
-30ba8b723282ecea8c3ee471493f90c5  PolicyKit-kde-20081219svn.tar.bz2
+36fffd4b9e7d43bd2c07cc7c1ec18cb6  PolicyKit-kde-4.2.0.tar.bz2



From than at fedoraproject.org  Fri Jan 23 11:00:54 2009
From: than at fedoraproject.org (Than Ngo)
Date: Fri, 23 Jan 2009 11:00:54 +0000 (UTC)
Subject: rpms/PolicyKit-kde/F-9 PolicyKit-kde.spec,1.2,1.3 sources,1.2,1.3
Message-ID: <20090123110054.889C5179D1E@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/PolicyKit-kde/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2292

Modified Files:
	PolicyKit-kde.spec sources 
Log Message:
4.2.0



Index: PolicyKit-kde.spec
===================================================================
RCS file: /cvs/extras/rpms/PolicyKit-kde/F-9/PolicyKit-kde.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- PolicyKit-kde.spec	10 Jan 2009 02:07:58 -0000	1.2
+++ PolicyKit-kde.spec	23 Jan 2009 11:00:24 -0000	1.3
@@ -1,16 +1,14 @@
 %define _develpackage 0
-%define _version 0.0
-%define _svndate 20081219svn
 
 Name: PolicyKit-kde
-Version: %{_version}
-Release: 0.1.%{_svndate}%{?dist}
+Version: 4.2.0
+Release: 1%{?dist}
 Summary: PolicyKit integration for the KDE desktop
 
 Group: System Environment/Libraries
 License: GPLv2+ and LGPLv2+
 URL: http://www.kde.org
-Source0: %{name}-%{_svndate}.tar.bz2
+Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/extragear/%{name}-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  kdelibs4-devel >= 4.1
@@ -73,5 +71,8 @@
 %endif
 
 %changelog
+* Fri Jan 23 2009 Than Ngo <than at redhat.com> - 4.2.0-1
+- 4.2.0
+
 * Thu Jan 08 2009 Than Ngo <than at redhat.com> - 0.0-0.1.20081219svn
 - initial version


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/PolicyKit-kde/F-9/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	9 Jan 2009 23:14:23 -0000	1.2
+++ sources	23 Jan 2009 11:00:24 -0000	1.3
@@ -1 +1 @@
-30ba8b723282ecea8c3ee471493f90c5  PolicyKit-kde-20081219svn.tar.bz2
+36fffd4b9e7d43bd2c07cc7c1ec18cb6  PolicyKit-kde-4.2.0.tar.bz2



From denis at fedoraproject.org  Fri Jan 23 11:01:14 2009
From: denis at fedoraproject.org (Denis Leroy)
Date: Fri, 23 Jan 2009 11:01:14 +0000 (UTC)
Subject: rpms/qof/devel qof.spec,1.22,1.23
Message-ID: <20090123110114.F3C69179D1E@cvs1.fedora.phx.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/qof/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2353

Modified Files:
	qof.spec 
Log Message:
Rebuild against compat-libgda, as libgda moved on to 4.0 API


Index: qof.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qof/devel/qof.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- qof.spec	2 Jun 2008 15:49:23 -0000	1.22
+++ qof.spec	23 Jan 2009 11:00:44 -0000	1.23
@@ -1,6 +1,6 @@
 Name:           qof
 Version:        0.7.5
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Query engine library for C objects
 
 Group:          System Environment/Libraries
@@ -14,7 +14,7 @@
 
 BuildRequires: libxml2-devel
 BuildRequires: glib2-devel
-BuildRequires: libgda-devel
+BuildRequires: compat-libgda-devel
 BuildRequires: intltool
 BuildRequires: gettext
 # qof doesn't ship with pre-built documentation
@@ -117,6 +117,9 @@
 %doc html
 
 %changelog
+* Thu Jan 22 2009 Denis Leroy <denis at poolshark.org> - 0.7.5-4
+- Rebuild against compat-libgda, as libgda moved on to 4.0 API
+
 * Mon Jun 02 2008 Jon Ciesla <limb at jcomserv.net> - 0.7.5-3
 - Fix %%check FTBTS error.  Bug promised, not yet filed.
 



From than at fedoraproject.org  Fri Jan 23 11:03:16 2009
From: than at fedoraproject.org (Than Ngo)
Date: Fri, 23 Jan 2009 11:03:16 +0000 (UTC)
Subject: rpms/PolicyKit-kde/F-9 PolicyKit-kde.spec,1.3,1.4
Message-ID: <20090123110316.855AA700FE@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/PolicyKit-kde/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2777

Modified Files:
	PolicyKit-kde.spec 
Log Message:
4.2.0



Index: PolicyKit-kde.spec
===================================================================
RCS file: /cvs/extras/rpms/PolicyKit-kde/F-9/PolicyKit-kde.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- PolicyKit-kde.spec	23 Jan 2009 11:00:24 -0000	1.3
+++ PolicyKit-kde.spec	23 Jan 2009 11:02:46 -0000	1.4
@@ -28,7 +28,7 @@
 Headers and libraries for PolicyKit-kde
 
 %prep
-%setup -qn %{name}
+%setup -q
 
 %build
 mkdir -p %{_target_platform}



From than at fedoraproject.org  Fri Jan 23 11:05:02 2009
From: than at fedoraproject.org (Than Ngo)
Date: Fri, 23 Jan 2009 11:05:02 +0000 (UTC)
Subject: rpms/PolicyKit-kde/F-10 PolicyKit-kde.spec,1.3,1.4
Message-ID: <20090123110502.921BE179D1E@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/PolicyKit-kde/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3121

Modified Files:
	PolicyKit-kde.spec 
Log Message:
4.2.0



Index: PolicyKit-kde.spec
===================================================================
RCS file: /cvs/extras/rpms/PolicyKit-kde/F-10/PolicyKit-kde.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- PolicyKit-kde.spec	23 Jan 2009 10:59:10 -0000	1.3
+++ PolicyKit-kde.spec	23 Jan 2009 11:04:32 -0000	1.4
@@ -28,7 +28,7 @@
 Headers and libraries for PolicyKit-kde
 
 %prep
-%setup -qn %{name}
+%setup -q
 
 %build
 mkdir -p %{_target_platform}



From than at fedoraproject.org  Fri Jan 23 11:06:32 2009
From: than at fedoraproject.org (Than Ngo)
Date: Fri, 23 Jan 2009 11:06:32 +0000 (UTC)
Subject: rpms/PolicyKit-kde/devel PolicyKit-kde.spec,1.3,1.4
Message-ID: <20090123110632.AE63F700FE@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/PolicyKit-kde/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3485

Modified Files:
	PolicyKit-kde.spec 
Log Message:
4.2.0



Index: PolicyKit-kde.spec
===================================================================
RCS file: /cvs/extras/rpms/PolicyKit-kde/devel/PolicyKit-kde.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- PolicyKit-kde.spec	23 Jan 2009 10:56:33 -0000	1.3
+++ PolicyKit-kde.spec	23 Jan 2009 11:06:02 -0000	1.4
@@ -28,7 +28,7 @@
 Headers and libraries for PolicyKit-kde
 
 %prep
-%setup -qn %{name}
+%setup -q
 
 %build
 mkdir -p %{_target_platform}



From denis at fedoraproject.org  Fri Jan 23 11:06:59 2009
From: denis at fedoraproject.org (Denis Leroy)
Date: Fri, 23 Jan 2009 11:06:59 +0000 (UTC)
Subject: rpms/libgdamm/devel .cvsignore, 1.7, 1.8 libgdamm.spec, 1.11,
	1.12 sources, 1.7, 1.8
Message-ID: <20090123110659.02FB3179D1E@cvs1.fedora.phx.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/libgdamm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3583

Modified Files:
	.cvsignore libgdamm.spec sources 
Log Message:
Update to upstream 3.99.8 (4.0 API). Pruned down devel package Rs


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libgdamm/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	3 Oct 2008 07:41:23 -0000	1.7
+++ .cvsignore	23 Jan 2009 11:06:28 -0000	1.8
@@ -1 +1 @@
-libgdamm-3.0.1.tar.bz2
+libgdamm-3.99.8.tar.bz2


Index: libgdamm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libgdamm/devel/libgdamm.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- libgdamm.spec	20 Nov 2008 23:13:09 -0000	1.11
+++ libgdamm.spec	23 Jan 2009 11:06:28 -0000	1.12
@@ -1,13 +1,14 @@
 Name:		libgdamm
-Version:	3.0.1
-Release:	2%{?dist}
+Version:	3.99.8
+Release:	1%{?dist}
 Summary:	C++ wrappers for libgda
 Group:		System Environment/Libraries
 License:	LGPLv2+
 URL:		http://www.gtkmm.org/
-Source0:	http://ftp.gnome.org/pub/GNOME/sources/libgdamm/3.0/%{name}-%{version}.tar.bz2
+Source0:	http://ftp.gnome.org/pub/GNOME/sources/libgdamm/3.99/%{name}-%{version}.tar.bz2
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:	glibmm24-devel, libgda-devel
+BuildRequires:	glibmm24-devel >= 2.12.8
+BuildRequires:  libgda-devel >= 3.99.0
 
 %description
 C++ wrappers for libgda. libgdamm is part of a set of powerful
@@ -18,7 +19,7 @@
 Summary:	Headers/Libraries for developing programs that use libgdamm
 Group:		Development/Libraries
 Requires:       %{name} = %{version}-%{release}
-Requires:	glibmm24-devel, libgda-devel, pkgconfig
+Requires:	pkgconfig
 
 %description devel
 This package contains headers and libraries that programmers will need 
@@ -50,12 +51,15 @@
 
 %files devel
 %defattr(-, root, root, -)
-%{_includedir}/libgdamm-3.0
+%{_includedir}/libgdamm-4.0
 %{_libdir}/*.so
-%{_libdir}/libgdamm-3.0
+%{_libdir}/libgdamm-4.0
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Wed Jan 21 2009 Denis Leroy <denis at poolshark.org> - 3.99.8-1
+- Update to upstream 3.99.8 (4.0 API)
+
 * Thu Nov 20 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 3.0.1-2
 - fix source url
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libgdamm/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	3 Oct 2008 07:41:23 -0000	1.7
+++ sources	23 Jan 2009 11:06:28 -0000	1.8
@@ -1 +1 @@
-63583ec970e643962474401400e19994  libgdamm-3.0.1.tar.bz2
+9797139252b08e4802cd34800c53195e  libgdamm-3.99.8.tar.bz2



From denis at fedoraproject.org  Fri Jan 23 11:18:40 2009
From: denis at fedoraproject.org (Denis Leroy)
Date: Fri, 23 Jan 2009 11:18:40 +0000 (UTC)
Subject: rpms/gnome-python2-extras/devel gnome-python2-extras.spec, 1.44,
	1.45
Message-ID: <20090123111840.7F427179D1E@cvs1.fedora.phx.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/gnome-python2-extras/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6342

Modified Files:
	gnome-python2-extras.spec 
Log Message:
Fixed Source URL. Switch to libgda 4.0 API


Index: gnome-python2-extras.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-python2-extras/devel/gnome-python2-extras.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- gnome-python2-extras.spec	22 Jan 2009 18:14:55 -0000	1.44
+++ gnome-python2-extras.spec	23 Jan 2009 11:18:09 -0000	1.45
@@ -17,10 +17,10 @@
 Release: 1%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: Development/Languages
-Summary: The sources for additional. PyGNOME Python extension modules.
+Summary: The sources for additional. PyGNOME Python extension modules
 URL: http://www.pygtk.org/
-BuildRoot: %{_tmppath}/%{name}-%{version}-root
-Source: gnome-python-extras-%{version}.tar.bz2
+Source0: ftp://ftp.gnome.org/pub/GNOME/sources/gnome-python-extras/2.25/gnome-python-extras-%{version}.tar.bz2
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Obsoletes: gnome-python2-gda <= 2.14.3-1
 Obsoletes: gnome-python2-gda-devel <= 2.14.3-1
@@ -124,8 +124,8 @@
 %setup -q -n gnome-python-extras-%{version}
 
 %build
-%configure --with-gtkmozembed=mozilla
-make
+%configure --with-gtkmozembed=mozilla --enable-docs
+make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -157,7 +157,7 @@
 %files -n gnome-python2-gtkmozembed
 %defattr(-,root,root,-)
 %{python_sitearch}/gtk-2.0/gtkmozembed.so
-#%{_datadir}/gtk-doc/html/gtkmozembed
+%{_datadir}/gtk-doc/html/pygtkmozembed
 
 %files -n gnome-python2-gtkspell
 %defattr(-,root,root,-)
@@ -176,10 +176,14 @@
 
 %files -n gnome-python2-gda-devel
 %defattr(-,root,root,-)
-%{_includedir}/pygda-3.0/
-%{_libdir}/pkgconfig/pygda-3.0.pc
+%{_includedir}/pygda-4.0/
+%{_libdir}/pkgconfig/pygda-4.0.pc
 
 %changelog
+* Fri Jan 23 2009 Denis Leroy <denis at poolshark.org> - 2.25.1-1
+- Fixed Source URL
+- Switch to libgda 4.0 API
+
 * Wed Jan 21 2009 Matthew Barnes <mbarnes at redhat.com> - 2.25.1-1
 - Update to 2.25.1
 - Remove the xulrunner patches (fixed upstream).



From denis at fedoraproject.org  Fri Jan 23 11:21:06 2009
From: denis at fedoraproject.org (Denis Leroy)
Date: Fri, 23 Jan 2009 11:21:06 +0000 (UTC)
Subject: rpms/gnome-python2-extras/devel
	gnome-python-extras-2.19.1-no-gdl-icons.patch, 1.1,
	NONE gnome-python-extras-2.19.1-pkg-config.patch, 1.1,
	NONE gnome-python-extras-2.19.1-xulrunner.patch, 1.1, NONE
Message-ID: <20090123112106.C99D6179D1E@cvs1.fedora.phx.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/gnome-python2-extras/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6899

Removed Files:
	gnome-python-extras-2.19.1-no-gdl-icons.patch 
	gnome-python-extras-2.19.1-pkg-config.patch 
	gnome-python-extras-2.19.1-xulrunner.patch 
Log Message:
Removed obsoletes patches


--- gnome-python-extras-2.19.1-no-gdl-icons.patch DELETED ---


--- gnome-python-extras-2.19.1-pkg-config.patch DELETED ---


--- gnome-python-extras-2.19.1-xulrunner.patch DELETED ---



From rjones at fedoraproject.org  Fri Jan 23 11:21:20 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Fri, 23 Jan 2009 11:21:20 +0000 (UTC)
Subject: rpms/mingw32-gettext/devel mingw32-gettext.spec,1.1,1.2
Message-ID: <20090123112120.44DC9179D1E@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/mingw32-gettext/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6847

Modified Files:
	mingw32-gettext.spec 
Log Message:
Use find_lang macro.


Index: mingw32-gettext.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-gettext/devel/mingw32-gettext.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mingw32-gettext.spec	17 Jan 2009 11:38:26 -0000	1.1
+++ mingw32-gettext.spec	23 Jan 2009 11:20:49 -0000	1.2
@@ -6,7 +6,7 @@
 
 Name:      mingw32-gettext
 Version:   0.17
-Release:   7%{?dist}
+Release:   8%{?dist}
 Summary:   GNU libraries and utilities for producing multi-lingual messages
 
 License:   GPLv2+ and LGPLv2+
@@ -68,12 +68,14 @@
 rm -rf $RPM_BUILD_ROOT%{_mingw32_mandir}/man1/
 rm -rf $RPM_BUILD_ROOT%{_mingw32_mandir}/man3/
 
+%find_lang %{name} --all-name
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 
-%files
+%files -f %{name}.lang
 %defattr(-,root,root)
 %doc COPYING
 %{_mingw32_bindir}/autopoint
@@ -121,11 +123,11 @@
 %{_mingw32_datadir}/info/autosprintf.info
 %{_mingw32_datadir}/info/gettext.info
 
-%{_mingw32_datadir}/locale/*/LC_MESSAGES/gettext-tools.mo
-%{_mingw32_datadir}/locale/*/LC_MESSAGES/gettext-runtime.mo
-
 
 %changelog
+* Fri Jan 23 2009 Richard W.M. Jones <rjones at redhat.com> - 0.17-8
+- Use find_lang macro.
+
 * Fri Jan 16 2009 Richard W.M. Jones <rjones at redhat.com> - 0.17-7
 - Remove the manpages - already available in base Fedora gettext-devel.
 - Use _smp_mflags for build.



From hadess at fedoraproject.org  Fri Jan 23 11:21:38 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Fri, 23 Jan 2009 11:21:38 +0000 (UTC)
Subject: rpms/control-center/devel gcc-pam-fprintd-avail.patch, NONE,
	1.1 control-center.spec, 1.428, 1.429
Message-ID: <20090123112138.C1BEF700FE@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/control-center/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6766

Modified Files:
	control-center.spec 
Added Files:
	gcc-pam-fprintd-avail.patch 
Log Message:
* Fri Jan 23 2009 - Bastien Nocera <bnocera at redhat.com> - 2.25.3-5
- Don't show enrollment for users if pam_fprintd isn't enabled in
  authconfig (#475804)


gcc-pam-fprintd-avail.patch:

--- NEW FILE gcc-pam-fprintd-avail.patch ---
Index: capplets/about-me/gnome-about-me-fingerprint.c
===================================================================
--- capplets/about-me/gnome-about-me-fingerprint.c	(revision 9203)
+++ capplets/about-me/gnome-about-me-fingerprint.c	(working copy)
@@ -92,6 +92,38 @@
 	return device;
 }
 
+static gboolean
+pam_fprintd_available (void)
+{
+	char *contents, **lines;
+	gboolean ret;
+	guint i;
+
+	if (g_file_get_contents ("/etc/sysconfig/authconfig", &contents, NULL, NULL) == FALSE)
+		return TRUE;
+
+	lines = g_strsplit (contents, "\n", -1);
+	g_free (contents);
+
+	ret = FALSE;
+
+	for (i = 0; lines[i] ; i++) {
+		if (g_str_has_prefix (lines[i], "USEFPRINTD=") != FALSE) {
+			char *value;
+
+			value = lines[i] + strlen ("USEFPRINTD=");
+			if (g_strcmp0 (value, "yes") == 0) {
+				ret = TRUE;
+				break;
+			}
+		}
+	}
+
+	g_strfreev (lines);
+
+	return ret;
+}
+
 static const char *
 get_reason_for_error (const char *dbus_error)
 {
@@ -146,29 +178,24 @@
 	gtk_widget_set_no_show_all (enable, TRUE);
 	gtk_widget_set_no_show_all (disable, TRUE);
 
+	if (pam_fprintd_available () == FALSE)
+		goto bail;
+
 	if (manager == NULL) {
 		create_manager ();
-		if (manager == NULL) {
-			gtk_widget_hide (enable);
-			gtk_widget_hide (disable);
-			return;
-		}
+		if (manager == NULL)
+			goto bail;
 	}
 
 	device = get_first_device ();
-	if (device == NULL) {
-		gtk_widget_hide (enable);
-		gtk_widget_hide (disable);
-		return;
-	}
+	if (device == NULL)
+		goto bail;
 
 	if (!dbus_g_proxy_call (device, "ListEnrolledFingers", &error, G_TYPE_STRING, "", G_TYPE_INVALID,
 				G_TYPE_STRV, &fingers, G_TYPE_INVALID)) {
 		if (dbus_g_error_has_name (error, "net.reactivated.Fprint.Error.NoEnrolledPrints") == FALSE) {
-			gtk_widget_hide (enable);
-			gtk_widget_hide (disable);
 			g_object_unref (device);
-			return;
+			goto bail;
 		}
 		fingers = NULL;
 	}
@@ -185,6 +212,11 @@
 
 	g_strfreev (fingers);
 	g_object_unref (device);
+
+	return;
+bail:
+	gtk_widget_hide (enable);
+	gtk_widget_hide (disable);
 }
 
 static void


Index: control-center.spec
===================================================================
RCS file: /cvs/pkgs/rpms/control-center/devel/control-center.spec,v
retrieving revision 1.428
retrieving revision 1.429
diff -u -r1.428 -r1.429
--- control-center.spec	20 Jan 2009 11:20:35 -0000	1.428
+++ control-center.spec	23 Jan 2009 11:21:08 -0000	1.429
@@ -22,7 +22,7 @@
 Summary: Utilities to configure the GNOME desktop
 Name: control-center
 Version: 2.25.3
-Release: 4%{?dist}
+Release: 5%{?dist}
 Epoch: 1
 License: GPLv2+ and GFDL
 Group: User Interface/Desktops
@@ -38,6 +38,9 @@
 # http://bugzilla.gnome.org/show_bug.cgi?id=568408
 Patch9: gcc-set-https-handler.patch
 
+# https://bugzilla.redhat.com/show_bug.cgi?id=475804
+Patch10: gcc-pam-fprintd-avail.patch
+
 # http://bugzilla.gnome.org/show_bug.cgi?id=545075 
 Patch22: slab-icon-names.patch
 
@@ -169,6 +172,7 @@
 %patch3 -p1 -b .no-gnome-common
 %patch8 -p1 -b .gtkmarshal
 %patch9 -p0 -b .set-https
+%patch10 -p0 -b .pam-fprintd
 %patch22 -p0 -b .slab-icon-names
 %patch25 -p1 -b .ta-schema
 %patch30 -p1 -b .default-layout-toggle
@@ -348,6 +352,10 @@
 %dir %{_datadir}/gnome-control-center/keybindings
 
 %changelog
+* Fri Jan 23 2009 - Bastien Nocera <bnocera at redhat.com> - 2.25.3-5
+- Don't show enrollment for users if pam_fprintd isn't enabled in
+  authconfig (#475804)
+
 * Tue Jan 20 2009 - Bastien Nocera <bnocera at redhat.com> - 2.25.3-4
 - Set HTTPS handler correctly when changing default browser (#480707)
 



From than at fedoraproject.org  Fri Jan 23 11:27:26 2009
From: than at fedoraproject.org (Than Ngo)
Date: Fri, 23 Jan 2009 11:27:26 +0000 (UTC)
Subject: rpms/PolicyKit-kde/devel PolicyKit-kde.spec,1.4,1.5
Message-ID: <20090123112726.1E166700FE@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/PolicyKit-kde/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7904

Modified Files:
	PolicyKit-kde.spec 
Log Message:
add BR gettext



Index: PolicyKit-kde.spec
===================================================================
RCS file: /cvs/extras/rpms/PolicyKit-kde/devel/PolicyKit-kde.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- PolicyKit-kde.spec	23 Jan 2009 11:06:02 -0000	1.4
+++ PolicyKit-kde.spec	23 Jan 2009 11:26:55 -0000	1.5
@@ -14,6 +14,7 @@
 BuildRequires:  kdelibs4-devel >= 4.1
 BuildRequires:  PolicyKit-devel >= 0.8
 BuildRequires:  cmake
+BuildRequires:  gettext
 
 %description
 This package provides a PolicyKit Authentication Frontend for KDE



From denis at fedoraproject.org  Fri Jan 23 11:27:40 2009
From: denis at fedoraproject.org (Denis Leroy)
Date: Fri, 23 Jan 2009 11:27:40 +0000 (UTC)
Subject: rpms/libgnomedb/devel .cvsignore, 1.5, 1.6 libgnomedb.spec, 1.31,
	1.32 sources, 1.5, 1.6
Message-ID: <20090123112740.73D53700FE@cvs1.fedora.phx.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/libgnomedb/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7984

Modified Files:
	.cvsignore libgnomedb.spec sources 
Log Message:
- Update to upstream 3.99.7 (4.0 API)
- Updated list of BRs
- Pruned down devel package Rs



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libgnomedb/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	20 Oct 2008 09:25:28 -0000	1.5
+++ .cvsignore	23 Jan 2009 11:27:10 -0000	1.6
@@ -1 +1 @@
-libgnomedb-3.1.2.tar.bz2
+libgnomedb-3.99.7.tar.bz2


Index: libgnomedb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libgnomedb/devel/libgnomedb.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- libgnomedb.spec	20 Oct 2008 09:25:28 -0000	1.31
+++ libgnomedb.spec	23 Jan 2009 11:27:10 -0000	1.32
@@ -1,15 +1,23 @@
 Name:            libgnomedb
 Epoch:           1
-Version:         3.1.2
+Version:         3.99.7
 Release:         1%{?dist}
 Summary:         Library for writing gnome database programs
 Group:           System Environment/Libraries
 License:         LGPLv2+
 URL:             http://www.gnome-db.org/
-Source:          http://ftp.gnome.org/pub/GNOME/sources/%{name}/3.0/%{name}-%{version}.tar.bz2
+Source:          http://ftp.gnome.org/pub/GNOME/sources/%{name}/3.99/%{name}-%{version}.tar.bz2
 BuildRoot:       %{_tmppath}/%{name}-%{version}-root
-BuildRequires:   libgnomeui-devel libgda-devel openssl-devel
-BuildRequires:   gtksourceview-devel
+BuildRequires:   gtk2-devel >= 2.10.0
+BuildRequires:   libgda-devel >= 3.99.7
+BuildRequires:   GConf2-devel
+BuildRequires:   goocanvas-devel >= 0.9
+BuildRequires:   libglade2-devel
+BuildRequires:   openssl-devel
+BuildRequires:   gtksourceview2-devel
+BuildRequires:   evolution-data-server-devel
+BuildRequires:   graphviz-devel
+BuildRequires:   iso-codes-devel
 BuildRequires:   gettext scrollkeeper perl(XML::Parser) desktop-file-utils
 Requires:        scrollkeeper hicolor-icon-theme
 Requires(pre):   GConf2
@@ -29,7 +37,7 @@
 Summary:         Development libraries and header files for libgnomedb
 Group:           Development/Libraries
 Requires:        %{name} = %{epoch}:%{version}-%{release}
-Requires:        pkgconfig libgnomeui-devel libgda-devel
+Requires:        pkgconfig
 Requires(post):  scrollkeeper
 Requires(postun): scrollkeeper
 
@@ -56,33 +64,33 @@
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT INSTALL="%{__install} -p" \
   LIBGNOMEDB_DTDDIR=%{_datadir}/libgnomedb/dtd
-%find_lang libgnomedb-3.0
+%find_lang libgnomedb-4.0
 
 # below is the desktop file and icon stuff.
 desktop-file-install --dir $RPM_BUILD_ROOT%{_datadir}/applications \
   --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
+  $RPM_BUILD_ROOT%{_datadir}/applications/database-properties-4.0.desktop
 
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps
-mv $RPM_BUILD_ROOT%{_datadir}/pixmaps/libgnomedb-3.0/gnome-db.png \
-  $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps
+mv $RPM_BUILD_ROOT%{_datadir}/pixmaps/gnome-db-4.0.png \
+  $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/gnome-db.png
 
 # remove unpackaged files
 rm $RPM_BUILD_ROOT/%{_libdir}/*.la
-rm $RPM_BUILD_ROOT/%{_libdir}/gnome-db-3.0/plugins/*.la
+rm $RPM_BUILD_ROOT/%{_libdir}/gnome-db-4.0/plugins/*.la
 rm $RPM_BUILD_ROOT/%{_libdir}/libglade/2.0/*.la
 
 # put the demo in -devel %%doc
-mv $RPM_BUILD_ROOT/%{_datadir}/gnome-db-3.0/demo .
+mv $RPM_BUILD_ROOT/%{_datadir}/gnome-db-4.0/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-3.0.schemas >/dev/null || :
+      %{_sysconfdir}/gconf/schemas/libgnomedb-4.0.schemas >/dev/null || :
 fi
 
 
@@ -90,7 +98,7 @@
 /sbin/ldconfig
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
 gconftool-2 --makefile-install-rule \
-  %{_sysconfdir}/gconf/schemas/libgnomedb-3.0.schemas > /dev/null || :
+  %{_sysconfdir}/gconf/schemas/libgnomedb-4.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 || :
@@ -101,7 +109,7 @@
 if [ "$1" -eq 0 ]; then
     export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
     gconftool-2 --makefile-uninstall-rule \
-      %{_sysconfdir}/gconf/schemas/libgnomedb-3.0.schemas > /dev/null || :
+      %{_sysconfdir}/gconf/schemas/libgnomedb-4.0.schemas > /dev/null || :
 fi
 
 
@@ -125,32 +133,36 @@
 rm -rf $RPM_BUILD_ROOT
 
 
-%files -f libgnomedb-3.0.lang
+%files -f libgnomedb-4.0.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog NEWS
 %{_bindir}/*
-%{_datadir}/pixmaps/libgnomedb-3.0
-%{_datadir}/pixmaps/gnome-db-3.0
-%{_datadir}/applications/fedora-database-properties-3.0.desktop
+%{_datadir}/pixmaps/gnome-db-4.0
+%{_datadir}/applications/fedora-database-properties-4.0.desktop
 %{_datadir}/icons/hicolor/48x48/apps/gnome-db.png
-%{_datadir}/gnome-db-3.0
+%{_datadir}/gnome-db-4.0
 %{_libdir}/*.so.*
-%dir %{_libdir}/gnome-db-3.0
-%{_libdir}/gnome-db-3.0/plugins
+%dir %{_libdir}/gnome-db-4.0
+%{_libdir}/gnome-db-4.0/plugins
 %{_libdir}/libglade/2.0/*
 %config(noreplace) %{_sysconfdir}/gconf/schemas/*
 
 %files devel
 %defattr(-,root,root,-)
 %doc demo
-%{_includedir}/libgnomedb-3.0
+%{_includedir}/libgnomedb-4.0
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/*.pc
 %{_datadir}/omf/%{name}
-%{_datadir}/gtk-doc/html/libgnomedb-3.0
+%{_datadir}/gtk-doc/html/libgnomedb-4.0
 
 
 %changelog
+* Wed Jan 21 2009 Denis Leroy <denis at poolshark.org> - 1:3.99.7-1
+- Update to upstream 3.99.7 (4.0 API)
+- Updated list of BRs
+- Pruned down devel package Rs
+
 * Mon Oct 20 2008 Denis Leroy <denis at poolshark.org> - 1:3.1.2-1
 - Update to upstream 3.1.2
 - 64-bit patch upstreamed


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libgnomedb/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	20 Oct 2008 09:25:28 -0000	1.5
+++ sources	23 Jan 2009 11:27:10 -0000	1.6
@@ -1 +1 @@
-9896bd66451c3f1e2bdd1cd79d524348  libgnomedb-3.1.2.tar.bz2
+5d6c77c6c156230ad624cdae190c9d52  libgnomedb-3.99.7.tar.bz2



From than at fedoraproject.org  Fri Jan 23 11:28:56 2009
From: than at fedoraproject.org (Than Ngo)
Date: Fri, 23 Jan 2009 11:28:56 +0000 (UTC)
Subject: rpms/PolicyKit-kde/F-10 PolicyKit-kde.spec,1.4,1.5
Message-ID: <20090123112856.3EDAD700FE@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/PolicyKit-kde/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8192

Modified Files:
	PolicyKit-kde.spec 
Log Message:
add BR gettext



Index: PolicyKit-kde.spec
===================================================================
RCS file: /cvs/extras/rpms/PolicyKit-kde/F-10/PolicyKit-kde.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- PolicyKit-kde.spec	23 Jan 2009 11:04:32 -0000	1.4
+++ PolicyKit-kde.spec	23 Jan 2009 11:28:25 -0000	1.5
@@ -14,6 +14,7 @@
 BuildRequires:  kdelibs4-devel >= 4.1
 BuildRequires:  PolicyKit-devel >= 0.8
 BuildRequires:  cmake
+BuildRequires:  gettext
 
 %description
 This package provides a PolicyKit Authentication Frontend for KDE



From denis at fedoraproject.org  Fri Jan 23 11:30:20 2009
From: denis at fedoraproject.org (Denis Leroy)
Date: Fri, 23 Jan 2009 11:30:20 +0000 (UTC)
Subject: rpms/glom/devel .cvsignore, 1.22, 1.23 glom.spec, 1.28, 1.29 sources,
	1.22, 1.23
Message-ID: <20090123113020.96F31700FE@cvs1.fedora.phx.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/glom/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8596

Modified Files:
	.cvsignore glom.spec sources 
Log Message:
- Update to upstream 1.9.0
- Updated list of BRs



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/glom/devel/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- .cvsignore	18 Jun 2008 07:40:40 -0000	1.22
+++ .cvsignore	23 Jan 2009 11:29:50 -0000	1.23
@@ -1 +1 @@
-glom-1.6.17.tar.bz2
+glom-1.9.0.tar.bz2


Index: glom.spec
===================================================================
RCS file: /cvs/pkgs/rpms/glom/devel/glom.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- glom.spec	30 Nov 2008 00:53:26 -0000	1.28
+++ glom.spec	23 Jan 2009 11:29:50 -0000	1.29
@@ -1,9 +1,9 @@
-%define major_version  1.6
-%define minor_version  17
+%define major_version  1.9
+%define minor_version  0
 
 Name:           glom
 Version:        %{major_version}.%{minor_version}
-Release:        3%{?dist}
+Release:        1%{?dist}
 Summary:        Easy-to-use database designer and user interface
 
 Group:          Applications/Databases
@@ -12,25 +12,26 @@
 Source0:        http://ftp.gnome.org/pub/GNOME/sources/glom/%{major_version}/%{name}-%{major_version}.%{minor_version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  bakery-devel >= 2.4.3
+BuildRequires:  bakery-devel >= 2.6.0
 BuildRequires:  desktop-file-utils gettext-devel intltool
-BuildRequires:  libgdamm-devel >= 2.9.81
+BuildRequires:  libgdamm-devel >= 3.99.8
 BuildRequires:  libxml++-devel >= 2.18.1
 BuildRequires:  python-devel
-BuildRequires:  gnome-python2-gda-devel
+BuildRequires:  gnome-python2-gda-devel >= 2.25.0
 BuildRequires:  gnome-vfsmm26-devel >= 2.11.1
-BuildRequires:  libgnome-devel >= 2.6.0
+BuildRequires:  gtkmm24-devel >= 2.10
 BuildRequires:  libxslt-devel >= 1.1.10
 BuildRequires:  pygtk2-devel >= 2.6
 BuildRequires:  iso-codes-devel
 BuildRequires:  gnome-doc-utils
 BuildRequires:  scrollkeeper
-BuildRequires:  libgtksourceviewmm-devel
-BuildRequires:  libgda-devel >= 3.0.2
+BuildRequires:  gtksourceviewmm-devel >= 2.0.0
+BuildRequires:  libgda-devel >= 3.99.8
 BuildRequires:  postgresql-server
-BuildRequires:	libgda-postgres-devel
-BuildRequires:  avahi-glib-devel
-BuildRequires:  goocanvas-devel
+BuildRequires:  libgda-postgres-devel
+BuildRequires:  avahi-ui-devel
+BuildRequires:  goocanvasmm-devel >= 0.13.0
+BuildRequires:  libepc-devel
 
 Requires:       postgresql-server
 Requires:       libgda-postgres
@@ -63,7 +64,6 @@
         --disable-static \
         --disable-update-mime-database \
         --disable-scrollkeeper \
-        --disable-rpath \
         --with-postgres-utils=/usr/bin
 make %{?_smp_mflags}
 
@@ -124,6 +124,10 @@
 
 
 %changelog
+* Thu Jan 22 2009 Denis Leroy <denis at poolshark.org> - 1.9.0-1
+- Update to upstream 1.9.0
+- Updated list of BRs
+
 * Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 1.6.17-3
 - Fix locations for Python 2.6
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/glom/devel/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- sources	18 Jun 2008 07:40:40 -0000	1.22
+++ sources	23 Jan 2009 11:29:50 -0000	1.23
@@ -1 +1 @@
-5629e1db63420a7afacfd0e110d7a1dc  glom-1.6.17.tar.bz2
+1c36d4fad63d834c9a163c80f515944f  glom-1.9.0.tar.bz2



From than at fedoraproject.org  Fri Jan 23 11:30:42 2009
From: than at fedoraproject.org (Than Ngo)
Date: Fri, 23 Jan 2009 11:30:42 +0000 (UTC)
Subject: rpms/PolicyKit-kde/F-9 PolicyKit-kde.spec,1.4,1.5
Message-ID: <20090123113042.19998700FE@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/PolicyKit-kde/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8632

Modified Files:
	PolicyKit-kde.spec 
Log Message:
add BR gettext



Index: PolicyKit-kde.spec
===================================================================
RCS file: /cvs/extras/rpms/PolicyKit-kde/F-9/PolicyKit-kde.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- PolicyKit-kde.spec	23 Jan 2009 11:02:46 -0000	1.4
+++ PolicyKit-kde.spec	23 Jan 2009 11:30:11 -0000	1.5
@@ -14,6 +14,7 @@
 BuildRequires:  kdelibs4-devel >= 4.1
 BuildRequires:  PolicyKit-devel >= 0.8
 BuildRequires:  cmake
+BuildRequires:  gettext
 
 %description
 This package provides a PolicyKit Authentication Frontend for KDE



From allisson at fedoraproject.org  Fri Jan 23 11:35:31 2009
From: allisson at fedoraproject.org (Allisson Azevedo)
Date: Fri, 23 Jan 2009 11:35:31 +0000 (UTC)
Subject: rpms/amora/devel amora.spec,1.4,1.5 import.log,1.1,1.2
Message-ID: <20090123113531.A7234700FE@cvs1.fedora.phx.redhat.com>

Author: allisson

Update of /cvs/pkgs/rpms/amora/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9489/devel

Modified Files:
	amora.spec import.log 
Log Message:

- Rebuild



Index: amora.spec
===================================================================
RCS file: /cvs/pkgs/rpms/amora/devel/amora.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- amora.spec	11 Sep 2008 14:23:56 -0000	1.4
+++ amora.spec	23 Jan 2009 11:35:01 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           amora
 Version:        1.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A mobile remote assistant
 
 Group:          Applications/Communications
@@ -50,6 +50,10 @@
 %{_mandir}/man8/amorad.8.gz
 
 %changelog
+
+* Fri Jan 23 2009 Allisson Azevedo <allisson at gmail.com> 1.1-3
+- Rebuild
+
 * Thu Sep 11 2008 - Bastien Nocera <bnocera at redhat.com> 1.1-2
 - Rebuild
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/amora/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	6 Sep 2008 17:27:27 -0000	1.1
+++ import.log	23 Jan 2009 11:35:01 -0000	1.2
@@ -1 +1,2 @@
 amora-1_1-1_fc9:HEAD:amora-1.1-1.fc9.src.rpm:1220722039
+amora-1_1-3_fc10:HEAD:amora-1.1-3.fc10.src.rpm:1232710340



From denis at fedoraproject.org  Fri Jan 23 11:38:58 2009
From: denis at fedoraproject.org (Denis Leroy)
Date: Fri, 23 Jan 2009 11:38:58 +0000 (UTC)
Subject: rpms/bakery/devel bakery.spec,1.11,1.12
Message-ID: <20090123113858.1B224700FE@cvs1.fedora.phx.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/bakery/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9980

Modified Files:
	bakery.spec 
Log Message:
Removed autodetected devel package Rs


Index: bakery.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bakery/devel/bakery.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- bakery.spec	17 Jan 2009 22:14:40 -0000	1.11
+++ bakery.spec	23 Jan 2009 11:38:27 -0000	1.12
@@ -36,11 +36,7 @@
 Summary:        Headers for developing programs that will use %{name}
 Group:          Development/Libraries
 Requires:       %{name} = %{epoch}:%{version}-%{release}
-Requires:       gtkmm24-devel
-Requires:       gconfmm26-devel
-Requires:       libglademm24-devel
-Requires:       libxml++-devel
-Requires:       gnome-vfsmm26-devel
+Requires:       pkgconfig
 
 
 %description devel
@@ -98,6 +94,7 @@
 %changelog
 * Sat Jan 17 2009 Denis Leroy <denis at poolshark.org> - 1:2.6.2-1
 - Update to upstream 2.6.2
+- Removed autodetected devel package Rs
 
 * Wed Aug  6 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1:2.4.4-3
 - revert to 2.4.4



From pmachata at fedoraproject.org  Fri Jan 23 11:45:15 2009
From: pmachata at fedoraproject.org (Petr Machata)
Date: Fri, 23 Jan 2009 11:45:15 +0000 (UTC)
Subject: rpms/tzdata/devel .cvsignore, 1.50, 1.51 sources, 1.54,
	1.55 tzdata.spec, 1.73, 1.74
Message-ID: <20090123114515.3B429700FE@cvs1.fedora.phx.redhat.com>

Author: pmachata

Update of /cvs/pkgs/rpms/tzdata/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11192

Modified Files:
	.cvsignore sources tzdata.spec 
Log Message:
- Upstream 2009a
  - Fix Asia/Kathmandu spelling
  - Historical timestamps for Switzerland and Cuba
  - DST update for America/Resolute



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/tzdata/devel/.cvsignore,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- .cvsignore	30 Oct 2008 11:44:55 -0000	1.50
+++ .cvsignore	23 Jan 2009 11:44:44 -0000	1.51
@@ -16,3 +16,5 @@
 tzdata2008h.tar.gz
 tzcode2008h.tar.gz
 tzdata2008i.tar.gz
+tzdata2009a.tar.gz
+tzcode2009a.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tzdata/devel/sources,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- sources	30 Oct 2008 11:44:55 -0000	1.54
+++ sources	23 Jan 2009 11:44:44 -0000	1.55
@@ -1,4 +1,4 @@
 6a3392cd5f1594d13c12c1a836ac8d91  javazic.tar.gz
 e36d2f742c22f8c8dbf0686ac9769b55  tzdata-base-0.tar.bz2
-2f0fc8b1227bd7289483f64e8a194ed9  tzcode2008h.tar.gz
-b659aac215ca5d1ef43c596cfb561252  tzdata2008i.tar.gz
+979cb227a83d7fbb954611a4fb5b1949  tzdata2009a.tar.gz
+6a20a58704c779e3006394cf38a1dc0a  tzcode2009a.tar.gz


Index: tzdata.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tzdata/devel/tzdata.spec,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- tzdata.spec	30 Oct 2008 11:44:55 -0000	1.73
+++ tzdata.spec	23 Jan 2009 11:44:44 -0000	1.74
@@ -1,8 +1,8 @@
 Summary: Timezone data
 Name: tzdata
-Version: 2008i
+Version: 2009a
 %define tzdata_version %{version}
-%define tzcode_version 2008h
+%define tzcode_version %{version}
 Release: 1%{?dist}
 License: Public Domain
 Group: System Environment/Base
@@ -107,6 +107,12 @@
 %{_datadir}/javazi
 
 %changelog
+* Fri Jan 23 2009 Petr Machata <pmachata at redhat.com> - 2009a-1
+- Upstream 2009a
+  - Fix Asia/Kathmandu spelling
+  - Historical timestamps for Switzerland and Cuba
+  - DST update for America/Resolute
+
 * Thu Oct 30 2008 Petr Machata <pmachata at redhat.com> - 2008i-1
 - Upstream 2008i
   - Updates for Argentina: Drop DST in zones America/Argentina/Jujuy,



From pkgdb at fedoraproject.org  Fri Jan 23 11:45:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 23 Jan 2009 11:45:43 +0000
Subject: [pkgdb] qemu: glommer has requested watchcommits
Message-ID: <20090123114544.17D6B208481@bastion.fedora.phx.redhat.com>

glommer has requested the watchcommits 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  Fri Jan 23 11:45:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 23 Jan 2009 11:45:47 +0000
Subject: [pkgdb] qemu: glommer has requested commit
Message-ID: <20090123114548.074C0208483@bastion.fedora.phx.redhat.com>

glommer has requested the commit acl on qemu (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qemu



From pmachata at fedoraproject.org  Fri Jan 23 11:46:14 2009
From: pmachata at fedoraproject.org (Petr Machata)
Date: Fri, 23 Jan 2009 11:46:14 +0000 (UTC)
Subject: rpms/tzdata/F-10 .cvsignore, 1.50, 1.51 sources, 1.54,
	1.55 tzdata.spec, 1.73, 1.74
Message-ID: <20090123114614.9175870141@cvs1.fedora.phx.redhat.com>

Author: pmachata

Update of /cvs/pkgs/rpms/tzdata/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11301

Modified Files:
	.cvsignore sources tzdata.spec 
Log Message:
- Upstream 2009a
  - Fix Asia/Kathmandu spelling
  - Historical timestamps for Switzerland and Cuba
  - DST update for America/Resolute



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/tzdata/F-10/.cvsignore,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- .cvsignore	30 Oct 2008 11:44:55 -0000	1.50
+++ .cvsignore	23 Jan 2009 11:45:44 -0000	1.51
@@ -16,3 +16,5 @@
 tzdata2008h.tar.gz
 tzcode2008h.tar.gz
 tzdata2008i.tar.gz
+tzdata2009a.tar.gz
+tzcode2009a.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tzdata/F-10/sources,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- sources	30 Oct 2008 11:44:55 -0000	1.54
+++ sources	23 Jan 2009 11:45:44 -0000	1.55
@@ -1,4 +1,4 @@
 6a3392cd5f1594d13c12c1a836ac8d91  javazic.tar.gz
 e36d2f742c22f8c8dbf0686ac9769b55  tzdata-base-0.tar.bz2
-2f0fc8b1227bd7289483f64e8a194ed9  tzcode2008h.tar.gz
-b659aac215ca5d1ef43c596cfb561252  tzdata2008i.tar.gz
+979cb227a83d7fbb954611a4fb5b1949  tzdata2009a.tar.gz
+6a20a58704c779e3006394cf38a1dc0a  tzcode2009a.tar.gz


Index: tzdata.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tzdata/F-10/tzdata.spec,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- tzdata.spec	30 Oct 2008 11:44:55 -0000	1.73
+++ tzdata.spec	23 Jan 2009 11:45:44 -0000	1.74
@@ -1,8 +1,8 @@
 Summary: Timezone data
 Name: tzdata
-Version: 2008i
+Version: 2009a
 %define tzdata_version %{version}
-%define tzcode_version 2008h
+%define tzcode_version %{version}
 Release: 1%{?dist}
 License: Public Domain
 Group: System Environment/Base
@@ -107,6 +107,12 @@
 %{_datadir}/javazi
 
 %changelog
+* Fri Jan 23 2009 Petr Machata <pmachata at redhat.com> - 2009a-1
+- Upstream 2009a
+  - Fix Asia/Kathmandu spelling
+  - Historical timestamps for Switzerland and Cuba
+  - DST update for America/Resolute
+
 * Thu Oct 30 2008 Petr Machata <pmachata at redhat.com> - 2008i-1
 - Upstream 2008i
   - Updates for Argentina: Drop DST in zones America/Argentina/Jujuy,



From pkgdb at fedoraproject.org  Fri Jan 23 11:46:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 23 Jan 2009 11:46:47 +0000
Subject: [pkgdb] qemu: glommer has requested commit
Message-ID: <20090123114647.6C93E208483@bastion.fedora.phx.redhat.com>

glommer has requested the commit acl on qemu (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qemu



From pkgdb at fedoraproject.org  Fri Jan 23 11:46:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 23 Jan 2009 11:46:45 +0000
Subject: [pkgdb] qemu: glommer has requested watchcommits
Message-ID: <20090123114645.9551E20847F@bastion.fedora.phx.redhat.com>

glommer has requested the watchcommits acl on qemu (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qemu



From pkgdb at fedoraproject.org  Fri Jan 23 11:46:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 23 Jan 2009 11:46:47 +0000
Subject: [pkgdb] qemu: glommer has requested approveacls
Message-ID: <20090123114647.BEE94208487@bastion.fedora.phx.redhat.com>

glommer has requested the approveacls acl on qemu (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qemu



From pmachata at fedoraproject.org  Fri Jan 23 11:47:34 2009
From: pmachata at fedoraproject.org (Petr Machata)
Date: Fri, 23 Jan 2009 11:47:34 +0000 (UTC)
Subject: rpms/tzdata/F-9 .cvsignore, 1.49, 1.50 sources, 1.54,
	1.55 tzdata.spec, 1.72, 1.73
Message-ID: <20090123114734.B16BE700FE@cvs1.fedora.phx.redhat.com>

Author: pmachata

Update of /cvs/pkgs/rpms/tzdata/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11856

Modified Files:
	.cvsignore sources tzdata.spec 
Log Message:
- Upstream 2009a
  - Fix Asia/Kathmandu spelling
  - Historical timestamps for Switzerland and Cuba
  - DST update for America/Resolute



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/tzdata/F-9/.cvsignore,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- .cvsignore	30 Oct 2008 11:46:08 -0000	1.49
+++ .cvsignore	23 Jan 2009 11:47:04 -0000	1.50
@@ -16,3 +16,5 @@
 tzdata2008h.tar.gz
 tzcode2008h.tar.gz
 tzdata2008i.tar.gz
+tzdata2009a.tar.gz
+tzcode2009a.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tzdata/F-9/sources,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- sources	30 Oct 2008 11:46:08 -0000	1.54
+++ sources	23 Jan 2009 11:47:04 -0000	1.55
@@ -1,4 +1,4 @@
 6a3392cd5f1594d13c12c1a836ac8d91  javazic.tar.gz
 e36d2f742c22f8c8dbf0686ac9769b55  tzdata-base-0.tar.bz2
-2f0fc8b1227bd7289483f64e8a194ed9  tzcode2008h.tar.gz
-b659aac215ca5d1ef43c596cfb561252  tzdata2008i.tar.gz
+979cb227a83d7fbb954611a4fb5b1949  tzdata2009a.tar.gz
+6a20a58704c779e3006394cf38a1dc0a  tzcode2009a.tar.gz


Index: tzdata.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tzdata/F-9/tzdata.spec,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- tzdata.spec	30 Oct 2008 11:46:08 -0000	1.72
+++ tzdata.spec	23 Jan 2009 11:47:04 -0000	1.73
@@ -1,8 +1,8 @@
 Summary: Timezone data
 Name: tzdata
-Version: 2008i
+Version: 2009a
 %define tzdata_version %{version}
-%define tzcode_version 2008h
+%define tzcode_version %{version}
 Release: 1%{?dist}
 License: Public Domain
 Group: System Environment/Base
@@ -107,6 +107,12 @@
 %{_datadir}/javazi
 
 %changelog
+* Fri Jan 23 2009 Petr Machata <pmachata at redhat.com> - 2009a-1
+- Upstream 2009a
+  - Fix Asia/Kathmandu spelling
+  - Historical timestamps for Switzerland and Cuba
+  - DST update for America/Resolute
+
 * Thu Oct 30 2008 Petr Machata <pmachata at redhat.com> - 2008i-1
 - Upstream 2008i
   - Updates for Argentina: Drop DST in zones America/Argentina/Jujuy,



From pkgdb at fedoraproject.org  Fri Jan 23 11:50:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 23 Jan 2009 11:50:19 +0000
Subject: [pkgdb] qemu had acl change status
Message-ID: <20090123115019.4BD9A20847F@bastion.fedora.phx.redhat.com>

markmc has set the commit acl on qemu (Fedora devel) to Approved for glommer

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qemu



From pkgdb at fedoraproject.org  Fri Jan 23 11:50:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 23 Jan 2009 11:50:23 +0000
Subject: [pkgdb] qemu had acl change status
Message-ID: <20090123115023.8D05E208483@bastion.fedora.phx.redhat.com>

markmc has set the watchcommits acl on qemu (Fedora devel) to Approved for glommer

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qemu



From pkgdb at fedoraproject.org  Fri Jan 23 11:50:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 23 Jan 2009 11:50:29 +0000
Subject: [pkgdb] qemu had acl change status
Message-ID: <20090123115029.D93A1208488@bastion.fedora.phx.redhat.com>

markmc has set the commit acl on qemu (Fedora devel) to Approved for markmc

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qemu



From pkgdb at fedoraproject.org  Fri Jan 23 11:50:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 23 Jan 2009 11:50:35 +0000
Subject: [pkgdb] qemu had acl change status
Message-ID: <20090123115035.611A3208489@bastion.fedora.phx.redhat.com>

markmc has set the watchcommits acl on qemu (Fedora devel) to Approved for markmc

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qemu



From pkgdb at fedoraproject.org  Fri Jan 23 11:50:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 23 Jan 2009 11:50:43 +0000
Subject: [pkgdb] qemu had acl change status
Message-ID: <20090123115043.7C12720848C@bastion.fedora.phx.redhat.com>

markmc has set the approveacls acl on qemu (Fedora devel) to Approved for glommer

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qemu



From pkgdb at fedoraproject.org  Fri Jan 23 11:50:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 23 Jan 2009 11:50:52 +0000
Subject: [pkgdb] qemu had acl change status
Message-ID: <20090123115052.A9466208482@bastion.fedora.phx.redhat.com>

markmc has set the watchcommits acl on qemu (Fedora 7) to Approved for markmc

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qemu



From pkgdb at fedoraproject.org  Fri Jan 23 11:50:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 23 Jan 2009 11:50:55 +0000
Subject: [pkgdb] qemu had acl change status
Message-ID: <20090123115055.E17A920848F@bastion.fedora.phx.redhat.com>

markmc has set the commit acl on qemu (Fedora 7) to Approved for markmc

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qemu



From pkgdb at fedoraproject.org  Fri Jan 23 11:50:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 23 Jan 2009 11:50:59 +0000
Subject: [pkgdb] qemu had acl change status
Message-ID: <20090123115059.591D9208490@bastion.fedora.phx.redhat.com>

markmc has set the commit acl on qemu (Fedora 3) to Approved for markmc

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qemu



From pkgdb at fedoraproject.org  Fri Jan 23 11:51:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 23 Jan 2009 11:51:03 +0000
Subject: [pkgdb] qemu had acl change status
Message-ID: <20090123115103.79EFB208492@bastion.fedora.phx.redhat.com>

markmc has set the watchcommits acl on qemu (Fedora 3) to Approved for markmc

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qemu



From pkgdb at fedoraproject.org  Fri Jan 23 11:51:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 23 Jan 2009 11:51:12 +0000
Subject: [pkgdb] qemu: glommer has requested watchcommits
Message-ID: <20090123115113.70C3F20847F@bastion.fedora.phx.redhat.com>

glommer has requested the watchcommits 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  Fri Jan 23 11:51:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 23 Jan 2009 11:51:14 +0000
Subject: [pkgdb] qemu: glommer has requested commit
Message-ID: <20090123115114.5F725208494@bastion.fedora.phx.redhat.com>

glommer has requested 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  Fri Jan 23 11:51:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 23 Jan 2009 11:51:21 +0000
Subject: [pkgdb] qemu had acl change status
Message-ID: <20090123115121.498F720848E@bastion.fedora.phx.redhat.com>

markmc has set the watchcommits acl on qemu (Fedora 4) to Approved for markmc

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qemu



From pkgdb at fedoraproject.org  Fri Jan 23 11:51:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 23 Jan 2009 11:51:25 +0000
Subject: [pkgdb] qemu had acl change status
Message-ID: <20090123115126.140F5208497@bastion.fedora.phx.redhat.com>

markmc has set the commit acl on qemu (Fedora 4) to Approved for markmc

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qemu



From ruben at fedoraproject.org  Fri Jan 23 11:53:33 2009
From: ruben at fedoraproject.org (Ruben Kerkhof)
Date: Fri, 23 Jan 2009 11:53:33 +0000 (UTC)
Subject: rpms/pdns/devel pdns.spec,1.15,1.16
Message-ID: <20090123115333.9C9E1700FE@cvs1.fedora.phx.redhat.com>

Author: ruben

Update of /cvs/pkgs/rpms/pdns/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13278

Modified Files:
	pdns.spec 
Log Message:
* Fri Jan 23 2009 Ruben Kerkhof <ruben at rubenkerkhof.com> 2.9.22-2.rc3
- Rebuild for new libmysqlclient



Index: pdns.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pdns/devel/pdns.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- pdns.spec	19 Jan 2009 13:04:50 -0000	1.15
+++ pdns.spec	23 Jan 2009 11:53:02 -0000	1.16
@@ -2,7 +2,7 @@
 Summary:	A modern, advanced and high performance authoritative-only nameserver
 Name:		pdns
 Version:	2.9.22
-Release:	1.%{alphatag}%{?dist}
+Release:	2.%{alphatag}%{?dist}
 
 Group:		System Environment/Daemons
 License:	GPLv2
@@ -180,6 +180,9 @@
 
 
 %changelog
+* Fri Jan 23 2009 Ruben Kerkhof <ruben at rubenkerkhof.com> 2.9.22-2.rc3
+- Rebuild for new libmysqlclient
+
 * Mon Jan 19 2009 Ruben Kerkhof <ruben at rubenkerkhof.com> 2.9.22-1.rc3
 - New release candidate
 



From pkgdb at fedoraproject.org  Fri Jan 23 11:55:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 23 Jan 2009 11:55:11 +0000
Subject: [pkgdb] qemu had acl change status
Message-ID: <20090123115512.5BE16208480@bastion.fedora.phx.redhat.com>

markmc has set the commit acl on qemu (Fedora EPEL 4) to Approved for markmc

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qemu



From pkgdb at fedoraproject.org  Fri Jan 23 11:55:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 23 Jan 2009 11:55:15 +0000
Subject: [pkgdb] qemu had acl change status
Message-ID: <20090123115515.558E7208484@bastion.fedora.phx.redhat.com>

markmc has set the watchcommits acl on qemu (Fedora EPEL 4) to Approved for markmc

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qemu



From pkgdb at fedoraproject.org  Fri Jan 23 11:55:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 23 Jan 2009 11:55:19 +0000
Subject: [pkgdb] qemu: markmc has given up commit
Message-ID: <20090123115519.3A682208488@bastion.fedora.phx.redhat.com>

markmc 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  Fri Jan 23 11:55:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 23 Jan 2009 11:55:20 +0000
Subject: [pkgdb] qemu: markmc has given up watchcommits
Message-ID: <20090123115520.56AC420848E@bastion.fedora.phx.redhat.com>

markmc has given up the watchcommits 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  Fri Jan 23 11:55:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 23 Jan 2009 11:55:29 +0000
Subject: [pkgdb] qemu: markmc has requested commit
Message-ID: <20090123115529.A7871208491@bastion.fedora.phx.redhat.com>

markmc has requested 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  Fri Jan 23 11:55:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 23 Jan 2009 11:55:33 +0000
Subject: [pkgdb] qemu had acl change status
Message-ID: <20090123115533.A1C88208495@bastion.fedora.phx.redhat.com>

markmc has set the commit acl on qemu (Fedora EPEL 5) to Approved for markmc

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qemu



From pkgdb at fedoraproject.org  Fri Jan 23 11:55:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 23 Jan 2009 11:55:36 +0000
Subject: [pkgdb] qemu had acl change status
Message-ID: <20090123115537.3E915208482@bastion.fedora.phx.redhat.com>

markmc has set the watchcommits acl on qemu (Fedora EPEL 5) to Approved for markmc

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qemu



From pkgdb at fedoraproject.org  Fri Jan 23 11:55:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 23 Jan 2009 11:55:42 +0000
Subject: [pkgdb] qemu had acl change status
Message-ID: <20090123115542.B580C208497@bastion.fedora.phx.redhat.com>

markmc has set the commit acl on qemu (Fedora 9) to Approved for markmc

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qemu



From pkgdb at fedoraproject.org  Fri Jan 23 11:55:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 23 Jan 2009 11:55:45 +0000
Subject: [pkgdb] qemu had acl change status
Message-ID: <20090123115545.D3A502084B7@bastion.fedora.phx.redhat.com>

markmc has set the watchcommits acl on qemu (Fedora 9) to Approved for markmc

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qemu



From pkgdb at fedoraproject.org  Fri Jan 23 11:55:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 23 Jan 2009 11:55:49 +0000
Subject: [pkgdb] qemu had acl change status
Message-ID: <20090123115549.F3D62208486@bastion.fedora.phx.redhat.com>

markmc has set the commit acl on qemu (Fedora 10) to Approved for markmc

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qemu



From pkgdb at fedoraproject.org  Fri Jan 23 11:55:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 23 Jan 2009 11:55:52 +0000
Subject: [pkgdb] qemu had acl change status
Message-ID: <20090123115553.1C8E820848F@bastion.fedora.phx.redhat.com>

markmc has set the watchcommits acl on qemu (Fedora 10) to Approved for markmc

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qemu



From pkgdb at fedoraproject.org  Fri Jan 23 11:55:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 23 Jan 2009 11:55:54 +0000
Subject: [pkgdb] qemu had acl change status
Message-ID: <20090123115554.7498A208605@bastion.fedora.phx.redhat.com>

markmc has set the watchcommits acl on qemu (Fedora 10) to Approved for glommer

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qemu



From pkgdb at fedoraproject.org  Fri Jan 23 11:55:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 23 Jan 2009 11:55:56 +0000
Subject: [pkgdb] qemu had acl change status
Message-ID: <20090123115557.94FD320860C@bastion.fedora.phx.redhat.com>

markmc has set the commit acl on qemu (Fedora 10) to Approved for glommer

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qemu



From pkgdb at fedoraproject.org  Fri Jan 23 11:55:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 23 Jan 2009 11:55:58 +0000
Subject: [pkgdb] qemu had acl change status
Message-ID: <20090123115558.8E8D320860F@bastion.fedora.phx.redhat.com>

markmc has set the approveacls acl on qemu (Fedora 10) to Approved for glommer

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qemu



From pkgdb at fedoraproject.org  Fri Jan 23 11:57:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 23 Jan 2009 11:57:28 +0000
Subject: [pkgdb] qemu had acl change status
Message-ID: <20090123115728.D6D9420847E@bastion.fedora.phx.redhat.com>

markmc has set the watchcommits acl on qemu (Fedora 9) to Approved for glommer

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qemu



From pkgdb at fedoraproject.org  Fri Jan 23 11:57:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 23 Jan 2009 11:57:31 +0000
Subject: [pkgdb] qemu had acl change status
Message-ID: <20090123115731.DC22E208489@bastion.fedora.phx.redhat.com>

markmc has set the commit acl on qemu (Fedora 9) to Approved for glommer

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qemu



From allisson at fedoraproject.org  Fri Jan 23 12:02:12 2009
From: allisson at fedoraproject.org (Allisson Azevedo)
Date: Fri, 23 Jan 2009 12:02:12 +0000 (UTC)
Subject: rpms/clutter-cairo/devel .cvsignore, 1.3, 1.4 clutter-cairo.spec,
	1.2, 1.3 import.log, 1.1, 1.2 sources, 1.3, 1.4
Message-ID: <20090123120212.8B40B700FE@cvs1.fedora.phx.redhat.com>

Author: allisson

Update of /cvs/pkgs/rpms/clutter-cairo/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14614/devel

Modified Files:
	.cvsignore clutter-cairo.spec import.log sources 
Log Message:

- Rebuild



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/clutter-cairo/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	7 Sep 2008 15:36:32 -0000	1.3
+++ .cvsignore	23 Jan 2009 12:01:42 -0000	1.4
@@ -1 +1 @@
-clutter-cairo-0.8.2.tar.gz
+clutter-cairo-0.8.2.tar.bz2


Index: clutter-cairo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/clutter-cairo/devel/clutter-cairo.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- clutter-cairo.spec	7 Sep 2008 15:36:32 -0000	1.2
+++ clutter-cairo.spec	23 Jan 2009 12:01:42 -0000	1.3
@@ -1,12 +1,12 @@
 Name:           clutter-cairo
 Version:        0.8.2
-Release:        1%{?dist}
+Release:        2%{?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.8/%{name}-%{version}.tar.gz
+Source0:        http://www.clutter-project.org/sources/%{name}/0.8/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  cairo-devel clutter-devel 
@@ -58,6 +58,9 @@
 
 %changelog
 
+* Fri Jan 23 2009 Allisson Azevedo <allisson at gmail.com> 0.8.2-2
+- Rebuild
+
 * Sat Sep  6 2008 Allisson Azevedo <allisson at gmail.com> 0.8.2-1
 - Update to 0.8.2
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/clutter-cairo/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	7 Sep 2008 15:36:32 -0000	1.1
+++ import.log	23 Jan 2009 12:01:42 -0000	1.2
@@ -1 +1,2 @@
 clutter-cairo-0_8_2-1_fc9:HEAD:clutter-cairo-0.8.2-1.fc9.src.rpm:1220801788
+clutter-cairo-0_8_2-2_fc10:HEAD:clutter-cairo-0.8.2-2.fc10.src.rpm:1232711924


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/clutter-cairo/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	7 Sep 2008 15:36:32 -0000	1.3
+++ sources	23 Jan 2009 12:01:42 -0000	1.4
@@ -1 +1 @@
-c3bfae082d007be37d9725e5e7b4a30b  clutter-cairo-0.8.2.tar.gz
+e3cae14ffd1e375d63046352b505788f  clutter-cairo-0.8.2.tar.bz2



From vcrhonek at fedoraproject.org  Fri Jan 23 12:21:35 2009
From: vcrhonek at fedoraproject.org (Vitezslav Crhonek)
Date: Fri, 23 Jan 2009 12:21:35 +0000 (UTC)
Subject: rpms/jwhois/devel jwhois-4.0-gi.patch, NONE, 1.1 jwhois.spec, 1.43,
	1.44
Message-ID: <20090123122135.21F80700FE@cvs1.fedora.phx.redhat.com>

Author: vcrhonek

Update of /cvs/extras/rpms/jwhois/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17774

Modified Files:
	jwhois.spec 
Added Files:
	jwhois-4.0-gi.patch 
Log Message:
Change the server used for .gi domains

jwhois-4.0-gi.patch:

--- NEW FILE jwhois-4.0-gi.patch ---
diff -up jwhois-4.0/example/jwhois.conf_old jwhois-4.0/example/jwhois.conf
--- jwhois-4.0/example/jwhois.conf_old	2009-01-23 12:57:35.000000000 +0100
+++ jwhois-4.0/example/jwhois.conf	2009-01-23 12:58:41.000000000 +0100
@@ -171,7 +171,7 @@ whois-servers {
 	"\\.fm$" = "www.dot.fm";
 	"\\.fo$" = "whois.ripe.net";
 	"\\.fr$" = "whois.nic.fr";
-	"\\.gi$" = "www.nic.gi";
+	"\\.gi$" = "whois2.afilias-grs.net";
 	"\\.gov$" = "whois.nic.gov";
 	"\\.gg$" = "whois.isles.net";
 	"\\.gm$" = "whois.ripe.net";


Index: jwhois.spec
===================================================================
RCS file: /cvs/extras/rpms/jwhois/devel/jwhois.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- jwhois.spec	13 Oct 2008 14:49:49 -0000	1.43
+++ jwhois.spec	23 Jan 2009 12:21:04 -0000	1.44
@@ -1,11 +1,12 @@
 Name: jwhois
 Version: 4.0
-Release: 8%{?dist}
+Release: 9%{?dist}
 URL: http://www.gnu.org/software/jwhois/
 Source0: ftp://ftp.gnu.org/gnu/jwhois/jwhois-%{version}.tar.gz
 Patch0: jwhois-4.0-connect.patch
 Patch1: jwhois-4.0-ipv6match.patch
 Patch2: jwhois-4.0-conf.patch
+Patch3: jwhois-4.0-gi.patch
 License: GPLv3
 Group: Applications/Internet
 Summary: Internet whois/nicname client
@@ -22,6 +23,7 @@
 %patch0 -p1 -b .connect
 %patch1 -p1 -b .ipv6match
 %patch2 -p1 -b .conf
+%patch3 -p1 -b .gi
 
 iconv -f iso-8859-1 -t utf-8 < doc/sv/jwhois.1 > doc/sv/jwhois.1_
 mv doc/sv/jwhois.1_ doc/sv/jwhois.1
@@ -61,6 +63,9 @@
 rm -fr $RPM_BUILD_ROOT
 
 %changelog
+* Fri Jan 23 2009 Vitezslav Crhonek <vcrhonek at redhat.com> - 4.0-9
+- Change the server used for .gi domains
+
 * Mon Oct 13 2008 Vitezslav Crhonek <vcrhonek at redhat.com> - 4.0-8
 - Update to latest upstream config
   Resolves: #463972



From denis at fedoraproject.org  Fri Jan 23 12:30:29 2009
From: denis at fedoraproject.org (Denis Leroy)
Date: Fri, 23 Jan 2009 12:30:29 +0000 (UTC)
Subject: rpms/bakery/devel bakery.spec,1.12,1.13
Message-ID: <20090123123029.2E6CC700FE@cvs1.fedora.phx.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/bakery/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18822

Modified Files:
	bakery.spec 
Log Message:
Added intltool BR


Index: bakery.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bakery/devel/bakery.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- bakery.spec	23 Jan 2009 11:38:27 -0000	1.12
+++ bakery.spec	23 Jan 2009 12:29:58 -0000	1.13
@@ -19,7 +19,7 @@
 BuildRequires:  gconfmm26-devel >= 2.6.0
 BuildRequires:  libglademm24-devel >= 2.4.0
 BuildRequires:  libxml++-devel >= 2.8.0
-BuildRequires:  doxygen graphviz gettext
+BuildRequires:  doxygen graphviz gettext intltool
 
 
 %description



From denis at fedoraproject.org  Fri Jan 23 12:41:06 2009
From: denis at fedoraproject.org (Denis Leroy)
Date: Fri, 23 Jan 2009 12:41:06 +0000 (UTC)
Subject: rpms/libgnomedb/devel libgnomedb.spec,1.32,1.33
Message-ID: <20090123124106.F33E8700FE@cvs1.fedora.phx.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/libgnomedb/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20060

Modified Files:
	libgnomedb.spec 
Log Message:
Added intltool BR


Index: libgnomedb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libgnomedb/devel/libgnomedb.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- libgnomedb.spec	23 Jan 2009 11:27:10 -0000	1.32
+++ libgnomedb.spec	23 Jan 2009 12:40:36 -0000	1.33
@@ -18,7 +18,7 @@
 BuildRequires:   evolution-data-server-devel
 BuildRequires:   graphviz-devel
 BuildRequires:   iso-codes-devel
-BuildRequires:   gettext scrollkeeper perl(XML::Parser) desktop-file-utils
+BuildRequires:   gettext intltool scrollkeeper perl(XML::Parser) desktop-file-utils
 Requires:        scrollkeeper hicolor-icon-theme
 Requires(pre):   GConf2
 Requires(post):  GConf2 /sbin/ldconfig



From denis at fedoraproject.org  Fri Jan 23 12:41:20 2009
From: denis at fedoraproject.org (Denis Leroy)
Date: Fri, 23 Jan 2009 12:41:20 +0000 (UTC)
Subject: rpms/libgda/devel libgda.spec,1.42,1.43
Message-ID: <20090123124120.44414700FE@cvs1.fedora.phx.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/libgda/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20105

Modified Files:
	libgda.spec 
Log Message:
Added intltool BR


Index: libgda.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libgda/devel/libgda.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- libgda.spec	23 Jan 2009 10:56:57 -0000	1.42
+++ libgda.spec	23 Jan 2009 12:40:50 -0000	1.43
@@ -55,7 +55,7 @@
 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)
+BuildRequires:    gtk-doc scrollkeeper intltool 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}



From allisson at fedoraproject.org  Fri Jan 23 12:48:37 2009
From: allisson at fedoraproject.org (Allisson Azevedo)
Date: Fri, 23 Jan 2009 12:48:37 +0000 (UTC)
Subject: rpms/clutter-gst/devel .cvsignore, 1.5, 1.6 clutter-gst.spec, 1.6, 
	1.7 import.log, 1.1, 1.2 sources, 1.5, 1.6
Message-ID: <20090123124838.04A2470142@cvs1.fedora.phx.redhat.com>

Author: allisson

Update of /cvs/pkgs/rpms/clutter-gst/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21149/devel

Modified Files:
	.cvsignore clutter-gst.spec import.log sources 
Log Message:

- Rebuild



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/clutter-gst/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	7 Sep 2008 18:12:49 -0000	1.5
+++ .cvsignore	23 Jan 2009 12:48:07 -0000	1.6
@@ -1 +1 @@
-clutter-gst-0.8.0.tar.gz
+clutter-gst-0.8.0.tar.bz2


Index: clutter-gst.spec
===================================================================
RCS file: /cvs/pkgs/rpms/clutter-gst/devel/clutter-gst.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- clutter-gst.spec	12 Sep 2008 16:48:56 -0000	1.6
+++ clutter-gst.spec	23 Jan 2009 12:48:07 -0000	1.7
@@ -1,12 +1,12 @@
 Name:           clutter-gst
 Version:        0.8.0
-Release:        2%{?dist}
+Release:        3%{?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.8/%{name}-%{version}.tar.gz
+Source0:        http://www.clutter-project.org/sources/%{name}/0.8/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  clutter-devel gstreamer-plugins-base-devel gstreamer-devel 
@@ -59,6 +59,9 @@
 
 %changelog
 
+* Fri Jan 23 2009 Allisson Azevedo <allisson at gmail.com> 0.8.0-3
+- Rebuild
+
 * Fri Sep 12 2008 Allisson Azevedo <allisson at gmail.com> 0.8.0-2
 - Rebuild against new gstreamer-devel
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/clutter-gst/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	7 Sep 2008 18:12:49 -0000	1.1
+++ import.log	23 Jan 2009 12:48:07 -0000	1.2
@@ -1 +1,2 @@
 clutter-gst-0_8_0-1_fc9:HEAD:clutter-gst-0.8.0-1.fc9.src.rpm:1220811149
+clutter-gst-0_8_0-3_fc10:HEAD:clutter-gst-0.8.0-3.fc10.src.rpm:1232714664


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/clutter-gst/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	7 Sep 2008 18:12:49 -0000	1.5
+++ sources	23 Jan 2009 12:48:07 -0000	1.6
@@ -1 +1 @@
-9ebf9bbe406757472952743ca01870f3  clutter-gst-0.8.0.tar.gz
+13d2a34ea76e4f010e66d20eba12e864  clutter-gst-0.8.0.tar.bz2



From jcollie at fedoraproject.org  Fri Jan 23 12:53:01 2009
From: jcollie at fedoraproject.org (Jeffrey C. Ollie)
Date: Fri, 23 Jan 2009 12:53:01 +0000 (UTC)
Subject: rpms/zabbix/devel zabbix.spec,1.31,1.32
Message-ID: <20090123125301.97121700FE@cvs1.fedora.phx.redhat.com>

Author: jcollie

Update of /cvs/pkgs/rpms/zabbix/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22669

Modified Files:
	zabbix.spec 
Log Message:
* Fri Jan 23 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6.2-2
- Rebuild for MySQL 5.1.X



Index: zabbix.spec
===================================================================
RCS file: /cvs/pkgs/rpms/zabbix/devel/zabbix.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- zabbix.spec	16 Jan 2009 14:53:20 -0000	1.31
+++ zabbix.spec	23 Jan 2009 12:52:31 -0000	1.32
@@ -1,6 +1,6 @@
 Name:           zabbix
 Version:        1.6.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Open-source monitoring solution for your IT infrastructure
 
 Group:          Applications/Internet
@@ -463,6 +463,9 @@
 %defattr(-,root,root,-)
 
 %changelog
+* Fri Jan 23 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6.2-2
+- Rebuild for MySQL 5.1.X
+
 * Fri Jan 16 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6.2-1
 - Update to 1.6.2: http://www.zabbix.com/rn1.6.2.php
 



From jcollie at fedoraproject.org  Fri Jan 23 13:03:21 2009
From: jcollie at fedoraproject.org (Jeffrey C. Ollie)
Date: Fri, 23 Jan 2009 13:03:21 +0000 (UTC)
Subject: rpms/callweaver/devel callweaver.spec,1.15,1.16
Message-ID: <20090123130321.8A67C700FE@cvs1.fedora.phx.redhat.com>

Author: jcollie

Update of /cvs/pkgs/rpms/callweaver/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23845

Modified Files:
	callweaver.spec 
Log Message:
* Fri Jan 23 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.2.0.1-2
- Rebuild for MySQL 5.1.X.



Index: callweaver.spec
===================================================================
RCS file: /cvs/pkgs/rpms/callweaver/devel/callweaver.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- callweaver.spec	11 Sep 2008 14:28:14 -0000	1.15
+++ callweaver.spec	23 Jan 2009 13:02:51 -0000	1.16
@@ -7,7 +7,7 @@
 
 Name:		callweaver
 Version:	1.2.0.1
-Release:	1.2%{?snap:.%{snap}}%{?dist}
+Release:	2%{?snap:.%{snap}}%{?dist}
 Summary:	The Truly Open Source PBX
 
 Group:		Applications/Internet
@@ -377,6 +377,9 @@
 %{_sbindir}/eogi*
 
 %changelog
+* Fri Jan 23 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.2.0.1-2
+- Rebuild for MySQL 5.1.X.
+
 * Thu Sep 11 2008 - Bastien Nocera <bnocera at redhat.com> - 1.2.0.1-1.2
 - Rebuild
 



From corsepiu at fedoraproject.org  Fri Jan 23 13:05:43 2009
From: corsepiu at fedoraproject.org (=?utf-8?q?Ralf_Cors=C3=A9pius?=)
Date: Fri, 23 Jan 2009 13:05:43 +0000 (UTC)
Subject: rpms/rt3/devel .cvsignore, 1.12, 1.13 rt3.spec, 1.31, 1.32 sources, 
	1.12, 1.13
Message-ID: <20090123130543.EA6B0700FE@cvs1.fedora.phx.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/rt3/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24263

Modified Files:
	.cvsignore rt3.spec sources 
Log Message:
* Fri Jan 23 2009 Ralf Cors??pius <corsepiu at fedoraproject.org> - 3.8.2-1
- Upstream update.
- Preps to add a perl-RT-Test package.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rt3/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	30 Nov 2008 09:07:23 -0000	1.12
+++ .cvsignore	23 Jan 2009 13:05:13 -0000	1.13
@@ -1 +1 @@
-rt-3.8.1.tar.gz
+rt-3.8.2.tar.gz


Index: rt3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rt3/devel/rt3.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- rt3.spec	30 Nov 2008 07:01:21 -0000	1.31
+++ rt3.spec	23 Jan 2009 13:05:13 -0000	1.32
@@ -18,7 +18,7 @@
 
 # --with devel_mode/--without devel_mode
 #	enable/disable building/installing devel files
-#	Default: without (missing deps; TBA in spec)
+#	Default: without
 %bcond_with devel_mode
 
 # --with gpg/--without gpg
@@ -39,8 +39,8 @@
 %define RT3_LOCALSTATEDIR	%{_localstatedir}/lib/rt3
 
 Name:		rt3
-Version:	3.8.1
-Release:	2%{?dist}
+Version:	3.8.2
+Release:	1%{?dist}
 Summary:	Request tracker 3
 
 Group:		Applications/Internet
@@ -133,6 +133,7 @@
 %{?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::HTTP::Server::Simple::StashWarnings)}
 %{?with_devel_mode:BuildRequires: perl(Test::MockTime)}
 %{?with_devel_mode:BuildRequires: perl(Test::Warn)}
 %{?with_devel_mode:BuildRequires: perl(Test::WWW::Mechanize)}
@@ -197,6 +198,16 @@
 %description mailgate
 %{summary}
 
+%if 0%{?with_devel_mode}
+%package -n perl-RT-Test
+Summary: rt3's test utility.
+Group:   Applications/Internet
+Requires:	rt3 = %{version}-%{release}
+
+%description -n perl-RT-Test
+%{summary}
+%endif
+
 %prep
 %setup -q -n rt-%{version}
 
@@ -406,7 +417,18 @@
 %{_sbindir}/rt-mailgate
 %{_mandir}/man1/rt-mailgate*
 
+%if 0%{?with_devel_mode}
+%files -n perl-RT-Test
+%defattr(-,root,root,-)
+%dir %{RT3_LIBDIR}/RT
+%{RT3_LIBDIR}/RT/Test*
+%endif
+
 %changelog
+* Fri Jan 23 2009 Ralf Cors??pius <corsepiu at fedoraproject.org> - 3.8.2-1
+- Upstream update.
+- Preps to add a perl-RT-Test package.
+
 * Sun Nov 30 2008 Ralf Cors??pius <corsepiu at fedoraproject.org> - 3.8.1-2
 - Fix rt3-mailgate's %%defattr(-,root,root,-).
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rt3/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	30 Nov 2008 09:07:23 -0000	1.12
+++ sources	23 Jan 2009 13:05:13 -0000	1.13
@@ -1 +1 @@
-72b4419816e43bde6b50ba68374882e3  rt-3.8.1.tar.gz
+100b1fd791e229c4338c0d056c65c12f  rt-3.8.2.tar.gz



From limb at fedoraproject.org  Fri Jan 23 13:06:42 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Fri, 23 Jan 2009 13:06:42 +0000 (UTC)
Subject: rpms/bacula/devel bacula.spec,1.22,1.23
Message-ID: <20090123130642.E063B700FE@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/bacula/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24366

Modified Files:
	bacula.spec 
Log Message:
mysql 5.1 rebuild.



Index: bacula.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bacula/devel/bacula.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- bacula.spec	6 Jan 2009 14:33:32 -0000	1.22
+++ bacula.spec	23 Jan 2009 13:06:12 -0000	1.23
@@ -8,7 +8,7 @@
 Summary: Cross platform network backup for Linux, Unix, Mac and Windows
 Name: bacula
 Version: 2.4.4
-Release: 1%{?dist}
+Release: 2%{?dist}
 # See LICENSE for details
 License: GPLv2 with exceptions
 Group: System Environment/Daemons
@@ -990,6 +990,9 @@
 
 
 %changelog
+* Fri Jan 23 2009 Jon Ciesla <limb at jcomserv.net - 2.4.4-2
+- Rebuild against mysql 5.1.
+
 * Mon Jan 05 2009 Jon Ciesla <limb at jcomserv.net - 2.4.4-1
 - Update to new upstream, 2.4.4.
 - Dropped orphaned jobs patch, python 2.6 patch, applied upstream.



From allisson at fedoraproject.org  Fri Jan 23 13:16:16 2009
From: allisson at fedoraproject.org (Allisson Azevedo)
Date: Fri, 23 Jan 2009 13:16:16 +0000 (UTC)
Subject: rpms/perl-Crypt-Simple/devel import.log, NONE,
	1.1 perl-Crypt-Simple.spec, 1.4, 1.5
Message-ID: <20090123131616.24C00700FE@cvs1.fedora.phx.redhat.com>

Author: allisson

Update of /cvs/pkgs/rpms/perl-Crypt-Simple/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25447/devel

Modified Files:
	perl-Crypt-Simple.spec 
Added Files:
	import.log 
Log Message:

- Rebuild



--- NEW FILE import.log ---
perl-Crypt-Simple-0_06-6_fc10:HEAD:perl-Crypt-Simple-0.06-6.fc10.src.rpm:1232716360


Index: perl-Crypt-Simple.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Crypt-Simple/devel/perl-Crypt-Simple.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-Crypt-Simple.spec	7 Jul 2008 19:20:00 -0000	1.4
+++ perl-Crypt-Simple.spec	23 Jan 2009 13:15:45 -0000	1.5
@@ -65,6 +65,10 @@
 
 
 %changelog
+
+* Fri Jan 23 2009 Allisson Azevedo <allisson at gmail.com> 0.06-7
+- Rebuild
+
 * Mon Jul 07 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.06-6
 - fix conditional comparison
 



From rdieter at fedoraproject.org  Fri Jan 23 13:20:19 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 23 Jan 2009 13:20:19 +0000 (UTC)
Subject: rpms/kipi-plugins/devel kipi-plugins.spec,1.79,1.80
Message-ID: <20090123132019.1566F700FE@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kipi-plugins/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26284

Modified Files:
	kipi-plugins.spec 
Log Message:
fix %files



Index: kipi-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kipi-plugins/devel/kipi-plugins.spec,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- kipi-plugins.spec	22 Jan 2009 19:56:27 -0000	1.79
+++ kipi-plugins.spec	23 Jan 2009 13:19:48 -0000	1.80
@@ -30,7 +30,7 @@
 BuildRequires: libxslt-devel
 ## DNG converter
 BuildRequires: expat-devel
-# bodus deps 
+# bodus deps (when built against kde < 4.2)
 BuildRequires: giflib-devel openldap-devel pcre-devel
 
 Requires(post): /sbin/ldconfig xdg-utils
@@ -39,6 +39,9 @@
 ## jpeglossless plugin
 Requires: ImageMagick
 
+
+## needs libopencv
+#RemoveRedEyes      : remove red eyes on image automatically
 %description
 This package contains plugins to use with Kipi, the KDE Image Plugin
 Interface.  Currently implemented plugins are:
@@ -54,7 +57,6 @@
 MetadataEdit       : edit EXIF, IPTC and XMP metadata
 PicasaWebExport    : export images to a remote Picasa web service
 RawConverter       : convert Raw Image to JPEG/PNG/TIFF
-RemoveRedEyes      : remove red eyes on image automatically
 SendImages         : send images by e-mail
 SimpleViewerExport : export images to Flash using SimpleViewer
 SlideShow          : slide images with 2D and 3D effects using OpenGL
@@ -74,7 +76,7 @@
 %{cmake_kde4} ..
 popd
 
-make %{?_smp_mflags} -C %{_target_platform} VERBOSE=1
+make %{?_smp_mflags} -C %{_target_platform}
 
 
 %install
@@ -105,11 +107,13 @@
 %post
 /sbin/ldconfig ||:
 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 ||:
 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 || :
 
 
@@ -136,7 +140,7 @@
 %{_kde4_libdir}/kde4/kipiplugin_sendimages.so
 %{_kde4_libdir}/kde4/kipiplugin_simpleviewer.so
 %{_kde4_libdir}/kde4/kipiplugin_slideshow.so
-%{_kde4_libdir}/kde4/kipiplugin_smugexport.so
+%{_kde4_libdir}/kde4/kipiplugin_smug.so
 %{_kde4_libdir}/kde4/kipiplugin_timeadjust.so
 %{_kde4_appsdir}/kipiplugin_galleryexport/
 %{_kde4_appsdir}/kipiplugin_htmlexport/
@@ -147,6 +151,7 @@
 %{_kde4_datadir}/applications/kde4/dngconverter.desktop
 %{_kde4_datadir}/kde4/services/*.desktop
 %{_kde4_iconsdir}/hicolor/*/*/*
+%{_kde4_iconsdir}/oxygen/*/*/*
 
 
 %changelog



From timn at fedoraproject.org  Fri Jan 23 13:24:31 2009
From: timn at fedoraproject.org (Tim Niemueller)
Date: Fri, 23 Jan 2009 13:24:31 +0000 (UTC)
Subject: rpms/lua-sql/devel lua-sql.spec,1.1,1.2
Message-ID: <20090123132431.E5E6D700FE@cvs1.fedora.phx.redhat.com>

Author: timn

Update of /cvs/pkgs/rpms/lua-sql/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27207

Modified Files:
	lua-sql.spec 
Log Message:
Rebuild for MySQL 5.1


Index: lua-sql.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lua-sql/devel/lua-sql.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- lua-sql.spec	8 Apr 2008 21:26:52 -0000	1.1
+++ lua-sql.spec	23 Jan 2009 13:24:01 -0000	1.2
@@ -4,7 +4,7 @@
 
 Name:           lua-sql
 Version:        2.1.1
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Database connectivity for the Lua programming language
 
 Group:          Development/Libraries
@@ -108,6 +108,9 @@
 
 
 %changelog
+* Fri Jan 23 2009 Tim Niemueller <tim at niemueller.de> - 2.1.1-5
+- Rebuild for MySQL 5.1
+
 * Tue Apr 08 2008 Tim Niemueller <tim at niemueller.de> - 2.1.1-4
 - Main package is now pure meta package to pull in everything else, README
   moved to doc sub-package.



From corsepiu at fedoraproject.org  Fri Jan 23 13:30:48 2009
From: corsepiu at fedoraproject.org (=?utf-8?q?Ralf_Cors=C3=A9pius?=)
Date: Fri, 23 Jan 2009 13:30:48 +0000 (UTC)
Subject: rpms/rt3/F-10 .cvsignore, 1.12, 1.13 rt3.spec, 1.31, 1.32 sources, 
	1.12, 1.13
Message-ID: <20090123133048.56036700FE@cvs1.fedora.phx.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/rt3/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27983

Modified Files:
	.cvsignore rt3.spec sources 
Log Message:
* Fri Jan 23 2009 Ralf Cors??pius <corsepiu at fedoraproject.org> - 3.8.2-1
- Upstream update.
- Preps to add a perl-RT-Test package.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rt3/F-10/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	30 Nov 2008 09:07:23 -0000	1.12
+++ .cvsignore	23 Jan 2009 13:30:17 -0000	1.13
@@ -1 +1 @@
-rt-3.8.1.tar.gz
+rt-3.8.2.tar.gz


Index: rt3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rt3/F-10/rt3.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- rt3.spec	30 Nov 2008 06:51:42 -0000	1.31
+++ rt3.spec	23 Jan 2009 13:30:17 -0000	1.32
@@ -18,7 +18,7 @@
 
 # --with devel_mode/--without devel_mode
 #	enable/disable building/installing devel files
-#	Default: without (missing deps; TBA in spec)
+#	Default: without
 %bcond_with devel_mode
 
 # --with gpg/--without gpg
@@ -39,8 +39,8 @@
 %define RT3_LOCALSTATEDIR	%{_localstatedir}/lib/rt3
 
 Name:		rt3
-Version:	3.8.1
-Release:	2%{?dist}
+Version:	3.8.2
+Release:	1%{?dist}
 Summary:	Request tracker 3
 
 Group:		Applications/Internet
@@ -133,6 +133,7 @@
 %{?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::HTTP::Server::Simple::StashWarnings)}
 %{?with_devel_mode:BuildRequires: perl(Test::MockTime)}
 %{?with_devel_mode:BuildRequires: perl(Test::Warn)}
 %{?with_devel_mode:BuildRequires: perl(Test::WWW::Mechanize)}
@@ -197,6 +198,16 @@
 %description mailgate
 %{summary}
 
+%if 0%{?with_devel_mode}
+%package -n perl-RT-Test
+Summary: rt3's test utility.
+Group:   Applications/Internet
+Requires:	rt3 = %{version}-%{release}
+
+%description -n perl-RT-Test
+%{summary}
+%endif
+
 %prep
 %setup -q -n rt-%{version}
 
@@ -406,7 +417,18 @@
 %{_sbindir}/rt-mailgate
 %{_mandir}/man1/rt-mailgate*
 
+%if 0%{?with_devel_mode}
+%files -n perl-RT-Test
+%defattr(-,root,root,-)
+%dir %{RT3_LIBDIR}/RT
+%{RT3_LIBDIR}/RT/Test*
+%endif
+
 %changelog
+* Fri Jan 23 2009 Ralf Cors??pius <corsepiu at fedoraproject.org> - 3.8.2-1
+- Upstream update.
+- Preps to add a perl-RT-Test package.
+
 * Sun Nov 30 2008 Ralf Cors??pius <corsepiu at fedoraproject.org> - 3.8.1-2
 - Fix rt3-mailgate's %%defattr(-,root,root,-).
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rt3/F-10/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	30 Nov 2008 09:07:23 -0000	1.12
+++ sources	23 Jan 2009 13:30:17 -0000	1.13
@@ -1 +1 @@
-72b4419816e43bde6b50ba68374882e3  rt-3.8.1.tar.gz
+100b1fd791e229c4338c0d056c65c12f  rt-3.8.2.tar.gz



From mildew at fedoraproject.org  Fri Jan 23 13:33:51 2009
From: mildew at fedoraproject.org (=?utf-8?q?Daniel_Kope=C4=8Dek?=)
Date: Fri, 23 Jan 2009 13:33:51 +0000 (UTC)
Subject: rpms/sectool/F-10 sectool.spec,1.23,1.24
Message-ID: <20090123133351.D8168700FE@cvs1.fedora.phx.redhat.com>

Author: mildew

Update of /cvs/pkgs/rpms/sectool/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28455

Modified Files:
	sectool.spec 
Log Message:
- removed showvars.sh
- added dist macro to Release:



Index: sectool.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sectool/F-10/sectool.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sectool.spec	1 Dec 2008 23:16:56 -0000	1.23
+++ sectool.spec	23 Jan 2009 13:33:21 -0000	1.24
@@ -1,7 +1,7 @@
 Summary: A security audit system and intrusion detection system
 Name: sectool
 Version: 0.9.2
-Release: 2
+Release: 3%{?dist}
 URL: https://hosted.fedoraproject.org/sectool/wiki/WikiStart
 Source0: %{name}-%{version}.tar.bz2
 Source1: sectool.log
@@ -69,6 +69,9 @@
 #this file is just for development
 rm $RPM_BUILD_ROOT/%{_datadir}/sectool/scheduler/selftest.py
 
+# remove debug stuff
+rm -f $RPM_BUILD_ROOT/%{_datadir}/sectool/tests/showvars.sh
+
 %find_lang %{name}
 
 %clean
@@ -109,6 +112,10 @@
 
 
 %changelog
+* Fri Jan 23 2009 Daniel Kopecek <dkopecek at redhat.com> - 0.9.2-3
+- removed showvars.sh
+- added dist macro to Release:
+
 * Tue Dec 02 2008 Daniel Kopecek <dkopecek at redhat.com> - 0.9.2-2
 - bugfix release
 



From rdieter at fedoraproject.org  Fri Jan 23 13:39:08 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 23 Jan 2009 13:39:08 +0000 (UTC)
Subject: rpms/libtunepimp/F-10 libtunepimp.spec,1.36,1.37
Message-ID: <20090123133908.DD061700FE@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/libtunepimp/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29204

Modified Files:
	libtunepimp.spec 
Log Message:
sync changes from devel/



Index: libtunepimp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libtunepimp/F-10/libtunepimp.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- libtunepimp.spec	22 Feb 2008 02:50:34 -0000	1.36
+++ libtunepimp.spec	23 Jan 2009 13:38:38 -0000	1.37
@@ -6,7 +6,7 @@
 Summary: A library for creating MusicBrainz enabled tagging applications 
 Name:	 libtunepimp
 Version: 0.5.3
-Release: 11%{?dist}
+Release: 13%{?dist}
 
 License: LGPLv2+
 Group: 	 System Environment/Libraries
@@ -19,7 +19,13 @@
 
 %define pkglibdir %{_libdir}/tunepimp
 
-BuildRequires: automake libtool
+%if 0%{?fedora} > 10
+# libtool2 (libltdl) building busted
+%else
+%define use_autofoo 1
+BuildRequires: automake libtool libtool-ltdl-devel
+%endif
+BuildRequires: chrpath
 BuildRequires: flac-devel
 %{?_with_mp4:BuildRequires: libmp4v2-devel}
 BuildRequires: libmpcdec-devel
@@ -59,11 +65,12 @@
 %description devel
 %{summary}.
 
-%{!?python_sitelib:%define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+%global python_ver %(%{__python} -c "import sys ; print sys.version[:3]")
+%global python_sitelib  %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")
+%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")
 %package -n python-tunepimp
 Summary: Python bindings for developing programs that will use %{name} 
 Group:   Development/Libraries
-%define python_ver %(%{__python} -c "import sys ; print sys.version[:3]")
 %description -n python-tunepimp
 %{summary}.
 
@@ -73,8 +80,15 @@
 
 %patch1 -p1 -b .gcc43
 
-# nuke rpath
-autoreconf
+# nuke rpath -- Rex
+%if 0%{?use_autofoo}
+autoreconf -i -f
+%else
+# ugly non-autofoo-but-works-with-libtool2 solution
+%if "%{_libdir}" != "/usr/lib"
+sed -i -e 's|"/lib /usr/lib|"/%{_lib} %{_libdir}|' configure
+%endif
+%endif
 
 
 %build
@@ -91,21 +105,28 @@
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
-make install DESTDIR=$RPM_BUILD_ROOT PLUGIN_DIR=%{pkglibdir}/plugins
+make install DESTDIR=%{buildroot} PLUGIN_DIR=%{pkglibdir}/plugins
 
 pushd python
-%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
+%{__python} setup.py install -O1 --skip-build --root %{buildroot}
 popd
 
+for foo in \
+ %{buildroot}%{_bindir}/puid \
+ %{buildroot}%{_libdir}/libtunepimp.so \
+ %{buildroot}%{pkglibdir}/plugins/*.tpp ; do
+  chrpath --list $foo && chrpath --delete $foo
+done
+
 # unpackaged files
-rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la
-%{!?_with_mp4:rm -f  $RPM_BUILD_ROOT%{pkglibdir}/plugins/mp4.tpp}
+rm -f %{buildroot}%{_libdir}/lib*.la
+%{!?_with_mp4:rm -f  %{buildroot}%{pkglibdir}/plugins/mp4.tpp}
 
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 
 %post -p /sbin/ldconfig
@@ -119,7 +140,7 @@
 # README omitted, it's mostly useless
 %doc README.LGPL
 %{_bindir}/puid
-%{_libdir}/lib*.so.*
+%{_libdir}/libtunepimp.so.5*
 %dir %{pkglibdir}/
 %dir %{pkglibdir}/plugins/
 %{pkglibdir}/plugins/flac.tpp
@@ -135,7 +156,7 @@
 %files devel
 %defattr(-,root,root,-)
 %{_includedir}/*
-%{_libdir}/lib*.so
+%{_libdir}/libtunepimp.so
 
 %files -n python-tunepimp
 %defattr(-,root,root,-)
@@ -144,6 +165,12 @@
 
 
 %changelog
+* Fri Dec 05 2008 Rex Dieter <rdieter at fedoraproject.org> - 0.5.3-13
+- fix build (libtool(2) and more rpath fun)
+
+* Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 0.5.3-12
+- Rebuild for Python 2.6
+
 * Thu Feb 21 2008 Rex Dieter <rdieter at fedoraproject.org> 0.5.3-11
 - gcc43 patch
 - include mp4 plugin here



From allisson at fedoraproject.org  Fri Jan 23 13:40:31 2009
From: allisson at fedoraproject.org (Allisson Azevedo)
Date: Fri, 23 Jan 2009 13:40:31 +0000 (UTC)
Subject: rpms/clutter-gtk/devel .cvsignore, 1.7, 1.8 clutter-gtk.spec, 1.7, 
	1.8 import.log, 1.2, 1.3 sources, 1.7, 1.8
Message-ID: <20090123134031.CFCF5700FE@cvs1.fedora.phx.redhat.com>

Author: allisson

Update of /cvs/pkgs/rpms/clutter-gtk/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29486/devel

Modified Files:
	.cvsignore clutter-gtk.spec import.log sources 
Log Message:

- Rebuild



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/clutter-gtk/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	16 Oct 2008 02:50:27 -0000	1.7
+++ .cvsignore	23 Jan 2009 13:40:01 -0000	1.8
@@ -1 +1 @@
-clutter-gtk-0.8.2.tar.gz
+clutter-gtk-0.8.2.tar.bz2


Index: clutter-gtk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/clutter-gtk/devel/clutter-gtk.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- clutter-gtk.spec	16 Oct 2008 02:50:27 -0000	1.7
+++ clutter-gtk.spec	23 Jan 2009 13:40:01 -0000	1.8
@@ -1,12 +1,12 @@
 Name:           clutter-gtk
 Version:        0.8.2
-Release:        1%{?dist}
+Release:        2%{?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.8/%{name}-%{version}.tar.gz
+Source0:        http://www.clutter-project.org/sources/%{name}/0.8/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gtk2-devel clutter-devel       
@@ -64,6 +64,9 @@
 
 %changelog
 
+* Fri Jan 23 2009 Allisson Azevedo <allisson at gmail.com> 0.8.2-2
+- Rebuild
+
 * Wed Oct 15 2008 Allisson Azevedo <allisson at gmail.com> 0.8.2-1
 - Update to 0.8.2
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/clutter-gtk/devel/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	16 Oct 2008 02:50:27 -0000	1.2
+++ import.log	23 Jan 2009 13:40:01 -0000	1.3
@@ -1,2 +1,3 @@
 clutter-gtk-0_8_1-1_fc9:HEAD:clutter-gtk-0.8.1-1.fc9.src.rpm:1220810052
 clutter-gtk-0_8_2-1_fc9:HEAD:clutter-gtk-0.8.2-1.fc9.src.rpm:1224125464
+clutter-gtk-0_8_2-2_fc10:HEAD:clutter-gtk-0.8.2-2.fc10.src.rpm:1232717836


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/clutter-gtk/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	16 Oct 2008 02:50:27 -0000	1.7
+++ sources	23 Jan 2009 13:40:01 -0000	1.8
@@ -1 +1 @@
-d6d5ebcdaa64e0f4c41cb391e55c8737  clutter-gtk-0.8.2.tar.gz
+fd8fe6ff8bdba349e393975cde80fec5  clutter-gtk-0.8.2.tar.bz2



From rdieter at fedoraproject.org  Fri Jan 23 13:42:12 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 23 Jan 2009 13:42:12 +0000 (UTC)
Subject: rpms/libmusicbrainz/devel dead.package, NONE, 1.1 .cvsignore, 1.5, 
	NONE libmusicbrainz-2.1.5-gcc43.patch, 1.1,
	NONE libmusicbrainz.spec, 1.26, NONE sources, 1.5, NONE
Message-ID: <20090123134212.E2A72700FE@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/libmusicbrainz/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29843/libmusicbrainz/devel

Added Files:
	dead.package 
Removed Files:
	.cvsignore libmusicbrainz-2.1.5-gcc43.patch 
	libmusicbrainz.spec sources 
Log Message:
uptream has virtually EOL'd libmusicbrainz/libtunepimp,
libmusicbrainz3 (and others) is the way forward.  See also
https://bugzilla.redhat.com/show_bug.cgi?id=226034



--- NEW FILE dead.package ---
upstream has virtually EOL'd libmusicbrainz/libtunepimp, 
libmusicbrainz3 (and others) is the way forward.  See also
https://bugzilla.redhat.com/show_bug.cgi?id=226034



--- .cvsignore DELETED ---


--- libmusicbrainz-2.1.5-gcc43.patch DELETED ---


--- libmusicbrainz.spec DELETED ---


--- sources DELETED ---



From rdieter at fedoraproject.org  Fri Jan 23 13:42:13 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 23 Jan 2009 13:42:13 +0000 (UTC)
Subject: rpms/libtunepimp/devel dead.package, NONE, 1.1 .cvsignore, 1.8,
	NONE libtunepimp-0.5.3-gcc43.patch, 1.3, NONE libtunepimp.spec,
	1.38, NONE sources, 1.7, NONE
Message-ID: <20090123134213.2984370141@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/libtunepimp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29843/libtunepimp/devel

Added Files:
	dead.package 
Removed Files:
	.cvsignore libtunepimp-0.5.3-gcc43.patch libtunepimp.spec 
	sources 
Log Message:
uptream has virtually EOL'd libmusicbrainz/libtunepimp,
libmusicbrainz3 (and others) is the way forward.  See also
https://bugzilla.redhat.com/show_bug.cgi?id=226034



--- NEW FILE dead.package ---
upstream has virtually EOL'd libmusicbrainz/libtunepimp, 
libmusicbrainz3 (and others) is the way forward.  See also
https://bugzilla.redhat.com/show_bug.cgi?id=226034



--- .cvsignore DELETED ---


--- libtunepimp-0.5.3-gcc43.patch DELETED ---


--- libtunepimp.spec DELETED ---


--- sources DELETED ---



From rdieter at fedoraproject.org  Fri Jan 23 13:44:42 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 23 Jan 2009 13:44:42 +0000 (UTC)
Subject: rpms/libmusicbrainz/devel dead.package,1.1,1.2
Message-ID: <20090123134442.E6C14700FE@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/libmusicbrainz/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30075/libmusicbrainz/devel

Modified Files:
	dead.package 
Log Message:
clarify, deprecated...



Index: dead.package
===================================================================
RCS file: /cvs/pkgs/rpms/libmusicbrainz/devel/dead.package,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- dead.package	23 Jan 2009 13:42:12 -0000	1.1
+++ dead.package	23 Jan 2009 13:44:12 -0000	1.2
@@ -1,4 +1,4 @@
-upstream has virtually EOL'd libmusicbrainz/libtunepimp, 
+upstream has virtually deprecated libmusicbrainz/libtunepimp, 
 libmusicbrainz3 (and others) is the way forward.  See also
 https://bugzilla.redhat.com/show_bug.cgi?id=226034
 



From rdieter at fedoraproject.org  Fri Jan 23 13:44:43 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 23 Jan 2009 13:44:43 +0000 (UTC)
Subject: rpms/libtunepimp/devel dead.package,1.1,1.2
Message-ID: <20090123134443.0DFAC70141@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/libtunepimp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30075/libtunepimp/devel

Modified Files:
	dead.package 
Log Message:
clarify, deprecated...



Index: dead.package
===================================================================
RCS file: /cvs/pkgs/rpms/libtunepimp/devel/dead.package,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- dead.package	23 Jan 2009 13:42:12 -0000	1.1
+++ dead.package	23 Jan 2009 13:44:12 -0000	1.2
@@ -1,4 +1,4 @@
-upstream has virtually EOL'd libmusicbrainz/libtunepimp, 
+upstream has virtually deprecated libmusicbrainz/libtunepimp, 
 libmusicbrainz3 (and others) is the way forward.  See also
 https://bugzilla.redhat.com/show_bug.cgi?id=226034
 



From than at fedoraproject.org  Fri Jan 23 14:03:38 2009
From: than at fedoraproject.org (Than Ngo)
Date: Fri, 23 Jan 2009 14:03:38 +0000 (UTC)
Subject: rpms/kde-l10n/devel kde-l10n.spec,1.60,1.61
Message-ID: <20090123140338.EC86C700FE@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kde-l10n/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv378

Modified Files:
	kde-l10n.spec 
Log Message:
it doesn't build, remove it temporary.



Index: kde-l10n.spec
===================================================================
RCS file: /cvs/extras/rpms/kde-l10n/devel/kde-l10n.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- kde-l10n.spec	22 Jan 2009 14:12:46 -0000	1.60
+++ kde-l10n.spec	23 Jan 2009 14:03:08 -0000	1.61
@@ -762,6 +762,9 @@
 done
 
 %build
+# it doesn't build, remove it temporary
+rm -f %{name}-et-%{version}/docs/kdeedu/kturtle
+
 for i in $(cat %{SOURCE1000}) ; do
   pushd %{name}-$i-%{version}
   # skip kdewebdev for now, because we're still shipping kdewebdev 3 due to Quanta



From kkofler at fedoraproject.org  Fri Jan 23 14:14:52 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Fri, 23 Jan 2009 14:14:52 +0000 (UTC)
Subject: rpms/phonon/devel phonon.spec,1.22,1.23
Message-ID: <20090123141452.AC2D6700FE@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/phonon/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1822/devel

Modified Files:
	phonon.spec 
Log Message:
* Fri Jan 23 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.0-2
- fix typo in postun scriptlet (introduced in 4.2.96-3)


Index: phonon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/phonon/devel/phonon.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- phonon.spec	22 Jan 2009 12:48:50 -0000	1.22
+++ phonon.spec	23 Jan 2009 14:14:22 -0000	1.23
@@ -1,7 +1,7 @@
 Summary: Multimedia framework api
 Name:    phonon
 Version: 4.3.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 Group:   System Environment/Libraries
 License: LGPLv2+
@@ -107,7 +107,7 @@
 %postun
 /sbin/ldconfig
 xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
-xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || 
+xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || :
 
 %files
 %defattr(-,root,root,-)
@@ -140,6 +140,9 @@
 
 
 %changelog
+* Fri Jan 23 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.0-2
+- fix typo in postun scriptlet (introduced in 4.2.96-3)
+
 * Thu Jan 22 2009 Than Ngo <than at redhat.com> - 4.3.0-1
 - 4.3.0
 



From spot at fedoraproject.org  Fri Jan 23 14:17:01 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Fri, 23 Jan 2009 14:17:01 +0000 (UTC)
Subject: rpms/gambas2/devel gambas2.spec,1.10,1.11
Message-ID: <20090123141701.84F07700FE@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/gambas2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2231

Modified Files:
	gambas2.spec 
Log Message:
rebuild for new mysql


Index: gambas2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gambas2/devel/gambas2.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- gambas2.spec	5 Jan 2009 20:44:31 -0000	1.10
+++ gambas2.spec	23 Jan 2009 14:16:31 -0000	1.11
@@ -1,7 +1,7 @@
 Name:		gambas2
 Summary:	IDE based on a basic interpreter with object extensions
 Version:	2.10.2
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GPL+
 Group:		Development/Tools
 URL:		http://gambas.sourceforge.net/
@@ -1491,6 +1491,9 @@
 %{_datadir}/%{name}/info/gb.xml.xslt.*
 
 %changelog
+* Fri Jan 23 2009 Tom "spot" Callaway <tcallawa at redhat.com> 2.10.2-2
+- rebuild for new mysql
+
 * Mon Jan  5 2009 Tom "spot" Callaway <tcallawa at redhat.com> 2.10.2-1
 - update to 2.10.2
 



From allisson at fedoraproject.org  Fri Jan 23 14:16:58 2009
From: allisson at fedoraproject.org (Allisson Azevedo)
Date: Fri, 23 Jan 2009 14:16:58 +0000 (UTC)
Subject: rpms/pyclutter/devel .cvsignore, 1.8, 1.9 import.log, 1.1,
	1.2 pyclutter.spec, 1.15, 1.16 sources, 1.10, 1.11
Message-ID: <20090123141658.8E9CA700FE@cvs1.fedora.phx.redhat.com>

Author: allisson

Update of /cvs/pkgs/rpms/pyclutter/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2193/devel

Modified Files:
	.cvsignore import.log pyclutter.spec sources 
Log Message:

- Update to 0.8.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pyclutter/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	9 Oct 2008 06:18:59 -0000	1.8
+++ .cvsignore	23 Jan 2009 14:16:28 -0000	1.9
@@ -1 +1 @@
-pyclutter-0.8.0.tar.gz
+pyclutter-0.8.2.tar.bz2


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/pyclutter/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	17 Oct 2008 21:01:39 -0000	1.1
+++ import.log	23 Jan 2009 14:16:28 -0000	1.2
@@ -1 +1,2 @@
 pyclutter-0_8_0-1_fc9:HEAD:pyclutter-0.8.0-1.fc9.src.rpm:1224277238
+pyclutter-0_8_2-1_fc10:HEAD:pyclutter-0.8.2-1.fc10.src.rpm:1232719812


Index: pyclutter.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pyclutter/devel/pyclutter.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- pyclutter.spec	29 Nov 2008 18:16:44 -0000	1.15
+++ pyclutter.spec	23 Jan 2009 14:16:28 -0000	1.16
@@ -2,19 +2,19 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           pyclutter
-Version:        0.8.0
-Release:        2%{?dist}
+Version:        0.8.2
+Release:        1%{?dist}
 Summary:        Python modules that allow you to use the Clutter toolkit
 
 Group:          Development/Languages
 License:        LGPLv2+
 URL:            http://www.clutter-project.org/
-Source0:        http://www.clutter-project.org/sources/%{name}/0.8/%{name}-%{version}.tar.gz
+Source0:        http://www.clutter-project.org/sources/%{name}/0.8/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 #BuildArch:      
-BuildRequires:  pygtk2-devel gtk2-devel clutter-devel clutter-gst-devel clutter-gtk-devel gstreamer-python
-BuildRequires:  clutter-cairo-devel
+BuildRequires:  pygtk2-devel gtk2-devel clutter-devel clutter-gst-devel clutter-gtk-devel 
+BuildRequires:  clutter-cairo-devel gstreamer-python-devel
 
 %description
 This archive contains the Python modules that allow you to use the
@@ -97,8 +97,8 @@
 %{python_sitearch}/clutter/keysyms.py*
 %{python_sitearch}/clutter/deprecation.py*
 %dir %{_datadir}/%{name}
-%dir %{_datadir}/%{name}/defs
-%{_datadir}/%{name}/defs/*.defs
+#%dir %{_datadir}/%{name}/defs
+#%{_datadir}/%{name}/defs/*.defs
 %dir %{_datadir}/%{name}/1.0
 %dir %{_datadir}/%{name}/1.0/defs
 %{_datadir}/%{name}/1.0/defs/*.defs
@@ -125,10 +125,13 @@
 
 
 %changelog
+
+* Fri Jan 23 2009 Allisson Azevedo <allisson at gmail.com> 0.8.2-1
+- Update to 0.8.2
+
 * Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 0.8.0-2
 - Rebuild for Python 2.6
 
-
 * Wed Oct 15 2008 Allisson Azevedo <allisson at gmail.com> 0.8.0-1
 - Update to 0.8.0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pyclutter/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	17 Oct 2008 21:01:39 -0000	1.10
+++ sources	23 Jan 2009 14:16:28 -0000	1.11
@@ -1 +1 @@
-a88d49fa931dbfb8d9d4137ace32d041  pyclutter-0.8.0.tar.gz
+2a57049c23337a40e8d39e7d7375a66c  pyclutter-0.8.2.tar.bz2



From nickc at fedoraproject.org  Fri Jan 23 14:18:33 2009
From: nickc at fedoraproject.org (Nicholas Clifton)
Date: Fri, 23 Jan 2009 14:18:33 +0000 (UTC)
Subject: rpms/binutils/devel binutils.spec,1.149,1.150
Message-ID: <20090123141833.384E6700FE@cvs1.fedora.phx.redhat.com>

Author: nickc

Update of /cvs/pkgs/rpms/binutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2620

Modified Files:
	binutils.spec 
Log Message:
Only require dejagnu if the the testsuites are going to be run.  (BZ 481169)



Index: binutils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/binutils/devel/binutils.spec,v
retrieving revision 1.149
retrieving revision 1.150
diff -u -r1.149 -r1.150
--- binutils.spec	29 Nov 2008 07:59:03 -0000	1.149
+++ binutils.spec	23 Jan 2009 14:18:02 -0000	1.150
@@ -17,7 +17,7 @@
 Summary: A GNU collection of binary utilities
 Name: %{?cross}binutils%{?_with_debug:-debug}
 Version: 2.19.50.0.1
-Release: 8%{?dist}
+Release: 9%{?dist}
 License: GPLv3+
 Group: Development/Tools
 URL: http://sources.redhat.com/binutils
@@ -43,11 +43,11 @@
 %endif
 
 Buildroot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
-BuildRequires: texinfo >= 4.0, dejagnu, gettext, flex, bison, zlib-devel
+BuildRequires: texinfo >= 4.0, gettext, flex, bison, zlib-devel
 # Required for: ld-bootstrap/bootstrap.exp bootstrap with --static
 # It should not be required for: ld-elf/elf.exp static {preinit,init,fini} array
 %if %{run_testsuite}
-BuildRequires: zlib-static
+BuildRequires: dejagnu, zlib-static
 %endif
 Conflicts: gcc-c++ < 4.0.0
 Requires(post): /sbin/install-info
@@ -345,6 +345,9 @@
 %endif # %{isnative}
 
 %changelog
+* Fri Jan 23 2009 Nick Clifton <nickc at redhat.com> 2.19.50.0.1-9
+- Only require dejagnu if the testsuites are going to be run.  (BZ 481169)
+
 * Sat Nov 29 2008 Nick Clifton <nickc at redhat.com> 2.19.50.0.1-8
 - Add build-id patch to ensure that section contents are incorporated
   into a build id.  (BZ 472152)



From allisson at fedoraproject.org  Fri Jan 23 14:24:59 2009
From: allisson at fedoraproject.org (Allisson Azevedo)
Date: Fri, 23 Jan 2009 14:24:59 +0000 (UTC)
Subject: rpms/ruby-cairo/devel import.log,1.2,1.3 ruby-cairo.spec,1.7,1.8
Message-ID: <20090123142459.8C595700FE@cvs1.fedora.phx.redhat.com>

Author: allisson

Update of /cvs/pkgs/rpms/ruby-cairo/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4061/devel

Modified Files:
	import.log ruby-cairo.spec 
Log Message:

- Rebuild



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/ruby-cairo/devel/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	6 Oct 2008 19:01:49 -0000	1.2
+++ import.log	23 Jan 2009 14:24:29 -0000	1.3
@@ -1,2 +1,3 @@
 ruby-cairo-1_7_0-1_fc9:HEAD:ruby-cairo-1.7.0-1.fc9.src.rpm:1220967755
 ruby-cairo-1_8_0-1_fc9:HEAD:ruby-cairo-1.8.0-1.fc9.src.rpm:1223319656
+ruby-cairo-1_8_0-2_fc10:HEAD:ruby-cairo-1.8.0-2.fc10.src.rpm:1232720501


Index: ruby-cairo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ruby-cairo/devel/ruby-cairo.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ruby-cairo.spec	6 Oct 2008 19:01:49 -0000	1.7
+++ ruby-cairo.spec	23 Jan 2009 14:24:29 -0000	1.8
@@ -3,7 +3,7 @@
 
 Name:           ruby-cairo
 Version:        1.8.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Ruby bindings for cairo
 
 Group:          System Environment/Libraries
@@ -82,6 +82,9 @@
 
 %changelog
 
+* Fri Jan 23 2009 Allisson Azevedo <allisson at gmail.com> 1.8.0-2
+- Rebuild
+
 * Sun Oct  5 2008 Allisson Azevedo <allisson at gmail.com> 1.8.0-1
 - Update to 1.8.0
 



From nickc at fedoraproject.org  Fri Jan 23 14:29:18 2009
From: nickc at fedoraproject.org (Nicholas Clifton)
Date: Fri, 23 Jan 2009 14:29:18 +0000 (UTC)
Subject: rpms/binutils/devel binutils.spec,1.150,1.151
Message-ID: <20090123142918.3E364700FE@cvs1.fedora.phx.redhat.com>

Author: nickc

Update of /cvs/pkgs/rpms/binutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4573

Modified Files:
	binutils.spec 
Log Message:
Mystery release number 9 is already tagged, so try using 10 instead.



Index: binutils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/binutils/devel/binutils.spec,v
retrieving revision 1.150
retrieving revision 1.151
diff -u -r1.150 -r1.151
--- binutils.spec	23 Jan 2009 14:18:02 -0000	1.150
+++ binutils.spec	23 Jan 2009 14:28:47 -0000	1.151
@@ -17,7 +17,7 @@
 Summary: A GNU collection of binary utilities
 Name: %{?cross}binutils%{?_with_debug:-debug}
 Version: 2.19.50.0.1
-Release: 9%{?dist}
+Release: 10%{?dist}
 License: GPLv3+
 Group: Development/Tools
 URL: http://sources.redhat.com/binutils
@@ -345,7 +345,7 @@
 %endif # %{isnative}
 
 %changelog
-* Fri Jan 23 2009 Nick Clifton <nickc at redhat.com> 2.19.50.0.1-9
+* Fri Jan 23 2009 Nick Clifton <nickc at redhat.com> 2.19.50.0.1-10
 - Only require dejagnu if the testsuites are going to be run.  (BZ 481169)
 
 * Sat Nov 29 2008 Nick Clifton <nickc at redhat.com> 2.19.50.0.1-8



From rdieter at fedoraproject.org  Fri Jan 23 14:32:35 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 23 Jan 2009 14:32:35 +0000 (UTC)
Subject: rpms/xine-lib/devel xine-lib-1.1.15-avsync_hack.patch, NONE,
	1.1 .cvsignore, 1.18, 1.19 sources, 1.20, 1.21 xine-lib.spec,
	1.60, 1.61
Message-ID: <20090123143236.02364700FE@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/xine-lib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4996

Modified Files:
	.cvsignore sources xine-lib.spec 
Added Files:
	xine-lib-1.1.15-avsync_hack.patch 
Log Message:
* Fri Jan 23 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.1.16.1-1
- xine-lib-1.1.16.1
- include avsync patch (#470568)


xine-lib-1.1.15-avsync_hack.patch:

--- NEW FILE xine-lib-1.1.15-avsync_hack.patch ---
diff -uNr xine-lib-1.1.15.orig/src/xine-engine/audio_out.c xine-lib-1.1.15/src/xine-engine/audio_out.c
--- xine-lib-1.1.15.orig/src/xine-engine/audio_out.c	2008-07-10 18:19:10.000000000 +0200
+++ xine-lib-1.1.15/src/xine-engine/audio_out.c	2009-01-10 21:57:20.000000000 +0100
@@ -1151,8 +1151,17 @@
   
     /*
      * calculate gap:
+     *
+     * HACK (rwa): If we have no video stream we do not need an AV sync and so
+     *             we assume a gap of 0. This seems to avoid the skips in the
+     *             first seconds when playing audio-only via the "glitch-free"
+     *             pulseaudio server.
      */
-    gap = in_buf->vpts - hw_vpts;
+    if (in_buf && in_buf->stream && in_buf->stream->video_decoder_plugin) {
+	gap = in_buf->vpts - hw_vpts;
+    } else {
+	gap = 0;
+    }
     lprintf ("hw_vpts : %" PRId64 " buffer_vpts : %" PRId64 " gap : %" PRId64 "\n",
              hw_vpts, in_buf->vpts, gap);
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xine-lib/devel/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- .cvsignore	7 Jan 2009 19:18:46 -0000	1.18
+++ .cvsignore	23 Jan 2009 14:32:05 -0000	1.19
@@ -1,2 +1,2 @@
-xine-lib-1.1.16-autotools.patch.bz2
-xine-lib-1.1.16-pruned.tar.bz2
+xine-lib-1.1.16.1-autotools.patch.bz2
+xine-lib-1.1.16.1-pruned.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xine-lib/devel/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources	7 Jan 2009 19:56:48 -0000	1.20
+++ sources	23 Jan 2009 14:32:05 -0000	1.21
@@ -1,2 +1,2 @@
-fe8148f2a0ec7b2e75ad509e8086e33f  xine-lib-1.1.16-autotools.patch.bz2
-512f31d8414ef4654ca366c0dce37301  xine-lib-1.1.16-pruned.tar.bz2
+e3e061f93f36eae910b66cb0c973dbb8  xine-lib-1.1.16.1-autotools.patch.bz2
+aa1265b1007086c0906ec8134cfeacf6  xine-lib-1.1.16.1-pruned.tar.bz2


Index: xine-lib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xine-lib/devel/xine-lib.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- xine-lib.spec	18 Jan 2009 22:33:17 -0000	1.60
+++ xine-lib.spec	23 Jan 2009 14:32:05 -0000	1.61
@@ -33,8 +33,8 @@
 
 Summary:        Xine library
 Name:           xine-lib
-Version:        1.1.16
-Release:        2%{?dist}
+Version:        1.1.16.1
+Release:        1%{?dist}
 License:        GPLv2+
 Group:          System Environment/Libraries
 URL:            http://xinehq.de/
@@ -50,7 +50,10 @@
 
 Patch1:         %{name}-1.1.4-optflags.patch
 Patch6:         %{name}-1.1.1-deepbind-939.patch
+# FIXME for 1.1.16.1 ?
 Patch7:         %{name}-1.1.16-old-caca.patch
+# http://bugzilla.redhat.com/470568
+Patch8:         xine-lib-1.1.15-avsync_hack.patch
 ## upstream patches
 
 Provides:       xine-lib(plugin-abi) = %{abiver}
@@ -73,7 +76,7 @@
 %if 0%{?old_caca}
 BuildRequires:  libcaca-devel >= 0.99
 %else
-BuildRequires:  libcaca-devel >= 0.99-0.5.beta16
+BuildRequires:  libcaca-devel >= 0.99-0.5.beta14
 %endif
 %if 0%{!?_without_directfb:1}
 BuildRequires:  directfb-devel
@@ -192,10 +195,13 @@
 # needed at least when compiling with external ffmpeg and internal faad livna bug#939.
 # see also http://bugzilla.redhat.com/480504 for side-effects
 #patch6 -p1 -b .deepbind
+
 %if 0%{?old_caca}
 %patch7 -p0 -b .old-caca
 %endif
 
+%patch8 -p1 -b .avsync_hack
+
 # Avoid standard rpaths on lib64 archs: (autotools patch should handle this, no? -- Rex )
 #sed -i -e 's|"/lib /usr/lib\b|"/%{_lib} %{_libdir}|' configure
 
@@ -428,6 +434,10 @@
 
 
 %changelog
+* Fri Jan 23 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.1.16.1-1
+- xine-lib-1.1.16.1
+- include avsync patch (#470568)
+
 * Sun Jan 18 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.1.16-2
 - drop deepbind patch (#480504)
 - caca support (EPEL)



From hadess at fedoraproject.org  Fri Jan 23 14:39:47 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Fri, 23 Jan 2009 14:39:47 +0000 (UTC)
Subject: rpms/gmyth/devel gmyth.spec,1.11,1.12
Message-ID: <20090123143947.9E3FA700FE@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/gmyth/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5828

Modified Files:
	gmyth.spec 
Log Message:
* Fri Jan 23 2009 - Bastien Nocera <bnocera at redhat.com> - 0.7.1-8
- Rebuild for new MySQL libraries



Index: gmyth.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gmyth/devel/gmyth.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- gmyth.spec	1 Sep 2008 10:08:27 -0000	1.11
+++ gmyth.spec	23 Jan 2009 14:39:17 -0000	1.12
@@ -3,7 +3,7 @@
 Summary: MythTV remote access libraries
 Name: gmyth
 Version: 0.7.1
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
@@ -84,6 +84,9 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Fri Jan 23 2009 - Bastien Nocera <bnocera at redhat.com> - 0.7.1-8
+- Rebuild for new MySQL libraries
+
 * Mon Sep 01 2008 - Bastien Nocera <bnocera at redhat.com> - 0.7.1-7
 - Remove extraneous debug and warnings
 



From hadess at fedoraproject.org  Fri Jan 23 14:42:49 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Fri, 23 Jan 2009 14:42:49 +0000 (UTC)
Subject: rpms/totem/devel totem.spec,1.216,1.217
Message-ID: <20090123144249.4083C700FE@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/totem/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6326

Modified Files:
	totem.spec 
Log Message:
* Fri Jan 23 2009 - Bastien Nocera <bnocera at redhat.com> - 2.25.3-8
- Rebuild for new MySQL libraries



Index: totem.spec
===================================================================
RCS file: /cvs/pkgs/rpms/totem/devel/totem.spec,v
retrieving revision 1.216
retrieving revision 1.217
diff -u -r1.216 -r1.217
--- totem.spec	17 Jan 2009 04:33:24 -0000	1.216
+++ totem.spec	23 Jan 2009 14:42:18 -0000	1.217
@@ -10,7 +10,7 @@
 Summary: Movie player for GNOME
 Name: totem
 Version: 2.25.3
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: GPLv2+ with exceptions
 Group: Applications/Multimedia
 URL: http://projects.gnome.org/totem/
@@ -54,6 +54,9 @@
 # FIXME for the mozilla plugin viewer
 BuildRequires: startup-notification-devel
 
+# Work-around for fontconfig bug https://bugzilla.redhat.com/show_bug.cgi?id=480928
+BuildRequires: liberation-sans-fonts
+
 # For plugins
 BuildRequires: lirc-devel
 BuildRequires: libgalago-devel
@@ -459,6 +462,9 @@
 %endif
 
 %changelog
+* Fri Jan 23 2009 - Bastien Nocera <bnocera at redhat.com> - 2.25.3-8
+- Rebuild for new MySQL libraries
+
 * Fri Jan 16 2009  Matthias Clasen <mclasen at redhat.com> - 2.25.3-7
 - Own /usr/lib/totem
 



From kwizart at fedoraproject.org  Fri Jan 23 15:10:14 2009
From: kwizart at fedoraproject.org (Chauvet Nicolas)
Date: Fri, 23 Jan 2009 15:10:14 +0000 (UTC)
Subject: rpms/libproxy/devel import.log, NONE, 1.1 libproxy-0.2.3-dbus.patch,
	NONE, 1.1 libproxy.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <20090123151014.84483700FE@cvs1.fedora.phx.redhat.com>

Author: kwizart

Update of /cvs/pkgs/rpms/libproxy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9968/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log libproxy-0.2.3-dbus.patch libproxy.spec 
Log Message:
Initial import for Rawhide



--- NEW FILE import.log ---
libproxy-0_2_3-8_fc10:HEAD:libproxy-0.2.3-8.fc10.src.rpm:1232723319

libproxy-0.2.3-dbus.patch:

--- NEW FILE libproxy-0.2.3-dbus.patch ---
diff -up libproxy-0.2.3/configure.dbus libproxy-0.2.3/configure
--- libproxy-0.2.3/configure.dbus	2008-07-11 12:13:12.000000000 +0200
+++ libproxy-0.2.3/configure	2008-07-11 12:13:24.000000000 +0200
@@ -20408,12 +20408,12 @@ if test -n "$NetworkManager_CFLAGS"; the
     pkg_cv_NetworkManager_CFLAGS="$NetworkManager_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"NetworkManager\"") >&5
-  ($PKG_CONFIG --exists --print-errors "NetworkManager") 2>&5
+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"NetworkManager dbus-1\"") >&5
+  ($PKG_CONFIG --exists --print-errors "NetworkManager dbus-1") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
-  pkg_cv_NetworkManager_CFLAGS=`$PKG_CONFIG --cflags "NetworkManager" 2>/dev/null`
+  pkg_cv_NetworkManager_CFLAGS=`$PKG_CONFIG --cflags "NetworkManager dbus-1" 2>/dev/null`
 else
   pkg_failed=yes
 fi
@@ -20424,12 +20424,12 @@ if test -n "$NetworkManager_LIBS"; then
     pkg_cv_NetworkManager_LIBS="$NetworkManager_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"NetworkManager\"") >&5
-  ($PKG_CONFIG --exists --print-errors "NetworkManager") 2>&5
+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"NetworkManager dbus-1\"") >&5
+  ($PKG_CONFIG --exists --print-errors "NetworkManager dbus-1") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
-  pkg_cv_NetworkManager_LIBS=`$PKG_CONFIG --libs "NetworkManager" 2>/dev/null`
+  pkg_cv_NetworkManager_LIBS=`$PKG_CONFIG --libs "NetworkManager dbus-1" 2>/dev/null`
 else
   pkg_failed=yes
 fi
@@ -20447,9 +20447,9 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        NetworkManager_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "NetworkManager" 2>&1`
+	        NetworkManager_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "NetworkManager dbus-1" 2>&1`
         else
-	        NetworkManager_PKG_ERRORS=`$PKG_CONFIG --print-errors "NetworkManager" 2>&1`
+	        NetworkManager_PKG_ERRORS=`$PKG_CONFIG --print-errors "NetworkManager dbus-1" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$NetworkManager_PKG_ERRORS" >&5
diff -up libproxy-0.2.3/configure.ac.dbus libproxy-0.2.3/configure.ac
--- libproxy-0.2.3/configure.ac.dbus	2008-07-11 12:12:43.000000000 +0200
+++ libproxy-0.2.3/configure.ac	2008-07-11 12:12:58.000000000 +0200
@@ -19,7 +19,7 @@ PKG_CHECK_MODULES(webkit, webkit-1.0, ha
 PKG_CHECK_MODULES(mozjs, xulrunner-js, have_mozjs=yes, 
 		[PKG_CHECK_MODULES(mozjs, firefox-js, have_mozjs=yes,
 		[PKG_CHECK_MODULES(mozjs, mozilla-js, have_mozjs=yes, have_mozjs=no)])])
-PKG_CHECK_MODULES(NetworkManager, NetworkManager, 
+PKG_CHECK_MODULES(NetworkManager, NetworkManager dbus-1, 
 					have_networkmanager=yes, have_networkmanager=no)
 
 # Environmental Variable


--- NEW FILE libproxy.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

%define gecko_version 1.9

Name:           libproxy
Version:        0.2.3
Release:        8%{?dist}
Summary:        A library handling all the details of proxy configuration

Group:          System Environment/Libraries
License:        LGPLv2+
URL:            http://code.google.com/p/libproxy/
Source0:        http://libproxy.googlecode.com/files/libproxy-%{version}.tar.gz
Patch0:         libproxy-0.2.3-dbus.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  python-devel
#Virtual Provides - We need either mozjs or WebKit
Requires: %{name}-pac >= %{version}
#
Requires: libproxy-python = %{version}-%{release}
Requires: libproxy-bin = %{version}-%{release}

# gnome
BuildRequires:  GConf2-devel
# mozjs
BuildRequires:  gecko-devel >= %{gecko_version}
# NetworkManager
BuildRequires:  NetworkManager-devel
BuildRequires:  dbus-devel
# webkit (gtk)
BuildRequires:  WebKit-gtk-devel
# kde
BuildRequires:  libXmu-devel
BuildRequires:  libX11-devel


%description
libproxy offers the following features:

    * extremely small core footprint (< 35K)
    * no external dependencies within libproxy core
      (libproxy plugins may have dependencies)
    * only 3 functions in the stable external API
    * dynamic adjustment to changing network topology
    * a standard way of dealing with proxy settings across all scenarios
    * a sublime sense of joy and accomplishment 

Non-default rpmbuild options:
--with webkit:           Enable WebKit-gtk support


%package        bin
Summary:        Binary to test %{name}
Group:          Applications/System
Requires:       %{name} = %{version}-%{release}

%description    bin
The %{name}-bin package contains the proxy binary for %{name}

%package        python
Summary:        Binding for %{name} and python
Group:          System Environment/Libraries
Requires:       %{name} = %{version}-%{release}

%description    python
The %{name}-python package contains the python binding for %{name}

%package        gnome
Summary:        Plugin for %{name} and gnome
Group:          System Environment/Libraries
Requires:       %{name} = %{version}-%{release}

%description    gnome
The %{name}-gnome package contains the %{name} plugin for gnome.

%package        kde
Summary:        Plugin for %{name} and kde
Group:          System Environment/Libraries
Requires:       %{name} = %{version}-%{release}

%description    kde
The %{name}-kde package contains the %{name} plugin for kde.

%package        mozjs
Summary:        Plugin for %{name} and mozjs
Group:          System Environment/Libraries
Requires:       %{name} = %{version}
#Tweak this according to the current gecko-libs version
Requires:       gecko-libs >= %{gecko_version}
Provides:       %{name}-pac = %{version}-%{release}

%description    mozjs
The %{name}-mozjs package contains the %{name} plugin for mozjs.

%package        webkit
Summary:        Plugin for %{name} and webkit
Group:          System Environment/Libraries
Requires:       %{name} = %{version}
Provides:       %{name}-pac = %{version}-%{release}

%description    webkit
The %{name}-webkit package contains the %{name} plugin for
webkit.

%package        devel
Summary:        Development files for %{name}
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}
Requires:       pkgconfig

%description    devel
The %{name}-devel package contains libraries and header files for
developing applications that use %{name}.


%prep
%setup -q
%patch0 -p1 -b .dbus
touch -r configure.dbus configure
touch -r configure.ac.dbus configure.ac


%build
%configure --includedir=%{_includedir}/libproxy --disable-static --with-python
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'


%clean
rm -rf $RPM_BUILD_ROOT


%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig


%files 
%defattr(-,root,root,-)
%doc AUTHORS COPYING README
%{_libdir}/*.so.*
%dir %{_libdir}/%{name}
%dir %{_libdir}/%{name}/%{version}
%dir %{_libdir}/%{name}/%{version}/plugins
%{_libdir}/%{name}/%{version}/plugins/envvar.so
%{_libdir}/%{name}/%{version}/plugins/file.so
%{_libdir}/%{name}/%{version}/plugins/networkmanager.so

%files bin
%defattr(-,root,root,-)
%{_bindir}/proxy

%files python
%defattr(-,root,root,-)
%{python_sitelib}/*

%files gnome
%defattr(-,root,root,-)
%{_libdir}/%{name}/%{version}/plugins/gnome.so

%files kde
%defattr(-,root,root,-)
%{_libdir}/%{name}/%{version}/plugins/kde.so

%files mozjs
%defattr(-,root,root,-)
%{_libdir}/%{name}/%{version}/plugins/mozjs.so

%files webkit
%defattr(-,root,root,-)
%{_libdir}/%{name}/%{version}/plugins/webkit.so

%files devel
%defattr(-,root,root,-)
%{_includedir}/libproxy/
%{_libdir}/*.so
%{_libdir}/pkgconfig/libproxy-1.0.pc


%changelog
* Thu Jan 22 2009 kwizart < kwizart at gmail.com > - 0.2.3-8
- Merge NetworkManager module into the main libproxy package
- Main Requires the -python and -bin subpackage 
 (splitted for multilibs compliance).

* Fri Oct 24 2008 kwizart < kwizart at gmail.com > - 0.2.3-7
- Disable Gnome/KDE default support via builtin modules.
 (it needs to be integrated via Gconf2/neon instead).

* Tue Oct 21 2008 kwizart < kwizart at gmail.com > - 0.2.3-6
- Disable Obsoletes.
- Requires ev instead of evr for optionnals sub-packages.

* Tue Oct 21 2008 kwizart < kwizart at gmail.com > - 0.2.3-5
- Use conditionals build.

* Mon Sep 15 2008 kwizart < kwizart at gmail.com > - 0.2.3-4
- Remove plugin- in the name of the packages

* Mon Aug  4 2008 kwizart < kwizart at gmail.com > - 0.2.3-3
- Move proxy.h to libproxy/proxy.h
  This will prevent it to be included in the default include path
- Split main to libs and util and use libproxy to install all

* Mon Aug  4 2008 kwizart < kwizart at gmail.com > - 0.2.3-2
- Rename binding-python to python
- Add Requires: gecko-libs >= %%{gecko_version}
- Fix some descriptions
- Add plugin-webkit package
 
* Fri Jul 11 2008 kwizart < kwizart at gmail.com > - 0.2.3-1
- Convert to Fedora spec

* Fri Jun 6 2008 - dominique-rpm at leuenberger.net
- Updated to version 0.2.3
* Wed Jun 4 2008 - dominique-rpm at leuenberger.net
- Extended spec file to build all available plugins
* Tue Jun 3 2008 - dominique-rpm at leuenberger.net
- Initial spec file for Version 0.2.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libproxy/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	6 Aug 2008 17:33:21 -0000	1.1
+++ .cvsignore	23 Jan 2009 15:09:43 -0000	1.2
@@ -0,0 +1 @@
+libproxy-0.2.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libproxy/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	6 Aug 2008 17:33:21 -0000	1.1
+++ sources	23 Jan 2009 15:09:44 -0000	1.2
@@ -0,0 +1 @@
+86b635e1eb2d665cfbef4c6134fe6604  libproxy-0.2.3.tar.gz



From kwizart at fedoraproject.org  Fri Jan 23 15:12:32 2009
From: kwizart at fedoraproject.org (Chauvet Nicolas)
Date: Fri, 23 Jan 2009 15:12:32 +0000 (UTC)
Subject: rpms/libproxy/F-10 import.log, NONE, 1.1 libproxy-0.2.3-dbus.patch, 
	NONE, 1.1 libproxy.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <20090123151232.6D5A9700FE@cvs1.fedora.phx.redhat.com>

Author: kwizart

Update of /cvs/pkgs/rpms/libproxy/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10454/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	import.log libproxy-0.2.3-dbus.patch libproxy.spec 
Log Message:
Initial import for F-10



--- NEW FILE import.log ---
libproxy-0_2_3-8_fc10:F-10:libproxy-0.2.3-8.fc10.src.rpm:1232723478

libproxy-0.2.3-dbus.patch:

--- NEW FILE libproxy-0.2.3-dbus.patch ---
diff -up libproxy-0.2.3/configure.dbus libproxy-0.2.3/configure
--- libproxy-0.2.3/configure.dbus	2008-07-11 12:13:12.000000000 +0200
+++ libproxy-0.2.3/configure	2008-07-11 12:13:24.000000000 +0200
@@ -20408,12 +20408,12 @@ if test -n "$NetworkManager_CFLAGS"; the
     pkg_cv_NetworkManager_CFLAGS="$NetworkManager_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"NetworkManager\"") >&5
-  ($PKG_CONFIG --exists --print-errors "NetworkManager") 2>&5
+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"NetworkManager dbus-1\"") >&5
+  ($PKG_CONFIG --exists --print-errors "NetworkManager dbus-1") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
-  pkg_cv_NetworkManager_CFLAGS=`$PKG_CONFIG --cflags "NetworkManager" 2>/dev/null`
+  pkg_cv_NetworkManager_CFLAGS=`$PKG_CONFIG --cflags "NetworkManager dbus-1" 2>/dev/null`
 else
   pkg_failed=yes
 fi
@@ -20424,12 +20424,12 @@ if test -n "$NetworkManager_LIBS"; then
     pkg_cv_NetworkManager_LIBS="$NetworkManager_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"NetworkManager\"") >&5
-  ($PKG_CONFIG --exists --print-errors "NetworkManager") 2>&5
+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"NetworkManager dbus-1\"") >&5
+  ($PKG_CONFIG --exists --print-errors "NetworkManager dbus-1") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
-  pkg_cv_NetworkManager_LIBS=`$PKG_CONFIG --libs "NetworkManager" 2>/dev/null`
+  pkg_cv_NetworkManager_LIBS=`$PKG_CONFIG --libs "NetworkManager dbus-1" 2>/dev/null`
 else
   pkg_failed=yes
 fi
@@ -20447,9 +20447,9 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        NetworkManager_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "NetworkManager" 2>&1`
+	        NetworkManager_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "NetworkManager dbus-1" 2>&1`
         else
-	        NetworkManager_PKG_ERRORS=`$PKG_CONFIG --print-errors "NetworkManager" 2>&1`
+	        NetworkManager_PKG_ERRORS=`$PKG_CONFIG --print-errors "NetworkManager dbus-1" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$NetworkManager_PKG_ERRORS" >&5
diff -up libproxy-0.2.3/configure.ac.dbus libproxy-0.2.3/configure.ac
--- libproxy-0.2.3/configure.ac.dbus	2008-07-11 12:12:43.000000000 +0200
+++ libproxy-0.2.3/configure.ac	2008-07-11 12:12:58.000000000 +0200
@@ -19,7 +19,7 @@ PKG_CHECK_MODULES(webkit, webkit-1.0, ha
 PKG_CHECK_MODULES(mozjs, xulrunner-js, have_mozjs=yes, 
 		[PKG_CHECK_MODULES(mozjs, firefox-js, have_mozjs=yes,
 		[PKG_CHECK_MODULES(mozjs, mozilla-js, have_mozjs=yes, have_mozjs=no)])])
-PKG_CHECK_MODULES(NetworkManager, NetworkManager, 
+PKG_CHECK_MODULES(NetworkManager, NetworkManager dbus-1, 
 					have_networkmanager=yes, have_networkmanager=no)
 
 # Environmental Variable


--- NEW FILE libproxy.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

%define gecko_version 1.9

Name:           libproxy
Version:        0.2.3
Release:        8%{?dist}
Summary:        A library handling all the details of proxy configuration

Group:          System Environment/Libraries
License:        LGPLv2+
URL:            http://code.google.com/p/libproxy/
Source0:        http://libproxy.googlecode.com/files/libproxy-%{version}.tar.gz
Patch0:         libproxy-0.2.3-dbus.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  python-devel
#Virtual Provides - We need either mozjs or WebKit
Requires: %{name}-pac >= %{version}
#
Requires: libproxy-python = %{version}-%{release}
Requires: libproxy-bin = %{version}-%{release}

# gnome
BuildRequires:  GConf2-devel
# mozjs
BuildRequires:  gecko-devel >= %{gecko_version}
# NetworkManager
BuildRequires:  NetworkManager-devel
BuildRequires:  dbus-devel
# webkit (gtk)
BuildRequires:  WebKit-gtk-devel
# kde
BuildRequires:  libXmu-devel
BuildRequires:  libX11-devel


%description
libproxy offers the following features:

    * extremely small core footprint (< 35K)
    * no external dependencies within libproxy core
      (libproxy plugins may have dependencies)
    * only 3 functions in the stable external API
    * dynamic adjustment to changing network topology
    * a standard way of dealing with proxy settings across all scenarios
    * a sublime sense of joy and accomplishment 

Non-default rpmbuild options:
--with webkit:           Enable WebKit-gtk support


%package        bin
Summary:        Binary to test %{name}
Group:          Applications/System
Requires:       %{name} = %{version}-%{release}

%description    bin
The %{name}-bin package contains the proxy binary for %{name}

%package        python
Summary:        Binding for %{name} and python
Group:          System Environment/Libraries
Requires:       %{name} = %{version}-%{release}

%description    python
The %{name}-python package contains the python binding for %{name}

%package        gnome
Summary:        Plugin for %{name} and gnome
Group:          System Environment/Libraries
Requires:       %{name} = %{version}-%{release}

%description    gnome
The %{name}-gnome package contains the %{name} plugin for gnome.

%package        kde
Summary:        Plugin for %{name} and kde
Group:          System Environment/Libraries
Requires:       %{name} = %{version}-%{release}

%description    kde
The %{name}-kde package contains the %{name} plugin for kde.

%package        mozjs
Summary:        Plugin for %{name} and mozjs
Group:          System Environment/Libraries
Requires:       %{name} = %{version}
#Tweak this according to the current gecko-libs version
Requires:       gecko-libs >= %{gecko_version}
Provides:       %{name}-pac = %{version}-%{release}

%description    mozjs
The %{name}-mozjs package contains the %{name} plugin for mozjs.

%package        webkit
Summary:        Plugin for %{name} and webkit
Group:          System Environment/Libraries
Requires:       %{name} = %{version}
Provides:       %{name}-pac = %{version}-%{release}

%description    webkit
The %{name}-webkit package contains the %{name} plugin for
webkit.

%package        devel
Summary:        Development files for %{name}
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}
Requires:       pkgconfig

%description    devel
The %{name}-devel package contains libraries and header files for
developing applications that use %{name}.


%prep
%setup -q
%patch0 -p1 -b .dbus
touch -r configure.dbus configure
touch -r configure.ac.dbus configure.ac


%build
%configure --includedir=%{_includedir}/libproxy --disable-static --with-python
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'


%clean
rm -rf $RPM_BUILD_ROOT


%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig


%files 
%defattr(-,root,root,-)
%doc AUTHORS COPYING README
%{_libdir}/*.so.*
%dir %{_libdir}/%{name}
%dir %{_libdir}/%{name}/%{version}
%dir %{_libdir}/%{name}/%{version}/plugins
%{_libdir}/%{name}/%{version}/plugins/envvar.so
%{_libdir}/%{name}/%{version}/plugins/file.so
%{_libdir}/%{name}/%{version}/plugins/networkmanager.so

%files bin
%defattr(-,root,root,-)
%{_bindir}/proxy

%files python
%defattr(-,root,root,-)
%{python_sitelib}/*

%files gnome
%defattr(-,root,root,-)
%{_libdir}/%{name}/%{version}/plugins/gnome.so

%files kde
%defattr(-,root,root,-)
%{_libdir}/%{name}/%{version}/plugins/kde.so

%files mozjs
%defattr(-,root,root,-)
%{_libdir}/%{name}/%{version}/plugins/mozjs.so

%files webkit
%defattr(-,root,root,-)
%{_libdir}/%{name}/%{version}/plugins/webkit.so

%files devel
%defattr(-,root,root,-)
%{_includedir}/libproxy/
%{_libdir}/*.so
%{_libdir}/pkgconfig/libproxy-1.0.pc


%changelog
* Thu Jan 22 2009 kwizart < kwizart at gmail.com > - 0.2.3-8
- Merge NetworkManager module into the main libproxy package
- Main Requires the -python and -bin subpackage 
 (splitted for multilibs compliance).

* Fri Oct 24 2008 kwizart < kwizart at gmail.com > - 0.2.3-7
- Disable Gnome/KDE default support via builtin modules.
 (it needs to be integrated via Gconf2/neon instead).

* Tue Oct 21 2008 kwizart < kwizart at gmail.com > - 0.2.3-6
- Disable Obsoletes.
- Requires ev instead of evr for optionnals sub-packages.

* Tue Oct 21 2008 kwizart < kwizart at gmail.com > - 0.2.3-5
- Use conditionals build.

* Mon Sep 15 2008 kwizart < kwizart at gmail.com > - 0.2.3-4
- Remove plugin- in the name of the packages

* Mon Aug  4 2008 kwizart < kwizart at gmail.com > - 0.2.3-3
- Move proxy.h to libproxy/proxy.h
  This will prevent it to be included in the default include path
- Split main to libs and util and use libproxy to install all

* Mon Aug  4 2008 kwizart < kwizart at gmail.com > - 0.2.3-2
- Rename binding-python to python
- Add Requires: gecko-libs >= %%{gecko_version}
- Fix some descriptions
- Add plugin-webkit package
 
* Fri Jul 11 2008 kwizart < kwizart at gmail.com > - 0.2.3-1
- Convert to Fedora spec

* Fri Jun 6 2008 - dominique-rpm at leuenberger.net
- Updated to version 0.2.3
* Wed Jun 4 2008 - dominique-rpm at leuenberger.net
- Extended spec file to build all available plugins
* Tue Jun 3 2008 - dominique-rpm at leuenberger.net
- Initial spec file for Version 0.2.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libproxy/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	6 Aug 2008 17:33:21 -0000	1.1
+++ .cvsignore	23 Jan 2009 15:12:02 -0000	1.2
@@ -0,0 +1 @@
+libproxy-0.2.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libproxy/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	6 Aug 2008 17:33:21 -0000	1.1
+++ sources	23 Jan 2009 15:12:02 -0000	1.2
@@ -0,0 +1 @@
+86b635e1eb2d665cfbef4c6134fe6604  libproxy-0.2.3.tar.gz



From kwade at fedoraproject.org  Fri Jan 23 15:23:42 2009
From: kwade at fedoraproject.org (Karsten Wade)
Date: Fri, 23 Jan 2009 15:23:42 +0000 (UTC)
Subject: CVSROOT avail,1.55,1.56
Message-ID: <20090123152342.63238700FE@cvs1.fedora.phx.redhat.com>

Author: kwade

Update of /cvs/fedora/CVSROOT
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12426

Modified Files:
	avail 
Log Message:
adding the other SELinux guide link for these writers


Index: avail
===================================================================
RCS file: /cvs/fedora/CVSROOT/avail,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- avail	16 Jan 2009 16:49:14 -0000	1.55
+++ avail	23 Jan 2009 15:23:41 -0000	1.56
@@ -32,6 +32,7 @@
 avail | eitch,mdomsch | web/html/download
 avail | eitch,mdomsch | web/html/Download
 avail | mdious,sparks | web/html/docs/selinux-guide
+avail | mdious,sparks | web/html/docs/selinux-user-guide
 avail | sparks | web/html/docs/security-guide
 
 # Fedora security repository



From overholt at fedoraproject.org  Fri Jan 23 15:55:41 2009
From: overholt at fedoraproject.org (Andrew Overholt)
Date: Fri, 23 Jan 2009 15:55:41 +0000 (UTC)
Subject: rpms/eclipse/devel eclipse.spec,1.616,1.617
Message-ID: <20090123155542.1581B700FE@cvs1.fedora.phx.redhat.com>

Author: overholt

Update of /cvs/pkgs/rpms/eclipse/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16036/devel

Modified Files:
	eclipse.spec 
Log Message:
* Fri Jan 23 2009 Andrew Overholt <overholt at redhat.com> 1:3.4.1-14
- Add R:java-devel for -jdt (rh#480979).


Index: eclipse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.616
retrieving revision 1.617
diff -u -r1.616 -r1.617
--- eclipse.spec	19 Jan 2009 15:27:54 -0000	1.616
+++ eclipse.spec	23 Jan 2009 15:55:09 -0000	1.617
@@ -30,7 +30,7 @@
 Summary:        An open, extensible IDE
 Name:           eclipse
 Version:        %{eclipse_majmin}.%{eclipse_micro}
-Release:        13%{?dist}
+Release:        14%{?dist}
 License:        EPL
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
@@ -288,6 +288,7 @@
 Requires:       junit >= 3.8.1-3jpp
 Requires:       junit4
 Requires:       java-javadoc
+Requires:       java-devel
 
 %description    jdt
 Eclipse Java Development Tools.  This package is required to use Eclipse for
@@ -1567,6 +1568,9 @@
 #%{_libdir}/%{name}/configuration/org.eclipse.equinox.source
 
 %changelog
+* Fri Jan 23 2009 Andrew Overholt <overholt at redhat.com> 1:3.4.1-14
+- Add R:java-devel for -jdt (rh#480979).
+
 * Mon Jan 19 2009 Alexander Kurtakov <akurtako at redhat.com> 1:3.4.1-13
 - Fix pdebuild to auto-set javacSouce based on BREE.
 



From tmraz at fedoraproject.org  Fri Jan 23 16:06:05 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 23 Jan 2009 16:06:05 +0000 (UTC)
Subject: rpms/cyrus-sasl/devel cyrus-sasl-2.1.22-ldap-timeout.patch, NONE,
	1.1 cyrus-sasl.spec, 1.74, 1.75 saslauthd.init, 1.4, 1.5
Message-ID: <20090123160605.EC188700FE@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/cyrus-sasl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17208

Modified Files:
	cyrus-sasl.spec saslauthd.init 
Added Files:
	cyrus-sasl-2.1.22-ldap-timeout.patch 
Log Message:
* Fri Jan 23 2009 Tomas Mraz <tmraz at redhat.com> - 2.1.22-20
- set LDAP_OPT_TIMEOUT (#326452)
- provide LSB compatible init script (#246900)


cyrus-sasl-2.1.22-ldap-timeout.patch:

--- NEW FILE cyrus-sasl-2.1.22-ldap-timeout.patch ---
commit c9447e1c3ffba88783e5d9396b832be82d3c78fc
Author: Kazuo Ito <ito.kazuo at oss.ntt.co.jp>
Date:   Wed Dec 10 12:03:29 2008 +0900

    support for LDAP_OPT_TIMEOUT
    
    OpenLDAP since 2.4 implements support for this option in ldap_result(),
    among other things.

diff --git a/saslauthd/lak.c b/saslauthd/lak.c
index 803d51f..8714265 100644
--- a/saslauthd/lak.c
+++ b/saslauthd/lak.c
@@ -833,6 +833,11 @@ static int lak_connect(
 		syslog(LOG_WARNING|LOG_AUTH, "Unable to set LDAP_OPT_NETWORK_TIMEOUT %d.%d.", lak->conf->timeout.tv_sec, lak->conf->timeout.tv_usec);
 	}
 
+	rc = ldap_set_option(lak->ld, LDAP_OPT_TIMEOUT, &(lak->conf->timeout));
+	if (rc != LDAP_OPT_SUCCESS) {
+		syslog(LOG_WARNING|LOG_AUTH, "Unable to set LDAP_OPT_TIMEOUT %d.%d.", lak->conf->timeout.tv_sec, lak->conf->timeout.tv_usec);
+	}
+
 	rc = ldap_set_option(lak->ld, LDAP_OPT_TIMELIMIT, &(lak->conf->time_limit));
 	if (rc != LDAP_OPT_SUCCESS) {
 		syslog(LOG_WARNING|LOG_AUTH, "Unable to set LDAP_OPT_TIMELIMIT %d.", lak->conf->time_limit);


Index: cyrus-sasl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cyrus-sasl/devel/cyrus-sasl.spec,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- cyrus-sasl.spec	26 Sep 2008 10:05:40 -0000	1.74
+++ cyrus-sasl.spec	23 Jan 2009 16:05:35 -0000	1.75
@@ -4,7 +4,7 @@
 Summary: The Cyrus SASL library
 Name: cyrus-sasl
 Version: 2.1.22
-Release: 19%{?dist}
+Release: 20%{?dist}
 License: BSD
 Group: System Environment/Libraries
 # Source0 originally comes from ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/;
@@ -29,6 +29,7 @@
 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
+Patch34: cyrus-sasl-2.1.22-ldap-timeout.patch
 
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: autoconf, automake, libtool, gdbm-devel, groff
@@ -147,6 +148,7 @@
 %patch31 -p1 -b .krb4
 %patch32 -p1 -b .warnings
 %patch33 -p1 -b .current-db
+%patch34 -p1 -b .ldap-timeout
 
 # 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.
@@ -381,6 +383,10 @@
 %{_sbindir}/sasl2-shared-mechlist
 
 %changelog
+* Fri Jan 23 2009 Tomas Mraz <tmraz at redhat.com> - 2.1.22-20
+- set LDAP_OPT_TIMEOUT (#326452)
+- provide LSB compatible init script (#246900)
+
 * 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)


Index: saslauthd.init
===================================================================
RCS file: /cvs/pkgs/rpms/cyrus-sasl/devel/saslauthd.init,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- saslauthd.init	1 Jul 2008 21:35:14 -0000	1.4
+++ saslauthd.init	23 Jan 2009 16:05:35 -0000	1.5
@@ -1,12 +1,21 @@
 #! /bin/bash
 #
-# saslauthd      Start/Stop the SASL authentication daemon.
+# saslauthd      Start/Stop the SASL authentication daemon
 #
-# chkconfig: - 95 05
-# description: saslauthd is a server process which handles plaintext \
+# chkconfig: - 65 10
+# description: Saslauthd is a server process which handles plaintext \
 #              authentication requests on behalf of the cyrus-sasl library.
 # processname: saslauthd
 
+### BEGIN INIT INFO
+# Provides: saslauthd
+# Required-Start: $local_fs $network
+# Required-Stop: $local_fs $network
+# Short-Description: Start/Stop the SASL authentication daemon
+# Description: Saslauthd is a server process which handles plaintext
+#              authentication requests on behalf of the cyrus-sasl library.
+### END INIT INFO
+
 # Source function library.
 . /etc/init.d/functions
 
@@ -24,29 +33,24 @@
 # considered boilerplate by now.
 prog=saslauthd
 path=/usr/sbin/saslauthd
-
-# Ugh. Switch to a specific copy of saslauthd if there's one with $MECH
-# in its name, in case it wasn't included in the base cyrus-sasl package
-# because it would have dragged in too many undesirable dependencies.
-if test -x ${path}.${MECH} ; then
-	path=/usr/sbin/saslauthd.$MECH
-fi
+lockfile=/var/lock/subsys/$prog
 
 start() {
+	[ -x $path ] || exit 5
 	echo -n $"Starting $prog: "
 	daemon $path -m $SOCKETDIR -a $MECH $FLAGS
 	RETVAL=$?
 	echo
-	[ $RETVAL -eq 0 ] && touch /var/lock/subsys/$prog
+	[ $RETVAL -eq 0 ] && touch $lockfile
 	return $RETVAL
 }
 
 stop() {
 	echo -n $"Stopping $prog: "
-	killproc $path
+	killproc $prog
 	RETVAL=$?
 	echo
-	[ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/$prog
+	[ $RETVAL -eq 0 ] && rm -f $lockfile
 	return $RETVAL
 }	
 
@@ -55,25 +59,52 @@
 	start
 }	
 
+reload() {
+	restart
+}
+
+force_reload() {
+	restart
+}
+
+rh_status() {
+	# run checks to determine if the service is running or use generic status
+	status $prog
+}
+
+rh_status_q() {
+	rh_status >/dev/null 2>&1
+}            
+
 case "$1" in
   start)
+	rh_status_q && exit 0
   	start
 	;;
   stop)
+	rh_status_q || exit 0
   	stop
 	;;
   restart)
   	restart
 	;;
+  reload)
+	rh_status_q || exit 7
+	reload
+	;;
+  force-reload)
+	force_reload
+	;;
   status)
-	status $path
+	rh_status
 	;;
-  condrestart)
-  	[ -f /var/lock/subsys/$prog ] && restart || :
+  condrestart|try-restart)
+	rh_status_q || exit 0
+	restart
 	;;
   *)
-	echo $"Usage: $0 {start|stop|status|restart|condrestart}"
-	exit 1
+	echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload}"
+	exit 2
 esac
 
 exit $?



From pwouters at fedoraproject.org  Fri Jan 23 16:08:08 2009
From: pwouters at fedoraproject.org (Paul Wouters)
Date: Fri, 23 Jan 2009 16:08:08 +0000 (UTC)
Subject: rpms/socat/F-9 .cvsignore, 1.2, 1.3 socat.spec, 1.7, 1.8 sources,
	1.2, 1.3
Message-ID: <20090123160808.46F91700FE@cvs1.fedora.phx.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/socat/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17512

Modified Files:
	.cvsignore socat.spec sources 
Log Message:
* Fri Jan 23 2009 Paul Wouters <paul at xelerance.com> - 1.7.0.0-1
Updated to new version 1.7.00



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/socat/F-9/.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	23 Jan 2009 16:07:37 -0000	1.3
@@ -1 +1 @@
-socat-1.5.0.0.tar.bz2
+socat-1.7.0.0.tar.bz2


Index: socat.spec
===================================================================
RCS file: /cvs/extras/rpms/socat/F-9/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	23 Jan 2009 16:07:37 -0000	1.8
@@ -1,7 +1,7 @@
 Summary: Bidirectional data relay between two data channels ('netcat++')
 Name: socat
-Version: 1.5.0.0
-Release: 8%{?dist}
+Version: 1.7.0.0
+Release: 1%{?dist}
 License: GPL
 Url:  http://www.dest-unreach.org/%{name}
 Source: http://www.dest-unreach.org/socat/download/%{name}-%{version}.tar.bz2
@@ -59,6 +59,9 @@
 %doc %{_mandir}/man1/socat.1*
 
 %changelog
+* Fri Jan 23 2009 Paul Wouters <paul at xelerance.com> - 1.7.0.0-1
+Updated to new version 1.7.00
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1.5.0.0-8
 - Autorebuild for GCC 4.3
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/socat/F-9/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	23 Jan 2009 16:07:37 -0000	1.3
@@ -1 +1 @@
-84b709de13e236198a4606fb4b80e123  socat-1.5.0.0.tar.bz2
+be5f942c44dafefa58365e9dc3ada81f  socat-1.7.0.0.tar.bz2



From rstrode at fedoraproject.org  Fri Jan 23 16:09:39 2009
From: rstrode at fedoraproject.org (Ray Strode)
Date: Fri, 23 Jan 2009 16:09:39 +0000 (UTC)
Subject: rpms/gnome-panel/devel .cvsignore, 1.88, 1.89 gnome-panel.spec,
	1.342, 1.343 sources, 1.91, 1.92
Message-ID: <20090123160939.DF403700FE@cvs1.fedora.phx.redhat.com>

Author: rstrode

Update of /cvs/pkgs/rpms/gnome-panel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17962

Modified Files:
	.cvsignore gnome-panel.spec sources 
Log Message:
- Update to 2.25.5.1
- Fixes bug 481029



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-panel/devel/.cvsignore,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -r1.88 -r1.89
--- .cvsignore	20 Jan 2009 19:37:52 -0000	1.88
+++ .cvsignore	23 Jan 2009 16:09:09 -0000	1.89
@@ -1 +1 @@
-gnome-panel-2.25.5.tar.bz2
+gnome-panel-2.25.5.1.tar.bz2


Index: gnome-panel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-panel/devel/gnome-panel.spec,v
retrieving revision 1.342
retrieving revision 1.343
diff -u -r1.342 -r1.343
--- gnome-panel.spec	20 Jan 2009 19:37:52 -0000	1.342
+++ gnome-panel.spec	23 Jan 2009 16:09:09 -0000	1.343
@@ -22,7 +22,7 @@
 
 Summary: GNOME panel
 Name: gnome-panel
-Version: 2.25.5
+Version: 2.25.5.1
 Release: 1%{?dist}
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/gnome-panel/2.25/%{name}-%{version}.tar.bz2
@@ -362,6 +362,10 @@
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Fri Jan 23 2009 Ray Strode <rstrode at redhat.com> - 2.25.5.1-1
+- Update to 2.25.5.1
+- Fixes bug 481029
+
 * Tue Jan 20 2009 Matthias Clasen <mclasen at redhat.com> - 2.25.5-1
 - Update to 2.25.5
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-panel/devel/sources,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -r1.91 -r1.92
--- sources	20 Jan 2009 19:37:52 -0000	1.91
+++ sources	23 Jan 2009 16:09:09 -0000	1.92
@@ -1 +1 @@
-ca67bbaa5e109d8e86424e2ace8e8683  gnome-panel-2.25.5.tar.bz2
+62bae4712c8e7be95b061d08b22905f2  gnome-panel-2.25.5.1.tar.bz2



From pwouters at fedoraproject.org  Fri Jan 23 16:10:05 2009
From: pwouters at fedoraproject.org (Paul Wouters)
Date: Fri, 23 Jan 2009 16:10:05 +0000 (UTC)
Subject: rpms/socat/F-10 .cvsignore, 1.3, 1.4 socat.spec, 1.9, 1.10 sources, 
	1.3, 1.4
Message-ID: <20090123161005.3DBE9700FE@cvs1.fedora.phx.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/socat/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18016

Modified Files:
	.cvsignore socat.spec sources 
Log Message:
* Fri Jan 23 2009 Paul Wouters <paul at xelerance.com> - 1.7.0.0-1
- Updated to new version 1.7.00



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/socat/F-10/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	4 Sep 2008 20:59:20 -0000	1.3
+++ .cvsignore	23 Jan 2009 16:09:34 -0000	1.4
@@ -1 +1,2 @@
 socat-1.6.0.1.tar.bz2
+socat-1.7.0.0.tar.bz2


Index: socat.spec
===================================================================
RCS file: /cvs/extras/rpms/socat/F-10/socat.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- socat.spec	4 Sep 2008 20:59:20 -0000	1.9
+++ socat.spec	23 Jan 2009 16:09:35 -0000	1.10
@@ -1,7 +1,7 @@
 Summary: Bidirectional data relay between two data channels ('netcat++')
 Name: socat
-Version: 1.6.0.1
-Release: 2%{?dist}
+Version: 1.7.0.0
+Release: 1%{?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
+* Fri Jan 23 2009 Paul Wouters <paul at xelerance.com> - 1.7.0.0-1
+- Updated to new version 1.7.00
+
 * Thu Sep  4 2008 Tom "spot" Callaway <tcallawa at redhat.com> 1.6.0.1-2
 - forgot to upload new source
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/socat/F-10/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	4 Sep 2008 20:59:20 -0000	1.3
+++ sources	23 Jan 2009 16:09:35 -0000	1.4
@@ -1 +1 @@
-6a0dd33cde2a18eb382433aca8f76ce2  socat-1.6.0.1.tar.bz2
+be5f942c44dafefa58365e9dc3ada81f  socat-1.7.0.0.tar.bz2



From pkgdb at fedoraproject.org  Fri Jan 23 16:14:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 23 Jan 2009 16:14:32 +0000
Subject: [pkgdb] munin had acl change status
Message-ID: <20090123161432.536C120847F@bastion.fedora.phx.redhat.com>

kevin has set the watchcommits acl on munin (Fedora devel) to Approved for ixs

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/munin



From pkgdb at fedoraproject.org  Fri Jan 23 16:14:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 23 Jan 2009 16:14:34 +0000
Subject: [pkgdb] munin had acl change status
Message-ID: <20090123161434.E8D34208483@bastion.fedora.phx.redhat.com>

kevin has set the commit acl on munin (Fedora devel) to Approved for ixs

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/munin



From pkgdb at fedoraproject.org  Fri Jan 23 16:14:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 23 Jan 2009 16:14:37 +0000
Subject: [pkgdb] munin had acl change status
Message-ID: <20090123161437.ECE3F208485@bastion.fedora.phx.redhat.com>

kevin has set the approveacls acl on munin (Fedora devel) to Approved for ixs

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/munin



From pkgdb at fedoraproject.org  Fri Jan 23 16:14:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 23 Jan 2009 16:14:48 +0000
Subject: [pkgdb] munin had acl change status
Message-ID: <20090123161448.B4F3820848B@bastion.fedora.phx.redhat.com>

kevin has set the watchcommits acl on munin (Fedora 9) to Approved for ixs

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/munin



From pkgdb at fedoraproject.org  Fri Jan 23 16:14:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 23 Jan 2009 16:14:49 +0000
Subject: [pkgdb] munin had acl change status
Message-ID: <20090123161449.1F75F20848F@bastion.fedora.phx.redhat.com>

kevin has set the commit acl on munin (Fedora 9) to Approved for ixs

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/munin



From pkgdb at fedoraproject.org  Fri Jan 23 16:14:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 23 Jan 2009 16:14:52 +0000
Subject: [pkgdb] munin had acl change status
Message-ID: <20090123161453.0C925208482@bastion.fedora.phx.redhat.com>

kevin has set the approveacls acl on munin (Fedora 9) to Approved for ixs

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/munin



From pkgdb at fedoraproject.org  Fri Jan 23 16:16:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 23 Jan 2009 16:16:39 +0000
Subject: [pkgdb] munin had acl change status
Message-ID: <20090123161639.4E2ED20847E@bastion.fedora.phx.redhat.com>

kevin has set the watchcommits acl on munin (Fedora EPEL 4) to Approved for ixs

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/munin



From pkgdb at fedoraproject.org  Fri Jan 23 16:16:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 23 Jan 2009 16:16:41 +0000
Subject: [pkgdb] munin had acl change status
Message-ID: <20090123161642.02F5C208485@bastion.fedora.phx.redhat.com>

kevin has set the approveacls acl on munin (Fedora EPEL 4) to Approved for ixs

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/munin



From pkgdb at fedoraproject.org  Fri Jan 23 16:16:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 23 Jan 2009 16:16:40 +0000
Subject: [pkgdb] munin had acl change status
Message-ID: <20090123161640.28976208482@bastion.fedora.phx.redhat.com>

kevin has set the commit acl on munin (Fedora EPEL 4) to Approved for ixs

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/munin



From pkgdb at fedoraproject.org  Fri Jan 23 16:16:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 23 Jan 2009 16:16:46 +0000
Subject: [pkgdb] munin had acl change status
Message-ID: <20090123161646.79912208488@bastion.fedora.phx.redhat.com>

kevin has set the watchcommits acl on munin (Fedora EPEL 5) to Approved for ixs

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/munin



From pkgdb at fedoraproject.org  Fri Jan 23 16:16:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 23 Jan 2009 16:16:47 +0000
Subject: [pkgdb] munin had acl change status
Message-ID: <20090123161648.2C2EC20848C@bastion.fedora.phx.redhat.com>

kevin has set the commit acl on munin (Fedora EPEL 5) to Approved for ixs

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/munin



From pkgdb at fedoraproject.org  Fri Jan 23 16:16:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 23 Jan 2009 16:16:50 +0000
Subject: [pkgdb] munin had acl change status
Message-ID: <20090123161650.3008D208490@bastion.fedora.phx.redhat.com>

kevin has set the approveacls acl on munin (Fedora EPEL 5) to Approved for ixs

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/munin



From pkgdb at fedoraproject.org  Fri Jan 23 16:16:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 23 Jan 2009 16:16:52 +0000
Subject: [pkgdb] munin had acl change status
Message-ID: <20090123161653.089EC208491@bastion.fedora.phx.redhat.com>

kevin has set the watchcommits acl on munin (Fedora 10) to Approved for ixs

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/munin



From pkgdb at fedoraproject.org  Fri Jan 23 16:16:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 23 Jan 2009 16:16:54 +0000
Subject: [pkgdb] munin had acl change status
Message-ID: <20090123161654.4EEE2208494@bastion.fedora.phx.redhat.com>

kevin has set the commit acl on munin (Fedora 10) to Approved for ixs

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/munin



From pwouters at fedoraproject.org  Fri Jan 23 16:17:06 2009
From: pwouters at fedoraproject.org (Paul Wouters)
Date: Fri, 23 Jan 2009 16:17:06 +0000 (UTC)
Subject: rpms/socat/F-9 socat.spec,1.8,1.9
Message-ID: <20090123161706.5FF12700FE@cvs1.fedora.phx.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/socat/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18902

Modified Files:
	socat.spec 
Log Message:
* Fri Jan 23 2009 Paul Wouters <paul at xelerance.com> - 1.7.0.0-2
- socat.html no longer exists in tar ball



Index: socat.spec
===================================================================
RCS file: /cvs/extras/rpms/socat/F-9/socat.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- socat.spec	23 Jan 2009 16:07:37 -0000	1.8
+++ socat.spec	23 Jan 2009 16:16:36 -0000	1.9
@@ -1,7 +1,7 @@
 Summary: Bidirectional data relay between two data channels ('netcat++')
 Name: socat
 Version: 1.7.0.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL
 Url:  http://www.dest-unreach.org/%{name}
 Source: http://www.dest-unreach.org/socat/download/%{name}-%{version}.tar.bz2
@@ -49,7 +49,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,8 +59,11 @@
 %doc %{_mandir}/man1/socat.1*
 
 %changelog
+* Fri Jan 23 2009 Paul Wouters <paul at xelerance.com> - 1.7.0.0-2
+- socat.html no longer exists in tar ball
+
 * Fri Jan 23 2009 Paul Wouters <paul at xelerance.com> - 1.7.0.0-1
-Updated to new version 1.7.00
+- Updated to new version 1.7.00
 
 * 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  Fri Jan 23 16:16:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 23 Jan 2009 16:16:55 +0000
Subject: [pkgdb] munin had acl change status
Message-ID: <20090123161655.EA7FA208497@bastion.fedora.phx.redhat.com>

kevin has set the approveacls acl on munin (Fedora 10) to Approved for ixs

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/munin



From limb at fedoraproject.org  Fri Jan 23 16:38:13 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Fri, 23 Jan 2009 16:38:13 +0000 (UTC)
Subject: rpms/lilypond/devel lilypond.spec,1.37,1.38
Message-ID: <20090123163813.74566700FE@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/lilypond/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22130

Modified Files:
	lilypond.spec 
Log Message:
Last bits.



Index: lilypond.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lilypond/devel/lilypond.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- lilypond.spec	22 Jan 2009 18:15:26 -0000	1.37
+++ lilypond.spec	23 Jan 2009 16:37:43 -0000	1.38
@@ -1,6 +1,6 @@
 Name:		lilypond
 Version:	2.12.1
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	A typesetting system for music notation
 
 Group:		Applications/Publishing
@@ -15,7 +15,6 @@
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
 Obsoletes: 	lilypond-fonts <= 2.12.1-1
-Provides:	lilypond-fonts <= 2.12.1-1
 Requires:	lilypond-aybabtu-fonts = %{version}-%{release}
 Requires:	lilypond-century-schoolbook-l-fonts = %{version}-%{release}
 Requires:	lilypond-emmentaler-fonts = %{version}-%{release}
@@ -166,12 +165,14 @@
 
 %files fonts-common
 %defattr(0644,root,root,0755)
-%doc 
 
 %dir %{_fontdir}
 
 
 %changelog
+* Fri Jan 23 2009 Jon Ciesla <limb at jcomserv.net> - 2.12.1-5
+- Final font corrections.
+
 * Thu Jan 22 2009 Jon Ciesla <limb at jcomserv.net> - 2.12.1-4
 - More font refinements.
 



From rdieter at fedoraproject.org  Fri Jan 23 16:45:20 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 23 Jan 2009 16:45:20 +0000 (UTC)
Subject: rpms/libmal/F-10 libmal-0.44-64bit.patch, NONE, 1.1 .cvsignore, 1.2,
	1.3 libmal.spec, 1.9, 1.10 sources, 1.2,
	1.3 libmal-0.31-64bit.patch, 1.1, NONE libmal-0.31-pi12.patch,
	1.1, NONE
Message-ID: <20090123164520.9F45C700FE@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/libmal/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23177

Modified Files:
	.cvsignore libmal.spec sources 
Added Files:
	libmal-0.44-64bit.patch 
Removed Files:
	libmal-0.31-64bit.patch libmal-0.31-pi12.patch 
Log Message:
* Thu Jan 15 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 0.44-1
- update to 0.44 (for kdepim 4.2)
- drop libmal-0.31-pi12.patch (fixed upstream)
- rebase 64bit patch
- package new file %{_bindir}/malsync


libmal-0.44-64bit.patch:

--- NEW FILE libmal-0.44-64bit.patch ---
diff -ur libmal-0.44/configure libmal-0.44-64bit/configure
--- libmal-0.44/configure	2007-01-17 00:19:11.000000000 +0100
+++ libmal-0.44-64bit/configure	2009-01-15 00:35:18.000000000 +0100
@@ -19680,7 +19680,7 @@
 PILOT_LIBS="-lpisock"
 
 if test $pilotlibs = no ; then
-    for pilot_libs in $pilot_prefix/lib /usr/lib /usr/local/lib/ \
+    for pilot_libs in $pilot_prefix/lib $libdir /usr/lib /usr/local/lib/ \
         /usr/extra/pilot/lib ; do
         if test -r "$pilot_libs/libpisock.so" ; then
             pilotlibs=yes
diff -ur libmal-0.44/configure.in libmal-0.44-64bit/configure.in
--- libmal-0.44/configure.in	2007-01-07 19:04:48.000000000 +0100
+++ libmal-0.44-64bit/configure.in	2009-01-15 00:34:57.000000000 +0100
@@ -59,7 +59,7 @@
 PILOT_LIBS="-lpisock"
 
 if test $pilotlibs = no ; then
-    for pilot_libs in $pilot_prefix/lib /usr/lib /usr/local/lib/ \
+    for pilot_libs in $pilot_prefix/lib $libdir /usr/lib /usr/local/lib/ \
         /usr/extra/pilot/lib ; do
         if test -r "$pilot_libs/libpisock.so" ; then
             pilotlibs=yes


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libmal/F-10/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	22 Mar 2006 15:22:43 -0000	1.2
+++ .cvsignore	23 Jan 2009 16:44:50 -0000	1.3
@@ -1 +1 @@
-libmal-0.31.tar.gz
+libmal-0.44.tar.gz


Index: libmal.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libmal/F-10/libmal.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- libmal.spec	11 Feb 2008 12:36:54 -0000	1.9
+++ libmal.spec	23 Jan 2009 16:44:50 -0000	1.10
@@ -1,20 +1,16 @@
 
 Summary: A convenience library for malsync
 Name:    libmal
-# NOTE: this isn't the latest version, but is the last version known to 
-# work with kdepim-3.5.x
-Version: 0.31 
-Release: 8%{?dist}
+Version: 0.44
+Release: 1%{?dist}
 
 License: MPLv1.0
-Url: 	 http://jasonday.home.att.net/code/libmal/ 
-Source0: http://jasonday.home.att.net/code/libmal/libmal-%{version}.tar.gz 
+Url: 	 http://jasonday.home.att.net/code/libmal/
+Source0: http://jasonday.home.att.net/code/libmal/libmal-%{version}.tar.gz
 Group:   System Environment/Libraries	
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Patch1: libmal-0.31-64bit.patch
-# pilot-link-0.12 fixes
-Patch2: libmal-0.31-pi12.patch
+Patch1: libmal-0.44-64bit.patch
 
 BuildRequires: pilot-link-devel 
 
@@ -34,7 +30,6 @@
 %setup -q 
 
 %patch1 -p1 -b .64bits
-%patch2 -p1 -b .pi12
 
 
 %build
@@ -66,6 +61,7 @@
 %doc ChangeLog README
 #empties
 #doc AUTHORS NEWS TODO
+%{_bindir}/malsync
 %{_libdir}/lib*.so.*
 
 %files devel
@@ -75,6 +71,12 @@
 
 
 %changelog
+* Thu Jan 15 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 0.44-1
+- update to 0.44 (for kdepim 4.2)
+- drop libmal-0.31-pi12.patch (fixed upstream)
+- rebase 64bit patch
+- package new file %%{_bindir}/malsync
+
 * Fri Feb 08 2008 Rex Dieter <rdieter at fedoraproject.org> 0.31-8 
 - respin (gcc43)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libmal/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	22 Mar 2006 15:22:43 -0000	1.2
+++ sources	23 Jan 2009 16:44:50 -0000	1.3
@@ -1 +1 @@
-3d1fd0a5ece6de47d55df5829ee8b6a2  libmal-0.31.tar.gz
+826f2334c8eb24f5e170f208581fdffb  libmal-0.44.tar.gz


--- libmal-0.31-64bit.patch DELETED ---


--- libmal-0.31-pi12.patch DELETED ---



From remi at fedoraproject.org  Fri Jan 23 16:48:28 2009
From: remi at fedoraproject.org (Remi Collet)
Date: Fri, 23 Jan 2009 16:48:28 +0000 (UTC)
Subject: rpms/mysql++/devel mysql++.spec,1.16,1.17
Message-ID: <20090123164828.0C074700FE@cvs1.fedora.phx.redhat.com>

Author: remi

Update of /cvs/extras/rpms/mysql++/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23682

Modified Files:
	mysql++.spec 
Log Message:
rebuild against MySQL Client 5.1 (libmysqlclient.so.16)


Index: mysql++.spec
===================================================================
RCS file: /cvs/extras/rpms/mysql++/devel/mysql++.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- mysql++.spec	30 Nov 2008 08:39:19 -0000	1.16
+++ mysql++.spec	23 Jan 2009 16:47:57 -0000	1.17
@@ -1,7 +1,7 @@
 Summary:    C++ wrapper for the MySQL C API
 Name:       mysql++
 Version:    3.0.8
-Release:    1%{?dist}
+Release:    2%{?dist}
 License:    LGPLv2
 Group:      Development/Libraries
 URL:        http://tangentsoft.net/mysql++/
@@ -120,6 +120,9 @@
 %{_datadir}/devhelp/books/%{name}
 
 %changelog
+* Fri Jan 23 2009 Remi Collet <Fedora at FamilleCollet.com> 3.0.8-2
+- rebuild against MySQL Client 5.1 (libmysqlclient.so.16)
+
 * Sun Nov 30 2008 Remi Collet <Fedora at FamilleCollet.com> 3.0.8-1
 - update to 3.0.8
 



From rdieter at fedoraproject.org  Fri Jan 23 16:51:17 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 23 Jan 2009 16:51:17 +0000 (UTC)
Subject: rpms/strigi/F-10 strigi-0.6.2-multilib.patch, NONE, 1.1 .cvsignore, 
	1.11, 1.12 sources, 1.11, 1.12 strigi.spec, 1.22,
	1.23 strigi-0.5.11-to-0.5.11.1.diff, 1.1,
	NONE strigi-multilib-fix.patch, 1.4, NONE
Message-ID: <20090123165117.233C2700FE@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/strigi/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24223

Modified Files:
	.cvsignore sources strigi.spec 
Added Files:
	strigi-0.6.2-multilib.patch 
Removed Files:
	strigi-0.5.11-to-0.5.11.1.diff strigi-multilib-fix.patch 
Log Message:
* Mon Jan 12 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.6.3-1
- strigi-0.6.3


strigi-0.6.2-multilib.patch:

--- NEW FILE strigi-0.6.2-multilib.patch ---
diff -up strigi-0.6.2/src/streams/strigi/strigiconfig.h.cmake.multilib strigi-0.6.2/src/streams/strigi/strigiconfig.h.cmake
--- strigi-0.6.2/src/streams/strigi/strigiconfig.h.cmake.multilib	2009-01-03 04:06:13.000000000 -0600
+++ strigi-0.6.2/src/streams/strigi/strigiconfig.h.cmake	2009-01-09 07:06:12.000000000 -0600
@@ -83,104 +83,6 @@
 #  include <stddef.h>
 #endif
 
-// our needed types
-#if !@HAVE_INT8_T@
- #define HAVE_INT8_T 1
- #if ${SIZEOF_CHAR}==1 //is char one byte?
-  typedef signed char int8_t;
- #else
-  #error Could not determine type for int8_t!
- #endif
-#endif
-
-#if !@HAVE_UINT8_T@
- #define HAVE_UINT8_T 1
- #if ${SIZEOF_CHAR}==1 //is char one byte?
-  typedef unsigned char uint8_t;
- #else
-  #error Could not determine type for uint8_t!
- #endif
-#endif
-
-#if !@HAVE_INT16_T@
- #define HAVE_INT16_T 1
- #if ${SIZEOF_SHORT}==2 //is short two bytes?
-  typedef short int16_t;
- #else
-  #error Could not determine type for int16_t!
- #endif
-#endif
-
-#if !@HAVE_UINT16_T@
- #define HAVE_UINT16_T 1
- #if ${SIZEOF_SHORT}==2 //is short two bytes?
-  typedef unsigned short uint16_t;
- #else
-  #error Could not determine type for uint16_t!
- #endif
-#endif
-
-#if !@HAVE_INT32_T@
- #define HAVE_INT32_T 1
- #if ${SIZEOF_INT}==4 //is int four bytes?
-  typedef int int32_t;
- #elif ${SIZEOF_LONG}==4 //is long four bytes?
-  typedef long int32_t;
- #else
-  #error Could not determine type for int32_t!
- #endif
-#endif
-
-#if !@HAVE_UINT32_T@
- #define HAVE_UINT32_T 1
- #if ${SIZEOF_INT}==4 //is int four bytes?
-  typedef unsigned int uint32_t;
- #elif ${SIZEOF_LONG}==4 //is long four bytes?
-  typedef unsigned long uint32_t;
- #else
-  #error Could not determine type for uint32_t!
- #endif
-#endif
-
-#if !@HAVE_INT64_T@
- #define HAVE_INT64_T 1
- #if ${SIZEOF_LONG}==8
-  typedef long int64_t;
- #elif ${SIZEOF_LONGLONG}==8
-  typedef long long int64_t; 
- #else
-  #error Could not determine type for int64_t!
- #endif
-#endif
-
-#if !@HAVE_UINT64_T@
- #define HAVE_UINT64_T 1
- #if ${SIZEOF_LONG}==8
-  typedef unsigned long uint64_t;
- #elif ${SIZEOF_LONGLONG}==8
-  typedef unsigned long long uint64_t; 
- #elif defined(HAVE___INT64)
-  typedef unsigned __int64 uint64_t; 
- #else
-  #error Could not determine type for uint64_t!
- #endif
-#endif
-
-#if !@HAVE_UINT@
- typedef unsigned int uint;
- #define HAVE_UINT 1
-#endif
-
-#if !@HAVE_SIZE_T@
- #ifndef _SIZE_T_DEFINED 
-  #ifndef HAVE_SIZE_T
-   typedef unsigned int size_t;
-   #define HAVE_SIZE_T 1
-  #endif
-  #define _SIZE_T_DEFINED 1     // kdewin32 define
- #endif
-#endif
-
 #cmakedefine __STRIGI_HAVE_GCC_VISIBILITY
 
 /**


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/strigi/F-10/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	17 Oct 2008 19:48:46 -0000	1.11
+++ .cvsignore	23 Jan 2009 16:50:46 -0000	1.12
@@ -1 +1 @@
-strigi-0.5.11.tar.bz2
+strigi-0.6.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/strigi/F-10/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	17 Oct 2008 19:48:46 -0000	1.11
+++ sources	23 Jan 2009 16:50:46 -0000	1.12
@@ -1 +1 @@
-f1fa3488a9c2fe1e8128f4d44088c4ad  strigi-0.5.11.tar.bz2
+52787a80278d24b0ee552b81bbf547aa  strigi-0.6.3.tar.bz2


Index: strigi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/strigi/F-10/strigi.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- strigi.spec	1 Jan 2009 22:46:00 -0000	1.22
+++ strigi.spec	23 Jan 2009 16:50:46 -0000	1.23
@@ -1,15 +1,14 @@
 Name:		strigi
-Version:	0.5.11.1
-Release:	2%{?dist}
+Version:	0.6.3
+Release:	1%{?dist}
 Summary:	A desktop search program for KDE
 Group:		Applications/Productivity
 License:	LGPLv2+
 URL:		http://www.vandenoever.info/software/strigi
-Source0:	http://www.vandenoever.info/software/strigi/strigi-0.5.11.tar.bz2
+Source0:	http://www.vandenoever.info/software/strigi/strigi-%{version}.tar.bz2
 Source1:	strigiclient.desktop
 Source2:	strigi-daemon.desktop
-Patch0:		strigi-multilib-fix.patch
-Patch1:     strigi-0.5.11-to-0.5.11.1.diff
+Patch0:		strigi-0.6.2-multilib.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	cmake >= 2.4.5
@@ -19,6 +18,8 @@
 BuildRequires:  bison
 BuildRequires:	desktop-file-utils
 
+Requires: %{name}-libs = %{version}-%{release}
+
 %description
 Strigi is a fast and light desktop search engine. It can handle a large range
 of file formats such as emails, office documents, media files, and file
@@ -35,7 +36,7 @@
 %package	devel
 Summary:	Development files for the strigi desktop search engine
 Group:		Development/Libraries
-Requires:	%name-libs = %version-%release
+Requires:	%{name}-libs = %{version}-%{release}
 Requires:	pkgconfig
 
 %description	devel
@@ -49,30 +50,22 @@
 Strigi search engine libraries
 
 %prep
-%setup -q -n strigi-0.5.11
-%patch0 -p1 -b .multilibs
-%patch1 -p0 -b .0.5.11-to-0.5.11.1
+%setup -q 
+%patch0 -p1 -b .multilib
 
 %build
-mkdir fedora
-cd fedora
-export CFLAGS="%{optflags}"
-export CXXFLAGS="%{optflags}"
-export FFLAGS="%{optflags}"
-%ifarch x86_64 ppc64
-%define lib_suffix 64
-%else
-%define lib_suffix %{nil}
-%endif
-cmake	-DCMAKE_INSTALL_PREFIX=%{_prefix}	\
-	-DLIB_DESTINATION=%{_libdir}		\
-	-DLIB_SUFFIX=%{lib_suffix} ..
-make VERBOSE=1 %{?_smp_mflags}
+mkdir -p %{_target_platform}
+pushd %{_target_platform}
+%cmake \
+  -DLIB_DESTINATION=%{_libdir} \
+  ..
+popd
+
+make %{?_smp_mflags} -C %{_target_platform}
 
 %install
 rm -rf %{buildroot}
-cd fedora
-make DESTDIR=%{buildroot} install
+make install/fast -C %{_target_platform}  DESTDIR=%{buildroot}
 
 desktop-file-install					\
 	--vendor="fedora"				\
@@ -80,14 +73,11 @@
 	%{SOURCE1}
 
 # Add an autostart desktop file for the strigi daemon
-mkdir -p %{buildroot}%{_sysconfdir}/xdg/autostart
-cp -pr %{SOURCE2} %{buildroot}%{_sysconfdir}/xdg/autostart/
+install -p -m644 -D %{SOURCE2} %{buildroot}%{_sysconfdir}/xdg/autostart/strigi-daemon.desktop
 
-#%check
-#cd fedora
-#make test
 
-find %{buildroot}%{_libdir} -type f -name "*.so*" -exec chmod 755 {} ';'
+#check
+#make -C %{_target_platform}/tests
 
 %clean
 rm -rf %{buildroot}
@@ -117,6 +107,13 @@
 %{_libdir}/strigi/
 
 %changelog
+* Mon Jan 12 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.6.3-1
+- strigi-0.6.3
+
+* Tue Jan 06 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.6.2-1
+- strigi-0.6.2
+- use %%cmake macro
+
 * Thu Dec 18 2008 Rex Dieter <rdieter at fedoraproject.org> - 0.5.11.1-2 
 - respin (exiv2)
 


--- strigi-0.5.11-to-0.5.11.1.diff DELETED ---


--- strigi-multilib-fix.patch DELETED ---



From rdieter at fedoraproject.org  Fri Jan 23 16:53:03 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 23 Jan 2009 16:53:03 +0000 (UTC)
Subject: rpms/soprano/F-10 .cvsignore, 1.12, 1.13 soprano.spec, 1.22,
	1.23 sources, 1.12, 1.13
Message-ID: <20090123165303.6C823700FE@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/soprano/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24551

Modified Files:
	.cvsignore soprano.spec sources 
Log Message:
* Fri Jan 09 2009 Than Ngo <than at redhat.com> - 2.1.64-1
- update to 2.1.64



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/soprano/F-10/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	28 Sep 2008 00:51:47 -0000	1.12
+++ .cvsignore	23 Jan 2009 16:52:32 -0000	1.13
@@ -1 +1,2 @@
 soprano-2.1.1.tar.bz2
+soprano-2.1.64.tar.bz2


Index: soprano.spec
===================================================================
RCS file: /cvs/pkgs/rpms/soprano/F-10/soprano.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- soprano.spec	28 Sep 2008 00:51:47 -0000	1.22
+++ soprano.spec	23 Jan 2009 16:52:33 -0000	1.23
@@ -6,7 +6,7 @@
 
 Summary: Qt wrapper API to different RDF storage solutions
 Name:    soprano
-Version: 2.1.1
+Version: 2.1.64
 Release: 1%{?dist}
 
 Group:   System Environment/Libraries
@@ -108,6 +108,9 @@
 
 
 %changelog
+* Fri Jan 09 2009 Than Ngo <than at redhat.com> - 2.1.64-1
+- update to 2.1.64
+
 * Sun Sep 28 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 2.1.1-1
 - update to 2.1.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/soprano/F-10/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	28 Sep 2008 00:51:47 -0000	1.12
+++ sources	23 Jan 2009 16:52:33 -0000	1.13
@@ -1 +1 @@
-dc590aa42d832cea5ed13145d359c9f2  soprano-2.1.1.tar.bz2
+f62267c1f904450ab0e9d8cab30d252b  soprano-2.1.64.tar.bz2



From rdieter at fedoraproject.org  Fri Jan 23 16:55:19 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 23 Jan 2009 16:55:19 +0000 (UTC)
Subject: rpms/automoc/F-10 .cvsignore, 1.5, 1.6 automoc.spec, 1.11,
	1.12 sources, 1.5, 1.6
Message-ID: <20090123165519.81E9B700FE@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/automoc/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24904

Modified Files:
	.cvsignore automoc.spec sources 
Log Message:
* Thu Jan 22 2009 Rex Dieter <rdieter at fedoraproject.org> 1.0-0.11.rc3
- automoc4-0.9.88 (1.0-rc3)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/automoc/F-10/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	4 Sep 2008 18:21:53 -0000	1.5
+++ .cvsignore	23 Jan 2009 16:54:49 -0000	1.6
@@ -1,2 +1 @@
-automoc4-0.9.84.tar.bz2
-automoc4-0.9.87.tar.bz2
+automoc4-0.9.88.tar.bz2


Index: automoc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/automoc/F-10/automoc.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- automoc.spec	4 Sep 2008 18:21:53 -0000	1.11
+++ automoc.spec	23 Jan 2009 16:54:49 -0000	1.12
@@ -1,25 +1,30 @@
 #define snaptag .20080527svn811390
-%define beta 0.9.87
-%define beta_tag rc2
+%define beta 0.9.88
+%define beta_tag rc3
 
 Name:           automoc
 Version:        1.0
-Release:        0.9.%{?beta_tag}%{?dist}
-Summary:        KDE4 automoc
+Release:        0.11.%{?beta_tag}%{?dist}
+Summary:        Automatic moc for Qt 4
 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:	automoc4-%{beta}.tar.bz2
+Source0:        ftp://ftp.kde.org/pub/kde/stable/automoc4/%{beta}/automoc4-%{beta}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Provides: automoc4 = %{beta}
 
-Requires:       cmake
-BuildRequires:  cmake qt4-devel kde-filesystem
+Requires:       cmake >= 2.4.5
+BuildRequires:  cmake >= 2.4.5
+BuildRequires:  qt4-devel
+BuildRequires:  kde-filesystem
 
 %description
-KDE4 automoc
+This package contains the automoc4 binary which is used to run moc on the
+right source files in a Qt 4 or KDE 4 application.
+Moc is the meta object compiler which is a widely used tool with Qt and
+creates standard C++ files to provide syntactic sugar of the signal/slots
+mechanism.
 
 
 %prep
@@ -51,6 +56,14 @@
 
 
 %changelog
+* Thu Jan 22 2009 Rex Dieter <rdieter at fedoraproject.org> 1.0-0.11.rc3
+- automoc4-0.9.88 (1.0-rc3)
+
+* Sat Nov 22 2008 Lorenzo Villani <lvillani at binaryhelix.net> - 1.0-0.10.rc2
+- fix package summary and descriptions (as requested by Richard Hughes)
+- match cmake minimum required version with the contents of CMakeLists.txt
+  (paranoid fix)
+
 * Thu Sep  4 2008 Lorenzo Villani <lvillani at binaryhelix.net> - 1.0-0.9.rc2
 - automoc4-0.9.87 (1.0-rc2)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/automoc/F-10/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	4 Sep 2008 18:21:53 -0000	1.5
+++ sources	23 Jan 2009 16:54:49 -0000	1.6
@@ -1,2 +1 @@
-6e1167594b8edd0fd2156aad75b4b2b0  automoc4-0.9.84.tar.bz2
-f7d7fa4e948bfdc720ae4996a1ae07ee  automoc4-0.9.87.tar.bz2
+91bf517cb940109180ecd07bc90c69ec  automoc4-0.9.88.tar.bz2



From rdieter at fedoraproject.org  Fri Jan 23 17:00:13 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 23 Jan 2009 17:00:13 +0000 (UTC)
Subject: rpms/libmsn/devel libmsn.spec, 1.5,
	1.6 libmsn-4.0-beta2-pkgconfig.patch, 1.1, NONE
Message-ID: <20090123170013.32C6B700FE@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/libmsn/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26260

Modified Files:
	libmsn.spec 
Removed Files:
	libmsn-4.0-beta2-pkgconfig.patch 
Log Message:
* Fri Jan 23 2009 Rex Dieter <rdieter at fedoraproject.org> 4.0-0.8.beta2
- remove pkgconfig hack/workaround



Index: libmsn.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libmsn/devel/libmsn.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- libmsn.spec	17 Jan 2009 14:28:07 -0000	1.5
+++ libmsn.spec	23 Jan 2009 16:59:42 -0000	1.6
@@ -3,7 +3,7 @@
 
 Name:		libmsn
 Version:	4.0
-Release:	0.7.%{beta}%{?dist}
+Release:	0.8.%{beta}%{?dist}
 
 Group:		System Environment/Libraries
 License:	GPLv2
@@ -13,8 +13,6 @@
 
 Summary:	Library for connecting to the MSN(tm) Messenger service
 
-Patch1:		libmsn-4.0-beta2-pkgconfig.patch
-
 BuildRequires:	cmake
 BuildRequires:	openssl-devel
 BuildRequires:	pkgconfig
@@ -37,8 +35,6 @@
 %prep
 %setup -q -n %{name}-%{version}%{?beta:-%{beta}}
 
-%patch1 -p1 -b .pkgconfig
-
 
 %build
 
@@ -78,6 +74,9 @@
 
 
 %changelog
+* Fri Jan 23 2009 Rex Dieter <rdieter at fedoraproject.org> 4.0-0.8.beta2
+- remove pkgconfig hack/workaround
+
 * Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> 4.0-0.7.beta2
 - rebuild with new openssl
 


--- libmsn-4.0-beta2-pkgconfig.patch DELETED ---



From pghmcfc at fedoraproject.org  Fri Jan 23 17:02:29 2009
From: pghmcfc at fedoraproject.org (Paul Howarth)
Date: Fri, 23 Jan 2009 17:02:29 +0000 (UTC)
Subject: rpms/gtkwave/devel .cvsignore, 1.53, 1.54 gtkwave.spec, 1.57,
	1.58 sources, 1.53, 1.54
Message-ID: <20090123170229.B2CB6700FE@cvs1.fedora.phx.redhat.com>

Author: pghmcfc

Update of /cvs/pkgs/rpms/gtkwave/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26725

Modified Files:
	.cvsignore gtkwave.spec sources 
Log Message:
- update to 3.2.0RC4 (#481264)
- new upstream URLs
- buildreq /usr/include/tcl.h for embedded tcl support



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gtkwave/devel/.cvsignore,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- .cvsignore	22 Aug 2008 23:19:43 -0000	1.53
+++ .cvsignore	23 Jan 2009 17:01:59 -0000	1.54
@@ -1 +1 @@
-gtkwave-3.1.13.tar.gz
+gtkwave-3.2.0RC4.tar.gz


Index: gtkwave.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtkwave/devel/gtkwave.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- gtkwave.spec	22 Aug 2008 23:19:43 -0000	1.57
+++ gtkwave.spec	23 Jan 2009 17:01:59 -0000	1.58
@@ -1,13 +1,18 @@
+%define prerel RC4
+
 Summary:	Waveform Viewer
 Name:		gtkwave
-Version:	3.1.13
-Release:	1%{?dist}
+Version:	3.2.0
+Release:	%{?prerel:0.}1%{?prerel:.%{prerel}}%{?dist}
 License:	GPLv2+
 Group:		Applications/Engineering
-URL:		http://home.nc.rr.com/gtkwave/
-Source0:	http://home.nc.rr.com/gtkwave/gtkwave-%{version}.tar.gz
+URL:		http://gtkwave.sourceforge.net/
+Source0:	http://gtkwave.sourceforge.net/gtkwave-%{version}%{?prerel}.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	gtk2-devel, bzip2-devel, zlib-devel, gperf, flex
+# BR: /usr/include/tcl.h rather than tcl-devel for compatibility with
+# old releases prior to tcl-devel split
+BuildRequires:	/usr/include/tcl.h
 
 %description
 GTKWave is a waveform viewer that can view VCD files produced by most Verilog
@@ -15,7 +20,7 @@
 tools.
 
 %prep
-%setup -q
+%setup -q -n gtkwave-%{version}%{?prerel}
 %{__cp} -p .gtkwaverc gtkwaverc.sample
 
 # Note that GTKWave is a GUI application but no desktop entry is provided for it.
@@ -89,6 +94,11 @@
 %{_mandir}/man5/gtkwaverc.5*
 
 %changelog
+* Fri Jan 29 2009 Paul Howarth <paul at city-fan.org> 3.2.0-0.1.RC4
+- update to 3.2.0RC4 (#481264)
+- new upstream URLs
+- buildreq /usr/include/tcl.h for embedded tcl support
+
 * Thu Aug 21 2008 Paul Howarth <paul at city-fan.org> 3.1.13-1
 - update to 3.1.13
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gtkwave/devel/sources,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- sources	22 Aug 2008 23:19:43 -0000	1.53
+++ sources	23 Jan 2009 17:01:59 -0000	1.54
@@ -1 +1 @@
-b79a78514fed8e0cd25b05409daeb799  gtkwave-3.1.13.tar.gz
+d5095a1e8e27ade8a124185785fe2ae9  gtkwave-3.2.0RC4.tar.gz



From rdieter at fedoraproject.org  Fri Jan 23 17:02:48 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 23 Jan 2009 17:02:48 +0000 (UTC)
Subject: rpms/libmsn/F-10 .cvsignore, 1.2, 1.3 libmsn.spec, 1.1, 1.2 sources,
	1.2, 1.3 libmsn-4.0beta1-rmhardcoded.patch, 1.1, NONE
Message-ID: <20090123170248.6C86D700FE@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/libmsn/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26811

Modified Files:
	.cvsignore libmsn.spec sources 
Removed Files:
	libmsn-4.0beta1-rmhardcoded.patch 
Log Message:
sync w/ devel/ branch for 4.0-beta2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libmsn/F-10/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	16 Dec 2008 15:38:09 -0000	1.2
+++ .cvsignore	23 Jan 2009 17:02:18 -0000	1.3
@@ -1 +1 @@
-libmsn-4.0-beta1.tar.bz2
+libmsn-4.0-beta2.tar.bz2


Index: libmsn.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libmsn/F-10/libmsn.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libmsn.spec	16 Dec 2008 15:38:10 -0000	1.1
+++ libmsn.spec	23 Jan 2009 17:02:18 -0000	1.2
@@ -1,21 +1,21 @@
+
+%define beta beta2
+
 Name:		libmsn
 Version:	4.0
-Release:	0.3.beta1%{?dist}
+Release:	0.8.%{beta}%{?dist}
 
 Group:		System Environment/Libraries
 License:	GPLv2
 URL:		http://sourceforge.net/projects/libmsn/
-Source0:	http://downloads.sourceforge.net/%{name}/%{name}-%{version}-beta1.tar.bz2
-
-Patch0:		%{name}-4.0beta1-rmhardcoded.patch
-
+Source0:	http://downloads.sourceforge.net/%{name}/%{name}-%{version}%{?beta:-%{beta}}.tar.bz2
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Summary:	Library for connecting to the MSN(tm) Messenger service
 
 BuildRequires:	cmake
 BuildRequires:	openssl-devel
-#All other headers seem to be provided by glibc or stdlibc++
+BuildRequires:	pkgconfig
 
 %description
 Libmsn is a reusable, open-source, fully documented library for connecting to
@@ -24,28 +24,31 @@
 %package	devel
 Summary:	Development files for %{name}
 Group:		Development/Libraries
-
 Requires:	%{name} = %{version}-%{release}
-
+Requires:	openssl-devel
+Requires:	pkgconfig
 %description	devel
 The %{name}-devel package contains libraries and header files for
 developing applications that use %{name}.
 
+
 %prep
-%setup -q -n %{name}-4.0-beta1
-%patch0 -p1
+%setup -q -n %{name}-%{version}%{?beta:-%{beta}}
+
 
 %build
-mkdir build
-cd build
+
+mkdir -p %{_target_platform}
+pushd %{_target_platform} 
 %{cmake} ..
-make
+popd
+
+make %{?_smp_mflags} -C %{_target_platform}
 
 
 %install
 rm -rf %{buildroot}
-cd build
-make install DESTDIR=%{buildroot}
+make install/fast -C %{_target_platform} DESTDIR=%{buildroot}
 
 
 %clean
@@ -60,14 +63,32 @@
 %files
 %defattr(-,root,root,-)
 %doc README COPYING THANKS
-%{_libdir}/*.so.*
+%{_bindir}/msntest
+%{_libdir}/libmsn.so.0*
 
 %files devel
 %defattr(-,root,root,-)
-%{_libdir}/*.so
-%{_includedir}/*
+%{_libdir}/libmsn.so
+%{_libdir}/pkgconfig/libmsn.pc
+%{_includedir}/msn/
+
 
 %changelog
+* Fri Jan 23 2009 Rex Dieter <rdieter at fedoraproject.org> 4.0-0.8.beta2
+- remove pkgconfig hack/workaround
+
+* Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> 4.0-0.7.beta2
+- rebuild with new openssl
+
+* Fri Jan 09 2009 Rex Dieter <rdieter at fedoraproject.org> 4.0-0.6.beta2
+- pkgconfig patch to workaround bug #479493
+
+* Fri Jan 09 2009 Rex Dieter <rdieter at fedoraproject.org> 4.0-0.5.beta2
+- -devel: Requires: openssl-devel
+
+* Fri Jan 09 2009 Rex Dieter <rdieter at fedoraproject.org> 4.0-0.4.beta2
+- libmsn-4.0-beta2
+
 * Thu Dec 11 2008 John5342 <john5342 at, fedoraproject.org> 4.0-0.3.beta1
 - Left docs out of devel package
 - Added (tm) to MSN


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libmsn/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	16 Dec 2008 15:38:10 -0000	1.2
+++ sources	23 Jan 2009 17:02:18 -0000	1.3
@@ -1 +1 @@
-f5b79c230ec7e7654b5efe8c61ea1602  libmsn-4.0-beta1.tar.bz2
+e2088e987a44cef0b243b4adcb8c3825  libmsn-4.0-beta2.tar.bz2


--- libmsn-4.0beta1-rmhardcoded.patch DELETED ---



From langel at fedoraproject.org  Fri Jan 23 17:22:56 2009
From: langel at fedoraproject.org (Lillian Angel)
Date: Fri, 23 Jan 2009 17:22:56 +0000 (UTC)
Subject: rpms/java-1.6.0-openjdk/F-10
	java-1.6.0-openjdk-accessible-toolkit.patch, NONE,
	1.1 java-1.6.0-openjdk-java-access-bridge-security.patch, 1.1,
	1.2 java-1.6.0-openjdk.spec, 1.98, 1.99
Message-ID: <20090123172256.2E3D4700FE@cvs1.fedora.phx.redhat.com>

Author: langel

Update of /cvs/pkgs/rpms/java-1.6.0-openjdk/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29478

Modified Files:
	java-1.6.0-openjdk-java-access-bridge-security.patch 
	java-1.6.0-openjdk.spec 
Added Files:
	java-1.6.0-openjdk-accessible-toolkit.patch 
Log Message:
* Fri Jan 23 2009 Lillian Angel <langel at redhat.com> - 1:1.6.0-10.b14
- Added accessibility patch.



java-1.6.0-openjdk-accessible-toolkit.patch:

--- NEW FILE java-1.6.0-openjdk-accessible-toolkit.patch ---
diff -uNr openjdk-orig/jdk/src/share/classes/java/awt/Toolkit.java openjdk/jdk/src/share/classes/java/awt/Toolkit.java
--- openjdk-orig/jdk/src/share/classes/java/awt/Toolkit.java	2009-01-23 11:59:47.000000000 -0500
+++ openjdk/jdk/src/share/classes/java/awt/Toolkit.java	2009-01-23 12:05:20.000000000 -0500
@@ -871,7 +871,11 @@
                         return null;
                     }
                 });
-                loadAssistiveTechnologies();
+                try {
+                    loadAssistiveTechnologies();
+                } catch ( AWTError error) {
+                    // ignore silently
+                }
             } finally {
                 // Make sure to always re-enable the JIT.
                 java.lang.Compiler.enable();

java-1.6.0-openjdk-java-access-bridge-security.patch:

Index: java-1.6.0-openjdk-java-access-bridge-security.patch
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/F-10/java-1.6.0-openjdk-java-access-bridge-security.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- java-1.6.0-openjdk-java-access-bridge-security.patch	22 Jan 2009 16:33:42 -0000	1.1
+++ java-1.6.0-openjdk-java-access-bridge-security.patch	23 Jan 2009 17:22:55 -0000	1.2
@@ -5,7 +5,7 @@
  # corresponding RuntimePermission ("accessClassInPackage."+package) has
  # been granted.
 -package.access=sun.,com.sun.xml.internal.ws.,com.sun.xml.internal.bind.
-+package.access=sun.,com.sun.xml.internal.ws.,com.sun.xml.internal.bind.,org.GNOME.Accessibility,org.GNOME.Bonobo
++package.access=sun.,com.sun.xml.internal.ws.,com.sun.xml.internal.bind.,org.GNOME.Accessibility.,org.GNOME.Bonobo.
  
  #
  # List of comma-separated packages that start with or equal this string


Index: java-1.6.0-openjdk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/F-10/java-1.6.0-openjdk.spec,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -r1.98 -r1.99
--- java-1.6.0-openjdk.spec	22 Jan 2009 19:34:19 -0000	1.98
+++ java-1.6.0-openjdk.spec	23 Jan 2009 17:22:55 -0000	1.99
@@ -139,6 +139,7 @@
 Patch2:   java-1.6.0-openjdk-makefile.patch
 Patch3:   java-1.6.0-openjdk-java-access-bridge-idlj.patch
 Patch4:   java-1.6.0-openjdk-java-access-bridge-security.patch
+Patch5:   java-1.6.0-openjdk-accessible-toolkit.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -364,6 +365,7 @@
 %endif
 make patch
 patch -l -p0 < %{PATCH4}
+patch -l -p0 < %{PATCH5}
 make
 
 export JAVA_HOME=$(pwd)/%{buildoutputdir}/j2sdk-image
@@ -888,6 +890,9 @@
 %{_jvmdir}/%{jredir}/lib/%{archinstall}/IcedTeaPlugin.so
 
 %changelog
+* Fri Jan 23 2009 Lillian Angel <langel at redhat.com> - 1:1.6.0-10.b14
+- Added accessibility patch.
+
 * Thu Jan 22 2009 Lillian Angel <langel at redhat.com> - 1:1.6.0-10.b14
 - Updated to icedtea-1.4 snapshot.
 - Updated release.



From langel at fedoraproject.org  Fri Jan 23 17:24:45 2009
From: langel at fedoraproject.org (Lillian Angel)
Date: Fri, 23 Jan 2009 17:24:45 +0000 (UTC)
Subject: rpms/java-1.6.0-openjdk/devel
	java-1.6.0-openjdk-java-access-bridge-security.patch, 1.1,
	1.2 java-1.6.0-openjdk.spec, 1.101, 1.102
Message-ID: <20090123172445.28595700FE@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-serv29670

Modified Files:
	java-1.6.0-openjdk-java-access-bridge-security.patch 
	java-1.6.0-openjdk.spec 
Log Message:
* Fri Jan 23 2009 Lillian Angel <langel at redhat.com> - 1:1.6.0-10.b14
- Added accessibility patch.



java-1.6.0-openjdk-java-access-bridge-security.patch:

Index: java-1.6.0-openjdk-java-access-bridge-security.patch
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/devel/java-1.6.0-openjdk-java-access-bridge-security.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- java-1.6.0-openjdk-java-access-bridge-security.patch	5 Dec 2008 16:45:47 -0000	1.1
+++ java-1.6.0-openjdk-java-access-bridge-security.patch	23 Jan 2009 17:24:44 -0000	1.2
@@ -5,7 +5,7 @@
  # corresponding RuntimePermission ("accessClassInPackage."+package) has
  # been granted.
 -package.access=sun.,com.sun.xml.internal.ws.,com.sun.xml.internal.bind.
-+package.access=sun.,com.sun.xml.internal.ws.,com.sun.xml.internal.bind.,org.GNOME.Accessibility,org.GNOME.Bonobo
++package.access=sun.,com.sun.xml.internal.ws.,com.sun.xml.internal.bind.,org.GNOME.Accessibility.,org.GNOME.Bonobo.
  
  #
  # List of comma-separated packages that start with or equal this string


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.101
retrieving revision 1.102
diff -u -r1.101 -r1.102
--- java-1.6.0-openjdk.spec	22 Jan 2009 19:34:01 -0000	1.101
+++ java-1.6.0-openjdk.spec	23 Jan 2009 17:24:44 -0000	1.102
@@ -139,6 +139,7 @@
 Patch2:   java-1.6.0-openjdk-makefile.patch
 Patch3:   java-1.6.0-openjdk-java-access-bridge-idlj.patch
 Patch4:	  java-1.6.0-openjdk-java-access-bridge-security.patch
+Patch5:   java-1.6.0-openjdk-accessible-toolkit.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -364,6 +365,7 @@
 %endif
 make patch
 patch -l -p0 < %{PATCH4}
+patch -l -p0 < %{PATCH5}
 make
 
 export JAVA_HOME=$(pwd)/%{buildoutputdir}/j2sdk-image
@@ -888,6 +890,9 @@
 %{_jvmdir}/%{jredir}/lib/%{archinstall}/IcedTeaPlugin.so
 
 %changelog
+* Fri Jan 23 2009 Lillian Angel <langel at redhat.com> - 1:1.6.0-10.b14
+- Added accessibility patch.
+
 * Thu Jan 22 2009 Lillian Angel <langel at redhat.com> - 1:1.6.0-10.b14
 - Updated to icedtea-1.4 snapshot.
 - Updated release.



From rdieter at fedoraproject.org  Fri Jan 23 17:27:56 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 23 Jan 2009 17:27:56 +0000 (UTC)
Subject: rpms/akonadi/F-10 .cvsignore, 1.5, 1.6 akonadi.spec, 1.15,
	1.16 sources, 1.5, 1.6
Message-ID: <20090123172756.A0244700FE@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/akonadi/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30633

Modified Files:
	.cvsignore akonadi.spec sources 
Log Message:
* Wed Jan 21 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.1.1-1
- 1.1.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/akonadi/F-10/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	23 Jul 2008 09:09:55 -0000	1.5
+++ .cvsignore	23 Jan 2009 17:27:26 -0000	1.6
@@ -1,2 +1 @@
-akonadi-0.82.0.tar.bz2
-akonadi-1.0.0.tar.bz2
+akonadi-1.1.1.tar.bz2


Index: akonadi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/akonadi/F-10/akonadi.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- akonadi.spec	1 Dec 2008 00:07:14 -0000	1.15
+++ akonadi.spec	23 Jan 2009 17:27:26 -0000	1.16
@@ -1,7 +1,7 @@
 Summary: PIM Storage Service
 Name:    akonadi
-Version: 1.0.0
-Release: 5%{?dist}
+Version: 1.1.1
+Release: 1%{?dist}
 
 Group:   System Environment/Libraries
 License: LGPLv2+
@@ -17,13 +17,13 @@
 # for xsltproc
 BuildRequires: libxslt
 BuildRequires: shared-mime-info
+BuildRequires: boost-devel
 
 # when/if akonadi grows support for other backends, consider splitting
 # these similar to how phonon is done currently.
 Requires: qt4-mysql
-# not *strictly* required, leave out for now, until we have something in
-# fedora that actively uses akonadi.
-#Requires(hint): mysql-server
+# not *strictly* required, but we need a functional default configuration
+Requires(hint): mysql-server
 
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
@@ -35,7 +35,6 @@
 package is installed on the machine.
 See also: %{_sysconfdir}/akonadi/mysql-global.conf
 
-
 %package devel
 Summary: Developer files for %{name}
 Group:   Development/Libraries
@@ -54,7 +53,9 @@
 
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
+# added CMAKE_SKIP_RPATH ... at least until universally in %%cmake macro -- Rex
 %{cmake} \
+  -DCMAKE_SKIP_RPATH:BOOL=ON \
   -DCONFIG_INSTALL_DIR=%{_sysconfdir} \
   ..
 popd
@@ -89,7 +90,7 @@
 %{_bindir}/akonadi_control
 %{_bindir}/akonadictl
 %{_bindir}/akonadiserver
-%{_libdir}/libakonadi*.so.*
+%{_libdir}/libakonadi*.so.1*
 %{_datadir}/dbus-1/interfaces/
 %{_datadir}/dbus-1/services/org.freedesktop.Akonadi.Control.service
 %{_datadir}/mime/packages/akonadi-mime.xml
@@ -104,9 +105,24 @@
 
 
 %changelog
-* Mon Dec 01 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 1.0.0-5
+* Wed Jan 21 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.1.1-1
+- 1.1.1
+
+* Sun Jan 04 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.1.0-1
+- 1.1.0
+
+* Tue Dec 16 2008 Rex Dieter <rdieter at fedoraproject.org> - 1.0.81-1
+- 1.0.81
+
+* Mon Dec 08 2008 Rex Dieter <rdieter at fedoraproject.org> - 1.0.80-3
+- restore Requires: mysql-server
+
+* Mon Dec 01 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> - 1.0.80-2
 - own /usr/share/akonadi and /usr/share/akonadi/agents (#473595)
 
+* Wed Nov 26 2008 Than Ngo <than at redhat.com> -  1.0.80-1
+- 1.0.80
+
 * Wed Oct 22 2008 Rex Dieter <rdieter at fedoraproject.org> 1.0.0-4
 - drop Requires: mysql-server (for now), mention in %%description
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/akonadi/F-10/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	23 Jul 2008 09:09:55 -0000	1.5
+++ sources	23 Jan 2009 17:27:26 -0000	1.6
@@ -1 +1 @@
-90039928f818a55a7e2a1bf852a32f2d  akonadi-1.0.0.tar.bz2
+2e98b42cec9ec4e60a2e3c096f1a3106  akonadi-1.1.1.tar.bz2



From rdieter at fedoraproject.org  Fri Jan 23 17:29:51 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 23 Jan 2009 17:29:51 +0000 (UTC)
Subject: rpms/phonon/F-10 gstreamer-logo.svg, NONE,
	1.1 phonon-4.2.96-pulseaudio.patch, NONE,
	1.1 phonon-4.2.96-xine-pulseaudio.patch, NONE, 1.1 .cvsignore,
	1.5, 1.6 phonon.spec, 1.12, 1.13 sources, 1.5,
	1.6 phonon-4.2.0-pulseaudio.patch, 1.1, NONE
Message-ID: <20090123172951.B8999700FE@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/phonon/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31080

Modified Files:
	.cvsignore phonon.spec sources 
Added Files:
	gstreamer-logo.svg phonon-4.2.96-pulseaudio.patch 
	phonon-4.2.96-xine-pulseaudio.patch 
Removed Files:
	phonon-4.2.0-pulseaudio.patch 
Log Message:
* Fri Jan 23 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.0-2
- fix typo in postun scriptlet (introduced in 4.2.96-3)



--- NEW FILE gstreamer-logo.svg ---
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 12.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 51448)  -->
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
	<!ENTITY ns_svg "http://www.w3.org/2000/svg">
	<!ENTITY ns_xlink "http://www.w3.org/1999/xlink">
]>
<svg  version="1.1" id="Layer_1" xmlns="&ns_svg;" xmlns:xlink="&ns_xlink;" width="280.22" height="69.387"
	 viewBox="0 0 280.22 69.387" overflow="visible" enable-background="new 0 0 280.22 69.387" xml:space="preserve">
<path fill="#8C8C8C" d="M199.551,58.684c-0.334-6.834,2.636-22.747,9.47-21.247c2.913,0.64,2.118,4.655,1.166,9
	c-1.282,5.85-3.5,12.237-3.5,12.237s8.334,0.333,8.167,0c0.833-10.5,3.039-21.928,9.167-21.071
	c5.081,0.71-1.441,21.071-1.441,21.071s6.27,0,7.587,0c-0.272-3.453,1.59-11.495,2.635-17.311s-1.181-8.36-5.86-8.405
	s-9.314,4.044-9.314,4.044c0.182-3.498-4.429-4.05-4.429-4.05c-4.93-0.313-9.655,3.005-9.655,3.005l0.438-2.57h-7.425
	c0,0-0.365,4.088-1.867,11.549s-3.51,13.738-3.51,13.738L199.551,58.684z"/>
<path fill="#8C8C8C" d="M250.388,32.759c-10.167,0-14.7,7.178-14.7,14.511s4.332,12.167,13.166,12.167c4.15,0,6.5-3.834,6.5-3.834
	s0.134-1.049-0.65-0.612s-2.92,1.352-5.71,1.352s-5.806-2.654-5.806-9.239c0,0,16.166,0,16,0
	C260.021,44.437,260.555,32.759,250.388,32.759z M251.871,44.136h-7.76c0-5.362,4.29-9.412,7.211-7.974
	C253.982,37.397,251.871,44.136,251.871,44.136z"/>
<path fill="#8C8C8C" d="M154.888,32.759c-10.167,0-14.7,7.178-14.7,14.511s4.332,12.167,13.166,12.167c4.15,0,6.5-3.834,6.5-3.834
	s0.134-1.049-0.65-0.612s-2.92,1.352-5.71,1.352s-5.806-2.654-5.806-9.239c0,0,16.166,0,16,0
	C164.521,44.437,165.055,32.759,154.888,32.759z M156.371,44.136h-7.76c0-5.362,3.621-8.836,6.542-7.397
	C157.813,37.973,156.371,44.136,156.371,44.136z"/>
<path fill="#8C8C8C" d="M268.725,59.088h-8.198c0,0,4.786-17.192,5.203-25.621c-0.072,0.072,7.11,0,7.11,0s-0.617,1.9-0.885,3.559
	c2.031-2.249,2.719-4.272,8.232-4.272c0.072,0,0,7.109,0,7.109s-5.15-1.275-7,0.574S269.354,43.77,268.725,59.088z"/>
<path fill="#8C8C8C" d="M127.225,59.088h-8.198c0,0,4.786-17.192,5.203-25.621c-0.072,0.072,7.11,0,7.11,0s-0.617,1.9-0.885,3.559
	c2.031-2.249,2.719-4.272,8.232-4.272c0.072,0,0,7.109,0,7.109s-5.15-1.275-7,0.574S127.854,43.77,127.225,59.088z"/>
<path fill="#8C8C8C" d="M117.227,24.633l-6.705,2.325l-1.541,6.244h-4.273v4.105h3.374c0,0-3.598,12.875-2.924,16.812
	c0.675,4.273,4.836,5.172,7.31,5.06s3.149-1.911,3.036-2.586s-3.487,0.644-3.824-2.393c-0.225-1.799,2.812-16.893,2.812-16.893
	h5.285v-4.105h-4.161L117.227,24.633z"/>
<path fill="#8C8C8C" d="M187.104,58.691c0.994-0.821,0.33-2.463-0.53-2.661c-0.97-2.011,2.023-13.763,2.023-16.98
	s-5.397-9.671-16.53-3.599c-1.079,0.686-0.682,1.808-0.416,2.183s0.766,0.625,1,0.375c1.047-1.141,5.602-2.333,7.737-0.084
	c1.462,1.35,1.396,3.958,0.383,4.97c-1.236,0.112-13.427-0.246-14.889,7.513c-2.522,13.777,12.92,6.522,13.719,5.96
	s0.706,1.626,2.003,2.548C185.125,59.223,186.41,59.264,187.104,58.691z M179.396,52.935c-1.25,3.292-5.891,2.789-6.166,0.459
	c-1-7.792,7.041-7.209,7.041-7.209S180.646,49.643,179.396,52.935z"/>
<path fill="#8C8C8C" d="M98.272,40.792l2.332-3.939c0,0-1.9-4.045-7.511-4.045s-8.848,4.046-8.848,8.848s10.682,8.417,8.093,13.164
	c-4.316,4.424-8.872-2.792-8.782-3.266c-0.326,0.47-2.56,3.549-2.452,3.549c0.54,1.079,2.5,4.5,8.752,4.572
	c5.179,0.06,8.309-3.776,8.417-8.523c0.108-6.366-9.172-9.604-9.28-12.517S95.144,32.375,98.272,40.792z"/>
<path d="M86.042,31.416c-1-0.938-1.75,0.313-4,1.25s-3,0.813-5.25,0.5c-3.688-0.813-10.17-0.57-11.875,0.25
	c-11.386,4.572-5.281,13.031-3.422,14.719c-0.016,0-2.773,1.453-3.176,3.735c-0.518,2.933,0.831,4.52,0.873,4.561
	c-3.72,0.193-6.112,3.934-5.536,6.997c0.62,3.299,4.553,5.931,10.184,5.953c11.904,0.259,12.521-7.353,12.521-7.353
	c1.629-9.258-6.222-9.685-11.817-9.25c-2.025-1.809-0.445-3.496-0.531-3.496C82.917,49.728,78.158,37.12,78.158,37.12
	C81.35,36.343,87.604,32.916,86.042,31.416z M60.722,57.939c7.405,1.336,10.385-0.362,10.892,3.413
	c0.219,3.684-2.908,4.737-6.545,4.963s-6.287-1.612-6.433-3.975C58.491,59.977,60.555,60.221,60.722,57.939z M72.161,41.835
	c-0.684,3.028-2.782,5.136-4.687,4.706c-1.905-0.431-2.894-3.234-2.211-6.263c0.684-3.029,2.782-5.137,4.687-4.707
	C71.855,36.002,72.845,38.806,72.161,41.835z"/>
<path fill="#FF3131" d="M47.141,5.199c-5.409,0-13.323-4.407-21.036-4.407S13.785,5.199,12.983,5.8
	c-0.801,0.601-1.303,2.904,1.102,2.203s4.407-0.701,8.214-0.701s12.922,5.209,22.138,5.209S61.365,5.4,63.068,2.895
	s0.1-3.306-1.202-2.704C60.563,0.792,52.15,5.199,47.141,5.199z"/>
<path fill="#319831" d="M70.639,18.921c-5.683,0-13.997-4.406-22.1-4.406s-12.944,4.406-13.786,5.008s-1.369,2.904,1.157,2.203
	s4.63-0.701,8.629-0.701c3.999,0,13.576,5.209,23.257,5.209s17.785-7.111,19.574-9.615c1.789-2.505,0.105-3.307-1.263-2.705
	S75.901,18.921,70.639,18.921z"/>
<path fill="#3232CC" d="M37.936,34.063c-5.893,0-14.515-4.761-22.918-4.761c-8.403,0-13.424,4.761-14.297,5.41
	s-1.419,3.137,1.2,2.379c2.62-0.757,4.802-0.757,8.949-0.757S24.949,41.96,34.99,41.96c10.04,0,18.443-7.681,20.299-10.386
	s0.109-3.57-1.31-2.921C52.56,29.302,43.393,34.063,37.936,34.063z"/>
</svg>

phonon-4.2.96-pulseaudio.patch:

--- NEW FILE phonon-4.2.96-pulseaudio.patch ---
diff -Naurw phonon-4.2.96/phonon/globalconfig.cpp phonon-4.2.96.pulseaudio/phonon/globalconfig.cpp
--- phonon-4.2.96/phonon/globalconfig.cpp	2008-11-27 16:41:41.000000000 +0100
+++ phonon-4.2.96.pulseaudio/phonon/globalconfig.cpp	2009-01-08 21:29:18.000000000 +0100
@@ -31,6 +31,7 @@
 #include "phononnamespace_p.h"
 
 #include <QtCore/QList>
+#include <QtCore/QHash>
 #include <QtCore/QVariant>
 
 QT_BEGIN_NAMESPACE
@@ -167,6 +168,15 @@
                     | ((override & HideUnavailableDevices) ? FilterUnavailableDevices : 0)
                     );
         }
+        // make PulseAudio the global default (assume it is already default in this list)
+        if (!list.isEmpty()) {
+            int firstIndex = list.first();
+            if (backendIface->objectDescriptionProperties(Phonon::AudioOutputDeviceType,
+                  firstIndex)["name"].toString() == "PulseAudio") {
+                list.removeFirst();
+                defaultList.prepend(firstIndex);
+            }
+        }
         defaultList += list;
     }
 
@@ -222,6 +232,15 @@
                     | ((override & HideUnavailableDevices) ? FilterUnavailableDevices : 0)
                   );
         }
+        // make PulseAudio the global default (assume it is already default in this list)
+        if (!list.isEmpty()) {
+            int firstIndex = list.first();
+            if (backendIface->objectDescriptionProperties(Phonon::AudioCaptureDeviceType,
+                  firstIndex)["name"].toString() == "PulseAudio") {
+                list.removeFirst();
+                defaultList.prepend(firstIndex);
+            }
+        }
         defaultList += list;
     }
 

phonon-4.2.96-xine-pulseaudio.patch:

--- NEW FILE phonon-4.2.96-xine-pulseaudio.patch ---
diff -Naurw phonon-4.2.96/xine/backend.cpp phonon-4.2.96.xine-pulseaudio/xine/backend.cpp
--- phonon-4.2.96/xine/backend.cpp	2008-12-19 08:08:53.000000000 +0100
+++ phonon-4.2.96.xine-pulseaudio/xine/backend.cpp	2009-01-08 21:31:10.000000000 +0100
@@ -649,7 +649,7 @@
                             "in KDE2 and KDE3. Its use is discuraged.</p></html>"),
                         /*icon name */"audio-backend-arts", outputPlugins[i]);
             } else if (0 == strcmp(outputPlugins[i], "pulseaudio")) {
-                addAudioOutput(nextIndex++, 10, tr("PulseAudio"),
+                addAudioOutput(nextIndex++, 2000, tr("PulseAudio"),
                         xine_get_audio_driver_plugin_description(m_xine, outputPlugins[i]),
                         /*icon name */"audio-backend-pulseaudio", outputPlugins[i]);
             } else if (0 == strcmp(outputPlugins[i], "esd")) {


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/phonon/F-10/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	30 Sep 2008 14:05:11 -0000	1.5
+++ .cvsignore	23 Jan 2009 17:29:21 -0000	1.6
@@ -1,2 +1,2 @@
-phonon-4.2.0.tar.bz2
-gstreamer-logo.svg
+phonon-4.2.96.tar.bz2
+phonon-4.3.0.tar.bz2


Index: phonon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/phonon/F-10/phonon.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- phonon.spec	30 Sep 2008 15:02:52 -0000	1.12
+++ phonon.spec	23 Jan 2009 17:29:21 -0000	1.13
@@ -1,13 +1,12 @@
-
 Summary: Multimedia framework api
-Name:    phonon 
-Version: 4.2.0
-Release: 7%{?dist}
+Name:    phonon
+Version: 4.3.0
+Release: 2%{?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
+Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{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
@@ -15,38 +14,50 @@
 # set through systemsettings, and listed devices are only those supported by the
 # "sink". So it never lists "PulseAudio" as a supported device, you have to pick
 # it as a "sink", and then the device setting is ignored entirely.
-Patch0:  phonon-4.2.0-pulseaudio.patch
+Patch0:  phonon-4.2.96-pulseaudio.patch
+Patch1:  phonon-4.2.96-xine-pulseaudio.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: automoc4
-BuildRequires: cmake
+BuildRequires: cmake >= 2.6.0
 BuildRequires: glib2-devel
 BuildRequires: gstreamer-devel
 BuildRequires: gstreamer-plugins-base-devel
+BuildRequires: ImageMagick
 BuildRequires: kde-filesystem
 BuildRequires: libxml2-devel
+BuildRequires: pkgconfig
 BuildRequires: qt4-devel >= 4.4.0
-BuildRequires: ImageMagick
+BuildRequires: xine-lib-devel
+
+Requires: phonon-backend
+## hard-code phonon-backend-xine, if yum chooses -gstreamer by default
+#Requires(hint): phonon-backend-xine
 
-## hard-code phonon-backend-xine, for now, so yum doesn't choose -gstreamer by default
-Requires: phonon-backend-xine
-#Requires: phonon-backend
+Requires(post): /sbin/ldconfig xdg-utils
+Requires(postun): /sbin/ldconfig xdg-utils
 
 %description
 %{summary}.
 
 %package backend-gstreamer
 Summary: Gstreamer phonon backend
-Group:   Applications/Multimedia 
+Group:   Applications/Multimedia
 Requires: %{name} = %{version}-%{release}
 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}.
 
+%package backend-xine
+Summary: xine phonon backend
+Group:   Applications/Multimedia
+Requires: %{name} = %{version}-%{release}
+Provides: phonon-backend = %{version}-%{release}
+%description backend-xine
+%{summary}.
+
 %package devel
 Summary: Developer files for %{name}
 Group:   Development/Libraries
@@ -58,8 +69,9 @@
 
 
 %prep
-%setup -q
+%setup -q -n phonon-%{version}%{?alphatag}
 %patch0 -p1 -b .pulseaudio
+%patch1 -p1 -b .xine-pulseaudio
 
 
 %build
@@ -68,13 +80,13 @@
 %{cmake} ..
 popd
 
-make %{?_smp_mflags} -C %{_target_platform}
+make %{?_smp_mflags} -C %{_target_platform} VERBOSE=1
 
 
 %install
-rm -rf %{buildroot} 
+rm -rf %{buildroot}
 
-make install DESTDIR=%{buildroot} -C %{_target_platform}
+make install/fast 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
@@ -83,26 +95,27 @@
 done
 
 
-
 %clean
-rm -rf %{buildroot} 
-
+rm -rf %{buildroot}
 
-%post -p /sbin/ldconfig
 
-%postun -p /sbin/ldconfig
-
-%post -n %{name}-backend-gstreamer
+%post
+/sbin/ldconfig
 xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
+xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || :
 
-%postun -n %{name}-backend-gstreamer
+%postun
+/sbin/ldconfig
 xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
+xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || :
 
 %files
 %defattr(-,root,root,-)
-%doc COPYING.LIB 
-%{_libdir}/libphonon*.so.*
+%doc COPYING.LIB
+%{_libdir}/libphonon*.so.4*
 %{_datadir}/dbus-1/interfaces/org.kde.Phonon.AudioOutput.xml
+%{_datadir}/icons/hicolor/*/*/*
+%{_datadir}/icons/oxygen/*/*/*
 # kde4-specific dirs
 %dir %{_kde4_libdir}/kde4/plugins/phonon_backend/
 %dir %{_kde4_datadir}/kde4/services/phononbackends/
@@ -111,8 +124,11 @@
 %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 backend-xine
+%defattr(-,root,root,-)
+%{_kde4_libdir}/kde4/plugins/phonon_backend/phonon_xine.so
+%{_kde4_datadir}/kde4/services/phononbackends/xine.desktop
 
 %files devel
 %defattr(-,root,root,-)
@@ -124,6 +140,44 @@
 
 
 %changelog
+* Fri Jan 23 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.0-2
+- fix typo in postun scriptlet (introduced in 4.2.96-3)
+
+* Thu Jan 22 2009 Than Ngo <than at redhat.com> - 4.3.0-1
+- 4.3.0
+
+* Thu Jan 08 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.96-3
+- new tarball
+- put icons/scriptlets into main pkg
+- Requires: phonon-backend
+
+* Thu Jan 08 2009 Lorenzo Villani <lvillani at binaryhelix.net> - 4.2.96-2
+- add gstreaer-logo.svg
+
+* Thu Jan 08 2009 Lorenzo Villani <lvillani at binaryhelix.net> - 4.2.96-1
+- 4.2.96
+- rebase phonon-4.2.0-pulseaudio.patch (-> phonon-4.2.96-pulseaudio.patch)
+- rebase phonon-4.2.70-xine-pulseaudio.patch 
+  (-> phonon-4.2.96-xine-pulseaudio.patch)
+
+* Fri Dec 12 2008 Rex Dieter <rdieter at fedoraproject.org> 4.2.80-3
+- rebuild for pkgconfig deps
+
+* Tue Nov 25 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.2.80-2
+- phonon-backend-xine: don't Obsolete/Provide itself, Provides: phonon-backend
+
+* Tue Nov 25 2008 Than Ngo <than at redhat.com> 4.2.80-1
+- 4.2.80
+
+* Fri Nov 21 2008 Lorenzo Villani <lvillani at binaryhelix.net> - 4.2.80-0.1.20081121svn887051
+- Use subversion (4.2.80) snapshot
+- phonon-backend-xine subpkg
+- make VERBOSE=1
+- make install/fast
+- Xine backend is in phonon now, add xine-lib-devel as BR
+- BR cmake >= 2.6.0
+- forward-port xine pulseaudio patch
+
 * Tue Sep 30 2008 Than Ngo <than at redhat.com> 4.2.0-7
 - fix tranparent issue by convert
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/phonon/F-10/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	30 Sep 2008 14:05:12 -0000	1.5
+++ sources	23 Jan 2009 17:29:21 -0000	1.6
@@ -1,2 +1 @@
-de80b0f055886a6946acc7886713e23e  phonon-4.2.0.tar.bz2
-8e3924f417fea67f72b2105faed2119c  gstreamer-logo.svg
+f851219ec1fb4eadc7904f053b6b498d  phonon-4.3.0.tar.bz2


--- phonon-4.2.0-pulseaudio.patch DELETED ---



From limb at fedoraproject.org  Fri Jan 23 17:33:42 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Fri, 23 Jan 2009 17:33:42 +0000 (UTC)
Subject: comps comps-f11.xml.in,1.75,1.76
Message-ID: <20090123173342.0FC2E700FE@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31691

Modified Files:
	comps-f11.xml.in 
Log Message:
Fonts for lilypond.



Index: comps-f11.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f11.xml.in,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- comps-f11.xml.in	23 Jan 2009 10:44:29 -0000	1.75
+++ comps-f11.xml.in	23 Jan 2009 17:33:11 -0000	1.76
@@ -1548,6 +1548,9 @@
       <packagereq type="optional">khmeros-fonts-metalchrieng</packagereq>
       <packagereq type="optional">khmeros-fonts-muol</packagereq>
       <packagereq type="optional">khmeros-fonts-siemreap</packagereq>
+      <packagereq type="optional">lilypond-aybabtu-fonts</packagereq> 
+      <packagereq type="optional">lilypond-century-schoolbook-l-fonts</packagereq> 
+      <packagereq type="optional">lilypond-emmentaler-fonts</packagereq> 
       <packagereq type="optional">linux-libertine-fonts</packagereq>
       <packagereq type="optional">lohit-fonts-kashmiri</packagereq>
       <packagereq type="optional">lohit-fonts-konkani</packagereq>



From rdieter at fedoraproject.org  Fri Jan 23 17:38:40 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 23 Jan 2009 17:38:40 +0000 (UTC)
Subject: rpms/kdelibs/devel .cvsignore,1.66,1.67 sources,1.82,1.83
Message-ID: <20090123173840.3FAF3700FE@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdelibs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32293

Modified Files:
	.cvsignore sources 
Log Message:
tarball respin (again)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/.cvsignore,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- .cvsignore	22 Jan 2009 11:18:31 -0000	1.66
+++ .cvsignore	23 Jan 2009 17:38:09 -0000	1.67
@@ -1,3 +1 @@
-kdelibs-4.1.85.tar.bz2
-kdelibs-4.1.96.tar.bz2
 kdelibs-4.2.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/sources,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -r1.82 -r1.83
--- sources	23 Jan 2009 10:04:29 -0000	1.82
+++ sources	23 Jan 2009 17:38:09 -0000	1.83
@@ -1 +1 @@
-39062d37534bc236dc824f7d824266f6  kdelibs-4.2.0.tar.bz2
+4ea13b88463125026a7f71937075bcec  kdelibs-4.2.0.tar.bz2



From rhughes at fedoraproject.org  Fri Jan 23 17:43:38 2009
From: rhughes at fedoraproject.org (Richard Hughes)
Date: Fri, 23 Jan 2009 17:43:38 +0000 (UTC)
Subject: rpms/DeviceKit-power/devel .cvsignore, 1.4, 1.5 DeviceKit-power.spec,
	1.3, 1.4 sources, 1.4, 1.5
Message-ID: <20090123174338.8CEDB700FE@cvs1.fedora.phx.redhat.com>

Author: rhughes

Update of /cvs/pkgs/rpms/DeviceKit-power/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv586

Modified Files:
	.cvsignore DeviceKit-power.spec sources 
Log Message:
* Fri Jan 23 2009 Richard Hughes <richard at hughsie.com> 004-1
- Update to 004



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/DeviceKit-power/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	9 Dec 2008 13:46:28 -0000	1.4
+++ .cvsignore	23 Jan 2009 17:43:08 -0000	1.5
@@ -1 +1 @@
-DeviceKit-power-003.tar.gz
+DeviceKit-power-004.tar.gz


Index: DeviceKit-power.spec
===================================================================
RCS file: /cvs/pkgs/rpms/DeviceKit-power/devel/DeviceKit-power.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DeviceKit-power.spec	9 Dec 2008 13:46:28 -0000	1.3
+++ DeviceKit-power.spec	23 Jan 2009 17:43:08 -0000	1.4
@@ -7,7 +7,7 @@
 
 Summary: Power Management Service
 Name: DeviceKit-power
-Version: 003
+Version: 004
 Release: 1%{?dist}
 License: GPLv2+
 Group: System Environment/Libraries
@@ -99,6 +99,9 @@
 %{_datadir}/gtk-doc/html/devkit-power/*
 
 %changelog
+* Fri Jan 23 2009 Richard Hughes <richard at hughsie.com> 004-1
+- Update to 004
+
 * Tue Dec 09 2008 Richard Hughes <richard at hughsie.com> 003-1
 - Update to 003
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/DeviceKit-power/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	9 Dec 2008 13:46:28 -0000	1.4
+++ sources	23 Jan 2009 17:43:08 -0000	1.5
@@ -1 +1 @@
-098bed718d26456ede2d542dd974467d  DeviceKit-power-003.tar.gz
+366540ad3defd0a0b4e8edc01de09c6a  DeviceKit-power-004.tar.gz



From rdieter at fedoraproject.org  Fri Jan 23 17:54:59 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 23 Jan 2009 17:54:59 +0000 (UTC)
Subject: rpms/google-gadgets/F-10 .cvsignore, 1.4, 1.5 google-gadgets.spec,
	1.7, 1.8 sources, 1.4, 1.5
Message-ID: <20090123175459.48FE8700FE@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/google-gadgets/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1983

Modified Files:
	.cvsignore google-gadgets.spec sources 
Log Message:
* Wed Jan 14 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.10.5-1
- 0.10.5, req'd by kde



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/google-gadgets/F-10/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	31 Dec 2008 08:43:56 -0000	1.4
+++ .cvsignore	23 Jan 2009 17:54:28 -0000	1.5
@@ -1 +1 @@
-google-gadgets-for-linux-0.10.4.tar.bz2
+google-gadgets-for-linux-0.10.5.tar.bz2


Index: google-gadgets.spec
===================================================================
RCS file: /cvs/pkgs/rpms/google-gadgets/F-10/google-gadgets.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- google-gadgets.spec	31 Dec 2008 08:43:56 -0000	1.7
+++ google-gadgets.spec	23 Jan 2009 17:54:28 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           google-gadgets
-Version:        0.10.4
-Release:        2%{?dist}
+Version:        0.10.5
+Release:        1%{?dist}
 Summary:        Google Gadgets for Linux
 
 Group:          User Interface/Desktops
@@ -189,6 +189,9 @@
 
 
 %changelog
+* Wed Jan 14 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.10.5-1
+- 0.10.5, req'd by kde
+
 * Tue Dec 30 2008 Michel Salim <salimma at fedoraproject.org> - 0.10.4-2
 - BR: Network-Manager-devel, startup-notification-devel
 - Pass the browser plugin directory to ./configure


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/google-gadgets/F-10/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	31 Dec 2008 08:43:56 -0000	1.4
+++ sources	23 Jan 2009 17:54:28 -0000	1.5
@@ -1 +1 @@
-0ef0a62e0a575388084a77759b646718  google-gadgets-for-linux-0.10.4.tar.bz2
+fdad6bd761b6c603e457b5d0d92ec2f9  google-gadgets-for-linux-0.10.5.tar.bz2



From jnovy at fedoraproject.org  Fri Jan 23 17:58:59 2009
From: jnovy at fedoraproject.org (Jindrich Novy)
Date: Fri, 23 Jan 2009 17:58:59 +0000 (UTC)
Subject: rpms/netpbm/F-10 netpbm-10.35-64bitfix.patch, NONE,
	1.1 netpbm-10.35-pamtosvgsegfault.patch, NONE,
	1.1 netpbm-10.35-pnmmontagefix.patch, NONE,
	1.1 netpbm-10.35-pnmtofiasco-stdin.patch, NONE, 1.1 .cvsignore,
	1.47, 1.48 netpbm-10.22-security2.patch, 1.4,
	1.5 netpbm-10.23-security.patch, 1.19, 1.20 netpbm.spec, 1.123,
	1.124 sources, 1.51, 1.52 netpbm-10.35-pamcomp.patch, 1.1, NONE
Message-ID: <20090123175859.94022700FE@cvs1.fedora.phx.redhat.com>

Author: jnovy

Update of /cvs/pkgs/rpms/netpbm/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3176

Modified Files:
	.cvsignore netpbm-10.22-security2.patch 
	netpbm-10.23-security.patch netpbm.spec sources 
Added Files:
	netpbm-10.35-64bitfix.patch 
	netpbm-10.35-pamtosvgsegfault.patch 
	netpbm-10.35-pnmmontagefix.patch 
	netpbm-10.35-pnmtofiasco-stdin.patch 
Removed Files:
	netpbm-10.35-pamcomp.patch 
Log Message:
* Fri Jan 23 2009 Jindrich Novy <jnovy at redhat.com> 10.35.58-1
- update to 10.35.38
- fixes crashes in picttoppm, pbmtomrf, mrftopbm
- fixes bugs in leaftoppm, ilbmtoppm
- unbreak ppmshadow and ppmrainbow (#476989)
- pnmmontage won't crash because of uninitialized memory usage
- fix segfault in pamtosvg caused by not reverting "sentinel value" (#476989)
- fix pnmtofiasco to accept image from stdin (#476989, #227283)
- fix cmuwmtopbm and other utilities by making endianess
  functions work correctly on 64bit systems (#476863)


netpbm-10.35-64bitfix.patch:

--- NEW FILE netpbm-10.35-64bitfix.patch ---
diff -up netpbm-10.35.58/lib/libpm.c.64bitfix netpbm-10.35.58/lib/libpm.c
--- netpbm-10.35.58/lib/libpm.c.64bitfix	2009-01-22 08:49:25.000000000 +0100
+++ netpbm-10.35.58/lib/libpm.c	2009-01-22 08:50:38.000000000 +0100
@@ -1069,7 +1069,7 @@
 pm_readbiglong(FILE * const ifP, 
                long * const lP) {
 
-    int c;
+    unsigned int c;
     unsigned long l;
 
     c = getc(ifP);
@@ -1148,7 +1148,7 @@
 int
 pm_readlittlelong(FILE * const ifP, 
                   long * const lP) {
-    int c;
+    unsigned int c;
     unsigned long l;
 
     c = getc(ifP);

netpbm-10.35-pamtosvgsegfault.patch:

--- NEW FILE netpbm-10.35-pamtosvgsegfault.patch ---
diff -up netpbm-10.35.57/converter/other/pamtosvg/fit.c.pamtosvgsegfault netpbm-10.35.57/converter/other/pamtosvg/fit.c
--- netpbm-10.35.57/converter/other/pamtosvg/fit.c.pamtosvgsegfault	2008-12-15 10:04:49.000000000 +0100
+++ netpbm-10.35.57/converter/other/pamtosvg/fit.c	2008-12-19 09:10:01.000000000 +0100
@@ -1852,6 +1852,7 @@ find_error (curve_type curve, spline_typ
 
   if (*worst_point == CURVE_LENGTH (curve) + 1)
     { /* Didn't have any ``worst point''; the error should be zero.  */
+      *worst_point = 0;
       if (epsilon_equal (total_error, 0.0))
         LOG ("  Every point fit perfectly.\n");
       else

netpbm-10.35-pnmmontagefix.patch:

--- NEW FILE netpbm-10.35-pnmmontagefix.patch ---
diff -up netpbm-10.35.57/editor/pnmmontage.c.pnmmontagefix netpbm-10.35.57/editor/pnmmontage.c
--- netpbm-10.35.57/editor/pnmmontage.c.pnmmontagefix	2008-12-15 10:04:29.000000000 +0100
+++ netpbm-10.35.57/editor/pnmmontage.c	2008-12-23 20:09:01.000000000 +0100
@@ -346,6 +346,7 @@ main(int argc, char **argv)
   }
 
   pnm_readpaminit(imgs[0].file, &imgs[0], PAM_STRUCT_SIZE(tuple_type));
+  memset(&outimg, 0, sizeof(outimg));
   outimg.maxval = imgs[0].maxval;
   outimg.format = imgs[0].format;
   memcpy(outimg.tuple_type, imgs[0].tuple_type, sizeof(imgs[0].tuple_type));

netpbm-10.35-pnmtofiasco-stdin.patch:

--- NEW FILE netpbm-10.35-pnmtofiasco-stdin.patch ---
diff -up netpbm-10.35.58/converter/other/fiasco/codec/coder.c.pnmtofiasco-stdin netpbm-10.35.58/converter/other/fiasco/codec/coder.c
--- netpbm-10.35.58/converter/other/fiasco/codec/coder.c.pnmtofiasco-stdin	2009-01-19 09:23:57.000000000 +0100
+++ netpbm-10.35.58/converter/other/fiasco/codec/coder.c	2009-01-21 08:03:00.000000000 +0100
@@ -213,15 +213,14 @@ alloc_coder (char const * const *inputna
     */
    {
       char     *filename;
-      int   	width, w = 0, height, h = 0;
+      int   	width, w = 0, height, h = 0, format;
       bool_t	color, c = NO;
+      xelval maxval;
       unsigned 	n;
       
       for (n = 0; (filename = get_input_image_name (inputname, n)); n++)
       {
           FILE *file;
-          xelval maxval;
-          int format;
           if (filename == NULL)
               file = stdin;
           else
@@ -251,6 +250,8 @@ alloc_coder (char const * const *inputna
       wi->width  = w;
       wi->height = h;
       wi->color  = c;
+      wi->format = format;
+      wi->maxval = maxval;
    }
 
    /*
@@ -642,7 +643,18 @@ video_coder (char const * const *image_t
        */
       future_frame   = frame == future_display;
       c->mt->number   = frame;
-      c->mt->original = read_image (image_name);
+      if (strcmp(image_name, "-")) {
+         c->mt->original = read_image (image_name);
+      } else { /* stdin is not seekable - read image contents without rewind */
+	 int width = wfa->wfainfo->width;
+	 int height = wfa->wfainfo->height;
+	 int color = wfa->wfainfo->color;
+	 int format = wfa->wfainfo->format;
+	 xelval maxval = wfa->wfainfo->maxval;
+
+	 c->mt->original = alloc_image(width, height, color, FORMAT_4_4_4);
+	 read_image_data(c->mt->original, stdin, color, width, height, maxval, format);
+      }
       if (c->tiling->exponent && type == I_FRAME) 
 	 perform_tiling (c->mt->original, c->tiling);
 
diff -up netpbm-10.35.58/converter/other/fiasco/codec/wfa.h.pnmtofiasco-stdin netpbm-10.35.58/converter/other/fiasco/codec/wfa.h
--- netpbm-10.35.58/converter/other/fiasco/codec/wfa.h.pnmtofiasco-stdin	2009-01-19 09:23:57.000000000 +0100
+++ netpbm-10.35.58/converter/other/fiasco/codec/wfa.h	2009-01-21 08:03:28.000000000 +0100
@@ -75,6 +75,7 @@ typedef struct range_info
    unsigned level;			/* bintree level of range */
 } range_info_t;
 
+#include "pnm.h"
 #include "image.h"
 #include "rpf.h"
 #include "bit-io.h"
@@ -93,6 +94,8 @@ typedef struct wfa_info
    unsigned  width;			/* image width */
    unsigned  height;			/* image height */
    unsigned  level;			/* image level */
+   unsigned  format;			/* image format */
+   xelval    maxval;			/* image maximal pixel intensity value */
    rpf_t    *rpf;			/* Standard reduced precision format */
    rpf_t    *dc_rpf;			/* DC reduced precision format */
    rpf_t    *d_rpf;			/* Delta reduced precision format */
diff -up netpbm-10.35.58/converter/other/fiasco/lib/image.c.pnmtofiasco-stdin netpbm-10.35.58/converter/other/fiasco/lib/image.c
--- netpbm-10.35.58/converter/other/fiasco/lib/image.c.pnmtofiasco-stdin	2009-01-19 09:23:57.000000000 +0100
+++ netpbm-10.35.58/converter/other/fiasco/lib/image.c	2009-01-21 08:01:53.000000000 +0100
@@ -273,7 +273,7 @@ free_image (image_t *image)
 }
 
 
-static void 
+void 
 read_image_data(image_t * const image, FILE *input, const bool_t color,
                 const int width, const int height, const xelval maxval,
                 const int format) {
diff -up netpbm-10.35.58/converter/other/fiasco/lib/image.h.pnmtofiasco-stdin netpbm-10.35.58/converter/other/fiasco/lib/image.h
--- netpbm-10.35.58/converter/other/fiasco/lib/image.h.pnmtofiasco-stdin	2009-01-19 09:23:57.000000000 +0100
+++ netpbm-10.35.58/converter/other/fiasco/lib/image.h	2009-01-21 08:02:29.000000000 +0100
@@ -17,6 +17,8 @@
 #ifndef _IMAGE_H
 #define _IMAGE_H
 
+#include "pnm.h"
+
 #include <stdio.h>
 #include "types.h"
 #include "fiasco.h"
@@ -51,6 +53,10 @@ read_pnmheader (const char *image_name, 
 image_t *
 read_image (const char *image_name);
 void
+read_image_data(image_t * const image, FILE *input, const bool_t color,
+                const int width, const int height, const xelval maxval,
+                const int format);
+void
 write_image (const char *image_name, const image_t *image);
 bool_t
 same_image_type (const image_t *img1, const image_t *img2);


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/netpbm/F-10/.cvsignore,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- .cvsignore	6 Nov 2008 11:15:27 -0000	1.47
+++ .cvsignore	23 Jan 2009 17:58:28 -0000	1.48
@@ -1 +1 @@
-netpbm-10.35.55.tar.bz2
+netpbm-10.35.58.tar.bz2

netpbm-10.22-security2.patch:

Index: netpbm-10.22-security2.patch
===================================================================
RCS file: /cvs/pkgs/rpms/netpbm/F-10/netpbm-10.22-security2.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- netpbm-10.22-security2.patch	4 Aug 2008 07:05:23 -0000	1.4
+++ netpbm-10.22-security2.patch	23 Jan 2009 17:58:28 -0000	1.5
@@ -416,7 +416,7 @@
 -my $ourtmp = "$tmpdir/ppmshadow$$";
 -mkdir($ourtmp, 0777) or
 -    die("Unable to create directory for temporary files '$ourtmp");
-+chomp($ourtmp = `mktemp -d -t PPMshadow.XXXXXX`);
++my $ourtmp; chomp($ourtmp = `mktemp -d -t PPMshadow.XXXXXX`);
 +if ($? >> 8) {
 +    die "Can't create directory for temporary files";
 +}

netpbm-10.23-security.patch:

Index: netpbm-10.23-security.patch
===================================================================
RCS file: /cvs/pkgs/rpms/netpbm/F-10/netpbm-10.23-security.patch,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- netpbm-10.23-security.patch	24 Jun 2008 09:38:25 -0000	1.19
+++ netpbm-10.23-security.patch	23 Jan 2009 17:58:28 -0000	1.20
@@ -1654,18 +1654,6 @@
      for (i = 0; i < iysize; i++) 
          for (j = 0; j < ixsize; j++) {
              fkernel[i*ixsize+j] = 1.0 / (1.0 + w * sqrt((double)
-diff -up netpbm-10.35.46/generator/ppmrainbow.security netpbm-10.35.46/generator/ppmrainbow
---- netpbm-10.35.46/generator/ppmrainbow.security	2008-06-24 08:58:57.000000000 +0200
-+++ netpbm-10.35.46/generator/ppmrainbow	2008-06-24 09:04:21.000000000 +0200
-@@ -11,7 +11,7 @@ my ($Twid, $Thgt, $tmpdir, $norepeat, $v
- # set defaults
- $Twid = 600;
- $Thgt = 8;
--$tmpdir = $ENV{"TMPDIR"} || "/tmp";
-+$tmpdir = $ENV{"TMPDIR"} || ".tmp";
- $norepeat = $FALSE;
- $verbose = $FALSE;
- 
 diff -up netpbm-10.35.46/lib/libpam.c.security netpbm-10.35.46/lib/libpam.c
 --- netpbm-10.35.46/lib/libpam.c.security	2008-06-24 08:59:03.000000000 +0200
 +++ netpbm-10.35.46/lib/libpam.c	2008-06-24 09:04:21.000000000 +0200


Index: netpbm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/netpbm/F-10/netpbm.spec,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -r1.123 -r1.124
--- netpbm.spec	6 Nov 2008 11:15:27 -0000	1.123
+++ netpbm.spec	23 Jan 2009 17:58:28 -0000	1.124
@@ -1,6 +1,6 @@
 Summary: A library for handling different graphics file formats
 Name: netpbm
-Version: 10.35.55
+Version: 10.35.58
 Release: 1%{?dist}
 # See copyright_summary for details
 License: BSD and GPLv2 and IJG and MIT and Public Domain
@@ -30,7 +30,10 @@
 Patch18: netpbm-10.35-glibc.patch
 Patch19: netpbm-10.35-gcc43.patch
 Patch20: netpbm-10.35-rgbtxt.patch
-Patch21: netpbm-10.35-pamcomp.patch
+Patch21: netpbm-10.35-pamtosvgsegfault.patch
+Patch22: netpbm-10.35-pnmmontagefix.patch
+Patch23: netpbm-10.35-pnmtofiasco-stdin.patch
+Patch24: netpbm-10.35-64bitfix.patch
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: libjpeg-devel, libpng-devel, libtiff-devel, flex
 BuildRequires: libX11-devel, python, jasper-devel
@@ -91,7 +94,10 @@
 %patch18 -p1 -b .glibc
 %patch19 -p1 -b .gcc43
 %patch20 -p1 -b .rgbtxt
-%patch21 -p1 -b .pamcomp
+%patch21 -p1 -b .pamtosvgsegfault
+%patch22 -p1 -b .pnmmontagefix
+%patch23 -p1 -b .pnmtofiasco-stdin
+%patch24 -p1 -b .64bitfix
 
 ##mv shhopt/shhopt.h shhopt/pbmshhopt.h
 ##perl -pi -e 's|shhopt.h|pbmshhopt.h|g' `find -name "*.c" -o -name "*.h"` ./GNUmakefile
@@ -219,6 +225,17 @@
 %{_datadir}/netpbm/
 
 %changelog
+* Fri Jan 23 2009 Jindrich Novy <jnovy at redhat.com> 10.35.58-1
+- update to 10.35.38
+- fixes crashes in picttoppm, pbmtomrf, mrftopbm
+- fixes bugs in leaftoppm, ilbmtoppm
+- unbreak ppmshadow and ppmrainbow (#476989)
+- pnmmontage won't crash because of uninitialized memory usage
+- fix segfault in pamtosvg caused by not reverting "sentinel value" (#476989)
+- fix pnmtofiasco to accept image from stdin (#476989, #227283)
+- fix cmuwmtopbm and other utilities by making endianess
+  functions work correctly on 64bit systems (#476863)
+
 * Thu Nov  6 2008 Jindrich Novy <jnovy at redhat.com> 10.35.55-1
 - update to 10.35.55
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/netpbm/F-10/sources,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- sources	6 Nov 2008 11:15:27 -0000	1.51
+++ sources	23 Jan 2009 17:58:28 -0000	1.52
@@ -1 +1 @@
-9d470a6472b3b49ecbc98e516d6d206c  netpbm-10.35.55.tar.bz2
+f4e789971594212d0be2d8fd1e8a00ac  netpbm-10.35.58.tar.bz2


--- netpbm-10.35-pamcomp.patch DELETED ---



From twaugh at fedoraproject.org  Fri Jan 23 18:17:23 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Fri, 23 Jan 2009 18:17:23 +0000 (UTC)
Subject: rpms/patchutils/devel patchutils-0.3.1.tar.bz2.sig, NONE,
	1.1 .cvsignore, 1.11, 1.12 patchutils.spec, 1.25, 1.26 sources,
	1.11, 1.12 patchutils-0.3.0.tar.bz2.sig, 1.1, NONE
Message-ID: <20090123181723.5B957700FE@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/patchutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5843

Modified Files:
	.cvsignore patchutils.spec sources 
Added Files:
	patchutils-0.3.1.tar.bz2.sig 
Removed Files:
	patchutils-0.3.0.tar.bz2.sig 
Log Message:
* Fri Jan 23 2009 Tim Waugh <twaugh at redhat.com> 0.3.1-1
- 0.3.1.



--- NEW FILE patchutils-0.3.1.tar.bz2.sig ---
??
i%????#?q

Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/patchutils/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	2 Jul 2008 12:11:15 -0000	1.11
+++ .cvsignore	23 Jan 2009 18:16:52 -0000	1.12
@@ -1,3 +1,4 @@
 patchutils-0.2.30.tar.bz2
 patchutils-0.2.31.tar.bz2
 patchutils-0.3.0.tar.bz2
+patchutils-0.3.1.tar.bz2


Index: patchutils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/patchutils/devel/patchutils.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- patchutils.spec	2 Jul 2008 12:11:15 -0000	1.25
+++ patchutils.spec	23 Jan 2009 18:16:52 -0000	1.26
@@ -1,6 +1,6 @@
 Summary: A collection of programs for manipulating patch files
 Name: patchutils
-Version: 0.3.0
+Version: 0.3.1
 Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/System
@@ -45,6 +45,9 @@
 %{_mandir}/*/*
 
 %changelog
+* Fri Jan 23 2009 Tim Waugh <twaugh at redhat.com> 0.3.1-1
+- 0.3.1.
+
 * Wed Jul  2 2008 Tim Waugh <twaugh at redhat.com> 0.3.0-1
 - 0.3.0.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/patchutils/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	2 Jul 2008 12:11:15 -0000	1.11
+++ sources	23 Jan 2009 18:16:52 -0000	1.12
@@ -1 +1 @@
-91cce007527cd0df93aeb81459575485  patchutils-0.3.0.tar.bz2
+3fd9bca58a429fbbb1c2126f1b72aa23  patchutils-0.3.1.tar.bz2


--- patchutils-0.3.0.tar.bz2.sig DELETED ---



From twaugh at fedoraproject.org  Fri Jan 23 18:25:22 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Fri, 23 Jan 2009 18:25:22 +0000 (UTC)
Subject: rpms/patchutils/F-10 patchutils-0.3.1.tar.bz2.sig, NONE,
	1.1 .cvsignore, 1.11, 1.12 patchutils.spec, 1.25, 1.26 sources,
	1.11, 1.12 patchutils-0.3.0.tar.bz2.sig, 1.1, NONE
Message-ID: <20090123182522.0E4D1700FE@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/patchutils/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6924

Modified Files:
	.cvsignore patchutils.spec sources 
Added Files:
	patchutils-0.3.1.tar.bz2.sig 
Removed Files:
	patchutils-0.3.0.tar.bz2.sig 
Log Message:
* Fri Jan 23 2009 Tim Waugh <twaugh at redhat.com> 0.3.1-1
- 0.3.1.



--- NEW FILE patchutils-0.3.1.tar.bz2.sig ---
??
i%????#?q

Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/patchutils/F-10/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	2 Jul 2008 12:11:15 -0000	1.11
+++ .cvsignore	23 Jan 2009 18:24:51 -0000	1.12
@@ -1,3 +1,4 @@
 patchutils-0.2.30.tar.bz2
 patchutils-0.2.31.tar.bz2
 patchutils-0.3.0.tar.bz2
+patchutils-0.3.1.tar.bz2


Index: patchutils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/patchutils/F-10/patchutils.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- patchutils.spec	2 Jul 2008 12:11:15 -0000	1.25
+++ patchutils.spec	23 Jan 2009 18:24:51 -0000	1.26
@@ -1,6 +1,6 @@
 Summary: A collection of programs for manipulating patch files
 Name: patchutils
-Version: 0.3.0
+Version: 0.3.1
 Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/System
@@ -45,6 +45,9 @@
 %{_mandir}/*/*
 
 %changelog
+* Fri Jan 23 2009 Tim Waugh <twaugh at redhat.com> 0.3.1-1
+- 0.3.1.
+
 * Wed Jul  2 2008 Tim Waugh <twaugh at redhat.com> 0.3.0-1
 - 0.3.0.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/patchutils/F-10/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	2 Jul 2008 12:11:15 -0000	1.11
+++ sources	23 Jan 2009 18:24:51 -0000	1.12
@@ -1 +1 @@
-91cce007527cd0df93aeb81459575485  patchutils-0.3.0.tar.bz2
+3fd9bca58a429fbbb1c2126f1b72aa23  patchutils-0.3.1.tar.bz2


--- patchutils-0.3.0.tar.bz2.sig DELETED ---



From kyle at fedoraproject.org  Fri Jan 23 18:49:13 2009
From: kyle at fedoraproject.org (Kyle McMartin)
Date: Fri, 23 Jan 2009 18:49:13 +0000 (UTC)
Subject: rpms/kernel/devel linux-2.6-defaults-intel_iommu-off.patch, NONE,
	1.1 kernel.spec, 1.1225, 1.1226
Message-ID: <20090123184913.62D9E700FE@cvs1.fedora.phx.redhat.com>

Author: kyle

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10772

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-defaults-intel_iommu-off.patch 
Log Message:
* Fri Jan 23 2009 Kyle McMartin <kyle at redhat.com>
- disable intel_iommu by default (enable with "intel_iommu=on")


linux-2.6-defaults-intel_iommu-off.patch:

--- NEW FILE linux-2.6-defaults-intel_iommu-off.patch ---
diff --git a/drivers/pci/intel-iommu.c b/drivers/pci/intel-iommu.c
index 3dfecb2..05f94fc 100644
--- a/drivers/pci/intel-iommu.c
+++ b/drivers/pci/intel-iommu.c
@@ -268,7 +268,7 @@ static long list_size;
 
 static void domain_remove_dev_info(struct dmar_domain *domain);
 
-int dmar_disabled;
+int dmar_disabled = 1;
 static int __initdata dmar_map_gfx = 1;
 static int dmar_forcedac;
 static int intel_iommu_strict;
@@ -284,9 +284,12 @@ static int __init intel_iommu_setup(char *str)
 	if (!str)
 		return -EINVAL;
 	while (*str) {
-		if (!strncmp(str, "off", 3)) {
+		if (!strncmp(str, "on", 2)) {
+			dmar_disabled = 0;
+			printk(KERN_INFO "Intel-IOMMU: enabled\n");
+		} else if (!strncmp(str, "off", 3)) {
 			dmar_disabled = 1;
-			printk(KERN_INFO"Intel-IOMMU: disabled\n");
+			printk(KERN_INFO "Intel-IOMMU: disabled\n");
 		} else if (!strncmp(str, "igfx_off", 8)) {
 			dmar_map_gfx = 0;
 			printk(KERN_INFO


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1225
retrieving revision 1.1226
diff -u -r1.1225 -r1.1226
--- kernel.spec	22 Jan 2009 06:26:05 -0000	1.1225
+++ kernel.spec	23 Jan 2009 18:48:42 -0000	1.1226
@@ -662,6 +662,7 @@
 
 Patch9000: use-per_cpu-module-references.patch
 Patch9001: revert-fix-modules_install-via-nfs.patch
+Patch9002: linux-2.6-defaults-intel_iommu-off.patch
 
 %endif
 
@@ -1165,6 +1166,10 @@
 ApplyPatch revert-fix-modules_install-via-nfs.patch
 
 ApplyPatch use-per_cpu-module-references.patch
+
+# turn off intel_iommu by default
+#  bugs: #481356, #479996
+ApplyPatch linux-2.6-defaults-intel_iommu-off.patch
 # END OF PATCH APPLICATIONS
 
 %endif
@@ -1740,6 +1745,9 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Fri Jan 23 2009 Kyle McMartin <kyle at redhat.com>
+- disable intel_iommu by default (enable with "intel_iommu=on")
+
 * Thu Jan 22 2009 Dave Airlie <airlied at redhat.com>
 - rebase drm patches - nouveau TODO
 



From salimma at fedoraproject.org  Fri Jan 23 18:58:50 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Fri, 23 Jan 2009 18:58:50 +0000 (UTC)
Subject: rpms/banshee/devel .cvsignore, 1.23, 1.24 banshee.spec, 1.65,
	1.66 sources, 1.23, 1.24 banshee-1-1.4.1-riptags.patch, 1.1, NONE
Message-ID: <20090123185850.3B615700FE@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/banshee/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12128

Modified Files:
	.cvsignore banshee.spec sources 
Removed Files:
	banshee-1-1.4.1-riptags.patch 
Log Message:
* Fri Jan 23 2009 Michel Salim <salimma at fedoraproject.org> - 1.4.2-1
- Update to 1.4.2
- Require mono-addins
- Enable menu entry on other desktops



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/banshee/devel/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- .cvsignore	27 Nov 2008 06:51:59 -0000	1.23
+++ .cvsignore	23 Jan 2009 18:58:19 -0000	1.24
@@ -1 +1 @@
-banshee-1-1.4.1.tar.bz2
+banshee-1-1.4.2.tar.bz2


Index: banshee.spec
===================================================================
RCS file: /cvs/pkgs/rpms/banshee/devel/banshee.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- banshee.spec	2 Jan 2009 00:14:48 -0000	1.65
+++ banshee.spec	23 Jan 2009 18:58:19 -0000	1.66
@@ -1,15 +1,15 @@
 %define mono_shared %{_builddir}/%{?buildsubdir}
 
 Name:    banshee
-Version: 1.4.1
-Release: 4%{?dist}
+Version: 1.4.2
+Release: 1%{?dist}
 Summary: Easily import, manage, and play selections from your music collection
 Group:   Applications/Multimedia
 License: MIT
 URL:     http://banshee-project.org/
 Source0: http://banshee-project.org/files/banshee/banshee-1-%{version}.tar.bz2
 Source1: README.Fedora
-Patch0:  banshee-1-1.4.1-riptags.patch
+# Patch0:  banshee-1-1.4.1-riptags.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # We only have mono on these arches:
@@ -45,6 +45,7 @@
 
 BuildRequires: desktop-file-utils
 
+Requires:      mono-addins
 Requires:      podsleuth
 Requires:      libmtp
 Requires:      %{name}-musicbrainz = %{version}-%{release}
@@ -98,7 +99,7 @@
 
 %prep
 %setup -q -n %{name}-1-%{version}
-%patch0 -p0 -b .riptags
+#patch0 -p0 -b .riptags
 cp -p %{SOURCE1} .
 
 %build
@@ -123,7 +124,6 @@
 desktop-file-install --vendor gnome --delete-original \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
   --add-category X-Fedora \
-  --add-only-show-in=GNOME \
   %{buildroot}%{_datadir}/applications/banshee-1.desktop
 
 %find_lang %name-1
@@ -180,6 +180,11 @@
 
 
 %changelog
+* Fri Jan 23 2009 Michel Salim <salimma at fedoraproject.org> - 1.4.2-1
+- Update to 1.4.2
+- Require mono-addins
+- Enable menu entry on other desktops
+
 * Thu Jan  1 2009 Michel Salim <salimma at fedoraproject.org> - 1.4.1-4
 - Manually require libmtp
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/banshee/devel/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sources	27 Nov 2008 06:52:00 -0000	1.23
+++ sources	23 Jan 2009 18:58:19 -0000	1.24
@@ -1 +1 @@
-cd245c2eb47c67f83e921f4edf105abe  banshee-1-1.4.1.tar.bz2
+ddee6b6c66aabb2c5a91c753ad5de498  banshee-1-1.4.2.tar.bz2


--- banshee-1-1.4.1-riptags.patch DELETED ---



From rdieter at fedoraproject.org  Fri Jan 23 18:59:58 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 23 Jan 2009 18:59:58 +0000 (UTC)
Subject: rpms/kdelibs/F-10 kdelibs-4.1.70-cmake.patch, NONE,
	1.1 kdelibs-4.1.72-kstandarddirs.patch, NONE,
	1.1 kdelibs-4.1.72-no-cache-kdeglobals-paths.patch, NONE,
	1.1 kdelibs-4.1.72-policykit-workaround.patch, NONE,
	1.1 kdelibs-4.1.82-kde149705.patch, NONE,
	1.1 kdelibs-4.1.96-AllowExternalPaths.patch, NONE,
	1.1 kdelibs-4.1.96-cmake.patch, NONE,
	1.1 kdelibs-4.1.96-parallel_devel.patch, NONE, 1.1 .cvsignore,
	1.61, 1.62 kde4.csh, 1.2, 1.3 kde4.sh, 1.2, 1.3 kdelibs.spec,
	1.395, 1.396 sources, 1.73, 1.74 kdelibs-3.95.0-kde149705.patch,
	1.1, NONE kdelibs-4.0.2-no-cache-kdeglobals-paths.patch, 1.1,
	NONE kdelibs-4.1.0-kstandarddirs.patch, 1.1,
	NONE kdelibs-4.1.0-parallel_devel.patch, 1.1,
	NONE kdelibs-4.1.1-cmake.patch, 1.2,
	NONE kdelibs-4.1.4-policykit-workaround.patch, 1.2, NONE
Message-ID: <20090123185958.B8BBB70142@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdelibs/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12302

Modified Files:
	.cvsignore kde4.csh kde4.sh kdelibs.spec sources 
Added Files:
	kdelibs-4.1.70-cmake.patch kdelibs-4.1.72-kstandarddirs.patch 
	kdelibs-4.1.72-no-cache-kdeglobals-paths.patch 
	kdelibs-4.1.72-policykit-workaround.patch 
	kdelibs-4.1.82-kde149705.patch 
	kdelibs-4.1.96-AllowExternalPaths.patch 
	kdelibs-4.1.96-cmake.patch kdelibs-4.1.96-parallel_devel.patch 
Removed Files:
	kdelibs-3.95.0-kde149705.patch 
	kdelibs-4.0.2-no-cache-kdeglobals-paths.patch 
	kdelibs-4.1.0-kstandarddirs.patch 
	kdelibs-4.1.0-parallel_devel.patch kdelibs-4.1.1-cmake.patch 
	kdelibs-4.1.4-policykit-workaround.patch 
Log Message:
sync with devel/ for 4.2.0 hotness


kdelibs-4.1.70-cmake.patch:

--- NEW FILE kdelibs-4.1.70-cmake.patch ---
diff -Naur kdelibs-4.1.70/cmake/modules/FindKDE4Internal.cmake kdelibs-4.1.70.cmake/cmake/modules/FindKDE4Internal.cmake
--- kdelibs-4.1.70/cmake/modules/FindKDE4Internal.cmake	2008-10-19 16:56:45.000000000 +0200
+++ kdelibs-4.1.70.cmake/cmake/modules/FindKDE4Internal.cmake	2008-10-19 17:06:14.000000000 +0200
@@ -817,6 +817,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_BUILD_TYPE})
 endif (NOT CMAKE_CONFIGURATION_TYPES AND NOT CMAKE_BUILD_TYPE)
 
 

kdelibs-4.1.72-kstandarddirs.patch:

--- NEW FILE kdelibs-4.1.72-kstandarddirs.patch ---
diff -Naur kdelibs-4.1.72/kdecore/kernel/kstandarddirs.cpp kdelibs-4.1.72.kstandarddirs/kdecore/kernel/kstandarddirs.cpp
--- kdelibs-4.1.72/kdecore/kernel/kstandarddirs.cpp	2008-11-12 18:31:44.000000000 +0100
+++ kdelibs-4.1.72.kstandarddirs/kdecore/kernel/kstandarddirs.cpp	2008-11-12 18:38:40.000000000 +0100
@@ -1002,7 +1002,9 @@
                  pit != prefixList->end();
                  ++pit)
             {
-	        if((*pit)!=installprefix||installdir.isEmpty())
+                // "exe" never has a custom install path, and the check triggers
+                // a false positive due to the libexecdir patch
+	        if((*pit)!=installprefix||installdir.isEmpty()||!strcmp("exe", type))
 	        {
                     for (QStringList::ConstIterator it = dirs.constBegin();
                          it != dirs.constEnd(); ++it)
@@ -1016,6 +1018,11 @@
                         if ((local || testdir.exists()) && !candidates.contains(path))
                             candidates.append(path);
                     }
+                    // special-case "config" (forward porting Chris Cheney's
+                    // hack) - we want /etc/kde after the local config paths
+                    // and before the ones in /usr (including kde-profile)
+                    if (local && !strcmp("config", type))
+                       candidates.append("/etc/kde/");
                     local = false;
                 }
 	        else

kdelibs-4.1.72-no-cache-kdeglobals-paths.patch:

--- NEW FILE kdelibs-4.1.72-no-cache-kdeglobals-paths.patch ---
diff -Naur kdelibs-4.1.72/kdecore/config/kconfig.cpp kdelibs-4.1.72.no-cache-kdeglobals-path/kdecore/config/kconfig.cpp
--- kdelibs-4.1.72/kdecore/config/kconfig.cpp	2008-10-23 01:05:09.000000000 +0200
+++ kdelibs-4.1.72.no-cache-kdeglobals-path/kdecore/config/kconfig.cpp	2008-11-10 17:38:33.000000000 +0100
@@ -61,12 +61,6 @@
 {
     sGlobalFileName = componentData.dirs()->saveLocation("config") +
                           QString::fromLatin1("kdeglobals");
-    if (wantGlobals()) {
-        const KStandardDirs *const dirs = componentData.dirs();
-        foreach(const QString& dir, dirs->findAllResources("config", QLatin1String("kdeglobals")) +
-                                    dirs->findAllResources("config", QLatin1String("system.kdeglobals")))
-            globalFiles.push_front(dir);
-    }
     const QString etc_kderc =
 #ifdef Q_WS_WIN
         QFile::decodeName( qgetenv("WINDIR") + "/kde4rc" );
@@ -76,15 +70,11 @@
     KEntryMap tmp;
     // first entry is always /etc/kderc or empty if cannot read
     if (KStandardDirs::checkAccess(etc_kderc, R_OK)) {
-        if (!globalFiles.contains(etc_kderc))
-            globalFiles.push_front(etc_kderc);
-
         if (!mappingsRegistered) {
             KSharedPtr<KConfigBackend> backend = KConfigBackend::create(componentData, etc_kderc, QLatin1String("INI"));
             backend->parseConfig( "en_US", tmp, KConfigBackend::ParseDefaults);
         }
     } else {
-        globalFiles.push_front(QString());
         mappingsRegistered = true;
     }
 
@@ -461,10 +451,31 @@
 
 void KConfigPrivate::parseGlobalFiles()
 {
+    QStringList globalFiles;
+
+    if (wantGlobals()) {
+        const KStandardDirs *const dirs = componentData.dirs();
+        foreach(const QString& dir, dirs->findAllResources("config", QLatin1String("kdeglobals")) +
+                                    dirs->findAllResources("config", QLatin1String("system.kdeglobals")))
+            globalFiles.push_front(dir);
+    }
+    const QString etc_kderc =
+#ifdef Q_WS_WIN
+        QFile::decodeName( QByteArray(::getenv("WINDIR")) + "\\kde4rc" );
+#else
+        QLatin1String("/etc/kde4rc");
+#endif
+    KEntryMap tmp;
+    // first entry is always /etc/kderc or empty if cannot read
+    if (KStandardDirs::checkAccess(etc_kderc, R_OK)) {
+        if (!globalFiles.contains(etc_kderc))
+            globalFiles.push_front(etc_kderc);
+    } else {
+        globalFiles.push_front(QString());
+    }
+
 //    qDebug() << "parsing global files" << globalFiles;
 
-    // TODO: can we cache the values in etc_kderc / other global files
-    //       on a per-application basis?
     const QByteArray utf8Locale = locale.toUtf8();
     foreach(const QString& file, globalFiles) {
         KConfigBackend::ParseOptions parseOpts = KConfigBackend::ParseGlobal|KConfigBackend::ParseExpansions;
diff -Naur kdelibs-4.1.72/kdecore/config/kconfig_p.h kdelibs-4.1.72.no-cache-kdeglobals-path/kdecore/config/kconfig_p.h
--- kdelibs-4.1.72/kdecore/config/kconfig_p.h	2008-06-03 11:34:54.000000000 +0200
+++ kdelibs-4.1.72.no-cache-kdeglobals-path/kdecore/config/kconfig_p.h	2008-11-10 17:38:33.000000000 +0100
@@ -86,7 +86,6 @@
 
     KEntryMap entryMap;
     QString backendType;
-    QStringList globalFiles;
     QStack<QString> extraFiles;
 
     QString locale;

kdelibs-4.1.72-policykit-workaround.patch:

--- NEW FILE kdelibs-4.1.72-policykit-workaround.patch ---
diff -Naur kdelibs-4.1.72.policykit/solid/solid/backends/hal/halstorageaccess.cpp kdelibs-4.1.72/solid/solid/backends/hal/halstorageaccess.cpp
--- kdelibs-4.1.72.policykit/solid/solid/backends/hal/halstorageaccess.cpp	2008-11-04 18:13:11.000000000 +0100
+++ kdelibs-4.1.72/solid/solid/backends/hal/halstorageaccess.cpp	2008-11-10 18:45:41.000000000 +0100
@@ -17,6 +17,8 @@
 
 */
 
+#include <config-prefix.h> // for LIBEXEC_INSTALL_DIR
+
 #include "halstorageaccess.h"
 
 #include "halfstabhandling.h"
@@ -172,11 +174,21 @@
 {
     // TODO: Better error reporting here
     if (m_setupInProgress) {
+	if (error.name() == "org.freedesktop.Hal.Device.PermissionDeniedByPolicy") {
+            if (callPrivilegedMount())
+              return;
+            // if we fail to run kdesu, fall through and emit the original PermissionDeniedByPolicy error
+        }
         m_setupInProgress = false;
         emit setupDone(Solid::UnauthorizedOperation,
                        error.name()+": "+error.message(),
                        m_device->udi());
     } else if (m_teardownInProgress) {
+	if (error.name() == "org.freedesktop.Hal.Device.PermissionDeniedByPolicy") {
+            if (callPrivilegedUnmount())
+              return;
+            // if we fail to run kdesu, fall through and emit the original PermissionDeniedByPolicy error
+        }
         m_teardownInProgress = false;
         emit teardownDone(Solid::UnauthorizedOperation,
                           error.name()+": "+error.message(),
@@ -294,8 +306,9 @@
 #else
     QString uid="uid=";
 #endif
-    if (halOptions.contains(uid)) {
-        options << uid+QString::number(::getuid());
+    if (halOptions.contains(uid) &&
+       (fstype == "vfat" || fstype == "iso9660" || fstype == "hfs" || fstype == "udf")) {
+            options << uid+QString::number(::getuid());
     }
 
 #ifdef Q_OS_FREEBSD
@@ -333,6 +346,59 @@
                               SLOT(slotDBusError(const QDBusError &)));
 }
 
+bool Solid::Backends::Hal::StorageAccess::callPrivilegedMount()
+{
+    QString udi = m_device->udi();
+    QString options;
+    QStringList halOptions = m_device->property("volume.mount.valid_options").toStringList();
+    QString fstype = m_device->property("volume.fstype").toString();
+
+    if (halOptions.contains("uid=")
+        && (fstype == "vfat" || fstype == "iso9660" || fstype == "hfs" || fstype == "udf")) {
+        options = "uid="+QString::number(::getuid());
+    }
+
+    m_process = new QProcess(this);
+
+    connect(m_process, SIGNAL(finished(int, QProcess::ExitStatus)),
+            this, SLOT(slotProcessFinished(int, QProcess::ExitStatus)));
+
+    m_process->start(LIBEXEC_INSTALL_DIR "/kdesu", QStringList() << "-d" << "-t"
+        << "--noignorebutton" << "-c"
+        << QString::fromLatin1("dbus-send  --system --print-reply --dest=org.freedesktop.Hal %1 "
+                               "org.freedesktop.Hal.Device.Volume.Mount string: string: "
+                               "array:string:%2").arg(udi).arg(options));
+
+    if (m_process->waitForStarted()) {
+        return true;
+    } else {
+        delete m_process;
+        return false;
+    }
+}
+
+bool Solid::Backends::Hal::StorageAccess::callPrivilegedUnmount()
+{
+    QString udi = m_device->udi();
+
+    m_process = new QProcess(this);
+
+    connect(m_process, SIGNAL(finished(int, QProcess::ExitStatus)),
+            this, SLOT(slotProcessFinished(int, QProcess::ExitStatus)));
+
+    m_process->start(LIBEXEC_INSTALL_DIR "/kdesu", QStringList() << "-d" << "-t"
+        << "--noignorebutton" << "-c"
+        << QString::fromLatin1("dbus-send  --system --print-reply --dest=org.freedesktop.Hal %1 "
+                               "org.freedesktop.Hal.Device.Volume.Unmount array:string:").arg(udi));
+
+    if (m_process->waitForStarted()) {
+        return true;
+    } else {
+        delete m_process;
+        return false;
+    }
+}
+
 bool StorageAccess::callHalVolumeUnmount()
 {
     QDBusConnection c = QDBusConnection::systemBus();
diff -Naur kdelibs-4.1.72.policykit/solid/solid/backends/hal/halstorageaccess.h kdelibs-4.1.72/solid/solid/backends/hal/halstorageaccess.h
--- kdelibs-4.1.72.policykit/solid/solid/backends/hal/halstorageaccess.h	2008-05-21 13:07:38.000000000 +0200
+++ kdelibs-4.1.72/solid/solid/backends/hal/halstorageaccess.h	2008-11-10 18:45:01.000000000 +0100
@@ -69,6 +69,9 @@
     bool callSystemMount();
     bool callSystemUnmount();
 
+    bool callPrivilegedMount();
+    bool callPrivilegedUnmount();
+
     bool requestPassphrase();
     void callCryptoSetup(const QString &passphrase);
     bool callCryptoTeardown();

kdelibs-4.1.82-kde149705.patch:

--- NEW FILE kdelibs-4.1.82-kde149705.patch ---
diff -Naurw kdelibs-4.1.82/kdeui/icons/kicontheme.cpp kdelibs-4.1.82.kde149705/kdeui/icons/kicontheme.cpp
--- kdelibs-4.1.82/kdeui/icons/kicontheme.cpp	2008-10-23 01:05:04.000000000 +0200
+++ kdelibs-4.1.82.kde149705/kdeui/icons/kicontheme.cpp	2008-12-09 14:15:14.000000000 +0100
@@ -516,7 +516,7 @@
         return *_theme;
 
     KConfigGroup cg(KGlobal::config(), "Icons");
-    *_theme = cg.readEntry("Theme", defaultThemeName());
+    *_theme = cg.readEntry("Theme4", cg.readEntry("Theme", defaultThemeName()));
     if ( *_theme == QLatin1String("hicolor") ) *_theme = defaultThemeName();
 /*    if (_theme->isEmpty())
     {
diff -Naurw kdelibs-4.1.82/kdeui/kernel/kglobalsettings.cpp kdelibs-4.1.82.kde149705/kdeui/kernel/kglobalsettings.cpp
--- kdelibs-4.1.82/kdeui/kernel/kglobalsettings.cpp	2008-11-28 16:40:11.000000000 +0100
+++ kdelibs-4.1.82.kde149705/kdeui/kernel/kglobalsettings.cpp	2008-12-09 14:17:51.000000000 +0100
@@ -831,7 +831,7 @@
     if (kde_overrideStyle.isEmpty()) {
         const QString &defaultStyle = KStyle::defaultStyle();
         const KConfigGroup pConfig(KGlobal::config(), "General");
-        const QString &styleStr = pConfig.readEntry("widgetStyle", defaultStyle);
+        const QString &styleStr = pConfig.readEntry("widgetStyle4", pConfig.readEntry("widgetStyle", defaultStyle));
 
         if (styleStr.isEmpty() ||
                 // check whether we already use the correct style to return then
diff -Naurw kdelibs-4.1.82/kutils/kdeglobals.kcfg kdelibs-4.1.82.kde149705/kutils/kdeglobals.kcfg
--- kdelibs-4.1.82/kutils/kdeglobals.kcfg	2008-05-21 13:08:56.000000000 +0200
+++ kdelibs-4.1.82.kde149705/kutils/kdeglobals.kcfg	2008-12-09 14:15:14.000000000 +0100
@@ -24,6 +24,10 @@
    <whatsthis>The name of the widget style, for example &quot;keramik&quot; or &quot;plastik&quot;. Without quotes.</whatsthis>
    <default>keramik</default>
   </entry>
+  <entry key="widgetStyle4" type="String" >
+   <label>Widget style to use for KDE 4</label>
+   <whatsthis>The name of the widget style, for example &quot;oxygen&quot;. Without quotes. Defaults to widgetStyle.</whatsthis>
+  </entry>
   <entry key="windowBackground" type="String" />
   <entry key="windowForeground" type="String" />
   <entry key="UseSystemBell" type="Bool" >

kdelibs-4.1.96-AllowExternalPaths.patch:

--- NEW FILE kdelibs-4.1.96-AllowExternalPaths.patch ---
diff -up kdelibs-4.1.96/plasma/package.cpp.orig kdelibs-4.1.96/plasma/package.cpp
--- kdelibs-4.1.96/plasma/package.cpp.orig	2009-01-06 18:27:56.000000000 +0100
+++ kdelibs-4.1.96/plasma/package.cpp	2009-01-16 14:42:39.000000000 +0100
@@ -139,6 +139,10 @@ QString Package::filePath(const char *fi
     }
 
     if (QFile::exists(path)) {
+        if (d->structure->allowExternalPaths()) {
+            return path;
+        }
+
         // ensure that we don't return files outside of our base path
         // due to symlink or ../ games
         QDir dir(path);
@@ -171,6 +175,10 @@ QStringList Package::entryList(const cha
     QDir dir(d->basePath + d->structure->contentsPrefix() + path);
 
     if (dir.exists()) {
+        if (d->structure->allowExternalPaths()) {
+            return dir.entryList(QDir::Files | QDir::Readable);
+        }
+
         // ensure that we don't return files outside of our base path
         // due to symlink or ../ games
         QString canonicalized = dir.canonicalPath();
diff -up kdelibs-4.1.96/plasma/packagestructure.cpp.orig kdelibs-4.1.96/plasma/packagestructure.cpp
--- kdelibs-4.1.96/plasma/packagestructure.cpp.orig	2009-01-16 14:41:56.000000000 +0100
+++ kdelibs-4.1.96/plasma/packagestructure.cpp	2009-01-16 14:42:39.000000000 +0100
@@ -58,17 +58,19 @@ class ContentStructure
         QString path;
         QString name;
         QStringList mimetypes;
-        bool directory;
-        bool required;
+        bool directory : 1;
+        bool required : 1;
 };
 
 class PackageStructurePrivate
 {
 public:
     PackageStructurePrivate()
-        : metadata(0)
+        : metadata(0),
+          externalPaths(false)
     {
     }
+
     ~PackageStructurePrivate()
     {
         delete metadata;
@@ -76,6 +78,8 @@ public:
 
     void createPackageMetadata(const QString &path);
 
+    static QHash<QString, PackageStructure::Ptr> structures;
+
     QString type;
     QString path;
     QString contentsPrefix;
@@ -83,8 +87,8 @@ public:
     QString servicePrefix;
     QMap<QByteArray, ContentStructure> contents;
     QStringList mimetypes;
-    static QHash<QString, PackageStructure::Ptr> structures;
     PackageMetadata *metadata;
+    bool externalPaths;
  };
 
 QHash<QString, PackageStructure::Ptr> PackageStructurePrivate::structures;
@@ -487,6 +491,16 @@ PackageMetadata PackageStructure::metada
     return *d->metadata;
 }
 
+bool PackageStructure::allowExternalPaths() const
+{
+    return d->externalPaths;
+}
+
+void PackageStructure::setAllowExternalPaths(bool allow)
+{
+    d->externalPaths = allow;
+}
+
 } // Plasma namespace
 
 #include "packagestructure.moc"
diff -up kdelibs-4.1.96/plasma/packagestructure.h.orig kdelibs-4.1.96/plasma/packagestructure.h
--- kdelibs-4.1.96/plasma/packagestructure.h.orig	2009-01-16 14:19:12.000000000 +0100
+++ kdelibs-4.1.96/plasma/packagestructure.h	2009-01-16 14:42:39.000000000 +0100
@@ -278,6 +278,12 @@ public:
       */
     virtual PackageMetadata metadata();
 
+    /**
+     * @return true if paths/symlinks outside the package itself should be followed.
+     * By default this is set to false for security reasons.
+     */
+    bool allowExternalPaths() const;
+
 Q_SIGNALS:
     /**
      * Emitted when the new widget browser process completes.
@@ -286,6 +292,13 @@ Q_SIGNALS:
 
 protected:
     /**
+     * Sets whether or not external paths/symlinks can be followed by a package
+     * @arg allow true if paths/symlinks outside of the package should be followed,
+     *             false if they should be rejected.
+     */
+    void setAllowExternalPaths(bool allow);
+
+    /**
      * Sets the prefix that all the contents in this package should
      * appear under. This defaults to "contents/" and is added automatically
      * between the base path and the entries as defined by the package

kdelibs-4.1.96-cmake.patch:

--- NEW FILE kdelibs-4.1.96-cmake.patch ---
diff -up kdelibs-4.1.96/cmake/modules/FindKdepimLibs.cmake.orig kdelibs-4.1.96/cmake/modules/FindKdepimLibs.cmake
--- kdelibs-4.1.96/cmake/modules/FindKdepimLibs.cmake.orig	2009-01-08 22:14:13.000000000 +0100
+++ kdelibs-4.1.96/cmake/modules/FindKdepimLibs.cmake	2009-01-08 22:14:59.000000000 +0100
@@ -64,9 +64,13 @@
 # See kdepimlibs/CMakeLists.txt and kdepimlibs/KdepimLibsConfig.cmake.in 
 # for details. Alex
 
-
+set(KDEPIMLIBS_VERSION 4.2.0)
+set(_KdepimLibsConfig_INSTALL_DIR ${LIB_INSTALL_DIR}/KdepimLibs-${KDEPIMLIBS_VERSION}/cmake)
+if(KDE4_USE_COMMON_CMAKE_PACKAGE_CONFIG_DIR)
+   set(_KdepimLibsConfig_INSTALL_DIR ${LIB_INSTALL_DIR}/cmake/KdepimLibs-${KDEPIMLIBS_VERSION} )
+endif(KDE4_USE_COMMON_CMAKE_PACKAGE_CONFIG_DIR)
 set(_KdepimLibs_FIND_QUIETLY  ${KdepimLibs_FIND_QUIETLY})
-find_package(KdepimLibs ${KdepimLibs_FIND_VERSION} QUIET NO_MODULE PATHS ${KDE4_LIB_DIR}/KdepimLibs/cmake )
+find_package(KdepimLibs ${KdepimLibs_FIND_VERSION} QUIET NO_MODULE PATHS ${_KdepimLibsConfig_INSTALL_DIR} )
 set(KdepimLibs_FIND_QUIETLY ${_KdepimLibs_FIND_QUIETLY})
 
 include(FindPackageHandleStandardArgs)
diff -up kdelibs-4.1.96/cmake/modules/FindKDE4Workspace.cmake.orig kdelibs-4.1.96/cmake/modules/FindKDE4Workspace.cmake
--- kdelibs-4.1.96/cmake/modules/FindKDE4Workspace.cmake.orig	2009-01-10 21:53:41.000000000 +0100
+++ kdelibs-4.1.96/cmake/modules/FindKDE4Workspace.cmake	2009-01-10 21:54:03.000000000 +0100
@@ -62,8 +62,14 @@
 # for details. Alex
 
 
+set(KDE4WORKSPACE_VERSION 4.2.0)
+set(_KdeWorkspaceConfig_INSTALL_DIR ${LIB_INSTALL_DIR}/KDE4Workspace-${KDE4WORKSPACE_VERSION}/cmake)
+if(KDE4_USE_COMMON_CMAKE_PACKAGE_CONFIG_DIR)
+   set(_KdeWorkspaceConfig_INSTALL_DIR ${LIB_INSTALL_DIR}/cmake/KDE4Workspace-${KDE4WORKSPACE_VERSION} )
+endif(KDE4_USE_COMMON_CMAKE_PACKAGE_CONFIG_DIR)
+
 set(_KDE4Workspace_FIND_QUIETLY  ${KDE4Workspace_FIND_QUIETLY})
-find_package(KDE4Workspace QUIET NO_MODULE PATHS ${KDE4_LIB_DIR}/KDE4Workspace/cmake )
+find_package(KDE4Workspace QUIET NO_MODULE PATHS ${_KdeWorkspaceConfig_INSTALL_DIR} )
 set(KDE4Workspace_FIND_QUIETLY ${_KDE4Workspace_FIND_QUIETLY})
 
 include(FindPackageHandleStandardArgs)

kdelibs-4.1.96-parallel_devel.patch:

--- NEW FILE kdelibs-4.1.96-parallel_devel.patch ---
diff -up kdelibs-4.1.96/cmake/modules/FindKDE4Internal.cmake.parallel_devel kdelibs-4.1.96/cmake/modules/FindKDE4Internal.cmake
--- kdelibs-4.1.96/cmake/modules/FindKDE4Internal.cmake.parallel_devel	2009-01-07 01:13:55.000000000 +0100
+++ kdelibs-4.1.96/cmake/modules/FindKDE4Internal.cmake	2009-01-07 22:42:22.000000000 +0100
@@ -15,10 +15,10 @@
 # The following variables are defined for the various tools required to
 # compile KDE software:
 #
-#  KDE4_KCFGC_EXECUTABLE    - the kconfig_compiler executable
+#  KDE4_KCFGC_EXECUTABLE    - the kconfig_compiler4 executable
 #  KDE4_AUTOMOC_EXECUTABLE  - the kde4automoc executable, deprecated, use AUTOMOC4_EXECUTABLE instead
 #  KDE4_MEINPROC_EXECUTABLE - the meinproc4 executable
-#  KDE4_MAKEKDEWIDGETS_EXECUTABLE - the makekdewidgets executable
+#  KDE4_MAKEKDEWIDGETS_EXECUTABLE - the makekdewidgets4 executable
 #
 # The following variables point to the location of the KDE libraries,
 # but shouldn't be used directly:
@@ -131,7 +131,7 @@
 #    Use optional GENERATE_MOC to generate moc if you use signals in your kcfg files.
 #
 #  KDE4_ADD_WIDGET_FILES (SRCS_VAR file1.widgets ... fileN.widgets)
-#    Use this to add widget description files for the makekdewidgets code generator
+#    Use this to add widget description files for the makekdewidgets4 code generator
 #    for Qt Designer plugins.
 #
 #  KDE4_CREATE_FINAL_FILES (filename_CXX filename_C file1 ... fileN)
@@ -370,23 +370,23 @@ if (_kdeBootStrapping)
    if (WIN32)
       set(LIBRARY_OUTPUT_PATH            ${EXECUTABLE_OUTPUT_PATH} )
       # CMAKE_CFG_INTDIR is the output subdirectory created e.g. by XCode and MSVC
-      set(KDE4_KCFGC_EXECUTABLE          ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/kconfig_compiler )
+      set(KDE4_KCFGC_EXECUTABLE          ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/kconfig_compiler4 )
 
       set(KDE4_MEINPROC_EXECUTABLE       ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/meinproc4 )
-      set(KDE4_MAKEKDEWIDGETS_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/makekdewidgets )
+      set(KDE4_MAKEKDEWIDGETS_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/makekdewidgets4 )
    else (WIN32)
       set(LIBRARY_OUTPUT_PATH            ${CMAKE_BINARY_DIR}/lib )
-      set(KDE4_KCFGC_EXECUTABLE          ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/kconfig_compiler.shell )
+      set(KDE4_KCFGC_EXECUTABLE          ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/kconfig_compiler4.shell )
 
       set(KDE4_MEINPROC_EXECUTABLE       ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/meinproc4.shell )
-      set(KDE4_MAKEKDEWIDGETS_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/makekdewidgets.shell )
+      set(KDE4_MAKEKDEWIDGETS_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/makekdewidgets4.shell )
    endif (WIN32)
 
    set(KDE4_LIB_DIR ${LIBRARY_OUTPUT_PATH}/${CMAKE_CFG_INTDIR})
 
    # when building kdelibs, make the kcfg rules depend on the binaries...
-   set( _KDE4_KCONFIG_COMPILER_DEP kconfig_compiler)
-   set( _KDE4_MAKEKDEWIDGETS_DEP makekdewidgets)
+   set( _KDE4_KCONFIG_COMPILER_DEP kconfig_compiler4)
+   set( _KDE4_MAKEKDEWIDGETS_DEP makekdewidgets4)
    set( _KDE4_MEINPROC_EXECUTABLE_DEP meinproc4)
 
    set(KDE4_INSTALLED_VERSION_OK TRUE)
@@ -488,7 +488,8 @@ else (_kdeBootStrapping)
 
    # KDE4_LIB_INSTALL_DIR and KDE4_INCLUDE_INSTALL_DIR are set in KDELibsDependencies.cmake,
    # use them to set the KDE4_LIB_DIR and KDE4_INCLUDE_DIR "public interface" variables
-   set(KDE4_LIB_DIR ${KDE4_LIB_INSTALL_DIR} )
+   set(KDE4_LIB_DIR ${KDE4_LIB_INSTALL_DIR}/kde4/devel )
+   link_directories("${KDE4_LIB_DIR}")
    set(KDE4_INCLUDE_DIR ${KDE4_INCLUDE_INSTALL_DIR} )
 
 
@@ -501,12 +502,12 @@ else (_kdeBootStrapping)
 
    # get the build CONFIGURATIONS which were exported in this file, and use just the first
    # of them to get the location of the installed executables
-   get_target_property(_importedConfigurations  ${KDE4_TARGET_PREFIX}kconfig_compiler IMPORTED_CONFIGURATIONS )
+   get_target_property(_importedConfigurations  ${KDE4_TARGET_PREFIX}kconfig_compiler4 IMPORTED_CONFIGURATIONS )
    list(GET _importedConfigurations 0 _firstConfig)
 
-   get_target_property(KDE4_KCFGC_EXECUTABLE          ${KDE4_TARGET_PREFIX}kconfig_compiler LOCATION_${firstConfig})
+   get_target_property(KDE4_KCFGC_EXECUTABLE          ${KDE4_TARGET_PREFIX}kconfig_compiler4 LOCATION_${firstConfig})
    get_target_property(KDE4_MEINPROC_EXECUTABLE       ${KDE4_TARGET_PREFIX}meinproc4        LOCATION_${firstConfig})
-   get_target_property(KDE4_MAKEKDEWIDGETS_EXECUTABLE ${KDE4_TARGET_PREFIX}makekdewidgets   LOCATION_${firstConfig})
+   get_target_property(KDE4_MAKEKDEWIDGETS_EXECUTABLE ${KDE4_TARGET_PREFIX}makekdewidgets4   LOCATION_${firstConfig})
 
    # allow searching cmake modules in all given kde install locations (KDEDIRS based)
    execute_process(COMMAND "${KDE4_KDECONFIG_EXECUTABLE}" --path data OUTPUT_VARIABLE _data_DIR ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE)
@@ -738,7 +739,8 @@ set(CMAKE_SYSTEM_INCLUDE_PATH ${CMAKE_SY
 set(CMAKE_SYSTEM_PROGRAM_PATH ${CMAKE_SYSTEM_PROGRAM_PATH}
                               "${KDE4_BIN_INSTALL_DIR}" )
 
-set(CMAKE_SYSTEM_LIBRARY_PATH ${CMAKE_SYSTEM_LIBRARY_PATH} 
+set(CMAKE_SYSTEM_LIBRARY_PATH "${KDE4_LIB_INSTALL_DIR}/kde4/devel"
+                              ${CMAKE_SYSTEM_LIBRARY_PATH}
                               "${KDE4_LIB_INSTALL_DIR}" )
 
 # under Windows dlls may be also installed in bin/
@@ -1121,9 +1123,9 @@ macro (KDE4_PRINT_RESULTS)
    endif (NOT _kdeBootStrapping)
 
    if(KDE4_KCFGC_EXECUTABLE)
-      message(STATUS "Found the KDE4 kconfig_compiler preprocessor: ${KDE4_KCFGC_EXECUTABLE}")
+      message(STATUS "Found the KDE4 kconfig_compiler4 preprocessor: ${KDE4_KCFGC_EXECUTABLE}")
    else(KDE4_KCFGC_EXECUTABLE)
-      message(STATUS "Didn't find the KDE4 kconfig_compiler preprocessor")
+      message(STATUS "Didn't find the KDE4 kconfig_compiler4 preprocessor")
    endif(KDE4_KCFGC_EXECUTABLE)
 
    if(AUTOMOC4_EXECUTABLE)
@@ -1142,7 +1145,7 @@ if (KDE4Internal_FIND_REQUIRED AND NOT K
    endif (NOT KDE4_INSTALLED_VERSION_OK)
 
    if (NOT KDE4_KCFGC_EXECUTABLE)
-     message(FATAL_ERROR "ERROR: could not detect a usable kconfig_compiler")
+     message(FATAL_ERROR "ERROR: could not detect a usable kconfig_compiler4")
    endif (NOT KDE4_KCFGC_EXECUTABLE)
 
    message(FATAL_ERROR "ERROR: could NOT find everything required for compiling KDE 4 programs")
diff -up kdelibs-4.1.96/doc/api/doxygen-preprocess-kcfg.sh.parallel_devel kdelibs-4.1.96/doc/api/doxygen-preprocess-kcfg.sh
--- kdelibs-4.1.96/doc/api/doxygen-preprocess-kcfg.sh.parallel_devel	2008-05-21 13:07:26.000000000 +0200
+++ kdelibs-4.1.96/doc/api/doxygen-preprocess-kcfg.sh	2009-01-07 22:04:13.000000000 +0100
@@ -2,9 +2,9 @@
 # Generates and cleans KConfigXT source code during a API dox build
 #
 
-kcfg_compiler="`kde4-config --prefix`/bin/kconfig_compiler"
+kcfg_compiler="`kde4-config --prefix`/bin/kconfig_compiler4"
 if test -z "$kcfg_compiler"; then
-	echo "kconfig_compiler not found!"
+	echo "kconfig_compiler4 not found!"
 	exit 1;
 fi
 
diff -up kdelibs-4.1.96/kdecore/kconfig_compiler/checkkcfg.pl.parallel_devel kdelibs-4.1.96/kdecore/kconfig_compiler/checkkcfg.pl
--- kdelibs-4.1.96/kdecore/kconfig_compiler/checkkcfg.pl.parallel_devel	2008-05-21 13:09:13.000000000 +0200
+++ kdelibs-4.1.96/kdecore/kconfig_compiler/checkkcfg.pl	2009-01-07 22:04:13.000000000 +0100
@@ -15,12 +15,12 @@ $file_cpp = "$filebase.cpp";
 
 $kcfgc = $file . "c";
 
-$cmd = "./kconfig_compiler $file $kcfgc";
+$cmd = "./kconfig_compiler4 $file $kcfgc";
 
 #print "CMD $cmd\n";
 
 if ( system( $cmd ) != 0 ) {
-  print STDERR "Unable to run kconfig_compiler\n";
+  print STDERR "Unable to run kconfig_compiler4\n";
   exit 1;
 }
 
diff -up kdelibs-4.1.96/kdecore/kconfig_compiler/CMakeLists.txt.parallel_devel kdelibs-4.1.96/kdecore/kconfig_compiler/CMakeLists.txt
--- kdelibs-4.1.96/kdecore/kconfig_compiler/CMakeLists.txt.parallel_devel	2009-01-06 18:27:49.000000000 +0100
+++ kdelibs-4.1.96/kdecore/kconfig_compiler/CMakeLists.txt	2009-01-07 22:44:57.000000000 +0100
@@ -8,13 +8,13 @@ add_subdirectory( example )
 set(kconfig_compiler_SRCS kconfig_compiler.cpp)
 
 
-kde4_add_executable(kconfig_compiler NOGUI RUN_UNINSTALLED ${kconfig_compiler_SRCS})
+kde4_add_executable(kconfig_compiler4 NOGUI RUN_UNINSTALLED ${kconfig_compiler_SRCS})
 
-target_link_libraries(kconfig_compiler  ${QT_QTCORE_LIBRARY} ${QT_QTXML_LIBRARY} )
+target_link_libraries(kconfig_compiler4  ${QT_QTCORE_LIBRARY} ${QT_QTXML_LIBRARY} )
 
 # "export" this target too so we can use the LOCATION property of the imported target in
 # FindKDE4Internal.cmake to get the full path to the installed executable instead of using FIND_PROGRAM(), Alex
-install(TARGETS kconfig_compiler EXPORT kdelibsToolsTargets ${INSTALL_TARGETS_DEFAULT_ARGS} )
+install(TARGETS kconfig_compiler4 EXPORT kdelibsToolsTargets ${INSTALL_TARGETS_DEFAULT_ARGS} )
 
 
 ########### install files ###############
diff -up kdelibs-4.1.96/kdeui/tests/kconfig_compiler/CMakeLists.txt.parallel_devel kdelibs-4.1.96/kdeui/tests/kconfig_compiler/CMakeLists.txt
--- kdelibs-4.1.96/kdeui/tests/kconfig_compiler/CMakeLists.txt.parallel_devel	2008-05-21 13:08:30.000000000 +0200
+++ kdelibs-4.1.96/kdeui/tests/kconfig_compiler/CMakeLists.txt	2009-01-07 22:04:13.000000000 +0100
@@ -9,7 +9,7 @@ macro(GEN_KCFG_TEST_SOURCE _testName _sr
    add_custom_command(
       OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${_testName}.cpp ${CMAKE_CURRENT_BINARY_DIR}/${_testName}.h
       COMMAND ${KDE4_KCFGC_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/${_testName}.kcfg ${CMAKE_CURRENT_SOURCE_DIR}/${_testName}.kcfgc
-      DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_testName}.kcfg ${CMAKE_CURRENT_SOURCE_DIR}/${_testName}.kcfgc kconfig_compiler)
+      DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_testName}.kcfg ${CMAKE_CURRENT_SOURCE_DIR}/${_testName}.kcfgc kconfig_compiler4)
 
 #   set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/${_testName}.h PROPERTIES GENERATED TRUE)
    qt4_generate_moc(${CMAKE_CURRENT_BINARY_DIR}/${_testName}.h ${CMAKE_CURRENT_BINARY_DIR}/${_testName}.moc )
diff -up kdelibs-4.1.96/kdewidgets/CMakeLists.txt.parallel_devel kdelibs-4.1.96/kdewidgets/CMakeLists.txt
--- kdelibs-4.1.96/kdewidgets/CMakeLists.txt.parallel_devel	2009-01-06 18:27:44.000000000 +0100
+++ kdelibs-4.1.96/kdewidgets/CMakeLists.txt	2009-01-07 22:46:30.000000000 +0100
@@ -14,24 +14,24 @@ include_directories( 
 set(makekdewidgets_SRCS makekdewidgets.cpp )
 
 
-kde4_add_executable(makekdewidgets NOGUI RUN_UNINSTALLED ${makekdewidgets_SRCS})
+kde4_add_executable(makekdewidgets4 NOGUI RUN_UNINSTALLED ${makekdewidgets_SRCS})
 
-target_link_libraries(makekdewidgets  ${KDE4_KDECORE_LIBS} )
+target_link_libraries(makekdewidgets4  ${KDE4_KDECORE_LIBS} )
 
 # "export" this target too so we can use the LOCATION property of the imported target in
 # FindKDE4Internal.cmake to get the full path to the installed executable instead of using FIND_PROGRAM(), Alex
-install(TARGETS makekdewidgets  EXPORT kdelibsToolsTargets ${INSTALL_TARGETS_DEFAULT_ARGS} )
+install(TARGETS makekdewidgets4  EXPORT kdelibsToolsTargets ${INSTALL_TARGETS_DEFAULT_ARGS} )
 
 
 ########### next target ###############
 
 
 # get the name of the generated wrapper script (which sets up LD_LIBRARY_PATH)
-get_target_property(MAKEKDEWIDGETS_EXECUTABLE makekdewidgets WRAPPER_SCRIPT)
+get_target_property(MAKEKDEWIDGETS_EXECUTABLE makekdewidgets4 WRAPPER_SCRIPT)
 
 add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/kdewidgets.cpp
   COMMAND "${MAKEKDEWIDGETS_EXECUTABLE}" -o ${CMAKE_CURRENT_BINARY_DIR}/kdewidgets.cpp ${CMAKE_CURRENT_SOURCE_DIR}/kde.widgets
-  MAIN_DEPENDENCY kde.widgets DEPENDS makekdewidgets)
+  MAIN_DEPENDENCY kde.widgets DEPENDS makekdewidgets4)
 
 set(kdewidgets_PART_SRCS
    classpreviews.cpp


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/F-10/.cvsignore,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- .cvsignore	7 Jan 2009 12:27:19 -0000	1.61
+++ .cvsignore	23 Jan 2009 18:59:58 -0000	1.62
@@ -1 +1 @@
-kdelibs-4.1.4.tar.bz2
+kdelibs-4.2.0.tar.bz2


Index: kde4.csh
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/F-10/kde4.csh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- kde4.csh	1 Dec 2007 19:43:21 -0000	1.2
+++ kde4.csh	23 Jan 2009 18:59:58 -0000	1.3
@@ -10,9 +10,16 @@
    if ( "$PRELINKING" == "yes" )  then
      if ( ! $?KDE_IS_PRELINKED ) setenv KDE_IS_PRELINKED 1
    endif
+   unset PRELINKING
 endif
 
-if ( ! $?QT_PLUGIN_PATH ) then
-  set KDE4_LIBDIR = `/bin/rpm --eval %\{\?_kde4_libdir\}%\{\!\?_kde4_libdir:%\{_libdir\}\}`
-  setenv QT_PLUGIN_PATH ${KDE4_LIBDIR}/kde4/plugins
+# handled in startkde, but this sets for other DE's too
+set KDE4_QTPLUGINS=`kde4-config --path qtplugins`
+if ( $?QT_PLUGIN_PATH ) then
+  if ( "$QT_PLUGIN_PATH" !~ *"${KDE4_QTPLUGINS}"* ) then
+    setenv QT_PLUGIN_PATH ${QT_PLUGIN_PATH}:${KDE4_QTPLUGINS}
+  endif 
+else
+  setenv QT_PLUGIN_PATH ${KDE4_QTPLUGINS} 
 endif
+unset KDE4_QTPLUGINS


Index: kde4.sh
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/F-10/kde4.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- kde4.sh	1 Dec 2007 19:43:21 -0000	1.2
+++ kde4.sh	23 Jan 2009 18:59:58 -0000	1.3
@@ -5,13 +5,19 @@
 [ -z "$KDEDIRS" ] && KDEDIRS="/usr" && export KDEDIRS
 
 ## When/if using prelinking, avoids (some) use of kdeinit
-if [ -f /etc/sysconfig/prelink ]; then
-  if [ `grep '^PRELINKING=yes' /etc/sysconfig/prelink` ] ; then
-    [ -z "$KDE_IS_PRELINKED" ] && KDE_IS_PRELINKED=1 && export KDE_IS_PRELINKED
-  fi
+if [ -z "$KDE_IS_PRELINKED" ] ; then
+  grep -qs '^PRELINKING=yes' /etc/sysconfig/prelink && \
+  KDE_IS_PRELINKED=1 && export KDE_IS_PRELINKED
 fi
 
-if [ -z "$QT_PLUGIN_PATH" ]; then
-  KDE4_LIBDIR=`/bin/rpm --eval '%{?_kde4_libdir}%{!?_kde4_libdir:%{_libdir}}' 2>/dev/null`
-  QT_PLUGIN_PATH=${KDE4_LIBDIR}/kde4/plugins && export QT_PLUGIN_PATH
+
+# handled in startkde, but this sets for other DE's too
+if [ -n "$QT_PLUGIN_PATH" ] ; then
+  if ! echo "$QT_PLUGIN_PATH" | grep -qw `kde4-config --path qtplugins` ; then
+    QT_PLUGIN_PATH="$QT_PLUGIN_PATH:`kde4-config --path qtplugins`"
+  fi
+else
+  QT_PLUGIN_PATH="`kde4-config --path qtplugins`"
 fi
+export QT_PLUGIN_PATH
+


Index: kdelibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/F-10/kdelibs.spec,v
retrieving revision 1.395
retrieving revision 1.396
diff -u -r1.395 -r1.396
--- kdelibs.spec	8 Jan 2009 05:00:14 -0000	1.395
+++ kdelibs.spec	23 Jan 2009 18:59:58 -0000	1.396
@@ -1,8 +1,6 @@
-%define _default_patch_fuzz 2
-
 Summary: K Desktop Environment 4 - Libraries
-Version: 4.1.4
-Release: 2%{?dist}
+Version: 4.2.0
+Release: 1%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs
@@ -29,13 +27,14 @@
 %endif
 
 BuildRequires: kde4-macros(api) >= 2
-BuildRequires: kde-filesystem >= 4
+BuildRequires: kde-filesystem >= 4-23
+# used in kde.(sh|csh)
+Requires: coreutils grep
+# dbus-launch needed here? don't think so, but be safe and keep 
+# for now -- Rex
 Requires: dbus-x11
 Requires: hicolor-icon-theme
-# kdebase-runtime not *strictly* required here, but how better to pull
-# it in?  comps only?
-#Requires: kdebase-runtime
-Requires: kde-filesystem >= 4
+Requires: kde-filesystem >= 4-23
 Requires: kde-settings
 %{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
 Requires: shared-mime-info
@@ -45,15 +44,16 @@
 %if 0%{?fedora} >= 9
 Requires: hunspell
 %endif
-Requires: soprano >= 2.1
+Requires: phonon >= 4.2.96
+Requires: soprano >= 2.1.64
 
 Source1: kde4.sh
 Source2: kde4.csh
 
 # make -devel packages parallel-installable
-Patch0: kdelibs-4.1.0-parallel_devel.patch
+Patch0: kdelibs-4.1.96-parallel_devel.patch
 # fix kde#149705
-Patch2: kdelibs-3.95.0-kde149705.patch
+Patch2: kdelibs-4.1.82-kde149705.patch
 # Hunspell support for K3Spell
 # http://fedoraproject.org/wiki/Releases/FeatureDictionary
 # http://bugs.kde.org/show_bug.cgi?id=154561
@@ -67,20 +67,23 @@
 Patch9: kdelibs-4.0.2-branding.patch
 # don't cache kdeglobals paths because they change after profile directories
 # are loaded from kde4rc
-Patch10: kdelibs-4.0.2-no-cache-kdeglobals-paths.patch
-# workarounds for policykit and NTFS
-Patch11: kdelibs-4.1.4-policykit-workaround.patch
+Patch10: kdelibs-4.1.72-no-cache-kdeglobals-paths.patch
+# workaround for policykit
+Patch11: kdelibs-4.1.72-policykit-workaround.patch
 Patch12: kdelibs-4.1.0-xdg-menu.patch
 # patch KStandardDirs to use %{_libexecdir}/kde4 instead of %{_libdir}/kde4/libexec
 Patch14: kdelibs-4.0.85-libexecdir.patch
 # kstandarddirs changes: search /etc/kde, find /usr/libexec/kde4
-Patch18: kdelibs-4.1.0-kstandarddirs.patch
-Patch20: kdelibs-4.1.1-cmake.patch
-
-## upstream patches
+Patch18: kdelibs-4.1.72-kstandarddirs.patch
+Patch20: kdelibs-4.1.70-cmake.patch
+Patch22: kdelibs-4.1.96-cmake.patch
+
+# upstream
+# 4.3 branch
+Patch101: kdelibs-4.1.96-AllowExternalPaths.patch
 
 BuildRequires: qt4-devel >= 4.4.0
-Requires: qt4 >= %{_qt4_version} 
+Requires: qt4 >= %{_qt4_version}
 Requires: xdg-utils
 Requires(post): /sbin/ldconfig xdg-utils
 Requires(postun): /sbin/ldconfig xdg-utils
@@ -93,7 +96,7 @@
 BuildRequires: automoc
 BuildRequires: avahi-devel
 BuildRequires: bzip2-devel
-BuildRequires: cmake
+BuildRequires: cmake >= 2.6.2-3
 BuildRequires: cups-devel cups
 BuildRequires: enchant-devel
 BuildRequires: gamin-devel
@@ -111,15 +114,13 @@
 BuildRequires: OpenEXR-devel
 BuildRequires: openssl-devel
 BuildRequires: pcre-devel
-# work around circular dependency from phonon-devel pulling in phonon-backend-xine
-BuildRequires: phonon-backend-gstreamer
-BuildRequires: phonon-devel >= 4.2
+BuildRequires: phonon-devel >= 4.2.96
 BuildRequires: shared-mime-info
-BuildRequires: soprano-devel >= 2.1
-BuildRequires: strigi-devel >= 0.5.7
+BuildRequires: soprano-devel >= 2.1.64
+BuildRequires: strigi-devel >= 0.6.3
 BuildRequires: zlib-devel
 BuildRequires: libutempter-devel
-# extra X deps (seemingly needed and/or checked-for by most kde4 buildscripts) 
+# extra X deps (seemingly needed and/or checked-for by most kde4 buildscripts)
 %define x_deps libXcomposite-devel libXdamage-devel libxkbfile-devel libXpm-devel libXScrnSaver-devel libXtst-devel libXv-devel libXxf86misc-devel
 %{?x_deps:BuildRequires: %{x_deps}}
 BuildRequires: openssh-clients
@@ -145,16 +146,18 @@
 %package devel
 Group: Development/Libraries
 Summary: Header files for compiling KDE 4 applications
+Provides: plasma-devel = %{version}-%{release}
 Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
 %if "%{name}" != "kdelibs4"
 Obsoletes: kdelibs4-devel < %{version}-%{release}
 Provides:  kdelibs4-devel = %{version}-%{release}
 %endif
+Requires: cmake >= 2.6.2-3
 Requires: automoc
 Requires: qt4-devel
 Requires: openssl-devel
-Requires: phonon-devel >= 4.2
-Requires: strigi-devel
+Requires: phonon-devel >= 4.2.96
+Requires: strigi-devel >= 0.6.3
 Requires: bzip2-devel gamin-devel libacl-devel zlib-devel libutempter-devel
 %{?x_deps:Requires: %{x_deps}}
 %description devel
@@ -196,18 +199,20 @@
 %patch9 -p1 -b .branding
 sed -i -e "s|@@VERSION_RELEASE@@|%{version}-%{release}|" kio/kio/kprotocolmanager.cpp
 %patch10 -p1 -b .no-cache-kdeglobals-paths
-%patch11 -p1 -b .policykit
+#%patch11 -p1 -b .policykit
 %patch12 -p1 -b .Administration-menu
 %patch14 -p1 -b .libexecdir
 %patch18 -p1 -b .kstandarddirs
-%patch20 -p1 -b .cmake
-
-## upstream patches
+%patch20 -p1 -b .xxcmake
+%patch22 -p1 -b .kdepimlibs-cmake
 
+# upstream patches
+%patch101 -p1 -b .AllowExternalPaths
 
 %build
+
 mkdir -p %{_target_platform}
-pushd %{_target_platform} 
+pushd %{_target_platform}
 %{cmake_kde4} -DKDE_DISTRIBUTION_TEXT="%{version}-%{release} Fedora" ..
 popd
 
@@ -226,7 +231,7 @@
 rm -rf %{buildroot}
 
 %if 0%{?rest}
-make install DESTDIR=%{buildroot} -C %{_target_platform}
+make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
 # see also use-of/patching of XDG_MENU_PREFIX in kdebase/kde-settings
 mv %{buildroot}%{_kde4_sysconfdir}/xdg/menus/applications.menu \
@@ -283,7 +288,7 @@
 xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
 xdg-desktop-menu forceupdate 2> /dev/null || :
 
-%postun 
+%postun
 /sbin/ldconfig ||:
 xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
 xdg-desktop-menu forceupdate 2> /dev/null || :
@@ -313,8 +318,9 @@
 %{_kde4_datadir}/mime/packages/*
 %{_kde4_sharedir}/kde4/services/*
 %{_kde4_sharedir}/kde4/servicetypes/*
-%{_kde4_sharedir}/icons/hicolor/*/actions/presence_*
+%{_kde4_sharedir}/icons/hicolor/*/actions/*
 %{_kde4_docdir}/HTML/en/sonnet/
+%{_kde4_docdir}/HTML/en/kioslave/
 %{_kde4_libdir}/lib*.so.*
 %{_kde4_libdir}/libkdeinit4_*.so
 %dir %{_kde4_libdir}/kde4/
@@ -363,23 +369,99 @@
 
 
 %changelog
-* Thu Jan 08 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.4-2
-- restore AWOL NTFS workaround yet again
+* Thu Jan 22 2009 Than Ngo <than at redhat.com> - 4.2.0-1
+- 4.2.0
 
-* Wed Jan  7 2009 Luk???? Tinkl <ltinkl at redhat.com> 4.1.4-1
-- KDE 4.1.4
+* Fri Jan 16 2009 Than Ngo <than at redhat.com> - 4.1.96-9
+- drop kdelibs-4.1.85-plasma-default-wallpaper.patch, it's not needed
+  since new plasma allows to define default wallpaper, new kde-setting
+  is required
+- backport fix from trunk to allow symlinks in wallpaper theme
 
-* Mon Dec 08 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.3-4
-- restore NTFS workaround which accidentally got dropped in the 4.1.3 update
+* Fri Jan 16 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.1.96-8
+- rebuild for new OpenSSL
 
-* Thu Nov 20 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.3-3
-- unmess Utilities menu (kdebug:161117)
+* Mon Jan 12 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.1.96-7
+- Slight speedup to profile.d/kde.sh (#465370)
+- (Build)Req: strigi(-devel) >= 0.6.3
 
-* Fri Nov 07 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.3-2
-- backport http_cache_cleaner fix (kdebug:172182)
+* Mon Jan 12 2009 Than Ngo <than at redhat.com> - 4.1.96-6
+- fix a crash (appearing in KSMServer)
+
+* Sat Jan 10 2009 Than Ngo <than at redhat.com> - 4.1.96-5
+- kdeworkspace cmake files in correct place
+
+* Fri Jan 09 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.1.96-4
+- bump min deps (cmake, kde-filesystem, phonon)
+- kde.(sh|csh): cleanup QT_PLUGIN_PATH handling
+- Requires: coreutils grep
+
+* Fri Jan 09 2009 Than Ngo <than at redhat.com> - 4.1.96-3
+- BR soprano >= 2.1.64
+
+* Thu Jan 08 2009 Than Ngo <than at redhat.com> - 4.1.96-2
+- kdepim cmake files in correct place
+
+* Wed Jan 07 2009 Than Ngo <than at redhat.com> - 4.1.96-1
+- 4.2rc1
+
+* Fri Dec 19 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.85-6
+- add plasma-default-wallpaper libplasma patch from kdebase-workspace-4.1
+
+* Tue Dec 16 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.85-5
+- respun tarball, integrates kde-l10n-systemsettings patch
+
+* Tue Dec 16 2008 Than Ngo <than at redhat.com> - 4.1.85-4
+- add missing ENTITY systemsettings in pt, that fixes kde-l10
+  build breakage
 
-* Tue Nov  4 2008 Luk???? Tinkl <ltinkl at redhat.com> 4.1.3-1
-- KDE 4.1.3
+* Mon Dec 15 2008 Than Ngo <than at redhat.com> - 4.1.85-3
+- add missing ENTITY systemsettings in ru/gl/es/pt, that fixes kde-l10
+  build breakage
+- rename suffix .xxcmake to avoid install .cmake
+
+* Sun Dec 14 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.1.85-2
+- tweak parallel_devel patch to get a -L flag for the symlink directory
+
+* Thu Dec 11 2008 Than Ngo <than at redhat.com> -  4.1.85-1
+- 4.2beta2
+
+* Tue Dec 09 2008 Lorenzo Villani <lvillani at binaryhelix.net> - 6:4.1.82-2
+- rebase parallel devel patch and kde149705 patch
+
+* Mon Dec 08 2008 Lorenzo Villani <lvillani at binaryhelix.net> - 6:4.1.82-1
+- 4.1.82
+
+* Tue Nov 25 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.80-5
+- remove workaround BR on phonon-backend-gstreamer, it's ineffective since
+  phonon now explicitly Requires: phonon-backend-xine and the dependency is no
+  longer circular anyway
+- update parallel_devel patch
+- fix minimum strigi version (only 0.5.9 needed)
+
+* Tue Nov 25 2008 Than Ngo <than at redhat.com> 4.1.80-4
+- respin
+
+* Thu Nov 20 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.80-3
+- -devel: Provides: plasma-devel
+
+* Thu Nov 20 2008 Than Ngo <than at redhat.com> 4.1.80-2
+- merged
+
+* Thu Nov 20 2008 Lorenzo Villani <lvillani at binaryhelix.net> - 6:4.1.80-1
+- 4.1.80
+- BR strigi 0.60
+- BR cmake 2.6
+- make install/fast
+- rebase policykit patch
+- rebase cmake patch
+- rebase a couple of patches and drop _default_patch_fuzz 2
+
+* Wed Nov 12 2008 Than Ngo <than at redhat.com> 4.1.3-1
+- 4.1.3
+
+* Fri Nov 07 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-6
+- backport http_cache_cleaner fix (kdebug:172182)
 
 * Wed Oct 15 2008 Luk???? Tinkl <ltinkl at redhat.com> 4.1.2-5
 - backport fix for faulty window resizing (kdebug:172042)
@@ -831,7 +913,7 @@
 
 * Wed Jun 27 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.91.0-1
 - kde-3.91.0
-- CMAKE_BUILD_TYPE=debug 
+- CMAKE_BUILD_TYPE=debug
 
 * Sat Jun 23 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.90.1-3
 - specfile cleanup (%%prefix issues mostly)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/F-10/sources,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- sources	7 Jan 2009 12:27:19 -0000	1.73
+++ sources	23 Jan 2009 18:59:58 -0000	1.74
@@ -1 +1 @@
-ffdb0340a72aaf06a0b98f354c0c59ef  kdelibs-4.1.4.tar.bz2
+4ea13b88463125026a7f71937075bcec  kdelibs-4.2.0.tar.bz2


--- kdelibs-3.95.0-kde149705.patch DELETED ---


--- kdelibs-4.0.2-no-cache-kdeglobals-paths.patch DELETED ---


--- kdelibs-4.1.0-kstandarddirs.patch DELETED ---


--- kdelibs-4.1.0-parallel_devel.patch DELETED ---


--- kdelibs-4.1.1-cmake.patch DELETED ---


--- kdelibs-4.1.4-policykit-workaround.patch DELETED ---



From jnovy at fedoraproject.org  Fri Jan 23 19:11:12 2009
From: jnovy at fedoraproject.org (Jindrich Novy)
Date: Fri, 23 Jan 2009 19:11:12 +0000 (UTC)
Subject: rpms/netpbm/F-9 netpbm-10.35-64bitfix.patch, NONE,
	1.1 netpbm-10.35-pamtosvgsegfault.patch, NONE,
	1.1 netpbm-10.35-pnmmontagefix.patch, NONE,
	1.1 netpbm-10.35-pnmtofiasco-stdin.patch, NONE, 1.1 .cvsignore,
	1.38, 1.39 netpbm-10.22-security2.patch, 1.4,
	1.5 netpbm-10.23-security.patch, 1.19, 1.20 netpbm.spec, 1.112,
	1.113 sources, 1.42, 1.43
Message-ID: <20090123191112.5BF5A700FE@cvs1.fedora.phx.redhat.com>

Author: jnovy

Update of /cvs/pkgs/rpms/netpbm/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14620

Modified Files:
	.cvsignore netpbm-10.22-security2.patch 
	netpbm-10.23-security.patch netpbm.spec sources 
Added Files:
	netpbm-10.35-64bitfix.patch 
	netpbm-10.35-pamtosvgsegfault.patch 
	netpbm-10.35-pnmmontagefix.patch 
	netpbm-10.35-pnmtofiasco-stdin.patch 
Log Message:
* Fri Jan 23 2009 Jindrich Novy <jnovy at redhat.com> 10.35.58-1
- update to 10.35.38
- fixes crashes in picttoppm, pbmtomrf, mrftopbm
- fixes bugs in leaftoppm, ilbmtoppm
- unbreak ppmshadow and ppmrainbow (#476989)
- pnmmontage won't crash because of uninitialized memory usage
- fix segfault in pamtosvg caused by not reverting "sentinel value" (#476989)
- fix pnmtofiasco to accept image from stdin (#476989, #227283)
- fix cmuwmtopbm and other utilities by making endianess
  functions work correctly on 64bit systems (#476863)
- link against external libjasper


netpbm-10.35-64bitfix.patch:

--- NEW FILE netpbm-10.35-64bitfix.patch ---
diff -up netpbm-10.35.58/lib/libpm.c.64bitfix netpbm-10.35.58/lib/libpm.c
--- netpbm-10.35.58/lib/libpm.c.64bitfix	2009-01-22 08:49:25.000000000 +0100
+++ netpbm-10.35.58/lib/libpm.c	2009-01-22 08:50:38.000000000 +0100
@@ -1069,7 +1069,7 @@
 pm_readbiglong(FILE * const ifP, 
                long * const lP) {
 
-    int c;
+    unsigned int c;
     unsigned long l;
 
     c = getc(ifP);
@@ -1148,7 +1148,7 @@
 int
 pm_readlittlelong(FILE * const ifP, 
                   long * const lP) {
-    int c;
+    unsigned int c;
     unsigned long l;
 
     c = getc(ifP);

netpbm-10.35-pamtosvgsegfault.patch:

--- NEW FILE netpbm-10.35-pamtosvgsegfault.patch ---
diff -up netpbm-10.35.57/converter/other/pamtosvg/fit.c.pamtosvgsegfault netpbm-10.35.57/converter/other/pamtosvg/fit.c
--- netpbm-10.35.57/converter/other/pamtosvg/fit.c.pamtosvgsegfault	2008-12-15 10:04:49.000000000 +0100
+++ netpbm-10.35.57/converter/other/pamtosvg/fit.c	2008-12-19 09:10:01.000000000 +0100
@@ -1852,6 +1852,7 @@ find_error (curve_type curve, spline_typ
 
   if (*worst_point == CURVE_LENGTH (curve) + 1)
     { /* Didn't have any ``worst point''; the error should be zero.  */
+      *worst_point = 0;
       if (epsilon_equal (total_error, 0.0))
         LOG ("  Every point fit perfectly.\n");
       else

netpbm-10.35-pnmmontagefix.patch:

--- NEW FILE netpbm-10.35-pnmmontagefix.patch ---
diff -up netpbm-10.35.57/editor/pnmmontage.c.pnmmontagefix netpbm-10.35.57/editor/pnmmontage.c
--- netpbm-10.35.57/editor/pnmmontage.c.pnmmontagefix	2008-12-15 10:04:29.000000000 +0100
+++ netpbm-10.35.57/editor/pnmmontage.c	2008-12-23 20:09:01.000000000 +0100
@@ -346,6 +346,7 @@ main(int argc, char **argv)
   }
 
   pnm_readpaminit(imgs[0].file, &imgs[0], PAM_STRUCT_SIZE(tuple_type));
+  memset(&outimg, 0, sizeof(outimg));
   outimg.maxval = imgs[0].maxval;
   outimg.format = imgs[0].format;
   memcpy(outimg.tuple_type, imgs[0].tuple_type, sizeof(imgs[0].tuple_type));

netpbm-10.35-pnmtofiasco-stdin.patch:

--- NEW FILE netpbm-10.35-pnmtofiasco-stdin.patch ---
diff -up netpbm-10.35.58/converter/other/fiasco/codec/coder.c.pnmtofiasco-stdin netpbm-10.35.58/converter/other/fiasco/codec/coder.c
--- netpbm-10.35.58/converter/other/fiasco/codec/coder.c.pnmtofiasco-stdin	2009-01-19 09:23:57.000000000 +0100
+++ netpbm-10.35.58/converter/other/fiasco/codec/coder.c	2009-01-21 08:03:00.000000000 +0100
@@ -213,15 +213,14 @@ alloc_coder (char const * const *inputna
     */
    {
       char     *filename;
-      int   	width, w = 0, height, h = 0;
+      int   	width, w = 0, height, h = 0, format;
       bool_t	color, c = NO;
+      xelval maxval;
       unsigned 	n;
       
       for (n = 0; (filename = get_input_image_name (inputname, n)); n++)
       {
           FILE *file;
-          xelval maxval;
-          int format;
           if (filename == NULL)
               file = stdin;
           else
@@ -251,6 +250,8 @@ alloc_coder (char const * const *inputna
       wi->width  = w;
       wi->height = h;
       wi->color  = c;
+      wi->format = format;
+      wi->maxval = maxval;
    }
 
    /*
@@ -642,7 +643,18 @@ video_coder (char const * const *image_t
        */
       future_frame   = frame == future_display;
       c->mt->number   = frame;
-      c->mt->original = read_image (image_name);
+      if (strcmp(image_name, "-")) {
+         c->mt->original = read_image (image_name);
+      } else { /* stdin is not seekable - read image contents without rewind */
+	 int width = wfa->wfainfo->width;
+	 int height = wfa->wfainfo->height;
+	 int color = wfa->wfainfo->color;
+	 int format = wfa->wfainfo->format;
+	 xelval maxval = wfa->wfainfo->maxval;
+
+	 c->mt->original = alloc_image(width, height, color, FORMAT_4_4_4);
+	 read_image_data(c->mt->original, stdin, color, width, height, maxval, format);
+      }
       if (c->tiling->exponent && type == I_FRAME) 
 	 perform_tiling (c->mt->original, c->tiling);
 
diff -up netpbm-10.35.58/converter/other/fiasco/codec/wfa.h.pnmtofiasco-stdin netpbm-10.35.58/converter/other/fiasco/codec/wfa.h
--- netpbm-10.35.58/converter/other/fiasco/codec/wfa.h.pnmtofiasco-stdin	2009-01-19 09:23:57.000000000 +0100
+++ netpbm-10.35.58/converter/other/fiasco/codec/wfa.h	2009-01-21 08:03:28.000000000 +0100
@@ -75,6 +75,7 @@ typedef struct range_info
    unsigned level;			/* bintree level of range */
 } range_info_t;
 
+#include "pnm.h"
 #include "image.h"
 #include "rpf.h"
 #include "bit-io.h"
@@ -93,6 +94,8 @@ typedef struct wfa_info
    unsigned  width;			/* image width */
    unsigned  height;			/* image height */
    unsigned  level;			/* image level */
+   unsigned  format;			/* image format */
+   xelval    maxval;			/* image maximal pixel intensity value */
    rpf_t    *rpf;			/* Standard reduced precision format */
    rpf_t    *dc_rpf;			/* DC reduced precision format */
    rpf_t    *d_rpf;			/* Delta reduced precision format */
diff -up netpbm-10.35.58/converter/other/fiasco/lib/image.c.pnmtofiasco-stdin netpbm-10.35.58/converter/other/fiasco/lib/image.c
--- netpbm-10.35.58/converter/other/fiasco/lib/image.c.pnmtofiasco-stdin	2009-01-19 09:23:57.000000000 +0100
+++ netpbm-10.35.58/converter/other/fiasco/lib/image.c	2009-01-21 08:01:53.000000000 +0100
@@ -273,7 +273,7 @@ free_image (image_t *image)
 }
 
 
-static void 
+void 
 read_image_data(image_t * const image, FILE *input, const bool_t color,
                 const int width, const int height, const xelval maxval,
                 const int format) {
diff -up netpbm-10.35.58/converter/other/fiasco/lib/image.h.pnmtofiasco-stdin netpbm-10.35.58/converter/other/fiasco/lib/image.h
--- netpbm-10.35.58/converter/other/fiasco/lib/image.h.pnmtofiasco-stdin	2009-01-19 09:23:57.000000000 +0100
+++ netpbm-10.35.58/converter/other/fiasco/lib/image.h	2009-01-21 08:02:29.000000000 +0100
@@ -17,6 +17,8 @@
 #ifndef _IMAGE_H
 #define _IMAGE_H
 
+#include "pnm.h"
+
 #include <stdio.h>
 #include "types.h"
 #include "fiasco.h"
@@ -51,6 +53,10 @@ read_pnmheader (const char *image_name, 
 image_t *
 read_image (const char *image_name);
 void
+read_image_data(image_t * const image, FILE *input, const bool_t color,
+                const int width, const int height, const xelval maxval,
+                const int format);
+void
 write_image (const char *image_name, const image_t *image);
 bool_t
 same_image_type (const image_t *img1, const image_t *img2);


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/netpbm/F-9/.cvsignore,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- .cvsignore	4 Aug 2008 13:02:36 -0000	1.38
+++ .cvsignore	23 Jan 2009 19:10:41 -0000	1.39
@@ -1 +1 @@
-netpbm-10.35.48.tar.bz2
+netpbm-10.35.58.tar.bz2

netpbm-10.22-security2.patch:

Index: netpbm-10.22-security2.patch
===================================================================
RCS file: /cvs/pkgs/rpms/netpbm/F-9/netpbm-10.22-security2.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- netpbm-10.22-security2.patch	4 Aug 2008 13:02:36 -0000	1.4
+++ netpbm-10.22-security2.patch	23 Jan 2009 19:10:41 -0000	1.5
@@ -416,7 +416,7 @@
 -my $ourtmp = "$tmpdir/ppmshadow$$";
 -mkdir($ourtmp, 0777) or
 -    die("Unable to create directory for temporary files '$ourtmp");
-+chomp($ourtmp = `mktemp -d -t PPMshadow.XXXXXX`);
++my $ourtmp; chomp($ourtmp = `mktemp -d -t PPMshadow.XXXXXX`);
 +if ($? >> 8) {
 +    die "Can't create directory for temporary files";
 +}

netpbm-10.23-security.patch:

Index: netpbm-10.23-security.patch
===================================================================
RCS file: /cvs/pkgs/rpms/netpbm/F-9/netpbm-10.23-security.patch,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- netpbm-10.23-security.patch	4 Aug 2008 13:02:36 -0000	1.19
+++ netpbm-10.23-security.patch	23 Jan 2009 19:10:41 -0000	1.20
@@ -1654,18 +1654,6 @@
      for (i = 0; i < iysize; i++) 
          for (j = 0; j < ixsize; j++) {
              fkernel[i*ixsize+j] = 1.0 / (1.0 + w * sqrt((double)
-diff -up netpbm-10.35.46/generator/ppmrainbow.security netpbm-10.35.46/generator/ppmrainbow
---- netpbm-10.35.46/generator/ppmrainbow.security	2008-06-24 08:58:57.000000000 +0200
-+++ netpbm-10.35.46/generator/ppmrainbow	2008-06-24 09:04:21.000000000 +0200
-@@ -11,7 +11,7 @@ my ($Twid, $Thgt, $tmpdir, $norepeat, $v
- # set defaults
- $Twid = 600;
- $Thgt = 8;
--$tmpdir = $ENV{"TMPDIR"} || "/tmp";
-+$tmpdir = $ENV{"TMPDIR"} || ".tmp";
- $norepeat = $FALSE;
- $verbose = $FALSE;
- 
 diff -up netpbm-10.35.46/lib/libpam.c.security netpbm-10.35.46/lib/libpam.c
 --- netpbm-10.35.46/lib/libpam.c.security	2008-06-24 08:59:03.000000000 +0200
 +++ netpbm-10.35.46/lib/libpam.c	2008-06-24 09:04:21.000000000 +0200


Index: netpbm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/netpbm/F-9/netpbm.spec,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -r1.112 -r1.113
--- netpbm.spec	4 Aug 2008 13:02:36 -0000	1.112
+++ netpbm.spec	23 Jan 2009 19:10:41 -0000	1.113
@@ -1,8 +1,9 @@
 Summary: A library for handling different graphics file formats
 Name: netpbm
-Version: 10.35.48
+Version: 10.35.58
 Release: 1%{?dist}
-License: Assorted licenses, see %{_docdir}/%{name}-%{version}/copyright_summary
+# See copyright_summary for details
+License: BSD and GPLv2 and IJG and MIT and Public Domain
 Group: System Environment/Libraries
 URL: http://netpbm.sourceforge.net/
 # Source0 is prepared by
@@ -29,9 +30,13 @@
 Patch18: netpbm-10.35-glibc.patch
 Patch19: netpbm-10.35-gcc43.patch
 Patch20: netpbm-10.35-rgbtxt.patch
+Patch21: netpbm-10.35-pamtosvgsegfault.patch
+Patch22: netpbm-10.35-pnmmontagefix.patch
+Patch23: netpbm-10.35-pnmtofiasco-stdin.patch
+Patch24: netpbm-10.35-64bitfix.patch
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: libjpeg-devel, libpng-devel, libtiff-devel, flex
-BuildRequires: libX11-devel, python
+BuildRequires: libX11-devel, python, jasper-devel
 
 %description
 The netpbm package contains a library of functions which support
@@ -89,6 +94,10 @@
 %patch18 -p1 -b .glibc
 %patch19 -p1 -b .gcc43
 %patch20 -p1 -b .rgbtxt
+%patch21 -p1 -b .pamtosvgsegfault
+%patch22 -p1 -b .pnmmontagefix
+%patch23 -p1 -b .pnmtofiasco-stdin
+%patch24 -p1 -b .64bitfix
 
 ##mv shhopt/shhopt.h shhopt/pbmshhopt.h
 ##perl -pi -e 's|shhopt.h|pbmshhopt.h|g' `find -name "*.c" -o -name "*.h"` ./GNUmakefile
@@ -130,7 +139,9 @@
 	TIFFLIB_DIR=%{_libdir} \
 	LINUXSVGALIB="NONE" \
 	X11LIB=%{_libdir}/libX11.so \
-	XML2LIBS="NONE"
+	XML2LIBS="NONE" \
+	JASPERLIB="" \
+	JASPERDEPLIBS="-ljasper"
 
 # prepare man files
 cd userguide
@@ -214,6 +225,18 @@
 %{_datadir}/netpbm/
 
 %changelog
+* Fri Jan 23 2009 Jindrich Novy <jnovy at redhat.com> 10.35.58-1
+- update to 10.35.38
+- fixes crashes in picttoppm, pbmtomrf, mrftopbm
+- fixes bugs in leaftoppm, ilbmtoppm
+- unbreak ppmshadow and ppmrainbow (#476989)
+- pnmmontage won't crash because of uninitialized memory usage
+- fix segfault in pamtosvg caused by not reverting "sentinel value" (#476989)
+- fix pnmtofiasco to accept image from stdin (#476989, #227283)
+- fix cmuwmtopbm and other utilities by making endianess
+  functions work correctly on 64bit systems (#476863)
+- link against external libjasper
+
 * Mon Aug  4 2008 Jindrich Novy <jnovy at redhat.com> 10.35.48-1
 - update to 10.35.48
 - fixes buffer overrun in pamperspective and pngtopnm output format


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/netpbm/F-9/sources,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- sources	4 Aug 2008 13:02:36 -0000	1.42
+++ sources	23 Jan 2009 19:10:41 -0000	1.43
@@ -1 +1 @@
-c49e34643a1d353e74877d4abe5fdb63  netpbm-10.35.48.tar.bz2
+f4e789971594212d0be2d8fd1e8a00ac  netpbm-10.35.58.tar.bz2



From salimma at fedoraproject.org  Fri Jan 23 19:12:13 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Fri, 23 Jan 2009 19:12:13 +0000 (UTC)
Subject: rpms/banshee/devel banshee.spec,1.66,1.67
Message-ID: <20090123191213.28BAE700FE@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/banshee/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14788

Modified Files:
	banshee.spec 
Log Message:
Add BR on intltool



Index: banshee.spec
===================================================================
RCS file: /cvs/pkgs/rpms/banshee/devel/banshee.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- banshee.spec	23 Jan 2009 18:58:19 -0000	1.66
+++ banshee.spec	23 Jan 2009 19:11:42 -0000	1.67
@@ -36,7 +36,7 @@
 BuildRequires: gnome-desktop-devel nautilus-cd-burner-devel ndesk-dbus-glib-devel
 
 # Misc
-BuildRequires: gettext-devel perl(XML::Parser)
+BuildRequires: gettext-devel intltool perl(XML::Parser)
 
 # No boo-devel for ppc but we owe it to the users to keep banshee up to date
 %ifarch  %ix86 x86_64 sparc



From mnagy at fedoraproject.org  Fri Jan 23 19:21:10 2009
From: mnagy at fedoraproject.org (Martin Nagy)
Date: Fri, 23 Jan 2009 19:21:10 +0000 (UTC)
Subject: rpms/vsftpd/devel .cvsignore, 1.15, 1.16 sources, 1.15,
	1.16 vsftpd.spec, 1.85, 1.86 vsftpd-2.1.0-disable_ptrace.patch,
	1.1, NONE vsftpd-2.1.0-warnings.patch, 1.2, NONE
Message-ID: <20090123192110.ED75C700FE@cvs1.fedora.phx.redhat.com>

Author: mnagy

Update of /cvs/extras/rpms/vsftpd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15999

Modified Files:
	.cvsignore sources vsftpd.spec 
Removed Files:
	vsftpd-2.1.0-disable_ptrace.patch vsftpd-2.1.0-warnings.patch 
Log Message:
* Fri Jan 23 2009 Martin Nagy <mnagy at redhat.com> - 2.1.0-0.3.pre4
- update to latest upstream release
- enable ptrace sandbox again
- don't mark vsftpd_conf_migrate.sh as a config file



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/vsftpd/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	16 Jan 2009 17:23:11 -0000	1.15
+++ .cvsignore	23 Jan 2009 19:20:40 -0000	1.16
@@ -1 +1 @@
-vsftpd-2.1.0pre3.tar.gz
+vsftpd-2.1.0pre4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/vsftpd/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	16 Jan 2009 17:23:11 -0000	1.15
+++ sources	23 Jan 2009 19:20:40 -0000	1.16
@@ -1 +1 @@
-6e968036b3575253f384e06f7b4ddd57  vsftpd-2.1.0pre3.tar.gz
+ec4ded9c2708165087390a1f647c42ec  vsftpd-2.1.0pre4.tar.gz


Index: vsftpd.spec
===================================================================
RCS file: /cvs/extras/rpms/vsftpd/devel/vsftpd.spec,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -r1.85 -r1.86
--- vsftpd.spec	16 Jan 2009 18:14:14 -0000	1.85
+++ vsftpd.spec	23 Jan 2009 19:20:40 -0000	1.86
@@ -2,14 +2,14 @@
 
 Name: vsftpd
 Version: 2.1.0
-Release: 0.2.pre3%{?dist}
+Release: 0.3.pre4%{?dist}
 Summary: Very Secure Ftp Daemon
 
 Group: System Environment/Daemons
 # OpenSSL link exception
 License: GPLv2 with exceptions
 URL: http://vsftpd.beasts.org/
-Source0: ftp://vsftpd.beasts.org/users/cevans/%{name}-%{version}pre3.tar.gz
+Source0: ftp://vsftpd.beasts.org/users/cevans/%{name}-%{version}pre4.tar.gz
 Source1: vsftpd.xinetd
 Source2: vsftpd.pam
 Source3: vsftpd.ftpusers
@@ -46,11 +46,6 @@
 Patch8: vsftpd-2.0.5-greedy.patch
 Patch9: vsftpd-2.1.0-userlist_log.patch
 
-# Sent upstream on 2009-01-16 via email
-Patch10: vsftpd-2.1.0-warnings.patch
-
-Patch11: vsftpd-2.1.0-disable_ptrace.patch
-
 
 %description
 vsftpd is a Very Secure FTP daemon. It was written completely from
@@ -72,8 +67,6 @@
 %patch7 -p1 -b .filter
 %patch8 -p1 -b .greedy
 %patch9 -p1 -b .userlist_log
-%patch10 -p1 -b .warnings
-%patch11 -p1 -b .disable_ptrace
 
 
 %build
@@ -95,7 +88,7 @@
 install -m 600 vsftpd.conf $RPM_BUILD_ROOT%{_sysconfdir}/vsftpd/vsftpd.conf
 install -m 644 vsftpd.conf.5 $RPM_BUILD_ROOT/%{_mandir}/man5/
 install -m 644 vsftpd.8 $RPM_BUILD_ROOT/%{_mandir}/man8/
-install -m 644 RedHat/vsftpd.log $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/vsftpd.log
+install -m 644 RedHat/vsftpd.log $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/vsftpd
 install -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/vsftpd
 install -m 600 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/vsftpd/ftpusers
 install -m 600 %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/vsftpd/user_list
@@ -111,7 +104,6 @@
 
 %post
 /sbin/chkconfig --add vsftpd
-#/usr/sbin/usermod -d /var/ftp ftp >/dev/null 2>&1 || :
 
 
 %preun
@@ -126,16 +118,25 @@
 %{_sbindir}/vsftpd
 %{_sysconfdir}/rc.d/init.d/vsftpd
 %dir %{_sysconfdir}/vsftpd
-%config(noreplace) %{_sysconfdir}/vsftpd/*
+%{_sysconfdir}/vsftpd/vsftpd_conf_migrate.sh
+%config(noreplace) %{_sysconfdir}/vsftpd/ftpusers
+%config(noreplace) %{_sysconfdir}/vsftpd/user_list
+%config(noreplace) %{_sysconfdir}/vsftpd/vsftpd.conf
 %config(noreplace) %{_sysconfdir}/pam.d/vsftpd
-%config(noreplace) %{_sysconfdir}/logrotate.d/vsftpd.log
-%doc FAQ INSTALL BUGS AUDIT Changelog LICENSE README README.security REWARD SPEED TODO BENCHMARKS COPYING SECURITY/ EXAMPLE/ TUNING SIZE vsftpd.xinetd
+%config(noreplace) %{_sysconfdir}/logrotate.d/vsftpd
+%doc FAQ INSTALL BUGS AUDIT Changelog LICENSE README README.security REWARD
+%doc SPEED TODO BENCHMARKS COPYING SECURITY/ EXAMPLE/ TUNING SIZE vsftpd.xinetd
 %{_mandir}/man5/vsftpd.conf.*
 %{_mandir}/man8/vsftpd.*
 %{_var}/ftp
 
 
 %changelog
+* Fri Jan 23 2009 Martin Nagy <mnagy at redhat.com> - 2.1.0-0.3.pre4
+- update to latest upstream release
+- enable ptrace sandbox again
+- don't mark vsftpd_conf_migrate.sh as a config file
+
 * Fri Jan 16 2009 Martin Nagy <mnagy at redhat.com> - 2.1.0-0.2.pre3
 - disable ptrace sandbox to fix build on i386
 


--- vsftpd-2.1.0-disable_ptrace.patch DELETED ---


--- vsftpd-2.1.0-warnings.patch DELETED ---



From behdad at fedoraproject.org  Fri Jan 23 19:21:55 2009
From: behdad at fedoraproject.org (Behdad Esfahbod)
Date: Fri, 23 Jan 2009 19:21:55 +0000 (UTC)
Subject: rpms/fontconfig/devel .cvsignore, 1.34, 1.35 fontconfig.spec, 1.116,
	1.117 sources, 1.35, 1.36
Message-ID: <20090123192155.2E7C9700FE@cvs1.fedora.phx.redhat.com>

Author: behdad

Update of /cvs/pkgs/rpms/fontconfig/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16180

Modified Files:
	.cvsignore fontconfig.spec sources 
Log Message:
* Fri Jan 23 2009 Behdad Esfahbod <besfahbo at redhat.com> -
* 2.6.94-1.git.65.g628ee83
- Update to 2.6.94-1.git.65.g628ee83



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fontconfig/devel/.cvsignore,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- .cvsignore	21 Jan 2009 01:17:23 -0000	1.34
+++ .cvsignore	23 Jan 2009 19:21:24 -0000	1.35
@@ -1 +1 @@
-fontconfig-2.6.93.tar.gz
+fontconfig-2.6.94.tar.gz


Index: fontconfig.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fontconfig/devel/fontconfig.spec,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -r1.116 -r1.117
--- fontconfig.spec	21 Jan 2009 01:17:23 -0000	1.116
+++ fontconfig.spec	23 Jan 2009 19:21:24 -0000	1.117
@@ -2,8 +2,8 @@
 
 Summary: Font configuration and customization library
 Name: fontconfig
-Version: 2.6.93
-Release: 1.git.64.g6aa4dce%{?dist}
+Version: 2.6.94
+Release: 1.git.65.g628ee83%{?dist}
 License: MIT
 Group: System Environment/Libraries
 Source: http://fontconfig.org/release/fontconfig-%{version}.tar.gz
@@ -131,6 +131,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Fri Jan 23 2009 Behdad Esfahbod <besfahbo at redhat.com> - 2.6.94-1.git.65.g628ee83
+- Update to 2.6.94-1.git.65.g628ee83
+
 * Mon Jan 20 2009 Behdad Esfahbod <besfahbo at redhat.com> - 2.6.93-1.git.64.g6aa4dce
 - Update to 2.6.93-1.git.64.g6aa4dce
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fontconfig/devel/sources,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- sources	21 Jan 2009 01:17:23 -0000	1.35
+++ sources	23 Jan 2009 19:21:24 -0000	1.36
@@ -1 +1 @@
-f5050687560a61a87781c34fdf6a65d9  fontconfig-2.6.93.tar.gz
+ba79ff72570a91698fb2f76ef255e5e4  fontconfig-2.6.94.tar.gz



From rdieter at fedoraproject.org  Fri Jan 23 19:25:26 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 23 Jan 2009 19:25:26 +0000 (UTC)
Subject: rpms/xine-lib/F-10 xine-lib-1.1.15-avsync_hack.patch, NONE,
	1.1 .cvsignore, 1.18, 1.19 sources, 1.19, 1.20 xine-lib.spec,
	1.53, 1.54
Message-ID: <20090123192526.16D3A700FE@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/xine-lib/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16886

Modified Files:
	.cvsignore sources xine-lib.spec 
Added Files:
	xine-lib-1.1.15-avsync_hack.patch 
Log Message:
* Fri Jan 23 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.1.16.1-1
- xine-lib-1.1.16.1
- include avsync patch (#470568)


xine-lib-1.1.15-avsync_hack.patch:

--- NEW FILE xine-lib-1.1.15-avsync_hack.patch ---
diff -uNr xine-lib-1.1.15.orig/src/xine-engine/audio_out.c xine-lib-1.1.15/src/xine-engine/audio_out.c
--- xine-lib-1.1.15.orig/src/xine-engine/audio_out.c	2008-07-10 18:19:10.000000000 +0200
+++ xine-lib-1.1.15/src/xine-engine/audio_out.c	2009-01-10 21:57:20.000000000 +0100
@@ -1151,8 +1151,17 @@
   
     /*
      * calculate gap:
+     *
+     * HACK (rwa): If we have no video stream we do not need an AV sync and so
+     *             we assume a gap of 0. This seems to avoid the skips in the
+     *             first seconds when playing audio-only via the "glitch-free"
+     *             pulseaudio server.
      */
-    gap = in_buf->vpts - hw_vpts;
+    if (in_buf && in_buf->stream && in_buf->stream->video_decoder_plugin) {
+	gap = in_buf->vpts - hw_vpts;
+    } else {
+	gap = 0;
+    }
     lprintf ("hw_vpts : %" PRId64 " buffer_vpts : %" PRId64 " gap : %" PRId64 "\n",
              hw_vpts, in_buf->vpts, gap);
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xine-lib/F-10/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- .cvsignore	7 Jan 2009 20:22:35 -0000	1.18
+++ .cvsignore	23 Jan 2009 19:24:55 -0000	1.19
@@ -1,2 +1,2 @@
-xine-lib-1.1.16-autotools.patch.bz2
-xine-lib-1.1.16-pruned.tar.bz2
+xine-lib-1.1.16.1-autotools.patch.bz2
+xine-lib-1.1.16.1-pruned.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xine-lib/F-10/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources	7 Jan 2009 20:22:35 -0000	1.19
+++ sources	23 Jan 2009 19:24:55 -0000	1.20
@@ -1,2 +1,2 @@
-fe8148f2a0ec7b2e75ad509e8086e33f  xine-lib-1.1.16-autotools.patch.bz2
-512f31d8414ef4654ca366c0dce37301  xine-lib-1.1.16-pruned.tar.bz2
+e3e061f93f36eae910b66cb0c973dbb8  xine-lib-1.1.16.1-autotools.patch.bz2
+aa1265b1007086c0906ec8134cfeacf6  xine-lib-1.1.16.1-pruned.tar.bz2


Index: xine-lib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xine-lib/F-10/xine-lib.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- xine-lib.spec	18 Jan 2009 21:40:56 -0000	1.53
+++ xine-lib.spec	23 Jan 2009 19:24:55 -0000	1.54
@@ -19,12 +19,10 @@
 
 %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
@@ -35,8 +33,8 @@
 
 Summary:        Xine library
 Name:           xine-lib
-Version:        1.1.16
-Release:        2%{?dist}
+Version:        1.1.16.1
+Release:        1%{?dist}
 License:        GPLv2+
 Group:          System Environment/Libraries
 URL:            http://xinehq.de/
@@ -52,7 +50,10 @@
 
 Patch1:         %{name}-1.1.4-optflags.patch
 Patch6:         %{name}-1.1.1-deepbind-939.patch
+# FIXME for 1.1.16.1 ?
 Patch7:         %{name}-1.1.16-old-caca.patch
+# http://bugzilla.redhat.com/470568
+Patch8:         xine-lib-1.1.15-avsync_hack.patch
 ## upstream patches
 
 Provides:       xine-lib(plugin-abi) = %{abiver}
@@ -72,13 +73,11 @@
 %if %{with_aalib}
 BuildRequires:  aalib-devel >= 1.4
 %endif # aalib
-%if %{with_caca}
 %if 0%{?old_caca}
 BuildRequires:  libcaca-devel >= 0.99
 %else
-BuildRequires:  libcaca-devel >= 0.99-0.5.beta16
+BuildRequires:  libcaca-devel >= 0.99-0.5.beta14
 %endif
-%endif # caca
 %if 0%{!?_without_directfb:1}
 BuildRequires:  directfb-devel
 %endif # directfb
@@ -125,7 +124,7 @@
 disk drives, and displays multimedia streamed over the Internet. It
 interprets many of the most common multimedia formats available - and some
 of the most uncommon formats, too.  --with/--without rpmbuild options
-(some default values depend on target distribution): aalib, caca, directfb,
+(some default values depend on target distribution): aalib, directfb,
 imagemagick, freetype, antialiasing (with freetype), pulseaudio, xcb.
 
 %package        devel
@@ -177,9 +176,7 @@
 %if %{with_aalib}
   - AA-lib
 %endif # aalib
-%if %{with_caca}
   - Libcaca
-%endif # caca
 %if 0%{!?_without_imagemagick:1}
   - Image decoding
 %endif # imagemagick
@@ -198,10 +195,13 @@
 # needed at least when compiling with external ffmpeg and internal faad livna bug#939.
 # see also http://bugzilla.redhat.com/480504 for side-effects
 #patch6 -p1 -b .deepbind
+
 %if 0%{?old_caca}
 %patch7 -p0 -b .old-caca
 %endif
 
+%patch8 -p1 -b .avsync_hack
+
 # Avoid standard rpaths on lib64 archs: (autotools patch should handle this, no? -- Rex )
 #sed -i -e 's|"/lib /usr/lib\b|"/%{_lib} %{_libdir}|' configure
 
@@ -226,6 +226,7 @@
 %if 0%{?_with_freetype:1}
 %if 0%{?_with_antialiasing:1}
     --enable-antialiasing \
+    --with-caca \
 %endif # antialiasing
     --with-freetype \
     --with-fontconfig \
@@ -411,9 +412,7 @@
 %if %{with_aalib}
 %{_libdir}/xine/plugins/%{abiver}/xineplug_vo_out_aa.so
 %endif # aalib
-%if %{with_caca}
 %{_libdir}/xine/plugins/%{abiver}/xineplug_vo_out_caca.so
-%endif # caca
 %if 0%{!?_without_directfb:1}
 %{_libdir}/xine/plugins/%{abiver}/xineplug_vo_out_directfb.so
 %{_libdir}/xine/plugins/%{abiver}/xineplug_vo_out_xdirectfb.so
@@ -435,8 +434,13 @@
 
 
 %changelog
+* Fri Jan 23 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.1.16.1-1
+- xine-lib-1.1.16.1
+- include avsync patch (#470568)
+
 * Sun Jan 18 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.1.16-2
 - drop deepbind patch (#480504)
+- caca support (EPEL)
 
 * Wed Jan 07 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 1.1.16-1.1
 - patch for old libcaca in F9-



From sandeen at fedoraproject.org  Fri Jan 23 19:28:40 2009
From: sandeen at fedoraproject.org (Eric Sandeen)
Date: Fri, 23 Jan 2009 19:28:40 +0000 (UTC)
Subject: rpms/kernel/devel linux-2.6.29-btrfs-selinux.patch, NONE,
	1.1 config-generic, 1.224, 1.225 kernel.spec, 1.1226, 1.1227
Message-ID: <20090123192840.BDA9E700FE@cvs1.fedora.phx.redhat.com>

Author: sandeen

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17440

Modified Files:
	config-generic kernel.spec 
Added Files:
	linux-2.6.29-btrfs-selinux.patch 
Log Message:
* Fri Jan 23 2009 Eric Sandeen <sandeen at redhat.com>
- build the crc32c driver into the kernel
- add selinux fixes for btrfs


linux-2.6.29-btrfs-selinux.patch:

--- NEW FILE linux-2.6.29-btrfs-selinux.patch ---
Add call to LSM security initialization and save
resulting security xattr for new inodes.

Add xattr support to symlink inode ops.

Set inode->i_op for existing special files.

Signed-off-by: jim owens <jowens at hp.com>
---
  fs/btrfs/inode.c |   23 +++++++++++++++++++----
  fs/btrfs/xattr.c |   32 ++++++++++++++++++++++++++++++++
  fs/btrfs/xattr.h |    2 ++
  3 files changed, 53 insertions(+), 4 deletions(-)

Index: linux/fs/btrfs/inode.c
===================================================================
--- linux.orig/fs/btrfs/inode.c
+++ linux/fs/btrfs/inode.c
@@ -91,6 +91,16 @@ static noinline int cow_file_range(struc
 				   u64 start, u64 end, int *page_started,
 				   unsigned long *nr_written, int unlock);
 
+static int btrfs_init_inode_security(struct inode *inode,  struct inode *dir)
+{
+	int err;
+
+	err = btrfs_init_acl(inode, dir);
+	if (!err)
+		err = btrfs_xattr_security_init(inode, dir);
+	return err;
+}
+
 /*
  * a very lame attempt at stopping writes when the FS is 85% full.  There
  * are countless ways this is incorrect, but it is better than nothing.
@@ -2039,6 +2049,7 @@ void btrfs_read_locked_inode(struct inod
 		inode->i_mapping->backing_dev_info = &root->fs_info->bdi;
 		break;
 	default:
+		inode->i_op = &btrfs_special_inode_operations;
 		init_special_inode(inode, inode->i_mode, rdev);
 		break;
 	}
@@ -3586,7 +3597,7 @@ static int btrfs_mknod(struct inode *dir
 	if (IS_ERR(inode))
 		goto out_unlock;
 
-	err = btrfs_init_acl(inode, dir);
+	err = btrfs_init_inode_security(inode, dir);
 	if (err) {
 		drop_inode = 1;
 		goto out_unlock;
@@ -3649,7 +3660,7 @@ static int btrfs_create(struct inode *di
 	if (IS_ERR(inode))
 		goto out_unlock;
 
-	err = btrfs_init_acl(inode, dir);
+	err = btrfs_init_inode_security(inode, dir);
 	if (err) {
 		drop_inode = 1;
 		goto out_unlock;
@@ -3772,7 +3783,7 @@ static int btrfs_mkdir(struct inode *dir
 
 	drop_on_err = 1;
 
-	err = btrfs_init_acl(inode, dir);
+	err = btrfs_init_inode_security(inode, dir);
 	if (err)
 		goto out_fail;
 
@@ -4733,7 +4744,7 @@ static int btrfs_symlink(struct inode *d
 	if (IS_ERR(inode))
 		goto out_unlock;
 
-	err = btrfs_init_acl(inode, dir);
+	err = btrfs_init_inode_security(inode, dir);
 	if (err) {
 		drop_inode = 1;
 		goto out_unlock;
@@ -5032,4 +5043,8 @@ static struct inode_operations btrfs_sym
 	.follow_link	= page_follow_link_light,
 	.put_link	= page_put_link,
 	.permission	= btrfs_permission,
+	.setxattr	= btrfs_setxattr,
+	.getxattr	= btrfs_getxattr,
+	.listxattr	= btrfs_listxattr,
+	.removexattr	= btrfs_removexattr,
 };
Index: linux/fs/btrfs/xattr.c
===================================================================
--- linux.orig/fs/btrfs/xattr.c
+++ linux/fs/btrfs/xattr.c
@@ -21,6 +21,7 @@
 #include <linux/slab.h>
 #include <linux/rwsem.h>
 #include <linux/xattr.h>
+#include <linux/security.h>
 #include "ctree.h"
 #include "btrfs_inode.h"
 #include "transaction.h"
@@ -320,3 +321,34 @@ int btrfs_removexattr(struct dentry *den
 		return -EOPNOTSUPP;
 	return __btrfs_setxattr(dentry->d_inode, name, NULL, 0, XATTR_REPLACE);
 }
+
+int btrfs_xattr_security_init(struct inode *inode, struct inode *dir)
+{
+	int err;
+	size_t len;
+	void *value;
+	char *suffix;
+	char *name;
+
+	err = security_inode_init_security(inode, dir, &suffix, &value, &len);
+	if (err) {
+		if (err == -EOPNOTSUPP)
+			return 0;
+		return err;
+	}
+
+	name = kmalloc(XATTR_SECURITY_PREFIX_LEN + strlen(suffix) + 1,
+		       GFP_NOFS);
+	if (!name) {
+		err = -ENOMEM;
+	} else {
+		strcpy(name, XATTR_SECURITY_PREFIX);
+		strcpy(name + XATTR_SECURITY_PREFIX_LEN, suffix);
+		err = __btrfs_setxattr(inode, name, value, len, 0);
+		kfree(name);
+	}
+
+	kfree(suffix);
+	kfree(value);
+	return err;
+}
Index: linux/fs/btrfs/xattr.h
===================================================================
--- linux.orig/fs/btrfs/xattr.h
+++ linux/fs/btrfs/xattr.h
@@ -36,4 +36,6 @@ extern int btrfs_setxattr(struct dentry 
 		const void *value, size_t size, int flags);
 extern int btrfs_removexattr(struct dentry *dentry, const char *name);
 
+extern int btrfs_xattr_security_init(struct inode *inode, struct inode *dir);
+
 #endif /* __XATTR__ */



Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-generic,v
retrieving revision 1.224
retrieving revision 1.225
diff -u -r1.224 -r1.225
--- config-generic	16 Jan 2009 21:34:24 -0000	1.224
+++ config-generic	23 Jan 2009 19:28:10 -0000	1.225
@@ -3355,7 +3355,7 @@
 CONFIG_CRYPTO_CAST6=m
 CONFIG_CRYPTO_CBC=m
 CONFIG_CRYPTO_CCM=m
-CONFIG_CRYPTO_CRC32C=m
+CONFIG_CRYPTO_CRC32C=y
 CONFIG_CRYPTO_CTR=m
 CONFIG_CRYPTO_CTS=m
 CONFIG_CRYPTO_DEFLATE=m


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1226
retrieving revision 1.1227
diff -u -r1.1226 -r1.1227
--- kernel.spec	23 Jan 2009 18:48:42 -0000	1.1226
+++ kernel.spec	23 Jan 2009 19:28:10 -0000	1.1227
@@ -664,6 +664,9 @@
 Patch9001: revert-fix-modules_install-via-nfs.patch
 Patch9002: linux-2.6-defaults-intel_iommu-off.patch
 
+# Hook up proper selinux bits for btrfs
+Patch9003: linux-2.6.29-btrfs-selinux.patch
+
 %endif
 
 BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -1059,6 +1062,9 @@
 
 # xfs
 
+# btrfs
+ApplyPatch linux-2.6.29-btrfs-selinux.patch
+
 # USB
 
 # ACPI
@@ -1745,6 +1751,10 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Fri Jan 23 2009 Eric Sandeen <sandeen at redhat.com>
+- build the crc32c driver into the kernel
+- add selinux fixes for btrfs
+
 * Fri Jan 23 2009 Kyle McMartin <kyle at redhat.com>
 - disable intel_iommu by default (enable with "intel_iommu=on")
 



From jamatos at fedoraproject.org  Fri Jan 23 19:36:32 2009
From: jamatos at fedoraproject.org (=?utf-8?q?Jos=C3=A9_Ab=C3=ADlio_Oliveira_Matos?=)
Date: Fri, 23 Jan 2009 19:36:32 +0000 (UTC)
Subject: rpms/grace/EL-5 grace.spec,1.17,1.18 sources,1.6,1.7
Message-ID: <20090123193632.C8EE2700FE@cvs1.fedora.phx.redhat.com>

Author: jamatos

Update of /cvs/pkgs/rpms/grace/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19174

Modified Files:
	grace.spec sources 
Log Message:
* Fri Jan 23 2009 Jos?? Matos <jamatos at fc.up.pt> - 5.1.22-1
- Upstream release (bug fixes).



Index: grace.spec
===================================================================
RCS file: /cvs/pkgs/rpms/grace/EL-5/grace.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- grace.spec	25 Jan 2008 09:10:05 -0000	1.17
+++ grace.spec	23 Jan 2009 19:36:02 -0000	1.18
@@ -2,12 +2,12 @@
 %define type1fontdir fonts/default/Type1
 
 Name:           grace
-Version:        5.1.21
-Release:        8%{?dist}
+Version:        5.1.22
+Release:        1%{?dist}
 Summary:        Numerical Data Processing and Visualization Tool
 
 License:        GPLv2+
-# cephes is LGPL, see also Source3 and Source4 
+# cephes is LGPL, see also Source3 and Source4
 URL:            http://plasma-gate.weizmann.ac.il/Grace/
 Source0:        ftp://plasma-gate.weizmann.ac.il/pub/grace/src/grace5/%{name}-%{version}.tar.gz
 Source1:        %{name}.desktop
@@ -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
 
@@ -63,7 +63,7 @@
 %patch0
 %patch1
 
-# avoid duplicating debian patch 
+# avoid duplicating debian patch
 %patch2 -p1
 patch -p0 < debian/patches/tmpnam_to_mkstemp.diff
 
@@ -85,7 +85,7 @@
     --with-extra-incpath=%{_includedir}/netcdf-3 \
     --with-extra-ldpath=%{_libdir}/netcdf-3 \
     --with-bundled-xbae=no
-    
+
 make %{?_smp_mflags}
 
 
@@ -203,9 +203,9 @@
 
 %files
 %defattr(-,root,root,-)
-%doc ChangeLog CHANGES COPYRIGHT DEVELOPERS LICENSE README 
+%doc ChangeLog CHANGES COPYRIGHT DEVELOPERS LICENSE README
 %doc cephes-license.email LICENSE.cephes
-%doc examples/ __dist_doc/doc/ 
+%doc examples/ __dist_doc/doc/
 %config(noreplace) %{_sysconfdir}/%{name}/
 %{_bindir}/*
 %{_datadir}/%{name}
@@ -225,6 +225,9 @@
 
 
 %changelog
+* Fri Jan 23 2009 Jos?? Matos <jamatos at fc.up.pt> - 5.1.22-1
+- Upstream release (bug fixes).
+
 * Wed Jan 23 2008 Patrice Dumas <pertusus[AT]free.fr> - 5.1.21-8
 - correct netcdf detection patch, thanks Jos??.
 
@@ -315,7 +318,7 @@
 * Sat Sep  3 2005 Patrice Dumas <dumas[AT]centre-cired.fr> - 5.1.18-3
 - cleanup licences
 - put examples/ and doc/ in %%doc
-- remove duplicate manpages 
+- remove duplicate manpages
 - add patch to change fdf2fit path in graderc
 
 * Sun Aug 21 2005 Jos?? Matos <jamatos[AT]fc.up.pt> - 5.1.18-2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/grace/EL-5/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	25 Jan 2008 09:10:05 -0000	1.6
+++ sources	23 Jan 2009 19:36:02 -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 rdieter at fedoraproject.org  Fri Jan 23 19:54:13 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 23 Jan 2009 19:54:13 +0000 (UTC)
Subject: rpms/xine-lib/EL-5 xine-lib-1.1.15-avsync_hack.patch, NONE,
	1.1 .cvsignore, 1.10, 1.11 sources, 1.10, 1.11 xine-lib.spec,
	1.23, 1.24
Message-ID: <20090123195413.340D9700FE@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-serv21344

Modified Files:
	.cvsignore sources xine-lib.spec 
Added Files:
	xine-lib-1.1.15-avsync_hack.patch 
Log Message:
* Fri Jan 23 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.1.16.1-1
- xine-lib-1.1.16.1
- include avsync patch (#470568)


xine-lib-1.1.15-avsync_hack.patch:

--- NEW FILE xine-lib-1.1.15-avsync_hack.patch ---
diff -uNr xine-lib-1.1.15.orig/src/xine-engine/audio_out.c xine-lib-1.1.15/src/xine-engine/audio_out.c
--- xine-lib-1.1.15.orig/src/xine-engine/audio_out.c	2008-07-10 18:19:10.000000000 +0200
+++ xine-lib-1.1.15/src/xine-engine/audio_out.c	2009-01-10 21:57:20.000000000 +0100
@@ -1151,8 +1151,17 @@
   
     /*
      * calculate gap:
+     *
+     * HACK (rwa): If we have no video stream we do not need an AV sync and so
+     *             we assume a gap of 0. This seems to avoid the skips in the
+     *             first seconds when playing audio-only via the "glitch-free"
+     *             pulseaudio server.
      */
-    gap = in_buf->vpts - hw_vpts;
+    if (in_buf && in_buf->stream && in_buf->stream->video_decoder_plugin) {
+	gap = in_buf->vpts - hw_vpts;
+    } else {
+	gap = 0;
+    }
     lprintf ("hw_vpts : %" PRId64 " buffer_vpts : %" PRId64 " gap : %" PRId64 "\n",
              hw_vpts, in_buf->vpts, gap);
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xine-lib/EL-5/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	7 Jan 2009 21:38:05 -0000	1.10
+++ .cvsignore	23 Jan 2009 19:53:42 -0000	1.11
@@ -1,2 +1,2 @@
-xine-lib-1.1.16-autotools.patch.bz2
-xine-lib-1.1.16-pruned.tar.bz2
+xine-lib-1.1.16.1-autotools.patch.bz2
+xine-lib-1.1.16.1-pruned.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xine-lib/EL-5/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	7 Jan 2009 21:38:05 -0000	1.10
+++ sources	23 Jan 2009 19:53:42 -0000	1.11
@@ -1,2 +1,2 @@
-fe8148f2a0ec7b2e75ad509e8086e33f  xine-lib-1.1.16-autotools.patch.bz2
-512f31d8414ef4654ca366c0dce37301  xine-lib-1.1.16-pruned.tar.bz2
+e3e061f93f36eae910b66cb0c973dbb8  xine-lib-1.1.16.1-autotools.patch.bz2
+aa1265b1007086c0906ec8134cfeacf6  xine-lib-1.1.16.1-pruned.tar.bz2


Index: xine-lib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xine-lib/EL-5/xine-lib.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- xine-lib.spec	18 Jan 2009 22:34:43 -0000	1.23
+++ xine-lib.spec	23 Jan 2009 19:53:42 -0000	1.24
@@ -33,8 +33,8 @@
 
 Summary:        Xine library
 Name:           xine-lib
-Version:        1.1.16
-Release:        2%{?dist}
+Version:        1.1.16.1
+Release:        1%{?dist}
 License:        GPLv2+
 Group:          System Environment/Libraries
 URL:            http://xinehq.de/
@@ -50,7 +50,10 @@
 
 Patch1:         %{name}-1.1.4-optflags.patch
 Patch6:         %{name}-1.1.1-deepbind-939.patch
+# FIXME for 1.1.16.1 ?
 Patch7:         %{name}-1.1.16-old-caca.patch
+# http://bugzilla.redhat.com/470568
+Patch8:         xine-lib-1.1.15-avsync_hack.patch
 ## upstream patches
 
 Provides:       xine-lib(plugin-abi) = %{abiver}
@@ -73,7 +76,7 @@
 %if 0%{?old_caca}
 BuildRequires:  libcaca-devel >= 0.99
 %else
-BuildRequires:  libcaca-devel >= 0.99-0.5.beta16
+BuildRequires:  libcaca-devel >= 0.99-0.5.beta14
 %endif
 %if 0%{!?_without_directfb:1}
 BuildRequires:  directfb-devel
@@ -192,10 +195,13 @@
 # needed at least when compiling with external ffmpeg and internal faad livna bug#939.
 # see also http://bugzilla.redhat.com/480504 for side-effects
 #patch6 -p1 -b .deepbind
+
 %if 0%{?old_caca}
 %patch7 -p0 -b .old-caca
 %endif
 
+%patch8 -p1 -b .avsync_hack
+
 # Avoid standard rpaths on lib64 archs: (autotools patch should handle this, no? -- Rex )
 #sed -i -e 's|"/lib /usr/lib\b|"/%{_lib} %{_libdir}|' configure
 
@@ -428,6 +434,10 @@
 
 
 %changelog
+* Fri Jan 23 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.1.16.1-1
+- xine-lib-1.1.16.1
+- include avsync patch (#470568)
+
 * Sun Jan 18 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.1.16-2
 - drop deepbind patch (#480504)
 - caca support (EPEL)



From jeffg at fedoraproject.org  Fri Jan 23 20:09:20 2009
From: jeffg at fedoraproject.org (Jeff Gilchrist)
Date: Fri, 23 Jan 2009 20:09:20 +0000 (UTC)
Subject: rpms/pbzip2/F-9 import.log, NONE, 1.1 .cvsignore, 1.7,
	1.8 pbzip2.spec, 1.13, 1.14 sources, 1.7, 1.8
Message-ID: <20090123200920.EDA61700FE@cvs1.fedora.phx.redhat.com>

Author: jeffg

Update of /cvs/pkgs/rpms/pbzip2/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23972/F-9

Modified Files:
	.cvsignore pbzip2.spec sources 
Added Files:
	import.log 
Log Message:
Major enhancements from upstream


--- NEW FILE import.log ---
pbzip2-1_0_5-1:F-9:pbzip2-1.0.5-1.src.rpm:1232741276


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pbzip2/F-9/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	26 Jul 2007 17:16:26 -0000	1.7
+++ .cvsignore	23 Jan 2009 20:08:50 -0000	1.8
@@ -1 +1 @@
-pbzip2-1.0.2.tar.gz
+pbzip2-1.0.5.tar.gz


Index: pbzip2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pbzip2/F-9/pbzip2.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- pbzip2.spec	10 Feb 2008 12:25:45 -0000	1.13
+++ pbzip2.spec	23 Jan 2009 20:08:50 -0000	1.14
@@ -1,12 +1,16 @@
 Name:		pbzip2
-Version:	1.0.2
-Release:	4%{?dist}
+Version:	1.0.5
+Release:	1%{?dist}
 Summary:	Parallel implementation of bzip2
 URL:		http://www.compression.ca/pbzip2/
 License:	BSD
 Group:		Applications/File
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:	bzip2-devel
+%if %{?suse_version:1}0
+BuildRequires:  bzip2
+%else
+BuildRequires:  bzip2-devel
+%endif
 Source0:	http://www.compression.ca/pbzip2/%{name}-%{version}.tar.gz
 
 %description
@@ -19,7 +23,7 @@
 
 %prep
 %setup -q
-sed -i -e 's/ -O3 / %{optflags} /' Makefile
+sed -i -e 's/ -O2/ %{optflags} /' Makefile
 
 
 %build
@@ -31,6 +35,7 @@
 install -D -m755 %{name} %{buildroot}%{_bindir}/%{name}
 install -D -m644 %{name}.1 %{buildroot}%{_mandir}/man1/%{name}.1
 ln -sf ./%{name} %{buildroot}%{_bindir}/pbunzip2
+ln -sf ./%{name} %{buildroot}%{_bindir}/pbzcat
 
 
 %clean
@@ -42,15 +47,21 @@
 %doc AUTHORS ChangeLog COPYING README
 %{_bindir}/%{name}
 %{_bindir}/pbunzip2
+%{_bindir}/pbzcat
 %{_mandir}/man1/*
 
 
 %changelog
-* Sun Feb 10 2008 Jeff Gilchrist <pbzip2 at compression.ca> - 1.0.2-4
-- Rebuild for gcc 4.3
+* Fri Jan 8 2009 Jeff Gilchrist <pbzip2 at compression.ca> - 1.0.5-1
+- Release 1.0.5
 
-* Wed Aug 29 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 1.0.2-3
-- Rebuild for selinux ppc32 issue.
+* Fri Dec 21 2008 Jeff Gilchrist <pbzip2 at compression.ca> - 1.0.4-1
+- Release 1.0.4
+
+* Tue Oct 31 2008 Jeff Gilchrist <pbzip2 at compression.ca> - 1.0.3-1
+- Release 1.0.3
+- Added support for SUSE RPM build
+- Added symlink for pbzcat
 
 * Thu Jul 26 2007 Jeff Gilchrist <pbzip2 at compression.ca> - 1.0.2-2
 - Fixed symbolic link for pbunzip2 file


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pbzip2/F-9/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	26 Jul 2007 17:16:26 -0000	1.7
+++ sources	23 Jan 2009 20:08:50 -0000	1.8
@@ -1 +1 @@
-2f58b4e844c74d0c98b98326c6a3945f  pbzip2-1.0.2.tar.gz
+e2448d22ee29d1e6549ac58b98df11ab  pbzip2-1.0.5.tar.gz



From rdieter at fedoraproject.org  Fri Jan 23 20:10:23 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 23 Jan 2009 20:10:23 +0000 (UTC)
Subject: rpms/libmsn/devel libmsn.spec,1.6,1.7
Message-ID: <20090123201023.22427700FE@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/libmsn/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24172

Modified Files:
	libmsn.spec 
Log Message:
* Fri Jan 23 2009 Rex Dieter <rdieter at fedoraproject.org> 4.0-0.9.beta2
- revert use of (tm)



Index: libmsn.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libmsn/devel/libmsn.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- libmsn.spec	23 Jan 2009 16:59:42 -0000	1.6
+++ libmsn.spec	23 Jan 2009 20:09:52 -0000	1.7
@@ -3,7 +3,7 @@
 
 Name:		libmsn
 Version:	4.0
-Release:	0.8.%{beta}%{?dist}
+Release:	0.9.%{beta}%{?dist}
 
 Group:		System Environment/Libraries
 License:	GPLv2
@@ -11,7 +11,7 @@
 Source0:	http://downloads.sourceforge.net/%{name}/%{name}-%{version}%{?beta:-%{beta}}.tar.bz2
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Summary:	Library for connecting to the MSN(tm) Messenger service
+Summary:	Library for connecting to the MSN Messenger service
 
 BuildRequires:	cmake
 BuildRequires:	openssl-devel
@@ -19,7 +19,7 @@
 
 %description
 Libmsn is a reusable, open-source, fully documented library for connecting to
-the MSN(tm) Messenger service.
+the MSN Messenger service.
 
 %package	devel
 Summary:	Development files for %{name}
@@ -74,6 +74,9 @@
 
 
 %changelog
+* Fri Jan 23 2009 Rex Dieter <rdieter at fedoraproject.org> 4.0-0.9.beta2
+- revert use of (tm)
+
 * Fri Jan 23 2009 Rex Dieter <rdieter at fedoraproject.org> 4.0-0.8.beta2
 - remove pkgconfig hack/workaround
 



From davej at fedoraproject.org  Fri Jan 23 20:20:26 2009
From: davej at fedoraproject.org (Dave Jones)
Date: Fri, 23 Jan 2009 20:20:26 +0000 (UTC)
Subject: rpms/kernel/devel linux-2.6.28-sunrpc-ipv6-rpcbind.patch, NONE,
	1.1 kernel.spec, 1.1227, 1.1228
Message-ID: <20090123202026.423B8700FE@cvs1.fedora.phx.redhat.com>

Author: davej

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25750

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6.28-sunrpc-ipv6-rpcbind.patch 
Log Message:
Make NFS work again.

linux-2.6.28-sunrpc-ipv6-rpcbind.patch:

--- NEW FILE linux-2.6.28-sunrpc-ipv6-rpcbind.patch ---
diff -up linux-2.6.28.i686/fs/Kconfig.save linux-2.6.28.i686/fs/Kconfig
--- linux-2.6.28.i686/fs/Kconfig.save	2009-01-23 14:04:47.000000000 -0500
+++ linux-2.6.28.i686/fs/Kconfig	2009-01-23 14:15:31.000000000 -0500
@@ -1401,28 +1401,6 @@ config SUNRPC_XPRT_RDMA
 
 	  If unsure, say N.
 
-config SUNRPC_REGISTER_V4
-	bool "Register local RPC services via rpcbind v4 (EXPERIMENTAL)"
-	depends on SUNRPC && EXPERIMENTAL
-	default n
-	help
-	  Sun added support for registering RPC services at an IPv6
-	  address by creating two new versions of the rpcbind protocol
-	  (RFC 1833).
-
-	  This option enables support in the kernel RPC server for
-	  registering kernel RPC services via version 4 of the rpcbind
-	  protocol.  If you enable this option, you must run a portmapper
-	  daemon that supports rpcbind protocol version 4.
-
-	  Serving NFS over IPv6 from knfsd (the kernel's NFS server)
-	  requires that you enable this option and use a portmapper that
-	  supports rpcbind version 4.
-
-	  If unsure, say N to get traditional behavior (register kernel
-	  RPC services using only rpcbind version 2).  Distributions
-	  using the legacy Linux portmapper daemon must say N here.
-
 config RPCSEC_GSS_KRB5
 	tristate "Secure RPC: Kerberos V mechanism (EXPERIMENTAL)"
 	depends on SUNRPC && EXPERIMENTAL
diff -up linux-2.6.28.i686/fs/lockd/svc.c.save linux-2.6.28.i686/fs/lockd/svc.c
--- linux-2.6.28.i686/fs/lockd/svc.c.save	2009-01-23 14:04:47.000000000 -0500
+++ linux-2.6.28.i686/fs/lockd/svc.c	2009-01-23 14:15:31.000000000 -0500
@@ -56,12 +56,11 @@ unsigned long			nlmsvc_timeout;
  * If the kernel has IPv6 support available, always listen for
  * both AF_INET and AF_INET6 requests.
  */
-#if (defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)) && \
-	defined(CONFIG_SUNRPC_REGISTER_V4)
+#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
 static const sa_family_t	nlmsvc_family = AF_INET6;
-#else	/* (CONFIG_IPV6 || CONFIG_IPV6_MODULE) && CONFIG_SUNRPC_REGISTER_V4 */
+#else	/* CONFIG_IPV6 || CONFIG_IPV6_MODULE */
 static const sa_family_t	nlmsvc_family = AF_INET;
-#endif	/* (CONFIG_IPV6 || CONFIG_IPV6_MODULE) && CONFIG_SUNRPC_REGISTER_V4 */
+#endif	/* CONFIG_IPV6 || CONFIG_IPV6_MODULE */
 
 /*
  * These can be set at insmod time (useful for NFS as root filesystem),
diff -up linux-2.6.28.i686/net/sunrpc/rpcb_clnt.c.save linux-2.6.28.i686/net/sunrpc/rpcb_clnt.c
--- linux-2.6.28.i686/net/sunrpc/rpcb_clnt.c.save	2009-01-23 14:04:47.000000000 -0500
+++ linux-2.6.28.i686/net/sunrpc/rpcb_clnt.c	2009-01-23 14:14:41.000000000 -0500
@@ -124,12 +124,6 @@ static const struct sockaddr_in rpcb_ina
 	.sin_port		= htons(RPCBIND_PORT),
 };
 
-static const struct sockaddr_in6 rpcb_in6addr_loopback = {
-	.sin6_family		= AF_INET6,
-	.sin6_addr		= IN6ADDR_LOOPBACK_INIT,
-	.sin6_port		= htons(RPCBIND_PORT),
-};
-
 static struct rpc_clnt *rpcb_create_local(struct sockaddr *addr,
 					  size_t addrlen, u32 version)
 {
@@ -176,9 +170,10 @@ static struct rpc_clnt *rpcb_create(char
 	return rpc_create(&args);
 }
 
-static int rpcb_register_call(struct sockaddr *addr, size_t addrlen,
-			      u32 version, struct rpc_message *msg)
+static int rpcb_register_call(u32 version, struct rpc_message *msg)
 {
+	struct sockaddr *addr = (struct sockaddr *)&rpcb_inaddr_loopback;
+	size_t addrlen = sizeof(rpcb_inaddr_loopback);
 	struct rpc_clnt *rpcb_clnt;
 	int result, error = 0;
 
@@ -192,7 +187,7 @@ static int rpcb_register_call(struct soc
 		error = PTR_ERR(rpcb_clnt);
 
 	if (error < 0) {
-		printk(KERN_WARNING "RPC: failed to contact local rpcbind "
+		dprintk("RPC:       failed to contact local rpcbind "
 				"server (errno %d).\n", -error);
 		return error;
 	}
@@ -254,9 +249,7 @@ int rpcb_register(u32 prog, u32 vers, in
 	if (port)
 		msg.rpc_proc = &rpcb_procedures2[RPCBPROC_SET];
 
-	return rpcb_register_call((struct sockaddr *)&rpcb_inaddr_loopback,
-					sizeof(rpcb_inaddr_loopback),
-					RPCBVERS_2, &msg);
+	return rpcb_register_call(RPCBVERS_2, &msg);
 }
 
 /*
@@ -284,9 +277,7 @@ static int rpcb_register_netid4(struct s
 	if (port)
 		msg->rpc_proc = &rpcb_procedures4[RPCBPROC_SET];
 
-	return rpcb_register_call((struct sockaddr *)&rpcb_inaddr_loopback,
-					sizeof(rpcb_inaddr_loopback),
-					RPCBVERS_4, msg);
+	return rpcb_register_call(RPCBVERS_4, msg);
 }
 
 /*
@@ -318,9 +309,7 @@ static int rpcb_register_netid6(struct s
 	if (port)
 		msg->rpc_proc = &rpcb_procedures4[RPCBPROC_SET];
 
-	return rpcb_register_call((struct sockaddr *)&rpcb_in6addr_loopback,
-					sizeof(rpcb_in6addr_loopback),
-					RPCBVERS_4, msg);
+	return rpcb_register_call(RPCBVERS_4, msg);
 }
 
 /**
diff -up linux-2.6.28.i686/net/sunrpc/svc.c.save linux-2.6.28.i686/net/sunrpc/svc.c
--- linux-2.6.28.i686/net/sunrpc/svc.c.save	2009-01-23 14:04:47.000000000 -0500
+++ linux-2.6.28.i686/net/sunrpc/svc.c	2009-01-23 14:14:41.000000000 -0500
@@ -719,8 +719,6 @@ svc_exit_thread(struct svc_rqst *rqstp)
 }
 EXPORT_SYMBOL_GPL(svc_exit_thread);
 
-#ifdef CONFIG_SUNRPC_REGISTER_V4
-
 /*
  * Register an "inet" protocol family netid with the local
  * rpcbind daemon via an rpcbind v4 SET request.
@@ -741,6 +739,7 @@ static int __svc_rpcb_register4(const u3
 		.sin_port		= htons(port),
 	};
 	char *netid;
+	int error;
 
 	switch (protocol) {
 	case IPPROTO_UDP:
@@ -750,11 +749,20 @@ static int __svc_rpcb_register4(const u3
 		netid = RPCBIND_NETID_TCP;
 		break;
 	default:
-		return -EPROTONOSUPPORT;
+		return -ENOPROTOOPT;
 	}
 
-	return rpcb_v4_register(program, version,
-				(struct sockaddr *)&sin, netid);
+	error = rpcb_v4_register(program, version,
+					(struct sockaddr *)&sin, netid);
+
+	/*
+	 * User space didn't support rpcbind v4, so retry this
+	 * registration request with the legacy rpcbind v2 protocol.
+	 */
+	if (error == -EPROTONOSUPPORT)
+		error = rpcb_register(program, version, protocol, port);
+
+	return error;
 }
 
 /*
@@ -777,6 +785,7 @@ static int __svc_rpcb_register6(const u3
 		.sin6_port		= htons(port),
 	};
 	char *netid;
+	int error;
 
 	switch (protocol) {
 	case IPPROTO_UDP:
@@ -786,11 +795,21 @@ static int __svc_rpcb_register6(const u3
 		netid = RPCBIND_NETID_TCP6;
 		break;
 	default:
-		return -EPROTONOSUPPORT;
+		return -ENOPROTOOPT;
 	}
 
-	return rpcb_v4_register(program, version,
+	error = rpcb_v4_register(program, version,
 				(struct sockaddr *)&sin6, netid);
+
+	/*
+	 * User space didn't support registering an IPv6 service,
+	 * so register this service for IPv4 only, using the legacy
+	 * rpcbind v2 protocol.
+	 */
+	if (error == -EPROTONOSUPPORT)
+		error = rpcb_register(program, version, protocol, port);
+
+	return error;
 }
 
 /*
@@ -799,7 +818,8 @@ static int __svc_rpcb_register6(const u3
  * Returns zero on success; a negative errno value is returned
  * if any error occurs.
  */
-static int __svc_register(const u32 program, const u32 version,
+static int __svc_register(const char *progname,
+			  const u32 program, const u32 version,
 			  const sa_family_t family,
 			  const unsigned short protocol,
 			  const unsigned short port)
@@ -808,13 +828,14 @@ static int __svc_register(const u32 prog
 
 	switch (family) {
 	case AF_INET:
-		return __svc_rpcb_register4(program, version,
+		error = __svc_rpcb_register4(program, version,
 						protocol, port);
+		break;
 	case AF_INET6:
 		error = __svc_rpcb_register6(program, version,
 						protocol, port);
 		if (error < 0)
-			return error;
+			break;
 
 		/*
 		 * Work around bug in some versions of Linux rpcbind
@@ -825,33 +846,17 @@ static int __svc_register(const u32 prog
 		 */
 		__svc_rpcb_register4(program, version,
 						protocol, port);
-		return 0;
+		break;
+	default:
+		error = -EAFNOSUPPORT;
 	}
 
-	return -EAFNOSUPPORT;
-}
-
-#else	/* CONFIG_SUNRPC_REGISTER_V4 */
-
-/*
- * Register a kernel RPC service via rpcbind version 2.
- *
- * Returns zero on success; a negative errno value is returned
- * if any error occurs.
- */
-static int __svc_register(const u32 program, const u32 version,
-			  sa_family_t family,
-			  const unsigned short protocol,
-			  const unsigned short port)
-{
-	if (family != AF_INET)
-		return -EAFNOSUPPORT;
-
-	return rpcb_register(program, version, protocol, port);
+	if (error < 0)
+		printk(KERN_WARNING "svc: failed to register %sv%u RPC "
+			"service (errno %d).\n", progname, version, -error);
+	return error;
 }
 
-#endif /* CONFIG_SUNRPC_REGISTER_V4 */
-
 /**
  * svc_register - register an RPC service with the local portmapper
  * @serv: svc_serv struct for the service to register
@@ -886,8 +891,9 @@ int svc_register(const struct svc_serv *
 			if (progp->pg_vers[i]->vs_hidden)
 				continue;
 
-			error = __svc_register(progp->pg_prog, i,
-						serv->sv_family, proto, port);
+			error = __svc_register(progp->pg_name, progp->pg_prog,
+						i, serv->sv_family,
+						proto, port);
 			if (error < 0)
 				break;
 		}
@@ -896,26 +902,10 @@ int svc_register(const struct svc_serv *
 	return error;
 }
 
-#ifdef CONFIG_SUNRPC_REGISTER_V4
-
-static void __svc_unregister(const u32 program, const u32 version,
-			     const char *progname)
-{
-	struct sockaddr_in6 sin6 = {
-		.sin6_family		= AF_INET6,
-		.sin6_addr		= IN6ADDR_ANY_INIT,
-		.sin6_port		= 0,
-	};
-	int error;
-
-	error = rpcb_v4_register(program, version,
-				(struct sockaddr *)&sin6, "");
-	dprintk("svc: %s(%sv%u), error %d\n",
-			__func__, progname, version, error);
-}
-
-#else	/* CONFIG_SUNRPC_REGISTER_V4 */
-
+/*
+ * Olaf says a v2 UNSET should clear _all_ entries, including any
+ * registered via a v4 SET
+ */
 static void __svc_unregister(const u32 program, const u32 version,
 			     const char *progname)
 {
@@ -926,8 +916,6 @@ static void __svc_unregister(const u32 p
 			__func__, progname, version, error);
 }
 
-#endif	/* CONFIG_SUNRPC_REGISTER_V4 */
-
 /*
  * All netids, bind addresses and ports registered for [program, version]
  * are removed from the local rpcbind database (if the service is not


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1227
retrieving revision 1.1228
diff -u -r1.1227 -r1.1228
--- kernel.spec	23 Jan 2009 19:28:10 -0000	1.1227
+++ kernel.spec	23 Jan 2009 20:19:55 -0000	1.1228
@@ -656,6 +656,8 @@
 Patch2200: linux-2.6-firewire-git-update.patch
 Patch2201: linux-2.6-firewire-git-pending.patch
 
+Patch2300: linux-2.6.28-sunrpc-ipv6-rpcbind.patch
+
 # Quiet boot fixes
 # silence the ACPI blacklist code
 Patch2802: linux-2.6-silence-acpi-blacklist.patch
@@ -1165,6 +1167,9 @@
 ApplyPatch linux-2.6-firewire-git-pending.patch
 fi
 
+# Fix NFS
+ApplyPatch linux-2.6.28-sunrpc-ipv6-rpcbind.patch
+
 # silence the ACPI blacklist code
 ApplyPatch linux-2.6-silence-acpi-blacklist.patch
 
@@ -1751,6 +1756,9 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Fri Jan 23 2009 Dave Jones <davej at redhat.com>
+- Make NFS work again.
+
 * Fri Jan 23 2009 Eric Sandeen <sandeen at redhat.com>
 - build the crc32c driver into the kernel
 - add selinux fixes for btrfs



From ausil at fedoraproject.org  Fri Jan 23 20:21:21 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Fri, 23 Jan 2009 20:21:21 +0000 (UTC)
Subject: rpms/mysql-gui-tools/devel mysql-gui-tools.spec,1.10,1.11
Message-ID: <20090123202121.BBBBA700FE@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-serv25891

Modified Files:
	mysql-gui-tools.spec 
Log Message:
rebuild for new Mysql



Index: mysql-gui-tools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mysql-gui-tools/devel/mysql-gui-tools.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- mysql-gui-tools.spec	15 Sep 2008 17:55:15 -0000	1.10
+++ mysql-gui-tools.spec	23 Jan 2009 20:20:51 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           mysql-gui-tools
 Version:        5.0r12
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        GUI tools to manage mysql Databases
 
 Group:          Applications/Databases
@@ -178,6 +178,9 @@
 
 
 %changelog
+* Fri Jan 23 2009 Dennis Gilmore <dennis at ausil.us> - 5.0r12-10
+- rebuild for new mysql
+
 * Mon Sep 15 2008 Dennis Gilmore <dennis at ausil.us> - 5.0r12-9
 - apply patch from Pavel Alexeev for gtk 
 - bugzilla #433987



From dwalsh at fedoraproject.org  Fri Jan 23 20:36:16 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Fri, 23 Jan 2009 20:36:16 +0000 (UTC)
Subject: rpms/selinux-policy/devel policy-20090105.patch, 1.18,
	1.19 selinux-policy.spec, 1.774, 1.775
Message-ID: <20090123203616.9F98A700FE@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28575

Modified Files:
	policy-20090105.patch selinux-policy.spec 
Log Message:
* Fri Jan 23 2009 Dan Walsh <dwalsh at redhat.com> 3.6.3-8
- Add policy to make dbus/nm-applet work


policy-20090105.patch:

Index: policy-20090105.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-20090105.patch,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- policy-20090105.patch	21 Jan 2009 22:49:23 -0000	1.18
+++ policy-20090105.patch	23 Jan 2009 20:35:45 -0000	1.19
@@ -1401,7 +1401,7 @@
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/vbetool.if serefpolicy-3.6.3/policy/modules/admin/vbetool.if
 --- nsaserefpolicy/policy/modules/admin/vbetool.if	2008-08-07 11:15:13.000000000 -0400
-+++ serefpolicy-3.6.3/policy/modules/admin/vbetool.if	2009-01-19 13:10:02.000000000 -0500
++++ serefpolicy-3.6.3/policy/modules/admin/vbetool.if	2009-01-23 14:46:57.000000000 -0500
 @@ -18,3 +18,28 @@
  	corecmd_search_bin($1)
  	domtrans_pattern($1, vbetool_exec_t, vbetool_t)
@@ -4058,7 +4058,7 @@
 +corecmd_executable_file(wm_exec_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corecommands.fc serefpolicy-3.6.3/policy/modules/kernel/corecommands.fc
 --- nsaserefpolicy/policy/modules/kernel/corecommands.fc	2009-01-05 15:39:38.000000000 -0500
-+++ serefpolicy-3.6.3/policy/modules/kernel/corecommands.fc	2009-01-20 14:46:23.000000000 -0500
++++ serefpolicy-3.6.3/policy/modules/kernel/corecommands.fc	2009-01-23 15:08:37.000000000 -0500
 @@ -58,6 +58,8 @@
  
  /etc/init\.d/functions		--	gen_context(system_u:object_r:bin_t,s0)
@@ -4103,7 +4103,7 @@
  /usr/share/fedora-usermgmt/wrapper --	gen_context(system_u:object_r:bin_t,s0)
  /usr/share/hplip/[^/]*		--	gen_context(system_u:object_r:bin_t,s0)
  /usr/share/hwbrowser/hwbrowser --	gen_context(system_u:object_r:bin_t,s0)
-@@ -293,3 +299,8 @@
+@@ -293,3 +299,10 @@
  ifdef(`distro_suse',`
  /var/lib/samba/bin/.+			gen_context(system_u:object_r:bin_t,s0)
  ')
@@ -4112,6 +4112,8 @@
 +/lib64/security/pam_krb5/pam_krb5_storetmp -- gen_context(system_u:object_r:bin_t,s0)
 +
 +/usr/lib/oracle/xe/apps(/.*)?  gen_context(system_u:object_r:bin_t,s0)
++
++/usr/lib(64)?/pm-utils/sleep.d(/.*)?  gen_context(system_u:object_r:bin_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corecommands.if serefpolicy-3.6.3/policy/modules/kernel/corecommands.if
 --- nsaserefpolicy/policy/modules/kernel/corecommands.if	2009-01-05 15:39:38.000000000 -0500
 +++ serefpolicy-3.6.3/policy/modules/kernel/corecommands.if	2009-01-19 13:10:02.000000000 -0500
@@ -6183,7 +6185,7 @@
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/storage.fc serefpolicy-3.6.3/policy/modules/kernel/storage.fc
 --- nsaserefpolicy/policy/modules/kernel/storage.fc	2008-10-08 19:00:23.000000000 -0400
-+++ serefpolicy-3.6.3/policy/modules/kernel/storage.fc	2009-01-19 13:53:59.000000000 -0500
++++ serefpolicy-3.6.3/policy/modules/kernel/storage.fc	2009-01-23 09:24:07.000000000 -0500
 @@ -36,7 +36,7 @@
  /dev/pg[0-3]		-c	gen_context(system_u:object_r:removable_device_t,s0)
  /dev/ps3d.*		-b	gen_context(system_u:object_r:fixed_disk_device_t,mls_systemhigh)
@@ -6193,6 +6195,15 @@
  /dev/rd.*		-b	gen_context(system_u:object_r:fixed_disk_device_t,mls_systemhigh)
  ifdef(`distro_redhat', `
  /dev/root		-b	gen_context(system_u:object_r:fixed_disk_device_t,mls_systemhigh)
+@@ -57,7 +57,7 @@
+ 
+ /dev/cciss/[^/]*	-b	gen_context(system_u:object_r:fixed_disk_device_t,mls_systemhigh)
+ 
+-/dev/fuse		-c	gen_context(system_u:object_r:fuse_device_t,mls_systemhigh)
++/dev/fuse		-c	gen_context(system_u:object_r:fuse_device_t,s0)
+ /dev/floppy/[^/]*	-b	gen_context(system_u:object_r:removable_device_t,s0)
+ 
+ /dev/i2o/hd[^/]*	-b	gen_context(system_u:object_r:fixed_disk_device_t,mls_systemhigh)
 @@ -67,6 +67,8 @@
  /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)
@@ -8502,7 +8513,7 @@
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.te serefpolicy-3.6.3/policy/modules/services/apache.te
 --- nsaserefpolicy/policy/modules/services/apache.te	2009-01-19 11:06:49.000000000 -0500
-+++ serefpolicy-3.6.3/policy/modules/services/apache.te	2009-01-21 11:01:33.000000000 -0500
++++ serefpolicy-3.6.3/policy/modules/services/apache.te	2009-01-23 15:14:19.000000000 -0500
 @@ -19,6 +19,8 @@
  # Declarations
  #
@@ -10134,8 +10145,13 @@
  
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cron.fc serefpolicy-3.6.3/policy/modules/services/cron.fc
 --- nsaserefpolicy/policy/modules/services/cron.fc	2008-11-11 16:13:46.000000000 -0500
-+++ serefpolicy-3.6.3/policy/modules/services/cron.fc	2009-01-19 13:10:02.000000000 -0500
-@@ -17,9 +17,9 @@
++++ serefpolicy-3.6.3/policy/modules/services/cron.fc	2009-01-23 15:16:30.000000000 -0500
+@@ -1,3 +1,4 @@
++/etc/rc\.d/init\.d/atd		--	gen_context(system_u:object_r:crond_initrc_exec_t,s0)
+ 
+ /etc/cron\.d(/.*)?			gen_context(system_u:object_r:system_cron_spool_t,s0)
+ /etc/crontab			--	gen_context(system_u:object_r:system_cron_spool_t,s0)
+@@ -17,9 +18,9 @@
  /var/run/fcron\.fifo		-s	gen_context(system_u:object_r:crond_var_run_t,s0)
  /var/run/fcron\.pid		--	gen_context(system_u:object_r:crond_var_run_t,s0)
  
@@ -10148,7 +10164,7 @@
  
  /var/spool/cron			-d	gen_context(system_u:object_r:cron_spool_t,s0)
  #/var/spool/cron/root		--	gen_context(system_u:object_r:sysadm_cron_spool_t,s0)
-@@ -41,7 +41,11 @@
+@@ -41,7 +42,11 @@
  #/var/spool/cron/crontabs/root	--	gen_context(system_u:object_r:sysadm_cron_spool_t,s0)
  
  /var/spool/fcron		-d	gen_context(system_u:object_r:cron_spool_t,s0)
@@ -10163,7 +10179,7 @@
 +/var/log/rpmpkgs.*		--	gen_context(system_u:object_r:cron_log_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cron.if serefpolicy-3.6.3/policy/modules/services/cron.if
 --- nsaserefpolicy/policy/modules/services/cron.if	2008-11-11 16:13:47.000000000 -0500
-+++ serefpolicy-3.6.3/policy/modules/services/cron.if	2009-01-21 15:20:50.000000000 -0500
++++ serefpolicy-3.6.3/policy/modules/services/cron.if	2009-01-23 15:15:40.000000000 -0500
 @@ -12,6 +12,10 @@
  ## </param>
  #
@@ -10259,7 +10275,50 @@
  	gen_require(`
  		type crond_t;
  	')
-@@ -481,11 +515,14 @@
+@@ -416,6 +450,42 @@
+ 
+ ########################################
+ ## <summary>
++##	Execute cron in the cron system domain.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`cron_domtrans',`
++	gen_require(`
++		type system_cronjob_t, crond_exec_t;
++	')
++
++	domtrans_pattern($1,crond_exec_t,system_cronjob_t)
++')
++
++########################################
++## <summary>
++##	Execute crond_exec_t 
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`cron_exec',`
++	gen_require(`
++		type crond_exec_t;
++	')
++
++	can_exec($1,crond_exec_t)
++')
++
++########################################
++## <summary>
+ ##	Inherit and use a file descriptor
+ ##	from system cron jobs.
+ ## </summary>
+@@ -481,11 +551,14 @@
  #
  interface(`cron_read_system_job_tmp_files',`
  	gen_require(`
@@ -10275,7 +10334,7 @@
  ')
  
  ########################################
-@@ -506,3 +543,82 @@
+@@ -506,3 +579,101 @@
  
  	dontaudit $1 system_cronjob_tmp_t:file append;
  ')
@@ -10358,9 +10417,28 @@
 +
 +	manage_files_pattern($1, crond_var_run_t,  crond_var_run_t)
 +')
++
++########################################
++## <summary>
++##	Execute crond server in the nscd domain.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	The type of the process performing this action.
++##	</summary>
++## </param>
++#
++interface(`cron_initrc_domtrans',`
++	gen_require(`
++		type crond_initrc_exec_t;
++')
++
++	init_labeled_script_domtrans($1, crond_initrc_exec_t)
++')
++
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cron.te serefpolicy-3.6.3/policy/modules/services/cron.te
 --- nsaserefpolicy/policy/modules/services/cron.te	2009-01-19 11:06:49.000000000 -0500
-+++ serefpolicy-3.6.3/policy/modules/services/cron.te	2009-01-21 15:19:17.000000000 -0500
++++ serefpolicy-3.6.3/policy/modules/services/cron.te	2009-01-23 15:14:37.000000000 -0500
 @@ -38,6 +38,10 @@
  type cron_var_lib_t;
  files_type(cron_var_lib_t)
@@ -10372,8 +10450,13 @@
  # var/log files
  type cron_log_t;
  logging_log_file(cron_log_t)
-@@ -58,6 +62,8 @@
+@@ -56,8 +60,13 @@
+ domain_interactive_fd(crond_t)
+ domain_cron_exemption_source(crond_t)
  
++type crond_initrc_exec_t;
++init_script_file(crond_initrc_exec_t)
++
  type crond_tmp_t;
  files_tmp_file(crond_tmp_t)
 +files_poly_parent(crond_tmp_t)
@@ -10381,7 +10464,7 @@
  
  type crond_var_run_t;
  files_pid_file(crond_var_run_t)
-@@ -70,10 +76,11 @@
+@@ -70,10 +79,11 @@
  typealias admin_crontab_tmp_t alias sysadm_crontab_tmp_t;
  
  cron_common_crontab_template(crontab)
@@ -10394,7 +10477,7 @@
  
  type system_cron_spool_t, cron_spool_type;
  files_type(system_cron_spool_t)
-@@ -103,6 +110,13 @@
+@@ -103,6 +113,13 @@
  files_type(user_cron_spool_t)
  ubac_constrained(user_cron_spool_t)
  
@@ -10408,7 +10491,7 @@
  ########################################
  #
  # Admin crontab local policy
-@@ -130,7 +144,7 @@
+@@ -130,7 +147,7 @@
  # Cron daemon local policy
  #
  
@@ -10417,7 +10500,7 @@
  dontaudit crond_t self:capability { sys_resource sys_tty_config };
  allow crond_t self:process ~{ ptrace setcurrent setexec setfscreate setrlimit execmem execstack execheap };
  allow crond_t self:process { setexec setfscreate };
-@@ -149,19 +163,19 @@
+@@ -149,19 +166,19 @@
  allow crond_t crond_var_run_t:file manage_file_perms;
  files_pid_filetrans(crond_t,crond_var_run_t,file)
  
@@ -10441,7 +10524,7 @@
  dev_read_sysfs(crond_t)
  selinux_get_fs_mount(crond_t)
  selinux_validate_context(crond_t)
-@@ -183,6 +197,8 @@
+@@ -183,6 +200,8 @@
  corecmd_read_bin_symlinks(crond_t)
  
  domain_use_interactive_fds(crond_t)
@@ -10450,7 +10533,7 @@
  
  files_read_etc_files(crond_t)
  files_read_generic_spool(crond_t)
-@@ -192,10 +208,13 @@
+@@ -192,10 +211,13 @@
  files_search_default(crond_t)
  
  init_rw_utmp(crond_t)
@@ -10464,7 +10547,7 @@
  
  seutil_read_config(crond_t)
  seutil_read_default_contexts(crond_t)
-@@ -208,6 +227,7 @@
+@@ -208,6 +230,7 @@
  userdom_list_user_home_dirs(crond_t)
  
  mta_send_mail(crond_t)
@@ -10472,7 +10555,7 @@
  
  ifdef(`distro_debian',`
  	# pam_limits is used
-@@ -227,21 +247,45 @@
+@@ -227,21 +250,45 @@
  	')
  ')
  
@@ -10519,7 +10602,7 @@
  ')
  
  optional_policy(`
-@@ -283,7 +327,14 @@
+@@ -283,7 +330,14 @@
  allow system_cronjob_t cron_var_lib_t:file manage_file_perms;
  files_var_lib_filetrans(system_cronjob_t, cron_var_lib_t, file)
  
@@ -10534,7 +10617,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
-@@ -314,9 +365,13 @@
+@@ -314,9 +368,13 @@
  filetrans_pattern(system_cronjob_t, crond_tmp_t, system_cronjob_tmp_t, { file lnk_file })
  files_tmp_filetrans(system_cronjob_t, system_cronjob_tmp_t, file)
  
@@ -10549,7 +10632,7 @@
  
  kernel_read_kernel_sysctls(system_cronjob_t)
  kernel_read_system_state(system_cronjob_t)
-@@ -370,7 +425,8 @@
+@@ -370,7 +428,8 @@
  init_read_utmp(system_cronjob_t)
  init_dontaudit_rw_utmp(system_cronjob_t)
  # prelink tells init to restart it self, we either need to allow or dontaudit
@@ -10559,7 +10642,7 @@
  
  auth_use_nsswitch(system_cronjob_t)
  
-@@ -378,6 +434,7 @@
+@@ -378,6 +437,7 @@
  libs_exec_ld_so(system_cronjob_t)
  
  logging_read_generic_logs(system_cronjob_t)
@@ -10567,7 +10650,7 @@
  logging_send_syslog_msg(system_cronjob_t)
  
  miscfiles_read_localization(system_cronjob_t)
-@@ -428,11 +485,20 @@
+@@ -428,11 +488,20 @@
  ')
  
  optional_policy(`
@@ -10588,7 +10671,7 @@
  ')
  
  optional_policy(`
-@@ -460,8 +526,7 @@
+@@ -460,8 +529,7 @@
  ')
  
  optional_policy(`
@@ -10598,7 +10681,7 @@
  ')
  
  optional_policy(`
-@@ -469,24 +534,17 @@
+@@ -469,24 +537,17 @@
  ')
  
  optional_policy(`
@@ -10607,16 +10690,16 @@
 +	unconfined_domain(crond_t)
  	unconfined_domain(system_cronjob_t)
 -	userdom_user_home_dir_filetrans_user_home_content(system_cronjob_t, { dir file lnk_file fifo_file sock_file })
- ')
- 
+-')
+-
 -ifdef(`TODO',`
 -ifdef(`mta.te', `
 -allow system_cronjob_t mail_spool_t:lnk_file read;
 -allow mta_user_agent system_cronjob_t:fd use;
 -r_dir_file(system_mail_t, crond_tmp_t)
--')
+ ')
 -') dnl end TODO
--
+ 
  ########################################
  #
  # User cronjobs local policy
@@ -10626,7 +10709,7 @@
  allow cronjob_t self:process { signal_perms setsched };
  allow cronjob_t self:fifo_file rw_fifo_file_perms;
  allow cronjob_t self:unix_stream_socket create_stream_socket_perms;
-@@ -570,6 +628,9 @@
+@@ -570,6 +631,9 @@
  userdom_manage_user_home_content_sockets(cronjob_t)
  #userdom_user_home_dir_filetrans_user_home_content(cronjob_t, notdevfile_class_set)
  
@@ -11606,8 +11689,8 @@
 +/var/run/devkit(/.*)?			gen_context(system_u:object_r:devicekit_var_run_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/devicekit.if serefpolicy-3.6.3/policy/modules/services/devicekit.if
 --- nsaserefpolicy/policy/modules/services/devicekit.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.3/policy/modules/services/devicekit.if	2009-01-20 17:22:44.000000000 -0500
-@@ -0,0 +1,157 @@
++++ serefpolicy-3.6.3/policy/modules/services/devicekit.if	2009-01-23 09:25:48.000000000 -0500
+@@ -0,0 +1,177 @@
 +
 +## <summary>policy for devicekit</summary>
 +
@@ -11765,10 +11848,30 @@
 +	devicekit_manage_var_run($1)
 +
 +')
++
++########################################
++## <summary>
++##	Send to devicekit over a unix domain
++##	datagram socket.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`devicekit_dgram_send',`
++	gen_require(`
++		type devicekit_t;
++	')
++
++	allow $1 devicekit_t:unix_dgram_socket sendto;
++')
++
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/devicekit.te serefpolicy-3.6.3/policy/modules/services/devicekit.te
 --- nsaserefpolicy/policy/modules/services/devicekit.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.3/policy/modules/services/devicekit.te	2009-01-20 17:10:23.000000000 -0500
-@@ -0,0 +1,71 @@
++++ serefpolicy-3.6.3/policy/modules/services/devicekit.te	2009-01-23 15:17:57.000000000 -0500
+@@ -0,0 +1,114 @@
 +policy_module(devicekit,1.0.0)
 +
 +########################################
@@ -11816,19 +11919,45 @@
 +#
 +# DeviceKit-Power local policy
 +#
++allow devicekit_power_t self:capability { sys_tty_config dac_override };
++allow devicekit_power_t self:fifo_file rw_fifo_file_perms;
 +allow devicekit_power_t self:unix_dgram_socket create_socket_perms;
 +
++corecmd_exec_bin(devicekit_power_t)
++corecmd_exec_shell(devicekit_power_t)
++
++consoletype_exec(devicekit_power_t)
++
 +dev_rw_generic_usb_dev(devicekit_power_t)
 +dev_rw_netcontrol(devicekit_power_t)
-+dev_read_sysfs(devicekit_power_t)
++dev_rw_sysfs(devicekit_power_t)
 +
 +files_read_etc_files(devicekit_power_t)
++files_read_usr_files(devicekit_t)
 +
 +fs_list_inotifyfs(devicekit_power_t)
 +
++auth_use_nsswitch(devicekit_power_t)
++
 +miscfiles_read_localization(devicekit_power_t)
 +
++userdom_read_all_users_state(devicekit_power_t)
++
++optional_policy(`
++	hal_domtrans_mac(devicekit_power_t)
++	hal_write_log(devicekit_power_t)
++	hal_manage_pid_dirs(devicekit_power_t)
++	hal_manage_pid_files(devicekit_power_t)
++	hal_dbus_chat(devicekit_power_t)
++')
++
++optional_policy(`
++	cron_initrc_domtrans(devicekit_power_t)
++')
++
 +optional_policy(`
++	polkit_domtrans_auth(devicekit_power_t)
++	polkit_read_lib(devicekit_power_t)
 +	polkit_read_reload(devicekit_power_t)
 +')
 +
@@ -11836,9 +11965,26 @@
 +	dbus_system_bus_client(devicekit_power_t)
 +	allow devicekit_power_t devicekit_t:dbus send_msg;
 +	allow devicekit_t devicekit_power_t:dbus send_msg;
++
 +	optional_policy(`
 +		consolekit_dbus_chat(devicekit_power_t)
 +	')
++
++	optional_policy(`
++		networkmanager_dbus_chat(devicekit_power_t)
++	')
++
++	optional_policy(`
++		rpm_dbus_chat(devicekit_power_t)
++	')
++')
++
++optional_policy(`
++	bootloader_domtrans(devicekit_power_t)
++')
++
++optional_policy(`
++	vbetool_domtrans(devicekit_power_t)
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dhcp.if serefpolicy-3.6.3/policy/modules/services/dhcp.if
 --- nsaserefpolicy/policy/modules/services/dhcp.if	2008-11-18 18:57:20.000000000 -0500
@@ -12735,8 +12881,33 @@
  /usr/libexec/hald-addon-macbookpro-backlight --	gen_context(system_u:object_r:hald_mac_exec_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.if serefpolicy-3.6.3/policy/modules/services/hal.if
 --- nsaserefpolicy/policy/modules/services/hal.if	2008-11-19 11:51:44.000000000 -0500
-+++ serefpolicy-3.6.3/policy/modules/services/hal.if	2009-01-20 15:29:07.000000000 -0500
-@@ -51,10 +51,7 @@
++++ serefpolicy-3.6.3/policy/modules/services/hal.if	2009-01-23 14:59:53.000000000 -0500
+@@ -20,6 +20,24 @@
+ 
+ ########################################
+ ## <summary>
++##	Execute hal mac in the hal mac domain.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`hal_domtrans_mac',`
++	gen_require(`
++		type hald_mac_t, hald_mac_exec_t;
++	')
++
++	domtrans_pattern($1, hald_mac_exec_t, hald_mac_t)
++')
++
++########################################
++## <summary>
+ ##	Get the attributes of a hal process.
+ ## </summary>
+ ## <param name="domain">
+@@ -51,10 +69,7 @@
  		type hald_t;
  	')
  
@@ -12748,6 +12919,67 @@
  ')
  
  ########################################
+@@ -340,3 +355,60 @@
+ 	files_search_pids($1)
+ 	allow $1 hald_var_run_t:file rw_file_perms;
+ ')
++
++########################################
++## <summary>
++##	Read/Write hald PID files.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`hal_rw_pid_files',`
++	gen_require(`
++		type hald_var_run_t;
++	')
++
++	files_search_pids($1)
++	allow $1 hald_var_run_t:file rw_file_perms;
++')
++
++########################################
++## <summary>
++##	Manage hald PID files.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`hal_manage_pid_files',`
++	gen_require(`
++		type hald_var_run_t;
++	')
++
++	files_search_pids($1)
++	manage_files_pattern($1, hald_var_run_t, hald_var_run_t)
++')
++
++########################################
++## <summary>
++##	Manage hald PID dirs.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`hal_manage_pid_dirs',`
++	gen_require(`
++		type hald_var_run_t;
++	')
++
++	files_search_pids($1)
++	manage_dirs_pattern($1, hald_var_run_t, hald_var_run_t)
++')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.te serefpolicy-3.6.3/policy/modules/services/hal.te
 --- nsaserefpolicy/policy/modules/services/hal.te	2009-01-19 11:06:49.000000000 -0500
 +++ serefpolicy-3.6.3/policy/modules/services/hal.te	2009-01-20 11:41:48.000000000 -0500
@@ -14776,7 +15008,7 @@
  
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nscd.if serefpolicy-3.6.3/policy/modules/services/nscd.if
 --- nsaserefpolicy/policy/modules/services/nscd.if	2009-01-05 15:39:43.000000000 -0500
-+++ serefpolicy-3.6.3/policy/modules/services/nscd.if	2009-01-19 13:10:02.000000000 -0500
++++ serefpolicy-3.6.3/policy/modules/services/nscd.if	2009-01-23 15:15:06.000000000 -0500
 @@ -58,6 +58,42 @@
  
  ########################################
@@ -16474,7 +16706,7 @@
 +/var/lib/misc/PolicyKit.reload			gen_context(system_u:object_r:polkit_reload_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/polkit.if serefpolicy-3.6.3/policy/modules/services/polkit.if
 --- nsaserefpolicy/policy/modules/services/polkit.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.3/policy/modules/services/polkit.if	2009-01-19 14:47:07.000000000 -0500
++++ serefpolicy-3.6.3/policy/modules/services/polkit.if	2009-01-23 14:44:09.000000000 -0500
 @@ -0,0 +1,241 @@
 +
 +## <summary>policy for polkit_auth</summary>
@@ -22605,7 +22837,7 @@
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.te serefpolicy-3.6.3/policy/modules/services/xserver.te
 --- nsaserefpolicy/policy/modules/services/xserver.te	2009-01-19 11:06:49.000000000 -0500
-+++ serefpolicy-3.6.3/policy/modules/services/xserver.te	2009-01-21 16:14:47.000000000 -0500
++++ serefpolicy-3.6.3/policy/modules/services/xserver.te	2009-01-23 10:14:45.000000000 -0500
 @@ -34,6 +34,13 @@
  
  ## <desc>
@@ -23043,6 +23275,15 @@
  
  # Device rules
  allow x_domain xserver_t:x_device { read getattr use setattr setfocus grab bell };
+@@ -622,7 +728,7 @@
+ manage_sock_files_pattern(xserver_t, xserver_tmp_t, xserver_tmp_t)
+ files_tmp_filetrans(xserver_t, xserver_tmp_t, { file dir sock_file })
+ 
+-filetrans_pattern(xserver_t, xserver_tmp_t, xserver_tmp_t,sock_file)
++#filetrans_pattern(xserver_t, xserver_tmp_t, xserver_tmp_t,sock_file)
+ 
+ manage_dirs_pattern(xserver_t, xserver_tmpfs_t, xserver_tmpfs_t)
+ manage_files_pattern(xserver_t, xserver_tmpfs_t, xserver_tmpfs_t)
 @@ -635,6 +741,15 @@
  manage_lnk_files_pattern(xserver_t, xkb_var_lib_t, xkb_var_lib_t)
  files_search_var_lib(xserver_t)
@@ -27411,7 +27652,7 @@
 +/dev/shm/mono.*		gen_context(system_u:object_r:user_tmpfs_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-3.6.3/policy/modules/system/userdomain.if
 --- nsaserefpolicy/policy/modules/system/userdomain.if	2009-01-19 11:07:34.000000000 -0500
-+++ serefpolicy-3.6.3/policy/modules/system/userdomain.if	2009-01-21 16:19:30.000000000 -0500
++++ serefpolicy-3.6.3/policy/modules/system/userdomain.if	2009-01-23 15:07:13.000000000 -0500
 @@ -30,8 +30,9 @@
  	')
  


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.774
retrieving revision 1.775
diff -u -r1.774 -r1.775
--- selinux-policy.spec	22 Jan 2009 20:10:48 -0000	1.774
+++ selinux-policy.spec	23 Jan 2009 20:35:45 -0000	1.775
@@ -20,7 +20,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.6.3
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -444,6 +444,9 @@
 %endif
 
 %changelog
+* Fri Jan 23 2009 Dan Walsh <dwalsh at redhat.com> 3.6.3-8
+- Add policy to make dbus/nm-applet work
+
 * Thu Jan 22 2009 Dan Walsh <dwalsh at redhat.com> 3.6.3-7
 - Remove polgen-ifgen from post and add trigger to policycoreutils-python
 



From rdieter at fedoraproject.org  Fri Jan 23 20:40:24 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 23 Jan 2009 20:40:24 +0000 (UTC)
Subject: rpms/kdepimlibs/F-10 kdepimlibs-4.1.85-debug-cmake-crash.patch, NONE,
	1.1 .cvsignore, 1.28, 1.29 kdepimlibs.spec, 1.57, 1.58 sources,
	1.29, 1.30 kdepimlibs-4.1.4-system-libical.patch, 1.1, NONE
Message-ID: <20090123204024.ED954700FE@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdepimlibs/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29286

Modified Files:
	.cvsignore kdepimlibs.spec sources 
Added Files:
	kdepimlibs-4.1.85-debug-cmake-crash.patch 
Removed Files:
	kdepimlibs-4.1.4-system-libical.patch 
Log Message:
sync w/devel branch for kde-4.2 hotness


kdepimlibs-4.1.85-debug-cmake-crash.patch:

--- NEW FILE kdepimlibs-4.1.85-debug-cmake-crash.patch ---
diff -ur kdepimlibs-4.1.85/qgpgme/CMakeLists.txt kdepimlibs-4.1.85-debug-cmake-crash/qgpgme/CMakeLists.txt
--- kdepimlibs-4.1.85/qgpgme/CMakeLists.txt	2008-12-04 09:34:05.000000000 +0100
+++ kdepimlibs-4.1.85-debug-cmake-crash/qgpgme/CMakeLists.txt	2008-12-12 15:54:33.000000000 +0100
@@ -1,9 +1,13 @@
 
+message( STATUS "qgpgme section 1" )
+
 set( _any_gpgme_found false )
 
 set( _qgpgme_version 1.0.1 )
 set( _qgpgme_soversion 1 )
 
+message( STATUS "qgpgme section 2" )
+
 if ( WIN32 AND GPGME_VANILLA_FOUND )
 
    # on Windows, we require gpgme(-vanilla), which is thread-safe,
@@ -15,6 +19,8 @@
 
 endif ( WIN32 AND GPGME_VANILLA_FOUND )
 
+message( STATUS "qgpgme section 3" )
+
 if ( NOT WIN32 AND GPGME_PTHREAD_FOUND )
 
    # on Unix, we requrie gpgme-pthread (for convenience, since vanilla
@@ -30,6 +36,8 @@
 
 # build / install only if any useable gpgme was found:
 
+message( STATUS "qgpgme section 4" )
+
 if ( _any_gpgme_found )
 
    include_directories( ${GPGME_INCLUDES} ${CMAKE_SOURCE_DIR}/gpgme++ ${Boost_INCLUDE_DIR} )
@@ -59,3 +67,5 @@
      DESTINATION ${INCLUDE_INSTALL_DIR}/qgpgme COMPONENT Devel )
 
 endif ( _any_gpgme_found )
+
+message( STATUS "qgpgme end" )


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdepimlibs/F-10/.cvsignore,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- .cvsignore	8 Jan 2009 10:07:30 -0000	1.28
+++ .cvsignore	23 Jan 2009 20:39:54 -0000	1.29
@@ -1 +1,3 @@
-kdepimlibs-4.1.4.tar.bz2
+kdepimlibs-4.1.85.tar.bz2
+kdepimlibs-4.1.96.tar.bz2
+kdepimlibs-4.2.0.tar.bz2


Index: kdepimlibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdepimlibs/F-10/kdepimlibs.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- kdepimlibs.spec	8 Jan 2009 10:20:28 -0000	1.57
+++ kdepimlibs.spec	23 Jan 2009 20:39:54 -0000	1.58
@@ -11,15 +11,10 @@
 %define rest 1
 #endif
 
-%if 0%{?fedora} >= 9
-# Use system libical (requires libical-devel >= 0.33)
-# Disabled for now because of #469228
-%define with_libical 1
-%endif
+%define akonadi_version 1.1.1
 
 Name: kdepimlibs
-
-Version: 4.1.4
+Version: 4.2.0
 Release: 1%{?dist}
 Summary: K Desktop Environment 4 - PIM Libraries
 
@@ -28,24 +23,24 @@
 
 URL: http://www.kde.org/
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdepimlibs-%{version}.tar.bz2
-# Use system libical (will be in 4.2)
-Patch100:      kdepimlibs-4.1.4-system-libical.patch
+Patch0: kdepimlibs-4.1.85-debug-cmake-crash.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Requires: akonadi >= %{akonadi_version}
 Requires: kdelibs4 >= %{version}
 
-BuildRequires: akonadi-devel
+BuildRequires: akonadi-devel >= %{akonadi_version} 
 BuildRequires: boost-devel
-BuildRequires: cmake
 BuildRequires: cyrus-sasl-devel
 BuildRequires: gpgme-devel
 BuildRequires: kdelibs4-devel >= %{version}
 BuildRequires: libXpm-devel libXtst-devel
 BuildRequires: openldap-devel
-%if 0%{?with_libical}
 BuildRequires: libical-devel >= 0.33
-%endif
-%{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
+
+# work around circular dependency from kdelibs4-devel
+# pulling in phonon-backend-xine
+#BuildRequires: phonon-backend-gstreamer
 
 ## upstream patches
 
@@ -61,12 +56,14 @@
 
 %package devel
 Group:    Development/Libraries
-Summary:  Development files for %{name} 
+Summary:  Development files for %{name}
 Requires: %{name} = %{version}-%{release}
 Obsoletes: kdepimlibs4-devel < %{version}-%{release}
 Provides:  kdepimlibs4-devel = %{version}-%{release}
 Requires: kdelibs4-devel
 Requires: boost-devel
+# FIXME/HACK, bogus dep -- Rex
+Requires: libical-devel
 
 %description devel
 Header files for developing applications using %{name}.
@@ -83,18 +80,13 @@
 
 %prep
 %setup -q -n kdepimlibs-%{version}
-%if 0%{?with_libical}
-# use system libical
-%patch100 -p1
-rm -rf kcal/libical
-%endif
-
+%patch0 -p1
 
 %build
 
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
-%{cmake_kde4} ..
+%{cmake_kde4} --debug-output ..
 popd
 
 %if 0%{?rest}
@@ -112,7 +104,7 @@
 rm -rf %{buildroot}
 
 %if 0%{?rest}
-make install DESTDIR=%{buildroot} -C %{_target_platform}
+make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
 # move devel symlinks
 mkdir -p %{buildroot}%{_kde4_libdir}/kde4/devel
@@ -145,7 +137,7 @@
 
 
 %clean
-rm -rf %{buildroot} 
+rm -rf %{buildroot}
 
 
 %if 0%{?rest}
@@ -153,9 +145,6 @@
 %defattr(-,root,root,-)
 %{_kde4_appsdir}/akonadi-kde/
 %{_kde4_appsdir}/kabc/
-%if !0%{?with_libical}
-%{_kde4_appsdir}/libical/
-%endif
 %{_kde4_appsdir}/kconf_update/*
 %{_kde4_datadir}/config.kcfg/*
 %{_datadir}/dbus-1/interfaces/*
@@ -163,14 +152,27 @@
 %{_kde4_datadir}/kde4/servicetypes/*
 %{_kde4_libdir}/lib*.so.*
 %{_kde4_libdir}/kde4/*
-%{_kde4_libdir}/gpgmepp/
 %exclude %{_kde4_libdir}/kde4/devel/
+%{_kde4_libdir}/gpgmepp/
+%{_kde4_docdir}/HTML/en/*
+%if 0%{?apidocs}
+%exclude %{_kde4_docdir}/HTML/en/kdepimlibs-apidocs/
+%endif
 
 %files devel
 %defattr(-,root,root,-)
 %{_kde4_appsdir}/cmake/modules/*
 %{_kde4_includedir}/*
 %{_kde4_libdir}/kde4/devel/lib*.so
+
+# CMake seems to change behaviour between F11's cmake (2.6.3rc5)
+# and F10's cmake (2.6.2) -- Lorenzo
+%if 0%{?fedora} > 10
+%{_kde4_libdir}/cmake/KdepimLibs*
+%else
+%{_kde4_libdir}/KdepimLibs*
+%endif
+%{_kde4_libdir}/gpgmepp/
 %endif
 
 %if 0%{?apidocs}
@@ -181,11 +183,41 @@
 
 
 %changelog
-* Thu Jan 08 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.4-1
-- update to 4.1.4
-- reenable system libical, #469228 reportedly fixed upstream now
-- also use the system libical on F9
-- rebase system-libical patch (some line endings changed from CR LF to LF)
+* Thu Jan 22 2009 Than Ngo <than at redhat.com> - 4.2.0-1
+- 4.2.0
+- exclude kdepimlibs-apidocs from main pkg
+
+* Thu Jan 08 2009 Lorenzo Villani <lvillani at binaryhelix.net> - 4.1.96-2
+- fix build on Fedora 10 (cmake < 2.6.3 seems to have a different
+  behaviour here)
+
+* Wed Jan 07 2009 Than Ngo <than at redhat.com> - 4.1.96-1
+- 4.2rc1
+
+* Wed Dec 17 2008 Rex Dieter <rdieter at fedoraproject.org> - 4.1.85-2
+- versioned akonadi(-devel) deps
+
+* Thu Dec 11 2008 Lorenzo Villani <lvillani at binaryhelix.net> - 4.1.85-1
+- KDE 4.2beta2
+
+* Wed Dec 10 2008 Lorenzo Villani <lvillani at binaryhelix.net> - 4.1.82-2
+- add --debug-output to our cmake call, that should fix a reproducible
+  bug with cmake and ppc builds (this work-around should be
+  removed anyway)
+
+* Tue Dec 09 2008 Lorenzo Villani <lvillani at binaryhelix.net> - 4.1.82-1
+- 4.1.82
+
+* Tue Dec 02 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.80-3
+- -devel: Requires: libical-devel
+
+* Thu Nov 20 2008 Than Ngo <than at redhat.com> 4.1.80-2
+- merged
+
+* Thu Nov 20 2008 Lorenzo Villani <lvillani at binaryhelix.net> - 4.1.80-1
+- 4.1.80
+- BR cmake 2.6
+- make install/fast
 
 * Wed Nov 12 2008 Than Ngo <than at redhat.com> 4.1.3-1
 - 4.1.3
@@ -367,7 +399,7 @@
 - dropped -DCMAKE_SKIP_RPATH=TRUE from cmake
 - compiling with QA_RPATHS=0x0003; export QA_RPATHS
 - added libXtst-devel libXpm-devel as BR
-	
+
 * Fri Nov 24 2006 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> 3.80.2-0.2.20061003svn
 - parallel build support
 - added -DCMAKE_SKIP_RPATH=TRUE to cmake to skip rpath


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdepimlibs/F-10/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- sources	8 Jan 2009 10:07:32 -0000	1.29
+++ sources	23 Jan 2009 20:39:54 -0000	1.30
@@ -1 +1 @@
-9546430309b1f34707bffdceec0fbc4b  kdepimlibs-4.1.4.tar.bz2
+8a91677e2dca7d4db26b33c78e239e5e  kdepimlibs-4.2.0.tar.bz2


--- kdepimlibs-4.1.4-system-libical.patch DELETED ---



From ausil at fedoraproject.org  Fri Jan 23 20:46:12 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Fri, 23 Jan 2009 20:46:12 +0000 (UTC)
Subject: rpms/snort/devel snort.spec,1.36,1.37
Message-ID: <20090123204612.D71EA700FE@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/snort/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30175

Modified Files:
	snort.spec 
Log Message:
rebuild for mysql 5.1



Index: snort.spec
===================================================================
RCS file: /cvs/pkgs/rpms/snort/devel/snort.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- snort.spec	2 Jul 2008 17:06:27 -0000	1.36
+++ snort.spec	23 Jan 2009 20:45:42 -0000	1.37
@@ -1,7 +1,7 @@
 Summary:        Intrusion detection system
 Name:           snort
 Version:        2.8.1
-Release:        5%{?dist}
+Release:        6%{?dist}
 License:        GPLv2
 Group:          Applications/Internet
 Source0:        http://www.snort.org/dl/current/snort-%{version}.tar.gz
@@ -495,6 +495,9 @@
 
 
 %changelog
+* Fri Jan 23 2009 Dennis Gilmore <dennis at ausil.us> - 2.8.1-6
+- rebuild for new mysql
+
 * Wed Jun 25 2008 Steve Grubb <sgrubb at redhat.com> - 2.8.1-5
 - Fix bz 452736, 452737, & 452763
 



From salimma at fedoraproject.org  Fri Jan 23 20:53:20 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Fri, 23 Jan 2009 20:53:20 +0000 (UTC)
Subject: rpms/banshee/F-10 .cvsignore, 1.22, 1.23 banshee.spec, 1.64,
	1.65 sources, 1.23, 1.24 banshee-1-1.4.1-riptags.patch, 1.1, NONE
Message-ID: <20090123205320.0F55E700FE@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/banshee/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31157/F-10

Modified Files:
	.cvsignore banshee.spec sources 
Removed Files:
	banshee-1-1.4.1-riptags.patch 
Log Message:
* Fri Jan 23 2009 Michel Salim <salimma at fedoraproject.org> - 1.4.2-1
- Update to 1.4.2
- Require mono-addins
- Enable menu entry on other desktops



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/banshee/F-10/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- .cvsignore	27 Nov 2008 06:51:58 -0000	1.22
+++ .cvsignore	23 Jan 2009 20:52:49 -0000	1.23
@@ -1 +1 @@
-banshee-1-1.4.1.tar.bz2
+banshee-1-1.4.2.tar.bz2


Index: banshee.spec
===================================================================
RCS file: /cvs/pkgs/rpms/banshee/F-10/banshee.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- banshee.spec	2 Jan 2009 00:14:47 -0000	1.64
+++ banshee.spec	23 Jan 2009 20:52:49 -0000	1.65
@@ -1,15 +1,15 @@
 %define mono_shared %{_builddir}/%{?buildsubdir}
 
 Name:    banshee
-Version: 1.4.1
-Release: 4%{?dist}
+Version: 1.4.2
+Release: 1%{?dist}
 Summary: Easily import, manage, and play selections from your music collection
 Group:   Applications/Multimedia
 License: MIT
 URL:     http://banshee-project.org/
 Source0: http://banshee-project.org/files/banshee/banshee-1-%{version}.tar.bz2
 Source1: README.Fedora
-Patch0:  banshee-1-1.4.1-riptags.patch
+# Patch0:  banshee-1-1.4.1-riptags.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # We only have mono on these arches:
@@ -36,7 +36,7 @@
 BuildRequires: gnome-desktop-devel nautilus-cd-burner-devel ndesk-dbus-glib-devel
 
 # Misc
-BuildRequires: gettext-devel perl(XML::Parser)
+BuildRequires: gettext-devel intltool perl(XML::Parser)
 
 # No boo-devel for ppc but we owe it to the users to keep banshee up to date
 %ifarch  %ix86 x86_64 sparc
@@ -45,6 +45,7 @@
 
 BuildRequires: desktop-file-utils
 
+Requires:      mono-addins
 Requires:      podsleuth
 Requires:      libmtp
 Requires:      %{name}-musicbrainz = %{version}-%{release}
@@ -98,7 +99,7 @@
 
 %prep
 %setup -q -n %{name}-1-%{version}
-%patch0 -p0 -b .riptags
+#patch0 -p0 -b .riptags
 cp -p %{SOURCE1} .
 
 %build
@@ -123,7 +124,6 @@
 desktop-file-install --vendor gnome --delete-original \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
   --add-category X-Fedora \
-  --add-only-show-in=GNOME \
   %{buildroot}%{_datadir}/applications/banshee-1.desktop
 
 %find_lang %name-1
@@ -180,6 +180,11 @@
 
 
 %changelog
+* Fri Jan 23 2009 Michel Salim <salimma at fedoraproject.org> - 1.4.2-1
+- Update to 1.4.2
+- Require mono-addins
+- Enable menu entry on other desktops
+
 * Thu Jan  1 2009 Michel Salim <salimma at fedoraproject.org> - 1.4.1-4
 - Manually require libmtp
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/banshee/F-10/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sources	27 Nov 2008 06:51:58 -0000	1.23
+++ sources	23 Jan 2009 20:52:49 -0000	1.24
@@ -1 +1 @@
-cd245c2eb47c67f83e921f4edf105abe  banshee-1-1.4.1.tar.bz2
+ddee6b6c66aabb2c5a91c753ad5de498  banshee-1-1.4.2.tar.bz2


--- banshee-1-1.4.1-riptags.patch DELETED ---



From salimma at fedoraproject.org  Fri Jan 23 20:53:20 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Fri, 23 Jan 2009 20:53:20 +0000 (UTC)
Subject: rpms/banshee/F-9 .cvsignore, 1.22, 1.23 banshee.spec, 1.58,
	1.59 sources, 1.22, 1.23 banshee-1-1.4.1-riptags.patch, 1.1, NONE
Message-ID: <20090123205320.AA2CF700FE@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/banshee/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31157/F-9

Modified Files:
	.cvsignore banshee.spec sources 
Removed Files:
	banshee-1-1.4.1-riptags.patch 
Log Message:
* Fri Jan 23 2009 Michel Salim <salimma at fedoraproject.org> - 1.4.2-1
- Update to 1.4.2
- Require mono-addins
- Enable menu entry on other desktops



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/banshee/F-9/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- .cvsignore	27 Nov 2008 06:51:59 -0000	1.22
+++ .cvsignore	23 Jan 2009 20:52:50 -0000	1.23
@@ -1 +1 @@
-banshee-1-1.4.1.tar.bz2
+banshee-1-1.4.2.tar.bz2


Index: banshee.spec
===================================================================
RCS file: /cvs/pkgs/rpms/banshee/F-9/banshee.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- banshee.spec	2 Jan 2009 00:14:47 -0000	1.58
+++ banshee.spec	23 Jan 2009 20:52:50 -0000	1.59
@@ -1,15 +1,15 @@
 %define mono_shared %{_builddir}/%{?buildsubdir}
 
 Name:    banshee
-Version: 1.4.1
-Release: 4%{?dist}
+Version: 1.4.2
+Release: 1%{?dist}
 Summary: Easily import, manage, and play selections from your music collection
 Group:   Applications/Multimedia
 License: MIT
 URL:     http://banshee-project.org/
 Source0: http://banshee-project.org/files/banshee/banshee-1-%{version}.tar.bz2
 Source1: README.Fedora
-Patch0:  banshee-1-1.4.1-riptags.patch
+# Patch0:  banshee-1-1.4.1-riptags.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # We only have mono on these arches:
@@ -36,7 +36,7 @@
 BuildRequires: gnome-desktop-devel nautilus-cd-burner-devel ndesk-dbus-glib-devel
 
 # Misc
-BuildRequires: gettext-devel perl(XML::Parser)
+BuildRequires: gettext-devel intltool perl(XML::Parser)
 
 # No boo-devel for ppc but we owe it to the users to keep banshee up to date
 %ifarch  %ix86 x86_64 sparc
@@ -45,6 +45,7 @@
 
 BuildRequires: desktop-file-utils
 
+Requires:      mono-addins
 Requires:      podsleuth
 Requires:      libmtp
 Requires:      %{name}-musicbrainz = %{version}-%{release}
@@ -98,7 +99,7 @@
 
 %prep
 %setup -q -n %{name}-1-%{version}
-%patch0 -p0 -b .riptags
+#patch0 -p0 -b .riptags
 cp -p %{SOURCE1} .
 
 %build
@@ -123,7 +124,6 @@
 desktop-file-install --vendor gnome --delete-original \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
   --add-category X-Fedora \
-  --add-only-show-in=GNOME \
   %{buildroot}%{_datadir}/applications/banshee-1.desktop
 
 %find_lang %name-1
@@ -180,6 +180,11 @@
 
 
 %changelog
+* Fri Jan 23 2009 Michel Salim <salimma at fedoraproject.org> - 1.4.2-1
+- Update to 1.4.2
+- Require mono-addins
+- Enable menu entry on other desktops
+
 * Thu Jan  1 2009 Michel Salim <salimma at fedoraproject.org> - 1.4.1-4
 - Manually require libmtp
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/banshee/F-9/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- sources	27 Nov 2008 06:51:59 -0000	1.22
+++ sources	23 Jan 2009 20:52:50 -0000	1.23
@@ -1 +1 @@
-cd245c2eb47c67f83e921f4edf105abe  banshee-1-1.4.1.tar.bz2
+ddee6b6c66aabb2c5a91c753ad5de498  banshee-1-1.4.2.tar.bz2


--- banshee-1-1.4.1-riptags.patch DELETED ---



From pkgdb at fedoraproject.org  Fri Jan 23 20:57:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 23 Jan 2009 20:57:06 +0000
Subject: [pkgdb] python-kiwi (Fedora EPEL, 5) updated by toshio
Message-ID: <20090123205706.C7FD420847E@bastion.fedora.phx.redhat.com>

toshio added a Fedora EPEL 5 branch for python-kiwi
toshio has set commit to Approved for provenpackager on python-kiwi (Fedora EPEL 5)
toshio has set build to Approved for provenpackager on python-kiwi (Fedora EPEL 5)
toshio has set checkout to Approved for provenpackager on python-kiwi (Fedora EPEL 5)
toshio changed owner of python-kiwi in Fedora EPEL 5 to icon

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-kiwi



From cebbert at fedoraproject.org  Fri Jan 23 20:58:23 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Fri, 23 Jan 2009 20:58:23 +0000 (UTC)
Subject: rpms/kernel/F-10 patch-2.6.28.2-rc1.bz2.sign, NONE, 1.1 .cvsignore, 
	1.964, 1.965 kernel.spec, 1.1227, 1.1228 sources, 1.926,
	1.927 upstream, 1.837, 1.838
	linux-2.6-net-sctp-avoid-memory-overflow-while-FWD-TSN-chunk-is-r.patch,
	1.1, NONE
Message-ID: <20090123205823.E78B2700FE@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32215

Modified Files:
	.cvsignore kernel.spec sources upstream 
Added Files:
	patch-2.6.28.2-rc1.bz2.sign 
Removed Files:
	linux-2.6-net-sctp-avoid-memory-overflow-while-FWD-TSN-chunk-is-r.patch 
Log Message:
2.6.28.2-rc1
  Dropped patches (merged upstream):
    linux-2.6-net-sctp-avoid-memory-overflow-while-FWD-TSN-chunk-is-r.patch


--- NEW FILE patch-2.6.28.2-rc1.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBJeTdkyGugalF9Dw4RAj3jAJ451Q84DX2WGAnX6+KYA+d18iGh/gCfZBVC
uQNEarowV0FYUjXzttxG5FI=
=nGUT
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/.cvsignore,v
retrieving revision 1.964
retrieving revision 1.965
diff -u -r1.964 -r1.965
--- .cvsignore	19 Jan 2009 00:07:52 -0000	1.964
+++ .cvsignore	23 Jan 2009 20:57:53 -0000	1.965
@@ -5,3 +5,4 @@
 kernel-2.6.28
 linux-2.6.28.tar.bz2
 patch-2.6.28.1.bz2
+patch-2.6.28.2-rc1.bz2


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/kernel.spec,v
retrieving revision 1.1227
retrieving revision 1.1228
diff -u -r1.1227 -r1.1228
--- kernel.spec	22 Jan 2009 17:51:08 -0000	1.1227
+++ kernel.spec	23 Jan 2009 20:57:53 -0000	1.1228
@@ -36,9 +36,9 @@
 %if 0%{?released_kernel}
 
 # Do we have a -stable update to apply?
-%define stable_update 1
+%define stable_update 2
 # Is it a -stable RC?
-%define stable_rc 0
+%define stable_rc 1
 # Set rpm version accordingly
 %if 0%{?stable_update}
 %define stablerev .%{stable_update}
@@ -658,9 +658,6 @@
 # Fix DEBUG_SHIRQ problem in tulip driver.  (454575)
 Patch2030: linux-2.6-net-tulip-interrupt.patch
 
-# CVE-2009-0065
-Patch2031: linux-2.6-net-sctp-avoid-memory-overflow-while-FWD-TSN-chunk-is-r.patch
-
 # olpc fixes
 Patch2040: linux-2.6-olpc-speaker-out.patch
 
@@ -1185,8 +1182,6 @@
 
 ApplyPatch linux-2.6-net-tulip-interrupt.patch
 
-ApplyPatch linux-2.6-net-sctp-avoid-memory-overflow-while-FWD-TSN-chunk-is-r.patch
-
 ApplyPatch linux-2.6-olpc-speaker-out.patch
 
 ApplyPatch linux-2.6-serial.patch
@@ -1787,6 +1782,11 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Fri Jan 23 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.28.2-21.rc1
+- 2.6.28.2-rc1
+  Dropped patches (merged upstream):
+    linux-2.6-net-sctp-avoid-memory-overflow-while-FWD-TSN-chunk-is-r.patch
+
 * Thu Jan 22 2009 Dave Jones <davej at redhat.com>
 - Disable CONFIG_RELOCATABLE on powerpc[64]
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/sources,v
retrieving revision 1.926
retrieving revision 1.927
diff -u -r1.926 -r1.927
--- sources	19 Jan 2009 00:07:52 -0000	1.926
+++ sources	23 Jan 2009 20:57:53 -0000	1.927
@@ -1,2 +1,3 @@
 d351e44709c9810b85e29b877f50968a  linux-2.6.28.tar.bz2
 137d854fbbb05d600de4006b74a9828c  patch-2.6.28.1.bz2
+b05e857840532cc1d15f1395103eec33  patch-2.6.28.2-rc1.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/upstream,v
retrieving revision 1.837
retrieving revision 1.838
diff -u -r1.837 -r1.838
--- upstream	19 Jan 2009 00:07:52 -0000	1.837
+++ upstream	23 Jan 2009 20:57:53 -0000	1.838
@@ -1,2 +1,3 @@
 linux-2.6.28.tar.bz2
 patch-2.6.28.1.bz2
+patch-2.6.28.2-rc1.bz2


--- linux-2.6-net-sctp-avoid-memory-overflow-while-FWD-TSN-chunk-is-r.patch DELETED ---



From nim at fedoraproject.org  Fri Jan 23 20:59:17 2009
From: nim at fedoraproject.org (Nicolas Mailhot)
Date: Fri, 23 Jan 2009 20:59:17 +0000 (UTC)
Subject: rpms/google-droid-fonts/F-10 NOTICE, NONE, 1.1 README.txt, NONE,
	1.1 google-droid-fonts-sans-fontconfig.conf, NONE,
	1.1 google-droid-fonts-sans-mono-fontconfig.conf, NONE,
	1.1 google-droid-fonts-serif-fontconfig.conf, NONE,
	1.1 google-droid-fonts.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090123205917.3DF1F700FE@cvs1.fedora.phx.redhat.com>

Author: nim

Update of /cvs/extras/rpms/google-droid-fonts/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32353/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	NOTICE README.txt google-droid-fonts-sans-fontconfig.conf 
	google-droid-fonts-sans-mono-fontconfig.conf 
	google-droid-fonts-serif-fontconfig.conf 
	google-droid-fonts.spec import.log 
Log Message:
initial import


--- NEW FILE NOTICE ---

   Copyright (c) 2005-2008, The Android Open Source Project

   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.

   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.


                                 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



--- NEW FILE README.txt ---
Copyright (C) 2008 The Android Open Source Project

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.

##########

This directory contains the fonts for the platform. They are licensed
under the Apache 2 license.


--- NEW FILE google-droid-fonts-sans-fontconfig.conf ---
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
<fontconfig>
  <alias>
    <family>sans-serif</family>
    <prefer>
      <family>Droid Sans</family>
    </prefer>
  </alias>
  <alias>
    <family>Droid Sans</family>
    <default>
      <family>sans-serif</family>
    </default>
  </alias>
  <match target="scan">
    <test name="family">
      <string>Droid Sans Fallback</string>
    </test>
    <edit name="family">
      <string>Droid Sans</string>
    </edit>
  </match>
</fontconfig>


--- NEW FILE google-droid-fonts-sans-mono-fontconfig.conf ---
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
<fontconfig>
  <alias>
    <family>monospace</family>
    <prefer>
      <family>Droid Sans Mono</family>
    </prefer>
  </alias>
  <alias>
    <family>Droid Sans Mono</family>
    <default>
      <family>monospace</family>
    </default>
  </alias>
</fontconfig>


--- NEW FILE google-droid-fonts-serif-fontconfig.conf ---
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
<fontconfig>
  <alias>
    <family>serif</family>
    <prefer>
      <family>Droid Serif</family>
    </prefer>
  </alias>
  <alias>
    <family>Droid Serif</family>
    <default>
      <family>serif</family>
    </default>
  </alias>
</fontconfig>


--- NEW FILE google-droid-fonts.spec ---
%define fontname google-droid

%define download_root http://android.git.kernel.org/?p=platform/frameworks/base.git;a=blob_plain;f=data/fonts

%define common_desc \
The Droid typeface family was designed in the fall of 2006 by Ascender's \
Steve Matteson, as a commission from Google to create a set of system fonts \
for its Android platform. The goal was to provide optimal quality and comfort \
on a mobile handset when rendered in application menus, web browsers and for \
other screen text.

Name:    %{fontname}-fonts
# The font files all have the same version except for sans fallback which I'm going to ignore here
Version: 1.0.112
Release: 3%{?dist}
Summary: General-purpose fonts released by Google as part of Android

Group:     User Interface/X
License:   ASL 2.0
URL:       http://android.git.kernel.org/?p=platform/frameworks/base.git;a=tree;f=data/fonts
Source1:   %{download_root}/DroidSans.ttf
Source2:   %{download_root}/DroidSans-Bold.ttf
Source3:   %{download_root}/DroidSansFallback.ttf
Source4:   %{download_root}/DroidSansMono.ttf
Source5:   %{download_root}/DroidSerif-Regular.ttf
Source6:   %{download_root}/DroidSerif-Bold.ttf
Source7:   %{download_root}/DroidSerif-Italic.ttf
Source8:   %{download_root}/DroidSerif-BoldItalic.ttf
Source9:   %{download_root}/NOTICE
Source10:  %{download_root}/README.txt
Source11:  %{name}-sans-fontconfig.conf
Source12:  %{name}-sans-mono-fontconfig.conf
Source13:  %{name}-serif-fontconfig.conf
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

BuildArch:     noarch
BuildRequires: fontpackages-devel

%description
%common_desc


%package common
Summary:  Common files of the Droid font set
Group:    User Interface/X
Requires: fontpackages-filesystem

%description common
%common_desc

This package consists of files used by other %{name} packages.

%package -n %{fontname}-sans-fonts
Summary:  A humanist sans serif typeface
Group:    User Interface/X
Requires: %{name}-common = %{version}-%{release}

%description -n %{fontname}-sans-fonts
%common_desc

Droid Sans is a humanist sans serif typeface designed for user interfaces and
electronic communication.

%_font_pkg -n sans -f ??-%{fontname}-sans.conf DroidSans.ttf DroidSans-Bold.ttf DroidSansFallback.ttf


%package -n %{fontname}-sans-mono-fonts
Summary:  A humanist monospace sans serif typeface
Group:    User Interface/X
Requires: %{name}-common = %{version}-%{release}

%description -n %{fontname}-sans-mono-fonts
%common_desc

Droid Sans Mono is a humanist monospace sans serif typeface designed for user
interfaces and electronic communication.

%_font_pkg -n sans-mono -f ??-%{fontname}-sans-mono.conf DroidSansMono.ttf


%package -n %{fontname}-serif-fonts
Summary:  A serif typeface
Group:    User Interface/X
Requires: %{name}-common = %{version}-%{release}

%description -n %{fontname}-serif-fonts
%common_desc

Droid Serif is a contemporary serif typeface family designed for comfortable
reading on screen. Droid Serif is slightly condensed to maximize the amount of
text displayed on small screens. Vertical stress and open forms contribute to
its readability while its proportion and overall design complement its
companion Droid Sans.

%_font_pkg -n serif -f ??-%{fontname}-serif.conf DroidSerif*ttf


%prep
%setup -q -c -T
install -m 0644 -p %{SOURCE9}  notice.txt
install -m 0644 -p %{SOURCE10} readme.txt


%build


%install
rm -fr %{buildroot}

install -m 0755 -d %{buildroot}%{_fontdir}

install -m 0644 -p  %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} \
                    %{SOURCE6} %{SOURCE7} %{SOURCE8} %{buildroot}%{_fontdir}

install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} \
                   %{buildroot}%{_fontconfig_confdir}

install -m 0644 -p %{SOURCE11} \
        %{buildroot}%{_fontconfig_templatedir}/65-%{fontname}-sans.conf
install -m 0644 -p %{SOURCE12} \
        %{buildroot}%{_fontconfig_templatedir}/60-%{fontname}-sans-mono.conf
install -m 0644 -p %{SOURCE13} \
        %{buildroot}%{_fontconfig_templatedir}/59-%{fontname}-serif.conf

for fontconf in 59-%{fontname}-sans.conf \
                59-%{fontname}-sans-mono.conf \
                59-%{fontname}-serif.conf ; do
  ln -s %{_fontconfig_templatedir}/$fontconf \
        %{buildroot}%{_fontconfig_confdir}/$fontconf
done


%clean
rm -fr %{buildroot}


%files common
%defattr(0644,root,root,0755)
%doc *.txt

%dir %{_fontdir}


%changelog
* Fri Jan 16 2009 <nicolas.mailhot at laposte.net>
- 1.0.112-3
??? Workaround RHEL5 rpmbuild UTF-8 handling bug
- 1.0.112-2
??? Convert to new naming guidelines
??? Do strange stuff with Sans Fallback (CJK users please check)

* Tue Dec  9 2008 <nicolas.mailhot at laposte.net>
- 1.0.112-1
?? Licensing bit clarified in bug #472635
?? Fedora submission

* Sun Nov 23 2008 <nicolas.mailhot at laposte.net>
- 1.0.107-1
?? Initial built using ???fontpackages???



--- NEW FILE import.log ---
google-droid-fonts-1_0_112-3_fc11:F-10:google-droid-fonts-1.0.112-3.fc11.src.rpm:1232744231


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/google-droid-fonts/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	15 Jan 2009 20:27:08 -0000	1.1
+++ .cvsignore	23 Jan 2009 20:58:46 -0000	1.2
@@ -0,0 +1,8 @@
+DroidSans-Bold.ttf
+DroidSans.ttf
+DroidSansFallback.ttf
+DroidSansMono.ttf
+DroidSerif-Bold.ttf
+DroidSerif-BoldItalic.ttf
+DroidSerif-Italic.ttf
+DroidSerif-Regular.ttf


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/google-droid-fonts/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	15 Jan 2009 20:27:08 -0000	1.1
+++ sources	23 Jan 2009 20:58:46 -0000	1.2
@@ -0,0 +1,8 @@
+2afdf28d5cdd079b41968cdabf1b469e  DroidSans-Bold.ttf
+6f28ad369fa0f2661cc2de7a7be9977e  DroidSans.ttf
+4caeadd734f4be9973163bdf02ea6cf5  DroidSansFallback.ttf
+3922dfe38a36da7d6edfb1fe77b276fb  DroidSansMono.ttf
+849a92990a80cbb665bfc74fd03743bd  DroidSerif-Bold.ttf
+a062025df92affc1331a05b7c07793fc  DroidSerif-BoldItalic.ttf
+a2e7305a0ba8bb7091124f4cd1485fc9  DroidSerif-Italic.ttf
+bfb2f44a7c1deba39f7f4d39bff18eeb  DroidSerif-Regular.ttf



From nim at fedoraproject.org  Fri Jan 23 20:59:19 2009
From: nim at fedoraproject.org (Nicolas Mailhot)
Date: Fri, 23 Jan 2009 20:59:19 +0000 (UTC)
Subject: rpms/google-droid-fonts/F-9 NOTICE, NONE, 1.1 README.txt, NONE,
	1.1 google-droid-fonts-sans-fontconfig.conf, NONE,
	1.1 google-droid-fonts-sans-mono-fontconfig.conf, NONE,
	1.1 google-droid-fonts-serif-fontconfig.conf, NONE,
	1.1 google-droid-fonts.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090123205919.3FB5C700FE@cvs1.fedora.phx.redhat.com>

Author: nim

Update of /cvs/extras/rpms/google-droid-fonts/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32377/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	NOTICE README.txt google-droid-fonts-sans-fontconfig.conf 
	google-droid-fonts-sans-mono-fontconfig.conf 
	google-droid-fonts-serif-fontconfig.conf 
	google-droid-fonts.spec import.log 
Log Message:
initial import


--- NEW FILE NOTICE ---

   Copyright (c) 2005-2008, The Android Open Source Project

   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.

   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.


                                 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



--- NEW FILE README.txt ---
Copyright (C) 2008 The Android Open Source Project

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.

##########

This directory contains the fonts for the platform. They are licensed
under the Apache 2 license.


--- NEW FILE google-droid-fonts-sans-fontconfig.conf ---
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
<fontconfig>
  <alias>
    <family>sans-serif</family>
    <prefer>
      <family>Droid Sans</family>
    </prefer>
  </alias>
  <alias>
    <family>Droid Sans</family>
    <default>
      <family>sans-serif</family>
    </default>
  </alias>
  <match target="scan">
    <test name="family">
      <string>Droid Sans Fallback</string>
    </test>
    <edit name="family">
      <string>Droid Sans</string>
    </edit>
  </match>
</fontconfig>


--- NEW FILE google-droid-fonts-sans-mono-fontconfig.conf ---
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
<fontconfig>
  <alias>
    <family>monospace</family>
    <prefer>
      <family>Droid Sans Mono</family>
    </prefer>
  </alias>
  <alias>
    <family>Droid Sans Mono</family>
    <default>
      <family>monospace</family>
    </default>
  </alias>
</fontconfig>


--- NEW FILE google-droid-fonts-serif-fontconfig.conf ---
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
<fontconfig>
  <alias>
    <family>serif</family>
    <prefer>
      <family>Droid Serif</family>
    </prefer>
  </alias>
  <alias>
    <family>Droid Serif</family>
    <default>
      <family>serif</family>
    </default>
  </alias>
</fontconfig>


--- NEW FILE google-droid-fonts.spec ---
%define fontname google-droid

%define download_root http://android.git.kernel.org/?p=platform/frameworks/base.git;a=blob_plain;f=data/fonts

%define common_desc \
The Droid typeface family was designed in the fall of 2006 by Ascender's \
Steve Matteson, as a commission from Google to create a set of system fonts \
for its Android platform. The goal was to provide optimal quality and comfort \
on a mobile handset when rendered in application menus, web browsers and for \
other screen text.

Name:    %{fontname}-fonts
# The font files all have the same version except for sans fallback which I'm going to ignore here
Version: 1.0.112
Release: 3%{?dist}
Summary: General-purpose fonts released by Google as part of Android

Group:     User Interface/X
License:   ASL 2.0
URL:       http://android.git.kernel.org/?p=platform/frameworks/base.git;a=tree;f=data/fonts
Source1:   %{download_root}/DroidSans.ttf
Source2:   %{download_root}/DroidSans-Bold.ttf
Source3:   %{download_root}/DroidSansFallback.ttf
Source4:   %{download_root}/DroidSansMono.ttf
Source5:   %{download_root}/DroidSerif-Regular.ttf
Source6:   %{download_root}/DroidSerif-Bold.ttf
Source7:   %{download_root}/DroidSerif-Italic.ttf
Source8:   %{download_root}/DroidSerif-BoldItalic.ttf
Source9:   %{download_root}/NOTICE
Source10:  %{download_root}/README.txt
Source11:  %{name}-sans-fontconfig.conf
Source12:  %{name}-sans-mono-fontconfig.conf
Source13:  %{name}-serif-fontconfig.conf
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

BuildArch:     noarch
BuildRequires: fontpackages-devel

%description
%common_desc


%package common
Summary:  Common files of the Droid font set
Group:    User Interface/X
Requires: fontpackages-filesystem

%description common
%common_desc

This package consists of files used by other %{name} packages.

%package -n %{fontname}-sans-fonts
Summary:  A humanist sans serif typeface
Group:    User Interface/X
Requires: %{name}-common = %{version}-%{release}

%description -n %{fontname}-sans-fonts
%common_desc

Droid Sans is a humanist sans serif typeface designed for user interfaces and
electronic communication.

%_font_pkg -n sans -f ??-%{fontname}-sans.conf DroidSans.ttf DroidSans-Bold.ttf DroidSansFallback.ttf


%package -n %{fontname}-sans-mono-fonts
Summary:  A humanist monospace sans serif typeface
Group:    User Interface/X
Requires: %{name}-common = %{version}-%{release}

%description -n %{fontname}-sans-mono-fonts
%common_desc

Droid Sans Mono is a humanist monospace sans serif typeface designed for user
interfaces and electronic communication.

%_font_pkg -n sans-mono -f ??-%{fontname}-sans-mono.conf DroidSansMono.ttf


%package -n %{fontname}-serif-fonts
Summary:  A serif typeface
Group:    User Interface/X
Requires: %{name}-common = %{version}-%{release}

%description -n %{fontname}-serif-fonts
%common_desc

Droid Serif is a contemporary serif typeface family designed for comfortable
reading on screen. Droid Serif is slightly condensed to maximize the amount of
text displayed on small screens. Vertical stress and open forms contribute to
its readability while its proportion and overall design complement its
companion Droid Sans.

%_font_pkg -n serif -f ??-%{fontname}-serif.conf DroidSerif*ttf


%prep
%setup -q -c -T
install -m 0644 -p %{SOURCE9}  notice.txt
install -m 0644 -p %{SOURCE10} readme.txt


%build


%install
rm -fr %{buildroot}

install -m 0755 -d %{buildroot}%{_fontdir}

install -m 0644 -p  %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} \
                    %{SOURCE6} %{SOURCE7} %{SOURCE8} %{buildroot}%{_fontdir}

install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} \
                   %{buildroot}%{_fontconfig_confdir}

install -m 0644 -p %{SOURCE11} \
        %{buildroot}%{_fontconfig_templatedir}/65-%{fontname}-sans.conf
install -m 0644 -p %{SOURCE12} \
        %{buildroot}%{_fontconfig_templatedir}/60-%{fontname}-sans-mono.conf
install -m 0644 -p %{SOURCE13} \
        %{buildroot}%{_fontconfig_templatedir}/59-%{fontname}-serif.conf

for fontconf in 59-%{fontname}-sans.conf \
                59-%{fontname}-sans-mono.conf \
                59-%{fontname}-serif.conf ; do
  ln -s %{_fontconfig_templatedir}/$fontconf \
        %{buildroot}%{_fontconfig_confdir}/$fontconf
done


%clean
rm -fr %{buildroot}


%files common
%defattr(0644,root,root,0755)
%doc *.txt

%dir %{_fontdir}


%changelog
* Fri Jan 16 2009 <nicolas.mailhot at laposte.net>
- 1.0.112-3
??? Workaround RHEL5 rpmbuild UTF-8 handling bug
- 1.0.112-2
??? Convert to new naming guidelines
??? Do strange stuff with Sans Fallback (CJK users please check)

* Tue Dec  9 2008 <nicolas.mailhot at laposte.net>
- 1.0.112-1
?? Licensing bit clarified in bug #472635
?? Fedora submission

* Sun Nov 23 2008 <nicolas.mailhot at laposte.net>
- 1.0.107-1
?? Initial built using ???fontpackages???



--- NEW FILE import.log ---
google-droid-fonts-1_0_112-3_fc11:F-9:google-droid-fonts-1.0.112-3.fc11.src.rpm:1232744230


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/google-droid-fonts/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	15 Jan 2009 20:27:08 -0000	1.1
+++ .cvsignore	23 Jan 2009 20:58:48 -0000	1.2
@@ -0,0 +1,8 @@
+DroidSans-Bold.ttf
+DroidSans.ttf
+DroidSansFallback.ttf
+DroidSansMono.ttf
+DroidSerif-Bold.ttf
+DroidSerif-BoldItalic.ttf
+DroidSerif-Italic.ttf
+DroidSerif-Regular.ttf


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/google-droid-fonts/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	15 Jan 2009 20:27:08 -0000	1.1
+++ sources	23 Jan 2009 20:58:48 -0000	1.2
@@ -0,0 +1,8 @@
+2afdf28d5cdd079b41968cdabf1b469e  DroidSans-Bold.ttf
+6f28ad369fa0f2661cc2de7a7be9977e  DroidSans.ttf
+4caeadd734f4be9973163bdf02ea6cf5  DroidSansFallback.ttf
+3922dfe38a36da7d6edfb1fe77b276fb  DroidSansMono.ttf
+849a92990a80cbb665bfc74fd03743bd  DroidSerif-Bold.ttf
+a062025df92affc1331a05b7c07793fc  DroidSerif-BoldItalic.ttf
+a2e7305a0ba8bb7091124f4cd1485fc9  DroidSerif-Italic.ttf
+bfb2f44a7c1deba39f7f4d39bff18eeb  DroidSerif-Regular.ttf



From salimma at fedoraproject.org  Fri Jan 23 21:02:03 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Fri, 23 Jan 2009 21:02:03 +0000 (UTC)
Subject: rpms/banshee/F-10 x-content.patch,1.1,NONE
Message-ID: <20090123210203.F2DBF700FE@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/banshee/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv581/F-10

Removed Files:
	x-content.patch 
Log Message:
Remove obsolete patch



--- x-content.patch DELETED ---



From salimma at fedoraproject.org  Fri Jan 23 21:02:04 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Fri, 23 Jan 2009 21:02:04 +0000 (UTC)
Subject: rpms/banshee/F-9 x-content.patch,1.1,NONE
Message-ID: <20090123210204.245A870141@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/banshee/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv581/F-9

Removed Files:
	x-content.patch 
Log Message:
Remove obsolete patch



--- x-content.patch DELETED ---



From salimma at fedoraproject.org  Fri Jan 23 21:02:04 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Fri, 23 Jan 2009 21:02:04 +0000 (UTC)
Subject: rpms/banshee/devel x-content.patch,1.1,NONE
Message-ID: <20090123210204.69309700FE@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/banshee/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv581/devel

Removed Files:
	x-content.patch 
Log Message:
Remove obsolete patch



--- x-content.patch DELETED ---



From cebbert at fedoraproject.org  Fri Jan 23 21:05:02 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Fri, 23 Jan 2009 21:05:02 +0000 (UTC)
Subject: rpms/kernel/F-9 patch-2.6.27.13-rc1.bz2.sign, NONE,
	1.1.2.1 .cvsignore, 
	1.837.2.3, 1.837.2.4 kernel.spec, 1.891.2.9, 1.891.2.10 sources,
	1.798.2.3, 1.798.2.4 upstream, 1.717.2.3, 1.717.2.4
	linux-2.6-net-sctp-avoid-memory-overflow-while-FWD-TSN-chunk-is-r.patch,
	1.1.2.1, NONE
Message-ID: <20090123210502.8AC09700FE@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1715

Modified Files:
      Tag: private-fedora-9-2_6_27-branch
	.cvsignore kernel.spec sources upstream 
Added Files:
      Tag: private-fedora-9-2_6_27-branch
	patch-2.6.27.13-rc1.bz2.sign 
Removed Files:
      Tag: private-fedora-9-2_6_27-branch
	linux-2.6-net-sctp-avoid-memory-overflow-while-FWD-TSN-chunk-is-r.patch 
Log Message:
2.6.27.13-rc1
  Dropped patches (merged upstream):
    linux-2.6-net-sctp-avoid-memory-overflow-while-FWD-TSN-chunk-is-r.patch


--- NEW FILE patch-2.6.27.13-rc1.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBJeTdkyGugalF9Dw4RAhoEAJ9/DYBDZO/PqWNy+XWZrb5ihThlbgCeL4pj
zcvdZfoJueSeBtDcmiKueNU=
=yxs7
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/.cvsignore,v
retrieving revision 1.837.2.3
retrieving revision 1.837.2.4
diff -u -r1.837.2.3 -r1.837.2.4
--- .cvsignore	19 Jan 2009 07:23:09 -0000	1.837.2.3
+++ .cvsignore	23 Jan 2009 21:04:31 -0000	1.837.2.4
@@ -5,3 +5,4 @@
 kernel-2.6.27
 linux-2.6.27.tar.bz2
 patch-2.6.27.12.bz2
+patch-2.6.27.13-rc1.bz2


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/kernel.spec,v
retrieving revision 1.891.2.9
retrieving revision 1.891.2.10
diff -u -r1.891.2.9 -r1.891.2.10
--- kernel.spec	23 Jan 2009 03:06:51 -0000	1.891.2.9
+++ kernel.spec	23 Jan 2009 21:04:31 -0000	1.891.2.10
@@ -36,9 +36,9 @@
 %if 0%{?released_kernel}
 
 # Do we have a -stable update to apply?
-%define stable_update 12
+%define stable_update 13
 # Is it a -stable RC?
-%define stable_rc 0
+%define stable_rc 1
 # Set rpm version accordingly
 %if 0%{?stable_update}
 %define stablerev .%{stable_update}
@@ -715,9 +715,6 @@
 
 Patch2030: linux-2.6-net-tulip-interrupt.patch
 
-# CVE-2009-0065 SCTP buffer overflow
-Patch2031: linux-2.6-net-sctp-avoid-memory-overflow-while-FWD-TSN-chunk-is-r.patch
-
 # linux1394 git patches
 Patch2200: linux-2.6-firewire-git-update.patch
 Patch2201: linux-2.6-firewire-git-pending.patch
@@ -1291,8 +1288,6 @@
 
 ApplyPatch linux-2.6-net-tulip-interrupt.patch
 
-ApplyPatch linux-2.6-net-sctp-avoid-memory-overflow-while-FWD-TSN-chunk-is-r.patch
-
 # Nouveau DRM + drm fixes
 ApplyPatch drm-fedora9-rollup.patch
 ApplyPatch drm-mm-readd-nopfn.patch
@@ -1915,6 +1910,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
+* Fri Jan 23 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.27.13-78.2.10
+- 2.6.27.13-rc1
+  Dropped patches (merged upstream):
+    linux-2.6-net-sctp-avoid-memory-overflow-while-FWD-TSN-chunk-is-r.patch
+
 * Thu Jan 22 2009 Dennis Gilmore <dennis at ausil.us 2.6.27.12-78.2.9
 - fix DAX handling on niagara
 - cs4231 ebus dma fixes


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/sources,v
retrieving revision 1.798.2.3
retrieving revision 1.798.2.4
diff -u -r1.798.2.3 -r1.798.2.4
--- sources	19 Jan 2009 07:23:10 -0000	1.798.2.3
+++ sources	23 Jan 2009 21:04:31 -0000	1.798.2.4
@@ -1,2 +1,3 @@
 b3e78977aa79d3754cb7f8143d7ddabd  linux-2.6.27.tar.bz2
 6ec5b819521600fc5bd20b17a939113d  patch-2.6.27.12.bz2
+f4cc0a09c5c0d1cab14586d906ce9d8f  patch-2.6.27.13-rc1.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/upstream,v
retrieving revision 1.717.2.3
retrieving revision 1.717.2.4
diff -u -r1.717.2.3 -r1.717.2.4
--- upstream	19 Jan 2009 07:23:10 -0000	1.717.2.3
+++ upstream	23 Jan 2009 21:04:31 -0000	1.717.2.4
@@ -1,2 +1,3 @@
 linux-2.6.27.tar.bz2
 patch-2.6.27.12.bz2
+patch-2.6.27.13-rc1.bz2


--- linux-2.6-net-sctp-avoid-memory-overflow-while-FWD-TSN-chunk-is-r.patch DELETED ---



From dwalsh at fedoraproject.org  Fri Jan 23 21:48:52 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Fri, 23 Jan 2009 21:48:52 +0000 (UTC)
Subject: rpms/selinux-policy/devel policy-20090105.patch,1.19,1.20
Message-ID: <20090123214852.EB82B700FE@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6802

Modified Files:
	policy-20090105.patch 
Log Message:
* Fri Jan 23 2009 Dan Walsh <dwalsh at redhat.com> 3.6.3-8
- Add policy to make dbus/nm-applet work


policy-20090105.patch:

Index: policy-20090105.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-20090105.patch,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- policy-20090105.patch	23 Jan 2009 20:35:45 -0000	1.19
+++ policy-20090105.patch	23 Jan 2009 21:48:22 -0000	1.20
@@ -12881,7 +12881,7 @@
  /usr/libexec/hald-addon-macbookpro-backlight --	gen_context(system_u:object_r:hald_mac_exec_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.if serefpolicy-3.6.3/policy/modules/services/hal.if
 --- nsaserefpolicy/policy/modules/services/hal.if	2008-11-19 11:51:44.000000000 -0500
-+++ serefpolicy-3.6.3/policy/modules/services/hal.if	2009-01-23 14:59:53.000000000 -0500
++++ serefpolicy-3.6.3/policy/modules/services/hal.if	2009-01-23 16:29:03.000000000 -0500
 @@ -20,6 +20,24 @@
  
  ########################################
@@ -12919,14 +12919,14 @@
  ')
  
  ########################################
-@@ -340,3 +355,60 @@
+@@ -340,3 +355,41 @@
  	files_search_pids($1)
  	allow $1 hald_var_run_t:file rw_file_perms;
  ')
 +
 +########################################
 +## <summary>
-+##	Read/Write hald PID files.
++##	Manage hald PID dirs.
 +## </summary>
 +## <param name="domain">
 +##	<summary>
@@ -12934,13 +12934,13 @@
 +##	</summary>
 +## </param>
 +#
-+interface(`hal_rw_pid_files',`
++interface(`hal_manage_pid_dirs',`
 +	gen_require(`
 +		type hald_var_run_t;
 +	')
 +
 +	files_search_pids($1)
-+	allow $1 hald_var_run_t:file rw_file_perms;
++	manage_dirs_pattern($1, hald_var_run_t, hald_var_run_t)
 +')
 +
 +########################################
@@ -12961,25 +12961,6 @@
 +	files_search_pids($1)
 +	manage_files_pattern($1, hald_var_run_t, hald_var_run_t)
 +')
-+
-+########################################
-+## <summary>
-+##	Manage hald PID dirs.
-+## </summary>
-+## <param name="domain">
-+##	<summary>
-+##	Domain allowed access.
-+##	</summary>
-+## </param>
-+#
-+interface(`hal_manage_pid_dirs',`
-+	gen_require(`
-+		type hald_var_run_t;
-+	')
-+
-+	files_search_pids($1)
-+	manage_dirs_pattern($1, hald_var_run_t, hald_var_run_t)
-+')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.te serefpolicy-3.6.3/policy/modules/services/hal.te
 --- nsaserefpolicy/policy/modules/services/hal.te	2009-01-19 11:06:49.000000000 -0500
 +++ serefpolicy-3.6.3/policy/modules/services/hal.te	2009-01-20 11:41:48.000000000 -0500
@@ -22837,7 +22818,7 @@
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.te serefpolicy-3.6.3/policy/modules/services/xserver.te
 --- nsaserefpolicy/policy/modules/services/xserver.te	2009-01-19 11:06:49.000000000 -0500
-+++ serefpolicy-3.6.3/policy/modules/services/xserver.te	2009-01-23 10:14:45.000000000 -0500
++++ serefpolicy-3.6.3/policy/modules/services/xserver.te	2009-01-23 16:45:11.000000000 -0500
 @@ -34,6 +34,13 @@
  
  ## <desc>
@@ -23337,6 +23318,15 @@
  
  modutils_domtrans_insmod(xserver_t)
  
+@@ -742,7 +868,7 @@
+ ')
+ 
+ ifdef(`enable_mls',`
+-	range_transition xserver_t xserver_tmp_t:sock_file s0 - mls_systemhigh;
++#	range_transition xserver_t xserver_tmp_t:sock_file s0 - mls_systemhigh;
+ 	range_transition xserver_t xserver_t:x_drawable s0 - mls_systemhigh;
+ ')
+ 
 @@ -774,6 +900,10 @@
  ')
  



From jcollie at fedoraproject.org  Fri Jan 23 22:31:06 2009
From: jcollie at fedoraproject.org (Jeffrey C. Ollie)
Date: Fri, 23 Jan 2009 22:31:06 +0000 (UTC)
Subject: rpms/asterisk/F-10 .cvsignore, 1.19, 1.20 asterisk.spec, 1.42,
	1.43 sources, 1.19, 1.20
Message-ID: <20090123223106.4DEC4700FE@cvs1.fedora.phx.redhat.com>

Author: jcollie

Update of /cvs/pkgs/rpms/asterisk/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11915

Modified Files:
	.cvsignore asterisk.spec sources 
Log Message:
* Fri Jan 23 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6.0.5-1
- Update to 1.6.0.5 to fix regressions caused by fixes for
  AST-2009-001/CVE-2009-0041 (Asterisk 1.6.0.4 was never released).



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/F-10/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- .cvsignore	8 Jan 2009 21:25:49 -0000	1.19
+++ .cvsignore	23 Jan 2009 22:30:35 -0000	1.20
@@ -1 +1 @@
-asterisk-1.6.0.3-stripped.tar.gz
+asterisk-1.6.0.5-stripped.tar.gz


Index: asterisk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/F-10/asterisk.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- asterisk.spec	8 Jan 2009 21:25:49 -0000	1.42
+++ asterisk.spec	23 Jan 2009 22:30:35 -0000	1.43
@@ -2,7 +2,7 @@
 
 Summary: The Open Source PBX
 Name: asterisk
-Version: 1.6.0.3
+Version: 1.6.0.5
 Release: 1%{?dist}
 License: GPLv2
 Group: Applications/Internet
@@ -19,13 +19,13 @@
 
 # MD5 Sums
 # ========
-# 0797cfc8834b06e5a0169b2fda6f7bb9  asterisk-1.6.0.3.tar.gz
-# eefe39842fac3f5bd3c7b3a6c378bb5c  asterisk-1.6.0.3-stripped.tar.gz
+# 11210cf7c59cde03d928743e71fcb556  asterisk-1.6.0.5.tar.gz
+# 29bdc7428266b75aac77d66acd8c88a0  asterisk-1.6.0.5-stripped.tar.gz
 #
 # SHA1 Sums
 # =========
-# bdede6d5113a5b0006b186a72e81c886d48ae4db  asterisk-1.6.0.3.tar.gz
-# e14b25b16d49a8b7400353e0588cc8e8d1768c5c  asterisk-1.6.0.3-stripped.tar.gz
+# f2a2cd9be274dc4a7e6001f877197863b4ba8e15  asterisk-1.6.0.5.tar.gz
+# 25b92e9675d72c784018bddf0ddb458cab9e4185  asterisk-1.6.0.5-stripped.tar.gz
 
 Source0: asterisk-%{version}-stripped.tar.gz
 Source1: asterisk-logrotate
@@ -1052,6 +1052,10 @@
 %{_libdir}/asterisk/modules/app_voicemail_plain.so
 
 %changelog
+* Fri Jan 23 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6.0.5-1
+- Update to 1.6.0.5 to fix regressions caused by fixes for
+  AST-2009-001/CVE-2009-0041 (Asterisk 1.6.0.4 was never released).
+
 * Thu Jan  8 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6.0.3-1
 - Update to 1.6.0.3 to fix AST-2009-001/CVE-2009-0041
 - http://downloads.digium.com/pub/security/AST-2009-001.html


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/F-10/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources	8 Jan 2009 21:25:49 -0000	1.19
+++ sources	23 Jan 2009 22:30:35 -0000	1.20
@@ -1 +1 @@
-eefe39842fac3f5bd3c7b3a6c378bb5c  asterisk-1.6.0.3-stripped.tar.gz
+29bdc7428266b75aac77d66acd8c88a0  asterisk-1.6.0.5-stripped.tar.gz



From rdieter at fedoraproject.org  Fri Jan 23 22:33:49 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 23 Jan 2009 22:33:49 +0000 (UTC)
Subject: rpms/kdebase-runtime/F-10 kdebase-runtime-4.1.70-pulseaudio.patch, 
	NONE, 1.1 .cvsignore, 1.23, 1.24 kdebase-runtime.spec, 1.79,
	1.80 sources, 1.25, 1.26 kdebase-runtime-4.1.0-pulseaudio.patch,
	1.1, NONE
Message-ID: <20090123223349.A7BD7700FE@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdebase-runtime/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12335

Modified Files:
	.cvsignore kdebase-runtime.spec sources 
Added Files:
	kdebase-runtime-4.1.70-pulseaudio.patch 
Removed Files:
	kdebase-runtime-4.1.0-pulseaudio.patch 
Log Message:
sync w/devel, kde-4.2 hotness


kdebase-runtime-4.1.70-pulseaudio.patch:

--- NEW FILE kdebase-runtime-4.1.70-pulseaudio.patch ---
diff -Naur kdebase-runtime-4.1.70/phonon/kcm/globalconfig.cpp kdebase-runtime-4.1.70.pulseaudio/phonon/kcm/globalconfig.cpp
--- kdebase-runtime-4.1.70/phonon/kcm/globalconfig.cpp	2008-07-17 23:32:48.000000000 +0200
+++ kdebase-runtime-4.1.70.pulseaudio/phonon/kcm/globalconfig.cpp	2008-10-21 18:49:35.000000000 +0200
@@ -28,6 +28,7 @@
 #include "phononnamespace_p.h"
 
 #include <QtCore/QList>
+#include <QtCore/QHash>
 #include <QtCore/QVariant>
 
 QT_BEGIN_NAMESPACE
@@ -158,6 +159,15 @@
                     | (defaultList.isEmpty() ? 0 : FilterHardwareDevices)
                     );
         }
+        // make PulseAudio the global default (assume it is already default in this list)
+        if (!list.isEmpty()) {
+            int firstIndex = list.first();
+            if (backendIface->objectDescriptionProperties(Phonon::AudioOutputDeviceType,
+                  firstIndex)["name"].toString() == "PulseAudio") {
+                list.removeFirst();
+                defaultList.prepend(firstIndex);
+            }
+        }
         defaultList += list;
     }
 
@@ -212,6 +222,15 @@
                     | (defaultList.isEmpty() ? 0 : FilterHardwareDevices)
                   );
         }
+        // make PulseAudio the global default (assume it is already default in this list)
+        if (!list.isEmpty()) {
+            int firstIndex = list.first();
+            if (backendIface->objectDescriptionProperties(Phonon::AudioCaptureDeviceType,
+                  firstIndex)["name"].toString() == "PulseAudio") {
+                list.removeFirst();
+                defaultList.prepend(firstIndex);
+            }
+        }
         defaultList += list;
     }
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-runtime/F-10/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- .cvsignore	8 Jan 2009 14:16:44 -0000	1.23
+++ .cvsignore	23 Jan 2009 22:33:19 -0000	1.24
@@ -1 +1,2 @@
-kdebase-runtime-4.1.4.tar.bz2
+kdebase-runtime-4.1.96.tar.bz2
+kdebase-runtime-4.2.0.tar.bz2


Index: kdebase-runtime.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-runtime/F-10/kdebase-runtime.spec,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- kdebase-runtime.spec	22 Jan 2009 04:53:52 -0000	1.79
+++ kdebase-runtime.spec	23 Jan 2009 22:33:19 -0000	1.80
@@ -1,5 +1,3 @@
-%define _default_patch_fuzz 2
-
 %if 0%{?fedora} < 9
 # # kde3_desktop=1 -> kde3 is primary desktop, omit conflicting bits here
 %define kde3_desktop 1
@@ -8,29 +6,20 @@
 %define _with_samba --with-samba
 
 Name:          kdebase-runtime
-Summary:       K Desktop Environment - Runtime 
-Version:       4.1.4
-Release:       2%{?dist}
+Summary:       K Desktop Environment - Runtime
+Version:       4.2.0
+Release:       1%{?dist}
 
 License:       GPLv2
 Group:         User Interface/Desktops
 URL:           http://www.kde.org/
 Source0:       ftp://ftp.kde.org/pub/kde/stable/%{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
+Patch0:        kdebase-runtime-4.1.70-pulseaudio.patch
 Patch1:        kdebase-runtime-4.1.x-searchproviders-shortcuts.patch
 Patch2:        kdebase-runtime-4.1.1-knetattach.patch
 Patch3:        kdebase-runtime-4.1.1-iconthemes-inherit.patch
-# Upstream patces
+# Upstream patches
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %ifarch noarch
@@ -58,24 +47,21 @@
 %endif
 
 BuildRequires: alsa-lib-devel
-BuildRequires: cmake
 BuildRequires: clucene-core-devel
-BuildRequires: giflib-devel
 BuildRequires: hal-devel
 BuildRequires: kdelibs4-devel >= %{version}
 BuildRequires: kdepimlibs-devel >= %{version}
 %{?_with_samba:BuildRequires: libsmbclient-devel}
+# needed for phonon-xine VideoWidget, also need xine-lib built with libxcb support
+BuildRequires: libxcb-devel
 BuildRequires: libXScrnSaver-devel
 BuildRequires: OpenEXR-devel
 BuildRequires: openssl-devel
-BuildRequires: pcre-devel
 BuildRequires: pkgconfig
+BuildRequires: pulseaudio-libs-devel
 BuildRequires: qimageblitz-devel
-BuildRequires: soprano-devel >= 2.0.97
-BuildRequires: strigi-devel >= 0.5.7
+BuildRequires: soprano-devel
 BuildRequires: xine-lib-devel
-# needed for phonon-xine VideoWidget, also need xine-lib built with libxcb support
-BuildRequires: libxcb-devel
 # needed?
 BuildRequires: xorg-x11-font-utils
 BuildRequires: xorg-x11-proto-devel
@@ -111,15 +97,6 @@
 %description -n oxygen-icon-theme-scalable
 %{summary}.
 
-%package -n phonon-backend-xine
-Summary: Xine phonon backend
-Group:   Applications/Multimedia
-# not sure exactly how best to version this one -- Rex
-Provides: phonon-backend = 4.2 
-%description -n phonon-backend-xine 
-%{summary}.
-
-
 %prep
 %setup -q -n kdebase-runtime-%{version}
 
@@ -132,7 +109,7 @@
 
 %build
 
-mkdir -p %{_target_platform} 
+mkdir -p %{_target_platform}
 pushd %{_target_platform}
 %{cmake_kde4} ..
 popd
@@ -153,19 +130,8 @@
 %endif
 
 %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
+make install/fast DESTDIR=%{buildroot} -C %{_target_platform}/pics/oxygen
+
 %if ! 0%{?rest}
 ln -sf oxygen %{buildroot}%{_kde4_iconsdir}/default.kde4
 %endif
@@ -271,10 +237,7 @@
 # FIXME: -devel type files, omit for now
 rm -rf %{buildroot}%{_kde4_includedir}/phonon/
 rm -f  %{buildroot}%{_kde4_libdir}/libkaudiodevicelist.so
-#   /usr/include/kde4/phonon/audiodevice.h
-#   /usr/include/kde4/phonon/audiodeviceenumerator.h
-#   /usr/include/kde4/phonon/kaudiodevicelist_export.h
-#   /usr/lib64/libkaudiodevicelist.so
+rm -f  %{buildroot}%{_kde4_libdir}/libkwalletbackend.so
 
 %endif
 
@@ -294,7 +257,6 @@
 xdg-desktop-menu forceupdate 2> /dev/null || :
 
 %post libs -p /sbin/ldconfig
-
 %postun libs -p /sbin/ldconfig
 
 %if 0%{?icons}
@@ -318,6 +280,7 @@
 %files
 %defattr(-,root,root,-)
 %{_kde4_bindir}/*
+# FIXME(?), currently contains cmake/modules -- Rex
 %{_kde4_appsdir}/*
 %{_kde4_configdir}/*.knsrc
 %{_kde4_datadir}/autostart/nepomukserver.desktop
@@ -331,14 +294,11 @@
 %{_kde4_libdir}/libkdeinit4_*.so
 %{_kde4_libdir}/kde4/kcm_*.so
 %{_kde4_libdir}/kde4/kded_*.so
+%{_kde4_libdir}/libkwalletbackend.so.*
 %{_kde4_libexecdir}/*
 %{_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/*
@@ -356,20 +316,9 @@
 
 %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
-
-%files -n phonon-backend-xine
-%defattr(-,root,root,-)
-%{_kde4_libdir}/kde4/kcm_phononxine.so
-%{_kde4_datadir}/kde4/services/kcm_phononxine.desktop
-%{_kde4_libdir}/kde4/phonon_xine.so
-%{_kde4_datadir}/kde4/services/phononbackends/xine.desktop
 
 %endif
 
@@ -387,14 +336,53 @@
 
 
 %changelog
-* Wed Jan 21 2009 Rex Dieter <rdieter at fedoraproject.org> 4.1.4-2
+* Thu Jan 22 2009 Than Ngo <than at redhat.com> - 4.2.0-1
+- 4.2.0
+- +BR: pulseaudio-libs-devel xine-lib-devel
+- -BR: giflib-devel pcre-devel
+
+* Tue Jan 13 2009 Rex Dieter <rdieter at fedoraproject.org> 4.1.96-2
+- tarball respin
+- drop extraneous deps (that are in kdelibs)
+
+* Wed Jan 07 2009 Than Ngo <than at redhat.com> - 4.1.96-1
+- 4.2rc1
+
+* Mon Dec 22 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.85-2
 - include %%_bindir/kdesu symlink
 
-* Thu Jan  8 2009 Luk???? Tinkl <ltinkl at redhat.com> 4.1.4-1
-- KDE 4.1.4
+* Thu Dec 11 2008 Than Ngo <than at redhat.com> 4.1.85-1
+- 4.2beta2
+
+* Mon Dec 01 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.80-5
+- don't ship libkwalletbackend.so devel symlink (conflicts with kdelibs3-devel,
+  and should be in a -devel package if it gets shipped)
+
+* Thu Nov 27 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.80-4
+- BR strigi-devel >= 0.5.11.1 because 0.5.11 is broken
+
+* Thu Nov 20 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.80-3
+- readd still relevant part of the Phonon PulseAudio patch (for the KCM)
+
+* Wed Nov 19 2008 Than Ngo <than at redhat.com> 4.1.80-2
+- drop kdebase-runtime-4.0.72-pulseaudio.patch/icons, it's part of phonon
+
+* Fri Nov 19 2008 Lorenzo Villani <lvillani at binaryhelix.net> - 4.1.80-1
+- 4.1.80
+- Drop upstreamed patch kdebase-runtime-4.1.2-kioexec.patch
+- BR cmake >= 2.6.2
+- Use 'make install/fast'
+- Drop subpkg phonon-backend-xine and related file entries: this has to be
+  part of phonon now that it moved there
+- Drop xine-lib-devel BR
+- Add libkwalletbackend to files list
+- Drop _default_patch_fuzz 2
+
+* Thu Nov 13 2008 Than Ngo <than at redhat.com> 4.1.3-5
+- apply upstream patch to fix X crash when disabling compositing
 
 * Wed Nov 12 2008 Than Ngo <than at redhat.com> 4.1.3-1
-- KDE 4.1.3
+- 4.1.3
 
 * Tue Oct 14 2008 Than Ngo <than at redhat.com> 4.1.2-5
 - apply upstream patch, kioexec processes never terminate
@@ -465,7 +453,7 @@
 - 4.0.82
 
 * Thu Jun 05 2008 Than Ngo <than at redhat.com> 4.0.80-2
-- add searchproviders-shortcuts for redhat bugzilla 
+- add searchproviders-shortcuts for redhat bugzilla
 
 * Mon May 26 2008 Than Ngo <than at redhat.com> 4.0.80-1
 - 4.1 beta 1
@@ -515,7 +503,7 @@
 - 4.0.3
 
 * Thu Mar 20 2008 Rex Dieter <rdieter at fedoraproject.org> 4.0.2-5
-- don't own %%_kde4_docdir/HTML/en/ 
+- don't own %%_kde4_docdir/HTML/en/
 
 * Thu Mar 20 2008 Rex Dieter <rdieter at fedoraproject.org> 4.0.2-4
 - oxygen-icon-theme, oxygen-icon-theme-scalable pkgs
@@ -551,7 +539,7 @@
 * Wed Dec 05 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.97.0-1
 - kde-3.97.0
 
-* Tue Dec 04 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.96.2-4 
+* Tue Dec 04 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.96.2-4
 - disable kioslave/smb (f9+, samba-3.2.x/gplv3 ickiness)
 
 * Sun Dec 02 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.96.2-3


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-runtime/F-10/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- sources	8 Jan 2009 14:16:44 -0000	1.25
+++ sources	23 Jan 2009 22:33:19 -0000	1.26
@@ -1,9 +1 @@
-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
-fad82875745bacbb52001eabf9c71202  kdebase-runtime-4.1.4.tar.bz2
+9e56281e9daa579d56cfda794f1bbc10  kdebase-runtime-4.2.0.tar.bz2


--- kdebase-runtime-4.1.0-pulseaudio.patch DELETED ---



From rdieter at fedoraproject.org  Fri Jan 23 22:37:05 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 23 Jan 2009 22:37:05 +0000 (UTC)
Subject: rpms/kdegraphics/F-10 .cvsignore, 1.52, 1.53 kdegraphics.spec, 1.182,
	1.183 sources, 1.60,
	1.61 kdegraphics-4.1.3-libkdcraw-0.4.0.patch, 1.2,
	NONE kdegraphics-4.1.3-libkexiv2-0.5.0.patch, 1.2,
	NONE kdegraphics-4.1.3-libkipi-0.3.0.patch, 1.2, NONE
Message-ID: <20090123223705.EA3DC70141@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdegraphics/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12746

Modified Files:
	.cvsignore kdegraphics.spec sources 
Removed Files:
	kdegraphics-4.1.3-libkdcraw-0.4.0.patch 
	kdegraphics-4.1.3-libkexiv2-0.5.0.patch 
	kdegraphics-4.1.3-libkipi-0.3.0.patch 
Log Message:
sync w/devel, kde-4.2 coolness



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdegraphics/F-10/.cvsignore,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- .cvsignore	9 Jan 2009 00:41:29 -0000	1.52
+++ .cvsignore	23 Jan 2009 22:36:34 -0000	1.53
@@ -1 +1,5 @@
-kdegraphics-4.1.4.tar.bz2
+kdegraphics-4.1.2.tar.bz2
+kdegraphics-4.1.80.tar.bz2
+kdegraphics-4.1.85.tar.bz2
+kdegraphics-4.1.96.tar.bz2
+kdegraphics-4.2.0.tar.bz2


Index: kdegraphics.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdegraphics/F-10/kdegraphics.spec,v
retrieving revision 1.182
retrieving revision 1.183
diff -u -r1.182 -r1.183
--- kdegraphics.spec	9 Jan 2009 00:41:29 -0000	1.182
+++ kdegraphics.spec	23 Jan 2009 22:36:35 -0000	1.183
@@ -1,5 +1,4 @@
-
-%if 0%{?fedora} > 9 
+%if 0%{?fedora} > 9
 %define obsolete_kde3_kipi 1
 %else
 %define omit_kde3_conflicts 1
@@ -7,7 +6,7 @@
 
 Summary:        K Desktop Environment - Graphics Applications
 Epoch:          7
-Version:        4.1.4
+Version:        4.2.0
 Release:        1%{?dist}
 
 Name:           kdegraphics
@@ -22,26 +21,14 @@
 
 ## upstream patches
 
-## kipi framework backports from trunk (4.2)
-## don't bother updating these, rediff them from the next tag instead!
-# LANG=en_US.UTF-8 svn diff svn://anonsvn.kde.org/home/kde/tags/KDE/4.1.3/kdegraphics/libs/libkexiv2 \
-# svn://anonsvn.kde.org/home/kde/trunk/KDE/kdegraphics/libs/libkexiv2 >kdegraphics-4.1.3-libkexiv2-0.5.0.patch
-Patch200: kdegraphics-4.1.3-libkexiv2-0.5.0.patch
-# LANG=en_US.UTF-8 svn diff svn://anonsvn.kde.org/home/kde/tags/KDE/4.1.3/kdegraphics/libs/libkdcraw \
-# svn://anonsvn.kde.org/home/kde/trunk/KDE/kdegraphics/libs/libkdcraw >kdegraphics-4.1.3-libkdcraw-0.4.0.patch
-Patch201: kdegraphics-4.1.3-libkdcraw-0.4.0.patch
-# LANG=en_US.UTF-8 svn diff svn://anonsvn.kde.org/home/kde/tags/KDE/4.1.3/kdegraphics/libs/libkipi \
-# svn://anonsvn.kde.org/home/kde/trunk/KDE/kdegraphics/libs/libkipi >kdegraphics-4.1.3-libkipi-0.3.0.patch
-Patch202: kdegraphics-4.1.3-libkipi-0.3.0.patch
-
-BuildRequires:  kde-filesystem >= 4
 BuildRequires:  kdelibs4-devel >= %{version}
-BuildRequires:  cmake
+BuildRequires:  kdepimlibs-devel >= %{version}
 BuildRequires:  chmlib-devel
 BuildRequires:  djvulibre-devel
 BuildRequires:  ebook-tools-devel
 BuildRequires:  exiv2-devel
 BuildRequires:  giflib-devel
+BuildRequires:  lcms-devel
 %if 0%{?fedora} > 9
 BuildRequires:  libgphoto2-devel
 %else
@@ -55,12 +42,12 @@
 BuildRequires:  qca2-devel
 BuildRequires:  qimageblitz-devel
 BuildRequires:  sane-backends-devel
-BuildRequires:  lcms-devel
+BuildRequires:  soprano-devel
 
 %{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
 Requires: kdelibs4 >= %{version}
 Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: cups 
+Requires: cups
 Requires(post): xdg-utils
 Requires(postun): xdg-utils
 
@@ -84,8 +71,6 @@
 %if 0%{?obsolete_kde3_kipi}
 Obsoletes: libkdcraw < 0.2.0, libkexiv2 < 0.4.0, libkipi < 0.2.0
 %endif
-Requires(post): xdg-utils
-Requires(postun): xdg-utils
 %description libs
 %{summary}.
 
@@ -109,19 +94,6 @@
 %setup -q -n kdegraphics-%{version}
 
 # upstream patches
-# libkexiv2 backport
-pushd libs/libkexiv2
-%patch200 -p0
-popd
-# libkdcraw backport
-pushd libs/libkdcraw
-%patch201 -p0
-popd
-# libkipi backport
-pushd libs/libkipi
-%patch202 -p0
-popd
-
 
 %build
 
@@ -157,13 +129,9 @@
 %{_bindir}/xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
 %{_bindir}/xdg-desktop-menu forceupdate 2> /dev/null || :
 
-%post libs
-/sbin/ldconfig
-%{_bindir}/xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
+%post libs -p /sbin/ldconfig
 
-%postun libs
-/sbin/ldconfig
-%{_bindir}/xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
+%postun libs -p /sbin/ldconfig
 
 
 %files
@@ -176,7 +144,7 @@
 %{_kde4_datadir}/applications/kde4/*
 %{_kde4_datadir}/config.kcfg/*
 %{_kde4_datadir}/kde4/services/*
-%{_kde4_datadir}/kde4/servicetypes/okularGenerator.desktop
+%{_kde4_datadir}/kde4/servicetypes/*
 %{_kde4_docdir}/HTML/en/okular/
 %{_kde4_appsdir}/gvpart/
 %{_kde4_appsdir}/gwenview/
@@ -184,31 +152,16 @@
 %{_kde4_appsdir}/kruler/
 %{_kde4_appsdir}/svgpart/*
 %{_datadir}/dbus-1/interfaces/*
-%{_kde4_docdir}/HTML/en/gwenview/
-%{_kde4_docdir}/HTML/en/kamera/
-%{_kde4_docdir}/HTML/en/kgamma/
-%{_kde4_docdir}/HTML/en/kolourpaint/
-%{_kde4_docdir}/HTML/en/ksnapshot/
-%{_kde4_docdir}/HTML/en/kruler/
-%{_kde4_iconsdir}/hicolor/*/actions/*
-%{_kde4_iconsdir}/hicolor/*/apps/gwenview.*
-%{_kde4_iconsdir}/hicolor/*/apps/kcolorchooser.*
-%{_kde4_iconsdir}/hicolor/*/apps/kgamma.*
-%{_kde4_iconsdir}/hicolor/*/apps/kolourpaint.*
-%{_kde4_iconsdir}/hicolor/*/apps/kruler.*
-%{_kde4_iconsdir}/hicolor/*/apps/ksnapshot.*
-%{_kde4_iconsdir}/hicolor/*/apps/okular.*
+%{_kde4_docdir}/HTML/en/*/
+%{_kde4_iconsdir}/hicolor/*/*/*
 
-%files libs 
+%files libs
 %defattr(-,root,root,-)
 %{_kde4_appsdir}/kipi/
 %{_kde4_appsdir}/libkdcraw/
 %{_kde4_libdir}/lib*.so.*
 %{_kde4_libdir}/kde4/*
 %{_kde4_libdir}/strigi/*
-%{_kde4_iconsdir}/hicolor/*/apps/kdcraw.*
-%{_kde4_iconsdir}/hicolor/*/apps/kipi.*
-%{_kde4_datadir}/kde4/servicetypes/kipiplugin.desktop
 
 %files devel
 %defattr(-,root,root,-)
@@ -226,24 +179,39 @@
 
 
 %changelog
-* Fri Jan  9 2009 Luk???? Tinkl <ltinkl at redhat.com> 4.1.4-1
-- KDE 4.1.4
+* Thu Jan 22 2009 Than Ngo <than at redhat.com> - 4.2.0-1
+- 4.2.0
 
-* Thu Jan 08 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.3-6
-- BR ebook-tools-devel
+* Sat Jan 17 2009 Rakesh Pandit <rakesh at fedoraproject.org> - 4.1.96-2
+- Updated with new djvulibre
 
-* Mon Dec 22 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.3-5
-- libkipi backport too (makes kde42 transition easier later)
+* Wed Jan 07 2009 Than Ngo <than at redhat.com> - 4.1.96-1
+- 4.2rc1
 
-* Mon Dec 01 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.3-4
-- cleanup Obsoletes: kdegraphics-extras
+* Mon Dec 22 2008 Rex Dieter <rdieter at fedoraproject.org> - 4.1.85-4
+- -devel: Provides: libkipi-devel = 0.3.0
+
+* Thu Dec 18 2008 Rex Dieter <rdieter at fedoraproject.org> - 4.1.85-3 
+- respin (eviv2)
 
-* Tue Nov 25 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.3-3
-- respin libkdcraw/libkexiv2 patches
+* Mon Dec 15 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.85-2
+- BR: ebook-tools-devel
+
+* Fri Dec 12 2008 Than Ngo <than at redhat.com> 4.1.85-1
+- 4.2beta2
+- BR: soprano-devel
+
+* Mon Dec 01 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.80-3
 - Obsoletes: libkdcraw libkexiv2 libkipi (F10+)
+- cleanup Obsoletes: kdegraphics-extras
+
+* Thu Nov 20 2008 Than Ngo <than at redhat.com> 4.1.80-2
+- merged
 
-* Tue Nov 25 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.3-2
-- move (remaining) libkipi/libkdcraw runtime bits to -libs (#472874)
+* Thu Nov 20 2008 Lorenzo Villani <lvillani at binaryhelix.net> - 7:4.1.72-1
+- 4.1.80
+- BR cmake >= 2.6.2
+- make install/fast
 
 * Wed Nov 12 2008 Than Ngo <than at redhat.com> 4.1.3-1
 - 4.1.3
@@ -407,7 +375,7 @@
 - remove all but okular on fedora <= 9
 - +BR: kde4-macros(api)
 - remove unneeded require for kdepimlibs
-- add defattr to devel package 
+- add defattr to devel package
 
 * Thu Nov 15 2007 Sebastian Vahl <fedora at deadbabylon.de> 7:3.96.0-2
 - re-added epoch (from kdegraphics3)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdegraphics/F-10/sources,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- sources	9 Jan 2009 00:41:29 -0000	1.60
+++ sources	23 Jan 2009 22:36:35 -0000	1.61
@@ -1 +1 @@
-c2a67098d9df60e839d2af6b866989ef  kdegraphics-4.1.4.tar.bz2
+8beb6fe5d475d0b0245ea6d4cc7e9732  kdegraphics-4.2.0.tar.bz2


--- kdegraphics-4.1.3-libkdcraw-0.4.0.patch DELETED ---


--- kdegraphics-4.1.3-libkexiv2-0.5.0.patch DELETED ---


--- kdegraphics-4.1.3-libkipi-0.3.0.patch DELETED ---



From jwrdegoede at fedoraproject.org  Fri Jan 23 22:40:55 2009
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Fri, 23 Jan 2009 22:40:55 +0000 (UTC)
Subject: rpms/kernel/devel linux-2.6-acpi-strict-resources.patch, NONE,
	1.1 linux-2.6-hwmon-atk0110.patch, NONE, 1.1 config-generic,
	1.225, 1.226 kernel.spec, 1.1228, 1.1229
Message-ID: <20090123224055.759D3700FE@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13833

Modified Files:
	config-generic kernel.spec 
Added Files:
	linux-2.6-acpi-strict-resources.patch 
	linux-2.6-hwmon-atk0110.patch 
Log Message:
* Fri Jan 23 2009 Hans de Goede <hdegoede at redhat.com>
- Change acpi_enforce_resources default to strict, this will cause hwmon
  drivers which clash with io resources reserved by ACPI to no longer load,
  avoiding both the ACPI code and the native driver trying to drive the same
  IC at the same time
- Add ASUS ACPI hwmon interface driver (atk0110), this will give (restore)
  hwmon functionality on most ASUS boards through the firmware


linux-2.6-acpi-strict-resources.patch:

--- NEW FILE linux-2.6-acpi-strict-resources.patch ---
diff -up linux-2.6.28.noarch/drivers/acpi/osl.c~ linux-2.6.28.noarch/drivers/acpi/osl.c
--- linux-2.6.28.noarch/drivers/acpi/osl.c~	2009-01-23 22:57:27.000000000 +0100
+++ linux-2.6.28.noarch/drivers/acpi/osl.c	2009-01-23 22:57:27.000000000 +0100
@@ -1077,7 +1077,7 @@ __setup("acpi_wake_gpes_always_on", acpi
 #define ENFORCE_RESOURCES_LAX    1
 #define ENFORCE_RESOURCES_NO     0
 
-static unsigned int acpi_enforce_resources = ENFORCE_RESOURCES_LAX;
+static unsigned int acpi_enforce_resources = ENFORCE_RESOURCES_STRICT;
 
 static int __init acpi_enforce_resources_setup(char *str)
 {

linux-2.6-hwmon-atk0110.patch:

--- NEW FILE linux-2.6-hwmon-atk0110.patch ---
--- linux-2.6.git.orig/drivers/acpi/acpica/nsutils.c	2008-12-26 18:59:30.000000000 +0100
+++ linux-2.6.git/drivers/acpi/acpica/nsutils.c	2008-12-26 18:59:38.000000000 +0100
@@ -700,6 +700,7 @@
 
 	return (ACPI_CAST_PTR(struct acpi_namespace_node, handle));
 }
+EXPORT_SYMBOL(acpi_ns_map_handle_to_node);
 
 /*******************************************************************************
  *
@@ -736,6 +737,7 @@
 	return ((acpi_handle) Node);
 ------------------------------------------------------*/
 }
+EXPORT_SYMBOL(acpi_ns_convert_entry_to_handle);
 
 /*******************************************************************************
  *
@@ -875,6 +877,7 @@
 	ACPI_FREE(internal_path);
 	return_ACPI_STATUS(status);
 }
+EXPORT_SYMBOL(acpi_ns_get_node);
 
 /*******************************************************************************
  *
Index: linux-2.6.git/drivers/acpi/namespace/nsxfeval.c
===================================================================
--- linux-2.6.git.orig/drivers/acpi/acpica/nsxfeval.c	2008-12-26 18:59:30.000000000 +0100
+++ linux-2.6.git/drivers/acpi/acpica/nsxfeval.c	2008-12-26 18:59:38.000000000 +0100
@@ -52,7 +52,6 @@
 /* Local prototypes */
 static void acpi_ns_resolve_references(struct acpi_evaluate_info *info);
 
-#ifdef ACPI_FUTURE_USAGE
 /*******************************************************************************
  *
  * FUNCTION:    acpi_evaluate_object_typed
@@ -146,7 +145,7 @@
 }
 
 ACPI_EXPORT_SYMBOL(acpi_evaluate_object_typed)
-#endif				/*  ACPI_FUTURE_USAGE  */
+
 /*******************************************************************************
  *
  * FUNCTION:    acpi_evaluate_object
Index: linux-2.6.git/include/acpi/acpixf.h
===================================================================
--- linux-2.6.git.orig/include/acpi/acpixf.h	2008-12-26 18:59:30.000000000 +0100
+++ linux-2.6.git/include/acpi/acpixf.h	2008-12-26 18:59:38.000000000 +0100
@@ -169,14 +169,12 @@
 		     struct acpi_object_list *parameter_objects,
 		     struct acpi_buffer *return_object_buffer);
 
-#ifdef ACPI_FUTURE_USAGE
 acpi_status
 acpi_evaluate_object_typed(acpi_handle object,
 			   acpi_string pathname,
 			   struct acpi_object_list *external_params,
 			   struct acpi_buffer *return_buffer,
 			   acpi_object_type return_type);
-#endif
 
 acpi_status
 acpi_get_object_info(acpi_handle handle, struct acpi_buffer *return_buffer);
Index: linux-2.6.git/drivers/hwmon/asus_atk0110.c
===================================================================
--- /dev/null	1970-01-01 00:00:00.000000000 +0000
+++ linux-2.6.git/drivers/hwmon/asus_atk0110.c	2009-01-05 20:58:46.176128447 +0100
@@ -0,0 +1,1019 @@
+/*
+ * Copyright (C) 2007-2009 Luca Tettamanti <kronos.it at gmail.com <http://lists.lm-sensors.org/mailman/listinfo/lm-sensors>>
+ *
+ * This file is released under the GPLv2
+ * See COPYING in the top level directory of the kernel tree.
+ */
+
+#define DEBUG
+
+#include <linux/kernel.h>
+#include <linux/hwmon.h>
+#include <linux/list.h>
+#include <linux/module.h>
+
+#include <acpi/acpi.h>
+#include <acpi/acpi_drivers.h>
+#include <acpi/acpi_bus.h>
+#include "../acpi/acpica/accommon.h"
+#include "../acpi/acpica/acnamesp.h"
+
+
+#define ATK_HID "ATK0110"
+#define ATK_DRV "atk-hwmon"
+#define ASOC "_SB.PCI0.SBRG.ASOC"
+
+#define CACHE_TIME		HZ
+
+#define BOARD_ID		"MBIF"
+#define METHOD_ENUMERATE	"GGRP"
+#define METHOD_READ		"GITM"
+#define METHOD_WRITE		"SITM"
+#define METHOD_OLD_READ_TMP	"RTMP"
+#define METHOD_OLD_READ_VLT	"RVLT"
+#define METHOD_OLD_READ_FAN	"RFAN"
+#define METHOD_OLD_ENUM_TMP	"TSIF"
+#define METHOD_OLD_ENUM_VLT	"VSIF"
+#define METHOD_OLD_ENUM_FAN	"FSIF"
+
+#define ATK_MUX_HWMON		0x00000006ULL
+
+#define ATK_CLASS_MASK		0xff000000ULL
+#define ATK_CLASS_FREQ_CTL	0x03000000ULL
+#define ATK_CLASS_FAN_CTL	0x04000000ULL
+#define ATK_CLASS_HWMON		0x06000000ULL
+
+#define ATK_TYPE_MASK		0x00ff0000ULL
+#define HWMON_TYPE_VOLT		0x00020000ULL
+#define HWMON_TYPE_TEMP		0x00030000ULL
+#define HWMON_TYPE_FAN		0x00040000ULL
+
+#define HWMON_SENSORS_ID_MASK	0x0000ffffULL
+
+enum atk_pack_member {
+	HWMON_PACK_FLAGS,
+	HWMON_PACK_NAME,
+	HWMON_PACK_LIMIT1,
+	HWMON_PACK_LIMIT2,
+	HWMON_PACK_ENABLE
+};
+
+/* New package format */
+#define _HWMON_NEW_PACK_SIZE	7
+#define _HWMON_NEW_PACK_FLAGS	0
+#define _HWMON_NEW_PACK_NAME	1
+#define _HWMON_NEW_PACK_UNK1	2
+#define _HWMON_NEW_PACK_UNK2	3
+#define _HWMON_NEW_PACK_LIMIT1	4
+#define _HWMON_NEW_PACK_LIMIT2	5
+#define _HWMON_NEW_PACK_ENABLE	6
+
+/* Old package format */
+#define _HWMON_OLD_PACK_SIZE	5
+#define _HWMON_OLD_PACK_FLAGS	0
+#define _HWMON_OLD_PACK_NAME	1
+#define _HWMON_OLD_PACK_LIMIT1	2
+#define _HWMON_OLD_PACK_LIMIT2	3
+#define _HWMON_OLD_PACK_ENABLE	4
+
+
+struct atk_data {
+	struct device *hwmon_dev;
+	acpi_handle atk_handle;
+	struct acpi_device *acpi_dev;
+
+	bool old_interface;
+
+	/* old interface */
+	acpi_handle rtmp_handle;
+	acpi_handle rvlt_handle;
+	acpi_handle rfan_handle;
+	/* new inteface */
+	acpi_handle enumerate_handle;
+	acpi_handle read_handle;
+
+	int voltage_count;
+	int temperature_count;
+	int fan_count;
+	struct list_head sensor_list;
+};
+
+
+typedef ssize_t (*sysfs_show_func)(struct device *dev,
+			struct device_attribute *attr, char *buf);
+
+static const struct acpi_device_id atk_ids[] = {
+	{ATK_HID, 0},
+	{"", 0},
+};
+MODULE_DEVICE_TABLE(acpi, atk_ids);
+
+#define ATTR_NAME_SIZE 16 /* Worst case is "tempN_input" */
+
+struct atk_sensor_data {
+	struct list_head list;
+	struct atk_data *data;
+	struct device_attribute label_attr;
+	struct device_attribute input_attr;
+	struct device_attribute limit1_attr;
+	struct device_attribute limit2_attr;
+	char label_attr_name[ATTR_NAME_SIZE];
+	char input_attr_name[ATTR_NAME_SIZE];
+	char limit1_attr_name[ATTR_NAME_SIZE];
+	char limit2_attr_name[ATTR_NAME_SIZE];
+	u64 id;
+	u64 type;
+	u64 limit1;
+	u64 limit2;
+	u64 cached_value;
+	unsigned long last_updated; /* in jiffies */
+	bool is_valid;
+	char const *acpi_name;
+};
+
+struct atk_acpi_buffer_u64 {
+	union acpi_object buf;
+	u64 value;
+};
+
+static int atk_add(struct acpi_device *device);
+static int atk_remove(struct acpi_device *device, int type);
+static void atk_print_sensor(struct atk_data *data, union acpi_object *obj);
+static int atk_read_value(struct atk_sensor_data *sensor, u64 *value);
+static void atk_free_sensors(struct atk_data *data);
+
+static struct acpi_driver atk_driver = {
+	.name	= ATK_HID,
+	.class	= "hwmon",
+	.ids	= atk_ids,
+	.ops	= {
+		.add	= atk_add,
+		.remove	= atk_remove,
+	},
+};
+
+#define input_to_atk_sensor(attr) \
+	container_of(attr, struct atk_sensor_data, input_attr)
+
+#define label_to_atk_sensor(attr) \
+	container_of(attr, struct atk_sensor_data, label_attr)
+
+#define limit1_to_atk_sensor(attr) \
+	container_of(attr, struct atk_sensor_data, limit1_attr)
+
+#define limit2_to_atk_sensor(attr) \
+	container_of(attr, struct atk_sensor_data, limit2_attr)
+
+
+static ssize_t atk_input_show(struct device *dev,
+		struct device_attribute *attr, char *buf)
+{
+	struct atk_sensor_data *s = input_to_atk_sensor(attr);
+	u64 value;
+	int err;
+
+	err = atk_read_value(s, &value);
+	if (err)
+		return err;
+
+	if (s->type == HWMON_TYPE_TEMP)
+		/* ACPI returns decidegree */
+		value *= 100;
+
+	return sprintf(buf, "%llu\n", value);
+}
+
+static ssize_t atk_label_show(struct device *dev,
+		struct device_attribute *attr, char *buf)
+{
+	struct atk_sensor_data *s = label_to_atk_sensor(attr);
+
+	return sprintf(buf, "%s\n", s->acpi_name);
+}
+
+static ssize_t atk_limit1_show(struct device *dev,
+		struct device_attribute *attr, char *buf)
+{
+	struct atk_sensor_data *s = limit1_to_atk_sensor(attr);
+	u64 value = s->limit1;
+
+	if (s->type == HWMON_TYPE_TEMP)
+		value *= 100;
+
+	return sprintf(buf, "%lld\n", value);
+}
+
+static ssize_t atk_limit2_show(struct device *dev,
+		struct device_attribute *attr, char *buf)
+{
+	struct atk_sensor_data *s = limit2_to_atk_sensor(attr);
+	u64 value = s->limit2;
+
+	if (s->type == HWMON_TYPE_TEMP)
+		value *= 100;
+
+	return sprintf(buf, "%lld\n", value);
+}
+
+static ssize_t atk_name_show(struct device *dev,
+				struct device_attribute *attr, char *buf)
+{
+	return sprintf(buf, "atk0110\n");
+}
+static struct device_attribute atk_name_attr = __ATTR(name, 0444, atk_name_show, NULL);
+
+static void atk_init_attribute(struct device_attribute *attr, char *name,
+		sysfs_show_func show)
+{
+	attr->attr.name = name;
+	attr->attr.mode = 0444;
+	attr->show = show;
+	attr->store = NULL;
+}
+
+
+static union acpi_object *atk_get_pack_member(struct atk_data *data,
+						union acpi_object *pack,
+						enum atk_pack_member m)
+{
+	bool old_if = data->old_interface;
+	int offset;
+
+	switch (m) {
+	case HWMON_PACK_FLAGS:
+		offset = old_if ? _HWMON_OLD_PACK_FLAGS : _HWMON_NEW_PACK_FLAGS;
+		break;
+	case HWMON_PACK_NAME:
+		offset = old_if ? _HWMON_OLD_PACK_NAME : _HWMON_NEW_PACK_NAME;
+		break;
+	case HWMON_PACK_LIMIT1:
+		offset = old_if ? _HWMON_OLD_PACK_LIMIT1 : _HWMON_NEW_PACK_LIMIT1;
+		break;
+	case HWMON_PACK_LIMIT2:
+		offset = old_if ? _HWMON_OLD_PACK_LIMIT2 : _HWMON_NEW_PACK_LIMIT2;
+		break;
+	case HWMON_PACK_ENABLE:
+		offset = old_if ? _HWMON_OLD_PACK_ENABLE : _HWMON_NEW_PACK_ENABLE;
+		break;
+	default:
+		return NULL;
+	}
+
+	return &pack->package.elements[offset];
+}
+
+
+/* New package format is:
+ * - flag (int)
+ *	class - used for de-muxing the request to the correct GITn
+ *	type (volt, temp, fan)
+ *	sensor id |
+ *	sensor id - used for de-muxing the request _inside_ the GITn
+ * - name (str)
+ * - unknown (int)
+ * - unknown (int)
+ * - limit1 (int)
+ * - limit2 (int)
+ * - enable (int)
+ *
+ * The old package has the same format but it's missing the two unknown fields.
+ */
+static int validate_hwmon_pack(struct atk_data *data, union acpi_object *obj)
+{
+	struct device *dev = &data->acpi_dev->dev;
+	union acpi_object *tmp;
+	bool old_if = data->old_interface;
+	int const expected_size = old_if ? _HWMON_OLD_PACK_SIZE : _HWMON_NEW_PACK_SIZE;
+
+	if (obj->type != ACPI_TYPE_PACKAGE) {
+		dev_warn(dev, "Invalid type: %d\n", obj->type);
+		return -EINVAL;
+	}
+
+	if (obj->package.count != expected_size) {
+		dev_warn(dev, "Invalid package size: %d, expected: %d\n",
+				obj->package.count, expected_size);
+		return -EINVAL;
+	}
+
+	tmp = atk_get_pack_member(data, obj, HWMON_PACK_FLAGS);
+	if (tmp->type != ACPI_TYPE_INTEGER) {
+		dev_warn(dev, "Invalid type (flag): %d\n", tmp->type);
+		return -EINVAL;
+	}
+
+	tmp = atk_get_pack_member(data, obj, HWMON_PACK_NAME);
+	if (tmp->type != ACPI_TYPE_STRING) {
+		dev_warn(dev, "Invalid type (name): %d\n", tmp->type);
+		return -EINVAL;
+	}
+
+	/* Don't check... we don't know what they're useful for anyway */
+#if 0
+	tmp = &obj->package.elements[HWMON_PACK_UNK1];
+	if (tmp->type != ACPI_TYPE_INTEGER) {
+		dev_warn(dev, "Invalid type (unk1): %d\n", tmp->type);
+		return -EINVAL;
+	}
+
+	tmp = &obj->package.elements[HWMON_PACK_UNK2];
+	if (tmp->type != ACPI_TYPE_INTEGER) {
+		dev_warn(dev, "Invalid type (unk2): %d\n", tmp->type);
+		return -EINVAL;
+	}
+#endif
+
+	tmp = atk_get_pack_member(data, obj, HWMON_PACK_LIMIT1);
+	if (tmp->type != ACPI_TYPE_INTEGER) {
+		dev_warn(dev, "Invalid type (limit1): %d\n", tmp->type);
+		return -EINVAL;
+	}
+
+	tmp = atk_get_pack_member(data, obj, HWMON_PACK_LIMIT2);
+	if (tmp->type != ACPI_TYPE_INTEGER) {
+		dev_warn(dev, "Invalid type (limit2): %d\n", tmp->type);
+		return -EINVAL;
+	}
+
+	tmp = atk_get_pack_member(data, obj, HWMON_PACK_ENABLE);
+	if (tmp->type != ACPI_TYPE_INTEGER) {
+		dev_warn(dev, "Invalid type (enable): %d\n", tmp->type);
+		return -EINVAL;
+	}
+
+	atk_print_sensor(data, obj);
+
+	return 0;
+}
+
+static char const *atk_sensor_type(union acpi_object *flags)
+{
+	u64 type = flags->integer.value & ATK_TYPE_MASK;
+	char const *what;
+
+	switch (type) {
+	case HWMON_TYPE_VOLT:
+		what = "voltage";
+		break;
+	case HWMON_TYPE_TEMP:
+		what = "temperature";
+		break;
+	case HWMON_TYPE_FAN:
+		what = "fan";
+		break;
+	default:
+		what = "unknown";
+		break;
+	}
+
+	return what;
+}
+
+static void atk_print_sensor(struct atk_data *data, union acpi_object *obj)
+{
+#ifdef DEBUG
+	struct device *dev = &data->acpi_dev->dev;
+	union acpi_object *flags;
+	union acpi_object *name;
+	union acpi_object *limit1;
+	union acpi_object *limit2;
+	union acpi_object *enable;
+	char const *what;
+
+	flags = atk_get_pack_member(data, obj, HWMON_PACK_FLAGS);
+	name = atk_get_pack_member(data, obj, HWMON_PACK_NAME);
+	limit1 = atk_get_pack_member(data, obj, HWMON_PACK_LIMIT1);
+	limit2 = atk_get_pack_member(data, obj, HWMON_PACK_LIMIT2);
+	enable = atk_get_pack_member(data, obj, HWMON_PACK_ENABLE);
+
+	what = atk_sensor_type(flags);
+
+	dev_dbg(dev, "%s: %#llx %s [%llu-%llu] %s\n", what,
+			flags->integer.value,
+			name->string.pointer,
+			limit1->integer.value, limit2->integer.value,
+			enable->integer.value ? "enabled" : "disabled");
+#endif
+}
+
+static int atk_read_value_old(struct atk_sensor_data *sensor, u64 *value)
+{
+	struct atk_data *data = sensor->data;
+	struct device *dev = &data->acpi_dev->dev;
+	struct acpi_object_list params;
+	union acpi_object id;
+	acpi_status status;
+	acpi_handle method;
+
+	switch (sensor->type) {
+	case HWMON_TYPE_VOLT:
+		method = data->rvlt_handle;
+		break;
+	case HWMON_TYPE_TEMP:
+		method = data->rtmp_handle;
+		break;
+	case HWMON_TYPE_FAN:
+		method = data->rfan_handle;
+		break;
+	default:
+		return -EINVAL;
+	}
+
+	id.type = ACPI_TYPE_INTEGER;
+	id.integer.value = sensor->id;
+
+	params.count = 1;
+	params.pointer = &id;
+
+	status = acpi_evaluate_integer(method, NULL, &params, value);
+	if (status != AE_OK) {
+		dev_warn(dev, "%s: ACPI exception: %s\n", __func__,
+				acpi_format_exception(status));
+		return -EIO;
+	}
+
+	return 0;
+}
+
+static int atk_read_value_new(struct atk_sensor_data *sensor, u64 *value)
+{
+	struct atk_data *data = sensor->data;
+	struct device *dev = &data->acpi_dev->dev;
+	struct acpi_object_list params;
+	struct acpi_buffer ret;
+	union acpi_object id;
+	struct atk_acpi_buffer_u64 tmp;
+	acpi_status status;
+	union acpi_object *o;
+	int i;
+
+	id.type = ACPI_TYPE_INTEGER;
+	id.integer.value = sensor->id;
+
+	params.count = 1;
+	params.pointer = &id;
+
+	tmp.buf.type = ACPI_TYPE_BUFFER;
+	tmp.buf.buffer.pointer = (u8 *)&tmp.value;
+	tmp.buf.buffer.length = sizeof(u64);
+	ret.length = sizeof(tmp);
+	ret.pointer = &tmp;
+
+	status = acpi_evaluate_object_typed(data->read_handle, NULL, &params,
+			&ret, ACPI_TYPE_BUFFER);
+	if (status != AE_OK) {
+		dev_warn(dev, "%s: ACPI exception: %s\n", __func__,
+				acpi_format_exception(status));
+		return -EIO;
+	}
+
+	o = ret.pointer;
+	dev_dbg(dev, "type = %d\n", o->type);
+	dev_dbg(dev, "size = %d\n", o->buffer.length);
+
+	for (i = 0; i < o->buffer.length; i++)
+		dev_dbg(dev, "  [%#x] %d\n", (u32)(o->buffer.pointer[i]),
+				(u32)(o->buffer.pointer[i]));
+
+	/* Return buffer format:
+	 * [0-3] "value" is valid flag
+	 * [4-7] value
+	 */
+	if (!(tmp.value & 0xffffffff)) {
+		/* The reading is not valid, possible causes:
+		 * - sensor failure
+		 * - enumeration was FUBAR (and we didn't notice)
+		 */
+		dev_info(dev, "Failure: %#llx\n", tmp.value);
+		return -EIO;
+	}
+
+	*value = (tmp.value & 0xffffffff00000000ULL) >> 32;
+
+	return 0;
+}
+
+static int atk_read_value(struct atk_sensor_data *sensor, u64 *value)
+{
+	int err;
+
+	if (!sensor->is_valid ||
+	    time_after(jiffies, sensor->last_updated + CACHE_TIME)) {
+		if (sensor->data->old_interface)
+			err = atk_read_value_old(sensor, value);
+		else
+			err = atk_read_value_new(sensor, value);
+
+		sensor->is_valid = true;
+		sensor->last_updated = jiffies;
+		sensor->cached_value = *value;
+	} else {
+		*value = sensor->cached_value;
+		err = 0;
+	}
+
+	return err;
+}
+
+static int atk_add_sensor(struct atk_data *data, union acpi_object *obj)
+{
+	struct device *dev = &data->acpi_dev->dev;
+	union acpi_object *flags;
+	union acpi_object *name;
+	union acpi_object *limit1;
+	union acpi_object *limit2;
+	union acpi_object *enable;
+	struct atk_sensor_data *sensor;
+	char const *base_name;
+	char const *limit1_name;
+	char const *limit2_name;
+	u64 type;
+	int err;
+	int *num;
+
+	if (obj->type != ACPI_TYPE_PACKAGE) {
+		/* wft is this? */
+		dev_warn(dev, "Unknown type for ACPI object: (%d)\n",
+				obj->type);
+		return -EINVAL;
+	}
+
+	err = validate_hwmon_pack(data, obj);
+	if (err)
+		return err;
+
+	/* Ok, we have a valid hwmon package */
+	type = atk_get_pack_member(data, obj, HWMON_PACK_FLAGS)->integer.value & ATK_TYPE_MASK;
+
+	switch (type) {
+	case HWMON_TYPE_VOLT:
+		base_name = "in";
+		limit1_name = "min";
+		limit2_name = "max";
+		num = &data->voltage_count;
+		break;
+	case HWMON_TYPE_TEMP:
+		base_name = "temp";
+		limit1_name = "max";
+		limit2_name = "crit";
+		num = &data->temperature_count;
+		break;
+	case HWMON_TYPE_FAN:
+		base_name = "fan";
+		limit1_name = "min";
+		limit2_name = "max";
+		num = &data->fan_count;
+		break;
+	default:
+		dev_warn(dev, "Unknown sensor type: %#llx\n", type);
+		return -EINVAL;
+	}
+
+	enable = atk_get_pack_member(data, obj, HWMON_PACK_ENABLE);
+	if (!enable->integer.value)
+		/* sensor is disabled */
+		return 0;
+
+	flags = atk_get_pack_member(data, obj, HWMON_PACK_FLAGS);
+	name = atk_get_pack_member(data, obj, HWMON_PACK_NAME);
+	limit1 = atk_get_pack_member(data, obj, HWMON_PACK_LIMIT1);
+	limit2 = atk_get_pack_member(data, obj, HWMON_PACK_LIMIT2);
+
+	sensor = kzalloc(sizeof(*sensor), GFP_KERNEL);
+	if (!sensor)
+		return -ENOMEM;
+
+	sensor->acpi_name = kstrdup(name->string.pointer, GFP_KERNEL);
+	if (!sensor->acpi_name) {
+		err = -ENOMEM;
+		goto out;
+	}
+
+	INIT_LIST_HEAD(&sensor->list);
+	sensor->type = type;
+	sensor->data = data;
+	sensor->id = flags->integer.value;
+	sensor->limit1 = limit1->integer.value;
+	sensor->limit2 = limit2->integer.value;
+
+	snprintf(sensor->input_attr_name, ATTR_NAME_SIZE,
+			"%s%d_input", base_name, *num);
+	atk_init_attribute(&sensor->input_attr,
+			sensor->input_attr_name,
+			atk_input_show);
+
+	snprintf(sensor->label_attr_name, ATTR_NAME_SIZE,
+			"%s%d_label", base_name, *num);
+	atk_init_attribute(&sensor->label_attr,
+			sensor->label_attr_name,
+			atk_label_show);
+
+	snprintf(sensor->limit1_attr_name, ATTR_NAME_SIZE,
+			"%s%d_%s", base_name, *num, limit1_name);
+	atk_init_attribute(&sensor->limit1_attr,
+			sensor->limit1_attr_name,
+			atk_limit1_show);
+
+	snprintf(sensor->limit2_attr_name, ATTR_NAME_SIZE,
+			"%s%d_%s", base_name, *num, limit2_name);
+	atk_init_attribute(&sensor->limit2_attr,
+			sensor->limit2_attr_name,
+			atk_limit2_show);
+
+	list_add(&sensor->list, &data->sensor_list);
+	(*num)++;
+
+	return 1;
+out:
+	kfree(sensor->acpi_name);
+	kfree(sensor);
+	return err;
+}
+
+static int atk_enumerate_old_hwmon(struct atk_data *data)
+{
+	struct device *dev = &data->acpi_dev->dev;
+	struct acpi_buffer buf;
+	union acpi_object *pack;
+	acpi_status status;
+	int i, ret;
+	int count = 0;
+
+	/* Voltages */
+	buf.length = ACPI_ALLOCATE_BUFFER;
+	status = acpi_evaluate_object_typed(data->atk_handle,
+			METHOD_OLD_ENUM_VLT, NULL, &buf, ACPI_TYPE_PACKAGE);
+	if (status != AE_OK) {
+		dev_warn(dev, METHOD_OLD_ENUM_VLT ": ACPI exception: %s\n",
+				acpi_format_exception(status));
+
+		return -ENODEV;
+	}
+
+	pack = buf.pointer;
+	for (i = 1; i < pack->package.count; i++) {
+		union acpi_object *obj = &pack->package.elements[i];
+
+		ret = atk_add_sensor(data, obj);
+		if (ret > 0)
+			count++;
+	}
+	ACPI_FREE(buf.pointer);
+
+	/* Temperatures */
+	buf.length = ACPI_ALLOCATE_BUFFER;
+	status = acpi_evaluate_object_typed(data->atk_handle, METHOD_OLD_ENUM_TMP, NULL,
+			&buf, ACPI_TYPE_PACKAGE);
+	if (status != AE_OK) {
+		dev_warn(dev, METHOD_OLD_ENUM_TMP ": ACPI exception: %s\n",
+				acpi_format_exception(status));
+
+		ret = -ENODEV;
+		goto cleanup;
+	}
+
+	pack = buf.pointer;
+	for (i = 1; i < pack->package.count; i++) {
+		union acpi_object *obj = &pack->package.elements[i];
+
+		ret = atk_add_sensor(data, obj);
+		if (ret > 0)
+			count++;
+	}
+	ACPI_FREE(buf.pointer);
+
+	/* Fans */
+	buf.length = ACPI_ALLOCATE_BUFFER;
+	status = acpi_evaluate_object_typed(data->atk_handle, METHOD_OLD_ENUM_FAN, NULL,
+			&buf, ACPI_TYPE_PACKAGE);
+	if (status != AE_OK) {
+		dev_warn(dev, METHOD_OLD_ENUM_FAN ": ACPI exception: %s\n",
+				acpi_format_exception(status));
+
+		ret = -ENODEV;
+		goto cleanup;
+	}
+
+	pack = buf.pointer;
+	for (i = 1; i < pack->package.count; i++) {
+		union acpi_object *obj = &pack->package.elements[i];
+
+		ret = atk_add_sensor(data, obj);
+		if (ret > 0)
+			count++;
+	}
+	ACPI_FREE(buf.pointer);
+
+	return count;
+cleanup:
+	atk_free_sensors(data);
+	return ret;
+}
+
+static int atk_enumerate_new_hwmon(struct atk_data *data)
+{
+	struct device *dev = &data->acpi_dev->dev;
+	struct acpi_buffer buf;
+	acpi_status ret;
+	struct acpi_object_list params;
+	union acpi_object id;
+	union acpi_object *pack;
+	int err;
+	int i;
+
+	dev_dbg(dev, "Enumerating hwmon sensors\n");
+
+	id.type = ACPI_TYPE_INTEGER;
+	id.integer.value = ATK_MUX_HWMON;
+	params.count = 1;
+	params.pointer = &id;
+
+	buf.length = ACPI_ALLOCATE_BUFFER;
+	ret = acpi_evaluate_object_typed(data->enumerate_handle, NULL, &params,
+			&buf, ACPI_TYPE_PACKAGE);
+	if (ret != AE_OK) {
+		dev_warn(dev, METHOD_ENUMERATE ": ACPI exception: %s\n",
+				acpi_format_exception(ret));
+		return -ENODEV;
+	}
+
+	/* Result must be a package */
+	pack = buf.pointer;
+
+	if (pack->package.count < 1) {
+		dev_dbg(dev, "%s: hwmon package is too small: %d\n", __func__,
+				pack->package.count);
+		err = -EINVAL;
+		goto out;
+	}
+
+	for (i = 0; i < pack->package.count; i++) {
+		union acpi_object *obj = &pack->package.elements[i];
+
+		atk_add_sensor(data, obj);
+	}
+
+	err = data->voltage_count + data->temperature_count + data->fan_count;
+
+out:
+	ACPI_FREE(buf.pointer);
+	return err;
+}
+
+static int atk_create_files(struct atk_data *data)
+{
+	struct atk_sensor_data *s;
+	int err;
+
+	list_for_each_entry(s, &data->sensor_list, list) {
+		err = device_create_file(data->hwmon_dev, &s->input_attr);
+		if (err)
+			return err;
+		err = device_create_file(data->hwmon_dev, &s->label_attr);
+		if (err)
+			return err;
+		err = device_create_file(data->hwmon_dev, &s->limit1_attr);
+		if (err)
+			return err;
+		err = device_create_file(data->hwmon_dev, &s->limit2_attr);
+		if (err)
+			return err;
+	}
+
+	err = device_create_file(data->hwmon_dev, &atk_name_attr);
+
+	return err;
+}
+
+static void atk_remove_files(struct atk_data *data)
+{
+	struct atk_sensor_data *s;
+
+	list_for_each_entry(s, &data->sensor_list, list) {
+		device_remove_file(data->hwmon_dev, &s->input_attr);
+		device_remove_file(data->hwmon_dev, &s->label_attr);
+		device_remove_file(data->hwmon_dev, &s->limit1_attr);
+		device_remove_file(data->hwmon_dev, &s->limit2_attr);
+	}
+	device_remove_file(data->hwmon_dev, &atk_name_attr);
+}
+
+static void atk_free_sensors(struct atk_data *data)
+{
+	struct list_head *head = &data->sensor_list;
+	struct atk_sensor_data *s, *tmp;
+
+	list_for_each_entry_safe(s, tmp, head, list) {
+		kfree(s->acpi_name);
+		kfree(s);
+	}
+}
+
+static int atk_register_hwmon(struct atk_data *data)
+{
+	struct device *dev = &data->acpi_dev->dev;
+	int err;
+
+	dev_dbg(dev, "registering hwmon device\n");
+	data->hwmon_dev = hwmon_device_register(dev);
+	if (IS_ERR(data->hwmon_dev))
+		return PTR_ERR(data->hwmon_dev);
+
+	dev_dbg(dev, "populating sysfs directory\n");
+	err = atk_create_files(data);
+	if (err)
+		goto remove;
+
+	return 0;
+remove:
+	/* Cleanup the registered files */
+	atk_remove_files(data);
+	hwmon_device_unregister(data->hwmon_dev);
+	return err;
+}
+
+static int atk_check_old_if(struct atk_data *data, struct acpi_namespace_node *ns)
+{
+	struct device *dev = &data->acpi_dev->dev;
+	struct acpi_namespace_node *ret;
+	acpi_status status;
+
+	/* RTMP: read temperature */
+	status = acpi_ns_get_node(ns, METHOD_OLD_READ_TMP, ACPI_NS_NO_UPSEARCH, &ret);
+	if (status != AE_OK) {
+		dev_dbg(dev, "method " METHOD_OLD_READ_TMP " not found: %s\n",
+				acpi_format_exception(status));
+		return -ENODEV;
+	}
+	data->rtmp_handle = acpi_ns_convert_entry_to_handle(ret);
+
+	/* RVLT: read voltage */
+	status = acpi_ns_get_node(ns, METHOD_OLD_READ_VLT, ACPI_NS_NO_UPSEARCH, &ret);
+	if (status != AE_OK) {
+		dev_dbg(dev, "method " METHOD_OLD_READ_VLT " not found: %s\n",
+				acpi_format_exception(status));
+		return -ENODEV;
+	}
+	data->rvlt_handle = acpi_ns_convert_entry_to_handle(ret);
+
+	/* RFAN: read fan status */
+	status = acpi_ns_get_node(ns, METHOD_OLD_READ_FAN, ACPI_NS_NO_UPSEARCH, &ret);
+	if (status != AE_OK) {
+		dev_dbg(dev, "method " METHOD_OLD_READ_FAN " not found: %s\n",
+				acpi_format_exception(status));
+		return -ENODEV;
+	}
+	data->rfan_handle = acpi_ns_convert_entry_to_handle(ret);
+
+	return 0;
+}
+
+static int atk_check_new_if(struct atk_data *data, struct acpi_namespace_node *ns)
+{
+	struct device *dev = &data->acpi_dev->dev;
+	struct acpi_namespace_node *ret;
+	acpi_status status;
+
+	/* Enumeration */
+	status = acpi_ns_get_node(ns, METHOD_ENUMERATE, ACPI_NS_NO_UPSEARCH, &ret);
+	if (status != AE_OK) {
+		dev_dbg(dev, "method " METHOD_ENUMERATE " not found: %s\n",
+				acpi_format_exception(status));
+		return -ENODEV;
+	}
+	data->enumerate_handle = acpi_ns_convert_entry_to_handle(ret);
+
+	/* De-multiplexer (read) */
+	status = acpi_ns_get_node(ns, METHOD_READ, ACPI_NS_NO_UPSEARCH, &ret);
+	if (status != AE_OK) {
+		dev_dbg(dev, "method " METHOD_READ " not found: %s\n",
+				acpi_format_exception(status));
+		return -ENODEV;
+	}
+	data->read_handle = acpi_ns_convert_entry_to_handle(ret);
+
+	return 0;
+}
+
+static int atk_add(struct acpi_device *device)
+{
+	acpi_status ret;
+	int err;
+	struct acpi_buffer buf;
+	union acpi_object *obj;
+	struct acpi_namespace_node *search_ns;
+	struct atk_data *data;
+
+	dev_dbg(&device->dev, "adding...\n");
+
+	data = kzalloc(sizeof(*data), GFP_KERNEL);
+	if (!data)
+		return -ENOMEM;
+
+	data->acpi_dev = device;
+	data->atk_handle = device->handle;
+	INIT_LIST_HEAD(&data->sensor_list);
+
+	buf.length = ACPI_ALLOCATE_BUFFER;
+	ret = acpi_evaluate_object_typed(data->atk_handle, BOARD_ID, NULL,
+			&buf, ACPI_TYPE_PACKAGE);
+	if (ret != AE_OK) {
+		dev_dbg(&device->dev, "atk: method MBIF not found\n");
+		err = -ENODEV;
+		goto out;
+	}
+
+	obj = buf.pointer;
+	if (obj->package.count >= 2 &&
+			obj->package.elements[1].type == ACPI_TYPE_STRING) {
+		dev_dbg(&device->dev, "board ID = %s\n",
+				obj->package.elements[1].string.pointer);
+	}
+	ACPI_FREE(buf.pointer);
+
+	/* Check for hwmon methods */
+	search_ns = acpi_ns_map_handle_to_node(device->handle);
+	if (!search_ns) {
+		err = -ENODEV;
+		goto out;
+	}
+
+	/* First check "old" style methods; note that both may be present: in
+	 * this case we stick to the old interface; analysis of multiple DSDTs
+	 * indicates that when both interfaces are present the new one
+	 * (GGRP/GITM) is not functional.
+	 */
+	err = atk_check_old_if(data, search_ns);
+	if (!err) {
+		dev_dbg(&device->dev, "Using old hwmon interface\n");
+		data->old_interface = true;
+	} else {
+		err = atk_check_new_if(data, search_ns);
+		if (err)
+			goto out;
+
+		dev_dbg(&device->dev, "Using new hwmon interface\n");
+		data->old_interface = false;
+	}
+
+	if (data->old_interface)
+		err = atk_enumerate_old_hwmon(data);
+	else
+		err = atk_enumerate_new_hwmon(data);
+	if (err < 0)
+		goto out;
+	if (err == 0) {
+		dev_info(&device->dev, "No usable sensor detected, bailing out\n");
+		err = -ENODEV;
+		goto out;
+	}
+
+	err = atk_register_hwmon(data);
+	if (err)
+		goto cleanup;
+
+	device->driver_data = data;
+	return 0;
+cleanup:
+	atk_free_sensors(data);
+out:
+	kfree(data);
+	return err;
+}
+
+static int atk_remove(struct acpi_device *device, int type)
+{
+	struct atk_data *data = device->driver_data;
+	dev_dbg(&device->dev, "removing...\n");
+
+	device->driver_data = NULL;
+
+	atk_remove_files(data);
+	atk_free_sensors(data);
+	hwmon_device_unregister(data->hwmon_dev);
+
+	kfree(data);
+
+	return 0;
+}
+
+static int atk0110_init(void)
+{
+	int ret;
+
+	ret = acpi_bus_register_driver(&atk_driver);
+	if (ret)
+		pr_info("atk: acpi_bus_register_driver failed: %d\n", ret);
+
+	return ret;
+}
+
+static void atk0110_exit(void)
+{
+	acpi_bus_unregister_driver(&atk_driver);
+}
+
+module_init(atk0110_init);
+module_exit(atk0110_exit);
+
+MODULE_LICENSE("GPL");
Index: linux-2.6.git/drivers/hwmon/Kconfig
===================================================================
--- linux-2.6.git.orig/drivers/hwmon/Kconfig	2008-12-26 18:59:30.000000000 +0100
+++ linux-2.6.git/drivers/hwmon/Kconfig	2008-12-26 18:59:38.000000000 +0100
@@ -238,6 +238,18 @@
 	  This driver can also be built as a module.  If so, the module
 	  will be called asb100.
 
+config SENSORS_ATK0110
+	tristate "ASUS ATK0110 ACPI hwmon"
+	depends on X86 && ACPI && EXPERIMENTAL
+	help
+	  If you say yes here you get support for the ACPI hardware
+	  monitoring interface found in many ASUS motherboards. This
+	  driver will provide readings of fans, voltages and temperatures
+	  through the system firmware.
+
+	  This driver can also be built as a module. If so, the module
+	  will be called asus_atk0110.
+
 config SENSORS_ATXP1
 	tristate "Attansic ATXP1 VID controller"
 	depends on I2C && EXPERIMENTAL
Index: linux-2.6.git/drivers/hwmon/Makefile
===================================================================
--- linux-2.6.git.orig/drivers/hwmon/Makefile	2008-12-26 18:59:30.000000000 +0100
+++ linux-2.6.git/drivers/hwmon/Makefile	2008-12-26 18:59:38.000000000 +0100
@@ -30,6 +30,7 @@
 obj-$(CONFIG_SENSORS_ADT7473)	+= adt7473.o
 obj-$(CONFIG_SENSORS_APPLESMC)	+= applesmc.o
 obj-$(CONFIG_SENSORS_AMS)	+= ams/
+obj-$(CONFIG_SENSORS_ATK0110)	+= asus_atk0110.o
 obj-$(CONFIG_SENSORS_ATXP1)	+= atxp1.o
 obj-$(CONFIG_SENSORS_CORETEMP)	+= coretemp.o
 obj-$(CONFIG_SENSORS_DME1737)	+= dme1737.o


Index: config-generic
===================================================================
RCS file: /cvs/extras/rpms/kernel/devel/config-generic,v
retrieving revision 1.225
retrieving revision 1.226
diff -u -r1.225 -r1.226
--- config-generic	23 Jan 2009 19:28:10 -0000	1.225
+++ config-generic	23 Jan 2009 22:40:24 -0000	1.226
@@ -1951,6 +1951,7 @@
 #
 # I2C Hardware Sensors Chip support
 #
+CONFIG_SENSORS_ATK0110=m
 CONFIG_SENSORS_ABITUGURU=m
 CONFIG_SENSORS_ABITUGURU3=m
 CONFIG_SENSORS_AD7414=m


Index: kernel.spec
===================================================================
RCS file: /cvs/extras/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1228
retrieving revision 1.1229
diff -u -r1.1228 -r1.1229
--- kernel.spec	23 Jan 2009 20:19:55 -0000	1.1228
+++ kernel.spec	23 Jan 2009 22:40:24 -0000	1.1229
@@ -611,6 +611,8 @@
 Patch382: linux-2.6-defaults-pciehp.patch
 Patch390: linux-2.6-defaults-acpi-video.patch
 Patch391: linux-2.6-acpi-video-dos.patch
+Patch392: linux-2.6-acpi-strict-resources.patch
+Patch393: linux-2.6-hwmon-atk0110.patch
 Patch400: linux-2.6-scsi-cpqarray-set-master.patch
 Patch450: linux-2.6-input-kill-stupid-messages.patch
 Patch460: linux-2.6-serial-460800.patch
@@ -1072,6 +1074,8 @@
 # ACPI
 ApplyPatch linux-2.6-defaults-acpi-video.patch
 ApplyPatch linux-2.6-acpi-video-dos.patch
+ApplyPatch linux-2.6-acpi-strict-resources.patch
+ApplyPatch linux-2.6-hwmon-atk0110.patch
 
 # Various low-impact patches to aid debugging.
 ApplyPatch linux-2.6-debug-sizeof-structs.patch
@@ -1756,6 +1760,14 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Fri Jan 23 2009 Hans de Goede <hdegoede at redhat.com>
+- Change acpi_enforce_resources default to strict, this will cause hwmon
+  drivers which clash with io resources reserved by ACPI to no longer load,
+  avoiding both the ACPI code and the native driver trying to drive the same
+  IC at the same time
+- Add ASUS ACPI hwmon interface driver (atk0110), this will give (restore)
+  hwmon functionality on most ASUS boards through the firmware
+
 * Fri Jan 23 2009 Dave Jones <davej at redhat.com>
 - Make NFS work again.
 



From pkgdb at fedoraproject.org  Fri Jan 23 23:03:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 23 Jan 2009 23:03:29 +0000
Subject: [pkgdb] python-kiwi (Fedora EPEL, 5) updated by kevin
Message-ID: <20090123230329.6420620847E@bastion.fedora.phx.redhat.com>

kevin changed owner of python-kiwi in Fedora EPEL 5 to icon

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-kiwi



From orion at fedoraproject.org  Fri Jan 23 23:07:27 2009
From: orion at fedoraproject.org (Orion Poplawski)
Date: Fri, 23 Jan 2009 23:07:27 +0000 (UTC)
Subject: rpms/ruby-mysql/devel .cvsignore, 1.6, 1.7 ruby-mysql.spec, 1.10,
	1.11 sources, 1.6, 1.7
Message-ID: <20090123230727.50AD1700FE@cvs1.fedora.phx.redhat.com>

Author: orion

Update of /cvs/pkgs/rpms/ruby-mysql/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16494

Modified Files:
	.cvsignore ruby-mysql.spec sources 
Log Message:
* Fri Jan 23 2009 Orion Poplawski <orion at cora.nwra.com> - 2.8-1
- Update to 2.8



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ruby-mysql/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	8 Mar 2008 00:00:31 -0000	1.6
+++ .cvsignore	23 Jan 2009 23:06:56 -0000	1.7
@@ -1 +1 @@
-mysql-ruby-2.7.5.tar.gz
+mysql-ruby-2.8.tar.gz


Index: ruby-mysql.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ruby-mysql/devel/ruby-mysql.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ruby-mysql.spec	8 Mar 2008 00:00:31 -0000	1.10
+++ ruby-mysql.spec	23 Jan 2009 23:06:56 -0000	1.11
@@ -2,7 +2,7 @@
 %{!?ruby_sitearchdir: %define ruby_sitearchdir %(/usr/bin/ruby -rrbconfig -e "puts Config::CONFIG['sitearchdir']")}
 
 Name:           ruby-mysql
-Version:        2.7.5
+Version:        2.8
 Release:        1%{?dist}
 Summary:        A Ruby interface to MySQL
 
@@ -39,6 +39,9 @@
 %{ruby_sitearchdir}/mysql.so
 
 %changelog
+* Fri Jan 23 2009 Orion Poplawski <orion at cora.nwra.com> - 2.8-1
+- Update to 2.8
+
 * Fri Mar  7 2008 Orion Poplawski <orion at cora.nwra.com> - 2.7.5-1
 - Update to 2.7.5
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ruby-mysql/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	8 Mar 2008 00:00:31 -0000	1.6
+++ sources	23 Jan 2009 23:06:56 -0000	1.7
@@ -1 +1 @@
-4e42869196aa84ca17e70ab2287f8830  mysql-ruby-2.7.5.tar.gz
+68a8df16b5147df7961d39371f0ff69f  mysql-ruby-2.8.tar.gz



From pkgdb at fedoraproject.org  Fri Jan 23 23:08:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 23 Jan 2009 23:08:20 +0000
Subject: [pkgdb] eclipse-linuxprofilingframework was added for overholt
Message-ID: <20090123230820.F21DA208480@bastion.fedora.phx.redhat.com>

kevin has added Package eclipse-linuxprofilingframework with summary Plugins common to Eclipse Linux Tools profiling tools
kevin has approved Package eclipse-linuxprofilingframework
kevin has added a Fedora devel branch for eclipse-linuxprofilingframework with an owner of overholt
kevin has approved eclipse-linuxprofilingframework in Fedora devel
kevin has approved Package eclipse-linuxprofilingframework
kevin has set commit to Approved for provenpackager on eclipse-linuxprofilingframework (Fedora devel)
kevin has set build to Approved for provenpackager on eclipse-linuxprofilingframework (Fedora devel)
kevin has set checkout to Approved for provenpackager on eclipse-linuxprofilingframework (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/eclipse-linuxprofilingframework



From pkgdb at fedoraproject.org  Fri Jan 23 23:08:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 23 Jan 2009 23:08:22 +0000
Subject: [pkgdb] eclipse-linuxprofilingframework (Fedora,
	devel) updated by kevin
Message-ID: <20090123230822.A4319208483@bastion.fedora.phx.redhat.com>

kevin approved watchbugzilla on eclipse-linuxprofilingframework (Fedora devel) for ebaron
kevin approved watchcommits on eclipse-linuxprofilingframework (Fedora devel) for ebaron

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/eclipse-linuxprofilingframework



From kevin at fedoraproject.org  Fri Jan 23 23:08:35 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 23 Jan 2009 23:08:35 +0000 (UTC)
Subject: rpms/eclipse-linuxprofilingframework - New directory
Message-ID: <20090123230835.3755F700FE@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/eclipse-linuxprofilingframework
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsc17186/rpms/eclipse-linuxprofilingframework

Log Message:
Directory /cvs/pkgs/rpms/eclipse-linuxprofilingframework added to the repository




From kevin at fedoraproject.org  Fri Jan 23 23:08:35 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 23 Jan 2009 23:08:35 +0000 (UTC)
Subject: rpms/eclipse-linuxprofilingframework/devel - New directory
Message-ID: <20090123230835.75E0170143@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/eclipse-linuxprofilingframework/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsc17186/rpms/eclipse-linuxprofilingframework/devel

Log Message:
Directory /cvs/pkgs/rpms/eclipse-linuxprofilingframework/devel added to the repository




From pkgdb at fedoraproject.org  Fri Jan 23 23:08:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 23 Jan 2009 23:08:22 +0000
Subject: [pkgdb] eclipse-linuxprofilingframework (Fedora,
	10) updated by kevin
Message-ID: <20090123230822.B5AE3208486@bastion.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for eclipse-linuxprofilingframework
kevin has set commit to Approved for provenpackager on eclipse-linuxprofilingframework (Fedora 10)
kevin has set build to Approved for provenpackager on eclipse-linuxprofilingframework (Fedora 10)
kevin has set checkout to Approved for provenpackager on eclipse-linuxprofilingframework (Fedora 10)
kevin approved watchbugzilla on eclipse-linuxprofilingframework (Fedora 10) for ebaron
kevin approved watchcommits on eclipse-linuxprofilingframework (Fedora 10) for ebaron

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/eclipse-linuxprofilingframework



From kevin at fedoraproject.org  Fri Jan 23 23:08:51 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 23 Jan 2009 23:08:51 +0000 (UTC)
Subject: rpms/eclipse-linuxprofilingframework Makefile,NONE,1.1
Message-ID: <20090123230851.18E6E700FE@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/eclipse-linuxprofilingframework
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsc17186/rpms/eclipse-linuxprofilingframework

Added Files:
	Makefile 
Log Message:
Setup of module eclipse-linuxprofilingframework


--- NEW FILE Makefile ---
# Top level Makefile for module eclipse-linuxprofilingframework
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Jan 23 23:08:51 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 23 Jan 2009 23:08:51 +0000 (UTC)
Subject: rpms/eclipse-linuxprofilingframework/devel .cvsignore, NONE,
	1.1 Makefile, NONE, 1.1 sources, NONE, 1.1
Message-ID: <20090123230851.5423A700FE@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/eclipse-linuxprofilingframework/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsc17186/rpms/eclipse-linuxprofilingframework/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module eclipse-linuxprofilingframework


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: eclipse-linuxprofilingframework
# $Id: Makefile,v 1.1 2009/01/23 23:08:51 kevin Exp $
NAME := eclipse-linuxprofilingframework
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Jan 23 23:11:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 23 Jan 2009 23:11:02 +0000
Subject: [pkgdb] ctan-kerkis-fonts was added for sarantis
Message-ID: <20090123231102.36382208480@bastion.fedora.phx.redhat.com>

kevin has added Package ctan-kerkis-fonts with summary Kerkis type 1 fonts for LaTeX
kevin has approved Package ctan-kerkis-fonts
kevin has added a Fedora devel branch for ctan-kerkis-fonts with an owner of sarantis
kevin has approved ctan-kerkis-fonts in Fedora devel
kevin has approved Package ctan-kerkis-fonts
kevin has set commit to Approved for provenpackager on ctan-kerkis-fonts (Fedora devel)
kevin has set build to Approved for provenpackager on ctan-kerkis-fonts (Fedora devel)
kevin has set checkout to Approved for provenpackager on ctan-kerkis-fonts (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ctan-kerkis-fonts



From kevin at fedoraproject.org  Fri Jan 23 23:11:20 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 23 Jan 2009 23:11:20 +0000 (UTC)
Subject: rpms/ctan-kerkis-fonts - New directory
Message-ID: <20090123231120.321F1700FE@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/ctan-kerkis-fonts
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvse17750/rpms/ctan-kerkis-fonts

Log Message:
Directory /cvs/pkgs/rpms/ctan-kerkis-fonts added to the repository




From kevin at fedoraproject.org  Fri Jan 23 23:11:20 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 23 Jan 2009 23:11:20 +0000 (UTC)
Subject: rpms/ctan-kerkis-fonts/devel - New directory
Message-ID: <20090123231120.72C24700FE@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/ctan-kerkis-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvse17750/rpms/ctan-kerkis-fonts/devel

Log Message:
Directory /cvs/pkgs/rpms/ctan-kerkis-fonts/devel added to the repository




From kevin at fedoraproject.org  Fri Jan 23 23:11:37 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 23 Jan 2009 23:11:37 +0000 (UTC)
Subject: rpms/ctan-kerkis-fonts Makefile,NONE,1.1
Message-ID: <20090123231137.38C4D700FE@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/ctan-kerkis-fonts
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvse17750/rpms/ctan-kerkis-fonts

Added Files:
	Makefile 
Log Message:
Setup of module ctan-kerkis-fonts


--- NEW FILE Makefile ---
# Top level Makefile for module ctan-kerkis-fonts
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Fri Jan 23 23:11:37 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 23 Jan 2009 23:11:37 +0000 (UTC)
Subject: rpms/ctan-kerkis-fonts/devel .cvsignore, NONE, 1.1 Makefile, NONE, 
	1.1 sources, NONE, 1.1
Message-ID: <20090123231137.8EA5C700FE@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/ctan-kerkis-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvse17750/rpms/ctan-kerkis-fonts/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module ctan-kerkis-fonts


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: ctan-kerkis-fonts
# $Id: Makefile,v 1.1 2009/01/23 23:11:37 kevin Exp $
NAME := ctan-kerkis-fonts
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Fri Jan 23 23:13:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 23 Jan 2009 23:13:17 +0000
Subject: [pkgdb] autotrust was added for pwouters
Message-ID: <20090123231317.F30F1208480@bastion.fedora.phx.redhat.com>

kevin has added Package autotrust with summary DNSKEY trust anchor update utility that uses RFC-5011
kevin has approved Package autotrust
kevin has added a Fedora devel branch for autotrust with an owner of pwouters
kevin has approved autotrust in Fedora devel
kevin has approved Package autotrust
kevin has set commit to Approved for provenpackager on autotrust (Fedora devel)
kevin has set build to Approved for provenpackager on autotrust (Fedora devel)
kevin has set checkout to Approved for provenpackager on autotrust (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/autotrust



From pkgdb at fedoraproject.org  Fri Jan 23 23:13:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 23 Jan 2009 23:13:19 +0000
Subject: [pkgdb] autotrust (Fedora, 9) updated by kevin
Message-ID: <20090123231319.2E781208483@bastion.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for autotrust
kevin has set commit to Approved for provenpackager on autotrust (Fedora 9)
kevin has set build to Approved for provenpackager on autotrust (Fedora 9)
kevin has set checkout to Approved for provenpackager on autotrust (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/autotrust



From pkgdb at fedoraproject.org  Fri Jan 23 23:13:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 23 Jan 2009 23:13:19 +0000
Subject: [pkgdb] autotrust (Fedora, 10) updated by kevin
Message-ID: <20090123231319.373F8208486@bastion.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for autotrust
kevin has set commit to Approved for provenpackager on autotrust (Fedora 10)
kevin has set build to Approved for provenpackager on autotrust (Fedora 10)
kevin has set checkout to Approved for provenpackager on autotrust (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/autotrust



From pkgdb at fedoraproject.org  Fri Jan 23 23:13:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 23 Jan 2009 23:13:19 +0000
Subject: [pkgdb] autotrust (Fedora EPEL, 5) updated by kevin
Message-ID: <20090123231319.436F3208489@bastion.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for autotrust
kevin has set commit to Approved for provenpackager on autotrust (Fedora EPEL 5)
kevin has set build to Approved for provenpackager on autotrust (Fedora EPEL 5)
kevin has set checkout to Approved for provenpackager on autotrust (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/autotrust



From kevin at fedoraproject.org  Fri Jan 23 23:13:49 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 23 Jan 2009 23:13:49 +0000 (UTC)
Subject: rpms/autotrust - New directory
Message-ID: <20090123231349.26351700FE@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/autotrust
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsr18079/rpms/autotrust

Log Message:
Directory /cvs/pkgs/rpms/autotrust added to the repository




From kevin at fedoraproject.org  Fri Jan 23 23:13:49 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 23 Jan 2009 23:13:49 +0000 (UTC)
Subject: rpms/autotrust/devel - New directory
Message-ID: <20090123231349.6FE1170142@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/autotrust/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsr18079/rpms/autotrust/devel

Log Message:
Directory /cvs/pkgs/rpms/autotrust/devel added to the repository




From kevin at fedoraproject.org  Fri Jan 23 23:14:07 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 23 Jan 2009 23:14:07 +0000 (UTC)
Subject: rpms/autotrust Makefile,NONE,1.1
Message-ID: <20090123231407.81F6C700FE@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/autotrust
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsr18079/rpms/autotrust

Added Files:
	Makefile 
Log Message:
Setup of module autotrust


--- NEW FILE Makefile ---
# Top level Makefile for module autotrust
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Jan 23 23:14:07 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 23 Jan 2009 23:14:07 +0000 (UTC)
Subject: rpms/autotrust/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090123231407.CA202700FE@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/autotrust/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsr18079/rpms/autotrust/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module autotrust


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: autotrust
# $Id: Makefile,v 1.1 2009/01/23 23:14:07 kevin Exp $
NAME := autotrust
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Jan 23 23:14:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 23 Jan 2009 23:14:42 +0000
Subject: [pkgdb] ctan-musixtex-fonts was added for oget
Message-ID: <20090123231442.A70A120847E@bastion.fedora.phx.redhat.com>

kevin has added Package ctan-musixtex-fonts with summary Type 1 versions of MusiXTeX fonts
kevin has approved Package ctan-musixtex-fonts
kevin has added a Fedora devel branch for ctan-musixtex-fonts with an owner of oget
kevin has approved ctan-musixtex-fonts in Fedora devel
kevin has approved Package ctan-musixtex-fonts
kevin has set commit to Approved for provenpackager on ctan-musixtex-fonts (Fedora devel)
kevin has set build to Approved for provenpackager on ctan-musixtex-fonts (Fedora devel)
kevin has set checkout to Approved for provenpackager on ctan-musixtex-fonts (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ctan-musixtex-fonts



From pkgdb at fedoraproject.org  Fri Jan 23 23:14:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 23 Jan 2009 23:14:43 +0000
Subject: [pkgdb] ctan-musixtex-fonts (Fedora, 9) updated by kevin
Message-ID: <20090123231443.DDF09208482@bastion.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for ctan-musixtex-fonts
kevin has set commit to Approved for provenpackager on ctan-musixtex-fonts (Fedora 9)
kevin has set build to Approved for provenpackager on ctan-musixtex-fonts (Fedora 9)
kevin has set checkout to Approved for provenpackager on ctan-musixtex-fonts (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ctan-musixtex-fonts



From pkgdb at fedoraproject.org  Fri Jan 23 23:14:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 23 Jan 2009 23:14:43 +0000
Subject: [pkgdb] ctan-musixtex-fonts (Fedora, 10) updated by kevin
Message-ID: <20090123231444.00252208485@bastion.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for ctan-musixtex-fonts
kevin has set commit to Approved for provenpackager on ctan-musixtex-fonts (Fedora 10)
kevin has set build to Approved for provenpackager on ctan-musixtex-fonts (Fedora 10)
kevin has set checkout to Approved for provenpackager on ctan-musixtex-fonts (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ctan-musixtex-fonts



From kevin at fedoraproject.org  Fri Jan 23 23:15:01 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 23 Jan 2009 23:15:01 +0000 (UTC)
Subject: rpms/ctan-musixtex-fonts - New directory
Message-ID: <20090123231501.412DE700FE@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/ctan-musixtex-fonts
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsl18400/rpms/ctan-musixtex-fonts

Log Message:
Directory /cvs/pkgs/rpms/ctan-musixtex-fonts added to the repository




From kevin at fedoraproject.org  Fri Jan 23 23:15:01 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 23 Jan 2009 23:15:01 +0000 (UTC)
Subject: rpms/ctan-musixtex-fonts/devel - New directory
Message-ID: <20090123231501.96A9D700FE@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/ctan-musixtex-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsl18400/rpms/ctan-musixtex-fonts/devel

Log Message:
Directory /cvs/pkgs/rpms/ctan-musixtex-fonts/devel added to the repository




From kevin at fedoraproject.org  Fri Jan 23 23:15:22 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 23 Jan 2009 23:15:22 +0000 (UTC)
Subject: rpms/ctan-musixtex-fonts Makefile,NONE,1.1
Message-ID: <20090123231522.21B19700FE@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/ctan-musixtex-fonts
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsl18400/rpms/ctan-musixtex-fonts

Added Files:
	Makefile 
Log Message:
Setup of module ctan-musixtex-fonts


--- NEW FILE Makefile ---
# Top level Makefile for module ctan-musixtex-fonts
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Fri Jan 23 23:15:22 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 23 Jan 2009 23:15:22 +0000 (UTC)
Subject: rpms/ctan-musixtex-fonts/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090123231522.87CF7700FE@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/ctan-musixtex-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsl18400/rpms/ctan-musixtex-fonts/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module ctan-musixtex-fonts


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: ctan-musixtex-fonts
# $Id: Makefile,v 1.1 2009/01/23 23:15:22 kevin Exp $
NAME := ctan-musixtex-fonts
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Fri Jan 23 23:18:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 23 Jan 2009 23:18:28 +0000
Subject: [pkgdb] php-pecl-imagick (Fedora EPEL, 5) updated by kevin
Message-ID: <20090123231828.8AB1620847E@bastion.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for php-pecl-imagick
kevin has set commit to Approved for provenpackager on php-pecl-imagick (Fedora EPEL 5)
kevin has set build to Approved for provenpackager on php-pecl-imagick (Fedora EPEL 5)
kevin has set checkout to Approved for provenpackager on php-pecl-imagick (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/php-pecl-imagick



From pkgdb at fedoraproject.org  Fri Jan 23 23:19:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 23 Jan 2009 23:19:27 +0000
Subject: [pkgdb] python-distutils-extra was added for fab
Message-ID: <20090123231927.6632720847E@bastion.fedora.phx.redhat.com>

kevin has added Package python-distutils-extra with summary Integrate more support into Python's distutils
kevin has approved Package python-distutils-extra
kevin has added a Fedora devel branch for python-distutils-extra with an owner of fab
kevin has approved python-distutils-extra in Fedora devel
kevin has approved Package python-distutils-extra
kevin has set commit to Approved for provenpackager on python-distutils-extra (Fedora devel)
kevin has set build to Approved for provenpackager on python-distutils-extra (Fedora devel)
kevin has set checkout to Approved for provenpackager on python-distutils-extra (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-distutils-extra



From pkgdb at fedoraproject.org  Fri Jan 23 23:19:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 23 Jan 2009 23:19:29 +0000
Subject: [pkgdb] python-distutils-extra (Fedora, 9) updated by kevin
Message-ID: <20090123231929.6499B208482@bastion.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for python-distutils-extra
kevin has set commit to Approved for provenpackager on python-distutils-extra (Fedora 9)
kevin has set build to Approved for provenpackager on python-distutils-extra (Fedora 9)
kevin has set checkout to Approved for provenpackager on python-distutils-extra (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-distutils-extra



From kevin at fedoraproject.org  Fri Jan 23 23:19:41 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 23 Jan 2009 23:19:41 +0000 (UTC)
Subject: rpms/python-distutils-extra - New directory
Message-ID: <20090123231941.20FCD700FE@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/python-distutils-extra
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsi19062/rpms/python-distutils-extra

Log Message:
Directory /cvs/pkgs/rpms/python-distutils-extra added to the repository




From kevin at fedoraproject.org  Fri Jan 23 23:19:41 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 23 Jan 2009 23:19:41 +0000 (UTC)
Subject: rpms/python-distutils-extra/devel - New directory
Message-ID: <20090123231941.609D4700FE@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/python-distutils-extra/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsi19062/rpms/python-distutils-extra/devel

Log Message:
Directory /cvs/pkgs/rpms/python-distutils-extra/devel added to the repository




From pkgdb at fedoraproject.org  Fri Jan 23 23:19:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 23 Jan 2009 23:19:29 +0000
Subject: [pkgdb] python-distutils-extra (Fedora, 10) updated by kevin
Message-ID: <20090123231929.72F76208485@bastion.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for python-distutils-extra
kevin has set commit to Approved for provenpackager on python-distutils-extra (Fedora 10)
kevin has set build to Approved for provenpackager on python-distutils-extra (Fedora 10)
kevin has set checkout to Approved for provenpackager on python-distutils-extra (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-distutils-extra



From kevin at fedoraproject.org  Fri Jan 23 23:19:58 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 23 Jan 2009 23:19:58 +0000 (UTC)
Subject: rpms/python-distutils-extra Makefile,NONE,1.1
Message-ID: <20090123231958.02E36700FE@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/python-distutils-extra
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsi19062/rpms/python-distutils-extra

Added Files:
	Makefile 
Log Message:
Setup of module python-distutils-extra


--- NEW FILE Makefile ---
# Top level Makefile for module python-distutils-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 Jan 23 23:19:58 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 23 Jan 2009 23:19:58 +0000 (UTC)
Subject: rpms/python-distutils-extra/devel .cvsignore, NONE, 1.1 Makefile,
	NONE, 1.1 sources, NONE, 1.1
Message-ID: <20090123231958.45D3E70143@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/python-distutils-extra/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsi19062/rpms/python-distutils-extra/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module python-distutils-extra


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: python-distutils-extra
# $Id: Makefile,v 1.1 2009/01/23 23:19:58 kevin Exp $
NAME := python-distutils-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 Jan 23 23:20:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 23 Jan 2009 23:20:18 +0000
Subject: [pkgdb] dnssec-conf was added for pwouters
Message-ID: <20090123232018.BB296208481@bastion.fedora.phx.redhat.com>

kevin has added Package dnssec-conf with summary DNSSEC and DLV configuration and priming tool
kevin has approved Package dnssec-conf
kevin has added a Fedora devel branch for dnssec-conf with an owner of pwouters
kevin has approved dnssec-conf in Fedora devel
kevin has approved Package dnssec-conf
kevin has set commit to Approved for provenpackager on dnssec-conf (Fedora devel)
kevin has set build to Approved for provenpackager on dnssec-conf (Fedora devel)
kevin has set checkout to Approved for provenpackager on dnssec-conf (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/dnssec-conf



From pkgdb at fedoraproject.org  Fri Jan 23 23:20:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 23 Jan 2009 23:20:20 +0000
Subject: [pkgdb] dnssec-conf (Fedora EPEL, 5) updated by kevin
Message-ID: <20090123232020.3C4E0208486@bastion.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for dnssec-conf
kevin has set commit to Approved for provenpackager on dnssec-conf (Fedora EPEL 5)
kevin has set build to Approved for provenpackager on dnssec-conf (Fedora EPEL 5)
kevin has set checkout to Approved for provenpackager on dnssec-conf (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/dnssec-conf



From pkgdb at fedoraproject.org  Fri Jan 23 23:20:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 23 Jan 2009 23:20:20 +0000
Subject: [pkgdb] dnssec-conf (Fedora, 9) updated by kevin
Message-ID: <20090123232020.4BEAD208489@bastion.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for dnssec-conf
kevin has set commit to Approved for provenpackager on dnssec-conf (Fedora 9)
kevin has set build to Approved for provenpackager on dnssec-conf (Fedora 9)
kevin has set checkout to Approved for provenpackager on dnssec-conf (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/dnssec-conf



From kevin at fedoraproject.org  Fri Jan 23 23:20:33 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 23 Jan 2009 23:20:33 +0000 (UTC)
Subject: rpms/dnssec-conf - New directory
Message-ID: <20090123232033.29661700FE@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/dnssec-conf
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsd19288/rpms/dnssec-conf

Log Message:
Directory /cvs/pkgs/rpms/dnssec-conf added to the repository




From pkgdb at fedoraproject.org  Fri Jan 23 23:20:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 23 Jan 2009 23:20:20 +0000
Subject: [pkgdb] dnssec-conf (Fedora, 10) updated by kevin
Message-ID: <20090123232020.5BB0E20848E@bastion.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for dnssec-conf
kevin has set commit to Approved for provenpackager on dnssec-conf (Fedora 10)
kevin has set build to Approved for provenpackager on dnssec-conf (Fedora 10)
kevin has set checkout to Approved for provenpackager on dnssec-conf (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/dnssec-conf



From kevin at fedoraproject.org  Fri Jan 23 23:20:33 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 23 Jan 2009 23:20:33 +0000 (UTC)
Subject: rpms/dnssec-conf/devel - New directory
Message-ID: <20090123232033.5FFAF70143@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/dnssec-conf/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsd19288/rpms/dnssec-conf/devel

Log Message:
Directory /cvs/pkgs/rpms/dnssec-conf/devel added to the repository




From kevin at fedoraproject.org  Fri Jan 23 23:20:51 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 23 Jan 2009 23:20:51 +0000 (UTC)
Subject: rpms/dnssec-conf Makefile,NONE,1.1
Message-ID: <20090123232051.0F707700FE@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/dnssec-conf
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsd19288/rpms/dnssec-conf

Added Files:
	Makefile 
Log Message:
Setup of module dnssec-conf


--- NEW FILE Makefile ---
# Top level Makefile for module dnssec-conf
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Jan 23 23:20:51 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 23 Jan 2009 23:20:51 +0000 (UTC)
Subject: rpms/dnssec-conf/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090123232051.658D0700FE@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/dnssec-conf/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsd19288/rpms/dnssec-conf/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module dnssec-conf


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: dnssec-conf
# $Id: Makefile,v 1.1 2009/01/23 23:20:51 kevin Exp $
NAME := dnssec-conf
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Jan 23 23:21:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 23 Jan 2009 23:21:22 +0000
Subject: [pkgdb] mingw32-libgpg-error was added for rjones
Message-ID: <20090123232122.8287F208481@bastion.fedora.phx.redhat.com>

kevin has added Package mingw32-libgpg-error with summary MinGW Windows GnuPGP error library
kevin has approved Package mingw32-libgpg-error
kevin has added a Fedora devel branch for mingw32-libgpg-error with an owner of rjones
kevin has approved mingw32-libgpg-error in Fedora devel
kevin has approved Package mingw32-libgpg-error
kevin has set commit to Approved for provenpackager on mingw32-libgpg-error (Fedora devel)
kevin has set build to Approved for provenpackager on mingw32-libgpg-error (Fedora devel)
kevin has set checkout to Approved for provenpackager on mingw32-libgpg-error (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-libgpg-error



From kevin at fedoraproject.org  Fri Jan 23 23:21:39 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 23 Jan 2009 23:21:39 +0000 (UTC)
Subject: rpms/mingw32-libgpg-error - New directory
Message-ID: <20090123232139.27A6E700FE@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/mingw32-libgpg-error
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsn19591/rpms/mingw32-libgpg-error

Log Message:
Directory /cvs/pkgs/rpms/mingw32-libgpg-error added to the repository




From kevin at fedoraproject.org  Fri Jan 23 23:21:39 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 23 Jan 2009 23:21:39 +0000 (UTC)
Subject: rpms/mingw32-libgpg-error/devel - New directory
Message-ID: <20090123232139.60CCA700FE@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/mingw32-libgpg-error/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsn19591/rpms/mingw32-libgpg-error/devel

Log Message:
Directory /cvs/pkgs/rpms/mingw32-libgpg-error/devel added to the repository




From kevin at fedoraproject.org  Fri Jan 23 23:21:56 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 23 Jan 2009 23:21:56 +0000 (UTC)
Subject: rpms/mingw32-libgpg-error/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090123232156.A3BCD700FE@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/mingw32-libgpg-error/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsn19591/rpms/mingw32-libgpg-error/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module mingw32-libgpg-error


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: mingw32-libgpg-error
# $Id: Makefile,v 1.1 2009/01/23 23:21:56 kevin Exp $
NAME := mingw32-libgpg-error
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From kevin at fedoraproject.org  Fri Jan 23 23:21:56 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 23 Jan 2009 23:21:56 +0000 (UTC)
Subject: rpms/mingw32-libgpg-error Makefile,NONE,1.1
Message-ID: <20090123232156.56ECB700FE@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/mingw32-libgpg-error
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsn19591/rpms/mingw32-libgpg-error

Added Files:
	Makefile 
Log Message:
Setup of module mingw32-libgpg-error


--- NEW FILE Makefile ---
# Top level Makefile for module mingw32-libgpg-error
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From pkgdb at fedoraproject.org  Fri Jan 23 23:25:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 23 Jan 2009 23:25:34 +0000
Subject: [pkgdb] poweradmin was added for ruben
Message-ID: <20090123232534.4E3E720847E@bastion.fedora.phx.redhat.com>

kevin has added Package poweradmin with summary A friendly web-based DNS administration tool for Bert Hubert's PowerDNS server
kevin has approved Package poweradmin
kevin has added a Fedora devel branch for poweradmin with an owner of ruben
kevin has approved poweradmin in Fedora devel
kevin has approved Package poweradmin
kevin has set commit to Approved for provenpackager on poweradmin (Fedora devel)
kevin has set build to Approved for provenpackager on poweradmin (Fedora devel)
kevin has set checkout to Approved for provenpackager on poweradmin (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/poweradmin



From pkgdb at fedoraproject.org  Fri Jan 23 23:25:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 23 Jan 2009 23:25:36 +0000
Subject: [pkgdb] poweradmin (Fedora EPEL, 5) updated by kevin
Message-ID: <20090123232536.A49BD208482@bastion.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for poweradmin
kevin has set commit to Approved for provenpackager on poweradmin (Fedora EPEL 5)
kevin has set build to Approved for provenpackager on poweradmin (Fedora EPEL 5)
kevin has set checkout to Approved for provenpackager on poweradmin (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/poweradmin



From pkgdb at fedoraproject.org  Fri Jan 23 23:25:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 23 Jan 2009 23:25:36 +0000
Subject: [pkgdb] poweradmin (Fedora, 10) updated by kevin
Message-ID: <20090123232536.B4CE8208485@bastion.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for poweradmin
kevin has set commit to Approved for provenpackager on poweradmin (Fedora 10)
kevin has set build to Approved for provenpackager on poweradmin (Fedora 10)
kevin has set checkout to Approved for provenpackager on poweradmin (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/poweradmin



From pkgdb at fedoraproject.org  Fri Jan 23 23:25:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 23 Jan 2009 23:25:36 +0000
Subject: [pkgdb] poweradmin (Fedora EPEL, 4) updated by kevin
Message-ID: <20090123232536.D5D03208488@bastion.fedora.phx.redhat.com>

kevin added a Fedora EPEL 4 branch for poweradmin
kevin has set commit to Approved for provenpackager on poweradmin (Fedora EPEL 4)
kevin has set build to Approved for provenpackager on poweradmin (Fedora EPEL 4)
kevin has set checkout to Approved for provenpackager on poweradmin (Fedora EPEL 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/poweradmin



From kevin at fedoraproject.org  Fri Jan 23 23:25:51 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 23 Jan 2009 23:25:51 +0000 (UTC)
Subject: rpms/poweradmin - New directory
Message-ID: <20090123232551.23735700FE@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/poweradmin
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsn20214/rpms/poweradmin

Log Message:
Directory /cvs/pkgs/rpms/poweradmin added to the repository




From kevin at fedoraproject.org  Fri Jan 23 23:25:51 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 23 Jan 2009 23:25:51 +0000 (UTC)
Subject: rpms/poweradmin/devel - New directory
Message-ID: <20090123232551.624C0700FE@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/poweradmin/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsn20214/rpms/poweradmin/devel

Log Message:
Directory /cvs/pkgs/rpms/poweradmin/devel added to the repository




From kevin at fedoraproject.org  Fri Jan 23 23:26:09 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 23 Jan 2009 23:26:09 +0000 (UTC)
Subject: rpms/poweradmin Makefile,NONE,1.1
Message-ID: <20090123232609.B9DB9700FE@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/poweradmin
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsn20214/rpms/poweradmin

Added Files:
	Makefile 
Log Message:
Setup of module poweradmin


--- NEW FILE Makefile ---
# Top level Makefile for module poweradmin
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Jan 23 23:26:10 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 23 Jan 2009 23:26:10 +0000 (UTC)
Subject: rpms/poweradmin/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090123232610.07CF5700FE@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/poweradmin/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsn20214/rpms/poweradmin/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module poweradmin


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: poweradmin
# $Id: Makefile,v 1.1 2009/01/23 23:26:09 kevin Exp $
NAME := poweradmin
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Jan 23 23:26:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 23 Jan 2009 23:26:36 +0000
Subject: [pkgdb] rubygem-mechanize was added for mtasaka
Message-ID: <20090123232636.C629320847E@bastion.fedora.phx.redhat.com>

kevin has added Package rubygem-mechanize with summary A handy web browsing ruby object
kevin has approved Package rubygem-mechanize
kevin has added a Fedora devel branch for rubygem-mechanize with an owner of mtasaka
kevin has approved rubygem-mechanize in Fedora devel
kevin has approved Package rubygem-mechanize
kevin has set commit to Approved for provenpackager on rubygem-mechanize (Fedora devel)
kevin has set build to Approved for provenpackager on rubygem-mechanize (Fedora devel)
kevin has set checkout to Approved for provenpackager on rubygem-mechanize (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rubygem-mechanize



From pkgdb at fedoraproject.org  Fri Jan 23 23:26:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 23 Jan 2009 23:26:38 +0000
Subject: [pkgdb] rubygem-mechanize (Fedora, 9) updated by kevin
Message-ID: <20090123232638.75082208482@bastion.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for rubygem-mechanize
kevin has set commit to Approved for provenpackager on rubygem-mechanize (Fedora 9)
kevin has set build to Approved for provenpackager on rubygem-mechanize (Fedora 9)
kevin has set checkout to Approved for provenpackager on rubygem-mechanize (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rubygem-mechanize



From kevin at fedoraproject.org  Fri Jan 23 23:26:56 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 23 Jan 2009 23:26:56 +0000 (UTC)
Subject: rpms/rubygem-mechanize - New directory
Message-ID: <20090123232656.2A9A9700FE@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/rubygem-mechanize
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsm20652/rpms/rubygem-mechanize

Log Message:
Directory /cvs/pkgs/rpms/rubygem-mechanize added to the repository




From kevin at fedoraproject.org  Fri Jan 23 23:26:56 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 23 Jan 2009 23:26:56 +0000 (UTC)
Subject: rpms/rubygem-mechanize/devel - New directory
Message-ID: <20090123232656.65573700FE@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/rubygem-mechanize/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsm20652/rpms/rubygem-mechanize/devel

Log Message:
Directory /cvs/pkgs/rpms/rubygem-mechanize/devel added to the repository




From pkgdb at fedoraproject.org  Fri Jan 23 23:26:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 23 Jan 2009 23:26:38 +0000
Subject: [pkgdb] rubygem-mechanize (Fedora, 10) updated by kevin
Message-ID: <20090123232638.8B1FF208485@bastion.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for rubygem-mechanize
kevin has set commit to Approved for provenpackager on rubygem-mechanize (Fedora 10)
kevin has set build to Approved for provenpackager on rubygem-mechanize (Fedora 10)
kevin has set checkout to Approved for provenpackager on rubygem-mechanize (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rubygem-mechanize



From kevin at fedoraproject.org  Fri Jan 23 23:27:13 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 23 Jan 2009 23:27:13 +0000 (UTC)
Subject: rpms/rubygem-mechanize Makefile,NONE,1.1
Message-ID: <20090123232713.3271C700FE@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/rubygem-mechanize
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsm20652/rpms/rubygem-mechanize

Added Files:
	Makefile 
Log Message:
Setup of module rubygem-mechanize


--- NEW FILE Makefile ---
# Top level Makefile for module rubygem-mechanize
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Jan 23 23:27:13 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 23 Jan 2009 23:27:13 +0000 (UTC)
Subject: rpms/rubygem-mechanize/devel .cvsignore, NONE, 1.1 Makefile, NONE, 
	1.1 sources, NONE, 1.1
Message-ID: <20090123232713.716B2700FE@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/rubygem-mechanize/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsm20652/rpms/rubygem-mechanize/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module rubygem-mechanize


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: rubygem-mechanize
# $Id: Makefile,v 1.1 2009/01/23 23:27:13 kevin Exp $
NAME := rubygem-mechanize
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Jan 23 23:27:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 23 Jan 2009 23:27:18 +0000
Subject: [pkgdb] mythes-ro was added for caolanm
Message-ID: <20090123232718.BA01E20848C@bastion.fedora.phx.redhat.com>

kevin has added Package mythes-ro with summary Romanian Thesaurus
kevin has approved Package mythes-ro
kevin has added a Fedora devel branch for mythes-ro with an owner of caolanm
kevin has approved mythes-ro in Fedora devel
kevin has approved Package mythes-ro
kevin has set commit to Approved for provenpackager on mythes-ro (Fedora devel)
kevin has set build to Approved for provenpackager on mythes-ro (Fedora devel)
kevin has set checkout to Approved for provenpackager on mythes-ro (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mythes-ro



From kevin at fedoraproject.org  Fri Jan 23 23:27:32 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 23 Jan 2009 23:27:32 +0000 (UTC)
Subject: rpms/mythes-ro - New directory
Message-ID: <20090123232732.28214700FE@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/mythes-ro
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsm20868/rpms/mythes-ro

Log Message:
Directory /cvs/pkgs/rpms/mythes-ro added to the repository




From kevin at fedoraproject.org  Fri Jan 23 23:27:32 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 23 Jan 2009 23:27:32 +0000 (UTC)
Subject: rpms/mythes-ro/devel - New directory
Message-ID: <20090123232732.62BB9700FE@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/mythes-ro/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsm20868/rpms/mythes-ro/devel

Log Message:
Directory /cvs/pkgs/rpms/mythes-ro/devel added to the repository




From kevin at fedoraproject.org  Fri Jan 23 23:27:47 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 23 Jan 2009 23:27:47 +0000 (UTC)
Subject: rpms/mythes-ro Makefile,NONE,1.1
Message-ID: <20090123232747.9D9FD700FE@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/mythes-ro
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsm20868/rpms/mythes-ro

Added Files:
	Makefile 
Log Message:
Setup of module mythes-ro


--- NEW FILE Makefile ---
# Top level Makefile for module mythes-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 kevin at fedoraproject.org  Fri Jan 23 23:27:48 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 23 Jan 2009 23:27:48 +0000 (UTC)
Subject: rpms/mythes-ro/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090123232748.02959700FE@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/mythes-ro/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsm20868/rpms/mythes-ro/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module mythes-ro


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: mythes-ro
# $Id: Makefile,v 1.1 2009/01/23 23:27:47 kevin Exp $
NAME := mythes-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 kevin at fedoraproject.org  Fri Jan 23 23:28:04 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 23 Jan 2009 23:28:04 +0000 (UTC)
Subject: rpms/mythes-sl - New directory
Message-ID: <20090123232804.22734700FE@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/mythes-sl
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsM20952/rpms/mythes-sl

Log Message:
Directory /cvs/pkgs/rpms/mythes-sl added to the repository




From kevin at fedoraproject.org  Fri Jan 23 23:28:04 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 23 Jan 2009 23:28:04 +0000 (UTC)
Subject: rpms/mythes-sl/devel - New directory
Message-ID: <20090123232804.5930B70142@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/mythes-sl/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsM20952/rpms/mythes-sl/devel

Log Message:
Directory /cvs/pkgs/rpms/mythes-sl/devel added to the repository




From pkgdb at fedoraproject.org  Fri Jan 23 23:27:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 23 Jan 2009 23:27:51 +0000
Subject: [pkgdb] mythes-sl was added for caolanm
Message-ID: <20090123232751.851CB208487@bastion.fedora.phx.redhat.com>

kevin has added Package mythes-sl with summary Slovenian Thesaurus
kevin has approved Package mythes-sl
kevin has added a Fedora devel branch for mythes-sl with an owner of caolanm
kevin has approved mythes-sl in Fedora devel
kevin has approved Package mythes-sl
kevin has set commit to Approved for provenpackager on mythes-sl (Fedora devel)
kevin has set build to Approved for provenpackager on mythes-sl (Fedora devel)
kevin has set checkout to Approved for provenpackager on mythes-sl (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mythes-sl



From kevin at fedoraproject.org  Fri Jan 23 23:28:20 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 23 Jan 2009 23:28:20 +0000 (UTC)
Subject: rpms/mythes-sl Makefile,NONE,1.1
Message-ID: <20090123232820.68032700FE@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/mythes-sl
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsM20952/rpms/mythes-sl

Added Files:
	Makefile 
Log Message:
Setup of module mythes-sl


--- NEW FILE Makefile ---
# Top level Makefile for module mythes-sl
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Jan 23 23:28:20 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 23 Jan 2009 23:28:20 +0000 (UTC)
Subject: rpms/mythes-sl/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090123232820.A5E0F700FE@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/mythes-sl/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsM20952/rpms/mythes-sl/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module mythes-sl


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: mythes-sl
# $Id: Makefile,v 1.1 2009/01/23 23:28:20 kevin Exp $
NAME := mythes-sl
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From kevin at fedoraproject.org  Fri Jan 23 23:28:33 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 23 Jan 2009 23:28:33 +0000 (UTC)
Subject: rpms/mythes-ru - New directory
Message-ID: <20090123232833.29755700FE@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/mythes-ru
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsS21069/rpms/mythes-ru

Log Message:
Directory /cvs/pkgs/rpms/mythes-ru added to the repository




From kevin at fedoraproject.org  Fri Jan 23 23:28:33 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 23 Jan 2009 23:28:33 +0000 (UTC)
Subject: rpms/mythes-ru/devel - New directory
Message-ID: <20090123232833.77547700FE@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/mythes-ru/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsS21069/rpms/mythes-ru/devel

Log Message:
Directory /cvs/pkgs/rpms/mythes-ru/devel added to the repository




From pkgdb at fedoraproject.org  Fri Jan 23 23:28:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 23 Jan 2009 23:28:19 +0000
Subject: [pkgdb] mythes-ru was added for caolanm
Message-ID: <20090123232820.1D91C20847E@bastion.fedora.phx.redhat.com>

kevin has added Package mythes-ru with summary Russian Thesaurus
kevin has approved Package mythes-ru
kevin has added a Fedora devel branch for mythes-ru with an owner of caolanm
kevin has approved mythes-ru in Fedora devel
kevin has approved Package mythes-ru
kevin has set commit to Approved for provenpackager on mythes-ru (Fedora devel)
kevin has set build to Approved for provenpackager on mythes-ru (Fedora devel)
kevin has set checkout to Approved for provenpackager on mythes-ru (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mythes-ru



From kevin at fedoraproject.org  Fri Jan 23 23:28:49 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 23 Jan 2009 23:28:49 +0000 (UTC)
Subject: rpms/mythes-ru Makefile,NONE,1.1
Message-ID: <20090123232849.C3B97700FE@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/mythes-ru
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsS21069/rpms/mythes-ru

Added Files:
	Makefile 
Log Message:
Setup of module mythes-ru


--- NEW FILE Makefile ---
# Top level Makefile for module mythes-ru
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Jan 23 23:28:50 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 23 Jan 2009 23:28:50 +0000 (UTC)
Subject: rpms/mythes-ru/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090123232850.17552700FE@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/mythes-ru/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsS21069/rpms/mythes-ru/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module mythes-ru


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: mythes-ru
# $Id: Makefile,v 1.1 2009/01/23 23:28:49 kevin Exp $
NAME := mythes-ru
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Jan 23 23:29:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 23 Jan 2009 23:29:40 +0000
Subject: [pkgdb] perl-Devel-SmallProf was added for iarnell
Message-ID: <20090123232940.E2C0720847E@bastion.fedora.phx.redhat.com>

kevin has added Package perl-Devel-SmallProf with summary Per-line Perl profiler
kevin has approved Package perl-Devel-SmallProf
kevin has added a Fedora devel branch for perl-Devel-SmallProf with an owner of iarnell
kevin has approved perl-Devel-SmallProf in Fedora devel
kevin has approved Package perl-Devel-SmallProf
kevin has set commit to Approved for provenpackager on perl-Devel-SmallProf (Fedora devel)
kevin has set build to Approved for provenpackager on perl-Devel-SmallProf (Fedora devel)
kevin has set checkout to Approved for provenpackager on perl-Devel-SmallProf (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Devel-SmallProf



From pkgdb at fedoraproject.org  Fri Jan 23 23:29:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 23 Jan 2009 23:29:42 +0000
Subject: [pkgdb] perl-Devel-SmallProf (Fedora, 9) updated by kevin
Message-ID: <20090123232942.2A1B1208482@bastion.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for perl-Devel-SmallProf
kevin has set commit to Approved for provenpackager on perl-Devel-SmallProf (Fedora 9)
kevin has set build to Approved for provenpackager on perl-Devel-SmallProf (Fedora 9)
kevin has set checkout to Approved for provenpackager on perl-Devel-SmallProf (Fedora 9)
kevin approved watchbugzilla on perl-Devel-SmallProf (Fedora 9) for perl-sig
kevin approved watchcommits on perl-Devel-SmallProf (Fedora 9) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Devel-SmallProf



From pkgdb at fedoraproject.org  Fri Jan 23 23:29:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 23 Jan 2009 23:29:42 +0000
Subject: [pkgdb] perl-Devel-SmallProf (Fedora, devel) updated by kevin
Message-ID: <20090123232942.36437208485@bastion.fedora.phx.redhat.com>

kevin approved watchbugzilla on perl-Devel-SmallProf (Fedora devel) for perl-sig
kevin approved watchcommits on perl-Devel-SmallProf (Fedora devel) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Devel-SmallProf



From pkgdb at fedoraproject.org  Fri Jan 23 23:29:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 23 Jan 2009 23:29:42 +0000
Subject: [pkgdb] perl-Devel-SmallProf (Fedora, 10) updated by kevin
Message-ID: <20090123232942.45020208488@bastion.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for perl-Devel-SmallProf
kevin has set commit to Approved for provenpackager on perl-Devel-SmallProf (Fedora 10)
kevin has set build to Approved for provenpackager on perl-Devel-SmallProf (Fedora 10)
kevin has set checkout to Approved for provenpackager on perl-Devel-SmallProf (Fedora 10)
kevin approved watchbugzilla on perl-Devel-SmallProf (Fedora 10) for perl-sig
kevin approved watchcommits on perl-Devel-SmallProf (Fedora 10) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Devel-SmallProf



From kevin at fedoraproject.org  Fri Jan 23 23:29:53 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 23 Jan 2009 23:29:53 +0000 (UTC)
Subject: rpms/perl-Devel-SmallProf/devel - New directory
Message-ID: <20090123232953.76BB070142@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Devel-SmallProf/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsw21224/rpms/perl-Devel-SmallProf/devel

Log Message:
Directory /cvs/pkgs/rpms/perl-Devel-SmallProf/devel added to the repository




From kevin at fedoraproject.org  Fri Jan 23 23:29:53 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 23 Jan 2009 23:29:53 +0000 (UTC)
Subject: rpms/perl-Devel-SmallProf - New directory
Message-ID: <20090123232953.301F5700FE@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Devel-SmallProf
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsw21224/rpms/perl-Devel-SmallProf

Log Message:
Directory /cvs/pkgs/rpms/perl-Devel-SmallProf added to the repository




From kevin at fedoraproject.org  Fri Jan 23 23:30:08 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 23 Jan 2009 23:30:08 +0000 (UTC)
Subject: rpms/perl-Devel-SmallProf Makefile,NONE,1.1
Message-ID: <20090123233008.B628C700FE@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Devel-SmallProf
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsw21224/rpms/perl-Devel-SmallProf

Added Files:
	Makefile 
Log Message:
Setup of module perl-Devel-SmallProf


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Devel-SmallProf
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Jan 23 23:30:08 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 23 Jan 2009 23:30:08 +0000 (UTC)
Subject: rpms/perl-Devel-SmallProf/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090123233008.F0B54700FE@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Devel-SmallProf/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsw21224/rpms/perl-Devel-SmallProf/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Devel-SmallProf


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: perl-Devel-SmallProf
# $Id: Makefile,v 1.1 2009/01/23 23:30:08 kevin Exp $
NAME := perl-Devel-SmallProf
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Jan 23 23:31:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 23 Jan 2009 23:31:37 +0000
Subject: [pkgdb] msp430-binutils (Fedora, 10) updated by kevin
Message-ID: <20090123233137.3D4B1208483@bastion.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for msp430-binutils
kevin has set commit to Approved for provenpackager on msp430-binutils (Fedora 10)
kevin has set build to Approved for provenpackager on msp430-binutils (Fedora 10)
kevin has set checkout to Approved for provenpackager on msp430-binutils (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/msp430-binutils



From pkgdb at fedoraproject.org  Fri Jan 23 23:31:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 23 Jan 2009 23:31:35 +0000
Subject: [pkgdb] msp430-binutils was added for rspanton
Message-ID: <20090123233135.C8A7B208480@bastion.fedora.phx.redhat.com>

kevin has added Package msp430-binutils with summary Cross Compiling GNU binutils targeted at msp430
kevin has approved Package msp430-binutils
kevin has added a Fedora devel branch for msp430-binutils with an owner of rspanton
kevin has approved msp430-binutils in Fedora devel
kevin has approved Package msp430-binutils
kevin has set commit to Approved for provenpackager on msp430-binutils (Fedora devel)
kevin has set build to Approved for provenpackager on msp430-binutils (Fedora devel)
kevin has set checkout to Approved for provenpackager on msp430-binutils (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/msp430-binutils



From kevin at fedoraproject.org  Fri Jan 23 23:31:50 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 23 Jan 2009 23:31:50 +0000 (UTC)
Subject: rpms/msp430-binutils - New directory
Message-ID: <20090123233150.25FCB700FE@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/msp430-binutils
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsg21594/rpms/msp430-binutils

Log Message:
Directory /cvs/pkgs/rpms/msp430-binutils added to the repository




From kevin at fedoraproject.org  Fri Jan 23 23:31:50 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 23 Jan 2009 23:31:50 +0000 (UTC)
Subject: rpms/msp430-binutils/devel - New directory
Message-ID: <20090123233150.72166700FE@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/msp430-binutils/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsg21594/rpms/msp430-binutils/devel

Log Message:
Directory /cvs/pkgs/rpms/msp430-binutils/devel added to the repository




From kevin at fedoraproject.org  Fri Jan 23 23:32:06 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 23 Jan 2009 23:32:06 +0000 (UTC)
Subject: rpms/msp430-binutils Makefile,NONE,1.1
Message-ID: <20090123233206.58EBA700FE@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/msp430-binutils
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsg21594/rpms/msp430-binutils

Added Files:
	Makefile 
Log Message:
Setup of module msp430-binutils


--- NEW FILE Makefile ---
# Top level Makefile for module msp430-binutils
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Jan 23 23:32:06 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 23 Jan 2009 23:32:06 +0000 (UTC)
Subject: rpms/msp430-binutils/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090123233206.9E739700FE@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/msp430-binutils/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsg21594/rpms/msp430-binutils/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module msp430-binutils


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: msp430-binutils
# $Id: Makefile,v 1.1 2009/01/23 23:32:06 kevin Exp $
NAME := msp430-binutils
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Jan 23 23:32:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 23 Jan 2009 23:32:31 +0000
Subject: [pkgdb] dateshift was added for fab
Message-ID: <20090123233231.BBC1D208480@bastion.fedora.phx.redhat.com>

kevin has added Package dateshift with summary A date/time test tool
kevin has approved Package dateshift
kevin has added a Fedora devel branch for dateshift with an owner of fab
kevin has approved dateshift in Fedora devel
kevin has approved Package dateshift
kevin has set commit to Approved for provenpackager on dateshift (Fedora devel)
kevin has set build to Approved for provenpackager on dateshift (Fedora devel)
kevin has set checkout to Approved for provenpackager on dateshift (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/dateshift



From pkgdb at fedoraproject.org  Fri Jan 23 23:32:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 23 Jan 2009 23:32:32 +0000
Subject: [pkgdb] dateshift (Fedora, 9) updated by kevin
Message-ID: <20090123233233.2E9C0208483@bastion.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for dateshift
kevin has set commit to Approved for provenpackager on dateshift (Fedora 9)
kevin has set build to Approved for provenpackager on dateshift (Fedora 9)
kevin has set checkout to Approved for provenpackager on dateshift (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/dateshift



From pkgdb at fedoraproject.org  Fri Jan 23 23:32:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 23 Jan 2009 23:32:32 +0000
Subject: [pkgdb] dateshift (Fedora, 10) updated by kevin
Message-ID: <20090123233233.3CAD1208486@bastion.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for dateshift
kevin has set commit to Approved for provenpackager on dateshift (Fedora 10)
kevin has set build to Approved for provenpackager on dateshift (Fedora 10)
kevin has set checkout to Approved for provenpackager on dateshift (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/dateshift



From kevin at fedoraproject.org  Fri Jan 23 23:32:44 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 23 Jan 2009 23:32:44 +0000 (UTC)
Subject: rpms/dateshift - New directory
Message-ID: <20090123233244.39E51700FE@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/dateshift
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsp21749/rpms/dateshift

Log Message:
Directory /cvs/pkgs/rpms/dateshift added to the repository




From kevin at fedoraproject.org  Fri Jan 23 23:32:44 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 23 Jan 2009 23:32:44 +0000 (UTC)
Subject: rpms/dateshift/devel - New directory
Message-ID: <20090123233244.750F3700FE@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/dateshift/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsp21749/rpms/dateshift/devel

Log Message:
Directory /cvs/pkgs/rpms/dateshift/devel added to the repository




From kevin at fedoraproject.org  Fri Jan 23 23:33:00 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 23 Jan 2009 23:33:00 +0000 (UTC)
Subject: rpms/dateshift Makefile,NONE,1.1
Message-ID: <20090123233300.3AACE700FE@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/dateshift
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsp21749/rpms/dateshift

Added Files:
	Makefile 
Log Message:
Setup of module dateshift


--- NEW FILE Makefile ---
# Top level Makefile for module dateshift
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Jan 23 23:33:00 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 23 Jan 2009 23:33:00 +0000 (UTC)
Subject: rpms/dateshift/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090123233300.81D11700FE@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/dateshift/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsp21749/rpms/dateshift/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module dateshift


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: dateshift
# $Id: Makefile,v 1.1 2009/01/23 23:33:00 kevin Exp $
NAME := dateshift
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Jan 23 23:33:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 23 Jan 2009 23:33:24 +0000
Subject: [pkgdb] pg_top was added for itamarjp
Message-ID: <20090123233324.C4EEF208483@bastion.fedora.phx.redhat.com>

kevin has added Package pg_top with summary pg_top is 'top' for PostgreSQL processes
kevin has approved Package pg_top
kevin has added a Fedora devel branch for pg_top with an owner of itamarjp
kevin has approved pg_top in Fedora devel
kevin has approved Package pg_top
kevin has set commit to Approved for provenpackager on pg_top (Fedora devel)
kevin has set build to Approved for provenpackager on pg_top (Fedora devel)
kevin has set checkout to Approved for provenpackager on pg_top (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pg_top



From pkgdb at fedoraproject.org  Fri Jan 23 23:33:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 23 Jan 2009 23:33:26 +0000
Subject: [pkgdb] pg_top (Fedora, 9) updated by kevin
Message-ID: <20090123233326.351D5208486@bastion.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for pg_top
kevin has set commit to Approved for provenpackager on pg_top (Fedora 9)
kevin has set build to Approved for provenpackager on pg_top (Fedora 9)
kevin has set checkout to Approved for provenpackager on pg_top (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pg_top



From pkgdb at fedoraproject.org  Fri Jan 23 23:33:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 23 Jan 2009 23:33:26 +0000
Subject: [pkgdb] pg_top (Fedora, 10) updated by kevin
Message-ID: <20090123233326.4CD6C208489@bastion.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for pg_top
kevin has set commit to Approved for provenpackager on pg_top (Fedora 10)
kevin has set build to Approved for provenpackager on pg_top (Fedora 10)
kevin has set checkout to Approved for provenpackager on pg_top (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pg_top



From kevin at fedoraproject.org  Fri Jan 23 23:33:48 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 23 Jan 2009 23:33:48 +0000 (UTC)
Subject: rpms/pg_top - New directory
Message-ID: <20090123233348.23DEB700FE@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/pg_top
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsf22007/rpms/pg_top

Log Message:
Directory /cvs/pkgs/rpms/pg_top added to the repository




From kevin at fedoraproject.org  Fri Jan 23 23:33:48 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 23 Jan 2009 23:33:48 +0000 (UTC)
Subject: rpms/pg_top/devel - New directory
Message-ID: <20090123233348.5B249700FE@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/pg_top/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsf22007/rpms/pg_top/devel

Log Message:
Directory /cvs/pkgs/rpms/pg_top/devel added to the repository




From kevin at fedoraproject.org  Fri Jan 23 23:34:03 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 23 Jan 2009 23:34:03 +0000 (UTC)
Subject: rpms/pg_top Makefile,NONE,1.1
Message-ID: <20090123233403.6A4EB700FE@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/pg_top
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsf22007/rpms/pg_top

Added Files:
	Makefile 
Log Message:
Setup of module pg_top


--- NEW FILE Makefile ---
# Top level Makefile for module pg_top
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Jan 23 23:34:03 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 23 Jan 2009 23:34:03 +0000 (UTC)
Subject: rpms/pg_top/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <20090123233403.A9FB5700FE@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/pg_top/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsf22007/rpms/pg_top/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module pg_top


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: pg_top
# $Id: Makefile,v 1.1 2009/01/23 23:34:03 kevin Exp $
NAME := pg_top
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Jan 23 23:36:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 23 Jan 2009 23:36:43 +0000
Subject: [pkgdb] httping was added for fab
Message-ID: <20090123233643.57EF1208482@bastion.fedora.phx.redhat.com>

kevin has added Package httping with summary Ping alike tool for http requests
kevin has approved Package httping
kevin has added a Fedora devel branch for httping with an owner of fab
kevin has approved httping in Fedora devel
kevin has approved Package httping
kevin has set commit to Approved for provenpackager on httping (Fedora devel)
kevin has set build to Approved for provenpackager on httping (Fedora devel)
kevin has set checkout to Approved for provenpackager on httping (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/httping



From pkgdb at fedoraproject.org  Fri Jan 23 23:36:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 23 Jan 2009 23:36:44 +0000
Subject: [pkgdb] httping (Fedora, 9) updated by kevin
Message-ID: <20090123233645.C6F0830000A@bastion.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for httping
kevin has set commit to Approved for provenpackager on httping (Fedora 9)
kevin has set build to Approved for provenpackager on httping (Fedora 9)
kevin has set checkout to Approved for provenpackager on httping (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/httping



From pkgdb at fedoraproject.org  Fri Jan 23 23:36:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 23 Jan 2009 23:36:44 +0000
Subject: [pkgdb] httping (Fedora, 10) updated by kevin
Message-ID: <20090123233646.524E4300003@bastion.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for httping
kevin has set commit to Approved for provenpackager on httping (Fedora 10)
kevin has set build to Approved for provenpackager on httping (Fedora 10)
kevin has set checkout to Approved for provenpackager on httping (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/httping



From kevin at fedoraproject.org  Fri Jan 23 23:37:01 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 23 Jan 2009 23:37:01 +0000 (UTC)
Subject: rpms/httping - New directory
Message-ID: <20090123233701.26B89700FE@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/httping
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsP22402/rpms/httping

Log Message:
Directory /cvs/pkgs/rpms/httping added to the repository




From kevin at fedoraproject.org  Fri Jan 23 23:37:01 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 23 Jan 2009 23:37:01 +0000 (UTC)
Subject: rpms/httping/devel - New directory
Message-ID: <20090123233701.640BB700FE@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/httping/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsP22402/rpms/httping/devel

Log Message:
Directory /cvs/pkgs/rpms/httping/devel added to the repository




From kevin at fedoraproject.org  Fri Jan 23 23:37:18 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 23 Jan 2009 23:37:18 +0000 (UTC)
Subject: rpms/httping Makefile,NONE,1.1
Message-ID: <20090123233718.1A265700FE@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/httping
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsP22402/rpms/httping

Added Files:
	Makefile 
Log Message:
Setup of module httping


--- NEW FILE Makefile ---
# Top level Makefile for module httping
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Jan 23 23:37:18 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 23 Jan 2009 23:37:18 +0000 (UTC)
Subject: rpms/httping/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <20090123233718.5C21A700FE@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/httping/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsP22402/rpms/httping/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module httping


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: httping
# $Id: Makefile,v 1.1 2009/01/23 23:37:18 kevin Exp $
NAME := httping
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Jan 23 23:37:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 23 Jan 2009 23:37:48 +0000
Subject: [pkgdb] cpmtools was added for lucilanga
Message-ID: <20090123233748.593BD20847E@bastion.fedora.phx.redhat.com>

kevin has added Package cpmtools with summary Programs for accessing CP/M disks
kevin has approved Package cpmtools
kevin has added a Fedora devel branch for cpmtools with an owner of lucilanga
kevin has approved cpmtools in Fedora devel
kevin has approved Package cpmtools
kevin has set commit to Approved for provenpackager on cpmtools (Fedora devel)
kevin has set build to Approved for provenpackager on cpmtools (Fedora devel)
kevin has set checkout to Approved for provenpackager on cpmtools (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cpmtools



From pkgdb at fedoraproject.org  Fri Jan 23 23:37:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 23 Jan 2009 23:37:50 +0000
Subject: [pkgdb] cpmtools (Fedora, 9) updated by kevin
Message-ID: <20090123233750.7B804208482@bastion.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for cpmtools
kevin has set commit to Approved for provenpackager on cpmtools (Fedora 9)
kevin has set build to Approved for provenpackager on cpmtools (Fedora 9)
kevin has set checkout to Approved for provenpackager on cpmtools (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cpmtools



From pkgdb at fedoraproject.org  Fri Jan 23 23:37:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 23 Jan 2009 23:37:50 +0000
Subject: [pkgdb] cpmtools (Fedora EPEL, 5) updated by kevin
Message-ID: <20090123233750.87548208485@bastion.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for cpmtools
kevin has set commit to Approved for provenpackager on cpmtools (Fedora EPEL 5)
kevin has set build to Approved for provenpackager on cpmtools (Fedora EPEL 5)
kevin has set checkout to Approved for provenpackager on cpmtools (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cpmtools



From pkgdb at fedoraproject.org  Fri Jan 23 23:37:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 23 Jan 2009 23:37:50 +0000
Subject: [pkgdb] cpmtools (Fedora, 10) updated by kevin
Message-ID: <20090123233750.99100300001@bastion.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for cpmtools
kevin has set commit to Approved for provenpackager on cpmtools (Fedora 10)
kevin has set build to Approved for provenpackager on cpmtools (Fedora 10)
kevin has set checkout to Approved for provenpackager on cpmtools (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cpmtools



From kevin at fedoraproject.org  Fri Jan 23 23:38:05 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 23 Jan 2009 23:38:05 +0000 (UTC)
Subject: rpms/cpmtools - New directory
Message-ID: <20090123233805.23939700FE@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/cpmtools
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsD22640/rpms/cpmtools

Log Message:
Directory /cvs/pkgs/rpms/cpmtools added to the repository




From kevin at fedoraproject.org  Fri Jan 23 23:38:05 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 23 Jan 2009 23:38:05 +0000 (UTC)
Subject: rpms/cpmtools/devel - New directory
Message-ID: <20090123233805.56E6570142@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/cpmtools/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsD22640/rpms/cpmtools/devel

Log Message:
Directory /cvs/pkgs/rpms/cpmtools/devel added to the repository




From kevin at fedoraproject.org  Fri Jan 23 23:38:22 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 23 Jan 2009 23:38:22 +0000 (UTC)
Subject: rpms/cpmtools Makefile,NONE,1.1
Message-ID: <20090123233822.16876700FE@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/cpmtools
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsD22640/rpms/cpmtools

Added Files:
	Makefile 
Log Message:
Setup of module cpmtools


--- NEW FILE Makefile ---
# Top level Makefile for module cpmtools
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Jan 23 23:38:22 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 23 Jan 2009 23:38:22 +0000 (UTC)
Subject: rpms/cpmtools/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090123233822.53FD4700FE@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/cpmtools/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsD22640/rpms/cpmtools/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module cpmtools


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: cpmtools
# $Id: Makefile,v 1.1 2009/01/23 23:38:22 kevin Exp $
NAME := cpmtools
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Jan 23 23:39:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 23 Jan 2009 23:39:53 +0000
Subject: [pkgdb] botan (Fedora EPEL, 5) updated by kevin
Message-ID: <20090123233953.ACD25208481@bastion.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for botan
kevin has set commit to Approved for provenpackager on botan (Fedora EPEL 5)
kevin has set build to Approved for provenpackager on botan (Fedora EPEL 5)
kevin has set checkout to Approved for provenpackager on botan (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/botan



From pkgdb at fedoraproject.org  Fri Jan 23 23:41:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 23 Jan 2009 23:41:01 +0000
Subject: [pkgdb] udns (Fedora EPEL, 5) updated by kevin
Message-ID: <20090123234101.506BA20847F@bastion.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for udns
kevin has set commit to Approved for provenpackager on udns (Fedora EPEL 5)
kevin has set build to Approved for provenpackager on udns (Fedora EPEL 5)
kevin has set checkout to Approved for provenpackager on udns (Fedora EPEL 5)
kevin changed owner of udns in Fedora EPEL 5 to adrian
kevin approved watchbugzilla on udns (Fedora EPEL 5) for ben
kevin approved watchcommits on udns (Fedora EPEL 5) for ben
kevin approved commit on udns (Fedora EPEL 5) for ben
kevin approved build on udns (Fedora EPEL 5) for ben
kevin approved approveacls on udns (Fedora EPEL 5) for ben

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/udns



From pkgdb at fedoraproject.org  Fri Jan 23 23:41:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 23 Jan 2009 23:41:46 +0000
Subject: [pkgdb] perl-CSS-Squish (Fedora EPEL, 5) updated by kevin
Message-ID: <20090123234146.9D150208480@bastion.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for perl-CSS-Squish
kevin has set commit to Approved for provenpackager on perl-CSS-Squish (Fedora EPEL 5)
kevin has set build to Approved for provenpackager on perl-CSS-Squish (Fedora EPEL 5)
kevin has set checkout to Approved for provenpackager on perl-CSS-Squish (Fedora EPEL 5)
kevin changed owner of perl-CSS-Squish in Fedora EPEL 5 to xavierb

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-CSS-Squish



From pwouters at fedoraproject.org  Fri Jan 23 23:42:32 2009
From: pwouters at fedoraproject.org (Paul Wouters)
Date: Fri, 23 Jan 2009 23:42:32 +0000 (UTC)
Subject: rpms/dnssec-conf/devel dnssec-conf.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090123234232.2DC10700FE@cvs1.fedora.phx.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/dnssec-conf/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24021/devel

Modified Files:
	.cvsignore sources 
Added Files:
	dnssec-conf.spec import.log 
Log Message:
initial import of dnssec-conf



--- NEW FILE dnssec-conf.spec ---
Summary: DNSSEC and DLV configuration tool (and TLD repository until the root is signed)
Name: dnssec-conf
Version: 1.13
Release: 2
License: GPLv2+
Url: http://www.xelerance.com/software/dnssec-conf/
Source: http://www.xelerance.com/software/%{name}/%{name}-%{version}.tar.gz
Group: System Environment/Daemons
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
Buildrequires: xmlto
Requires: python-dns, curl, unbound >= 1.1.1-7
#Requires: a caching nameserver
#Requires bind 9.4.0 if bind is reconfigured.....

%description
DNSSEC configuration and priming tool. Keys are required until the root
is signed, as well as for local unpublished DNSSEC keys to be preloaded
into the recursive nameserver. These DNSSEC configuration files can be
directly included in the bind or unbound nameserver configuration files.
dnssec-conf includes a commandline configuration client for Bind and
Unbound, known DNSSEC keys, URL's to official publication pages of keys,
and harvested keys, as well a script to harvest DNSKEY's from DNS.

%prep
%setup -q -n %{name}-%{version}

%build
make 

%install
rm -rf ${RPM_BUILD_ROOT}
make DESTDIR=${RPM_BUILD_ROOT} install

%clean
rm -rf ${RPM_BUILD_ROOT}

%files 
%defattr(-,root,root)
%doc LICENSE README
%attr(0755,root,root) %dir %{_sysconfdir}/pki/dnssec-keys
%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/pki/dnssec-keys/*/*
%attr(0755,root,root) %dir %{_sysconfdir}/pki/dnssec-keys/production
%attr(0755,root,root) %dir %{_sysconfdir}/pki/dnssec-keys/production/reverse
%attr(0755,root,root) %dir %{_sysconfdir}/pki/dnssec-keys/testing
%attr(0755,root,root) %dir %{_sysconfdir}/pki/dnssec-keys/harvest
%attr(0755,root,root) %dir %{_sysconfdir}/pki/dnssec-keys/dlv
%{_bindir}/dnskey-pull
%{_sbindir}/dnssec-configure
%{_mandir}/*/*

%changelog
* Wed Jan 21 2009 Paul Wouters <paul at xelerance.com> - 1.13-2
- Upstream made source available :=)
- removed macros from changes.

* Wed Jan 21 2009 Paul Wouters <paul at xelerance.com> - 1.13-1
- Clarify license
- Fix mixed use of RPM_BUILD_ROOT and buildroot
- Source tag fully qualified now

* Sat Jan 17 2009 Paul Wouters <paul at xelerance.com> - 1.10-1
- Updated to 1.10. Adds --set and --query and show option to use with system-config-dnssec
- Updated RIPE's reverse keys

* Tue Jan 13 2009 Paul Wouters <paul at xelerance.com> - 1.09-1
- Added testing key for gr.

* Mon Jan  5 2009 Paul Wouters <paul at xelerance.com> 1.08-1
- Upgrade to 'upstream'

* Mon Jan  5 2009 Paul Wouters <paul at xelerance.com> 1.07-1
- Require unbound >= 1.1.1-7

* Mon Jan  5 2009 Paul Wouters <paul at xelerance.com> 1.06-1
- Package renamed to dnssec-conf
- Added punycode test keys
- Fix for dnskey-pull and UTF8
- No longer requires the use of generating .conf files, by using
  a patch for unbound

* Fri Nov  7 2008 Paul Wouters <paul at xelerance.com> 1.0-1
- Initial release



--- NEW FILE import.log ---
dnssec-conf-1_13-2:HEAD:dnssec-conf-1.13-2.src.rpm:1232754095


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/dnssec-conf/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	23 Jan 2009 23:20:51 -0000	1.1
+++ .cvsignore	23 Jan 2009 23:42:01 -0000	1.2
@@ -0,0 +1 @@
+dnssec-conf-1.13.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/dnssec-conf/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	23 Jan 2009 23:20:51 -0000	1.1
+++ sources	23 Jan 2009 23:42:01 -0000	1.2
@@ -0,0 +1 @@
+c998c8050c77c14eda496b26891bb4c1  dnssec-conf-1.13.tar.gz



From donv at fedoraproject.org  Fri Jan 23 23:48:55 2009
From: donv at fedoraproject.org (Uwe Kubosch)
Date: Fri, 23 Jan 2009 23:48:55 +0000 (UTC)
Subject: rpms/zfs-fuse/devel zfs-fuse.spec,1.11,1.12 zfs-fuse.init,1.3,1.4
Message-ID: <20090123234855.2A7FF70141@cvs1.fedora.phx.redhat.com>

Author: donv

Update of /cvs/pkgs/rpms/zfs-fuse/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25093/devel

Modified Files:
	zfs-fuse.spec zfs-fuse.init 
Log Message:
* Sat Jan 24 2009 Uwe Kubosh <uwe at kubosch.no> - 0.5.0-7.20081221
- Updated etc/init.d/zfs-fuse init script after feedback from Rudd-O
  Removed limits for the fuse process which could lead to a hung system
  or use lots of memory.



Index: zfs-fuse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/zfs-fuse/devel/zfs-fuse.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- zfs-fuse.spec	8 Jan 2009 23:02:10 -0000	1.11
+++ zfs-fuse.spec	23 Jan 2009 23:48:24 -0000	1.12
@@ -1,7 +1,7 @@
 Summary:          ZFS ported to Linux FUSE
 Name:             zfs-fuse
 Version:          0.5.0
-Release:          6.20081221%{?dist}
+Release:          7.20081221%{?dist}
 Group:            System Environment/Base
 License:          CDDL
 URL:              http://www.wizy.org/wiki/ZFS_on_FUSE
@@ -87,6 +87,11 @@
 %{_sysconfdir}/sysconfig/%{name}
 
 %changelog
+* Sat Jan 24 2009 Uwe Kubosh <uwe at kubosch.no> - 0.5.0-7.20081221
+- Updated etc/init.d/zfs-fuse init script after feedback from Rudd-O
+  Removed limits for the fuse process which could lead to a hung system
+  or use lots of memory.
+
 * Sun Dec 28 2008 Uwe Kubosh <uwe at kubosch.no> - 0.5.0-6.20081221
 - Updated etc/init.d/zfs-fuse init script after feedback from Rudd-O at
   http://groups.google.com/group/zfs-fuse/browse_thread/thread/da94aa803bceef52


Index: zfs-fuse.init
===================================================================
RCS file: /cvs/pkgs/rpms/zfs-fuse/devel/zfs-fuse.init,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- zfs-fuse.init	24 Dec 2008 23:45:16 -0000	1.3
+++ zfs-fuse.init	23 Jan 2009 23:48:24 -0000	1.4
@@ -29,6 +29,10 @@
 PIDFILE=/var/run/$prog.pid
 
 unset LANG
+ulimit -v unlimited
+ulimit -c 512000
+ulimit -l unlimited
+ulimit -s unlimited
 
 start() {
     [ -x $exec ] || (echo "$prog binary not present or executable" && exit 5)
@@ -67,7 +71,7 @@
     if [ "$PID" = "" ] ; then
         echo "ZFS-FUSE did not start or create $PIDFILE"
         exit 3
-    fi 
+    fi
 
     echo -n "Immunizing $prog against OOM kills"
     echo -17 > "/proc/$PID/oom_adj"



From donv at fedoraproject.org  Fri Jan 23 23:48:54 2009
From: donv at fedoraproject.org (Uwe Kubosch)
Date: Fri, 23 Jan 2009 23:48:54 +0000 (UTC)
Subject: rpms/zfs-fuse/F-10 zfs-fuse.spec,1.5,1.6 zfs-fuse.init,1.3,1.4
Message-ID: <20090123234854.ED70E700FE@cvs1.fedora.phx.redhat.com>

Author: donv

Update of /cvs/pkgs/rpms/zfs-fuse/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25093/F-10

Modified Files:
	zfs-fuse.spec zfs-fuse.init 
Log Message:
* Sat Jan 24 2009 Uwe Kubosh <uwe at kubosch.no> - 0.5.0-7.20081221
- Updated etc/init.d/zfs-fuse init script after feedback from Rudd-O
  Removed limits for the fuse process which could lead to a hung system
  or use lots of memory.



Index: zfs-fuse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/zfs-fuse/F-10/zfs-fuse.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- zfs-fuse.spec	8 Jan 2009 23:02:09 -0000	1.5
+++ zfs-fuse.spec	23 Jan 2009 23:48:24 -0000	1.6
@@ -1,7 +1,7 @@
 Summary:          ZFS ported to Linux FUSE
 Name:             zfs-fuse
 Version:          0.5.0
-Release:          6.20081221%{?dist}
+Release:          7.20081221%{?dist}
 Group:            System Environment/Base
 License:          CDDL
 URL:              http://www.wizy.org/wiki/ZFS_on_FUSE
@@ -87,6 +87,11 @@
 %{_sysconfdir}/sysconfig/%{name}
 
 %changelog
+* Sat Jan 24 2009 Uwe Kubosh <uwe at kubosch.no> - 0.5.0-7.20081221
+- Updated etc/init.d/zfs-fuse init script after feedback from Rudd-O
+  Removed limits for the fuse process which could lead to a hung system
+  or use lots of memory.
+
 * Sun Dec 28 2008 Uwe Kubosh <uwe at kubosch.no> - 0.5.0-6.20081221
 - Updated etc/init.d/zfs-fuse init script after feedback from Rudd-O at
   http://groups.google.com/group/zfs-fuse/browse_thread/thread/da94aa803bceef52


Index: zfs-fuse.init
===================================================================
RCS file: /cvs/pkgs/rpms/zfs-fuse/F-10/zfs-fuse.init,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- zfs-fuse.init	1 Jan 2009 12:33:09 -0000	1.3
+++ zfs-fuse.init	23 Jan 2009 23:48:24 -0000	1.4
@@ -29,6 +29,10 @@
 PIDFILE=/var/run/$prog.pid
 
 unset LANG
+ulimit -v unlimited
+ulimit -c 512000
+ulimit -l unlimited
+ulimit -s unlimited
 
 start() {
     [ -x $exec ] || (echo "$prog binary not present or executable" && exit 5)
@@ -67,7 +71,7 @@
     if [ "$PID" = "" ] ; then
         echo "ZFS-FUSE did not start or create $PIDFILE"
         exit 3
-    fi 
+    fi
 
     echo -n "Immunizing $prog against OOM kills"
     echo -17 > "/proc/$PID/oom_adj"



From mclasen at fedoraproject.org  Sat Jan 24 00:12:03 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Sat, 24 Jan 2009 00:12:03 +0000 (UTC)
Subject: rpms/devhelp/devel devhelp.spec,1.102,1.103
Message-ID: <20090124001203.59D6B7010A@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/devhelp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28467

Modified Files:
	devhelp.spec 
Log Message:
Cosmetic fixes



Index: devhelp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/devhelp/devel/devhelp.spec,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -r1.102 -r1.103
--- devhelp.spec	20 Jan 2009 01:43:11 -0000	1.102
+++ devhelp.spec	24 Jan 2009 00:11:32 -0000	1.103
@@ -6,12 +6,12 @@
 
 Name: devhelp
 Version: 0.23
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Group: Development/Tools
 Summary: API documention browser
 URL: http://developer.imendio.com/projects/devhelp
-Source: http://download.gnome.org/sources/devhelp/0.21/devhelp-%{version}.tar.bz2
+Source: http://download.gnome.org/sources/devhelp/0.23/devhelp-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/devhelp-%{version}-%{release}-root-%(%{__id_u} -n)
 
 ### Dependencies ###
@@ -25,8 +25,8 @@
 BuildRequires: desktop-file-utils >= 0.3
 BuildRequires: gettext
 BuildRequires: intltool
-BuildRequires: libgnomeui-devel >= 2.2.0
 BuildRequires: libwnck-devel >= %{libwnck_version}
+BuildRequires: gtk2-devel
 BuildRequires: WebKit-gtk-devel
 
 %description
@@ -37,9 +37,7 @@
 Summary: Library to embed Devhelp in other applications
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
-Requires: gnome-vfs2-devel >= 2.2.0
 Requires: gtk2-devel >= %{gtk2_version}
-Requires: libgnomeui-devel >= 2.2.0
 Requires: libwnck-devel >= %{libwnck_version}
 Requires: pkgconfig
 Requires: WebKit-gtk-devel
@@ -134,6 +132,9 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Fri Jan 23 2009 Matthias Clasen  <mclasen at redhat.com> - 0.23-2
+- Cosmetic spec fixes
+
 * Mon Jan 19 2009 Matthew Barnes <mbarnes at redhat.com> - 0.23-1
 - Update to 0.23
 



From mclasen at fedoraproject.org  Sat Jan 24 00:17:04 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Sat, 24 Jan 2009 00:17:04 +0000 (UTC)
Subject: rpms/gtk2/devel .cvsignore, 1.97, 1.98 gtk2.spec, 1.343,
	1.344 sources, 1.106, 1.107
Message-ID: <20090124001704.6458F7010A@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gtk2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29018

Modified Files:
	.cvsignore gtk2.spec sources 
Log Message:
2.15.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gtk2/devel/.cvsignore,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -r1.97 -r1.98
--- .cvsignore	2 Jan 2009 01:46:04 -0000	1.97
+++ .cvsignore	24 Jan 2009 00:16:33 -0000	1.98
@@ -1 +1 @@
-gtk+-2.15.0.tar.bz2
+gtk+-2.15.1.tar.bz2


Index: gtk2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtk2/devel/gtk2.spec,v
retrieving revision 1.343
retrieving revision 1.344
diff -u -r1.343 -r1.344
--- gtk2.spec	19 Jan 2009 13:44:41 -0000	1.343
+++ gtk2.spec	24 Jan 2009 00:16:33 -0000	1.344
@@ -10,13 +10,13 @@
 %define cairo_version %{cairo_base_version}-1
 %define libpng_version 2:1.2.2-16
 
-%define base_version 2.15.0
+%define base_version 2.15.1
 %define bin_version 2.10.0
 
 Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X
 Name: gtk2
 Version: %{base_version}
-Release: 2%{?dist}
+Release: 1%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 Source: http://download.gnome.org/sources/gtk+/2.15/gtk+-%{version}.tar.bz2
@@ -294,6 +294,9 @@
 %{_datadir}/gtk-2.0
 
 %changelog
+* Fri Jan 23 2009 Matthias Clasen <mclasen at redhat.com> - 2.15.1-1
+- Update to 2.15.1
+
 * Mon Jan 19 2009 Marek Kasik <mkasik at redhat.com> - 2.15.0-2
 - fix a problem with default printer in a network
 - Resolves: #478400


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gtk2/devel/sources,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -r1.106 -r1.107
--- sources	2 Jan 2009 01:46:05 -0000	1.106
+++ sources	24 Jan 2009 00:16:33 -0000	1.107
@@ -1 +1 @@
-23ff288d00b24f0820a4ae79a747f25e  gtk+-2.15.0.tar.bz2
+08bd30294bec395078a2554d642d3b2d  gtk+-2.15.1.tar.bz2



From pwouters at fedoraproject.org  Sat Jan 24 00:30:05 2009
From: pwouters at fedoraproject.org (Paul Wouters)
Date: Sat, 24 Jan 2009 00:30:05 +0000 (UTC)
Subject: rpms/autotrust/devel autotrust.conf, NONE, 1.1 autotrust.cron, NONE,
	1.1 autotrust.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090124003005.E9CEF7010A@cvs1.fedora.phx.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/autotrust/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30694/devel

Modified Files:
	.cvsignore sources 
Added Files:
	autotrust.conf autotrust.cron autotrust.spec import.log 
Log Message:
initial import



--- NEW FILE autotrust.conf ---
# program configuration
config:
	# directory to go to for performing autotrust.
	# by default, autotrust will store files in the current directory.
	working-dir:		"/var/lib/autotrust"

	# where to find the root-hints. 
	# by default, autotrust uses builtin root hints from libunbound.
	# root-hints:		"/etc/named.root"

	# where to log messages. 
	# by default, logs will be outputted to stderr.
	log-file:		"/var/log/autotrust.log"

	# where to store state information for trust anchors. 
	# by default, state information is stored in a file autotrust.state in 
	# the working directory.
	state-file:		"/var/lib/autotrust/autotrust.state" 

	# where to find the the trust anchors (that can be used for Unbound).
	# trust-anchor-file:	"trust-anchor.file"

	# where to find the the trust anchors (that can be used for 
	# BIND9 and Unbound). you can also put your BIND configuration file 
	# here, though it is recommended to solely put the trusted-keys clause 
	# in this file and include it in your actual BIND configuration file.
	trusted-keys-file:	"/etc/pki/dnssec-keys/production.conf"

	# what resolv.conf file to use. 
	# by default, autotrust doesn't use configured nameservers, but queries 
	# for the answers himself. By providing your resolver configuration, the
	# program will run much faster.
	# resolv-conf:		"/etc/resolv.conf"

	# by default, autotrust makes use of both ipv4 and ipv6. 
	# setting one of these options to "yes" eliminates the use of the other 
	# protocol version.
	# ipv4-only:		"no"
	# ipv6-only:		"no"

	# specify the time when a trust anchor may be added.
	# by default, add holddown time is 30 days.
	# add-holddown:		2592000 # 30 days

	# specify the time when a trust anchor may be removed.
	# by default, del holddown time is 30 days.
	# del-holddown:		2592000 # 30 days

	# how many times must a pending trust anchor be seen, before adding it 
	# to the valid trust anchor set. by default, 2 times.
	# STRONGLY RECOMMENDED VALUE: 2 or higher
	# pending-count:	2

	# keep trust anchors with the START state in the state information file.
	# by default, trust anchors in the state START are not stored.
	# keep-start:		"no"

	# keep trust anchors with the REMOVED state in the state information.
	# by default, trust anchors in the state REMOVED are not stored.
	# keep-removed:		"no"

	# the pidfile that stores the process id of your resolver.
	# by default, autotrust does not know about your resolver and will not 
	# signal resolvers.
	# resolver-pidfile:		"/var/run/named/named.pid"
	resolver-pidfile: "/var/run/unbound/unbound.pid /var/run/named/named.pid"

	# if you use Unbound, you can specify the Undbound configuration 
	# here, so that autotrust uses the same configuration. This option was 
	# built in for debugging purposes (to configure stub zones), and is 
	# considered experimental.
	unbound-conf:		"/etc/unbound/unbound.conf"

	# specify the time when a missing trust anchor may not be used 
	# as valid trust anchor anymore. If keep-missing is 0, missing keys 
	# are never removed (unless revoked), which is the default.
	# STRONGLY RECOMMENDED VALUE: 0, or 1year or higher
	# keep-missing:		31536000 # 1 year

	# log if keys gone missing, regardless of the used verbosity level.
	# on by default.
	# alert-missing:	"yes"

	# if you have a superior trust point configured, the subordinate trust 
	# anchors will be removed after 180 days after the superior trust point 
	# was introduced. by default, this option is disabled, you may enable it 
	# by setting 'superior-trust' to "yes".
	# THIS OPTION IS NOT IMPLEMENTED YET
	# superior-trust:	"yes"

	# set the level of verbosity. default it it set to 1. the higher this 
	# number, the more log messages you will get. if you want no 
	# output at all, set verbosity to 0 (you will log only error and 
	# warning messages).
	# verbosity:		1


--- NEW FILE autotrust.cron ---
#!/bin/sh

# Check for updated and revoked  DNSKEY trust anchors daily
/usr/sbin/autotrust


--- NEW FILE autotrust.spec ---
%define prever rc1
%define VERSION %{version}%{prever}

Summary: DNSKEY trust anchor update utility that uses RFC-5011
Name: autotrust
Version: 0.2.1
Release: 0.2.%{prever}%{?dist}
License: BSD
Url: http://www.nlnetlabs.nl/%{name}/
Source: http://www.nlnetlabs.nl/downloads/%{name}-%{VERSION}.tar.gz
Source1: autotrust.conf
Source2: autotrust.cron
Group: System Environment/Libraries
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: ldns-devel >= 1.3.0, unbound-devel >= 1.0.0
Requires: anacron

%description
autotrust takes care of keeping your DNSSEC trust anchors up to date. It
is RFC5011 compliant, except for the query intervals and the retry timers.
autotrust is meant to run from commandline or in a cron job. If we want to
follow the values recommended by RFC5011, autotrust should run as daemon. 

%prep
%setup -q -n autotrust-%{VERSION}

%build
%configure --disable-rpath 
make %{?_smp_mflags}

%install
rm -rf %{buildroot}

make DESTDIR=%{buildroot} INSTALL="%{__install} -p" install 
mkdir -p %{buildroot}%{_sysconfdir}/%{name}/
mkdir -p %{buildroot}%{_localstatedir}/lib/%{name}
mkdir -p %{buildroot}%{_sysconfdir}/cron.daily/
install -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/%{name}/
install -m 755 %{SOURCE2} %{buildroot}%{_sysconfdir}/cron.daily/autotrust

%clean
rm -rf %{buildroot}

%files 
%defattr(-,root,root)
%{_sbindir}/autotrust
%doc doc/*
%{_mandir}/*/*
%dir %{_sysconfdir}/%{name}
%dir %{_localstatedir}/lib/%{name}
%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/%{name}/autotrust.conf
%attr(0755,root,root) %{_sysconfdir}/cron.daily/autotrust

%changelog
* Wed Jan 21 2009 Paul Wouters <paul at xelerance.com> - 0.2.1-0.2.rc1
- Drop sysconfig argument for configure
- Merged changelog entry to avoid rpm warning 

* Wed Jan 21 2009 Paul Wouters <paul at xelerance.com> - 0.2.1-0.1.rc1
- Drop regeneration of configure - does not work on rawhide
- Fix version/release tag
- Removed merged in patch. updated to upstream which fixes the reported autoconf issues.

* Tue Dec  2 2008 Paul Wouters <paul at xelerance.com> - 0.2.0-3
- Use upstream svn patch for multiple resolvers and defaults
- Don't override unused libdir
- Cleanup and run autoreconf
- Added missing dependancies (anacron, automake, libtool)
- Fix permission on cron job.

* Fri Nov 28 2008 Paul Wouters <paul at xelerance.com> - 0.2.0-2
- Fix typo in resolver-pidfile: option in autotrust.conf

* Thu Nov 27 2008 Paul Wouters <paul at xelerance.com> - 0.2.0-1
- Updated to newest version
- Fix default file locations
- Allow resolver-pid: to take multiple filenames, seperated by a space

* Fri Nov 22 2008 Paul Wouters <paul at xelerance.com> - 0.1.0-1
- Initial version


--- NEW FILE import.log ---
autotrust-0_2_1-0_2_rc1_fc10:HEAD:autotrust-0.2.1-0.2.rc1.fc10.src.rpm:1232756896


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/autotrust/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	23 Jan 2009 23:14:07 -0000	1.1
+++ .cvsignore	24 Jan 2009 00:29:35 -0000	1.2
@@ -0,0 +1 @@
+autotrust-0.2.1rc1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/autotrust/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	23 Jan 2009 23:14:07 -0000	1.1
+++ sources	24 Jan 2009 00:29:35 -0000	1.2
@@ -0,0 +1 @@
+663254fbd41176e3b13952bffd49a21c  autotrust-0.2.1rc1.tar.gz



From mclasen at fedoraproject.org  Sat Jan 24 00:39:13 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Sat, 24 Jan 2009 00:39:13 +0000 (UTC)
Subject: rpms/vinagre/devel .cvsignore, 1.19, 1.20 sources, 1.19,
	1.20 vinagre.spec, 1.37, 1.38
Message-ID: <20090124003913.6E6037010A@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/vinagre/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31740

Modified Files:
	.cvsignore sources vinagre.spec 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/vinagre/devel/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- .cvsignore	6 Jan 2009 17:27:54 -0000	1.19
+++ .cvsignore	24 Jan 2009 00:38:43 -0000	1.20
@@ -1 +1 @@
-vinagre-2.25.4.tar.bz2
+vinagre-2.25.5.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/vinagre/devel/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources	6 Jan 2009 17:27:54 -0000	1.19
+++ sources	24 Jan 2009 00:38:43 -0000	1.20
@@ -1 +1 @@
-7fe8686c28979f02e0d421690b755cd2  vinagre-2.25.4.tar.bz2
+c9d237227eb3b6c2eb0a61d98f994d57  vinagre-2.25.5.tar.bz2


Index: vinagre.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vinagre/devel/vinagre.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- vinagre.spec	6 Jan 2009 17:27:54 -0000	1.37
+++ vinagre.spec	24 Jan 2009 00:38:43 -0000	1.38
@@ -1,5 +1,5 @@
 Name:		vinagre
-Version:	2.25.4
+Version:	2.25.5
 Release:	1%{?dist}
 Summary:	VNC client for GNOME
 
@@ -122,6 +122,9 @@
 %doc README NEWS COPYING AUTHORS
 
 %changelog
+* Fri Jan 23 2009 Matthias Clasen <mclasen at redhat.com> - 2.25.5-1
+- Update to 2.25.5
+
 * Tue Jan  6 2009 Matthias Clasen <mclasen at redhat.com> - 2.25.4-1
 - Update to 2.25.4
 



From mclasen at fedoraproject.org  Sat Jan 24 00:54:07 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Sat, 24 Jan 2009 00:54:07 +0000 (UTC)
Subject: rpms/vino/devel .cvsignore, 1.42, 1.43 sources, 1.42, 1.43 vino.spec,
	1.84, 1.85
Message-ID: <20090124005407.1D6537010A@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/vino/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1382

Modified Files:
	.cvsignore sources vino.spec 
Log Message:
2.25.5



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/vino/devel/.cvsignore,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- .cvsignore	6 Jan 2009 17:47:50 -0000	1.42
+++ .cvsignore	24 Jan 2009 00:53:36 -0000	1.43
@@ -1 +1 @@
-vino-2.25.4.tar.bz2
+vino-2.25.5.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/vino/devel/sources,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- sources	6 Jan 2009 17:47:50 -0000	1.42
+++ sources	24 Jan 2009 00:53:36 -0000	1.43
@@ -1 +1 @@
-0105a7edb08b8fbc99deff60b94e3f18  vino-2.25.4.tar.bz2
+86d9f360a9ab17f0fce34bdbb7459e8f  vino-2.25.5.tar.bz2


Index: vino.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vino/devel/vino.spec,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -r1.84 -r1.85
--- vino.spec	6 Jan 2009 17:47:50 -0000	1.84
+++ vino.spec	24 Jan 2009 00:53:36 -0000	1.85
@@ -8,7 +8,7 @@
 
 Summary: A remote desktop system for GNOME
 Name: vino
-Version: 2.25.4
+Version: 2.25.5
 Release: 1%{?dist}
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/vino/2.25/%{name}-%{version}.tar.bz2
@@ -107,6 +107,9 @@
 %{_datadir}/gnome/autostart/vino-server.desktop
 
 %changelog
+* Fri Jan 23 2009 Matthias Clasen <mclasen at redhat.com> - 2.25.5-1
+- Update to 2.25.5
+
 * Tue Jan  6 2009 Matthias Clasen <mclasen at redhat.com> - 2.25.4-1
 - Update to 2.25.4
 



From mclasen at fedoraproject.org  Sat Jan 24 00:58:56 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Sat, 24 Jan 2009 00:58:56 +0000 (UTC)
Subject: rpms/vino/devel vino.spec,1.85,1.86
Message-ID: <20090124005856.588997010A@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/vino/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1885

Modified Files:
	vino.spec 
Log Message:
2.25.5



Index: vino.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vino/devel/vino.spec,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -r1.85 -r1.86
--- vino.spec	24 Jan 2009 00:53:36 -0000	1.85
+++ vino.spec	24 Jan 2009 00:58:25 -0000	1.86
@@ -29,7 +29,6 @@
 BuildRequires: libnotify-devel >= %{libnotify_version}
 BuildRequires: libXt-devel, libXtst-devel, libXdamage-devel, avahi-glib-devel
 BuildRequires: desktop-file-utils
-BuildRequires: perl(XML::Parser)
 BuildRequires: intltool
 BuildRequires: gettext
 BuildRequires: dbus-glib-devel
@@ -45,7 +44,6 @@
 %configure                   	\
   --enable-avahi             	\
   --disable-gnutls           	\
-  --disable-session-support  	\
   --disable-http-server		\
   --enable-libnotify
 make



From john5342 at fedoraproject.org  Sat Jan 24 00:59:05 2009
From: john5342 at fedoraproject.org (Adrian John Wilson)
Date: Sat, 24 Jan 2009 00:59:05 +0000 (UTC)
Subject: rpms/ebook-tools/F-10 ebook-tools.spec,1.1,1.2
Message-ID: <20090124005905.CE50C7010A@cvs1.fedora.phx.redhat.com>

Author: john5342

Update of /cvs/pkgs/rpms/ebook-tools/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1821/F-10

Modified Files:
	ebook-tools.spec 
Log Message:
* Sat Jan 24 2009 John5342 <john5342 at, fedoraproject.org> 0.1.1-3
- Actually remove lit2epub this time



Index: ebook-tools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ebook-tools/F-10/ebook-tools.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ebook-tools.spec	15 Dec 2008 23:50:05 -0000	1.1
+++ ebook-tools.spec	24 Jan 2009 00:58:35 -0000	1.2
@@ -1,6 +1,6 @@
 Name:		ebook-tools
 Version:	0.1.1
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Tools for accessing and converting various ebook file formats
 
 Group:		Applications/Publishing
@@ -55,7 +55,7 @@
 cd build
 make install DESTDIR=%{buildroot}
 #remove because it doesnt work without clit
-rm -f %{_bindir}/lit2epub
+rm -f %{buildroot}%{_bindir}/lit2epub
 
 %clean
 rm -rf %{buildroot}
@@ -67,7 +67,7 @@
 %files
 %defattr(-,root,root,-)
 %doc
-%{_bindir}/*
+%{_bindir}/einfo
 
 %files	devel
 %defattr(-,root,root,-)
@@ -80,6 +80,9 @@
 %{_libdir}/*.so.*
 
 %changelog
+* Sat Jan 24 2009 John5342 <john5342 at, fedoraproject.org> 0.1.1-3
+- Actually remove lit2epub this time
+
 * Mon Dec 15 2008 John5342 <john5342 at, fedoraproject.org> 0.1.1-2
 - Removed lit2epub as it doesnt work without clit
 



From john5342 at fedoraproject.org  Sat Jan 24 00:59:06 2009
From: john5342 at fedoraproject.org (Adrian John Wilson)
Date: Sat, 24 Jan 2009 00:59:06 +0000 (UTC)
Subject: rpms/ebook-tools/F-9 ebook-tools.spec,1.1,1.2
Message-ID: <20090124005906.1FB537010A@cvs1.fedora.phx.redhat.com>

Author: john5342

Update of /cvs/pkgs/rpms/ebook-tools/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1821/F-9

Modified Files:
	ebook-tools.spec 
Log Message:
* Sat Jan 24 2009 John5342 <john5342 at, fedoraproject.org> 0.1.1-3
- Actually remove lit2epub this time



Index: ebook-tools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ebook-tools/F-9/ebook-tools.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ebook-tools.spec	15 Dec 2008 23:54:53 -0000	1.1
+++ ebook-tools.spec	24 Jan 2009 00:58:35 -0000	1.2
@@ -1,6 +1,6 @@
 Name:		ebook-tools
 Version:	0.1.1
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Tools for accessing and converting various ebook file formats
 
 Group:		Applications/Publishing
@@ -55,7 +55,7 @@
 cd build
 make install DESTDIR=%{buildroot}
 #remove because it doesnt work without clit
-rm -f %{_bindir}/lit2epub
+rm -f %{buildroot}%{_bindir}/lit2epub
 
 %clean
 rm -rf %{buildroot}
@@ -67,7 +67,7 @@
 %files
 %defattr(-,root,root,-)
 %doc
-%{_bindir}/*
+%{_bindir}/einfo
 
 %files	devel
 %defattr(-,root,root,-)
@@ -80,6 +80,9 @@
 %{_libdir}/*.so.*
 
 %changelog
+* Sat Jan 24 2009 John5342 <john5342 at, fedoraproject.org> 0.1.1-3
+- Actually remove lit2epub this time
+
 * Mon Dec 15 2008 John5342 <john5342 at, fedoraproject.org> 0.1.1-2
 - Removed lit2epub as it doesnt work without clit
 



From john5342 at fedoraproject.org  Sat Jan 24 00:59:06 2009
From: john5342 at fedoraproject.org (Adrian John Wilson)
Date: Sat, 24 Jan 2009 00:59:06 +0000 (UTC)
Subject: rpms/ebook-tools/devel ebook-tools.spec,1.1,1.2
Message-ID: <20090124005906.72AC67010A@cvs1.fedora.phx.redhat.com>

Author: john5342

Update of /cvs/pkgs/rpms/ebook-tools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1821/devel

Modified Files:
	ebook-tools.spec 
Log Message:
* Sat Jan 24 2009 John5342 <john5342 at, fedoraproject.org> 0.1.1-3
- Actually remove lit2epub this time



Index: ebook-tools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ebook-tools/devel/ebook-tools.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ebook-tools.spec	15 Dec 2008 20:38:40 -0000	1.1
+++ ebook-tools.spec	24 Jan 2009 00:58:36 -0000	1.2
@@ -1,6 +1,6 @@
 Name:		ebook-tools
 Version:	0.1.1
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Tools for accessing and converting various ebook file formats
 
 Group:		Applications/Publishing
@@ -55,7 +55,7 @@
 cd build
 make install DESTDIR=%{buildroot}
 #remove because it doesnt work without clit
-rm -f %{_bindir}/lit2epub
+rm -f %{buildroot}%{_bindir}/lit2epub
 
 %clean
 rm -rf %{buildroot}
@@ -67,7 +67,7 @@
 %files
 %defattr(-,root,root,-)
 %doc
-%{_bindir}/*
+%{_bindir}/einfo
 
 %files	devel
 %defattr(-,root,root,-)
@@ -80,6 +80,9 @@
 %{_libdir}/*.so.*
 
 %changelog
+* Sat Jan 24 2009 John5342 <john5342 at, fedoraproject.org> 0.1.1-3
+- Actually remove lit2epub this time
+
 * Mon Dec 15 2008 John5342 <john5342 at, fedoraproject.org> 0.1.1-2
 - Removed lit2epub as it doesnt work without clit
 



From sadmac at fedoraproject.org  Sat Jan 24 01:00:14 2009
From: sadmac at fedoraproject.org (Casey Dahlin)
Date: Sat, 24 Jan 2009 01:00:14 +0000 (UTC)
Subject: rpms/upstart/F-10 upstart-save-state-across-reexec.patch, NONE,
	1.1 upstart.spec, 1.30, 1.31
Message-ID: <20090124010014.B2EB77010A@cvs1.fedora.phx.redhat.com>

Author: sadmac

Update of /cvs/pkgs/rpms/upstart/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2065/F-10

Modified Files:
	upstart.spec 
Added Files:
	upstart-save-state-across-reexec.patch 
Log Message:
Fix Bug #450488


upstart-save-state-across-reexec.patch:

--- NEW FILE upstart-save-state-across-reexec.patch ---
diff -uNr upstart-0.3.9.orig/init/main.c upstart-0.3.9/init/main.c
--- upstart-0.3.9.orig/init/main.c	2009-01-23 13:44:32.000000000 -0500
+++ upstart-0.3.9/init/main.c	2009-01-23 13:44:54.000000000 -0500
@@ -59,6 +59,7 @@
 #include "cfgfile.h"
 #include "paths.h"
 #include "tty.h"
+#include "restore.h"
 
 
 /* Prototypes for static functions */
@@ -278,6 +279,10 @@
 		exit (1);
 	}
 
+	/* Restore the state of previously active jobs, if re-exec'd by
+         * a previously running init. */
+
+	if (restart) restore_configuration(args);
 
 	/* Generate and run the startup event or read the state from the
 	 * init daemon that exec'd us
@@ -534,6 +539,8 @@
 	NihError   *err;
 	const char *loglevel;
 	sigset_t    mask, oldmask;
+	char **args;
+	size_t len;
 
 	nih_assert (argv0 != NULL);
 	nih_assert (signal != NULL);
@@ -559,7 +566,20 @@
 	} else {
 		loglevel = NULL;
 	}
-	execl (argv0, argv0, "--restart", loglevel, NULL);
+	args = nih_str_array_new(NULL);
+	len = 0;
+	if (args) args = nih_str_array_add(&args, NULL, &len, argv0);
+	if (args) args = nih_str_array_add(&args, NULL, &len, "--restart");
+	if (args && loglevel)
+		args = nih_str_array_add(&args, NULL, &len, loglevel);
+	if (args) save_current_configuration(&args, NULL, &len);
+	if (args) {
+		execv (argv0, args);
+		nih_free(args);
+	} else {
+		nih_warn (_("Unable to save list of currently running jobs"));
+		execl(argv0, argv0, "--restart", loglevel, NULL);
+	}
 	nih_error_raise_system ();
 
 	err = nih_error_get ();
diff -uNr upstart-0.3.9.orig/init/Makefile.am upstart-0.3.9/init/Makefile.am
--- upstart-0.3.9.orig/init/Makefile.am	2009-01-23 13:44:32.000000000 -0500
+++ upstart-0.3.9/init/Makefile.am	2009-01-23 13:44:54.000000000 -0500
@@ -23,7 +23,8 @@
 	event.c event.h \
 	control.c control.h \
 	notify.c notify.h \
-	cfgfile.c cfgfile.h
+	cfgfile.c cfgfile.h \
+	restore.c restore.h
 
 init_LDFLAGS = -static
 init_LDADD = \
diff -uNr upstart-0.3.9.orig/init/Makefile.in upstart-0.3.9/init/Makefile.in
--- upstart-0.3.9.orig/init/Makefile.in	2009-01-23 13:44:32.000000000 -0500
+++ upstart-0.3.9/init/Makefile.in	2009-01-23 13:44:54.000000000 -0500
@@ -72,7 +72,7 @@
 PROGRAMS = $(sbin_PROGRAMS)
 am_init_OBJECTS = main.$(OBJEXT) tty.$(OBJEXT) process.$(OBJEXT) \
 	job.$(OBJEXT) event.$(OBJEXT) control.$(OBJEXT) \
-	notify.$(OBJEXT) cfgfile.$(OBJEXT)
+	notify.$(OBJEXT) cfgfile.$(OBJEXT) restore.$(OBJEXT)
 init_OBJECTS = $(am_init_OBJECTS)
 am__DEPENDENCIES_1 =
 init_DEPENDENCIES = ../upstart/libupstart.la ../nih/libnih.la \
@@ -315,7 +315,8 @@
 	event.c event.h \
 	control.c control.h \
 	notify.c notify.h \
-	cfgfile.c cfgfile.h
+	cfgfile.c cfgfile.h \
+	restore.c restore.h
 
 init_LDFLAGS = -static
 init_LDADD = \
diff -uNr upstart-0.3.9.orig/init/restore.c upstart-0.3.9/init/restore.c
--- upstart-0.3.9.orig/init/restore.c	1969-12-31 19:00:00.000000000 -0500
+++ upstart-0.3.9/init/restore.c	2009-01-23 13:44:54.000000000 -0500
@@ -0,0 +1,333 @@
+/* Modifications to upstart to allow passing of the state of currently
+ * running jobs when upstart re-execs itself.
+ */
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif /* HAVE_CONFIG_H */
+
+
+#include <sys/types.h>
+#include <string.h>
+#include <nih/string.h>
+#include <nih/logging.h>
+#include <nih/alloc.h>
+#include "job.h"
+#include "restore.h"
+
+
+/**
+ * store_pid:
+ * @proc:    pointer to a JobProcess structure or NULL
+ * @args:    array of arguments
+ * @parent:  parent of @args
+ * @len:     current length of @args
+ * 
+ * Does nothing if @args is null.
+ * Pushes "X" onto @args if @args is non-null but @process is null.
+ * Otherwise: extracts the pid from @process, creates a hexadecimal string
+ * form of it, pushes a copy onto the array @args, then frees the original.
+ */
+
+void store_pid(JobProcess *proc, char ***args, const void *parent, size_t *len)
+{
+	char *pidstr;
+	if (! *args) return;
+	pidstr = (proc ? nih_sprintf(NULL, "%x", proc->pid) : "X");
+
+	if (! pidstr) {
+		nih_error("Unable to allocate storage to save process id");
+		*args = NULL;
+		return;
+	}
+	if (! nih_str_array_add(args, parent, len, pidstr)) {
+		nih_error("Unable to add process id to argument list");
+		*args = NULL;
+	}
+
+	if (proc) nih_free(pidstr);
+}
+ 
+/**
+ * unpack_pid:
+ * @pidstr: hexadecimal string created by pack_pid
+ * @err: pointer to flag to set if error occurs
+ *
+ * Returns the process id corresponding to the string passed in pidstr.
+ * If an error occurs, returns 0 and sets the flag pointed to by @err.
+ **/
+
+pid_t unpack_pid(char *pidstr, int *err) {
+	pid_t result = 0;
+	while (*pidstr) {
+		unsigned char c = *pidstr++;
+		result <<= 4;
+		if (c >= '0' && c <= '9') result += (c-'0');
+		else if (c >= 'a' && c <= 'f') result += 10 + (c-'a');
+		else {
+			*err = 1;
+			return 0;
+		}
+	}
+	return result;
+}
+
+/**
+ * retrieve_pid:
+ * @arg: 	pointer to array of arguments from which to read pid string
+ * @jobname: 	name of job whose pids are being retrieved
+ * @err: 	pointer to flag to set if error occurs
+ * @pid: 	pointer to location to hold the retrieved process id
+ * @present:	pointer to a location to hold 1 if the process id was present
+ *
+ * Reads a process id or no-process-present indicator from the hexadecimal
+ * string pointed to by @arg, increments @arg to point to the next string in
+ * the array unless it already points to a null string, and stores into
+ * @present a value of 0 or 1 indicating whether or not a process id is
+ * present, and stores into @pid the unpacked process id (or zero if there
+ * is no process present or an error occurred). If an error occured, sets
+ * the flag pointed to by @err and printes an error message.
+ **/
+
+void retrieve_pid(char ***arg, char *jobname, int *err,
+						pid_t *pid, int *present)
+{
+	*pid = 0;
+	*present = 0;
+	char *str;
+	if (! arg || ! *arg || ! **arg) {
+		nih_error("Ran out of arguments when restoring job %s",
+			  jobname);
+		*err = 1;
+		return;
+	}
+	str = **arg;
+	if (str) ++(*arg);
+	if (strcmp(str, "X")==0) return;
+	*present = 1;
+	*pid = unpack_pid(str, err);
+	if (*err) nih_error("Cannot parse pid %s for job %s", str, jobname);
+}
+
+/**
+ * restore_pid:
+ * @proc: 	pointer to a JobProcess structure, or NULL
+ * @pid: 	process id
+ * @present: 	integer which is 1 if process id is applicable
+ * @jobname:	name of job whose process ids are being restored
+ *
+ * Checks that the non-null status of @proc matches the true/false
+ * status of @present. If there is a mismatch, prints an error message.
+ * If @present is true and @proc is non-null, stores the process id from
+ * @pid into the JobProcess structure pointed to by @proc.
+ */
+
+void restore_pid(JobProcess *proc, pid_t pid, int present, char *jobname)
+{
+	if (proc == NULL && ! present) return;
+	if (proc != NULL && present) {
+		proc->pid = pid;
+		return;
+	}
+	nih_error("Unable to restore process id for job %s", jobname);
+}
+
+/**
+ * save_current_configuration:
+ * @args:   array of arguments to pass to new init
+ * @parent: parent of @args
+ * @len:    current length of @args
+ *
+ * Pushes, onto the array @args, information about currently running
+ * jobs. Each job consists of seven arguments:
+ *   (1) The job name
+ *   (2) A 3-character state/goal string:
+ *         First character for the goal: 0=goal JOB_STOP, 1=goal JOB_START
+ *         Second character for the current state:
+ *             W=JOB_WAITING,
+ *             S=JOB_STARTING, A=JOB_PRE_START, B=JOB_SPAWNED, C=JOB_POST_START,
+ *             R=JOB_RUNNING,
+ *             T=JOB_STOPPING, X=JOB_PRE_STOP, Y=JOB_KILLED, Z=JOB_POST_STOP
+ *         Third character: N=normal job, I=instance job
+ *   (3) The associated PROCESS_MAIN process id
+ *   (4) The associated PROCESS_PRE_START process id
+ *   (5) The associated PROCESS_POST_START process id
+ *   (6) The associated PROCESS_PRE_STOP process id
+ *   (7) The associated PROCESS_POST_STOP process id
+ * Process ids are in hexadecimal using lower-case letters (0-9,a-f),
+ * or 0 if there is a JobProcess structure but no running process, or
+ * "X" if there is no JobProcess structure.
+ *
+ */
+ 
+void save_current_configuration(char ***args, const void *parent, size_t *len)
+{
+	NIH_HASH_FOREACH(jobs, iter) {
+		Job *job = (Job *) iter;
+		char goal_state[4];
+		JobProcess **pids;
+
+		
+		if (job->replacement_for != NULL) continue;
+		if (job->state == JOB_DELETED) continue;
+		if (job->instance && ! job->instance_of) continue;
+		
+		if (! nih_str_array_add(args, parent, len, job->name))
+			return;
+		
+		if (job->goal == JOB_START) goal_state[0] = '1';
+		else goal_state[0] = '0';
+		
+		switch (job->state)
+			{
+			case JOB_WAITING:    goal_state[1] = 'W'; break;
+			case JOB_STARTING:   goal_state[1] = 'S'; break;
+			case JOB_PRE_START:  goal_state[1] = 'A'; break;
+			case JOB_SPAWNED:    goal_state[1] = 'B'; break;
+			case JOB_POST_START: goal_state[1] = 'C'; break;
+			case JOB_RUNNING:    goal_state[1] = 'R'; break;
+			case JOB_STOPPING:   goal_state[1] = 'T'; break;
+			case JOB_PRE_STOP:   goal_state[1] = 'X'; break;
+			case JOB_KILLED:     goal_state[1] = 'Y'; break;
+			case JOB_POST_STOP:  goal_state[1] = 'Z'; break;
+			default:             goal_state[1] = '?';      
+			}
+		if (job->instance_of) goal_state[2] = 'I';
+		else goal_state[2] = 'N';
+		goal_state[3] = 0;
+		
+		if (! nih_str_array_add(args, parent, len, goal_state))
+			return;
+		
+		pids = job->process;
+		store_pid(pids[PROCESS_MAIN],       args, parent, len);
+		store_pid(pids[PROCESS_PRE_START],  args, parent, len);
+		store_pid(pids[PROCESS_POST_START], args, parent, len);
+		store_pid(pids[PROCESS_PRE_STOP],   args, parent, len);
+		store_pid(pids[PROCESS_POST_STOP],  args, parent, len);
+	}
+}
+
+/**
+ * restore_job_state:
+ * @jobname: name of job whose state we are to restore
+ * @goal_state: the goal/state string generated by save_current_configuration
+ * @pids: array of five process ids 
+ * @presents: array of five integers indicating which process ids are applicable
+ */
+
+void restore_job_state (char *jobname, char *goal_state,
+				pid_t *pids, int *presents)
+{
+	Job *job;
+	JobGoal goal = JOB_STOP;
+	JobState state = JOB_WAITING;
+	int is_instance = 0;
+	int is_invalid = 0;
+	JobProcess **procs;
+
+	if (jobname == NULL) {
+		nih_error("Missing name for restored job");
+		return;
+	}
+
+	if (goal_state == NULL) {
+		nih_error("Missing goal/state for restored job %s", jobname);
+		return;
+	}
+	
+	if (strlen(goal_state) != 3) {
+		nih_error("Invalid length goal/state %s for restored job %s",
+			  goal_state, jobname);
+		return;
+	}
+
+	switch (goal_state[0])
+		{
+		case '0': goal = JOB_STOP; break;
+		case '1': goal = JOB_START; break;
+		default: is_invalid = 1; break;
+		}
+	
+	switch (goal_state[1])
+		{
+		case 'W': state = JOB_WAITING; break;
+		case 'S': state = JOB_STARTING; break;
+		case 'A': state = JOB_PRE_START; break;
+		case 'B': state = JOB_SPAWNED; break;
+		case 'C': state = JOB_POST_START; break;
+		case 'R': state = JOB_RUNNING; break;
+		case 'T': state = JOB_STOPPING; break;
+		case 'X': state = JOB_PRE_STOP; break;
+		case 'Y': state = JOB_KILLED; break;
+		case 'Z': state = JOB_POST_STOP; break;
+		default: is_invalid = 1;
+		}
+
+	switch (goal_state[2])
+		{
+		case 'N': break;
+		case 'I': is_instance = 1; break;
+		default: is_invalid = 1;
+		}
+	
+	if (is_invalid) {
+		nih_error("Invalid goal/state %s for restored job %s",
+			  goal_state, jobname);
+		return;
+	}
+	job = job_find_by_name(jobname);
+	if (! job) {
+		nih_error("Unknown job %s passed to re-exec", jobname);
+		return;
+	}				
+	if (is_instance) {
+		if (! job->instance) {
+			nih_error("Can not restore job %s as instance job",
+				  jobname);
+			return;
+		}
+		job = job_instance(job);
+	} else {
+		if (job->instance) {
+			nih_error("Can not restore job %s as non-instance job",
+				  jobname);
+			return;
+		}
+	}
+	job->goal = goal;
+	job->state = state;
+	procs=job->process;
+	restore_pid(procs[PROCESS_MAIN],       pids[0], presents[0], jobname);
+	restore_pid(procs[PROCESS_PRE_START],  pids[1], presents[1], jobname);
+	restore_pid(procs[PROCESS_POST_START], pids[2], presents[2], jobname);
+	restore_pid(procs[PROCESS_PRE_STOP],   pids[3], presents[3], jobname);
+	restore_pid(procs[PROCESS_POST_STOP],  pids[4], presents[4], jobname);
+}
+
+/**
+ * restore_current_configuration:
+ * @args:   non-option arguments that were passed to the new init
+ */
+
+void restore_configuration(char **args)
+{
+	if (! args) return;
+	
+	char **arg = args;
+	while (arg && *arg) {
+		char *jobname = *(arg++);
+		char *goal_state = *arg;
+		pid_t pids[5];
+		int presents[5];
+		int is_invalid = 0;
+
+		if (*arg) ++arg;
+		for (int i = 0; i < 5; i++) 
+			retrieve_pid(&arg, jobname, &is_invalid,
+					&pids[i], &presents[i]);
+
+		if (! is_invalid)
+			restore_job_state (jobname, goal_state, pids, presents);
+	}
+}
diff -uNr upstart-0.3.9.orig/init/restore.h upstart-0.3.9/init/restore.h
--- upstart-0.3.9.orig/init/restore.h	1969-12-31 19:00:00.000000000 -0500
+++ upstart-0.3.9/init/restore.h	2009-01-23 13:44:54.000000000 -0500
@@ -0,0 +1,13 @@
+#ifndef INIT_RESTORE_H
+#define INIT_RESTORE_H
+
+#include <nih/string.h>
+
+NIH_BEGIN_EXTERN
+
+void save_current_configuration(char ***args, const void *parent, size_t *len);
+void restore_configuration(char **args);
+
+NIH_END_EXTERN
+
+#endif /* INIT_RESTORE_H */


Index: upstart.spec
===================================================================
RCS file: /cvs/pkgs/rpms/upstart/F-10/upstart.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- upstart.spec	13 Jan 2009 00:48:29 -0000	1.30
+++ upstart.spec	24 Jan 2009 00:59:44 -0000	1.31
@@ -1,6 +1,6 @@
 Name:           upstart
 Version:        0.3.9
-Release:        21%{?dist}
+Release:        22%{?dist}
 Summary:        An event-driven init system
 
 Group:          System Environment/Base
@@ -13,8 +13,9 @@
 Patch2:         upstart-tty-stack.patch
 Patch3:         upstart-rpm.patch
 Patch4:         upstart-fedora-buglist.patch
-#Patch5:         upstart-telinit-u.patch
+Patch5:         upstart-telinit-u.patch
 Patch6:	        upstart-initctl-man.patch
+Patch7:		upstart-save-state-across-reexec.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Obsoletes: SysVinit < 2.86-24, sysvinit < 2.86-24
 Provides: SysVinit = 2.86-24, sysvinit = 2.86-24
@@ -32,8 +33,9 @@
 %patch2
 %patch3
 %patch4 -p1
-#%patch5 -p1
+%patch5 -p1
 %patch6 -p1
+%patch7 -p1
 
 %build
 %configure --enable-compat=sysv --sbindir=/sbin --libdir=/%{_lib}
@@ -99,6 +101,10 @@
 %{_mandir}/man8/telinit.8.gz
 
 %changelog
+* Fri Jan 23 2009 Casey Dahlin <cdahlin at redhat.com> - 0.3.9-22
+- Re-add 'telinit u' support along with patch to fix it (#450488). Patch due to
+  <pspencer at fields.utoronto.ca>
+
 * Mon Jan 12 2009 Bill Nottingham <notting at redhat.com> - 0.3.9-21
 - Remove 'telinit u' support as it is broken (#450488, <cjdahlin at ncsu.edu>)
 



From sadmac at fedoraproject.org  Sat Jan 24 01:00:15 2009
From: sadmac at fedoraproject.org (Casey Dahlin)
Date: Sat, 24 Jan 2009 01:00:15 +0000 (UTC)
Subject: rpms/upstart/F-9 upstart-save-state-across-reexec.patch, NONE,
	1.1 upstart.spec, 1.23, 1.24
Message-ID: <20090124010015.168997010A@cvs1.fedora.phx.redhat.com>

Author: sadmac

Update of /cvs/pkgs/rpms/upstart/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2065/F-9

Modified Files:
	upstart.spec 
Added Files:
	upstart-save-state-across-reexec.patch 
Log Message:
Fix Bug #450488


upstart-save-state-across-reexec.patch:

--- NEW FILE upstart-save-state-across-reexec.patch ---
diff -uNr upstart-0.3.9.orig/init/main.c upstart-0.3.9/init/main.c
--- upstart-0.3.9.orig/init/main.c	2009-01-23 13:44:32.000000000 -0500
+++ upstart-0.3.9/init/main.c	2009-01-23 13:44:54.000000000 -0500
@@ -59,6 +59,7 @@
 #include "cfgfile.h"
 #include "paths.h"
 #include "tty.h"
+#include "restore.h"
 
 
 /* Prototypes for static functions */
@@ -278,6 +279,10 @@
 		exit (1);
 	}
 
+	/* Restore the state of previously active jobs, if re-exec'd by
+         * a previously running init. */
+
+	if (restart) restore_configuration(args);
 
 	/* Generate and run the startup event or read the state from the
 	 * init daemon that exec'd us
@@ -534,6 +539,8 @@
 	NihError   *err;
 	const char *loglevel;
 	sigset_t    mask, oldmask;
+	char **args;
+	size_t len;
 
 	nih_assert (argv0 != NULL);
 	nih_assert (signal != NULL);
@@ -559,7 +566,20 @@
 	} else {
 		loglevel = NULL;
 	}
-	execl (argv0, argv0, "--restart", loglevel, NULL);
+	args = nih_str_array_new(NULL);
+	len = 0;
+	if (args) args = nih_str_array_add(&args, NULL, &len, argv0);
+	if (args) args = nih_str_array_add(&args, NULL, &len, "--restart");
+	if (args && loglevel)
+		args = nih_str_array_add(&args, NULL, &len, loglevel);
+	if (args) save_current_configuration(&args, NULL, &len);
+	if (args) {
+		execv (argv0, args);
+		nih_free(args);
+	} else {
+		nih_warn (_("Unable to save list of currently running jobs"));
+		execl(argv0, argv0, "--restart", loglevel, NULL);
+	}
 	nih_error_raise_system ();
 
 	err = nih_error_get ();
diff -uNr upstart-0.3.9.orig/init/Makefile.am upstart-0.3.9/init/Makefile.am
--- upstart-0.3.9.orig/init/Makefile.am	2009-01-23 13:44:32.000000000 -0500
+++ upstart-0.3.9/init/Makefile.am	2009-01-23 13:44:54.000000000 -0500
@@ -23,7 +23,8 @@
 	event.c event.h \
 	control.c control.h \
 	notify.c notify.h \
-	cfgfile.c cfgfile.h
+	cfgfile.c cfgfile.h \
+	restore.c restore.h
 
 init_LDFLAGS = -static
 init_LDADD = \
diff -uNr upstart-0.3.9.orig/init/Makefile.in upstart-0.3.9/init/Makefile.in
--- upstart-0.3.9.orig/init/Makefile.in	2009-01-23 13:44:32.000000000 -0500
+++ upstart-0.3.9/init/Makefile.in	2009-01-23 13:44:54.000000000 -0500
@@ -72,7 +72,7 @@
 PROGRAMS = $(sbin_PROGRAMS)
 am_init_OBJECTS = main.$(OBJEXT) tty.$(OBJEXT) process.$(OBJEXT) \
 	job.$(OBJEXT) event.$(OBJEXT) control.$(OBJEXT) \
-	notify.$(OBJEXT) cfgfile.$(OBJEXT)
+	notify.$(OBJEXT) cfgfile.$(OBJEXT) restore.$(OBJEXT)
 init_OBJECTS = $(am_init_OBJECTS)
 am__DEPENDENCIES_1 =
 init_DEPENDENCIES = ../upstart/libupstart.la ../nih/libnih.la \
@@ -315,7 +315,8 @@
 	event.c event.h \
 	control.c control.h \
 	notify.c notify.h \
-	cfgfile.c cfgfile.h
+	cfgfile.c cfgfile.h \
+	restore.c restore.h
 
 init_LDFLAGS = -static
 init_LDADD = \
diff -uNr upstart-0.3.9.orig/init/restore.c upstart-0.3.9/init/restore.c
--- upstart-0.3.9.orig/init/restore.c	1969-12-31 19:00:00.000000000 -0500
+++ upstart-0.3.9/init/restore.c	2009-01-23 13:44:54.000000000 -0500
@@ -0,0 +1,333 @@
+/* Modifications to upstart to allow passing of the state of currently
+ * running jobs when upstart re-execs itself.
+ */
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif /* HAVE_CONFIG_H */
+
+
+#include <sys/types.h>
+#include <string.h>
+#include <nih/string.h>
+#include <nih/logging.h>
+#include <nih/alloc.h>
+#include "job.h"
+#include "restore.h"
+
+
+/**
+ * store_pid:
+ * @proc:    pointer to a JobProcess structure or NULL
+ * @args:    array of arguments
+ * @parent:  parent of @args
+ * @len:     current length of @args
+ * 
+ * Does nothing if @args is null.
+ * Pushes "X" onto @args if @args is non-null but @process is null.
+ * Otherwise: extracts the pid from @process, creates a hexadecimal string
+ * form of it, pushes a copy onto the array @args, then frees the original.
+ */
+
+void store_pid(JobProcess *proc, char ***args, const void *parent, size_t *len)
+{
+	char *pidstr;
+	if (! *args) return;
+	pidstr = (proc ? nih_sprintf(NULL, "%x", proc->pid) : "X");
+
+	if (! pidstr) {
+		nih_error("Unable to allocate storage to save process id");
+		*args = NULL;
+		return;
+	}
+	if (! nih_str_array_add(args, parent, len, pidstr)) {
+		nih_error("Unable to add process id to argument list");
+		*args = NULL;
+	}
+
+	if (proc) nih_free(pidstr);
+}
+ 
+/**
+ * unpack_pid:
+ * @pidstr: hexadecimal string created by pack_pid
+ * @err: pointer to flag to set if error occurs
+ *
+ * Returns the process id corresponding to the string passed in pidstr.
+ * If an error occurs, returns 0 and sets the flag pointed to by @err.
+ **/
+
+pid_t unpack_pid(char *pidstr, int *err) {
+	pid_t result = 0;
+	while (*pidstr) {
+		unsigned char c = *pidstr++;
+		result <<= 4;
+		if (c >= '0' && c <= '9') result += (c-'0');
+		else if (c >= 'a' && c <= 'f') result += 10 + (c-'a');
+		else {
+			*err = 1;
+			return 0;
+		}
+	}
+	return result;
+}
+
+/**
+ * retrieve_pid:
+ * @arg: 	pointer to array of arguments from which to read pid string
+ * @jobname: 	name of job whose pids are being retrieved
+ * @err: 	pointer to flag to set if error occurs
+ * @pid: 	pointer to location to hold the retrieved process id
+ * @present:	pointer to a location to hold 1 if the process id was present
+ *
+ * Reads a process id or no-process-present indicator from the hexadecimal
+ * string pointed to by @arg, increments @arg to point to the next string in
+ * the array unless it already points to a null string, and stores into
+ * @present a value of 0 or 1 indicating whether or not a process id is
+ * present, and stores into @pid the unpacked process id (or zero if there
+ * is no process present or an error occurred). If an error occured, sets
+ * the flag pointed to by @err and printes an error message.
+ **/
+
+void retrieve_pid(char ***arg, char *jobname, int *err,
+						pid_t *pid, int *present)
+{
+	*pid = 0;
+	*present = 0;
+	char *str;
+	if (! arg || ! *arg || ! **arg) {
+		nih_error("Ran out of arguments when restoring job %s",
+			  jobname);
+		*err = 1;
+		return;
+	}
+	str = **arg;
+	if (str) ++(*arg);
+	if (strcmp(str, "X")==0) return;
+	*present = 1;
+	*pid = unpack_pid(str, err);
+	if (*err) nih_error("Cannot parse pid %s for job %s", str, jobname);
+}
+
+/**
+ * restore_pid:
+ * @proc: 	pointer to a JobProcess structure, or NULL
+ * @pid: 	process id
+ * @present: 	integer which is 1 if process id is applicable
+ * @jobname:	name of job whose process ids are being restored
+ *
+ * Checks that the non-null status of @proc matches the true/false
+ * status of @present. If there is a mismatch, prints an error message.
+ * If @present is true and @proc is non-null, stores the process id from
+ * @pid into the JobProcess structure pointed to by @proc.
+ */
+
+void restore_pid(JobProcess *proc, pid_t pid, int present, char *jobname)
+{
+	if (proc == NULL && ! present) return;
+	if (proc != NULL && present) {
+		proc->pid = pid;
+		return;
+	}
+	nih_error("Unable to restore process id for job %s", jobname);
+}
+
+/**
+ * save_current_configuration:
+ * @args:   array of arguments to pass to new init
+ * @parent: parent of @args
+ * @len:    current length of @args
+ *
+ * Pushes, onto the array @args, information about currently running
+ * jobs. Each job consists of seven arguments:
+ *   (1) The job name
+ *   (2) A 3-character state/goal string:
+ *         First character for the goal: 0=goal JOB_STOP, 1=goal JOB_START
+ *         Second character for the current state:
+ *             W=JOB_WAITING,
+ *             S=JOB_STARTING, A=JOB_PRE_START, B=JOB_SPAWNED, C=JOB_POST_START,
+ *             R=JOB_RUNNING,
+ *             T=JOB_STOPPING, X=JOB_PRE_STOP, Y=JOB_KILLED, Z=JOB_POST_STOP
+ *         Third character: N=normal job, I=instance job
+ *   (3) The associated PROCESS_MAIN process id
+ *   (4) The associated PROCESS_PRE_START process id
+ *   (5) The associated PROCESS_POST_START process id
+ *   (6) The associated PROCESS_PRE_STOP process id
+ *   (7) The associated PROCESS_POST_STOP process id
+ * Process ids are in hexadecimal using lower-case letters (0-9,a-f),
+ * or 0 if there is a JobProcess structure but no running process, or
+ * "X" if there is no JobProcess structure.
+ *
+ */
+ 
+void save_current_configuration(char ***args, const void *parent, size_t *len)
+{
+	NIH_HASH_FOREACH(jobs, iter) {
+		Job *job = (Job *) iter;
+		char goal_state[4];
+		JobProcess **pids;
+
+		
+		if (job->replacement_for != NULL) continue;
+		if (job->state == JOB_DELETED) continue;
+		if (job->instance && ! job->instance_of) continue;
+		
+		if (! nih_str_array_add(args, parent, len, job->name))
+			return;
+		
+		if (job->goal == JOB_START) goal_state[0] = '1';
+		else goal_state[0] = '0';
+		
+		switch (job->state)
+			{
+			case JOB_WAITING:    goal_state[1] = 'W'; break;
+			case JOB_STARTING:   goal_state[1] = 'S'; break;
+			case JOB_PRE_START:  goal_state[1] = 'A'; break;
+			case JOB_SPAWNED:    goal_state[1] = 'B'; break;
+			case JOB_POST_START: goal_state[1] = 'C'; break;
+			case JOB_RUNNING:    goal_state[1] = 'R'; break;
+			case JOB_STOPPING:   goal_state[1] = 'T'; break;
+			case JOB_PRE_STOP:   goal_state[1] = 'X'; break;
+			case JOB_KILLED:     goal_state[1] = 'Y'; break;
+			case JOB_POST_STOP:  goal_state[1] = 'Z'; break;
+			default:             goal_state[1] = '?';      
+			}
+		if (job->instance_of) goal_state[2] = 'I';
+		else goal_state[2] = 'N';
+		goal_state[3] = 0;
+		
+		if (! nih_str_array_add(args, parent, len, goal_state))
+			return;
+		
+		pids = job->process;
+		store_pid(pids[PROCESS_MAIN],       args, parent, len);
+		store_pid(pids[PROCESS_PRE_START],  args, parent, len);
+		store_pid(pids[PROCESS_POST_START], args, parent, len);
+		store_pid(pids[PROCESS_PRE_STOP],   args, parent, len);
+		store_pid(pids[PROCESS_POST_STOP],  args, parent, len);
+	}
+}
+
+/**
+ * restore_job_state:
+ * @jobname: name of job whose state we are to restore
+ * @goal_state: the goal/state string generated by save_current_configuration
+ * @pids: array of five process ids 
+ * @presents: array of five integers indicating which process ids are applicable
+ */
+
+void restore_job_state (char *jobname, char *goal_state,
+				pid_t *pids, int *presents)
+{
+	Job *job;
+	JobGoal goal = JOB_STOP;
+	JobState state = JOB_WAITING;
+	int is_instance = 0;
+	int is_invalid = 0;
+	JobProcess **procs;
+
+	if (jobname == NULL) {
+		nih_error("Missing name for restored job");
+		return;
+	}
+
+	if (goal_state == NULL) {
+		nih_error("Missing goal/state for restored job %s", jobname);
+		return;
+	}
+	
+	if (strlen(goal_state) != 3) {
+		nih_error("Invalid length goal/state %s for restored job %s",
+			  goal_state, jobname);
+		return;
+	}
+
+	switch (goal_state[0])
+		{
+		case '0': goal = JOB_STOP; break;
+		case '1': goal = JOB_START; break;
+		default: is_invalid = 1; break;
+		}
+	
+	switch (goal_state[1])
+		{
+		case 'W': state = JOB_WAITING; break;
+		case 'S': state = JOB_STARTING; break;
+		case 'A': state = JOB_PRE_START; break;
+		case 'B': state = JOB_SPAWNED; break;
+		case 'C': state = JOB_POST_START; break;
+		case 'R': state = JOB_RUNNING; break;
+		case 'T': state = JOB_STOPPING; break;
+		case 'X': state = JOB_PRE_STOP; break;
+		case 'Y': state = JOB_KILLED; break;
+		case 'Z': state = JOB_POST_STOP; break;
+		default: is_invalid = 1;
+		}
+
+	switch (goal_state[2])
+		{
+		case 'N': break;
+		case 'I': is_instance = 1; break;
+		default: is_invalid = 1;
+		}
+	
+	if (is_invalid) {
+		nih_error("Invalid goal/state %s for restored job %s",
+			  goal_state, jobname);
+		return;
+	}
+	job = job_find_by_name(jobname);
+	if (! job) {
+		nih_error("Unknown job %s passed to re-exec", jobname);
+		return;
+	}				
+	if (is_instance) {
+		if (! job->instance) {
+			nih_error("Can not restore job %s as instance job",
+				  jobname);
+			return;
+		}
+		job = job_instance(job);
+	} else {
+		if (job->instance) {
+			nih_error("Can not restore job %s as non-instance job",
+				  jobname);
+			return;
+		}
+	}
+	job->goal = goal;
+	job->state = state;
+	procs=job->process;
+	restore_pid(procs[PROCESS_MAIN],       pids[0], presents[0], jobname);
+	restore_pid(procs[PROCESS_PRE_START],  pids[1], presents[1], jobname);
+	restore_pid(procs[PROCESS_POST_START], pids[2], presents[2], jobname);
+	restore_pid(procs[PROCESS_PRE_STOP],   pids[3], presents[3], jobname);
+	restore_pid(procs[PROCESS_POST_STOP],  pids[4], presents[4], jobname);
+}
+
+/**
+ * restore_current_configuration:
+ * @args:   non-option arguments that were passed to the new init
+ */
+
+void restore_configuration(char **args)
+{
+	if (! args) return;
+	
+	char **arg = args;
+	while (arg && *arg) {
+		char *jobname = *(arg++);
+		char *goal_state = *arg;
+		pid_t pids[5];
+		int presents[5];
+		int is_invalid = 0;
+
+		if (*arg) ++arg;
+		for (int i = 0; i < 5; i++) 
+			retrieve_pid(&arg, jobname, &is_invalid,
+					&pids[i], &presents[i]);
+
+		if (! is_invalid)
+			restore_job_state (jobname, goal_state, pids, presents);
+	}
+}
diff -uNr upstart-0.3.9.orig/init/restore.h upstart-0.3.9/init/restore.h
--- upstart-0.3.9.orig/init/restore.h	1969-12-31 19:00:00.000000000 -0500
+++ upstart-0.3.9/init/restore.h	2009-01-23 13:44:54.000000000 -0500
@@ -0,0 +1,13 @@
+#ifndef INIT_RESTORE_H
+#define INIT_RESTORE_H
+
+#include <nih/string.h>
+
+NIH_BEGIN_EXTERN
+
+void save_current_configuration(char ***args, const void *parent, size_t *len);
+void restore_configuration(char **args);
+
+NIH_END_EXTERN
+
+#endif /* INIT_RESTORE_H */


Index: upstart.spec
===================================================================
RCS file: /cvs/pkgs/rpms/upstart/F-9/upstart.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- upstart.spec	13 Jan 2009 00:48:29 -0000	1.23
+++ upstart.spec	24 Jan 2009 00:59:44 -0000	1.24
@@ -1,6 +1,6 @@
 Name:           upstart
 Version:        0.3.9
-Release:        21%{?dist}
+Release:        22%{?dist}
 Summary:        An event-driven init system
 
 Group:          System Environment/Base
@@ -13,8 +13,9 @@
 Patch2:         upstart-tty-stack.patch
 Patch3:         upstart-rpm.patch
 Patch4:         upstart-fedora-buglist.patch
-#Patch5:         upstart-telinit-u.patch
+Patch5:         upstart-telinit-u.patch
 Patch6:	        upstart-initctl-man.patch
+Patch7:		upstart-save-state-across-reexec.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Obsoletes: SysVinit < 2.86-24, sysvinit < 2.86-24
 Provides: SysVinit = 2.86-24, sysvinit = 2.86-24
@@ -32,8 +33,9 @@
 %patch2
 %patch3
 %patch4 -p1
-#%patch5 -p1
+%patch5 -p1
 %patch6 -p1
+%patch7 -p1
 
 %build
 %configure --enable-compat=sysv --sbindir=/sbin --libdir=/%{_lib}
@@ -99,6 +101,10 @@
 %{_mandir}/man8/telinit.8.gz
 
 %changelog
+* Fri Jan 23 2009 Casey Dahlin <cdahlin at redhat.com> - 0.3.9-22
+- Re-add 'telinit u' support along with patch to fix it (#450488). Patch due to
+  <pspencer at fields.utoronto.ca>
+
 * Mon Jan 12 2009 Bill Nottingham <notting at redhat.com> - 0.3.9-21
 - Remove 'telinit u' support as it is broken (#450488, <cjdahlin at ncsu.edu>)
 



From mclasen at fedoraproject.org  Sat Jan 24 01:05:47 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Sat, 24 Jan 2009 01:05:47 +0000 (UTC)
Subject: rpms/vino/devel vino.spec,1.86,1.87
Message-ID: <20090124010547.D0C947010A@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/vino/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2950

Modified Files:
	vino.spec 
Log Message:
add br for libsoup



Index: vino.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vino/devel/vino.spec,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -r1.86 -r1.87
--- vino.spec	24 Jan 2009 00:58:25 -0000	1.86
+++ vino.spec	24 Jan 2009 01:05:17 -0000	1.87
@@ -32,6 +32,7 @@
 BuildRequires: intltool
 BuildRequires: gettext
 BuildRequires: dbus-glib-devel
+BuildRequires: libsoup-devel
 
 %description
 Vino is a VNC server for GNOME. It allows remote users to



From mclasen at fedoraproject.org  Sat Jan 24 01:15:49 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Sat, 24 Jan 2009 01:15:49 +0000 (UTC)
Subject: rpms/gnome-games/devel .cvsignore, 1.91, 1.92 gnome-games.spec,
	1.195, 1.196 sources, 1.96, 1.97
Message-ID: <20090124011549.E76B87010A@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-games/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4564

Modified Files:
	.cvsignore gnome-games.spec sources 
Log Message:
2.25.5



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-games/devel/.cvsignore,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -r1.91 -r1.92
--- .cvsignore	6 Jan 2009 16:13:57 -0000	1.91
+++ .cvsignore	24 Jan 2009 01:15:19 -0000	1.92
@@ -1 +1 @@
-gnome-games-2.25.4.tar.bz2
+gnome-games-2.25.5.tar.bz2


Index: gnome-games.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-games/devel/gnome-games.spec,v
retrieving revision 1.195
retrieving revision 1.196
diff -u -r1.195 -r1.196
--- gnome-games.spec	6 Jan 2009 16:13:57 -0000	1.195
+++ gnome-games.spec	24 Jan 2009 01:15:19 -0000	1.196
@@ -43,7 +43,7 @@
 
 Summary: Games for the GNOME desktop
 Name: gnome-games
-Version: 2.25.4
+Version: 2.25.5
 Release: 1%{?dist}
 Epoch: 1
 License: GPLv2+ and GFDL
@@ -356,6 +356,9 @@
 %{_datadir}/omf/*
 
 %changelog
+* Fri Jan 23 2009 Matthias Clasen <mclasen at redhat.com> - 1:2.25.5-1
+- Update to 2.25.5
+
 * Tue Jan  6 2009 Matthias Clasen <mclasen at redhat.com> - 1:2.25.4-1
 - Update to 2.25.4
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-games/devel/sources,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -r1.96 -r1.97
--- sources	6 Jan 2009 16:13:57 -0000	1.96
+++ sources	24 Jan 2009 01:15:19 -0000	1.97
@@ -1 +1 @@
-f78a4141f8d634d83eb3ce1c9fc995f9  gnome-games-2.25.4.tar.bz2
+af00f89f038d83773c703dd8a7008c5e  gnome-games-2.25.5.tar.bz2



From roland at fedoraproject.org  Sat Jan 24 01:17:07 2009
From: roland at fedoraproject.org (Roland McGrath)
Date: Sat, 24 Jan 2009 01:17:07 +0000 (UTC)
Subject: rpms/elfutils/devel elfutils-0.139.tar.bz2.sig, NONE, 1.1 .cvsignore,
	1.45, 1.46 Makefile, 1.30, 1.31 elfutils-portability.patch, 1.39,
	1.40 elfutils-robustify.patch, 1.12, 1.13 elfutils.spec, 1.111,
	1.112 sources, 1.49, 1.50 upstream-key.gpg, 1.1,
	1.2 elfutils-0.138-libelf-padding-fix.patch, 1.1,
	NONE elfutils-0.138.tar.bz2.sig, 1.1, NONE
Message-ID: <20090124011707.87C847010A@cvs1.fedora.phx.redhat.com>

Author: roland

Update of /cvs/pkgs/rpms/elfutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4850

Modified Files:
	.cvsignore Makefile elfutils-portability.patch 
	elfutils-robustify.patch elfutils.spec sources 
	upstream-key.gpg 
Added Files:
	elfutils-0.139.tar.bz2.sig 
Removed Files:
	elfutils-0.138-libelf-padding-fix.patch 
	elfutils-0.138.tar.bz2.sig 
Log Message:
Update to 0.139


--- NEW FILE elfutils-0.139.tar.bz2.sig ---
??
~??% ?
J?Zve????H+

Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/elfutils/devel/.cvsignore,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- .cvsignore	31 Dec 2008 22:12:43 -0000	1.45
+++ .cvsignore	24 Jan 2009 01:16:36 -0000	1.46
@@ -1 +1 @@
-elfutils-0.138.tar.bz2
+elfutils-0.139.tar.bz2


Index: Makefile
===================================================================
RCS file: /cvs/pkgs/rpms/elfutils/devel/Makefile,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- Makefile	31 Dec 2008 22:12:43 -0000	1.30
+++ Makefile	24 Jan 2009 01:16:36 -0000	1.31
@@ -3,6 +3,8 @@
 NAME := elfutils
 SPECFILE = elfutils.spec
 
+all:
+
 UPSTREAM_CHECKS := sig
 UPSTREAM_FILES = $(NAME)-$(VERSION).tar.bz2
 upstream:;
@@ -28,20 +30,19 @@
 CURL += -k
 endif
 
+patches := $(patsubst %,elfutils-%.patch,robustify portability)
+all: $(patches)
+
 branch-portability = portable
+branch-master = elfutils-$(VERSION)
 
-elfutils-base = elfutils-$(VERSION)
-elfutils-base = master
+elfutils-%/configure: .git/refs/heads/* Makefile
+	@rm -rf $(@D)
+	git archive --prefix=$(@D)/ $(firstword $(branch-$*) $*) | tar xf -
+	cd $(@D) && autoreconf -i && rm -rf autom4te.cache
 
-elfutils-%.patch: elfutils-$(VERSION).tar.bz2 Makefile
-	@rm -rf elfutils-master elfutils-$*
-	git archive --prefix=elfutils-master/ $(elfutils-base) \
-	| tar xf -
-	git archive --prefix=elfutils-$*/ $(firstword $(branch-$*) $*) \
-	| tar xf -
-	cd elfutils-master; autoreconf -i; rm -rf autom4te.cache
-	cd elfutils-$*; autoreconf -i; rm -rf autom4te.cache
-	diff -Nrpu elfutils-master elfutils-$* | \
+elfutils-%.patch: elfutils-master/configure elfutils-%/configure
+	diff --exclude='.gitignore' -Nrpu $(^D) | \
 	filterdiff --remove-timestamps --strip=1 --addprefix=elfutils/ > $@.new
 	mv $@.new $@
 
@@ -52,7 +53,7 @@
 portable-r = 0.$(subst $(DIST),,$(RELEASE))
 portable-vr = $(VERSION)-$(portable-r)
 portable.srpm = elfutils-$(portable-vr).src.rpm
-$(portable.srpm): elfutils-portable.spec elfutils-portability.patch \
+$(portable.srpm): elfutils-portable.spec $(patches) \
 		  elfutils-$(VERSION).tar.bz2
 	$(RPM_WITH_DIRS) --nodeps -bs $<
 

elfutils-portability.patch:

Index: elfutils-portability.patch
===================================================================
RCS file: /cvs/pkgs/rpms/elfutils/devel/elfutils-portability.patch,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- elfutils-portability.patch	31 Dec 2008 22:12:44 -0000	1.39
+++ elfutils-portability.patch	24 Jan 2009 01:16:36 -0000	1.40
@@ -1,6 +1,14 @@
 --- elfutils/backends/ChangeLog
 +++ elfutils/backends/ChangeLog
-@@ -325,6 +325,11 @@
+@@ -1,3 +1,7 @@
++2009-01-23  Roland McGrath  <roland at redhat.com>
++
++	* Makefile.am (libebl_%.so): Use $(LD_AS_NEEDED).
++
+ 2008-10-04  Ulrich Drepper  <drepper at redhat.com>
+ 
+ 	* i386_reloc.def: Fix entries for TLS_GOTDESC, TLS_DESC_CALL, and
+@@ -325,6 +329,11 @@
  	* sparc_init.c: Likewise.
  	* x86_64_init.c: Likewise.
  
@@ -12,7 +20,7 @@
  2005-11-19  Roland McGrath  <roland at redhat.com>
  
  	* ppc64_reloc.def: REL30 -> ADDR30.
-@@ -347,6 +352,9 @@
+@@ -347,6 +356,9 @@
  	* Makefile.am (uninstall): Don't try to remove $(pkgincludedir).
  	(CLEANFILES): Add libebl_$(m).so.
  
@@ -24,6 +32,14 @@
  
 --- elfutils/backends/Makefile.am
 +++ elfutils/backends/Makefile.am
+@@ -1,6 +1,6 @@
+ ## Process this file with automake to create Makefile.in
+ ##
+-## Copyright (C) 2000-2006, 2007, 2008 Red Hat, Inc.
++## Copyright (C) 2000-2006, 2007, 2008, 2009 Red Hat, Inc.
+ ## This file is part of Red Hat elfutils.
+ ##
+ ## Red Hat elfutils is free software; you can redistribute it and/or modify
 @@ -25,12 +25,14 @@
  ## <http://www.openinventionnetwork.com>.
  ##
@@ -48,9 +64,18 @@
  i386_SRCS = i386_init.c i386_symbol.c i386_corenote.c \
  	    i386_retval.c i386_regs.c i386_auxv.c i386_syscall.c
  cpu_i386 = ../libcpu/libcpu_i386.a
+@@ -114,7 +115,7 @@ libebl_%.so: libebl_%_pic.a libebl_%.map
+ 	$(LINK) -shared -o $@ -Wl,--whole-archive,$<\
+ 		$(cpu_$(@:libebl_%.so=%)) -Wl,--no-whole-archive \
+ 		-Wl,--version-script,$(word 2,$^) \
+-		-Wl,-z,defs -Wl,--as-needed $(libelf) $(libdw) $(libmudflap)
++		-Wl,-z,defs $(LD_AS_NEEDED) $(libelf) $(libdw) $(libmudflap)
+ 	$(textrel_check)
+ 
+ # XXX Should not be needed...
 --- elfutils/backends/Makefile.in
 +++ elfutils/backends/Makefile.in
-@@ -155,6 +155,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -156,6 +156,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
  INSTALL_SCRIPT = @INSTALL_SCRIPT@
  INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
  LDFLAGS = @LDFLAGS@
@@ -58,7 +83,7 @@
  LEX = @LEX@
  LEXLIB = @LEXLIB@
  LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-@@ -184,6 +185,7 @@ SHELL = @SHELL@
+@@ -185,6 +186,7 @@ SHELL = @SHELL@
  STRIP = @STRIP@
  USE_NLS = @USE_NLS@
  VERSION = @VERSION@
@@ -66,9 +91,9 @@
  XGETTEXT = @XGETTEXT@
  XGETTEXT_015 = @XGETTEXT_015@
  YACC = @YACC@
-@@ -241,9 +243,9 @@ top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
+@@ -243,9 +245,9 @@ top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
+ zip_LIBS = @zip_LIBS@
  @MUDFLAP_FALSE at AM_CFLAGS = -fpic -Wall -Wshadow -Werror -Wunused \
 - at MUDFLAP_FALSE@	-Wextra -Wformat=2 -std=gnu99
 + at MUDFLAP_FALSE@	$(WEXTRA) -Wformat=2 -std=gnu99
@@ -78,9 +103,31 @@
  INCLUDES = -I$(srcdir) -I$(top_srcdir)/libebl -I$(top_srcdir)/libasm \
  	   -I$(top_srcdir)/libelf -I$(top_srcdir)/libdw \
  	   -I$(top_srcdir)/lib -I..
+@@ -641,7 +643,7 @@ libebl_%.so: libebl_%_pic.a libebl_%.map
+ 	$(LINK) -shared -o $@ -Wl,--whole-archive,$<\
+ 		$(cpu_$(@:libebl_%.so=%)) -Wl,--no-whole-archive \
+ 		-Wl,--version-script,$(word 2,$^) \
+-		-Wl,-z,defs -Wl,--as-needed $(libelf) $(libdw) $(libmudflap)
++		-Wl,-z,defs $(LD_AS_NEEDED) $(libelf) $(libdw) $(libmudflap)
+ 	$(textrel_check)
+ 
+ # XXX Should not be needed...
 --- elfutils/ChangeLog
 +++ elfutils/ChangeLog
-@@ -54,6 +54,10 @@
+@@ -1,3 +1,12 @@
++2009-01-23  Roland McGrath  <roland at redhat.com>
++
++	* configure.ac: Check for __builtin_popcount.
++
++	* configure.ac (zlib check): Check for gzdirect, need zlib >= 1.2.2.3.
++
++	* configure.ac (__thread check): Use AC_LINK_IFELSE, in case of
++	building with compiler support but no working runtime support.
++
+ 2009-01-22  Ulrich Drepper  <drepper at redhat.com>
+ 
+ 	* Makefile.am (rpm): The tarball is now bzip2-compressed.
+@@ -73,6 +82,10 @@
  	* configure.ac: Add dummy automake conditional to get dependencies
  	for non-generic linker right.  See src/Makefile.am.
  
@@ -91,7 +138,7 @@
  2005-11-18  Roland McGrath  <roland at redhat.com>
  
  	* Makefile.am (DISTCHECK_CONFIGURE_FLAGS): New variable.
-@@ -101,6 +105,17 @@
+@@ -120,6 +133,17 @@
  	* Makefile.am (all_SUBDIRS): Add libdwfl.
  	* configure.ac: Write libdwfl/Makefile.
  
@@ -111,7 +158,7 @@
  	* configure.ac [AH_BOTTOM] (INTDECL, _INTDECL): New macros.
 --- elfutils/config/Makefile.in
 +++ elfutils/config/Makefile.in
-@@ -72,6 +72,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -73,6 +73,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
  INSTALL_SCRIPT = @INSTALL_SCRIPT@
  INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
  LDFLAGS = @LDFLAGS@
@@ -119,7 +166,7 @@
  LEX = @LEX@
  LEXLIB = @LEXLIB@
  LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-@@ -101,6 +102,7 @@ SHELL = @SHELL@
+@@ -102,6 +103,7 @@ SHELL = @SHELL@
  STRIP = @STRIP@
  USE_NLS = @USE_NLS@
  VERSION = @VERSION@
@@ -127,9 +174,28 @@
  XGETTEXT = @XGETTEXT@
  XGETTEXT_015 = @XGETTEXT_015@
  YACC = @YACC@
+--- elfutils/config.h.in
++++ elfutils/config.h.in
+@@ -1,5 +1,8 @@
+ /* config.h.in.  Generated from configure.ac by autoheader.  */
+ 
++/* Have __builtin_popcount. */
++#undef HAVE_BUILTIN_POPCOUNT
++
+ /* $libdir subdirectory containing libebl modules. */
+ #undef LIBEBL_SUBDIR
+ 
+@@ -52,4 +55,7 @@
+ /* Define for large files, on AIX-style hosts. */
+ #undef _LARGE_FILES
+ 
++/* Stubbed out if missing compiler support. */
++#undef __thread
++
+ #include <eu-config.h>
 --- elfutils/configure
 +++ elfutils/configure
-@@ -637,6 +637,8 @@ NATIVE_LD_FALSE
+@@ -642,6 +642,8 @@ NATIVE_LD_FALSE
  NATIVE_LD_TRUE
  DATADIRNAME
  LOCALEDIR
@@ -138,38 +204,31 @@
  LEXLIB
  LEX_OUTPUT_ROOT
  LEX
-@@ -4028,6 +4030,89 @@ $as_echo "$as_me: error: gcc with C99 su
+@@ -4041,13 +4043,15 @@ $as_echo "$as_me: error: gcc with C99 su
  fi
  
  
+-{ $as_echo "$as_me:$LINENO: checking for gcc with TLS support" >&5
+-$as_echo_n "checking for gcc with TLS support... " >&6; }
+-if test "${ac_cv_tls+set}" = set; then
 +{ $as_echo "$as_me:$LINENO: checking for -Wextra option to $CC" >&5
 +$as_echo_n "checking for -Wextra option to $CC... " >&6; }
 +if test "${ac_cv_cc_wextra+set}" = set; then
-+  $as_echo_n "(cached) " >&6
-+else
+   $as_echo_n "(cached) " >&6
+ else
+-  cat >conftest.$ac_ext <<_ACEOF
+-__thread int a; int foo (int b) { return a + b; }
 +  old_CFLAGS="$CFLAGS"
 +CFLAGS="$CFLAGS -Wextra"
 +cat >conftest.$ac_ext <<_ACEOF
 +void foo (void) { }
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest.$ac_objext; then
+ _ACEOF
+ rm -f conftest.$ac_objext
+ if { (ac_try="$ac_compile"
+@@ -4067,6 +4071,172 @@ $as_echo "$ac_try_echo") >&5
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
 +  ac_cv_cc_wextra=yes
 +else
 +  $as_echo "$as_me: failed program was:" >&5
@@ -224,16 +283,226 @@
 +
 +
 +
++{ $as_echo "$as_me:$LINENO: checking for __builtin_popcount" >&5
++$as_echo_n "checking for __builtin_popcount... " >&6; }
++if test "${ac_cv_popcount+set}" = set; then
++  $as_echo_n "(cached) " >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++int
++main ()
++{
++exit (__builtin_popcount (127));
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
++$as_echo "$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
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext && {
++	 test "$cross_compiling" = yes ||
++	 $as_test_x conftest$ac_exeext
++       }; then
++  ac_cv_popcount=yes
++else
++  $as_echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
 +
- LOCALEDIR=$datadir
++	ac_cv_popcount=no
++fi
++
++rm -rf conftest.dSYM
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++{ $as_echo "$as_me:$LINENO: result: $ac_cv_popcount" >&5
++$as_echo "$ac_cv_popcount" >&6; }
++if test "x$ac_cv_popcount" = xyes; then
++
++cat >>confdefs.h <<\_ACEOF
++#define HAVE_BUILTIN_POPCOUNT 1
++_ACEOF
++
++fi
++
++
++{ $as_echo "$as_me:$LINENO: checking for __thread support" >&5
++$as_echo_n "checking for __thread support... " >&6; }
++if test "${ac_cv_tls+set}" = set; then
++  $as_echo_n "(cached) " >&6
++else
++  # Use the same flags that we use for our DSOs, so the test is representative.
++# Some old compiler/linker/libc combinations fail some ways and not others.
++save_CFLAGS="$CFLAGS"
++save_LDFLAGS="$LDFLAGS"
++CFLAGS="-fpic $CFLAGS"
++LDFLAGS="-shared -Wl,-z,defs,-z,relro $LDFLAGS"
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#undef __thread
++static __thread int a; int foo (int b) { return a + b; }
++int
++main ()
++{
++exit (foo (0));
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
++$as_echo "$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
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext && {
++	 test "$cross_compiling" = yes ||
++	 $as_test_x conftest$ac_exeext
++       }; then
+   ac_cv_tls=yes
+ else
+   $as_echo "$as_me: failed program was:" >&5
+@@ -4075,14 +4245,27 @@ sed 's/^/| /' conftest.$ac_ext >&5
+ 	ac_cv_tls=no
+ fi
  
- cat >>confdefs.h <<_ACEOF
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -rf conftest.dSYM
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
++      conftest$ac_exeext conftest.$ac_ext
++CFLAGS="$save_CFLAGS"
++LDFLAGS="$save_LDFLAGS"
+ fi
+ { $as_echo "$as_me:$LINENO: result: $ac_cv_tls" >&5
+ $as_echo "$ac_cv_tls" >&6; }
+ if test "x$ac_cv_tls" != xyes; then
+-  { { $as_echo "$as_me:$LINENO: error: gcc with TLS support required" >&5
+-$as_echo "$as_me: error: gcc with TLS support required" >&2;}
++  if test "$use_locks" = yes; then
++  { { $as_echo "$as_me:$LINENO: error: --enable-thread-safety requires __thread support" >&5
++$as_echo "$as_me: error: --enable-thread-safety requires __thread support" >&2;}
+    { (exit 1); exit 1; }; }
++else
++
++cat >>confdefs.h <<\_ACEOF
++#define __thread /* empty: no multi-thread support */
++_ACEOF
++
++fi
++
+ fi
+ 
+ 
+@@ -4673,9 +4856,9 @@ if test "${with_zlib+set}" = set; then
+ fi
+ 
+ if test $with_zlib != no; then
+-  { $as_echo "$as_me:$LINENO: checking for library containing gzdopen" >&5
+-$as_echo_n "checking for library containing gzdopen... " >&6; }
+-if test "${ac_cv_search_gzdopen+set}" = set; then
++  { $as_echo "$as_me:$LINENO: checking for library containing gzdirect" >&5
++$as_echo_n "checking for library containing gzdirect... " >&6; }
++if test "${ac_cv_search_gzdirect+set}" = set; then
+   $as_echo_n "(cached) " >&6
+ else
+   ac_func_search_save_LIBS=$LIBS
+@@ -4692,11 +4875,11 @@ cat >>conftest.$ac_ext <<_ACEOF
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-char gzdopen ();
++char gzdirect ();
+ int
+ main ()
+ {
+-return gzdopen ();
++return gzdirect ();
+   ;
+   return 0;
+ }
+@@ -4729,7 +4912,7 @@ $as_echo "$ac_try_echo") >&5
+ 	 test "$cross_compiling" = yes ||
+ 	 $as_test_x conftest$ac_exeext
+        }; then
+-  ac_cv_search_gzdopen=$ac_res
++  ac_cv_search_gzdirect=$ac_res
+ else
+   $as_echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -4740,21 +4923,21 @@ fi
+ rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext
+-  if test "${ac_cv_search_gzdopen+set}" = set; then
++  if test "${ac_cv_search_gzdirect+set}" = set; then
+   break
+ fi
+ done
+-if test "${ac_cv_search_gzdopen+set}" = set; then
++if test "${ac_cv_search_gzdirect+set}" = set; then
+   :
+ else
+-  ac_cv_search_gzdopen=no
++  ac_cv_search_gzdirect=no
+ fi
+ rm conftest.$ac_ext
+ LIBS=$ac_func_search_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_gzdopen" >&5
+-$as_echo "$ac_cv_search_gzdopen" >&6; }
+-ac_res=$ac_cv_search_gzdopen
++{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_gzdirect" >&5
++$as_echo "$ac_cv_search_gzdirect" >&6; }
++ac_res=$ac_cv_search_gzdirect
+ if test "$ac_res" != no; then
+   test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+   with_zlib=yes
 --- elfutils/configure.ac
 +++ elfutils/configure.ac
-@@ -74,6 +74,34 @@ CFLAGS="$old_CFLAGS"])
+@@ -74,12 +74,58 @@ CFLAGS="$old_CFLAGS"])
  AS_IF([test "x$ac_cv_c99" != xyes],
        AC_MSG_ERROR([gcc with C99 support required]))
  
+-AC_CACHE_CHECK([for gcc with TLS support], ac_cv_tls, [dnl
+-AC_COMPILE_IFELSE([dnl
+-__thread int a; int foo (int b) { return a + b; }],
+-		  ac_cv_tls=yes, ac_cv_tls=no)])
 +AC_CACHE_CHECK([for -Wextra option to $CC], ac_cv_cc_wextra, [dnl
 +old_CFLAGS="$CFLAGS"
 +CFLAGS="$CFLAGS -Wextra"
@@ -261,13 +530,58 @@
 +      [LD_AS_NEEDED=-Wl,--as-needed], [LD_AS_NEEDED=])
 +AC_SUBST(LD_AS_NEEDED)
 +
-+
++AC_CACHE_CHECK([for __builtin_popcount], ac_cv_popcount, [dnl
++AC_LINK_IFELSE([AC_LANG_PROGRAM([], [[exit (__builtin_popcount (127));]])],
++	       ac_cv_popcount=yes, ac_cv_popcount=no)])
++AS_IF([test "x$ac_cv_popcount" = xyes],
++      [AC_DEFINE([HAVE_BUILTIN_POPCOUNT], [1], [Have __builtin_popcount.])])
++
++AC_CACHE_CHECK([for __thread support], ac_cv_tls, [dnl
++# Use the same flags that we use for our DSOs, so the test is representative.
++# Some old compiler/linker/libc combinations fail some ways and not others.
++save_CFLAGS="$CFLAGS"
++save_LDFLAGS="$LDFLAGS"
++CFLAGS="-fpic $CFLAGS"
++LDFLAGS="-shared -Wl,-z,defs,-z,relro $LDFLAGS"
++AC_LINK_IFELSE([dnl
++AC_LANG_PROGRAM([[#undef __thread
++static __thread int a; int foo (int b) { return a + b; }]],
++		[[exit (foo (0));]])],
++	       ac_cv_tls=yes, ac_cv_tls=no)
++CFLAGS="$save_CFLAGS"
++LDFLAGS="$save_LDFLAGS"])
+ AS_IF([test "x$ac_cv_tls" != xyes],
+-      AC_MSG_ERROR([gcc with TLS support required]))
++      [AS_IF([test "$use_locks" = yes],
++	     [AC_MSG_ERROR([--enable-thread-safety requires __thread support])],
++	     [AC_DEFINE([__thread], [/* empty: no multi-thread support */],
++			[Stubbed out if missing compiler support.])])])
+ 
  LOCALEDIR=$datadir
  AC_SUBST(LOCALEDIR)
- AC_DEFINE_UNQUOTED(LOCALEDIR, "$LOCALEDIR")
+@@ -193,7 +239,7 @@ dnl Test for zlib and bzlib, gives ZLIB/
+ dnl conditional and config.h USE_ZLIB/USE_BZLIB #define.
+ save_LIBS="$LIBS"
+ LIBS=
+-eu_ZIPLIB(z,Z,z,gzdopen,gzip)
++eu_ZIPLIB(z,Z,z,gzdirect,gzip)
+ eu_ZIPLIB(bz,BZ,bz2,BZ2_bzdopen,bzip2)
+ zip_LIBS="$LIBS"
+ LIBS="$save_LIBS"
 --- elfutils/lib/ChangeLog
 +++ elfutils/lib/ChangeLog
-@@ -41,6 +41,11 @@
+@@ -1,3 +1,10 @@
++2009-01-23  Roland McGrath  <roland at redhat.com>
++
++	* eu-config.h [! HAVE_BUILTIN_POPCOUNT]
++	(__builtin_popcount): New inline function.
++
++	* eu-config.h: Add multiple inclusion protection.
++
+ 2009-01-17  Ulrich Drepper  <drepper at redhat.com>
+ 
+ 	* system.h (ARGP_PROGRAM_VERSION_HOOK_DEF): Define.
+@@ -52,6 +59,11 @@
  	* Makefile.am (libeu_a_SOURCES): Add it.
  	* system.h: Declare crc32_file.
  
@@ -279,6 +593,36 @@
  2005-04-30  Ulrich Drepper  <drepper at redhat.com>
  
  	* Makefile.am: Use -ffunction-sections for xmalloc.c.
+--- elfutils/lib/eu-config.h
++++ elfutils/lib/eu-config.h
+@@ -46,6 +46,9 @@
+    Network licensing program, please visit www.openinventionnetwork.com
+    <http://www.openinventionnetwork.com>.  */
+ 
++#ifndef EU_CONFIG_H
++#define EU_CONFIG_H	1
++
+ #ifdef USE_LOCKS
+ # include <pthread.h>
+ # include <assert.h>
+@@ -178,3 +181,17 @@ asm (".section predict_data, \"aw\"; .pr
+ 
+ /* This macro is used by the tests conditionalize for standalone building.  */
+ #define ELFUTILS_HEADER(name) <lib##name.h>
++
++#ifndef HAVE_BUILTIN_POPCOUNT
++# define __builtin_popcount hakmem_popcount
++static inline unsigned int __attribute__ ((unused))
++hakmem_popcount (unsigned int x)
++{
++  /* HAKMEM 169 */
++  unsigned int n = x - ((x >> 1) & 033333333333) - ((x >> 2) & 011111111111);
++  return ((n + (n >> 3)) & 030707070707) % 63;
++}
++#endif	/* HAVE_BUILTIN_POPCOUNT */
++
++
++#endif	/* eu-config.h */
 --- elfutils/lib/Makefile.am
 +++ elfutils/lib/Makefile.am
 @@ -25,12 +25,13 @@
@@ -298,7 +642,7 @@
  noinst_LIBRARIES = libeu.a
 --- elfutils/lib/Makefile.in
 +++ elfutils/lib/Makefile.in
-@@ -93,6 +93,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -94,6 +94,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
  INSTALL_SCRIPT = @INSTALL_SCRIPT@
  INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
  LDFLAGS = @LDFLAGS@
@@ -306,7 +650,7 @@
  LEX = @LEX@
  LEXLIB = @LEXLIB@
  LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-@@ -122,6 +123,7 @@ SHELL = @SHELL@
+@@ -123,6 +124,7 @@ SHELL = @SHELL@
  STRIP = @STRIP@
  USE_NLS = @USE_NLS@
  VERSION = @VERSION@
@@ -314,9 +658,9 @@
  XGETTEXT = @XGETTEXT@
  XGETTEXT_015 = @XGETTEXT_015@
  YACC = @YACC@
-@@ -179,9 +181,9 @@ top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
+@@ -181,9 +183,9 @@ top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
+ zip_LIBS = @zip_LIBS@
  @MUDFLAP_FALSE at AM_CFLAGS = -fpic -Wall -Wshadow -Werror -Wunused \
 - at MUDFLAP_FALSE@	-Wextra $($(*F)_CFLAGS)
 + at MUDFLAP_FALSE@	$(WEXTRA) $($(*F)_CFLAGS)
@@ -328,7 +672,7 @@
  libeu_a_SOURCES = xstrndup.c xmalloc.c next_prime.c \
 --- elfutils/libasm/ChangeLog
 +++ elfutils/libasm/ChangeLog
-@@ -58,6 +58,11 @@
+@@ -63,6 +63,11 @@
  	* asm_error.c: Add new error ASM_E_IOERROR.
  	* libasmP.h: Add ASM_E_IOERROR definition.
  
@@ -359,7 +703,7 @@
  	   -I$(top_srcdir)/lib
 --- elfutils/libasm/Makefile.in
 +++ elfutils/libasm/Makefile.in
-@@ -127,6 +127,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -128,6 +128,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
  INSTALL_SCRIPT = @INSTALL_SCRIPT@
  INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
  LDFLAGS = @LDFLAGS@
@@ -367,7 +711,7 @@
  LEX = @LEX@
  LEXLIB = @LEXLIB@
  LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-@@ -156,6 +157,7 @@ SHELL = @SHELL@
+@@ -157,6 +158,7 @@ SHELL = @SHELL@
  STRIP = @STRIP@
  USE_NLS = @USE_NLS@
  VERSION = 1
@@ -375,9 +719,9 @@
  XGETTEXT = @XGETTEXT@
  XGETTEXT_015 = @XGETTEXT_015@
  YACC = @YACC@
-@@ -213,9 +215,9 @@ top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
+@@ -215,9 +217,9 @@ top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
+ zip_LIBS = @zip_LIBS@
  @MUDFLAP_FALSE at AM_CFLAGS = -std=gnu99 -Wall -Wshadow -Werror -Wunused \
 - at MUDFLAP_FALSE@	-Wextra -Wformat=2
 + at MUDFLAP_FALSE@	$(WEXTRA) -Wformat=2
@@ -389,7 +733,19 @@
  	   -I$(top_srcdir)/lib
 --- elfutils/libcpu/ChangeLog
 +++ elfutils/libcpu/ChangeLog
-@@ -307,6 +307,11 @@
+@@ -1,3 +1,11 @@
++2009-01-23  Roland McGrath  <roland at redhat.com>
++
++	* i386_disasm.c (i386_disasm): Add abort after assert-constant for old
++	compilers that don't realize it's noreturn.
++
++	* Makefile.am (i386_parse_CFLAGS): Use quotes around command
++	substitution that can produce leading whitespace.
++
+ 2009-01-01  Ulrich Drepper  <drepper at redhat.com>
+ 
+ 	* i386_parse.y (instrtable_out): Optimize match_data table by not
+@@ -324,6 +332,11 @@
  	* defs/i386.doc: New file.
  	* defs/x86_64: New file.
  
@@ -401,8 +757,26 @@
  2005-02-15  Ulrich Drepper  <drepper at redhat.com>
  
  	* Makefile (AM_CFLAGS): Add -Wunused -Wextra -Wformat=2.
+--- elfutils/libcpu/i386_disasm.c
++++ elfutils/libcpu/i386_disasm.c
+@@ -791,6 +791,7 @@ i386_disasm (const uint8_t **startp, con
+ 
+ 			default:
+ 			  assert (! "INVALID not handled");
++			  abort ();
+ 			}
+ 		    }
+ 		  else
 --- elfutils/libcpu/Makefile.am
 +++ elfutils/libcpu/Makefile.am
+@@ -1,6 +1,6 @@
+ ## Process this file with automake to create Makefile.in
+ ##
+-## Copyright (C) 2002, 2004, 2005, 2007, 2008 Red Hat, Inc.
++## Copyright (C) 2002, 2004, 2005, 2007, 2008, 2009 Red Hat, Inc.
+ ## This file is part of Red Hat elfutils.
+ ##
+ ## Red Hat elfutils is free software; you can redistribute it and/or modify
 @@ -30,7 +30,8 @@ AM_CFLAGS = -fmudflap
  else
  AM_CFLAGS =
@@ -413,9 +787,18 @@
  	     $($(*F)_CFLAGS) \
  	     $(if $($(*F)_no_Werror),,-Werror)
  INCLUDES = -I$(srcdir) -I$(srcdir)/../lib -I$(srcdir)/../libelf \
+@@ -70,7 +71,7 @@ libeu = ../lib/libeu.a
+ 
+ i386_lex_CFLAGS = -Wno-unused-label -Wno-unused-function -Wno-sign-compare
+ i386_parse.o: i386_parse.c i386.mnemonics
+-i386_parse_CFLAGS = -DNMNES=$$(wc -l < i386.mnemonics)
++i386_parse_CFLAGS = -DNMNES="`wc -l < i386.mnemonics`"
+ i386_lex.o: i386_parse.h
+ i386_gendis_LDADD = $(libeu) -lm $(libmudflap)
+ 
 --- elfutils/libcpu/Makefile.in
 +++ elfutils/libcpu/Makefile.in
-@@ -109,6 +109,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -110,6 +110,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
  INSTALL_SCRIPT = @INSTALL_SCRIPT@
  INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
  LDFLAGS = @LDFLAGS@
@@ -423,7 +806,7 @@
  LEX = @LEX@
  LEXLIB = @LEXLIB@
  LEX_OUTPUT_ROOT = lex.$(<F:lex.l=)
-@@ -138,6 +139,7 @@ SHELL = @SHELL@
+@@ -139,6 +140,7 @@ SHELL = @SHELL@
  STRIP = @STRIP@
  USE_NLS = @USE_NLS@
  VERSION = @VERSION@
@@ -431,10 +814,10 @@
  XGETTEXT = @XGETTEXT@
  XGETTEXT_015 = @XGETTEXT_015@
  YACC = @YACC@
-@@ -194,10 +196,10 @@ target_alias = @target_alias@
- top_build_prefix = @top_build_prefix@
+@@ -196,10 +198,10 @@ top_build_prefix = @top_build_prefix@
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
+ zip_LIBS = @zip_LIBS@
 - at MUDFLAP_FALSE@AM_CFLAGS = -Wall -Wshadow -Wunused -Wextra -std=gnu99 \
 - at MUDFLAP_FALSE@	-fpic $($(*F)_CFLAGS) $(if \
 + at MUDFLAP_FALSE@AM_CFLAGS = -Wall -Wshadow -Wunused $(WEXTRA) \
@@ -445,9 +828,27 @@
  @MUDFLAP_TRUE@	-std=gnu99 -fpic $($(*F)_CFLAGS) $(if \
  @MUDFLAP_TRUE@	$($(*F)_no_Werror),,-Werror)
  INCLUDES = -I$(srcdir) -I$(srcdir)/../lib -I$(srcdir)/../libelf \
+@@ -215,7 +217,7 @@ i386_gendis_SOURCES = i386_gendis.c i386
+ i386_lex_no_Werror = yes
+ libeu = ../lib/libeu.a
+ i386_lex_CFLAGS = -Wno-unused-label -Wno-unused-function -Wno-sign-compare
+-i386_parse_CFLAGS = -DNMNES=$$(wc -l < i386.mnemonics)
++i386_parse_CFLAGS = -DNMNES="`wc -l < i386.mnemonics`"
+ i386_gendis_LDADD = $(libeu) -lm $(libmudflap)
+ noinst_HEADERS = memory-access.h i386_parse.h i386_data.h
+ EXTRA_DIST = defs/i386
 --- elfutils/libdw/ChangeLog
 +++ elfutils/libdw/ChangeLog
-@@ -495,6 +495,11 @@
+@@ -1,3 +1,8 @@
++2009-01-23  Roland McGrath  <roland at redhat.com>
++
++	* Makefile.am ($(srcdir)/known-dwarf.h): Target renamed back.
++	Put these rules under if MAINTAINER_MODE.
++
+ 2009-01-22  Roland McGrath  <roland at redhat.com>
+ 
+ 	* dwarf.h: Add DW_OP_GNU_encoded_addr.
+@@ -542,6 +547,11 @@
  
  2005-05-31  Roland McGrath  <roland at redhat.com>
  
@@ -478,9 +879,26 @@
  INCLUDES = -I. -I$(srcdir) -I$(srcdir)/../libelf -I.. -I$(srcdir)/../lib
  VERSION = 1
  
+@@ -85,11 +86,13 @@ libdw_a_SOURCES = dwarf_begin.c dwarf_be
+ 		  libdw_visit_scopes.c \
+ 		  dwarf_entry_breakpoints.c
+ 
+-BUILT_SOURCES = known-dwarf.h
+-CLEANFILES = known-dwarf.h
+-known-dwarf.h: $(top_srcdir)/config/known-dwarf.awk $(srcdir)/dwarf.h
++if MAINTAINER_MODE
++BUILT_SOURCES = $(srcdir)/known-dwarf.h
++MAINTAINERCLEANFILES = $(srcdir)/known-dwarf.h
++$(srcdir)/known-dwarf.h: $(top_srcdir)/config/known-dwarf.awk $(srcdir)/dwarf.h
+ 	$(AWK) -f $^ > $@.new
+ 	mv -f $@.new $@
++endif
+ 
+ if !MUDFLAP
+ libdw_pic_a_SOURCES =
 --- elfutils/libdw/Makefile.in
 +++ elfutils/libdw/Makefile.in
-@@ -164,6 +164,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -165,6 +165,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
  INSTALL_SCRIPT = @INSTALL_SCRIPT@
  INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
  LDFLAGS = @LDFLAGS@
@@ -488,7 +906,7 @@
  LEX = @LEX@
  LEXLIB = @LEXLIB@
  LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-@@ -193,6 +194,7 @@ SHELL = @SHELL@
+@@ -194,6 +195,7 @@ SHELL = @SHELL@
  STRIP = @STRIP@
  USE_NLS = @USE_NLS@
  VERSION = 1
@@ -496,9 +914,9 @@
  XGETTEXT = @XGETTEXT@
  XGETTEXT_015 = @XGETTEXT_015@
  YACC = @YACC@
-@@ -250,9 +252,10 @@ top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
+@@ -252,9 +254,10 @@ top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
+ zip_LIBS = @zip_LIBS@
  @MUDFLAP_FALSE at AM_CFLAGS = $(am__append_1) -Wall -Werror -Wshadow \
 - at MUDFLAP_FALSE@	-Wunused -Wformat=2 -Wextra -std=gnu99
 + at MUDFLAP_FALSE@	-Wunused -Wformat=2 $(WEXTRA) -std=gnu99
@@ -509,9 +927,49 @@
  INCLUDES = -I. -I$(srcdir) -I$(srcdir)/../libelf -I.. -I$(srcdir)/../lib
  COMPILE.os = $(filter-out -fprofile-arcs, $(filter-out -ftest-coverage, \
  						       $(COMPILE)))
+@@ -299,8 +302,8 @@ libdw_a_SOURCES = dwarf_begin.c dwarf_be
+ 		  libdw_visit_scopes.c \
+ 		  dwarf_entry_breakpoints.c
+ 
+-BUILT_SOURCES = known-dwarf.h
+-CLEANFILES = known-dwarf.h
++ at MAINTAINER_MODE_TRUE@BUILT_SOURCES = $(srcdir)/known-dwarf.h
++ at MAINTAINER_MODE_TRUE@MAINTAINERCLEANFILES = $(srcdir)/known-dwarf.h
+ @MUDFLAP_FALSE at libdw_pic_a_SOURCES = 
+ @MUDFLAP_FALSE at am_libdw_pic_a_OBJECTS = $(libdw_a_SOURCES:.c=.os)
+ @MUDFLAP_FALSE at libdw_so_SOURCES = 
+@@ -635,7 +638,6 @@ mostlyclean-generic:
+ 	-test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)
+ 
+ clean-generic:
+-	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+ 
+ distclean-generic:
+ 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+@@ -644,6 +646,7 @@ maintainer-clean-generic:
+ 	@echo "This command is intended for maintainers to use"
+ 	@echo "it deletes files that may require special tools to rebuild."
+ 	-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
++	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
+ clean: clean-am
+ 
+ clean-am: clean-generic clean-libLIBRARIES clean-noinstLIBRARIES \
+@@ -720,9 +723,9 @@ uninstall-am: uninstall-includeHEADERS u
+ 	ps ps-am tags uninstall uninstall-am uninstall-includeHEADERS \
+ 	uninstall-libLIBRARIES uninstall-pkgincludeHEADERS
+ 
+-known-dwarf.h: $(top_srcdir)/config/known-dwarf.awk $(srcdir)/dwarf.h
+-	$(AWK) -f $^ > $@.new
+-	mv -f $@.new $@
++ at MAINTAINER_MODE_TRUE@$(srcdir)/known-dwarf.h: $(top_srcdir)/config/known-dwarf.awk $(srcdir)/dwarf.h
++ at MAINTAINER_MODE_TRUE@	$(AWK) -f $^ > $@.new
++ at MAINTAINER_MODE_TRUE@	mv -f $@.new $@
+ @MUDFLAP_FALSE at libdw.so: $(srcdir)/libdw.map libdw_pic.a \
+ @MUDFLAP_FALSE@	  ../libdwfl/libdwfl_pic.a ../libebl/libebl.a \
+ @MUDFLAP_FALSE@	  ../libelf/libelf.so
 --- elfutils/libdwfl/ChangeLog
 +++ elfutils/libdwfl/ChangeLog
-@@ -936,6 +936,11 @@
+@@ -987,6 +987,11 @@
  
  2005-07-21  Roland McGrath  <roland at redhat.com>
  
@@ -542,7 +1000,7 @@
  VERSION = 1
 --- elfutils/libdwfl/Makefile.in
 +++ elfutils/libdwfl/Makefile.in
-@@ -131,6 +131,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -155,6 +155,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
  INSTALL_SCRIPT = @INSTALL_SCRIPT@
  INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
  LDFLAGS = @LDFLAGS@
@@ -550,7 +1008,7 @@
  LEX = @LEX@
  LEXLIB = @LEXLIB@
  LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-@@ -160,6 +161,7 @@ SHELL = @SHELL@
+@@ -184,6 +185,7 @@ SHELL = @SHELL@
  STRIP = @STRIP@
  USE_NLS = @USE_NLS@
  VERSION = 1
@@ -558,9 +1016,9 @@
  XGETTEXT = @XGETTEXT@
  XGETTEXT_015 = @XGETTEXT_015@
  YACC = @YACC@
-@@ -217,9 +219,9 @@ top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
+@@ -242,9 +244,9 @@ top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
+ zip_LIBS = @zip_LIBS@
  @MUDFLAP_FALSE at AM_CFLAGS = -Wall -Werror -Wshadow -Wunused -Wformat=2 \
 - at MUDFLAP_FALSE@	-Wextra -std=gnu99
 + at MUDFLAP_FALSE@	$(WEXTRA) -std=gnu99
@@ -603,7 +1061,7 @@
  INCLUDES = -I$(srcdir) -I$(top_srcdir)/libelf -I$(top_srcdir)/libdw \
 --- elfutils/libebl/Makefile.in
 +++ elfutils/libebl/Makefile.in
-@@ -123,6 +123,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -124,6 +124,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
  INSTALL_SCRIPT = @INSTALL_SCRIPT@
  INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
  LDFLAGS = @LDFLAGS@
@@ -611,7 +1069,7 @@
  LEX = @LEX@
  LEXLIB = @LEXLIB@
  LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-@@ -152,6 +153,7 @@ SHELL = @SHELL@
+@@ -153,6 +154,7 @@ SHELL = @SHELL@
  STRIP = @STRIP@
  USE_NLS = @USE_NLS@
  VERSION = 1
@@ -619,9 +1077,9 @@
  XGETTEXT = @XGETTEXT@
  XGETTEXT_015 = @XGETTEXT_015@
  YACC = @YACC@
-@@ -209,9 +211,9 @@ top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
+@@ -211,9 +213,9 @@ top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
+ zip_LIBS = @zip_LIBS@
  @MUDFLAP_FALSE at AM_CFLAGS = -fpic -Wall -Wshadow -Werror -Wunused \
 - at MUDFLAP_FALSE@	-Wextra -Wformat=2 -std=gnu99
 + at MUDFLAP_FALSE@	$(WEXTRA) -Wformat=2 -std=gnu99
@@ -633,18 +1091,18 @@
  
 --- elfutils/libelf/ChangeLog
 +++ elfutils/libelf/ChangeLog
-@@ -477,6 +477,11 @@
- 	If section content hasn't been read yet, do it before looking for the
- 	block size.  If no section data present, infer size of section header.
+@@ -515,6 +515,11 @@
+ 
+ 	* elf.h: Update from glibc.
  
 +2005-05-31  Roland McGrath  <roland at redhat.com>
 +
 +	* Makefile.am (WEXTRA): New variable, substituted by configure.
 +	(AM_CFLAGS): Use it in place of -Wextra.
 +
- 2005-05-11  Ulrich Drepper  <drepper at redhat.com>
+ 2005-05-08  Roland McGrath  <roland at redhat.com>
  
- 	* elf.h: Update again.
+ 	* elf_begin.c (read_file) [_MUDFLAP]: Don't use mmap for now.
 --- elfutils/libelf/common.h
 +++ elfutils/libelf/common.h
 @@ -160,7 +160,7 @@ libelf_release_all (Elf *elf)
@@ -686,7 +1144,7 @@
  GCC_INCLUDE = -I$(shell $(CC) -print-file-name=include)
 --- elfutils/libelf/Makefile.in
 +++ elfutils/libelf/Makefile.in
-@@ -171,6 +171,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -172,6 +172,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
  INSTALL_SCRIPT = @INSTALL_SCRIPT@
  INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
  LDFLAGS = @LDFLAGS@
@@ -694,7 +1152,7 @@
  LEX = @LEX@
  LEXLIB = @LEXLIB@
  LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-@@ -200,6 +201,7 @@ SHELL = @SHELL@
+@@ -201,6 +202,7 @@ SHELL = @SHELL@
  STRIP = @STRIP@
  USE_NLS = @USE_NLS@
  VERSION = 1
@@ -702,9 +1160,9 @@
  XGETTEXT = @XGETTEXT@
  XGETTEXT_015 = @XGETTEXT_015@
  YACC = @YACC@
-@@ -257,10 +259,10 @@ top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
+@@ -259,10 +261,10 @@ top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
+ zip_LIBS = @zip_LIBS@
  @MUDFLAP_FALSE at AM_CFLAGS = $(am__append_1) -Wall -Wshadow -Werror \
 - at MUDFLAP_FALSE@	-Wunused -Wextra -Wformat=2 -std=gnu99 \
 + at MUDFLAP_FALSE@	-Wunused $(WEXTRA) -Wformat=2 -std=gnu99 \
@@ -717,7 +1175,7 @@
  GCC_INCLUDE = -I$(shell $(CC) -print-file-name=include)
 --- elfutils/m4/Makefile.in
 +++ elfutils/m4/Makefile.in
-@@ -71,6 +71,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -72,6 +72,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
  INSTALL_SCRIPT = @INSTALL_SCRIPT@
  INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
  LDFLAGS = @LDFLAGS@
@@ -725,7 +1183,7 @@
  LEX = @LEX@
  LEXLIB = @LEXLIB@
  LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-@@ -100,6 +101,7 @@ SHELL = @SHELL@
+@@ -101,6 +102,7 @@ SHELL = @SHELL@
  STRIP = @STRIP@
  USE_NLS = @USE_NLS@
  VERSION = @VERSION@
@@ -735,7 +1193,7 @@
  YACC = @YACC@
 --- elfutils/Makefile.in
 +++ elfutils/Makefile.in
-@@ -109,6 +109,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -110,6 +110,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
  INSTALL_SCRIPT = @INSTALL_SCRIPT@
  INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
  LDFLAGS = @LDFLAGS@
@@ -743,7 +1201,7 @@
  LEX = @LEX@
  LEXLIB = @LEXLIB@
  LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-@@ -138,6 +139,7 @@ SHELL = @SHELL@
+@@ -139,6 +140,7 @@ SHELL = @SHELL@
  STRIP = @STRIP@
  USE_NLS = @USE_NLS@
  VERSION = @VERSION@
@@ -751,9 +1209,38 @@
  XGETTEXT = @XGETTEXT@
  XGETTEXT_015 = @XGETTEXT_015@
  YACC = @YACC@
+--- elfutils/src/addr2line.c
++++ elfutils/src/addr2line.c
+@@ -376,7 +376,7 @@ handle_address (const char *string, Dwfl
+       bool parsed = false;
+       int n;
+       char *name = NULL;
+-      if (sscanf (string, "(%m[^)])%" PRIiMAX "%n", &name, &addr, &n) == 2
++      if (sscanf (string, "(%a[^)])%" PRIiMAX "%n", &name, &addr, &n) == 2
+ 	  && string[n] == '\0')
+ 	{
+ 	  /* It was (section)+offset.  This makes sense if there is
+@@ -417,7 +417,7 @@ handle_address (const char *string, Dwfl
+ 		}
+ 	    }
+ 	}
+-      else if (sscanf (string, "%m[^-+]%" PRIiMAX "%n", &name, &addr, &n) == 2
++      else if (sscanf (string, "%a[^-+]%" PRIiMAX "%n", &name, &addr, &n) == 2
+ 	       && string[n] == '\0')
+ 	{
+ 	  /* It was symbol+offset.  */
 --- elfutils/src/ChangeLog
 +++ elfutils/src/ChangeLog
-@@ -76,6 +76,11 @@
+@@ -12,6 +12,8 @@
+ 	* readelf.c (print_debug_frame_section): Use t instead of j formats
+ 	for ptrdiff_t OFFSET.
+ 
++	* addr2line.c (handle_address): Use %a instead of %m for compatibility.
++
+ 2009-01-21  Ulrich Drepper  <drepper at redhat.com>
+ 
+ 	* elflint.c (check_program_header): Fix typo in .eh_frame_hdr section
+@@ -195,6 +197,11 @@
  	that matches its PT_LOAD's p_flags &~ PF_W.  On sparc, PF_X really
  	is valid in RELRO.
  
@@ -765,7 +1252,7 @@
  2008-02-29  Roland McGrath  <roland at redhat.com>
  
  	* readelf.c (print_attributes): Add a cast.
-@@ -327,6 +332,8 @@
+@@ -446,6 +453,8 @@
  
  	* readelf.c (hex_dump): Fix rounding error in whitespace calculation.
  
@@ -774,7 +1261,7 @@
  2007-10-15  Roland McGrath  <roland at redhat.com>
  
  	* make-debug-archive.in: New file.
-@@ -766,6 +773,10 @@
+@@ -885,6 +894,10 @@
  	* elflint.c (valid_e_machine): Add EM_ALPHA.
  	Reported by Christian Aichinger <Greek0 at gmx.net>.
  
@@ -785,7 +1272,7 @@
  2006-08-08  Ulrich Drepper  <drepper at redhat.com>
  
  	* elflint.c (check_dynamic): Don't require DT_HASH for DT_SYMTAB.
-@@ -842,6 +853,10 @@
+@@ -961,6 +974,10 @@
  	* Makefile.am: Add hacks to create dependency files for non-generic
  	linker.
  
@@ -796,7 +1283,7 @@
  2006-06-12  Ulrich Drepper  <drepper at redhat.com>
  
  	* ldgeneric.c (ld_generic_generate_sections): Don't create .interp
-@@ -1190,6 +1205,11 @@
+@@ -1309,6 +1326,11 @@
  	* readelf.c (print_debug_loc_section): Fix indentation for larger
  	address size.
  
@@ -810,7 +1297,7 @@
  	* readelf.c (print_debug_line_section): Print section offset of each
 --- elfutils/src/findtextrel.c
 +++ elfutils/src/findtextrel.c
-@@ -488,7 +488,11 @@ ptrcompare (const void *p1, const void *
+@@ -490,7 +490,11 @@ ptrcompare (const void *p1, const void *
  
  
  static void
@@ -839,10 +1326,10 @@
  	     $(if $($(*F)_no_Werror),,-Werror) \
 -	     $(if $($(*F)_no_Wunused),,-Wunused -Wextra) \
 +	     $(if $($(*F)_no_Wunused),,-Wunused $(WEXTRA)) \
- 	     $(if $($(*F)_no_Wformat),,-Wformat=2) $(CFLAGS_$(*F))
+ 	     $(if $($(*F)_no_Wformat),-Wno-format,-Wformat=2) $(CFLAGS_$(*F))
  
  INCLUDES = -I$(srcdir) -I$(srcdir)/../libelf -I$(srcdir)/../libebl \
-@@ -111,6 +112,9 @@ strings_no_Wformat = yes
+@@ -112,6 +113,9 @@ addr2line_no_Wformat = yes
  # XXX While the file is not finished, don't warn about this
  ldgeneric_no_Wunused = yes
  
@@ -854,7 +1341,7 @@
  size_LDADD = $(libelf) $(libeu) $(libmudflap)
 --- elfutils/src/Makefile.in
 +++ elfutils/src/Makefile.in
-@@ -201,6 +201,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -202,6 +202,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
  INSTALL_SCRIPT = @INSTALL_SCRIPT@
  INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
  LDFLAGS = @LDFLAGS@
@@ -862,7 +1349,7 @@
  LEX = @LEX@
  LEXLIB = @LEXLIB@
  LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-@@ -230,6 +231,7 @@ SHELL = @SHELL@
+@@ -231,6 +232,7 @@ SHELL = @SHELL@
  STRIP = @STRIP@
  USE_NLS = @USE_NLS@
  VERSION = @VERSION@
@@ -870,24 +1357,24 @@
  XGETTEXT = @XGETTEXT@
  XGETTEXT_015 = @XGETTEXT_015@
  YACC = @YACC@ -d
-@@ -289,13 +291,13 @@ top_srcdir = @top_srcdir@
+@@ -291,13 +293,13 @@ zip_LIBS = @zip_LIBS@
  @MUDFLAP_FALSE at AM_CFLAGS = -Wall -Wshadow -std=gnu99 \
  @MUDFLAP_FALSE@	$(native_ld_cflags) $(if \
  @MUDFLAP_FALSE@	$($(*F)_no_Werror),,-Werror) $(if \
 - at MUDFLAP_FALSE@	$($(*F)_no_Wunused),,-Wunused -Wextra) $(if \
 + at MUDFLAP_FALSE@	$($(*F)_no_Wunused),,-Wunused $(WEXTRA)) $(if \
- @MUDFLAP_FALSE@	$($(*F)_no_Wformat),,-Wformat=2) \
+ @MUDFLAP_FALSE@	$($(*F)_no_Wformat),-Wno-format,-Wformat=2) \
  @MUDFLAP_FALSE@	$(CFLAGS_$(*F))
  @MUDFLAP_TRUE at AM_CFLAGS = -fmudflap -Wall -Wshadow -std=gnu99 \
  @MUDFLAP_TRUE@	$(native_ld_cflags) $(if \
  @MUDFLAP_TRUE@	$($(*F)_no_Werror),,-Werror) $(if \
 - at MUDFLAP_TRUE@	$($(*F)_no_Wunused),,-Wunused -Wextra) $(if \
 + at MUDFLAP_TRUE@	$($(*F)_no_Wunused),,-Wunused $(WEXTRA)) $(if \
- @MUDFLAP_TRUE@	$($(*F)_no_Wformat),,-Wformat=2) $(CFLAGS_$(*F))
+ @MUDFLAP_TRUE@	$($(*F)_no_Wformat),-Wno-format,-Wformat=2) \
+ @MUDFLAP_TRUE@	$(CFLAGS_$(*F))
  INCLUDES = -I$(srcdir) -I$(srcdir)/../libelf -I$(srcdir)/../libebl \
- 	   -I$(srcdir)/../libdw -I$(srcdir)/../libdwfl \
-@@ -339,6 +341,9 @@ size_no_Wformat = yes
- strings_no_Wformat = yes
+@@ -343,6 +345,9 @@ strings_no_Wformat = yes
+ addr2line_no_Wformat = yes
  # XXX While the file is not finished, don't warn about this
  ldgeneric_no_Wunused = yes
 +
@@ -898,7 +1385,7 @@
  size_LDADD = $(libelf) $(libeu) $(libmudflap)
 --- elfutils/src/readelf.c
 +++ elfutils/src/readelf.c
-@@ -6424,7 +6424,7 @@ dump_archive_index (Elf *elf, const char
+@@ -7385,7 +7385,7 @@ dump_archive_index (Elf *elf, const char
  	  if (unlikely (elf_rand (elf, as_off) == 0)
  	      || unlikely ((subelf = elf_begin (-1, ELF_C_READ_MMAP, elf))
  			   == NULL))
@@ -988,7 +1475,7 @@
  cannot set access and modification date of '%s'"), fname);
 --- elfutils/tests/ChangeLog
 +++ elfutils/tests/ChangeLog
-@@ -84,6 +84,8 @@
+@@ -95,6 +95,8 @@
  
  2008-01-21  Roland McGrath  <roland at redhat.com>
  
@@ -997,7 +1484,7 @@
  	* testfile45.S.bz2: Add tests for cltq, cqto.
  	* testfile45.expect.bz2: Adjust.
  
-@@ -792,6 +794,11 @@
+@@ -803,6 +805,11 @@
  	* Makefile.am (TESTS): Add run-elflint-test.sh.
  	(EXTRA_DIST): Add run-elflint-test.sh and testfile18.bz2.
  
@@ -1040,7 +1527,7 @@
  endif
 --- elfutils/tests/Makefile.in
 +++ elfutils/tests/Makefile.in
-@@ -341,6 +341,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -342,6 +342,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
  INSTALL_SCRIPT = @INSTALL_SCRIPT@
  INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
  LDFLAGS = @LDFLAGS@
@@ -1048,7 +1535,7 @@
  LEX = @LEX@
  LEXLIB = @LEXLIB@
  LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-@@ -370,6 +371,7 @@ SHELL = @SHELL@
+@@ -371,6 +372,7 @@ SHELL = @SHELL@
  STRIP = @STRIP@
  USE_NLS = @USE_NLS@
  VERSION = @VERSION@
@@ -1056,10 +1543,10 @@
  XGETTEXT = @XGETTEXT@
  XGETTEXT_015 = @XGETTEXT_015@
  YACC = @YACC@
-@@ -426,10 +428,10 @@ target_alias = @target_alias@
- top_build_prefix = @top_build_prefix@
+@@ -428,10 +430,10 @@ top_build_prefix = @top_build_prefix@
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
+ zip_LIBS = @zip_LIBS@
 - at MUDFLAP_FALSE@AM_CFLAGS = -Wall -Werror -Wextra -std=gnu99 \
 + at MUDFLAP_FALSE@AM_CFLAGS = -Wall -Werror $(WEXTRA) -std=gnu99 \
  @MUDFLAP_FALSE@	    $(if $($(*F)_no_Wformat),-Wno-format,-Wformat=2)

elfutils-robustify.patch:

Index: elfutils-robustify.patch
===================================================================
RCS file: /cvs/pkgs/rpms/elfutils/devel/elfutils-robustify.patch,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- elfutils-robustify.patch	27 Aug 2008 08:19:15 -0000	1.12
+++ elfutils-robustify.patch	24 Jan 2009 01:16:36 -0000	1.13
@@ -1,72 +1,57 @@
-src/
-2005-06-09  Roland McGrath  <roland at redhat.com>
-
-	* readelf.c (handle_dynamic, handle_symtab): Check for bogus sh_link.
-	(handle_verneed, handle_verdef, handle_versym, handle_hash): Likewise.
-	(handle_scngrp): Check for bogus sh_info.
-
-	* strip.c (handle_elf): Check for bogus values in sh_link, sh_info,
-	st_shndx, e_shstrndx, and SHT_GROUP or SHT_SYMTAB_SHNDX data.
-	Don't use assert on input values, instead bail with "illformed" error.
-
-2005-05-17  Jakub Jelinek  <jakub at redhat.com>
-
-libelf/
-	* elf32_getphdr.c (elfw2(LIBELFBITS,getphdr)): Check if program header
-	table fits into object's bounds.
-	* elf_getshstrndx.c (elf_getshstrndx): Add elf->start_offset to
-	elf->map_address.  Check if first section header fits into object's
-	bounds.
-	* elf32_getshdr.c (elfw2(LIBELFBITS,getshdr)):
-	Check if section header table fits into object's bounds.
-	* elf_begin.c (get_shnum): Ensure section headers fits into
-	object's bounds.
-	(file_read_elf): Make sure scncnt is small enough to allocate both
-	ElfXX_Shdr and Elf_Scn array.  Make sure section and program header
-	tables fit into object's bounds.  Avoid memory leak on failure.
-
-src/
-	* elflint.c (check_hash): Don't check entries beyond end of section.
-	(check_note): Don't crash if gelf_rawchunk fails.
-	(section_name): Return <invalid> if gelf_getshdr returns NULL.
-
-2005-05-14  Jakub Jelinek  <jakub at redhat.com>
-
-libelf/
-	* libelfP.h (INVALID_NDX): Define.
-	* gelf_getdyn.c (gelf_getdyn): Use it.  Remove ndx < 0 test if any.
-	* gelf_getlib.c (gelf_getlib): Likewise.
-	* gelf_getmove.c (gelf_getmove): Likewise.
-	* gelf_getrel.c (gelf_getrel): Likewise.
-	* gelf_getrela.c (gelf_getrela): Likewise.
-	* gelf_getsym.c (gelf_getsym): Likewise.
-	* gelf_getsyminfo.c (gelf_getsyminfo): Likewise.
-	* gelf_getsymshndx.c (gelf_getsymshndx): Likewise.
-	* gelf_getversym.c (gelf_getversym): Likewise.
-	* gelf_update_dyn.c (gelf_update_dyn): Likewise.
-	* gelf_update_lib.c (gelf_update_lib): Likewise.
-	* gelf_update_move.c (gelf_update_move): Likewise.
-	* gelf_update_rel.c (gelf_update_rel): Likewise.
-	* gelf_update_rela.c (gelf_update_rela): Likewise.
-	* gelf_update_sym.c (gelf_update_sym): Likewise.
-	* gelf_update_syminfo.c (gelf_update_syminfo): Likewise.
-	* gelf_update_symshndx.c (gelf_update_symshndx): Likewise.
-	* gelf_update_versym.c (gelf_update_versym): Likewise.
-	* elf_newscn.c (elf_newscn): Check for overflow.
-	* elf32_updatefile.c (__elfw2(LIBELFBITS,updatemmap)): Likewise.
-	(__elfw2(LIBELFBITS,updatefile)): Likewise.
-	* elf_begin.c (file_read_elf): Likewise.
-	* elf32_newphdr.c (elfw2(LIBELFBITS,newphdr)): Likewise.
-	* elf_getarsym.c (elf_getarsym): Likewise.
-	* elf32_getshdr.c (elfw2(LIBELFBITS,getshdr)): Likewise.
-src/
-	* elflint.c (section_name): Return "<invalid>" instead of
-	crashing on invalid section name.
-	(check_symtab, is_rel_dyn, check_rela, check_rel, check_dynamic,
-	check_symtab_shndx, check_hash, check_versym): Robustify.
-
---- elfutils-0.136/libelf/elf32_getphdr.c.robustify
-+++ elfutils-0.136/libelf/elf32_getphdr.c
+--- elfutils/libelf/ChangeLog
++++ elfutils/libelf/ChangeLog
+@@ -507,6 +507,49 @@
+ 	If section content hasn't been read yet, do it before looking for the
+ 	block size.  If no section data present, infer size of section header.
+ 
++2005-05-17  Jakub Jelinek  <jakub at redhat.com>
++
++	* elf32_getphdr.c (elfw2(LIBELFBITS,getphdr)): Check if program header
++	table fits into object's bounds.
++	* elf_getshstrndx.c (elf_getshstrndx): Add elf->start_offset to
++	elf->map_address.  Check if first section header fits into object's
++	bounds.
++	* elf32_getshdr.c (elfw2(LIBELFBITS,getshdr)):
++	Check if section header table fits into object's bounds.
++	* elf_begin.c (get_shnum): Ensure section headers fits into
++	object's bounds.
++	(file_read_elf): Make sure scncnt is small enough to allocate both
++	ElfXX_Shdr and Elf_Scn array.  Make sure section and program header
++	tables fit into object's bounds.  Avoid memory leak on failure.
++
++2005-05-14  Jakub Jelinek  <jakub at redhat.com>
++
++	* libelfP.h (INVALID_NDX): Define.
++	* gelf_getdyn.c (gelf_getdyn): Use it.  Remove ndx < 0 test if any.
++	* gelf_getlib.c (gelf_getlib): Likewise.
++	* gelf_getmove.c (gelf_getmove): Likewise.
++	* gelf_getrel.c (gelf_getrel): Likewise.
++	* gelf_getrela.c (gelf_getrela): Likewise.
++	* gelf_getsym.c (gelf_getsym): Likewise.
++	* gelf_getsyminfo.c (gelf_getsyminfo): Likewise.
++	* gelf_getsymshndx.c (gelf_getsymshndx): Likewise.
++	* gelf_getversym.c (gelf_getversym): Likewise.
++	* gelf_update_dyn.c (gelf_update_dyn): Likewise.
++	* gelf_update_lib.c (gelf_update_lib): Likewise.
++	* gelf_update_move.c (gelf_update_move): Likewise.
++	* gelf_update_rel.c (gelf_update_rel): Likewise.
++	* gelf_update_rela.c (gelf_update_rela): Likewise.
++	* gelf_update_sym.c (gelf_update_sym): Likewise.
++	* gelf_update_syminfo.c (gelf_update_syminfo): Likewise.
++	* gelf_update_symshndx.c (gelf_update_symshndx): Likewise.
++	* gelf_update_versym.c (gelf_update_versym): Likewise.
++	* elf_newscn.c (elf_newscn): Check for overflow.
++	* elf32_updatefile.c (__elfw2(LIBELFBITS,updatemmap)): Likewise.
++	(__elfw2(LIBELFBITS,updatefile)): Likewise.
++	* elf_begin.c (file_read_elf): Likewise.
++	* elf32_newphdr.c (elfw2(LIBELFBITS,newphdr)): Likewise.
++	* elf_getarsym.c (elf_getarsym): Likewise.
++	* elf32_getshdr.c (elfw2(LIBELFBITS,getshdr)): Likewise.
+ 2005-05-11  Ulrich Drepper  <drepper at redhat.com>
+ 
+ 	* elf.h: Update again.
+--- elfutils/libelf/elf32_getphdr.c
++++ elfutils/libelf/elf32_getphdr.c
 @@ -105,6 +105,16 @@ __elfw2(LIBELFBITS,getphdr_wrlock) (elf)
  
        if (elf->map_address != NULL)
@@ -84,8 +69,8 @@
  	  /* All the data is already mapped.  Use it.  */
  	  void *file_phdr = ((char *) elf->map_address
  			     + elf->start_offset + ehdr->e_phoff);
---- elfutils-0.136/libelf/elf32_getshdr.c.robustify
-+++ elfutils-0.136/libelf/elf32_getshdr.c
+--- elfutils/libelf/elf32_getshdr.c
++++ elfutils/libelf/elf32_getshdr.c
 @@ -1,5 +1,5 @@
  /* Return section header.
 -   Copyright (C) 1998, 1999, 2000, 2001, 2002, 2005, 2007 Red Hat, Inc.
@@ -93,7 +78,7 @@
     This file is part of Red Hat elfutils.
     Written by Ulrich Drepper <drepper at redhat.com>, 1998.
  
-@@ -81,7 +81,8 @@ load_shdr_rwlock (Elf_Scn *scn)
+@@ -81,7 +81,8 @@ load_shdr_wrlock (Elf_Scn *scn)
      goto out;
  
    size_t shnum;
@@ -103,7 +88,7 @@
      goto out;
    size_t size = shnum * sizeof (ElfW2(LIBELFBITS,Shdr));
  
-@@ -98,6 +99,16 @@ load_shdr_rwlock (Elf_Scn *scn)
+@@ -98,6 +99,16 @@ load_shdr_wrlock (Elf_Scn *scn)
  
    if (elf->map_address != NULL)
      {
@@ -120,8 +105,8 @@
        ElfW2(LIBELFBITS,Shdr) *notcvt;
  
        /* All the data is already mapped.  If we could use it
---- elfutils-0.136/libelf/elf32_newphdr.c.robustify
-+++ elfutils-0.136/libelf/elf32_newphdr.c
+--- elfutils/libelf/elf32_newphdr.c
++++ elfutils/libelf/elf32_newphdr.c
 @@ -124,6 +124,12 @@ elfw2(LIBELFBITS,newphdr) (elf, count)
    else if (elf->state.ELFW(elf,LIBELFBITS).ehdr->e_phnum != count
  	   || elf->state.ELFW(elf,LIBELFBITS).phdr == NULL)
@@ -135,9 +120,9 @@
        /* Allocate a new program header with the appropriate number of
  	 elements.  */
        result = (ElfW2(LIBELFBITS,Phdr) *)
---- elfutils-0.136/libelf/elf32_updatefile.c.robustify
-+++ elfutils-0.136/libelf/elf32_updatefile.c
-@@ -212,6 +212,9 @@ __elfw2(LIBELFBITS,updatemmap) (Elf *elf
+--- elfutils/libelf/elf32_updatefile.c
++++ elfutils/libelf/elf32_updatefile.c
+@@ -220,6 +220,9 @@ __elfw2(LIBELFBITS,updatemmap) (Elf *elf
    /* Write all the sections.  Well, only those which are modified.  */
    if (shnum > 0)
      {
@@ -147,7 +132,7 @@
        Elf_ScnList *list = &elf->state.ELFW(elf,LIBELFBITS).scns;
        Elf_Scn **scns = (Elf_Scn **) alloca (shnum * sizeof (Elf_Scn *));
        char *const shdr_start = ((char *) elf->map_address + elf->start_offset
-@@ -582,6 +585,10 @@ __elfw2(LIBELFBITS,updatefile) (Elf *elf
+@@ -633,6 +636,10 @@ __elfw2(LIBELFBITS,updatefile) (Elf *elf
    /* Write all the sections.  Well, only those which are modified.  */
    if (shnum > 0)
      {
@@ -158,9 +143,9 @@
        off_t shdr_offset = elf->start_offset + ehdr->e_shoff;
  #if EV_NUM != 2
        xfct_t shdr_fctp = __elf_xfctstom[__libelf_version - 1][EV_CURRENT - 1][ELFW(ELFCLASS, LIBELFBITS) - 1][ELF_T_SHDR];
---- elfutils-0.136/libelf/elf_begin.c.robustify
-+++ elfutils-0.136/libelf/elf_begin.c
-@@ -155,7 +155,8 @@ get_shnum (void *map_address, unsigned c
+--- elfutils/libelf/elf_begin.c
++++ elfutils/libelf/elf_begin.c
+@@ -165,7 +165,8 @@ get_shnum (void *map_address, unsigned c
  
        if (unlikely (result == 0) && ehdr.e32->e_shoff != 0)
  	{
@@ -170,7 +155,7 @@
  	    /* Cannot read the first section header.  */
  	    return 0;
  
-@@ -203,7 +204,8 @@ get_shnum (void *map_address, unsigned c
+@@ -213,7 +214,8 @@ get_shnum (void *map_address, unsigned c
  
        if (unlikely (result == 0) && ehdr.e64->e_shoff != 0)
  	{
@@ -180,7 +165,7 @@
  	    /* Cannot read the first section header.  */
  	    return 0;
  
-@@ -275,6 +277,15 @@ file_read_elf (int fildes, void *map_add
+@@ -285,6 +287,15 @@ file_read_elf (int fildes, void *map_add
      /* Could not determine the number of sections.  */
      return NULL;
  
@@ -196,7 +181,7 @@
    /* We can now allocate the memory.  */
    Elf *elf = allocate_elf (fildes, map_address, offset, maxsize, cmd, parent,
  			   ELF_K_ELF, scncnt * sizeof (Elf_Scn));
-@@ -308,13 +319,31 @@ file_read_elf (int fildes, void *map_add
+@@ -318,13 +329,31 @@ file_read_elf (int fildes, void *map_add
  	{
  	  /* We can use the mmapped memory.  */
  	  elf->state.elf32.ehdr = ehdr;
@@ -228,7 +213,7 @@
  
  	  for (size_t cnt = 0; cnt < scncnt; ++cnt)
  	    {
-@@ -396,13 +425,26 @@ file_read_elf (int fildes, void *map_add
+@@ -406,13 +435,26 @@ file_read_elf (int fildes, void *map_add
  	{
  	  /* We can use the mmapped memory.  */
  	  elf->state.elf64.ehdr = ehdr;
@@ -255,8 +240,8 @@
  
  	  for (size_t cnt = 0; cnt < scncnt; ++cnt)
  	    {
---- elfutils-0.136/libelf/elf_getarsym.c.robustify
-+++ elfutils-0.136/libelf/elf_getarsym.c
+--- elfutils/libelf/elf_getarsym.c
++++ elfutils/libelf/elf_getarsym.c
 @@ -179,6 +179,9 @@ elf_getarsym (elf, ptr)
        size_t index_size = atol (tmpbuf);
  
@@ -267,8 +252,8 @@
  	  || n * sizeof (uint32_t) > index_size)
  	{
  	  /* This index table cannot be right since it does not fit into
---- elfutils-0.136/libelf/elf_getshstrndx.c.robustify
-+++ elfutils-0.136/libelf/elf_getshstrndx.c
+--- elfutils/libelf/elf_getshstrndx.c
++++ elfutils/libelf/elf_getshstrndx.c
 @@ -125,10 +125,25 @@ elf_getshstrndx (elf, dst)
  	      if (elf->map_address != NULL
  		  && elf->state.elf32.ehdr->e_ident[EI_DATA] == MY_ELFDATA
@@ -325,8 +310,8 @@
  	      else
  		{
  		  /* We avoid reading in all the section headers.  Just read
---- elfutils-0.136/libelf/elf_newscn.c.robustify
-+++ elfutils-0.136/libelf/elf_newscn.c
+--- elfutils/libelf/elf_newscn.c
++++ elfutils/libelf/elf_newscn.c
 @@ -104,10 +104,18 @@ elf_newscn (elf)
    else
      {
@@ -347,8 +332,8 @@
        newp = (Elf_ScnList *) calloc (sizeof (Elf_ScnList)
  				     + ((elf->state.elf.scnincr *= 2)
  					* sizeof (Elf_Scn)), 1);
---- elfutils-0.136/libelf/gelf_getdyn.c.robustify
-+++ elfutils-0.136/libelf/gelf_getdyn.c
+--- elfutils/libelf/gelf_getdyn.c
++++ elfutils/libelf/gelf_getdyn.c
 @@ -93,7 +93,8 @@ gelf_getdyn (data, ndx, dst)
  	 table entries has to be adopted.  The user better has provided
  	 a buffer where we can store the information.  While copying the
@@ -369,8 +354,8 @@
  	{
  	  __libelf_seterrno (ELF_E_INVALID_INDEX);
  	  goto out;
---- elfutils-0.136/libelf/gelf_getlib.c.robustify
-+++ elfutils-0.136/libelf/gelf_getlib.c
+--- elfutils/libelf/gelf_getlib.c
++++ elfutils/libelf/gelf_getlib.c
 @@ -86,7 +86,8 @@ gelf_getlib (data, ndx, dst)
    /* The data is already in the correct form.  Just make sure the
       index is OK.  */
@@ -381,8 +366,8 @@
      __libelf_seterrno (ELF_E_INVALID_INDEX);
    else
      {
---- elfutils-0.136/libelf/gelf_getmove.c.robustify
-+++ elfutils-0.136/libelf/gelf_getmove.c
+--- elfutils/libelf/gelf_getmove.c
++++ elfutils/libelf/gelf_getmove.c
 @@ -83,7 +83,8 @@ gelf_getmove (data, ndx, dst)
  
    /* The data is already in the correct form.  Just make sure the
@@ -393,8 +378,8 @@
      {
        __libelf_seterrno (ELF_E_INVALID_INDEX);
        goto out;
---- elfutils-0.136/libelf/gelf_getrela.c.robustify
-+++ elfutils-0.136/libelf/gelf_getrela.c
+--- elfutils/libelf/gelf_getrela.c
++++ elfutils/libelf/gelf_getrela.c
 @@ -71,12 +71,6 @@ gelf_getrela (data, ndx, dst)
    if (data_scn == NULL)
      return NULL;
@@ -428,8 +413,8 @@
  	{
  	  __libelf_seterrno (ELF_E_INVALID_INDEX);
  	  result = NULL;
---- elfutils-0.136/libelf/gelf_getrel.c.robustify
-+++ elfutils-0.136/libelf/gelf_getrel.c
+--- elfutils/libelf/gelf_getrel.c
++++ elfutils/libelf/gelf_getrel.c
 @@ -71,12 +71,6 @@ gelf_getrel (data, ndx, dst)
    if (data_scn == NULL)
      return NULL;
@@ -463,8 +448,8 @@
  	{
  	  __libelf_seterrno (ELF_E_INVALID_INDEX);
  	  result = NULL;
---- elfutils-0.136/libelf/gelf_getsym.c.robustify
-+++ elfutils-0.136/libelf/gelf_getsym.c
+--- elfutils/libelf/gelf_getsym.c
++++ elfutils/libelf/gelf_getsym.c
 @@ -90,7 +90,8 @@ gelf_getsym (data, ndx, dst)
  	 table entries has to be adopted.  The user better has provided
  	 a buffer where we can store the information.  While copying the
@@ -485,8 +470,8 @@
  	{
  	  __libelf_seterrno (ELF_E_INVALID_INDEX);
  	  goto out;
---- elfutils-0.136/libelf/gelf_getsyminfo.c.robustify
-+++ elfutils-0.136/libelf/gelf_getsyminfo.c
+--- elfutils/libelf/gelf_getsyminfo.c
++++ elfutils/libelf/gelf_getsyminfo.c
 @@ -84,7 +84,8 @@ gelf_getsyminfo (data, ndx, dst)
  
    /* The data is already in the correct form.  Just make sure the
@@ -497,8 +482,8 @@
      {
        __libelf_seterrno (ELF_E_INVALID_INDEX);
        goto out;
---- elfutils-0.136/libelf/gelf_getsymshndx.c.robustify
-+++ elfutils-0.136/libelf/gelf_getsymshndx.c
+--- elfutils/libelf/gelf_getsymshndx.c
++++ elfutils/libelf/gelf_getsymshndx.c
 @@ -90,7 +90,9 @@ gelf_getsymshndx (symdata, shndxdata, nd
       section index table.  */
    if (likely (shndxdata_scn != NULL))
@@ -530,8 +515,8 @@
  	{
  	  __libelf_seterrno (ELF_E_INVALID_INDEX);
  	  goto out;
---- elfutils-0.136/libelf/gelf_getversym.c.robustify
-+++ elfutils-0.136/libelf/gelf_getversym.c
+--- elfutils/libelf/gelf_getversym.c
++++ elfutils/libelf/gelf_getversym.c
 @@ -92,7 +92,8 @@ gelf_getversym (data, ndx, dst)
  
    /* The data is already in the correct form.  Just make sure the
@@ -542,8 +527,8 @@
      {
        __libelf_seterrno (ELF_E_INVALID_INDEX);
        result = NULL;
---- elfutils-0.136/libelf/gelf_update_dyn.c.robustify
-+++ elfutils-0.136/libelf/gelf_update_dyn.c
+--- elfutils/libelf/gelf_update_dyn.c
++++ elfutils/libelf/gelf_update_dyn.c
 @@ -71,12 +71,6 @@ gelf_update_dyn (data, ndx, src)
    if (data == NULL)
      return 0;
@@ -577,8 +562,8 @@
  	{
  	  __libelf_seterrno (ELF_E_INVALID_INDEX);
  	  goto out;
---- elfutils-0.136/libelf/gelf_update_lib.c.robustify
-+++ elfutils-0.136/libelf/gelf_update_lib.c
+--- elfutils/libelf/gelf_update_lib.c
++++ elfutils/libelf/gelf_update_lib.c
 @@ -68,12 +68,6 @@ gelf_update_lib (data, ndx, src)
    if (data == NULL)
      return 0;
@@ -602,8 +587,8 @@
      __libelf_seterrno (ELF_E_INVALID_INDEX);
    else
      {
---- elfutils-0.136/libelf/gelf_update_move.c.robustify
-+++ elfutils-0.136/libelf/gelf_update_move.c
+--- elfutils/libelf/gelf_update_move.c
++++ elfutils/libelf/gelf_update_move.c
 @@ -75,7 +75,7 @@ gelf_update_move (data, ndx, src)
    assert (sizeof (GElf_Move) == sizeof (Elf64_Move));
  
@@ -613,8 +598,8 @@
        || unlikely ((ndx + 1) * sizeof (GElf_Move) > data_scn->d.d_size))
      {
        __libelf_seterrno (ELF_E_INVALID_INDEX);
---- elfutils-0.136/libelf/gelf_update_rela.c.robustify
-+++ elfutils-0.136/libelf/gelf_update_rela.c
+--- elfutils/libelf/gelf_update_rela.c
++++ elfutils/libelf/gelf_update_rela.c
 @@ -68,12 +68,6 @@ gelf_update_rela (Elf_Data *dst, int ndx
    if (dst == NULL)
      return 0;
@@ -648,8 +633,8 @@
  	{
  	  __libelf_seterrno (ELF_E_INVALID_INDEX);
  	  goto out;
---- elfutils-0.136/libelf/gelf_update_rel.c.robustify
-+++ elfutils-0.136/libelf/gelf_update_rel.c
+--- elfutils/libelf/gelf_update_rel.c
++++ elfutils/libelf/gelf_update_rel.c
 @@ -68,12 +68,6 @@ gelf_update_rel (Elf_Data *dst, int ndx,
    if (dst == NULL)
      return 0;
@@ -683,8 +668,8 @@
  	{
  	  __libelf_seterrno (ELF_E_INVALID_INDEX);
  	  goto out;
---- elfutils-0.136/libelf/gelf_update_sym.c.robustify
-+++ elfutils-0.136/libelf/gelf_update_sym.c
+--- elfutils/libelf/gelf_update_sym.c
++++ elfutils/libelf/gelf_update_sym.c
 @@ -72,12 +72,6 @@ gelf_update_sym (data, ndx, src)
    if (data == NULL)
      return 0;
@@ -718,8 +703,8 @@
  	{
  	  __libelf_seterrno (ELF_E_INVALID_INDEX);
  	  goto out;
---- elfutils-0.136/libelf/gelf_update_syminfo.c.robustify
-+++ elfutils-0.136/libelf/gelf_update_syminfo.c
+--- elfutils/libelf/gelf_update_syminfo.c
++++ elfutils/libelf/gelf_update_syminfo.c
 @@ -72,12 +72,6 @@ gelf_update_syminfo (data, ndx, src)
    if (data == NULL)
      return 0;
@@ -743,8 +728,8 @@
      {
        __libelf_seterrno (ELF_E_INVALID_INDEX);
        goto out;
---- elfutils-0.136/libelf/gelf_update_symshndx.c.robustify
-+++ elfutils-0.136/libelf/gelf_update_symshndx.c
+--- elfutils/libelf/gelf_update_symshndx.c
++++ elfutils/libelf/gelf_update_symshndx.c
 @@ -77,12 +77,6 @@ gelf_update_symshndx (symdata, shndxdata
    if (symdata == NULL)
      return 0;
@@ -778,8 +763,8 @@
  	{
  	  __libelf_seterrno (ELF_E_INVALID_INDEX);
  	  goto out;
---- elfutils-0.136/libelf/gelf_update_versym.c.robustify
-+++ elfutils-0.136/libelf/gelf_update_versym.c
+--- elfutils/libelf/gelf_update_versym.c
++++ elfutils/libelf/gelf_update_versym.c
 @@ -75,7 +75,7 @@ gelf_update_versym (data, ndx, src)
    assert (sizeof (GElf_Versym) == sizeof (Elf64_Versym));
  
@@ -789,8 +774,8 @@
        || unlikely ((ndx + 1) * sizeof (GElf_Versym) > data_scn->d.d_size))
      {
        __libelf_seterrno (ELF_E_INVALID_INDEX);
---- elfutils-0.136/libelf/libelfP.h.robustify
-+++ elfutils-0.136/libelf/libelfP.h
+--- elfutils/libelf/libelfP.h
++++ elfutils/libelf/libelfP.h
 @@ -611,4 +611,13 @@ extern uint32_t __libelf_crc32 (uint32_t
  /* Align offset to 4 bytes as needed for note name and descriptor data.  */
  #define NOTE_ALIGN(n)	(((n) + 3) & -4U)
@@ -805,9 +790,48 @@
 +#endif
 +
  #endif  /* libelfP.h */
---- elfutils-0.136/src/elflint.c.robustify
-+++ elfutils-0.136/src/elflint.c
-@@ -131,6 +131,9 @@ static uint32_t shstrndx;
+--- elfutils/src/ChangeLog
++++ elfutils/src/ChangeLog
+@@ -1297,6 +1297,16 @@
+ 	object symbols or symbols with unknown type.
+ 	(check_rel): Likewise.
+ 
++2005-06-09  Roland McGrath  <roland at redhat.com>
++
++	* readelf.c (handle_dynamic, handle_symtab): Check for bogus sh_link.
++	(handle_verneed, handle_verdef, handle_versym, handle_hash): Likewise.
++	(handle_scngrp): Check for bogus sh_info.
++
++	* strip.c (handle_elf): Check for bogus values in sh_link, sh_info,
++	st_shndx, e_shstrndx, and SHT_GROUP or SHT_SYMTAB_SHNDX data.
++	Don't use assert on input values, instead bail with "illformed" error.
++
+ 2005-06-08  Roland McGrath  <roland at redhat.com>
+ 
+ 	* readelf.c (print_ops): Add consts.
+@@ -1342,6 +1352,19 @@
+ 
+ 	* readelf.c (dwarf_tag_string): Add new tags.
+ 
++2005-05-17  Jakub Jelinek  <jakub at redhat.com>
++
++	* elflint.c (check_hash): Don't check entries beyond end of section.
++	(check_note): Don't crash if gelf_rawchunk fails.
++	(section_name): Return <invalid> if gelf_getshdr returns NULL.
++
++2005-05-14  Jakub Jelinek  <jakub at redhat.com>
++
++	* elflint.c (section_name): Return "<invalid>" instead of
++	crashing on invalid section name.
++	(check_symtab, is_rel_dyn, check_rela, check_rel, check_dynamic,
++	check_symtab_shndx, check_hash, check_versym): Robustify.
++
+ 2005-05-08  Roland McGrath  <roland at redhat.com>
+ 
+ 	* strip.c (handle_elf): Don't translate hash and versym data formats,
+--- elfutils/src/elflint.c
++++ elfutils/src/elflint.c
+@@ -130,6 +130,9 @@ static uint32_t shstrndx;
  /* Array to count references in section groups.  */
  static int *scnref;
  
@@ -817,7 +841,7 @@
  
  int
  main (int argc, char *argv[])
-@@ -320,10 +323,19 @@ section_name (Ebl *ebl, int idx)
+@@ -319,10 +322,19 @@ section_name (Ebl *ebl, int idx)
  {
    GElf_Shdr shdr_mem;
    GElf_Shdr *shdr;
@@ -838,7 +862,7 @@
  }
  
  
-@@ -345,10 +357,6 @@ static const int valid_e_machine[] =
+@@ -344,10 +356,6 @@ static const int valid_e_machine[] =
    (sizeof (valid_e_machine) / sizeof (valid_e_machine[0]))
  
  
@@ -849,7 +873,7 @@
  static void
  check_elf_header (Ebl *ebl, GElf_Ehdr *ehdr, size_t size)
  {
-@@ -613,7 +621,8 @@ section [%2d] '%s': symbol table cannot 
+@@ -612,7 +620,8 @@ section [%2d] '%s': symbol table cannot 
  	  }
        }
  
@@ -859,7 +883,7 @@
      ERROR (gettext ("\
  section [%2u] '%s': entry size is does not match ElfXX_Sym\n"),
  	   idx, section_name (ebl, idx));
-@@ -651,7 +660,7 @@ section [%2d] '%s': XINDEX for zeroth en
+@@ -650,7 +659,7 @@ section [%2d] '%s': XINDEX for zeroth en
  	       xndxscnidx, section_name (ebl, xndxscnidx));
      }
  
@@ -868,7 +892,7 @@
      {
        sym = gelf_getsymshndx (data, xndxdata, cnt, &sym_mem, &xndx);
        if (sym == NULL)
-@@ -671,7 +680,8 @@ section [%2d] '%s': symbol %zu: invalid 
+@@ -670,7 +679,8 @@ section [%2d] '%s': symbol %zu: invalid 
        else
  	{
  	  name = elf_strptr (ebl->elf, shdr->sh_link, sym->st_name);
@@ -878,7 +902,7 @@
  	}
  
        if (sym->st_shndx == SHN_XINDEX)
-@@ -1001,9 +1011,11 @@ is_rel_dyn (Ebl *ebl, const GElf_Ehdr *e
+@@ -1000,9 +1010,11 @@ is_rel_dyn (Ebl *ebl, const GElf_Ehdr *e
      {
        GElf_Shdr rcshdr_mem;
        const GElf_Shdr *rcshdr = gelf_getshdr (scn, &rcshdr_mem);
@@ -892,7 +916,7 @@
  	{
  	  /* Found the dynamic section.  Look through it.  */
  	  Elf_Data *d = elf_getdata (scn, NULL);
-@@ -1013,7 +1025,9 @@ is_rel_dyn (Ebl *ebl, const GElf_Ehdr *e
+@@ -1012,7 +1024,9 @@ is_rel_dyn (Ebl *ebl, const GElf_Ehdr *e
  	    {
  	      GElf_Dyn dyn_mem;
  	      GElf_Dyn *dyn = gelf_getdyn (d, cnt, &dyn_mem);
@@ -903,7 +927,7 @@
  
  	      if (dyn->d_tag == DT_RELCOUNT)
  		{
-@@ -1027,7 +1041,9 @@ section [%2d] '%s': DT_RELCOUNT used for
+@@ -1026,7 +1040,9 @@ section [%2d] '%s': DT_RELCOUNT used for
  		      /* Does the number specified number of relative
  			 relocations exceed the total number of
  			 relocations?  */
@@ -914,7 +938,7 @@
  			ERROR (gettext ("\
  section [%2d] '%s': DT_RELCOUNT value %d too high for this section\n"),
  			       idx, section_name (ebl, idx),
-@@ -1187,7 +1203,8 @@ section [%2d] '%s': no relocations for m
+@@ -1186,7 +1202,8 @@ section [%2d] '%s': no relocations for m
  	}
      }
  
@@ -924,7 +948,7 @@
      ERROR (gettext (reltype == ELF_T_RELA ? "\
  section [%2d] '%s': section entry size does not match ElfXX_Rela\n" : "\
  section [%2d] '%s': section entry size does not match ElfXX_Rel\n"),
-@@ -1410,7 +1427,8 @@ check_rela (Ebl *ebl, GElf_Ehdr *ehdr, G
+@@ -1409,7 +1426,8 @@ check_rela (Ebl *ebl, GElf_Ehdr *ehdr, G
    Elf_Data *symdata = elf_getdata (symscn, NULL);
    enum load_state state = state_undecided;
  
@@ -934,7 +958,7 @@
      {
        GElf_Rela rela_mem;
        GElf_Rela *rela = gelf_getrela (data, cnt, &rela_mem);
-@@ -1460,7 +1478,8 @@ check_rel (Ebl *ebl, GElf_Ehdr *ehdr, GE
+@@ -1459,7 +1477,8 @@ check_rel (Ebl *ebl, GElf_Ehdr *ehdr, GE
    Elf_Data *symdata = elf_getdata (symscn, NULL);
    enum load_state state = state_undecided;
  
@@ -944,7 +968,7 @@
      {
        GElf_Rel rel_mem;
        GElf_Rel *rel = gelf_getrel (data, cnt, &rel_mem);
-@@ -1563,7 +1582,8 @@ section [%2d] '%s': referenced as string
+@@ -1562,7 +1581,8 @@ section [%2d] '%s': referenced as string
  	   shdr->sh_link, section_name (ebl, shdr->sh_link),
  	   idx, section_name (ebl, idx));
  
@@ -954,7 +978,7 @@
      ERROR (gettext ("\
  section [%2d] '%s': section entry size does not match ElfXX_Dyn\n"),
  	   idx, section_name (ebl, idx));
-@@ -1573,7 +1593,7 @@ section [%2d] '%s': section entry size d
+@@ -1572,7 +1592,7 @@ section [%2d] '%s': section entry size d
  	   idx, section_name (ebl, idx));
  
    bool non_null_warned = false;
@@ -963,7 +987,7 @@
      {
        GElf_Dyn dyn_mem;
        GElf_Dyn *dyn = gelf_getdyn (data, cnt, &dyn_mem);
-@@ -1854,6 +1874,8 @@ section [%2d] '%s': entry size does not 
+@@ -1853,6 +1873,8 @@ section [%2d] '%s': entry size does not 
  	   idx, section_name (ebl, idx));
  
    if (symshdr != NULL
@@ -972,7 +996,7 @@
        && (shdr->sh_size / shdr->sh_entsize
  	  < symshdr->sh_size / symshdr->sh_entsize))
      ERROR (gettext ("\
-@@ -1880,6 +1902,12 @@ section [%2d] '%s': extended section ind
+@@ -1879,6 +1901,12 @@ section [%2d] '%s': extended section ind
      }
  
    Elf_Data *data = elf_getdata (elf_getscn (ebl->elf, idx), NULL);
@@ -985,7 +1009,7 @@
  
    if (*((Elf32_Word *) data->d_buf) != 0)
      ERROR (gettext ("symbol 0 should have zero extended section index\n"));
-@@ -1922,7 +1950,7 @@ section [%2d] '%s': hash table section i
+@@ -1921,7 +1949,7 @@ section [%2d] '%s': hash table section i
  
    size_t maxidx = nchain;
  
@@ -994,7 +1018,7 @@
      {
        size_t symsize = symshdr->sh_size / symshdr->sh_entsize;
  
-@@ -1933,18 +1961,28 @@ section [%2d] '%s': hash table section i
+@@ -1932,18 +1960,28 @@ section [%2d] '%s': hash table section i
        maxidx = symsize;
      }
  
@@ -1025,7 +1049,7 @@
  }
  
  
-@@ -1974,18 +2012,28 @@ section [%2d] '%s': hash table section i
+@@ -1973,18 +2011,28 @@ section [%2d] '%s': hash table section i
        maxidx = symsize;
      }
  
@@ -1057,7 +1081,7 @@
  }
  
  
-@@ -2010,7 +2058,7 @@ section [%2d] '%s': bitmask size not pow
+@@ -2009,7 +2057,7 @@ section [%2d] '%s': bitmask size not pow
    if (shdr->sh_size < (4 + bitmask_words + nbuckets) * sizeof (Elf32_Word))
      {
        ERROR (gettext ("\
@@ -1066,7 +1090,7 @@
  	     idx, section_name (ebl, idx), (long int) shdr->sh_size,
  	     (long int) ((4 + bitmask_words + nbuckets) * sizeof (Elf32_Word)));
        return;
-@@ -2682,8 +2730,9 @@ section [%2d] '%s' refers in sh_link to 
+@@ -2681,8 +2729,9 @@ section [%2d] '%s' refers in sh_link to 
  
    /* The number of elements in the version symbol table must be the
       same as the number of symbols.  */
@@ -1078,9 +1102,9 @@
      ERROR (gettext ("\
  section [%2d] '%s' has different number of entries than symbol table [%2d] '%s'\n"),
  	   idx, section_name (ebl, idx),
---- elfutils-0.136/src/readelf.c.robustify
-+++ elfutils-0.136/src/readelf.c
-@@ -1111,6 +1111,8 @@ handle_scngrp (Ebl *ebl, Elf_Scn *scn, G
+--- elfutils/src/readelf.c
++++ elfutils/src/readelf.c
+@@ -1130,6 +1130,8 @@ handle_scngrp (Ebl *ebl, Elf_Scn *scn, G
    Elf32_Word *grpref = (Elf32_Word *) data->d_buf;
  
    GElf_Sym sym_mem;
@@ -1089,7 +1113,7 @@
    printf ((grpref[0] & GRP_COMDAT)
  	  ? ngettext ("\
  \nCOMDAT section group [%2zu] '%s' with signature '%s' contains %zu entry:\n",
-@@ -1123,8 +1125,8 @@ handle_scngrp (Ebl *ebl, Elf_Scn *scn, G
+@@ -1142,8 +1144,8 @@ handle_scngrp (Ebl *ebl, Elf_Scn *scn, G
  		      data->d_size / sizeof (Elf32_Word) - 1),
  	  elf_ndxscn (scn),
  	  elf_strptr (ebl->elf, shstrndx, shdr->sh_name),
@@ -1100,7 +1124,7 @@
  	  ?: gettext ("<INVALID SYMBOL>"),
  	  data->d_size / sizeof (Elf32_Word) - 1);
  
-@@ -1275,7 +1277,8 @@ static void
+@@ -1294,7 +1296,8 @@ static void
  handle_dynamic (Ebl *ebl, Elf_Scn *scn, GElf_Shdr *shdr)
  {
    int class = gelf_getclass (ebl->elf);
@@ -1110,7 +1134,7 @@
    Elf_Data *data;
    size_t cnt;
    size_t shstrndx;
-@@ -1290,6 +1293,11 @@ handle_dynamic (Ebl *ebl, Elf_Scn *scn, 
+@@ -1309,6 +1312,11 @@ handle_dynamic (Ebl *ebl, Elf_Scn *scn, 
      error (EXIT_FAILURE, 0,
  	   gettext ("cannot get section header string table index"));
  
@@ -1122,7 +1146,7 @@
    printf (ngettext ("\
  \nDynamic segment contains %lu entry:\n Addr: %#0*" PRIx64 "  Offset: %#08" PRIx64 "  Link to section: [%2u] '%s'\n",
  		    "\
-@@ -1299,9 +1307,7 @@ handle_dynamic (Ebl *ebl, Elf_Scn *scn, 
+@@ -1318,9 +1326,7 @@ handle_dynamic (Ebl *ebl, Elf_Scn *scn, 
  	  class == ELFCLASS32 ? 10 : 18, shdr->sh_addr,
  	  shdr->sh_offset,
  	  (int) shdr->sh_link,
@@ -1133,7 +1157,7 @@
    fputs_unlocked (gettext ("  Type              Value\n"), stdout);
  
    for (cnt = 0; cnt < shdr->sh_size / shdr->sh_entsize; ++cnt)
-@@ -1801,6 +1807,13 @@ handle_symtab (Ebl *ebl, Elf_Scn *scn, G
+@@ -1820,6 +1826,13 @@ handle_symtab (Ebl *ebl, Elf_Scn *scn, G
      error (EXIT_FAILURE, 0,
  	   gettext ("cannot get section header string table index"));
  
@@ -1147,7 +1171,7 @@
    /* Now we can compute the number of entries in the section.  */
    unsigned int nsyms = data->d_size / (class == ELFCLASS32
  				       ? sizeof (Elf32_Sym)
-@@ -1811,15 +1824,12 @@ handle_symtab (Ebl *ebl, Elf_Scn *scn, G
+@@ -1830,15 +1843,12 @@ handle_symtab (Ebl *ebl, Elf_Scn *scn, G
  		    nsyms),
  	  (unsigned int) elf_ndxscn (scn),
  	  elf_strptr (ebl->elf, shstrndx, shdr->sh_name), nsyms);
@@ -1164,7 +1188,7 @@
  
    fputs_unlocked (class == ELFCLASS32
  		  ? gettext ("\
-@@ -2055,7 +2065,13 @@ handle_verneed (Ebl *ebl, Elf_Scn *scn, 
+@@ -2074,7 +2084,13 @@ handle_verneed (Ebl *ebl, Elf_Scn *scn, 
      error (EXIT_FAILURE, 0,
  	   gettext ("cannot get section header string table index"));
  
@@ -1179,7 +1203,7 @@
    printf (ngettext ("\
  \nVersion needs section [%2u] '%s' contains %d entry:\n Addr: %#0*" PRIx64 "  Offset: %#08" PRIx64 "  Link to section: [%2u] '%s'\n",
  		    "\
-@@ -2066,9 +2082,7 @@ handle_verneed (Ebl *ebl, Elf_Scn *scn, 
+@@ -2085,9 +2101,7 @@ handle_verneed (Ebl *ebl, Elf_Scn *scn, 
  	  class == ELFCLASS32 ? 10 : 18, shdr->sh_addr,
  	  shdr->sh_offset,
  	  (unsigned int) shdr->sh_link,
@@ -1190,7 +1214,7 @@
  
    unsigned int offset = 0;
    for (int cnt = shdr->sh_info; --cnt >= 0; )
-@@ -2121,8 +2135,14 @@ handle_verdef (Ebl *ebl, Elf_Scn *scn, G
+@@ -2140,8 +2154,14 @@ handle_verdef (Ebl *ebl, Elf_Scn *scn, G
      error (EXIT_FAILURE, 0,
  	   gettext ("cannot get section header string table index"));
  
@@ -1206,7 +1230,7 @@
    printf (ngettext ("\
  \nVersion definition section [%2u] '%s' contains %d entry:\n Addr: %#0*" PRIx64 "  Offset: %#08" PRIx64 "  Link to section: [%2u] '%s'\n",
  		    "\
-@@ -2134,9 +2154,7 @@ handle_verdef (Ebl *ebl, Elf_Scn *scn, G
+@@ -2153,9 +2173,7 @@ handle_verdef (Ebl *ebl, Elf_Scn *scn, G
  	  class == ELFCLASS32 ? 10 : 18, shdr->sh_addr,
  	  shdr->sh_offset,
  	  (unsigned int) shdr->sh_link,
@@ -1217,7 +1241,7 @@
  
    unsigned int offset = 0;
    for (int cnt = shdr->sh_info; --cnt >= 0; )
-@@ -2398,8 +2416,14 @@ handle_versym (Ebl *ebl, Elf_Scn *scn, G
+@@ -2417,8 +2435,14 @@ handle_versym (Ebl *ebl, Elf_Scn *scn, G
        filename = NULL;
      }
  
@@ -1233,7 +1257,7 @@
    printf (ngettext ("\
  \nVersion symbols section [%2u] '%s' contains %d entry:\n Addr: %#0*" PRIx64 "  Offset: %#08" PRIx64 "  Link to section: [%2u] '%s'",
  		    "\
-@@ -2411,9 +2435,7 @@ handle_versym (Ebl *ebl, Elf_Scn *scn, G
+@@ -2430,9 +2454,7 @@ handle_versym (Ebl *ebl, Elf_Scn *scn, G
  	  class == ELFCLASS32 ? 10 : 18, shdr->sh_addr,
  	  shdr->sh_offset,
  	  (unsigned int) shdr->sh_link,
@@ -1244,7 +1268,7 @@
  
    /* Now we can finally look at the actual contents of this section.  */
    for (unsigned int cnt = 0; cnt < shdr->sh_size / shdr->sh_entsize; ++cnt)
-@@ -2465,7 +2487,17 @@ print_hash_info (Ebl *ebl, Elf_Scn *scn,
+@@ -2484,7 +2506,17 @@ print_hash_info (Ebl *ebl, Elf_Scn *scn,
    for (Elf32_Word cnt = 0; cnt < nbucket; ++cnt)
      ++counts[lengths[cnt]];
  
@@ -1263,7 +1287,7 @@
    printf (ngettext ("\
  \nHistogram for bucket list length in section [%2u] '%s' (total of %d bucket):\n Addr: %#0*" PRIx64 "  Offset: %#08" PRIx64 "  Link to section: [%2u] '%s'\n",
  		    "\
-@@ -2478,9 +2510,7 @@ print_hash_info (Ebl *ebl, Elf_Scn *scn,
+@@ -2497,9 +2529,7 @@ print_hash_info (Ebl *ebl, Elf_Scn *scn,
  	  shdr->sh_addr,
  	  shdr->sh_offset,
  	  (unsigned int) shdr->sh_link,
@@ -1274,7 +1298,7 @@
  
    if (extrastr != NULL)
      fputs (extrastr, stdout);
-@@ -4039,6 +4069,16 @@ print_debug_aranges_section (Dwfl_Module
+@@ -4058,6 +4088,16 @@ print_debug_aranges_section (Dwfl_Module
        return;
      }
  
@@ -1289,10 +1313,10 @@
 +    }
 +
    printf (ngettext ("\
- \nDWARF section '%s' at offset %#" PRIx64 " contains %zu entry:\n",
+ \nDWARF section [%2zu] '%s' at offset %#" PRIx64 " contains %zu entry:\n",
  		    "\
---- elfutils-0.136/src/strip.c.robustify
-+++ elfutils-0.136/src/strip.c
+--- elfutils/src/strip.c
++++ elfutils/src/strip.c
 @@ -544,6 +544,11 @@ handle_elf (int fd, Elf *elf, const char
        goto fail_close;
      }


Index: elfutils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/elfutils/devel/elfutils.spec,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -r1.111 -r1.112
--- elfutils.spec	2 Jan 2009 05:37:25 -0000	1.111
+++ elfutils.spec	24 Jan 2009 01:16:36 -0000	1.112
@@ -1,5 +1,5 @@
-%define eu_version 0.138
-%define eu_release 2
+%define eu_version 0.139
+%define eu_release 1
 
 %if %{?_with_compat:1}%{!?_with_compat:0}
 %define compat 1
@@ -33,13 +33,11 @@
 Group: Development/Tools
 URL: https://fedorahosted.org/elfutils/
 Source: http://fedorahosted.org/releases/e/l/elfutils/%{name}-%{version}.tar.bz2
-Patch1: elfutils-portability.patch
-Patch2: elfutils-robustify.patch
+Patch1: elfutils-robustify.patch
+Patch2: elfutils-portability.patch
 Requires: elfutils-libelf-%{_arch} = %{version}-%{release}
 Requires: elfutils-libs-%{_arch} = %{version}-%{release}
 
-Patch3: elfutils-0.138-libelf-padding-fix.patch
-
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: bison >= 1.875
 BuildRequires: flex >= 2.5.4a
@@ -52,6 +50,19 @@
 BuildRequires: gcc >= 3.2
 %endif
 
+%define use_zlib 0
+%if 0%{?fedora} >= 5
+%define use_zlib 1
+%endif
+%if 0%{?rhel} >= 5
+%define use_zlib 1
+%endif
+
+%if %{use_zlib}
+BuildRequires: zlib-devel >= 1.2.2.3
+BuildRequires: bzip2-devel
+%endif
+
 %define _gnu %{nil}
 %define _program_prefix eu-
 
@@ -144,21 +155,19 @@
 %prep
 %setup -q
 
-%if !0%{?scanf_has_m}
-sed -i.scanf-m -e 's/%m/%a/' tests/line2addr.c
-%endif
+%patch1 -p1 -b .robustify
 
 %if %{compat}
-%patch1 -p1 -b .portability
+%patch2 -p1 -b .portability
 sleep 1
 find . \( -name Makefile.in -o -name aclocal.m4 \) -print | xargs touch
 sleep 1
 find . \( -name configure -o -name config.h.in \) -print | xargs touch
+%else
+%if !0%{?scanf_has_m}
+sed -i.scanf-m -e 's/%m/%a/g' src/addr2line.c tests/line2addr.c
+%endif
 %endif
-
-%patch2 -p1 -b .robustify
-
-%patch3 -p1 -b .fixes
 
 find . -name \*.sh ! -perm -0100 -print | xargs chmod +x
 
@@ -267,6 +276,14 @@
 %{_libdir}/libelf.a
 
 %changelog
+* Fri Jan 23 2009 Roland McGrath <roland at redhat.com> - 0.139-1
+- Update to 0.139
+  - libcpu: Add Intel SSE4 disassembler support
+  - readelf: Implement call frame information and exception handling dumping.
+    	     Add -e option.  Enable it implicitly for -a.
+  - elflint: Check PT_GNU_EH_FRAME program header entry.
+  - libdwfl: Support automatic gzip/bzip2 decompression of ELF files. (#472136)
+
 * Thu Jan  1 2009 Roland McGrath <roland at redhat.com> - 0.138-2
 - Fix libelf regression.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/elfutils/devel/sources,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- sources	31 Dec 2008 22:12:44 -0000	1.49
+++ sources	24 Jan 2009 01:16:36 -0000	1.50
@@ -1 +1 @@
-1a846d275cb6c8ab995fa0fa877113ff  elfutils-0.138.tar.bz2
+9cfc12ac0d6d14968e253639fa957946  elfutils-0.139.tar.bz2


Index: upstream-key.gpg
===================================================================
RCS file: /cvs/pkgs/rpms/elfutils/devel/upstream-key.gpg,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- upstream-key.gpg	9 Apr 2008 21:51:31 -0000	1.1
+++ upstream-key.gpg	24 Jan 2009 01:16:36 -0000	1.2
@@ -1,123 +1,109 @@
+pub   1024D/7EBBD625 2003-01-10
+uid                  Roland McGrath <roland at frob.com>
+uid                  Roland McGrath <frob at debian.org>
+uid                  Roland McGrath <roland at gnu.org>
+uid                  Roland McGrath <roland at redhat.com>
+sub   2048g/17998A93 2003-01-10
+
 pub   1024D/79FF4474 2001-08-24
 uid                  Ulrich Drepper <drepper at akkadia.org>
 uid                  Ulrich Drepper <drepper at redhat.com>
-uid                  [jpeg image of size 2203]
 sub   2048g/07FA6550 2001-08-24
 
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.4.7 (GNU/Linux)
+Version: GnuPG v1.4.5 (GNU/Linux)
 
-mQGiBDuFth0RBACPcHEkyqJE26wTXuuuCxpqJjxlBnNFkJGkWUoeu89QjzWgzXy/
-EA8+ptNBgCTPKnLEqhkRUyxAT/Uz+t+xbKqUtL54IzYfxO4NQsN/VVM0uppNfIJb
-MWvAjvpp2HCkd/32i693rlH+G9dvG8K57by3PBRHBgH2L8Q7t/QvA2AWpwCgzokX
-DDUiitysGn4rWO0rBBoR6OED/3ehpcHtbGixNoubRZAxpw99VTKs/I76OkrQzqcm
-+w+zwZeihJXC88yAHA77/LBB3YKaX3G4CmDQUbeRJ9zPlETTLmRMcF61dQdq/3qV
-Biq1sm6ctZ4uEpm8HnysKMT+VY4Xmj9LLzF2BdING9frcX9rk8Vk25iCLBronS0M
-IU3WA/sEvlUFlfbyCBRBoq+Rlr9u05fnHc7CLMKI7EIS1T1dLPxH1ivuUhyYNGAM
-RhCivBbT2Z0t/R4ksu3VdnPGkCyAAdWNSafSGqCYUzQH0u5Z8HK6c2iXrIX3Ipk5
-DhQOQ6k1tyYzuQw3cCf7RYRJ9/iup8RlscVt2kmGnSucqpxJCbQjVWxyaWNoIERy
-ZXBwZXIgPGRyZXBwZXJAcmVkaGF0LmNvbT6IRgQQEQIABgUCPIkA7wAKCRBVlt0M
-6b9lPe8IAJ9UVZehWyB1VZk9tuJzqeW/fDmVZwCfXoV8zOtEW5hot5CTUt9CCPkh
-n7eIRgQQEQIABgUCRec5UAAKCRB0q9d6LPEagCPxAKCMM03ny+O3QyC5+vNGRozq
-i60V8gCgoD5UbvrmbTXcmE3ojuLXFC+NhFqIRgQQEQIABgUCRx2D0gAKCRDHJIY3
-TSCJ234UAJwJwIETvdovyN9uvTkfWXLMks4+tACeP/S4+pjdt++dzym5J9MPzrBM
-oC2IRgQQEQIABgUCRx2D8wAKCRB2nZNyaMUfOCojAJ9AbgZY4yAZijk45PDOsYR/
-DW633ACfYzEcj9oYoqXfUuHBl0YBJLmYXh+IRgQQEQIABgUCRx3yzAAKCRBSNIRd
-8rkg9aHnAKD7iptz5ni0z74qgFQMGG1mJP62FQCgnDjSDB8FLKkNhK9aIxc49Mqj
-deeIRgQQEQIABgUCRx3yzAAKCRBSNIRd8rkg9fAkAJwLDoqhNWPJ9/xH2pB2pHH4
-fl0S0QCfakhHUYZZOwsIbRWitVxj2x9YBC2IRgQSEQIABgUCPsFP0gAKCRDXV5dM
-QyvG1Dd1AKC64m6qOuOGk+ehl0/0EJ82MMxhJQCgpvGT9jNKuYor05F+1LT0XCZU
-JMOIRgQSEQIABgUCQbYILgAKCRBl/LSO4fnVa76lAJ0dOjyXnw3fuzpAOvOzz6OA
-/kW99wCfVLILUMVOv/fHfResby6KT7KuCUeIRgQTEQIABgUCPU77dAAKCRD90t6s
-0zPLoVMtAKDagEwY9rrBLSXbhh7pCmfZkGsnBQCfcpatDJmScDGd+vfXuq4DIhwD
-AFWIRgQTEQIABgUCRyHsjgAKCRBPq0nLRJVA8gL7AKC4EsZIH49moYSyvj9xwlk2
-5/iD6wCePe/sbg6DNT3IEBL8ByG48mQ9KC+IVwQTEQIAFwUCO4W2HQULBwoDBAMV
-AwIDFgIBAheAAAoJENoowjp5/0R0SqUAoL5HBbaRWR19vjldUeJvYCG2AR94AKDL
-nmVEaykaZWyyNg0OTuxLe1boa4hfBBMRAgAXBQI7hbYdBQsHCgMEAxUDAgMWAgEC
-F4AAEgkQ2ijCOnn/RHQHZUdQRwABAUqlAKC+RwW2kVkdfb45XVHib2AhtgEfeACg
-y55lRGspGmVssjYNDk7sS3tW6Gu0JFVscmljaCBEcmVwcGVyIDxkcmVwcGVyQGFr
-a2FkaWEub3JnPohGBBARAgAGBQJF5zlEAAoJEHSr13os8RqArYkAn3UiPHSHaP2R
-0PIka7LnJHZTXk86AJ497cneDJ1SJn9WFLGAGzZbf3YprYhGBBARAgAGBQJHHYPS
-AAoJEMckhjdNIInbNckAnRwBT8gHMfqec5PhzXVnvbZYa7xbAJ9Aqup1cr0Kuo02
-7sOKFf5+Ey8H5ohGBBARAgAGBQJHHYPzAAoJEHadk3JoxR849XkAnR/AG5dbQGjU
-eRdJs58uOJWJIRyIAJ42c0iYKntBFf/HcboFXZxLuayu04hGBBARAgAGBQJHHfLM
-AAoJEFI0hF3yuSD18CQAnAsOiqE1Y8n3/EfakHakcfh+XRLRAJ9qSEdRhlk7Cwht
-FaK1XGPbH1gELYhGBBMRAgAGBQJHIeyOAAoJEE+rSctElUDyA4YAoLZviKAzCZp+
-JtDl3QOlWQuS+aZWAJ46pBEAJX6IDUn6QqxQ1zauNGghfYheBBMRAgAeBQJBy0Hv
-AhsDBgsJCAcDAgMVAgMDFgIBAh4BAheAAAoJENoowjp5/0R0yOgAoMBsA6jm9k1D
-qVJ9Eq7jX3UQJWnDAJ9uNQEqh6ZkGhNSokvZKZPWRROkCLQlVWxyaWNoIERyZXBw
-ZXIgPGRyZXBwZXJAc3RhcmJhbmQubmV0PohGBBARAgAGBQJF5zlQAAoJEHSr13os
-8RqAQhYAnRbsQsOLU9w5Z/fnUO90c1qqrsM7AKCT1yloZg537aeKqHZw99aQ9Ic/
-1ohJBDARAgAJBQJF6S2gAh0gAAoJENoowjp5/0R093sAoM3Z6hVdd5x+R/3TLa/U
-R8EXBq4DAJ4pr7Okc6lccwA4EHPcwOIv0r1oKYheBBMRAgAeBQJBy0HUAhsDBgsJ
-CAcDAgMVAgMDFgIBAh4BAheAAAoJENoowjp5/0R0IfAAniTzqP93kEtaOSz9mKEu
-9BkoW+f/AKCr1D2+yE1QPmzLKorWmVJhT8djqNHH7sfsARAAAQEAAAAAAAAAAAAA
-AAD/2P/gABBKRklGAAEBAQBIAEgAAP/bAEMACAYGBwYFCAcHBwkJCAoMFA0MCwsM
-GRITDxQdGh8eHRocHCAkLicgIiwjHBwoNyksMDE0NDQfJzk9ODI8LjM0Mv/bAEMB
-CQkJDAsMGA0NGDIhHCEyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIy
-MjIyMjIyMjIyMjIyMjIyMv/AABEIAGAASwMBIgACEQEDEQH/xAAbAAACAgMBAAAA
-AAAAAAAAAAAFBgQHAgMIAf/EADYQAAIBAwIEBAQDBwUAAAAAAAECAwAEEQUhBhIx
-QRMiUWEUMnGBB0KRFSNyocHR8DNSYnOx/8QAGQEAAwEBAQAAAAAAAAAAAAAAAgME
-BQAB/8QAIhEAAwADAAICAgMAAAAAAAAAAAECAxEhMUEEEiIyQlFh/9oADAMBAAIR
-AxEAPwB1sNXgbW7ic5RFh3PbJPStel6hHcpdxSlg5fClh0GdsVvttFgnSa/mLo8j
-ELg4GB0qEl/LYRyyO6GKGTnYuuCV+tJl+2Mrb4h0ivYF0mUi5TmjUruQKpuz4003
-hpbxuWSe58ZvCjzkAZ9fShvGf4g3fEs5sNKi+Hs84JTZpPqew9qUIdOV2CPJl/8A
-juB/U11JU9hYppLoWXiXULm7mubRFikcl9k5s+1YnjLUEkzOEcZ3Kry/bFZDQXtb
-fxWmjww8pUEGo0miEjxCeYdcnvXjmf6DcsbRxQmtWKfCXHgsgAdX6rTHZz2th4MJ
-cznly1xkHBPaqZVpNPvPEjKuqtuOx9qcZOKrO8tow1t4QA+VDtmk5Ja/UCm0h51W
-SxitDJchOV/KS25JNIFzw7cm4cwxkxk5Ug9q81XiN7+zWFVIGcA4rWthxAEXlecL
-gYHMeleRv+Qh5tl9CMnTIELhysYBI9ap38RNWnW8k0iLbmbL4O5HYfrVoyXgk0eO
-aHlgiYc5KnZAKoTXr5rjXL+9dyf3hVG/z2qmnPEhuKXttkFpltUMMOOdtmb+lMnC
-tsHmaZoPERVJd+XIWlK2iaZ1AHmY7AVa/CeiG0iUTg8zj5PQe9DstjG676AFwj6h
-qaNEjpHz4XmB3+2aa7rhq5ntIzBEDJy4YE4pq07h+JX8eSMA58u3QUYWFUVl9DRK
-X7GOZXEUFrXDV1bLKzQMrpuRkHI9aWrcL8QEYlQTggjpXQWu2sU9u6FAw32Irn3V
-kOn6vNE2Qobp6A9KFr0JzY1osFYdHt9JSC4Cu+MrIvrS1qX4gXlrqEtvFE5SIhAc
-LvgAelDxNGLcvK7YAzgUr3N74tzI7E5LUGPEvLM1RqmXle6xcaTdzW1q/wAVa5PO
-jDZSeuKqfVZzJeycox5zt7k5Jq29Rs4l09DG/n6N6nNVxxBpC2OsRj94UkUS5cAE
-5ocVJrZZjbvbGDgbSEZm1CdCVjGEz0HvVp6NZnCzMMPLuBj5RS9pMEaWNtaRx+QA
-NKR69cU9W11bWkPPM6hiN/YelMjr2zQb+kaQQC4TBAAxsKjSh41LYJAG5HpWUep2
-l4AIJA30ry6vIraI+IQABnJ9Kc2vImU16AOo/vQSDkegqkPxAsxFrKz8g5JE5WHq
-etXFe8QWMkjLEjy4/Mq7Z+tVnxvGNQsppIwRJDIr+b64pTf5HZuyIUzMNOjZmOU8
-u35s0GaMBjsx9wKYJi728NvIgIEeEUbEnqKESRZkYtdRoc/Lk7UcshudM6a1PSYI
-4GPxcWew9aXtd4an1g2LAQ8sCKpwdyDjf26VM1p9KlukXTLMwMy45ebO9MejpC+m
-xwOwF1CMDPUjt9aFY/Y34+VOnv2SdM0uC0tQkSAvjdqj32ivdRlTeXUTZ6xuQD7Y
-FFNPbnTBOB0qbMsaJzkjHejUlf29MD2NktuM4IIwBkkn65NCON4Xu7WzRZHjRpkE
-hQ78ud6ZJJ4yQACds0H4htpJ9L51UkoeYD1xQtc4Mnz0gHhvTjI1xBaLzspHJ+Ud
-e33NLfEWix22jzxk/Mhzk5A7jFOWh6rBfQvErhnhIVx3GQCP5GgPHMsUOnSyEnAU
-k+4xQ13oFTzRSeqxNZ3EKnlMnIpJ7AUCnt1Sd1EgwDgZNMGqzfF28rxKBydAR+XG
-DS1KpaZyVOST2o48GfkfTq1eG5BdPJFp0iIBsxx/KpL6Nf3KLHBYtGke4ldwC+eo
-x1p2aeFOsi/TNYfE8+0cbt74wKb64S6097FayhaMyQOcSxtg71suEY/6hPKP0zWF
-/I1rrMkxUAOQGAOcbVLZ1mjKkBlbsaW0auOuJkIqZep27EGgmvrq89hNZ2NxBEGG
-PFkJyB7YHWptzo1urlocxknJCnFBL/TXKkCdyO3Mw/tXPwaGKIrroG8PWScNsYvG
-aeSbzSsfzEe33qJ+IKCHh/ULp2JIfwo17dP7kfpRLRoYNNuXkkUyu+2WJPT6nalr
-jvU1v9MvbJJAwhiaRm9ZOu36Ur/CX5Fa2kVnZyseZ5CP9oHrUYWqT5kcPlj2GK22
-8gkKwrERIF2YdM47itn7Evn8y3MOD7t/anKGZn2TR01BdyR5liYySN0U1OueJmt7
-BZGKx4HmZsAfrSHqPFtnoYEUMvjzIMKqHJH8R7f+0halxBqOtXA+KmPgr5lhX5RU
-/wAebpbfgGpnyizeFdam1671uG58winXlPsy5x/nrR2O4e1bwZT0+U+opH4G1CGH
-V35pAq3KANnbLL8pz9CQftVlXNjHdRDnXPeqqksxWvqeJPFNCC3ehV0keWdtlH86
-zfQr1QW0+7X+CYHA+4pZ1qy4xKNFDBZf9hnwP0NLrZRN6F/i/X1tpY7e3IVgd8dv
-Wk6djPYzGRvLIfPvufapGo8P30F40uqXsDTk5ZY35yP6VD2eRYkB8ND37+5osWPb
-2yPNl7owS2is9PSNVxJJ5mPrXoXlABk/Str5eVV5thuBitbMVbHT7VUSH//ZiEYE
-EBECAAYFAkXnOVAACgkQdKvXeizxGoAyYgCfa4IPVggty0vvUAS+wZjN3a7tSFAA
-nieXbdlhMNu3yl/4loY38AAH+oQfiEYEEBECAAYFAkcdg9IACgkQxySGN00gidtU
-BACgkvyd3aRw79gxlXs0yGBFrVsx5JcAoJKAuGMb/bwCwbk7R4rV+i3rx8DFiEYE
-EBECAAYFAkcdg/MACgkQdp2TcmjFHzgNpwCfXy4kh6hF8Sv9/mwEzxJjl8z0BOwA
-oJr8ERbzjkVkP26mIg6QkRx1bCntiEYEExECAAYFAkch7I4ACgkQT6tJy0SVQPJn
-KgCfR+keQFf+eXIYDP5cCPRez3gLco0AoIe4GdgY8uYgyKMJVubvc3oFyDJaiF4E
-ExECAB4FAkAHZw4CGwMGCwkIBwMCAxUCAwMWAgECHgECF4AACgkQ2ijCOnn/RHTf
-AwCfQKSN9iZ3IxojQzcXbAbJwPsGQ1cAn2GGS0L8LGCrhK2v78jOMY0c4BRYuQIN
-BDuFtk8QCADO4UA+rWxhS2kkKXBfv6l3PUp0iBvEMqhIeHatJHHbgcthj/GD2mzp
-9kXbX9IGJqUpoHwEWch6HxL0tdS1a31pR4KSWedDA9tHQEZFxkBLv6cdn1qCIx3g
-JF7hFYWZLoqEh5SwNrvT7xeEib8L46B3tqCQHDvKRNv+NYczK9w/2JjRC2Yhq19V
-MMlSbtGblO0zWYMKaX+BYhAnl7Ov2C/Y1QbeSk1jA/4b2jgEvJM4dqaLH/Rgcj8e
-JlJiLCrjRqjTNE53/Jdjr9reaK033oCJ0kvkjm1uqesXLouZG9abI7FaQkP9sXfW
-us7k99VSBxWlTFu1bjg+1WKWEu6H6qNPAAMFB/41MfCNTDWP49mz/Llec/DTHRl1
-gYSXQjs2q0yALEjhkdP2NotwtcBFvdRUS5zUu4nW0ADWyzVzU0srcuD65nN4oxF9
-9FgRSDQSZ6vxAZavW5I7EMdwDO5Flfc9g1dwQYTISbjjcMOdev/hvzNgro76zLUt
-35JXHGnqPC2TQvJPuiSAPQTV0NTNf6rGmxW6NvN0fht2qhwqi4w0xP4Ed6hs1mlH
-hPLPn6nBb6vDX5dl5vIFSQg9c6hY9mlRMMZ9n6ib3F+DQk5wpkhnRf3V0tCnnH31
-oKbPBZ5bL0sU9MB/2liTLzBfO14Si0T9OSYN4DVxo8L0gQr0EGutL1N65usQiE4E
-GBECAAYFAjuFtk8AEgkQ2ijCOnn/RHQHZUdQRwABAWd/AJoDOBQKrsJbR9KKE3QJ
+mQGiBD4ejvcRBADNwfo3ALnr8qMQQARgBzHM5HsGaBGnGWPIFO18IhVhjqeOTBjd
+w0N9R6FAj/i3ObeTPwJABNGj92m2qnd49puBAtirJRd8Ul6shvLR8oNMZcCJEmGW
+6Ud7D+uS/WxIoQHXWKl2VtvJBLIEdZ8n/Z6SxcHuMEfTD+2pc7cqOxZPGwCglqP6
+Bt6BF5aUMbN0b/jj93ZHHSMD/iQxEiH7MmvVPHDZYN9CGepzlwcD+BKhYbq6wxsq
+pxxrtK5OrakwNd6cBb8nOVK2DjyOVRHBdWH6MVx+DCDSp0FWDEftQpCR0N0iItP4
+h+8lTP/7NdZj5+tfi99TUNMMaOcTdgWQ+s8/WUEZoJErDy/yXNHbK6xhD5mBm4pF
+bgQnBACmWQfAFDhFm1uKsNS8vPqcJ6Be+bbh+5uTOm30zXiAHEdi56v5tvn4mJSy
+yXakNGBHKkmdVQDTb4mLrnhpUnEHFegioOoBrwR6ZUsnsT7zaLz7r+p56HPKRkkn
+8284/NlZigncvPPcOK/9m6N9OLX8uerLy5TjuOPwjITxHmNgBbQgUm9sYW5kIE1j
+R3JhdGggPHJvbGFuZEBmcm9iLmNvbT6IXAQTEQIAHAQLBwMCAxUCAwMWAgECHgEC
+F4ACGQEFAj4ejvgACgkQ2vc1Cn671iU4OwCcC3y0ZCz5gxT/rzeRjogiMdOMMMcA
+nRPShRs5wsaJUeGOxAqRwu++hbrPiD8DBRA+HpK6Z/R4eOAIGpcRApUPAKDtBRDr
+ijwEwnyN8JF5jKzFqnlaZwCbBK6J7CLs8HonLtkjBFBy5JKblgKJAJUDBRA+HpOD
+pkJ+bR8IKbEBAWlBA/91cNYotVnrh4hjc06UHxySasqtxK2gd2h5A96Ez5FY0l0s
+KixJ7Rtvt490qhHqo6LiHFjKtmeiWNIO5H1MMGxXuJfBD2uDc6mfurwyt8j0v29n
+CeBFqrckR5NTbXWiepIbCe00Ux5+WbbJTdWpLFOxo8YiwqzfF/XbPdghPyY1YLQg
+Um9sYW5kIE1jR3JhdGggPGZyb2JAZGViaWFuLm9yZz6IWwQTEQIAHAUCPh6PXQIb
+AwQLBwMCAxUCAwMWAgECHgECF4AACgkQ2vc1Cn671iV7RACdHM6BWdolx88UOBhk
+L0XjMAAzF+IAmMyGjKKdDyNXmoMU1/SX/KFuPVOIPwMFED4eksNn9Hh44AgalxEC
+4G0AoIxbFjdAJImO7kOV5rFoW/+B9dxeAKDOIWg/gcAAOYFKggTBl8YO7uEYKokA
+lQMFED4ek8KmQn5tHwgpsQEBZD4D/3NBTjA3j5rj2mN7HDbSlIpttllC6B+jmzi0
+ynOgEzkhvae3ZY3mm334+/l3L9C3ZNJMQNvRdWVq2DjQq94xc9waI/Z4mNDeVQQB
+6fHC/0cmqj2n/ymS4NWxBx75W+wQKoBOXW2/bdd3cMOOwIhnC4H00FblFYR0Avth
+sxw9hDUztB9Sb2xhbmQgTWNHcmF0aCA8cm9sYW5kQGdudS5vcmc+iFwEExECABwF
+Aj4ej3UCGwMECwcDAgMVAgMDFgIBAh4BAheAAAoJENr3NQp+u9Yl6jUAnA7DcQVj
+kWoPngzvzWHB7EIYInaXAJwLZP3Nk6jPifu1J4vJ2F768hQyoYg/AwUQPh6SzGf0
+eHjgCBqXEQLPqwCgm6h1Z6xwyduXw6ZYpbRYdyBqwGcAoKIrMkypgDXci//FI5Kc
+iYBRF3ajiQCVAwUQPh6T0KZCfm0fCCmxAQFrYQP9Hh1v7DrIkT370pMo7qICLhdf
+B7r7ofSkcqSGPcAq+gwNa2aNoDx11U9hk2Vo5HWJm2psSzikUN83i7uzMZi8dW5D
+e0uI3TeHgUOFPCxXLG5KSMwGdjxKwe/Ks95gNnlDzYTe6mjJdP89D4NhSc/cP78B
+tRpc3pK+KJYd/O/xUgy0IlJvbGFuZCBNY0dyYXRoIDxyb2xhbmRAcmVkaGF0LmNv
+bT6IXgQTEQIAHgUCQjO3pQIbAwYLCQgHAwIDFQIDAxYCAQIeAQIXgAAKCRDa9zUK
+frvWJTY3AJ9UFpGYfE0dCtF6IL0CcoPB8//7tQCfesL/4DPu53OWLoVhxVKhEe+2
+QoS5Ag0EPh6PKRAIAIU6PeE1k+YYKYtZhFzb2EhVid/eUe8QsEYLJrJUYTAyzssb
+1wnWx90iFHRxyLOAyTc7YXKWz3lkbCW+TqYCSc9rbTCQy1dE8dK4ojdizZempape
+P+7kuk+zGWquabqQ71/294m2Sffasdz97yr3Eo6uSSN38ct7fxEBHhFgEGx/jDVV
+1/o1vrUcrrYyI39mOTp4yjcLwbS7JqFsNKxTGEUULpL3GYRJC+JtcaH9766E8Si+
+caxKqNLND4PHIPQ7UQCmDu2Rn84mM7Oy1whR7Pkjw6S9kQxZP+Xfykq6NAHWfFyp
+9g/5DTGVYCLxCM1Ska6KF8lnAYB1cr84OMvZ3J8AAwUH/j1rknj9KRrsgfE9CyFV
+WNUWpH79PTBQG+uoU4qyO9OPuJqcz9bBgyj9zo1DM4mxJ/euZH1X/35PTe8O1YQR
+VxzhnS5CzHoTq33qROi9/6m8HAkhp6c0s6uBplWargmomJz8gtVi+av5KbUjSxVs
+yxKWSWkX46EEjItYxmQTv9TA8X6yMM7SkQJUEIz3UXtYSLb+pVXPJfScr945kXK8
+180MGQLBhq9wEcR5ypUN1HqyO1J+TJQdsqtXAVe57RMIPY/XoFnS73B9aQmTwYRk
+5fDo9wTnHEDW4dxN+zphONOjLbGaJt5o4ytbqrQ54JHwNt4xXavWgG39OPlPqENU
+x7GIRgQYEQIABgUCPh6PKQAKCRDa9zUKfrvWJYxEAJ9FFDtc48oBtVQISX80/a2d
+smT+qwCeLgHE6iheS8L2cbygDxDnsLx32wSZAaIEO4W2HREEAI9wcSTKokTbrBNe
+664LGmomPGUGc0WQkaRZSh67z1CPNaDNfL8QDz6m00GAJM8qcsSqGRFTLEBP9TP6
+37FsqpS0vngjNh/E7g1Cw39VUzS6mk18glsxa8CO+mnYcKR3/faLr3euUf4b128b
+wrntvLc8FEcGAfYvxDu39C8DYBanAKDOiRcMNSKK3KwafitY7SsEGhHo4QP/d6Gl
+we1saLE2i5tFkDGnD31VMqz8jvo6StDOpyb7D7PBl6KElcLzzIAcDvv8sEHdgppf
+cbgKYNBRt5En3M+URNMuZExwXrV1B2r/epUGKrWybpy1ni4SmbwefKwoxP5Vjhea
+P0svMXYF0g0b1+txf2uTxWTbmIIsGuidLQwhTdYD+wS+VQWV9vIIFEGir5GWv27T
+l+cdzsIswojsQhLVPV0s/EfWK+5SHJg0YAxGEKK8FtPZnS39HiSy7dV2c8aQLIAB
+1Y1Jp9IaoJhTNAfS7lnwcrpzaJeshfcimTkOFA5DqTW3JjO5DDdwJ/tFhEn3+K6n
+xGWxxW3aSYadK5yqnEkJtCNVbHJpY2ggRHJlcHBlciA8ZHJlcHBlckByZWRoYXQu
+Y29tPohGBBARAgAGBQI8iQDvAAoJEFWW3Qzpv2U97wgAn1RVl6FbIHVVmT224nOp
+5b98OZVnAJ9ehXzM60RbmGi3kJNS30II+SGft4hXBBMRAgAXBQI7hbYdBQsHCgME
+AxUDAgMWAgECF4AACgkQ2ijCOnn/RHRKpQCgvkcFtpFZHX2+OV1R4m9gIbYBH3gA
+oMueZURrKRplbLI2DQ5O7Et7VuhriEYEExECAAYFAj1O+3QACgkQ/dLerNMzy6FT
+LQCg2oBMGPa6wS0l24Ye6Qpn2ZBrJwUAn3KWrQyZknAxnfr317quAyIcAwBViEYE
+EhECAAYFAj7BT9IACgkQ11eXTEMrxtQ3dQCguuJuqjrjhpPnoZdP9BCfNjDMYSUA
+oKbxk/YzSrmKK9ORftS09FwmVCTDiEYEEBECAAYFAkXnOVAACgkQdKvXeizxGoAj
+8QCgjDNN58vjt0MgufrzRkaM6outFfIAoKA+VG765m013JhN6I7i1xQvjYRaiEYE
+EBECAAYFAkcd8swACgkQUjSEXfK5IPWh5wCg+4qbc+Z4tM++KoBUDBhtZiT+thUA
+oJw40gwfBSypDYSvWiMXOPTKo3XniEYEEBECAAYFAkhMxecACgkQ3L4Y/6A1U7zA
+4QCfTR51NKVwuqenN7wx5Yh5DdvnQ1wAoKllIwL7hPpOBxhcJ89JRwRvcXpsiEYE
+EhECAAYFAkG2CC4ACgkQZfy0juH51Wu+pQCdHTo8l58N37s6QDrzs8+jgP5FvfcA
+n1SyC1DFTr/3x30XrG8uik+yrglHtCRVbHJpY2ggRHJlcHBlciA8ZHJlcHBlckBh
+a2thZGlhLm9yZz6IRgQQEQIABgUCRec5RAAKCRB0q9d6LPEagK2JAJ91Ijx0h2j9
+kdDyJGuy5yR2U15POgCePe3J3gydUiZ/VhSxgBs2W392Ka2IRgQQEQIABgUCRx3y
+zAAKCRBSNIRd8rkg9fAkAJwLDoqhNWPJ9/xH2pB2pHH4fl0S0QCfakhHUYZZOwsI
+bRWitVxj2x9YBC2IXgQTEQIAHgUCQctB7wIbAwYLCQgHAwIDFQIDAxYCAQIeAQIX
+gAAKCRDaKMI6ef9EdMjoAKDAbAOo5vZNQ6lSfRKu4191ECVpwwCfbjUBKoemZBoT
+UqJL2SmT1kUTpAi0JVVscmljaCBEcmVwcGVyIDxkcmVwcGVyQHN0YXJiYW5kLm5l
+dD6IRgQQEQIABgUCRec5UAAKCRB0q9d6LPEagEIWAJ0W7ELDi1PcOWf351DvdHNa
+qq7DOwCgk9cpaGYOd+2niqh2cPfWkPSHP9aIXgQTEQIAHgUCQctB1AIbAwYLCQgH
+AwIDFQIDAxYCAQIeAQIXgAAKCRDaKMI6ef9EdCHwAJ4k86j/d5BLWjks/ZihLvQZ
+KFvn/wCgq9Q9vshNUD5syyqK1plSYU/HY6iISQQwEQIACQUCRektoAIdIAAKCRDa
+KMI6ef9EdPd7AKDN2eoVXXecfkf90y2v1EfBFwauAwCeKa+zpHOpXHMAOBBz3MDi
+L9K9aCm5Ag0EO4W2TxAIAM7hQD6tbGFLaSQpcF+/qXc9SnSIG8QyqEh4dq0kcduB
+y2GP8YPabOn2Rdtf0gYmpSmgfARZyHofEvS11LVrfWlHgpJZ50MD20dARkXGQEu/
+px2fWoIjHeAkXuEVhZkuioSHlLA2u9PvF4SJvwvjoHe2oJAcO8pE2/41hzMr3D/Y
+mNELZiGrX1UwyVJu0ZuU7TNZgwppf4FiECeXs6/YL9jVBt5KTWMD/hvaOAS8kzh2
+posf9GByPx4mUmIsKuNGqNM0Tnf8l2Ov2t5orTfegInSS+SObW6p6xcui5kb1psj
+sVpCQ/2xd9a6zuT31VIHFaVMW7VuOD7VYpYS7ofqo08AAwUH/jUx8I1MNY/j2bP8
+uV5z8NMdGXWBhJdCOzarTIAsSOGR0/Y2i3C1wEW91FRLnNS7idbQANbLNXNTSyty
+4Prmc3ijEX30WBFINBJnq/EBlq9bkjsQx3AM7kWV9z2DV3BBhMhJuONww516/+G/
+M2CujvrMtS3fklccaeo8LZNC8k+6JIA9BNXQ1M1/qsabFbo283R+G3aqHCqLjDTE
+/gR3qGzWaUeE8s+fqcFvq8Nfl2Xm8gVJCD1zqFj2aVEwxn2fqJvcX4NCTnCmSGdF
+/dXS0KecffWgps8FnlsvSxT0wH/aWJMvMF87XhKLRP05Jg3gNXGjwvSBCvQQa60v
+U3rm6xCIRgQYEQIABgUCO4W2TwAKCRDaKMI6ef9EdGd/AJoDOBQKrsJbR9KKE3QJ
 gTKAnym+PwCfbnwIeEZfbBWgonv4/I3aNNm3FdQ=
-=rhf6
+=2IML
 -----END PGP PUBLIC KEY BLOCK-----


--- elfutils-0.138-libelf-padding-fix.patch DELETED ---


--- elfutils-0.138.tar.bz2.sig DELETED ---



From roland at fedoraproject.org  Sat Jan 24 01:22:40 2009
From: roland at fedoraproject.org (Roland McGrath)
Date: Sat, 24 Jan 2009 01:22:40 +0000 (UTC)
Subject: rpms/elfutils/F-10 elfutils-0.139.tar.bz2.sig, NONE, 1.1 .cvsignore,
	1.45, 1.46 Makefile, 1.29, 1.30 elfutils-portability.patch, 1.39,
	1.40 elfutils-robustify.patch, 1.12, 1.13 elfutils.spec, 1.110,
	1.111 sources, 1.49, 1.50 upstream-key.gpg, 1.1,
	1.2 elfutils-0.138.tar.bz2.sig, 1.1, NONE
Message-ID: <20090124012240.69A117010A@cvs1.fedora.phx.redhat.com>

Author: roland

Update of /cvs/pkgs/rpms/elfutils/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5465/F-10

Modified Files:
	.cvsignore Makefile elfutils-portability.patch 
	elfutils-robustify.patch elfutils.spec sources 
	upstream-key.gpg 
Added Files:
	elfutils-0.139.tar.bz2.sig 
Removed Files:
	elfutils-0.138.tar.bz2.sig 
Log Message:
Update to 0.139


--- NEW FILE elfutils-0.139.tar.bz2.sig ---
??
~??% ?
J?Zve????H+

Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/elfutils/F-10/.cvsignore,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- .cvsignore	31 Dec 2008 22:12:42 -0000	1.45
+++ .cvsignore	24 Jan 2009 01:22:09 -0000	1.46
@@ -1 +1 @@
-elfutils-0.138.tar.bz2
+elfutils-0.139.tar.bz2


Index: Makefile
===================================================================
RCS file: /cvs/pkgs/rpms/elfutils/F-10/Makefile,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- Makefile	31 Dec 2008 22:12:42 -0000	1.29
+++ Makefile	24 Jan 2009 01:22:09 -0000	1.30
@@ -3,6 +3,8 @@
 NAME := elfutils
 SPECFILE = elfutils.spec
 
+all:
+
 UPSTREAM_CHECKS := sig
 UPSTREAM_FILES = $(NAME)-$(VERSION).tar.bz2
 upstream:;
@@ -28,20 +30,19 @@
 CURL += -k
 endif
 
+patches := $(patsubst %,elfutils-%.patch,robustify portability)
+all: $(patches)
+
 branch-portability = portable
+branch-master = elfutils-$(VERSION)
 
-elfutils-base = elfutils-$(VERSION)
-elfutils-base = master
+elfutils-%/configure: .git/refs/heads/* Makefile
+	@rm -rf $(@D)
+	git archive --prefix=$(@D)/ $(firstword $(branch-$*) $*) | tar xf -
+	cd $(@D) && autoreconf -i && rm -rf autom4te.cache
 
-elfutils-%.patch: elfutils-$(VERSION).tar.bz2 Makefile
-	@rm -rf elfutils-master elfutils-$*
-	git archive --prefix=elfutils-master/ $(elfutils-base) \
-	| tar xf -
-	git archive --prefix=elfutils-$*/ $(firstword $(branch-$*) $*) \
-	| tar xf -
-	cd elfutils-master; autoreconf -i; rm -rf autom4te.cache
-	cd elfutils-$*; autoreconf -i; rm -rf autom4te.cache
-	diff -Nrpu elfutils-master elfutils-$* | \
+elfutils-%.patch: elfutils-master/configure elfutils-%/configure
+	diff --exclude='.gitignore' -Nrpu $(^D) | \
 	filterdiff --remove-timestamps --strip=1 --addprefix=elfutils/ > $@.new
 	mv $@.new $@
 
@@ -52,7 +53,7 @@
 portable-r = 0.$(subst $(DIST),,$(RELEASE))
 portable-vr = $(VERSION)-$(portable-r)
 portable.srpm = elfutils-$(portable-vr).src.rpm
-$(portable.srpm): elfutils-portable.spec elfutils-portability.patch \
+$(portable.srpm): elfutils-portable.spec $(patches) \
 		  elfutils-$(VERSION).tar.bz2
 	$(RPM_WITH_DIRS) --nodeps -bs $<
 

elfutils-portability.patch:

Index: elfutils-portability.patch
===================================================================
RCS file: /cvs/pkgs/rpms/elfutils/F-10/elfutils-portability.patch,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- elfutils-portability.patch	31 Dec 2008 22:12:42 -0000	1.39
+++ elfutils-portability.patch	24 Jan 2009 01:22:09 -0000	1.40
@@ -1,6 +1,14 @@
 --- elfutils/backends/ChangeLog
 +++ elfutils/backends/ChangeLog
-@@ -325,6 +325,11 @@
+@@ -1,3 +1,7 @@
++2009-01-23  Roland McGrath  <roland at redhat.com>
++
++	* Makefile.am (libebl_%.so): Use $(LD_AS_NEEDED).
++
+ 2008-10-04  Ulrich Drepper  <drepper at redhat.com>
+ 
+ 	* i386_reloc.def: Fix entries for TLS_GOTDESC, TLS_DESC_CALL, and
+@@ -325,6 +329,11 @@
  	* sparc_init.c: Likewise.
  	* x86_64_init.c: Likewise.
  
@@ -12,7 +20,7 @@
  2005-11-19  Roland McGrath  <roland at redhat.com>
  
  	* ppc64_reloc.def: REL30 -> ADDR30.
-@@ -347,6 +352,9 @@
+@@ -347,6 +356,9 @@
  	* Makefile.am (uninstall): Don't try to remove $(pkgincludedir).
  	(CLEANFILES): Add libebl_$(m).so.
  
@@ -24,6 +32,14 @@
  
 --- elfutils/backends/Makefile.am
 +++ elfutils/backends/Makefile.am
+@@ -1,6 +1,6 @@
+ ## Process this file with automake to create Makefile.in
+ ##
+-## Copyright (C) 2000-2006, 2007, 2008 Red Hat, Inc.
++## Copyright (C) 2000-2006, 2007, 2008, 2009 Red Hat, Inc.
+ ## This file is part of Red Hat elfutils.
+ ##
+ ## Red Hat elfutils is free software; you can redistribute it and/or modify
 @@ -25,12 +25,14 @@
  ## <http://www.openinventionnetwork.com>.
  ##
@@ -48,9 +64,18 @@
  i386_SRCS = i386_init.c i386_symbol.c i386_corenote.c \
  	    i386_retval.c i386_regs.c i386_auxv.c i386_syscall.c
  cpu_i386 = ../libcpu/libcpu_i386.a
+@@ -114,7 +115,7 @@ libebl_%.so: libebl_%_pic.a libebl_%.map
+ 	$(LINK) -shared -o $@ -Wl,--whole-archive,$<\
+ 		$(cpu_$(@:libebl_%.so=%)) -Wl,--no-whole-archive \
+ 		-Wl,--version-script,$(word 2,$^) \
+-		-Wl,-z,defs -Wl,--as-needed $(libelf) $(libdw) $(libmudflap)
++		-Wl,-z,defs $(LD_AS_NEEDED) $(libelf) $(libdw) $(libmudflap)
+ 	$(textrel_check)
+ 
+ # XXX Should not be needed...
 --- elfutils/backends/Makefile.in
 +++ elfutils/backends/Makefile.in
-@@ -155,6 +155,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -156,6 +156,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
  INSTALL_SCRIPT = @INSTALL_SCRIPT@
  INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
  LDFLAGS = @LDFLAGS@
@@ -58,7 +83,7 @@
  LEX = @LEX@
  LEXLIB = @LEXLIB@
  LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-@@ -184,6 +185,7 @@ SHELL = @SHELL@
+@@ -185,6 +186,7 @@ SHELL = @SHELL@
  STRIP = @STRIP@
  USE_NLS = @USE_NLS@
  VERSION = @VERSION@
@@ -66,9 +91,9 @@
  XGETTEXT = @XGETTEXT@
  XGETTEXT_015 = @XGETTEXT_015@
  YACC = @YACC@
-@@ -241,9 +243,9 @@ top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
+@@ -243,9 +245,9 @@ top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
+ zip_LIBS = @zip_LIBS@
  @MUDFLAP_FALSE at AM_CFLAGS = -fpic -Wall -Wshadow -Werror -Wunused \
 - at MUDFLAP_FALSE@	-Wextra -Wformat=2 -std=gnu99
 + at MUDFLAP_FALSE@	$(WEXTRA) -Wformat=2 -std=gnu99
@@ -78,9 +103,31 @@
  INCLUDES = -I$(srcdir) -I$(top_srcdir)/libebl -I$(top_srcdir)/libasm \
  	   -I$(top_srcdir)/libelf -I$(top_srcdir)/libdw \
  	   -I$(top_srcdir)/lib -I..
+@@ -641,7 +643,7 @@ libebl_%.so: libebl_%_pic.a libebl_%.map
+ 	$(LINK) -shared -o $@ -Wl,--whole-archive,$<\
+ 		$(cpu_$(@:libebl_%.so=%)) -Wl,--no-whole-archive \
+ 		-Wl,--version-script,$(word 2,$^) \
+-		-Wl,-z,defs -Wl,--as-needed $(libelf) $(libdw) $(libmudflap)
++		-Wl,-z,defs $(LD_AS_NEEDED) $(libelf) $(libdw) $(libmudflap)
+ 	$(textrel_check)
+ 
+ # XXX Should not be needed...
 --- elfutils/ChangeLog
 +++ elfutils/ChangeLog
-@@ -54,6 +54,10 @@
+@@ -1,3 +1,12 @@
++2009-01-23  Roland McGrath  <roland at redhat.com>
++
++	* configure.ac: Check for __builtin_popcount.
++
++	* configure.ac (zlib check): Check for gzdirect, need zlib >= 1.2.2.3.
++
++	* configure.ac (__thread check): Use AC_LINK_IFELSE, in case of
++	building with compiler support but no working runtime support.
++
+ 2009-01-22  Ulrich Drepper  <drepper at redhat.com>
+ 
+ 	* Makefile.am (rpm): The tarball is now bzip2-compressed.
+@@ -73,6 +82,10 @@
  	* configure.ac: Add dummy automake conditional to get dependencies
  	for non-generic linker right.  See src/Makefile.am.
  
@@ -91,7 +138,7 @@
  2005-11-18  Roland McGrath  <roland at redhat.com>
  
  	* Makefile.am (DISTCHECK_CONFIGURE_FLAGS): New variable.
-@@ -101,6 +105,17 @@
+@@ -120,6 +133,17 @@
  	* Makefile.am (all_SUBDIRS): Add libdwfl.
  	* configure.ac: Write libdwfl/Makefile.
  
@@ -111,7 +158,7 @@
  	* configure.ac [AH_BOTTOM] (INTDECL, _INTDECL): New macros.
 --- elfutils/config/Makefile.in
 +++ elfutils/config/Makefile.in
-@@ -72,6 +72,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -73,6 +73,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
  INSTALL_SCRIPT = @INSTALL_SCRIPT@
  INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
  LDFLAGS = @LDFLAGS@
@@ -119,7 +166,7 @@
  LEX = @LEX@
  LEXLIB = @LEXLIB@
  LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-@@ -101,6 +102,7 @@ SHELL = @SHELL@
+@@ -102,6 +103,7 @@ SHELL = @SHELL@
  STRIP = @STRIP@
  USE_NLS = @USE_NLS@
  VERSION = @VERSION@
@@ -127,9 +174,28 @@
  XGETTEXT = @XGETTEXT@
  XGETTEXT_015 = @XGETTEXT_015@
  YACC = @YACC@
+--- elfutils/config.h.in
++++ elfutils/config.h.in
+@@ -1,5 +1,8 @@
+ /* config.h.in.  Generated from configure.ac by autoheader.  */
+ 
++/* Have __builtin_popcount. */
++#undef HAVE_BUILTIN_POPCOUNT
++
+ /* $libdir subdirectory containing libebl modules. */
+ #undef LIBEBL_SUBDIR
+ 
+@@ -52,4 +55,7 @@
+ /* Define for large files, on AIX-style hosts. */
+ #undef _LARGE_FILES
+ 
++/* Stubbed out if missing compiler support. */
++#undef __thread
++
+ #include <eu-config.h>
 --- elfutils/configure
 +++ elfutils/configure
-@@ -637,6 +637,8 @@ NATIVE_LD_FALSE
+@@ -642,6 +642,8 @@ NATIVE_LD_FALSE
  NATIVE_LD_TRUE
  DATADIRNAME
  LOCALEDIR
@@ -138,38 +204,31 @@
  LEXLIB
  LEX_OUTPUT_ROOT
  LEX
-@@ -4028,6 +4030,89 @@ $as_echo "$as_me: error: gcc with C99 su
+@@ -4041,13 +4043,15 @@ $as_echo "$as_me: error: gcc with C99 su
  fi
  
  
+-{ $as_echo "$as_me:$LINENO: checking for gcc with TLS support" >&5
+-$as_echo_n "checking for gcc with TLS support... " >&6; }
+-if test "${ac_cv_tls+set}" = set; then
 +{ $as_echo "$as_me:$LINENO: checking for -Wextra option to $CC" >&5
 +$as_echo_n "checking for -Wextra option to $CC... " >&6; }
 +if test "${ac_cv_cc_wextra+set}" = set; then
-+  $as_echo_n "(cached) " >&6
-+else
+   $as_echo_n "(cached) " >&6
+ else
+-  cat >conftest.$ac_ext <<_ACEOF
+-__thread int a; int foo (int b) { return a + b; }
 +  old_CFLAGS="$CFLAGS"
 +CFLAGS="$CFLAGS -Wextra"
 +cat >conftest.$ac_ext <<_ACEOF
 +void foo (void) { }
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest.$ac_objext; then
+ _ACEOF
+ rm -f conftest.$ac_objext
+ if { (ac_try="$ac_compile"
+@@ -4067,6 +4071,172 @@ $as_echo "$ac_try_echo") >&5
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
 +  ac_cv_cc_wextra=yes
 +else
 +  $as_echo "$as_me: failed program was:" >&5
@@ -224,16 +283,226 @@
 +
 +
 +
++{ $as_echo "$as_me:$LINENO: checking for __builtin_popcount" >&5
++$as_echo_n "checking for __builtin_popcount... " >&6; }
++if test "${ac_cv_popcount+set}" = set; then
++  $as_echo_n "(cached) " >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++int
++main ()
++{
++exit (__builtin_popcount (127));
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
++$as_echo "$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
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext && {
++	 test "$cross_compiling" = yes ||
++	 $as_test_x conftest$ac_exeext
++       }; then
++  ac_cv_popcount=yes
++else
++  $as_echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
 +
- LOCALEDIR=$datadir
++	ac_cv_popcount=no
++fi
++
++rm -rf conftest.dSYM
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++{ $as_echo "$as_me:$LINENO: result: $ac_cv_popcount" >&5
++$as_echo "$ac_cv_popcount" >&6; }
++if test "x$ac_cv_popcount" = xyes; then
++
++cat >>confdefs.h <<\_ACEOF
++#define HAVE_BUILTIN_POPCOUNT 1
++_ACEOF
++
++fi
++
++
++{ $as_echo "$as_me:$LINENO: checking for __thread support" >&5
++$as_echo_n "checking for __thread support... " >&6; }
++if test "${ac_cv_tls+set}" = set; then
++  $as_echo_n "(cached) " >&6
++else
++  # Use the same flags that we use for our DSOs, so the test is representative.
++# Some old compiler/linker/libc combinations fail some ways and not others.
++save_CFLAGS="$CFLAGS"
++save_LDFLAGS="$LDFLAGS"
++CFLAGS="-fpic $CFLAGS"
++LDFLAGS="-shared -Wl,-z,defs,-z,relro $LDFLAGS"
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#undef __thread
++static __thread int a; int foo (int b) { return a + b; }
++int
++main ()
++{
++exit (foo (0));
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
++$as_echo "$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
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext && {
++	 test "$cross_compiling" = yes ||
++	 $as_test_x conftest$ac_exeext
++       }; then
+   ac_cv_tls=yes
+ else
+   $as_echo "$as_me: failed program was:" >&5
+@@ -4075,14 +4245,27 @@ sed 's/^/| /' conftest.$ac_ext >&5
+ 	ac_cv_tls=no
+ fi
  
- cat >>confdefs.h <<_ACEOF
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -rf conftest.dSYM
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
++      conftest$ac_exeext conftest.$ac_ext
++CFLAGS="$save_CFLAGS"
++LDFLAGS="$save_LDFLAGS"
+ fi
+ { $as_echo "$as_me:$LINENO: result: $ac_cv_tls" >&5
+ $as_echo "$ac_cv_tls" >&6; }
+ if test "x$ac_cv_tls" != xyes; then
+-  { { $as_echo "$as_me:$LINENO: error: gcc with TLS support required" >&5
+-$as_echo "$as_me: error: gcc with TLS support required" >&2;}
++  if test "$use_locks" = yes; then
++  { { $as_echo "$as_me:$LINENO: error: --enable-thread-safety requires __thread support" >&5
++$as_echo "$as_me: error: --enable-thread-safety requires __thread support" >&2;}
+    { (exit 1); exit 1; }; }
++else
++
++cat >>confdefs.h <<\_ACEOF
++#define __thread /* empty: no multi-thread support */
++_ACEOF
++
++fi
++
+ fi
+ 
+ 
+@@ -4673,9 +4856,9 @@ if test "${with_zlib+set}" = set; then
+ fi
+ 
+ if test $with_zlib != no; then
+-  { $as_echo "$as_me:$LINENO: checking for library containing gzdopen" >&5
+-$as_echo_n "checking for library containing gzdopen... " >&6; }
+-if test "${ac_cv_search_gzdopen+set}" = set; then
++  { $as_echo "$as_me:$LINENO: checking for library containing gzdirect" >&5
++$as_echo_n "checking for library containing gzdirect... " >&6; }
++if test "${ac_cv_search_gzdirect+set}" = set; then
+   $as_echo_n "(cached) " >&6
+ else
+   ac_func_search_save_LIBS=$LIBS
+@@ -4692,11 +4875,11 @@ cat >>conftest.$ac_ext <<_ACEOF
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-char gzdopen ();
++char gzdirect ();
+ int
+ main ()
+ {
+-return gzdopen ();
++return gzdirect ();
+   ;
+   return 0;
+ }
+@@ -4729,7 +4912,7 @@ $as_echo "$ac_try_echo") >&5
+ 	 test "$cross_compiling" = yes ||
+ 	 $as_test_x conftest$ac_exeext
+        }; then
+-  ac_cv_search_gzdopen=$ac_res
++  ac_cv_search_gzdirect=$ac_res
+ else
+   $as_echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -4740,21 +4923,21 @@ fi
+ rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext
+-  if test "${ac_cv_search_gzdopen+set}" = set; then
++  if test "${ac_cv_search_gzdirect+set}" = set; then
+   break
+ fi
+ done
+-if test "${ac_cv_search_gzdopen+set}" = set; then
++if test "${ac_cv_search_gzdirect+set}" = set; then
+   :
+ else
+-  ac_cv_search_gzdopen=no
++  ac_cv_search_gzdirect=no
+ fi
+ rm conftest.$ac_ext
+ LIBS=$ac_func_search_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_gzdopen" >&5
+-$as_echo "$ac_cv_search_gzdopen" >&6; }
+-ac_res=$ac_cv_search_gzdopen
++{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_gzdirect" >&5
++$as_echo "$ac_cv_search_gzdirect" >&6; }
++ac_res=$ac_cv_search_gzdirect
+ if test "$ac_res" != no; then
+   test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+   with_zlib=yes
 --- elfutils/configure.ac
 +++ elfutils/configure.ac
-@@ -74,6 +74,34 @@ CFLAGS="$old_CFLAGS"])
+@@ -74,12 +74,58 @@ CFLAGS="$old_CFLAGS"])
  AS_IF([test "x$ac_cv_c99" != xyes],
        AC_MSG_ERROR([gcc with C99 support required]))
  
+-AC_CACHE_CHECK([for gcc with TLS support], ac_cv_tls, [dnl
+-AC_COMPILE_IFELSE([dnl
+-__thread int a; int foo (int b) { return a + b; }],
+-		  ac_cv_tls=yes, ac_cv_tls=no)])
 +AC_CACHE_CHECK([for -Wextra option to $CC], ac_cv_cc_wextra, [dnl
 +old_CFLAGS="$CFLAGS"
 +CFLAGS="$CFLAGS -Wextra"
@@ -261,13 +530,58 @@
 +      [LD_AS_NEEDED=-Wl,--as-needed], [LD_AS_NEEDED=])
 +AC_SUBST(LD_AS_NEEDED)
 +
-+
++AC_CACHE_CHECK([for __builtin_popcount], ac_cv_popcount, [dnl
++AC_LINK_IFELSE([AC_LANG_PROGRAM([], [[exit (__builtin_popcount (127));]])],
++	       ac_cv_popcount=yes, ac_cv_popcount=no)])
++AS_IF([test "x$ac_cv_popcount" = xyes],
++      [AC_DEFINE([HAVE_BUILTIN_POPCOUNT], [1], [Have __builtin_popcount.])])
++
++AC_CACHE_CHECK([for __thread support], ac_cv_tls, [dnl
++# Use the same flags that we use for our DSOs, so the test is representative.
++# Some old compiler/linker/libc combinations fail some ways and not others.
++save_CFLAGS="$CFLAGS"
++save_LDFLAGS="$LDFLAGS"
++CFLAGS="-fpic $CFLAGS"
++LDFLAGS="-shared -Wl,-z,defs,-z,relro $LDFLAGS"
++AC_LINK_IFELSE([dnl
++AC_LANG_PROGRAM([[#undef __thread
++static __thread int a; int foo (int b) { return a + b; }]],
++		[[exit (foo (0));]])],
++	       ac_cv_tls=yes, ac_cv_tls=no)
++CFLAGS="$save_CFLAGS"
++LDFLAGS="$save_LDFLAGS"])
+ AS_IF([test "x$ac_cv_tls" != xyes],
+-      AC_MSG_ERROR([gcc with TLS support required]))
++      [AS_IF([test "$use_locks" = yes],
++	     [AC_MSG_ERROR([--enable-thread-safety requires __thread support])],
++	     [AC_DEFINE([__thread], [/* empty: no multi-thread support */],
++			[Stubbed out if missing compiler support.])])])
+ 
  LOCALEDIR=$datadir
  AC_SUBST(LOCALEDIR)
- AC_DEFINE_UNQUOTED(LOCALEDIR, "$LOCALEDIR")
+@@ -193,7 +239,7 @@ dnl Test for zlib and bzlib, gives ZLIB/
+ dnl conditional and config.h USE_ZLIB/USE_BZLIB #define.
+ save_LIBS="$LIBS"
+ LIBS=
+-eu_ZIPLIB(z,Z,z,gzdopen,gzip)
++eu_ZIPLIB(z,Z,z,gzdirect,gzip)
+ eu_ZIPLIB(bz,BZ,bz2,BZ2_bzdopen,bzip2)
+ zip_LIBS="$LIBS"
+ LIBS="$save_LIBS"
 --- elfutils/lib/ChangeLog
 +++ elfutils/lib/ChangeLog
-@@ -41,6 +41,11 @@
+@@ -1,3 +1,10 @@
++2009-01-23  Roland McGrath  <roland at redhat.com>
++
++	* eu-config.h [! HAVE_BUILTIN_POPCOUNT]
++	(__builtin_popcount): New inline function.
++
++	* eu-config.h: Add multiple inclusion protection.
++
+ 2009-01-17  Ulrich Drepper  <drepper at redhat.com>
+ 
+ 	* system.h (ARGP_PROGRAM_VERSION_HOOK_DEF): Define.
+@@ -52,6 +59,11 @@
  	* Makefile.am (libeu_a_SOURCES): Add it.
  	* system.h: Declare crc32_file.
  
@@ -279,6 +593,36 @@
  2005-04-30  Ulrich Drepper  <drepper at redhat.com>
  
  	* Makefile.am: Use -ffunction-sections for xmalloc.c.
+--- elfutils/lib/eu-config.h
++++ elfutils/lib/eu-config.h
+@@ -46,6 +46,9 @@
+    Network licensing program, please visit www.openinventionnetwork.com
+    <http://www.openinventionnetwork.com>.  */
+ 
++#ifndef EU_CONFIG_H
++#define EU_CONFIG_H	1
++
+ #ifdef USE_LOCKS
+ # include <pthread.h>
+ # include <assert.h>
+@@ -178,3 +181,17 @@ asm (".section predict_data, \"aw\"; .pr
+ 
+ /* This macro is used by the tests conditionalize for standalone building.  */
+ #define ELFUTILS_HEADER(name) <lib##name.h>
++
++#ifndef HAVE_BUILTIN_POPCOUNT
++# define __builtin_popcount hakmem_popcount
++static inline unsigned int __attribute__ ((unused))
++hakmem_popcount (unsigned int x)
++{
++  /* HAKMEM 169 */
++  unsigned int n = x - ((x >> 1) & 033333333333) - ((x >> 2) & 011111111111);
++  return ((n + (n >> 3)) & 030707070707) % 63;
++}
++#endif	/* HAVE_BUILTIN_POPCOUNT */
++
++
++#endif	/* eu-config.h */
 --- elfutils/lib/Makefile.am
 +++ elfutils/lib/Makefile.am
 @@ -25,12 +25,13 @@
@@ -298,7 +642,7 @@
  noinst_LIBRARIES = libeu.a
 --- elfutils/lib/Makefile.in
 +++ elfutils/lib/Makefile.in
-@@ -93,6 +93,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -94,6 +94,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
  INSTALL_SCRIPT = @INSTALL_SCRIPT@
  INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
  LDFLAGS = @LDFLAGS@
@@ -306,7 +650,7 @@
  LEX = @LEX@
  LEXLIB = @LEXLIB@
  LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-@@ -122,6 +123,7 @@ SHELL = @SHELL@
+@@ -123,6 +124,7 @@ SHELL = @SHELL@
  STRIP = @STRIP@
  USE_NLS = @USE_NLS@
  VERSION = @VERSION@
@@ -314,9 +658,9 @@
  XGETTEXT = @XGETTEXT@
  XGETTEXT_015 = @XGETTEXT_015@
  YACC = @YACC@
-@@ -179,9 +181,9 @@ top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
+@@ -181,9 +183,9 @@ top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
+ zip_LIBS = @zip_LIBS@
  @MUDFLAP_FALSE at AM_CFLAGS = -fpic -Wall -Wshadow -Werror -Wunused \
 - at MUDFLAP_FALSE@	-Wextra $($(*F)_CFLAGS)
 + at MUDFLAP_FALSE@	$(WEXTRA) $($(*F)_CFLAGS)
@@ -328,7 +672,7 @@
  libeu_a_SOURCES = xstrndup.c xmalloc.c next_prime.c \
 --- elfutils/libasm/ChangeLog
 +++ elfutils/libasm/ChangeLog
-@@ -58,6 +58,11 @@
+@@ -63,6 +63,11 @@
  	* asm_error.c: Add new error ASM_E_IOERROR.
  	* libasmP.h: Add ASM_E_IOERROR definition.
  
@@ -359,7 +703,7 @@
  	   -I$(top_srcdir)/lib
 --- elfutils/libasm/Makefile.in
 +++ elfutils/libasm/Makefile.in
-@@ -127,6 +127,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -128,6 +128,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
  INSTALL_SCRIPT = @INSTALL_SCRIPT@
  INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
  LDFLAGS = @LDFLAGS@
@@ -367,7 +711,7 @@
  LEX = @LEX@
  LEXLIB = @LEXLIB@
  LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-@@ -156,6 +157,7 @@ SHELL = @SHELL@
+@@ -157,6 +158,7 @@ SHELL = @SHELL@
  STRIP = @STRIP@
  USE_NLS = @USE_NLS@
  VERSION = 1
@@ -375,9 +719,9 @@
  XGETTEXT = @XGETTEXT@
  XGETTEXT_015 = @XGETTEXT_015@
  YACC = @YACC@
-@@ -213,9 +215,9 @@ top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
+@@ -215,9 +217,9 @@ top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
+ zip_LIBS = @zip_LIBS@
  @MUDFLAP_FALSE at AM_CFLAGS = -std=gnu99 -Wall -Wshadow -Werror -Wunused \
 - at MUDFLAP_FALSE@	-Wextra -Wformat=2
 + at MUDFLAP_FALSE@	$(WEXTRA) -Wformat=2
@@ -389,7 +733,19 @@
  	   -I$(top_srcdir)/lib
 --- elfutils/libcpu/ChangeLog
 +++ elfutils/libcpu/ChangeLog
-@@ -307,6 +307,11 @@
+@@ -1,3 +1,11 @@
++2009-01-23  Roland McGrath  <roland at redhat.com>
++
++	* i386_disasm.c (i386_disasm): Add abort after assert-constant for old
++	compilers that don't realize it's noreturn.
++
++	* Makefile.am (i386_parse_CFLAGS): Use quotes around command
++	substitution that can produce leading whitespace.
++
+ 2009-01-01  Ulrich Drepper  <drepper at redhat.com>
+ 
+ 	* i386_parse.y (instrtable_out): Optimize match_data table by not
+@@ -324,6 +332,11 @@
  	* defs/i386.doc: New file.
  	* defs/x86_64: New file.
  
@@ -401,8 +757,26 @@
  2005-02-15  Ulrich Drepper  <drepper at redhat.com>
  
  	* Makefile (AM_CFLAGS): Add -Wunused -Wextra -Wformat=2.
+--- elfutils/libcpu/i386_disasm.c
++++ elfutils/libcpu/i386_disasm.c
+@@ -791,6 +791,7 @@ i386_disasm (const uint8_t **startp, con
+ 
+ 			default:
+ 			  assert (! "INVALID not handled");
++			  abort ();
+ 			}
+ 		    }
+ 		  else
 --- elfutils/libcpu/Makefile.am
 +++ elfutils/libcpu/Makefile.am
+@@ -1,6 +1,6 @@
+ ## Process this file with automake to create Makefile.in
+ ##
+-## Copyright (C) 2002, 2004, 2005, 2007, 2008 Red Hat, Inc.
++## Copyright (C) 2002, 2004, 2005, 2007, 2008, 2009 Red Hat, Inc.
+ ## This file is part of Red Hat elfutils.
+ ##
+ ## Red Hat elfutils is free software; you can redistribute it and/or modify
 @@ -30,7 +30,8 @@ AM_CFLAGS = -fmudflap
  else
  AM_CFLAGS =
@@ -413,9 +787,18 @@
  	     $($(*F)_CFLAGS) \
  	     $(if $($(*F)_no_Werror),,-Werror)
  INCLUDES = -I$(srcdir) -I$(srcdir)/../lib -I$(srcdir)/../libelf \
+@@ -70,7 +71,7 @@ libeu = ../lib/libeu.a
+ 
+ i386_lex_CFLAGS = -Wno-unused-label -Wno-unused-function -Wno-sign-compare
+ i386_parse.o: i386_parse.c i386.mnemonics
+-i386_parse_CFLAGS = -DNMNES=$$(wc -l < i386.mnemonics)
++i386_parse_CFLAGS = -DNMNES="`wc -l < i386.mnemonics`"
+ i386_lex.o: i386_parse.h
+ i386_gendis_LDADD = $(libeu) -lm $(libmudflap)
+ 
 --- elfutils/libcpu/Makefile.in
 +++ elfutils/libcpu/Makefile.in
-@@ -109,6 +109,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -110,6 +110,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
  INSTALL_SCRIPT = @INSTALL_SCRIPT@
  INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
  LDFLAGS = @LDFLAGS@
@@ -423,7 +806,7 @@
  LEX = @LEX@
  LEXLIB = @LEXLIB@
  LEX_OUTPUT_ROOT = lex.$(<F:lex.l=)
-@@ -138,6 +139,7 @@ SHELL = @SHELL@
+@@ -139,6 +140,7 @@ SHELL = @SHELL@
  STRIP = @STRIP@
  USE_NLS = @USE_NLS@
  VERSION = @VERSION@
@@ -431,10 +814,10 @@
  XGETTEXT = @XGETTEXT@
  XGETTEXT_015 = @XGETTEXT_015@
  YACC = @YACC@
-@@ -194,10 +196,10 @@ target_alias = @target_alias@
- top_build_prefix = @top_build_prefix@
+@@ -196,10 +198,10 @@ top_build_prefix = @top_build_prefix@
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
+ zip_LIBS = @zip_LIBS@
 - at MUDFLAP_FALSE@AM_CFLAGS = -Wall -Wshadow -Wunused -Wextra -std=gnu99 \
 - at MUDFLAP_FALSE@	-fpic $($(*F)_CFLAGS) $(if \
 + at MUDFLAP_FALSE@AM_CFLAGS = -Wall -Wshadow -Wunused $(WEXTRA) \
@@ -445,9 +828,27 @@
  @MUDFLAP_TRUE@	-std=gnu99 -fpic $($(*F)_CFLAGS) $(if \
  @MUDFLAP_TRUE@	$($(*F)_no_Werror),,-Werror)
  INCLUDES = -I$(srcdir) -I$(srcdir)/../lib -I$(srcdir)/../libelf \
+@@ -215,7 +217,7 @@ i386_gendis_SOURCES = i386_gendis.c i386
+ i386_lex_no_Werror = yes
+ libeu = ../lib/libeu.a
+ i386_lex_CFLAGS = -Wno-unused-label -Wno-unused-function -Wno-sign-compare
+-i386_parse_CFLAGS = -DNMNES=$$(wc -l < i386.mnemonics)
++i386_parse_CFLAGS = -DNMNES="`wc -l < i386.mnemonics`"
+ i386_gendis_LDADD = $(libeu) -lm $(libmudflap)
+ noinst_HEADERS = memory-access.h i386_parse.h i386_data.h
+ EXTRA_DIST = defs/i386
 --- elfutils/libdw/ChangeLog
 +++ elfutils/libdw/ChangeLog
-@@ -495,6 +495,11 @@
+@@ -1,3 +1,8 @@
++2009-01-23  Roland McGrath  <roland at redhat.com>
++
++	* Makefile.am ($(srcdir)/known-dwarf.h): Target renamed back.
++	Put these rules under if MAINTAINER_MODE.
++
+ 2009-01-22  Roland McGrath  <roland at redhat.com>
+ 
+ 	* dwarf.h: Add DW_OP_GNU_encoded_addr.
+@@ -542,6 +547,11 @@
  
  2005-05-31  Roland McGrath  <roland at redhat.com>
  
@@ -478,9 +879,26 @@
  INCLUDES = -I. -I$(srcdir) -I$(srcdir)/../libelf -I.. -I$(srcdir)/../lib
  VERSION = 1
  
+@@ -85,11 +86,13 @@ libdw_a_SOURCES = dwarf_begin.c dwarf_be
+ 		  libdw_visit_scopes.c \
+ 		  dwarf_entry_breakpoints.c
+ 
+-BUILT_SOURCES = known-dwarf.h
+-CLEANFILES = known-dwarf.h
+-known-dwarf.h: $(top_srcdir)/config/known-dwarf.awk $(srcdir)/dwarf.h
++if MAINTAINER_MODE
++BUILT_SOURCES = $(srcdir)/known-dwarf.h
++MAINTAINERCLEANFILES = $(srcdir)/known-dwarf.h
++$(srcdir)/known-dwarf.h: $(top_srcdir)/config/known-dwarf.awk $(srcdir)/dwarf.h
+ 	$(AWK) -f $^ > $@.new
+ 	mv -f $@.new $@
++endif
+ 
+ if !MUDFLAP
+ libdw_pic_a_SOURCES =
 --- elfutils/libdw/Makefile.in
 +++ elfutils/libdw/Makefile.in
-@@ -164,6 +164,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -165,6 +165,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
  INSTALL_SCRIPT = @INSTALL_SCRIPT@
  INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
  LDFLAGS = @LDFLAGS@
@@ -488,7 +906,7 @@
  LEX = @LEX@
  LEXLIB = @LEXLIB@
  LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-@@ -193,6 +194,7 @@ SHELL = @SHELL@
+@@ -194,6 +195,7 @@ SHELL = @SHELL@
  STRIP = @STRIP@
  USE_NLS = @USE_NLS@
  VERSION = 1
@@ -496,9 +914,9 @@
  XGETTEXT = @XGETTEXT@
  XGETTEXT_015 = @XGETTEXT_015@
  YACC = @YACC@
-@@ -250,9 +252,10 @@ top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
+@@ -252,9 +254,10 @@ top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
+ zip_LIBS = @zip_LIBS@
  @MUDFLAP_FALSE at AM_CFLAGS = $(am__append_1) -Wall -Werror -Wshadow \
 - at MUDFLAP_FALSE@	-Wunused -Wformat=2 -Wextra -std=gnu99
 + at MUDFLAP_FALSE@	-Wunused -Wformat=2 $(WEXTRA) -std=gnu99
@@ -509,9 +927,49 @@
  INCLUDES = -I. -I$(srcdir) -I$(srcdir)/../libelf -I.. -I$(srcdir)/../lib
  COMPILE.os = $(filter-out -fprofile-arcs, $(filter-out -ftest-coverage, \
  						       $(COMPILE)))
+@@ -299,8 +302,8 @@ libdw_a_SOURCES = dwarf_begin.c dwarf_be
+ 		  libdw_visit_scopes.c \
+ 		  dwarf_entry_breakpoints.c
+ 
+-BUILT_SOURCES = known-dwarf.h
+-CLEANFILES = known-dwarf.h
++ at MAINTAINER_MODE_TRUE@BUILT_SOURCES = $(srcdir)/known-dwarf.h
++ at MAINTAINER_MODE_TRUE@MAINTAINERCLEANFILES = $(srcdir)/known-dwarf.h
+ @MUDFLAP_FALSE at libdw_pic_a_SOURCES = 
+ @MUDFLAP_FALSE at am_libdw_pic_a_OBJECTS = $(libdw_a_SOURCES:.c=.os)
+ @MUDFLAP_FALSE at libdw_so_SOURCES = 
+@@ -635,7 +638,6 @@ mostlyclean-generic:
+ 	-test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)
+ 
+ clean-generic:
+-	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+ 
+ distclean-generic:
+ 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+@@ -644,6 +646,7 @@ maintainer-clean-generic:
+ 	@echo "This command is intended for maintainers to use"
+ 	@echo "it deletes files that may require special tools to rebuild."
+ 	-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
++	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
+ clean: clean-am
+ 
+ clean-am: clean-generic clean-libLIBRARIES clean-noinstLIBRARIES \
+@@ -720,9 +723,9 @@ uninstall-am: uninstall-includeHEADERS u
+ 	ps ps-am tags uninstall uninstall-am uninstall-includeHEADERS \
+ 	uninstall-libLIBRARIES uninstall-pkgincludeHEADERS
+ 
+-known-dwarf.h: $(top_srcdir)/config/known-dwarf.awk $(srcdir)/dwarf.h
+-	$(AWK) -f $^ > $@.new
+-	mv -f $@.new $@
++ at MAINTAINER_MODE_TRUE@$(srcdir)/known-dwarf.h: $(top_srcdir)/config/known-dwarf.awk $(srcdir)/dwarf.h
++ at MAINTAINER_MODE_TRUE@	$(AWK) -f $^ > $@.new
++ at MAINTAINER_MODE_TRUE@	mv -f $@.new $@
+ @MUDFLAP_FALSE at libdw.so: $(srcdir)/libdw.map libdw_pic.a \
+ @MUDFLAP_FALSE@	  ../libdwfl/libdwfl_pic.a ../libebl/libebl.a \
+ @MUDFLAP_FALSE@	  ../libelf/libelf.so
 --- elfutils/libdwfl/ChangeLog
 +++ elfutils/libdwfl/ChangeLog
-@@ -936,6 +936,11 @@
+@@ -987,6 +987,11 @@
  
  2005-07-21  Roland McGrath  <roland at redhat.com>
  
@@ -542,7 +1000,7 @@
  VERSION = 1
 --- elfutils/libdwfl/Makefile.in
 +++ elfutils/libdwfl/Makefile.in
-@@ -131,6 +131,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -155,6 +155,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
  INSTALL_SCRIPT = @INSTALL_SCRIPT@
  INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
  LDFLAGS = @LDFLAGS@
@@ -550,7 +1008,7 @@
  LEX = @LEX@
  LEXLIB = @LEXLIB@
  LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-@@ -160,6 +161,7 @@ SHELL = @SHELL@
+@@ -184,6 +185,7 @@ SHELL = @SHELL@
  STRIP = @STRIP@
  USE_NLS = @USE_NLS@
  VERSION = 1
@@ -558,9 +1016,9 @@
  XGETTEXT = @XGETTEXT@
  XGETTEXT_015 = @XGETTEXT_015@
  YACC = @YACC@
-@@ -217,9 +219,9 @@ top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
+@@ -242,9 +244,9 @@ top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
+ zip_LIBS = @zip_LIBS@
  @MUDFLAP_FALSE at AM_CFLAGS = -Wall -Werror -Wshadow -Wunused -Wformat=2 \
 - at MUDFLAP_FALSE@	-Wextra -std=gnu99
 + at MUDFLAP_FALSE@	$(WEXTRA) -std=gnu99
@@ -603,7 +1061,7 @@
  INCLUDES = -I$(srcdir) -I$(top_srcdir)/libelf -I$(top_srcdir)/libdw \
 --- elfutils/libebl/Makefile.in
 +++ elfutils/libebl/Makefile.in
-@@ -123,6 +123,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -124,6 +124,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
  INSTALL_SCRIPT = @INSTALL_SCRIPT@
  INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
  LDFLAGS = @LDFLAGS@
@@ -611,7 +1069,7 @@
  LEX = @LEX@
  LEXLIB = @LEXLIB@
  LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-@@ -152,6 +153,7 @@ SHELL = @SHELL@
+@@ -153,6 +154,7 @@ SHELL = @SHELL@
  STRIP = @STRIP@
  USE_NLS = @USE_NLS@
  VERSION = 1
@@ -619,9 +1077,9 @@
  XGETTEXT = @XGETTEXT@
  XGETTEXT_015 = @XGETTEXT_015@
  YACC = @YACC@
-@@ -209,9 +211,9 @@ top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
+@@ -211,9 +213,9 @@ top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
+ zip_LIBS = @zip_LIBS@
  @MUDFLAP_FALSE at AM_CFLAGS = -fpic -Wall -Wshadow -Werror -Wunused \
 - at MUDFLAP_FALSE@	-Wextra -Wformat=2 -std=gnu99
 + at MUDFLAP_FALSE@	$(WEXTRA) -Wformat=2 -std=gnu99
@@ -633,18 +1091,18 @@
  
 --- elfutils/libelf/ChangeLog
 +++ elfutils/libelf/ChangeLog
-@@ -477,6 +477,11 @@
- 	If section content hasn't been read yet, do it before looking for the
- 	block size.  If no section data present, infer size of section header.
+@@ -515,6 +515,11 @@
+ 
+ 	* elf.h: Update from glibc.
  
 +2005-05-31  Roland McGrath  <roland at redhat.com>
 +
 +	* Makefile.am (WEXTRA): New variable, substituted by configure.
 +	(AM_CFLAGS): Use it in place of -Wextra.
 +
- 2005-05-11  Ulrich Drepper  <drepper at redhat.com>
+ 2005-05-08  Roland McGrath  <roland at redhat.com>
  
- 	* elf.h: Update again.
+ 	* elf_begin.c (read_file) [_MUDFLAP]: Don't use mmap for now.
 --- elfutils/libelf/common.h
 +++ elfutils/libelf/common.h
 @@ -160,7 +160,7 @@ libelf_release_all (Elf *elf)
@@ -686,7 +1144,7 @@
  GCC_INCLUDE = -I$(shell $(CC) -print-file-name=include)
 --- elfutils/libelf/Makefile.in
 +++ elfutils/libelf/Makefile.in
-@@ -171,6 +171,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -172,6 +172,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
  INSTALL_SCRIPT = @INSTALL_SCRIPT@
  INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
  LDFLAGS = @LDFLAGS@
@@ -694,7 +1152,7 @@
  LEX = @LEX@
  LEXLIB = @LEXLIB@
  LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-@@ -200,6 +201,7 @@ SHELL = @SHELL@
+@@ -201,6 +202,7 @@ SHELL = @SHELL@
  STRIP = @STRIP@
  USE_NLS = @USE_NLS@
  VERSION = 1
@@ -702,9 +1160,9 @@
  XGETTEXT = @XGETTEXT@
  XGETTEXT_015 = @XGETTEXT_015@
  YACC = @YACC@
-@@ -257,10 +259,10 @@ top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
+@@ -259,10 +261,10 @@ top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
+ zip_LIBS = @zip_LIBS@
  @MUDFLAP_FALSE at AM_CFLAGS = $(am__append_1) -Wall -Wshadow -Werror \
 - at MUDFLAP_FALSE@	-Wunused -Wextra -Wformat=2 -std=gnu99 \
 + at MUDFLAP_FALSE@	-Wunused $(WEXTRA) -Wformat=2 -std=gnu99 \
@@ -717,7 +1175,7 @@
  GCC_INCLUDE = -I$(shell $(CC) -print-file-name=include)
 --- elfutils/m4/Makefile.in
 +++ elfutils/m4/Makefile.in
-@@ -71,6 +71,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -72,6 +72,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
  INSTALL_SCRIPT = @INSTALL_SCRIPT@
  INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
  LDFLAGS = @LDFLAGS@
@@ -725,7 +1183,7 @@
  LEX = @LEX@
  LEXLIB = @LEXLIB@
  LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-@@ -100,6 +101,7 @@ SHELL = @SHELL@
+@@ -101,6 +102,7 @@ SHELL = @SHELL@
  STRIP = @STRIP@
  USE_NLS = @USE_NLS@
  VERSION = @VERSION@
@@ -735,7 +1193,7 @@
  YACC = @YACC@
 --- elfutils/Makefile.in
 +++ elfutils/Makefile.in
-@@ -109,6 +109,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -110,6 +110,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
  INSTALL_SCRIPT = @INSTALL_SCRIPT@
  INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
  LDFLAGS = @LDFLAGS@
@@ -743,7 +1201,7 @@
  LEX = @LEX@
  LEXLIB = @LEXLIB@
  LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-@@ -138,6 +139,7 @@ SHELL = @SHELL@
+@@ -139,6 +140,7 @@ SHELL = @SHELL@
  STRIP = @STRIP@
  USE_NLS = @USE_NLS@
  VERSION = @VERSION@
@@ -751,9 +1209,38 @@
  XGETTEXT = @XGETTEXT@
  XGETTEXT_015 = @XGETTEXT_015@
  YACC = @YACC@
+--- elfutils/src/addr2line.c
++++ elfutils/src/addr2line.c
+@@ -376,7 +376,7 @@ handle_address (const char *string, Dwfl
+       bool parsed = false;
+       int n;
+       char *name = NULL;
+-      if (sscanf (string, "(%m[^)])%" PRIiMAX "%n", &name, &addr, &n) == 2
++      if (sscanf (string, "(%a[^)])%" PRIiMAX "%n", &name, &addr, &n) == 2
+ 	  && string[n] == '\0')
+ 	{
+ 	  /* It was (section)+offset.  This makes sense if there is
+@@ -417,7 +417,7 @@ handle_address (const char *string, Dwfl
+ 		}
+ 	    }
+ 	}
+-      else if (sscanf (string, "%m[^-+]%" PRIiMAX "%n", &name, &addr, &n) == 2
++      else if (sscanf (string, "%a[^-+]%" PRIiMAX "%n", &name, &addr, &n) == 2
+ 	       && string[n] == '\0')
+ 	{
+ 	  /* It was symbol+offset.  */
 --- elfutils/src/ChangeLog
 +++ elfutils/src/ChangeLog
-@@ -76,6 +76,11 @@
+@@ -12,6 +12,8 @@
+ 	* readelf.c (print_debug_frame_section): Use t instead of j formats
+ 	for ptrdiff_t OFFSET.
+ 
++	* addr2line.c (handle_address): Use %a instead of %m for compatibility.
++
+ 2009-01-21  Ulrich Drepper  <drepper at redhat.com>
+ 
+ 	* elflint.c (check_program_header): Fix typo in .eh_frame_hdr section
+@@ -195,6 +197,11 @@
  	that matches its PT_LOAD's p_flags &~ PF_W.  On sparc, PF_X really
  	is valid in RELRO.
  
@@ -765,7 +1252,7 @@
  2008-02-29  Roland McGrath  <roland at redhat.com>
  
  	* readelf.c (print_attributes): Add a cast.
-@@ -327,6 +332,8 @@
+@@ -446,6 +453,8 @@
  
  	* readelf.c (hex_dump): Fix rounding error in whitespace calculation.
  
@@ -774,7 +1261,7 @@
  2007-10-15  Roland McGrath  <roland at redhat.com>
  
  	* make-debug-archive.in: New file.
-@@ -766,6 +773,10 @@
+@@ -885,6 +894,10 @@
  	* elflint.c (valid_e_machine): Add EM_ALPHA.
  	Reported by Christian Aichinger <Greek0 at gmx.net>.
  
@@ -785,7 +1272,7 @@
  2006-08-08  Ulrich Drepper  <drepper at redhat.com>
  
  	* elflint.c (check_dynamic): Don't require DT_HASH for DT_SYMTAB.
-@@ -842,6 +853,10 @@
+@@ -961,6 +974,10 @@
  	* Makefile.am: Add hacks to create dependency files for non-generic
  	linker.
  
@@ -796,7 +1283,7 @@
  2006-06-12  Ulrich Drepper  <drepper at redhat.com>
  
  	* ldgeneric.c (ld_generic_generate_sections): Don't create .interp
-@@ -1190,6 +1205,11 @@
+@@ -1309,6 +1326,11 @@
  	* readelf.c (print_debug_loc_section): Fix indentation for larger
  	address size.
  
@@ -810,7 +1297,7 @@
  	* readelf.c (print_debug_line_section): Print section offset of each
 --- elfutils/src/findtextrel.c
 +++ elfutils/src/findtextrel.c
-@@ -488,7 +488,11 @@ ptrcompare (const void *p1, const void *
+@@ -490,7 +490,11 @@ ptrcompare (const void *p1, const void *
  
  
  static void
@@ -839,10 +1326,10 @@
  	     $(if $($(*F)_no_Werror),,-Werror) \
 -	     $(if $($(*F)_no_Wunused),,-Wunused -Wextra) \
 +	     $(if $($(*F)_no_Wunused),,-Wunused $(WEXTRA)) \
- 	     $(if $($(*F)_no_Wformat),,-Wformat=2) $(CFLAGS_$(*F))
+ 	     $(if $($(*F)_no_Wformat),-Wno-format,-Wformat=2) $(CFLAGS_$(*F))
  
  INCLUDES = -I$(srcdir) -I$(srcdir)/../libelf -I$(srcdir)/../libebl \
-@@ -111,6 +112,9 @@ strings_no_Wformat = yes
+@@ -112,6 +113,9 @@ addr2line_no_Wformat = yes
  # XXX While the file is not finished, don't warn about this
  ldgeneric_no_Wunused = yes
  
@@ -854,7 +1341,7 @@
  size_LDADD = $(libelf) $(libeu) $(libmudflap)
 --- elfutils/src/Makefile.in
 +++ elfutils/src/Makefile.in
-@@ -201,6 +201,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -202,6 +202,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
  INSTALL_SCRIPT = @INSTALL_SCRIPT@
  INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
  LDFLAGS = @LDFLAGS@
@@ -862,7 +1349,7 @@
  LEX = @LEX@
  LEXLIB = @LEXLIB@
  LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-@@ -230,6 +231,7 @@ SHELL = @SHELL@
+@@ -231,6 +232,7 @@ SHELL = @SHELL@
  STRIP = @STRIP@
  USE_NLS = @USE_NLS@
  VERSION = @VERSION@
@@ -870,24 +1357,24 @@
  XGETTEXT = @XGETTEXT@
  XGETTEXT_015 = @XGETTEXT_015@
  YACC = @YACC@ -d
-@@ -289,13 +291,13 @@ top_srcdir = @top_srcdir@
+@@ -291,13 +293,13 @@ zip_LIBS = @zip_LIBS@
  @MUDFLAP_FALSE at AM_CFLAGS = -Wall -Wshadow -std=gnu99 \
  @MUDFLAP_FALSE@	$(native_ld_cflags) $(if \
  @MUDFLAP_FALSE@	$($(*F)_no_Werror),,-Werror) $(if \
 - at MUDFLAP_FALSE@	$($(*F)_no_Wunused),,-Wunused -Wextra) $(if \
 + at MUDFLAP_FALSE@	$($(*F)_no_Wunused),,-Wunused $(WEXTRA)) $(if \
- @MUDFLAP_FALSE@	$($(*F)_no_Wformat),,-Wformat=2) \
+ @MUDFLAP_FALSE@	$($(*F)_no_Wformat),-Wno-format,-Wformat=2) \
  @MUDFLAP_FALSE@	$(CFLAGS_$(*F))
  @MUDFLAP_TRUE at AM_CFLAGS = -fmudflap -Wall -Wshadow -std=gnu99 \
  @MUDFLAP_TRUE@	$(native_ld_cflags) $(if \
  @MUDFLAP_TRUE@	$($(*F)_no_Werror),,-Werror) $(if \
 - at MUDFLAP_TRUE@	$($(*F)_no_Wunused),,-Wunused -Wextra) $(if \
 + at MUDFLAP_TRUE@	$($(*F)_no_Wunused),,-Wunused $(WEXTRA)) $(if \
- @MUDFLAP_TRUE@	$($(*F)_no_Wformat),,-Wformat=2) $(CFLAGS_$(*F))
+ @MUDFLAP_TRUE@	$($(*F)_no_Wformat),-Wno-format,-Wformat=2) \
+ @MUDFLAP_TRUE@	$(CFLAGS_$(*F))
  INCLUDES = -I$(srcdir) -I$(srcdir)/../libelf -I$(srcdir)/../libebl \
- 	   -I$(srcdir)/../libdw -I$(srcdir)/../libdwfl \
-@@ -339,6 +341,9 @@ size_no_Wformat = yes
- strings_no_Wformat = yes
+@@ -343,6 +345,9 @@ strings_no_Wformat = yes
+ addr2line_no_Wformat = yes
  # XXX While the file is not finished, don't warn about this
  ldgeneric_no_Wunused = yes
 +
@@ -898,7 +1385,7 @@
  size_LDADD = $(libelf) $(libeu) $(libmudflap)
 --- elfutils/src/readelf.c
 +++ elfutils/src/readelf.c
-@@ -6424,7 +6424,7 @@ dump_archive_index (Elf *elf, const char
+@@ -7385,7 +7385,7 @@ dump_archive_index (Elf *elf, const char
  	  if (unlikely (elf_rand (elf, as_off) == 0)
  	      || unlikely ((subelf = elf_begin (-1, ELF_C_READ_MMAP, elf))
  			   == NULL))
@@ -988,7 +1475,7 @@
  cannot set access and modification date of '%s'"), fname);
 --- elfutils/tests/ChangeLog
 +++ elfutils/tests/ChangeLog
-@@ -84,6 +84,8 @@
+@@ -95,6 +95,8 @@
  
  2008-01-21  Roland McGrath  <roland at redhat.com>
  
@@ -997,7 +1484,7 @@
  	* testfile45.S.bz2: Add tests for cltq, cqto.
  	* testfile45.expect.bz2: Adjust.
  
-@@ -792,6 +794,11 @@
+@@ -803,6 +805,11 @@
  	* Makefile.am (TESTS): Add run-elflint-test.sh.
  	(EXTRA_DIST): Add run-elflint-test.sh and testfile18.bz2.
  
@@ -1040,7 +1527,7 @@
  endif
 --- elfutils/tests/Makefile.in
 +++ elfutils/tests/Makefile.in
-@@ -341,6 +341,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -342,6 +342,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
  INSTALL_SCRIPT = @INSTALL_SCRIPT@
  INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
  LDFLAGS = @LDFLAGS@
@@ -1048,7 +1535,7 @@
  LEX = @LEX@
  LEXLIB = @LEXLIB@
  LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-@@ -370,6 +371,7 @@ SHELL = @SHELL@
+@@ -371,6 +372,7 @@ SHELL = @SHELL@
  STRIP = @STRIP@
  USE_NLS = @USE_NLS@
  VERSION = @VERSION@
@@ -1056,10 +1543,10 @@
  XGETTEXT = @XGETTEXT@
  XGETTEXT_015 = @XGETTEXT_015@
  YACC = @YACC@
-@@ -426,10 +428,10 @@ target_alias = @target_alias@
- top_build_prefix = @top_build_prefix@
+@@ -428,10 +430,10 @@ top_build_prefix = @top_build_prefix@
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
+ zip_LIBS = @zip_LIBS@
 - at MUDFLAP_FALSE@AM_CFLAGS = -Wall -Werror -Wextra -std=gnu99 \
 + at MUDFLAP_FALSE@AM_CFLAGS = -Wall -Werror $(WEXTRA) -std=gnu99 \
  @MUDFLAP_FALSE@	    $(if $($(*F)_no_Wformat),-Wno-format,-Wformat=2)

elfutils-robustify.patch:

Index: elfutils-robustify.patch
===================================================================
RCS file: /cvs/pkgs/rpms/elfutils/F-10/elfutils-robustify.patch,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- elfutils-robustify.patch	27 Aug 2008 08:19:15 -0000	1.12
+++ elfutils-robustify.patch	24 Jan 2009 01:22:09 -0000	1.13
@@ -1,72 +1,57 @@
-src/
-2005-06-09  Roland McGrath  <roland at redhat.com>
-
-	* readelf.c (handle_dynamic, handle_symtab): Check for bogus sh_link.
-	(handle_verneed, handle_verdef, handle_versym, handle_hash): Likewise.
-	(handle_scngrp): Check for bogus sh_info.
-
-	* strip.c (handle_elf): Check for bogus values in sh_link, sh_info,
-	st_shndx, e_shstrndx, and SHT_GROUP or SHT_SYMTAB_SHNDX data.
-	Don't use assert on input values, instead bail with "illformed" error.
-
-2005-05-17  Jakub Jelinek  <jakub at redhat.com>
-
-libelf/
-	* elf32_getphdr.c (elfw2(LIBELFBITS,getphdr)): Check if program header
-	table fits into object's bounds.
-	* elf_getshstrndx.c (elf_getshstrndx): Add elf->start_offset to
-	elf->map_address.  Check if first section header fits into object's
-	bounds.
-	* elf32_getshdr.c (elfw2(LIBELFBITS,getshdr)):
-	Check if section header table fits into object's bounds.
-	* elf_begin.c (get_shnum): Ensure section headers fits into
-	object's bounds.
-	(file_read_elf): Make sure scncnt is small enough to allocate both
-	ElfXX_Shdr and Elf_Scn array.  Make sure section and program header
-	tables fit into object's bounds.  Avoid memory leak on failure.
-
-src/
-	* elflint.c (check_hash): Don't check entries beyond end of section.
-	(check_note): Don't crash if gelf_rawchunk fails.
-	(section_name): Return <invalid> if gelf_getshdr returns NULL.
-
-2005-05-14  Jakub Jelinek  <jakub at redhat.com>
-
-libelf/
-	* libelfP.h (INVALID_NDX): Define.
-	* gelf_getdyn.c (gelf_getdyn): Use it.  Remove ndx < 0 test if any.
-	* gelf_getlib.c (gelf_getlib): Likewise.
-	* gelf_getmove.c (gelf_getmove): Likewise.
-	* gelf_getrel.c (gelf_getrel): Likewise.
-	* gelf_getrela.c (gelf_getrela): Likewise.
-	* gelf_getsym.c (gelf_getsym): Likewise.
-	* gelf_getsyminfo.c (gelf_getsyminfo): Likewise.
-	* gelf_getsymshndx.c (gelf_getsymshndx): Likewise.
-	* gelf_getversym.c (gelf_getversym): Likewise.
-	* gelf_update_dyn.c (gelf_update_dyn): Likewise.
-	* gelf_update_lib.c (gelf_update_lib): Likewise.
-	* gelf_update_move.c (gelf_update_move): Likewise.
-	* gelf_update_rel.c (gelf_update_rel): Likewise.
-	* gelf_update_rela.c (gelf_update_rela): Likewise.
-	* gelf_update_sym.c (gelf_update_sym): Likewise.
-	* gelf_update_syminfo.c (gelf_update_syminfo): Likewise.
-	* gelf_update_symshndx.c (gelf_update_symshndx): Likewise.
-	* gelf_update_versym.c (gelf_update_versym): Likewise.
-	* elf_newscn.c (elf_newscn): Check for overflow.
-	* elf32_updatefile.c (__elfw2(LIBELFBITS,updatemmap)): Likewise.
-	(__elfw2(LIBELFBITS,updatefile)): Likewise.
-	* elf_begin.c (file_read_elf): Likewise.
-	* elf32_newphdr.c (elfw2(LIBELFBITS,newphdr)): Likewise.
-	* elf_getarsym.c (elf_getarsym): Likewise.
-	* elf32_getshdr.c (elfw2(LIBELFBITS,getshdr)): Likewise.
-src/
-	* elflint.c (section_name): Return "<invalid>" instead of
-	crashing on invalid section name.
-	(check_symtab, is_rel_dyn, check_rela, check_rel, check_dynamic,
-	check_symtab_shndx, check_hash, check_versym): Robustify.
-
---- elfutils-0.136/libelf/elf32_getphdr.c.robustify
-+++ elfutils-0.136/libelf/elf32_getphdr.c
+--- elfutils/libelf/ChangeLog
++++ elfutils/libelf/ChangeLog
+@@ -507,6 +507,49 @@
+ 	If section content hasn't been read yet, do it before looking for the
+ 	block size.  If no section data present, infer size of section header.
+ 
++2005-05-17  Jakub Jelinek  <jakub at redhat.com>
++
++	* elf32_getphdr.c (elfw2(LIBELFBITS,getphdr)): Check if program header
++	table fits into object's bounds.
++	* elf_getshstrndx.c (elf_getshstrndx): Add elf->start_offset to
++	elf->map_address.  Check if first section header fits into object's
++	bounds.
++	* elf32_getshdr.c (elfw2(LIBELFBITS,getshdr)):
++	Check if section header table fits into object's bounds.
++	* elf_begin.c (get_shnum): Ensure section headers fits into
++	object's bounds.
++	(file_read_elf): Make sure scncnt is small enough to allocate both
++	ElfXX_Shdr and Elf_Scn array.  Make sure section and program header
++	tables fit into object's bounds.  Avoid memory leak on failure.
++
++2005-05-14  Jakub Jelinek  <jakub at redhat.com>
++
++	* libelfP.h (INVALID_NDX): Define.
++	* gelf_getdyn.c (gelf_getdyn): Use it.  Remove ndx < 0 test if any.
++	* gelf_getlib.c (gelf_getlib): Likewise.
++	* gelf_getmove.c (gelf_getmove): Likewise.
++	* gelf_getrel.c (gelf_getrel): Likewise.
++	* gelf_getrela.c (gelf_getrela): Likewise.
++	* gelf_getsym.c (gelf_getsym): Likewise.
++	* gelf_getsyminfo.c (gelf_getsyminfo): Likewise.
++	* gelf_getsymshndx.c (gelf_getsymshndx): Likewise.
++	* gelf_getversym.c (gelf_getversym): Likewise.
++	* gelf_update_dyn.c (gelf_update_dyn): Likewise.
++	* gelf_update_lib.c (gelf_update_lib): Likewise.
++	* gelf_update_move.c (gelf_update_move): Likewise.
++	* gelf_update_rel.c (gelf_update_rel): Likewise.
++	* gelf_update_rela.c (gelf_update_rela): Likewise.
++	* gelf_update_sym.c (gelf_update_sym): Likewise.
++	* gelf_update_syminfo.c (gelf_update_syminfo): Likewise.
++	* gelf_update_symshndx.c (gelf_update_symshndx): Likewise.
++	* gelf_update_versym.c (gelf_update_versym): Likewise.
++	* elf_newscn.c (elf_newscn): Check for overflow.
++	* elf32_updatefile.c (__elfw2(LIBELFBITS,updatemmap)): Likewise.
++	(__elfw2(LIBELFBITS,updatefile)): Likewise.
++	* elf_begin.c (file_read_elf): Likewise.
++	* elf32_newphdr.c (elfw2(LIBELFBITS,newphdr)): Likewise.
++	* elf_getarsym.c (elf_getarsym): Likewise.
++	* elf32_getshdr.c (elfw2(LIBELFBITS,getshdr)): Likewise.
+ 2005-05-11  Ulrich Drepper  <drepper at redhat.com>
+ 
+ 	* elf.h: Update again.
+--- elfutils/libelf/elf32_getphdr.c
++++ elfutils/libelf/elf32_getphdr.c
 @@ -105,6 +105,16 @@ __elfw2(LIBELFBITS,getphdr_wrlock) (elf)
  
        if (elf->map_address != NULL)
@@ -84,8 +69,8 @@
  	  /* All the data is already mapped.  Use it.  */
  	  void *file_phdr = ((char *) elf->map_address
  			     + elf->start_offset + ehdr->e_phoff);
---- elfutils-0.136/libelf/elf32_getshdr.c.robustify
-+++ elfutils-0.136/libelf/elf32_getshdr.c
+--- elfutils/libelf/elf32_getshdr.c
++++ elfutils/libelf/elf32_getshdr.c
 @@ -1,5 +1,5 @@
  /* Return section header.
 -   Copyright (C) 1998, 1999, 2000, 2001, 2002, 2005, 2007 Red Hat, Inc.
@@ -93,7 +78,7 @@
     This file is part of Red Hat elfutils.
     Written by Ulrich Drepper <drepper at redhat.com>, 1998.
  
-@@ -81,7 +81,8 @@ load_shdr_rwlock (Elf_Scn *scn)
+@@ -81,7 +81,8 @@ load_shdr_wrlock (Elf_Scn *scn)
      goto out;
  
    size_t shnum;
@@ -103,7 +88,7 @@
      goto out;
    size_t size = shnum * sizeof (ElfW2(LIBELFBITS,Shdr));
  
-@@ -98,6 +99,16 @@ load_shdr_rwlock (Elf_Scn *scn)
+@@ -98,6 +99,16 @@ load_shdr_wrlock (Elf_Scn *scn)
  
    if (elf->map_address != NULL)
      {
@@ -120,8 +105,8 @@
        ElfW2(LIBELFBITS,Shdr) *notcvt;
  
        /* All the data is already mapped.  If we could use it
---- elfutils-0.136/libelf/elf32_newphdr.c.robustify
-+++ elfutils-0.136/libelf/elf32_newphdr.c
+--- elfutils/libelf/elf32_newphdr.c
++++ elfutils/libelf/elf32_newphdr.c
 @@ -124,6 +124,12 @@ elfw2(LIBELFBITS,newphdr) (elf, count)
    else if (elf->state.ELFW(elf,LIBELFBITS).ehdr->e_phnum != count
  	   || elf->state.ELFW(elf,LIBELFBITS).phdr == NULL)
@@ -135,9 +120,9 @@
        /* Allocate a new program header with the appropriate number of
  	 elements.  */
        result = (ElfW2(LIBELFBITS,Phdr) *)
---- elfutils-0.136/libelf/elf32_updatefile.c.robustify
-+++ elfutils-0.136/libelf/elf32_updatefile.c
-@@ -212,6 +212,9 @@ __elfw2(LIBELFBITS,updatemmap) (Elf *elf
+--- elfutils/libelf/elf32_updatefile.c
++++ elfutils/libelf/elf32_updatefile.c
+@@ -220,6 +220,9 @@ __elfw2(LIBELFBITS,updatemmap) (Elf *elf
    /* Write all the sections.  Well, only those which are modified.  */
    if (shnum > 0)
      {
@@ -147,7 +132,7 @@
        Elf_ScnList *list = &elf->state.ELFW(elf,LIBELFBITS).scns;
        Elf_Scn **scns = (Elf_Scn **) alloca (shnum * sizeof (Elf_Scn *));
        char *const shdr_start = ((char *) elf->map_address + elf->start_offset
-@@ -582,6 +585,10 @@ __elfw2(LIBELFBITS,updatefile) (Elf *elf
+@@ -633,6 +636,10 @@ __elfw2(LIBELFBITS,updatefile) (Elf *elf
    /* Write all the sections.  Well, only those which are modified.  */
    if (shnum > 0)
      {
@@ -158,9 +143,9 @@
        off_t shdr_offset = elf->start_offset + ehdr->e_shoff;
  #if EV_NUM != 2
        xfct_t shdr_fctp = __elf_xfctstom[__libelf_version - 1][EV_CURRENT - 1][ELFW(ELFCLASS, LIBELFBITS) - 1][ELF_T_SHDR];
---- elfutils-0.136/libelf/elf_begin.c.robustify
-+++ elfutils-0.136/libelf/elf_begin.c
-@@ -155,7 +155,8 @@ get_shnum (void *map_address, unsigned c
+--- elfutils/libelf/elf_begin.c
++++ elfutils/libelf/elf_begin.c
+@@ -165,7 +165,8 @@ get_shnum (void *map_address, unsigned c
  
        if (unlikely (result == 0) && ehdr.e32->e_shoff != 0)
  	{
@@ -170,7 +155,7 @@
  	    /* Cannot read the first section header.  */
  	    return 0;
  
-@@ -203,7 +204,8 @@ get_shnum (void *map_address, unsigned c
+@@ -213,7 +214,8 @@ get_shnum (void *map_address, unsigned c
  
        if (unlikely (result == 0) && ehdr.e64->e_shoff != 0)
  	{
@@ -180,7 +165,7 @@
  	    /* Cannot read the first section header.  */
  	    return 0;
  
-@@ -275,6 +277,15 @@ file_read_elf (int fildes, void *map_add
+@@ -285,6 +287,15 @@ file_read_elf (int fildes, void *map_add
      /* Could not determine the number of sections.  */
      return NULL;
  
@@ -196,7 +181,7 @@
    /* We can now allocate the memory.  */
    Elf *elf = allocate_elf (fildes, map_address, offset, maxsize, cmd, parent,
  			   ELF_K_ELF, scncnt * sizeof (Elf_Scn));
-@@ -308,13 +319,31 @@ file_read_elf (int fildes, void *map_add
+@@ -318,13 +329,31 @@ file_read_elf (int fildes, void *map_add
  	{
  	  /* We can use the mmapped memory.  */
  	  elf->state.elf32.ehdr = ehdr;
@@ -228,7 +213,7 @@
  
  	  for (size_t cnt = 0; cnt < scncnt; ++cnt)
  	    {
-@@ -396,13 +425,26 @@ file_read_elf (int fildes, void *map_add
+@@ -406,13 +435,26 @@ file_read_elf (int fildes, void *map_add
  	{
  	  /* We can use the mmapped memory.  */
  	  elf->state.elf64.ehdr = ehdr;
@@ -255,8 +240,8 @@
  
  	  for (size_t cnt = 0; cnt < scncnt; ++cnt)
  	    {
---- elfutils-0.136/libelf/elf_getarsym.c.robustify
-+++ elfutils-0.136/libelf/elf_getarsym.c
+--- elfutils/libelf/elf_getarsym.c
++++ elfutils/libelf/elf_getarsym.c
 @@ -179,6 +179,9 @@ elf_getarsym (elf, ptr)
        size_t index_size = atol (tmpbuf);
  
@@ -267,8 +252,8 @@
  	  || n * sizeof (uint32_t) > index_size)
  	{
  	  /* This index table cannot be right since it does not fit into
---- elfutils-0.136/libelf/elf_getshstrndx.c.robustify
-+++ elfutils-0.136/libelf/elf_getshstrndx.c
+--- elfutils/libelf/elf_getshstrndx.c
++++ elfutils/libelf/elf_getshstrndx.c
 @@ -125,10 +125,25 @@ elf_getshstrndx (elf, dst)
  	      if (elf->map_address != NULL
  		  && elf->state.elf32.ehdr->e_ident[EI_DATA] == MY_ELFDATA
@@ -325,8 +310,8 @@
  	      else
  		{
  		  /* We avoid reading in all the section headers.  Just read
---- elfutils-0.136/libelf/elf_newscn.c.robustify
-+++ elfutils-0.136/libelf/elf_newscn.c
+--- elfutils/libelf/elf_newscn.c
++++ elfutils/libelf/elf_newscn.c
 @@ -104,10 +104,18 @@ elf_newscn (elf)
    else
      {
@@ -347,8 +332,8 @@
        newp = (Elf_ScnList *) calloc (sizeof (Elf_ScnList)
  				     + ((elf->state.elf.scnincr *= 2)
  					* sizeof (Elf_Scn)), 1);
---- elfutils-0.136/libelf/gelf_getdyn.c.robustify
-+++ elfutils-0.136/libelf/gelf_getdyn.c
+--- elfutils/libelf/gelf_getdyn.c
++++ elfutils/libelf/gelf_getdyn.c
 @@ -93,7 +93,8 @@ gelf_getdyn (data, ndx, dst)
  	 table entries has to be adopted.  The user better has provided
  	 a buffer where we can store the information.  While copying the
@@ -369,8 +354,8 @@
  	{
  	  __libelf_seterrno (ELF_E_INVALID_INDEX);
  	  goto out;
---- elfutils-0.136/libelf/gelf_getlib.c.robustify
-+++ elfutils-0.136/libelf/gelf_getlib.c
+--- elfutils/libelf/gelf_getlib.c
++++ elfutils/libelf/gelf_getlib.c
 @@ -86,7 +86,8 @@ gelf_getlib (data, ndx, dst)
    /* The data is already in the correct form.  Just make sure the
       index is OK.  */
@@ -381,8 +366,8 @@
      __libelf_seterrno (ELF_E_INVALID_INDEX);
    else
      {
---- elfutils-0.136/libelf/gelf_getmove.c.robustify
-+++ elfutils-0.136/libelf/gelf_getmove.c
+--- elfutils/libelf/gelf_getmove.c
++++ elfutils/libelf/gelf_getmove.c
 @@ -83,7 +83,8 @@ gelf_getmove (data, ndx, dst)
  
    /* The data is already in the correct form.  Just make sure the
@@ -393,8 +378,8 @@
      {
        __libelf_seterrno (ELF_E_INVALID_INDEX);
        goto out;
---- elfutils-0.136/libelf/gelf_getrela.c.robustify
-+++ elfutils-0.136/libelf/gelf_getrela.c
+--- elfutils/libelf/gelf_getrela.c
++++ elfutils/libelf/gelf_getrela.c
 @@ -71,12 +71,6 @@ gelf_getrela (data, ndx, dst)
    if (data_scn == NULL)
      return NULL;
@@ -428,8 +413,8 @@
  	{
  	  __libelf_seterrno (ELF_E_INVALID_INDEX);
  	  result = NULL;
---- elfutils-0.136/libelf/gelf_getrel.c.robustify
-+++ elfutils-0.136/libelf/gelf_getrel.c
+--- elfutils/libelf/gelf_getrel.c
++++ elfutils/libelf/gelf_getrel.c
 @@ -71,12 +71,6 @@ gelf_getrel (data, ndx, dst)
    if (data_scn == NULL)
      return NULL;
@@ -463,8 +448,8 @@
  	{
  	  __libelf_seterrno (ELF_E_INVALID_INDEX);
  	  result = NULL;
---- elfutils-0.136/libelf/gelf_getsym.c.robustify
-+++ elfutils-0.136/libelf/gelf_getsym.c
+--- elfutils/libelf/gelf_getsym.c
++++ elfutils/libelf/gelf_getsym.c
 @@ -90,7 +90,8 @@ gelf_getsym (data, ndx, dst)
  	 table entries has to be adopted.  The user better has provided
  	 a buffer where we can store the information.  While copying the
@@ -485,8 +470,8 @@
  	{
  	  __libelf_seterrno (ELF_E_INVALID_INDEX);
  	  goto out;
---- elfutils-0.136/libelf/gelf_getsyminfo.c.robustify
-+++ elfutils-0.136/libelf/gelf_getsyminfo.c
+--- elfutils/libelf/gelf_getsyminfo.c
++++ elfutils/libelf/gelf_getsyminfo.c
 @@ -84,7 +84,8 @@ gelf_getsyminfo (data, ndx, dst)
  
    /* The data is already in the correct form.  Just make sure the
@@ -497,8 +482,8 @@
      {
        __libelf_seterrno (ELF_E_INVALID_INDEX);
        goto out;
---- elfutils-0.136/libelf/gelf_getsymshndx.c.robustify
-+++ elfutils-0.136/libelf/gelf_getsymshndx.c
+--- elfutils/libelf/gelf_getsymshndx.c
++++ elfutils/libelf/gelf_getsymshndx.c
 @@ -90,7 +90,9 @@ gelf_getsymshndx (symdata, shndxdata, nd
       section index table.  */
    if (likely (shndxdata_scn != NULL))
@@ -530,8 +515,8 @@
  	{
  	  __libelf_seterrno (ELF_E_INVALID_INDEX);
  	  goto out;
---- elfutils-0.136/libelf/gelf_getversym.c.robustify
-+++ elfutils-0.136/libelf/gelf_getversym.c
+--- elfutils/libelf/gelf_getversym.c
++++ elfutils/libelf/gelf_getversym.c
 @@ -92,7 +92,8 @@ gelf_getversym (data, ndx, dst)
  
    /* The data is already in the correct form.  Just make sure the
@@ -542,8 +527,8 @@
      {
        __libelf_seterrno (ELF_E_INVALID_INDEX);
        result = NULL;
---- elfutils-0.136/libelf/gelf_update_dyn.c.robustify
-+++ elfutils-0.136/libelf/gelf_update_dyn.c
+--- elfutils/libelf/gelf_update_dyn.c
++++ elfutils/libelf/gelf_update_dyn.c
 @@ -71,12 +71,6 @@ gelf_update_dyn (data, ndx, src)
    if (data == NULL)
      return 0;
@@ -577,8 +562,8 @@
  	{
  	  __libelf_seterrno (ELF_E_INVALID_INDEX);
  	  goto out;
---- elfutils-0.136/libelf/gelf_update_lib.c.robustify
-+++ elfutils-0.136/libelf/gelf_update_lib.c
+--- elfutils/libelf/gelf_update_lib.c
++++ elfutils/libelf/gelf_update_lib.c
 @@ -68,12 +68,6 @@ gelf_update_lib (data, ndx, src)
    if (data == NULL)
      return 0;
@@ -602,8 +587,8 @@
      __libelf_seterrno (ELF_E_INVALID_INDEX);
    else
      {
---- elfutils-0.136/libelf/gelf_update_move.c.robustify
-+++ elfutils-0.136/libelf/gelf_update_move.c
+--- elfutils/libelf/gelf_update_move.c
++++ elfutils/libelf/gelf_update_move.c
 @@ -75,7 +75,7 @@ gelf_update_move (data, ndx, src)
    assert (sizeof (GElf_Move) == sizeof (Elf64_Move));
  
@@ -613,8 +598,8 @@
        || unlikely ((ndx + 1) * sizeof (GElf_Move) > data_scn->d.d_size))
      {
        __libelf_seterrno (ELF_E_INVALID_INDEX);
---- elfutils-0.136/libelf/gelf_update_rela.c.robustify
-+++ elfutils-0.136/libelf/gelf_update_rela.c
+--- elfutils/libelf/gelf_update_rela.c
++++ elfutils/libelf/gelf_update_rela.c
 @@ -68,12 +68,6 @@ gelf_update_rela (Elf_Data *dst, int ndx
    if (dst == NULL)
      return 0;
@@ -648,8 +633,8 @@
  	{
  	  __libelf_seterrno (ELF_E_INVALID_INDEX);
  	  goto out;
---- elfutils-0.136/libelf/gelf_update_rel.c.robustify
-+++ elfutils-0.136/libelf/gelf_update_rel.c
+--- elfutils/libelf/gelf_update_rel.c
++++ elfutils/libelf/gelf_update_rel.c
 @@ -68,12 +68,6 @@ gelf_update_rel (Elf_Data *dst, int ndx,
    if (dst == NULL)
      return 0;
@@ -683,8 +668,8 @@
  	{
  	  __libelf_seterrno (ELF_E_INVALID_INDEX);
  	  goto out;
---- elfutils-0.136/libelf/gelf_update_sym.c.robustify
-+++ elfutils-0.136/libelf/gelf_update_sym.c
+--- elfutils/libelf/gelf_update_sym.c
++++ elfutils/libelf/gelf_update_sym.c
 @@ -72,12 +72,6 @@ gelf_update_sym (data, ndx, src)
    if (data == NULL)
      return 0;
@@ -718,8 +703,8 @@
  	{
  	  __libelf_seterrno (ELF_E_INVALID_INDEX);
  	  goto out;
---- elfutils-0.136/libelf/gelf_update_syminfo.c.robustify
-+++ elfutils-0.136/libelf/gelf_update_syminfo.c
+--- elfutils/libelf/gelf_update_syminfo.c
++++ elfutils/libelf/gelf_update_syminfo.c
 @@ -72,12 +72,6 @@ gelf_update_syminfo (data, ndx, src)
    if (data == NULL)
      return 0;
@@ -743,8 +728,8 @@
      {
        __libelf_seterrno (ELF_E_INVALID_INDEX);
        goto out;
---- elfutils-0.136/libelf/gelf_update_symshndx.c.robustify
-+++ elfutils-0.136/libelf/gelf_update_symshndx.c
+--- elfutils/libelf/gelf_update_symshndx.c
++++ elfutils/libelf/gelf_update_symshndx.c
 @@ -77,12 +77,6 @@ gelf_update_symshndx (symdata, shndxdata
    if (symdata == NULL)
      return 0;
@@ -778,8 +763,8 @@
  	{
  	  __libelf_seterrno (ELF_E_INVALID_INDEX);
  	  goto out;
---- elfutils-0.136/libelf/gelf_update_versym.c.robustify
-+++ elfutils-0.136/libelf/gelf_update_versym.c
+--- elfutils/libelf/gelf_update_versym.c
++++ elfutils/libelf/gelf_update_versym.c
 @@ -75,7 +75,7 @@ gelf_update_versym (data, ndx, src)
    assert (sizeof (GElf_Versym) == sizeof (Elf64_Versym));
  
@@ -789,8 +774,8 @@
        || unlikely ((ndx + 1) * sizeof (GElf_Versym) > data_scn->d.d_size))
      {
        __libelf_seterrno (ELF_E_INVALID_INDEX);
---- elfutils-0.136/libelf/libelfP.h.robustify
-+++ elfutils-0.136/libelf/libelfP.h
+--- elfutils/libelf/libelfP.h
++++ elfutils/libelf/libelfP.h
 @@ -611,4 +611,13 @@ extern uint32_t __libelf_crc32 (uint32_t
  /* Align offset to 4 bytes as needed for note name and descriptor data.  */
  #define NOTE_ALIGN(n)	(((n) + 3) & -4U)
@@ -805,9 +790,48 @@
 +#endif
 +
  #endif  /* libelfP.h */
---- elfutils-0.136/src/elflint.c.robustify
-+++ elfutils-0.136/src/elflint.c
-@@ -131,6 +131,9 @@ static uint32_t shstrndx;
+--- elfutils/src/ChangeLog
++++ elfutils/src/ChangeLog
+@@ -1297,6 +1297,16 @@
+ 	object symbols or symbols with unknown type.
+ 	(check_rel): Likewise.
+ 
++2005-06-09  Roland McGrath  <roland at redhat.com>
++
++	* readelf.c (handle_dynamic, handle_symtab): Check for bogus sh_link.
++	(handle_verneed, handle_verdef, handle_versym, handle_hash): Likewise.
++	(handle_scngrp): Check for bogus sh_info.
++
++	* strip.c (handle_elf): Check for bogus values in sh_link, sh_info,
++	st_shndx, e_shstrndx, and SHT_GROUP or SHT_SYMTAB_SHNDX data.
++	Don't use assert on input values, instead bail with "illformed" error.
++
+ 2005-06-08  Roland McGrath  <roland at redhat.com>
+ 
+ 	* readelf.c (print_ops): Add consts.
+@@ -1342,6 +1352,19 @@
+ 
+ 	* readelf.c (dwarf_tag_string): Add new tags.
+ 
++2005-05-17  Jakub Jelinek  <jakub at redhat.com>
++
++	* elflint.c (check_hash): Don't check entries beyond end of section.
++	(check_note): Don't crash if gelf_rawchunk fails.
++	(section_name): Return <invalid> if gelf_getshdr returns NULL.
++
++2005-05-14  Jakub Jelinek  <jakub at redhat.com>
++
++	* elflint.c (section_name): Return "<invalid>" instead of
++	crashing on invalid section name.
++	(check_symtab, is_rel_dyn, check_rela, check_rel, check_dynamic,
++	check_symtab_shndx, check_hash, check_versym): Robustify.
++
+ 2005-05-08  Roland McGrath  <roland at redhat.com>
+ 
+ 	* strip.c (handle_elf): Don't translate hash and versym data formats,
+--- elfutils/src/elflint.c
++++ elfutils/src/elflint.c
+@@ -130,6 +130,9 @@ static uint32_t shstrndx;
  /* Array to count references in section groups.  */
  static int *scnref;
  
@@ -817,7 +841,7 @@
  
  int
  main (int argc, char *argv[])
-@@ -320,10 +323,19 @@ section_name (Ebl *ebl, int idx)
+@@ -319,10 +322,19 @@ section_name (Ebl *ebl, int idx)
  {
    GElf_Shdr shdr_mem;
    GElf_Shdr *shdr;
@@ -838,7 +862,7 @@
  }
  
  
-@@ -345,10 +357,6 @@ static const int valid_e_machine[] =
+@@ -344,10 +356,6 @@ static const int valid_e_machine[] =
    (sizeof (valid_e_machine) / sizeof (valid_e_machine[0]))
  
  
@@ -849,7 +873,7 @@
  static void
  check_elf_header (Ebl *ebl, GElf_Ehdr *ehdr, size_t size)
  {
-@@ -613,7 +621,8 @@ section [%2d] '%s': symbol table cannot 
+@@ -612,7 +620,8 @@ section [%2d] '%s': symbol table cannot 
  	  }
        }
  
@@ -859,7 +883,7 @@
      ERROR (gettext ("\
  section [%2u] '%s': entry size is does not match ElfXX_Sym\n"),
  	   idx, section_name (ebl, idx));
-@@ -651,7 +660,7 @@ section [%2d] '%s': XINDEX for zeroth en
+@@ -650,7 +659,7 @@ section [%2d] '%s': XINDEX for zeroth en
  	       xndxscnidx, section_name (ebl, xndxscnidx));
      }
  
@@ -868,7 +892,7 @@
      {
        sym = gelf_getsymshndx (data, xndxdata, cnt, &sym_mem, &xndx);
        if (sym == NULL)
-@@ -671,7 +680,8 @@ section [%2d] '%s': symbol %zu: invalid 
+@@ -670,7 +679,8 @@ section [%2d] '%s': symbol %zu: invalid 
        else
  	{
  	  name = elf_strptr (ebl->elf, shdr->sh_link, sym->st_name);
@@ -878,7 +902,7 @@
  	}
  
        if (sym->st_shndx == SHN_XINDEX)
-@@ -1001,9 +1011,11 @@ is_rel_dyn (Ebl *ebl, const GElf_Ehdr *e
+@@ -1000,9 +1010,11 @@ is_rel_dyn (Ebl *ebl, const GElf_Ehdr *e
      {
        GElf_Shdr rcshdr_mem;
        const GElf_Shdr *rcshdr = gelf_getshdr (scn, &rcshdr_mem);
@@ -892,7 +916,7 @@
  	{
  	  /* Found the dynamic section.  Look through it.  */
  	  Elf_Data *d = elf_getdata (scn, NULL);
-@@ -1013,7 +1025,9 @@ is_rel_dyn (Ebl *ebl, const GElf_Ehdr *e
+@@ -1012,7 +1024,9 @@ is_rel_dyn (Ebl *ebl, const GElf_Ehdr *e
  	    {
  	      GElf_Dyn dyn_mem;
  	      GElf_Dyn *dyn = gelf_getdyn (d, cnt, &dyn_mem);
@@ -903,7 +927,7 @@
  
  	      if (dyn->d_tag == DT_RELCOUNT)
  		{
-@@ -1027,7 +1041,9 @@ section [%2d] '%s': DT_RELCOUNT used for
+@@ -1026,7 +1040,9 @@ section [%2d] '%s': DT_RELCOUNT used for
  		      /* Does the number specified number of relative
  			 relocations exceed the total number of
  			 relocations?  */
@@ -914,7 +938,7 @@
  			ERROR (gettext ("\
  section [%2d] '%s': DT_RELCOUNT value %d too high for this section\n"),
  			       idx, section_name (ebl, idx),
-@@ -1187,7 +1203,8 @@ section [%2d] '%s': no relocations for m
+@@ -1186,7 +1202,8 @@ section [%2d] '%s': no relocations for m
  	}
      }
  
@@ -924,7 +948,7 @@
      ERROR (gettext (reltype == ELF_T_RELA ? "\
  section [%2d] '%s': section entry size does not match ElfXX_Rela\n" : "\
  section [%2d] '%s': section entry size does not match ElfXX_Rel\n"),
-@@ -1410,7 +1427,8 @@ check_rela (Ebl *ebl, GElf_Ehdr *ehdr, G
+@@ -1409,7 +1426,8 @@ check_rela (Ebl *ebl, GElf_Ehdr *ehdr, G
    Elf_Data *symdata = elf_getdata (symscn, NULL);
    enum load_state state = state_undecided;
  
@@ -934,7 +958,7 @@
      {
        GElf_Rela rela_mem;
        GElf_Rela *rela = gelf_getrela (data, cnt, &rela_mem);
-@@ -1460,7 +1478,8 @@ check_rel (Ebl *ebl, GElf_Ehdr *ehdr, GE
+@@ -1459,7 +1477,8 @@ check_rel (Ebl *ebl, GElf_Ehdr *ehdr, GE
    Elf_Data *symdata = elf_getdata (symscn, NULL);
    enum load_state state = state_undecided;
  
@@ -944,7 +968,7 @@
      {
        GElf_Rel rel_mem;
        GElf_Rel *rel = gelf_getrel (data, cnt, &rel_mem);
-@@ -1563,7 +1582,8 @@ section [%2d] '%s': referenced as string
+@@ -1562,7 +1581,8 @@ section [%2d] '%s': referenced as string
  	   shdr->sh_link, section_name (ebl, shdr->sh_link),
  	   idx, section_name (ebl, idx));
  
@@ -954,7 +978,7 @@
      ERROR (gettext ("\
  section [%2d] '%s': section entry size does not match ElfXX_Dyn\n"),
  	   idx, section_name (ebl, idx));
-@@ -1573,7 +1593,7 @@ section [%2d] '%s': section entry size d
+@@ -1572,7 +1592,7 @@ section [%2d] '%s': section entry size d
  	   idx, section_name (ebl, idx));
  
    bool non_null_warned = false;
@@ -963,7 +987,7 @@
      {
        GElf_Dyn dyn_mem;
        GElf_Dyn *dyn = gelf_getdyn (data, cnt, &dyn_mem);
-@@ -1854,6 +1874,8 @@ section [%2d] '%s': entry size does not 
+@@ -1853,6 +1873,8 @@ section [%2d] '%s': entry size does not 
  	   idx, section_name (ebl, idx));
  
    if (symshdr != NULL
@@ -972,7 +996,7 @@
        && (shdr->sh_size / shdr->sh_entsize
  	  < symshdr->sh_size / symshdr->sh_entsize))
      ERROR (gettext ("\
-@@ -1880,6 +1902,12 @@ section [%2d] '%s': extended section ind
+@@ -1879,6 +1901,12 @@ section [%2d] '%s': extended section ind
      }
  
    Elf_Data *data = elf_getdata (elf_getscn (ebl->elf, idx), NULL);
@@ -985,7 +1009,7 @@
  
    if (*((Elf32_Word *) data->d_buf) != 0)
      ERROR (gettext ("symbol 0 should have zero extended section index\n"));
-@@ -1922,7 +1950,7 @@ section [%2d] '%s': hash table section i
+@@ -1921,7 +1949,7 @@ section [%2d] '%s': hash table section i
  
    size_t maxidx = nchain;
  
@@ -994,7 +1018,7 @@
      {
        size_t symsize = symshdr->sh_size / symshdr->sh_entsize;
  
-@@ -1933,18 +1961,28 @@ section [%2d] '%s': hash table section i
+@@ -1932,18 +1960,28 @@ section [%2d] '%s': hash table section i
        maxidx = symsize;
      }
  
@@ -1025,7 +1049,7 @@
  }
  
  
-@@ -1974,18 +2012,28 @@ section [%2d] '%s': hash table section i
+@@ -1973,18 +2011,28 @@ section [%2d] '%s': hash table section i
        maxidx = symsize;
      }
  
@@ -1057,7 +1081,7 @@
  }
  
  
-@@ -2010,7 +2058,7 @@ section [%2d] '%s': bitmask size not pow
+@@ -2009,7 +2057,7 @@ section [%2d] '%s': bitmask size not pow
    if (shdr->sh_size < (4 + bitmask_words + nbuckets) * sizeof (Elf32_Word))
      {
        ERROR (gettext ("\
@@ -1066,7 +1090,7 @@
  	     idx, section_name (ebl, idx), (long int) shdr->sh_size,
  	     (long int) ((4 + bitmask_words + nbuckets) * sizeof (Elf32_Word)));
        return;
-@@ -2682,8 +2730,9 @@ section [%2d] '%s' refers in sh_link to 
+@@ -2681,8 +2729,9 @@ section [%2d] '%s' refers in sh_link to 
  
    /* The number of elements in the version symbol table must be the
       same as the number of symbols.  */
@@ -1078,9 +1102,9 @@
      ERROR (gettext ("\
  section [%2d] '%s' has different number of entries than symbol table [%2d] '%s'\n"),
  	   idx, section_name (ebl, idx),
---- elfutils-0.136/src/readelf.c.robustify
-+++ elfutils-0.136/src/readelf.c
-@@ -1111,6 +1111,8 @@ handle_scngrp (Ebl *ebl, Elf_Scn *scn, G
+--- elfutils/src/readelf.c
++++ elfutils/src/readelf.c
+@@ -1130,6 +1130,8 @@ handle_scngrp (Ebl *ebl, Elf_Scn *scn, G
    Elf32_Word *grpref = (Elf32_Word *) data->d_buf;
  
    GElf_Sym sym_mem;
@@ -1089,7 +1113,7 @@
    printf ((grpref[0] & GRP_COMDAT)
  	  ? ngettext ("\
  \nCOMDAT section group [%2zu] '%s' with signature '%s' contains %zu entry:\n",
-@@ -1123,8 +1125,8 @@ handle_scngrp (Ebl *ebl, Elf_Scn *scn, G
+@@ -1142,8 +1144,8 @@ handle_scngrp (Ebl *ebl, Elf_Scn *scn, G
  		      data->d_size / sizeof (Elf32_Word) - 1),
  	  elf_ndxscn (scn),
  	  elf_strptr (ebl->elf, shstrndx, shdr->sh_name),
@@ -1100,7 +1124,7 @@
  	  ?: gettext ("<INVALID SYMBOL>"),
  	  data->d_size / sizeof (Elf32_Word) - 1);
  
-@@ -1275,7 +1277,8 @@ static void
+@@ -1294,7 +1296,8 @@ static void
  handle_dynamic (Ebl *ebl, Elf_Scn *scn, GElf_Shdr *shdr)
  {
    int class = gelf_getclass (ebl->elf);
@@ -1110,7 +1134,7 @@
    Elf_Data *data;
    size_t cnt;
    size_t shstrndx;
-@@ -1290,6 +1293,11 @@ handle_dynamic (Ebl *ebl, Elf_Scn *scn, 
+@@ -1309,6 +1312,11 @@ handle_dynamic (Ebl *ebl, Elf_Scn *scn, 
      error (EXIT_FAILURE, 0,
  	   gettext ("cannot get section header string table index"));
  
@@ -1122,7 +1146,7 @@
    printf (ngettext ("\
  \nDynamic segment contains %lu entry:\n Addr: %#0*" PRIx64 "  Offset: %#08" PRIx64 "  Link to section: [%2u] '%s'\n",
  		    "\
-@@ -1299,9 +1307,7 @@ handle_dynamic (Ebl *ebl, Elf_Scn *scn, 
+@@ -1318,9 +1326,7 @@ handle_dynamic (Ebl *ebl, Elf_Scn *scn, 
  	  class == ELFCLASS32 ? 10 : 18, shdr->sh_addr,
  	  shdr->sh_offset,
  	  (int) shdr->sh_link,
@@ -1133,7 +1157,7 @@
    fputs_unlocked (gettext ("  Type              Value\n"), stdout);
  
    for (cnt = 0; cnt < shdr->sh_size / shdr->sh_entsize; ++cnt)
-@@ -1801,6 +1807,13 @@ handle_symtab (Ebl *ebl, Elf_Scn *scn, G
+@@ -1820,6 +1826,13 @@ handle_symtab (Ebl *ebl, Elf_Scn *scn, G
      error (EXIT_FAILURE, 0,
  	   gettext ("cannot get section header string table index"));
  
@@ -1147,7 +1171,7 @@
    /* Now we can compute the number of entries in the section.  */
    unsigned int nsyms = data->d_size / (class == ELFCLASS32
  				       ? sizeof (Elf32_Sym)
-@@ -1811,15 +1824,12 @@ handle_symtab (Ebl *ebl, Elf_Scn *scn, G
+@@ -1830,15 +1843,12 @@ handle_symtab (Ebl *ebl, Elf_Scn *scn, G
  		    nsyms),
  	  (unsigned int) elf_ndxscn (scn),
  	  elf_strptr (ebl->elf, shstrndx, shdr->sh_name), nsyms);
@@ -1164,7 +1188,7 @@
  
    fputs_unlocked (class == ELFCLASS32
  		  ? gettext ("\
-@@ -2055,7 +2065,13 @@ handle_verneed (Ebl *ebl, Elf_Scn *scn, 
+@@ -2074,7 +2084,13 @@ handle_verneed (Ebl *ebl, Elf_Scn *scn, 
      error (EXIT_FAILURE, 0,
  	   gettext ("cannot get section header string table index"));
  
@@ -1179,7 +1203,7 @@
    printf (ngettext ("\
  \nVersion needs section [%2u] '%s' contains %d entry:\n Addr: %#0*" PRIx64 "  Offset: %#08" PRIx64 "  Link to section: [%2u] '%s'\n",
  		    "\
-@@ -2066,9 +2082,7 @@ handle_verneed (Ebl *ebl, Elf_Scn *scn, 
+@@ -2085,9 +2101,7 @@ handle_verneed (Ebl *ebl, Elf_Scn *scn, 
  	  class == ELFCLASS32 ? 10 : 18, shdr->sh_addr,
  	  shdr->sh_offset,
  	  (unsigned int) shdr->sh_link,
@@ -1190,7 +1214,7 @@
  
    unsigned int offset = 0;
    for (int cnt = shdr->sh_info; --cnt >= 0; )
-@@ -2121,8 +2135,14 @@ handle_verdef (Ebl *ebl, Elf_Scn *scn, G
+@@ -2140,8 +2154,14 @@ handle_verdef (Ebl *ebl, Elf_Scn *scn, G
      error (EXIT_FAILURE, 0,
  	   gettext ("cannot get section header string table index"));
  
@@ -1206,7 +1230,7 @@
    printf (ngettext ("\
  \nVersion definition section [%2u] '%s' contains %d entry:\n Addr: %#0*" PRIx64 "  Offset: %#08" PRIx64 "  Link to section: [%2u] '%s'\n",
  		    "\
-@@ -2134,9 +2154,7 @@ handle_verdef (Ebl *ebl, Elf_Scn *scn, G
+@@ -2153,9 +2173,7 @@ handle_verdef (Ebl *ebl, Elf_Scn *scn, G
  	  class == ELFCLASS32 ? 10 : 18, shdr->sh_addr,
  	  shdr->sh_offset,
  	  (unsigned int) shdr->sh_link,
@@ -1217,7 +1241,7 @@
  
    unsigned int offset = 0;
    for (int cnt = shdr->sh_info; --cnt >= 0; )
-@@ -2398,8 +2416,14 @@ handle_versym (Ebl *ebl, Elf_Scn *scn, G
+@@ -2417,8 +2435,14 @@ handle_versym (Ebl *ebl, Elf_Scn *scn, G
        filename = NULL;
      }
  
@@ -1233,7 +1257,7 @@
    printf (ngettext ("\
  \nVersion symbols section [%2u] '%s' contains %d entry:\n Addr: %#0*" PRIx64 "  Offset: %#08" PRIx64 "  Link to section: [%2u] '%s'",
  		    "\
-@@ -2411,9 +2435,7 @@ handle_versym (Ebl *ebl, Elf_Scn *scn, G
+@@ -2430,9 +2454,7 @@ handle_versym (Ebl *ebl, Elf_Scn *scn, G
  	  class == ELFCLASS32 ? 10 : 18, shdr->sh_addr,
  	  shdr->sh_offset,
  	  (unsigned int) shdr->sh_link,
@@ -1244,7 +1268,7 @@
  
    /* Now we can finally look at the actual contents of this section.  */
    for (unsigned int cnt = 0; cnt < shdr->sh_size / shdr->sh_entsize; ++cnt)
-@@ -2465,7 +2487,17 @@ print_hash_info (Ebl *ebl, Elf_Scn *scn,
+@@ -2484,7 +2506,17 @@ print_hash_info (Ebl *ebl, Elf_Scn *scn,
    for (Elf32_Word cnt = 0; cnt < nbucket; ++cnt)
      ++counts[lengths[cnt]];
  
@@ -1263,7 +1287,7 @@
    printf (ngettext ("\
  \nHistogram for bucket list length in section [%2u] '%s' (total of %d bucket):\n Addr: %#0*" PRIx64 "  Offset: %#08" PRIx64 "  Link to section: [%2u] '%s'\n",
  		    "\
-@@ -2478,9 +2510,7 @@ print_hash_info (Ebl *ebl, Elf_Scn *scn,
+@@ -2497,9 +2529,7 @@ print_hash_info (Ebl *ebl, Elf_Scn *scn,
  	  shdr->sh_addr,
  	  shdr->sh_offset,
  	  (unsigned int) shdr->sh_link,
@@ -1274,7 +1298,7 @@
  
    if (extrastr != NULL)
      fputs (extrastr, stdout);
-@@ -4039,6 +4069,16 @@ print_debug_aranges_section (Dwfl_Module
+@@ -4058,6 +4088,16 @@ print_debug_aranges_section (Dwfl_Module
        return;
      }
  
@@ -1289,10 +1313,10 @@
 +    }
 +
    printf (ngettext ("\
- \nDWARF section '%s' at offset %#" PRIx64 " contains %zu entry:\n",
+ \nDWARF section [%2zu] '%s' at offset %#" PRIx64 " contains %zu entry:\n",
  		    "\
---- elfutils-0.136/src/strip.c.robustify
-+++ elfutils-0.136/src/strip.c
+--- elfutils/src/strip.c
++++ elfutils/src/strip.c
 @@ -544,6 +544,11 @@ handle_elf (int fd, Elf *elf, const char
        goto fail_close;
      }


Index: elfutils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/elfutils/F-10/elfutils.spec,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -r1.110 -r1.111
--- elfutils.spec	31 Dec 2008 22:12:42 -0000	1.110
+++ elfutils.spec	24 Jan 2009 01:22:09 -0000	1.111
@@ -1,4 +1,4 @@
-%define eu_version 0.138
+%define eu_version 0.139
 %define eu_release 1
 
 %if %{?_with_compat:1}%{!?_with_compat:0}
@@ -33,8 +33,8 @@
 Group: Development/Tools
 URL: https://fedorahosted.org/elfutils/
 Source: http://fedorahosted.org/releases/e/l/elfutils/%{name}-%{version}.tar.bz2
-Patch1: elfutils-portability.patch
-Patch2: elfutils-robustify.patch
+Patch1: elfutils-robustify.patch
+Patch2: elfutils-portability.patch
 Requires: elfutils-libelf-%{_arch} = %{version}-%{release}
 Requires: elfutils-libs-%{_arch} = %{version}-%{release}
 
@@ -50,6 +50,19 @@
 BuildRequires: gcc >= 3.2
 %endif
 
+%define use_zlib 0
+%if 0%{?fedora} >= 5
+%define use_zlib 1
+%endif
+%if 0%{?rhel} >= 5
+%define use_zlib 1
+%endif
+
+%if %{use_zlib}
+BuildRequires: zlib-devel >= 1.2.2.3
+BuildRequires: bzip2-devel
+%endif
+
 %define _gnu %{nil}
 %define _program_prefix eu-
 
@@ -142,19 +155,19 @@
 %prep
 %setup -q
 
-%if !0%{?scanf_has_m}
-sed -i.scanf-m -e 's/%m/%a/' tests/line2addr.c
-%endif
+%patch1 -p1 -b .robustify
 
 %if %{compat}
-%patch1 -p1 -b .portability
+%patch2 -p1 -b .portability
 sleep 1
 find . \( -name Makefile.in -o -name aclocal.m4 \) -print | xargs touch
 sleep 1
 find . \( -name configure -o -name config.h.in \) -print | xargs touch
+%else
+%if !0%{?scanf_has_m}
+sed -i.scanf-m -e 's/%m/%a/g' src/addr2line.c tests/line2addr.c
+%endif
 %endif
-
-%patch2 -p1 -b .robustify
 
 find . -name \*.sh ! -perm -0100 -print | xargs chmod +x
 
@@ -263,6 +276,17 @@
 %{_libdir}/libelf.a
 
 %changelog
+* Fri Jan 23 2009 Roland McGrath <roland at redhat.com> - 0.139-1
+- Update to 0.139
+  - libcpu: Add Intel SSE4 disassembler support
+  - readelf: Implement call frame information and exception handling dumping.
+    	     Add -e option.  Enable it implicitly for -a.
+  - elflint: Check PT_GNU_EH_FRAME program header entry.
+  - libdwfl: Support automatic gzip/bzip2 decompression of ELF files. (#472136)
+
+* Thu Jan  1 2009 Roland McGrath <roland at redhat.com> - 0.138-2
+- Fix libelf regression.
+
 * Wed Dec 31 2008 Roland McGrath <roland at redhat.com> - 0.138-1
 - Update to 0.138
   - Install <elfutils/version.h> header file for applications to use in


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/elfutils/F-10/sources,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- sources	31 Dec 2008 22:12:42 -0000	1.49
+++ sources	24 Jan 2009 01:22:09 -0000	1.50
@@ -1 +1 @@
-1a846d275cb6c8ab995fa0fa877113ff  elfutils-0.138.tar.bz2
+9cfc12ac0d6d14968e253639fa957946  elfutils-0.139.tar.bz2


Index: upstream-key.gpg
===================================================================
RCS file: /cvs/pkgs/rpms/elfutils/F-10/upstream-key.gpg,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- upstream-key.gpg	9 Apr 2008 21:51:31 -0000	1.1
+++ upstream-key.gpg	24 Jan 2009 01:22:09 -0000	1.2
@@ -1,123 +1,109 @@
+pub   1024D/7EBBD625 2003-01-10
+uid                  Roland McGrath <roland at frob.com>
+uid                  Roland McGrath <frob at debian.org>
+uid                  Roland McGrath <roland at gnu.org>
+uid                  Roland McGrath <roland at redhat.com>
+sub   2048g/17998A93 2003-01-10
+
 pub   1024D/79FF4474 2001-08-24
 uid                  Ulrich Drepper <drepper at akkadia.org>
 uid                  Ulrich Drepper <drepper at redhat.com>
-uid                  [jpeg image of size 2203]
 sub   2048g/07FA6550 2001-08-24
 
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.4.7 (GNU/Linux)
+Version: GnuPG v1.4.5 (GNU/Linux)
 
-mQGiBDuFth0RBACPcHEkyqJE26wTXuuuCxpqJjxlBnNFkJGkWUoeu89QjzWgzXy/
-EA8+ptNBgCTPKnLEqhkRUyxAT/Uz+t+xbKqUtL54IzYfxO4NQsN/VVM0uppNfIJb
-MWvAjvpp2HCkd/32i693rlH+G9dvG8K57by3PBRHBgH2L8Q7t/QvA2AWpwCgzokX
-DDUiitysGn4rWO0rBBoR6OED/3ehpcHtbGixNoubRZAxpw99VTKs/I76OkrQzqcm
-+w+zwZeihJXC88yAHA77/LBB3YKaX3G4CmDQUbeRJ9zPlETTLmRMcF61dQdq/3qV
-Biq1sm6ctZ4uEpm8HnysKMT+VY4Xmj9LLzF2BdING9frcX9rk8Vk25iCLBronS0M
-IU3WA/sEvlUFlfbyCBRBoq+Rlr9u05fnHc7CLMKI7EIS1T1dLPxH1ivuUhyYNGAM
-RhCivBbT2Z0t/R4ksu3VdnPGkCyAAdWNSafSGqCYUzQH0u5Z8HK6c2iXrIX3Ipk5
-DhQOQ6k1tyYzuQw3cCf7RYRJ9/iup8RlscVt2kmGnSucqpxJCbQjVWxyaWNoIERy
-ZXBwZXIgPGRyZXBwZXJAcmVkaGF0LmNvbT6IRgQQEQIABgUCPIkA7wAKCRBVlt0M
-6b9lPe8IAJ9UVZehWyB1VZk9tuJzqeW/fDmVZwCfXoV8zOtEW5hot5CTUt9CCPkh
-n7eIRgQQEQIABgUCRec5UAAKCRB0q9d6LPEagCPxAKCMM03ny+O3QyC5+vNGRozq
-i60V8gCgoD5UbvrmbTXcmE3ojuLXFC+NhFqIRgQQEQIABgUCRx2D0gAKCRDHJIY3
-TSCJ234UAJwJwIETvdovyN9uvTkfWXLMks4+tACeP/S4+pjdt++dzym5J9MPzrBM
-oC2IRgQQEQIABgUCRx2D8wAKCRB2nZNyaMUfOCojAJ9AbgZY4yAZijk45PDOsYR/
-DW633ACfYzEcj9oYoqXfUuHBl0YBJLmYXh+IRgQQEQIABgUCRx3yzAAKCRBSNIRd
-8rkg9aHnAKD7iptz5ni0z74qgFQMGG1mJP62FQCgnDjSDB8FLKkNhK9aIxc49Mqj
-deeIRgQQEQIABgUCRx3yzAAKCRBSNIRd8rkg9fAkAJwLDoqhNWPJ9/xH2pB2pHH4
-fl0S0QCfakhHUYZZOwsIbRWitVxj2x9YBC2IRgQSEQIABgUCPsFP0gAKCRDXV5dM
-QyvG1Dd1AKC64m6qOuOGk+ehl0/0EJ82MMxhJQCgpvGT9jNKuYor05F+1LT0XCZU
-JMOIRgQSEQIABgUCQbYILgAKCRBl/LSO4fnVa76lAJ0dOjyXnw3fuzpAOvOzz6OA
-/kW99wCfVLILUMVOv/fHfResby6KT7KuCUeIRgQTEQIABgUCPU77dAAKCRD90t6s
-0zPLoVMtAKDagEwY9rrBLSXbhh7pCmfZkGsnBQCfcpatDJmScDGd+vfXuq4DIhwD
-AFWIRgQTEQIABgUCRyHsjgAKCRBPq0nLRJVA8gL7AKC4EsZIH49moYSyvj9xwlk2
-5/iD6wCePe/sbg6DNT3IEBL8ByG48mQ9KC+IVwQTEQIAFwUCO4W2HQULBwoDBAMV
-AwIDFgIBAheAAAoJENoowjp5/0R0SqUAoL5HBbaRWR19vjldUeJvYCG2AR94AKDL
-nmVEaykaZWyyNg0OTuxLe1boa4hfBBMRAgAXBQI7hbYdBQsHCgMEAxUDAgMWAgEC
-F4AAEgkQ2ijCOnn/RHQHZUdQRwABAUqlAKC+RwW2kVkdfb45XVHib2AhtgEfeACg
-y55lRGspGmVssjYNDk7sS3tW6Gu0JFVscmljaCBEcmVwcGVyIDxkcmVwcGVyQGFr
-a2FkaWEub3JnPohGBBARAgAGBQJF5zlEAAoJEHSr13os8RqArYkAn3UiPHSHaP2R
-0PIka7LnJHZTXk86AJ497cneDJ1SJn9WFLGAGzZbf3YprYhGBBARAgAGBQJHHYPS
-AAoJEMckhjdNIInbNckAnRwBT8gHMfqec5PhzXVnvbZYa7xbAJ9Aqup1cr0Kuo02
-7sOKFf5+Ey8H5ohGBBARAgAGBQJHHYPzAAoJEHadk3JoxR849XkAnR/AG5dbQGjU
-eRdJs58uOJWJIRyIAJ42c0iYKntBFf/HcboFXZxLuayu04hGBBARAgAGBQJHHfLM
-AAoJEFI0hF3yuSD18CQAnAsOiqE1Y8n3/EfakHakcfh+XRLRAJ9qSEdRhlk7Cwht
-FaK1XGPbH1gELYhGBBMRAgAGBQJHIeyOAAoJEE+rSctElUDyA4YAoLZviKAzCZp+
-JtDl3QOlWQuS+aZWAJ46pBEAJX6IDUn6QqxQ1zauNGghfYheBBMRAgAeBQJBy0Hv
-AhsDBgsJCAcDAgMVAgMDFgIBAh4BAheAAAoJENoowjp5/0R0yOgAoMBsA6jm9k1D
-qVJ9Eq7jX3UQJWnDAJ9uNQEqh6ZkGhNSokvZKZPWRROkCLQlVWxyaWNoIERyZXBw
-ZXIgPGRyZXBwZXJAc3RhcmJhbmQubmV0PohGBBARAgAGBQJF5zlQAAoJEHSr13os
-8RqAQhYAnRbsQsOLU9w5Z/fnUO90c1qqrsM7AKCT1yloZg537aeKqHZw99aQ9Ic/
-1ohJBDARAgAJBQJF6S2gAh0gAAoJENoowjp5/0R093sAoM3Z6hVdd5x+R/3TLa/U
-R8EXBq4DAJ4pr7Okc6lccwA4EHPcwOIv0r1oKYheBBMRAgAeBQJBy0HUAhsDBgsJ
-CAcDAgMVAgMDFgIBAh4BAheAAAoJENoowjp5/0R0IfAAniTzqP93kEtaOSz9mKEu
-9BkoW+f/AKCr1D2+yE1QPmzLKorWmVJhT8djqNHH7sfsARAAAQEAAAAAAAAAAAAA
-AAD/2P/gABBKRklGAAEBAQBIAEgAAP/bAEMACAYGBwYFCAcHBwkJCAoMFA0MCwsM
-GRITDxQdGh8eHRocHCAkLicgIiwjHBwoNyksMDE0NDQfJzk9ODI8LjM0Mv/bAEMB
-CQkJDAsMGA0NGDIhHCEyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIy
-MjIyMjIyMjIyMjIyMjIyMv/AABEIAGAASwMBIgACEQEDEQH/xAAbAAACAgMBAAAA
-AAAAAAAAAAAFBgQHAgMIAf/EADYQAAIBAwIEBAQDBwUAAAAAAAECAwAEEQUhBhIx
-QRMiUWEUMnGBB0KRFSNyocHR8DNSYnOx/8QAGQEAAwEBAQAAAAAAAAAAAAAAAgME
-BQAB/8QAIhEAAwADAAICAgMAAAAAAAAAAAECAxEhMUEEEiIyQlFh/9oADAMBAAIR
-AxEAPwB1sNXgbW7ic5RFh3PbJPStel6hHcpdxSlg5fClh0GdsVvttFgnSa/mLo8j
-ELg4GB0qEl/LYRyyO6GKGTnYuuCV+tJl+2Mrb4h0ivYF0mUi5TmjUruQKpuz4003
-hpbxuWSe58ZvCjzkAZ9fShvGf4g3fEs5sNKi+Hs84JTZpPqew9qUIdOV2CPJl/8A
-juB/U11JU9hYppLoWXiXULm7mubRFikcl9k5s+1YnjLUEkzOEcZ3Kry/bFZDQXtb
-fxWmjww8pUEGo0miEjxCeYdcnvXjmf6DcsbRxQmtWKfCXHgsgAdX6rTHZz2th4MJ
-cznly1xkHBPaqZVpNPvPEjKuqtuOx9qcZOKrO8tow1t4QA+VDtmk5Ja/UCm0h51W
-SxitDJchOV/KS25JNIFzw7cm4cwxkxk5Ug9q81XiN7+zWFVIGcA4rWthxAEXlecL
-gYHMeleRv+Qh5tl9CMnTIELhysYBI9ap38RNWnW8k0iLbmbL4O5HYfrVoyXgk0eO
-aHlgiYc5KnZAKoTXr5rjXL+9dyf3hVG/z2qmnPEhuKXttkFpltUMMOOdtmb+lMnC
-tsHmaZoPERVJd+XIWlK2iaZ1AHmY7AVa/CeiG0iUTg8zj5PQe9DstjG676AFwj6h
-qaNEjpHz4XmB3+2aa7rhq5ntIzBEDJy4YE4pq07h+JX8eSMA58u3QUYWFUVl9DRK
-X7GOZXEUFrXDV1bLKzQMrpuRkHI9aWrcL8QEYlQTggjpXQWu2sU9u6FAw32Irn3V
-kOn6vNE2Qobp6A9KFr0JzY1osFYdHt9JSC4Cu+MrIvrS1qX4gXlrqEtvFE5SIhAc
-LvgAelDxNGLcvK7YAzgUr3N74tzI7E5LUGPEvLM1RqmXle6xcaTdzW1q/wAVa5PO
-jDZSeuKqfVZzJeycox5zt7k5Jq29Rs4l09DG/n6N6nNVxxBpC2OsRj94UkUS5cAE
-5ocVJrZZjbvbGDgbSEZm1CdCVjGEz0HvVp6NZnCzMMPLuBj5RS9pMEaWNtaRx+QA
-NKR69cU9W11bWkPPM6hiN/YelMjr2zQb+kaQQC4TBAAxsKjSh41LYJAG5HpWUep2
-l4AIJA30ry6vIraI+IQABnJ9Kc2vImU16AOo/vQSDkegqkPxAsxFrKz8g5JE5WHq
-etXFe8QWMkjLEjy4/Mq7Z+tVnxvGNQsppIwRJDIr+b64pTf5HZuyIUzMNOjZmOU8
-u35s0GaMBjsx9wKYJi728NvIgIEeEUbEnqKESRZkYtdRoc/Lk7UcshudM6a1PSYI
-4GPxcWew9aXtd4an1g2LAQ8sCKpwdyDjf26VM1p9KlukXTLMwMy45ebO9MejpC+m
-xwOwF1CMDPUjt9aFY/Y34+VOnv2SdM0uC0tQkSAvjdqj32ivdRlTeXUTZ6xuQD7Y
-FFNPbnTBOB0qbMsaJzkjHejUlf29MD2NktuM4IIwBkkn65NCON4Xu7WzRZHjRpkE
-hQ78ud6ZJJ4yQACds0H4htpJ9L51UkoeYD1xQtc4Mnz0gHhvTjI1xBaLzspHJ+Ud
-e33NLfEWix22jzxk/Mhzk5A7jFOWh6rBfQvErhnhIVx3GQCP5GgPHMsUOnSyEnAU
-k+4xQ13oFTzRSeqxNZ3EKnlMnIpJ7AUCnt1Sd1EgwDgZNMGqzfF28rxKBydAR+XG
-DS1KpaZyVOST2o48GfkfTq1eG5BdPJFp0iIBsxx/KpL6Nf3KLHBYtGke4ldwC+eo
-x1p2aeFOsi/TNYfE8+0cbt74wKb64S6097FayhaMyQOcSxtg71suEY/6hPKP0zWF
-/I1rrMkxUAOQGAOcbVLZ1mjKkBlbsaW0auOuJkIqZep27EGgmvrq89hNZ2NxBEGG
-PFkJyB7YHWptzo1urlocxknJCnFBL/TXKkCdyO3Mw/tXPwaGKIrroG8PWScNsYvG
-aeSbzSsfzEe33qJ+IKCHh/ULp2JIfwo17dP7kfpRLRoYNNuXkkUyu+2WJPT6nalr
-jvU1v9MvbJJAwhiaRm9ZOu36Ur/CX5Fa2kVnZyseZ5CP9oHrUYWqT5kcPlj2GK22
-8gkKwrERIF2YdM47itn7Evn8y3MOD7t/anKGZn2TR01BdyR5liYySN0U1OueJmt7
-BZGKx4HmZsAfrSHqPFtnoYEUMvjzIMKqHJH8R7f+0halxBqOtXA+KmPgr5lhX5RU
-/wAebpbfgGpnyizeFdam1671uG58winXlPsy5x/nrR2O4e1bwZT0+U+opH4G1CGH
-V35pAq3KANnbLL8pz9CQftVlXNjHdRDnXPeqqksxWvqeJPFNCC3ehV0keWdtlH86
-zfQr1QW0+7X+CYHA+4pZ1qy4xKNFDBZf9hnwP0NLrZRN6F/i/X1tpY7e3IVgd8dv
-Wk6djPYzGRvLIfPvufapGo8P30F40uqXsDTk5ZY35yP6VD2eRYkB8ND37+5osWPb
-2yPNl7owS2is9PSNVxJJ5mPrXoXlABk/Str5eVV5thuBitbMVbHT7VUSH//ZiEYE
-EBECAAYFAkXnOVAACgkQdKvXeizxGoAyYgCfa4IPVggty0vvUAS+wZjN3a7tSFAA
-nieXbdlhMNu3yl/4loY38AAH+oQfiEYEEBECAAYFAkcdg9IACgkQxySGN00gidtU
-BACgkvyd3aRw79gxlXs0yGBFrVsx5JcAoJKAuGMb/bwCwbk7R4rV+i3rx8DFiEYE
-EBECAAYFAkcdg/MACgkQdp2TcmjFHzgNpwCfXy4kh6hF8Sv9/mwEzxJjl8z0BOwA
-oJr8ERbzjkVkP26mIg6QkRx1bCntiEYEExECAAYFAkch7I4ACgkQT6tJy0SVQPJn
-KgCfR+keQFf+eXIYDP5cCPRez3gLco0AoIe4GdgY8uYgyKMJVubvc3oFyDJaiF4E
-ExECAB4FAkAHZw4CGwMGCwkIBwMCAxUCAwMWAgECHgECF4AACgkQ2ijCOnn/RHTf
-AwCfQKSN9iZ3IxojQzcXbAbJwPsGQ1cAn2GGS0L8LGCrhK2v78jOMY0c4BRYuQIN
-BDuFtk8QCADO4UA+rWxhS2kkKXBfv6l3PUp0iBvEMqhIeHatJHHbgcthj/GD2mzp
-9kXbX9IGJqUpoHwEWch6HxL0tdS1a31pR4KSWedDA9tHQEZFxkBLv6cdn1qCIx3g
-JF7hFYWZLoqEh5SwNrvT7xeEib8L46B3tqCQHDvKRNv+NYczK9w/2JjRC2Yhq19V
-MMlSbtGblO0zWYMKaX+BYhAnl7Ov2C/Y1QbeSk1jA/4b2jgEvJM4dqaLH/Rgcj8e
-JlJiLCrjRqjTNE53/Jdjr9reaK033oCJ0kvkjm1uqesXLouZG9abI7FaQkP9sXfW
-us7k99VSBxWlTFu1bjg+1WKWEu6H6qNPAAMFB/41MfCNTDWP49mz/Llec/DTHRl1
-gYSXQjs2q0yALEjhkdP2NotwtcBFvdRUS5zUu4nW0ADWyzVzU0srcuD65nN4oxF9
-9FgRSDQSZ6vxAZavW5I7EMdwDO5Flfc9g1dwQYTISbjjcMOdev/hvzNgro76zLUt
-35JXHGnqPC2TQvJPuiSAPQTV0NTNf6rGmxW6NvN0fht2qhwqi4w0xP4Ed6hs1mlH
-hPLPn6nBb6vDX5dl5vIFSQg9c6hY9mlRMMZ9n6ib3F+DQk5wpkhnRf3V0tCnnH31
-oKbPBZ5bL0sU9MB/2liTLzBfO14Si0T9OSYN4DVxo8L0gQr0EGutL1N65usQiE4E
-GBECAAYFAjuFtk8AEgkQ2ijCOnn/RHQHZUdQRwABAWd/AJoDOBQKrsJbR9KKE3QJ
+mQGiBD4ejvcRBADNwfo3ALnr8qMQQARgBzHM5HsGaBGnGWPIFO18IhVhjqeOTBjd
+w0N9R6FAj/i3ObeTPwJABNGj92m2qnd49puBAtirJRd8Ul6shvLR8oNMZcCJEmGW
+6Ud7D+uS/WxIoQHXWKl2VtvJBLIEdZ8n/Z6SxcHuMEfTD+2pc7cqOxZPGwCglqP6
+Bt6BF5aUMbN0b/jj93ZHHSMD/iQxEiH7MmvVPHDZYN9CGepzlwcD+BKhYbq6wxsq
+pxxrtK5OrakwNd6cBb8nOVK2DjyOVRHBdWH6MVx+DCDSp0FWDEftQpCR0N0iItP4
+h+8lTP/7NdZj5+tfi99TUNMMaOcTdgWQ+s8/WUEZoJErDy/yXNHbK6xhD5mBm4pF
+bgQnBACmWQfAFDhFm1uKsNS8vPqcJ6Be+bbh+5uTOm30zXiAHEdi56v5tvn4mJSy
+yXakNGBHKkmdVQDTb4mLrnhpUnEHFegioOoBrwR6ZUsnsT7zaLz7r+p56HPKRkkn
+8284/NlZigncvPPcOK/9m6N9OLX8uerLy5TjuOPwjITxHmNgBbQgUm9sYW5kIE1j
+R3JhdGggPHJvbGFuZEBmcm9iLmNvbT6IXAQTEQIAHAQLBwMCAxUCAwMWAgECHgEC
+F4ACGQEFAj4ejvgACgkQ2vc1Cn671iU4OwCcC3y0ZCz5gxT/rzeRjogiMdOMMMcA
+nRPShRs5wsaJUeGOxAqRwu++hbrPiD8DBRA+HpK6Z/R4eOAIGpcRApUPAKDtBRDr
+ijwEwnyN8JF5jKzFqnlaZwCbBK6J7CLs8HonLtkjBFBy5JKblgKJAJUDBRA+HpOD
+pkJ+bR8IKbEBAWlBA/91cNYotVnrh4hjc06UHxySasqtxK2gd2h5A96Ez5FY0l0s
+KixJ7Rtvt490qhHqo6LiHFjKtmeiWNIO5H1MMGxXuJfBD2uDc6mfurwyt8j0v29n
+CeBFqrckR5NTbXWiepIbCe00Ux5+WbbJTdWpLFOxo8YiwqzfF/XbPdghPyY1YLQg
+Um9sYW5kIE1jR3JhdGggPGZyb2JAZGViaWFuLm9yZz6IWwQTEQIAHAUCPh6PXQIb
+AwQLBwMCAxUCAwMWAgECHgECF4AACgkQ2vc1Cn671iV7RACdHM6BWdolx88UOBhk
+L0XjMAAzF+IAmMyGjKKdDyNXmoMU1/SX/KFuPVOIPwMFED4eksNn9Hh44AgalxEC
+4G0AoIxbFjdAJImO7kOV5rFoW/+B9dxeAKDOIWg/gcAAOYFKggTBl8YO7uEYKokA
+lQMFED4ek8KmQn5tHwgpsQEBZD4D/3NBTjA3j5rj2mN7HDbSlIpttllC6B+jmzi0
+ynOgEzkhvae3ZY3mm334+/l3L9C3ZNJMQNvRdWVq2DjQq94xc9waI/Z4mNDeVQQB
+6fHC/0cmqj2n/ymS4NWxBx75W+wQKoBOXW2/bdd3cMOOwIhnC4H00FblFYR0Avth
+sxw9hDUztB9Sb2xhbmQgTWNHcmF0aCA8cm9sYW5kQGdudS5vcmc+iFwEExECABwF
+Aj4ej3UCGwMECwcDAgMVAgMDFgIBAh4BAheAAAoJENr3NQp+u9Yl6jUAnA7DcQVj
+kWoPngzvzWHB7EIYInaXAJwLZP3Nk6jPifu1J4vJ2F768hQyoYg/AwUQPh6SzGf0
+eHjgCBqXEQLPqwCgm6h1Z6xwyduXw6ZYpbRYdyBqwGcAoKIrMkypgDXci//FI5Kc
+iYBRF3ajiQCVAwUQPh6T0KZCfm0fCCmxAQFrYQP9Hh1v7DrIkT370pMo7qICLhdf
+B7r7ofSkcqSGPcAq+gwNa2aNoDx11U9hk2Vo5HWJm2psSzikUN83i7uzMZi8dW5D
+e0uI3TeHgUOFPCxXLG5KSMwGdjxKwe/Ks95gNnlDzYTe6mjJdP89D4NhSc/cP78B
+tRpc3pK+KJYd/O/xUgy0IlJvbGFuZCBNY0dyYXRoIDxyb2xhbmRAcmVkaGF0LmNv
+bT6IXgQTEQIAHgUCQjO3pQIbAwYLCQgHAwIDFQIDAxYCAQIeAQIXgAAKCRDa9zUK
+frvWJTY3AJ9UFpGYfE0dCtF6IL0CcoPB8//7tQCfesL/4DPu53OWLoVhxVKhEe+2
+QoS5Ag0EPh6PKRAIAIU6PeE1k+YYKYtZhFzb2EhVid/eUe8QsEYLJrJUYTAyzssb
+1wnWx90iFHRxyLOAyTc7YXKWz3lkbCW+TqYCSc9rbTCQy1dE8dK4ojdizZempape
+P+7kuk+zGWquabqQ71/294m2Sffasdz97yr3Eo6uSSN38ct7fxEBHhFgEGx/jDVV
+1/o1vrUcrrYyI39mOTp4yjcLwbS7JqFsNKxTGEUULpL3GYRJC+JtcaH9766E8Si+
+caxKqNLND4PHIPQ7UQCmDu2Rn84mM7Oy1whR7Pkjw6S9kQxZP+Xfykq6NAHWfFyp
+9g/5DTGVYCLxCM1Ska6KF8lnAYB1cr84OMvZ3J8AAwUH/j1rknj9KRrsgfE9CyFV
+WNUWpH79PTBQG+uoU4qyO9OPuJqcz9bBgyj9zo1DM4mxJ/euZH1X/35PTe8O1YQR
+VxzhnS5CzHoTq33qROi9/6m8HAkhp6c0s6uBplWargmomJz8gtVi+av5KbUjSxVs
+yxKWSWkX46EEjItYxmQTv9TA8X6yMM7SkQJUEIz3UXtYSLb+pVXPJfScr945kXK8
+180MGQLBhq9wEcR5ypUN1HqyO1J+TJQdsqtXAVe57RMIPY/XoFnS73B9aQmTwYRk
+5fDo9wTnHEDW4dxN+zphONOjLbGaJt5o4ytbqrQ54JHwNt4xXavWgG39OPlPqENU
+x7GIRgQYEQIABgUCPh6PKQAKCRDa9zUKfrvWJYxEAJ9FFDtc48oBtVQISX80/a2d
+smT+qwCeLgHE6iheS8L2cbygDxDnsLx32wSZAaIEO4W2HREEAI9wcSTKokTbrBNe
+664LGmomPGUGc0WQkaRZSh67z1CPNaDNfL8QDz6m00GAJM8qcsSqGRFTLEBP9TP6
+37FsqpS0vngjNh/E7g1Cw39VUzS6mk18glsxa8CO+mnYcKR3/faLr3euUf4b128b
+wrntvLc8FEcGAfYvxDu39C8DYBanAKDOiRcMNSKK3KwafitY7SsEGhHo4QP/d6Gl
+we1saLE2i5tFkDGnD31VMqz8jvo6StDOpyb7D7PBl6KElcLzzIAcDvv8sEHdgppf
+cbgKYNBRt5En3M+URNMuZExwXrV1B2r/epUGKrWybpy1ni4SmbwefKwoxP5Vjhea
+P0svMXYF0g0b1+txf2uTxWTbmIIsGuidLQwhTdYD+wS+VQWV9vIIFEGir5GWv27T
+l+cdzsIswojsQhLVPV0s/EfWK+5SHJg0YAxGEKK8FtPZnS39HiSy7dV2c8aQLIAB
+1Y1Jp9IaoJhTNAfS7lnwcrpzaJeshfcimTkOFA5DqTW3JjO5DDdwJ/tFhEn3+K6n
+xGWxxW3aSYadK5yqnEkJtCNVbHJpY2ggRHJlcHBlciA8ZHJlcHBlckByZWRoYXQu
+Y29tPohGBBARAgAGBQI8iQDvAAoJEFWW3Qzpv2U97wgAn1RVl6FbIHVVmT224nOp
+5b98OZVnAJ9ehXzM60RbmGi3kJNS30II+SGft4hXBBMRAgAXBQI7hbYdBQsHCgME
+AxUDAgMWAgECF4AACgkQ2ijCOnn/RHRKpQCgvkcFtpFZHX2+OV1R4m9gIbYBH3gA
+oMueZURrKRplbLI2DQ5O7Et7VuhriEYEExECAAYFAj1O+3QACgkQ/dLerNMzy6FT
+LQCg2oBMGPa6wS0l24Ye6Qpn2ZBrJwUAn3KWrQyZknAxnfr317quAyIcAwBViEYE
+EhECAAYFAj7BT9IACgkQ11eXTEMrxtQ3dQCguuJuqjrjhpPnoZdP9BCfNjDMYSUA
+oKbxk/YzSrmKK9ORftS09FwmVCTDiEYEEBECAAYFAkXnOVAACgkQdKvXeizxGoAj
+8QCgjDNN58vjt0MgufrzRkaM6outFfIAoKA+VG765m013JhN6I7i1xQvjYRaiEYE
+EBECAAYFAkcd8swACgkQUjSEXfK5IPWh5wCg+4qbc+Z4tM++KoBUDBhtZiT+thUA
+oJw40gwfBSypDYSvWiMXOPTKo3XniEYEEBECAAYFAkhMxecACgkQ3L4Y/6A1U7zA
+4QCfTR51NKVwuqenN7wx5Yh5DdvnQ1wAoKllIwL7hPpOBxhcJ89JRwRvcXpsiEYE
+EhECAAYFAkG2CC4ACgkQZfy0juH51Wu+pQCdHTo8l58N37s6QDrzs8+jgP5FvfcA
+n1SyC1DFTr/3x30XrG8uik+yrglHtCRVbHJpY2ggRHJlcHBlciA8ZHJlcHBlckBh
+a2thZGlhLm9yZz6IRgQQEQIABgUCRec5RAAKCRB0q9d6LPEagK2JAJ91Ijx0h2j9
+kdDyJGuy5yR2U15POgCePe3J3gydUiZ/VhSxgBs2W392Ka2IRgQQEQIABgUCRx3y
+zAAKCRBSNIRd8rkg9fAkAJwLDoqhNWPJ9/xH2pB2pHH4fl0S0QCfakhHUYZZOwsI
+bRWitVxj2x9YBC2IXgQTEQIAHgUCQctB7wIbAwYLCQgHAwIDFQIDAxYCAQIeAQIX
+gAAKCRDaKMI6ef9EdMjoAKDAbAOo5vZNQ6lSfRKu4191ECVpwwCfbjUBKoemZBoT
+UqJL2SmT1kUTpAi0JVVscmljaCBEcmVwcGVyIDxkcmVwcGVyQHN0YXJiYW5kLm5l
+dD6IRgQQEQIABgUCRec5UAAKCRB0q9d6LPEagEIWAJ0W7ELDi1PcOWf351DvdHNa
+qq7DOwCgk9cpaGYOd+2niqh2cPfWkPSHP9aIXgQTEQIAHgUCQctB1AIbAwYLCQgH
+AwIDFQIDAxYCAQIeAQIXgAAKCRDaKMI6ef9EdCHwAJ4k86j/d5BLWjks/ZihLvQZ
+KFvn/wCgq9Q9vshNUD5syyqK1plSYU/HY6iISQQwEQIACQUCRektoAIdIAAKCRDa
+KMI6ef9EdPd7AKDN2eoVXXecfkf90y2v1EfBFwauAwCeKa+zpHOpXHMAOBBz3MDi
+L9K9aCm5Ag0EO4W2TxAIAM7hQD6tbGFLaSQpcF+/qXc9SnSIG8QyqEh4dq0kcduB
+y2GP8YPabOn2Rdtf0gYmpSmgfARZyHofEvS11LVrfWlHgpJZ50MD20dARkXGQEu/
+px2fWoIjHeAkXuEVhZkuioSHlLA2u9PvF4SJvwvjoHe2oJAcO8pE2/41hzMr3D/Y
+mNELZiGrX1UwyVJu0ZuU7TNZgwppf4FiECeXs6/YL9jVBt5KTWMD/hvaOAS8kzh2
+posf9GByPx4mUmIsKuNGqNM0Tnf8l2Ov2t5orTfegInSS+SObW6p6xcui5kb1psj
+sVpCQ/2xd9a6zuT31VIHFaVMW7VuOD7VYpYS7ofqo08AAwUH/jUx8I1MNY/j2bP8
+uV5z8NMdGXWBhJdCOzarTIAsSOGR0/Y2i3C1wEW91FRLnNS7idbQANbLNXNTSyty
+4Prmc3ijEX30WBFINBJnq/EBlq9bkjsQx3AM7kWV9z2DV3BBhMhJuONww516/+G/
+M2CujvrMtS3fklccaeo8LZNC8k+6JIA9BNXQ1M1/qsabFbo283R+G3aqHCqLjDTE
+/gR3qGzWaUeE8s+fqcFvq8Nfl2Xm8gVJCD1zqFj2aVEwxn2fqJvcX4NCTnCmSGdF
+/dXS0KecffWgps8FnlsvSxT0wH/aWJMvMF87XhKLRP05Jg3gNXGjwvSBCvQQa60v
+U3rm6xCIRgQYEQIABgUCO4W2TwAKCRDaKMI6ef9EdGd/AJoDOBQKrsJbR9KKE3QJ
 gTKAnym+PwCfbnwIeEZfbBWgonv4/I3aNNm3FdQ=
-=rhf6
+=2IML
 -----END PGP PUBLIC KEY BLOCK-----


--- elfutils-0.138.tar.bz2.sig DELETED ---



From roland at fedoraproject.org  Sat Jan 24 01:22:40 2009
From: roland at fedoraproject.org (Roland McGrath)
Date: Sat, 24 Jan 2009 01:22:40 +0000 (UTC)
Subject: rpms/elfutils/F-9 elfutils-0.139.tar.bz2.sig, NONE, 1.1 .cvsignore, 
	1.45, 1.46 Makefile, 1.27, 1.28 elfutils-portability.patch, 1.39,
	1.40 elfutils-robustify.patch, 1.12, 1.13 elfutils.spec, 1.110,
	1.111 sources, 1.49, 1.50 upstream-key.gpg, 1.1,
	1.2 elfutils-0.138.tar.bz2.sig, 1.1, NONE
Message-ID: <20090124012240.DA4E97010A@cvs1.fedora.phx.redhat.com>

Author: roland

Update of /cvs/pkgs/rpms/elfutils/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5465/F-9

Modified Files:
	.cvsignore Makefile elfutils-portability.patch 
	elfutils-robustify.patch elfutils.spec sources 
	upstream-key.gpg 
Added Files:
	elfutils-0.139.tar.bz2.sig 
Removed Files:
	elfutils-0.138.tar.bz2.sig 
Log Message:
Update to 0.139


--- NEW FILE elfutils-0.139.tar.bz2.sig ---
??
~??% ?
J?Zve????H+

Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/elfutils/F-9/.cvsignore,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- .cvsignore	31 Dec 2008 22:12:42 -0000	1.45
+++ .cvsignore	24 Jan 2009 01:22:10 -0000	1.46
@@ -1 +1 @@
-elfutils-0.138.tar.bz2
+elfutils-0.139.tar.bz2


Index: Makefile
===================================================================
RCS file: /cvs/pkgs/rpms/elfutils/F-9/Makefile,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- Makefile	31 Dec 2008 22:12:43 -0000	1.27
+++ Makefile	24 Jan 2009 01:22:10 -0000	1.28
@@ -3,6 +3,8 @@
 NAME := elfutils
 SPECFILE = elfutils.spec
 
+all:
+
 UPSTREAM_CHECKS := sig
 UPSTREAM_FILES = $(NAME)-$(VERSION).tar.bz2
 upstream:;
@@ -28,20 +30,19 @@
 CURL += -k
 endif
 
+patches := $(patsubst %,elfutils-%.patch,robustify portability)
+all: $(patches)
+
 branch-portability = portable
+branch-master = elfutils-$(VERSION)
 
-elfutils-base = elfutils-$(VERSION)
-elfutils-base = master
+elfutils-%/configure: .git/refs/heads/* Makefile
+	@rm -rf $(@D)
+	git archive --prefix=$(@D)/ $(firstword $(branch-$*) $*) | tar xf -
+	cd $(@D) && autoreconf -i && rm -rf autom4te.cache
 
-elfutils-%.patch: elfutils-$(VERSION).tar.bz2 Makefile
-	@rm -rf elfutils-master elfutils-$*
-	git archive --prefix=elfutils-master/ $(elfutils-base) \
-	| tar xf -
-	git archive --prefix=elfutils-$*/ $(firstword $(branch-$*) $*) \
-	| tar xf -
-	cd elfutils-master; autoreconf -i; rm -rf autom4te.cache
-	cd elfutils-$*; autoreconf -i; rm -rf autom4te.cache
-	diff -Nrpu elfutils-master elfutils-$* | \
+elfutils-%.patch: elfutils-master/configure elfutils-%/configure
+	diff --exclude='.gitignore' -Nrpu $(^D) | \
 	filterdiff --remove-timestamps --strip=1 --addprefix=elfutils/ > $@.new
 	mv $@.new $@
 
@@ -52,7 +53,7 @@
 portable-r = 0.$(subst $(DIST),,$(RELEASE))
 portable-vr = $(VERSION)-$(portable-r)
 portable.srpm = elfutils-$(portable-vr).src.rpm
-$(portable.srpm): elfutils-portable.spec elfutils-portability.patch \
+$(portable.srpm): elfutils-portable.spec $(patches) \
 		  elfutils-$(VERSION).tar.bz2
 	$(RPM_WITH_DIRS) --nodeps -bs $<
 

elfutils-portability.patch:

Index: elfutils-portability.patch
===================================================================
RCS file: /cvs/pkgs/rpms/elfutils/F-9/elfutils-portability.patch,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- elfutils-portability.patch	31 Dec 2008 22:12:43 -0000	1.39
+++ elfutils-portability.patch	24 Jan 2009 01:22:10 -0000	1.40
@@ -1,6 +1,14 @@
 --- elfutils/backends/ChangeLog
 +++ elfutils/backends/ChangeLog
-@@ -325,6 +325,11 @@
+@@ -1,3 +1,7 @@
++2009-01-23  Roland McGrath  <roland at redhat.com>
++
++	* Makefile.am (libebl_%.so): Use $(LD_AS_NEEDED).
++
+ 2008-10-04  Ulrich Drepper  <drepper at redhat.com>
+ 
+ 	* i386_reloc.def: Fix entries for TLS_GOTDESC, TLS_DESC_CALL, and
+@@ -325,6 +329,11 @@
  	* sparc_init.c: Likewise.
  	* x86_64_init.c: Likewise.
  
@@ -12,7 +20,7 @@
  2005-11-19  Roland McGrath  <roland at redhat.com>
  
  	* ppc64_reloc.def: REL30 -> ADDR30.
-@@ -347,6 +352,9 @@
+@@ -347,6 +356,9 @@
  	* Makefile.am (uninstall): Don't try to remove $(pkgincludedir).
  	(CLEANFILES): Add libebl_$(m).so.
  
@@ -24,6 +32,14 @@
  
 --- elfutils/backends/Makefile.am
 +++ elfutils/backends/Makefile.am
+@@ -1,6 +1,6 @@
+ ## Process this file with automake to create Makefile.in
+ ##
+-## Copyright (C) 2000-2006, 2007, 2008 Red Hat, Inc.
++## Copyright (C) 2000-2006, 2007, 2008, 2009 Red Hat, Inc.
+ ## This file is part of Red Hat elfutils.
+ ##
+ ## Red Hat elfutils is free software; you can redistribute it and/or modify
 @@ -25,12 +25,14 @@
  ## <http://www.openinventionnetwork.com>.
  ##
@@ -48,9 +64,18 @@
  i386_SRCS = i386_init.c i386_symbol.c i386_corenote.c \
  	    i386_retval.c i386_regs.c i386_auxv.c i386_syscall.c
  cpu_i386 = ../libcpu/libcpu_i386.a
+@@ -114,7 +115,7 @@ libebl_%.so: libebl_%_pic.a libebl_%.map
+ 	$(LINK) -shared -o $@ -Wl,--whole-archive,$<\
+ 		$(cpu_$(@:libebl_%.so=%)) -Wl,--no-whole-archive \
+ 		-Wl,--version-script,$(word 2,$^) \
+-		-Wl,-z,defs -Wl,--as-needed $(libelf) $(libdw) $(libmudflap)
++		-Wl,-z,defs $(LD_AS_NEEDED) $(libelf) $(libdw) $(libmudflap)
+ 	$(textrel_check)
+ 
+ # XXX Should not be needed...
 --- elfutils/backends/Makefile.in
 +++ elfutils/backends/Makefile.in
-@@ -155,6 +155,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -156,6 +156,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
  INSTALL_SCRIPT = @INSTALL_SCRIPT@
  INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
  LDFLAGS = @LDFLAGS@
@@ -58,7 +83,7 @@
  LEX = @LEX@
  LEXLIB = @LEXLIB@
  LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-@@ -184,6 +185,7 @@ SHELL = @SHELL@
+@@ -185,6 +186,7 @@ SHELL = @SHELL@
  STRIP = @STRIP@
  USE_NLS = @USE_NLS@
  VERSION = @VERSION@
@@ -66,9 +91,9 @@
  XGETTEXT = @XGETTEXT@
  XGETTEXT_015 = @XGETTEXT_015@
  YACC = @YACC@
-@@ -241,9 +243,9 @@ top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
+@@ -243,9 +245,9 @@ top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
+ zip_LIBS = @zip_LIBS@
  @MUDFLAP_FALSE at AM_CFLAGS = -fpic -Wall -Wshadow -Werror -Wunused \
 - at MUDFLAP_FALSE@	-Wextra -Wformat=2 -std=gnu99
 + at MUDFLAP_FALSE@	$(WEXTRA) -Wformat=2 -std=gnu99
@@ -78,9 +103,31 @@
  INCLUDES = -I$(srcdir) -I$(top_srcdir)/libebl -I$(top_srcdir)/libasm \
  	   -I$(top_srcdir)/libelf -I$(top_srcdir)/libdw \
  	   -I$(top_srcdir)/lib -I..
+@@ -641,7 +643,7 @@ libebl_%.so: libebl_%_pic.a libebl_%.map
+ 	$(LINK) -shared -o $@ -Wl,--whole-archive,$<\
+ 		$(cpu_$(@:libebl_%.so=%)) -Wl,--no-whole-archive \
+ 		-Wl,--version-script,$(word 2,$^) \
+-		-Wl,-z,defs -Wl,--as-needed $(libelf) $(libdw) $(libmudflap)
++		-Wl,-z,defs $(LD_AS_NEEDED) $(libelf) $(libdw) $(libmudflap)
+ 	$(textrel_check)
+ 
+ # XXX Should not be needed...
 --- elfutils/ChangeLog
 +++ elfutils/ChangeLog
-@@ -54,6 +54,10 @@
+@@ -1,3 +1,12 @@
++2009-01-23  Roland McGrath  <roland at redhat.com>
++
++	* configure.ac: Check for __builtin_popcount.
++
++	* configure.ac (zlib check): Check for gzdirect, need zlib >= 1.2.2.3.
++
++	* configure.ac (__thread check): Use AC_LINK_IFELSE, in case of
++	building with compiler support but no working runtime support.
++
+ 2009-01-22  Ulrich Drepper  <drepper at redhat.com>
+ 
+ 	* Makefile.am (rpm): The tarball is now bzip2-compressed.
+@@ -73,6 +82,10 @@
  	* configure.ac: Add dummy automake conditional to get dependencies
  	for non-generic linker right.  See src/Makefile.am.
  
@@ -91,7 +138,7 @@
  2005-11-18  Roland McGrath  <roland at redhat.com>
  
  	* Makefile.am (DISTCHECK_CONFIGURE_FLAGS): New variable.
-@@ -101,6 +105,17 @@
+@@ -120,6 +133,17 @@
  	* Makefile.am (all_SUBDIRS): Add libdwfl.
  	* configure.ac: Write libdwfl/Makefile.
  
@@ -111,7 +158,7 @@
  	* configure.ac [AH_BOTTOM] (INTDECL, _INTDECL): New macros.
 --- elfutils/config/Makefile.in
 +++ elfutils/config/Makefile.in
-@@ -72,6 +72,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -73,6 +73,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
  INSTALL_SCRIPT = @INSTALL_SCRIPT@
  INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
  LDFLAGS = @LDFLAGS@
@@ -119,7 +166,7 @@
  LEX = @LEX@
  LEXLIB = @LEXLIB@
  LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-@@ -101,6 +102,7 @@ SHELL = @SHELL@
+@@ -102,6 +103,7 @@ SHELL = @SHELL@
  STRIP = @STRIP@
  USE_NLS = @USE_NLS@
  VERSION = @VERSION@
@@ -127,9 +174,28 @@
  XGETTEXT = @XGETTEXT@
  XGETTEXT_015 = @XGETTEXT_015@
  YACC = @YACC@
+--- elfutils/config.h.in
++++ elfutils/config.h.in
+@@ -1,5 +1,8 @@
+ /* config.h.in.  Generated from configure.ac by autoheader.  */
+ 
++/* Have __builtin_popcount. */
++#undef HAVE_BUILTIN_POPCOUNT
++
+ /* $libdir subdirectory containing libebl modules. */
+ #undef LIBEBL_SUBDIR
+ 
+@@ -52,4 +55,7 @@
+ /* Define for large files, on AIX-style hosts. */
+ #undef _LARGE_FILES
+ 
++/* Stubbed out if missing compiler support. */
++#undef __thread
++
+ #include <eu-config.h>
 --- elfutils/configure
 +++ elfutils/configure
-@@ -637,6 +637,8 @@ NATIVE_LD_FALSE
+@@ -642,6 +642,8 @@ NATIVE_LD_FALSE
  NATIVE_LD_TRUE
  DATADIRNAME
  LOCALEDIR
@@ -138,38 +204,31 @@
  LEXLIB
  LEX_OUTPUT_ROOT
  LEX
-@@ -4028,6 +4030,89 @@ $as_echo "$as_me: error: gcc with C99 su
+@@ -4041,13 +4043,15 @@ $as_echo "$as_me: error: gcc with C99 su
  fi
  
  
+-{ $as_echo "$as_me:$LINENO: checking for gcc with TLS support" >&5
+-$as_echo_n "checking for gcc with TLS support... " >&6; }
+-if test "${ac_cv_tls+set}" = set; then
 +{ $as_echo "$as_me:$LINENO: checking for -Wextra option to $CC" >&5
 +$as_echo_n "checking for -Wextra option to $CC... " >&6; }
 +if test "${ac_cv_cc_wextra+set}" = set; then
-+  $as_echo_n "(cached) " >&6
-+else
+   $as_echo_n "(cached) " >&6
+ else
+-  cat >conftest.$ac_ext <<_ACEOF
+-__thread int a; int foo (int b) { return a + b; }
 +  old_CFLAGS="$CFLAGS"
 +CFLAGS="$CFLAGS -Wextra"
 +cat >conftest.$ac_ext <<_ACEOF
 +void foo (void) { }
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest.$ac_objext; then
+ _ACEOF
+ rm -f conftest.$ac_objext
+ if { (ac_try="$ac_compile"
+@@ -4067,6 +4071,172 @@ $as_echo "$ac_try_echo") >&5
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
 +  ac_cv_cc_wextra=yes
 +else
 +  $as_echo "$as_me: failed program was:" >&5
@@ -224,16 +283,226 @@
 +
 +
 +
++{ $as_echo "$as_me:$LINENO: checking for __builtin_popcount" >&5
++$as_echo_n "checking for __builtin_popcount... " >&6; }
++if test "${ac_cv_popcount+set}" = set; then
++  $as_echo_n "(cached) " >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++int
++main ()
++{
++exit (__builtin_popcount (127));
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
++$as_echo "$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
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext && {
++	 test "$cross_compiling" = yes ||
++	 $as_test_x conftest$ac_exeext
++       }; then
++  ac_cv_popcount=yes
++else
++  $as_echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
 +
- LOCALEDIR=$datadir
++	ac_cv_popcount=no
++fi
++
++rm -rf conftest.dSYM
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++{ $as_echo "$as_me:$LINENO: result: $ac_cv_popcount" >&5
++$as_echo "$ac_cv_popcount" >&6; }
++if test "x$ac_cv_popcount" = xyes; then
++
++cat >>confdefs.h <<\_ACEOF
++#define HAVE_BUILTIN_POPCOUNT 1
++_ACEOF
++
++fi
++
++
++{ $as_echo "$as_me:$LINENO: checking for __thread support" >&5
++$as_echo_n "checking for __thread support... " >&6; }
++if test "${ac_cv_tls+set}" = set; then
++  $as_echo_n "(cached) " >&6
++else
++  # Use the same flags that we use for our DSOs, so the test is representative.
++# Some old compiler/linker/libc combinations fail some ways and not others.
++save_CFLAGS="$CFLAGS"
++save_LDFLAGS="$LDFLAGS"
++CFLAGS="-fpic $CFLAGS"
++LDFLAGS="-shared -Wl,-z,defs,-z,relro $LDFLAGS"
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#undef __thread
++static __thread int a; int foo (int b) { return a + b; }
++int
++main ()
++{
++exit (foo (0));
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
++$as_echo "$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
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext && {
++	 test "$cross_compiling" = yes ||
++	 $as_test_x conftest$ac_exeext
++       }; then
+   ac_cv_tls=yes
+ else
+   $as_echo "$as_me: failed program was:" >&5
+@@ -4075,14 +4245,27 @@ sed 's/^/| /' conftest.$ac_ext >&5
+ 	ac_cv_tls=no
+ fi
  
- cat >>confdefs.h <<_ACEOF
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -rf conftest.dSYM
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
++      conftest$ac_exeext conftest.$ac_ext
++CFLAGS="$save_CFLAGS"
++LDFLAGS="$save_LDFLAGS"
+ fi
+ { $as_echo "$as_me:$LINENO: result: $ac_cv_tls" >&5
+ $as_echo "$ac_cv_tls" >&6; }
+ if test "x$ac_cv_tls" != xyes; then
+-  { { $as_echo "$as_me:$LINENO: error: gcc with TLS support required" >&5
+-$as_echo "$as_me: error: gcc with TLS support required" >&2;}
++  if test "$use_locks" = yes; then
++  { { $as_echo "$as_me:$LINENO: error: --enable-thread-safety requires __thread support" >&5
++$as_echo "$as_me: error: --enable-thread-safety requires __thread support" >&2;}
+    { (exit 1); exit 1; }; }
++else
++
++cat >>confdefs.h <<\_ACEOF
++#define __thread /* empty: no multi-thread support */
++_ACEOF
++
++fi
++
+ fi
+ 
+ 
+@@ -4673,9 +4856,9 @@ if test "${with_zlib+set}" = set; then
+ fi
+ 
+ if test $with_zlib != no; then
+-  { $as_echo "$as_me:$LINENO: checking for library containing gzdopen" >&5
+-$as_echo_n "checking for library containing gzdopen... " >&6; }
+-if test "${ac_cv_search_gzdopen+set}" = set; then
++  { $as_echo "$as_me:$LINENO: checking for library containing gzdirect" >&5
++$as_echo_n "checking for library containing gzdirect... " >&6; }
++if test "${ac_cv_search_gzdirect+set}" = set; then
+   $as_echo_n "(cached) " >&6
+ else
+   ac_func_search_save_LIBS=$LIBS
+@@ -4692,11 +4875,11 @@ cat >>conftest.$ac_ext <<_ACEOF
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-char gzdopen ();
++char gzdirect ();
+ int
+ main ()
+ {
+-return gzdopen ();
++return gzdirect ();
+   ;
+   return 0;
+ }
+@@ -4729,7 +4912,7 @@ $as_echo "$ac_try_echo") >&5
+ 	 test "$cross_compiling" = yes ||
+ 	 $as_test_x conftest$ac_exeext
+        }; then
+-  ac_cv_search_gzdopen=$ac_res
++  ac_cv_search_gzdirect=$ac_res
+ else
+   $as_echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -4740,21 +4923,21 @@ fi
+ rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext
+-  if test "${ac_cv_search_gzdopen+set}" = set; then
++  if test "${ac_cv_search_gzdirect+set}" = set; then
+   break
+ fi
+ done
+-if test "${ac_cv_search_gzdopen+set}" = set; then
++if test "${ac_cv_search_gzdirect+set}" = set; then
+   :
+ else
+-  ac_cv_search_gzdopen=no
++  ac_cv_search_gzdirect=no
+ fi
+ rm conftest.$ac_ext
+ LIBS=$ac_func_search_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_gzdopen" >&5
+-$as_echo "$ac_cv_search_gzdopen" >&6; }
+-ac_res=$ac_cv_search_gzdopen
++{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_gzdirect" >&5
++$as_echo "$ac_cv_search_gzdirect" >&6; }
++ac_res=$ac_cv_search_gzdirect
+ if test "$ac_res" != no; then
+   test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+   with_zlib=yes
 --- elfutils/configure.ac
 +++ elfutils/configure.ac
-@@ -74,6 +74,34 @@ CFLAGS="$old_CFLAGS"])
+@@ -74,12 +74,58 @@ CFLAGS="$old_CFLAGS"])
  AS_IF([test "x$ac_cv_c99" != xyes],
        AC_MSG_ERROR([gcc with C99 support required]))
  
+-AC_CACHE_CHECK([for gcc with TLS support], ac_cv_tls, [dnl
+-AC_COMPILE_IFELSE([dnl
+-__thread int a; int foo (int b) { return a + b; }],
+-		  ac_cv_tls=yes, ac_cv_tls=no)])
 +AC_CACHE_CHECK([for -Wextra option to $CC], ac_cv_cc_wextra, [dnl
 +old_CFLAGS="$CFLAGS"
 +CFLAGS="$CFLAGS -Wextra"
@@ -261,13 +530,58 @@
 +      [LD_AS_NEEDED=-Wl,--as-needed], [LD_AS_NEEDED=])
 +AC_SUBST(LD_AS_NEEDED)
 +
-+
++AC_CACHE_CHECK([for __builtin_popcount], ac_cv_popcount, [dnl
++AC_LINK_IFELSE([AC_LANG_PROGRAM([], [[exit (__builtin_popcount (127));]])],
++	       ac_cv_popcount=yes, ac_cv_popcount=no)])
++AS_IF([test "x$ac_cv_popcount" = xyes],
++      [AC_DEFINE([HAVE_BUILTIN_POPCOUNT], [1], [Have __builtin_popcount.])])
++
++AC_CACHE_CHECK([for __thread support], ac_cv_tls, [dnl
++# Use the same flags that we use for our DSOs, so the test is representative.
++# Some old compiler/linker/libc combinations fail some ways and not others.
++save_CFLAGS="$CFLAGS"
++save_LDFLAGS="$LDFLAGS"
++CFLAGS="-fpic $CFLAGS"
++LDFLAGS="-shared -Wl,-z,defs,-z,relro $LDFLAGS"
++AC_LINK_IFELSE([dnl
++AC_LANG_PROGRAM([[#undef __thread
++static __thread int a; int foo (int b) { return a + b; }]],
++		[[exit (foo (0));]])],
++	       ac_cv_tls=yes, ac_cv_tls=no)
++CFLAGS="$save_CFLAGS"
++LDFLAGS="$save_LDFLAGS"])
+ AS_IF([test "x$ac_cv_tls" != xyes],
+-      AC_MSG_ERROR([gcc with TLS support required]))
++      [AS_IF([test "$use_locks" = yes],
++	     [AC_MSG_ERROR([--enable-thread-safety requires __thread support])],
++	     [AC_DEFINE([__thread], [/* empty: no multi-thread support */],
++			[Stubbed out if missing compiler support.])])])
+ 
  LOCALEDIR=$datadir
  AC_SUBST(LOCALEDIR)
- AC_DEFINE_UNQUOTED(LOCALEDIR, "$LOCALEDIR")
+@@ -193,7 +239,7 @@ dnl Test for zlib and bzlib, gives ZLIB/
+ dnl conditional and config.h USE_ZLIB/USE_BZLIB #define.
+ save_LIBS="$LIBS"
+ LIBS=
+-eu_ZIPLIB(z,Z,z,gzdopen,gzip)
++eu_ZIPLIB(z,Z,z,gzdirect,gzip)
+ eu_ZIPLIB(bz,BZ,bz2,BZ2_bzdopen,bzip2)
+ zip_LIBS="$LIBS"
+ LIBS="$save_LIBS"
 --- elfutils/lib/ChangeLog
 +++ elfutils/lib/ChangeLog
-@@ -41,6 +41,11 @@
+@@ -1,3 +1,10 @@
++2009-01-23  Roland McGrath  <roland at redhat.com>
++
++	* eu-config.h [! HAVE_BUILTIN_POPCOUNT]
++	(__builtin_popcount): New inline function.
++
++	* eu-config.h: Add multiple inclusion protection.
++
+ 2009-01-17  Ulrich Drepper  <drepper at redhat.com>
+ 
+ 	* system.h (ARGP_PROGRAM_VERSION_HOOK_DEF): Define.
+@@ -52,6 +59,11 @@
  	* Makefile.am (libeu_a_SOURCES): Add it.
  	* system.h: Declare crc32_file.
  
@@ -279,6 +593,36 @@
  2005-04-30  Ulrich Drepper  <drepper at redhat.com>
  
  	* Makefile.am: Use -ffunction-sections for xmalloc.c.
+--- elfutils/lib/eu-config.h
++++ elfutils/lib/eu-config.h
+@@ -46,6 +46,9 @@
+    Network licensing program, please visit www.openinventionnetwork.com
+    <http://www.openinventionnetwork.com>.  */
+ 
++#ifndef EU_CONFIG_H
++#define EU_CONFIG_H	1
++
+ #ifdef USE_LOCKS
+ # include <pthread.h>
+ # include <assert.h>
+@@ -178,3 +181,17 @@ asm (".section predict_data, \"aw\"; .pr
+ 
+ /* This macro is used by the tests conditionalize for standalone building.  */
+ #define ELFUTILS_HEADER(name) <lib##name.h>
++
++#ifndef HAVE_BUILTIN_POPCOUNT
++# define __builtin_popcount hakmem_popcount
++static inline unsigned int __attribute__ ((unused))
++hakmem_popcount (unsigned int x)
++{
++  /* HAKMEM 169 */
++  unsigned int n = x - ((x >> 1) & 033333333333) - ((x >> 2) & 011111111111);
++  return ((n + (n >> 3)) & 030707070707) % 63;
++}
++#endif	/* HAVE_BUILTIN_POPCOUNT */
++
++
++#endif	/* eu-config.h */
 --- elfutils/lib/Makefile.am
 +++ elfutils/lib/Makefile.am
 @@ -25,12 +25,13 @@
@@ -298,7 +642,7 @@
  noinst_LIBRARIES = libeu.a
 --- elfutils/lib/Makefile.in
 +++ elfutils/lib/Makefile.in
-@@ -93,6 +93,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -94,6 +94,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
  INSTALL_SCRIPT = @INSTALL_SCRIPT@
  INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
  LDFLAGS = @LDFLAGS@
@@ -306,7 +650,7 @@
  LEX = @LEX@
  LEXLIB = @LEXLIB@
  LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-@@ -122,6 +123,7 @@ SHELL = @SHELL@
+@@ -123,6 +124,7 @@ SHELL = @SHELL@
  STRIP = @STRIP@
  USE_NLS = @USE_NLS@
  VERSION = @VERSION@
@@ -314,9 +658,9 @@
  XGETTEXT = @XGETTEXT@
  XGETTEXT_015 = @XGETTEXT_015@
  YACC = @YACC@
-@@ -179,9 +181,9 @@ top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
+@@ -181,9 +183,9 @@ top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
+ zip_LIBS = @zip_LIBS@
  @MUDFLAP_FALSE at AM_CFLAGS = -fpic -Wall -Wshadow -Werror -Wunused \
 - at MUDFLAP_FALSE@	-Wextra $($(*F)_CFLAGS)
 + at MUDFLAP_FALSE@	$(WEXTRA) $($(*F)_CFLAGS)
@@ -328,7 +672,7 @@
  libeu_a_SOURCES = xstrndup.c xmalloc.c next_prime.c \
 --- elfutils/libasm/ChangeLog
 +++ elfutils/libasm/ChangeLog
-@@ -58,6 +58,11 @@
+@@ -63,6 +63,11 @@
  	* asm_error.c: Add new error ASM_E_IOERROR.
  	* libasmP.h: Add ASM_E_IOERROR definition.
  
@@ -359,7 +703,7 @@
  	   -I$(top_srcdir)/lib
 --- elfutils/libasm/Makefile.in
 +++ elfutils/libasm/Makefile.in
-@@ -127,6 +127,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -128,6 +128,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
  INSTALL_SCRIPT = @INSTALL_SCRIPT@
  INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
  LDFLAGS = @LDFLAGS@
@@ -367,7 +711,7 @@
  LEX = @LEX@
  LEXLIB = @LEXLIB@
  LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-@@ -156,6 +157,7 @@ SHELL = @SHELL@
+@@ -157,6 +158,7 @@ SHELL = @SHELL@
  STRIP = @STRIP@
  USE_NLS = @USE_NLS@
  VERSION = 1
@@ -375,9 +719,9 @@
  XGETTEXT = @XGETTEXT@
  XGETTEXT_015 = @XGETTEXT_015@
  YACC = @YACC@
-@@ -213,9 +215,9 @@ top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
+@@ -215,9 +217,9 @@ top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
+ zip_LIBS = @zip_LIBS@
  @MUDFLAP_FALSE at AM_CFLAGS = -std=gnu99 -Wall -Wshadow -Werror -Wunused \
 - at MUDFLAP_FALSE@	-Wextra -Wformat=2
 + at MUDFLAP_FALSE@	$(WEXTRA) -Wformat=2
@@ -389,7 +733,19 @@
  	   -I$(top_srcdir)/lib
 --- elfutils/libcpu/ChangeLog
 +++ elfutils/libcpu/ChangeLog
-@@ -307,6 +307,11 @@
+@@ -1,3 +1,11 @@
++2009-01-23  Roland McGrath  <roland at redhat.com>
++
++	* i386_disasm.c (i386_disasm): Add abort after assert-constant for old
++	compilers that don't realize it's noreturn.
++
++	* Makefile.am (i386_parse_CFLAGS): Use quotes around command
++	substitution that can produce leading whitespace.
++
+ 2009-01-01  Ulrich Drepper  <drepper at redhat.com>
+ 
+ 	* i386_parse.y (instrtable_out): Optimize match_data table by not
+@@ -324,6 +332,11 @@
  	* defs/i386.doc: New file.
  	* defs/x86_64: New file.
  
@@ -401,8 +757,26 @@
  2005-02-15  Ulrich Drepper  <drepper at redhat.com>
  
  	* Makefile (AM_CFLAGS): Add -Wunused -Wextra -Wformat=2.
+--- elfutils/libcpu/i386_disasm.c
++++ elfutils/libcpu/i386_disasm.c
+@@ -791,6 +791,7 @@ i386_disasm (const uint8_t **startp, con
+ 
+ 			default:
+ 			  assert (! "INVALID not handled");
++			  abort ();
+ 			}
+ 		    }
+ 		  else
 --- elfutils/libcpu/Makefile.am
 +++ elfutils/libcpu/Makefile.am
+@@ -1,6 +1,6 @@
+ ## Process this file with automake to create Makefile.in
+ ##
+-## Copyright (C) 2002, 2004, 2005, 2007, 2008 Red Hat, Inc.
++## Copyright (C) 2002, 2004, 2005, 2007, 2008, 2009 Red Hat, Inc.
+ ## This file is part of Red Hat elfutils.
+ ##
+ ## Red Hat elfutils is free software; you can redistribute it and/or modify
 @@ -30,7 +30,8 @@ AM_CFLAGS = -fmudflap
  else
  AM_CFLAGS =
@@ -413,9 +787,18 @@
  	     $($(*F)_CFLAGS) \
  	     $(if $($(*F)_no_Werror),,-Werror)
  INCLUDES = -I$(srcdir) -I$(srcdir)/../lib -I$(srcdir)/../libelf \
+@@ -70,7 +71,7 @@ libeu = ../lib/libeu.a
+ 
+ i386_lex_CFLAGS = -Wno-unused-label -Wno-unused-function -Wno-sign-compare
+ i386_parse.o: i386_parse.c i386.mnemonics
+-i386_parse_CFLAGS = -DNMNES=$$(wc -l < i386.mnemonics)
++i386_parse_CFLAGS = -DNMNES="`wc -l < i386.mnemonics`"
+ i386_lex.o: i386_parse.h
+ i386_gendis_LDADD = $(libeu) -lm $(libmudflap)
+ 
 --- elfutils/libcpu/Makefile.in
 +++ elfutils/libcpu/Makefile.in
-@@ -109,6 +109,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -110,6 +110,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
  INSTALL_SCRIPT = @INSTALL_SCRIPT@
  INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
  LDFLAGS = @LDFLAGS@
@@ -423,7 +806,7 @@
  LEX = @LEX@
  LEXLIB = @LEXLIB@
  LEX_OUTPUT_ROOT = lex.$(<F:lex.l=)
-@@ -138,6 +139,7 @@ SHELL = @SHELL@
+@@ -139,6 +140,7 @@ SHELL = @SHELL@
  STRIP = @STRIP@
  USE_NLS = @USE_NLS@
  VERSION = @VERSION@
@@ -431,10 +814,10 @@
  XGETTEXT = @XGETTEXT@
  XGETTEXT_015 = @XGETTEXT_015@
  YACC = @YACC@
-@@ -194,10 +196,10 @@ target_alias = @target_alias@
- top_build_prefix = @top_build_prefix@
+@@ -196,10 +198,10 @@ top_build_prefix = @top_build_prefix@
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
+ zip_LIBS = @zip_LIBS@
 - at MUDFLAP_FALSE@AM_CFLAGS = -Wall -Wshadow -Wunused -Wextra -std=gnu99 \
 - at MUDFLAP_FALSE@	-fpic $($(*F)_CFLAGS) $(if \
 + at MUDFLAP_FALSE@AM_CFLAGS = -Wall -Wshadow -Wunused $(WEXTRA) \
@@ -445,9 +828,27 @@
  @MUDFLAP_TRUE@	-std=gnu99 -fpic $($(*F)_CFLAGS) $(if \
  @MUDFLAP_TRUE@	$($(*F)_no_Werror),,-Werror)
  INCLUDES = -I$(srcdir) -I$(srcdir)/../lib -I$(srcdir)/../libelf \
+@@ -215,7 +217,7 @@ i386_gendis_SOURCES = i386_gendis.c i386
+ i386_lex_no_Werror = yes
+ libeu = ../lib/libeu.a
+ i386_lex_CFLAGS = -Wno-unused-label -Wno-unused-function -Wno-sign-compare
+-i386_parse_CFLAGS = -DNMNES=$$(wc -l < i386.mnemonics)
++i386_parse_CFLAGS = -DNMNES="`wc -l < i386.mnemonics`"
+ i386_gendis_LDADD = $(libeu) -lm $(libmudflap)
+ noinst_HEADERS = memory-access.h i386_parse.h i386_data.h
+ EXTRA_DIST = defs/i386
 --- elfutils/libdw/ChangeLog
 +++ elfutils/libdw/ChangeLog
-@@ -495,6 +495,11 @@
+@@ -1,3 +1,8 @@
++2009-01-23  Roland McGrath  <roland at redhat.com>
++
++	* Makefile.am ($(srcdir)/known-dwarf.h): Target renamed back.
++	Put these rules under if MAINTAINER_MODE.
++
+ 2009-01-22  Roland McGrath  <roland at redhat.com>
+ 
+ 	* dwarf.h: Add DW_OP_GNU_encoded_addr.
+@@ -542,6 +547,11 @@
  
  2005-05-31  Roland McGrath  <roland at redhat.com>
  
@@ -478,9 +879,26 @@
  INCLUDES = -I. -I$(srcdir) -I$(srcdir)/../libelf -I.. -I$(srcdir)/../lib
  VERSION = 1
  
+@@ -85,11 +86,13 @@ libdw_a_SOURCES = dwarf_begin.c dwarf_be
+ 		  libdw_visit_scopes.c \
+ 		  dwarf_entry_breakpoints.c
+ 
+-BUILT_SOURCES = known-dwarf.h
+-CLEANFILES = known-dwarf.h
+-known-dwarf.h: $(top_srcdir)/config/known-dwarf.awk $(srcdir)/dwarf.h
++if MAINTAINER_MODE
++BUILT_SOURCES = $(srcdir)/known-dwarf.h
++MAINTAINERCLEANFILES = $(srcdir)/known-dwarf.h
++$(srcdir)/known-dwarf.h: $(top_srcdir)/config/known-dwarf.awk $(srcdir)/dwarf.h
+ 	$(AWK) -f $^ > $@.new
+ 	mv -f $@.new $@
++endif
+ 
+ if !MUDFLAP
+ libdw_pic_a_SOURCES =
 --- elfutils/libdw/Makefile.in
 +++ elfutils/libdw/Makefile.in
-@@ -164,6 +164,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -165,6 +165,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
  INSTALL_SCRIPT = @INSTALL_SCRIPT@
  INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
  LDFLAGS = @LDFLAGS@
@@ -488,7 +906,7 @@
  LEX = @LEX@
  LEXLIB = @LEXLIB@
  LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-@@ -193,6 +194,7 @@ SHELL = @SHELL@
+@@ -194,6 +195,7 @@ SHELL = @SHELL@
  STRIP = @STRIP@
  USE_NLS = @USE_NLS@
  VERSION = 1
@@ -496,9 +914,9 @@
  XGETTEXT = @XGETTEXT@
  XGETTEXT_015 = @XGETTEXT_015@
  YACC = @YACC@
-@@ -250,9 +252,10 @@ top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
+@@ -252,9 +254,10 @@ top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
+ zip_LIBS = @zip_LIBS@
  @MUDFLAP_FALSE at AM_CFLAGS = $(am__append_1) -Wall -Werror -Wshadow \
 - at MUDFLAP_FALSE@	-Wunused -Wformat=2 -Wextra -std=gnu99
 + at MUDFLAP_FALSE@	-Wunused -Wformat=2 $(WEXTRA) -std=gnu99
@@ -509,9 +927,49 @@
  INCLUDES = -I. -I$(srcdir) -I$(srcdir)/../libelf -I.. -I$(srcdir)/../lib
  COMPILE.os = $(filter-out -fprofile-arcs, $(filter-out -ftest-coverage, \
  						       $(COMPILE)))
+@@ -299,8 +302,8 @@ libdw_a_SOURCES = dwarf_begin.c dwarf_be
+ 		  libdw_visit_scopes.c \
+ 		  dwarf_entry_breakpoints.c
+ 
+-BUILT_SOURCES = known-dwarf.h
+-CLEANFILES = known-dwarf.h
++ at MAINTAINER_MODE_TRUE@BUILT_SOURCES = $(srcdir)/known-dwarf.h
++ at MAINTAINER_MODE_TRUE@MAINTAINERCLEANFILES = $(srcdir)/known-dwarf.h
+ @MUDFLAP_FALSE at libdw_pic_a_SOURCES = 
+ @MUDFLAP_FALSE at am_libdw_pic_a_OBJECTS = $(libdw_a_SOURCES:.c=.os)
+ @MUDFLAP_FALSE at libdw_so_SOURCES = 
+@@ -635,7 +638,6 @@ mostlyclean-generic:
+ 	-test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)
+ 
+ clean-generic:
+-	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+ 
+ distclean-generic:
+ 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+@@ -644,6 +646,7 @@ maintainer-clean-generic:
+ 	@echo "This command is intended for maintainers to use"
+ 	@echo "it deletes files that may require special tools to rebuild."
+ 	-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
++	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
+ clean: clean-am
+ 
+ clean-am: clean-generic clean-libLIBRARIES clean-noinstLIBRARIES \
+@@ -720,9 +723,9 @@ uninstall-am: uninstall-includeHEADERS u
+ 	ps ps-am tags uninstall uninstall-am uninstall-includeHEADERS \
+ 	uninstall-libLIBRARIES uninstall-pkgincludeHEADERS
+ 
+-known-dwarf.h: $(top_srcdir)/config/known-dwarf.awk $(srcdir)/dwarf.h
+-	$(AWK) -f $^ > $@.new
+-	mv -f $@.new $@
++ at MAINTAINER_MODE_TRUE@$(srcdir)/known-dwarf.h: $(top_srcdir)/config/known-dwarf.awk $(srcdir)/dwarf.h
++ at MAINTAINER_MODE_TRUE@	$(AWK) -f $^ > $@.new
++ at MAINTAINER_MODE_TRUE@	mv -f $@.new $@
+ @MUDFLAP_FALSE at libdw.so: $(srcdir)/libdw.map libdw_pic.a \
+ @MUDFLAP_FALSE@	  ../libdwfl/libdwfl_pic.a ../libebl/libebl.a \
+ @MUDFLAP_FALSE@	  ../libelf/libelf.so
 --- elfutils/libdwfl/ChangeLog
 +++ elfutils/libdwfl/ChangeLog
-@@ -936,6 +936,11 @@
+@@ -987,6 +987,11 @@
  
  2005-07-21  Roland McGrath  <roland at redhat.com>
  
@@ -542,7 +1000,7 @@
  VERSION = 1
 --- elfutils/libdwfl/Makefile.in
 +++ elfutils/libdwfl/Makefile.in
-@@ -131,6 +131,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -155,6 +155,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
  INSTALL_SCRIPT = @INSTALL_SCRIPT@
  INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
  LDFLAGS = @LDFLAGS@
@@ -550,7 +1008,7 @@
  LEX = @LEX@
  LEXLIB = @LEXLIB@
  LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-@@ -160,6 +161,7 @@ SHELL = @SHELL@
+@@ -184,6 +185,7 @@ SHELL = @SHELL@
  STRIP = @STRIP@
  USE_NLS = @USE_NLS@
  VERSION = 1
@@ -558,9 +1016,9 @@
  XGETTEXT = @XGETTEXT@
  XGETTEXT_015 = @XGETTEXT_015@
  YACC = @YACC@
-@@ -217,9 +219,9 @@ top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
+@@ -242,9 +244,9 @@ top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
+ zip_LIBS = @zip_LIBS@
  @MUDFLAP_FALSE at AM_CFLAGS = -Wall -Werror -Wshadow -Wunused -Wformat=2 \
 - at MUDFLAP_FALSE@	-Wextra -std=gnu99
 + at MUDFLAP_FALSE@	$(WEXTRA) -std=gnu99
@@ -603,7 +1061,7 @@
  INCLUDES = -I$(srcdir) -I$(top_srcdir)/libelf -I$(top_srcdir)/libdw \
 --- elfutils/libebl/Makefile.in
 +++ elfutils/libebl/Makefile.in
-@@ -123,6 +123,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -124,6 +124,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
  INSTALL_SCRIPT = @INSTALL_SCRIPT@
  INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
  LDFLAGS = @LDFLAGS@
@@ -611,7 +1069,7 @@
  LEX = @LEX@
  LEXLIB = @LEXLIB@
  LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-@@ -152,6 +153,7 @@ SHELL = @SHELL@
+@@ -153,6 +154,7 @@ SHELL = @SHELL@
  STRIP = @STRIP@
  USE_NLS = @USE_NLS@
  VERSION = 1
@@ -619,9 +1077,9 @@
  XGETTEXT = @XGETTEXT@
  XGETTEXT_015 = @XGETTEXT_015@
  YACC = @YACC@
-@@ -209,9 +211,9 @@ top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
+@@ -211,9 +213,9 @@ top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
+ zip_LIBS = @zip_LIBS@
  @MUDFLAP_FALSE at AM_CFLAGS = -fpic -Wall -Wshadow -Werror -Wunused \
 - at MUDFLAP_FALSE@	-Wextra -Wformat=2 -std=gnu99
 + at MUDFLAP_FALSE@	$(WEXTRA) -Wformat=2 -std=gnu99
@@ -633,18 +1091,18 @@
  
 --- elfutils/libelf/ChangeLog
 +++ elfutils/libelf/ChangeLog
-@@ -477,6 +477,11 @@
- 	If section content hasn't been read yet, do it before looking for the
- 	block size.  If no section data present, infer size of section header.
+@@ -515,6 +515,11 @@
+ 
+ 	* elf.h: Update from glibc.
  
 +2005-05-31  Roland McGrath  <roland at redhat.com>
 +
 +	* Makefile.am (WEXTRA): New variable, substituted by configure.
 +	(AM_CFLAGS): Use it in place of -Wextra.
 +
- 2005-05-11  Ulrich Drepper  <drepper at redhat.com>
+ 2005-05-08  Roland McGrath  <roland at redhat.com>
  
- 	* elf.h: Update again.
+ 	* elf_begin.c (read_file) [_MUDFLAP]: Don't use mmap for now.
 --- elfutils/libelf/common.h
 +++ elfutils/libelf/common.h
 @@ -160,7 +160,7 @@ libelf_release_all (Elf *elf)
@@ -686,7 +1144,7 @@
  GCC_INCLUDE = -I$(shell $(CC) -print-file-name=include)
 --- elfutils/libelf/Makefile.in
 +++ elfutils/libelf/Makefile.in
-@@ -171,6 +171,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -172,6 +172,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
  INSTALL_SCRIPT = @INSTALL_SCRIPT@
  INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
  LDFLAGS = @LDFLAGS@
@@ -694,7 +1152,7 @@
  LEX = @LEX@
  LEXLIB = @LEXLIB@
  LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-@@ -200,6 +201,7 @@ SHELL = @SHELL@
+@@ -201,6 +202,7 @@ SHELL = @SHELL@
  STRIP = @STRIP@
  USE_NLS = @USE_NLS@
  VERSION = 1
@@ -702,9 +1160,9 @@
  XGETTEXT = @XGETTEXT@
  XGETTEXT_015 = @XGETTEXT_015@
  YACC = @YACC@
-@@ -257,10 +259,10 @@ top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
+@@ -259,10 +261,10 @@ top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
+ zip_LIBS = @zip_LIBS@
  @MUDFLAP_FALSE at AM_CFLAGS = $(am__append_1) -Wall -Wshadow -Werror \
 - at MUDFLAP_FALSE@	-Wunused -Wextra -Wformat=2 -std=gnu99 \
 + at MUDFLAP_FALSE@	-Wunused $(WEXTRA) -Wformat=2 -std=gnu99 \
@@ -717,7 +1175,7 @@
  GCC_INCLUDE = -I$(shell $(CC) -print-file-name=include)
 --- elfutils/m4/Makefile.in
 +++ elfutils/m4/Makefile.in
-@@ -71,6 +71,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -72,6 +72,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
  INSTALL_SCRIPT = @INSTALL_SCRIPT@
  INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
  LDFLAGS = @LDFLAGS@
@@ -725,7 +1183,7 @@
  LEX = @LEX@
  LEXLIB = @LEXLIB@
  LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-@@ -100,6 +101,7 @@ SHELL = @SHELL@
+@@ -101,6 +102,7 @@ SHELL = @SHELL@
  STRIP = @STRIP@
  USE_NLS = @USE_NLS@
  VERSION = @VERSION@
@@ -735,7 +1193,7 @@
  YACC = @YACC@
 --- elfutils/Makefile.in
 +++ elfutils/Makefile.in
-@@ -109,6 +109,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -110,6 +110,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
  INSTALL_SCRIPT = @INSTALL_SCRIPT@
  INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
  LDFLAGS = @LDFLAGS@
@@ -743,7 +1201,7 @@
  LEX = @LEX@
  LEXLIB = @LEXLIB@
  LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-@@ -138,6 +139,7 @@ SHELL = @SHELL@
+@@ -139,6 +140,7 @@ SHELL = @SHELL@
  STRIP = @STRIP@
  USE_NLS = @USE_NLS@
  VERSION = @VERSION@
@@ -751,9 +1209,38 @@
  XGETTEXT = @XGETTEXT@
  XGETTEXT_015 = @XGETTEXT_015@
  YACC = @YACC@
+--- elfutils/src/addr2line.c
++++ elfutils/src/addr2line.c
+@@ -376,7 +376,7 @@ handle_address (const char *string, Dwfl
+       bool parsed = false;
+       int n;
+       char *name = NULL;
+-      if (sscanf (string, "(%m[^)])%" PRIiMAX "%n", &name, &addr, &n) == 2
++      if (sscanf (string, "(%a[^)])%" PRIiMAX "%n", &name, &addr, &n) == 2
+ 	  && string[n] == '\0')
+ 	{
+ 	  /* It was (section)+offset.  This makes sense if there is
+@@ -417,7 +417,7 @@ handle_address (const char *string, Dwfl
+ 		}
+ 	    }
+ 	}
+-      else if (sscanf (string, "%m[^-+]%" PRIiMAX "%n", &name, &addr, &n) == 2
++      else if (sscanf (string, "%a[^-+]%" PRIiMAX "%n", &name, &addr, &n) == 2
+ 	       && string[n] == '\0')
+ 	{
+ 	  /* It was symbol+offset.  */
 --- elfutils/src/ChangeLog
 +++ elfutils/src/ChangeLog
-@@ -76,6 +76,11 @@
+@@ -12,6 +12,8 @@
+ 	* readelf.c (print_debug_frame_section): Use t instead of j formats
+ 	for ptrdiff_t OFFSET.
+ 
++	* addr2line.c (handle_address): Use %a instead of %m for compatibility.
++
+ 2009-01-21  Ulrich Drepper  <drepper at redhat.com>
+ 
+ 	* elflint.c (check_program_header): Fix typo in .eh_frame_hdr section
+@@ -195,6 +197,11 @@
  	that matches its PT_LOAD's p_flags &~ PF_W.  On sparc, PF_X really
  	is valid in RELRO.
  
@@ -765,7 +1252,7 @@
  2008-02-29  Roland McGrath  <roland at redhat.com>
  
  	* readelf.c (print_attributes): Add a cast.
-@@ -327,6 +332,8 @@
+@@ -446,6 +453,8 @@
  
  	* readelf.c (hex_dump): Fix rounding error in whitespace calculation.
  
@@ -774,7 +1261,7 @@
  2007-10-15  Roland McGrath  <roland at redhat.com>
  
  	* make-debug-archive.in: New file.
-@@ -766,6 +773,10 @@
+@@ -885,6 +894,10 @@
  	* elflint.c (valid_e_machine): Add EM_ALPHA.
  	Reported by Christian Aichinger <Greek0 at gmx.net>.
  
@@ -785,7 +1272,7 @@
  2006-08-08  Ulrich Drepper  <drepper at redhat.com>
  
  	* elflint.c (check_dynamic): Don't require DT_HASH for DT_SYMTAB.
-@@ -842,6 +853,10 @@
+@@ -961,6 +974,10 @@
  	* Makefile.am: Add hacks to create dependency files for non-generic
  	linker.
  
@@ -796,7 +1283,7 @@
  2006-06-12  Ulrich Drepper  <drepper at redhat.com>
  
  	* ldgeneric.c (ld_generic_generate_sections): Don't create .interp
-@@ -1190,6 +1205,11 @@
+@@ -1309,6 +1326,11 @@
  	* readelf.c (print_debug_loc_section): Fix indentation for larger
  	address size.
  
@@ -810,7 +1297,7 @@
  	* readelf.c (print_debug_line_section): Print section offset of each
 --- elfutils/src/findtextrel.c
 +++ elfutils/src/findtextrel.c
-@@ -488,7 +488,11 @@ ptrcompare (const void *p1, const void *
+@@ -490,7 +490,11 @@ ptrcompare (const void *p1, const void *
  
  
  static void
@@ -839,10 +1326,10 @@
  	     $(if $($(*F)_no_Werror),,-Werror) \
 -	     $(if $($(*F)_no_Wunused),,-Wunused -Wextra) \
 +	     $(if $($(*F)_no_Wunused),,-Wunused $(WEXTRA)) \
- 	     $(if $($(*F)_no_Wformat),,-Wformat=2) $(CFLAGS_$(*F))
+ 	     $(if $($(*F)_no_Wformat),-Wno-format,-Wformat=2) $(CFLAGS_$(*F))
  
  INCLUDES = -I$(srcdir) -I$(srcdir)/../libelf -I$(srcdir)/../libebl \
-@@ -111,6 +112,9 @@ strings_no_Wformat = yes
+@@ -112,6 +113,9 @@ addr2line_no_Wformat = yes
  # XXX While the file is not finished, don't warn about this
  ldgeneric_no_Wunused = yes
  
@@ -854,7 +1341,7 @@
  size_LDADD = $(libelf) $(libeu) $(libmudflap)
 --- elfutils/src/Makefile.in
 +++ elfutils/src/Makefile.in
-@@ -201,6 +201,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -202,6 +202,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
  INSTALL_SCRIPT = @INSTALL_SCRIPT@
  INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
  LDFLAGS = @LDFLAGS@
@@ -862,7 +1349,7 @@
  LEX = @LEX@
  LEXLIB = @LEXLIB@
  LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-@@ -230,6 +231,7 @@ SHELL = @SHELL@
+@@ -231,6 +232,7 @@ SHELL = @SHELL@
  STRIP = @STRIP@
  USE_NLS = @USE_NLS@
  VERSION = @VERSION@
@@ -870,24 +1357,24 @@
  XGETTEXT = @XGETTEXT@
  XGETTEXT_015 = @XGETTEXT_015@
  YACC = @YACC@ -d
-@@ -289,13 +291,13 @@ top_srcdir = @top_srcdir@
+@@ -291,13 +293,13 @@ zip_LIBS = @zip_LIBS@
  @MUDFLAP_FALSE at AM_CFLAGS = -Wall -Wshadow -std=gnu99 \
  @MUDFLAP_FALSE@	$(native_ld_cflags) $(if \
  @MUDFLAP_FALSE@	$($(*F)_no_Werror),,-Werror) $(if \
 - at MUDFLAP_FALSE@	$($(*F)_no_Wunused),,-Wunused -Wextra) $(if \
 + at MUDFLAP_FALSE@	$($(*F)_no_Wunused),,-Wunused $(WEXTRA)) $(if \
- @MUDFLAP_FALSE@	$($(*F)_no_Wformat),,-Wformat=2) \
+ @MUDFLAP_FALSE@	$($(*F)_no_Wformat),-Wno-format,-Wformat=2) \
  @MUDFLAP_FALSE@	$(CFLAGS_$(*F))
  @MUDFLAP_TRUE at AM_CFLAGS = -fmudflap -Wall -Wshadow -std=gnu99 \
  @MUDFLAP_TRUE@	$(native_ld_cflags) $(if \
  @MUDFLAP_TRUE@	$($(*F)_no_Werror),,-Werror) $(if \
 - at MUDFLAP_TRUE@	$($(*F)_no_Wunused),,-Wunused -Wextra) $(if \
 + at MUDFLAP_TRUE@	$($(*F)_no_Wunused),,-Wunused $(WEXTRA)) $(if \
- @MUDFLAP_TRUE@	$($(*F)_no_Wformat),,-Wformat=2) $(CFLAGS_$(*F))
+ @MUDFLAP_TRUE@	$($(*F)_no_Wformat),-Wno-format,-Wformat=2) \
+ @MUDFLAP_TRUE@	$(CFLAGS_$(*F))
  INCLUDES = -I$(srcdir) -I$(srcdir)/../libelf -I$(srcdir)/../libebl \
- 	   -I$(srcdir)/../libdw -I$(srcdir)/../libdwfl \
-@@ -339,6 +341,9 @@ size_no_Wformat = yes
- strings_no_Wformat = yes
+@@ -343,6 +345,9 @@ strings_no_Wformat = yes
+ addr2line_no_Wformat = yes
  # XXX While the file is not finished, don't warn about this
  ldgeneric_no_Wunused = yes
 +
@@ -898,7 +1385,7 @@
  size_LDADD = $(libelf) $(libeu) $(libmudflap)
 --- elfutils/src/readelf.c
 +++ elfutils/src/readelf.c
-@@ -6424,7 +6424,7 @@ dump_archive_index (Elf *elf, const char
+@@ -7385,7 +7385,7 @@ dump_archive_index (Elf *elf, const char
  	  if (unlikely (elf_rand (elf, as_off) == 0)
  	      || unlikely ((subelf = elf_begin (-1, ELF_C_READ_MMAP, elf))
  			   == NULL))
@@ -988,7 +1475,7 @@
  cannot set access and modification date of '%s'"), fname);
 --- elfutils/tests/ChangeLog
 +++ elfutils/tests/ChangeLog
-@@ -84,6 +84,8 @@
+@@ -95,6 +95,8 @@
  
  2008-01-21  Roland McGrath  <roland at redhat.com>
  
@@ -997,7 +1484,7 @@
  	* testfile45.S.bz2: Add tests for cltq, cqto.
  	* testfile45.expect.bz2: Adjust.
  
-@@ -792,6 +794,11 @@
+@@ -803,6 +805,11 @@
  	* Makefile.am (TESTS): Add run-elflint-test.sh.
  	(EXTRA_DIST): Add run-elflint-test.sh and testfile18.bz2.
  
@@ -1040,7 +1527,7 @@
  endif
 --- elfutils/tests/Makefile.in
 +++ elfutils/tests/Makefile.in
-@@ -341,6 +341,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -342,6 +342,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
  INSTALL_SCRIPT = @INSTALL_SCRIPT@
  INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
  LDFLAGS = @LDFLAGS@
@@ -1048,7 +1535,7 @@
  LEX = @LEX@
  LEXLIB = @LEXLIB@
  LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-@@ -370,6 +371,7 @@ SHELL = @SHELL@
+@@ -371,6 +372,7 @@ SHELL = @SHELL@
  STRIP = @STRIP@
  USE_NLS = @USE_NLS@
  VERSION = @VERSION@
@@ -1056,10 +1543,10 @@
  XGETTEXT = @XGETTEXT@
  XGETTEXT_015 = @XGETTEXT_015@
  YACC = @YACC@
-@@ -426,10 +428,10 @@ target_alias = @target_alias@
- top_build_prefix = @top_build_prefix@
+@@ -428,10 +430,10 @@ top_build_prefix = @top_build_prefix@
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
+ zip_LIBS = @zip_LIBS@
 - at MUDFLAP_FALSE@AM_CFLAGS = -Wall -Werror -Wextra -std=gnu99 \
 + at MUDFLAP_FALSE@AM_CFLAGS = -Wall -Werror $(WEXTRA) -std=gnu99 \
  @MUDFLAP_FALSE@	    $(if $($(*F)_no_Wformat),-Wno-format,-Wformat=2)

elfutils-robustify.patch:

Index: elfutils-robustify.patch
===================================================================
RCS file: /cvs/pkgs/rpms/elfutils/F-9/elfutils-robustify.patch,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- elfutils-robustify.patch	27 Aug 2008 08:26:20 -0000	1.12
+++ elfutils-robustify.patch	24 Jan 2009 01:22:10 -0000	1.13
@@ -1,72 +1,57 @@
-src/
-2005-06-09  Roland McGrath  <roland at redhat.com>
-
-	* readelf.c (handle_dynamic, handle_symtab): Check for bogus sh_link.
-	(handle_verneed, handle_verdef, handle_versym, handle_hash): Likewise.
-	(handle_scngrp): Check for bogus sh_info.
-
-	* strip.c (handle_elf): Check for bogus values in sh_link, sh_info,
-	st_shndx, e_shstrndx, and SHT_GROUP or SHT_SYMTAB_SHNDX data.
-	Don't use assert on input values, instead bail with "illformed" error.
-
-2005-05-17  Jakub Jelinek  <jakub at redhat.com>
-
-libelf/
-	* elf32_getphdr.c (elfw2(LIBELFBITS,getphdr)): Check if program header
-	table fits into object's bounds.
-	* elf_getshstrndx.c (elf_getshstrndx): Add elf->start_offset to
-	elf->map_address.  Check if first section header fits into object's
-	bounds.
-	* elf32_getshdr.c (elfw2(LIBELFBITS,getshdr)):
-	Check if section header table fits into object's bounds.
-	* elf_begin.c (get_shnum): Ensure section headers fits into
-	object's bounds.
-	(file_read_elf): Make sure scncnt is small enough to allocate both
-	ElfXX_Shdr and Elf_Scn array.  Make sure section and program header
-	tables fit into object's bounds.  Avoid memory leak on failure.
-
-src/
-	* elflint.c (check_hash): Don't check entries beyond end of section.
-	(check_note): Don't crash if gelf_rawchunk fails.
-	(section_name): Return <invalid> if gelf_getshdr returns NULL.
-
-2005-05-14  Jakub Jelinek  <jakub at redhat.com>
-
-libelf/
-	* libelfP.h (INVALID_NDX): Define.
-	* gelf_getdyn.c (gelf_getdyn): Use it.  Remove ndx < 0 test if any.
-	* gelf_getlib.c (gelf_getlib): Likewise.
-	* gelf_getmove.c (gelf_getmove): Likewise.
-	* gelf_getrel.c (gelf_getrel): Likewise.
-	* gelf_getrela.c (gelf_getrela): Likewise.
-	* gelf_getsym.c (gelf_getsym): Likewise.
-	* gelf_getsyminfo.c (gelf_getsyminfo): Likewise.
-	* gelf_getsymshndx.c (gelf_getsymshndx): Likewise.
-	* gelf_getversym.c (gelf_getversym): Likewise.
-	* gelf_update_dyn.c (gelf_update_dyn): Likewise.
-	* gelf_update_lib.c (gelf_update_lib): Likewise.
-	* gelf_update_move.c (gelf_update_move): Likewise.
-	* gelf_update_rel.c (gelf_update_rel): Likewise.
-	* gelf_update_rela.c (gelf_update_rela): Likewise.
-	* gelf_update_sym.c (gelf_update_sym): Likewise.
-	* gelf_update_syminfo.c (gelf_update_syminfo): Likewise.
-	* gelf_update_symshndx.c (gelf_update_symshndx): Likewise.
-	* gelf_update_versym.c (gelf_update_versym): Likewise.
-	* elf_newscn.c (elf_newscn): Check for overflow.
-	* elf32_updatefile.c (__elfw2(LIBELFBITS,updatemmap)): Likewise.
-	(__elfw2(LIBELFBITS,updatefile)): Likewise.
-	* elf_begin.c (file_read_elf): Likewise.
-	* elf32_newphdr.c (elfw2(LIBELFBITS,newphdr)): Likewise.
-	* elf_getarsym.c (elf_getarsym): Likewise.
-	* elf32_getshdr.c (elfw2(LIBELFBITS,getshdr)): Likewise.
-src/
-	* elflint.c (section_name): Return "<invalid>" instead of
-	crashing on invalid section name.
-	(check_symtab, is_rel_dyn, check_rela, check_rel, check_dynamic,
-	check_symtab_shndx, check_hash, check_versym): Robustify.
-
---- elfutils-0.136/libelf/elf32_getphdr.c.robustify
-+++ elfutils-0.136/libelf/elf32_getphdr.c
+--- elfutils/libelf/ChangeLog
++++ elfutils/libelf/ChangeLog
+@@ -507,6 +507,49 @@
+ 	If section content hasn't been read yet, do it before looking for the
+ 	block size.  If no section data present, infer size of section header.
+ 
++2005-05-17  Jakub Jelinek  <jakub at redhat.com>
++
++	* elf32_getphdr.c (elfw2(LIBELFBITS,getphdr)): Check if program header
++	table fits into object's bounds.
++	* elf_getshstrndx.c (elf_getshstrndx): Add elf->start_offset to
++	elf->map_address.  Check if first section header fits into object's
++	bounds.
++	* elf32_getshdr.c (elfw2(LIBELFBITS,getshdr)):
++	Check if section header table fits into object's bounds.
++	* elf_begin.c (get_shnum): Ensure section headers fits into
++	object's bounds.
++	(file_read_elf): Make sure scncnt is small enough to allocate both
++	ElfXX_Shdr and Elf_Scn array.  Make sure section and program header
++	tables fit into object's bounds.  Avoid memory leak on failure.
++
++2005-05-14  Jakub Jelinek  <jakub at redhat.com>
++
++	* libelfP.h (INVALID_NDX): Define.
++	* gelf_getdyn.c (gelf_getdyn): Use it.  Remove ndx < 0 test if any.
++	* gelf_getlib.c (gelf_getlib): Likewise.
++	* gelf_getmove.c (gelf_getmove): Likewise.
++	* gelf_getrel.c (gelf_getrel): Likewise.
++	* gelf_getrela.c (gelf_getrela): Likewise.
++	* gelf_getsym.c (gelf_getsym): Likewise.
++	* gelf_getsyminfo.c (gelf_getsyminfo): Likewise.
++	* gelf_getsymshndx.c (gelf_getsymshndx): Likewise.
++	* gelf_getversym.c (gelf_getversym): Likewise.
++	* gelf_update_dyn.c (gelf_update_dyn): Likewise.
++	* gelf_update_lib.c (gelf_update_lib): Likewise.
++	* gelf_update_move.c (gelf_update_move): Likewise.
++	* gelf_update_rel.c (gelf_update_rel): Likewise.
++	* gelf_update_rela.c (gelf_update_rela): Likewise.
++	* gelf_update_sym.c (gelf_update_sym): Likewise.
++	* gelf_update_syminfo.c (gelf_update_syminfo): Likewise.
++	* gelf_update_symshndx.c (gelf_update_symshndx): Likewise.
++	* gelf_update_versym.c (gelf_update_versym): Likewise.
++	* elf_newscn.c (elf_newscn): Check for overflow.
++	* elf32_updatefile.c (__elfw2(LIBELFBITS,updatemmap)): Likewise.
++	(__elfw2(LIBELFBITS,updatefile)): Likewise.
++	* elf_begin.c (file_read_elf): Likewise.
++	* elf32_newphdr.c (elfw2(LIBELFBITS,newphdr)): Likewise.
++	* elf_getarsym.c (elf_getarsym): Likewise.
++	* elf32_getshdr.c (elfw2(LIBELFBITS,getshdr)): Likewise.
+ 2005-05-11  Ulrich Drepper  <drepper at redhat.com>
+ 
+ 	* elf.h: Update again.
+--- elfutils/libelf/elf32_getphdr.c
++++ elfutils/libelf/elf32_getphdr.c
 @@ -105,6 +105,16 @@ __elfw2(LIBELFBITS,getphdr_wrlock) (elf)
  
        if (elf->map_address != NULL)
@@ -84,8 +69,8 @@
  	  /* All the data is already mapped.  Use it.  */
  	  void *file_phdr = ((char *) elf->map_address
  			     + elf->start_offset + ehdr->e_phoff);
---- elfutils-0.136/libelf/elf32_getshdr.c.robustify
-+++ elfutils-0.136/libelf/elf32_getshdr.c
+--- elfutils/libelf/elf32_getshdr.c
++++ elfutils/libelf/elf32_getshdr.c
 @@ -1,5 +1,5 @@
  /* Return section header.
 -   Copyright (C) 1998, 1999, 2000, 2001, 2002, 2005, 2007 Red Hat, Inc.
@@ -93,7 +78,7 @@
     This file is part of Red Hat elfutils.
     Written by Ulrich Drepper <drepper at redhat.com>, 1998.
  
-@@ -81,7 +81,8 @@ load_shdr_rwlock (Elf_Scn *scn)
+@@ -81,7 +81,8 @@ load_shdr_wrlock (Elf_Scn *scn)
      goto out;
  
    size_t shnum;
@@ -103,7 +88,7 @@
      goto out;
    size_t size = shnum * sizeof (ElfW2(LIBELFBITS,Shdr));
  
-@@ -98,6 +99,16 @@ load_shdr_rwlock (Elf_Scn *scn)
+@@ -98,6 +99,16 @@ load_shdr_wrlock (Elf_Scn *scn)
  
    if (elf->map_address != NULL)
      {
@@ -120,8 +105,8 @@
        ElfW2(LIBELFBITS,Shdr) *notcvt;
  
        /* All the data is already mapped.  If we could use it
---- elfutils-0.136/libelf/elf32_newphdr.c.robustify
-+++ elfutils-0.136/libelf/elf32_newphdr.c
+--- elfutils/libelf/elf32_newphdr.c
++++ elfutils/libelf/elf32_newphdr.c
 @@ -124,6 +124,12 @@ elfw2(LIBELFBITS,newphdr) (elf, count)
    else if (elf->state.ELFW(elf,LIBELFBITS).ehdr->e_phnum != count
  	   || elf->state.ELFW(elf,LIBELFBITS).phdr == NULL)
@@ -135,9 +120,9 @@
        /* Allocate a new program header with the appropriate number of
  	 elements.  */
        result = (ElfW2(LIBELFBITS,Phdr) *)
---- elfutils-0.136/libelf/elf32_updatefile.c.robustify
-+++ elfutils-0.136/libelf/elf32_updatefile.c
-@@ -212,6 +212,9 @@ __elfw2(LIBELFBITS,updatemmap) (Elf *elf
+--- elfutils/libelf/elf32_updatefile.c
++++ elfutils/libelf/elf32_updatefile.c
+@@ -220,6 +220,9 @@ __elfw2(LIBELFBITS,updatemmap) (Elf *elf
    /* Write all the sections.  Well, only those which are modified.  */
    if (shnum > 0)
      {
@@ -147,7 +132,7 @@
        Elf_ScnList *list = &elf->state.ELFW(elf,LIBELFBITS).scns;
        Elf_Scn **scns = (Elf_Scn **) alloca (shnum * sizeof (Elf_Scn *));
        char *const shdr_start = ((char *) elf->map_address + elf->start_offset
-@@ -582,6 +585,10 @@ __elfw2(LIBELFBITS,updatefile) (Elf *elf
+@@ -633,6 +636,10 @@ __elfw2(LIBELFBITS,updatefile) (Elf *elf
    /* Write all the sections.  Well, only those which are modified.  */
    if (shnum > 0)
      {
@@ -158,9 +143,9 @@
        off_t shdr_offset = elf->start_offset + ehdr->e_shoff;
  #if EV_NUM != 2
        xfct_t shdr_fctp = __elf_xfctstom[__libelf_version - 1][EV_CURRENT - 1][ELFW(ELFCLASS, LIBELFBITS) - 1][ELF_T_SHDR];
---- elfutils-0.136/libelf/elf_begin.c.robustify
-+++ elfutils-0.136/libelf/elf_begin.c
-@@ -155,7 +155,8 @@ get_shnum (void *map_address, unsigned c
+--- elfutils/libelf/elf_begin.c
++++ elfutils/libelf/elf_begin.c
+@@ -165,7 +165,8 @@ get_shnum (void *map_address, unsigned c
  
        if (unlikely (result == 0) && ehdr.e32->e_shoff != 0)
  	{
@@ -170,7 +155,7 @@
  	    /* Cannot read the first section header.  */
  	    return 0;
  
-@@ -203,7 +204,8 @@ get_shnum (void *map_address, unsigned c
+@@ -213,7 +214,8 @@ get_shnum (void *map_address, unsigned c
  
        if (unlikely (result == 0) && ehdr.e64->e_shoff != 0)
  	{
@@ -180,7 +165,7 @@
  	    /* Cannot read the first section header.  */
  	    return 0;
  
-@@ -275,6 +277,15 @@ file_read_elf (int fildes, void *map_add
+@@ -285,6 +287,15 @@ file_read_elf (int fildes, void *map_add
      /* Could not determine the number of sections.  */
      return NULL;
  
@@ -196,7 +181,7 @@
    /* We can now allocate the memory.  */
    Elf *elf = allocate_elf (fildes, map_address, offset, maxsize, cmd, parent,
  			   ELF_K_ELF, scncnt * sizeof (Elf_Scn));
-@@ -308,13 +319,31 @@ file_read_elf (int fildes, void *map_add
+@@ -318,13 +329,31 @@ file_read_elf (int fildes, void *map_add
  	{
  	  /* We can use the mmapped memory.  */
  	  elf->state.elf32.ehdr = ehdr;
@@ -228,7 +213,7 @@
  
  	  for (size_t cnt = 0; cnt < scncnt; ++cnt)
  	    {
-@@ -396,13 +425,26 @@ file_read_elf (int fildes, void *map_add
+@@ -406,13 +435,26 @@ file_read_elf (int fildes, void *map_add
  	{
  	  /* We can use the mmapped memory.  */
  	  elf->state.elf64.ehdr = ehdr;
@@ -255,8 +240,8 @@
  
  	  for (size_t cnt = 0; cnt < scncnt; ++cnt)
  	    {
---- elfutils-0.136/libelf/elf_getarsym.c.robustify
-+++ elfutils-0.136/libelf/elf_getarsym.c
+--- elfutils/libelf/elf_getarsym.c
++++ elfutils/libelf/elf_getarsym.c
 @@ -179,6 +179,9 @@ elf_getarsym (elf, ptr)
        size_t index_size = atol (tmpbuf);
  
@@ -267,8 +252,8 @@
  	  || n * sizeof (uint32_t) > index_size)
  	{
  	  /* This index table cannot be right since it does not fit into
---- elfutils-0.136/libelf/elf_getshstrndx.c.robustify
-+++ elfutils-0.136/libelf/elf_getshstrndx.c
+--- elfutils/libelf/elf_getshstrndx.c
++++ elfutils/libelf/elf_getshstrndx.c
 @@ -125,10 +125,25 @@ elf_getshstrndx (elf, dst)
  	      if (elf->map_address != NULL
  		  && elf->state.elf32.ehdr->e_ident[EI_DATA] == MY_ELFDATA
@@ -325,8 +310,8 @@
  	      else
  		{
  		  /* We avoid reading in all the section headers.  Just read
---- elfutils-0.136/libelf/elf_newscn.c.robustify
-+++ elfutils-0.136/libelf/elf_newscn.c
+--- elfutils/libelf/elf_newscn.c
++++ elfutils/libelf/elf_newscn.c
 @@ -104,10 +104,18 @@ elf_newscn (elf)
    else
      {
@@ -347,8 +332,8 @@
        newp = (Elf_ScnList *) calloc (sizeof (Elf_ScnList)
  				     + ((elf->state.elf.scnincr *= 2)
  					* sizeof (Elf_Scn)), 1);
---- elfutils-0.136/libelf/gelf_getdyn.c.robustify
-+++ elfutils-0.136/libelf/gelf_getdyn.c
+--- elfutils/libelf/gelf_getdyn.c
++++ elfutils/libelf/gelf_getdyn.c
 @@ -93,7 +93,8 @@ gelf_getdyn (data, ndx, dst)
  	 table entries has to be adopted.  The user better has provided
  	 a buffer where we can store the information.  While copying the
@@ -369,8 +354,8 @@
  	{
  	  __libelf_seterrno (ELF_E_INVALID_INDEX);
  	  goto out;
---- elfutils-0.136/libelf/gelf_getlib.c.robustify
-+++ elfutils-0.136/libelf/gelf_getlib.c
+--- elfutils/libelf/gelf_getlib.c
++++ elfutils/libelf/gelf_getlib.c
 @@ -86,7 +86,8 @@ gelf_getlib (data, ndx, dst)
    /* The data is already in the correct form.  Just make sure the
       index is OK.  */
@@ -381,8 +366,8 @@
      __libelf_seterrno (ELF_E_INVALID_INDEX);
    else
      {
---- elfutils-0.136/libelf/gelf_getmove.c.robustify
-+++ elfutils-0.136/libelf/gelf_getmove.c
+--- elfutils/libelf/gelf_getmove.c
++++ elfutils/libelf/gelf_getmove.c
 @@ -83,7 +83,8 @@ gelf_getmove (data, ndx, dst)
  
    /* The data is already in the correct form.  Just make sure the
@@ -393,8 +378,8 @@
      {
        __libelf_seterrno (ELF_E_INVALID_INDEX);
        goto out;
---- elfutils-0.136/libelf/gelf_getrela.c.robustify
-+++ elfutils-0.136/libelf/gelf_getrela.c
+--- elfutils/libelf/gelf_getrela.c
++++ elfutils/libelf/gelf_getrela.c
 @@ -71,12 +71,6 @@ gelf_getrela (data, ndx, dst)
    if (data_scn == NULL)
      return NULL;
@@ -428,8 +413,8 @@
  	{
  	  __libelf_seterrno (ELF_E_INVALID_INDEX);
  	  result = NULL;
---- elfutils-0.136/libelf/gelf_getrel.c.robustify
-+++ elfutils-0.136/libelf/gelf_getrel.c
+--- elfutils/libelf/gelf_getrel.c
++++ elfutils/libelf/gelf_getrel.c
 @@ -71,12 +71,6 @@ gelf_getrel (data, ndx, dst)
    if (data_scn == NULL)
      return NULL;
@@ -463,8 +448,8 @@
  	{
  	  __libelf_seterrno (ELF_E_INVALID_INDEX);
  	  result = NULL;
---- elfutils-0.136/libelf/gelf_getsym.c.robustify
-+++ elfutils-0.136/libelf/gelf_getsym.c
+--- elfutils/libelf/gelf_getsym.c
++++ elfutils/libelf/gelf_getsym.c
 @@ -90,7 +90,8 @@ gelf_getsym (data, ndx, dst)
  	 table entries has to be adopted.  The user better has provided
  	 a buffer where we can store the information.  While copying the
@@ -485,8 +470,8 @@
  	{
  	  __libelf_seterrno (ELF_E_INVALID_INDEX);
  	  goto out;
---- elfutils-0.136/libelf/gelf_getsyminfo.c.robustify
-+++ elfutils-0.136/libelf/gelf_getsyminfo.c
+--- elfutils/libelf/gelf_getsyminfo.c
++++ elfutils/libelf/gelf_getsyminfo.c
 @@ -84,7 +84,8 @@ gelf_getsyminfo (data, ndx, dst)
  
    /* The data is already in the correct form.  Just make sure the
@@ -497,8 +482,8 @@
      {
        __libelf_seterrno (ELF_E_INVALID_INDEX);
        goto out;
---- elfutils-0.136/libelf/gelf_getsymshndx.c.robustify
-+++ elfutils-0.136/libelf/gelf_getsymshndx.c
+--- elfutils/libelf/gelf_getsymshndx.c
++++ elfutils/libelf/gelf_getsymshndx.c
 @@ -90,7 +90,9 @@ gelf_getsymshndx (symdata, shndxdata, nd
       section index table.  */
    if (likely (shndxdata_scn != NULL))
@@ -530,8 +515,8 @@
  	{
  	  __libelf_seterrno (ELF_E_INVALID_INDEX);
  	  goto out;
---- elfutils-0.136/libelf/gelf_getversym.c.robustify
-+++ elfutils-0.136/libelf/gelf_getversym.c
+--- elfutils/libelf/gelf_getversym.c
++++ elfutils/libelf/gelf_getversym.c
 @@ -92,7 +92,8 @@ gelf_getversym (data, ndx, dst)
  
    /* The data is already in the correct form.  Just make sure the
@@ -542,8 +527,8 @@
      {
        __libelf_seterrno (ELF_E_INVALID_INDEX);
        result = NULL;
---- elfutils-0.136/libelf/gelf_update_dyn.c.robustify
-+++ elfutils-0.136/libelf/gelf_update_dyn.c
+--- elfutils/libelf/gelf_update_dyn.c
++++ elfutils/libelf/gelf_update_dyn.c
 @@ -71,12 +71,6 @@ gelf_update_dyn (data, ndx, src)
    if (data == NULL)
      return 0;
@@ -577,8 +562,8 @@
  	{
  	  __libelf_seterrno (ELF_E_INVALID_INDEX);
  	  goto out;
---- elfutils-0.136/libelf/gelf_update_lib.c.robustify
-+++ elfutils-0.136/libelf/gelf_update_lib.c
+--- elfutils/libelf/gelf_update_lib.c
++++ elfutils/libelf/gelf_update_lib.c
 @@ -68,12 +68,6 @@ gelf_update_lib (data, ndx, src)
    if (data == NULL)
      return 0;
@@ -602,8 +587,8 @@
      __libelf_seterrno (ELF_E_INVALID_INDEX);
    else
      {
---- elfutils-0.136/libelf/gelf_update_move.c.robustify
-+++ elfutils-0.136/libelf/gelf_update_move.c
+--- elfutils/libelf/gelf_update_move.c
++++ elfutils/libelf/gelf_update_move.c
 @@ -75,7 +75,7 @@ gelf_update_move (data, ndx, src)
    assert (sizeof (GElf_Move) == sizeof (Elf64_Move));
  
@@ -613,8 +598,8 @@
        || unlikely ((ndx + 1) * sizeof (GElf_Move) > data_scn->d.d_size))
      {
        __libelf_seterrno (ELF_E_INVALID_INDEX);
---- elfutils-0.136/libelf/gelf_update_rela.c.robustify
-+++ elfutils-0.136/libelf/gelf_update_rela.c
+--- elfutils/libelf/gelf_update_rela.c
++++ elfutils/libelf/gelf_update_rela.c
 @@ -68,12 +68,6 @@ gelf_update_rela (Elf_Data *dst, int ndx
    if (dst == NULL)
      return 0;
@@ -648,8 +633,8 @@
  	{
  	  __libelf_seterrno (ELF_E_INVALID_INDEX);
  	  goto out;
---- elfutils-0.136/libelf/gelf_update_rel.c.robustify
-+++ elfutils-0.136/libelf/gelf_update_rel.c
+--- elfutils/libelf/gelf_update_rel.c
++++ elfutils/libelf/gelf_update_rel.c
 @@ -68,12 +68,6 @@ gelf_update_rel (Elf_Data *dst, int ndx,
    if (dst == NULL)
      return 0;
@@ -683,8 +668,8 @@
  	{
  	  __libelf_seterrno (ELF_E_INVALID_INDEX);
  	  goto out;
---- elfutils-0.136/libelf/gelf_update_sym.c.robustify
-+++ elfutils-0.136/libelf/gelf_update_sym.c
+--- elfutils/libelf/gelf_update_sym.c
++++ elfutils/libelf/gelf_update_sym.c
 @@ -72,12 +72,6 @@ gelf_update_sym (data, ndx, src)
    if (data == NULL)
      return 0;
@@ -718,8 +703,8 @@
  	{
  	  __libelf_seterrno (ELF_E_INVALID_INDEX);
  	  goto out;
---- elfutils-0.136/libelf/gelf_update_syminfo.c.robustify
-+++ elfutils-0.136/libelf/gelf_update_syminfo.c
+--- elfutils/libelf/gelf_update_syminfo.c
++++ elfutils/libelf/gelf_update_syminfo.c
 @@ -72,12 +72,6 @@ gelf_update_syminfo (data, ndx, src)
    if (data == NULL)
      return 0;
@@ -743,8 +728,8 @@
      {
        __libelf_seterrno (ELF_E_INVALID_INDEX);
        goto out;
---- elfutils-0.136/libelf/gelf_update_symshndx.c.robustify
-+++ elfutils-0.136/libelf/gelf_update_symshndx.c
+--- elfutils/libelf/gelf_update_symshndx.c
++++ elfutils/libelf/gelf_update_symshndx.c
 @@ -77,12 +77,6 @@ gelf_update_symshndx (symdata, shndxdata
    if (symdata == NULL)
      return 0;
@@ -778,8 +763,8 @@
  	{
  	  __libelf_seterrno (ELF_E_INVALID_INDEX);
  	  goto out;
---- elfutils-0.136/libelf/gelf_update_versym.c.robustify
-+++ elfutils-0.136/libelf/gelf_update_versym.c
+--- elfutils/libelf/gelf_update_versym.c
++++ elfutils/libelf/gelf_update_versym.c
 @@ -75,7 +75,7 @@ gelf_update_versym (data, ndx, src)
    assert (sizeof (GElf_Versym) == sizeof (Elf64_Versym));
  
@@ -789,8 +774,8 @@
        || unlikely ((ndx + 1) * sizeof (GElf_Versym) > data_scn->d.d_size))
      {
        __libelf_seterrno (ELF_E_INVALID_INDEX);
---- elfutils-0.136/libelf/libelfP.h.robustify
-+++ elfutils-0.136/libelf/libelfP.h
+--- elfutils/libelf/libelfP.h
++++ elfutils/libelf/libelfP.h
 @@ -611,4 +611,13 @@ extern uint32_t __libelf_crc32 (uint32_t
  /* Align offset to 4 bytes as needed for note name and descriptor data.  */
  #define NOTE_ALIGN(n)	(((n) + 3) & -4U)
@@ -805,9 +790,48 @@
 +#endif
 +
  #endif  /* libelfP.h */
---- elfutils-0.136/src/elflint.c.robustify
-+++ elfutils-0.136/src/elflint.c
-@@ -131,6 +131,9 @@ static uint32_t shstrndx;
+--- elfutils/src/ChangeLog
++++ elfutils/src/ChangeLog
+@@ -1297,6 +1297,16 @@
+ 	object symbols or symbols with unknown type.
+ 	(check_rel): Likewise.
+ 
++2005-06-09  Roland McGrath  <roland at redhat.com>
++
++	* readelf.c (handle_dynamic, handle_symtab): Check for bogus sh_link.
++	(handle_verneed, handle_verdef, handle_versym, handle_hash): Likewise.
++	(handle_scngrp): Check for bogus sh_info.
++
++	* strip.c (handle_elf): Check for bogus values in sh_link, sh_info,
++	st_shndx, e_shstrndx, and SHT_GROUP or SHT_SYMTAB_SHNDX data.
++	Don't use assert on input values, instead bail with "illformed" error.
++
+ 2005-06-08  Roland McGrath  <roland at redhat.com>
+ 
+ 	* readelf.c (print_ops): Add consts.
+@@ -1342,6 +1352,19 @@
+ 
+ 	* readelf.c (dwarf_tag_string): Add new tags.
+ 
++2005-05-17  Jakub Jelinek  <jakub at redhat.com>
++
++	* elflint.c (check_hash): Don't check entries beyond end of section.
++	(check_note): Don't crash if gelf_rawchunk fails.
++	(section_name): Return <invalid> if gelf_getshdr returns NULL.
++
++2005-05-14  Jakub Jelinek  <jakub at redhat.com>
++
++	* elflint.c (section_name): Return "<invalid>" instead of
++	crashing on invalid section name.
++	(check_symtab, is_rel_dyn, check_rela, check_rel, check_dynamic,
++	check_symtab_shndx, check_hash, check_versym): Robustify.
++
+ 2005-05-08  Roland McGrath  <roland at redhat.com>
+ 
+ 	* strip.c (handle_elf): Don't translate hash and versym data formats,
+--- elfutils/src/elflint.c
++++ elfutils/src/elflint.c
+@@ -130,6 +130,9 @@ static uint32_t shstrndx;
  /* Array to count references in section groups.  */
  static int *scnref;
  
@@ -817,7 +841,7 @@
  
  int
  main (int argc, char *argv[])
-@@ -320,10 +323,19 @@ section_name (Ebl *ebl, int idx)
+@@ -319,10 +322,19 @@ section_name (Ebl *ebl, int idx)
  {
    GElf_Shdr shdr_mem;
    GElf_Shdr *shdr;
@@ -838,7 +862,7 @@
  }
  
  
-@@ -345,10 +357,6 @@ static const int valid_e_machine[] =
+@@ -344,10 +356,6 @@ static const int valid_e_machine[] =
    (sizeof (valid_e_machine) / sizeof (valid_e_machine[0]))
  
  
@@ -849,7 +873,7 @@
  static void
  check_elf_header (Ebl *ebl, GElf_Ehdr *ehdr, size_t size)
  {
-@@ -613,7 +621,8 @@ section [%2d] '%s': symbol table cannot 
+@@ -612,7 +620,8 @@ section [%2d] '%s': symbol table cannot 
  	  }
        }
  
@@ -859,7 +883,7 @@
      ERROR (gettext ("\
  section [%2u] '%s': entry size is does not match ElfXX_Sym\n"),
  	   idx, section_name (ebl, idx));
-@@ -651,7 +660,7 @@ section [%2d] '%s': XINDEX for zeroth en
+@@ -650,7 +659,7 @@ section [%2d] '%s': XINDEX for zeroth en
  	       xndxscnidx, section_name (ebl, xndxscnidx));
      }
  
@@ -868,7 +892,7 @@
      {
        sym = gelf_getsymshndx (data, xndxdata, cnt, &sym_mem, &xndx);
        if (sym == NULL)
-@@ -671,7 +680,8 @@ section [%2d] '%s': symbol %zu: invalid 
+@@ -670,7 +679,8 @@ section [%2d] '%s': symbol %zu: invalid 
        else
  	{
  	  name = elf_strptr (ebl->elf, shdr->sh_link, sym->st_name);
@@ -878,7 +902,7 @@
  	}
  
        if (sym->st_shndx == SHN_XINDEX)
-@@ -1001,9 +1011,11 @@ is_rel_dyn (Ebl *ebl, const GElf_Ehdr *e
+@@ -1000,9 +1010,11 @@ is_rel_dyn (Ebl *ebl, const GElf_Ehdr *e
      {
        GElf_Shdr rcshdr_mem;
        const GElf_Shdr *rcshdr = gelf_getshdr (scn, &rcshdr_mem);
@@ -892,7 +916,7 @@
  	{
  	  /* Found the dynamic section.  Look through it.  */
  	  Elf_Data *d = elf_getdata (scn, NULL);
-@@ -1013,7 +1025,9 @@ is_rel_dyn (Ebl *ebl, const GElf_Ehdr *e
+@@ -1012,7 +1024,9 @@ is_rel_dyn (Ebl *ebl, const GElf_Ehdr *e
  	    {
  	      GElf_Dyn dyn_mem;
  	      GElf_Dyn *dyn = gelf_getdyn (d, cnt, &dyn_mem);
@@ -903,7 +927,7 @@
  
  	      if (dyn->d_tag == DT_RELCOUNT)
  		{
-@@ -1027,7 +1041,9 @@ section [%2d] '%s': DT_RELCOUNT used for
+@@ -1026,7 +1040,9 @@ section [%2d] '%s': DT_RELCOUNT used for
  		      /* Does the number specified number of relative
  			 relocations exceed the total number of
  			 relocations?  */
@@ -914,7 +938,7 @@
  			ERROR (gettext ("\
  section [%2d] '%s': DT_RELCOUNT value %d too high for this section\n"),
  			       idx, section_name (ebl, idx),
-@@ -1187,7 +1203,8 @@ section [%2d] '%s': no relocations for m
+@@ -1186,7 +1202,8 @@ section [%2d] '%s': no relocations for m
  	}
      }
  
@@ -924,7 +948,7 @@
      ERROR (gettext (reltype == ELF_T_RELA ? "\
  section [%2d] '%s': section entry size does not match ElfXX_Rela\n" : "\
  section [%2d] '%s': section entry size does not match ElfXX_Rel\n"),
-@@ -1410,7 +1427,8 @@ check_rela (Ebl *ebl, GElf_Ehdr *ehdr, G
+@@ -1409,7 +1426,8 @@ check_rela (Ebl *ebl, GElf_Ehdr *ehdr, G
    Elf_Data *symdata = elf_getdata (symscn, NULL);
    enum load_state state = state_undecided;
  
@@ -934,7 +958,7 @@
      {
        GElf_Rela rela_mem;
        GElf_Rela *rela = gelf_getrela (data, cnt, &rela_mem);
-@@ -1460,7 +1478,8 @@ check_rel (Ebl *ebl, GElf_Ehdr *ehdr, GE
+@@ -1459,7 +1477,8 @@ check_rel (Ebl *ebl, GElf_Ehdr *ehdr, GE
    Elf_Data *symdata = elf_getdata (symscn, NULL);
    enum load_state state = state_undecided;
  
@@ -944,7 +968,7 @@
      {
        GElf_Rel rel_mem;
        GElf_Rel *rel = gelf_getrel (data, cnt, &rel_mem);
-@@ -1563,7 +1582,8 @@ section [%2d] '%s': referenced as string
+@@ -1562,7 +1581,8 @@ section [%2d] '%s': referenced as string
  	   shdr->sh_link, section_name (ebl, shdr->sh_link),
  	   idx, section_name (ebl, idx));
  
@@ -954,7 +978,7 @@
      ERROR (gettext ("\
  section [%2d] '%s': section entry size does not match ElfXX_Dyn\n"),
  	   idx, section_name (ebl, idx));
-@@ -1573,7 +1593,7 @@ section [%2d] '%s': section entry size d
+@@ -1572,7 +1592,7 @@ section [%2d] '%s': section entry size d
  	   idx, section_name (ebl, idx));
  
    bool non_null_warned = false;
@@ -963,7 +987,7 @@
      {
        GElf_Dyn dyn_mem;
        GElf_Dyn *dyn = gelf_getdyn (data, cnt, &dyn_mem);
-@@ -1854,6 +1874,8 @@ section [%2d] '%s': entry size does not 
+@@ -1853,6 +1873,8 @@ section [%2d] '%s': entry size does not 
  	   idx, section_name (ebl, idx));
  
    if (symshdr != NULL
@@ -972,7 +996,7 @@
        && (shdr->sh_size / shdr->sh_entsize
  	  < symshdr->sh_size / symshdr->sh_entsize))
      ERROR (gettext ("\
-@@ -1880,6 +1902,12 @@ section [%2d] '%s': extended section ind
+@@ -1879,6 +1901,12 @@ section [%2d] '%s': extended section ind
      }
  
    Elf_Data *data = elf_getdata (elf_getscn (ebl->elf, idx), NULL);
@@ -985,7 +1009,7 @@
  
    if (*((Elf32_Word *) data->d_buf) != 0)
      ERROR (gettext ("symbol 0 should have zero extended section index\n"));
-@@ -1922,7 +1950,7 @@ section [%2d] '%s': hash table section i
+@@ -1921,7 +1949,7 @@ section [%2d] '%s': hash table section i
  
    size_t maxidx = nchain;
  
@@ -994,7 +1018,7 @@
      {
        size_t symsize = symshdr->sh_size / symshdr->sh_entsize;
  
-@@ -1933,18 +1961,28 @@ section [%2d] '%s': hash table section i
+@@ -1932,18 +1960,28 @@ section [%2d] '%s': hash table section i
        maxidx = symsize;
      }
  
@@ -1025,7 +1049,7 @@
  }
  
  
-@@ -1974,18 +2012,28 @@ section [%2d] '%s': hash table section i
+@@ -1973,18 +2011,28 @@ section [%2d] '%s': hash table section i
        maxidx = symsize;
      }
  
@@ -1057,7 +1081,7 @@
  }
  
  
-@@ -2010,7 +2058,7 @@ section [%2d] '%s': bitmask size not pow
+@@ -2009,7 +2057,7 @@ section [%2d] '%s': bitmask size not pow
    if (shdr->sh_size < (4 + bitmask_words + nbuckets) * sizeof (Elf32_Word))
      {
        ERROR (gettext ("\
@@ -1066,7 +1090,7 @@
  	     idx, section_name (ebl, idx), (long int) shdr->sh_size,
  	     (long int) ((4 + bitmask_words + nbuckets) * sizeof (Elf32_Word)));
        return;
-@@ -2682,8 +2730,9 @@ section [%2d] '%s' refers in sh_link to 
+@@ -2681,8 +2729,9 @@ section [%2d] '%s' refers in sh_link to 
  
    /* The number of elements in the version symbol table must be the
       same as the number of symbols.  */
@@ -1078,9 +1102,9 @@
      ERROR (gettext ("\
  section [%2d] '%s' has different number of entries than symbol table [%2d] '%s'\n"),
  	   idx, section_name (ebl, idx),
---- elfutils-0.136/src/readelf.c.robustify
-+++ elfutils-0.136/src/readelf.c
-@@ -1111,6 +1111,8 @@ handle_scngrp (Ebl *ebl, Elf_Scn *scn, G
+--- elfutils/src/readelf.c
++++ elfutils/src/readelf.c
+@@ -1130,6 +1130,8 @@ handle_scngrp (Ebl *ebl, Elf_Scn *scn, G
    Elf32_Word *grpref = (Elf32_Word *) data->d_buf;
  
    GElf_Sym sym_mem;
@@ -1089,7 +1113,7 @@
    printf ((grpref[0] & GRP_COMDAT)
  	  ? ngettext ("\
  \nCOMDAT section group [%2zu] '%s' with signature '%s' contains %zu entry:\n",
-@@ -1123,8 +1125,8 @@ handle_scngrp (Ebl *ebl, Elf_Scn *scn, G
+@@ -1142,8 +1144,8 @@ handle_scngrp (Ebl *ebl, Elf_Scn *scn, G
  		      data->d_size / sizeof (Elf32_Word) - 1),
  	  elf_ndxscn (scn),
  	  elf_strptr (ebl->elf, shstrndx, shdr->sh_name),
@@ -1100,7 +1124,7 @@
  	  ?: gettext ("<INVALID SYMBOL>"),
  	  data->d_size / sizeof (Elf32_Word) - 1);
  
-@@ -1275,7 +1277,8 @@ static void
+@@ -1294,7 +1296,8 @@ static void
  handle_dynamic (Ebl *ebl, Elf_Scn *scn, GElf_Shdr *shdr)
  {
    int class = gelf_getclass (ebl->elf);
@@ -1110,7 +1134,7 @@
    Elf_Data *data;
    size_t cnt;
    size_t shstrndx;
-@@ -1290,6 +1293,11 @@ handle_dynamic (Ebl *ebl, Elf_Scn *scn, 
+@@ -1309,6 +1312,11 @@ handle_dynamic (Ebl *ebl, Elf_Scn *scn, 
      error (EXIT_FAILURE, 0,
  	   gettext ("cannot get section header string table index"));
  
@@ -1122,7 +1146,7 @@
    printf (ngettext ("\
  \nDynamic segment contains %lu entry:\n Addr: %#0*" PRIx64 "  Offset: %#08" PRIx64 "  Link to section: [%2u] '%s'\n",
  		    "\
-@@ -1299,9 +1307,7 @@ handle_dynamic (Ebl *ebl, Elf_Scn *scn, 
+@@ -1318,9 +1326,7 @@ handle_dynamic (Ebl *ebl, Elf_Scn *scn, 
  	  class == ELFCLASS32 ? 10 : 18, shdr->sh_addr,
  	  shdr->sh_offset,
  	  (int) shdr->sh_link,
@@ -1133,7 +1157,7 @@
    fputs_unlocked (gettext ("  Type              Value\n"), stdout);
  
    for (cnt = 0; cnt < shdr->sh_size / shdr->sh_entsize; ++cnt)
-@@ -1801,6 +1807,13 @@ handle_symtab (Ebl *ebl, Elf_Scn *scn, G
+@@ -1820,6 +1826,13 @@ handle_symtab (Ebl *ebl, Elf_Scn *scn, G
      error (EXIT_FAILURE, 0,
  	   gettext ("cannot get section header string table index"));
  
@@ -1147,7 +1171,7 @@
    /* Now we can compute the number of entries in the section.  */
    unsigned int nsyms = data->d_size / (class == ELFCLASS32
  				       ? sizeof (Elf32_Sym)
-@@ -1811,15 +1824,12 @@ handle_symtab (Ebl *ebl, Elf_Scn *scn, G
+@@ -1830,15 +1843,12 @@ handle_symtab (Ebl *ebl, Elf_Scn *scn, G
  		    nsyms),
  	  (unsigned int) elf_ndxscn (scn),
  	  elf_strptr (ebl->elf, shstrndx, shdr->sh_name), nsyms);
@@ -1164,7 +1188,7 @@
  
    fputs_unlocked (class == ELFCLASS32
  		  ? gettext ("\
-@@ -2055,7 +2065,13 @@ handle_verneed (Ebl *ebl, Elf_Scn *scn, 
+@@ -2074,7 +2084,13 @@ handle_verneed (Ebl *ebl, Elf_Scn *scn, 
      error (EXIT_FAILURE, 0,
  	   gettext ("cannot get section header string table index"));
  
@@ -1179,7 +1203,7 @@
    printf (ngettext ("\
  \nVersion needs section [%2u] '%s' contains %d entry:\n Addr: %#0*" PRIx64 "  Offset: %#08" PRIx64 "  Link to section: [%2u] '%s'\n",
  		    "\
-@@ -2066,9 +2082,7 @@ handle_verneed (Ebl *ebl, Elf_Scn *scn, 
+@@ -2085,9 +2101,7 @@ handle_verneed (Ebl *ebl, Elf_Scn *scn, 
  	  class == ELFCLASS32 ? 10 : 18, shdr->sh_addr,
  	  shdr->sh_offset,
  	  (unsigned int) shdr->sh_link,
@@ -1190,7 +1214,7 @@
  
    unsigned int offset = 0;
    for (int cnt = shdr->sh_info; --cnt >= 0; )
-@@ -2121,8 +2135,14 @@ handle_verdef (Ebl *ebl, Elf_Scn *scn, G
+@@ -2140,8 +2154,14 @@ handle_verdef (Ebl *ebl, Elf_Scn *scn, G
      error (EXIT_FAILURE, 0,
  	   gettext ("cannot get section header string table index"));
  
@@ -1206,7 +1230,7 @@
    printf (ngettext ("\
  \nVersion definition section [%2u] '%s' contains %d entry:\n Addr: %#0*" PRIx64 "  Offset: %#08" PRIx64 "  Link to section: [%2u] '%s'\n",
  		    "\
-@@ -2134,9 +2154,7 @@ handle_verdef (Ebl *ebl, Elf_Scn *scn, G
+@@ -2153,9 +2173,7 @@ handle_verdef (Ebl *ebl, Elf_Scn *scn, G
  	  class == ELFCLASS32 ? 10 : 18, shdr->sh_addr,
  	  shdr->sh_offset,
  	  (unsigned int) shdr->sh_link,
@@ -1217,7 +1241,7 @@
  
    unsigned int offset = 0;
    for (int cnt = shdr->sh_info; --cnt >= 0; )
-@@ -2398,8 +2416,14 @@ handle_versym (Ebl *ebl, Elf_Scn *scn, G
+@@ -2417,8 +2435,14 @@ handle_versym (Ebl *ebl, Elf_Scn *scn, G
        filename = NULL;
      }
  
@@ -1233,7 +1257,7 @@
    printf (ngettext ("\
  \nVersion symbols section [%2u] '%s' contains %d entry:\n Addr: %#0*" PRIx64 "  Offset: %#08" PRIx64 "  Link to section: [%2u] '%s'",
  		    "\
-@@ -2411,9 +2435,7 @@ handle_versym (Ebl *ebl, Elf_Scn *scn, G
+@@ -2430,9 +2454,7 @@ handle_versym (Ebl *ebl, Elf_Scn *scn, G
  	  class == ELFCLASS32 ? 10 : 18, shdr->sh_addr,
  	  shdr->sh_offset,
  	  (unsigned int) shdr->sh_link,
@@ -1244,7 +1268,7 @@
  
    /* Now we can finally look at the actual contents of this section.  */
    for (unsigned int cnt = 0; cnt < shdr->sh_size / shdr->sh_entsize; ++cnt)
-@@ -2465,7 +2487,17 @@ print_hash_info (Ebl *ebl, Elf_Scn *scn,
+@@ -2484,7 +2506,17 @@ print_hash_info (Ebl *ebl, Elf_Scn *scn,
    for (Elf32_Word cnt = 0; cnt < nbucket; ++cnt)
      ++counts[lengths[cnt]];
  
@@ -1263,7 +1287,7 @@
    printf (ngettext ("\
  \nHistogram for bucket list length in section [%2u] '%s' (total of %d bucket):\n Addr: %#0*" PRIx64 "  Offset: %#08" PRIx64 "  Link to section: [%2u] '%s'\n",
  		    "\
-@@ -2478,9 +2510,7 @@ print_hash_info (Ebl *ebl, Elf_Scn *scn,
+@@ -2497,9 +2529,7 @@ print_hash_info (Ebl *ebl, Elf_Scn *scn,
  	  shdr->sh_addr,
  	  shdr->sh_offset,
  	  (unsigned int) shdr->sh_link,
@@ -1274,7 +1298,7 @@
  
    if (extrastr != NULL)
      fputs (extrastr, stdout);
-@@ -4039,6 +4069,16 @@ print_debug_aranges_section (Dwfl_Module
+@@ -4058,6 +4088,16 @@ print_debug_aranges_section (Dwfl_Module
        return;
      }
  
@@ -1289,10 +1313,10 @@
 +    }
 +
    printf (ngettext ("\
- \nDWARF section '%s' at offset %#" PRIx64 " contains %zu entry:\n",
+ \nDWARF section [%2zu] '%s' at offset %#" PRIx64 " contains %zu entry:\n",
  		    "\
---- elfutils-0.136/src/strip.c.robustify
-+++ elfutils-0.136/src/strip.c
+--- elfutils/src/strip.c
++++ elfutils/src/strip.c
 @@ -544,6 +544,11 @@ handle_elf (int fd, Elf *elf, const char
        goto fail_close;
      }


Index: elfutils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/elfutils/F-9/elfutils.spec,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -r1.110 -r1.111
--- elfutils.spec	31 Dec 2008 22:12:43 -0000	1.110
+++ elfutils.spec	24 Jan 2009 01:22:10 -0000	1.111
@@ -1,4 +1,4 @@
-%define eu_version 0.138
+%define eu_version 0.139
 %define eu_release 1
 
 %if %{?_with_compat:1}%{!?_with_compat:0}
@@ -33,8 +33,8 @@
 Group: Development/Tools
 URL: https://fedorahosted.org/elfutils/
 Source: http://fedorahosted.org/releases/e/l/elfutils/%{name}-%{version}.tar.bz2
-Patch1: elfutils-portability.patch
-Patch2: elfutils-robustify.patch
+Patch1: elfutils-robustify.patch
+Patch2: elfutils-portability.patch
 Requires: elfutils-libelf-%{_arch} = %{version}-%{release}
 Requires: elfutils-libs-%{_arch} = %{version}-%{release}
 
@@ -50,6 +50,19 @@
 BuildRequires: gcc >= 3.2
 %endif
 
+%define use_zlib 0
+%if 0%{?fedora} >= 5
+%define use_zlib 1
+%endif
+%if 0%{?rhel} >= 5
+%define use_zlib 1
+%endif
+
+%if %{use_zlib}
+BuildRequires: zlib-devel >= 1.2.2.3
+BuildRequires: bzip2-devel
+%endif
+
 %define _gnu %{nil}
 %define _program_prefix eu-
 
@@ -142,19 +155,19 @@
 %prep
 %setup -q
 
-%if !0%{?scanf_has_m}
-sed -i.scanf-m -e 's/%m/%a/' tests/line2addr.c
-%endif
+%patch1 -p1 -b .robustify
 
 %if %{compat}
-%patch1 -p1 -b .portability
+%patch2 -p1 -b .portability
 sleep 1
 find . \( -name Makefile.in -o -name aclocal.m4 \) -print | xargs touch
 sleep 1
 find . \( -name configure -o -name config.h.in \) -print | xargs touch
+%else
+%if !0%{?scanf_has_m}
+sed -i.scanf-m -e 's/%m/%a/g' src/addr2line.c tests/line2addr.c
+%endif
 %endif
-
-%patch2 -p1 -b .robustify
 
 find . -name \*.sh ! -perm -0100 -print | xargs chmod +x
 
@@ -263,6 +276,17 @@
 %{_libdir}/libelf.a
 
 %changelog
+* Fri Jan 23 2009 Roland McGrath <roland at redhat.com> - 0.139-1
+- Update to 0.139
+  - libcpu: Add Intel SSE4 disassembler support
+  - readelf: Implement call frame information and exception handling dumping.
+    	     Add -e option.  Enable it implicitly for -a.
+  - elflint: Check PT_GNU_EH_FRAME program header entry.
+  - libdwfl: Support automatic gzip/bzip2 decompression of ELF files. (#472136)
+
+* Thu Jan  1 2009 Roland McGrath <roland at redhat.com> - 0.138-2
+- Fix libelf regression.
+
 * Wed Dec 31 2008 Roland McGrath <roland at redhat.com> - 0.138-1
 - Update to 0.138
   - Install <elfutils/version.h> header file for applications to use in


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/elfutils/F-9/sources,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- sources	31 Dec 2008 22:12:43 -0000	1.49
+++ sources	24 Jan 2009 01:22:10 -0000	1.50
@@ -1 +1 @@
-1a846d275cb6c8ab995fa0fa877113ff  elfutils-0.138.tar.bz2
+9cfc12ac0d6d14968e253639fa957946  elfutils-0.139.tar.bz2


Index: upstream-key.gpg
===================================================================
RCS file: /cvs/pkgs/rpms/elfutils/F-9/upstream-key.gpg,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- upstream-key.gpg	9 Apr 2008 21:51:31 -0000	1.1
+++ upstream-key.gpg	24 Jan 2009 01:22:10 -0000	1.2
@@ -1,123 +1,109 @@
+pub   1024D/7EBBD625 2003-01-10
+uid                  Roland McGrath <roland at frob.com>
+uid                  Roland McGrath <frob at debian.org>
+uid                  Roland McGrath <roland at gnu.org>
+uid                  Roland McGrath <roland at redhat.com>
+sub   2048g/17998A93 2003-01-10
+
 pub   1024D/79FF4474 2001-08-24
 uid                  Ulrich Drepper <drepper at akkadia.org>
 uid                  Ulrich Drepper <drepper at redhat.com>
-uid                  [jpeg image of size 2203]
 sub   2048g/07FA6550 2001-08-24
 
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.4.7 (GNU/Linux)
+Version: GnuPG v1.4.5 (GNU/Linux)
 
-mQGiBDuFth0RBACPcHEkyqJE26wTXuuuCxpqJjxlBnNFkJGkWUoeu89QjzWgzXy/
-EA8+ptNBgCTPKnLEqhkRUyxAT/Uz+t+xbKqUtL54IzYfxO4NQsN/VVM0uppNfIJb
-MWvAjvpp2HCkd/32i693rlH+G9dvG8K57by3PBRHBgH2L8Q7t/QvA2AWpwCgzokX
-DDUiitysGn4rWO0rBBoR6OED/3ehpcHtbGixNoubRZAxpw99VTKs/I76OkrQzqcm
-+w+zwZeihJXC88yAHA77/LBB3YKaX3G4CmDQUbeRJ9zPlETTLmRMcF61dQdq/3qV
-Biq1sm6ctZ4uEpm8HnysKMT+VY4Xmj9LLzF2BdING9frcX9rk8Vk25iCLBronS0M
-IU3WA/sEvlUFlfbyCBRBoq+Rlr9u05fnHc7CLMKI7EIS1T1dLPxH1ivuUhyYNGAM
-RhCivBbT2Z0t/R4ksu3VdnPGkCyAAdWNSafSGqCYUzQH0u5Z8HK6c2iXrIX3Ipk5
-DhQOQ6k1tyYzuQw3cCf7RYRJ9/iup8RlscVt2kmGnSucqpxJCbQjVWxyaWNoIERy
-ZXBwZXIgPGRyZXBwZXJAcmVkaGF0LmNvbT6IRgQQEQIABgUCPIkA7wAKCRBVlt0M
-6b9lPe8IAJ9UVZehWyB1VZk9tuJzqeW/fDmVZwCfXoV8zOtEW5hot5CTUt9CCPkh
-n7eIRgQQEQIABgUCRec5UAAKCRB0q9d6LPEagCPxAKCMM03ny+O3QyC5+vNGRozq
-i60V8gCgoD5UbvrmbTXcmE3ojuLXFC+NhFqIRgQQEQIABgUCRx2D0gAKCRDHJIY3
-TSCJ234UAJwJwIETvdovyN9uvTkfWXLMks4+tACeP/S4+pjdt++dzym5J9MPzrBM
-oC2IRgQQEQIABgUCRx2D8wAKCRB2nZNyaMUfOCojAJ9AbgZY4yAZijk45PDOsYR/
-DW633ACfYzEcj9oYoqXfUuHBl0YBJLmYXh+IRgQQEQIABgUCRx3yzAAKCRBSNIRd
-8rkg9aHnAKD7iptz5ni0z74qgFQMGG1mJP62FQCgnDjSDB8FLKkNhK9aIxc49Mqj
-deeIRgQQEQIABgUCRx3yzAAKCRBSNIRd8rkg9fAkAJwLDoqhNWPJ9/xH2pB2pHH4
-fl0S0QCfakhHUYZZOwsIbRWitVxj2x9YBC2IRgQSEQIABgUCPsFP0gAKCRDXV5dM
-QyvG1Dd1AKC64m6qOuOGk+ehl0/0EJ82MMxhJQCgpvGT9jNKuYor05F+1LT0XCZU
-JMOIRgQSEQIABgUCQbYILgAKCRBl/LSO4fnVa76lAJ0dOjyXnw3fuzpAOvOzz6OA
-/kW99wCfVLILUMVOv/fHfResby6KT7KuCUeIRgQTEQIABgUCPU77dAAKCRD90t6s
-0zPLoVMtAKDagEwY9rrBLSXbhh7pCmfZkGsnBQCfcpatDJmScDGd+vfXuq4DIhwD
-AFWIRgQTEQIABgUCRyHsjgAKCRBPq0nLRJVA8gL7AKC4EsZIH49moYSyvj9xwlk2
-5/iD6wCePe/sbg6DNT3IEBL8ByG48mQ9KC+IVwQTEQIAFwUCO4W2HQULBwoDBAMV
-AwIDFgIBAheAAAoJENoowjp5/0R0SqUAoL5HBbaRWR19vjldUeJvYCG2AR94AKDL
-nmVEaykaZWyyNg0OTuxLe1boa4hfBBMRAgAXBQI7hbYdBQsHCgMEAxUDAgMWAgEC
-F4AAEgkQ2ijCOnn/RHQHZUdQRwABAUqlAKC+RwW2kVkdfb45XVHib2AhtgEfeACg
-y55lRGspGmVssjYNDk7sS3tW6Gu0JFVscmljaCBEcmVwcGVyIDxkcmVwcGVyQGFr
-a2FkaWEub3JnPohGBBARAgAGBQJF5zlEAAoJEHSr13os8RqArYkAn3UiPHSHaP2R
-0PIka7LnJHZTXk86AJ497cneDJ1SJn9WFLGAGzZbf3YprYhGBBARAgAGBQJHHYPS
-AAoJEMckhjdNIInbNckAnRwBT8gHMfqec5PhzXVnvbZYa7xbAJ9Aqup1cr0Kuo02
-7sOKFf5+Ey8H5ohGBBARAgAGBQJHHYPzAAoJEHadk3JoxR849XkAnR/AG5dbQGjU
-eRdJs58uOJWJIRyIAJ42c0iYKntBFf/HcboFXZxLuayu04hGBBARAgAGBQJHHfLM
-AAoJEFI0hF3yuSD18CQAnAsOiqE1Y8n3/EfakHakcfh+XRLRAJ9qSEdRhlk7Cwht
-FaK1XGPbH1gELYhGBBMRAgAGBQJHIeyOAAoJEE+rSctElUDyA4YAoLZviKAzCZp+
-JtDl3QOlWQuS+aZWAJ46pBEAJX6IDUn6QqxQ1zauNGghfYheBBMRAgAeBQJBy0Hv
-AhsDBgsJCAcDAgMVAgMDFgIBAh4BAheAAAoJENoowjp5/0R0yOgAoMBsA6jm9k1D
-qVJ9Eq7jX3UQJWnDAJ9uNQEqh6ZkGhNSokvZKZPWRROkCLQlVWxyaWNoIERyZXBw
-ZXIgPGRyZXBwZXJAc3RhcmJhbmQubmV0PohGBBARAgAGBQJF5zlQAAoJEHSr13os
-8RqAQhYAnRbsQsOLU9w5Z/fnUO90c1qqrsM7AKCT1yloZg537aeKqHZw99aQ9Ic/
-1ohJBDARAgAJBQJF6S2gAh0gAAoJENoowjp5/0R093sAoM3Z6hVdd5x+R/3TLa/U
-R8EXBq4DAJ4pr7Okc6lccwA4EHPcwOIv0r1oKYheBBMRAgAeBQJBy0HUAhsDBgsJ
-CAcDAgMVAgMDFgIBAh4BAheAAAoJENoowjp5/0R0IfAAniTzqP93kEtaOSz9mKEu
-9BkoW+f/AKCr1D2+yE1QPmzLKorWmVJhT8djqNHH7sfsARAAAQEAAAAAAAAAAAAA
-AAD/2P/gABBKRklGAAEBAQBIAEgAAP/bAEMACAYGBwYFCAcHBwkJCAoMFA0MCwsM
-GRITDxQdGh8eHRocHCAkLicgIiwjHBwoNyksMDE0NDQfJzk9ODI8LjM0Mv/bAEMB
-CQkJDAsMGA0NGDIhHCEyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIy
-MjIyMjIyMjIyMjIyMjIyMv/AABEIAGAASwMBIgACEQEDEQH/xAAbAAACAgMBAAAA
-AAAAAAAAAAAFBgQHAgMIAf/EADYQAAIBAwIEBAQDBwUAAAAAAAECAwAEEQUhBhIx
-QRMiUWEUMnGBB0KRFSNyocHR8DNSYnOx/8QAGQEAAwEBAQAAAAAAAAAAAAAAAgME
-BQAB/8QAIhEAAwADAAICAgMAAAAAAAAAAAECAxEhMUEEEiIyQlFh/9oADAMBAAIR
-AxEAPwB1sNXgbW7ic5RFh3PbJPStel6hHcpdxSlg5fClh0GdsVvttFgnSa/mLo8j
-ELg4GB0qEl/LYRyyO6GKGTnYuuCV+tJl+2Mrb4h0ivYF0mUi5TmjUruQKpuz4003
-hpbxuWSe58ZvCjzkAZ9fShvGf4g3fEs5sNKi+Hs84JTZpPqew9qUIdOV2CPJl/8A
-juB/U11JU9hYppLoWXiXULm7mubRFikcl9k5s+1YnjLUEkzOEcZ3Kry/bFZDQXtb
-fxWmjww8pUEGo0miEjxCeYdcnvXjmf6DcsbRxQmtWKfCXHgsgAdX6rTHZz2th4MJ
-cznly1xkHBPaqZVpNPvPEjKuqtuOx9qcZOKrO8tow1t4QA+VDtmk5Ja/UCm0h51W
-SxitDJchOV/KS25JNIFzw7cm4cwxkxk5Ug9q81XiN7+zWFVIGcA4rWthxAEXlecL
-gYHMeleRv+Qh5tl9CMnTIELhysYBI9ap38RNWnW8k0iLbmbL4O5HYfrVoyXgk0eO
-aHlgiYc5KnZAKoTXr5rjXL+9dyf3hVG/z2qmnPEhuKXttkFpltUMMOOdtmb+lMnC
-tsHmaZoPERVJd+XIWlK2iaZ1AHmY7AVa/CeiG0iUTg8zj5PQe9DstjG676AFwj6h
-qaNEjpHz4XmB3+2aa7rhq5ntIzBEDJy4YE4pq07h+JX8eSMA58u3QUYWFUVl9DRK
-X7GOZXEUFrXDV1bLKzQMrpuRkHI9aWrcL8QEYlQTggjpXQWu2sU9u6FAw32Irn3V
-kOn6vNE2Qobp6A9KFr0JzY1osFYdHt9JSC4Cu+MrIvrS1qX4gXlrqEtvFE5SIhAc
-LvgAelDxNGLcvK7YAzgUr3N74tzI7E5LUGPEvLM1RqmXle6xcaTdzW1q/wAVa5PO
-jDZSeuKqfVZzJeycox5zt7k5Jq29Rs4l09DG/n6N6nNVxxBpC2OsRj94UkUS5cAE
-5ocVJrZZjbvbGDgbSEZm1CdCVjGEz0HvVp6NZnCzMMPLuBj5RS9pMEaWNtaRx+QA
-NKR69cU9W11bWkPPM6hiN/YelMjr2zQb+kaQQC4TBAAxsKjSh41LYJAG5HpWUep2
-l4AIJA30ry6vIraI+IQABnJ9Kc2vImU16AOo/vQSDkegqkPxAsxFrKz8g5JE5WHq
-etXFe8QWMkjLEjy4/Mq7Z+tVnxvGNQsppIwRJDIr+b64pTf5HZuyIUzMNOjZmOU8
-u35s0GaMBjsx9wKYJi728NvIgIEeEUbEnqKESRZkYtdRoc/Lk7UcshudM6a1PSYI
-4GPxcWew9aXtd4an1g2LAQ8sCKpwdyDjf26VM1p9KlukXTLMwMy45ebO9MejpC+m
-xwOwF1CMDPUjt9aFY/Y34+VOnv2SdM0uC0tQkSAvjdqj32ivdRlTeXUTZ6xuQD7Y
-FFNPbnTBOB0qbMsaJzkjHejUlf29MD2NktuM4IIwBkkn65NCON4Xu7WzRZHjRpkE
-hQ78ud6ZJJ4yQACds0H4htpJ9L51UkoeYD1xQtc4Mnz0gHhvTjI1xBaLzspHJ+Ud
-e33NLfEWix22jzxk/Mhzk5A7jFOWh6rBfQvErhnhIVx3GQCP5GgPHMsUOnSyEnAU
-k+4xQ13oFTzRSeqxNZ3EKnlMnIpJ7AUCnt1Sd1EgwDgZNMGqzfF28rxKBydAR+XG
-DS1KpaZyVOST2o48GfkfTq1eG5BdPJFp0iIBsxx/KpL6Nf3KLHBYtGke4ldwC+eo
-x1p2aeFOsi/TNYfE8+0cbt74wKb64S6097FayhaMyQOcSxtg71suEY/6hPKP0zWF
-/I1rrMkxUAOQGAOcbVLZ1mjKkBlbsaW0auOuJkIqZep27EGgmvrq89hNZ2NxBEGG
-PFkJyB7YHWptzo1urlocxknJCnFBL/TXKkCdyO3Mw/tXPwaGKIrroG8PWScNsYvG
-aeSbzSsfzEe33qJ+IKCHh/ULp2JIfwo17dP7kfpRLRoYNNuXkkUyu+2WJPT6nalr
-jvU1v9MvbJJAwhiaRm9ZOu36Ur/CX5Fa2kVnZyseZ5CP9oHrUYWqT5kcPlj2GK22
-8gkKwrERIF2YdM47itn7Evn8y3MOD7t/anKGZn2TR01BdyR5liYySN0U1OueJmt7
-BZGKx4HmZsAfrSHqPFtnoYEUMvjzIMKqHJH8R7f+0halxBqOtXA+KmPgr5lhX5RU
-/wAebpbfgGpnyizeFdam1671uG58winXlPsy5x/nrR2O4e1bwZT0+U+opH4G1CGH
-V35pAq3KANnbLL8pz9CQftVlXNjHdRDnXPeqqksxWvqeJPFNCC3ehV0keWdtlH86
-zfQr1QW0+7X+CYHA+4pZ1qy4xKNFDBZf9hnwP0NLrZRN6F/i/X1tpY7e3IVgd8dv
-Wk6djPYzGRvLIfPvufapGo8P30F40uqXsDTk5ZY35yP6VD2eRYkB8ND37+5osWPb
-2yPNl7owS2is9PSNVxJJ5mPrXoXlABk/Str5eVV5thuBitbMVbHT7VUSH//ZiEYE
-EBECAAYFAkXnOVAACgkQdKvXeizxGoAyYgCfa4IPVggty0vvUAS+wZjN3a7tSFAA
-nieXbdlhMNu3yl/4loY38AAH+oQfiEYEEBECAAYFAkcdg9IACgkQxySGN00gidtU
-BACgkvyd3aRw79gxlXs0yGBFrVsx5JcAoJKAuGMb/bwCwbk7R4rV+i3rx8DFiEYE
-EBECAAYFAkcdg/MACgkQdp2TcmjFHzgNpwCfXy4kh6hF8Sv9/mwEzxJjl8z0BOwA
-oJr8ERbzjkVkP26mIg6QkRx1bCntiEYEExECAAYFAkch7I4ACgkQT6tJy0SVQPJn
-KgCfR+keQFf+eXIYDP5cCPRez3gLco0AoIe4GdgY8uYgyKMJVubvc3oFyDJaiF4E
-ExECAB4FAkAHZw4CGwMGCwkIBwMCAxUCAwMWAgECHgECF4AACgkQ2ijCOnn/RHTf
-AwCfQKSN9iZ3IxojQzcXbAbJwPsGQ1cAn2GGS0L8LGCrhK2v78jOMY0c4BRYuQIN
-BDuFtk8QCADO4UA+rWxhS2kkKXBfv6l3PUp0iBvEMqhIeHatJHHbgcthj/GD2mzp
-9kXbX9IGJqUpoHwEWch6HxL0tdS1a31pR4KSWedDA9tHQEZFxkBLv6cdn1qCIx3g
-JF7hFYWZLoqEh5SwNrvT7xeEib8L46B3tqCQHDvKRNv+NYczK9w/2JjRC2Yhq19V
-MMlSbtGblO0zWYMKaX+BYhAnl7Ov2C/Y1QbeSk1jA/4b2jgEvJM4dqaLH/Rgcj8e
-JlJiLCrjRqjTNE53/Jdjr9reaK033oCJ0kvkjm1uqesXLouZG9abI7FaQkP9sXfW
-us7k99VSBxWlTFu1bjg+1WKWEu6H6qNPAAMFB/41MfCNTDWP49mz/Llec/DTHRl1
-gYSXQjs2q0yALEjhkdP2NotwtcBFvdRUS5zUu4nW0ADWyzVzU0srcuD65nN4oxF9
-9FgRSDQSZ6vxAZavW5I7EMdwDO5Flfc9g1dwQYTISbjjcMOdev/hvzNgro76zLUt
-35JXHGnqPC2TQvJPuiSAPQTV0NTNf6rGmxW6NvN0fht2qhwqi4w0xP4Ed6hs1mlH
-hPLPn6nBb6vDX5dl5vIFSQg9c6hY9mlRMMZ9n6ib3F+DQk5wpkhnRf3V0tCnnH31
-oKbPBZ5bL0sU9MB/2liTLzBfO14Si0T9OSYN4DVxo8L0gQr0EGutL1N65usQiE4E
-GBECAAYFAjuFtk8AEgkQ2ijCOnn/RHQHZUdQRwABAWd/AJoDOBQKrsJbR9KKE3QJ
+mQGiBD4ejvcRBADNwfo3ALnr8qMQQARgBzHM5HsGaBGnGWPIFO18IhVhjqeOTBjd
+w0N9R6FAj/i3ObeTPwJABNGj92m2qnd49puBAtirJRd8Ul6shvLR8oNMZcCJEmGW
+6Ud7D+uS/WxIoQHXWKl2VtvJBLIEdZ8n/Z6SxcHuMEfTD+2pc7cqOxZPGwCglqP6
+Bt6BF5aUMbN0b/jj93ZHHSMD/iQxEiH7MmvVPHDZYN9CGepzlwcD+BKhYbq6wxsq
+pxxrtK5OrakwNd6cBb8nOVK2DjyOVRHBdWH6MVx+DCDSp0FWDEftQpCR0N0iItP4
+h+8lTP/7NdZj5+tfi99TUNMMaOcTdgWQ+s8/WUEZoJErDy/yXNHbK6xhD5mBm4pF
+bgQnBACmWQfAFDhFm1uKsNS8vPqcJ6Be+bbh+5uTOm30zXiAHEdi56v5tvn4mJSy
+yXakNGBHKkmdVQDTb4mLrnhpUnEHFegioOoBrwR6ZUsnsT7zaLz7r+p56HPKRkkn
+8284/NlZigncvPPcOK/9m6N9OLX8uerLy5TjuOPwjITxHmNgBbQgUm9sYW5kIE1j
+R3JhdGggPHJvbGFuZEBmcm9iLmNvbT6IXAQTEQIAHAQLBwMCAxUCAwMWAgECHgEC
+F4ACGQEFAj4ejvgACgkQ2vc1Cn671iU4OwCcC3y0ZCz5gxT/rzeRjogiMdOMMMcA
+nRPShRs5wsaJUeGOxAqRwu++hbrPiD8DBRA+HpK6Z/R4eOAIGpcRApUPAKDtBRDr
+ijwEwnyN8JF5jKzFqnlaZwCbBK6J7CLs8HonLtkjBFBy5JKblgKJAJUDBRA+HpOD
+pkJ+bR8IKbEBAWlBA/91cNYotVnrh4hjc06UHxySasqtxK2gd2h5A96Ez5FY0l0s
+KixJ7Rtvt490qhHqo6LiHFjKtmeiWNIO5H1MMGxXuJfBD2uDc6mfurwyt8j0v29n
+CeBFqrckR5NTbXWiepIbCe00Ux5+WbbJTdWpLFOxo8YiwqzfF/XbPdghPyY1YLQg
+Um9sYW5kIE1jR3JhdGggPGZyb2JAZGViaWFuLm9yZz6IWwQTEQIAHAUCPh6PXQIb
+AwQLBwMCAxUCAwMWAgECHgECF4AACgkQ2vc1Cn671iV7RACdHM6BWdolx88UOBhk
+L0XjMAAzF+IAmMyGjKKdDyNXmoMU1/SX/KFuPVOIPwMFED4eksNn9Hh44AgalxEC
+4G0AoIxbFjdAJImO7kOV5rFoW/+B9dxeAKDOIWg/gcAAOYFKggTBl8YO7uEYKokA
+lQMFED4ek8KmQn5tHwgpsQEBZD4D/3NBTjA3j5rj2mN7HDbSlIpttllC6B+jmzi0
+ynOgEzkhvae3ZY3mm334+/l3L9C3ZNJMQNvRdWVq2DjQq94xc9waI/Z4mNDeVQQB
+6fHC/0cmqj2n/ymS4NWxBx75W+wQKoBOXW2/bdd3cMOOwIhnC4H00FblFYR0Avth
+sxw9hDUztB9Sb2xhbmQgTWNHcmF0aCA8cm9sYW5kQGdudS5vcmc+iFwEExECABwF
+Aj4ej3UCGwMECwcDAgMVAgMDFgIBAh4BAheAAAoJENr3NQp+u9Yl6jUAnA7DcQVj
+kWoPngzvzWHB7EIYInaXAJwLZP3Nk6jPifu1J4vJ2F768hQyoYg/AwUQPh6SzGf0
+eHjgCBqXEQLPqwCgm6h1Z6xwyduXw6ZYpbRYdyBqwGcAoKIrMkypgDXci//FI5Kc
+iYBRF3ajiQCVAwUQPh6T0KZCfm0fCCmxAQFrYQP9Hh1v7DrIkT370pMo7qICLhdf
+B7r7ofSkcqSGPcAq+gwNa2aNoDx11U9hk2Vo5HWJm2psSzikUN83i7uzMZi8dW5D
+e0uI3TeHgUOFPCxXLG5KSMwGdjxKwe/Ks95gNnlDzYTe6mjJdP89D4NhSc/cP78B
+tRpc3pK+KJYd/O/xUgy0IlJvbGFuZCBNY0dyYXRoIDxyb2xhbmRAcmVkaGF0LmNv
+bT6IXgQTEQIAHgUCQjO3pQIbAwYLCQgHAwIDFQIDAxYCAQIeAQIXgAAKCRDa9zUK
+frvWJTY3AJ9UFpGYfE0dCtF6IL0CcoPB8//7tQCfesL/4DPu53OWLoVhxVKhEe+2
+QoS5Ag0EPh6PKRAIAIU6PeE1k+YYKYtZhFzb2EhVid/eUe8QsEYLJrJUYTAyzssb
+1wnWx90iFHRxyLOAyTc7YXKWz3lkbCW+TqYCSc9rbTCQy1dE8dK4ojdizZempape
+P+7kuk+zGWquabqQ71/294m2Sffasdz97yr3Eo6uSSN38ct7fxEBHhFgEGx/jDVV
+1/o1vrUcrrYyI39mOTp4yjcLwbS7JqFsNKxTGEUULpL3GYRJC+JtcaH9766E8Si+
+caxKqNLND4PHIPQ7UQCmDu2Rn84mM7Oy1whR7Pkjw6S9kQxZP+Xfykq6NAHWfFyp
+9g/5DTGVYCLxCM1Ska6KF8lnAYB1cr84OMvZ3J8AAwUH/j1rknj9KRrsgfE9CyFV
+WNUWpH79PTBQG+uoU4qyO9OPuJqcz9bBgyj9zo1DM4mxJ/euZH1X/35PTe8O1YQR
+VxzhnS5CzHoTq33qROi9/6m8HAkhp6c0s6uBplWargmomJz8gtVi+av5KbUjSxVs
+yxKWSWkX46EEjItYxmQTv9TA8X6yMM7SkQJUEIz3UXtYSLb+pVXPJfScr945kXK8
+180MGQLBhq9wEcR5ypUN1HqyO1J+TJQdsqtXAVe57RMIPY/XoFnS73B9aQmTwYRk
+5fDo9wTnHEDW4dxN+zphONOjLbGaJt5o4ytbqrQ54JHwNt4xXavWgG39OPlPqENU
+x7GIRgQYEQIABgUCPh6PKQAKCRDa9zUKfrvWJYxEAJ9FFDtc48oBtVQISX80/a2d
+smT+qwCeLgHE6iheS8L2cbygDxDnsLx32wSZAaIEO4W2HREEAI9wcSTKokTbrBNe
+664LGmomPGUGc0WQkaRZSh67z1CPNaDNfL8QDz6m00GAJM8qcsSqGRFTLEBP9TP6
+37FsqpS0vngjNh/E7g1Cw39VUzS6mk18glsxa8CO+mnYcKR3/faLr3euUf4b128b
+wrntvLc8FEcGAfYvxDu39C8DYBanAKDOiRcMNSKK3KwafitY7SsEGhHo4QP/d6Gl
+we1saLE2i5tFkDGnD31VMqz8jvo6StDOpyb7D7PBl6KElcLzzIAcDvv8sEHdgppf
+cbgKYNBRt5En3M+URNMuZExwXrV1B2r/epUGKrWybpy1ni4SmbwefKwoxP5Vjhea
+P0svMXYF0g0b1+txf2uTxWTbmIIsGuidLQwhTdYD+wS+VQWV9vIIFEGir5GWv27T
+l+cdzsIswojsQhLVPV0s/EfWK+5SHJg0YAxGEKK8FtPZnS39HiSy7dV2c8aQLIAB
+1Y1Jp9IaoJhTNAfS7lnwcrpzaJeshfcimTkOFA5DqTW3JjO5DDdwJ/tFhEn3+K6n
+xGWxxW3aSYadK5yqnEkJtCNVbHJpY2ggRHJlcHBlciA8ZHJlcHBlckByZWRoYXQu
+Y29tPohGBBARAgAGBQI8iQDvAAoJEFWW3Qzpv2U97wgAn1RVl6FbIHVVmT224nOp
+5b98OZVnAJ9ehXzM60RbmGi3kJNS30II+SGft4hXBBMRAgAXBQI7hbYdBQsHCgME
+AxUDAgMWAgECF4AACgkQ2ijCOnn/RHRKpQCgvkcFtpFZHX2+OV1R4m9gIbYBH3gA
+oMueZURrKRplbLI2DQ5O7Et7VuhriEYEExECAAYFAj1O+3QACgkQ/dLerNMzy6FT
+LQCg2oBMGPa6wS0l24Ye6Qpn2ZBrJwUAn3KWrQyZknAxnfr317quAyIcAwBViEYE
+EhECAAYFAj7BT9IACgkQ11eXTEMrxtQ3dQCguuJuqjrjhpPnoZdP9BCfNjDMYSUA
+oKbxk/YzSrmKK9ORftS09FwmVCTDiEYEEBECAAYFAkXnOVAACgkQdKvXeizxGoAj
+8QCgjDNN58vjt0MgufrzRkaM6outFfIAoKA+VG765m013JhN6I7i1xQvjYRaiEYE
+EBECAAYFAkcd8swACgkQUjSEXfK5IPWh5wCg+4qbc+Z4tM++KoBUDBhtZiT+thUA
+oJw40gwfBSypDYSvWiMXOPTKo3XniEYEEBECAAYFAkhMxecACgkQ3L4Y/6A1U7zA
+4QCfTR51NKVwuqenN7wx5Yh5DdvnQ1wAoKllIwL7hPpOBxhcJ89JRwRvcXpsiEYE
+EhECAAYFAkG2CC4ACgkQZfy0juH51Wu+pQCdHTo8l58N37s6QDrzs8+jgP5FvfcA
+n1SyC1DFTr/3x30XrG8uik+yrglHtCRVbHJpY2ggRHJlcHBlciA8ZHJlcHBlckBh
+a2thZGlhLm9yZz6IRgQQEQIABgUCRec5RAAKCRB0q9d6LPEagK2JAJ91Ijx0h2j9
+kdDyJGuy5yR2U15POgCePe3J3gydUiZ/VhSxgBs2W392Ka2IRgQQEQIABgUCRx3y
+zAAKCRBSNIRd8rkg9fAkAJwLDoqhNWPJ9/xH2pB2pHH4fl0S0QCfakhHUYZZOwsI
+bRWitVxj2x9YBC2IXgQTEQIAHgUCQctB7wIbAwYLCQgHAwIDFQIDAxYCAQIeAQIX
+gAAKCRDaKMI6ef9EdMjoAKDAbAOo5vZNQ6lSfRKu4191ECVpwwCfbjUBKoemZBoT
+UqJL2SmT1kUTpAi0JVVscmljaCBEcmVwcGVyIDxkcmVwcGVyQHN0YXJiYW5kLm5l
+dD6IRgQQEQIABgUCRec5UAAKCRB0q9d6LPEagEIWAJ0W7ELDi1PcOWf351DvdHNa
+qq7DOwCgk9cpaGYOd+2niqh2cPfWkPSHP9aIXgQTEQIAHgUCQctB1AIbAwYLCQgH
+AwIDFQIDAxYCAQIeAQIXgAAKCRDaKMI6ef9EdCHwAJ4k86j/d5BLWjks/ZihLvQZ
+KFvn/wCgq9Q9vshNUD5syyqK1plSYU/HY6iISQQwEQIACQUCRektoAIdIAAKCRDa
+KMI6ef9EdPd7AKDN2eoVXXecfkf90y2v1EfBFwauAwCeKa+zpHOpXHMAOBBz3MDi
+L9K9aCm5Ag0EO4W2TxAIAM7hQD6tbGFLaSQpcF+/qXc9SnSIG8QyqEh4dq0kcduB
+y2GP8YPabOn2Rdtf0gYmpSmgfARZyHofEvS11LVrfWlHgpJZ50MD20dARkXGQEu/
+px2fWoIjHeAkXuEVhZkuioSHlLA2u9PvF4SJvwvjoHe2oJAcO8pE2/41hzMr3D/Y
+mNELZiGrX1UwyVJu0ZuU7TNZgwppf4FiECeXs6/YL9jVBt5KTWMD/hvaOAS8kzh2
+posf9GByPx4mUmIsKuNGqNM0Tnf8l2Ov2t5orTfegInSS+SObW6p6xcui5kb1psj
+sVpCQ/2xd9a6zuT31VIHFaVMW7VuOD7VYpYS7ofqo08AAwUH/jUx8I1MNY/j2bP8
+uV5z8NMdGXWBhJdCOzarTIAsSOGR0/Y2i3C1wEW91FRLnNS7idbQANbLNXNTSyty
+4Prmc3ijEX30WBFINBJnq/EBlq9bkjsQx3AM7kWV9z2DV3BBhMhJuONww516/+G/
+M2CujvrMtS3fklccaeo8LZNC8k+6JIA9BNXQ1M1/qsabFbo283R+G3aqHCqLjDTE
+/gR3qGzWaUeE8s+fqcFvq8Nfl2Xm8gVJCD1zqFj2aVEwxn2fqJvcX4NCTnCmSGdF
+/dXS0KecffWgps8FnlsvSxT0wH/aWJMvMF87XhKLRP05Jg3gNXGjwvSBCvQQa60v
+U3rm6xCIRgQYEQIABgUCO4W2TwAKCRDaKMI6ef9EdGd/AJoDOBQKrsJbR9KKE3QJ
 gTKAnym+PwCfbnwIeEZfbBWgonv4/I3aNNm3FdQ=
-=rhf6
+=2IML
 -----END PGP PUBLIC KEY BLOCK-----


--- elfutils-0.138.tar.bz2.sig DELETED ---



From mclasen at fedoraproject.org  Sat Jan 24 02:11:54 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Sat, 24 Jan 2009 02:11:54 +0000 (UTC)
Subject: rpms/hicolor-icon-theme/devel hicolor-icon-theme.spec,1.22,1.23
Message-ID: <20090124021154.0BB437010A@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/hicolor-icon-theme/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10837

Modified Files:
	hicolor-icon-theme.spec 
Log Message:
Cosmetic fixes



Index: hicolor-icon-theme.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hicolor-icon-theme/devel/hicolor-icon-theme.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- hicolor-icon-theme.spec	18 Nov 2007 06:26:25 -0000	1.22
+++ hicolor-icon-theme.spec	24 Jan 2009 02:11:23 -0000	1.23
@@ -1,10 +1,10 @@
 Summary: Basic requirement for icon themes
 Name: hicolor-icon-theme
 Version: 0.10
-Release: 4
+Release: 5
 License: GPL+
 Group: User Interface/Desktops
-URL: http://freedesktop.org/Software/icon-theme
+URL: http://icon-theme.freedesktop.org/wiki/HicolorTheme 
 Source: http://icon-theme.freedesktop.org/releases/%{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
@@ -34,25 +34,28 @@
 if [ -x /usr/bin/gtk-update-icon-cache ]; then
   gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor
 fi
-exit 0
 
 %postun
 touch --no-create %{_datadir}/icons/hicolor
 if [ -x /usr/bin/gtk-update-icon-cache ]; then
   gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor
 fi
-exit 0
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc README COPYING
+%doc README COPYING ChangeLog
 %{_datadir}/icons/hicolor
 %ghost %{_datadir}/icons/hicolor/icon-theme.cache
 
 %changelog
+* Fri Jan 23 2009 Matthias Clasen <mclasen at redhat.com> - 0.10-5
+- Update URL
+- Clean up scriptlets
+- Include ChangeLog
+
 * Sun Nov 18 2007 Matthias Clasen <mclasen at redhat.com> - 0.10-4
 - Correct the license
 - Include COPYING



From jcollie at fedoraproject.org  Sat Jan 24 02:24:22 2009
From: jcollie at fedoraproject.org (Jeffrey C. Ollie)
Date: Sat, 24 Jan 2009 02:24:22 +0000 (UTC)
Subject: rpms/asterisk/F-9 .cvsignore, 1.18, 1.19 asterisk.spec, 1.34,
	1.35 sources, 1.18, 1.19
Message-ID: <20090124022422.C37C97010A@cvs1.fedora.phx.redhat.com>

Author: jcollie

Update of /cvs/pkgs/rpms/asterisk/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12853

Modified Files:
	.cvsignore asterisk.spec sources 
Log Message:
* Fri Jan 23 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6.0.5-1
- Update to 1.6.0.5 to fix regressions caused by fixes for
  AST-2009-001/CVE-2009-0041 (Asterisk 1.6.0.4 was never released).



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/F-9/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- .cvsignore	8 Jan 2009 22:30:35 -0000	1.18
+++ .cvsignore	24 Jan 2009 02:23:52 -0000	1.19
@@ -1 +1 @@
-asterisk-1.6.0.3-stripped.tar.gz
+asterisk-1.6.0.5-stripped.tar.gz


Index: asterisk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/F-9/asterisk.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- asterisk.spec	8 Jan 2009 22:30:36 -0000	1.34
+++ asterisk.spec	24 Jan 2009 02:23:52 -0000	1.35
@@ -2,7 +2,7 @@
 
 Summary: The Open Source PBX
 Name: asterisk
-Version: 1.6.0.3
+Version: 1.6.0.5
 Release: 1%{?dist}
 License: GPLv2
 Group: Applications/Internet
@@ -19,13 +19,13 @@
 
 # MD5 Sums
 # ========
-# 0797cfc8834b06e5a0169b2fda6f7bb9  asterisk-1.6.0.3.tar.gz
-# eefe39842fac3f5bd3c7b3a6c378bb5c  asterisk-1.6.0.3-stripped.tar.gz
+# 11210cf7c59cde03d928743e71fcb556  asterisk-1.6.0.5.tar.gz
+# 29bdc7428266b75aac77d66acd8c88a0  asterisk-1.6.0.5-stripped.tar.gz
 #
 # SHA1 Sums
 # =========
-# bdede6d5113a5b0006b186a72e81c886d48ae4db  asterisk-1.6.0.3.tar.gz
-# e14b25b16d49a8b7400353e0588cc8e8d1768c5c  asterisk-1.6.0.3-stripped.tar.gz
+# f2a2cd9be274dc4a7e6001f877197863b4ba8e15  asterisk-1.6.0.5.tar.gz
+# 25b92e9675d72c784018bddf0ddb458cab9e4185  asterisk-1.6.0.5-stripped.tar.gz
 
 Source0: asterisk-%{version}-stripped.tar.gz
 Source1: asterisk-logrotate
@@ -1052,6 +1052,10 @@
 %{_libdir}/asterisk/modules/app_voicemail_plain.so
 
 %changelog
+* Fri Jan 23 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6.0.5-1
+- Update to 1.6.0.5 to fix regressions caused by fixes for
+  AST-2009-001/CVE-2009-0041 (Asterisk 1.6.0.4 was never released).
+
 * Thu Jan  8 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6.0.3-1
 - Update to 1.6.0.3 to fix AST-2009-001/CVE-2009-0041
 - http://downloads.digium.com/pub/security/AST-2009-001.html


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/F-9/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources	8 Jan 2009 22:30:36 -0000	1.18
+++ sources	24 Jan 2009 02:23:52 -0000	1.19
@@ -1 +1 @@
-eefe39842fac3f5bd3c7b3a6c378bb5c  asterisk-1.6.0.3-stripped.tar.gz
+29bdc7428266b75aac77d66acd8c88a0  asterisk-1.6.0.5-stripped.tar.gz



From mclasen at fedoraproject.org  Sat Jan 24 02:41:50 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Sat, 24 Jan 2009 02:41:50 +0000 (UTC)
Subject: rpms/tsclient/devel tsclient.spec,1.40,1.41
Message-ID: <20090124024150.1654A7010A@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/tsclient/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14632

Modified Files:
	tsclient.spec 
Log Message:
Fix duplicate menu item



Index: tsclient.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tsclient/devel/tsclient.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- tsclient.spec	20 Dec 2008 14:16:32 -0000	1.40
+++ tsclient.spec	24 Jan 2009 02:41:19 -0000	1.41
@@ -8,7 +8,7 @@
 Summary: Client for VNC and Windows Terminal Server
 Name: tsclient
 Version: 2.0.1
-Release: 10%{?dist}
+Release: 11%{?dist}
 URL: http://sourceforge.net/projects/tsclient
 Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
 
@@ -27,7 +27,6 @@
 BuildRequires: gnome-panel-devel >= %{gnome_panel}
 BuildRequires: desktop-file-utils >= %{desktop_file_utils_version}
 BuildRequires: gettext
-BuildRequires: perl(XML::Parser)
 BuildRequires: autoconf, automake, libtool, intltool
 
 # reported upstream
@@ -47,7 +46,6 @@
 
 %description
 tsclient is a frontend that makes it easy to use rdesktop and vncviewer.
-You will need to install rdesktop or vnc in addition to tsclient.
 
 %package devel
 Summary: Header files needed to write tsclient plugins
@@ -84,8 +82,7 @@
 
 desktop-file-install --vendor tsclient --delete-original      \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications               \
-  --remove-category X-Red-Hat-Base                            \
-  --add-category Utility 	                              \
+  --remove-category Application                               \
   $RPM_BUILD_ROOT%{_datadir}/applications/*
 
 rm -rf $RPM_BUILD_ROOT/usr/lib/tsclient/plugins/*.{a,la}
@@ -138,6 +135,9 @@
 
 
 %changelog
+* Fri Jan 23 2009 Matthias Clasen <mclasen at redhat.com> - 2.0.1-11
+- Don't add Utility to the desktop file categories
+
 * Sat Dec 20 2008 Caol??n McNamara <caolanm at redhat.com> - 2.0.1-10
 - Rebuild
 



From bashton at fedoraproject.org  Sat Jan 24 02:48:01 2009
From: bashton at fedoraproject.org (Brennan Ashton)
Date: Sat, 24 Jan 2009 02:48:01 +0000 (UTC)
Subject: rpms/jeuclid/devel jeuclid-cli.sh,NONE,1.1 import.log,1.1,1.2
Message-ID: <20090124024801.579F97010A@cvs1.fedora.phx.redhat.com>

Author: bashton

Update of /cvs/pkgs/rpms/jeuclid/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15996/devel

Modified Files:
	import.log 
Added Files:
	jeuclid-cli.sh 
Log Message:
Initial import to rawhide


--- NEW FILE jeuclid-cli.sh ---
#!/bin/bash
. /usr/share/java-utils/java-functions

MAIN_CLASS=net.sourceforge.jeuclid.app.Mml2xxx

set_classpath "commons-logging commons-cli commons-lang xmlgraphics-commons batik-all commons-io jeuclid-core jeuclid-cli"

run "$@"


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/jeuclid/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	21 Dec 2008 08:46:51 -0000	1.1
+++ import.log	24 Jan 2009 02:47:31 -0000	1.2
@@ -1 +1,2 @@
 jeuclid-3_1_3-9_fc10:HEAD:jeuclid-3.1.3-9.fc10.src.rpm:1229849066
+jeuclid-3_1_3-9_fc10:HEAD:jeuclid-3.1.3-9.fc10.src.rpm:1232765158



From bashton at fedoraproject.org  Sat Jan 24 02:48:59 2009
From: bashton at fedoraproject.org (Brennan Ashton)
Date: Sat, 24 Jan 2009 02:48:59 +0000 (UTC)
Subject: rpms/jeuclid/devel import.log,1.2,1.3
Message-ID: <20090124024859.A2CC07010A@cvs1.fedora.phx.redhat.com>

Author: bashton

Update of /cvs/pkgs/rpms/jeuclid/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16246/devel

Modified Files:
	import.log 
Log Message:
* Fri Jan 23 2009 Brennan Ashton <bashton at, brennanashton.com> 3.1.3-9
- Re-imported SRPM, cvs failed to bring in jecuclid-cli.sh



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/jeuclid/devel/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	24 Jan 2009 02:47:31 -0000	1.2
+++ import.log	24 Jan 2009 02:48:29 -0000	1.3
@@ -1,2 +1,3 @@
 jeuclid-3_1_3-9_fc10:HEAD:jeuclid-3.1.3-9.fc10.src.rpm:1229849066
 jeuclid-3_1_3-9_fc10:HEAD:jeuclid-3.1.3-9.fc10.src.rpm:1232765158
+jeuclid-3_1_3-9_fc10:HEAD:jeuclid-3.1.3-9.fc10.src.rpm:1232765283



From oget at fedoraproject.org  Sat Jan 24 02:54:41 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Sat, 24 Jan 2009 02:54:41 +0000 (UTC)
Subject: rpms/ctan-musixtex-fonts/devel ctan-musixtex-fonts.spec, NONE,
	1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090124025441.B3D1A7010A@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/ctan-musixtex-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17010/devel

Modified Files:
	.cvsignore sources 
Added Files:
	ctan-musixtex-fonts.spec import.log 
Log Message:
* Wed Jan 21 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 1.13-1
- Initial Fedora build



--- NEW FILE ctan-musixtex-fonts.spec ---
%define fontname ctan-musixtex
%define archivename musixps-unix

Name:           %{fontname}-fonts
Version:        1.13
Release:        1%{?dist}
Summary:        Type 1 versions of MusiXTeX fonts
Group:          User Interface/X
License:        LPPL
URL:            http://tug.ctan.org/cgi-bin/ctanPackageInformation.py?id=musixtex-t1fonts
Source0:        http://tug.ctan.org/tex-archive/fonts/musixtex/ps-type1/%{archivename}.tar.gz
BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildArch:      noarch
BuildRequires:  fontpackages-devel
Requires:       fontpackages-filesystem

%description
This package provides Type 1 fonts (PFB format) for  MusiXTeX (musixtex). The
fonts are based on the original MetaFont sources, such as musix20.mf, which are 
distributed with MusiXTeX. The fonts provided here may be used to produce 
printer-independent PostScript files or PDF files.

%prep
%setup -q -n %{archivename}

%build

%install
rm -fr %{buildroot}

install -m 0755 -d %{buildroot}%{_fontdir}
install -m 0644 -p pfb/*.pfb %{buildroot}%{_fontdir}

%clean
rm -fr %{buildroot}

%_font_pkg *.pfb
%doc CHANGES README
%dir %{_fontdir}

%changelog
* Wed Jan 21 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 1.13-1
- Initial Fedora build


--- NEW FILE import.log ---
ctan-musixtex-fonts-1_13-1_fc10:HEAD:ctan-musixtex-fonts-1.13-1.fc10.src.rpm:1232765621


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ctan-musixtex-fonts/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	23 Jan 2009 23:15:22 -0000	1.1
+++ .cvsignore	24 Jan 2009 02:54:11 -0000	1.2
@@ -0,0 +1 @@
+musixps-unix.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ctan-musixtex-fonts/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	23 Jan 2009 23:15:22 -0000	1.1
+++ sources	24 Jan 2009 02:54:11 -0000	1.2
@@ -0,0 +1 @@
+1753fadcf6a0e196b583869106b5c074  musixps-unix.tar.gz



From oget at fedoraproject.org  Sat Jan 24 02:56:26 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Sat, 24 Jan 2009 02:56:26 +0000 (UTC)
Subject: rpms/ctan-musixtex-fonts/F-9 ctan-musixtex-fonts.spec, NONE,
	1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090124025626.2CA3E7010A@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/ctan-musixtex-fonts/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17396/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	ctan-musixtex-fonts.spec import.log 
Log Message:
* Wed Jan 21 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 1.13-1
- Initial Fedora build



--- NEW FILE ctan-musixtex-fonts.spec ---
%define fontname ctan-musixtex
%define archivename musixps-unix

Name:           %{fontname}-fonts
Version:        1.13
Release:        1%{?dist}
Summary:        Type 1 versions of MusiXTeX fonts
Group:          User Interface/X
License:        LPPL
URL:            http://tug.ctan.org/cgi-bin/ctanPackageInformation.py?id=musixtex-t1fonts
Source0:        http://tug.ctan.org/tex-archive/fonts/musixtex/ps-type1/%{archivename}.tar.gz
BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildArch:      noarch
BuildRequires:  fontpackages-devel
Requires:       fontpackages-filesystem

%description
This package provides Type 1 fonts (PFB format) for  MusiXTeX (musixtex). The
fonts are based on the original MetaFont sources, such as musix20.mf, which are 
distributed with MusiXTeX. The fonts provided here may be used to produce 
printer-independent PostScript files or PDF files.

%prep
%setup -q -n %{archivename}

%build

%install
rm -fr %{buildroot}

install -m 0755 -d %{buildroot}%{_fontdir}
install -m 0644 -p pfb/*.pfb %{buildroot}%{_fontdir}

%clean
rm -fr %{buildroot}

%_font_pkg *.pfb
%doc CHANGES README
%dir %{_fontdir}

%changelog
* Wed Jan 21 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 1.13-1
- Initial Fedora build


--- NEW FILE import.log ---
ctan-musixtex-fonts-1_13-1_fc10:F-9:ctan-musixtex-fonts-1.13-1.fc10.src.rpm:1232765716


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ctan-musixtex-fonts/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	23 Jan 2009 23:15:22 -0000	1.1
+++ .cvsignore	24 Jan 2009 02:55:55 -0000	1.2
@@ -0,0 +1 @@
+musixps-unix.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ctan-musixtex-fonts/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	23 Jan 2009 23:15:22 -0000	1.1
+++ sources	24 Jan 2009 02:55:55 -0000	1.2
@@ -0,0 +1 @@
+1753fadcf6a0e196b583869106b5c074  musixps-unix.tar.gz



From oget at fedoraproject.org  Sat Jan 24 02:58:07 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Sat, 24 Jan 2009 02:58:07 +0000 (UTC)
Subject: rpms/ctan-musixtex-fonts/F-10 ctan-musixtex-fonts.spec, NONE,
	1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090124025807.E08F97010A@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/ctan-musixtex-fonts/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17752/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	ctan-musixtex-fonts.spec import.log 
Log Message:
Jan 21 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 1.13-1
- Initial Fedora build



--- NEW FILE ctan-musixtex-fonts.spec ---
%define fontname ctan-musixtex
%define archivename musixps-unix

Name:           %{fontname}-fonts
Version:        1.13
Release:        1%{?dist}
Summary:        Type 1 versions of MusiXTeX fonts
Group:          User Interface/X
License:        LPPL
URL:            http://tug.ctan.org/cgi-bin/ctanPackageInformation.py?id=musixtex-t1fonts
Source0:        http://tug.ctan.org/tex-archive/fonts/musixtex/ps-type1/%{archivename}.tar.gz
BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildArch:      noarch
BuildRequires:  fontpackages-devel
Requires:       fontpackages-filesystem

%description
This package provides Type 1 fonts (PFB format) for  MusiXTeX (musixtex). The
fonts are based on the original MetaFont sources, such as musix20.mf, which are 
distributed with MusiXTeX. The fonts provided here may be used to produce 
printer-independent PostScript files or PDF files.

%prep
%setup -q -n %{archivename}

%build

%install
rm -fr %{buildroot}

install -m 0755 -d %{buildroot}%{_fontdir}
install -m 0644 -p pfb/*.pfb %{buildroot}%{_fontdir}

%clean
rm -fr %{buildroot}

%_font_pkg *.pfb
%doc CHANGES README
%dir %{_fontdir}

%changelog
* Wed Jan 21 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 1.13-1
- Initial Fedora build


--- NEW FILE import.log ---
ctan-musixtex-fonts-1_13-1_fc10:F-10:ctan-musixtex-fonts-1.13-1.fc10.src.rpm:1232765748


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ctan-musixtex-fonts/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	23 Jan 2009 23:15:22 -0000	1.1
+++ .cvsignore	24 Jan 2009 02:57:37 -0000	1.2
@@ -0,0 +1 @@
+musixps-unix.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ctan-musixtex-fonts/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	23 Jan 2009 23:15:22 -0000	1.1
+++ sources	24 Jan 2009 02:57:37 -0000	1.2
@@ -0,0 +1 @@
+1753fadcf6a0e196b583869106b5c074  musixps-unix.tar.gz



From bashton at fedoraproject.org  Sat Jan 24 03:00:46 2009
From: bashton at fedoraproject.org (Brennan Ashton)
Date: Sat, 24 Jan 2009 03:00:46 +0000 (UTC)
Subject: rpms/jeuclid/devel import.log,1.3,1.4 jeuclid.spec,1.1,1.2
Message-ID: <20090124030046.21E2A7010A@cvs1.fedora.phx.redhat.com>

Author: bashton

Update of /cvs/pkgs/rpms/jeuclid/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18396/devel

Modified Files:
	import.log jeuclid.spec 
Log Message:
* Fri Jan 23 2009 Brennan Ashton <bashton at, brennanashton.com> 3.1.3-9
- Re-imported SRPM, cvs failed to bring in jecuclid-cli.sh



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/jeuclid/devel/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- import.log	24 Jan 2009 02:48:29 -0000	1.3
+++ import.log	24 Jan 2009 03:00:15 -0000	1.4
@@ -1,3 +1,4 @@
 jeuclid-3_1_3-9_fc10:HEAD:jeuclid-3.1.3-9.fc10.src.rpm:1229849066
 jeuclid-3_1_3-9_fc10:HEAD:jeuclid-3.1.3-9.fc10.src.rpm:1232765158
 jeuclid-3_1_3-9_fc10:HEAD:jeuclid-3.1.3-9.fc10.src.rpm:1232765283
+jeuclid-3_1_3-10_fc10:HEAD:jeuclid-3.1.3-10.fc10.src.rpm:1232765985


Index: jeuclid.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jeuclid/devel/jeuclid.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- jeuclid.spec	21 Dec 2008 08:46:51 -0000	1.1
+++ jeuclid.spec	24 Jan 2009 03:00:15 -0000	1.2
@@ -1,6 +1,6 @@
 Name:		jeuclid
 Version:	3.1.3
-Release:	9%{?dist}
+Release:	10%{?dist}
 Summary:	MathML rendering solution
 Group:		Development/Libraries
 License:	ASL 2.0 and SPL
@@ -163,6 +163,9 @@
 %{_bindir}/jeuclid-cli
 
 %changelog
+* Fri Jan 23 2009 Brennan Ashton <bashton at, brennanashton.com> 3.1.3-9
+- Re-imported SRPM, cvs failed to bring in jecuclid-cli.sh
+
 * Tue Dec 9 2008 Brennan Ashton <bashton at, brennanashton.com> 3.1.3-9
 - Added missing hicolor-icon-theme build require
 - Fixed timestamp issue



From jcollie at fedoraproject.org  Sat Jan 24 03:17:02 2009
From: jcollie at fedoraproject.org (Jeffrey C. Ollie)
Date: Sat, 24 Jan 2009 03:17:02 +0000 (UTC)
Subject: rpms/asterisk/F-10 0016-Fix-a-reversed-logic-ast_strlen_zero.patch, 
	NONE, 1.1 asterisk.spec, 1.43, 1.44
Message-ID: <20090124031702.C3ED97010A@cvs1.fedora.phx.redhat.com>

Author: jcollie

Update of /cvs/pkgs/rpms/asterisk/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20713

Modified Files:
	asterisk.spec 
Added Files:
	0016-Fix-a-reversed-logic-ast_strlen_zero.patch 
Log Message:
* Fri Jan 23 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6.0.5-2
- Add a patch to fix a problem with the manager interface.


0016-Fix-a-reversed-logic-ast_strlen_zero.patch:

--- NEW FILE 0016-Fix-a-reversed-logic-ast_strlen_zero.patch ---
>From f439a25ddc062941e2e14d7c3cf60b55b324f98b Mon Sep 17 00:00:00 2001
From: mmichelson <mmichelson at f38db490-d61c-443f-a65b-d21fe96a405b>
Date: Fri, 5 Dec 2008 22:59:43 +0000
Subject: [PATCH] Fix a reversed-logic ast_strlen_zero.

This problem was pointed out on the asterisk-users list
by Jim Dickenson

git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0 at 161490 f38db490-d61c-443f-a65b-d21fe96a405b
---
 main/manager.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/main/manager.c b/main/manager.c
index 0076f64..5eb8339 100644
--- a/main/manager.c
+++ b/main/manager.c
@@ -2163,7 +2163,7 @@ static int action_originate(struct mansession *s, const struct message *m)
 	int format = AST_FORMAT_SLINEAR;
 
 	pthread_t th;
-	if (!ast_strlen_zero(name)) {
+	if (ast_strlen_zero(name)) {
 		astman_send_error(s, m, "Channel not specified");
 		return 0;
 	}
-- 
1.6.0.6



Index: asterisk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/F-10/asterisk.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- asterisk.spec	23 Jan 2009 22:30:35 -0000	1.43
+++ asterisk.spec	24 Jan 2009 03:16:32 -0000	1.44
@@ -3,7 +3,7 @@
 Summary: The Open Source PBX
 Name: asterisk
 Version: 1.6.0.5
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2
 Group: Applications/Internet
 URL: http://www.asterisk.org/
@@ -47,6 +47,7 @@
 Patch13: 0013-Update-autoconf.patch
 Patch14: 0014-Fix-up-some-paths.patch
 Patch15: 0015-Add-LDAP-schema-that-is-compatible-with-Fedora-Direc.patch
+Patch16: 0016-Fix-a-reversed-logic-ast_strlen_zero.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
 
@@ -435,6 +436,7 @@
 %patch13 -p1
 %patch14 -p1
 %patch15 -p1
+%patch16 -p1
 
 cp %{SOURCE2} menuselect.makedeps
 cp %{SOURCE3} menuselect.makeopts
@@ -1052,6 +1054,9 @@
 %{_libdir}/asterisk/modules/app_voicemail_plain.so
 
 %changelog
+* Fri Jan 23 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6.0.5-2
+- Add a patch to fix a problem with the manager interface.
+
 * Fri Jan 23 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6.0.5-1
 - Update to 1.6.0.5 to fix regressions caused by fixes for
   AST-2009-001/CVE-2009-0041 (Asterisk 1.6.0.4 was never released).



From deji at fedoraproject.org  Sat Jan 24 03:34:28 2009
From: deji at fedoraproject.org (Deji Akingunola)
Date: Sat, 24 Jan 2009 03:34:28 +0000 (UTC)
Subject: rpms/gnome-scan/F-10 .cvsignore, 1.5, 1.6 gnome-scan.spec, 1.8,
	1.9 sources, 1.6, 1.7 gnome-scan-cursor_fix.patch, 1.1, NONE
Message-ID: <20090124033428.8AFE67010A@cvs1.fedora.phx.redhat.com>

Author: deji

Update of /cvs/pkgs/rpms/gnome-scan/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22601

Modified Files:
	.cvsignore gnome-scan.spec sources 
Removed Files:
	gnome-scan-cursor_fix.patch 
Log Message:
* Fri Jan 23 2009 Deji Akingunola <dakingun at gmail.com> - 0.6.1-1
- Update to version 0.6.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-scan/F-10/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	11 Mar 2008 01:51:02 -0000	1.5
+++ .cvsignore	24 Jan 2009 03:33:57 -0000	1.6
@@ -1 +1 @@
-gnome-scan-0.6.tar.bz2
+gnome-scan-0.6.1.tar.bz2


Index: gnome-scan.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-scan/F-10/gnome-scan.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- gnome-scan.spec	14 Mar 2008 01:54:51 -0000	1.8
+++ gnome-scan.spec	24 Jan 2009 03:33:57 -0000	1.9
@@ -1,18 +1,17 @@
 Summary:	Gnome solution for scanning in the desktop on top of libsane
 Name:		gnome-scan
-Version:	0.6
-Release:	2%{?dist}
+Version:	0.6.1
+Release:	1%{?dist}
 Group:		Applications/System
 License:	LGPLv2+
 URL:		http://home.gna.org/gnomescan/
 Source0:	http://ftp.gnome.org/pub/GNOME/sources/%{name}/0.6/%{name}-%{version}.tar.bz2
-Patch0:		gnome-scan-cursor_fix.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	gtk2-devel libgnomeui-devel sane-backends-devel
 BuildRequires:	gegl-devel gimp-devel
-BuildRequires:	gettext perl(XML::Parser) pkgconfig
+BuildRequires:	gettext perl(XML::Parser) pkgconfig intltool
 BuildRequires:	desktop-file-utils gtk-doc gnome-doc-utils
-Requires:	gimp
+Requires:	gimp, gegl >= 0.0.22
 Provides:	flegita = %{version}-%{release}
 Provides:	gnomescan = %{version}-%{release}
 Obsoletes:	gnomescan < 0.5
@@ -43,7 +42,6 @@
 
 %prep
 %setup -q
-%patch0 -p0 -b .fix
 
 %build
 %configure --disable-static
@@ -110,6 +108,9 @@
 %doc %{_datadir}/gtk-doc/html/gnome-scan*/
 
 %changelog
+* Fri Jan 23 2009 Deji Akingunola <dakingun at gmail.com> - 0.6.1-1
+- Update to version 0.6.1
+
 * Thu Mar 13 2008 Deji Akingunola <dakingun at gmail.com> - 0.6-2
 - Fix wrong mouse cursor (Bug #437417)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-scan/F-10/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	11 Mar 2008 01:51:02 -0000	1.6
+++ sources	24 Jan 2009 03:33:57 -0000	1.7
@@ -1 +1 @@
-4bdf2d0ce27893aa802743d24b853afd  gnome-scan-0.6.tar.bz2
+aac087c9c36b92cbd87063e6d7017fe4  gnome-scan-0.6.1.tar.bz2


--- gnome-scan-cursor_fix.patch DELETED ---



From mclasen at fedoraproject.org  Sat Jan 24 03:36:03 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Sat, 24 Jan 2009 03:36:03 +0000 (UTC)
Subject: rpms/tsclient/devel tsclient.spec, 1.41,
	1.42 vnc-remote-screen-size.patch, 1.1, 1.2
Message-ID: <20090124033603.C4FB97010A@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/tsclient/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22769

Modified Files:
	tsclient.spec vnc-remote-screen-size.patch 
Log Message:
2.0.2



Index: tsclient.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tsclient/devel/tsclient.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- tsclient.spec	24 Jan 2009 02:41:19 -0000	1.41
+++ tsclient.spec	24 Jan 2009 03:35:33 -0000	1.42
@@ -7,8 +7,8 @@
 
 Summary: Client for VNC and Windows Terminal Server
 Name: tsclient
-Version: 2.0.1
-Release: 11%{?dist}
+Version: 2.0.2
+Release: 1%{?dist}
 URL: http://sourceforge.net/projects/tsclient
 Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
 
@@ -32,8 +32,6 @@
 # reported upstream
 Patch0: icon-names.patch
 # reported upstream
-Patch1: launch-args.patch
-# reported upstream
 Patch2: edit-dialog-crash.patch
 # reported upstream
 Patch3: vnc-password-optional.patch
@@ -59,7 +57,6 @@
 %prep
 %setup -q
 %patch0 -p1 -b .icon-names
-%patch1 -p1 -b .launch-args
 %patch2 -p1 -b .edit-dialog-crash
 %patch3 -p1 -b .vnc-password
 %patch4 -p1 -b .vnc-remotesize
@@ -135,6 +132,9 @@
 
 
 %changelog
+* Fri Jan 23 2009 Matthias Clasen <mclasen at redhat.com> - 2.0.2-1
+- Update to 2.0.2
+
 * Fri Jan 23 2009 Matthias Clasen <mclasen at redhat.com> - 2.0.1-11
 - Don't add Utility to the desktop file categories
 

vnc-remote-screen-size.patch:

Index: vnc-remote-screen-size.patch
===================================================================
RCS file: /cvs/pkgs/rpms/tsclient/devel/vnc-remote-screen-size.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- vnc-remote-screen-size.patch	22 Oct 2008 03:03:16 -0000	1.1
+++ vnc-remote-screen-size.patch	24 Jan 2009 03:35:33 -0000	1.2
@@ -1,5 +1,1041 @@
---- tsclient-2.0.1/src/plugins/default/tsc-vnc-connection.c.vnc-remotesize	2008-05-09 16:22:54.000000000 -0400
-+++ tsclient-2.0.1/src/plugins/default/tsc-vnc-connection.c	2008-10-20 14:47:17.000000000 -0400
+diff -up tsclient-2.0.2/data/tsclient.glade.vnc-remotesize tsclient-2.0.2/data/tsclient.glade
+--- tsclient-2.0.2/data/tsclient.glade.vnc-remotesize	2008-11-26 17:43:41.000000000 -0500
++++ tsclient-2.0.2/data/tsclient.glade	2009-01-23 22:25:31.000000000 -0500
+@@ -1,6 +1,7 @@
+ <?xml version="1.0"?>
+ <glade-interface>
+-  <requires-version lib="gtk+" version="2.12"/>
++  <!-- interface-requires gtk+ 2.16 -->
++  <!-- interface-naming-policy toplevel-contextual -->
+   <widget class="GtkWindow" id="main_window">
+     <property name="visible">True</property>
+     <property name="title" translatable="yes">Terminal Server Client</property>
+@@ -10,7 +11,7 @@
+         <child>
+           <widget class="GtkToolbar" id="main_toolbar">
+             <property name="visible">True</property>
+-            <property name="toolbar_style">GTK_TOOLBAR_BOTH_HORIZ</property>
++            <property name="toolbar_style">both-horiz</property>
+             <child>
+               <widget class="GtkToggleToolButton" id="add_button">
+                 <property name="visible">True</property>
+@@ -20,6 +21,7 @@
+                 <property name="stock_id">gtk-add</property>
+               </widget>
+               <packing>
++                <property name="expand">False</property>
+                 <property name="homogeneous">True</property>
+               </packing>
+             </child>
+@@ -32,6 +34,7 @@
+                 <property name="stock_id">gtk-remove</property>
+               </widget>
+               <packing>
++                <property name="expand">False</property>
+                 <property name="homogeneous">True</property>
+               </packing>
+             </child>
+@@ -44,6 +47,7 @@
+                 <property name="stock_id">gtk-properties</property>
+               </widget>
+               <packing>
++                <property name="expand">False</property>
+                 <property name="homogeneous">True</property>
+               </packing>
+             </child>
+@@ -54,6 +58,7 @@
+                 <property name="stock_id">gtk-quit</property>
+               </widget>
+               <packing>
++                <property name="expand">False</property>
+                 <property name="homogeneous">True</property>
+               </packing>
+             </child>
+@@ -61,21 +66,22 @@
+           <packing>
+             <property name="expand">False</property>
+             <property name="fill">False</property>
++            <property name="position">0</property>
+           </packing>
+         </child>
+         <child>
+           <widget class="GtkScrolledWindow" id="scrolledwindow1">
+             <property name="visible">True</property>
+             <property name="can_focus">True</property>
+-            <property name="hscrollbar_policy">GTK_POLICY_NEVER</property>
+-            <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
++            <property name="hscrollbar_policy">never</property>
++            <property name="vscrollbar_policy">automatic</property>
+             <child>
+               <widget class="GtkIconView" id="icon_view">
+                 <property name="width_request">450</property>
+                 <property name="height_request">200</property>
+                 <property name="visible">True</property>
+                 <property name="can_focus">True</property>
+-                <property name="selection_mode">GTK_SELECTION_MULTIPLE</property>
++                <property name="selection_mode">multiple</property>
+               </widget>
+             </child>
+           </widget>
+@@ -89,7 +95,7 @@
+   <widget class="GtkDialog" id="edit_dialog">
+     <property name="visible">True</property>
+     <property name="title" translatable="yes">Edit Connection</property>
+-    <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
++    <property name="type_hint">dialog</property>
+     <property name="has_separator">False</property>
+     <child internal-child="vbox">
+       <widget class="GtkVBox" id="dialog-vbox1">
+@@ -103,7 +109,7 @@
+               <widget class="GtkFrame" id="general_frame">
+                 <property name="visible">True</property>
+                 <property name="label_xalign">0</property>
+-                <property name="shadow_type">GTK_SHADOW_NONE</property>
++                <property name="shadow_type">none</property>
+                 <child>
+                   <widget class="GtkAlignment" id="alignment1">
+                     <property name="visible">True</property>
+@@ -116,18 +122,12 @@
+                         <property name="column_spacing">6</property>
+                         <property name="row_spacing">6</property>
+                         <child>
+-                          <placeholder/>
+-                        </child>
+-                        <child>
+-                          <placeholder/>
+-                        </child>
+-                        <child>
+                           <widget class="GtkCheckButton" id="autostart_checkbox">
++                            <property name="label" translatable="yes">Autostart at login time</property>
+                             <property name="visible">True</property>
+                             <property name="can_focus">True</property>
+-                            <property name="label" translatable="yes">Autostart at login time</property>
++                            <property name="receives_default">False</property>
+                             <property name="use_underline">True</property>
+-                            <property name="response_id">0</property>
+                             <property name="draw_indicator">True</property>
+                           </widget>
+                           <packing>
+@@ -190,11 +190,11 @@ Prompt For Reconnect After Error</proper
+                         </child>
+                         <child>
+                           <widget class="GtkCheckButton" id="shortcut_checkbox">
++                            <property name="label" translatable="yes">Add to Favorites</property>
+                             <property name="visible">True</property>
+                             <property name="can_focus">True</property>
+-                            <property name="label" translatable="yes">Add to Favorites</property>
++                            <property name="receives_default">False</property>
+                             <property name="use_underline">True</property>
+-                            <property name="response_id">0</property>
+                             <property name="draw_indicator">True</property>
+                           </widget>
+                           <packing>
+@@ -202,6 +202,12 @@ Prompt For Reconnect After Error</proper
+                             <property name="bottom_attach">4</property>
+                           </packing>
+                         </child>
++                        <child>
++                          <placeholder/>
++                        </child>
++                        <child>
++                          <placeholder/>
++                        </child>
+                       </widget>
+                     </child>
+                   </widget>
+@@ -217,6 +223,9 @@ Prompt For Reconnect After Error</proper
+                   </packing>
+                 </child>
+               </widget>
++              <packing>
++                <property name="position">0</property>
++              </packing>
+             </child>
+           </widget>
+           <packing>
+@@ -226,34 +235,44 @@ Prompt For Reconnect After Error</proper
+         <child internal-child="action_area">
+           <widget class="GtkHButtonBox" id="dialog-action_area1">
+             <property name="visible">True</property>
+-            <property name="layout_style">GTK_BUTTONBOX_END</property>
++            <property name="layout_style">end</property>
+             <child>
+               <widget class="GtkButton" id="cancelbutton1">
++                <property name="label">gtk-cancel</property>
++                <property name="response_id">-6</property>
+                 <property name="visible">True</property>
+                 <property name="can_focus">True</property>
+                 <property name="can_default">True</property>
+-                <property name="label">gtk-cancel</property>
++                <property name="receives_default">False</property>
+                 <property name="use_stock">True</property>
+-                <property name="response_id">-6</property>
+               </widget>
++              <packing>
++                <property name="expand">False</property>
++                <property name="fill">False</property>
++                <property name="position">0</property>
++              </packing>
+             </child>
+             <child>
+               <widget class="GtkButton" id="okbutton1">
++                <property name="label">gtk-ok</property>
++                <property name="response_id">-5</property>
+                 <property name="visible">True</property>
+                 <property name="can_focus">True</property>
+                 <property name="can_default">True</property>
+-                <property name="label">gtk-ok</property>
++                <property name="receives_default">False</property>
+                 <property name="use_stock">True</property>
+-                <property name="response_id">-5</property>
+               </widget>
+               <packing>
++                <property name="expand">False</property>
++                <property name="fill">False</property>
+                 <property name="position">1</property>
+               </packing>
+             </child>
+           </widget>
+           <packing>
+             <property name="expand">False</property>
+-            <property name="pack_type">GTK_PACK_END</property>
++            <property name="pack_type">end</property>
++            <property name="position">0</property>
+           </packing>
+         </child>
+       </widget>
+@@ -262,7 +281,7 @@ Prompt For Reconnect After Error</proper
+   <widget class="GtkDialog" id="generic_edit_dialog">
+     <property name="visible">True</property>
+     <property name="title" translatable="yes">dialog1</property>
+-    <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
++    <property name="type_hint">dialog</property>
+     <child internal-child="vbox">
+       <widget class="GtkVBox" id="dialog-vbox2">
+         <property name="visible">True</property>
+@@ -271,7 +290,7 @@ Prompt For Reconnect After Error</proper
+             <property name="visible">True</property>
+             <property name="border_width">6</property>
+             <property name="label_xalign">0</property>
+-            <property name="shadow_type">GTK_SHADOW_NONE</property>
++            <property name="shadow_type">none</property>
+             <child>
+               <widget class="GtkAlignment" id="alignment2">
+                 <property name="visible">True</property>
+@@ -284,15 +303,12 @@ Prompt For Reconnect After Error</proper
+                     <property name="column_spacing">6</property>
+                     <property name="row_spacing">6</property>
+                     <child>
+-                      <placeholder/>
+-                    </child>
+-                    <child>
+                       <widget class="GtkCheckButton" id="terminal_checkbox">
++                        <property name="label" translatable="yes">Run in terminal window</property>
+                         <property name="visible">True</property>
+                         <property name="can_focus">True</property>
+-                        <property name="label" translatable="yes">Run in terminal window</property>
++                        <property name="receives_default">False</property>
+                         <property name="use_underline">True</property>
+-                        <property name="response_id">0</property>
+                         <property name="draw_indicator">True</property>
+                       </widget>
+                       <packing>
+@@ -323,6 +339,9 @@ Prompt For Reconnect After Error</proper
+                         <property name="y_options"></property>
+                       </packing>
+                     </child>
++                    <child>
++                      <placeholder/>
++                    </child>
+                   </widget>
+                 </child>
+               </widget>
+@@ -345,34 +364,44 @@ Prompt For Reconnect After Error</proper
+         <child internal-child="action_area">
+           <widget class="GtkHButtonBox" id="dialog-action_area2">
+             <property name="visible">True</property>
+-            <property name="layout_style">GTK_BUTTONBOX_END</property>
++            <property name="layout_style">end</property>
+             <child>
+               <widget class="GtkButton" id="cancelbutton2">
++                <property name="label">gtk-cancel</property>
++                <property name="response_id">-6</property>
+                 <property name="visible">True</property>
+                 <property name="can_focus">True</property>
+                 <property name="can_default">True</property>
+-                <property name="label">gtk-cancel</property>
++                <property name="receives_default">False</property>
+                 <property name="use_stock">True</property>
+-                <property name="response_id">-6</property>
+               </widget>
++              <packing>
++                <property name="expand">False</property>
++                <property name="fill">False</property>
++                <property name="position">0</property>
++              </packing>
+             </child>
+             <child>
+               <widget class="GtkButton" id="okbutton2">
++                <property name="label">gtk-ok</property>
++                <property name="response_id">-5</property>
+                 <property name="visible">True</property>
+                 <property name="can_focus">True</property>
+                 <property name="can_default">True</property>
+-                <property name="label">gtk-ok</property>
++                <property name="receives_default">False</property>
+                 <property name="use_stock">True</property>
+-                <property name="response_id">-5</property>
+               </widget>
+               <packing>
++                <property name="expand">False</property>
++                <property name="fill">False</property>
+                 <property name="position">1</property>
+               </packing>
+             </child>
+           </widget>
+           <packing>
+             <property name="expand">False</property>
+-            <property name="pack_type">GTK_PACK_END</property>
++            <property name="pack_type">end</property>
++            <property name="position">0</property>
+           </packing>
+         </child>
+       </widget>
+@@ -381,7 +410,7 @@ Prompt For Reconnect After Error</proper
+   <widget class="GtkDialog" id="rdp_edit_dialog">
+     <property name="visible">True</property>
+     <property name="title" translatable="yes">dialog1</property>
+-    <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
++    <property name="type_hint">dialog</property>
+     <child internal-child="vbox">
+       <widget class="GtkVBox" id="vbox1">
+         <property name="visible">True</property>
+@@ -394,7 +423,7 @@ Prompt For Reconnect After Error</proper
+               <widget class="GtkFrame" id="frame4">
+                 <property name="visible">True</property>
+                 <property name="label_xalign">0</property>
+-                <property name="shadow_type">GTK_SHADOW_NONE</property>
++                <property name="shadow_type">none</property>
+                 <child>
+                   <widget class="GtkAlignment" id="alignment3">
+                     <property name="visible">True</property>
+@@ -421,6 +450,7 @@ Prompt For Reconnect After Error</proper
+                               <packing>
+                                 <property name="expand">False</property>
+                                 <property name="fill">False</property>
++                                <property name="position">0</property>
+                               </packing>
+                             </child>
+                             <child>
+@@ -467,11 +497,11 @@ Prompt For Reconnect After Error</proper
+                         </child>
+                         <child>
+                           <widget class="GtkRadioButton" id="rdp_custom_window_radio">
++                            <property name="label" translatable="yes">Custom Window Size:</property>
+                             <property name="visible">True</property>
+                             <property name="can_focus">True</property>
+-                            <property name="label" translatable="yes">Custom Window Size:</property>
++                            <property name="receives_default">False</property>
+                             <property name="use_underline">True</property>
+-                            <property name="response_id">0</property>
+                             <property name="draw_indicator">True</property>
+                             <property name="group">rdp_fullscreen_radio</property>
+                           </widget>
+@@ -483,11 +513,11 @@ Prompt For Reconnect After Error</proper
+                         </child>
+                         <child>
+                           <widget class="GtkRadioButton" id="rdp_fullscreen_radio">
++                            <property name="label" translatable="yes">Fullscreen Window</property>
+                             <property name="visible">True</property>
+                             <property name="can_focus">True</property>
+-                            <property name="label" translatable="yes">Fullscreen Window</property>
++                            <property name="receives_default">False</property>
+                             <property name="use_underline">True</property>
+-                            <property name="response_id">0</property>
+                             <property name="draw_indicator">True</property>
+                             <property name="group">rdp_custom_window_radio</property>
+                           </widget>
+@@ -609,11 +639,11 @@ Prompt For Reconnect After Error</proper
+                         </child>
+                         <child>
+                           <widget class="GtkCheckButton" id="sound_check">
++                            <property name="label" translatable="yes">Enable sound forwarding</property>
+                             <property name="visible">True</property>
+                             <property name="can_focus">True</property>
+-                            <property name="label" translatable="yes">Enable sound forwarding</property>
++                            <property name="receives_default">False</property>
+                             <property name="use_underline">True</property>
+-                            <property name="response_id">0</property>
+                             <property name="active">True</property>
+                             <property name="draw_indicator">True</property>
+                           </widget>
+@@ -641,6 +671,7 @@ Prompt For Reconnect After Error</proper
+               <packing>
+                 <property name="expand">False</property>
+                 <property name="fill">False</property>
++                <property name="position">0</property>
+               </packing>
+             </child>
+             <child>
+@@ -745,34 +776,44 @@ LAN</property>
+         <child internal-child="action_area">
+           <widget class="GtkHButtonBox" id="hbuttonbox1">
+             <property name="visible">True</property>
+-            <property name="layout_style">GTK_BUTTONBOX_END</property>
++            <property name="layout_style">end</property>
+             <child>
+               <widget class="GtkButton" id="button1">
++                <property name="label">gtk-cancel</property>
++                <property name="response_id">-6</property>
+                 <property name="visible">True</property>
+                 <property name="can_focus">True</property>
+                 <property name="can_default">True</property>
+-                <property name="label">gtk-cancel</property>
++                <property name="receives_default">False</property>
+                 <property name="use_stock">True</property>
+-                <property name="response_id">-6</property>
+               </widget>
++              <packing>
++                <property name="expand">False</property>
++                <property name="fill">False</property>
++                <property name="position">0</property>
++              </packing>
+             </child>
+             <child>
+               <widget class="GtkButton" id="button2">
++                <property name="label">gtk-ok</property>
++                <property name="response_id">-5</property>
+                 <property name="visible">True</property>
+                 <property name="can_focus">True</property>
+                 <property name="can_default">True</property>
+-                <property name="label">gtk-ok</property>
++                <property name="receives_default">False</property>
+                 <property name="use_stock">True</property>
+-                <property name="response_id">-5</property>
+               </widget>
+               <packing>
++                <property name="expand">False</property>
++                <property name="fill">False</property>
+                 <property name="position">1</property>
+               </packing>
+             </child>
+           </widget>
+           <packing>
+             <property name="expand">False</property>
+-            <property name="pack_type">GTK_PACK_END</property>
++            <property name="pack_type">end</property>
++            <property name="position">0</property>
+           </packing>
+         </child>
+       </widget>
+@@ -781,7 +822,7 @@ LAN</property>
+   <widget class="GtkDialog" id="vnc_edit_dialog">
+     <property name="visible">True</property>
+     <property name="title" translatable="yes">Edit Connection</property>
+-    <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
++    <property name="type_hint">dialog</property>
+     <child internal-child="vbox">
+       <widget class="GtkVBox" id="vbox2">
+         <property name="visible">True</property>
+@@ -794,7 +835,7 @@ LAN</property>
+               <widget class="GtkFrame" id="frame5">
+                 <property name="visible">True</property>
+                 <property name="label_xalign">0</property>
+-                <property name="shadow_type">GTK_SHADOW_NONE</property>
++                <property name="shadow_type">none</property>
+                 <child>
+                   <widget class="GtkAlignment" id="alignment5">
+                     <property name="visible">True</property>
+@@ -802,7 +843,7 @@ LAN</property>
+                     <child>
+                       <widget class="GtkTable" id="table5">
+                         <property name="visible">True</property>
+-                        <property name="n_rows">6</property>
++                        <property name="n_rows">7</property>
+                         <property name="n_columns">2</property>
+                         <property name="column_spacing">6</property>
+                         <property name="row_spacing">6</property>
+@@ -821,6 +862,7 @@ LAN</property>
+                               <packing>
+                                 <property name="expand">False</property>
+                                 <property name="fill">False</property>
++                                <property name="position">0</property>
+                               </packing>
+                             </child>
+                             <child>
+@@ -859,35 +901,35 @@ LAN</property>
+                           <packing>
+                             <property name="left_attach">1</property>
+                             <property name="right_attach">2</property>
+-                            <property name="top_attach">3</property>
+-                            <property name="bottom_attach">4</property>
++                            <property name="top_attach">4</property>
++                            <property name="bottom_attach">5</property>
+                             <property name="x_options"></property>
+                             <property name="y_options"></property>
+                           </packing>
+                         </child>
+                         <child>
+                           <widget class="GtkRadioButton" id="vnc_custom_window_radio">
++                            <property name="label" translatable="yes">Custom Window Size:</property>
+                             <property name="visible">True</property>
+                             <property name="can_focus">True</property>
+-                            <property name="label" translatable="yes">Custom Window Size:</property>
++                            <property name="receives_default">False</property>
+                             <property name="use_underline">True</property>
+-                            <property name="response_id">0</property>
+                             <property name="draw_indicator">True</property>
+                             <property name="group">vnc_fullscreen_radio</property>
+                           </widget>
+                           <packing>
+-                            <property name="top_attach">3</property>
+-                            <property name="bottom_attach">4</property>
++                            <property name="top_attach">4</property>
++                            <property name="bottom_attach">5</property>
+                             <property name="y_options"></property>
+                           </packing>
+                         </child>
+                         <child>
+                           <widget class="GtkRadioButton" id="vnc_fullscreen_radio">
++                            <property name="label" translatable="yes">Fullscreen Window</property>
+                             <property name="visible">True</property>
+                             <property name="can_focus">True</property>
+-                            <property name="label" translatable="yes">Fullscreen Window</property>
++                            <property name="receives_default">False</property>
+                             <property name="use_underline">True</property>
+-                            <property name="response_id">0</property>
+                             <property name="draw_indicator">True</property>
+                             <property name="group">vnc_custom_window_radio</property>
+                           </widget>
+@@ -899,36 +941,53 @@ LAN</property>
+                           </packing>
+                         </child>
+                         <child>
++                          <widget class="GtkRadioButton" id="vnc_remotesize_radio">
++                            <property name="label" translatable="yes">Use Remote Screen Size</property>
++                            <property name="visible">True</property>
++                            <property name="can_focus">True</property>
++                            <property name="receives_default">False</property>
++                            <property name="use_underline">True</property>
++                            <property name="draw_indicator">True</property>
++                            <property name="group">vnc_fullscreen_radio</property>
++                          </widget>
++                          <packing>
++                            <property name="right_attach">2</property>
++                            <property name="top_attach">3</property>
++                            <property name="bottom_attach">4</property>
++                            <property name="x_options">GTK_FILL</property>
++                          </packing>
++                        </child>
++                        <child>
+                           <widget class="GtkCheckButton" id="viewonly_checkbox">
++                            <property name="label" translatable="yes">View only</property>
+                             <property name="visible">True</property>
+                             <property name="can_focus">True</property>
++                            <property name="receives_default">False</property>
+                             <property name="tooltip" translatable="yes">Do not send mouse or keyboard actions</property>
+-                            <property name="label" translatable="yes">View only</property>
+                             <property name="use_underline">True</property>
+-                            <property name="response_id">0</property>
+                             <property name="draw_indicator">True</property>
+                           </widget>
+                           <packing>
+                             <property name="right_attach">2</property>
+-                            <property name="top_attach">5</property>
+-                            <property name="bottom_attach">6</property>
++                            <property name="top_attach">6</property>
++                            <property name="bottom_attach">7</property>
+                             <property name="y_options"></property>
+                           </packing>
+                         </child>
+                         <child>
+                           <widget class="GtkCheckButton" id="shared_checkbox">
++                            <property name="label" translatable="yes">Share with other clients</property>
+                             <property name="visible">True</property>
+                             <property name="can_focus">True</property>
++                            <property name="receives_default">False</property>
+                             <property name="tooltip" translatable="yes">Allows you to share the desktop with other clients already using it.</property>
+-                            <property name="label" translatable="yes">Share with other clients</property>
+                             <property name="use_underline">True</property>
+-                            <property name="response_id">0</property>
+                             <property name="draw_indicator">True</property>
+                           </widget>
+                           <packing>
+                             <property name="right_attach">2</property>
+-                            <property name="top_attach">4</property>
+-                            <property name="bottom_attach">5</property>
++                            <property name="top_attach">5</property>
++                            <property name="bottom_attach">6</property>
+                             <property name="y_options"></property>
+                           </packing>
+                         </child>
+@@ -996,6 +1055,9 @@ LAN</property>
+                   </packing>
+                 </child>
+               </widget>
++              <packing>
++                <property name="position">0</property>
++              </packing>
+             </child>
+           </widget>
+           <packing>
+@@ -1005,34 +1067,44 @@ LAN</property>
+         <child internal-child="action_area">
+           <widget class="GtkHButtonBox" id="hbuttonbox2">
+             <property name="visible">True</property>
+-            <property name="layout_style">GTK_BUTTONBOX_END</property>
++            <property name="layout_style">end</property>
+             <child>
+               <widget class="GtkButton" id="button3">
++                <property name="label">gtk-cancel</property>
++                <property name="response_id">-6</property>
+                 <property name="visible">True</property>
+                 <property name="can_focus">True</property>
+                 <property name="can_default">True</property>
+-                <property name="label">gtk-cancel</property>
++                <property name="receives_default">False</property>
+                 <property name="use_stock">True</property>
+-                <property name="response_id">-6</property>
+               </widget>
++              <packing>
++                <property name="expand">False</property>
++                <property name="fill">False</property>
++                <property name="position">0</property>
++              </packing>
+             </child>
+             <child>
+               <widget class="GtkButton" id="button4">
++                <property name="label">gtk-ok</property>
++                <property name="response_id">-5</property>
+                 <property name="visible">True</property>
+                 <property name="can_focus">True</property>
+                 <property name="can_default">True</property>
+-                <property name="label">gtk-ok</property>
++                <property name="receives_default">False</property>
+                 <property name="use_stock">True</property>
+-                <property name="response_id">-5</property>
+               </widget>
+               <packing>
++                <property name="expand">False</property>
++                <property name="fill">False</property>
+                 <property name="position">1</property>
+               </packing>
+             </child>
+           </widget>
+           <packing>
+             <property name="expand">False</property>
+-            <property name="pack_type">GTK_PACK_END</property>
++            <property name="pack_type">end</property>
++            <property name="position">0</property>
+           </packing>
+         </child>
+       </widget>
+@@ -1041,7 +1113,7 @@ LAN</property>
+   <widget class="GtkDialog" id="web_edit_dialog">
+     <property name="visible">True</property>
+     <property name="title" translatable="yes">dialog1</property>
+-    <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
++    <property name="type_hint">dialog</property>
+     <child internal-child="vbox">
+       <widget class="GtkVBox" id="vbox3">
+         <property name="visible">True</property>
+@@ -1050,7 +1122,7 @@ LAN</property>
+             <property name="visible">True</property>
+             <property name="border_width">6</property>
+             <property name="label_xalign">0</property>
+-            <property name="shadow_type">GTK_SHADOW_NONE</property>
++            <property name="shadow_type">none</property>
+             <child>
+               <widget class="GtkAlignment" id="alignment7">
+                 <property name="visible">True</property>
+@@ -1062,18 +1134,6 @@ LAN</property>
+                     <property name="column_spacing">6</property>
+                     <property name="row_spacing">6</property>
+                     <child>
+-                      <placeholder/>
+-                    </child>
+-                    <child>
+-                      <placeholder/>
+-                    </child>
+-                    <child>
+-                      <placeholder/>
+-                    </child>
+-                    <child>
+-                      <placeholder/>
+-                    </child>
+-                    <child>
+                       <widget class="GtkEntry" id="url_entry">
+                         <property name="visible">True</property>
+                         <property name="can_focus">True</property>
+@@ -1117,34 +1177,44 @@ LAN</property>
+         <child internal-child="action_area">
+           <widget class="GtkHButtonBox" id="hbuttonbox3">
+             <property name="visible">True</property>
+-            <property name="layout_style">GTK_BUTTONBOX_END</property>
++            <property name="layout_style">end</property>
+             <child>
+               <widget class="GtkButton" id="button5">
++                <property name="label">gtk-cancel</property>
++                <property name="response_id">-6</property>
+                 <property name="visible">True</property>
+                 <property name="can_focus">True</property>
+                 <property name="can_default">True</property>
+-                <property name="label">gtk-cancel</property>
++                <property name="receives_default">False</property>
+                 <property name="use_stock">True</property>
+-                <property name="response_id">-6</property>
+               </widget>
++              <packing>
++                <property name="expand">False</property>
++                <property name="fill">False</property>
++                <property name="position">0</property>
++              </packing>
+             </child>
+             <child>
+               <widget class="GtkButton" id="button6">
++                <property name="label">gtk-ok</property>
++                <property name="response_id">-5</property>
+                 <property name="visible">True</property>
+                 <property name="can_focus">True</property>
+                 <property name="can_default">True</property>
+-                <property name="label">gtk-ok</property>
++                <property name="receives_default">False</property>
+                 <property name="use_stock">True</property>
+-                <property name="response_id">-5</property>
+               </widget>
+               <packing>
++                <property name="expand">False</property>
++                <property name="fill">False</property>
+                 <property name="position">1</property>
+               </packing>
+             </child>
+           </widget>
+           <packing>
+             <property name="expand">False</property>
+-            <property name="pack_type">GTK_PACK_END</property>
++            <property name="pack_type">end</property>
++            <property name="position">0</property>
+           </packing>
+         </child>
+       </widget>
+@@ -1153,7 +1223,7 @@ LAN</property>
+   <widget class="GtkDialog" id="mainframe_edit_dialog">
+     <property name="visible">True</property>
+     <property name="title" translatable="yes">dialog1</property>
+-    <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
++    <property name="type_hint">dialog</property>
+     <child internal-child="vbox">
+       <widget class="GtkVBox" id="vbox4">
+         <property name="visible">True</property>
+@@ -1162,7 +1232,7 @@ LAN</property>
+             <property name="visible">True</property>
+             <property name="border_width">6</property>
+             <property name="label_xalign">0</property>
+-            <property name="shadow_type">GTK_SHADOW_NONE</property>
++            <property name="shadow_type">none</property>
+             <child>
+               <widget class="GtkAlignment" id="alignment8">
+                 <property name="visible">True</property>
+@@ -1179,6 +1249,7 @@ LAN</property>
+                       <packing>
+                         <property name="expand">False</property>
+                         <property name="fill">False</property>
++                        <property name="position">0</property>
+                       </packing>
+                     </child>
+                     <child>
+@@ -1212,34 +1283,44 @@ LAN</property>
+         <child internal-child="action_area">
+           <widget class="GtkHButtonBox" id="hbuttonbox4">
+             <property name="visible">True</property>
+-            <property name="layout_style">GTK_BUTTONBOX_END</property>
++            <property name="layout_style">end</property>
+             <child>
+               <widget class="GtkButton" id="button7">
++                <property name="label">gtk-cancel</property>
++                <property name="response_id">-6</property>
+                 <property name="visible">True</property>
+                 <property name="can_focus">True</property>
+                 <property name="can_default">True</property>
+-                <property name="label">gtk-cancel</property>
++                <property name="receives_default">False</property>
+                 <property name="use_stock">True</property>
+-                <property name="response_id">-6</property>
+               </widget>
++              <packing>
++                <property name="expand">False</property>
++                <property name="fill">False</property>
++                <property name="position">0</property>
++              </packing>
+             </child>
+             <child>
+               <widget class="GtkButton" id="button8">
++                <property name="label">gtk-ok</property>
++                <property name="response_id">-5</property>
+                 <property name="visible">True</property>
+                 <property name="can_focus">True</property>
+                 <property name="can_default">True</property>
+-                <property name="label">gtk-ok</property>
++                <property name="receives_default">False</property>
+                 <property name="use_stock">True</property>
+-                <property name="response_id">-5</property>
+               </widget>
+               <packing>
++                <property name="expand">False</property>
++                <property name="fill">False</property>
+                 <property name="position">1</property>
+               </packing>
+             </child>
+           </widget>
+           <packing>
+             <property name="expand">False</property>
+-            <property name="pack_type">GTK_PACK_END</property>
++            <property name="pack_type">end</property>
++            <property name="position">0</property>
+           </packing>
+         </child>
+       </widget>
+@@ -1248,7 +1329,7 @@ LAN</property>
+   <widget class="GtkDialog" id="xdmcp_edit_dialog">
+     <property name="visible">True</property>
+     <property name="title" translatable="yes">Edit Connection</property>
+-    <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
++    <property name="type_hint">dialog</property>
+     <child internal-child="vbox">
+       <widget class="GtkVBox" id="dialog-vbox9">
+         <property name="visible">True</property>
+@@ -1261,7 +1342,7 @@ LAN</property>
+               <widget class="GtkFrame" id="frame2">
+                 <property name="visible">True</property>
+                 <property name="label_xalign">0</property>
+-                <property name="shadow_type">GTK_SHADOW_NONE</property>
++                <property name="shadow_type">none</property>
+                 <child>
+                   <widget class="GtkAlignment" id="alignment9">
+                     <property name="visible">True</property>
+@@ -1288,6 +1369,7 @@ LAN</property>
+                               <packing>
+                                 <property name="expand">False</property>
+                                 <property name="fill">False</property>
++                                <property name="position">0</property>
+                               </packing>
+                             </child>
+                             <child>
+@@ -1334,11 +1416,11 @@ LAN</property>
+                         </child>
+                         <child>
+                           <widget class="GtkRadioButton" id="xdmcp_custom_window_radio">
++                            <property name="label" translatable="yes">Custom Window Size:</property>
+                             <property name="visible">True</property>
+                             <property name="can_focus">True</property>
+-                            <property name="label" translatable="yes">Custom Window Size:</property>
++                            <property name="receives_default">False</property>
+                             <property name="use_underline">True</property>
+-                            <property name="response_id">0</property>
+                             <property name="draw_indicator">True</property>
+                             <property name="group">xdmcp_fullscreen_radio</property>
+                           </widget>
+@@ -1350,11 +1432,11 @@ LAN</property>
+                         </child>
+                         <child>
+                           <widget class="GtkRadioButton" id="xdmcp_fullscreen_radio">
++                            <property name="label" translatable="yes">Fullscreen Window</property>
+                             <property name="visible">True</property>
+                             <property name="can_focus">True</property>
+-                            <property name="label" translatable="yes">Fullscreen Window</property>
++                            <property name="receives_default">False</property>
+                             <property name="use_underline">True</property>
+-                            <property name="response_id">0</property>
+                             <property name="active">True</property>
+                             <property name="draw_indicator">True</property>
+                             <property name="group">xdmcp_custom_window_radio</property>
+@@ -1403,6 +1485,9 @@ LAN</property>
+                   </packing>
+                 </child>
+               </widget>
++              <packing>
++                <property name="position">0</property>
++              </packing>
+             </child>
+           </widget>
+           <packing>
+@@ -1412,34 +1497,44 @@ LAN</property>
+         <child internal-child="action_area">
+           <widget class="GtkHButtonBox" id="dialog-action_area9">
+             <property name="visible">True</property>
+-            <property name="layout_style">GTK_BUTTONBOX_END</property>
++            <property name="layout_style">end</property>
+             <child>
+               <widget class="GtkButton" id="button11">
++                <property name="label">gtk-cancel</property>
++                <property name="response_id">-6</property>
+                 <property name="visible">True</property>
+                 <property name="can_focus">True</property>
+                 <property name="can_default">True</property>
+-                <property name="label">gtk-cancel</property>
++                <property name="receives_default">False</property>
+                 <property name="use_stock">True</property>
+-                <property name="response_id">-6</property>
+               </widget>
++              <packing>
++                <property name="expand">False</property>
++                <property name="fill">False</property>
++                <property name="position">0</property>
++              </packing>
+             </child>
+             <child>
+               <widget class="GtkButton" id="button12">
++                <property name="label">gtk-ok</property>
++                <property name="response_id">-5</property>
+                 <property name="visible">True</property>
+                 <property name="can_focus">True</property>
+                 <property name="can_default">True</property>
+-                <property name="label">gtk-ok</property>
++                <property name="receives_default">False</property>
+                 <property name="use_stock">True</property>
+-                <property name="response_id">-5</property>
+               </widget>
+               <packing>
++                <property name="expand">False</property>
++                <property name="fill">False</property>
+                 <property name="position">1</property>
+               </packing>
+             </child>
+           </widget>
+           <packing>
+             <property name="expand">False</property>
+-            <property name="pack_type">GTK_PACK_END</property>
++            <property name="pack_type">end</property>
++            <property name="position">0</property>
+           </packing>
+         </child>
+       </widget>
+@@ -1448,7 +1543,7 @@ LAN</property>
+   <widget class="GtkDialog" id="ssh_edit_dialog">
+     <property name="visible">True</property>
+     <property name="title" translatable="yes">dialog1</property>
+-    <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
++    <property name="type_hint">dialog</property>
+     <child internal-child="vbox">
+       <widget class="GtkVBox" id="dialog-vbox10">
+         <property name="visible">True</property>
+@@ -1457,7 +1552,7 @@ LAN</property>
+             <property name="visible">True</property>
+             <property name="border_width">6</property>
+             <property name="label_xalign">0</property>
+-            <property name="shadow_type">GTK_SHADOW_NONE</property>
++            <property name="shadow_type">none</property>
+             <child>
+               <widget class="GtkAlignment" id="alignment10">
+                 <property name="visible">True</property>
+@@ -1470,12 +1565,6 @@ LAN</property>
+                     <property name="column_spacing">6</property>
+                     <property name="row_spacing">6</property>
+                     <child>
+-                      <placeholder/>
+-                    </child>
+-                    <child>
+-                      <placeholder/>
+-                    </child>
+-                    <child>
+                       <widget class="GtkEntry" id="password_entry2">
+                         <property name="visible">True</property>
+                         <property name="can_focus">True</property>
+@@ -1513,11 +1602,11 @@ LAN</property>
+                     </child>
+                     <child>
+                       <widget class="GtkCheckButton" id="x11_checkbox">
++                        <property name="label" translatable="yes">X11 Support</property>
+                         <property name="visible">True</property>
+                         <property name="can_focus">True</property>
+-                        <property name="label" translatable="yes">X11 Support</property>
++                        <property name="receives_default">False</property>
+                         <property name="use_underline">True</property>
+-                        <property name="response_id">0</property>
+                         <property name="draw_indicator">True</property>
+                       </widget>
+                       <packing>
+@@ -1584,11 +1673,11 @@ LAN</property>
+                     </child>
+                     <child>
+                       <widget class="GtkCheckButton" id="terminal_checkbox1">
++                        <property name="label" translatable="yes">Run in terminal window</property>
+                         <property name="visible">True</property>
+                         <property name="can_focus">True</property>
+-                        <property name="label" translatable="yes">Run in terminal window</property>
++                        <property name="receives_default">False</property>
+                         <property name="use_underline">True</property>
+-                        <property name="response_id">0</property>
+                         <property name="draw_indicator">True</property>
+                       </widget>
+                       <packing>
+@@ -1618,6 +1707,12 @@ LAN</property>
+                         <property name="y_options"></property>
+                       </packing>
+                     </child>
++                    <child>
++                      <placeholder/>
++                    </child>
++                    <child>
++                      <placeholder/>
++                    </child>
+                   </widget>
+                 </child>
+               </widget>
+@@ -1640,34 +1735,44 @@ LAN</property>
+         <child internal-child="action_area">
+           <widget class="GtkHButtonBox" id="dialog-action_area10">
+             <property name="visible">True</property>
+-            <property name="layout_style">GTK_BUTTONBOX_END</property>
++            <property name="layout_style">end</property>
+             <child>
+               <widget class="GtkButton" id="cancelbutton4">
++                <property name="label">gtk-cancel</property>
++                <property name="response_id">-6</property>
+                 <property name="visible">True</property>
+                 <property name="can_focus">True</property>
+                 <property name="can_default">True</property>
+-                <property name="label">gtk-cancel</property>
++                <property name="receives_default">False</property>
+                 <property name="use_stock">True</property>
+-                <property name="response_id">-6</property>
+               </widget>
++              <packing>
++                <property name="expand">False</property>
++                <property name="fill">False</property>
++                <property name="position">0</property>
++              </packing>
+             </child>
+             <child>
+               <widget class="GtkButton" id="okbutton4">
++                <property name="label">gtk-ok</property>
++                <property name="response_id">-5</property>
+                 <property name="visible">True</property>
+                 <property name="can_focus">True</property>
+                 <property name="can_default">True</property>
+-                <property name="label">gtk-ok</property>
++                <property name="receives_default">False</property>
+                 <property name="use_stock">True</property>
+-                <property name="response_id">-5</property>
+               </widget>
+               <packing>
++                <property name="expand">False</property>
++                <property name="fill">False</property>
+                 <property name="position">1</property>
+               </packing>
+             </child>
+           </widget>
+           <packing>
+             <property name="expand">False</property>
+-            <property name="pack_type">GTK_PACK_END</property>
++            <property name="pack_type">end</property>
++            <property name="position">0</property>
+           </packing>
+         </child>
+       </widget>
+diff -up tsclient-2.0.2/src/plugins/default/tsc-vnc-connection.c.vnc-remotesize tsclient-2.0.2/src/plugins/default/tsc-vnc-connection.c
+--- tsclient-2.0.2/src/plugins/default/tsc-vnc-connection.c.vnc-remotesize	2008-11-26 16:19:02.000000000 -0500
++++ tsclient-2.0.2/src/plugins/default/tsc-vnc-connection.c	2009-01-23 22:01:28.000000000 -0500
 @@ -102,7 +102,7 @@ tsc_vnc_connection_start (TSCConnection 
  
  	if (connection->fullscreen) {
@@ -38,8 +1074,9 @@
  }
  
  static void
---- tsclient-2.0.1/src/plugins/default/tsc-vnc-connection.h.vnc-remotesize	2008-04-22 12:37:43.000000000 -0400
-+++ tsclient-2.0.1/src/plugins/default/tsc-vnc-connection.h	2008-10-20 14:47:17.000000000 -0400
+diff -up tsclient-2.0.2/src/plugins/default/tsc-vnc-connection.h.vnc-remotesize tsclient-2.0.2/src/plugins/default/tsc-vnc-connection.h
+--- tsclient-2.0.2/src/plugins/default/tsc-vnc-connection.h.vnc-remotesize	2008-11-26 16:19:02.000000000 -0500
++++ tsclient-2.0.2/src/plugins/default/tsc-vnc-connection.h	2009-01-23 22:01:28.000000000 -0500
 @@ -23,6 +23,7 @@ typedef struct _TSCVncConnection {
  	gboolean shared;
  	gboolean viewonly;
@@ -48,95 +1085,29 @@
  	
  	int width;
  	int height;
---- tsclient-2.0.1/src/plugins/default/tsc-vnc-edit-dialog.c.vnc-remotesize	2008-10-20 14:45:35.000000000 -0400
-+++ tsclient-2.0.1/src/plugins/default/tsc-vnc-edit-dialog.c	2008-10-20 14:47:17.000000000 -0400
-@@ -64,6 +64,10 @@ tsc_vnc_edit_dialog_load (TSCEditDialog 
+diff -up tsclient-2.0.2/src/plugins/default/tsc-vnc-edit-dialog.c.vnc-remotesize tsclient-2.0.2/src/plugins/default/tsc-vnc-edit-dialog.c
+--- tsclient-2.0.2/src/plugins/default/tsc-vnc-edit-dialog.c.vnc-remotesize	2009-01-23 22:01:28.000000000 -0500
++++ tsclient-2.0.2/src/plugins/default/tsc-vnc-edit-dialog.c	2009-01-23 22:07:44.000000000 -0500
+@@ -64,6 +64,11 @@ tsc_vnc_edit_dialog_load (TSCEditDialog 
  		gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (glade_xml_get_widget (dialog->xml,
- 										       "fullscreen_radio")),
+ 										       "vnc_fullscreen_radio")),
  					      TRUE);
 +	} else if (connection->remotesize) {
 +		gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (glade_xml_get_widget (dialog->xml,
-+										       "remotesize_radio")),
-+					      TRUE);
++								 "vnc_remotesize_radio")),
++						TRUE);
++ 
  	} else {
  		gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (glade_xml_get_widget (dialog->xml,
- 										       "custom_window_radio")),
-@@ -133,6 +137,9 @@ tsc_vnc_edit_dialog_save (TSCEditDialog 
+ 										       "vnc_custom_window_radio")),
+@@ -133,6 +138,10 @@ tsc_vnc_edit_dialog_save (TSCEditDialog 
  	connection->fullscreen = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (
  								       glade_xml_get_widget (dialog->xml,
- 											     "fullscreen_radio")));
+ 											     "vnc_fullscreen_radio")));
 +	connection->remotesize = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (
-+								       glade_xml_get_widget (dialog->xml,
-+											     "remotesize_radio")));
++								glade_xml_get_widget (dialog->xml,
++										      "vnc_remotesize_radio")));
++
  	connection->width = gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (
  								      glade_xml_get_widget (dialog->xml,
- 											    "width_spin")));
---- tsclient-2.0.1/data/tsclient.glade.vnc-remotesize	2008-06-27 11:16:33.000000000 -0400
-+++ tsclient-2.0.1/data/tsclient.glade	2008-10-20 14:47:17.000000000 -0400
-@@ -794,7 +794,7 @@ LAN</property>
-                     <child>
-                       <widget class="GtkTable" id="table5">
-                         <property name="visible">True</property>
--                        <property name="n_rows">6</property>
-+                        <property name="n_rows">7</property>
-                         <property name="n_columns">2</property>
-                         <property name="column_spacing">6</property>
-                         <property name="row_spacing">6</property>
-@@ -851,8 +851,8 @@ LAN</property>
-                           <packing>
-                             <property name="left_attach">1</property>
-                             <property name="right_attach">2</property>
--                            <property name="top_attach">3</property>
--                            <property name="bottom_attach">4</property>
-+                            <property name="top_attach">4</property>
-+                            <property name="bottom_attach">5</property>
-                             <property name="x_options">GTK_FILL</property>
-                             <property name="y_options">GTK_FILL</property>
-                           </packing>
-@@ -868,6 +868,24 @@ LAN</property>
-                             <property name="group">fullscreen_radio</property>
-                           </widget>
-                           <packing>
-+                            <property name="top_attach">4</property>
-+                            <property name="bottom_attach">5</property>
-+                            <property name="x_options">GTK_FILL</property>
-+                            <property name="y_options"></property>
-+                          </packing>
-+                        </child>
-+                        <child>
-+                          <widget class="GtkRadioButton" id="remotesize_radio">
-+                            <property name="visible">True</property>
-+                            <property name="can_focus">True</property>
-+                            <property name="label" translatable="yes">Use Remote Screen Size</property>
-+                            <property name="use_underline">True</property>
-+                            <property name="response_id">0</property>
-+                            <property name="draw_indicator">True</property>
-+                            <property name="group">fullscreen_radio</property>
-+                          </widget>
-+                          <packing>
-+                            <property name="right_attach">2</property>
-                             <property name="top_attach">3</property>
-                             <property name="bottom_attach">4</property>
-                             <property name="x_options">GTK_FILL</property>
-@@ -903,8 +921,8 @@ LAN</property>
-                           </widget>
-                           <packing>
-                             <property name="right_attach">2</property>
--                            <property name="top_attach">5</property>
--                            <property name="bottom_attach">6</property>
-+                            <property name="top_attach">6</property>
-+                            <property name="bottom_attach">7</property>
-                             <property name="x_options">GTK_FILL</property>
-                             <property name="y_options"></property>
-                           </packing>
-@@ -921,8 +939,8 @@ LAN</property>
-                           </widget>
-                           <packing>
-                             <property name="right_attach">2</property>
--                            <property name="top_attach">4</property>
--                            <property name="bottom_attach">5</property>
-+                            <property name="top_attach">5</property>
-+                            <property name="bottom_attach">6</property>
-                             <property name="x_options">GTK_FILL</property>
-                             <property name="y_options"></property>
-                           </packing>
+ 											    "vnc_width_spin")));



From mclasen at fedoraproject.org  Sat Jan 24 03:38:37 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Sat, 24 Jan 2009 03:38:37 +0000 (UTC)
Subject: rpms/tsclient/devel .cvsignore,1.8,1.9 sources,1.8,1.9
Message-ID: <20090124033837.482567010A@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/tsclient/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23111

Modified Files:
	.cvsignore sources 
Log Message:
update sources



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/tsclient/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	12 Aug 2008 04:24:04 -0000	1.8
+++ .cvsignore	24 Jan 2009 03:38:06 -0000	1.9
@@ -1 +1 @@
-tsclient-2.0.1.tar.bz2
+tsclient-2.0.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tsclient/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	12 Aug 2008 04:24:04 -0000	1.8
+++ sources	24 Jan 2009 03:38:06 -0000	1.9
@@ -1 +1 @@
-3de7131156f37c5ef1028a5f03ed021b  tsclient-2.0.1.tar.bz2
+8cfc7962cd53f5133c125f27cca4eaa8  tsclient-2.0.2.tar.bz2



From jcollie at fedoraproject.org  Sat Jan 24 03:47:42 2009
From: jcollie at fedoraproject.org (Jeffrey C. Ollie)
Date: Sat, 24 Jan 2009 03:47:42 +0000 (UTC)
Subject: rpms/asterisk/F-9 0016-Fix-a-reversed-logic-ast_strlen_zero.patch, 
	NONE, 1.1 asterisk.spec, 1.35, 1.36
Message-ID: <20090124034742.9A9E47010A@cvs1.fedora.phx.redhat.com>

Author: jcollie

Update of /cvs/pkgs/rpms/asterisk/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24565

Modified Files:
	asterisk.spec 
Added Files:
	0016-Fix-a-reversed-logic-ast_strlen_zero.patch 
Log Message:
* Fri Jan 23 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6.0.5-2
- Add a patch to fix a problem with the manager interface.


0016-Fix-a-reversed-logic-ast_strlen_zero.patch:

--- NEW FILE 0016-Fix-a-reversed-logic-ast_strlen_zero.patch ---
>From f439a25ddc062941e2e14d7c3cf60b55b324f98b Mon Sep 17 00:00:00 2001
From: mmichelson <mmichelson at f38db490-d61c-443f-a65b-d21fe96a405b>
Date: Fri, 5 Dec 2008 22:59:43 +0000
Subject: [PATCH] Fix a reversed-logic ast_strlen_zero.

This problem was pointed out on the asterisk-users list
by Jim Dickenson

git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0 at 161490 f38db490-d61c-443f-a65b-d21fe96a405b
---
 main/manager.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/main/manager.c b/main/manager.c
index 0076f64..5eb8339 100644
--- a/main/manager.c
+++ b/main/manager.c
@@ -2163,7 +2163,7 @@ static int action_originate(struct mansession *s, const struct message *m)
 	int format = AST_FORMAT_SLINEAR;
 
 	pthread_t th;
-	if (!ast_strlen_zero(name)) {
+	if (ast_strlen_zero(name)) {
 		astman_send_error(s, m, "Channel not specified");
 		return 0;
 	}
-- 
1.6.0.6



Index: asterisk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/F-9/asterisk.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- asterisk.spec	24 Jan 2009 02:23:52 -0000	1.35
+++ asterisk.spec	24 Jan 2009 03:47:12 -0000	1.36
@@ -3,7 +3,7 @@
 Summary: The Open Source PBX
 Name: asterisk
 Version: 1.6.0.5
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2
 Group: Applications/Internet
 URL: http://www.asterisk.org/
@@ -47,6 +47,7 @@
 Patch13: 0013-Update-autoconf.patch
 Patch14: 0014-Fix-up-some-paths.patch
 Patch15: 0015-Add-LDAP-schema-that-is-compatible-with-Fedora-Direc.patch
+Patch16: 0016-Fix-a-reversed-logic-ast_strlen_zero.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
 
@@ -435,6 +436,7 @@
 %patch13 -p1
 %patch14 -p1
 %patch15 -p1
+%patch16 -p1
 
 cp %{SOURCE2} menuselect.makedeps
 cp %{SOURCE3} menuselect.makeopts
@@ -1052,6 +1054,9 @@
 %{_libdir}/asterisk/modules/app_voicemail_plain.so
 
 %changelog
+* Fri Jan 23 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6.0.5-2
+- Add a patch to fix a problem with the manager interface.
+
 * Fri Jan 23 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6.0.5-1
 - Update to 1.6.0.5 to fix regressions caused by fixes for
   AST-2009-001/CVE-2009-0041 (Asterisk 1.6.0.4 was never released).



From rdieter at fedoraproject.org  Sat Jan 24 03:59:16 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sat, 24 Jan 2009 03:59:16 +0000 (UTC)
Subject: rpms/kdebindings/F-10 .cvsignore, 1.50, 1.51 kdebindings.spec, 1.148,
	1.149 sources, 1.57, 1.58
Message-ID: <20090124035916.A63BE7010A@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdebindings/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25940

Modified Files:
	.cvsignore kdebindings.spec sources 
Log Message:
sync w/devel for 4.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdebindings/F-10/.cvsignore,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- .cvsignore	8 Jan 2009 18:25:14 -0000	1.50
+++ .cvsignore	24 Jan 2009 03:58:46 -0000	1.51
@@ -1 +1,5 @@
-kdebindings-4.1.4.tar.bz2
+kdebindings-4.1.2.tar.bz2
+kdebindings-4.1.80.tar.bz2
+kdebindings-4.1.85.tar.bz2
+kdebindings-4.1.96.tar.bz2
+kdebindings-4.2.0.tar.bz2


Index: kdebindings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebindings/F-10/kdebindings.spec,v
retrieving revision 1.148
retrieving revision 1.149
diff -u -r1.148 -r1.149
--- kdebindings.spec	8 Jan 2009 18:25:14 -0000	1.148
+++ kdebindings.spec	24 Jan 2009 03:58:46 -0000	1.149
@@ -6,72 +6,75 @@
 
 # define to enable these optional bits
 #define csharp 1
+#define falcon 1
+#define php 1
 %define ruby 1
 %define smoke 1
-#define php 1
+# define to build kde-plasma-ruby bits, needs QtRuby-devel bootstrap
+# FIXME/TODO: ping upstream so it uses the just-built rbuic4
+#define kde_plasma_ruby 1
 
 %if 0%{?ruby}%{?smoke}
 %define devel 1
 %endif
 
-%{!?ruby_sitelib: %define ruby_sitelib %(ruby -rrbconfig -e 'puts Config::CONFIG["sitelibdir"]')}
-%{!?ruby_sitearch: %define ruby_sitearch %(ruby -rrbconfig -e 'puts Config::CONFIG["sitearchdir"]')}
+%global ruby_sitelib %(ruby -rrbconfig -e 'puts Config::CONFIG["sitelibdir"]')
+%global ruby_sitearch %(ruby -rrbconfig -e 'puts Config::CONFIG["sitearchdir"]')
 %global python_ver %(%{__python} -c "import sys ; print sys.version[:3]")
 %global python_sitelib  %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")
 %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")
 
 Name: kdebindings
-Version: 4.1.4
+Version: 4.2.0
 Release: 1%{?dist}
 Summary: KDE bindings to non-C++ languages
 
 Group: User Interface/Desktops
 License: GPLv2
 URL: http://developer.kde.org/language-bindings/
-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
+# upstream patches
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  kde-filesystem >= 4
+BuildRequires:  akonadi-devel >= 1.1.0
+BuildRequires:  plasma-devel >= %{version}
+# okular bindings
+BuildRequires:  kdegraphics-devel >= %{version}
 BuildRequires:  kdelibs4-devel >= %{version}
-BuildRequires:  kdebase-workspace-devel >= %{version}
 BuildRequires:  kdepimlibs-devel >= %{version}
-BuildRequires:  soprano-devel >= 2.0.97
-BuildRequires:  cmake
 %{?csharp:BuildRequires:  mono-core}
 BuildRequires:  python-devel
 %{?ruby:BuildRequires:  ruby-devel ruby}
-BuildRequires:  giflib-devel
-BuildRequires:  pcre-devel
-# causes smokeqt to fail to build
-#{?smoke:BuildRequires:  qwt-devel}
 BuildRequires:  PyQt4-devel >= 4.4.2
 %if 0%{?fedora} > 8
 BuildRequires:  qscintilla-devel >= 2.2
 %endif
+BuildRequires:  soprano-devel
+%if 0%{?kde_plasma_ruby}
+BuildRequires:  QtRuby-devel
+%endif
 
-# FIXME/TODO: are there other explicit Requires?
 Requires: kdelibs4 >= %{version}
-Requires: kdebase-workspace >= %{version}
 
 %{!?devel:Obsoletes: kdebindings-devel < %{version}-%{release}}
 
 %description
 KDE bindings to non-C++ languages
 
-%package -n PyKDE4 
+%package -n PyKDE4
 Group:    Development/Languages
-Summary:  Python bindings for KDE4 
+Summary:  Python bindings for KDE4
 Requires: kdelibs4 >= %{version}
 Requires: PyQt4
-%description -n PyKDE4 
+%description -n PyKDE4
 Header files for developing applications using %{name}.
 
 %package -n PyKDE4-devel
 Group:    Development/Languages
-Summary:  Files needed to build other bindings based on KDE4 
+Summary:  Files needed to build other bindings based on KDE4
 Requires: PyQt4-devel
 Requires: PyKDE4 = %{version}-%{release}
-%description -n PyKDE4-devel 
+%description -n PyKDE4-devel
 Files needed to build other bindings for C++ classes that inherit from any
 of the KDE4 classes.
 
@@ -79,10 +82,79 @@
 Group:    Development/Libraries
 Summary:  Header files for %{name}
 Requires: %{name} = %{version}-%{release}
-Requires: kdelibs4-devel kdebase-workspace-devel
+Requires: kdelibs4-devel
 %description devel
 Header files for developing applications using %{name}.
 
+%if 0%{?ruby}
+%package -n korundum
+Group:    Development/Languages
+Summary:  Ruby bindings for KDE4
+Requires: kdelibs4 >= %{version}
+Requires: QtRuby = %{version}-%{release}
+Provides: korundum4 = %{version}-%{release}
+%description -n korundum
+%{summary}.
+
+%package -n korundum-devel
+Group:    Development/Languages
+Summary:  Development files for korundum 
+Requires: QtRuby-devel
+Requires: korundum = %{version}-%{release}
+Provides: korundum4-devel = %{version}-%{release}
+%description -n korundum-devel
+%{summary}.
+
+%package -n QtRuby
+Group:    Development/Languages
+Summary:  Ruby bindings for Qt4
+Requires: qt4 >= %{_qt4_version} 
+Provides: QtRuby4 = %{version}-%{release}
+%description -n QtRuby
+%{summary}.
+
+%package -n QtRuby-devel
+Group:    Development/Languages
+Summary:  Development files for QtRuby 
+Requires: QtRuby = %{version}-%{release}
+Provides: QtRuby4-devel = %{version}-%{release}
+%description -n QtRuby-devel
+%{summary}.
+
+%package -n kde-plasma-ruby-digitalclock
+Group:    User Interface/Desktops
+Summary:  Digital clock plasmoid written in Ruby
+Requires: korundum = %{version}-%{release}
+%description -n kde-plasma-ruby-digitalclock
+%{summary}.
+
+%package -n kde-plasma-ruby-analogclock
+Group:    User Interface/Desktops
+Summary:  Analog clock plasmoid written in Ruby
+Requires: korundum = %{version}-%{release}
+%description -n kde-plasma-ruby-analogclock
+%{summary}.
+%endif
+
+%package -n kross-python
+Group:    Development/Languages
+Summary:  Kross plugin for python
+Requires: kdelibs4 >= %{version}
+Provides: kross(python) = ^{version]-%{release}
+%description -n kross-python
+Python plugin for the Kross archtecture in KDE4.
+
+%if 0%{?ruby}
+%package -n kross-ruby
+Group:    Development/Languages
+Summary:  Kross plugin for ruby
+Requires: ruby
+Requires: kdelibs4 >= %{version}
+Provides: kross(ruby) = %{version}-%{release}
+%description -n kross-ruby
+Ruby plugin for the Kross archtecture in KDE4.
+%endif
+
 
 %prep
 %setup -q
@@ -105,8 +177,7 @@
 
 %install
 rm -rf %{buildroot}
-mkdir -p %{buildroot}
-make install DESTDIR=%{buildroot} -C %{_target_platform}
+make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
 
 %clean
@@ -122,21 +193,17 @@
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING NEWS README
 %if 0%{?smoke}
-%{_kde4_libdir}/lib*.so.*
+%{_kde4_libdir}/libsmoke*.so.*
+%endif
+
+%if 0%{?devel}
+%files devel
+%defattr(-,root,root,-)
+%if 0%{?smoke}
+%{_includedir}/smoke.h
+%{_includedir}/smoke/
+%{_kde4_libdir}/libsmoke*.so
 %endif
-# unversioned library
-%{_kde4_libdir}/kde4/krosspython.so
-%if 0%{?ruby}
-%{_kde4_bindir}/*
-%{_kde4_appsdir}/plasma_scriptengine_ruby/
-%{_kde4_datadir}/kde4/services/plasma-scriptengine-ruby-*.desktop
-%{_kde4_libdir}/libqtruby4shared.so
-%{_kde4_libdir}/kde4/krossruby.so
-%{_kde4_libdir}/kde4/krubypluginfactory.so
-%{ruby_sitelib}/*
-%{ruby_sitearch}/*.so
-%{_kde4_datadir}/applications/kde4/dbpedia_references.desktop
-%{_kde4_appsdir}/dbpedia_references/
 %endif
 
 %files -n PyKDE4
@@ -144,32 +211,143 @@
 %doc COPYING
 %{python_sitearch}/PyKDE4/
 %{_kde4_appsdir}/pykde4/
+%{_kde4_libdir}/kde4/kpythonpluginfactory.so
 
 %files -n PyKDE4-devel
 %defattr(-,root,root,-)
-%doc %{_kde4_docdir}/HTML/en/pykde4/
+#doc %{_kde4_docdir}/HTML/en/pykde4/
 %{_kde4_datadir}/sip/PyKDE4/
 
-%if 0%{?devel}
-%files devel
-%defattr(-,root,root,-)
-%if 0%{?smoke}
-%{_includedir}/smoke.h
-%{_includedir}/smoke/
-%{_kde4_libdir}/lib*.so
-%endif
 %if 0%{?ruby}
+%files -n korundum
+%defattr(-,root,root,-)
+%{_kde4_bindir}/krubyapplication
+%{ruby_sitelib}/KDE/
+%{ruby_sitelib}/akonadi/
+%{ruby_sitelib}/khtml/
+%{ruby_sitelib}/ktexteditor/
+%{ruby_sitelib}/okular/
+%{ruby_sitelib}/solid/
+%{ruby_sitelib}/soprano/
+%{ruby_sitelib}/nepomuk/
+%{ruby_sitearch}/akonadi.so
+%{ruby_sitearch}/khtml.so
+%{ruby_sitearch}/korundum4.so
+%{ruby_sitearch}/ktexteditor.so
+%{ruby_sitearch}/okular.so
+%{ruby_sitearch}/plasma_applet.so
+%{ruby_sitearch}/solid.so
+%{ruby_sitearch}/soprano.so
+%{ruby_sitearch}/nepomuk.so
+%{_kde4_libdir}/kde4/krubypluginfactory.so
+%{_kde4_datadir}/applications/kde4/dbpedia_references.desktop
+%{_kde4_appsdir}/dbpedia_references/
+
+%files -n korundum-devel
+%defattr(-,root,root,-)
+%{_kde4_bindir}/rbkconfig_compiler4
 %{_includedir}/qtruby/
 %exclude %{_kde4_libdir}/libqtruby4shared.so
+
+%files -n QtRuby
+%defattr(-,root,root,-)
+%{ruby_sitelib}/Qt/
+%{ruby_sitelib}/Qt*.rb
+%{ruby_sitelib}/qtscript/
+%{ruby_sitelib}/qttest/
+%{ruby_sitelib}/qtuitools/
+%{ruby_sitelib}/qtwebkit/
+%{ruby_sitearch}/qt*.so
+%{_kde4_libdir}/libqtruby4shared.so.2
+%{_kde4_libdir}/libqtruby4shared.so.2.0.0
+
+%files -n QtRuby-devel
+%defattr(-,root,root,-)
+%{_kde4_bindir}/rbqtapi
+%{_kde4_bindir}/rbrcc
+%{_kde4_bindir}/rbuic4
+%{_kde4_libdir}/libqtruby4shared.so
+%endif
+
+%files -n kross-python
+%defattr(-,root,root,-)
+# unversioned library
+%{_kde4_libdir}/kde4/krosspython.so
+
+%if 0%{?ruby}
+%files -n kross-ruby
+%defattr(-,root,root,-)
+%{_kde4_libdir}/kde4/krossruby.so
+
+%if 0%{?kde_plasma_ruby}
+%files -n kde-plasma-ruby-analogclock
+%defattr(-,root,root,-)
+%{_kde4_sharedir}/kde4/apps/plasma_applet_ruby_clock/
+%{_kde4_sharedir}/kde4/services/plasma-applet-ruby-analogclock.desktop
+
+%files -n kde-plasma-ruby-digitalclock
+%defattr(-,root,root,-)
+%{_kde4_sharedir}/kde4/apps/plasma_ruby_digital_clock/
+%{_kde4_sharedir}/kde4/services/plasma-ruby-digital-clock-default.desktop
 %endif
 %endif
 
 
 %changelog
-* Thu Jan  8 2009 Luk???? Tinkl <ltinkl at redhat.com> 4.1.4-1
-- KDE 4.1.4
+* Thu Jan 22 2009 Than Ngo <than at redhat.com> - 4.2.0-1
+- 4.2.0
+
+* Thu Jan 15 2009 Rex Dieter <rdieter at fedoraproject.org> 4.1.96-5
+- toggle for QtRuby/kde-plasma-ruby bootstrap
+
+* Thu Jan 15 2009 Rex Dieter <rdieter at fedoraproject.org> 4.1.96-4
+- update %%description/%%summaries for new (sub)pkgs
+- use versioned Provides/Requires all over
+- BR: akonadi-devel kdegraphics-devel
+- don't package kde-plasma-ruby-* (cmake error "rbuic4 not found")
+
+* Thu Jan 15 2009 Ben Boeckel <MathStuf at gmail.com> 4.1.96-3
+- Fixed QtRuby version
+- Moved QtRuby tools to QtRuby-devel
+
+* Wed Jan 14 2009 Ben Boeckel <MathStuf at gmail.com> 4.1.96-2
+- Split out Ruby bindings and Kross modules
+
+* Wed Jan 07 2009 Than Ngo <than at redhat.com> - 4.1.96-1
+- 4.2rc1
+
+* Fri Dec 12 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.85-2
+- reenable smoke, ruby
+- disable NepomukSmoke for now: it wasn't actually used (the corresponding
+  Ruby binding is disabled by default and we don't build the C# bindings) and it
+  depends on nepomukquery libs from kdebase (which also means we need to sort
+  out the -devel symlink mess there first)
+
+* Fri Dec 12 2008 Than Ngo <than at redhat.com> 4.1.85-1
+- 4.2beta2
+
+* Mon Dec 01 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.80-5
+- rebuild for Python 2.6
+
+* Mon Dec 01 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.80-4
+- don't require kdebase-workspace(-devel)
+
+* Thu Nov 27 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.80-3
+- BR plasma-devel instead of kdebase-workspace-devel
+- disable smoke,ruby (for now, busted)
+
+* Thu Nov 20 2008 Than Ngo <than at redhat.com> 4.1.80-2
+- merged
+
+* Thu Nov 20 2008 Lorenzo Villani <lvillani at binaryhelix.net> - 4.1.80-1
+- 4.1.80
+- BR cmake >= 2.6.2
+- make install/fast
+
+* Mon Nov 17 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-2.1
+- respin (qscintilla)
 
-* Wed Nov 12 2008 Than Ngo <than at redhat.com>  4.1.3-1
+* Wed Nov 12 2008 Than Ngo <than at redhat.com> 4.1.3-1
 - 4.1.3
 
 * Mon Sep 29 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdebindings/F-10/sources,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- sources	8 Jan 2009 18:25:14 -0000	1.57
+++ sources	24 Jan 2009 03:58:46 -0000	1.58
@@ -1 +1 @@
-d96fc787abcc6d7d9b3f2f1467fe226b  kdebindings-4.1.4.tar.bz2
+6eae8fd968da83fe65e592993e416adc  kdebindings-4.2.0.tar.bz2



From mtasaka at fedoraproject.org  Sat Jan 24 04:07:54 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Sat, 24 Jan 2009 04:07:54 +0000 (UTC)
Subject: rpms/rubygem-mechanize/F-10 rubygem-mechanize.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090124040754.F1F177010A@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/rubygem-mechanize/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27051/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	rubygem-mechanize.spec 
Log Message:
Initial commit


--- NEW FILE rubygem-mechanize.spec ---
# Initially Generated from mechanize-0.8.5.gem by gem2rpm -*- rpm-spec -*-
%define	ruby_sitelib		%(ruby -rrbconfig -e "puts Config::CONFIG['sitelibdir']")
%define	rubyabi		1.8

%define	gemdir			%(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null)
%define	gemname		mechanize
%define	geminstdir		%{gemdir}/gems/%{gemname}-%{version}

Summary:	A handy web browsing ruby object
Name:		rubygem-%{gemname}
Version:	0.9.0
Release:	2%{?dist}
Group:		Development/Languages
License:	GPL+
URL:		http://mechanize.rubyforge.org/
Source0:	http://gems.rubyforge.org/gems/%{gemname}-%{version}.gem

BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:	ruby(abi) = %{rubyabi}
BuildRequires:	ruby(rubygems)
Requires:	ruby(abi) = %{rubyabi}
Requires:	ruby(rubygems)
Requires:	rubygem(nokogiri)
Provides:	rubygem(%{gemname}) = %{version}-%{release}
#Requires:	rubygem(hoe)

BuildArch:	noarch

%description
The Mechanize library is used for automating interaction with websites. 
Mechanize automatically stores and sends cookies, follows redirects, 
can follow links, and submit forms. Form fields can be populated and 
submitted. Mechanize also keeps track of the sites that you have 
visited as a history.

%package	doc
Summary:	Documentation for %{name}
Group:		Documentation
# Directory ownership issue
Requires:	%{name} = %{version}-%{release}
Requires:	ruby(rubygems)

%description	doc
This package contains documentation for %{name}.

%package	-n ruby-%{gemname}
Summary:	Non-Gem support package for %{gemname}
Group:		Development/Languages
Requires:	%{name} = %{version}-%{release}
Requires:	ruby(nokogiri)
Provides:	ruby(%{gemname}) = %{version}-%{release}

%description	-n ruby-%{gemname}
This package provides non-Gem support for %{gemname}.

%prep

%build

%install
rm -rf %{buildroot}
mkdir -p %{buildroot}%{gemdir}
gem install \
	--local \
	--install-dir %{buildroot}%{gemdir} \
	--force --rdoc \
	%{SOURCE0}

# Clean up
rm -f %{buildroot}%{geminstdir}/*.gemspec
rm -f %{buildroot}%{geminstdir}/{Rakefile,Manifest.txt}
find %{buildroot}%{geminstdir} -name \*.html -print0 | \
	xargs -0 chmod 0644

# The following method is completely copied from rubygem-gettext
# spec file
#
# Create symlinks
##
## Note that before switching to gem %%{ruby_sitelib}/%%{gemname}
## already existed as a directory, so this cannot be replaced
## by symlink (cpio fails)
## Similarly, all directories under %%{ruby_sitelib} cannot be
## replaced by symlink
#

create_symlink_rec(){

ORIGBASEDIR=$1
TARGETBASEDIR=$2

## First calculate relative path of ORIGBASEDIR 
## from TARGETBASEDIR
TMPDIR=$TARGETBASEDIR
BACKDIR=
DOWNDIR=
num=0
nnum=0
while true
do
	num=$((num+1))
	TMPDIR=$(echo $TMPDIR | sed -e 's|/[^/][^/]*$||')
	DOWNDIR=$(echo $ORIGBASEDIR | sed -e "s|^$TMPDIR||")
	if [ x$DOWNDIR != x$ORIGBASEDIR ]
	then
		nnum=0
		while [ $nnum -lt $num ]
		do
			BACKDIR="../$BACKDIR"
			nnum=$((nnum+1))
		done
		break
	fi
done

RELBASEDIR=$( echo $BACKDIR/$DOWNDIR | sed -e 's|//*|/|g' )

## Next actually create symlink
pushd %{buildroot}/$ORIGBASEDIR
find . -type f | while read f
do
	DIRNAME=$(dirname $f)
	BACK2DIR=$(echo $DIRNAME | sed -e 's|/[^/][^/]*|/..|g')
	mkdir -p %{buildroot}${TARGETBASEDIR}/$DIRNAME
	LNNAME=$(echo $BACK2DIR/$RELBASEDIR/$f | \
		sed -e 's|^\./||' | sed -e 's|//|/|g' | \
		sed -e 's|/\./|/|' )
	ln -s -f $LNNAME %{buildroot}${TARGETBASEDIR}/$f
done
popd

}

create_symlink_rec %{geminstdir}/lib %{ruby_sitelib}


%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc	%{geminstdir}/[A-Z]*.txt
%dir	%{geminstdir}
%{geminstdir}/lib/
%{gemdir}/cache/%{gemname}-%{version}.gem
%{gemdir}/specifications/%{gemname}-%{version}.gemspec

%files	doc
%defattr(-,root,root,-)
%{gemdir}/doc/%{gemname}-%{version}/
%{geminstdir}/examples/
%{geminstdir}/test/

%files	-n ruby-%{gemname}
%defattr(-,root,root,-)
%{ruby_sitelib}/%{gemname}.rb
%{ruby_sitelib}/www/

%changelog
* Tue Jan 20 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.9.0-2
- Some cleanup

* Thu Dec 25 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.9.0-1
- 0.9.0
- Dependency changed: hpricot -> nokogiri

* Sun Dec 21 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.8.5-2
- Switch to Gem

* Wed Nov 26 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.8.5-1
- 0.8.5

* Wed Oct  8 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.8.4-1
- 0.8.4

* Wed Oct  1 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.8.3-1
- 0.8.3

* 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

* Thu Jul 31 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.7.7-1
- 0.7.7

* Thu May 22 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.7.6-1
- 0.7.6

* Thu Mar 20 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.7.5-1
- 0.7.5

* Thu Mar  6 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.7.1-1
- 0.7.1

* Thu Jan 17 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.7.0-1
- 0.7.0

* Thu Dec 13 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.6.11-1
- 0.6.11

* Fri Nov  9 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.6.10-3
- More cleanup

* Sat Nov  3 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.6.10-2
- BR: ruby
- Remove unneeded CFLAGS

* Sat Nov  3 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.6.10-1
- 0.6.10

* Fri Jun  8 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.6.8-1
- Initial packaging


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rubygem-mechanize/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	23 Jan 2009 23:27:13 -0000	1.1
+++ .cvsignore	24 Jan 2009 04:07:24 -0000	1.2
@@ -0,0 +1 @@
+mechanize-0.9.0.gem


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rubygem-mechanize/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	23 Jan 2009 23:27:13 -0000	1.1
+++ sources	24 Jan 2009 04:07:24 -0000	1.2
@@ -0,0 +1 @@
+7bd4fd71b64d1be3212cd3e559e2e669  mechanize-0.9.0.gem



From mtasaka at fedoraproject.org  Sat Jan 24 04:07:55 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Sat, 24 Jan 2009 04:07:55 +0000 (UTC)
Subject: rpms/rubygem-mechanize/devel rubygem-mechanize.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090124040755.64C667010A@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/rubygem-mechanize/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27051/devel

Modified Files:
	.cvsignore sources 
Added Files:
	rubygem-mechanize.spec 
Log Message:
Initial commit


--- NEW FILE rubygem-mechanize.spec ---
# Initially Generated from mechanize-0.8.5.gem by gem2rpm -*- rpm-spec -*-
%define	ruby_sitelib		%(ruby -rrbconfig -e "puts Config::CONFIG['sitelibdir']")
%define	rubyabi		1.8

%define	gemdir			%(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null)
%define	gemname		mechanize
%define	geminstdir		%{gemdir}/gems/%{gemname}-%{version}

Summary:	A handy web browsing ruby object
Name:		rubygem-%{gemname}
Version:	0.9.0
Release:	2%{?dist}
Group:		Development/Languages
License:	GPL+
URL:		http://mechanize.rubyforge.org/
Source0:	http://gems.rubyforge.org/gems/%{gemname}-%{version}.gem

BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:	ruby(abi) = %{rubyabi}
BuildRequires:	ruby(rubygems)
Requires:	ruby(abi) = %{rubyabi}
Requires:	ruby(rubygems)
Requires:	rubygem(nokogiri)
Provides:	rubygem(%{gemname}) = %{version}-%{release}
#Requires:	rubygem(hoe)

BuildArch:	noarch

%description
The Mechanize library is used for automating interaction with websites. 
Mechanize automatically stores and sends cookies, follows redirects, 
can follow links, and submit forms. Form fields can be populated and 
submitted. Mechanize also keeps track of the sites that you have 
visited as a history.

%package	doc
Summary:	Documentation for %{name}
Group:		Documentation
# Directory ownership issue
Requires:	%{name} = %{version}-%{release}
Requires:	ruby(rubygems)

%description	doc
This package contains documentation for %{name}.

%package	-n ruby-%{gemname}
Summary:	Non-Gem support package for %{gemname}
Group:		Development/Languages
Requires:	%{name} = %{version}-%{release}
Requires:	ruby(nokogiri)
Provides:	ruby(%{gemname}) = %{version}-%{release}

%description	-n ruby-%{gemname}
This package provides non-Gem support for %{gemname}.

%prep

%build

%install
rm -rf %{buildroot}
mkdir -p %{buildroot}%{gemdir}
gem install \
	--local \
	--install-dir %{buildroot}%{gemdir} \
	--force --rdoc \
	%{SOURCE0}

# Clean up
rm -f %{buildroot}%{geminstdir}/*.gemspec
rm -f %{buildroot}%{geminstdir}/{Rakefile,Manifest.txt}
find %{buildroot}%{geminstdir} -name \*.html -print0 | \
	xargs -0 chmod 0644

# The following method is completely copied from rubygem-gettext
# spec file
#
# Create symlinks
##
## Note that before switching to gem %%{ruby_sitelib}/%%{gemname}
## already existed as a directory, so this cannot be replaced
## by symlink (cpio fails)
## Similarly, all directories under %%{ruby_sitelib} cannot be
## replaced by symlink
#

create_symlink_rec(){

ORIGBASEDIR=$1
TARGETBASEDIR=$2

## First calculate relative path of ORIGBASEDIR 
## from TARGETBASEDIR
TMPDIR=$TARGETBASEDIR
BACKDIR=
DOWNDIR=
num=0
nnum=0
while true
do
	num=$((num+1))
	TMPDIR=$(echo $TMPDIR | sed -e 's|/[^/][^/]*$||')
	DOWNDIR=$(echo $ORIGBASEDIR | sed -e "s|^$TMPDIR||")
	if [ x$DOWNDIR != x$ORIGBASEDIR ]
	then
		nnum=0
		while [ $nnum -lt $num ]
		do
			BACKDIR="../$BACKDIR"
			nnum=$((nnum+1))
		done
		break
	fi
done

RELBASEDIR=$( echo $BACKDIR/$DOWNDIR | sed -e 's|//*|/|g' )

## Next actually create symlink
pushd %{buildroot}/$ORIGBASEDIR
find . -type f | while read f
do
	DIRNAME=$(dirname $f)
	BACK2DIR=$(echo $DIRNAME | sed -e 's|/[^/][^/]*|/..|g')
	mkdir -p %{buildroot}${TARGETBASEDIR}/$DIRNAME
	LNNAME=$(echo $BACK2DIR/$RELBASEDIR/$f | \
		sed -e 's|^\./||' | sed -e 's|//|/|g' | \
		sed -e 's|/\./|/|' )
	ln -s -f $LNNAME %{buildroot}${TARGETBASEDIR}/$f
done
popd

}

create_symlink_rec %{geminstdir}/lib %{ruby_sitelib}


%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc	%{geminstdir}/[A-Z]*.txt
%dir	%{geminstdir}
%{geminstdir}/lib/
%{gemdir}/cache/%{gemname}-%{version}.gem
%{gemdir}/specifications/%{gemname}-%{version}.gemspec

%files	doc
%defattr(-,root,root,-)
%{gemdir}/doc/%{gemname}-%{version}/
%{geminstdir}/examples/
%{geminstdir}/test/

%files	-n ruby-%{gemname}
%defattr(-,root,root,-)
%{ruby_sitelib}/%{gemname}.rb
%{ruby_sitelib}/www/

%changelog
* Tue Jan 20 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.9.0-2
- Some cleanup

* Thu Dec 25 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.9.0-1
- 0.9.0
- Dependency changed: hpricot -> nokogiri

* Sun Dec 21 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.8.5-2
- Switch to Gem

* Wed Nov 26 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.8.5-1
- 0.8.5

* Wed Oct  8 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.8.4-1
- 0.8.4

* Wed Oct  1 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.8.3-1
- 0.8.3

* 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

* Thu Jul 31 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.7.7-1
- 0.7.7

* Thu May 22 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.7.6-1
- 0.7.6

* Thu Mar 20 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.7.5-1
- 0.7.5

* Thu Mar  6 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.7.1-1
- 0.7.1

* Thu Jan 17 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.7.0-1
- 0.7.0

* Thu Dec 13 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.6.11-1
- 0.6.11

* Fri Nov  9 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.6.10-3
- More cleanup

* Sat Nov  3 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.6.10-2
- BR: ruby
- Remove unneeded CFLAGS

* Sat Nov  3 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.6.10-1
- 0.6.10

* Fri Jun  8 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.6.8-1
- Initial packaging


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rubygem-mechanize/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	23 Jan 2009 23:27:13 -0000	1.1
+++ .cvsignore	24 Jan 2009 04:07:25 -0000	1.2
@@ -0,0 +1 @@
+mechanize-0.9.0.gem


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rubygem-mechanize/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	23 Jan 2009 23:27:13 -0000	1.1
+++ sources	24 Jan 2009 04:07:25 -0000	1.2
@@ -0,0 +1 @@
+7bd4fd71b64d1be3212cd3e559e2e669  mechanize-0.9.0.gem



From mtasaka at fedoraproject.org  Sat Jan 24 04:07:55 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Sat, 24 Jan 2009 04:07:55 +0000 (UTC)
Subject: rpms/rubygem-mechanize/F-9 rubygem-mechanize.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090124040755.1E1237010A@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/rubygem-mechanize/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27051/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	rubygem-mechanize.spec 
Log Message:
Initial commit


--- NEW FILE rubygem-mechanize.spec ---
# Initially Generated from mechanize-0.8.5.gem by gem2rpm -*- rpm-spec -*-
%define	ruby_sitelib		%(ruby -rrbconfig -e "puts Config::CONFIG['sitelibdir']")
%define	rubyabi		1.8

%define	gemdir			%(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null)
%define	gemname		mechanize
%define	geminstdir		%{gemdir}/gems/%{gemname}-%{version}

Summary:	A handy web browsing ruby object
Name:		rubygem-%{gemname}
Version:	0.9.0
Release:	2%{?dist}
Group:		Development/Languages
License:	GPL+
URL:		http://mechanize.rubyforge.org/
Source0:	http://gems.rubyforge.org/gems/%{gemname}-%{version}.gem

BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:	ruby(abi) = %{rubyabi}
BuildRequires:	ruby(rubygems)
Requires:	ruby(abi) = %{rubyabi}
Requires:	ruby(rubygems)
Requires:	rubygem(nokogiri)
Provides:	rubygem(%{gemname}) = %{version}-%{release}
#Requires:	rubygem(hoe)

BuildArch:	noarch

%description
The Mechanize library is used for automating interaction with websites. 
Mechanize automatically stores and sends cookies, follows redirects, 
can follow links, and submit forms. Form fields can be populated and 
submitted. Mechanize also keeps track of the sites that you have 
visited as a history.

%package	doc
Summary:	Documentation for %{name}
Group:		Documentation
# Directory ownership issue
Requires:	%{name} = %{version}-%{release}
Requires:	ruby(rubygems)

%description	doc
This package contains documentation for %{name}.

%package	-n ruby-%{gemname}
Summary:	Non-Gem support package for %{gemname}
Group:		Development/Languages
Requires:	%{name} = %{version}-%{release}
Requires:	ruby(nokogiri)
Provides:	ruby(%{gemname}) = %{version}-%{release}

%description	-n ruby-%{gemname}
This package provides non-Gem support for %{gemname}.

%prep

%build

%install
rm -rf %{buildroot}
mkdir -p %{buildroot}%{gemdir}
gem install \
	--local \
	--install-dir %{buildroot}%{gemdir} \
	--force --rdoc \
	%{SOURCE0}

# Clean up
rm -f %{buildroot}%{geminstdir}/*.gemspec
rm -f %{buildroot}%{geminstdir}/{Rakefile,Manifest.txt}
find %{buildroot}%{geminstdir} -name \*.html -print0 | \
	xargs -0 chmod 0644

# The following method is completely copied from rubygem-gettext
# spec file
#
# Create symlinks
##
## Note that before switching to gem %%{ruby_sitelib}/%%{gemname}
## already existed as a directory, so this cannot be replaced
## by symlink (cpio fails)
## Similarly, all directories under %%{ruby_sitelib} cannot be
## replaced by symlink
#

create_symlink_rec(){

ORIGBASEDIR=$1
TARGETBASEDIR=$2

## First calculate relative path of ORIGBASEDIR 
## from TARGETBASEDIR
TMPDIR=$TARGETBASEDIR
BACKDIR=
DOWNDIR=
num=0
nnum=0
while true
do
	num=$((num+1))
	TMPDIR=$(echo $TMPDIR | sed -e 's|/[^/][^/]*$||')
	DOWNDIR=$(echo $ORIGBASEDIR | sed -e "s|^$TMPDIR||")
	if [ x$DOWNDIR != x$ORIGBASEDIR ]
	then
		nnum=0
		while [ $nnum -lt $num ]
		do
			BACKDIR="../$BACKDIR"
			nnum=$((nnum+1))
		done
		break
	fi
done

RELBASEDIR=$( echo $BACKDIR/$DOWNDIR | sed -e 's|//*|/|g' )

## Next actually create symlink
pushd %{buildroot}/$ORIGBASEDIR
find . -type f | while read f
do
	DIRNAME=$(dirname $f)
	BACK2DIR=$(echo $DIRNAME | sed -e 's|/[^/][^/]*|/..|g')
	mkdir -p %{buildroot}${TARGETBASEDIR}/$DIRNAME
	LNNAME=$(echo $BACK2DIR/$RELBASEDIR/$f | \
		sed -e 's|^\./||' | sed -e 's|//|/|g' | \
		sed -e 's|/\./|/|' )
	ln -s -f $LNNAME %{buildroot}${TARGETBASEDIR}/$f
done
popd

}

create_symlink_rec %{geminstdir}/lib %{ruby_sitelib}


%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc	%{geminstdir}/[A-Z]*.txt
%dir	%{geminstdir}
%{geminstdir}/lib/
%{gemdir}/cache/%{gemname}-%{version}.gem
%{gemdir}/specifications/%{gemname}-%{version}.gemspec

%files	doc
%defattr(-,root,root,-)
%{gemdir}/doc/%{gemname}-%{version}/
%{geminstdir}/examples/
%{geminstdir}/test/

%files	-n ruby-%{gemname}
%defattr(-,root,root,-)
%{ruby_sitelib}/%{gemname}.rb
%{ruby_sitelib}/www/

%changelog
* Tue Jan 20 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.9.0-2
- Some cleanup

* Thu Dec 25 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.9.0-1
- 0.9.0
- Dependency changed: hpricot -> nokogiri

* Sun Dec 21 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.8.5-2
- Switch to Gem

* Wed Nov 26 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.8.5-1
- 0.8.5

* Wed Oct  8 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.8.4-1
- 0.8.4

* Wed Oct  1 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.8.3-1
- 0.8.3

* 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

* Thu Jul 31 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.7.7-1
- 0.7.7

* Thu May 22 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.7.6-1
- 0.7.6

* Thu Mar 20 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.7.5-1
- 0.7.5

* Thu Mar  6 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.7.1-1
- 0.7.1

* Thu Jan 17 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.7.0-1
- 0.7.0

* Thu Dec 13 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.6.11-1
- 0.6.11

* Fri Nov  9 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.6.10-3
- More cleanup

* Sat Nov  3 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.6.10-2
- BR: ruby
- Remove unneeded CFLAGS

* Sat Nov  3 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.6.10-1
- 0.6.10

* Fri Jun  8 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.6.8-1
- Initial packaging


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rubygem-mechanize/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	23 Jan 2009 23:27:13 -0000	1.1
+++ .cvsignore	24 Jan 2009 04:07:24 -0000	1.2
@@ -0,0 +1 @@
+mechanize-0.9.0.gem


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rubygem-mechanize/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	23 Jan 2009 23:27:13 -0000	1.1
+++ sources	24 Jan 2009 04:07:24 -0000	1.2
@@ -0,0 +1 @@
+7bd4fd71b64d1be3212cd3e559e2e669  mechanize-0.9.0.gem



From mwiriadi at fedoraproject.org  Sat Jan 24 04:37:50 2009
From: mwiriadi at fedoraproject.org (Marc Wiriadisastra)
Date: Sat, 24 Jan 2009 04:37:50 +0000 (UTC)
Subject: rpms/mediatomb/devel mediatomb.spec,1.8,1.9
Message-ID: <20090124043750.18F927010A@cvs1.fedora.phx.redhat.com>

Author: mwiriadi

Update of /cvs/pkgs/rpms/mediatomb/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30988

Modified Files:
	mediatomb.spec 
Log Message:
Changed spec for the mysqlclient rebuild




Index: mediatomb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mediatomb/devel/mediatomb.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- mediatomb.spec	1 Dec 2008 14:35:23 -0000	1.8
+++ mediatomb.spec	24 Jan 2009 04:37:19 -0000	1.9
@@ -1,7 +1,7 @@
 Version: 0.11.0
 Summary: UPnP AV MediaServer 
 Name: mediatomb
-Release: 4%{?dist}
+Release: 5%{?dist}
 Summary: MediaTomb - UPnP AV Mediaserver for Linux
 License: GPLv2
 Group: Applications/Multimedia
@@ -99,6 +99,9 @@
 %{_initrddir}/mediatomb
 
 %changelog
+* Sat Jan 24 2009 Marc Wiriadisastra <marc at mwiriadi.id.au> 0.11.0-5
+- Rebuild for mysql dependancy
+
 * Mon Dec  1 2008 Michael Schwendt <mschwendt at fedoraproject.org> 0.11.0-4
 - Include /usr/share/mediatomb directory.
 



From mwiriadi at fedoraproject.org  Sat Jan 24 04:57:13 2009
From: mwiriadi at fedoraproject.org (Marc Wiriadisastra)
Date: Sat, 24 Jan 2009 04:57:13 +0000 (UTC)
Subject: rpms/mediatomb/devel import.log,1.2,1.3
Message-ID: <20090124045713.B49F37010A@cvs1.fedora.phx.redhat.com>

Author: mwiriadi

Update of /cvs/pkgs/rpms/mediatomb/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1320/devel

Modified Files:
	import.log 
Log Message:
Rebuild for mysqlclient




Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/mediatomb/devel/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	7 Oct 2008 12:47:45 -0000	1.2
+++ import.log	24 Jan 2009 04:56:43 -0000	1.3
@@ -1,2 +1,3 @@
 mediatomb-0_11_0-2_fc9:HEAD:mediatomb-0.11.0-2.fc9.src.rpm:1223381865
 mediatomb-0_11_0-3_fc9:HEAD:mediatomb-0.11.0-3.fc9.src.rpm:1223383635
+mediatomb-0_11_0-5_fc10:HEAD:mediatomb-0.11.0-5.fc10.src.rpm:1232772951



From mtasaka at fedoraproject.org  Sat Jan 24 05:22:04 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Sat, 24 Jan 2009 05:22:04 +0000 (UTC)
Subject: rpms/cairo-dock/devel .cvsignore, 1.105, 1.106 cairo-dock.spec,
	1.142, 1.143 sources, 1.105, 1.106
Message-ID: <20090124052204.BE7DF7010A@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/cairo-dock/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4901

Modified Files:
	.cvsignore cairo-dock.spec sources 
Log Message:
* Sat Jan 24 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
- rev 1498



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cairo-dock/devel/.cvsignore,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -r1.105 -r1.106
--- .cvsignore	22 Jan 2009 04:53:04 -0000	1.105
+++ .cvsignore	24 Jan 2009 05:21:34 -0000	1.106
@@ -1 +1 @@
-cairo-dock-sources-svn1496_trunk.tar.bz2
+cairo-dock-sources-svn1498_trunk.tar.bz2


Index: cairo-dock.spec
===================================================================
RCS file: /cvs/extras/rpms/cairo-dock/devel/cairo-dock.spec,v
retrieving revision 1.142
retrieving revision 1.143
diff -u -r1.142 -r1.143
--- cairo-dock.spec	22 Jan 2009 04:53:04 -0000	1.142
+++ cairo-dock.spec	24 Jan 2009 05:21:34 -0000	1.143
@@ -14,7 +14,7 @@
 %undefine		betaver		
 %define		build_webkit	1
 %define		build_xfce	1
-%define		tarballver	svn1496_trunk
+%define		tarballver	svn1498_trunk
 
 %define		fedora_main_rel	3
 
@@ -642,6 +642,9 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Sat Jan 24 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- rev 1498
+
 * Thu Jan 22 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
 - rev 1496
 - Include Wanda directory in Cairo-Penguin plug-in again


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cairo-dock/devel/sources,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -r1.105 -r1.106
--- sources	22 Jan 2009 04:53:04 -0000	1.105
+++ sources	24 Jan 2009 05:21:34 -0000	1.106
@@ -1 +1 @@
-5793909618917764b46b857d3dcd2047  cairo-dock-sources-svn1496_trunk.tar.bz2
+96f655e8730fdf44f548b3a28561ae92  cairo-dock-sources-svn1498_trunk.tar.bz2



From mclasen at fedoraproject.org  Sat Jan 24 05:45:26 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Sat, 24 Jan 2009 05:45:26 +0000 (UTC)
Subject: rpms/gok/devel gok.spec, 1.67, 1.68 gok-1.2.1-fixlogin.patch, 1.1,
	NONE
Message-ID: <20090124054527.08A2E7010A@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gok/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7212

Modified Files:
	gok.spec 
Removed Files:
	gok-1.2.1-fixlogin.patch 
Log Message:
Merge review feedback



Index: gok.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gok/devel/gok.spec,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- gok.spec	20 Jan 2009 18:56:32 -0000	1.67
+++ gok.spec	24 Jan 2009 05:44:56 -0000	1.68
@@ -3,9 +3,9 @@
 Summary: GNOME Onscreen Keyboard
 Name: gok
 Version: 2.25.3
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: LGPLv2+
-Group: Desktop/Accessibility
+Group: User Interface/Desktops
 URL: http://www.gok.ca/
 Source0: http://download.gnome.org/sources/gok/2.25/%{name}-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
@@ -16,7 +16,10 @@
 Requires(post):   scrollkeeper >= 0.1.4
 Requires(preun):   GConf2
 Requires(postun): scrollkeeper >= 0.1.4
+
 Requires:	at-spi
+Requires:	htmlview
+
 BuildRequires:	at-spi-devel
 BuildRequires:	gail-devel
 BuildRequires:  intltool
@@ -25,9 +28,7 @@
 BuildRequires:  libwnck-devel
 BuildRequires:  gnome-speech-devel
 BuildRequires:  gtk-doc
-BuildRequires:  m4
 BuildRequires:  gettext
-BuildRequires:  perl(XML::Parser)
 BuildRequires:  libXt-devel
 BuildRequires:  libXevie-devel
 BuildRequires:  esound-devel
@@ -38,7 +39,7 @@
 built-in accessibility framework.
 
 %package devel
-Summary: Libraries/include files for the Gnome Onscreen Keyboard
+Summary: Libraries/include files for the GNOME Onscreen Keyboard
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
 Requires: libgnomeui-devel 
@@ -50,6 +51,7 @@
 Requires: esound-devel 
 Requires: at-spi-devel
 Requires: pkgconfig
+Requires: gtk-doc
 
 %description devel
 The gok project aims to enable users to control their computer without
@@ -69,6 +71,8 @@
 %configure
 make
 
+iconv -f latin1 -t utf-8 NEWS > NEWSx && mv NEWSx NEWS
+
 # strip unneeded translations from .mo files
 # ideally intltool (ha!) would do that for us
 # http://bugzilla.gnome.org/show_bug.cgi?id=474987
@@ -89,8 +93,6 @@
 make install DESTDIR=$RPM_BUILD_ROOT
 unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
 
-rm -rf $RPM_BUILD_ROOT/var/scrollkeeper
-
 %find_lang %{po_package} --with-gnome
 
 
@@ -137,6 +139,9 @@
 %{_datadir}/gtk-doc/html/gok
 
 %changelog
+* Sat Jan 24 2009 Matthias Clasen <mclasen at redhat.com> - 2.25.3-3
+- Merge review feedback (#225852)
+
 * Tue Jan 20 2009 Matthias Clasen <mclasen at redhat.com> - 2.25.3-2
 - Update to 2.25.3
 
@@ -252,7 +257,7 @@
 - fix memory handling errors 
 
 * Fri Nov 18 2005 Bill Nottingham <notting at redhat.com>
-- with modular X in /usr/%{_lib}, libdir patch isn't needed - remove it
+- with modular X in /usr/%%{_lib}, libdir patch isn't needed - remove it
 
 * Tue Aug 16 2005 Matthias Clasen <mclasen at redhat.com> 
 - Rebuilt


--- gok-1.2.1-fixlogin.patch DELETED ---



From rdieter at fedoraproject.org  Sat Jan 24 05:48:08 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sat, 24 Jan 2009 05:48:08 +0000 (UTC)
Subject: rpms/kdeaccessibility/F-10 .cvsignore, 1.33,
	1.34 kdeaccessibility.spec, 1.62, 1.63 sources, 1.35, 1.36
Message-ID: <20090124054808.A9DC87010A@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdeaccessibility/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7700

Modified Files:
	.cvsignore kdeaccessibility.spec sources 
Log Message:
* Thu Jan 22 2009 Than Ngo <than at redhat.com> - 4.2.0-1
- 4.2.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdeaccessibility/F-10/.cvsignore,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- .cvsignore	7 Jan 2009 10:35:34 -0000	1.33
+++ .cvsignore	24 Jan 2009 05:47:38 -0000	1.34
@@ -1,2 +1,5 @@
 kdeaccessibility-4.1.2.tar.bz2
-kdeaccessibility-4.1.4.tar.bz2
+kdeaccessibility-4.1.80.tar.bz2
+kdeaccessibility-4.1.85.tar.bz2
+kdeaccessibility-4.1.96.tar.bz2
+kdeaccessibility-4.2.0.tar.bz2


Index: kdeaccessibility.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeaccessibility/F-10/kdeaccessibility.spec,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- kdeaccessibility.spec	7 Jan 2009 10:35:34 -0000	1.62
+++ kdeaccessibility.spec	24 Jan 2009 05:47:38 -0000	1.63
@@ -1,7 +1,7 @@
 Summary:        K Desktop Environment - Accessibility
 Name:           kdeaccessibility
 Epoch:          1
-Version:        4.1.4
+Version:        4.2.0
 Release:        1%{?dist}
 
 Group:          User Interface/Desktops
@@ -11,31 +11,34 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: alsa-lib-devel
-BuildRequires: cmake
 BuildRequires: festival
 # workaround (hopefully) temporary borkage
 %ifnarch sparcv9 sparc64
 BuildRequires: flite-devel
 %endif
-BuildRequires: kde-filesystem >= 4
 BuildRequires: kdelibs4-devel >= %{version}
-BuildRequires: kdebase-workspace-devel >= %{version}
+BuildRequires: plasma-devel >= %{version}
+## cmake output to check on
+#-- The KTTSD Epos plugin will be built but the pos executable was not found.
+#-- The KTTSD FreeTTS plugin will be built but the freetts.jar file was not found.
+#-- The KTTSD Hadifix plugin will be built but the txt2pho executable was not found.
+#-- The KTTSD Hadifix plugin will be built but the mbrola executable was not found.
 
-# FIXME/TODO: are there other explicit Requires?
 Requires(post): /sbin/ldconfig xdg-utils
 Requires(postun): /sbin/ldconfig xdg-utils
-%{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
 Requires: kdelibs4 >= %{version}
-Requires: kdebase-workspace >= %{version}
 
-Obsoletes: %{name}-devel < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes: kdeaccessibility-devel < 1:3.5.8 
+
+#noarch ?  -- Rex
 Provides: mono-icon-theme = %{version}-%{release}
 
 %description
 Included with this package are:
-* kmag, a screen magnifier,
-* kmousetool, a program for people whom it hurts to click the mouse,
-* kmouth, program that allows people who have lost their voice
+* kmag: a screen magnifier
+* kmousetool: a program for people whom it hurts to click the mouse
+* kmouth: program that allows people who have lost their voice
+* ktts: text to speech support
 
 
 %prep
@@ -44,7 +47,7 @@
 
 %build
 
-mkdir -p %{_target_platform} 
+mkdir -p %{_target_platform}
 pushd %{_target_platform}
 %{cmake_kde4} ..
 popd
@@ -54,8 +57,7 @@
 
 %install
 rm -rf %{buildroot}
-
-make install DESTDIR=%{buildroot} -C %{_target_platform}
+make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
 
 %clean
@@ -95,11 +97,38 @@
 %{_kde4_libdir}/lib*.so.*
 %{_kde4_libdir}/lib*.so
 %{_kde4_libdir}/kde4/*
+%{_mandir}/*/*.gz
 
 
 %changelog
-* Wed Jan 07 2009 Than Ngo <than at redhat.com> - 4.1.4-1
-- 4.1.4
+* Thu Jan 22 2009 Than Ngo <than at redhat.com> - 4.2.0-1
+- 4.2.0
+
+* Fri Jan 09 2009 Lorenzo Villani <lvillani at binaryhelix.net> - 1:4.1.96-2
+- rebuilt
+- fix file list
+
+* Wed Jan 07 2009 Than Ngo <than at redhat.com> - 4.1.96-1
+- 4.2rc1
+
+* Thu Dec 11 2008 Than Ngo <than at redhat.com> -  4.1.85-1
+- 4.2beta2
+
+* Thu Dec 04 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.80-4
+- rebuild for fixed kde-filesystem (macros.kde4) (get rid of rpaths)
+
+* Thu Dec 04 2008 Rex Dieter <rdieter at fedoraproject.or> 4.1.80-3
+- drop (Build)Requires: kdebase-workspace(-devel)
+- BR: plasma-devel
+- better, versioned Obsoletes: kdeaccessibility-devel ...
+
+* Thu Nov 20 2008 Than Ngo <than at redhat.com> 4.1.80-2
+- remove duplicated BR on cmake, it's already done in kdelibs-devel
+
+* Wed Nov 19 2008 Lorenzo Villani <lvillani at binaryhelix.net> - 1:4.1.80-1
+- 4.1.80
+- BR cmake >= 2.6.2
+- make install/fast
 
 * Tue Nov 11 2008 Than Ngo <than at redhat.com> 4.1.3-1
 - KDE 4.1.3
@@ -252,7 +281,7 @@
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1:3.5.1-1.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 
-* Fri Feb 03 2006 Than Ngo <than at redhat.com> 1:3.5.1-1 
+* Fri Feb 03 2006 Than Ngo <than at redhat.com> 1:3.5.1-1
 - 3.5.1
 
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdeaccessibility/F-10/sources,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- sources	7 Jan 2009 10:35:34 -0000	1.35
+++ sources	24 Jan 2009 05:47:38 -0000	1.36
@@ -1 +1 @@
-da6c157741d73eb1445cd60d9b78cd2e  kdeaccessibility-4.1.4.tar.bz2
+f32f24c4f07906b7af39ca18d47b5e27  kdeaccessibility-4.2.0.tar.bz2



From rdieter at fedoraproject.org  Sat Jan 24 05:52:56 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sat, 24 Jan 2009 05:52:56 +0000 (UTC)
Subject: rpms/kdebase/F-10 kdebase-4.1.70-konsole-session.patch, NONE,
	1.1 kdebase-4.1.80-nsplugins-paths.patch, NONE,
	1.1 kdebase-4.1.2-konsole-kde#156636.patch, 1.3,
	NONE kdebase-4.1.2-konsole-session-1.patch, 1.3,
	NONE kdebase-4.1.2-konsole-session.patch, 1.1,
	NONE kdebase-nsplugins-paths.patch, 1.1, NONE
Message-ID: <20090124055256.BDC067010A@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdebase/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9132

Added Files:
	kdebase-4.1.70-konsole-session.patch 
	kdebase-4.1.80-nsplugins-paths.patch 
Removed Files:
	kdebase-4.1.2-konsole-kde#156636.patch 
	kdebase-4.1.2-konsole-session-1.patch 
	kdebase-4.1.2-konsole-session.patch 
	kdebase-nsplugins-paths.patch 
Log Message:
* Thu Jan 22 2009 Than Ngo <than at redhat.com> - 4.2.0-1
- 4.2.0


kdebase-4.1.70-konsole-session.patch:

--- NEW FILE kdebase-4.1.70-konsole-session.patch ---
diff -Naur kdebase-4.1.70/apps/konsole/src/ViewManager.cpp kdebase-4.1.70.konsole-session/apps/konsole/src/ViewManager.cpp
--- kdebase-4.1.70/apps/konsole/src/ViewManager.cpp	2008-10-09 11:46:34.000000000 +0200
+++ kdebase-4.1.70.konsole-session/apps/konsole/src/ViewManager.cpp	2008-10-29 16:14:04.000000000 +0100
@@ -885,7 +885,7 @@
         Q_ASSERT(view);
         Session *session = _sessionMap[view];
         ids << SessionManager::instance()->getRestoreId(session);
-        if (view == activeview) group.writeEntry("Active", tab);
+        if (view == activeview) group.writeEntry("ActiveTabIndex", tab);
         unique.insert(session, 1);
         tab++;
     }
@@ -905,24 +905,37 @@
 void ViewManager::restoreSessions(const KConfigGroup& group)
 {
     QList<int> ids = group.readEntry("Sessions", QList<int>());
-    int activeTab  = group.readEntry("Active", 0);
-    TerminalDisplay *display = 0;
 
-    int tab = 1;
-    foreach(int id, ids)
+    if (ids.isEmpty())
     {
-        Session *session = SessionManager::instance()->idToSession(id);
+        // Incomplete session file, e.g. from a KDE3 session. Create a
+        // default session so that we don't end up with an empty window.
+        kWarning() << i18n("Unable to restore saved tabs. Possibly unsupported KDE 3 session data.");
+        Session *session = SessionManager::instance()->createSession();
         createView(session);
-        if (!session->isRunning())
-            session->run();
-        if (tab++ == activeTab)
-            display = dynamic_cast<TerminalDisplay*>(activeView());
+        session->run();
     }
-
-    if (display)
+    else
     {
-        _viewSplitter->activeContainer()->setActiveView(display);
-        display->setFocus(Qt::OtherFocusReason);
+        int activeTab = group.readEntry("ActiveTabIndex", 0);
+        int tab = 1;
+        QWidget *focusView = 0;
+
+        foreach(int id, ids)
+        {
+            Session *session = SessionManager::instance()->idToSession(id);
+            createView(session);
+            if (!session->isRunning())
+                session->run();
+            if (tab++ == activeTab)
+                focusView = activeView();
+        }
+
+        if (focusView)
+        {
+            _viewSplitter->activeContainer()->setActiveView(focusView);
+            focusView->setFocus(Qt::OtherFocusReason);
+        }
     }
 }
 

kdebase-4.1.80-nsplugins-paths.patch:

--- NEW FILE kdebase-4.1.80-nsplugins-paths.patch ---
diff -Naur kdebase-4.1.80/apps/konqueror/settings/konqhtml/pluginopts.cpp kdebase-4.1.80.nsplugins-path/apps/konqueror/settings/konqhtml/pluginopts.cpp
--- kdebase-4.1.80/apps/konqueror/settings/konqhtml/pluginopts.cpp	2008-10-19 18:53:24.000000000 +0200
+++ kdebase-4.1.80.nsplugins-path/apps/konqueror/settings/konqhtml/pluginopts.cpp	2008-11-23 22:43:09.000000000 +0100
@@ -430,6 +430,8 @@
         paths.append("/usr/lib/mozilla/plugins");
 	paths.append("/usr/lib64/netscape/plugins");
 	paths.append("/usr/lib64/mozilla/plugins");
+	paths.append("/usr/lib64/mozilla/plugins-wrapped");
+	paths.append("/usr/lib/mozilla/plugins-wrapped");
         paths.append("$MOZILLA_HOME/plugins");
     }

diff -Naur kdebase-4.1.80/apps/nsplugins/plugin_paths.cpp kdebase-4.1.80.nsplugins-path/apps/nsplugins/plugin_paths.cpp
--- kdebase-4.1.80/apps/nsplugins/plugin_paths.cpp	2008-11-11 22:58:32.000000000 +0100
+++ kdebase-4.1.80.nsplugins-path/apps/nsplugins/plugin_paths.cpp	2008-11-23 22:43:09.000000000 +0100
@@ -54,6 +54,8 @@
         paths.append("/usr/lib/mozilla/plugins");
 	paths.append("/usr/lib64/netscape/plugins");
 	paths.append("/usr/lib64/mozilla/plugins");
+	paths.append("/usr/lib64/mozilla/plugins-wrapped");
+	paths.append("/usr/lib/mozilla/plugins-wrapped");
         paths.append("$MOZILLA_HOME/plugins");
         config.writeEntry( "scanPaths", paths );
     }


--- kdebase-4.1.2-konsole-kde#156636.patch DELETED ---


--- kdebase-4.1.2-konsole-session-1.patch DELETED ---


--- kdebase-4.1.2-konsole-session.patch DELETED ---


--- kdebase-nsplugins-paths.patch DELETED ---



From rdieter at fedoraproject.org  Sat Jan 24 05:55:33 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sat, 24 Jan 2009 05:55:33 +0000 (UTC)
Subject: rpms/kdeedu/F-10 .cvsignore, 1.55, 1.56 kdeedu.spec, 1.136,
	1.137 sources, 1.59, 1.60
Message-ID: <20090124055533.A13127010A@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdeedu/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9453

Modified Files:
	.cvsignore kdeedu.spec sources 
Log Message:
* Thu Jan 22 2009 Than Ngo <than at redhat.com> - 4.2.0-1
- 4.2.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdeedu/F-10/.cvsignore,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- .cvsignore	8 Jan 2009 22:53:26 -0000	1.55
+++ .cvsignore	24 Jan 2009 05:55:03 -0000	1.56
@@ -1 +1,3 @@
-kdeedu-4.1.4.tar.bz2
+kdeedu-4.1.85.tar.bz2
+kdeedu-4.1.96.tar.bz2
+kdeedu-4.2.0.tar.bz2


Index: kdeedu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeedu/F-10/kdeedu.spec,v
retrieving revision 1.136
retrieving revision 1.137
diff -u -r1.136 -r1.137
--- kdeedu.spec	8 Jan 2009 23:14:28 -0000	1.136
+++ kdeedu.spec	24 Jan 2009 05:55:03 -0000	1.137
@@ -12,24 +12,20 @@
 %endif
 
 Name:    kdeedu
-Summary: Educational/Edutainment applications 
-Version: 4.1.4
+Summary: Educational/Edutainment applications
+Version: 4.2.0
 Release: 1%{?dist}
 
 License: GPLv2
 Group:	 Amusements/Games
 URL:     http://www.kde.org/
-Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdeedu-%{version}.tar.bz2
+Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdeedu-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # http://bugzilla.redhat.com/371121
 Obsoletes: kalgebra < 1:0.7-7
 Provides:  kalgebra = 1:0.7-7
 
-# http://bugzilla.redhat.com/394011
-Obsoletes: marble < 1:0.5.1-1
-Provides:  marble = 1:0.5.1-1
-
 Obsoletes: kdeedu4 < %{version}-%{release}
 Provides:  kdeedu4 = %{version}-%{release}
 
@@ -37,18 +33,13 @@
 BuildRequires: boost-devel
 # CFITSIO Library is needed by KStars for many INDI drivers & for KStars FITS Viewer.
 BuildRequires: cfitsio-devel
-BuildRequires: cmake 
 BuildRequires: desktop-file-utils
 BuildRequires: eigen-devel
-BuildRequires: giflib-devel
 BuildRequires: gmm-devel
 BuildRequires: gpsd-devel
 BuildRequires: gsl-devel
-# for libplasma
-BuildRequires: kdebase-workspace-devel >= %{version}
-BuildRequires: kdelibs4-devel >= %{version}
+BuildRequires: plasma-devel >= %{version}
 # for macros.kde4
-BuildRequires: kde-filesystem
 BuildRequires: libnova-devel
 BuildRequires: libqalculate-devel
 BuildRequires: libusb-devel
@@ -59,17 +50,25 @@
 BuildRequires: ocaml-facile-devel
 %endif
 BuildRequires: openbabel-devel >= 2.2.0-0.4.b5
-BuildRequires: pcre-devel
 BuildRequires: python-devel python
 BuildRequires: readline-devel
+BuildRequires: python-devel
+
 ## BR's FIXME/TODO:
-#+ libsbigudrv, 1.00: SBIG Universal Driver is needed by KStars <http://indi.sourceforge.net/>
+#-- The following OPTIONAL packages could NOT be located on your system.
+#+ Experimental Python binding support for the Marble library: Experimental Python binding support for the Marble library <http://techbase.kde.org/Development/Languages/Python>
+#Experimental Python binding support for the Marble library. To activate it pass -DEXPERIMENTAL_PYTHON_BINDINGS=TRUE to cmake.
+#+ libindi, 0.6 or higher: A framework for controlling astronomical devices such as telescopes, CCDs, filter wheels..etc. <http://indi.sf.net>
+#Gives KStars support for controlling astronomical devices.
 
 %{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
 Requires: %{name}-libs = %{version}-%{release}
 # split pkgs, (temporary?) upgrade path -- Rex
 Requires: %{name}-kstars = %{version}-%{release}
+Requires: %{name}-marble = %{version}-%{release}
 Requires: %{name}-math = %{version}-%{release}
+# khangman
+Requires: dustin-dustismo-fonts-roman
 Requires(post): xdg-utils
 Requires(postun): xdg-utils
 
@@ -82,10 +81,9 @@
 * khangman: Hangman Game
 * kiten: Japanese Reference/Study Tool
 * klettres: French alphabet tutor
-* ktouch: Learn and practice touch typing 
+* ktouch: Learn and practice touch typing
 * kturtle: Logo Programming Environment
 * kwordquiz: Flashcard and vocabulary learning
-* marble: A World Atlas 
 * parley: Vocabulary Trainer
 * step: Interactive physical simulator
 
@@ -97,28 +95,41 @@
 
 %package devel
 Group:    Development/Libraries
-Summary:  Developer files for %{name} 
+Summary:  Developer files for %{name}
 Requires: %{name}-libs = %{version}-%{release}
+# libmarble
+Requires: %{name}-marble = %{version}-%{release}
 Obsoletes: kdeedu4-devel < %{version}-%{release}
 Provides:  kdeedu4-devel = %{version}-%{release}
 # http://bugzilla.redhat.com/394011
 Obsoletes: marble-devel < 1:0.5.1-1
-Provides:  marble-devel = 1:0.5.1-1
+Provides:  marble-devel = 1:0.7-%{release}
 Requires: kdelibs4-devel
-Requires: giflib-devel
-Requires: pcre-devel
 %description devel
 %{summary}.
 
 %package kstars
 Group:   Amusements/Games
-Summary: Desktop Planetarium 
+Summary: Desktop Planetarium
 Requires: %{name}-libs = %{version}-%{release}
 Requires(post): xdg-utils
 Requires(postun): xdg-utils
 %description kstars
 %{summary}.
 
+%package marble 
+Summary: A World Atlas
+Group:   Amusements/Games
+# http://bugzilla.redhat.com/394011
+Obsoletes: marble < 1:0.5.1-1
+Provides:  marble = 1:0.7-%{release}
+Requires: %{name}-libs = %{version}-%{release}
+Requires(post): xdg-utils
+Requires(postun): xdg-utils
+%description marble 
+%{summary}.
+
+
 %package math
 Group:	 Amusements/Games
 Summary: Math applications
@@ -129,10 +140,9 @@
 %description math
 Educational/Edutainment Math applications:
 * kalgebra: MathML-based graph calculator
-* kbruch: Exercise Fractions
+* kbruch: Exercise Fractions and Percentages
 * kig: Interactive Geometry
 * kmplot: Mathematical Function Plotter
-* kpercentage: Excersize Percentages
 
 
 %prep
@@ -158,13 +168,16 @@
 # omit stuff for which there isn't a clear public API
 rm -f %{buildroot}%{_kde4_libdir}/lib{SatLib,analitza,compoundviewer,htmesh,sbigudrv}.{a,so}
 
+# omti dustismo roman font
+rm -f %{buildroot}%{_kde4_appsdir}/khangman/fonts/Dustismo_Roman.ttf
+
 
 %post
 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 
+%postun
 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 || :
@@ -179,10 +192,18 @@
 %postun kstars
 xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
 
-%post math 
+%post marble 
+/sbin/ldconfig
+xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
+
+%postun marble 
+/sbin/ldconfig
+xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
+
+%post math
 xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
 
-%postun math 
+%postun math
 xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
 
 
@@ -195,7 +216,6 @@
 # FIXME/TODO : sort file list into per-app sections. ? -- Rex
 %{_kde4_bindir}/blinken
 %{_kde4_bindir}/geodatatest
-%{_kde4_bindir}/indi*
 %{_kde4_bindir}/kalzium
 %{_kde4_bindir}/kanagram
 %{_kde4_bindir}/kgeography
@@ -207,7 +227,6 @@
 %{_kde4_bindir}/ktouch
 %{_kde4_bindir}/kturtle
 %{_kde4_bindir}/kwordquiz
-%{_kde4_bindir}/marble
 %{_kde4_bindir}/parley
 %{_kde4_bindir}/step
 %{_kde4_bindir}/tilecreator
@@ -226,19 +245,22 @@
 %{_kde4_appsdir}/kturtle/
 %{_kde4_appsdir}/kvtml/
 %{_kde4_appsdir}/kwordquiz/
-%{_kde4_appsdir}/marble/
-%{_kde4_appsdir}/marble_part/
 %{_kde4_appsdir}/parley/
 %{_kde4_appsdir}/step/
 
-%{_kde4_datadir}/kde4/services/marble_part.desktop
+%{_kde4_datadir}/kde4/services/plasma-applet-kworldclock.desktop
 %{_kde4_datadir}/kde4/services/plasma-dataengine-parley.desktop
 %{_kde4_datadir}/kde4/services/plasma_parley.desktop
+%{_kde4_datadir}/kde4/services/plasma-dataengine-kalzium.desktop
+%{_kde4_datadir}/kde4/services/plasma_didyouknow.desktop
 
-%{_kde4_libdir}/kde4/libmarble_part.so
 %{_kde4_libdir}/kde4/plasma_applet_kalgebra.so
+%{_kde4_libdir}/kde4/plasma_applet_worldclock.so
 %{_kde4_libdir}/kde4/plasma_applet_parley.so
 %{_kde4_libdir}/kde4/plasma_engine_parley.so
+%{_kde4_libdir}/kde4/plasma_applet_didyouknow.so
+%{_kde4_libdir}/kde4/plasma_engine_kalzium.so
+
 %{_kde4_datadir}/applications/kde4/blinken.desktop
 %{_kde4_datadir}/applications/kde4/kalzium.desktop
 %{_kde4_datadir}/applications/kde4/kanagram.desktop
@@ -249,7 +271,6 @@
 %{_kde4_datadir}/applications/kde4/ktouch.desktop
 %{_kde4_datadir}/applications/kde4/kturtle.desktop
 %{_kde4_datadir}/applications/kde4/kwordquiz.desktop
-%{_kde4_datadir}/applications/kde4/marble.desktop
 %{_kde4_datadir}/applications/kde4/parley.desktop
 %{_kde4_datadir}/applications/kde4/step.desktop
 
@@ -264,7 +285,6 @@
 %{_kde4_datadir}/config.kcfg/ktouch.kcfg
 %{_kde4_datadir}/config.kcfg/kwordquiz.kcfg
 %{_kde4_datadir}/config.kcfg/languagesettings.kcfg
-%{_kde4_datadir}/config.kcfg/marble.kcfg
 %{_kde4_datadir}/config.kcfg/parley.kcfg
 %{_kde4_datadir}/config.kcfg/step.kcfg
 %{_kde4_datadir}/config/kalzium.knsrc
@@ -285,7 +305,6 @@
 %{_kde4_docdir}/HTML/en/ktouch/
 %{_kde4_docdir}/HTML/en/kturtle
 %{_kde4_docdir}/HTML/en/kwordquiz/
-%{_kde4_docdir}/HTML/en/marble/
 %{_kde4_docdir}/HTML/en/parley/
 %{_kde4_docdir}/HTML/en/step/
 
@@ -299,28 +318,25 @@
 %{_kde4_iconsdir}/hicolor/*/*/ktouch.*
 %{_kde4_iconsdir}/hicolor/*/*/kturtle.*
 %{_kde4_iconsdir}/hicolor/*/*/kwordquiz.*
-%{_kde4_iconsdir}/hicolor/*/*/marble.*
 %{_kde4_iconsdir}/hicolor/*/*/parley*.*
 %{_kde4_iconsdir}/hicolor/*/*/step.*
 %{_kde4_iconsdir}/oxygen/*/*/*
 
-%{_kde4_libdir}/avogadro-kalzium/
-# marble
-%{_kde4_libdir}/libcompoundviewer.so.*
+%{_mandir}/man1/kalzium.*
+%{_mandir}/man1/ktouch.*
+%{_mandir}/man6/khangman.*
 
-%files libs 
+%files libs
 %defattr(-,root,root,-)
 %doc COPYING README
 %{_kde4_libdir}/libanalitza.so.*
+%{_kde4_libdir}/avogadro-kalzium/
 %{_kde4_libdir}/libavogadro-kalzium.so.*
+%{_kde4_appsdir}/libkdeedu/
 %{_kde4_libdir}/libkdeedu*.so.*
 %{_kde4_libdir}/libkeduvocdocument.so.*
 %{_kde4_libdir}/libkiten.so.*
-%{_kde4_libdir}/libmarble*.so.*
-%{_kde4_libdir}/libsbigudrv.so.*
 %{_kde4_libdir}/libscience.so.*
-%{_kde4_appsdir}/libkdeedu/
-%{_kde4_libdir}/kde4/plugins/marble/
 
 %files devel
 %defattr(-,root,root,-)
@@ -332,8 +348,8 @@
 %{_kde4_libdir}/libkdeedu*.so
 %{_kde4_libdir}/libkeduvocdocument.so
 %{_kde4_libdir}/libkiten.so
-%{_kde4_libdir}/libmarble*.so
 %{_kde4_libdir}/libscience.so
+%{_kde4_libdir}/libmarble*.so
 %{_kde4_libdir}/kde4/plugins/designer/kalziumuiwidgets.so
 
 %files kstars
@@ -347,6 +363,21 @@
 %{_kde4_iconsdir}/hicolor/*/*/kstars.*
 %{_kde4_libdir}/libSatLib.so.*
 
+%files marble
+%defattr(-,root,root,-)
+%{_kde4_appsdir}/marble/
+%{_kde4_appsdir}/marble_part/
+%{_kde4_bindir}/marble
+%{_kde4_datadir}/applications/kde4/marble.desktop
+%{_kde4_datadir}/config.kcfg/marble.kcfg
+%{_kde4_datadir}/kde4/services/marble_part.desktop
+%{_kde4_docdir}/HTML/en/marble/
+%{_kde4_libdir}/libcompoundviewer.so.*
+%{_kde4_libdir}/libmarble*.so.*
+%{_kde4_libdir}/kde4/libmarble_part.so
+%{_kde4_libdir}/kde4/plugins/marble/
+%{_kde4_iconsdir}/hicolor/*/*/marble.*
+
 %files math
 %defattr(-,root,root,-)
 %doc COPYING README
@@ -355,7 +386,6 @@
 %{_kde4_bindir}/kbruch
 %{_kde4_bindir}/kig
 %{_kde4_bindir}/kmplot
-%{_kde4_bindir}/kpercentage
 %{_kde4_bindir}/pykig.*
 %{_kde4_libdir}/kde4/kigpart.*
 %{_kde4_libdir}/kde4/libkmplotpart.*
@@ -363,11 +393,9 @@
 %{_kde4_datadir}/applications/kde4/kbruch.desktop
 %{_kde4_datadir}/applications/kde4/kig.desktop
 %{_kde4_datadir}/applications/kde4/kmplot.desktop
-%{_kde4_datadir}/applications/kde4/kpercentage.desktop
 %{_kde4_datadir}/config.kcfg/kbruch.kcfg
 %{_kde4_datadir}/config.kcfg/kmplot.kcfg
 %{_datadir}/dbus-1/interfaces/org.kde.kmplot.*
-%{_kde4_docdir}/HTML/en/kpercentage/
 %{_kde4_docdir}/HTML/en/kalgebra/
 %{_kde4_docdir}/HTML/en/kbruch/
 %{_kde4_docdir}/HTML/en/kig/
@@ -376,27 +404,88 @@
 %{_kde4_iconsdir}/hicolor/*/*/kbruch.*
 %{_kde4_iconsdir}/hicolor/*/*/kig.*
 %{_kde4_iconsdir}/hicolor/*/*/kmplot.*
-%{_kde4_iconsdir}/hicolor/*/*/kpercentage.*
 %{_kde4_iconsdir}/hicolor/*/*/application-x-kig.*
 %{_kde4_appsdir}/katepart/syntax/python-kig.xml
 %{_kde4_appsdir}/kbruch/
 %{_kde4_appsdir}/kig/
 %{_kde4_appsdir}/kmplot/
-%{_kde4_appsdir}/kpercentage/
 %{_kde4_datadir}/kde4/services/kalgebraplasmoid.desktop
 %{_kde4_datadir}/kde4/services/kig_part.desktop
 %{_kde4_datadir}/kde4/services/kmplot_part.desktop
+%{_mandir}/man1/kbruch.*
+%{_mandir}/man1/kig.*
+%{_mandir}/man1/kmplot.*
 
 
 %changelog
-* Thu Jan  8 2009 Luk???? Tinkl <ltinkl at redhat.com> 4.1.4-1
-- KDE 4.1.4
+* Thu Jan 22 2009 Than Ngo <than at redhat.com> - 4.2.0-1
+- 4.2.0
+
+* Mon Jan 12 2009 Rex Dieter <rdieter at fedoraproject.org> 4.1.96-4
+- drop extraneous giflib pcre deps
 
-* Thu Dec 18 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.3-2
+* Mon Jan 12 2009 Rex Dieter <rdieter at fedoraproject.org> 4.1.96-3
+- sane marble packaging (#470577)
+- use system dustismo-roman font (#477406)
+
+* Fri Jan 09 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.96-2
+- drop upstreamed cfitsio patch
+- package manpages
+
+* Wed Jan 07 2009 Than Ngo <than at redhat.com> 4.1.96-1
+- 4.2rc1
+
+* Thu Dec 18 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.85-5
+- and fix cfitsio detection yet again (upstream revision 898747)
+
+* Thu Dec 18 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.85-4
 - respin (upstreamable) cfitsio patch
 
-* Wed Nov 12 2008 Than Ngo <than at redhat.com> 4.1.3-1
-- 4.1.3
+* Thu Dec 18 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.85-3
+- fix cfitsio detection yet again
+
+* Thu Dec 18 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.85-2
+- rebuild for new boost
+
+* Fri Dec 12 2008 Than Ngo <than at redhat.com> 4.1.85-1
+- 4.2beta2
+
+* Fri Dec 05 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.80-9
+- rebuild for fixed kde-filesystem (macros.kde4) (get rid of rpaths)
+
+* Thu Dec 04 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 4.1.80-8
+- Rebuild for Python 2.6
+
+* Tue Dec 02 2008 Steven M. Parrish <smparrish at shallowcreek.net> 4.1.80-7
+- rebuild for gmm 3.1 
+
+* Mon Dec 01 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.80-6
+- rebuild for Python 2.6
+
+* Mon Dec 01 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.80-5
+- BR plasma-devel instead of kdebase-workspace-devel
+- fix file list
+
+* Sun Nov 30 2008 Lorenzo Villani <lvillani at binaryhelix.net> - 4.1.80-4
+- adjust file lists (and fix build)
+
+* Thu Nov 20 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.80-3
+- readd kbruch, has been reenabled in 4.1.80
+- remove kpercentage, has been dropped in favor of percentage exercises newly
+  added to kbruch
+
+* Thu Nov 20 2008 Than Ngo <than at redhat.com> 4.1.80-2
+- merged
+
+* Thu Nov 20 2008 Lorenzo Villani <lvillani at binaryhelix.net> - 4.1.80-1
+- 4.1.80
+- BR cmake 2.6.2
+- BR python-devel
+- make install/fast
+- drop kbruch and related files from filelists
+
+* Mon Nov 10 2008 Luk???? Tinkl <ltinkl at redhat.com> 4.1.3-1
+- KDE 4.1.3
 
 * Mon Sep 29 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-2
 - make VERBOSE=1
@@ -536,7 +625,7 @@
 - kde-3.96.0
 
 * Fri Nov 09 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.95.2-1
-- kdeedu-3.95.2 
+- kdeedu-3.95.2
 - resume ppc, ppc64 builds (#370771)
 
 * Wed Nov 07 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.95.0-4
@@ -606,7 +695,7 @@
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 3.5.1-1.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 
-* Sat Feb 04 2006 Than Ngo <than at redhat.com> 3.5.1-1 
+* Sat Feb 04 2006 Than Ngo <than at redhat.com> 3.5.1-1
 - 3.5.1
 
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
@@ -616,7 +705,7 @@
 - 3.5 final
 
 * Fri Nov 11 2005 Than Ngo <than at redhat.com> 3.4.92-2
-- fix #172887 
+- fix #172887
 
 * Tue Oct 25 2005 Than Ngo <than at redhat.com> 3.4.92-1
 - update to 3.5 beta2
@@ -646,7 +735,7 @@
 * Fri Mar 04 2005 Than Ngo <than at redhat.com> 3.4.0-0.rc1.2
 - rebuilt against gcc-4.0.0-0.31
 
-* Tue Mar 01 2005 Than Ngo <than at redhat.com> 3.4.0-0.rc1.1 
+* Tue Mar 01 2005 Than Ngo <than at redhat.com> 3.4.0-0.rc1.1
 - 3.4.0 rc1
 
 * Wed Feb 16 2005 Than Ngo <than at redhat.com> 3.3.92-0.1
@@ -781,7 +870,7 @@
 * Fri Aug  9 2002 Than Ngo <than at redhat.com> 3.0.2-3
 - desktop file issues
 - fixed a bug in install (bug #69414)
- 
+
 * Tue Jul 23 2002 Tim Powers <timp at redhat.com> 3.0.2-2
 - build using gcc-3.2-0.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdeedu/F-10/sources,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- sources	8 Jan 2009 22:53:26 -0000	1.59
+++ sources	24 Jan 2009 05:55:03 -0000	1.60
@@ -1 +1 @@
-28840fa475571184994824d12a0b7684  kdeedu-4.1.4.tar.bz2
+aaddbdab29e1d284ad8ee67a78b4c597  kdeedu-4.2.0.tar.bz2



From rdieter at fedoraproject.org  Sat Jan 24 05:57:09 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sat, 24 Jan 2009 05:57:09 +0000 (UTC)
Subject: rpms/kdegames/F-10 .cvsignore, 1.59, 1.60 kdegames.spec, 1.107,
	1.108 sources, 1.63, 1.64
Message-ID: <20090124055709.C73337010A@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdegames/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9732

Modified Files:
	.cvsignore kdegames.spec sources 
Log Message:
* Thu Jan 22 2009 Than Ngo <than at redhat.com> - 4.2.0-1
- 4.2.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdegames/F-10/.cvsignore,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- .cvsignore	9 Jan 2009 00:04:59 -0000	1.59
+++ .cvsignore	24 Jan 2009 05:56:39 -0000	1.60
@@ -1 +1,5 @@
-kdegames-4.1.4.tar.bz2
+kdegames-4.1.2.tar.bz2
+kdegames-4.1.80.tar.bz2
+kdegames-4.1.85.tar.bz2
+kdegames-4.1.96.tar.bz2
+kdegames-4.2.0.tar.bz2


Index: kdegames.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdegames/F-10/kdegames.spec,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -r1.107 -r1.108
--- kdegames.spec	9 Jan 2009 00:04:59 -0000	1.107
+++ kdegames.spec	24 Jan 2009 05:56:39 -0000	1.108
@@ -1,15 +1,14 @@
-%define _default_patch_fuzz 2
 %{!?_ggz_datadir:%define _ggz_datadir %(ggz-config --datadir >& /dev/null ||:)}
 
 Name:    kdegames
 Summary: K Desktop Environment 4 - Games
 Epoch:   6
-Version: 4.1.4
+Version: 4.2.0
 Release: 1%{?dist}
 
 License: GPLv2
 URL:     http://www.kde.org/
-Group:   Amusements/Games 
+Group:   Amusements/Games
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdegames-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -22,11 +21,9 @@
 Obsoletes: ksirk < %{version}-%{release}
 Provides:  ksirk = %{version}-%{release}
 
-BuildRequires: cmake 
 BuildRequires: ggz-client-libs-devel
 BuildRequires: kdelibs4-devel >= %{version}
-# for macros.kde4
-BuildRequires: kde-filesystem
+BuildRequires: qca2-devel
 
 %{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
 Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}
@@ -36,7 +33,9 @@
 
 %description
 Games for the K Desktop Environment 4, including:
+* bomber
 * bovo
+* kapman
 * katomic
 * kbackgammon
 * kbattleship
@@ -47,6 +46,7 @@
 * kdiamond
 * kfourinline
 * kgoldrunner
+* killbots
 * kiriki
 * kjumpingcube
 * klines
@@ -103,7 +103,7 @@
 %install
 rm -rf %{buildroot}
 
-make install DESTDIR=%{buildroot} -C %{_target_platform}
+make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
 # HACK, FIXME
 install -m644 -p -D ./kbattleship/src/module.dsc %{buildroot}%{_ggz_datadir}/kbattleship.dsc
@@ -130,7 +130,7 @@
 %{_ggz_config} --remove --modfile=%{_ggz_datadir}/ksquares.dsc ||:
 fi
 
-%postun 
+%postun
 xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
 xdg-icon-resource forceupdate --theme locolor 2> /dev/null || :
 xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || :
@@ -152,6 +152,8 @@
 %{_kde4_appsdir}/*
 %exclude %{_kde4_appsdir}/cmake/
 %{_kde4_configdir}/*
+%{_kde4_datadir}/sounds/*.ogg
+%{_kde4_datadir}/sounds/*/*.ogg
 %{_kde4_datadir}/applications/kde4/*
 %{_kde4_datadir}/config.kcfg/*
 %{_kde4_docdir}/HTML/en/*
@@ -162,7 +164,7 @@
 %{_ggz_datadir}/kreversi.dsc
 %{_ggz_datadir}/ksquares.dsc
 
-%files libs 
+%files libs
 %defattr(-,root,root,-)
 %doc COPYING
 %{_kde4_libdir}/lib*.so.*
@@ -175,8 +177,30 @@
 
 
 %changelog
-* Fri Jan  9 2009 Luk???? Tinkl <ltinkl at redhat.com> 4.1.4-1
-- KDE 4.1.4
+* Thu Jan 22 2009 Than Ngo <than at redhat.com> - 4.2.0-1
+- 4.2.0
+
+* Wed Jan 07 2009 Than Ngo <than at redhat.com> - 4.1.96-1
+- 4.2rc1
+
+* Fri Dec 12 2008 <than at redhat.com> 4.1.85-1
+- 4.2beta2
+
+* Fri Dec 05 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 6:4.1.80-4
+- rebuild for fixed kde-filesystem (macros.kde4) (get rid of rpaths)
+
+* Thu Dec 04 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 6:4.1.80-3
+- add missing BR qca2-devel (for ksirk)
+- add killbots, kapman and bomber to the description
+
+* Thu Nov 20 2008 Than Ngo <than at redhat.com> 4.1.80-2
+- merged
+
+* Thu Nov 20 2008 Lorenzo Villani <lvillani at binaryhelix.net> 6:4.1.80-1
+- 4.1.80
+- BR cmake >= 2.6.2
+- make install/fast
+- drop _default_patch_fuzz 2
 
 * Wed Nov 12 2008 Than Ngo <than at redhat.com> 4.1.3-1
 - 4.1.3
@@ -318,7 +342,7 @@
 - cleanup
 
 * Tue Mar 06 2007 Than Ngo <than at redhat.com> - 6:3.5.6-2.fc7
-- cleanup 
+- cleanup
 
 * Wed Feb 07 2007 Than Ngo <than at redhat.com> 6:3.5.6-1.fc7
 - 3.5.6
@@ -351,7 +375,7 @@
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 6:3.5.1-1.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 
-* Fri Feb 03 2006 Than Ngo <than at redhat.com> 6:3.5.1-1 
+* Fri Feb 03 2006 Than Ngo <than at redhat.com> 6:3.5.1-1
 - 3.5.1
 
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
@@ -396,7 +420,7 @@
 * Mon Oct 18 2004 Than Ngo <than at redhat.com> 6:3.3.1-2
 - add missing klickety icons #135614
 
-* Wed Oct 13 2004 Than Ngo <than at redhat.com> 6:3.3.1-1 
+* Wed Oct 13 2004 Than Ngo <than at redhat.com> 6:3.3.1-1
 - update to 3.3.1
 
 * Fri Oct 08 2004 Than Ngo <than at redhat.com> 6:3.3.0-2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdegames/F-10/sources,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- sources	9 Jan 2009 00:04:59 -0000	1.63
+++ sources	24 Jan 2009 05:56:39 -0000	1.64
@@ -1 +1 @@
-b18b4b89c83ea20a76bab5fac03bcc0b  kdegames-4.1.4.tar.bz2
+68cefd627025be99ba136e5a4e35e554  kdegames-4.2.0.tar.bz2



From rdieter at fedoraproject.org  Sat Jan 24 05:59:27 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sat, 24 Jan 2009 05:59:27 +0000 (UTC)
Subject: rpms/kdenetwork/F-10 kdenetwork-4.1.96-system-libgadu.patch, NONE, 
	1.1 .cvsignore, 1.59, 1.60 sources, 1.67,
	1.68 kdenetwork-4.1.3-handle-enc-message.patch, 1.1,
	NONE kdenetwork-4.1.4-system-libgadu.patch, 1.1, NONE
Message-ID: <20090124055927.2FFB17010A@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdenetwork/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10093

Modified Files:
	.cvsignore sources 
Added Files:
	kdenetwork-4.1.96-system-libgadu.patch 
Removed Files:
	kdenetwork-4.1.3-handle-enc-message.patch 
	kdenetwork-4.1.4-system-libgadu.patch 
Log Message:
* Thu Jan 22 2009 Than Ngo <than at redhat.com> - 4.2.0-1
- 4.2.0


kdenetwork-4.1.96-system-libgadu.patch:

--- NEW FILE kdenetwork-4.1.96-system-libgadu.patch ---
Index: cmake/modules/FindLibgadu.cmake
===================================================================
--- cmake/modules/FindLibgadu.cmake	(Revision 0)
+++ cmake/modules/FindLibgadu.cmake	(Revision 909145)
@@ -0,0 +1,72 @@
+# - Try to find libgadu (Gadu Gadu protocol support library)
+# Once done this will define
+#
+#  LIBGADU_FOUND - system has LIBGADU
+#  LIBGADU_INCLUDE_DIR - the LIBGADU include directory
+#  LIBGADU_LIBRARIES - the libraries needed to use LIBGADU
+#  LIBGADU_DEFINITIONS - Compiler switches required for using LIBGADU
+#
+# use pkg-config to get the directories and then use these values
+# in the FIND_PATH() and FIND_LIBRARY() calls
+
+# Copyright (c) 2008, Maciej Mrozowski, <reavertm at poczta.fm>
+#
+# Redistribution and use is allowed according to the terms of the BSD license.
+# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+
+include (FindLibraryWithDebug)
+
+if (LIBGADU_INCLUDE_DIR AND LIBGADU_LIBRARIES)
+
+    # in cache already
+    set (LIBGADU_FOUND TRUE)
+
+else (LIBGADU_INCLUDE_DIR AND LIBGADU_LIBRARIES)
+
+    if (NOT WIN32)
+
+        find_package (PkgConfig)
+        pkg_check_modules (PC_LIBGADU libgadu)
+
+        # If pkgconfig found libgadu, get the full path to the library using find_library()
+        # but only in the path reported by pkgconfig.
+        # Otherwise do a normal search.
+        if (PC_LIBGADU_FOUND)
+
+            set (LIBGADU_DEFINITIONS ${PC_LIBGADU_CFLAGS})
+
+            if (PC_LIBGADU_INCLUDE_DIRS)
+                set (LIBGADU_INCLUDE_DIR ${PC_LIBGADU_INCLUDE_DIRS})
+            else (PC_LIBGADU_INCLUDE_DIRS)
+                find_path (LIBGADU_INCLUDE_DIR libgadu.h PATH_SUFFIXES libgadu)
+            endif (PC_LIBGADU_INCLUDE_DIRS)
+
+            find_library (LIBGADU_LIBRARIES NAMES gadu
+                PATHS
+                ${PC_LIBGADU_LIBDIR}
+                NO_DEFAULT_PATH
+            )
+
+        else (PC_LIBGADU_FOUND)
+
+            find_library (LIBGADU_LIBRARIES NAMES gadu)
+            find_path (LIBGADU_INCLUDE_DIR libgadu.h PATH_SUFFIXES libgadu)
+
+        endif (PC_LIBGADU_FOUND)
+
+    else (NOT WIN32)
+
+        find_library_with_debug (LIBGADU_LIBRARIES
+            WIN32_DEBUG_POSTFIX d
+            NAMES gadu
+        )
+        find_path (LIBGADU_INCLUDE_DIR libgadu.h PATH_SUFFIXES libgadu)
+
+    endif (NOT WIN32)
+
+    include (FindPackageHandleStandardArgs)
+    find_package_handle_standard_args (LIBGADU DEFAULT_MSG LIBGADU_LIBRARIES LIBGADU_INCLUDE_DIR)
+
+    mark_as_advanced (LIBGADU_INCLUDE_DIR LIBGADU_LIBRARIES)
+
+endif (LIBGADU_INCLUDE_DIR AND LIBGADU_LIBRARIES)
Index: kopete/protocols/gadu/CMakeLists.txt
===================================================================
--- kopete/protocols/gadu/CMakeLists.txt	(Revision 909143)
+++ kopete/protocols/gadu/CMakeLists.txt	(Revision 909145)
@@ -3,11 +3,8 @@
 KDE4_NO_ENABLE_FINAL(kopete)
 
 add_subdirectory( icons ) 
-add_subdirectory( libgadu )
 
-include_directories( ${KOPETE_INCLUDES} 
-${CMAKE_CURRENT_SOURCE_DIR}/libgadu/ 
-${CMAKE_CURRENT_BINARY_DIR}/libgadu/ 
+include_directories( ${KOPETE_INCLUDES} ${LIBGADU_INCLUDE_DIRS} }
 )
 
 
@@ -46,7 +43,7 @@
 kde4_add_plugin(kopete_gadu ${kopete_gadu_PART_SRCS})
 
 
-target_link_libraries(kopete_gadu ${KDE4_KIO_LIBS} ${QT_QTNETWORK_LIBRARY} ${KDE4_KDE3SUPPORT_LIBS} gadu_kopete kopete )
+target_link_libraries(kopete_gadu ${KDE4_KIO_LIBS} ${QT_QTNETWORK_LIBRARY} ${KDE4_KDE3SUPPORT_LIBS} ${LIBGADU_LIBRARIES} kopete )
 
 install(TARGETS kopete_gadu  DESTINATION ${PLUGIN_INSTALL_DIR})
 
Index: kopete/protocols/CMakeLists.txt
===================================================================
--- kopete/protocols/CMakeLists.txt	(Revision 909143)
+++ kopete/protocols/CMakeLists.txt	(Revision 909145)
@@ -1,6 +1,3 @@
-macro_optional_find_package(OpenSSL)
-macro_log_feature(OPENSSL_FOUND "OpenSSL" "A toolkit implementing the Secure Sockets Layer (SSL v2/v3) and Transport Layer Security (TLS v1) protocols" "http://openssl.org" FALSE "" "Required for the Kopete Gadu-Gadu protocol.")
-
 # On Solaris, some of the name resolution functions are in libnsl;
 # this needs to be linked in if found. Copied from kdelibs.
 check_library_exists(nsl gethostbyname "" HAVE_NSL_LIBRARY)
@@ -47,9 +44,9 @@
   if(WITH_winpopup)
     add_subdirectory( winpopup )
   endif(WITH_winpopup)
-  if(WITH_gadu AND OPENSSL_FOUND)
+  if(WITH_gadu AND LIBGADU_FOUND)
 	add_subdirectory( gadu )
-  endif(WITH_gadu AND OPENSSL_FOUND)
+  endif(WITH_gadu AND LIBGADU_FOUND)
   if(WITH_sms)
     add_subdirectory( sms )
   endif(WITH_sms)
Index: kopete/CMakeLists.txt
===================================================================
--- kopete/CMakeLists.txt	(Revision 909143)
+++ kopete/CMakeLists.txt	(Revision 909145)
@@ -37,6 +37,10 @@
 macro_bool_to_01(LIBMEANWHILE_FOUND HAVE_LIBMEANWHILE)
 macro_log_feature(LIBMEANWHILE_FOUND "libmeanwhile" "A library for protocol support for connection to Sametime servers" "http://meanwhile.sf.net" FALSE "" "Required for the Kopete Meanwhile protocol")
 
+macro_optional_find_package(Libgadu)
+macro_bool_to_01(LIBGADU_FOUND HAVE_LIBGADU)
+macro_log_feature(LIBGADU_FOUND "libgadu" "A library providing support for Gadu-Gadu protocol" "http://toxygen.net/libgadu/" FALSE "1.8.0" "Required for Kopete Gadu-Gadu protocol")
+
 check_include_files(valgrind/valgrind.h HAVE_VALGRIND_H)
 check_include_files(stdint.h HAVE_STDINT_H)
 check_include_files(inttypes.h HAVE_INTTYPES_H)


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdenetwork/F-10/.cvsignore,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- .cvsignore	9 Jan 2009 10:38:39 -0000	1.59
+++ .cvsignore	24 Jan 2009 05:58:56 -0000	1.60
@@ -1 +1,5 @@
-kdenetwork-4.1.4.tar.bz2
+kdenetwork-4.1.2.tar.bz2
+kdenetwork-4.1.80.tar.bz2
+kdenetwork-4.1.85.tar.bz2
+kdenetwork-4.1.96.tar.bz2
+kdenetwork-4.2.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdenetwork/F-10/sources,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- sources	9 Jan 2009 10:38:39 -0000	1.67
+++ sources	24 Jan 2009 05:58:56 -0000	1.68
@@ -1 +1 @@
-c67114c0e28a4e44f1466bf467a7b8dd  kdenetwork-4.1.4.tar.bz2
+0ea1628e11d398fdf45276a35edd3cae  kdenetwork-4.2.0.tar.bz2


--- kdenetwork-4.1.3-handle-enc-message.patch DELETED ---


--- kdenetwork-4.1.4-system-libgadu.patch DELETED ---



From rdieter at fedoraproject.org  Sat Jan 24 06:02:53 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sat, 24 Jan 2009 06:02:53 +0000 (UTC)
Subject: rpms/kdepim/F-10 kdepim-4.1.80-libqgpgme-link-fix.patch, NONE,
	1.1 .cvsignore, 1.58, 1.59 kdepim.spec, 1.201, 1.202 sources,
	1.67, 1.68 bug_169166_fix.patch, 1.1,
	NONE kdepim-4.1.2-kabcdistlistupdater.patch, 1.1, NONE
Message-ID: <20090124060253.879157010A@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdepim/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10694

Modified Files:
	.cvsignore kdepim.spec sources 
Added Files:
	kdepim-4.1.80-libqgpgme-link-fix.patch 
Removed Files:
	bug_169166_fix.patch kdepim-4.1.2-kabcdistlistupdater.patch 
Log Message:
* Thu Jan 22 2009 Than Ngo <than at redhat.com> - 4.2.0-1
- 4.2.0


kdepim-4.1.80-libqgpgme-link-fix.patch:

--- NEW FILE kdepim-4.1.80-libqgpgme-link-fix.patch ---
diff -Naur kdepim-4.1.80/kleopatra/kgpgconf/CMakeLists.txt kdepim-4.1.80.libqgpgme-link-fix/kleopatra/kgpgconf/CMakeLists.txt
--- kdepim-4.1.80/kleopatra/kgpgconf/CMakeLists.txt	2008-11-04 18:12:56.000000000 +0100
+++ kdepim-4.1.80.libqgpgme-link-fix/kleopatra/kgpgconf/CMakeLists.txt	2008-11-28 20:28:00.000000000 +0100
@@ -21,7 +21,7 @@
 kde4_add_app_icon(_kgpgconf_SRCS "${KDE4_ICON_DIR}/oxygen/*/apps/preferences-desktop-cryptography.png")
 
 kde4_add_executable(kgpgconf ${_kgpgconf_SRCS} )
-target_link_libraries(kgpgconf ${QGPGME_LIBRARIES} ${KDE4_KDEUI_LIBS} )
+target_link_libraries(kgpgconf ${KDE4_QGPGME_LIBRARY} ${KDE4_KDEUI_LIBS} )
 
 install(TARGETS kgpgconf ${INSTALL_TARGETS_DEFAULT_ARGS})
 
diff -Naur kdepim-4.1.80/libkleo/CMakeLists.txt kdepim-4.1.80.libqgpgme-link-fix/libkleo/CMakeLists.txt
--- kdepim-4.1.80/libkleo/CMakeLists.txt	2008-11-04 18:12:56.000000000 +0100
+++ kdepim-4.1.80.libqgpgme-link-fix/libkleo/CMakeLists.txt	2008-11-28 18:56:14.000000000 +0100
@@ -108,7 +108,7 @@
 if(WIN32)
 target_link_libraries(kleo ${kleo_LIB_LIBS}  ${GPGME_VANILLA_LIBRARIES} )
 else(WIN32)
-target_link_libraries(kleo ${kleo_LIB_LIBS} )
+target_link_libraries(kleo ${kleo_LIB_LIBS} ${KDE4_QGPGME_LIBRARY} )
 endif(WIN32)
 set_target_properties(kleo PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
 install(TARGETS kleo ${INSTALL_TARGETS_DEFAULT_ARGS})


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdepim/F-10/.cvsignore,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- .cvsignore	9 Jan 2009 04:57:39 -0000	1.58
+++ .cvsignore	24 Jan 2009 06:02:23 -0000	1.59
@@ -1 +1,5 @@
-kdepim-4.1.4.tar.bz2
+kdepim-4.1.2.tar.bz2
+kdepim-4.1.80.tar.bz2
+kdepim-4.1.85.tar.bz2
+kdepim-4.1.96.tar.bz2
+kdepim-4.2.0.tar.bz2


Index: kdepim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdepim/F-10/kdepim.spec,v
retrieving revision 1.201
retrieving revision 1.202
diff -u -r1.201 -r1.202
--- kdepim.spec	21 Jan 2009 19:56:50 -0000	1.201
+++ kdepim.spec	24 Jan 2009 06:02:23 -0000	1.202
@@ -1,25 +1,20 @@
-
 %ifnarch s390 s390x
-#define _with_pilot_link 1
+%define _with_pilot_link 1
 %endif
 
 Name:    kdepim
 Summary: PIM (Personal Information Manager) applications
 Epoch:   6
-Version: 4.1.4
-Release: 2%{?dist}
+Version: 4.2.0
+Release: 1%{?dist}
 
 License: GPLv2
 Group:   Applications/Productivity
 URL:	 http://www.kde.org/
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
-Patch0:  kdepim-4.1.2-kabcdistlistupdater.patch
+Patch0:  kdepim-4.1.80-libqgpgme-link-fix.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-## upstream patches
-# http://websvn.kde.org/?view=rev&revision=914005
-Patch100: bug_169166_fix.patch
-
 Provides: kdepim4 = %{version}-%{release}
 
 Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}
@@ -30,22 +25,20 @@
 BuildRequires: akonadi-devel
 BuildRequires: bison flex
 BuildRequires: boost-devel
-BuildRequires: cmake
 BuildRequires: cyrus-sasl-devel
 BuildRequires: desktop-file-utils
 BuildRequires: gnokii-devel
 BuildRequires: gpgme-devel
-BuildRequires: kdelibs4-devel >= %{version}
 BuildRequires: kdepimlibs-devel >= %{version}
 BuildRequires: libassuan-devel
 BuildRequires: libXpm-devel libXScrnSaver-devel
-BuildRequires: libical-devel
 # TODO: libmapi from http://www.openchange.org/
 #BuildRequires: libmapi-devel
-BuildRequires: libopensync-devel
+# Not used, has broken deps to boot -- Rex
+#BuildRequires: libopensync-devel
 BuildRequires: libxslt-devel
 BuildRequires: lockdev-devel
-%{?_with_pilot_link:BuildRequires: pilot-link-devel >= 0.12}
+%{?_with_pilot_link:BuildRequires: pilot-link-devel >= 0.12 libmal-devel >= 0.40}
 BuildRequires: python-devel
 BuildRequires: soprano-devel
 BuildRequires: qca2-devel
@@ -54,6 +47,7 @@
 BuildRequires: giflib-devel
 BuildRequires: openldap-devel
 BuildRequires: pcre-devel
+BuildRequires: libical-devel
 
 ##Optional bits
 Requires(hint): pinentry-gui
@@ -64,7 +58,7 @@
 
 %description
 %{summary}, including:
-* akregator: feed aggregator 
+* akregator: feed aggregator
 * kmail: email client
 * knode: newsreader
 * knotes: sticky notes for the desktop
@@ -73,7 +67,7 @@
 %{?_with_pilot_link:* kpilot: HotSync?? software for Palm OS?? devices}
 
 %package devel
-Summary: Development files for %{name} 
+Summary: Development files for %{name}
 Group: Development/Libraries
 Provides: kdepim4-devel = %{version}-%{release}
 Requires: %{name}-libs = %{epoch}:%{version}-%{release}
@@ -94,29 +88,23 @@
 
 %prep
 %setup -q
-%patch0 -p1
+%patch0 -p1 -b .libqgpgme-link-fix
 
 # upstream patches
-pushd kmail
-%patch100 -p0 -b .kde#169166
-popd
-
 
 %build
-
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
-%{cmake_kde4} --debug-output ..
+%{cmake_kde4} ..
 popd
 
 make %{?_smp_mflags} -C %{_target_platform} VERBOSE=1
 
 
-
 %install
 rm -rf %{buildroot}
 
-make install DESTDIR=%{buildroot} -C %{_target_platform}
+make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
 # conflict with oxygen-icon-theme
 rm -rvf %{buildroot}%{_kde4_iconsdir}/oxygen/32x32/actions/appointment-new.png
@@ -158,6 +146,9 @@
 %doc README README.Kolab
 %doc COPYING
 %{_kde4_bindir}/*
+%if 0%{?_with_pilot_link:1}
+%{_kde4_libdir}/libkpilot_*.so
+%endif
 %{_kde4_libdir}/kde4/*.so
 %{_kde4_libdir}/strigi/*.so
 %{_kde4_datadir}/applications/kde4/*
@@ -172,36 +163,54 @@
 %{_kde4_datadir}/kde4/services/*
 %{_kde4_datadir}/kde4/servicetypes/*
 %{_kde4_docdir}/HTML/en/*
+%{_mandir}/man1/kabcclient.1*
 
 %files libs
 %defattr(-,root,root,-)
 %{_kde4_libdir}/lib*.so.*
-# unversioned library
-#{_kde4_libdir}/libkpilot_conduit_base.so
 
 %files devel
 %defattr(-,root,root,-)
 %{_kde4_includedir}/*
 %{_kde4_libdir}/lib*.so
+%if 0%{?_with_pilot_link:1}
+%exclude %{_kde4_libdir}/libkpilot_*.so
+%endif
 %{_kde4_libdir}/kde4/plugins/designer/*
-#exclude %{_kde4_libdir}/libkpilot_conduit_base.so
 
 
 %changelog
-* Wed Jan 21 2009 Rex Dieter <rdieter at fedoraproject.org. 4.1.4-2
-- KMail would lose account settings (kde#169166)
+* Thu Jan 22 2009 Than Ngo <than at redhat.com> - 4.2.0-1
+- 4.2.0
+
+* Thu Jan 15 2009 Rex Dieter <rdieter at fedoraproject.org> 4.1.96-3
+- move libkpilot_*.so -devel -> main pkg
+
+* Thu Jan 15 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.96-2
+- reenable BR pilot-link-devel, add missing BR libmal-devel (for KPilot)
+
+* Wed Jan 07 2009 Than Ngo <than at redhat.com> 4.1.96-1
+- 4.2rc1
 
-* Fri Jan 09 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.4-1
-- 4.1.4
-- BR libical-devel
+* Fri Dec 12 2008 Than Ngo <than at redhat.com> 4.1.85-1
+- 4.2beta2
+
+* Fri Nov 28 2008 Lorenzo Villani <lvillani at binaryhelix.net> - 6:4.1.80-3
+- kdepim-4.1.80-libqgpgme-link-fix.patch
+  fix libqgpgme linking errors
+
+* Thu Nov 20 2008 Than Ngo <than at redhat.com> 4.1.80-2
+- merged
+
+* Thu Nov 20 2008 Lorenzo Villani <lvillani at binaryhelix.net> - 6:4.1.80-1
+- 4.1.80
+- BR cmake >= 2.6.2
+- make install/fast
+- kdepim-4.1.2-kabcdistlistupdater.patch upstreamed
 
 * Wed Nov 12 2008 Than Ngo <than at redhat.com> 4.1.3-1
 - 4.1.3
 
-* Tue Nov 11 2008 Jaroslav Reznik <jreznik at redhat.com> 4.1.2-5
-- revert akregator systray show/hide backport (#471022)
-- fix akregator crashes on startup (#469452)
-
 * Sun Oct 26 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.2-4
 - add missing BR soprano-devel
 
@@ -269,7 +278,7 @@
 - fix gnokii detection (thanks to Dirk M??ller)
 
 * Wed Feb 27 2008 Rex Dieter <rdieter at fedoraproject.org> 6:3.5.9-6
-- "Enterprise headers" makes impossible to select text in 
+- "Enterprise headers" makes impossible to select text in
   first paragraph of body (kde#151150)
 
 * Mon Feb 18 2008 Than Ngo <than at redhat.com> 6:3.5.9-5
@@ -301,7 +310,7 @@
 
 * Wed Dec 12 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 6:3.5.8-12.20071204.ent
 - omit crystalsvg icons (f9+)
-- kdepim_3.5.6.enterprise.0.20071204.744693 
+- kdepim_3.5.6.enterprise.0.20071204.744693
 
 * Thu Nov 29 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 6:3.5.8-10.20071129.ent
 - kdepim-enterprise branch 20071129 snapshot, r742984
@@ -310,7 +319,7 @@
 - omit "compacting mbox..." patch for now (doesn't apply)
 
 * Wed Nov 28 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 6:3.5.8-8.20071127.ent
-- include/reference kdepim-enterprise-svn_checkout.sh 
+- include/reference kdepim-enterprise-svn_checkout.sh
 
 * Mon Nov 27 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 6:3.5.8-7.20071127.ent
 - kdepim-enterprise branch 20071127 snapshot, r742277 (rh#401391, kde#152553)
@@ -353,7 +362,7 @@
 
 * Mon Aug 20 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 6:3.5.7-6
 - License: GPLv2
-- Provides: kdepim3(-devel) 
+- Provides: kdepim3(-devel)
 - (Build)Requires: kdelibs3(-devel)
 
 * Tue Jun 19 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 6:3.5.7-3
@@ -453,7 +462,7 @@
 - apply upstream patches
 
 * Mon Jun 19 2006 Than Ngo <than at redhat.com> 6:3.5.3-2
-- BR: cyrus-sasl-devel, #195500 
+- BR: cyrus-sasl-devel, #195500
 
 * Fri Jun 02 2006 Than Ngo <than at redhat.com> 6:3.5.3-1
 - update to 3.5.3
@@ -477,7 +486,7 @@
 
 * Thu Feb 02 2006 Than Ngo <than at redhat.com> 6:3.5.1-1
 - update to 3.5.1
-- get rid of kdepim-3.5.0-kmail-113730.patch, which included in new upstream 
+- get rid of kdepim-3.5.0-kmail-113730.patch, which included in new upstream
 
 * Mon Dec 12 2005 Than Ngo <than at redhat.com> 6:3.5.0-1
 - apply patch to fix crash when applying pipe through filters
@@ -526,7 +535,7 @@
 - add missing kandy icons #141165
 
 * Mon Mar 21 2005 Than Ngo <than at redhat.com> 6:3.4.0-3
-- cleanup build dependencies #151673 
+- cleanup build dependencies #151673
 
 * Fri Mar 18 2005 Than Ngo <than at redhat.com> 6:3.4.0-2
 - fix broken dependencies on kdepim-devel #151508
@@ -581,7 +590,7 @@
 * Tue Aug 10 2004 Than Ngo <than at redhat.com> 3.3.0-0.1.rc1
 - update to 3.3.0 rc1
 
-* Wed Aug 04 2004 Than Ngo <than at redhat.com> 6:3.2.92-1 
+* Wed Aug 04 2004 Than Ngo <than at redhat.com> 6:3.2.92-1
 - update to KDE 3.3 Beta 2
 
 * Sat Jul 03 2004 Than Ngo <than at redhat.com> 6:3.2.91-1
@@ -599,10 +608,10 @@
 * Mon Mar 22 2004 Than Ngo <than at redhat.com> 6:3.2.1-4
 - fix conflict problem by update, #118709
 
-* Fri Mar 19 2004 Karsten Hopp <karsten at redhat.de> 3.2.1-3 
+* Fri Mar 19 2004 Karsten Hopp <karsten at redhat.de> 3.2.1-3
 - add Obsoletes: kmail
 
-* Sun Mar 14 2004 Karsten Hopp <karsten at redhat.de> 3.2.1-2 
+* Sun Mar 14 2004 Karsten Hopp <karsten at redhat.de> 3.2.1-2
 - add Provide: kmail
 
 * Sun Mar 07 2004 Than Ngo <than at redhat.com> 6:3.2.1-1
@@ -612,7 +621,7 @@
 - rebuilt
 
 * Mon Mar 01 2004 Than Ngo <than at redhat.com> 3.2.0-1.5
-- add Buildrequires on libart_lgpl-devel #115183  
+- add Buildrequires on libart_lgpl-devel #115183
 
 * Tue Feb 24 2004 Than Ngo <than at redhat.com> 6:3.2.0-1.4
 - some critical bugs in kmail, #116080
@@ -727,7 +736,7 @@
 
 * Mon Aug 12 2002 Than Ngo <than at redhat.com> 3.0.3-1
 - 3.0.3
-- Fixed a bug in clock applet 
+- Fixed a bug in clock applet
 
 * Tue Aug  6 2002 Than Ngo <than at redhat.com> 3.0.2-4
 - build against pilot-link-0.11.2
@@ -940,7 +949,7 @@
 - snapshot, includes kde 1.1.1 + fixes
 - kvt removed for security reasons.  It is a steaming pile of...
 
-* Mon Apr 19 1999 Preston Brown <pbrown at redhat.com> 
+* Mon Apr 19 1999 Preston Brown <pbrown at redhat.com>
 - last snapshot before release
 
 * Fri Apr 16 1999 Preston Brown <pbrown at redhat.com>


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdepim/F-10/sources,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- sources	9 Jan 2009 04:57:39 -0000	1.67
+++ sources	24 Jan 2009 06:02:23 -0000	1.68
@@ -1 +1 @@
-297ffe93343bc0dd62c7d90feae0ee6c  kdepim-4.1.4.tar.bz2
+a80631de21930b2544c86722138aaa6c  kdepim-4.2.0.tar.bz2


--- bug_169166_fix.patch DELETED ---


--- kdepim-4.1.2-kabcdistlistupdater.patch DELETED ---



From rdieter at fedoraproject.org  Sat Jan 24 06:09:13 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sat, 24 Jan 2009 06:09:13 +0000 (UTC)
Subject: rpms/kdesdk/F-10 kdesdk-4.1.2-quit.patch,1.1,NONE
Message-ID: <20090124060913.6331C7010A@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdesdk/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11583

Removed Files:
	kdesdk-4.1.2-quit.patch 
Log Message:
* Thu Jan 22 2009 Than Ngo <than at redhat.com> - 4.2.0-1
- 4.2.0



--- kdesdk-4.1.2-quit.patch DELETED ---



From corsepiu at fedoraproject.org  Sat Jan 24 06:10:41 2009
From: corsepiu at fedoraproject.org (=?utf-8?q?Ralf_Cors=C3=A9pius?=)
Date: Sat, 24 Jan 2009 06:10:41 +0000 (UTC)
Subject: rpms/rt3/devel rt3.spec,1.32,1.33
Message-ID: <20090124061041.43AC37010A@cvs1.fedora.phx.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/rt3/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11796

Modified Files:
	rt3.spec 
Log Message:
* Fri Jan 24 2009 Ralf Cors??pius <corsepiu at fedoraproject.org> - 3.8.2-2
- Filter out R: perl(Test::Email).
- Add perl-RT-Test package.
- Activate --with devel_mode.
- Don't pass --enable/disable-devel-mode to configure.
- Add Explicit check for devel-mode deps.



Index: rt3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rt3/devel/rt3.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- rt3.spec	23 Jan 2009 13:05:13 -0000	1.32
+++ rt3.spec	24 Jan 2009 06:10:10 -0000	1.33
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2005, 2006, 2007, 2008 Ralf Corsepius, Ulm, Germany.
+# Copyright (c) 2005, 2006, 2007, 2008, 2009 Ralf Corsepius, Ulm, Germany.
 # This file and all modifications and additions to the pristine
 # package are under the same license as the package itself.
 #
@@ -18,8 +18,8 @@
 
 # --with devel_mode/--without devel_mode
 #	enable/disable building/installing devel files
-#	Default: without
-%bcond_with devel_mode
+#	Default: with
+%bcond_without devel_mode
 
 # --with gpg/--without gpg
 #	enable/disable building gpg support
@@ -40,7 +40,7 @@
 
 Name:		rt3
 Version:	3.8.2
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Request tracker 3
 
 Group:		Applications/Internet
@@ -242,11 +242,13 @@
 
 # Filter out a bogus R:perl() rpm adds.
 # Keep SpamAssassin optional
+# Keep Test::Email optional (Not yet in Fedora)
 cat << \EOF > %{name}-req
 #!/bin/sh
 %{__perl_requires} $* |\
     sed -e '/^perl()/d' \
-	-e '/^perl(Mail::SpamAssassin)$/d'
+	-e '/^perl(Mail::SpamAssassin)$/d' \
+	-e '/^perl(Test::Email)$/d'
 EOF
 %define __perl_requires %{_builddir}/rt-%{version}/%{name}-req
 chmod +x %{__perl_requires}
@@ -291,11 +293,13 @@
 --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}
+%{?with_gpg:--enable-gpg}%{!?with_gpg:--disable-gpg}
 
 make %{?_smp_mflags}
 
+# Explicitly check for devel-mode deps
+%{?with_devel_mode:%{__perl} ./sbin/rt-test-dependencies --verbose --with-mysql --with-modperl2 --with-dev}
+
 # Generate man-pages
 /usr/bin/pod2man bin/rt-mailgate > bin/rt-mailgate.1
 /usr/bin/pod2man bin/mason_handler.fcgi > bin/mason_handler.fcgi.1
@@ -417,14 +421,19 @@
 %{_sbindir}/rt-mailgate
 %{_mandir}/man1/rt-mailgate*
 
-%if 0%{?with_devel_mode}
 %files -n perl-RT-Test
 %defattr(-,root,root,-)
 %dir %{RT3_LIBDIR}/RT
 %{RT3_LIBDIR}/RT/Test*
-%endif
 
 %changelog
+* Fri Jan 24 2009 Ralf Cors??pius <corsepiu at fedoraproject.org> - 3.8.2-2
+- Filter out R: perl(Test::Email).
+- Add perl-RT-Test package.
+- Activate --with devel_mode.
+- Don't pass --enable/disable-devel-mode to configure.
+- Add Explicit check for devel-mode deps.
+
 * Fri Jan 23 2009 Ralf Cors??pius <corsepiu at fedoraproject.org> - 3.8.2-1
 - Upstream update.
 - Preps to add a perl-RT-Test package.



From rdieter at fedoraproject.org  Sat Jan 24 06:18:29 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sat, 24 Jan 2009 06:18:29 +0000 (UTC)
Subject: rpms/kdebase-workspace/F-10
	kdebase-workspace-4.1.72-plasma-konsole.patch, NONE,
	1.1 kdebase-workspace-4.1.80-session-button.patch, NONE,
	1.1 kdebase-workspace-4.1.82-redhat-startkde.patch, NONE,
	1.1 kdebase-workspace-4.1.96-AllowExternalPaths.patch, NONE,
	1.1 kdebase-workspace-4.1.96-font.patch, NONE,
	1.1 kdebase-workspace-4.2.0-show-systemsettings.patch, NONE,
	1.1 .cvsignore, 1.21, 1.22 kdebase-workspace.spec, 1.148,
	1.149 sources, 1.25,
	1.26 kdebase-workspace-4.0.72-plasma-konsole.patch, 1.1,
	NONE kdebase-workspace-4.0.80-ksysguard-onlyshowin.patch, 1.1,
	NONE kdebase-workspace-4.0.98-consolekit-kdm.patch, 1.5,
	NONE kdebase-workspace-4.0.98-kickoff-suspend.patch, 1.1,
	NONE kdebase-workspace-4.1.0-enable-kwin-taskbarthumbnail.patch,
	1.1, NONE kdebase-workspace-4.1.0-kde#152914.patch, 1.1,
	NONE kdebase-workspace-4.1.0-plasma-tooltips.patch, 1.1,
	NONE kdebase-workspace-4.1.2-default_applets.patch, 1.2,
	NONE kdebase-workspace-4.1.2-multihead.patch, 1.1,
	NONE kdebase-workspace-4.1.2-panel-autohide-866998.patch, 1.1,
	NONE kdebase-workspace-4.1.2-panel-autohide-868231.patch, 1.1,
	NONE kdebase-workspace-4.1.2-panel-autohide-869277.patch, 1.1,
	NONE kdebase-workspace-4.1.2-panel-autohide-871058.patch, 1.1,
	NONE kdebase-workspace-4.1.2-panel-autohide-coords.patch, 1.1,
	NONE kdebase-workspace-4.1.2-panel-autohide-fix-flicker.patch,
	1.2, NONE kdebase-workspace-4.1.2-panel-autohide.patch, 1.2,
	NONE kdebase-workspace-4.1.2-redhat-startkde.patch, 1.1,
	NONE kdebase-workspace-4.1.2-session-button.patch, 1.1,
	NONE kdebase-workspace-4.1.4-krunnerhistory.patch, 1.1, NONE
Message-ID: <20090124061829.E40D57010A@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdebase-workspace/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12905

Modified Files:
	.cvsignore kdebase-workspace.spec sources 
Added Files:
	kdebase-workspace-4.1.72-plasma-konsole.patch 
	kdebase-workspace-4.1.80-session-button.patch 
	kdebase-workspace-4.1.82-redhat-startkde.patch 
	kdebase-workspace-4.1.96-AllowExternalPaths.patch 
	kdebase-workspace-4.1.96-font.patch 
	kdebase-workspace-4.2.0-show-systemsettings.patch 
Removed Files:
	kdebase-workspace-4.0.72-plasma-konsole.patch 
	kdebase-workspace-4.0.80-ksysguard-onlyshowin.patch 
	kdebase-workspace-4.0.98-consolekit-kdm.patch 
	kdebase-workspace-4.0.98-kickoff-suspend.patch 
	kdebase-workspace-4.1.0-enable-kwin-taskbarthumbnail.patch 
	kdebase-workspace-4.1.0-kde#152914.patch 
	kdebase-workspace-4.1.0-plasma-tooltips.patch 
	kdebase-workspace-4.1.2-default_applets.patch 
	kdebase-workspace-4.1.2-multihead.patch 
	kdebase-workspace-4.1.2-panel-autohide-866998.patch 
	kdebase-workspace-4.1.2-panel-autohide-868231.patch 
	kdebase-workspace-4.1.2-panel-autohide-869277.patch 
	kdebase-workspace-4.1.2-panel-autohide-871058.patch 
	kdebase-workspace-4.1.2-panel-autohide-coords.patch 
	kdebase-workspace-4.1.2-panel-autohide-fix-flicker.patch 
	kdebase-workspace-4.1.2-panel-autohide.patch 
	kdebase-workspace-4.1.2-redhat-startkde.patch 
	kdebase-workspace-4.1.2-session-button.patch 
	kdebase-workspace-4.1.4-krunnerhistory.patch 
Log Message:
* Thu Jan 22 2009 Than Ngo <than at redhat.com> - 4.2.0-1
- 4.2.0


kdebase-workspace-4.1.72-plasma-konsole.patch:

--- NEW FILE kdebase-workspace-4.1.72-plasma-konsole.patch ---
diff -Naur kdebase-workspace-4.1.72/plasma/containments/desktop/desktop.cpp kdebase-workspace-4.1.72.plasma-konsole/plasma/containments/desktop/desktop.cpp
--- kdebase-workspace-4.1.72/plasma/containments/desktop/desktop.cpp	2008-11-04 18:12:35.000000000 +0100
+++ kdebase-workspace-4.1.72.plasma-konsole/plasma/containments/desktop/desktop.cpp	2008-11-10 21:59:00.000000000 +0100
@@ -41,6 +41,7 @@
 #include <KRun>
 #include <KStandardDirs>
 #include <KWindowSystem>
+#include <KProcess>
 
 #include <Plasma/Corona>
 #include <Plasma/Animator>
@@ -63,6 +64,7 @@
       m_lockDesktopAction(0),
       m_appletBrowserAction(0),
       m_addPanelAction(0),
+      m_runKonsoleAction(0),
       m_runCommandAction(0),
       m_lockScreenAction(0),
       m_logoutAction(0),
@@ -132,6 +134,13 @@
     krunner.display();
 }
 
+void DefaultDesktop::runKonsole()
+{
+    KProcess proc;
+    proc << KStandardDirs::locate("exe", "konsole");
+    proc.execute();
+}
+
 void DefaultDesktop::lockScreen()
 {
     if (!KAuthorized::authorizeKAction("lock_screen")) {
@@ -161,6 +170,10 @@
         connect(m_addPanelAction, SIGNAL(triggered(bool)), this, SLOT(addPanel()));
         m_addPanelAction->setIcon(KIcon("list-add"));
 
+        m_runKonsoleAction = new QAction(i18n("Konsole"), this);
+        connect(m_runKonsoleAction, SIGNAL(triggered(bool)), this, SLOT(runKonsole()));
+        m_runKonsoleAction->setIcon(KIcon("terminal"));
+
         m_runCommandAction = new QAction(i18n("Run Command..."), this);
         connect(m_runCommandAction, SIGNAL(triggered(bool)), this, SLOT(runCommand()));
         m_runCommandAction->setIcon(KIcon("system-run"));
@@ -186,6 +199,8 @@
 
     QList<QAction*> actions;
 
+    actions.append(m_runKonsoleAction);
+
     if (KAuthorized::authorizeKAction("run_command")) {
         actions.append(m_runCommandAction);
     }
diff -Naur kdebase-workspace-4.1.72/plasma/containments/desktop/desktop.h kdebase-workspace-4.1.72.plasma-konsole/plasma/containments/desktop/desktop.h
--- kdebase-workspace-4.1.72/plasma/containments/desktop/desktop.h	2008-11-04 18:12:35.000000000 +0100
+++ kdebase-workspace-4.1.72.plasma-konsole/plasma/containments/desktop/desktop.h	2008-11-10 21:59:00.000000000 +0100
@@ -70,6 +70,7 @@
     void dropEvent(QGraphicsSceneDragDropEvent *event);
 
 protected Q_SLOTS:
+    void runKonsole();
     void runCommand();
 
     void lockScreen();
@@ -88,6 +89,7 @@
     QAction *m_lockDesktopAction;
     QAction *m_appletBrowserAction;
     QAction *m_addPanelAction;
+    QAction *m_runKonsoleAction;
     QAction *m_runCommandAction;
     QAction *m_setupDesktopAction;
     QAction *m_lockScreenAction;

kdebase-workspace-4.1.80-session-button.patch:

--- NEW FILE kdebase-workspace-4.1.80-session-button.patch ---
diff -up kdebase-workspace-4.1.80/kdm/kfrontend/kgreeter.cpp.orig kdebase-workspace-4.1.80/kdm/kfrontend/kgreeter.cpp
--- kdebase-workspace-4.1.80/kdm/kfrontend/kgreeter.cpp.orig	2008-11-19 23:44:43.000000000 +0100
+++ kdebase-workspace-4.1.80/kdm/kfrontend/kgreeter.cpp	2008-11-19 23:45:55.000000000 +0100
@@ -520,10 +520,12 @@ KGreeter::setPrevWM( QAction *wm )
 	if (curPrev != wm) {
 		if (curPrev)
 			curPrev->setText( sessionTypes[curPrev->data().toInt()].name );
-		if (wm)
+		if (wm) {
 			wm->setText( i18nc( "@item:inmenu session type",
 			                    "%1 (previous)",
 			                    sessionTypes[wm->data().toInt()].name ) );
+			wm->toggle();
+		}
 		curPrev = wm;
 	}
 }

kdebase-workspace-4.1.82-redhat-startkde.patch:

--- NEW FILE kdebase-workspace-4.1.82-redhat-startkde.patch ---
diff -Naurw kdebase-workspace-4.1.82/startkde.cmake kdebase-workspace-4.1.82.redhat-startkde/startkde.cmake
--- kdebase-workspace-4.1.82/startkde.cmake	2008-11-28 16:33:30.000000000 +0100
+++ kdebase-workspace-4.1.82.redhat-startkde/startkde.cmake	2008-12-10 20:10:42.000000000 +0100
@@ -19,12 +19,12 @@
         exit 1
 fi
 
-# Set the background to plain grey.
+# Set the background to the Red Hat default
 # The standard X background is nasty, causing moire effects and exploding
 # people's heads. We use colours from the standard KDE palette for those with
 # palettised displays.
 if test -z "$XDM_MANAGED" || echo "$XDM_MANAGED" | grep ",auto" > /dev/null; then
-  xsetroot -solid "#000000"
+  xsetroot -solid "#103D77"
 fi
 
 # we have to unset this for Darwin since it will screw up KDE's dynamic-loading
@@ -34,22 +34,6 @@
 MALLOC_CHECK_=2 
 export MALLOC_CHECK_
 
-# in case we have been started with full pathname spec without being in PATH
-bindir=`echo "$0" | sed -n 's,^\(/.*\)/[^/][^/]*$,\1,p'`
-if [ -n "$bindir" ]; then
-  qbindir=`$bindir/kde4-config --qt-binaries`
-  if [ -n "$qbindir" ]; then
-    case $PATH in
-      $qbindir|$qbindir:*|*:$qbindir|*:$qbindir:*) ;;
-      *) PATH=$qbindir:$PATH; export PATH;;
-    esac
-  fi
-  case $PATH in
-    $bindir|$bindir:*|*:$bindir|*:$bindir:*) ;;
-    *) PATH=$bindir:$PATH; export PATH;;
-  esac
-fi
-
 # Boot sequence:
 #
 # kdeinit is used to fork off processes which improves memory usage
@@ -87,6 +71,13 @@
 kcmfonts General forceFontDPI 0
 kdeglobals Locale Language '' # trigger requesting languages from KLocale
 EOF
+# read the default KSplash theme to use out of kde-settings
+if [ -e /usr/share/kde-settings/kde-profile/default/share/config/ksplashrc ]
+  then eval `grep '^Theme=' /usr/share/kde-settings/kde-profile/default/share/config/ksplashrc`
+       if [ -n "$Theme" ]
+         then sed -i -e "s/Default/$Theme/g" $kdehome/share/config/startupconfigkeys
+       fi
+fi
 kstartupconfig4
 returncode=$?
 if test $returncode -ne 0; then
@@ -207,8 +198,9 @@
 # better use the Autostart folder.
 
 libpath=`kde4-config --path lib | tr : '\n'`
+envpath=/etc/kde/env/
 
-for prefix in `echo "$libpath" | sed -n -e 's,/lib[^/]*/,/env/,p'`; do
+for prefix in `echo "$libpath" | sed -n -e 's,/lib[^/]*/,/env/,p'` $envpath ; do
   for file in "$prefix"*.sh; do
     test -r "$file" && . "$file"
   done
@@ -421,7 +413,8 @@
 echo 'startkde: Running shutdown scripts...'  1>&2
 
 # Run scripts found in $KDEDIRS/shutdown
-for prefix in `echo "$libpath" | sed -n -e 's,/lib[^/]*/,/shutdown/,p'`; do
+shutdownpath=/etc/kde/shutdown/
+for prefix in `echo "$libpath" | sed -n -e 's,/lib[^/]*/,/shutdown/,p'` $shutdownpath; do
   for file in `ls "$prefix" 2> /dev/null | egrep -v '(~|\.bak)$'`; do
     test -x "$prefix$file" && "$prefix$file"
   done

kdebase-workspace-4.1.96-AllowExternalPaths.patch:

--- NEW FILE kdebase-workspace-4.1.96-AllowExternalPaths.patch ---
diff -up kdebase-workspace-4.1.96/plasma/wallpapers/image/backgroundpackage.cpp.orig kdebase-workspace-4.1.96/plasma/wallpapers/image/backgroundpackage.cpp
--- kdebase-workspace-4.1.96/plasma/wallpapers/image/backgroundpackage.cpp.orig	2009-01-16 14:57:51.000000000 +0100
+++ kdebase-workspace-4.1.96/plasma/wallpapers/image/backgroundpackage.cpp	2009-01-16 14:58:43.000000000 +0100
@@ -157,6 +157,7 @@ BackgroundPackageStructure::BackgroundPa
 
     addDirectoryDefinition("images", "images", i18n("Images"));
     addFileDefinition("screenshot", "screenshot.png", i18n("Screenshot"));
+    setAllowExternalPaths(true);
 }
 
 

kdebase-workspace-4.1.96-font.patch:

--- NEW FILE kdebase-workspace-4.1.96-font.patch ---
diff -up kdebase-workspace-4.1.96/startkde.cmake.orig kdebase-workspace-4.1.96/startkde.cmake
--- kdebase-workspace-4.1.96/startkde.cmake.orig	2009-01-21 16:35:32.000000000 +0100
+++ kdebase-workspace-4.1.96/startkde.cmake	2009-01-21 16:35:53.000000000 +0100
@@ -214,48 +214,6 @@ else
 fi
 export QT_PLUGIN_PATH
 
-# Activate the kde font directories.
-#
-# There are 4 directories that may be used for supplying fonts for KDE.
-#
-# There are two system directories. These belong to the administrator.
-# There are two user directories, where the user may add her own fonts.
-#
-# The 'override' versions are for fonts that should come first in the list,
-# i.e. if you have a font in your 'override' directory, it will be used in
-# preference to any other.
-#
-# The preference order looks like this:
-# user override, system override, X, user, system
-#
-# Where X is the original font database that was set up before this script
-# runs.
-
-usr_odir=$HOME/.fonts/kde-override
-usr_fdir=$HOME/.fonts
-
-if test -n "$KDEDIRS"; then
-  kdedirs_first=`echo "$KDEDIRS"|sed -e 's/:.*//'`
-  sys_odir=$kdedirs_first/share/fonts/override
-  sys_fdir=$kdedirs_first/share/fonts
-else
-  sys_odir=$KDEDIR/share/fonts/override
-  sys_fdir=$KDEDIR/share/fonts
-fi
-
-# We run mkfontdir on the user's font dirs (if we have permission) to pick
-# up any new fonts they may have installed. If mkfontdir fails, we still
-# add the user's dirs to the font path, as they might simply have been made
-# read-only by the administrator, for whatever reason.
-
-test -d "$sys_odir" && xset +fp "$sys_odir"
-test -d "$usr_odir" && (mkfontdir "$usr_odir" ; xset +fp "$usr_odir")
-test -d "$usr_fdir" && (mkfontdir "$usr_fdir" ; xset fp+ "$usr_fdir")
-test -d "$sys_fdir" && xset fp+ "$sys_fdir"
-
-# Ask X11 to rebuild its font list.
-xset fp rehash
-
 # Set a left cursor instead of the standard X11 "X" cursor, since I've heard
 # from some users that they're confused and don't know what to do. This is
 # especially necessary on slow machines, where starting KDE takes one or two

kdebase-workspace-4.2.0-show-systemsettings.patch:

--- NEW FILE kdebase-workspace-4.2.0-show-systemsettings.patch ---
diff -up kdebase-workspace-4.2.0/plasma/applets/kickoff/core/applicationmodel.cpp.show-systemsettings kdebase-workspace-4.2.0/plasma/applets/kickoff/core/applicationmodel.cpp
--- kdebase-workspace-4.2.0/plasma/applets/kickoff/core/applicationmodel.cpp.show-systemsettings	2009-01-17 12:00:26.000000000 +0100
+++ kdebase-workspace-4.2.0/plasma/applets/kickoff/core/applicationmodel.cpp	2009-01-22 22:51:03.000000000 +0100
@@ -105,7 +105,6 @@ public:
               systemApplicationPolicy(ApplicationModel::ShowSystemOnlyPolicy),
               primaryNamePolicy(ApplicationModel::GenericNamePrimary)
     {
-        systemApplications = Kickoff::systemApplicationList();
     }
 
     ~ApplicationModelPrivate()
diff -up kdebase-workspace-4.2.0/systemsettings/systemsettings.desktop.show-systemsettings kdebase-workspace-4.2.0/systemsettings/systemsettings.desktop
--- kdebase-workspace-4.2.0/systemsettings/systemsettings.desktop.show-systemsettings	2009-01-17 11:59:33.000000000 +0100
+++ kdebase-workspace-4.2.0/systemsettings/systemsettings.desktop	2009-01-22 22:47:10.000000000 +0100
@@ -151,3 +151,4 @@ Name[zh_TW]=????????????
 
 X-DBUS-StartupType=Unique
 Categories=Qt;KDE;System;
+OnlyShowIn=KDE;


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/F-10/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- .cvsignore	8 Jan 2009 11:13:10 -0000	1.21
+++ .cvsignore	24 Jan 2009 06:17:58 -0000	1.22
@@ -1 +1,3 @@
-kdebase-workspace-4.1.4.tar.bz2
+kdebase-workspace-4.1.85.tar.bz2
+kdebase-workspace-4.1.96.tar.bz2
+kdebase-workspace-4.2.0.tar.bz2


Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/F-10/kdebase-workspace.spec,v
retrieving revision 1.148
retrieving revision 1.149
diff -u -r1.148 -r1.149
--- kdebase-workspace.spec	8 Jan 2009 11:24:27 -0000	1.148
+++ kdebase-workspace.spec	24 Jan 2009 06:17:59 -0000	1.149
@@ -1,8 +1,9 @@
-%define _default_patch_fuzz 2
+%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Summary: K Desktop Environment - Workspace
 Name: kdebase-workspace
-Version: 4.1.4
+Version: 4.2.0
+
 Release: 1%{?dist}
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-workspace-%{version}.tar.bz2
 License: GPLv2
@@ -10,75 +11,30 @@
 URL: http://www.kde.org/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Patch1: kdebase-workspace-4.1.2-redhat-startkde.patch
-Patch2: kdebase-workspace-4.0.98-consolekit-kdm.patch
-Patch3: kdebase-workspace-4.0.72-plasma-konsole.patch
-Patch4: kdebase-workspace-4.1.1-show-systemsettings.patch
-Patch5: kdebase-workspace-4.0.72-ck-shutdown.patch
+Patch1: kdebase-workspace-4.1.82-redhat-startkde.patch
+Patch2: kdebase-workspace-4.1.72-plasma-konsole.patch
+Patch3: kdebase-workspace-4.2.0-show-systemsettings.patch
+Patch4: kdebase-workspace-4.0.72-ck-shutdown.patch
 #??434824: KDE4 System Settings - No Method To Enter Administrative Mode
-Patch6: kdebase-workspace-4.1.2-rootprivs.patch
-Patch7: kdebase-workspace-4.0.3-timedate-kcm.patch
+Patch5: kdebase-workspace-4.1.2-rootprivs.patch
+Patch6: kdebase-workspace-4.0.3-timedate-kcm.patch
 #??441062: packagekit tools do not show icons correctly on KDE
-Patch8: kdebase-workspace-4.0.3-krdb.patch
-# originally from plasma-4.0-openSUSE
-Patch9: kdebase-workspace-4.0.98-kickoff-suspend.patch
-Patch10: kdebase-workspace-4.0.72-klipper-url.patch
-# allows to define a default wallpaper via plasmarc:wallpaper
-Patch11: kdebase-workspace-4.0.85-plasma-default-wallpaper.patch
-Patch12: kdebase-workspace-4.1.2-multihead.patch
-Patch13: kdebase-workspace-4.1.2-session-button.patch
-Patch14: kdebase-workspace-4.1.2-ldap.patch
-Patch15: kdebase-workspace-4.1.2-kdm-i18n.patch
-# omit battery applet from default panel
-Patch16: kdebase-workspace-4.1.2-default_applets.patch
+Patch7: kdebase-workspace-4.0.3-krdb.patch
+Patch8: kdebase-workspace-4.0.72-klipper-url.patch
+Patch9: kdebase-workspace-4.1.80-session-button.patch
+Patch10: kdebase-workspace-4.1.2-ldap.patch
+Patch11: kdebase-workspace-4.1.96-font.patch
 
 # upstream patches:
-# backport Plasma tooltip manager from KDE 4.2 (fixes regression from 4.0)
-# This is a cumulative patch from the following revisions/pairs: 833271:833299,
-# 833386, 833479:833545, 833581, 833587:833620, 834652, 836698, 837733, 837827.
-# This is backwards BC wrt 4.1, but the API of the new classes is not finalized.
-Patch100: kdebase-workspace-4.1.0-plasma-tooltips.patch
-# http://bugs.kde.org/152914
-Patch101: kdebase-workspace-4.1.0-kde#152914.patch
-# reenable KWin taskbarthumbnail effect (already done upstream in 4.2, was
-# disabled in 4.1 due to no tooltip support - see also Patch100)
-Patch102: kdebase-workspace-4.1.0-enable-kwin-taskbarthumbnail.patch
-
-# backport of panel autohide from KDE 4.2
-# from plasma-4.1-openSUSE: http://websvn.kde.org/?view=rev&revision=864493
-# Fedora changes:
-# * removed theme changes
-# * removed hunks from plasmacontroller.cpp which rename theme elements
-# * removed unrelated panelappletoverlay.cpp changes from
-#   http://websvn.kde.org/?view=rev&revision=857606 which need library changes
-Patch104: kdebase-workspace-4.1.2-panel-autohide.patch
-# panel autohide bugfixes
-# (use sed -i -e 's!plasma/shells/desktop!plasma/plasma!g' to backport):
-# http://websvn.kde.org/?view=rev&revision=866710
-# http://websvn.kde.org/?view=rev&revision=866715
-Patch105: kdebase-workspace-4.1.2-panel-autohide-fix-flicker.patch
-# http://websvn.kde.org/?view=rev&revision=866998
-Patch106: kdebase-workspace-4.1.2-panel-autohide-866998.patch
-# http://websvn.kde.org/?view=rev&revision=868231
-Patch107: kdebase-workspace-4.1.2-panel-autohide-868231.patch
-# http://websvn.kde.org/?view=rev&revision=869277
-Patch108: kdebase-workspace-4.1.2-panel-autohide-869277.patch
-# http://websvn.kde.org/?view=rev&revision=869882
-# http://websvn.kde.org/?view=rev&revision=869925
-# http://websvn.kde.org/?view=rev&revision=870041
-Patch109: kdebase-workspace-4.1.2-panel-autohide-coords.patch
-# http://websvn.kde.org/?view=rev&revision=871058
-Patch110: kdebase-workspace-4.1.2-panel-autohide-871058.patch
-# end panel autohide bugfixes
-
-# KDE Bug 159510: 	 krunner doesn't store settings
-Patch111: kdebase-workspace-4.1.4-krunnerhistory.patch
+# trunk
+Patch100: kdebase-workspace-4.1.96-AllowExternalPaths.patch
 
 # FIXME: "inconsistent naming System Monitor vs KSysGuard" http://bugs.kde.org/162151
 
 Provides: kdebase-kdm = 6:%{version}-%{release}
 Provides: kdm = %{version}-%{release}
 
+# FIXME: Should we restore this now that kdebase no longer depends on kdebase-workspace?
 %if 0%{?fedora} == 9
 # upgrade path: kdebase(3) -> kdebase-workspace
 Obsoletes: kdebase < 6:4
@@ -89,11 +45,15 @@
 # kdmtheme's functionality is now provided by kdebase-workspace itself
 Obsoletes: kdmtheme < 1.3
 
+%if 0%{?fedora} > 10
+# kpowersave -> powerdevil upgrade path
+Obsoletes: kpowersave < 0.7.3-10
+%endif
+
 BuildRequires: bluez-libs-devel
-BuildRequires: cmake
 BuildRequires: ConsoleKit-devel
+BuildRequires: google-gadgets-devel >= 0.10.5
 BuildRequires: glib2-devel
-BuildRequires: kde-filesystem >= 4
 BuildRequires: kdelibs4-devel >= %{version}
 BuildRequires: libcaptury-devel
 BuildRequires: libraw1394-devel
@@ -105,6 +65,11 @@
 BuildRequires: qimageblitz-devel
 BuildRequires: soprano-devel
 BuildRequires: openldap-devel
+BuildRequires: python-devel
+BuildRequires: PyKDE4-devel >= %{version}
+BuildRequires: qedje-devel
+# used for the Logitech mouse KCM, disabled until #399931 is fixed
+# BuildRequires: libusb-devel
 
 Requires: %{name}-libs = %{version}-%{release}
 Requires: kde-settings-kdm
@@ -112,7 +77,7 @@
 Requires(post): xdg-utils
 Requires(postun): xdg-utils
 
-# would much rather these deps be elsewhere, 
+# would much rather these deps be elsewhere,
 # but adding here doesn't hurt either -- Rex
 Requires: kdebase-runtime >= %{version}
 Requires: oxygen-icon-theme
@@ -135,7 +100,7 @@
 %endif
 
 %description
-The KDE Workspace consists of what is the desktop of the 
+The KDE Workspace consists of what is the desktop of the
 KDE Desktop Environment.
 
 This package contains:
@@ -154,7 +119,6 @@
 %package devel
 Group:    Development/Libraries
 Summary:  Development files for %{name}
-Provides: plasma-devel = %{version}-%{release}
 Requires: %{name}-libs = %{version}-%{release}
 Requires: kdelibs4-devel
 %description devel
@@ -164,16 +128,15 @@
 Summary: Runtime libraries for %{name}
 Group:   System Environment/Libraries
 Requires: kdelibs4 >= %{version}
-# out of paranoia really, may or may not be 100% essential.  -- Rex
 Requires: %{name} = %{version}-%{release}
 %description libs
 %{summary}.
 
-%package wallpapers 
-Summary: KDE wallpapers 
+%package wallpapers
+Summary: KDE wallpapers
 Group: User Interface/Desktops
 Requires: kde-filesystem
-%description wallpapers 
+%description wallpapers
 %{summary}.
 
 %package -n ksysguardd
@@ -182,10 +145,10 @@
 %description -n ksysguardd
 %{summary}.
 
-%package -n oxygen-cursor-themes 
-Summary: Oxygen cursor themes 
+%package -n oxygen-cursor-themes
+Summary: Oxygen cursor themes
 Group: User Interface/Desktops
-%description -n oxygen-cursor-themes 
+%description -n oxygen-cursor-themes
 %{summary}.
 
 
@@ -196,37 +159,22 @@
 
 # RH/Fedora-specific startkde changes
 %patch1 -p1 -b .redhat-startkde
-# ConsoleKit support for KDM (#228111, #430388, kde#147790)
-%patch2 -p1 -b .consolekit
-%patch3 -p1 -b .plasma-konsole
-%patch4 -p1 -b .show-systemsettings
+%patch2 -p1 -b .plasma-konsole
+%patch3 -p1 -b .show-systemsettings
 # ConsoleKit >= 0.2.4 shutdown/reboot support (needed for GDM 2.22)
-%patch5 -p1 -b .ck-shutdown
+%patch4 -p1 -b .ck-shutdown
 pushd systemsettings
-%patch6 -p0 -b .rootprivs
+%patch5 -p0 -b .rootprivs
 popd
-%patch7 -p0 -b .timedate-kcm
-%patch8 -p0 -b .krdb
-%patch9 -p1 -b .kickoff-suspend
-%patch10 -p1 -b .klipper-url
-%patch11 -p1 -b .plasma-default-wallpaper
-%patch12 -p1 -b .multihead
-%patch13 -p1 -b .session-button
-%patch14 -p1 -b .ldap
-%patch15 -p1 -b .kdm-i18n
-%patch16 -p1 -b .default_applets
+%patch6 -p0 -b .timedate-kcm
+%patch7 -p0 -b .krdb
+%patch8 -p1 -b .klipper-url
+%patch9 -p1 -b .session-button
+%patch10 -p1 -b .ldap
+%patch11 -p1 -b .font
 
 # upstream patches
-%patch100 -p1 -b .plasma-tooltips
-%patch102 -p0 -b .kwin-taskbarthumbnail
-%patch104 -p0 -b .panel-autohide
-%patch105 -p0 -b .panel-autohide2
-%patch106 -p0 -b .panel-autohide3
-%patch107 -p0 -b .panel-autohide4
-%patch108 -p0 -b .panel-autohide5
-%patch109 -p0 -b .panel-autohide6
-%patch110 -p0 -b .panel-autohide7
-%patch111 -p1 -b .krunnerhistory
+%patch100 -p1 -b .AllowExternalPaths
 
 %build
 
@@ -244,7 +192,7 @@
 %install
 rm -rf %{buildroot}
 
-make install DESTDIR=%{buildroot} -C %{_target_platform}
+make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
 # xsession support
 mkdir -p %{buildroot}%{_datadir}/xsessions/
@@ -260,28 +208,6 @@
 ln -sf ../pics/users/%{default_face_icon} .default.face.icon
 popd
 
-# move devel symlinks
-mkdir -p %{buildroot}%{_kde4_libdir}/kde4/devel
-pushd %{buildroot}%{_kde4_libdir}
-for i in lib*.so
-do
-  case "$i" in
-    libkdeinit*.so)
-      ;;
-    # leave libworkspace.so for kate
-    libkworkspace.so|libplasma.so)
-      linktarget=`readlink "$i"`
-      ln -sf "../../$linktarget" "kde4/devel/$i"
-      ;;
-    *)
-      linktarget=`readlink "$i"`
-      rm -f "$i"
-      ln -sf "../../$linktarget" "kde4/devel/$i"
-      ;;
-  esac
-done
-popd
-
 
 %clean
 rm -rf %{buildroot}
@@ -316,6 +242,7 @@
 %{_kde4_datadir}/autostart/*
 %{_kde4_datadir}/applications/kde4/*
 %{_datadir}/dbus-1/interfaces/*
+%{_datadir}/dbus-1/services/*
 %{_kde4_datadir}/config.kcfg/*
 %{_datadir}/xsessions/*
 %{_kde4_docdir}/HTML/en/*
@@ -326,18 +253,28 @@
 %{_libdir}/strigi/
 %{_kde4_libdir}/libkdeinit*.so
 %{_kde4_libdir}/kconf_update_bin/*
+%{python_sitearch}/PyKDE4/plasmascript.py*
 
 %files libs
 %defattr(-,root,root,-)
 %{_kde4_libdir}/lib*.so.*
+%{_kde4_libdir}/libplasma_applet-system-monitor.so
 
 %files devel
 %defattr(-,root,root,-)
 %{_kde4_includedir}/*
 %{_kde4_libdir}/lib*.so
-%{_kde4_libdir}/kde4/devel/lib*.so
 %{_kde4_libdir}/kde4/plugins/designer/ksysguardwidgets.so
+%{_kde4_libdir}/kde4/plugins/designer/ksysguardlsofwidgets.so
+# CMake seems to change behaviour between F11's cmake (2.6.3rc5)
+# and F10's cmake (2.6.2) -- Lorenzo
+%if 0%{?fedora} > 10
+%{_kde4_libdir}/cmake/KDE4Workspace*
+%else
+%{_kde4_libdir}/KDE4Workspace*
+%endif
 %exclude %{_kde4_libdir}/libkdeinit*.so
+%exclude %{_kde4_libdir}/libplasma_applet-system-monitor.so
 
 %files wallpapers
 %defattr(-,root,root,-)
@@ -363,20 +300,105 @@
 
 
 %changelog
-* Thu Jan  8 2009 Luk???? Tinkl <ltinkl at redhat.com> 4.1.4-1
-- KDE 4.1.4
+* Thu Jan 22 2009 Than Ngo <than at redhat.com> - 4.2.0-1
+- 4.2.0
+
+* Fri Jan 16 2009 Than Ngo <than at redhat.com> - 4.1.96-4
+- backport fix from trunk to allow symlinks in wallpaper theme
+
+* Wed Jan 14 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.1.96-3
+- BR: google-gadgets-devel > 0.10.5
+
+* Fri Jan 09 2009 Than Ngo <than at redhat.com> - 4.1.96-2
+- remove Provides: plasma-devel  
+
+* Wed Jan 07 2009 Than Ngo <than at redhat.com> - 4.1.96-1
+- 4.2rc1
+
+* Tue Dec 23 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.85-7
+- Obsoletes: kpowersave (kpowersave -> powerdevil upgrade path, F-11+)
+
+* Mon Dec 22 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.85-6
+- (re)enable edje, google-gadget support
+
+* Thu Dec 18 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.85-5
+- drop BR edje-devel, we need QEdje instead, which we don't have yet
+- comment out BR google-gadgets-* for now, need 0.10.4, have 0.10.3
 
-* Wed Dec 10 2008 Luk???? Tinkl <ltinkl at redhat.com> 4.1.3-7
-- fix krunner (aka minicli) not remembering command history between
-  sessions (kdebug:159510)
+* Thu Dec 18 2008 Rex Dieter <rdieter at fedoraproject.org> - 4.1.85-4
+- BR: edje-devel
+- BR: google-gadgets-devel
+
+* Tue Dec 16 2008 Rex Dieter <rdieter at fedoraproject.org> - 4.1.85-3
+- respun tarball
+
+* Fri Dec 12 2008 Rex Dieter <rdieter at fedoraproject.org> - 4.1.85-2
+- BR: PyKDE4-devel >= %%version
+
+* Thu Dec 11 2008 Than Ngo <than at redhat.com> -  4.1.85-1
+- 4.2beta2
+
+* Wed Dec 10 2008 Lorenzo Villani <lvillani at binaryhelix.net> - 4.1.82-1
+- 4.1.82
+- rebase redhat-startkde patch
+
+* Fri Dec 05 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.80-12
+- move libplasma_applet-system-monitor.so from -devel to -libs (not a symlink)
+
+* Fri Dec 05 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.80-11
+- drop devel symlink (parallel -devel) hacks, not needed anymore in this package
+
+* Tue Dec 02 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.80-10
+- keep libtaskmanager.so in libdir
+
+* Tue Dec 02 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.80-9
+- keep libweather_ion.so in libdir
+
+* Tue Dec 02 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.80-8
+- keep libplasmaclock.so in libdir
+
+* Mon Dec 01 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.80-7
+- rebuild for Python 2.6
+
+* Thu Nov 27 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.80-6
+- disable Logitech mouse KCM again until #399931 is fixed
+
+* Thu Nov 27 2008 Lorenzo Villani <lvillani at binaryhelix.net> - 4.1.80-5
+- use python_sitearch for x86_64 systems
+- kephal seems to be disabled/removed, re-adapted file lists
+
+* Tue Nov 25 2008 Than Ngo <than at redhat.com> 4.1.80-4
+- respin
 
-* Thu Nov 20 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.3-6
-- -devel: Provides: plasma-devel
+* Sun Nov 23 2008 Lorenzo Villani <lvillani at binaryhelix.net> - 4.1.80-3
+- rebase kdebase-workspace-4.1.1-show-systemsettings.patch
+- new library: Kephal -> adapt file lists
+
+* Wed Nov 19 2008 Than Ngo <than at redhat.com> 4.1.80-2
+- merged
+- drop kdebase-workspace-4.1.2-kdm-i18n.patch, it's included in upstream
+- drop kdebase-workspace-4.0.85-plasma-default-wallpaper.patch, it's included in upstream
+- drop kdebase-workspace-4.1.65-consolekit-kdm.patch
+- add kdebase-workspace-4.1.80-session-button.patch
+- add kdebase-workspace-4.1.2-ldap.patch
+
+* Wed Nov 19 2008 Lorenzo Villani <lvillani at binaryhelix.net> - 4.1.80-1
+- 4.1.80
+- BR cmake >= 2.6.2
+- make install/fast
+- drop _default_patch_fuzz 2
+- rebase startkde patch
+- rebase plasma-konsole patch
+- rebase ck-shutdown patch
+- add PyKDE4-devel, python-devel and PyQt4-devel to build plasma's python
+  scripting interface
+- BR google-gadgets-devel for google gadgets scriptengine
+- BR libusb-devel for Logitech USB support in KControl
 
-* Thu Nov 13 2008 Than Ngo <than at redhat.com> 4.1.3-5
+* Thu Nov 13 2008 Than Ngo <than at redhat.com>??4.1.3-5
 - apply upstream patch to fix X crash when disabling compositing
 
-* Wed Nov 12 2008 Than Ngo <than at redhat.com> 4.1.3-4
+* Wed Nov 12 2008 Than Ngo <than at redhat.com> 4.1.3-1
 - 4.1.3
 
 * Fri Nov 07 2008 Than Ngo <than at redhat.com> 4.1.2-14
@@ -702,7 +724,7 @@
 - Obsoletes: kdmtheme
 
 * Mon Dec 17 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.97.0-3
-- Requires: coreutils dbus-x11 xorg-x11-apps xorg-x11-utils 
+- Requires: coreutils dbus-x11 xorg-x11-apps xorg-x11-utils
             xorg-x11-server-utils (used in startkde)
 - drop pam configs that were previously moved to kde-settings
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/F-10/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- sources	8 Jan 2009 11:13:10 -0000	1.25
+++ sources	24 Jan 2009 06:17:59 -0000	1.26
@@ -1 +1 @@
-bdac9ac8055b976845587fe544d568be  kdebase-workspace-4.1.4.tar.bz2
+193e30b9ed0b55b0196289d9df43a904  kdebase-workspace-4.2.0.tar.bz2


--- kdebase-workspace-4.0.72-plasma-konsole.patch DELETED ---


--- kdebase-workspace-4.0.80-ksysguard-onlyshowin.patch DELETED ---


--- kdebase-workspace-4.0.98-consolekit-kdm.patch DELETED ---


--- kdebase-workspace-4.0.98-kickoff-suspend.patch DELETED ---


--- kdebase-workspace-4.1.0-enable-kwin-taskbarthumbnail.patch DELETED ---


--- kdebase-workspace-4.1.0-kde#152914.patch DELETED ---


--- kdebase-workspace-4.1.0-plasma-tooltips.patch DELETED ---


--- kdebase-workspace-4.1.2-default_applets.patch DELETED ---


--- kdebase-workspace-4.1.2-multihead.patch DELETED ---


--- kdebase-workspace-4.1.2-panel-autohide-866998.patch DELETED ---


--- kdebase-workspace-4.1.2-panel-autohide-868231.patch DELETED ---


--- kdebase-workspace-4.1.2-panel-autohide-869277.patch DELETED ---


--- kdebase-workspace-4.1.2-panel-autohide-871058.patch DELETED ---


--- kdebase-workspace-4.1.2-panel-autohide-coords.patch DELETED ---


--- kdebase-workspace-4.1.2-panel-autohide-fix-flicker.patch DELETED ---


--- kdebase-workspace-4.1.2-panel-autohide.patch DELETED ---


--- kdebase-workspace-4.1.2-redhat-startkde.patch DELETED ---


--- kdebase-workspace-4.1.2-session-button.patch DELETED ---


--- kdebase-workspace-4.1.4-krunnerhistory.patch DELETED ---



From rdieter at fedoraproject.org  Sat Jan 24 06:20:41 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sat, 24 Jan 2009 06:20:41 +0000 (UTC)
Subject: rpms/kdeutils/F-10 kdeutils.spec,1.148,1.149 sources,1.58,1.59
Message-ID: <20090124062041.8B9A07010A@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdeutils/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13298

Modified Files:
	kdeutils.spec sources 
Log Message:
* Thu Jan 22 2009 Than Ngo <than at redhat.com> - 4.2.0-1
- 4.2.0



Index: kdeutils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeutils/F-10/kdeutils.spec,v
retrieving revision 1.148
retrieving revision 1.149
diff -u -r1.148 -r1.149
--- kdeutils.spec	9 Jan 2009 04:51:11 -0000	1.148
+++ kdeutils.spec	24 Jan 2009 06:20:11 -0000	1.149
@@ -1,4 +1,3 @@
-
 %if 0%{?fedora} > 9
 # include new PyKDE4 printer applet
 %define printer_applet 1
@@ -11,7 +10,7 @@
 
 Name:           kdeutils
 Epoch:          6
-Version:        4.1.4
+Version:        4.2.0
 Release:        1%{?dist}
 Summary:        K Desktop Environment - Utilities
 
@@ -27,29 +26,22 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # FIXME/TODO: Tpctl is needed for klaptopdaemon
-BuildRequires:  cmake
-BuildRequires:  kde-filesystem >= 4
-%{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
-BuildRequires:  kdelibs4-devel >= %{version}
 BuildRequires:  kdepimlibs-devel >= %{version}
-BuildRequires:  kdebase-workspace-devel >= %{version}
+BuildRequires:  plasma-devel >= %{version}
 BuildRequires:  gmp-devel
 BuildRequires:  libarchive-devel
 BuildRequires:  libzip-devel
-BuildRequires:  openldap-devel
-BuildRequires:  python-devel
 BuildRequires:  qimageblitz-devel
 
 Requires(post): /sbin/ldconfig xdg-utils
 Requires(postun): /sbin/ldconfig xdg-utils
 Requires: kdelibs4 >= %{version}
 %if 0%{?printer_applet}
-# (new) printer applet 
-BuildRequires:  PyKDE4-devel
-BuildRequires:  system-config-printer
-Requires: PyKDE4
+BuildRequires:  PyKDE4-devel >= %{version}
+BuildRequires:  system-config-printer-libs
+Requires: PyKDE4 >= %{version}
 Requires: hal-cups-utils
-Requires: system-config-printer
+Requires: system-config-printer-libs
 %endif
 
 Provides:       okteta = 0.1.0-1
@@ -88,9 +80,9 @@
 
 %package devel
 Group:    Development/Libraries
-Summary:  Development files for %{name} 
+Summary:  Development files for %{name}
 Requires: %{name}-libs = %{epoch}:%{version}-%{release}
-Requires: kdelibs4-devel kdepimlibs4-devel kdebase-workspace-devel
+Requires: kdepimlibs4-devel kdebase-workspace-devel
 %description devel
 %{summary}.
 
@@ -123,7 +115,7 @@
 %install
 rm -rf %{buildroot}
 
-make install DESTDIR=%{buildroot} -C %{_target_platform}
+make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
 # nothing should build against these
 rm -f %{buildroot}%{_kde4_libdir}/liboktetacore.so %{buildroot}%{_kde4_libdir}/liboktetagui.so
@@ -171,17 +163,7 @@
 %{_kde4_datadir}/kde4/services/*
 %{_kde4_datadir}/kde4/servicetypes/*
 %{_kde4_datadir}/applications/kde4/*
-%{_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/
-%{_kde4_docdir}/HTML/en/ktimer/
-%{_kde4_docdir}/HTML/en/kwallet/
-%{_kde4_docdir}/HTML/en/okteta/
-%{_kde4_docdir}/HTML/en/superkaramba/
+%{_kde4_docdir}/HTML/en/*
 %{_kde4_iconsdir}/hicolor/*/apps/*
 %{_kde4_iconsdir}/oxygen/*/*/*
 %{_datadir}/dbus-1/interfaces/*
@@ -194,6 +176,7 @@
 %{_kde4_appsdir}/kjots/
 %{_kde4_docdir}/HTML/en/kjots/
 %endif
+%{_mandir}/man1/*
 
 %if 0
 %files libs
@@ -211,8 +194,34 @@
 
 
 %changelog
-* Fri Jan 09 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.4-1
-- 4.1.4
+* Thu Jan 22 2009 Than Ngo <than at redhat.com> - 4.2.0-1
+- 4.2.0
+
+* Wed Jan 14 2009 Rex Dieter <rdieter at fedoraproject.org> 4.1.96-2
+- (Build)Req: system-config-printer-libs
+
+* Wed Jan 07 2009 Than Ngo <than at redhat.com> - 4.1.96-1
+- 4.2rc1
+
+* Fri Dec 12 2008 Than Ngo <than at redhat.com> 4.1.85-1
+- 4.2beta2
+
+* Mon Dec 08 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.80-5
+- BR: PyKDE4-devel >= %%version (vs previously unversioned BR)
+
+* Mon Dec 01 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.80-4
+- rebuild for Python 2.6
+
+* Mon Dec 01 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.80-3
+- BR plasma-devel instead of kdebase-workspace-devel
+
+* Thu Nov 20 2008 Than Ngo <than at redhat.com> 4.1.80-2
+- merged
+
+* Thu Nov 20 2008 Lorenzo Villani <lvillani at binaryhelix.net> - 6:4.1.80-1
+- 4.1.80
+- BR cmake >= 2.6.2
+- make install/fast
 
 * Wed Nov 12 2008 Than Ngo <than at redhat.com> 4.1.3-1
 - 4.1.3
@@ -258,7 +267,7 @@
 - 4.0.84
 
 * Sat Jun 21 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.0.83-2
-- add explicit dep on rhpl to work around missing dep in 
+- add explicit dep on rhpl to work around missing dep in
   system-config-printer (#452575)
 
 * Thu Jun 19 2008 Than Ngo <than at redhat.com> 4.0.83-1


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdeutils/F-10/sources,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- sources	9 Jan 2009 04:51:11 -0000	1.58
+++ sources	24 Jan 2009 06:20:11 -0000	1.59
@@ -1 +1 @@
-542663eeae777978dafab2dcf9d422c2  kdeutils-4.1.4.tar.bz2
+f0ca24c7d3e5bb0ab55bf6b26fc6224e  kdeutils-4.2.0.tar.bz2



From corsepiu at fedoraproject.org  Sat Jan 24 06:21:03 2009
From: corsepiu at fedoraproject.org (=?utf-8?q?Ralf_Cors=C3=A9pius?=)
Date: Sat, 24 Jan 2009 06:21:03 +0000 (UTC)
Subject: rpms/rt3/devel rt3.spec,1.33,1.34
Message-ID: <20090124062103.7C9F970141@cvs1.fedora.phx.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/rt3/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13381

Modified Files:
	rt3.spec 
Log Message:
* Sat Jan 24 2009 Ralf Cors??pius <corsepiu at fedoraproject.org> - 3.8.2-3
- Fix date in changelog entry.



Index: rt3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rt3/devel/rt3.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- rt3.spec	24 Jan 2009 06:10:10 -0000	1.33
+++ rt3.spec	24 Jan 2009 06:20:33 -0000	1.34
@@ -40,7 +40,7 @@
 
 Name:		rt3
 Version:	3.8.2
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Request tracker 3
 
 Group:		Applications/Internet
@@ -427,7 +427,10 @@
 %{RT3_LIBDIR}/RT/Test*
 
 %changelog
-* Fri Jan 24 2009 Ralf Cors??pius <corsepiu at fedoraproject.org> - 3.8.2-2
+* Sat Jan 24 2009 Ralf Cors??pius <corsepiu at fedoraproject.org> - 3.8.2-3
+- Fix date in changelog entry.
+
+* Sat Jan 24 2009 Ralf Cors??pius <corsepiu at fedoraproject.org> - 3.8.2-2
 - Filter out R: perl(Test::Email).
 - Add perl-RT-Test package.
 - Activate --with devel_mode.



From iarnell at fedoraproject.org  Sat Jan 24 06:26:07 2009
From: iarnell at fedoraproject.org (Iain Arnell)
Date: Sat, 24 Jan 2009 06:26:07 +0000 (UTC)
Subject: rpms/perl-Devel-SmallProf/devel perl-Devel-SmallProf.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090124062607.DC84E7010A@cvs1.fedora.phx.redhat.com>

Author: iarnell

Update of /cvs/pkgs/rpms/perl-Devel-SmallProf/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14860

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Devel-SmallProf.spec 
Log Message:
initial import


--- NEW FILE perl-Devel-SmallProf.spec ---
Name:           perl-Devel-SmallProf
Version:        2.02
Release:        2%{?dist}
Summary:        Per-line Perl profiler
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Devel-SmallProf/
Source0:        http://www.cpan.org/authors/id/S/SA/SALVA/Devel-SmallProf-%{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::HiRes)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
The Devel::SmallProf profiler is focused on the time taken for a program
run on a line-by-line basis. It is intended to be as "small" in terms of
impact on the speed and memory usage of the profiled program as possible
and also in terms of being simple to use.

%prep
%setup -q -n Devel-SmallProf-%{version}

iconv -f iso8859-1 -t utf-8 README >README.conv && mv -f README.conv README

cat << \EOF > %{name}-prov
#!/bin/sh
%{__perl_provides} $* |\
sed -e '/perl(DB)/d'
EOF

%define __perl_provides %{_builddir}/Devel-SmallProf-%{version}/%{name}-prov
chmod +x %{__perl_provides}


%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT

make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT

find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;

%{_fixperms} $RPM_BUILD_ROOT/*

%check
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Changes README TODO
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Fri Jan 23 2009 Iain Arnell <iarnell at gmail.com> 2.02-2
- strip bogus provides

* Wed Jan 21 2009 Iain Arnell 2.02-1
- Specfile autogenerated by cpanspec 1.77.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Devel-SmallProf/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	23 Jan 2009 23:30:08 -0000	1.1
+++ .cvsignore	24 Jan 2009 06:25:37 -0000	1.2
@@ -0,0 +1 @@
+Devel-SmallProf-2.02.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Devel-SmallProf/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	23 Jan 2009 23:30:08 -0000	1.1
+++ sources	24 Jan 2009 06:25:37 -0000	1.2
@@ -0,0 +1 @@
+498704ed1b888fc62b0c7092f8b590f5  Devel-SmallProf-2.02.tar.gz



From rdieter at fedoraproject.org  Sat Jan 24 06:27:13 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sat, 24 Jan 2009 06:27:13 +0000 (UTC)
Subject: rpms/kdeadmin/F-10 kdeadmin.spec,1.115,1.116
Message-ID: <20090124062713.728147010A@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdeadmin/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15003

Modified Files:
	kdeadmin.spec 
Log Message:
botched tag?  respin



Index: kdeadmin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeadmin/F-10/kdeadmin.spec,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -r1.115 -r1.116
--- kdeadmin.spec	7 Jan 2009 10:47:26 -0000	1.115
+++ kdeadmin.spec	24 Jan 2009 06:26:43 -0000	1.116
@@ -1,7 +1,7 @@
 Name:           kdeadmin
 Epoch:          7
-Version:        4.1.4
-Release:        1%{?dist}
+Version:        4.2.0
+Release:        1%{?dist}.1
 Summary:        K Desktop Environment - Administrative tools
 
 Group:          User Interface/Desktops
@@ -13,20 +13,16 @@
 Source1:        kuser.pam
 Source2:        kuser.pamd
 
-BuildRequires:  cmake
-BuildRequires:  kde-filesystem >= 4
-%{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
 BuildRequires:  kdelibs4-devel >= %{version}
 BuildRequires:  kdepimlibs-devel >= %{version}
-BuildRequires:  openldap-devel
+BuildRequires:  python-devel
+BuildRequires:  PyKDE4-devel >= %{version}
+BuildRequires:  system-config-printer-libs
 
 Requires(post): /sbin/ldconfig xdg-utils
 Requires(postun): /sbin/ldconfig xdg-utils
 Requires: kdelibs4 >= %{version}
 Requires: kdepimlibs >= %{version}
-# kcron/knetworkconf kcm modules
-Requires: kdebase-workspace
-
 
 %description
 The %{name} package includes administrative tools including:
@@ -47,6 +43,15 @@
 
 It is based upon the "Smart Package Manager".
 
+%package -n system-config-printer-kde
+Summary: A printer administration tool for KDE 
+Group: System Environment/Base
+Requires: PyKDE4 >= %{version}
+Requires: system-config-printer-libs
+%description -n system-config-printer-kde
+A printer administration tool for KDE that allows the user to configure
+a CUPS print server.
+
 
 %prep
 %setup -q
@@ -65,7 +70,7 @@
 %install
 rm -rf %{buildroot}
 
-make install DESTDIR=%{buildroot} -C %{_target_platform}
+make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
 # remove broken .pc file which has no business to be in a non-devel pkg anyway
 rm -rf %{buildroot}%{_libdir}/pkgconfig
@@ -104,8 +109,10 @@
 %{_kde4_docdir}/HTML/en/kcron/
 %{_kde4_docdir}/HTML/en/ksystemlog/
 %{_kde4_docdir}/HTML/en/kuser/
-%{_kde4_iconsdir}/hicolor/*/*/*
-%exclude %{_kde4_iconsdir}/hicolor/*/*/kpackage*
+%{_kde4_iconsdir}/hicolor/*/*/knetworkconf.*
+%{_kde4_iconsdir}/hicolor/*/*/ksystemlog.*
+%{_kde4_iconsdir}/hicolor/*/*/kuser.*
+%{_kde4_iconsdir}/hicolor/*/*/network*
 %{_kde4_libdir}/kde4/kcm_cron.so
 %{_kde4_libdir}/kde4/kcm_knetworkconfmodule.so
 
@@ -118,10 +125,40 @@
 %{_kde4_docdir}/HTML/en/kpackage/
 %{_kde4_iconsdir}/hicolor/*/*/kpackage*
 
+%files -n system-config-printer-kde
+%defattr(-,root,root,-)
+%{_kde4_bindir}/system-config-printer-kde
+%{_kde4_datadir}/applications/kde4/system-config-printer-kde.desktop
+%{_kde4_appsdir}/system-config-printer-kde/
+
 
 %changelog
-* Wed Jan 07 2009 Than Ngo <than at redhat.com> - 4.1.4-1
-- 4.1.4
+* Thu Jan 22 2009 Than Ngo <than at redhat.com> - 4.2.0-1
+- 4.2.0
+
+* Wed Jan 14 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.1.96-2
+- include system-config-printer-kde
+
+* Wed Jan 07 2009 Than Ngo <than at redhat.com> - 4.1.96-1
+- 4.2rc1
+
+* Thu Dec 11 2008 Than Ngo <than at redhat.com> -  4.1.85-1
+- 4.2beta2
+
+* Thu Dec 04 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.80-4
+- rebuild for fixed kde-filesystem (macros.kde4) (get rid of rpaths)
+
+* Thu Dec 04 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.80-3
+- drop Requires: kdebase-workspace
+
+* Thu Nov 20 2008 Than Ngo <than at redhat.com> 4.1.80-2
+- get rid of duplicated BRs
+
+* Wed Nov 19 2008 Lorenzo Villani <lvillani at binaryhelix.net> - 7:4.1.80-1
+- 4.1.80
+- BR cmake 2.6
+- BR python-devel
+- make install/fast
 
 * Tue Nov 11 2008 Than Ngo <than at redhat.com> 4.1.3-1
 - 4.1.3
@@ -237,7 +274,7 @@
 - +BR: kde4-macros(api)
 
 * Thu Nov 15 2007 Sebastian Vahl <fedora at deadbabylon.de> 7:3.96.0-2
-- included AUTHORS 
+- included AUTHORS
 - added %%post and %%postun
 - BR: kde-filesystem
 



From rdieter at fedoraproject.org  Sat Jan 24 06:33:42 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sat, 24 Jan 2009 06:33:42 +0000 (UTC)
Subject: rpms/kdeadmin/F-10 .cvsignore,1.54,1.55 sources,1.57,1.58
Message-ID: <20090124063342.E500F7010A@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdeadmin/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15909

Modified Files:
	.cvsignore sources 
Log Message:
botched sources, update/fix



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdeadmin/F-10/.cvsignore,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- .cvsignore	7 Jan 2009 10:47:26 -0000	1.54
+++ .cvsignore	24 Jan 2009 06:33:12 -0000	1.55
@@ -1,2 +1,5 @@
 kdeadmin-4.1.2.tar.bz2
-kdeadmin-4.1.4.tar.bz2
+kdeadmin-4.1.80.tar.bz2
+kdeadmin-4.1.85.tar.bz2
+kdeadmin-4.1.96.tar.bz2
+kdeadmin-4.2.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdeadmin/F-10/sources,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- sources	7 Jan 2009 10:47:26 -0000	1.57
+++ sources	24 Jan 2009 06:33:12 -0000	1.58
@@ -1 +1 @@
-c3194bc30daacae33322993f2dba0074  kdeadmin-4.1.4.tar.bz2
+2c5b33477b5679bcd9fdbc1f8017e6fb  kdeadmin-4.2.0.tar.bz2



From iarnell at fedoraproject.org  Sat Jan 24 06:39:57 2009
From: iarnell at fedoraproject.org (Iain Arnell)
Date: Sat, 24 Jan 2009 06:39:57 +0000 (UTC)
Subject: rpms/perl-Devel-SmallProf/F-10 perl-Devel-SmallProf.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090124063957.4883F7010A@cvs1.fedora.phx.redhat.com>

Author: iarnell

Update of /cvs/pkgs/rpms/perl-Devel-SmallProf/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16689/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Devel-SmallProf.spec 
Log Message:
initial import on branches


--- NEW FILE perl-Devel-SmallProf.spec ---
Name:           perl-Devel-SmallProf
Version:        2.02
Release:        2%{?dist}
Summary:        Per-line Perl profiler
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Devel-SmallProf/
Source0:        http://www.cpan.org/authors/id/S/SA/SALVA/Devel-SmallProf-%{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::HiRes)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
The Devel::SmallProf profiler is focused on the time taken for a program
run on a line-by-line basis. It is intended to be as "small" in terms of
impact on the speed and memory usage of the profiled program as possible
and also in terms of being simple to use.

%prep
%setup -q -n Devel-SmallProf-%{version}

iconv -f iso8859-1 -t utf-8 README >README.conv && mv -f README.conv README

cat << \EOF > %{name}-prov
#!/bin/sh
%{__perl_provides} $* |\
sed -e '/perl(DB)/d'
EOF

%define __perl_provides %{_builddir}/Devel-SmallProf-%{version}/%{name}-prov
chmod +x %{__perl_provides}


%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT

make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT

find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;

%{_fixperms} $RPM_BUILD_ROOT/*

%check
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Changes README TODO
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Fri Jan 23 2009 Iain Arnell <iarnell at gmail.com> 2.02-2
- strip bogus provides

* Wed Jan 21 2009 Iain Arnell 2.02-1
- Specfile autogenerated by cpanspec 1.77.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Devel-SmallProf/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	23 Jan 2009 23:30:08 -0000	1.1
+++ .cvsignore	24 Jan 2009 06:39:26 -0000	1.2
@@ -0,0 +1 @@
+Devel-SmallProf-2.02.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Devel-SmallProf/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	23 Jan 2009 23:30:08 -0000	1.1
+++ sources	24 Jan 2009 06:39:26 -0000	1.2
@@ -0,0 +1 @@
+498704ed1b888fc62b0c7092f8b590f5  Devel-SmallProf-2.02.tar.gz



From iarnell at fedoraproject.org  Sat Jan 24 06:39:57 2009
From: iarnell at fedoraproject.org (Iain Arnell)
Date: Sat, 24 Jan 2009 06:39:57 +0000 (UTC)
Subject: rpms/perl-Devel-SmallProf/F-9 perl-Devel-SmallProf.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090124063957.805B97010A@cvs1.fedora.phx.redhat.com>

Author: iarnell

Update of /cvs/pkgs/rpms/perl-Devel-SmallProf/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16689/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Devel-SmallProf.spec 
Log Message:
initial import on branches


--- NEW FILE perl-Devel-SmallProf.spec ---
Name:           perl-Devel-SmallProf
Version:        2.02
Release:        2%{?dist}
Summary:        Per-line Perl profiler
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Devel-SmallProf/
Source0:        http://www.cpan.org/authors/id/S/SA/SALVA/Devel-SmallProf-%{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::HiRes)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
The Devel::SmallProf profiler is focused on the time taken for a program
run on a line-by-line basis. It is intended to be as "small" in terms of
impact on the speed and memory usage of the profiled program as possible
and also in terms of being simple to use.

%prep
%setup -q -n Devel-SmallProf-%{version}

iconv -f iso8859-1 -t utf-8 README >README.conv && mv -f README.conv README

cat << \EOF > %{name}-prov
#!/bin/sh
%{__perl_provides} $* |\
sed -e '/perl(DB)/d'
EOF

%define __perl_provides %{_builddir}/Devel-SmallProf-%{version}/%{name}-prov
chmod +x %{__perl_provides}


%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT

make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT

find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;

%{_fixperms} $RPM_BUILD_ROOT/*

%check
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Changes README TODO
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Fri Jan 23 2009 Iain Arnell <iarnell at gmail.com> 2.02-2
- strip bogus provides

* Wed Jan 21 2009 Iain Arnell 2.02-1
- Specfile autogenerated by cpanspec 1.77.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Devel-SmallProf/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	23 Jan 2009 23:30:08 -0000	1.1
+++ .cvsignore	24 Jan 2009 06:39:27 -0000	1.2
@@ -0,0 +1 @@
+Devel-SmallProf-2.02.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Devel-SmallProf/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	23 Jan 2009 23:30:08 -0000	1.1
+++ sources	24 Jan 2009 06:39:27 -0000	1.2
@@ -0,0 +1 @@
+498704ed1b888fc62b0c7092f8b590f5  Devel-SmallProf-2.02.tar.gz



From corsepiu at fedoraproject.org  Sat Jan 24 06:48:03 2009
From: corsepiu at fedoraproject.org (=?utf-8?q?Ralf_Cors=C3=A9pius?=)
Date: Sat, 24 Jan 2009 06:48:03 +0000 (UTC)
Subject: rpms/rt3/F-10 rt3.spec,1.32,1.33
Message-ID: <20090124064803.210E07010A@cvs1.fedora.phx.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/rt3/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17628

Modified Files:
	rt3.spec 
Log Message:
* Sat Jan 24 2009 Ralf Cors??pius <corsepiu at fedoraproject.org> - 3.8.2-2
- Filter out R: perl(Test::Email).
- Don't pass --enable/disable-devel-mode to configure.
- Add Explicit check for devel-mode deps.



Index: rt3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rt3/F-10/rt3.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- rt3.spec	23 Jan 2009 13:30:17 -0000	1.32
+++ rt3.spec	24 Jan 2009 06:47:32 -0000	1.33
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2005, 2006, 2007, 2008 Ralf Corsepius, Ulm, Germany.
+# Copyright (c) 2005, 2006, 2007, 2008, 2009 Ralf Corsepius, Ulm, Germany.
 # This file and all modifications and additions to the pristine
 # package are under the same license as the package itself.
 #
@@ -18,8 +18,8 @@
 
 # --with devel_mode/--without devel_mode
 #	enable/disable building/installing devel files
-#	Default: without
-%bcond_with devel_mode
+#	Default: with
+%bcond_without devel_mode
 
 # --with gpg/--without gpg
 #	enable/disable building gpg support
@@ -40,7 +40,7 @@
 
 Name:		rt3
 Version:	3.8.2
-Release:	1%{?dist}
+Release:	3%{?dist}
 Summary:	Request tracker 3
 
 Group:		Applications/Internet
@@ -198,7 +198,7 @@
 %description mailgate
 %{summary}
 
-%if 0%{?with_devel_mode}
+%if 0
 %package -n perl-RT-Test
 Summary: rt3's test utility.
 Group:   Applications/Internet
@@ -242,11 +242,13 @@
 
 # Filter out a bogus R:perl() rpm adds.
 # Keep SpamAssassin optional
+# Keep Test::Email optional (Not yet in Fedora)
 cat << \EOF > %{name}-req
 #!/bin/sh
 %{__perl_requires} $* |\
     sed -e '/^perl()/d' \
-	-e '/^perl(Mail::SpamAssassin)$/d'
+	-e '/^perl(Mail::SpamAssassin)$/d' \
+	-e '/^perl(Test::Email)$/d'
 EOF
 %define __perl_requires %{_builddir}/rt-%{version}/%{name}-req
 chmod +x %{__perl_requires}
@@ -291,11 +293,13 @@
 --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}
+%{?with_gpg:--enable-gpg}%{!?with_gpg:--disable-gpg}
 
 make %{?_smp_mflags}
 
+# Explicitly check for devel-mode deps
+%{?with_devel_mode:%{__perl} ./sbin/rt-test-dependencies --verbose --with-mysql --with-modperl2 --with-dev}
+
 # Generate man-pages
 /usr/bin/pod2man bin/rt-mailgate > bin/rt-mailgate.1
 /usr/bin/pod2man bin/mason_handler.fcgi > bin/mason_handler.fcgi.1
@@ -417,7 +421,7 @@
 %{_sbindir}/rt-mailgate
 %{_mandir}/man1/rt-mailgate*
 
-%if 0%{?with_devel_mode}
+%if 0
 %files -n perl-RT-Test
 %defattr(-,root,root,-)
 %dir %{RT3_LIBDIR}/RT
@@ -425,6 +429,11 @@
 %endif
 
 %changelog
+* Sat Jan 24 2009 Ralf Cors??pius <corsepiu at fedoraproject.org> - 3.8.2-2
+- Filter out R: perl(Test::Email).
+- Don't pass --enable/disable-devel-mode to configure.
+- Add Explicit check for devel-mode deps.
+
 * Fri Jan 23 2009 Ralf Cors??pius <corsepiu at fedoraproject.org> - 3.8.2-1
 - Upstream update.
 - Preps to add a perl-RT-Test package.



From corsepiu at fedoraproject.org  Sat Jan 24 06:49:54 2009
From: corsepiu at fedoraproject.org (=?utf-8?q?Ralf_Cors=C3=A9pius?=)
Date: Sat, 24 Jan 2009 06:49:54 +0000 (UTC)
Subject: rpms/rt3/F-10 rt3.spec,1.33,1.34
Message-ID: <20090124064954.B3C6D7010A@cvs1.fedora.phx.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/rt3/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17841

Modified Files:
	rt3.spec 
Log Message:
Fix Release:


Index: rt3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rt3/F-10/rt3.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- rt3.spec	24 Jan 2009 06:47:32 -0000	1.33
+++ rt3.spec	24 Jan 2009 06:49:24 -0000	1.34
@@ -40,7 +40,7 @@
 
 Name:		rt3
 Version:	3.8.2
-Release:	3%{?dist}
+Release:	2%{?dist}
 Summary:	Request tracker 3
 
 Group:		Applications/Internet



From iarnell at fedoraproject.org  Sat Jan 24 06:58:10 2009
From: iarnell at fedoraproject.org (Iain Arnell)
Date: Sat, 24 Jan 2009 06:58:10 +0000 (UTC)
Subject: rpms/vim-perl-support/devel vim-perl-support.spec,1.3,1.4
Message-ID: <20090124065810.F2BC97010A@cvs1.fedora.phx.redhat.com>

Author: iarnell

Update of /cvs/pkgs/rpms/vim-perl-support/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19465

Modified Files:
	vim-perl-support.spec 
Log Message:
* Sat Jan 24 2009 Iain Arnell <iarnell at gmail.com> 4.0.1-2
- require perl(Devel::SmallProf) now that it's available



Index: vim-perl-support.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vim-perl-support/devel/vim-perl-support.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- vim-perl-support.spec	2 Jan 2009 13:26:44 -0000	1.3
+++ vim-perl-support.spec	24 Jan 2009 06:57:40 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           vim-perl-support
 Version:        4.0.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Perl-IDE for VIM
 
 Group:          Applications/Editors
@@ -22,10 +22,10 @@
 Requires:         perl(Perl::Critic)         
 # Parses and beautifies perl source
 Requires:         perl(Perl::Tidy)           
+# per-line Perl profiler
+Requires:         perl(Devel::SmallProf)     
 
 # the following are not yet available in fedora
-# per-line Perl profiler
-#Requires:         perl(Devel::SmallProf)     
 # Perl debugger using a Tk GUI
 #Requires:         perl(Devel::ptkdb)         
 # Generate Ctags style tags for Perl source code
@@ -130,6 +130,9 @@
 
 
 %changelog
+* Sat Jan 24 2009 Iain Arnell <iarnell at gmail.com> 4.0.1-2
+- require perl(Devel::SmallProf) now that it's available
+
 * Fri Jan 02 2009 Iain Arnell <iarnell at gmail.com> 4.0.1-1
 - Bugfix: Error message in some functions that issue a prompt.
 



From remi at fedoraproject.org  Sat Jan 24 07:11:46 2009
From: remi at fedoraproject.org (Remi Collet)
Date: Sat, 24 Jan 2009 07:11:46 +0000 (UTC)
Subject: rpms/php-pear-Cache-Lite/devel .cvsignore, 1.3,
	1.4 php-pear-Cache-Lite.spec, 1.2, 1.3 sources, 1.3, 1.4
Message-ID: <20090124071146.C93757010A@cvs1.fedora.phx.redhat.com>

Author: remi

Update of /cvs/extras/rpms/php-pear-Cache-Lite/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21096

Modified Files:
	.cvsignore php-pear-Cache-Lite.spec sources 
Log Message:
update to 1.7.5 (bugfix)


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Cache-Lite/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	9 Jun 2008 14:55:57 -0000	1.3
+++ .cvsignore	24 Jan 2009 07:11:16 -0000	1.4
@@ -1 +1 @@
-Cache_Lite-1.7.4.tgz
+Cache_Lite-1.7.5.tgz


Index: php-pear-Cache-Lite.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Cache-Lite/devel/php-pear-Cache-Lite.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- php-pear-Cache-Lite.spec	9 Jun 2008 14:55:57 -0000	1.2
+++ php-pear-Cache-Lite.spec	24 Jan 2009 07:11:16 -0000	1.3
@@ -4,7 +4,7 @@
 Summary:        Fast and Safe little cache system for PHP
 Summary(fr):    M??thode de cache rapide et s??curis??e pour PHP
 Name:           php-pear-Cache-Lite
-Version:        1.7.4
+Version:        1.7.5
 Release:        1%{?dist}
 License:        PHP
 Group:          Development/Libraries
@@ -97,6 +97,9 @@
 
 
 %changelog
+* Sat Jan 09 2009 Remi Collet <Fedora at FamilleCollet.com> 1.7.5-1
+- update to 1.7.5
+
 * Mon Jun 09 2008 Remi Collet <Fedora at FamilleCollet.com> 1.7.4-1
 - update to 1.7.4
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Cache-Lite/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	9 Jun 2008 14:55:57 -0000	1.3
+++ sources	24 Jan 2009 07:11:16 -0000	1.4
@@ -1 +1 @@
-93a7a2a40d85a16725f02937ee5c9b88  Cache_Lite-1.7.4.tgz
+085d095dc2bd92e546a8d6aa8dd748ba  Cache_Lite-1.7.5.tgz



From remi at fedoraproject.org  Sat Jan 24 07:22:18 2009
From: remi at fedoraproject.org (Remi Collet)
Date: Sat, 24 Jan 2009 07:22:18 +0000 (UTC)
Subject: rpms/php-pear-Cache-Lite/F-10 php-pear-Cache-Lite.spec, 1.2,
	1.3 sources, 1.3, 1.4
Message-ID: <20090124072218.7EB4D7010A@cvs1.fedora.phx.redhat.com>

Author: remi

Update of /cvs/extras/rpms/php-pear-Cache-Lite/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22371

Modified Files:
	php-pear-Cache-Lite.spec sources 
Log Message:
update to 1.7.5 (bugfix)


Index: php-pear-Cache-Lite.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Cache-Lite/F-10/php-pear-Cache-Lite.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- php-pear-Cache-Lite.spec	9 Jun 2008 14:55:57 -0000	1.2
+++ php-pear-Cache-Lite.spec	24 Jan 2009 07:21:48 -0000	1.3
@@ -4,7 +4,7 @@
 Summary:        Fast and Safe little cache system for PHP
 Summary(fr):    M??thode de cache rapide et s??curis??e pour PHP
 Name:           php-pear-Cache-Lite
-Version:        1.7.4
+Version:        1.7.5
 Release:        1%{?dist}
 License:        PHP
 Group:          Development/Libraries
@@ -97,6 +97,9 @@
 
 
 %changelog
+* Sat Jan 09 2009 Remi Collet <Fedora at FamilleCollet.com> 1.7.5-1
+- update to 1.7.5
+
 * Mon Jun 09 2008 Remi Collet <Fedora at FamilleCollet.com> 1.7.4-1
 - update to 1.7.4
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Cache-Lite/F-10/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	9 Jun 2008 14:55:57 -0000	1.3
+++ sources	24 Jan 2009 07:21:48 -0000	1.4
@@ -1 +1 @@
-93a7a2a40d85a16725f02937ee5c9b88  Cache_Lite-1.7.4.tgz
+085d095dc2bd92e546a8d6aa8dd748ba  Cache_Lite-1.7.5.tgz



From remi at fedoraproject.org  Sat Jan 24 07:30:25 2009
From: remi at fedoraproject.org (Remi Collet)
Date: Sat, 24 Jan 2009 07:30:25 +0000 (UTC)
Subject: rpms/php-pear-Cache-Lite/F-9 php-pear-Cache-Lite.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <20090124073026.0A7937010A@cvs1.fedora.phx.redhat.com>

Author: remi

Update of /cvs/extras/rpms/php-pear-Cache-Lite/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24078

Modified Files:
	php-pear-Cache-Lite.spec sources 
Log Message:
update to 1.7.5 (bugfix)


Index: php-pear-Cache-Lite.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Cache-Lite/F-9/php-pear-Cache-Lite.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- php-pear-Cache-Lite.spec	9 Jun 2008 15:03:24 -0000	1.1
+++ php-pear-Cache-Lite.spec	24 Jan 2009 07:29:55 -0000	1.2
@@ -4,7 +4,7 @@
 Summary:        Fast and Safe little cache system for PHP
 Summary(fr):    M??thode de cache rapide et s??curis??e pour PHP
 Name:           php-pear-Cache-Lite
-Version:        1.7.4
+Version:        1.7.5
 Release:        1%{?dist}
 License:        PHP
 Group:          Development/Libraries
@@ -97,6 +97,9 @@
 
 
 %changelog
+* Sat Jan 09 2009 Remi Collet <Fedora at FamilleCollet.com> 1.7.5-1
+- update to 1.7.5
+
 * Mon Jun 09 2008 Remi Collet <Fedora at FamilleCollet.com> 1.7.4-1
 - update to 1.7.4
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Cache-Lite/F-9/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	9 Jun 2008 15:03:24 -0000	1.2
+++ sources	24 Jan 2009 07:29:55 -0000	1.3
@@ -1 +1 @@
-93a7a2a40d85a16725f02937ee5c9b88  Cache_Lite-1.7.4.tgz
+085d095dc2bd92e546a8d6aa8dd748ba  Cache_Lite-1.7.5.tgz



From remi at fedoraproject.org  Sat Jan 24 07:38:36 2009
From: remi at fedoraproject.org (Remi Collet)
Date: Sat, 24 Jan 2009 07:38:36 +0000 (UTC)
Subject: rpms/php-pear-XML-Parser/F-10 php-pear-XML-Parser.spec, 1.6,
	1.7 sources, 1.5, 1.6
Message-ID: <20090124073836.EB8417010A@cvs1.fedora.phx.redhat.com>

Author: remi

Update of /cvs/extras/rpms/php-pear-XML-Parser/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25100

Modified Files:
	php-pear-XML-Parser.spec sources 
Log Message:
update to 1.3.2 (bugfix)


Index: php-pear-XML-Parser.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pear-XML-Parser/F-10/php-pear-XML-Parser.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- php-pear-XML-Parser.spec	30 Sep 2008 19:31:48 -0000	1.6
+++ php-pear-XML-Parser.spec	24 Jan 2009 07:38:06 -0000	1.7
@@ -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.1
+Version:      1.3.2
 Release:      1%{?dist}
 License:      BSD
 Group:        Development/Libraries
@@ -48,15 +48,18 @@
 l'analyseur du gestionnaire d'objets, il n'est donc plus n??cessaire d'??tendre
 XML_Parser pour analyser un document.
 
+
 %prep
 %setup -q -c
 # Package2.xml is v2
 %{_bindir}/php -n %{SOURCE2} package2.xml >CHANGELOG
 mv package2.xml %{pear_name}-%{version}/%{pear_name}.xml
 
+
 %build
 # Empty build section
 
+
 %install
 rm -rf %{buildroot} docdir
 pushd %{pear_name}-%{version}
@@ -83,17 +86,21 @@
 lst=$(find %{buildroot}%{pear_phpdir} -exec grep -q %{buildroot} {} \; -print)
 [ ! -z "$lst" ] && echo "Reference to BUILDROOT in $lst" && exit 1;
 
+
 %clean
 rm -rf %{buildroot}
 
+
 %post
 %{__pear} install --nodeps --soft --force --register-only %{pear_xmldir}/%{pear_name}.xml >/dev/null || :
 
+
 %postun
 if [ "$1" -eq "0" ]; then
     %{__pear} uninstall --nodeps --ignore-errors --register-only %{pear_name} >/dev/null || :
 fi
 
+
 %files
 %defattr(-,root,root,-)
 %doc CHANGELOG docdir/examples
@@ -104,7 +111,11 @@
 
 
 %changelog
+* Thu Jan 22 2009 Remi Collet <Fedora at FamilleCollet.com> 1.3.2-1
+- update to 1.3.2
+
 * Tue Sep 30 2008 Remi Collet <Fedora at FamilleCollet.com> 1.3.1-1
+- update to 1.3.1
 - fix in package.xml (license)
 
 * Fri Aug 29 2008 Remi Collet <Fedora at FamilleCollet.com> 1.3.0-1


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pear-XML-Parser/F-10/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	30 Sep 2008 19:31:48 -0000	1.5
+++ sources	24 Jan 2009 07:38:06 -0000	1.6
@@ -1 +1 @@
-1210e440ce8a78c406ee234bd81dfbe5  XML_Parser-1.3.1.tgz
+78d38605bdf53f6406095e76a21adff4  XML_Parser-1.3.2.tgz



From remi at fedoraproject.org  Sat Jan 24 07:42:41 2009
From: remi at fedoraproject.org (Remi Collet)
Date: Sat, 24 Jan 2009 07:42:41 +0000 (UTC)
Subject: rpms/php-pear-XML-Parser/F-9 php-pear-XML-Parser.spec, 1.6,
	1.7 sources, 1.5, 1.6
Message-ID: <20090124074241.D34FA7010A@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-serv25719

Modified Files:
	php-pear-XML-Parser.spec sources 
Log Message:
update to 1.3.2 (bugfix)


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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- php-pear-XML-Parser.spec	30 Sep 2008 19:36:24 -0000	1.6
+++ php-pear-XML-Parser.spec	24 Jan 2009 07:42:11 -0000	1.7
@@ -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.1
+Version:      1.3.2
 Release:      1%{?dist}
 License:      BSD
 Group:        Development/Libraries
@@ -48,15 +48,18 @@
 l'analyseur du gestionnaire d'objets, il n'est donc plus n??cessaire d'??tendre
 XML_Parser pour analyser un document.
 
+
 %prep
 %setup -q -c
 # Package2.xml is v2
 %{_bindir}/php -n %{SOURCE2} package2.xml >CHANGELOG
 mv package2.xml %{pear_name}-%{version}/%{pear_name}.xml
 
+
 %build
 # Empty build section
 
+
 %install
 rm -rf %{buildroot} docdir
 pushd %{pear_name}-%{version}
@@ -83,17 +86,21 @@
 lst=$(find %{buildroot}%{pear_phpdir} -exec grep -q %{buildroot} {} \; -print)
 [ ! -z "$lst" ] && echo "Reference to BUILDROOT in $lst" && exit 1;
 
+
 %clean
 rm -rf %{buildroot}
 
+
 %post
 %{__pear} install --nodeps --soft --force --register-only %{pear_xmldir}/%{pear_name}.xml >/dev/null || :
 
+
 %postun
 if [ "$1" -eq "0" ]; then
     %{__pear} uninstall --nodeps --ignore-errors --register-only %{pear_name} >/dev/null || :
 fi
 
+
 %files
 %defattr(-,root,root,-)
 %doc CHANGELOG docdir/examples
@@ -104,7 +111,11 @@
 
 
 %changelog
+* Thu Jan 22 2009 Remi Collet <Fedora at FamilleCollet.com> 1.3.2-1
+- update to 1.3.2
+
 * Tue Sep 30 2008 Remi Collet <Fedora at FamilleCollet.com> 1.3.1-1
+- update to 1.3.1
 - fix in package.xml (license)
 
 * Fri Aug 29 2008 Remi Collet <Fedora at FamilleCollet.com> 1.3.0-1


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pear-XML-Parser/F-9/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	30 Sep 2008 19:36:24 -0000	1.5
+++ sources	24 Jan 2009 07:42:11 -0000	1.6
@@ -1 +1 @@
-1210e440ce8a78c406ee234bd81dfbe5  XML_Parser-1.3.1.tgz
+78d38605bdf53f6406095e76a21adff4  XML_Parser-1.3.2.tgz



From lucilanga at fedoraproject.org  Sat Jan 24 08:31:18 2009
From: lucilanga at fedoraproject.org (Lucian Langa)
Date: Sat, 24 Jan 2009 08:31:18 +0000 (UTC)
Subject: rpms/cpmtools/devel cpmtools-2.8-nostrip.patch, NONE,
	1.1 cpmtools.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090124083118.271667010A@cvs1.fedora.phx.redhat.com>

Author: lucilanga

Update of /cvs/pkgs/rpms/cpmtools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3106

Modified Files:
	.cvsignore sources 
Added Files:
	cpmtools-2.8-nostrip.patch cpmtools.spec 
Log Message:
initial import

cpmtools-2.8-nostrip.patch:

--- NEW FILE cpmtools-2.8-nostrip.patch ---
--- cpmtools-2.8/Makefile.in	2008-09-12 14:46:56.000000000 +0300
+++ cpmtools-2.8-mod/Makefile.in	2009-01-17 16:11:40.000000000 +0200
@@ -80,14 +80,14 @@
 		-./fsck.cpm -f pcw -n badfs/label
 
 install:	all
-		$(INSTALL) -s -m 755 cpmls $(BINDIR)/cpmls
-		$(INSTALL) -s -m 755 cpmcp $(BINDIR)/cpmcp
-		$(INSTALL) -s -m 755 cpmrm $(BINDIR)/cpmrm
-		$(INSTALL) -s -m 755 cpmchmod $(BINDIR)/cpmchmod
-		$(INSTALL) -s -m 755 cpmchattr $(BINDIR)/cpmchattr
-		$(INSTALL) -s -m 755 mkfs.cpm $(BINDIR)/mkfs.cpm
-		$(INSTALL) -s -m 755 fsck.cpm $(BINDIR)/fsck.cpm
-		$(INSTALL) -s -m 755 fsed.cpm $(BINDIR)/fsed.cpm
+		$(INSTALL) -m 755 cpmls $(BINDIR)/cpmls
+		$(INSTALL) -m 755 cpmcp $(BINDIR)/cpmcp
+		$(INSTALL) -m 755 cpmrm $(BINDIR)/cpmrm
+		$(INSTALL) -m 755 cpmchmod $(BINDIR)/cpmchmod
+		$(INSTALL) -m 755 cpmchattr $(BINDIR)/cpmchattr
+		$(INSTALL) -m 755 mkfs.cpm $(BINDIR)/mkfs.cpm
+		$(INSTALL) -m 755 fsck.cpm $(BINDIR)/fsck.cpm
+		$(INSTALL) -m 755 fsed.cpm $(BINDIR)/fsed.cpm
 		$(INSTALL_DATA) diskdefs @datarootdir@/diskdefs
 		$(INSTALL_DATA) cpmls.1 $(MANDIR)/man1/cpmls.1
 		$(INSTALL_DATA) cpmcp.1 $(MANDIR)/man1/cpmcp.1


--- NEW FILE cpmtools.spec ---
Name:		cpmtools
Version:	2.8
Release:	2%{?dist}
Summary:	Programs for accessing CP/M disks

Group:		Applications/System
License:	GPLv3+
URL:		http://www.moria.de/~michael/cpmtools/
Source0:	http://www.moria.de/~michael/cpmtools/cpmtools-2.8.tar.gz
Patch0:		cpmtools-2.8-nostrip.patch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	ncurses-devel
#Requires:	

%description
This package allows to access CP/M file systems similar to the well-known
mtools package, which accesses MSDOS file systems. I use it for file
exchange with a Z80-PC simulator, but it works on floppy devices as well.


%prep
%setup -q -n %{name}-%{version}
%patch0 -p1 -b .nostrip
sed -i -e "s!@datarootdir@/diskdefs!\$\(DATADIR\)/diskdefs!" Makefile.in
#modify path contained in man files
sed -i -e "s!@DATADIR@!%{_datadir}/%{name}!" *.1.in


%build
%configure --datarootdir=%{_datadir}/%{name}
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_bindir}
mkdir -p $RPM_BUILD_ROOT%{_mandir}/man{1,5}
mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}
make install BINDIR=$RPM_BUILD_ROOT%{_bindir} MANDIR=$RPM_BUILD_ROOT%{_mandir} DATADIR=$RPM_BUILD_ROOT%{_datadir}/%{name} INSTALL="install -p"


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc COPYING NEWS README
%{_bindir}/*
%{_datadir}/%{name}
%{_mandir}/man?/*



%changelog
* Sun Jan 18 2009 Lucian Langa <cooly at gnome.eu.org> - 2.8-2
- place diskdefs under correct location

* Sat Jan 17 2009 Lucian Langa <cooly at gnome.eu.org> - 2.8-1
- initial package




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cpmtools/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	23 Jan 2009 23:38:22 -0000	1.1
+++ .cvsignore	24 Jan 2009 08:30:47 -0000	1.2
@@ -0,0 +1 @@
+cpmtools-2.8.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cpmtools/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	23 Jan 2009 23:38:22 -0000	1.1
+++ sources	24 Jan 2009 08:30:47 -0000	1.2
@@ -0,0 +1 @@
+ccf53decbb9e9f6708fb1492c7defa17  cpmtools-2.8.tar.gz



From lucilanga at fedoraproject.org  Sat Jan 24 08:33:59 2009
From: lucilanga at fedoraproject.org (Lucian Langa)
Date: Sat, 24 Jan 2009 08:33:59 +0000 (UTC)
Subject: rpms/cpmtools/F-10 cpmtools-2.8-nostrip.patch, NONE,
	1.1 cpmtools.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090124083359.B56267010A@cvs1.fedora.phx.redhat.com>

Author: lucilanga

Update of /cvs/pkgs/rpms/cpmtools/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3734

Modified Files:
	.cvsignore sources 
Added Files:
	cpmtools-2.8-nostrip.patch cpmtools.spec 
Log Message:
initial import

cpmtools-2.8-nostrip.patch:

--- NEW FILE cpmtools-2.8-nostrip.patch ---
--- cpmtools-2.8/Makefile.in	2008-09-12 14:46:56.000000000 +0300
+++ cpmtools-2.8-mod/Makefile.in	2009-01-17 16:11:40.000000000 +0200
@@ -80,14 +80,14 @@
 		-./fsck.cpm -f pcw -n badfs/label
 
 install:	all
-		$(INSTALL) -s -m 755 cpmls $(BINDIR)/cpmls
-		$(INSTALL) -s -m 755 cpmcp $(BINDIR)/cpmcp
-		$(INSTALL) -s -m 755 cpmrm $(BINDIR)/cpmrm
-		$(INSTALL) -s -m 755 cpmchmod $(BINDIR)/cpmchmod
-		$(INSTALL) -s -m 755 cpmchattr $(BINDIR)/cpmchattr
-		$(INSTALL) -s -m 755 mkfs.cpm $(BINDIR)/mkfs.cpm
-		$(INSTALL) -s -m 755 fsck.cpm $(BINDIR)/fsck.cpm
-		$(INSTALL) -s -m 755 fsed.cpm $(BINDIR)/fsed.cpm
+		$(INSTALL) -m 755 cpmls $(BINDIR)/cpmls
+		$(INSTALL) -m 755 cpmcp $(BINDIR)/cpmcp
+		$(INSTALL) -m 755 cpmrm $(BINDIR)/cpmrm
+		$(INSTALL) -m 755 cpmchmod $(BINDIR)/cpmchmod
+		$(INSTALL) -m 755 cpmchattr $(BINDIR)/cpmchattr
+		$(INSTALL) -m 755 mkfs.cpm $(BINDIR)/mkfs.cpm
+		$(INSTALL) -m 755 fsck.cpm $(BINDIR)/fsck.cpm
+		$(INSTALL) -m 755 fsed.cpm $(BINDIR)/fsed.cpm
 		$(INSTALL_DATA) diskdefs @datarootdir@/diskdefs
 		$(INSTALL_DATA) cpmls.1 $(MANDIR)/man1/cpmls.1
 		$(INSTALL_DATA) cpmcp.1 $(MANDIR)/man1/cpmcp.1


--- NEW FILE cpmtools.spec ---
Name:		cpmtools
Version:	2.8
Release:	2%{?dist}
Summary:	Programs for accessing CP/M disks

Group:		Applications/System
License:	GPLv3+
URL:		http://www.moria.de/~michael/cpmtools/
Source0:	http://www.moria.de/~michael/cpmtools/cpmtools-2.8.tar.gz
Patch0:		cpmtools-2.8-nostrip.patch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	ncurses-devel
#Requires:	

%description
This package allows to access CP/M file systems similar to the well-known
mtools package, which accesses MSDOS file systems. I use it for file
exchange with a Z80-PC simulator, but it works on floppy devices as well.


%prep
%setup -q -n %{name}-%{version}
%patch0 -p1 -b .nostrip
sed -i -e "s!@datarootdir@/diskdefs!\$\(DATADIR\)/diskdefs!" Makefile.in
#modify path contained in man files
sed -i -e "s!@DATADIR@!%{_datadir}/%{name}!" *.1.in


%build
%configure --datarootdir=%{_datadir}/%{name}
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_bindir}
mkdir -p $RPM_BUILD_ROOT%{_mandir}/man{1,5}
mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}
make install BINDIR=$RPM_BUILD_ROOT%{_bindir} MANDIR=$RPM_BUILD_ROOT%{_mandir} DATADIR=$RPM_BUILD_ROOT%{_datadir}/%{name} INSTALL="install -p"


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc COPYING NEWS README
%{_bindir}/*
%{_datadir}/%{name}
%{_mandir}/man?/*



%changelog
* Sun Jan 18 2009 Lucian Langa <cooly at gnome.eu.org> - 2.8-2
- place diskdefs under correct location

* Sat Jan 17 2009 Lucian Langa <cooly at gnome.eu.org> - 2.8-1
- initial package




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cpmtools/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	23 Jan 2009 23:38:22 -0000	1.1
+++ .cvsignore	24 Jan 2009 08:33:29 -0000	1.2
@@ -0,0 +1 @@
+cpmtools-2.8.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cpmtools/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	23 Jan 2009 23:38:22 -0000	1.1
+++ sources	24 Jan 2009 08:33:29 -0000	1.2
@@ -0,0 +1 @@
+ccf53decbb9e9f6708fb1492c7defa17  cpmtools-2.8.tar.gz



From lucilanga at fedoraproject.org  Sat Jan 24 08:35:04 2009
From: lucilanga at fedoraproject.org (Lucian Langa)
Date: Sat, 24 Jan 2009 08:35:04 +0000 (UTC)
Subject: rpms/cpmtools/F-9 cpmtools-2.8-nostrip.patch, NONE,
	1.1 cpmtools.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090124083504.4B0F17010A@cvs1.fedora.phx.redhat.com>

Author: lucilanga

Update of /cvs/pkgs/rpms/cpmtools/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4073

Modified Files:
	.cvsignore sources 
Added Files:
	cpmtools-2.8-nostrip.patch cpmtools.spec 
Log Message:
initial import

cpmtools-2.8-nostrip.patch:

--- NEW FILE cpmtools-2.8-nostrip.patch ---
--- cpmtools-2.8/Makefile.in	2008-09-12 14:46:56.000000000 +0300
+++ cpmtools-2.8-mod/Makefile.in	2009-01-17 16:11:40.000000000 +0200
@@ -80,14 +80,14 @@
 		-./fsck.cpm -f pcw -n badfs/label
 
 install:	all
-		$(INSTALL) -s -m 755 cpmls $(BINDIR)/cpmls
-		$(INSTALL) -s -m 755 cpmcp $(BINDIR)/cpmcp
-		$(INSTALL) -s -m 755 cpmrm $(BINDIR)/cpmrm
-		$(INSTALL) -s -m 755 cpmchmod $(BINDIR)/cpmchmod
-		$(INSTALL) -s -m 755 cpmchattr $(BINDIR)/cpmchattr
-		$(INSTALL) -s -m 755 mkfs.cpm $(BINDIR)/mkfs.cpm
-		$(INSTALL) -s -m 755 fsck.cpm $(BINDIR)/fsck.cpm
-		$(INSTALL) -s -m 755 fsed.cpm $(BINDIR)/fsed.cpm
+		$(INSTALL) -m 755 cpmls $(BINDIR)/cpmls
+		$(INSTALL) -m 755 cpmcp $(BINDIR)/cpmcp
+		$(INSTALL) -m 755 cpmrm $(BINDIR)/cpmrm
+		$(INSTALL) -m 755 cpmchmod $(BINDIR)/cpmchmod
+		$(INSTALL) -m 755 cpmchattr $(BINDIR)/cpmchattr
+		$(INSTALL) -m 755 mkfs.cpm $(BINDIR)/mkfs.cpm
+		$(INSTALL) -m 755 fsck.cpm $(BINDIR)/fsck.cpm
+		$(INSTALL) -m 755 fsed.cpm $(BINDIR)/fsed.cpm
 		$(INSTALL_DATA) diskdefs @datarootdir@/diskdefs
 		$(INSTALL_DATA) cpmls.1 $(MANDIR)/man1/cpmls.1
 		$(INSTALL_DATA) cpmcp.1 $(MANDIR)/man1/cpmcp.1


--- NEW FILE cpmtools.spec ---
Name:		cpmtools
Version:	2.8
Release:	2%{?dist}
Summary:	Programs for accessing CP/M disks

Group:		Applications/System
License:	GPLv3+
URL:		http://www.moria.de/~michael/cpmtools/
Source0:	http://www.moria.de/~michael/cpmtools/cpmtools-2.8.tar.gz
Patch0:		cpmtools-2.8-nostrip.patch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	ncurses-devel
#Requires:	

%description
This package allows to access CP/M file systems similar to the well-known
mtools package, which accesses MSDOS file systems. I use it for file
exchange with a Z80-PC simulator, but it works on floppy devices as well.


%prep
%setup -q -n %{name}-%{version}
%patch0 -p1 -b .nostrip
sed -i -e "s!@datarootdir@/diskdefs!\$\(DATADIR\)/diskdefs!" Makefile.in
#modify path contained in man files
sed -i -e "s!@DATADIR@!%{_datadir}/%{name}!" *.1.in


%build
%configure --datarootdir=%{_datadir}/%{name}
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_bindir}
mkdir -p $RPM_BUILD_ROOT%{_mandir}/man{1,5}
mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}
make install BINDIR=$RPM_BUILD_ROOT%{_bindir} MANDIR=$RPM_BUILD_ROOT%{_mandir} DATADIR=$RPM_BUILD_ROOT%{_datadir}/%{name} INSTALL="install -p"


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc COPYING NEWS README
%{_bindir}/*
%{_datadir}/%{name}
%{_mandir}/man?/*



%changelog
* Sun Jan 18 2009 Lucian Langa <cooly at gnome.eu.org> - 2.8-2
- place diskdefs under correct location

* Sat Jan 17 2009 Lucian Langa <cooly at gnome.eu.org> - 2.8-1
- initial package




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cpmtools/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	23 Jan 2009 23:38:22 -0000	1.1
+++ .cvsignore	24 Jan 2009 08:34:33 -0000	1.2
@@ -0,0 +1 @@
+cpmtools-2.8.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cpmtools/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	23 Jan 2009 23:38:22 -0000	1.1
+++ sources	24 Jan 2009 08:34:33 -0000	1.2
@@ -0,0 +1 @@
+ccf53decbb9e9f6708fb1492c7defa17  cpmtools-2.8.tar.gz



From rakesh at fedoraproject.org  Sat Jan 24 08:39:12 2009
From: rakesh at fedoraproject.org (Rakesh Pandit)
Date: Sat, 24 Jan 2009 08:39:12 +0000 (UTC)
Subject: rpms/ntop/devel ntop.spec,1.2,1.3
Message-ID: <20090124083912.2E6307010A@cvs1.fedora.phx.redhat.com>

Author: rakesh

Update of /cvs/pkgs/rpms/ntop/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5048

Modified Files:
	ntop.spec 
Log Message:
Bumped - for new update in mysql


Index: ntop.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ntop/devel/ntop.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ntop.spec	22 Oct 2008 13:36:48 -0000	1.2
+++ ntop.spec	24 Jan 2009 08:38:41 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           ntop
 Version:        3.3.8
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A network traffic probe similar to the UNIX top command
 Group:          Applications/Internet
 License:        GPLv2
@@ -154,6 +154,9 @@
 %{_localstatedir}/lib/ntop/rrd
 
 %changelog
+* Sat Jan 24 2009 Rakesh Pandit <rakesh at fedoraproject.org> - 3.3.8-2
+- Bumped - for new update in mysql
+
 * Wed Oct 22 2008 Rakesh Pandit <rakesh at fedoraproject.org> - 3.3.8-1
 - updated to 3.3.8, removed ntop compile patch
 



From jwrdegoede at fedoraproject.org  Sat Jan 24 09:39:06 2009
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Sat, 24 Jan 2009 09:39:06 +0000 (UTC)
Subject: rpms/kernel/devel linux-2.6-hwmon-atk0110-fix-numbering.patch, NONE,
	1.1 kernel.spec, 1.1229, 1.1230
Message-ID: <20090124093906.A9CF67010A@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17609

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-hwmon-atk0110-fix-numbering.patch 
Log Message:
* Sat Jan 24 2009 Hans de Goede <hdegoede at redhat.com>
- Fix atk0110 sensor numbering


linux-2.6-hwmon-atk0110-fix-numbering.patch:

--- NEW FILE linux-2.6-hwmon-atk0110-fix-numbering.patch ---
diff -up linux-2.6.28.x86_64/drivers/hwmon/asus_atk0110.c~ linux-2.6.28.x86_64/drivers/hwmon/asus_atk0110.c
--- linux-2.6.28.x86_64/drivers/hwmon/asus_atk0110.c~	2009-01-24 10:33:38.000000000 +0100
+++ linux-2.6.28.x86_64/drivers/hwmon/asus_atk0110.c	2009-01-24 10:27:26.000000000 +0100
@@ -530,6 +530,7 @@ static int atk_add_sensor(struct atk_dat
 	u64 type;
 	int err;
 	int *num;
+	int start;
 
 	if (obj->type != ACPI_TYPE_PACKAGE) {
 		/* wft is this? */
@@ -551,18 +552,21 @@ static int atk_add_sensor(struct atk_dat
 		limit1_name = "min";
 		limit2_name = "max";
 		num = &data->voltage_count;
+		start = 0;
 		break;
 	case HWMON_TYPE_TEMP:
 		base_name = "temp";
 		limit1_name = "max";
 		limit2_name = "crit";
 		num = &data->temperature_count;
+		start = 1;
 		break;
 	case HWMON_TYPE_FAN:
 		base_name = "fan";
 		limit1_name = "min";
 		limit2_name = "max";
 		num = &data->fan_count;
+		start = 1;
 		break;
 	default:
 		dev_warn(dev, "Unknown sensor type: %#llx\n", type);
@@ -597,25 +601,25 @@ static int atk_add_sensor(struct atk_dat
 	sensor->limit2 = limit2->integer.value;
 
 	snprintf(sensor->input_attr_name, ATTR_NAME_SIZE,
-			"%s%d_input", base_name, *num);
+			"%s%d_input", base_name, start + *num);
 	atk_init_attribute(&sensor->input_attr,
 			sensor->input_attr_name,
 			atk_input_show);
 
 	snprintf(sensor->label_attr_name, ATTR_NAME_SIZE,
-			"%s%d_label", base_name, *num);
+			"%s%d_label", base_name, start + *num);
 	atk_init_attribute(&sensor->label_attr,
 			sensor->label_attr_name,
 			atk_label_show);
 
 	snprintf(sensor->limit1_attr_name, ATTR_NAME_SIZE,
-			"%s%d_%s", base_name, *num, limit1_name);
+			"%s%d_%s", base_name, start + *num, limit1_name);
 	atk_init_attribute(&sensor->limit1_attr,
 			sensor->limit1_attr_name,
 			atk_limit1_show);
 
 	snprintf(sensor->limit2_attr_name, ATTR_NAME_SIZE,
-			"%s%d_%s", base_name, *num, limit2_name);
+			"%s%d_%s", base_name, start + *num, limit2_name);
 	atk_init_attribute(&sensor->limit2_attr,
 			sensor->limit2_attr_name,
 			atk_limit2_show);


Index: kernel.spec
===================================================================
RCS file: /cvs/extras/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1229
retrieving revision 1.1230
diff -u -r1.1229 -r1.1230
--- kernel.spec	23 Jan 2009 22:40:24 -0000	1.1229
+++ kernel.spec	24 Jan 2009 09:38:35 -0000	1.1230
@@ -613,6 +613,7 @@
 Patch391: linux-2.6-acpi-video-dos.patch
 Patch392: linux-2.6-acpi-strict-resources.patch
 Patch393: linux-2.6-hwmon-atk0110.patch
+Patch394: linux-2.6-hwmon-atk0110-fix-numbering.patch
 Patch400: linux-2.6-scsi-cpqarray-set-master.patch
 Patch450: linux-2.6-input-kill-stupid-messages.patch
 Patch460: linux-2.6-serial-460800.patch
@@ -1076,6 +1077,7 @@
 ApplyPatch linux-2.6-acpi-video-dos.patch
 ApplyPatch linux-2.6-acpi-strict-resources.patch
 ApplyPatch linux-2.6-hwmon-atk0110.patch
+ApplyPatch linux-2.6-hwmon-atk0110-fix-numbering.patch
 
 # Various low-impact patches to aid debugging.
 ApplyPatch linux-2.6-debug-sizeof-structs.patch
@@ -1760,6 +1762,9 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Sat Jan 24 2009 Hans de Goede <hdegoede at redhat.com>
+- Fix atk0110 sensor numbering
+
 * Fri Jan 23 2009 Hans de Goede <hdegoede at redhat.com>
 - Change acpi_enforce_resources default to strict, this will cause hwmon
   drivers which clash with io resources reserved by ACPI to no longer load,



From sharkcz at fedoraproject.org  Sat Jan 24 09:56:07 2009
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Sat, 24 Jan 2009 09:56:07 +0000 (UTC)
Subject: rpms/dovecot/devel dovecot.spec,1.118,1.119
Message-ID: <20090124095607.957B37010A@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/dovecot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22324

Modified Files:
	dovecot.spec 
Log Message:
* Sat Jan 24 2009 Dan Horak <dan[at]danny.cz> - 1:1.1.8-3
- rebuild with new mysql



Index: dovecot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dovecot/devel/dovecot.spec,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -r1.118 -r1.119
--- dovecot.spec	13 Jan 2009 18:57:14 -0000	1.118
+++ dovecot.spec	24 Jan 2009 09:55:35 -0000	1.119
@@ -2,7 +2,7 @@
 Name: dovecot
 Epoch: 1
 Version: 1.1.8
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: MIT and LGPLv2 and BSD with advertising
 Group: System Environment/Daemons
 
@@ -425,6 +425,9 @@
 
 
 %changelog
+* Sat Jan 24 2009 Dan Horak <dan[at]danny.cz> - 1:1.1.8-3
+- rebuild with new mysql
+
 * Tue Jan 13 2009 Michal Hlavinka <mhlavink at redhat.com> - 1:1.1.8-2
 - added managesieve support (thanks Helmut K. C. Tessarek)
 



From pkgdb at fedoraproject.org  Sat Jan 24 09:56:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 24 Jan 2009 09:56:19 +0000
Subject: [pkgdb] fail2ban ownership updated
Message-ID: <20090124095619.EF880208481@bastion.fedora.phx.redhat.com>

Package fail2ban in Fedora EPEL 4 was orphaned by athimm

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fail2ban



From pkgdb at fedoraproject.org  Sat Jan 24 09:56:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 24 Jan 2009 09:56:23 +0000
Subject: [pkgdb] fail2ban ownership updated
Message-ID: <20090124095623.5785B208487@bastion.fedora.phx.redhat.com>

Package fail2ban in Fedora EPEL 5 was orphaned by athimm

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fail2ban



From abompard at fedoraproject.org  Sat Jan 24 10:01:59 2009
From: abompard at fedoraproject.org (Aurelien Bompard)
Date: Sat, 24 Jan 2009 10:01:59 +0000 (UTC)
Subject: rpms/pure-ftpd/devel pure-ftpd.spec,1.21,1.22
Message-ID: <20090124100159.871577010A@cvs1.fedora.phx.redhat.com>

Author: abompard

Update of /cvs/pkgs/rpms/pure-ftpd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24603

Modified Files:
	pure-ftpd.spec 
Log Message:
* Sat Jan 24 2009 Aurelien Bompard <abompard at fedoraproject.org> 1.0.21-18
- Rebuild for mysql



Index: pure-ftpd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pure-ftpd/devel/pure-ftpd.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- pure-ftpd.spec	1 Dec 2008 15:00:39 -0000	1.21
+++ pure-ftpd.spec	24 Jan 2009 10:01:28 -0000	1.22
@@ -1,6 +1,6 @@
 Name:       pure-ftpd
 Version:    1.0.21
-Release:    17%{?dist}
+Release:    18%{?dist}
 Summary:    Lightweight, fast and secure FTP server
 
 Group:      System Environment/Daemons
@@ -253,6 +253,9 @@
 
 
 %changelog
+* Sat Jan 24 2009 Aurelien Bompard <abompard at fedoraproject.org> 1.0.21-18
+- Rebuild for mysql
+
 * Mon Dec 01 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 1.0.21-17
 - Rebuild for Python 2.6
 



From abompard at fedoraproject.org  Sat Jan 24 10:04:53 2009
From: abompard at fedoraproject.org (Aurelien Bompard)
Date: Sat, 24 Jan 2009 10:04:53 +0000 (UTC)
Subject: rpms/showimg/devel showimg.spec,1.24,1.25
Message-ID: <20090124100453.722D17010A@cvs1.fedora.phx.redhat.com>

Author: abompard

Update of /cvs/pkgs/rpms/showimg/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25418

Modified Files:
	showimg.spec 
Log Message:
* Sat Jan 24 2009 Aurelien Bompard <abompard at fedoraproject.org> 0.9.5-20
- rebuild for mysql



Index: showimg.spec
===================================================================
RCS file: /cvs/pkgs/rpms/showimg/devel/showimg.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- showimg.spec	12 Aug 2008 20:43:11 -0000	1.24
+++ showimg.spec	24 Jan 2009 10:04:22 -0000	1.25
@@ -1,6 +1,6 @@
 Name:           showimg
 Version:        0.9.5
-Release:        19%{?dist}
+Release:        20%{?dist}
 Summary:        Feature-rich image viewer for KDE
 
 Group:          Applications/Multimedia
@@ -122,6 +122,9 @@
 
 
 %changelog
+* Sat Jan 24 2009 Aurelien Bompard <abompard at fedoraproject.org> 0.9.5-20
+- rebuild for mysql
+
 * Sun Aug 03 2008 Aurelien Bompard <abompard at fedoraproject.org> 0.9.5-19
 - drop libkipi support (for KDE4)
 



From sharkcz at fedoraproject.org  Sat Jan 24 10:18:58 2009
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Sat, 24 Jan 2009 10:18:58 +0000 (UTC)
Subject: rpms/collectl/devel .cvsignore, 1.6, 1.7 collectl.spec, 1.5,
	1.6 sources, 1.6, 1.7
Message-ID: <20090124101858.963AA7010A@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/collectl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29079

Modified Files:
	.cvsignore collectl.spec sources 
Log Message:
* Sat Jan 24 2009 Dan Horak <dan[at]danny.cz> 3.1.3-1
- upgrade to upstream version 3.1.3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/collectl/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	20 Jan 2009 15:23:34 -0000	1.6
+++ .cvsignore	24 Jan 2009 10:18:28 -0000	1.7
@@ -1 +1 @@
-collectl-3.1.2.src.tar.gz
+collectl-3.1.3.src.tar.gz


Index: collectl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/collectl/devel/collectl.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- collectl.spec	20 Jan 2009 15:23:34 -0000	1.5
+++ collectl.spec	24 Jan 2009 10:18:28 -0000	1.6
@@ -1,6 +1,6 @@
 Summary: A utility to collect various linux performance data
 Name: collectl
-Version: 3.1.2
+Version: 3.1.3
 Release: 1%{?dist}
 License: GPLv2+ or Artistic
 Group: Applications/System
@@ -94,6 +94,9 @@
 %{_localstatedir}/log/%{name}
 
 %changelog
+* Sat Jan 24 2009 Dan Horak <dan[at]danny.cz> 3.1.3-1
+- upgrade to upstream version 3.1.3
+
 * Tue Jan 20 2009 Dan Horak <dan[at]danny.cz> 3.1.2-1
 - upgrade to upstream version 3.1.2
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/collectl/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	20 Jan 2009 15:23:34 -0000	1.6
+++ sources	24 Jan 2009 10:18:28 -0000	1.7
@@ -1 +1 @@
-161d47dcbff551c353020cef4990efc8  collectl-3.1.2.src.tar.gz
+8fcd4988dd43af98943833ca9c78cb2d  collectl-3.1.3.src.tar.gz



From than at fedoraproject.org  Sat Jan 24 10:19:03 2009
From: than at fedoraproject.org (Than Ngo)
Date: Sat, 24 Jan 2009 10:19:03 +0000 (UTC)
Subject: rpms/kde-l10n/devel kde-l10n.spec,1.61,1.62 sources,1.20,1.21
Message-ID: <20090124101903.6CA277010A@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kde-l10n/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29055

Modified Files:
	kde-l10n.spec sources 
Log Message:
respin



Index: kde-l10n.spec
===================================================================
RCS file: /cvs/extras/rpms/kde-l10n/devel/kde-l10n.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- kde-l10n.spec	23 Jan 2009 14:03:08 -0000	1.61
+++ kde-l10n.spec	24 Jan 2009 10:18:33 -0000	1.62
@@ -762,9 +762,6 @@
 done
 
 %build
-# it doesn't build, remove it temporary
-rm -f %{name}-et-%{version}/docs/kdeedu/kturtle
-
 for i in $(cat %{SOURCE1000}) ; do
   pushd %{name}-$i-%{version}
   # skip kdewebdev for now, because we're still shipping kdewebdev 3 due to Quanta


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kde-l10n/devel/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources	22 Jan 2009 14:06:57 -0000	1.20
+++ sources	24 Jan 2009 10:18:33 -0000	1.21
@@ -7,7 +7,6 @@
 2bbfca0b7a1366aee558804105b176cb  kde-l10n-el-4.2.0.tar.bz2
 12814406b6d35d8098a6cd16f49f827e  kde-l10n-en_GB-4.2.0.tar.bz2
 e3b9bc8ef5573f7574e296385eb130a9  kde-l10n-es-4.2.0.tar.bz2
-94b1a109b75d7bca66a3f26b0b3b61c1  kde-l10n-et-4.2.0.tar.bz2
 dc5bda4589b9a2042ade700caf8de083  kde-l10n-fi-4.2.0.tar.bz2
 ca231f7972a5269a589cad934cd4ab81  kde-l10n-fr-4.2.0.tar.bz2
 d18b399ca99aa54c936bcdb207baac0a  kde-l10n-ga-4.2.0.tar.bz2
@@ -44,3 +43,4 @@
 08af73c8b0f82689f5ab046f0700bf9d  kde-l10n-zh_TW-4.2.0.tar.bz2
 058b0bd3a7b2ca4ef56730488a234afa  kde-l10n-ar-4.2.0.tar.bz2
 5248515b294143a7821055754b9236e4  kde-l10n-eu-4.2.0.tar.bz2
+fb2e1d63d9d926c6639a537b6bf73d03  kde-l10n-et-4.2.0.tar.bz2



From than at fedoraproject.org  Sat Jan 24 10:23:43 2009
From: than at fedoraproject.org (Than Ngo)
Date: Sat, 24 Jan 2009 10:23:43 +0000 (UTC)
Subject: rpms/kde-l10n/F-10 kde-l10n.spec, 1.52, 1.53 sources, 1.17,
	1.18 subdirs-kde-l10n, 1.12, 1.13
Message-ID: <20090124102343.5CC387010A@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kde-l10n/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29855

Modified Files:
	kde-l10n.spec sources subdirs-kde-l10n 
Log Message:
4.2.0



Index: kde-l10n.spec
===================================================================
RCS file: /cvs/extras/rpms/kde-l10n/F-10/kde-l10n.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- kde-l10n.spec	9 Jan 2009 23:08:43 -0000	1.52
+++ kde-l10n.spec	24 Jan 2009 10:23:12 -0000	1.53
@@ -1,17 +1,17 @@
 %define buildall 0
 
 Name: kde-l10n
-Version: 4.1.4
-Release: 2%{dist}
+Version: 4.2.0
+Release: 1%{dist}
 Url: http://www.kde.org
 Summary: Internationalization support for KDE
 Group: User Interface/Desktops
 License: LGPLv2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
-#Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-ar-%{version}.tar.bz2
+Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-ar-%{version}.tar.bz2
 #Source1: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-be-%{version}.tar.bz2
-Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-bg-%{version}.tar.bz2
+Source2: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-bg-%{version}.tar.bz2
 Source3: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-ca-%{version}.tar.bz2
 Source4: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-cs-%{version}.tar.bz2
 Source5: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-csb-%{version}.tar.bz2
@@ -22,7 +22,7 @@
 Source10: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-eo-%{version}.tar.bz2
 Source11: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-es-%{version}.tar.bz2
 Source12: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-et-%{version}.tar.bz2
-#Source13: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-eu-%{version}.tar.bz2
+Source13: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-eu-%{version}.tar.bz2
 Source14: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-fi-%{version}.tar.bz2
 Source15: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-fr-%{version}.tar.bz2
 Source16: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-ga-%{version}.tar.bz2
@@ -758,7 +758,7 @@
 %setup -q -n %{name}-%{version} -c
 
 for i in $(cat %{SOURCE1000}) ; do
-  tar jxf %{_sourcedir}/%{name}-$i-%{version}.tar.bz2
+  bzip2 -dc %{_sourcedir}/%{name}-$i-%{version}.tar.bz2 | tar -xf -
 done
 
 %build
@@ -833,12 +833,10 @@
 %lang(af) %{_datadir}/locale/af/*
 %endif
 
-%if %{buildall}
 %files Arabic 
 %defattr(-,root,root)
 %lang(ar) %{_datadir}/locale/ar/*
 %lang(ar) %{_datadir}/kde4/apps/klettres/ar
-%endif
 
 %if %{buildall}
 %files Azerbaijani
@@ -919,6 +917,7 @@
 %lang(de) %{_kde4_appsdir}/ktuberling/sounds/de*
 %lang(de) %{_kde4_appsdir}/khangman/de.txt
 %lang(de) %{_kde4_appsdir}/kvtml/de
+%lang(de) %{_kde4_appsdir}/step/objinfo/l10n/de/
 %lang(de) %{_kde4_docdir}/HTML/de
 
 %files Greek
@@ -954,11 +953,9 @@
 %lang(et) %{_kde4_appsdir}/kvtml/et
 %lang(et) %{_kde4_docdir}/HTML/et
 
-%if %{buildall}
 %files Basque
 %defattr(-,root,root)
 %lang(eu) %{_datadir}/locale/eu/*
-%endif
 
 %if %{buildall}
 %files Farsi
@@ -1001,7 +998,7 @@
 %defattr(-,root,root)
 %lang(gl) %{_datadir}/locale/gl/*
 %lang(gl) %{_kde4_appsdir}/kvtml/gl
-%lang(gl) %{_kde4_appsdir}/ktuberling/sounds/gl.soundtheme         
+%lang(gl) %{_kde4_appsdir}/ktuberling/sounds/gl.soundtheme
 %lang(gl) %{_kde4_appsdir}/ktuberling/sounds/gl/
 %lang(gl) %{_kde4_docdir}/HTML/gl
 
@@ -1146,15 +1143,15 @@
 %defattr(-,root,root)
 %lang(nb) %{_datadir}/locale/nb/*
 %lang(nb) %{_kde4_appsdir}/khangman/nb.txt
-%lang(nb) %{_kde4_appsdir}/kvtml/nb
-%lang(nb) %{_kde4_docdir}/HTML/nb
+%lang(nb) %{_kde4_appsdir}/kvtml/nb/
+%lang(nb) %{_kde4_docdir}/HTML/nb/
 %lang(nb) %{_kde4_appsdir}/klettres/nb
 
 %files Norwegian-Nynorsk
 %defattr(-,root,root)
 %lang(nn) %{_datadir}/locale/nn/*
 %lang(nn) %{_kde4_appsdir}/khangman/nn.txt
-%lang(nn) %{_kde4_appsdir}/kvtml/nn
+%lang(nn) %{_kde4_appsdir}/kvtml/nn/
 %lang(nn) %{_kde4_docdir}/HTML/nn
 
 %if %{buildall}
@@ -1309,14 +1306,20 @@
 %lang(zh_TW) %{_kde4_docdir}/HTML/zh_TW
 
 %changelog
-* Sat Jan 10 2009 Than Ngo <than at redhat.com> - 4.1.4-2
-- fix file listfor gl/nb
+* Thu Jan 22 2009 Than Ngo <than at redhat.com> - 4.2.0-1
+- 4.2.0
+
+* Sat Jan 10 2009 Than Ngo <than at redhat.com> - 4.1.96-2
+- remove debug
+
+* Wed Jan 07 2009 Than Ngo <than at redhat.com> - 4.1.96-1
+- 4.2rc1
 
-* Fri Jan 09 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.4-1
-- 4.1.4
+* Fri Dec 12 2008 Than Ngo <than at redhat.com> - 4.1.85-1
+- 4.2beta2
 
-* Wed Nov 12 2008 Than Ngo <than at redhat.com> 4.1.3-1
-- 4.1.3
+* Fri Nov 21 2008 Than Ngo <than at redhat.com> 4.1.80-1
+- 4.2 beta1
 
 * Fri Sep 26 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-1
 - 4.1.2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kde-l10n/F-10/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources	9 Jan 2009 17:47:00 -0000	1.17
+++ sources	24 Jan 2009 10:23:12 -0000	1.18
@@ -1,47 +1,46 @@
-5f5b1effdd9b8f0a6c1a4ab59b739f0e  kde-l10n-bg-4.1.4.tar.bz2
-ebf90b925b2bf1a0b6246e800a3eaf09  kde-l10n-ca-4.1.4.tar.bz2
-12cd58d5728958829d65881fcdb3958f  kde-l10n-cs-4.1.4.tar.bz2
-b3371c5468c27021ee8dc19113ad4be7  kde-l10n-csb-4.1.4.tar.bz2
-b6c145d943292f2ba11753aa044f66f5  kde-l10n-da-4.1.4.tar.bz2
-bf5db9e7c2708e4ecd01345137009cab  kde-l10n-de-4.1.4.tar.bz2
-4b80c39785839da001190a38c8e7266b  kde-l10n-el-4.1.4.tar.bz2
-42f851c5f7e4432894483bf85ecb9076  kde-l10n-en_GB-4.1.4.tar.bz2
-88875e433f2440757b03df87eab9de07  kde-l10n-eo-4.1.4.tar.bz2
-0d2fed450def3f19704f34e8c9927054  kde-l10n-es-4.1.4.tar.bz2
-c1516ef8c2d60e03ca10bb5f9ef731ee  kde-l10n-et-4.1.4.tar.bz2
-eac2a616f172f714abe8f8a9c4403f19  kde-l10n-fi-4.1.4.tar.bz2
-dd6b5b97e47b28ca8c8d72c432a12056  kde-l10n-fr-4.1.4.tar.bz2
-1ca52ac5269d104ae970a06b683a6924  kde-l10n-fy-4.1.4.tar.bz2
-e35d048d6977d62b9f1598ecd6410ae9  kde-l10n-ga-4.1.4.tar.bz2
-7e75474eb5f39f122ae08f4f1abeeeb2  kde-l10n-gl-4.1.4.tar.bz2
-be6dc85d35ccd4431f3ffadef802f1dc  kde-l10n-hi-4.1.4.tar.bz2
-ea3cf065ea2a17e4daf3847194c2bd5f  kde-l10n-hu-4.1.4.tar.bz2
-f57747f19419714cfd72cbbbba3c465a  kde-l10n-it-4.1.4.tar.bz2
-19157c9ca23253d1dc5f872f71d88c9e  kde-l10n-ja-4.1.4.tar.bz2
-9c6ae2d6e70b95d6287a46b1d53502e6  kde-l10n-kk-4.1.4.tar.bz2
-4df0089cebfea89a9f4a3287df90f0a7  kde-l10n-km-4.1.4.tar.bz2
-d1c3c4d106672a83f2fa73b5b49312d9  kde-l10n-ko-4.1.4.tar.bz2
-2dea53e4a1b43644549a8a53b427c167  kde-l10n-ku-4.1.4.tar.bz2
-87b9c0b435bd37a073549427300c713b  kde-l10n-lt-4.1.4.tar.bz2
-e05d96e5fad79570422b33029a6cb65c  kde-l10n-lv-4.1.4.tar.bz2
-aef1f6063ba8701a352132aed655ab05  kde-l10n-mk-4.1.4.tar.bz2
-2491e682dc830fdb0b6738e9ff6e04d0  kde-l10n-ml-4.1.4.tar.bz2
-e21c6f67d95240a1a26512894c18efdf  kde-l10n-nb-4.1.4.tar.bz2
-12b299ec3b9ec3715b78e3afc17f0fb0  kde-l10n-nds-4.1.4.tar.bz2
-50b0dabddf55d79ae55e4313b3dfb0cc  kde-l10n-nl-4.1.4.tar.bz2
-b55ec0958d079004ca0d6d89af1cc0af  kde-l10n-nn-4.1.4.tar.bz2
-c40c3a9d61439b62c0dad8e5f994623b  kde-l10n-pa-4.1.4.tar.bz2
-dbf06430f02b44933fd78f16f445e54f  kde-l10n-pl-4.1.4.tar.bz2
-cf666b9d9e4f5e6089d3dfc04e5291ff  kde-l10n-pt-4.1.4.tar.bz2
-6f08bd872f25ff812b1f449e012b2691  kde-l10n-pt_BR-4.1.4.tar.bz2
-bf8b2f974108d722962e832e26fc00ec  kde-l10n-ru-4.1.4.tar.bz2
-c4a74ef14b66d2cc44518e4dbccf7884  kde-l10n-sl-4.1.4.tar.bz2
-a60f826a7fcb82e23851fabf03f52fa7  kde-l10n-sr-4.1.4.tar.bz2
-35e967ea1a7b93629a7591e7a2736da0  kde-l10n-sv-4.1.4.tar.bz2
-6b1ffdaed790ed733bfc3aac8808cbad  kde-l10n-ta-4.1.4.tar.bz2
-24ffa0fca844ff1756ca7469bd845d98  kde-l10n-th-4.1.4.tar.bz2
-d06edd7000b97585335bcefb4e62ad3a  kde-l10n-tr-4.1.4.tar.bz2
-e0a1b781e02d56caef169fd51ddb7a63  kde-l10n-uk-4.1.4.tar.bz2
-6b01aafb428179c9f4153a958b0d0044  kde-l10n-wa-4.1.4.tar.bz2
-cfe9af2f9f3df568623b0c35cc307403  kde-l10n-zh_CN-4.1.4.tar.bz2
-02f9104908ad1e3e28f78716b0a562cc  kde-l10n-zh_TW-4.1.4.tar.bz2
+fc201d9b7d85b84ed02d049309d50ec7  kde-l10n-bg-4.2.0.tar.bz2
+62b468adf048dde92abcea1cc8378ee0  kde-l10n-ca-4.2.0.tar.bz2
+3fbbda2cb209e8c773c075ed3d28f831  kde-l10n-cs-4.2.0.tar.bz2
+c9e576d85e7c8644a7f363a7dc446a47  kde-l10n-csb-4.2.0.tar.bz2
+9f6a01336b631223e13df6f82f6247ad  kde-l10n-da-4.2.0.tar.bz2
+da8184a7380795790d498c7d5e4a6b62  kde-l10n-de-4.2.0.tar.bz2
+2bbfca0b7a1366aee558804105b176cb  kde-l10n-el-4.2.0.tar.bz2
+12814406b6d35d8098a6cd16f49f827e  kde-l10n-en_GB-4.2.0.tar.bz2
+e3b9bc8ef5573f7574e296385eb130a9  kde-l10n-es-4.2.0.tar.bz2
+dc5bda4589b9a2042ade700caf8de083  kde-l10n-fi-4.2.0.tar.bz2
+ca231f7972a5269a589cad934cd4ab81  kde-l10n-fr-4.2.0.tar.bz2
+d18b399ca99aa54c936bcdb207baac0a  kde-l10n-ga-4.2.0.tar.bz2
+104815bc1b20b100509f66132df52cad  kde-l10n-gl-4.2.0.tar.bz2
+b828a209e2b370e4b3487be01dc0ea8e  kde-l10n-hi-4.2.0.tar.bz2
+b000573be5a3b6cee9ee9aa45b0931bc  kde-l10n-hu-4.2.0.tar.bz2
+42387c0b473767173ebf65622edb4278  kde-l10n-it-4.2.0.tar.bz2
+84c1dc6f18dd405b217d98312ffec6bf  kde-l10n-ja-4.2.0.tar.bz2
+a984ed36132141eb8473ab541187d296  kde-l10n-kk-4.2.0.tar.bz2
+a8aaca814f556e3e8b3cd99f04eddca6  kde-l10n-km-4.2.0.tar.bz2
+bbd68e1c9eee724c7db051657fdfb50c  kde-l10n-ko-4.2.0.tar.bz2
+3ce287f12f044c14608692518018bbef  kde-l10n-ku-4.2.0.tar.bz2
+5ffad305fb06d70f7991745b82a427e3  kde-l10n-lt-4.2.0.tar.bz2
+9d8fe83cefb273eb065337a0ab8790a5  kde-l10n-lv-4.2.0.tar.bz2
+933d60b4c535d9d6d9729bd986906e64  kde-l10n-mk-4.2.0.tar.bz2
+462763d9a71c273b7ae6f3ebd2c798e1  kde-l10n-ml-4.2.0.tar.bz2
+db0d87c5125b05c25788cbf10fd56490  kde-l10n-nb-4.2.0.tar.bz2
+378e068c4c86670788019ae7d0dda136  kde-l10n-nds-4.2.0.tar.bz2
+f9174173973b0e235a3d729b0ef2f1cf  kde-l10n-nl-4.2.0.tar.bz2
+cff7964f1c88a52d7e64df19e53c88ea  kde-l10n-nn-4.2.0.tar.bz2
+a8dded180d298489861d17a761df51f8  kde-l10n-pa-4.2.0.tar.bz2
+b04d741a53b0e1ba58d315cf118985e4  kde-l10n-pl-4.2.0.tar.bz2
+eabe2a528d1e9d5c10ecae15dea68d26  kde-l10n-pt-4.2.0.tar.bz2
+d932254d7168016819aacc45a759592e  kde-l10n-pt_BR-4.2.0.tar.bz2
+9038ce82cdddf3fcf028aff50a55932a  kde-l10n-ru-4.2.0.tar.bz2
+b24648e4fe6552ed7253acee7306f03e  kde-l10n-sl-4.2.0.tar.bz2
+8d58ae783752ba8129df1e3866e8a089  kde-l10n-sr-4.2.0.tar.bz2
+efbdb69f70e723c1ce0783e2a0693aaf  kde-l10n-sv-4.2.0.tar.bz2
+010ba3a0ed85c99cd215623f6d78fcd5  kde-l10n-th-4.2.0.tar.bz2
+850a88f8d82d9d9ab4c5ef2406eba39e  kde-l10n-tr-4.2.0.tar.bz2
+7dba32b49fe5d263103a617a49a1849e  kde-l10n-uk-4.2.0.tar.bz2
+0db1e8dc944786811cc1364df0ee4cf2  kde-l10n-wa-4.2.0.tar.bz2
+c4730babc7bef39cea255c9528607fdc  kde-l10n-zh_CN-4.2.0.tar.bz2
+08af73c8b0f82689f5ab046f0700bf9d  kde-l10n-zh_TW-4.2.0.tar.bz2
+058b0bd3a7b2ca4ef56730488a234afa  kde-l10n-ar-4.2.0.tar.bz2
+5248515b294143a7821055754b9236e4  kde-l10n-eu-4.2.0.tar.bz2
+fb2e1d63d9d926c6639a537b6bf73d03  kde-l10n-et-4.2.0.tar.bz2


Index: subdirs-kde-l10n
===================================================================
RCS file: /cvs/extras/rpms/kde-l10n/F-10/subdirs-kde-l10n,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- subdirs-kde-l10n	12 Nov 2008 00:01:31 -0000	1.12
+++ subdirs-kde-l10n	24 Jan 2009 10:23:12 -0000	1.13
@@ -1,7 +1,8 @@
+ar
 bg
 ca
-csb
 cs
+csb
 da
 de
 el
@@ -9,6 +10,7 @@
 eo
 es
 et
+eu
 fi
 fr
 fy
@@ -32,8 +34,8 @@
 nn
 pa
 pl
-pt_BR
 pt
+pt_BR
 ru
 sl
 sr



From sharkcz at fedoraproject.org  Sat Jan 24 10:28:41 2009
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Sat, 24 Jan 2009 10:28:41 +0000 (UTC)
Subject: rpms/collectl/F-10 .cvsignore, 1.6, 1.7 collectl.spec, 1.5,
	1.6 sources, 1.6, 1.7
Message-ID: <20090124102841.F39647010A@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/collectl/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30823

Modified Files:
	.cvsignore collectl.spec sources 
Log Message:
* Sat Jan 24 2009 Dan Horak <dan[at]danny.cz> 3.1.3-1
- upgrade to upstream version 3.1.3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/collectl/F-10/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	20 Jan 2009 15:27:18 -0000	1.6
+++ .cvsignore	24 Jan 2009 10:28:11 -0000	1.7
@@ -1 +1 @@
-collectl-3.1.2.src.tar.gz
+collectl-3.1.3.src.tar.gz


Index: collectl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/collectl/F-10/collectl.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- collectl.spec	20 Jan 2009 15:27:18 -0000	1.5
+++ collectl.spec	24 Jan 2009 10:28:11 -0000	1.6
@@ -1,6 +1,6 @@
 Summary: A utility to collect various linux performance data
 Name: collectl
-Version: 3.1.2
+Version: 3.1.3
 Release: 1%{?dist}
 License: GPLv2+ or Artistic
 Group: Applications/System
@@ -94,6 +94,9 @@
 %{_localstatedir}/log/%{name}
 
 %changelog
+* Sat Jan 24 2009 Dan Horak <dan[at]danny.cz> 3.1.3-1
+- upgrade to upstream version 3.1.3
+
 * Tue Jan 20 2009 Dan Horak <dan[at]danny.cz> 3.1.2-1
 - upgrade to upstream version 3.1.2
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/collectl/F-10/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	20 Jan 2009 15:27:18 -0000	1.6
+++ sources	24 Jan 2009 10:28:11 -0000	1.7
@@ -1 +1 @@
-161d47dcbff551c353020cef4990efc8  collectl-3.1.2.src.tar.gz
+8fcd4988dd43af98943833ca9c78cb2d  collectl-3.1.3.src.tar.gz



From ruben at fedoraproject.org  Sat Jan 24 10:29:29 2009
From: ruben at fedoraproject.org (Ruben Kerkhof)
Date: Sat, 24 Jan 2009 10:29:29 +0000 (UTC)
Subject: rpms/poweradmin/devel import.log, NONE,
	1.1 poweradmin-config.inc.php, 
	NONE, 1.1 poweradmin.conf, NONE, 1.1 poweradmin.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090124102929.BBA3A70141@cvs1.fedora.phx.redhat.com>

Author: ruben

Update of /cvs/pkgs/rpms/poweradmin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31125/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log poweradmin-config.inc.php poweradmin.conf 
	poweradmin.spec 
Log Message:
Initial import into devel



--- NEW FILE import.log ---
poweradmin-2_1_2-2_fc11:HEAD:poweradmin-2.1.2-2.fc11.src.rpm:1232792906


--- NEW FILE poweradmin-config.inc.php ---
<?php

$db_host                = "localhost";
$db_user                = "powerdns";
$db_pass                = "";
$db_name                = "powerdns";
$db_type                = "mysql";

$iface_lang             = "en_EN";

$dns_hostmaster         = "hostmaster.example.com";
$dns_ns1                = "ns1.example.com";
$dns_ns2                = "ns2.example.com";

?>



--- NEW FILE poweradmin.conf ---
Alias /poweradmin /usr/share/poweradmin
<Directory /usr/share/poweradmin/>
   order deny,allow
   deny from all
   allow from 127.0.0.1
</Directory>


--- NEW FILE poweradmin.spec ---
Name:         poweradmin
Version:      2.1.2
Release:      2%{?dist}
Summary:      A friendly web-based DNS administration tool for Bert Hubert's PowerDNS server

Group:        Applications/Internet
License:      GPLv3+
URL:          http://www.poweradmin.org
Source0:      https://www.poweradmin.org/download/%{name}-%{version}.tgz
Source1:      %{name}.conf
Source2:      %{name}-config.inc.php
BuildRoot:    %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:    noarch

Requires:     httpd
Requires:     php
Requires:     php-pear(MDB2_Driver_mysql)
Requires:     php-pear(MDB2_Driver_pgsql)

%description
Poweradmin is a friendly web-based DNS administration tool for Bert Hubert's
PowerDNS server. The interface has full support for most of the features of
PowerDNS. It has full support for all zone types (master, native and slave),
for supermasters for automatic provisioning of slave zones, full support
for IPv6 and comes with multi-language support.


%prep
%setup -q


%build


%install
rm -rf %{buildroot}
%{__mkdir} -pv %{buildroot}/%{_datadir}/%{name}
%{__mkdir} -pv %{buildroot}/%{_sysconfdir}/httpd/conf.d/
%{__mkdir} -p %{buildroot}/%{_sysconfdir}/%{name}

%{__cp} -adpv ./* %{buildroot}/%{_datadir}/%{name}
%{__cp} -pv %{SOURCE1} %{buildroot}/%{_sysconfdir}/httpd/conf.d/%{name}.conf

%{__cp} %{SOURCE2} %{buildroot}/%{_sysconfdir}/%{name}/config.inc.php
ln -s %{_sysconfdir}/%{name}/config.inc.php %{buildroot}/%{_datadir}/%{name}/config.inc.php

%{__rm} -rfv %{buildroot}/%{_datadir}/%{name}/docs
%{__rm} -rfv %{buildroot}/%{_datadir}/%{name}/install

%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%{_datadir}/%{name}
%config(noreplace) %{_sysconfdir}/httpd/conf.d/%{name}.conf
%dir %{_sysconfdir}/%{name}
%config(noreplace) %{_sysconfdir}/%{name}/config.inc.php
%doc docs/*



%changelog
* Mon Jan 19 2009 Ruben Kerkhof <ruben at rubenkerkhof.com> - 2.1.2-2
- Review fixes (#480552)

* Sun Jan 18 2009 Ruben Kerkhof <ruben at rubenkerkhof.com> - 2.1.2-1
- Initial import



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/poweradmin/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	23 Jan 2009 23:26:09 -0000	1.1
+++ .cvsignore	24 Jan 2009 10:28:59 -0000	1.2
@@ -0,0 +1 @@
+poweradmin-2.1.2.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/poweradmin/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	23 Jan 2009 23:26:09 -0000	1.1
+++ sources	24 Jan 2009 10:28:59 -0000	1.2
@@ -0,0 +1 @@
+cf83b89c6931160684de52a0b3ea3678  poweradmin-2.1.2.tgz



From sharkcz at fedoraproject.org  Sat Jan 24 10:30:41 2009
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Sat, 24 Jan 2009 10:30:41 +0000 (UTC)
Subject: rpms/collectl/F-9 .cvsignore, 1.6, 1.7 collectl.spec, 1.5,
	1.6 sources, 1.6, 1.7
Message-ID: <20090124103041.695D770142@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/collectl/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31559

Modified Files:
	.cvsignore collectl.spec sources 
Log Message:
* Sat Jan 24 2009 Dan Horak <dan[at]danny.cz> 3.1.3-1
- upgrade to upstream version 3.1.3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/collectl/F-9/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	20 Jan 2009 15:28:51 -0000	1.6
+++ .cvsignore	24 Jan 2009 10:30:10 -0000	1.7
@@ -1 +1 @@
-collectl-3.1.2.src.tar.gz
+collectl-3.1.3.src.tar.gz


Index: collectl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/collectl/F-9/collectl.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- collectl.spec	20 Jan 2009 15:28:51 -0000	1.5
+++ collectl.spec	24 Jan 2009 10:30:10 -0000	1.6
@@ -1,6 +1,6 @@
 Summary: A utility to collect various linux performance data
 Name: collectl
-Version: 3.1.2
+Version: 3.1.3
 Release: 1%{?dist}
 License: GPLv2+ or Artistic
 Group: Applications/System
@@ -94,6 +94,9 @@
 %{_localstatedir}/log/%{name}
 
 %changelog
+* Sat Jan 24 2009 Dan Horak <dan[at]danny.cz> 3.1.3-1
+- upgrade to upstream version 3.1.3
+
 * Tue Jan 20 2009 Dan Horak <dan[at]danny.cz> 3.1.2-1
 - upgrade to upstream version 3.1.2
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/collectl/F-9/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	20 Jan 2009 15:28:51 -0000	1.6
+++ sources	24 Jan 2009 10:30:10 -0000	1.7
@@ -1 +1 @@
-161d47dcbff551c353020cef4990efc8  collectl-3.1.2.src.tar.gz
+8fcd4988dd43af98943833ca9c78cb2d  collectl-3.1.3.src.tar.gz



From sharkcz at fedoraproject.org  Sat Jan 24 10:32:23 2009
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Sat, 24 Jan 2009 10:32:23 +0000 (UTC)
Subject: rpms/collectl/EL-5 .cvsignore, 1.6, 1.7 collectl.spec, 1.5,
	1.6 sources, 1.6, 1.7
Message-ID: <20090124103223.2F9C77010A@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/collectl/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32610

Modified Files:
	.cvsignore collectl.spec sources 
Log Message:
* Sat Jan 24 2009 Dan Horak <dan[at]danny.cz> 3.1.3-1
- upgrade to upstream version 3.1.3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/collectl/EL-5/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	20 Jan 2009 15:30:21 -0000	1.6
+++ .cvsignore	24 Jan 2009 10:31:52 -0000	1.7
@@ -1 +1 @@
-collectl-3.1.2.src.tar.gz
+collectl-3.1.3.src.tar.gz


Index: collectl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/collectl/EL-5/collectl.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- collectl.spec	20 Jan 2009 15:30:21 -0000	1.5
+++ collectl.spec	24 Jan 2009 10:31:52 -0000	1.6
@@ -1,6 +1,6 @@
 Summary: A utility to collect various linux performance data
 Name: collectl
-Version: 3.1.2
+Version: 3.1.3
 Release: 1%{?dist}
 License: GPLv2+ or Artistic
 Group: Applications/System
@@ -94,6 +94,9 @@
 %{_localstatedir}/log/%{name}
 
 %changelog
+* Sat Jan 24 2009 Dan Horak <dan[at]danny.cz> 3.1.3-1
+- upgrade to upstream version 3.1.3
+
 * Tue Jan 20 2009 Dan Horak <dan[at]danny.cz> 3.1.2-1
 - upgrade to upstream version 3.1.2
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/collectl/EL-5/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	20 Jan 2009 15:30:21 -0000	1.6
+++ sources	24 Jan 2009 10:31:52 -0000	1.7
@@ -1 +1 @@
-161d47dcbff551c353020cef4990efc8  collectl-3.1.2.src.tar.gz
+8fcd4988dd43af98943833ca9c78cb2d  collectl-3.1.3.src.tar.gz



From sharkcz at fedoraproject.org  Sat Jan 24 10:35:04 2009
From: sharkcz at fedoraproject.org (=?utf-8?q?Dan_Hor=C3=A1k?=)
Date: Sat, 24 Jan 2009 10:35:04 +0000 (UTC)
Subject: rpms/collectl/EL-4 .cvsignore, 1.5, 1.6 collectl.spec, 1.4,
	1.5 sources, 1.5, 1.6
Message-ID: <20090124103504.CA9AA7010A@cvs1.fedora.phx.redhat.com>

Author: sharkcz

Update of /cvs/pkgs/rpms/collectl/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv751

Modified Files:
	.cvsignore collectl.spec sources 
Log Message:
* Sat Jan 24 2009 Dan Horak <dan[at]danny.cz> 3.1.3-1
- upgrade to upstream version 3.1.3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/collectl/EL-4/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	8 Nov 2008 19:44:25 -0000	1.5
+++ .cvsignore	24 Jan 2009 10:34:34 -0000	1.6
@@ -1 +1 @@
-collectl-3.1.1.src.tar.gz
+collectl-3.1.3.src.tar.gz


Index: collectl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/collectl/EL-4/collectl.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- collectl.spec	8 Nov 2008 19:44:25 -0000	1.4
+++ collectl.spec	24 Jan 2009 10:34:34 -0000	1.5
@@ -1,6 +1,6 @@
 Summary: A utility to collect various linux performance data
 Name: collectl
-Version: 3.1.1
+Version: 3.1.3
 Release: 1%{?dist}
 License: GPLv2+ or Artistic
 Group: Applications/System
@@ -94,6 +94,12 @@
 %{_localstatedir}/log/%{name}
 
 %changelog
+* Sat Jan 24 2009 Dan Horak <dan[at]danny.cz> 3.1.3-1
+- upgrade to upstream version 3.1.3
+
+* Tue Jan 20 2009 Dan Horak <dan[at]danny.cz> 3.1.2-1
+- upgrade to upstream version 3.1.2
+
 * Sat Nov  8 2008 Dan Horak <dan[at]danny.cz> 3.1.1-1
 - upgrade to upstream version 3.1.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/collectl/EL-4/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	8 Nov 2008 19:44:25 -0000	1.5
+++ sources	24 Jan 2009 10:34:34 -0000	1.6
@@ -1 +1 @@
-6194341e62685aabf9c33dea3ec1cf1d  collectl-3.1.1.src.tar.gz
+8fcd4988dd43af98943833ca9c78cb2d  collectl-3.1.3.src.tar.gz



From than at fedoraproject.org  Sat Jan 24 10:36:34 2009
From: than at fedoraproject.org (Than Ngo)
Date: Sat, 24 Jan 2009 10:36:34 +0000 (UTC)
Subject: rpms/kde-l10n/devel kde-l10n.spec, 1.62, 1.63 subdirs-kde-l10n, 1.12,
	1.13
Message-ID: <20090124103634.277897010A@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kde-l10n/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv983

Modified Files:
	kde-l10n.spec subdirs-kde-l10n 
Log Message:
disable fy/ta/eo in upstream



Index: kde-l10n.spec
===================================================================
RCS file: /cvs/extras/rpms/kde-l10n/devel/kde-l10n.spec,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- kde-l10n.spec	24 Jan 2009 10:18:33 -0000	1.62
+++ kde-l10n.spec	24 Jan 2009 10:36:03 -0000	1.63
@@ -932,9 +932,11 @@
 %lang(en_GB) %{_kde4_appsdir}/kvtml/en_GB
 %lang(en_GB) %{_kde4_docdir}/HTML/en_GB
 
+%if %{buildall}
 %files Esperanto
 %defattr(-,root,root)
 %lang(eo) %{_datadir}/locale/eo/*
+%endif
 
 %files Spanish
 %defattr(-,root,root)
@@ -984,9 +986,11 @@
 %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)
@@ -1244,9 +1248,11 @@
 %lang(sv) %{_kde4_appsdir}/kvtml/sv
 %lang(sv) %{_kde4_docdir}/HTML/sv
 
+%if %{buildall}
 %files Tamil
 %defattr(-,root,root)
 %lang(ta) %{_datadir}/locale/ta/*
+%endif
 
 %if %{buildall}
 %files Tajik


Index: subdirs-kde-l10n
===================================================================
RCS file: /cvs/extras/rpms/kde-l10n/devel/subdirs-kde-l10n,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- subdirs-kde-l10n	22 Jan 2009 14:06:57 -0000	1.12
+++ subdirs-kde-l10n	24 Jan 2009 10:36:03 -0000	1.13
@@ -7,13 +7,11 @@
 de
 el
 en_GB
-eo
 es
 et
 eu
 fi
 fr
-fy
 ga
 gl
 hi
@@ -40,7 +38,6 @@
 sl
 sr
 sv
-ta
 th
 tr
 uk



From ruben at fedoraproject.org  Sat Jan 24 10:37:51 2009
From: ruben at fedoraproject.org (Ruben Kerkhof)
Date: Sat, 24 Jan 2009 10:37:51 +0000 (UTC)
Subject: rpms/poweradmin/F-10 import.log, NONE, 1.1 poweradmin-config.inc.php,
	NONE, 1.1 poweradmin.conf, NONE, 1.1 poweradmin.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090124103751.3719F7010A@cvs1.fedora.phx.redhat.com>

Author: ruben

Update of /cvs/pkgs/rpms/poweradmin/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1480/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	import.log poweradmin-config.inc.php poweradmin.conf 
	poweradmin.spec 
Log Message:
Import into F-10



--- NEW FILE import.log ---
poweradmin-2_1_2-2_fc11:F-10:poweradmin-2.1.2-2.fc11.src.rpm:1232793351


--- NEW FILE poweradmin-config.inc.php ---
<?php

$db_host                = "localhost";
$db_user                = "powerdns";
$db_pass                = "";
$db_name                = "powerdns";
$db_type                = "mysql";

$iface_lang             = "en_EN";

$dns_hostmaster         = "hostmaster.example.com";
$dns_ns1                = "ns1.example.com";
$dns_ns2                = "ns2.example.com";

?>



--- NEW FILE poweradmin.conf ---
Alias /poweradmin /usr/share/poweradmin
<Directory /usr/share/poweradmin/>
   order deny,allow
   deny from all
   allow from 127.0.0.1
</Directory>


--- NEW FILE poweradmin.spec ---
Name:         poweradmin
Version:      2.1.2
Release:      2%{?dist}
Summary:      A friendly web-based DNS administration tool for Bert Hubert's PowerDNS server

Group:        Applications/Internet
License:      GPLv3+
URL:          http://www.poweradmin.org
Source0:      https://www.poweradmin.org/download/%{name}-%{version}.tgz
Source1:      %{name}.conf
Source2:      %{name}-config.inc.php
BuildRoot:    %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:    noarch

Requires:     httpd
Requires:     php
Requires:     php-pear(MDB2_Driver_mysql)
Requires:     php-pear(MDB2_Driver_pgsql)

%description
Poweradmin is a friendly web-based DNS administration tool for Bert Hubert's
PowerDNS server. The interface has full support for most of the features of
PowerDNS. It has full support for all zone types (master, native and slave),
for supermasters for automatic provisioning of slave zones, full support
for IPv6 and comes with multi-language support.


%prep
%setup -q


%build


%install
rm -rf %{buildroot}
%{__mkdir} -pv %{buildroot}/%{_datadir}/%{name}
%{__mkdir} -pv %{buildroot}/%{_sysconfdir}/httpd/conf.d/
%{__mkdir} -p %{buildroot}/%{_sysconfdir}/%{name}

%{__cp} -adpv ./* %{buildroot}/%{_datadir}/%{name}
%{__cp} -pv %{SOURCE1} %{buildroot}/%{_sysconfdir}/httpd/conf.d/%{name}.conf

%{__cp} %{SOURCE2} %{buildroot}/%{_sysconfdir}/%{name}/config.inc.php
ln -s %{_sysconfdir}/%{name}/config.inc.php %{buildroot}/%{_datadir}/%{name}/config.inc.php

%{__rm} -rfv %{buildroot}/%{_datadir}/%{name}/docs
%{__rm} -rfv %{buildroot}/%{_datadir}/%{name}/install

%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%{_datadir}/%{name}
%config(noreplace) %{_sysconfdir}/httpd/conf.d/%{name}.conf
%dir %{_sysconfdir}/%{name}
%config(noreplace) %{_sysconfdir}/%{name}/config.inc.php
%doc docs/*



%changelog
* Mon Jan 19 2009 Ruben Kerkhof <ruben at rubenkerkhof.com> - 2.1.2-2
- Review fixes (#480552)

* Sun Jan 18 2009 Ruben Kerkhof <ruben at rubenkerkhof.com> - 2.1.2-1
- Initial import



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/poweradmin/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	23 Jan 2009 23:26:09 -0000	1.1
+++ .cvsignore	24 Jan 2009 10:37:20 -0000	1.2
@@ -0,0 +1 @@
+poweradmin-2.1.2.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/poweradmin/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	23 Jan 2009 23:26:09 -0000	1.1
+++ sources	24 Jan 2009 10:37:20 -0000	1.2
@@ -0,0 +1 @@
+cf83b89c6931160684de52a0b3ea3678  poweradmin-2.1.2.tgz



From than at fedoraproject.org  Sat Jan 24 10:38:23 2009
From: than at fedoraproject.org (Than Ngo)
Date: Sat, 24 Jan 2009 10:38:23 +0000 (UTC)
Subject: rpms/kde-l10n/F-10 kde-l10n.spec, 1.53, 1.54 subdirs-kde-l10n, 1.13,
	1.14
Message-ID: <20090124103823.AC2FC7010A@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kde-l10n/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1601

Modified Files:
	kde-l10n.spec subdirs-kde-l10n 
Log Message:
4.2.0



Index: kde-l10n.spec
===================================================================
RCS file: /cvs/extras/rpms/kde-l10n/F-10/kde-l10n.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- kde-l10n.spec	24 Jan 2009 10:23:12 -0000	1.53
+++ kde-l10n.spec	24 Jan 2009 10:37:53 -0000	1.54
@@ -932,9 +932,11 @@
 %lang(en_GB) %{_kde4_appsdir}/kvtml/en_GB
 %lang(en_GB) %{_kde4_docdir}/HTML/en_GB
 
+%if %{buildall}
 %files Esperanto
 %defattr(-,root,root)
 %lang(eo) %{_datadir}/locale/eo/*
+%endif
 
 %files Spanish
 %defattr(-,root,root)
@@ -984,9 +986,11 @@
 %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)
@@ -1244,9 +1248,11 @@
 %lang(sv) %{_kde4_appsdir}/kvtml/sv
 %lang(sv) %{_kde4_docdir}/HTML/sv
 
+%if %{buildall}
 %files Tamil
 %defattr(-,root,root)
 %lang(ta) %{_datadir}/locale/ta/*
+%endif
 
 %if %{buildall}
 %files Tajik


Index: subdirs-kde-l10n
===================================================================
RCS file: /cvs/extras/rpms/kde-l10n/F-10/subdirs-kde-l10n,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- subdirs-kde-l10n	24 Jan 2009 10:23:12 -0000	1.13
+++ subdirs-kde-l10n	24 Jan 2009 10:37:53 -0000	1.14
@@ -7,13 +7,11 @@
 de
 el
 en_GB
-eo
 es
 et
 eu
 fi
 fr
-fy
 ga
 gl
 hi
@@ -40,7 +38,6 @@
 sl
 sr
 sv
-ta
 th
 tr
 uk



From ruben at fedoraproject.org  Sat Jan 24 10:41:54 2009
From: ruben at fedoraproject.org (Ruben Kerkhof)
Date: Sat, 24 Jan 2009 10:41:54 +0000 (UTC)
Subject: rpms/poweradmin/EL-5 import.log, NONE, 1.1 poweradmin-config.inc.php,
	NONE, 1.1 poweradmin.conf, NONE, 1.1 poweradmin.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090124104154.71C0A7010A@cvs1.fedora.phx.redhat.com>

Author: ruben

Update of /cvs/pkgs/rpms/poweradmin/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2539/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	import.log poweradmin-config.inc.php poweradmin.conf 
	poweradmin.spec 
Log Message:
Import into EL-5



--- NEW FILE import.log ---
poweradmin-2_1_2-2_fc11:EL-5:poweradmin-2.1.2-2.fc11.src.rpm:1232793655


--- NEW FILE poweradmin-config.inc.php ---
<?php

$db_host                = "localhost";
$db_user                = "powerdns";
$db_pass                = "";
$db_name                = "powerdns";
$db_type                = "mysql";

$iface_lang             = "en_EN";

$dns_hostmaster         = "hostmaster.example.com";
$dns_ns1                = "ns1.example.com";
$dns_ns2                = "ns2.example.com";

?>



--- NEW FILE poweradmin.conf ---
Alias /poweradmin /usr/share/poweradmin
<Directory /usr/share/poweradmin/>
   order deny,allow
   deny from all
   allow from 127.0.0.1
</Directory>


--- NEW FILE poweradmin.spec ---
Name:         poweradmin
Version:      2.1.2
Release:      2%{?dist}
Summary:      A friendly web-based DNS administration tool for Bert Hubert's PowerDNS server

Group:        Applications/Internet
License:      GPLv3+
URL:          http://www.poweradmin.org
Source0:      https://www.poweradmin.org/download/%{name}-%{version}.tgz
Source1:      %{name}.conf
Source2:      %{name}-config.inc.php
BuildRoot:    %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:    noarch

Requires:     httpd
Requires:     php
Requires:     php-pear(MDB2_Driver_mysql)
Requires:     php-pear(MDB2_Driver_pgsql)

%description
Poweradmin is a friendly web-based DNS administration tool for Bert Hubert's
PowerDNS server. The interface has full support for most of the features of
PowerDNS. It has full support for all zone types (master, native and slave),
for supermasters for automatic provisioning of slave zones, full support
for IPv6 and comes with multi-language support.


%prep
%setup -q


%build


%install
rm -rf %{buildroot}
%{__mkdir} -pv %{buildroot}/%{_datadir}/%{name}
%{__mkdir} -pv %{buildroot}/%{_sysconfdir}/httpd/conf.d/
%{__mkdir} -p %{buildroot}/%{_sysconfdir}/%{name}

%{__cp} -adpv ./* %{buildroot}/%{_datadir}/%{name}
%{__cp} -pv %{SOURCE1} %{buildroot}/%{_sysconfdir}/httpd/conf.d/%{name}.conf

%{__cp} %{SOURCE2} %{buildroot}/%{_sysconfdir}/%{name}/config.inc.php
ln -s %{_sysconfdir}/%{name}/config.inc.php %{buildroot}/%{_datadir}/%{name}/config.inc.php

%{__rm} -rfv %{buildroot}/%{_datadir}/%{name}/docs
%{__rm} -rfv %{buildroot}/%{_datadir}/%{name}/install

%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%{_datadir}/%{name}
%config(noreplace) %{_sysconfdir}/httpd/conf.d/%{name}.conf
%dir %{_sysconfdir}/%{name}
%config(noreplace) %{_sysconfdir}/%{name}/config.inc.php
%doc docs/*



%changelog
* Mon Jan 19 2009 Ruben Kerkhof <ruben at rubenkerkhof.com> - 2.1.2-2
- Review fixes (#480552)

* Sun Jan 18 2009 Ruben Kerkhof <ruben at rubenkerkhof.com> - 2.1.2-1
- Initial import



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/poweradmin/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	23 Jan 2009 23:26:09 -0000	1.1
+++ .cvsignore	24 Jan 2009 10:41:23 -0000	1.2
@@ -0,0 +1 @@
+poweradmin-2.1.2.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/poweradmin/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	23 Jan 2009 23:26:09 -0000	1.1
+++ sources	24 Jan 2009 10:41:23 -0000	1.2
@@ -0,0 +1 @@
+cf83b89c6931160684de52a0b3ea3678  poweradmin-2.1.2.tgz



From abompard at fedoraproject.org  Sat Jan 24 10:42:32 2009
From: abompard at fedoraproject.org (Aurelien Bompard)
Date: Sat, 24 Jan 2009 10:42:32 +0000 (UTC)
Subject: rpms/ulogd/devel ulogd.spec,1.22,1.23
Message-ID: <20090124104232.050527010A@cvs1.fedora.phx.redhat.com>

Author: abompard

Update of /cvs/pkgs/rpms/ulogd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2718

Modified Files:
	ulogd.spec 
Log Message:
* Sat Jan 24 2009 Aurelien Bompard <abompard at fedoraproject.org> 1.24-10
- rebuild for mysql



Index: ulogd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ulogd/devel/ulogd.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- ulogd.spec	18 Feb 2008 18:33:57 -0000	1.22
+++ ulogd.spec	24 Jan 2009 10:42:01 -0000	1.23
@@ -1,6 +1,6 @@
 Name:           ulogd
 Version:        1.24
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        The userspace logging daemon for netfilter
 License:        GPLv2
 Group:          System Environment/Daemons
@@ -141,6 +141,9 @@
 %{_libdir}/ulogd/ulogd_PCAP.so
 
 %changelog
+* Sat Jan 24 2009 Aurelien Bompard <abompard at fedoraproject.org> 1.24-10
+- rebuild for mysql
+
 * Mon Feb 18 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1.24-9
 - Autorebuild for GCC 4.3
 



From than at fedoraproject.org  Sat Jan 24 10:43:37 2009
From: than at fedoraproject.org (Than Ngo)
Date: Sat, 24 Jan 2009 10:43:37 +0000 (UTC)
Subject: rpms/kde-l10n/devel kde-l10n.spec,1.63,1.64
Message-ID: <20090124104337.BD5717010A@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kde-l10n/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3270

Modified Files:
	kde-l10n.spec 
Log Message:
disable fy/ta/eo in upstream



Index: kde-l10n.spec
===================================================================
RCS file: /cvs/extras/rpms/kde-l10n/devel/kde-l10n.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- kde-l10n.spec	24 Jan 2009 10:36:03 -0000	1.63
+++ kde-l10n.spec	24 Jan 2009 10:43:07 -0000	1.64
@@ -19,7 +19,7 @@
 Source7: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-de-%{version}.tar.bz2
 Source8: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-el-%{version}.tar.bz2
 Source9: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-en_GB-%{version}.tar.bz2
-Source10: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-eo-%{version}.tar.bz2
+#Source10: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-eo-%{version}.tar.bz2
 Source11: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-es-%{version}.tar.bz2
 Source12: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-et-%{version}.tar.bz2
 Source13: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-eu-%{version}.tar.bz2
@@ -52,7 +52,7 @@
 #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
+#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
@@ -60,7 +60,7 @@
 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
+#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 ruben at fedoraproject.org  Sat Jan 24 11:10:01 2009
From: ruben at fedoraproject.org (Ruben Kerkhof)
Date: Sat, 24 Jan 2009 11:10:01 +0000 (UTC)
Subject: rpms/poweradmin/EL-4 poweradmin-config.inc.php, NONE,
	1.1 poweradmin.conf, NONE, 1.1 poweradmin.spec, NONE,
	1.1 sources, 1.1, 1.2
Message-ID: <20090124111001.B32097010A@cvs1.fedora.phx.redhat.com>

Author: ruben

Update of /cvs/pkgs/rpms/poweradmin/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9270

Modified Files:
	sources 
Added Files:
	poweradmin-config.inc.php poweradmin.conf poweradmin.spec 
Log Message:
Initial import into EL-4



--- NEW FILE poweradmin-config.inc.php ---
<?php

$db_host                = "localhost";
$db_user                = "powerdns";
$db_pass                = "";
$db_name                = "powerdns";
$db_type                = "mysql";

$iface_lang             = "en_EN";

$dns_hostmaster         = "hostmaster.example.com";
$dns_ns1                = "ns1.example.com";
$dns_ns2                = "ns2.example.com";

?>



--- NEW FILE poweradmin.conf ---
Alias /poweradmin /usr/share/poweradmin
<Directory /usr/share/poweradmin/>
   order deny,allow
   deny from all
   allow from 127.0.0.1
</Directory>


--- NEW FILE poweradmin.spec ---
Name:         poweradmin
Version:      2.1.2
Release:      2%{?dist}
Summary:      A friendly web-based DNS administration tool for Bert Hubert's PowerDNS server

Group:        Applications/Internet
License:      GPLv3+
URL:          http://www.poweradmin.org
Source0:      https://www.poweradmin.org/download/%{name}-%{version}.tgz
Source1:      %{name}.conf
Source2:      %{name}-config.inc.php
BuildRoot:    %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:    noarch

Requires:     httpd
Requires:     php
Requires:     php-pear(MDB2_Driver_mysql)
Requires:     php-pear(MDB2_Driver_pgsql)

%description
Poweradmin is a friendly web-based DNS administration tool for Bert Hubert's
PowerDNS server. The interface has full support for most of the features of
PowerDNS. It has full support for all zone types (master, native and slave),
for supermasters for automatic provisioning of slave zones, full support
for IPv6 and comes with multi-language support.


%prep
%setup -q


%build


%install
rm -rf %{buildroot}
%{__mkdir} -pv %{buildroot}/%{_datadir}/%{name}
%{__mkdir} -pv %{buildroot}/%{_sysconfdir}/httpd/conf.d/
%{__mkdir} -p %{buildroot}/%{_sysconfdir}/%{name}

%{__cp} -adpv ./* %{buildroot}/%{_datadir}/%{name}
%{__cp} -pv %{SOURCE1} %{buildroot}/%{_sysconfdir}/httpd/conf.d/%{name}.conf

%{__cp} %{SOURCE2} %{buildroot}/%{_sysconfdir}/%{name}/config.inc.php
ln -s %{_sysconfdir}/%{name}/config.inc.php %{buildroot}/%{_datadir}/%{name}/config.inc.php

%{__rm} -rfv %{buildroot}/%{_datadir}/%{name}/docs
%{__rm} -rfv %{buildroot}/%{_datadir}/%{name}/install

%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%{_datadir}/%{name}
%config(noreplace) %{_sysconfdir}/httpd/conf.d/%{name}.conf
%dir %{_sysconfdir}/%{name}
%config(noreplace) %{_sysconfdir}/%{name}/config.inc.php
%doc docs/*



%changelog
* Mon Jan 19 2009 Ruben Kerkhof <ruben at rubenkerkhof.com> - 2.1.2-2
- Review fixes (#480552)

* Sun Jan 18 2009 Ruben Kerkhof <ruben at rubenkerkhof.com> - 2.1.2-1
- Initial import



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/poweradmin/EL-4/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	23 Jan 2009 23:26:09 -0000	1.1
+++ sources	24 Jan 2009 11:09:29 -0000	1.2
@@ -0,0 +1 @@
+cf83b89c6931160684de52a0b3ea3678  poweradmin-2.1.2.tgz



From pkgdb at fedoraproject.org  Sat Jan 24 12:28:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 24 Jan 2009 12:28:15 +0000
Subject: [pkgdb] abyssinica-fonts ownership updated
Message-ID: <20090124122816.18EB0208483@bastion.fedora.phx.redhat.com>

Package abyssinica-fonts in Fedora devel is now owned by bochecha

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/abyssinica-fonts



From pkgdb at fedoraproject.org  Sat Jan 24 12:28:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 24 Jan 2009 12:28:30 +0000
Subject: [pkgdb] abyssinica-fonts ownership updated
Message-ID: <20090124122830.CF302208483@bastion.fedora.phx.redhat.com>

Package abyssinica-fonts in Fedora 9 is now owned by bochecha

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/abyssinica-fonts



From pkgdb at fedoraproject.org  Sat Jan 24 12:28:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 24 Jan 2009 12:28:46 +0000
Subject: [pkgdb] abyssinica-fonts ownership updated
Message-ID: <20090124122846.C1CDD208483@bastion.fedora.phx.redhat.com>

Package abyssinica-fonts in Fedora 10 is now owned by bochecha

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/abyssinica-fonts



From pkgdb at fedoraproject.org  Sat Jan 24 12:31:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 24 Jan 2009 12:31:39 +0000
Subject: [pkgdb] nafees-web-naskh-fonts ownership updated
Message-ID: <20090124123139.BE5C0208482@bastion.fedora.phx.redhat.com>

Package nafees-web-naskh-fonts in Fedora devel is now owned by bochecha

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/nafees-web-naskh-fonts



From pkgdb at fedoraproject.org  Sat Jan 24 12:31:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 24 Jan 2009 12:31:46 +0000
Subject: [pkgdb] nafees-web-naskh-fonts ownership updated
Message-ID: <20090124123146.CF051208489@bastion.fedora.phx.redhat.com>

Package nafees-web-naskh-fonts in Fedora 9 is now owned by bochecha

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/nafees-web-naskh-fonts



From pkgdb at fedoraproject.org  Sat Jan 24 12:31:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 24 Jan 2009 12:31:53 +0000
Subject: [pkgdb] nafees-web-naskh-fonts ownership updated
Message-ID: <20090124123153.B565920848E@bastion.fedora.phx.redhat.com>

Package nafees-web-naskh-fonts in Fedora 10 is now owned by bochecha

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/nafees-web-naskh-fonts



From mnowak at fedoraproject.org  Sat Jan 24 12:37:42 2009
From: mnowak at fedoraproject.org (Michal Nowak)
Date: Sat, 24 Jan 2009 12:37:42 +0000 (UTC)
Subject: rpms/khmeros-fonts/devel import.log, 1.1, 1.2 khmeros-fonts.spec,
	1.1, 1.2
Message-ID: <20090124123742.ABC427010A@cvs1.fedora.phx.redhat.com>

Author: mnowak

Update of /cvs/pkgs/rpms/khmeros-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25925/devel

Modified Files:
	import.log khmeros-fonts.spec 
Log Message:
changes to comply with F11 font rules



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/khmeros-fonts/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	11 Jul 2008 08:23:07 -0000	1.1
+++ import.log	24 Jan 2009 12:37:12 -0000	1.2
@@ -1 +1,2 @@
 khmeros-fonts-5_0-3_fc9:HEAD:khmeros-fonts-5.0-3.fc9.src.rpm:1215764336
+khmeros-fonts-5_0-4_fc10:HEAD:khmeros-fonts-5.0-4.fc10.src.rpm:1232800449


Index: khmeros-fonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/khmeros-fonts/devel/khmeros-fonts.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- khmeros-fonts.spec	11 Jul 2008 08:23:07 -0000	1.1
+++ khmeros-fonts.spec	24 Jan 2009 12:37:12 -0000	1.2
@@ -1,107 +1,131 @@
-%define fontname        khmeros
-%define fontdir         %{_datadir}/fonts/%{fontname}
-%define archivename     All_KhmerOS_%{version}
+%define fontname khmeros
+#%%define fontconf <XX>-%{fontname}
+
+%define archivename All_KhmerOS_%{version}
+
+%define common_desc \
+The Khmer OS fonts include Khmer and Latin alphabets, and they have equivalent \
+sizes for Khmer and English alphabets, so that when texts mix both it is not \
+necessary to have different point sizes for the text in each language. \
+\
+They were created by Danh Hong of the Cambodian Open Institute.
+
 
 Name:           %{fontname}-fonts
 Version:        5.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Khmer font set created by Danh Hong of the Cambodian Open Institute
 
 Group:          User Interface/X
 License:        LGPLv2+
 URL:            http://www.khmeros.info/drupal/?q=en/download/fonts
 Source0:        http://downloads.sourceforge.net/khmer/%{archivename}.zip
+#Source1:        %{name}-fontconfig.conf
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
+BuildRequires:  fontpackages-devel
 
 %description
-The Khmer OS fonts include Khmer and Latin alphabets, and they have equivalent
-sizes for Khmer and English alphabets, so that when texts mix both it is not 
-necessary to have different point sizes for the text in each language.
+%common_desc
 
-They were created by Danh Hong of the Cambodian Open Institute.
 
-%package base
-Summary: Base Khmer font set created by Danh Hong of the Cambodian Open Institute
-Group: User Interface/X
-%description base
-The Khmer OS fonts include base Khmer and Latin alphabets, and they have 
-equivalent sizes for Khmer and English alphabets, so that when texts mix 
-both it is not necessary to have different point sizes for the text in each 
-language.
+#%package common
+#Summary:        Common files of %{name}
+#Group:          User Interface/X
+#Requires:       fontpackages-filesystem
+#
+#%description common
+#%common_desc
+#
+#This package consists of files used by other %{name} packages.
 
-They were created by Danh Hong of the Cambodian Open Institute.
 
-%package battambang
-Summary: Khmer font set created by Danh Hong of the Cambodian Open Institute
-Group: User Interface/X
-%description battambang
-The Khmer OS fonts include Khmer and Latin alphabets, and they have 
-equivalent sizes for Khmer and English alphabets, so that when texts mix 
-both it is not necessary to have different point sizes for the text in each 
-language.
+%package -n %{fontname}-base-fonts
+Summary:        Base KhmerOS font
+Group:          User Interface/X
+#Requires:       %{name}-common = %{version}-%{release}
+#Obsoletes:      khmeros-fonts-base <= %{version}-3
+#Provides:       khmeros-fonts-base-%{version}-%{release}
 
-They were created by Danh Hong of the Cambodian Open Institute.
+%description -n %{fontname}-base-fonts
+%common_desc
 
-%package bokor
-Summary: Khmer font set created by Danh Hong of the Cambodian Open Institute
-Group: User Interface/X
-%description bokor
-The Khmer OS fonts include Khmer and Latin alphabets, and they have 
-equivalent sizes for Khmer and English alphabets, so that when texts mix 
-both it is not necessary to have different point sizes for the text in each 
-language.
+Base KhmerOS fonts.
 
-They were created by Danh Hong of the Cambodian Open Institute.
+%_font_pkg -n base KhmerOS.ttf KhmerOS_content.ttf KhmerOS_sys.ttf
 
+%package -n %{fontname}-battambang-fonts
+Summary:        Battambang font
+Group:          User Interface/X
+#Requires:       %{name}-common = %{version}-%{release}
 
-%package handwritten
-Summary: Handwritten Khmer font set created by Danh Hong of the Cambodian Open Institute
-Group: User Interface/X
-%description handwritten
-The Khmer OS fonts include Khmer and Latin alphabets, and they have 
-equivalent sizes for Khmer and English alphabets, so that when texts mix 
-both it is not necessary to have different point sizes for the text in each 
-language.
+%description -n %{fontname}-battambang-fonts
+%common_desc
 
-They were created by Danh Hong of the Cambodian Open Institute.
+Battambang font.
 
+%_font_pkg -n battambang KhmerOS_battambang.ttf
 
-%package metalchrieng
-Summary: Old-fashioned Khmer font set by Danh Hong of the Cambodian Open Institute
-Group: User Interface/X
-%description metalchrieng
-The Khmer OS fonts include Khmer and Latin alphabets, and they have 
-equivalent sizes for Khmer and English alphabets, so that when texts mix 
-both it is not necessary to have different point sizes for the text in each 
-language.
+%package -n %{fontname}-bokor-fonts
+Summary:        Bokor font
+Group:          User Interface/X
+#Requires:       %{name}-common = %{version}-%{release}
 
-They were created by Danh Hong of the Cambodian Open Institute.
+%description -n %{fontname}-bokor-fonts
+%common_desc
 
+Bokor font.
 
-%package muol
-Summary: Khmer font set created by Danh Hong of the Cambodian Open Institute
-Group: User Interface/X
-%description muol
-The Khmer OS fonts include Khmer and Latin alphabets, and they have 
-equivalent sizes for Khmer and English alphabets, so that when texts mix 
-both it is not necessary to have different point sizes for the text in each 
-language.
+%_font_pkg -n bokor KhmerOS_bokor.ttf
 
-They were created by Danh Hong of the Cambodian Open Institute.
+%package -n %{fontname}-handwritten-fonts
+Summary:        Freehand and fasthand fonts
+Group:          User Interface/X
+#Requires:       %{name}-common = %{version}-%{release}
 
+%description -n %{fontname}-handwritten-fonts
+%common_desc
 
-%package siemreap
-Summary: Khmer font set created by Danh Hong of the Cambodian Open Institute
-Group: User Interface/X
-%description siemreap
-The Khmer OS fonts include Khmer and Latin alphabets, and they have 
-equivalent sizes for Khmer and English alphabets, so that when texts mix 
-both it is not necessary to have different point sizes for the text in each 
-language.
+Freehand and fasthand - handwritten fonts.
 
-They were created by Danh Hong of the Cambodian Open Institute.
+%_font_pkg -n handwritten KhmerOS_freehand.ttf KhmerOS_fasthand.ttf
+
+%package -n %{fontname}-metal-chrieng-fonts
+Summary:        Metal Chrieng font
+Group:          User Interface/X
+#Requires:       %{name}-common = %{version}-%{release}
+
+%description -n %{fontname}-metal-chrieng-fonts
+%common_desc
+
+Metal Chrieng font.
+
+%_font_pkg -n metal-chrieng KhmerOS_metalchrieng.ttf
+
+%package -n %{fontname}-muol-fonts
+Summary:        Muol fonts - normal, light and Pali
+Group:          User Interface/X
+#Requires:       %{name}-common = %{version}-%{release}
+
+%description -n %{fontname}-muol-fonts
+%common_desc
+
+Muol fonts - normal, light and Pali.
+
+%_font_pkg -n muol KhmerOS_muol.ttf KhmerOS_muollight.ttf KhmerOS_muolpali.ttf
+
+%package -n %{fontname}-siemreap-fonts
+Summary:        Siemreap font
+Group:          User Interface/X
+#Requires:       %{name}-common = %{version}-%{release}
+
+%description -n %{fontname}-siemreap-fonts
+%common_desc
+
+Siemreap font.
+
+%_font_pkg -n siemreap KhmerOS_siemreap.ttf
 
 
 %prep
@@ -114,125 +138,40 @@
 %install
 rm -rf %{buildroot}
 
-# One of the fonts is named 'KhmerOS .ttf' (note the space).
-#   1) It is apparently a mistake.
-#   2) Have problems with installing it inside %%files base
-rename ' ' '' *
+# get rid of the white space (' ')
+mv 'KhmerOS .ttf' KhmerOS.ttf
 
-install -dm 755 %{buildroot}%{fontdir}
-install -pm 644 *.ttf %{buildroot}%{fontdir}
+install -m 0755 -d %{buildroot}%{_fontdir}
+install -m 0644 -p *.ttf %{buildroot}%{_fontdir}
+
+#install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} \
+#                   %{buildroot}%{_fontconfig_confdir}
+
+# Repeat for every font family
+#install -m 0644 -p %{SOURCEX} \
+#        %{buildroot}%{_fontconfig_templatedir}/%{fontconf}-<FAMILYX>.conf
+
+#for fconf in %{fontconf}-<FAMILYX>.conf \
+#             %{fontconf}-<FAMILYY>.conf \
+#             %{fontconf}-<FAMILYZ>.conf ; do
+#  ln -s %{_fontconfig_templatedir}/$fconf \
+#        %{buildroot}%{_fontconfig_confdir}/$fconf
+#done
 
 
 %clean
 rm -rf %{buildroot}
 
 
-%post base
-if [ -x %{_bindir}/fc-cache ] ; then
-    %{_bindir}/fc-cache -f %{fontdir} || :
-fi
-
-%post battambang
-if [ -x %{_bindir}/fc-cache ] ; then
-    %{_bindir}/fc-cache -f %{fontdir} || :
-fi
-
-%post bokor
-if [ -x %{_bindir}/fc-cache ] ; then
-    %{_bindir}/fc-cache -f %{fontdir} || :
-fi
-
-%post handwritten
-if [ -x %{_bindir}/fc-cache ] ; then
-    %{_bindir}/fc-cache -f %{fontdir} || :
-fi
-
-%post metalchrieng
-if [ -x %{_bindir}/fc-cache ] ; then
-    %{_bindir}/fc-cache -f %{fontdir} || :
-fi
-
-%post muol
-if [ -x %{_bindir}/fc-cache ] ; then
-    %{_bindir}/fc-cache -f %{fontdir} || :
-fi
-
-%post siemreap
-if [ -x %{_bindir}/fc-cache ] ; then
-    %{_bindir}/fc-cache -f %{fontdir} || :
-fi
-
-%postun base
-if [ $1 -eq 0 -a -x %{_bindir}/fc-cache ] ; then
-    %{_bindir}/fc-cache -f %{fontdir} || :
-fi
-%postun battambang
-if [ $1 -eq 0 -a -x %{_bindir}/fc-cache ] ; then
-    %{_bindir}/fc-cache -f %{fontdir} || :
-fi
-%postun bokor
-if [ $1 -eq 0 -a -x %{_bindir}/fc-cache ] ; then
-    %{_bindir}/fc-cache -f %{fontdir} || :
-fi
-%postun handwritten
-if [ $1 -eq 0 -a -x %{_bindir}/fc-cache ] ; then
-    %{_bindir}/fc-cache -f %{fontdir} || :
-fi
-%postun metalchrieng
-if [ $1 -eq 0 -a -x %{_bindir}/fc-cache ] ; then
-    %{_bindir}/fc-cache -f %{fontdir} || :
-fi
-%postun muol
-if [ $1 -eq 0 -a -x %{_bindir}/fc-cache ] ; then
-    %{_bindir}/fc-cache -f %{fontdir} || :
-fi
-%postun siemreap
-if [ $1 -eq 0 -a -x %{_bindir}/fc-cache ] ; then
-    %{_bindir}/fc-cache -f %{fontdir} || :
-fi
-
-
-%files base
-%defattr(644,root,root,755)
-%dir %{fontdir}
-%{fontdir}/KhmerOS.ttf
-%{fontdir}/KhmerOS_sys.ttf
-%{fontdir}/KhmerOS_content.ttf
-
-%files battambang
-%defattr(644,root,root,755)
-%dir %{fontdir}
-%{fontdir}/KhmerOS_battambang.ttf
-
-%files bokor
-%defattr(644,root,root,755)
-%dir %{fontdir}
-%{fontdir}/KhmerOS_bokor.ttf
-
-%files handwritten
-%defattr(644,root,root,755)
-%dir %{fontdir}
-%{fontdir}/KhmerOS_fasthand.ttf
-%{fontdir}/KhmerOS_freehand.ttf
-
-%files metalchrieng
-%defattr(644,root,root,755)
-%dir %{fontdir}
-%{fontdir}/KhmerOS_metalchrieng.ttf
-
-%files muol
-%defattr(644,root,root,755)
-%dir %{fontdir}
-%{fontdir}/KhmerOS_muol.ttf
-%{fontdir}/KhmerOS_muolpali.ttf
-%{fontdir}/KhmerOS_muollight.ttf
-
-%files siemreap
-%defattr(644,root,root,755)
-%dir %{fontdir}
-%{fontdir}/KhmerOS_siemreap.ttf
+#%files common
+#%defattr(0644,root,root,0755)
+#%dir %{_fontdir}
+
 
 %changelog
+* Fri Jan 23 2009 Michal Nowak <mnowak at redhat.com> - 5.0-4
+- changes to comply with F11 font rules
+
 * Tue Jul 8 2008 Michal Nowak <mnowak at redhat.com> - 5.0-3
 - reshaping to multiple subpackages based on font type/purpose
 - license uncertainity is solved; licence field is set according
@@ -243,5 +182,5 @@
 - refactoring summary and description texts (Nicolas Mailhot)
 
 * Fri Jul 4 2008 Michal Nowak <mnowak at redhat.com> - 5.0-1
-- Initial release
+- initial release
 



From lkundrak at fedoraproject.org  Sat Jan 24 13:25:52 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Sat, 24 Jan 2009 13:25:52 +0000 (UTC)
Subject: rpms/kBuild/devel .cvsignore, 1.3, 1.4 kBuild.spec, 1.2, 1.3 sources,
	1.3, 1.4
Message-ID: <20090124132552.CE86A7010A@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/kBuild/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32700

Modified Files:
	.cvsignore kBuild.spec sources 
Log Message:
* Sat Jan 24 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.1.5-1
- Update to new upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kBuild/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	30 Dec 2008 20:16:09 -0000	1.3
+++ .cvsignore	24 Jan 2009 13:25:22 -0000	1.4
@@ -1 +1 @@
-kBuild.tar.gz
+kBuild-0.1.5-src.tar.gz


Index: kBuild.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kBuild/devel/kBuild.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- kBuild.spec	30 Dec 2008 20:16:09 -0000	1.2
+++ kBuild.spec	24 Jan 2009 13:25:22 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           kBuild
 Version:        0.1.5
-Release:        0.1.20081106svn%{?dist}
+Release:        1%{?dist}
 Summary:        A cross-platform build enviroment
 
 Group:          Development/Tools
@@ -8,16 +8,8 @@
 # most tools are from NetBSD, some are from FreeBSD,
 # and make and sed are from GNU
 URL:            http://svn.netlabs.org/kbuild
-#Source0:        ftp://ftp.netlabs.org/pub/kbuild/%{name}-%{version}-src.tar.gz
-# Revision 2058 is of the most recent file of VirtualBox OSE-bundled kBuild
-# where the version was determinable. More recent trunk as of end of 2008 won't
-# build, and latest stable can't build VirtualBox OSE
-# svn export -r2058 http://svn.netlabs.org/repos/kbuild at 2058 kBuild
-# tar czf kBuild.tar.gz kBuild
-Source0:        %{name}.tar.gz
+Source0:        ftp://ftp.netlabs.org/pub/kbuild/%{name}-%{version}-src.tar.gz
 Patch0:         kBuild-0.1.3-escape.patch
-# Revert it, or add <assert.h> include? -- that is the question.
-Patch1:         kBuild-0.1.5-revert2027.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  byacc libacl-devel flex 
@@ -29,36 +21,43 @@
 complex tasks and portable versions of various UNIX tools to
 ensure cross-platform portability.
 
+It is used mainly to build VirtualBox OSE packages for RPM Fusion
+repository.
+
 
 %prep
-%setup -q -n %{name}
+%setup -q
 %patch0 -p1 -b .escape
-%patch1 -p0 -b .revert2027
 
 # Remove prebuilt stuff
 rm -rf kBuild/bin/*
 
 
 %build
-# Unset hardcoded optimizations
-%define mflags CFLAGS="%{optflags}" %{_smp_mflags}
-
-# This is so that we see what's being done,
-# i.e. if the compiler flags are in effect
-export KBUILD_VERBOSE=2
+%define bootstrap_mflags %{_smp_mflags} \\\
+        CFLAGS="%{optflags}"            \\\
+        KBUILD_VERBOSE=2
+
+%define mflags %{bootstrap_mflags}      \\\
+        NIX_INSTALL_DIR=%{_prefix}      \\\
+        BUILD_TYPE=release              \\\
+        MY_INST_MODE=0644               \\\
+        MY_INST_BIN_MODE=0755
 
 # The bootstrap would probably not be needed if we depended on ourselves,
 # yet it is not guarranteed that new versions are compilable with older
 # kmk versions, so with this we are on a safer side
-kBuild/env.sh --full make -f bootstrap.gmk %{mflags}
+kBuild/env.sh --full make -f bootstrap.gmk %{bootstrap_mflags}
 
-kBuild/env.sh kmk NIX_INSTALL_DIR=%{_prefix} BUILD_TYPE=release %{mflags} rebuild
+kBuild/env.sh kmk %{mflags} rebuild
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-kBuild/env.sh kmk NIX_INSTALL_DIR=%{_prefix} BUILD_TYPE=release PATH_INS=$RPM_BUILD_ROOT %{mflags} install
-cp -a kBuild/units $RPM_BUILD_ROOT/%{_datadir}/kBuild
+export KBUILD_VERBOSE=2
+kBuild/env.sh kmk %{mflags} PATH_INS=$RPM_BUILD_ROOT install
+# These are included later in files section
+rm -r $RPM_BUILD_ROOT%{_docdir}
 
 
 %clean
@@ -66,13 +65,17 @@
 
 
 %files
-%defattr(0644,root,root,0755)
-%doc COPYING ChangeLog
-%attr(0755,root,root) %{_bindir}/*
+%defattr(-,root,root,-)
+%{_bindir}/*
 %{_datadir}/*
+%doc COPYING ChangeLog
+%doc kBuild/doc/COPYING-FDL-1.3 kBuild/doc/QuickReference*
 
 
 %changelog
+* Sat Jan 24 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.1.5-1
+- Update to new upstream release
+
 * Tue Dec 30 2008 Lubomir Rintel <lkundrak at v3.sk> - 0.1.5-0.1.20081106svn
 - Update to build VirtualBox OSE 2.1.0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kBuild/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	30 Dec 2008 20:16:09 -0000	1.3
+++ sources	24 Jan 2009 13:25:22 -0000	1.4
@@ -1 +1 @@
-54ec45538cc644a3a2843a0e0618eaf1  kBuild.tar.gz
+df7e0905232e67728643f97d63cbf3f3  kBuild-0.1.5-src.tar.gz



From lkundrak at fedoraproject.org  Sat Jan 24 13:30:13 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Sat, 24 Jan 2009 13:30:13 +0000 (UTC)
Subject: rpms/kBuild/EL-5 kBuild-0.1.5-revert2027.patch,1.1,NONE
Message-ID: <20090124133013.B1C147010A@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/kBuild/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv956/EL-5

Removed Files:
	kBuild-0.1.5-revert2027.patch 
Log Message:
Update branches


--- kBuild-0.1.5-revert2027.patch DELETED ---



From lkundrak at fedoraproject.org  Sat Jan 24 13:30:44 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Sat, 24 Jan 2009 13:30:44 +0000 (UTC)
Subject: rpms/kBuild/F-9 .cvsignore, 1.3, 1.4 kBuild.spec, 1.2, 1.3 sources, 
	1.3, 1.4 kBuild-0.1.5-revert2027.patch, 1.1, NONE
Message-ID: <20090124133044.605EE7010A@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/kBuild/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv956/F-9

Modified Files:
	.cvsignore kBuild.spec sources 
Removed Files:
	kBuild-0.1.5-revert2027.patch 
Log Message:
Update branches


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kBuild/F-9/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	30 Dec 2008 20:48:16 -0000	1.3
+++ .cvsignore	24 Jan 2009 13:30:14 -0000	1.4
@@ -1 +1 @@
-kBuild.tar.gz
+kBuild-0.1.5-src.tar.gz


Index: kBuild.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kBuild/F-9/kBuild.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- kBuild.spec	30 Dec 2008 20:48:16 -0000	1.2
+++ kBuild.spec	24 Jan 2009 13:30:14 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           kBuild
 Version:        0.1.5
-Release:        0.1.20081106svn%{?dist}
+Release:        1%{?dist}
 Summary:        A cross-platform build enviroment
 
 Group:          Development/Tools
@@ -8,16 +8,8 @@
 # most tools are from NetBSD, some are from FreeBSD,
 # and make and sed are from GNU
 URL:            http://svn.netlabs.org/kbuild
-#Source0:        ftp://ftp.netlabs.org/pub/kbuild/%{name}-%{version}-src.tar.gz
-# Revision 2058 is of the most recent file of VirtualBox OSE-bundled kBuild
-# where the version was determinable. More recent trunk as of end of 2008 won't
-# build, and latest stable can't build VirtualBox OSE
-# svn export -r2058 http://svn.netlabs.org/repos/kbuild at 2058 kBuild
-# tar czf kBuild.tar.gz kBuild
-Source0:        %{name}.tar.gz
+Source0:        ftp://ftp.netlabs.org/pub/kbuild/%{name}-%{version}-src.tar.gz
 Patch0:         kBuild-0.1.3-escape.patch
-# Revert it, or add <assert.h> include? -- that is the question.
-Patch1:         kBuild-0.1.5-revert2027.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  byacc libacl-devel flex 
@@ -29,36 +21,43 @@
 complex tasks and portable versions of various UNIX tools to
 ensure cross-platform portability.
 
+It is used mainly to build VirtualBox OSE packages for RPM Fusion
+repository.
+
 
 %prep
-%setup -q -n %{name}
+%setup -q
 %patch0 -p1 -b .escape
-%patch1 -p0 -b .revert2027
 
 # Remove prebuilt stuff
 rm -rf kBuild/bin/*
 
 
 %build
-# Unset hardcoded optimizations
-%define mflags CFLAGS="%{optflags}" %{_smp_mflags}
-
-# This is so that we see what's being done,
-# i.e. if the compiler flags are in effect
-export KBUILD_VERBOSE=2
+%define bootstrap_mflags %{_smp_mflags} \\\
+        CFLAGS="%{optflags}"            \\\
+        KBUILD_VERBOSE=2
+
+%define mflags %{bootstrap_mflags}      \\\
+        NIX_INSTALL_DIR=%{_prefix}      \\\
+        BUILD_TYPE=release              \\\
+        MY_INST_MODE=0644               \\\
+        MY_INST_BIN_MODE=0755
 
 # The bootstrap would probably not be needed if we depended on ourselves,
 # yet it is not guarranteed that new versions are compilable with older
 # kmk versions, so with this we are on a safer side
-kBuild/env.sh --full make -f bootstrap.gmk %{mflags}
+kBuild/env.sh --full make -f bootstrap.gmk %{bootstrap_mflags}
 
-kBuild/env.sh kmk NIX_INSTALL_DIR=%{_prefix} BUILD_TYPE=release %{mflags} rebuild
+kBuild/env.sh kmk %{mflags} rebuild
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-kBuild/env.sh kmk NIX_INSTALL_DIR=%{_prefix} BUILD_TYPE=release PATH_INS=$RPM_BUILD_ROOT %{mflags} install
-cp -a kBuild/units $RPM_BUILD_ROOT/%{_datadir}/kBuild
+export KBUILD_VERBOSE=2
+kBuild/env.sh kmk %{mflags} PATH_INS=$RPM_BUILD_ROOT install
+# These are included later in files section
+rm -r $RPM_BUILD_ROOT%{_docdir}
 
 
 %clean
@@ -66,13 +65,17 @@
 
 
 %files
-%defattr(0644,root,root,0755)
-%doc COPYING ChangeLog
-%attr(0755,root,root) %{_bindir}/*
+%defattr(-,root,root,-)
+%{_bindir}/*
 %{_datadir}/*
+%doc COPYING ChangeLog
+%doc kBuild/doc/COPYING-FDL-1.3 kBuild/doc/QuickReference*
 
 
 %changelog
+* Sat Jan 24 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.1.5-1
+- Update to new upstream release
+
 * Tue Dec 30 2008 Lubomir Rintel <lkundrak at v3.sk> - 0.1.5-0.1.20081106svn
 - Update to build VirtualBox OSE 2.1.0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kBuild/F-9/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	30 Dec 2008 20:48:16 -0000	1.3
+++ sources	24 Jan 2009 13:30:14 -0000	1.4
@@ -1 +1 @@
-54ec45538cc644a3a2843a0e0618eaf1  kBuild.tar.gz
+df7e0905232e67728643f97d63cbf3f3  kBuild-0.1.5-src.tar.gz


--- kBuild-0.1.5-revert2027.patch DELETED ---



From lkundrak at fedoraproject.org  Sat Jan 24 13:30:44 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Sat, 24 Jan 2009 13:30:44 +0000 (UTC)
Subject: rpms/kBuild/F-10 .cvsignore, 1.3, 1.4 kBuild.spec, 1.2, 1.3 sources,
	1.3, 1.4 kBuild-0.1.5-revert2027.patch, 1.1, NONE
Message-ID: <20090124133044.164787010A@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/kBuild/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv956/F-10

Modified Files:
	.cvsignore kBuild.spec sources 
Removed Files:
	kBuild-0.1.5-revert2027.patch 
Log Message:
Update branches


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kBuild/F-10/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	30 Dec 2008 20:48:15 -0000	1.3
+++ .cvsignore	24 Jan 2009 13:30:13 -0000	1.4
@@ -1 +1 @@
-kBuild.tar.gz
+kBuild-0.1.5-src.tar.gz


Index: kBuild.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kBuild/F-10/kBuild.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- kBuild.spec	30 Dec 2008 20:48:15 -0000	1.2
+++ kBuild.spec	24 Jan 2009 13:30:13 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           kBuild
 Version:        0.1.5
-Release:        0.1.20081106svn%{?dist}
+Release:        1%{?dist}
 Summary:        A cross-platform build enviroment
 
 Group:          Development/Tools
@@ -8,16 +8,8 @@
 # most tools are from NetBSD, some are from FreeBSD,
 # and make and sed are from GNU
 URL:            http://svn.netlabs.org/kbuild
-#Source0:        ftp://ftp.netlabs.org/pub/kbuild/%{name}-%{version}-src.tar.gz
-# Revision 2058 is of the most recent file of VirtualBox OSE-bundled kBuild
-# where the version was determinable. More recent trunk as of end of 2008 won't
-# build, and latest stable can't build VirtualBox OSE
-# svn export -r2058 http://svn.netlabs.org/repos/kbuild at 2058 kBuild
-# tar czf kBuild.tar.gz kBuild
-Source0:        %{name}.tar.gz
+Source0:        ftp://ftp.netlabs.org/pub/kbuild/%{name}-%{version}-src.tar.gz
 Patch0:         kBuild-0.1.3-escape.patch
-# Revert it, or add <assert.h> include? -- that is the question.
-Patch1:         kBuild-0.1.5-revert2027.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  byacc libacl-devel flex 
@@ -29,36 +21,43 @@
 complex tasks and portable versions of various UNIX tools to
 ensure cross-platform portability.
 
+It is used mainly to build VirtualBox OSE packages for RPM Fusion
+repository.
+
 
 %prep
-%setup -q -n %{name}
+%setup -q
 %patch0 -p1 -b .escape
-%patch1 -p0 -b .revert2027
 
 # Remove prebuilt stuff
 rm -rf kBuild/bin/*
 
 
 %build
-# Unset hardcoded optimizations
-%define mflags CFLAGS="%{optflags}" %{_smp_mflags}
-
-# This is so that we see what's being done,
-# i.e. if the compiler flags are in effect
-export KBUILD_VERBOSE=2
+%define bootstrap_mflags %{_smp_mflags} \\\
+        CFLAGS="%{optflags}"            \\\
+        KBUILD_VERBOSE=2
+
+%define mflags %{bootstrap_mflags}      \\\
+        NIX_INSTALL_DIR=%{_prefix}      \\\
+        BUILD_TYPE=release              \\\
+        MY_INST_MODE=0644               \\\
+        MY_INST_BIN_MODE=0755
 
 # The bootstrap would probably not be needed if we depended on ourselves,
 # yet it is not guarranteed that new versions are compilable with older
 # kmk versions, so with this we are on a safer side
-kBuild/env.sh --full make -f bootstrap.gmk %{mflags}
+kBuild/env.sh --full make -f bootstrap.gmk %{bootstrap_mflags}
 
-kBuild/env.sh kmk NIX_INSTALL_DIR=%{_prefix} BUILD_TYPE=release %{mflags} rebuild
+kBuild/env.sh kmk %{mflags} rebuild
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-kBuild/env.sh kmk NIX_INSTALL_DIR=%{_prefix} BUILD_TYPE=release PATH_INS=$RPM_BUILD_ROOT %{mflags} install
-cp -a kBuild/units $RPM_BUILD_ROOT/%{_datadir}/kBuild
+export KBUILD_VERBOSE=2
+kBuild/env.sh kmk %{mflags} PATH_INS=$RPM_BUILD_ROOT install
+# These are included later in files section
+rm -r $RPM_BUILD_ROOT%{_docdir}
 
 
 %clean
@@ -66,13 +65,17 @@
 
 
 %files
-%defattr(0644,root,root,0755)
-%doc COPYING ChangeLog
-%attr(0755,root,root) %{_bindir}/*
+%defattr(-,root,root,-)
+%{_bindir}/*
 %{_datadir}/*
+%doc COPYING ChangeLog
+%doc kBuild/doc/COPYING-FDL-1.3 kBuild/doc/QuickReference*
 
 
 %changelog
+* Sat Jan 24 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.1.5-1
+- Update to new upstream release
+
 * Tue Dec 30 2008 Lubomir Rintel <lkundrak at v3.sk> - 0.1.5-0.1.20081106svn
 - Update to build VirtualBox OSE 2.1.0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kBuild/F-10/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	30 Dec 2008 20:48:15 -0000	1.3
+++ sources	24 Jan 2009 13:30:13 -0000	1.4
@@ -1 +1 @@
-54ec45538cc644a3a2843a0e0618eaf1  kBuild.tar.gz
+df7e0905232e67728643f97d63cbf3f3  kBuild-0.1.5-src.tar.gz


--- kBuild-0.1.5-revert2027.patch DELETED ---



From lkundrak at fedoraproject.org  Sat Jan 24 13:33:06 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Sat, 24 Jan 2009 13:33:06 +0000 (UTC)
Subject: rpms/kBuild/EL-5 .cvsignore, 1.3, 1.4 kBuild.spec, 1.2, 1.3 sources,
	1.3, 1.4
Message-ID: <20090124133306.C20B07010A@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/kBuild/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1546/EL-5

Modified Files:
	.cvsignore kBuild.spec sources 
Log Message:
Update branch


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kBuild/EL-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	30 Dec 2008 20:48:15 -0000	1.3
+++ .cvsignore	24 Jan 2009 13:32:36 -0000	1.4
@@ -1 +1 @@
-kBuild.tar.gz
+kBuild-0.1.5-src.tar.gz


Index: kBuild.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kBuild/EL-5/kBuild.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- kBuild.spec	30 Dec 2008 20:48:15 -0000	1.2
+++ kBuild.spec	24 Jan 2009 13:32:36 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           kBuild
 Version:        0.1.5
-Release:        0.1.20081106svn%{?dist}
+Release:        1%{?dist}
 Summary:        A cross-platform build enviroment
 
 Group:          Development/Tools
@@ -8,16 +8,8 @@
 # most tools are from NetBSD, some are from FreeBSD,
 # and make and sed are from GNU
 URL:            http://svn.netlabs.org/kbuild
-#Source0:        ftp://ftp.netlabs.org/pub/kbuild/%{name}-%{version}-src.tar.gz
-# Revision 2058 is of the most recent file of VirtualBox OSE-bundled kBuild
-# where the version was determinable. More recent trunk as of end of 2008 won't
-# build, and latest stable can't build VirtualBox OSE
-# svn export -r2058 http://svn.netlabs.org/repos/kbuild at 2058 kBuild
-# tar czf kBuild.tar.gz kBuild
-Source0:        %{name}.tar.gz
+Source0:        ftp://ftp.netlabs.org/pub/kbuild/%{name}-%{version}-src.tar.gz
 Patch0:         kBuild-0.1.3-escape.patch
-# Revert it, or add <assert.h> include? -- that is the question.
-Patch1:         kBuild-0.1.5-revert2027.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  byacc libacl-devel flex 
@@ -29,36 +21,43 @@
 complex tasks and portable versions of various UNIX tools to
 ensure cross-platform portability.
 
+It is used mainly to build VirtualBox OSE packages for RPM Fusion
+repository.
+
 
 %prep
-%setup -q -n %{name}
+%setup -q
 %patch0 -p1 -b .escape
-%patch1 -p0 -b .revert2027
 
 # Remove prebuilt stuff
 rm -rf kBuild/bin/*
 
 
 %build
-# Unset hardcoded optimizations
-%define mflags CFLAGS="%{optflags}" %{_smp_mflags}
-
-# This is so that we see what's being done,
-# i.e. if the compiler flags are in effect
-export KBUILD_VERBOSE=2
+%define bootstrap_mflags %{_smp_mflags} \\\
+        CFLAGS="%{optflags}"            \\\
+        KBUILD_VERBOSE=2
+
+%define mflags %{bootstrap_mflags}      \\\
+        NIX_INSTALL_DIR=%{_prefix}      \\\
+        BUILD_TYPE=release              \\\
+        MY_INST_MODE=0644               \\\
+        MY_INST_BIN_MODE=0755
 
 # The bootstrap would probably not be needed if we depended on ourselves,
 # yet it is not guarranteed that new versions are compilable with older
 # kmk versions, so with this we are on a safer side
-kBuild/env.sh --full make -f bootstrap.gmk %{mflags}
+kBuild/env.sh --full make -f bootstrap.gmk %{bootstrap_mflags}
 
-kBuild/env.sh kmk NIX_INSTALL_DIR=%{_prefix} BUILD_TYPE=release %{mflags} rebuild
+kBuild/env.sh kmk %{mflags} rebuild
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-kBuild/env.sh kmk NIX_INSTALL_DIR=%{_prefix} BUILD_TYPE=release PATH_INS=$RPM_BUILD_ROOT %{mflags} install
-cp -a kBuild/units $RPM_BUILD_ROOT/%{_datadir}/kBuild
+export KBUILD_VERBOSE=2
+kBuild/env.sh kmk %{mflags} PATH_INS=$RPM_BUILD_ROOT install
+# These are included later in files section
+rm -r $RPM_BUILD_ROOT%{_docdir}
 
 
 %clean
@@ -66,13 +65,17 @@
 
 
 %files
-%defattr(0644,root,root,0755)
-%doc COPYING ChangeLog
-%attr(0755,root,root) %{_bindir}/*
+%defattr(-,root,root,-)
+%{_bindir}/*
 %{_datadir}/*
+%doc COPYING ChangeLog
+%doc kBuild/doc/COPYING-FDL-1.3 kBuild/doc/QuickReference*
 
 
 %changelog
+* Sat Jan 24 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.1.5-1
+- Update to new upstream release
+
 * Tue Dec 30 2008 Lubomir Rintel <lkundrak at v3.sk> - 0.1.5-0.1.20081106svn
 - Update to build VirtualBox OSE 2.1.0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kBuild/EL-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	30 Dec 2008 20:48:15 -0000	1.3
+++ sources	24 Jan 2009 13:32:36 -0000	1.4
@@ -1 +1 @@
-54ec45538cc644a3a2843a0e0618eaf1  kBuild.tar.gz
+df7e0905232e67728643f97d63cbf3f3  kBuild-0.1.5-src.tar.gz



From ixs at fedoraproject.org  Sat Jan 24 14:02:10 2009
From: ixs at fedoraproject.org (Andreas Thienemann)
Date: Sat, 24 Jan 2009 14:02:10 +0000 (UTC)
Subject: rpms/munin/devel munin.spec,1.22,1.23
Message-ID: <20090124140210.114067010A@cvs1.fedora.phx.redhat.com>

Author: ixs

Update of /cvs/pkgs/rpms/munin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5945

Modified Files:
	munin.spec 
Log Message:
Added /usr/bin/which as a dependency. Many plugins need this.


Index: munin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/munin/devel/munin.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- munin.spec	23 Jan 2009 00:17:25 -0000	1.22
+++ munin.spec	24 Jan 2009 14:01:39 -0000	1.23
@@ -47,7 +47,7 @@
 BuildArchitectures: noarch
 Requires: perl-Net-Server
 Requires: procps >= 2.0.7
-Requires: sysstat
+Requires: sysstat, /usr/bin/which
 Requires(pre): shadow-utils
 Requires(post): /sbin/chkconfig
 Requires(preun): /sbin/chkconfig



From caolanm at fedoraproject.org  Sat Jan 24 14:31:38 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Sat, 24 Jan 2009 14:31:38 +0000 (UTC)
Subject: rpms/openoffice.org/devel openoffice.org.spec,1.1769,1.1770
Message-ID: <20090124143138.5A4BC7010A@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9929

Modified Files:
	openoffice.org.spec 
Log Message:
missed a font


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1769
retrieving revision 1.1770
diff -u -r1.1769 -r1.1770
--- openoffice.org.spec	23 Jan 2009 08:59:27 -0000	1.1769
+++ openoffice.org.spec	24 Jan 2009 14:31:07 -0000	1.1770
@@ -1,6 +1,6 @@
 %define oootag OOO300
 %define ooomilestone 15
-%define rh_rpm_release 4
+%define rh_rpm_release 5
 
 # rhbz#465664 jar-repacking breaks help by reordering META-INF/MANIFEST.MF
 %define __jar_repack %{nil}
@@ -1227,7 +1227,7 @@
 Summary: Traditional Chinese language pack for %{name}
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
-Requires: cjkunifonts-uming
+Requires: cjkuni-uming-fonts
 Obsoletes: openoffice.org-i18n < 1.9.0
 Obsoletes: openoffice.org-langpack-zh-TW < 1:2.0.3
 Obsoletes: openoffice.org2-langpack-zh_TW < 1:3.0.0
@@ -3830,6 +3830,9 @@
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
+* Sat Jan 24 2009 Caol??n McNamara <caolanm at redhat.com> - 1:3.0.1-15.5
+- cjkunifonts-uming -> cjkuni-uming-fonts
+
 * Fri Jan 23 2009 Caol??n McNamara <caolanm at redhat.com> - 1:3.0.1-15.4
 - Resolves: rhbz#480057 add openoffice.org-3.0.1.ooo98288.ucb.neonchange.patch
 - cjkunifonts-uming -> cjkuni-uming-fonts



From rdieter at fedoraproject.org  Sat Jan 24 14:35:20 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sat, 24 Jan 2009 14:35:20 +0000 (UTC)
Subject: rpms/kdeartwork/F-10 kdeartwork.spec,1.94,1.95 sources,1.54,1.55
Message-ID: <20090124143520.0B7E87010A@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdeartwork/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10403

Modified Files:
	kdeartwork.spec sources 
Log Message:
* Thu Jan 22 2009 Than Ngo <than at redhat.com> - 4.2.0-1
- 4.2.0



Index: kdeartwork.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeartwork/F-10/kdeartwork.spec,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -r1.94 -r1.95
--- kdeartwork.spec	7 Jan 2009 11:05:29 -0000	1.94
+++ kdeartwork.spec	24 Jan 2009 14:34:49 -0000	1.95
@@ -1,5 +1,5 @@
 Name:           kdeartwork
-Version:        4.1.4
+Version:        4.2.0
 Release:        1%{?dist}
 Summary:        Additional artwork (themes, sound themes, ...) for KDE
 
@@ -21,9 +21,6 @@
 # TODO: Revisit this issue once the renaming is complete. -- Kevin
 #define include_crystalsvg 1
 
-BuildRequires:  cmake
-BuildRequires:  kde-filesystem >= 4
-%{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
 BuildRequires:  kdelibs4-devel >= %{version}
 BuildRequires:  kdebase-workspace-devel >= %{version}
 
@@ -44,7 +41,7 @@
 Provides:  kdeartwork-icons-crystalsvg = %{version}-%{release}
 Requires(post): xdg-utils
 Requires(postun): xdg-utils
-%description -n crystalsvg-icon-theme 
+%description -n crystalsvg-icon-theme
 This package contains the crystalsvg icon theme.
 It was the standard theme in KDE3 and is needed for KDE3 applications.
 %endif
@@ -52,21 +49,12 @@
 %package icons
 Summary: Additional icon themes
 Group: User Interface/Desktops
-Provides: Locolor-icon-theme = %{version}-%{release}
-Provides: nuvola-icon-theme = %{version}-%{release}
-Provides: ikons-icon-theme = %{version}-%{release}
 Provides: kdeclassic-icon-theme = %{version}-%{release}
-Provides: kids-icon-theme = %{version}-%{release}
-Provides: slick-icon-theme = %{version}-%{release} 
 Requires(post): xdg-utils
 Requires(postun): xdg-utils
 %description icons
 This contains icon themes:
-* Locolor
-* ikons
 * kdeclassic
-* kids
-* slick
 
 %package extras
 Summary: Artwork Extras, including xscreensaver-based screensavers
@@ -110,11 +98,11 @@
 rm -rf %{buildroot}
 
 %if 0%{?rest}
-make install DESTDIR=%{buildroot} -C %{_target_platform}
+make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 %endif
 
 %if 0%{?icons}
-make install DESTDIR=%{buildroot} -C %{_target_platform}/IconThemes
+make install/fast DESTDIR=%{buildroot} -C %{_target_platform}/IconThemes
 %if ! 0%{?include_crystalsvg}
 rm -rf %{buildroot}%{_kde4_iconsdir}/crystalsvg/
 %endif
@@ -128,12 +116,7 @@
 
 %if 0%{?icons}
 %post icons
-%{_bindir}/xdg-icon-resource forceupdate --theme Locolor 2> /dev/null || :
-%{_bindir}/xdg-icon-resource forceupdate --theme nuvola 2> /dev/null || :
-%{_bindir}/xdg-icon-resource forceupdate --theme ikons 2> /dev/null || :
 %{_bindir}/xdg-icon-resource forceupdate --theme kdeclassic 2> /dev/null || :
-%{_bindir}/xdg-icon-resource forceupdate --theme kids 2> /dev/null || :
-%{_bindir}/xdg-icon-resource forceupdate --theme slick 2> /dev/null || :
 
 %if 0%{?include_crystalsvg}
 %post -n crystalsvg-icon-theme
@@ -141,12 +124,7 @@
 %endif
 
 %postun icons
-%{_bindir}/xdg-icon-resource forceupdate --theme Locolor 2> /dev/null || :
-%{_bindir}/xdg-icon-resource forceupdate --theme nuvola 2> /dev/null || :
-%{_bindir}/xdg-icon-resource forceupdate --theme ikons 2> /dev/null || :
 %{_bindir}/xdg-icon-resource forceupdate --theme kdeclassic 2> /dev/null || :
-%{_bindir}/xdg-icon-resource forceupdate --theme kids 2> /dev/null || :
-%{_bindir}/xdg-icon-resource forceupdate --theme slick 2> /dev/null || :
 
 %if 0%{?include_crystalsvg}
 %postun -n crystalsvg-icon-theme
@@ -179,15 +157,10 @@
 %if 0%{?icons}
 %files icons
 %defattr(-,root,root,-)
-%{_kde4_iconsdir}/Locolor/
-%{_kde4_iconsdir}/nuvola/
-%{_kde4_iconsdir}/ikons/
 %{_kde4_iconsdir}/kdeclassic/
-%{_kde4_iconsdir}/kids/
-%{_kde4_iconsdir}/slick/
 
 %if 0%{?include_crystalsvg}
-%files -n crystalsvg-icon-theme 
+%files -n crystalsvg-icon-theme
 %defattr(-,root,root,-)
 %{_kde4_iconsdir}/crystalsvg/
 %endif
@@ -195,11 +168,28 @@
 
 
 %changelog
-* Wed Jan 07 2009 Than Ngo <than at redhat.com> - 4.1.4-1
-- 4.1.4
+* Thu Jan 22 2009 Than Ngo <than at redhat.com> - 4.2.0-1
+- 4.2.0
 
-* Thu Nov 27 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.3-3
-- reenable webcollage since xscreensaver now has a sane default setting for it
+* Sat Jan 10 2009 Than Ngo <than at redhat.com> - 4.1.96-2
+- fix file list
+
+* Wed Jan 07 2009 Than Ngo <than at redhat.com> - 4.1.96-1
+- 4.2rc1
+
+* Thu Dec 11 2008 Than Ngo <than at redhat.com> -  4.1.85-1
+- 4.2beta2
+
+* Wed Nov 26 2008 Than Ngo <than at redhat.com> 4.1.80-3
+- enable webcollage since xscreensaver has sane default setting
+
+* Thu Nov 20 2008 Than Ngo <than at redhat.com> 4.1.80-2
+- drop duplicated BRs
+
+* Wed Nov 19 2008 Lorenzo Villani <lvillani at binaryhelix.net> - 4.1.80-1
+- 4.1.80
+- BR cmake 2.6
+- make install/fast
 
 * Tue Nov 18 2008 Than Ngo <than at redhat.com> 4.1.3-2
 - drop webcollage bz#461926
@@ -362,12 +352,12 @@
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 3.5.1-1.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 
-* Fri Feb 03 2006 Than Ngo <than at redhat.com> 3.5.1-1 
+* Fri Feb 03 2006 Than Ngo <than at redhat.com> 3.5.1-1
 - 3.5.1
 
-* Sat Dec 17 2005 Than Ngo <than at redhat.com> 3.5.0-2 
+* Sat Dec 17 2005 Than Ngo <than at redhat.com> 3.5.0-2
 - requires on xscreensaver-extras
-  
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 
@@ -383,7 +373,7 @@
 * Tue Aug 09 2005 Than Ngo <than at redhat.com> 3.4.2-1
 - update to 3.4.2
 
-* Thu Jun 30 2005 Than Ngo <than at redhat.com> 3.4.1-2 
+* Thu Jun 30 2005 Than Ngo <than at redhat.com> 3.4.1-2
 - configure script does not look the right xscreensaver dirs
   apply patch to fix this problem, #161312, thanks to Rex Dieter
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdeartwork/F-10/sources,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- sources	7 Jan 2009 11:05:29 -0000	1.54
+++ sources	24 Jan 2009 14:34:49 -0000	1.55
@@ -1 +1 @@
-6b53365e45fdcd227e7e7c546e25cb36  kdeartwork-4.1.4.tar.bz2
+d81623b60c7deb314bc2e28a52254ac2  kdeartwork-4.2.0.tar.bz2



From ixs at fedoraproject.org  Sat Jan 24 14:36:06 2009
From: ixs at fedoraproject.org (Andreas Thienemann)
Date: Sat, 24 Jan 2009 14:36:06 +0000 (UTC)
Subject: rpms/munin/devel munin.spec,1.23,1.24
Message-ID: <20090124143606.8CE2B7010A@cvs1.fedora.phx.redhat.com>

Author: ixs

Update of /cvs/pkgs/rpms/munin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10602

Modified Files:
	munin.spec 
Log Message:
Added hdparm as a dependency. Needed by hddtemp plugin


Index: munin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/munin/devel/munin.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- munin.spec	24 Jan 2009 14:01:39 -0000	1.23
+++ munin.spec	24 Jan 2009 14:35:36 -0000	1.24
@@ -47,7 +47,7 @@
 BuildArchitectures: noarch
 Requires: perl-Net-Server
 Requires: procps >= 2.0.7
-Requires: sysstat, /usr/bin/which
+Requires: sysstat, /usr/bin/which, hdparm
 Requires(pre): shadow-utils
 Requires(post): /sbin/chkconfig
 Requires(preun): /sbin/chkconfig



From rdieter at fedoraproject.org  Sat Jan 24 14:40:20 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sat, 24 Jan 2009 14:40:20 +0000 (UTC)
Subject: rpms/kdeplasma-addons/F-10 kdeplasma-addons.spec,1.10,1.11
Message-ID: <20090124144020.64E0D7010A@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdeplasma-addons/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12047

Modified Files:
	kdeplasma-addons.spec 
Log Message:
* Thu Jan 22 2009 Than Ngo <than at redhat.com> - 4.2.0-1
- 4.2.0



Index: kdeplasma-addons.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeplasma-addons/F-10/kdeplasma-addons.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- kdeplasma-addons.spec	9 Jan 2009 12:20:24 -0000	1.10
+++ kdeplasma-addons.spec	24 Jan 2009 14:39:50 -0000	1.11
@@ -1,6 +1,5 @@
-
 Name:           kdeplasma-addons
-Version:        4.1.4
+Version:        4.2.0
 Release:        1%{?dist}
 Summary:        Additional plasmoids for KDE
 
@@ -10,24 +9,32 @@
 Source0:        ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdeplasma-addons-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  cmake
 BuildRequires:  boost-devel
 BuildRequires:  gettext
-BuildRequires:  kdelibs4-devel >= %{version}
 BuildRequires:  kdepimlibs-devel >= %{version}
+BuildRequires:  plasma-devel >= %{version}
+# for libplasmaclock
 BuildRequires:  kdebase-workspace-devel >= %{version}
 BuildRequires:  openldap-devel
 BuildRequires:  qimageblitz-devel
+%if 0%{?fedora} >= 10
+# Optional (but recommended), enables automatic rotation for frame applet
+# Not available on Fedora 9
+BuildRequires:  libkexiv2-devel >= 0.4.0
+%endif
 
 # most of former kdeaddons for KDE3 is now here
 Obsoletes: kdeaddons < 4
 # extragear-plasma -> kdeplasmoids rename
-Obsoletes: extragear-plasma < %{version}-%{release}
+Obsoletes: extragear-plasma < 4.1 
 Provides:  extragear-plasma = %{version}-%{release}
-# Oh gawd, another rename 
-Obsoletes: kdeplasmoids < %{version}-%{release}
+# Oh gawd, another rename
+Obsoletes: kdeplasmoids < 4.1 
 Provides: kdeplasmoids = %{version}-%{release}
 
+Obsoletes: kde-plasma-lancelot < 4.0.80 
+Provides: kde-plasma-lancelot = %{version}-%{release}
+
 Requires(post): /sbin/ldconfig xdg-utils
 Requires(postun): /sbin/ldconfig xdg-utils
 
@@ -54,11 +61,12 @@
 %install
 rm -rf %{buildroot}
 
-make install DESTDIR=%{buildroot} -C %{_target_platform}
+make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
 # unpackaged files
 # omit -devel type stuff, for now
 rm -f %{buildroot}%{_kde4_libdir}/libplasma*.so
+rm -f %{buildroot}%{_kde4_libdir}/liblancelot*.so
 rm -rf %{buildroot}%{_kde4_includedir}/
 
 
@@ -79,19 +87,53 @@
 %files
 %defattr(-,root,root,-)
 %doc COPYING COPYING.LIB
+%{_kde4_bindir}/lancelot
+%{_kde4_appsdir}/bball/
 %{_kde4_appsdir}/desktoptheme/*
-%{_kde4_appsdir}/plasma-comic/
+%{_kde4_appsdir}/plasma/services/*
+%{_kde4_appsdir}/plasma-bluemarble/
+%{_kde4_appsdir}/rssnow/
+%{_kde4_datadir}/config/*
 %{_kde4_datadir}/kde4/services/*
 %{_kde4_datadir}/kde4/servicetypes/*
+%{_kde4_datadir}/mime/packages/lancelotpart-mime.xml
+%{_kde4_datadir}/dbus-1/services/org.kde.lancelot.service
 %{_kde4_libdir}/kde4/*
+%{_kde4_libdir}/liblancelot.so.*
+%{_kde4_libdir}/libplasmaconverter.so.*
 %{_kde4_libdir}/libplasmacomicprovidercore.so.*
-%{_kde4_libdir}/libplasmaappletdialog.so.*
+# %{_kde4_libdir}/libplasmaappletdialog.so.*
 %{_kde4_iconsdir}/hicolor/*/*/*
+%{_kde4_iconsdir}/oxygen/*/*/*
 
 
 %changelog
-* Fri Jan  9 2009 Luk???? Tinkl <ltinkl at redhat.com> 4.1.4-1
-- KDE 4.1.4
+* Thu Jan 22 2009 Than Ngo <than at redhat.com> - 4.2.0-1
+- 4.2.0
+
+* Wed Jan 07 2009 Than Ngo <than at redhat.com> - 4.1.96-1
+- 4.2rc1
+
+* Tue Dec 16 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.85-2
+- saner versioned Obsoletes
+
+* Fri Dec 12 2008 Than Ngo <than at redhat.com> 4.1.85-1
+- 4.2beta2
+
+* Tue Dec 02 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.80-3
+- BR plasma-devel
+- add Provides: kde-plasma-lancelot
+- fix file list
+- BR libkexiv2-devel >= 0.4.0 on F10+
+
+* Thu Nov 20 2008 Than Ngo <than at redhat.com> 4.1.80-2
+- merged
+- add Obsoletes: kde-plasma-lancelot
+
+* Thu Nov 20 2008 Lorenzo Villani <lvillani at binaryhelix.net> - 4.1.80-1
+- 4.1.80
+- BR cmake >= 2.6.2
+- make install/fast
 
 * Wed Nov 12 2008 Than Ngo <than at redhat.com> 4.1.3-1
 - 4.1.3



From caolanm at fedoraproject.org  Sat Jan 24 14:44:06 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Sat, 24 Jan 2009 14:44:06 +0000 (UTC)
Subject: rpms/mythes-ru/devel import.log, NONE, 1.1 mythes-ru.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090124144406.657377010A@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/mythes-ru/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12744/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log mythes-ru.spec 
Log Message:



--- NEW FILE import.log ---
mythes-ru-0_20070613-1_fc10:HEAD:mythes-ru-0.20070613-1.fc10.src.rpm:1232808159


--- NEW FILE mythes-ru.spec ---
Name: mythes-ru
Summary: Russian thesaurus
%define upstreamid 20070613
Version: 0.%{upstreamid}
Release: 1%{?dist}
Source: http://download.i-rs.ru/pub/openoffice/dict/thes_ru_RU_v2.zip
Group: Applications/Text
URL: http://wiki.services.openoffice.org/wiki/Dictionaries
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: unzip
License: LGPLv2+
BuildArch: noarch

%description
Russian thesaurus.

%prep
%setup -q -c

%build

%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT/%{_datadir}/mythes
cp -p th_ru_RU_v2.* $RPM_BUILD_ROOT/%{_datadir}/mythes
pushd $RPM_BUILD_ROOT/%{_datadir}/mythes/
ru_RU_aliases="ru_UA"
for lang in $ru_RU_aliases; do
        ln -s th_ru_RU_v2.idx "th_"$lang"_v2.idx"
        ln -s th_ru_RU_v2.dat "th_"$lang"_v2.dat"
done

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc README_thes_ru_RU.txt licence.txt
%dir %{_datadir}/mythes
%{_datadir}/mythes/*

%changelog
* Wed Jan 21 2009 Caolan McNamara <caolanm at redhat.com> - 0.20070613-1
- initial version


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mythes-ru/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	23 Jan 2009 23:28:49 -0000	1.1
+++ .cvsignore	24 Jan 2009 14:43:35 -0000	1.2
@@ -0,0 +1 @@
+thes_ru_RU_v2.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mythes-ru/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	23 Jan 2009 23:28:49 -0000	1.1
+++ sources	24 Jan 2009 14:43:36 -0000	1.2
@@ -0,0 +1 @@
+802cc8a3e5447a65debdbad13247f5c4  thes_ru_RU_v2.zip



From caolanm at fedoraproject.org  Sat Jan 24 14:45:22 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Sat, 24 Jan 2009 14:45:22 +0000 (UTC)
Subject: rpms/mythes-sl/devel import.log, NONE, 1.1 mythes-sl.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090124144522.C14AE7010A@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/mythes-sl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13131/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log mythes-sl.spec 
Log Message:



--- NEW FILE import.log ---
mythes-sl-0_20090121-1_fc10:HEAD:mythes-sl-0.20090121-1.fc10.src.rpm:1232808261


--- NEW FILE mythes-sl.spec ---
Name: mythes-sl
Summary: Slovenian thesaurus
%define upstreamid 20090121
Version: 0.%{upstreamid}
Release: 1%{?dist}
Source: http://193.2.66.133:85/download/thes_sl_SI_v2.zip
Group: Applications/Text
URL: http://www.tezaver.si/
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: python, perl
License: LGPLv2+
BuildArch: noarch

%description
Slovenian thesaurus.

%prep
%setup -q -c

%build
tr -d '\r' < README_th_sl_SI_v2.txt > README_th_sl_SI_v2.txt.new
mv -f README_th_sl_SI_v2.txt.new README_th_sl_SI_v2.txt
chmod -x *

%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT/%{_datadir}/mythes
cp -p th_sl_SI_v2.* $RPM_BUILD_ROOT/%{_datadir}/mythes

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc README_th_sl_SI_v2.txt
%dir %{_datadir}/mythes
%{_datadir}/mythes/*

%changelog
* Wed Jan 21 2009 Caolan McNamara <caolanm at redhat.com> - 0.20090121-1
- initial version


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mythes-sl/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	23 Jan 2009 23:28:20 -0000	1.1
+++ .cvsignore	24 Jan 2009 14:44:52 -0000	1.2
@@ -0,0 +1 @@
+thes_sl_SI_v2.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mythes-sl/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	23 Jan 2009 23:28:20 -0000	1.1
+++ sources	24 Jan 2009 14:44:52 -0000	1.2
@@ -0,0 +1 @@
+28250ff21dd883b7620fdd78d552f90a  thes_sl_SI_v2.zip



From rdieter at fedoraproject.org  Sat Jan 24 14:45:59 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sat, 24 Jan 2009 14:45:59 +0000 (UTC)
Subject: rpms/kdemultimedia/F-10 kdemultimedia.spec,1.126,1.127
Message-ID: <20090124144559.0D7D37010A@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdemultimedia/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13309

Modified Files:
	kdemultimedia.spec 
Log Message:
botched tag?  respin.



Index: kdemultimedia.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdemultimedia/F-10/kdemultimedia.spec,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -r1.126 -r1.127
--- kdemultimedia.spec	9 Jan 2009 01:03:28 -0000	1.126
+++ kdemultimedia.spec	24 Jan 2009 14:45:28 -0000	1.127
@@ -1,7 +1,7 @@
 Name: kdemultimedia
 Epoch: 6
-Version: 4.1.4
-Release: 1%{?dist}
+Version: 4.2.0
+Release: 1%{?dist}.1
 Summary: K Desktop Environment - Multimedia applications
 
 Group:     Applications/Multimedia
@@ -16,19 +16,16 @@
 
 BuildRequires: alsa-lib-devel
 BuildRequires: cdparanoia-devel cdparanoia
-BuildRequires: cmake
 BuildRequires: flac-devel
 BuildRequires: giflib-devel
-BuildRequires: kde-filesystem >= 4
-BuildRequires: kdelibs4-devel >= %{version}
 BuildRequires: kdebase-workspace-devel >= %{version}
-BuildRequires: libmusicbrainz-devel
 BuildRequires: libtheora-devel
-BuildRequires: libtunepimp-devel
+## needed to build Kscd, keep for now -- Kevin
+BuildRequires: libtunepimp-devel libmusicbrainz-devel
 BuildRequires: libvorbis-devel
 BuildRequires: pcre-devel
 BuildRequires: taglib-devel
-BuildRequires: xine-lib-devel
+BuildRequires: xine-lib-devel libxcb-devel
 
 Requires(post): xdg-utils
 Requires(postun): xdg-utils
@@ -53,10 +50,7 @@
 License: LGPLv2+ and GPLv2+
 Summary: Runtime libraries for %{name}
 Group:   System Environment/Libraries
-Obsoletes: %{name}-extras-libs < %{?epoch:%{epoch}:}%{version}-%{release} 
-
-# force replacing old standalone dragonplayer with the main package
-# otherwise, dragonplayer conflicts with this over dragonpart.so
+Obsoletes: %{name}-extras-libs < %{?epoch:%{epoch}:}%{version}-%{release}
 Conflicts: dragonplayer < 2.0.2-0.1
 
 %description libs
@@ -64,10 +58,10 @@
 
 %package devel
 Group:    Development/Libraries
-Summary:  Developer files for %{name} 
+Summary:  Developer files for %{name}
 License:  LGPLv2+ and GPLv2+
 Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: kdelibs4-devel kdebase-workspace-devel
+Requires: kdelibs4-devel
 %description devel
 %{summary}.
 
@@ -78,7 +72,7 @@
 
 %build
 
-mkdir -p %{_target_platform} 
+mkdir -p %{_target_platform}
 pushd %{_target_platform}
 %{cmake_kde4} ..
 popd
@@ -89,7 +83,7 @@
 %install
 rm -rf %{buildroot}
 
-make install DESTDIR=%{buildroot} -C %{_target_platform}
+make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
 
 %clean
@@ -119,6 +113,8 @@
 %{_kde4_appsdir}/kconf_update/*
 %{_kde4_appsdir}/konqsidebartng/
 %{_kde4_appsdir}/profiles/*
+%{_kde4_appsdir}/kscd/skin/
+%{_kde4_appsdir}/solid/actions/dragonplayer-opendvd.desktop
 %{_kde4_configdir}/dragonplayerrc
 %{_kde4_datadir}/applications/kde4/*
 %{_kde4_datadir}/autostart/*
@@ -129,8 +125,10 @@
 %{_kde4_docdir}/HTML/en/juk/
 %{_kde4_docdir}/HTML/en/kmix/
 %{_kde4_docdir}/HTML/en/kscd/
+%{_kde4_docdir}/HTML/en/kioslave/
 %{_kde4_iconsdir}/hicolor/*/*/*
 %{_kde4_iconsdir}/oxygen/*/actions/player-volume-muted.*
+%{_kde4_iconsdir}/oxygen/*/actions/kscd-dock.*
 %{_kde4_libdir}/libkdeinit*.so
 
 %files libs
@@ -148,13 +146,35 @@
 
 
 %changelog
-* Fri Jan  9 2009 Luk???? Tinkl <ltinkl at redhat.com> 4.1.4-1
-- KDE 4.1.4
+* Thu Jan 22 2009 Than Ngo <than at redhat.com> - 4.2.0-1
+- 4.2.0
+
+* Wed Jan 07 2009 Than Ngo <than at redhat.com> - 4.1.96-1
+- 4.2rc1
+
+* Sat Dec 13 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.85-2
+- restore BR libtunepimp-devel libmusicbrainz-devel for now, needed by Kscd
+
+* Fri Dec 12 2008 Than Ngo <than at redhat.com> 4.1.85-1
+- 4.2beta2
 
-* Thu Nov 20 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.3-2
+* Fri Nov 28 2008 Lorenzo Villani <lvillani at binaryhelix.net> - 6:4.1.80-3
+- dragon documentation disappeared (at least with my mock build), update file
+  lists
+- add kioslave documentation to file lists
+
+* Thu Nov 20 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.80-3
 - -devel: drop Req: kdebase-workspace-devel
 
-* Wed Nov 12 2008 Than Ngo <than at redhat.com>  4.1.3-1
+* Thu Nov 20 2008 Than Ngo <than at redhat.com> 4.1.80-2
+- merged
+
+* Thu Nov 20 2008 Lorenzo Villani <lvillani at binaryhelix.net> - 6:4.1.80-1
+- 4.1.80
+- BR cmake >= 2.6.2
+- make install/fast
+
+* Wed Nov 12 2008 Than Ngo <than at redhat.com> 4.1.3-1
 - 4.1.3
 
 * Mon Sep 29 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-2
@@ -165,7 +185,7 @@
 - 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 
+- 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 caolanm at fedoraproject.org  Sat Jan 24 14:46:26 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Sat, 24 Jan 2009 14:46:26 +0000 (UTC)
Subject: rpms/mythes-ro/devel import.log, NONE, 1.1 mythes-ro.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090124144626.58B737010A@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/mythes-ro/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13496/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log mythes-ro.spec 
Log Message:



--- NEW FILE import.log ---
mythes-ro-3_3-0_1_test3_fc10:HEAD:mythes-ro-3.3-0.1.test3.fc10.src.rpm:1232808318


--- NEW FILE mythes-ro.spec ---
Name: mythes-ro
Summary: Romanian thesaurus
Version: 3.3
Release: 0.1.test3%{?dist}
Source: http://downloads.sourceforge.net/rospell/th_ro_RO.3.3-test3.zip
Group: Applications/Text
URL: http://rospell.sourceforge.net/
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
License: GPLv2+
BuildArch: noarch

%description
Romanian thesaurus.

%prep
%setup -q -c

%build

%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT/%{_datadir}/mythes
cp -p th_ro_RO.dat $RPM_BUILD_ROOT/%{_datadir}/mythes/th_ro_RO_v2.dat
cp -p th_ro_RO.idx $RPM_BUILD_ROOT/%{_datadir}/mythes/th_ro_RO_v2.idx

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc README COPYING.GPL 
%dir %{_datadir}/mythes
%{_datadir}/mythes/*

%changelog
* Thu Jan 20 2009 Caolan McNamara <caolanm at redhat.com> - 3.3-0.1.test3
- initial version


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mythes-ro/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	23 Jan 2009 23:27:47 -0000	1.1
+++ .cvsignore	24 Jan 2009 14:45:56 -0000	1.2
@@ -0,0 +1 @@
+th_ro_RO.3.3-test3.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mythes-ro/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	23 Jan 2009 23:27:47 -0000	1.1
+++ sources	24 Jan 2009 14:45:56 -0000	1.2
@@ -0,0 +1 @@
+2ba6c21bae99d7e30ee87e52b6f327ba  th_ro_RO.3.3-test3.zip



From rdieter at fedoraproject.org  Sat Jan 24 14:47:23 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sat, 24 Jan 2009 14:47:23 +0000 (UTC)
Subject: rpms/kdemultimedia/F-10 .cvsignore,1.56,1.57 sources,1.59,1.60
Message-ID: <20090124144723.99C0D7010A@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdemultimedia/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13686

Modified Files:
	.cvsignore sources 
Log Message:
update sources too (cvs wonky for me?)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdemultimedia/F-10/.cvsignore,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- .cvsignore	9 Jan 2009 01:03:28 -0000	1.56
+++ .cvsignore	24 Jan 2009 14:46:53 -0000	1.57
@@ -1 +1,5 @@
-kdemultimedia-4.1.4.tar.bz2
+kdemultimedia-4.1.2.tar.bz2
+kdemultimedia-4.1.80.tar.bz2
+kdemultimedia-4.1.85.tar.bz2
+kdemultimedia-4.1.96.tar.bz2
+kdemultimedia-4.2.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdemultimedia/F-10/sources,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- sources	9 Jan 2009 01:03:28 -0000	1.59
+++ sources	24 Jan 2009 14:46:53 -0000	1.60
@@ -1 +1 @@
-4a4e046f0b862e7be9e916e0e29ed188  kdemultimedia-4.1.4.tar.bz2
+3e944c87888ac1ac5b11d3722dd31f88  kdemultimedia-4.2.0.tar.bz2



From rdieter at fedoraproject.org  Sat Jan 24 14:49:31 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sat, 24 Jan 2009 14:49:31 +0000 (UTC)
Subject: rpms/kdetoys/F-10 .cvsignore, 1.28, 1.29 kdetoys.spec, 1.37,
	1.38 sources, 1.27, 1.28
Message-ID: <20090124144932.07AC27010A@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdetoys/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14186

Modified Files:
	.cvsignore kdetoys.spec sources 
Log Message:
sync to 4.2 (again? wierd)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdetoys/F-10/.cvsignore,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- .cvsignore	9 Jan 2009 17:18:23 -0000	1.28
+++ .cvsignore	24 Jan 2009 14:49:01 -0000	1.29
@@ -1 +1,5 @@
-kdetoys-4.1.4.tar.bz2
+kdetoys-4.1.2.tar.bz2
+kdetoys-4.1.80.tar.bz2
+kdetoys-4.1.85.tar.bz2
+kdetoys-4.1.96.tar.bz2
+kdetoys-4.2.0.tar.bz2


Index: kdetoys.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdetoys/F-10/kdetoys.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- kdetoys.spec	9 Jan 2009 17:18:23 -0000	1.37
+++ kdetoys.spec	24 Jan 2009 14:49:01 -0000	1.38
@@ -1,8 +1,7 @@
-
 Name:           kdetoys
 Summary:        K Desktop Environment - Toys and Amusements
 Epoch:          7
-Version:        4.1.4
+Version:        4.2.0
 Release:        1%{?dist}
 
 License:        GPLv2
@@ -11,22 +10,8 @@
 Source0:        ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires: cmake
-BuildRequires: kde-filesystem >= 4
-%{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
-BuildRequires: kdelibs4-devel >= %{version}
+# need kdebase-workspace-devel for KTux
 BuildRequires: kdebase-workspace-devel >= %{version}
-BuildRequires: qimageblitz-devel
-BuildRequires: libXcomposite-devel
-BuildRequires: libXdamage-devel
-BuildRequires: libxkbfile-devel
-BuildRequires: libXpm-devel
-BuildRequires: libXv-devel
-BuildRequires: libXxf86misc-devel
-BuildRequires: giflib-devel
-BuildRequires: pcre-devel
-BuildRequires: libXtst-devel
-BuildRequires: libXScrnSaver-devel
 
 Requires: kdelibs4 >= %{version}
 #Requires: kdebase-workspace
@@ -34,14 +19,15 @@
 Requires(postun): /sbin/ldconfig xdg-utils
 
 
-# FIXME: Some of the stuff listed below is not actually being built.
+# FIXME: Don't list / drop kweather? It isn't really working as far as I can
+#        tell, and it is being replaced by the weather and weather_station
+#        plasmoids.
 %description
 %{name} includes:
 * amor: Amusing Misuse Of Resources put's comic figures above your windows
 * kteatime: makes sure your tea does not get too strong
 * ktux: Tux-in-a-Spaceship screen saver
 * kweather: display the current weather outside
-* kworldclock: shows daylight area on the world globe
 
 
 %prep
@@ -60,8 +46,7 @@
 
 %install
 rm -rf %{buildroot}
-
-make install DESTDIR=%{buildroot} -C %{_target_platform}
+make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
 %clean
 rm -rf %{buildroot}
@@ -79,25 +64,43 @@
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING README
 %{_kde4_bindir}/*
-%{_kde4_appsdir}/amor/
-%{_kde4_appsdir}/kteatime/
-%{_kde4_appsdir}/ktux/
-%{_kde4_appsdir}/kweather/
-%{_kde4_appsdir}/kweatherservice/
+%{_kde4_appsdir}/*/
 %{_kde4_datadir}/kde4/services/*
-%{_kde4_docdir}/HTML/en/amor/
-%{_kde4_docdir}/HTML/en/kteatime/
-%{_kde4_docdir}/HTML/en/kweather/
+%{_kde4_docdir}/HTML/*/*/
 %{_kde4_datadir}/applications/kde4/*.desktop
 %{_datadir}/dbus-1/interfaces/*
 %{_kde4_iconsdir}/hicolor/*/*/*
 %{_kde4_libdir}/kde4/*
 %{_kde4_libdir}/libkdeinit4_*.*
+%{_mandir}/man6/amor.6*
 
 
 %changelog
-* Fri Jan 09 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.4-1
-- 4.1.4
+* Thu Jan 22 2009 Than Ngo <than at redhat.com> - 4.2.0-1
+- 4.2.0
+
+* Wed Jan 07 2009 Than Ngo <than at redhat.com> - 4.1.96-1
+- 4.2rc1
+
+* Fri Dec 12 2008 Than Ngo <than at redhat.com> 4.1.85-1
+- 4.2beta2
+
+* Thu Dec 04 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.80-4
+- clean up BRs
+- fix file list
+
+* Tue Nov 25 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.80-3
+- remove kworldclock from description (dropped in 4.2, replaced by a plasmoid
+  using marble, which is part of kdeedu)
+- remove bogus BR qimageblitz-devel (was already unneeded in 4.1)
+
+* Thu Nov 20 2008 Than Ngo <than at redhat.com> 4.1.80-2
+- merged
+
+* Thu Nov 20 2008 Lorenzo Villani <lvillani at binaryhelix.net> - 7:4.1.72-1
+- 4.1.80
+- BR cmake >= 2.6.2
+- make install/fast
 
 * Wed Nov 12 2008 Than Ngo <than at redhat.com> 4.1.3-1
 - 4.1.3
@@ -167,7 +170,7 @@
 
 * Wed Nov 28 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 7:3.96.1-2
 - touchup a bit for cvs import
-- drop libs subpkg (no shlibs present) 
+- drop libs subpkg (no shlibs present)
 
 * Sat Nov 24 2007 Sebastian Vahl <fedora at deadbabylon.de> 7:3.96.1-1
 - kde-3.96.1


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdetoys/F-10/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- sources	9 Jan 2009 17:18:23 -0000	1.27
+++ sources	24 Jan 2009 14:49:01 -0000	1.28
@@ -1 +1 @@
-b32cfc4788e749e6240476783f0eb1a9  kdetoys-4.1.4.tar.bz2
+3adf538297e5dca51f15186b4acd02ce  kdetoys-4.2.0.tar.bz2



From caolanm at fedoraproject.org  Sat Jan 24 14:49:48 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Sat, 24 Jan 2009 14:49:48 +0000 (UTC)
Subject: rpms/openoffice.org/devel openoffice.org.spec,1.1770,1.1771
Message-ID: <20090124144948.D310E7010A@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14316

Modified Files:
	openoffice.org.spec 
Log Message:
add mythes-ru and mythes-sl depends


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1770
retrieving revision 1.1771
diff -u -r1.1770 -r1.1771
--- openoffice.org.spec	24 Jan 2009 14:31:07 -0000	1.1770
+++ openoffice.org.spec	24 Jan 2009 14:49:18 -0000	1.1771
@@ -1051,7 +1051,7 @@
 Summary: Russian language pack for %{name}
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
-Requires: hunspell-ru, hyphen-ru
+Requires: hunspell-ru, hyphen-ru, mythes-ru
 Obsoletes: openoffice.org-i18n < 1.9.0
 Obsoletes: openoffice.org2-langpack-ru < 1:3.0.0
 
@@ -1074,7 +1074,7 @@
 Summary: Slovenian language pack for %{name}
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
-Requires: hunspell-sl, hyphen-sl
+Requires: hunspell-sl, hyphen-sl, mythes-sl
 Obsoletes: openoffice.org-i18n < 1.9.0
 Obsoletes: openoffice.org-langpack-sl < 1:2.0.3
 Obsoletes: openoffice.org2-langpack-sl_SI < 1:3.0.0



From rdieter at fedoraproject.org  Sat Jan 24 14:51:25 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sat, 24 Jan 2009 14:51:25 +0000 (UTC)
Subject: rpms/kdeplasma-addons/F-10 .cvsignore,1.7,1.8 sources,1.8,1.9
Message-ID: <20090124145125.1251E7010A@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdeplasma-addons/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14725

Modified Files:
	.cvsignore sources 
Log Message:
sync (again)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdeplasma-addons/F-10/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	9 Jan 2009 12:20:24 -0000	1.7
+++ .cvsignore	24 Jan 2009 14:50:54 -0000	1.8
@@ -1 +1,5 @@
-kdeplasma-addons-4.1.4.tar.bz2
+kdeplasma-addons-4.1.2.tar.bz2
+kdeplasma-addons-4.1.80.tar.bz2
+kdeplasma-addons-4.1.85.tar.bz2
+kdeplasma-addons-4.1.96.tar.bz2
+kdeplasma-addons-4.2.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdeplasma-addons/F-10/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	9 Jan 2009 12:20:24 -0000	1.8
+++ sources	24 Jan 2009 14:50:54 -0000	1.9
@@ -1 +1 @@
-4a0df1a79854539a4022df2308629dc9  kdeplasma-addons-4.1.4.tar.bz2
+d98f805f4c9b7af7278067f9e544b2ec  kdeplasma-addons-4.2.0.tar.bz2



From sgrubb at fedoraproject.org  Sat Jan 24 15:03:34 2009
From: sgrubb at fedoraproject.org (Steve Grubb)
Date: Sat, 24 Jan 2009 15:03:34 +0000 (UTC)
Subject: rpms/audit/devel audit.spec,1.202,1.203
Message-ID: <20090124150334.BED897010A@cvs1.fedora.phx.redhat.com>

Author: sgrubb

Update of /cvs/pkgs/rpms/audit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15908

Modified Files:
	audit.spec 
Log Message:
Fix syslog conf packaging



Index: audit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/audit/devel/audit.spec,v
retrieving revision 1.202
retrieving revision 1.203
diff -u -r1.202 -r1.203
--- audit.spec	13 Jan 2009 22:12:58 -0000	1.202
+++ audit.spec	24 Jan 2009 15:03:04 -0000	1.203
@@ -225,10 +225,10 @@
 %config(noreplace) %attr(640,root,root) /etc/sysconfig/auditd
 %config(noreplace) %attr(640,root,root) /etc/audisp/audispd.conf
 %config(noreplace) %attr(640,root,root) /etc/audisp/plugins.d/af_unix.conf
+%config(noreplace) %attr(640,root,root) /etc/audisp/plugins.d/syslog.conf
 
 %files -n audispd-plugins
 %defattr(-,root,root,-)
-%attr(640,root,root) /etc/audisp/plugins.d/syslog.conf
 %attr(644,root,root) %{_mandir}/man8/audispd-zos-remote.8.gz
 %attr(644,root,root) %{_mandir}/man5/zos-remote.conf.5.gz
 %config(noreplace) %attr(640,root,root) /etc/audisp/plugins.d/audispd-zos-remote.conf



From sgrubb at fedoraproject.org  Sat Jan 24 15:05:05 2009
From: sgrubb at fedoraproject.org (Steve Grubb)
Date: Sat, 24 Jan 2009 15:05:05 +0000 (UTC)
Subject: rpms/audit/F-10 audit.spec,1.200,1.201
Message-ID: <20090124150505.700BD7010A@cvs1.fedora.phx.redhat.com>

Author: sgrubb

Update of /cvs/pkgs/rpms/audit/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16084

Modified Files:
	audit.spec 
Log Message:
Fix syslog conf packaging



Index: audit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/audit/F-10/audit.spec,v
retrieving revision 1.200
retrieving revision 1.201
diff -u -r1.200 -r1.201
--- audit.spec	13 Jan 2009 22:45:32 -0000	1.200
+++ audit.spec	24 Jan 2009 15:04:35 -0000	1.201
@@ -225,10 +225,10 @@
 %config(noreplace) %attr(640,root,root) /etc/sysconfig/auditd
 %config(noreplace) %attr(640,root,root) /etc/audisp/audispd.conf
 %config(noreplace) %attr(640,root,root) /etc/audisp/plugins.d/af_unix.conf
+%config(noreplace) %attr(640,root,root) /etc/audisp/plugins.d/syslog.conf
 
 %files -n audispd-plugins
 %defattr(-,root,root,-)
-%attr(640,root,root) /etc/audisp/plugins.d/syslog.conf
 %attr(644,root,root) %{_mandir}/man8/audispd-zos-remote.8.gz
 %attr(644,root,root) %{_mandir}/man5/zos-remote.conf.5.gz
 %config(noreplace) %attr(640,root,root) /etc/audisp/plugins.d/audispd-zos-remote.conf



From transif at fedoraproject.org  Sat Jan 24 15:13:32 2009
From: transif at fedoraproject.org (Transifex System User)
Date: Sat, 24 Jan 2009 15:13:32 +0000 (UTC)
Subject: comps/po ca.po,1.16,1.17
Message-ID: <20090124151332.5611F7010A@cvs1.fedora.phx.redhat.com>

Author: transif

Update of /cvs/pkgs/comps/po
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17604/po

Modified Files:
	ca.po 
Log Message:
    2009-01-24  Xavier Conde <xavi.conde at gmail.com> (via
xconde at fedoraproject.org)
    
      * po/ca.po: Updated catalan translation
    



Index: ca.po
===================================================================
RCS file: /cvs/pkgs/comps/po/ca.po,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- ca.po	9 Jan 2009 11:52:35 -0000	1.16
+++ ca.po	24 Jan 2009 15:13:01 -0000	1.17
@@ -3,6 +3,7 @@
 # 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, 2008.
+# Oscar Osta Pueyo <oostap at gmail.com>, 2009
 #
 # 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
@@ -23,9 +24,9 @@
 msgstr ""
 "Project-Id-Version: comps-po\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-22 15:50-0500\n"
-"PO-Revision-Date: 2008-10-16 11:11+0100\n"
-"Last-Translator: Xavier Conde Rueda <xavi.conde at gmail.com>\n"
+"POT-Creation-Date: 2009-01-19 13:33+0000\n"
+"PO-Revision-Date: 2009-01-24 23:25+0100\n"
+"Last-Translator: Oscar Osta Pueyo <oostap at gmail.com>\n"
 "Language-Team: Catalan <fedora at softcatala.net>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -530,13 +531,13 @@
 #: ../comps-f7.xml.in.h:89 ../comps-f8.xml.in.h:93 ../comps-f9.xml.in.h:96
 #: ../comps-f10.xml.in.h:102 ../comps-f11.xml.in.h:107
 msgid "Lao Support"
-msgstr "Suport per al Lao"
+msgstr "Suport per al lao"
 
 # TODO
 #: ../comps-f7.xml.in.h:90 ../comps-f8.xml.in.h:94 ../comps-f9.xml.in.h:97
 #: ../comps-f10.xml.in.h:103 ../comps-f11.xml.in.h:108
 msgid "Latvian Support"
-msgstr "Latvian Support"
+msgstr "Suport per al let??"
 
 #: ../comps-f7.xml.in.h:91 ../comps-f8.xml.in.h:96 ../comps-f9.xml.in.h:99
 #: ../comps-f10.xml.in.h:105 ../comps-f11.xml.in.h:110
@@ -572,7 +573,7 @@
 #: ../comps-f7.xml.in.h:97 ../comps-f8.xml.in.h:103 ../comps-f9.xml.in.h:107
 #: ../comps-f10.xml.in.h:114 ../comps-f11.xml.in.h:120
 msgid "Malayalam Support"
-msgstr "Suport per al malayalam"
+msgstr "Suport per al malaialam"
 
 #: ../comps-f7.xml.in.h:98 ../comps-f8.xml.in.h:104 ../comps-f9.xml.in.h:108
 #: ../comps-f10.xml.in.h:115 ../comps-f11.xml.in.h:121
@@ -869,7 +870,8 @@
 #: ../comps-f10.xml.in.h:175 ../comps-f11.xml.in.h:182
 msgid ""
 "These packages include network-based servers such as DHCP, Kerberos and NIS."
-msgstr "S'inclouen servidors de xarxa com ara el DHCP, Kerberos i NIS."
+msgstr "" 
+"Aquests paquets inclouen servidors de xarxa com ara el DHCP, Kerberos i NIS."
 
 #: ../comps-f7.xml.in.h:150 ../comps-f8.xml.in.h:158 ../comps-f9.xml.in.h:165
 #: ../comps-f10.xml.in.h:176 ../comps-f11.xml.in.h:183
@@ -1209,7 +1211,7 @@
 #: ../comps-f8.xml.in.h:100 ../comps-f9.xml.in.h:103 ../comps-f10.xml.in.h:109
 #: ../comps-f11.xml.in.h:114
 msgid "Low Saxon Support"
-msgstr "Supor per al sax?? baix"
+msgstr "Suport per al sax?? baix"
 
 #: ../comps-f8.xml.in.h:106 ../comps-f9.xml.in.h:110 ../comps-f10.xml.in.h:117
 #: ../comps-f11.xml.in.h:123
@@ -1233,12 +1235,11 @@
 # TODO
 #: ../comps-f9.xml.in.h:91 ../comps-f10.xml.in.h:95 ../comps-f11.xml.in.h:99
 msgid "Kashubian Support"
-msgstr "Kashubian Support"
+msgstr "Suport per al caixubi"
 
 #: ../comps-f9.xml.in.h:94 ../comps-f10.xml.in.h:99 ../comps-f11.xml.in.h:104
-#, fuzzy
 msgid "Kurdish Support"
-msgstr "Suport per al turc"
+msgstr "Suport per al kurd"
 
 #: ../comps-f9.xml.in.h:104 ../comps-f10.xml.in.h:110
 #: ../comps-f11.xml.in.h:115
@@ -1248,7 +1249,7 @@
 #: ../comps-f9.xml.in.h:115 ../comps-f10.xml.in.h:123
 #: ../comps-f11.xml.in.h:129
 msgid "Northern Sami Support"
-msgstr "Supor per al sami del nord"
+msgstr "Suport per al sami del nord"
 
 #: ../comps-f9.xml.in.h:131 ../comps-f10.xml.in.h:139
 #: ../comps-f11.xml.in.h:146
@@ -1264,7 +1265,7 @@
 #: ../comps-f9.xml.in.h:201 ../comps-f10.xml.in.h:213
 #: ../comps-f11.xml.in.h:223
 msgid "Walloon Support"
-msgstr "Walloon Support"
+msgstr "Suport per al val??"
 
 #: ../comps-f10.xml.in.h:70 ../comps-f11.xml.in.h:74
 msgid "Haskell Development"
@@ -1281,7 +1282,7 @@
 # TODO
 #: ../comps-f10.xml.in.h:94 ../comps-f11.xml.in.h:98
 msgid "Kashmiri Support"
-msgstr "Kashmiri Support"
+msgstr "Suport per al caixmiri"
 
 #: ../comps-f10.xml.in.h:97 ../comps-f11.xml.in.h:102
 msgid "Konkani Support"
@@ -1289,7 +1290,7 @@
 
 #: ../comps-f10.xml.in.h:100 ../comps-f11.xml.in.h:105
 msgid "LXDE"
-msgstr ""
+msgstr "LXDE"
 
 # TODO
 #: ../comps-f10.xml.in.h:112 ../comps-f11.xml.in.h:117
@@ -1299,7 +1300,7 @@
 # TODO
 #: ../comps-f10.xml.in.h:119 ../comps-f11.xml.in.h:125
 msgid "Myanmar (Burmese) Support"
-msgstr "Suport per al myanmar (burmese)"
+msgstr "Suport per al myanmar (birm??)"
 
 # TODO
 #: ../comps-f10.xml.in.h:146 ../comps-f11.xml.in.h:153
@@ -1318,59 +1319,51 @@
 # TODO
 #: ../comps-f10.xml.in.h:207 ../comps-f11.xml.in.h:217
 msgid "Uzbek Support"
-msgstr "Uzbek Support"
+msgstr "Suport per a l'uzbek"
 
 #: ../comps-f11.xml.in.h:5
-#, fuzzy
 msgid "Amazigh Support"
-msgstr "Suport per a l'??rab"
+msgstr "Suport per al berber"
 
 #: ../comps-f11.xml.in.h:54
 msgid "Font design and packaging"
-msgstr ""
+msgstr "Disseny i empaquetat de tipus de lletra"
 
 #: ../comps-f11.xml.in.h:58
-#, fuzzy
 msgid "Frisian Support"
-msgstr "Suport per al persa"
+msgstr "Suport per al fris??"
 
 #: ../comps-f11.xml.in.h:59
-#, fuzzy
 msgid "Friulian Support"
-msgstr "Suport per al brasiler"
+msgstr "Suport per al furl??"
 
 #: ../comps-f11.xml.in.h:101
-#, fuzzy
 msgid "Kinyarwanda Support"
-msgstr "Suport per al kannada"
+msgstr "Suport per al kinyarwanda"
 
 #: ../comps-f11.xml.in.h:118
-#, fuzzy
 msgid "Malagasy Support"
-msgstr "Suport per al malai"
+msgstr "Suport per al malgaix"
 
 #: ../comps-f11.xml.in.h:132
-#, fuzzy
 msgid "Occitan Support"
-msgstr "Suport per al tibet??"
+msgstr "Suport per a l'occit??"
 
 #: ../comps-f11.xml.in.h:201
-#, fuzzy
 msgid ""
 "This group is a collection of tools used in the design, modification, "
 "manipulation, and packaging of fonts."
 msgstr ""
-"Aquest grup ??s una col??lecci?? d'eines i recursos per a entorns armenis."
+"Aquest grup ??s una col??lecci?? d'eines usades en el disseny, modificaci??, "
+"manipulaci?? i empaquetat de tipus de lletra."
 
 #: ../comps-f11.xml.in.h:213
-#, fuzzy
 msgid "Turkmen Support"
-msgstr "Suport per al turc"
+msgstr "Suport per al turcman"
 
 #: ../comps-f11.xml.in.h:215
-#, fuzzy
 msgid "Upper Sorbian Support"
-msgstr "Suport per al serbi"
+msgstr "Suport per a l'alt s??rab"
 
 #: ../comps-el4.xml.in.h:3 ../comps-el5.xml.in.h:3
 msgid "Applications for a variety of tasks"



From rathann at fedoraproject.org  Sat Jan 24 15:34:20 2009
From: rathann at fedoraproject.org (Dominik Mierzejewski)
Date: Sat, 24 Jan 2009 15:34:20 +0000 (UTC)
Subject: rpms/mnemosyne/devel mnemosyne-desktop.patch, NONE,
	1.1 mnemosyne.spec, 
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090124153420.DB2047010A@cvs1.fedora.phx.redhat.com>

Author: rathann

Update of /cvs/pkgs/rpms/mnemosyne/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19502

Modified Files:
	.cvsignore sources 
Added Files:
	mnemosyne-desktop.patch mnemosyne.spec 
Log Message:
- initial rawhide import

mnemosyne-desktop.patch:

--- NEW FILE mnemosyne-desktop.patch ---
diff -up mnemosyne-1.1.1/mnemosyne.desktop.d mnemosyne-1.1.1/mnemosyne.desktop
--- mnemosyne-1.1.1/mnemosyne.desktop.d	2008-09-15 20:20:01.000000000 +0200
+++ mnemosyne-1.1.1/mnemosyne.desktop	2008-11-11 18:08:16.000000000 +0100
@@ -1,8 +1,8 @@
 [Desktop Entry]
 Name=Mnemosyne
-Comment=A flash card program to make your review process more efficient
+Comment=Make your review process more efficient
 Exec=mnemosyne %f
 Icon=mnemosyne
-Categories=Education
+Categories=Education;Languages;
 Terminal=false
 Type=Application


--- NEW FILE mnemosyne.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

Name:		mnemosyne
Summary:	Flash-card learning tool
Version:	1.1.1
Release:	3.r1%{?dist}
URL:		http://www.mnemosyne-proj.org/
Source0:	http://downloads.sourceforge.net/sourceforge/mnemosyne-proj/%{name}-%{version}-r1.tgz
Patch0:		%{name}-desktop.patch
License:	GPLv2+
Group:		Amusements/Games
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(id -u -n)
BuildRequires:	desktop-file-utils
BuildRequires:	python-setuptools-devel
BuildArch:	noarch
Requires:	hicolor-icon-theme
Requires:	pygame
Requires:	PyQt

%description
Mnemosyne resembles a traditional flash-card program but with an
important twist: it uses a sophisticated algorithm to schedule the best
time for a card to come up for review.

Optional dependencies:
* latex: enables entering formulas using latex syntax.

%prep
%setup -q
%patch0 -p1 -b .d

%build
CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build

%install
rm -rf %{buildroot}

%{__python} setup.py install -O1 --skip-build --root %{buildroot}

install -d %{buildroot}%{_datadir}/applications
desktop-file-install --vendor="" \
	--dir=%{buildroot}%{_datadir}/applications \
	%{name}.desktop

install -d %{buildroot}/%{_datadir}/icons/hicolor/128x128/apps
pushd %{buildroot}/%{_datadir}/icons
mv %{name}.png hicolor/128x128/apps/%{name}.png
popd

%clean
rm -rf %{buildroot}

%post
touch --no-create %{_datadir}/icons/hicolor
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
fi

%postun
touch --no-create %{_datadir}/icons/hicolor
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
fi

%files
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog LICENSE README
%{_bindir}/%{name}
%{python_sitelib}/%{name}
%{python_sitelib}/Mnemosyne-%{version}-*.egg-info
%{_datadir}/applications/%{name}.desktop
%{_datadir}/icons/hicolor/*/apps/%{name}.png

%changelog
* Tue Nov 11 2008 Dominik Mierzejewski <rpm at greysector.net> 1.1.1-3.r1
- fixed .desktop file comment to conform to GNOME HIG
- removed a redundant python setup.py install call
- moved the .desktop file category addition to the patch
- added missing hicolor-icon-theme-requires

* Fri Oct 03 2008 Dominik Mierzejewski <rpm at greysector.net> 1.1.1-2.r1
- updated to 1.1.1-r1
- dropped separate icon (fixed upstream)

* Thu Sep 11 2008 Dominik Mierzejewski <rpm at greysector.net> 1.1.1-1
- initial package
- include fixed icon from 1.1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mnemosyne/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	12 Nov 2008 18:17:46 -0000	1.1
+++ .cvsignore	24 Jan 2009 15:33:49 -0000	1.2
@@ -0,0 +1 @@
+mnemosyne-1.1.1-r1.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mnemosyne/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	12 Nov 2008 18:17:46 -0000	1.1
+++ sources	24 Jan 2009 15:33:50 -0000	1.2
@@ -0,0 +1 @@
+2c08f6b0465f3280fcd2b17960b797bc  mnemosyne-1.1.1-r1.tgz



From ixs at fedoraproject.org  Sat Jan 24 15:35:02 2009
From: ixs at fedoraproject.org (Andreas Thienemann)
Date: Sat, 24 Jan 2009 15:35:02 +0000 (UTC)
Subject: rpms/munin/devel munin-1.2.6-hddtemp_smartctl-spinup.patch, NONE,
	1.1 munin.spec, 1.24, 1.25
Message-ID: <20090124153502.05EDF7010A@cvs1.fedora.phx.redhat.com>

Author: ixs

Update of /cvs/pkgs/rpms/munin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19601

Modified Files:
	munin.spec 
Added Files:
	munin-1.2.6-hddtemp_smartctl-spinup.patch 
Log Message:
* Sat Jan 24 2009 Andreas Thienemann <andreas at bawue.net> - 1.2.6-8
- Updated dependencies to better reflect plugin requirements
- Added hddtemp_smartctl patch to only scan for standby state on /dev/[sh]d? devices.


munin-1.2.6-hddtemp_smartctl-spinup.patch:

--- NEW FILE munin-1.2.6-hddtemp_smartctl-spinup.patch ---
--- munin-1.2.6/node/node.d/hddtemp_smartctl.in	2009-01-24 15:47:35.000000000 +0100
+++ munin-1.2.6/node/node.d/hddtemp_smartctl.in	2009-01-24 15:48:18.000000000 +0100
@@ -146,8 +146,8 @@
   $fulldev .= 'rdsk/' if $^O eq 'solaris';
   $fulldev .= exists $ENV{'dev_'.$_} ? $ENV{'dev_'.$_} : $dev;
 
-  # Avoid spinning up sleeping disks
-  next if `hdparm -C $fulldev 2>/dev/null` =~ /standby/;
+  # Avoid spinning up sleeping disks only for /dev/sd? or /dev/hd? devices.
+  next if $fulldev =~ /\/dev\/[sh]d?/ && `hdparm -C $fulldev 2>/dev/null` =~ /standby/;
 
   my $cmd = $smartctl.' -A ';
   $cmd .= $ENV{'args_'.$_}.' ' if exists $ENV{'args_'.$_};


Index: munin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/munin/devel/munin.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- munin.spec	24 Jan 2009 14:35:36 -0000	1.24
+++ munin.spec	24 Jan 2009 15:34:31 -0000	1.25
@@ -1,6 +1,6 @@
 Name:      munin
 Version:   1.2.6
-Release:   7%{?dist}
+Release:   8%{?dist}
 Summary:   Network-wide graphing framework (grapher/gatherer)
 License:   GPLv2 and Bitstream Vera
 Group:     System Environment/Daemons
@@ -19,6 +19,7 @@
 Patch2: munin-1.2.5-nf-conntrack.patch
 Patch3: munin-1.2.5-amp-degree.patch
 Patch4: munin-1.2.6-ntp_offset.patch
+Patch5: munin-1.2.6-hddtemp_smartctl-spinup.patch
 BuildArchitectures: noarch
 Requires: perl-Net-Server perl-Net-SNMP
 Requires: rrdtool
@@ -81,6 +82,7 @@
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 
 %build
 
@@ -247,6 +249,10 @@
 %doc %{_mandir}/man5/munin-node*
 
 %changelog
+* Sat Jan 24 2009 Andreas Thienemann <andreas at bawue.net> - 1.2.6-8
+- Updated dependencies to better reflect plugin requirements
+- Added hddtemp_smartctl patch to only scan for standby state on /dev/[sh]d? devices.
+
 * Sat Jan 17 2009 Kevin Fenzi <kevin at tummy.com> - 1.2.6-7
 - Adjust font requires for new dejavu-sans-mono-fonts name (fixes #480463)
 



From caolanm at fedoraproject.org  Sat Jan 24 15:34:56 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Sat, 24 Jan 2009 15:34:56 +0000 (UTC)
Subject: rpms/zoneminder/devel zoneminder.spec,1.13,1.14
Message-ID: <20090124153456.D64A47010A@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/zoneminder/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19573

Modified Files:
	zoneminder.spec 
Log Message:
rebuild for dependencies


Index: zoneminder.spec
===================================================================
RCS file: /cvs/pkgs/rpms/zoneminder/devel/zoneminder.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- zoneminder.spec	15 Dec 2008 21:22:20 -0000	1.13
+++ zoneminder.spec	24 Jan 2009 15:34:26 -0000	1.14
@@ -5,7 +5,7 @@
 
 Name: 		zoneminder
 Version: 	1.23.3
-Release: 	2%{?dist}
+Release: 	3%{?dist}
 Summary:        A camera monitoring and analysis tool
 Group:          System Environment/Daemons
 # jscalendar is LGPL (any version):  http://www.dynarch.com/projects/calendar/
@@ -191,6 +191,9 @@
 
 
 %changelog
+* Sat Jan 24 2009 Caol??n McNamara <caolanm at redhat.com> - 1.23.3-3
+- rebuild for dependencies
+
 * Mon Dec 15 2008 Martin Ebourne <martin at zepler.org> - 1.23.3-2
 - Fix permissions on zm.conf
 



From caolanm at fedoraproject.org  Sat Jan 24 15:46:08 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Sat, 24 Jan 2009 15:46:08 +0000 (UTC)
Subject: rpms/ser/devel ser.spec,1.14,1.15
Message-ID: <20090124154608.34B6A7010A@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/ser/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21319

Modified Files:
	ser.spec 
Log Message:
rebuild for dependencies


Index: ser.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ser/devel/ser.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- ser.spec	7 Jul 2008 19:23:57 -0000	1.14
+++ ser.spec	24 Jan 2009 15:45:36 -0000	1.15
@@ -8,7 +8,7 @@
 Summary: SIP Express Router
 Name: ser
 Version: 0.9.6
-Release: 15%{?dist}
+Release: 16%{?dist}
 License: GPLv2+
 Group: System Environment/Daemons
 Source0: http://ftp.iptel.org/pub/ser/latest/src/ser-%{version}_src.tar.gz
@@ -216,6 +216,9 @@
 %endif
 
 %changelog
+* Sat Jan 24 2009 Caol??n McNamara <caolanm at redhat.com> - 0.9.6-16
+- rebuild for dependencies
+
 * Mon Jul  7 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.9.6-15
 - fix conditional comparison
 - fix license tag



From sgrubb at fedoraproject.org  Sat Jan 24 15:48:08 2009
From: sgrubb at fedoraproject.org (Steve Grubb)
Date: Sat, 24 Jan 2009 15:48:08 +0000 (UTC)
Subject: rpms/libprelude/devel libprelude.spec,1.38,1.39
Message-ID: <20090124154808.C11D27010A@cvs1.fedora.phx.redhat.com>

Author: sgrubb

Update of /cvs/pkgs/rpms/libprelude/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21588

Modified Files:
	libprelude.spec 
Log Message:
* Sat Jan 24 2009 Steve Grubb <sgrubb at redhat.com> - 0.9.21.2-6
- Rebuild for MySQL 5.1.30



Index: libprelude.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libprelude/devel/libprelude.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- libprelude.spec	5 Dec 2008 17:57:04 -0000	1.38
+++ libprelude.spec	24 Jan 2009 15:47:38 -0000	1.39
@@ -5,7 +5,7 @@
 
 Name:		libprelude
 Version:	0.9.21.2
-Release:	5%{?dist}
+Release:	6%{?dist}
 Summary:	The prelude library        
 Group:		System Environment/Libraries 
 License:	GPLv2+
@@ -158,6 +158,9 @@
 %{ruby_sitearch}/PreludeEasy.so
 
 %changelog
+* Sat Jan 24 2009 Steve Grubb <sgrubb at redhat.com> - 0.9.21.2-6
+- Rebuild for MySQL 5.1.30
+
 * Fri Dec 05 2008 Steve Grubb <sgrubb at redhat.com> - 0.9.21.2-5
 - Rebuild _again_ for Python 2.6
 



From caolanm at fedoraproject.org  Sat Jan 24 15:57:09 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Sat, 24 Jan 2009 15:57:09 +0000 (UTC)
Subject: rpms/rsyslog/devel rsyslog.spec,1.53,1.54
Message-ID: <20090124155709.0EAEF7010A@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/rsyslog/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22517

Modified Files:
	rsyslog.spec 
Log Message:
rebuild for dependencies


Index: rsyslog.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rsyslog/devel/rsyslog.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- rsyslog.spec	7 Jan 2009 12:08:38 -0000	1.53
+++ rsyslog.spec	24 Jan 2009 15:56:38 -0000	1.54
@@ -3,7 +3,7 @@
 Summary: Enhanced system logging and kernel message trapping daemons
 Name: rsyslog
 Version: 3.21.9
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv3+
 Group: System Environment/Daemons
 URL: http://www.rsyslog.com/
@@ -196,6 +196,9 @@
 %{_libdir}/rsyslog/lmnsd_gtls.so
 
 %changelog
+* Sat Jan 24 2009 Caol??n McNamara <caolanm at redhat.com> 3.21.9-3
+- rebuild for dependencies
+
 * Tue Jan 07 2009 Tomas Heinrich <theinric at redhat.com> 3.21.9-2
 - fix several legacy options handling
 - fix internal message output (#478612)



From rathann at fedoraproject.org  Sat Jan 24 16:04:19 2009
From: rathann at fedoraproject.org (Dominik Mierzejewski)
Date: Sat, 24 Jan 2009 16:04:19 +0000 (UTC)
Subject: rpms/mnemosyne/F-10 mnemosyne-desktop.patch, NONE,
	1.1 mnemosyne.spec, 
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090124160419.7E58B7010A@cvs1.fedora.phx.redhat.com>

Author: rathann

Update of /cvs/pkgs/rpms/mnemosyne/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23566

Modified Files:
	.cvsignore sources 
Added Files:
	mnemosyne-desktop.patch mnemosyne.spec 
Log Message:
- initial F-10 import

mnemosyne-desktop.patch:

--- NEW FILE mnemosyne-desktop.patch ---
diff -up mnemosyne-1.1.1/mnemosyne.desktop.d mnemosyne-1.1.1/mnemosyne.desktop
--- mnemosyne-1.1.1/mnemosyne.desktop.d	2008-09-15 20:20:01.000000000 +0200
+++ mnemosyne-1.1.1/mnemosyne.desktop	2008-11-11 18:08:16.000000000 +0100
@@ -1,8 +1,8 @@
 [Desktop Entry]
 Name=Mnemosyne
-Comment=A flash card program to make your review process more efficient
+Comment=Make your review process more efficient
 Exec=mnemosyne %f
 Icon=mnemosyne
-Categories=Education
+Categories=Education;Languages;
 Terminal=false
 Type=Application


--- NEW FILE mnemosyne.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

Name:		mnemosyne
Summary:	Flash-card learning tool
Version:	1.1.1
Release:	3.r1%{?dist}
URL:		http://www.mnemosyne-proj.org/
Source0:	http://downloads.sourceforge.net/sourceforge/mnemosyne-proj/%{name}-%{version}-r1.tgz
Patch0:		%{name}-desktop.patch
License:	GPLv2+
Group:		Amusements/Games
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(id -u -n)
BuildRequires:	desktop-file-utils
BuildRequires:	python-setuptools-devel
BuildArch:	noarch
Requires:	hicolor-icon-theme
Requires:	pygame
Requires:	PyQt

%description
Mnemosyne resembles a traditional flash-card program but with an
important twist: it uses a sophisticated algorithm to schedule the best
time for a card to come up for review.

Optional dependencies:
* latex: enables entering formulas using latex syntax.

%prep
%setup -q
%patch0 -p1 -b .d

%build
CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build

%install
rm -rf %{buildroot}

%{__python} setup.py install -O1 --skip-build --root %{buildroot}

install -d %{buildroot}%{_datadir}/applications
desktop-file-install --vendor="" \
	--dir=%{buildroot}%{_datadir}/applications \
	%{name}.desktop

install -d %{buildroot}/%{_datadir}/icons/hicolor/128x128/apps
pushd %{buildroot}/%{_datadir}/icons
mv %{name}.png hicolor/128x128/apps/%{name}.png
popd

%clean
rm -rf %{buildroot}

%post
touch --no-create %{_datadir}/icons/hicolor
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
fi

%postun
touch --no-create %{_datadir}/icons/hicolor
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
fi

%files
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog LICENSE README
%{_bindir}/%{name}
%{python_sitelib}/%{name}
%{python_sitelib}/Mnemosyne-%{version}-*.egg-info
%{_datadir}/applications/%{name}.desktop
%{_datadir}/icons/hicolor/*/apps/%{name}.png

%changelog
* Tue Nov 11 2008 Dominik Mierzejewski <rpm at greysector.net> 1.1.1-3.r1
- fixed .desktop file comment to conform to GNOME HIG
- removed a redundant python setup.py install call
- moved the .desktop file category addition to the patch
- added missing hicolor-icon-theme-requires

* Fri Oct 03 2008 Dominik Mierzejewski <rpm at greysector.net> 1.1.1-2.r1
- updated to 1.1.1-r1
- dropped separate icon (fixed upstream)

* Thu Sep 11 2008 Dominik Mierzejewski <rpm at greysector.net> 1.1.1-1
- initial package
- include fixed icon from 1.1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mnemosyne/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	12 Nov 2008 18:17:46 -0000	1.1
+++ .cvsignore	24 Jan 2009 16:03:48 -0000	1.2
@@ -0,0 +1 @@
+mnemosyne-1.1.1-r1.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mnemosyne/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	12 Nov 2008 18:17:46 -0000	1.1
+++ sources	24 Jan 2009 16:03:49 -0000	1.2
@@ -0,0 +1 @@
+2c08f6b0465f3280fcd2b17960b797bc  mnemosyne-1.1.1-r1.tgz



From caolanm at fedoraproject.org  Sat Jan 24 16:08:46 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Sat, 24 Jan 2009 16:08:46 +0000 (UTC)
Subject: rpms/publican/devel publican.spec,1.20,1.21
Message-ID: <20090124160846.1D0787010A@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/publican/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24104

Modified Files:
	publican.spec 
Log Message:
cjkunifonts-uming -> cjkuni-uming-fonts


Index: publican.spec
===================================================================
RCS file: /cvs/pkgs/rpms/publican/devel/publican.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- publican.spec	22 Jan 2009 09:19:37 -0000	1.20
+++ publican.spec	24 Jan 2009 16:08:15 -0000	1.21
@@ -6,7 +6,7 @@
 Name:		publican	
 Summary:	Common files and scripts for publishing with DocBook XML
 Version:	0.40
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GPLv2+ and GFDL
 # The following directories are licensed under the GFDL:
 #	content, Book_Template, Set_Template, Article_Template
@@ -44,12 +44,12 @@
 BuildRequires:	fonts-malayalam fonts-oriya fonts-punjabi fonts-sinhala
 BuildRequires:	fonts-tamil fonts-telugu liberation-fonts
 %else
-Requires:	lohit-fonts-bengali cjkunifonts-uming lohit-fonts-gujarati
+Requires:	lohit-fonts-bengali cjkuni-uming-fonts lohit-fonts-gujarati
 Requires:	lohit-fonts-hindi sazanami-fonts-gothic sazanami-fonts-mincho lohit-fonts-kannada
 Requires:	lohit-fonts-malayalam lohit-fonts-oriya lohit-fonts-punjabi lklug-fonts
 Requires:	lohit-fonts-tamil lohit-fonts-telugu liberation-fonts baekmuk-ttf-batang-fonts
 
-BuildRequires:	lohit-fonts-bengali cjkunifonts-uming lohit-fonts-gujarati
+BuildRequires:	lohit-fonts-bengali cjkuni-uming-fonts lohit-fonts-gujarati
 BuildRequires:	lohit-fonts-hindi sazanami-fonts-gothic sazanami-fonts-mincho lohit-fonts-kannada
 BuildRequires:	lohit-fonts-malayalam lohit-fonts-oriya lohit-fonts-punjabi lklug-fonts
 BuildRequires:	lohit-fonts-tamil lohit-fonts-telugu liberation-fonts baekmuk-ttf-batang-fonts
@@ -146,6 +146,9 @@
 %doc fdl.txt
 
 %changelog
+* Sat Jan 24 2009 Caol??n McNamara <caolanm at redhat.com> - 0.40-2
+- cjkunifonts-uming -> cjkuni-uming-fonts
+
 * Thu Jan 22 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 0.40-1
 - Font changes baekmuk-ttf-fonts-batang -> baekmuk-ttf-batang-fonts to
   fix broken deps in rawhide



From rathann at fedoraproject.org  Sat Jan 24 16:12:36 2009
From: rathann at fedoraproject.org (Dominik Mierzejewski)
Date: Sat, 24 Jan 2009 16:12:36 +0000 (UTC)
Subject: rpms/mnemosyne/F-9 mnemosyne-desktop.patch, NONE, 1.1 mnemosyne.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090124161237.0071F70141@cvs1.fedora.phx.redhat.com>

Author: rathann

Update of /cvs/pkgs/rpms/mnemosyne/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24718

Modified Files:
	.cvsignore sources 
Added Files:
	mnemosyne-desktop.patch mnemosyne.spec 
Log Message:
- initial F-9 import

mnemosyne-desktop.patch:

--- NEW FILE mnemosyne-desktop.patch ---
diff -up mnemosyne-1.1.1/mnemosyne.desktop.d mnemosyne-1.1.1/mnemosyne.desktop
--- mnemosyne-1.1.1/mnemosyne.desktop.d	2008-09-15 20:20:01.000000000 +0200
+++ mnemosyne-1.1.1/mnemosyne.desktop	2008-11-11 18:08:16.000000000 +0100
@@ -1,8 +1,8 @@
 [Desktop Entry]
 Name=Mnemosyne
-Comment=A flash card program to make your review process more efficient
+Comment=Make your review process more efficient
 Exec=mnemosyne %f
 Icon=mnemosyne
-Categories=Education
+Categories=Education;Languages;
 Terminal=false
 Type=Application


--- NEW FILE mnemosyne.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

Name:		mnemosyne
Summary:	Flash-card learning tool
Version:	1.1.1
Release:	3.r1%{?dist}
URL:		http://www.mnemosyne-proj.org/
Source0:	http://downloads.sourceforge.net/sourceforge/mnemosyne-proj/%{name}-%{version}-r1.tgz
Patch0:		%{name}-desktop.patch
License:	GPLv2+
Group:		Amusements/Games
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(id -u -n)
BuildRequires:	desktop-file-utils
BuildRequires:	python-setuptools-devel
BuildArch:	noarch
Requires:	hicolor-icon-theme
Requires:	pygame
Requires:	PyQt

%description
Mnemosyne resembles a traditional flash-card program but with an
important twist: it uses a sophisticated algorithm to schedule the best
time for a card to come up for review.

Optional dependencies:
* latex: enables entering formulas using latex syntax.

%prep
%setup -q
%patch0 -p1 -b .d

%build
CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build

%install
rm -rf %{buildroot}

%{__python} setup.py install -O1 --skip-build --root %{buildroot}

install -d %{buildroot}%{_datadir}/applications
desktop-file-install --vendor="" \
	--dir=%{buildroot}%{_datadir}/applications \
	%{name}.desktop

install -d %{buildroot}/%{_datadir}/icons/hicolor/128x128/apps
pushd %{buildroot}/%{_datadir}/icons
mv %{name}.png hicolor/128x128/apps/%{name}.png
popd

%clean
rm -rf %{buildroot}

%post
touch --no-create %{_datadir}/icons/hicolor
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
fi

%postun
touch --no-create %{_datadir}/icons/hicolor
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
fi

%files
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog LICENSE README
%{_bindir}/%{name}
%{python_sitelib}/%{name}
%{python_sitelib}/Mnemosyne-%{version}-*.egg-info
%{_datadir}/applications/%{name}.desktop
%{_datadir}/icons/hicolor/*/apps/%{name}.png

%changelog
* Tue Nov 11 2008 Dominik Mierzejewski <rpm at greysector.net> 1.1.1-3.r1
- fixed .desktop file comment to conform to GNOME HIG
- removed a redundant python setup.py install call
- moved the .desktop file category addition to the patch
- added missing hicolor-icon-theme-requires

* Fri Oct 03 2008 Dominik Mierzejewski <rpm at greysector.net> 1.1.1-2.r1
- updated to 1.1.1-r1
- dropped separate icon (fixed upstream)

* Thu Sep 11 2008 Dominik Mierzejewski <rpm at greysector.net> 1.1.1-1
- initial package
- include fixed icon from 1.1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mnemosyne/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	12 Nov 2008 18:17:46 -0000	1.1
+++ .cvsignore	24 Jan 2009 16:12:06 -0000	1.2
@@ -0,0 +1 @@
+mnemosyne-1.1.1-r1.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mnemosyne/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	12 Nov 2008 18:17:46 -0000	1.1
+++ sources	24 Jan 2009 16:12:06 -0000	1.2
@@ -0,0 +1 @@
+2c08f6b0465f3280fcd2b17960b797bc  mnemosyne-1.1.1-r1.tgz



From jgu at fedoraproject.org  Sat Jan 24 16:29:02 2009
From: jgu at fedoraproject.org (Jonathan G. Underwood)
Date: Sat, 24 Jan 2009 16:29:02 +0000 (UTC)
Subject: rpms/shorewall/devel .cvsignore, 1.46, 1.47 shorewall.spec, 1.69,
	1.70 sources, 1.46, 1.47
Message-ID: <20090124162902.7CF067010A@cvs1.fedora.phx.redhat.com>

Author: jgu

Update of /cvs/extras/rpms/shorewall/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26961

Modified Files:
	.cvsignore shorewall.spec sources 
Log Message:
* Sat Jan 24 2009 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 4.2.5-1
- Update to version 4.2.5



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/shorewall/devel/.cvsignore,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- .cvsignore	15 Jan 2009 00:26:09 -0000	1.46
+++ .cvsignore	24 Jan 2009 16:28:32 -0000	1.47
@@ -1,6 +1,6 @@
-shorewall6-4.2.4.1.tar.bz2
-shorewall6-lite-4.2.4.1.tar.bz2
-shorewall-common-4.2.4.tar.bz2
-shorewall-lite-4.2.4.tar.bz2
-shorewall-perl-4.2.4.6.tar.bz2
-shorewall-shell-4.2.4.tar.bz2
+shorewall6-4.2.5.tar.bz2
+shorewall6-lite-4.2.5.tar.bz2
+shorewall-common-4.2.5.tar.bz2
+shorewall-lite-4.2.5.tar.bz2
+shorewall-perl-4.2.5.tar.bz2
+shorewall-shell-4.2.5.tar.bz2


Index: shorewall.spec
===================================================================
RCS file: /cvs/extras/rpms/shorewall/devel/shorewall.spec,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- shorewall.spec	15 Jan 2009 00:36:52 -0000	1.69
+++ shorewall.spec	24 Jan 2009 16:28:32 -0000	1.70
@@ -1,17 +1,17 @@
 # A very helpful document for packaging Shorewall is "Anatomy of Shorewall 4.0"
 # which is found at http://www.shorewall.net/Anatomy.html
 
-%define major_ver 4.2.4
+%define major_ver 4.2.5
 %define common_ver %{major_ver}
-%define perl_ver %{major_ver}.6
+%define perl_ver %{major_ver}
 %define lite_ver %{major_ver}
 %define shell_ver %{major_ver}
-%define shorewall6_ver %{major_ver}.1
-%define lite6_ver %{major_ver}.1
+%define shorewall6_ver %{major_ver}
+%define lite6_ver %{major_ver}
 
 Name:           shorewall
 Version:	%{major_ver}
-Release:	4%{?dist}
+Release:	1%{?dist}
 Summary:	An iptables front end for firewall configuration
 Group:		Applications/System
 License:	GPLv2+
@@ -402,6 +402,9 @@
 %attr(0755,root,root) %{_datadir}/shorewall6-lite/wait4ifup
 
 %changelog
+* Sat Jan 24 2009 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 4.2.5-1
+- Update to version 4.2.5
+
 * Thu Jan 15 2009 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 4.2.4-4
 - Really update shorewall-perl to 4.2.4.6
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/shorewall/devel/sources,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- sources	15 Jan 2009 00:26:09 -0000	1.46
+++ sources	24 Jan 2009 16:28:32 -0000	1.47
@@ -1,6 +1,6 @@
-fbf1467c40a599d176732804f5f85f54  shorewall6-4.2.4.1.tar.bz2
-9f40f99dc4db2aea61ecd3a1040321e1  shorewall6-lite-4.2.4.1.tar.bz2
-888130a12280f7bf9022009153ac63cd  shorewall-common-4.2.4.tar.bz2
-15405aa9d2bc804dd7c3d555b1798848  shorewall-lite-4.2.4.tar.bz2
-cebd27bed5cebc44edc23571fee231e9  shorewall-perl-4.2.4.6.tar.bz2
-95a645963e541aef5a39c707f67874b5  shorewall-shell-4.2.4.tar.bz2
+6946999f4311f0856362aa81de4ce0ce  shorewall6-4.2.5.tar.bz2
+55a1537f93c551a0ba8deaa8fb58dc05  shorewall6-lite-4.2.5.tar.bz2
+51ef3a22e554cd942469a0d38d07f3b9  shorewall-common-4.2.5.tar.bz2
+4f2fc64bb4b05337ca322d1099c3b3c4  shorewall-lite-4.2.5.tar.bz2
+43127cadd7418061aa3f54072a51587c  shorewall-perl-4.2.5.tar.bz2
+9a73eeb321809f221499e622d36ebd83  shorewall-shell-4.2.5.tar.bz2



From caolanm at fedoraproject.org  Sat Jan 24 16:29:56 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Sat, 24 Jan 2009 16:29:56 +0000 (UTC)
Subject: rpms/proftpd/devel proftpd.spec,1.42,1.43
Message-ID: <20090124162956.39E597010A@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/proftpd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27161

Modified Files:
	proftpd.spec 
Log Message:
rebuild for dependencies


Index: proftpd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/proftpd/devel/proftpd.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- proftpd.spec	2 Jan 2009 13:31:48 -0000	1.42
+++ proftpd.spec	24 Jan 2009 16:29:25 -0000	1.43
@@ -3,7 +3,7 @@
 Summary: Flexible, stable and highly-configurable FTP server
 Name: proftpd
 Version: 1.3.2
-Release: 0.2%{?prever:.%{prever}}%{?dist}
+Release: 0.3%{?prever:.%{prever}}%{?dist}
 License: GPLv2+
 Group: System Environment/Daemons
 URL: http://www.proftpd.org/
@@ -197,6 +197,9 @@
 
 
 %changelog
+* Sat Jan 24 2009 Caol??n McNamara 1.3.2-0.3.rc3
+- rebuild for dependencies
+
 * Fri Jan  2 2009 Matthias Saou <http://freshrpms.net/> 1.3.2-0.2.rc3
 - Update default configuration to have a lit of available modules and more
   example configuration for them.



From jgu at fedoraproject.org  Sat Jan 24 16:30:54 2009
From: jgu at fedoraproject.org (Jonathan G. Underwood)
Date: Sat, 24 Jan 2009 16:30:54 +0000 (UTC)
Subject: rpms/shorewall/F-10 shorewall.spec,1.69,1.70 sources,1.46,1.47
Message-ID: <20090124163054.3C5EA7010A@cvs1.fedora.phx.redhat.com>

Author: jgu

Update of /cvs/extras/rpms/shorewall/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27346

Modified Files:
	shorewall.spec sources 
Log Message:
* Sat Jan 24 2009 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 4.2.5-1
- Update to version 4.2.5



Index: shorewall.spec
===================================================================
RCS file: /cvs/extras/rpms/shorewall/F-10/shorewall.spec,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- shorewall.spec	15 Jan 2009 00:38:17 -0000	1.69
+++ shorewall.spec	24 Jan 2009 16:30:23 -0000	1.70
@@ -1,17 +1,17 @@
 # A very helpful document for packaging Shorewall is "Anatomy of Shorewall 4.0"
 # which is found at http://www.shorewall.net/Anatomy.html
 
-%define major_ver 4.2.4
+%define major_ver 4.2.5
 %define common_ver %{major_ver}
-%define perl_ver %{major_ver}.6
+%define perl_ver %{major_ver}
 %define lite_ver %{major_ver}
 %define shell_ver %{major_ver}
-%define shorewall6_ver %{major_ver}.1
-%define lite6_ver %{major_ver}.1
+%define shorewall6_ver %{major_ver}
+%define lite6_ver %{major_ver}
 
 Name:           shorewall
 Version:	%{major_ver}
-Release:	4%{?dist}
+Release:	1%{?dist}
 Summary:	An iptables front end for firewall configuration
 Group:		Applications/System
 License:	GPLv2+
@@ -402,6 +402,9 @@
 %attr(0755,root,root) %{_datadir}/shorewall6-lite/wait4ifup
 
 %changelog
+* Sat Jan 24 2009 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 4.2.5-1
+- Update to version 4.2.5
+
 * Thu Jan 15 2009 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 4.2.4-4
 - Really update shorewall-perl to 4.2.4.6
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/shorewall/F-10/sources,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- sources	15 Jan 2009 00:27:55 -0000	1.46
+++ sources	24 Jan 2009 16:30:24 -0000	1.47
@@ -1,6 +1,6 @@
-fbf1467c40a599d176732804f5f85f54  shorewall6-4.2.4.1.tar.bz2
-9f40f99dc4db2aea61ecd3a1040321e1  shorewall6-lite-4.2.4.1.tar.bz2
-888130a12280f7bf9022009153ac63cd  shorewall-common-4.2.4.tar.bz2
-15405aa9d2bc804dd7c3d555b1798848  shorewall-lite-4.2.4.tar.bz2
-cebd27bed5cebc44edc23571fee231e9  shorewall-perl-4.2.4.6.tar.bz2
-95a645963e541aef5a39c707f67874b5  shorewall-shell-4.2.4.tar.bz2
+6946999f4311f0856362aa81de4ce0ce  shorewall6-4.2.5.tar.bz2
+55a1537f93c551a0ba8deaa8fb58dc05  shorewall6-lite-4.2.5.tar.bz2
+51ef3a22e554cd942469a0d38d07f3b9  shorewall-common-4.2.5.tar.bz2
+4f2fc64bb4b05337ca322d1099c3b3c4  shorewall-lite-4.2.5.tar.bz2
+43127cadd7418061aa3f54072a51587c  shorewall-perl-4.2.5.tar.bz2
+9a73eeb321809f221499e622d36ebd83  shorewall-shell-4.2.5.tar.bz2



From caolanm at fedoraproject.org  Sat Jan 24 16:39:26 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Sat, 24 Jan 2009 16:39:26 +0000 (UTC)
Subject: rpms/nufw/devel nufw.spec,1.2,1.3
Message-ID: <20090124163926.DBF7D7010A@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/nufw/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28398

Modified Files:
	nufw.spec 
Log Message:
rebuild for dependencies


Index: nufw.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nufw/devel/nufw.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- nufw.spec	17 Jan 2009 15:46:04 -0000	1.2
+++ nufw.spec	24 Jan 2009 16:38:56 -0000	1.3
@@ -2,7 +2,7 @@
 
 Name: nufw
 Version: 2.2.20
-Release: 6%{dist}
+Release: 7%{dist}
 Summary: Authentication Firewall Suite for Linux
 License: GPLv2
 Group: System Environment/Daemons
@@ -357,6 +357,9 @@
 %{python_sitelib}/nuclient/*
 
 %changelog
+* Sat Jan 24 2009 Caol??n McNamara <caolanm at redhat.com> 2.2.20-7
+- rebuild for dependencies
+
 * Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> 2.2.20-6
 - rebuild with new openssl
 



From rathann at fedoraproject.org  Sat Jan 24 16:40:20 2009
From: rathann at fedoraproject.org (Dominik Mierzejewski)
Date: Sat, 24 Jan 2009 16:40:20 +0000 (UTC)
Subject: rpms/mnemosyne/EL-5 mnemosyne-desktop.patch, NONE,
	1.1 mnemosyne.spec, 
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090124164020.54A737010A@cvs1.fedora.phx.redhat.com>

Author: rathann

Update of /cvs/pkgs/rpms/mnemosyne/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28618

Modified Files:
	.cvsignore sources 
Added Files:
	mnemosyne-desktop.patch mnemosyne.spec 
Log Message:
- initial EL-5 import

mnemosyne-desktop.patch:

--- NEW FILE mnemosyne-desktop.patch ---
diff -up mnemosyne-1.1.1/mnemosyne.desktop.d mnemosyne-1.1.1/mnemosyne.desktop
--- mnemosyne-1.1.1/mnemosyne.desktop.d	2008-09-15 20:20:01.000000000 +0200
+++ mnemosyne-1.1.1/mnemosyne.desktop	2008-11-11 18:08:16.000000000 +0100
@@ -1,8 +1,8 @@
 [Desktop Entry]
 Name=Mnemosyne
-Comment=A flash card program to make your review process more efficient
+Comment=Make your review process more efficient
 Exec=mnemosyne %f
 Icon=mnemosyne
-Categories=Education
+Categories=Education;Languages;
 Terminal=false
 Type=Application


--- NEW FILE mnemosyne.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

Name:		mnemosyne
Summary:	Flash-card learning tool
Version:	1.1.1
Release:	3.r1%{?dist}
URL:		http://www.mnemosyne-proj.org/
Source0:	http://downloads.sourceforge.net/sourceforge/mnemosyne-proj/%{name}-%{version}-r1.tgz
Patch0:		%{name}-desktop.patch
License:	GPLv2+
Group:		Amusements/Games
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(id -u -n)
BuildRequires:	desktop-file-utils
BuildRequires:	python-setuptools-devel
BuildArch:	noarch
Requires:	hicolor-icon-theme
Requires:	pygame
Requires:	PyQt

%description
Mnemosyne resembles a traditional flash-card program but with an
important twist: it uses a sophisticated algorithm to schedule the best
time for a card to come up for review.

Optional dependencies:
* latex: enables entering formulas using latex syntax.

%prep
%setup -q
%patch0 -p1 -b .d

%build
CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build

%install
rm -rf %{buildroot}

%{__python} setup.py install -O1 --skip-build --root %{buildroot}

install -d %{buildroot}%{_datadir}/applications
desktop-file-install --vendor="" \
	--dir=%{buildroot}%{_datadir}/applications \
	%{name}.desktop

install -d %{buildroot}/%{_datadir}/icons/hicolor/128x128/apps
pushd %{buildroot}/%{_datadir}/icons
mv %{name}.png hicolor/128x128/apps/%{name}.png
popd

%clean
rm -rf %{buildroot}

%post
touch --no-create %{_datadir}/icons/hicolor
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
fi

%postun
touch --no-create %{_datadir}/icons/hicolor
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
fi

%files
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog LICENSE README
%{_bindir}/%{name}
%{python_sitelib}/%{name}
%{python_sitelib}/Mnemosyne-%{version}-*.egg-info
%{_datadir}/applications/%{name}.desktop
%{_datadir}/icons/hicolor/*/apps/%{name}.png

%changelog
* Tue Nov 11 2008 Dominik Mierzejewski <rpm at greysector.net> 1.1.1-3.r1
- fixed .desktop file comment to conform to GNOME HIG
- removed a redundant python setup.py install call
- moved the .desktop file category addition to the patch
- added missing hicolor-icon-theme-requires

* Fri Oct 03 2008 Dominik Mierzejewski <rpm at greysector.net> 1.1.1-2.r1
- updated to 1.1.1-r1
- dropped separate icon (fixed upstream)

* Thu Sep 11 2008 Dominik Mierzejewski <rpm at greysector.net> 1.1.1-1
- initial package
- include fixed icon from 1.1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mnemosyne/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	12 Nov 2008 18:17:46 -0000	1.1
+++ .cvsignore	24 Jan 2009 16:39:50 -0000	1.2
@@ -0,0 +1 @@
+mnemosyne-1.1.1-r1.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mnemosyne/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	12 Nov 2008 18:17:46 -0000	1.1
+++ sources	24 Jan 2009 16:39:50 -0000	1.2
@@ -0,0 +1 @@
+2c08f6b0465f3280fcd2b17960b797bc  mnemosyne-1.1.1-r1.tgz



From caolanm at fedoraproject.org  Sat Jan 24 16:47:02 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Sat, 24 Jan 2009 16:47:02 +0000 (UTC)
Subject: rpms/nagios-plugins/devel nagios-plugins.spec,1.56,1.57
Message-ID: <20090124164702.391A47010A@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/nagios-plugins/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30114

Modified Files:
	nagios-plugins.spec 
Log Message:
rebuild for dependencies


Index: nagios-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nagios-plugins/devel/nagios-plugins.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- nagios-plugins.spec	17 Jan 2009 15:19:10 -0000	1.56
+++ nagios-plugins.spec	24 Jan 2009 16:46:31 -0000	1.57
@@ -1,6 +1,6 @@
 Name: nagios-plugins
 Version: 1.4.13
-Release: 12%{?dist}
+Release: 13%{?dist}
 Summary: Host/service/network monitoring program plugins for Nagios
 
 Group: Applications/System
@@ -807,6 +807,9 @@
 %{_libdir}/nagios/plugins/utils.sh
 
 %changelog
+* Sat Jan 24 2009 Caol??n McNamara <caolanm at redhat.com> 1.4.13-13
+- rebuild for dependencies
+
 * Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> 1.4.13-12
 - rebuild with new openssl
 



From timj at fedoraproject.org  Sat Jan 24 16:52:51 2009
From: timj at fedoraproject.org (Tim Jackson)
Date: Sat, 24 Jan 2009 16:52:51 +0000 (UTC)
Subject: rpms/alsa-tools/devel .cvsignore, 1.11, 1.12 alsa-tools.spec, 1.21, 
	1.22 sources, 1.11, 1.12
Message-ID: <20090124165251.C898F7010A@cvs1.fedora.phx.redhat.com>

Author: timj

Update of /cvs/extras/rpms/alsa-tools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30739

Modified Files:
	.cvsignore alsa-tools.spec sources 
Log Message:
Update to 1.0.19
Mark udev rules as config



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/alsa-tools/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	21 Jul 2008 17:45:27 -0000	1.11
+++ .cvsignore	24 Jan 2009 16:52:21 -0000	1.12
@@ -4,3 +4,4 @@
 envy24control.desktop
 envy24control.png
 alsa-tools-1.0.17-pruned.tar.bz2
+alsa-tools-1.0.19-pruned.tar.bz2


Index: alsa-tools.spec
===================================================================
RCS file: /cvs/extras/rpms/alsa-tools/devel/alsa-tools.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- alsa-tools.spec	5 Dec 2008 17:03:16 -0000	1.21
+++ alsa-tools.spec	24 Jan 2009 16:52:21 -0000	1.22
@@ -22,8 +22,8 @@
 
 Summary:        Specialist tools for ALSA
 Name:           alsa-tools
-Version:        1.0.17
-Release:        2%{?dist}
+Version:        1.0.19
+Release:        1%{?dist}
 
 # Checked at least one source file from all the sub-projects contained in
 # the source tarball and they are consistent GPLv2+ - TJ 2007-11-15
@@ -89,7 +89,7 @@
 
 
 %build
-mv seq/sbiload . ; rmdir seq
+mv seq/sbiload . ; rm -rf seq
 for i in %{?builddirstools:%builddirstools} %{?builddirsfirmw:%builddirsfirmw}
 do
   cd $i ; %configure
@@ -205,7 +205,7 @@
 %doc %{_docdir}/%{name}-%{version}/mixartloader
 %doc %{_docdir}/%{name}-%{version}/usx2yloader
 %doc %{_docdir}/%{name}-%{version}/vxloader
-%{_sysconfdir}/udev/rules.d/*.rules
+%config(noreplace) %{_sysconfdir}/udev/rules.d/*.rules
 /lib/udev/tascam_fpga
 /lib/udev/tascam_fw
 %{_bindir}/hdsploader
@@ -215,6 +215,10 @@
 %endif
 
 %changelog
+* Sat Jan 24 2009 Tim Jackson <rpm at timj.co.uk> - 1.0.19-1
+- Update to version 1.0.19
+- Mark udev rules as config
+
 * Fri Dec  5 2008 Jon McCann <jmccann at redhat.com> - 1.0.17-2
 - Convert hotplug stuff to udev
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/alsa-tools/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	21 Jul 2008 17:45:27 -0000	1.11
+++ sources	24 Jan 2009 16:52:21 -0000	1.12
@@ -2,4 +2,4 @@
 38db1b88c44adb5591f87173061d7d98  echomixer.png
 4c10f8d250a86bdb3ea138488aec8fc4  envy24control.desktop
 3a1a195f2b9641f68651e3d312e5476f  envy24control.png
-0f9a6dbc1318b8a4c6897914b95c210d  alsa-tools-1.0.17-pruned.tar.bz2
+b12c748adc1bc4d4b454d61ee2e4432f  alsa-tools-1.0.19-pruned.tar.bz2



From caolanm at fedoraproject.org  Sat Jan 24 16:56:10 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Sat, 24 Jan 2009 16:56:10 +0000 (UTC)
Subject: rpms/libpreludedb/devel libpreludedb.spec,1.18,1.19
Message-ID: <20090124165610.A48C17010A@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/libpreludedb/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31161

Modified Files:
	libpreludedb.spec 
Log Message:
rebuild for dependencies


Index: libpreludedb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libpreludedb/devel/libpreludedb.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- libpreludedb.spec	29 Nov 2008 16:48:04 -0000	1.18
+++ libpreludedb.spec	24 Jan 2009 16:55:40 -0000	1.19
@@ -3,7 +3,7 @@
 
 Name:		libpreludedb		           
 Version:	0.9.15.1 
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Provide the framework for easy access to the Prelude database
 Group:		System Environment/Libraries
 License:	GPLv2+
@@ -165,6 +165,9 @@
 
 
 %changelog
+* Sat Jan 24 2009 Caol??n McNamara <caolanm at redhat.com> - 0.9.15.1-3
+- rebuild for dependencies
+
 * Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 0.9.15.1-2
 - Rebuild for Python 2.6
 



From caolanm at fedoraproject.org  Sat Jan 24 17:00:07 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Sat, 24 Jan 2009 17:00:07 +0000 (UTC)
Subject: rpms/lighttpd/devel lighttpd.spec,1.52,1.53
Message-ID: <20090124170007.1C20C7010A@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/lighttpd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31632

Modified Files:
	lighttpd.spec 
Log Message:
rebuild for dependencies


Index: lighttpd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lighttpd/devel/lighttpd.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- lighttpd.spec	24 Dec 2008 17:52:48 -0000	1.52
+++ lighttpd.spec	24 Jan 2009 16:59:36 -0000	1.53
@@ -6,7 +6,7 @@
 Summary: Lightning fast webserver with light system requirements
 Name: lighttpd
 Version: 1.4.20
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: BSD
 Group: System Environment/Daemons
 URL: http://www.lighttpd.net/
@@ -242,6 +242,9 @@
 %{_mandir}/man1/spawn-fcgi.1*
 
 %changelog
+* Sat Jan 24 2009 Caol??n McNamara <caolanm at redhat.com> 1.4.20-7
+- rebuild for dependencies
+
 * Wed Dec 24 2008 Matthias Saou <http://freshrpms.net/> 1.4.20-6
 - Partially revert last change by creating a "spawn-fastcgi" symlink, so that
   nothing breaks currently (especially for EL).



From caolanm at fedoraproject.org  Sat Jan 24 17:06:23 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Sat, 24 Jan 2009 17:06:23 +0000 (UTC)
Subject: rpms/freeradius/devel freeradius.spec,1.76,1.77
Message-ID: <20090124170623.E61CB7010A@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/freeradius/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32289

Modified Files:
	freeradius.spec 
Log Message:
rebuild for dependencies


Index: freeradius.spec
===================================================================
RCS file: /cvs/pkgs/rpms/freeradius/devel/freeradius.spec,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- freeradius.spec	5 Dec 2008 21:13:23 -0000	1.76
+++ freeradius.spec	24 Jan 2009 17:05:53 -0000	1.77
@@ -1,7 +1,7 @@
 Summary: High-performance and highly configurable free RADIUS server
 Name: freeradius
 Version: 2.1.3
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Daemons
 URL: http://www.freeradius.org/
@@ -507,6 +507,9 @@
 %{_libdir}/freeradius/rlm_sql_unixodbc-%{version}.so
 
 %changelog
+* Sat Jan 24 2009 Caol??n McNamara <caolanm at redhat.com> - 2.1.3-2
+- rebuild for dependencies
+
 * Thu Dec  4 2008 John Dennis <jdennis at redhat.com> - 2.1.3-1
 - upgrade to latest upstream release, upstream summary follows:
   The focus of this release is stability.



From caolanm at fedoraproject.org  Sat Jan 24 17:10:10 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Sat, 24 Jan 2009 17:10:10 +0000 (UTC)
Subject: rpms/flow-tools/devel flow-tools.spec,1.25,1.26
Message-ID: <20090124171010.B8ACA7010A@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/flow-tools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv374

Modified Files:
	flow-tools.spec 
Log Message:
rebuild for dependencies


Index: flow-tools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/flow-tools/devel/flow-tools.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- flow-tools.spec	31 Mar 2008 17:23:19 -0000	1.25
+++ flow-tools.spec	24 Jan 2009 17:09:40 -0000	1.26
@@ -8,7 +8,7 @@
 Version: 0.68.4
 Name: flow-tools
 Summary: Tool set for working with NetFlow data
-Release: 1%{?dist}
+Release: 2%{?dist}
 Group: Applications/System
 License: BSD 
 URL: http://code.google.com/p/%{name}/
@@ -129,6 +129,9 @@
 %{_includedir}/*.h
 
 %changelog
+* Sat Jan 24 2009 Caol??n McNamara <caolanm at redhat.com> - 0.68.4-2
+- rebuild for dependencies
+
 * Mon Mar 31 2008 Paul P Komkoff Jr <i at stingr.net> - 0.68.4-1
 - New upstream version
 



From caolanm at fedoraproject.org  Sat Jan 24 17:14:46 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Sat, 24 Jan 2009 17:14:46 +0000 (UTC)
Subject: rpms/exim/devel exim.spec,1.54,1.55
Message-ID: <20090124171446.378457010A@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/exim/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1290

Modified Files:
	exim.spec 
Log Message:
rebuild for dependencies


Index: exim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/exim/devel/exim.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- exim.spec	28 Aug 2008 21:05:31 -0000	1.54
+++ exim.spec	24 Jan 2009 17:14:15 -0000	1.55
@@ -12,7 +12,7 @@
 Summary: The exim mail transfer agent
 Name: exim
 Version: 4.69
-Release: 8%{?dist}
+Release: 9%{?dist}
 License: GPLv2+
 Url: http://www.exim.org/
 Group: System Environment/Daemons
@@ -483,6 +483,9 @@
 %{_sysconfdir}/cron.daily/greylist-tidy.sh
 
 %changelog
+* Sat Jan 24 2009 Caol??n McNamara <caolanm at redhat.com> 4.69-9
+- rebuild for dependencies
+
 * Thu Aug 28 2008 Michael Schwendt <mschwendt at fedoraproject.org> 4.69-8
 - Include unowned directories.
 



From caolanm at fedoraproject.org  Sat Jan 24 17:15:40 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Sat, 24 Jan 2009 17:15:40 +0000 (UTC)
Subject: rpms/rekall/devel rekall.spec,1.37,1.38
Message-ID: <20090124171540.2C6BB7010A@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/rekall/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1847

Modified Files:
	rekall.spec 
Log Message:
rebuild for dependencies


Index: rekall.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rekall/devel/rekall.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- rekall.spec	25 Dec 2008 05:12:27 -0000	1.37
+++ rekall.spec	24 Jan 2009 17:15:09 -0000	1.38
@@ -3,7 +3,7 @@
 Name:		rekall
 Summary:	A KDE database front-end application
 Version:	2.4.6
-Release:	7%{?dist}
+Release:	8%{?dist}
 Group:		Development/Tools
 License:	GPLv2
 URL:		http://www.rekallrevealed.org/
@@ -337,6 +337,9 @@
 %{_libdir}/librekallqt_driver_sqlite3.so*
 
 %changelog
+* Sat Jan 24 2009 Caol??n McNamara <caolanm at redhat.com> - 2.4.6-8
+- rebuild for dependencies
+
 * Wed Dec 24 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 2.4.6-7
 - manually tell it where to find python includedir based on what we have
 - enable support for mdb (thanks to mdbtools)



From timj at fedoraproject.org  Sat Jan 24 17:18:16 2009
From: timj at fedoraproject.org (Tim Jackson)
Date: Sat, 24 Jan 2009 17:18:16 +0000 (UTC)
Subject: rpms/alsa-firmware/devel .cvsignore, 1.4, 1.5 alsa-firmware.spec,
	1.8, 1.9 sources, 1.5, 1.6
Message-ID: <20090124171816.E17FE7010A@cvs1.fedora.phx.redhat.com>

Author: timj

Update of /cvs/extras/rpms/alsa-firmware/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2233

Modified Files:
	.cvsignore alsa-firmware.spec sources 
Log Message:
Update to 1.0.19



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/alsa-firmware/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	21 Jul 2008 14:49:54 -0000	1.4
+++ .cvsignore	24 Jan 2009 17:17:46 -0000	1.5
@@ -1 +1,2 @@
 alsa-firmware-1.0.17-pruned.tar.bz2
+alsa-firmware-1.0.19-pruned.tar.bz2


Index: alsa-firmware.spec
===================================================================
RCS file: /cvs/extras/rpms/alsa-firmware/devel/alsa-firmware.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- alsa-firmware.spec	21 Jul 2008 14:49:54 -0000	1.8
+++ alsa-firmware.spec	24 Jan 2009 17:17:46 -0000	1.9
@@ -1,6 +1,6 @@
 Summary:        Firmware for several ALSA-supported sound cards
 Name:           alsa-firmware
-Version:        1.0.17
+Version:        1.0.19
 Release:        1%{?dist}
 # See later in the spec for a breakdown of licensing
 License:        GPL+ and BSD and GPLv2+ and GPLv2 and LGPLv2+
@@ -190,6 +190,9 @@
 
 
 %changelog
+* Tue Jan 20 2009 Tim Jackson <rpm at timj.co.uk> - 1.0.19-1
+- Update to 1.0.19
+
 * Mon Jul 21 2008 Jaroslav Kysela <jkysela at redhat.com> - 1.0.17-1
 - Updated to 1.0.17
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/alsa-firmware/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	21 Jul 2008 14:49:54 -0000	1.5
+++ sources	24 Jan 2009 17:17:46 -0000	1.6
@@ -1 +1 @@
-267ba607640390caeaa3cdff5436b4ae  alsa-firmware-1.0.17-pruned.tar.bz2
+9213707c565d5c3ff9e9303a2e290b3f  alsa-firmware-1.0.19-pruned.tar.bz2



From caolanm at fedoraproject.org  Sat Jan 24 17:19:07 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Sat, 24 Jan 2009 17:19:07 +0000 (UTC)
Subject: rpms/cherokee/devel cherokee.spec,1.8,1.9
Message-ID: <20090124171907.B78AD7010A@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/cherokee/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2383

Modified Files:
	cherokee.spec 
Log Message:
rebuild for dependencies


Index: cherokee.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cherokee/devel/cherokee.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- cherokee.spec	31 Dec 2008 06:42:53 -0000	1.8
+++ cherokee.spec	24 Jan 2009 17:18:37 -0000	1.9
@@ -11,7 +11,7 @@
 
 Name:           cherokee
 Version:        0.11.6
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Flexible and Fast Webserver
 
 Group:          Applications/Internet
@@ -164,6 +164,8 @@
 
 
 %changelog
+* Sat Jan 24 2009 Caol??n McNamara <caolanm at redhat.com> - 0.11.6-2
+- rebuild for dependencies
 * Tue Dec 30 2008 Pavel Lisy <pavel.lisy at gmail.com> - 0.11.6-1
 - Resolves bz 478488, updated to 0.11.6
 * Tue Dec 30 2008 Pavel Lisy <pavel.lisy at gmail.com> - 0.11.2-4



From rdieter at fedoraproject.org  Sat Jan 24 17:23:01 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sat, 24 Jan 2009 17:23:01 +0000 (UTC)
Subject: rpms/kdebase/F-10 .cvsignore, 1.80, 1.81 kdebase.spec, 1.350,
	1.351 sources, 1.105, 1.106
Message-ID: <20090124172301.A01C87010A@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdebase/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3023

Modified Files:
	.cvsignore kdebase.spec sources 
Log Message:
* Thu Jan 22 2009 Than Ngo <than at redhat.com> - 4.2.0-1
- 4.2.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase/F-10/.cvsignore,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- .cvsignore	8 Jan 2009 17:24:52 -0000	1.80
+++ .cvsignore	24 Jan 2009 17:22:30 -0000	1.81
@@ -1 +1,5 @@
-kdebase-4.1.4.tar.bz2
+kdebase-4.1.2.tar.bz2
+kdebase-4.1.80.tar.bz2
+kdebase-4.1.85.tar.bz2
+kdebase-4.1.96.tar.bz2
+kdebase-4.2.0.tar.bz2


Index: kdebase.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase/F-10/kdebase.spec,v
retrieving revision 1.350
retrieving revision 1.351
diff -u -r1.350 -r1.351
--- kdebase.spec	13 Jan 2009 11:54:23 -0000	1.350
+++ kdebase.spec	24 Jan 2009 17:22:31 -0000	1.351
@@ -1,7 +1,6 @@
-
 Summary: K Desktop Environment 4 - Core Files
-Version: 4.1.4
-Release: 2%{?dist}
+Version: 4.2.0
+Release: 1%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdebase
@@ -26,20 +25,12 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # fedora specific nsplugins paths
-Patch1:   kdebase-nsplugins-paths.patch
-Patch2:   kdebase-4.1.2-konsole-session.patch
-Patch3:   kdebase-4.1.2-konsole-session-1.patch
+Patch0:   kdebase-4.1.80-nsplugins-paths.patch
+# Konsole patches
+Patch1:   kdebase-4.1.70-konsole-session.patch
 
 ## upstream patches
-# http://bugs.kde.org/show_bug.cgi?id=156636 (backported from 4.2)
-# Add keyboard actions for switching to the 1st-10th tab in Konsole
-# PLEASE DON'T DROP THIS BEFORE 4.2!
-Patch100: kdebase-4.1.2-konsole-kde#156636.patch
-
-BuildRequires: kde-filesystem >= 4
-%{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
-Requires(post): xdg-utils
-Requires(postun): xdg-utils
+
 %ifnarch s390 s390x
 Requires: eject
 %endif
@@ -61,17 +52,18 @@
 # FIXME: remove BRs which are only needed for stuff now in -runtime
 BuildRequires: alsa-lib-devel
 BuildRequires: bzip2-devel
-BuildRequires: cmake
+BuildRequires: cmake >= 2.6.2
 BuildRequires: cyrus-sasl-devel
 BuildRequires: doxygen
 BuildRequires: fontconfig-devel
 BuildRequires: gettext
 BuildRequires: giflib-devel
 BuildRequires: hal-devel
+BuildRequires: pcre-devel
 BuildRequires: kdelibs4-devel >= %{version}
 BuildRequires: kdepimlibs-devel >= %{version}
 %if "%{name}" == "kdebase"
-BuildRequires: kdebase-workspace-devel >= %{version}
+BuildRequires: plasma-devel >= %{version}
 %endif
 %ifnarch s390 s390x
 BuildRequires: libraw1394-devel
@@ -108,7 +100,7 @@
 
 %if 0%{?libs}
 %package libs
-Summary: Runtime libraries for %{name} 
+Summary: Runtime libraries for %{name}
 Group:   System Environment/Libraries
 Requires: kdelibs4 >= %{version}, kdepimlibs >= %{version}
 %description libs
@@ -117,7 +109,7 @@
 
 %package devel
 Group:    Development/Libraries
-Summary:  Development files for %{name} 
+Summary:  Development files for %{name}
 Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}
 %if "%{name}" != "kdebase4"
 Obsoletes: kdebase4-devel < %{version}-%{release}
@@ -130,16 +122,14 @@
 
 %prep
 %setup -q -n kdebase-%{version}
-%patch1 -p0 -b .nsplugins-paths
-%patch2 -p1 -b .konsole-session
-%patch3 -p1 -b .konsole-session-1
-%patch100 -p0 -b .kde#156636
+%patch0 -p1 -b .nsplugins-paths
+%patch1 -p1 -b .konsole-session
 
 # fix incorrect assumption that we're building in a combined kdebase tree
 sed -i -e 's/EXISTS "${kdebase_SOURCE_DIR}"/0/g' apps/CMakeLists.txt
 
 %build
-mkdir -p %{_target_platform} 
+mkdir -p %{_target_platform}
 pushd %{_target_platform}
 %{cmake_kde4} ..
 popd
@@ -149,7 +139,7 @@
 
 %install
 rm -rf %{buildroot}
-make install DESTDIR=%{buildroot} -C %{_target_platform}
+make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
 %if "%{name}" != "kdebase"
 # remove files which conflict with KDE 3
@@ -291,7 +281,7 @@
 %{_kde4_docdir}/HTML/en/*
 %{_kde4_libdir}/kde4/*
 %exclude %{_kde4_libdir}/kde4/devel/
-
+%{_mandir}/man1/*
 %if "%{name}" == "kdebase"
 %{_kde4_datadir}/autostart/*
 %{_kde4_configdir}/*
@@ -314,11 +304,31 @@
 
 
 %changelog
-* Tue Jan 13 2009 Than Ngo <than at redhat.com> - 4.1.4-2
-- respin
+* Thu Jan 22 2009 Than Ngo <than at redhat.com> - 4.2.0-1
+- 4.2.0
+
+* Wed Jan 07 2009 Than Ngo <than at redhat.com> - 4.1.96-1
+- 4.2rc1
+
+* Thu Dec 11 2008 Than Ngo <than at redhat.com> -  4.1.85-1
+- 4.2beta2
 
-* Thu Jan  8 2009 Luk???? Tinkl <ltinkl at redhat.com> 4.1.4-1
-- KDE 4.1.4
+* Thu Nov 27 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 6:4.1.80-4
+- BR plasma-devel instead of kdebase-workspace-devel
+
+* Sun Nov 23 2008 Lorenzo Villani <lvillani at binaryhelix.net> - 6:4.1.80-3
+- rebase nsplugins-path patch
+
+* Thu Nov 20 2008 Than Ngo <than at redhat.com>  4.1.80-2
+- merged
+
+* Wed Nov 19 2008 Lorenzo Villani <lvillani at binaryhelix.net> - 6:4.1.80-1
+- 4.1.80
+- patch100 was backported from 4.2 (4.1.6x), removed from patch list
+- ported 4.1.2 konsole patches
+- drop the second konsole patch (upstreamed)
+- using make install/fast
+- BR cmake >= 2.6.2
 
 * Wed Nov 12 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.3-2
 - readd kde#156636 patch (Konsole keyboard actions backport)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase/F-10/sources,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -r1.105 -r1.106
--- sources	13 Jan 2009 11:54:23 -0000	1.105
+++ sources	24 Jan 2009 17:22:31 -0000	1.106
@@ -1 +1 @@
-9a76438f5453a3ba4f773db6847825f7  kdebase-4.1.4.tar.bz2
+da86a8ad624e86eda3a7509f39272060  kdebase-4.2.0.tar.bz2



From caolanm at fedoraproject.org  Sat Jan 24 17:26:41 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Sat, 24 Jan 2009 17:26:41 +0000 (UTC)
Subject: rpms/Io-language/devel Io-language.spec,1.9,1.10
Message-ID: <20090124172641.B1C367010A@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/Io-language/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3507

Modified Files:
	Io-language.spec 
Log Message:
rebuild for dependencies


Index: Io-language.spec
===================================================================
RCS file: /cvs/pkgs/rpms/Io-language/devel/Io-language.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Io-language.spec	1 Dec 2008 05:03:43 -0000	1.9
+++ Io-language.spec	24 Jan 2009 17:26:11 -0000	1.10
@@ -9,7 +9,7 @@
  
 Name:           Io-language
 Version:        20071010
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Io is a small, prototype-based programming language
 Group:          System Environment/Libraries
 License:        BSD
@@ -215,6 +215,9 @@
 
 
 %changelog
+* Sat Jan 24 2009 Caol??n McNamara <caolanm at redhat.com> - 20071010-8
+- rebuild for dependencies
+
 * Sun Nov 30 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 20071010-7
 - Rebuild for Python 2.6
 



From caolanm at fedoraproject.org  Sat Jan 24 17:33:49 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Sat, 24 Jan 2009 17:33:49 +0000 (UTC)
Subject: rpms/bind/devel bind.spec,1.299,1.300
Message-ID: <20090124173349.22EF17010A@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/bind/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4494

Modified Files:
	bind.spec 
Log Message:
rebuild for dependencies


Index: bind.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bind/devel/bind.spec,v
retrieving revision 1.299
retrieving revision 1.300
diff -u -r1.299 -r1.300
--- bind.spec	21 Jan 2009 13:12:40 -0000	1.299
+++ bind.spec	24 Jan 2009 17:33:18 -0000	1.300
@@ -21,7 +21,7 @@
 Name:     bind
 License:  ISC
 Version:  9.6.0
-Release:  3.%{PATCHVER}%{?dist}
+Release:  4.%{PATCHVER}%{?dist}
 Epoch:    32
 Url:      http://www.isc.org/products/BIND/
 Buildroot:%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -602,6 +602,9 @@
 %ghost %{chroot_prefix}/etc/localtime
 
 %changelog
+* Sat Jan 24 2009 Caol??n McNamara <caolanm at redhat.com> 32:9.6.0-4.P1
+- rebuild for dependencies
+
 * Wed Jan 21 2009 Adam Tkac <atkac redhat com> 32:9.6.0-3.P1
 - rebuild against new openssl
 



From than at fedoraproject.org  Sat Jan 24 17:42:07 2009
From: than at fedoraproject.org (Than Ngo)
Date: Sat, 24 Jan 2009 17:42:07 +0000 (UTC)
Subject: rpms/kde-l10n/devel kde-l10n.spec,1.64,1.65
Message-ID: <20090124174207.4D0D27010A@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kde-l10n/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5416

Modified Files:
	kde-l10n.spec 
Log Message:
fix rpm file list



Index: kde-l10n.spec
===================================================================
RCS file: /cvs/extras/rpms/kde-l10n/devel/kde-l10n.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- kde-l10n.spec	24 Jan 2009 10:43:07 -0000	1.64
+++ kde-l10n.spec	24 Jan 2009 17:41:36 -0000	1.65
@@ -942,7 +942,7 @@
 %defattr(-,root,root)
 %lang(es) %{_datadir}/locale/es/*
 %lang(es) %{_kde4_appsdir}/ktuberling/sounds/es*
-%lang(es) %{_kde4_appsdir}/khangman/data/es
+#%lang(es) %{_kde4_appsdir}/khangman/data/es
 %lang(es) %{_kde4_appsdir}/khangman/es.txt
 %lang(es) %{_kde4_appsdir}/klettres/es
 %lang(es) %{_kde4_appsdir}/kvtml/es



From rdieter at fedoraproject.org  Sat Jan 24 17:45:40 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sat, 24 Jan 2009 17:45:40 +0000 (UTC)
Subject: rpms/kdenetwork/F-10 kdenetwork.spec,1.161,1.162
Message-ID: <20090124174540.13A797010A@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdenetwork/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6186

Modified Files:
	kdenetwork.spec 
Log Message:
* Thu Jan 22 2009 Than Ngo <than at redhat.com> - 4.2.0-1
- 4.2.0



Index: kdenetwork.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdenetwork/F-10/kdenetwork.spec,v
retrieving revision 1.161
retrieving revision 1.162
diff -u -r1.161 -r1.162
--- kdenetwork.spec	12 Jan 2009 18:40:24 -0000	1.161
+++ kdenetwork.spec	24 Jan 2009 17:45:09 -0000	1.162
@@ -1,61 +1,51 @@
-# FIXME/TODO: needed BuildRequires 
-# Decibel
-
 Summary: K Desktop Environment - Network Applications
 Name: kdenetwork
 Epoch: 7
-Version: 4.1.4
-Release: 2%{?dist}
+Version: 4.2.0
+Release: 1%{?dist}
 
 License: GPLv2
 Group: Applications/Internet
 URL: http://www.kde.org
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
-Patch0: kdenetwork-4.1.3-handle-enc-message.patch
 # build Kopete against the system libgadu (backported from 4.3)
 # http://websvn.kde.org/?view=rev&revision=909144
 # http://websvn.kde.org/?view=rev&revision=909145
-Patch100: kdenetwork-4.1.4-system-libgadu.patch
-
-# upstream patches
-
+Patch100: kdenetwork-4.1.96-system-libgadu.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: avahi-compat-libdns_sd-devel
 BuildRequires: boost-devel
-BuildRequires: cmake
-# TODO
+# FIXME/TODO
 #BuildRequires: decibel-devel
 BuildRequires: giflib-devel
 BuildRequires: glib2-devel
 BuildRequires: gmp-devel
-BuildRequires: kde-filesystem >= 4
-%{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
-BuildRequires: kdelibs4-devel >= %{version}
 BuildRequires: kdepimlibs-devel >= %{version}
-BuildRequires: kdebase-workspace-devel >= %{version}
 BuildRequires: libgadu-devel >= 1.8.0
 BuildRequires: libidn-devel
+BuildRequires: libmsn-devel >= 4.0-0.4.beta2
 BuildRequires: libotr-devel
 BuildRequires: libvncserver-devel
 BuildRequires: libxslt-devel libxml2-devel
+BuildRequires: meanwhile-devel
 BuildRequires: openldap-devel
 BuildRequires: openslp-devel
+BuildRequires: ortp-devel
 BuildRequires: pcre-devel
 BuildRequires: qca2-devel
+BuildRequires: plasma-devel >= %{version}
 BuildRequires: qimageblitz-devel
 BuildRequires: soprano-devel >= 2.0.97
+BuildRequires: speex-devel
 BuildRequires: sqlite-devel
-# omit for now, save pulling in xmms-lib, gtk+ lib stack
-#BuildRequires: xmms-devel 
-
+# FIXME/TODO: libnxcl-devel
 
 # FIXME/TODO: are there other explicit Requires?
 Requires(post): xdg-utils
 Requires(postun): xdg-utils
-Requires: kdelibs4 >= %{version}
 Requires: kdepimlibs >= %{version}
-Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: %{name}-libs = %{epoch}:%{version}-%{release}
 
 # kopete/yahoo
 Requires(hint): jasper
@@ -66,14 +56,15 @@
 ## krdc
 Requires(hint): rdesktop
 
-Obsoletes: %{name}-extras < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes: %{name}-extras < 7:4.0.0 
+
+# kopete-bonjour review, https://bugzilla.redhat.com/451302
+Obsoletes: kopete-bonjour < 2
+Provides: kopete-bonjour = 2
 
-# FIXME/TODO: Taken from 3.5.8. review needed
 %description
 Networking applications, including:
 * kget: downloader manager
-* kio_lan: lan browsing kio slave
-* knewsticker: RDF newsticker applet
 * kopete: chat client
 * kppp: dialer and front end for pppd
 * krdc: a client for Desktop Sharing and other VNC servers
@@ -87,7 +78,7 @@
 
 %package devel
 Group:    Development/Libraries
-Summary:  Development files for %{name} 
+Summary:  Development files for %{name}
 Requires: %{name}-libs = %{epoch}:%{version}-%{release}
 Requires: kdelibs4-devel
 %description devel
@@ -96,8 +87,7 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .handle-enc-message
-%patch100 -p1 -b .system-libgadu
+%patch100 -p0 -b .system-libgadu
 rm -rf kopete/protocols/gadu/libgadu/
 
 %build
@@ -112,7 +102,7 @@
 %install
 rm -rf %{buildroot}
 
-make install DESTDIR=%{buildroot} -C %{_target_platform}
+make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
 
 %clean
@@ -120,10 +110,14 @@
 
 
 %post
-%{_bindir}/xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
+/sbin/ldconfig ||:
+xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
+xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || :
 
 %postun
-%{_bindir}/xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
+/sbin/ldconfig ||:
+xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
+xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || :
 
 %post libs -p /sbin/ldconfig
 
@@ -134,6 +128,7 @@
 %defattr(-,root,root,-)
 %doc COPYING README
 %{_kde4_bindir}/*
+%{_kde4_appsdir}/kconf_update/*
 %{_kde4_appsdir}/kget/
 %{_kde4_appsdir}/khtml/kpartplugins/kget_plug_in.rc
 %{_kde4_appsdir}/kopete*
@@ -141,46 +136,74 @@
 %{_kde4_appsdir}/krfb/
 %{_kde4_appsdir}/krdc/
 %{_kde4_appsdir}/remoteview/
+%{_kde4_appsdir}/desktoptheme/default/widgets/kget.svg
+%{_kde4_configdir}/kopeterc
 %{_kde4_datadir}/applications/kde4/*
 %{_kde4_datadir}/config.kcfg/*
 %{_datadir}/dbus-1/interfaces/*
 %{_kde4_datadir}/kde4/services/*
 %{_kde4_datadir}/kde4/servicetypes/*
 %{_kde4_datadir}/sounds/*
-%{_kde4_docdir}/HTML/en/kget/
-%{_kde4_docdir}/HTML/en/knewsticker/
-%{_kde4_docdir}/HTML/en/kopete/
-%{_kde4_docdir}/HTML/en/kppp/
-%{_kde4_docdir}/HTML/en/krfb/
-%{_kde4_docdir}/HTML/en/krdc/
+%{_kde4_docdir}/HTML/en/*/
 %{_kde4_iconsdir}/hicolor/*/*/*
-%{_kde4_configdir}/kopeterc
 %{_kde4_iconsdir}/oxygen/*/*/*
-%{_kde4_appsdir}/kconf_update/*
-%{_kde4_appsdir}/desktoptheme/default/widgets/kget.svg
 %{_kde4_libdir}/kde4/*
+%{_kde4_libdir}/libqgroupwise.so
 
 %files libs
 %defattr(-,root,root,-)
-%{_kde4_libdir}/libqgroupwise.so
 %{_kde4_libdir}/lib*.so.*
 
 %files devel
 %defattr(-,root,root,-)
-%{_kde4_includedir}/*
+%{_kde4_includedir}/kopete/
 %{_kde4_libdir}/lib*.so
 %exclude %{_kde4_libdir}/libqgroupwise.so
 
 
 %changelog
-* Mon Jan 12 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.4-2
+* Thu Jan 22 2009 Than Ngo <than at redhat.com> - 4.2.0-1
+- 4.2.0
+
+* Fri Jan 16 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.96-3
+- rebuild for new OpenSSL
+
+* Mon Jan 12 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.96-2
 - build against system libgadu (trivial patch backported from 4.3)
 
-* Fri Jan  9 2009 Luk???? Tinkl <ltinkl at redhat.com> 4.1.4-1
-- KDE 4.1.4
+* Wed Jan 07 2009 Than Ngo <than at redhat.com> - 4.1.96-1
+- 4.2rc1
 
-* Wed Dec 10 2008 Jaroslav Reznik <jreznik at redhat.com> 4.1.3-2
-- fix kopete jabber protocol encrypted message handling (#473412)
+* Fri Dec 12 2008 Than Ngo <than at redhat.com> 4.1.85-1
+- 4.2beta2
+- BR: libmsn-devel
+
+* Thu Dec 11 2008 Rex Dieter <rdieter at fedoraproject.org> 7:4.1.80-7
+- Obsoletes/Provides: kopete-bonjour (#451302)
+
+* Thu Dec 04 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 7:4.1.80-6
+- rebuild for fixed kde-filesystem (macros.kde4) (get rid of rpaths)
+
+* Thu Dec 04 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 7:4.1.80-5
+- add missing BR meanwhile-devel (#474592)
+- add missing BR ortp-devel and speex-devel (for Jingle protocol)
+
+* Mon Dec 01 2008 Rex Dieter <rdieter at fedoraproject.org> 7:4.1.80-4
+- fix up %%description
+- versioned Obsoletes
+- scriptlets fixes
+- BR: plasma-devel
+
+* Fri Nov 28 2008 Lorenzo Villani <lvillani at binaryhelix.net> 7:4.1.80-3
+- fix build (updated file lists)
+
+* Thu Nov 20 2008 Than Ngo <than at redhat.com> 4.1.80-2
+- merged
+
+* Thu Nov 20 2008 Lorenzo Villani <lvillani at binaryhelix.net> 7:4.1.72-1
+- 4.1.80
+- BR cmake 2.6
+- make install/fast
 
 * Wed Nov 12 2008 Than Ngo <than at redhat.com> 4.1.3-1
 - 4.1.3
@@ -279,7 +302,7 @@
 - Obsoletes: -extras ...
 - Requires: rdesktop (#420801), for krdc
 - Requires: ppp , for kppp
-- Requires: jasper , for kopete 
+- Requires: jasper , for kopete
 
 * Wed Dec 12 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.97.0-4
 - rebuild for changed _kde4_includedir



From rdieter at fedoraproject.org  Sat Jan 24 17:54:38 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sat, 24 Jan 2009 17:54:38 +0000 (UTC)
Subject: rpms/kdesdk/F-10 .cvsignore, 1.51, 1.52 kdesdk.spec, 1.123,
	1.124 sources, 1.54, 1.55
Message-ID: <20090124175438.500BC7010A@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdesdk/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7521

Modified Files:
	.cvsignore kdesdk.spec sources 
Log Message:
* Thu Jan 22 2009 Than Ngo <than at redhat.com> - 4.2.0-1
- 4.2.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdesdk/F-10/.cvsignore,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- .cvsignore	9 Jan 2009 12:38:25 -0000	1.51
+++ .cvsignore	24 Jan 2009 17:54:07 -0000	1.52
@@ -1 +1,5 @@
-kdesdk-4.1.4.tar.bz2
+kdesdk-4.1.2.tar.bz2
+kdesdk-4.1.80.tar.bz2
+kdesdk-4.1.85.tar.bz2
+kdesdk-4.1.96.tar.bz2
+kdesdk-4.2.0.tar.bz2


Index: kdesdk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdesdk/F-10/kdesdk.spec,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -r1.123 -r1.124
--- kdesdk.spec	9 Jan 2009 12:57:27 -0000	1.123
+++ kdesdk.spec	24 Jan 2009 17:54:07 -0000	1.124
@@ -1,6 +1,5 @@
-
 Name:           kdesdk
-Version:        4.1.4
+Version:        4.2.0
 Release:        1%{?dist}
 Summary:        The KDE Software Development Kit (SDK)
 
@@ -9,18 +8,12 @@
 License:        GPLv2
 URL:            http://www.kde.org/
 Source0:        ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
+# upstream patches
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-## upstream patches
-Patch100:       kdesdk-4.1.2-quit.patch
-
-BuildRequires:  kde-filesystem >= 4
-%{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
-BuildRequires:  kdelibs4-devel >= %{version}
 BuildRequires:  kdepimlibs-devel >= %{version}
-BuildRequires:  kdebase-workspace-devel >= %{version}
+BuildRequires:  plasma-devel >= %{version}
 BuildRequires:  strigi-devel
-BuildRequires:  cmake
 BuildRequires:  flex
 BuildRequires:  giflib-devel
 BuildRequires:  apr-devel
@@ -32,18 +25,15 @@
 BuildRequires:  libtool-ltdl-devel
 BuildRequires:  subversion-devel
 BuildRequires:  boost-devel
+BuildRequires:  libical-devel
 # for libiberty (used by kmtrace for cp_demangle)
 # IMPORTANT: check licensing from time to time, currently libiberty is still
 #            GPLv2+/LGPLv2+
 BuildRequires:  binutils-devel
-# for kbugbuster
-BuildRequires:  libical-devel
 
 Requires(post): xdg-utils
 Requires(postun): xdg-utils
-Requires: kdelibs4 >= %{version}
 Requires: kdepimlibs >= %{version}
-Requires: kdebase-workspace >= %{version}
 Requires: %{name}-libs = %{version}-%{release}
 
 # not *strictly* required, helps upgrade case so tools don't disappear
@@ -73,7 +63,7 @@
 Summary:  Developer files for %{name}
 Group:    Development/Libraries
 Requires: %{name}-libs = %{version}-%{release}
-Requires: kdelibs4-devel kdepimlibs-devel
+Requires: kdepimlibs-devel
 %description devel
 Files for developing applications using %{name}.
 
@@ -92,7 +82,6 @@
 %setup -q
 
 # upstream patches
-%patch100 -p1 -b .quit
 
 %build
 mkdir -p %{_target_platform}
@@ -106,10 +95,13 @@
 %install
 rm -rf %{buildroot}
 
-make install DESTDIR=%{buildroot} -C %{_target_platform}
+make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
 # unpackaged files
 rm -f %{buildroot}%{_kde4_libdir}/libantlr.so
+# This one fits better into krazy2 (it requires krazy2), and the version in
+# kdesdk does not understand lib64.
+rm -f %{buildroot}%{_kde4_bindir}/krazy-licensecheck
 
 # move devel symlinks
 mkdir -p %{buildroot}%{_kde4_libdir}/kde4/devel
@@ -157,15 +149,16 @@
 %{_kde4_appsdir}/cervisia/
 %{_kde4_appsdir}/cervisiapart/*
 %{_kde4_appsdir}/kabc/*
-%{_kde4_appsdir}/kapptemplate/
 %{_kde4_appsdir}/katepart/
 %{_kde4_appsdir}/kate/
 %{_kde4_appsdir}/kbugbuster/
 %{_kde4_appsdir}/kcachegrind/*
 %{_kde4_appsdir}/kconf_update/*
+%{_kde4_appsdir}/kio_perldoc/
 %{_kde4_appsdir}/kdevappwizard/
 %{_kde4_appsdir}/kmtrace/
 %{_kde4_appsdir}/kompare/
+%{_kde4_appsdir}/kpartloader/
 %{_kde4_appsdir}/kuiviewer/*
 %{_kde4_appsdir}/kuiviewerpart/*
 %{_kde4_appsdir}/lokalize/
@@ -222,8 +215,38 @@
 
 
 %changelog
-* Fri Jan  9 2009 Luk???? Tinkl <ltinkl at redhat.com> 4.1.4-1
-- KDE 4.1.4
+* Thu Jan 22 2009 Than Ngo <than at redhat.com> - 4.2.0-1
+- 4.2.0
+
+* Mon Jan 19 2009 Than Ngo <than at redhat.com> - 4.1.96-4
+- apply patch to fix  build against Boost 1.37.0 
+
+* Tue Jan 13 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.96-3
+- F11+: add workaround to fix build against Boost 1.37.0
+
+* Fri Jan 09 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.96-2
+- don't ship krazy-licensecheck, should be in krazy2
+
+* Wed Jan 07 2009 Than Ngo <than at redhat.com> - 4.1.96-1
+- 4.2rc1
+
+* Fri Dec 12 2008 Than Ngo <than at redhat.com> 4.1.85-1
+- 4.2beta2
+
+* Mon Dec 01 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.80-3
+- BR plasma-devel instead of kdebase-workspace-devel
+- don't require kdebase-workspace
+- rebase Lokalize quit menu patch
+- BR libical-devel
+
+* Thu Nov 20 2008 Than Ngo <than at redhat.com> 4.1.80-2
+- merged
+
+* Thu Nov 20 2008 Lorenzo Villani <lvillani at binaryhelix.net> 4.1.80-1
+- 4.1.80
+- BR cmake >= 2.6.2
+- make install/fast
+- kdesdk-4.1.2-kdecore.patch upstreamed, dropped
 
 * Wed Nov 12 2008 Than Ngo <than at redhat.com> 4.1.3-1
 - 4.1.3


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdesdk/F-10/sources,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- sources	9 Jan 2009 12:38:25 -0000	1.54
+++ sources	24 Jan 2009 17:54:07 -0000	1.55
@@ -1 +1 @@
-1ca874a1d239018472bf27d0f2b98feb  kdesdk-4.1.4.tar.bz2
+79d01b4f10f1ecc283f7860d2c7973e9  kdesdk-4.2.0.tar.bz2



From rjones at fedoraproject.org  Sat Jan 24 18:12:14 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Sat, 24 Jan 2009 18:12:14 +0000 (UTC)
Subject: rpms/mingw32-filesystem/devel mingw32-filesystem.spec, 1.10,
	1.11 mingw32-macros.mingw32, 1.6, 1.7
Message-ID: <20090124181214.1DAA07010A@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/mingw32-filesystem/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9161

Modified Files:
	mingw32-filesystem.spec mingw32-macros.mingw32 
Log Message:
- Don't claim C++ compiler exists if it's not installed, as this
  breaks autoconf and (in particular) libtool.



Index: mingw32-filesystem.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-filesystem/devel/mingw32-filesystem.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- mingw32-filesystem.spec	14 Jan 2009 10:20:03 -0000	1.10
+++ mingw32-filesystem.spec	24 Jan 2009 18:11:43 -0000	1.11
@@ -1,8 +1,8 @@
 %define debug_package %{nil}
 
 Name:           mingw32-filesystem
-Version:        42
-Release:        1%{?dist}
+Version:        43
+Release:        6%{?dist}
 Summary:        MinGW base filesystem and environment
 
 Group:          Development/Libraries
@@ -145,6 +145,10 @@
 
 
 %changelog
+* Sat Jan 24 2009 Richard W.M. Jones <rjones at redhat.com> - 43-6
+- Don't claim C++ compiler exists if it's not installed, as this
+  breaks autoconf and (in particular) libtool.
+
 * Wed Jan 14 2009 Richard W.M. Jones <rjones at redhat.com> - 42-1
 - Add pseudo-provides secur32.dll
 


Index: mingw32-macros.mingw32
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-filesystem/devel/mingw32-macros.mingw32,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- mingw32-macros.mingw32	18 Dec 2008 10:53:30 -0000	1.6
+++ mingw32-macros.mingw32	24 Jan 2009 18:11:43 -0000	1.7
@@ -55,16 +55,22 @@
 
 %_mingw32_env HOST_CC=gcc; export HOST_CC; \
   PKG_CONFIG_PATH="%{_mingw32_libdir}/pkgconfig"; export PKG_CONFIG_PATH; \
-  CC="${MINGW32_CC:-%_mingw32_cc}"; export CC; \
-  CXX="${MINGW32_CXX:-%_mingw32_cxx}"; export CXX; \
-  CFLAGS="${MINGW32_CFLAGS:-%_mingw32_cflags}"; export CFLAGS; \
-  CXXFLAGS="${MINGW32_CXXFLAGS:-%_mingw32_cflags}"; export CXXFLAGS; \
   _PREFIX="%{_bindir}/%{_mingw32_target}-"; \
-  for i in `ls ${_PREFIX}*|egrep -v "gcc-"`; do \
+  for i in `ls -1 ${_PREFIX}* | grep -v 'gcc-'`; do \
     x=`echo $i|sed "s,${_PREFIX},,"|tr "a-z+-" "A-ZX_"`; \
     declare -x $x="$i" ; export $x; \
   done; \
   unset _PREFIX; \
+  CC="${MINGW32_CC:-%_mingw32_cc}"; export CC; \
+  CFLAGS="${MINGW32_CFLAGS:-%_mingw32_cflags}"; export CFLAGS; \
+  if [ -x "%{_bindir}/%{_mingw32_cxx}" ]; then \
+    CXX="${MINGW32_CXX:-%_mingw32_cxx}"; export CXX; \
+    CXXFLAGS="${MINGW32_CXXFLAGS:-%_mingw32_cflags}"; export CXXFLAGS; \
+  else \
+    CXX=; export CXX; \
+    ac_cv_prog_CXX=no; export ac_cv_prog_CXX; \
+    CXXFLAGS=; export CXXFLAGS; \
+  fi; \
   for i in `ls %{_mingw32_bindir}/*|grep -- "-config\$"` ; do \
     x=`basename $i|tr "a-z+-" "A-ZX_"`; \
     declare -x $x="$i" ; export $x; \



From jkeating at fedoraproject.org  Sat Jan 24 18:20:40 2009
From: jkeating at fedoraproject.org (Jesse Keating)
Date: Sat, 24 Jan 2009 18:20:40 +0000 (UTC)
Subject: rpms/jpoker/devel .cvsignore, 1.4, 1.5 jpoker.spec, 1.3, 1.4 sources,
	1.4, 1.5
Message-ID: <20090124182040.0C3177010A@cvs1.fedora.phx.redhat.com>

Author: jkeating

Update of /cvs/pkgs/rpms/jpoker/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10623

Modified Files:
	.cvsignore jpoker.spec sources 
Log Message:
* Sat Jan 24 2009 Jesse Keating <jkeating at redhat.com> - 1.0.14-1
- New upstream release
- Site change
- Update summary and description from upstream



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/jpoker/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	6 Apr 2008 20:28:15 -0000	1.4
+++ .cvsignore	24 Jan 2009 18:20:09 -0000	1.5
@@ -1 +1 @@
-jpoker-1.0.9.tar.gz
+jpoker-1.0.14.tar.gz


Index: jpoker.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jpoker/devel/jpoker.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- jpoker.spec	6 Apr 2008 20:28:15 -0000	1.3
+++ jpoker.spec	24 Jan 2009 18:20:09 -0000	1.4
@@ -1,22 +1,23 @@
 Name:           jpoker
-Version:        1.0.9
+Version:        1.0.14
 Release:        1%{?dist}
-Summary:        A jQuery user interface to play on poker-network based servers
+Summary:        Client for playing online poker in a Web browser
 
 Group:          Applications/Internet
-License:        GPLv3+ and (MIT or GPL+)
-URL:            http://jquery.com/plugins/project/%{name}
-Source0:        http://jquery.com/plugins/files/%{name}-%{version}.tar.gz
+License:        GPLv3+ and BSD and CC-BY-SA and AGPLv3 and (MIT or GPL+)
+URL:            http://jspoker.pokersource.info/
+Source0:        http://jspoker.pokersource.info/sources/%{name}-%{version}.tar.gz
 Source1:        %{name}.conf
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
-Requires:       httpd
-
 %description
-jPoker is a jQuery user interface to play on poker-network based server.
-For now jPoker allows you to list running tables and upcoming tournaments,
-but it means to become a full featured javascript pokerclient.
+jpoker is a client for playing online poker which runs in a Web browser. It
+displays the list of poker tables, and when the user choses one, it is
+displayed in the browser. The user can join the game and play hands. It
+supports multi table tournaments. The poker server to which jpoker connects
+must implement a protocol compatible with
+http://pokersource.info/poker-network/. 
 
 
 %prep
@@ -29,16 +30,7 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-# There is no install script, we do it by hand.
-%{__install} -m 0755 -d $RPM_BUILD_ROOT/%{_datadir}/%{name}
-%{__install} -m 0644 -p jpoker/*.js $RPM_BUILD_ROOT/%{_datadir}/%{name}/
-%{__install} -m 0644 -p jpoker/*.html $RPM_BUILD_ROOT/%{_datadir}/%{name}/
-%{__install} -m 0644 -p jpoker/*.css $RPM_BUILD_ROOT/%{_datadir}/%{name}/
-
-# Install the config file, forcing the need of apache.
-%{__install} -m 0755 -d $RPM_BUILD_ROOT/%{_sysconfdir}/httpd/conf.d
-%{__install} -m 0644 -p %{SOURCE1} $RPM_BUILD_ROOT/%{_sysconfdir}/httpd/conf.d/%{name}.conf
-
+make install DESTDIR=$RPM_BUILD_ROOT/
 
 
 %clean
@@ -47,14 +39,17 @@
 
 %files
 %defattr(-,root,root,-)
-%doc ChangeLog MIT-LICENSE.txt COPYING
+%doc COPYRIGHT/* AUTHORS NEWS ChangeLog README.binary
 %dir %{_datadir}/%{name}
 %{_datadir}/%{name}/*
-%{_sysconfdir}/httpd/conf.d/%{name}.conf
-
 
 
 %changelog
+* Sat Jan 24 2009 Jesse Keating <jkeating at redhat.com> - 1.0.14-1
+- New upstream release
+- Site change
+- Update summary and description from upstream
+
 * Sun Mar 23 2008 Jesse Keating <jkeating at redhat.com> - 1.0.9-1
 - New upstream release
 - Now GPLv3+


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/jpoker/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	6 Apr 2008 20:28:15 -0000	1.4
+++ sources	24 Jan 2009 18:20:09 -0000	1.5
@@ -1 +1 @@
-2d4926874e233dff57aa0a701a29bba9  jpoker-1.0.9.tar.gz
+be3fe132b38158233c6610296be4c23f  jpoker-1.0.14.tar.gz



From mathstuf at fedoraproject.org  Sat Jan 24 18:24:31 2009
From: mathstuf at fedoraproject.org (Ben Boeckel)
Date: Sat, 24 Jan 2009 18:24:31 +0000 (UTC)
Subject: rpms/kdebindings/devel kdebindings.spec,1.170,1.171
Message-ID: <20090124182431.610747010A@cvs1.fedora.phx.redhat.com>

Author: mathstuf

Update of /cvs/pkgs/rpms/kdebindings/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11061

Modified Files:
	kdebindings.spec 
Log Message:
* Sat Jan 24 2009 Ben Boeckel <MathStuf at gmail.com> - 4.2.0-2
- Removed Ruby examples; killed upstream



Index: kdebindings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebindings/devel/kdebindings.spec,v
retrieving revision 1.170
retrieving revision 1.171
diff -u -r1.170 -r1.171
--- kdebindings.spec	22 Jan 2009 19:24:48 -0000	1.170
+++ kdebindings.spec	24 Jan 2009 18:24:01 -0000	1.171
@@ -1,18 +1,12 @@
 # FIXME/TODO: BRs for Java (krossjava), C# (qyoto, kimono) and PHP (php-qt) support?
-# IMHO this one really needs to be split into subpackages, we don't want to pull
-# in e.g. the whole Ruby, OpenJDK and Mono stacks for a PyKDE app! -- Kevin
-# FIXME/TODO: Do we want to enable the optional Ruby bindings which are off by
-# default? There are bindings for QScintilla, Plasma and Nepomuk/Soprano. -- Kevin
 
 # define to enable these optional bits
 #define csharp 1
+# Waiting for Falcon >= 0.8.12, bug #476119
 #define falcon 1
 #define php 1
 %define ruby 1
 %define smoke 1
-# define to build kde-plasma-ruby bits, needs QtRuby-devel bootstrap
-# FIXME/TODO: ping upstream so it uses the just-built rbuic4
-#define kde_plasma_ruby 1
 
 %if 0%{?ruby}%{?smoke}
 %define devel 1
@@ -26,7 +20,7 @@
 
 Name: kdebindings
 Version: 4.2.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: KDE bindings to non-C++ languages
 
 Group: User Interface/Desktops
@@ -50,9 +44,6 @@
 BuildRequires:  qscintilla-devel >= 2.2
 %endif
 BuildRequires:  soprano-devel
-%if 0%{?kde_plasma_ruby}
-BuildRequires:  QtRuby-devel
-%endif
 
 Requires: kdelibs4 >= %{version}
 
@@ -120,20 +111,6 @@
 Provides: QtRuby4-devel = %{version}-%{release}
 %description -n QtRuby-devel
 %{summary}.
-
-%package -n kde-plasma-ruby-digitalclock
-Group:    User Interface/Desktops
-Summary:  Digital clock plasmoid written in Ruby
-Requires: korundum = %{version}-%{release}
-%description -n kde-plasma-ruby-digitalclock
-%{summary}.
-
-%package -n kde-plasma-ruby-analogclock
-Group:    User Interface/Desktops
-Summary:  Analog clock plasmoid written in Ruby
-Requires: korundum = %{version}-%{release}
-%description -n kde-plasma-ruby-analogclock
-%{summary}.
 %endif
 
 %package -n kross-python
@@ -165,6 +142,7 @@
 # FIXME/TODO: Get csharp to compile
 %{cmake_kde4} \
   %{!?csharp:-DBUILD_csharp=OFF} \
+  %{!?falcon:-DBUILD_falcon=OFF} \
   %{!?php:-DBUILD_php=OFF} \
   %{!?ruby:-DBUILD_ruby=OFF} %{?ruby:-DRUBY_SITE_LIB_DIR=%{ruby_sitelib} -DRUBY_SITE_ARCH_DIR=%{ruby_sitearch}} \
   %{!?smoke:-DBUILD_smoke=OFF} \
@@ -278,22 +256,13 @@
 %files -n kross-ruby
 %defattr(-,root,root,-)
 %{_kde4_libdir}/kde4/krossruby.so
-
-%if 0%{?kde_plasma_ruby}
-%files -n kde-plasma-ruby-analogclock
-%defattr(-,root,root,-)
-%{_kde4_sharedir}/kde4/apps/plasma_applet_ruby_clock/
-%{_kde4_sharedir}/kde4/services/plasma-applet-ruby-analogclock.desktop
-
-%files -n kde-plasma-ruby-digitalclock
-%defattr(-,root,root,-)
-%{_kde4_sharedir}/kde4/apps/plasma_ruby_digital_clock/
-%{_kde4_sharedir}/kde4/services/plasma-ruby-digital-clock-default.desktop
-%endif
 %endif
 
 
 %changelog
+* Sat Jan 24 2009 Ben Boeckel <MathStuf at gmail.com> - 4.2.0-2
+- Removed Ruby examples; killed upstream
+
 * Thu Jan 22 2009 Than Ngo <than at redhat.com> - 4.2.0-1
 - 4.2.0
 



From mathstuf at fedoraproject.org  Sat Jan 24 18:36:48 2009
From: mathstuf at fedoraproject.org (Ben Boeckel)
Date: Sat, 24 Jan 2009 18:36:48 +0000 (UTC)
Subject: rpms/krazy2/devel krazy2.spec,1.8,1.9 sources,1.5,1.6
Message-ID: <20090124183648.AE6CF7010A@cvs1.fedora.phx.redhat.com>

Author: mathstuf

Update of /cvs/pkgs/rpms/krazy2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12336

Modified Files:
	krazy2.spec sources 
Log Message:
Cleaner specfile and patches are now upstream


Index: krazy2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/krazy2/devel/krazy2.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- krazy2.spec	13 Jan 2009 23:32:30 -0000	1.8
+++ krazy2.spec	24 Jan 2009 18:36:18 -0000	1.9
@@ -1,6 +1,9 @@
+# Set to 1 if kdevplatform is available
+%define kdp 0
+
 Name:           krazy2
 Version:        2.8
-Release:        5.20090111svn909634%{?dist}
+Release:        6.20090113svn916151%{?dist}
 Summary:        Krazy is a tool for checking code against the KDE coding guidelines
 
 Group:          Development/Libraries
@@ -8,13 +11,12 @@
 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 909634 svn://anonsvn.kde.org/home/kde/trunk/quality/krazy2 krazy2-2.8
+#  svn export -r 916151 svn://anonsvn.kde.org/home/kde/trunk/quality/krazy2 krazy2-2.8
 #  tar -c krazy2-2.8 | bzip2 --best -c > krazy2-2.8.tar.bz2
 Source0:        krazy2-%{version}.tar.bz2
 # TODO: Remove if/when 4.2 hits F9 and F10
 %if 0%{?fedora} > 10
 Source1:        krazy-licensecheck
-Patch0:         checkutil-libsuffix.patch
 %endif
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -24,10 +26,11 @@
 BuildRequires:  perl(Tie::IxHash)
 BuildRequires:  perl(XML::LibXML)
 BuildRequires:  qt4-devel
-# FIXME: Needs KDevPlatform4
-# BuildRequires:  cmake
-# BuildRequires:  kdelibs4-devel
-# BuildRequires:  kdevplatform-devel
+%if 0%{?kdp}
+BuildRequires:  cmake
+BuildRequires:  kdelibs4-devel
+BuildRequires:  kdevplatform-devel
+%endif
 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
@@ -40,9 +43,6 @@
 
 %prep
 %setup -q
-%if 0%{?fedora} > 10
-%patch0
-%endif
 
 
 %build
@@ -52,15 +52,16 @@
 %{_qt4_qmake}
 make %{?_smp_mflags}
 popd
-# FIXME: Needs KDevelop4
-#pushd cppchecks
-#{cmake}
-#make VERBOSE=1 %{?_smp_mflags}
-#popd
+%if 0%{?kdp}
+pushd cppchecks
+%{cmake}
+make VERBOSE=1 %{?_smp_mflags}
+popd
+%endif
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 make DESTDIR=%{buildroot} PREFIX=%{_prefix} install
 chmod 0755 %{buildroot}%{_bindir}/krazy2{,all,ebn}
 pushd helpers
@@ -99,16 +100,20 @@
 pushd doc
 make DESTDIR=%{buildroot}%{_mandir} install
 popd
-%if 0%{fedora} > 10
+%if 0%{?fedora} > 10
 install -m 644 %{SOURCE1} %{buildroot}%{_bindir}/krazy-licensecheck
 %endif
-# FIXME: Needs KDevelop4
-# pushd cppchecks
-# make DESTDIR=%{buildroot} PREFIX=%{_prefix} 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 ';'
+%if 0%{?kdp}
+pushd cppchecks
+make DESTDIR=%{buildroot} PREFIX=%{_prefix} install
+# No headers installed
+rm -rf %{buildroot}%{_libdir}/libc++parser.so
+rm -rf %{buildroot}%{_libdir}/libcheckutil.so
+popd
+%endif
+find %{buildroot} -type f -name .packlist -exec rm -f {} ';'
+find %{buildroot} -type f -name perllocal.pod -exec rm -f {} ';'
+find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null ';'
 # chmod -R ug+w %{buildroot}%{_bindir}
 # chmod -R ug+w %{buildroot}%{_libdir}
 
@@ -117,7 +122,7 @@
 
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 
 %files
@@ -133,12 +138,22 @@
 %{_bindir}/krazy2
 %{_bindir}/krazy2all
 %{_bindir}/krazy2ebn
-%{_libdir}/krazy2
-%{_datadir}/dtd
-%{perl_vendorlib}/Krazy
+%if 0%{?kdp}
+%{_libdir}/libc++parser.so.1
+%{_libdir}/libc++parser.so.1.0
+%{_libdir}/libcheckutil.so.1
+%{_libdir}/libcheckutil.so.1.0
+%endif
+%{_libdir}/krazy2/
+%{_datadir}/dtd/
+%{perl_vendorlib}/Krazy/
 
 
 %changelog
+* Sat Jan 24 2009 Ben Boeckel <MathStuf at gmail.com> 2.8-6.20090113svn916151
+- Added flag for building with kdevplatform
+- Removed patches applied upstream
+
 * Tue Jan 13 2009 Ben Boeckel <MathStuf at gmail.com> 2.8-5.20090111svn909634
 - Typo with sources
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/krazy2/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	13 Jan 2009 23:04:36 -0000	1.5
+++ sources	24 Jan 2009 18:36:18 -0000	1.6
@@ -1 +1 @@
-e0507238f2643be52e9edae5e2059c7d  krazy2-2.8.tar.bz2
+242362beb2dc5c636d9810c592d115d1  krazy2-2.8.tar.bz2



From ausil at fedoraproject.org  Sat Jan 24 18:53:37 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Sat, 24 Jan 2009 18:53:37 +0000 (UTC)
Subject: rpms/iw/F-9 iw.spec,1.4,1.5
Message-ID: <20090124185337.361E47010A@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/iw/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14822

Modified Files:
	iw.spec 
Log Message:
BR kernel-headers sparc32 has only headers.  no kernel image so no kernel-devel



Index: iw.spec
===================================================================
RCS file: /cvs/pkgs/rpms/iw/F-9/iw.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- iw.spec	10 Jan 2009 18:38:02 -0000	1.4
+++ iw.spec	24 Jan 2009 18:53:06 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           iw
 Version:        0.9.7
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A nl80211 based wireless configuration tool
 
 Group:          System Environment/Base
@@ -9,7 +9,7 @@
 Source0:        http://wireless.kernel.org/download/iw/iw-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires: kernel-devel >= 2.6.24 
+BuildRequires: kernel-headers >= 2.6.24 
 BuildRequires: libnl-devel >= 1.0
 BuildRequires: pkgconfig      
 
@@ -43,6 +43,10 @@
 %doc COPYING
 
 %changelog
+* Sat Jan 24 2009 Dennis Gilmore <dennis at ausil.us> - 0.9.7-2 
+- BuildRequires kernel-headers not kernel-devel
+- (sparc32 has no kernel so no kernel-devel)
+
 * Sat Jan 10 2009 Adel Gadllah <adel.gadllah at gmail.com> 0.9.7-1
 - Update to 0.9.7
 



From rjones at fedoraproject.org  Sat Jan 24 19:49:10 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Sat, 24 Jan 2009 19:49:10 +0000 (UTC)
Subject: rpms/mingw32-libgpg-error/devel import.log, NONE,
	1.1 libgpg-error-1.6.tar.bz2.sig, NONE,
	1.1 mingw32-libgpg-error.spec, NONE, 1.1 wk@g10code.com, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090124194910.7B0A47010A@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/mingw32-libgpg-error/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25280/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log libgpg-error-1.6.tar.bz2.sig 
	mingw32-libgpg-error.spec wk at g10code.com 
Log Message:
Initial import.



--- NEW FILE import.log ---
mingw32-libgpg-error-1_6-9_fc11:HEAD:mingw32-libgpg-error-1.6-9.fc11.src.rpm:1232825555


--- NEW FILE libgpg-error-1.6.tar.bz2.sig ---
?
c?^????N??wonw
???????ET?? ??????s?x>?;9D	???4z8??C?{?b}3??pR??l#'??e???hc???

--- NEW FILE mingw32-libgpg-error.spec ---
%define __strip %{_mingw32_strip}
%define __objdump %{_mingw32_objdump}
%define _use_internal_dependency_generator 0
%define __find_requires %{_mingw32_findrequires}
%define __find_provides %{_mingw32_findprovides}

Name:           mingw32-libgpg-error
Version:        1.6
Release:        9%{?dist}
Summary:        MinGW Windows GnuPGP error library

License:        LGPLv2+
Group:          Development/Libraries
URL:            ftp://ftp.gnupg.org/gcrypt/libgpg-error/
Source0:        ftp://ftp.gnupg.org/gcrypt/libgpg-error/libgpg-error-%{version}.tar.bz2
Source1:        ftp://ftp.gnupg.org/gcrypt/libgpg-error/libgpg-error-%{version}.tar.bz2.sig
Source2:        wk at g10code.com
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch

BuildRequires:  mingw32-filesystem >= 27
BuildRequires:  mingw32-gcc
BuildRequires:  mingw32-binutils
BuildRequires:  mingw32-dlfcn
BuildRequires:  mingw32-iconv
BuildRequires:  mingw32-gettext

BuildRequires:  gettext


%description
MinGW Windows GnuPGP error library.


%prep
%setup -q -n libgpg-error-%{version}


%build
%{_mingw32_configure}
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT

make DESTDIR=$RPM_BUILD_ROOT install

rm $RPM_BUILD_ROOT%{_mingw32_libdir}/libgpg-error.a

%find_lang libgpg-error

%clean
rm -rf $RPM_BUILD_ROOT


%files -f libgpg-error.lang
%defattr(-,root,root)
%{_mingw32_bindir}/gpg-error-config
%{_mingw32_bindir}/gpg-error.exe
%{_mingw32_bindir}/libgpg-error-0.dll
%{_mingw32_libdir}/libgpg-error.dll.a
%{_mingw32_libdir}/libgpg-error.la
%{_mingw32_includedir}/gpg-error.h
%{_mingw32_datadir}/aclocal/gpg-error.m4
%{_mingw32_datadir}/common-lisp/source/gpg-error/*

%changelog
* Thu Jan 22 2009 Richard W.M. Jones <rjones at redhat.com> - 1.6-9
- Verify that we are still matching current native package.
- Use auto-buildrequires to identify more accurate list of BRs:
    + BR gettext (for /usr/bin/msgfmt etc)
    + BR mingw32-dlfcn
    + BR mingw32-iconv
- Use _smp_mflags.
- Use find_lang.

* Mon Sep 22 2008 Richard W.M. Jones <rjones at redhat.com> - 1.6-8
- Rename mingw -> mingw32.
- Depends on mingw-filesystem 27.

* Mon Sep 22 2008 Daniel P. Berrange <berrange at redhat.com> - 1.6-6
- Added signature source file & correct URLs

* Wed Sep 10 2008 Richard W.M. Jones <rjones at redhat.com> - 1.6-5
- Remove static libraries.

* Fri Sep  5 2008 Daniel P. Berrange <berrange at redhat.com> - 1.6-4
- Add gettext support

* Thu Sep  4 2008 Richard W.M. Jones <rjones at redhat.com> - 1.6-3
- Use mingw-filesystem RPM macros.
- BuildArch is noarch.

* Tue Sep  2 2008 Daniel P. Berrange <berrange at redhat.com> - 1.6-2
- List files explicitly and use custom CFLAGS

* Mon Jul  7 2008 Richard W.M. Jones <rjones at redhat.com> - 1.6-1
- Initial RPM release, largely based on earlier work from several sources.


--- NEW FILE wk at g10code.com ---
Login: wk                              Name: Werner Koch                             
No project.
No plan.
Public key:
  pub   1024D/5B0358A2 1999-03-15 [expires: 2011-07-11]
  uid                  Werner Koch <wk at gnupg.org>
  uid                  Werner Koch <wk at g10code.com>
  uid                  Werner Koch
  uid                  Werner Koch <werner at fsfe.org>
  sub   1024D/010A57ED 2004-03-21 [expires: 2007-12-31]
  sub   2048R/C3680A6E 2006-01-01 [expires: 2007-12-31]
  
  pub   1024R/1CE0C630 2006-01-01 [expires: 2008-12-31]
  uid                  Werner Koch (dist sig) <dd9jn at gnu.org>
  
  pub   1024R/37D92FFB 2003-11-17 [expires: 2009-12-31]
  uid                  g10 Code (code signing key 1) <code at g10code.com>
  
  pub   1024D/57548DCD 1998-07-07 [expired: 2005-12-31]
  uid                  Werner Koch (gnupg sig) <dd9jn at gnu.org>
  

5B0358A2 is my main key.
1CE0C630 is used to sign software distributions.
37D92FFB is used to sign certain source files.
57548DCD was used to sign GNU crypto software;
         it has been superseded by 1CE0C630.

Please note that I use a subkey for signing messages; some old OpenPGP
implementations may not be able to check such a signature. The primary
key is stored at a more or less secure place and only used on a spare
laptop which is not connected to any network. If you find a key
certified by this one, you can be sure that I personally met this
person and checked the name part of the user ID against an official
looking passport or another suitable photo id.  My signature does not
say anything about the email address (I merely check that the address
looks plausible).


-----BEGIN PGP PUBLIC KEY BLOCK-----
Version: GnuPG v1.4.7 (GNU/Linux)

mQGiBDWiHh4RBAD+l0rg5p9rW4M3sKvmeyzhs2mDxhRKDTVVUnTwpMIR2kIA9pT4
3No/coPajDvhZTaDM/vSz25IZDZWJ7gEu86RpoEdtr/eK8GuDcgsWvFs5+YpCDwW
G2dx39ME7DN+SRvEE1xUm4E9G2Nnd2UNtLgg82wgi/ZK4Ih9CYDyo0a9awCgisn3
RvZ/MREJmQq1+SjJgDx+c2sEAOEnxGYisqIKcOTdPOTTie7o7x+nem2uac7uOW68
N+wRWxhGPIxsOdueMIa7U94Wg/Ydn4f2WngJpBvKNaHYmW8j1Q5zvZXXpIWRXSvy
TR641BceGHNdYiR/PiDBJsGQ3ac7n7pwhV4qex3IViRDJWz5Dzr88x+Oju63KtxY
urUIBACi7d1rUlHr4ok7iBRlWHYXU2hpUIQ8C+UOE1XXT+HB7mZLSRONQnWMyXnq
bAAW+EUUX2xpb54CevAg4eOilt0es8GZMmU6c0wdUsnMWWqOKHBFFlDIvyI27aZ9
quf0yvby63kFCanQKc0QnqGXQKzuXbFqBYW2UQrYgjXji8rd8bQnV2VybmVyIEtv
Y2ggKGdudXBnIHNpZykgPGRkOWpuQGdudS5vcmc+iGIEExECACICGwMECwcDAgMV
AgMDFgIBAh4BAheABQI/6YJpBQkMMyPLAAoJEGi3q4lXVI3Nou8AnAuw9XXJ9zYP
7JP7ZbXUf9+00wO/AJsHB45GEJv878Q6SDZRNckFHh6SgIhGBBARAgAGBQI1oic8
AAoJEGx+4bhiHMATftYAn1fOaKDUOt+dS38rB+CJ2Q+iElWJAKDRPpp8q5GylbM8
DPlMpClWN3TYqYhGBBARAgAGBQI27U5sAAoJEF3iSZZbA1iiarYAn35qU3ZOlVEC
ELE/3V6q98Q30eAaAKCtO+lacH0Qq1E6v4BP/9y6MoLIhohdBBMRAgAdAwsEAwUV
AwIGAQMWAgECF4AFAj/pgnMFCQwzI8sACgkQaLeriVdUjc2CugCfZn7gqBWjafNb
vZOAInCQA/Rw5zYAnRkyKWw5abGYQboHiwcwuQHiKvgYiF0EExECAB0DCwQDBRUD
AgYBAxYCAQIXgAUCP+mCcwUJDDMjywAKCRBot6uJV1SNzYK6AJ9Gs4h+WWneZKYa
keAjG+DlXy+0xwCfQG8pV6E6f7XZi+f0EId+DfiNRluIYQQTEQIAIQIXgAUJDhSH
/QUCQbxoXgYLCQgHAwIDFQIDAxYCAQIeAQAKCRBot6uJV1SNzQSTAJ9Nd9d2oNLY
I6xlGbQ5SmG5jSHjHgCdFKVbI8acpQXEo7DxPDAJIux29keIRgQQEQIABgUCNuj6
3QAKCRAHAyqWiQTI4hKYAKDNyIrKze113YZz/ZZsdFCShO0rBQCcDFiAZxivd6I7
ll4fWIA0ckmSmaiIRgQQEQIABgUCOcwPPAAKCRAyw1uAR7qTV/b8AJ9WUVGMiFle
V6EVCKuxKc9YnfoQ1QCgzGUqNeYfb3xgI68racTrOXJVvhuIPwMFED1dFpBsryRo
IByznhECwRQAn1Ho60oFxkas1xl+sCpZ80cukB8fAJ48MPZI3wHW7Vf9egVKS3EO
76eEJYhGBBARAgAGBQI1pysWAAoJEAQ1xdJF3KZpeMoAmwZEvOS95jEKj/HnbFBD
Dp5C4dw0AJ4nsZgDnGDAG7FCEJI6+LoIIUit44hGBBARAgAGBQI1pytxAAoJEITk
+JQB5ZloGOgAnjVcqopXEyMYEZfF98STKmutKPiKAJ9xHmxZW3KtVSTRf/ITSNSs
/0gClIhGBBARAgAGBQI21moBAAoJEJKyepXkBBOquBcAoNljEbSHXMLH54/J4Hit
AsiI18amAKDrDLnxCzmC+8m/OTNu4mZamePP3ohGBBARAgAGBQI314yyAAoJENa2
+kuMjp8j2KwAoK9+TObp3jf+TwnPVIfXGkmHSbcMAKDo8zs+isKynXOMF2g50STZ
waWTHYhGBBARAgAGBQI32QNDAAoJEM024CF+PI6rjjkAoKo8mBja4lOGW+miluBh
3LiTaDNJAKDQrqc4kkfaQcVlXjDVYVael74oJohGBBARAgAGBQI4JoPuAAoJENXo
h0OUdhKzCAMAnRfk1mf0+yiUdMuSENhKMXyysZ2sAKCvMSdEEmGomWCgsQfLWMzC
LR7+5YhGBBARAgAGBQI4WM8aAAoJEHEtCxfQPYpPbZwAnRr7nX029eq1E0Pv9FwQ
rgs3Zu+nAJ4s25RKi089/avsVVqnm87egAzB2YhGBBARAgAGBQI4XUq+AAoJEEPM
0G/dqdt2qekAoN1HvYZQ6AxvNVLx3M06s/ytk21NAKDNn0RgGyCBiyQeLuV3Gkuq
xke7kIhGBBARAgAGBQI4YMPoAAoJEHFG8OMwcClIpb0An1H9sxwJF5/2bKL0HZsL
XO43aq1sAJ9z7U0cOGYNIrRNpHlJ67ZPJX0tx4hGBBARAgAGBQI4mP1QAAoJEGXc
QrfU5YAmi8wAnihZi/5OG9CnzMx1UKdtBAvvt4t2AJ9lX+jCeoO3TF8QykdMXSFI
dDHL3ohGBBARAgAGBQI4q/0WAAoJEDW6YX9GCEVakzQAmgNaF00/D/eOgHmtLEjE
0IH1H2yUAJ9EKs47I9s8U7IYJOGoQRy7LD1JRYhGBBARAgAGBQI4vt9pAAoJEC5A
rMtkcKsmHDkAoL3TIizomIuEKO6vwHMFcFndsaAaAKCJAkq+I2mjYimFE7ajlaL0
jyecGohGBBARAgAGBQI483onAAoJEIQ/V9estY1PhJYAn0hEgISY812GhhZRzuE/
sc5RWEd+AJ9SxHhtH0oJNrKcGYq8AoD9yJMGHohGBBARAgAGBQI5DSiPAAoJEFL+
72cgfnGZx5UAn1UiUx9sLoaeLeMtdmztURfk1ZAJAKCJ3juG6XKBMjLl4+SmCM47
VkM/9ohGBBARAgAGBQI5Rs0pAAoJEH/i7V71FDsqLkoAnivh01I3uQurWc5bnb7f
T1GIOmfyAJwOE/KCrJV89Rko61XC+20dlzKzGohGBBARAgAGBQI5TM2WAAoJEAJx
6COq/B+4jTYAnjOMlKc5tuqspHgAUgAVmBda5XNGAKCIqZ3Fu33suLyRABGZ+tN3
tJ1QZ4hGBBARAgAGBQI5Zs0MAAoJEEcWKRmClXtmuPEAoJe7siEXNYVflP+Glf71
M2xvkSa3AKCerd0dwvhmi4Ao4ujBnuZI4YUIhIhGBBARAgAGBQI5bedgAAoJEDLG
kzuo7SAfxjMAn2I7CSRyEz8mkaD3emaM1WYxvbb5AKCFOlNjoxNmu3SSWfgrW1EE
SYPQY4hGBBARAgAGBQI5kqZcAAoJEMfg9pSiTYtOVeUAoMTgBNUjD+AYQEzIU1zY
kiW1NgZhAKDW3GzsDPqzs3nF+mkMnggYPFnEnohGBBARAgAGBQI5tN9hAAoJENGO
Dw57qpD6cEkAoLm4o/nqc2SDZ2eKr5hYDTUfWBlCAJ9g8KJvMM6+/1tEPaolM/hV
WKBx6ohGBBARAgAGBQI5ypYLAAoJEJ853fBeKcbCFbgAn3PjBy25SYCXCOWeNg+H
ebn7Pi7GAKDKtfxnXigrcdNvARmZtWHNMzvHMIhGBBARAgAGBQI5zQ+XAAoJEPd9
ddcOjOSBz8YAn2a5jCk052U+frr+sFRQ1MqKmrxKAJ9J71OdRNZLefkD7ihJ2Ymc
o8Gsp4hGBBARAgAGBQI5zzSCAAoJEKZZdW0/TbZp0ssAn1qZ7PJCIHf6ErUG111c
5bWjCbW3AKC/3Cf/ZNZK2mKZOmfCCRn9sBBlRYhGBBARAgAGBQI55+EEAAoJEEQ0
VrKnu+CclHMAoNOx0T2hZqYtHoxhruXjMvAOpfHtAKCvYm+l6Yah/UuM6OrsKbXr
7ulq9YhGBBARAgAGBQI58yQiAAoJEOY1PDi4UosBhq8AoN9OP59IYJ+NQYJmpdoy
PFgJitPfAJ4tlu7qDh0lpQUBJKIrCjG0od4yIYhGBBARAgAGBQI6A6zWAAoJEAa2
rnqGiisg4Y0An2Y/8oNJ+Oj40zqQGYn0rCZNTbbqAKDmvIQiqEcdQn/SoIhELxW2
YZs+WYhGBBARAgAGBQI6Gfa2AAoJEL4aU+syO97mR7kAnjSX4QP7gR6x1BYTCC89
u2gSXAQtAJ9nReACgNU/D+TLqimlMS9TqnTyZIhGBBARAgAGBQI6QjVhAAoJEN9J
A6fJssLArhgAoMONOWaoVjK4DXsFNID5Zc/kvVevAKC3q/YHRHK92h4cWcZmaY7E
cuMP7YhGBBARAgAGBQI6c0fgAAoJEIj3xI8iNZX1HdIAnAug/Inx3NbV/a5vNgES
SQc3jWn1AJ4pu8BlA1FywwpMkIC6GXAWeHsoaohGBBARAgAGBQI6kBGJAAoJEPOk
M758VsXv+K8An0lw/DejITM3yqmem+l/5GoP3Uv0AJ9kDPVOHQq1JfJDk3WWz/jQ
vh3MdIhGBBARAgAGBQI6k/ROAAoJEGnBgyv5Otrs1aQAoNARp9b/2AqdQ0Ug0moS
RhRexiUuAJkBwZY54+uszs8Q7P+HTeSqWVi3zohGBBARAgAGBQI6ln0BAAoJEKu/
XM0hJhuIIhgAoP6jS+IboXddicsmt6kyXhWBYDJtAKDljV7NQnqWDBmdRzYW3CYh
/hvPyIhGBBARAgAGBQI6nlT1AAoJEPqlSVpCsy/Jc7wAn12uIYBL9WfhmS2Sh0O+
mIO2j580AJ9nJvBuz4q07lkgDUFVJQlruD1IfIhGBBARAgAGBQI6xKZNAAoJECAs
PjFYbhLlDsgAn0tfgJSaxWUd5s0ZGmKob7b84onEAKC15V+DRTrE1tArKxy/itSN
iMtQG4hGBBARAgAGBQI6zP4MAAoJEP2mrjmFey4hMioAn0UGCzQKKSmQqGw0B3x8
abYWUC+aAJ9cpULGVtTlggjdM2AEDI+LaYyaeIhGBBARAgAGBQI6ziMsAAoJEOB5
DjbKcLrc2aEAnR1WTr4J4dpFuNtvRTsEXbVcm2RlAKDoZbCBC9I+VuGCQhkK4Xe7
8bqNL4hGBBARAgAGBQI61vgkAAoJEJeJjZL0kb0h64gAoNU2VN5G1PryITJbB49E
xmAjcmRGAJ0crDTB0H8MiiTRPt4PaDf+sh9CnohGBBARAgAGBQI7FTOnAAoJEOTO
X3gKLDxeqsgAnjMWBiiEToG6ATHKHZhkbFh52sTdAKCi4/cu+BYrzhNL+KHZXc8F
bP49t4hGBBARAgAGBQI7GQwoAAoJEF4Gyczs+hnFZhYAoOMcc6W4Rg3pd+9eEtqx
ZHlDDIoEAJ9VG0vhxw9szHap9L0bNN3awkZanIhGBBARAgAGBQI7JUB0AAoJEB3T
gN9DaBQASVsAn28snlWv8ljqxPsS2e7xqJxzND3GAKCsObLMGdGyED2YKlu0sSa4
E7cE+4hGBBARAgAGBQI7PonmAAoJECTQzUdmDtvZdT0AoJwx1hvhf+2pMN+e0u05
bb0ebVfnAKDpZKStArdW8xS/idhP9R7UaHyZvYhGBBARAgAGBQI7ScU3AAoJEDec
kqFodBLoiG0AoItVFw4742i3VVL75rHpS/iRTyXXAJ46OJxgMvJ9knQ0l4so5JiB
otS/8IhGBBARAgAGBQI7Vf1SAAoJEFbTlPwk1QvEjPoAn21RJvXsS2r7ULpXtiKI
cK3/+9jYAKC3qGXWrrPZmFKAksFXo3rCyzQZYYhGBBARAgAGBQI7awLUAAoJEBd4
3VVgXTjQKI4AoKzDCRFCypusHv+HobIOrB7IIT8TAKDJ0Env5dzMRub+k88oAKje
3AyYxYhGBBARAgAGBQI7b+zBAAoJEK6vjC0HwEYDSbYAnjD/E6PAovkpDzSAoTzW
gmhIqOjfAJ41Nryc49NSfzwmHjHKA02eGmjvZYhGBBARAgAGBQI7eNsgAAoJEI/A
t40JszEG65oAn3gQAikxZTrE3G4YZbyI2SfWVE9dAJ9DR1B56JLQOBjHcVub0frd
boRnFohGBBARAgAGBQI7hEQBAAoJEFwx4sMqF2LdKY4An01JbxbW3DrWPwxoLaNc
K8u8rgnGAKCEF+4ICy2QiFUTOjXVeevFwKaKHohGBBARAgAGBQI7kOZuAAoJEFwI
fke31CB7qREAoJ8lDAoLcN7vtSgtx8BfwRMW2Q0qAJ9Ru/GtQglsVha+XrgC1Vzd
B4zqT4hGBBARAgAGBQI7sbiiAAoJELBm2s/e4NveRe0An15yU2qDEyVxOCkaof5A
J74yKDTQAJ9ZyEiwLE1gQKuabrs/bUL3yvDWP4hGBBARAgAGBQI7v1c6AAoJED/O
KBDjNrEGu8wAn323cSQPxAIku2BOJ6Ai/T6EWuaqAJ4xOQHIAR2RQNZY9N2cHXIS
Ehu+oIhGBBARAgAGBQI7zECMAAoJEL6VZu5GV3J0pmsAoJjHoGQYZnqA2nkkD82K
lFm8ypDtAJ4jDyaF0RmkcfcmpjOA9LOg8rp8D4hGBBARAgAGBQI73t7LAAoJEIeo
vXamM4UazXQAnjd2m9MQaZ8q7mVBxEpup10sFMZwAJwIJvIeB+kUppNTea6ijo0w
pCuF8YhGBBARAgAGBQI7430SAAoJEB/tJKqSZfr7xIIAmQHbJSna96OkNqDCdSQl
gm0TAoPUAKCByEtRAOO+3GtDu2byKOXqqQQf9IhGBBARAgAGBQI78y1IAAoJEPFm
QMK+QtymtcIAn2rhARKRI+Ilaf+8NmfX64/NsFw+AJ9LFE0WZD7BSPmErPYKtH3q
4nB304hGBBARAgAGBQI7/a2UAAoJEDdpZyTeGKgb45EAn3Ttnv2G66peIp6Qd0LK
9HyHMG52AKDCEdDCDgpOp9xE9y3Qfy3XaeK2johGBBARAgAGBQI8OvrmAAoJEH0J
HgBCHFE0amsAnjzZ1rzTcQr1X5FVcQjlkqja3y0LAKDRr652u3GCVSTU4TFj6//+
yKrSSYhGBBARAgAGBQI8WSziAAoJEJgXkxOJvYru6ZcAn2aTbYiVEFX814lG6qaS
K8LanQOjAKDiEB6Q6EF5ZwG9NqIKt9CxWCYzY4hGBBARAgAGBQI8XB4lAAoJEC27
dr+t1Mkzbv0AoLd0yc8rHrSTfzvXAMtQyAKh4HuMAJwPgqYNdOXUM3hkTHipMN72
v2MXcohGBBARAgAGBQI8fAA1AAoJEPJk0qCezPAhoGMAoNE5kpHw0fI7yu7py5vD
+O1nYLdSAJ49Nt+hkrRCdJeiwTRhw3S434jADIhGBBARAgAGBQI8iA8eAAoJEKO8
fk+VSKRRLTIAn0wHfcDCzH7lVwvdck1DE99ZKp3UAJ93Rnr7Ut8FiWOsgaSjEYOM
/Wn2bohGBBARAgAGBQI8pwmAAAoJEGFhpSo9Vtc9TFMAninforCqZtGuJ1zaipXc
9sIicMIjAJ9bsGgNfFpkIaOkhwoYcZ+m0kZkLohGBBARAgAGBQI8xSCzAAoJEOnW
IbyLxfYrs9IAoOYpFNtlaOU4mzgA9q64FU+aRCejAJ9LpWSYdz9FQStASLILJYYH
0cj8vohGBBARAgAGBQI8yc+PAAoJEKmGnWIe6RjWJ0QAoJ2nEZs/HYmJ9FF1jn+l
phCnWZOaAKC2cRtAnlpSmgj2fWWtzBPAjMRulIhGBBARAgAGBQI80OgmAAoJEDFc
jj1lbLW1N0sAmgIlqOJ3G3EE9CPIJ60xVH5+//Z9AJ9Ou9+9E+Fze6zMB7Vn7j/L
AzsfwIhGBBARAgAGBQI84DImAAoJEEPaqJTf81JOjJkAnjo8IJSyn1RDc0C/SByu
ZlqSRjjRAJwKxnmGh3EMe1ZVtO3ZGe50S7Tda4hGBBARAgAGBQI84PTyAAoJELoW
FZDMNQMyLZ0AoOAdy099LVvSlHyVqjtRc3RctixdAKDyxlwDweoBvGYQpsT6iqb7
xPpkcIhGBBARAgAGBQI86d10AAoJEGsY5C12UxliJoEAoKgP1pbGf7WFJR8q3Nyk
HoMYoirnAJ4k4kusg6EL9nt/WBcKmzWDO2sEs4hGBBARAgAGBQI88QRCAAoJEPsP
OnXTORgQ0a8AnRcSVlV84X56jTnSftapXggAxG/yAKCbIogHWD0SrzV0DXgjo+AE
IuYXCohGBBARAgAGBQI88l+3AAoJEE6prRadbVuu/aUAnivV8DalPGw3QcuFmpBK
wSwEMCY7AJ96Mb0eJVCmj/+nbtDIhXj9ihCCAohGBBARAgAGBQI89JjcAAoJENOh
xR3NTfIFU0QAnj0YNNd5gZNHfNmIb1jai+5dgSX2AJ9bovKcoZIZxeOoFPpmlF66
WIozL4hGBBARAgAGBQI89QC/AAoJEE6prRadbVuuw40An1sLHPZXu05p4/wqDnqN
bECMZ9QgAJsFRiiz9IbLbtJ6JolVDGHpvLrrN4hGBBARAgAGBQI89QDzAAoJEBnb
ZojaeNCo04YAoILQe2cG58KsPTSyIkKTg+mwkQouAJ0eCgjvNWrhPHiSRnegEsbF
o4zsK4hGBBARAgAGBQI9H2xgAAoJEGHsr3XM5FOYekcAoMY+mIbdRh9YTGKrskfW
QQCQ87bxAJ0ZZTr2iwukIOXW8ryk4zlD72ZWi4hGBBARAgAGBQI9bjqiAAoJEHLT
tWP+y1FLj0kAnjGZGzl4VHxvUa+c4gD/GMrw6wgEAJ45Gy0INAp+Rh6NJbNECzjH
OFjstIhGBBARAgAGBQI9cUfYAAoJEFwRFAeEa7Skd/AAniL6ZGAUqQGs8siu2ia0
SnVoLBQyAJ9DrvhmP3aaZf+/GwR8Gx+Lt7uwTYhGBBARAgAGBQI9eF2CAAoJEG9K
95D+u1J7GAkAoIVs4Kxb0R7luN6Pi+WhXNfii4QbAJ0UZLJ/ySM8ZbHnGTUNIooe
ecnLjIhGBBARAgAGBQI9h9ZMAAoJEMR6qYKMZW0ODu4AoMMA74PG6QjDICxdsLWe
hhuJf3VzAJ9aHtt/ld1W/DTWSjdvH6AP9g6ZeIhGBBARAgAGBQI9k3U6AAoJENBl
k7NU+gyIiCcAnj46+kM9W4dDxs0dqNGCOXfzfXUjAJ9DWG0bLQ/tixVsWApUHTd+
ffQM2IhGBBARAgAGBQI9p/iCAAoJECxm82ySywptILkAnikhz+yOxNJMNnj/aB9C
h4i0fQmUAKCHRje8FE5DZSPWf+OwYcixOm+TxIhGBBARAgAGBQI9rwp0AAoJEDxV
WkwvmGAIsxsAoJgH82l8l5GRGwXBl26AHj8ZA6zaAJ9bKL45L0jyrSRF1V5FPLxY
twXDe4hGBBARAgAGBQI9tsipAAoJEIIYfzQ7kw7P9UAAoJ4URNsGaPSQkTSKLO9E
rSPkRdHXAKCynlouXdSQ70FBn4j6mG5I40cnGIhGBBARAgAGBQI93wWnAAoJEE1r
ZOIZBCWd+yoAn0IBXJN0bR73EG7dtOPB4Vf+MIqjAKDky8A5HD2DHDrED/bCDDBG
JeS134hGBBARAgAGBQI98WVmAAoJEP4Xknlj8hRJ51kAnijQacczGC7jafSF5un6
nRG65a7kAJ41Z8eK4JMaTNVLkkM3n1e7hh7RAohGBBARAgAGBQI+n5+UAAoJEO5p
t4fBbO/YeOIAoJA3UYEf9kntgTFeNY8pOAnCY4ouAKDjI2BHDR3zlcNPNcaczJO1
Uvxd64hGBBARAgAGBQI+n5/CAAoJEDBJWXZ7Y/q9XWYAniEPJv06FUNu2iZr2eON
fn137TmAAKDQoEEKk4kZ8bYxI6HmRRbBU7hQTYhGBBARAgAGBQI+thg2AAoJEB4q
exxFM9Jns00AoIJMwTx+2aRpo3WNCdulrRUzx/ZwAJ4waxt3zbR0M15kEF8mlB0h
198mOYhGBDARAgAGBQI4no7wAAoJECShvswraT6/w8oAn0XLPn0F4s9wQ4pGXNPC
m7MJ6E5zAJ9CbanRlaKAXoD1LP5bmADGkRBqfYhGBDARAgAGBQI+1KueAAoJEK4I
uPUH3Hp+6ngAnRTP6a9ztIe15H5seESNWjlpGzBcAJ96No/FG7JY9qHg2WoJs/F4
[...1608 lines suppressed...]
RQCdGaBGlA0R0Bjjldv0vEBtcbVB/BmInAQQAQIABgUCQyCv0AAKCRC0a5I7bYq+
cY0kA/0U+JNuaHih2INmjGtIyNtn0uLR5OVxpFDy9fvh1A/PQIcnv6Cznf0+/1EO
pC8dO6HWQxs6d1n1ZK1yDPc3boyLjxLLxuWd6B4xM7HsjqvBvW2fvVFcpPioawST
63swdZIWdvz5c7a3SOSipeuepxyutXLiLfcCB5HviXbCkYf4+ohGBBARAgAGBQJD
ILAFAAoJEMWvd0pYUQtaHroAoPk4cr3Cd0eUk1ceNnoBMeP+281CAKDjuLEpyr2S
4txh6EvT+jz0PfWJVohMBBARAgAMBQJDIUxxBYMHN4h3AAoJEBSp1Git8Ip/wbMA
oJemraY1wFzUJAWsY3D4bFxLppX5AKCA+jLM2kD/5oRZbIqSzGtkok9ZY4hMBBMR
AgAMBQJDIZVDBYMHNz+lAAoJEL/r08ZBzwMi8KkAoJ0FJADGDhigHpm7dLEoRUa+
ZpxFAKDFQvGvWe8G3qCzb/LIdyzfIJ0hzohMBBARAgAMBQJDI3VNBYMHNV+bAAoJ
EJugk2taNf1CygoAoNAK8rnU1FUY7ZJzCgw+ZjtzL3jEAKDIwfErE8XTv5PP0sJM
CUJhxf7r4ohMBBARAgAMBQJDI3gFBYMHNVzjAAoJEDFIu+8e7yb0pT4An37QJM1Z
P++YHev7oYJknn57POoKAJ9lOdPWCuFuiCdPM9L4CvAUAeGd1IhMBBARAgAMBQJD
KKE0BYMHMDO0AAoJEEk++45dZPhw6PYAoJf6zUL8WFtgMLXr7gYeknvv8MJ7AKCL
XLi8Tu2SzTIc/PeFUqoLeSUoH4hMBBARAgAMBQJDIJ3pBYMHODb/AAoJEJT+3vmt
NrUVuFoAn3oCb9Z5+SeuRbBf3F4jy7oXa4ZEAJwIVmjnLrfaQvYWsNmTOK9Ao/Qy
TohMBBARAgAMBQJDIKhFBYMHOCyjAAoJEGxk7XjeNO+hJh4AnREqzDeFWvNqKJgz
LY5MMDPmqE8rAJ4khVpKsCn4zTTL88oIg4d7Q52gSohMBBMRAgAMBQJDIKH3BYMH
ODLxAAoJEDA62eiAWc/cOX0An1VJdoTDlAW2y4cxBiiqPbvwYzhPAJ9SFl+1uI/T
6PadAFhV1le5/NSTB4hMBBMRAgAMBQJDJCP5BYMHNLDvAAoJEHw0FqlEG6/3e/YA
n0xTVNplMGLfwL21U4uztcQo0C+9AJ9XF8ORPSTU3jzv6j7q+kBRwZpz2oiiBBAB
AgAMBQJDJcl+BYMHMwtqAAoJEA348Hf+CljYLmQD/2aFAfI9tLHiBvHkYX/GOJ5V
9bOhh5/9y1ldbd7mJZhYm4gkTxd/4TeO+iOFj4OjjcvGYfQo6O/B7n3M/VVNcpdJ
Cd+GjUvqVucwtEJu/Zlejx6T2zAjxpZxhVAk9U1iQ+tVC7ld+PEnLoHDsEI1cjuO
SDVEh4S836xlym5CtQGBiEYEEBECAAYFAkNfjG8ACgkQ5XoO79RjNtr/CQCgvQam
DsV4gii8XMn7N5nViO1J2mUAoO4AtHtN2l2Imsrv+y4W8wtpFyKEiEwEExECAAwF
AkPTbagFgwaFZ0AACgkQ5klUNHCsE9WrtwCfSFV3kQnpq8TEP5Sd15JR6zHawLkA
nj7OzbtoOwobgeWTB6NrVOh45wvHiEYEEBECAAYFAkQFyuAACgkQ9Jgd/vNmD1NS
6wCgjFSuWKUMECj8lq751xuRhdES0BIAnj4nvo+sxUykCpiNdGmD/kv8BR76iEYE
EBECAAYFAkQGZN0ACgkQIIdHgCGsbMShDwCeLNGiHENHdyi4L+ZDohBWpUvzlLYA
n3Uz1vuofNQ3JakVjyVqOFESowMYiEYEEBECAAYFAkQH63kACgkQ3HeLB051S+3p
LACguWszxmfMO1IxV+HtYaxfhhogv1YAoIUPRfY0bNGfJbcpeQfr+CcDT3hziJwE
EwECAAYFAkQNdgcACgkQpOAUxG0aO7HMBAQAlr0rX9d3DVtkoWDnJqjtxd2AEGIv
epBd3bH4vxgaxlKHO8qF9QRJk3TMpp+AketiERWexrwsu3HRsINee/9gb6lkVkxS
uTcSfn/NXT1fFLxyCEzxyhiC9nwKObj3JPOMRnJiPsET30aZ+K9/yfiuUfEUrDly
gZy6OfFa/jY04eKJARwEEAECAAYFAkQG/cgACgkQ+fnDJwmNErObegf+JtFCMTbg
ewZ4R+qmz7WWB1i4zOPCRe6O99EexdcXSOAHZ4r3oLiXMZEcjCQKZ5Wpz1TDqsob
VkyW65Ws5UwbiTs1WO/WI10dHdp9Vrv+ALhsx32amwMV37qrA9RCoBIU0QQFVTMk
Y1W4iLT0Myd/0C0VCHfMrV1S43ZPDQaC7V3yh1KCpZzjhZGTIKJSvckWjyTsUW2F
vCusCakX2P/GoSs0oF5s0mSl3BvlbkxlI2ZzE1bNfVIpqSDR8jT1r87cwTJkEH57
e3PrO3DEbiQTHjbyuwD9kNTTnV2oGvVWPF/FvsFBk+fln1yECv6SIpALU1/zVzG/
wZyP4MwTIOb4NIhGBBARAgAGBQJEKFdaAAoJEBH0xB6z+64zBhUAoJ6kWu5gDqHB
Z8Wan0YynEZi6tKyAJsHBacxx6UNYPENlVXlb0xl+kssa4h6BBMRAgA6BQJEXmVA
MxpodHRwOi8vd3d3LnNjLWRlbHBoaW4tZXNjaHdlaWxlci5kZS9wZ3AvaW5kZXgu
aHRtbAAKCRCUj9ag4Q9QLulZAJ992LLlu7wU5sJddqnffDzPoKh69QCgoX8QzBEi
SZjLKSrALwLCTYI/akSIegQTEQIAOgUCRF5lZDMaaHR0cDovL3d3dy5zYy1kZWxw
aGluLWVzY2h3ZWlsZXIuZGUvcGdwL2luZGV4Lmh0bWwACgkQtHXiB7q1gikU0QCf
ZM81Hr4p7ZPwxMZW+TVcRdaSIjoAoMq7mN4xSLtRsB/lGlFLhc1O4soLiEYEExEC
AAYFAkRc/SoACgkQiqNir+lyMs3HBACfb7fa3KzNGB9Oma3KDWeC42feCzAAoIfF
w3OXxtigxx8+AowiXGsZmqI+iEYEExECAAYFAkRc/TEACgkQp99YcnDUTCOrZQCg
gV7PoPMl1d+gvPTiuUAZm8UG/dYAn3PlOcTP4vxayC7OGSkoDA8Dut+KiEYEExEC
AAYFAkNEG6QACgkQ6tS1kPaJm8DI0ACfRfci8SHm+sQpjzKqr0zxfJT5yF0AnA37
mn7nQyY28SJ2sddCo/f1JhvAiEYEEBECAAYFAkQFglgACgkQb11ZaBzVLeiG9wCf
aX6+h8bpMOraCn/sH1yQb6aI34EAoLzx4H6lGdyqnQTYiLXSrBTrto/niEYEEBEC
AAYFAkQGCjQACgkQmsnSLGNcY0vZ4wCgvBjcB5ABcNYRMEFSWsClxhaRAqUAmwUv
MA9NWdLk0pcUndbE3w70B5hUiEwEEhECAAwFAkQGKycFgwZSqcEACgkQ3+ZXkjKV
xc2qMwCfdew+RX+7ultYmO0Y8gRoLJzjBfgAn1UkZILe3+NKZBJTd1ZowJQiljHI
iEwEEhECAAwFAkQGK2cFgwZSqYEACgkQoOUVvzmICVQuFwCgqbjde48qPvUqLEip
he/zFq6pqgAAn1dXi6z+1s+bHavwCQK/q+3K5gdHiJwEEwECAAYFAkQNdesACgkQ
/dJ0ek5GOmrWRgQAoFF9IdTs5vX5OIDKIHW+d4aJfPg6w91SKkfpElDxNqZuk3rA
HvekwMSeCapKjyUajgKA4hHLy51cupdJPrz01uHO8ySxVaHt7f0qKXEcMXiEFP64
aEi+Mhx6TvPAE79tJdvgSOnUWqtckaEJ1oY4+J8kEvXP40WcnGynIPDVB6eJAhwE
EAECAAYFAkQPSJcACgkQGioH6hxXudkA+xAAruFS7PuoOVGB2fS3Er4O/NaT7H9h
0TVpGKI8JiE35+CCEbxESuIV62M23fqipD/Xli3XHBoycx+DtazmYSCjCp6yoKWN
XC/sm+oTOKFT0y2tQyPJ0cu4hwWYYMPbL1QIgtlIeB1TKEd3vzCt2rf/Xlod/udV
7KFQ6V5ZJFkrDnpwEmlL5RmfE2rW1EL7oEc4VfbbgyERiJP8jxoqntTkMFR6LLdb
NXhdnUse2BsVwtNgpcStrDb+1ucVj2BpsDNjTx+mPBUG3KgirCazO1kuu6qTMW/P
0jhds5TU5DlVrCaBHiCUotcKtVCigruNqosNRc2aCKXWnaJUpnmSaHBCN7wWey2K
BqPXPjC3LOR0olqdFuLtXdzMj4lDdrWfFss60ABcxUl8LafWYTDTiVTXQLJlv8kH
XY2bwNDyy++Ybu1wBw5ODtUBtdrL6vnIMm2EzrxFMi/jIP+lBVEcdSS3E/pO859k
UQ54mY3/JTKTpOMWcqLJ1ujNn5U7lRHBBCJzRfIfQL/xXxFVkq314AgguOmylOsY
+KlVngmeTD0XOAgWg1vwDEw3vXRpwiB66QCOLYoAcZzhpvWlmrTdCVWXQlciSbP0
1jG2BNN3fWa/l5ok4s60uFhcLnhpUepzuq0gHzSgg2H3pWlvVaO4KQr+3N+o+abd
ngPGs5CQufTiYTeJAiIEEAECAAwFAkQFDZkFgwZTx08ACgkQbjbvGsyNqzB0zw//
YgstKNU1LGBbXgrwhJM8Qg/Y0JCa29yMMDr7iWnEP3nRft+cNgU6F58Qq/n9+3i6
SgpXFBtPW1UrJnZHVl4ykDDx2dQf8QwjAPcDAWs/yz6XbRihpSD3FBuclgnMCbrr
ZpDAnEAFuK/Z5Zj8ymsdqf2Mjgth9ch0qbu8Q/SKAUhYZPw/07s5g9ie4CrNu3XN
IjlCW5myPStcP8swqIcCJRbB5VvY7q2dGT6tFD3KbpLEn0Ur7vX27dLgF7hx4F6e
g+ZIta/vvHKFCV7UIA4qe36K9brv4LwOxs+ftFRxJYLW+UnNbB9x9ublOk6V+cmc
ChlGvdxFd0pXskvHT6+XBawnmrOvBy7zDiZdMBodHL0SfoswDRNf2/fkdmKhURDc
9PLtfPzuloUmxaN06IIA//kFXZzFFS1Yjq6tWQo6dJKPRvsYlQPTz9t2nWF1dOfs
0iGhW7lR0NU05auSqzgaJUQytIZIr5QoKHx0Zn2nPh2890/xgJ2HamiaQQ0aT7tz
w+ox+/XgG2dYuKDKW8ki2WAehXYVGNEtDK6YJmfdbkbUww+Q478g+TfnKQ6w8VS2
w1jqpg3656jzWZg6wUiCvhpnyE0dZD8J8KQwkEnFNc4TcdN5BEmWxnz6JTr3gdUA
6DmDi821xLkQDndOvd0lbAlKoDxascWP0aTBciVlAvCJAiIEEAECAAwFAkQFESIF
gwZTw8YACgkQHRqO3OFAoFSLYw/9GFOeol/eGOQotl7lOcffMlaTUdI/PIvFvoAR
/8shR+za0dWqKzIRARn5Q9pjmNcuIHWlueupA+32mEqP7a4IhZF815k26kPJ7BWC
ZXjEF6tU/clTvgOsqBk+E6VazL96p8WzvFWvO9jqNNgX+ACEq6GA5z0sO2XrNdnI
YE3t2MsWebYbsV6jdyaIbjatO/eZ62kbYn9pDRkL5UULyYYDJUB24xbZK0xoFcem
GGs+rzm9Z5Av9+F25bhZ84S11KXcR9GPoe4uW7tMEI25y9FKr/+PDRUhGP7KnlvA
/x7hfUnlPbmhZlM4Ewhu0GP3fwzVXzh7ExdfebWFQhDluz8Kio3UvZI99sSqB8F4
ICmexnTXWsyKTYsU1b24l6RCzss8NUjJGZPo7bM3Z6cFsdPtJ82j00CLuhgB50BM
I+df96iKhTeEn3pN/whqLrrIIBDxw0DeebRxKdZnXAjKHKwGOIqKepEexr6y7bi8
Xos/swevSNEIdx+EtU6gWDI5GyT0sNePAtf1mr4O5zGr95XrZ3Kf84BrpUTHCkiz
neg/kirnnW3Zn7lv7i5TwJlK0jH85es3kWYbyy5qbQzmrMvOqtw8IcQM5Iny0I6v
TCDh2hzmGUEpPHJQf79LKb2HFg3PJAy/qyWOiGk4C9meqmpJFSy5UJhd4yAK7uuG
iMz5etmIRgQQEQIABgUCREihKQAKCRAFi1rNRBxfgangAJ9+uYWIpLFlxzA0ecaQ
xVXJkHDj6ACePdI2VJIxflo2IzVDZR8E1tavH4GIRgQQEQIABgUCREjJ/QAKCRCn
L/ZsQr1kXR7pAJwIKv2Qqa+/+462dqU61HjyYD6cIwCfaVG6OEZVKvyxF39Y7dCq
okIgk5OIRgQQEQIABgUCRFsJZQAKCRB/3j6P8z4/xjliAJ0Y9b5gJ7AMKwamZxfo
7vUpytH4bwCfRVVxusRKkqgQ44Yi+pEZulMkfpCIRgQQEQIABgUCRGCHygAKCRD9
AQSw4jPImMrLAJ9gxkxh4oIcJM5XEYvKaYxO1r8RbACgybXZPUKIjB0D6VGea8TH
LJOV3kaIRgQTEQIABgUCRE/tdQAKCRA/0h0qmjpVWLDwAKCcTi0jyFD2d/MI1NZd
GYBQiJAvsgCeNHNSZjWWHuvz68YF1ZyaZzLvzZOITAQQEQIADAUCRF3UigWDBfsA
XgAKCRBbqJPk7D6Y30TkAKDHS7wBh5G6EPPMC16vNJwOIgfrNQCfdLK+e71M+mz4
sgzVEh625NcGtZCITAQQEQIADAUCRF8XTgWDBfm9mgAKCRC8EAnaDpclP5j9AKDB
VPkHkPJOeLTvpTFU49JloRL/ZwCfYMniDkE2yjqPyeAe6WLat+nZfJiITAQSEQIA
DAUCRF22QgWDBfsepgAKCRAyNS1FZ/eCZBq6AJ95fp74I7lRx8zt3B+WjWK19bWd
5ACggupHyHoQEEm00m+7UgEGmuFMHHmI3AQQAQIABgUCRFC2ogAKCRDR2VIECemh
1f+tBgC0TjA2eTBH5WfFG7N0+XvHVj4SZnRJfj5k9WM7NyVXAuBRHqRDClz4o+7t
DI7XnpJa6Uf7kI9iabJ7gMxEcXjHstKz1LhycgpmEnCqvVHWZrYfudKqzVfMt0t6
QEjDtDR8ccYUoNYRhNBFovSHQazsEIISIk+I0nm/l6TOREI80+qBSsktW0Pvd6lg
BkjHScDk52hXeLd8BQfpfIDxdqAFyW0wC/2lF0jYYC7/FZXpsAFyTTZXeMCZ+vSy
z3iLTyKJARwEEAECAAYFAkRbcFcACgkQZ02H1ZEZDvnadQgAyHXaBb3PpaZUlvA7
wb1nAua+LO7qXSR5jLsLl71iWSzfdViqtGVjlXSrsCB74QvSxcRHtpTFqDN80VdV
oGwNfLPOVUWOEu/Meh1EfugpD0rahwae0FCc0Tu/RnAQbibN+I5SdNKxIPKutCH4
XdouoD7gSDN4wNAXrHatSxaDTHRpu3+3FNOLYy5NgAPzJcchT6/mQ/YmwIlEped2
AdEfuio2E/SFpR1y+p3xfqvZEZ9iiX5QKr65fmazBksDYhqR+sGwtjqQwifMqUUI
tnzUTHQH8IQU5aoI97DCMOu1mlrA4NhNXqBNRC4+CWm3XGgQc6kBnL/qF6syeUMk
z8gDlYicBBMBAgAGBQJElY7IAAoJENwG3M95JPpzalYD/jp8FsIDlMIoNhHr7+sN
qbexeYupQDeNNqZUSvVFl2OsIY9clsWAioWHoQtBTZQ3z45nVV6RRVK15+tWdXSe
EoTQskfdS79woeq7LgLTOB6yLjjhNgG2YyMwBw6eqC97/FpNqED101n538J75XZ3
9v8fMErAz2GEMrT8lLgj5UEuiEYEEBECAAYFAkS9UTAACgkQxKXVjqqse7yTbwCf
Vdx7ZbTonurIXC27+BRl8eA4HXIAnih67tYrdols1F3hxc5WGDNuGt9ziEYEEBEC
AAYFAkS9Os0ACgkQOOnzljbgEa/DZQCfXp8cAjuDumQJJHqJsF6xDzMxeYUAoIoc
+HbWTvWAyUAJhezqfSTxvvfkiEYEEBECAAYFAkTCe3AACgkQQggFxokHT625SgCf
anHG7BMHpCjPGl0K1A2jvk+UsT8An1blZqLZfsQFqOwp8aM3lYfXgQDtiEYEEBEC
AAYFAkSNRGcACgkQp6+YGoOsM0oNzwCgxLPbVnWls9geqVyjZxFalLvWJDsAmQFf
76bS7JiyhQ5adD8iXhW0CKdziEYEEBECAAYFAkVXpxYACgkQ9LSwzHl+v6v0+ACf
TH2UJ1s11ygX4MGuVJZ1lXEJ9LAAn0gk/Fga/IEJ2x4IhchMw8xV8RvdiIEEExEC
AEEFAkVbWTI6Gmh0dHA6Ly93d3cuZmFicml6aW90YXJpenpvLm9yZy9kb2N1bWVu
dGkvZ3BnLXNpZ24tcG9saWN5LwAKCRAyNXpF8ejm5IczAJ0S/kd6+n9RtlhMuXc8
ij9XsTV8nACg3/CDXfU3mo3eFY8C6taTFUkT842IRgQQEQIABgUCRex7sAAKCRDP
6Ei//GeFord7AJ9OTDnZn4UoOMI8SMhMSQG2RwZS1QCeMo4+3rhFWl197wQUISSa
UbEymqCIRgQQEQIABgUCRe3kPQAKCRB3vlkTd0nZ2UACAJ4++JE629pGiJZvvjgY
t5Rt2qYciQCffDOE5ldc8/vfkY/j3g9qjb3+f9GIRgQQEQIABgUCRcPBPQAKCRCO
qodEOSmdMQ3xAJ9aoLpFPtuw3WO6xJP4q1bzOIDp6QCfVHhJYiDBcTQbnIeDeIhW
Q0QsznOIRgQQEQIABgUCRcPBSAAKCRD6RGIhxCQl7ZtEAJ991bKoauaANbLu5AHJ
DeDZqbDzrgCgoF0R9fuJfcOIToZfn8/TgIjCcX+IRgQQEQIABgUCRcPBUQAKCRDU
BjIcB09ehLwDAKDHaRXarOBs+dy2YZLP+ps6J5GRaQCfcBs4PbRdyfPExOmzrJjK
am6x7EaIRgQQEQIABgUCRcPBWAAKCRAtCXF4Sgiq3wDDAJ4vdHpx5jfxVjZK2b36
e76o5ciwVACdGIdCTvt4T64gkukks+Iz/L8brPSIRgQQEQIABgUCRer2xgAKCRBO
OFL0w3wdCTQOAKCp9dc7VBEMwSfoUzVVOutO/C8AVACdEHrn6/W3F05u56dkRMS7
9AByuSmIRgQTEQIABgUCRVg8TQAKCRBU9GFq67wvJiEaAJ9rLGAkAvMeccqYFBVm
rP0aMvUOwACeM7QuCLlRy1Vj1aITHzFceHp5JjqIRgQQEQIABgUCRe3bCAAKCRDR
lQx2FhPo1SIpAJ9Tx3e0bx91LgKzod0R0uhRAMGHCgCfdJ/t6r5hBZIAWM3AFWaG
BGVJIPGIRgQQEQIABgUCRe34FQAKCRDemKiKLdsArEpKAJ95NIcqjpLxNwWersWD
IUy0m67bRACeOkaaI/i+HL4XTtQUPp3P89TSbN6IYwQTEQIAIwIbAwIeAQIXgAUL
BwoDAgMVAgMDFgIBBQJGtcWRBQkXLil/AAoJEF3iSZZbA1iiYL0AoI5OdGEa6zru
BXaT7wrZLDK1gOpVAJ9xoQkq7wQF3SzHcXTbgZf9E3CdmrkBogRAXdpPEQQA/1KB
8hsg8voFDWeqhuWxNiiLBY8vjy4Fk+OQN/LxexVHlX1pFCWCALjHj8wPcinkBSBF
4js9weenibe9xUtc+X7/uLuEDB3ziIrOA3wjxVbQR69+Vw2budtYSemNobElYVuF
IsjUOaqdp+hTydmAanZCgT5+WAYN3nn0LdKIdFMAoNuqBLcQOFNvB9L5sCFbleLz
/YI/A/0e5565b0z9zK3xS+WIuyPZ5gwQjLsJ5Is7Xdd+eoKNyccr5vn38AN3312k
xqreAqPsCPVEixFXapYMmkM1dXE/sLL4XPF6VCzK09A5XwfwCQH5GCZLJ/GU1FSQ
LexBTqNH0jCY8PiIHl+n9KpSmf77vtMACteqx8duaWfBy5TUQAP+LsISHEsFhLU3
vuHDEvwNYKqOmL7U8ob7p1zQFAUhTe5SFvMsZ+oShtQOG96qC2Wy+gRn+VHxGAy/
+46NcSCIBNDJMRruzcza+NeWkuNePOSWZrcuqZxqbd0R//k5HTbJmJ/qE9T/Hx/9
VCV7SQo0p04JXX52WjxokfZQhlFEi+2ITwQYEQIADwUCQF3aTwIbAgUJBxtWAAAK
CRBd4kmWWwNYoiKoAJ9/4y+YEsZIEDQ2R0r1kHd9NLMJ1wCgusn1Bh7b68W7ZZgZ
k0LnEnLZ1vWITwQYEQIADwUCQF3aUAIbAgUJBxtWAAAKCRBd4kmWWwNYosNxAJ90
WHb91jqnxLPqdLm1/HlqQ6qY8ACfdj8+liZn5sh+gVweXOM/GYj3e5KIlwQYEQIA
DwIbAgUJBxtWAAUCRHWsHQBSRyAEGRECAAYFAkR1rBMACgkQYHhOlAEKV+3ZEwCf
VeIv9sL2EHJkicIlNoJ3xZLyRgIAoJ+kBbAsjGR/AB4P9Ej7anTSdB+8CRBd4kmW
WwNYorHtAKC5zj8eISzrgTLmnpiKHLrtfwTRiwCdFcwV1dU/vDDy6V2WM+IPVODK
6um5AQsEQF3bKQEIANEoVLSVnD/YxrBL3s/edXK3YUX1dZvyyLtP0mCX41EX3e6p
Q4gLXmze7lJU9zB0iGgbTjBgodMsqHIECMWnhrN8uaIgEMOnfsNjdIC0lPpOyBQt
H7IWRdtG+4g5Tk3/RbHOsroknCUVUTJo9fvOZZUowKP5IyPYWuaW25VLRoJ/SKje
f3ttQC+5Td2CNMWgepbjTXuyZ9sThUzCctiLf/VJL2zTKwozo/HnIQzehCI5b/2l
LjzBIV+zeVeLw3UGKSA91TkUUD7kEZJSHHIV/6Wp2PBwHIELstPd0KsV5ZA4vRR5
WHrAbjw7rePyO57uZ9Ob7nn25ecP8nrk+IdxlOcABimITwQYEQIADwUCQF3bKQIb
DAUJA1jvAAAKCRBd4kmWWwNYohLWAKCgnbPg6cDR1W3tkz894CwpcDQoVQCfcBXf
K5kpfhYfDk+d/mwuYXktSSW5AQsEQ7gWIgEIANFah4LB/iVUglBqEzvK0VG88yuR
JlDLTvb8jr/hA8qxocj4eegHw+NOYGnIEMsrxjo5/djWE1vvvF76baD7xar8FQoe
9SLUX7HOzOmeLG0yv5A6LLpTuQIkDp8a+rSqbOtcZy/mteka9bDJl/KZMtbhfZYq
A0vxuE4PLS4n1lH9+GMTuecgeAhuhKcEBQ8cKwj0EW6axtTwUqwokI4GrOIcTIMd
uLHu4/oHJiyUfa1TD1Z1BTxjOjaZaiOCFemMTtRPS0BvhA1N3C6suCIQgfm6awzj
d6WvX/ad3ToqKBBf41HgyrK1H7bwm0QQq9QvAlmmYTGzgH44HjHyX7otzT8ABimI
TwQYEQIADwUCQ7gWIgIbDAUJA8EVgAAKCRBd4kmWWwNYol3LAJ43JG07X/IjKI2S
i1hF87nLfG4ehwCcDIDiNrFrvTaxGziI9H9ZYmQyASqYjgQ/uRN7AQQA4PCjWWzi
/vMxKJcYm5eECcScwD2KanQ0jznjMTrfuwkJVmKiqZro42kF54x8pQMFpcEBOrKK
KVlcp9JEsSjjyN0qE21MEYIweAYxJQXOGlEGZHimDK3C7stXtNMRJ7EFnpLUWUbg
eIwNDLnV8Locjpi20cFm21GdUgud4VefnOMAIPpvtYO0MGcxMCBDb2RlIChjb2Rl
IHNpZ25pbmcga2V5IDEpIDxjb2RlQGcxMGNvZGUuY29tPoi2BBMBAgAgBQI/uRN7
AhsDBQkLg9oAAgsCAxUCAwMWAgECHgECF4AACgkQMQCenzfZL/vXIgP+MVhiaKzD
y7LeeVXZwwHwfwc3yI/q67mcrbbCwWomgQKb+J2HSS0MLoio6mKiLLeR6Fy/QsRL
S347V5jcWnhqlohCYOipmVVSRHrLcOrAuuUEjtjBBuPdH7NgN3cHFSo+Nc4cbcry
opcwxNUCLr2GDqbvBI7k7dn1B7ob+V3UokGISwQTEQIADAUCP7owmwWDC4K84AAK
CRBot6uJV1SNzdO3AJjZiVSOGYmMzWVc+XfFKy2+Mvh7AJkBpHifVlq5ybuLa65Y
gIzwp/+8BZiOBEO3+scBBADQmRl6K1zJAyqTbEZ3/mYahzj5g3BCjw5KZXAi9jxQ
Aje0GiuEXqFr2eJqplTi92V1OdcxTSPWg9yQCE6BE9o69oRmFhRMXQX/XmmIAXl2
RlDp2yZdVSQ81gxlOmRzacD4gAIGI6bKAYGQsW5e8dFbWLpI3PbyJEf9RlxguL/a
IQAggVZQmbQmV2VybmVyIEtvY2ggKGRpc3Qgc2lnKSA8ZGQ5am5AZ251Lm9yZz6I
vAQTAQIAJgUCQ7f6yAIbAwUJBaOagAYLCQgHAwIEFQIIAwQWAgMBAh4BAheAAAoJ
EFO2INAc4MYweaMEAIdDDtJLkO4TOgCo/GCuG0RmqRwZniJ4mnq/WOr8F4BK3w1H
IuwVEE8V6BRU4Chx8wc9/W83krckIE5uaZRmjhCXCWsiK9Ow2ngbXAv3TKFVCbMM
myjBbT+31M9OT0Sowob8a1s4Xv2J+gQJjxfumMUKNlvfK86tEx0ucCiY15h8iEYE
EBECAAYFAkO4EUMACgkQXeJJllsDWKKR5gCfdiiNjGdj9/mMariU4cnuSmaPQIkA
nj+zW9f9Z2M0K2r+gldEC2Ew2yTl
=I1gH
-----END PGP PUBLIC KEY BLOCK-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-libgpg-error/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	23 Jan 2009 23:21:56 -0000	1.1
+++ .cvsignore	24 Jan 2009 19:48:39 -0000	1.2
@@ -0,0 +1 @@
+libgpg-error-1.6.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-libgpg-error/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	23 Jan 2009 23:21:56 -0000	1.1
+++ sources	24 Jan 2009 19:48:40 -0000	1.2
@@ -0,0 +1 @@
+f3e9870e213518b407a959f8d29cd554  libgpg-error-1.6.tar.bz2



From rjones at fedoraproject.org  Sat Jan 24 19:50:42 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Sat, 24 Jan 2009 19:50:42 +0000 (UTC)
Subject: rpms/mingw32-libgpg-error/EL-5 import.log, NONE,
	1.1 libgpg-error-1.6.tar.bz2.sig, NONE,
	1.1 mingw32-libgpg-error.spec, NONE, 1.1 wk@g10code.com, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090124195042.29BB27010A@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/mingw32-libgpg-error/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26801/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	import.log libgpg-error-1.6.tar.bz2.sig 
	mingw32-libgpg-error.spec wk at g10code.com 
Log Message:
Initial import.



--- NEW FILE import.log ---
mingw32-libgpg-error-1_6-9_fc11:EL-5:mingw32-libgpg-error-1.6-9.fc11.src.rpm:1232826361


--- NEW FILE libgpg-error-1.6.tar.bz2.sig ---
?
c?^????N??wonw
???????ET?? ??????s?x>?;9D	???4z8??C?{?b}3??pR??l#'??e???hc???

--- NEW FILE mingw32-libgpg-error.spec ---
%define __strip %{_mingw32_strip}
%define __objdump %{_mingw32_objdump}
%define _use_internal_dependency_generator 0
%define __find_requires %{_mingw32_findrequires}
%define __find_provides %{_mingw32_findprovides}

Name:           mingw32-libgpg-error
Version:        1.6
Release:        9%{?dist}
Summary:        MinGW Windows GnuPGP error library

License:        LGPLv2+
Group:          Development/Libraries
URL:            ftp://ftp.gnupg.org/gcrypt/libgpg-error/
Source0:        ftp://ftp.gnupg.org/gcrypt/libgpg-error/libgpg-error-%{version}.tar.bz2
Source1:        ftp://ftp.gnupg.org/gcrypt/libgpg-error/libgpg-error-%{version}.tar.bz2.sig
Source2:        wk at g10code.com
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch

BuildRequires:  mingw32-filesystem >= 27
BuildRequires:  mingw32-gcc
BuildRequires:  mingw32-binutils
BuildRequires:  mingw32-dlfcn
BuildRequires:  mingw32-iconv
BuildRequires:  mingw32-gettext

BuildRequires:  gettext


%description
MinGW Windows GnuPGP error library.


%prep
%setup -q -n libgpg-error-%{version}


%build
%{_mingw32_configure}
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT

make DESTDIR=$RPM_BUILD_ROOT install

rm $RPM_BUILD_ROOT%{_mingw32_libdir}/libgpg-error.a

%find_lang libgpg-error

%clean
rm -rf $RPM_BUILD_ROOT


%files -f libgpg-error.lang
%defattr(-,root,root)
%{_mingw32_bindir}/gpg-error-config
%{_mingw32_bindir}/gpg-error.exe
%{_mingw32_bindir}/libgpg-error-0.dll
%{_mingw32_libdir}/libgpg-error.dll.a
%{_mingw32_libdir}/libgpg-error.la
%{_mingw32_includedir}/gpg-error.h
%{_mingw32_datadir}/aclocal/gpg-error.m4
%{_mingw32_datadir}/common-lisp/source/gpg-error/*

%changelog
* Thu Jan 22 2009 Richard W.M. Jones <rjones at redhat.com> - 1.6-9
- Verify that we are still matching current native package.
- Use auto-buildrequires to identify more accurate list of BRs:
    + BR gettext (for /usr/bin/msgfmt etc)
    + BR mingw32-dlfcn
    + BR mingw32-iconv
- Use _smp_mflags.
- Use find_lang.

* Mon Sep 22 2008 Richard W.M. Jones <rjones at redhat.com> - 1.6-8
- Rename mingw -> mingw32.
- Depends on mingw-filesystem 27.

* Mon Sep 22 2008 Daniel P. Berrange <berrange at redhat.com> - 1.6-6
- Added signature source file & correct URLs

* Wed Sep 10 2008 Richard W.M. Jones <rjones at redhat.com> - 1.6-5
- Remove static libraries.

* Fri Sep  5 2008 Daniel P. Berrange <berrange at redhat.com> - 1.6-4
- Add gettext support

* Thu Sep  4 2008 Richard W.M. Jones <rjones at redhat.com> - 1.6-3
- Use mingw-filesystem RPM macros.
- BuildArch is noarch.

* Tue Sep  2 2008 Daniel P. Berrange <berrange at redhat.com> - 1.6-2
- List files explicitly and use custom CFLAGS

* Mon Jul  7 2008 Richard W.M. Jones <rjones at redhat.com> - 1.6-1
- Initial RPM release, largely based on earlier work from several sources.


--- NEW FILE wk at g10code.com ---
Login: wk                              Name: Werner Koch                             
No project.
No plan.
Public key:
  pub   1024D/5B0358A2 1999-03-15 [expires: 2011-07-11]
  uid                  Werner Koch <wk at gnupg.org>
  uid                  Werner Koch <wk at g10code.com>
  uid                  Werner Koch
  uid                  Werner Koch <werner at fsfe.org>
  sub   1024D/010A57ED 2004-03-21 [expires: 2007-12-31]
  sub   2048R/C3680A6E 2006-01-01 [expires: 2007-12-31]
  
  pub   1024R/1CE0C630 2006-01-01 [expires: 2008-12-31]
  uid                  Werner Koch (dist sig) <dd9jn at gnu.org>
  
  pub   1024R/37D92FFB 2003-11-17 [expires: 2009-12-31]
  uid                  g10 Code (code signing key 1) <code at g10code.com>
  
  pub   1024D/57548DCD 1998-07-07 [expired: 2005-12-31]
  uid                  Werner Koch (gnupg sig) <dd9jn at gnu.org>
  

5B0358A2 is my main key.
1CE0C630 is used to sign software distributions.
37D92FFB is used to sign certain source files.
57548DCD was used to sign GNU crypto software;
         it has been superseded by 1CE0C630.

Please note that I use a subkey for signing messages; some old OpenPGP
implementations may not be able to check such a signature. The primary
key is stored at a more or less secure place and only used on a spare
laptop which is not connected to any network. If you find a key
certified by this one, you can be sure that I personally met this
person and checked the name part of the user ID against an official
looking passport or another suitable photo id.  My signature does not
say anything about the email address (I merely check that the address
looks plausible).


-----BEGIN PGP PUBLIC KEY BLOCK-----
Version: GnuPG v1.4.7 (GNU/Linux)

mQGiBDWiHh4RBAD+l0rg5p9rW4M3sKvmeyzhs2mDxhRKDTVVUnTwpMIR2kIA9pT4
3No/coPajDvhZTaDM/vSz25IZDZWJ7gEu86RpoEdtr/eK8GuDcgsWvFs5+YpCDwW
G2dx39ME7DN+SRvEE1xUm4E9G2Nnd2UNtLgg82wgi/ZK4Ih9CYDyo0a9awCgisn3
RvZ/MREJmQq1+SjJgDx+c2sEAOEnxGYisqIKcOTdPOTTie7o7x+nem2uac7uOW68
N+wRWxhGPIxsOdueMIa7U94Wg/Ydn4f2WngJpBvKNaHYmW8j1Q5zvZXXpIWRXSvy
TR641BceGHNdYiR/PiDBJsGQ3ac7n7pwhV4qex3IViRDJWz5Dzr88x+Oju63KtxY
urUIBACi7d1rUlHr4ok7iBRlWHYXU2hpUIQ8C+UOE1XXT+HB7mZLSRONQnWMyXnq
bAAW+EUUX2xpb54CevAg4eOilt0es8GZMmU6c0wdUsnMWWqOKHBFFlDIvyI27aZ9
quf0yvby63kFCanQKc0QnqGXQKzuXbFqBYW2UQrYgjXji8rd8bQnV2VybmVyIEtv
Y2ggKGdudXBnIHNpZykgPGRkOWpuQGdudS5vcmc+iGIEExECACICGwMECwcDAgMV
AgMDFgIBAh4BAheABQI/6YJpBQkMMyPLAAoJEGi3q4lXVI3Nou8AnAuw9XXJ9zYP
7JP7ZbXUf9+00wO/AJsHB45GEJv878Q6SDZRNckFHh6SgIhGBBARAgAGBQI1oic8
AAoJEGx+4bhiHMATftYAn1fOaKDUOt+dS38rB+CJ2Q+iElWJAKDRPpp8q5GylbM8
DPlMpClWN3TYqYhGBBARAgAGBQI27U5sAAoJEF3iSZZbA1iiarYAn35qU3ZOlVEC
ELE/3V6q98Q30eAaAKCtO+lacH0Qq1E6v4BP/9y6MoLIhohdBBMRAgAdAwsEAwUV
AwIGAQMWAgECF4AFAj/pgnMFCQwzI8sACgkQaLeriVdUjc2CugCfZn7gqBWjafNb
vZOAInCQA/Rw5zYAnRkyKWw5abGYQboHiwcwuQHiKvgYiF0EExECAB0DCwQDBRUD
AgYBAxYCAQIXgAUCP+mCcwUJDDMjywAKCRBot6uJV1SNzYK6AJ9Gs4h+WWneZKYa
keAjG+DlXy+0xwCfQG8pV6E6f7XZi+f0EId+DfiNRluIYQQTEQIAIQIXgAUJDhSH
/QUCQbxoXgYLCQgHAwIDFQIDAxYCAQIeAQAKCRBot6uJV1SNzQSTAJ9Nd9d2oNLY
I6xlGbQ5SmG5jSHjHgCdFKVbI8acpQXEo7DxPDAJIux29keIRgQQEQIABgUCNuj6
3QAKCRAHAyqWiQTI4hKYAKDNyIrKze113YZz/ZZsdFCShO0rBQCcDFiAZxivd6I7
ll4fWIA0ckmSmaiIRgQQEQIABgUCOcwPPAAKCRAyw1uAR7qTV/b8AJ9WUVGMiFle
V6EVCKuxKc9YnfoQ1QCgzGUqNeYfb3xgI68racTrOXJVvhuIPwMFED1dFpBsryRo
IByznhECwRQAn1Ho60oFxkas1xl+sCpZ80cukB8fAJ48MPZI3wHW7Vf9egVKS3EO
76eEJYhGBBARAgAGBQI1pysWAAoJEAQ1xdJF3KZpeMoAmwZEvOS95jEKj/HnbFBD
Dp5C4dw0AJ4nsZgDnGDAG7FCEJI6+LoIIUit44hGBBARAgAGBQI1pytxAAoJEITk
+JQB5ZloGOgAnjVcqopXEyMYEZfF98STKmutKPiKAJ9xHmxZW3KtVSTRf/ITSNSs
/0gClIhGBBARAgAGBQI21moBAAoJEJKyepXkBBOquBcAoNljEbSHXMLH54/J4Hit
AsiI18amAKDrDLnxCzmC+8m/OTNu4mZamePP3ohGBBARAgAGBQI314yyAAoJENa2
+kuMjp8j2KwAoK9+TObp3jf+TwnPVIfXGkmHSbcMAKDo8zs+isKynXOMF2g50STZ
waWTHYhGBBARAgAGBQI32QNDAAoJEM024CF+PI6rjjkAoKo8mBja4lOGW+miluBh
3LiTaDNJAKDQrqc4kkfaQcVlXjDVYVael74oJohGBBARAgAGBQI4JoPuAAoJENXo
h0OUdhKzCAMAnRfk1mf0+yiUdMuSENhKMXyysZ2sAKCvMSdEEmGomWCgsQfLWMzC
LR7+5YhGBBARAgAGBQI4WM8aAAoJEHEtCxfQPYpPbZwAnRr7nX029eq1E0Pv9FwQ
rgs3Zu+nAJ4s25RKi089/avsVVqnm87egAzB2YhGBBARAgAGBQI4XUq+AAoJEEPM
0G/dqdt2qekAoN1HvYZQ6AxvNVLx3M06s/ytk21NAKDNn0RgGyCBiyQeLuV3Gkuq
xke7kIhGBBARAgAGBQI4YMPoAAoJEHFG8OMwcClIpb0An1H9sxwJF5/2bKL0HZsL
XO43aq1sAJ9z7U0cOGYNIrRNpHlJ67ZPJX0tx4hGBBARAgAGBQI4mP1QAAoJEGXc
QrfU5YAmi8wAnihZi/5OG9CnzMx1UKdtBAvvt4t2AJ9lX+jCeoO3TF8QykdMXSFI
dDHL3ohGBBARAgAGBQI4q/0WAAoJEDW6YX9GCEVakzQAmgNaF00/D/eOgHmtLEjE
0IH1H2yUAJ9EKs47I9s8U7IYJOGoQRy7LD1JRYhGBBARAgAGBQI4vt9pAAoJEC5A
rMtkcKsmHDkAoL3TIizomIuEKO6vwHMFcFndsaAaAKCJAkq+I2mjYimFE7ajlaL0
jyecGohGBBARAgAGBQI483onAAoJEIQ/V9estY1PhJYAn0hEgISY812GhhZRzuE/
sc5RWEd+AJ9SxHhtH0oJNrKcGYq8AoD9yJMGHohGBBARAgAGBQI5DSiPAAoJEFL+
72cgfnGZx5UAn1UiUx9sLoaeLeMtdmztURfk1ZAJAKCJ3juG6XKBMjLl4+SmCM47
VkM/9ohGBBARAgAGBQI5Rs0pAAoJEH/i7V71FDsqLkoAnivh01I3uQurWc5bnb7f
T1GIOmfyAJwOE/KCrJV89Rko61XC+20dlzKzGohGBBARAgAGBQI5TM2WAAoJEAJx
6COq/B+4jTYAnjOMlKc5tuqspHgAUgAVmBda5XNGAKCIqZ3Fu33suLyRABGZ+tN3
tJ1QZ4hGBBARAgAGBQI5Zs0MAAoJEEcWKRmClXtmuPEAoJe7siEXNYVflP+Glf71
M2xvkSa3AKCerd0dwvhmi4Ao4ujBnuZI4YUIhIhGBBARAgAGBQI5bedgAAoJEDLG
kzuo7SAfxjMAn2I7CSRyEz8mkaD3emaM1WYxvbb5AKCFOlNjoxNmu3SSWfgrW1EE
SYPQY4hGBBARAgAGBQI5kqZcAAoJEMfg9pSiTYtOVeUAoMTgBNUjD+AYQEzIU1zY
kiW1NgZhAKDW3GzsDPqzs3nF+mkMnggYPFnEnohGBBARAgAGBQI5tN9hAAoJENGO
Dw57qpD6cEkAoLm4o/nqc2SDZ2eKr5hYDTUfWBlCAJ9g8KJvMM6+/1tEPaolM/hV
WKBx6ohGBBARAgAGBQI5ypYLAAoJEJ853fBeKcbCFbgAn3PjBy25SYCXCOWeNg+H
ebn7Pi7GAKDKtfxnXigrcdNvARmZtWHNMzvHMIhGBBARAgAGBQI5zQ+XAAoJEPd9
ddcOjOSBz8YAn2a5jCk052U+frr+sFRQ1MqKmrxKAJ9J71OdRNZLefkD7ihJ2Ymc
o8Gsp4hGBBARAgAGBQI5zzSCAAoJEKZZdW0/TbZp0ssAn1qZ7PJCIHf6ErUG111c
5bWjCbW3AKC/3Cf/ZNZK2mKZOmfCCRn9sBBlRYhGBBARAgAGBQI55+EEAAoJEEQ0
VrKnu+CclHMAoNOx0T2hZqYtHoxhruXjMvAOpfHtAKCvYm+l6Yah/UuM6OrsKbXr
7ulq9YhGBBARAgAGBQI58yQiAAoJEOY1PDi4UosBhq8AoN9OP59IYJ+NQYJmpdoy
PFgJitPfAJ4tlu7qDh0lpQUBJKIrCjG0od4yIYhGBBARAgAGBQI6A6zWAAoJEAa2
rnqGiisg4Y0An2Y/8oNJ+Oj40zqQGYn0rCZNTbbqAKDmvIQiqEcdQn/SoIhELxW2
YZs+WYhGBBARAgAGBQI6Gfa2AAoJEL4aU+syO97mR7kAnjSX4QP7gR6x1BYTCC89
u2gSXAQtAJ9nReACgNU/D+TLqimlMS9TqnTyZIhGBBARAgAGBQI6QjVhAAoJEN9J
A6fJssLArhgAoMONOWaoVjK4DXsFNID5Zc/kvVevAKC3q/YHRHK92h4cWcZmaY7E
cuMP7YhGBBARAgAGBQI6c0fgAAoJEIj3xI8iNZX1HdIAnAug/Inx3NbV/a5vNgES
SQc3jWn1AJ4pu8BlA1FywwpMkIC6GXAWeHsoaohGBBARAgAGBQI6kBGJAAoJEPOk
M758VsXv+K8An0lw/DejITM3yqmem+l/5GoP3Uv0AJ9kDPVOHQq1JfJDk3WWz/jQ
vh3MdIhGBBARAgAGBQI6k/ROAAoJEGnBgyv5Otrs1aQAoNARp9b/2AqdQ0Ug0moS
RhRexiUuAJkBwZY54+uszs8Q7P+HTeSqWVi3zohGBBARAgAGBQI6ln0BAAoJEKu/
XM0hJhuIIhgAoP6jS+IboXddicsmt6kyXhWBYDJtAKDljV7NQnqWDBmdRzYW3CYh
/hvPyIhGBBARAgAGBQI6nlT1AAoJEPqlSVpCsy/Jc7wAn12uIYBL9WfhmS2Sh0O+
mIO2j580AJ9nJvBuz4q07lkgDUFVJQlruD1IfIhGBBARAgAGBQI6xKZNAAoJECAs
PjFYbhLlDsgAn0tfgJSaxWUd5s0ZGmKob7b84onEAKC15V+DRTrE1tArKxy/itSN
iMtQG4hGBBARAgAGBQI6zP4MAAoJEP2mrjmFey4hMioAn0UGCzQKKSmQqGw0B3x8
abYWUC+aAJ9cpULGVtTlggjdM2AEDI+LaYyaeIhGBBARAgAGBQI6ziMsAAoJEOB5
DjbKcLrc2aEAnR1WTr4J4dpFuNtvRTsEXbVcm2RlAKDoZbCBC9I+VuGCQhkK4Xe7
8bqNL4hGBBARAgAGBQI61vgkAAoJEJeJjZL0kb0h64gAoNU2VN5G1PryITJbB49E
xmAjcmRGAJ0crDTB0H8MiiTRPt4PaDf+sh9CnohGBBARAgAGBQI7FTOnAAoJEOTO
X3gKLDxeqsgAnjMWBiiEToG6ATHKHZhkbFh52sTdAKCi4/cu+BYrzhNL+KHZXc8F
bP49t4hGBBARAgAGBQI7GQwoAAoJEF4Gyczs+hnFZhYAoOMcc6W4Rg3pd+9eEtqx
ZHlDDIoEAJ9VG0vhxw9szHap9L0bNN3awkZanIhGBBARAgAGBQI7JUB0AAoJEB3T
gN9DaBQASVsAn28snlWv8ljqxPsS2e7xqJxzND3GAKCsObLMGdGyED2YKlu0sSa4
E7cE+4hGBBARAgAGBQI7PonmAAoJECTQzUdmDtvZdT0AoJwx1hvhf+2pMN+e0u05
bb0ebVfnAKDpZKStArdW8xS/idhP9R7UaHyZvYhGBBARAgAGBQI7ScU3AAoJEDec
kqFodBLoiG0AoItVFw4742i3VVL75rHpS/iRTyXXAJ46OJxgMvJ9knQ0l4so5JiB
otS/8IhGBBARAgAGBQI7Vf1SAAoJEFbTlPwk1QvEjPoAn21RJvXsS2r7ULpXtiKI
cK3/+9jYAKC3qGXWrrPZmFKAksFXo3rCyzQZYYhGBBARAgAGBQI7awLUAAoJEBd4
3VVgXTjQKI4AoKzDCRFCypusHv+HobIOrB7IIT8TAKDJ0Env5dzMRub+k88oAKje
3AyYxYhGBBARAgAGBQI7b+zBAAoJEK6vjC0HwEYDSbYAnjD/E6PAovkpDzSAoTzW
gmhIqOjfAJ41Nryc49NSfzwmHjHKA02eGmjvZYhGBBARAgAGBQI7eNsgAAoJEI/A
t40JszEG65oAn3gQAikxZTrE3G4YZbyI2SfWVE9dAJ9DR1B56JLQOBjHcVub0frd
boRnFohGBBARAgAGBQI7hEQBAAoJEFwx4sMqF2LdKY4An01JbxbW3DrWPwxoLaNc
K8u8rgnGAKCEF+4ICy2QiFUTOjXVeevFwKaKHohGBBARAgAGBQI7kOZuAAoJEFwI
fke31CB7qREAoJ8lDAoLcN7vtSgtx8BfwRMW2Q0qAJ9Ru/GtQglsVha+XrgC1Vzd
B4zqT4hGBBARAgAGBQI7sbiiAAoJELBm2s/e4NveRe0An15yU2qDEyVxOCkaof5A
J74yKDTQAJ9ZyEiwLE1gQKuabrs/bUL3yvDWP4hGBBARAgAGBQI7v1c6AAoJED/O
KBDjNrEGu8wAn323cSQPxAIku2BOJ6Ai/T6EWuaqAJ4xOQHIAR2RQNZY9N2cHXIS
Ehu+oIhGBBARAgAGBQI7zECMAAoJEL6VZu5GV3J0pmsAoJjHoGQYZnqA2nkkD82K
lFm8ypDtAJ4jDyaF0RmkcfcmpjOA9LOg8rp8D4hGBBARAgAGBQI73t7LAAoJEIeo
vXamM4UazXQAnjd2m9MQaZ8q7mVBxEpup10sFMZwAJwIJvIeB+kUppNTea6ijo0w
pCuF8YhGBBARAgAGBQI7430SAAoJEB/tJKqSZfr7xIIAmQHbJSna96OkNqDCdSQl
gm0TAoPUAKCByEtRAOO+3GtDu2byKOXqqQQf9IhGBBARAgAGBQI78y1IAAoJEPFm
QMK+QtymtcIAn2rhARKRI+Ilaf+8NmfX64/NsFw+AJ9LFE0WZD7BSPmErPYKtH3q
4nB304hGBBARAgAGBQI7/a2UAAoJEDdpZyTeGKgb45EAn3Ttnv2G66peIp6Qd0LK
9HyHMG52AKDCEdDCDgpOp9xE9y3Qfy3XaeK2johGBBARAgAGBQI8OvrmAAoJEH0J
HgBCHFE0amsAnjzZ1rzTcQr1X5FVcQjlkqja3y0LAKDRr652u3GCVSTU4TFj6//+
yKrSSYhGBBARAgAGBQI8WSziAAoJEJgXkxOJvYru6ZcAn2aTbYiVEFX814lG6qaS
K8LanQOjAKDiEB6Q6EF5ZwG9NqIKt9CxWCYzY4hGBBARAgAGBQI8XB4lAAoJEC27
dr+t1Mkzbv0AoLd0yc8rHrSTfzvXAMtQyAKh4HuMAJwPgqYNdOXUM3hkTHipMN72
v2MXcohGBBARAgAGBQI8fAA1AAoJEPJk0qCezPAhoGMAoNE5kpHw0fI7yu7py5vD
+O1nYLdSAJ49Nt+hkrRCdJeiwTRhw3S434jADIhGBBARAgAGBQI8iA8eAAoJEKO8
fk+VSKRRLTIAn0wHfcDCzH7lVwvdck1DE99ZKp3UAJ93Rnr7Ut8FiWOsgaSjEYOM
/Wn2bohGBBARAgAGBQI8pwmAAAoJEGFhpSo9Vtc9TFMAninforCqZtGuJ1zaipXc
9sIicMIjAJ9bsGgNfFpkIaOkhwoYcZ+m0kZkLohGBBARAgAGBQI8xSCzAAoJEOnW
IbyLxfYrs9IAoOYpFNtlaOU4mzgA9q64FU+aRCejAJ9LpWSYdz9FQStASLILJYYH
0cj8vohGBBARAgAGBQI8yc+PAAoJEKmGnWIe6RjWJ0QAoJ2nEZs/HYmJ9FF1jn+l
phCnWZOaAKC2cRtAnlpSmgj2fWWtzBPAjMRulIhGBBARAgAGBQI80OgmAAoJEDFc
jj1lbLW1N0sAmgIlqOJ3G3EE9CPIJ60xVH5+//Z9AJ9Ou9+9E+Fze6zMB7Vn7j/L
AzsfwIhGBBARAgAGBQI84DImAAoJEEPaqJTf81JOjJkAnjo8IJSyn1RDc0C/SByu
ZlqSRjjRAJwKxnmGh3EMe1ZVtO3ZGe50S7Tda4hGBBARAgAGBQI84PTyAAoJELoW
FZDMNQMyLZ0AoOAdy099LVvSlHyVqjtRc3RctixdAKDyxlwDweoBvGYQpsT6iqb7
xPpkcIhGBBARAgAGBQI86d10AAoJEGsY5C12UxliJoEAoKgP1pbGf7WFJR8q3Nyk
HoMYoirnAJ4k4kusg6EL9nt/WBcKmzWDO2sEs4hGBBARAgAGBQI88QRCAAoJEPsP
OnXTORgQ0a8AnRcSVlV84X56jTnSftapXggAxG/yAKCbIogHWD0SrzV0DXgjo+AE
IuYXCohGBBARAgAGBQI88l+3AAoJEE6prRadbVuu/aUAnivV8DalPGw3QcuFmpBK
wSwEMCY7AJ96Mb0eJVCmj/+nbtDIhXj9ihCCAohGBBARAgAGBQI89JjcAAoJENOh
xR3NTfIFU0QAnj0YNNd5gZNHfNmIb1jai+5dgSX2AJ9bovKcoZIZxeOoFPpmlF66
WIozL4hGBBARAgAGBQI89QC/AAoJEE6prRadbVuuw40An1sLHPZXu05p4/wqDnqN
bECMZ9QgAJsFRiiz9IbLbtJ6JolVDGHpvLrrN4hGBBARAgAGBQI89QDzAAoJEBnb
ZojaeNCo04YAoILQe2cG58KsPTSyIkKTg+mwkQouAJ0eCgjvNWrhPHiSRnegEsbF
o4zsK4hGBBARAgAGBQI9H2xgAAoJEGHsr3XM5FOYekcAoMY+mIbdRh9YTGKrskfW
QQCQ87bxAJ0ZZTr2iwukIOXW8ryk4zlD72ZWi4hGBBARAgAGBQI9bjqiAAoJEHLT
tWP+y1FLj0kAnjGZGzl4VHxvUa+c4gD/GMrw6wgEAJ45Gy0INAp+Rh6NJbNECzjH
OFjstIhGBBARAgAGBQI9cUfYAAoJEFwRFAeEa7Skd/AAniL6ZGAUqQGs8siu2ia0
SnVoLBQyAJ9DrvhmP3aaZf+/GwR8Gx+Lt7uwTYhGBBARAgAGBQI9eF2CAAoJEG9K
95D+u1J7GAkAoIVs4Kxb0R7luN6Pi+WhXNfii4QbAJ0UZLJ/ySM8ZbHnGTUNIooe
ecnLjIhGBBARAgAGBQI9h9ZMAAoJEMR6qYKMZW0ODu4AoMMA74PG6QjDICxdsLWe
hhuJf3VzAJ9aHtt/ld1W/DTWSjdvH6AP9g6ZeIhGBBARAgAGBQI9k3U6AAoJENBl
k7NU+gyIiCcAnj46+kM9W4dDxs0dqNGCOXfzfXUjAJ9DWG0bLQ/tixVsWApUHTd+
ffQM2IhGBBARAgAGBQI9p/iCAAoJECxm82ySywptILkAnikhz+yOxNJMNnj/aB9C
h4i0fQmUAKCHRje8FE5DZSPWf+OwYcixOm+TxIhGBBARAgAGBQI9rwp0AAoJEDxV
WkwvmGAIsxsAoJgH82l8l5GRGwXBl26AHj8ZA6zaAJ9bKL45L0jyrSRF1V5FPLxY
twXDe4hGBBARAgAGBQI9tsipAAoJEIIYfzQ7kw7P9UAAoJ4URNsGaPSQkTSKLO9E
rSPkRdHXAKCynlouXdSQ70FBn4j6mG5I40cnGIhGBBARAgAGBQI93wWnAAoJEE1r
ZOIZBCWd+yoAn0IBXJN0bR73EG7dtOPB4Vf+MIqjAKDky8A5HD2DHDrED/bCDDBG
JeS134hGBBARAgAGBQI98WVmAAoJEP4Xknlj8hRJ51kAnijQacczGC7jafSF5un6
nRG65a7kAJ41Z8eK4JMaTNVLkkM3n1e7hh7RAohGBBARAgAGBQI+n5+UAAoJEO5p
t4fBbO/YeOIAoJA3UYEf9kntgTFeNY8pOAnCY4ouAKDjI2BHDR3zlcNPNcaczJO1
Uvxd64hGBBARAgAGBQI+n5/CAAoJEDBJWXZ7Y/q9XWYAniEPJv06FUNu2iZr2eON
fn137TmAAKDQoEEKk4kZ8bYxI6HmRRbBU7hQTYhGBBARAgAGBQI+thg2AAoJEB4q
exxFM9Jns00AoIJMwTx+2aRpo3WNCdulrRUzx/ZwAJ4waxt3zbR0M15kEF8mlB0h
198mOYhGBDARAgAGBQI4no7wAAoJECShvswraT6/w8oAn0XLPn0F4s9wQ4pGXNPC
m7MJ6E5zAJ9CbanRlaKAXoD1LP5bmADGkRBqfYhGBDARAgAGBQI+1KueAAoJEK4I
uPUH3Hp+6ngAnRTP6a9ztIe15H5seESNWjlpGzBcAJ96No/FG7JY9qHg2WoJs/F4
[...1608 lines suppressed...]
RQCdGaBGlA0R0Bjjldv0vEBtcbVB/BmInAQQAQIABgUCQyCv0AAKCRC0a5I7bYq+
cY0kA/0U+JNuaHih2INmjGtIyNtn0uLR5OVxpFDy9fvh1A/PQIcnv6Cznf0+/1EO
pC8dO6HWQxs6d1n1ZK1yDPc3boyLjxLLxuWd6B4xM7HsjqvBvW2fvVFcpPioawST
63swdZIWdvz5c7a3SOSipeuepxyutXLiLfcCB5HviXbCkYf4+ohGBBARAgAGBQJD
ILAFAAoJEMWvd0pYUQtaHroAoPk4cr3Cd0eUk1ceNnoBMeP+281CAKDjuLEpyr2S
4txh6EvT+jz0PfWJVohMBBARAgAMBQJDIUxxBYMHN4h3AAoJEBSp1Git8Ip/wbMA
oJemraY1wFzUJAWsY3D4bFxLppX5AKCA+jLM2kD/5oRZbIqSzGtkok9ZY4hMBBMR
AgAMBQJDIZVDBYMHNz+lAAoJEL/r08ZBzwMi8KkAoJ0FJADGDhigHpm7dLEoRUa+
ZpxFAKDFQvGvWe8G3qCzb/LIdyzfIJ0hzohMBBARAgAMBQJDI3VNBYMHNV+bAAoJ
EJugk2taNf1CygoAoNAK8rnU1FUY7ZJzCgw+ZjtzL3jEAKDIwfErE8XTv5PP0sJM
CUJhxf7r4ohMBBARAgAMBQJDI3gFBYMHNVzjAAoJEDFIu+8e7yb0pT4An37QJM1Z
P++YHev7oYJknn57POoKAJ9lOdPWCuFuiCdPM9L4CvAUAeGd1IhMBBARAgAMBQJD
KKE0BYMHMDO0AAoJEEk++45dZPhw6PYAoJf6zUL8WFtgMLXr7gYeknvv8MJ7AKCL
XLi8Tu2SzTIc/PeFUqoLeSUoH4hMBBARAgAMBQJDIJ3pBYMHODb/AAoJEJT+3vmt
NrUVuFoAn3oCb9Z5+SeuRbBf3F4jy7oXa4ZEAJwIVmjnLrfaQvYWsNmTOK9Ao/Qy
TohMBBARAgAMBQJDIKhFBYMHOCyjAAoJEGxk7XjeNO+hJh4AnREqzDeFWvNqKJgz
LY5MMDPmqE8rAJ4khVpKsCn4zTTL88oIg4d7Q52gSohMBBMRAgAMBQJDIKH3BYMH
ODLxAAoJEDA62eiAWc/cOX0An1VJdoTDlAW2y4cxBiiqPbvwYzhPAJ9SFl+1uI/T
6PadAFhV1le5/NSTB4hMBBMRAgAMBQJDJCP5BYMHNLDvAAoJEHw0FqlEG6/3e/YA
n0xTVNplMGLfwL21U4uztcQo0C+9AJ9XF8ORPSTU3jzv6j7q+kBRwZpz2oiiBBAB
AgAMBQJDJcl+BYMHMwtqAAoJEA348Hf+CljYLmQD/2aFAfI9tLHiBvHkYX/GOJ5V
9bOhh5/9y1ldbd7mJZhYm4gkTxd/4TeO+iOFj4OjjcvGYfQo6O/B7n3M/VVNcpdJ
Cd+GjUvqVucwtEJu/Zlejx6T2zAjxpZxhVAk9U1iQ+tVC7ld+PEnLoHDsEI1cjuO
SDVEh4S836xlym5CtQGBiEYEEBECAAYFAkNfjG8ACgkQ5XoO79RjNtr/CQCgvQam
DsV4gii8XMn7N5nViO1J2mUAoO4AtHtN2l2Imsrv+y4W8wtpFyKEiEwEExECAAwF
AkPTbagFgwaFZ0AACgkQ5klUNHCsE9WrtwCfSFV3kQnpq8TEP5Sd15JR6zHawLkA
nj7OzbtoOwobgeWTB6NrVOh45wvHiEYEEBECAAYFAkQFyuAACgkQ9Jgd/vNmD1NS
6wCgjFSuWKUMECj8lq751xuRhdES0BIAnj4nvo+sxUykCpiNdGmD/kv8BR76iEYE
EBECAAYFAkQGZN0ACgkQIIdHgCGsbMShDwCeLNGiHENHdyi4L+ZDohBWpUvzlLYA
n3Uz1vuofNQ3JakVjyVqOFESowMYiEYEEBECAAYFAkQH63kACgkQ3HeLB051S+3p
LACguWszxmfMO1IxV+HtYaxfhhogv1YAoIUPRfY0bNGfJbcpeQfr+CcDT3hziJwE
EwECAAYFAkQNdgcACgkQpOAUxG0aO7HMBAQAlr0rX9d3DVtkoWDnJqjtxd2AEGIv
epBd3bH4vxgaxlKHO8qF9QRJk3TMpp+AketiERWexrwsu3HRsINee/9gb6lkVkxS
uTcSfn/NXT1fFLxyCEzxyhiC9nwKObj3JPOMRnJiPsET30aZ+K9/yfiuUfEUrDly
gZy6OfFa/jY04eKJARwEEAECAAYFAkQG/cgACgkQ+fnDJwmNErObegf+JtFCMTbg
ewZ4R+qmz7WWB1i4zOPCRe6O99EexdcXSOAHZ4r3oLiXMZEcjCQKZ5Wpz1TDqsob
VkyW65Ws5UwbiTs1WO/WI10dHdp9Vrv+ALhsx32amwMV37qrA9RCoBIU0QQFVTMk
Y1W4iLT0Myd/0C0VCHfMrV1S43ZPDQaC7V3yh1KCpZzjhZGTIKJSvckWjyTsUW2F
vCusCakX2P/GoSs0oF5s0mSl3BvlbkxlI2ZzE1bNfVIpqSDR8jT1r87cwTJkEH57
e3PrO3DEbiQTHjbyuwD9kNTTnV2oGvVWPF/FvsFBk+fln1yECv6SIpALU1/zVzG/
wZyP4MwTIOb4NIhGBBARAgAGBQJEKFdaAAoJEBH0xB6z+64zBhUAoJ6kWu5gDqHB
Z8Wan0YynEZi6tKyAJsHBacxx6UNYPENlVXlb0xl+kssa4h6BBMRAgA6BQJEXmVA
MxpodHRwOi8vd3d3LnNjLWRlbHBoaW4tZXNjaHdlaWxlci5kZS9wZ3AvaW5kZXgu
aHRtbAAKCRCUj9ag4Q9QLulZAJ992LLlu7wU5sJddqnffDzPoKh69QCgoX8QzBEi
SZjLKSrALwLCTYI/akSIegQTEQIAOgUCRF5lZDMaaHR0cDovL3d3dy5zYy1kZWxw
aGluLWVzY2h3ZWlsZXIuZGUvcGdwL2luZGV4Lmh0bWwACgkQtHXiB7q1gikU0QCf
ZM81Hr4p7ZPwxMZW+TVcRdaSIjoAoMq7mN4xSLtRsB/lGlFLhc1O4soLiEYEExEC
AAYFAkRc/SoACgkQiqNir+lyMs3HBACfb7fa3KzNGB9Oma3KDWeC42feCzAAoIfF
w3OXxtigxx8+AowiXGsZmqI+iEYEExECAAYFAkRc/TEACgkQp99YcnDUTCOrZQCg
gV7PoPMl1d+gvPTiuUAZm8UG/dYAn3PlOcTP4vxayC7OGSkoDA8Dut+KiEYEExEC
AAYFAkNEG6QACgkQ6tS1kPaJm8DI0ACfRfci8SHm+sQpjzKqr0zxfJT5yF0AnA37
mn7nQyY28SJ2sddCo/f1JhvAiEYEEBECAAYFAkQFglgACgkQb11ZaBzVLeiG9wCf
aX6+h8bpMOraCn/sH1yQb6aI34EAoLzx4H6lGdyqnQTYiLXSrBTrto/niEYEEBEC
AAYFAkQGCjQACgkQmsnSLGNcY0vZ4wCgvBjcB5ABcNYRMEFSWsClxhaRAqUAmwUv
MA9NWdLk0pcUndbE3w70B5hUiEwEEhECAAwFAkQGKycFgwZSqcEACgkQ3+ZXkjKV
xc2qMwCfdew+RX+7ultYmO0Y8gRoLJzjBfgAn1UkZILe3+NKZBJTd1ZowJQiljHI
iEwEEhECAAwFAkQGK2cFgwZSqYEACgkQoOUVvzmICVQuFwCgqbjde48qPvUqLEip
he/zFq6pqgAAn1dXi6z+1s+bHavwCQK/q+3K5gdHiJwEEwECAAYFAkQNdesACgkQ
/dJ0ek5GOmrWRgQAoFF9IdTs5vX5OIDKIHW+d4aJfPg6w91SKkfpElDxNqZuk3rA
HvekwMSeCapKjyUajgKA4hHLy51cupdJPrz01uHO8ySxVaHt7f0qKXEcMXiEFP64
aEi+Mhx6TvPAE79tJdvgSOnUWqtckaEJ1oY4+J8kEvXP40WcnGynIPDVB6eJAhwE
EAECAAYFAkQPSJcACgkQGioH6hxXudkA+xAAruFS7PuoOVGB2fS3Er4O/NaT7H9h
0TVpGKI8JiE35+CCEbxESuIV62M23fqipD/Xli3XHBoycx+DtazmYSCjCp6yoKWN
XC/sm+oTOKFT0y2tQyPJ0cu4hwWYYMPbL1QIgtlIeB1TKEd3vzCt2rf/Xlod/udV
7KFQ6V5ZJFkrDnpwEmlL5RmfE2rW1EL7oEc4VfbbgyERiJP8jxoqntTkMFR6LLdb
NXhdnUse2BsVwtNgpcStrDb+1ucVj2BpsDNjTx+mPBUG3KgirCazO1kuu6qTMW/P
0jhds5TU5DlVrCaBHiCUotcKtVCigruNqosNRc2aCKXWnaJUpnmSaHBCN7wWey2K
BqPXPjC3LOR0olqdFuLtXdzMj4lDdrWfFss60ABcxUl8LafWYTDTiVTXQLJlv8kH
XY2bwNDyy++Ybu1wBw5ODtUBtdrL6vnIMm2EzrxFMi/jIP+lBVEcdSS3E/pO859k
UQ54mY3/JTKTpOMWcqLJ1ujNn5U7lRHBBCJzRfIfQL/xXxFVkq314AgguOmylOsY
+KlVngmeTD0XOAgWg1vwDEw3vXRpwiB66QCOLYoAcZzhpvWlmrTdCVWXQlciSbP0
1jG2BNN3fWa/l5ok4s60uFhcLnhpUepzuq0gHzSgg2H3pWlvVaO4KQr+3N+o+abd
ngPGs5CQufTiYTeJAiIEEAECAAwFAkQFDZkFgwZTx08ACgkQbjbvGsyNqzB0zw//
YgstKNU1LGBbXgrwhJM8Qg/Y0JCa29yMMDr7iWnEP3nRft+cNgU6F58Qq/n9+3i6
SgpXFBtPW1UrJnZHVl4ykDDx2dQf8QwjAPcDAWs/yz6XbRihpSD3FBuclgnMCbrr
ZpDAnEAFuK/Z5Zj8ymsdqf2Mjgth9ch0qbu8Q/SKAUhYZPw/07s5g9ie4CrNu3XN
IjlCW5myPStcP8swqIcCJRbB5VvY7q2dGT6tFD3KbpLEn0Ur7vX27dLgF7hx4F6e
g+ZIta/vvHKFCV7UIA4qe36K9brv4LwOxs+ftFRxJYLW+UnNbB9x9ublOk6V+cmc
ChlGvdxFd0pXskvHT6+XBawnmrOvBy7zDiZdMBodHL0SfoswDRNf2/fkdmKhURDc
9PLtfPzuloUmxaN06IIA//kFXZzFFS1Yjq6tWQo6dJKPRvsYlQPTz9t2nWF1dOfs
0iGhW7lR0NU05auSqzgaJUQytIZIr5QoKHx0Zn2nPh2890/xgJ2HamiaQQ0aT7tz
w+ox+/XgG2dYuKDKW8ki2WAehXYVGNEtDK6YJmfdbkbUww+Q478g+TfnKQ6w8VS2
w1jqpg3656jzWZg6wUiCvhpnyE0dZD8J8KQwkEnFNc4TcdN5BEmWxnz6JTr3gdUA
6DmDi821xLkQDndOvd0lbAlKoDxascWP0aTBciVlAvCJAiIEEAECAAwFAkQFESIF
gwZTw8YACgkQHRqO3OFAoFSLYw/9GFOeol/eGOQotl7lOcffMlaTUdI/PIvFvoAR
/8shR+za0dWqKzIRARn5Q9pjmNcuIHWlueupA+32mEqP7a4IhZF815k26kPJ7BWC
ZXjEF6tU/clTvgOsqBk+E6VazL96p8WzvFWvO9jqNNgX+ACEq6GA5z0sO2XrNdnI
YE3t2MsWebYbsV6jdyaIbjatO/eZ62kbYn9pDRkL5UULyYYDJUB24xbZK0xoFcem
GGs+rzm9Z5Av9+F25bhZ84S11KXcR9GPoe4uW7tMEI25y9FKr/+PDRUhGP7KnlvA
/x7hfUnlPbmhZlM4Ewhu0GP3fwzVXzh7ExdfebWFQhDluz8Kio3UvZI99sSqB8F4
ICmexnTXWsyKTYsU1b24l6RCzss8NUjJGZPo7bM3Z6cFsdPtJ82j00CLuhgB50BM
I+df96iKhTeEn3pN/whqLrrIIBDxw0DeebRxKdZnXAjKHKwGOIqKepEexr6y7bi8
Xos/swevSNEIdx+EtU6gWDI5GyT0sNePAtf1mr4O5zGr95XrZ3Kf84BrpUTHCkiz
neg/kirnnW3Zn7lv7i5TwJlK0jH85es3kWYbyy5qbQzmrMvOqtw8IcQM5Iny0I6v
TCDh2hzmGUEpPHJQf79LKb2HFg3PJAy/qyWOiGk4C9meqmpJFSy5UJhd4yAK7uuG
iMz5etmIRgQQEQIABgUCREihKQAKCRAFi1rNRBxfgangAJ9+uYWIpLFlxzA0ecaQ
xVXJkHDj6ACePdI2VJIxflo2IzVDZR8E1tavH4GIRgQQEQIABgUCREjJ/QAKCRCn
L/ZsQr1kXR7pAJwIKv2Qqa+/+462dqU61HjyYD6cIwCfaVG6OEZVKvyxF39Y7dCq
okIgk5OIRgQQEQIABgUCRFsJZQAKCRB/3j6P8z4/xjliAJ0Y9b5gJ7AMKwamZxfo
7vUpytH4bwCfRVVxusRKkqgQ44Yi+pEZulMkfpCIRgQQEQIABgUCRGCHygAKCRD9
AQSw4jPImMrLAJ9gxkxh4oIcJM5XEYvKaYxO1r8RbACgybXZPUKIjB0D6VGea8TH
LJOV3kaIRgQTEQIABgUCRE/tdQAKCRA/0h0qmjpVWLDwAKCcTi0jyFD2d/MI1NZd
GYBQiJAvsgCeNHNSZjWWHuvz68YF1ZyaZzLvzZOITAQQEQIADAUCRF3UigWDBfsA
XgAKCRBbqJPk7D6Y30TkAKDHS7wBh5G6EPPMC16vNJwOIgfrNQCfdLK+e71M+mz4
sgzVEh625NcGtZCITAQQEQIADAUCRF8XTgWDBfm9mgAKCRC8EAnaDpclP5j9AKDB
VPkHkPJOeLTvpTFU49JloRL/ZwCfYMniDkE2yjqPyeAe6WLat+nZfJiITAQSEQIA
DAUCRF22QgWDBfsepgAKCRAyNS1FZ/eCZBq6AJ95fp74I7lRx8zt3B+WjWK19bWd
5ACggupHyHoQEEm00m+7UgEGmuFMHHmI3AQQAQIABgUCRFC2ogAKCRDR2VIECemh
1f+tBgC0TjA2eTBH5WfFG7N0+XvHVj4SZnRJfj5k9WM7NyVXAuBRHqRDClz4o+7t
DI7XnpJa6Uf7kI9iabJ7gMxEcXjHstKz1LhycgpmEnCqvVHWZrYfudKqzVfMt0t6
QEjDtDR8ccYUoNYRhNBFovSHQazsEIISIk+I0nm/l6TOREI80+qBSsktW0Pvd6lg
BkjHScDk52hXeLd8BQfpfIDxdqAFyW0wC/2lF0jYYC7/FZXpsAFyTTZXeMCZ+vSy
z3iLTyKJARwEEAECAAYFAkRbcFcACgkQZ02H1ZEZDvnadQgAyHXaBb3PpaZUlvA7
wb1nAua+LO7qXSR5jLsLl71iWSzfdViqtGVjlXSrsCB74QvSxcRHtpTFqDN80VdV
oGwNfLPOVUWOEu/Meh1EfugpD0rahwae0FCc0Tu/RnAQbibN+I5SdNKxIPKutCH4
XdouoD7gSDN4wNAXrHatSxaDTHRpu3+3FNOLYy5NgAPzJcchT6/mQ/YmwIlEped2
AdEfuio2E/SFpR1y+p3xfqvZEZ9iiX5QKr65fmazBksDYhqR+sGwtjqQwifMqUUI
tnzUTHQH8IQU5aoI97DCMOu1mlrA4NhNXqBNRC4+CWm3XGgQc6kBnL/qF6syeUMk
z8gDlYicBBMBAgAGBQJElY7IAAoJENwG3M95JPpzalYD/jp8FsIDlMIoNhHr7+sN
qbexeYupQDeNNqZUSvVFl2OsIY9clsWAioWHoQtBTZQ3z45nVV6RRVK15+tWdXSe
EoTQskfdS79woeq7LgLTOB6yLjjhNgG2YyMwBw6eqC97/FpNqED101n538J75XZ3
9v8fMErAz2GEMrT8lLgj5UEuiEYEEBECAAYFAkS9UTAACgkQxKXVjqqse7yTbwCf
Vdx7ZbTonurIXC27+BRl8eA4HXIAnih67tYrdols1F3hxc5WGDNuGt9ziEYEEBEC
AAYFAkS9Os0ACgkQOOnzljbgEa/DZQCfXp8cAjuDumQJJHqJsF6xDzMxeYUAoIoc
+HbWTvWAyUAJhezqfSTxvvfkiEYEEBECAAYFAkTCe3AACgkQQggFxokHT625SgCf
anHG7BMHpCjPGl0K1A2jvk+UsT8An1blZqLZfsQFqOwp8aM3lYfXgQDtiEYEEBEC
AAYFAkSNRGcACgkQp6+YGoOsM0oNzwCgxLPbVnWls9geqVyjZxFalLvWJDsAmQFf
76bS7JiyhQ5adD8iXhW0CKdziEYEEBECAAYFAkVXpxYACgkQ9LSwzHl+v6v0+ACf
TH2UJ1s11ygX4MGuVJZ1lXEJ9LAAn0gk/Fga/IEJ2x4IhchMw8xV8RvdiIEEExEC
AEEFAkVbWTI6Gmh0dHA6Ly93d3cuZmFicml6aW90YXJpenpvLm9yZy9kb2N1bWVu
dGkvZ3BnLXNpZ24tcG9saWN5LwAKCRAyNXpF8ejm5IczAJ0S/kd6+n9RtlhMuXc8
ij9XsTV8nACg3/CDXfU3mo3eFY8C6taTFUkT842IRgQQEQIABgUCRex7sAAKCRDP
6Ei//GeFord7AJ9OTDnZn4UoOMI8SMhMSQG2RwZS1QCeMo4+3rhFWl197wQUISSa
UbEymqCIRgQQEQIABgUCRe3kPQAKCRB3vlkTd0nZ2UACAJ4++JE629pGiJZvvjgY
t5Rt2qYciQCffDOE5ldc8/vfkY/j3g9qjb3+f9GIRgQQEQIABgUCRcPBPQAKCRCO
qodEOSmdMQ3xAJ9aoLpFPtuw3WO6xJP4q1bzOIDp6QCfVHhJYiDBcTQbnIeDeIhW
Q0QsznOIRgQQEQIABgUCRcPBSAAKCRD6RGIhxCQl7ZtEAJ991bKoauaANbLu5AHJ
DeDZqbDzrgCgoF0R9fuJfcOIToZfn8/TgIjCcX+IRgQQEQIABgUCRcPBUQAKCRDU
BjIcB09ehLwDAKDHaRXarOBs+dy2YZLP+ps6J5GRaQCfcBs4PbRdyfPExOmzrJjK
am6x7EaIRgQQEQIABgUCRcPBWAAKCRAtCXF4Sgiq3wDDAJ4vdHpx5jfxVjZK2b36
e76o5ciwVACdGIdCTvt4T64gkukks+Iz/L8brPSIRgQQEQIABgUCRer2xgAKCRBO
OFL0w3wdCTQOAKCp9dc7VBEMwSfoUzVVOutO/C8AVACdEHrn6/W3F05u56dkRMS7
9AByuSmIRgQTEQIABgUCRVg8TQAKCRBU9GFq67wvJiEaAJ9rLGAkAvMeccqYFBVm
rP0aMvUOwACeM7QuCLlRy1Vj1aITHzFceHp5JjqIRgQQEQIABgUCRe3bCAAKCRDR
lQx2FhPo1SIpAJ9Tx3e0bx91LgKzod0R0uhRAMGHCgCfdJ/t6r5hBZIAWM3AFWaG
BGVJIPGIRgQQEQIABgUCRe34FQAKCRDemKiKLdsArEpKAJ95NIcqjpLxNwWersWD
IUy0m67bRACeOkaaI/i+HL4XTtQUPp3P89TSbN6IYwQTEQIAIwIbAwIeAQIXgAUL
BwoDAgMVAgMDFgIBBQJGtcWRBQkXLil/AAoJEF3iSZZbA1iiYL0AoI5OdGEa6zru
BXaT7wrZLDK1gOpVAJ9xoQkq7wQF3SzHcXTbgZf9E3CdmrkBogRAXdpPEQQA/1KB
8hsg8voFDWeqhuWxNiiLBY8vjy4Fk+OQN/LxexVHlX1pFCWCALjHj8wPcinkBSBF
4js9weenibe9xUtc+X7/uLuEDB3ziIrOA3wjxVbQR69+Vw2budtYSemNobElYVuF
IsjUOaqdp+hTydmAanZCgT5+WAYN3nn0LdKIdFMAoNuqBLcQOFNvB9L5sCFbleLz
/YI/A/0e5565b0z9zK3xS+WIuyPZ5gwQjLsJ5Is7Xdd+eoKNyccr5vn38AN3312k
xqreAqPsCPVEixFXapYMmkM1dXE/sLL4XPF6VCzK09A5XwfwCQH5GCZLJ/GU1FSQ
LexBTqNH0jCY8PiIHl+n9KpSmf77vtMACteqx8duaWfBy5TUQAP+LsISHEsFhLU3
vuHDEvwNYKqOmL7U8ob7p1zQFAUhTe5SFvMsZ+oShtQOG96qC2Wy+gRn+VHxGAy/
+46NcSCIBNDJMRruzcza+NeWkuNePOSWZrcuqZxqbd0R//k5HTbJmJ/qE9T/Hx/9
VCV7SQo0p04JXX52WjxokfZQhlFEi+2ITwQYEQIADwUCQF3aTwIbAgUJBxtWAAAK
CRBd4kmWWwNYoiKoAJ9/4y+YEsZIEDQ2R0r1kHd9NLMJ1wCgusn1Bh7b68W7ZZgZ
k0LnEnLZ1vWITwQYEQIADwUCQF3aUAIbAgUJBxtWAAAKCRBd4kmWWwNYosNxAJ90
WHb91jqnxLPqdLm1/HlqQ6qY8ACfdj8+liZn5sh+gVweXOM/GYj3e5KIlwQYEQIA
DwIbAgUJBxtWAAUCRHWsHQBSRyAEGRECAAYFAkR1rBMACgkQYHhOlAEKV+3ZEwCf
VeIv9sL2EHJkicIlNoJ3xZLyRgIAoJ+kBbAsjGR/AB4P9Ej7anTSdB+8CRBd4kmW
WwNYorHtAKC5zj8eISzrgTLmnpiKHLrtfwTRiwCdFcwV1dU/vDDy6V2WM+IPVODK
6um5AQsEQF3bKQEIANEoVLSVnD/YxrBL3s/edXK3YUX1dZvyyLtP0mCX41EX3e6p
Q4gLXmze7lJU9zB0iGgbTjBgodMsqHIECMWnhrN8uaIgEMOnfsNjdIC0lPpOyBQt
H7IWRdtG+4g5Tk3/RbHOsroknCUVUTJo9fvOZZUowKP5IyPYWuaW25VLRoJ/SKje
f3ttQC+5Td2CNMWgepbjTXuyZ9sThUzCctiLf/VJL2zTKwozo/HnIQzehCI5b/2l
LjzBIV+zeVeLw3UGKSA91TkUUD7kEZJSHHIV/6Wp2PBwHIELstPd0KsV5ZA4vRR5
WHrAbjw7rePyO57uZ9Ob7nn25ecP8nrk+IdxlOcABimITwQYEQIADwUCQF3bKQIb
DAUJA1jvAAAKCRBd4kmWWwNYohLWAKCgnbPg6cDR1W3tkz894CwpcDQoVQCfcBXf
K5kpfhYfDk+d/mwuYXktSSW5AQsEQ7gWIgEIANFah4LB/iVUglBqEzvK0VG88yuR
JlDLTvb8jr/hA8qxocj4eegHw+NOYGnIEMsrxjo5/djWE1vvvF76baD7xar8FQoe
9SLUX7HOzOmeLG0yv5A6LLpTuQIkDp8a+rSqbOtcZy/mteka9bDJl/KZMtbhfZYq
A0vxuE4PLS4n1lH9+GMTuecgeAhuhKcEBQ8cKwj0EW6axtTwUqwokI4GrOIcTIMd
uLHu4/oHJiyUfa1TD1Z1BTxjOjaZaiOCFemMTtRPS0BvhA1N3C6suCIQgfm6awzj
d6WvX/ad3ToqKBBf41HgyrK1H7bwm0QQq9QvAlmmYTGzgH44HjHyX7otzT8ABimI
TwQYEQIADwUCQ7gWIgIbDAUJA8EVgAAKCRBd4kmWWwNYol3LAJ43JG07X/IjKI2S
i1hF87nLfG4ehwCcDIDiNrFrvTaxGziI9H9ZYmQyASqYjgQ/uRN7AQQA4PCjWWzi
/vMxKJcYm5eECcScwD2KanQ0jznjMTrfuwkJVmKiqZro42kF54x8pQMFpcEBOrKK
KVlcp9JEsSjjyN0qE21MEYIweAYxJQXOGlEGZHimDK3C7stXtNMRJ7EFnpLUWUbg
eIwNDLnV8Locjpi20cFm21GdUgud4VefnOMAIPpvtYO0MGcxMCBDb2RlIChjb2Rl
IHNpZ25pbmcga2V5IDEpIDxjb2RlQGcxMGNvZGUuY29tPoi2BBMBAgAgBQI/uRN7
AhsDBQkLg9oAAgsCAxUCAwMWAgECHgECF4AACgkQMQCenzfZL/vXIgP+MVhiaKzD
y7LeeVXZwwHwfwc3yI/q67mcrbbCwWomgQKb+J2HSS0MLoio6mKiLLeR6Fy/QsRL
S347V5jcWnhqlohCYOipmVVSRHrLcOrAuuUEjtjBBuPdH7NgN3cHFSo+Nc4cbcry
opcwxNUCLr2GDqbvBI7k7dn1B7ob+V3UokGISwQTEQIADAUCP7owmwWDC4K84AAK
CRBot6uJV1SNzdO3AJjZiVSOGYmMzWVc+XfFKy2+Mvh7AJkBpHifVlq5ybuLa65Y
gIzwp/+8BZiOBEO3+scBBADQmRl6K1zJAyqTbEZ3/mYahzj5g3BCjw5KZXAi9jxQ
Aje0GiuEXqFr2eJqplTi92V1OdcxTSPWg9yQCE6BE9o69oRmFhRMXQX/XmmIAXl2
RlDp2yZdVSQ81gxlOmRzacD4gAIGI6bKAYGQsW5e8dFbWLpI3PbyJEf9RlxguL/a
IQAggVZQmbQmV2VybmVyIEtvY2ggKGRpc3Qgc2lnKSA8ZGQ5am5AZ251Lm9yZz6I
vAQTAQIAJgUCQ7f6yAIbAwUJBaOagAYLCQgHAwIEFQIIAwQWAgMBAh4BAheAAAoJ
EFO2INAc4MYweaMEAIdDDtJLkO4TOgCo/GCuG0RmqRwZniJ4mnq/WOr8F4BK3w1H
IuwVEE8V6BRU4Chx8wc9/W83krckIE5uaZRmjhCXCWsiK9Ow2ngbXAv3TKFVCbMM
myjBbT+31M9OT0Sowob8a1s4Xv2J+gQJjxfumMUKNlvfK86tEx0ucCiY15h8iEYE
EBECAAYFAkO4EUMACgkQXeJJllsDWKKR5gCfdiiNjGdj9/mMariU4cnuSmaPQIkA
nj+zW9f9Z2M0K2r+gldEC2Ew2yTl
=I1gH
-----END PGP PUBLIC KEY BLOCK-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-libgpg-error/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	23 Jan 2009 23:21:56 -0000	1.1
+++ .cvsignore	24 Jan 2009 19:50:11 -0000	1.2
@@ -0,0 +1 @@
+libgpg-error-1.6.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-libgpg-error/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	23 Jan 2009 23:21:56 -0000	1.1
+++ sources	24 Jan 2009 19:50:11 -0000	1.2
@@ -0,0 +1 @@
+f3e9870e213518b407a959f8d29cd554  libgpg-error-1.6.tar.bz2



From rjones at fedoraproject.org  Sat Jan 24 19:50:51 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Sat, 24 Jan 2009 19:50:51 +0000 (UTC)
Subject: rpms/mingw32-libgpg-error/F-10 import.log, NONE,
	1.1 libgpg-error-1.6.tar.bz2.sig, NONE,
	1.1 mingw32-libgpg-error.spec, NONE, 1.1 wk@g10code.com, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090124195051.0B7F17010A@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/mingw32-libgpg-error/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26769/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	import.log libgpg-error-1.6.tar.bz2.sig 
	mingw32-libgpg-error.spec wk at g10code.com 
Log Message:
Initial import.



--- NEW FILE import.log ---
mingw32-libgpg-error-1_6-9_fc11:F-10:mingw32-libgpg-error-1.6-9.fc11.src.rpm:1232826361


--- NEW FILE libgpg-error-1.6.tar.bz2.sig ---
?
c?^????N??wonw
???????ET?? ??????s?x>?;9D	???4z8??C?{?b}3??pR??l#'??e???hc???

--- NEW FILE mingw32-libgpg-error.spec ---
%define __strip %{_mingw32_strip}
%define __objdump %{_mingw32_objdump}
%define _use_internal_dependency_generator 0
%define __find_requires %{_mingw32_findrequires}
%define __find_provides %{_mingw32_findprovides}

Name:           mingw32-libgpg-error
Version:        1.6
Release:        9%{?dist}
Summary:        MinGW Windows GnuPGP error library

License:        LGPLv2+
Group:          Development/Libraries
URL:            ftp://ftp.gnupg.org/gcrypt/libgpg-error/
Source0:        ftp://ftp.gnupg.org/gcrypt/libgpg-error/libgpg-error-%{version}.tar.bz2
Source1:        ftp://ftp.gnupg.org/gcrypt/libgpg-error/libgpg-error-%{version}.tar.bz2.sig
Source2:        wk at g10code.com
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch

BuildRequires:  mingw32-filesystem >= 27
BuildRequires:  mingw32-gcc
BuildRequires:  mingw32-binutils
BuildRequires:  mingw32-dlfcn
BuildRequires:  mingw32-iconv
BuildRequires:  mingw32-gettext

BuildRequires:  gettext


%description
MinGW Windows GnuPGP error library.


%prep
%setup -q -n libgpg-error-%{version}


%build
%{_mingw32_configure}
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT

make DESTDIR=$RPM_BUILD_ROOT install

rm $RPM_BUILD_ROOT%{_mingw32_libdir}/libgpg-error.a

%find_lang libgpg-error

%clean
rm -rf $RPM_BUILD_ROOT


%files -f libgpg-error.lang
%defattr(-,root,root)
%{_mingw32_bindir}/gpg-error-config
%{_mingw32_bindir}/gpg-error.exe
%{_mingw32_bindir}/libgpg-error-0.dll
%{_mingw32_libdir}/libgpg-error.dll.a
%{_mingw32_libdir}/libgpg-error.la
%{_mingw32_includedir}/gpg-error.h
%{_mingw32_datadir}/aclocal/gpg-error.m4
%{_mingw32_datadir}/common-lisp/source/gpg-error/*

%changelog
* Thu Jan 22 2009 Richard W.M. Jones <rjones at redhat.com> - 1.6-9
- Verify that we are still matching current native package.
- Use auto-buildrequires to identify more accurate list of BRs:
    + BR gettext (for /usr/bin/msgfmt etc)
    + BR mingw32-dlfcn
    + BR mingw32-iconv
- Use _smp_mflags.
- Use find_lang.

* Mon Sep 22 2008 Richard W.M. Jones <rjones at redhat.com> - 1.6-8
- Rename mingw -> mingw32.
- Depends on mingw-filesystem 27.

* Mon Sep 22 2008 Daniel P. Berrange <berrange at redhat.com> - 1.6-6
- Added signature source file & correct URLs

* Wed Sep 10 2008 Richard W.M. Jones <rjones at redhat.com> - 1.6-5
- Remove static libraries.

* Fri Sep  5 2008 Daniel P. Berrange <berrange at redhat.com> - 1.6-4
- Add gettext support

* Thu Sep  4 2008 Richard W.M. Jones <rjones at redhat.com> - 1.6-3
- Use mingw-filesystem RPM macros.
- BuildArch is noarch.

* Tue Sep  2 2008 Daniel P. Berrange <berrange at redhat.com> - 1.6-2
- List files explicitly and use custom CFLAGS

* Mon Jul  7 2008 Richard W.M. Jones <rjones at redhat.com> - 1.6-1
- Initial RPM release, largely based on earlier work from several sources.


--- NEW FILE wk at g10code.com ---
Login: wk                              Name: Werner Koch                             
No project.
No plan.
Public key:
  pub   1024D/5B0358A2 1999-03-15 [expires: 2011-07-11]
  uid                  Werner Koch <wk at gnupg.org>
  uid                  Werner Koch <wk at g10code.com>
  uid                  Werner Koch
  uid                  Werner Koch <werner at fsfe.org>
  sub   1024D/010A57ED 2004-03-21 [expires: 2007-12-31]
  sub   2048R/C3680A6E 2006-01-01 [expires: 2007-12-31]
  
  pub   1024R/1CE0C630 2006-01-01 [expires: 2008-12-31]
  uid                  Werner Koch (dist sig) <dd9jn at gnu.org>
  
  pub   1024R/37D92FFB 2003-11-17 [expires: 2009-12-31]
  uid                  g10 Code (code signing key 1) <code at g10code.com>
  
  pub   1024D/57548DCD 1998-07-07 [expired: 2005-12-31]
  uid                  Werner Koch (gnupg sig) <dd9jn at gnu.org>
  

5B0358A2 is my main key.
1CE0C630 is used to sign software distributions.
37D92FFB is used to sign certain source files.
57548DCD was used to sign GNU crypto software;
         it has been superseded by 1CE0C630.

Please note that I use a subkey for signing messages; some old OpenPGP
implementations may not be able to check such a signature. The primary
key is stored at a more or less secure place and only used on a spare
laptop which is not connected to any network. If you find a key
certified by this one, you can be sure that I personally met this
person and checked the name part of the user ID against an official
looking passport or another suitable photo id.  My signature does not
say anything about the email address (I merely check that the address
looks plausible).


-----BEGIN PGP PUBLIC KEY BLOCK-----
Version: GnuPG v1.4.7 (GNU/Linux)

mQGiBDWiHh4RBAD+l0rg5p9rW4M3sKvmeyzhs2mDxhRKDTVVUnTwpMIR2kIA9pT4
3No/coPajDvhZTaDM/vSz25IZDZWJ7gEu86RpoEdtr/eK8GuDcgsWvFs5+YpCDwW
G2dx39ME7DN+SRvEE1xUm4E9G2Nnd2UNtLgg82wgi/ZK4Ih9CYDyo0a9awCgisn3
RvZ/MREJmQq1+SjJgDx+c2sEAOEnxGYisqIKcOTdPOTTie7o7x+nem2uac7uOW68
N+wRWxhGPIxsOdueMIa7U94Wg/Ydn4f2WngJpBvKNaHYmW8j1Q5zvZXXpIWRXSvy
TR641BceGHNdYiR/PiDBJsGQ3ac7n7pwhV4qex3IViRDJWz5Dzr88x+Oju63KtxY
urUIBACi7d1rUlHr4ok7iBRlWHYXU2hpUIQ8C+UOE1XXT+HB7mZLSRONQnWMyXnq
bAAW+EUUX2xpb54CevAg4eOilt0es8GZMmU6c0wdUsnMWWqOKHBFFlDIvyI27aZ9
quf0yvby63kFCanQKc0QnqGXQKzuXbFqBYW2UQrYgjXji8rd8bQnV2VybmVyIEtv
Y2ggKGdudXBnIHNpZykgPGRkOWpuQGdudS5vcmc+iGIEExECACICGwMECwcDAgMV
AgMDFgIBAh4BAheABQI/6YJpBQkMMyPLAAoJEGi3q4lXVI3Nou8AnAuw9XXJ9zYP
7JP7ZbXUf9+00wO/AJsHB45GEJv878Q6SDZRNckFHh6SgIhGBBARAgAGBQI1oic8
AAoJEGx+4bhiHMATftYAn1fOaKDUOt+dS38rB+CJ2Q+iElWJAKDRPpp8q5GylbM8
DPlMpClWN3TYqYhGBBARAgAGBQI27U5sAAoJEF3iSZZbA1iiarYAn35qU3ZOlVEC
ELE/3V6q98Q30eAaAKCtO+lacH0Qq1E6v4BP/9y6MoLIhohdBBMRAgAdAwsEAwUV
AwIGAQMWAgECF4AFAj/pgnMFCQwzI8sACgkQaLeriVdUjc2CugCfZn7gqBWjafNb
vZOAInCQA/Rw5zYAnRkyKWw5abGYQboHiwcwuQHiKvgYiF0EExECAB0DCwQDBRUD
AgYBAxYCAQIXgAUCP+mCcwUJDDMjywAKCRBot6uJV1SNzYK6AJ9Gs4h+WWneZKYa
keAjG+DlXy+0xwCfQG8pV6E6f7XZi+f0EId+DfiNRluIYQQTEQIAIQIXgAUJDhSH
/QUCQbxoXgYLCQgHAwIDFQIDAxYCAQIeAQAKCRBot6uJV1SNzQSTAJ9Nd9d2oNLY
I6xlGbQ5SmG5jSHjHgCdFKVbI8acpQXEo7DxPDAJIux29keIRgQQEQIABgUCNuj6
3QAKCRAHAyqWiQTI4hKYAKDNyIrKze113YZz/ZZsdFCShO0rBQCcDFiAZxivd6I7
ll4fWIA0ckmSmaiIRgQQEQIABgUCOcwPPAAKCRAyw1uAR7qTV/b8AJ9WUVGMiFle
V6EVCKuxKc9YnfoQ1QCgzGUqNeYfb3xgI68racTrOXJVvhuIPwMFED1dFpBsryRo
IByznhECwRQAn1Ho60oFxkas1xl+sCpZ80cukB8fAJ48MPZI3wHW7Vf9egVKS3EO
76eEJYhGBBARAgAGBQI1pysWAAoJEAQ1xdJF3KZpeMoAmwZEvOS95jEKj/HnbFBD
Dp5C4dw0AJ4nsZgDnGDAG7FCEJI6+LoIIUit44hGBBARAgAGBQI1pytxAAoJEITk
+JQB5ZloGOgAnjVcqopXEyMYEZfF98STKmutKPiKAJ9xHmxZW3KtVSTRf/ITSNSs
/0gClIhGBBARAgAGBQI21moBAAoJEJKyepXkBBOquBcAoNljEbSHXMLH54/J4Hit
AsiI18amAKDrDLnxCzmC+8m/OTNu4mZamePP3ohGBBARAgAGBQI314yyAAoJENa2
+kuMjp8j2KwAoK9+TObp3jf+TwnPVIfXGkmHSbcMAKDo8zs+isKynXOMF2g50STZ
waWTHYhGBBARAgAGBQI32QNDAAoJEM024CF+PI6rjjkAoKo8mBja4lOGW+miluBh
3LiTaDNJAKDQrqc4kkfaQcVlXjDVYVael74oJohGBBARAgAGBQI4JoPuAAoJENXo
h0OUdhKzCAMAnRfk1mf0+yiUdMuSENhKMXyysZ2sAKCvMSdEEmGomWCgsQfLWMzC
LR7+5YhGBBARAgAGBQI4WM8aAAoJEHEtCxfQPYpPbZwAnRr7nX029eq1E0Pv9FwQ
rgs3Zu+nAJ4s25RKi089/avsVVqnm87egAzB2YhGBBARAgAGBQI4XUq+AAoJEEPM
0G/dqdt2qekAoN1HvYZQ6AxvNVLx3M06s/ytk21NAKDNn0RgGyCBiyQeLuV3Gkuq
xke7kIhGBBARAgAGBQI4YMPoAAoJEHFG8OMwcClIpb0An1H9sxwJF5/2bKL0HZsL
XO43aq1sAJ9z7U0cOGYNIrRNpHlJ67ZPJX0tx4hGBBARAgAGBQI4mP1QAAoJEGXc
QrfU5YAmi8wAnihZi/5OG9CnzMx1UKdtBAvvt4t2AJ9lX+jCeoO3TF8QykdMXSFI
dDHL3ohGBBARAgAGBQI4q/0WAAoJEDW6YX9GCEVakzQAmgNaF00/D/eOgHmtLEjE
0IH1H2yUAJ9EKs47I9s8U7IYJOGoQRy7LD1JRYhGBBARAgAGBQI4vt9pAAoJEC5A
rMtkcKsmHDkAoL3TIizomIuEKO6vwHMFcFndsaAaAKCJAkq+I2mjYimFE7ajlaL0
jyecGohGBBARAgAGBQI483onAAoJEIQ/V9estY1PhJYAn0hEgISY812GhhZRzuE/
sc5RWEd+AJ9SxHhtH0oJNrKcGYq8AoD9yJMGHohGBBARAgAGBQI5DSiPAAoJEFL+
72cgfnGZx5UAn1UiUx9sLoaeLeMtdmztURfk1ZAJAKCJ3juG6XKBMjLl4+SmCM47
VkM/9ohGBBARAgAGBQI5Rs0pAAoJEH/i7V71FDsqLkoAnivh01I3uQurWc5bnb7f
T1GIOmfyAJwOE/KCrJV89Rko61XC+20dlzKzGohGBBARAgAGBQI5TM2WAAoJEAJx
6COq/B+4jTYAnjOMlKc5tuqspHgAUgAVmBda5XNGAKCIqZ3Fu33suLyRABGZ+tN3
tJ1QZ4hGBBARAgAGBQI5Zs0MAAoJEEcWKRmClXtmuPEAoJe7siEXNYVflP+Glf71
M2xvkSa3AKCerd0dwvhmi4Ao4ujBnuZI4YUIhIhGBBARAgAGBQI5bedgAAoJEDLG
kzuo7SAfxjMAn2I7CSRyEz8mkaD3emaM1WYxvbb5AKCFOlNjoxNmu3SSWfgrW1EE
SYPQY4hGBBARAgAGBQI5kqZcAAoJEMfg9pSiTYtOVeUAoMTgBNUjD+AYQEzIU1zY
kiW1NgZhAKDW3GzsDPqzs3nF+mkMnggYPFnEnohGBBARAgAGBQI5tN9hAAoJENGO
Dw57qpD6cEkAoLm4o/nqc2SDZ2eKr5hYDTUfWBlCAJ9g8KJvMM6+/1tEPaolM/hV
WKBx6ohGBBARAgAGBQI5ypYLAAoJEJ853fBeKcbCFbgAn3PjBy25SYCXCOWeNg+H
ebn7Pi7GAKDKtfxnXigrcdNvARmZtWHNMzvHMIhGBBARAgAGBQI5zQ+XAAoJEPd9
ddcOjOSBz8YAn2a5jCk052U+frr+sFRQ1MqKmrxKAJ9J71OdRNZLefkD7ihJ2Ymc
o8Gsp4hGBBARAgAGBQI5zzSCAAoJEKZZdW0/TbZp0ssAn1qZ7PJCIHf6ErUG111c
5bWjCbW3AKC/3Cf/ZNZK2mKZOmfCCRn9sBBlRYhGBBARAgAGBQI55+EEAAoJEEQ0
VrKnu+CclHMAoNOx0T2hZqYtHoxhruXjMvAOpfHtAKCvYm+l6Yah/UuM6OrsKbXr
7ulq9YhGBBARAgAGBQI58yQiAAoJEOY1PDi4UosBhq8AoN9OP59IYJ+NQYJmpdoy
PFgJitPfAJ4tlu7qDh0lpQUBJKIrCjG0od4yIYhGBBARAgAGBQI6A6zWAAoJEAa2
rnqGiisg4Y0An2Y/8oNJ+Oj40zqQGYn0rCZNTbbqAKDmvIQiqEcdQn/SoIhELxW2
YZs+WYhGBBARAgAGBQI6Gfa2AAoJEL4aU+syO97mR7kAnjSX4QP7gR6x1BYTCC89
u2gSXAQtAJ9nReACgNU/D+TLqimlMS9TqnTyZIhGBBARAgAGBQI6QjVhAAoJEN9J
A6fJssLArhgAoMONOWaoVjK4DXsFNID5Zc/kvVevAKC3q/YHRHK92h4cWcZmaY7E
cuMP7YhGBBARAgAGBQI6c0fgAAoJEIj3xI8iNZX1HdIAnAug/Inx3NbV/a5vNgES
SQc3jWn1AJ4pu8BlA1FywwpMkIC6GXAWeHsoaohGBBARAgAGBQI6kBGJAAoJEPOk
M758VsXv+K8An0lw/DejITM3yqmem+l/5GoP3Uv0AJ9kDPVOHQq1JfJDk3WWz/jQ
vh3MdIhGBBARAgAGBQI6k/ROAAoJEGnBgyv5Otrs1aQAoNARp9b/2AqdQ0Ug0moS
RhRexiUuAJkBwZY54+uszs8Q7P+HTeSqWVi3zohGBBARAgAGBQI6ln0BAAoJEKu/
XM0hJhuIIhgAoP6jS+IboXddicsmt6kyXhWBYDJtAKDljV7NQnqWDBmdRzYW3CYh
/hvPyIhGBBARAgAGBQI6nlT1AAoJEPqlSVpCsy/Jc7wAn12uIYBL9WfhmS2Sh0O+
mIO2j580AJ9nJvBuz4q07lkgDUFVJQlruD1IfIhGBBARAgAGBQI6xKZNAAoJECAs
PjFYbhLlDsgAn0tfgJSaxWUd5s0ZGmKob7b84onEAKC15V+DRTrE1tArKxy/itSN
iMtQG4hGBBARAgAGBQI6zP4MAAoJEP2mrjmFey4hMioAn0UGCzQKKSmQqGw0B3x8
abYWUC+aAJ9cpULGVtTlggjdM2AEDI+LaYyaeIhGBBARAgAGBQI6ziMsAAoJEOB5
DjbKcLrc2aEAnR1WTr4J4dpFuNtvRTsEXbVcm2RlAKDoZbCBC9I+VuGCQhkK4Xe7
8bqNL4hGBBARAgAGBQI61vgkAAoJEJeJjZL0kb0h64gAoNU2VN5G1PryITJbB49E
xmAjcmRGAJ0crDTB0H8MiiTRPt4PaDf+sh9CnohGBBARAgAGBQI7FTOnAAoJEOTO
X3gKLDxeqsgAnjMWBiiEToG6ATHKHZhkbFh52sTdAKCi4/cu+BYrzhNL+KHZXc8F
bP49t4hGBBARAgAGBQI7GQwoAAoJEF4Gyczs+hnFZhYAoOMcc6W4Rg3pd+9eEtqx
ZHlDDIoEAJ9VG0vhxw9szHap9L0bNN3awkZanIhGBBARAgAGBQI7JUB0AAoJEB3T
gN9DaBQASVsAn28snlWv8ljqxPsS2e7xqJxzND3GAKCsObLMGdGyED2YKlu0sSa4
E7cE+4hGBBARAgAGBQI7PonmAAoJECTQzUdmDtvZdT0AoJwx1hvhf+2pMN+e0u05
bb0ebVfnAKDpZKStArdW8xS/idhP9R7UaHyZvYhGBBARAgAGBQI7ScU3AAoJEDec
kqFodBLoiG0AoItVFw4742i3VVL75rHpS/iRTyXXAJ46OJxgMvJ9knQ0l4so5JiB
otS/8IhGBBARAgAGBQI7Vf1SAAoJEFbTlPwk1QvEjPoAn21RJvXsS2r7ULpXtiKI
cK3/+9jYAKC3qGXWrrPZmFKAksFXo3rCyzQZYYhGBBARAgAGBQI7awLUAAoJEBd4
3VVgXTjQKI4AoKzDCRFCypusHv+HobIOrB7IIT8TAKDJ0Env5dzMRub+k88oAKje
3AyYxYhGBBARAgAGBQI7b+zBAAoJEK6vjC0HwEYDSbYAnjD/E6PAovkpDzSAoTzW
gmhIqOjfAJ41Nryc49NSfzwmHjHKA02eGmjvZYhGBBARAgAGBQI7eNsgAAoJEI/A
t40JszEG65oAn3gQAikxZTrE3G4YZbyI2SfWVE9dAJ9DR1B56JLQOBjHcVub0frd
boRnFohGBBARAgAGBQI7hEQBAAoJEFwx4sMqF2LdKY4An01JbxbW3DrWPwxoLaNc
K8u8rgnGAKCEF+4ICy2QiFUTOjXVeevFwKaKHohGBBARAgAGBQI7kOZuAAoJEFwI
fke31CB7qREAoJ8lDAoLcN7vtSgtx8BfwRMW2Q0qAJ9Ru/GtQglsVha+XrgC1Vzd
B4zqT4hGBBARAgAGBQI7sbiiAAoJELBm2s/e4NveRe0An15yU2qDEyVxOCkaof5A
J74yKDTQAJ9ZyEiwLE1gQKuabrs/bUL3yvDWP4hGBBARAgAGBQI7v1c6AAoJED/O
KBDjNrEGu8wAn323cSQPxAIku2BOJ6Ai/T6EWuaqAJ4xOQHIAR2RQNZY9N2cHXIS
Ehu+oIhGBBARAgAGBQI7zECMAAoJEL6VZu5GV3J0pmsAoJjHoGQYZnqA2nkkD82K
lFm8ypDtAJ4jDyaF0RmkcfcmpjOA9LOg8rp8D4hGBBARAgAGBQI73t7LAAoJEIeo
vXamM4UazXQAnjd2m9MQaZ8q7mVBxEpup10sFMZwAJwIJvIeB+kUppNTea6ijo0w
pCuF8YhGBBARAgAGBQI7430SAAoJEB/tJKqSZfr7xIIAmQHbJSna96OkNqDCdSQl
gm0TAoPUAKCByEtRAOO+3GtDu2byKOXqqQQf9IhGBBARAgAGBQI78y1IAAoJEPFm
QMK+QtymtcIAn2rhARKRI+Ilaf+8NmfX64/NsFw+AJ9LFE0WZD7BSPmErPYKtH3q
4nB304hGBBARAgAGBQI7/a2UAAoJEDdpZyTeGKgb45EAn3Ttnv2G66peIp6Qd0LK
9HyHMG52AKDCEdDCDgpOp9xE9y3Qfy3XaeK2johGBBARAgAGBQI8OvrmAAoJEH0J
HgBCHFE0amsAnjzZ1rzTcQr1X5FVcQjlkqja3y0LAKDRr652u3GCVSTU4TFj6//+
yKrSSYhGBBARAgAGBQI8WSziAAoJEJgXkxOJvYru6ZcAn2aTbYiVEFX814lG6qaS
K8LanQOjAKDiEB6Q6EF5ZwG9NqIKt9CxWCYzY4hGBBARAgAGBQI8XB4lAAoJEC27
dr+t1Mkzbv0AoLd0yc8rHrSTfzvXAMtQyAKh4HuMAJwPgqYNdOXUM3hkTHipMN72
v2MXcohGBBARAgAGBQI8fAA1AAoJEPJk0qCezPAhoGMAoNE5kpHw0fI7yu7py5vD
+O1nYLdSAJ49Nt+hkrRCdJeiwTRhw3S434jADIhGBBARAgAGBQI8iA8eAAoJEKO8
fk+VSKRRLTIAn0wHfcDCzH7lVwvdck1DE99ZKp3UAJ93Rnr7Ut8FiWOsgaSjEYOM
/Wn2bohGBBARAgAGBQI8pwmAAAoJEGFhpSo9Vtc9TFMAninforCqZtGuJ1zaipXc
9sIicMIjAJ9bsGgNfFpkIaOkhwoYcZ+m0kZkLohGBBARAgAGBQI8xSCzAAoJEOnW
IbyLxfYrs9IAoOYpFNtlaOU4mzgA9q64FU+aRCejAJ9LpWSYdz9FQStASLILJYYH
0cj8vohGBBARAgAGBQI8yc+PAAoJEKmGnWIe6RjWJ0QAoJ2nEZs/HYmJ9FF1jn+l
phCnWZOaAKC2cRtAnlpSmgj2fWWtzBPAjMRulIhGBBARAgAGBQI80OgmAAoJEDFc
jj1lbLW1N0sAmgIlqOJ3G3EE9CPIJ60xVH5+//Z9AJ9Ou9+9E+Fze6zMB7Vn7j/L
AzsfwIhGBBARAgAGBQI84DImAAoJEEPaqJTf81JOjJkAnjo8IJSyn1RDc0C/SByu
ZlqSRjjRAJwKxnmGh3EMe1ZVtO3ZGe50S7Tda4hGBBARAgAGBQI84PTyAAoJELoW
FZDMNQMyLZ0AoOAdy099LVvSlHyVqjtRc3RctixdAKDyxlwDweoBvGYQpsT6iqb7
xPpkcIhGBBARAgAGBQI86d10AAoJEGsY5C12UxliJoEAoKgP1pbGf7WFJR8q3Nyk
HoMYoirnAJ4k4kusg6EL9nt/WBcKmzWDO2sEs4hGBBARAgAGBQI88QRCAAoJEPsP
OnXTORgQ0a8AnRcSVlV84X56jTnSftapXggAxG/yAKCbIogHWD0SrzV0DXgjo+AE
IuYXCohGBBARAgAGBQI88l+3AAoJEE6prRadbVuu/aUAnivV8DalPGw3QcuFmpBK
wSwEMCY7AJ96Mb0eJVCmj/+nbtDIhXj9ihCCAohGBBARAgAGBQI89JjcAAoJENOh
xR3NTfIFU0QAnj0YNNd5gZNHfNmIb1jai+5dgSX2AJ9bovKcoZIZxeOoFPpmlF66
WIozL4hGBBARAgAGBQI89QC/AAoJEE6prRadbVuuw40An1sLHPZXu05p4/wqDnqN
bECMZ9QgAJsFRiiz9IbLbtJ6JolVDGHpvLrrN4hGBBARAgAGBQI89QDzAAoJEBnb
ZojaeNCo04YAoILQe2cG58KsPTSyIkKTg+mwkQouAJ0eCgjvNWrhPHiSRnegEsbF
o4zsK4hGBBARAgAGBQI9H2xgAAoJEGHsr3XM5FOYekcAoMY+mIbdRh9YTGKrskfW
QQCQ87bxAJ0ZZTr2iwukIOXW8ryk4zlD72ZWi4hGBBARAgAGBQI9bjqiAAoJEHLT
tWP+y1FLj0kAnjGZGzl4VHxvUa+c4gD/GMrw6wgEAJ45Gy0INAp+Rh6NJbNECzjH
OFjstIhGBBARAgAGBQI9cUfYAAoJEFwRFAeEa7Skd/AAniL6ZGAUqQGs8siu2ia0
SnVoLBQyAJ9DrvhmP3aaZf+/GwR8Gx+Lt7uwTYhGBBARAgAGBQI9eF2CAAoJEG9K
95D+u1J7GAkAoIVs4Kxb0R7luN6Pi+WhXNfii4QbAJ0UZLJ/ySM8ZbHnGTUNIooe
ecnLjIhGBBARAgAGBQI9h9ZMAAoJEMR6qYKMZW0ODu4AoMMA74PG6QjDICxdsLWe
hhuJf3VzAJ9aHtt/ld1W/DTWSjdvH6AP9g6ZeIhGBBARAgAGBQI9k3U6AAoJENBl
k7NU+gyIiCcAnj46+kM9W4dDxs0dqNGCOXfzfXUjAJ9DWG0bLQ/tixVsWApUHTd+
ffQM2IhGBBARAgAGBQI9p/iCAAoJECxm82ySywptILkAnikhz+yOxNJMNnj/aB9C
h4i0fQmUAKCHRje8FE5DZSPWf+OwYcixOm+TxIhGBBARAgAGBQI9rwp0AAoJEDxV
WkwvmGAIsxsAoJgH82l8l5GRGwXBl26AHj8ZA6zaAJ9bKL45L0jyrSRF1V5FPLxY
twXDe4hGBBARAgAGBQI9tsipAAoJEIIYfzQ7kw7P9UAAoJ4URNsGaPSQkTSKLO9E
rSPkRdHXAKCynlouXdSQ70FBn4j6mG5I40cnGIhGBBARAgAGBQI93wWnAAoJEE1r
ZOIZBCWd+yoAn0IBXJN0bR73EG7dtOPB4Vf+MIqjAKDky8A5HD2DHDrED/bCDDBG
JeS134hGBBARAgAGBQI98WVmAAoJEP4Xknlj8hRJ51kAnijQacczGC7jafSF5un6
nRG65a7kAJ41Z8eK4JMaTNVLkkM3n1e7hh7RAohGBBARAgAGBQI+n5+UAAoJEO5p
t4fBbO/YeOIAoJA3UYEf9kntgTFeNY8pOAnCY4ouAKDjI2BHDR3zlcNPNcaczJO1
Uvxd64hGBBARAgAGBQI+n5/CAAoJEDBJWXZ7Y/q9XWYAniEPJv06FUNu2iZr2eON
fn137TmAAKDQoEEKk4kZ8bYxI6HmRRbBU7hQTYhGBBARAgAGBQI+thg2AAoJEB4q
exxFM9Jns00AoIJMwTx+2aRpo3WNCdulrRUzx/ZwAJ4waxt3zbR0M15kEF8mlB0h
198mOYhGBDARAgAGBQI4no7wAAoJECShvswraT6/w8oAn0XLPn0F4s9wQ4pGXNPC
m7MJ6E5zAJ9CbanRlaKAXoD1LP5bmADGkRBqfYhGBDARAgAGBQI+1KueAAoJEK4I
uPUH3Hp+6ngAnRTP6a9ztIe15H5seESNWjlpGzBcAJ96No/FG7JY9qHg2WoJs/F4
[...1608 lines suppressed...]
RQCdGaBGlA0R0Bjjldv0vEBtcbVB/BmInAQQAQIABgUCQyCv0AAKCRC0a5I7bYq+
cY0kA/0U+JNuaHih2INmjGtIyNtn0uLR5OVxpFDy9fvh1A/PQIcnv6Cznf0+/1EO
pC8dO6HWQxs6d1n1ZK1yDPc3boyLjxLLxuWd6B4xM7HsjqvBvW2fvVFcpPioawST
63swdZIWdvz5c7a3SOSipeuepxyutXLiLfcCB5HviXbCkYf4+ohGBBARAgAGBQJD
ILAFAAoJEMWvd0pYUQtaHroAoPk4cr3Cd0eUk1ceNnoBMeP+281CAKDjuLEpyr2S
4txh6EvT+jz0PfWJVohMBBARAgAMBQJDIUxxBYMHN4h3AAoJEBSp1Git8Ip/wbMA
oJemraY1wFzUJAWsY3D4bFxLppX5AKCA+jLM2kD/5oRZbIqSzGtkok9ZY4hMBBMR
AgAMBQJDIZVDBYMHNz+lAAoJEL/r08ZBzwMi8KkAoJ0FJADGDhigHpm7dLEoRUa+
ZpxFAKDFQvGvWe8G3qCzb/LIdyzfIJ0hzohMBBARAgAMBQJDI3VNBYMHNV+bAAoJ
EJugk2taNf1CygoAoNAK8rnU1FUY7ZJzCgw+ZjtzL3jEAKDIwfErE8XTv5PP0sJM
CUJhxf7r4ohMBBARAgAMBQJDI3gFBYMHNVzjAAoJEDFIu+8e7yb0pT4An37QJM1Z
P++YHev7oYJknn57POoKAJ9lOdPWCuFuiCdPM9L4CvAUAeGd1IhMBBARAgAMBQJD
KKE0BYMHMDO0AAoJEEk++45dZPhw6PYAoJf6zUL8WFtgMLXr7gYeknvv8MJ7AKCL
XLi8Tu2SzTIc/PeFUqoLeSUoH4hMBBARAgAMBQJDIJ3pBYMHODb/AAoJEJT+3vmt
NrUVuFoAn3oCb9Z5+SeuRbBf3F4jy7oXa4ZEAJwIVmjnLrfaQvYWsNmTOK9Ao/Qy
TohMBBARAgAMBQJDIKhFBYMHOCyjAAoJEGxk7XjeNO+hJh4AnREqzDeFWvNqKJgz
LY5MMDPmqE8rAJ4khVpKsCn4zTTL88oIg4d7Q52gSohMBBMRAgAMBQJDIKH3BYMH
ODLxAAoJEDA62eiAWc/cOX0An1VJdoTDlAW2y4cxBiiqPbvwYzhPAJ9SFl+1uI/T
6PadAFhV1le5/NSTB4hMBBMRAgAMBQJDJCP5BYMHNLDvAAoJEHw0FqlEG6/3e/YA
n0xTVNplMGLfwL21U4uztcQo0C+9AJ9XF8ORPSTU3jzv6j7q+kBRwZpz2oiiBBAB
AgAMBQJDJcl+BYMHMwtqAAoJEA348Hf+CljYLmQD/2aFAfI9tLHiBvHkYX/GOJ5V
9bOhh5/9y1ldbd7mJZhYm4gkTxd/4TeO+iOFj4OjjcvGYfQo6O/B7n3M/VVNcpdJ
Cd+GjUvqVucwtEJu/Zlejx6T2zAjxpZxhVAk9U1iQ+tVC7ld+PEnLoHDsEI1cjuO
SDVEh4S836xlym5CtQGBiEYEEBECAAYFAkNfjG8ACgkQ5XoO79RjNtr/CQCgvQam
DsV4gii8XMn7N5nViO1J2mUAoO4AtHtN2l2Imsrv+y4W8wtpFyKEiEwEExECAAwF
AkPTbagFgwaFZ0AACgkQ5klUNHCsE9WrtwCfSFV3kQnpq8TEP5Sd15JR6zHawLkA
nj7OzbtoOwobgeWTB6NrVOh45wvHiEYEEBECAAYFAkQFyuAACgkQ9Jgd/vNmD1NS
6wCgjFSuWKUMECj8lq751xuRhdES0BIAnj4nvo+sxUykCpiNdGmD/kv8BR76iEYE
EBECAAYFAkQGZN0ACgkQIIdHgCGsbMShDwCeLNGiHENHdyi4L+ZDohBWpUvzlLYA
n3Uz1vuofNQ3JakVjyVqOFESowMYiEYEEBECAAYFAkQH63kACgkQ3HeLB051S+3p
LACguWszxmfMO1IxV+HtYaxfhhogv1YAoIUPRfY0bNGfJbcpeQfr+CcDT3hziJwE
EwECAAYFAkQNdgcACgkQpOAUxG0aO7HMBAQAlr0rX9d3DVtkoWDnJqjtxd2AEGIv
epBd3bH4vxgaxlKHO8qF9QRJk3TMpp+AketiERWexrwsu3HRsINee/9gb6lkVkxS
uTcSfn/NXT1fFLxyCEzxyhiC9nwKObj3JPOMRnJiPsET30aZ+K9/yfiuUfEUrDly
gZy6OfFa/jY04eKJARwEEAECAAYFAkQG/cgACgkQ+fnDJwmNErObegf+JtFCMTbg
ewZ4R+qmz7WWB1i4zOPCRe6O99EexdcXSOAHZ4r3oLiXMZEcjCQKZ5Wpz1TDqsob
VkyW65Ws5UwbiTs1WO/WI10dHdp9Vrv+ALhsx32amwMV37qrA9RCoBIU0QQFVTMk
Y1W4iLT0Myd/0C0VCHfMrV1S43ZPDQaC7V3yh1KCpZzjhZGTIKJSvckWjyTsUW2F
vCusCakX2P/GoSs0oF5s0mSl3BvlbkxlI2ZzE1bNfVIpqSDR8jT1r87cwTJkEH57
e3PrO3DEbiQTHjbyuwD9kNTTnV2oGvVWPF/FvsFBk+fln1yECv6SIpALU1/zVzG/
wZyP4MwTIOb4NIhGBBARAgAGBQJEKFdaAAoJEBH0xB6z+64zBhUAoJ6kWu5gDqHB
Z8Wan0YynEZi6tKyAJsHBacxx6UNYPENlVXlb0xl+kssa4h6BBMRAgA6BQJEXmVA
MxpodHRwOi8vd3d3LnNjLWRlbHBoaW4tZXNjaHdlaWxlci5kZS9wZ3AvaW5kZXgu
aHRtbAAKCRCUj9ag4Q9QLulZAJ992LLlu7wU5sJddqnffDzPoKh69QCgoX8QzBEi
SZjLKSrALwLCTYI/akSIegQTEQIAOgUCRF5lZDMaaHR0cDovL3d3dy5zYy1kZWxw
aGluLWVzY2h3ZWlsZXIuZGUvcGdwL2luZGV4Lmh0bWwACgkQtHXiB7q1gikU0QCf
ZM81Hr4p7ZPwxMZW+TVcRdaSIjoAoMq7mN4xSLtRsB/lGlFLhc1O4soLiEYEExEC
AAYFAkRc/SoACgkQiqNir+lyMs3HBACfb7fa3KzNGB9Oma3KDWeC42feCzAAoIfF
w3OXxtigxx8+AowiXGsZmqI+iEYEExECAAYFAkRc/TEACgkQp99YcnDUTCOrZQCg
gV7PoPMl1d+gvPTiuUAZm8UG/dYAn3PlOcTP4vxayC7OGSkoDA8Dut+KiEYEExEC
AAYFAkNEG6QACgkQ6tS1kPaJm8DI0ACfRfci8SHm+sQpjzKqr0zxfJT5yF0AnA37
mn7nQyY28SJ2sddCo/f1JhvAiEYEEBECAAYFAkQFglgACgkQb11ZaBzVLeiG9wCf
aX6+h8bpMOraCn/sH1yQb6aI34EAoLzx4H6lGdyqnQTYiLXSrBTrto/niEYEEBEC
AAYFAkQGCjQACgkQmsnSLGNcY0vZ4wCgvBjcB5ABcNYRMEFSWsClxhaRAqUAmwUv
MA9NWdLk0pcUndbE3w70B5hUiEwEEhECAAwFAkQGKycFgwZSqcEACgkQ3+ZXkjKV
xc2qMwCfdew+RX+7ultYmO0Y8gRoLJzjBfgAn1UkZILe3+NKZBJTd1ZowJQiljHI
iEwEEhECAAwFAkQGK2cFgwZSqYEACgkQoOUVvzmICVQuFwCgqbjde48qPvUqLEip
he/zFq6pqgAAn1dXi6z+1s+bHavwCQK/q+3K5gdHiJwEEwECAAYFAkQNdesACgkQ
/dJ0ek5GOmrWRgQAoFF9IdTs5vX5OIDKIHW+d4aJfPg6w91SKkfpElDxNqZuk3rA
HvekwMSeCapKjyUajgKA4hHLy51cupdJPrz01uHO8ySxVaHt7f0qKXEcMXiEFP64
aEi+Mhx6TvPAE79tJdvgSOnUWqtckaEJ1oY4+J8kEvXP40WcnGynIPDVB6eJAhwE
EAECAAYFAkQPSJcACgkQGioH6hxXudkA+xAAruFS7PuoOVGB2fS3Er4O/NaT7H9h
0TVpGKI8JiE35+CCEbxESuIV62M23fqipD/Xli3XHBoycx+DtazmYSCjCp6yoKWN
XC/sm+oTOKFT0y2tQyPJ0cu4hwWYYMPbL1QIgtlIeB1TKEd3vzCt2rf/Xlod/udV
7KFQ6V5ZJFkrDnpwEmlL5RmfE2rW1EL7oEc4VfbbgyERiJP8jxoqntTkMFR6LLdb
NXhdnUse2BsVwtNgpcStrDb+1ucVj2BpsDNjTx+mPBUG3KgirCazO1kuu6qTMW/P
0jhds5TU5DlVrCaBHiCUotcKtVCigruNqosNRc2aCKXWnaJUpnmSaHBCN7wWey2K
BqPXPjC3LOR0olqdFuLtXdzMj4lDdrWfFss60ABcxUl8LafWYTDTiVTXQLJlv8kH
XY2bwNDyy++Ybu1wBw5ODtUBtdrL6vnIMm2EzrxFMi/jIP+lBVEcdSS3E/pO859k
UQ54mY3/JTKTpOMWcqLJ1ujNn5U7lRHBBCJzRfIfQL/xXxFVkq314AgguOmylOsY
+KlVngmeTD0XOAgWg1vwDEw3vXRpwiB66QCOLYoAcZzhpvWlmrTdCVWXQlciSbP0
1jG2BNN3fWa/l5ok4s60uFhcLnhpUepzuq0gHzSgg2H3pWlvVaO4KQr+3N+o+abd
ngPGs5CQufTiYTeJAiIEEAECAAwFAkQFDZkFgwZTx08ACgkQbjbvGsyNqzB0zw//
YgstKNU1LGBbXgrwhJM8Qg/Y0JCa29yMMDr7iWnEP3nRft+cNgU6F58Qq/n9+3i6
SgpXFBtPW1UrJnZHVl4ykDDx2dQf8QwjAPcDAWs/yz6XbRihpSD3FBuclgnMCbrr
ZpDAnEAFuK/Z5Zj8ymsdqf2Mjgth9ch0qbu8Q/SKAUhYZPw/07s5g9ie4CrNu3XN
IjlCW5myPStcP8swqIcCJRbB5VvY7q2dGT6tFD3KbpLEn0Ur7vX27dLgF7hx4F6e
g+ZIta/vvHKFCV7UIA4qe36K9brv4LwOxs+ftFRxJYLW+UnNbB9x9ublOk6V+cmc
ChlGvdxFd0pXskvHT6+XBawnmrOvBy7zDiZdMBodHL0SfoswDRNf2/fkdmKhURDc
9PLtfPzuloUmxaN06IIA//kFXZzFFS1Yjq6tWQo6dJKPRvsYlQPTz9t2nWF1dOfs
0iGhW7lR0NU05auSqzgaJUQytIZIr5QoKHx0Zn2nPh2890/xgJ2HamiaQQ0aT7tz
w+ox+/XgG2dYuKDKW8ki2WAehXYVGNEtDK6YJmfdbkbUww+Q478g+TfnKQ6w8VS2
w1jqpg3656jzWZg6wUiCvhpnyE0dZD8J8KQwkEnFNc4TcdN5BEmWxnz6JTr3gdUA
6DmDi821xLkQDndOvd0lbAlKoDxascWP0aTBciVlAvCJAiIEEAECAAwFAkQFESIF
gwZTw8YACgkQHRqO3OFAoFSLYw/9GFOeol/eGOQotl7lOcffMlaTUdI/PIvFvoAR
/8shR+za0dWqKzIRARn5Q9pjmNcuIHWlueupA+32mEqP7a4IhZF815k26kPJ7BWC
ZXjEF6tU/clTvgOsqBk+E6VazL96p8WzvFWvO9jqNNgX+ACEq6GA5z0sO2XrNdnI
YE3t2MsWebYbsV6jdyaIbjatO/eZ62kbYn9pDRkL5UULyYYDJUB24xbZK0xoFcem
GGs+rzm9Z5Av9+F25bhZ84S11KXcR9GPoe4uW7tMEI25y9FKr/+PDRUhGP7KnlvA
/x7hfUnlPbmhZlM4Ewhu0GP3fwzVXzh7ExdfebWFQhDluz8Kio3UvZI99sSqB8F4
ICmexnTXWsyKTYsU1b24l6RCzss8NUjJGZPo7bM3Z6cFsdPtJ82j00CLuhgB50BM
I+df96iKhTeEn3pN/whqLrrIIBDxw0DeebRxKdZnXAjKHKwGOIqKepEexr6y7bi8
Xos/swevSNEIdx+EtU6gWDI5GyT0sNePAtf1mr4O5zGr95XrZ3Kf84BrpUTHCkiz
neg/kirnnW3Zn7lv7i5TwJlK0jH85es3kWYbyy5qbQzmrMvOqtw8IcQM5Iny0I6v
TCDh2hzmGUEpPHJQf79LKb2HFg3PJAy/qyWOiGk4C9meqmpJFSy5UJhd4yAK7uuG
iMz5etmIRgQQEQIABgUCREihKQAKCRAFi1rNRBxfgangAJ9+uYWIpLFlxzA0ecaQ
xVXJkHDj6ACePdI2VJIxflo2IzVDZR8E1tavH4GIRgQQEQIABgUCREjJ/QAKCRCn
L/ZsQr1kXR7pAJwIKv2Qqa+/+462dqU61HjyYD6cIwCfaVG6OEZVKvyxF39Y7dCq
okIgk5OIRgQQEQIABgUCRFsJZQAKCRB/3j6P8z4/xjliAJ0Y9b5gJ7AMKwamZxfo
7vUpytH4bwCfRVVxusRKkqgQ44Yi+pEZulMkfpCIRgQQEQIABgUCRGCHygAKCRD9
AQSw4jPImMrLAJ9gxkxh4oIcJM5XEYvKaYxO1r8RbACgybXZPUKIjB0D6VGea8TH
LJOV3kaIRgQTEQIABgUCRE/tdQAKCRA/0h0qmjpVWLDwAKCcTi0jyFD2d/MI1NZd
GYBQiJAvsgCeNHNSZjWWHuvz68YF1ZyaZzLvzZOITAQQEQIADAUCRF3UigWDBfsA
XgAKCRBbqJPk7D6Y30TkAKDHS7wBh5G6EPPMC16vNJwOIgfrNQCfdLK+e71M+mz4
sgzVEh625NcGtZCITAQQEQIADAUCRF8XTgWDBfm9mgAKCRC8EAnaDpclP5j9AKDB
VPkHkPJOeLTvpTFU49JloRL/ZwCfYMniDkE2yjqPyeAe6WLat+nZfJiITAQSEQIA
DAUCRF22QgWDBfsepgAKCRAyNS1FZ/eCZBq6AJ95fp74I7lRx8zt3B+WjWK19bWd
5ACggupHyHoQEEm00m+7UgEGmuFMHHmI3AQQAQIABgUCRFC2ogAKCRDR2VIECemh
1f+tBgC0TjA2eTBH5WfFG7N0+XvHVj4SZnRJfj5k9WM7NyVXAuBRHqRDClz4o+7t
DI7XnpJa6Uf7kI9iabJ7gMxEcXjHstKz1LhycgpmEnCqvVHWZrYfudKqzVfMt0t6
QEjDtDR8ccYUoNYRhNBFovSHQazsEIISIk+I0nm/l6TOREI80+qBSsktW0Pvd6lg
BkjHScDk52hXeLd8BQfpfIDxdqAFyW0wC/2lF0jYYC7/FZXpsAFyTTZXeMCZ+vSy
z3iLTyKJARwEEAECAAYFAkRbcFcACgkQZ02H1ZEZDvnadQgAyHXaBb3PpaZUlvA7
wb1nAua+LO7qXSR5jLsLl71iWSzfdViqtGVjlXSrsCB74QvSxcRHtpTFqDN80VdV
oGwNfLPOVUWOEu/Meh1EfugpD0rahwae0FCc0Tu/RnAQbibN+I5SdNKxIPKutCH4
XdouoD7gSDN4wNAXrHatSxaDTHRpu3+3FNOLYy5NgAPzJcchT6/mQ/YmwIlEped2
AdEfuio2E/SFpR1y+p3xfqvZEZ9iiX5QKr65fmazBksDYhqR+sGwtjqQwifMqUUI
tnzUTHQH8IQU5aoI97DCMOu1mlrA4NhNXqBNRC4+CWm3XGgQc6kBnL/qF6syeUMk
z8gDlYicBBMBAgAGBQJElY7IAAoJENwG3M95JPpzalYD/jp8FsIDlMIoNhHr7+sN
qbexeYupQDeNNqZUSvVFl2OsIY9clsWAioWHoQtBTZQ3z45nVV6RRVK15+tWdXSe
EoTQskfdS79woeq7LgLTOB6yLjjhNgG2YyMwBw6eqC97/FpNqED101n538J75XZ3
9v8fMErAz2GEMrT8lLgj5UEuiEYEEBECAAYFAkS9UTAACgkQxKXVjqqse7yTbwCf
Vdx7ZbTonurIXC27+BRl8eA4HXIAnih67tYrdols1F3hxc5WGDNuGt9ziEYEEBEC
AAYFAkS9Os0ACgkQOOnzljbgEa/DZQCfXp8cAjuDumQJJHqJsF6xDzMxeYUAoIoc
+HbWTvWAyUAJhezqfSTxvvfkiEYEEBECAAYFAkTCe3AACgkQQggFxokHT625SgCf
anHG7BMHpCjPGl0K1A2jvk+UsT8An1blZqLZfsQFqOwp8aM3lYfXgQDtiEYEEBEC
AAYFAkSNRGcACgkQp6+YGoOsM0oNzwCgxLPbVnWls9geqVyjZxFalLvWJDsAmQFf
76bS7JiyhQ5adD8iXhW0CKdziEYEEBECAAYFAkVXpxYACgkQ9LSwzHl+v6v0+ACf
TH2UJ1s11ygX4MGuVJZ1lXEJ9LAAn0gk/Fga/IEJ2x4IhchMw8xV8RvdiIEEExEC
AEEFAkVbWTI6Gmh0dHA6Ly93d3cuZmFicml6aW90YXJpenpvLm9yZy9kb2N1bWVu
dGkvZ3BnLXNpZ24tcG9saWN5LwAKCRAyNXpF8ejm5IczAJ0S/kd6+n9RtlhMuXc8
ij9XsTV8nACg3/CDXfU3mo3eFY8C6taTFUkT842IRgQQEQIABgUCRex7sAAKCRDP
6Ei//GeFord7AJ9OTDnZn4UoOMI8SMhMSQG2RwZS1QCeMo4+3rhFWl197wQUISSa
UbEymqCIRgQQEQIABgUCRe3kPQAKCRB3vlkTd0nZ2UACAJ4++JE629pGiJZvvjgY
t5Rt2qYciQCffDOE5ldc8/vfkY/j3g9qjb3+f9GIRgQQEQIABgUCRcPBPQAKCRCO
qodEOSmdMQ3xAJ9aoLpFPtuw3WO6xJP4q1bzOIDp6QCfVHhJYiDBcTQbnIeDeIhW
Q0QsznOIRgQQEQIABgUCRcPBSAAKCRD6RGIhxCQl7ZtEAJ991bKoauaANbLu5AHJ
DeDZqbDzrgCgoF0R9fuJfcOIToZfn8/TgIjCcX+IRgQQEQIABgUCRcPBUQAKCRDU
BjIcB09ehLwDAKDHaRXarOBs+dy2YZLP+ps6J5GRaQCfcBs4PbRdyfPExOmzrJjK
am6x7EaIRgQQEQIABgUCRcPBWAAKCRAtCXF4Sgiq3wDDAJ4vdHpx5jfxVjZK2b36
e76o5ciwVACdGIdCTvt4T64gkukks+Iz/L8brPSIRgQQEQIABgUCRer2xgAKCRBO
OFL0w3wdCTQOAKCp9dc7VBEMwSfoUzVVOutO/C8AVACdEHrn6/W3F05u56dkRMS7
9AByuSmIRgQTEQIABgUCRVg8TQAKCRBU9GFq67wvJiEaAJ9rLGAkAvMeccqYFBVm
rP0aMvUOwACeM7QuCLlRy1Vj1aITHzFceHp5JjqIRgQQEQIABgUCRe3bCAAKCRDR
lQx2FhPo1SIpAJ9Tx3e0bx91LgKzod0R0uhRAMGHCgCfdJ/t6r5hBZIAWM3AFWaG
BGVJIPGIRgQQEQIABgUCRe34FQAKCRDemKiKLdsArEpKAJ95NIcqjpLxNwWersWD
IUy0m67bRACeOkaaI/i+HL4XTtQUPp3P89TSbN6IYwQTEQIAIwIbAwIeAQIXgAUL
BwoDAgMVAgMDFgIBBQJGtcWRBQkXLil/AAoJEF3iSZZbA1iiYL0AoI5OdGEa6zru
BXaT7wrZLDK1gOpVAJ9xoQkq7wQF3SzHcXTbgZf9E3CdmrkBogRAXdpPEQQA/1KB
8hsg8voFDWeqhuWxNiiLBY8vjy4Fk+OQN/LxexVHlX1pFCWCALjHj8wPcinkBSBF
4js9weenibe9xUtc+X7/uLuEDB3ziIrOA3wjxVbQR69+Vw2budtYSemNobElYVuF
IsjUOaqdp+hTydmAanZCgT5+WAYN3nn0LdKIdFMAoNuqBLcQOFNvB9L5sCFbleLz
/YI/A/0e5565b0z9zK3xS+WIuyPZ5gwQjLsJ5Is7Xdd+eoKNyccr5vn38AN3312k
xqreAqPsCPVEixFXapYMmkM1dXE/sLL4XPF6VCzK09A5XwfwCQH5GCZLJ/GU1FSQ
LexBTqNH0jCY8PiIHl+n9KpSmf77vtMACteqx8duaWfBy5TUQAP+LsISHEsFhLU3
vuHDEvwNYKqOmL7U8ob7p1zQFAUhTe5SFvMsZ+oShtQOG96qC2Wy+gRn+VHxGAy/
+46NcSCIBNDJMRruzcza+NeWkuNePOSWZrcuqZxqbd0R//k5HTbJmJ/qE9T/Hx/9
VCV7SQo0p04JXX52WjxokfZQhlFEi+2ITwQYEQIADwUCQF3aTwIbAgUJBxtWAAAK
CRBd4kmWWwNYoiKoAJ9/4y+YEsZIEDQ2R0r1kHd9NLMJ1wCgusn1Bh7b68W7ZZgZ
k0LnEnLZ1vWITwQYEQIADwUCQF3aUAIbAgUJBxtWAAAKCRBd4kmWWwNYosNxAJ90
WHb91jqnxLPqdLm1/HlqQ6qY8ACfdj8+liZn5sh+gVweXOM/GYj3e5KIlwQYEQIA
DwIbAgUJBxtWAAUCRHWsHQBSRyAEGRECAAYFAkR1rBMACgkQYHhOlAEKV+3ZEwCf
VeIv9sL2EHJkicIlNoJ3xZLyRgIAoJ+kBbAsjGR/AB4P9Ej7anTSdB+8CRBd4kmW
WwNYorHtAKC5zj8eISzrgTLmnpiKHLrtfwTRiwCdFcwV1dU/vDDy6V2WM+IPVODK
6um5AQsEQF3bKQEIANEoVLSVnD/YxrBL3s/edXK3YUX1dZvyyLtP0mCX41EX3e6p
Q4gLXmze7lJU9zB0iGgbTjBgodMsqHIECMWnhrN8uaIgEMOnfsNjdIC0lPpOyBQt
H7IWRdtG+4g5Tk3/RbHOsroknCUVUTJo9fvOZZUowKP5IyPYWuaW25VLRoJ/SKje
f3ttQC+5Td2CNMWgepbjTXuyZ9sThUzCctiLf/VJL2zTKwozo/HnIQzehCI5b/2l
LjzBIV+zeVeLw3UGKSA91TkUUD7kEZJSHHIV/6Wp2PBwHIELstPd0KsV5ZA4vRR5
WHrAbjw7rePyO57uZ9Ob7nn25ecP8nrk+IdxlOcABimITwQYEQIADwUCQF3bKQIb
DAUJA1jvAAAKCRBd4kmWWwNYohLWAKCgnbPg6cDR1W3tkz894CwpcDQoVQCfcBXf
K5kpfhYfDk+d/mwuYXktSSW5AQsEQ7gWIgEIANFah4LB/iVUglBqEzvK0VG88yuR
JlDLTvb8jr/hA8qxocj4eegHw+NOYGnIEMsrxjo5/djWE1vvvF76baD7xar8FQoe
9SLUX7HOzOmeLG0yv5A6LLpTuQIkDp8a+rSqbOtcZy/mteka9bDJl/KZMtbhfZYq
A0vxuE4PLS4n1lH9+GMTuecgeAhuhKcEBQ8cKwj0EW6axtTwUqwokI4GrOIcTIMd
uLHu4/oHJiyUfa1TD1Z1BTxjOjaZaiOCFemMTtRPS0BvhA1N3C6suCIQgfm6awzj
d6WvX/ad3ToqKBBf41HgyrK1H7bwm0QQq9QvAlmmYTGzgH44HjHyX7otzT8ABimI
TwQYEQIADwUCQ7gWIgIbDAUJA8EVgAAKCRBd4kmWWwNYol3LAJ43JG07X/IjKI2S
i1hF87nLfG4ehwCcDIDiNrFrvTaxGziI9H9ZYmQyASqYjgQ/uRN7AQQA4PCjWWzi
/vMxKJcYm5eECcScwD2KanQ0jznjMTrfuwkJVmKiqZro42kF54x8pQMFpcEBOrKK
KVlcp9JEsSjjyN0qE21MEYIweAYxJQXOGlEGZHimDK3C7stXtNMRJ7EFnpLUWUbg
eIwNDLnV8Locjpi20cFm21GdUgud4VefnOMAIPpvtYO0MGcxMCBDb2RlIChjb2Rl
IHNpZ25pbmcga2V5IDEpIDxjb2RlQGcxMGNvZGUuY29tPoi2BBMBAgAgBQI/uRN7
AhsDBQkLg9oAAgsCAxUCAwMWAgECHgECF4AACgkQMQCenzfZL/vXIgP+MVhiaKzD
y7LeeVXZwwHwfwc3yI/q67mcrbbCwWomgQKb+J2HSS0MLoio6mKiLLeR6Fy/QsRL
S347V5jcWnhqlohCYOipmVVSRHrLcOrAuuUEjtjBBuPdH7NgN3cHFSo+Nc4cbcry
opcwxNUCLr2GDqbvBI7k7dn1B7ob+V3UokGISwQTEQIADAUCP7owmwWDC4K84AAK
CRBot6uJV1SNzdO3AJjZiVSOGYmMzWVc+XfFKy2+Mvh7AJkBpHifVlq5ybuLa65Y
gIzwp/+8BZiOBEO3+scBBADQmRl6K1zJAyqTbEZ3/mYahzj5g3BCjw5KZXAi9jxQ
Aje0GiuEXqFr2eJqplTi92V1OdcxTSPWg9yQCE6BE9o69oRmFhRMXQX/XmmIAXl2
RlDp2yZdVSQ81gxlOmRzacD4gAIGI6bKAYGQsW5e8dFbWLpI3PbyJEf9RlxguL/a
IQAggVZQmbQmV2VybmVyIEtvY2ggKGRpc3Qgc2lnKSA8ZGQ5am5AZ251Lm9yZz6I
vAQTAQIAJgUCQ7f6yAIbAwUJBaOagAYLCQgHAwIEFQIIAwQWAgMBAh4BAheAAAoJ
EFO2INAc4MYweaMEAIdDDtJLkO4TOgCo/GCuG0RmqRwZniJ4mnq/WOr8F4BK3w1H
IuwVEE8V6BRU4Chx8wc9/W83krckIE5uaZRmjhCXCWsiK9Ow2ngbXAv3TKFVCbMM
myjBbT+31M9OT0Sowob8a1s4Xv2J+gQJjxfumMUKNlvfK86tEx0ucCiY15h8iEYE
EBECAAYFAkO4EUMACgkQXeJJllsDWKKR5gCfdiiNjGdj9/mMariU4cnuSmaPQIkA
nj+zW9f9Z2M0K2r+gldEC2Ew2yTl
=I1gH
-----END PGP PUBLIC KEY BLOCK-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-libgpg-error/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	23 Jan 2009 23:21:56 -0000	1.1
+++ .cvsignore	24 Jan 2009 19:50:20 -0000	1.2
@@ -0,0 +1 @@
+libgpg-error-1.6.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-libgpg-error/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	23 Jan 2009 23:21:56 -0000	1.1
+++ sources	24 Jan 2009 19:50:20 -0000	1.2
@@ -0,0 +1 @@
+f3e9870e213518b407a959f8d29cd554  libgpg-error-1.6.tar.bz2



From pkgdb at fedoraproject.org  Sat Jan 24 19:53:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 24 Jan 2009 19:53:08 +0000
Subject: [pkgdb] mingw32-libgpg-error: mingwmaint has requested watchcommits
Message-ID: <20090124195308.9D179208482@bastion.fedora.phx.redhat.com>

mingwmaint has requested the watchcommits acl on mingw32-libgpg-error (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-libgpg-error



From pkgdb at fedoraproject.org  Sat Jan 24 19:53:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 24 Jan 2009 19:53:09 +0000
Subject: [pkgdb] mingw32-libgpg-error: mingwmaint has requested watchcommits
Message-ID: <20090124195309.97DBA208487@bastion.fedora.phx.redhat.com>

mingwmaint has requested the watchcommits acl on mingw32-libgpg-error (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-libgpg-error



From pkgdb at fedoraproject.org  Sat Jan 24 19:53:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 24 Jan 2009 19:53:09 +0000
Subject: [pkgdb] mingw32-libgpg-error: mingwmaint has requested watchbugzilla
Message-ID: <20090124195309.AEDB220848E@bastion.fedora.phx.redhat.com>

mingwmaint has requested the watchbugzilla acl on mingw32-libgpg-error (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-libgpg-error



From pkgdb at fedoraproject.org  Sat Jan 24 19:53:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 24 Jan 2009 19:53:10 +0000
Subject: [pkgdb] mingw32-libgpg-error: mingwmaint has requested watchbugzilla
Message-ID: <20090124195310.6AFE8208493@bastion.fedora.phx.redhat.com>

mingwmaint has requested the watchbugzilla acl on mingw32-libgpg-error (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-libgpg-error



From pkgdb at fedoraproject.org  Sat Jan 24 19:53:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 24 Jan 2009 19:53:13 +0000
Subject: [pkgdb] mingw32-libgpg-error: mingwmaint has requested watchcommits
Message-ID: <20090124195313.92F7D2084A7@bastion.fedora.phx.redhat.com>

mingwmaint has requested the watchcommits acl on mingw32-libgpg-error (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-libgpg-error



From pkgdb at fedoraproject.org  Sat Jan 24 19:53:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 24 Jan 2009 19:53:15 +0000
Subject: [pkgdb] mingw32-libgpg-error: mingwmaint has requested watchbugzilla
Message-ID: <20090124195315.78935208605@bastion.fedora.phx.redhat.com>

mingwmaint has requested the watchbugzilla acl on mingw32-libgpg-error (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-libgpg-error



From pkgdb at fedoraproject.org  Sat Jan 24 19:54:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 24 Jan 2009 19:54:03 +0000
Subject: [pkgdb] mingw32-libgpg-error had acl change status
Message-ID: <20090124195403.CE66320848B@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on mingw32-libgpg-error (Fedora devel) to Approved for mingwmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-libgpg-error



From pkgdb at fedoraproject.org  Sat Jan 24 19:54:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 24 Jan 2009 19:54:04 +0000
Subject: [pkgdb] mingw32-libgpg-error had acl change status
Message-ID: <20090124195404.4ABAD208491@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on mingw32-libgpg-error (Fedora devel) to Approved for mingwmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-libgpg-error



From pkgdb at fedoraproject.org  Sat Jan 24 19:54:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 24 Jan 2009 19:54:06 +0000
Subject: [pkgdb] mingw32-libgpg-error had acl change status
Message-ID: <20090124195406.A352C208495@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on mingw32-libgpg-error (Fedora 10) to Approved for mingwmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-libgpg-error



From pkgdb at fedoraproject.org  Sat Jan 24 19:54:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 24 Jan 2009 19:54:07 +0000
Subject: [pkgdb] mingw32-libgpg-error had acl change status
Message-ID: <20090124195407.242BD20860E@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on mingw32-libgpg-error (Fedora 10) to Approved for mingwmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-libgpg-error



From pkgdb at fedoraproject.org  Sat Jan 24 19:54:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 24 Jan 2009 19:54:09 +0000
Subject: [pkgdb] mingw32-libgpg-error had acl change status
Message-ID: <20090124195409.28ECD208679@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on mingw32-libgpg-error (Fedora EPEL 5) to Approved for mingwmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-libgpg-error



From pkgdb at fedoraproject.org  Sat Jan 24 19:54:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 24 Jan 2009 19:54:09 +0000
Subject: [pkgdb] mingw32-libgpg-error had acl change status
Message-ID: <20090124195410.3DBEC208739@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on mingw32-libgpg-error (Fedora EPEL 5) to Approved for mingwmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-libgpg-error



From rdieter at fedoraproject.org  Sat Jan 24 20:10:30 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sat, 24 Jan 2009 20:10:30 +0000 (UTC)
Subject: rpms/kdeedu/devel kdeedu.spec,1.157,1.158
Message-ID: <20090124201030.651967010A@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdeedu/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32690

Modified Files:
	kdeedu.spec 
Log Message:
* Sat Jan 24 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.0-2
- Requires: dustin-dustismo-roman-fonts



Index: kdeedu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeedu/devel/kdeedu.spec,v
retrieving revision 1.157
retrieving revision 1.158
diff -u -r1.157 -r1.158
--- kdeedu.spec	22 Jan 2009 10:53:11 -0000	1.157
+++ kdeedu.spec	24 Jan 2009 20:09:59 -0000	1.158
@@ -14,7 +14,7 @@
 Name:    kdeedu
 Summary: Educational/Edutainment applications
 Version: 4.2.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPLv2
 Group:	 Amusements/Games
@@ -68,7 +68,7 @@
 Requires: %{name}-marble = %{version}-%{release}
 Requires: %{name}-math = %{version}-%{release}
 # khangman
-Requires: dustin-dustismo-fonts-roman
+Requires: dustin-dustismo-roman-fonts
 Requires(post): xdg-utils
 Requires(postun): xdg-utils
 
@@ -418,6 +418,9 @@
 
 
 %changelog
+* Sat Jan 24 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.0-2
+- Requires: dustin-dustismo-roman-fonts
+
 * Thu Jan 22 2009 Than Ngo <than at redhat.com> - 4.2.0-1
 - 4.2.0
 



From rdieter at fedoraproject.org  Sat Jan 24 20:20:56 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sat, 24 Jan 2009 20:20:56 +0000 (UTC)
Subject: rpms/kdeedu/F-10 kdeedu.spec,1.137,1.138
Message-ID: <20090124202056.6634B7010A@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdeedu/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2590

Modified Files:
	kdeedu.spec 
Log Message:
* Sat Jan 24 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.0-2
- Requires: dustin-dustismo-roman-fonts



Index: kdeedu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeedu/F-10/kdeedu.spec,v
retrieving revision 1.137
retrieving revision 1.138
diff -u -r1.137 -r1.138
--- kdeedu.spec	24 Jan 2009 05:55:03 -0000	1.137
+++ kdeedu.spec	24 Jan 2009 20:20:26 -0000	1.138
@@ -14,7 +14,7 @@
 Name:    kdeedu
 Summary: Educational/Edutainment applications
 Version: 4.2.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPLv2
 Group:	 Amusements/Games
@@ -68,7 +68,7 @@
 Requires: %{name}-marble = %{version}-%{release}
 Requires: %{name}-math = %{version}-%{release}
 # khangman
-Requires: dustin-dustismo-fonts-roman
+Requires: dustin-dustismo-roman-fonts
 Requires(post): xdg-utils
 Requires(postun): xdg-utils
 
@@ -418,6 +418,9 @@
 
 
 %changelog
+* Sat Jan 24 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.0-2
+- Requires: dustin-dustismo-roman-fonts
+
 * Thu Jan 22 2009 Than Ngo <than at redhat.com> - 4.2.0-1
 - 4.2.0
 



From john5342 at fedoraproject.org  Sat Jan 24 20:26:13 2009
From: john5342 at fedoraproject.org (Adrian John Wilson)
Date: Sat, 24 Jan 2009 20:26:13 +0000 (UTC)
Subject: rpms/libmsn/devel .cvsignore, 1.3, 1.4 import.log, 1.1,
	1.2 libmsn.spec, 1.7, 1.8 sources, 1.4, 1.5
Message-ID: <20090124202613.690C47010A@cvs1.fedora.phx.redhat.com>

Author: john5342

Update of /cvs/pkgs/rpms/libmsn/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3551/devel

Modified Files:
	.cvsignore import.log libmsn.spec sources 
Log Message:
* Sat Jan 24 2009 John5342 <john5342 at, fedoraproject.org> 4.0-0.10.beta4
- libmsn-4.0-beta4



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libmsn/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	9 Jan 2009 21:22:25 -0000	1.3
+++ .cvsignore	24 Jan 2009 20:25:42 -0000	1.4
@@ -1 +1 @@
-libmsn-4.0-beta2.tar.bz2
+libmsn-4.0-beta4.tar.bz2


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/libmsn/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	12 Dec 2008 21:15:05 -0000	1.1
+++ import.log	24 Jan 2009 20:25:42 -0000	1.2
@@ -1 +1,2 @@
 libmsn-4_0-0_3_beta1_fc10:HEAD:libmsn-4.0-0.3.beta1.fc10.src.rpm:1229116321
+libmsn-4_0-0_10_beta4_fc10:HEAD:libmsn-4.0-0.10.beta4.fc10.src.rpm:1232828618


Index: libmsn.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libmsn/devel/libmsn.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- libmsn.spec	23 Jan 2009 20:09:52 -0000	1.7
+++ libmsn.spec	24 Jan 2009 20:25:42 -0000	1.8
@@ -1,9 +1,9 @@
 
-%define beta beta2
+%define beta beta4
 
 Name:		libmsn
 Version:	4.0
-Release:	0.9.%{beta}%{?dist}
+Release:	0.10.%{beta}%{?dist}
 
 Group:		System Environment/Libraries
 License:	GPLv2
@@ -74,6 +74,9 @@
 
 
 %changelog
+* Sat Jan 24 2009 John5342 <john5342 at, fedoraproject.org> 4.0-0.10.beta4
+- libmsn-4.0-beta4
+
 * Fri Jan 23 2009 Rex Dieter <rdieter at fedoraproject.org> 4.0-0.9.beta2
 - revert use of (tm)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libmsn/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	9 Jan 2009 21:22:25 -0000	1.4
+++ sources	24 Jan 2009 20:25:42 -0000	1.5
@@ -1 +1 @@
-e2088e987a44cef0b243b4adcb8c3825  libmsn-4.0-beta2.tar.bz2
+b0155f01443644d7c4a60269e44d8dac  libmsn-4.0-beta4.tar.bz2



From john5342 at fedoraproject.org  Sat Jan 24 20:30:36 2009
From: john5342 at fedoraproject.org (Adrian John Wilson)
Date: Sat, 24 Jan 2009 20:30:36 +0000 (UTC)
Subject: rpms/libmsn/F-10 .cvsignore, 1.3, 1.4 import.log, 1.1,
	1.2 libmsn.spec, 1.2, 1.3 sources, 1.3, 1.4
Message-ID: <20090124203036.ACC8C7010A@cvs1.fedora.phx.redhat.com>

Author: john5342

Update of /cvs/pkgs/rpms/libmsn/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4369/F-10

Modified Files:
	.cvsignore import.log libmsn.spec sources 
Log Message:
* Sat Jan 24 2009 John5342 <john5342 at, fedoraproject.org> 4.0-0.10.beta4
- libmsn-4.0-beta4



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libmsn/F-10/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	23 Jan 2009 17:02:18 -0000	1.3
+++ .cvsignore	24 Jan 2009 20:30:06 -0000	1.4
@@ -1 +1 @@
-libmsn-4.0-beta2.tar.bz2
+libmsn-4.0-beta4.tar.bz2


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/libmsn/F-10/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	16 Dec 2008 15:38:10 -0000	1.1
+++ import.log	24 Jan 2009 20:30:06 -0000	1.2
@@ -1 +1,2 @@
 libmsn-4_0-0_3_beta1_fc10:F-10:libmsn-4.0-0.3.beta1.fc10.src.rpm:1229441740
+libmsn-4_0-0_10_beta4_fc10:F-10:libmsn-4.0-0.10.beta4.fc10.src.rpm:1232828954


Index: libmsn.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libmsn/F-10/libmsn.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- libmsn.spec	23 Jan 2009 17:02:18 -0000	1.2
+++ libmsn.spec	24 Jan 2009 20:30:06 -0000	1.3
@@ -1,9 +1,9 @@
 
-%define beta beta2
+%define beta beta4
 
 Name:		libmsn
 Version:	4.0
-Release:	0.8.%{beta}%{?dist}
+Release:	0.10.%{beta}%{?dist}
 
 Group:		System Environment/Libraries
 License:	GPLv2
@@ -11,7 +11,7 @@
 Source0:	http://downloads.sourceforge.net/%{name}/%{name}-%{version}%{?beta:-%{beta}}.tar.bz2
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Summary:	Library for connecting to the MSN(tm) Messenger service
+Summary:	Library for connecting to the MSN Messenger service
 
 BuildRequires:	cmake
 BuildRequires:	openssl-devel
@@ -19,7 +19,7 @@
 
 %description
 Libmsn is a reusable, open-source, fully documented library for connecting to
-the MSN(tm) Messenger service.
+the MSN Messenger service.
 
 %package	devel
 Summary:	Development files for %{name}
@@ -74,6 +74,12 @@
 
 
 %changelog
+* Sat Jan 24 2009 John5342 <john5342 at, fedoraproject.org> 4.0-0.10.beta4
+- libmsn-4.0-beta4
+
+* Fri Jan 23 2009 Rex Dieter <rdieter at fedoraproject.org> 4.0-0.9.beta2
+- revert use of (tm)
+
 * Fri Jan 23 2009 Rex Dieter <rdieter at fedoraproject.org> 4.0-0.8.beta2
 - remove pkgconfig hack/workaround
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libmsn/F-10/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	23 Jan 2009 17:02:18 -0000	1.3
+++ sources	24 Jan 2009 20:30:06 -0000	1.4
@@ -1 +1 @@
-e2088e987a44cef0b243b4adcb8c3825  libmsn-4.0-beta2.tar.bz2
+b0155f01443644d7c4a60269e44d8dac  libmsn-4.0-beta4.tar.bz2



From pghmcfc at fedoraproject.org  Sat Jan 24 20:48:01 2009
From: pghmcfc at fedoraproject.org (Paul Howarth)
Date: Sat, 24 Jan 2009 20:48:01 +0000 (UTC)
Subject: rpms/perl-IO-Socket-SSL/devel .cvsignore, 1.14,
	1.15 perl-IO-Socket-SSL.spec, 1.17, 1.18 sources, 1.14, 1.15
Message-ID: <20090124204801.A6ED77010A@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-serv6950

Modified Files:
	.cvsignore perl-IO-Socket-SSL.spec sources 
Log Message:
Update to latest upstream version: 1.22


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-IO-Socket-SSL/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	22 Jan 2009 15:51:36 -0000	1.14
+++ .cvsignore	24 Jan 2009 20:47:31 -0000	1.15
@@ -1 +1 @@
-IO-Socket-SSL-1.20.tar.gz
+IO-Socket-SSL-1.22.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.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- perl-IO-Socket-SSL.spec	22 Jan 2009 15:51:36 -0000	1.17
+++ perl-IO-Socket-SSL.spec	24 Jan 2009 20:47:31 -0000	1.18
@@ -4,7 +4,7 @@
 #
 
 Name:		perl-IO-Socket-SSL
-Version:	1.20
+Version:	1.22
 Release:	1%{?dist}
 Summary:	Perl library for transparent SSL
 Group:		Development/Libraries
@@ -60,6 +60,9 @@
 %{_mandir}/man3/*.3*
 
 %changelog
+* Sat Jan 24 2009 Paul Howarth <paul at city-fan.org> - 1.22-1
+- Update to latest upstream version: 1.22
+
 * Thu Jan 22 2009 Paul Howarth <paul at city-fan.org> - 1.20-1
 - Update to latest upstream version: 1.20
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-IO-Socket-SSL/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	22 Jan 2009 15:51:36 -0000	1.14
+++ sources	24 Jan 2009 20:47:31 -0000	1.15
@@ -1 +1 @@
-9ef155c3cb0d3ba2f6f94288c4a699f6  IO-Socket-SSL-1.20.tar.gz
+41361bc4480642046f50e56345fe6bfd  IO-Socket-SSL-1.22.tar.gz



From wolfy at fedoraproject.org  Sat Jan 24 21:56:24 2009
From: wolfy at fedoraproject.org (Manuel Wolfshant)
Date: Sat, 24 Jan 2009 21:56:24 +0000 (UTC)
Subject: rpms/rpmlint/EL-5 rpmlint-0.85-compile.patch, NONE,
	1.1 rpmlint-0.85-configs.patch, NONE, 1.1 .cvsignore, 1.20,
	1.21 rpmlint.spec, 1.39, 1.40 sources, 1.20,
	1.21 rpmlint-0.78-distregex.patch, 1.1, NONE
Message-ID: <20090124215624.798A27010A@cvs1.fedora.phx.redhat.com>

Author: wolfy

Update of /cvs/pkgs/rpms/rpmlint/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19138

Modified Files:
	.cvsignore rpmlint.spec sources 
Added Files:
	rpmlint-0.85-compile.patch rpmlint-0.85-configs.patch 
Removed Files:
	rpmlint-0.78-distregex.patch 
Log Message:
- Sync with Fedora rawhide version 0.85-3, including:
-- Update to upstream version 0.85
-- Apply upstream patch to load all *config from /etc/rpmlint.
- Sync Fedora license list as Wiki revision 1.34
- Filter out "filename-too-long-for-joliet" and "symlink-should-be-*"
   warnings in default config.



rpmlint-0.85-compile.patch:

--- NEW FILE rpmlint-0.85-compile.patch ---
diff -up rpmlint-0.85/compile.py.orig rpmlint-0.85/compile.py
--- rpmlint-0.85/compile.py.orig	2006-04-01 11:09:19.000000000 +0300
+++ rpmlint-0.85/compile.py	2008-10-23 23:33:03.000000000 +0300
@@ -12,6 +12,7 @@ import py_compile
 import sys
 
 for f in sys.argv[2:]:
+    py_compile.compile(f, f + 'c', sys.argv[1] + f)
     py_compile.compile(f, f + 'o', sys.argv[1] + f)
 
 # compile.py ends here
diff -up rpmlint-0.85/Makefile.orig rpmlint-0.85/Makefile
--- rpmlint-0.85/Makefile.orig	2008-10-23 22:47:48.000000000 +0300
+++ rpmlint-0.85/Makefile	2008-10-23 23:33:03.000000000 +0300
@@ -36,7 +36,7 @@ clean:
 
 install:
 	-mkdir -p $(DESTDIR)$(LIBDIR) $(DESTDIR)$(BINDIR) $(DESTDIR)$(ETCDIR)/$(PACKAGE) $(DESTDIR)$(ETCDIR)/bash_completion.d $(DESTDIR)$(MANDIR)/man1
-	cp -p *.py *.pyo $(DESTDIR)$(LIBDIR)
+	cp -p *.py *.pyc *.pyo $(DESTDIR)$(LIBDIR)
 	rm -f $(DESTDIR)$(LIBDIR)/compile.py*
 	sed -e 's/@VERSION@/$(VERSION)/' < rpmlint.py > $(DESTDIR)$(LIBDIR)/rpmlint.py
 	cp -p rpmlint rpmdiff $(DESTDIR)$(BINDIR)

rpmlint-0.85-configs.patch:

--- NEW FILE rpmlint-0.85-configs.patch ---
Index: rpmlint.py
===================================================================
--- rpmlint.py	(revision 1466)
+++ rpmlint.py	(revision 1467)
@@ -12,6 +12,7 @@
 import AbstractCheck
 import imp
 import getopt
+import glob
 import Pkg
 import Config
 import os
@@ -214,7 +215,10 @@
 info_error=0
 
 # load global config files
-for f in ('/usr/share/rpmlint/config','/etc/rpmlint/config'):
+configs = glob.glob('/etc/rpmlint/*config')
+configs.sort()
+configs.insert(0, '/usr/share/rpmlint/config')
+for f in configs:
     try:
         execfile(f)
     except IOError:
Index: rpmlint.1
===================================================================
--- rpmlint.1	(revision 1466)
+++ rpmlint.1	(revision 1467)
@@ -55,7 +55,7 @@
 \fB/usr/share/rpmlint/config\fR
 Built-in configuration.
 .TP
-\fB/etc/rpmlint/config\fR
+\fB/etc/rpmlint/*config\fR
 System wide configuration.
 .TP
 \fB~/.rpmlintrc\fR
Index: README
===================================================================
--- README	(revision 1466)
+++ README	(revision 1467)
@@ -30,7 +30,7 @@
 	o Rpm file checks (RpmFileCheck).
 
 If you want to change configuration options or the list of checks, use
-the global configuration file /etc/rpmlint/config or in the user
+the global configuration files /etc/rpmlint/*config or the user
 configuration file ~/.rpmlintrc.
 
 Configuration files are Python source files and should begin with the


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rpmlint/EL-5/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- .cvsignore	26 Jul 2008 20:01:46 -0000	1.20
+++ .cvsignore	24 Jan 2009 21:55:53 -0000	1.21
@@ -1,2 +1 @@
-rpmlint-0.84.tar.bz2
-rpmlint-0.84-distregex.patch
+rpmlint-0.85.tar.bz2


Index: rpmlint.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rpmlint/EL-5/rpmlint.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- rpmlint.spec	18 Oct 2008 02:34:47 -0000	1.39
+++ rpmlint.spec	24 Jan 2009 21:55:54 -0000	1.40
@@ -1,6 +1,6 @@
 Name:           rpmlint
-Version:        0.84
-Release:        3%{?dist}
+Version:        0.85
+Release:        1%{?dist}
 Summary:        Tool for checking common errors in RPM packages
 
 Group:          Development/Tools
@@ -9,8 +9,11 @@
 Source0:        http://rpmlint.zarb.org/download/%{name}-%{version}.tar.bz2
 Source1:        %{name}.config
 Source2:        %{name}-CHANGES.package.old
-Patch0:         %{name}-0.84-distregex.patch
-Patch1:         %{name}-0.77-compile.patch
+Source3:        %{name}-etc.config
+# Fedora specific, not upstreamable
+Patch0:         %{name}-0.85-compile.patch
+# From upstream svn
+Patch1:         %{name}-0.85-configs.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -32,9 +35,10 @@
 %prep
 %setup -q
 %patch0 -p1
-%patch1
+%patch1 -p0
 sed -i -e /MenuCheck/d Config.py
 install -pm 644 %{SOURCE2} CHANGES.package.old
+install -pm 644 %{SOURCE3} config
 
 
 %build
@@ -46,8 +50,6 @@
 touch rpmlint.pyc rpmlint.pyo # just for the %%exclude to work everywhere
 make install DESTDIR=$RPM_BUILD_ROOT ETCDIR=%{_sysconfdir} MANDIR=%{_mandir} \
   LIBDIR=%{_datadir}/rpmlint BINDIR=%{_bindir}
-echo "# Add local system wide rpmlint configuration here." \
-  > $RPM_BUILD_ROOT%{_sysconfdir}/rpmlint/config
 install -pm 644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/rpmlint/config
 
 
@@ -68,6 +70,14 @@
 
 
 %changelog
+* Sat Jan 24  2009 Manuel Wolfshant <wolfy at fedoraproject.org> - 0.85-1
+- Sync with Fedora rawhide version 0.85-3, including:
+-- Update to upstream version 0.85
+-- Apply upstream patch to load all *config from /etc/rpmlint.
+- Sync Fedora license list as Wiki revision 1.34
+- Filter out "filename-too-long-for-joliet" and "symlink-should-be-*"
+   warnings in default config.
+
 * Sat Oct  18 2008 Manuel Wolfshant <wolfy at fedoraproject.org> - 0.84-3
 - Sync Fedora license list with Wiki revision 1.09
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rpmlint/EL-5/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources	26 Jul 2008 20:01:46 -0000	1.20
+++ sources	24 Jan 2009 21:55:54 -0000	1.21
@@ -1,2 +1 @@
-d7e2aab6135a44a845f677d27f2722bd  rpmlint-0.84.tar.bz2
-4a6a0894e3f1a305464cb651b629af30  rpmlint-0.84-distregex.patch
+a9344017826f709328c63192c5a727ec  rpmlint-0.85.tar.bz2


--- rpmlint-0.78-distregex.patch DELETED ---



From wolfy at fedoraproject.org  Sat Jan 24 21:58:35 2009
From: wolfy at fedoraproject.org (Manuel Wolfshant)
Date: Sat, 24 Jan 2009 21:58:35 +0000 (UTC)
Subject: rpms/rpmlint/EL-5 rpmlint-etc.config,NONE,1.1
Message-ID: <20090124215835.2299C7010A@cvs1.fedora.phx.redhat.com>

Author: wolfy

Update of /cvs/pkgs/rpms/rpmlint/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19686

Added Files:
	rpmlint-etc.config 
Log Message:
add missing config file



--- NEW FILE rpmlint-etc.config ---
# Add local system wide rpmlint configuration here or in other *config files
# in this directory.



From transif at fedoraproject.org  Sat Jan 24 22:01:52 2009
From: transif at fedoraproject.org (Transifex System User)
Date: Sat, 24 Jan 2009 22:01:52 +0000 (UTC)
Subject: comps/po nl.po,1.21,1.22
Message-ID: <20090124220152.34B737010A@cvs1.fedora.phx.redhat.com>

Author: transif

Update of /cvs/pkgs/comps/po
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20467/po

Modified Files:
	nl.po 
Log Message:
    2009-01-24  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.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- nl.po	9 Jan 2009 11:52:39 -0000	1.21
+++ nl.po	24 Jan 2009 22:01:21 -0000	1.22
@@ -1,5 +1,5 @@
-# Dutch translation of comps-po.
-# Copyright (C) 2003 THE comps'S COPYRIGHT HOLDER
+# Dutch translation of comps
+# Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 # This file is distributed under the same license as the comps package.
 #
 # Huib Kleinhout <huib at stack.nl>, 2003.
@@ -7,10 +7,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: comps-po\n"
+"Project-Id-Version: comps\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-22 15:50-0500\n"
-"PO-Revision-Date: 2008-10-05 20:34+0200\n"
+"POT-Creation-Date: 2009-01-24 13:33+0000\n"
+"PO-Revision-Date: 2009-01-24 22:42+0100\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"
@@ -1227,9 +1227,8 @@
 msgstr "Ondersteuning voor Kasjoebisch"
 
 #: ../comps-f9.xml.in.h:94 ../comps-f10.xml.in.h:99 ../comps-f11.xml.in.h:104
-#, fuzzy
 msgid "Kurdish Support"
-msgstr "Ondersteuning voor Turks"
+msgstr "Ondersteuning voor Koerdisch"
 
 #: ../comps-f9.xml.in.h:104 ../comps-f10.xml.in.h:110
 #: ../comps-f11.xml.in.h:115
@@ -1278,7 +1277,7 @@
 
 #: ../comps-f10.xml.in.h:100 ../comps-f11.xml.in.h:105
 msgid "LXDE"
-msgstr ""
+msgstr "LXDE"
 
 #: ../comps-f10.xml.in.h:112 ../comps-f11.xml.in.h:117
 msgid "Maithili Support"
@@ -1307,57 +1306,48 @@
 msgstr "Ondersteuning voor Oezbeeks"
 
 #: ../comps-f11.xml.in.h:5
-#, fuzzy
 msgid "Amazigh Support"
-msgstr "Ondersteuning voor Arabisch"
+msgstr "Ondersteuning voor Amazigh"
 
 #: ../comps-f11.xml.in.h:54
 msgid "Font design and packaging"
-msgstr ""
+msgstr "Lettertypen ontwerpen en samenstellen"
 
 #: ../comps-f11.xml.in.h:58
-#, fuzzy
 msgid "Frisian Support"
-msgstr "Ondersteuning voor Perzisch"
+msgstr "Ondersteuning voor Fries"
 
 #: ../comps-f11.xml.in.h:59
-#, fuzzy
 msgid "Friulian Support"
-msgstr "Braziliaanse ondersteuning"
+msgstr "Ondersteuning voor Friulisch"
 
 #: ../comps-f11.xml.in.h:101
-#, fuzzy
 msgid "Kinyarwanda Support"
-msgstr "Ondersteuning voor Kannada"
+msgstr "Ondersteuning voor Kinyarwanda"
 
 #: ../comps-f11.xml.in.h:118
-#, fuzzy
 msgid "Malagasy Support"
-msgstr "Ondersteuning voor Maleis"
+msgstr "Ondersteuning voor Malagasi"
 
 #: ../comps-f11.xml.in.h:132
-#, fuzzy
 msgid "Occitan Support"
-msgstr "Ondersteuning voor Tibetaans"
+msgstr "Ondersteuning voor Occitaans"
 
 #: ../comps-f11.xml.in.h:201
-#, fuzzy
 msgid ""
 "This group is a collection of tools used in the design, modification, "
 "manipulation, and packaging of fonts."
 msgstr ""
-"Deze groep is een collectie van hulpmiddelen en hulpbronnen voor Armeense "
-"omgevingen."
+"Deze groep is een collectie van hulpmiddelen gebruikt voor het "
+"ontwerpen, wijzigen, manipuleren en samenstellen van lettertypen."
 
 #: ../comps-f11.xml.in.h:213
-#, fuzzy
 msgid "Turkmen Support"
-msgstr "Ondersteuning voor Turks"
+msgstr "Ondersteuning voor Turkmeens"
 
 #: ../comps-f11.xml.in.h:215
-#, fuzzy
 msgid "Upper Sorbian Support"
-msgstr "Ondersteuning voor Servisch"
+msgstr "Ondersteuning voor Oppersorbisch"
 
 #: ../comps-el4.xml.in.h:3 ../comps-el5.xml.in.h:3
 msgid "Applications for a variety of tasks"



From mclasen at fedoraproject.org  Sat Jan 24 22:03:57 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Sat, 24 Jan 2009 22:03:57 +0000 (UTC)
Subject: rpms/gtk2/devel activatable-toolitem.patch, NONE, 1.1 gtk2.spec,
	1.344, 1.345
Message-ID: <20090124220357.193E87010A@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gtk2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20831

Modified Files:
	gtk2.spec 
Added Files:
	activatable-toolitem.patch 
Log Message:
fix blank toolitems in the evo composer


activatable-toolitem.patch:

--- NEW FILE activatable-toolitem.patch ---
Index: gtk/gtktoolbutton.c
===================================================================
--- gtk/gtktoolbutton.c	(revision 22204)
+++ gtk/gtktoolbutton.c	(working copy)
@@ -772,6 +772,7 @@ gtk_tool_button_activatable_update (GtkA
 	  gtk_tool_button_set_label (button, NULL);
 	  gtk_tool_button_set_icon_name (button, NULL);
 	}
+      gtk_tool_button_set_icon_widget (button, NULL);
       gtk_tool_button_set_stock_id (button, gtk_action_get_stock_id (action));
     }
   else if (strcmp (property_name, "gicon") == 0)
@@ -812,6 +813,7 @@ gtk_tool_button_activatable_reset (GtkAc
 {
   GtkToolButton *button;
   GIcon         *icon;
+  const gchar   *stock_id;
 
   parent_activatable_iface->reset (activatable, action);
 
@@ -822,14 +824,15 @@ gtk_tool_button_activatable_reset (GtkAc
     return;
 
   button = GTK_TOOL_BUTTON (activatable);
-  
-  gtk_tool_button_set_label (button, NULL);
-  gtk_tool_button_set_stock_id (button, NULL);
-  gtk_tool_button_set_icon_name (button, NULL);
+  stock_id = gtk_action_get_stock_id (action);
+
+  gtk_tool_button_set_label (button, gtk_action_get_short_label (action));
   gtk_tool_button_set_use_underline (button, TRUE);
-  
-  if (gtk_action_get_stock_id (action))
-    gtk_tool_button_set_stock_id (button, gtk_action_get_stock_id (action));
+  gtk_tool_button_set_stock_id (button, stock_id);
+  gtk_tool_button_set_icon_name (button, gtk_action_get_icon_name (action));
+
+  if (stock_id && gtk_icon_factory_lookup_default (stock_id))
+      gtk_tool_button_set_icon_widget (button, NULL);
   else if ((icon = gtk_action_get_gicon (action)) != NULL)
     {
       GtkIconSize icon_size = gtk_tool_item_get_icon_size (GTK_TOOL_ITEM (button));


Index: gtk2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtk2/devel/gtk2.spec,v
retrieving revision 1.344
retrieving revision 1.345
diff -u -r1.344 -r1.345
--- gtk2.spec	24 Jan 2009 00:16:33 -0000	1.344
+++ gtk2.spec	24 Jan 2009 22:03:26 -0000	1.345
@@ -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.15/gtk+-%{version}.tar.bz2
@@ -30,6 +30,8 @@
 Patch2: workaround.patch
 # http://bugzilla.redhat.com/show_bug.cgi?id=478400
 Patch3: default_printer.patch
+# fixed upstream
+Patch4: activatable-toolitem.patch
 
 BuildRequires: atk-devel >= %{atk_version}
 BuildRequires: pango-devel >= %{pango_version}
@@ -116,7 +118,8 @@
 
 %patch0 -p1 -b .lib64
 %patch2 -p1 -b .workaround
-%patch3 -p0 -b default-printer
+%patch3 -p0 -b .default-printer
+%patch4 -p0 -b .activatable-toolitem
 
 %build
 libtoolize --force --copy
@@ -294,6 +297,9 @@
 %{_datadir}/gtk-2.0
 
 %changelog
+* Sat Jan 24 2009 Matthias Clasen <mclasen at redhat.com> - 2.15.1-2
+- Fix blank toolbuttons in the evolution composer
+
 * Fri Jan 23 2009 Matthias Clasen <mclasen at redhat.com> - 2.15.1-1
 - Update to 2.15.1
 



From pwouters at fedoraproject.org  Sat Jan 24 22:05:30 2009
From: pwouters at fedoraproject.org (Paul Wouters)
Date: Sat, 24 Jan 2009 22:05:30 +0000 (UTC)
Subject: rpms/dnssec-conf/F-10 dnssec-conf.spec, NONE, 1.1 .cvsignore, 1.1, 
	1.2 sources, 1.1, 1.2
Message-ID: <20090124220530.592F97010A@cvs1.fedora.phx.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/dnssec-conf/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21265

Modified Files:
	.cvsignore sources 
Added Files:
	dnssec-conf.spec 
Log Message:
Initial build of dnssec-conf for F-10



--- NEW FILE dnssec-conf.spec ---
Summary: DNSSEC and DLV configuration tool (and TLD repository until the root is signed)
Name: dnssec-conf
Version: 1.13
Release: 2
License: GPLv2+
Url: http://www.xelerance.com/software/dnssec-conf/
Source: http://www.xelerance.com/software/%{name}/%{name}-%{version}.tar.gz
Group: System Environment/Daemons
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
Buildrequires: xmlto
Requires: python-dns, curl, unbound >= 1.1.1-7
#Requires: a caching nameserver
#Requires bind 9.4.0 if bind is reconfigured.....

%description
DNSSEC configuration and priming tool. Keys are required until the root
is signed, as well as for local unpublished DNSSEC keys to be preloaded
into the recursive nameserver. These DNSSEC configuration files can be
directly included in the bind or unbound nameserver configuration files.
dnssec-conf includes a commandline configuration client for Bind and
Unbound, known DNSSEC keys, URL's to official publication pages of keys,
and harvested keys, as well a script to harvest DNSKEY's from DNS.

%prep
%setup -q -n %{name}-%{version}

%build
make 

%install
rm -rf ${RPM_BUILD_ROOT}
make DESTDIR=${RPM_BUILD_ROOT} install

%clean
rm -rf ${RPM_BUILD_ROOT}

%files 
%defattr(-,root,root)
%doc LICENSE README
%attr(0755,root,root) %dir %{_sysconfdir}/pki/dnssec-keys
%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/pki/dnssec-keys/*/*
%attr(0755,root,root) %dir %{_sysconfdir}/pki/dnssec-keys/production
%attr(0755,root,root) %dir %{_sysconfdir}/pki/dnssec-keys/production/reverse
%attr(0755,root,root) %dir %{_sysconfdir}/pki/dnssec-keys/testing
%attr(0755,root,root) %dir %{_sysconfdir}/pki/dnssec-keys/harvest
%attr(0755,root,root) %dir %{_sysconfdir}/pki/dnssec-keys/dlv
%{_bindir}/dnskey-pull
%{_sbindir}/dnssec-configure
%{_mandir}/*/*

%changelog
* Wed Jan 21 2009 Paul Wouters <paul at xelerance.com> - 1.13-2
- Upstream made source available :=)
- removed macros from changes.

* Wed Jan 21 2009 Paul Wouters <paul at xelerance.com> - 1.13-1
- Clarify license
- Fix mixed use of RPM_BUILD_ROOT and buildroot
- Source tag fully qualified now

* Sat Jan 17 2009 Paul Wouters <paul at xelerance.com> - 1.10-1
- Updated to 1.10. Adds --set and --query and show option to use with system-config-dnssec
- Updated RIPE's reverse keys

* Tue Jan 13 2009 Paul Wouters <paul at xelerance.com> - 1.09-1
- Added testing key for gr.

* Mon Jan  5 2009 Paul Wouters <paul at xelerance.com> 1.08-1
- Upgrade to 'upstream'

* Mon Jan  5 2009 Paul Wouters <paul at xelerance.com> 1.07-1
- Require unbound >= 1.1.1-7

* Mon Jan  5 2009 Paul Wouters <paul at xelerance.com> 1.06-1
- Package renamed to dnssec-conf
- Added punycode test keys
- Fix for dnskey-pull and UTF8
- No longer requires the use of generating .conf files, by using
  a patch for unbound

* Fri Nov  7 2008 Paul Wouters <paul at xelerance.com> 1.0-1
- Initial release



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/dnssec-conf/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	23 Jan 2009 23:20:51 -0000	1.1
+++ .cvsignore	24 Jan 2009 22:04:59 -0000	1.2
@@ -0,0 +1 @@
+dnssec-conf-1.13.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/dnssec-conf/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	23 Jan 2009 23:20:51 -0000	1.1
+++ sources	24 Jan 2009 22:04:59 -0000	1.2
@@ -0,0 +1 @@
+c998c8050c77c14eda496b26891bb4c1  dnssec-conf-1.13.tar.gz



From konradm at fedoraproject.org  Sat Jan 24 22:36:23 2009
From: konradm at fedoraproject.org (Conrad Meyer)
Date: Sat, 24 Jan 2009 22:36:23 +0000 (UTC)
Subject: rpms/python-psyco/devel python-psyco.spec,1.22,1.23
Message-ID: <20090124223623.DFA0C7010A@cvs1.fedora.phx.redhat.com>

Author: konradm

Update of /cvs/pkgs/rpms/python-psyco/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26637

Modified Files:
	python-psyco.spec 
Log Message:
Added comment about being i386 only.


Index: python-psyco.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-psyco/devel/python-psyco.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- python-psyco.spec	13 Dec 2008 02:43:50 -0000	1.22
+++ python-psyco.spec	24 Jan 2009 22:35:52 -0000	1.23
@@ -14,6 +14,16 @@
 Source0:        http://download.sourceforge.net/psyco/%{srcname}-%{version}-src.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+# Upstream makes *heavy* use of inline i386 asm this would take extensive
+# work to support anything other than i386. See the URL for more info.
+# http://psyco.sourceforge.net/links.html
+# 
+# """
+# Here are a couple of non-Pythonic dynamic compilation projects. I am
+# often pointed to them as potentials back-ends for Psyco, to help make
+# Psyco portable beyond the current x86 machine code. However, I consider
+# them as not really suited for Psyco.
+# """
 ExclusiveArch:  i386
 BuildRequires:  python-devel
 



From caolanm at fedoraproject.org  Sat Jan 24 22:48:52 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Sat, 24 Jan 2009 22:48:52 +0000 (UTC)
Subject: rpms/openoffice.org/devel
	openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch, 1.5,
	1.6 openoffice.org.spec, 1.1771, 1.1772
Message-ID: <20090124224852.CCFEE7010A@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28625

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch 
Log Message:
still getting the randomesque java failures

openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch:

Index: openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch
===================================================================
RCS file: openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch
diff -N openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch	24 Jan 2009 22:48:22 -0000	1.6
@@ -0,0 +1,16 @@
+Index: bin/modules/installer/globals.pm
+===================================================================
+RCS file: /cvs/tools/solenv/bin/modules/installer/globals.pm,v
+retrieving revision 1.62.2.3
+diff -u -r1.62.2.3 globals.pm
+--- openoffice.org.orig/solenv/bin/modules/installer/globals.pm	24 Jan 2007 16:34:05 -0000	1.62.2.3
++++ openoffice.org/solenv/bin/modules/installer/globals.pm	27 Feb 2007 17:25:53 -0000
+@@ -305,7 +305,7 @@
+ 	%moduledestination = ();
+ 	
+ 	$unomaxservices = 25;
+-	$javamaxservices = 15;
++	$javamaxservices = 1;
+ 	
+ 	$one_cab_file = 0;
+ 	$fix_number_of_cab_files = 1;


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1771
retrieving revision 1.1772
diff -u -r1.1771 -r1.1772
--- openoffice.org.spec	24 Jan 2009 14:49:18 -0000	1.1771
+++ openoffice.org.spec	24 Jan 2009 22:48:22 -0000	1.1772
@@ -134,6 +134,7 @@
 Patch63: openoffice.org-3.1.0.ooo98137.filter.redeclared-variables.patch
 Patch64: openoffice.org-3.0.1.ooo98240.sc.basicworkaround.patch
 Patch65: openoffice.org-3.0.1.ooo98288.ucb.neonchange.patch
+Patch66: openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch
 
 %define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
 %define instdir %{_libdir}
@@ -1420,6 +1421,7 @@
 %patch63 -p1 -b .ooo98137.filter.redeclared-variables.patch
 %patch64 -p1 -b .ooo98240.sc.basicworkaround.patch
 %patch65 -p1 -b .ooo98288.ucb.neonchange.patch
+%patch66 -p1 -b .gccXXXXX.solenv.javaregistration.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`



From john5342 at fedoraproject.org  Sat Jan 24 22:51:15 2009
From: john5342 at fedoraproject.org (Adrian John Wilson)
Date: Sat, 24 Jan 2009 22:51:15 +0000 (UTC)
Subject: rpms/libmsn/F-9 .cvsignore, 1.2, 1.3 import.log, 1.1,
	1.2 libmsn.spec, 
	1.1, 1.2 sources, 1.2, 1.3 libmsn-4.0beta1-rmhardcoded.patch,
	1.1, NONE
Message-ID: <20090124225115.4C4507010A@cvs1.fedora.phx.redhat.com>

Author: john5342

Update of /cvs/pkgs/rpms/libmsn/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29089/F-9

Modified Files:
	.cvsignore import.log libmsn.spec sources 
Removed Files:
	libmsn-4.0beta1-rmhardcoded.patch 
Log Message:
* Sat Jan 24 2009 John5342 <john5342 at, fedoraproject.org> 4.0-0.10.beta4
- libmsn-4.0-beta4



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libmsn/F-9/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	16 Dec 2008 15:40:11 -0000	1.2
+++ .cvsignore	24 Jan 2009 22:50:44 -0000	1.3
@@ -1 +1 @@
-libmsn-4.0-beta1.tar.bz2
+libmsn-4.0-beta4.tar.bz2


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/libmsn/F-9/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	16 Dec 2008 15:40:11 -0000	1.1
+++ import.log	24 Jan 2009 22:50:44 -0000	1.2
@@ -1 +1,2 @@
 libmsn-4_0-0_3_beta1_fc10:F-9:libmsn-4.0-0.3.beta1.fc10.src.rpm:1229441971
+libmsn-4_0-0_10_beta4_fc10:F-9:libmsn-4.0-0.10.beta4.fc10.src.rpm:1232837368


Index: libmsn.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libmsn/F-9/libmsn.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libmsn.spec	16 Dec 2008 15:40:11 -0000	1.1
+++ libmsn.spec	24 Jan 2009 22:50:44 -0000	1.2
@@ -1,51 +1,54 @@
+
+%define beta beta4
+
 Name:		libmsn
 Version:	4.0
-Release:	0.3.beta1%{?dist}
+Release:	0.10.%{beta}%{?dist}
 
 Group:		System Environment/Libraries
 License:	GPLv2
 URL:		http://sourceforge.net/projects/libmsn/
-Source0:	http://downloads.sourceforge.net/%{name}/%{name}-%{version}-beta1.tar.bz2
-
-Patch0:		%{name}-4.0beta1-rmhardcoded.patch
-
+Source0:	http://downloads.sourceforge.net/%{name}/%{name}-%{version}%{?beta:-%{beta}}.tar.bz2
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Summary:	Library for connecting to the MSN(tm) Messenger service
+Summary:	Library for connecting to the MSN Messenger service
 
 BuildRequires:	cmake
 BuildRequires:	openssl-devel
-#All other headers seem to be provided by glibc or stdlibc++
+BuildRequires:	pkgconfig
 
 %description
 Libmsn is a reusable, open-source, fully documented library for connecting to
-the MSN(tm) Messenger service.
+the MSN Messenger service.
 
 %package	devel
 Summary:	Development files for %{name}
 Group:		Development/Libraries
-
 Requires:	%{name} = %{version}-%{release}
-
+Requires:	openssl-devel
+Requires:	pkgconfig
 %description	devel
 The %{name}-devel package contains libraries and header files for
 developing applications that use %{name}.
 
+
 %prep
-%setup -q -n %{name}-4.0-beta1
-%patch0 -p1
+%setup -q -n %{name}-%{version}%{?beta:-%{beta}}
+
 
 %build
-mkdir build
-cd build
+
+mkdir -p %{_target_platform}
+pushd %{_target_platform} 
 %{cmake} ..
-make
+popd
+
+make %{?_smp_mflags} -C %{_target_platform}
 
 
 %install
 rm -rf %{buildroot}
-cd build
-make install DESTDIR=%{buildroot}
+make install/fast -C %{_target_platform} DESTDIR=%{buildroot}
 
 
 %clean
@@ -60,14 +63,38 @@
 %files
 %defattr(-,root,root,-)
 %doc README COPYING THANKS
-%{_libdir}/*.so.*
+%{_bindir}/msntest
+%{_libdir}/libmsn.so.0*
 
 %files devel
 %defattr(-,root,root,-)
-%{_libdir}/*.so
-%{_includedir}/*
+%{_libdir}/libmsn.so
+%{_libdir}/pkgconfig/libmsn.pc
+%{_includedir}/msn/
+
 
 %changelog
+* Sat Jan 24 2009 John5342 <john5342 at, fedoraproject.org> 4.0-0.10.beta4
+- libmsn-4.0-beta4
+
+* Fri Jan 23 2009 Rex Dieter <rdieter at fedoraproject.org> 4.0-0.9.beta2
+- revert use of (tm)
+
+* Fri Jan 23 2009 Rex Dieter <rdieter at fedoraproject.org> 4.0-0.8.beta2
+- remove pkgconfig hack/workaround
+
+* Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> 4.0-0.7.beta2
+- rebuild with new openssl
+
+* Fri Jan 09 2009 Rex Dieter <rdieter at fedoraproject.org> 4.0-0.6.beta2
+- pkgconfig patch to workaround bug #479493
+
+* Fri Jan 09 2009 Rex Dieter <rdieter at fedoraproject.org> 4.0-0.5.beta2
+- -devel: Requires: openssl-devel
+
+* Fri Jan 09 2009 Rex Dieter <rdieter at fedoraproject.org> 4.0-0.4.beta2
+- libmsn-4.0-beta2
+
 * Thu Dec 11 2008 John5342 <john5342 at, fedoraproject.org> 4.0-0.3.beta1
 - Left docs out of devel package
 - Added (tm) to MSN


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libmsn/F-9/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	16 Dec 2008 15:40:11 -0000	1.2
+++ sources	24 Jan 2009 22:50:44 -0000	1.3
@@ -1 +1 @@
-f5b79c230ec7e7654b5efe8c61ea1602  libmsn-4.0-beta1.tar.bz2
+b0155f01443644d7c4a60269e44d8dac  libmsn-4.0-beta4.tar.bz2


--- libmsn-4.0beta1-rmhardcoded.patch DELETED ---



From caolanm at fedoraproject.org  Sat Jan 24 23:00:38 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Sat, 24 Jan 2009 23:00:38 +0000 (UTC)
Subject: rpms/hunspell-uk/devel .cvsignore, 1.3, 1.4 hunspell-uk.spec, 1.2, 
	1.3 sources, 1.3, 1.4
Message-ID: <20090124230039.0A2F17010A@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/hunspell-uk/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31441

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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	30 Sep 2008 08:22:59 -0000	1.3
+++ .cvsignore	24 Jan 2009 23:00:08 -0000	1.4
@@ -1 +1 @@
-myspell-uk_UA-1.5.5.zip
+myspell-uk_UA-1.5.7.zip


Index: hunspell-uk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-uk/devel/hunspell-uk.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- hunspell-uk.spec	30 Sep 2008 08:22:59 -0000	1.2
+++ hunspell-uk.spec	24 Jan 2009 23:00:08 -0000	1.3
@@ -1,6 +1,6 @@
 Name: hunspell-uk
 Summary: Ukrainian hunspell dictionaries
-Version: 1.5.5
+Version: 1.5.7
 Release: 1%{?dist}
 Source: http://downloads.sourceforge.net/ispell-uk/myspell-uk_UA-%{version}.zip
 Group: Applications/Text
@@ -33,6 +33,9 @@
 %{_datadir}/myspell/*
 
 %changelog
+* Sat Jan 24 2009 Caolan McNamara <caolanm at redhat.com> - 1.5.7-1
+- latest version
+
 * Tue Sep 30 2008 Caolan McNamara <caolanm at redhat.com> - 1.5.5-1
 - latest version
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-uk/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	30 Sep 2008 08:22:59 -0000	1.3
+++ sources	24 Jan 2009 23:00:08 -0000	1.4
@@ -1 +1 @@
-8ae61c7a5d19ee86bf773ea4d74e7f89  myspell-uk_UA-1.5.5.zip
+1e067400ca6a3414d232c10ef1300293  myspell-uk_UA-1.5.7.zip



From airlied at fedoraproject.org  Sat Jan 24 23:54:37 2009
From: airlied at fedoraproject.org (Dave Airlie)
Date: Sat, 24 Jan 2009 23:54:37 +0000 (UTC)
Subject: rpms/xorg-x11-drv-ati/F-10 radeon-modeset-fix-legacy-vt.patch, NONE,
	1.1 xorg-x11-drv-ati.spec, 1.164, 1.165
Message-ID: <20090124235438.4376070107@cvs1.fedora.phx.redhat.com>

Author: airlied

Update of /cvs/pkgs/rpms/xorg-x11-drv-ati/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8166

Modified Files:
	xorg-x11-drv-ati.spec 
Added Files:
	radeon-modeset-fix-legacy-vt.patch 
Log Message:
* Sun Jan 25 2009 Dave Airlie <airlied at redhat.com> 6.9.0-64
- hopefully fix post-resume DRI (#475193)


radeon-modeset-fix-legacy-vt.patch:

--- NEW FILE radeon-modeset-fix-legacy-vt.patch ---
diff -up xf86-video-ati-6.9.0/src/radeon_dri.c.dma xf86-video-ati-6.9.0/src/radeon_dri.c
--- xf86-video-ati-6.9.0/src/radeon_dri.c.dma	2009-01-25 09:50:13.000000000 +1000
+++ xf86-video-ati-6.9.0/src/radeon_dri.c	2009-01-25 09:51:26.000000000 +1000
@@ -478,6 +478,9 @@ Bool radeon_update_dri_buffers(ScreenPtr
     if (info->ChipFamily >= CHIP_FAMILY_R600)
 	return TRUE;
 
+    if (!info->drm_mm)
+	return TRUE;
+
     success = radeon_update_dri_mappings(pScrn, sarea);
 
     if (!success)
@@ -1289,7 +1292,7 @@ static Bool RADEONDRIMapInit(RADEONInfoP
 {
 
     if (info->drm_mm)
-    return TRUE;
+    	return TRUE;
 				/* Map registers */
     info->dri->registerSize = info->MMIOSize;
     if (drmAddMap(info->dri->drmFD, info->MMIOAddr, info->dri->registerSize,
diff -up xf86-video-ati-6.9.0/src/radeon_driver.c.dma xf86-video-ati-6.9.0/src/radeon_driver.c


Index: xorg-x11-drv-ati.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ati/F-10/xorg-x11-drv-ati.spec,v
retrieving revision 1.164
retrieving revision 1.165
diff -u -r1.164 -r1.165
--- xorg-x11-drv-ati.spec	21 Dec 2008 23:33:09 -0000	1.164
+++ xorg-x11-drv-ati.spec	24 Jan 2009 23:54:06 -0000	1.165
@@ -5,7 +5,7 @@
 Summary:   Xorg X11 ati video driver
 Name:      xorg-x11-drv-ati
 Version:   6.9.0
-Release:   63%{?dist}
+Release:   64%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -24,6 +24,7 @@
 Patch9:	    radeon-6.9.0-dig1-hdmi.patch
 Patch10:    radeon-6.9.0-exa-dst-a8-r100-r200.patch
 Patch11:    radeon-6.9.0-posting-fix.patch
+Patch12:    radeon-modeset-fix-legacy-vt.patch
 
 ExcludeArch: s390 s390x
 
@@ -55,6 +56,7 @@
 %patch9 -p1 -b .hdmi
 %patch10 -p1 -b .dsta8
 %patch11 -p1 -b .posting
+%patch12 -p1 -b .vtswitch
 
 %build
 autoreconf
@@ -86,6 +88,9 @@
 %{_mandir}/man4/radeon.4*
 
 %changelog
+* Sun Jan 25 2009 Dave Airlie <airlied at redhat.com> 6.9.0-64
+- hopefully fix post-resume DRI (#475193)
+
 * Mon Dec 22 2008 Dave Airlie <airlied at redhat.com> 6.9.0-63
 - radeon-modeset.patch: fix EXA with DRI disabled
 



From pkgdb at fedoraproject.org  Sun Jan 25 01:46:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 25 Jan 2009 01:46:20 +0000
Subject: [pkgdb] raddump was added for fab
Message-ID: <20090125014620.F2B2E208482@bastion.fedora.phx.redhat.com>

kevin has added Package raddump with summary RADIUS packets interpreter
kevin has approved Package raddump
kevin has added a Fedora devel branch for raddump with an owner of fab
kevin has approved raddump in Fedora devel
kevin has approved Package raddump
kevin has set commit to Approved for provenpackager on raddump (Fedora devel)
kevin has set build to Approved for provenpackager on raddump (Fedora devel)
kevin has set checkout to Approved for provenpackager on raddump (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/raddump



From pkgdb at fedoraproject.org  Sun Jan 25 01:46:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 25 Jan 2009 01:46:23 +0000
Subject: [pkgdb] raddump (Fedora, 9) updated by kevin
Message-ID: <20090125014623.75985208486@bastion.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for raddump
kevin has set commit to Approved for provenpackager on raddump (Fedora 9)
kevin has set build to Approved for provenpackager on raddump (Fedora 9)
kevin has set checkout to Approved for provenpackager on raddump (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/raddump



From pkgdb at fedoraproject.org  Sun Jan 25 01:46:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 25 Jan 2009 01:46:23 +0000
Subject: [pkgdb] raddump (Fedora, 10) updated by kevin
Message-ID: <20090125014623.89D45208489@bastion.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for raddump
kevin has set commit to Approved for provenpackager on raddump (Fedora 10)
kevin has set build to Approved for provenpackager on raddump (Fedora 10)
kevin has set checkout to Approved for provenpackager on raddump (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/raddump



From kevin at fedoraproject.org  Sun Jan 25 01:46:40 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 25 Jan 2009 01:46:40 +0000 (UTC)
Subject: rpms/raddump - New directory
Message-ID: <20090125014640.942DA70133@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/raddump
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsr27655/rpms/raddump

Log Message:
Directory /cvs/pkgs/rpms/raddump added to the repository




From kevin at fedoraproject.org  Sun Jan 25 01:46:40 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 25 Jan 2009 01:46:40 +0000 (UTC)
Subject: rpms/raddump/devel - New directory
Message-ID: <20090125014640.DC3D470133@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/raddump/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsr27655/rpms/raddump/devel

Log Message:
Directory /cvs/pkgs/rpms/raddump/devel added to the repository




From kevin at fedoraproject.org  Sun Jan 25 01:46:59 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 25 Jan 2009 01:46:59 +0000 (UTC)
Subject: rpms/raddump Makefile,NONE,1.1
Message-ID: <20090125014659.E9ED770133@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/raddump
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsr27655/rpms/raddump

Added Files:
	Makefile 
Log Message:
Setup of module raddump


--- NEW FILE Makefile ---
# Top level Makefile for module raddump
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Jan 25 01:47:00 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 25 Jan 2009 01:47:00 +0000 (UTC)
Subject: rpms/raddump/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <20090125014700.4E23170141@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/raddump/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsr27655/rpms/raddump/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module raddump


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: raddump
# $Id: Makefile,v 1.1 2009/01/25 01:47:00 kevin Exp $
NAME := raddump
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Jan 25 01:48:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 25 Jan 2009 01:48:33 +0000
Subject: [pkgdb] w_scan was added for heffer
Message-ID: <20090125014833.AA36D208481@bastion.fedora.phx.redhat.com>

kevin has added Package w_scan with summary Tool for scanning DVB-C/T transponders
kevin has approved Package w_scan
kevin has added a Fedora devel branch for w_scan with an owner of heffer
kevin has approved w_scan in Fedora devel
kevin has approved Package w_scan
kevin has set commit to Approved for provenpackager on w_scan (Fedora devel)
kevin has set build to Approved for provenpackager on w_scan (Fedora devel)
kevin has set checkout to Approved for provenpackager on w_scan (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/w_scan



From pkgdb at fedoraproject.org  Sun Jan 25 01:48:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 25 Jan 2009 01:48:35 +0000
Subject: [pkgdb] w_scan (Fedora, 9) updated by kevin
Message-ID: <20090125014835.602CC208486@bastion.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for w_scan
kevin has set commit to Approved for provenpackager on w_scan (Fedora 9)
kevin has set build to Approved for provenpackager on w_scan (Fedora 9)
kevin has set checkout to Approved for provenpackager on w_scan (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/w_scan



From kevin at fedoraproject.org  Sun Jan 25 01:48:50 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 25 Jan 2009 01:48:50 +0000 (UTC)
Subject: rpms/w_scan - New directory
Message-ID: <20090125014850.2464E70133@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/w_scan
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsb28090/rpms/w_scan

Log Message:
Directory /cvs/pkgs/rpms/w_scan added to the repository




From pkgdb at fedoraproject.org  Sun Jan 25 01:48:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 25 Jan 2009 01:48:35 +0000
Subject: [pkgdb] w_scan (Fedora, 10) updated by kevin
Message-ID: <20090125014835.75611208489@bastion.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for w_scan
kevin has set commit to Approved for provenpackager on w_scan (Fedora 10)
kevin has set build to Approved for provenpackager on w_scan (Fedora 10)
kevin has set checkout to Approved for provenpackager on w_scan (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/w_scan



From kevin at fedoraproject.org  Sun Jan 25 01:48:50 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 25 Jan 2009 01:48:50 +0000 (UTC)
Subject: rpms/w_scan/devel - New directory
Message-ID: <20090125014850.675B070133@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/w_scan/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsb28090/rpms/w_scan/devel

Log Message:
Directory /cvs/pkgs/rpms/w_scan/devel added to the repository




From kevin at fedoraproject.org  Sun Jan 25 01:49:07 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 25 Jan 2009 01:49:07 +0000 (UTC)
Subject: rpms/w_scan Makefile,NONE,1.1
Message-ID: <20090125014907.26BD470133@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/w_scan
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsb28090/rpms/w_scan

Added Files:
	Makefile 
Log Message:
Setup of module w_scan


--- NEW FILE Makefile ---
# Top level Makefile for module w_scan
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Jan 25 01:49:07 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 25 Jan 2009 01:49:07 +0000 (UTC)
Subject: rpms/w_scan/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <20090125014907.DCFD970133@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/w_scan/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsb28090/rpms/w_scan/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module w_scan


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: w_scan
# $Id: Makefile,v 1.1 2009/01/25 01:49:07 kevin Exp $
NAME := w_scan
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Jan 25 01:50:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 25 Jan 2009 01:50:09 +0000
Subject: [pkgdb] ctan-musixtex-fonts (Fedora, 10) updated by kevin
Message-ID: <20090125015009.8C410208482@bastion.fedora.phx.redhat.com>

kevin approved watchbugzilla on ctan-musixtex-fonts (Fedora 10) for fonts-sig
kevin approved watchcommits on ctan-musixtex-fonts (Fedora 10) for fonts-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ctan-musixtex-fonts



From pkgdb at fedoraproject.org  Sun Jan 25 01:50:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 25 Jan 2009 01:50:09 +0000
Subject: [pkgdb] ctan-musixtex-fonts (Fedora, devel) updated by kevin
Message-ID: <20090125015009.C5C39208487@bastion.fedora.phx.redhat.com>

kevin approved watchbugzilla on ctan-musixtex-fonts (Fedora devel) for fonts-sig
kevin approved watchcommits on ctan-musixtex-fonts (Fedora devel) for fonts-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ctan-musixtex-fonts



From pkgdb at fedoraproject.org  Sun Jan 25 01:50:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 25 Jan 2009 01:50:09 +0000
Subject: [pkgdb] ctan-musixtex-fonts (Fedora, 9) updated by kevin
Message-ID: <20090125015009.D633C20848B@bastion.fedora.phx.redhat.com>

kevin approved watchbugzilla on ctan-musixtex-fonts (Fedora 9) for fonts-sig
kevin approved watchcommits on ctan-musixtex-fonts (Fedora 9) for fonts-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ctan-musixtex-fonts



From pkgdb at fedoraproject.org  Sun Jan 25 01:52:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 25 Jan 2009 01:52:35 +0000
Subject: [pkgdb] emacs-htmlize was added for rishi
Message-ID: <20090125015239.19C6E208482@bastion.fedora.phx.redhat.com>

kevin has added Package emacs-htmlize with summary Convert buffer text and decorations to HTML
kevin has approved Package emacs-htmlize
kevin has added a Fedora devel branch for emacs-htmlize with an owner of rishi
kevin has approved emacs-htmlize in Fedora devel
kevin has approved Package emacs-htmlize
kevin has set commit to Approved for provenpackager on emacs-htmlize (Fedora devel)
kevin has set build to Approved for provenpackager on emacs-htmlize (Fedora devel)
kevin has set checkout to Approved for provenpackager on emacs-htmlize (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/emacs-htmlize



From pkgdb at fedoraproject.org  Sun Jan 25 01:52:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 25 Jan 2009 01:52:37 +0000
Subject: [pkgdb] emacs-htmlize (Fedora, 9) updated by kevin
Message-ID: <20090125015239.37002208487@bastion.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for emacs-htmlize
kevin has set commit to Approved for provenpackager on emacs-htmlize (Fedora 9)
kevin has set build to Approved for provenpackager on emacs-htmlize (Fedora 9)
kevin has set checkout to Approved for provenpackager on emacs-htmlize (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/emacs-htmlize



From pkgdb at fedoraproject.org  Sun Jan 25 01:52:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 25 Jan 2009 01:52:37 +0000
Subject: [pkgdb] emacs-htmlize (Fedora, 10) updated by kevin
Message-ID: <20090125015239.5A2E220848B@bastion.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for emacs-htmlize
kevin has set commit to Approved for provenpackager on emacs-htmlize (Fedora 10)
kevin has set build to Approved for provenpackager on emacs-htmlize (Fedora 10)
kevin has set checkout to Approved for provenpackager on emacs-htmlize (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/emacs-htmlize



From kevin at fedoraproject.org  Sun Jan 25 01:55:49 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 25 Jan 2009 01:55:49 +0000 (UTC)
Subject: rpms/emacs-htmlize - New directory
Message-ID: <20090125015549.2454970133@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/emacs-htmlize
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsv29173/rpms/emacs-htmlize

Log Message:
Directory /cvs/pkgs/rpms/emacs-htmlize added to the repository




From kevin at fedoraproject.org  Sun Jan 25 01:55:49 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 25 Jan 2009 01:55:49 +0000 (UTC)
Subject: rpms/emacs-htmlize/devel - New directory
Message-ID: <20090125015549.60C9E70133@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/emacs-htmlize/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsv29173/rpms/emacs-htmlize/devel

Log Message:
Directory /cvs/pkgs/rpms/emacs-htmlize/devel added to the repository




From kevin at fedoraproject.org  Sun Jan 25 01:56:04 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 25 Jan 2009 01:56:04 +0000 (UTC)
Subject: rpms/emacs-htmlize Makefile,NONE,1.1
Message-ID: <20090125015604.2FEA670133@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/emacs-htmlize
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsv29173/rpms/emacs-htmlize

Added Files:
	Makefile 
Log Message:
Setup of module emacs-htmlize


--- NEW FILE Makefile ---
# Top level Makefile for module emacs-htmlize
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Jan 25 01:56:04 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 25 Jan 2009 01:56:04 +0000 (UTC)
Subject: rpms/emacs-htmlize/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090125015604.6C37170133@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/emacs-htmlize/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsv29173/rpms/emacs-htmlize/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module emacs-htmlize


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: emacs-htmlize
# $Id: Makefile,v 1.1 2009/01/25 01:56:04 kevin Exp $
NAME := emacs-htmlize
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Jan 25 01:56:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 25 Jan 2009 01:56:33 +0000
Subject: [pkgdb] viking was added for fab
Message-ID: <20090125015633.CEBD0208485@bastion.fedora.phx.redhat.com>

kevin has added Package viking with summary GPS data editor and analyzer
kevin has approved Package viking
kevin has added a Fedora devel branch for viking with an owner of fab
kevin has approved viking in Fedora devel
kevin has approved Package viking
kevin has set commit to Approved for provenpackager on viking (Fedora devel)
kevin has set build to Approved for provenpackager on viking (Fedora devel)
kevin has set checkout to Approved for provenpackager on viking (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/viking



From kevin at fedoraproject.org  Sun Jan 25 01:56:49 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 25 Jan 2009 01:56:49 +0000 (UTC)
Subject: rpms/viking - New directory
Message-ID: <20090125015649.255D870133@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/viking
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvso29439/rpms/viking

Log Message:
Directory /cvs/pkgs/rpms/viking added to the repository




From pkgdb at fedoraproject.org  Sun Jan 25 01:56:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 25 Jan 2009 01:56:35 +0000
Subject: [pkgdb] viking (Fedora, 9) updated by kevin
Message-ID: <20090125015636.21661208488@bastion.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for viking
kevin has set commit to Approved for provenpackager on viking (Fedora 9)
kevin has set build to Approved for provenpackager on viking (Fedora 9)
kevin has set checkout to Approved for provenpackager on viking (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/viking



From pkgdb at fedoraproject.org  Sun Jan 25 01:56:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 25 Jan 2009 01:56:35 +0000
Subject: [pkgdb] viking (Fedora, 10) updated by kevin
Message-ID: <20090125015636.291CA20848C@bastion.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for viking
kevin has set commit to Approved for provenpackager on viking (Fedora 10)
kevin has set build to Approved for provenpackager on viking (Fedora 10)
kevin has set checkout to Approved for provenpackager on viking (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/viking



From kevin at fedoraproject.org  Sun Jan 25 01:56:49 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 25 Jan 2009 01:56:49 +0000 (UTC)
Subject: rpms/viking/devel - New directory
Message-ID: <20090125015649.6938B70133@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/viking/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvso29439/rpms/viking/devel

Log Message:
Directory /cvs/pkgs/rpms/viking/devel added to the repository




From kevin at fedoraproject.org  Sun Jan 25 01:57:08 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 25 Jan 2009 01:57:08 +0000 (UTC)
Subject: rpms/viking Makefile,NONE,1.1
Message-ID: <20090125015708.44F1D70133@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/viking
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvso29439/rpms/viking

Added Files:
	Makefile 
Log Message:
Setup of module viking


--- NEW FILE Makefile ---
# Top level Makefile for module viking
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Jan 25 01:57:08 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 25 Jan 2009 01:57:08 +0000 (UTC)
Subject: rpms/viking/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <20090125015708.9CE6470133@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/viking/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvso29439/rpms/viking/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module viking


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: viking
# $Id: Makefile,v 1.1 2009/01/25 01:57:08 kevin Exp $
NAME := viking
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Jan 25 01:57:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 25 Jan 2009 01:57:41 +0000
Subject: [pkgdb] pax-utils was added for rathann
Message-ID: <20090125015741.DB473208481@bastion.fedora.phx.redhat.com>

kevin has added Package pax-utils with summary PaX aware and related utilities for ELF binaries
kevin has approved Package pax-utils
kevin has added a Fedora devel branch for pax-utils with an owner of rathann
kevin has approved pax-utils in Fedora devel
kevin has approved Package pax-utils
kevin has set commit to Approved for provenpackager on pax-utils (Fedora devel)
kevin has set build to Approved for provenpackager on pax-utils (Fedora devel)
kevin has set checkout to Approved for provenpackager on pax-utils (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pax-utils



From pkgdb at fedoraproject.org  Sun Jan 25 01:57:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 25 Jan 2009 01:57:43 +0000
Subject: [pkgdb] pax-utils (Fedora, 9) updated by kevin
Message-ID: <20090125015744.21A49208485@bastion.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for pax-utils
kevin has set commit to Approved for provenpackager on pax-utils (Fedora 9)
kevin has set build to Approved for provenpackager on pax-utils (Fedora 9)
kevin has set checkout to Approved for provenpackager on pax-utils (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pax-utils



From pkgdb at fedoraproject.org  Sun Jan 25 01:57:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 25 Jan 2009 01:57:44 +0000
Subject: [pkgdb] pax-utils (Fedora EPEL, 5) updated by kevin
Message-ID: <20090125015744.454B0208488@bastion.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for pax-utils
kevin has set commit to Approved for provenpackager on pax-utils (Fedora EPEL 5)
kevin has set build to Approved for provenpackager on pax-utils (Fedora EPEL 5)
kevin has set checkout to Approved for provenpackager on pax-utils (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pax-utils



From pkgdb at fedoraproject.org  Sun Jan 25 01:57:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 25 Jan 2009 01:57:44 +0000
Subject: [pkgdb] pax-utils (Fedora, 10) updated by kevin
Message-ID: <20090125015744.4D5F420848C@bastion.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for pax-utils
kevin has set commit to Approved for provenpackager on pax-utils (Fedora 10)
kevin has set build to Approved for provenpackager on pax-utils (Fedora 10)
kevin has set checkout to Approved for provenpackager on pax-utils (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pax-utils



From kevin at fedoraproject.org  Sun Jan 25 01:57:56 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 25 Jan 2009 01:57:56 +0000 (UTC)
Subject: rpms/pax-utils - New directory
Message-ID: <20090125015756.5670E70133@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/pax-utils
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsC29783/rpms/pax-utils

Log Message:
Directory /cvs/pkgs/rpms/pax-utils added to the repository




From kevin at fedoraproject.org  Sun Jan 25 01:57:56 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 25 Jan 2009 01:57:56 +0000 (UTC)
Subject: rpms/pax-utils/devel - New directory
Message-ID: <20090125015756.93CFF70133@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/pax-utils/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsC29783/rpms/pax-utils/devel

Log Message:
Directory /cvs/pkgs/rpms/pax-utils/devel added to the repository




From kevin at fedoraproject.org  Sun Jan 25 01:58:14 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 25 Jan 2009 01:58:14 +0000 (UTC)
Subject: rpms/pax-utils Makefile,NONE,1.1
Message-ID: <20090125015814.27FC770133@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/pax-utils
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsC29783/rpms/pax-utils

Added Files:
	Makefile 
Log Message:
Setup of module pax-utils


--- NEW FILE Makefile ---
# Top level Makefile for module pax-utils
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Sun Jan 25 01:58:14 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 25 Jan 2009 01:58:14 +0000 (UTC)
Subject: rpms/pax-utils/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090125015814.69DB970133@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/pax-utils/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsC29783/rpms/pax-utils/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module pax-utils


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: pax-utils
# $Id: Makefile,v 1.1 2009/01/25 01:58:14 kevin Exp $
NAME := pax-utils
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From mclasen at fedoraproject.org  Sun Jan 25 03:42:49 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Sun, 25 Jan 2009 03:42:49 +0000 (UTC)
Subject: rpms/gtk2/devel imcontext-reset.patch, NONE, 1.1 gtk2.spec, 1.345,
	1.346
Message-ID: <20090125034249.2CA9370133@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gtk2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15824

Modified Files:
	gtk2.spec 
Added Files:
	imcontext-reset.patch 
Log Message:
make gdm greeter work again


imcontext-reset.patch:

--- NEW FILE imcontext-reset.patch ---
Index: gtk/gtktextview.c
===================================================================
--- gtk/gtktextview.c	(revision 22213)
+++ gtk/gtktextview.c	(working copy)
@@ -2076,8 +2076,7 @@
    */
   area.width = 0;
 
-  if (GTK_WIDGET_REALIZED (text_view))
-    gtk_im_context_set_cursor_location (text_view->im_context, &area);
+  gtk_im_context_set_cursor_location (text_view->im_context, &area);
 }
 
 static gboolean
@@ -3840,7 +3839,7 @@
     }
 
   /* Ensure updating the spot location. */
-  gtk_text_view_update_im_spot_location(text_view);
+  gtk_text_view_update_im_spot_location (text_view);
 }
 
 static void
Index: gtk/gtkimmulticontext.c
===================================================================
--- gtk/gtkimmulticontext.c	(revision 22213)
+++ gtk/gtkimmulticontext.c	(working copy)
@@ -226,7 +226,7 @@
   if (!multicontext->slave)
     {
       GtkIMContext *slave;
-
+      
       g_free (multicontext->context_id);
        
       if (multicontext->priv->context_id)
@@ -258,18 +258,14 @@
 				       GdkWindow    *window)
 {
   GtkIMMulticontext *multicontext = GTK_IM_MULTICONTEXT (context);
-  GtkIMContext *slave; 
   GdkScreen *screen; 
   GtkSettings *settings;
   gboolean connected;
 
   multicontext->priv->client_window = window;
 
-  slave = gtk_im_multicontext_get_slave (multicontext);
+  gtk_im_multicontext_set_slave (multicontext, NULL, FALSE);
 
-  if (slave)
-    gtk_im_context_set_client_window (slave, window);
-
   if (window == NULL) 
     return;
    
Index: gtk/gtkimmodule.c
===================================================================
--- gtk/gtkimmodule.c	(revision 22213)
+++ gtk/gtkimmodule.c	(working copy)
@@ -671,9 +671,6 @@
   GdkScreen *screen;
   GtkSettings *settings;
       
-  /* assertion to make sure all of the unexpected invocation is really gone. */
-  g_return_val_if_fail (client_window != NULL, SIMPLE_ID);
-
   if (!contexts_hash)
     gtk_im_module_initialize ();
 


Index: gtk2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtk2/devel/gtk2.spec,v
retrieving revision 1.345
retrieving revision 1.346
diff -u -r1.345 -r1.346
--- gtk2.spec	24 Jan 2009 22:03:26 -0000	1.345
+++ gtk2.spec	25 Jan 2009 03:42:16 -0000	1.346
@@ -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.15/gtk+-%{version}.tar.bz2
@@ -32,6 +32,8 @@
 Patch3: default_printer.patch
 # fixed upstream
 Patch4: activatable-toolitem.patch
+# fixed upstream
+Patch5: imcontext-reset.patch
 
 BuildRequires: atk-devel >= %{atk_version}
 BuildRequires: pango-devel >= %{pango_version}
@@ -120,6 +122,7 @@
 %patch2 -p1 -b .workaround
 %patch3 -p0 -b .default-printer
 %patch4 -p0 -b .activatable-toolitem
+%patch5 -p0 -b .imcontext-reset
 
 %build
 libtoolize --force --copy
@@ -297,6 +300,9 @@
 %{_datadir}/gtk-2.0
 
 %changelog
+* Sat Jan 24 2009 Matthias Clasen <mclasen at redhat.com> - 2.15.1-3
+- Avoid triggering an assertion that makes the gdm greeter nonfunctional
+
 * Sat Jan 24 2009 Matthias Clasen <mclasen at redhat.com> - 2.15.1-2
 - Fix blank toolbuttons in the evolution composer
 



From airlied at fedoraproject.org  Sun Jan 25 07:09:19 2009
From: airlied at fedoraproject.org (Dave Airlie)
Date: Sun, 25 Jan 2009 07:09:19 +0000 (UTC)
Subject: rpms/xorg-x11-drv-ati/F-10 radeon-6.10.0-fixes.patch, NONE,
	1.1 .cvsignore, 1.24, 1.25 radeon-modeset.patch, 1.51,
	1.52 radeon.xinf, 1.9, 1.10 sources, 1.24,
	1.25 xorg-x11-drv-ati.spec, 1.165,
	1.166 radeon-6.9.0-add-hd3300.patch, 1.1,
	NONE radeon-6.9.0-dig1-hdmi.patch, 1.2,
	NONE radeon-6.9.0-exa-dst-a8-r100-r200.patch, 1.1,
	NONE radeon-6.9.0-posting-fix.patch, 1.1,
	NONE radeon-6.9.0-quirk-agp.patch, 1.2,
	NONE radeon-6.9.0-to-git.patch, 1.6, NONE
Message-ID: <20090125070919.6449370133@cvs1.fedora.phx.redhat.com>

Author: airlied

Update of /cvs/pkgs/rpms/xorg-x11-drv-ati/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17801

Modified Files:
	.cvsignore radeon-modeset.patch radeon.xinf sources 
	xorg-x11-drv-ati.spec 
Added Files:
	radeon-6.10.0-fixes.patch 
Removed Files:
	radeon-6.9.0-add-hd3300.patch radeon-6.9.0-dig1-hdmi.patch 
	radeon-6.9.0-exa-dst-a8-r100-r200.patch 
	radeon-6.9.0-posting-fix.patch radeon-6.9.0-quirk-agp.patch 
	radeon-6.9.0-to-git.patch 
Log Message:
* Sun Jan 25 2009 Dave Airlie <airlied at redhat.com> 6.10.0-1
- rebase to latest upstream release


radeon-6.10.0-fixes.patch:

--- NEW FILE radeon-6.10.0-fixes.patch ---
diff --git a/src/radeon_dri.c b/src/radeon_dri.c
index 596c1c0..968afe6 100644
--- a/src/radeon_dri.c
+++ b/src/radeon_dri.c
@@ -739,7 +739,9 @@ static radeon_agpmode_quirk radeon_agpmode_quirk_list[] = {
     /* Intel 82865G/PE/P DRAM Controller/Host-Hub / Mobility 9800 Needs AGPMode 4 (deb #462590) */
     { PCI_VENDOR_INTEL,0x2570,  PCI_VENDOR_ATI,0x4a4e,  PCI_VENDOR_DELL,0x5106,  4 },
     /* Intel 82855PM Processor to I/O Controller / Mobility M6 LY Needs AGPMode 1 (deb #467235) */
-    { PCI_VENDOR_INTEL,0x3340,  PCI_VENDOR_ATI,0x4c59,  0x1014,0x052f,   1},
+    { PCI_VENDOR_INTEL,0x3340,  PCI_VENDOR_ATI,0x4c59,  0x1014,0x052f,   1 },
+    /* Intel 82855PM Processor to I/O Controller / Mobility M9+ Needs AGPMode 8 (phoronix forum) */
+    { PCI_VENDOR_INTEL,0x3340,  PCI_VENDOR_ATI,0x5c61,  0x104d,0x8195,   8 },
     /* Intel 82830 830 Chipset Host Bridge / Mobility M6 LY Needs AGPMode 2 (fdo #17360)*/
     { PCI_VENDOR_INTEL,0x3575,  PCI_VENDOR_ATI,0x4c59,  PCI_VENDOR_DELL,0x00e3,  2 },
     /* Intel 82852/82855 host bridge / Mobility 9600 M10 RV350 Needs AGPMode 1 (deb #467460) */
@@ -754,12 +756,16 @@ static radeon_agpmode_quirk radeon_agpmode_quirk_list[] = {
     { PCI_VENDOR_INTEL,0x3580,  PCI_VENDOR_ATI,0x4e50,  0x10cf,0x127f,  1 },
 
     /* ASRock K7VT4A+ AGP 8x / ATI Radeon 9250 AGP Needs AGPMode 4 (LP: #133192) */
-    { 0x1849,0x3189,            PCI_VENDOR_ATI,0x5960,  0x1787, 0x5960,          4},
+    { 0x1849,0x3189,            PCI_VENDOR_ATI,0x5960,  0x1787, 0x5960,          4 },
 
     /* VIA VT8363 Host Bridge / R200 QL [Radeon 8500] Needs AGPMode 2 (lp #141551) */
     { 0x1106,0x0305,            PCI_VENDOR_ATI,0x514c,  0x1002,0x013a,           2 },
     /* VIA VT8377 Host Bridge / R200 QM [Radeon 9100] Needs AGPMode 4 (deb #461144) */
     { 0x1106,0x3189,            PCI_VENDOR_ATI,0x514d,  0x174b,0x7149,           4 },
+    /* VIA VT8377 Host Bridge / RV280 [Radeon 9200 PRO] Needs AGPMode 4 (lp #312693) */
+    { 0x1106,0x3189,            PCI_VENDOR_ATI,0x5960,  0x1462,0x0380,           4 },
+    /* VIA VT8377 Host Bridge / RV280 Needs AGPMode 4 (ati ML) */
+    { 0x1106,0x3189,            PCI_VENDOR_ATI,0x5964,  0x148c,0x2073,           4 },
     /* VIA VT82C693A Host Bridge / RV280 [Radeon 9200 PRO] Needs AGPMode 2 */
     { 0x1106,0x0691,            PCI_VENDOR_ATI,0x5960,  0x1043,0x0054,           2 },
     /* VIA K8M800 Host Bridge / RV280 [Radeon 9200 PRO] Needs AGPMode 4 (fdo #12544) */
diff --git a/src/radeon_exa_render.c b/src/radeon_exa_render.c
index 50446ca..db0f8f5 100644
--- a/src/radeon_exa_render.c
+++ b/src/radeon_exa_render.c
@@ -344,6 +344,11 @@ static Bool R100CheckCompositeTexture(PicturePtr pPict, int unit)
 	RADEON_FALLBACK(("Unsupported filter 0x%x\n", pPict->filter));
     }
 
+    if (pPict->repeat && pPict->repeatType != RepeatNormal)
+    {
+	RADEON_FALLBACK(("Unsupported repeat type %d\n", pPict->repeat));
+    }
+
     return TRUE;
 }
 
@@ -666,6 +671,11 @@ static Bool R200CheckCompositeTexture(PicturePtr pPict, int unit)
 	pPict->filter != PictFilterBilinear)
 	RADEON_FALLBACK(("Unsupported filter 0x%x\n", pPict->filter));
 
+    if (pPict->repeat && pPict->repeatType != RepeatNormal)
+    {
+	RADEON_FALLBACK(("Unsupported repeat type %d\n", pPict->repeat));
+    }
+
     return TRUE;
 }
 
@@ -1002,6 +1012,11 @@ static Bool R300CheckCompositeTexture(PicturePtr pPict,
 	    RADEON_FALLBACK(("REPEAT_NONE unsupported for transformed xRGB source\n"));
     }
 
+    if (pPict->repeat && pPict->repeatType != RepeatNormal)
+    {
+	RADEON_FALLBACK(("Unsupported repeat type %d\n", pPict->repeat));
+    }
+
     return TRUE;
 }
 
@@ -1969,7 +1984,7 @@ static void FUNC_NAME(RadeonCompositeTile)(PixmapPtr pDst,
     RINFO_FROM_SCREEN(pDst->drawable.pScreen);
     int vtx_count;
     xPointFixed srcTopLeft, srcTopRight, srcBottomLeft, srcBottomRight;
-    xPointFixed maskTopLeft, maskTopRight, maskBottomLeft, maskBottomRight;
+    static xPointFixed maskTopLeft, maskTopRight, maskBottomLeft, maskBottomRight;
     ACCEL_PREAMBLE();
 
     ENTER_DRAW(0);
@@ -1986,31 +2001,32 @@ static void FUNC_NAME(RadeonCompositeTile)(PixmapPtr pDst,
     srcBottomRight.x = IntToxFixed(srcX + w);
     srcBottomRight.y = IntToxFixed(srcY + h);
 
-    maskTopLeft.x     = IntToxFixed(maskX);
-    maskTopLeft.y     = IntToxFixed(maskY);
-    maskTopRight.x    = IntToxFixed(maskX + w);
-    maskTopRight.y    = IntToxFixed(maskY);
-    maskBottomLeft.x  = IntToxFixed(maskX);
-    maskBottomLeft.y  = IntToxFixed(maskY + h);
-    maskBottomRight.x = IntToxFixed(maskX + w);
-    maskBottomRight.y = IntToxFixed(maskY + h);
-
     if (info->accel_state->is_transform[0]) {
 	transformPoint(info->accel_state->transform[0], &srcTopLeft);
 	transformPoint(info->accel_state->transform[0], &srcTopRight);
 	transformPoint(info->accel_state->transform[0], &srcBottomLeft);
 	transformPoint(info->accel_state->transform[0], &srcBottomRight);
     }
-    if (info->accel_state->is_transform[1]) {
-	transformPoint(info->accel_state->transform[1], &maskTopLeft);
-	transformPoint(info->accel_state->transform[1], &maskTopRight);
-	transformPoint(info->accel_state->transform[1], &maskBottomLeft);
-	transformPoint(info->accel_state->transform[1], &maskBottomRight);
-    }
 
-    if (info->accel_state->has_mask)
+    if (info->accel_state->has_mask) {
+	maskTopLeft.x     = IntToxFixed(maskX);
+	maskTopLeft.y     = IntToxFixed(maskY);
+	maskTopRight.x    = IntToxFixed(maskX + w);
+	maskTopRight.y    = IntToxFixed(maskY);
+	maskBottomLeft.x  = IntToxFixed(maskX);
+	maskBottomLeft.y  = IntToxFixed(maskY + h);
+	maskBottomRight.x = IntToxFixed(maskX + w);
+	maskBottomRight.y = IntToxFixed(maskY + h);
+
+	if (info->accel_state->is_transform[1]) {
+	    transformPoint(info->accel_state->transform[1], &maskTopLeft);
+	    transformPoint(info->accel_state->transform[1], &maskTopRight);
+	    transformPoint(info->accel_state->transform[1], &maskBottomLeft);
+	    transformPoint(info->accel_state->transform[1], &maskBottomRight);
+	}
+
 	vtx_count = 6;
-    else
+    } else
 	vtx_count = 4;
 
     FUNC_NAME(RADEONWaitForVLine)(pScrn, pDst, RADEONBiggerCrtcArea(pDst), dstY, dstY + h, info->accel_state->vsync);
diff --git a/src/radeon_textured_videofuncs.c b/src/radeon_textured_videofuncs.c
index 2fe852d..c6ed472 100644
--- a/src/radeon_textured_videofuncs.c
+++ b/src/radeon_textured_videofuncs.c
@@ -1529,7 +1529,7 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
 #endif
 
 	if (IS_R300_3D || IS_R500_3D) {
-	    if (IS_R300_3D && ((dstw > 1440) || (dsth > 1440)))
+	    if (IS_R300_3D && ((dstw+dsth) > 2880))
 		use_quad = TRUE;
 	    /*
 	     * Set up the scissor area to that of the output size.
@@ -1634,39 +1634,43 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
 			       (float)(srcX + srcw) / info->accel_state->texW[0], (float)srcY / info->accel_state->texH[0],
 			       (float)(srcX + srcw) + 0.5,                        (float)srcY + 0.5);
 	    } else {
-		VTX_OUT_FILTER((float)dstX,                                    (float)dstY,
-			       (float)srcX / info->accel_state->texW[0],              (float)srcY / info->accel_state->texH[0],
-			       (float)srcX + 0.5,                                     (float)srcY + 0.5);
-		VTX_OUT_FILTER((float)dstX,                                    (float)(dstY + dsth * 2),
-			       (float)srcX / info->accel_state->texW[0],              (float)(srcY + srch * 2) / info->accel_state->texH[0],
-			       (float)srcX + 0.5,                                     (float)(srcY + srch * 2) + 0.5);
-		VTX_OUT_FILTER((float)(dstX + dstw * 2),                       (float)dstY,
-			       (float)(srcX + srcw * 2) / info->accel_state->texW[0], (float)srcY / info->accel_state->texH[0],
-			       (float)(srcX + srcw * 2) + 0.5,                        (float)srcY + 0.5);
+		VTX_OUT_FILTER((float)dstX,                                       (float)dstY,
+			       (float)srcX / info->accel_state->texW[0],          (float)srcY / info->accel_state->texH[0],
+			       (float)srcX + 0.5,                                 (float)srcY + 0.5);
+		VTX_OUT_FILTER((float)dstX,                                       (float)(dstY + dstw + dsth),
+			       (float)srcX / info->accel_state->texW[0],          ((float)srcY + (float)srch * (((float)dstw / (float)dsth) + 1.0)) / info->accel_state->texH[0],
+			       (float)srcX + 0.5,                                 (float)srcY + (float)srch * (((float)dstw / (float)dsth) + 1.0) + 0.5);
+		VTX_OUT_FILTER((float)(dstX + dstw + dsth),                       (float)dstY,
+			       ((float)srcX + (float)srcw * (((float)dsth / (float)dstw) + 1.0)) / info->accel_state->texW[0],
+			                                                          (float)srcY / info->accel_state->texH[0],
+			       (float)srcX + (float)srcw * (((float)dsth / (float)dstw) + 1.0) + 0.5,
+			                                                          (float)srcY + 0.5);
 	    }
 	} else {
 	    if (IS_R300_3D || IS_R500_3D) {
 		if (use_quad) {
-		    VTX_OUT((float)dstX,                                           (float)dstY,
-			    (float)srcX / info->accel_state->texW[0],              (float)srcY / info->accel_state->texH[0]);
-		    VTX_OUT((float)dstX,                                           (float)(dstY + dsth),
-			    (float)srcX / info->accel_state->texW[0],              (float)(srcY + srch) / info->accel_state->texH[0]);
-		    VTX_OUT((float)(dstX + dstw),                                  (float)(dstY + dsth),
-			    (float)(srcX + srcw) / info->accel_state->texW[0],     (float)(srcY + srch) / info->accel_state->texH[0]);
-		    VTX_OUT((float)(dstX + dstw),                                  (float)dstY,
-			    (float)(srcX + srcw) / info->accel_state->texW[0],     (float)srcY / info->accel_state->texH[0]);
+		    VTX_OUT((float)dstX,                                       (float)dstY,
+			    (float)srcX / info->accel_state->texW[0],          (float)srcY / info->accel_state->texH[0]);
+		    VTX_OUT((float)dstX,                                       (float)(dstY + dsth),
+			    (float)srcX / info->accel_state->texW[0],          (float)(srcY + srch) / info->accel_state->texH[0]);
+		    VTX_OUT((float)(dstX + dstw),                              (float)(dstY + dsth),
+			    (float)(srcX + srcw) / info->accel_state->texW[0], (float)(srcY + srch) / info->accel_state->texH[0]);
+		    VTX_OUT((float)(dstX + dstw),                              (float)dstY,
+			    (float)(srcX + srcw) / info->accel_state->texW[0], (float)srcY / info->accel_state->texH[0]);
 		} else {
 		    /*
 		     * Render a big, scissored triangle. This means
-		     * doubling the triangle size and adjusting
+		     * increasing the triangle size and adjusting
 		     * texture coordinates.
 		     */
-		    VTX_OUT((float)dstX,                                           (float)dstY,
-			    (float)srcX / info->accel_state->texW[0],              (float)srcY / info->accel_state->texH[0]);
-		    VTX_OUT((float)dstX,                                           (float)(dstY + dsth * 2),
-			    (float)srcX / info->accel_state->texW[0],              (float)(srcY + srch * 2) / info->accel_state->texH[0]);
-		    VTX_OUT((float)(dstX + dstw * 2),                              (float)dstY,
-			    (float)(srcX + srcw * 2) / info->accel_state->texW[0], (float)srcY / info->accel_state->texH[0]);
+		    VTX_OUT((float)dstX,                              (float)dstY,
+			    (float)srcX / info->accel_state->texW[0], (float)srcY / info->accel_state->texH[0]);
+		    VTX_OUT((float)dstX,                              (float)(dstY + dsth + dstw),
+			    (float)srcX / info->accel_state->texW[0], ((float)srcY + (float)srch * (((float)dstw / (float)dsth) + 1.0)) / info->accel_state->texH[0]);
+			    
+		    VTX_OUT((float)(dstX + dstw + dsth),              (float)dstY,
+			    ((float)srcX + (float)srcw * (((float)dsth / (float)dstw) + 1.0)) / info->accel_state->texW[0],
+			                                              (float)srcY / info->accel_state->texH[0]);
 		}
 	    } else {
 		/*


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ati/F-10/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- .cvsignore	11 Aug 2008 04:14:20 -0000	1.24
+++ .cvsignore	25 Jan 2009 07:08:45 -0000	1.25
@@ -1 +1 @@
-xf86-video-ati-6.9.0.tar.bz2
+xf86-video-ati-6.10.0.tar.bz2

radeon-modeset.patch:

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.51 -r 1.52 radeon-modeset.patch
Index: radeon-modeset.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ati/F-10/radeon-modeset.patch,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- radeon-modeset.patch	21 Dec 2008 23:33:09 -0000	1.51
+++ radeon-modeset.patch	25 Jan 2009 07:08:46 -0000	1.52
@@ -1,847 +1,8 @@
-commit 52249421d496bbdf67c80c3169e964d71437f49a
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Mon Dec 22 09:27:47 2008 +1000
-
-    radeon: setup 3D engine even when no DRI.
-    
-    This should fix some missing font issues in EXA without DRI cases.
-
-commit 0db333f639cfbb71fa434a0ce08520c9172694f9
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Fri Dec 19 12:37:01 2008 +1100
-
-    radeon: only do mappings if direct rendering is enabled
-
-commit 97461ae1187e31f402a55d63fd55428abcc72ed8
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Tue Dec 9 13:29:18 2008 +1000
-
-    radeon: upstream fix for Init3D vs switch to/from 2d/3d
-
-commit 654092013c6ca2b666ec08e4046ab0b4d327b4c5
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Mon Dec 8 14:19:47 2008 +1000
-
-    radeon: only update dri buffers if DRI enabled
-
-commit c14f510c877c5ccfb38ebc11b910891a4bcf40ba
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Mon Dec 1 15:31:08 2008 +1100
-
-    radeon: don't have 2D and 3D in one CS buffer
-
-commit 73b6e729a09421f759a8c0e55ef830ab6bb2be84
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Wed Nov 26 16:09:29 2008 +1100
-
-    radeon: set touched flag on pinned buffers
-
-commit 5f3d3de0fbe755177109d1ab308266b423db1ae6
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Wed Nov 26 16:04:35 2008 +1100
-
-    radeon: fix up some of the touched by gpu handling and force gtt handling
-    
-    this fixes DFS on the rs690
-
-commit 969fb5d72094a2a7b6a2ad40a80a8ed93d6c8193
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Wed Nov 26 12:52:24 2008 +1100
-
-    radeon: brutal attempt to fix RS4xx and RS6xx by flushing more often
-    
-    this might take more CPU but hopefully leads to stabler GPU
-
-commit bc3caa80847c6652e6e6056e9ab32576d5ef179c
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Tue Nov 25 17:20:44 2008 +1100
-
-    radeon: rs690 stabilisation fixes.
-    
-    Flush the VAP due a IB hang on the VAP setup regs.
-    Flush the TX earlier.
-    Emit a right to SC_CLIP_RULE to flush as per r500 docs.
-
-commit 0e9f5f28a24d297d3fcd59dcebd4a6a74e4110dd
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Sun Nov 23 18:10:41 2008 +1000
-
-    radeon: switch to 3D slightly earlier
-
-commit 4f1dc1fc2a025d103263fdf55d4429583c302f5f
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Sun Nov 23 17:56:02 2008 +1000
-
-    radeon: wait for rendering before doing UTS
-
-commit 97f13799475a0583be1ffc318aaf3b840a7cfa63
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Sun Nov 23 17:54:27 2008 +1000
-
-    radeon: stop this_op_read from going negative
-
-commit 71915dae562835a397490311f01fdc1005243f01
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Sun Nov 23 17:52:42 2008 +1000
-
-    radeon: return flush for conflicting domains
-
-commit dc1d2bbac69d4ef8fa7d570a5775ed8e6af0e3c4
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Sun Nov 23 17:50:47 2008 +1000
-
-    radeon: only reset state2d before emitting cache flush
-
-commit 2697016d4ae42e457e9552d42b1d3a609472a7c4
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Thu Nov 20 16:48:33 2008 +1000
-
-    flush on UTS if any references
-
-commit b8264d48009b5e7b441d492f9c3fe45a6caa2f14
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Thu Nov 20 16:44:40 2008 +1000
-
-    radeon: add gart vs vram writes
-
-commit 16ddff0560a5c7dea735516172cf5166674b1669
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Thu Nov 20 16:37:07 2008 +1000
-
-    radeon: improve DFS performance for non-vram objects
-
-commit 69cbdf394f20eeb7882184eb78a306e9d9c5fe9e
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Wed Nov 19 14:49:44 2008 +1000
-
-    radeon: scrap state on LeaveVT not EnterVT
-
-commit 88a99cdd0faa4d9748987a90b9b1cfd3939be564
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Wed Nov 19 11:08:34 2008 +1000
-
-    radeon: even more typos
-
-commit ea7a1e29ae615bb1bc637c3ff8a20a7bec6debfc
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Wed Nov 19 07:51:03 2008 +1000
-
-    radeon: oops bad typo
-
-commit 051302885dddaac1b3ae5b30dd6e46dbd15d7ab8
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Tue Nov 18 16:09:10 2008 +1000
-
-    radeon: even if kernels fails, struggle onwards
-    
-    try and keep the session going even if visual glitches happen
-
-commit 68b88eda5de7d5ed0f8b13a0b5b861970826c2ed
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Tue Nov 18 15:46:46 2008 +1000
-
-    radeon_bufmgr: much more complete size check functionality
-
-commit 07b2b3d3b2eac76c0d7f3b84cb342df3d1037403
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Tue Nov 18 14:33:44 2008 +1000
-
-    radeon: I fail at uint32_t division
-
-commit 4ba990209bb2bd4070dcb160a63ecde05653bbb7
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Tue Nov 18 12:06:02 2008 +1000
-
-    radeon: workaround O(wtf) logic in post_submit bufmgr
-
-commit ed2ddc61540453dc89b7bbacc8c2e7d1bc002bfe
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Mon Nov 17 19:19:43 2008 +1000
-
-    radeon: set emit limit to 90% VRAM
-
-commit 82783174ca2ed4f9a3afa18d5f32c0274f866f88
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Mon Nov 17 16:16:51 2008 +1000
-
-    radeon: use get/set master ioctls
-
-commit 912a135fa66d50174ed925676ebcbaeae7bd8556
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Fri Nov 14 15:56:16 2008 +1000
-
-    radeon: make space accounting a lot smarter
-
-commit 1163200d644744bbfc72c205f47bf00a92446c68
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Fri Nov 14 15:55:12 2008 +1000
-
-    radeon: retry on CS2 EAGAIN
-
-commit 9f16d36104d242385e2a14916a66cdc95fca96ca
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Fri Nov 14 15:20:59 2008 +1000
-
-    radeon: add src/mask/dest to fallbacks
-
-commit 38b1f12d268f5a3213380e3b4fbd730d17ba073c
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Fri Nov 14 15:20:37 2008 +1000
-
-    radeon_memory: align all allocations
[...3262 lines suppressed...]
  
  #ifdef XF86DRI
-@@ -107,6 +110,7 @@ static __inline__ uint32_t F_TO_DW(float val)
+@@ -133,6 +136,7 @@ static __inline__ uint32_t F_TO_24(float val)
  #define OUT_ACCEL_REG_F(reg, val)	OUT_ACCEL_REG(reg, F_TO_DW(val))
  #define FINISH_ACCEL()		ADVANCE_RING()
  #define OUT_RING_F(x) OUT_RING(F_TO_DW(x))
@@ -8481,23 +7971,17 @@
  
  #include "radeon_textured_videofuncs.c"
  
-@@ -188,13 +192,8 @@ RADEONPutImageTextured(ScrnInfoPtr pScrn,
+@@ -214,7 +218,8 @@ RADEONPutImageTextured(ScrnInfoPtr pScrn,
  	break;
      }
  
--#ifdef XF86DRI
--   if (info->directRenderingEnabled && info->DMAForXv)
--       /* The upload blit only supports multiples of 64 bytes */
--       dstPitch = (dstPitch + 63) & ~63;
--   else
--#endif
--       dstPitch = (dstPitch + 15) & ~15;
+-   dstPitch = (dstPitch + 63) & ~63;
 +    /* always align to 64 bytes - fixes issue with non-CP code */
 +    dstPitch = (dstPitch + 63) & ~63;
  
      if (pPriv->video_memory != NULL && size != pPriv->size) {
  	radeon_legacy_free_memory(pScrn, pPriv->video_memory);
-@@ -207,6 +206,9 @@ RADEONPutImageTextured(ScrnInfoPtr pScrn,
+@@ -227,6 +232,9 @@ RADEONPutImageTextured(ScrnInfoPtr pScrn,
  						            size * 2, 64);
  	if (pPriv->video_offset == 0)
  	    return BadAlloc;
@@ -8506,8 +7990,8 @@
 +	    pPriv->src_bo = pPriv->video_memory;
      }
  
-     /* Bicubic filter loading */
-@@ -219,6 +221,9 @@ RADEONPutImageTextured(ScrnInfoPtr pScrn,
+     /* Bicubic filter setup */
+@@ -250,6 +258,9 @@ RADEONPutImageTextured(ScrnInfoPtr pScrn,
  	pPriv->bicubic_src_offset = pPriv->bicubic_offset + info->fbLocation + pScrn->fbOffset;
  	if (pPriv->bicubic_offset == 0)
  		pPriv->bicubic_enabled = FALSE;
@@ -8517,7 +8001,7 @@
      }
  
      if (pDraw->type == DRAWABLE_WINDOW)
-@@ -248,8 +253,19 @@ RADEONPutImageTextured(ScrnInfoPtr pScrn,
+@@ -279,8 +290,19 @@ RADEONPutImageTextured(ScrnInfoPtr pScrn,
      left = (x1 >> 16) & ~1;
      npixels = ((((x2 + 0xffff) >> 16) + 1) & ~1) - left;
  
@@ -8539,7 +8023,7 @@
      pPriv->src_pitch = dstPitch;
      pPriv->size = size;
      pPriv->pDraw = pDraw;
-@@ -290,8 +306,24 @@ RADEONPutImageTextured(ScrnInfoPtr pScrn,
+@@ -321,8 +343,24 @@ RADEONPutImageTextured(ScrnInfoPtr pScrn,
      }
  
      /* Upload bicubic filter tex */
@@ -8566,7 +8050,7 @@
  
      /* update cliplist */
      if (!REGION_EQUAL(pScrn->pScreen, &pPriv->clip, clipBoxes)) {
-@@ -308,8 +340,10 @@ RADEONPutImageTextured(ScrnInfoPtr pScrn,
+@@ -339,8 +377,10 @@ RADEONPutImageTextured(ScrnInfoPtr pScrn,
      pPriv->w = width;
      pPriv->h = height;
  
@@ -8579,10 +8063,10 @@
      else
  #endif
 diff --git a/src/radeon_textured_videofuncs.c b/src/radeon_textured_videofuncs.c
-index c5ad0e1..481bfc8 100644
+index 2fe852d..389d173 100644
 --- a/src/radeon_textured_videofuncs.c
 +++ b/src/radeon_textured_videofuncs.c
-@@ -95,6 +95,11 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
+@@ -92,6 +92,11 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
  {
      RADEONInfoPtr info = RADEONPTR(pScrn);
      PixmapPtr pPixmap = pPriv->pPixmap;
@@ -8594,7 +8078,7 @@
      uint32_t txformat;
      uint32_t txfilter, txformat0, txformat1, txoffset, txpitch;
      uint32_t dst_offset, dst_pitch, dst_format;
-@@ -103,19 +108,57 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
+@@ -100,19 +105,57 @@ 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);
@@ -8655,7 +8139,7 @@
  	    dst_pitch = pPixmap->devKind;
  	}
  
-@@ -210,13 +253,20 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
+@@ -213,13 +256,20 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
  
  	txoffset = pPriv->src_offset;
  
@@ -8678,7 +8162,7 @@
  	FINISH_ACCEL();
  
  	txenable = R300_TEX_0_ENABLE;
-@@ -237,13 +287,19 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
+@@ -240,13 +290,19 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
  			    R300_TX_MAG_FILTER_NEAREST |
  			    (1 << R300_TX_ID_SHIFT));
  
@@ -8700,7 +8184,7 @@
  		FINISH_ACCEL();
  
  		/* Enable tex 1 */
-@@ -980,11 +1036,18 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
+@@ -1332,11 +1388,18 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
  	    }
  	}
  
@@ -8721,7 +8205,7 @@
  	OUT_ACCEL_REG(R300_RB3D_COLORPITCH0, colorpitch);
  
  	blendcntl = RADEON_SRC_BLEND_GL_ONE | RADEON_DST_BLEND_GL_ZERO;
-@@ -1029,6 +1092,8 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
+@@ -1381,6 +1444,8 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
  		      RADEON_TEX_0_ENABLE | RADEON_TEX_BLEND_0_ENABLE);
  	OUT_ACCEL_REG(RADEON_RB3D_CNTL,
  		      dst_format | RADEON_ALPHA_BLEND_ENABLE);
@@ -8730,7 +8214,7 @@
  	OUT_ACCEL_REG(RADEON_RB3D_COLOROFFSET, dst_offset);
  
  	OUT_ACCEL_REG(RADEON_RB3D_COLORPITCH, colorpitch);
-@@ -1066,7 +1131,8 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
+@@ -1418,7 +1483,8 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
  			  ((pPriv->h - 1) << RADEON_TEX_VSIZE_SHIFT));
  	    OUT_ACCEL_REG(R200_PP_TXPITCH_0, pPriv->src_pitch - 32);
  
@@ -8740,7 +8224,7 @@
  
  	    OUT_ACCEL_REG(R200_PP_TXCBLEND_0,
  			  R200_TXC_ARG_A_ZERO |
-@@ -1099,8 +1165,10 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
+@@ -1451,8 +1517,10 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
  			  RADEON_CLAMP_S_CLAMP_LAST |
  			  RADEON_CLAMP_T_CLAMP_LAST |
  			  RADEON_YUV_TO_RGB);
@@ -8753,10 +8237,10 @@
  			  RADEON_COLOR_ARG_A_ZERO |
  			  RADEON_COLOR_ARG_B_ZERO |
 diff --git a/src/radeon_video.c b/src/radeon_video.c
-index 6249cea..5874335 100644
+index 423ea28..ae62549 100644
 --- a/src/radeon_video.c
 +++ b/src/radeon_video.c
-@@ -257,7 +257,7 @@ void RADEONInitVideo(ScreenPtr pScreen)
+@@ -287,7 +287,7 @@ void RADEONInitVideo(ScreenPtr pScreen)
      memcpy(newAdaptors, adaptors, num_adaptors * sizeof(XF86VideoAdaptorPtr));
      adaptors = newAdaptors;
  
@@ -8765,7 +8249,7 @@
  	overlayAdaptor = RADEONSetupImageVideo(pScreen);
  	if (overlayAdaptor != NULL) {
  	    adaptors[num_adaptors++] = overlayAdaptor;
-@@ -270,7 +270,7 @@ void RADEONInitVideo(ScreenPtr pScreen)
+@@ -300,7 +300,7 @@ void RADEONInitVideo(ScreenPtr pScreen)
      if (info->ChipFamily != CHIP_FAMILY_RV250) {
  	if ((info->ChipFamily < CHIP_FAMILY_RS400)
  #ifdef XF86DRI
@@ -8774,7 +8258,7 @@
  #endif
  	    ) {
  	    texturedAdaptor = RADEONSetupImageTexturedVideo(pScreen);
-@@ -2173,7 +2173,7 @@ RADEONCopyData(
+@@ -2203,7 +2203,7 @@ RADEONCopyData(
  
  #ifdef XF86DRI
  
@@ -8784,16 +8268,16 @@
  	uint8_t *buf;
  	uint32_t bufPitch, dstPitchOff;
 diff --git a/src/radeon_video.h b/src/radeon_video.h
-index 11b8029..a1bd20c 100644
+index 7f1891e..7a5f740 100644
 --- a/src/radeon_video.h
 +++ b/src/radeon_video.h
-@@ -111,6 +111,9 @@ typedef struct {
-     int src_w, src_h, dst_w, dst_h;
+@@ -116,6 +116,9 @@ typedef struct {
      int w, h;
      int drw_x, drw_y;
+     int vsync;
 +
 +    dri_bo *src_bo;
 +    dri_bo *bicubic_bo;
  } RADEONPortPrivRec, *RADEONPortPrivPtr;
  
- void RADEONInitI2C(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv);
+ int


Index: radeon.xinf
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ati/F-10/radeon.xinf,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- radeon.xinf	29 Oct 2008 05:59:58 -0000	1.9
+++ radeon.xinf	25 Jan 2009 07:08:46 -0000	1.10
@@ -225,7 +225,7 @@
 alias pcivideo:v00001002d00007288sv*sd*bc*sc*i* radeon # ATI Radeon X1950 GT
 alias pcivideo:v00001002d00007289sv*sd*bc*sc*i* radeon # ATI RV570
 alias pcivideo:v00001002d0000728Bsv*sd*bc*sc*i* radeon # ATI RV570
-alias pcivideo:v00001002d0000728Csv*sd*bc*sc*i* radeon # ATI ATI FireGL V7400
+alias pcivideo:v00001002d0000728Csv*sd*bc*sc*i* radeon # ATI FireGL V7400
 alias pcivideo:v00001002d00007290sv*sd*bc*sc*i* radeon # ATI RV560
 alias pcivideo:v00001002d00007291sv*sd*bc*sc*i* radeon # ATI Radeon X1650
 alias pcivideo:v00001002d00007293sv*sd*bc*sc*i* radeon # ATI Radeon X1650
@@ -252,13 +252,31 @@
 alias pcivideo:v00001002d00009440sv*sd*bc*sc*i* radeon # ATI Radeon 4800 Series
 alias pcivideo:v00001002d00009441sv*sd*bc*sc*i* radeon # ATI Radeon HD 4870 x2
 alias pcivideo:v00001002d00009442sv*sd*bc*sc*i* radeon # ATI Radeon 4800 Series
+alias pcivideo:v00001002d00009444sv*sd*bc*sc*i* radeon # ATI FirePro V8750 (FireGL)
+alias pcivideo:v00001002d00009446sv*sd*bc*sc*i* radeon # ATI FirePro V7760 (FireGL)
+alias pcivideo:v00001002d0000944Asv*sd*bc*sc*i* radeon # ATI Mobility RADEON HD 4850
+alias pcivideo:v00001002d0000944Bsv*sd*bc*sc*i* radeon # ATI Mobility RADEON HD 4850 X2
+alias pcivideo:v00001002d0000944Csv*sd*bc*sc*i* radeon # ATI Radeon 4800 Series
+alias pcivideo:v00001002d0000944Esv*sd*bc*sc*i* radeon # ATI FirePro RV770
+alias pcivideo:v00001002d00009450sv*sd*bc*sc*i* radeon # AMD FireStream 9270
+alias pcivideo:v00001002d00009452sv*sd*bc*sc*i* radeon # AMD FireStream 9250
+alias pcivideo:v00001002d00009456sv*sd*bc*sc*i* radeon # ATI FirePro V8700 (FireGL)
+alias pcivideo:v00001002d0000945Asv*sd*bc*sc*i* radeon # ATI Mobility RADEON HD 4870
+alias pcivideo:v00001002d0000945Bsv*sd*bc*sc*i* radeon # ATI Mobility RADEON M98
+alias pcivideo:v00001002d00009487sv*sd*bc*sc*i* radeon # ATI Radeon RV730 (AGP)
+alias pcivideo:v00001002d0000948Fsv*sd*bc*sc*i* radeon # ATI Radeon RV730 (AGP)
+alias pcivideo:v00001002d00009490sv*sd*bc*sc*i* radeon # ATI RV730XT [Radeon HD 4670]
+alias pcivideo:v00001002d00009498sv*sd*bc*sc*i* radeon # ATI RV730 PRO [Radeon HD 4650]
+alias pcivideo:v00001002d0000949Csv*sd*bc*sc*i* radeon # ATI FirePro V7750 (FireGL)
+alias pcivideo:v00001002d0000949Esv*sd*bc*sc*i* radeon # ATI FirePro V5700 (FireGL)
+alias pcivideo:v00001002d0000949Fsv*sd*bc*sc*i* radeon # ATI FirePro V3750 (FireGL)
 alias pcivideo:v00001002d000094C0sv*sd*bc*sc*i* radeon # ATI RV610
 alias pcivideo:v00001002d000094C1sv*sd*bc*sc*i* radeon # ATI Radeon HD 2400 XT
 alias pcivideo:v00001002d000094C3sv*sd*bc*sc*i* radeon # ATI Radeon HD 2400 Pro
 alias pcivideo:v00001002d000094C4sv*sd*bc*sc*i* radeon # ATI Radeon HD 2400 PRO AGP
 alias pcivideo:v00001002d000094C5sv*sd*bc*sc*i* radeon # ATI FireGL V4000
 alias pcivideo:v00001002d000094C6sv*sd*bc*sc*i* radeon # ATI RV610
-alias pcivideo:v00001002d000094C7sv*sd*bc*sc*i* radeon # ATI ATI Radeon HD 2350
+alias pcivideo:v00001002d000094C7sv*sd*bc*sc*i* radeon # ATI Radeon HD 2350
 alias pcivideo:v00001002d000094C8sv*sd*bc*sc*i* radeon # ATI Mobility Radeon HD 2400 XT
 alias pcivideo:v00001002d000094C9sv*sd*bc*sc*i* radeon # ATI Mobility Radeon HD 2400
 alias pcivideo:v00001002d000094CBsv*sd*bc*sc*i* radeon # ATI RADEON E2400
@@ -270,6 +288,12 @@
 alias pcivideo:v00001002d0000950Fsv*sd*bc*sc*i* radeon # ATI Radeon HD3870 X2
 alias pcivideo:v00001002d00009511sv*sd*bc*sc*i* radeon # ATI FireGL V7700
 alias pcivideo:v00001002d00009515sv*sd*bc*sc*i* radeon # ATI Radeon HD3850
+alias pcivideo:v00001002d00009540sv*sd*bc*sc*i* radeon # ATI Radeon HD 4550
+alias pcivideo:v00001002d00009541sv*sd*bc*sc*i* radeon # ATI Radeon RV710
+alias pcivideo:v00001002d0000954Esv*sd*bc*sc*i* radeon # ATI Radeon RV710
+alias pcivideo:v00001002d0000954Fsv*sd*bc*sc*i* radeon # ATI Radeon HD 4350
+alias pcivideo:v00001002d00009552sv*sd*bc*sc*i* radeon # ATI Mobility Radeon 4300 Series
+alias pcivideo:v00001002d00009553sv*sd*bc*sc*i* radeon # ATI Mobility Radeon 4500 Series
 alias pcivideo:v00001002d00009580sv*sd*bc*sc*i* radeon # ATI RV630
 alias pcivideo:v00001002d00009581sv*sd*bc*sc*i* radeon # ATI Mobility Radeon HD 2600
 alias pcivideo:v00001002d00009583sv*sd*bc*sc*i* radeon # ATI Mobility Radeon HD 2600 XT
@@ -282,19 +306,20 @@
 alias pcivideo:v00001002d0000958Csv*sd*bc*sc*i* radeon # ATI FireGL V5600
 alias pcivideo:v00001002d0000958Dsv*sd*bc*sc*i* radeon # ATI FireGL V3600
 alias pcivideo:v00001002d0000958Esv*sd*bc*sc*i* radeon # ATI Radeon HD 2600 LE
+alias pcivideo:v00001002d00009592sv*sd*bc*sc*i* radeon # ATI Radeon RV710
 alias pcivideo:v00001002d000095C0sv*sd*bc*sc*i* radeon # ATI Radeon HD 3470
-alias pcivideo:v00001002d000095C5sv*sd*bc*sc*i* radeon # ATI Radeon HD 3450
-alias pcivideo:v00001002d000095C7sv*sd*bc*sc*i* radeon # ATI Radeon HD 3430
 alias pcivideo:v00001002d000095C2sv*sd*bc*sc*i* radeon # ATI Mobility Radeon HD 3430
 alias pcivideo:v00001002d000095C4sv*sd*bc*sc*i* radeon # ATI Mobility Radeon HD 3400 Series
+alias pcivideo:v00001002d000095C5sv*sd*bc*sc*i* radeon # ATI Radeon HD 3450
+alias pcivideo:v00001002d000095C7sv*sd*bc*sc*i* radeon # ATI Radeon HD 3430
 alias pcivideo:v00001002d000095CDsv*sd*bc*sc*i* radeon # ATI FireMV 2450
 alias pcivideo:v00001002d000095CEsv*sd*bc*sc*i* radeon # ATI FireMV 2260
 alias pcivideo:v00001002d000095CFsv*sd*bc*sc*i* radeon # ATI FireMV 2260
-alias pcivideo:v00001002d00009590sv*sd*bc*sc*i* radeon # ATI ATI Radeon HD 3600 Series
-alias pcivideo:v00001002d00009596sv*sd*bc*sc*i* radeon # ATI ATI Radeon HD 3650 AGP
-alias pcivideo:v00001002d00009597sv*sd*bc*sc*i* radeon # ATI ATI Radeon HD 3600 PRO
-alias pcivideo:v00001002d00009598sv*sd*bc*sc*i* radeon # ATI ATI Radeon HD 3600 XT
-alias pcivideo:v00001002d00009599sv*sd*bc*sc*i* radeon # ATI ATI Radeon HD 3600 PRO
+alias pcivideo:v00001002d00009590sv*sd*bc*sc*i* radeon # ATI Radeon HD 3600 Series
+alias pcivideo:v00001002d00009596sv*sd*bc*sc*i* radeon # ATI Radeon HD 3650 AGP
+alias pcivideo:v00001002d00009597sv*sd*bc*sc*i* radeon # ATI Radeon HD 3600 PRO
+alias pcivideo:v00001002d00009598sv*sd*bc*sc*i* radeon # ATI Radeon HD 3600 XT
+alias pcivideo:v00001002d00009599sv*sd*bc*sc*i* radeon # ATI Radeon HD 3600 PRO
 alias pcivideo:v00001002d00009591sv*sd*bc*sc*i* radeon # ATI Mobility Radeon HD 3650
 alias pcivideo:v00001002d00009593sv*sd*bc*sc*i* radeon # ATI Mobility Radeon HD 3670
 alias pcivideo:v00001002d00009610sv*sd*bc*sc*i* radeon # ATI Radeon HD 3200 Graphics


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ati/F-10/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- sources	11 Aug 2008 04:14:20 -0000	1.24
+++ sources	25 Jan 2009 07:08:46 -0000	1.25
@@ -1 +1 @@
-afa4873f58ae6fa31fedeb9ed31531db  xf86-video-ati-6.9.0.tar.bz2
+6445815b12ffa4ccd1aafd43640f466d  xf86-video-ati-6.10.0.tar.bz2


Index: xorg-x11-drv-ati.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ati/F-10/xorg-x11-drv-ati.spec,v
retrieving revision 1.165
retrieving revision 1.166
diff -u -r1.165 -r1.166
--- xorg-x11-drv-ati.spec	24 Jan 2009 23:54:06 -0000	1.165
+++ xorg-x11-drv-ati.spec	25 Jan 2009 07:08:46 -0000	1.166
@@ -4,8 +4,8 @@
 
 Summary:   Xorg X11 ati video driver
 Name:      xorg-x11-drv-ati
-Version:   6.9.0
-Release:   64%{?dist}
+Version:   6.10.0
+Release:   1%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -14,16 +14,11 @@
 Source0:   http://www.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
 Source1:   radeon.xinf
 
-Patch0:	    radeon-6.9.0-to-git.patch
 Patch1:     radeon-modeset.patch
 Patch4:     radeon-6.9.0-remove-limit-heuristics.patch
 Patch5:	    radeon-6.9.0-panel-size-sanity.patch
 Patch6:     radeon-6.9.0-bgnr-enable.patch
-Patch7:	    radeon-6.9.0-add-hd3300.patch
-Patch8:     radeon-6.9.0-quirk-agp.patch
-Patch9:	    radeon-6.9.0-dig1-hdmi.patch
-Patch10:    radeon-6.9.0-exa-dst-a8-r100-r200.patch
-Patch11:    radeon-6.9.0-posting-fix.patch
+Patch7:	    radeon-6.10.0-fixes.patch
 Patch12:    radeon-modeset-fix-legacy-vt.patch
 
 ExcludeArch: s390 s390x
@@ -46,20 +41,15 @@
 
 %prep
 %setup -q -n %{tarball}-%{version}
-%patch0 -p1 -b .git
 %patch1 -p1 -b .modeset
 %patch4 -p1 -b .remove-limit-heuristics
 %patch5 -p1 -b .panel-size
 %patch6 -p1 -b .bgnr
-%patch7 -p1 -b .pciid
-%patch8 -p1 -b .quirk
-%patch9 -p1 -b .hdmi
-%patch10 -p1 -b .dsta8
-%patch11 -p1 -b .posting
+%patch7 -p1 -b .upstream
 %patch12 -p1 -b .vtswitch
 
 %build
-autoreconf
+autoreconf -iv
 %configure --disable-static
 make %{?_smp_mflags}
 
@@ -88,7 +78,10 @@
 %{_mandir}/man4/radeon.4*
 
 %changelog
-* Sun Jan 25 2009 Dave Airlie <airlied at redhat.com> 6.9.0-64
+* Sun Jan 25 2009 Dave Airlie <airlied at redhat.com> 6.10.0-1
+- rebase to latest upstream release
+
+ Sun Jan 25 2009 Dave Airlie <airlied at redhat.com> 6.9.0-64
 - hopefully fix post-resume DRI (#475193)
 
 * Mon Dec 22 2008 Dave Airlie <airlied at redhat.com> 6.9.0-63


--- radeon-6.9.0-add-hd3300.patch DELETED ---


--- radeon-6.9.0-dig1-hdmi.patch DELETED ---


--- radeon-6.9.0-exa-dst-a8-r100-r200.patch DELETED ---


--- radeon-6.9.0-posting-fix.patch DELETED ---


--- radeon-6.9.0-quirk-agp.patch DELETED ---


--- radeon-6.9.0-to-git.patch DELETED ---



From kevin at fedoraproject.org  Sun Jan 25 07:41:05 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 25 Jan 2009 07:41:05 +0000 (UTC)
Subject: rpms/dircproxy/devel sources, 1.2, 1.3 .cvsignore, 1.2,
	1.3 dircproxy.spec, 1.5, 1.6
Message-ID: <20090125074105.73B3870133@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/dircproxy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23201

Modified Files:
	sources .cvsignore dircproxy.spec 
Log Message:
Update to RC1



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/dircproxy/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	28 Oct 2006 05:40:39 -0000	1.2
+++ sources	25 Jan 2009 07:40:33 -0000	1.3
@@ -1 +1 @@
-850443437f709276ff21a173bbf98456  dircproxy-1.2.0-beta2.tar.bz
+4fe2e82619c7b575599bfb236adbd872  dircproxy-1.2.0-RC1.tar.gz


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/dircproxy/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	28 Oct 2006 05:40:39 -0000	1.2
+++ .cvsignore	25 Jan 2009 07:40:33 -0000	1.3
@@ -1 +1 @@
-dircproxy-1.2.0-beta2.tar.bz
+dircproxy-1.2.0-RC1.tar.gz


Index: dircproxy.spec
===================================================================
RCS file: /cvs/extras/rpms/dircproxy/devel/dircproxy.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- dircproxy.spec	16 Jul 2008 21:08:44 -0000	1.5
+++ dircproxy.spec	25 Jan 2009 07:40:33 -0000	1.6
@@ -1,16 +1,15 @@
 Name:           dircproxy
 Version:        1.2.0
-%define betaver beta2
-Release:        0.8.%{betaver}%{?dist}
+%define betaver RC1
+Release:        0.9.%{betaver}%{?dist}
 Summary:        IRC proxy server
 
 Group:          Applications/Internet
 License:        GPLv2+
-URL:            http://dircproxy.securiweb.net/
-Source0:        http://dircproxy.securiweb.net/pub/1.2/%{name}-%{version}-%{betaver}.tar.bz
+URL:            http://code.google.com/p/dircproxy/
+Source0:        http://dircproxy.googlecode.com/files/%{name}-%{version}-%{betaver}.tar.gz
 Source1:        dircproxy.init
 Source2:        dircproxy.sysconfig
-Patch0:         dircproxy-1.2.0-blank-me-segfault.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  openssl-devel
@@ -27,7 +26,6 @@
 
 %prep
 %setup -q -n %{name}-%{version}-%{betaver}
-%patch0 -p1
 
 %build
 %configure --enable-ssl
@@ -79,6 +77,9 @@
 %{_datadir}/dircproxy/
 
 %changelog
+* Sun Jan 25 2009 Kevin Fenzi <kevin at tummy.com> - 1.2.0-0.9.RC1
+- Update to RC1
+
 * Wed Jul 16 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1.2.0-0.8.beta2
 - fix license tag
 



From than at fedoraproject.org  Sun Jan 25 08:11:47 2009
From: than at fedoraproject.org (Than Ngo)
Date: Sun, 25 Jan 2009 08:11:47 +0000 (UTC)
Subject: rpms/kde-l10n/devel kde-l10n.spec,1.65,1.66
Message-ID: <20090125081147.9264870133@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kde-l10n/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28469

Modified Files:
	kde-l10n.spec 
Log Message:
fix file list



Index: kde-l10n.spec
===================================================================
RCS file: /cvs/extras/rpms/kde-l10n/devel/kde-l10n.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- kde-l10n.spec	24 Jan 2009 17:41:36 -0000	1.65
+++ kde-l10n.spec	25 Jan 2009 08:11:14 -0000	1.66
@@ -1096,7 +1096,6 @@
 %lang(nds) %{_kde4_appsdir}/kvtml/nds
 %lang(nds) %{_kde4_appsdir}/ktuberling/sounds/nds*
 %lang(nds) %{_kde4_appsdir}/katepart/syntax/logohighlightstyle.nds.xml
-%lang(nds) %{_kde4_appsdir}/kturtle/data/logokeywords.sr*
 %lang(nds) %{_kde4_appsdir}/kturtle/examples/nds
 
 %files Latvian



From denis at fedoraproject.org  Sun Jan 25 09:06:46 2009
From: denis at fedoraproject.org (Denis Leroy)
Date: Sun, 25 Jan 2009 09:06:46 +0000 (UTC)
Subject: rpms/libburn/devel .cvsignore, 1.8, 1.9 libburn.spec, 1.14,
	1.15 sources, 1.9, 1.10
Message-ID: <20090125090646.D700070133@cvs1.fedora.phx.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/libburn/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7877

Modified Files:
	.cvsignore libburn.spec sources 
Log Message:
Updating to pl01 tarball from upstream. Fixed project URL


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libburn/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	7 Jan 2009 14:37:00 -0000	1.8
+++ .cvsignore	25 Jan 2009 09:06:15 -0000	1.9
@@ -1 +1 @@
-libburn-0.6.0.pl00.tar.gz
+libburn-0.6.0.pl01.tar.gz


Index: libburn.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libburn/devel/libburn.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- libburn.spec	7 Jan 2009 14:37:00 -0000	1.14
+++ libburn.spec	25 Jan 2009 09:06:15 -0000	1.15
@@ -1,12 +1,14 @@
+%define tbpostfix pl01
+
 Name:           libburn
 Version:        0.6.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Library for reading, mastering and writing optical discs
 
 Group:          System Environment/Libraries
 License:        GPLv2
-URL:            http://libburn.pykix.org/
-Source0:        http://files.libburnia-project.org/releases/%{name}-%{version}.pl00.tar.gz
+URL:            http://libburnia.pykix.org/
+Source0:        http://files.libburnia-project.org/releases/%{name}-%{version}.%{tbpostfix}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:   libtool intltool gettext doxygen graphviz
@@ -92,6 +94,10 @@
 
 
 %changelog
+* Sat Jan 24 2009 Denis Leroy <denis at poolshark.org> - 0.6.0-2
+- Updating to pl01 tarball from upstream
+- Fixed project URL
+
 * Wed Jan 07 2009 Adel Gadllah <adel.gadllah at gmail.com> - 0.6.0-1
 - New upstream version
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libburn/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	7 Jan 2009 14:37:00 -0000	1.9
+++ sources	25 Jan 2009 09:06:15 -0000	1.10
@@ -1 +1 @@
-3c8ec5a3e129099fb31f91b2c081fa5a  libburn-0.6.0.pl00.tar.gz
+9ad48fe011dd5cbe9a15367ae8173647  libburn-0.6.0.pl01.tar.gz



From denis at fedoraproject.org  Sun Jan 25 09:39:42 2009
From: denis at fedoraproject.org (Denis Leroy)
Date: Sun, 25 Jan 2009 09:39:42 +0000 (UTC)
Subject: rpms/libisofs/devel .cvsignore, 1.4, 1.5 libisofs.spec, 1.7,
	1.8 sources, 1.4, 1.5
Message-ID: <20090125093942.8124C70133@cvs1.fedora.phx.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/libisofs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13593

Modified Files:
	.cvsignore libisofs.spec sources 
Log Message:
Update to 0.6.12 upstream version


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libisofs/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	11 Jun 2008 07:31:05 -0000	1.4
+++ .cvsignore	25 Jan 2009 09:39:09 -0000	1.5
@@ -1 +1 @@
-libisofs-0.6.6.tar.gz
+libisofs-0.6.12.tar.gz


Index: libisofs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libisofs/devel/libisofs.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- libisofs.spec	6 Aug 2008 16:46:04 -0000	1.7
+++ libisofs.spec	25 Jan 2009 09:39:10 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           libisofs
-Version:        0.6.6
-Release:        2%{?dist}
+Version:        0.6.12
+Release:        1%{?dist}
 Summary:        Library to create ISO 9660 disk images
 
 Group:          System Environment/Libraries
@@ -70,6 +70,9 @@
  
 
 %changelog
+* Sun Jan 25 2009 Denis Leroy <denis at poolshark.org> - 0.6.12-1
+- Update to 0.6.12 upstream version
+
 * Wed Aug  6 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.6.6-2
 - fix license tag
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libisofs/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	11 Jun 2008 07:31:06 -0000	1.4
+++ sources	25 Jan 2009 09:39:10 -0000	1.5
@@ -1 +1 @@
-9437ee4e9493da5ccfa2b18b4fa0b7e8  libisofs-0.6.6.tar.gz
+bbf94852dc019ff21a711805bcd0af2d  libisofs-0.6.12.tar.gz



From denis at fedoraproject.org  Sun Jan 25 09:54:33 2009
From: denis at fedoraproject.org (Denis Leroy)
Date: Sun, 25 Jan 2009 09:54:33 +0000 (UTC)
Subject: rpms/libburn/devel libburn.spec,1.15,1.16
Message-ID: <20090125095434.4690D70133@cvs1.fedora.phx.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/libburn/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16708

Modified Files:
	libburn.spec 
Log Message:
Fixed URL to official address


Index: libburn.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libburn/devel/libburn.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- libburn.spec	25 Jan 2009 09:06:15 -0000	1.15
+++ libburn.spec	25 Jan 2009 09:54:02 -0000	1.16
@@ -7,7 +7,7 @@
 
 Group:          System Environment/Libraries
 License:        GPLv2
-URL:            http://libburnia.pykix.org/
+URL:            http://libburnia-project.org/
 Source0:        http://files.libburnia-project.org/releases/%{name}-%{version}.%{tbpostfix}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 



From denis at fedoraproject.org  Sun Jan 25 09:55:09 2009
From: denis at fedoraproject.org (Denis Leroy)
Date: Sun, 25 Jan 2009 09:55:09 +0000 (UTC)
Subject: rpms/libisofs/devel libisofs.spec,1.8,1.9
Message-ID: <20090125095509.8952D70133@cvs1.fedora.phx.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/libisofs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16840

Modified Files:
	libisofs.spec 
Log Message:
Fixed URL to official address


Index: libisofs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libisofs/devel/libisofs.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- libisofs.spec	25 Jan 2009 09:39:10 -0000	1.8
+++ libisofs.spec	25 Jan 2009 09:54:39 -0000	1.9
@@ -5,7 +5,7 @@
 
 Group:          System Environment/Libraries
 License:        GPLv2
-URL:            http://libburnia.pykix.org/
+URL:            http://libburnia-project.org/
 Source0:        http://files.libburnia-project.org/releases/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 



From drago01 at fedoraproject.org  Sun Jan 25 10:18:02 2009
From: drago01 at fedoraproject.org (Adel Gadllah)
Date: Sun, 25 Jan 2009 10:18:02 +0000 (UTC)
Subject: rpms/compiz-fusion-extras/devel compiz-fusion-extras.spec, 1.23,
	1.24
Message-ID: <20090125101802.506F570133@cvs1.fedora.phx.redhat.com>

Author: drago01

Update of /cvs/pkgs/rpms/compiz-fusion-extras/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20649

Modified Files:
	compiz-fusion-extras.spec 
Log Message:
build with libnotify support


Index: compiz-fusion-extras.spec
===================================================================
RCS file: /cvs/pkgs/rpms/compiz-fusion-extras/devel/compiz-fusion-extras.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- compiz-fusion-extras.spec	5 Dec 2008 09:07:58 -0000	1.23
+++ compiz-fusion-extras.spec	25 Jan 2009 10:17:29 -0000	1.24
@@ -2,7 +2,7 @@
 
 Name: compiz-fusion-extras
 Version: 0.7.8
-Release: 4%{?dist}
+Release: 5%{?dist}
 Summary: Additional Compiz Fusion plugins for Compiz      
 
 Group: User Interface/Desktops        
@@ -20,6 +20,7 @@
 BuildRequires: perl(XML::Parser)
 BuildRequires: mesa-libGLU-devel
 BuildRequires: libXrender-devel
+BuildRequires: libnotify-devel
 BuildRequires: GConf2
 BuildRequires: libjpeg-devel
 BuildRequires: gawk
@@ -124,6 +125,9 @@
 %{_libdir}/pkgconfig/compiz-*
 
 %changelog
+* Sun Jan 25 2009 Adel Gadllah <adel.gadllah at gmail.com> 0.7.8-5
+- Build with libnotify support
+
 * Fri Dec 08 2008 Adel Gadllah <adel.gadllah at gmail.com> 0.7.8-4
 - Remove crap from scriptlet
 



From drago01 at fedoraproject.org  Sun Jan 25 10:18:51 2009
From: drago01 at fedoraproject.org (Adel Gadllah)
Date: Sun, 25 Jan 2009 10:18:51 +0000 (UTC)
Subject: rpms/compiz-fusion-extras/F-10 compiz-fusion-extras.spec,1.21,1.22
Message-ID: <20090125101851.90D0570133@cvs1.fedora.phx.redhat.com>

Author: drago01

Update of /cvs/pkgs/rpms/compiz-fusion-extras/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20992

Modified Files:
	compiz-fusion-extras.spec 
Log Message:
build with libnotify support


Index: compiz-fusion-extras.spec
===================================================================
RCS file: /cvs/pkgs/rpms/compiz-fusion-extras/F-10/compiz-fusion-extras.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- compiz-fusion-extras.spec	10 Dec 2008 16:55:13 -0000	1.21
+++ compiz-fusion-extras.spec	25 Jan 2009 10:18:21 -0000	1.22
@@ -2,7 +2,7 @@
 
 Name: compiz-fusion-extras
 Version: 0.7.8
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: Additional Compiz Fusion plugins for Compiz      
 
 Group: User Interface/Desktops        
@@ -20,6 +20,7 @@
 BuildRequires: perl(XML::Parser)
 BuildRequires: mesa-libGLU-devel
 BuildRequires: libXrender-devel
+BuildRequires: libnotify-devel
 BuildRequires: GConf2
 BuildRequires: libjpeg-devel
 BuildRequires: gawk
@@ -126,6 +127,9 @@
 %{_libdir}/pkgconfig/compiz-*
 
 %changelog
+* Sun Jan 25 2009 Adel Gadllah <adel.gadllah at gmail.com> 0.7.8-3
+- Build with libnotify support
+
 * Wed Dec 10 2008 Adel Gadllah <adel.gadllah at gmail.com> 0.7.8-2
 - Update to 0.7.8
 - Add clog entry



From ivaxer at fedoraproject.org  Sun Jan 25 10:36:40 2009
From: ivaxer at fedoraproject.org (John A. Khvatov)
Date: Sun, 25 Jan 2009 10:36:40 +0000 (UTC)
Subject: rpms/glog/devel glog-r38.patch, NONE, 1.1 .cvsignore, 1.2,
	1.3 glog.spec, 1.1, 1.2 import.log, 1.1, 1.2 sources, 1.2,
	1.3 glog-lpthread.patch, 1.1, NONE
Message-ID: <20090125103640.BFDB470133@cvs1.fedora.phx.redhat.com>

Author: ivaxer

Update of /cvs/pkgs/rpms/glog/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25442/devel

Modified Files:
	.cvsignore glog.spec import.log sources 
Added Files:
	glog-r38.patch 
Removed Files:
	glog-lpthread.patch 
Log Message:
update to 0.2


glog-r38.patch:

--- NEW FILE glog-r38.patch ---
Index: src/logging_unittest.cc
===================================================================
--- src/logging_unittest.cc	(revision 37)
+++ src/logging_unittest.cc	(revision 38)
@@ -154,7 +154,7 @@
   FLAGS_logtostderr = true;
 
   InitGoogleTest(&argc, argv);
-#ifdef HAVE_LIB_GTEST
+#ifdef HAVE_LIB_GMOCK
   InitGoogleMock(&argc, argv);
 #endif
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/glog/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	15 Dec 2008 12:28:02 -0000	1.2
+++ .cvsignore	25 Jan 2009 10:36:08 -0000	1.3
@@ -1 +1 @@
-glog-0.1.2.tar.gz
+glog-0.2.tar.gz


Index: glog.spec
===================================================================
RCS file: /cvs/pkgs/rpms/glog/devel/glog.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- glog.spec	15 Dec 2008 12:28:02 -0000	1.1
+++ glog.spec	25 Jan 2009 10:36:09 -0000	1.2
@@ -1,13 +1,13 @@
 Name:           glog
-Version:        0.1.2
-Release:        6%{?dist}
+Version:        0.2
+Release:        2%{?dist}
 Summary:        A C++ application logging library
 
 Group:          System Environment/Libraries
 License:        BSD
 URL:            http://code.google.com/p/google-glog
 Source0:        http://google-glog.googlecode.com/files/%{name}-%{version}.tar.gz
-Patch0:         glog-lpthread.patch
+Patch0:         glog-r38.patch
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 BuildRequires:  autoconf
@@ -69,6 +69,9 @@
 
 
 %changelog
+* Sun Jan 25 2009 John A. Khvatov <ivaxer at fedoraproject.org> 0.2-2
+- update to 0.2
+
 * Thu Dec 4 2008 John A. Khvatov <ivaxer at fedoraproject.org> 0.1.2-6
 - fix %%{_includedir}
 - fixed documentation


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/glog/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	15 Dec 2008 12:28:02 -0000	1.1
+++ import.log	25 Jan 2009 10:36:09 -0000	1.2
@@ -1 +1,2 @@
 glog-0_1_2-6_fc10:HEAD:glog-0.1.2-6.fc10.src.rpm:1229343821
+glog-0_2-2_fc10:HEAD:glog-0.2-2.fc10.src.rpm:1232879474


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/glog/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	15 Dec 2008 12:28:02 -0000	1.2
+++ sources	25 Jan 2009 10:36:09 -0000	1.3
@@ -1 +1 @@
-64b44e0a36b25c4afc77a0f6b2b208ed  glog-0.1.2.tar.gz
+c0fe88ea51ba4e2328580cffc4856ca5  glog-0.2.tar.gz


--- glog-lpthread.patch DELETED ---



From caolanm at fedoraproject.org  Sun Jan 25 11:06:29 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Sun, 25 Jan 2009 11:06:29 +0000 (UTC)
Subject: comps comps-f11.xml.in,1.76,1.77
Message-ID: <20090125110629.986DE70133@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31007

Modified Files:
	comps-f11.xml.in 
Log Message:
add some new minority language dictionaries


Index: comps-f11.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f11.xml.in,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- comps-f11.xml.in	23 Jan 2009 17:33:11 -0000	1.76
+++ comps-f11.xml.in	25 Jan 2009 11:05:56 -0000	1.77
@@ -1307,6 +1307,7 @@
     <uservisible>false</uservisible>
     <langonly>eo</langonly>
     <packagelist>
+      <packagereq type="conditional" requires="hunspell">hunspell-eo</packagereq>
       <packagereq type="conditional" requires="kdelibs">kde-l10n-Esperanto</packagereq>
       <packagereq type="optional">m17n-contrib-esperanto</packagereq>
     </packagelist>
@@ -1387,6 +1388,7 @@
     <uservisible>false</uservisible>
     <langonly>fil</langonly>
     <packagelist>
+      <packagereq type="conditional" requires="hunspell">hunspell-tl</packagereq>
       <packagereq type="conditional" requires="moodle">moodle-fil</packagereq>
     </packagelist>
   </group>
@@ -3015,6 +3017,7 @@
     <uservisible>false</uservisible>
     <langonly>csb</langonly>
     <packagelist>
+      <packagereq type="conditional" requires="hunspell">hunspell-csb</packagereq>
       <packagereq type="conditional" requires="kdelibs">kde-l10n-Kashubian</packagereq>
     </packagelist>
   </group>
@@ -3586,6 +3589,7 @@
     <uservisible>false</uservisible>
     <langonly>mn</langonly>
     <packagelist>
+      <packagereq type="conditional" requires="hunspell">hunspell-mn</packagereq>
       <packagereq type="conditional" requires="moodle">moodle-mn</packagereq>
     </packagelist>
   </group>
@@ -3859,6 +3863,7 @@
     <uservisible>false</uservisible>
     <langonly>fa</langonly>
     <packagelist>
+      <packagereq type="conditional" requires="hunspell">hunspell-fa</packagereq>
       <packagereq type="conditional" requires="koffice-core">koffice-langpack-fa</packagereq>
       <packagereq type="conditional" requires="moodle">moodle-fa</packagereq>
       <packagereq type="optional">m17n-db-farsi</packagereq>



From jorton at fedoraproject.org  Sun Jan 25 11:20:42 2009
From: jorton at fedoraproject.org (Joe Orton)
Date: Sun, 25 Jan 2009 11:20:42 +0000 (UTC)
Subject: rpms/php/devel php.spec,1.167,1.168
Message-ID: <20090125112042.DB6C570133@cvs1.fedora.phx.redhat.com>

Author: jorton

Update of /cvs/extras/rpms/php/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv817

Modified Files:
	php.spec 
Log Message:
* Sun Jan 25 2009 Joe Orton <jorton at redhat.com> 5.2.8-4
- move wddx to php-xml, build curl shared in -common
- remove BR for expat-devel, bogus configure option



Index: php.spec
===================================================================
RCS file: /cvs/extras/rpms/php/devel/php.spec,v
retrieving revision 1.167
retrieving revision 1.168
diff -u -r1.167 -r1.168
--- php.spec	23 Jan 2009 09:39:51 -0000	1.167
+++ php.spec	25 Jan 2009 11:20:10 -0000	1.168
@@ -8,7 +8,7 @@
 Summary: PHP scripting language for creating dynamic web sites
 Name: php
 Version: 5.2.8
-Release: 3%{?dist}
+Release: 5%{?dist}
 License: PHP
 Group: Development/Languages
 URL: http://www.php.net/
@@ -41,7 +41,7 @@
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires: bzip2-devel, curl-devel >= 7.9, db4-devel, expat-devel
+BuildRequires: bzip2-devel, curl-devel >= 7.9, db4-devel
 BuildRequires: gmp-devel
 BuildRequires: httpd-devel >= 2.0.46-1, pam-devel
 BuildRequires: libstdc++-devel, openssl-devel, sqlite-devel >= 3.0.0
@@ -90,7 +90,7 @@
 Provides: php-openssl, php-pcre, php-posix
 Provides: php-reflection, php-session, php-shmop, php-simplexml, php-sockets
 Provides: php-spl, php-sysvsem, php-sysvshm, php-sysvmsg, php-tokenizer
-Provides: php-wddx, php-zlib, php-json, php-zip, php-dbase
+Provides: php-zlib, php-json, php-zip, php-dbase
 Obsoletes: php-openssl, php-pecl-zip, php-json, php-dbase
 
 %description common
@@ -228,7 +228,7 @@
 Group: Development/Languages
 Requires: php-common = %{version}-%{release}
 Obsoletes: php-domxml, php-dom
-Provides: php-dom, php-xsl, php-domxml
+Provides: php-dom, php-xsl, php-domxml, php-wddx
 BuildRequires: libxslt-devel >= 1.0.18-1, libxml2-devel >= 2.4.14-1
 
 %description xml
@@ -240,7 +240,6 @@
 Summary: A module for PHP applications which use the XML-RPC protocol
 Group: Development/Languages
 Requires: php-common = %{version}-%{release}
-BuildRequires: expat-devel
 
 %description xmlrpc
 The php-xmlrpc package contains a dynamic shared object that will add
@@ -455,7 +454,6 @@
 	--disable-rpath \
 	--without-pear \
 	--with-bz2 \
-	--with-curl \
 	--with-exec-dir=%{_bindir} \
 	--with-freetype-dir=%{_prefix} \
 	--with-png-dir=%{_prefix} \
@@ -480,7 +478,6 @@
 	--enable-track-vars \
 	--enable-trans-sid \
 	--enable-yp \
-	--enable-wddx \
 	--with-kerberos \
 	--enable-ucd-snmp-hack \
 	--with-unixODBC=shared,%{_prefix} \
@@ -522,10 +519,12 @@
       --enable-dom=shared \
       --with-dom-xslt=%{_prefix} --with-dom-exslt=%{_prefix} \
       --with-pgsql=shared \
+      --enable-wddx=shared \
       --with-snmp=shared,%{_prefix} \
       --enable-soap=shared \
       --with-xsl=shared,%{_prefix} \
       --enable-xmlreader=shared --enable-xmlwriter=shared \
+      --with-curl=shared,%{_prefix} \
       --enable-fastcgi \
       --enable-pdo=shared \
       --with-pdo-odbc=shared,unixODBC,%{_prefix} \
@@ -548,7 +547,8 @@
       --without-odbc --disable-dom \
       --disable-dba --without-unixODBC \
       --disable-pdo --disable-xmlreader --disable-xmlwriter \
-      --disable-json --without-pspell"
+      --disable-json --without-pspell --disable-wddx \
+      --without-curl"
 
 # Build Apache module, and the CLI SAPI, /usr/bin/php
 pushd build-apache
@@ -616,7 +616,7 @@
 for mod in pgsql mysql mysqli odbc ldap snmp xmlrpc imap \
     mbstring ncurses gd dom xsl soap bcmath dba xmlreader xmlwriter \
     pdo pdo_mysql pdo_pgsql pdo_odbc pdo_sqlite json zip \
-    dbase mcrypt mhash tidy pdo_dblib mssql pspell; do
+    dbase mcrypt mhash tidy pdo_dblib mssql pspell curl wddx; do
     cat > $RPM_BUILD_ROOT%{_sysconfdir}/php.d/${mod}.ini <<EOF
 ; Enable ${mod} extension module
 extension=${mod}.so
@@ -628,7 +628,7 @@
 done
 
 # The dom, xsl and xml* modules are all packaged in php-xml
-cat files.dom files.xsl files.xml{reader,writer} > files.xml
+cat files.dom files.xsl files.xml{reader,writer} files.wddx > files.xml
 
 # The mysql and mysqli modules are both packaged in php-mysql
 cat files.mysqli >> files.mysql
@@ -644,7 +644,7 @@
 cat files.pdo_sqlite >> files.pdo
 
 # Package json, dbase and zip in -common.
-cat files.json files.dbase files.zip > files.common
+cat files.json files.dbase files.zip files.curl > files.common
 
 # Install the macros file:
 install -d $RPM_BUILD_ROOT%{_sysconfdir}/rpm
@@ -733,6 +733,10 @@
 %files pspell -f files.pspell
 
 %changelog
+* Sun Jan 25 2009 Joe Orton <jorton at redhat.com> 5.2.8-4
+- move wddx to php-xml, build curl shared in -common
+- remove BR for expat-devel, bogus configure option
+
 * Fri Jan 23 2009 Joe Orton <jorton at redhat.com> 5.2.8-3
 - rebuild for new MySQL
 



From nim at fedoraproject.org  Sun Jan 25 12:46:21 2009
From: nim at fedoraproject.org (Nicolas Mailhot)
Date: Sun, 25 Jan 2009 12:46:21 +0000 (UTC)
Subject: rpms/edrip-fonts/devel dead.package, NONE,
	1.1 edrip-fonts-fontconfig.conf, 1.4,
	NONE edrip-fonts-license.patch, 1.1, NONE edrip-fonts.spec, 1.13, NONE
Message-ID: <20090125124622.441F870133@cvs1.fedora.phx.redhat.com>

Author: nim

Update of /cvs/extras/rpms/edrip-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14727

Added Files:
	dead.package 
Removed Files:
	edrip-fonts-fontconfig.conf edrip-fonts-license.patch 
	edrip-fonts.spec 
Log Message:
renamed to apanov-edrip-fonts


--- NEW FILE dead.package ---
Renamed to apanov-edrip-fonts (#481472)


--- edrip-fonts-fontconfig.conf DELETED ---


--- edrip-fonts-license.patch DELETED ---


--- edrip-fonts.spec DELETED ---



From heffer at fedoraproject.org  Sun Jan 25 13:07:40 2009
From: heffer at fedoraproject.org (Felix Kaechele)
Date: Sun, 25 Jan 2009 13:07:40 +0000 (UTC)
Subject: rpms/w_scan/devel import.log, NONE, 1.1 w_scan.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090125130741.138AD70133@cvs1.fedora.phx.redhat.com>

Author: heffer

Update of /cvs/pkgs/rpms/w_scan/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18608/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log w_scan.spec 
Log Message:
initial import of w_scan



--- NEW FILE import.log ---
w_scan-20081106-1_fc10:HEAD:w_scan-20081106-1.fc10.src.rpm:1232888757


--- NEW FILE w_scan.spec ---
Name:           w_scan
Version:        20081106
Release:        1%{?dist}
Summary:        Tool for scanning DVB-C/T transponders

Group:          Applications/Multimedia
License:        GPLv2+
URL:            http://wirbel.htpc-forum.de/w_scan/index2.html
Source0:        http://wirbel.htpc-forum.de/%{name}/%{name}-%{version}.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%description
The w_scan tool is similar to dvbscan from dvb-apps. However it does not 
require initial tuning data and thus is able to find more channels.
Note that w_scan does not support DVB-S (only DVB-C/T).

%prep
%setup -q

%build
make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS"

%install
rm -rf $RPM_BUILD_ROOT
install -dm 755 $RPM_BUILD_ROOT%{_bindir}
install -dm 755 $RPM_BUILD_ROOT%{_datadir}/%{name}
install -pm 755 w_scan $RPM_BUILD_ROOT%{_bindir}
install -pm 755 w_scan_start.sh $RPM_BUILD_ROOT%{_bindir}
install -pm 644 pci.classes $RPM_BUILD_ROOT%{_datadir}/%{name}
install -pm 644 pci.ids $RPM_BUILD_ROOT%{_datadir}/%{name}
install -pm 644 usb.classes $RPM_BUILD_ROOT%{_datadir}/%{name}
install -pm 644 usb.ids $RPM_BUILD_ROOT%{_datadir}/%{name}

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc COPYING README
%{_bindir}/%{name}
%{_bindir}/%{name}_start.sh
%{_datadir}/%{name}

%changelog
* Wed Jan 21 2009 Felix Kaechele <felix at fetzig dot org> - 20081106-1
- Initial build


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/w_scan/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	25 Jan 2009 01:49:07 -0000	1.1
+++ .cvsignore	25 Jan 2009 13:07:09 -0000	1.2
@@ -0,0 +1 @@
+w_scan-20081106.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/w_scan/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	25 Jan 2009 01:49:07 -0000	1.1
+++ sources	25 Jan 2009 13:07:09 -0000	1.2
@@ -0,0 +1 @@
+f576286c8e51c3e2b86c4a8bc25db7d8  w_scan-20081106.tar.bz2



From heffer at fedoraproject.org  Sun Jan 25 13:14:12 2009
From: heffer at fedoraproject.org (Felix Kaechele)
Date: Sun, 25 Jan 2009 13:14:12 +0000 (UTC)
Subject: rpms/w_scan/F-9 w_scan.spec,NONE,1.1
Message-ID: <20090125131412.DA0AC70133@cvs1.fedora.phx.redhat.com>

Author: heffer

Update of /cvs/pkgs/rpms/w_scan/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19858

Added Files:
	w_scan.spec 
Log Message:
* Wed Jan 21 2009 Felix Kaechele <felix at fetzig dot org> - 20081106-1
- Initial build



--- NEW FILE w_scan.spec ---
Name:           w_scan
Version:        20081106
Release:        1%{?dist}
Summary:        Tool for scanning DVB-C/T transponders

Group:          Applications/Multimedia
License:        GPLv2+
URL:            http://wirbel.htpc-forum.de/w_scan/index2.html
Source0:        http://wirbel.htpc-forum.de/%{name}/%{name}-%{version}.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%description
The w_scan tool is similar to dvbscan from dvb-apps. However it does not 
require initial tuning data and thus is able to find more channels.
Note that w_scan does not support DVB-S (only DVB-C/T).

%prep
%setup -q

%build
make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS"

%install
rm -rf $RPM_BUILD_ROOT
install -dm 755 $RPM_BUILD_ROOT%{_bindir}
install -dm 755 $RPM_BUILD_ROOT%{_datadir}/%{name}
install -pm 755 w_scan $RPM_BUILD_ROOT%{_bindir}
install -pm 755 w_scan_start.sh $RPM_BUILD_ROOT%{_bindir}
install -pm 644 pci.classes $RPM_BUILD_ROOT%{_datadir}/%{name}
install -pm 644 pci.ids $RPM_BUILD_ROOT%{_datadir}/%{name}
install -pm 644 usb.classes $RPM_BUILD_ROOT%{_datadir}/%{name}
install -pm 644 usb.ids $RPM_BUILD_ROOT%{_datadir}/%{name}

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc COPYING README
%{_bindir}/%{name}
%{_bindir}/%{name}_start.sh
%{_datadir}/%{name}

%changelog
* Wed Jan 21 2009 Felix Kaechele <felix at fetzig dot org> - 20081106-1
- Initial build



From heffer at fedoraproject.org  Sun Jan 25 13:15:50 2009
From: heffer at fedoraproject.org (Felix Kaechele)
Date: Sun, 25 Jan 2009 13:15:50 +0000 (UTC)
Subject: rpms/w_scan/F-10 w_scan.spec,NONE,1.1
Message-ID: <20090125131550.0D05170133@cvs1.fedora.phx.redhat.com>

Author: heffer

Update of /cvs/pkgs/rpms/w_scan/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20244

Added Files:
	w_scan.spec 
Log Message:
* Wed Jan 21 2009 Felix Kaechele <felix at fetzig dot org> - 20081106-1
- Initial build



--- NEW FILE w_scan.spec ---
Name:           w_scan
Version:        20081106
Release:        1%{?dist}
Summary:        Tool for scanning DVB-C/T transponders

Group:          Applications/Multimedia
License:        GPLv2+
URL:            http://wirbel.htpc-forum.de/w_scan/index2.html
Source0:        http://wirbel.htpc-forum.de/%{name}/%{name}-%{version}.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%description
The w_scan tool is similar to dvbscan from dvb-apps. However it does not 
require initial tuning data and thus is able to find more channels.
Note that w_scan does not support DVB-S (only DVB-C/T).

%prep
%setup -q

%build
make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS"

%install
rm -rf $RPM_BUILD_ROOT
install -dm 755 $RPM_BUILD_ROOT%{_bindir}
install -dm 755 $RPM_BUILD_ROOT%{_datadir}/%{name}
install -pm 755 w_scan $RPM_BUILD_ROOT%{_bindir}
install -pm 755 w_scan_start.sh $RPM_BUILD_ROOT%{_bindir}
install -pm 644 pci.classes $RPM_BUILD_ROOT%{_datadir}/%{name}
install -pm 644 pci.ids $RPM_BUILD_ROOT%{_datadir}/%{name}
install -pm 644 usb.classes $RPM_BUILD_ROOT%{_datadir}/%{name}
install -pm 644 usb.ids $RPM_BUILD_ROOT%{_datadir}/%{name}

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc COPYING README
%{_bindir}/%{name}
%{_bindir}/%{name}_start.sh
%{_datadir}/%{name}

%changelog
* Wed Jan 21 2009 Felix Kaechele <felix at fetzig dot org> - 20081106-1
- Initial build



From heffer at fedoraproject.org  Sun Jan 25 13:19:20 2009
From: heffer at fedoraproject.org (Felix Kaechele)
Date: Sun, 25 Jan 2009 13:19:20 +0000 (UTC)
Subject: rpms/w_scan/F-9 sources,1.1,1.2
Message-ID: <20090125131920.7865270133@cvs1.fedora.phx.redhat.com>

Author: heffer

Update of /cvs/pkgs/rpms/w_scan/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20799

Modified Files:
	sources 
Log Message:
forgot to update source file



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/w_scan/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	25 Jan 2009 01:49:07 -0000	1.1
+++ sources	25 Jan 2009 13:18:49 -0000	1.2
@@ -0,0 +1 @@
+f576286c8e51c3e2b86c4a8bc25db7d8  w_scan-20081106.tar.bz2



From heffer at fedoraproject.org  Sun Jan 25 13:21:34 2009
From: heffer at fedoraproject.org (Felix Kaechele)
Date: Sun, 25 Jan 2009 13:21:34 +0000 (UTC)
Subject: rpms/w_scan/F-10 .cvsignore,1.1,1.2 sources,1.1,1.2
Message-ID: <20090125132134.DED4B70133@cvs1.fedora.phx.redhat.com>

Author: heffer

Update of /cvs/pkgs/rpms/w_scan/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21250

Modified Files:
	.cvsignore sources 
Log Message:
forgot to update source file



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/w_scan/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	25 Jan 2009 01:49:07 -0000	1.1
+++ .cvsignore	25 Jan 2009 13:21:04 -0000	1.2
@@ -0,0 +1 @@
+w_scan-20081106.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/w_scan/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	25 Jan 2009 01:49:07 -0000	1.1
+++ sources	25 Jan 2009 13:21:04 -0000	1.2
@@ -0,0 +1 @@
+f576286c8e51c3e2b86c4a8bc25db7d8  w_scan-20081106.tar.bz2



From heffer at fedoraproject.org  Sun Jan 25 13:35:29 2009
From: heffer at fedoraproject.org (Felix Kaechele)
Date: Sun, 25 Jan 2009 13:35:29 +0000 (UTC)
Subject: comps comps-f11.xml.in,1.77,1.78
Message-ID: <20090125133529.D152170133@cvs1.fedora.phx.redhat.com>

Author: heffer

Update of /cvs/pkgs/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24356

Modified Files:
	comps-f11.xml.in 
Log Message:
Added vdr-streamdev-* and w_scan



Index: comps-f11.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f11.xml.in,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- comps-f11.xml.in	25 Jan 2009 11:05:56 -0000	1.77
+++ comps-f11.xml.in	25 Jan 2009 13:34:58 -0000	1.78
@@ -4273,6 +4273,8 @@
       <packagereq type="optional">vdr-remote</packagereq>
       <packagereq type="optional">vdr-skins</packagereq>
       <packagereq type="optional">vdr-skinsoppalusikka</packagereq>
+      <packagereq type="optional">vdr-streamdev-client</packagereq>
+      <packagereq type="optional">vdr-streamdev-server</packagereq>
       <packagereq type="optional">vdr-sudoku</packagereq>
       <packagereq type="optional">vdr-text2skin</packagereq>
       <packagereq type="optional">vdr-ttxtsubs</packagereq>
@@ -4593,6 +4595,7 @@
       <packagereq type="optional">viaideinfo</packagereq>
       <packagereq type="optional">vlock</packagereq>
       <packagereq type="optional">vnstat</packagereq>
+      <packagereq type="optional">w_scan</packagereq>
       <packagereq type="optional">wifiroamd</packagereq>
       <packagereq type="optional">wine</packagereq>
       <packagereq type="optional">wireshark-gnome</packagereq>



From jwrdegoede at fedoraproject.org  Sun Jan 25 13:51:16 2009
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Sun, 25 Jan 2009 13:51:16 +0000 (UTC)
Subject: rpms/allegro/devel allegro.spec,1.51,1.52
Message-ID: <20090125135116.DB7D570133@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/allegro/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27131

Modified Files:
	allegro.spec 
Log Message:
* Sun Jan 25 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 4.2.2-11
- Fix wrong file path in semanage call in scriptlets (#481407)



Index: allegro.spec
===================================================================
RCS file: /cvs/extras/rpms/allegro/devel/allegro.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- allegro.spec	5 May 2008 10:51:43 -0000	1.51
+++ allegro.spec	25 Jan 2009 13:50:45 -0000	1.52
@@ -1,6 +1,6 @@
 Name:           allegro
 Version:        4.2.2
-Release:        10%{?dist}
+Release:        11%{?dist}
 
 Summary:        A game programming library
 Summary(es):    Una libreria de programacion de juegos
@@ -204,7 +204,7 @@
 /sbin/ldconfig   
 # Set SELinux file_context for vga plugin in the policy
 semanage fcontext -a -t textrel_shlib_t \
-  '%{_libdir}/allegro/4\.2\.1/alleg-vga\.so' 2>/dev/null || :
+  '%{_libdir}/allegro/4\.2\.2/alleg-vga\.so' 2>/dev/null || :
 # Actually change the context
 chcon -t textrel_shlib_t %{_libdir}/allegro/%{version}/alleg-vga.so \
   2> /dev/null || :
@@ -218,7 +218,7 @@
 # SELinux support
 if [ $1 -eq 0 ]; then  # final removal
   semanage fcontext -d -t textrel_shlib_t \
-    '%{_libdir}/allegro/4\.2\.1/alleg-vga\.so' 2>/dev/null || :
+    '%{_libdir}/allegro/4\.2\.2/alleg-vga\.so' 2>/dev/null || :
 fi
 %else 
 %postun -p /sbin/ldconfig 
@@ -294,6 +294,9 @@
 
 
 %changelog
+* Sun Jan 25 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 4.2.2-11
+- Fix wrong file path in semanage call in scriptlets (#481407)
+
 * Mon May  5 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 4.2.2-10
 - Look for /etc/timidity.cfg instead of /usr/share/timidity/timidity.cfg,
   as the latter is no longer available now that Fedora has switched from



From jwrdegoede at fedoraproject.org  Sun Jan 25 13:54:52 2009
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Sun, 25 Jan 2009 13:54:52 +0000 (UTC)
Subject: rpms/allegro/devel allegro.spec,1.52,1.53
Message-ID: <20090125135452.62EA370133@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/allegro/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27811

Modified Files:
	allegro.spec 
Log Message:
* Sun Jan 25 2009 Hans de Goede <j.w.r.degoede at hhs.nl> 4.2.2-11
- Fix wrong file path in semanage call in scriptlets (#481407)



Index: allegro.spec
===================================================================
RCS file: /cvs/extras/rpms/allegro/devel/allegro.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- allegro.spec	25 Jan 2009 13:50:45 -0000	1.52
+++ allegro.spec	25 Jan 2009 13:54:21 -0000	1.53
@@ -294,7 +294,7 @@
 
 
 %changelog
-* Sun Jan 25 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 4.2.2-11
+* Sun Jan 25 2009 Hans de Goede <j.w.r.degoede at hhs.nl> 4.2.2-11
 - Fix wrong file path in semanage call in scriptlets (#481407)
 
 * Mon May  5 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 4.2.2-10



From jwrdegoede at fedoraproject.org  Sun Jan 25 13:59:43 2009
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Sun, 25 Jan 2009 13:59:43 +0000 (UTC)
Subject: rpms/portaudio/F-9 portaudio-non-mmap-alsa.patch, NONE,
	1.1 portaudio.spec, 1.14, 1.15
Message-ID: <20090125135943.F282770133@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/portaudio/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28830

Modified Files:
	portaudio.spec 
Added Files:
	portaudio-non-mmap-alsa.patch 
Log Message:
* Sun Dec  7 2008 Hans de Goede <hdegoede at redhat.com> 19-6
- Add a patch by Kevin Kofler to make non mmap alsa (and thus pulseaudio) work
  (bz 445644)


portaudio-non-mmap-alsa.patch:

--- NEW FILE portaudio-non-mmap-alsa.patch ---
diff -ur portaudio/src/hostapi/alsa/pa_linux_alsa.c portaudio-pulseaudio/src/hostapi/alsa/pa_linux_alsa.c
--- portaudio/src/hostapi/alsa/pa_linux_alsa.c	2007-09-12 19:39:48.000000000 +0200
+++ portaudio-pulseaudio/src/hostapi/alsa/pa_linux_alsa.c	2008-12-08 19:30:20.000000000 +0100
@@ -6,6 +6,7 @@
  *
  * Copyright (c) 2002 Joshua Haberman <joshua at haberman.com>
  * Copyright (c) 2005-2007 Arve Knudsen <aknuds-1 at broadpark.no>
+ * Copyright (c) 2008 Kevin Kofler <kevin.kofler at chello.at>
  *
  * Based on the Open Source API proposed by Ross Bencina
  * Copyright (c) 1999-2002 Ross Bencina, Phil Burk
@@ -118,6 +119,8 @@
     unsigned long framesPerBuffer;
     int numUserChannels, numHostChannels;
     int userInterleaved, hostInterleaved;
+    int canMmap;
+    void *nonMmapBuffer;
     PaDeviceIndex device;     /* Keep the device index */
 
     snd_pcm_t *pcm;
@@ -321,7 +324,7 @@
  * and a suitable result returned. The device is closed before returning.
  */
 static PaError GropeDevice( snd_pcm_t* pcm, int isPlug, StreamDirection mode, int openBlocking,
-        PaAlsaDeviceInfo* devInfo, int* canMmap )
+        PaAlsaDeviceInfo* devInfo )
 {
     PaError result = paNoError;
     snd_pcm_hw_params_t *hwParams;
@@ -354,9 +357,6 @@
     snd_pcm_hw_params_alloca( &hwParams );
     snd_pcm_hw_params_any( pcm, hwParams );
 
-    *canMmap = snd_pcm_hw_params_test_access( pcm, hwParams, SND_PCM_ACCESS_MMAP_INTERLEAVED ) >= 0 ||
-            snd_pcm_hw_params_test_access( pcm, hwParams, SND_PCM_ACCESS_MMAP_NONINTERLEAVED ) >= 0;
-
     if( defaultSr >= 0 )
     {
         /* Could be that the device opened in one mode supports samplerates that the other mode wont have,
@@ -566,7 +566,6 @@
     PaError result = 0;
     PaDeviceInfo *baseDeviceInfo = &devInfo->baseDeviceInfo;
     snd_pcm_t *pcm;
-    int canMmap = -1;
     PaUtilHostApiRepresentation *baseApi = &alsaApi->baseHostApiRep;
 
     /* Zero fields */
@@ -580,8 +579,7 @@
             OpenPcm( &pcm, deviceName->alsaName, SND_PCM_STREAM_CAPTURE, blocking, 0 )
             >= 0 )
     {
-        if( GropeDevice( pcm, deviceName->isPlug, StreamDirection_In, blocking, devInfo,
-                    &canMmap ) != paNoError )
+        if( GropeDevice( pcm, deviceName->isPlug, StreamDirection_In, blocking, devInfo ) != paNoError )
         {
             /* Error */
             PA_DEBUG(("%s: Failed groping %s for capture\n", __FUNCTION__, deviceName->alsaName));
@@ -594,8 +592,7 @@
             OpenPcm( &pcm, deviceName->alsaName, SND_PCM_STREAM_PLAYBACK, blocking, 0 )
             >= 0 )
     {
-        if( GropeDevice( pcm, deviceName->isPlug, StreamDirection_Out, blocking, devInfo,
-                    &canMmap ) != paNoError )
+        if( GropeDevice( pcm, deviceName->isPlug, StreamDirection_Out, blocking, devInfo ) != paNoError )
         {
             /* Error */
             PA_DEBUG(("%s: Failed groping %s for playback\n", __FUNCTION__, deviceName->alsaName));
@@ -603,12 +600,6 @@
         }
     }
 
-    if( 0 == canMmap )
-    {
-        PA_DEBUG(("%s: Device %s doesn't support mmap\n", __FUNCTION__, deviceName->alsaName));
-        goto end;
-    }
-
     baseDeviceInfo->structVersion = 2;
     baseDeviceInfo->hostApi = alsaApi->hostApiIndex;
     baseDeviceInfo->name = deviceName->name;
@@ -1197,6 +1188,8 @@
     self->hostInterleaved = self->userInterleaved = !(userSampleFormat & paNonInterleaved);
     self->numUserChannels = params->channelCount;
     self->streamDir = streamDir;
+    self->canMmap = 0;
+    self->nonMmapBuffer = NULL;
 
     if( !callbackMode && !self->userInterleaved )
     {
@@ -1239,6 +1232,7 @@
 
     PaError result = paNoError;
     snd_pcm_access_t accessMode, alternateAccessMode;
+    snd_pcm_access_t rwAccessMode, alternateRwAccessMode;
     int dir = 0;
     snd_pcm_t *pcm = self->pcm;
     double sr = *sampleRate;
@@ -1258,32 +1252,40 @@
     if( self->userInterleaved )
     {
         accessMode = SND_PCM_ACCESS_MMAP_INTERLEAVED;
+        rwAccessMode = SND_PCM_ACCESS_RW_INTERLEAVED;
         alternateAccessMode = SND_PCM_ACCESS_MMAP_NONINTERLEAVED;
+        alternateRwAccessMode = SND_PCM_ACCESS_RW_NONINTERLEAVED;
     }
     else
     {
         accessMode = SND_PCM_ACCESS_MMAP_NONINTERLEAVED;
+        rwAccessMode = SND_PCM_ACCESS_RW_NONINTERLEAVED;
         alternateAccessMode = SND_PCM_ACCESS_MMAP_INTERLEAVED;
+        alternateRwAccessMode = SND_PCM_ACCESS_RW_INTERLEAVED;
     }
     /* If requested access mode fails, try alternate mode */
+    self->canMmap = 1;
     if( snd_pcm_hw_params_set_access( pcm, hwParams, accessMode ) < 0 )
     {
-        int err = 0;
-        if( (err = snd_pcm_hw_params_set_access( pcm, hwParams, alternateAccessMode )) < 0)
+        if( snd_pcm_hw_params_set_access( pcm, hwParams, rwAccessMode ) >= 0 )
+            self->canMmap = 0;
+        else
         {
-            result = paUnanticipatedHostError;
-            if( -EINVAL == err )
+            if( snd_pcm_hw_params_set_access( pcm, hwParams, alternateAccessMode ) < 0 )
             {
-                PaUtil_SetLastHostErrorInfo( paALSA, err, "PA ALSA requires that a device supports mmap access" );
-            }
-            else
-            {
-                PaUtil_SetLastHostErrorInfo( paALSA, err, snd_strerror( err ) );
+                int err = 0;
+                if( (err = snd_pcm_hw_params_set_access( pcm, hwParams, alternateRwAccessMode )) >= 0)
+                    self->canMmap = 0;
+                else
+                {
+                    result = paUnanticipatedHostError;
+                    PaUtil_SetLastHostErrorInfo( paALSA, err, snd_strerror( err ) );
+                    goto error;
+                }
             }
-            goto error;
+            /* Flip mode */
+            self->hostInterleaved = !self->userInterleaved;
         }
-        /* Flip mode */
-        self->hostInterleaved = !self->userInterleaved;
     }
 
     ENSURE_( snd_pcm_hw_params_set_format( pcm, hwParams, self->nativeFormat ), paUnanticipatedHostError );
@@ -1361,7 +1363,7 @@
         
     ENSURE_( snd_pcm_sw_params_set_avail_min( self->pcm, swParams, self->framesPerBuffer ), paUnanticipatedHostError );
     ENSURE_( snd_pcm_sw_params_set_xfer_align( self->pcm, swParams, 1 ), paUnanticipatedHostError );
-    ENSURE_( snd_pcm_sw_params_set_tstamp_mode( self->pcm, swParams, SND_PCM_TSTAMP_MMAP ), paUnanticipatedHostError );
+    ENSURE_( snd_pcm_sw_params_set_tstamp_mode( self->pcm, swParams, SND_PCM_TSTAMP_ENABLE ), paUnanticipatedHostError );
 
     /* Set the parameters! */
     ENSURE_( snd_pcm_sw_params( self->pcm, swParams ), paUnanticipatedHostError );
@@ -1589,6 +1591,10 @@
         }
     }
 
+    /* non-mmap mode needs a reasonably-sized buffer or it'll stutter */
+    if( !self->canMmap && framesPerHostBuffer < 2048 )
+        framesPerHostBuffer = 2048;
+
     assert( framesPerHostBuffer > 0 );
     {
         snd_pcm_uframes_t min = 0, max = 0;
@@ -1831,12 +1837,13 @@
     PA_UNLESS( framesPerHostBuffer != 0, paInternalError );
     self->maxFramesPerHostBuffer = framesPerHostBuffer;
 
-    if( !accurate )
+    if( !self->playback.canMmap || !accurate )
     {
         /* Don't know the exact size per host buffer */
         *hostBufferSizeMode = paUtilBoundedHostBufferSize;
         /* Raise upper bound */
-        ++self->maxFramesPerHostBuffer;
+        if( !accurate )
+            ++self->maxFramesPerHostBuffer;
     }
 
 error:
@@ -2059,9 +2066,11 @@
             {
                 /* Buffer isn't primed, so prepare and silence */
                 ENSURE_( snd_pcm_prepare( stream->playback.pcm ), paUnanticipatedHostError );
-                SilenceBuffer( stream );
+                if( stream->playback.canMmap )
+                    SilenceBuffer( stream );
             }
-            ENSURE_( snd_pcm_start( stream->playback.pcm ), paUnanticipatedHostError );
+            if( stream->playback.canMmap )
+                ENSURE_( snd_pcm_start( stream->playback.pcm ), paUnanticipatedHostError );
         }
         else
             ENSURE_( snd_pcm_prepare( stream->playback.pcm ), paUnanticipatedHostError );
@@ -2390,6 +2399,7 @@
     snd_pcm_status_t *st;
     PaTime now = PaUtil_GetTime();
     snd_timestamp_t t;
+    int errplayback = 0, errcapture = 0;
 
     snd_pcm_status_alloca( &st );
 
@@ -2400,6 +2410,7 @@
         {
             snd_pcm_status_get_trigger_tstamp( st, &t );
             self->underrun = now * 1000 - ((PaTime) t.tv_sec * 1000 + (PaTime) t.tv_usec / 1000);
+            errplayback = snd_pcm_recover( self->playback.pcm, -EPIPE, 0 );
         }
     }
     if( self->capture.pcm )
@@ -2409,10 +2420,12 @@
         {
             snd_pcm_status_get_trigger_tstamp( st, &t );
             self->overrun = now * 1000 - ((PaTime) t.tv_sec * 1000 + (PaTime) t.tv_usec / 1000);
+            errcapture = snd_pcm_recover( self->capture.pcm, -EPIPE, 0 );
         }
     }
 
-    PA_ENSURE( AlsaRestart( self ) );
+    if( errplayback || errcapture )
+        PA_ENSURE( AlsaRestart( self ) );
 
 end:
     return result;
@@ -2563,7 +2576,7 @@
 static PaError PaAlsaStreamComponent_EndProcessing( PaAlsaStreamComponent *self, unsigned long numFrames, int *xrun )
 {
     PaError result = paNoError;
-    int res;
+    int res = 0;
 
     /* @concern FullDuplex It is possible that only one direction is marked ready after polling, and processed
      * afterwards
@@ -2571,7 +2584,34 @@
     if( !self->ready )
         goto end;
 
-    res = snd_pcm_mmap_commit( self->pcm, self->offset, numFrames );
+    if( !self->canMmap && StreamDirection_Out == self->streamDir )
+    {
+        /* Play sound */
+        if( self->hostInterleaved )
+            res = snd_pcm_writei( self->pcm, self->nonMmapBuffer, numFrames );
+        else
+        {
+            void *bufs[self->numHostChannels];
+            int bufsize = snd_pcm_format_size( self->nativeFormat, self->framesPerBuffer + 1 );
+            unsigned char *buffer = self->nonMmapBuffer;
+            int i;
+            for( i = 0; i < self->numHostChannels; ++i )
+            {
+                bufs[i] = buffer;
+                buffer += bufsize;
+            }
+            res = snd_pcm_writen( self->pcm, bufs, numFrames );
+        }
+    }
+
+    if( self->canMmap )
+        res = snd_pcm_mmap_commit( self->pcm, self->offset, numFrames );
+    else
+    {
+        free( self->nonMmapBuffer );
+        self->nonMmapBuffer = NULL;
+    }
+
     if( res == -EPIPE || res == -ESTRPIPE )
     {
         *xrun = 1;
@@ -2611,7 +2651,7 @@
     if( self->hostInterleaved )
     {
         int swidth = snd_pcm_format_size( self->nativeFormat, 1 );
-        unsigned char *buffer = ExtractAddress( self->channelAreas, self->offset );
+        unsigned char *buffer = self->canMmap ? ExtractAddress( self->channelAreas, self->offset ) : self->nonMmapBuffer;
 
         /* Start after the last user channel */
         p = buffer + self->numUserChannels * swidth;
@@ -2991,13 +3031,23 @@
         goto end;
     }
 
-    ENSURE_( snd_pcm_mmap_begin( self->pcm, &areas, &self->offset, numFrames ), paUnanticipatedHostError );
+    if( self->canMmap )
+    {
+        ENSURE_( snd_pcm_mmap_begin( self->pcm, &areas, &self->offset, numFrames ), paUnanticipatedHostError );
+        /* @concern ChannelAdaption Buffer address is recorded so we can do some channel adaption later */
+        self->channelAreas = (snd_pcm_channel_area_t *)areas;
+    }
+    else
+    {
+        free( self->nonMmapBuffer );
+        self->nonMmapBuffer = calloc( self->numHostChannels, snd_pcm_format_size( self->nativeFormat, self->framesPerBuffer + 1 ) );
+    }
 
     if( self->hostInterleaved )
     {
         int swidth = snd_pcm_format_size( self->nativeFormat, 1 );
 
-        p = buffer = ExtractAddress( areas, self->offset );
+        p = buffer = self->canMmap ? ExtractAddress( areas, self->offset ) : self->nonMmapBuffer;
         for( i = 0; i < self->numUserChannels; ++i )
         {
             /* We're setting the channels up to userChannels, but the stride will be hostChannels samples */
@@ -3007,16 +3057,52 @@
     }
     else
     {
-        for( i = 0; i < self->numUserChannels; ++i )
+        if( self->canMmap )
+            for( i = 0; i < self->numUserChannels; ++i )
+            {
+                area = areas + i;
+                buffer = ExtractAddress( area, self->offset );
+                setChannel( bp, i, buffer, 1 );
+            }
+        else
         {
-            area = areas + i;
-            buffer = ExtractAddress( area, self->offset );
-            setChannel( bp, i, buffer, 1 );
+            int bufsize = snd_pcm_format_size( self->nativeFormat, self->framesPerBuffer + 1 );
+            buffer = self->nonMmapBuffer;
+            for( i = 0; i < self->numUserChannels; ++i )
+            {
+                setChannel( bp, i, buffer, 1 );
+                buffer += bufsize;
+            }
         }
     }
 
-    /* @concern ChannelAdaption Buffer address is recorded so we can do some channel adaption later */
-    self->channelAreas = (snd_pcm_channel_area_t *)areas;
+    if( !self->canMmap && StreamDirection_In == self->streamDir )
+    {
+        /* Read sound */
+        int res;
+        if( self->hostInterleaved )
+            res = snd_pcm_readi( self->pcm, self->nonMmapBuffer, *numFrames );
+        else
+        {
+            void *bufs[self->numHostChannels];
+            int bufsize = snd_pcm_format_size( self->nativeFormat, self->framesPerBuffer + 1 );
+            unsigned char *buffer = self->nonMmapBuffer;
+            int i;
+            for( i = 0; i < self->numHostChannels; ++i )
+            {
+                bufs[i] = buffer;
+                buffer += bufsize;
+            }
+            res = snd_pcm_readn( self->pcm, bufs, *numFrames );
+        }
+        if( res == -EPIPE || res == -ESTRPIPE )
+        {
+            *xrun = 1;
+            *numFrames = 0;
+            free( self->nonMmapBuffer );
+            self->nonMmapBuffer = NULL;
+        }
+    }
 
 end:
 error:
diff -ur portaudio/src/os/unix/pa_unix_hostapis.c portaudio-pulseaudio/src/os/unix/pa_unix_hostapis.c
--- portaudio/src/os/unix/pa_unix_hostapis.c	2006-08-26 10:27:53.000000000 +0200
+++ portaudio-pulseaudio/src/os/unix/pa_unix_hostapis.c	2008-11-09 04:51:04.000000000 +0100
@@ -75,4 +75,8 @@
         0   /* NULL terminated array */
     };
 
+#if defined(PA_USE_OSS) && defined(PA_USE_ALSA)
+int paDefaultHostApiIndex = 1;
+#else
 int paDefaultHostApiIndex = 0;
+#endif


Index: portaudio.spec
===================================================================
RCS file: /cvs/extras/rpms/portaudio/F-9/portaudio.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- portaudio.spec	3 Feb 2008 10:47:47 -0000	1.14
+++ portaudio.spec	25 Jan 2009 13:59:13 -0000	1.15
@@ -3,11 +3,12 @@
 Summary: Free, cross platform, open-source, audio I/O library
 Name: portaudio
 Version: 19
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.portaudio.com/
 Source: http://www.portaudio.com/archives/pa_stable_%{real_version}.tar.gz
+Patch0: portaudio-non-mmap-alsa.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: doxygen
 BuildRequires: alsa-lib-devel
@@ -37,6 +38,7 @@
 
 %prep
 %setup -q -n %{name}
+%patch0 -p1
 
 
 %build
@@ -76,6 +78,10 @@
 
 
 %changelog
+* Sun Dec  7 2008 Hans de Goede <hdegoede at redhat.com> 19-6
+- Add a patch by Kevin Kofler to make non mmap alsa (and thus pulseaudio) work
+  (bz 445644)
+
 * Sun Feb  3 2008 Matthias Saou <http://freshrpms.net/> 19-5
 - Update to "stable" v19_20071207.
 - Rebuild against latest jack in rawhide (#430672).



From mnowak at fedoraproject.org  Sun Jan 25 14:03:23 2009
From: mnowak at fedoraproject.org (Michal Nowak)
Date: Sun, 25 Jan 2009 14:03:23 +0000 (UTC)
Subject: rpms/khmeros-fonts/devel import.log, 1.2, 1.3 khmeros-fonts.spec,
	1.2, 1.3
Message-ID: <20090125140323.6925470133@cvs1.fedora.phx.redhat.com>

Author: mnowak

Update of /cvs/pkgs/rpms/khmeros-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29635/devel

Modified Files:
	import.log khmeros-fonts.spec 
Log Message:
provide Obsoletes and dependency on -common pkg



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/khmeros-fonts/devel/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	24 Jan 2009 12:37:12 -0000	1.2
+++ import.log	25 Jan 2009 14:02:52 -0000	1.3
@@ -1,2 +1,3 @@
 khmeros-fonts-5_0-3_fc9:HEAD:khmeros-fonts-5.0-3.fc9.src.rpm:1215764336
 khmeros-fonts-5_0-4_fc10:HEAD:khmeros-fonts-5.0-4.fc10.src.rpm:1232800449
+khmeros-fonts-5_0-4_fc10:HEAD:khmeros-fonts-5.0-4.fc10.src.rpm:1232892078


Index: khmeros-fonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/khmeros-fonts/devel/khmeros-fonts.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- khmeros-fonts.spec	24 Jan 2009 12:37:12 -0000	1.2
+++ khmeros-fonts.spec	25 Jan 2009 14:02:52 -0000	1.3
@@ -30,23 +30,22 @@
 %common_desc
 
 
-#%package common
-#Summary:        Common files of %{name}
-#Group:          User Interface/X
-#Requires:       fontpackages-filesystem
-#
-#%description common
-#%common_desc
-#
-#This package consists of files used by other %{name} packages.
+%package common
+Summary:        Common files of %{name}
+Group:          User Interface/X
+Requires:       fontpackages-filesystem
+
+%description common
+%common_desc
+
+This package consists of files used by other %{name} packages.
 
 
 %package -n %{fontname}-base-fonts
 Summary:        Base KhmerOS font
 Group:          User Interface/X
-#Requires:       %{name}-common = %{version}-%{release}
-#Obsoletes:      khmeros-fonts-base <= %{version}-3
-#Provides:       khmeros-fonts-base-%{version}-%{release}
+Requires:       %{name}-common = %{version}-%{release}
+Obsoletes:      khmeros-fonts-base < 5.0-4
 
 %description -n %{fontname}-base-fonts
 %common_desc
@@ -58,7 +57,8 @@
 %package -n %{fontname}-battambang-fonts
 Summary:        Battambang font
 Group:          User Interface/X
-#Requires:       %{name}-common = %{version}-%{release}
+Requires:       %{name}-common = %{version}-%{release}
+Obsoletes:      khmeros-fonts-battambang < 5.0-4
 
 %description -n %{fontname}-battambang-fonts
 %common_desc
@@ -70,7 +70,8 @@
 %package -n %{fontname}-bokor-fonts
 Summary:        Bokor font
 Group:          User Interface/X
-#Requires:       %{name}-common = %{version}-%{release}
+Requires:       %{name}-common = %{version}-%{release}
+Obsoletes:      khmeros-fonts-bokor < 5.0-4
 
 %description -n %{fontname}-bokor-fonts
 %common_desc
@@ -82,7 +83,8 @@
 %package -n %{fontname}-handwritten-fonts
 Summary:        Freehand and fasthand fonts
 Group:          User Interface/X
-#Requires:       %{name}-common = %{version}-%{release}
+Requires:       %{name}-common = %{version}-%{release}
+Obsoletes:      khmeros-fonts-handwritten < 5.0-4
 
 %description -n %{fontname}-handwritten-fonts
 %common_desc
@@ -94,7 +96,8 @@
 %package -n %{fontname}-metal-chrieng-fonts
 Summary:        Metal Chrieng font
 Group:          User Interface/X
-#Requires:       %{name}-common = %{version}-%{release}
+Requires:       %{name}-common = %{version}-%{release}
+Obsoletes:      khmeros-fonts-metalchrieng < 5.0-4
 
 %description -n %{fontname}-metal-chrieng-fonts
 %common_desc
@@ -106,7 +109,8 @@
 %package -n %{fontname}-muol-fonts
 Summary:        Muol fonts - normal, light and Pali
 Group:          User Interface/X
-#Requires:       %{name}-common = %{version}-%{release}
+Requires:       %{name}-common = %{version}-%{release}
+Obsoletes:      khmeros-fonts-muol < 5.0-4
 
 %description -n %{fontname}-muol-fonts
 %common_desc
@@ -118,7 +122,8 @@
 %package -n %{fontname}-siemreap-fonts
 Summary:        Siemreap font
 Group:          User Interface/X
-#Requires:       %{name}-common = %{version}-%{release}
+Requires:       %{name}-common = %{version}-%{release}
+Obsoletes:      khmeros-fonts-siemreap < 5.0-4
 
 %description -n %{fontname}-siemreap-fonts
 %common_desc
@@ -163,9 +168,9 @@
 rm -rf %{buildroot}
 
 
-#%files common
-#%defattr(0644,root,root,0755)
-#%dir %{_fontdir}
+%files common
+%defattr(0644,root,root,0755)
+%dir %{_fontdir}
 
 
 %changelog



From nim at fedoraproject.org  Sun Jan 25 14:11:43 2009
From: nim at fedoraproject.org (Nicolas Mailhot)
Date: Sun, 25 Jan 2009 14:11:43 +0000 (UTC)
Subject: rpms/andika-fonts/devel dead.package, NONE,
	1.1 andika-fonts-fontconfig.conf, 1.2, NONE andika-fonts.spec,
	1.2, NONE
Message-ID: <20090125141144.0598A70133@cvs1.fedora.phx.redhat.com>

Author: nim

Update of /cvs/extras/rpms/andika-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31954

Added Files:
	dead.package 
Removed Files:
	andika-fonts-fontconfig.conf andika-fonts.spec 
Log Message:
renamed to sil-andika-fonts


--- NEW FILE dead.package ---
renamed to sil-andika-fonts


--- andika-fonts-fontconfig.conf DELETED ---


--- andika-fonts.spec DELETED ---



From nim at fedoraproject.org  Sun Jan 25 14:13:13 2009
From: nim at fedoraproject.org (Nicolas Mailhot)
Date: Sun, 25 Jan 2009 14:13:13 +0000 (UTC)
Subject: rpms/charis-fonts/devel dead.package, NONE,
	1.1 charis-fonts-fontconfig.conf, 1.4, NONE charis-fonts.spec,
	1.11, NONE
Message-ID: <20090125141313.0284670133@cvs1.fedora.phx.redhat.com>

Author: nim

Update of /cvs/extras/rpms/charis-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32325

Added Files:
	dead.package 
Removed Files:
	charis-fonts-fontconfig.conf charis-fonts.spec 
Log Message:
renamed to sil-charis-fonts


--- NEW FILE dead.package ---
renamed to sil-charis-fonts


--- charis-fonts-fontconfig.conf DELETED ---


--- charis-fonts.spec DELETED ---



From mnowak at fedoraproject.org  Sun Jan 25 14:15:24 2009
From: mnowak at fedoraproject.org (Michal Nowak)
Date: Sun, 25 Jan 2009 14:15:24 +0000 (UTC)
Subject: rpms/khmeros-fonts/devel import.log, 1.3, 1.4 khmeros-fonts.spec,
	1.3, 1.4
Message-ID: <20090125141524.348A270133@cvs1.fedora.phx.redhat.com>

Author: mnowak

Update of /cvs/pkgs/rpms/khmeros-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32502/devel

Modified Files:
	import.log khmeros-fonts.spec 
Log Message:
provide Obsoletes and require -common pkg



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/khmeros-fonts/devel/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- import.log	25 Jan 2009 14:02:52 -0000	1.3
+++ import.log	25 Jan 2009 14:14:53 -0000	1.4
@@ -1,3 +1,4 @@
 khmeros-fonts-5_0-3_fc9:HEAD:khmeros-fonts-5.0-3.fc9.src.rpm:1215764336
 khmeros-fonts-5_0-4_fc10:HEAD:khmeros-fonts-5.0-4.fc10.src.rpm:1232800449
 khmeros-fonts-5_0-4_fc10:HEAD:khmeros-fonts-5.0-4.fc10.src.rpm:1232892078
+khmeros-fonts-5_0-5_fc10:HEAD:khmeros-fonts-5.0-5.fc10.src.rpm:1232892707


Index: khmeros-fonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/khmeros-fonts/devel/khmeros-fonts.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- khmeros-fonts.spec	25 Jan 2009 14:02:52 -0000	1.3
+++ khmeros-fonts.spec	25 Jan 2009 14:14:53 -0000	1.4
@@ -13,7 +13,7 @@
 
 Name:           %{fontname}-fonts
 Version:        5.0
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Khmer font set created by Danh Hong of the Cambodian Open Institute
 
 Group:          User Interface/X
@@ -174,6 +174,9 @@
 
 
 %changelog
+* Sun Jan 25 2009 Michal Nowak <mnowak at redhat.com> - 5.0-5
+- provide Obsoletes and dependency on -common pkg
+
 * Fri Jan 23 2009 Michal Nowak <mnowak at redhat.com> - 5.0-4
 - changes to comply with F11 font rules
 



From rathann at fedoraproject.org  Sun Jan 25 14:19:51 2009
From: rathann at fedoraproject.org (Dominik Mierzejewski)
Date: Sun, 25 Jan 2009 14:19:51 +0000 (UTC)
Subject: rpms/pax-utils/devel pax-utils.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090125141951.A6B7B70133@cvs1.fedora.phx.redhat.com>

Author: rathann

Update of /cvs/pkgs/rpms/pax-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1013

Modified Files:
	.cvsignore sources 
Added Files:
	pax-utils.spec 
Log Message:
initial rawhide import


--- NEW FILE pax-utils.spec ---
Summary: PaX aware and related utilities for ELF binaries
Name: pax-utils
Version: 0.1.17
Release: 1%{?dist}
URL: http://hardened.gentoo.org/pax-utils.xml
Group: Development/Tools
Source: http://gentoo.mirror.pw.edu.pl/distfiles/%{name}-%{version}.tar.bz2
License: GPLv2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%description
pax-utils is a small set of various PaX aware and related utilities for
ELF binaries. It was written for ELF Q/A on Gentoo systems but can be
used on any distro.

%prep
%setup -q

%build
%{__make} CFLAGS="%{optflags}" %{?_smp_mflags}

%install
rm -rf %{buildroot}
make CP="cp -p" STRIP="echo" S=1 DESTDIR=%{buildroot} install

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc BUGS COPYING README TODO
%{_bindir}/dumpelf
%{_bindir}/lddtree.sh
%{_bindir}/pspax
%{_bindir}/scanelf
%{_mandir}/man1/dumpelf.1*
%{_mandir}/man1/pspax.1*
%{_mandir}/man1/scanelf.1*

%changelog
* Thu Oct 30 2008 Dominik Mierzejewski <rpm at greysector.net> 0.1.17-1
- initial build


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pax-utils/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	25 Jan 2009 01:58:14 -0000	1.1
+++ .cvsignore	25 Jan 2009 14:19:21 -0000	1.2
@@ -0,0 +1 @@
+pax-utils-0.1.17.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pax-utils/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	25 Jan 2009 01:58:14 -0000	1.1
+++ sources	25 Jan 2009 14:19:21 -0000	1.2
@@ -0,0 +1 @@
+5553b42fae6d26e8f7543406efd05f24  pax-utils-0.1.17.tar.bz2



From robert at fedoraproject.org  Sun Jan 25 14:28:02 2009
From: robert at fedoraproject.org (Robert Scheck)
Date: Sun, 25 Jan 2009 14:28:02 +0000 (UTC)
Subject: rpms/php-magickwand/devel php-magickwand.spec,1.9,1.10
Message-ID: <20090125142802.ABFA370133@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/extras/rpms/php-magickwand/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2530

Modified Files:
	php-magickwand.spec 
Log Message:
Corrected typo



Index: php-magickwand.spec
===================================================================
RCS file: /cvs/extras/rpms/php-magickwand/devel/php-magickwand.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- php-magickwand.spec	17 May 2008 21:37:47 -0000	1.9
+++ php-magickwand.spec	25 Jan 2009 14:27:32 -0000	1.10
@@ -10,7 +10,7 @@
 Source0:	http://image_magick.veidrodis.com/image_magick/php/MagickWandForPHP-%{version}.tar.gz
 Source1:	magickwand.ini
 URL:		http://www.magickwand.org/
-BuildRequires:	php-devel >= 4.3.0, ImageMagick-devel >= 6.0.4.0, autoconf, automake, libtool
+BuildRequires:	php-devel >= 4.3.0, ImageMagick-devel >= 6.4.0, autoconf, automake, libtool
 Requires:	php-api = %((echo %{default_apiver}; php -i 2>/dev/null | sed -n 's/^PHP API => //p') | tail -1)
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -51,7 +51,7 @@
 
 %changelog
 * Sat May 17 2008 Robert Scheck <robert at fedoraproject.org> 1.0.7-2
-- Rebuild against ImageMagick 6.0.4.10
+- Rebuild against ImageMagick 6.4.0.10
 
 * Sun Apr 27 2008 Robert Scheck <robert at fedoraproject.org> 1.0.7-1
 - Upgrade to 1.0.7



From rathann at fedoraproject.org  Sun Jan 25 14:30:28 2009
From: rathann at fedoraproject.org (Dominik Mierzejewski)
Date: Sun, 25 Jan 2009 14:30:28 +0000 (UTC)
Subject: rpms/pax-utils/F-10 pax-utils.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090125143028.71A1F70133@cvs1.fedora.phx.redhat.com>

Author: rathann

Update of /cvs/pkgs/rpms/pax-utils/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3003

Modified Files:
	.cvsignore sources 
Added Files:
	pax-utils.spec 
Log Message:
initial F-10 import


--- NEW FILE pax-utils.spec ---
Summary: PaX aware and related utilities for ELF binaries
Name: pax-utils
Version: 0.1.17
Release: 1%{?dist}
URL: http://hardened.gentoo.org/pax-utils.xml
Group: Development/Tools
Source: http://gentoo.mirror.pw.edu.pl/distfiles/%{name}-%{version}.tar.bz2
License: GPLv2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%description
pax-utils is a small set of various PaX aware and related utilities for
ELF binaries. It was written for ELF Q/A on Gentoo systems but can be
used on any distro.

%prep
%setup -q

%build
%{__make} CFLAGS="%{optflags}" %{?_smp_mflags}

%install
rm -rf %{buildroot}
make CP="cp -p" STRIP="echo" S=1 DESTDIR=%{buildroot} install

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc BUGS COPYING README TODO
%{_bindir}/dumpelf
%{_bindir}/lddtree.sh
%{_bindir}/pspax
%{_bindir}/scanelf
%{_mandir}/man1/dumpelf.1*
%{_mandir}/man1/pspax.1*
%{_mandir}/man1/scanelf.1*

%changelog
* Thu Oct 30 2008 Dominik Mierzejewski <rpm at greysector.net> 0.1.17-1
- initial build


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pax-utils/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	25 Jan 2009 01:58:14 -0000	1.1
+++ .cvsignore	25 Jan 2009 14:29:57 -0000	1.2
@@ -0,0 +1 @@
+pax-utils-0.1.17.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pax-utils/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	25 Jan 2009 01:58:14 -0000	1.1
+++ sources	25 Jan 2009 14:29:57 -0000	1.2
@@ -0,0 +1 @@
+5553b42fae6d26e8f7543406efd05f24  pax-utils-0.1.17.tar.bz2



From rathann at fedoraproject.org  Sun Jan 25 14:41:53 2009
From: rathann at fedoraproject.org (Dominik Mierzejewski)
Date: Sun, 25 Jan 2009 14:41:53 +0000 (UTC)
Subject: rpms/pax-utils/F-9 pax-utils.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090125144153.64C0470133@cvs1.fedora.phx.redhat.com>

Author: rathann

Update of /cvs/pkgs/rpms/pax-utils/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5524

Modified Files:
	.cvsignore sources 
Added Files:
	pax-utils.spec 
Log Message:
initial F-9 import


--- NEW FILE pax-utils.spec ---
Summary: PaX aware and related utilities for ELF binaries
Name: pax-utils
Version: 0.1.17
Release: 1%{?dist}
URL: http://hardened.gentoo.org/pax-utils.xml
Group: Development/Tools
Source: http://gentoo.mirror.pw.edu.pl/distfiles/%{name}-%{version}.tar.bz2
License: GPLv2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%description
pax-utils is a small set of various PaX aware and related utilities for
ELF binaries. It was written for ELF Q/A on Gentoo systems but can be
used on any distro.

%prep
%setup -q

%build
%{__make} CFLAGS="%{optflags}" %{?_smp_mflags}

%install
rm -rf %{buildroot}
make CP="cp -p" STRIP="echo" S=1 DESTDIR=%{buildroot} install

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc BUGS COPYING README TODO
%{_bindir}/dumpelf
%{_bindir}/lddtree.sh
%{_bindir}/pspax
%{_bindir}/scanelf
%{_mandir}/man1/dumpelf.1*
%{_mandir}/man1/pspax.1*
%{_mandir}/man1/scanelf.1*

%changelog
* Thu Oct 30 2008 Dominik Mierzejewski <rpm at greysector.net> 0.1.17-1
- initial build


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pax-utils/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	25 Jan 2009 01:58:14 -0000	1.1
+++ .cvsignore	25 Jan 2009 14:41:22 -0000	1.2
@@ -0,0 +1 @@
+pax-utils-0.1.17.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pax-utils/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	25 Jan 2009 01:58:14 -0000	1.1
+++ sources	25 Jan 2009 14:41:22 -0000	1.2
@@ -0,0 +1 @@
+5553b42fae6d26e8f7543406efd05f24  pax-utils-0.1.17.tar.bz2



From rathann at fedoraproject.org  Sun Jan 25 14:45:45 2009
From: rathann at fedoraproject.org (Dominik Mierzejewski)
Date: Sun, 25 Jan 2009 14:45:45 +0000 (UTC)
Subject: rpms/pax-utils/EL-5 pax-utils.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090125144545.2C06570133@cvs1.fedora.phx.redhat.com>

Author: rathann

Update of /cvs/pkgs/rpms/pax-utils/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6194

Modified Files:
	.cvsignore sources 
Added Files:
	pax-utils.spec 
Log Message:
initial EL-5 import


--- NEW FILE pax-utils.spec ---
Summary: PaX aware and related utilities for ELF binaries
Name: pax-utils
Version: 0.1.17
Release: 1%{?dist}
URL: http://hardened.gentoo.org/pax-utils.xml
Group: Development/Tools
Source: http://gentoo.mirror.pw.edu.pl/distfiles/%{name}-%{version}.tar.bz2
License: GPLv2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%description
pax-utils is a small set of various PaX aware and related utilities for
ELF binaries. It was written for ELF Q/A on Gentoo systems but can be
used on any distro.

%prep
%setup -q

%build
%{__make} CFLAGS="%{optflags}" %{?_smp_mflags}

%install
rm -rf %{buildroot}
make CP="cp -p" STRIP="echo" S=1 DESTDIR=%{buildroot} install

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc BUGS COPYING README TODO
%{_bindir}/dumpelf
%{_bindir}/lddtree.sh
%{_bindir}/pspax
%{_bindir}/scanelf
%{_mandir}/man1/dumpelf.1*
%{_mandir}/man1/pspax.1*
%{_mandir}/man1/scanelf.1*

%changelog
* Thu Oct 30 2008 Dominik Mierzejewski <rpm at greysector.net> 0.1.17-1
- initial build


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pax-utils/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	25 Jan 2009 01:58:14 -0000	1.1
+++ .cvsignore	25 Jan 2009 14:45:14 -0000	1.2
@@ -0,0 +1 @@
+pax-utils-0.1.17.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pax-utils/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	25 Jan 2009 01:58:14 -0000	1.1
+++ sources	25 Jan 2009 14:45:14 -0000	1.2
@@ -0,0 +1 @@
+5553b42fae6d26e8f7543406efd05f24  pax-utils-0.1.17.tar.bz2



From robert at fedoraproject.org  Sun Jan 25 14:49:02 2009
From: robert at fedoraproject.org (Robert Scheck)
Date: Sun, 25 Jan 2009 14:49:02 +0000 (UTC)
Subject: rpms/tcpick/devel tcpick.spec,1.7,1.8
Message-ID: <20090125144902.56DC570133@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/extras/rpms/tcpick/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6833

Modified Files:
	tcpick.spec 
Log Message:
Minor spec file updates regarding Packaging Guidelines



Index: tcpick.spec
===================================================================
RCS file: /cvs/extras/rpms/tcpick/devel/tcpick.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- tcpick.spec	10 Feb 2008 01:16:00 -0000	1.7
+++ tcpick.spec	25 Jan 2009 14:48:31 -0000	1.8
@@ -1,11 +1,11 @@
+Summary:	A tcp stream sniffer, tracker and capturer
 Name: 		tcpick
 Version: 	0.2.1
 Release: 	14%{?dist}
-Summary:  	A tcp stream sniffer, tracker and capturer
 License: 	GPLv2+
 Group: 		Applications/Internet
 URL: 		http://tcpick.sourceforge.net/
-Source:		http://dl.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.gz
+Source:		http://downloads.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.gz
 Patch0:		tcpick-0.2.1-CVE-2006-0048.patch
 Patch1:		tcpick-0.2.1-ppc.patch
 Patch2:		tcpick-0.2.1-pointers.patch
@@ -36,12 +36,16 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make DESTDIR=$RPM_BUILD_ROOT install
+make DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p' install
 
 # Move the Italian man page to its correct place
 mkdir -p $RPM_BUILD_ROOT%{_mandir}/it/man8
 mv -f $RPM_BUILD_ROOT%{_mandir}/man8/tcpick_italian.8 $RPM_BUILD_ROOT%{_mandir}/it/man8/tcpick.8
 
+# Convert non-utf8 authors file into utf8
+iconv -f iso-8859-1 -t utf-8 -o AUTHORS.utf8 AUTHORS
+touch -c -r AUTHORS AUTHORS.utf8; mv -f AUTHORS.utf8 AUTHORS
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 



From sarantis at fedoraproject.org  Sun Jan 25 14:53:54 2009
From: sarantis at fedoraproject.org (Sarantis Paskalis)
Date: Sun, 25 Jan 2009 14:53:54 +0000 (UTC)
Subject: rpms/mgopen-fonts/devel mgopen-fonts.spec, 1.13, 1.14 sources, 1.4,
	1.5
Message-ID: <20090125145354.54DA970133@cvs1.fedora.phx.redhat.com>

Author: sarantis

Update of /cvs/extras/rpms/mgopen-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7788

Modified Files:
	mgopen-fonts.spec sources 
Log Message:
Fix fontconfig file for moderna.



Index: mgopen-fonts.spec
===================================================================
RCS file: /cvs/extras/rpms/mgopen-fonts/devel/mgopen-fonts.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- mgopen-fonts.spec	21 Jan 2009 11:13:08 -0000	1.13
+++ mgopen-fonts.spec	25 Jan 2009 14:53:23 -0000	1.14
@@ -19,7 +19,7 @@
 
 Name:      %{fontname}-fonts
 Version:   0.%{upstream_date}
-Release:   13%{?dist}
+Release:   14%{?dist}
 Summary:   Truetype greek fonts
 Group:     User Interface/X
 License:   MgOpen
@@ -157,6 +157,10 @@
 %files compat
 
 %changelog
+* Sun Jan 25 2009 Sarantis Paskalis <paskalis at di.uoa.gr> - 0.20050515-14
+- Fix fontconfig file for moderna ,i.e. 
+  https://bugzilla.redhat.com/show_bug.cgi?id=477425#c7
+
 * Wed Jan 21 2009 Sarantis Paskalis <paskalis at di.uoa.gr> - 0.20050515-13
 - Drop provides mgopen-fonts for the -compat subpackage.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mgopen-fonts/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	20 Jan 2009 10:55:22 -0000	1.4
+++ sources	25 Jan 2009 14:53:23 -0000	1.5
@@ -1,3 +1,3 @@
 9ad4bba3d173e92734320286bfff4c8e  MgOpen-20050515.tar.gz
 eb667a1458a92bc4d4e9a1f5924f6e61  MgOpen-20050515-doc.tar.gz
-99aed78f4c58e3ca4b7502f0adff7075  mgopen-fontconfig.tar.gz
+878dfd8fadd0aa63ade2f915fa942bcd  mgopen-fontconfig.tar.gz



From xavierb at fedoraproject.org  Sun Jan 25 14:57:33 2009
From: xavierb at fedoraproject.org (Xavier Bachelot)
Date: Sun, 25 Jan 2009 14:57:33 +0000 (UTC)
Subject: rpms/rt3/EL-5 rt3.spec,1.20,1.21 sources,1.7,1.8
Message-ID: <20090125145733.EC4D970133@cvs1.fedora.phx.redhat.com>

Author: xavierb

Update of /cvs/pkgs/rpms/rt3/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8545

Modified Files:
	rt3.spec sources 
Log Message:
Update to 3.6.7 (BZ 481163 - CVE-2008-3502).


Index: rt3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rt3/EL-5/rt3.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- rt3.spec	26 Mar 2008 18:28:57 -0000	1.20
+++ rt3.spec	25 Jan 2009 14:57:03 -0000	1.21
@@ -12,8 +12,8 @@
 %define RT3_LOCALSTATEDIR	%{_localstatedir}/lib/rt3
 
 Name:		rt3
-Version:	3.6.5
-Release:	3%{?dist}
+Version:	3.6.7
+Release:	1%{?dist}
 Summary:	Request tracker 3
 
 Group:		Applications/Internet
@@ -44,6 +44,7 @@
 # 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)
@@ -269,10 +270,16 @@
 %ghost %{_prefix}/local/etc/rt3
 
 %files mailgate
+%defattr(-,root,root,-)
 %{_sbindir}/rt-mailgate
 %{_mandir}/man1/rt-mailgate*
 
 %changelog
+* Sat 10 Jan 2009 Xavier Bachelot <xavier at bachelot.org> - 3.6.7-1
+- Update to 3.6.7 (BZ 481163 - CVE-2008-3502).
+- R: perl(CSS::Squish).
+- Add %%defattr() to rt3-mailgate.
+
 * Wed Mar 26 2008 Ralf Cors??pius <rc040203 at freenet.de> - 3.6.5-3
 - Install rt3.logrotate to /etc/logrotate.d.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rt3/EL-5/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	20 Mar 2008 20:44:17 -0000	1.7
+++ sources	25 Jan 2009 14:57:03 -0000	1.8
@@ -1 +1 @@
-e935ef70ad72e6b9cdaea781b676a4cd  rt-3.6.5.tar.gz
+46c0b29cd14010ee6a3f181743aeb6ef  rt-3.6.7.tar.gz



From xavierb at fedoraproject.org  Sun Jan 25 15:00:43 2009
From: xavierb at fedoraproject.org (Xavier Bachelot)
Date: Sun, 25 Jan 2009 15:00:43 +0000 (UTC)
Subject: rpms/rt3/EL-5 rt3.spec,1.21,1.22
Message-ID: <20090125150043.A2A0070133@cvs1.fedora.phx.redhat.com>

Author: xavierb

Update of /cvs/pkgs/rpms/rt3/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9121

Modified Files:
	rt3.spec 
Log Message:
fix date format in changelog


Index: rt3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rt3/EL-5/rt3.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- rt3.spec	25 Jan 2009 14:57:03 -0000	1.21
+++ rt3.spec	25 Jan 2009 15:00:13 -0000	1.22
@@ -275,7 +275,7 @@
 %{_mandir}/man1/rt-mailgate*
 
 %changelog
-* Sat 10 Jan 2009 Xavier Bachelot <xavier at bachelot.org> - 3.6.7-1
+* Sat Jan 10 2009 Xavier Bachelot <xavier at bachelot.org> - 3.6.7-1
 - Update to 3.6.7 (BZ 481163 - CVE-2008-3502).
 - R: perl(CSS::Squish).
 - Add %%defattr() to rt3-mailgate.



From pkgdb at fedoraproject.org  Sun Jan 25 15:03:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sun, 25 Jan 2009 15:03:21 +0000
Subject: [pkgdb] xmms-skins: tlee2 has requested watchcommits
Message-ID: <20090125150321.7CB21208480@bastion.fedora.phx.redhat.com>

tlee2 has requested the watchcommits acl on xmms-skins (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/xmms-skins



From sarantis at fedoraproject.org  Sun Jan 25 15:03:21 2009
From: sarantis at fedoraproject.org (Sarantis Paskalis)
Date: Sun, 25 Jan 2009 15:03:21 +0000 (UTC)
Subject: rpms/ctan-kerkis-fonts/devel ctan-kerkis-fonts.spec, NONE,
	1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090125150321.9336A70133@cvs1.fedora.phx.redhat.com>

Author: sarantis

Update of /cvs/extras/rpms/ctan-kerkis-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9780/devel

Modified Files:
	.cvsignore sources 
Added Files:
	ctan-kerkis-fonts.spec import.log 
Log Message:
Renamed from tetex-font-kerkis



--- NEW FILE ctan-kerkis-fonts.spec ---
%define foundryname  ctan
%define fontpkg      kerkis
%define fontname     %{foundryname}-%{fontpkg}
%define fontconf     64-%{fontname}
%define ctan_date    20051007
%define texfonts     %{_texmf_main}/fonts
%define texfontpath  %{fontpkg}

# Common description
%define common_desc Kerkis type 1 fonts for LaTeX.  These fonts are particularly useful \
for typesetting Greek. The Greek repertoire includes full support for \
polytonic Greek, Greek numerals, and double forms of several letters \
that occur in variant forms.


Name:           ctan-kerkis-fonts
Version:        2.0
Release:        18%{?dist}
Summary:        Kerkis Type 1 fonts
Group:          Applications/Publishing
License:        LPPL
URL:            http://www.ctan.org/tex-archive/help/Catalogue/entries/kerkis.html
Source0:        kerkis-%{ctan_date}.zip
# upstream source - unversioned zip file
# ftp://tug.ctan.org/pub/tex-archive/fonts/greek/kerkis.zip
Source1:        %{fontname}-fontconfig.tar.gz
# Tarball of fontconfig files for each font
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  fontpackages-devel texlive-texmf
%description
%{common_desc}


%package common
Summary:  Kerkis Type 1 fonts, common files (documentation???)
Group:    User Interface/X
Requires: fontpackages-filesystem
%description common
%common_desc
This package consists of files used by other kerkis-fonts packages.


%define seriffonts %{fontname}-serif-fonts
%package -n %{seriffonts}
Summary:  Kerkis serif Type1 fonts
Group:    User Interface/X
%description -n %{seriffonts}
%{common_desc}
This package contains the Kerkis font family. It is based on the URW Bookman
font and extends it with Greek characters and math support.

%_font_pkg -n serif -f %{fontconf}-serif.conf Kerkis.* Kerkis-*Bold.* Kerkis-*Italic.* Kerkis-*SmallCaps*


%define sansfonts %{fontname}-sans-fonts
%package -n %{sansfonts}
Summary:  KerkisSans Type1 fonts
Group:    User Interface/X
%description -n %{sansfonts}
%{common_desc}
This package contains the KerkisSans font family, based on a free version
of the AvantGardURW Bookman font.

%_font_pkg -n sans -f %{fontconf}-sans.conf KerkisSans* 


%define calligraphicfonts %{fontname}-calligraphic-fonts
%package -n %{calligraphicfonts}
Summary:  Kerkis Calligraphic Type1 fonts
Group:    User Interface/X
%description -n %{calligraphicfonts}
%{common_desc}
This package contains the Kerkis-Calligraphic font family, a calligraphic font 
family of Kerkis, based on URW Bookman.

%_font_pkg -n calligraphic -f %{fontconf}-calligraphic.conf Kerkis-Calligraphic* ktsy.*


%define texfontpkg tex-kerkis
%package -n %{texfontpkg}
Summary:  Kerkis Type1 fonts, TeX support files
Group:    User Interface/X
Requires: %{seriffonts} = %{version}-%{release}, %{sansfonts} = %{version}-%{release}
Requires: tex(latex)
Provides: tetex-font-kerkis = %{version}-%{release}
Obsoletes: tetex-font-kerkis < 2.0-17

%description -n %{texfontpkg}
%{common_desc}
TeX support files.


%prep
%setup -q -a1 -n %{fontpkg}


%build


%install
rm -rf %{buildroot}

mkdir -p %{buildroot}%{_texmf_main}/tex/latex/%{fontpkg}
mkdir -p %{buildroot}%{texfonts}/{afm,tfm,type1,vf}/%{texfontpath}
mkdir -p %{buildroot}%{texfonts}/{map,enc}/dvips/%{fontpkg}

install -p -m 644 tex/{*.sty,*.fd} %{buildroot}%{_texmf_main}/tex/latex/%{fontpkg}/
install -p -m 644 tfm/*.tfm %{buildroot}%{texfonts}/tfm/%{texfontpath}/
install -p -m 644 vf/*.vf %{buildroot}%{texfonts}/vf/%{texfontpath}/
install -p -m 644 dvips/*.map %{buildroot}%{texfonts}/map/dvips/%{fontpkg}/
install -p -m 644 dvips/*.enc %{buildroot}%{texfonts}/enc/dvips/%{fontpkg}/

#install .pfb and .afm files in %{_fontdir} as per the fedora font guidelines
install -m 0755 -d %{buildroot}%{_fontdir}
install -m 0644 -p type1/* %{buildroot}%{_fontdir}
install -m 0644 -p afm/* %{buildroot}%{_fontdir}

pushd %{buildroot}%{_fontdir}
for pfb_file in *.pfb ;  do
    ln -s %{_fontdir}/$pfb_file %{buildroot}%{texfonts}/type1/%{texfontpath}/$pfb_file
done
for afm_file in *.afm ;  do
    ln -s %{_fontdir}/$afm_file %{buildroot}%{texfonts}/afm/%{texfontpath}/$afm_file
done
popd


# fontconfig stuff (see spectemplate-fonts-multi.spec)
install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} \
                   %{buildroot}%{_fontconfig_confdir}

install -m 0644 -p fontconfig/%{fontname}-serif.conf \
         %{buildroot}%{_fontconfig_templatedir}/%{fontconf}-serif.conf
install -m 0644 -p fontconfig/%{fontname}-sans.conf \
         %{buildroot}%{_fontconfig_templatedir}/%{fontconf}-sans.conf
install -m 0644 -p fontconfig/%{fontname}-calligraphic.conf \
         %{buildroot}%{_fontconfig_templatedir}/%{fontconf}-calligraphic.conf


for fconf in %{fontconf}-serif.conf \
             %{fontconf}-sans.conf \
             %{fontconf}-calligraphic.conf ; do
  ln -s %{_fontconfig_templatedir}/$fconf \
        %{buildroot}%{_fontconfig_confdir}/$fconf
done



%clean
rm -rf %{buildroot}


%post -n %{texfontpkg}
texhash
conffile="$(texconfig-sys conf | grep updmap.cfg)"
if [ "$1" = "1" ]; then
    updmap-sys --quiet --nohash --cnffile ${conffile} --enable Map %{fontpkg}.map
fi


%postun -n %{texfontpkg}
conffile="$(texconfig-sys conf | grep updmap.cfg)"
if [ "$1" = "0" ]; then
    updmap-sys --quiet --nohash --cnffile ${conffile} --disable %{fontpkg}.map
fi
texhash

%files common
%defattr(0644,root,root,0755)
%doc License.txt README.html


%files -n %{texfontpkg}
%defattr(-,root,root,-)
%{_texmf_main}/tex/latex/%{fontpkg}
%{texfonts}/afm/%{texfontpath}
%{texfonts}/tfm/%{texfontpath}
%{texfonts}/type1/%{texfontpath}
%{texfonts}/vf/%{texfontpath}
%{texfonts}/map/dvips/%{fontpkg}
%{texfonts}/enc/dvips/%{fontpkg}



%changelog
* Tue Jan 20 2009 Sarantis Paskalis <paskalis at di.uoa.gr> - 2.0-18
- Address comments in https://bugzilla.redhat.com/show_bug.cgi?id=480591#c2
  (thanks Nicolas Mailhot)
    - Add a buildrequires for texlive-texmf
    - Remove Requires: fontpackages-filesystem from main and add to common
      subpackage.
    - Fix Obsoletes to cover latest update for F-10
    - Add -calligraphic-fonts subpackage
    - Add substitution rules for fonts from which Kerkis and KerkisSans
      derived
    - Remove tabs to silence rpmlint

* Fri Jan 16 2009 Sarantis Paskalis <paskalis at di.uoa.gr> - 2.0-17
- Rename the package to ctan-kerkis-fonts
- Name the subpackages according to
  http://fedoraproject.org/wiki/PackagingDrafts/Font_package_naming_(2009-01-13)
- Update to fontpackages-* >= 1.15

* Mon Jan 12 2009 Sarantis Paskalis <paskalis at di.uoa.gr> - 2.0-16
- Restructure spec file according to
  https://fedoraproject.org/wiki/Fonts_SIG_Fedora_11_packaging_changes
  (bug #477462)
- Split package to cm-lgc-fonts (.pfb and .afm) and tetex-font-cm-lgc
  (TeX stuff)
- Include .afm files (forgotten in the previous versions)


* Fri Jan  4 2008 Sarantis Paskalis <paskalis at di.uoa.gr> - 2.0-15
- Drop requirement for -fonts.
- Point source URL to ctan.
- Change license to LPPL.

* Tue Aug 29 2006 Sarantis Paskalis <paskalis at di.uoa.gr> - 2.0-13
- Bump release for FC6 rebuild.

* Mon Feb 20 2006 Sarantis Paskalis <paskalis at di.uoa.gr> - 2.0-11
- Rebuild for FC5.

* Sun Nov  6 2005 Sarantis Paskalis <paskalis at di.uoa.gr> - 2.0-10
- Use run-time define updmap.cfg (Michal Jaegermann, bug #172492).

* Wed Nov  2 2005 Sarantis Paskalis <paskalis at di.uoa.gr> - 2.0-9
- Use absolute path commands in post and postun.

* Wed Nov  2 2005 Sarantis Paskalis <paskalis at di.uoa.gr> - 2.0-8
- Remove explicit outputdir for updmap-sys (bug #172268)
- Readd texhash in post and postun.

* Fri Oct  7 2005 Sarantis Paskalis <paskalis at di.uoa.gr> - 2.0-7
- Require tetex-fonts.
- Drop kerkis-test.tex.
- Use ctan zip soure.
- Other cleanups.

* Tue Jun 21 2005 Sarantis Paskalis <paskalis at di.uoa.gr> - 2.0-6
- Run updmap-sys only when installing/removing, not updating.

* Fri Jun 10 2005 Sarantis Paskalis <paskalis at di.uoa.gr> - 2.0-5
- Fix location for font encoding files
- Use updmap-sys instead of updmap

* Wed Jun  1 2005 Sarantis Paskalis <paskalis at di.uoa.gr> - 2.0-4
- update location for map files according to TeXLive 2004.

* Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
- rebuilt

* Wed May  5 2004 Marius L. J??hndal <mariuslj at ifi.uio.no> - 0:2.0-0.fdr.2
- Added kerkis-test.tex test document (bug 998).
- Moved preun script to postun (bug 998).
- Split Requires(post,postun) into separate Require statements (bug 998).

* Sun Nov 16 2003 Marius L. Johndal <mariuslj at ifi.uio.no> 0:2.0-0.fdr.1
- Initial RPM release.


--- NEW FILE import.log ---
ctan-kerkis-fonts-2_0-18_fc11:HEAD:ctan-kerkis-fonts-2.0-18.fc11.src.rpm:1232895709


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ctan-kerkis-fonts/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	23 Jan 2009 23:11:37 -0000	1.1
+++ .cvsignore	25 Jan 2009 15:02:50 -0000	1.2
@@ -0,0 +1,2 @@
+ctan-kerkis-fontconfig.tar.gz
+kerkis-20051007.zip


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ctan-kerkis-fonts/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	23 Jan 2009 23:11:37 -0000	1.1
+++ sources	25 Jan 2009 15:02:51 -0000	1.2
@@ -0,0 +1,2 @@
+04215bdcd9fbee9121797b197975e791  ctan-kerkis-fontconfig.tar.gz
+87479b0f42f906ed60f58d553405a127  kerkis-20051007.zip



From sarantis at fedoraproject.org  Sun Jan 25 15:15:10 2009
From: sarantis at fedoraproject.org (Sarantis Paskalis)
Date: Sun, 25 Jan 2009 15:15:10 +0000 (UTC)
Subject: comps comps-f11.xml.in,1.78,1.79
Message-ID: <20090125151510.4657370133@cvs1.fedora.phx.redhat.com>

Author: sarantis

Update of /cvs/extras/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12382

Modified Files:
	comps-f11.xml.in 
Log Message:
Add ctan-kerkis-*-fonts to the fonts group and greek support.



Index: comps-f11.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-f11.xml.in,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- comps-f11.xml.in	25 Jan 2009 13:34:58 -0000	1.78
+++ comps-f11.xml.in	25 Jan 2009 15:14:39 -0000	1.79
@@ -1505,6 +1505,9 @@
       <packagereq type="optional">ctan-cm-lgc-roman-fonts</packagereq>
       <packagereq type="optional">ctan-cm-lgc-sans-fonts</packagereq>
       <packagereq type="optional">ctan-cm-lgc-typewriter-fonts</packagereq>
+      <packagereq type="optional">ctan-kerkis-calligraphic-fonts</packagereq>
+      <packagereq type="optional">ctan-kerkis-sans-fonts</packagereq>
+      <packagereq type="optional">ctan-kerkis-serif-fonts</packagereq>
       <packagereq type="optional">darkgarden-fonts</packagereq>
       <packagereq type="optional">dejavu-lgc-sans-fonts</packagereq>
       <packagereq type="optional">dejavu-lgc-sans-mono-fonts</packagereq>
@@ -1550,9 +1553,9 @@
       <packagereq type="optional">khmeros-fonts-metalchrieng</packagereq>
       <packagereq type="optional">khmeros-fonts-muol</packagereq>
       <packagereq type="optional">khmeros-fonts-siemreap</packagereq>
-      <packagereq type="optional">lilypond-aybabtu-fonts</packagereq> 
-      <packagereq type="optional">lilypond-century-schoolbook-l-fonts</packagereq> 
-      <packagereq type="optional">lilypond-emmentaler-fonts</packagereq> 
+      <packagereq type="optional">lilypond-aybabtu-fonts</packagereq>
+      <packagereq type="optional">lilypond-century-schoolbook-l-fonts</packagereq>
+      <packagereq type="optional">lilypond-emmentaler-fonts</packagereq>
       <packagereq type="optional">linux-libertine-fonts</packagereq>
       <packagereq type="optional">lohit-fonts-kashmiri</packagereq>
       <packagereq type="optional">lohit-fonts-konkani</packagereq>
@@ -2398,6 +2401,9 @@
       <packagereq type="optional">ctan-cm-lgc-roman-fonts</packagereq>
       <packagereq type="optional">ctan-cm-lgc-sans-fonts</packagereq>
       <packagereq type="optional">ctan-cm-lgc-typewriter-fonts</packagereq>
+      <packagereq type="optional">ctan-kerkis-calligraphic-fonts</packagereq>
+      <packagereq type="optional">ctan-kerkis-sans-fonts</packagereq>
+      <packagereq type="optional">ctan-kerkis-serif-fonts</packagereq>
       <packagereq type="optional">gfs-ambrosia-fonts</packagereq>
       <packagereq type="optional">gfs-artemisia-fonts</packagereq>
       <packagereq type="optional">gfs-baskerville-fonts</packagereq>
@@ -4595,11 +4601,11 @@
       <packagereq type="optional">viaideinfo</packagereq>
       <packagereq type="optional">vlock</packagereq>
       <packagereq type="optional">vnstat</packagereq>
-      <packagereq type="optional">w_scan</packagereq>
       <packagereq type="optional">wifiroamd</packagereq>
       <packagereq type="optional">wine</packagereq>
       <packagereq type="optional">wireshark-gnome</packagereq>
       <packagereq type="optional">wlassistant</packagereq>
+      <packagereq type="optional">w_scan</packagereq>
       <packagereq type="optional">x3270-x11</packagereq>
       <packagereq type="optional">xsel</packagereq>
       <packagereq type="optional">xsupplicant</packagereq>



From musuruan at fedoraproject.org  Sun Jan 25 15:30:41 2009
From: musuruan at fedoraproject.org (Andrea Musuruane)
Date: Sun, 25 Jan 2009 15:30:41 +0000 (UTC)
Subject: rpms/hatari/devel .cvsignore, 1.6, 1.7 hatari.spec, 1.10,
	1.11 sources, 1.6, 1.7 hatari-1.0.0-hmsa_rpmopt.patch, 1.1, NONE
Message-ID: <20090125153041.6B78F70133@cvs1.fedora.phx.redhat.com>

Author: musuruan

Update of /cvs/pkgs/rpms/hatari/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15296

Modified Files:
	.cvsignore hatari.spec sources 
Removed Files:
	hatari-1.0.0-hmsa_rpmopt.patch 
Log Message:
* Sat Jan 24 2009 Andrea Musuruane <musuruan at gmail.com> 1.2.0-1
- updated to upstream 1.2.0
- dropped no longer needed hmsa tool patch
- updated upstream URL
- updated Source0 URL



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hatari/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	30 Nov 2008 11:31:02 -0000	1.6
+++ .cvsignore	25 Jan 2009 15:30:10 -0000	1.7
@@ -1 +1 @@
-hatari-1.1.0.tar.bz2
+hatari-1.2.0.tar.bz2


Index: hatari.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hatari/devel/hatari.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- hatari.spec	30 Nov 2008 11:31:02 -0000	1.10
+++ hatari.spec	25 Jan 2009 15:30:10 -0000	1.11
@@ -1,16 +1,15 @@
 Summary: An Atari ST emulator suitable for playing games
 Name: hatari
-Version: 1.1.0
+Version: 1.2.0
 Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/Emulators
-URL: http://hatari.sourceforge.net/
+URL: http://hatari.berlios.de/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Source0: http://dl.sf.net/%{name}/%{name}-%{version}.tar.bz2
+Source0: http://prdownload.berlios.de/%{name}/%{name}-%{version}.tar.bz2
 Source1: hatari.png
 Source2: hatari.desktop
 Source3: hatari-README.tos
-Patch0: hatari-1.0.0-hmsa_rpmopt.patch
 BuildRequires: SDL-devel >= 1.2.0
 BuildRequires: zlib-devel
 BuildRequires: desktop-file-utils
@@ -35,7 +34,6 @@
 
 %prep
 %setup -q
-%patch0 -p1
 
 cp -p %{SOURCE3} README.tos
 
@@ -99,6 +97,7 @@
 %files
 %defattr(-,root,root)
 %{_bindir}/hatari
+%{_bindir}/zip2st
 %{_bindir}/hmsa
 %{_datadir}/hatari
 %{_mandir}/man1/hatari.1*
@@ -111,6 +110,12 @@
 
 
 %changelog
+* Sat Jan 24 2009 Andrea Musuruane <musuruan at gmail.com> 1.2.0-1
+- updated to upstream 1.2.0
+- dropped no longer needed hmsa tool patch
+- updated upstream URL
+- updated Source0 URL
+
 * Sat Nov 29 2008 Andrea Musuruane <musuruan at gmail.com> 1.1.0-1
 - updated to upstream 1.1.0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hatari/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	30 Nov 2008 11:31:03 -0000	1.6
+++ sources	25 Jan 2009 15:30:10 -0000	1.7
@@ -1 +1 @@
-e782830f4d82dccb017159b302fd8b62  hatari-1.1.0.tar.bz2
+4aecd42784fae8c5e8c9a9a341146fbb  hatari-1.2.0.tar.bz2


--- hatari-1.0.0-hmsa_rpmopt.patch DELETED ---



From robert at fedoraproject.org  Sun Jan 25 15:31:23 2009
From: robert at fedoraproject.org (Robert Scheck)
Date: Sun, 25 Jan 2009 15:31:23 +0000 (UTC)
Subject: rpms/eggdrop/devel eggdrop.spec,1.20,1.21
Message-ID: <20090125153123.E34C470133@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/extras/rpms/eggdrop/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15462

Modified Files:
	eggdrop.spec 
Log Message:
Minor spec file updates regarding Packaging Guidelines



Index: eggdrop.spec
===================================================================
RCS file: /cvs/extras/rpms/eggdrop/devel/eggdrop.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- eggdrop.spec	30 Aug 2008 12:38:01 -0000	1.20
+++ eggdrop.spec	25 Jan 2009 15:30:53 -0000	1.21
@@ -34,7 +34,7 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make DEST=$RPM_BUILD_ROOT%{_datadir}/%{name} install
+make DEST=$RPM_BUILD_ROOT%{_datadir}/%{name} INSTALL='install -p' install
 
 rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name}/{README,doc,eggdrop*,filesys,logs,modules}
 install -D -m 755 %{name} $RPM_BUILD_ROOT%{_bindir}/%{name}
@@ -46,14 +46,16 @@
 
 # Documentation cleanups
 find doc -name "Makefile*" -exec rm {} \;
-mv doc/html .
-rm -rf doc/man1
+mv doc/html . ; rm -rf doc/man1
 chmod -x doc/WEIRD-MESSAGES eggdrop.conf src/mod/transfer.mod/*.c
 
 # Convert everything to UTF-8
 iconv -f iso-8859-1 -t utf-8 -o doc/KNOWN-PROBLEMS.utf8 doc/KNOWN-PROBLEMS
+touch -c -r doc/KNOWN-PROBLEMS doc/KNOWN-PROBLEMS.utf8
 mv -f doc/KNOWN-PROBLEMS.utf8 doc/KNOWN-PROBLEMS
+
 iconv -f iso-8859-1 -t utf-8 -o doc/UPDATES1.6.utf8 doc/UPDATES1.6
+touch -c -r doc/UPDATES1.6 doc/UPDATES1.6.utf8
 mv -f doc/UPDATES1.6.utf8 doc/UPDATES1.6
 
 # Fix paths of example eggdrop.conf



From pwouters at fedoraproject.org  Sun Jan 25 15:31:21 2009
From: pwouters at fedoraproject.org (Paul Wouters)
Date: Sun, 25 Jan 2009 15:31:21 +0000 (UTC)
Subject: rpms/dnssec-conf/devel dnssec-conf.spec,1.1,1.2
Message-ID: <20090125153121.C84F770133@cvs1.fedora.phx.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/dnssec-conf/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15433

Modified Files:
	dnssec-conf.spec 
Log Message:
Added dist tag



Index: dnssec-conf.spec
===================================================================
RCS file: /cvs/extras/rpms/dnssec-conf/devel/dnssec-conf.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- dnssec-conf.spec	23 Jan 2009 23:42:01 -0000	1.1
+++ dnssec-conf.spec	25 Jan 2009 15:30:51 -0000	1.2
@@ -1,7 +1,7 @@
 Summary: DNSSEC and DLV configuration tool (and TLD repository until the root is signed)
 Name: dnssec-conf
 Version: 1.13
-Release: 2
+Release: 2%{?dist}
 License: GPLv2+
 Url: http://www.xelerance.com/software/dnssec-conf/
 Source: http://www.xelerance.com/software/%{name}/%{name}-%{version}.tar.gz



From pwouters at fedoraproject.org  Sun Jan 25 15:33:20 2009
From: pwouters at fedoraproject.org (Paul Wouters)
Date: Sun, 25 Jan 2009 15:33:20 +0000 (UTC)
Subject: rpms/autotrust/F-10 autotrust.conf, NONE, 1.1 autotrust.cron, NONE, 
	1.1 autotrust.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090125153320.3B0D570133@cvs1.fedora.phx.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/autotrust/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16024

Modified Files:
	.cvsignore sources 
Added Files:
	autotrust.conf autotrust.cron autotrust.spec 
Log Message:
initial build of autotrust for F-10



--- NEW FILE autotrust.conf ---
# program configuration
config:
	# directory to go to for performing autotrust.
	# by default, autotrust will store files in the current directory.
	working-dir:		"/var/lib/autotrust"

	# where to find the root-hints. 
	# by default, autotrust uses builtin root hints from libunbound.
	# root-hints:		"/etc/named.root"

	# where to log messages. 
	# by default, logs will be outputted to stderr.
	log-file:		"/var/log/autotrust.log"

	# where to store state information for trust anchors. 
	# by default, state information is stored in a file autotrust.state in 
	# the working directory.
	state-file:		"/var/lib/autotrust/autotrust.state" 

	# where to find the the trust anchors (that can be used for Unbound).
	# trust-anchor-file:	"trust-anchor.file"

	# where to find the the trust anchors (that can be used for 
	# BIND9 and Unbound). you can also put your BIND configuration file 
	# here, though it is recommended to solely put the trusted-keys clause 
	# in this file and include it in your actual BIND configuration file.
	trusted-keys-file:	"/etc/pki/dnssec-keys/production.conf"

	# what resolv.conf file to use. 
	# by default, autotrust doesn't use configured nameservers, but queries 
	# for the answers himself. By providing your resolver configuration, the
	# program will run much faster.
	# resolv-conf:		"/etc/resolv.conf"

	# by default, autotrust makes use of both ipv4 and ipv6. 
	# setting one of these options to "yes" eliminates the use of the other 
	# protocol version.
	# ipv4-only:		"no"
	# ipv6-only:		"no"

	# specify the time when a trust anchor may be added.
	# by default, add holddown time is 30 days.
	# add-holddown:		2592000 # 30 days

	# specify the time when a trust anchor may be removed.
	# by default, del holddown time is 30 days.
	# del-holddown:		2592000 # 30 days

	# how many times must a pending trust anchor be seen, before adding it 
	# to the valid trust anchor set. by default, 2 times.
	# STRONGLY RECOMMENDED VALUE: 2 or higher
	# pending-count:	2

	# keep trust anchors with the START state in the state information file.
	# by default, trust anchors in the state START are not stored.
	# keep-start:		"no"

	# keep trust anchors with the REMOVED state in the state information.
	# by default, trust anchors in the state REMOVED are not stored.
	# keep-removed:		"no"

	# the pidfile that stores the process id of your resolver.
	# by default, autotrust does not know about your resolver and will not 
	# signal resolvers.
	# resolver-pidfile:		"/var/run/named/named.pid"
	resolver-pidfile: "/var/run/unbound/unbound.pid /var/run/named/named.pid"

	# if you use Unbound, you can specify the Undbound configuration 
	# here, so that autotrust uses the same configuration. This option was 
	# built in for debugging purposes (to configure stub zones), and is 
	# considered experimental.
	unbound-conf:		"/etc/unbound/unbound.conf"

	# specify the time when a missing trust anchor may not be used 
	# as valid trust anchor anymore. If keep-missing is 0, missing keys 
	# are never removed (unless revoked), which is the default.
	# STRONGLY RECOMMENDED VALUE: 0, or 1year or higher
	# keep-missing:		31536000 # 1 year

	# log if keys gone missing, regardless of the used verbosity level.
	# on by default.
	# alert-missing:	"yes"

	# if you have a superior trust point configured, the subordinate trust 
	# anchors will be removed after 180 days after the superior trust point 
	# was introduced. by default, this option is disabled, you may enable it 
	# by setting 'superior-trust' to "yes".
	# THIS OPTION IS NOT IMPLEMENTED YET
	# superior-trust:	"yes"

	# set the level of verbosity. default it it set to 1. the higher this 
	# number, the more log messages you will get. if you want no 
	# output at all, set verbosity to 0 (you will log only error and 
	# warning messages).
	# verbosity:		1


--- NEW FILE autotrust.cron ---
#!/bin/sh

# Check for updated and revoked  DNSKEY trust anchors daily
/usr/sbin/autotrust


--- NEW FILE autotrust.spec ---
%define prever rc1
%define VERSION %{version}%{prever}

Summary: DNSKEY trust anchor update utility that uses RFC-5011
Name: autotrust
Version: 0.2.1
Release: 0.2.%{prever}%{?dist}
License: BSD
Url: http://www.nlnetlabs.nl/%{name}/
Source: http://www.nlnetlabs.nl/downloads/%{name}-%{VERSION}.tar.gz
Source1: autotrust.conf
Source2: autotrust.cron
Group: System Environment/Libraries
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: ldns-devel >= 1.3.0, unbound-devel >= 1.0.0
Requires: anacron

%description
autotrust takes care of keeping your DNSSEC trust anchors up to date. It
is RFC5011 compliant, except for the query intervals and the retry timers.
autotrust is meant to run from commandline or in a cron job. If we want to
follow the values recommended by RFC5011, autotrust should run as daemon. 

%prep
%setup -q -n autotrust-%{VERSION}

%build
%configure --disable-rpath 
make %{?_smp_mflags}

%install
rm -rf %{buildroot}

make DESTDIR=%{buildroot} INSTALL="%{__install} -p" install 
mkdir -p %{buildroot}%{_sysconfdir}/%{name}/
mkdir -p %{buildroot}%{_localstatedir}/lib/%{name}
mkdir -p %{buildroot}%{_sysconfdir}/cron.daily/
install -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/%{name}/
install -m 755 %{SOURCE2} %{buildroot}%{_sysconfdir}/cron.daily/autotrust

%clean
rm -rf %{buildroot}

%files 
%defattr(-,root,root)
%{_sbindir}/autotrust
%doc doc/*
%{_mandir}/*/*
%dir %{_sysconfdir}/%{name}
%dir %{_localstatedir}/lib/%{name}
%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/%{name}/autotrust.conf
%attr(0755,root,root) %{_sysconfdir}/cron.daily/autotrust

%changelog
* Wed Jan 21 2009 Paul Wouters <paul at xelerance.com> - 0.2.1-0.2.rc1
- Drop sysconfig argument for configure
- Merged changelog entry to avoid rpm warning 

* Wed Jan 21 2009 Paul Wouters <paul at xelerance.com> - 0.2.1-0.1.rc1
- Drop regeneration of configure - does not work on rawhide
- Fix version/release tag
- Removed merged in patch. updated to upstream which fixes the reported autoconf issues.

* Tue Dec  2 2008 Paul Wouters <paul at xelerance.com> - 0.2.0-3
- Use upstream svn patch for multiple resolvers and defaults
- Don't override unused libdir
- Cleanup and run autoreconf
- Added missing dependancies (anacron, automake, libtool)
- Fix permission on cron job.

* Fri Nov 28 2008 Paul Wouters <paul at xelerance.com> - 0.2.0-2
- Fix typo in resolver-pidfile: option in autotrust.conf

* Thu Nov 27 2008 Paul Wouters <paul at xelerance.com> - 0.2.0-1
- Updated to newest version
- Fix default file locations
- Allow resolver-pid: to take multiple filenames, seperated by a space

* Fri Nov 22 2008 Paul Wouters <paul at xelerance.com> - 0.1.0-1
- Initial version


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/autotrust/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	23 Jan 2009 23:14:07 -0000	1.1
+++ .cvsignore	25 Jan 2009 15:32:49 -0000	1.2
@@ -0,0 +1 @@
+autotrust-0.2.1rc1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/autotrust/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	23 Jan 2009 23:14:07 -0000	1.1
+++ sources	25 Jan 2009 15:32:49 -0000	1.2
@@ -0,0 +1 @@
+663254fbd41176e3b13952bffd49a21c  autotrust-0.2.1rc1.tar.gz



From robert at fedoraproject.org  Sun Jan 25 15:46:48 2009
From: robert at fedoraproject.org (Robert Scheck)
Date: Sun, 25 Jan 2009 15:46:48 +0000 (UTC)
Subject: rpms/perl-Net-LibIDN/devel .cvsignore, 1.4, 1.5 perl-Net-LibIDN.spec,
	1.7, 1.8 sources, 1.4, 1.5
Message-ID: <20090125154648.D9E0C70133@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/extras/rpms/perl-Net-LibIDN/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18886

Modified Files:
	.cvsignore perl-Net-LibIDN.spec sources 
Log Message:
Upgrade to 0.11



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Net-LibIDN/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	10 Feb 2008 13:37:29 -0000	1.4
+++ .cvsignore	25 Jan 2009 15:46:16 -0000	1.5
@@ -1 +1 @@
-Net-LibIDN-0.10.tar.gz
+Net-LibIDN-0.11.tar.gz


Index: perl-Net-LibIDN.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Net-LibIDN/devel/perl-Net-LibIDN.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- perl-Net-LibIDN.spec	7 Mar 2008 02:11:47 -0000	1.7
+++ perl-Net-LibIDN.spec	25 Jan 2009 15:46:16 -0000	1.8
@@ -2,8 +2,8 @@
 
 Summary: 	Perl bindings for GNU LibIDN
 Name: 		perl-Net-LibIDN
-Version: 	0.10
-Release: 	2%{?dist}
+Version: 	0.11
+Release: 	1%{?dist}
 License: 	GPL+ or Artistic
 Group: 		Development/Libraries
 URL: 		http://search.cpan.org/dist/%{pkgname}/
@@ -26,8 +26,8 @@
 make %{?_smp_mflags}
 
 # Change man page encoding into UTF-8
-iconv -f latin1 -t utf-8 -o "blib/man3/Net::LibIDN.3pm.new" "blib/man3/Net::LibIDN.3pm"
-mv -f "blib/man3/Net::LibIDN.3pm.new" "blib/man3/Net::LibIDN.3pm"
+iconv -f latin1 -t utf-8 -o "blib/man3/Net::LibIDN.3pm.utf8" "blib/man3/Net::LibIDN.3pm"
+mv -f "blib/man3/Net::LibIDN.3pm.utf8" "blib/man3/Net::LibIDN.3pm"
 
 # Package is lacking GPL file
 perldoc -t perlgpl > COPYING
@@ -53,8 +53,11 @@
 %{perl_vendorarch}/auto/Net
 
 %changelog
-* Thu Mar 06 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.10-2
-Rebuild for new perl
+* Sun Jan 25 2009 Robert Scheck <robert at fedoraproject.org> 0.11-1
+- Upgrade to 0.11
+
+* Thu Mar 06 2008 Tom "spot" Callaway <tcallawa at redhat.com> 0.10-2
+- Rebuild for new perl
 
 * Sun Feb 10 2008 Robert Scheck <robert at fedoraproject.org> 0.10-1
 - Upgrade to 0.10


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Net-LibIDN/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	10 Feb 2008 13:37:29 -0000	1.4
+++ sources	25 Jan 2009 15:46:16 -0000	1.5
@@ -1 +1 @@
-9e7f0545f4c70cb9a03f58841c82c508  Net-LibIDN-0.10.tar.gz
+9386ec7da9d0de1509e05eaef3a1943e  Net-LibIDN-0.11.tar.gz



From robert at fedoraproject.org  Sun Jan 25 15:59:13 2009
From: robert at fedoraproject.org (Robert Scheck)
Date: Sun, 25 Jan 2009 15:59:13 +0000 (UTC)
Subject: rpms/perl-Net-LibIDN/EL-4 .cvsignore, 1.4, 1.5 perl-Net-LibIDN.spec,
	1.6, 1.7 sources, 1.4, 1.5
Message-ID: <20090125155914.3118B70142@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/extras/rpms/perl-Net-LibIDN/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21141/EL-4

Modified Files:
	.cvsignore perl-Net-LibIDN.spec sources 
Log Message:
Upgrade to 0.11



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Net-LibIDN/EL-4/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	10 Feb 2008 13:36:59 -0000	1.4
+++ .cvsignore	25 Jan 2009 15:58:42 -0000	1.5
@@ -1 +1 @@
-Net-LibIDN-0.10.tar.gz
+Net-LibIDN-0.11.tar.gz


Index: perl-Net-LibIDN.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Net-LibIDN/EL-4/perl-Net-LibIDN.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- perl-Net-LibIDN.spec	10 Feb 2008 13:36:59 -0000	1.6
+++ perl-Net-LibIDN.spec	25 Jan 2009 15:58:42 -0000	1.7
@@ -2,7 +2,7 @@
 
 Summary: 	Perl bindings for GNU LibIDN
 Name: 		perl-Net-LibIDN
-Version: 	0.10
+Version: 	0.11
 Release: 	1%{?dist}
 License: 	GPL+ or Artistic
 Group: 		Development/Libraries
@@ -26,8 +26,8 @@
 make %{?_smp_mflags}
 
 # Change man page encoding into UTF-8
-iconv -f latin1 -t utf-8 -o "blib/man3/Net::LibIDN.3pm.new" "blib/man3/Net::LibIDN.3pm"
-mv -f "blib/man3/Net::LibIDN.3pm.new" "blib/man3/Net::LibIDN.3pm"
+iconv -f latin1 -t utf-8 -o "blib/man3/Net::LibIDN.3pm.utf8" "blib/man3/Net::LibIDN.3pm"
+mv -f "blib/man3/Net::LibIDN.3pm.utf8" "blib/man3/Net::LibIDN.3pm"
 
 # Package is lacking GPL file
 perldoc -t perlgpl > COPYING
@@ -53,6 +53,12 @@
 %{perl_vendorarch}/auto/Net
 
 %changelog
+* Sun Jan 25 2009 Robert Scheck <robert at fedoraproject.org> 0.11-1
+- Upgrade to 0.11
+
+* Thu Mar 06 2008 Tom "spot" Callaway <tcallawa at redhat.com> 0.10-2
+- Rebuild for new perl
+
 * Sun Feb 10 2008 Robert Scheck <robert at fedoraproject.org> 0.10-1
 - Upgrade to 0.10
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Net-LibIDN/EL-4/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	10 Feb 2008 13:36:59 -0000	1.4
+++ sources	25 Jan 2009 15:58:42 -0000	1.5
@@ -1 +1 @@
-9e7f0545f4c70cb9a03f58841c82c508  Net-LibIDN-0.10.tar.gz
+9386ec7da9d0de1509e05eaef3a1943e  Net-LibIDN-0.11.tar.gz



From robert at fedoraproject.org  Sun Jan 25 15:59:13 2009
From: robert at fedoraproject.org (Robert Scheck)
Date: Sun, 25 Jan 2009 15:59:13 +0000 (UTC)
Subject: rpms/perl-Net-LibIDN/EL-5 .cvsignore, 1.4, 1.5 perl-Net-LibIDN.spec,
	1.6, 1.7 sources, 1.4, 1.5
Message-ID: <20090125155914.314BD70143@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/extras/rpms/perl-Net-LibIDN/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21141/EL-5

Modified Files:
	.cvsignore perl-Net-LibIDN.spec sources 
Log Message:
Upgrade to 0.11



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Net-LibIDN/EL-5/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	10 Feb 2008 13:37:10 -0000	1.4
+++ .cvsignore	25 Jan 2009 15:58:42 -0000	1.5
@@ -1 +1 @@
-Net-LibIDN-0.10.tar.gz
+Net-LibIDN-0.11.tar.gz


Index: perl-Net-LibIDN.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Net-LibIDN/EL-5/perl-Net-LibIDN.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- perl-Net-LibIDN.spec	10 Feb 2008 13:37:10 -0000	1.6
+++ perl-Net-LibIDN.spec	25 Jan 2009 15:58:42 -0000	1.7
@@ -2,7 +2,7 @@
 
 Summary: 	Perl bindings for GNU LibIDN
 Name: 		perl-Net-LibIDN
-Version: 	0.10
+Version: 	0.11
 Release: 	1%{?dist}
 License: 	GPL+ or Artistic
 Group: 		Development/Libraries
@@ -26,8 +26,8 @@
 make %{?_smp_mflags}
 
 # Change man page encoding into UTF-8
-iconv -f latin1 -t utf-8 -o "blib/man3/Net::LibIDN.3pm.new" "blib/man3/Net::LibIDN.3pm"
-mv -f "blib/man3/Net::LibIDN.3pm.new" "blib/man3/Net::LibIDN.3pm"
+iconv -f latin1 -t utf-8 -o "blib/man3/Net::LibIDN.3pm.utf8" "blib/man3/Net::LibIDN.3pm"
+mv -f "blib/man3/Net::LibIDN.3pm.utf8" "blib/man3/Net::LibIDN.3pm"
 
 # Package is lacking GPL file
 perldoc -t perlgpl > COPYING
@@ -53,6 +53,12 @@
 %{perl_vendorarch}/auto/Net
 
 %changelog
+* Sun Jan 25 2009 Robert Scheck <robert at fedoraproject.org> 0.11-1
+- Upgrade to 0.11
+
+* Thu Mar 06 2008 Tom "spot" Callaway <tcallawa at redhat.com> 0.10-2
+- Rebuild for new perl
+
 * Sun Feb 10 2008 Robert Scheck <robert at fedoraproject.org> 0.10-1
 - Upgrade to 0.10
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Net-LibIDN/EL-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	10 Feb 2008 13:37:10 -0000	1.4
+++ sources	25 Jan 2009 15:58:42 -0000	1.5
@@ -1 +1 @@
-9e7f0545f4c70cb9a03f58841c82c508  Net-LibIDN-0.10.tar.gz
+9386ec7da9d0de1509e05eaef3a1943e  Net-LibIDN-0.11.tar.gz



From robert at fedoraproject.org  Sun Jan 25 15:59:14 2009
From: robert at fedoraproject.org (Robert Scheck)
Date: Sun, 25 Jan 2009 15:59:14 +0000 (UTC)
Subject: rpms/perl-Net-LibIDN/F-9 .cvsignore, 1.4, 1.5 perl-Net-LibIDN.spec, 
	1.7, 1.8 sources, 1.4, 1.5
Message-ID: <20090125155914.34BCB70144@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/extras/rpms/perl-Net-LibIDN/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21141/F-9

Modified Files:
	.cvsignore perl-Net-LibIDN.spec sources 
Log Message:
Upgrade to 0.11



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Net-LibIDN/F-9/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	10 Feb 2008 13:37:29 -0000	1.4
+++ .cvsignore	25 Jan 2009 15:58:43 -0000	1.5
@@ -1 +1 @@
-Net-LibIDN-0.10.tar.gz
+Net-LibIDN-0.11.tar.gz


Index: perl-Net-LibIDN.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Net-LibIDN/F-9/perl-Net-LibIDN.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- perl-Net-LibIDN.spec	7 Mar 2008 02:11:47 -0000	1.7
+++ perl-Net-LibIDN.spec	25 Jan 2009 15:58:43 -0000	1.8
@@ -2,8 +2,8 @@
 
 Summary: 	Perl bindings for GNU LibIDN
 Name: 		perl-Net-LibIDN
-Version: 	0.10
-Release: 	2%{?dist}
+Version: 	0.11
+Release: 	1%{?dist}
 License: 	GPL+ or Artistic
 Group: 		Development/Libraries
 URL: 		http://search.cpan.org/dist/%{pkgname}/
@@ -26,8 +26,8 @@
 make %{?_smp_mflags}
 
 # Change man page encoding into UTF-8
-iconv -f latin1 -t utf-8 -o "blib/man3/Net::LibIDN.3pm.new" "blib/man3/Net::LibIDN.3pm"
-mv -f "blib/man3/Net::LibIDN.3pm.new" "blib/man3/Net::LibIDN.3pm"
+iconv -f latin1 -t utf-8 -o "blib/man3/Net::LibIDN.3pm.utf8" "blib/man3/Net::LibIDN.3pm"
+mv -f "blib/man3/Net::LibIDN.3pm.utf8" "blib/man3/Net::LibIDN.3pm"
 
 # Package is lacking GPL file
 perldoc -t perlgpl > COPYING
@@ -53,8 +53,11 @@
 %{perl_vendorarch}/auto/Net
 
 %changelog
-* Thu Mar 06 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.10-2
-Rebuild for new perl
+* Sun Jan 25 2009 Robert Scheck <robert at fedoraproject.org> 0.11-1
+- Upgrade to 0.11
+
+* Thu Mar 06 2008 Tom "spot" Callaway <tcallawa at redhat.com> 0.10-2
+- Rebuild for new perl
 
 * Sun Feb 10 2008 Robert Scheck <robert at fedoraproject.org> 0.10-1
 - Upgrade to 0.10


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Net-LibIDN/F-9/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	10 Feb 2008 13:37:29 -0000	1.4
+++ sources	25 Jan 2009 15:58:43 -0000	1.5
@@ -1 +1 @@
-9e7f0545f4c70cb9a03f58841c82c508  Net-LibIDN-0.10.tar.gz
+9386ec7da9d0de1509e05eaef3a1943e  Net-LibIDN-0.11.tar.gz



From robert at fedoraproject.org  Sun Jan 25 15:59:13 2009
From: robert at fedoraproject.org (Robert Scheck)
Date: Sun, 25 Jan 2009 15:59:13 +0000 (UTC)
Subject: rpms/perl-Net-LibIDN/F-10 .cvsignore, 1.4, 1.5 perl-Net-LibIDN.spec,
	1.7, 1.8 sources, 1.4, 1.5
Message-ID: <20090125155914.224B670133@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/extras/rpms/perl-Net-LibIDN/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21141/F-10

Modified Files:
	.cvsignore perl-Net-LibIDN.spec sources 
Log Message:
Upgrade to 0.11



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Net-LibIDN/F-10/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	10 Feb 2008 13:37:29 -0000	1.4
+++ .cvsignore	25 Jan 2009 15:58:43 -0000	1.5
@@ -1 +1 @@
-Net-LibIDN-0.10.tar.gz
+Net-LibIDN-0.11.tar.gz


Index: perl-Net-LibIDN.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Net-LibIDN/F-10/perl-Net-LibIDN.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- perl-Net-LibIDN.spec	7 Mar 2008 02:11:47 -0000	1.7
+++ perl-Net-LibIDN.spec	25 Jan 2009 15:58:43 -0000	1.8
@@ -2,8 +2,8 @@
 
 Summary: 	Perl bindings for GNU LibIDN
 Name: 		perl-Net-LibIDN
-Version: 	0.10
-Release: 	2%{?dist}
+Version: 	0.11
+Release: 	1%{?dist}
 License: 	GPL+ or Artistic
 Group: 		Development/Libraries
 URL: 		http://search.cpan.org/dist/%{pkgname}/
@@ -26,8 +26,8 @@
 make %{?_smp_mflags}
 
 # Change man page encoding into UTF-8
-iconv -f latin1 -t utf-8 -o "blib/man3/Net::LibIDN.3pm.new" "blib/man3/Net::LibIDN.3pm"
-mv -f "blib/man3/Net::LibIDN.3pm.new" "blib/man3/Net::LibIDN.3pm"
+iconv -f latin1 -t utf-8 -o "blib/man3/Net::LibIDN.3pm.utf8" "blib/man3/Net::LibIDN.3pm"
+mv -f "blib/man3/Net::LibIDN.3pm.utf8" "blib/man3/Net::LibIDN.3pm"
 
 # Package is lacking GPL file
 perldoc -t perlgpl > COPYING
@@ -53,8 +53,11 @@
 %{perl_vendorarch}/auto/Net
 
 %changelog
-* Thu Mar 06 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.10-2
-Rebuild for new perl
+* Sun Jan 25 2009 Robert Scheck <robert at fedoraproject.org> 0.11-1
+- Upgrade to 0.11
+
+* Thu Mar 06 2008 Tom "spot" Callaway <tcallawa at redhat.com> 0.10-2
+- Rebuild for new perl
 
 * Sun Feb 10 2008 Robert Scheck <robert at fedoraproject.org> 0.10-1
 - Upgrade to 0.10


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Net-LibIDN/F-10/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	10 Feb 2008 13:37:29 -0000	1.4
+++ sources	25 Jan 2009 15:58:43 -0000	1.5
@@ -1 +1 @@
-9e7f0545f4c70cb9a03f58841c82c508  Net-LibIDN-0.10.tar.gz
+9386ec7da9d0de1509e05eaef3a1943e  Net-LibIDN-0.11.tar.gz



From rdieter at fedoraproject.org  Sun Jan 25 16:16:02 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sun, 25 Jan 2009 16:16:02 +0000 (UTC)
Subject: rpms/jasper/devel jpc_dec.c.patch,NONE,1.1 jasper.spec,1.30,1.31
Message-ID: <20090125161602.6593470133@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/jasper/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24933

Modified Files:
	jasper.spec 
Added Files:
	jpc_dec.c.patch 
Log Message:
* Sun Jan 25 2009 Rex Dieter <rdieter at fedoraproject.org> 1.900.1-9
- patch for "jpc_dec_tiledecode: Assertion `dec->numcomps == 3' failed)
  (#481284, #481291)


jpc_dec.c.patch:

--- NEW FILE jpc_dec.c.patch ---
diff -urN jasper-1.900.1/src/libjasper/jpc/jpc_dec.c jasper-1.900.1-fix/src/libjasper/jpc/jpc_dec.c
--- jasper-1.900.1/src/libjasper/jpc/jpc_dec.c	2007-01-19 14:43:07.000000000 -0700
+++ jasper-1.900.1-fix/src/libjasper/jpc/jpc_dec.c	2008-03-06 16:51:12.000000000 -0700
@@ -1069,12 +1069,12 @@
 	/* Apply an inverse intercomponent transform if necessary. */
 	switch (tile->cp->mctid) {
 	case JPC_MCT_RCT:
-		assert(dec->numcomps == 3);
+		assert(dec->numcomps >= 3);
 		jpc_irct(tile->tcomps[0].data, tile->tcomps[1].data,
 		  tile->tcomps[2].data);
 		break;
 	case JPC_MCT_ICT:
-		assert(dec->numcomps == 3);
+		assert(dec->numcomps >= 3);
 		jpc_iict(tile->tcomps[0].data, tile->tcomps[1].data,
 		  tile->tcomps[2].data);
 		break;


Index: jasper.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jasper/devel/jasper.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- jasper.spec	8 Feb 2008 21:24:17 -0000	1.30
+++ jasper.spec	25 Jan 2009 16:15:31 -0000	1.31
@@ -1,14 +1,13 @@
 
 # NOTE: packages that can use jasper:
 # ImageMagick
-# kdelibs
 # netpbm
 
 Summary: Implementation of the JPEG-2000 standard, Part 1
 Name:    jasper
 Group:   System Environment/Libraries
 Version: 1.900.1
-Release: 8%{?dist}
+Release: 9%{?dist}
 
 License: JasPer
 URL:     http://www.ece.uvic.ca/~mdadams/jasper/
@@ -21,6 +20,9 @@
 # CVE-2007-2721 (bug #240397)
 # borrowed from http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=413041;msg=88
 Patch3: patch-libjasper-stepsizes-overflow.diff
+# borrowed from http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=469786 
+Patch4: jpc_dec.c.patch
+
 
 BuildRequires: automake 
 BuildRequires: libjpeg-devel
@@ -63,6 +65,7 @@
 
 %patch1 -p1 -b .GL
 %patch3 -p1 -b .CVE-2007-2721
+%patch4 -p1 -b .jpc_dec_assertion
 
 
 %build
@@ -109,12 +112,12 @@
 %defattr(-,root,root,-)
 %doc doc/*
 %{_includedir}/jasper/
-%{_libdir}/lib*.so
+%{_libdir}/libjasper.so
 
 %files libs
 %defattr(-,root,root,-)
 %doc COPYRIGHT LICENSE NEWS README
-%{_libdir}/lib*.so.*
+%{_libdir}/libjasper.so.1*
 
 %files utils
 %defattr(-,root,root,-)
@@ -124,6 +127,10 @@
 
 
 %changelog
+* Sun Jan 25 2009 Rex Dieter <rdieter at fedoraproject.org> 1.900.1-9
+- patch for "jpc_dec_tiledecode: Assertion `dec->numcomps == 3' failed)
+  (#481284, #481291)
+
 * Fri Feb 08 2008 Rex Dieter <rdieter at fedoraproject.org> 1.900.1-8
 - respin (gcc43)
 



From robert at fedoraproject.org  Sun Jan 25 16:20:25 2009
From: robert at fedoraproject.org (Robert Scheck)
Date: Sun, 25 Jan 2009 16:20:25 +0000 (UTC)
Subject: rpms/mimedefang/devel mimedefang.spec,1.11,1.12
Message-ID: <20090125162025.A956A70133@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/extras/rpms/mimedefang/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25690

Modified Files:
	mimedefang.spec 
Log Message:
Convert Changelog to UTF-8



Index: mimedefang.spec
===================================================================
RCS file: /cvs/extras/rpms/mimedefang/devel/mimedefang.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- mimedefang.spec	4 Sep 2008 20:25:01 -0000	1.11
+++ mimedefang.spec	25 Jan 2009 16:19:55 -0000	1.12
@@ -51,6 +51,11 @@
 install -m 755 gen-ip-validator.pl $RPM_BUILD_ROOT%{_bindir}/gen-ip-validator.pl
 sed -i '1s@^@#!%{_bindir}/perl\n@' $RPM_BUILD_ROOT%{_bindir}/gen-ip-validator.pl
 
+# Convert everything to UTF-8
+iconv -f iso-8859-1 -t utf-8 -o Changelog.utf8 Changelog
+touch -c -r Changelog Changelog.utf8
+mv -f Changelog.utf8 Changelog
+
 %pre
 if [ -x %{_sbindir}/fedora-groupadd -a -x %{_sbindir}/fedora-useradd ]; then
   getent group defang > /dev/null || %{_sbindir}/fedora-groupadd 8 -r defang



From rdieter at fedoraproject.org  Sun Jan 25 16:20:27 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sun, 25 Jan 2009 16:20:27 +0000 (UTC)
Subject: rpms/jasper/F-10 jpc_dec.c.patch,NONE,1.1 jasper.spec,1.30,1.31
Message-ID: <20090125162027.BC2FE70133@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/jasper/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25748

Modified Files:
	jasper.spec 
Added Files:
	jpc_dec.c.patch 
Log Message:
* Sun Jan 25 2009 Rex Dieter <rdieter at fedoraproject.org> 1.900.1-9
- patch for "jpc_dec_tiledecode: Assertion `dec->numcomps == 3' failed)
  (#481284, #481291)


jpc_dec.c.patch:

--- NEW FILE jpc_dec.c.patch ---
diff -urN jasper-1.900.1/src/libjasper/jpc/jpc_dec.c jasper-1.900.1-fix/src/libjasper/jpc/jpc_dec.c
--- jasper-1.900.1/src/libjasper/jpc/jpc_dec.c	2007-01-19 14:43:07.000000000 -0700
+++ jasper-1.900.1-fix/src/libjasper/jpc/jpc_dec.c	2008-03-06 16:51:12.000000000 -0700
@@ -1069,12 +1069,12 @@
 	/* Apply an inverse intercomponent transform if necessary. */
 	switch (tile->cp->mctid) {
 	case JPC_MCT_RCT:
-		assert(dec->numcomps == 3);
+		assert(dec->numcomps >= 3);
 		jpc_irct(tile->tcomps[0].data, tile->tcomps[1].data,
 		  tile->tcomps[2].data);
 		break;
 	case JPC_MCT_ICT:
-		assert(dec->numcomps == 3);
+		assert(dec->numcomps >= 3);
 		jpc_iict(tile->tcomps[0].data, tile->tcomps[1].data,
 		  tile->tcomps[2].data);
 		break;


Index: jasper.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jasper/F-10/jasper.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- jasper.spec	8 Feb 2008 21:24:17 -0000	1.30
+++ jasper.spec	25 Jan 2009 16:19:57 -0000	1.31
@@ -1,14 +1,13 @@
 
 # NOTE: packages that can use jasper:
 # ImageMagick
-# kdelibs
 # netpbm
 
 Summary: Implementation of the JPEG-2000 standard, Part 1
 Name:    jasper
 Group:   System Environment/Libraries
 Version: 1.900.1
-Release: 8%{?dist}
+Release: 9%{?dist}
 
 License: JasPer
 URL:     http://www.ece.uvic.ca/~mdadams/jasper/
@@ -21,6 +20,9 @@
 # CVE-2007-2721 (bug #240397)
 # borrowed from http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=413041;msg=88
 Patch3: patch-libjasper-stepsizes-overflow.diff
+# borrowed from http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=469786 
+Patch4: jpc_dec.c.patch
+
 
 BuildRequires: automake 
 BuildRequires: libjpeg-devel
@@ -63,6 +65,7 @@
 
 %patch1 -p1 -b .GL
 %patch3 -p1 -b .CVE-2007-2721
+%patch4 -p1 -b .jpc_dec_assertion
 
 
 %build
@@ -109,12 +112,12 @@
 %defattr(-,root,root,-)
 %doc doc/*
 %{_includedir}/jasper/
-%{_libdir}/lib*.so
+%{_libdir}/libjasper.so
 
 %files libs
 %defattr(-,root,root,-)
 %doc COPYRIGHT LICENSE NEWS README
-%{_libdir}/lib*.so.*
+%{_libdir}/libjasper.so.1*
 
 %files utils
 %defattr(-,root,root,-)
@@ -124,6 +127,10 @@
 
 
 %changelog
+* Sun Jan 25 2009 Rex Dieter <rdieter at fedoraproject.org> 1.900.1-9
+- patch for "jpc_dec_tiledecode: Assertion `dec->numcomps == 3' failed)
+  (#481284, #481291)
+
 * Fri Feb 08 2008 Rex Dieter <rdieter at fedoraproject.org> 1.900.1-8
 - respin (gcc43)
 



From rdieter at fedoraproject.org  Sun Jan 25 16:21:53 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sun, 25 Jan 2009 16:21:53 +0000 (UTC)
Subject: rpms/jasper/F-9 jpc_dec.c.patch,NONE,1.1 jasper.spec,1.30,1.31
Message-ID: <20090125162153.0169070133@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/jasper/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26120

Modified Files:
	jasper.spec 
Added Files:
	jpc_dec.c.patch 
Log Message:
* Sun Jan 25 2009 Rex Dieter <rdieter at fedoraproject.org> 1.900.1-9
- patch for "jpc_dec_tiledecode: Assertion `dec->numcomps == 3' failed)
  (#481284, #481291)


jpc_dec.c.patch:

--- NEW FILE jpc_dec.c.patch ---
diff -urN jasper-1.900.1/src/libjasper/jpc/jpc_dec.c jasper-1.900.1-fix/src/libjasper/jpc/jpc_dec.c
--- jasper-1.900.1/src/libjasper/jpc/jpc_dec.c	2007-01-19 14:43:07.000000000 -0700
+++ jasper-1.900.1-fix/src/libjasper/jpc/jpc_dec.c	2008-03-06 16:51:12.000000000 -0700
@@ -1069,12 +1069,12 @@
 	/* Apply an inverse intercomponent transform if necessary. */
 	switch (tile->cp->mctid) {
 	case JPC_MCT_RCT:
-		assert(dec->numcomps == 3);
+		assert(dec->numcomps >= 3);
 		jpc_irct(tile->tcomps[0].data, tile->tcomps[1].data,
 		  tile->tcomps[2].data);
 		break;
 	case JPC_MCT_ICT:
-		assert(dec->numcomps == 3);
+		assert(dec->numcomps >= 3);
 		jpc_iict(tile->tcomps[0].data, tile->tcomps[1].data,
 		  tile->tcomps[2].data);
 		break;


Index: jasper.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jasper/F-9/jasper.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- jasper.spec	8 Feb 2008 21:24:17 -0000	1.30
+++ jasper.spec	25 Jan 2009 16:21:22 -0000	1.31
@@ -1,14 +1,13 @@
 
 # NOTE: packages that can use jasper:
 # ImageMagick
-# kdelibs
 # netpbm
 
 Summary: Implementation of the JPEG-2000 standard, Part 1
 Name:    jasper
 Group:   System Environment/Libraries
 Version: 1.900.1
-Release: 8%{?dist}
+Release: 9%{?dist}
 
 License: JasPer
 URL:     http://www.ece.uvic.ca/~mdadams/jasper/
@@ -21,6 +20,9 @@
 # CVE-2007-2721 (bug #240397)
 # borrowed from http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=413041;msg=88
 Patch3: patch-libjasper-stepsizes-overflow.diff
+# borrowed from http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=469786 
+Patch4: jpc_dec.c.patch
+
 
 BuildRequires: automake 
 BuildRequires: libjpeg-devel
@@ -63,6 +65,7 @@
 
 %patch1 -p1 -b .GL
 %patch3 -p1 -b .CVE-2007-2721
+%patch4 -p1 -b .jpc_dec_assertion
 
 
 %build
@@ -109,12 +112,12 @@
 %defattr(-,root,root,-)
 %doc doc/*
 %{_includedir}/jasper/
-%{_libdir}/lib*.so
+%{_libdir}/libjasper.so
 
 %files libs
 %defattr(-,root,root,-)
 %doc COPYRIGHT LICENSE NEWS README
-%{_libdir}/lib*.so.*
+%{_libdir}/libjasper.so.1*
 
 %files utils
 %defattr(-,root,root,-)
@@ -124,6 +127,10 @@
 
 
 %changelog
+* Sun Jan 25 2009 Rex Dieter <rdieter at fedoraproject.org> 1.900.1-9
+- patch for "jpc_dec_tiledecode: Assertion `dec->numcomps == 3' failed)
+  (#481284, #481291)
+
 * Fri Feb 08 2008 Rex Dieter <rdieter at fedoraproject.org> 1.900.1-8
 - respin (gcc43)
 



From rdieter at fedoraproject.org  Sun Jan 25 16:22:51 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sun, 25 Jan 2009 16:22:51 +0000 (UTC)
Subject: rpms/jasper/EL-4 jpc_dec.c.patch,NONE,1.1 jasper.spec,1.21,1.22
Message-ID: <20090125162251.441D270133@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/jasper/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26534

Modified Files:
	jasper.spec 
Added Files:
	jpc_dec.c.patch 
Log Message:
* Sun Jan 25 2009 Rex Dieter <rdieter at fedoraproject.org> 1.900.1-9
- patch for "jpc_dec_tiledecode: Assertion `dec->numcomps == 3' failed)
  (#481284, #481291)


jpc_dec.c.patch:

--- NEW FILE jpc_dec.c.patch ---
diff -urN jasper-1.900.1/src/libjasper/jpc/jpc_dec.c jasper-1.900.1-fix/src/libjasper/jpc/jpc_dec.c
--- jasper-1.900.1/src/libjasper/jpc/jpc_dec.c	2007-01-19 14:43:07.000000000 -0700
+++ jasper-1.900.1-fix/src/libjasper/jpc/jpc_dec.c	2008-03-06 16:51:12.000000000 -0700
@@ -1069,12 +1069,12 @@
 	/* Apply an inverse intercomponent transform if necessary. */
 	switch (tile->cp->mctid) {
 	case JPC_MCT_RCT:
-		assert(dec->numcomps == 3);
+		assert(dec->numcomps >= 3);
 		jpc_irct(tile->tcomps[0].data, tile->tcomps[1].data,
 		  tile->tcomps[2].data);
 		break;
 	case JPC_MCT_ICT:
-		assert(dec->numcomps == 3);
+		assert(dec->numcomps >= 3);
 		jpc_iict(tile->tcomps[0].data, tile->tcomps[1].data,
 		  tile->tcomps[2].data);
 		break;


Index: jasper.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jasper/EL-4/jasper.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- jasper.spec	23 May 2007 19:18:16 -0000	1.21
+++ jasper.spec	25 Jan 2009 16:22:20 -0000	1.22
@@ -1,28 +1,17 @@
 
 # NOTE: packages that can use jasper:
 # ImageMagick
-# kdelibs
 # netpbm
 
-# define to use GeoJasper
-#define geo 1
-
 Summary: Implementation of the JPEG-2000 standard, Part 1
 Name:    jasper
 Group:   System Environment/Libraries
 Version: 1.900.1
-Release: 2%{?dist}
+Release: 9%{?dist}
 
-License: JasPer License Version 2.0
-%if "%{?geo:1}" == "1"
-%define  geojasper_ver 1.2.9
-URL:	 http://www.dimin.net/software/utils.html
-Source:  http://dimin.m6.net/software/utils/geojasper_src.zip
-Provides: geojasper = %{geojasper_ver}
-%else
+License: JasPer
 URL:     http://www.ece.uvic.ca/~mdadams/jasper/
 Source0: http://www.ece.uvic.ca/~mdadams/jasper/software/jasper-%{version}.zip
-%endif
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Patch1: jasper-1.701.0-GL.patch
@@ -31,42 +20,52 @@
 # CVE-2007-2721 (bug #240397)
 # borrowed from http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=413041;msg=88
 Patch3: patch-libjasper-stepsizes-overflow.diff
+# borrowed from http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=469786 
+Patch4: jpc_dec.c.patch
+
 
 BuildRequires: automake 
 BuildRequires: libjpeg-devel
 # "freeglut-devel: Requires: libGL-devel libGLU-devel" (#179464)
 BuildRequires: freeglut-devel libGL-devel libGLU-devel
 
+Requires: %{name}-libs = %{version}-%{release}
+
 %description
 This package contains an implementation of the image compression
 standard JPEG-2000, Part 1. It consists of tools for conversion to and
 from the JP2 and JPC formats.
 
 %package devel
-Summary: JPEG-2000 library developer files
+Summary: Header files, libraries and developer documentation
 Group:   Development/Libraries
-Requires: %{name} = %{version}-%{release}
+Provides: libjasper-devel = %{version}-%{release}
+Requires: %{name}-libs = %{version}-%{release}
 Requires: libjpeg-devel
 %description devel
 %{summary}.
 
+%package libs 
+Summary: Runtime libraries for %{name}
+Group:   System Environment/Libraries
+%description libs 
+%{summary}.
+
+%package utils 
+Summary: Nonessential utilities for %{name}
+Group:   Development/Libraries
+Requires: %{name} = %{version}-%{release}
+%description utils 
+%{summary}, including jiv and tmrdemo.
+
+
 
 %prep
-%setup -q -n %{name}-%{version}%{?geo:.GEO}
+%setup -q -n %{name}-%{version}
 
 %patch1 -p1 -b .GL
 %patch3 -p1 -b .CVE-2007-2721
-
-%if "%{?geo:1}" == "1"
-chmod +x configure configure.ac
-%patch2 -p1 -b .GL-ac
-libtoolize --force
-aclocal
-autoconf
-autoheader
-automake -a
-%endif
-
+%patch4 -p1 -b .jpc_dec_assertion
 
 
 %build
@@ -96,30 +95,60 @@
 rm -rf $RPM_BUILD_ROOT
 
 
-%post -p /sbin/ldconfig
+%post libs -p /sbin/ldconfig
 
-%postun -p /sbin/ldconfig
+%postun libs -p /sbin/ldconfig
 
 
 %files
 %defattr(-,root,root,-)
-%doc COPYRIGHT LICENSE NEWS README
 %{_bindir}/imgcmp
-%{_bindir}/jiv
 %{_bindir}/imginfo
-%{_bindir}/*jasper*
-%{_bindir}/tmrdemo
-%{_libdir}/lib*.so.*
-%{_mandir}/man1/*
+%{_bindir}/jasper
+%{_mandir}/man1/img*
+%{_mandir}/man1/jasper.1*
 
 %files devel
 %defattr(-,root,root,-)
 %doc doc/*
 %{_includedir}/jasper/
-%{_libdir}/lib*.so
+%{_libdir}/libjasper.so
+
+%files libs
+%defattr(-,root,root,-)
+%doc COPYRIGHT LICENSE NEWS README
+%{_libdir}/libjasper.so.1*
+
+%files utils
+%defattr(-,root,root,-)
+%{_bindir}/jiv
+%{_bindir}/tmrdemo
+%{_mandir}/man1/jiv.1*
 
 
 %changelog
+* Sun Jan 25 2009 Rex Dieter <rdieter at fedoraproject.org> 1.900.1-9
+- patch for "jpc_dec_tiledecode: Assertion `dec->numcomps == 3' failed)
+  (#481284, #481291)
+
+* Fri Feb 08 2008 Rex Dieter <rdieter at fedoraproject.org> 1.900.1-8
+- respin (gcc43)
+
+* Mon Oct 15 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 1.900.1-7
+- -libs: %%post/%%postun -p /sbin/ldconfig
+
+* Mon Sep 17 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 1.900.1-6
+- -libs: -Requires: %%name
+- -devel: +Provides: libjasper-devel
+- drop (unused) geojasper bits
+
+* Wed Aug 22 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 1.900.1-4
+- -libs subpkg to be multilib friendlier
+- -utils subpkg for non-essential binaries jiv, tmrdemo (#244153)
+
+* Fri Aug 17 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 1.900.1-3
+- License: JasPer
+
 * Wed May 23 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 1.900.1-2
 - CVE-2007-2721 (#240397)
 



From rdieter at fedoraproject.org  Sun Jan 25 16:23:16 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sun, 25 Jan 2009 16:23:16 +0000 (UTC)
Subject: rpms/jasper/EL-5 jpc_dec.c.patch,NONE,1.1 jasper.spec,1.20,1.21
Message-ID: <20090125162316.96DAF70133@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/jasper/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26650

Modified Files:
	jasper.spec 
Added Files:
	jpc_dec.c.patch 
Log Message:
* Sun Jan 25 2009 Rex Dieter <rdieter at fedoraproject.org> 1.900.1-9
- patch for "jpc_dec_tiledecode: Assertion `dec->numcomps == 3' failed)
  (#481284, #481291)


jpc_dec.c.patch:

--- NEW FILE jpc_dec.c.patch ---
diff -urN jasper-1.900.1/src/libjasper/jpc/jpc_dec.c jasper-1.900.1-fix/src/libjasper/jpc/jpc_dec.c
--- jasper-1.900.1/src/libjasper/jpc/jpc_dec.c	2007-01-19 14:43:07.000000000 -0700
+++ jasper-1.900.1-fix/src/libjasper/jpc/jpc_dec.c	2008-03-06 16:51:12.000000000 -0700
@@ -1069,12 +1069,12 @@
 	/* Apply an inverse intercomponent transform if necessary. */
 	switch (tile->cp->mctid) {
 	case JPC_MCT_RCT:
-		assert(dec->numcomps == 3);
+		assert(dec->numcomps >= 3);
 		jpc_irct(tile->tcomps[0].data, tile->tcomps[1].data,
 		  tile->tcomps[2].data);
 		break;
 	case JPC_MCT_ICT:
-		assert(dec->numcomps == 3);
+		assert(dec->numcomps >= 3);
 		jpc_iict(tile->tcomps[0].data, tile->tcomps[1].data,
 		  tile->tcomps[2].data);
 		break;


Index: jasper.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jasper/EL-5/jasper.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- jasper.spec	23 May 2007 19:19:15 -0000	1.20
+++ jasper.spec	25 Jan 2009 16:22:45 -0000	1.21
@@ -1,28 +1,17 @@
 
 # NOTE: packages that can use jasper:
 # ImageMagick
-# kdelibs
 # netpbm
 
-# define to use GeoJasper
-#define geo 1
-
 Summary: Implementation of the JPEG-2000 standard, Part 1
 Name:    jasper
 Group:   System Environment/Libraries
 Version: 1.900.1
-Release: 2%{?dist}
+Release: 9%{?dist}
 
-License: JasPer License Version 2.0
-%if "%{?geo:1}" == "1"
-%define  geojasper_ver 1.2.9
-URL:	 http://www.dimin.net/software/utils.html
-Source:  http://dimin.m6.net/software/utils/geojasper_src.zip
-Provides: geojasper = %{geojasper_ver}
-%else
+License: JasPer
 URL:     http://www.ece.uvic.ca/~mdadams/jasper/
 Source0: http://www.ece.uvic.ca/~mdadams/jasper/software/jasper-%{version}.zip
-%endif
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Patch1: jasper-1.701.0-GL.patch
@@ -31,42 +20,52 @@
 # CVE-2007-2721 (bug #240397)
 # borrowed from http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=413041;msg=88
 Patch3: patch-libjasper-stepsizes-overflow.diff
+# borrowed from http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=469786 
+Patch4: jpc_dec.c.patch
+
 
 BuildRequires: automake 
 BuildRequires: libjpeg-devel
 # "freeglut-devel: Requires: libGL-devel libGLU-devel" (#179464)
 BuildRequires: freeglut-devel libGL-devel libGLU-devel
 
+Requires: %{name}-libs = %{version}-%{release}
+
 %description
 This package contains an implementation of the image compression
 standard JPEG-2000, Part 1. It consists of tools for conversion to and
 from the JP2 and JPC formats.
 
 %package devel
-Summary: JPEG-2000 library developer files
+Summary: Header files, libraries and developer documentation
 Group:   Development/Libraries
-Requires: %{name} = %{version}-%{release}
+Provides: libjasper-devel = %{version}-%{release}
+Requires: %{name}-libs = %{version}-%{release}
 Requires: libjpeg-devel
 %description devel
 %{summary}.
 
+%package libs 
+Summary: Runtime libraries for %{name}
+Group:   System Environment/Libraries
+%description libs 
+%{summary}.
+
+%package utils 
+Summary: Nonessential utilities for %{name}
+Group:   Development/Libraries
+Requires: %{name} = %{version}-%{release}
+%description utils 
+%{summary}, including jiv and tmrdemo.
+
+
 
 %prep
-%setup -q -n %{name}-%{version}%{?geo:.GEO}
+%setup -q -n %{name}-%{version}
 
 %patch1 -p1 -b .GL
 %patch3 -p1 -b .CVE-2007-2721
-
-%if "%{?geo:1}" == "1"
-chmod +x configure configure.ac
-%patch2 -p1 -b .GL-ac
-libtoolize --force
-aclocal
-autoconf
-autoheader
-automake -a
-%endif
-
+%patch4 -p1 -b .jpc_dec_assertion
 
 
 %build
@@ -96,30 +95,60 @@
 rm -rf $RPM_BUILD_ROOT
 
 
-%post -p /sbin/ldconfig
+%post libs -p /sbin/ldconfig
 
-%postun -p /sbin/ldconfig
+%postun libs -p /sbin/ldconfig
 
 
 %files
 %defattr(-,root,root,-)
-%doc COPYRIGHT LICENSE NEWS README
 %{_bindir}/imgcmp
-%{_bindir}/jiv
 %{_bindir}/imginfo
-%{_bindir}/*jasper*
-%{_bindir}/tmrdemo
-%{_libdir}/lib*.so.*
-%{_mandir}/man1/*
+%{_bindir}/jasper
+%{_mandir}/man1/img*
+%{_mandir}/man1/jasper.1*
 
 %files devel
 %defattr(-,root,root,-)
 %doc doc/*
 %{_includedir}/jasper/
-%{_libdir}/lib*.so
+%{_libdir}/libjasper.so
+
+%files libs
+%defattr(-,root,root,-)
+%doc COPYRIGHT LICENSE NEWS README
+%{_libdir}/libjasper.so.1*
+
+%files utils
+%defattr(-,root,root,-)
+%{_bindir}/jiv
+%{_bindir}/tmrdemo
+%{_mandir}/man1/jiv.1*
 
 
 %changelog
+* Sun Jan 25 2009 Rex Dieter <rdieter at fedoraproject.org> 1.900.1-9
+- patch for "jpc_dec_tiledecode: Assertion `dec->numcomps == 3' failed)
+  (#481284, #481291)
+
+* Fri Feb 08 2008 Rex Dieter <rdieter at fedoraproject.org> 1.900.1-8
+- respin (gcc43)
+
+* Mon Oct 15 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 1.900.1-7
+- -libs: %%post/%%postun -p /sbin/ldconfig
+
+* Mon Sep 17 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 1.900.1-6
+- -libs: -Requires: %%name
+- -devel: +Provides: libjasper-devel
+- drop (unused) geojasper bits
+
+* Wed Aug 22 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 1.900.1-4
+- -libs subpkg to be multilib friendlier
+- -utils subpkg for non-essential binaries jiv, tmrdemo (#244153)
+
+* Fri Aug 17 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 1.900.1-3
+- License: JasPer
+
 * Wed May 23 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 1.900.1-2
 - CVE-2007-2721 (#240397)
 



From robert at fedoraproject.org  Sun Jan 25 17:11:08 2009
From: robert at fedoraproject.org (Robert Scheck)
Date: Sun, 25 Jan 2009 17:11:08 +0000 (UTC)
Subject: rpms/duplicity/EL-5 .cvsignore, 1.9, 1.10 duplicity.spec, 1.21,
	1.22 sources, 1.9, 1.10
Message-ID: <20090125171109.55CE970142@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/extras/rpms/duplicity/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2130/EL-5

Modified Files:
	.cvsignore duplicity.spec sources 
Log Message:
Upgrade to 0.5.06 (#481489)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/duplicity/EL-5/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	7 Dec 2008 18:00:38 -0000	1.9
+++ .cvsignore	25 Jan 2009 17:10:37 -0000	1.10
@@ -1 +1 @@
-duplicity-0.5.03.tar.gz
+duplicity-0.5.06.tar.gz


Index: duplicity.spec
===================================================================
RCS file: /cvs/extras/rpms/duplicity/EL-5/duplicity.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- duplicity.spec	7 Dec 2008 18:00:39 -0000	1.21
+++ duplicity.spec	25 Jan 2009 17:10:38 -0000	1.22
@@ -2,18 +2,18 @@
 
 Summary:        Encrypted bandwidth-efficient backup using rsync algorithm
 Name:           duplicity
-Version:        0.5.03
+Version:        0.5.06
 Release:        1%{?dist}
 License:        GPLv3+
 Group:          Applications/Archiving
 URL:            http://www.nongnu.org/duplicity/
 Source:         http://savannah.nongnu.org/download/%{name}/%{name}-%{version}.tar.gz
-Requires:       python-GnuPGInterface >= 0.3.2, gnupg >= 1.0.6, rsync
-Requires:       pexpect >= 2.1, openssh-clients, ncftp >= 3.1.9, python-boto >= 0.9d
+Requires:       python-GnuPGInterface >= 0.3.2, gnupg >= 1.0.6
+Requires:       openssh-clients, ncftp >= 3.1.9, rsync
 %if 0%{?rhel} <= 4
 Requires:       python-abi = %(%{__python} -c "import sys; print sys.version[:3]")
 %endif
-BuildRequires:  python-devel >= 2.3, librsync-devel >= 0.9.6, pexpect >= 2.1
+BuildRequires:  python-devel >= 2.3, librsync-devel >= 0.9.6
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -39,10 +39,12 @@
 rm -rf $RPM_BUILD_ROOT
 %{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
 
+%find_lang %{name}
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%files
+%files -f %{name}.lang
 %defattr(-,root,root)
 %doc CHANGELOG COPYING README
 %{_bindir}/rdiffdir
@@ -52,6 +54,9 @@
 %{python_sitearch}/%{name}*
 
 %changelog
+* Sun Jan 25 2009 Robert Scheck <robert at fedoraproject.org> 0.5.06-1
+- Upgrade to 0.5.06 (#481489)
+
 * Sun Dec 07 2008 Robert Scheck <robert at fedoraproject.org> 0.5.03-1
 - Upgrade to 0.5.03
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/duplicity/EL-5/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	7 Dec 2008 18:00:39 -0000	1.9
+++ sources	25 Jan 2009 17:10:38 -0000	1.10
@@ -1 +1 @@
-80273525ae47e8075078a855cf4a134e  duplicity-0.5.03.tar.gz
+7363d8f1be770e0296c78badbffaa4b4  duplicity-0.5.06.tar.gz



From robert at fedoraproject.org  Sun Jan 25 17:11:08 2009
From: robert at fedoraproject.org (Robert Scheck)
Date: Sun, 25 Jan 2009 17:11:08 +0000 (UTC)
Subject: rpms/duplicity/EL-4 .cvsignore, 1.8, 1.9 duplicity.spec, 1.17,
	1.18 sources, 1.8, 1.9
Message-ID: <20090125171109.4BD7970133@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/extras/rpms/duplicity/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2130/EL-4

Modified Files:
	.cvsignore duplicity.spec sources 
Log Message:
Upgrade to 0.5.06 (#481489)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/duplicity/EL-4/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	7 Dec 2008 18:00:37 -0000	1.8
+++ .cvsignore	25 Jan 2009 17:10:37 -0000	1.9
@@ -1 +1 @@
-duplicity-0.5.03.tar.gz
+duplicity-0.5.06.tar.gz


Index: duplicity.spec
===================================================================
RCS file: /cvs/extras/rpms/duplicity/EL-4/duplicity.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- duplicity.spec	7 Dec 2008 18:00:37 -0000	1.17
+++ duplicity.spec	25 Jan 2009 17:10:37 -0000	1.18
@@ -2,18 +2,18 @@
 
 Summary:        Encrypted bandwidth-efficient backup using rsync algorithm
 Name:           duplicity
-Version:        0.5.03
+Version:        0.5.06
 Release:        1%{?dist}
 License:        GPLv3+
 Group:          Applications/Archiving
 URL:            http://www.nongnu.org/duplicity/
 Source:         http://savannah.nongnu.org/download/%{name}/%{name}-%{version}.tar.gz
-Requires:       python-GnuPGInterface >= 0.3.2, gnupg >= 1.0.6, rsync
-Requires:       pexpect >= 2.1, openssh-clients, ncftp >= 3.1.9, python-boto >= 0.9d
+Requires:       python-GnuPGInterface >= 0.3.2, gnupg >= 1.0.6
+Requires:       openssh-clients, ncftp >= 3.1.9, rsync
 %if 0%{?rhel} <= 4
 Requires:       python-abi = %(%{__python} -c "import sys; print sys.version[:3]")
 %endif
-BuildRequires:  python-devel >= 2.3, librsync-devel >= 0.9.6, pexpect >= 2.1
+BuildRequires:  python-devel >= 2.3, librsync-devel >= 0.9.6
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -39,10 +39,12 @@
 rm -rf $RPM_BUILD_ROOT
 %{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
 
+%find_lang %{name}
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%files
+%files -f %{name}.lang
 %defattr(-,root,root)
 %doc CHANGELOG COPYING README
 %{_bindir}/rdiffdir
@@ -52,6 +54,9 @@
 %{python_sitearch}/%{name}*
 
 %changelog
+* Sun Jan 25 2009 Robert Scheck <robert at fedoraproject.org> 0.5.06-1
+- Upgrade to 0.5.06 (#481489)
+
 * Sun Dec 07 2008 Robert Scheck <robert at fedoraproject.org> 0.5.03-1
 - Upgrade to 0.5.03
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/duplicity/EL-4/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	7 Dec 2008 18:00:37 -0000	1.8
+++ sources	25 Jan 2009 17:10:37 -0000	1.9
@@ -1 +1 @@
-80273525ae47e8075078a855cf4a134e  duplicity-0.5.03.tar.gz
+7363d8f1be770e0296c78badbffaa4b4  duplicity-0.5.06.tar.gz



From robert at fedoraproject.org  Sun Jan 25 17:11:09 2009
From: robert at fedoraproject.org (Robert Scheck)
Date: Sun, 25 Jan 2009 17:11:09 +0000 (UTC)
Subject: rpms/duplicity/F-10 .cvsignore, 1.9, 1.10 duplicity.spec, 1.21,
	1.22 sources, 1.9, 1.10
Message-ID: <20090125171109.CB02B70133@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/extras/rpms/duplicity/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2130/F-10

Modified Files:
	.cvsignore duplicity.spec sources 
Log Message:
Upgrade to 0.5.06 (#481489)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/duplicity/F-10/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	7 Dec 2008 18:00:39 -0000	1.9
+++ .cvsignore	25 Jan 2009 17:10:38 -0000	1.10
@@ -1 +1 @@
-duplicity-0.5.03.tar.gz
+duplicity-0.5.06.tar.gz


Index: duplicity.spec
===================================================================
RCS file: /cvs/extras/rpms/duplicity/F-10/duplicity.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- duplicity.spec	7 Dec 2008 18:00:39 -0000	1.21
+++ duplicity.spec	25 Jan 2009 17:10:38 -0000	1.22
@@ -2,15 +2,15 @@
 
 Summary:        Encrypted bandwidth-efficient backup using rsync algorithm
 Name:           duplicity
-Version:        0.5.03
+Version:        0.5.06
 Release:        1%{?dist}
 License:        GPLv3+
 Group:          Applications/Archiving
 URL:            http://www.nongnu.org/duplicity/
 Source:         http://savannah.nongnu.org/download/%{name}/%{name}-%{version}.tar.gz
-Requires:       python-GnuPGInterface >= 0.3.2, gnupg >= 1.0.6, rsync
-Requires:       pexpect >= 2.1, openssh-clients, ncftp >= 3.1.9, python-boto >= 0.9d
-BuildRequires:  python-devel >= 2.3, librsync-devel >= 0.9.6, pexpect >= 2.1
+Requires:       python-GnuPGInterface >= 0.3.2, gnupg >= 1.0.6
+Requires:       openssh-clients, ncftp >= 3.1.9, rsync
+BuildRequires:  python-devel >= 2.3, librsync-devel >= 0.9.6
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -36,10 +36,12 @@
 rm -rf $RPM_BUILD_ROOT
 %{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
 
+%find_lang %{name}
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%files
+%files -f %{name}.lang
 %defattr(-,root,root)
 %doc CHANGELOG COPYING README
 %{_bindir}/rdiffdir
@@ -49,6 +51,9 @@
 %{python_sitearch}/%{name}*
 
 %changelog
+* Sun Jan 25 2009 Robert Scheck <robert at fedoraproject.org> 0.5.06-1
+- Upgrade to 0.5.06 (#481489)
+
 * Sun Dec 07 2008 Robert Scheck <robert at fedoraproject.org> 0.5.03-1
 - Upgrade to 0.5.03
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/duplicity/F-10/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	7 Dec 2008 18:00:39 -0000	1.9
+++ sources	25 Jan 2009 17:10:39 -0000	1.10
@@ -1 +1 @@
-80273525ae47e8075078a855cf4a134e  duplicity-0.5.03.tar.gz
+7363d8f1be770e0296c78badbffaa4b4  duplicity-0.5.06.tar.gz



From robert at fedoraproject.org  Sun Jan 25 17:11:10 2009
From: robert at fedoraproject.org (Robert Scheck)
Date: Sun, 25 Jan 2009 17:11:10 +0000 (UTC)
Subject: rpms/duplicity/F-9 .cvsignore, 1.9, 1.10 duplicity.spec, 1.21,
	1.22 sources, 1.9, 1.10
Message-ID: <20090125171110.786F570133@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/extras/rpms/duplicity/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2130/F-9

Modified Files:
	.cvsignore duplicity.spec sources 
Log Message:
Upgrade to 0.5.06 (#481489)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/duplicity/F-9/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	7 Dec 2008 18:00:40 -0000	1.9
+++ .cvsignore	25 Jan 2009 17:10:39 -0000	1.10
@@ -1 +1 @@
-duplicity-0.5.03.tar.gz
+duplicity-0.5.06.tar.gz


Index: duplicity.spec
===================================================================
RCS file: /cvs/extras/rpms/duplicity/F-9/duplicity.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- duplicity.spec	7 Dec 2008 18:00:40 -0000	1.21
+++ duplicity.spec	25 Jan 2009 17:10:39 -0000	1.22
@@ -2,15 +2,15 @@
 
 Summary:        Encrypted bandwidth-efficient backup using rsync algorithm
 Name:           duplicity
-Version:        0.5.03
+Version:        0.5.06
 Release:        1%{?dist}
 License:        GPLv3+
 Group:          Applications/Archiving
 URL:            http://www.nongnu.org/duplicity/
 Source:         http://savannah.nongnu.org/download/%{name}/%{name}-%{version}.tar.gz
-Requires:       python-GnuPGInterface >= 0.3.2, gnupg >= 1.0.6, rsync
-Requires:       pexpect >= 2.1, openssh-clients, ncftp >= 3.1.9, python-boto >= 0.9d
-BuildRequires:  python-devel >= 2.3, librsync-devel >= 0.9.6, pexpect >= 2.1
+Requires:       python-GnuPGInterface >= 0.3.2, gnupg >= 1.0.6
+Requires:       openssh-clients, ncftp >= 3.1.9, rsync
+BuildRequires:  python-devel >= 2.3, librsync-devel >= 0.9.6
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -36,10 +36,12 @@
 rm -rf $RPM_BUILD_ROOT
 %{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
 
+%find_lang %{name}
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%files
+%files -f %{name}.lang
 %defattr(-,root,root)
 %doc CHANGELOG COPYING README
 %{_bindir}/rdiffdir
@@ -49,6 +51,9 @@
 %{python_sitearch}/%{name}*
 
 %changelog
+* Sun Jan 25 2009 Robert Scheck <robert at fedoraproject.org> 0.5.06-1
+- Upgrade to 0.5.06 (#481489)
+
 * Sun Dec 07 2008 Robert Scheck <robert at fedoraproject.org> 0.5.03-1
 - Upgrade to 0.5.03
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/duplicity/F-9/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	7 Dec 2008 18:00:40 -0000	1.9
+++ sources	25 Jan 2009 17:10:40 -0000	1.10
@@ -1 +1 @@
-80273525ae47e8075078a855cf4a134e  duplicity-0.5.03.tar.gz
+7363d8f1be770e0296c78badbffaa4b4  duplicity-0.5.06.tar.gz



From robert at fedoraproject.org  Sun Jan 25 17:11:10 2009
From: robert at fedoraproject.org (Robert Scheck)
Date: Sun, 25 Jan 2009 17:11:10 +0000 (UTC)
Subject: rpms/duplicity/devel .cvsignore, 1.9, 1.10 duplicity.spec, 1.22,
	1.23 sources, 1.9, 1.10
Message-ID: <20090125171110.B4BEF70133@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/extras/rpms/duplicity/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2130/devel

Modified Files:
	.cvsignore duplicity.spec sources 
Log Message:
Upgrade to 0.5.06 (#481489)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/duplicity/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	7 Dec 2008 18:00:40 -0000	1.9
+++ .cvsignore	25 Jan 2009 17:10:40 -0000	1.10
@@ -1 +1 @@
-duplicity-0.5.03.tar.gz
+duplicity-0.5.06.tar.gz


Index: duplicity.spec
===================================================================
RCS file: /cvs/extras/rpms/duplicity/devel/duplicity.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- duplicity.spec	7 Dec 2008 18:00:40 -0000	1.22
+++ duplicity.spec	25 Jan 2009 17:10:40 -0000	1.23
@@ -2,15 +2,15 @@
 
 Summary:        Encrypted bandwidth-efficient backup using rsync algorithm
 Name:           duplicity
-Version:        0.5.03
+Version:        0.5.06
 Release:        1%{?dist}
 License:        GPLv3+
 Group:          Applications/Archiving
 URL:            http://www.nongnu.org/duplicity/
 Source:         http://savannah.nongnu.org/download/%{name}/%{name}-%{version}.tar.gz
-Requires:       python-GnuPGInterface >= 0.3.2, gnupg >= 1.0.6, rsync
-Requires:       pexpect >= 2.1, openssh-clients, ncftp >= 3.1.9, python-boto >= 0.9d
-BuildRequires:  python-devel >= 2.3, librsync-devel >= 0.9.6, pexpect >= 2.1
+Requires:       python-GnuPGInterface >= 0.3.2, gnupg >= 1.0.6
+Requires:       openssh-clients, ncftp >= 3.1.9, rsync
+BuildRequires:  python-devel >= 2.3, librsync-devel >= 0.9.6
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -36,10 +36,12 @@
 rm -rf $RPM_BUILD_ROOT
 %{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
 
+%find_lang %{name}
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%files
+%files -f %{name}.lang
 %defattr(-,root,root)
 %doc CHANGELOG COPYING README
 %{_bindir}/rdiffdir
@@ -49,6 +51,9 @@
 %{python_sitearch}/%{name}*
 
 %changelog
+* Sun Jan 25 2009 Robert Scheck <robert at fedoraproject.org> 0.5.06-1
+- Upgrade to 0.5.06 (#481489)
+
 * Sun Dec 07 2008 Robert Scheck <robert at fedoraproject.org> 0.5.03-1
 - Upgrade to 0.5.03
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/duplicity/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	7 Dec 2008 18:00:40 -0000	1.9
+++ sources	25 Jan 2009 17:10:40 -0000	1.10
@@ -1 +1 @@
-80273525ae47e8075078a855cf4a134e  duplicity-0.5.03.tar.gz
+7363d8f1be770e0296c78badbffaa4b4  duplicity-0.5.06.tar.gz



From mtruch at fedoraproject.org  Sun Jan 25 17:27:05 2009
From: mtruch at fedoraproject.org (Matthew D Truch)
Date: Sun, 25 Jan 2009 17:27:05 +0000 (UTC)
Subject: rpms/kst/EL-5 kst.spec,1.13,1.14
Message-ID: <20090125172705.3E0C370133@cvs1.fedora.phx.redhat.com>

Author: mtruch

Update of /cvs/extras/rpms/kst/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5941

Modified Files:
	kst.spec 
Log Message:
Bump for kjsembed.so pickup.



Index: kst.spec
===================================================================
RCS file: /cvs/extras/rpms/kst/EL-5/kst.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- kst.spec	16 Dec 2008 22:05:17 -0000	1.13
+++ kst.spec	25 Jan 2009 17:26:34 -0000	1.14
@@ -1,6 +1,6 @@
 Name:       kst
 Version:    1.3.1
-Release:    5%{?dist}
+Release:    6%{?dist}
 Summary:    A data viewing program for KDE
 
 Group:      Applications/Engineering
@@ -216,6 +216,9 @@
 %{_datadir}/services/kst/kstdata_netcdf.desktop
 
 %changelog
+* Sun Jan 25 2009 Matthew Truch <matt at truch.net> - 1.3.1-5
+- Bump to pick up proper kjsembed.so.
+
 * Tue Dec 16 2008 Matthew Truch <matt at truch.net> - 1.3.1-4
 - Include utempter for EPEL build.
 



From mnowak at fedoraproject.org  Sun Jan 25 17:37:36 2009
From: mnowak at fedoraproject.org (Michal Nowak)
Date: Sun, 25 Jan 2009 17:37:36 +0000 (UTC)
Subject: comps comps-f11.xml.in,1.79,1.80
Message-ID: <20090125173736.741CE70133@cvs1.fedora.phx.redhat.com>

Author: mnowak

Update of /cvs/pkgs/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7527

Modified Files:
	comps-f11.xml.in 
Log Message:
removed unikurd-web-font (to be renamed to kurdit-unikurd-web-fonts)



Index: comps-f11.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f11.xml.in,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- comps-f11.xml.in	25 Jan 2009 15:14:39 -0000	1.79
+++ comps-f11.xml.in	25 Jan 2009 17:37:05 -0000	1.80
@@ -98,7 +98,6 @@
       <packagereq type="default">paktype-fonts</packagereq>
       <packagereq type="optional">m17n-db-arabic</packagereq>
       <packagereq type="optional">scim-tables-arabic</packagereq>
-      <packagereq type="optional">unikurd-web-font</packagereq>
     </packagelist>
   </group>
   <group>
@@ -1618,7 +1617,6 @@
       <packagereq type="optional">un-extra-fonts-taza</packagereq>
       <packagereq type="optional">un-extra-fonts-vada</packagereq>
       <packagereq type="optional">un-extra-fonts-yetgul</packagereq>
-      <packagereq type="optional">unikurd-web-font</packagereq>
       <packagereq type="optional">VLGothic-fonts-proportional</packagereq>
       <packagereq type="optional">wqy-zenhei-fonts</packagereq>
       <packagereq type="optional">xorg-x11-fonts-ethiopic</packagereq>
@@ -3254,7 +3252,6 @@
     <uservisible>false</uservisible>
     <langonly>ku</langonly>
     <packagelist>
-      <packagereq type="mandatory">unikurd-web-font</packagereq>
       <packagereq type="conditional" requires="hunspell">hunspell-ku</packagereq>
     </packagelist>
   </group>
@@ -3873,7 +3870,6 @@
       <packagereq type="conditional" requires="koffice-core">koffice-langpack-fa</packagereq>
       <packagereq type="conditional" requires="moodle">moodle-fa</packagereq>
       <packagereq type="optional">m17n-db-farsi</packagereq>
-      <packagereq type="optional">unikurd-web-font</packagereq>
     </packagelist>
   </group>
   <group>



From lucilanga at fedoraproject.org  Sun Jan 25 17:41:17 2009
From: lucilanga at fedoraproject.org (Lucian Langa)
Date: Sun, 25 Jan 2009 17:41:17 +0000 (UTC)
Subject: rpms/soundmodem/devel soundmodem-0.10-alsa-tx.patch, NONE,
	1.1 soundmodem.spec, 1.2, 1.3
Message-ID: <20090125174117.E1A8670133@cvs1.fedora.phx.redhat.com>

Author: lucilanga

Update of /cvs/pkgs/rpms/soundmodem/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8328

Modified Files:
	soundmodem.spec 
Added Files:
	soundmodem-0.10-alsa-tx.patch 
Log Message:
* Sun Jan 25 2009 Lucian Langa <cooly at gnome.eu.org> - 0.10-6
- apply debian patch for tx switching in ALSA mode

soundmodem-0.10-alsa-tx.patch:

--- NEW FILE soundmodem-0.10-alsa-tx.patch ---
--- soundmodem-0.10/soundcard/alsaio.c	2004-04-13 18:05:51.000000000 +0300
+++ soundmodem-0.10-mod/soundcard/alsaio.c	2009-01-25 18:59:25.000000000 +0200
@@ -360,6 +360,10 @@
 {
 	int err;
 
+	if (snd_pcm_prepare(audioio->playback_handle) < 0) {
+                logprintf(MLOG_ERROR, "Error preparing tx.\n");
+        }
+
 	err = snd_pcm_start(audioio->playback_handle);
 	if (err < 0)
 		logprintf(MLOG_ERROR, "snd_pcm_start: %s", snd_strerror(err));


Index: soundmodem.spec
===================================================================
RCS file: /cvs/pkgs/rpms/soundmodem/devel/soundmodem.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- soundmodem.spec	8 Dec 2008 10:12:21 -0000	1.2
+++ soundmodem.spec	25 Jan 2009 17:40:47 -0000	1.3
@@ -1,12 +1,13 @@
 Name: soundmodem
 Version: 0.10
-Release: 5%{?dist}
+Release: 6%{?dist}
 Summary: Soundcard Packet Radio Modem
 Group: Applications/Communications
 License: GPLv2+
 URL: http://www.baycom.org/~tom/ham/soundmodem/
 Source: http://www.baycom.org/~tom/ham/soundmodem/%{name}-%{version}.tar.gz
 Patch0: soundmodem-0.10-spurious-printf.patch
+Patch1: soundmodem-0.10-alsa-tx.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # Requires: /sbin/ifconfig /sbin/route /sbin/arp
 BuildRequires: gtk+-devel
@@ -40,6 +41,7 @@
 %prep
 %setup -q
 %patch0 -p1 -b .printf
+%patch1 -p1 -b .alsa-tx
 
 %build
 autoreconf -if
@@ -89,6 +91,9 @@
 %{_includedir}/%{name}
 
 %changelog
+* Sun Jan 25 2009 Lucian Langa <cooly at gnome.eu.org> - 0.10-6
+- apply debian patch for tx switching in ALSA mode 
+
 * Sat Dec 06 2008 Alan Crosswell <alan at columbia.edu> - 0.10-5
 - Apply patch to remove spurious printfs.
 



From pwouters at fedoraproject.org  Sun Jan 25 17:43:54 2009
From: pwouters at fedoraproject.org (Paul Wouters)
Date: Sun, 25 Jan 2009 17:43:54 +0000 (UTC)
Subject: rpms/dnssec-conf/F-10 dnssec-conf.spec,1.1,1.2
Message-ID: <20090125174354.A9D7870133@cvs1.fedora.phx.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/dnssec-conf/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8834

Modified Files:
	dnssec-conf.spec 
Log Message:
added disttag



Index: dnssec-conf.spec
===================================================================
RCS file: /cvs/extras/rpms/dnssec-conf/F-10/dnssec-conf.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- dnssec-conf.spec	24 Jan 2009 22:04:59 -0000	1.1
+++ dnssec-conf.spec	25 Jan 2009 17:43:23 -0000	1.2
@@ -1,7 +1,7 @@
 Summary: DNSSEC and DLV configuration tool (and TLD repository until the root is signed)
 Name: dnssec-conf
 Version: 1.13
-Release: 2
+Release: 2%{?dist}
 License: GPLv2+
 Url: http://www.xelerance.com/software/dnssec-conf/
 Source: http://www.xelerance.com/software/%{name}/%{name}-%{version}.tar.gz



From lucilanga at fedoraproject.org  Sun Jan 25 17:51:29 2009
From: lucilanga at fedoraproject.org (Lucian Langa)
Date: Sun, 25 Jan 2009 17:51:29 +0000 (UTC)
Subject: rpms/soundmodem/F-9 soundmodem-0.10-alsa-tx.patch, NONE,
	1.1 soundmodem.spec, 1.1, 1.2
Message-ID: <20090125175129.0828470133@cvs1.fedora.phx.redhat.com>

Author: lucilanga

Update of /cvs/pkgs/rpms/soundmodem/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10964

Modified Files:
	soundmodem.spec 
Added Files:
	soundmodem-0.10-alsa-tx.patch 
Log Message:
* Sun Jan 25 2009 Lucian Langa <cooly at gnome.eu.org> - 0.10-6
- apply debian patch for tx switching in ALSA mode

soundmodem-0.10-alsa-tx.patch:

--- NEW FILE soundmodem-0.10-alsa-tx.patch ---
--- soundmodem-0.10/soundcard/alsaio.c	2004-04-13 18:05:51.000000000 +0300
+++ soundmodem-0.10-mod/soundcard/alsaio.c	2009-01-25 18:59:25.000000000 +0200
@@ -360,6 +360,10 @@
 {
 	int err;
 
+	if (snd_pcm_prepare(audioio->playback_handle) < 0) {
+                logprintf(MLOG_ERROR, "Error preparing tx.\n");
+        }
+
 	err = snd_pcm_start(audioio->playback_handle);
 	if (err < 0)
 		logprintf(MLOG_ERROR, "snd_pcm_start: %s", snd_strerror(err));


Index: soundmodem.spec
===================================================================
RCS file: /cvs/pkgs/rpms/soundmodem/F-9/soundmodem.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- soundmodem.spec	8 Dec 2008 10:16:38 -0000	1.1
+++ soundmodem.spec	25 Jan 2009 17:50:58 -0000	1.2
@@ -1,12 +1,13 @@
 Name: soundmodem
 Version: 0.10
-Release: 5%{?dist}
+Release: 6%{?dist}
 Summary: Soundcard Packet Radio Modem
 Group: Applications/Communications
 License: GPLv2+
 URL: http://www.baycom.org/~tom/ham/soundmodem/
 Source: http://www.baycom.org/~tom/ham/soundmodem/%{name}-%{version}.tar.gz
 Patch0: soundmodem-0.10-spurious-printf.patch
+Patch1: soundmodem-0.10-alsa-tx.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # Requires: /sbin/ifconfig /sbin/route /sbin/arp
 BuildRequires: gtk+-devel
@@ -40,6 +41,7 @@
 %prep
 %setup -q
 %patch0 -p1 -b .printf
+%patch1 -p1 -b .alsa-tx
 
 %build
 autoreconf -if
@@ -89,6 +91,9 @@
 %{_includedir}/%{name}
 
 %changelog
+* Sun Jan 25 2009 Lucian Langa <cooly at gnome.eu.org> - 0.10-6
+- apply debian patch for tx switching in ALSA mode 
+
 * Sat Dec 06 2008 Alan Crosswell <alan at columbia.edu> - 0.10-5
 - Apply patch to remove spurious printfs.
 



From lucilanga at fedoraproject.org  Sun Jan 25 17:57:07 2009
From: lucilanga at fedoraproject.org (Lucian Langa)
Date: Sun, 25 Jan 2009 17:57:07 +0000 (UTC)
Subject: rpms/soundmodem/F-10 soundmodem-0.10-alsa-tx.patch, NONE,
	1.1 soundmodem.spec, 1.1, 1.2
Message-ID: <20090125175707.107BA70133@cvs1.fedora.phx.redhat.com>

Author: lucilanga

Update of /cvs/pkgs/rpms/soundmodem/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11919

Modified Files:
	soundmodem.spec 
Added Files:
	soundmodem-0.10-alsa-tx.patch 
Log Message:
* Sun Jan 25 2009 Lucian Langa <cooly at gnome.eu.org> - 0.10-6
- apply debian patch for tx switching in ALSA mode

soundmodem-0.10-alsa-tx.patch:

--- NEW FILE soundmodem-0.10-alsa-tx.patch ---
--- soundmodem-0.10/soundcard/alsaio.c	2004-04-13 18:05:51.000000000 +0300
+++ soundmodem-0.10-mod/soundcard/alsaio.c	2009-01-25 18:59:25.000000000 +0200
@@ -360,6 +360,10 @@
 {
 	int err;
 
+	if (snd_pcm_prepare(audioio->playback_handle) < 0) {
+                logprintf(MLOG_ERROR, "Error preparing tx.\n");
+        }
+
 	err = snd_pcm_start(audioio->playback_handle);
 	if (err < 0)
 		logprintf(MLOG_ERROR, "snd_pcm_start: %s", snd_strerror(err));


Index: soundmodem.spec
===================================================================
RCS file: /cvs/pkgs/rpms/soundmodem/F-10/soundmodem.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- soundmodem.spec	8 Dec 2008 10:21:27 -0000	1.1
+++ soundmodem.spec	25 Jan 2009 17:56:36 -0000	1.2
@@ -1,12 +1,13 @@
 Name: soundmodem
 Version: 0.10
-Release: 5%{?dist}
+Release: 6%{?dist}
 Summary: Soundcard Packet Radio Modem
 Group: Applications/Communications
 License: GPLv2+
 URL: http://www.baycom.org/~tom/ham/soundmodem/
 Source: http://www.baycom.org/~tom/ham/soundmodem/%{name}-%{version}.tar.gz
 Patch0: soundmodem-0.10-spurious-printf.patch
+Patch1: soundmodem-0.10-alsa-tx.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # Requires: /sbin/ifconfig /sbin/route /sbin/arp
 BuildRequires: gtk+-devel
@@ -40,6 +41,7 @@
 %prep
 %setup -q
 %patch0 -p1 -b .printf
+%patch1 -p1 -b .alsa-tx
 
 %build
 autoreconf -if
@@ -89,6 +91,9 @@
 %{_includedir}/%{name}
 
 %changelog
+* Sun Jan 25 2009 Lucian Langa <cooly at gnome.eu.org> - 0.10-6
+- apply debian patch for tx switching in ALSA mode 
+
 * Sat Dec 06 2008 Alan Crosswell <alan at columbia.edu> - 0.10-5
 - Apply patch to remove spurious printfs.
 



From pwouters at fedoraproject.org  Sun Jan 25 18:21:25 2009
From: pwouters at fedoraproject.org (Paul Wouters)
Date: Sun, 25 Jan 2009 18:21:25 +0000 (UTC)
Subject: rpms/autotrust/F-9 autotrust.conf, NONE, 1.1 autotrust.cron, NONE, 
	1.1 autotrust.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090125182125.1BA5570133@cvs1.fedora.phx.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/autotrust/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15386

Modified Files:
	.cvsignore sources 
Added Files:
	autotrust.conf autotrust.cron autotrust.spec 
Log Message:
Initial build of autotrust for F-9



--- NEW FILE autotrust.conf ---
# program configuration
config:
	# directory to go to for performing autotrust.
	# by default, autotrust will store files in the current directory.
	working-dir:		"/var/lib/autotrust"

	# where to find the root-hints. 
	# by default, autotrust uses builtin root hints from libunbound.
	# root-hints:		"/etc/named.root"

	# where to log messages. 
	# by default, logs will be outputted to stderr.
	log-file:		"/var/log/autotrust.log"

	# where to store state information for trust anchors. 
	# by default, state information is stored in a file autotrust.state in 
	# the working directory.
	state-file:		"/var/lib/autotrust/autotrust.state" 

	# where to find the the trust anchors (that can be used for Unbound).
	# trust-anchor-file:	"trust-anchor.file"

	# where to find the the trust anchors (that can be used for 
	# BIND9 and Unbound). you can also put your BIND configuration file 
	# here, though it is recommended to solely put the trusted-keys clause 
	# in this file and include it in your actual BIND configuration file.
	trusted-keys-file:	"/etc/pki/dnssec-keys/production.conf"

	# what resolv.conf file to use. 
	# by default, autotrust doesn't use configured nameservers, but queries 
	# for the answers himself. By providing your resolver configuration, the
	# program will run much faster.
	# resolv-conf:		"/etc/resolv.conf"

	# by default, autotrust makes use of both ipv4 and ipv6. 
	# setting one of these options to "yes" eliminates the use of the other 
	# protocol version.
	# ipv4-only:		"no"
	# ipv6-only:		"no"

	# specify the time when a trust anchor may be added.
	# by default, add holddown time is 30 days.
	# add-holddown:		2592000 # 30 days

	# specify the time when a trust anchor may be removed.
	# by default, del holddown time is 30 days.
	# del-holddown:		2592000 # 30 days

	# how many times must a pending trust anchor be seen, before adding it 
	# to the valid trust anchor set. by default, 2 times.
	# STRONGLY RECOMMENDED VALUE: 2 or higher
	# pending-count:	2

	# keep trust anchors with the START state in the state information file.
	# by default, trust anchors in the state START are not stored.
	# keep-start:		"no"

	# keep trust anchors with the REMOVED state in the state information.
	# by default, trust anchors in the state REMOVED are not stored.
	# keep-removed:		"no"

	# the pidfile that stores the process id of your resolver.
	# by default, autotrust does not know about your resolver and will not 
	# signal resolvers.
	# resolver-pidfile:		"/var/run/named/named.pid"
	resolver-pidfile: "/var/run/unbound/unbound.pid /var/run/named/named.pid"

	# if you use Unbound, you can specify the Undbound configuration 
	# here, so that autotrust uses the same configuration. This option was 
	# built in for debugging purposes (to configure stub zones), and is 
	# considered experimental.
	unbound-conf:		"/etc/unbound/unbound.conf"

	# specify the time when a missing trust anchor may not be used 
	# as valid trust anchor anymore. If keep-missing is 0, missing keys 
	# are never removed (unless revoked), which is the default.
	# STRONGLY RECOMMENDED VALUE: 0, or 1year or higher
	# keep-missing:		31536000 # 1 year

	# log if keys gone missing, regardless of the used verbosity level.
	# on by default.
	# alert-missing:	"yes"

	# if you have a superior trust point configured, the subordinate trust 
	# anchors will be removed after 180 days after the superior trust point 
	# was introduced. by default, this option is disabled, you may enable it 
	# by setting 'superior-trust' to "yes".
	# THIS OPTION IS NOT IMPLEMENTED YET
	# superior-trust:	"yes"

	# set the level of verbosity. default it it set to 1. the higher this 
	# number, the more log messages you will get. if you want no 
	# output at all, set verbosity to 0 (you will log only error and 
	# warning messages).
	# verbosity:		1


--- NEW FILE autotrust.cron ---
#!/bin/sh

# Check for updated and revoked  DNSKEY trust anchors daily
/usr/sbin/autotrust


--- NEW FILE autotrust.spec ---
%define prever rc1
%define VERSION %{version}%{prever}

Summary: DNSKEY trust anchor update utility that uses RFC-5011
Name: autotrust
Version: 0.2.1
Release: 0.2.%{prever}%{?dist}
License: BSD
Url: http://www.nlnetlabs.nl/%{name}/
Source: http://www.nlnetlabs.nl/downloads/%{name}-%{VERSION}.tar.gz
Source1: autotrust.conf
Source2: autotrust.cron
Group: System Environment/Libraries
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: ldns-devel >= 1.3.0, unbound-devel >= 1.0.0
Requires: anacron

%description
autotrust takes care of keeping your DNSSEC trust anchors up to date. It
is RFC5011 compliant, except for the query intervals and the retry timers.
autotrust is meant to run from commandline or in a cron job. If we want to
follow the values recommended by RFC5011, autotrust should run as daemon. 

%prep
%setup -q -n autotrust-%{VERSION}

%build
%configure --disable-rpath 
make %{?_smp_mflags}

%install
rm -rf %{buildroot}

make DESTDIR=%{buildroot} INSTALL="%{__install} -p" install 
mkdir -p %{buildroot}%{_sysconfdir}/%{name}/
mkdir -p %{buildroot}%{_localstatedir}/lib/%{name}
mkdir -p %{buildroot}%{_sysconfdir}/cron.daily/
install -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/%{name}/
install -m 755 %{SOURCE2} %{buildroot}%{_sysconfdir}/cron.daily/autotrust

%clean
rm -rf %{buildroot}

%files 
%defattr(-,root,root)
%{_sbindir}/autotrust
%doc doc/*
%{_mandir}/*/*
%dir %{_sysconfdir}/%{name}
%dir %{_localstatedir}/lib/%{name}
%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/%{name}/autotrust.conf
%attr(0755,root,root) %{_sysconfdir}/cron.daily/autotrust

%changelog
* Wed Jan 21 2009 Paul Wouters <paul at xelerance.com> - 0.2.1-0.2.rc1
- Drop sysconfig argument for configure
- Merged changelog entry to avoid rpm warning 

* Wed Jan 21 2009 Paul Wouters <paul at xelerance.com> - 0.2.1-0.1.rc1
- Drop regeneration of configure - does not work on rawhide
- Fix version/release tag
- Removed merged in patch. updated to upstream which fixes the reported autoconf issues.

* Tue Dec  2 2008 Paul Wouters <paul at xelerance.com> - 0.2.0-3
- Use upstream svn patch for multiple resolvers and defaults
- Don't override unused libdir
- Cleanup and run autoreconf
- Added missing dependancies (anacron, automake, libtool)
- Fix permission on cron job.

* Fri Nov 28 2008 Paul Wouters <paul at xelerance.com> - 0.2.0-2
- Fix typo in resolver-pidfile: option in autotrust.conf

* Thu Nov 27 2008 Paul Wouters <paul at xelerance.com> - 0.2.0-1
- Updated to newest version
- Fix default file locations
- Allow resolver-pid: to take multiple filenames, seperated by a space

* Fri Nov 22 2008 Paul Wouters <paul at xelerance.com> - 0.1.0-1
- Initial version


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/autotrust/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	23 Jan 2009 23:14:07 -0000	1.1
+++ .cvsignore	25 Jan 2009 18:20:54 -0000	1.2
@@ -0,0 +1 @@
+autotrust-0.2.1rc1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/autotrust/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	23 Jan 2009 23:14:07 -0000	1.1
+++ sources	25 Jan 2009 18:20:54 -0000	1.2
@@ -0,0 +1 @@
+663254fbd41176e3b13952bffd49a21c  autotrust-0.2.1rc1.tar.gz



From kevin at fedoraproject.org  Sun Jan 25 19:59:54 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Sun, 25 Jan 2009 19:59:54 +0000 (UTC)
Subject: rpms/twinkle/devel sources, 1.7, 1.8 .cvsignore, 1.7,
	1.8 twinkle.spec, 1.17, 1.18
Message-ID: <20090125195954.E71DB70133@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/twinkle/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29761

Modified Files:
	sources .cvsignore twinkle.spec 
Log Message:
Update to 1.4



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/twinkle/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	3 Sep 2008 20:08:39 -0000	1.7
+++ sources	25 Jan 2009 19:59:24 -0000	1.8
@@ -1 +1 @@
-8bafa14baeafc47be43c59fefc836c63  twinkle-1.3.2.tar.gz
+592068954c13d6b559951ecc944a3b6d  twinkle-1.4.tar.gz


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/twinkle/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	3 Sep 2008 20:08:39 -0000	1.7
+++ .cvsignore	25 Jan 2009 19:59:24 -0000	1.8
@@ -1 +1 @@
-twinkle-1.3.2.tar.gz
+twinkle-1.4.tar.gz


Index: twinkle.spec
===================================================================
RCS file: /cvs/extras/rpms/twinkle/devel/twinkle.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- twinkle.spec	17 Dec 2008 23:39:21 -0000	1.17
+++ twinkle.spec	25 Jan 2009 19:59:24 -0000	1.18
@@ -1,6 +1,6 @@
 Name:           twinkle
-Version:        1.3.2
-Release:        3%{?dist}
+Version:        1.4
+Release:        1%{?dist}
 Summary:        A SIP Soft Phone
 
 Group:          Applications/Internet
@@ -8,7 +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.3.2-command-line-segfault.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: commoncpp2-devel
@@ -22,6 +21,7 @@
 BuildRequires: bison
 BuildRequires: libzrtpcpp-devel
 BuildRequires: file-devel
+BuildRequires: readline-devel
 
 %description
 Twinkle is a SIP based soft phone for making telephone calls over IP networks.
@@ -29,7 +29,6 @@
 %prep
 %setup -q
 %patch0 -p1 -b .msg
-%patch1 -p1 -b .segfault
 
 %build
 %configure
@@ -62,6 +61,9 @@
 %{_datadir}/applications/fedora-twinkle.desktop
 
 %changelog
+* Sun Jan 25 2009 Kevin Fenzi <kevin at tummy.com> - 1.4-1
+- Update to 1.4
+
 * Wed Dec 17 2008 Benjamin Kosnik  <bkoz at redhat.com> - 1.3.2-3
 - Rebuild for boost-1.37.0.
 



From mtasaka at fedoraproject.org  Sun Jan 25 20:12:14 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Sun, 25 Jan 2009 20:12:14 +0000 (UTC)
Subject: rpms/ruby-mechanize/devel dead.package, NONE, 1.1 .cvsignore, 1.13, 
	NONE Makefile, 1.1, NONE ruby-mechanize.spec, 1.12, NONE sources,
	1.13, NONE
Message-ID: <20090125201214.4BE7270133@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/ruby-mechanize/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31711

Added Files:
	dead.package 
Removed Files:
	.cvsignore Makefile ruby-mechanize.spec sources 
Log Message:
Goodby, ruby-mechanize


--- NEW FILE dead.package ---
2008-01-26 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>

tarball -> gem archive change.
rubygem-mechanize srpm is imported into Fedora and
now ruby-mechanize binary rpm is created as a subpackage
of rubygem-mechanize.


--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- ruby-mechanize.spec DELETED ---


--- sources DELETED ---



From mtasaka at fedoraproject.org  Sun Jan 25 20:15:14 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Sun, 25 Jan 2009 20:15:14 +0000 (UTC)
Subject: rpms/ruby-mechanize/devel dead.package,1.1,1.2
Message-ID: <20090125201514.C5E7970133@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/ruby-mechanize/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32202

Modified Files:
	dead.package 
Log Message:
... and fix date on dead.package, orz


Index: dead.package
===================================================================
RCS file: /cvs/extras/rpms/ruby-mechanize/devel/dead.package,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- dead.package	25 Jan 2009 20:12:13 -0000	1.1
+++ dead.package	25 Jan 2009 20:14:44 -0000	1.2
@@ -1,4 +1,4 @@
-2008-01-26 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+2009-01-26 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
 
 tarball -> gem archive change.
 rubygem-mechanize srpm is imported into Fedora and



From robert at fedoraproject.org  Sun Jan 25 20:17:29 2009
From: robert at fedoraproject.org (Robert Scheck)
Date: Sun, 25 Jan 2009 20:17:29 +0000 (UTC)
Subject: rpms/digitemp/EL-5 digitemp-3.6.0-cflags.patch, NONE, 1.1 .cvsignore,
	1.2, 1.3 digitemp.spec, 1.2, 1.3 sources, 1.2,
	1.3 digitemp-3.5.0-cflags.patch, 1.1, NONE
Message-ID: <20090125201729.C67CD70133@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/pkgs/rpms/digitemp/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32613/EL-5

Modified Files:
	.cvsignore digitemp.spec sources 
Added Files:
	digitemp-3.6.0-cflags.patch 
Removed Files:
	digitemp-3.5.0-cflags.patch 
Log Message:
Upgrade to 3.6.0


digitemp-3.6.0-cflags.patch:

--- NEW FILE digitemp-3.6.0-cflags.patch ---
Patch by Robert Scheck <robert at fedoraproject.org> for digitemp >= 3.6.0,
which forces the use of $RPM_OPT_FLAGS to have a usable -debuginfo package.

--- digitemp-3.6.0/Makefile		2008-08-28 23:37:00.000000000 +0200
+++ digitemp-3.6.0/Makefile.cflags	2009-01-25 20:49:03.000000000 +0100
@@ -12,7 +12,7 @@
 VERSION = 3.6.0
 
 CC	= gcc
-CFLAGS	= -I./src -I./userial -O2 -Wall # -g
+CFLAGS	= -I./src -I./userial -O2 -Wall $(RPM_OPT_FLAGS) # -g
 
 OBJS		=	src/digitemp.o src/device_name.o src/ds2438.o
 HDRS		= 	src/digitemp.h src/device_name.h


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/digitemp/EL-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	10 Jun 2007 09:42:19 -0000	1.2
+++ .cvsignore	25 Jan 2009 20:16:59 -0000	1.3
@@ -1 +1 @@
-digitemp-3.5.0.tar.gz
+digitemp-3.6.0.tar.gz


Index: digitemp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/digitemp/EL-5/digitemp.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- digitemp.spec	28 Aug 2007 18:47:50 -0000	1.2
+++ digitemp.spec	25 Jan 2009 20:16:59 -0000	1.3
@@ -2,15 +2,15 @@
 
 Summary:           Dallas Semiconductor 1-wire device reading console application
 Name:              digitemp
-Version:           3.5.0
-Release:           2%{?dist}
+Version:           3.6.0
+Release:           1%{?dist}
 License:           GPLv2+
 Group:             Applications/System
 URL:               http://www.digitemp.com/
 Source0:           http://www.digitemp.com/software/linux/%{name}-%{version}.tar.gz
 Source1:           dthowto.txt
 Source2:           DS9097_Schematic.gif
-Patch0:            digitemp-3.5.0-cflags.patch
+Patch0:            digitemp-3.6.0-cflags.patch
 %if %{with_libusb}
 BuildRequires:     libusb-devel
 %endif
@@ -28,7 +28,7 @@
 %prep
 %setup -q
 %patch0 -p1 -b .cflags
-cp -f %{SOURCE1} %{SOURCE2} .
+cp -pf %{SOURCE1} %{SOURCE2} .
 
 %build
 make ds9097 %{?_smp_mflags}
@@ -44,9 +44,11 @@
 %if %{with_libusb}
 install -m 755 digitemp_DS2490 $RPM_BUILD_ROOT%{_bindir}
 %endif
+install -p -m 644 %{name}.1 $RPM_BUILD_ROOT%{_mandir}/man1/%{name}.1
 
-iconv -f iso-8859-1 -t utf-8 -o digitemp.1.utf8 digitemp.1
-install -m 644 digitemp.1.utf8 $RPM_BUILD_ROOT%{_mandir}/man1/%{name}.1
+# Convert everything to UTF-8
+iconv -f iso-8859-1 -t utf-8 -o ChangeLog.utf8 ChangeLog
+touch -c -r ChangeLog ChangeLog.utf8; mv -f ChangeLog.utf8 ChangeLog
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -59,6 +61,12 @@
 %{_mandir}/man1/%{name}.*
 
 %changelog
+* Sun Jan 25 2009 Robert Scheck <robert at fedoraproject.org> 3.6.0-1
+- Upgrade to 3.6.0
+
+* Sun Feb 10 2008 Robert Scheck <robert at fedoraproject.org> 3.5.0-3
+- Rebuilt against gcc 4.3
+
 * Tue Aug 28 2007 Robert Scheck <robert at fedoraproject.org> 3.5.0-2
 - Updated the license tag according to the guidelines
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/digitemp/EL-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	10 Jun 2007 09:42:19 -0000	1.2
+++ sources	25 Jan 2009 20:16:59 -0000	1.3
@@ -1 +1 @@
-72bda9c8a66b017aa969c19dedb3225b  digitemp-3.5.0.tar.gz
+9be2e48db37920f21925ae6e88f83b84  digitemp-3.6.0.tar.gz


--- digitemp-3.5.0-cflags.patch DELETED ---



From robert at fedoraproject.org  Sun Jan 25 20:17:29 2009
From: robert at fedoraproject.org (Robert Scheck)
Date: Sun, 25 Jan 2009 20:17:29 +0000 (UTC)
Subject: rpms/digitemp/EL-4 digitemp-3.6.0-cflags.patch, NONE, 1.1 .cvsignore,
	1.2, 1.3 digitemp.spec, 1.2, 1.3 sources, 1.2,
	1.3 digitemp-3.5.0-cflags.patch, 1.1, NONE
Message-ID: <20090125201729.92EBD70133@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/pkgs/rpms/digitemp/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32613/EL-4

Modified Files:
	.cvsignore digitemp.spec sources 
Added Files:
	digitemp-3.6.0-cflags.patch 
Removed Files:
	digitemp-3.5.0-cflags.patch 
Log Message:
Upgrade to 3.6.0


digitemp-3.6.0-cflags.patch:

--- NEW FILE digitemp-3.6.0-cflags.patch ---
Patch by Robert Scheck <robert at fedoraproject.org> for digitemp >= 3.6.0,
which forces the use of $RPM_OPT_FLAGS to have a usable -debuginfo package.

--- digitemp-3.6.0/Makefile		2008-08-28 23:37:00.000000000 +0200
+++ digitemp-3.6.0/Makefile.cflags	2009-01-25 20:49:03.000000000 +0100
@@ -12,7 +12,7 @@
 VERSION = 3.6.0
 
 CC	= gcc
-CFLAGS	= -I./src -I./userial -O2 -Wall # -g
+CFLAGS	= -I./src -I./userial -O2 -Wall $(RPM_OPT_FLAGS) # -g
 
 OBJS		=	src/digitemp.o src/device_name.o src/ds2438.o
 HDRS		= 	src/digitemp.h src/device_name.h


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/digitemp/EL-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	10 Jun 2007 09:40:44 -0000	1.2
+++ .cvsignore	25 Jan 2009 20:16:59 -0000	1.3
@@ -1 +1 @@
-digitemp-3.5.0.tar.gz
+digitemp-3.6.0.tar.gz


Index: digitemp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/digitemp/EL-4/digitemp.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- digitemp.spec	28 Aug 2007 18:48:42 -0000	1.2
+++ digitemp.spec	25 Jan 2009 20:16:59 -0000	1.3
@@ -2,15 +2,15 @@
 
 Summary:           Dallas Semiconductor 1-wire device reading console application
 Name:              digitemp
-Version:           3.5.0
-Release:           2%{?dist}
+Version:           3.6.0
+Release:           1%{?dist}
 License:           GPLv2+
 Group:             Applications/System
 URL:               http://www.digitemp.com/
 Source0:           http://www.digitemp.com/software/linux/%{name}-%{version}.tar.gz
 Source1:           dthowto.txt
 Source2:           DS9097_Schematic.gif
-Patch0:            digitemp-3.5.0-cflags.patch
+Patch0:            digitemp-3.6.0-cflags.patch
 %if %{with_libusb}
 BuildRequires:     libusb-devel
 %endif
@@ -28,7 +28,7 @@
 %prep
 %setup -q
 %patch0 -p1 -b .cflags
-cp -f %{SOURCE1} %{SOURCE2} .
+cp -pf %{SOURCE1} %{SOURCE2} .
 
 %build
 make ds9097 %{?_smp_mflags}
@@ -44,9 +44,11 @@
 %if %{with_libusb}
 install -m 755 digitemp_DS2490 $RPM_BUILD_ROOT%{_bindir}
 %endif
+install -p -m 644 %{name}.1 $RPM_BUILD_ROOT%{_mandir}/man1/%{name}.1
 
-iconv -f iso-8859-1 -t utf-8 -o digitemp.1.utf8 digitemp.1
-install -m 644 digitemp.1.utf8 $RPM_BUILD_ROOT%{_mandir}/man1/%{name}.1
+# Convert everything to UTF-8
+iconv -f iso-8859-1 -t utf-8 -o ChangeLog.utf8 ChangeLog
+touch -c -r ChangeLog ChangeLog.utf8; mv -f ChangeLog.utf8 ChangeLog
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -59,6 +61,12 @@
 %{_mandir}/man1/%{name}.*
 
 %changelog
+* Sun Jan 25 2009 Robert Scheck <robert at fedoraproject.org> 3.6.0-1
+- Upgrade to 3.6.0
+
+* Sun Feb 10 2008 Robert Scheck <robert at fedoraproject.org> 3.5.0-3
+- Rebuilt against gcc 4.3
+
 * Tue Aug 28 2007 Robert Scheck <robert at fedoraproject.org> 3.5.0-2
 - Updated the license tag according to the guidelines
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/digitemp/EL-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	10 Jun 2007 09:40:44 -0000	1.2
+++ sources	25 Jan 2009 20:16:59 -0000	1.3
@@ -1 +1 @@
-72bda9c8a66b017aa969c19dedb3225b  digitemp-3.5.0.tar.gz
+9be2e48db37920f21925ae6e88f83b84  digitemp-3.6.0.tar.gz


--- digitemp-3.5.0-cflags.patch DELETED ---



From robert at fedoraproject.org  Sun Jan 25 20:17:30 2009
From: robert at fedoraproject.org (Robert Scheck)
Date: Sun, 25 Jan 2009 20:17:30 +0000 (UTC)
Subject: rpms/digitemp/F-10 digitemp-3.6.0-cflags.patch, NONE, 1.1 .cvsignore,
	1.2, 1.3 digitemp.spec, 1.3, 1.4 sources, 1.2,
	1.3 digitemp-3.5.0-cflags.patch, 1.1, NONE
Message-ID: <20090125201730.2D08D70133@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/pkgs/rpms/digitemp/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32613/F-10

Modified Files:
	.cvsignore digitemp.spec sources 
Added Files:
	digitemp-3.6.0-cflags.patch 
Removed Files:
	digitemp-3.5.0-cflags.patch 
Log Message:
Upgrade to 3.6.0


digitemp-3.6.0-cflags.patch:

--- NEW FILE digitemp-3.6.0-cflags.patch ---
Patch by Robert Scheck <robert at fedoraproject.org> for digitemp >= 3.6.0,
which forces the use of $RPM_OPT_FLAGS to have a usable -debuginfo package.

--- digitemp-3.6.0/Makefile		2008-08-28 23:37:00.000000000 +0200
+++ digitemp-3.6.0/Makefile.cflags	2009-01-25 20:49:03.000000000 +0100
@@ -12,7 +12,7 @@
 VERSION = 3.6.0
 
 CC	= gcc
-CFLAGS	= -I./src -I./userial -O2 -Wall # -g
+CFLAGS	= -I./src -I./userial -O2 -Wall $(RPM_OPT_FLAGS) # -g
 
 OBJS		=	src/digitemp.o src/device_name.o src/ds2438.o
 HDRS		= 	src/digitemp.h src/device_name.h


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/digitemp/F-10/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	10 Jun 2007 09:17:36 -0000	1.2
+++ .cvsignore	25 Jan 2009 20:16:59 -0000	1.3
@@ -1 +1 @@
-digitemp-3.5.0.tar.gz
+digitemp-3.6.0.tar.gz


Index: digitemp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/digitemp/F-10/digitemp.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- digitemp.spec	10 Feb 2008 00:31:50 -0000	1.3
+++ digitemp.spec	25 Jan 2009 20:16:59 -0000	1.4
@@ -2,15 +2,15 @@
 
 Summary:           Dallas Semiconductor 1-wire device reading console application
 Name:              digitemp
-Version:           3.5.0
-Release:           3%{?dist}
+Version:           3.6.0
+Release:           1%{?dist}
 License:           GPLv2+
 Group:             Applications/System
 URL:               http://www.digitemp.com/
 Source0:           http://www.digitemp.com/software/linux/%{name}-%{version}.tar.gz
 Source1:           dthowto.txt
 Source2:           DS9097_Schematic.gif
-Patch0:            digitemp-3.5.0-cflags.patch
+Patch0:            digitemp-3.6.0-cflags.patch
 %if %{with_libusb}
 BuildRequires:     libusb-devel
 %endif
@@ -28,7 +28,7 @@
 %prep
 %setup -q
 %patch0 -p1 -b .cflags
-cp -f %{SOURCE1} %{SOURCE2} .
+cp -pf %{SOURCE1} %{SOURCE2} .
 
 %build
 make ds9097 %{?_smp_mflags}
@@ -44,9 +44,11 @@
 %if %{with_libusb}
 install -m 755 digitemp_DS2490 $RPM_BUILD_ROOT%{_bindir}
 %endif
+install -p -m 644 %{name}.1 $RPM_BUILD_ROOT%{_mandir}/man1/%{name}.1
 
-iconv -f iso-8859-1 -t utf-8 -o digitemp.1.utf8 digitemp.1
-install -m 644 digitemp.1.utf8 $RPM_BUILD_ROOT%{_mandir}/man1/%{name}.1
+# Convert everything to UTF-8
+iconv -f iso-8859-1 -t utf-8 -o ChangeLog.utf8 ChangeLog
+touch -c -r ChangeLog ChangeLog.utf8; mv -f ChangeLog.utf8 ChangeLog
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -59,6 +61,9 @@
 %{_mandir}/man1/%{name}.*
 
 %changelog
+* Sun Jan 25 2009 Robert Scheck <robert at fedoraproject.org> 3.6.0-1
+- Upgrade to 3.6.0
+
 * Sun Feb 10 2008 Robert Scheck <robert at fedoraproject.org> 3.5.0-3
 - Rebuilt against gcc 4.3
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/digitemp/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	10 Jun 2007 09:17:36 -0000	1.2
+++ sources	25 Jan 2009 20:16:59 -0000	1.3
@@ -1 +1 @@
-72bda9c8a66b017aa969c19dedb3225b  digitemp-3.5.0.tar.gz
+9be2e48db37920f21925ae6e88f83b84  digitemp-3.6.0.tar.gz


--- digitemp-3.5.0-cflags.patch DELETED ---



From robert at fedoraproject.org  Sun Jan 25 20:17:30 2009
From: robert at fedoraproject.org (Robert Scheck)
Date: Sun, 25 Jan 2009 20:17:30 +0000 (UTC)
Subject: rpms/digitemp/F-9 digitemp-3.6.0-cflags.patch, NONE, 1.1 .cvsignore,
	1.2, 1.3 digitemp.spec, 1.3, 1.4 sources, 1.2,
	1.3 digitemp-3.5.0-cflags.patch, 1.1, NONE
Message-ID: <20090125201730.61A5E70133@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/pkgs/rpms/digitemp/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32613/F-9

Modified Files:
	.cvsignore digitemp.spec sources 
Added Files:
	digitemp-3.6.0-cflags.patch 
Removed Files:
	digitemp-3.5.0-cflags.patch 
Log Message:
Upgrade to 3.6.0


digitemp-3.6.0-cflags.patch:

--- NEW FILE digitemp-3.6.0-cflags.patch ---
Patch by Robert Scheck <robert at fedoraproject.org> for digitemp >= 3.6.0,
which forces the use of $RPM_OPT_FLAGS to have a usable -debuginfo package.

--- digitemp-3.6.0/Makefile		2008-08-28 23:37:00.000000000 +0200
+++ digitemp-3.6.0/Makefile.cflags	2009-01-25 20:49:03.000000000 +0100
@@ -12,7 +12,7 @@
 VERSION = 3.6.0
 
 CC	= gcc
-CFLAGS	= -I./src -I./userial -O2 -Wall # -g
+CFLAGS	= -I./src -I./userial -O2 -Wall $(RPM_OPT_FLAGS) # -g
 
 OBJS		=	src/digitemp.o src/device_name.o src/ds2438.o
 HDRS		= 	src/digitemp.h src/device_name.h


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/digitemp/F-9/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	10 Jun 2007 09:17:36 -0000	1.2
+++ .cvsignore	25 Jan 2009 20:17:00 -0000	1.3
@@ -1 +1 @@
-digitemp-3.5.0.tar.gz
+digitemp-3.6.0.tar.gz


Index: digitemp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/digitemp/F-9/digitemp.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- digitemp.spec	10 Feb 2008 00:31:50 -0000	1.3
+++ digitemp.spec	25 Jan 2009 20:17:00 -0000	1.4
@@ -2,15 +2,15 @@
 
 Summary:           Dallas Semiconductor 1-wire device reading console application
 Name:              digitemp
-Version:           3.5.0
-Release:           3%{?dist}
+Version:           3.6.0
+Release:           1%{?dist}
 License:           GPLv2+
 Group:             Applications/System
 URL:               http://www.digitemp.com/
 Source0:           http://www.digitemp.com/software/linux/%{name}-%{version}.tar.gz
 Source1:           dthowto.txt
 Source2:           DS9097_Schematic.gif
-Patch0:            digitemp-3.5.0-cflags.patch
+Patch0:            digitemp-3.6.0-cflags.patch
 %if %{with_libusb}
 BuildRequires:     libusb-devel
 %endif
@@ -28,7 +28,7 @@
 %prep
 %setup -q
 %patch0 -p1 -b .cflags
-cp -f %{SOURCE1} %{SOURCE2} .
+cp -pf %{SOURCE1} %{SOURCE2} .
 
 %build
 make ds9097 %{?_smp_mflags}
@@ -44,9 +44,11 @@
 %if %{with_libusb}
 install -m 755 digitemp_DS2490 $RPM_BUILD_ROOT%{_bindir}
 %endif
+install -p -m 644 %{name}.1 $RPM_BUILD_ROOT%{_mandir}/man1/%{name}.1
 
-iconv -f iso-8859-1 -t utf-8 -o digitemp.1.utf8 digitemp.1
-install -m 644 digitemp.1.utf8 $RPM_BUILD_ROOT%{_mandir}/man1/%{name}.1
+# Convert everything to UTF-8
+iconv -f iso-8859-1 -t utf-8 -o ChangeLog.utf8 ChangeLog
+touch -c -r ChangeLog ChangeLog.utf8; mv -f ChangeLog.utf8 ChangeLog
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -59,6 +61,9 @@
 %{_mandir}/man1/%{name}.*
 
 %changelog
+* Sun Jan 25 2009 Robert Scheck <robert at fedoraproject.org> 3.6.0-1
+- Upgrade to 3.6.0
+
 * Sun Feb 10 2008 Robert Scheck <robert at fedoraproject.org> 3.5.0-3
 - Rebuilt against gcc 4.3
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/digitemp/F-9/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	10 Jun 2007 09:17:36 -0000	1.2
+++ sources	25 Jan 2009 20:17:00 -0000	1.3
@@ -1 +1 @@
-72bda9c8a66b017aa969c19dedb3225b  digitemp-3.5.0.tar.gz
+9be2e48db37920f21925ae6e88f83b84  digitemp-3.6.0.tar.gz


--- digitemp-3.5.0-cflags.patch DELETED ---



From robert at fedoraproject.org  Sun Jan 25 20:17:30 2009
From: robert at fedoraproject.org (Robert Scheck)
Date: Sun, 25 Jan 2009 20:17:30 +0000 (UTC)
Subject: rpms/digitemp/devel digitemp-3.6.0-cflags.patch, NONE,
	1.1 .cvsignore, 1.2, 1.3 digitemp.spec, 1.3, 1.4 sources, 1.2,
	1.3 digitemp-3.5.0-cflags.patch, 1.1, NONE
Message-ID: <20090125201730.9CE3E70133@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/pkgs/rpms/digitemp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32613/devel

Modified Files:
	.cvsignore digitemp.spec sources 
Added Files:
	digitemp-3.6.0-cflags.patch 
Removed Files:
	digitemp-3.5.0-cflags.patch 
Log Message:
Upgrade to 3.6.0


digitemp-3.6.0-cflags.patch:

--- NEW FILE digitemp-3.6.0-cflags.patch ---
Patch by Robert Scheck <robert at fedoraproject.org> for digitemp >= 3.6.0,
which forces the use of $RPM_OPT_FLAGS to have a usable -debuginfo package.

--- digitemp-3.6.0/Makefile		2008-08-28 23:37:00.000000000 +0200
+++ digitemp-3.6.0/Makefile.cflags	2009-01-25 20:49:03.000000000 +0100
@@ -12,7 +12,7 @@
 VERSION = 3.6.0
 
 CC	= gcc
-CFLAGS	= -I./src -I./userial -O2 -Wall # -g
+CFLAGS	= -I./src -I./userial -O2 -Wall $(RPM_OPT_FLAGS) # -g
 
 OBJS		=	src/digitemp.o src/device_name.o src/ds2438.o
 HDRS		= 	src/digitemp.h src/device_name.h


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/digitemp/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	10 Jun 2007 09:17:36 -0000	1.2
+++ .cvsignore	25 Jan 2009 20:17:00 -0000	1.3
@@ -1 +1 @@
-digitemp-3.5.0.tar.gz
+digitemp-3.6.0.tar.gz


Index: digitemp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/digitemp/devel/digitemp.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- digitemp.spec	10 Feb 2008 00:31:50 -0000	1.3
+++ digitemp.spec	25 Jan 2009 20:17:00 -0000	1.4
@@ -2,15 +2,15 @@
 
 Summary:           Dallas Semiconductor 1-wire device reading console application
 Name:              digitemp
-Version:           3.5.0
-Release:           3%{?dist}
+Version:           3.6.0
+Release:           1%{?dist}
 License:           GPLv2+
 Group:             Applications/System
 URL:               http://www.digitemp.com/
 Source0:           http://www.digitemp.com/software/linux/%{name}-%{version}.tar.gz
 Source1:           dthowto.txt
 Source2:           DS9097_Schematic.gif
-Patch0:            digitemp-3.5.0-cflags.patch
+Patch0:            digitemp-3.6.0-cflags.patch
 %if %{with_libusb}
 BuildRequires:     libusb-devel
 %endif
@@ -28,7 +28,7 @@
 %prep
 %setup -q
 %patch0 -p1 -b .cflags
-cp -f %{SOURCE1} %{SOURCE2} .
+cp -pf %{SOURCE1} %{SOURCE2} .
 
 %build
 make ds9097 %{?_smp_mflags}
@@ -44,9 +44,11 @@
 %if %{with_libusb}
 install -m 755 digitemp_DS2490 $RPM_BUILD_ROOT%{_bindir}
 %endif
+install -p -m 644 %{name}.1 $RPM_BUILD_ROOT%{_mandir}/man1/%{name}.1
 
-iconv -f iso-8859-1 -t utf-8 -o digitemp.1.utf8 digitemp.1
-install -m 644 digitemp.1.utf8 $RPM_BUILD_ROOT%{_mandir}/man1/%{name}.1
+# Convert everything to UTF-8
+iconv -f iso-8859-1 -t utf-8 -o ChangeLog.utf8 ChangeLog
+touch -c -r ChangeLog ChangeLog.utf8; mv -f ChangeLog.utf8 ChangeLog
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -59,6 +61,9 @@
 %{_mandir}/man1/%{name}.*
 
 %changelog
+* Sun Jan 25 2009 Robert Scheck <robert at fedoraproject.org> 3.6.0-1
+- Upgrade to 3.6.0
+
 * Sun Feb 10 2008 Robert Scheck <robert at fedoraproject.org> 3.5.0-3
 - Rebuilt against gcc 4.3
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/digitemp/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	10 Jun 2007 09:17:36 -0000	1.2
+++ sources	25 Jan 2009 20:17:00 -0000	1.3
@@ -1 +1 @@
-72bda9c8a66b017aa969c19dedb3225b  digitemp-3.5.0.tar.gz
+9be2e48db37920f21925ae6e88f83b84  digitemp-3.6.0.tar.gz


--- digitemp-3.5.0-cflags.patch DELETED ---



From jwrdegoede at fedoraproject.org  Sun Jan 25 20:19:39 2009
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Sun, 25 Jan 2009 20:19:39 +0000 (UTC)
Subject: rpms/supertuxkart/devel .cvsignore, 1.5, 1.6 sources, 1.5,
	1.6 supertuxkart-0.3-default-fs.patch, 1.2,
	1.3 supertuxkart-0.3-desktop.patch, 1.4,
	1.5 supertuxkart-fhs.patch, 1.3, 1.4 supertuxkart.spec, 1.10,
	1.11 supertuxkart-images-legal.txt, 1.2, NONE
Message-ID: <20090125201939.AE83F70141@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/supertuxkart/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv696

Modified Files:
	.cvsignore sources supertuxkart-0.3-default-fs.patch 
	supertuxkart-0.3-desktop.patch supertuxkart-fhs.patch 
	supertuxkart.spec 
Removed Files:
	supertuxkart-images-legal.txt 
Log Message:
* Sun Jan 25 2009 Hans de Goede <hdegoede at redhat.com> 0.6-1
- New upstream release 0.6



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/supertuxkart/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	9 Jun 2008 18:24:14 -0000	1.5
+++ .cvsignore	25 Jan 2009 20:19:08 -0000	1.6
@@ -1,2 +1 @@
-supertuxkart-0.5.tar.bz2
-supertuxkart-alt-images.tar.gz
+supertuxkart-0.6-src.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/supertuxkart/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	9 Jun 2008 18:24:14 -0000	1.5
+++ sources	25 Jan 2009 20:19:08 -0000	1.6
@@ -1,2 +1 @@
-5e11b2dd8ed3aa3ebe65294da6a42942  supertuxkart-0.5.tar.bz2
-d08eab1c9abd427a24486e84ce58a674  supertuxkart-alt-images.tar.gz
+4b6bd4cc415424423282f491ecdffcc4  supertuxkart-0.6-src.tar.bz2

supertuxkart-0.3-default-fs.patch:

Index: supertuxkart-0.3-default-fs.patch
===================================================================
RCS file: /cvs/extras/rpms/supertuxkart/devel/supertuxkart-0.3-default-fs.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- supertuxkart-0.3-default-fs.patch	10 Mar 2008 22:02:46 -0000	1.2
+++ supertuxkart-0.3-default-fs.patch	25 Jan 2009 20:19:08 -0000	1.3
@@ -1,12 +1,12 @@
-diff -up supertuxkart-0.4/src/user_config.cpp.fs supertuxkart-0.4/src/user_config.cpp
---- supertuxkart-0.4/src/user_config.cpp.fs	2008-03-05 05:16:12.000000000 +0100
-+++ supertuxkart-0.4/src/user_config.cpp	2008-03-10 09:52:53.000000000 +0100
-@@ -117,7 +117,7 @@ void UserConfig::setDefaults()
-     m_keyboard_debug   = false;
-     m_track_debug      = 0;
-     m_bullet_debug     = false;
--    m_fullscreen       = false;
-+    m_fullscreen       = true;
-     m_no_start_screen  = false;
-     m_sfx              = UC_ENABLE;
-     m_music            = UC_ENABLE;
+diff -up supertuxkart-0.6/src/user_config.cpp~ supertuxkart-0.6/src/user_config.cpp
+--- supertuxkart-0.6/src/user_config.cpp~	2009-01-25 16:10:22.000000000 +0100
++++ supertuxkart-0.6/src/user_config.cpp	2009-01-25 16:10:22.000000000 +0100
+@@ -95,7 +95,7 @@ void UserConfig::setDefaults()
+     m_gamepad_debug     = false;
+     m_track_debug       = 0;
+     m_bullet_debug      = false;
+-    m_fullscreen        = false;
++    m_fullscreen        = true;
+     m_no_start_screen   = false;
+     m_sfx               = UC_ENABLE;
+     m_music             = UC_ENABLE;

supertuxkart-0.3-desktop.patch:

Index: supertuxkart-0.3-desktop.patch
===================================================================
RCS file: /cvs/extras/rpms/supertuxkart/devel/supertuxkart-0.3-desktop.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- supertuxkart-0.3-desktop.patch	9 Jun 2008 18:24:14 -0000	1.4
+++ supertuxkart-0.3-desktop.patch	25 Jan 2009 20:19:08 -0000	1.5
@@ -1,6 +1,8 @@
---- supertuxkart-0.4/data/supertuxkart_desktop.template	2008-03-05 23:45:56.000000000 +0100
-+++ supertuxkart-0.4/data/supertuxkart_desktop.template	2008-03-10 09:50:51.000000000 +0100
-@@ -1,15 +1,12 @@
+diff -up supertuxkart-0.6/data/supertuxkart_desktop.template~ supertuxkart-0.6/data/supertuxkart_desktop.template
+--- supertuxkart-0.6/data/supertuxkart_desktop.template~	2009-01-25 16:08:25.000000000 +0100
++++ supertuxkart-0.6/data/supertuxkart_desktop.template	2009-01-25 16:08:25.000000000 +0100
+@@ -1,17 +1,12 @@
+-
  [Desktop Entry]
 -Encoding=UTF-8
  Name=Supertuxkart
@@ -18,4 +20,5 @@
  Type=Application
 -TryExec=PREFIX/games/supertuxkart
 -Categories=Game;ArcadeGame
+-GenericName=
 +Categories=Game;ActionGame;SportsGame;

supertuxkart-fhs.patch:

Index: supertuxkart-fhs.patch
===================================================================
RCS file: /cvs/extras/rpms/supertuxkart/devel/supertuxkart-fhs.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- supertuxkart-fhs.patch	8 Sep 2008 14:27:40 -0000	1.3
+++ supertuxkart-fhs.patch	25 Jan 2009 20:19:08 -0000	1.4
@@ -1,24 +1,24 @@
-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@
+diff -up supertuxkart-0.6/src/Makefile.am.fhs supertuxkart-0.6/src/Makefile.am
+--- supertuxkart-0.6/src/Makefile.am.fhs	2009-01-20 00:47:29.000000000 +0100
++++ supertuxkart-0.6/src/Makefile.am	2009-01-25 16:00:40.000000000 +0100
+@@ -5,7 +5,7 @@ SUBDIRS = ide
+ bindir=$(prefix)/games
+ bin_PROGRAMS = supertuxkart
  
--AM_CPPFLAGS=-DSUPERTUXKART_DATADIR="\"$(datadir)/games/@PACKAGE@/\""
-+AM_CPPFLAGS=-DSUPERTUXKART_DATADIR="\"$(datadir)/@PACKAGE@/\""
+-AM_CPPFLAGS = -DSUPERTUXKART_DATADIR="\"$(datadir)/games/$(PACKAGE)/\""  \
++AM_CPPFLAGS = -DSUPERTUXKART_DATADIR="\"$(datadir)/$(PACKAGE)/\""  \
+  -I$(srcdir)/bullet/src/ -I$(srcdir)/enet/include/
  
- 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           	\
+ supertuxkart_SOURCES = \
+diff -up supertuxkart-0.6/src/Makefile.in.fhs supertuxkart-0.6/src/Makefile.in
+--- supertuxkart-0.6/src/Makefile.in.fhs	2009-01-21 23:13:59.000000000 +0100
++++ supertuxkart-0.6/src/Makefile.in	2009-01-25 16:00:59.000000000 +0100
+@@ -269,7 +269,7 @@ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+ SUBDIRS = ide
+-AM_CPPFLAGS = -DSUPERTUXKART_DATADIR="\"$(datadir)/games/$(PACKAGE)/\""  \
++AM_CPPFLAGS = -DSUPERTUXKART_DATADIR="\"$(datadir)/$(PACKAGE)/\""  \
+  -I$(srcdir)/bullet/src/ -I$(srcdir)/enet/include/
+ 
+ supertuxkart_SOURCES = \


Index: supertuxkart.spec
===================================================================
RCS file: /cvs/extras/rpms/supertuxkart/devel/supertuxkart.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- supertuxkart.spec	8 Sep 2008 14:27:40 -0000	1.10
+++ supertuxkart.spec	25 Jan 2009 20:19:08 -0000	1.11
@@ -1,14 +1,12 @@
 Name:           supertuxkart
-Version:        0.5
-Release:        2%{?dist}
+Version:        0.6
+Release:        1%{?dist}
 Summary:        Kids 3D go-kart racing game featuring Tux
 Group:          Amusements/Games
 License:        GPLv2+
 URL:            http://supertuxkart.sourceforge.net/
-Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
-Source1:        %{name}-alt-images.tar.gz
-Source2:        %{name}-images-legal.txt
-Source3:        %{name}.6
+Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}-src.tar.bz2
+Source1:        %{name}.6
 Patch0:         supertuxkart-fhs.patch
 Patch1:         supertuxkart-0.3-desktop.patch
 Patch2:         supertuxkart-0.3-default-fs.patch
@@ -29,13 +27,14 @@
 
 
 %prep
-%setup -q -a 1
+%setup -q
 %patch0 -p1 -z .fhs
 %patch1 -p1 -z .desktop
 %patch2 -p1 -z .fs
-cp -a %{SOURCE2} .
-chmod -x AUTHORS COPYING ChangeLog README TODO src/robots/default_robot.* \
-  src/sdldrv.cpp
+# some cleanups
+chmod -x AUTHORS COPYING ChangeLog README TODO
+chmod -x `find -name "*.cpp" -o -name "*.hpp"`
+rm -fr data/karts/*/.svn data/karts/.svn
 # stop automake from rerunning because of our patches above
 touch src/Makefile.in
 
@@ -52,6 +51,12 @@
 mkdir -p $RPM_BUILD_ROOT%{_bindir}
 mv $RPM_BUILD_ROOT%{_prefix}/games/%{name} $RPM_BUILD_ROOT%{_bindir}
 mv $RPM_BUILD_ROOT%{_datadir}/games/%{name} $RPM_BUILD_ROOT%{_datadir}
+mv $RPM_BUILD_ROOT%{_datadir}/%{name}/data/po $RPM_BUILD_ROOT%{_datadir}/locale
+rm $RPM_BUILD_ROOT%{_datadir}/locale/*.po
+rm $RPM_BUILD_ROOT%{_datadir}/locale/%{name}.pot
+ln -s ../../locale $RPM_BUILD_ROOT%{_datadir}/%{name}/data/po
+
+%find_lang %{name}
 
 ln -s opengl-game-wrapper.sh $RPM_BUILD_ROOT%{_bindir}/%{name}-wrapper
 
@@ -69,7 +74,7 @@
 
 # add the manpage (courtesy of Debian)
 mkdir -p $RPM_BUILD_ROOT%{_mandir}/man6
-install -m 644 %{SOURCE3} $RPM_BUILD_ROOT%{_mandir}/man6
+install -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_mandir}/man6
 
 # remove the installed docs (we include them through %doc)
 rm -r $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}
@@ -92,10 +97,9 @@
 fi
 
 
-%files
+%files -f %{name}.lang
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING ChangeLog README TODO %{name}-images-legal.txt
-%doc doc/players_manual
+%doc AUTHORS COPYING ChangeLog README TODO
 %{_bindir}/%{name}*
 %{_datadir}/%{name}
 %{_mandir}/man6/%{name}.6.gz
@@ -104,6 +108,9 @@
 
 
 %changelog
+* Sun Jan 25 2009 Hans de Goede <hdegoede at redhat.com> 0.6-1
+- New upstream release 0.6
+
 * Sun Sep  7 2008 Hans de Goede <hdegoede at redhat.com> 0.5-2
 - Fix patch fuzz build failure
 


--- supertuxkart-images-legal.txt DELETED ---



From than at fedoraproject.org  Sun Jan 25 20:39:49 2009
From: than at fedoraproject.org (Than Ngo)
Date: Sun, 25 Jan 2009 20:39:49 +0000 (UTC)
Subject: rpms/kde-l10n/devel kde-l10n.spec,1.66,1.67
Message-ID: <20090125203949.52BB070133@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kde-l10n/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4223

Modified Files:
	kde-l10n.spec 
Log Message:
fix rpm file list



Index: kde-l10n.spec
===================================================================
RCS file: /cvs/extras/rpms/kde-l10n/devel/kde-l10n.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- kde-l10n.spec	25 Jan 2009 08:11:14 -0000	1.66
+++ kde-l10n.spec	25 Jan 2009 20:39:18 -0000	1.67
@@ -1230,12 +1230,7 @@
 %lang(sr) %{_kde4_iconsdir}/*/*/*/*/*/*/sr/*
 %lang(sr) %{_kde4_appsdir}/desktoptheme/*/widgets/l10n/sr
 %lang(sr) %{_kde4_appsdir}/desktoptheme/*/widgets/l10n/sr at latin
-%lang(sr) %{_kde4_appsdir}/katepart/syntax/logohighlightstyle.sr*
 %lang(sr) %{_kde4_appsdir}/khangman/sr at latin.txt
-%lang(sr) %{_kde4_appsdir}/ksplash/Themes/*/*/l10n/sr
-%lang(sr) %{_kde4_appsdir}/ksplash/Themes/*/*/l10n/sr at latin
-%lang(sr) %{_kde4_appsdir}/kturtle/examples/sr
-%lang(sr) %{_kde4_appsdir}/kturtle/examples/sr at latin
 %lang(sr) %{_kde4_appsdir}/kvtml/sr*
 %lang(sr) %{_datadir}/locale/sr at latin/*
 



From pgordon at fedoraproject.org  Sun Jan 25 20:42:37 2009
From: pgordon at fedoraproject.org (Peter Gordon)
Date: Sun, 25 Jan 2009 20:42:37 +0000 (UTC)
Subject: rpms/deluge/devel .cvsignore, 1.51, 1.52 deluge.spec, 1.80,
	1.81 sources, 1.51, 1.52
Message-ID: <20090125204237.E428E70133@cvs1.fedora.phx.redhat.com>

Author: pgordon

Update of /cvs/pkgs/rpms/deluge/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4763

Modified Files:
	.cvsignore deluge.spec sources 
Log Message:
Update to 1.1.1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/deluge/devel/.cvsignore,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- .cvsignore	12 Jan 2009 06:15:45 -0000	1.51
+++ .cvsignore	25 Jan 2009 20:42:07 -0000	1.52
@@ -1 +1 @@
-deluge-1.1.0.tar.bz2
+deluge-1.1.1.tar.bz2


Index: deluge.spec
===================================================================
RCS file: /cvs/pkgs/rpms/deluge/devel/deluge.spec,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- deluge.spec	12 Jan 2009 06:15:45 -0000	1.80
+++ deluge.spec	25 Jan 2009 20:42:07 -0000	1.81
@@ -6,7 +6,7 @@
 %define	min_rblibtorrent_ver	0.14.1
 
 Name:		deluge
-Version:	1.1.0
+Version:	1.1.1
 Release:	1%{?dist}
 Summary:	A GTK+ BitTorrent client with support for DHT, UPnP, and PEX
 Group:		Applications/Internet
@@ -144,6 +144,9 @@
 
 
 %changelog
+* Sun Jan 25 2009 Peter Gordon <peter at thecodergeek.com> - 1.1.1-1
+- Update to new upstream bug-fix release (1.1.1)
+
 * Sun Jan 11 2009 Peter Gordon <peter at thecodergeek.com> - 1.1.0-1
 - Update to new upstream release (1.1.0 Final - yay!)
 - Drop the get_tracker_host patch (fixed upstream):


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/deluge/devel/sources,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- sources	12 Jan 2009 06:15:45 -0000	1.51
+++ sources	25 Jan 2009 20:42:07 -0000	1.52
@@ -1 +1 @@
-c315f7d793d55e36f4e6d22c974be8ee  deluge-1.1.0.tar.bz2
+67eb31364d9ca13e14f92c4c24215735  deluge-1.1.1.tar.bz2



From musuruan at fedoraproject.org  Sun Jan 25 21:01:03 2009
From: musuruan at fedoraproject.org (Andrea Musuruane)
Date: Sun, 25 Jan 2009 21:01:03 +0000 (UTC)
Subject: rpms/hatari/F-10 .cvsignore, 1.6, 1.7 hatari.spec, 1.10,
	1.11 sources, 1.6, 1.7 hatari-1.0.0-hmsa_rpmopt.patch, 1.1, NONE
Message-ID: <20090125210103.2915670133@cvs1.fedora.phx.redhat.com>

Author: musuruan

Update of /cvs/pkgs/rpms/hatari/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8195

Modified Files:
	.cvsignore hatari.spec sources 
Removed Files:
	hatari-1.0.0-hmsa_rpmopt.patch 
Log Message:
* Sat Jan 24 2009 Andrea Musuruane <musuruan at gmail.com> 1.2.0-1
- updated to upstream 1.2.0
- dropped no longer needed hmsa tool patch
- updated upstream URL
- updated Source0 URL



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hatari/F-10/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	30 Nov 2008 11:32:26 -0000	1.6
+++ .cvsignore	25 Jan 2009 21:00:32 -0000	1.7
@@ -1 +1 @@
-hatari-1.1.0.tar.bz2
+hatari-1.2.0.tar.bz2


Index: hatari.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hatari/F-10/hatari.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- hatari.spec	30 Nov 2008 11:32:26 -0000	1.10
+++ hatari.spec	25 Jan 2009 21:00:32 -0000	1.11
@@ -1,16 +1,15 @@
 Summary: An Atari ST emulator suitable for playing games
 Name: hatari
-Version: 1.1.0
+Version: 1.2.0
 Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/Emulators
-URL: http://hatari.sourceforge.net/
+URL: http://hatari.berlios.de/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Source0: http://dl.sf.net/%{name}/%{name}-%{version}.tar.bz2
+Source0: http://prdownload.berlios.de/%{name}/%{name}-%{version}.tar.bz2
 Source1: hatari.png
 Source2: hatari.desktop
 Source3: hatari-README.tos
-Patch0: hatari-1.0.0-hmsa_rpmopt.patch
 BuildRequires: SDL-devel >= 1.2.0
 BuildRequires: zlib-devel
 BuildRequires: desktop-file-utils
@@ -35,7 +34,6 @@
 
 %prep
 %setup -q
-%patch0 -p1
 
 cp -p %{SOURCE3} README.tos
 
@@ -99,6 +97,7 @@
 %files
 %defattr(-,root,root)
 %{_bindir}/hatari
+%{_bindir}/zip2st
 %{_bindir}/hmsa
 %{_datadir}/hatari
 %{_mandir}/man1/hatari.1*
@@ -111,6 +110,12 @@
 
 
 %changelog
+* Sat Jan 24 2009 Andrea Musuruane <musuruan at gmail.com> 1.2.0-1
+- updated to upstream 1.2.0
+- dropped no longer needed hmsa tool patch
+- updated upstream URL
+- updated Source0 URL
+
 * Sat Nov 29 2008 Andrea Musuruane <musuruan at gmail.com> 1.1.0-1
 - updated to upstream 1.1.0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hatari/F-10/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	30 Nov 2008 11:32:26 -0000	1.6
+++ sources	25 Jan 2009 21:00:32 -0000	1.7
@@ -1 +1 @@
-e782830f4d82dccb017159b302fd8b62  hatari-1.1.0.tar.bz2
+4aecd42784fae8c5e8c9a9a341146fbb  hatari-1.2.0.tar.bz2


--- hatari-1.0.0-hmsa_rpmopt.patch DELETED ---



From musuruan at fedoraproject.org  Sun Jan 25 21:12:11 2009
From: musuruan at fedoraproject.org (Andrea Musuruane)
Date: Sun, 25 Jan 2009 21:12:11 +0000 (UTC)
Subject: rpms/hatari/F-9 .cvsignore, 1.6, 1.7 hatari.spec, 1.10, 1.11 sources,
	1.6, 1.7 hatari-1.0.0-hmsa_rpmopt.patch, 1.1, NONE
Message-ID: <20090125211211.650DF70133@cvs1.fedora.phx.redhat.com>

Author: musuruan

Update of /cvs/pkgs/rpms/hatari/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9947

Modified Files:
	.cvsignore hatari.spec sources 
Removed Files:
	hatari-1.0.0-hmsa_rpmopt.patch 
Log Message:
* Sat Jan 24 2009 Andrea Musuruane <musuruan at gmail.com> 1.2.0-1
- updated to upstream 1.2.0
- dropped no longer needed hmsa tool patch
- updated upstream URL
- updated Source0 URL



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hatari/F-9/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	30 Nov 2008 11:36:05 -0000	1.6
+++ .cvsignore	25 Jan 2009 21:11:40 -0000	1.7
@@ -1 +1 @@
-hatari-1.1.0.tar.bz2
+hatari-1.2.0.tar.bz2


Index: hatari.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hatari/F-9/hatari.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- hatari.spec	30 Nov 2008 11:36:05 -0000	1.10
+++ hatari.spec	25 Jan 2009 21:11:40 -0000	1.11
@@ -1,16 +1,15 @@
 Summary: An Atari ST emulator suitable for playing games
 Name: hatari
-Version: 1.1.0
+Version: 1.2.0
 Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/Emulators
-URL: http://hatari.sourceforge.net/
+URL: http://hatari.berlios.de/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Source0: http://dl.sf.net/%{name}/%{name}-%{version}.tar.bz2
+Source0: http://prdownload.berlios.de/%{name}/%{name}-%{version}.tar.bz2
 Source1: hatari.png
 Source2: hatari.desktop
 Source3: hatari-README.tos
-Patch0: hatari-1.0.0-hmsa_rpmopt.patch
 BuildRequires: SDL-devel >= 1.2.0
 BuildRequires: zlib-devel
 BuildRequires: desktop-file-utils
@@ -35,7 +34,6 @@
 
 %prep
 %setup -q
-%patch0 -p1
 
 cp -p %{SOURCE3} README.tos
 
@@ -99,6 +97,7 @@
 %files
 %defattr(-,root,root)
 %{_bindir}/hatari
+%{_bindir}/zip2st
 %{_bindir}/hmsa
 %{_datadir}/hatari
 %{_mandir}/man1/hatari.1*
@@ -111,6 +110,12 @@
 
 
 %changelog
+* Sat Jan 24 2009 Andrea Musuruane <musuruan at gmail.com> 1.2.0-1
+- updated to upstream 1.2.0
+- dropped no longer needed hmsa tool patch
+- updated upstream URL
+- updated Source0 URL
+
 * Sat Nov 29 2008 Andrea Musuruane <musuruan at gmail.com> 1.1.0-1
 - updated to upstream 1.1.0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hatari/F-9/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	30 Nov 2008 11:36:06 -0000	1.6
+++ sources	25 Jan 2009 21:11:40 -0000	1.7
@@ -1 +1 @@
-e782830f4d82dccb017159b302fd8b62  hatari-1.1.0.tar.bz2
+4aecd42784fae8c5e8c9a9a341146fbb  hatari-1.2.0.tar.bz2


--- hatari-1.0.0-hmsa_rpmopt.patch DELETED ---



From robert at fedoraproject.org  Sun Jan 25 21:31:56 2009
From: robert at fedoraproject.org (Robert Scheck)
Date: Sun, 25 Jan 2009 21:31:56 +0000 (UTC)
Subject: rpms/libnids/devel libnids.spec,1.6,1.7
Message-ID: <20090125213156.EECD070133@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/pkgs/rpms/libnids/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13084

Modified Files:
	libnids.spec 
Log Message:
Work around outdated config.* by upstream and missing Makefile.am...



Index: libnids.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libnids/devel/libnids.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- libnids.spec	23 May 2008 21:35:45 -0000	1.6
+++ libnids.spec	25 Jan 2009 21:31:26 -0000	1.7
@@ -7,7 +7,7 @@
 URL:		http://libnids.sourceforge.net/
 Source:		http://downloads.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.gz
 BuildRequires:	libnet-devel, glib2-devel, %{_includedir}/pcap.h, pkgconfig
-BuildRequires:	libtool
+BuildRequires:	libtool, automake
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -32,6 +32,9 @@
 %setup -q
 libtoolize --force
 
+# Needed for ppc64, automake can't be run here
+cp -f %{_datadir}/automake-*/config.* .
+
 %build
 %configure --enable-shared
 make %{?_smp_mflags}



From robert at fedoraproject.org  Sun Jan 25 21:44:52 2009
From: robert at fedoraproject.org (Robert Scheck)
Date: Sun, 25 Jan 2009 21:44:52 +0000 (UTC)
Subject: rpms/perl-ccom/devel perl-ccom.spec,1.3,1.4
Message-ID: <20090125214452.539EB70133@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/pkgs/rpms/perl-ccom/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15206

Modified Files:
	perl-ccom.spec 
Log Message:
Cosmetic changes



Index: perl-ccom.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-ccom/devel/perl-ccom.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- perl-ccom.spec	7 Mar 2008 02:21:56 -0000	1.3
+++ perl-ccom.spec	25 Jan 2009 21:44:21 -0000	1.4
@@ -30,8 +30,8 @@
 make %{?_smp_mflags}
 
 # Change man page encoding into UTF-8
-iconv -f latin1 -t utf-8 -o blib/man3/ccom.3pm.new blib/man3/ccom.3pm
-mv -f blib/man3/ccom.3pm.new blib/man3/ccom.3pm
+iconv -f latin1 -t utf-8 -o blib/man3/ccom.3pm.utf8 blib/man3/ccom.3pm
+mv -f blib/man3/ccom.3pm.utf8 blib/man3/ccom.3pm
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -64,8 +64,8 @@
 %{perl_vendorarch}/*.pm
 
 %changelog
-* Thu Mar 06 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1.4.1-2
-Rebuild for new perl
+* Thu Mar 06 2008 Tom "spot" Callaway <tcallawa at redhat.com> 1.4.1-2
+- Rebuild for new perl
 
 * Thu Jan 31 2008 Robert Scheck <robert at fedoraproject.org> 1.4.1-1
 - Upgrade to 1.4.1



From than at fedoraproject.org  Sun Jan 25 23:02:59 2009
From: than at fedoraproject.org (Than Ngo)
Date: Sun, 25 Jan 2009 23:02:59 +0000 (UTC)
Subject: rpms/kde-l10n/devel kde-l10n.spec,1.67,1.68
Message-ID: <20090125230259.B61EB70133@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kde-l10n/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28450

Modified Files:
	kde-l10n.spec 
Log Message:
fix file list



Index: kde-l10n.spec
===================================================================
RCS file: /cvs/extras/rpms/kde-l10n/devel/kde-l10n.spec,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- kde-l10n.spec	25 Jan 2009 20:39:18 -0000	1.67
+++ kde-l10n.spec	25 Jan 2009 23:02:28 -0000	1.68
@@ -886,6 +886,7 @@
 %lang(ca) %{_kde4_appsdir}/kvtml/ca
 %lang(ca) %{_kde4_appsdir}/kvtml/latinCatalan*
 %lang(ca) %{_kde4_docdir}/HTML/ca
+%lang(ca) %{_mandir}/ca/*/*
 
 %files Czech
 %defattr(-,root,root)
@@ -909,6 +910,7 @@
 %lang(da) %{_kde4_appsdir}/klettres/da
 %lang(da) %{_kde4_appsdir}/kvtml/da
 %lang(da) %{_kde4_docdir}/HTML/da
+%lang(da) %{_mandir}/da/*/*
 
 %files German
 %defattr(-,root,root)
@@ -919,6 +921,7 @@
 %lang(de) %{_kde4_appsdir}/kvtml/de
 %lang(de) %{_kde4_appsdir}/step/objinfo/l10n/de/
 %lang(de) %{_kde4_docdir}/HTML/de
+%lang(de) %{_mandir}/de/*/*
 
 %files Greek
 %defattr(-,root,root)
@@ -947,6 +950,7 @@
 %lang(es) %{_kde4_appsdir}/klettres/es
 %lang(es) %{_kde4_appsdir}/kvtml/es
 %lang(es) %{_kde4_docdir}/HTML/es
+%lang(es) %{_mandir}/es/*/*
 
 %files Estonian
 %defattr(-,root,root)
@@ -954,6 +958,7 @@
 %lang(et) %{_kde4_appsdir}/khangman/et.txt
 %lang(et) %{_kde4_appsdir}/kvtml/et
 %lang(et) %{_kde4_docdir}/HTML/et
+%lang(et) %{_mandir}/et/*/*
 
 %files Basque
 %defattr(-,root,root)
@@ -985,6 +990,7 @@
 %lang(fr) %{_kde4_appsdir}/khangman/fr.txt
 %lang(fr) %{_kde4_appsdir}/kvtml/fr
 %lang(fr) %{_kde4_docdir}/HTML/fr
+%lang(fr) %{_mandir}/fr/*/*
 
 %if %{buildall}
 %files Frisian
@@ -1005,6 +1011,7 @@
 %lang(gl) %{_kde4_appsdir}/ktuberling/sounds/gl.soundtheme
 %lang(gl) %{_kde4_appsdir}/ktuberling/sounds/gl/
 %lang(gl) %{_kde4_docdir}/HTML/gl
+%lang(gl) %{_mandir}/gl/*/*
 
 %if %{buildall}
 %files Hebrew
@@ -1050,6 +1057,8 @@
 %lang(it) %{_kde4_appsdir}/klettres/it
 %lang(it) %{_kde4_appsdir}/kvtml/it
 %lang(it) %{_kde4_docdir}/HTML/it
+%lang(it) %{_kde4_appsdir}/step/objinfo/l10n/it/
+%lang(it) %{_mandir}/it/*/*
 
 %files Japanese
 %defattr(-,root,root)
@@ -1115,6 +1124,7 @@
 %files Malayalam
 %defattr(-,root,root)
 %lang(ml) %{_datadir}/locale/ml/*
+%lang(ml) %{_kde4_appsdir}/klettres/ml/
 
 %if %{buildall}
 %files Maltese
@@ -1135,6 +1145,7 @@
 %lang(nl) %{_kde4_appsdir}/klettres/nl
 %lang(nl) %{_kde4_appsdir}/kvtml/nl
 %lang(nl) %{_kde4_docdir}/HTML/nl
+%lang(nl) %{_mandir}/nl/*/*
 
 %if %{buildall}
 %files NorthernSami
@@ -1149,6 +1160,7 @@
 %lang(nb) %{_kde4_appsdir}/kvtml/nb/
 %lang(nb) %{_kde4_docdir}/HTML/nb/
 %lang(nb) %{_kde4_appsdir}/klettres/nb
+%lang(nb) %{_mandir}/nb/*/*
 
 %files Norwegian-Nynorsk
 %defattr(-,root,root)
@@ -1156,6 +1168,7 @@
 %lang(nn) %{_kde4_appsdir}/khangman/nn.txt
 %lang(nn) %{_kde4_appsdir}/kvtml/nn/
 %lang(nn) %{_kde4_docdir}/HTML/nn
+%lang(nn) %{_mandir}/nn/*/*
 
 %if %{buildall}
 %files Occitan
@@ -1181,6 +1194,7 @@
 %lang(pt) %{_kde4_appsdir}/ktuberling/sounds/pt*
 %lang(pt) %{_kde4_appsdir}/kvtml/pt
 %lang(pt) %{_kde4_docdir}/HTML/pt
+%lang(pt) %{_mandir}/pt/*/*
 
 %files Brazil
 %defattr(-,root,root)
@@ -1189,6 +1203,7 @@
 %lang(pt_BR) %{_kde4_appsdir}/klettres/pt_BR/*
 %lang(pt_BR) %{_kde4_appsdir}/kvtml/pt_BR
 %lang(pt_BR) %{_kde4_docdir}/HTML/pt_BR
+%lang(pt_BR) %{_mandir}/pt_BR/*/*
 
 %if %{buildall}
 %files Romanian
@@ -1202,6 +1217,7 @@
 %lang(ru) %{_datadir}/locale/ru/*
 %lang(ru) %{_kde4_appsdir}/kvtml/ru
 %lang(ru) %{_kde4_docdir}/HTML/ru
+%lang(ru) %{_mandir}/ru/*/*
 
 %if %{buildall}
 %files Slovak
@@ -1241,6 +1257,7 @@
 %lang(sv) %{_kde4_appsdir}/khangman/sv.txt
 %lang(sv) %{_kde4_appsdir}/kvtml/sv
 %lang(sv) %{_kde4_docdir}/HTML/sv
+%lang(sv) %{_mandir}/sv/*/*
 
 %if %{buildall}
 %files Tamil
@@ -1271,6 +1288,7 @@
 %lang(uk) %{_kde4_appsdir}/ktuberling/sounds/uk*
 %lang(uk) %{_kde4_appsdir}/kvtml/uk
 %lang(uk) %{_kde4_docdir}/HTML/uk
+%lang(uk) %{_mandir}/uk/*/*
 
 %if %{buildall}
 %files Venda
@@ -1299,6 +1317,8 @@
 %defattr(-,root,root)
 %lang(zh_CN) %{_datadir}/locale/zh_CN/*
 %lang(zh_CN) %{_kde4_appsdir}/kvtml/zh_CN
+%lang(zh_CN) %{_kde4_docdir}/HTML/gwenview/
+%lang(zh_CN) %{_kde4_appsdir}/step/objinfo/l10n/zh_CN/
 
 %files Chinese-Traditional
 %defattr(-,root,root)



From cweyl at fedoraproject.org  Sun Jan 25 23:06:40 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Sun, 25 Jan 2009 23:06:40 +0000 (UTC)
Subject: rpms/perl-Catalyst-Manual/devel .cvsignore, 1.4,
	1.5 perl-Catalyst-Manual.spec, 1.8, 1.9 sources, 1.5, 1.6
Message-ID: <20090125230640.2278770133@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Catalyst-Manual/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29232

Modified Files:
	.cvsignore perl-Catalyst-Manual.spec sources 
Log Message:
* Sun Jan 25 2009 Chris Weyl <cweyl at alumni.drew.edu> 5.7016-1
- update to 5.7016



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Catalyst-Manual/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	8 Nov 2008 21:30:49 -0000	1.4
+++ .cvsignore	25 Jan 2009 23:06:09 -0000	1.5
@@ -1 +1 @@
-Catalyst-Manual-5.7014.tar.gz
+Catalyst-Manual-5.7016.tar.gz


Index: perl-Catalyst-Manual.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Catalyst-Manual/devel/perl-Catalyst-Manual.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- perl-Catalyst-Manual.spec	8 Nov 2008 21:30:49 -0000	1.8
+++ perl-Catalyst-Manual.spec	25 Jan 2009 23:06:09 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           perl-Catalyst-Manual
 Epoch:          1
-Version:        5.7014
+Version:        5.7016
 Release:        1%{?dist}
 Summary:        Catalyst web framework manual
 License:        GPL+ or Artistic
@@ -53,6 +53,9 @@
 %exclude %{_mandir}/man3/Catalyst::Manual.3*
 
 %changelog
+* Sun Jan 25 2009 Chris Weyl <cweyl at alumni.drew.edu> 5.7016-1
+- update to 5.7016
+
 * Sat Nov 08 2008 Chris Weyl <cweyl at alumni.drew.edu> 5.7014-1
 - update to 5.7014
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Catalyst-Manual/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	8 Nov 2008 21:30:49 -0000	1.5
+++ sources	25 Jan 2009 23:06:09 -0000	1.6
@@ -1 +1 @@
-f683006f85c0d69fc0058ea0cc718856  Catalyst-Manual-5.7014.tar.gz
+7645455d158e362b1d34dc8e678bbed1  Catalyst-Manual-5.7016.tar.gz



From cweyl at fedoraproject.org  Sun Jan 25 23:07:13 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Sun, 25 Jan 2009 23:07:13 +0000 (UTC)
Subject: rpms/perl-Catalyst-Manual/F-10 perl-Catalyst-Manual.spec, 1.8,
	1.9 sources, 1.5, 1.6
Message-ID: <20090125230713.BFB8870133@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Catalyst-Manual/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29353

Modified Files:
	perl-Catalyst-Manual.spec sources 
Log Message:
* Sun Jan 25 2009 Chris Weyl <cweyl at alumni.drew.edu> 5.7016-1
- update to 5.7016



Index: perl-Catalyst-Manual.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Catalyst-Manual/F-10/perl-Catalyst-Manual.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- perl-Catalyst-Manual.spec	8 Nov 2008 21:35:41 -0000	1.8
+++ perl-Catalyst-Manual.spec	25 Jan 2009 23:06:43 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           perl-Catalyst-Manual
 Epoch:          1
-Version:        5.7014
+Version:        5.7016
 Release:        1%{?dist}
 Summary:        Catalyst web framework manual
 License:        GPL+ or Artistic
@@ -53,6 +53,9 @@
 %exclude %{_mandir}/man3/Catalyst::Manual.3*
 
 %changelog
+* Sun Jan 25 2009 Chris Weyl <cweyl at alumni.drew.edu> 5.7016-1
+- update to 5.7016
+
 * Sat Nov 08 2008 Chris Weyl <cweyl at alumni.drew.edu> 5.7014-1
 - update to 5.7014
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Catalyst-Manual/F-10/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	8 Nov 2008 21:35:41 -0000	1.5
+++ sources	25 Jan 2009 23:06:43 -0000	1.6
@@ -1 +1 @@
-f683006f85c0d69fc0058ea0cc718856  Catalyst-Manual-5.7014.tar.gz
+7645455d158e362b1d34dc8e678bbed1  Catalyst-Manual-5.7016.tar.gz



From cweyl at fedoraproject.org  Sun Jan 25 23:07:33 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Sun, 25 Jan 2009 23:07:33 +0000 (UTC)
Subject: rpms/perl-Catalyst-Manual/F-9 perl-Catalyst-Manual.spec, 1.7,
	1.8 sources, 1.5, 1.6
Message-ID: <20090125230733.6B9D970133@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Catalyst-Manual/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29511

Modified Files:
	perl-Catalyst-Manual.spec sources 
Log Message:
* Sun Jan 25 2009 Chris Weyl <cweyl at alumni.drew.edu> 5.7016-1
- update to 5.7016



Index: perl-Catalyst-Manual.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Catalyst-Manual/F-9/perl-Catalyst-Manual.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- perl-Catalyst-Manual.spec	8 Nov 2008 21:40:47 -0000	1.7
+++ perl-Catalyst-Manual.spec	25 Jan 2009 23:07:03 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           perl-Catalyst-Manual
 Epoch:          1
-Version:        5.7014
+Version:        5.7016
 Release:        1%{?dist}
 Summary:        Catalyst web framework manual
 License:        GPL+ or Artistic
@@ -53,6 +53,9 @@
 %exclude %{_mandir}/man3/Catalyst::Manual.3*
 
 %changelog
+* Sun Jan 25 2009 Chris Weyl <cweyl at alumni.drew.edu> 5.7016-1
+- update to 5.7016
+
 * Sat Nov 08 2008 Chris Weyl <cweyl at alumni.drew.edu> 5.7014-1
 - update to 5.7014
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Catalyst-Manual/F-9/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	8 Nov 2008 21:40:47 -0000	1.5
+++ sources	25 Jan 2009 23:07:03 -0000	1.6
@@ -1 +1 @@
-f683006f85c0d69fc0058ea0cc718856  Catalyst-Manual-5.7014.tar.gz
+7645455d158e362b1d34dc8e678bbed1  Catalyst-Manual-5.7016.tar.gz



From jamatos at fedoraproject.org  Sun Jan 25 23:07:52 2009
From: jamatos at fedoraproject.org (=?utf-8?q?Jos=C3=A9_Ab=C3=ADlio_Oliveira_Matos?=)
Date: Sun, 25 Jan 2009 23:07:52 +0000 (UTC)
Subject: rpms/grace/EL-5 grace.spec,1.18,1.19
Message-ID: <20090125230752.5A93670133@cvs1.fedora.phx.redhat.com>

Author: jamatos

Update of /cvs/pkgs/rpms/grace/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29606

Modified Files:
	grace.spec 
Log Message:
* Sun Jan 25 2009 Jos?? Matos <jamatos at fc.up.pt> - 5.1.22-2
- Fix patch level used.



Index: grace.spec
===================================================================
RCS file: /cvs/pkgs/rpms/grace/EL-5/grace.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- grace.spec	23 Jan 2009 19:36:02 -0000	1.18
+++ grace.spec	25 Jan 2009 23:07:22 -0000	1.19
@@ -3,7 +3,7 @@
 
 Name:           grace
 Version:        5.1.22
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Numerical Data Processing and Visualization Tool
 
 License:        GPLv2+
@@ -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,9 @@
 
 
 %changelog
+* Sun Jan 25 2009 Jos?? Matos <jamatos at fc.up.pt> - 5.1.22-2
+- Fix patch level used.
+
 * Fri Jan 23 2009 Jos?? Matos <jamatos at fc.up.pt> - 5.1.22-1
 - Upstream release (bug fixes).
 



From cweyl at fedoraproject.org  Sun Jan 25 23:11:34 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Sun, 25 Jan 2009 23:11:34 +0000 (UTC)
Subject: rpms/perl-Catalyst-Plugin-Authentication/devel .cvsignore, 1.4,
	1.5 perl-Catalyst-Plugin-Authentication.spec, 1.4, 1.5 sources,
	1.4, 1.5
Message-ID: <20090125231134.8C36970133@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-serv30508

Modified Files:
	.cvsignore perl-Catalyst-Plugin-Authentication.spec sources 
Log Message:
* Sun Jan 25 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.100092-1
- update to 0.100092



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Catalyst-Plugin-Authentication/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	27 Oct 2008 00:37:51 -0000	1.4
+++ .cvsignore	25 Jan 2009 23:11:04 -0000	1.5
@@ -1 +1 @@
-Catalyst-Plugin-Authentication-0.10008.tar.gz
+Catalyst-Plugin-Authentication-0.100092.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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-Catalyst-Plugin-Authentication.spec	27 Oct 2008 00:37:51 -0000	1.4
+++ perl-Catalyst-Plugin-Authentication.spec	25 Jan 2009 23:11:04 -0000	1.5
@@ -1,11 +1,12 @@
 Name:           perl-Catalyst-Plugin-Authentication
-Version:        0.10008
+Version:        0.100092
 Release:        1%{?dist}
 Summary:        Infrastructure plugin for the Catalyst authentication framework
 License:        GPL+ or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/Catalyst-Plugin-Authentication/
-Source0:        http://www.cpan.org/authors/id/J/JA/JAYK/Catalyst-Plugin-Authentication-%{version}.tar.gz
+Source0:        http://www.cpan.org/authors/id/B/BO/BOBTFISH/Catalyst-Plugin-Authentication-%{version}.tar.gz
+#Source0:        http://www.cpan.org/authors/id/J/JA/JAYK/Catalyst-Plugin-Authentication-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
@@ -83,6 +84,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Sun Jan 25 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.100092-1
+- update to 0.100092
+
 * Sun Oct 26 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.10008-1
 - update to 0.10008
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Catalyst-Plugin-Authentication/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	27 Oct 2008 00:37:51 -0000	1.4
+++ sources	25 Jan 2009 23:11:04 -0000	1.5
@@ -1 +1 @@
-ebf3708c964281f723006461bbd81f6a  Catalyst-Plugin-Authentication-0.10008.tar.gz
+2af45dacf12b9ff9d8825431cb2b81de  Catalyst-Plugin-Authentication-0.100092.tar.gz



From cweyl at fedoraproject.org  Sun Jan 25 23:13:11 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Sun, 25 Jan 2009 23:13:11 +0000 (UTC)
Subject: rpms/perl-Catalyst-Plugin-Authentication/F-10
	perl-Catalyst-Plugin-Authentication.spec, 1.4, 1.5 sources, 1.4, 1.5
Message-ID: <20090125231311.AA3FD70133@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Catalyst-Plugin-Authentication/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30946

Modified Files:
	perl-Catalyst-Plugin-Authentication.spec sources 
Log Message:
* Sun Jan 25 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.100092-1
- update to 0.100092



Index: perl-Catalyst-Plugin-Authentication.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Catalyst-Plugin-Authentication/F-10/perl-Catalyst-Plugin-Authentication.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-Catalyst-Plugin-Authentication.spec	27 Oct 2008 00:37:51 -0000	1.4
+++ perl-Catalyst-Plugin-Authentication.spec	25 Jan 2009 23:12:41 -0000	1.5
@@ -1,11 +1,12 @@
 Name:           perl-Catalyst-Plugin-Authentication
-Version:        0.10008
+Version:        0.100092
 Release:        1%{?dist}
 Summary:        Infrastructure plugin for the Catalyst authentication framework
 License:        GPL+ or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/Catalyst-Plugin-Authentication/
-Source0:        http://www.cpan.org/authors/id/J/JA/JAYK/Catalyst-Plugin-Authentication-%{version}.tar.gz
+Source0:        http://www.cpan.org/authors/id/B/BO/BOBTFISH/Catalyst-Plugin-Authentication-%{version}.tar.gz
+#Source0:        http://www.cpan.org/authors/id/J/JA/JAYK/Catalyst-Plugin-Authentication-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
@@ -83,6 +84,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Sun Jan 25 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.100092-1
+- update to 0.100092
+
 * Sun Oct 26 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.10008-1
 - update to 0.10008
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Catalyst-Plugin-Authentication/F-10/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	27 Oct 2008 00:37:51 -0000	1.4
+++ sources	25 Jan 2009 23:12:41 -0000	1.5
@@ -1 +1 @@
-ebf3708c964281f723006461bbd81f6a  Catalyst-Plugin-Authentication-0.10008.tar.gz
+2af45dacf12b9ff9d8825431cb2b81de  Catalyst-Plugin-Authentication-0.100092.tar.gz



From cweyl at fedoraproject.org  Sun Jan 25 23:13:36 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Sun, 25 Jan 2009 23:13:36 +0000 (UTC)
Subject: rpms/perl-Catalyst-Plugin-Authentication/F-9
	perl-Catalyst-Plugin-Authentication.spec, 1.3, 1.4 sources, 1.4, 1.5
Message-ID: <20090125231336.F163470133@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-serv31082

Modified Files:
	perl-Catalyst-Plugin-Authentication.spec sources 
Log Message:
* Sun Jan 25 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.100092-1
- update to 0.100092



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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- perl-Catalyst-Plugin-Authentication.spec	27 Oct 2008 00:42:45 -0000	1.3
+++ perl-Catalyst-Plugin-Authentication.spec	25 Jan 2009 23:13:06 -0000	1.4
@@ -1,11 +1,12 @@
 Name:           perl-Catalyst-Plugin-Authentication
-Version:        0.10008
+Version:        0.100092
 Release:        1%{?dist}
 Summary:        Infrastructure plugin for the Catalyst authentication framework
 License:        GPL+ or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/Catalyst-Plugin-Authentication/
-Source0:        http://www.cpan.org/authors/id/J/JA/JAYK/Catalyst-Plugin-Authentication-%{version}.tar.gz
+Source0:        http://www.cpan.org/authors/id/B/BO/BOBTFISH/Catalyst-Plugin-Authentication-%{version}.tar.gz
+#Source0:        http://www.cpan.org/authors/id/J/JA/JAYK/Catalyst-Plugin-Authentication-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
@@ -83,6 +84,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Sun Jan 25 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.100092-1
+- update to 0.100092
+
 * Sun Oct 26 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.10008-1
 - update to 0.10008
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Catalyst-Plugin-Authentication/F-9/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	27 Oct 2008 00:42:45 -0000	1.4
+++ sources	25 Jan 2009 23:13:06 -0000	1.5
@@ -1 +1 @@
-ebf3708c964281f723006461bbd81f6a  Catalyst-Plugin-Authentication-0.10008.tar.gz
+2af45dacf12b9ff9d8825431cb2b81de  Catalyst-Plugin-Authentication-0.100092.tar.gz



From cweyl at fedoraproject.org  Sun Jan 25 23:17:08 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Sun, 25 Jan 2009 23:17:08 +0000 (UTC)
Subject: rpms/perl-Catalyst-Plugin-ConfigLoader/devel .cvsignore, 1.4,
	1.5 perl-Catalyst-Plugin-ConfigLoader.spec, 1.6, 1.7 sources, 1.4, 1.5
Message-ID: <20090125231708.D98F570133@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-serv31940

Modified Files:
	.cvsignore perl-Catalyst-Plugin-ConfigLoader.spec sources 
Log Message:
* Sun Jan 25 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.22-1
- update to 0.22
- add br on MRO::Compat



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Catalyst-Plugin-ConfigLoader/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	26 Sep 2008 05:10:01 -0000	1.4
+++ .cvsignore	25 Jan 2009 23:16:38 -0000	1.5
@@ -1 +1 @@
-Catalyst-Plugin-ConfigLoader-0.21.tar.gz
+Catalyst-Plugin-ConfigLoader-0.22.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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- perl-Catalyst-Plugin-ConfigLoader.spec	2 Oct 2008 05:01:19 -0000	1.6
+++ perl-Catalyst-Plugin-ConfigLoader.spec	25 Jan 2009 23:16:38 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           perl-Catalyst-Plugin-ConfigLoader
-Version:        0.21
-Release:        2%{?dist}
+Version:        0.22
+Release:        1%{?dist}
 Summary:        Load config files of various types
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -17,6 +17,7 @@
 BuildRequires:  perl(Catalyst)
 BuildRequires:  perl(Config::Any) >= 0.04
 BuildRequires:  perl(Data::Visitor) >= 0.02
+BuildRequires:  perl(MRO::Compat) >= 0.09
 # test 
 BuildRequires:  perl(Test::Pod), perl(Test::Pod::Coverage)
 
@@ -56,6 +57,10 @@
 %{_mandir}/man3/*
 
 %changelog
+* Sun Jan 25 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.22-1
+- update to 0.22
+- add br on MRO::Compat
+
 * Wed Oct 01 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.21-2
 - drop _with_network_tests bit
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Catalyst-Plugin-ConfigLoader/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	26 Sep 2008 05:10:01 -0000	1.4
+++ sources	25 Jan 2009 23:16:38 -0000	1.5
@@ -1 +1 @@
-64f68d04c8ae102a1e424324e02f1fb0  Catalyst-Plugin-ConfigLoader-0.21.tar.gz
+add762f2be35c9da2b6a61b4bc367588  Catalyst-Plugin-ConfigLoader-0.22.tar.gz



From cweyl at fedoraproject.org  Sun Jan 25 23:18:08 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Sun, 25 Jan 2009 23:18:08 +0000 (UTC)
Subject: rpms/perl-Catalyst-Plugin-ConfigLoader/F-10
	perl-Catalyst-Plugin-ConfigLoader.spec, 1.6, 1.7 sources, 1.4, 1.5
Message-ID: <20090125231808.ED7E370133@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Catalyst-Plugin-ConfigLoader/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32253

Modified Files:
	perl-Catalyst-Plugin-ConfigLoader.spec sources 
Log Message:
* Sun Jan 25 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.22-1
- update to 0.22
- add br on MRO::Compat



Index: perl-Catalyst-Plugin-ConfigLoader.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Catalyst-Plugin-ConfigLoader/F-10/perl-Catalyst-Plugin-ConfigLoader.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- perl-Catalyst-Plugin-ConfigLoader.spec	2 Oct 2008 05:01:19 -0000	1.6
+++ perl-Catalyst-Plugin-ConfigLoader.spec	25 Jan 2009 23:17:38 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           perl-Catalyst-Plugin-ConfigLoader
-Version:        0.21
-Release:        2%{?dist}
+Version:        0.22
+Release:        1%{?dist}
 Summary:        Load config files of various types
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -17,6 +17,7 @@
 BuildRequires:  perl(Catalyst)
 BuildRequires:  perl(Config::Any) >= 0.04
 BuildRequires:  perl(Data::Visitor) >= 0.02
+BuildRequires:  perl(MRO::Compat) >= 0.09
 # test 
 BuildRequires:  perl(Test::Pod), perl(Test::Pod::Coverage)
 
@@ -56,6 +57,10 @@
 %{_mandir}/man3/*
 
 %changelog
+* Sun Jan 25 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.22-1
+- update to 0.22
+- add br on MRO::Compat
+
 * Wed Oct 01 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.21-2
 - drop _with_network_tests bit
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Catalyst-Plugin-ConfigLoader/F-10/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	26 Sep 2008 05:10:01 -0000	1.4
+++ sources	25 Jan 2009 23:17:38 -0000	1.5
@@ -1 +1 @@
-64f68d04c8ae102a1e424324e02f1fb0  Catalyst-Plugin-ConfigLoader-0.21.tar.gz
+add762f2be35c9da2b6a61b4bc367588  Catalyst-Plugin-ConfigLoader-0.22.tar.gz



From cweyl at fedoraproject.org  Sun Jan 25 23:20:30 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Sun, 25 Jan 2009 23:20:30 +0000 (UTC)
Subject: rpms/perl-Catalyst-Plugin-ConfigLoader/F-9
	perl-Catalyst-Plugin-ConfigLoader.spec, 1.5, 1.6 sources, 1.4, 1.5
Message-ID: <20090125232030.B02C170133@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-serv32739

Modified Files:
	perl-Catalyst-Plugin-ConfigLoader.spec sources 
Log Message:
* Sun Jan 25 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.22-1
- update to 0.22
- add br on MRO::Compat



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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perl-Catalyst-Plugin-ConfigLoader.spec	26 Sep 2008 05:11:14 -0000	1.5
+++ perl-Catalyst-Plugin-ConfigLoader.spec	25 Jan 2009 23:20:00 -0000	1.6
@@ -1,5 +1,5 @@
 Name:           perl-Catalyst-Plugin-ConfigLoader
-Version:        0.21
+Version:        0.22
 Release:        1%{?dist}
 Summary:        Load config files of various types
 License:        GPL+ or Artistic
@@ -17,6 +17,7 @@
 BuildRequires:  perl(Catalyst)
 BuildRequires:  perl(Config::Any) >= 0.04
 BuildRequires:  perl(Data::Visitor) >= 0.02
+BuildRequires:  perl(MRO::Compat) >= 0.09
 # test 
 BuildRequires:  perl(Test::Pod), perl(Test::Pod::Coverage)
 
@@ -44,10 +45,7 @@
 %{_fixperms} %{buildroot}/*
 
 %check
-# avoid test that will fail in mock (needs local network access)
-%{?!_with_network_tests: mv t/10-live_auto.t .}
 make test
-%{?!_with_network_tests: mv 10-live_auto.t t/ }
 
 %clean
 rm -rf %{buildroot}
@@ -59,6 +57,13 @@
 %{_mandir}/man3/*
 
 %changelog
+* Sun Jan 25 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.22-1
+- update to 0.22
+- add br on MRO::Compat
+
+* Wed Oct 01 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.21-2
+- drop _with_network_tests bit
+
 * Thu Sep 25 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.21-1
 - update to 0.21
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Catalyst-Plugin-ConfigLoader/F-9/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	26 Sep 2008 05:11:14 -0000	1.4
+++ sources	25 Jan 2009 23:20:00 -0000	1.5
@@ -1 +1 @@
-64f68d04c8ae102a1e424324e02f1fb0  Catalyst-Plugin-ConfigLoader-0.21.tar.gz
+add762f2be35c9da2b6a61b4bc367588  Catalyst-Plugin-ConfigLoader-0.22.tar.gz



From cweyl at fedoraproject.org  Sun Jan 25 23:30:39 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Sun, 25 Jan 2009 23:30:39 +0000 (UTC)
Subject: rpms/perl-Catalyst-Runtime/devel .cvsignore, 1.5,
	1.6 perl-Catalyst-Runtime.spec, 1.9, 1.10 sources, 1.5, 1.6
Message-ID: <20090125233039.7816870133@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Catalyst-Runtime/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3072

Modified Files:
	.cvsignore perl-Catalyst-Runtime.spec sources 
Log Message:
* Sun Jan 25 2009 Chris Weyl <cweyl at alumni.drew.edu> 5.71000-1
- update to 5.71000



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Catalyst-Runtime/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	23 Oct 2008 14:23:24 -0000	1.5
+++ .cvsignore	25 Jan 2009 23:30:09 -0000	1.6
@@ -1 +1 @@
-Catalyst-Runtime-5.7015.tar.gz
+Catalyst-Runtime-5.71000.tar.gz


Index: perl-Catalyst-Runtime.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Catalyst-Runtime/devel/perl-Catalyst-Runtime.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- perl-Catalyst-Runtime.spec	23 Oct 2008 14:23:24 -0000	1.9
+++ perl-Catalyst-Runtime.spec	25 Jan 2009 23:30:09 -0000	1.10
@@ -1,5 +1,5 @@
 Name:           perl-Catalyst-Runtime
-Version:        5.7015
+Version:        5.71000
 Release:        1%{?dist}
 Summary:        Catalyst core modules
 License:        GPL+ or Artistic
@@ -20,22 +20,22 @@
 BuildRequires:  perl(CGI::Simple::Cookie)
 BuildRequires:  perl(Class::Accessor::Fast)
 BuildRequires:  perl(Class::Data::Inheritable)
-BuildRequires:  perl(Class::Inspector) >= 1.06
+BuildRequires:  perl(Class::Inspector)      >= 1.06
 BuildRequires:  perl(Data::Dump)
 BuildRequires:  perl(File::Modified)
 BuildRequires:  perl(HTML::Entities)
-BuildRequires:  perl(HTTP::Body) >= 0.9
-BuildRequires:  perl(HTTP::Headers) >= 1.64
+BuildRequires:  perl(HTTP::Body)            >= 1.04 
+BuildRequires:  perl(HTTP::Headers)         >= 1.64
 BuildRequires:  perl(HTTP::Request)
-BuildRequires:  perl(HTTP::Request::AsCGI) >= 0.5
+BuildRequires:  perl(HTTP::Request::AsCGI)  >= 0.5
 BuildRequires:  perl(HTTP::Response)
 BuildRequires:  perl(LWP::UserAgent)
-BuildRequires:  perl(Module::Pluggable) >= 3.01
+BuildRequires:  perl(Module::Pluggable)     >= 3.01
 BuildRequires:  perl(Path::Class) >= 0.09
-BuildRequires:  perl(Text::SimpleTable) >= 0.03
-BuildRequires:  perl(Tree::Simple) >= 1.15
+BuildRequires:  perl(Text::SimpleTable)     >= 0.03
+BuildRequires:  perl(Tree::Simple)          >= 1.15
 BuildRequires:  perl(Tree::Simple::Visitor::FindByPath)
-BuildRequires:  perl(URI) >= 1.35
+BuildRequires:  perl(URI)                   >= 1.35
 # test
 BuildRequires:  perl(Class::C3)
 BuildRequires:  perl(File::Copy::Recursive)
@@ -142,6 +142,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Sun Jan 25 2009 Chris Weyl <cweyl at alumni.drew.edu> 5.71000-1
+- update to 5.71000
+
 * Thu Oct 23 2008 Chris Weyl <cweyl at alumni.drew.edu> 5.7015-1
 - update to 5.7015
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Catalyst-Runtime/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	23 Oct 2008 14:23:24 -0000	1.5
+++ sources	25 Jan 2009 23:30:09 -0000	1.6
@@ -1 +1 @@
-b072cd434585676b075b41ccc9775ee9  Catalyst-Runtime-5.7015.tar.gz
+d92966ae79d5ad3d7768809acd4886ea  Catalyst-Runtime-5.71000.tar.gz



From cweyl at fedoraproject.org  Sun Jan 25 23:35:24 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Sun, 25 Jan 2009 23:35:24 +0000 (UTC)
Subject: rpms/perl-Class-C3/devel .cvsignore, 1.5, 1.6 perl-Class-C3.spec,
	1.8, 1.9 sources, 1.6, 1.7
Message-ID: <20090125233524.8A81370133@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Class-C3/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4017

Modified Files:
	.cvsignore perl-Class-C3.spec sources 
Log Message:
* Sun Jan 25 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.20-1
- update to 0.20



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-C3/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	1 Jun 2007 20:42:27 -0000	1.5
+++ .cvsignore	25 Jan 2009 23:34:54 -0000	1.6
@@ -1 +1,4 @@
-Class-C3-0.18.tar.gz
+Class-C3-0.20.tar.gz
+*.gz
+*.log
+*.rpm


Index: perl-Class-C3.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-C3/devel/perl-Class-C3.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- perl-Class-C3.spec	4 Mar 2008 22:52:18 -0000	1.8
+++ perl-Class-C3.spec	25 Jan 2009 23:34:54 -0000	1.9
@@ -1,11 +1,12 @@
 Name:           perl-Class-C3
-Version:        0.19
-Release:        2%{?dist}
+Version:        0.20
+Release:        1%{?dist}
 Summary:        Pragma to use the C3 method resolution order algorithm
 License:        GPL+ or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/Class-C3/
-Source0:        http://www.cpan.org/authors/id/B/BL/BLBLACK/Class-C3-%{version}.tar.gz
+Source0:        http://www.cpan.org/authors/id/F/FL/FLORA/Class-C3-%{version}.tar.gz
+#Source0:        http://www.cpan.org/authors/id/B/BL/BLBLACK/Class-C3-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
@@ -23,6 +24,7 @@
 BuildRequires:  perl(Test::Exception) >= 0.15
 # testing...
 BuildRequires:  perl(Test::Pod), perl(Test::Pod::Coverage)
+BuildRequires:  perl(Class::C3)
 BuildRequires:  perl(Sub::Name)
 
 # missed!
@@ -74,6 +76,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Sun Jan 25 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.20-1
+- update to 0.20
+
 * Tue Mar  4 2008 Tom "spot" Callaway <tcallawa at redhat.com> 0.19-2
 - rebuild for new perl
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-C3/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	24 Oct 2007 06:33:49 -0000	1.6
+++ sources	25 Jan 2009 23:34:54 -0000	1.7
@@ -1 +1 @@
-bb3779da9c9786043ba2e0d9357b5078  Class-C3-0.19.tar.gz
+dcb30979cedeb252438179a6e478ea5a  Class-C3-0.20.tar.gz



From cweyl at fedoraproject.org  Sun Jan 25 23:35:50 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Sun, 25 Jan 2009 23:35:50 +0000 (UTC)
Subject: rpms/perl-Class-C3/F-10 perl-Class-C3.spec,1.8,1.9 sources,1.6,1.7
Message-ID: <20090125233550.2110E70133@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Class-C3/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4166

Modified Files:
	perl-Class-C3.spec sources 
Log Message:
* Sun Jan 25 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.20-1
- update to 0.20



Index: perl-Class-C3.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-C3/F-10/perl-Class-C3.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- perl-Class-C3.spec	4 Mar 2008 22:52:18 -0000	1.8
+++ perl-Class-C3.spec	25 Jan 2009 23:35:19 -0000	1.9
@@ -1,11 +1,12 @@
 Name:           perl-Class-C3
-Version:        0.19
-Release:        2%{?dist}
+Version:        0.20
+Release:        1%{?dist}
 Summary:        Pragma to use the C3 method resolution order algorithm
 License:        GPL+ or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/Class-C3/
-Source0:        http://www.cpan.org/authors/id/B/BL/BLBLACK/Class-C3-%{version}.tar.gz
+Source0:        http://www.cpan.org/authors/id/F/FL/FLORA/Class-C3-%{version}.tar.gz
+#Source0:        http://www.cpan.org/authors/id/B/BL/BLBLACK/Class-C3-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
@@ -23,6 +24,7 @@
 BuildRequires:  perl(Test::Exception) >= 0.15
 # testing...
 BuildRequires:  perl(Test::Pod), perl(Test::Pod::Coverage)
+BuildRequires:  perl(Class::C3)
 BuildRequires:  perl(Sub::Name)
 
 # missed!
@@ -74,6 +76,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Sun Jan 25 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.20-1
+- update to 0.20
+
 * Tue Mar  4 2008 Tom "spot" Callaway <tcallawa at redhat.com> 0.19-2
 - rebuild for new perl
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-C3/F-10/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	24 Oct 2007 06:33:49 -0000	1.6
+++ sources	25 Jan 2009 23:35:19 -0000	1.7
@@ -1 +1 @@
-bb3779da9c9786043ba2e0d9357b5078  Class-C3-0.19.tar.gz
+dcb30979cedeb252438179a6e478ea5a  Class-C3-0.20.tar.gz



From cweyl at fedoraproject.org  Sun Jan 25 23:36:09 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Sun, 25 Jan 2009 23:36:09 +0000 (UTC)
Subject: rpms/perl-Class-C3/F-9 perl-Class-C3.spec,1.8,1.9 sources,1.6,1.7
Message-ID: <20090125233609.1E20C70133@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Class-C3/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4364

Modified Files:
	perl-Class-C3.spec sources 
Log Message:
* Sun Jan 25 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.20-1
- update to 0.20



Index: perl-Class-C3.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-C3/F-9/perl-Class-C3.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- perl-Class-C3.spec	4 Mar 2008 22:52:18 -0000	1.8
+++ perl-Class-C3.spec	25 Jan 2009 23:35:38 -0000	1.9
@@ -1,11 +1,12 @@
 Name:           perl-Class-C3
-Version:        0.19
-Release:        2%{?dist}
+Version:        0.20
+Release:        1%{?dist}
 Summary:        Pragma to use the C3 method resolution order algorithm
 License:        GPL+ or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/Class-C3/
-Source0:        http://www.cpan.org/authors/id/B/BL/BLBLACK/Class-C3-%{version}.tar.gz
+Source0:        http://www.cpan.org/authors/id/F/FL/FLORA/Class-C3-%{version}.tar.gz
+#Source0:        http://www.cpan.org/authors/id/B/BL/BLBLACK/Class-C3-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
@@ -23,6 +24,7 @@
 BuildRequires:  perl(Test::Exception) >= 0.15
 # testing...
 BuildRequires:  perl(Test::Pod), perl(Test::Pod::Coverage)
+BuildRequires:  perl(Class::C3)
 BuildRequires:  perl(Sub::Name)
 
 # missed!
@@ -74,6 +76,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Sun Jan 25 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.20-1
+- update to 0.20
+
 * Tue Mar  4 2008 Tom "spot" Callaway <tcallawa at redhat.com> 0.19-2
 - rebuild for new perl
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-C3/F-9/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	24 Oct 2007 06:33:49 -0000	1.6
+++ sources	25 Jan 2009 23:35:38 -0000	1.7
@@ -1 +1 @@
-bb3779da9c9786043ba2e0d9357b5078  Class-C3-0.19.tar.gz
+dcb30979cedeb252438179a6e478ea5a  Class-C3-0.20.tar.gz



From cweyl at fedoraproject.org  Sun Jan 25 23:37:24 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Sun, 25 Jan 2009 23:37:24 +0000 (UTC)
Subject: rpms/perl-CSS-Tiny/F-9 perl-CSS-Tiny.spec,1.4,1.5 sources,1.3,1.4
Message-ID: <20090125233724.8D27A70133@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-CSS-Tiny/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4809

Modified Files:
	perl-CSS-Tiny.spec sources 
Log Message:
* Sun Oct 26 2008 Chris Weyl <cweyl at alumni.drew.edu> 1.15-1
- update to 1.15



Index: perl-CSS-Tiny.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-CSS-Tiny/F-9/perl-CSS-Tiny.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-CSS-Tiny.spec	28 Feb 2008 13:10:45 -0000	1.4
+++ perl-CSS-Tiny.spec	25 Jan 2009 23:36:54 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           perl-CSS-Tiny
-Version:        1.14
-Release:        3%{?dist}
+Version:        1.15
+Release:        1%{?dist}
 Summary:        Read/Write .css files with as little code as possible
 
 Group:          Development/Libraries
@@ -53,6 +53,9 @@
 
 
 %changelog
+* Sun Oct 26 2008 Chris Weyl <cweyl at alumni.drew.edu> 1.15-1
+- update to 1.15
+
 * Wed Feb 27 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1.14-3
 - Rebuild for perl 5.10 (again)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-CSS-Tiny/F-9/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	4 Sep 2006 18:33:20 -0000	1.3
+++ sources	25 Jan 2009 23:36:54 -0000	1.4
@@ -1 +1 @@
-778e4184dcac079b2eb0264c4748c335  CSS-Tiny-1.14.tar.gz
+fb95eca695af24221f34de116a069b73  CSS-Tiny-1.15.tar.gz



From cweyl at fedoraproject.org  Sun Jan 25 23:41:06 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Sun, 25 Jan 2009 23:41:06 +0000 (UTC)
Subject: rpms/perl-CPAN-Mini/devel .cvsignore, 1.2, 1.3 perl-CPAN-Mini.spec, 
	1.2, 1.3 sources, 1.2, 1.3
Message-ID: <20090125234106.6209170133@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-CPAN-Mini/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5719

Modified Files:
	.cvsignore perl-CPAN-Mini.spec sources 
Log Message:
* Sun Jan 25 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.576-1
- update to 0.576



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-CPAN-Mini/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	30 May 2008 19:47:10 -0000	1.2
+++ .cvsignore	25 Jan 2009 23:40:35 -0000	1.3
@@ -1 +1 @@
-CPAN-Mini-0.571.tar.gz
+CPAN-Mini-0.576.tar.gz


Index: perl-CPAN-Mini.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-CPAN-Mini/devel/perl-CPAN-Mini.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-CPAN-Mini.spec	30 May 2008 19:49:00 -0000	1.2
+++ perl-CPAN-Mini.spec	25 Jan 2009 23:40:35 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-CPAN-Mini
-Version:        0.571
-Release:        2%{?dist}
+Version:        0.576
+Release:        1%{?dist}
 Summary:        Create a minimal mirror of CPAN
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -13,6 +13,7 @@
 BuildRequires:  perl(Compress::Zlib) >= 1.20
 BuildRequires:  perl(ExtUtils::MakeMaker)
 BuildRequires:  perl(File::HomeDir) >= 0.57
+BuildRequires:  perl(File::Path) >= 2.04
 BuildRequires:  perl(LWP) >= 5
 BuildRequires:  perl(URI) >= 1
 BuildRequires:  perl(Test::More)
@@ -55,6 +56,9 @@
 %{_mandir}/man[13]/*
 
 %changelog
+* Sun Jan 25 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.576-1
+- update to 0.576
+
 * Fri May 30 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.571-2
 - bump
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-CPAN-Mini/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	30 May 2008 19:47:10 -0000	1.2
+++ sources	25 Jan 2009 23:40:35 -0000	1.3
@@ -1 +1 @@
-0fcaa2f7ee4872c51ae62620ec04f221  CPAN-Mini-0.571.tar.gz
+d351d5d32b1259a8c3037f460f8b22b6  CPAN-Mini-0.576.tar.gz



From cweyl at fedoraproject.org  Sun Jan 25 23:42:30 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Sun, 25 Jan 2009 23:42:30 +0000 (UTC)
Subject: rpms/perl-CPAN-Mini/F-10 perl-CPAN-Mini.spec, 1.2, 1.3 sources, 1.2,
	1.3
Message-ID: <20090125234230.46A5E70133@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-CPAN-Mini/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6192

Modified Files:
	perl-CPAN-Mini.spec sources 
Log Message:
* Sun Jan 25 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.576-1
- update to 0.576



Index: perl-CPAN-Mini.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-CPAN-Mini/F-10/perl-CPAN-Mini.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-CPAN-Mini.spec	30 May 2008 19:49:00 -0000	1.2
+++ perl-CPAN-Mini.spec	25 Jan 2009 23:41:59 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-CPAN-Mini
-Version:        0.571
-Release:        2%{?dist}
+Version:        0.576
+Release:        1%{?dist}
 Summary:        Create a minimal mirror of CPAN
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -13,6 +13,7 @@
 BuildRequires:  perl(Compress::Zlib) >= 1.20
 BuildRequires:  perl(ExtUtils::MakeMaker)
 BuildRequires:  perl(File::HomeDir) >= 0.57
+BuildRequires:  perl(File::Path) >= 2.04
 BuildRequires:  perl(LWP) >= 5
 BuildRequires:  perl(URI) >= 1
 BuildRequires:  perl(Test::More)
@@ -55,6 +56,9 @@
 %{_mandir}/man[13]/*
 
 %changelog
+* Sun Jan 25 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.576-1
+- update to 0.576
+
 * Fri May 30 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.571-2
 - bump
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-CPAN-Mini/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	30 May 2008 19:47:10 -0000	1.2
+++ sources	25 Jan 2009 23:41:59 -0000	1.3
@@ -1 +1 @@
-0fcaa2f7ee4872c51ae62620ec04f221  CPAN-Mini-0.571.tar.gz
+d351d5d32b1259a8c3037f460f8b22b6  CPAN-Mini-0.576.tar.gz



From cweyl at fedoraproject.org  Sun Jan 25 23:42:46 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Sun, 25 Jan 2009 23:42:46 +0000 (UTC)
Subject: rpms/perl-CPAN-Mini/F-9 perl-CPAN-Mini.spec, 1.1, 1.2 sources, 1.2,
	1.3
Message-ID: <20090125234246.E37FE70133@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-CPAN-Mini/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6295

Modified Files:
	perl-CPAN-Mini.spec sources 
Log Message:
* Sun Jan 25 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.576-1
- update to 0.576



Index: perl-CPAN-Mini.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-CPAN-Mini/F-9/perl-CPAN-Mini.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-CPAN-Mini.spec	30 May 2008 19:49:58 -0000	1.1
+++ perl-CPAN-Mini.spec	25 Jan 2009 23:42:16 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-CPAN-Mini
-Version:        0.571
-Release:        2%{?dist}
+Version:        0.576
+Release:        1%{?dist}
 Summary:        Create a minimal mirror of CPAN
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -13,6 +13,7 @@
 BuildRequires:  perl(Compress::Zlib) >= 1.20
 BuildRequires:  perl(ExtUtils::MakeMaker)
 BuildRequires:  perl(File::HomeDir) >= 0.57
+BuildRequires:  perl(File::Path) >= 2.04
 BuildRequires:  perl(LWP) >= 5
 BuildRequires:  perl(URI) >= 1
 BuildRequires:  perl(Test::More)
@@ -55,6 +56,9 @@
 %{_mandir}/man[13]/*
 
 %changelog
+* Sun Jan 25 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.576-1
+- update to 0.576
+
 * Fri May 30 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.571-2
 - bump
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-CPAN-Mini/F-9/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	30 May 2008 19:49:58 -0000	1.2
+++ sources	25 Jan 2009 23:42:16 -0000	1.3
@@ -1 +1 @@
-0fcaa2f7ee4872c51ae62620ec04f221  CPAN-Mini-0.571.tar.gz
+d351d5d32b1259a8c3037f460f8b22b6  CPAN-Mini-0.576.tar.gz



From cweyl at fedoraproject.org  Sun Jan 25 23:46:07 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Sun, 25 Jan 2009 23:46:07 +0000 (UTC)
Subject: rpms/perl-Gtk2-Sexy/devel .cvsignore, 1.4, 1.5 perl-Gtk2-Sexy.spec, 
	1.8, 1.9 sources, 1.4, 1.5
Message-ID: <20090125234607.8AB2D70133@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Gtk2-Sexy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7259

Modified Files:
	.cvsignore perl-Gtk2-Sexy.spec sources 
Log Message:
* Sun Jan 25 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.05-1
- update to 0.05



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Gtk2-Sexy/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	23 Oct 2008 17:32:38 -0000	1.4
+++ .cvsignore	25 Jan 2009 23:45:36 -0000	1.5
@@ -1 +1 @@
-Gtk2-Sexy-0.04.tar.gz
+Gtk2-Sexy-0.05.tar.gz


Index: perl-Gtk2-Sexy.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Gtk2-Sexy/devel/perl-Gtk2-Sexy.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- perl-Gtk2-Sexy.spec	23 Oct 2008 17:32:38 -0000	1.8
+++ perl-Gtk2-Sexy.spec	25 Jan 2009 23:45:36 -0000	1.9
@@ -1,5 +1,5 @@
 Name:           perl-Gtk2-Sexy
-Version:        0.04
+Version:        0.05
 Release:        1%{?dist}
 Summary:        Perl interface to the sexy widget collection 
 
@@ -65,6 +65,9 @@
 
 
 %changelog
+* Sun Jan 25 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.05-1
+- update to 0.05
+
 * Thu Oct 23 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.04-1
 - update to 0.04
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Gtk2-Sexy/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	23 Oct 2008 17:32:38 -0000	1.4
+++ sources	25 Jan 2009 23:45:37 -0000	1.5
@@ -1 +1 @@
-d87b988f52a020cc59a28e892700ce88  Gtk2-Sexy-0.04.tar.gz
+3e291808250d7b956ba8443013a1b461  Gtk2-Sexy-0.05.tar.gz



From cweyl at fedoraproject.org  Sun Jan 25 23:47:48 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Sun, 25 Jan 2009 23:47:48 +0000 (UTC)
Subject: rpms/perl-Gtk2-Sexy/F-10 perl-Gtk2-Sexy.spec, 1.8, 1.9 sources, 1.4,
	1.5
Message-ID: <20090125234748.6FDD270133@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Gtk2-Sexy/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7832

Modified Files:
	perl-Gtk2-Sexy.spec sources 
Log Message:
* Sun Jan 25 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.05-1
- update to 0.05



Index: perl-Gtk2-Sexy.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Gtk2-Sexy/F-10/perl-Gtk2-Sexy.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- perl-Gtk2-Sexy.spec	23 Oct 2008 17:32:38 -0000	1.8
+++ perl-Gtk2-Sexy.spec	25 Jan 2009 23:47:17 -0000	1.9
@@ -1,5 +1,5 @@
 Name:           perl-Gtk2-Sexy
-Version:        0.04
+Version:        0.05
 Release:        1%{?dist}
 Summary:        Perl interface to the sexy widget collection 
 
@@ -65,6 +65,9 @@
 
 
 %changelog
+* Sun Jan 25 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.05-1
+- update to 0.05
+
 * Thu Oct 23 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.04-1
 - update to 0.04
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Gtk2-Sexy/F-10/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	23 Oct 2008 17:32:38 -0000	1.4
+++ sources	25 Jan 2009 23:47:17 -0000	1.5
@@ -1 +1 @@
-d87b988f52a020cc59a28e892700ce88  Gtk2-Sexy-0.04.tar.gz
+3e291808250d7b956ba8443013a1b461  Gtk2-Sexy-0.05.tar.gz



From cweyl at fedoraproject.org  Sun Jan 25 23:48:00 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Sun, 25 Jan 2009 23:48:00 +0000 (UTC)
Subject: rpms/perl-Gtk2-Sexy/F-9 perl-Gtk2-Sexy.spec, 1.7, 1.8 sources, 1.3,
	1.4
Message-ID: <20090125234800.993E070133@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Gtk2-Sexy/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7921

Modified Files:
	perl-Gtk2-Sexy.spec sources 
Log Message:
* Sun Jan 25 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.05-1
- update to 0.05



Index: perl-Gtk2-Sexy.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Gtk2-Sexy/F-9/perl-Gtk2-Sexy.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- perl-Gtk2-Sexy.spec	18 Jun 2008 05:16:56 -0000	1.7
+++ perl-Gtk2-Sexy.spec	25 Jan 2009 23:47:30 -0000	1.8
@@ -1,5 +1,5 @@
 Name:           perl-Gtk2-Sexy
-Version:        0.03        
+Version:        0.05
 Release:        1%{?dist}
 Summary:        Perl interface to the sexy widget collection 
 
@@ -65,6 +65,12 @@
 
 
 %changelog
+* Sun Jan 25 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.05-1
+- update to 0.05
+
+* Thu Oct 23 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.04-1
+- update to 0.04
+
 * Tue Jun 17 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.03-1
 - update to 0.03
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Gtk2-Sexy/F-9/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	18 Jun 2008 05:16:56 -0000	1.3
+++ sources	25 Jan 2009 23:47:30 -0000	1.4
@@ -1 +1 @@
-f1737098fab51e7a016498f5139e9260  Gtk2-Sexy-0.03.tar.gz
+3e291808250d7b956ba8443013a1b461  Gtk2-Sexy-0.05.tar.gz



From bpepple at fedoraproject.org  Sun Jan 25 23:50:45 2009
From: bpepple at fedoraproject.org (Brian Pepple)
Date: Sun, 25 Jan 2009 23:50:45 +0000 (UTC)
Subject: rpms/twitux/devel .cvsignore, 1.6, 1.7 sources, 1.6, 1.7 twitux.spec,
	1.9, 1.10
Message-ID: <20090125235045.E62F570133@cvs1.fedora.phx.redhat.com>

Author: bpepple

Update of /cvs/pkgs/rpms/twitux/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8602

Modified Files:
	.cvsignore sources twitux.spec 
Log Message:
* Sun Jan 25 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.69-1
- Update to 0.69.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/twitux/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	15 Dec 2008 00:25:01 -0000	1.6
+++ .cvsignore	25 Jan 2009 23:50:15 -0000	1.7
@@ -1 +1 @@
-twitux-0.68.tar.bz2
+twitux-0.69.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/twitux/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	15 Dec 2008 00:25:01 -0000	1.6
+++ sources	25 Jan 2009 23:50:15 -0000	1.7
@@ -1 +1 @@
-1daa6e090cab52eb0658cd40743a54f5  twitux-0.68.tar.bz2
+e51162151cc59623d95a0cfe3624d254  twitux-0.69.tar.bz2


Index: twitux.spec
===================================================================
RCS file: /cvs/pkgs/rpms/twitux/devel/twitux.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- twitux.spec	15 Dec 2008 00:25:01 -0000	1.9
+++ twitux.spec	25 Jan 2009 23:50:15 -0000	1.10
@@ -1,5 +1,5 @@
 Name:           twitux
-Version:        0.68
+Version:        0.69
 Release:        1%{?dist}
 Summary:        Twitux is a Twitter client for the Gnome desktop
 
@@ -112,6 +112,9 @@
 
 
 %changelog
+* Sun Jan 25 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.69-1
+- Update to 0.69.
+
 * Sun Dec 14 2008 Brian Pepple <bpepple at fedoraproject.org> - 0.68-1
 - Update to 0.68.
 - Add BR on gnome-doc-utils and libcanberra-devel.



From cweyl at fedoraproject.org  Sun Jan 25 23:51:22 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Sun, 25 Jan 2009 23:51:22 +0000 (UTC)
Subject: rpms/perl-Gtk2-Notify/devel .cvsignore, 1.4,
	1.5 perl-Gtk2-Notify.spec, 1.7, 1.8 sources, 1.4, 1.5
Message-ID: <20090125235122.1C60970133@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Gtk2-Notify/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8796

Modified Files:
	.cvsignore perl-Gtk2-Notify.spec sources 
Log Message:
* Sun Jan 25 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.05-1
- update to 0.05



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Gtk2-Notify/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	6 Nov 2007 05:29:39 -0000	1.4
+++ .cvsignore	25 Jan 2009 23:50:51 -0000	1.5
@@ -1 +1 @@
-Gtk2-Notify-0.04.tar.gz
+Gtk2-Notify-0.05.tar.gz


Index: perl-Gtk2-Notify.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Gtk2-Notify/devel/perl-Gtk2-Notify.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- perl-Gtk2-Notify.spec	7 Mar 2008 02:03:26 -0000	1.7
+++ perl-Gtk2-Notify.spec	25 Jan 2009 23:50:51 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           perl-Gtk2-Notify
-Version:        0.04
-Release:        3%{?dist}
+Version:        0.05
+Release:        1%{?dist}
 Summary:        Perl interface to libnotify
 License:        LGPLv2+
 Group:          Development/Libraries
@@ -66,6 +66,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Sun Jan 25 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.05-1
+- update to 0.05
+
 * Thu Mar 06 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.04-3
 Rebuild for new perl
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Gtk2-Notify/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	6 Nov 2007 05:29:39 -0000	1.4
+++ sources	25 Jan 2009 23:50:51 -0000	1.5
@@ -1 +1 @@
-a7b746ef43e09564950228d3a8b37245  Gtk2-Notify-0.04.tar.gz
+071144ad4a5670b8b2451baf358c4a88  Gtk2-Notify-0.05.tar.gz



From cweyl at fedoraproject.org  Sun Jan 25 23:51:49 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Sun, 25 Jan 2009 23:51:49 +0000 (UTC)
Subject: rpms/perl-Gtk2-Notify/F-10 perl-Gtk2-Notify.spec, 1.7, 1.8 sources, 
	1.4, 1.5
Message-ID: <20090125235149.5A94D70133@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Gtk2-Notify/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8991

Modified Files:
	perl-Gtk2-Notify.spec sources 
Log Message:
* Sun Jan 25 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.05-1
- update to 0.05



Index: perl-Gtk2-Notify.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Gtk2-Notify/F-10/perl-Gtk2-Notify.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- perl-Gtk2-Notify.spec	7 Mar 2008 02:03:26 -0000	1.7
+++ perl-Gtk2-Notify.spec	25 Jan 2009 23:51:19 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           perl-Gtk2-Notify
-Version:        0.04
-Release:        3%{?dist}
+Version:        0.05
+Release:        1%{?dist}
 Summary:        Perl interface to libnotify
 License:        LGPLv2+
 Group:          Development/Libraries
@@ -66,6 +66,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Sun Jan 25 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.05-1
+- update to 0.05
+
 * Thu Mar 06 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.04-3
 Rebuild for new perl
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Gtk2-Notify/F-10/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	6 Nov 2007 05:29:39 -0000	1.4
+++ sources	25 Jan 2009 23:51:19 -0000	1.5
@@ -1 +1 @@
-a7b746ef43e09564950228d3a8b37245  Gtk2-Notify-0.04.tar.gz
+071144ad4a5670b8b2451baf358c4a88  Gtk2-Notify-0.05.tar.gz



From cweyl at fedoraproject.org  Sun Jan 25 23:51:59 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Sun, 25 Jan 2009 23:51:59 +0000 (UTC)
Subject: rpms/perl-Gtk2-Notify/F-9 perl-Gtk2-Notify.spec, 1.7, 1.8 sources,
	1.4, 1.5
Message-ID: <20090125235159.A627B70133@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Gtk2-Notify/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9073

Modified Files:
	perl-Gtk2-Notify.spec sources 
Log Message:
* Sun Jan 25 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.05-1
- update to 0.05



Index: perl-Gtk2-Notify.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Gtk2-Notify/F-9/perl-Gtk2-Notify.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- perl-Gtk2-Notify.spec	7 Mar 2008 02:03:26 -0000	1.7
+++ perl-Gtk2-Notify.spec	25 Jan 2009 23:51:29 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           perl-Gtk2-Notify
-Version:        0.04
-Release:        3%{?dist}
+Version:        0.05
+Release:        1%{?dist}
 Summary:        Perl interface to libnotify
 License:        LGPLv2+
 Group:          Development/Libraries
@@ -66,6 +66,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Sun Jan 25 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.05-1
+- update to 0.05
+
 * Thu Mar 06 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.04-3
 Rebuild for new perl
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Gtk2-Notify/F-9/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	6 Nov 2007 05:29:39 -0000	1.4
+++ sources	25 Jan 2009 23:51:29 -0000	1.5
@@ -1 +1 @@
-a7b746ef43e09564950228d3a8b37245  Gtk2-Notify-0.04.tar.gz
+071144ad4a5670b8b2451baf358c4a88  Gtk2-Notify-0.05.tar.gz



From denis at fedoraproject.org  Sun Jan 25 23:53:30 2009
From: denis at fedoraproject.org (Denis Leroy)
Date: Sun, 25 Jan 2009 23:53:30 +0000 (UTC)
Subject: rpms/xfburn/devel .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 xfburn.spec,
	1.2, 1.3
Message-ID: <20090125235330.3988270105@cvs1.fedora.phx.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/xfburn/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9621

Modified Files:
	.cvsignore sources xfburn.spec 
Log Message:
Update to upstream 0.4.0


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xfburn/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	4 Dec 2008 01:17:55 -0000	1.2
+++ .cvsignore	25 Jan 2009 23:52:59 -0000	1.3
@@ -1 +1 @@
-xfburn-0.3.91.tar.bz2
+xfburn-0.4.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xfburn/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	4 Dec 2008 01:17:55 -0000	1.2
+++ sources	25 Jan 2009 23:52:59 -0000	1.3
@@ -1 +1 @@
-fbf53524dcdc5abc630e36e48b8cf4d2  xfburn-0.3.91.tar.bz2
+621a59415138c191c25e3d30a5ed5742  xfburn-0.4.0.tar.bz2


Index: xfburn.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfburn/devel/xfburn.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xfburn.spec	4 Dec 2008 01:42:15 -0000	1.2
+++ xfburn.spec	25 Jan 2009 23:52:59 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           xfburn
-Version:        0.3.91
-Release:        2%{?dist}
+Version:        0.4.0
+Release:        1%{?dist}
 Summary:        Simple CD burning tool for Xfce
 
 Group:          Applications/Archiving
@@ -12,7 +12,7 @@
 BuildRequires:  libxfcegui4-devel >= 4.4.0 Thunar-devel >= 0.3.0 
 BuildRequires:  libburn-devel >= 0.4.2 libisofs-devel >= 0.6.2
 BuildRequires:  dbus-glib-devel >= 0.34 hal-devel >= 0.5.7
-BuildRequires:  gstreamer-devel >= 0.10.2
+BuildRequires:  gstreamer-devel >= 0.10.2 gstreamer-plugins-base-devel
 BuildRequires:  gtk2-devel >= 2.10.0 gettext desktop-file-utils
 Requires:       hicolor-icon-theme
 
@@ -67,6 +67,7 @@
 %doc AUTHORS COPYING ChangeLog NEWS TODO
 %{_bindir}/%{name}
 %{_datadir}/applications/%{name}.desktop
+%{_datadir}/Thunar/sendto/*.desktop
 %{_datadir}/icons/hicolor/*/stock/media/stock_%{name}-*.png
 %{_datadir}/icons/hicolor/scalable/stock/media/stock_%{name}-*.svg
 %dir %{_datadir}/%{name}/
@@ -74,6 +75,9 @@
 
 
 %changelog
+* Mon Jan 26 2009 Denis Leroy <denis at poolshark.org> - 0.4.0-1
+- Update to upstream 0.4.0
+
 * Tue Nov 04 2008 Christoph Wickert <cwickert at fedoraproject.org> - 0.3.91-2
 - Don't enable debug
 - Require hicolor-icon-theme



From cweyl at fedoraproject.org  Mon Jan 26 00:00:33 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Mon, 26 Jan 2009 00:00:33 +0000 (UTC)
Subject: rpms/perl-Gtk2-GladeXML/devel .cvsignore, 1.3,
	1.4 perl-Gtk2-GladeXML.spec, 1.6, 1.7 sources, 1.3, 1.4
Message-ID: <20090126000033.1341270141@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Gtk2-GladeXML/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11521

Modified Files:
	.cvsignore perl-Gtk2-GladeXML.spec sources 
Log Message:
* Sun Jan 25 2009 Chris Weyl <cweyl at alumni.drew.edu> 1.007-1
- update to 1.007
- correct license tag (LGPLv2+, _not_ GPLv2+)
- minor spec tweaks, mostly cosmetic



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Gtk2-GladeXML/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	28 Sep 2006 17:36:02 -0000	1.3
+++ .cvsignore	26 Jan 2009 00:00:02 -0000	1.4
@@ -1 +1 @@
-Gtk2-GladeXML-1.006.tar.gz
+Gtk2-GladeXML-1.007.tar.gz


Index: perl-Gtk2-GladeXML.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Gtk2-GladeXML/devel/perl-Gtk2-GladeXML.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- perl-Gtk2-GladeXML.spec	6 Mar 2008 18:39:28 -0000	1.6
+++ perl-Gtk2-GladeXML.spec	26 Jan 2009 00:00:02 -0000	1.7
@@ -1,18 +1,23 @@
 Name:           perl-Gtk2-GladeXML
-Version:        1.006
-Release:        4%{?dist}
+Version:        1.007
+Release:        1%{?dist}
 Summary:        Create user interfaces directly from Glade XML files
 
 Group:          Development/Libraries
-License:        GPLv2+
+License:        LGPLv2+
 URL:            http://search.cpan.org/dist/Gtk2-GladeXML/
 Source0:        http://search.cpan.org/CPAN/authors/id/T/TS/TSCH/Gtk2-GladeXML-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
-BuildRequires:  perl(ExtUtils::Depends), perl(ExtUtils::PkgConfig)
-BuildRequires:  perl(Glib), perl(Gtk2)
+# non-perl
 BuildRequires:  libglade2-devel >= 2.0.0
-Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+
+BuildRequires:  perl(ExtUtils::MakeMaker)
+BuildRequires:  perl(ExtUtils::Depends) >= 0.300
+BuildRequires:  perl(ExtUtils::PkgConfig)
+BuildRequires:  perl(Glib)
+BuildRequires:  perl(Gtk2)
 
 %description
 Glade is a free user interface builder for GTK+ and GNOME. 
@@ -32,20 +37,23 @@
 %prep
 %setup -q -n Gtk2-GladeXML-%{version}
 
-chmod -x examples/*
+chmod -c -x examples/*
 
 %build
-%{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS"
+%{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="%{optflags}"
 make %{?_smp_mflags}
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
-find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';'
-find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';'
-find $RPM_BUILD_ROOT -type f -name '*.bs' -empty -exec rm -f {} ';'
-chmod -R u+w $RPM_BUILD_ROOT/*
+rm -rf %{buildroot}
+
+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 ';'
+find %{buildroot} -type f -name '*.bs' -empty -exec rm -f {} ';'
+
+%{_fixperms} %{buildroot}/*
 
 
 %check
@@ -53,7 +61,7 @@
 
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 
 %files
@@ -66,6 +74,11 @@
 
 
 %changelog
+* Sun Jan 25 2009 Chris Weyl <cweyl at alumni.drew.edu> 1.007-1
+- update to 1.007
+- correct license tag (LGPLv2+, _not_ GPLv2+)
+- minor spec tweaks, mostly cosmetic
+
 * Thu Mar  6 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1.006-4
 - rebuild for new perl
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Gtk2-GladeXML/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	28 Sep 2006 17:36:02 -0000	1.3
+++ sources	26 Jan 2009 00:00:02 -0000	1.4
@@ -1 +1 @@
-a321fa6ec7b883fc002a371bdaa99d76  Gtk2-GladeXML-1.006.tar.gz
+e6ca234e2a9f0221263acd2a593c583b  Gtk2-GladeXML-1.007.tar.gz



From cweyl at fedoraproject.org  Mon Jan 26 00:01:12 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Mon, 26 Jan 2009 00:01:12 +0000 (UTC)
Subject: rpms/perl-Gtk2-GladeXML/F-10 perl-Gtk2-GladeXML.spec, 1.6,
	1.7 sources, 1.3, 1.4
Message-ID: <20090126000112.D8A3A70141@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Gtk2-GladeXML/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11699

Modified Files:
	perl-Gtk2-GladeXML.spec sources 
Log Message:
* Sun Jan 25 2009 Chris Weyl <cweyl at alumni.drew.edu> 1.007-1
- update to 1.007
- correct license tag (LGPLv2+, _not_ GPLv2+)
- minor spec tweaks, mostly cosmetic



Index: perl-Gtk2-GladeXML.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Gtk2-GladeXML/F-10/perl-Gtk2-GladeXML.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- perl-Gtk2-GladeXML.spec	6 Mar 2008 18:39:28 -0000	1.6
+++ perl-Gtk2-GladeXML.spec	26 Jan 2009 00:00:42 -0000	1.7
@@ -1,18 +1,23 @@
 Name:           perl-Gtk2-GladeXML
-Version:        1.006
-Release:        4%{?dist}
+Version:        1.007
+Release:        1%{?dist}
 Summary:        Create user interfaces directly from Glade XML files
 
 Group:          Development/Libraries
-License:        GPLv2+
+License:        LGPLv2+
 URL:            http://search.cpan.org/dist/Gtk2-GladeXML/
 Source0:        http://search.cpan.org/CPAN/authors/id/T/TS/TSCH/Gtk2-GladeXML-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
-BuildRequires:  perl(ExtUtils::Depends), perl(ExtUtils::PkgConfig)
-BuildRequires:  perl(Glib), perl(Gtk2)
+# non-perl
 BuildRequires:  libglade2-devel >= 2.0.0
-Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+
+BuildRequires:  perl(ExtUtils::MakeMaker)
+BuildRequires:  perl(ExtUtils::Depends) >= 0.300
+BuildRequires:  perl(ExtUtils::PkgConfig)
+BuildRequires:  perl(Glib)
+BuildRequires:  perl(Gtk2)
 
 %description
 Glade is a free user interface builder for GTK+ and GNOME. 
@@ -32,20 +37,23 @@
 %prep
 %setup -q -n Gtk2-GladeXML-%{version}
 
-chmod -x examples/*
+chmod -c -x examples/*
 
 %build
-%{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS"
+%{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="%{optflags}"
 make %{?_smp_mflags}
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
-find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';'
-find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';'
-find $RPM_BUILD_ROOT -type f -name '*.bs' -empty -exec rm -f {} ';'
-chmod -R u+w $RPM_BUILD_ROOT/*
+rm -rf %{buildroot}
+
+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 ';'
+find %{buildroot} -type f -name '*.bs' -empty -exec rm -f {} ';'
+
+%{_fixperms} %{buildroot}/*
 
 
 %check
@@ -53,7 +61,7 @@
 
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 
 %files
@@ -66,6 +74,11 @@
 
 
 %changelog
+* Sun Jan 25 2009 Chris Weyl <cweyl at alumni.drew.edu> 1.007-1
+- update to 1.007
+- correct license tag (LGPLv2+, _not_ GPLv2+)
+- minor spec tweaks, mostly cosmetic
+
 * Thu Mar  6 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1.006-4
 - rebuild for new perl
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Gtk2-GladeXML/F-10/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	28 Sep 2006 17:36:02 -0000	1.3
+++ sources	26 Jan 2009 00:00:42 -0000	1.4
@@ -1 +1 @@
-a321fa6ec7b883fc002a371bdaa99d76  Gtk2-GladeXML-1.006.tar.gz
+e6ca234e2a9f0221263acd2a593c583b  Gtk2-GladeXML-1.007.tar.gz



From cweyl at fedoraproject.org  Mon Jan 26 00:01:26 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Mon, 26 Jan 2009 00:01:26 +0000 (UTC)
Subject: rpms/perl-Gtk2-GladeXML/F-9 perl-Gtk2-GladeXML.spec, 1.6,
	1.7 sources, 1.3, 1.4
Message-ID: <20090126000126.6472670141@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Gtk2-GladeXML/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11862

Modified Files:
	perl-Gtk2-GladeXML.spec sources 
Log Message:
* Sun Jan 25 2009 Chris Weyl <cweyl at alumni.drew.edu> 1.007-1
- update to 1.007
- correct license tag (LGPLv2+, _not_ GPLv2+)
- minor spec tweaks, mostly cosmetic



Index: perl-Gtk2-GladeXML.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Gtk2-GladeXML/F-9/perl-Gtk2-GladeXML.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- perl-Gtk2-GladeXML.spec	6 Mar 2008 18:39:28 -0000	1.6
+++ perl-Gtk2-GladeXML.spec	26 Jan 2009 00:00:56 -0000	1.7
@@ -1,18 +1,23 @@
 Name:           perl-Gtk2-GladeXML
-Version:        1.006
-Release:        4%{?dist}
+Version:        1.007
+Release:        1%{?dist}
 Summary:        Create user interfaces directly from Glade XML files
 
 Group:          Development/Libraries
-License:        GPLv2+
+License:        LGPLv2+
 URL:            http://search.cpan.org/dist/Gtk2-GladeXML/
 Source0:        http://search.cpan.org/CPAN/authors/id/T/TS/TSCH/Gtk2-GladeXML-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
-BuildRequires:  perl(ExtUtils::Depends), perl(ExtUtils::PkgConfig)
-BuildRequires:  perl(Glib), perl(Gtk2)
+# non-perl
 BuildRequires:  libglade2-devel >= 2.0.0
-Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+
+BuildRequires:  perl(ExtUtils::MakeMaker)
+BuildRequires:  perl(ExtUtils::Depends) >= 0.300
+BuildRequires:  perl(ExtUtils::PkgConfig)
+BuildRequires:  perl(Glib)
+BuildRequires:  perl(Gtk2)
 
 %description
 Glade is a free user interface builder for GTK+ and GNOME. 
@@ -32,20 +37,23 @@
 %prep
 %setup -q -n Gtk2-GladeXML-%{version}
 
-chmod -x examples/*
+chmod -c -x examples/*
 
 %build
-%{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS"
+%{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="%{optflags}"
 make %{?_smp_mflags}
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
-find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';'
-find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';'
-find $RPM_BUILD_ROOT -type f -name '*.bs' -empty -exec rm -f {} ';'
-chmod -R u+w $RPM_BUILD_ROOT/*
+rm -rf %{buildroot}
+
+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 ';'
+find %{buildroot} -type f -name '*.bs' -empty -exec rm -f {} ';'
+
+%{_fixperms} %{buildroot}/*
 
 
 %check
@@ -53,7 +61,7 @@
 
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 
 %files
@@ -66,6 +74,11 @@
 
 
 %changelog
+* Sun Jan 25 2009 Chris Weyl <cweyl at alumni.drew.edu> 1.007-1
+- update to 1.007
+- correct license tag (LGPLv2+, _not_ GPLv2+)
+- minor spec tweaks, mostly cosmetic
+
 * Thu Mar  6 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1.006-4
 - rebuild for new perl
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Gtk2-GladeXML/F-9/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	28 Sep 2006 17:36:02 -0000	1.3
+++ sources	26 Jan 2009 00:00:56 -0000	1.4
@@ -1 +1 @@
-a321fa6ec7b883fc002a371bdaa99d76  Gtk2-GladeXML-1.006.tar.gz
+e6ca234e2a9f0221263acd2a593c583b  Gtk2-GladeXML-1.007.tar.gz



From denis at fedoraproject.org  Mon Jan 26 00:01:47 2009
From: denis at fedoraproject.org (Denis Leroy)
Date: Mon, 26 Jan 2009 00:01:47 +0000 (UTC)
Subject: rpms/xfburn/devel xfburn.spec,1.3,1.4
Message-ID: <20090126000147.426B070141@cvs1.fedora.phx.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/xfburn/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11971

Modified Files:
	xfburn.spec 
Log Message:
Added intltool to BRs


Index: xfburn.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfburn/devel/xfburn.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xfburn.spec	25 Jan 2009 23:52:59 -0000	1.3
+++ xfburn.spec	26 Jan 2009 00:01:17 -0000	1.4
@@ -13,7 +13,7 @@
 BuildRequires:  libburn-devel >= 0.4.2 libisofs-devel >= 0.6.2
 BuildRequires:  dbus-glib-devel >= 0.34 hal-devel >= 0.5.7
 BuildRequires:  gstreamer-devel >= 0.10.2 gstreamer-plugins-base-devel
-BuildRequires:  gtk2-devel >= 2.10.0 gettext desktop-file-utils
+BuildRequires:  gtk2-devel >= 2.10.0 gettext desktop-file-utils intltool
 Requires:       hicolor-icon-theme
 
 %description



From cweyl at fedoraproject.org  Mon Jan 26 00:03:49 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Mon, 26 Jan 2009 00:03:49 +0000 (UTC)
Subject: rpms/perl-Hash-Case/F-9 perl-Hash-Case.spec, 1.3, 1.4 sources, 1.2,
	1.3
Message-ID: <20090126000349.5DD3670141@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Hash-Case/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12605

Modified Files:
	perl-Hash-Case.spec sources 
Log Message:
* Sat Oct 25 2008 Chris Weyl <cweyl at alumni.drew.edu> 1.006-1
- update to 1.006



Index: perl-Hash-Case.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Hash-Case/F-9/perl-Hash-Case.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- perl-Hash-Case.spec	5 Mar 2008 16:49:20 -0000	1.3
+++ perl-Hash-Case.spec	26 Jan 2009 00:03:18 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           perl-Hash-Case
-Version:        1.003
-Release:        3%{?dist}
+Version:        1.006
+Release:        1%{?dist}
 Summary:        Base class for hashes with key-casing requirements
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -50,6 +50,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Sat Oct 25 2008 Chris Weyl <cweyl at alumni.drew.edu> 1.006-1
+- update to 1.006
+
 * Wed Mar  5 2008 Tom "spot" Callaway <tcallawa at redhat.com> 1.003-3
 - rebuild for new perl
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Hash-Case/F-9/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	19 Apr 2007 18:34:32 -0000	1.2
+++ sources	26 Jan 2009 00:03:19 -0000	1.3
@@ -1 +1 @@
-3cf179f0730b3e3651eb7e270aed2dac  Hash-Case-1.003.tar.gz
+1911b81b5b6bb3d47e5d3660cf1c8eae  Hash-Case-1.006.tar.gz



From cweyl at fedoraproject.org  Mon Jan 26 00:07:51 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Mon, 26 Jan 2009 00:07:51 +0000 (UTC)
Subject: rpms/perl-MooseX-Role-Parameterized/devel .cvsignore, 1.2,
	1.3 perl-MooseX-Role-Parameterized.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20090126000751.623B470141@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-MooseX-Role-Parameterized/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13424

Modified Files:
	.cvsignore perl-MooseX-Role-Parameterized.spec sources 
Log Message:
* Sun Jan 25 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.03-1
- update to 0.03



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-MooseX-Role-Parameterized/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	14 Jan 2009 22:59:46 -0000	1.2
+++ .cvsignore	26 Jan 2009 00:07:20 -0000	1.3
@@ -1 +1 @@
-MooseX-Role-Parameterized-0.02.tar.gz
+MooseX-Role-Parameterized-0.03.tar.gz


Index: perl-MooseX-Role-Parameterized.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-MooseX-Role-Parameterized/devel/perl-MooseX-Role-Parameterized.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-MooseX-Role-Parameterized.spec	14 Jan 2009 22:59:46 -0000	1.1
+++ perl-MooseX-Role-Parameterized.spec	26 Jan 2009 00:07:21 -0000	1.2
@@ -1,6 +1,6 @@
 Name:       perl-MooseX-Role-Parameterized 
-Version:    0.02 
-Release:    1%{?dist}
+Version:        0.03
+Release:        1%{?dist}
 # see LICENSE 
 License:    GPL+ or Artistic
 Group:      Development/Libraries
@@ -66,6 +66,9 @@
 %{_mandir}/man3/*.3*
 
 %changelog
+* Sun Jan 25 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.03-1
+- update to 0.03
+
 * Mon Jan 12 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.02-1
 - update for submission
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-MooseX-Role-Parameterized/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	14 Jan 2009 22:59:46 -0000	1.2
+++ sources	26 Jan 2009 00:07:21 -0000	1.3
@@ -1 +1 @@
-2adcf2c7225c34768d80efb018d877ab  MooseX-Role-Parameterized-0.02.tar.gz
+8215cab7f5c3284e5a3e36a92d123ad8  MooseX-Role-Parameterized-0.03.tar.gz



From cweyl at fedoraproject.org  Mon Jan 26 00:18:15 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Mon, 26 Jan 2009 00:18:15 +0000 (UTC)
Subject: rpms/perl-ExtUtils-Depends/F-9 perl-ExtUtils-Depends.spec, 1.12,
	1.13 sources, 1.3, 1.4
Message-ID: <20090126001815.16DFA70141@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-ExtUtils-Depends/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14984

Modified Files:
	perl-ExtUtils-Depends.spec sources 
Log Message:
* Thu May 15 2008 Steven Pritchard <steve at kspei.com> 0.300-1
- Update to 0.300.
- Clean up to match cpanspec output.
- Fix find option order.
- Use fixperms macro instead of our own chmod incantation.
- Update Source0 URL.
- BR Test::More.



Index: perl-ExtUtils-Depends.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-ExtUtils-Depends/F-9/perl-ExtUtils-Depends.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- perl-ExtUtils-Depends.spec	6 Feb 2008 02:19:17 -0000	1.12
+++ perl-ExtUtils-Depends.spec	26 Jan 2009 00:17:44 -0000	1.13
@@ -1,58 +1,61 @@
 Name:           perl-ExtUtils-Depends
-Version:        0.205
-Release:        6%{?dist}
+Version:        0.300
+Release:        1%{?dist}
 Summary:        Easily build XS extensions that depend on XS extensions
-
-Group:          Development/Libraries
 License:        GPL+ or Artistic
+Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/ExtUtils-Depends/
-Source0:        http://www.cpan.org/authors/id/R/RM/RMCFARLA/Gtk2-Perl/ExtUtils-Depends-%{version}.tar.gz
+Source0:        http://www.cpan.org/authors/id/T/TS/TSCH/ExtUtils-Depends-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
 BuildArch:      noarch
 BuildRequires:  perl(ExtUtils::MakeMaker)
+BuildRequires:  perl(Test::More)
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
 This module tries to make it easy to build Perl extensions that use
-functions and typemaps provided by other perl extensions. This means
-that a perl extension is treated like a shared library that provides
-also a C and an XS interface besides the perl one.
-
+functions and typemaps provided by other perl extensions. This means that a
+perl extension is treated like a shared library that provides also a C and
+an XS interface besides the perl one.
 
 %prep
 %setup -q -n ExtUtils-Depends-%{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 -type d -depth -exec rmdir {} 2>/dev/null ';'
-chmod -R u+w $RPM_BUILD_ROOT/*
 
+find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
+find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;
+
+%{_fixperms} $RPM_BUILD_ROOT/*
 
 %check
 make test
 
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-
 %files
 %defattr(-,root,root,-)
 %doc Changes README
-%{perl_vendorlib}/ExtUtils/
-%{_mandir}/man3/*.3pm*
-
+%{perl_vendorlib}/*
+%{_mandir}/man3/*
 
 %changelog
+* Thu May 15 2008 Steven Pritchard <steve at kspei.com> 0.300-1
+- Update to 0.300.
+- Clean up to match cpanspec output.
+- Fix find option order.
+- Use fixperms macro instead of our own chmod incantation.
+- Update Source0 URL.
+- BR Test::More.
+
 * Tue Feb  5 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.205-6
 - rebuild for new perl
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-ExtUtils-Depends/F-9/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	15 Feb 2005 02:49:20 -0000	1.3
+++ sources	26 Jan 2009 00:17:44 -0000	1.4
@@ -1 +1 @@
-02c22a93ec9efb8e457764114ce24eb4  ExtUtils-Depends-0.205.tar.gz
+69061666b5f96663e0a1266c1d76ad6b  ExtUtils-Depends-0.300.tar.gz



From pwouters at fedoraproject.org  Mon Jan 26 00:41:59 2009
From: pwouters at fedoraproject.org (Paul Wouters)
Date: Mon, 26 Jan 2009 00:41:59 +0000 (UTC)
Subject: rpms/dnssec-conf/F-10 dnssec-conf.spec,1.2,1.3
Message-ID: <20090126004159.93FD27010C@cvs1.fedora.phx.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/dnssec-conf/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20094

Modified Files:
	dnssec-conf.spec 
Log Message:
bump version



Index: dnssec-conf.spec
===================================================================
RCS file: /cvs/extras/rpms/dnssec-conf/F-10/dnssec-conf.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- dnssec-conf.spec	25 Jan 2009 17:43:23 -0000	1.2
+++ dnssec-conf.spec	26 Jan 2009 00:41:29 -0000	1.3
@@ -1,7 +1,7 @@
 Summary: DNSSEC and DLV configuration tool (and TLD repository until the root is signed)
 Name: dnssec-conf
 Version: 1.13
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+
 Url: http://www.xelerance.com/software/dnssec-conf/
 Source: http://www.xelerance.com/software/%{name}/%{name}-%{version}.tar.gz
@@ -50,6 +50,9 @@
 %{_mandir}/*/*
 
 %changelog
+* Sun Jan 25 2009 Paul Wouters <paul at xelerance.com> - 1.13-3
+- bump version tag
+
 * Wed Jan 21 2009 Paul Wouters <paul at xelerance.com> - 1.13-2
 - Upstream made source available :=)
 - removed macros from changes.



From pwouters at fedoraproject.org  Mon Jan 26 00:43:12 2009
From: pwouters at fedoraproject.org (Paul Wouters)
Date: Mon, 26 Jan 2009 00:43:12 +0000 (UTC)
Subject: rpms/autotrust/EL-5 autotrust.conf, NONE, 1.1 autotrust.cron, NONE, 
	1.1 autotrust.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090126004312.0A4447010C@cvs1.fedora.phx.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/autotrust/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20408

Modified Files:
	.cvsignore sources 
Added Files:
	autotrust.conf autotrust.cron autotrust.spec 
Log Message:
initial build for autotrust in EL-5



--- NEW FILE autotrust.conf ---
# program configuration
config:
	# directory to go to for performing autotrust.
	# by default, autotrust will store files in the current directory.
	working-dir:		"/var/lib/autotrust"

	# where to find the root-hints. 
	# by default, autotrust uses builtin root hints from libunbound.
	# root-hints:		"/etc/named.root"

	# where to log messages. 
	# by default, logs will be outputted to stderr.
	log-file:		"/var/log/autotrust.log"

	# where to store state information for trust anchors. 
	# by default, state information is stored in a file autotrust.state in 
	# the working directory.
	state-file:		"/var/lib/autotrust/autotrust.state" 

	# where to find the the trust anchors (that can be used for Unbound).
	# trust-anchor-file:	"trust-anchor.file"

	# where to find the the trust anchors (that can be used for 
	# BIND9 and Unbound). you can also put your BIND configuration file 
	# here, though it is recommended to solely put the trusted-keys clause 
	# in this file and include it in your actual BIND configuration file.
	trusted-keys-file:	"/etc/pki/dnssec-keys/production.conf"

	# what resolv.conf file to use. 
	# by default, autotrust doesn't use configured nameservers, but queries 
	# for the answers himself. By providing your resolver configuration, the
	# program will run much faster.
	# resolv-conf:		"/etc/resolv.conf"

	# by default, autotrust makes use of both ipv4 and ipv6. 
	# setting one of these options to "yes" eliminates the use of the other 
	# protocol version.
	# ipv4-only:		"no"
	# ipv6-only:		"no"

	# specify the time when a trust anchor may be added.
	# by default, add holddown time is 30 days.
	# add-holddown:		2592000 # 30 days

	# specify the time when a trust anchor may be removed.
	# by default, del holddown time is 30 days.
	# del-holddown:		2592000 # 30 days

	# how many times must a pending trust anchor be seen, before adding it 
	# to the valid trust anchor set. by default, 2 times.
	# STRONGLY RECOMMENDED VALUE: 2 or higher
	# pending-count:	2

	# keep trust anchors with the START state in the state information file.
	# by default, trust anchors in the state START are not stored.
	# keep-start:		"no"

	# keep trust anchors with the REMOVED state in the state information.
	# by default, trust anchors in the state REMOVED are not stored.
	# keep-removed:		"no"

	# the pidfile that stores the process id of your resolver.
	# by default, autotrust does not know about your resolver and will not 
	# signal resolvers.
	# resolver-pidfile:		"/var/run/named/named.pid"
	resolver-pidfile: "/var/run/unbound/unbound.pid /var/run/named/named.pid"

	# if you use Unbound, you can specify the Undbound configuration 
	# here, so that autotrust uses the same configuration. This option was 
	# built in for debugging purposes (to configure stub zones), and is 
	# considered experimental.
	unbound-conf:		"/etc/unbound/unbound.conf"

	# specify the time when a missing trust anchor may not be used 
	# as valid trust anchor anymore. If keep-missing is 0, missing keys 
	# are never removed (unless revoked), which is the default.
	# STRONGLY RECOMMENDED VALUE: 0, or 1year or higher
	# keep-missing:		31536000 # 1 year

	# log if keys gone missing, regardless of the used verbosity level.
	# on by default.
	# alert-missing:	"yes"

	# if you have a superior trust point configured, the subordinate trust 
	# anchors will be removed after 180 days after the superior trust point 
	# was introduced. by default, this option is disabled, you may enable it 
	# by setting 'superior-trust' to "yes".
	# THIS OPTION IS NOT IMPLEMENTED YET
	# superior-trust:	"yes"

	# set the level of verbosity. default it it set to 1. the higher this 
	# number, the more log messages you will get. if you want no 
	# output at all, set verbosity to 0 (you will log only error and 
	# warning messages).
	# verbosity:		1


--- NEW FILE autotrust.cron ---
#!/bin/sh

# Check for updated and revoked  DNSKEY trust anchors daily
/usr/sbin/autotrust


--- NEW FILE autotrust.spec ---
%define prever rc1
%define VERSION %{version}%{prever}

Summary: DNSKEY trust anchor update utility that uses RFC-5011
Name: autotrust
Version: 0.2.1
Release: 0.2.%{prever}%{?dist}
License: BSD
Url: http://www.nlnetlabs.nl/%{name}/
Source: http://www.nlnetlabs.nl/downloads/%{name}-%{VERSION}.tar.gz
Source1: autotrust.conf
Source2: autotrust.cron
Group: System Environment/Libraries
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: ldns-devel >= 1.3.0, unbound-devel >= 1.0.0
Requires: anacron

%description
autotrust takes care of keeping your DNSSEC trust anchors up to date. It
is RFC5011 compliant, except for the query intervals and the retry timers.
autotrust is meant to run from commandline or in a cron job. If we want to
follow the values recommended by RFC5011, autotrust should run as daemon. 

%prep
%setup -q -n autotrust-%{VERSION}

%build
%configure --disable-rpath 
make %{?_smp_mflags}

%install
rm -rf %{buildroot}

make DESTDIR=%{buildroot} INSTALL="%{__install} -p" install 
mkdir -p %{buildroot}%{_sysconfdir}/%{name}/
mkdir -p %{buildroot}%{_localstatedir}/lib/%{name}
mkdir -p %{buildroot}%{_sysconfdir}/cron.daily/
install -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/%{name}/
install -m 755 %{SOURCE2} %{buildroot}%{_sysconfdir}/cron.daily/autotrust

%clean
rm -rf %{buildroot}

%files 
%defattr(-,root,root)
%{_sbindir}/autotrust
%doc doc/*
%{_mandir}/*/*
%dir %{_sysconfdir}/%{name}
%dir %{_localstatedir}/lib/%{name}
%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/%{name}/autotrust.conf
%attr(0755,root,root) %{_sysconfdir}/cron.daily/autotrust

%changelog
* Wed Jan 21 2009 Paul Wouters <paul at xelerance.com> - 0.2.1-0.2.rc1
- Drop sysconfig argument for configure
- Merged changelog entry to avoid rpm warning 

* Wed Jan 21 2009 Paul Wouters <paul at xelerance.com> - 0.2.1-0.1.rc1
- Drop regeneration of configure - does not work on rawhide
- Fix version/release tag
- Removed merged in patch. updated to upstream which fixes the reported autoconf issues.

* Tue Dec  2 2008 Paul Wouters <paul at xelerance.com> - 0.2.0-3
- Use upstream svn patch for multiple resolvers and defaults
- Don't override unused libdir
- Cleanup and run autoreconf
- Added missing dependancies (anacron, automake, libtool)
- Fix permission on cron job.

* Fri Nov 28 2008 Paul Wouters <paul at xelerance.com> - 0.2.0-2
- Fix typo in resolver-pidfile: option in autotrust.conf

* Thu Nov 27 2008 Paul Wouters <paul at xelerance.com> - 0.2.0-1
- Updated to newest version
- Fix default file locations
- Allow resolver-pid: to take multiple filenames, seperated by a space

* Fri Nov 22 2008 Paul Wouters <paul at xelerance.com> - 0.1.0-1
- Initial version


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/autotrust/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	23 Jan 2009 23:14:07 -0000	1.1
+++ .cvsignore	26 Jan 2009 00:42:41 -0000	1.2
@@ -0,0 +1 @@
+autotrust-0.2.1rc1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/autotrust/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	23 Jan 2009 23:14:07 -0000	1.1
+++ sources	26 Jan 2009 00:42:41 -0000	1.2
@@ -0,0 +1 @@
+663254fbd41176e3b13952bffd49a21c  autotrust-0.2.1rc1.tar.gz



From mclasen at fedoraproject.org  Mon Jan 26 00:48:43 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon, 26 Jan 2009 00:48:43 +0000 (UTC)
Subject: rpms/libsoup/devel libsoup.spec,1.82,1.83
Message-ID: <20090126004843.1F9AD7010C@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/libsoup/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21614

Modified Files:
	libsoup.spec 
Log Message:
build with libproxy



Index: libsoup.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libsoup/devel/libsoup.spec,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -r1.82 -r1.83
--- libsoup.spec	5 Jan 2009 21:52:31 -0000	1.82
+++ libsoup.spec	26 Jan 2009 00:48:12 -0000	1.83
@@ -4,7 +4,7 @@
 
 Name: libsoup
 Version: 2.25.4
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: LGPLv2
 Group: Development/Libraries
 Summary: Soup, an HTTP library implementation
@@ -17,7 +17,7 @@
 BuildRequires: glib2-devel >= %{glib2_version}
 BuildRequires: gnutls-devel
 BuildRequires: libxml2-devel
-BuildRequires: GConf2-devel
+BuildRequires: libproxy-devel
 BuildRequires: sqlite-devel
 
 %description
@@ -83,6 +83,9 @@
 %{_datadir}/gtk-doc/html/%{name}-2.4
 
 %changelog
+* Sun Jan 25 2009 Matthias Clasen  <mclasen at redhat.com> - 2.25.4-2
+- Build against libproxy 
+
 * Mon Jan 05 2009 Matthew Barnes <mbarnes at redhat.com> - 2.25.4-1
 - Update to 2.25.4
 



From pwouters at fedoraproject.org  Mon Jan 26 01:00:20 2009
From: pwouters at fedoraproject.org (Paul Wouters)
Date: Mon, 26 Jan 2009 01:00:20 +0000 (UTC)
Subject: rpms/dnssec-conf/EL-5 dnssec-conf.spec, NONE, 1.1 .cvsignore, 1.1, 
	1.2 sources, 1.1, 1.2
Message-ID: <20090126010020.9BE247010C@cvs1.fedora.phx.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/dnssec-conf/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21554

Modified Files:
	.cvsignore sources 
Added Files:
	dnssec-conf.spec 
Log Message:
initial build of dnssec-conf for EL-5



--- NEW FILE dnssec-conf.spec ---
Summary: DNSSEC and DLV configuration tool (and TLD repository until the root is signed)
Name: dnssec-conf
Version: 1.13
Release: 2%{?dist}
License: GPLv2+
Url: http://www.xelerance.com/software/dnssec-conf/
Source: http://www.xelerance.com/software/%{name}/%{name}-%{version}.tar.gz
Group: System Environment/Daemons
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
Buildrequires: xmlto
Requires: python-dns, curl, unbound >= 1.1.1-7
#Requires: a caching nameserver
#Requires bind 9.4.0 if bind is reconfigured.....

%description
DNSSEC configuration and priming tool. Keys are required until the root
is signed, as well as for local unpublished DNSSEC keys to be preloaded
into the recursive nameserver. These DNSSEC configuration files can be
directly included in the bind or unbound nameserver configuration files.
dnssec-conf includes a commandline configuration client for Bind and
Unbound, known DNSSEC keys, URL's to official publication pages of keys,
and harvested keys, as well a script to harvest DNSKEY's from DNS.

%prep
%setup -q -n %{name}-%{version}

%build
make 

%install
rm -rf ${RPM_BUILD_ROOT}
make DESTDIR=${RPM_BUILD_ROOT} install

%clean
rm -rf ${RPM_BUILD_ROOT}

%files 
%defattr(-,root,root)
%doc LICENSE README
%attr(0755,root,root) %dir %{_sysconfdir}/pki/dnssec-keys
%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/pki/dnssec-keys/*/*
%attr(0755,root,root) %dir %{_sysconfdir}/pki/dnssec-keys/production
%attr(0755,root,root) %dir %{_sysconfdir}/pki/dnssec-keys/production/reverse
%attr(0755,root,root) %dir %{_sysconfdir}/pki/dnssec-keys/testing
%attr(0755,root,root) %dir %{_sysconfdir}/pki/dnssec-keys/harvest
%attr(0755,root,root) %dir %{_sysconfdir}/pki/dnssec-keys/dlv
%{_bindir}/dnskey-pull
%{_sbindir}/dnssec-configure
%{_mandir}/*/*

%changelog
* Wed Jan 21 2009 Paul Wouters <paul at xelerance.com> - 1.13-2
- Upstream made source available :=)
- removed macros from changes.

* Wed Jan 21 2009 Paul Wouters <paul at xelerance.com> - 1.13-1
- Clarify license
- Fix mixed use of RPM_BUILD_ROOT and buildroot
- Source tag fully qualified now

* Sat Jan 17 2009 Paul Wouters <paul at xelerance.com> - 1.10-1
- Updated to 1.10. Adds --set and --query and show option to use with system-config-dnssec
- Updated RIPE's reverse keys

* Tue Jan 13 2009 Paul Wouters <paul at xelerance.com> - 1.09-1
- Added testing key for gr.

* Mon Jan  5 2009 Paul Wouters <paul at xelerance.com> 1.08-1
- Upgrade to 'upstream'

* Mon Jan  5 2009 Paul Wouters <paul at xelerance.com> 1.07-1
- Require unbound >= 1.1.1-7

* Mon Jan  5 2009 Paul Wouters <paul at xelerance.com> 1.06-1
- Package renamed to dnssec-conf
- Added punycode test keys
- Fix for dnskey-pull and UTF8
- No longer requires the use of generating .conf files, by using
  a patch for unbound

* Fri Nov  7 2008 Paul Wouters <paul at xelerance.com> 1.0-1
- Initial release



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/dnssec-conf/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	23 Jan 2009 23:20:51 -0000	1.1
+++ .cvsignore	26 Jan 2009 00:59:50 -0000	1.2
@@ -0,0 +1 @@
+dnssec-conf-1.13.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/dnssec-conf/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	23 Jan 2009 23:20:51 -0000	1.1
+++ sources	26 Jan 2009 00:59:50 -0000	1.2
@@ -0,0 +1 @@
+c998c8050c77c14eda496b26891bb4c1  dnssec-conf-1.13.tar.gz



From kkofler at fedoraproject.org  Mon Jan 26 01:01:39 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Mon, 26 Jan 2009 01:01:39 +0000 (UTC)
Subject: rpms/kde-l10n/devel kde-l10n.spec,1.68,1.69
Message-ID: <20090126010139.356BA7010C@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kde-l10n/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24748/devel

Modified Files:
	kde-l10n.spec 
Log Message:
Fix the file list yet again.


Index: kde-l10n.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kde-l10n/devel/kde-l10n.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- kde-l10n.spec	25 Jan 2009 23:02:28 -0000	1.68
+++ kde-l10n.spec	26 Jan 2009 01:01:08 -0000	1.69
@@ -1317,7 +1317,6 @@
 %defattr(-,root,root)
 %lang(zh_CN) %{_datadir}/locale/zh_CN/*
 %lang(zh_CN) %{_kde4_appsdir}/kvtml/zh_CN
-%lang(zh_CN) %{_kde4_docdir}/HTML/gwenview/
 %lang(zh_CN) %{_kde4_appsdir}/step/objinfo/l10n/zh_CN/
 
 %files Chinese-Traditional



From jstanley at fedoraproject.org  Mon Jan 26 02:19:54 2009
From: jstanley at fedoraproject.org (Jon Stanley)
Date: Mon, 26 Jan 2009 02:19:54 +0000 (UTC)
Subject: rpms/supybot-fedora/EL-5 .cvsignore, 1.3, 1.4 sources, 1.4,
	1.5 supybot-fedora.spec, 1.3, 1.4
Message-ID: <20090126021954.17B277010C@cvs1.fedora.phx.redhat.com>

Author: jstanley

Update of /cvs/pkgs/rpms/supybot-fedora/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6492

Modified Files:
	.cvsignore sources supybot-fedora.spec 
Log Message:
Update to upstream 0.2.3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/supybot-fedora/EL-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	11 Jan 2009 20:23:48 -0000	1.3
+++ .cvsignore	26 Jan 2009 02:19:22 -0000	1.4
@@ -1 +1 @@
-supybot-fedora-0.2.2.tar.bz2
+supybot-fedora-0.2.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/supybot-fedora/EL-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	11 Jan 2009 20:23:48 -0000	1.4
+++ sources	26 Jan 2009 02:19:22 -0000	1.5
@@ -1 +1 @@
-3a309594f00858990b963fe442d4fea6  supybot-fedora-0.2.2.tar.bz2
+a1837d9a035eb217bb5c5a98a242fa22  supybot-fedora-0.2.3.tar.bz2


Index: supybot-fedora.spec
===================================================================
RCS file: /cvs/pkgs/rpms/supybot-fedora/EL-5/supybot-fedora.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- supybot-fedora.spec	11 Jan 2009 20:23:48 -0000	1.3
+++ supybot-fedora.spec	26 Jan 2009 02:19:22 -0000	1.4
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           supybot-fedora
-Version:        0.2.2
+Version:        0.2.3
 Release:        1%{?dist}
 Summary:        Plugin for Supybot to interact with Fedora services
 
@@ -54,6 +54,9 @@
 
 
 %changelog
+* Sun Jan 25 2009 Jon Stanley <jonstanley at gmail.com> - 0.2.3-1
+- New upstream 0.2.3
+
 * Sun Jan 11 2009 Jon Stanley <jonstanley at gmail.com> - 0.2.2-1
 - New upstream 0.2.2
 



From kkofler at fedoraproject.org  Mon Jan 26 02:37:03 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Mon, 26 Jan 2009 02:37:03 +0000 (UTC)
Subject: rpms/kde-l10n/devel kde-l10n.spec,1.69,1.70
Message-ID: <20090126023703.8CE177010C@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kde-l10n/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10148/devel

Modified Files:
	kde-l10n.spec 
Log Message:
Fix the file list yet again...


Index: kde-l10n.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kde-l10n/devel/kde-l10n.spec,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- kde-l10n.spec	26 Jan 2009 01:01:08 -0000	1.69
+++ kde-l10n.spec	26 Jan 2009 02:36:32 -0000	1.70
@@ -1318,6 +1318,7 @@
 %lang(zh_CN) %{_datadir}/locale/zh_CN/*
 %lang(zh_CN) %{_kde4_appsdir}/kvtml/zh_CN
 %lang(zh_CN) %{_kde4_appsdir}/step/objinfo/l10n/zh_CN/
+%lang(zh_CN) %{_kde4_docdir}/HTML/zh_CN
 
 %files Chinese-Traditional
 %defattr(-,root,root)



From mclasen at fedoraproject.org  Mon Jan 26 03:03:56 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon, 26 Jan 2009 03:03:56 +0000 (UTC)
Subject: rpms/gtk2/devel radio-proxy.patch, NONE, 1.1 tool-proxy.patch, NONE,
	1.1 gtk2.spec, 1.346, 1.347
Message-ID: <20090126030356.6695A7010C@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gtk2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15294

Modified Files:
	gtk2.spec 
Added Files:
	radio-proxy.patch tool-proxy.patch 
Log Message:
Fix more action issues


radio-proxy.patch:

--- NEW FILE radio-proxy.patch ---
diff -up gtk+-2.15.1/gtk/gtkradioaction.c.radio-proxy gtk+-2.15.1/gtk/gtkradioaction.c
--- gtk+-2.15.1/gtk/gtkradioaction.c.radio-proxy	2009-01-25 19:00:44.000000000 -0500
+++ gtk+-2.15.1/gtk/gtkradioaction.c	2009-01-25 19:01:09.000000000 -0500
@@ -176,6 +176,8 @@ gtk_radio_action_init (GtkRadioAction *a
   action->private_data = GTK_RADIO_ACTION_GET_PRIVATE (action);
   action->private_data->group = g_slist_prepend (NULL, action);
   action->private_data->value = 0;
+
+  gtk_toggle_action_set_draw_as_radio (GTK_TOGGLE_ACTION (action), TRUE);
 }
 
 /**

tool-proxy.patch:

--- NEW FILE tool-proxy.patch ---
Index: gtk/gtktoggletoolbutton.c
===================================================================
--- gtk/gtktoggletoolbutton.c	(revision 22216)
+++ gtk/gtktoggletoolbutton.c	(working copy)
@@ -201,11 +201,17 @@
   GtkStockItem stock_item;
   gboolean use_mnemonic = TRUE;
   const char *label;
+  GtkWidget *label_widget;
+  const gchar *label_text;
+  const gchar *stock_id;
 
-  GtkWidget *label_widget = gtk_tool_button_get_label_widget (tool_button);
-  const gchar *label_text = gtk_tool_button_get_label (tool_button);
-  const gchar *stock_id = gtk_tool_button_get_stock_id (tool_button);
+  if (_gtk_tool_item_create_menu_proxy (item))
+    return TRUE;
 
+  label_widget = gtk_tool_button_get_label_widget (tool_button);
+  label_text = gtk_tool_button_get_label (tool_button);
+  stock_id = gtk_tool_button_get_stock_id (tool_button);
+
   if (GTK_IS_LABEL (label_widget))
     {
       label = gtk_label_get_label (GTK_LABEL (label_widget));
Index: gtk/gtktoolbutton.c
===================================================================
--- gtk/gtktoolbutton.c	(revision 22216)
+++ gtk/gtktoolbutton.c	(working copy)
@@ -642,6 +642,9 @@
   gboolean use_mnemonic = TRUE;
   const char *label;
 
+  if (_gtk_tool_item_create_menu_proxy (item))
+    return TRUE;
+ 
   if (GTK_IS_LABEL (button->priv->label_widget))
     {
       label = gtk_label_get_label (GTK_LABEL (button->priv->label_widget));
Index: gtk/gtkrecentchoosermenu.c
===================================================================
--- gtk/gtkrecentchoosermenu.c	(revision 22216)
+++ gtk/gtkrecentchoosermenu.c	(working copy)
@@ -970,6 +970,8 @@
 
 	  return FALSE;
 	}
+      else
+        gtk_widget_hide (pdata->placeholder);
       
       pdata->n_items = g_list_length (pdata->items);
       pdata->loaded_items = 0;
@@ -1056,9 +1058,8 @@
 
   priv->icon_size = get_icon_size_for_widget (GTK_WIDGET (menu));
   
-  /* remove our menu items first and hide the placeholder */
+  /* remove our menu items first */
   gtk_recent_chooser_menu_dispose_items (menu);
-  gtk_widget_hide (priv->placeholder);
   
   priv->populate_id = gdk_threads_add_idle_full (G_PRIORITY_HIGH_IDLE + 30,
   					         idle_populate_func,
Index: gtk/gtktoolitem.c
===================================================================
--- gtk/gtktoolitem.c	(revision 22216)
+++ gtk/gtktoolitem.c	(working copy)
@@ -127,8 +127,6 @@
 						const gchar *tip_text,
 						const gchar *tip_private);
 
-static gboolean gtk_tool_item_create_menu_proxy (GtkToolItem *item);
-
 static void gtk_tool_item_activatable_interface_init (GtkActivatableIface  *iface);
 static void gtk_tool_item_activatable_update         (GtkActivatable       *activatable,
 						      GtkAction            *action,
@@ -169,7 +167,7 @@
   widget_class->size_allocate = gtk_tool_item_size_allocate;
   widget_class->parent_set    = gtk_tool_item_parent_set;
 
-  klass->create_menu_proxy = gtk_tool_item_create_menu_proxy;
+  klass->create_menu_proxy = _gtk_tool_item_create_menu_proxy;
   klass->set_tooltip       = gtk_tool_item_real_set_tooltip;
   
   g_object_class_install_property (object_class,
@@ -554,8 +552,8 @@
     }
 }
 
-static gboolean
-gtk_tool_item_create_menu_proxy (GtkToolItem *item)
+gboolean
+_gtk_tool_item_create_menu_proxy (GtkToolItem *item)
 {
   GtkWidget *menu_item;
   gboolean visible_overflown;
@@ -574,6 +572,8 @@
 	}
       else
 	gtk_tool_item_set_proxy_menu_item (item, "gtk-action-menu-item", NULL);
+
+      return TRUE;
     }
 
   return FALSE;
Index: gtk/gtktoolitem.h
===================================================================
--- gtk/gtktoolitem.h	(revision 22216)
+++ gtk/gtktoolitem.h	(working copy)
@@ -128,6 +128,10 @@
 
 void            gtk_tool_item_toolbar_reconfigured     (GtkToolItem *tool_item);
 
+/* private */
+
+gboolean       _gtk_tool_item_create_menu_proxy        (GtkToolItem *tool_item);
+
 G_END_DECLS
 
 #endif /* __GTK_TOOL_ITEM_H__ */


Index: gtk2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtk2/devel/gtk2.spec,v
retrieving revision 1.346
retrieving revision 1.347
diff -u -r1.346 -r1.347
--- gtk2.spec	25 Jan 2009 03:42:16 -0000	1.346
+++ gtk2.spec	26 Jan 2009 03:03:26 -0000	1.347
@@ -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.15/gtk+-%{version}.tar.bz2
@@ -30,10 +30,12 @@
 Patch2: workaround.patch
 # http://bugzilla.redhat.com/show_bug.cgi?id=478400
 Patch3: default_printer.patch
+
 # fixed upstream
 Patch4: activatable-toolitem.patch
-# fixed upstream
 Patch5: imcontext-reset.patch
+Patch6: radio-proxy.patch
+Patch7: tool-proxy.patch
 
 BuildRequires: atk-devel >= %{atk_version}
 BuildRequires: pango-devel >= %{pango_version}
@@ -123,6 +125,8 @@
 %patch3 -p0 -b .default-printer
 %patch4 -p0 -b .activatable-toolitem
 %patch5 -p0 -b .imcontext-reset
+%patch6 -p1 -b .radio-proxy
+%patch7 -p1 -b .tool-proxy
 
 %build
 libtoolize --force --copy
@@ -300,6 +304,10 @@
 %{_datadir}/gtk-2.0
 
 %changelog
+* Sun Jan 25 2009 Matthias Clasen <mclasen at redhat.com> - 2.15.1-4
+- Draw radio action proxies as radio menuitems
+- Fix issues with toolitem action proxies and overflow
+
 * Sat Jan 24 2009 Matthias Clasen <mclasen at redhat.com> - 2.15.1-3
 - Avoid triggering an assertion that makes the gdm greeter nonfunctional
 



From mclasen at fedoraproject.org  Mon Jan 26 03:10:01 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Mon, 26 Jan 2009 03:10:01 +0000 (UTC)
Subject: rpms/gtk2/devel gtk2.spec,1.347,1.348
Message-ID: <20090126031001.5D3F67010C@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gtk2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16381

Modified Files:
	gtk2.spec 
Log Message:
fix spec



Index: gtk2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtk2/devel/gtk2.spec,v
retrieving revision 1.347
retrieving revision 1.348
diff -u -r1.347 -r1.348
--- gtk2.spec	26 Jan 2009 03:03:26 -0000	1.347
+++ gtk2.spec	26 Jan 2009 03:09:30 -0000	1.348
@@ -126,7 +126,7 @@
 %patch4 -p0 -b .activatable-toolitem
 %patch5 -p0 -b .imcontext-reset
 %patch6 -p1 -b .radio-proxy
-%patch7 -p1 -b .tool-proxy
+%patch7 -p0 -b .tool-proxy
 
 %build
 libtoolize --force --copy



From dignan at fedoraproject.org  Mon Jan 26 03:59:07 2009
From: dignan at fedoraproject.org (Patrick Dignan)
Date: Mon, 26 Jan 2009 03:59:07 +0000 (UTC)
Subject: rpms/jpcap/devel import.log, NONE, 1.1 jpcap.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090126035907.A24327010C@cvs1.fedora.phx.redhat.com>

Author: dignan

Update of /cvs/pkgs/rpms/jpcap/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24132/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log jpcap.spec 
Log Message:
* Tue Jan 06 2009 Patrick Dignan <jpdota at, sourceforge.net> 0.7-5
- Fixed End-of-line problems in README, ChangeLog, doc/javadoc/stylesheet.css, and doc/javadoc/package-list
- Fixed Directory ownership of _libdir/name (macros)
- No longer strips the binaries
- Added Fedora specific compilation flags to make
- Fixed x86_64 build by adding -fPIC to make
- JAVA_HOME now set by the java_home macro
- Removed require on libpcap
- Changed SourceURL to use the name and version macros



--- NEW FILE import.log ---
jpcap-0_7-5_fc10:HEAD:jpcap-0.7-5.fc10.src.rpm:1232937434


--- NEW FILE jpcap.spec ---
#
#     RPM package specification for Jpcap
#
#     Edited by Patrick Dignan
#     Originally made by Keita Fujii
#

Name: jpcap
Version: 0.7
Release: 5%{?dist}
Summary: A Java library for capturing and sending network packets

Group: Development/Libraries
License: LGPLv2+ and BSD with advertising
URL: http://netresearch.ics.uci.edu/kfujii/jpcap/
Source: http://netresearch.ics.uci.edu/kfujii/jpcap/%{name}-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: jpackage-utils, java-devel >= 1:1.6, libpcap-devel >= 0.9, ant, dos2unix
Requires: jpackage-utils, java >= 1:1.6

%description 
Jpcap is a Java library for capturing and
sending network packets from Java applications.
This Jpcap package requires Java 1.6 or higher 
and libpcap 0.9 or higher.

%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
rm -rf lib/*
dos2unix ChangeLog
dos2unix README
dos2unix doc/javadoc/package-list
dos2unix doc/javadoc/stylesheet.css

%build
export JAVA_HOME=%{java_home}
set JAVA_HOME=%{java_home}
mkdir bin
%{ant} jar
cd src/c
make clean
make %{?_smp_mflags} CC="gcc %{optflags} -fPIC"

%install
rm -rf $RPM_BUILD_ROOT

install -D src/c/libjpcap.so $RPM_BUILD_ROOT%{_libdir}/%{name}/libjpcap.so
install -D lib/jpcap.jar $RPM_BUILD_ROOT%{_libdir}/%{name}/jpcap.jar

mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}
cp -rp doc/javadoc/ $RPM_BUILD_ROOT%{_javadocdir}/%{name}

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc README COPYING ChangeLog
%dir %{_libdir}/%{name}
%{_libdir}/%{name}/libjpcap.so
%{_libdir}/%{name}/jpcap.jar

%files javadoc
%defattr(-,root,root,-)
%{_javadocdir}/%{name}


%changelog
* Tue Jan 06 2009 Patrick Dignan <jpdota at, sourceforge.net> 0.7-5
- Fixed End-of-line problems in README, ChangeLog, doc/javadoc/stylesheet.css, and doc/javadoc/package-list
- Fixed Directory ownership of _libdir/name (macros)
- No longer strips the binaries
- Added Fedora specific compilation flags to make
- Fixed x86_64 build by adding -fPIC to make
- JAVA_HOME now set by the java_home macro
- Removed require on libpcap
- Changed SourceURL to use the name and version macros


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/jpcap/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	15 Jan 2009 20:21:31 -0000	1.1
+++ .cvsignore	26 Jan 2009 03:58:35 -0000	1.2
@@ -0,0 +1 @@
+jpcap-0.7.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/jpcap/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	15 Jan 2009 20:21:31 -0000	1.1
+++ sources	26 Jan 2009 03:58:36 -0000	1.2
@@ -0,0 +1 @@
+faa3c4be407ce3419cad90150db391a5  jpcap-0.7.tar.gz



From pkgdb at fedoraproject.org  Mon Jan 26 04:14:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Jan 2009 04:14:40 +0000
Subject: [pkgdb] ruby-mechanize ownership updated
Message-ID: <20090126041440.81692208484@bastion.fedora.phx.redhat.com>

Package ruby-mechanize in Fedora devel was orphaned by mtasaka

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ruby-mechanize



From lmacken at fedoraproject.org  Mon Jan 26 05:14:25 2009
From: lmacken at fedoraproject.org (Luke Macken)
Date: Mon, 26 Jan 2009 05:14:25 +0000 (UTC)
Subject: rpms/net6/devel .cvsignore, 1.13, 1.14 net6.spec, 1.22, 1.23 sources,
	1.13, 1.14
Message-ID: <20090126051425.961607010C@cvs1.fedora.phx.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/net6/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3894

Modified Files:
	.cvsignore net6.spec sources 
Log Message:
Update to 1.3.9


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/net6/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	26 Jul 2008 18:58:22 -0000	1.13
+++ .cvsignore	26 Jan 2009 05:13:55 -0000	1.14
@@ -1 +1 @@
-net6-1.3.6.tar.gz
+net6-1.3.9.tar.gz


Index: net6.spec
===================================================================
RCS file: /cvs/pkgs/rpms/net6/devel/net6.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- net6.spec	26 Jul 2008 18:58:23 -0000	1.22
+++ net6.spec	26 Jan 2009 05:13:55 -0000	1.23
@@ -1,5 +1,5 @@
 Name:           net6
-Version:        1.3.6
+Version:        1.3.9
 Release:        1%{?dist}
 Summary:        A TCP protocol abstraction for library C++
 
@@ -71,6 +71,9 @@
 
 
 %changelog
+* Sun Jan 25 2009 Luke Macken <lmacken at redhat.com> - 1.3.9-1
+- Update to 1.3.9
+
 * Sat Jul 26 2008 Luke Macken <lmacken at redhat.com> - 1.3.6-1
 - Update to the latest upstream release.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/net6/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	26 Jul 2008 18:58:23 -0000	1.13
+++ sources	26 Jan 2009 05:13:55 -0000	1.14
@@ -1 +1 @@
-033734dff97af88741f41633fbe992bc  net6-1.3.6.tar.gz
+afab12d33fc201a7dbc2cfa116218079  net6-1.3.9.tar.gz



From lmacken at fedoraproject.org  Mon Jan 26 05:15:48 2009
From: lmacken at fedoraproject.org (Luke Macken)
Date: Mon, 26 Jan 2009 05:15:48 +0000 (UTC)
Subject: rpms/obby/devel .cvsignore, 1.13, 1.14 obby.spec, 1.32, 1.33 sources,
	1.13, 1.14
Message-ID: <20090126051548.6A9DA7010C@cvs1.fedora.phx.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/obby/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4157

Modified Files:
	.cvsignore obby.spec sources 
Log Message:
Update to 0.4.7


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/obby/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	13 Sep 2008 00:16:52 -0000	1.13
+++ .cvsignore	26 Jan 2009 05:15:18 -0000	1.14
@@ -1 +1 @@
-obby-0.4.6.tar.gz
+obby-0.4.7.tar.gz


Index: obby.spec
===================================================================
RCS file: /cvs/pkgs/rpms/obby/devel/obby.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- obby.spec	13 Sep 2008 00:16:52 -0000	1.32
+++ obby.spec	26 Jan 2009 05:15:18 -0000	1.33
@@ -1,5 +1,5 @@
 Name:           obby
-Version:        0.4.6
+Version:        0.4.7
 Release:        1%{?dist}
 Summary:        A library which provides synced document buffers
 
@@ -65,6 +65,9 @@
 
 
 %changelog
+* Sun Jan 25 2009 Luke Macken <lmacken at redhat.com> - 0.4.7-1
+- Update to 0.4.7
+
 * Thu Sep 11 2008 Luke Macken <lmacken at redhat.com> - 0.4.6-1
 - Update to the latest upstream release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/obby/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	13 Sep 2008 00:16:52 -0000	1.13
+++ sources	26 Jan 2009 05:15:18 -0000	1.14
@@ -1 +1 @@
-500c23f64249967596259daddf97f711  obby-0.4.6.tar.gz
+33fac4228c1efc1a1635bacf6480dc31  obby-0.4.7.tar.gz



From lmacken at fedoraproject.org  Mon Jan 26 05:17:17 2009
From: lmacken at fedoraproject.org (Luke Macken)
Date: Mon, 26 Jan 2009 05:17:17 +0000 (UTC)
Subject: rpms/gobby/devel .cvsignore, 1.15, 1.16 gobby.spec, 1.32,
	1.33 sources, 1.15, 1.16
Message-ID: <20090126051717.B63EF7010C@cvs1.fedora.phx.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/gobby/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4419

Modified Files:
	.cvsignore gobby.spec sources 
Log Message:
Update to 0.4.10


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gobby/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	13 Sep 2008 00:17:43 -0000	1.15
+++ .cvsignore	26 Jan 2009 05:16:47 -0000	1.16
@@ -1 +1 @@
-gobby-0.4.7.tar.gz
+gobby-0.4.10.tar.gz


Index: gobby.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gobby/devel/gobby.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- gobby.spec	21 Nov 2008 20:31:22 -0000	1.32
+++ gobby.spec	26 Jan 2009 05:16:47 -0000	1.33
@@ -1,6 +1,6 @@
 Name:           gobby
-Version:        0.4.7
-Release:        2%{?dist}
+Version:        0.4.10
+Release:        1%{?dist}
 Summary:        Free collaborative editor
 
 Group:          Applications/Internet
@@ -64,11 +64,18 @@
 %doc README NEWS AUTHORS COPYING ChangeLog
 %{_bindir}/gobby
 %{_datadir}/applications/fedora-gobby.desktop
-%{_datadir}/pixmaps/*
+%{_datadir}/icons/hicolor/48x48/apps/gobby.png
+%{_datadir}/icons/hicolor/scalable/apps/gobby.svg
+%{_datadir}/icons/HighContrastLargePrintInverse/48x48/apps/gobby.png
+%{_datadir}/icons/HighContrastLargePrintInverse/scalable/apps/gobby.svg
+%{_datadir}/pixmaps/gobby/
 %{_mandir}/man1/*
 
 
 %changelog
+* Sun Jan 25 2009 Luke Macken <lmacken at redhat.com> - 0.4.10-1
+- Update to 0.4.10
+
 * Fri Nov 21 2008 Luke Macken <lmacken at redhat.com> - 0.4.7-2
 - Change license tag to GPLv2+ (#461663)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gobby/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	13 Sep 2008 00:17:43 -0000	1.15
+++ sources	26 Jan 2009 05:16:47 -0000	1.16
@@ -1 +1 @@
-88b1bd42d643f73fbaac18c8973f4853  gobby-0.4.7.tar.gz
+f100f0bfa51970f0d093f870a695054f  gobby-0.4.10.tar.gz



From mtasaka at fedoraproject.org  Mon Jan 26 05:31:04 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Mon, 26 Jan 2009 05:31:04 +0000 (UTC)
Subject: rpms/cairo-dock/devel .cvsignore, 1.106, 1.107 cairo-dock.spec,
	1.143, 1.144 sources, 1.106, 1.107
Message-ID: <20090126053104.D559F7010C@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/cairo-dock/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6136

Modified Files:
	.cvsignore cairo-dock.spec sources 
Log Message:
* Mon Jan 26 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
- rev 1501



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cairo-dock/devel/.cvsignore,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -r1.106 -r1.107
--- .cvsignore	24 Jan 2009 05:21:34 -0000	1.106
+++ .cvsignore	26 Jan 2009 05:30:34 -0000	1.107
@@ -1 +1 @@
-cairo-dock-sources-svn1498_trunk.tar.bz2
+cairo-dock-sources-svn1501_trunk.tar.bz2


Index: cairo-dock.spec
===================================================================
RCS file: /cvs/extras/rpms/cairo-dock/devel/cairo-dock.spec,v
retrieving revision 1.143
retrieving revision 1.144
diff -u -r1.143 -r1.144
--- cairo-dock.spec	24 Jan 2009 05:21:34 -0000	1.143
+++ cairo-dock.spec	26 Jan 2009 05:30:34 -0000	1.144
@@ -14,7 +14,7 @@
 %undefine		betaver		
 %define		build_webkit	1
 %define		build_xfce	1
-%define		tarballver	svn1498_trunk
+%define		tarballver	svn1501_trunk
 
 %define		fedora_main_rel	3
 
@@ -267,8 +267,6 @@
 	-e '/^GETTEXT_PACKAGE/s|@GETTEXT_PACKAGE@|@GETTEXT_WEBLETS@|' \
 	po/Makefile.in.in
 
-## Need check
-sed -i.tmp '/cairo_dock_build_dialog/d' src/applet-*.c
 cd ..
 
 
@@ -361,7 +359,6 @@
 # (and now we are all F-9+...)
 %configure \
 	--enable-gio \
-	--enable-weblets \
 
 # Parallel make fails some times, but it is gerenally fast
 # so do parallel make anyway first
@@ -642,8 +639,8 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
-* Sat Jan 24 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
-- rev 1498
+* Mon Jan 26 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- rev 1501
 
 * Thu Jan 22 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
 - rev 1496


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cairo-dock/devel/sources,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -r1.106 -r1.107
--- sources	24 Jan 2009 05:21:34 -0000	1.106
+++ sources	26 Jan 2009 05:30:34 -0000	1.107
@@ -1 +1 @@
-96f655e8730fdf44f548b3a28561ae92  cairo-dock-sources-svn1498_trunk.tar.bz2
+74ed0cc55f3f7f5c7d52896d4a6bda35  cairo-dock-sources-svn1501_trunk.tar.bz2



From dignan at fedoraproject.org  Mon Jan 26 05:44:40 2009
From: dignan at fedoraproject.org (Patrick Dignan)
Date: Mon, 26 Jan 2009 05:44:40 +0000 (UTC)
Subject: rpms/jpcap/F-9 import.log, NONE, 1.1 jpcap.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090126054440.A54D17010C@cvs1.fedora.phx.redhat.com>

Author: dignan

Update of /cvs/pkgs/rpms/jpcap/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8504/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	import.log jpcap.spec 
Log Message:
* Tue Jan 06 2009 Patrick Dignan <jpdota at, sourceforge.net> 0.7-5
- Fixed End-of-line problems in README, ChangeLog, doc/javadoc/stylesheet.css, and doc/javadoc/package-list
- Fixed Directory ownership of _libdir/name (macros)
- No longer strips the binaries
- Added Fedora specific compilation flags to make
- Fixed x86_64 build by adding -fPIC to make
- JAVA_HOME now set by the java_home macro
- Removed require on libpcap
- Changed SourceURL to use the name and version macros



--- NEW FILE import.log ---
jpcap-0_7-5_fc10:F-9:jpcap-0.7-5.fc10.src.rpm:1232948572


--- NEW FILE jpcap.spec ---
#
#     RPM package specification for Jpcap
#
#     Edited by Patrick Dignan
#     Originally made by Keita Fujii
#

Name: jpcap
Version: 0.7
Release: 5%{?dist}
Summary: A Java library for capturing and sending network packets

Group: Development/Libraries
License: LGPLv2+ and BSD with advertising
URL: http://netresearch.ics.uci.edu/kfujii/jpcap/
Source: http://netresearch.ics.uci.edu/kfujii/jpcap/%{name}-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: jpackage-utils, java-devel >= 1:1.6, libpcap-devel >= 0.9, ant, dos2unix
Requires: jpackage-utils, java >= 1:1.6

%description 
Jpcap is a Java library for capturing and
sending network packets from Java applications.
This Jpcap package requires Java 1.6 or higher 
and libpcap 0.9 or higher.

%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
rm -rf lib/*
dos2unix ChangeLog
dos2unix README
dos2unix doc/javadoc/package-list
dos2unix doc/javadoc/stylesheet.css

%build
export JAVA_HOME=%{java_home}
set JAVA_HOME=%{java_home}
mkdir bin
%{ant} jar
cd src/c
make clean
make %{?_smp_mflags} CC="gcc %{optflags} -fPIC"

%install
rm -rf $RPM_BUILD_ROOT

install -D src/c/libjpcap.so $RPM_BUILD_ROOT%{_libdir}/%{name}/libjpcap.so
install -D lib/jpcap.jar $RPM_BUILD_ROOT%{_libdir}/%{name}/jpcap.jar

mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}
cp -rp doc/javadoc/ $RPM_BUILD_ROOT%{_javadocdir}/%{name}

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc README COPYING ChangeLog
%dir %{_libdir}/%{name}
%{_libdir}/%{name}/libjpcap.so
%{_libdir}/%{name}/jpcap.jar

%files javadoc
%defattr(-,root,root,-)
%{_javadocdir}/%{name}


%changelog
* Tue Jan 06 2009 Patrick Dignan <jpdota at, sourceforge.net> 0.7-5
- Fixed End-of-line problems in README, ChangeLog, doc/javadoc/stylesheet.css, and doc/javadoc/package-list
- Fixed Directory ownership of _libdir/name (macros)
- No longer strips the binaries
- Added Fedora specific compilation flags to make
- Fixed x86_64 build by adding -fPIC to make
- JAVA_HOME now set by the java_home macro
- Removed require on libpcap
- Changed SourceURL to use the name and version macros


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/jpcap/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	15 Jan 2009 20:21:31 -0000	1.1
+++ .cvsignore	26 Jan 2009 05:44:10 -0000	1.2
@@ -0,0 +1 @@
+jpcap-0.7.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/jpcap/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	15 Jan 2009 20:21:31 -0000	1.1
+++ sources	26 Jan 2009 05:44:10 -0000	1.2
@@ -0,0 +1 @@
+faa3c4be407ce3419cad90150db391a5  jpcap-0.7.tar.gz



From remi at fedoraproject.org  Mon Jan 26 05:47:52 2009
From: remi at fedoraproject.org (Remi Collet)
Date: Mon, 26 Jan 2009 05:47:52 +0000 (UTC)
Subject: rpms/glpi/devel .cvsignore, 1.12, 1.13 glpi.spec, 1.19, 1.20 sources,
	1.14, 1.15
Message-ID: <20090126054752.9BE1C7010C@cvs1.fedora.phx.redhat.com>

Author: remi

Update of /cvs/extras/rpms/glpi/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9035

Modified Files:
	.cvsignore glpi.spec sources 
Log Message:
update to 0.71.4 - SECURITY Release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/glpi/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	30 Nov 2008 16:05:51 -0000	1.12
+++ .cvsignore	26 Jan 2009 05:47:22 -0000	1.13
@@ -1 +1 @@
-glpi-0.71.3.tar.gz
+glpi-0.71.4.tar.gz


Index: glpi.spec
===================================================================
RCS file: /cvs/extras/rpms/glpi/devel/glpi.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- glpi.spec	30 Nov 2008 16:05:51 -0000	1.19
+++ glpi.spec	26 Jan 2009 05:47:22 -0000	1.20
@@ -5,7 +5,7 @@
 %endif
 
 Name:           glpi
-Version:        0.71.3
+Version:        0.71.4
 Release:        1%{?dist}
 Summary:        Free IT asset management software
 Summary(fr):    Gestion Libre de Parc Informatique
@@ -230,6 +230,9 @@
 
 
 %changelog
+* Mon Jan 26 2009 Remi Collet <Fedora at FamilleCollet.com> - 0.71.4-1
+- update to 0.71.4 (Security Release)
+
 * Sun Nov 30 2008 Remi Collet <Fedora at FamilleCollet.com> - 0.71.3-1
 - update to 0.71.3 (bugfix release)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/glpi/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	30 Nov 2008 16:05:51 -0000	1.14
+++ sources	26 Jan 2009 05:47:22 -0000	1.15
@@ -1 +1 @@
-0ad7e379f69cc81c59d5b297ab83474a  glpi-0.71.3.tar.gz
+d7e4ae789408616b67ea6d598bc3cc51  glpi-0.71.4.tar.gz



From remi at fedoraproject.org  Mon Jan 26 05:53:42 2009
From: remi at fedoraproject.org (Remi Collet)
Date: Mon, 26 Jan 2009 05:53:42 +0000 (UTC)
Subject: rpms/glpi/F-10 glpi.spec,1.19,1.20 sources,1.14,1.15
Message-ID: <20090126055342.6D4D27010C@cvs1.fedora.phx.redhat.com>

Author: remi

Update of /cvs/extras/rpms/glpi/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9847

Modified Files:
	glpi.spec sources 
Log Message:
update to 0.71.4 - SECURITY Release


Index: glpi.spec
===================================================================
RCS file: /cvs/extras/rpms/glpi/F-10/glpi.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- glpi.spec	30 Nov 2008 16:10:36 -0000	1.19
+++ glpi.spec	26 Jan 2009 05:53:12 -0000	1.20
@@ -5,7 +5,7 @@
 %endif
 
 Name:           glpi
-Version:        0.71.3
+Version:        0.71.4
 Release:        1%{?dist}
 Summary:        Free IT asset management software
 Summary(fr):    Gestion Libre de Parc Informatique
@@ -230,6 +230,9 @@
 
 
 %changelog
+* Mon Jan 26 2009 Remi Collet <Fedora at FamilleCollet.com> - 0.71.4-1
+- update to 0.71.4 (Security Release)
+
 * Sun Nov 30 2008 Remi Collet <Fedora at FamilleCollet.com> - 0.71.3-1
 - update to 0.71.3 (bugfix release)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/glpi/F-10/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	30 Nov 2008 16:10:36 -0000	1.14
+++ sources	26 Jan 2009 05:53:12 -0000	1.15
@@ -1 +1 @@
-0ad7e379f69cc81c59d5b297ab83474a  glpi-0.71.3.tar.gz
+d7e4ae789408616b67ea6d598bc3cc51  glpi-0.71.4.tar.gz



From remi at fedoraproject.org  Mon Jan 26 05:55:16 2009
From: remi at fedoraproject.org (Remi Collet)
Date: Mon, 26 Jan 2009 05:55:16 +0000 (UTC)
Subject: rpms/glpi/F-9 glpi.spec,1.19,1.20 sources,1.14,1.15
Message-ID: <20090126055516.888F87010C@cvs1.fedora.phx.redhat.com>

Author: remi

Update of /cvs/extras/rpms/glpi/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10200

Modified Files:
	glpi.spec sources 
Log Message:
update to 0.71.4 - SECURITY Release


Index: glpi.spec
===================================================================
RCS file: /cvs/extras/rpms/glpi/F-9/glpi.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- glpi.spec	30 Nov 2008 16:16:32 -0000	1.19
+++ glpi.spec	26 Jan 2009 05:54:46 -0000	1.20
@@ -5,7 +5,7 @@
 %endif
 
 Name:           glpi
-Version:        0.71.3
+Version:        0.71.4
 Release:        1%{?dist}
 Summary:        Free IT asset management software
 Summary(fr):    Gestion Libre de Parc Informatique
@@ -230,6 +230,9 @@
 
 
 %changelog
+* Mon Jan 26 2009 Remi Collet <Fedora at FamilleCollet.com> - 0.71.4-1
+- update to 0.71.4 (Security Release)
+
 * Sun Nov 30 2008 Remi Collet <Fedora at FamilleCollet.com> - 0.71.3-1
 - update to 0.71.3 (bugfix release)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/glpi/F-9/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	30 Nov 2008 16:16:32 -0000	1.14
+++ sources	26 Jan 2009 05:54:46 -0000	1.15
@@ -1 +1 @@
-0ad7e379f69cc81c59d5b297ab83474a  glpi-0.71.3.tar.gz
+d7e4ae789408616b67ea6d598bc3cc51  glpi-0.71.4.tar.gz



From dignan at fedoraproject.org  Mon Jan 26 05:56:35 2009
From: dignan at fedoraproject.org (Patrick Dignan)
Date: Mon, 26 Jan 2009 05:56:35 +0000 (UTC)
Subject: rpms/jpcap/F-10 import.log, NONE, 1.1 jpcap.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090126055635.E1F487010C@cvs1.fedora.phx.redhat.com>

Author: dignan

Update of /cvs/pkgs/rpms/jpcap/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10408/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	import.log jpcap.spec 
Log Message:
* Tue Jan 06 2009 Patrick Dignan <jpdota at, sourceforge.net> 0.7-5
- Fixed End-of-line problems in README, ChangeLog, doc/javadoc/stylesheet.css, and doc/javadoc/package-list
- Fixed Directory ownership of _libdir/name (macros)
- No longer strips the binaries
- Added Fedora specific compilation flags to make
- Fixed x86_64 build by adding -fPIC to make
- JAVA_HOME now set by the java_home macro
- Removed require on libpcap
- Changed SourceURL to use the name and version macros



--- NEW FILE import.log ---
jpcap-0_7-5_fc10:F-10:jpcap-0.7-5.fc10.src.rpm:1232949238


--- NEW FILE jpcap.spec ---
#
#     RPM package specification for Jpcap
#
#     Edited by Patrick Dignan
#     Originally made by Keita Fujii
#

Name: jpcap
Version: 0.7
Release: 5%{?dist}
Summary: A Java library for capturing and sending network packets

Group: Development/Libraries
License: LGPLv2+ and BSD with advertising
URL: http://netresearch.ics.uci.edu/kfujii/jpcap/
Source: http://netresearch.ics.uci.edu/kfujii/jpcap/%{name}-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: jpackage-utils, java-devel >= 1:1.6, libpcap-devel >= 0.9, ant, dos2unix
Requires: jpackage-utils, java >= 1:1.6

%description 
Jpcap is a Java library for capturing and
sending network packets from Java applications.
This Jpcap package requires Java 1.6 or higher 
and libpcap 0.9 or higher.

%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
rm -rf lib/*
dos2unix ChangeLog
dos2unix README
dos2unix doc/javadoc/package-list
dos2unix doc/javadoc/stylesheet.css

%build
export JAVA_HOME=%{java_home}
set JAVA_HOME=%{java_home}
mkdir bin
%{ant} jar
cd src/c
make clean
make %{?_smp_mflags} CC="gcc %{optflags} -fPIC"

%install
rm -rf $RPM_BUILD_ROOT

install -D src/c/libjpcap.so $RPM_BUILD_ROOT%{_libdir}/%{name}/libjpcap.so
install -D lib/jpcap.jar $RPM_BUILD_ROOT%{_libdir}/%{name}/jpcap.jar

mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}
cp -rp doc/javadoc/ $RPM_BUILD_ROOT%{_javadocdir}/%{name}

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc README COPYING ChangeLog
%dir %{_libdir}/%{name}
%{_libdir}/%{name}/libjpcap.so
%{_libdir}/%{name}/jpcap.jar

%files javadoc
%defattr(-,root,root,-)
%{_javadocdir}/%{name}


%changelog
* Tue Jan 06 2009 Patrick Dignan <jpdota at, sourceforge.net> 0.7-5
- Fixed End-of-line problems in README, ChangeLog, doc/javadoc/stylesheet.css, and doc/javadoc/package-list
- Fixed Directory ownership of _libdir/name (macros)
- No longer strips the binaries
- Added Fedora specific compilation flags to make
- Fixed x86_64 build by adding -fPIC to make
- JAVA_HOME now set by the java_home macro
- Removed require on libpcap
- Changed SourceURL to use the name and version macros


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/jpcap/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	15 Jan 2009 20:21:31 -0000	1.1
+++ .cvsignore	26 Jan 2009 05:56:05 -0000	1.2
@@ -0,0 +1 @@
+jpcap-0.7.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/jpcap/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	15 Jan 2009 20:21:31 -0000	1.1
+++ sources	26 Jan 2009 05:56:05 -0000	1.2
@@ -0,0 +1 @@
+faa3c4be407ce3419cad90150db391a5  jpcap-0.7.tar.gz



From remi at fedoraproject.org  Mon Jan 26 05:57:17 2009
From: remi at fedoraproject.org (Remi Collet)
Date: Mon, 26 Jan 2009 05:57:17 +0000 (UTC)
Subject: rpms/glpi/EL-5 glpi.spec,1.10,1.11 sources,1.7,1.8
Message-ID: <20090126055717.6FD737010C@cvs1.fedora.phx.redhat.com>

Author: remi

Update of /cvs/extras/rpms/glpi/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10540

Modified Files:
	glpi.spec sources 
Log Message:
update to 0.71.4 - SECURITY Release


Index: glpi.spec
===================================================================
RCS file: /cvs/extras/rpms/glpi/EL-5/glpi.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- glpi.spec	30 Nov 2008 16:29:13 -0000	1.10
+++ glpi.spec	26 Jan 2009 05:56:47 -0000	1.11
@@ -5,7 +5,7 @@
 %endif
 
 Name:           glpi
-Version:        0.71.3
+Version:        0.71.4
 Release:        1%{?dist}
 Summary:        Free IT asset management software
 Summary(fr):    Gestion Libre de Parc Informatique
@@ -230,6 +230,9 @@
 
 
 %changelog
+* Mon Jan 26 2009 Remi Collet <Fedora at FamilleCollet.com> - 0.71.4-1
+- update to 0.71.4 (Security Release)
+
 * Sun Nov 30 2008 Remi Collet <Fedora at FamilleCollet.com> - 0.71.3-1
 - update to 0.71.3 (bugfix release)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/glpi/EL-5/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	30 Nov 2008 16:29:13 -0000	1.7
+++ sources	26 Jan 2009 05:56:47 -0000	1.8
@@ -1 +1 @@
-0ad7e379f69cc81c59d5b297ab83474a  glpi-0.71.3.tar.gz
+d7e4ae789408616b67ea6d598bc3cc51  glpi-0.71.4.tar.gz



From remi at fedoraproject.org  Mon Jan 26 05:58:54 2009
From: remi at fedoraproject.org (Remi Collet)
Date: Mon, 26 Jan 2009 05:58:54 +0000 (UTC)
Subject: rpms/glpi/EL-4 glpi.spec,1.8,1.9 sources,1.7,1.8
Message-ID: <20090126055854.1192D7010C@cvs1.fedora.phx.redhat.com>

Author: remi

Update of /cvs/extras/rpms/glpi/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10866

Modified Files:
	glpi.spec sources 
Log Message:
update to 0.71.4 - SECURITY Release


Index: glpi.spec
===================================================================
RCS file: /cvs/extras/rpms/glpi/EL-4/glpi.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- glpi.spec	30 Nov 2008 16:36:35 -0000	1.8
+++ glpi.spec	26 Jan 2009 05:58:23 -0000	1.9
@@ -5,7 +5,7 @@
 %endif
 
 Name:           glpi
-Version:        0.71.3
+Version:        0.71.4
 Release:        1%{?dist}
 Summary:        Free IT asset management software
 Summary(fr):    Gestion Libre de Parc Informatique
@@ -230,6 +230,9 @@
 
 
 %changelog
+* Mon Jan 26 2009 Remi Collet <Fedora at FamilleCollet.com> - 0.71.4-1
+- update to 0.71.4 (Security Release)
+
 * Sun Nov 30 2008 Remi Collet <Fedora at FamilleCollet.com> - 0.71.3-1
 - update to 0.71.3 (bugfix release)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/glpi/EL-4/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	30 Nov 2008 16:36:35 -0000	1.7
+++ sources	26 Jan 2009 05:58:23 -0000	1.8
@@ -1 +1 @@
-0ad7e379f69cc81c59d5b297ab83474a  glpi-0.71.3.tar.gz
+d7e4ae789408616b67ea6d598bc3cc51  glpi-0.71.4.tar.gz



From kyle at fedoraproject.org  Mon Jan 26 06:44:24 2009
From: kyle at fedoraproject.org (Kyle McMartin)
Date: Mon, 26 Jan 2009 06:44:24 +0000 (UTC)
Subject: rpms/squashfs-tools/devel .cvsignore,1.7,1.8
Message-ID: <20090126064424.5A2367010C@cvs1.fedora.phx.redhat.com>

Author: kyle

Update of /cvs/pkgs/rpms/squashfs-tools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17619

Modified Files:
	.cvsignore 
Log Message:
cvsignore update


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/squashfs-tools/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	12 Jan 2009 22:57:19 -0000	1.7
+++ .cvsignore	26 Jan 2009 06:43:53 -0000	1.8
@@ -1 +1,2 @@
+squashfs
 squashfs-20090112.tar.bz2



From kyle at fedoraproject.org  Mon Jan 26 06:54:25 2009
From: kyle at fedoraproject.org (Kyle McMartin)
Date: Mon, 26 Jan 2009 06:54:25 +0000 (UTC)
Subject: rpms/squashfs-tools/devel .cvsignore, 1.8, 1.9 sources, 1.7,
	1.8 squashfs-tools.spec, 1.19, 1.20
Message-ID: <20090126065425.8E8AA7010C@cvs1.fedora.phx.redhat.com>

Author: kyle

Update of /cvs/pkgs/rpms/squashfs-tools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19028

Modified Files:
	.cvsignore sources squashfs-tools.spec 
Log Message:
* Mon Jan 26 2009 Kyle McMartin <kyle at redhat.com> - 4.0-0.20090125
- update to cvs snap that should unbreak big endian machines creating
  little endian fs.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/squashfs-tools/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	26 Jan 2009 06:43:53 -0000	1.8
+++ .cvsignore	26 Jan 2009 06:53:55 -0000	1.9
@@ -1,2 +1,2 @@
 squashfs
-squashfs-20090112.tar.bz2
+squashfs-20090125.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/squashfs-tools/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	12 Jan 2009 22:57:19 -0000	1.7
+++ sources	26 Jan 2009 06:53:55 -0000	1.8
@@ -1 +1 @@
-73e3445f064d29a5f244afc1a9c8172a  squashfs-20090112.tar.bz2
+5e92416f598d46e2e403854e77ab3090  squashfs-20090125.tar.bz2


Index: squashfs-tools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/squashfs-tools/devel/squashfs-tools.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- squashfs-tools.spec	12 Jan 2009 22:57:19 -0000	1.19
+++ squashfs-tools.spec	26 Jan 2009 06:53:55 -0000	1.20
@@ -1,12 +1,12 @@
 Summary: Utility for the creation of squashfs filesystems
 Name: squashfs-tools
 Version: 4.0
-# cvs snapshot from cvs -d:pserver:anonymous at squashfs.cvs.sourceforge.net:/cvsroot/squashfs co squashfs on 2009-01-12
-Release: 0.20090112
+# cvs snapshot from cvs -d:pserver:anonymous at squashfs.cvs.sourceforge.net:/cvsroot/squashfs co squashfs on 2009-01-25
+Release: 0.20090125
 License: GPLv2+
 Group: System Environment/Base
 URL: http://squashfs.sf.net
-Source0: squashfs-20090112.tar.bz2
+Source0: squashfs-20090125.tar.bz2
 Patch0: squashfs-cflags.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: zlib-devel
@@ -42,6 +42,10 @@
 #%{_sbindir}/unsquashfs
 
 %changelog
+* Mon Jan 26 2009 Kyle McMartin <kyle at redhat.com> - 4.0-0.20090125
+- update to cvs snap that should unbreak big endian machines creating
+  little endian fs.
+
 * Mon Jan 12 2009  <katzj at redhat.com> - 4.0-0.20090112
 - update to cvs snap that generates v4.0 images
 



From kyle at fedoraproject.org  Mon Jan 26 06:57:15 2009
From: kyle at fedoraproject.org (Kyle McMartin)
Date: Mon, 26 Jan 2009 06:57:15 +0000 (UTC)
Subject: rpms/squashfs-tools/devel .cvsignore,1.9,1.10
Message-ID: <20090126065715.9B7B37010C@cvs1.fedora.phx.redhat.com>

Author: kyle

Update of /cvs/pkgs/rpms/squashfs-tools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19491

Modified Files:
	.cvsignore 
Log Message:
add clog to .cvsignore


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/squashfs-tools/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	26 Jan 2009 06:53:55 -0000	1.9
+++ .cvsignore	26 Jan 2009 06:56:45 -0000	1.10
@@ -1,2 +1,3 @@
 squashfs
+clog
 squashfs-20090125.tar.bz2



From jstanley at fedoraproject.org  Mon Jan 26 07:09:01 2009
From: jstanley at fedoraproject.org (Jon Stanley)
Date: Mon, 26 Jan 2009 07:09:01 +0000 (UTC)
Subject: rpms/supybot-fedora/devel sources, 1.4, 1.5 supybot-fedora.spec, 1.3,
	1.4
Message-ID: <20090126070901.0BBF57010C@cvs1.fedora.phx.redhat.com>

Author: jstanley

Update of /cvs/pkgs/rpms/supybot-fedora/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20976

Modified Files:
	sources supybot-fedora.spec 
Log Message:
update to upstream 0.2.3



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/supybot-fedora/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	11 Jan 2009 20:26:57 -0000	1.4
+++ sources	26 Jan 2009 07:08:30 -0000	1.5
@@ -1 +1 @@
-3a309594f00858990b963fe442d4fea6  supybot-fedora-0.2.2.tar.bz2
+a1837d9a035eb217bb5c5a98a242fa22  supybot-fedora-0.2.3.tar.bz2


Index: supybot-fedora.spec
===================================================================
RCS file: /cvs/pkgs/rpms/supybot-fedora/devel/supybot-fedora.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- supybot-fedora.spec	11 Jan 2009 20:26:57 -0000	1.3
+++ supybot-fedora.spec	26 Jan 2009 07:08:30 -0000	1.4
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           supybot-fedora
-Version:        0.2.2
+Version:        0.2.3
 Release:        1%{?dist}
 Summary:        Plugin for Supybot to interact with Fedora services
 
@@ -54,6 +54,9 @@
 
 
 %changelog
+* Sun Jan 25 2009 Jon Stanley <jonstanley at gmail.com> - 0.2.3-1
+- New upstream 0.2.3
+
 * Sun Jan 11 2009 Jon Stanley <jonstanley at gmail.com> - 0.2.2-1
 - New upstream 0.2.2
 



From kyle at fedoraproject.org  Mon Jan 26 07:19:43 2009
From: kyle at fedoraproject.org (Kyle McMartin)
Date: Mon, 26 Jan 2009 07:19:43 +0000 (UTC)
Subject: rpms/kernel/devel config-arm, NONE, 1.1 Makefile.config, 1.68,
	1.69 kernel.spec, 1.1230, 1.1231
Message-ID: <20090126071943.A50B07010C@cvs1.fedora.phx.redhat.com>

Author: kyle

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23250

Modified Files:
	Makefile.config kernel.spec 
Added Files:
	config-arm 
Log Message:
add arm support from Kedar Sovani


--- NEW FILE config-arm ---
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
# CONFIG_SMP is not set

CONFIG_CC_OPTIMIZE_FOR_SIZE=y

CONFIG_ARCH_VERSATILE=y

CONFIG_ARM_THUMB=y

CONFIG_AEABI=y
CONFIG_OABI_COMPAT=y

CONFIG_CMDLINE="console=ttyAM0,115200 root=/dev/sda1 rootdelay=20"



Index: Makefile.config
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/Makefile.config,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- Makefile.config	21 Oct 2008 20:02:27 -0000	1.68
+++ Makefile.config	26 Jan 2009 07:19:13 -0000	1.69
@@ -9,7 +9,7 @@
 	$(CFG)-i686.config $(CFG)-i686-PAE.config \
 	$(CFG)-i686-debug.config $(CFG)-i686-PAEdebug.config \
 	$(CFG)-x86_64.config $(CFG)-x86_64-debug.config \
-	$(CFG)-s390x.config \
+	$(CFG)-s390x.config $(CFG)-arm.config \
 	$(CFG)-ppc.config $(CFG)-ppc-smp.config \
 	$(CFG)-sparc64.config $(CFG)-sparc64-smp.config \
 	$(CFG)-ppc64.config $(CFG)-ppc64-kdump.config $(CFG)-ppc64-debug.config \
@@ -102,6 +102,9 @@
 kernel-$(VERSION)-s390x.config: config-s390x temp-s390-generic
 	perl merge.pl $^ s390 > $@
 
+kernel-$(VERSION)-arm.config: config-arm temp-generic
+	perl merge.pl $^ arm > $@
+
 kernel-$(VERSION)-ppc.config: /dev/null temp-powerpc32-generic
 	perl merge.pl $^ powerpc > $@
 


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1230
retrieving revision 1.1231
diff -u -r1.1230 -r1.1231
--- kernel.spec	24 Jan 2009 09:38:35 -0000	1.1230
+++ kernel.spec	26 Jan 2009 07:19:13 -0000	1.1231
@@ -347,6 +347,14 @@
 %define kernel_image vmlinux
 %endif
 
+%ifarch %{arm}
+%define all_arch_configs kernel-%{version}-arm*.config
+%define image_install_path boot
+%define hdrarch arm
+%define make_target vmlinux
+%define kernel_image vmlinux
+%endif
+
 %if %{nopatches}
 # XXX temporary until last vdso patches are upstream
 %define vdso_arches ppc ppc64
@@ -367,8 +375,8 @@
 # Which is a BadThing(tm).
 
 # We don't build a kernel on i386; we only do kernel-headers there,
-# and we no longer build for 31bit S390. Same for 32bit sparc.
-%define nobuildarches i386 s390 sparc
+# and we no longer build for 31bit S390. Same for 32bit sparc and arm.
+%define nobuildarches i386 s390 sparc %{arm}
 
 %ifarch %nobuildarches
 %define with_up 0
@@ -463,7 +471,7 @@
 Release: %{pkg_release}
 # DO NOT CHANGE THE 'ExclusiveArch' LINE TO TEMPORARILY EXCLUDE AN ARCHITECTURE BUILD.
 # SET %%nobuildarches (ABOVE) INSTEAD
-ExclusiveArch: noarch %{all_x86} x86_64 ppc ppc64 ia64 sparc sparc64 s390x alpha alphaev56
+ExclusiveArch: noarch %{all_x86} x86_64 ppc ppc64 ia64 sparc sparc64 s390x alpha alphaev56 %{arm}
 ExclusiveOS: Linux
 
 %kernel_reqprovconf
@@ -532,6 +540,9 @@
 Source90: config-sparc64-generic
 Source91: config-sparc64-smp
 
+Source100: config-arm
+
+%if %{using_upstream_branch}
 # Here should be only the patches up to the upstream canonical Linus tree.
 
 # For a stable release kernel
@@ -562,7 +573,6 @@
 %endif
 %endif
 
-%if %{using_upstream_branch}
 ### BRANCH PATCH ###
 %endif
 



From alexlan at fedoraproject.org  Mon Jan 26 07:28:34 2009
From: alexlan at fedoraproject.org (Alex Lancaster)
Date: Mon, 26 Jan 2009 07:28:34 +0000 (UTC)
Subject: rpms/perl-bioperl/devel .cvsignore, 1.7, 1.8 perl-bioperl.spec, 1.19,
	1.20 sources, 1.8, 1.9
Message-ID: <20090126072834.B969A7010C@cvs1.fedora.phx.redhat.com>

Author: alexlan

Update of /cvs/extras/rpms/perl-bioperl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24593

Modified Files:
	.cvsignore perl-bioperl.spec sources 
Log Message:
- Update to 1.6.0 final release



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-bioperl/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	22 Jan 2009 08:42:54 -0000	1.7
+++ .cvsignore	26 Jan 2009 07:28:04 -0000	1.8
@@ -1 +1 @@
-BioPerl-1.5.9_4.tar.bz2
+BioPerl-1.6.0.tar.bz2


Index: perl-bioperl.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-bioperl/devel/perl-bioperl.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- perl-bioperl.spec	22 Jan 2009 08:42:54 -0000	1.19
+++ perl-bioperl.spec	26 Jan 2009 07:28:04 -0000	1.20
@@ -1,12 +1,12 @@
 Name:           perl-bioperl
-Version:        1.5.9
-Release:        0.5.4%{?dist}
+Version:        1.6.0
+Release:        1%{?dist}
 Summary:        Perl tools for computational molecular biology
 
 Group:          Development/Libraries
 License:        GPL+ or Artistic
 URL:            http://www.bioperl.org/
-Source0:        http://bioperl.org/DIST/BioPerl-%{version}_4.tar.bz2
+Source0:        http://bioperl.org/DIST/BioPerl-%{version}.tar.bz2
 Patch0:         bioperl-1.5.9-paths.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -58,7 +58,7 @@
 many modules depend on each other to achieve a task.
 
 %prep
-%setup -q -n BioPerl-%{version}._4
+%setup -q -n BioPerl-%{version}
 %patch0 -p1 
 
 # temporarily remove PhyloNetwork before compiling until upstream says
@@ -70,13 +70,13 @@
 # these are the unwanted Requires for perl-bioperl-run, keeping in
 # case we need to do the temporary hack for bootstrapping again
 
-#cat << \EOF > %{_builddir}/BioPerl-%{version}._4/%{name}-req
+#cat << \EOF > %{_builddir}/BioPerl-%{version}/%{name}-req
 ##!/bin/sh
 #%{__perl_requires} $* |\
 #   sed -e '/perl(Bio::Tools::Run::Alignment::Clustalw)/d; /perl(Bio::Tools::Run::GenericParameters)/d; /perl(Bio::Tools::Run::Phylo::Molphy::ProtML)/d; /perl(Bio::Tools::Run::Phylo::Phylip::Neighbor)/d; /perl(Bio::Tools::Run::Phylo::Phylip::ProtDist)/d; /perl(Bio::Tools::Run::Phylo::Phylip::ProtPars)/d; /perl(Bio::Tools::Run::RemoteBlast)/d'
 #EOF
  
-#%%define __perl_requires %{_builddir}/BioPerl-%{version}._4/%{name}-req
+#%%define __perl_requires %{_builddir}/BioPerl-%{version}/%{name}-req
 #chmod +x %{__perl_requires}
 
 # remove all execute bits from the doc stuff
@@ -129,6 +129,9 @@
 %{_mandir}/man3/*.3*    
 
 %changelog
+* Mon Jan 26 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 1.6.0-1
+- Update to 1.6.0 final release
+
 * Thu Jan 22 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 1.5.9-0.5.4
 - Update to 1.6.0 release candidate 4
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-bioperl/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	22 Jan 2009 08:42:54 -0000	1.8
+++ sources	26 Jan 2009 07:28:04 -0000	1.9
@@ -1 +1 @@
-9ed4f5c69196782a71833fe43511a6a6  BioPerl-1.5.9_4.tar.bz2
+b5bc873aa990892651c3092d7e504397  BioPerl-1.6.0.tar.bz2



From than at fedoraproject.org  Mon Jan 26 08:02:40 2009
From: than at fedoraproject.org (Than Ngo)
Date: Mon, 26 Jan 2009 08:02:40 +0000 (UTC)
Subject: rpms/kde-l10n/F-10 kde-l10n.spec,1.54,1.55
Message-ID: <20090126080240.61BF67010C@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kde-l10n/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29991

Modified Files:
	kde-l10n.spec 
Log Message:
fix file list



Index: kde-l10n.spec
===================================================================
RCS file: /cvs/extras/rpms/kde-l10n/F-10/kde-l10n.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- kde-l10n.spec	24 Jan 2009 10:37:53 -0000	1.54
+++ kde-l10n.spec	26 Jan 2009 08:02:10 -0000	1.55
@@ -19,7 +19,7 @@
 Source7: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-de-%{version}.tar.bz2
 Source8: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-el-%{version}.tar.bz2
 Source9: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-en_GB-%{version}.tar.bz2
-Source10: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-eo-%{version}.tar.bz2
+#Source10: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-eo-%{version}.tar.bz2
 Source11: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-es-%{version}.tar.bz2
 Source12: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-et-%{version}.tar.bz2
 Source13: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-eu-%{version}.tar.bz2
@@ -52,7 +52,7 @@
 #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
+#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
@@ -60,7 +60,7 @@
 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
+#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
@@ -886,6 +886,7 @@
 %lang(ca) %{_kde4_appsdir}/kvtml/ca
 %lang(ca) %{_kde4_appsdir}/kvtml/latinCatalan*
 %lang(ca) %{_kde4_docdir}/HTML/ca
+%lang(ca) %{_mandir}/ca/*/*
 
 %files Czech
 %defattr(-,root,root)
@@ -909,6 +910,7 @@
 %lang(da) %{_kde4_appsdir}/klettres/da
 %lang(da) %{_kde4_appsdir}/kvtml/da
 %lang(da) %{_kde4_docdir}/HTML/da
+%lang(da) %{_mandir}/da/*/*
 
 %files German
 %defattr(-,root,root)
@@ -919,6 +921,7 @@
 %lang(de) %{_kde4_appsdir}/kvtml/de
 %lang(de) %{_kde4_appsdir}/step/objinfo/l10n/de/
 %lang(de) %{_kde4_docdir}/HTML/de
+%lang(de) %{_mandir}/de/*/*
 
 %files Greek
 %defattr(-,root,root)
@@ -942,11 +945,12 @@
 %defattr(-,root,root)
 %lang(es) %{_datadir}/locale/es/*
 %lang(es) %{_kde4_appsdir}/ktuberling/sounds/es*
-%lang(es) %{_kde4_appsdir}/khangman/data/es
+#%lang(es) %{_kde4_appsdir}/khangman/data/es
 %lang(es) %{_kde4_appsdir}/khangman/es.txt
 %lang(es) %{_kde4_appsdir}/klettres/es
 %lang(es) %{_kde4_appsdir}/kvtml/es
 %lang(es) %{_kde4_docdir}/HTML/es
+%lang(es) %{_mandir}/es/*/*
 
 %files Estonian
 %defattr(-,root,root)
@@ -954,6 +958,7 @@
 %lang(et) %{_kde4_appsdir}/khangman/et.txt
 %lang(et) %{_kde4_appsdir}/kvtml/et
 %lang(et) %{_kde4_docdir}/HTML/et
+%lang(et) %{_mandir}/et/*/*
 
 %files Basque
 %defattr(-,root,root)
@@ -985,6 +990,7 @@
 %lang(fr) %{_kde4_appsdir}/khangman/fr.txt
 %lang(fr) %{_kde4_appsdir}/kvtml/fr
 %lang(fr) %{_kde4_docdir}/HTML/fr
+%lang(fr) %{_mandir}/fr/*/*
 
 %if %{buildall}
 %files Frisian
@@ -1005,6 +1011,7 @@
 %lang(gl) %{_kde4_appsdir}/ktuberling/sounds/gl.soundtheme
 %lang(gl) %{_kde4_appsdir}/ktuberling/sounds/gl/
 %lang(gl) %{_kde4_docdir}/HTML/gl
+%lang(gl) %{_mandir}/gl/*/*
 
 %if %{buildall}
 %files Hebrew
@@ -1050,6 +1057,8 @@
 %lang(it) %{_kde4_appsdir}/klettres/it
 %lang(it) %{_kde4_appsdir}/kvtml/it
 %lang(it) %{_kde4_docdir}/HTML/it
+%lang(it) %{_kde4_appsdir}/step/objinfo/l10n/it/
+%lang(it) %{_mandir}/it/*/*
 
 %files Japanese
 %defattr(-,root,root)
@@ -1096,7 +1105,6 @@
 %lang(nds) %{_kde4_appsdir}/kvtml/nds
 %lang(nds) %{_kde4_appsdir}/ktuberling/sounds/nds*
 %lang(nds) %{_kde4_appsdir}/katepart/syntax/logohighlightstyle.nds.xml
-%lang(nds) %{_kde4_appsdir}/kturtle/data/logokeywords.sr*
 %lang(nds) %{_kde4_appsdir}/kturtle/examples/nds
 
 %files Latvian
@@ -1116,6 +1124,7 @@
 %files Malayalam
 %defattr(-,root,root)
 %lang(ml) %{_datadir}/locale/ml/*
+%lang(ml) %{_kde4_appsdir}/klettres/ml/
 
 %if %{buildall}
 %files Maltese
@@ -1136,6 +1145,7 @@
 %lang(nl) %{_kde4_appsdir}/klettres/nl
 %lang(nl) %{_kde4_appsdir}/kvtml/nl
 %lang(nl) %{_kde4_docdir}/HTML/nl
+%lang(nl) %{_mandir}/nl/*/*
 
 %if %{buildall}
 %files NorthernSami
@@ -1150,6 +1160,7 @@
 %lang(nb) %{_kde4_appsdir}/kvtml/nb/
 %lang(nb) %{_kde4_docdir}/HTML/nb/
 %lang(nb) %{_kde4_appsdir}/klettres/nb
+%lang(nb) %{_mandir}/nb/*/*
 
 %files Norwegian-Nynorsk
 %defattr(-,root,root)
@@ -1157,6 +1168,7 @@
 %lang(nn) %{_kde4_appsdir}/khangman/nn.txt
 %lang(nn) %{_kde4_appsdir}/kvtml/nn/
 %lang(nn) %{_kde4_docdir}/HTML/nn
+%lang(nn) %{_mandir}/nn/*/*
 
 %if %{buildall}
 %files Occitan
@@ -1182,6 +1194,7 @@
 %lang(pt) %{_kde4_appsdir}/ktuberling/sounds/pt*
 %lang(pt) %{_kde4_appsdir}/kvtml/pt
 %lang(pt) %{_kde4_docdir}/HTML/pt
+%lang(pt) %{_mandir}/pt/*/*
 
 %files Brazil
 %defattr(-,root,root)
@@ -1190,6 +1203,7 @@
 %lang(pt_BR) %{_kde4_appsdir}/klettres/pt_BR/*
 %lang(pt_BR) %{_kde4_appsdir}/kvtml/pt_BR
 %lang(pt_BR) %{_kde4_docdir}/HTML/pt_BR
+%lang(pt_BR) %{_mandir}/pt_BR/*/*
 
 %if %{buildall}
 %files Romanian
@@ -1203,6 +1217,7 @@
 %lang(ru) %{_datadir}/locale/ru/*
 %lang(ru) %{_kde4_appsdir}/kvtml/ru
 %lang(ru) %{_kde4_docdir}/HTML/ru
+%lang(ru) %{_mandir}/ru/*/*
 
 %if %{buildall}
 %files Slovak
@@ -1231,12 +1246,7 @@
 %lang(sr) %{_kde4_iconsdir}/*/*/*/*/*/*/sr/*
 %lang(sr) %{_kde4_appsdir}/desktoptheme/*/widgets/l10n/sr
 %lang(sr) %{_kde4_appsdir}/desktoptheme/*/widgets/l10n/sr at latin
-%lang(sr) %{_kde4_appsdir}/katepart/syntax/logohighlightstyle.sr*
 %lang(sr) %{_kde4_appsdir}/khangman/sr at latin.txt
-%lang(sr) %{_kde4_appsdir}/ksplash/Themes/*/*/l10n/sr
-%lang(sr) %{_kde4_appsdir}/ksplash/Themes/*/*/l10n/sr at latin
-%lang(sr) %{_kde4_appsdir}/kturtle/examples/sr
-%lang(sr) %{_kde4_appsdir}/kturtle/examples/sr at latin
 %lang(sr) %{_kde4_appsdir}/kvtml/sr*
 %lang(sr) %{_datadir}/locale/sr at latin/*
 
@@ -1247,6 +1257,7 @@
 %lang(sv) %{_kde4_appsdir}/khangman/sv.txt
 %lang(sv) %{_kde4_appsdir}/kvtml/sv
 %lang(sv) %{_kde4_docdir}/HTML/sv
+%lang(sv) %{_mandir}/sv/*/*
 
 %if %{buildall}
 %files Tamil
@@ -1277,6 +1288,7 @@
 %lang(uk) %{_kde4_appsdir}/ktuberling/sounds/uk*
 %lang(uk) %{_kde4_appsdir}/kvtml/uk
 %lang(uk) %{_kde4_docdir}/HTML/uk
+%lang(uk) %{_mandir}/uk/*/*
 
 %if %{buildall}
 %files Venda
@@ -1305,6 +1317,8 @@
 %defattr(-,root,root)
 %lang(zh_CN) %{_datadir}/locale/zh_CN/*
 %lang(zh_CN) %{_kde4_appsdir}/kvtml/zh_CN
+%lang(zh_CN) %{_kde4_appsdir}/step/objinfo/l10n/zh_CN/
+%lang(zh_CN) %{_kde4_docdir}/HTML/zh_CN
 
 %files Chinese-Traditional
 %defattr(-,root,root)



From pkgdb at fedoraproject.org  Mon Jan 26 08:23:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Jan 2009 08:23:12 +0000
Subject: [pkgdb] kvm: markmc has requested watchbugzilla
Message-ID: <20090126082312.8171E208485@bastion.fedora.phx.redhat.com>

markmc has requested the watchbugzilla acl on kvm (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kvm



From pkgdb at fedoraproject.org  Mon Jan 26 08:23:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Jan 2009 08:23:13 +0000
Subject: [pkgdb] kvm: markmc has requested commit
Message-ID: <20090126082313.86AB5208489@bastion.fedora.phx.redhat.com>

markmc has requested the commit acl on kvm (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kvm



From pkgdb at fedoraproject.org  Mon Jan 26 08:23:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Jan 2009 08:23:14 +0000
Subject: [pkgdb] kvm: markmc has requested approveacls
Message-ID: <20090126082314.9F09120848F@bastion.fedora.phx.redhat.com>

markmc has requested the approveacls acl on kvm (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kvm



From pkgdb at fedoraproject.org  Mon Jan 26 08:23:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Jan 2009 08:23:16 +0000
Subject: [pkgdb] kvm: markmc has requested watchcommits
Message-ID: <20090126082316.12A05208493@bastion.fedora.phx.redhat.com>

markmc has requested the watchcommits acl on kvm (Fedora 7)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kvm



From pkgdb at fedoraproject.org  Mon Jan 26 08:23:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Jan 2009 08:23:20 +0000
Subject: [pkgdb] kvm: markmc has requested watchcommits
Message-ID: <20090126082320.7B98A208497@bastion.fedora.phx.redhat.com>

markmc has requested the watchcommits acl on kvm (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kvm



From pkgdb at fedoraproject.org  Mon Jan 26 08:23:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Jan 2009 08:23:21 +0000
Subject: [pkgdb] kvm: markmc has requested commit
Message-ID: <20090126082321.6D91E2084BA@bastion.fedora.phx.redhat.com>

markmc has requested the commit acl on kvm (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kvm



From pkgdb at fedoraproject.org  Mon Jan 26 08:23:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Jan 2009 08:23:20 +0000
Subject: [pkgdb] kvm: markmc has requested watchbugzilla
Message-ID: <20090126082323.AE55A20860A@bastion.fedora.phx.redhat.com>

markmc has requested the watchbugzilla acl on kvm (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kvm



From pkgdb at fedoraproject.org  Mon Jan 26 08:23:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Jan 2009 08:23:24 +0000
Subject: [pkgdb] kvm: markmc has requested approveacls
Message-ID: <20090126082324.E73E320860C@bastion.fedora.phx.redhat.com>

markmc has requested the approveacls acl on kvm (Fedora 8)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kvm



From pkgdb at fedoraproject.org  Mon Jan 26 08:23:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Jan 2009 08:23:27 +0000
Subject: [pkgdb] kvm: markmc has requested watchcommits
Message-ID: <20090126082327.C4813208610@bastion.fedora.phx.redhat.com>

markmc has requested the watchcommits acl on kvm (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kvm



From pkgdb at fedoraproject.org  Mon Jan 26 08:23:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Jan 2009 08:23:29 +0000
Subject: [pkgdb] kvm: markmc has requested commit
Message-ID: <20090126082330.01EFE2086F0@bastion.fedora.phx.redhat.com>

markmc has requested the commit acl on kvm (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kvm



From pkgdb at fedoraproject.org  Mon Jan 26 08:23:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Jan 2009 08:23:33 +0000
Subject: [pkgdb] kvm: markmc has requested watchbugzilla
Message-ID: <20090126082333.2818F208701@bastion.fedora.phx.redhat.com>

markmc has requested the watchbugzilla acl on kvm (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kvm



From pkgdb at fedoraproject.org  Mon Jan 26 08:23:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Jan 2009 08:23:36 +0000
Subject: [pkgdb] kvm: markmc has requested approveacls
Message-ID: <20090126082336.48D8B208487@bastion.fedora.phx.redhat.com>

markmc has requested the approveacls acl on kvm (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kvm



From pkgdb at fedoraproject.org  Mon Jan 26 08:23:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Jan 2009 08:23:42 +0000
Subject: [pkgdb] kvm had acl change status
Message-ID: <20090126082342.D5FCD208744@bastion.fedora.phx.redhat.com>

markmc has set the watchbugzilla acl on kvm (Fedora 10) to Approved for markmc

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kvm



From pkgdb at fedoraproject.org  Mon Jan 26 08:23:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Jan 2009 08:23:47 +0000
Subject: [pkgdb] kvm had acl change status
Message-ID: <20090126082351.C49A020848F@bastion.fedora.phx.redhat.com>

markmc has set the watchbugzilla acl on kvm (Fedora 10) to Approved for virtmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kvm



From pkgdb at fedoraproject.org  Mon Jan 26 08:24:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Jan 2009 08:24:14 +0000
Subject: [pkgdb] qemu had acl change status
Message-ID: <20090126082414.2EBC8208496@bastion.fedora.phx.redhat.com>

markmc has set the watchbugzilla acl on qemu (Fedora devel) to Approved for virtmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qemu



From pkgdb at fedoraproject.org  Mon Jan 26 08:24:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Jan 2009 08:24:18 +0000
Subject: [pkgdb] qemu had acl change status
Message-ID: <20090126082418.A348D2084B7@bastion.fedora.phx.redhat.com>

markmc has set the watchbugzilla acl on qemu (Fedora devel) to Approved for markmc

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qemu



From pkgdb at fedoraproject.org  Mon Jan 26 08:24:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Jan 2009 08:24:22 +0000
Subject: [pkgdb] qemu had acl change status
Message-ID: <20090126082422.EA0B7208605@bastion.fedora.phx.redhat.com>

markmc has set the watchbugzilla acl on qemu (Fedora devel) to Approved for glommer

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qemu



From pkgdb at fedoraproject.org  Mon Jan 26 08:24:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Jan 2009 08:24:27 +0000
Subject: [pkgdb] qemu had acl change status
Message-ID: <20090126082427.D9F6D20876A@bastion.fedora.phx.redhat.com>

markmc has set the watchbugzilla acl on qemu (Fedora 7) to Approved for markmc

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qemu



From pkgdb at fedoraproject.org  Mon Jan 26 08:24:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Jan 2009 08:24:29 +0000
Subject: [pkgdb] qemu had acl change status
Message-ID: <20090126082429.B3696208966@bastion.fedora.phx.redhat.com>

markmc has set the watchbugzilla acl on qemu (Fedora 3) to Approved for markmc

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qemu



From pkgdb at fedoraproject.org  Mon Jan 26 08:24:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Jan 2009 08:24:38 +0000
Subject: [pkgdb] qemu had acl change status
Message-ID: <20090126082438.8A01F20896A@bastion.fedora.phx.redhat.com>

markmc has set the watchbugzilla acl on qemu (Fedora 5) to Approved for markmc

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qemu



From pkgdb at fedoraproject.org  Mon Jan 26 08:24:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Jan 2009 08:24:36 +0000
Subject: [pkgdb] qemu had acl change status
Message-ID: <20090126082436.C9FD720860C@bastion.fedora.phx.redhat.com>

markmc has set the watchbugzilla acl on qemu (Fedora 4) to Approved for markmc

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qemu



From pkgdb at fedoraproject.org  Mon Jan 26 08:24:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Jan 2009 08:24:43 +0000
Subject: [pkgdb] qemu had acl change status
Message-ID: <20090126082443.C9749208610@bastion.fedora.phx.redhat.com>

markmc has set the watchbugzilla acl on qemu (Fedora 6) to Approved for markmc

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qemu



From pkgdb at fedoraproject.org  Mon Jan 26 08:24:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Jan 2009 08:24:50 +0000
Subject: [pkgdb] qemu had acl change status
Message-ID: <20090126082452.36A7D208973@bastion.fedora.phx.redhat.com>

markmc has set the watchbugzilla acl on qemu (Fedora 8) to Approved for markmc

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qemu



From pkgdb at fedoraproject.org  Mon Jan 26 08:24:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Jan 2009 08:24:54 +0000
Subject: [pkgdb] qemu had acl change status
Message-ID: <20090126082455.862A72086F7@bastion.fedora.phx.redhat.com>

markmc has set the watchcommits acl on qemu (Fedora 5) to Approved for markmc

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qemu



From pkgdb at fedoraproject.org  Mon Jan 26 08:24:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Jan 2009 08:24:55 +0000
Subject: [pkgdb] qemu had acl change status
Message-ID: <20090126082455.B8D5C20897D@bastion.fedora.phx.redhat.com>

markmc has set the commit acl on qemu (Fedora 5) to Approved for markmc

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qemu



From pkgdb at fedoraproject.org  Mon Jan 26 08:25:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Jan 2009 08:25:01 +0000
Subject: [pkgdb] qemu had acl change status
Message-ID: <20090126082501.4462120897C@bastion.fedora.phx.redhat.com>

markmc has set the watchcommits acl on qemu (Fedora 6) to Approved for markmc

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qemu



From pkgdb at fedoraproject.org  Mon Jan 26 08:25:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Jan 2009 08:25:01 +0000
Subject: [pkgdb] qemu had acl change status
Message-ID: <20090126082501.5FDFC208A61@bastion.fedora.phx.redhat.com>

markmc has set the commit acl on qemu (Fedora 6) to Approved for markmc

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qemu



From pkgdb at fedoraproject.org  Mon Jan 26 08:25:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Jan 2009 08:25:04 +0000
Subject: [pkgdb] qemu had acl change status
Message-ID: <20090126082504.99D64208701@bastion.fedora.phx.redhat.com>

markmc has set the commit acl on qemu (Fedora 8) to Approved for markmc

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qemu



From pkgdb at fedoraproject.org  Mon Jan 26 08:25:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Jan 2009 08:25:05 +0000
Subject: [pkgdb] qemu had acl change status
Message-ID: <20090126082505.788CC208D5E@bastion.fedora.phx.redhat.com>

markmc has set the watchcommits acl on qemu (Fedora 8) to Approved for markmc

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qemu



From pkgdb at fedoraproject.org  Mon Jan 26 08:25:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Jan 2009 08:25:09 +0000
Subject: [pkgdb] qemu had acl change status
Message-ID: <20090126082510.29EE0208D64@bastion.fedora.phx.redhat.com>

markmc has set the commit acl on qemu (Fedora EPEL 4) to Approved for markmc

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qemu



From pkgdb at fedoraproject.org  Mon Jan 26 08:25:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Jan 2009 08:25:10 +0000
Subject: [pkgdb] qemu had acl change status
Message-ID: <20090126082511.23239208DA8@bastion.fedora.phx.redhat.com>

markmc has set the watchcommits acl on qemu (Fedora EPEL 4) to Approved for markmc

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qemu



From pkgdb at fedoraproject.org  Mon Jan 26 08:25:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Jan 2009 08:25:13 +0000
Subject: [pkgdb] qemu had acl change status
Message-ID: <20090126082513.EC2DA208DE0@bastion.fedora.phx.redhat.com>

markmc has set the watchbugzilla acl on qemu (Fedora EPEL 4) to Approved for markmc

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qemu



From pkgdb at fedoraproject.org  Mon Jan 26 08:25:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Jan 2009 08:25:19 +0000
Subject: [pkgdb] qemu had acl change status
Message-ID: <20090126082519.AC4C7208744@bastion.fedora.phx.redhat.com>

markmc has set the watchbugzilla acl on qemu (Fedora EPEL 5) to Approved for markmc

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qemu



From pkgdb at fedoraproject.org  Mon Jan 26 08:25:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Jan 2009 08:25:22 +0000
Subject: [pkgdb] qemu had acl change status
Message-ID: <20090126082522.D8845208DE2@bastion.fedora.phx.redhat.com>

markmc has set the watchbugzilla acl on qemu (Fedora 9) to Approved for glommer

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qemu



From pkgdb at fedoraproject.org  Mon Jan 26 08:25:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Jan 2009 08:25:26 +0000
Subject: [pkgdb] qemu had acl change status
Message-ID: <20090126082526.65DAC208DE6@bastion.fedora.phx.redhat.com>

markmc has set the watchbugzilla acl on qemu (Fedora 9) to Approved for markmc

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qemu



From pkgdb at fedoraproject.org  Mon Jan 26 08:25:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Jan 2009 08:25:29 +0000
Subject: [pkgdb] qemu had acl change status
Message-ID: <20090126082529.E3404208DE7@bastion.fedora.phx.redhat.com>

markmc has set the approveacls acl on qemu (Fedora 9) to Approved for glommer

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qemu



From pkgdb at fedoraproject.org  Mon Jan 26 08:25:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Jan 2009 08:25:33 +0000
Subject: [pkgdb] qemu had acl change status
Message-ID: <20090126082534.0132E208DEC@bastion.fedora.phx.redhat.com>

markmc has set the watchbugzilla acl on qemu (Fedora 9) to Approved for virtmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qemu



From pkgdb at fedoraproject.org  Mon Jan 26 08:25:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Jan 2009 08:25:38 +0000
Subject: [pkgdb] qemu had acl change status
Message-ID: <20090126082538.A4496208DEF@bastion.fedora.phx.redhat.com>

markmc has set the watchbugzilla acl on qemu (Fedora EPEL 5) to Approved for virtmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qemu



From pkgdb at fedoraproject.org  Mon Jan 26 08:25:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Jan 2009 08:25:40 +0000
Subject: [pkgdb] qemu had acl change status
Message-ID: <20090126082540.7208D208DF2@bastion.fedora.phx.redhat.com>

markmc has set the watchbugzilla acl on qemu (Fedora 10) to Approved for virtmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qemu



From pkgdb at fedoraproject.org  Mon Jan 26 08:25:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Jan 2009 08:25:42 +0000
Subject: [pkgdb] qemu had acl change status
Message-ID: <20090126082542.780F0208DF5@bastion.fedora.phx.redhat.com>

markmc has set the watchbugzilla acl on qemu (Fedora 10) to Approved for markmc

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qemu



From pkgdb at fedoraproject.org  Mon Jan 26 08:25:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Jan 2009 08:25:44 +0000
Subject: [pkgdb] qemu had acl change status
Message-ID: <20090126082544.62B99208DF9@bastion.fedora.phx.redhat.com>

markmc has set the watchbugzilla acl on qemu (Fedora 10) to Approved for glommer

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qemu



From pkgdb at fedoraproject.org  Mon Jan 26 08:25:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Jan 2009 08:25:54 +0000
Subject: [pkgdb] qemu had acl change status
Message-ID: <20090126082555.5F92B208DFB@bastion.fedora.phx.redhat.com>

markmc has set the watchbugzilla acl on qemu (Fedora EPEL 4) to Approved for virtmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qemu



From pkgdb at fedoraproject.org  Mon Jan 26 08:25:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Jan 2009 08:25:56 +0000
Subject: [pkgdb] qemu had acl change status
Message-ID: <20090126082556.E410F208DFE@bastion.fedora.phx.redhat.com>

markmc has set the watchbugzilla acl on qemu (Fedora 8) to Approved for virtmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qemu



From pkgdb at fedoraproject.org  Mon Jan 26 08:25:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Jan 2009 08:25:59 +0000
Subject: [pkgdb] qemu had acl change status
Message-ID: <20090126082600.02315208E01@bastion.fedora.phx.redhat.com>

markmc has set the watchbugzilla acl on qemu (Fedora 6) to Approved for virtmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qemu



From pkgdb at fedoraproject.org  Mon Jan 26 08:26:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Jan 2009 08:26:03 +0000
Subject: [pkgdb] qemu had acl change status
Message-ID: <20090126082604.8B659208605@bastion.fedora.phx.redhat.com>

markmc has set the watchbugzilla acl on qemu (Fedora 5) to Approved for virtmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qemu



From pkgdb at fedoraproject.org  Mon Jan 26 08:26:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Jan 2009 08:26:07 +0000
Subject: [pkgdb] qemu had acl change status
Message-ID: <20090126082607.CAEF5208E05@bastion.fedora.phx.redhat.com>

markmc has set the watchbugzilla acl on qemu (Fedora 4) to Approved for virtmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qemu



From pkgdb at fedoraproject.org  Mon Jan 26 08:26:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Jan 2009 08:26:13 +0000
Subject: [pkgdb] qemu had acl change status
Message-ID: <20090126082614.291FD208E0A@bastion.fedora.phx.redhat.com>

markmc has set the watchbugzilla acl on qemu (Fedora 3) to Approved for virtmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qemu



From pkgdb at fedoraproject.org  Mon Jan 26 08:26:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Jan 2009 08:26:15 +0000
Subject: [pkgdb] qemu had acl change status
Message-ID: <20090126082615.B1826208E0D@bastion.fedora.phx.redhat.com>

markmc has set the watchbugzilla acl on qemu (Fedora 7) to Approved for virtmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qemu



From pkgdb at fedoraproject.org  Mon Jan 26 08:49:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Jan 2009 08:49:29 +0000
Subject: [pkgdb] sugar-turtleart: fab has requested watchbugzilla
Message-ID: <20090126084929.1F77A208487@bastion.fedora.phx.redhat.com>

fab has requested the watchbugzilla acl on sugar-turtleart (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-turtleart



From pkgdb at fedoraproject.org  Mon Jan 26 08:49:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Jan 2009 08:49:37 +0000
Subject: [pkgdb] sugar-turtleart: fab has requested watchcommits
Message-ID: <20090126084937.18995208482@bastion.fedora.phx.redhat.com>

fab has requested the watchcommits acl on sugar-turtleart (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-turtleart



From pkgdb at fedoraproject.org  Mon Jan 26 08:56:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Jan 2009 08:56:53 +0000
Subject: [pkgdb] python-olpcgames: fab has requested watchbugzilla
Message-ID: <20090126085653.E0125208480@bastion.fedora.phx.redhat.com>

fab has requested the watchbugzilla acl on python-olpcgames (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-olpcgames



From pkgdb at fedoraproject.org  Mon Jan 26 08:56:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Jan 2009 08:56:54 +0000
Subject: [pkgdb] python-olpcgames: fab has requested watchcommits
Message-ID: <20090126085654.28C94208486@bastion.fedora.phx.redhat.com>

fab has requested the watchcommits acl on python-olpcgames (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-olpcgames



From pkgdb at fedoraproject.org  Mon Jan 26 08:57:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Jan 2009 08:57:03 +0000
Subject: [pkgdb] python-olpcgames: fab has requested watchcommits
Message-ID: <20090126085703.0FA25208490@bastion.fedora.phx.redhat.com>

fab has requested the watchcommits acl on python-olpcgames (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-olpcgames



From pkgdb at fedoraproject.org  Mon Jan 26 08:57:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Jan 2009 08:57:02 +0000
Subject: [pkgdb] python-olpcgames: fab has requested watchbugzilla
Message-ID: <20090126085702.57D6B20848B@bastion.fedora.phx.redhat.com>

fab has requested the watchbugzilla acl on python-olpcgames (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-olpcgames



From tmraz at fedoraproject.org  Mon Jan 26 09:09:35 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Mon, 26 Jan 2009 09:09:35 +0000 (UTC)
Subject: rpms/boinc-client/devel boinc-client.spec,1.21,1.22
Message-ID: <20090126090935.33F647010C@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/boinc-client/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7704

Modified Files:
	boinc-client.spec 
Log Message:
* Mon Jan 26 2009 Tomas Mraz <tmraz at redhat.com> - 6.4.5-3.20081217svn 
- rebuild with new openssl and mysql



Index: boinc-client.spec
===================================================================
RCS file: /cvs/pkgs/rpms/boinc-client/devel/boinc-client.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- boinc-client.spec	15 Jan 2009 00:25:10 -0000	1.21
+++ boinc-client.spec	26 Jan 2009 09:09:04 -0000	1.22
@@ -4,7 +4,7 @@
 Summary:	The BOINC client core
 Name:		boinc-client
 Version:	6.4.5
-Release:	2.%{snap}svn%{?dist}
+Release:	3.%{snap}svn%{?dist}
 License:	LGPLv2+
 Group:		Applications/Engineering
 URL:		http://boinc.berkeley.edu/
@@ -272,6 +272,9 @@
 %{_includedir}/boinc/*
 
 %changelog
+* Mon Jan 26 2009 Tomas Mraz <tmraz at redhat.com> - 6.4.5-3.20081217svn 
+- rebuild with new openssl and mysql
+
 * Thu Jan 15 2009 Milos Jakubicek <xjakub at fi.muni.cz> - 6.4.5-2.20081217svn
 - Fix security bug BZ#479664
 



From tmraz at fedoraproject.org  Mon Jan 26 09:19:31 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Mon, 26 Jan 2009 09:19:31 +0000 (UTC)
Subject: rpms/gammu/devel gammu.spec,1.19,1.20
Message-ID: <20090126091931.C57F27010C@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/gammu/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10306

Modified Files:
	gammu.spec 
Log Message:
* Mon Jan 26 2009 Tomas Mraz <tmraz at redhat.com> - 1.22.90-2
- rebuild with new openssl and mysql



Index: gammu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gammu/devel/gammu.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- gammu.spec	11 Jan 2009 17:54:09 -0000	1.19
+++ gammu.spec	26 Jan 2009 09:19:01 -0000	1.20
@@ -1,6 +1,6 @@
 Name:		gammu
 Version:        1.22.90
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Command Line utility to work with mobile phones
 
 Group:          Applications/System
@@ -128,6 +128,9 @@
 
 
 %changelog
+* Mon Jan 26 2009 Tomas Mraz <tmraz at redhat.com> - 1.22.90-2
+- rebuild with new openssl and mysql
+
 * Sun Jan 11 2009 Xavier Lamien <lxtnow[at]gmail.com> - 1.22.90-1
 - Update release.
 



From mmaslano at fedoraproject.org  Mon Jan 26 09:26:09 2009
From: mmaslano at fedoraproject.org (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?=)
Date: Mon, 26 Jan 2009 09:26:09 +0000 (UTC)
Subject: rpms/crontabs/devel crontab,1.3,1.4 crontabs.spec,1.28,1.29
Message-ID: <20090126092609.C35F17010C@cvs1.fedora.phx.redhat.com>

Author: mmaslano

Update of /cvs/pkgs/rpms/crontabs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11748

Modified Files:
	crontab crontabs.spec 
Log Message:
* Mon Jan 26 2009 Marcela Ma??l????ov?? <mmaslano at redhat.com> 1.10-26
- change /etc/crontab. All anacron jobs in cron.daily,weekly,...
 are check by anacron every hour. Anacron run them if they didn't
 run today. 



Index: crontab
===================================================================
RCS file: /cvs/pkgs/rpms/crontabs/devel/crontab,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- crontab	30 May 2008 12:48:44 -0000	1.3
+++ crontab	26 Jan 2009 09:25:39 -0000	1.4
@@ -2,9 +2,12 @@
 PATH=/sbin:/bin:/usr/sbin:/usr/bin
 MAILTO=root
 HOME=/
+# .---------------- minute (0 - 59) 
+# |  .------------- hour (0 - 23)
+# |  |  .---------- day of month (1 - 31)
+# |  |  |  .------- month (1 - 12) OR jan,feb,mar,apr ... 
+# |  |  |  |  .---- day of week (0 - 6) (Sunday=0 or 7)  OR
+#sun,mon,tue,wed,thu,fri,sat 
+# |  |  |  |  |
+# *  *  *  *  *  command to be executed
 
-# run-parts
-01 * * * * root run-parts /etc/cron.hourly
-02 4 * * * root run-parts /etc/cron.daily
-22 4 * * 0 root run-parts /etc/cron.weekly
-42 4 1 * * root run-parts /etc/cron.monthly


Index: crontabs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/crontabs/devel/crontabs.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- crontabs.spec	1 Dec 2008 07:47:36 -0000	1.28
+++ crontabs.spec	26 Jan 2009 09:25:39 -0000	1.29
@@ -1,13 +1,14 @@
 Summary: Root crontab files used to schedule the execution of programs
 Name: crontabs
 Version: 1.10
-Release: 25%{?dist}
+Release: 26%{?dist}
 License: Public Domain and GPLv2
 Group: System Environment/Base
 Source0: crontab
 Source1: run-parts
 Source2: config
 BuildArch: noarch
+Requires: /etc/cron.d/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -34,15 +35,20 @@
 
 %files
 %defattr(-,root,root,-)
-%config(noreplace) /etc/crontab
 %{_bindir}/run-parts
 %config(noreplace) /etc/sysconfig/crontab
+%config(noreplace) /etc/crontab
 %dir /etc/cron.hourly
 %dir /etc/cron.daily
 %dir /etc/cron.weekly
 %dir /etc/cron.monthly
 
 %changelog
+* Mon Jan 26 2009 Marcela Ma??l????ov?? <mmaslano at redhat.com> 1.10-26
+- change /etc/crontab. All anacron jobs in cron.daily,weekly,...
+ are check by anacron every hour. Anacron run them if they didn't
+ run today. 
+
 * Mon Dec  1 2008 Jan ONDREJ (SAL) <ondrejj(at)salstar.sk> 1.10-25
 - Added /etc/cron.{hourly,daily,weekly,monthly} dirs again. bz#473353
 



From mmaslano at fedoraproject.org  Mon Jan 26 09:26:23 2009
From: mmaslano at fedoraproject.org (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?=)
Date: Mon, 26 Jan 2009 09:26:23 +0000 (UTC)
Subject: rpms/anacron/devel hourly.patch, NONE, 1.1 .cvsignore, 1.3,
	1.4 anacron.init, 1.20, 1.21 anacron.spec, 1.54, 1.55 sources,
	1.3, 1.4
Message-ID: <20090126092623.DF2D17010C@cvs1.fedora.phx.redhat.com>

Author: mmaslano

Update of /cvs/pkgs/rpms/anacron/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11849

Modified Files:
	.cvsignore anacron.init anacron.spec sources 
Added Files:
	hourly.patch 
Log Message:
* Mon Jan 26 2009 Marcela Ma??l????ov?? <mmaslano at redhat.com> 2.3-66
- cron.{daily,weekly,hourly,monthly} should be owned by crontabs, because
	some don't have installed anacron and other cron like programmes could
	be dependent
- 0anacron is now trying run all cron.{daily,weekly,...} every hour. 
	This should fix problem with jobs running twice, with not running jobs
	after hibernation and so on.
- the random delay is in default switch off


hourly.patch:

--- NEW FILE hourly.patch ---
diff -up anacron-2.3/fedora/anacron.hourly.old anacron-2.3/fedora/anacron.hourly
--- anacron-2.3/fedora/anacron.hourly.old	2008-12-01 08:49:33.000000000 +0100
+++ anacron-2.3/fedora/anacron.hourly	2008-12-01 08:49:17.000000000 +0100
@@ -0,0 +1,20 @@
+#!/bin/bash
+# wait for 3:02 when /etc/crontab runs cron.daily
+if [ `date +%H` -le 4 ]; then
+    exit 0;
+fi
+
+day=`cat /var/spool/anacron/cron.daily`
+if [ `date +%Y%m%d` = $day ]; then
+    exit 0;
+fi
+
+# in case anacron is already running,
+# there will be log (daemon won't be running twice).
+if test -x /usr/bin/on_ac_power; then
+    /usr/bin/on_ac_power &> /dev/null
+    if test $? -eq 1; then
+	exit 0
+    fi
+fi
+/usr/sbin/anacron -s


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/anacron/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	6 Feb 2007 14:35:24 -0000	1.3
+++ .cvsignore	26 Jan 2009 09:25:53 -0000	1.4
@@ -1,2 +1,3 @@
 anacron_2.3.orig.tar.gz
 anacron.init
+0hourly


Index: anacron.init
===================================================================
RCS file: /cvs/pkgs/rpms/anacron/devel/anacron.init,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- anacron.init	24 Oct 2008 13:02:50 -0000	1.20
+++ anacron.init	26 Jan 2009 09:25:53 -0000	1.21
@@ -1,99 +1,92 @@
 #!/bin/sh
+# Startup script for anacron
 #
-# anacron Run cron jobs that were left out due to downtime.
+# chkconfig: 2345 95 05
+# description: Run cron jobs that were left out due to downtime
+# pidfile: /var/run/anacron.pid
 #
-# chkconfig:   2345 99 05
-# description: 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 /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. 
-
-### BEGIN INIT INFO
-# Provides: $anacron
-# Required-Start: $local_fs $syslog
-# Required-Stop: $local_fs $syslog
-# Default-Start:  2345
-# Default-Stop: 99
-# Short-Description: run left over cron jobs 
-# Description: 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 /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.    
-### END INIT INFO
-
 # Source function library.
 . /etc/rc.d/init.d/functions
 
-exec=/usr/sbin/anacron
-prog=anacron
-#config=doesn't have config file, some values are stored in /etc/anacrontab
+[ -f /usr/sbin/anacron ] || exit 0
 
-lockfile=/var/lock/subsys/$prog
+prog="anacron"
+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 /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() {
-    [ -x $exec ] || exit 5
-    echo -n $"Starting $prog: "
+    echo -n $"Starting $prog: " 
+    # on_ac_power doesn't exist, on_ac_power returns 0 (ac power being used)
+    if [ -x /usr/bin/on_ac_power ]; then
+        /usr/bin/on_ac_power > /dev/null
+        if [ $? -eq 1 ]; then
+            echo "deferred while on battery power."
+            RETVAL=0
+            exit 0
+        fi
+    fi
     daemon +19 anacron -s
-    retval=$?
+    RETVAL=$?
+    if [ $RETVAL -ne 0 ]; then
+	failure;
+    fi;
     echo
-    [ $retval -eq 0 ]
-	## && touch $lockfile it creates lock in code
-    return $retval
+    return $RETVAL
 }
 
 stop() {
     echo -n $"Stopping $prog: "
-    killproc $prog
-    retval=$?
+    if [ -f $PIDFILE ]; then
+	killproc anacron
+	RETVAL=$?
+	if [ $RETVAL -ne 0 ]; then 
+	    failure;
+	fi;
+    else
+	RETVAL=1
+	failure;
+    fi
     echo
-    [ $retval -eq 0 ]
-    #usually anacron clean his lock after he stops himself.
-    #Just in case something goes wrong kill him.
-    [ -f $lockfile ] && rm -f $lockfile
-    return $retval
+    return $RETVAL
 }
 
-restart() {
-    stop
-    start
-}
-
-rh_status() {
-    # run checks to determine if the service is running or use generic status
-    status $prog
-}
-
-rh_status_q() {
-    rh_status >/dev/null 2>&1
-}
-
-
 case "$1" in
-    start)
-        rh_status_q && exit 0
-        $1
-        ;;
-    stop)
-        rh_status_q || exit 0
-        $1
-        ;;
-    restart)
-        $1
-        ;;
-    status)
-        rh_status
-        ;;
-    condrestart)
-        rh_status_q || exit 0
-        restart
-        ;;
-    *)
-        echo $"Usage: $0 {start|stop|status|restart|condrestart}"
-        exit 2
+	start)
+	    start
+	    ;;
+	
+	stop)
+	    stop
+	    ;;
+	
+	status)
+	    status anacron
+	    ;;
+
+	restart)
+	    stop
+	    start
+	    ;;
+
+	condrestart)
+	    if [ -f $LOCKFILE ]; then
+		stop
+		start
+	    fi
+	    ;;
+	
+	*)
+	    echo $"Usage: $0 {start|stop|restart|condrestart|status}"
+	    exit 1
+
 esac
-exit $?
 
+exit $RETVAL


Index: anacron.spec
===================================================================
RCS file: /cvs/pkgs/rpms/anacron/devel/anacron.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- anacron.spec	24 Oct 2008 13:02:50 -0000	1.54
+++ anacron.spec	26 Jan 2009 09:25:53 -0000	1.55
@@ -1,13 +1,14 @@
 Summary: A cron-like program that can run jobs lost during downtime
 Name: anacron
 Version: 2.3
-Release: 65%{?dist}
+Release: 66%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 URL: http://packages.debian.org/stable/source/anacron
 Source: http://ftp.debian.org/debian/pool/main/a/anacron/%{name}_%{version}.orig.tar.gz
 Source1: anacrontab
 Source2: anacron.init
+Source3: 0hourly
 Patch1: anacron_2.3-13.patch
 Patch2: anacron-2.3-mail-content-type-77108.patch
 Patch3: anacron-2.3-fdclose.patch
@@ -15,6 +16,7 @@
 Patch5: anacron-2.3-memleaking.patch
 Patch6: anacron-2.3-spooldir.patch
 Patch7: anacron-2.3-hourly.patch
+Patch8: hourly.patch
 
 Requires: crontabs
 Requires: initscripts
@@ -48,6 +50,7 @@
 %patch5 -p1 -b .memleaking
 %patch6 -p1 -b .spool
 %patch7 -p1
+%patch8 -p1
 
 %build
 make CFLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags}
@@ -66,13 +69,17 @@
 mkdir -p $RPM_BUILD_ROOT/etc/$i/
 done
 
-install -m755 fedora/anacron.daily $RPM_BUILD_ROOT/etc/cron.daily/0anacron
-ln -s ../cron.daily/0anacron $RPM_BUILD_ROOT/etc/cron.weekly/0anacron
-ln -s ../cron.daily/0anacron $RPM_BUILD_ROOT/etc/cron.monthly/0anacron
+#install -m755 fedora/anacron.daily $RPM_BUILD_ROOT/etc/cron.daily/0anacron
+#ln -s ../cron.daily/0anacron $RPM_BUILD_ROOT/etc/cron.weekly/0anacron
+#ln -s ../cron.daily/0anacron $RPM_BUILD_ROOT/etc/cron.monthly/0anacron
+install -m755 fedora/anacron.hourly $RPM_BUILD_ROOT/etc/cron.hourly/0anacron
 
 mkdir -p $RPM_BUILD_ROOT/etc/rc.d/init.d/
 install -c -m755 %SOURCE2 $RPM_BUILD_ROOT/etc/rc.d/init.d/anacron
 
+mkdir -p $RPM_BUILD_ROOT/etc/cron.d/
+install -c -m755 %SOURCE3 $RPM_BUILD_ROOT/etc/cron.d/0hourly
+
 %clean 
 rm -rf $RPM_BUILD_ROOT
 
@@ -99,18 +106,25 @@
 %config(noreplace) /etc/anacrontab
 %dir /var/spool/anacron/
 %dir /etc/rc.d/init.d/*
-/%{_mandir}/man5/*
-/%{_mandir}/man8/*
+%{_mandir}/man5/*
+%{_mandir}/man8/*
 /usr/sbin/anacron
-%dir /etc/cron.hourly
-%dir /etc/cron.daily
-%dir /etc/cron.weekly
-%dir /etc/cron.monthly
-%dir /etc/cron.daily/0anacron
-%dir /etc/cron.weekly/0anacron
-%dir /etc/cron.monthly/0anacron
+%dir /etc/cron.hourly/0anacron
+%attr(644,root,root) /etc/cron.d/0hourly
+#%dir /etc/cron.daily/0anacron
+#%dir /etc/cron.weekly/0anacron
+#%dir /etc/cron.monthly/0anacron
 
 %changelog
+* Mon Jan 26 2009 Marcela Ma??l????ov?? <mmaslano at redhat.com> 2.3-66
+- cron.{daily,weekly,hourly,monthly} should be owned by crontabs, because
+	some don't have installed anacron and other cron like programmes could
+	be dependent
+- 0anacron is now trying run all cron.{daily,weekly,...} every hour. 
+	This should fix problem with jobs running twice, with not running jobs
+	after hibernation and so on.
+- the random delay is in default switch off
+
 * Fri Oct 24 2008 Marcela Ma??l????ov?? <mmaslano at redhat.com> 2.3-65
 - rewrite init script - using fedora guidelines SysVInitScript
 
@@ -128,8 +142,7 @@
 - correct spooldir logged
 
 * Thu Feb 28 2008 Marcela Maslanova <mmaslano at redhat.com> 2.3-59
-- 0anacron.{daily,weekly,monthly} sterror's output also goes to
-    dev/null
+- 0anacron.{daily,weekly,monthly} sterror's output also goes to dev/null
 - rhbz#435255
 
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 2.3-58


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/anacron/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	6 Feb 2007 14:35:24 -0000	1.3
+++ sources	26 Jan 2009 09:25:53 -0000	1.4
@@ -1,2 +1,3 @@
 9fdfc50f5741643332722a9145146278  anacron_2.3.orig.tar.gz
 094af5e05723d2c4924d60f73d738509  anacron.init
+e354dcd88554723abd476f069c90069d  0hourly



From mschwendt at fedoraproject.org  Mon Jan 26 09:39:27 2009
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Mon, 26 Jan 2009 09:39:27 +0000 (UTC)
Subject: rpms/geeqie/devel .cvsignore, 1.6, 1.7 geeqie.spec, 1.12,
	1.13 sources, 1.6, 1.7
Message-ID: <20090126093927.AA7057010C@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/pkgs/rpms/geeqie/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14209

Modified Files:
	.cvsignore geeqie.spec sources 
Log Message:
* Mon Jan 26 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.0-0.12.alpha3
- update to alpha3 tarball



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/geeqie/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	22 Jan 2009 13:19:53 -0000	1.6
+++ .cvsignore	26 Jan 2009 09:38:57 -0000	1.7
@@ -1 +1 @@
-geeqie-1.0alpha2-svn-1341.tgz
+geeqie-1.0alpha3.tar.gz


Index: geeqie.spec
===================================================================
RCS file: /cvs/pkgs/rpms/geeqie/devel/geeqie.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- geeqie.spec	22 Jan 2009 13:19:53 -0000	1.12
+++ geeqie.spec	26 Jan 2009 09:38:57 -0000	1.13
@@ -1,14 +1,14 @@
-%define upstreamversion 1.0alpha2
+%define upstreamversion 1.0alpha3
 
 Summary: Image browser and viewer
 Name: geeqie
 Version: 1.0
-Release: 0.11.alpha2.1341svn%{?dist}
+Release: 0.12.alpha3%{?dist}
 License: GPLv3
 Group: User Interface/X
 # svn + autogen
-Source: geeqie-1.0alpha2-svn-1341.tgz
-#Source: http://dl.sf.net/sourceforge/geeqie/%{name}-%{upstreamversion}.tar.gz
+#Source: geeqie-1.0alpha2-svn-1341.tgz
+Source: http://dl.sf.net/sourceforge/geeqie/%{name}-%{upstreamversion}.tar.gz
 Patch1: geeqie-1.0alpha2-desktop.patch
 Patch2: geeqie-1.0alpha2-editors.patch
 # bz 222639
@@ -16,7 +16,7 @@
 Patch4: geeqie-1.0alpha2-gcc-warn.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n)
 URL: http://geeqie.sourceforge.net/
-BuildRequires: gtk2-devel >= 2.4.0
+BuildRequires: gtk2-devel
 BuildRequires: lcms-devel
 BuildRequires: exiv2-devel
 #BuildRequires: lirc-devel
@@ -48,6 +48,7 @@
 
 %build
 %configure --disable-lirc
+make clean
 make %{?_smp_mflags}
 
 
@@ -92,6 +93,9 @@
 
 
 %changelog
+* Mon Jan 26 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.0-0.12.alpha3
+- update to alpha3 tarball
+
 * Thu Jan 22 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.0-0.11.alpha2.1341svn
 - update to svn 1341 for pre-alpha3 testing (image metadata features)
 - drop obsolete patches remote-blank and float-layout


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/geeqie/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	22 Jan 2009 13:19:53 -0000	1.6
+++ sources	26 Jan 2009 09:38:57 -0000	1.7
@@ -1 +1 @@
-526efa8d2c7947772ce280800fe64ffe  geeqie-1.0alpha2-svn-1341.tgz
+0f0c3991ee4ef9232e21ed49fa879b83  geeqie-1.0alpha3.tar.gz



From pkgdb at fedoraproject.org  Mon Jan 26 09:40:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Jan 2009 09:40:10 +0000
Subject: [pkgdb] xmms-skins had acl change status
Message-ID: <20090126094010.3B28F208484@bastion.fedora.phx.redhat.com>

thias has set the watchcommits acl on xmms-skins (Fedora 10) to Approved for tlee2

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/xmms-skins



From nphilipp at fedoraproject.org  Mon Jan 26 09:57:57 2009
From: nphilipp at fedoraproject.org (Nils Philippsen)
Date: Mon, 26 Jan 2009 09:57:57 +0000 (UTC)
Subject: rpms/ufraw/devel .cvsignore, 1.10, 1.11 sources, 1.10,
	1.11 ufraw.spec, 1.39, 1.40
Message-ID: <20090126095757.98FA07010C@cvs1.fedora.phx.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/ufraw/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17260

Modified Files:
	.cvsignore sources ufraw.spec 
Log Message:
version 0.15
use downloads.sourceforge.net source URL



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ufraw/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	28 Nov 2008 11:54:38 -0000	1.10
+++ .cvsignore	26 Jan 2009 09:57:26 -0000	1.11
@@ -1 +1 @@
-ufraw-0.14.1.tar.gz
+ufraw-0.15.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ufraw/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	28 Nov 2008 11:54:38 -0000	1.10
+++ sources	26 Jan 2009 09:57:26 -0000	1.11
@@ -1 +1 @@
-cc204ecc7009b947a265391bd3aec236  ufraw-0.14.1.tar.gz
+6d8f6c98a388c438784cd909dd82d540  ufraw-0.15.tar.gz


Index: ufraw.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ufraw/devel/ufraw.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- ufraw.spec	23 Dec 2008 13:37:51 -0000	1.39
+++ ufraw.spec	26 Jan 2009 09:57:26 -0000	1.40
@@ -35,12 +35,12 @@
 
 Summary: Raw image data retrieval tool for digital cameras
 Name: ufraw
-Version: 0.14.1
-Release: 4%{?dist}
+Version: 0.15
+Release: 1%{?dist}
 Group: Applications/Multimedia
 License: GPLv2+
 URL: http://ufraw.sourceforge.net
-Source0: http://download.sourceforge.net/ufraw/ufraw-%{version}.tar.gz
+Source0: http://downloads.sourceforge.net/ufraw/ufraw-%{version}.tar.gz
 BuildRequires: gimp-devel >= 2.0
 BuildRequires: gimp >= 2.0
 %if %{with cinepaint}
@@ -227,6 +227,17 @@
 %endif
 
 %changelog
+* Mon Jan 26 2009 Nils Philippsen <nils at redhat.com> - 0.15-1
+- version 0.15:
+  - Multiprocessing support using OpenMP. Patch by Bruce Guenter.
+  - Add progress report during the loading of raw files.
+  - Add JPEG optimization to reduce the file size without effecting image
+    quality.
+  - Compatibility with the just released Exiv2-0.18.
+  - Support sRAW1 and sRAW2 formats of the Canon 50D and 5D Mark II.
+  - Some annoying bugs got squashed.
+- use downloads.sourceforge.net source URL
+
 * Thu Dec 18 2008 Rex Dieter <rdieter at fedoraproject.org> - 0.14.1-4 
 - respin (exiv2)
 



From nphilipp at fedoraproject.org  Mon Jan 26 10:00:54 2009
From: nphilipp at fedoraproject.org (Nils Philippsen)
Date: Mon, 26 Jan 2009 10:00:54 +0000 (UTC)
Subject: rpms/ufraw/F-10 .cvsignore, 1.10, 1.11 sources, 1.10,
	1.11 ufraw.spec, 1.37, 1.38
Message-ID: <20090126100054.D4AA97010C@cvs1.fedora.phx.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/ufraw/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17760

Modified Files:
	.cvsignore sources ufraw.spec 
Log Message:
version 0.15
use downloads.sourceforge.net source URL



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ufraw/F-10/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	1 Dec 2008 15:39:25 -0000	1.10
+++ .cvsignore	26 Jan 2009 10:00:24 -0000	1.11
@@ -1 +1 @@
-ufraw-0.14.1.tar.gz
+ufraw-0.15.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ufraw/F-10/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	1 Dec 2008 15:39:25 -0000	1.10
+++ sources	26 Jan 2009 10:00:24 -0000	1.11
@@ -1 +1 @@
-cc204ecc7009b947a265391bd3aec236  ufraw-0.14.1.tar.gz
+6d8f6c98a388c438784cd909dd82d540  ufraw-0.15.tar.gz


Index: ufraw.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ufraw/F-10/ufraw.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- ufraw.spec	2 Dec 2008 14:34:00 -0000	1.37
+++ ufraw.spec	26 Jan 2009 10:00:24 -0000	1.38
@@ -35,12 +35,12 @@
 
 Summary: Raw image data retrieval tool for digital cameras
 Name: ufraw
-Version: 0.14.1
-Release: 3%{?dist}
+Version: 0.15
+Release: 1%{?dist}
 Group: Applications/Multimedia
 License: GPLv2+
 URL: http://ufraw.sourceforge.net
-Source0: http://download.sourceforge.net/ufraw/ufraw-%{version}.tar.gz
+Source0: http://downloads.sourceforge.net/ufraw/ufraw-%{version}.tar.gz
 BuildRequires: gimp-devel >= 2.0
 BuildRequires: gimp >= 2.0
 %if %{with cinepaint}
@@ -227,6 +227,20 @@
 %endif
 
 %changelog
+* Mon Jan 26 2009 Nils Philippsen <nils at redhat.com> - 0.15-1
+- version 0.15:
+  - Multiprocessing support using OpenMP. Patch by Bruce Guenter.
+  - Add progress report during the loading of raw files.
+  - Add JPEG optimization to reduce the file size without effecting image
+    quality.
+  - Compatibility with the just released Exiv2-0.18.
+  - Support sRAW1 and sRAW2 formats of the Canon 50D and 5D Mark II.
+  - Some annoying bugs got squashed.
+- use downloads.sourceforge.net source URL
+
+* Thu Dec 18 2008 Rex Dieter <rdieter at fedoraproject.org> - 0.14.1-4 
+- respin (exiv2)
+
 * Tue Dec 02 2008 Nils Philippsen <nils at redhat.com> - 0.14.1-3
 - require gimp and cinepaint in the respective subpackages (#474021)
 



From nphilipp at fedoraproject.org  Mon Jan 26 10:01:16 2009
From: nphilipp at fedoraproject.org (Nils Philippsen)
Date: Mon, 26 Jan 2009 10:01:16 +0000 (UTC)
Subject: rpms/ufraw/F-9 .cvsignore, 1.10, 1.11 sources, 1.10, 1.11 ufraw.spec,
	1.36, 1.37
Message-ID: <20090126100116.1EEBB7010C@cvs1.fedora.phx.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/ufraw/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17910

Modified Files:
	.cvsignore sources ufraw.spec 
Log Message:
version 0.15
use downloads.sourceforge.net source URL



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ufraw/F-9/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	1 Dec 2008 15:59:05 -0000	1.10
+++ .cvsignore	26 Jan 2009 10:00:45 -0000	1.11
@@ -1 +1 @@
-ufraw-0.14.1.tar.gz
+ufraw-0.15.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ufraw/F-9/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	1 Dec 2008 15:59:05 -0000	1.10
+++ sources	26 Jan 2009 10:00:45 -0000	1.11
@@ -1 +1 @@
-cc204ecc7009b947a265391bd3aec236  ufraw-0.14.1.tar.gz
+6d8f6c98a388c438784cd909dd82d540  ufraw-0.15.tar.gz


Index: ufraw.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ufraw/F-9/ufraw.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- ufraw.spec	2 Dec 2008 14:34:07 -0000	1.36
+++ ufraw.spec	26 Jan 2009 10:00:45 -0000	1.37
@@ -35,12 +35,12 @@
 
 Summary: Raw image data retrieval tool for digital cameras
 Name: ufraw
-Version: 0.14.1
-Release: 3%{?dist}
+Version: 0.15
+Release: 1%{?dist}
 Group: Applications/Multimedia
 License: GPLv2+
 URL: http://ufraw.sourceforge.net
-Source0: http://download.sourceforge.net/ufraw/ufraw-%{version}.tar.gz
+Source0: http://downloads.sourceforge.net/ufraw/ufraw-%{version}.tar.gz
 BuildRequires: gimp-devel >= 2.0
 BuildRequires: gimp >= 2.0
 %if %{with cinepaint}
@@ -227,6 +227,20 @@
 %endif
 
 %changelog
+* Mon Jan 26 2009 Nils Philippsen <nils at redhat.com> - 0.15-1
+- version 0.15:
+  - Multiprocessing support using OpenMP. Patch by Bruce Guenter.
+  - Add progress report during the loading of raw files.
+  - Add JPEG optimization to reduce the file size without effecting image
+    quality.
+  - Compatibility with the just released Exiv2-0.18.
+  - Support sRAW1 and sRAW2 formats of the Canon 50D and 5D Mark II.
+  - Some annoying bugs got squashed.
+- use downloads.sourceforge.net source URL
+
+* Thu Dec 18 2008 Rex Dieter <rdieter at fedoraproject.org> - 0.14.1-4 
+- respin (exiv2)
+
 * Tue Dec 02 2008 Nils Philippsen <nils at redhat.com> - 0.14.1-3
 - require gimp and cinepaint in the respective subpackages (#474021)
 



From karsten at fedoraproject.org  Mon Jan 26 10:06:34 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Mon, 26 Jan 2009 10:06:34 +0000 (UTC)
Subject: rpms/vim/devel 7.2.080,NONE,1.1
Message-ID: <20090126100634.889717010C@cvs1.fedora.phx.redhat.com>

Author: karsten

Update of /cvs/extras/rpms/vim/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18923

Added Files:
	7.2.080 
Log Message:
- patchlevel 080


--- NEW FILE 7.2.080 ---
To: vim-dev at vim.org
Subject: Patch 7.2.080
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.080
Problem:    When typing a composing character just after starting completion
	    may access memory before its allocation point. (Dominique Pelle)
Solution:   Don't delete before the completion start column.  Add extra checks
	    for the offset not being negative.
Files:	    src/edit.c


*** ../vim-7.2.079/src/edit.c	Wed Aug  6 18:56:55 2008
--- src/edit.c	Tue Jan 13 12:05:57 2009
***************
*** 147,152 ****
--- 147,153 ----
  static int  ins_compl_bs __ARGS((void));
  static void ins_compl_new_leader __ARGS((void));
  static void ins_compl_addleader __ARGS((int c));
+ static int ins_compl_len __ARGS((void));
  static void ins_compl_restart __ARGS((void));
  static void ins_compl_set_original_text __ARGS((char_u *str));
  static void ins_compl_addfrommatch __ARGS((void));
***************
*** 197,203 ****
  static void mb_replace_pop_ins __ARGS((int cc));
  #endif
  static void replace_flush __ARGS((void));
! static void replace_do_bs __ARGS((void));
  #ifdef FEAT_CINDENT
  static int cindent_on __ARGS((void));
  #endif
--- 198,205 ----
  static void mb_replace_pop_ins __ARGS((int cc));
  #endif
  static void replace_flush __ARGS((void));
! static void replace_do_bs __ARGS((int limit_col));
! static int del_char_after_col __ARGS((int limit_col));
  #ifdef FEAT_CINDENT
  static int cindent_on __ARGS((void));
  #endif
***************
*** 1933,1938 ****
--- 1935,1942 ----
  /*
   * Backspace the cursor until the given column.  Handles REPLACE and VREPLACE
   * modes correctly.  May also be used when not in insert mode at all.
+  * Will attempt not to go before "col" even when there is a composing
+  * character.
   */
      void
  backspace_until_column(col)
***************
*** 1942,1954 ****
      {
  	curwin->w_cursor.col--;
  	if (State & REPLACE_FLAG)
! 	    replace_do_bs();
! 	else
! 	    (void)del_char(FALSE);
      }
  }
  #endif
  
  #if defined(FEAT_INS_EXPAND) || defined(PROTO)
  /*
   * CTRL-X pressed in Insert mode.
--- 1946,1994 ----
      {
  	curwin->w_cursor.col--;
  	if (State & REPLACE_FLAG)
! 	    replace_do_bs(col);
! 	else if (!del_char_after_col(col))
! 	    break;
      }
  }
  #endif
  
+ /*
+  * Like del_char(), but make sure not to go before column "limit_col".
+  * Only matters when there are composing characters.
+  * Return TRUE when something was deleted.
+  */
+    static int
+ del_char_after_col(limit_col)
+     int limit_col;
+ {
+ #ifdef FEAT_MBYTE
+     if (enc_utf8 && limit_col >= 0)
+     {
+ 	int ecol = curwin->w_cursor.col + 1;
+ 
+ 	/* Make sure the cursor is at the start of a character, but
+ 	 * skip forward again when going too far back because of a
+ 	 * composing character. */
+ 	mb_adjust_cursor();
+ 	while (curwin->w_cursor.col < limit_col)
+ 	{
+ 	    int l = utf_ptr2len(ml_get_cursor());
+ 
+ 	    if (l == 0)  /* end of line */
+ 		break;
+ 	    curwin->w_cursor.col += l;
+ 	}
+ 	if (*ml_get_cursor() == NUL || curwin->w_cursor.col == ecol)
+ 	    return FALSE;
+ 	del_bytes((long)(ecol - curwin->w_cursor.col), FALSE, TRUE);
+     }
+     else
+ #endif
+ 	(void)del_char(FALSE);
+     return TRUE;
+ }
+ 
  #if defined(FEAT_INS_EXPAND) || defined(PROTO)
  /*
   * CTRL-X pressed in Insert mode.
***************
*** 2418,2424 ****
  	{
  	    had_match = (curwin->w_cursor.col > compl_col);
  	    ins_compl_delete();
! 	    ins_bytes(compl_leader + curwin->w_cursor.col - compl_col);
  	    ins_redraw(FALSE);
  
  	    /* When the match isn't there (to avoid matching itself) remove it
--- 2458,2464 ----
  	{
  	    had_match = (curwin->w_cursor.col > compl_col);
  	    ins_compl_delete();
! 	    ins_bytes(compl_leader + ins_compl_len());
  	    ins_redraw(FALSE);
  
  	    /* When the match isn't there (to avoid matching itself) remove it
***************
*** 2470,2476 ****
  	    *p = NUL;
  	    had_match = (curwin->w_cursor.col > compl_col);
  	    ins_compl_delete();
! 	    ins_bytes(compl_leader + curwin->w_cursor.col - compl_col);
  	    ins_redraw(FALSE);
  
  	    /* When the match isn't there (to avoid matching itself) remove it
--- 2510,2516 ----
  	    *p = NUL;
  	    had_match = (curwin->w_cursor.col > compl_col);
  	    ins_compl_delete();
! 	    ins_bytes(compl_leader + ins_compl_len());
  	    ins_redraw(FALSE);
  
  	    /* When the match isn't there (to avoid matching itself) remove it
***************
*** 3209,3215 ****
  {
      ins_compl_del_pum();
      ins_compl_delete();
!     ins_bytes(compl_leader + curwin->w_cursor.col - compl_col);
      compl_used_match = FALSE;
  
      if (compl_started)
--- 3249,3255 ----
  {
      ins_compl_del_pum();
      ins_compl_delete();
!     ins_bytes(compl_leader + ins_compl_len());
      compl_used_match = FALSE;
  
      if (compl_started)
***************
*** 3264,3269 ****
--- 3304,3323 ----
  }
  
  /*
+  * Return the length of the completion, from the completion start column to
+  * the cursor column.  Making sure it never goes below zero.
+  */
+     static int
+ ins_compl_len()
+ {
+     int off = curwin->w_cursor.col - compl_col;
+ 
+     if (off < 0)
+ 	return 0;
+     return off;
+ }
+ 
+ /*
   * Append one character to the match leader.  May reduce the number of
   * matches.
   */
***************
*** 3621,3630 ****
  	    {
  		ins_compl_delete();
  		if (compl_leader != NULL)
! 		    ins_bytes(compl_leader + curwin->w_cursor.col - compl_col);
  		else if (compl_first_match != NULL)
! 		    ins_bytes(compl_orig_text
! 					  + curwin->w_cursor.col - compl_col);
  		retval = TRUE;
  	    }
  
--- 3675,3683 ----
  	    {
  		ins_compl_delete();
  		if (compl_leader != NULL)
! 		    ins_bytes(compl_leader + ins_compl_len());
  		else if (compl_first_match != NULL)
! 		    ins_bytes(compl_orig_text + ins_compl_len());
  		retval = TRUE;
  	    }
  
***************
*** 4256,4262 ****
      static void
  ins_compl_insert()
  {
!     ins_bytes(compl_shown_match->cp_str + curwin->w_cursor.col - compl_col);
      if (compl_shown_match->cp_flags & ORIGINAL_TEXT)
  	compl_used_match = FALSE;
      else
--- 4309,4315 ----
      static void
  ins_compl_insert()
  {
!     ins_bytes(compl_shown_match->cp_str + ins_compl_len());
      if (compl_shown_match->cp_flags & ORIGINAL_TEXT)
  	compl_used_match = FALSE;
      else
***************
*** 4425,4431 ****
  	if (!compl_get_longest || compl_used_match)
  	    ins_compl_insert();
  	else
! 	    ins_bytes(compl_leader + curwin->w_cursor.col - compl_col);
      }
      else
  	compl_used_match = FALSE;
--- 4478,4484 ----
  	if (!compl_get_longest || compl_used_match)
  	    ins_compl_insert();
  	else
! 	    ins_bytes(compl_leader + ins_compl_len());
      }
      else
  	compl_used_match = FALSE;
***************
*** 7123,7131 ****
   * cc == 0: character was inserted, delete it
   * cc > 0: character was replaced, put cc (first byte of original char) back
   * and check for more characters to be put back
   */
      static void
! replace_do_bs()
  {
      int		cc;
  #ifdef FEAT_VREPLACE
--- 7176,7187 ----
   * cc == 0: character was inserted, delete it
   * cc > 0: character was replaced, put cc (first byte of original char) back
   * and check for more characters to be put back
+  * When "limit_col" is >= 0, don't delete before this column.  Matters when
+  * using composing characters, use del_char_after_col() instead of del_char().
   */
      static void
! replace_do_bs(limit_col)
!     int		limit_col;
  {
      int		cc;
  #ifdef FEAT_VREPLACE
***************
*** 7153,7159 ****
  #ifdef FEAT_MBYTE
  	if (has_mbyte)
  	{
! 	    del_char(FALSE);
  # ifdef FEAT_VREPLACE
  	    if (State & VREPLACE_FLAG)
  		orig_len = (int)STRLEN(ml_get_cursor());
--- 7209,7215 ----
  #ifdef FEAT_MBYTE
  	if (has_mbyte)
  	{
! 	    (void)del_char_after_col(limit_col);
  # ifdef FEAT_VREPLACE
  	    if (State & VREPLACE_FLAG)
  		orig_len = (int)STRLEN(ml_get_cursor());
***************
*** 7203,7209 ****
  	changed_bytes(curwin->w_cursor.lnum, curwin->w_cursor.col);
      }
      else if (cc == 0)
! 	(void)del_char(FALSE);
  }
  
  #ifdef FEAT_CINDENT
--- 7259,7265 ----
  	changed_bytes(curwin->w_cursor.lnum, curwin->w_cursor.col);
      }
      else if (cc == 0)
! 	(void)del_char_after_col(limit_col);
  }
  
  #ifdef FEAT_CINDENT
***************
*** 8239,8245 ****
  	 * Replace mode */
  	if (curwin->w_cursor.lnum != Insstart.lnum
  		|| curwin->w_cursor.col >= Insstart.col)
! 	    replace_do_bs();
      }
      else
  	(void)del_char(FALSE);
--- 8295,8301 ----
  	 * Replace mode */
  	if (curwin->w_cursor.lnum != Insstart.lnum
  		|| curwin->w_cursor.col >= Insstart.col)
! 	    replace_do_bs(-1);
      }
      else
  	(void)del_char(FALSE);
***************
*** 8556,8562 ****
  		break;
  	    }
  	    if (State & REPLACE_FLAG)
! 		replace_do_bs();
  	    else
  	    {
  #ifdef FEAT_MBYTE
--- 8612,8618 ----
  		break;
  	    }
  	    if (State & REPLACE_FLAG)
! 		replace_do_bs(-1);
  	    else
  	    {
  #ifdef FEAT_MBYTE
*** ../vim-7.2.079/src/version.c	Tue Jan  6 16:13:42 2009
--- src/version.c	Tue Jan 13 12:25:29 2009
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     80,
  /**/

-- 
At some point in the project somebody will start whining about the need to
determine the project "requirements".  This involves interviewing people who
don't know what they want but, curiously, know exactly when they need it.
				(Scott Adams - The Dilbert principle)

 /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\        download, build and distribute -- http://www.A-A-P.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///



From karsten at fedoraproject.org  Mon Jan 26 10:06:47 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Mon, 26 Jan 2009 10:06:47 +0000 (UTC)
Subject: rpms/vim/devel 7.2.081,NONE,1.1
Message-ID: <20090126100647.4D60A7010C@cvs1.fedora.phx.redhat.com>

Author: karsten

Update of /cvs/extras/rpms/vim/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18972

Added Files:
	7.2.081 
Log Message:
- patchlevel 081


--- NEW FILE 7.2.081 ---
To: vim-dev at vim.org
Subject: Patch 7.2.081
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.081
Problem:    Compiler warning for floating point overflow on VAX.
Solution:   For VAX use a smaller number. (Zoltan Arpadffy)
Files:	    src/message.c


*** ../vim-7.2.080/src/message.c	Fri Nov 28 21:26:50 2008
--- src/message.c	Tue Jan 13 16:19:07 2009
***************
*** 4556,4562 ****
  			remove_trailing_zeroes = TRUE;
  		    }
  
! 		    if (fmt_spec == 'f' && abs_f > 1.0e307)
  		    {
  			/* Avoid a buffer overflow */
  			strcpy(tmp, "inf");
--- 4556,4568 ----
  			remove_trailing_zeroes = TRUE;
  		    }
  
! 		    if (fmt_spec == 'f' &&
! #ifdef VAX
! 			    abs_f > 1.0e38
! #else
! 			    abs_f > 1.0e307
! #endif
! 			    )
  		    {
  			/* Avoid a buffer overflow */
  			strcpy(tmp, "inf");
*** ../vim-7.2.080/src/version.c	Tue Jan 13 12:29:03 2009
--- src/version.c	Tue Jan 13 16:19:52 2009
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     81,
  /**/

-- 
Sometimes you can protect millions of dollars in your budget simply by buying
a bag of cookies, dropping it on the budget anylyst's desk, and saying
something deeply personal such as "How was your weekend, big guy?"
				(Scott Adams - The Dilbert principle)

 /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\        download, build and distribute -- http://www.A-A-P.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///



From hadess at fedoraproject.org  Mon Jan 26 10:06:53 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Mon, 26 Jan 2009 10:06:53 +0000 (UTC)
Subject: rpms/gstreamer-plugins-good/devel
	gst-plugins-good-0.10.13-libv4l.patch, NONE, 1.1 .cvsignore,
	1.13, 1.14 gstreamer-plugins-good.spec, 1.81, 1.82 sources, 1.13,
	1.14 gst-plugins-good-0.10.9-libv4l.patch, 1.4, NONE
Message-ID: <20090126100653.02C7A7010C@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-serv18834

Modified Files:
	.cvsignore gstreamer-plugins-good.spec sources 
Added Files:
	gst-plugins-good-0.10.13-libv4l.patch 
Removed Files:
	gst-plugins-good-0.10.9-libv4l.patch 
Log Message:
* Mon Jan 26 2009 - Bastien Nocera <bnocera at redhat.com> - 0.10.13-1
- Update to 0.10.13
- Update libv4l patch


gst-plugins-good-0.10.13-libv4l.patch:

--- NEW FILE gst-plugins-good-0.10.13-libv4l.patch ---
diff -upr gst-plugins-good-0.10.13.old/config.h.in gst-plugins-good-0.10.13/config.h.in
--- gst-plugins-good-0.10.13.old/config.h.in	2009-01-22 21:27:01.000000000 +0000
+++ gst-plugins-good-0.10.13/config.h.in	2009-01-26 09:56:08.000000000 +0000
@@ -187,6 +187,9 @@
 /* Define to enable Portable Network Graphics library (used by png). */
 #undef HAVE_LIBPNG
 
+/* Whether libv4l2 is available for video buffer conversion */
+#undef HAVE_LIBV4L2
+
 /* Define to 1 if you have the <memory.h> header file. */
 #undef HAVE_MEMORY_H
 
diff -upr gst-plugins-good-0.10.13.old/configure gst-plugins-good-0.10.13/configure
--- gst-plugins-good-0.10.13.old/configure	2009-01-22 21:25:11.000000000 +0000
+++ gst-plugins-good-0.10.13/configure	2009-01-26 09:56:53.000000000 +0000
@@ -909,6 +909,8 @@ X_CFLAGS
 XMKMF
 USE_GST_V4L2_FALSE
 USE_GST_V4L2_TRUE
+LIBV4L2_CFLAGS
+LIBV4L2_LIBS
 XVIDEO_LIBS
 USE_OSX_VIDEO_FALSE
 USE_OSX_VIDEO_TRUE
@@ -1438,6 +1440,8 @@ GST_PLUGINS_BASE_CFLAGS
 GST_PLUGINS_BASE_LIBS
 GTK2_CFLAGS
 GTK2_LIBS
+LIBV4L2_CFLAGS
+LIBV4L2_LIBS
 XMKMF
 XFIXES_CFLAGS
 XFIXES_LIBS
@@ -2297,6 +2301,10 @@ Some influential environment variables:
               linker flags for GST_PLUGINS_BASE, overriding pkg-config
   GTK2_CFLAGS C compiler flags for GTK2, overriding pkg-config
   GTK2_LIBS   linker flags for GTK2, overriding pkg-config
+  LIBV4L2_CFLAGS
+              C compiler flags for LIBV4L2, overriding pkg-config
+  LIBV4L2_LIBS
+              linker flags for LIBV4L2, overriding pkg-config
   XMKMF       Path to xmkmf, Makefile generator for X Window System
   XFIXES_CFLAGS
               C compiler flags for XFIXES, overriding pkg-config
@@ -37144,6 +37152,71 @@ else
   USE_GDK_PIXBUF_FALSE=
 fi
 
+if test x$HAVE_GST_V4L2 = xyes; then
+
+pkg_failed=no
+{ echo "$as_me:$LINENO: checking for LIBV4L2" >&5
+echo $ECHO_N "checking for LIBV4L2... " >&6; }
+
+if test -n "$PKG_CONFIG"; then
+    if test -n "$LIBV4L2_CFLAGS"; then
+        pkg_cv_LIBV4L2_CFLAGS="$LIBV4L2_CFLAGS"
+    else
+        if test -n "$PKG_CONFIG" && \
+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libv4l2\"") >&5
+  ($PKG_CONFIG --exists --print-errors "libv4l2") 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
+  pkg_cv_LIBV4L2_CFLAGS=`$PKG_CONFIG --cflags "libv4l2" 2>/dev/null`
+else
+  pkg_failed=yes
+fi
+    fi
+else
+	pkg_failed=untried
+fi
+if test -n "$PKG_CONFIG"; then
+    if test -n "$LIBV4L2_LIBS"; then
+        pkg_cv_LIBV4L2_LIBS="$LIBV4L2_LIBS"
+    else
+        if test -n "$PKG_CONFIG" && \
+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libv4l2\"") >&5
+  ($PKG_CONFIG --exists --print-errors "libv4l2") 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
+  pkg_cv_LIBV4L2_LIBS=`$PKG_CONFIG --libs "libv4l2" 2>/dev/null`
+else
+  pkg_failed=yes
+fi
+    fi
+else
+	pkg_failed=untried
+fi
+
+if test $pkg_failed = yes; then
+	LIBV4L2_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libv4l2"`
+	# Put the nasty error message in config.log where it belongs
+	echo "$LIBV4L2_PKG_ERRORS" 1>&5
+
+	have_libv4l2=no
+elif test $pkg_failed = untried; then
+	have_libv4l2=no
+else
+	LIBV4L2_CFLAGS=$pkg_cv_LIBV4L2_CFLAGS
+	LIBV4L2_LIBS=$pkg_cv_LIBV4L2_LIBS
+        { echo "$as_me:$LINENO: result: yes" >&5
+echo "yes" >&6; }
+	have_libv4l2=yes
+fi
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_LIBV4L2 test x$have_libv4l2 = xyes
+_ACEOF
+
+fi
+
 
 
 echo
diff -upr gst-plugins-good-0.10.13.old/configure.ac gst-plugins-good-0.10.13/configure.ac
--- gst-plugins-good-0.10.13.old/configure.ac	2009-01-22 21:04:39.000000000 +0000
+++ gst-plugins-good-0.10.13/configure.ac	2009-01-26 09:56:08.000000000 +0000
@@ -550,6 +550,12 @@ return 0;
   fi
 ])
 
+if test x$HAVE_GST_V4L2 = xyes; then
+  PKG_CHECK_MODULES(LIBV4L2, libv4l2, [have_libv4l2=yes], [have_libv4l2=no])
+  AC_DEFINE([HAVE_LIBV4L2], test x$have_libv4l2 = xyes,
+	    [Whether libv4l2 is available for video buffer conversion])
+fi
+
 dnl Check for X11
 translit(dnm, m, l) AM_CONDITIONAL(USE_X, true)
 AG_GST_CHECK_FEATURE(X, [X libraries and plugins],
diff -upr gst-plugins-good-0.10.13.old/sys/v4l2/gstv4l2src.c gst-plugins-good-0.10.13/sys/v4l2/gstv4l2src.c
--- gst-plugins-good-0.10.13.old/sys/v4l2/gstv4l2src.c	2009-01-22 00:04:30.000000000 +0000
+++ gst-plugins-good-0.10.13/sys/v4l2/gstv4l2src.c	2009-01-26 09:56:08.000000000 +0000
@@ -1194,7 +1194,7 @@ gst_v4l2src_get_read (GstV4l2Src * v4l2s
 
   do {
     amount =
-        read (v4l2src->v4l2object->video_fd, GST_BUFFER_DATA (*buf),
+        v4l2_read (v4l2src->v4l2object->video_fd, GST_BUFFER_DATA (*buf),
         buffersize);
     if (amount == buffersize) {
       break;
diff -upr gst-plugins-good-0.10.13.old/sys/v4l2/Makefile.am gst-plugins-good-0.10.13/sys/v4l2/Makefile.am
--- gst-plugins-good-0.10.13.old/sys/v4l2/Makefile.am	2009-01-21 23:58:47.000000000 +0000
+++ gst-plugins-good-0.10.13/sys/v4l2/Makefile.am	2009-01-26 09:56:08.000000000 +0000
@@ -22,15 +22,17 @@ libgstvideo4linux2_la_SOURCES = gstv4l2.
 libgstvideo4linux2_la_CFLAGS =   $(GST_PLUGINS_BASE_CFLAGS) \
 				 $(GST_BASE_CFLAGS) \
 				 $(GST_CFLAGS) \
-				 $(X_CFLAGS)
-			        
+				 $(X_CFLAGS) \
+				 $(LIBV4L2_CFLAGS)
+
 libgstvideo4linux2_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 
 libgstvideo4linux2_la_LIBADD =   $(GST_PLUGINS_BASE_LIBS) \
 				 $(GST_BASE_LIBS) \
 				 -lgstinterfaces-$(GST_MAJORMINOR) \
 				 $(GST_LIBS) \
-				 $(xv_libs)
+				 $(xv_libs) \
+				 $(LIBV4L2_LIBS)
 
 noinst_HEADERS = gstv4l2object.h v4l2_calls.h \
 		 gstv4l2src.h v4l2src_calls.h \
diff -upr gst-plugins-good-0.10.13.old/sys/v4l2/Makefile.in gst-plugins-good-0.10.13/sys/v4l2/Makefile.in
--- gst-plugins-good-0.10.13.old/sys/v4l2/Makefile.in	2009-01-22 21:25:00.000000000 +0000
+++ gst-plugins-good-0.10.13/sys/v4l2/Makefile.in	2009-01-26 09:56:08.000000000 +0000
@@ -274,6 +274,8 @@ LIBOIL_CFLAGS = @LIBOIL_CFLAGS@
 LIBOIL_LIBS = @LIBOIL_LIBS@
 LIBPNG_CFLAGS = @LIBPNG_CFLAGS@
 LIBPNG_LIBS = @LIBPNG_LIBS@
+LIBV4L2_CFLAGS =
+LIBV4L2_LIBS = -lv4l2 -lv4lconvert
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
 LIPO = @LIPO@
@@ -441,14 +443,16 @@ libgstvideo4linux2_la_SOURCES = gstv4l2.
 libgstvideo4linux2_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) \
 				 $(GST_BASE_CFLAGS) \
 				 $(GST_CFLAGS) \
-				 $(X_CFLAGS)
+				 $(X_CFLAGS) \
+				 $(LIBV4L2_CFLAGS)
 
 libgstvideo4linux2_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstvideo4linux2_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) \
 				 $(GST_BASE_LIBS) \
 				 -lgstinterfaces-$(GST_MAJORMINOR) \
 				 $(GST_LIBS) \
-				 $(xv_libs)
+				 $(xv_libs) \
+				 $(LIBV4L2_LIBS)
 
 noinst_HEADERS = gstv4l2object.h v4l2_calls.h \
 		 gstv4l2src.h v4l2src_calls.h \
diff -upr gst-plugins-good-0.10.13.old/sys/v4l2/v4l2_calls.c gst-plugins-good-0.10.13/sys/v4l2/v4l2_calls.c
--- gst-plugins-good-0.10.13.old/sys/v4l2/v4l2_calls.c	2009-01-22 00:04:30.000000000 +0000
+++ gst-plugins-good-0.10.13/sys/v4l2/v4l2_calls.c	2009-01-26 09:56:08.000000000 +0000
@@ -75,7 +75,7 @@ gst_v4l2_get_capabilities (GstV4l2Object
   if (!GST_V4L2_IS_OPEN (v4l2object))
     return FALSE;
 
-  if (ioctl (v4l2object->video_fd, VIDIOC_QUERYCAP, &v4l2object->vcap) < 0)
+  if (v4l2_ioctl (v4l2object->video_fd, VIDIOC_QUERYCAP, &v4l2object->vcap) < 0)
     goto cap_failed;
 
   GST_LOG_OBJECT (e, "driver:      '%s'", v4l2object->vcap.driver);
@@ -124,7 +124,7 @@ gst_v4l2_fill_lists (GstV4l2Object * v4l
     GstTunerChannel *channel;
 
     input.index = n;
-    if (ioctl (v4l2object->video_fd, VIDIOC_ENUMINPUT, &input) < 0) {
+    if (v4l2_ioctl (v4l2object->video_fd, VIDIOC_ENUMINPUT, &input) < 0) {
       if (errno == EINVAL)
         break;                  /* end of enumeration */
       else {
@@ -157,7 +157,7 @@ gst_v4l2_fill_lists (GstV4l2Object * v4l
       channel->flags |= GST_TUNER_CHANNEL_FREQUENCY;
 
       vtun.index = input.tuner;
-      if (ioctl (v4l2object->video_fd, VIDIOC_G_TUNER, &vtun) < 0) {
+      if (v4l2_ioctl (v4l2object->video_fd, VIDIOC_G_TUNER, &vtun) < 0) {
         GST_ELEMENT_ERROR (e, RESOURCE, SETTINGS,
             (_("Failed to get setting of tuner %d on device '%s'."),
                 input.tuner, v4l2object->videodev), GST_ERROR_SYSTEM);
@@ -197,7 +197,7 @@ gst_v4l2_fill_lists (GstV4l2Object * v4l
     standard.frameperiod.denominator = 0;
     standard.index = n;
 
-    if (ioctl (v4l2object->video_fd, VIDIOC_ENUMSTD, &standard) < 0) {
+    if (v4l2_ioctl (v4l2object->video_fd, VIDIOC_ENUMSTD, &standard) < 0) {
       if (errno == EINVAL || errno == ENOTTY)
         break;                  /* end of enumeration */
       else {
@@ -242,7 +242,7 @@ gst_v4l2_fill_lists (GstV4l2Object * v4l
     }
 
     control.id = n;
-    if (ioctl (v4l2object->video_fd, VIDIOC_QUERYCTRL, &control) < 0) {
+    if (v4l2_ioctl (v4l2object->video_fd, VIDIOC_QUERYCTRL, &control) < 0) {
       if (errno == EINVAL) {
         if (n < V4L2_CID_PRIVATE_BASE)
           /* continue so that we also check private controls */
@@ -324,7 +324,7 @@ gst_v4l2_fill_lists (GstV4l2Object * v4l
       menu.id = n;
       for (i = 0;; i++) {
         menu.index = i;
-        if (ioctl (v4l2object->video_fd, VIDIOC_QUERYMENU, &menu) < 0) {
+        if (v4l2_ioctl (v4l2object->video_fd, VIDIOC_QUERYMENU, &menu) < 0) {
           if (errno == EINVAL)
             break;              /* end of enumeration */
           else {
@@ -399,6 +399,7 @@ gboolean
 gst_v4l2_open (GstV4l2Object * v4l2object)
 {
   struct stat st;
+  int libv4l2_fd;
 
   GST_DEBUG_OBJECT (v4l2object->element, "Trying to open device %s",
       v4l2object->videodev);
@@ -424,6 +425,17 @@ gst_v4l2_open (GstV4l2Object * v4l2objec
   if (!GST_V4L2_IS_OPEN (v4l2object))
     goto not_open;
 
+  libv4l2_fd = v4l2_fd_open(v4l2object->video_fd,
+      V4L2_ENABLE_ENUM_FMT_EMULATION);
+  /* Note the v4l2_xxx functions are designed so that if they get passed an
+     unknown fd, the will behave exactly as their regular xxx counterparts, so
+     if v4l2_fd_open fails, we continue as normal (missing the libv4l2 custom
+     cam format to normal formats conversion). Chances are big we will still
+     fail then though, as normally v4l2_fd_open only fails if the device is not
+     a v4l2 device. */
+  if (libv4l2_fd != -1)
+    v4l2object->video_fd = libv4l2_fd;
+
   /* get capabilities, error will be posted */
   if (!gst_v4l2_get_capabilities (v4l2object))
     goto error;
@@ -477,7 +489,7 @@ error:
   {
     if (GST_V4L2_IS_OPEN (v4l2object)) {
       /* close device */
-      close (v4l2object->video_fd);
+      v4l2_close (v4l2object->video_fd);
       v4l2object->video_fd = -1;
     }
     /* empty lists */
@@ -503,7 +515,7 @@ gst_v4l2_close (GstV4l2Object * v4l2obje
   GST_V4L2_CHECK_NOT_ACTIVE (v4l2object);
 
   /* close device */
-  close (v4l2object->video_fd);
+  v4l2_close (v4l2object->video_fd);
   v4l2object->video_fd = -1;
 
   /* empty lists */
@@ -526,7 +538,7 @@ gst_v4l2_get_norm (GstV4l2Object * v4l2o
   if (!GST_V4L2_IS_OPEN (v4l2object))
     return FALSE;
 
-  if (ioctl (v4l2object->video_fd, VIDIOC_G_STD, norm) < 0)
+  if (v4l2_ioctl (v4l2object->video_fd, VIDIOC_G_STD, norm) < 0)
     goto std_failed;
 
   return TRUE;
@@ -554,7 +566,7 @@ gst_v4l2_set_norm (GstV4l2Object * v4l2o
   if (!GST_V4L2_IS_OPEN (v4l2object))
     return FALSE;
 
-  if (ioctl (v4l2object->video_fd, VIDIOC_S_STD, &norm) < 0)
+  if (v4l2_ioctl (v4l2object->video_fd, VIDIOC_S_STD, &norm) < 0)
     goto std_failed;
 
   return TRUE;
@@ -590,7 +602,7 @@ gst_v4l2_get_frequency (GstV4l2Object * 
   channel = gst_tuner_get_channel (GST_TUNER (v4l2object->element));
 
   freq.tuner = tunernum;
-  if (ioctl (v4l2object->video_fd, VIDIOC_G_FREQUENCY, &freq) < 0)
+  if (v4l2_ioctl (v4l2object->video_fd, VIDIOC_G_FREQUENCY, &freq) < 0)
     goto freq_failed;
 
   *frequency = freq.frequency * channel->freq_multiplicator;
@@ -631,10 +643,10 @@ gst_v4l2_set_frequency (GstV4l2Object * 
 
   freq.tuner = tunernum;
   /* fill in type - ignore error */
-  ioctl (v4l2object->video_fd, VIDIOC_G_FREQUENCY, &freq);
+  v4l2_ioctl (v4l2object->video_fd, VIDIOC_G_FREQUENCY, &freq);
   freq.frequency = frequency / channel->freq_multiplicator;
 
-  if (ioctl (v4l2object->video_fd, VIDIOC_S_FREQUENCY, &freq) < 0)
+  if (v4l2_ioctl (v4l2object->video_fd, VIDIOC_S_FREQUENCY, &freq) < 0)
     goto freq_failed;
 
   return TRUE;
@@ -666,7 +678,7 @@ gst_v4l2_signal_strength (GstV4l2Object 
     return FALSE;
 
   tuner.index = tunernum;
-  if (ioctl (v4l2object->video_fd, VIDIOC_G_TUNER, &tuner) < 0)
+  if (v4l2_ioctl (v4l2object->video_fd, VIDIOC_G_TUNER, &tuner) < 0)
     goto tuner_failed;
 
   *signal_strength = tuner.signal;
@@ -702,7 +714,7 @@ gst_v4l2_get_attribute (GstV4l2Object * 
 
   control.id = attribute_num;
 
-  if (ioctl (v4l2object->video_fd, VIDIOC_G_CTRL, &control) < 0)
+  if (v4l2_ioctl (v4l2object->video_fd, VIDIOC_G_CTRL, &control) < 0)
     goto ctrl_failed;
 
   *value = control.value;
@@ -739,7 +751,7 @@ gst_v4l2_set_attribute (GstV4l2Object * 
 
   control.id = attribute_num;
   control.value = value;
-  if (ioctl (v4l2object->video_fd, VIDIOC_S_CTRL, &control) < 0)
+  if (v4l2_ioctl (v4l2object->video_fd, VIDIOC_S_CTRL, &control) < 0)
     goto ctrl_failed;
 
   return TRUE;
@@ -764,7 +776,7 @@ gst_v4l2_get_input (GstV4l2Object * v4l2
   if (!GST_V4L2_IS_OPEN (v4l2object))
     return FALSE;
 
-  if (ioctl (v4l2object->video_fd, VIDIOC_G_INPUT, &n) < 0)
+  if (v4l2_ioctl (v4l2object->video_fd, VIDIOC_G_INPUT, &n) < 0)
     goto input_failed;
 
   *input = n;
@@ -790,7 +802,7 @@ gst_v4l2_set_input (GstV4l2Object * v4l2
   if (!GST_V4L2_IS_OPEN (v4l2object))
     return FALSE;
 
-  if (ioctl (v4l2object->video_fd, VIDIOC_S_INPUT, &input) < 0)
+  if (v4l2_ioctl (v4l2object->video_fd, VIDIOC_S_INPUT, &input) < 0)
     goto input_failed;
 
   return TRUE;
diff -upr gst-plugins-good-0.10.13.old/sys/v4l2/v4l2_calls.h gst-plugins-good-0.10.13/sys/v4l2/v4l2_calls.h
--- gst-plugins-good-0.10.13.old/sys/v4l2/v4l2_calls.h	2009-01-21 23:58:47.000000000 +0000
+++ gst-plugins-good-0.10.13/sys/v4l2/v4l2_calls.h	2009-01-26 09:56:08.000000000 +0000
@@ -27,6 +27,17 @@
 #include "gstv4l2object.h"
 #include "gst/gst-i18n-plugin.h"
 
+#ifdef HAVE_LIBV4L2
+#include <libv4l2.h>
+#else
+#define v4l2_fd_open(fd, flags) (fd)
+#define v4l2_close close
+#define v4l2_dup dup
+#define v4l2_ioctl ioctl
+#define v4l2_read read
+#define v4l2_mmap mmap
+#define v4l2_munmap munmap
+#endif
 
 /* simple check whether the device is open */
 #define GST_V4L2_IS_OPEN(v4l2object) \
diff -upr gst-plugins-good-0.10.13.old/sys/v4l2/v4l2src_calls.c gst-plugins-good-0.10.13/sys/v4l2/v4l2src_calls.c
--- gst-plugins-good-0.10.13.old/sys/v4l2/v4l2src_calls.c	2009-01-22 00:04:30.000000000 +0000
+++ gst-plugins-good-0.10.13/sys/v4l2/v4l2src_calls.c	2009-01-26 09:56:08.000000000 +0000
@@ -88,7 +88,7 @@ gst_v4l2_buffer_finalize (GstV4l2Buffer 
     pool->num_live_buffers--;
 
   if (pool->running) {
-    if (ioctl (pool->video_fd, VIDIOC_QBUF, &buffer->vbuffer) < 0) {
+    if (v4l2_ioctl (pool->video_fd, VIDIOC_QBUF, &buffer->vbuffer) < 0) {
       GST_WARNING ("could not requeue buffer %p %d", buffer, index);
     } else {
       /* FIXME: check that the caps didn't change */
@@ -106,7 +106,7 @@ gst_v4l2_buffer_finalize (GstV4l2Buffer 
   if (!resuscitated) {
     GST_LOG ("buffer %p not recovered, unmapping", buffer);
     gst_mini_object_unref (GST_MINI_OBJECT (pool));
-    munmap ((void *) GST_BUFFER_DATA (buffer), buffer->vbuffer.length);
+    v4l2_munmap ((void *) GST_BUFFER_DATA (buffer), buffer->vbuffer.length);
 
     GST_MINI_OBJECT_CLASS (v4l2buffer_parent_class)->finalize (GST_MINI_OBJECT
         (buffer));
@@ -165,7 +165,7 @@ gst_v4l2_buffer_new (GstV4l2BufferPool *
   ret->vbuffer.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
   ret->vbuffer.memory = V4L2_MEMORY_MMAP;
 
-  if (ioctl (pool->video_fd, VIDIOC_QUERYBUF, &ret->vbuffer) < 0)
+  if (v4l2_ioctl (pool->video_fd, VIDIOC_QUERYBUF, &ret->vbuffer) < 0)
     goto querybuf_failed;
 
   GST_LOG ("  index:     %u", ret->vbuffer.index);
@@ -179,7 +179,7 @@ gst_v4l2_buffer_new (GstV4l2BufferPool *
   GST_LOG ("  length:    %u", ret->vbuffer.length);
   GST_LOG ("  input:     %u", ret->vbuffer.input);
 
-  data = (guint8 *) mmap (0, ret->vbuffer.length,
+  data = (guint8 *) v4l2_mmap (0, ret->vbuffer.length,
       PROT_READ | PROT_WRITE, MAP_SHARED, pool->video_fd,
       ret->vbuffer.m.offset);
 
@@ -229,7 +229,7 @@ gst_v4l2_buffer_pool_finalize (GstV4l2Bu
   pool->lock = NULL;
 
   if (pool->video_fd >= 0)
-    close (pool->video_fd);
+    v4l2_close (pool->video_fd);
 
   if (pool->buffers) {
     g_free (pool->buffers);
@@ -292,7 +292,7 @@ gst_v4l2_buffer_pool_new (GstV4l2Src * v
 
   pool = (GstV4l2BufferPool *) gst_mini_object_new (GST_TYPE_V4L2_BUFFER_POOL);
 
-  pool->video_fd = dup (fd);
+  pool->video_fd = v4l2_dup (fd);
   if (pool->video_fd < 0)
     goto dup_failed;
 
@@ -344,7 +344,7 @@ gst_v4l2_buffer_pool_activate (GstV4l2Bu
 
     GST_LOG ("enqueue pool buffer %d", n);
 
-    if (ioctl (pool->video_fd, VIDIOC_QBUF, buf) < 0)
+    if (v4l2_ioctl (pool->video_fd, VIDIOC_QBUF, buf) < 0)
       goto queue_failed;
   }
   pool->running = TRUE;
@@ -519,7 +519,7 @@ gst_v4l2src_fill_format_list (GstV4l2Src
     format->index = n;
     format->type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
 
-    if (ioctl (v4l2src->v4l2object->video_fd, VIDIOC_ENUM_FMT, format) < 0) {
+    if (v4l2_ioctl (v4l2src->v4l2object->video_fd, VIDIOC_ENUM_FMT, format) < 0) {
       if (errno == EINVAL) {
         g_free (format);
         break;                  /* end of enumeration */
@@ -595,7 +595,7 @@ gst_v4l2src_probe_caps_for_format_and_si
 
   /* keep in mind that v4l2 gives us frame intervals (durations); we invert the
    * fraction to get framerate */
-  if (ioctl (fd, VIDIOC_ENUM_FRAMEINTERVALS, &ival) < 0)
+  if (v4l2_ioctl (fd, VIDIOC_ENUM_FRAMEINTERVALS, &ival) < 0)
     goto enum_frameintervals_failed;
 
   if (ival.type == V4L2_FRMIVAL_TYPE_DISCRETE) {
@@ -621,7 +621,7 @@ gst_v4l2src_probe_caps_for_format_and_si
       gst_value_list_append_value (&rates, &rate);
 
       ival.index++;
-    } while (ioctl (fd, VIDIOC_ENUM_FRAMEINTERVALS, &ival) >= 0);
+    } while (v4l2_ioctl (fd, VIDIOC_ENUM_FRAMEINTERVALS, &ival) >= 0);
   } else if (ival.type == V4L2_FRMIVAL_TYPE_STEPWISE) {
     GValue min = { 0, };
     GValue step = { 0, };
@@ -782,7 +782,7 @@ gst_v4l2src_probe_caps_for_format (GstV4
 
   GST_DEBUG_OBJECT (v4l2src, "Enumerating frame sizes");
 
-  if (ioctl (fd, VIDIOC_ENUM_FRAMESIZES, &size) < 0)
+  if (v4l2_ioctl (fd, VIDIOC_ENUM_FRAMESIZES, &size) < 0)
     goto enum_framesizes_failed;
 
   if (size.type == V4L2_FRMSIZE_TYPE_DISCRETE) {
@@ -802,7 +802,7 @@ gst_v4l2src_probe_caps_for_format (GstV4
         results = g_list_prepend (results, tmp);
 
       size.index++;
-    } while (ioctl (fd, VIDIOC_ENUM_FRAMESIZES, &size) >= 0);
+    } while (v4l2_ioctl (fd, VIDIOC_ENUM_FRAMESIZES, &size) >= 0);
     GST_DEBUG_OBJECT (v4l2src, "done iterating discrete frame sizes");
   } else if (size.type == V4L2_FRMSIZE_TYPE_STEPWISE) {
     GST_DEBUG_OBJECT (v4l2src, "we have stepwise frame sizes:");
@@ -972,7 +972,7 @@ gst_v4l2src_grab_frame (GstV4l2Src * v4l
   buffer.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
   buffer.memory = V4L2_MEMORY_MMAP;
 
-  while (ioctl (v4l2src->v4l2object->video_fd, VIDIOC_DQBUF, &buffer) < 0) {
+  while (v4l2_ioctl (v4l2src->v4l2object->video_fd, VIDIOC_DQBUF, &buffer) < 0) {
 
     GST_WARNING_OBJECT (v4l2src,
         "problem grabbing frame %d (ix=%d), trials=%d, pool-ct=%d, buf.flags=%d",
@@ -1190,7 +1190,7 @@ gst_v4l2src_set_capture (GstV4l2Src * v4
   memset (&format, 0x00, sizeof (struct v4l2_format));
   format.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
 
-  if (ioctl (fd, VIDIOC_G_FMT, &format) < 0)
+  if (v4l2_ioctl (fd, VIDIOC_G_FMT, &format) < 0)
     goto get_fmt_failed;
 
   format.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
@@ -1202,7 +1202,7 @@ gst_v4l2src_set_capture (GstV4l2Src * v4
    *  combined, there are other modes for requesting fields individually) */
   format.fmt.pix.field = V4L2_FIELD_INTERLACED;
 
-  if (ioctl (fd, VIDIOC_S_FMT, &format) < 0) {
+  if (v4l2_ioctl (fd, VIDIOC_S_FMT, &format) < 0) {
     if (errno != EINVAL)
       goto set_fmt_failed;
 
@@ -1211,7 +1211,7 @@ gst_v4l2src_set_capture (GstV4l2Src * v4
     format.fmt.pix.height = height;
     format.fmt.pix.pixelformat = pixelformat;
     format.fmt.pix.field = V4L2_FIELD_NONE;
-    if (ioctl (fd, VIDIOC_S_FMT, &format) < 0)
+    if (v4l2_ioctl (fd, VIDIOC_S_FMT, &format) < 0)
       goto set_fmt_failed;
   }
 
@@ -1226,7 +1226,7 @@ gst_v4l2src_set_capture (GstV4l2Src * v4
 
   memset (&stream, 0x00, sizeof (struct v4l2_streamparm));
   stream.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
-  if (ioctl (fd, VIDIOC_G_PARM, &stream) < 0) {
+  if (v4l2_ioctl (fd, VIDIOC_G_PARM, &stream) < 0) {
     GST_ELEMENT_WARNING (v4l2src, RESOURCE, SETTINGS,
         (_("Could not get parameters on device '%s'"),
             v4l2src->v4l2object->videodev), GST_ERROR_SYSTEM);
@@ -1256,7 +1256,7 @@ gst_v4l2src_set_capture (GstV4l2Src * v4
   stream.parm.capture.timeperframe.denominator = fps_n;
 
   /* some cheap USB cam's won't accept any change */
-  if (ioctl (fd, VIDIOC_S_PARM, &stream) < 0) {
+  if (v4l2_ioctl (fd, VIDIOC_S_PARM, &stream) < 0) {
     GST_ELEMENT_WARNING (v4l2src, RESOURCE, SETTINGS,
         (_("Video input device did not accept new frame rate setting.")),
         GST_ERROR_SYSTEM);
@@ -1338,7 +1338,7 @@ gst_v4l2src_capture_init (GstV4l2Src * v
     breq.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
     breq.memory = V4L2_MEMORY_MMAP;
 
-    if (ioctl (fd, VIDIOC_REQBUFS, &breq) < 0)
+    if (v4l2_ioctl (fd, VIDIOC_REQBUFS, &breq) < 0)
       goto reqbufs_failed;
 
     GST_LOG_OBJECT (v4l2src, " count:  %u", breq.count);
@@ -1433,7 +1433,7 @@ gst_v4l2src_capture_start (GstV4l2Src * 
     if (!gst_v4l2_buffer_pool_activate (v4l2src->pool, v4l2src))
       goto pool_activate_failed;
 
-    if (ioctl (fd, VIDIOC_STREAMON, &type) < 0)
+    if (v4l2_ioctl (fd, VIDIOC_STREAMON, &type) < 0)
       goto streamon_failed;
   }
 
@@ -1478,7 +1478,7 @@ gst_v4l2src_capture_stop (GstV4l2Src * v
   if (v4l2src->use_mmap) {
     /* we actually need to sync on all queued buffers but not
      * on the non-queued ones */
-    if (ioctl (v4l2src->v4l2object->video_fd, VIDIOC_STREAMOFF, &type) < 0)
+    if (v4l2_ioctl (v4l2src->v4l2object->video_fd, VIDIOC_STREAMOFF, &type) < 0)
       goto streamoff_failed;
   }
 
@@ -1554,14 +1554,14 @@ gst_v4l2src_get_nearest_size (GstV4l2Src
   fmt.fmt.pix.pixelformat = pixelformat;
   fmt.fmt.pix.field = V4L2_FIELD_INTERLACED;
 
-  r = ioctl (fd, VIDIOC_TRY_FMT, &fmt);
+  r = v4l2_ioctl (fd, VIDIOC_TRY_FMT, &fmt);
   if (r < 0 && errno == EINVAL) {
     /* try again with progressive video */
     fmt.fmt.pix.width = *width;
     fmt.fmt.pix.height = *height;
     fmt.fmt.pix.pixelformat = pixelformat;
     fmt.fmt.pix.field = V4L2_FIELD_NONE;
-    r = ioctl (fd, VIDIOC_TRY_FMT, &fmt);
+    r = v4l2_ioctl (fd, VIDIOC_TRY_FMT, &fmt);
   }
 
   if (r < 0) {
@@ -1581,14 +1581,14 @@ gst_v4l2src_get_nearest_size (GstV4l2Src
     fmt.fmt.pix.width = *width;
     fmt.fmt.pix.height = *height;
 
-    r = ioctl (fd, VIDIOC_S_FMT, &fmt);
+    r = v4l2_ioctl (fd, VIDIOC_S_FMT, &fmt);
     if (r < 0 && errno == EINVAL) {
       /* try again with progressive video */
       fmt.fmt.pix.width = *width;
       fmt.fmt.pix.height = *height;
       fmt.fmt.pix.pixelformat = pixelformat;
       fmt.fmt.pix.field = V4L2_FIELD_NONE;
-      r = ioctl (fd, VIDIOC_S_FMT, &fmt);
+      r = v4l2_ioctl (fd, VIDIOC_S_FMT, &fmt);
     }
 
     if (r < 0)


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamer-plugins-good/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	25 Oct 2008 00:18:49 -0000	1.13
+++ .cvsignore	26 Jan 2009 10:06:22 -0000	1.14
@@ -1 +1 @@
-gst-plugins-good-0.10.11.tar.bz2
+gst-plugins-good-0.10.13.tar.bz2


Index: gstreamer-plugins-good.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamer-plugins-good/devel/gstreamer-plugins-good.spec,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- gstreamer-plugins-good.spec	21 Jan 2009 00:48:01 -0000	1.81
+++ gstreamer-plugins-good.spec	26 Jan 2009 10:06:22 -0000	1.82
@@ -5,8 +5,8 @@
 %define         _gstpb          0.10.17
 
 Name: 		%{gstreamer}-plugins-good
-Version: 	0.10.11
-Release:  	5%{?dist}
+Version: 	0.10.13
+Release:  	1%{?dist}
 Summary: 	GStreamer plug-ins with good code and licensing
 
 Group: 		Applications/Multimedia
@@ -16,7 +16,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # http://bugzilla.gnome.org/show_bug.cgi?id=545033
-Patch0: gst-plugins-good-0.10.9-libv4l.patch
+Patch0: gst-plugins-good-0.10.13-libv4l.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=556986
 Patch1: gst-plugins-good-0.10.11-pulse-hang-bz556986.patch
 # https://bugzilla.redhat.com/show_bug.cgi?id=470000
@@ -104,7 +104,7 @@
 
 %prep
 %setup -q -n gst-plugins-good-%{version}
-%patch0 -p0 -b .libv4l
+%patch0 -p1 -b .libv4l
 %patch1 -p0 -b .pulse-hang
 %patch2 -p1 -b .pulseprobe-fix
 
@@ -257,6 +257,10 @@
 gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/gstreamer-%{majorminor}.schemas > /dev/null || :
 
 %changelog
+* Mon Jan 26 2009 - Bastien Nocera <bnocera at redhat.com> - 0.10.13-1
+- Update to 0.10.13
+- Update libv4l patch
+
 * Wed Jan 21 2009 - Bastien Nocera <bnocera at redhat.com> - 0.10.11-5
 - Rebuild for new gstreamer base library
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamer-plugins-good/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	25 Oct 2008 00:18:49 -0000	1.13
+++ sources	26 Jan 2009 10:06:22 -0000	1.14
@@ -1 +1 @@
-79b086c2dc0e07ae0c8ddc91512bab3a  gst-plugins-good-0.10.11.tar.bz2
+27f27151ccefad1157c9eaa322e14ac4  gst-plugins-good-0.10.13.tar.bz2


--- gst-plugins-good-0.10.9-libv4l.patch DELETED ---



From karsten at fedoraproject.org  Mon Jan 26 10:07:01 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Mon, 26 Jan 2009 10:07:01 +0000 (UTC)
Subject: rpms/vim/devel 7.2.082,NONE,1.1
Message-ID: <20090126100701.90BA17010C@cvs1.fedora.phx.redhat.com>

Author: karsten

Update of /cvs/extras/rpms/vim/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19019

Added Files:
	7.2.082 
Log Message:
- patchlevel 082


--- NEW FILE 7.2.082 ---
To: vim-dev at vim.org
Subject: Patch 7.2.082
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.082
Problem:    When 'ff' is "mac" then "ga" on a ^J shows 0x0d instead of 0x0a.
	    (Andy Wokula)
Solution:   Use NL for this situation. (Lech Lorens)
Files:	    src/ex_cmds.c


*** ../vim-7.2.081/src/ex_cmds.c	Fri Nov 28 21:26:50 2008
--- src/ex_cmds.c	Tue Jan 13 16:51:32 2009
***************
*** 49,54 ****
--- 49,55 ----
      exarg_T	*eap;
  {
      int		c;
+     int		cval;
      char	buf1[20];
      char	buf2[20];
      char_u	buf3[7];
***************
*** 75,80 ****
--- 76,85 ----
      {
  	if (c == NL)	    /* NUL is stored as NL */
  	    c = NUL;
+ 	if (c == CAR && get_fileformat(curbuf) == EOL_MAC)
+ 	    cval = NL;	    /* NL is stored as CR */
+ 	else
+ 	    cval = c;
  	if (vim_isprintc_strict(c) && (c < ' '
  #ifndef EBCDIC
  		    || c > '~'
***************
*** 94,100 ****
  	    buf2[0] = NUL;
  	vim_snprintf((char *)IObuff, IOSIZE,
  		_("<%s>%s%s  %d,  Hex %02x,  Octal %03o"),
! 					   transchar(c), buf1, buf2, c, c, c);
  #ifdef FEAT_MBYTE
  	if (enc_utf8)
  	    c = cc[ci++];
--- 99,105 ----
  	    buf2[0] = NUL;
  	vim_snprintf((char *)IObuff, IOSIZE,
  		_("<%s>%s%s  %d,  Hex %02x,  Octal %03o"),
! 				  transchar(c), buf1, buf2, cval, cval, cval);
  #ifdef FEAT_MBYTE
  	if (enc_utf8)
  	    c = cc[ci++];
*** ../vim-7.2.081/src/version.c	Tue Jan 13 16:37:31 2009
--- src/version.c	Tue Jan 13 16:53:39 2009
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     82,
  /**/

-- 
The budget process was invented by an alien race of sadistic beings who
resemble large cats.
				(Scott Adams - The Dilbert principle)

 /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\        download, build and distribute -- http://www.A-A-P.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///



From karsten at fedoraproject.org  Mon Jan 26 10:07:14 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Mon, 26 Jan 2009 10:07:14 +0000 (UTC)
Subject: rpms/vim/devel 7.2.083,NONE,1.1
Message-ID: <20090126100714.6EE197010C@cvs1.fedora.phx.redhat.com>

Author: karsten

Update of /cvs/extras/rpms/vim/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19149

Added Files:
	7.2.083 
Log Message:
- patchlevel 083


--- NEW FILE 7.2.083 ---
To: vim-dev at vim.org
Subject: Patch 7.2.083
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.083
Problem:    ":tag" does not return to the right tag entry from the tag stack.
Solution:   Don't change the current match when there is no argument.
	    (Erik Falor)
Files:	    src/tag.c


*** ../vim-7.2.082/src/tag.c	Tue Dec  9 12:12:31 2008
--- src/tag.c	Tue Jan 13 17:14:59 2009
***************
*** 515,521 ****
  	     * If a count is supplied to the ":tag <name>" command, then
  	     * jump to count'th matching tag.
  	     */
! 	    if (type == DT_TAG && count > 0)
  		cur_match = count - 1;
  
  	    if (type == DT_SELECT || type == DT_JUMP
--- 515,521 ----
  	     * If a count is supplied to the ":tag <name>" command, then
  	     * jump to count'th matching tag.
  	     */
! 	    if (type == DT_TAG && *tag != NUL && count > 0)
  		cur_match = count - 1;
  
  	    if (type == DT_SELECT || type == DT_JUMP
*** ../vim-7.2.082/src/version.c	Tue Jan 13 16:57:09 2009
--- src/version.c	Tue Jan 13 17:16:42 2009
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     83,
  /**/

-- 
Engineers will go without food and hygiene for days to solve a problem.
(Other times just because they forgot.)
				(Scott Adams - The Dilbert principle)

 /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\        download, build and distribute -- http://www.A-A-P.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///



From karsten at fedoraproject.org  Mon Jan 26 10:07:28 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Mon, 26 Jan 2009 10:07:28 +0000 (UTC)
Subject: rpms/vim/devel 7.2.084,NONE,1.1
Message-ID: <20090126100728.31B4C7010C@cvs1.fedora.phx.redhat.com>

Author: karsten

Update of /cvs/extras/rpms/vim/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19200

Added Files:
	7.2.084 
Log Message:
- patchlevel 084


--- NEW FILE 7.2.084 ---
To: vim-dev at vim.org
Subject: Patch 7.2.084
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.084
Problem:    Recursive structures are not handled properly in Python
	    vim.eval().
Solution:   Keep track of references in a better way. (Yukihiro Nakadaira)
Files:	    src/if_python.c


*** ../vim-7.2.083/src/if_python.c	Thu Nov 20 11:04:01 2008
--- src/if_python.c	Tue Jan 13 18:08:06 2009
***************
*** 1151,1164 ****
  
      /* Check if we run into a recursive loop.  The item must be in lookupDict
       * then and we can use it again. */
!     sprintf(ptrBuf, PRINTF_DECIMAL_LONG_U, (long_u)our_tv);
!     result = PyDict_GetItemString(lookupDict, ptrBuf);
!     if (result != NULL)
! 	Py_INCREF(result);
!     else if (our_tv->v_type == VAR_STRING)
      {
  	result = Py_BuildValue("s", our_tv->vval.v_string);
- 	PyDict_SetItemString(lookupDict, ptrBuf, result);
      }
      else if (our_tv->v_type == VAR_NUMBER)
      {
--- 1151,1173 ----
  
      /* Check if we run into a recursive loop.  The item must be in lookupDict
       * then and we can use it again. */
!     if ((our_tv->v_type == VAR_LIST && our_tv->vval.v_list != NULL)
! 	    || (our_tv->v_type == VAR_DICT && our_tv->vval.v_dict != NULL))
!     {
! 	sprintf(ptrBuf, PRINTF_DECIMAL_LONG_U,
! 	        our_tv->v_type == VAR_LIST ? (long_u)our_tv->vval.v_list
! 		                           : (long_u)our_tv->vval.v_dict);
! 	result = PyDict_GetItemString(lookupDict, ptrBuf);
! 	if (result != NULL)
! 	{
! 	    Py_INCREF(result);
! 	    return result;
! 	}
!     }
! 
!     if (our_tv->v_type == VAR_STRING)
      {
  	result = Py_BuildValue("s", our_tv->vval.v_string);
      }
      else if (our_tv->v_type == VAR_NUMBER)
      {
***************
*** 1167,1173 ****
  	/* For backwards compatibility numbers are stored as strings. */
  	sprintf(buf, "%ld", (long)our_tv->vval.v_number);
  	result = Py_BuildValue("s", buf);
- 	PyDict_SetItemString(lookupDict, ptrBuf, result);
      }
  # ifdef FEAT_FLOAT
      else if (our_tv->v_type == VAR_FLOAT)
--- 1176,1181 ----
***************
*** 1176,1182 ****
  
  	sprintf(buf, "%f", our_tv->vval.v_float);
  	result = Py_BuildValue("s", buf);
- 	PyDict_SetItemString(lookupDict, ptrBuf, result);
      }
  # endif
      else if (our_tv->v_type == VAR_LIST)
--- 1184,1189 ----
***************
*** 1185,1194 ****
  	listitem_T	*curr;
  
  	result = PyList_New(0);
- 	PyDict_SetItemString(lookupDict, ptrBuf, result);
  
  	if (list != NULL)
  	{
  	    for (curr = list->lv_first; curr != NULL; curr = curr->li_next)
  	    {
  		newObj = VimToPython(&curr->li_tv, depth + 1, lookupDict);
--- 1192,1202 ----
  	listitem_T	*curr;
  
  	result = PyList_New(0);
  
  	if (list != NULL)
  	{
+ 	    PyDict_SetItemString(lookupDict, ptrBuf, result);
+ 
  	    for (curr = list->lv_first; curr != NULL; curr = curr->li_next)
  	    {
  		newObj = VimToPython(&curr->li_tv, depth + 1, lookupDict);
***************
*** 1200,1206 ****
      else if (our_tv->v_type == VAR_DICT)
      {
  	result = PyDict_New();
- 	PyDict_SetItemString(lookupDict, ptrBuf, result);
  
  	if (our_tv->vval.v_dict != NULL)
  	{
--- 1208,1213 ----
***************
*** 1209,1214 ****
--- 1216,1223 ----
  	    hashitem_T	*hi;
  	    dictitem_T	*di;
  
+ 	    PyDict_SetItemString(lookupDict, ptrBuf, result);
+ 
  	    for (hi = ht->ht_array; todo > 0; ++hi)
  	    {
  		if (!HASHITEM_EMPTY(hi))
*** ../vim-7.2.083/src/version.c	Tue Jan 13 17:27:18 2009
--- src/version.c	Tue Jan 13 17:54:14 2009
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     84,
  /**/

-- 
Article in the first Free Software Magazine: "Bram Moolenaar studied electrical
engineering at the Technical University of Delft and graduated in 1985 on a
multi-processor Unix architecture."
Response by "dimator": Could the school not afford a proper stage for the
ceremony?

 /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\        download, build and distribute -- http://www.A-A-P.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///



From karsten at fedoraproject.org  Mon Jan 26 10:07:41 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Mon, 26 Jan 2009 10:07:41 +0000 (UTC)
Subject: rpms/vim/devel 7.2.085,NONE,1.1
Message-ID: <20090126100741.390A77010C@cvs1.fedora.phx.redhat.com>

Author: karsten

Update of /cvs/extras/rpms/vim/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19254

Added Files:
	7.2.085 
Log Message:
- patchlevel 085


--- NEW FILE 7.2.085 ---
To: vim-dev at vim.org
Subject: Patch 7.2.085
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.085
Problem:    ":set <M-b>=<Esc>b" does not work when 'encoding' is utf-8.
Solution:   Put the <M-b> character in the input buffer as valid utf-8.
	    (partly by Matt Wosniski)
Files:	    src/term.c


*** ../vim-7.2.084/src/term.c	Tue Jul 29 12:22:12 2008
--- src/term.c	Thu Jan 22 18:18:29 2009
***************
*** 4920,4926 ****
  	key_name[0] = KEY2TERMCAP0(key);
  	key_name[1] = KEY2TERMCAP1(key);
  	if (key_name[0] == KS_KEY)
! 	    string[new_slen++] = key_name[1];	/* from ":set <M-b>=xx" */
  	else
  	{
  	    string[new_slen++] = K_SPECIAL;
--- 4920,4934 ----
  	key_name[0] = KEY2TERMCAP0(key);
  	key_name[1] = KEY2TERMCAP1(key);
  	if (key_name[0] == KS_KEY)
! 	{
! 	    /* from ":set <M-b>=xx" */
! #ifdef FEAT_MBYTE
! 	    if (has_mbyte)
! 		new_slen += (*mb_char2bytes)(key_name[1], string + new_slen);
! 	    else
! #endif
! 		string[new_slen++] = key_name[1];
! 	}
  	else
  	{
  	    string[new_slen++] = K_SPECIAL;
*** ../vim-7.2.084/src/version.c	Tue Jan 13 18:10:21 2009
--- src/version.c	Thu Jan 22 18:31:50 2009
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     85,
  /**/

-- 
hundred-and-one symptoms of being an internet addict:
20. When looking at a pageful of someone else's links, you notice all of them
    are already highlighted in purple.

 /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- 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 Jan 26 10:07:56 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Mon, 26 Jan 2009 10:07:56 +0000 (UTC)
Subject: rpms/vim/devel 7.2.086,NONE,1.1
Message-ID: <20090126100756.0EE027010C@cvs1.fedora.phx.redhat.com>

Author: karsten

Update of /cvs/extras/rpms/vim/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19302

Added Files:
	7.2.086 
Log Message:
- patchlevel 086


--- NEW FILE 7.2.086 ---
To: vim-dev at vim.org
Subject: Patch 7.2.086
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.086
Problem:    Using ":diffget 1" in buffer 1 corrupts the text.
Solution:   Don't do anything when source and destination of ":diffget" or
	    ":diffput" is the same buffer. (Dominique Pelle)
Files:	    src/diff.c


*** ../vim-7.2.085/src/diff.c	Sun Nov 30 15:15:56 2008
--- src/diff.c	Wed Jan 14 20:40:25 2009
***************
*** 8,14 ****
   */
  
  /*
!  * diff.c: code for diff'ing two or three buffers.
   */
  
  #include "vim.h"
--- 8,14 ----
   */
  
  /*
!  * diff.c: code for diff'ing two, three or four buffers.
   */
  
  #include "vim.h"
***************
*** 116,122 ****
   * Add a buffer to make diffs for.
   * Call this when a new buffer is being edited in the current window where
   * 'diff' is set.
!  * Marks the current buffer as being part of the diff and requireing updating.
   * This must be done before any autocmd, because a command may use info
   * about the screen contents.
   */
--- 116,122 ----
   * Add a buffer to make diffs for.
   * Call this when a new buffer is being edited in the current window where
   * 'diff' is set.
!  * Marks the current buffer as being part of the diff and requiring updating.
   * This must be done before any autocmd, because a command may use info
   * about the screen contents.
   */
***************
*** 929,935 ****
  	goto theend;
  
  #ifdef UNIX
!     /* Temporaraly chdir to /tmp, to avoid patching files in the current
       * directory when the patch file contains more than one patch.  When we
       * have our own temp dir use that instead, it will be cleaned up when we
       * exit (any .rej files created).  Don't change directory if we can't
--- 929,935 ----
  	goto theend;
  
  #ifdef UNIX
!     /* Temporarily chdir to /tmp, to avoid patching files in the current
       * directory when the patch file contains more than one patch.  When we
       * have our own temp dir use that instead, it will be cleaned up when we
       * exit (any .rej files created).  Don't change directory if we can't
***************
*** 2129,2134 ****
--- 2129,2136 ----
  	    EMSG2(_("E102: Can't find buffer \"%s\""), eap->arg);
  	    return;
  	}
+ 	if (buf == curbuf)
+ 	    return;		/* nothing to do */
  	idx_other = diff_buf_idx(buf);
  	if (idx_other == DB_COUNT)
  	{
*** ../vim-7.2.085/src/version.c	Thu Jan 22 18:32:55 2009
--- src/version.c	Thu Jan 22 20:46:54 2009
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     86,
  /**/

-- 
Shift happens.
                -- Doppler

 /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- 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 Jan 26 10:10:05 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Mon, 26 Jan 2009 10:10:05 +0000 (UTC)
Subject: rpms/vim/devel 7.2.087,NONE,1.1
Message-ID: <20090126101005.4A1537010C@cvs1.fedora.phx.redhat.com>

Author: karsten

Update of /cvs/extras/rpms/vim/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19616

Added Files:
	7.2.087 
Log Message:
- patchlevel 087


--- NEW FILE 7.2.087 ---
To: vim-dev at vim.org
Subject: Patch 7.2.087
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.087
Problem:    Adding URL to 'path' doesn't work to edit a file.
Solution:   Skip simplify_filename() for URLs. (Matt Wosniski)
Files:	    src/misc2.c


*** ../vim-7.2.086/src/misc2.c	Wed Dec 24 12:53:33 2008
--- src/misc2.c	Sun Jan 18 12:26:20 2009
***************
*** 4696,4702 ****
  				stackp->ffs_filearray_cur = i + 1;
  				ff_push(search_ctx, stackp);
  
! 				simplify_filename(file_path);
  				if (mch_dirname(ff_expand_buffer, MAXPATHL)
  									== OK)
  				{
--- 4696,4703 ----
  				stackp->ffs_filearray_cur = i + 1;
  				ff_push(search_ctx, stackp);
  
! 				if (!path_with_url(file_path))
! 				    simplify_filename(file_path);
  				if (mch_dirname(ff_expand_buffer, MAXPATHL)
  									== OK)
  				{
*** ../vim-7.2.086/src/version.c	Thu Jan 22 20:48:07 2009
--- src/version.c	Thu Jan 22 21:30:36 2009
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     87,
  /**/

-- 
hundred-and-one symptoms of being an internet addict:
21. Your dog has its own home page.

 /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- 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 Jan 26 10:11:00 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Mon, 26 Jan 2009 10:11:00 +0000 (UTC)
Subject: rpms/vim/devel 7.2.088, NONE, 1.1 README.patches, 1.116,
	1.117 vim.spec, 1.229, 1.230
Message-ID: <20090126101100.EF4FF7010C@cvs1.fedora.phx.redhat.com>

Author: karsten

Update of /cvs/extras/rpms/vim/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19725

Modified Files:
	README.patches vim.spec 
Added Files:
	7.2.088 
Log Message:
- patchlevel 088


--- NEW FILE 7.2.088 ---
To: vim-dev at vim.org
Subject: Patch 7.2.088 (extra)
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.088 (extra)
Problem:    OpenClipboard() may fail when another application is using the
	    clipboard.
Solution:   Retry OpenClipboard() a few times. (Jianrong Yu)
Files:	    src/os_mswin.c


*** ../vim-7.2.087/src/os_mswin.c	Thu Nov 20 17:09:09 2008
--- src/os_mswin.c	Thu Jan 22 18:38:12 2009
***************
*** 1224,1229 ****
--- 1224,1248 ----
  #endif /* FEAT_MBYTE */
  
  /*
+  * Wait for another process to Close the Clipboard.
+  * Returns TRUE for success.
+  */
+     int
+ vim_open_clipboard()
+ {
+     int delay = 10;
+ 
+     while (!OpenClipboard(NULL))
+     {
+         if (delay > 500)
+             return FALSE;  /* waited too long, give up */
+         Sleep(delay);
+         delay *= 2;	/* wait for 10, 20, 40, 80, etc. msec */
+     }
+     return TRUE;
+ }
+ 
+ /*
   * Get the current selection and put it in the clipboard register.
   *
   * NOTE: Must use GlobalLock/Unlock here to ensure Win32s compatibility.
***************
*** 1254,1260 ****
       * Don't pass GetActiveWindow() as an argument to OpenClipboard() because
       * then we can't paste back into the same window for some reason - webb.
       */
!     if (!OpenClipboard(NULL))
  	return;
  
      /* Check for vim's own clipboard format first.  This only gets the type of
--- 1273,1279 ----
       * Don't pass GetActiveWindow() as an argument to OpenClipboard() because
       * then we can't paste back into the same window for some reason - webb.
       */
!     if (!vim_open_clipboard())
  	return;
  
      /* Check for vim's own clipboard format first.  This only gets the type of
***************
*** 1562,1568 ****
       * because then we can't paste back into the same window for some
       * reason - webb.
       */
!     if (OpenClipboard(NULL))
      {
  	if (EmptyClipboard())
  	{
--- 1581,1587 ----
       * because then we can't paste back into the same window for some
       * reason - webb.
       */
!     if (vim_open_clipboard())
      {
  	if (EmptyClipboard())
  	{
*** ../vim-7.2.087/src/version.c	Thu Jan 22 21:31:24 2009
--- src/version.c	Thu Jan 22 21:47:52 2009
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     88,
  /**/

-- 
hundred-and-one symptoms of being an internet addict:
22. You've already visited all the links at Yahoo and you're halfway through
    Lycos.

 /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- 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.116
retrieving revision 1.117
diff -u -r1.116 -r1.117
--- README.patches	8 Jan 2009 13:20:21 -0000	1.116
+++ README.patches	26 Jan 2009 10:10:30 -0000	1.117
@@ -104,3 +104,12 @@
   4745  7.2.077  (after 7.2.076) rename() fails if names differ only in case
   3298  7.2.078  problems with deleting folds
   6947  7.2.079  "killed" netbeans events are not handled correctly
+  9942  7.2.080  accessing wrong memory with completion and composing char
+  1728  7.2.081  compiler warning for float overflow on VAX
+  2134  7.2.082  if 'ff' is "mac" then "ga" on a ^J shows 0x0d instead of 0x0a
+  1733  7.2.083  ":tag" doesn't return to the right tag entry in the tag stack
+  4331  7.2.084  Python: vim.eval() is wrong for recursive structures 
+  1862  7.2.085  ":set <M-b>=<Esc>b" does not work when 'encoding' is utf-8
+  3045  7.2.086  using ":diffget 1" in buffer 1 corrupts the text
+  1570  7.2.087  adding URL to 'path' doesn't work to edit a file
+  2895  7.2.088  (extra) Win32: Using the clipboard sometimes fails


Index: vim.spec
===================================================================
RCS file: /cvs/extras/rpms/vim/devel/vim.spec,v
retrieving revision 1.229
retrieving revision 1.230
diff -u -r1.229 -r1.230
--- vim.spec	8 Jan 2009 13:20:21 -0000	1.229
+++ vim.spec	26 Jan 2009 10:10:30 -0000	1.230
@@ -18,13 +18,13 @@
 #used for pre-releases:
 %define beta %{nil}
 %define vimdir vim72%{?beta}
-%define patchlevel 079
+%define patchlevel 088
 
 Summary: The VIM editor
 URL:     http://www.vim.org/
 Name: vim
 Version: %{baseversion}.%{beta}%{patchlevel}
-Release: 2%{?dist}
+Release: 1%{?dist}
 License: Vim
 Group: Applications/Editors
 Source0: ftp://ftp.vim.org/pub/vim/unix/vim-%{baseversion}%{?beta}%{?CVSDATE}.tar.bz2
@@ -145,6 +145,15 @@
 Patch077: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.077
 Patch078: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.078
 Patch079: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.079
+Patch080: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.080
+Patch081: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.081
+Patch082: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.082
+Patch083: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.083
+Patch084: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.084
+Patch085: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.085
+Patch086: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.086
+Patch087: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.087
+Patch088: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.088
 
 Patch3000: vim-7.0-syntax.patch
 Patch3002: vim-7.1-nowarnings.patch
@@ -357,7 +366,15 @@
 %patch077 -p0
 %patch078 -p0
 %patch079 -p0
-
+%patch080 -p0
+%patch081 -p0
+%patch082 -p0
+%patch083 -p0
+%patch084 -p0
+%patch085 -p0
+%patch086 -p0
+%patch087 -p0
+%patch088 -p0
 
 # install spell files
 %if %{withvimspell}
@@ -816,6 +833,9 @@
 %{_datadir}/icons/hicolor/*/apps/*
 
 %changelog
+* Mon Jan 26 2009 Karsten Hopp <karsten at redhat.com> 7.2.088-1
+- patchlevel 88
+
 * Thu Jan 08 2009 Karsten Hopp <karsten at redhat.com> 7.2.079-2
 - patchlevel 79
 



From thias at fedoraproject.org  Mon Jan 26 10:10:53 2009
From: thias at fedoraproject.org (Matthias Saou)
Date: Mon, 26 Jan 2009 10:10:53 +0000 (UTC)
Subject: rpms/elisa/devel .cvsignore, 1.10, 1.11 elisa.spec, 1.13,
	1.14 sources, 1.10, 1.11
Message-ID: <20090126101053.0CE4C7010C@cvs1.fedora.phx.redhat.com>

Author: thias

Update of /cvs/extras/rpms/elisa/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19676

Modified Files:
	.cvsignore elisa.spec sources 
Log Message:
Update to 0.5.24.1.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/elisa/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	12 Jan 2009 18:14:38 -0000	1.10
+++ .cvsignore	26 Jan 2009 10:10:22 -0000	1.11
@@ -1 +1 @@
-elisa-0.5.23.tar.gz
+elisa-0.5.24.1.tar.gz


Index: elisa.spec
===================================================================
RCS file: /cvs/extras/rpms/elisa/devel/elisa.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- elisa.spec	12 Jan 2009 18:14:38 -0000	1.13
+++ elisa.spec	26 Jan 2009 10:10:22 -0000	1.14
@@ -2,7 +2,7 @@
 
 Summary: Media Center
 Name: elisa
-Version: 0.5.23
+Version: 0.5.24.1
 Release: 1%{?dist}
 # The base of Elisa is GPLv3, some plugins are MIT but are in other packages.
 # See the included COPYING file for the details.
@@ -14,10 +14,8 @@
 # Our "base" files for building the plugins where the main requirements are
 Requires: elisa-base = %{version}-%{release}
 # Plugins. The bad are actually mandatory (they contain the GUI for instance)
-Requires: elisa-plugins-good = %{version}
-Requires: elisa-plugins-bad = %{version}
-# For the "official" default font ("MgOpen Cosmetica")
-Requires: mgopen-fonts
+Requires: elisa-plugins-good >= %{version}
+Requires: elisa-plugins-bad >= %{version}
 # For the "build" itself, most of the above aren't required, just these
 BuildRequires: python-devel
 BuildRequires: python-twisted-core
@@ -92,6 +90,10 @@
 
 
 %changelog
+* Wed Jan 21 2009 Matthias Saou <http://freshrpms.net/> 0.5.24.1-1
+- Update to 0.5.24.1.
+- Drop the mgopen-fonts req, it hasn't been the default font for a while.
+
 * Mon Jan 12 2009 Matthias Saou <http://freshrpms.net/> 0.5.23-1
 - Update to 0.5.23.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/elisa/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	12 Jan 2009 18:14:38 -0000	1.10
+++ sources	26 Jan 2009 10:10:22 -0000	1.11
@@ -1 +1 @@
-20c6a7606ac3a67f233bb5421bfbbb2a  elisa-0.5.23.tar.gz
+e284a270687d555554839a2ba50692b8  elisa-0.5.24.1.tar.gz



From hadess at fedoraproject.org  Mon Jan 26 10:17:11 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Mon, 26 Jan 2009 10:17:11 +0000 (UTC)
Subject: rpms/gstreamer-plugins-good/F-10
	gst-plugins-good-0.10.13-libv4l.patch, NONE,
	1.1 gstreamer-plugins-good.spec, 1.79,
	1.80 gst-plugins-good-0.10.9-libv4l.patch, 1.4, NONE
Message-ID: <20090126101711.892687010C@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/gstreamer-plugins-good/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21364

Modified Files:
	gstreamer-plugins-good.spec 
Added Files:
	gst-plugins-good-0.10.13-libv4l.patch 
Removed Files:
	gst-plugins-good-0.10.9-libv4l.patch 
Log Message:
* Mon Jan 26 2009 - Bastien Nocera <bnocera at redhat.com> - 0.10.13-1
- Update to 0.10.13
- Update libv4l patch


gst-plugins-good-0.10.13-libv4l.patch:

--- NEW FILE gst-plugins-good-0.10.13-libv4l.patch ---
diff -upr gst-plugins-good-0.10.13.old/config.h.in gst-plugins-good-0.10.13/config.h.in
--- gst-plugins-good-0.10.13.old/config.h.in	2009-01-22 21:27:01.000000000 +0000
+++ gst-plugins-good-0.10.13/config.h.in	2009-01-26 09:56:08.000000000 +0000
@@ -187,6 +187,9 @@
 /* Define to enable Portable Network Graphics library (used by png). */
 #undef HAVE_LIBPNG
 
+/* Whether libv4l2 is available for video buffer conversion */
+#undef HAVE_LIBV4L2
+
 /* Define to 1 if you have the <memory.h> header file. */
 #undef HAVE_MEMORY_H
 
diff -upr gst-plugins-good-0.10.13.old/configure gst-plugins-good-0.10.13/configure
--- gst-plugins-good-0.10.13.old/configure	2009-01-22 21:25:11.000000000 +0000
+++ gst-plugins-good-0.10.13/configure	2009-01-26 09:56:53.000000000 +0000
@@ -909,6 +909,8 @@ X_CFLAGS
 XMKMF
 USE_GST_V4L2_FALSE
 USE_GST_V4L2_TRUE
+LIBV4L2_CFLAGS
+LIBV4L2_LIBS
 XVIDEO_LIBS
 USE_OSX_VIDEO_FALSE
 USE_OSX_VIDEO_TRUE
@@ -1438,6 +1440,8 @@ GST_PLUGINS_BASE_CFLAGS
 GST_PLUGINS_BASE_LIBS
 GTK2_CFLAGS
 GTK2_LIBS
+LIBV4L2_CFLAGS
+LIBV4L2_LIBS
 XMKMF
 XFIXES_CFLAGS
 XFIXES_LIBS
@@ -2297,6 +2301,10 @@ Some influential environment variables:
               linker flags for GST_PLUGINS_BASE, overriding pkg-config
   GTK2_CFLAGS C compiler flags for GTK2, overriding pkg-config
   GTK2_LIBS   linker flags for GTK2, overriding pkg-config
+  LIBV4L2_CFLAGS
+              C compiler flags for LIBV4L2, overriding pkg-config
+  LIBV4L2_LIBS
+              linker flags for LIBV4L2, overriding pkg-config
   XMKMF       Path to xmkmf, Makefile generator for X Window System
   XFIXES_CFLAGS
               C compiler flags for XFIXES, overriding pkg-config
@@ -37144,6 +37152,71 @@ else
   USE_GDK_PIXBUF_FALSE=
 fi
 
+if test x$HAVE_GST_V4L2 = xyes; then
+
+pkg_failed=no
+{ echo "$as_me:$LINENO: checking for LIBV4L2" >&5
+echo $ECHO_N "checking for LIBV4L2... " >&6; }
+
+if test -n "$PKG_CONFIG"; then
+    if test -n "$LIBV4L2_CFLAGS"; then
+        pkg_cv_LIBV4L2_CFLAGS="$LIBV4L2_CFLAGS"
+    else
+        if test -n "$PKG_CONFIG" && \
+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libv4l2\"") >&5
+  ($PKG_CONFIG --exists --print-errors "libv4l2") 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
+  pkg_cv_LIBV4L2_CFLAGS=`$PKG_CONFIG --cflags "libv4l2" 2>/dev/null`
+else
+  pkg_failed=yes
+fi
+    fi
+else
+	pkg_failed=untried
+fi
+if test -n "$PKG_CONFIG"; then
+    if test -n "$LIBV4L2_LIBS"; then
+        pkg_cv_LIBV4L2_LIBS="$LIBV4L2_LIBS"
+    else
+        if test -n "$PKG_CONFIG" && \
+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libv4l2\"") >&5
+  ($PKG_CONFIG --exists --print-errors "libv4l2") 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
+  pkg_cv_LIBV4L2_LIBS=`$PKG_CONFIG --libs "libv4l2" 2>/dev/null`
+else
+  pkg_failed=yes
+fi
+    fi
+else
+	pkg_failed=untried
+fi
+
+if test $pkg_failed = yes; then
+	LIBV4L2_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libv4l2"`
+	# Put the nasty error message in config.log where it belongs
+	echo "$LIBV4L2_PKG_ERRORS" 1>&5
+
+	have_libv4l2=no
+elif test $pkg_failed = untried; then
+	have_libv4l2=no
+else
+	LIBV4L2_CFLAGS=$pkg_cv_LIBV4L2_CFLAGS
+	LIBV4L2_LIBS=$pkg_cv_LIBV4L2_LIBS
+        { echo "$as_me:$LINENO: result: yes" >&5
+echo "yes" >&6; }
+	have_libv4l2=yes
+fi
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_LIBV4L2 test x$have_libv4l2 = xyes
+_ACEOF
+
+fi
+
 
 
 echo
diff -upr gst-plugins-good-0.10.13.old/configure.ac gst-plugins-good-0.10.13/configure.ac
--- gst-plugins-good-0.10.13.old/configure.ac	2009-01-22 21:04:39.000000000 +0000
+++ gst-plugins-good-0.10.13/configure.ac	2009-01-26 09:56:08.000000000 +0000
@@ -550,6 +550,12 @@ return 0;
   fi
 ])
 
+if test x$HAVE_GST_V4L2 = xyes; then
+  PKG_CHECK_MODULES(LIBV4L2, libv4l2, [have_libv4l2=yes], [have_libv4l2=no])
+  AC_DEFINE([HAVE_LIBV4L2], test x$have_libv4l2 = xyes,
+	    [Whether libv4l2 is available for video buffer conversion])
+fi
+
 dnl Check for X11
 translit(dnm, m, l) AM_CONDITIONAL(USE_X, true)
 AG_GST_CHECK_FEATURE(X, [X libraries and plugins],
diff -upr gst-plugins-good-0.10.13.old/sys/v4l2/gstv4l2src.c gst-plugins-good-0.10.13/sys/v4l2/gstv4l2src.c
--- gst-plugins-good-0.10.13.old/sys/v4l2/gstv4l2src.c	2009-01-22 00:04:30.000000000 +0000
+++ gst-plugins-good-0.10.13/sys/v4l2/gstv4l2src.c	2009-01-26 09:56:08.000000000 +0000
@@ -1194,7 +1194,7 @@ gst_v4l2src_get_read (GstV4l2Src * v4l2s
 
   do {
     amount =
-        read (v4l2src->v4l2object->video_fd, GST_BUFFER_DATA (*buf),
+        v4l2_read (v4l2src->v4l2object->video_fd, GST_BUFFER_DATA (*buf),
         buffersize);
     if (amount == buffersize) {
       break;
diff -upr gst-plugins-good-0.10.13.old/sys/v4l2/Makefile.am gst-plugins-good-0.10.13/sys/v4l2/Makefile.am
--- gst-plugins-good-0.10.13.old/sys/v4l2/Makefile.am	2009-01-21 23:58:47.000000000 +0000
+++ gst-plugins-good-0.10.13/sys/v4l2/Makefile.am	2009-01-26 09:56:08.000000000 +0000
@@ -22,15 +22,17 @@ libgstvideo4linux2_la_SOURCES = gstv4l2.
 libgstvideo4linux2_la_CFLAGS =   $(GST_PLUGINS_BASE_CFLAGS) \
 				 $(GST_BASE_CFLAGS) \
 				 $(GST_CFLAGS) \
-				 $(X_CFLAGS)
-			        
+				 $(X_CFLAGS) \
+				 $(LIBV4L2_CFLAGS)
+
 libgstvideo4linux2_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 
 libgstvideo4linux2_la_LIBADD =   $(GST_PLUGINS_BASE_LIBS) \
 				 $(GST_BASE_LIBS) \
 				 -lgstinterfaces-$(GST_MAJORMINOR) \
 				 $(GST_LIBS) \
-				 $(xv_libs)
+				 $(xv_libs) \
+				 $(LIBV4L2_LIBS)
 
 noinst_HEADERS = gstv4l2object.h v4l2_calls.h \
 		 gstv4l2src.h v4l2src_calls.h \
diff -upr gst-plugins-good-0.10.13.old/sys/v4l2/Makefile.in gst-plugins-good-0.10.13/sys/v4l2/Makefile.in
--- gst-plugins-good-0.10.13.old/sys/v4l2/Makefile.in	2009-01-22 21:25:00.000000000 +0000
+++ gst-plugins-good-0.10.13/sys/v4l2/Makefile.in	2009-01-26 09:56:08.000000000 +0000
@@ -274,6 +274,8 @@ LIBOIL_CFLAGS = @LIBOIL_CFLAGS@
 LIBOIL_LIBS = @LIBOIL_LIBS@
 LIBPNG_CFLAGS = @LIBPNG_CFLAGS@
 LIBPNG_LIBS = @LIBPNG_LIBS@
+LIBV4L2_CFLAGS =
+LIBV4L2_LIBS = -lv4l2 -lv4lconvert
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
 LIPO = @LIPO@
@@ -441,14 +443,16 @@ libgstvideo4linux2_la_SOURCES = gstv4l2.
 libgstvideo4linux2_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) \
 				 $(GST_BASE_CFLAGS) \
 				 $(GST_CFLAGS) \
-				 $(X_CFLAGS)
+				 $(X_CFLAGS) \
+				 $(LIBV4L2_CFLAGS)
 
 libgstvideo4linux2_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstvideo4linux2_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) \
 				 $(GST_BASE_LIBS) \
 				 -lgstinterfaces-$(GST_MAJORMINOR) \
 				 $(GST_LIBS) \
-				 $(xv_libs)
+				 $(xv_libs) \
+				 $(LIBV4L2_LIBS)
 
 noinst_HEADERS = gstv4l2object.h v4l2_calls.h \
 		 gstv4l2src.h v4l2src_calls.h \
diff -upr gst-plugins-good-0.10.13.old/sys/v4l2/v4l2_calls.c gst-plugins-good-0.10.13/sys/v4l2/v4l2_calls.c
--- gst-plugins-good-0.10.13.old/sys/v4l2/v4l2_calls.c	2009-01-22 00:04:30.000000000 +0000
+++ gst-plugins-good-0.10.13/sys/v4l2/v4l2_calls.c	2009-01-26 09:56:08.000000000 +0000
@@ -75,7 +75,7 @@ gst_v4l2_get_capabilities (GstV4l2Object
   if (!GST_V4L2_IS_OPEN (v4l2object))
     return FALSE;
 
-  if (ioctl (v4l2object->video_fd, VIDIOC_QUERYCAP, &v4l2object->vcap) < 0)
+  if (v4l2_ioctl (v4l2object->video_fd, VIDIOC_QUERYCAP, &v4l2object->vcap) < 0)
     goto cap_failed;
 
   GST_LOG_OBJECT (e, "driver:      '%s'", v4l2object->vcap.driver);
@@ -124,7 +124,7 @@ gst_v4l2_fill_lists (GstV4l2Object * v4l
     GstTunerChannel *channel;
 
     input.index = n;
-    if (ioctl (v4l2object->video_fd, VIDIOC_ENUMINPUT, &input) < 0) {
+    if (v4l2_ioctl (v4l2object->video_fd, VIDIOC_ENUMINPUT, &input) < 0) {
       if (errno == EINVAL)
         break;                  /* end of enumeration */
       else {
@@ -157,7 +157,7 @@ gst_v4l2_fill_lists (GstV4l2Object * v4l
       channel->flags |= GST_TUNER_CHANNEL_FREQUENCY;
 
       vtun.index = input.tuner;
-      if (ioctl (v4l2object->video_fd, VIDIOC_G_TUNER, &vtun) < 0) {
+      if (v4l2_ioctl (v4l2object->video_fd, VIDIOC_G_TUNER, &vtun) < 0) {
         GST_ELEMENT_ERROR (e, RESOURCE, SETTINGS,
             (_("Failed to get setting of tuner %d on device '%s'."),
                 input.tuner, v4l2object->videodev), GST_ERROR_SYSTEM);
@@ -197,7 +197,7 @@ gst_v4l2_fill_lists (GstV4l2Object * v4l
     standard.frameperiod.denominator = 0;
     standard.index = n;
 
-    if (ioctl (v4l2object->video_fd, VIDIOC_ENUMSTD, &standard) < 0) {
+    if (v4l2_ioctl (v4l2object->video_fd, VIDIOC_ENUMSTD, &standard) < 0) {
       if (errno == EINVAL || errno == ENOTTY)
         break;                  /* end of enumeration */
       else {
@@ -242,7 +242,7 @@ gst_v4l2_fill_lists (GstV4l2Object * v4l
     }
 
     control.id = n;
-    if (ioctl (v4l2object->video_fd, VIDIOC_QUERYCTRL, &control) < 0) {
+    if (v4l2_ioctl (v4l2object->video_fd, VIDIOC_QUERYCTRL, &control) < 0) {
       if (errno == EINVAL) {
         if (n < V4L2_CID_PRIVATE_BASE)
           /* continue so that we also check private controls */
@@ -324,7 +324,7 @@ gst_v4l2_fill_lists (GstV4l2Object * v4l
       menu.id = n;
       for (i = 0;; i++) {
         menu.index = i;
-        if (ioctl (v4l2object->video_fd, VIDIOC_QUERYMENU, &menu) < 0) {
+        if (v4l2_ioctl (v4l2object->video_fd, VIDIOC_QUERYMENU, &menu) < 0) {
           if (errno == EINVAL)
             break;              /* end of enumeration */
           else {
@@ -399,6 +399,7 @@ gboolean
 gst_v4l2_open (GstV4l2Object * v4l2object)
 {
   struct stat st;
+  int libv4l2_fd;
 
   GST_DEBUG_OBJECT (v4l2object->element, "Trying to open device %s",
       v4l2object->videodev);
@@ -424,6 +425,17 @@ gst_v4l2_open (GstV4l2Object * v4l2objec
   if (!GST_V4L2_IS_OPEN (v4l2object))
     goto not_open;
 
+  libv4l2_fd = v4l2_fd_open(v4l2object->video_fd,
+      V4L2_ENABLE_ENUM_FMT_EMULATION);
+  /* Note the v4l2_xxx functions are designed so that if they get passed an
+     unknown fd, the will behave exactly as their regular xxx counterparts, so
+     if v4l2_fd_open fails, we continue as normal (missing the libv4l2 custom
+     cam format to normal formats conversion). Chances are big we will still
+     fail then though, as normally v4l2_fd_open only fails if the device is not
+     a v4l2 device. */
+  if (libv4l2_fd != -1)
+    v4l2object->video_fd = libv4l2_fd;
+
   /* get capabilities, error will be posted */
   if (!gst_v4l2_get_capabilities (v4l2object))
     goto error;
@@ -477,7 +489,7 @@ error:
   {
     if (GST_V4L2_IS_OPEN (v4l2object)) {
       /* close device */
-      close (v4l2object->video_fd);
+      v4l2_close (v4l2object->video_fd);
       v4l2object->video_fd = -1;
     }
     /* empty lists */
@@ -503,7 +515,7 @@ gst_v4l2_close (GstV4l2Object * v4l2obje
   GST_V4L2_CHECK_NOT_ACTIVE (v4l2object);
 
   /* close device */
-  close (v4l2object->video_fd);
+  v4l2_close (v4l2object->video_fd);
   v4l2object->video_fd = -1;
 
   /* empty lists */
@@ -526,7 +538,7 @@ gst_v4l2_get_norm (GstV4l2Object * v4l2o
   if (!GST_V4L2_IS_OPEN (v4l2object))
     return FALSE;
 
-  if (ioctl (v4l2object->video_fd, VIDIOC_G_STD, norm) < 0)
+  if (v4l2_ioctl (v4l2object->video_fd, VIDIOC_G_STD, norm) < 0)
     goto std_failed;
 
   return TRUE;
@@ -554,7 +566,7 @@ gst_v4l2_set_norm (GstV4l2Object * v4l2o
   if (!GST_V4L2_IS_OPEN (v4l2object))
     return FALSE;
 
-  if (ioctl (v4l2object->video_fd, VIDIOC_S_STD, &norm) < 0)
+  if (v4l2_ioctl (v4l2object->video_fd, VIDIOC_S_STD, &norm) < 0)
     goto std_failed;
 
   return TRUE;
@@ -590,7 +602,7 @@ gst_v4l2_get_frequency (GstV4l2Object * 
   channel = gst_tuner_get_channel (GST_TUNER (v4l2object->element));
 
   freq.tuner = tunernum;
-  if (ioctl (v4l2object->video_fd, VIDIOC_G_FREQUENCY, &freq) < 0)
+  if (v4l2_ioctl (v4l2object->video_fd, VIDIOC_G_FREQUENCY, &freq) < 0)
     goto freq_failed;
 
   *frequency = freq.frequency * channel->freq_multiplicator;
@@ -631,10 +643,10 @@ gst_v4l2_set_frequency (GstV4l2Object * 
 
   freq.tuner = tunernum;
   /* fill in type - ignore error */
-  ioctl (v4l2object->video_fd, VIDIOC_G_FREQUENCY, &freq);
+  v4l2_ioctl (v4l2object->video_fd, VIDIOC_G_FREQUENCY, &freq);
   freq.frequency = frequency / channel->freq_multiplicator;
 
-  if (ioctl (v4l2object->video_fd, VIDIOC_S_FREQUENCY, &freq) < 0)
+  if (v4l2_ioctl (v4l2object->video_fd, VIDIOC_S_FREQUENCY, &freq) < 0)
     goto freq_failed;
 
   return TRUE;
@@ -666,7 +678,7 @@ gst_v4l2_signal_strength (GstV4l2Object 
     return FALSE;
 
   tuner.index = tunernum;
-  if (ioctl (v4l2object->video_fd, VIDIOC_G_TUNER, &tuner) < 0)
+  if (v4l2_ioctl (v4l2object->video_fd, VIDIOC_G_TUNER, &tuner) < 0)
     goto tuner_failed;
 
   *signal_strength = tuner.signal;
@@ -702,7 +714,7 @@ gst_v4l2_get_attribute (GstV4l2Object * 
 
   control.id = attribute_num;
 
-  if (ioctl (v4l2object->video_fd, VIDIOC_G_CTRL, &control) < 0)
+  if (v4l2_ioctl (v4l2object->video_fd, VIDIOC_G_CTRL, &control) < 0)
     goto ctrl_failed;
 
   *value = control.value;
@@ -739,7 +751,7 @@ gst_v4l2_set_attribute (GstV4l2Object * 
 
   control.id = attribute_num;
   control.value = value;
-  if (ioctl (v4l2object->video_fd, VIDIOC_S_CTRL, &control) < 0)
+  if (v4l2_ioctl (v4l2object->video_fd, VIDIOC_S_CTRL, &control) < 0)
     goto ctrl_failed;
 
   return TRUE;
@@ -764,7 +776,7 @@ gst_v4l2_get_input (GstV4l2Object * v4l2
   if (!GST_V4L2_IS_OPEN (v4l2object))
     return FALSE;
 
-  if (ioctl (v4l2object->video_fd, VIDIOC_G_INPUT, &n) < 0)
+  if (v4l2_ioctl (v4l2object->video_fd, VIDIOC_G_INPUT, &n) < 0)
     goto input_failed;
 
   *input = n;
@@ -790,7 +802,7 @@ gst_v4l2_set_input (GstV4l2Object * v4l2
   if (!GST_V4L2_IS_OPEN (v4l2object))
     return FALSE;
 
-  if (ioctl (v4l2object->video_fd, VIDIOC_S_INPUT, &input) < 0)
+  if (v4l2_ioctl (v4l2object->video_fd, VIDIOC_S_INPUT, &input) < 0)
     goto input_failed;
 
   return TRUE;
diff -upr gst-plugins-good-0.10.13.old/sys/v4l2/v4l2_calls.h gst-plugins-good-0.10.13/sys/v4l2/v4l2_calls.h
--- gst-plugins-good-0.10.13.old/sys/v4l2/v4l2_calls.h	2009-01-21 23:58:47.000000000 +0000
+++ gst-plugins-good-0.10.13/sys/v4l2/v4l2_calls.h	2009-01-26 09:56:08.000000000 +0000
@@ -27,6 +27,17 @@
 #include "gstv4l2object.h"
 #include "gst/gst-i18n-plugin.h"
 
+#ifdef HAVE_LIBV4L2
+#include <libv4l2.h>
+#else
+#define v4l2_fd_open(fd, flags) (fd)
+#define v4l2_close close
+#define v4l2_dup dup
+#define v4l2_ioctl ioctl
+#define v4l2_read read
+#define v4l2_mmap mmap
+#define v4l2_munmap munmap
+#endif
 
 /* simple check whether the device is open */
 #define GST_V4L2_IS_OPEN(v4l2object) \
diff -upr gst-plugins-good-0.10.13.old/sys/v4l2/v4l2src_calls.c gst-plugins-good-0.10.13/sys/v4l2/v4l2src_calls.c
--- gst-plugins-good-0.10.13.old/sys/v4l2/v4l2src_calls.c	2009-01-22 00:04:30.000000000 +0000
+++ gst-plugins-good-0.10.13/sys/v4l2/v4l2src_calls.c	2009-01-26 09:56:08.000000000 +0000
@@ -88,7 +88,7 @@ gst_v4l2_buffer_finalize (GstV4l2Buffer 
     pool->num_live_buffers--;
 
   if (pool->running) {
-    if (ioctl (pool->video_fd, VIDIOC_QBUF, &buffer->vbuffer) < 0) {
+    if (v4l2_ioctl (pool->video_fd, VIDIOC_QBUF, &buffer->vbuffer) < 0) {
       GST_WARNING ("could not requeue buffer %p %d", buffer, index);
     } else {
       /* FIXME: check that the caps didn't change */
@@ -106,7 +106,7 @@ gst_v4l2_buffer_finalize (GstV4l2Buffer 
   if (!resuscitated) {
     GST_LOG ("buffer %p not recovered, unmapping", buffer);
     gst_mini_object_unref (GST_MINI_OBJECT (pool));
-    munmap ((void *) GST_BUFFER_DATA (buffer), buffer->vbuffer.length);
+    v4l2_munmap ((void *) GST_BUFFER_DATA (buffer), buffer->vbuffer.length);
 
     GST_MINI_OBJECT_CLASS (v4l2buffer_parent_class)->finalize (GST_MINI_OBJECT
         (buffer));
@@ -165,7 +165,7 @@ gst_v4l2_buffer_new (GstV4l2BufferPool *
   ret->vbuffer.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
   ret->vbuffer.memory = V4L2_MEMORY_MMAP;
 
-  if (ioctl (pool->video_fd, VIDIOC_QUERYBUF, &ret->vbuffer) < 0)
+  if (v4l2_ioctl (pool->video_fd, VIDIOC_QUERYBUF, &ret->vbuffer) < 0)
     goto querybuf_failed;
 
   GST_LOG ("  index:     %u", ret->vbuffer.index);
@@ -179,7 +179,7 @@ gst_v4l2_buffer_new (GstV4l2BufferPool *
   GST_LOG ("  length:    %u", ret->vbuffer.length);
   GST_LOG ("  input:     %u", ret->vbuffer.input);
 
-  data = (guint8 *) mmap (0, ret->vbuffer.length,
+  data = (guint8 *) v4l2_mmap (0, ret->vbuffer.length,
       PROT_READ | PROT_WRITE, MAP_SHARED, pool->video_fd,
       ret->vbuffer.m.offset);
 
@@ -229,7 +229,7 @@ gst_v4l2_buffer_pool_finalize (GstV4l2Bu
   pool->lock = NULL;
 
   if (pool->video_fd >= 0)
-    close (pool->video_fd);
+    v4l2_close (pool->video_fd);
 
   if (pool->buffers) {
     g_free (pool->buffers);
@@ -292,7 +292,7 @@ gst_v4l2_buffer_pool_new (GstV4l2Src * v
 
   pool = (GstV4l2BufferPool *) gst_mini_object_new (GST_TYPE_V4L2_BUFFER_POOL);
 
-  pool->video_fd = dup (fd);
+  pool->video_fd = v4l2_dup (fd);
   if (pool->video_fd < 0)
     goto dup_failed;
 
@@ -344,7 +344,7 @@ gst_v4l2_buffer_pool_activate (GstV4l2Bu
 
     GST_LOG ("enqueue pool buffer %d", n);
 
-    if (ioctl (pool->video_fd, VIDIOC_QBUF, buf) < 0)
+    if (v4l2_ioctl (pool->video_fd, VIDIOC_QBUF, buf) < 0)
       goto queue_failed;
   }
   pool->running = TRUE;
@@ -519,7 +519,7 @@ gst_v4l2src_fill_format_list (GstV4l2Src
     format->index = n;
     format->type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
 
-    if (ioctl (v4l2src->v4l2object->video_fd, VIDIOC_ENUM_FMT, format) < 0) {
+    if (v4l2_ioctl (v4l2src->v4l2object->video_fd, VIDIOC_ENUM_FMT, format) < 0) {
       if (errno == EINVAL) {
         g_free (format);
         break;                  /* end of enumeration */
@@ -595,7 +595,7 @@ gst_v4l2src_probe_caps_for_format_and_si
 
   /* keep in mind that v4l2 gives us frame intervals (durations); we invert the
    * fraction to get framerate */
-  if (ioctl (fd, VIDIOC_ENUM_FRAMEINTERVALS, &ival) < 0)
+  if (v4l2_ioctl (fd, VIDIOC_ENUM_FRAMEINTERVALS, &ival) < 0)
     goto enum_frameintervals_failed;
 
   if (ival.type == V4L2_FRMIVAL_TYPE_DISCRETE) {
@@ -621,7 +621,7 @@ gst_v4l2src_probe_caps_for_format_and_si
       gst_value_list_append_value (&rates, &rate);
 
       ival.index++;
-    } while (ioctl (fd, VIDIOC_ENUM_FRAMEINTERVALS, &ival) >= 0);
+    } while (v4l2_ioctl (fd, VIDIOC_ENUM_FRAMEINTERVALS, &ival) >= 0);
   } else if (ival.type == V4L2_FRMIVAL_TYPE_STEPWISE) {
     GValue min = { 0, };
     GValue step = { 0, };
@@ -782,7 +782,7 @@ gst_v4l2src_probe_caps_for_format (GstV4
 
   GST_DEBUG_OBJECT (v4l2src, "Enumerating frame sizes");
 
-  if (ioctl (fd, VIDIOC_ENUM_FRAMESIZES, &size) < 0)
+  if (v4l2_ioctl (fd, VIDIOC_ENUM_FRAMESIZES, &size) < 0)
     goto enum_framesizes_failed;
 
   if (size.type == V4L2_FRMSIZE_TYPE_DISCRETE) {
@@ -802,7 +802,7 @@ gst_v4l2src_probe_caps_for_format (GstV4
         results = g_list_prepend (results, tmp);
 
       size.index++;
-    } while (ioctl (fd, VIDIOC_ENUM_FRAMESIZES, &size) >= 0);
+    } while (v4l2_ioctl (fd, VIDIOC_ENUM_FRAMESIZES, &size) >= 0);
     GST_DEBUG_OBJECT (v4l2src, "done iterating discrete frame sizes");
   } else if (size.type == V4L2_FRMSIZE_TYPE_STEPWISE) {
     GST_DEBUG_OBJECT (v4l2src, "we have stepwise frame sizes:");
@@ -972,7 +972,7 @@ gst_v4l2src_grab_frame (GstV4l2Src * v4l
   buffer.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
   buffer.memory = V4L2_MEMORY_MMAP;
 
-  while (ioctl (v4l2src->v4l2object->video_fd, VIDIOC_DQBUF, &buffer) < 0) {
+  while (v4l2_ioctl (v4l2src->v4l2object->video_fd, VIDIOC_DQBUF, &buffer) < 0) {
 
     GST_WARNING_OBJECT (v4l2src,
         "problem grabbing frame %d (ix=%d), trials=%d, pool-ct=%d, buf.flags=%d",
@@ -1190,7 +1190,7 @@ gst_v4l2src_set_capture (GstV4l2Src * v4
   memset (&format, 0x00, sizeof (struct v4l2_format));
   format.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
 
-  if (ioctl (fd, VIDIOC_G_FMT, &format) < 0)
+  if (v4l2_ioctl (fd, VIDIOC_G_FMT, &format) < 0)
     goto get_fmt_failed;
 
   format.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
@@ -1202,7 +1202,7 @@ gst_v4l2src_set_capture (GstV4l2Src * v4
    *  combined, there are other modes for requesting fields individually) */
   format.fmt.pix.field = V4L2_FIELD_INTERLACED;
 
-  if (ioctl (fd, VIDIOC_S_FMT, &format) < 0) {
+  if (v4l2_ioctl (fd, VIDIOC_S_FMT, &format) < 0) {
     if (errno != EINVAL)
       goto set_fmt_failed;
 
@@ -1211,7 +1211,7 @@ gst_v4l2src_set_capture (GstV4l2Src * v4
     format.fmt.pix.height = height;
     format.fmt.pix.pixelformat = pixelformat;
     format.fmt.pix.field = V4L2_FIELD_NONE;
-    if (ioctl (fd, VIDIOC_S_FMT, &format) < 0)
+    if (v4l2_ioctl (fd, VIDIOC_S_FMT, &format) < 0)
       goto set_fmt_failed;
   }
 
@@ -1226,7 +1226,7 @@ gst_v4l2src_set_capture (GstV4l2Src * v4
 
   memset (&stream, 0x00, sizeof (struct v4l2_streamparm));
   stream.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
-  if (ioctl (fd, VIDIOC_G_PARM, &stream) < 0) {
+  if (v4l2_ioctl (fd, VIDIOC_G_PARM, &stream) < 0) {
     GST_ELEMENT_WARNING (v4l2src, RESOURCE, SETTINGS,
         (_("Could not get parameters on device '%s'"),
             v4l2src->v4l2object->videodev), GST_ERROR_SYSTEM);
@@ -1256,7 +1256,7 @@ gst_v4l2src_set_capture (GstV4l2Src * v4
   stream.parm.capture.timeperframe.denominator = fps_n;
 
   /* some cheap USB cam's won't accept any change */
-  if (ioctl (fd, VIDIOC_S_PARM, &stream) < 0) {
+  if (v4l2_ioctl (fd, VIDIOC_S_PARM, &stream) < 0) {
     GST_ELEMENT_WARNING (v4l2src, RESOURCE, SETTINGS,
         (_("Video input device did not accept new frame rate setting.")),
         GST_ERROR_SYSTEM);
@@ -1338,7 +1338,7 @@ gst_v4l2src_capture_init (GstV4l2Src * v
     breq.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
     breq.memory = V4L2_MEMORY_MMAP;
 
-    if (ioctl (fd, VIDIOC_REQBUFS, &breq) < 0)
+    if (v4l2_ioctl (fd, VIDIOC_REQBUFS, &breq) < 0)
       goto reqbufs_failed;
 
     GST_LOG_OBJECT (v4l2src, " count:  %u", breq.count);
@@ -1433,7 +1433,7 @@ gst_v4l2src_capture_start (GstV4l2Src * 
     if (!gst_v4l2_buffer_pool_activate (v4l2src->pool, v4l2src))
       goto pool_activate_failed;
 
-    if (ioctl (fd, VIDIOC_STREAMON, &type) < 0)
+    if (v4l2_ioctl (fd, VIDIOC_STREAMON, &type) < 0)
       goto streamon_failed;
   }
 
@@ -1478,7 +1478,7 @@ gst_v4l2src_capture_stop (GstV4l2Src * v
   if (v4l2src->use_mmap) {
     /* we actually need to sync on all queued buffers but not
      * on the non-queued ones */
-    if (ioctl (v4l2src->v4l2object->video_fd, VIDIOC_STREAMOFF, &type) < 0)
+    if (v4l2_ioctl (v4l2src->v4l2object->video_fd, VIDIOC_STREAMOFF, &type) < 0)
       goto streamoff_failed;
   }
 
@@ -1554,14 +1554,14 @@ gst_v4l2src_get_nearest_size (GstV4l2Src
   fmt.fmt.pix.pixelformat = pixelformat;
   fmt.fmt.pix.field = V4L2_FIELD_INTERLACED;
 
-  r = ioctl (fd, VIDIOC_TRY_FMT, &fmt);
+  r = v4l2_ioctl (fd, VIDIOC_TRY_FMT, &fmt);
   if (r < 0 && errno == EINVAL) {
     /* try again with progressive video */
     fmt.fmt.pix.width = *width;
     fmt.fmt.pix.height = *height;
     fmt.fmt.pix.pixelformat = pixelformat;
     fmt.fmt.pix.field = V4L2_FIELD_NONE;
-    r = ioctl (fd, VIDIOC_TRY_FMT, &fmt);
+    r = v4l2_ioctl (fd, VIDIOC_TRY_FMT, &fmt);
   }
 
   if (r < 0) {
@@ -1581,14 +1581,14 @@ gst_v4l2src_get_nearest_size (GstV4l2Src
     fmt.fmt.pix.width = *width;
     fmt.fmt.pix.height = *height;
 
-    r = ioctl (fd, VIDIOC_S_FMT, &fmt);
+    r = v4l2_ioctl (fd, VIDIOC_S_FMT, &fmt);
     if (r < 0 && errno == EINVAL) {
       /* try again with progressive video */
       fmt.fmt.pix.width = *width;
       fmt.fmt.pix.height = *height;
       fmt.fmt.pix.pixelformat = pixelformat;
       fmt.fmt.pix.field = V4L2_FIELD_NONE;
-      r = ioctl (fd, VIDIOC_S_FMT, &fmt);
+      r = v4l2_ioctl (fd, VIDIOC_S_FMT, &fmt);
     }
 
     if (r < 0)


Index: gstreamer-plugins-good.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamer-plugins-good/F-10/gstreamer-plugins-good.spec,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- gstreamer-plugins-good.spec	15 Jan 2009 03:21:19 -0000	1.79
+++ gstreamer-plugins-good.spec	26 Jan 2009 10:16:41 -0000	1.80
@@ -5,8 +5,8 @@
 %define         _gstpb          0.10.17
 
 Name: 		%{gstreamer}-plugins-good
-Version: 	0.10.11
-Release:  	4%{?dist}
+Version: 	0.10.13
+Release:  	1%{?dist}
 Summary: 	GStreamer plug-ins with good code and licensing
 
 Group: 		Applications/Multimedia
@@ -16,7 +16,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # http://bugzilla.gnome.org/show_bug.cgi?id=545033
-Patch0: gst-plugins-good-0.10.9-libv4l.patch
+Patch0: gst-plugins-good-0.10.13-libv4l.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=556986
 Patch1: gst-plugins-good-0.10.11-pulse-hang-bz556986.patch
 # https://bugzilla.redhat.com/show_bug.cgi?id=470000
@@ -104,7 +104,7 @@
 
 %prep
 %setup -q -n gst-plugins-good-%{version}
-%patch0 -p0 -b .libv4l
+%patch0 -p1 -b .libv4l
 %patch1 -p0 -b .pulse-hang
 %patch2 -p1 -b .pulseprobe-fix
 
@@ -257,6 +257,10 @@
 gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/gstreamer-%{majorminor}.schemas > /dev/null || :
 
 %changelog
+* Mon Jan 26 2009 - Bastien Nocera <bnocera at redhat.com> - 0.10.13-1
+- Update to 0.10.13
+- Update libv4l patch
+
 * Wed Jan 14 2009 Warren Togami <wtogami at redhat.com> 0.10.11-4
 - Bug #477877 Fix multilib conflict in -devel
 - Bug #478449 Fix ladspa on lib64 


--- gst-plugins-good-0.10.9-libv4l.patch DELETED ---



From hadess at fedoraproject.org  Mon Jan 26 10:28:24 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Mon, 26 Jan 2009 10:28:24 +0000 (UTC)
Subject: rpms/gstreamer-plugins-good/F-10 .cvsignore, 1.13, 1.14 sources,
	1.13, 1.14
Message-ID: <20090126102824.CDB737010C@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/gstreamer-plugins-good/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23186

Modified Files:
	.cvsignore sources 
Log Message:
Add missing sources file



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamer-plugins-good/F-10/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	25 Oct 2008 00:18:49 -0000	1.13
+++ .cvsignore	26 Jan 2009 10:27:54 -0000	1.14
@@ -1 +1 @@
-gst-plugins-good-0.10.11.tar.bz2
+gst-plugins-good-0.10.13.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamer-plugins-good/F-10/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	25 Oct 2008 00:18:49 -0000	1.13
+++ sources	26 Jan 2009 10:27:54 -0000	1.14
@@ -1 +1 @@
-79b086c2dc0e07ae0c8ddc91512bab3a  gst-plugins-good-0.10.11.tar.bz2
+27f27151ccefad1157c9eaa322e14ac4  gst-plugins-good-0.10.13.tar.bz2



From tagoh at fedoraproject.org  Mon Jan 26 10:40:26 2009
From: tagoh at fedoraproject.org (Akira TAGOH)
Date: Mon, 26 Jan 2009 10:40:26 +0000 (UTC)
Subject: rpms/namazu/devel namazu.spec,1.23,1.24
Message-ID: <20090126104026.74AB07010C@cvs1.fedora.phx.redhat.com>

Author: tagoh

Update of /cvs/pkgs/rpms/namazu/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25270

Modified Files:
	namazu.spec 
Log Message:
* Mon Jan 26 2009 Akira TAGOH <tagoh at redhat.com> - 2.0.18-7
- simplify a package summary.


Index: namazu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/namazu/devel/namazu.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- namazu.spec	3 Sep 2008 14:41:54 -0000	1.23
+++ namazu.spec	26 Jan 2009 10:39:55 -0000	1.24
@@ -4,7 +4,7 @@
 
 Name:		namazu
 Version:	2.0.18
-Release:	6%{?dist}
+Release:	7%{?dist}
 License:	GPLv2+
 URL:		http://www.namazu.org/
 BuildRequires:	perl >= 5.6.0, perl(NKF) >= 1.70, perl(Text::Kakasi) >= 1.00
@@ -21,7 +21,7 @@
 
 %define __perl_requires %{SOURCE1}
 
-Summary:	Namazu is a full-text search engine
+Summary:	A full-text search engine
 Requires:	perl >= 5.6.0, perl(File::MMagic) >= 1.12, perl(NKF) >= 1.70
 Requires:	kakasi >= 2.3.0, perl(Text::Kakasi) >= 1.00
 Group:		Applications/Text
@@ -161,6 +161,9 @@
 
 
 %changelog
+* Mon Jan 26 2009 Akira TAGOH <tagoh at redhat.com> - 2.0.18-7
+- simplify a package summary.
+
 * Wed Sep  3 2008 Akira TAGOH <tagoh at redhat.com> - 2.0.18-6
 - Fix a broken deps.
 



From ltinkl at fedoraproject.org  Mon Jan 26 10:40:29 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Mon, 26 Jan 2009 10:40:29 +0000 (UTC)
Subject: rpms/kdelibs/F-9 kdelibs-4.1.70-cmake.patch, NONE,
	1.1 kdelibs-4.1.72-kstandarddirs.patch, NONE,
	1.1 kdelibs-4.1.72-no-cache-kdeglobals-paths.patch, NONE,
	1.1 kdelibs-4.1.72-policykit-workaround.patch, NONE,
	1.1 kdelibs-4.1.82-kde149705.patch, NONE,
	1.1 kdelibs-4.1.96-AllowExternalPaths.patch, NONE,
	1.1 kdelibs-4.1.96-cmake.patch, NONE,
	1.1 kdelibs-4.1.96-parallel_devel.patch, NONE, 1.1 .cvsignore,
	1.55, 1.56 kde4.csh, 1.2, 1.3 kde4.sh, 1.2, 1.3 kdelibs.spec,
	1.373, 1.374 kdelibs-3.95.0-kde149705.patch, 1.1,
	NONE kdelibs-4.0.2-no-cache-kdeglobals-paths.patch, 1.1,
	NONE kdelibs-4.1.0-kstandarddirs.patch, 1.1,
	NONE kdelibs-4.1.0-parallel_devel.patch, 1.1,
	NONE kdelibs-4.1.1-cmake.patch, 1.1,
	NONE kdelibs-4.1.4-policykit-workaround.patch, 1.2, NONE
Message-ID: <20090126104029.4B4C77010C@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kdelibs/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25187

Modified Files:
	.cvsignore kde4.csh kde4.sh kdelibs.spec 
Added Files:
	kdelibs-4.1.70-cmake.patch kdelibs-4.1.72-kstandarddirs.patch 
	kdelibs-4.1.72-no-cache-kdeglobals-paths.patch 
	kdelibs-4.1.72-policykit-workaround.patch 
	kdelibs-4.1.82-kde149705.patch 
	kdelibs-4.1.96-AllowExternalPaths.patch 
	kdelibs-4.1.96-cmake.patch kdelibs-4.1.96-parallel_devel.patch 
Removed Files:
	kdelibs-3.95.0-kde149705.patch 
	kdelibs-4.0.2-no-cache-kdeglobals-paths.patch 
	kdelibs-4.1.0-kstandarddirs.patch 
	kdelibs-4.1.0-parallel_devel.patch kdelibs-4.1.1-cmake.patch 
	kdelibs-4.1.4-policykit-workaround.patch 
Log Message:
KDE 4.2.0


kdelibs-4.1.70-cmake.patch:

--- NEW FILE kdelibs-4.1.70-cmake.patch ---
diff -Naur kdelibs-4.1.70/cmake/modules/FindKDE4Internal.cmake kdelibs-4.1.70.cmake/cmake/modules/FindKDE4Internal.cmake
--- kdelibs-4.1.70/cmake/modules/FindKDE4Internal.cmake	2008-10-19 16:56:45.000000000 +0200
+++ kdelibs-4.1.70.cmake/cmake/modules/FindKDE4Internal.cmake	2008-10-19 17:06:14.000000000 +0200
@@ -817,6 +817,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_BUILD_TYPE})
 endif (NOT CMAKE_CONFIGURATION_TYPES AND NOT CMAKE_BUILD_TYPE)
 
 

kdelibs-4.1.72-kstandarddirs.patch:

--- NEW FILE kdelibs-4.1.72-kstandarddirs.patch ---
diff -Naur kdelibs-4.1.72/kdecore/kernel/kstandarddirs.cpp kdelibs-4.1.72.kstandarddirs/kdecore/kernel/kstandarddirs.cpp
--- kdelibs-4.1.72/kdecore/kernel/kstandarddirs.cpp	2008-11-12 18:31:44.000000000 +0100
+++ kdelibs-4.1.72.kstandarddirs/kdecore/kernel/kstandarddirs.cpp	2008-11-12 18:38:40.000000000 +0100
@@ -1002,7 +1002,9 @@
                  pit != prefixList->end();
                  ++pit)
             {
-	        if((*pit)!=installprefix||installdir.isEmpty())
+                // "exe" never has a custom install path, and the check triggers
+                // a false positive due to the libexecdir patch
+	        if((*pit)!=installprefix||installdir.isEmpty()||!strcmp("exe", type))
 	        {
                     for (QStringList::ConstIterator it = dirs.constBegin();
                          it != dirs.constEnd(); ++it)
@@ -1016,6 +1018,11 @@
                         if ((local || testdir.exists()) && !candidates.contains(path))
                             candidates.append(path);
                     }
+                    // special-case "config" (forward porting Chris Cheney's
+                    // hack) - we want /etc/kde after the local config paths
+                    // and before the ones in /usr (including kde-profile)
+                    if (local && !strcmp("config", type))
+                       candidates.append("/etc/kde/");
                     local = false;
                 }
 	        else

kdelibs-4.1.72-no-cache-kdeglobals-paths.patch:

--- NEW FILE kdelibs-4.1.72-no-cache-kdeglobals-paths.patch ---
diff -Naur kdelibs-4.1.72/kdecore/config/kconfig.cpp kdelibs-4.1.72.no-cache-kdeglobals-path/kdecore/config/kconfig.cpp
--- kdelibs-4.1.72/kdecore/config/kconfig.cpp	2008-10-23 01:05:09.000000000 +0200
+++ kdelibs-4.1.72.no-cache-kdeglobals-path/kdecore/config/kconfig.cpp	2008-11-10 17:38:33.000000000 +0100
@@ -61,12 +61,6 @@
 {
     sGlobalFileName = componentData.dirs()->saveLocation("config") +
                           QString::fromLatin1("kdeglobals");
-    if (wantGlobals()) {
-        const KStandardDirs *const dirs = componentData.dirs();
-        foreach(const QString& dir, dirs->findAllResources("config", QLatin1String("kdeglobals")) +
-                                    dirs->findAllResources("config", QLatin1String("system.kdeglobals")))
-            globalFiles.push_front(dir);
-    }
     const QString etc_kderc =
 #ifdef Q_WS_WIN
         QFile::decodeName( qgetenv("WINDIR") + "/kde4rc" );
@@ -76,15 +70,11 @@
     KEntryMap tmp;
     // first entry is always /etc/kderc or empty if cannot read
     if (KStandardDirs::checkAccess(etc_kderc, R_OK)) {
-        if (!globalFiles.contains(etc_kderc))
-            globalFiles.push_front(etc_kderc);
-
         if (!mappingsRegistered) {
             KSharedPtr<KConfigBackend> backend = KConfigBackend::create(componentData, etc_kderc, QLatin1String("INI"));
             backend->parseConfig( "en_US", tmp, KConfigBackend::ParseDefaults);
         }
     } else {
-        globalFiles.push_front(QString());
         mappingsRegistered = true;
     }
 
@@ -461,10 +451,31 @@
 
 void KConfigPrivate::parseGlobalFiles()
 {
+    QStringList globalFiles;
+
+    if (wantGlobals()) {
+        const KStandardDirs *const dirs = componentData.dirs();
+        foreach(const QString& dir, dirs->findAllResources("config", QLatin1String("kdeglobals")) +
+                                    dirs->findAllResources("config", QLatin1String("system.kdeglobals")))
+            globalFiles.push_front(dir);
+    }
+    const QString etc_kderc =
+#ifdef Q_WS_WIN
+        QFile::decodeName( QByteArray(::getenv("WINDIR")) + "\\kde4rc" );
+#else
+        QLatin1String("/etc/kde4rc");
+#endif
+    KEntryMap tmp;
+    // first entry is always /etc/kderc or empty if cannot read
+    if (KStandardDirs::checkAccess(etc_kderc, R_OK)) {
+        if (!globalFiles.contains(etc_kderc))
+            globalFiles.push_front(etc_kderc);
+    } else {
+        globalFiles.push_front(QString());
+    }
+
 //    qDebug() << "parsing global files" << globalFiles;
 
-    // TODO: can we cache the values in etc_kderc / other global files
-    //       on a per-application basis?
     const QByteArray utf8Locale = locale.toUtf8();
     foreach(const QString& file, globalFiles) {
         KConfigBackend::ParseOptions parseOpts = KConfigBackend::ParseGlobal|KConfigBackend::ParseExpansions;
diff -Naur kdelibs-4.1.72/kdecore/config/kconfig_p.h kdelibs-4.1.72.no-cache-kdeglobals-path/kdecore/config/kconfig_p.h
--- kdelibs-4.1.72/kdecore/config/kconfig_p.h	2008-06-03 11:34:54.000000000 +0200
+++ kdelibs-4.1.72.no-cache-kdeglobals-path/kdecore/config/kconfig_p.h	2008-11-10 17:38:33.000000000 +0100
@@ -86,7 +86,6 @@
 
     KEntryMap entryMap;
     QString backendType;
-    QStringList globalFiles;
     QStack<QString> extraFiles;
 
     QString locale;

kdelibs-4.1.72-policykit-workaround.patch:

--- NEW FILE kdelibs-4.1.72-policykit-workaround.patch ---
diff -Naur kdelibs-4.1.72.policykit/solid/solid/backends/hal/halstorageaccess.cpp kdelibs-4.1.72/solid/solid/backends/hal/halstorageaccess.cpp
--- kdelibs-4.1.72.policykit/solid/solid/backends/hal/halstorageaccess.cpp	2008-11-04 18:13:11.000000000 +0100
+++ kdelibs-4.1.72/solid/solid/backends/hal/halstorageaccess.cpp	2008-11-10 18:45:41.000000000 +0100
@@ -17,6 +17,8 @@
 
 */
 
+#include <config-prefix.h> // for LIBEXEC_INSTALL_DIR
+
 #include "halstorageaccess.h"
 
 #include "halfstabhandling.h"
@@ -172,11 +174,21 @@
 {
     // TODO: Better error reporting here
     if (m_setupInProgress) {
+	if (error.name() == "org.freedesktop.Hal.Device.PermissionDeniedByPolicy") {
+            if (callPrivilegedMount())
+              return;
+            // if we fail to run kdesu, fall through and emit the original PermissionDeniedByPolicy error
+        }
         m_setupInProgress = false;
         emit setupDone(Solid::UnauthorizedOperation,
                        error.name()+": "+error.message(),
                        m_device->udi());
     } else if (m_teardownInProgress) {
+	if (error.name() == "org.freedesktop.Hal.Device.PermissionDeniedByPolicy") {
+            if (callPrivilegedUnmount())
+              return;
+            // if we fail to run kdesu, fall through and emit the original PermissionDeniedByPolicy error
+        }
         m_teardownInProgress = false;
         emit teardownDone(Solid::UnauthorizedOperation,
                           error.name()+": "+error.message(),
@@ -294,8 +306,9 @@
 #else
     QString uid="uid=";
 #endif
-    if (halOptions.contains(uid)) {
-        options << uid+QString::number(::getuid());
+    if (halOptions.contains(uid) &&
+       (fstype == "vfat" || fstype == "iso9660" || fstype == "hfs" || fstype == "udf")) {
+            options << uid+QString::number(::getuid());
     }
 
 #ifdef Q_OS_FREEBSD
@@ -333,6 +346,59 @@
                               SLOT(slotDBusError(const QDBusError &)));
 }
 
+bool Solid::Backends::Hal::StorageAccess::callPrivilegedMount()
+{
+    QString udi = m_device->udi();
+    QString options;
+    QStringList halOptions = m_device->property("volume.mount.valid_options").toStringList();
+    QString fstype = m_device->property("volume.fstype").toString();
+
+    if (halOptions.contains("uid=")
+        && (fstype == "vfat" || fstype == "iso9660" || fstype == "hfs" || fstype == "udf")) {
+        options = "uid="+QString::number(::getuid());
+    }
+
+    m_process = new QProcess(this);
+
+    connect(m_process, SIGNAL(finished(int, QProcess::ExitStatus)),
+            this, SLOT(slotProcessFinished(int, QProcess::ExitStatus)));
+
+    m_process->start(LIBEXEC_INSTALL_DIR "/kdesu", QStringList() << "-d" << "-t"
+        << "--noignorebutton" << "-c"
+        << QString::fromLatin1("dbus-send  --system --print-reply --dest=org.freedesktop.Hal %1 "
+                               "org.freedesktop.Hal.Device.Volume.Mount string: string: "
+                               "array:string:%2").arg(udi).arg(options));
+
+    if (m_process->waitForStarted()) {
+        return true;
+    } else {
+        delete m_process;
+        return false;
+    }
+}
+
+bool Solid::Backends::Hal::StorageAccess::callPrivilegedUnmount()
+{
+    QString udi = m_device->udi();
+
+    m_process = new QProcess(this);
+
+    connect(m_process, SIGNAL(finished(int, QProcess::ExitStatus)),
+            this, SLOT(slotProcessFinished(int, QProcess::ExitStatus)));
+
+    m_process->start(LIBEXEC_INSTALL_DIR "/kdesu", QStringList() << "-d" << "-t"
+        << "--noignorebutton" << "-c"
+        << QString::fromLatin1("dbus-send  --system --print-reply --dest=org.freedesktop.Hal %1 "
+                               "org.freedesktop.Hal.Device.Volume.Unmount array:string:").arg(udi));
+
+    if (m_process->waitForStarted()) {
+        return true;
+    } else {
+        delete m_process;
+        return false;
+    }
+}
+
 bool StorageAccess::callHalVolumeUnmount()
 {
     QDBusConnection c = QDBusConnection::systemBus();
diff -Naur kdelibs-4.1.72.policykit/solid/solid/backends/hal/halstorageaccess.h kdelibs-4.1.72/solid/solid/backends/hal/halstorageaccess.h
--- kdelibs-4.1.72.policykit/solid/solid/backends/hal/halstorageaccess.h	2008-05-21 13:07:38.000000000 +0200
+++ kdelibs-4.1.72/solid/solid/backends/hal/halstorageaccess.h	2008-11-10 18:45:01.000000000 +0100
@@ -69,6 +69,9 @@
     bool callSystemMount();
     bool callSystemUnmount();
 
+    bool callPrivilegedMount();
+    bool callPrivilegedUnmount();
+
     bool requestPassphrase();
     void callCryptoSetup(const QString &passphrase);
     bool callCryptoTeardown();

kdelibs-4.1.82-kde149705.patch:

--- NEW FILE kdelibs-4.1.82-kde149705.patch ---
diff -Naurw kdelibs-4.1.82/kdeui/icons/kicontheme.cpp kdelibs-4.1.82.kde149705/kdeui/icons/kicontheme.cpp
--- kdelibs-4.1.82/kdeui/icons/kicontheme.cpp	2008-10-23 01:05:04.000000000 +0200
+++ kdelibs-4.1.82.kde149705/kdeui/icons/kicontheme.cpp	2008-12-09 14:15:14.000000000 +0100
@@ -516,7 +516,7 @@
         return *_theme;
 
     KConfigGroup cg(KGlobal::config(), "Icons");
-    *_theme = cg.readEntry("Theme", defaultThemeName());
+    *_theme = cg.readEntry("Theme4", cg.readEntry("Theme", defaultThemeName()));
     if ( *_theme == QLatin1String("hicolor") ) *_theme = defaultThemeName();
 /*    if (_theme->isEmpty())
     {
diff -Naurw kdelibs-4.1.82/kdeui/kernel/kglobalsettings.cpp kdelibs-4.1.82.kde149705/kdeui/kernel/kglobalsettings.cpp
--- kdelibs-4.1.82/kdeui/kernel/kglobalsettings.cpp	2008-11-28 16:40:11.000000000 +0100
+++ kdelibs-4.1.82.kde149705/kdeui/kernel/kglobalsettings.cpp	2008-12-09 14:17:51.000000000 +0100
@@ -831,7 +831,7 @@
     if (kde_overrideStyle.isEmpty()) {
         const QString &defaultStyle = KStyle::defaultStyle();
         const KConfigGroup pConfig(KGlobal::config(), "General");
-        const QString &styleStr = pConfig.readEntry("widgetStyle", defaultStyle);
+        const QString &styleStr = pConfig.readEntry("widgetStyle4", pConfig.readEntry("widgetStyle", defaultStyle));
 
         if (styleStr.isEmpty() ||
                 // check whether we already use the correct style to return then
diff -Naurw kdelibs-4.1.82/kutils/kdeglobals.kcfg kdelibs-4.1.82.kde149705/kutils/kdeglobals.kcfg
--- kdelibs-4.1.82/kutils/kdeglobals.kcfg	2008-05-21 13:08:56.000000000 +0200
+++ kdelibs-4.1.82.kde149705/kutils/kdeglobals.kcfg	2008-12-09 14:15:14.000000000 +0100
@@ -24,6 +24,10 @@
    <whatsthis>The name of the widget style, for example &quot;keramik&quot; or &quot;plastik&quot;. Without quotes.</whatsthis>
    <default>keramik</default>
   </entry>
+  <entry key="widgetStyle4" type="String" >
+   <label>Widget style to use for KDE 4</label>
+   <whatsthis>The name of the widget style, for example &quot;oxygen&quot;. Without quotes. Defaults to widgetStyle.</whatsthis>
+  </entry>
   <entry key="windowBackground" type="String" />
   <entry key="windowForeground" type="String" />
   <entry key="UseSystemBell" type="Bool" >

kdelibs-4.1.96-AllowExternalPaths.patch:

--- NEW FILE kdelibs-4.1.96-AllowExternalPaths.patch ---
diff -up kdelibs-4.1.96/plasma/package.cpp.orig kdelibs-4.1.96/plasma/package.cpp
--- kdelibs-4.1.96/plasma/package.cpp.orig	2009-01-06 18:27:56.000000000 +0100
+++ kdelibs-4.1.96/plasma/package.cpp	2009-01-16 14:42:39.000000000 +0100
@@ -139,6 +139,10 @@ QString Package::filePath(const char *fi
     }
 
     if (QFile::exists(path)) {
+        if (d->structure->allowExternalPaths()) {
+            return path;
+        }
+
         // ensure that we don't return files outside of our base path
         // due to symlink or ../ games
         QDir dir(path);
@@ -171,6 +175,10 @@ QStringList Package::entryList(const cha
     QDir dir(d->basePath + d->structure->contentsPrefix() + path);
 
     if (dir.exists()) {
+        if (d->structure->allowExternalPaths()) {
+            return dir.entryList(QDir::Files | QDir::Readable);
+        }
+
         // ensure that we don't return files outside of our base path
         // due to symlink or ../ games
         QString canonicalized = dir.canonicalPath();
diff -up kdelibs-4.1.96/plasma/packagestructure.cpp.orig kdelibs-4.1.96/plasma/packagestructure.cpp
--- kdelibs-4.1.96/plasma/packagestructure.cpp.orig	2009-01-16 14:41:56.000000000 +0100
+++ kdelibs-4.1.96/plasma/packagestructure.cpp	2009-01-16 14:42:39.000000000 +0100
@@ -58,17 +58,19 @@ class ContentStructure
         QString path;
         QString name;
         QStringList mimetypes;
-        bool directory;
-        bool required;
+        bool directory : 1;
+        bool required : 1;
 };
 
 class PackageStructurePrivate
 {
 public:
     PackageStructurePrivate()
-        : metadata(0)
+        : metadata(0),
+          externalPaths(false)
     {
     }
+
     ~PackageStructurePrivate()
     {
         delete metadata;
@@ -76,6 +78,8 @@ public:
 
     void createPackageMetadata(const QString &path);
 
+    static QHash<QString, PackageStructure::Ptr> structures;
+
     QString type;
     QString path;
     QString contentsPrefix;
@@ -83,8 +87,8 @@ public:
     QString servicePrefix;
     QMap<QByteArray, ContentStructure> contents;
     QStringList mimetypes;
-    static QHash<QString, PackageStructure::Ptr> structures;
     PackageMetadata *metadata;
+    bool externalPaths;
  };
 
 QHash<QString, PackageStructure::Ptr> PackageStructurePrivate::structures;
@@ -487,6 +491,16 @@ PackageMetadata PackageStructure::metada
     return *d->metadata;
 }
 
+bool PackageStructure::allowExternalPaths() const
+{
+    return d->externalPaths;
+}
+
+void PackageStructure::setAllowExternalPaths(bool allow)
+{
+    d->externalPaths = allow;
+}
+
 } // Plasma namespace
 
 #include "packagestructure.moc"
diff -up kdelibs-4.1.96/plasma/packagestructure.h.orig kdelibs-4.1.96/plasma/packagestructure.h
--- kdelibs-4.1.96/plasma/packagestructure.h.orig	2009-01-16 14:19:12.000000000 +0100
+++ kdelibs-4.1.96/plasma/packagestructure.h	2009-01-16 14:42:39.000000000 +0100
@@ -278,6 +278,12 @@ public:
       */
     virtual PackageMetadata metadata();
 
+    /**
+     * @return true if paths/symlinks outside the package itself should be followed.
+     * By default this is set to false for security reasons.
+     */
+    bool allowExternalPaths() const;
+
 Q_SIGNALS:
     /**
      * Emitted when the new widget browser process completes.
@@ -286,6 +292,13 @@ Q_SIGNALS:
 
 protected:
     /**
+     * Sets whether or not external paths/symlinks can be followed by a package
+     * @arg allow true if paths/symlinks outside of the package should be followed,
+     *             false if they should be rejected.
+     */
+    void setAllowExternalPaths(bool allow);
+
+    /**
      * Sets the prefix that all the contents in this package should
      * appear under. This defaults to "contents/" and is added automatically
      * between the base path and the entries as defined by the package

kdelibs-4.1.96-cmake.patch:

--- NEW FILE kdelibs-4.1.96-cmake.patch ---
diff -up kdelibs-4.1.96/cmake/modules/FindKdepimLibs.cmake.orig kdelibs-4.1.96/cmake/modules/FindKdepimLibs.cmake
--- kdelibs-4.1.96/cmake/modules/FindKdepimLibs.cmake.orig	2009-01-08 22:14:13.000000000 +0100
+++ kdelibs-4.1.96/cmake/modules/FindKdepimLibs.cmake	2009-01-08 22:14:59.000000000 +0100
@@ -64,9 +64,13 @@
 # See kdepimlibs/CMakeLists.txt and kdepimlibs/KdepimLibsConfig.cmake.in 
 # for details. Alex
 
-
+set(KDEPIMLIBS_VERSION 4.2.0)
+set(_KdepimLibsConfig_INSTALL_DIR ${LIB_INSTALL_DIR}/KdepimLibs-${KDEPIMLIBS_VERSION}/cmake)
+if(KDE4_USE_COMMON_CMAKE_PACKAGE_CONFIG_DIR)
+   set(_KdepimLibsConfig_INSTALL_DIR ${LIB_INSTALL_DIR}/cmake/KdepimLibs-${KDEPIMLIBS_VERSION} )
+endif(KDE4_USE_COMMON_CMAKE_PACKAGE_CONFIG_DIR)
 set(_KdepimLibs_FIND_QUIETLY  ${KdepimLibs_FIND_QUIETLY})
-find_package(KdepimLibs ${KdepimLibs_FIND_VERSION} QUIET NO_MODULE PATHS ${KDE4_LIB_DIR}/KdepimLibs/cmake )
+find_package(KdepimLibs ${KdepimLibs_FIND_VERSION} QUIET NO_MODULE PATHS ${_KdepimLibsConfig_INSTALL_DIR} )
 set(KdepimLibs_FIND_QUIETLY ${_KdepimLibs_FIND_QUIETLY})
 
 include(FindPackageHandleStandardArgs)
diff -up kdelibs-4.1.96/cmake/modules/FindKDE4Workspace.cmake.orig kdelibs-4.1.96/cmake/modules/FindKDE4Workspace.cmake
--- kdelibs-4.1.96/cmake/modules/FindKDE4Workspace.cmake.orig	2009-01-10 21:53:41.000000000 +0100
+++ kdelibs-4.1.96/cmake/modules/FindKDE4Workspace.cmake	2009-01-10 21:54:03.000000000 +0100
@@ -62,8 +62,14 @@
 # for details. Alex
 
 
+set(KDE4WORKSPACE_VERSION 4.2.0)
+set(_KdeWorkspaceConfig_INSTALL_DIR ${LIB_INSTALL_DIR}/KDE4Workspace-${KDE4WORKSPACE_VERSION}/cmake)
+if(KDE4_USE_COMMON_CMAKE_PACKAGE_CONFIG_DIR)
+   set(_KdeWorkspaceConfig_INSTALL_DIR ${LIB_INSTALL_DIR}/cmake/KDE4Workspace-${KDE4WORKSPACE_VERSION} )
+endif(KDE4_USE_COMMON_CMAKE_PACKAGE_CONFIG_DIR)
+
 set(_KDE4Workspace_FIND_QUIETLY  ${KDE4Workspace_FIND_QUIETLY})
-find_package(KDE4Workspace QUIET NO_MODULE PATHS ${KDE4_LIB_DIR}/KDE4Workspace/cmake )
+find_package(KDE4Workspace QUIET NO_MODULE PATHS ${_KdeWorkspaceConfig_INSTALL_DIR} )
 set(KDE4Workspace_FIND_QUIETLY ${_KDE4Workspace_FIND_QUIETLY})
 
 include(FindPackageHandleStandardArgs)

kdelibs-4.1.96-parallel_devel.patch:

--- NEW FILE kdelibs-4.1.96-parallel_devel.patch ---
diff -up kdelibs-4.1.96/cmake/modules/FindKDE4Internal.cmake.parallel_devel kdelibs-4.1.96/cmake/modules/FindKDE4Internal.cmake
--- kdelibs-4.1.96/cmake/modules/FindKDE4Internal.cmake.parallel_devel	2009-01-07 01:13:55.000000000 +0100
+++ kdelibs-4.1.96/cmake/modules/FindKDE4Internal.cmake	2009-01-07 22:42:22.000000000 +0100
@@ -15,10 +15,10 @@
 # The following variables are defined for the various tools required to
 # compile KDE software:
 #
-#  KDE4_KCFGC_EXECUTABLE    - the kconfig_compiler executable
+#  KDE4_KCFGC_EXECUTABLE    - the kconfig_compiler4 executable
 #  KDE4_AUTOMOC_EXECUTABLE  - the kde4automoc executable, deprecated, use AUTOMOC4_EXECUTABLE instead
 #  KDE4_MEINPROC_EXECUTABLE - the meinproc4 executable
-#  KDE4_MAKEKDEWIDGETS_EXECUTABLE - the makekdewidgets executable
+#  KDE4_MAKEKDEWIDGETS_EXECUTABLE - the makekdewidgets4 executable
 #
 # The following variables point to the location of the KDE libraries,
 # but shouldn't be used directly:
@@ -131,7 +131,7 @@
 #    Use optional GENERATE_MOC to generate moc if you use signals in your kcfg files.
 #
 #  KDE4_ADD_WIDGET_FILES (SRCS_VAR file1.widgets ... fileN.widgets)
-#    Use this to add widget description files for the makekdewidgets code generator
+#    Use this to add widget description files for the makekdewidgets4 code generator
 #    for Qt Designer plugins.
 #
 #  KDE4_CREATE_FINAL_FILES (filename_CXX filename_C file1 ... fileN)
@@ -370,23 +370,23 @@ if (_kdeBootStrapping)
    if (WIN32)
       set(LIBRARY_OUTPUT_PATH            ${EXECUTABLE_OUTPUT_PATH} )
       # CMAKE_CFG_INTDIR is the output subdirectory created e.g. by XCode and MSVC
-      set(KDE4_KCFGC_EXECUTABLE          ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/kconfig_compiler )
+      set(KDE4_KCFGC_EXECUTABLE          ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/kconfig_compiler4 )
 
       set(KDE4_MEINPROC_EXECUTABLE       ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/meinproc4 )
-      set(KDE4_MAKEKDEWIDGETS_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/makekdewidgets )
+      set(KDE4_MAKEKDEWIDGETS_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/makekdewidgets4 )
    else (WIN32)
       set(LIBRARY_OUTPUT_PATH            ${CMAKE_BINARY_DIR}/lib )
-      set(KDE4_KCFGC_EXECUTABLE          ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/kconfig_compiler.shell )
+      set(KDE4_KCFGC_EXECUTABLE          ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/kconfig_compiler4.shell )
 
       set(KDE4_MEINPROC_EXECUTABLE       ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/meinproc4.shell )
-      set(KDE4_MAKEKDEWIDGETS_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/makekdewidgets.shell )
+      set(KDE4_MAKEKDEWIDGETS_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/makekdewidgets4.shell )
    endif (WIN32)
 
    set(KDE4_LIB_DIR ${LIBRARY_OUTPUT_PATH}/${CMAKE_CFG_INTDIR})
 
    # when building kdelibs, make the kcfg rules depend on the binaries...
-   set( _KDE4_KCONFIG_COMPILER_DEP kconfig_compiler)
-   set( _KDE4_MAKEKDEWIDGETS_DEP makekdewidgets)
+   set( _KDE4_KCONFIG_COMPILER_DEP kconfig_compiler4)
+   set( _KDE4_MAKEKDEWIDGETS_DEP makekdewidgets4)
    set( _KDE4_MEINPROC_EXECUTABLE_DEP meinproc4)
 
    set(KDE4_INSTALLED_VERSION_OK TRUE)
@@ -488,7 +488,8 @@ else (_kdeBootStrapping)
 
    # KDE4_LIB_INSTALL_DIR and KDE4_INCLUDE_INSTALL_DIR are set in KDELibsDependencies.cmake,
    # use them to set the KDE4_LIB_DIR and KDE4_INCLUDE_DIR "public interface" variables
-   set(KDE4_LIB_DIR ${KDE4_LIB_INSTALL_DIR} )
+   set(KDE4_LIB_DIR ${KDE4_LIB_INSTALL_DIR}/kde4/devel )
+   link_directories("${KDE4_LIB_DIR}")
    set(KDE4_INCLUDE_DIR ${KDE4_INCLUDE_INSTALL_DIR} )
 
 
@@ -501,12 +502,12 @@ else (_kdeBootStrapping)
 
    # get the build CONFIGURATIONS which were exported in this file, and use just the first
    # of them to get the location of the installed executables
-   get_target_property(_importedConfigurations  ${KDE4_TARGET_PREFIX}kconfig_compiler IMPORTED_CONFIGURATIONS )
+   get_target_property(_importedConfigurations  ${KDE4_TARGET_PREFIX}kconfig_compiler4 IMPORTED_CONFIGURATIONS )
    list(GET _importedConfigurations 0 _firstConfig)
 
-   get_target_property(KDE4_KCFGC_EXECUTABLE          ${KDE4_TARGET_PREFIX}kconfig_compiler LOCATION_${firstConfig})
+   get_target_property(KDE4_KCFGC_EXECUTABLE          ${KDE4_TARGET_PREFIX}kconfig_compiler4 LOCATION_${firstConfig})
    get_target_property(KDE4_MEINPROC_EXECUTABLE       ${KDE4_TARGET_PREFIX}meinproc4        LOCATION_${firstConfig})
-   get_target_property(KDE4_MAKEKDEWIDGETS_EXECUTABLE ${KDE4_TARGET_PREFIX}makekdewidgets   LOCATION_${firstConfig})
+   get_target_property(KDE4_MAKEKDEWIDGETS_EXECUTABLE ${KDE4_TARGET_PREFIX}makekdewidgets4   LOCATION_${firstConfig})
 
    # allow searching cmake modules in all given kde install locations (KDEDIRS based)
    execute_process(COMMAND "${KDE4_KDECONFIG_EXECUTABLE}" --path data OUTPUT_VARIABLE _data_DIR ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE)
@@ -738,7 +739,8 @@ set(CMAKE_SYSTEM_INCLUDE_PATH ${CMAKE_SY
 set(CMAKE_SYSTEM_PROGRAM_PATH ${CMAKE_SYSTEM_PROGRAM_PATH}
                               "${KDE4_BIN_INSTALL_DIR}" )
 
-set(CMAKE_SYSTEM_LIBRARY_PATH ${CMAKE_SYSTEM_LIBRARY_PATH} 
+set(CMAKE_SYSTEM_LIBRARY_PATH "${KDE4_LIB_INSTALL_DIR}/kde4/devel"
+                              ${CMAKE_SYSTEM_LIBRARY_PATH}
                               "${KDE4_LIB_INSTALL_DIR}" )
 
 # under Windows dlls may be also installed in bin/
@@ -1121,9 +1123,9 @@ macro (KDE4_PRINT_RESULTS)
    endif (NOT _kdeBootStrapping)
 
    if(KDE4_KCFGC_EXECUTABLE)
-      message(STATUS "Found the KDE4 kconfig_compiler preprocessor: ${KDE4_KCFGC_EXECUTABLE}")
+      message(STATUS "Found the KDE4 kconfig_compiler4 preprocessor: ${KDE4_KCFGC_EXECUTABLE}")
    else(KDE4_KCFGC_EXECUTABLE)
-      message(STATUS "Didn't find the KDE4 kconfig_compiler preprocessor")
+      message(STATUS "Didn't find the KDE4 kconfig_compiler4 preprocessor")
    endif(KDE4_KCFGC_EXECUTABLE)
 
    if(AUTOMOC4_EXECUTABLE)
@@ -1142,7 +1145,7 @@ if (KDE4Internal_FIND_REQUIRED AND NOT K
    endif (NOT KDE4_INSTALLED_VERSION_OK)
 
    if (NOT KDE4_KCFGC_EXECUTABLE)
-     message(FATAL_ERROR "ERROR: could not detect a usable kconfig_compiler")
+     message(FATAL_ERROR "ERROR: could not detect a usable kconfig_compiler4")
    endif (NOT KDE4_KCFGC_EXECUTABLE)
 
    message(FATAL_ERROR "ERROR: could NOT find everything required for compiling KDE 4 programs")
diff -up kdelibs-4.1.96/doc/api/doxygen-preprocess-kcfg.sh.parallel_devel kdelibs-4.1.96/doc/api/doxygen-preprocess-kcfg.sh
--- kdelibs-4.1.96/doc/api/doxygen-preprocess-kcfg.sh.parallel_devel	2008-05-21 13:07:26.000000000 +0200
+++ kdelibs-4.1.96/doc/api/doxygen-preprocess-kcfg.sh	2009-01-07 22:04:13.000000000 +0100
@@ -2,9 +2,9 @@
 # Generates and cleans KConfigXT source code during a API dox build
 #
 
-kcfg_compiler="`kde4-config --prefix`/bin/kconfig_compiler"
+kcfg_compiler="`kde4-config --prefix`/bin/kconfig_compiler4"
 if test -z "$kcfg_compiler"; then
-	echo "kconfig_compiler not found!"
+	echo "kconfig_compiler4 not found!"
 	exit 1;
 fi
 
diff -up kdelibs-4.1.96/kdecore/kconfig_compiler/checkkcfg.pl.parallel_devel kdelibs-4.1.96/kdecore/kconfig_compiler/checkkcfg.pl
--- kdelibs-4.1.96/kdecore/kconfig_compiler/checkkcfg.pl.parallel_devel	2008-05-21 13:09:13.000000000 +0200
+++ kdelibs-4.1.96/kdecore/kconfig_compiler/checkkcfg.pl	2009-01-07 22:04:13.000000000 +0100
@@ -15,12 +15,12 @@ $file_cpp = "$filebase.cpp";
 
 $kcfgc = $file . "c";
 
-$cmd = "./kconfig_compiler $file $kcfgc";
+$cmd = "./kconfig_compiler4 $file $kcfgc";
 
 #print "CMD $cmd\n";
 
 if ( system( $cmd ) != 0 ) {
-  print STDERR "Unable to run kconfig_compiler\n";
+  print STDERR "Unable to run kconfig_compiler4\n";
   exit 1;
 }
 
diff -up kdelibs-4.1.96/kdecore/kconfig_compiler/CMakeLists.txt.parallel_devel kdelibs-4.1.96/kdecore/kconfig_compiler/CMakeLists.txt
--- kdelibs-4.1.96/kdecore/kconfig_compiler/CMakeLists.txt.parallel_devel	2009-01-06 18:27:49.000000000 +0100
+++ kdelibs-4.1.96/kdecore/kconfig_compiler/CMakeLists.txt	2009-01-07 22:44:57.000000000 +0100
@@ -8,13 +8,13 @@ add_subdirectory( example )
 set(kconfig_compiler_SRCS kconfig_compiler.cpp)
 
 
-kde4_add_executable(kconfig_compiler NOGUI RUN_UNINSTALLED ${kconfig_compiler_SRCS})
+kde4_add_executable(kconfig_compiler4 NOGUI RUN_UNINSTALLED ${kconfig_compiler_SRCS})
 
-target_link_libraries(kconfig_compiler  ${QT_QTCORE_LIBRARY} ${QT_QTXML_LIBRARY} )
+target_link_libraries(kconfig_compiler4  ${QT_QTCORE_LIBRARY} ${QT_QTXML_LIBRARY} )
 
 # "export" this target too so we can use the LOCATION property of the imported target in
 # FindKDE4Internal.cmake to get the full path to the installed executable instead of using FIND_PROGRAM(), Alex
-install(TARGETS kconfig_compiler EXPORT kdelibsToolsTargets ${INSTALL_TARGETS_DEFAULT_ARGS} )
+install(TARGETS kconfig_compiler4 EXPORT kdelibsToolsTargets ${INSTALL_TARGETS_DEFAULT_ARGS} )
 
 
 ########### install files ###############
diff -up kdelibs-4.1.96/kdeui/tests/kconfig_compiler/CMakeLists.txt.parallel_devel kdelibs-4.1.96/kdeui/tests/kconfig_compiler/CMakeLists.txt
--- kdelibs-4.1.96/kdeui/tests/kconfig_compiler/CMakeLists.txt.parallel_devel	2008-05-21 13:08:30.000000000 +0200
+++ kdelibs-4.1.96/kdeui/tests/kconfig_compiler/CMakeLists.txt	2009-01-07 22:04:13.000000000 +0100
@@ -9,7 +9,7 @@ macro(GEN_KCFG_TEST_SOURCE _testName _sr
    add_custom_command(
       OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${_testName}.cpp ${CMAKE_CURRENT_BINARY_DIR}/${_testName}.h
       COMMAND ${KDE4_KCFGC_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/${_testName}.kcfg ${CMAKE_CURRENT_SOURCE_DIR}/${_testName}.kcfgc
-      DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_testName}.kcfg ${CMAKE_CURRENT_SOURCE_DIR}/${_testName}.kcfgc kconfig_compiler)
+      DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_testName}.kcfg ${CMAKE_CURRENT_SOURCE_DIR}/${_testName}.kcfgc kconfig_compiler4)
 
 #   set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/${_testName}.h PROPERTIES GENERATED TRUE)
    qt4_generate_moc(${CMAKE_CURRENT_BINARY_DIR}/${_testName}.h ${CMAKE_CURRENT_BINARY_DIR}/${_testName}.moc )
diff -up kdelibs-4.1.96/kdewidgets/CMakeLists.txt.parallel_devel kdelibs-4.1.96/kdewidgets/CMakeLists.txt
--- kdelibs-4.1.96/kdewidgets/CMakeLists.txt.parallel_devel	2009-01-06 18:27:44.000000000 +0100
+++ kdelibs-4.1.96/kdewidgets/CMakeLists.txt	2009-01-07 22:46:30.000000000 +0100
@@ -14,24 +14,24 @@ include_directories( 
 set(makekdewidgets_SRCS makekdewidgets.cpp )
 
 
-kde4_add_executable(makekdewidgets NOGUI RUN_UNINSTALLED ${makekdewidgets_SRCS})
+kde4_add_executable(makekdewidgets4 NOGUI RUN_UNINSTALLED ${makekdewidgets_SRCS})
 
-target_link_libraries(makekdewidgets  ${KDE4_KDECORE_LIBS} )
+target_link_libraries(makekdewidgets4  ${KDE4_KDECORE_LIBS} )
 
 # "export" this target too so we can use the LOCATION property of the imported target in
 # FindKDE4Internal.cmake to get the full path to the installed executable instead of using FIND_PROGRAM(), Alex
-install(TARGETS makekdewidgets  EXPORT kdelibsToolsTargets ${INSTALL_TARGETS_DEFAULT_ARGS} )
+install(TARGETS makekdewidgets4  EXPORT kdelibsToolsTargets ${INSTALL_TARGETS_DEFAULT_ARGS} )
 
 
 ########### next target ###############
 
 
 # get the name of the generated wrapper script (which sets up LD_LIBRARY_PATH)
-get_target_property(MAKEKDEWIDGETS_EXECUTABLE makekdewidgets WRAPPER_SCRIPT)
+get_target_property(MAKEKDEWIDGETS_EXECUTABLE makekdewidgets4 WRAPPER_SCRIPT)
 
 add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/kdewidgets.cpp
   COMMAND "${MAKEKDEWIDGETS_EXECUTABLE}" -o ${CMAKE_CURRENT_BINARY_DIR}/kdewidgets.cpp ${CMAKE_CURRENT_SOURCE_DIR}/kde.widgets
-  MAIN_DEPENDENCY kde.widgets DEPENDS makekdewidgets)
+  MAIN_DEPENDENCY kde.widgets DEPENDS makekdewidgets4)
 
 set(kdewidgets_PART_SRCS
    classpreviews.cpp


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdelibs/F-9/.cvsignore,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- .cvsignore	7 Jan 2009 12:29:00 -0000	1.55
+++ .cvsignore	26 Jan 2009 10:39:58 -0000	1.56
@@ -1 +0,0 @@
-kdelibs-4.1.4.tar.bz2


Index: kde4.csh
===================================================================
RCS file: /cvs/extras/rpms/kdelibs/F-9/kde4.csh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- kde4.csh	1 Dec 2007 19:43:21 -0000	1.2
+++ kde4.csh	26 Jan 2009 10:39:58 -0000	1.3
@@ -10,9 +10,16 @@
    if ( "$PRELINKING" == "yes" )  then
      if ( ! $?KDE_IS_PRELINKED ) setenv KDE_IS_PRELINKED 1
    endif
+   unset PRELINKING
 endif
 
-if ( ! $?QT_PLUGIN_PATH ) then
-  set KDE4_LIBDIR = `/bin/rpm --eval %\{\?_kde4_libdir\}%\{\!\?_kde4_libdir:%\{_libdir\}\}`
-  setenv QT_PLUGIN_PATH ${KDE4_LIBDIR}/kde4/plugins
+# handled in startkde, but this sets for other DE's too
+set KDE4_QTPLUGINS=`kde4-config --path qtplugins`
+if ( $?QT_PLUGIN_PATH ) then
+  if ( "$QT_PLUGIN_PATH" !~ *"${KDE4_QTPLUGINS}"* ) then
+    setenv QT_PLUGIN_PATH ${QT_PLUGIN_PATH}:${KDE4_QTPLUGINS}
+  endif 
+else
+  setenv QT_PLUGIN_PATH ${KDE4_QTPLUGINS} 
 endif
+unset KDE4_QTPLUGINS


Index: kde4.sh
===================================================================
RCS file: /cvs/extras/rpms/kdelibs/F-9/kde4.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- kde4.sh	1 Dec 2007 19:43:21 -0000	1.2
+++ kde4.sh	26 Jan 2009 10:39:58 -0000	1.3
@@ -5,13 +5,19 @@
 [ -z "$KDEDIRS" ] && KDEDIRS="/usr" && export KDEDIRS
 
 ## When/if using prelinking, avoids (some) use of kdeinit
-if [ -f /etc/sysconfig/prelink ]; then
-  if [ `grep '^PRELINKING=yes' /etc/sysconfig/prelink` ] ; then
-    [ -z "$KDE_IS_PRELINKED" ] && KDE_IS_PRELINKED=1 && export KDE_IS_PRELINKED
-  fi
+if [ -z "$KDE_IS_PRELINKED" ] ; then
+  grep -qs '^PRELINKING=yes' /etc/sysconfig/prelink && \
+  KDE_IS_PRELINKED=1 && export KDE_IS_PRELINKED
 fi
 
-if [ -z "$QT_PLUGIN_PATH" ]; then
-  KDE4_LIBDIR=`/bin/rpm --eval '%{?_kde4_libdir}%{!?_kde4_libdir:%{_libdir}}' 2>/dev/null`
-  QT_PLUGIN_PATH=${KDE4_LIBDIR}/kde4/plugins && export QT_PLUGIN_PATH
+
+# handled in startkde, but this sets for other DE's too
+if [ -n "$QT_PLUGIN_PATH" ] ; then
+  if ! echo "$QT_PLUGIN_PATH" | grep -qw `kde4-config --path qtplugins` ; then
+    QT_PLUGIN_PATH="$QT_PLUGIN_PATH:`kde4-config --path qtplugins`"
+  fi
+else
+  QT_PLUGIN_PATH="`kde4-config --path qtplugins`"
 fi
+export QT_PLUGIN_PATH
+


Index: kdelibs.spec
===================================================================
RCS file: /cvs/extras/rpms/kdelibs/F-9/kdelibs.spec,v
retrieving revision 1.373
retrieving revision 1.374
diff -u -r1.373 -r1.374
--- kdelibs.spec	8 Jan 2009 05:00:15 -0000	1.373
+++ kdelibs.spec	26 Jan 2009 10:39:58 -0000	1.374
@@ -1,8 +1,6 @@
-%define _default_patch_fuzz 2
-
 Summary: K Desktop Environment 4 - Libraries
-Version: 4.1.4
-Release: 2%{?dist}
+Version: 4.2.0
+Release: 1%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs
@@ -29,13 +27,14 @@
 %endif
 
 BuildRequires: kde4-macros(api) >= 2
-BuildRequires: kde-filesystem >= 4
+BuildRequires: kde-filesystem >= 4-23
+# used in kde.(sh|csh)
+Requires: coreutils grep
+# dbus-launch needed here? don't think so, but be safe and keep 
+# for now -- Rex
 Requires: dbus-x11
 Requires: hicolor-icon-theme
-# kdebase-runtime not *strictly* required here, but how better to pull
-# it in?  comps only?
-#Requires: kdebase-runtime
-Requires: kde-filesystem >= 4
+Requires: kde-filesystem >= 4-23
 Requires: kde-settings
 %{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
 Requires: shared-mime-info
@@ -45,15 +44,16 @@
 %if 0%{?fedora} >= 9
 Requires: hunspell
 %endif
-Requires: soprano >= 2.1
+Requires: phonon >= 4.2.96
+Requires: soprano >= 2.1.64
 
 Source1: kde4.sh
 Source2: kde4.csh
 
 # make -devel packages parallel-installable
-Patch0: kdelibs-4.1.0-parallel_devel.patch
+Patch0: kdelibs-4.1.96-parallel_devel.patch
 # fix kde#149705
-Patch2: kdelibs-3.95.0-kde149705.patch
+Patch2: kdelibs-4.1.82-kde149705.patch
 # Hunspell support for K3Spell
 # http://fedoraproject.org/wiki/Releases/FeatureDictionary
 # http://bugs.kde.org/show_bug.cgi?id=154561
@@ -67,20 +67,23 @@
 Patch9: kdelibs-4.0.2-branding.patch
 # don't cache kdeglobals paths because they change after profile directories
 # are loaded from kde4rc
-Patch10: kdelibs-4.0.2-no-cache-kdeglobals-paths.patch
-# workarounds for policykit and NTFS
-Patch11: kdelibs-4.1.4-policykit-workaround.patch
+Patch10: kdelibs-4.1.72-no-cache-kdeglobals-paths.patch
+# workaround for policykit
+Patch11: kdelibs-4.1.72-policykit-workaround.patch
 Patch12: kdelibs-4.1.0-xdg-menu.patch
 # patch KStandardDirs to use %{_libexecdir}/kde4 instead of %{_libdir}/kde4/libexec
 Patch14: kdelibs-4.0.85-libexecdir.patch
 # kstandarddirs changes: search /etc/kde, find /usr/libexec/kde4
-Patch18: kdelibs-4.1.0-kstandarddirs.patch
-Patch20: kdelibs-4.1.1-cmake.patch
-
-## upstream patches
+Patch18: kdelibs-4.1.72-kstandarddirs.patch
+Patch20: kdelibs-4.1.70-cmake.patch
+Patch22: kdelibs-4.1.96-cmake.patch
+
+# upstream
+# 4.3 branch
+Patch101: kdelibs-4.1.96-AllowExternalPaths.patch
 
 BuildRequires: qt4-devel >= 4.4.0
-Requires: qt4 >= %{_qt4_version} 
+Requires: qt4 >= %{_qt4_version}
 Requires: xdg-utils
 Requires(post): /sbin/ldconfig xdg-utils
 Requires(postun): /sbin/ldconfig xdg-utils
@@ -93,7 +96,7 @@
 BuildRequires: automoc
 BuildRequires: avahi-devel
 BuildRequires: bzip2-devel
-BuildRequires: cmake
+BuildRequires: cmake >= 2.6.2-3
 BuildRequires: cups-devel cups
 BuildRequires: enchant-devel
 BuildRequires: gamin-devel
@@ -111,15 +114,13 @@
 BuildRequires: OpenEXR-devel
 BuildRequires: openssl-devel
 BuildRequires: pcre-devel
-# work around circular dependency from phonon-devel pulling in phonon-backend-xine
-BuildRequires: phonon-backend-gstreamer
-BuildRequires: phonon-devel >= 4.2
+BuildRequires: phonon-devel >= 4.2.96
 BuildRequires: shared-mime-info
-BuildRequires: soprano-devel >= 2.1
-BuildRequires: strigi-devel >= 0.5.7
+BuildRequires: soprano-devel >= 2.1.64
+BuildRequires: strigi-devel >= 0.6.3
 BuildRequires: zlib-devel
 BuildRequires: libutempter-devel
-# extra X deps (seemingly needed and/or checked-for by most kde4 buildscripts) 
+# extra X deps (seemingly needed and/or checked-for by most kde4 buildscripts)
 %define x_deps libXcomposite-devel libXdamage-devel libxkbfile-devel libXpm-devel libXScrnSaver-devel libXtst-devel libXv-devel libXxf86misc-devel
 %{?x_deps:BuildRequires: %{x_deps}}
 BuildRequires: openssh-clients
@@ -145,16 +146,18 @@
 %package devel
 Group: Development/Libraries
 Summary: Header files for compiling KDE 4 applications
+Provides: plasma-devel = %{version}-%{release}
 Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
 %if "%{name}" != "kdelibs4"
 Obsoletes: kdelibs4-devel < %{version}-%{release}
 Provides:  kdelibs4-devel = %{version}-%{release}
 %endif
+Requires: cmake >= 2.6.2-3
 Requires: automoc
 Requires: qt4-devel
 Requires: openssl-devel
-Requires: phonon-devel >= 4.2
-Requires: strigi-devel
+Requires: phonon-devel >= 4.2.96
+Requires: strigi-devel >= 0.6.3
 Requires: bzip2-devel gamin-devel libacl-devel zlib-devel libutempter-devel
 %{?x_deps:Requires: %{x_deps}}
 %description devel
@@ -196,18 +199,20 @@
 %patch9 -p1 -b .branding
 sed -i -e "s|@@VERSION_RELEASE@@|%{version}-%{release}|" kio/kio/kprotocolmanager.cpp
 %patch10 -p1 -b .no-cache-kdeglobals-paths
-%patch11 -p1 -b .policykit
+#%patch11 -p1 -b .policykit
 %patch12 -p1 -b .Administration-menu
 %patch14 -p1 -b .libexecdir
 %patch18 -p1 -b .kstandarddirs
-%patch20 -p1 -b .cmake
-
-## upstream patches
+%patch20 -p1 -b .xxcmake
+%patch22 -p1 -b .kdepimlibs-cmake
 
+# upstream patches
+%patch101 -p1 -b .AllowExternalPaths
 
 %build
+
 mkdir -p %{_target_platform}
-pushd %{_target_platform} 
+pushd %{_target_platform}
 %{cmake_kde4} -DKDE_DISTRIBUTION_TEXT="%{version}-%{release} Fedora" ..
 popd
 
@@ -226,7 +231,7 @@
 rm -rf %{buildroot}
 
 %if 0%{?rest}
-make install DESTDIR=%{buildroot} -C %{_target_platform}
+make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
 # see also use-of/patching of XDG_MENU_PREFIX in kdebase/kde-settings
 mv %{buildroot}%{_kde4_sysconfdir}/xdg/menus/applications.menu \
@@ -283,7 +288,7 @@
 xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
 xdg-desktop-menu forceupdate 2> /dev/null || :
 
-%postun 
+%postun
 /sbin/ldconfig ||:
 xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
 xdg-desktop-menu forceupdate 2> /dev/null || :
@@ -313,8 +318,9 @@
 %{_kde4_datadir}/mime/packages/*
 %{_kde4_sharedir}/kde4/services/*
 %{_kde4_sharedir}/kde4/servicetypes/*
-%{_kde4_sharedir}/icons/hicolor/*/actions/presence_*
+%{_kde4_sharedir}/icons/hicolor/*/actions/*
 %{_kde4_docdir}/HTML/en/sonnet/
+%{_kde4_docdir}/HTML/en/kioslave/
 %{_kde4_libdir}/lib*.so.*
 %{_kde4_libdir}/libkdeinit4_*.so
 %dir %{_kde4_libdir}/kde4/
@@ -363,6 +369,9 @@
 
 
 %changelog
+* Mon Jan 26 2009 Luk???? Tinkl <ltinkl at redhat.com> 4.2.0-1
+- KDE 4.2.0
+
 * Thu Jan 08 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.4-2
 - restore AWOL NTFS workaround yet again
 


--- kdelibs-3.95.0-kde149705.patch DELETED ---


--- kdelibs-4.0.2-no-cache-kdeglobals-paths.patch DELETED ---


--- kdelibs-4.1.0-kstandarddirs.patch DELETED ---


--- kdelibs-4.1.0-parallel_devel.patch DELETED ---


--- kdelibs-4.1.1-cmake.patch DELETED ---


--- kdelibs-4.1.4-policykit-workaround.patch DELETED ---



From mildew at fedoraproject.org  Mon Jan 26 10:42:10 2009
From: mildew at fedoraproject.org (=?utf-8?q?Daniel_Kope=C4=8Dek?=)
Date: Mon, 26 Jan 2009 10:42:10 +0000 (UTC)
Subject: rpms/sectool/F-10 sectool.spec,1.24,1.25
Message-ID: <20090126104210.260297010C@cvs1.fedora.phx.redhat.com>

Author: mildew

Update of /cvs/pkgs/rpms/sectool/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25767

Modified Files:
	sectool.spec 
Log Message:
removed showvars.dsc


Index: sectool.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sectool/F-10/sectool.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- sectool.spec	23 Jan 2009 13:33:21 -0000	1.24
+++ sectool.spec	26 Jan 2009 10:41:39 -0000	1.25
@@ -71,6 +71,7 @@
 
 # remove debug stuff
 rm -f $RPM_BUILD_ROOT/%{_datadir}/sectool/tests/showvars.sh
+rm -f $RPM_BUILD_ROOT/%{_sysconfdir}/sectool/tests/00_showvars.dsc
 
 %find_lang %{name}
 
@@ -112,6 +113,9 @@
 
 
 %changelog
+* Mon Jan 26 2009 Daniel Kopecek <dkopecek at redhat.com> - 0.9.2-4
+- removed showvars.dsc
+
 * Fri Jan 23 2009 Daniel Kopecek <dkopecek at redhat.com> - 0.9.2-3
 - removed showvars.sh
 - added dist macro to Release:



From hadess at fedoraproject.org  Mon Jan 26 10:42:57 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Mon, 26 Jan 2009 10:42:57 +0000 (UTC)
Subject: rpms/fprintd/devel .cvsignore, 1.2, 1.3 fprintd.spec, 1.3,
	1.4 sources, 1.2, 1.3 0001-More-cleanups.patch, 1.1,
	NONE 0001-Update-D-Bus-config-file.patch, 1.1, NONE import.log,
	1.1, NONE
Message-ID: <20090126104257.58B0E7010C@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/fprintd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25872

Modified Files:
	.cvsignore fprintd.spec sources 
Removed Files:
	0001-More-cleanups.patch 0001-Update-D-Bus-config-file.patch 
	import.log 
Log Message:
* Mon Jan 26 2009 - Bastien Nocera <bnocera at redhat.com> - 0.1-6.git04fd09cfa
- Update to latest git, fixes some run-time warnings



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fprintd/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	5 Dec 2008 09:48:18 -0000	1.2
+++ .cvsignore	26 Jan 2009 10:42:26 -0000	1.3
@@ -1 +1 @@
-fprintd-0.1-43fe72a2aa.tar.bz2
+fprintd-0.1-04fd09cfa.tar.bz2


Index: fprintd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fprintd/devel/fprintd.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- fprintd.spec	17 Dec 2008 14:37:41 -0000	1.3
+++ fprintd.spec	26 Jan 2009 10:42:27 -0000	1.4
@@ -1,9 +1,9 @@
-%define long_hash  43fe72a2aad91576e16b418cf31fcbe886c1de60
-%define short_hash 43fe72a2aa
+%define long_hash  04fd09cfa88718838e02f4419befc1a0dd4b5a0e
+%define short_hash 04fd09cfa
 
 Name:		fprintd
 Version:	0.1
-Release:	5.git%{short_hash}%{?dist}
+Release:	6.git%{short_hash}%{?dist}
 Summary:	D-Bus service for Fingerprint reader access
 
 Group:		System Environment/Daemons
@@ -16,8 +16,6 @@
 Source0:	fprintd-0.1-%{short_hash}.tar.bz2
 # FIXME remove when we have a newer libfprint
 Patch0:		old-libfprint.patch
-Patch1:		0001-Update-D-Bus-config-file.patch
-Patch2:		0001-More-cleanups.patch
 Url:		http://www.reactivated.net/fprint/wiki/Fprintd
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -60,8 +58,6 @@
 %prep
 %setup -q -n %{name}-%{version}
 %patch0 -p1
-%patch1 -p1
-%patch2 -p1
 
 %build
 %configure --libdir=/%{_lib}/ --enable-gtk-doc --enable-pam
@@ -96,6 +92,9 @@
 %{_datadir}/gtk-doc/html/fprintd
 
 %changelog
+* Mon Jan 26 2009 - Bastien Nocera <bnocera at redhat.com> - 0.1-6.git04fd09cfa
+- Update to latest git, fixes some run-time warnings
+
 * Wed Dec 17 2008 - Bastien Nocera <bnocera at redhat.com> - 0.1-5.git43fe72a2aa
 - Add patch to stop leaking a D-Bus connection on failure
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fprintd/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	5 Dec 2008 09:48:18 -0000	1.2
+++ sources	26 Jan 2009 10:42:27 -0000	1.3
@@ -1 +1 @@
-ac9638a644d35da10a6b327a11ccee2b  fprintd-0.1-43fe72a2aa.tar.bz2
+13a47aec00b7e9f42f524fe5e6a2695b  fprintd-0.1-04fd09cfa.tar.bz2


--- 0001-More-cleanups.patch DELETED ---


--- 0001-Update-D-Bus-config-file.patch DELETED ---


--- import.log DELETED ---



From mildew at fedoraproject.org  Mon Jan 26 10:46:53 2009
From: mildew at fedoraproject.org (=?utf-8?q?Daniel_Kope=C4=8Dek?=)
Date: Mon, 26 Jan 2009 10:46:53 +0000 (UTC)
Subject: rpms/sectool/F-10 sectool.spec,1.25,1.26
Message-ID: <20090126104653.D4AF37010C@cvs1.fedora.phx.redhat.com>

Author: mildew

Update of /cvs/pkgs/rpms/sectool/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26683

Modified Files:
	sectool.spec 
Log Message:
release++


Index: sectool.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sectool/F-10/sectool.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- sectool.spec	26 Jan 2009 10:41:39 -0000	1.25
+++ sectool.spec	26 Jan 2009 10:46:23 -0000	1.26
@@ -1,7 +1,7 @@
 Summary: A security audit system and intrusion detection system
 Name: sectool
 Version: 0.9.2
-Release: 3%{?dist}
+Release: 4%{?dist}
 URL: https://hosted.fedoraproject.org/sectool/wiki/WikiStart
 Source0: %{name}-%{version}.tar.bz2
 Source1: sectool.log



From ltinkl at fedoraproject.org  Mon Jan 26 10:47:56 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Mon, 26 Jan 2009 10:47:56 +0000 (UTC)
Subject: rpms/automoc/F-9 .cvsignore, 1.4, 1.5 automoc.spec, 1.3, 1.4 sources,
	1.4, 1.5
Message-ID: <20090126104756.D459D7010C@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/automoc/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27387

Modified Files:
	.cvsignore automoc.spec sources 
Log Message:
KDE 4.2.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/automoc/F-9/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	26 Jul 2008 01:20:21 -0000	1.4
+++ .cvsignore	26 Jan 2009 10:47:26 -0000	1.5
@@ -1 +0,0 @@
-automoc4-0.9.84.tar.bz2


Index: automoc.spec
===================================================================
RCS file: /cvs/extras/rpms/automoc/F-9/automoc.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- automoc.spec	26 Jul 2008 01:19:10 -0000	1.3
+++ automoc.spec	26 Jan 2009 10:47:26 -0000	1.4
@@ -1,10 +1,10 @@
 #define snaptag .20080527svn811390
-%define beta 0.9.84
-%define beta_tag rc1 
+%define beta 0.9.88
+%define beta_tag rc3
 
 Name:           automoc
 Version:        1.0
-Release:        0.8.%{?beta_tag}%{?dist}
+Release:        0.11.%{?beta_tag}%{?dist}
 Summary:        KDE4 automoc
 Group:          Development/Tools
 License:        BSD
@@ -14,8 +14,10 @@
 
 Provides: automoc4 = %{beta}
 
-Requires:       cmake
-BuildRequires:  cmake qt4-devel kde-filesystem
+Requires:       cmake >= 2.4.5
+BuildRequires:  cmake >= 2.4.5
+BuildRequires:  qt4-devel 
+BuildRequires:  kde-filesystem
 
 %description
 KDE4 automoc
@@ -50,6 +52,8 @@
 
 
 %changelog
+* Mon Jan 26 2009 Luk???? Tinkl <ltinkl at redhat.com> 1.0-0.9.88.rc3
+
 * 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/extras/rpms/automoc/F-9/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	26 Jul 2008 01:20:21 -0000	1.4
+++ sources	26 Jan 2009 10:47:26 -0000	1.5
@@ -1 +1 @@
-6e1167594b8edd0fd2156aad75b4b2b0  automoc4-0.9.84.tar.bz2
+91bf517cb940109180ecd07bc90c69ec  automoc4-0.9.88.tar.bz2



From ltinkl at fedoraproject.org  Mon Jan 26 10:53:25 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Mon, 26 Jan 2009 10:53:25 +0000 (UTC)
Subject: rpms/libmal/F-9 libmal-0.44-64bit.patch, NONE, 1.1 libmal.spec, 1.9,
	1.10 sources, 1.2, 1.3 libmal-0.31-64bit.patch, 1.1,
	NONE libmal-0.31-pi12.patch, 1.1, NONE
Message-ID: <20090126105325.B081C7010C@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/libmal/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28176

Modified Files:
	libmal.spec sources 
Added Files:
	libmal-0.44-64bit.patch 
Removed Files:
	libmal-0.31-64bit.patch libmal-0.31-pi12.patch 
Log Message:
KDE 4.2.0


libmal-0.44-64bit.patch:

--- NEW FILE libmal-0.44-64bit.patch ---
diff -ur libmal-0.44/configure libmal-0.44-64bit/configure
--- libmal-0.44/configure	2007-01-17 00:19:11.000000000 +0100
+++ libmal-0.44-64bit/configure	2009-01-15 00:35:18.000000000 +0100
@@ -19680,7 +19680,7 @@
 PILOT_LIBS="-lpisock"
 
 if test $pilotlibs = no ; then
-    for pilot_libs in $pilot_prefix/lib /usr/lib /usr/local/lib/ \
+    for pilot_libs in $pilot_prefix/lib $libdir /usr/lib /usr/local/lib/ \
         /usr/extra/pilot/lib ; do
         if test -r "$pilot_libs/libpisock.so" ; then
             pilotlibs=yes
diff -ur libmal-0.44/configure.in libmal-0.44-64bit/configure.in
--- libmal-0.44/configure.in	2007-01-07 19:04:48.000000000 +0100
+++ libmal-0.44-64bit/configure.in	2009-01-15 00:34:57.000000000 +0100
@@ -59,7 +59,7 @@
 PILOT_LIBS="-lpisock"
 
 if test $pilotlibs = no ; then
-    for pilot_libs in $pilot_prefix/lib /usr/lib /usr/local/lib/ \
+    for pilot_libs in $pilot_prefix/lib $libdir /usr/lib /usr/local/lib/ \
         /usr/extra/pilot/lib ; do
         if test -r "$pilot_libs/libpisock.so" ; then
             pilotlibs=yes


Index: libmal.spec
===================================================================
RCS file: /cvs/extras/rpms/libmal/F-9/libmal.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- libmal.spec	11 Feb 2008 12:36:54 -0000	1.9
+++ libmal.spec	26 Jan 2009 10:52:55 -0000	1.10
@@ -1,20 +1,16 @@
 
 Summary: A convenience library for malsync
 Name:    libmal
-# NOTE: this isn't the latest version, but is the last version known to 
-# work with kdepim-3.5.x
-Version: 0.31 
-Release: 8%{?dist}
+Version: 0.44
+Release: 1%{?dist}
 
 License: MPLv1.0
-Url: 	 http://jasonday.home.att.net/code/libmal/ 
-Source0: http://jasonday.home.att.net/code/libmal/libmal-%{version}.tar.gz 
+Url: 	 http://jasonday.home.att.net/code/libmal/
+Source0: http://jasonday.home.att.net/code/libmal/libmal-%{version}.tar.gz
 Group:   System Environment/Libraries	
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Patch1: libmal-0.31-64bit.patch
-# pilot-link-0.12 fixes
-Patch2: libmal-0.31-pi12.patch
+Patch1: libmal-0.44-64bit.patch
 
 BuildRequires: pilot-link-devel 
 
@@ -34,7 +30,6 @@
 %setup -q 
 
 %patch1 -p1 -b .64bits
-%patch2 -p1 -b .pi12
 
 
 %build
@@ -66,6 +61,7 @@
 %doc ChangeLog README
 #empties
 #doc AUTHORS NEWS TODO
+%{_bindir}/malsync
 %{_libdir}/lib*.so.*
 
 %files devel
@@ -75,6 +71,12 @@
 
 
 %changelog
+* Thu Jan 15 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 0.44-1
+- update to 0.44 (for kdepim 4.2)
+- drop libmal-0.31-pi12.patch (fixed upstream)
+- rebase 64bit patch
+- package new file %%{_bindir}/malsync
+
 * Fri Feb 08 2008 Rex Dieter <rdieter at fedoraproject.org> 0.31-8 
 - respin (gcc43)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libmal/F-9/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	22 Mar 2006 15:22:43 -0000	1.2
+++ sources	26 Jan 2009 10:52:55 -0000	1.3
@@ -1 +1 @@
-3d1fd0a5ece6de47d55df5829ee8b6a2  libmal-0.31.tar.gz
+826f2334c8eb24f5e170f208581fdffb  libmal-0.44.tar.gz


--- libmal-0.31-64bit.patch DELETED ---


--- libmal-0.31-pi12.patch DELETED ---



From peter at fedoraproject.org  Mon Jan 26 10:55:34 2009
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Mon, 26 Jan 2009 10:55:34 +0000 (UTC)
Subject: rpms/mldonkey/devel import.log, NONE, 1.1 mldonkey-gui.desktop, NONE,
	1.1 mldonkey-initscript.patch, NONE, 1.1 mldonkey.logrotate,
	NONE, 1.1 mldonkey.spec, NONE, 1.1 mldonkey_df_monitor.crond,
	NONE, 1.1 mldonkey_df_monitor.sh, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090126105534.17A8C7010C@cvs1.fedora.phx.redhat.com>

Author: peter

Update of /cvs/pkgs/rpms/mldonkey/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28786/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log mldonkey-gui.desktop mldonkey-initscript.patch 
	mldonkey.logrotate mldonkey.spec mldonkey_df_monitor.crond 
	mldonkey_df_monitor.sh 
Log Message:
Initial import


--- NEW FILE import.log ---
mldonkey-2_9_6-3_fc10:HEAD:mldonkey-2.9.6-3.fc10.src.rpm:1232967277


--- NEW FILE mldonkey-gui.desktop ---
[Desktop Entry]
Name=MlDonkey
Type=Application
GenericName=MlDonkey peer-to-peer client
Exec=mlgui
Icon=mldonkey
Categories=Network;
Encoding=UTF-8

mldonkey-initscript.patch:

--- NEW FILE mldonkey-initscript.patch ---
diff --git a/packages/rpm/mldonkey.init b/packages/rpm/mldonkey.init
index 536a88a..2291a9b 100755
--- a/packages/rpm/mldonkey.init
+++ b/packages/rpm/mldonkey.init
@@ -4,7 +4,7 @@
 #
 # Laurent Culioli <laurent at pschit.net>
 #
-# chkconfig: 2345 90 15
+# chkconfig: - 90 15
 # description: Mldonkey is client to access multiple peer-to-peer network
 # processname: mldonkey
 # config: /etc/sysconfig/mldonkey
@@ -15,6 +15,8 @@
 # Source some options 
 . /etc/sysconfig/mldonkey
 
+[ -z $LOGFILE ] && LOGFILE="/dev/null"
+
 RETVAL=0
 
 # Path to the mldonkey binarie.
@@ -27,17 +29,18 @@ fullpath=/usr/bin/mlnet
 [ ${NETWORKING} = "no" ] && exit 0
 
 start() {
-        gprintf "Starting Mldonkey (mlnet): "
-         cd $DIRECTORY
-	daemon --user mldonkey --check mldonkey $NICE "$fullpath  > /dev/null 2>&1 &"
-	touch /var/lock/subsys/mldonkey
-	echo
+       echo -n $"Starting Mldonkey (mlnet): "
+       cd $DIRECTORY
+       daemon --user mldonkey --check mldonkey $NICE "$fullpath  > $LOGFILE 2>&1 &"
+       RETVAL=$?
+       [ $RETVAL -eq 0 ] && touch /var/lock/subsys/mldonkey
+       echo
 }
 stop() {
-        gprintf "Stopping Mldonkey (mlnet): "
-        killproc mldonkey-bin
-	rm -fr /var/lock/subsys/mldonkey
-	echo
+       echo -n $"Stopping Mldonkey (mlnet): "
+       killproc $fullpath
+       rm -fr /var/lock/subsys/mldonkey
+       echo
 }
 
 
@@ -53,11 +56,19 @@ case "$1" in
                 stop
                 start
                 ;;
+        condrestart)
+                if status mldonkey >/dev/null; then
+                    stop
+                    start
+                else
+                    echo $"Mldonkey (mlnet) is stopped"
+                fi
+                ;;
         status)
 	        status mldonkey
 		;;
-	*)
-                gprintf "Usage: mldonkey {start|stop|restart|reload|status}\n"
+        *)
+                echo $"Usage: $0 {start|stop|restart|reload|condrestart|status}"
                 RETVAL=1
 esac
 exit $RETVAL


--- NEW FILE mldonkey.logrotate ---
/var/log/mldonkey/mldonkey.log {
    monthly
    notifempty
    missingok
    compress
    postrotate
    service mldonkey condrestart > /dev/null
    endscript
}


--- NEW FILE mldonkey.spec ---
Name:		mldonkey
Version:	2.9.6
Release:	3%{?dist}
Summary:	Client for several P2P networks
License:	GPLv2+
Source0:	http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
Source1:	mldonkey-gui.desktop
Source8:	mldonkey_df_monitor.crond
Source9:	mldonkey_df_monitor.sh
Source11:	mldonkey.logrotate
Patch0:		mldonkey-initscript.patch
URL:		http://mldonkey.sourceforge.net
Group:		Applications/Internet
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:	ocaml >= 3.10.0
BuildRequires:	ocaml-camlp4-devel
BuildRequires:	ocaml-lablgtk-devel >= 2.10.0
BuildRequires:	zlib-devel
BuildRequires:	desktop-file-utils
BuildRequires:	gtk2-devel >= 2.4.0
BuildRequires:	librsvg2-devel >= 2.4.0
BuildRequires:	bzip2-devel
BuildRequires:	ncurses-devel
BuildRequires:	file-devel
Requires:	logrotate
# for kill_mldonkey
Requires:	perl(LWP::UserAgent)
# for mldonkey_command
Requires:	nc


%description
MLDonkey is a door to the 'donkey' network, a decentralized network used to
exchange big files on the Internet. It is written in a wonderful language,
called Objective-Caml, and present most features of the basic Windows donkey
client, plus some more:
  - It should work on most UNIX-compatible platforms.
  - You can remotely command your client, either by telnet (port 4000),
    by a WEB browser (http://localhost:4080), or with a classical client
    interface (see http://www.nongnu.org/mldonkey)
  - You can connect to several servers, and each search will query all the
    connected servers.
  - You can select mp3s by bitrates in queries (useful ?).
  - You can select the name of a downloaded file before moving it to your
    incoming directory.
  - You can have several queries in the graphical user interface at the same
    time.
  - You can remember your old queries results in the command-line interface.
  - You can search in the history of all files you have seen on the network.

It can also access other peer-to-peer networks:
- BitTorrent
- Fasttrack
- FileTP (wget-clone)
- DC++


%package gui
Summary:	Graphical frontend for mldonkey based on GTK
Group:		Applications/Internet
Requires:	hicolor-icon-theme
# TODO requirement for mldonkey_previewer
# Requires:	mplayer


%description gui
The GTK interface for mldonkey provides a convenient way of managing
all mldonkey operations. It gives details about conected servers,
downloaded files, friends and lets one search for files in a pleasing
way.


%package server
Summary:	Enables mldonkey as a system daemon
Group:		System Environment/Daemons
Requires:	%{name} = %{version}-%{release}
# Neseccary for mldonkey_df_monitor.sh
Requires:	mailx
Requires(pre):	/usr/sbin/useradd
Requires(post): /sbin/chkconfig
Requires(preun):/sbin/chkconfig
Requires(preun):/sbin/service


%description server
Contains init and configs to launch mldonkey as a service.

NOTE: by default incoming dir is located in %{_localstatedir}/lib/mldonkey/incoming
and temp dir in %{_localstatedir}/lib/cache/mldonkey. Mlondkey is launched
with the mldonkey user (created after installation).

NOTE: If you are using a password for your mldonkey, you need to specify
it in your %{_sysconfdir}/sysconfig/mldonkey, because mldonkey now stores
it encrypted.


%package -n konqueror-mldonkey-ed2k-support
Summary:	Easy way to download a ed2k-link from Konqueror
Group:		User Interface/Desktops
Requires:	perl(LWP::UserAgent)
Requires:	kde-filesystem


%description -n konqueror-mldonkey-ed2k-support
This package contains tool which gives you an easy way to add an ed2k-link
(like ed2k://|file|filename.exe|21352658|72b0b287cab7d875ccc1d89ebe910b9g|)
with a single click to your mldonkey download queue.
You need to edit %{_sysconfdir}/sysconfig/mldonkey_submit


#%package -n mozilla-mldonkey-ed2k-support
#Summary:	Easy way to download a ed2k-link from Mozilla/Firefox
#Group:		User Interface/Desktops
# TODO should it require firefox?


#%description -n mozilla-mldonkey-ed2k-support
#This package contains tool which gives you an easy way to add an ed2k-link
#(like ed2k://|file|filename.exe|21352658|72b0b287cab7d875ccc1d89ebe910b9g|)
#with a single click within Mozilla/Firefox to your mldonkey download queue.
#The tool is a .xpi file to import into mozilla. The file is located in
#%{_datadir}/%name


%prep
%setup -q
%patch0 -p1 -b .fedora
# Let's make rpmlint happy
sed -i 's|\r||g' distrib/ed2k_submit/README.MLdonkeySubmit
sed -i 's|\r||g' docs/slavanap.txt

iconv -f iso8859-1 -t UTF-8 docs/gnutella.txt > docs/gnutella.utf8 && mv docs/gnutella.{utf8,txt}
iconv -f iso8859-1 -t UTF-8 distrib/Authors.txt > distrib/Authors.utf8 && mv distrib/Authors.{utf8,txt}

chmod 644 src/utils/lib/fst_hash.c
chmod 644 src/networks/fasttrack/fst_crypt_ml.c


%build
%configure --enable-pthread \
           --enable-ocamlver=%(rpm -q --qf '%%{version}' ocaml) \
           --enable-gui=newgui2 \
           --disable-gd

make depend
# Does not support parallel builds
make
make utils


%install
rm -rf $RPM_BUILD_ROOT
DONT_GPRINTIFY=1
export DONT_GPRINTIFY
make DESTDIR=$RPM_BUILD_ROOT install

# core
install -p -m 755 distrib/mldonkey_command $RPM_BUILD_ROOT%{_bindir}/mldonkey_command
install -p -m 755 distrib/kill_mldonkey $RPM_BUILD_ROOT%{_bindir}/kill_mldonkey

# utils
for util in copysources mld_hash get_range make_torrent svg_converter subconv; do
	install -p -m 755 $util $RPM_BUILD_ROOT%{_bindir}/$util ;
done

# gui
install -p -m 755 mlguistarter $RPM_BUILD_ROOT%{_bindir}/mlguistarter

# install preview utility
install -p -m 755 distrib/mldonkey_previewer $RPM_BUILD_ROOT%{_bindir}/mldonkey_previewer

# menu and pixmaps
install packages/rpm/mldonkey-icon-16.png -D -m 644 $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/apps/mldonkey.png
install packages/rpm/mldonkey-icon-32.png -D -m 644 $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/mldonkey.png
install packages/rpm/mldonkey-icon-48.png -D -m 644 $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/mldonkey.png
install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/pixmaps
ln -s ../icons/hicolor/48x48/apps/mldonkey.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/mldonkey.png
desktop-file-install --vendor fedora --dir $RPM_BUILD_ROOT%{_datadir}/applications --copy-generic-name-to-name %{SOURCE1}

# Send email when mldonkey runs out of allowed disk space
install -D -p -m 755 %{SOURCE9} $RPM_BUILD_ROOT%{_sbindir}/mldonkey_df_monitor.sh
sed -i 's,/var,%{_localstatedir},g;
        s,/etc/init.d,%{_initrddir},g;
        s,/etc,%{_sysconfdir},g' $RPM_BUILD_ROOT%{_sbindir}/mldonkey_df_monitor.sh

install -D -p -m 644 %{SOURCE8} $RPM_BUILD_ROOT%{_sysconfdir}/cron.d/mldonkey_df_monitor
sed -i 's,/usr/sbin,%{_sbindir},g' $RPM_BUILD_ROOT%{_sysconfdir}/cron.d/mldonkey_df_monitor

# create directory for storing log-file
install -d -m 755 $RPM_BUILD_ROOT%{_localstatedir}/log/mldonkey

# install logrotate script for  /var/log/mldonkey/mldonkey.log
install -D -p -m 644 %{SOURCE11} $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/mldonkey
sed -i 's,/var,%{_localstatedir},g' $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/mldonkey

# install init-scipt
install -D -p -m 755 packages/rpm/mldonkey.init $RPM_BUILD_ROOT%{_initrddir}/mldonkey
sed -e 's,/etc/init.d,%{_initrddir},g;
        s,/etc,%{_sysconfdir},g;
        s,/var,%{_localstatedir},g' $RPM_BUILD_ROOT%{_initrddir}/mldonkey

# Create necessary directories for server
install -d -m 755 $RPM_BUILD_ROOT%{_localstatedir}/cache/mldonkey
install -d -m 755 $RPM_BUILD_ROOT%{_localstatedir}/lib/%{name}/incoming

# create downloads.ini
echo "temp_directory = \"%{_localstatedir}/cache/mldonkey\"" > $RPM_BUILD_ROOT%{_localstatedir}/lib/%{name}/downloads.ini
echo "incoming_directory = \"%{_localstatedir}/lib/%{name}/incoming\"" >> $RPM_BUILD_ROOT%{_localstatedir}/lib/%{name}/downloads.ini
echo "mldonkey_gui = \"%{_bindir}/mlgui\"" >> $RPM_BUILD_ROOT%{_localstatedir}/lib/%{name}/downloads.ini
echo "mldonkey_bin = \"%{_bindir}/mldonkey\"" >> $RPM_BUILD_ROOT%{_localstatedir}/lib/%{name}/downloads.ini
echo "log_file = \"%{_localstatedir}/log/mldonkey/mldonkey.log\"" >> $RPM_BUILD_ROOT%{_localstatedir}/lib/%{name}/downloads.ini

# Install sysconfig file
install -D -p -m 644 packages/rpm/mldonkey.sysconfig $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/mldonkey
sed -i 's,/var,%{_localstatedir},g' $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/mldonkey

# ed2k for konqueror support
install -p -m 755 distrib/ed2k_submit/mldonkey_submit $RPM_BUILD_ROOT%{_bindir}/mldonkey_submit
install -p -m 644 distrib/ed2k_submit/mldonkey $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/mldonkey_submit
sed -i 's,myusername,,;s,mypassword,,' $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/mldonkey_submit
install -D -p -m 644 distrib/ed2k_submit/ed2k.protocol  $RPM_BUILD_ROOT%{_datadir}/services/ed2k.protocol

# ed2k for mozilla support
# TODO should we unpack it into FF's plugins directory?
#install -D -p -m 644 distrib/ed2k_mozilla/mldonkey_protocol_handler-2.2.xpi $RPM_BUILD_ROOT%{_datadir}/%{name}/mldonkey_protocol_handler-2.2.xpi


%clean
rm -rf $RPM_BUILD_ROOT


%pre server
/usr/sbin/useradd -r -d %{_localstatedir}/lib/%{name} \
                  -c "MlDonkey service" -s /bin/bash mldonkey 2>/dev/null || :


%post server
if [ "$1" == "1" ]; then
	/sbin/chkconfig --add mldonkey || :
fi


%preun server
if [ "$1" == "0" ]; then
	/sbin/service mldonkey stop >/dev/null 2>&1 || :
	/sbin/chkconfig --del mldonkey || :
fi


%files
%defattr(-,root,root)
%doc Copying.txt distrib/Authors.txt distrib/Bugs.txt distrib/ChangeLog distrib/Developers.txt
%doc docs
%{_bindir}/mlnet
%{_bindir}/mldonkey_command
%{_bindir}/kill_mldonkey
%{_bindir}/copysources
%{_bindir}/get_range
%{_bindir}/make_torrent
%{_bindir}/mlbt
%{_bindir}/mld_hash
%{_bindir}/mldc
%{_bindir}/mlgnut
%{_bindir}/mldonkey
%{_bindir}/mlslsk
%{_bindir}/subconv
%{_bindir}/svg_converter


%files gui
%defattr(-,root,root)
%doc Copying.txt distrib/Authors.txt distrib/Bugs.txt distrib/ChangeLog distrib/Developers.txt
%{_bindir}/mlbt+gui
%{_bindir}/mldc+gui
%{_bindir}/mldonkey+gui
%{_bindir}/mldonkey_gui
%{_bindir}/mldonkey_previewer
%{_bindir}/mlgnut+gui
%{_bindir}/mlgui
%{_bindir}/mlguistarter
%{_bindir}/mlnet+gui
%{_bindir}/mlslsk+gui
%{_datadir}/applications/*.desktop
%{_datadir}/icons/hicolor/16x16/apps/mldonkey.png
%{_datadir}/icons/hicolor/32x32/apps/mldonkey.png
%{_datadir}/icons/hicolor/48x48/apps/mldonkey.png
%{_datadir}/pixmaps/mldonkey.png


%files server
%defattr(-,root,root)
%doc Copying.txt
%config(noreplace) %{_sysconfdir}/sysconfig/mldonkey
%config(noreplace) %{_sysconfdir}/cron.d/mldonkey_df_monitor
%attr(755,root,root) %{_initrddir}/mldonkey
%config(noreplace) %{_sysconfdir}/logrotate.d/mldonkey
%{_sbindir}/mldonkey_df_monitor.sh
%attr(750,mldonkey,mldonkey) %dir %{_localstatedir}/log/mldonkey
%attr(750,mldonkey,mldonkey) %dir %{_localstatedir}/cache/mldonkey
%attr(750,mldonkey,mldonkey) %dir %{_localstatedir}/lib/mldonkey
%attr(770,mldonkey,mldonkey) %dir %{_localstatedir}/lib/mldonkey/incoming
%config(noreplace) %{_localstatedir}/lib/mldonkey/downloads.ini


#%files -n mozilla-mldonkey-ed2k-support
#%defattr(-,root,root)
#%doc Copying.txt
#%{_datadir}/%{name}/mldonkey_protocol_handler-2.2.xpi


%files -n konqueror-mldonkey-ed2k-support
%defattr(-,root,root)
%doc Copying.txt distrib/ed2k_submit/README.MLdonkeySubmit
%config(noreplace) %{_sysconfdir}/sysconfig/mldonkey_submit
%{_bindir}/mldonkey_submit
%{_datadir}/services/ed2k.protocol


%changelog
* Mon Jan 26 2009 Peter Lemenkov <lemenkov at gmail.com> 2.9.6-3
- Temporarily disable mozilla support

* Sat Dec  6 2008 Peter Lemenkov <lemenkov at gmail.com> 2.9.6-2
- Fixed installation of sysconfig-file

* Mon Aug 25 2008 Peter Lemenkov <lemenkov at gmail.com> 2.9.6-1
- Ver. 2.9.6

* Mon Jun 23 2008 Peter Lemenkov <lemenkov at gmail.com> 2.9.5-1
- Ver. 2.9.5

* Sun Jan 27 2008 Peter Lemenkov <lemenkov at gmail.com> 2.9.3-1
- Ver. 2.9.3

* Sun Jan 13 2008 Peter Lemenkov <lemenkov at gmail.com> 2.9.2-2
- Correct BR for perl modules
- More robust iconv usage
- Fixed desktop file
- Changed BR for scriplets

* Sun Nov  4 2007 Peter Lemenkov <lemenkov at gmail.com> 2.9.2-1
- Ver. 2.9.2
- BR ocaml >= 3.10.0
- BR lablgtk > 2.10.0

* Tue Sep 25 2007 Peter Lemenkov <lemenkov at gmail.com> 2.9.1-1
- Ver. 2.9.1
- converted two non-UTF8 text-files

* Sun Aug 19 2007 Peter Lemenkov <lemenkov at gmail.com> 2.9.0-2
- fixed License tag as required in Fedora

* Sun Aug  5 2007 Peter Lemenkov <lemenkov at gmail.com> 2.9.0-1
- Added shadow-utils as required
- Ver. 2.9.0
- Disabled Gnutella/G2 (unmaintained)
- Added BR file-devel (for libmagic)

* Wed Jun  6 2007 Peter Lemenkov <lemenkov at gmail.com> 2.8.7-1
- Ver. 2.8.7
- Added DC++ back

* Sun May 20 2007 Peter Lemenkov <lemenkov at gmail.com> 2.8.5-6
- Splitted ed2k-support to mozilla-mldonkey-ed2k-support and
  konqueror-mldonkey-ed2k-support

* Sun May 13 2007 Peter Lemenkov <lemenkov at gmail.com> 2.8.5-5
- Fixed bug #1421

* Sat May  5 2007 Peter Lemenkov <lemenkov at gmail.com> 2.8.5-4
- Fixed file conflicts
- Removed soulseek support (broken)

* Sat May  5 2007 Peter Lemenkov <lemenkov at gmail.com> 2.8.5-3
- Removed mysterious Requires kdelibs

* Fri May  4 2007 Peter Lemenkov <lemenkov at gmail.com> 2.8.5-2
- Added BR ncurses-devel

* Mon Apr 23 2007 Peter Lemenkov <lemenkov at gmail.com> 2.8.5-1
- version 2.8.5
- graphical stats disabled (temporarily?), see bug #1191
- mlchat removed from upstream

* Sun May 21 2006 Aurelien Bompard <gauret[AT]free.fr> 2.7.6-1
- version 2.7.6

* Mon Apr 17 2006 Aurelien Bompard <gauret[AT]free.fr> 2.7.5-1
- version 2.7.5

* Wed Mar 15 2006 Aurelien Bompard <gauret[AT]free.fr> 2.7.3-1
- version 2.7.3
- drop patch 0 & patch 1 (applied upstream)

* Thu Mar 09 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
- switch to new release field

* Tue Feb 28 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
- add dist

* Fri Dec 02 2005 Aurelien Bompard <gauret[AT]free.fr> 2.7.0-0.lvn.2
- patch init script to add condrestart
- use condrestart in logrotate

* Sun Nov 20 2005 Aurelien Bompard <gauret[AT]free.fr> 2.7.0-0.lvn.1
- version 2.7.0
- fix logrotate file

* Mon Sep 05 2005 Aurelien Bompard <gauret[AT]free.fr> 2.6.4-0.lvn.1
- version 2.6.4

* Mon Aug 22 2005 Aurelien Bompard <gauret[AT]free.fr> 2.6.3-0.lvn.1
- version 2.6.3

* Thu Aug 11 2005 Aurelien Bompard <gauret[AT]free.fr> 2.6.2-0.lvn.1
- version 2.6.2

* Wed Aug 10 2005 Aurelien Bompard <gauret[AT]free.fr> 2.6.1-0.lvn.1
- version 2.6.1
- don't start initscript on boot by default

* Fri Jul 22 2005 Aurelien Bompard <gauret[AT]free.fr> 2.6.0-0.lvn.1
- update to 2.6.0
- drop explicit Epoch

* Mon Jun 27 2005 Aurelien Bompard <gauret[AT]free.fr> 0:2.5.30.16-0.lvn.1
- version 2.5.30.16
- add missing scriptlets requirements
- don't remove the mldonkey user on uninstall
- init script: sync with upstream
- sysconfig file: sync with upstream
- start script: sync with upstream

* Sun Feb 13 2005 Aurelien Bompard <gauret[AT]free.fr> 0:2.5.28-0.lvn.1
- version 2.5.28
- enable gui
- disable direct-connect (broken at the moment)

* Wed Aug 04 2004 Aurelien Bompard <gauret[AT]free.fr> 0:2.5.22-0.lvn.1
- version 2.5.22
- get ready for the new gui based on GTK2
  (upstream says "still a little buggy", and it does not build yet)

* Thu May 06 2004 Aurelien Bompard <gauret[AT]free.fr> 0:2.5.21-0.lvn.1
- version 2.5.21 (bugfix again...)

* Tue May 04 2004 Aurelien Bompard <gauret[AT]free.fr> 0:2.5.20-0.lvn.1
- version 2.5.20 (bugfix)

* Mon May 03 2004 Aurelien Bompard <gauret[AT]free.fr> 0:2.5.19-0.lvn.1
- version 2.5.19

* Sun Apr 25 2004 Aurelien Bompard <gauret[AT]free.fr> 0:2.5.18-0.lvn.1
- version 2.5.18

* Mon Mar 08 2004 Aurelien Bompard <gauret[AT]free.fr> 0:2.5.16-0.lvn.1
- update to version 2.5.16
- new subconv tool to convert movie subtitles

* Mon Mar 01 2004 Aurelien Bompard <gauret[AT]free.fr> 0:2.5.12-0.lvn.1
- Initial Fedora package, ported from Mandrake/PLF


--- NEW FILE mldonkey_df_monitor.crond ---
*/30 * * * *	root	/usr/sbin/mldonkey_df_monitor.sh


--- NEW FILE mldonkey_df_monitor.sh ---
#!/bin/sh

CACHEDIR="/var/cache/mldonkey"
MINFREE=102400
EMAIL="root at localhost"

. /etc/sysconfig/mldonkey

[ ! "$ENABLE_DF_MONITOR" = "yes" ] && exit

send_email() {
	mail -s "mldonkey, disk space warning" $EMAIL << EOF

your $CACHEDIR has only $CURFREE KiB free space left
all downloads paused

BTW: you can control this check by editing /etc/sysconfig/mldonkey.
EOF
}


CURFREE=`df -P -k $CACHEDIR | tail -n 1 | awk '{ print $4 }'`
if [ $CURFREE -lt $MINFREE ] ; then
	/etc/init.d/mldonkey pause > /dev/null
	send_email
fi



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mldonkey/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	20 Jan 2009 21:18:40 -0000	1.1
+++ .cvsignore	26 Jan 2009 10:55:03 -0000	1.2
@@ -0,0 +1 @@
+mldonkey-2.9.6.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mldonkey/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	20 Jan 2009 21:18:40 -0000	1.1
+++ sources	26 Jan 2009 10:55:03 -0000	1.2
@@ -0,0 +1 @@
+5da87678449bf87ce0c78f37e7871eb9  mldonkey-2.9.6.tar.bz2



From peter at fedoraproject.org  Mon Jan 26 10:57:51 2009
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Mon, 26 Jan 2009 10:57:51 +0000 (UTC)
Subject: rpms/mldonkey/F-10 import.log, NONE, 1.1 mldonkey-gui.desktop, NONE,
	1.1 mldonkey-initscript.patch, NONE, 1.1 mldonkey.logrotate,
	NONE, 1.1 mldonkey.spec, NONE, 1.1 mldonkey_df_monitor.crond,
	NONE, 1.1 mldonkey_df_monitor.sh, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090126105751.E1E297010C@cvs1.fedora.phx.redhat.com>

Author: peter

Update of /cvs/pkgs/rpms/mldonkey/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29397/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	import.log mldonkey-gui.desktop mldonkey-initscript.patch 
	mldonkey.logrotate mldonkey.spec mldonkey_df_monitor.crond 
	mldonkey_df_monitor.sh 
Log Message:
Initial import


--- NEW FILE import.log ---
mldonkey-2_9_6-3_fc10:F-10:mldonkey-2.9.6-3.fc10.src.rpm:1232967409


--- NEW FILE mldonkey-gui.desktop ---
[Desktop Entry]
Name=MlDonkey
Type=Application
GenericName=MlDonkey peer-to-peer client
Exec=mlgui
Icon=mldonkey
Categories=Network;
Encoding=UTF-8

mldonkey-initscript.patch:

--- NEW FILE mldonkey-initscript.patch ---
diff --git a/packages/rpm/mldonkey.init b/packages/rpm/mldonkey.init
index 536a88a..2291a9b 100755
--- a/packages/rpm/mldonkey.init
+++ b/packages/rpm/mldonkey.init
@@ -4,7 +4,7 @@
 #
 # Laurent Culioli <laurent at pschit.net>
 #
-# chkconfig: 2345 90 15
+# chkconfig: - 90 15
 # description: Mldonkey is client to access multiple peer-to-peer network
 # processname: mldonkey
 # config: /etc/sysconfig/mldonkey
@@ -15,6 +15,8 @@
 # Source some options 
 . /etc/sysconfig/mldonkey
 
+[ -z $LOGFILE ] && LOGFILE="/dev/null"
+
 RETVAL=0
 
 # Path to the mldonkey binarie.
@@ -27,17 +29,18 @@ fullpath=/usr/bin/mlnet
 [ ${NETWORKING} = "no" ] && exit 0
 
 start() {
-        gprintf "Starting Mldonkey (mlnet): "
-         cd $DIRECTORY
-	daemon --user mldonkey --check mldonkey $NICE "$fullpath  > /dev/null 2>&1 &"
-	touch /var/lock/subsys/mldonkey
-	echo
+       echo -n $"Starting Mldonkey (mlnet): "
+       cd $DIRECTORY
+       daemon --user mldonkey --check mldonkey $NICE "$fullpath  > $LOGFILE 2>&1 &"
+       RETVAL=$?
+       [ $RETVAL -eq 0 ] && touch /var/lock/subsys/mldonkey
+       echo
 }
 stop() {
-        gprintf "Stopping Mldonkey (mlnet): "
-        killproc mldonkey-bin
-	rm -fr /var/lock/subsys/mldonkey
-	echo
+       echo -n $"Stopping Mldonkey (mlnet): "
+       killproc $fullpath
+       rm -fr /var/lock/subsys/mldonkey
+       echo
 }
 
 
@@ -53,11 +56,19 @@ case "$1" in
                 stop
                 start
                 ;;
+        condrestart)
+                if status mldonkey >/dev/null; then
+                    stop
+                    start
+                else
+                    echo $"Mldonkey (mlnet) is stopped"
+                fi
+                ;;
         status)
 	        status mldonkey
 		;;
-	*)
-                gprintf "Usage: mldonkey {start|stop|restart|reload|status}\n"
+        *)
+                echo $"Usage: $0 {start|stop|restart|reload|condrestart|status}"
                 RETVAL=1
 esac
 exit $RETVAL


--- NEW FILE mldonkey.logrotate ---
/var/log/mldonkey/mldonkey.log {
    monthly
    notifempty
    missingok
    compress
    postrotate
    service mldonkey condrestart > /dev/null
    endscript
}


--- NEW FILE mldonkey.spec ---
Name:		mldonkey
Version:	2.9.6
Release:	3%{?dist}
Summary:	Client for several P2P networks
License:	GPLv2+
Source0:	http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
Source1:	mldonkey-gui.desktop
Source8:	mldonkey_df_monitor.crond
Source9:	mldonkey_df_monitor.sh
Source11:	mldonkey.logrotate
Patch0:		mldonkey-initscript.patch
URL:		http://mldonkey.sourceforge.net
Group:		Applications/Internet
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:	ocaml >= 3.10.0
BuildRequires:	ocaml-camlp4-devel
BuildRequires:	ocaml-lablgtk-devel >= 2.10.0
BuildRequires:	zlib-devel
BuildRequires:	desktop-file-utils
BuildRequires:	gtk2-devel >= 2.4.0
BuildRequires:	librsvg2-devel >= 2.4.0
BuildRequires:	bzip2-devel
BuildRequires:	ncurses-devel
BuildRequires:	file-devel
Requires:	logrotate
# for kill_mldonkey
Requires:	perl(LWP::UserAgent)
# for mldonkey_command
Requires:	nc


%description
MLDonkey is a door to the 'donkey' network, a decentralized network used to
exchange big files on the Internet. It is written in a wonderful language,
called Objective-Caml, and present most features of the basic Windows donkey
client, plus some more:
  - It should work on most UNIX-compatible platforms.
  - You can remotely command your client, either by telnet (port 4000),
    by a WEB browser (http://localhost:4080), or with a classical client
    interface (see http://www.nongnu.org/mldonkey)
  - You can connect to several servers, and each search will query all the
    connected servers.
  - You can select mp3s by bitrates in queries (useful ?).
  - You can select the name of a downloaded file before moving it to your
    incoming directory.
  - You can have several queries in the graphical user interface at the same
    time.
  - You can remember your old queries results in the command-line interface.
  - You can search in the history of all files you have seen on the network.

It can also access other peer-to-peer networks:
- BitTorrent
- Fasttrack
- FileTP (wget-clone)
- DC++


%package gui
Summary:	Graphical frontend for mldonkey based on GTK
Group:		Applications/Internet
Requires:	hicolor-icon-theme
# TODO requirement for mldonkey_previewer
# Requires:	mplayer


%description gui
The GTK interface for mldonkey provides a convenient way of managing
all mldonkey operations. It gives details about conected servers,
downloaded files, friends and lets one search for files in a pleasing
way.


%package server
Summary:	Enables mldonkey as a system daemon
Group:		System Environment/Daemons
Requires:	%{name} = %{version}-%{release}
# Neseccary for mldonkey_df_monitor.sh
Requires:	mailx
Requires(pre):	/usr/sbin/useradd
Requires(post): /sbin/chkconfig
Requires(preun):/sbin/chkconfig
Requires(preun):/sbin/service


%description server
Contains init and configs to launch mldonkey as a service.

NOTE: by default incoming dir is located in %{_localstatedir}/lib/mldonkey/incoming
and temp dir in %{_localstatedir}/lib/cache/mldonkey. Mlondkey is launched
with the mldonkey user (created after installation).

NOTE: If you are using a password for your mldonkey, you need to specify
it in your %{_sysconfdir}/sysconfig/mldonkey, because mldonkey now stores
it encrypted.


%package -n konqueror-mldonkey-ed2k-support
Summary:	Easy way to download a ed2k-link from Konqueror
Group:		User Interface/Desktops
Requires:	perl(LWP::UserAgent)
Requires:	kde-filesystem


%description -n konqueror-mldonkey-ed2k-support
This package contains tool which gives you an easy way to add an ed2k-link
(like ed2k://|file|filename.exe|21352658|72b0b287cab7d875ccc1d89ebe910b9g|)
with a single click to your mldonkey download queue.
You need to edit %{_sysconfdir}/sysconfig/mldonkey_submit


#%package -n mozilla-mldonkey-ed2k-support
#Summary:	Easy way to download a ed2k-link from Mozilla/Firefox
#Group:		User Interface/Desktops
# TODO should it require firefox?


#%description -n mozilla-mldonkey-ed2k-support
#This package contains tool which gives you an easy way to add an ed2k-link
#(like ed2k://|file|filename.exe|21352658|72b0b287cab7d875ccc1d89ebe910b9g|)
#with a single click within Mozilla/Firefox to your mldonkey download queue.
#The tool is a .xpi file to import into mozilla. The file is located in
#%{_datadir}/%name


%prep
%setup -q
%patch0 -p1 -b .fedora
# Let's make rpmlint happy
sed -i 's|\r||g' distrib/ed2k_submit/README.MLdonkeySubmit
sed -i 's|\r||g' docs/slavanap.txt

iconv -f iso8859-1 -t UTF-8 docs/gnutella.txt > docs/gnutella.utf8 && mv docs/gnutella.{utf8,txt}
iconv -f iso8859-1 -t UTF-8 distrib/Authors.txt > distrib/Authors.utf8 && mv distrib/Authors.{utf8,txt}

chmod 644 src/utils/lib/fst_hash.c
chmod 644 src/networks/fasttrack/fst_crypt_ml.c


%build
%configure --enable-pthread \
           --enable-ocamlver=%(rpm -q --qf '%%{version}' ocaml) \
           --enable-gui=newgui2 \
           --disable-gd

make depend
# Does not support parallel builds
make
make utils


%install
rm -rf $RPM_BUILD_ROOT
DONT_GPRINTIFY=1
export DONT_GPRINTIFY
make DESTDIR=$RPM_BUILD_ROOT install

# core
install -p -m 755 distrib/mldonkey_command $RPM_BUILD_ROOT%{_bindir}/mldonkey_command
install -p -m 755 distrib/kill_mldonkey $RPM_BUILD_ROOT%{_bindir}/kill_mldonkey

# utils
for util in copysources mld_hash get_range make_torrent svg_converter subconv; do
	install -p -m 755 $util $RPM_BUILD_ROOT%{_bindir}/$util ;
done

# gui
install -p -m 755 mlguistarter $RPM_BUILD_ROOT%{_bindir}/mlguistarter

# install preview utility
install -p -m 755 distrib/mldonkey_previewer $RPM_BUILD_ROOT%{_bindir}/mldonkey_previewer

# menu and pixmaps
install packages/rpm/mldonkey-icon-16.png -D -m 644 $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/apps/mldonkey.png
install packages/rpm/mldonkey-icon-32.png -D -m 644 $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/mldonkey.png
install packages/rpm/mldonkey-icon-48.png -D -m 644 $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/mldonkey.png
install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/pixmaps
ln -s ../icons/hicolor/48x48/apps/mldonkey.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/mldonkey.png
desktop-file-install --vendor fedora --dir $RPM_BUILD_ROOT%{_datadir}/applications --copy-generic-name-to-name %{SOURCE1}

# Send email when mldonkey runs out of allowed disk space
install -D -p -m 755 %{SOURCE9} $RPM_BUILD_ROOT%{_sbindir}/mldonkey_df_monitor.sh
sed -i 's,/var,%{_localstatedir},g;
        s,/etc/init.d,%{_initrddir},g;
        s,/etc,%{_sysconfdir},g' $RPM_BUILD_ROOT%{_sbindir}/mldonkey_df_monitor.sh

install -D -p -m 644 %{SOURCE8} $RPM_BUILD_ROOT%{_sysconfdir}/cron.d/mldonkey_df_monitor
sed -i 's,/usr/sbin,%{_sbindir},g' $RPM_BUILD_ROOT%{_sysconfdir}/cron.d/mldonkey_df_monitor

# create directory for storing log-file
install -d -m 755 $RPM_BUILD_ROOT%{_localstatedir}/log/mldonkey

# install logrotate script for  /var/log/mldonkey/mldonkey.log
install -D -p -m 644 %{SOURCE11} $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/mldonkey
sed -i 's,/var,%{_localstatedir},g' $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/mldonkey

# install init-scipt
install -D -p -m 755 packages/rpm/mldonkey.init $RPM_BUILD_ROOT%{_initrddir}/mldonkey
sed -e 's,/etc/init.d,%{_initrddir},g;
        s,/etc,%{_sysconfdir},g;
        s,/var,%{_localstatedir},g' $RPM_BUILD_ROOT%{_initrddir}/mldonkey

# Create necessary directories for server
install -d -m 755 $RPM_BUILD_ROOT%{_localstatedir}/cache/mldonkey
install -d -m 755 $RPM_BUILD_ROOT%{_localstatedir}/lib/%{name}/incoming

# create downloads.ini
echo "temp_directory = \"%{_localstatedir}/cache/mldonkey\"" > $RPM_BUILD_ROOT%{_localstatedir}/lib/%{name}/downloads.ini
echo "incoming_directory = \"%{_localstatedir}/lib/%{name}/incoming\"" >> $RPM_BUILD_ROOT%{_localstatedir}/lib/%{name}/downloads.ini
echo "mldonkey_gui = \"%{_bindir}/mlgui\"" >> $RPM_BUILD_ROOT%{_localstatedir}/lib/%{name}/downloads.ini
echo "mldonkey_bin = \"%{_bindir}/mldonkey\"" >> $RPM_BUILD_ROOT%{_localstatedir}/lib/%{name}/downloads.ini
echo "log_file = \"%{_localstatedir}/log/mldonkey/mldonkey.log\"" >> $RPM_BUILD_ROOT%{_localstatedir}/lib/%{name}/downloads.ini

# Install sysconfig file
install -D -p -m 644 packages/rpm/mldonkey.sysconfig $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/mldonkey
sed -i 's,/var,%{_localstatedir},g' $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/mldonkey

# ed2k for konqueror support
install -p -m 755 distrib/ed2k_submit/mldonkey_submit $RPM_BUILD_ROOT%{_bindir}/mldonkey_submit
install -p -m 644 distrib/ed2k_submit/mldonkey $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/mldonkey_submit
sed -i 's,myusername,,;s,mypassword,,' $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/mldonkey_submit
install -D -p -m 644 distrib/ed2k_submit/ed2k.protocol  $RPM_BUILD_ROOT%{_datadir}/services/ed2k.protocol

# ed2k for mozilla support
# TODO should we unpack it into FF's plugins directory?
#install -D -p -m 644 distrib/ed2k_mozilla/mldonkey_protocol_handler-2.2.xpi $RPM_BUILD_ROOT%{_datadir}/%{name}/mldonkey_protocol_handler-2.2.xpi


%clean
rm -rf $RPM_BUILD_ROOT


%pre server
/usr/sbin/useradd -r -d %{_localstatedir}/lib/%{name} \
                  -c "MlDonkey service" -s /bin/bash mldonkey 2>/dev/null || :


%post server
if [ "$1" == "1" ]; then
	/sbin/chkconfig --add mldonkey || :
fi


%preun server
if [ "$1" == "0" ]; then
	/sbin/service mldonkey stop >/dev/null 2>&1 || :
	/sbin/chkconfig --del mldonkey || :
fi


%files
%defattr(-,root,root)
%doc Copying.txt distrib/Authors.txt distrib/Bugs.txt distrib/ChangeLog distrib/Developers.txt
%doc docs
%{_bindir}/mlnet
%{_bindir}/mldonkey_command
%{_bindir}/kill_mldonkey
%{_bindir}/copysources
%{_bindir}/get_range
%{_bindir}/make_torrent
%{_bindir}/mlbt
%{_bindir}/mld_hash
%{_bindir}/mldc
%{_bindir}/mlgnut
%{_bindir}/mldonkey
%{_bindir}/mlslsk
%{_bindir}/subconv
%{_bindir}/svg_converter


%files gui
%defattr(-,root,root)
%doc Copying.txt distrib/Authors.txt distrib/Bugs.txt distrib/ChangeLog distrib/Developers.txt
%{_bindir}/mlbt+gui
%{_bindir}/mldc+gui
%{_bindir}/mldonkey+gui
%{_bindir}/mldonkey_gui
%{_bindir}/mldonkey_previewer
%{_bindir}/mlgnut+gui
%{_bindir}/mlgui
%{_bindir}/mlguistarter
%{_bindir}/mlnet+gui
%{_bindir}/mlslsk+gui
%{_datadir}/applications/*.desktop
%{_datadir}/icons/hicolor/16x16/apps/mldonkey.png
%{_datadir}/icons/hicolor/32x32/apps/mldonkey.png
%{_datadir}/icons/hicolor/48x48/apps/mldonkey.png
%{_datadir}/pixmaps/mldonkey.png


%files server
%defattr(-,root,root)
%doc Copying.txt
%config(noreplace) %{_sysconfdir}/sysconfig/mldonkey
%config(noreplace) %{_sysconfdir}/cron.d/mldonkey_df_monitor
%attr(755,root,root) %{_initrddir}/mldonkey
%config(noreplace) %{_sysconfdir}/logrotate.d/mldonkey
%{_sbindir}/mldonkey_df_monitor.sh
%attr(750,mldonkey,mldonkey) %dir %{_localstatedir}/log/mldonkey
%attr(750,mldonkey,mldonkey) %dir %{_localstatedir}/cache/mldonkey
%attr(750,mldonkey,mldonkey) %dir %{_localstatedir}/lib/mldonkey
%attr(770,mldonkey,mldonkey) %dir %{_localstatedir}/lib/mldonkey/incoming
%config(noreplace) %{_localstatedir}/lib/mldonkey/downloads.ini


#%files -n mozilla-mldonkey-ed2k-support
#%defattr(-,root,root)
#%doc Copying.txt
#%{_datadir}/%{name}/mldonkey_protocol_handler-2.2.xpi


%files -n konqueror-mldonkey-ed2k-support
%defattr(-,root,root)
%doc Copying.txt distrib/ed2k_submit/README.MLdonkeySubmit
%config(noreplace) %{_sysconfdir}/sysconfig/mldonkey_submit
%{_bindir}/mldonkey_submit
%{_datadir}/services/ed2k.protocol


%changelog
* Mon Jan 26 2009 Peter Lemenkov <lemenkov at gmail.com> 2.9.6-3
- Temporarily disable mozilla support

* Sat Dec  6 2008 Peter Lemenkov <lemenkov at gmail.com> 2.9.6-2
- Fixed installation of sysconfig-file

* Mon Aug 25 2008 Peter Lemenkov <lemenkov at gmail.com> 2.9.6-1
- Ver. 2.9.6

* Mon Jun 23 2008 Peter Lemenkov <lemenkov at gmail.com> 2.9.5-1
- Ver. 2.9.5

* Sun Jan 27 2008 Peter Lemenkov <lemenkov at gmail.com> 2.9.3-1
- Ver. 2.9.3

* Sun Jan 13 2008 Peter Lemenkov <lemenkov at gmail.com> 2.9.2-2
- Correct BR for perl modules
- More robust iconv usage
- Fixed desktop file
- Changed BR for scriplets

* Sun Nov  4 2007 Peter Lemenkov <lemenkov at gmail.com> 2.9.2-1
- Ver. 2.9.2
- BR ocaml >= 3.10.0
- BR lablgtk > 2.10.0

* Tue Sep 25 2007 Peter Lemenkov <lemenkov at gmail.com> 2.9.1-1
- Ver. 2.9.1
- converted two non-UTF8 text-files

* Sun Aug 19 2007 Peter Lemenkov <lemenkov at gmail.com> 2.9.0-2
- fixed License tag as required in Fedora

* Sun Aug  5 2007 Peter Lemenkov <lemenkov at gmail.com> 2.9.0-1
- Added shadow-utils as required
- Ver. 2.9.0
- Disabled Gnutella/G2 (unmaintained)
- Added BR file-devel (for libmagic)

* Wed Jun  6 2007 Peter Lemenkov <lemenkov at gmail.com> 2.8.7-1
- Ver. 2.8.7
- Added DC++ back

* Sun May 20 2007 Peter Lemenkov <lemenkov at gmail.com> 2.8.5-6
- Splitted ed2k-support to mozilla-mldonkey-ed2k-support and
  konqueror-mldonkey-ed2k-support

* Sun May 13 2007 Peter Lemenkov <lemenkov at gmail.com> 2.8.5-5
- Fixed bug #1421

* Sat May  5 2007 Peter Lemenkov <lemenkov at gmail.com> 2.8.5-4
- Fixed file conflicts
- Removed soulseek support (broken)

* Sat May  5 2007 Peter Lemenkov <lemenkov at gmail.com> 2.8.5-3
- Removed mysterious Requires kdelibs

* Fri May  4 2007 Peter Lemenkov <lemenkov at gmail.com> 2.8.5-2
- Added BR ncurses-devel

* Mon Apr 23 2007 Peter Lemenkov <lemenkov at gmail.com> 2.8.5-1
- version 2.8.5
- graphical stats disabled (temporarily?), see bug #1191
- mlchat removed from upstream

* Sun May 21 2006 Aurelien Bompard <gauret[AT]free.fr> 2.7.6-1
- version 2.7.6

* Mon Apr 17 2006 Aurelien Bompard <gauret[AT]free.fr> 2.7.5-1
- version 2.7.5

* Wed Mar 15 2006 Aurelien Bompard <gauret[AT]free.fr> 2.7.3-1
- version 2.7.3
- drop patch 0 & patch 1 (applied upstream)

* Thu Mar 09 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
- switch to new release field

* Tue Feb 28 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
- add dist

* Fri Dec 02 2005 Aurelien Bompard <gauret[AT]free.fr> 2.7.0-0.lvn.2
- patch init script to add condrestart
- use condrestart in logrotate

* Sun Nov 20 2005 Aurelien Bompard <gauret[AT]free.fr> 2.7.0-0.lvn.1
- version 2.7.0
- fix logrotate file

* Mon Sep 05 2005 Aurelien Bompard <gauret[AT]free.fr> 2.6.4-0.lvn.1
- version 2.6.4

* Mon Aug 22 2005 Aurelien Bompard <gauret[AT]free.fr> 2.6.3-0.lvn.1
- version 2.6.3

* Thu Aug 11 2005 Aurelien Bompard <gauret[AT]free.fr> 2.6.2-0.lvn.1
- version 2.6.2

* Wed Aug 10 2005 Aurelien Bompard <gauret[AT]free.fr> 2.6.1-0.lvn.1
- version 2.6.1
- don't start initscript on boot by default

* Fri Jul 22 2005 Aurelien Bompard <gauret[AT]free.fr> 2.6.0-0.lvn.1
- update to 2.6.0
- drop explicit Epoch

* Mon Jun 27 2005 Aurelien Bompard <gauret[AT]free.fr> 0:2.5.30.16-0.lvn.1
- version 2.5.30.16
- add missing scriptlets requirements
- don't remove the mldonkey user on uninstall
- init script: sync with upstream
- sysconfig file: sync with upstream
- start script: sync with upstream

* Sun Feb 13 2005 Aurelien Bompard <gauret[AT]free.fr> 0:2.5.28-0.lvn.1
- version 2.5.28
- enable gui
- disable direct-connect (broken at the moment)

* Wed Aug 04 2004 Aurelien Bompard <gauret[AT]free.fr> 0:2.5.22-0.lvn.1
- version 2.5.22
- get ready for the new gui based on GTK2
  (upstream says "still a little buggy", and it does not build yet)

* Thu May 06 2004 Aurelien Bompard <gauret[AT]free.fr> 0:2.5.21-0.lvn.1
- version 2.5.21 (bugfix again...)

* Tue May 04 2004 Aurelien Bompard <gauret[AT]free.fr> 0:2.5.20-0.lvn.1
- version 2.5.20 (bugfix)

* Mon May 03 2004 Aurelien Bompard <gauret[AT]free.fr> 0:2.5.19-0.lvn.1
- version 2.5.19

* Sun Apr 25 2004 Aurelien Bompard <gauret[AT]free.fr> 0:2.5.18-0.lvn.1
- version 2.5.18

* Mon Mar 08 2004 Aurelien Bompard <gauret[AT]free.fr> 0:2.5.16-0.lvn.1
- update to version 2.5.16
- new subconv tool to convert movie subtitles

* Mon Mar 01 2004 Aurelien Bompard <gauret[AT]free.fr> 0:2.5.12-0.lvn.1
- Initial Fedora package, ported from Mandrake/PLF


--- NEW FILE mldonkey_df_monitor.crond ---
*/30 * * * *	root	/usr/sbin/mldonkey_df_monitor.sh


--- NEW FILE mldonkey_df_monitor.sh ---
#!/bin/sh

CACHEDIR="/var/cache/mldonkey"
MINFREE=102400
EMAIL="root at localhost"

. /etc/sysconfig/mldonkey

[ ! "$ENABLE_DF_MONITOR" = "yes" ] && exit

send_email() {
	mail -s "mldonkey, disk space warning" $EMAIL << EOF

your $CACHEDIR has only $CURFREE KiB free space left
all downloads paused

BTW: you can control this check by editing /etc/sysconfig/mldonkey.
EOF
}


CURFREE=`df -P -k $CACHEDIR | tail -n 1 | awk '{ print $4 }'`
if [ $CURFREE -lt $MINFREE ] ; then
	/etc/init.d/mldonkey pause > /dev/null
	send_email
fi



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mldonkey/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	20 Jan 2009 21:18:40 -0000	1.1
+++ .cvsignore	26 Jan 2009 10:57:21 -0000	1.2
@@ -0,0 +1 @@
+mldonkey-2.9.6.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mldonkey/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	20 Jan 2009 21:18:40 -0000	1.1
+++ sources	26 Jan 2009 10:57:21 -0000	1.2
@@ -0,0 +1 @@
+5da87678449bf87ce0c78f37e7871eb9  mldonkey-2.9.6.tar.bz2



From ltinkl at fedoraproject.org  Mon Jan 26 10:58:28 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Mon, 26 Jan 2009 10:58:28 +0000 (UTC)
Subject: rpms/akonadi/F-9 akonadi.spec,1.5,1.6 sources,1.3,1.4
Message-ID: <20090126105828.55B8C7010C@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/akonadi/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29502

Modified Files:
	akonadi.spec sources 
Log Message:
KDE 4.2.0



Index: akonadi.spec
===================================================================
RCS file: /cvs/extras/rpms/akonadi/F-9/akonadi.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- akonadi.spec	1 Dec 2008 00:09:34 -0000	1.5
+++ akonadi.spec	26 Jan 2009 10:57:58 -0000	1.6
@@ -1,7 +1,7 @@
 Summary: PIM Storage Service
 Name:    akonadi
-Version: 1.0.0
-Release: 5%{?dist}
+Version: 1.1.1
+Release: 1%{?dist}
 
 Group:   System Environment/Libraries
 License: LGPLv2+
@@ -17,13 +17,13 @@
 # for xsltproc
 BuildRequires: libxslt
 BuildRequires: shared-mime-info
+BuildRequires: boost-devel
 
 # when/if akonadi grows support for other backends, consider splitting
 # these similar to how phonon is done currently.
 Requires: qt4-mysql
-# not *strictly* required, leave out for now, until we have something in
-# fedora that actively uses akonadi.
-#Requires(hint): mysql-server
+# not *strictly* required, but we need a functional default configuration
+Requires(hint): mysql-server
 
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
@@ -35,7 +35,6 @@
 package is installed on the machine.
 See also: %{_sysconfdir}/akonadi/mysql-global.conf
 
-
 %package devel
 Summary: Developer files for %{name}
 Group:   Development/Libraries
@@ -54,7 +53,9 @@
 
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
+# added CMAKE_SKIP_RPATH ... at least until universally in %%cmake macro -- Rex
 %{cmake} \
+  -DCMAKE_SKIP_RPATH:BOOL=ON \
   -DCONFIG_INSTALL_DIR=%{_sysconfdir} \
   ..
 popd
@@ -89,7 +90,7 @@
 %{_bindir}/akonadi_control
 %{_bindir}/akonadictl
 %{_bindir}/akonadiserver
-%{_libdir}/libakonadi*.so.*
+%{_libdir}/libakonadi*.so.1*
 %{_datadir}/dbus-1/interfaces/
 %{_datadir}/dbus-1/services/org.freedesktop.Akonadi.Control.service
 %{_datadir}/mime/packages/akonadi-mime.xml
@@ -104,9 +105,24 @@
 
 
 %changelog
-* Mon Dec 01 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 1.0.0-5
+* Mon Jan 26 2009 Luk???? Tinkl <ltinkl at redhat.com> - 1.1.1-1
+- 1.1.1
+
+* Sun Jan 04 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.1.0-1
+- 1.1.0
+
+* Tue Dec 16 2008 Rex Dieter <rdieter at fedoraproject.org> - 1.0.81-1
+- 1.0.81
+
+* Mon Dec 08 2008 Rex Dieter <rdieter at fedoraproject.org> - 1.0.80-3
+- restore Requires: mysql-server
+
+* Mon Dec 01 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> - 1.0.80-2
 - own /usr/share/akonadi and /usr/share/akonadi/agents (#473595)
 
+* Wed Nov 26 2008 Than Ngo <than at redhat.com> -  1.0.80-1
+- 1.0.80
+
 * Wed Oct 22 2008 Rex Dieter <rdieter at fedoraproject.org> 1.0.0-4
 - drop Requires: mysql-server (for now), mention in %%description
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/akonadi/F-9/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	23 Jul 2008 10:29:26 -0000	1.3
+++ sources	26 Jan 2009 10:57:58 -0000	1.4
@@ -1 +1 @@
-90039928f818a55a7e2a1bf852a32f2d  akonadi-1.0.0.tar.bz2
+2e98b42cec9ec4e60a2e3c096f1a3106  akonadi-1.1.1.tar.bz2



From peter at fedoraproject.org  Mon Jan 26 11:01:06 2009
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Mon, 26 Jan 2009 11:01:06 +0000 (UTC)
Subject: rpms/mldonkey/F-9 import.log, NONE, 1.1 mldonkey-gui.desktop, NONE, 
	1.1 mldonkey-initscript.patch, NONE, 1.1 mldonkey.logrotate,
	NONE, 1.1 mldonkey.spec, NONE, 1.1 mldonkey_df_monitor.crond,
	NONE, 1.1 mldonkey_df_monitor.sh, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090126110106.D9A507010C@cvs1.fedora.phx.redhat.com>

Author: peter

Update of /cvs/pkgs/rpms/mldonkey/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30254/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	import.log mldonkey-gui.desktop mldonkey-initscript.patch 
	mldonkey.logrotate mldonkey.spec mldonkey_df_monitor.crond 
	mldonkey_df_monitor.sh 
Log Message:
Initial import


--- NEW FILE import.log ---
mldonkey-2_9_6-3_fc10:F-9:mldonkey-2.9.6-3.fc10.src.rpm:1232967588


--- NEW FILE mldonkey-gui.desktop ---
[Desktop Entry]
Name=MlDonkey
Type=Application
GenericName=MlDonkey peer-to-peer client
Exec=mlgui
Icon=mldonkey
Categories=Network;
Encoding=UTF-8

mldonkey-initscript.patch:

--- NEW FILE mldonkey-initscript.patch ---
diff --git a/packages/rpm/mldonkey.init b/packages/rpm/mldonkey.init
index 536a88a..2291a9b 100755
--- a/packages/rpm/mldonkey.init
+++ b/packages/rpm/mldonkey.init
@@ -4,7 +4,7 @@
 #
 # Laurent Culioli <laurent at pschit.net>
 #
-# chkconfig: 2345 90 15
+# chkconfig: - 90 15
 # description: Mldonkey is client to access multiple peer-to-peer network
 # processname: mldonkey
 # config: /etc/sysconfig/mldonkey
@@ -15,6 +15,8 @@
 # Source some options 
 . /etc/sysconfig/mldonkey
 
+[ -z $LOGFILE ] && LOGFILE="/dev/null"
+
 RETVAL=0
 
 # Path to the mldonkey binarie.
@@ -27,17 +29,18 @@ fullpath=/usr/bin/mlnet
 [ ${NETWORKING} = "no" ] && exit 0
 
 start() {
-        gprintf "Starting Mldonkey (mlnet): "
-         cd $DIRECTORY
-	daemon --user mldonkey --check mldonkey $NICE "$fullpath  > /dev/null 2>&1 &"
-	touch /var/lock/subsys/mldonkey
-	echo
+       echo -n $"Starting Mldonkey (mlnet): "
+       cd $DIRECTORY
+       daemon --user mldonkey --check mldonkey $NICE "$fullpath  > $LOGFILE 2>&1 &"
+       RETVAL=$?
+       [ $RETVAL -eq 0 ] && touch /var/lock/subsys/mldonkey
+       echo
 }
 stop() {
-        gprintf "Stopping Mldonkey (mlnet): "
-        killproc mldonkey-bin
-	rm -fr /var/lock/subsys/mldonkey
-	echo
+       echo -n $"Stopping Mldonkey (mlnet): "
+       killproc $fullpath
+       rm -fr /var/lock/subsys/mldonkey
+       echo
 }
 
 
@@ -53,11 +56,19 @@ case "$1" in
                 stop
                 start
                 ;;
+        condrestart)
+                if status mldonkey >/dev/null; then
+                    stop
+                    start
+                else
+                    echo $"Mldonkey (mlnet) is stopped"
+                fi
+                ;;
         status)
 	        status mldonkey
 		;;
-	*)
-                gprintf "Usage: mldonkey {start|stop|restart|reload|status}\n"
+        *)
+                echo $"Usage: $0 {start|stop|restart|reload|condrestart|status}"
                 RETVAL=1
 esac
 exit $RETVAL


--- NEW FILE mldonkey.logrotate ---
/var/log/mldonkey/mldonkey.log {
    monthly
    notifempty
    missingok
    compress
    postrotate
    service mldonkey condrestart > /dev/null
    endscript
}


--- NEW FILE mldonkey.spec ---
Name:		mldonkey
Version:	2.9.6
Release:	3%{?dist}
Summary:	Client for several P2P networks
License:	GPLv2+
Source0:	http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
Source1:	mldonkey-gui.desktop
Source8:	mldonkey_df_monitor.crond
Source9:	mldonkey_df_monitor.sh
Source11:	mldonkey.logrotate
Patch0:		mldonkey-initscript.patch
URL:		http://mldonkey.sourceforge.net
Group:		Applications/Internet
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:	ocaml >= 3.10.0
BuildRequires:	ocaml-camlp4-devel
BuildRequires:	ocaml-lablgtk-devel >= 2.10.0
BuildRequires:	zlib-devel
BuildRequires:	desktop-file-utils
BuildRequires:	gtk2-devel >= 2.4.0
BuildRequires:	librsvg2-devel >= 2.4.0
BuildRequires:	bzip2-devel
BuildRequires:	ncurses-devel
BuildRequires:	file-devel
Requires:	logrotate
# for kill_mldonkey
Requires:	perl(LWP::UserAgent)
# for mldonkey_command
Requires:	nc


%description
MLDonkey is a door to the 'donkey' network, a decentralized network used to
exchange big files on the Internet. It is written in a wonderful language,
called Objective-Caml, and present most features of the basic Windows donkey
client, plus some more:
  - It should work on most UNIX-compatible platforms.
  - You can remotely command your client, either by telnet (port 4000),
    by a WEB browser (http://localhost:4080), or with a classical client
    interface (see http://www.nongnu.org/mldonkey)
  - You can connect to several servers, and each search will query all the
    connected servers.
  - You can select mp3s by bitrates in queries (useful ?).
  - You can select the name of a downloaded file before moving it to your
    incoming directory.
  - You can have several queries in the graphical user interface at the same
    time.
  - You can remember your old queries results in the command-line interface.
  - You can search in the history of all files you have seen on the network.

It can also access other peer-to-peer networks:
- BitTorrent
- Fasttrack
- FileTP (wget-clone)
- DC++


%package gui
Summary:	Graphical frontend for mldonkey based on GTK
Group:		Applications/Internet
Requires:	hicolor-icon-theme
# TODO requirement for mldonkey_previewer
# Requires:	mplayer


%description gui
The GTK interface for mldonkey provides a convenient way of managing
all mldonkey operations. It gives details about conected servers,
downloaded files, friends and lets one search for files in a pleasing
way.


%package server
Summary:	Enables mldonkey as a system daemon
Group:		System Environment/Daemons
Requires:	%{name} = %{version}-%{release}
# Neseccary for mldonkey_df_monitor.sh
Requires:	mailx
Requires(pre):	/usr/sbin/useradd
Requires(post): /sbin/chkconfig
Requires(preun):/sbin/chkconfig
Requires(preun):/sbin/service


%description server
Contains init and configs to launch mldonkey as a service.

NOTE: by default incoming dir is located in %{_localstatedir}/lib/mldonkey/incoming
and temp dir in %{_localstatedir}/lib/cache/mldonkey. Mlondkey is launched
with the mldonkey user (created after installation).

NOTE: If you are using a password for your mldonkey, you need to specify
it in your %{_sysconfdir}/sysconfig/mldonkey, because mldonkey now stores
it encrypted.


%package -n konqueror-mldonkey-ed2k-support
Summary:	Easy way to download a ed2k-link from Konqueror
Group:		User Interface/Desktops
Requires:	perl(LWP::UserAgent)
Requires:	kde-filesystem


%description -n konqueror-mldonkey-ed2k-support
This package contains tool which gives you an easy way to add an ed2k-link
(like ed2k://|file|filename.exe|21352658|72b0b287cab7d875ccc1d89ebe910b9g|)
with a single click to your mldonkey download queue.
You need to edit %{_sysconfdir}/sysconfig/mldonkey_submit


#%package -n mozilla-mldonkey-ed2k-support
#Summary:	Easy way to download a ed2k-link from Mozilla/Firefox
#Group:		User Interface/Desktops
# TODO should it require firefox?


#%description -n mozilla-mldonkey-ed2k-support
#This package contains tool which gives you an easy way to add an ed2k-link
#(like ed2k://|file|filename.exe|21352658|72b0b287cab7d875ccc1d89ebe910b9g|)
#with a single click within Mozilla/Firefox to your mldonkey download queue.
#The tool is a .xpi file to import into mozilla. The file is located in
#%{_datadir}/%name


%prep
%setup -q
%patch0 -p1 -b .fedora
# Let's make rpmlint happy
sed -i 's|\r||g' distrib/ed2k_submit/README.MLdonkeySubmit
sed -i 's|\r||g' docs/slavanap.txt

iconv -f iso8859-1 -t UTF-8 docs/gnutella.txt > docs/gnutella.utf8 && mv docs/gnutella.{utf8,txt}
iconv -f iso8859-1 -t UTF-8 distrib/Authors.txt > distrib/Authors.utf8 && mv distrib/Authors.{utf8,txt}

chmod 644 src/utils/lib/fst_hash.c
chmod 644 src/networks/fasttrack/fst_crypt_ml.c


%build
%configure --enable-pthread \
           --enable-ocamlver=%(rpm -q --qf '%%{version}' ocaml) \
           --enable-gui=newgui2 \
           --disable-gd

make depend
# Does not support parallel builds
make
make utils


%install
rm -rf $RPM_BUILD_ROOT
DONT_GPRINTIFY=1
export DONT_GPRINTIFY
make DESTDIR=$RPM_BUILD_ROOT install

# core
install -p -m 755 distrib/mldonkey_command $RPM_BUILD_ROOT%{_bindir}/mldonkey_command
install -p -m 755 distrib/kill_mldonkey $RPM_BUILD_ROOT%{_bindir}/kill_mldonkey

# utils
for util in copysources mld_hash get_range make_torrent svg_converter subconv; do
	install -p -m 755 $util $RPM_BUILD_ROOT%{_bindir}/$util ;
done

# gui
install -p -m 755 mlguistarter $RPM_BUILD_ROOT%{_bindir}/mlguistarter

# install preview utility
install -p -m 755 distrib/mldonkey_previewer $RPM_BUILD_ROOT%{_bindir}/mldonkey_previewer

# menu and pixmaps
install packages/rpm/mldonkey-icon-16.png -D -m 644 $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/apps/mldonkey.png
install packages/rpm/mldonkey-icon-32.png -D -m 644 $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/mldonkey.png
install packages/rpm/mldonkey-icon-48.png -D -m 644 $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/mldonkey.png
install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/pixmaps
ln -s ../icons/hicolor/48x48/apps/mldonkey.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/mldonkey.png
desktop-file-install --vendor fedora --dir $RPM_BUILD_ROOT%{_datadir}/applications --copy-generic-name-to-name %{SOURCE1}

# Send email when mldonkey runs out of allowed disk space
install -D -p -m 755 %{SOURCE9} $RPM_BUILD_ROOT%{_sbindir}/mldonkey_df_monitor.sh
sed -i 's,/var,%{_localstatedir},g;
        s,/etc/init.d,%{_initrddir},g;
        s,/etc,%{_sysconfdir},g' $RPM_BUILD_ROOT%{_sbindir}/mldonkey_df_monitor.sh

install -D -p -m 644 %{SOURCE8} $RPM_BUILD_ROOT%{_sysconfdir}/cron.d/mldonkey_df_monitor
sed -i 's,/usr/sbin,%{_sbindir},g' $RPM_BUILD_ROOT%{_sysconfdir}/cron.d/mldonkey_df_monitor

# create directory for storing log-file
install -d -m 755 $RPM_BUILD_ROOT%{_localstatedir}/log/mldonkey

# install logrotate script for  /var/log/mldonkey/mldonkey.log
install -D -p -m 644 %{SOURCE11} $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/mldonkey
sed -i 's,/var,%{_localstatedir},g' $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/mldonkey

# install init-scipt
install -D -p -m 755 packages/rpm/mldonkey.init $RPM_BUILD_ROOT%{_initrddir}/mldonkey
sed -e 's,/etc/init.d,%{_initrddir},g;
        s,/etc,%{_sysconfdir},g;
        s,/var,%{_localstatedir},g' $RPM_BUILD_ROOT%{_initrddir}/mldonkey

# Create necessary directories for server
install -d -m 755 $RPM_BUILD_ROOT%{_localstatedir}/cache/mldonkey
install -d -m 755 $RPM_BUILD_ROOT%{_localstatedir}/lib/%{name}/incoming

# create downloads.ini
echo "temp_directory = \"%{_localstatedir}/cache/mldonkey\"" > $RPM_BUILD_ROOT%{_localstatedir}/lib/%{name}/downloads.ini
echo "incoming_directory = \"%{_localstatedir}/lib/%{name}/incoming\"" >> $RPM_BUILD_ROOT%{_localstatedir}/lib/%{name}/downloads.ini
echo "mldonkey_gui = \"%{_bindir}/mlgui\"" >> $RPM_BUILD_ROOT%{_localstatedir}/lib/%{name}/downloads.ini
echo "mldonkey_bin = \"%{_bindir}/mldonkey\"" >> $RPM_BUILD_ROOT%{_localstatedir}/lib/%{name}/downloads.ini
echo "log_file = \"%{_localstatedir}/log/mldonkey/mldonkey.log\"" >> $RPM_BUILD_ROOT%{_localstatedir}/lib/%{name}/downloads.ini

# Install sysconfig file
install -D -p -m 644 packages/rpm/mldonkey.sysconfig $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/mldonkey
sed -i 's,/var,%{_localstatedir},g' $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/mldonkey

# ed2k for konqueror support
install -p -m 755 distrib/ed2k_submit/mldonkey_submit $RPM_BUILD_ROOT%{_bindir}/mldonkey_submit
install -p -m 644 distrib/ed2k_submit/mldonkey $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/mldonkey_submit
sed -i 's,myusername,,;s,mypassword,,' $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/mldonkey_submit
install -D -p -m 644 distrib/ed2k_submit/ed2k.protocol  $RPM_BUILD_ROOT%{_datadir}/services/ed2k.protocol

# ed2k for mozilla support
# TODO should we unpack it into FF's plugins directory?
#install -D -p -m 644 distrib/ed2k_mozilla/mldonkey_protocol_handler-2.2.xpi $RPM_BUILD_ROOT%{_datadir}/%{name}/mldonkey_protocol_handler-2.2.xpi


%clean
rm -rf $RPM_BUILD_ROOT


%pre server
/usr/sbin/useradd -r -d %{_localstatedir}/lib/%{name} \
                  -c "MlDonkey service" -s /bin/bash mldonkey 2>/dev/null || :


%post server
if [ "$1" == "1" ]; then
	/sbin/chkconfig --add mldonkey || :
fi


%preun server
if [ "$1" == "0" ]; then
	/sbin/service mldonkey stop >/dev/null 2>&1 || :
	/sbin/chkconfig --del mldonkey || :
fi


%files
%defattr(-,root,root)
%doc Copying.txt distrib/Authors.txt distrib/Bugs.txt distrib/ChangeLog distrib/Developers.txt
%doc docs
%{_bindir}/mlnet
%{_bindir}/mldonkey_command
%{_bindir}/kill_mldonkey
%{_bindir}/copysources
%{_bindir}/get_range
%{_bindir}/make_torrent
%{_bindir}/mlbt
%{_bindir}/mld_hash
%{_bindir}/mldc
%{_bindir}/mlgnut
%{_bindir}/mldonkey
%{_bindir}/mlslsk
%{_bindir}/subconv
%{_bindir}/svg_converter


%files gui
%defattr(-,root,root)
%doc Copying.txt distrib/Authors.txt distrib/Bugs.txt distrib/ChangeLog distrib/Developers.txt
%{_bindir}/mlbt+gui
%{_bindir}/mldc+gui
%{_bindir}/mldonkey+gui
%{_bindir}/mldonkey_gui
%{_bindir}/mldonkey_previewer
%{_bindir}/mlgnut+gui
%{_bindir}/mlgui
%{_bindir}/mlguistarter
%{_bindir}/mlnet+gui
%{_bindir}/mlslsk+gui
%{_datadir}/applications/*.desktop
%{_datadir}/icons/hicolor/16x16/apps/mldonkey.png
%{_datadir}/icons/hicolor/32x32/apps/mldonkey.png
%{_datadir}/icons/hicolor/48x48/apps/mldonkey.png
%{_datadir}/pixmaps/mldonkey.png


%files server
%defattr(-,root,root)
%doc Copying.txt
%config(noreplace) %{_sysconfdir}/sysconfig/mldonkey
%config(noreplace) %{_sysconfdir}/cron.d/mldonkey_df_monitor
%attr(755,root,root) %{_initrddir}/mldonkey
%config(noreplace) %{_sysconfdir}/logrotate.d/mldonkey
%{_sbindir}/mldonkey_df_monitor.sh
%attr(750,mldonkey,mldonkey) %dir %{_localstatedir}/log/mldonkey
%attr(750,mldonkey,mldonkey) %dir %{_localstatedir}/cache/mldonkey
%attr(750,mldonkey,mldonkey) %dir %{_localstatedir}/lib/mldonkey
%attr(770,mldonkey,mldonkey) %dir %{_localstatedir}/lib/mldonkey/incoming
%config(noreplace) %{_localstatedir}/lib/mldonkey/downloads.ini


#%files -n mozilla-mldonkey-ed2k-support
#%defattr(-,root,root)
#%doc Copying.txt
#%{_datadir}/%{name}/mldonkey_protocol_handler-2.2.xpi


%files -n konqueror-mldonkey-ed2k-support
%defattr(-,root,root)
%doc Copying.txt distrib/ed2k_submit/README.MLdonkeySubmit
%config(noreplace) %{_sysconfdir}/sysconfig/mldonkey_submit
%{_bindir}/mldonkey_submit
%{_datadir}/services/ed2k.protocol


%changelog
* Mon Jan 26 2009 Peter Lemenkov <lemenkov at gmail.com> 2.9.6-3
- Temporarily disable mozilla support

* Sat Dec  6 2008 Peter Lemenkov <lemenkov at gmail.com> 2.9.6-2
- Fixed installation of sysconfig-file

* Mon Aug 25 2008 Peter Lemenkov <lemenkov at gmail.com> 2.9.6-1
- Ver. 2.9.6

* Mon Jun 23 2008 Peter Lemenkov <lemenkov at gmail.com> 2.9.5-1
- Ver. 2.9.5

* Sun Jan 27 2008 Peter Lemenkov <lemenkov at gmail.com> 2.9.3-1
- Ver. 2.9.3

* Sun Jan 13 2008 Peter Lemenkov <lemenkov at gmail.com> 2.9.2-2
- Correct BR for perl modules
- More robust iconv usage
- Fixed desktop file
- Changed BR for scriplets

* Sun Nov  4 2007 Peter Lemenkov <lemenkov at gmail.com> 2.9.2-1
- Ver. 2.9.2
- BR ocaml >= 3.10.0
- BR lablgtk > 2.10.0

* Tue Sep 25 2007 Peter Lemenkov <lemenkov at gmail.com> 2.9.1-1
- Ver. 2.9.1
- converted two non-UTF8 text-files

* Sun Aug 19 2007 Peter Lemenkov <lemenkov at gmail.com> 2.9.0-2
- fixed License tag as required in Fedora

* Sun Aug  5 2007 Peter Lemenkov <lemenkov at gmail.com> 2.9.0-1
- Added shadow-utils as required
- Ver. 2.9.0
- Disabled Gnutella/G2 (unmaintained)
- Added BR file-devel (for libmagic)

* Wed Jun  6 2007 Peter Lemenkov <lemenkov at gmail.com> 2.8.7-1
- Ver. 2.8.7
- Added DC++ back

* Sun May 20 2007 Peter Lemenkov <lemenkov at gmail.com> 2.8.5-6
- Splitted ed2k-support to mozilla-mldonkey-ed2k-support and
  konqueror-mldonkey-ed2k-support

* Sun May 13 2007 Peter Lemenkov <lemenkov at gmail.com> 2.8.5-5
- Fixed bug #1421

* Sat May  5 2007 Peter Lemenkov <lemenkov at gmail.com> 2.8.5-4
- Fixed file conflicts
- Removed soulseek support (broken)

* Sat May  5 2007 Peter Lemenkov <lemenkov at gmail.com> 2.8.5-3
- Removed mysterious Requires kdelibs

* Fri May  4 2007 Peter Lemenkov <lemenkov at gmail.com> 2.8.5-2
- Added BR ncurses-devel

* Mon Apr 23 2007 Peter Lemenkov <lemenkov at gmail.com> 2.8.5-1
- version 2.8.5
- graphical stats disabled (temporarily?), see bug #1191
- mlchat removed from upstream

* Sun May 21 2006 Aurelien Bompard <gauret[AT]free.fr> 2.7.6-1
- version 2.7.6

* Mon Apr 17 2006 Aurelien Bompard <gauret[AT]free.fr> 2.7.5-1
- version 2.7.5

* Wed Mar 15 2006 Aurelien Bompard <gauret[AT]free.fr> 2.7.3-1
- version 2.7.3
- drop patch 0 & patch 1 (applied upstream)

* Thu Mar 09 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
- switch to new release field

* Tue Feb 28 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
- add dist

* Fri Dec 02 2005 Aurelien Bompard <gauret[AT]free.fr> 2.7.0-0.lvn.2
- patch init script to add condrestart
- use condrestart in logrotate

* Sun Nov 20 2005 Aurelien Bompard <gauret[AT]free.fr> 2.7.0-0.lvn.1
- version 2.7.0
- fix logrotate file

* Mon Sep 05 2005 Aurelien Bompard <gauret[AT]free.fr> 2.6.4-0.lvn.1
- version 2.6.4

* Mon Aug 22 2005 Aurelien Bompard <gauret[AT]free.fr> 2.6.3-0.lvn.1
- version 2.6.3

* Thu Aug 11 2005 Aurelien Bompard <gauret[AT]free.fr> 2.6.2-0.lvn.1
- version 2.6.2

* Wed Aug 10 2005 Aurelien Bompard <gauret[AT]free.fr> 2.6.1-0.lvn.1
- version 2.6.1
- don't start initscript on boot by default

* Fri Jul 22 2005 Aurelien Bompard <gauret[AT]free.fr> 2.6.0-0.lvn.1
- update to 2.6.0
- drop explicit Epoch

* Mon Jun 27 2005 Aurelien Bompard <gauret[AT]free.fr> 0:2.5.30.16-0.lvn.1
- version 2.5.30.16
- add missing scriptlets requirements
- don't remove the mldonkey user on uninstall
- init script: sync with upstream
- sysconfig file: sync with upstream
- start script: sync with upstream

* Sun Feb 13 2005 Aurelien Bompard <gauret[AT]free.fr> 0:2.5.28-0.lvn.1
- version 2.5.28
- enable gui
- disable direct-connect (broken at the moment)

* Wed Aug 04 2004 Aurelien Bompard <gauret[AT]free.fr> 0:2.5.22-0.lvn.1
- version 2.5.22
- get ready for the new gui based on GTK2
  (upstream says "still a little buggy", and it does not build yet)

* Thu May 06 2004 Aurelien Bompard <gauret[AT]free.fr> 0:2.5.21-0.lvn.1
- version 2.5.21 (bugfix again...)

* Tue May 04 2004 Aurelien Bompard <gauret[AT]free.fr> 0:2.5.20-0.lvn.1
- version 2.5.20 (bugfix)

* Mon May 03 2004 Aurelien Bompard <gauret[AT]free.fr> 0:2.5.19-0.lvn.1
- version 2.5.19

* Sun Apr 25 2004 Aurelien Bompard <gauret[AT]free.fr> 0:2.5.18-0.lvn.1
- version 2.5.18

* Mon Mar 08 2004 Aurelien Bompard <gauret[AT]free.fr> 0:2.5.16-0.lvn.1
- update to version 2.5.16
- new subconv tool to convert movie subtitles

* Mon Mar 01 2004 Aurelien Bompard <gauret[AT]free.fr> 0:2.5.12-0.lvn.1
- Initial Fedora package, ported from Mandrake/PLF


--- NEW FILE mldonkey_df_monitor.crond ---
*/30 * * * *	root	/usr/sbin/mldonkey_df_monitor.sh


--- NEW FILE mldonkey_df_monitor.sh ---
#!/bin/sh

CACHEDIR="/var/cache/mldonkey"
MINFREE=102400
EMAIL="root at localhost"

. /etc/sysconfig/mldonkey

[ ! "$ENABLE_DF_MONITOR" = "yes" ] && exit

send_email() {
	mail -s "mldonkey, disk space warning" $EMAIL << EOF

your $CACHEDIR has only $CURFREE KiB free space left
all downloads paused

BTW: you can control this check by editing /etc/sysconfig/mldonkey.
EOF
}


CURFREE=`df -P -k $CACHEDIR | tail -n 1 | awk '{ print $4 }'`
if [ $CURFREE -lt $MINFREE ] ; then
	/etc/init.d/mldonkey pause > /dev/null
	send_email
fi



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mldonkey/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	20 Jan 2009 21:18:40 -0000	1.1
+++ .cvsignore	26 Jan 2009 11:00:36 -0000	1.2
@@ -0,0 +1 @@
+mldonkey-2.9.6.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mldonkey/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	20 Jan 2009 21:18:40 -0000	1.1
+++ sources	26 Jan 2009 11:00:36 -0000	1.2
@@ -0,0 +1 @@
+5da87678449bf87ce0c78f37e7871eb9  mldonkey-2.9.6.tar.bz2



From kkofler at fedoraproject.org  Mon Jan 26 11:03:45 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Mon, 26 Jan 2009 11:03:45 +0000 (UTC)
Subject: rpms/libmal/F-9 libmal-0.31-64bit.patch, 1.2,
	1.3 libmal-0.31-pi12.patch, 1.2, 1.3 libmal.spec, 1.10,
	1.11 sources, 1.3, 1.4 libmal-0.44-64bit.patch, 1.1, NONE
Message-ID: <20090126110345.995F27010C@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/libmal/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30924/F-9

Modified Files:
	libmal.spec sources 
Added Files:
	libmal-0.31-64bit.patch libmal-0.31-pi12.patch 
Removed Files:
	libmal-0.44-64bit.patch 
Log Message:
Revert F-9 to libmal 0.31, last version to work with kdepim 3.5. (0.44 wasn't built.)

libmal-0.31-64bit.patch:

Index: libmal-0.31-64bit.patch
===================================================================
RCS file: libmal-0.31-64bit.patch
diff -N libmal-0.31-64bit.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ libmal-0.31-64bit.patch	26 Jan 2009 11:03:14 -0000	1.3
@@ -0,0 +1,22 @@
+--- libmal-0.31/configure.64	2003-03-23 11:33:42.000000000 -0600
++++ libmal-0.31/configure	2004-12-16 11:37:13.000000000 -0600
+@@ -8102,7 +8102,7 @@
+ pilotlibs=no
+ PILOT_LIBS="-lpisock"
+ 
+-for pilot_libs in $pilot_prefix/lib /usr/lib /usr/local/lib/ \
++for pilot_libs in $pilot_prefix/lib $libdir /usr/lib /usr/local/lib/ \
+   /usr/extra/pilot/lib ; do
+    if test -r "$pilot_libs/libpisock.so" ; then
+       pilotlibs=yes
+--- libmal-0.31/configure.in.64	2003-03-22 12:37:22.000000000 -0600
++++ libmal-0.31/configure.in	2004-12-16 11:36:57.000000000 -0600
+@@ -60,7 +60,7 @@
+ pilotlibs=no
+ PILOT_LIBS="-lpisock"
+ 
+-for pilot_libs in $pilot_prefix/lib /usr/lib /usr/local/lib/ \
++for pilot_libs in $pilot_prefix/lib $libdir /usr/lib /usr/local/lib/ \
+   /usr/extra/pilot/lib ; do
+    if test -r "$pilot_libs/libpisock.so" ; then
+       pilotlibs=yes

libmal-0.31-pi12.patch:

Index: libmal-0.31-pi12.patch
===================================================================
RCS file: libmal-0.31-pi12.patch
diff -N libmal-0.31-pi12.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ libmal-0.31-pi12.patch	26 Jan 2009 11:03:14 -0000	1.3
@@ -0,0 +1,85 @@
+--- libmal-0.31/libmal.c.pi12	2003-03-23 11:00:26.000000000 -0600
++++ libmal-0.31/libmal.c	2005-06-14 10:51:54.000000000 -0500
+@@ -508,8 +508,13 @@
+     uint8 buffer[BUFFERSIZE];
+     AGBufferReader * r = NULL;
+ 
++#if (PILOT_LINK_MAJOR >= 12)
++    rc = dlp_ReadRecordByIndex(sd, userConfigDBHandle, 0, (void *)buffer,
++                               &id, &attr, &cat);
++#else
+     rc = dlp_ReadRecordByIndex(sd, userConfigDBHandle, 0, (void *)buffer,
+                                &id, &bufferSize, &attr, &cat);
++#endif
+ 
+     if (rc < 0) {
+ #ifdef _DEBUG
+@@ -541,8 +546,13 @@
+     uint8 buffer[BUFFERSIZE];
+     AGBufferReader * r = NULL;
+ 
++#if (PILOT_LINK_MAJOR >= 12)
++    rc = dlp_ReadRecordByIndex(sd, userConfigDBHandle, 0, (void *)buffer,
++                               &id, &attr, &cat);
++#else
+     rc = dlp_ReadRecordByIndex(sd, userConfigDBHandle, 0, (void *)buffer,
+                                &id, &bufferSize, &attr, &cat);
++#endif
+ 
+     if (rc < 0) {
+ #ifdef _DEBUG
+@@ -596,9 +606,13 @@
+             AGUserConfigWriteData(deviceUserConfig, (AGWriter*)w);
+         }
+ 
+-        result = dlp_ReadRecordByIndex(sd, userConfigDBHandle, 0, (void *)buffer
+-                                       ,
+-                                       &id, &bufferSize, &attr, &cat);
++#if (PILOT_LINK_MAJOR >= 12)
++        result = dlp_ReadRecordByIndex(sd, userConfigDBHandle, 0, (void *)buffer,
++                               &id, &attr, &cat);
++#else
++        result = dlp_ReadRecordByIndex(sd, userConfigDBHandle, 0, (void *)buffer,
++                               &id, &bufferSize, &attr, &cat);
++#endif
+ 
+         if (result < 0)
+             id = 0;
+@@ -881,13 +895,25 @@
+     int idx   = pInfo->pilot_RecIndex++;
+ 
+     result = (modonly) ?
++#if (PILOT_LINK_MAJOR >= 12)
++        dlp_ReadNextModifiedRec (sd, pInfo->pilot_rHandle, pInfo->pilot_buffer,
++                                 &pInfo->id, &idx,
++                                 &att, &cat)
++#else
+         dlp_ReadNextModifiedRec (sd, pInfo->pilot_rHandle, pInfo->pilot_buffer,
+                                  &pInfo->id, &idx,
+                                  &size, &att, &cat)
++#endif
+         :
++#if (PILOT_LINK_MAJOR >= 12)
++        dlp_ReadRecordByIndex(sd, pInfo->pilot_rHandle, idx,
++                              pInfo->pilot_buffer, &pInfo->id,
++                              &att, &cat);
++#else
+         dlp_ReadRecordByIndex(sd, pInfo->pilot_rHandle, idx,
+                               pInfo->pilot_buffer, &pInfo->id,
+                               &size, &att, &cat);
++#endif
+     
+     if (result < 0) {
+         closeDatabase(pInfo);
+@@ -1208,7 +1234,11 @@
+     
+     strcpy(addr.pi_device, device);
+     
++#if (PILOT_LINK_MAJOR >= 12)
++    ret = pi_bind(sd, (struct sockaddr*)&addr);
++#else
+     ret = pi_bind(sd, (struct sockaddr*)&addr, sizeof(addr));
++#endif
+     if(ret == -1) {
+         /*fprintf(stderr, "Unable to bind to port '%s'.\n", device);*/
+         (*printerror) ("Unable to bind to port '%s'.\n", device);


Index: libmal.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libmal/F-9/libmal.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- libmal.spec	26 Jan 2009 10:52:55 -0000	1.10
+++ libmal.spec	26 Jan 2009 11:03:15 -0000	1.11
@@ -1,16 +1,20 @@
 
 Summary: A convenience library for malsync
 Name:    libmal
-Version: 0.44
-Release: 1%{?dist}
+# NOTE: this isn't the latest version, but is the last version known to 
+# work with kdepim-3.5.x
+Version: 0.31 
+Release: 8%{?dist}
 
 License: MPLv1.0
-Url: 	 http://jasonday.home.att.net/code/libmal/
-Source0: http://jasonday.home.att.net/code/libmal/libmal-%{version}.tar.gz
+Url: 	 http://jasonday.home.att.net/code/libmal/ 
+Source0: http://jasonday.home.att.net/code/libmal/libmal-%{version}.tar.gz 
 Group:   System Environment/Libraries	
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Patch1: libmal-0.44-64bit.patch
+Patch1: libmal-0.31-64bit.patch
+# pilot-link-0.12 fixes
+Patch2: libmal-0.31-pi12.patch
 
 BuildRequires: pilot-link-devel 
 
@@ -30,6 +34,7 @@
 %setup -q 
 
 %patch1 -p1 -b .64bits
+%patch2 -p1 -b .pi12
 
 
 %build
@@ -61,7 +66,6 @@
 %doc ChangeLog README
 #empties
 #doc AUTHORS NEWS TODO
-%{_bindir}/malsync
 %{_libdir}/lib*.so.*
 
 %files devel
@@ -71,12 +75,6 @@
 
 
 %changelog
-* Thu Jan 15 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 0.44-1
-- update to 0.44 (for kdepim 4.2)
-- drop libmal-0.31-pi12.patch (fixed upstream)
-- rebase 64bit patch
-- package new file %%{_bindir}/malsync
-
 * Fri Feb 08 2008 Rex Dieter <rdieter at fedoraproject.org> 0.31-8 
 - respin (gcc43)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libmal/F-9/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	26 Jan 2009 10:52:55 -0000	1.3
+++ sources	26 Jan 2009 11:03:15 -0000	1.4
@@ -1 +1 @@
-826f2334c8eb24f5e170f208581fdffb  libmal-0.44.tar.gz
+3d1fd0a5ece6de47d55df5829ee8b6a2  libmal-0.31.tar.gz


--- libmal-0.44-64bit.patch DELETED ---



From peter at fedoraproject.org  Mon Jan 26 11:06:51 2009
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Mon, 26 Jan 2009 11:06:51 +0000 (UTC)
Subject: rpms/mldonkey/EL-5 import.log, NONE, 1.1 mldonkey-gui.desktop, NONE,
	1.1 mldonkey-initscript.patch, NONE, 1.1 mldonkey.logrotate,
	NONE, 1.1 mldonkey.spec, NONE, 1.1 mldonkey_df_monitor.crond,
	NONE, 1.1 mldonkey_df_monitor.sh, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090126110651.D0F4F7010C@cvs1.fedora.phx.redhat.com>

Author: peter

Update of /cvs/pkgs/rpms/mldonkey/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31641/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	import.log mldonkey-gui.desktop mldonkey-initscript.patch 
	mldonkey.logrotate mldonkey.spec mldonkey_df_monitor.crond 
	mldonkey_df_monitor.sh 
Log Message:
Initial import


--- NEW FILE import.log ---
mldonkey-2_9_6-3_fc10:EL-5:mldonkey-2.9.6-3.fc10.src.rpm:1232967945


--- NEW FILE mldonkey-gui.desktop ---
[Desktop Entry]
Name=MlDonkey
Type=Application
GenericName=MlDonkey peer-to-peer client
Exec=mlgui
Icon=mldonkey
Categories=Network;
Encoding=UTF-8

mldonkey-initscript.patch:

--- NEW FILE mldonkey-initscript.patch ---
diff --git a/packages/rpm/mldonkey.init b/packages/rpm/mldonkey.init
index 536a88a..2291a9b 100755
--- a/packages/rpm/mldonkey.init
+++ b/packages/rpm/mldonkey.init
@@ -4,7 +4,7 @@
 #
 # Laurent Culioli <laurent at pschit.net>
 #
-# chkconfig: 2345 90 15
+# chkconfig: - 90 15
 # description: Mldonkey is client to access multiple peer-to-peer network
 # processname: mldonkey
 # config: /etc/sysconfig/mldonkey
@@ -15,6 +15,8 @@
 # Source some options 
 . /etc/sysconfig/mldonkey
 
+[ -z $LOGFILE ] && LOGFILE="/dev/null"
+
 RETVAL=0
 
 # Path to the mldonkey binarie.
@@ -27,17 +29,18 @@ fullpath=/usr/bin/mlnet
 [ ${NETWORKING} = "no" ] && exit 0
 
 start() {
-        gprintf "Starting Mldonkey (mlnet): "
-         cd $DIRECTORY
-	daemon --user mldonkey --check mldonkey $NICE "$fullpath  > /dev/null 2>&1 &"
-	touch /var/lock/subsys/mldonkey
-	echo
+       echo -n $"Starting Mldonkey (mlnet): "
+       cd $DIRECTORY
+       daemon --user mldonkey --check mldonkey $NICE "$fullpath  > $LOGFILE 2>&1 &"
+       RETVAL=$?
+       [ $RETVAL -eq 0 ] && touch /var/lock/subsys/mldonkey
+       echo
 }
 stop() {
-        gprintf "Stopping Mldonkey (mlnet): "
-        killproc mldonkey-bin
-	rm -fr /var/lock/subsys/mldonkey
-	echo
+       echo -n $"Stopping Mldonkey (mlnet): "
+       killproc $fullpath
+       rm -fr /var/lock/subsys/mldonkey
+       echo
 }
 
 
@@ -53,11 +56,19 @@ case "$1" in
                 stop
                 start
                 ;;
+        condrestart)
+                if status mldonkey >/dev/null; then
+                    stop
+                    start
+                else
+                    echo $"Mldonkey (mlnet) is stopped"
+                fi
+                ;;
         status)
 	        status mldonkey
 		;;
-	*)
-                gprintf "Usage: mldonkey {start|stop|restart|reload|status}\n"
+        *)
+                echo $"Usage: $0 {start|stop|restart|reload|condrestart|status}"
                 RETVAL=1
 esac
 exit $RETVAL


--- NEW FILE mldonkey.logrotate ---
/var/log/mldonkey/mldonkey.log {
    monthly
    notifempty
    missingok
    compress
    postrotate
    service mldonkey condrestart > /dev/null
    endscript
}


--- NEW FILE mldonkey.spec ---
Name:		mldonkey
Version:	2.9.6
Release:	3%{?dist}
Summary:	Client for several P2P networks
License:	GPLv2+
Source0:	http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
Source1:	mldonkey-gui.desktop
Source8:	mldonkey_df_monitor.crond
Source9:	mldonkey_df_monitor.sh
Source11:	mldonkey.logrotate
Patch0:		mldonkey-initscript.patch
URL:		http://mldonkey.sourceforge.net
Group:		Applications/Internet
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:	ocaml >= 3.10.0
BuildRequires:	ocaml-camlp4-devel
BuildRequires:	ocaml-lablgtk-devel >= 2.10.0
BuildRequires:	zlib-devel
BuildRequires:	desktop-file-utils
BuildRequires:	gtk2-devel >= 2.4.0
BuildRequires:	librsvg2-devel >= 2.4.0
BuildRequires:	bzip2-devel
BuildRequires:	ncurses-devel
BuildRequires:	file-devel
Requires:	logrotate
# for kill_mldonkey
Requires:	perl(LWP::UserAgent)
# for mldonkey_command
Requires:	nc


%description
MLDonkey is a door to the 'donkey' network, a decentralized network used to
exchange big files on the Internet. It is written in a wonderful language,
called Objective-Caml, and present most features of the basic Windows donkey
client, plus some more:
  - It should work on most UNIX-compatible platforms.
  - You can remotely command your client, either by telnet (port 4000),
    by a WEB browser (http://localhost:4080), or with a classical client
    interface (see http://www.nongnu.org/mldonkey)
  - You can connect to several servers, and each search will query all the
    connected servers.
  - You can select mp3s by bitrates in queries (useful ?).
  - You can select the name of a downloaded file before moving it to your
    incoming directory.
  - You can have several queries in the graphical user interface at the same
    time.
  - You can remember your old queries results in the command-line interface.
  - You can search in the history of all files you have seen on the network.

It can also access other peer-to-peer networks:
- BitTorrent
- Fasttrack
- FileTP (wget-clone)
- DC++


%package gui
Summary:	Graphical frontend for mldonkey based on GTK
Group:		Applications/Internet
Requires:	hicolor-icon-theme
# TODO requirement for mldonkey_previewer
# Requires:	mplayer


%description gui
The GTK interface for mldonkey provides a convenient way of managing
all mldonkey operations. It gives details about conected servers,
downloaded files, friends and lets one search for files in a pleasing
way.


%package server
Summary:	Enables mldonkey as a system daemon
Group:		System Environment/Daemons
Requires:	%{name} = %{version}-%{release}
# Neseccary for mldonkey_df_monitor.sh
Requires:	mailx
Requires(pre):	/usr/sbin/useradd
Requires(post): /sbin/chkconfig
Requires(preun):/sbin/chkconfig
Requires(preun):/sbin/service


%description server
Contains init and configs to launch mldonkey as a service.

NOTE: by default incoming dir is located in %{_localstatedir}/lib/mldonkey/incoming
and temp dir in %{_localstatedir}/lib/cache/mldonkey. Mlondkey is launched
with the mldonkey user (created after installation).

NOTE: If you are using a password for your mldonkey, you need to specify
it in your %{_sysconfdir}/sysconfig/mldonkey, because mldonkey now stores
it encrypted.


%package -n konqueror-mldonkey-ed2k-support
Summary:	Easy way to download a ed2k-link from Konqueror
Group:		User Interface/Desktops
Requires:	perl(LWP::UserAgent)
Requires:	kde-filesystem


%description -n konqueror-mldonkey-ed2k-support
This package contains tool which gives you an easy way to add an ed2k-link
(like ed2k://|file|filename.exe|21352658|72b0b287cab7d875ccc1d89ebe910b9g|)
with a single click to your mldonkey download queue.
You need to edit %{_sysconfdir}/sysconfig/mldonkey_submit


#%package -n mozilla-mldonkey-ed2k-support
#Summary:	Easy way to download a ed2k-link from Mozilla/Firefox
#Group:		User Interface/Desktops
# TODO should it require firefox?


#%description -n mozilla-mldonkey-ed2k-support
#This package contains tool which gives you an easy way to add an ed2k-link
#(like ed2k://|file|filename.exe|21352658|72b0b287cab7d875ccc1d89ebe910b9g|)
#with a single click within Mozilla/Firefox to your mldonkey download queue.
#The tool is a .xpi file to import into mozilla. The file is located in
#%{_datadir}/%name


%prep
%setup -q
%patch0 -p1 -b .fedora
# Let's make rpmlint happy
sed -i 's|\r||g' distrib/ed2k_submit/README.MLdonkeySubmit
sed -i 's|\r||g' docs/slavanap.txt

iconv -f iso8859-1 -t UTF-8 docs/gnutella.txt > docs/gnutella.utf8 && mv docs/gnutella.{utf8,txt}
iconv -f iso8859-1 -t UTF-8 distrib/Authors.txt > distrib/Authors.utf8 && mv distrib/Authors.{utf8,txt}

chmod 644 src/utils/lib/fst_hash.c
chmod 644 src/networks/fasttrack/fst_crypt_ml.c


%build
%configure --enable-pthread \
           --enable-ocamlver=%(rpm -q --qf '%%{version}' ocaml) \
           --enable-gui=newgui2 \
           --disable-gd

make depend
# Does not support parallel builds
make
make utils


%install
rm -rf $RPM_BUILD_ROOT
DONT_GPRINTIFY=1
export DONT_GPRINTIFY
make DESTDIR=$RPM_BUILD_ROOT install

# core
install -p -m 755 distrib/mldonkey_command $RPM_BUILD_ROOT%{_bindir}/mldonkey_command
install -p -m 755 distrib/kill_mldonkey $RPM_BUILD_ROOT%{_bindir}/kill_mldonkey

# utils
for util in copysources mld_hash get_range make_torrent svg_converter subconv; do
	install -p -m 755 $util $RPM_BUILD_ROOT%{_bindir}/$util ;
done

# gui
install -p -m 755 mlguistarter $RPM_BUILD_ROOT%{_bindir}/mlguistarter

# install preview utility
install -p -m 755 distrib/mldonkey_previewer $RPM_BUILD_ROOT%{_bindir}/mldonkey_previewer

# menu and pixmaps
install packages/rpm/mldonkey-icon-16.png -D -m 644 $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/apps/mldonkey.png
install packages/rpm/mldonkey-icon-32.png -D -m 644 $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/mldonkey.png
install packages/rpm/mldonkey-icon-48.png -D -m 644 $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/mldonkey.png
install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/pixmaps
ln -s ../icons/hicolor/48x48/apps/mldonkey.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/mldonkey.png
desktop-file-install --vendor fedora --dir $RPM_BUILD_ROOT%{_datadir}/applications --copy-generic-name-to-name %{SOURCE1}

# Send email when mldonkey runs out of allowed disk space
install -D -p -m 755 %{SOURCE9} $RPM_BUILD_ROOT%{_sbindir}/mldonkey_df_monitor.sh
sed -i 's,/var,%{_localstatedir},g;
        s,/etc/init.d,%{_initrddir},g;
        s,/etc,%{_sysconfdir},g' $RPM_BUILD_ROOT%{_sbindir}/mldonkey_df_monitor.sh

install -D -p -m 644 %{SOURCE8} $RPM_BUILD_ROOT%{_sysconfdir}/cron.d/mldonkey_df_monitor
sed -i 's,/usr/sbin,%{_sbindir},g' $RPM_BUILD_ROOT%{_sysconfdir}/cron.d/mldonkey_df_monitor

# create directory for storing log-file
install -d -m 755 $RPM_BUILD_ROOT%{_localstatedir}/log/mldonkey

# install logrotate script for  /var/log/mldonkey/mldonkey.log
install -D -p -m 644 %{SOURCE11} $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/mldonkey
sed -i 's,/var,%{_localstatedir},g' $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/mldonkey

# install init-scipt
install -D -p -m 755 packages/rpm/mldonkey.init $RPM_BUILD_ROOT%{_initrddir}/mldonkey
sed -e 's,/etc/init.d,%{_initrddir},g;
        s,/etc,%{_sysconfdir},g;
        s,/var,%{_localstatedir},g' $RPM_BUILD_ROOT%{_initrddir}/mldonkey

# Create necessary directories for server
install -d -m 755 $RPM_BUILD_ROOT%{_localstatedir}/cache/mldonkey
install -d -m 755 $RPM_BUILD_ROOT%{_localstatedir}/lib/%{name}/incoming

# create downloads.ini
echo "temp_directory = \"%{_localstatedir}/cache/mldonkey\"" > $RPM_BUILD_ROOT%{_localstatedir}/lib/%{name}/downloads.ini
echo "incoming_directory = \"%{_localstatedir}/lib/%{name}/incoming\"" >> $RPM_BUILD_ROOT%{_localstatedir}/lib/%{name}/downloads.ini
echo "mldonkey_gui = \"%{_bindir}/mlgui\"" >> $RPM_BUILD_ROOT%{_localstatedir}/lib/%{name}/downloads.ini
echo "mldonkey_bin = \"%{_bindir}/mldonkey\"" >> $RPM_BUILD_ROOT%{_localstatedir}/lib/%{name}/downloads.ini
echo "log_file = \"%{_localstatedir}/log/mldonkey/mldonkey.log\"" >> $RPM_BUILD_ROOT%{_localstatedir}/lib/%{name}/downloads.ini

# Install sysconfig file
install -D -p -m 644 packages/rpm/mldonkey.sysconfig $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/mldonkey
sed -i 's,/var,%{_localstatedir},g' $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/mldonkey

# ed2k for konqueror support
install -p -m 755 distrib/ed2k_submit/mldonkey_submit $RPM_BUILD_ROOT%{_bindir}/mldonkey_submit
install -p -m 644 distrib/ed2k_submit/mldonkey $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/mldonkey_submit
sed -i 's,myusername,,;s,mypassword,,' $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/mldonkey_submit
install -D -p -m 644 distrib/ed2k_submit/ed2k.protocol  $RPM_BUILD_ROOT%{_datadir}/services/ed2k.protocol

# ed2k for mozilla support
# TODO should we unpack it into FF's plugins directory?
#install -D -p -m 644 distrib/ed2k_mozilla/mldonkey_protocol_handler-2.2.xpi $RPM_BUILD_ROOT%{_datadir}/%{name}/mldonkey_protocol_handler-2.2.xpi


%clean
rm -rf $RPM_BUILD_ROOT


%pre server
/usr/sbin/useradd -r -d %{_localstatedir}/lib/%{name} \
                  -c "MlDonkey service" -s /bin/bash mldonkey 2>/dev/null || :


%post server
if [ "$1" == "1" ]; then
	/sbin/chkconfig --add mldonkey || :
fi


%preun server
if [ "$1" == "0" ]; then
	/sbin/service mldonkey stop >/dev/null 2>&1 || :
	/sbin/chkconfig --del mldonkey || :
fi


%files
%defattr(-,root,root)
%doc Copying.txt distrib/Authors.txt distrib/Bugs.txt distrib/ChangeLog distrib/Developers.txt
%doc docs
%{_bindir}/mlnet
%{_bindir}/mldonkey_command
%{_bindir}/kill_mldonkey
%{_bindir}/copysources
%{_bindir}/get_range
%{_bindir}/make_torrent
%{_bindir}/mlbt
%{_bindir}/mld_hash
%{_bindir}/mldc
%{_bindir}/mlgnut
%{_bindir}/mldonkey
%{_bindir}/mlslsk
%{_bindir}/subconv
%{_bindir}/svg_converter


%files gui
%defattr(-,root,root)
%doc Copying.txt distrib/Authors.txt distrib/Bugs.txt distrib/ChangeLog distrib/Developers.txt
%{_bindir}/mlbt+gui
%{_bindir}/mldc+gui
%{_bindir}/mldonkey+gui
%{_bindir}/mldonkey_gui
%{_bindir}/mldonkey_previewer
%{_bindir}/mlgnut+gui
%{_bindir}/mlgui
%{_bindir}/mlguistarter
%{_bindir}/mlnet+gui
%{_bindir}/mlslsk+gui
%{_datadir}/applications/*.desktop
%{_datadir}/icons/hicolor/16x16/apps/mldonkey.png
%{_datadir}/icons/hicolor/32x32/apps/mldonkey.png
%{_datadir}/icons/hicolor/48x48/apps/mldonkey.png
%{_datadir}/pixmaps/mldonkey.png


%files server
%defattr(-,root,root)
%doc Copying.txt
%config(noreplace) %{_sysconfdir}/sysconfig/mldonkey
%config(noreplace) %{_sysconfdir}/cron.d/mldonkey_df_monitor
%attr(755,root,root) %{_initrddir}/mldonkey
%config(noreplace) %{_sysconfdir}/logrotate.d/mldonkey
%{_sbindir}/mldonkey_df_monitor.sh
%attr(750,mldonkey,mldonkey) %dir %{_localstatedir}/log/mldonkey
%attr(750,mldonkey,mldonkey) %dir %{_localstatedir}/cache/mldonkey
%attr(750,mldonkey,mldonkey) %dir %{_localstatedir}/lib/mldonkey
%attr(770,mldonkey,mldonkey) %dir %{_localstatedir}/lib/mldonkey/incoming
%config(noreplace) %{_localstatedir}/lib/mldonkey/downloads.ini


#%files -n mozilla-mldonkey-ed2k-support
#%defattr(-,root,root)
#%doc Copying.txt
#%{_datadir}/%{name}/mldonkey_protocol_handler-2.2.xpi


%files -n konqueror-mldonkey-ed2k-support
%defattr(-,root,root)
%doc Copying.txt distrib/ed2k_submit/README.MLdonkeySubmit
%config(noreplace) %{_sysconfdir}/sysconfig/mldonkey_submit
%{_bindir}/mldonkey_submit
%{_datadir}/services/ed2k.protocol


%changelog
* Mon Jan 26 2009 Peter Lemenkov <lemenkov at gmail.com> 2.9.6-3
- Temporarily disable mozilla support

* Sat Dec  6 2008 Peter Lemenkov <lemenkov at gmail.com> 2.9.6-2
- Fixed installation of sysconfig-file

* Mon Aug 25 2008 Peter Lemenkov <lemenkov at gmail.com> 2.9.6-1
- Ver. 2.9.6

* Mon Jun 23 2008 Peter Lemenkov <lemenkov at gmail.com> 2.9.5-1
- Ver. 2.9.5

* Sun Jan 27 2008 Peter Lemenkov <lemenkov at gmail.com> 2.9.3-1
- Ver. 2.9.3

* Sun Jan 13 2008 Peter Lemenkov <lemenkov at gmail.com> 2.9.2-2
- Correct BR for perl modules
- More robust iconv usage
- Fixed desktop file
- Changed BR for scriplets

* Sun Nov  4 2007 Peter Lemenkov <lemenkov at gmail.com> 2.9.2-1
- Ver. 2.9.2
- BR ocaml >= 3.10.0
- BR lablgtk > 2.10.0

* Tue Sep 25 2007 Peter Lemenkov <lemenkov at gmail.com> 2.9.1-1
- Ver. 2.9.1
- converted two non-UTF8 text-files

* Sun Aug 19 2007 Peter Lemenkov <lemenkov at gmail.com> 2.9.0-2
- fixed License tag as required in Fedora

* Sun Aug  5 2007 Peter Lemenkov <lemenkov at gmail.com> 2.9.0-1
- Added shadow-utils as required
- Ver. 2.9.0
- Disabled Gnutella/G2 (unmaintained)
- Added BR file-devel (for libmagic)

* Wed Jun  6 2007 Peter Lemenkov <lemenkov at gmail.com> 2.8.7-1
- Ver. 2.8.7
- Added DC++ back

* Sun May 20 2007 Peter Lemenkov <lemenkov at gmail.com> 2.8.5-6
- Splitted ed2k-support to mozilla-mldonkey-ed2k-support and
  konqueror-mldonkey-ed2k-support

* Sun May 13 2007 Peter Lemenkov <lemenkov at gmail.com> 2.8.5-5
- Fixed bug #1421

* Sat May  5 2007 Peter Lemenkov <lemenkov at gmail.com> 2.8.5-4
- Fixed file conflicts
- Removed soulseek support (broken)

* Sat May  5 2007 Peter Lemenkov <lemenkov at gmail.com> 2.8.5-3
- Removed mysterious Requires kdelibs

* Fri May  4 2007 Peter Lemenkov <lemenkov at gmail.com> 2.8.5-2
- Added BR ncurses-devel

* Mon Apr 23 2007 Peter Lemenkov <lemenkov at gmail.com> 2.8.5-1
- version 2.8.5
- graphical stats disabled (temporarily?), see bug #1191
- mlchat removed from upstream

* Sun May 21 2006 Aurelien Bompard <gauret[AT]free.fr> 2.7.6-1
- version 2.7.6

* Mon Apr 17 2006 Aurelien Bompard <gauret[AT]free.fr> 2.7.5-1
- version 2.7.5

* Wed Mar 15 2006 Aurelien Bompard <gauret[AT]free.fr> 2.7.3-1
- version 2.7.3
- drop patch 0 & patch 1 (applied upstream)

* Thu Mar 09 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
- switch to new release field

* Tue Feb 28 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
- add dist

* Fri Dec 02 2005 Aurelien Bompard <gauret[AT]free.fr> 2.7.0-0.lvn.2
- patch init script to add condrestart
- use condrestart in logrotate

* Sun Nov 20 2005 Aurelien Bompard <gauret[AT]free.fr> 2.7.0-0.lvn.1
- version 2.7.0
- fix logrotate file

* Mon Sep 05 2005 Aurelien Bompard <gauret[AT]free.fr> 2.6.4-0.lvn.1
- version 2.6.4

* Mon Aug 22 2005 Aurelien Bompard <gauret[AT]free.fr> 2.6.3-0.lvn.1
- version 2.6.3

* Thu Aug 11 2005 Aurelien Bompard <gauret[AT]free.fr> 2.6.2-0.lvn.1
- version 2.6.2

* Wed Aug 10 2005 Aurelien Bompard <gauret[AT]free.fr> 2.6.1-0.lvn.1
- version 2.6.1
- don't start initscript on boot by default

* Fri Jul 22 2005 Aurelien Bompard <gauret[AT]free.fr> 2.6.0-0.lvn.1
- update to 2.6.0
- drop explicit Epoch

* Mon Jun 27 2005 Aurelien Bompard <gauret[AT]free.fr> 0:2.5.30.16-0.lvn.1
- version 2.5.30.16
- add missing scriptlets requirements
- don't remove the mldonkey user on uninstall
- init script: sync with upstream
- sysconfig file: sync with upstream
- start script: sync with upstream

* Sun Feb 13 2005 Aurelien Bompard <gauret[AT]free.fr> 0:2.5.28-0.lvn.1
- version 2.5.28
- enable gui
- disable direct-connect (broken at the moment)

* Wed Aug 04 2004 Aurelien Bompard <gauret[AT]free.fr> 0:2.5.22-0.lvn.1
- version 2.5.22
- get ready for the new gui based on GTK2
  (upstream says "still a little buggy", and it does not build yet)

* Thu May 06 2004 Aurelien Bompard <gauret[AT]free.fr> 0:2.5.21-0.lvn.1
- version 2.5.21 (bugfix again...)

* Tue May 04 2004 Aurelien Bompard <gauret[AT]free.fr> 0:2.5.20-0.lvn.1
- version 2.5.20 (bugfix)

* Mon May 03 2004 Aurelien Bompard <gauret[AT]free.fr> 0:2.5.19-0.lvn.1
- version 2.5.19

* Sun Apr 25 2004 Aurelien Bompard <gauret[AT]free.fr> 0:2.5.18-0.lvn.1
- version 2.5.18

* Mon Mar 08 2004 Aurelien Bompard <gauret[AT]free.fr> 0:2.5.16-0.lvn.1
- update to version 2.5.16
- new subconv tool to convert movie subtitles

* Mon Mar 01 2004 Aurelien Bompard <gauret[AT]free.fr> 0:2.5.12-0.lvn.1
- Initial Fedora package, ported from Mandrake/PLF


--- NEW FILE mldonkey_df_monitor.crond ---
*/30 * * * *	root	/usr/sbin/mldonkey_df_monitor.sh


--- NEW FILE mldonkey_df_monitor.sh ---
#!/bin/sh

CACHEDIR="/var/cache/mldonkey"
MINFREE=102400
EMAIL="root at localhost"

. /etc/sysconfig/mldonkey

[ ! "$ENABLE_DF_MONITOR" = "yes" ] && exit

send_email() {
	mail -s "mldonkey, disk space warning" $EMAIL << EOF

your $CACHEDIR has only $CURFREE KiB free space left
all downloads paused

BTW: you can control this check by editing /etc/sysconfig/mldonkey.
EOF
}


CURFREE=`df -P -k $CACHEDIR | tail -n 1 | awk '{ print $4 }'`
if [ $CURFREE -lt $MINFREE ] ; then
	/etc/init.d/mldonkey pause > /dev/null
	send_email
fi



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mldonkey/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	20 Jan 2009 21:18:40 -0000	1.1
+++ .cvsignore	26 Jan 2009 11:06:20 -0000	1.2
@@ -0,0 +1 @@
+mldonkey-2.9.6.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mldonkey/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	20 Jan 2009 21:18:40 -0000	1.1
+++ sources	26 Jan 2009 11:06:20 -0000	1.2
@@ -0,0 +1 @@
+5da87678449bf87ce0c78f37e7871eb9  mldonkey-2.9.6.tar.bz2



From peter at fedoraproject.org  Mon Jan 26 11:08:57 2009
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Mon, 26 Jan 2009 11:08:57 +0000 (UTC)
Subject: rpms/mldonkey/EL-4 import.log, NONE, 1.1 mldonkey-gui.desktop, NONE,
	1.1 mldonkey-initscript.patch, NONE, 1.1 mldonkey.logrotate,
	NONE, 1.1 mldonkey.spec, NONE, 1.1 mldonkey_df_monitor.crond,
	NONE, 1.1 mldonkey_df_monitor.sh, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090126110857.E2EF77010C@cvs1.fedora.phx.redhat.com>

Author: peter

Update of /cvs/pkgs/rpms/mldonkey/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32302/EL-4

Modified Files:
	.cvsignore sources 
Added Files:
	import.log mldonkey-gui.desktop mldonkey-initscript.patch 
	mldonkey.logrotate mldonkey.spec mldonkey_df_monitor.crond 
	mldonkey_df_monitor.sh 
Log Message:
Initial import


--- NEW FILE import.log ---
mldonkey-2_9_6-3_fc10:EL-4:mldonkey-2.9.6-3.fc10.src.rpm:1232968075


--- NEW FILE mldonkey-gui.desktop ---
[Desktop Entry]
Name=MlDonkey
Type=Application
GenericName=MlDonkey peer-to-peer client
Exec=mlgui
Icon=mldonkey
Categories=Network;
Encoding=UTF-8

mldonkey-initscript.patch:

--- NEW FILE mldonkey-initscript.patch ---
diff --git a/packages/rpm/mldonkey.init b/packages/rpm/mldonkey.init
index 536a88a..2291a9b 100755
--- a/packages/rpm/mldonkey.init
+++ b/packages/rpm/mldonkey.init
@@ -4,7 +4,7 @@
 #
 # Laurent Culioli <laurent at pschit.net>
 #
-# chkconfig: 2345 90 15
+# chkconfig: - 90 15
 # description: Mldonkey is client to access multiple peer-to-peer network
 # processname: mldonkey
 # config: /etc/sysconfig/mldonkey
@@ -15,6 +15,8 @@
 # Source some options 
 . /etc/sysconfig/mldonkey
 
+[ -z $LOGFILE ] && LOGFILE="/dev/null"
+
 RETVAL=0
 
 # Path to the mldonkey binarie.
@@ -27,17 +29,18 @@ fullpath=/usr/bin/mlnet
 [ ${NETWORKING} = "no" ] && exit 0
 
 start() {
-        gprintf "Starting Mldonkey (mlnet): "
-         cd $DIRECTORY
-	daemon --user mldonkey --check mldonkey $NICE "$fullpath  > /dev/null 2>&1 &"
-	touch /var/lock/subsys/mldonkey
-	echo
+       echo -n $"Starting Mldonkey (mlnet): "
+       cd $DIRECTORY
+       daemon --user mldonkey --check mldonkey $NICE "$fullpath  > $LOGFILE 2>&1 &"
+       RETVAL=$?
+       [ $RETVAL -eq 0 ] && touch /var/lock/subsys/mldonkey
+       echo
 }
 stop() {
-        gprintf "Stopping Mldonkey (mlnet): "
-        killproc mldonkey-bin
-	rm -fr /var/lock/subsys/mldonkey
-	echo
+       echo -n $"Stopping Mldonkey (mlnet): "
+       killproc $fullpath
+       rm -fr /var/lock/subsys/mldonkey
+       echo
 }
 
 
@@ -53,11 +56,19 @@ case "$1" in
                 stop
                 start
                 ;;
+        condrestart)
+                if status mldonkey >/dev/null; then
+                    stop
+                    start
+                else
+                    echo $"Mldonkey (mlnet) is stopped"
+                fi
+                ;;
         status)
 	        status mldonkey
 		;;
-	*)
-                gprintf "Usage: mldonkey {start|stop|restart|reload|status}\n"
+        *)
+                echo $"Usage: $0 {start|stop|restart|reload|condrestart|status}"
                 RETVAL=1
 esac
 exit $RETVAL


--- NEW FILE mldonkey.logrotate ---
/var/log/mldonkey/mldonkey.log {
    monthly
    notifempty
    missingok
    compress
    postrotate
    service mldonkey condrestart > /dev/null
    endscript
}


--- NEW FILE mldonkey.spec ---
Name:		mldonkey
Version:	2.9.6
Release:	3%{?dist}
Summary:	Client for several P2P networks
License:	GPLv2+
Source0:	http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
Source1:	mldonkey-gui.desktop
Source8:	mldonkey_df_monitor.crond
Source9:	mldonkey_df_monitor.sh
Source11:	mldonkey.logrotate
Patch0:		mldonkey-initscript.patch
URL:		http://mldonkey.sourceforge.net
Group:		Applications/Internet
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:	ocaml >= 3.10.0
BuildRequires:	ocaml-camlp4-devel
BuildRequires:	ocaml-lablgtk-devel >= 2.10.0
BuildRequires:	zlib-devel
BuildRequires:	desktop-file-utils
BuildRequires:	gtk2-devel >= 2.4.0
BuildRequires:	librsvg2-devel >= 2.4.0
BuildRequires:	bzip2-devel
BuildRequires:	ncurses-devel
BuildRequires:	file-devel
Requires:	logrotate
# for kill_mldonkey
Requires:	perl(LWP::UserAgent)
# for mldonkey_command
Requires:	nc


%description
MLDonkey is a door to the 'donkey' network, a decentralized network used to
exchange big files on the Internet. It is written in a wonderful language,
called Objective-Caml, and present most features of the basic Windows donkey
client, plus some more:
  - It should work on most UNIX-compatible platforms.
  - You can remotely command your client, either by telnet (port 4000),
    by a WEB browser (http://localhost:4080), or with a classical client
    interface (see http://www.nongnu.org/mldonkey)
  - You can connect to several servers, and each search will query all the
    connected servers.
  - You can select mp3s by bitrates in queries (useful ?).
  - You can select the name of a downloaded file before moving it to your
    incoming directory.
  - You can have several queries in the graphical user interface at the same
    time.
  - You can remember your old queries results in the command-line interface.
  - You can search in the history of all files you have seen on the network.

It can also access other peer-to-peer networks:
- BitTorrent
- Fasttrack
- FileTP (wget-clone)
- DC++


%package gui
Summary:	Graphical frontend for mldonkey based on GTK
Group:		Applications/Internet
Requires:	hicolor-icon-theme
# TODO requirement for mldonkey_previewer
# Requires:	mplayer


%description gui
The GTK interface for mldonkey provides a convenient way of managing
all mldonkey operations. It gives details about conected servers,
downloaded files, friends and lets one search for files in a pleasing
way.


%package server
Summary:	Enables mldonkey as a system daemon
Group:		System Environment/Daemons
Requires:	%{name} = %{version}-%{release}
# Neseccary for mldonkey_df_monitor.sh
Requires:	mailx
Requires(pre):	/usr/sbin/useradd
Requires(post): /sbin/chkconfig
Requires(preun):/sbin/chkconfig
Requires(preun):/sbin/service


%description server
Contains init and configs to launch mldonkey as a service.

NOTE: by default incoming dir is located in %{_localstatedir}/lib/mldonkey/incoming
and temp dir in %{_localstatedir}/lib/cache/mldonkey. Mlondkey is launched
with the mldonkey user (created after installation).

NOTE: If you are using a password for your mldonkey, you need to specify
it in your %{_sysconfdir}/sysconfig/mldonkey, because mldonkey now stores
it encrypted.


%package -n konqueror-mldonkey-ed2k-support
Summary:	Easy way to download a ed2k-link from Konqueror
Group:		User Interface/Desktops
Requires:	perl(LWP::UserAgent)
Requires:	kde-filesystem


%description -n konqueror-mldonkey-ed2k-support
This package contains tool which gives you an easy way to add an ed2k-link
(like ed2k://|file|filename.exe|21352658|72b0b287cab7d875ccc1d89ebe910b9g|)
with a single click to your mldonkey download queue.
You need to edit %{_sysconfdir}/sysconfig/mldonkey_submit


#%package -n mozilla-mldonkey-ed2k-support
#Summary:	Easy way to download a ed2k-link from Mozilla/Firefox
#Group:		User Interface/Desktops
# TODO should it require firefox?


#%description -n mozilla-mldonkey-ed2k-support
#This package contains tool which gives you an easy way to add an ed2k-link
#(like ed2k://|file|filename.exe|21352658|72b0b287cab7d875ccc1d89ebe910b9g|)
#with a single click within Mozilla/Firefox to your mldonkey download queue.
#The tool is a .xpi file to import into mozilla. The file is located in
#%{_datadir}/%name


%prep
%setup -q
%patch0 -p1 -b .fedora
# Let's make rpmlint happy
sed -i 's|\r||g' distrib/ed2k_submit/README.MLdonkeySubmit
sed -i 's|\r||g' docs/slavanap.txt

iconv -f iso8859-1 -t UTF-8 docs/gnutella.txt > docs/gnutella.utf8 && mv docs/gnutella.{utf8,txt}
iconv -f iso8859-1 -t UTF-8 distrib/Authors.txt > distrib/Authors.utf8 && mv distrib/Authors.{utf8,txt}

chmod 644 src/utils/lib/fst_hash.c
chmod 644 src/networks/fasttrack/fst_crypt_ml.c


%build
%configure --enable-pthread \
           --enable-ocamlver=%(rpm -q --qf '%%{version}' ocaml) \
           --enable-gui=newgui2 \
           --disable-gd

make depend
# Does not support parallel builds
make
make utils


%install
rm -rf $RPM_BUILD_ROOT
DONT_GPRINTIFY=1
export DONT_GPRINTIFY
make DESTDIR=$RPM_BUILD_ROOT install

# core
install -p -m 755 distrib/mldonkey_command $RPM_BUILD_ROOT%{_bindir}/mldonkey_command
install -p -m 755 distrib/kill_mldonkey $RPM_BUILD_ROOT%{_bindir}/kill_mldonkey

# utils
for util in copysources mld_hash get_range make_torrent svg_converter subconv; do
	install -p -m 755 $util $RPM_BUILD_ROOT%{_bindir}/$util ;
done

# gui
install -p -m 755 mlguistarter $RPM_BUILD_ROOT%{_bindir}/mlguistarter

# install preview utility
install -p -m 755 distrib/mldonkey_previewer $RPM_BUILD_ROOT%{_bindir}/mldonkey_previewer

# menu and pixmaps
install packages/rpm/mldonkey-icon-16.png -D -m 644 $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/apps/mldonkey.png
install packages/rpm/mldonkey-icon-32.png -D -m 644 $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/mldonkey.png
install packages/rpm/mldonkey-icon-48.png -D -m 644 $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/mldonkey.png
install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/pixmaps
ln -s ../icons/hicolor/48x48/apps/mldonkey.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/mldonkey.png
desktop-file-install --vendor fedora --dir $RPM_BUILD_ROOT%{_datadir}/applications --copy-generic-name-to-name %{SOURCE1}

# Send email when mldonkey runs out of allowed disk space
install -D -p -m 755 %{SOURCE9} $RPM_BUILD_ROOT%{_sbindir}/mldonkey_df_monitor.sh
sed -i 's,/var,%{_localstatedir},g;
        s,/etc/init.d,%{_initrddir},g;
        s,/etc,%{_sysconfdir},g' $RPM_BUILD_ROOT%{_sbindir}/mldonkey_df_monitor.sh

install -D -p -m 644 %{SOURCE8} $RPM_BUILD_ROOT%{_sysconfdir}/cron.d/mldonkey_df_monitor
sed -i 's,/usr/sbin,%{_sbindir},g' $RPM_BUILD_ROOT%{_sysconfdir}/cron.d/mldonkey_df_monitor

# create directory for storing log-file
install -d -m 755 $RPM_BUILD_ROOT%{_localstatedir}/log/mldonkey

# install logrotate script for  /var/log/mldonkey/mldonkey.log
install -D -p -m 644 %{SOURCE11} $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/mldonkey
sed -i 's,/var,%{_localstatedir},g' $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/mldonkey

# install init-scipt
install -D -p -m 755 packages/rpm/mldonkey.init $RPM_BUILD_ROOT%{_initrddir}/mldonkey
sed -e 's,/etc/init.d,%{_initrddir},g;
        s,/etc,%{_sysconfdir},g;
        s,/var,%{_localstatedir},g' $RPM_BUILD_ROOT%{_initrddir}/mldonkey

# Create necessary directories for server
install -d -m 755 $RPM_BUILD_ROOT%{_localstatedir}/cache/mldonkey
install -d -m 755 $RPM_BUILD_ROOT%{_localstatedir}/lib/%{name}/incoming

# create downloads.ini
echo "temp_directory = \"%{_localstatedir}/cache/mldonkey\"" > $RPM_BUILD_ROOT%{_localstatedir}/lib/%{name}/downloads.ini
echo "incoming_directory = \"%{_localstatedir}/lib/%{name}/incoming\"" >> $RPM_BUILD_ROOT%{_localstatedir}/lib/%{name}/downloads.ini
echo "mldonkey_gui = \"%{_bindir}/mlgui\"" >> $RPM_BUILD_ROOT%{_localstatedir}/lib/%{name}/downloads.ini
echo "mldonkey_bin = \"%{_bindir}/mldonkey\"" >> $RPM_BUILD_ROOT%{_localstatedir}/lib/%{name}/downloads.ini
echo "log_file = \"%{_localstatedir}/log/mldonkey/mldonkey.log\"" >> $RPM_BUILD_ROOT%{_localstatedir}/lib/%{name}/downloads.ini

# Install sysconfig file
install -D -p -m 644 packages/rpm/mldonkey.sysconfig $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/mldonkey
sed -i 's,/var,%{_localstatedir},g' $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/mldonkey

# ed2k for konqueror support
install -p -m 755 distrib/ed2k_submit/mldonkey_submit $RPM_BUILD_ROOT%{_bindir}/mldonkey_submit
install -p -m 644 distrib/ed2k_submit/mldonkey $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/mldonkey_submit
sed -i 's,myusername,,;s,mypassword,,' $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/mldonkey_submit
install -D -p -m 644 distrib/ed2k_submit/ed2k.protocol  $RPM_BUILD_ROOT%{_datadir}/services/ed2k.protocol

# ed2k for mozilla support
# TODO should we unpack it into FF's plugins directory?
#install -D -p -m 644 distrib/ed2k_mozilla/mldonkey_protocol_handler-2.2.xpi $RPM_BUILD_ROOT%{_datadir}/%{name}/mldonkey_protocol_handler-2.2.xpi


%clean
rm -rf $RPM_BUILD_ROOT


%pre server
/usr/sbin/useradd -r -d %{_localstatedir}/lib/%{name} \
                  -c "MlDonkey service" -s /bin/bash mldonkey 2>/dev/null || :


%post server
if [ "$1" == "1" ]; then
	/sbin/chkconfig --add mldonkey || :
fi


%preun server
if [ "$1" == "0" ]; then
	/sbin/service mldonkey stop >/dev/null 2>&1 || :
	/sbin/chkconfig --del mldonkey || :
fi


%files
%defattr(-,root,root)
%doc Copying.txt distrib/Authors.txt distrib/Bugs.txt distrib/ChangeLog distrib/Developers.txt
%doc docs
%{_bindir}/mlnet
%{_bindir}/mldonkey_command
%{_bindir}/kill_mldonkey
%{_bindir}/copysources
%{_bindir}/get_range
%{_bindir}/make_torrent
%{_bindir}/mlbt
%{_bindir}/mld_hash
%{_bindir}/mldc
%{_bindir}/mlgnut
%{_bindir}/mldonkey
%{_bindir}/mlslsk
%{_bindir}/subconv
%{_bindir}/svg_converter


%files gui
%defattr(-,root,root)
%doc Copying.txt distrib/Authors.txt distrib/Bugs.txt distrib/ChangeLog distrib/Developers.txt
%{_bindir}/mlbt+gui
%{_bindir}/mldc+gui
%{_bindir}/mldonkey+gui
%{_bindir}/mldonkey_gui
%{_bindir}/mldonkey_previewer
%{_bindir}/mlgnut+gui
%{_bindir}/mlgui
%{_bindir}/mlguistarter
%{_bindir}/mlnet+gui
%{_bindir}/mlslsk+gui
%{_datadir}/applications/*.desktop
%{_datadir}/icons/hicolor/16x16/apps/mldonkey.png
%{_datadir}/icons/hicolor/32x32/apps/mldonkey.png
%{_datadir}/icons/hicolor/48x48/apps/mldonkey.png
%{_datadir}/pixmaps/mldonkey.png


%files server
%defattr(-,root,root)
%doc Copying.txt
%config(noreplace) %{_sysconfdir}/sysconfig/mldonkey
%config(noreplace) %{_sysconfdir}/cron.d/mldonkey_df_monitor
%attr(755,root,root) %{_initrddir}/mldonkey
%config(noreplace) %{_sysconfdir}/logrotate.d/mldonkey
%{_sbindir}/mldonkey_df_monitor.sh
%attr(750,mldonkey,mldonkey) %dir %{_localstatedir}/log/mldonkey
%attr(750,mldonkey,mldonkey) %dir %{_localstatedir}/cache/mldonkey
%attr(750,mldonkey,mldonkey) %dir %{_localstatedir}/lib/mldonkey
%attr(770,mldonkey,mldonkey) %dir %{_localstatedir}/lib/mldonkey/incoming
%config(noreplace) %{_localstatedir}/lib/mldonkey/downloads.ini


#%files -n mozilla-mldonkey-ed2k-support
#%defattr(-,root,root)
#%doc Copying.txt
#%{_datadir}/%{name}/mldonkey_protocol_handler-2.2.xpi


%files -n konqueror-mldonkey-ed2k-support
%defattr(-,root,root)
%doc Copying.txt distrib/ed2k_submit/README.MLdonkeySubmit
%config(noreplace) %{_sysconfdir}/sysconfig/mldonkey_submit
%{_bindir}/mldonkey_submit
%{_datadir}/services/ed2k.protocol


%changelog
* Mon Jan 26 2009 Peter Lemenkov <lemenkov at gmail.com> 2.9.6-3
- Temporarily disable mozilla support

* Sat Dec  6 2008 Peter Lemenkov <lemenkov at gmail.com> 2.9.6-2
- Fixed installation of sysconfig-file

* Mon Aug 25 2008 Peter Lemenkov <lemenkov at gmail.com> 2.9.6-1
- Ver. 2.9.6

* Mon Jun 23 2008 Peter Lemenkov <lemenkov at gmail.com> 2.9.5-1
- Ver. 2.9.5

* Sun Jan 27 2008 Peter Lemenkov <lemenkov at gmail.com> 2.9.3-1
- Ver. 2.9.3

* Sun Jan 13 2008 Peter Lemenkov <lemenkov at gmail.com> 2.9.2-2
- Correct BR for perl modules
- More robust iconv usage
- Fixed desktop file
- Changed BR for scriplets

* Sun Nov  4 2007 Peter Lemenkov <lemenkov at gmail.com> 2.9.2-1
- Ver. 2.9.2
- BR ocaml >= 3.10.0
- BR lablgtk > 2.10.0

* Tue Sep 25 2007 Peter Lemenkov <lemenkov at gmail.com> 2.9.1-1
- Ver. 2.9.1
- converted two non-UTF8 text-files

* Sun Aug 19 2007 Peter Lemenkov <lemenkov at gmail.com> 2.9.0-2
- fixed License tag as required in Fedora

* Sun Aug  5 2007 Peter Lemenkov <lemenkov at gmail.com> 2.9.0-1
- Added shadow-utils as required
- Ver. 2.9.0
- Disabled Gnutella/G2 (unmaintained)
- Added BR file-devel (for libmagic)

* Wed Jun  6 2007 Peter Lemenkov <lemenkov at gmail.com> 2.8.7-1
- Ver. 2.8.7
- Added DC++ back

* Sun May 20 2007 Peter Lemenkov <lemenkov at gmail.com> 2.8.5-6
- Splitted ed2k-support to mozilla-mldonkey-ed2k-support and
  konqueror-mldonkey-ed2k-support

* Sun May 13 2007 Peter Lemenkov <lemenkov at gmail.com> 2.8.5-5
- Fixed bug #1421

* Sat May  5 2007 Peter Lemenkov <lemenkov at gmail.com> 2.8.5-4
- Fixed file conflicts
- Removed soulseek support (broken)

* Sat May  5 2007 Peter Lemenkov <lemenkov at gmail.com> 2.8.5-3
- Removed mysterious Requires kdelibs

* Fri May  4 2007 Peter Lemenkov <lemenkov at gmail.com> 2.8.5-2
- Added BR ncurses-devel

* Mon Apr 23 2007 Peter Lemenkov <lemenkov at gmail.com> 2.8.5-1
- version 2.8.5
- graphical stats disabled (temporarily?), see bug #1191
- mlchat removed from upstream

* Sun May 21 2006 Aurelien Bompard <gauret[AT]free.fr> 2.7.6-1
- version 2.7.6

* Mon Apr 17 2006 Aurelien Bompard <gauret[AT]free.fr> 2.7.5-1
- version 2.7.5

* Wed Mar 15 2006 Aurelien Bompard <gauret[AT]free.fr> 2.7.3-1
- version 2.7.3
- drop patch 0 & patch 1 (applied upstream)

* Thu Mar 09 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
- switch to new release field

* Tue Feb 28 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
- add dist

* Fri Dec 02 2005 Aurelien Bompard <gauret[AT]free.fr> 2.7.0-0.lvn.2
- patch init script to add condrestart
- use condrestart in logrotate

* Sun Nov 20 2005 Aurelien Bompard <gauret[AT]free.fr> 2.7.0-0.lvn.1
- version 2.7.0
- fix logrotate file

* Mon Sep 05 2005 Aurelien Bompard <gauret[AT]free.fr> 2.6.4-0.lvn.1
- version 2.6.4

* Mon Aug 22 2005 Aurelien Bompard <gauret[AT]free.fr> 2.6.3-0.lvn.1
- version 2.6.3

* Thu Aug 11 2005 Aurelien Bompard <gauret[AT]free.fr> 2.6.2-0.lvn.1
- version 2.6.2

* Wed Aug 10 2005 Aurelien Bompard <gauret[AT]free.fr> 2.6.1-0.lvn.1
- version 2.6.1
- don't start initscript on boot by default

* Fri Jul 22 2005 Aurelien Bompard <gauret[AT]free.fr> 2.6.0-0.lvn.1
- update to 2.6.0
- drop explicit Epoch

* Mon Jun 27 2005 Aurelien Bompard <gauret[AT]free.fr> 0:2.5.30.16-0.lvn.1
- version 2.5.30.16
- add missing scriptlets requirements
- don't remove the mldonkey user on uninstall
- init script: sync with upstream
- sysconfig file: sync with upstream
- start script: sync with upstream

* Sun Feb 13 2005 Aurelien Bompard <gauret[AT]free.fr> 0:2.5.28-0.lvn.1
- version 2.5.28
- enable gui
- disable direct-connect (broken at the moment)

* Wed Aug 04 2004 Aurelien Bompard <gauret[AT]free.fr> 0:2.5.22-0.lvn.1
- version 2.5.22
- get ready for the new gui based on GTK2
  (upstream says "still a little buggy", and it does not build yet)

* Thu May 06 2004 Aurelien Bompard <gauret[AT]free.fr> 0:2.5.21-0.lvn.1
- version 2.5.21 (bugfix again...)

* Tue May 04 2004 Aurelien Bompard <gauret[AT]free.fr> 0:2.5.20-0.lvn.1
- version 2.5.20 (bugfix)

* Mon May 03 2004 Aurelien Bompard <gauret[AT]free.fr> 0:2.5.19-0.lvn.1
- version 2.5.19

* Sun Apr 25 2004 Aurelien Bompard <gauret[AT]free.fr> 0:2.5.18-0.lvn.1
- version 2.5.18

* Mon Mar 08 2004 Aurelien Bompard <gauret[AT]free.fr> 0:2.5.16-0.lvn.1
- update to version 2.5.16
- new subconv tool to convert movie subtitles

* Mon Mar 01 2004 Aurelien Bompard <gauret[AT]free.fr> 0:2.5.12-0.lvn.1
- Initial Fedora package, ported from Mandrake/PLF


--- NEW FILE mldonkey_df_monitor.crond ---
*/30 * * * *	root	/usr/sbin/mldonkey_df_monitor.sh


--- NEW FILE mldonkey_df_monitor.sh ---
#!/bin/sh

CACHEDIR="/var/cache/mldonkey"
MINFREE=102400
EMAIL="root at localhost"

. /etc/sysconfig/mldonkey

[ ! "$ENABLE_DF_MONITOR" = "yes" ] && exit

send_email() {
	mail -s "mldonkey, disk space warning" $EMAIL << EOF

your $CACHEDIR has only $CURFREE KiB free space left
all downloads paused

BTW: you can control this check by editing /etc/sysconfig/mldonkey.
EOF
}


CURFREE=`df -P -k $CACHEDIR | tail -n 1 | awk '{ print $4 }'`
if [ $CURFREE -lt $MINFREE ] ; then
	/etc/init.d/mldonkey pause > /dev/null
	send_email
fi



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mldonkey/EL-4/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	20 Jan 2009 21:18:40 -0000	1.1
+++ .cvsignore	26 Jan 2009 11:08:26 -0000	1.2
@@ -0,0 +1 @@
+mldonkey-2.9.6.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mldonkey/EL-4/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	20 Jan 2009 21:18:40 -0000	1.1
+++ sources	26 Jan 2009 11:08:27 -0000	1.2
@@ -0,0 +1 @@
+5da87678449bf87ce0c78f37e7871eb9  mldonkey-2.9.6.tar.bz2



From ltinkl at fedoraproject.org  Mon Jan 26 11:10:49 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Mon, 26 Jan 2009 11:10:49 +0000 (UTC)
Subject: rpms/phonon/F-9 phonon-4.2.96-pulseaudio.patch, NONE,
	1.1 phonon-4.2.96-xine-pulseaudio.patch, NONE, 1.1 phonon.spec,
	1.6, 1.7 sources, 1.3, 1.4 phonon-4.2.0-pulseaudio.patch, 1.1, NONE
Message-ID: <20090126111049.48D8A7010C@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/phonon/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32639

Modified Files:
	phonon.spec sources 
Added Files:
	phonon-4.2.96-pulseaudio.patch 
	phonon-4.2.96-xine-pulseaudio.patch 
Removed Files:
	phonon-4.2.0-pulseaudio.patch 
Log Message:
KDE 4.2.0


phonon-4.2.96-pulseaudio.patch:

--- NEW FILE phonon-4.2.96-pulseaudio.patch ---
diff -Naurw phonon-4.2.96/phonon/globalconfig.cpp phonon-4.2.96.pulseaudio/phonon/globalconfig.cpp
--- phonon-4.2.96/phonon/globalconfig.cpp	2008-11-27 16:41:41.000000000 +0100
+++ phonon-4.2.96.pulseaudio/phonon/globalconfig.cpp	2009-01-08 21:29:18.000000000 +0100
@@ -31,6 +31,7 @@
 #include "phononnamespace_p.h"
 
 #include <QtCore/QList>
+#include <QtCore/QHash>
 #include <QtCore/QVariant>
 
 QT_BEGIN_NAMESPACE
@@ -167,6 +168,15 @@
                     | ((override & HideUnavailableDevices) ? FilterUnavailableDevices : 0)
                     );
         }
+        // make PulseAudio the global default (assume it is already default in this list)
+        if (!list.isEmpty()) {
+            int firstIndex = list.first();
+            if (backendIface->objectDescriptionProperties(Phonon::AudioOutputDeviceType,
+                  firstIndex)["name"].toString() == "PulseAudio") {
+                list.removeFirst();
+                defaultList.prepend(firstIndex);
+            }
+        }
         defaultList += list;
     }
 
@@ -222,6 +232,15 @@
                     | ((override & HideUnavailableDevices) ? FilterUnavailableDevices : 0)
                   );
         }
+        // make PulseAudio the global default (assume it is already default in this list)
+        if (!list.isEmpty()) {
+            int firstIndex = list.first();
+            if (backendIface->objectDescriptionProperties(Phonon::AudioCaptureDeviceType,
+                  firstIndex)["name"].toString() == "PulseAudio") {
+                list.removeFirst();
+                defaultList.prepend(firstIndex);
+            }
+        }
         defaultList += list;
     }
 

phonon-4.2.96-xine-pulseaudio.patch:

--- NEW FILE phonon-4.2.96-xine-pulseaudio.patch ---
diff -Naurw phonon-4.2.96/xine/backend.cpp phonon-4.2.96.xine-pulseaudio/xine/backend.cpp
--- phonon-4.2.96/xine/backend.cpp	2008-12-19 08:08:53.000000000 +0100
+++ phonon-4.2.96.xine-pulseaudio/xine/backend.cpp	2009-01-08 21:31:10.000000000 +0100
@@ -649,7 +649,7 @@
                             "in KDE2 and KDE3. Its use is discuraged.</p></html>"),
                         /*icon name */"audio-backend-arts", outputPlugins[i]);
             } else if (0 == strcmp(outputPlugins[i], "pulseaudio")) {
-                addAudioOutput(nextIndex++, 10, tr("PulseAudio"),
+                addAudioOutput(nextIndex++, 2000, tr("PulseAudio"),
                         xine_get_audio_driver_plugin_description(m_xine, outputPlugins[i]),
                         /*icon name */"audio-backend-pulseaudio", outputPlugins[i]);
             } else if (0 == strcmp(outputPlugins[i], "esd")) {


Index: phonon.spec
===================================================================
RCS file: /cvs/extras/rpms/phonon/F-9/phonon.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- phonon.spec	29 Sep 2008 13:26:42 -0000	1.6
+++ phonon.spec	26 Jan 2009 11:10:18 -0000	1.7
@@ -1,41 +1,48 @@
-
 Summary: Multimedia framework api
-Name:    phonon 
-Version: 4.2.0
-Release: 5%{?dist}.1
+Name:    phonon
+Version: 4.3.0
+Release: 2%{?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
+Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{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
 # set through systemsettings, and listed devices are only those supported by the
 # "sink". So it never lists "PulseAudio" as a supported device, you have to pick
 # it as a "sink", and then the device setting is ignored entirely.
-Patch0:  phonon-4.2.0-pulseaudio.patch
+Patch0:  phonon-4.2.96-pulseaudio.patch
+Patch1:  phonon-4.2.96-xine-pulseaudio.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: automoc4
-BuildRequires: cmake
+BuildRequires: cmake >= 2.6.0
 BuildRequires: glib2-devel
 BuildRequires: gstreamer-devel
 BuildRequires: gstreamer-plugins-base-devel
+BuildRequires: ImageMagick
 BuildRequires: kde-filesystem
 BuildRequires: libxml2-devel
+BuildRequires: pkgconfig
 BuildRequires: qt4-devel >= 4.4.0
+BuildRequires: xine-lib-devel
 
-## hard-code phonon-backend-xine, for now, so yum doesn't choose -gstreamer by default
-#Requires: phonon-backend-xine
 Requires: phonon-backend
+## hard-code phonon-backend-xine, if yum chooses -gstreamer by default
+#Requires(hint): phonon-backend-xine
+
+Requires(post): /sbin/ldconfig xdg-utils
+Requires(postun): /sbin/ldconfig xdg-utils
 
 %description
 %{summary}.
 
 %package backend-gstreamer
 Summary: Gstreamer phonon backend
-Group:   Applications/Multimedia 
+Group:   Applications/Multimedia
 Requires: %{name} = %{version}-%{release}
 Provides: phonon-backend = %{version}-%{release}
 Obsoletes: %{name}-backend-gst < 4.2.0-4
@@ -43,6 +50,14 @@
 %description backend-gstreamer
 %{summary}.
 
+%package backend-xine
+Summary: xine phonon backend
+Group:   Applications/Multimedia
+Requires: %{name} = %{version}-%{release}
+Provides: phonon-backend = %{version}-%{release}
+%description backend-xine
+%{summary}.
+
 %package devel
 Summary: Developer files for %{name}
 Group:   Development/Libraries
@@ -54,8 +69,9 @@
 
 
 %prep
-%setup -q
+%setup -q -n phonon-%{version}%{?alphatag}
 %patch0 -p1 -b .pulseaudio
+%patch1 -p1 -b .xine-pulseaudio
 
 
 %build
@@ -64,30 +80,42 @@
 %{cmake} ..
 popd
 
-make %{?_smp_mflags} -C %{_target_platform}
+make %{?_smp_mflags} -C %{_target_platform} VERBOSE=1
 
 
 %install
-rm -rf %{buildroot} 
+rm -rf %{buildroot}
 
-make install DESTDIR=%{buildroot} -C %{_target_platform}
+make install/fast 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 -background None -geometry ${i}x${i}  %{SOURCE1} %{buildroot}%{_datadir}/icons/hicolor/${i}x${i}/apps/%{name}-gstreamer.png
+done
 
 
 %clean
-rm -rf %{buildroot} 
-
-
-%post -p /sbin/ldconfig
+rm -rf %{buildroot}
 
-%postun -p /sbin/ldconfig
 
+%post
+/sbin/ldconfig
+xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
+xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || :
+
+%postun
+/sbin/ldconfig
+xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
+xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || :
 
 %files
 %defattr(-,root,root,-)
-%doc COPYING.LIB 
-%{_libdir}/libphonon*.so.*
+%doc COPYING.LIB
+%{_libdir}/libphonon*.so.4*
 %{_datadir}/dbus-1/interfaces/org.kde.Phonon.AudioOutput.xml
+%{_datadir}/icons/hicolor/*/*/*
+%{_datadir}/icons/oxygen/*/*/*
 # kde4-specific dirs
 %dir %{_kde4_libdir}/kde4/plugins/phonon_backend/
 %dir %{_kde4_datadir}/kde4/services/phononbackends/
@@ -97,6 +125,11 @@
 %{_kde4_libdir}/kde4/plugins/phonon_backend/phonon_gstreamer.so
 %{_kde4_datadir}/kde4/services/phononbackends/gstreamer.desktop
 
+%files backend-xine
+%defattr(-,root,root,-)
+%{_kde4_libdir}/kde4/plugins/phonon_backend/phonon_xine.so
+%{_kde4_datadir}/kde4/services/phononbackends/xine.desktop
+
 %files devel
 %defattr(-,root,root,-)
 %dir %{_includedir}/KDE
@@ -107,6 +140,50 @@
 
 
 %changelog
+* Fri Jan 23 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.0-2
+- fix typo in postun scriptlet (introduced in 4.2.96-3)
+
+* Thu Jan 22 2009 Than Ngo <than at redhat.com> - 4.3.0-1
+- 4.3.0
+
+* Thu Jan 08 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.96-3
+- new tarball
+- put icons/scriptlets into main pkg
+- Requires: phonon-backend
+
+* Thu Jan 08 2009 Lorenzo Villani <lvillani at binaryhelix.net> - 4.2.96-2
+- add gstreaer-logo.svg
+
+* Thu Jan 08 2009 Lorenzo Villani <lvillani at binaryhelix.net> - 4.2.96-1
+- 4.2.96
+- rebase phonon-4.2.0-pulseaudio.patch (-> phonon-4.2.96-pulseaudio.patch)
+- rebase phonon-4.2.70-xine-pulseaudio.patch 
+  (-> phonon-4.2.96-xine-pulseaudio.patch)
+
+* Fri Dec 12 2008 Rex Dieter <rdieter at fedoraproject.org> 4.2.80-3
+- rebuild for pkgconfig deps
+
+* Tue Nov 25 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.2.80-2
+- phonon-backend-xine: don't Obsolete/Provide itself, Provides: phonon-backend
+
+* Tue Nov 25 2008 Than Ngo <than at redhat.com> 4.2.80-1
+- 4.2.80
+
+* Fri Nov 21 2008 Lorenzo Villani <lvillani at binaryhelix.net> - 4.2.80-0.1.20081121svn887051
+- Use subversion (4.2.80) snapshot
+- phonon-backend-xine subpkg
+- make VERBOSE=1
+- make install/fast
+- Xine backend is in phonon now, add xine-lib-devel as BR
+- BR cmake >= 2.6.0
+- forward-port xine pulseaudio patch
+
+* 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
+
 * 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/F-9/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	23 Jul 2008 13:13:31 -0000	1.3
+++ sources	26 Jan 2009 11:10:18 -0000	1.4
@@ -1 +1 @@
-de80b0f055886a6946acc7886713e23e  phonon-4.2.0.tar.bz2
+f851219ec1fb4eadc7904f053b6b498d  phonon-4.3.0.tar.bz2


--- phonon-4.2.0-pulseaudio.patch DELETED ---



From ltinkl at fedoraproject.org  Mon Jan 26 11:14:35 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Mon, 26 Jan 2009 11:14:35 +0000 (UTC)
Subject: rpms/soprano/F-9 soprano.spec,1.19,1.20 sources,1.10,1.11
Message-ID: <20090126111435.246A67010C@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/soprano/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv717

Modified Files:
	soprano.spec sources 
Log Message:
KDE 4.2.0



Index: soprano.spec
===================================================================
RCS file: /cvs/extras/rpms/soprano/F-9/soprano.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- soprano.spec	22 Jul 2008 21:18:17 -0000	1.19
+++ soprano.spec	26 Jan 2009 11:14:03 -0000	1.20
@@ -6,7 +6,7 @@
 
 Summary: Qt wrapper API to different RDF storage solutions
 Name:    soprano
-Version: 2.1
+Version: 2.1.64
 Release: 1%{?dist}
 
 Group:   System Environment/Libraries
@@ -108,6 +108,12 @@
 
 
 %changelog
+* Fri Jan 09 2009 Than Ngo <than at redhat.com> - 2.1.64-1
+- update to 2.1.64
+
+* 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/extras/rpms/soprano/F-9/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	22 Jul 2008 21:07:23 -0000	1.10
+++ sources	26 Jan 2009 11:14:03 -0000	1.11
@@ -1 +1 @@
-c89c04931db14eb7f5801eb3d4e5c742  soprano-2.1.tar.bz2
+f62267c1f904450ab0e9d8cab30d252b  soprano-2.1.64.tar.bz2



From caolanm at fedoraproject.org  Mon Jan 26 11:16:37 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Mon, 26 Jan 2009 11:16:37 +0000 (UTC)
Subject: rpms/dia/F-10 dia-0.96.1-plugins.patch, NONE,
	1.1 dia-0.96.1-pythonpath.patch, NONE, 1.1 dia.spec, 1.27, 1.28
Message-ID: <20090126111638.0438A7010C@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/dia/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1020/F-10

Modified Files:
	dia.spec 
Added Files:
	dia-0.96.1-plugins.patch dia-0.96.1-pythonpath.patch 
Log Message:
Resolves: rhbz#481551 python modules search path

dia-0.96.1-plugins.patch:

--- NEW FILE dia-0.96.1-plugins.patch ---
diff -Naur dia-0.96.1.orig/lib/plug-ins.c dia-0.96.1/lib/plug-ins.c
--- dia-0.96.1.orig/lib/plug-ins.c	2007-01-07 03:58:26.000000000 +0530
+++ dia-0.96.1/lib/plug-ins.c	2009-01-03 20:57:33.000000000 +0530
@@ -52,9 +52,9 @@
 #  define USING_LIBTOOL 0
 #else
 /* this one should work on any platform where libtool is used to compile dia */
-#  define PLUG_IN_EXT ".la"
+#  define PLUG_IN_EXT ".so"
 #  define PLUG_IN_EXT_LEN 3
-#  define USING_LIBTOOL 1
+#  define USING_LIBTOOL 0
 #endif
 
 struct _PluginInfo {

dia-0.96.1-pythonpath.patch:

--- NEW FILE dia-0.96.1-pythonpath.patch ---
--- dia-0.96.1.orig/plug-ins/python/python.c
+++ dia-0.96.1/plug-ins/python/python.c
@@ -102,6 +102,8 @@
     Py_Initialize();
 
     PySys_SetArgv(1, python_argv);
+    /* Sanitize sys.path */
+    PyRun_SimpleString("import sys; sys.path = filter(None, sys.path)");
 
     if (on_error_report())
 	return DIA_PLUGIN_INIT_ERROR;


Index: dia.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dia/F-10/dia.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- dia.spec	31 Oct 2008 22:56:43 -0000	1.27
+++ dia.spec	26 Jan 2009 11:16:07 -0000	1.28
@@ -1,6 +1,6 @@
 Name:           dia
 Version:        0.96.1
-Release:        8%{?dist}
+Release:        9%{?dist}
 Epoch:          1
 Summary:        Diagram drawing program
 Group:          Applications/Multimedia
@@ -14,6 +14,8 @@
 Patch5:         dia-0.96.1-64bit.patch
 Patch6:         dia-0.96.1-desktop.patch
 Patch7:         dia-0.96.1-svg-export.patch
+Patch8:         dia-0.96.1-plugins.patch
+Patch9:         dia-0.96.1-pythonpath.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  libgnomeui-devel python-devel pygtk2-devel desktop-file-utils
 BuildRequires:  intltool docbook-utils docbook-style-dsssl docbook-style-xsl
@@ -38,6 +40,8 @@
 %patch5 -p1 -b .64bit
 %patch6 -p1
 %patch7 -p1
+%patch8 -p1 -b .orig
+%patch9 -p1 -b .pythonpath
 sed -i 's|libdia_la_LDFLAGS = -avoid-version|libdia_la_LDFLAGS = -avoid-version $(shell pkg-config gtk+-2.0 libxml-2.0 libart-2.0 libgnome-2.0 --libs)|' \
   lib/Makefile.*
 chmod -x `find objects/AADL -type f`
@@ -111,6 +115,9 @@
 
 
 %changelog
+* Mon Jan 26 2009 Caol??n McNamara <caolanm at redhat.com> 1:0.96.1-9
+- Resolves: rhbz#481551 python modules search path
+
 * Fri Oct 31 2008 Caol??n McNamara <caolanm at redhat.com> 1:0.96.1-8
 - kill the ".la"s
 



From caolanm at fedoraproject.org  Mon Jan 26 11:16:38 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Mon, 26 Jan 2009 11:16:38 +0000 (UTC)
Subject: rpms/dia/F-9 dia-0.96.1-pythonpath.patch, NONE, 1.1 dia.spec, 1.25,
	1.26
Message-ID: <20090126111638.47FD47010C@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/dia/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1020/F-9

Modified Files:
	dia.spec 
Added Files:
	dia-0.96.1-pythonpath.patch 
Log Message:
Resolves: rhbz#481551 python modules search path

dia-0.96.1-pythonpath.patch:

--- NEW FILE dia-0.96.1-pythonpath.patch ---
--- dia-0.96.1.orig/plug-ins/python/python.c
+++ dia-0.96.1/plug-ins/python/python.c
@@ -102,6 +102,8 @@
     Py_Initialize();
 
     PySys_SetArgv(1, python_argv);
+    /* Sanitize sys.path */
+    PyRun_SimpleString("import sys; sys.path = filter(None, sys.path)");
 
     if (on_error_report())
 	return DIA_PLUGIN_INIT_ERROR;


Index: dia.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dia/F-9/dia.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- dia.spec	1 Feb 2008 14:35:55 -0000	1.25
+++ dia.spec	26 Jan 2009 11:16:08 -0000	1.26
@@ -1,6 +1,6 @@
 Name:           dia
 Version:        0.96.1
-Release:        6%{?dist}
+Release:        7%{?dist}
 Epoch:          1
 Summary:        Diagram drawing program
 Group:          Applications/Multimedia
@@ -14,6 +14,7 @@
 Patch5:         dia-0.96.1-64bit.patch
 Patch6:         dia-0.96.1-desktop.patch
 Patch7:         dia-0.96.1-svg-export.patch
+Patch8:         dia-0.96.1-pythonpath.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  libgnomeui-devel python-devel pygtk2-devel desktop-file-utils
 BuildRequires:  intltool docbook-utils docbook-style-dsssl docbook-style-xsl
@@ -38,6 +39,7 @@
 %patch5 -p1 -b .64bit
 %patch6 -p1
 %patch7 -p1
+%patch8 -p1 -b .pythonpath
 sed -i 's|libdia_la_LDFLAGS = -avoid-version|libdia_la_LDFLAGS = -avoid-version $(shell pkg-config gtk+-2.0 libxml-2.0 libart-2.0 libgnome-2.0 --libs)|' \
   lib/Makefile.*
 chmod -x `find objects/AADL -type f`
@@ -110,6 +112,9 @@
 
 
 %changelog
+* Mon Jan 26 2009 Caol??n McNamara <caolanm at redhat.com> 1:0.96.1-7
+- Resolves: rhbz#481551 python modules search path
+
 * Fri Feb  1 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 1:0.96.1-6
 - Fix svg export (bug 431184)
 



From caolanm at fedoraproject.org  Mon Jan 26 11:16:38 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Mon, 26 Jan 2009 11:16:38 +0000 (UTC)
Subject: rpms/dia/devel dia-0.96.1-pythonpath.patch, NONE, 1.1 dia.spec, 1.31,
	1.32
Message-ID: <20090126111638.B17127010C@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/dia/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1020/devel

Modified Files:
	dia.spec 
Added Files:
	dia-0.96.1-pythonpath.patch 
Log Message:
Resolves: rhbz#481551 python modules search path

dia-0.96.1-pythonpath.patch:

--- NEW FILE dia-0.96.1-pythonpath.patch ---
--- dia-0.96.1.orig/plug-ins/python/python.c
+++ dia-0.96.1/plug-ins/python/python.c
@@ -102,6 +102,8 @@
     Py_Initialize();
 
     PySys_SetArgv(1, python_argv);
+    /* Sanitize sys.path */
+    PyRun_SimpleString("import sys; sys.path = filter(None, sys.path)");
 
     if (on_error_report())
 	return DIA_PLUGIN_INIT_ERROR;


Index: dia.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dia/devel/dia.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- dia.spec	4 Jan 2009 03:48:40 -0000	1.31
+++ dia.spec	26 Jan 2009 11:16:08 -0000	1.32
@@ -1,6 +1,6 @@
 Name:           dia
 Version:        0.96.1
-Release:        10%{?dist}
+Release:        11%{?dist}
 Epoch:          1
 Summary:        Diagram drawing program
 Group:          Applications/Multimedia
@@ -15,6 +15,7 @@
 Patch6:         dia-0.96.1-desktop.patch
 Patch7:         dia-0.96.1-svg-export.patch
 Patch8:		dia-0.96.1-plugins.patch
+Patch9:		dia-0.96.1-pythonpath.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  libgnomeui-devel python-devel pygtk2-devel desktop-file-utils
 BuildRequires:  intltool docbook-utils docbook-style-dsssl docbook-style-xsl
@@ -40,6 +41,7 @@
 %patch6 -p1
 %patch7 -p1
 %patch8 -p1 -b .orig
+%patch9 -p1 -b .pythonpath
 sed -i 's|libdia_la_LDFLAGS = -avoid-version|libdia_la_LDFLAGS = -avoid-version $(shell pkg-config gtk+-2.0 libxml-2.0 libart-2.0 libgnome-2.0 --libs)|' \
   lib/Makefile.*
 chmod -x `find objects/AADL -type f`
@@ -113,6 +115,9 @@
 
 
 %changelog
+* Mon Jan 26 2009 Caol??n McNamara <caolanm at redhat.com> 1:0.96.1-11
+- Resolves: rhbz#481551 python modules search path
+
 * Sat Jan 03 2009 Huzaifa Sidhpurwala <huzaifas at redhat.com> 1:0.96.1-10
 - Patch so that plugins dont look for .la files
 



From ltinkl at fedoraproject.org  Mon Jan 26 11:24:35 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Mon, 26 Jan 2009 11:24:35 +0000 (UTC)
Subject: rpms/strigi/F-9 strigi-0.6.2-multilib.patch, NONE, 1.1 sources, 1.9,
	1.10 strigi.spec, 1.18, 1.19 strigi-0.5.11-to-0.5.11.1.diff, 1.1,
	NONE strigi-multilib-fix.patch, 1.2, NONE
Message-ID: <20090126112435.9441A7010C@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/strigi/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2979

Modified Files:
	sources strigi.spec 
Added Files:
	strigi-0.6.2-multilib.patch 
Removed Files:
	strigi-0.5.11-to-0.5.11.1.diff strigi-multilib-fix.patch 
Log Message:
KDE 4.2.0


strigi-0.6.2-multilib.patch:

--- NEW FILE strigi-0.6.2-multilib.patch ---
diff -up strigi-0.6.2/src/streams/strigi/strigiconfig.h.cmake.multilib strigi-0.6.2/src/streams/strigi/strigiconfig.h.cmake
--- strigi-0.6.2/src/streams/strigi/strigiconfig.h.cmake.multilib	2009-01-03 04:06:13.000000000 -0600
+++ strigi-0.6.2/src/streams/strigi/strigiconfig.h.cmake	2009-01-09 07:06:12.000000000 -0600
@@ -83,104 +83,6 @@
 #  include <stddef.h>
 #endif
 
-// our needed types
-#if !@HAVE_INT8_T@
- #define HAVE_INT8_T 1
- #if ${SIZEOF_CHAR}==1 //is char one byte?
-  typedef signed char int8_t;
- #else
-  #error Could not determine type for int8_t!
- #endif
-#endif
-
-#if !@HAVE_UINT8_T@
- #define HAVE_UINT8_T 1
- #if ${SIZEOF_CHAR}==1 //is char one byte?
-  typedef unsigned char uint8_t;
- #else
-  #error Could not determine type for uint8_t!
- #endif
-#endif
-
-#if !@HAVE_INT16_T@
- #define HAVE_INT16_T 1
- #if ${SIZEOF_SHORT}==2 //is short two bytes?
-  typedef short int16_t;
- #else
-  #error Could not determine type for int16_t!
- #endif
-#endif
-
-#if !@HAVE_UINT16_T@
- #define HAVE_UINT16_T 1
- #if ${SIZEOF_SHORT}==2 //is short two bytes?
-  typedef unsigned short uint16_t;
- #else
-  #error Could not determine type for uint16_t!
- #endif
-#endif
-
-#if !@HAVE_INT32_T@
- #define HAVE_INT32_T 1
- #if ${SIZEOF_INT}==4 //is int four bytes?
-  typedef int int32_t;
- #elif ${SIZEOF_LONG}==4 //is long four bytes?
-  typedef long int32_t;
- #else
-  #error Could not determine type for int32_t!
- #endif
-#endif
-
-#if !@HAVE_UINT32_T@
- #define HAVE_UINT32_T 1
- #if ${SIZEOF_INT}==4 //is int four bytes?
-  typedef unsigned int uint32_t;
- #elif ${SIZEOF_LONG}==4 //is long four bytes?
-  typedef unsigned long uint32_t;
- #else
-  #error Could not determine type for uint32_t!
- #endif
-#endif
-
-#if !@HAVE_INT64_T@
- #define HAVE_INT64_T 1
- #if ${SIZEOF_LONG}==8
-  typedef long int64_t;
- #elif ${SIZEOF_LONGLONG}==8
-  typedef long long int64_t; 
- #else
-  #error Could not determine type for int64_t!
- #endif
-#endif
-
-#if !@HAVE_UINT64_T@
- #define HAVE_UINT64_T 1
- #if ${SIZEOF_LONG}==8
-  typedef unsigned long uint64_t;
- #elif ${SIZEOF_LONGLONG}==8
-  typedef unsigned long long uint64_t; 
- #elif defined(HAVE___INT64)
-  typedef unsigned __int64 uint64_t; 
- #else
-  #error Could not determine type for uint64_t!
- #endif
-#endif
-
-#if !@HAVE_UINT@
- typedef unsigned int uint;
- #define HAVE_UINT 1
-#endif
-
-#if !@HAVE_SIZE_T@
- #ifndef _SIZE_T_DEFINED 
-  #ifndef HAVE_SIZE_T
-   typedef unsigned int size_t;
-   #define HAVE_SIZE_T 1
-  #endif
-  #define _SIZE_T_DEFINED 1     // kdewin32 define
- #endif
-#endif
-
 #cmakedefine __STRIGI_HAVE_GCC_VISIBILITY
 
 /**


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/strigi/F-9/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	20 Jul 2008 18:15:03 -0000	1.9
+++ sources	26 Jan 2009 11:24:03 -0000	1.10
@@ -1 +1 @@
-f1fa3488a9c2fe1e8128f4d44088c4ad  strigi-0.5.11.tar.bz2
+52787a80278d24b0ee552b81bbf547aa  strigi-0.6.3.tar.bz2


Index: strigi.spec
===================================================================
RCS file: /cvs/extras/rpms/strigi/F-9/strigi.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- strigi.spec	1 Jan 2009 22:46:02 -0000	1.18
+++ strigi.spec	26 Jan 2009 11:24:04 -0000	1.19
@@ -1,15 +1,14 @@
 Name:		strigi
-Version:	0.5.11.1
-Release:	2%{?dist}
+Version:	0.6.3
+Release:	1%{?dist}
 Summary:	A desktop search program for KDE
 Group:		Applications/Productivity
 License:	LGPLv2+
 URL:		http://www.vandenoever.info/software/strigi
-Source0:	http://www.vandenoever.info/software/strigi/strigi-0.5.11.tar.bz2
+Source0:	http://www.vandenoever.info/software/strigi/strigi-%{version}.tar.bz2
 Source1:	strigiclient.desktop
 Source2:	strigi-daemon.desktop
-Patch0:		strigi-multilib-fix.patch
-Patch1:     strigi-0.5.11-to-0.5.11.1.diff
+Patch0:		strigi-0.6.2-multilib.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	cmake >= 2.4.5
@@ -19,6 +18,8 @@
 BuildRequires:  bison
 BuildRequires:	desktop-file-utils
 
+Requires: %{name}-libs = %{version}-%{release}
+
 %description
 Strigi is a fast and light desktop search engine. It can handle a large range
 of file formats such as emails, office documents, media files, and file
@@ -35,7 +36,7 @@
 %package	devel
 Summary:	Development files for the strigi desktop search engine
 Group:		Development/Libraries
-Requires:	%name-libs = %version-%release
+Requires:	%{name}-libs = %{version}-%{release}
 Requires:	pkgconfig
 
 %description	devel
@@ -49,30 +50,22 @@
 Strigi search engine libraries
 
 %prep
-%setup -q -n strigi-0.5.11
-%patch0 -p1 -b .multilibs
-%patch1 -p0 -b .0.5.11-to-0.5.11.1
+%setup -q 
+%patch0 -p1 -b .multilib
 
 %build
-mkdir fedora
-cd fedora
-export CFLAGS="%{optflags}"
-export CXXFLAGS="%{optflags}"
-export FFLAGS="%{optflags}"
-%ifarch x86_64 ppc64
-%define lib_suffix 64
-%else
-%define lib_suffix %{nil}
-%endif
-cmake	-DCMAKE_INSTALL_PREFIX=%{_prefix}	\
-	-DLIB_DESTINATION=%{_libdir}		\
-	-DLIB_SUFFIX=%{lib_suffix} ..
-make VERBOSE=1 %{?_smp_mflags}
+mkdir -p %{_target_platform}
+pushd %{_target_platform}
+%cmake \
+  -DLIB_DESTINATION=%{_libdir} \
+  ..
+popd
+
+make %{?_smp_mflags} -C %{_target_platform}
 
 %install
 rm -rf %{buildroot}
-cd fedora
-make DESTDIR=%{buildroot} install
+make install/fast -C %{_target_platform}  DESTDIR=%{buildroot}
 
 desktop-file-install					\
 	--vendor="fedora"				\
@@ -80,14 +73,11 @@
 	%{SOURCE1}
 
 # Add an autostart desktop file for the strigi daemon
-mkdir -p %{buildroot}%{_sysconfdir}/xdg/autostart
-cp -pr %{SOURCE2} %{buildroot}%{_sysconfdir}/xdg/autostart/
+install -p -m644 -D %{SOURCE2} %{buildroot}%{_sysconfdir}/xdg/autostart/strigi-daemon.desktop
 
-#%check
-#cd fedora
-#make test
 
-find %{buildroot}%{_libdir} -type f -name "*.so*" -exec chmod 755 {} ';'
+#check
+#make -C %{_target_platform}/tests
 
 %clean
 rm -rf %{buildroot}
@@ -117,6 +107,13 @@
 %{_libdir}/strigi/
 
 %changelog
+* Mon Jan 12 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.6.3-1
+- strigi-0.6.3
+
+* Tue Jan 06 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.6.2-1
+- strigi-0.6.2
+- use %%cmake macro
+
 * Thu Dec 18 2008 Rex Dieter <rdieter at fedoraproject.org> - 0.5.11.1-2 
 - respin (exiv2)
 


--- strigi-0.5.11-to-0.5.11.1.diff DELETED ---


--- strigi-multilib-fix.patch DELETED ---



From jorton at fedoraproject.org  Mon Jan 26 11:32:27 2009
From: jorton at fedoraproject.org (Joe Orton)
Date: Mon, 26 Jan 2009 11:32:27 +0000 (UTC)
Subject: rpms/php/devel php.spec,1.168,1.169
Message-ID: <20090126113227.846B87010C@cvs1.fedora.phx.redhat.com>

Author: jorton

Update of /cvs/extras/rpms/php/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4183

Modified Files:
	php.spec 
Log Message:
* Mon Jan 26 2009 Joe Orton <jorton at redhat.com> 5.2.8-5
- split out sysvshm, sysvsem, sysvmsg, posix into php-process



Index: php.spec
===================================================================
RCS file: /cvs/extras/rpms/php/devel/php.spec,v
retrieving revision 1.168
retrieving revision 1.169
diff -u -r1.168 -r1.169
--- php.spec	25 Jan 2009 11:20:10 -0000	1.168
+++ php.spec	26 Jan 2009 11:31:57 -0000	1.169
@@ -8,7 +8,7 @@
 Summary: PHP scripting language for creating dynamic web sites
 Name: php
 Version: 5.2.8
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: PHP
 Group: Development/Languages
 URL: http://www.php.net/
@@ -87,9 +87,8 @@
 # Provides for all builtin modules:
 Provides: php-bz2, php-calendar, php-ctype, php-curl, php-date, php-exif
 Provides: php-ftp, php-gettext, php-gmp, php-hash, php-iconv, php-libxml
-Provides: php-openssl, php-pcre, php-posix
 Provides: php-reflection, php-session, php-shmop, php-simplexml, php-sockets
-Provides: php-spl, php-sysvsem, php-sysvshm, php-sysvmsg, php-tokenizer
+Provides: php-spl, php-tokenizer, php-openssl, php-pcre
 Provides: php-zlib, php-json, php-zip, php-dbase
 Obsoletes: php-openssl, php-pecl-zip, php-json, php-dbase
 
@@ -184,6 +183,17 @@
 PostgreSQL, you should install this package in addition to the main
 php package.
 
+%package process
+Summary: Modules for PHP script using system process interfaces
+Group: Development/Languages
+Requires: php-common = %{version}-%{release}
+Provides: php-posix, php-sysvsem, php-sysvshm, php-sysvmsg
+
+%description process
+The php-process package contains dynamic shared objects which add
+support to PHP using system interfaces for inter-process
+communication.
+
 %package odbc
 Group: Development/Languages
 Requires: php-common = %{version}-%{release}, php-pdo
@@ -540,7 +550,9 @@
       --with-mcrypt=shared,%{_prefix} \
       --with-mhash=shared,%{_prefix} \
       --with-tidy=shared,%{_prefix} \
-      --with-mssql=shared,%{_prefix}
+      --with-mssql=shared,%{_prefix} \
+      --enable-sysvmsg=shared --enable-sysvshm=shared --enable-sysvsem=shared \
+      --enable-posix=shared
 popd
 
 without_shared="--without-mysql --without-gd \
@@ -548,7 +560,8 @@
       --disable-dba --without-unixODBC \
       --disable-pdo --disable-xmlreader --disable-xmlwriter \
       --disable-json --without-pspell --disable-wddx \
-      --without-curl"
+      --without-curl --disable-posix \
+      --disable-sysvmsg --disable-sysvshm --disable-sysvsem"
 
 # Build Apache module, and the CLI SAPI, /usr/bin/php
 pushd build-apache
@@ -616,7 +629,8 @@
 for mod in pgsql mysql mysqli odbc ldap snmp xmlrpc imap \
     mbstring ncurses gd dom xsl soap bcmath dba xmlreader xmlwriter \
     pdo pdo_mysql pdo_pgsql pdo_odbc pdo_sqlite json zip \
-    dbase mcrypt mhash tidy pdo_dblib mssql pspell curl wddx; do
+    dbase mcrypt mhash tidy pdo_dblib mssql pspell curl wddx \
+    posix sysvshm sysvsem sysvmsg; do
     cat > $RPM_BUILD_ROOT%{_sysconfdir}/php.d/${mod}.ini <<EOF
 ; Enable ${mod} extension module
 extension=${mod}.so
@@ -639,6 +653,9 @@
 cat files.pdo_pgsql >> files.pgsql
 cat files.pdo_odbc >> files.odbc
 
+# sysv* and posix in packaged in php-process
+cat files.syv* files.posix > files.process
+
 # Package pdo_sqlite with pdo; isolating the sqlite dependency
 # isn't useful at this time since rpm itself requires sqlite.
 cat files.pdo_sqlite >> files.pdo
@@ -731,8 +748,12 @@
 %files tidy -f files.tidy
 %files mssql -f files.mssql
 %files pspell -f files.pspell
+%files process -f files.process
 
 %changelog
+* Mon Jan 26 2009 Joe Orton <jorton at redhat.com> 5.2.8-5
+- split out sysvshm, sysvsem, sysvmsg, posix into php-process
+
 * Sun Jan 25 2009 Joe Orton <jorton at redhat.com> 5.2.8-4
 - move wddx to php-xml, build curl shared in -common
 - remove BR for expat-devel, bogus configure option



From than at fedoraproject.org  Mon Jan 26 11:43:51 2009
From: than at fedoraproject.org (Than Ngo)
Date: Mon, 26 Jan 2009 11:43:51 +0000 (UTC)
Subject: rpms/konq-plugins/devel konq-plugins-4.2.0-fsview.patch, NONE,
	1.1 konq-plugins.spec, 1.17, 1.18
Message-ID: <20090126114351.625387010C@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/konq-plugins/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5541

Modified Files:
	konq-plugins.spec 
Added Files:
	konq-plugins-4.2.0-fsview.patch 
Log Message:
fix file list


konq-plugins-4.2.0-fsview.patch:

--- NEW FILE konq-plugins-4.2.0-fsview.patch ---
diff -up konq-plugins-4.2.0/CMakeLists.txt.orig konq-plugins-4.2.0/CMakeLists.txt
--- konq-plugins-4.2.0/CMakeLists.txt.orig	2009-01-26 12:07:10.000000000 +0100
+++ konq-plugins-4.2.0/CMakeLists.txt	2009-01-26 12:07:23.000000000 +0100
@@ -34,7 +34,7 @@ add_subdirectory( imagerotation ) 
 add_subdirectory( minitools ) 
 add_subdirectory( microformat ) 
 add_subdirectory( autorefresh ) 
-#add_subdirectory( fsview ) 
+add_subdirectory( fsview ) 
 add_subdirectory( searchbar ) 
 MESSAGE(STATUS "remember to readd sidebar")
 add_subdirectory( rellinks ) 


Index: konq-plugins.spec
===================================================================
RCS file: /cvs/extras/rpms/konq-plugins/devel/konq-plugins.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- konq-plugins.spec	23 Jan 2009 10:45:01 -0000	1.17
+++ konq-plugins.spec	26 Jan 2009 11:43:21 -0000	1.18
@@ -9,6 +9,7 @@
 License:        GPLv2+ and LGPLv2+
 URL:            http://extragear.kde.org
 Source0:        ftp://ftp.kde.org/pub/kde/stable/%{version}/src/extragear/konq-plugins-%{version}.tar.bz2
+Patch0:         konq-plugins-4.2.0-fsview.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # upstreamed
@@ -44,7 +45,7 @@
 
 %prep
 %setup -q
-
+%patch0 -p1 -b .fsview
 
 %build
 mkdir -p %{_target_platform}
@@ -87,7 +88,7 @@
 
 %files -f %{name}.lang 
 %defattr(-,root,root,-)
-%doc konq-plugins/COPYING konq-plugins/COPYING.LIB konq-plugins/README
+%doc COPYING* README
 %{_kde4_docdir}/HTML/en/*
 %{_kde4_bindir}/fsview
 %{_datadir}/config/translaterc
@@ -101,6 +102,7 @@
 %{_kde4_appsdir}/microformat/
 %{_kde4_appsdir}/webkitpart/kpartplugins/*
 %{_kde4_datadir}/kde4/services/*
+%{_kde4_datadir}/config.kcfg/validators.kcfg
 %{_kde4_iconsdir}/hicolor/*/*/*
 %{_kde4_iconsdir}/oxygen/*/*/*
 %{_kde4_libdir}/kde4/*
@@ -108,6 +110,7 @@
 %lang(de) %{_kde4_docdir}/HTML/de/konq-plugins
 %lang(et) %{_kde4_docdir}/HTML/et/konq-plugins
 %lang(fr) %{_kde4_docdir}/HTML/fr/konq-plugins
+%lang(it) %{_kde4_docdir}/HTML/it/konq-plugins
 %lang(nl) %{_kde4_docdir}/HTML/nl/konq-plugins
 %lang(pt) %{_kde4_docdir}/HTML/pt/konq-plugins
 %lang(sv) %{_kde4_docdir}/HTML/sv/konq-plugins



From ltinkl at fedoraproject.org  Mon Jan 26 11:49:44 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Mon, 26 Jan 2009 11:49:44 +0000 (UTC)
Subject: rpms/kdelibs/F-9 sources,1.67,1.68
Message-ID: <20090126114944.7C9CF7010C@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kdelibs/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6804

Modified Files:
	sources 
Log Message:
correct sources



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdelibs/F-9/sources,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- sources	7 Jan 2009 12:29:00 -0000	1.67
+++ sources	26 Jan 2009 11:49:14 -0000	1.68
@@ -1 +1 @@
-ffdb0340a72aaf06a0b98f354c0c59ef  kdelibs-4.1.4.tar.bz2
+4ea13b88463125026a7f71937075bcec  kdelibs-4.2.0.tar.bz2



From rrakus at fedoraproject.org  Mon Jan 26 11:51:15 2009
From: rrakus at fedoraproject.org (Roman Rakus)
Date: Mon, 26 Jan 2009 11:51:15 +0000 (UTC)
Subject: rpms/bash/devel bash-4.0-no_debug_output.patch, NONE, 1.1 .cvsignore,
	1.10, 1.11 bash-2.05a-interpreter.patch, 1.5,
	1.6 bash-3.2-audit.patch, 1.1,
	1.2 bash-3.2-ssh_source_bash.patch, 1.1, 1.2 bash-bashbug.patch,
	1.1, 1.2 bash-requires.patch, 1.3, 1.4 bash-tty-tests.patch, 1.1,
	1.2 bash-ulimit-m.patch, 1.1, 1.2 bash.spec, 1.167,
	1.168 sources, 1.13, 1.14
Message-ID: <20090126115115.16A5E7010C@cvs1.fedora.phx.redhat.com>

Author: rrakus

Update of /cvs/extras/rpms/bash/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7483

Modified Files:
	.cvsignore bash-2.05a-interpreter.patch bash-3.2-audit.patch 
	bash-3.2-ssh_source_bash.patch bash-bashbug.patch 
	bash-requires.patch bash-tty-tests.patch bash-ulimit-m.patch 
	bash.spec sources 
Added Files:
	bash-4.0-no_debug_output.patch 
Log Message:
new version bash-4.0-rc1

bash-4.0-no_debug_output.patch:

--- NEW FILE bash-4.0-no_debug_output.patch ---
diff -up bash-4.0/builtins/evalstring.c.rr bash-4.0/builtins/evalstring.c
--- bash-4.0/builtins/evalstring.c.rr	2009-01-26 04:40:10.000000000 -0500
+++ bash-4.0/builtins/evalstring.c	2009-01-26 04:40:52.000000000 -0500
@@ -268,7 +268,7 @@ parse_and_execute (string, from_file, fl
 	      if ((subshell_environment & SUBSHELL_COMSUB) && comsub_ignore_return)
 {
 		command->flags |= CMD_IGNORE_RETURN;
-itrace("parse_and_execute: turned on CMD_IGNORE_RETURN from comsub_ignore_return");
+/* itrace("parse_and_execute: turned on CMD_IGNORE_RETURN from comsub_ignore_return"); */
 }
 
 #if defined (ONESHOT)


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/bash/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	8 Dec 2008 14:00:45 -0000	1.10
+++ .cvsignore	26 Jan 2009 11:50:44 -0000	1.11
@@ -1,2 +1 @@
-bash-3.2.tar.gz
-bash-doc-3.2.tar.gz
+bash-4.0.tar.gz

bash-2.05a-interpreter.patch:

Index: bash-2.05a-interpreter.patch
===================================================================
RCS file: /cvs/extras/rpms/bash/devel/bash-2.05a-interpreter.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- bash-2.05a-interpreter.patch	15 Dec 2006 18:02:32 -0000	1.5
+++ bash-2.05a-interpreter.patch	26 Jan 2009 11:50:44 -0000	1.6
@@ -1,26 +1,7 @@
---- bash-3.2/configure.in.interpreter	2006-09-26 16:05:45.000000000 +0100
-+++ bash-3.2/configure.in	2006-12-15 17:56:15.000000000 +0000
-@@ -634,7 +634,7 @@
- 
- AC_CHECK_HEADERS(unistd.h stdlib.h stdarg.h varargs.h limits.h string.h \
- 		 memory.h locale.h termcap.h termio.h termios.h dlfcn.h \
--		 stddef.h stdint.h netdb.h pwd.h grp.h strings.h regex.h)
-+		 stddef.h stdint.h netdb.h pwd.h grp.h strings.h regex.h elf.h)
- AC_CHECK_HEADERS(sys/pte.h sys/stream.h sys/select.h sys/file.h \
- 		 sys/resource.h sys/param.h sys/socket.h sys/stat.h \
- 		 sys/time.h sys/times.h sys/types.h sys/wait.h)
-@@ -698,7 +698,7 @@
- AC_CHECK_FUNCS(dup2 eaccess fcntl getdtablesize getgroups gethostname \
- 		getpagesize getpeername getrlimit getrusage gettimeofday \
- 		kill killpg lstat readlink sbrk select setdtablesize \
--		tcgetpgrp uname ulimit waitpid)
-+		tcgetpgrp uname ulimit waitpid pread)
- AC_REPLACE_FUNCS(rename)
- 
- dnl checks for c library functions
---- bash-3.2/execute_cmd.c.interpreter	2006-12-15 17:55:53.000000000 +0000
-+++ bash-3.2/execute_cmd.c	2006-12-15 17:55:53.000000000 +0000
-@@ -40,6 +40,10 @@
+diff -up bash-4.0/execute_cmd.c.interpreter bash-4.0/execute_cmd.c
+--- bash-4.0/execute_cmd.c.interpreter	2009-01-04 20:32:29.000000000 +0100
++++ bash-4.0/execute_cmd.c	2009-01-21 14:55:34.000000000 +0100
+@@ -41,6 +41,10 @@
  #  include <unistd.h>
  #endif
  
@@ -31,7 +12,7 @@
  #include "posixtime.h"
  
  #if defined (HAVE_SYS_RESOURCE_H) && !defined (RLIMTYPE)
-@@ -3953,13 +3957,21 @@
+@@ -4601,13 +4605,21 @@ shell_execve (command, args, env)
  	{
  	  /* The file has the execute bits set, but the kernel refuses to
  	     run it for some reason.  See why. */
@@ -54,7 +35,7 @@
  	      interp = getinterp (sample, sample_len, (int *)NULL);
  	      ilen = strlen (interp);
  	      errno = i;
-@@ -3975,6 +3987,136 @@
+@@ -4623,6 +4635,136 @@ shell_execve (command, args, env)
  	      return (EX_NOEXEC);
  	    }
  #endif
@@ -191,9 +172,10 @@
  	  errno = i;
  	  file_error (command);
  	}
---- bash-3.2/config.h.in.interpreter	2006-12-15 17:55:53.000000000 +0000
-+++ bash-3.2/config.h.in	2006-12-15 17:55:53.000000000 +0000
-@@ -646,6 +646,9 @@
+diff -up bash-4.0/config.h.in.interpreter bash-4.0/config.h.in
+--- bash-4.0/config.h.in.interpreter	2009-01-21 14:55:34.000000000 +0100
++++ bash-4.0/config.h.in	2009-01-21 14:55:34.000000000 +0100
+@@ -670,6 +670,9 @@
  /* Define if you have the pathconf function. */
  #undef HAVE_PATHCONF
  
@@ -203,7 +185,7 @@
  /* Define if you have the putenv function.  */
  #undef HAVE_PUTENV
  
-@@ -823,6 +826,9 @@
+@@ -850,6 +853,9 @@
  /* Define if you have the <dlfcn.h> header file.  */
  #undef HAVE_DLFCN_H
  
@@ -213,3 +195,24 @@
  /* Define if you have the <grp.h> header file.  */
  #undef HAVE_GRP_H
  
+diff -up bash-4.0/configure.in.interpreter bash-4.0/configure.in
+--- bash-4.0/configure.in.interpreter	2009-01-06 17:51:58.000000000 +0100
++++ bash-4.0/configure.in	2009-01-21 15:04:58.000000000 +0100
+@@ -649,7 +649,7 @@ BASH_HEADER_INTTYPES
+ 
+ AC_CHECK_HEADERS(unistd.h stdlib.h stdarg.h varargs.h limits.h string.h \
+ 		 memory.h locale.h termcap.h termio.h termios.h dlfcn.h \
+-		 stddef.h stdint.h netdb.h pwd.h grp.h strings.h regex.h)
++		 stddef.h stdint.h netdb.h pwd.h grp.h strings.h regex.h elf.h)
+ AC_CHECK_HEADERS(sys/pte.h sys/stream.h sys/select.h sys/file.h \
+ 		 sys/resource.h sys/param.h sys/socket.h sys/stat.h \
+ 		 sys/time.h sys/times.h sys/types.h sys/wait.h)
+@@ -713,7 +713,7 @@ dnl checks for system calls
+ AC_CHECK_FUNCS(dup2 eaccess fcntl getdtablesize getgroups gethostname \
+ 		getpagesize getpeername getrlimit getrusage gettimeofday \
+ 		kill killpg lstat readlink sbrk select setdtablesize \
+-		setitimer tcgetpgrp uname ulimit waitpid)
++		setitimer tcgetpgrp uname ulimit waitpid pread)
+ AC_REPLACE_FUNCS(rename)
+ 
+ dnl checks for c library functions

bash-3.2-audit.patch:

Index: bash-3.2-audit.patch
===================================================================
RCS file: /cvs/extras/rpms/bash/devel/bash-3.2-audit.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- bash-3.2-audit.patch	15 Dec 2008 10:41:49 -0000	1.1
+++ bash-3.2-audit.patch	26 Jan 2009 11:50:44 -0000	1.2
@@ -1,5 +1,36 @@
---- bash-3.2/lib/readline/readline.c.audit	2008-01-18 13:06:25.000000000 +0100
-+++ bash-3.2/lib/readline/readline.c	2008-01-18 13:06:25.000000000 +0100
+diff -up bash-4.0/config.h.in.audit bash-4.0/config.h.in
+--- bash-4.0/config.h.in.audit	2009-01-21 11:34:34.000000000 -0500
++++ bash-4.0/config.h.in	2009-01-21 11:34:35.000000000 -0500
+@@ -1077,6 +1077,14 @@
+ 
+ /* End additions for lib/intl */
+ 
++
++/* Additions for lib/readline */
++
++/* Define if you have <linux/audit.h> and it defines AUDIT_USER_TTY */
++#undef HAVE_DECL_AUDIT_USER_TTY
++
++/* End additions for lib/readline */
++
+ #include "config-bot.h"
+ 
+ #endif /* _CONFIG_H_ */
+diff -up bash-4.0/configure.in.audit bash-4.0/configure.in
+--- bash-4.0/configure.in.audit	2009-01-21 11:34:34.000000000 -0500
++++ bash-4.0/configure.in	2009-01-21 11:34:35.000000000 -0500
+@@ -875,6 +875,8 @@ BASH_FUNC_DUP2_CLOEXEC_CHECK
+ BASH_SYS_PGRP_SYNC
+ BASH_SYS_SIGNAL_VINTAGE
+ 
++AC_CHECK_DECLS([AUDIT_USER_TTY],,, [[#include <linux/audit.h>]])
++
+ dnl checking for the presence of certain library symbols
+ BASH_SYS_ERRLIST
+ BASH_SYS_SIGLIST
+diff -up bash-4.0/lib/readline/readline.c.audit bash-4.0/lib/readline/readline.c
+--- bash-4.0/lib/readline/readline.c.audit	2009-01-21 11:34:34.000000000 -0500
++++ bash-4.0/lib/readline/readline.c	2009-01-21 11:40:12.000000000 -0500
 @@ -55,6 +55,12 @@
  extern int errno;
  #endif /* !errno */
@@ -13,7 +44,7 @@
  /* System-specific feature definitions and include files. */
  #include "rldefs.h"
  #include "rlmbutil.h"
-@@ -292,7 +298,47 @@
+@@ -297,7 +303,47 @@ rl_set_prompt (prompt)
    rl_visible_prompt_length = rl_expand_prompt (rl_prompt);
    return 0;
  }
@@ -62,8 +93,8 @@
  /* Read a line of input.  Prompt with PROMPT.  An empty PROMPT means
     none.  A return value of NULL means that EOF was encountered. */
  char *
-@@ -326,6 +372,11 @@
-   rl_clear_signals ();
+@@ -348,6 +394,11 @@ readline (prompt)
+     RL_SETSTATE (RL_STATE_CALLBACK);
  #endif
  
 +#if defined (HAVE_DECL_AUDIT_USER_TTY)
@@ -74,31 +105,3 @@
    return (value);
  }
  
---- bash-3.2/configure.in.audit	2008-01-18 13:06:25.000000000 +0100
-+++ bash-3.2/configure.in	2008-01-18 13:06:25.000000000 +0100
-@@ -871,6 +871,8 @@
- BASH_SYS_PGRP_SYNC
- BASH_SYS_SIGNAL_VINTAGE
- 
-+AC_CHECK_DECLS([AUDIT_USER_TTY],,, [[#include <linux/audit.h>]])
-+
- dnl checking for the presence of certain library symbols
- BASH_SYS_ERRLIST
- BASH_SYS_SIGLIST
---- bash-3.2/config.h.in.audit	2008-01-18 13:06:25.000000000 +0100
-+++ bash-3.2/config.h.in	2008-01-18 13:10:19.000000000 +0100
-@@ -1058,6 +1058,14 @@
- 
- /* End additions for lib/intl */
- 
-+
-+/* Additions for lib/readline */
-+
-+/* Define if you have <linux/audit.h> and it defines AUDIT_USER_TTY */
-+#undef HAVE_DECL_AUDIT_USER_TTY
-+
-+/* End additions for lib/readline */
-+
- #include "config-bot.h"
- 
- #endif /* _CONFIG_H_ */

bash-3.2-ssh_source_bash.patch:

Index: bash-3.2-ssh_source_bash.patch
===================================================================
RCS file: /cvs/extras/rpms/bash/devel/bash-3.2-ssh_source_bash.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- bash-3.2-ssh_source_bash.patch	23 Oct 2008 13:44:05 -0000	1.1
+++ bash-3.2-ssh_source_bash.patch	26 Jan 2009 11:50:44 -0000	1.2
@@ -1,9 +1,12 @@
-diff -up bash-3.2/config-top.h.ssh_source_bash bash-3.2/config-top.h
---- bash-3.2/config-top.h.ssh_source_bash	2008-10-23 15:08:04.000000000 +0200
-+++ bash-3.2/config-top.h	2008-10-23 15:08:33.000000000 +0200
-@@ -86,4 +86,4 @@
- 
- /* Define this if you want bash to try to check whether it's being run by
-    sshd and source the .bashrc if so (like the rshd behavior). */
+diff -up bash-4.0/config-top.h.ssh_source_bash bash-4.0/config-top.h
+--- bash-4.0/config-top.h.ssh_source_bash	2009-01-21 15:20:06.000000000 +0100
++++ bash-4.0/config-top.h	2009-01-21 15:25:46.000000000 +0100
+@@ -90,7 +90,7 @@
+    sshd and source the .bashrc if so (like the rshd behavior).  This checks
+    for the presence of SSH_CLIENT or SSH2_CLIENT in the initial environment,
+    which can be fooled under certain not-uncommon circumstances. */
 -/* #define SSH_SOURCE_BASHRC */
 +#define SSH_SOURCE_BASHRC
+ 
+ /* Define if you want the case-capitalizing operators (~[~]) and the
+    `capcase' variable attribute (declare -c). */

bash-bashbug.patch:

Index: bash-bashbug.patch
===================================================================
RCS file: /cvs/extras/rpms/bash/devel/bash-bashbug.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- bash-bashbug.patch	9 Sep 2004 03:33:21 -0000	1.1
+++ bash-bashbug.patch	26 Jan 2009 11:50:44 -0000	1.2
@@ -1,6 +1,7 @@
---- bash-3.0/doc/bash.1.bashbug	2004-09-07 18:12:05.102185374 +0100
-+++ bash-3.0/doc/bash.1	2004-09-07 18:15:12.796455678 +0100
-@@ -8680,7 +8680,7 @@
+diff -up bash-4.0/doc/bash.1.bashbug bash-4.0/doc/bash.1
+--- bash-4.0/doc/bash.1.bashbug	2008-12-29 16:49:25.000000000 -0500
++++ bash-4.0/doc/bash.1	2009-01-21 11:43:34.000000000 -0500
+@@ -9325,7 +9325,7 @@ The latest version is always available f
  .PP
  Once you have determined that a bug actually exists, use the
  .I bashbug
@@ -9,7 +10,7 @@
  If you have a fix, you are encouraged to mail that as well!
  Suggestions and `philosophical' bug reports may be mailed
  to \fIbug-bash at gnu.org\fP or posted to the Usenet
-@@ -8702,10 +8702,6 @@
+@@ -9347,10 +9347,6 @@ A description of the bug behaviour
  A short script or `recipe' which exercises the bug
  .PD
  .PP
@@ -19,10 +20,11 @@
 -.PP
  Comments and bug reports concerning
  this manual page should be directed to
- .IR chet at po.CWRU.Edu .
---- bash-3.0/doc/bashref.texi.bashbug	2004-09-07 18:13:53.305588178 +0100
-+++ bash-3.0/doc/bashref.texi	2004-09-07 18:14:58.111251326 +0100
-@@ -6777,7 +6777,7 @@
+ .IR chet at po.cwru.edu .
+diff -up bash-4.0/doc/bashref.texi.bashbug bash-4.0/doc/bashref.texi
+--- bash-4.0/doc/bashref.texi.bashbug	2009-01-04 14:32:25.000000000 -0500
++++ bash-4.0/doc/bashref.texi	2009-01-21 11:41:07.000000000 -0500
+@@ -7292,7 +7292,7 @@ The latest version of Bash is always ava
  @uref{ftp://ftp.gnu.org/pub/bash/}.
  
  Once you have determined that a bug actually exists, use the
@@ -31,7 +33,7 @@
  If you have a fix, you are encouraged to mail that as well!
  Suggestions and `philosophical' bug reports may be mailed
  to @email{bug-bash@@gnu.org} or posted to the Usenet
-@@ -6799,9 +6799,6 @@
+@@ -7314,9 +7314,6 @@ to reproduce it.
  @end itemize
  
  @noindent
@@ -41,9 +43,10 @@
  Please send all reports concerning this manual to
  @email{chet@@po.CWRU.Edu}.
  
---- bash-3.0/shell.c.bashbug	2004-09-07 18:11:10.580563335 +0100
-+++ bash-3.0/shell.c	2004-09-07 18:11:23.650075642 +0100
-@@ -1763,7 +1763,6 @@
+diff -up bash-4.0/shell.c.bashbug bash-4.0/shell.c
+--- bash-4.0/shell.c.bashbug	2009-01-04 14:32:41.000000000 -0500
++++ bash-4.0/shell.c	2009-01-21 11:41:07.000000000 -0500
+@@ -1806,7 +1806,6 @@ show_shell_usage (fp, extra)
      {
        fprintf (fp, _("Type `%s -c \"help set\"' for more information about shell options.\n"), shell_name);
        fprintf (fp, _("Type `%s -c help' for more information about shell builtin commands.\n"), shell_name);

bash-requires.patch:

Index: bash-requires.patch
===================================================================
RCS file: /cvs/extras/rpms/bash/devel/bash-requires.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- bash-requires.patch	9 Dec 2008 14:54:13 -0000	1.3
+++ bash-requires.patch	26 Jan 2009 11:50:44 -0000	1.4
@@ -1,7 +1,7 @@
-diff -up bash-3.2/shell.c.requires bash-3.2/shell.c
---- bash-3.2/shell.c.requires	2006-05-17 14:46:54.000000000 +0200
-+++ bash-3.2/shell.c	2008-12-09 14:02:02.000000000 +0100
-@@ -175,6 +175,9 @@ int running_under_emacs;
+diff -up bash-4.0/shell.c.requires bash-4.0/shell.c
+--- bash-4.0/shell.c.requires	2009-01-21 15:28:16.000000000 +0100
++++ bash-4.0/shell.c	2009-01-21 15:28:16.000000000 +0100
+@@ -193,6 +193,9 @@ int have_devfd = 0;
  /* The name of the .(shell)rc file. */
  static char *bashrc_file = "~/.bashrc";
  
@@ -11,7 +11,7 @@
  /* Non-zero means to act more like the Bourne shell on startup. */
  static int act_like_sh;
  
-@@ -233,6 +236,7 @@ struct {
+@@ -251,6 +254,7 @@ static const struct {
    { "posix", Int, &posixly_correct, (char **)0x0 },
    { "protected", Int, &protected_mode, (char **)0x0 },
    { "rcfile", Charp, (int *)0x0, &bashrc_file },
@@ -19,7 +19,7 @@
  #if defined (RESTRICTED_SHELL)
    { "restricted", Int, &restricted, (char **)0x0 },
  #endif
-@@ -460,6 +464,12 @@ main (argc, argv, env)
+@@ -479,6 +483,12 @@ main (argc, argv, env)
    if (dump_translatable_strings)
      read_but_dont_execute = 1;
  
@@ -32,10 +32,10 @@
    if (running_setuid && privileged_mode == 0)
      disable_priv_mode ();
  
-diff -up bash-3.2/doc/bashref.texi.requires bash-3.2/doc/bashref.texi
---- bash-3.2/doc/bashref.texi.requires	2008-12-09 14:02:01.000000000 +0100
-+++ bash-3.2/doc/bashref.texi	2008-12-09 14:02:02.000000000 +0100
-@@ -4906,6 +4906,13 @@ standard.  @xref{Bash POSIX Mode}, for a
+diff -up bash-4.0/doc/bashref.texi.requires bash-4.0/doc/bashref.texi
+--- bash-4.0/doc/bashref.texi.requires	2009-01-21 15:28:16.000000000 +0100
++++ bash-4.0/doc/bashref.texi	2009-01-21 15:28:16.000000000 +0100
+@@ -5253,6 +5253,13 @@ standard.  @xref{Bash POSIX Mode}, for a
  @item --restricted
  Make the shell a restricted shell (@pxref{The Restricted Shell}).
  
@@ -49,10 +49,10 @@
  @item --verbose
  Equivalent to @option{-v}.  Print shell input lines as they're read.
  
-diff -up bash-3.2/doc/bash.1.requires bash-3.2/doc/bash.1
---- bash-3.2/doc/bash.1.requires	2008-12-09 14:02:01.000000000 +0100
-+++ bash-3.2/doc/bash.1	2008-12-09 14:02:02.000000000 +0100
-@@ -232,6 +232,13 @@ The shell becomes restricted (see
+diff -up bash-4.0/doc/bash.1.requires bash-4.0/doc/bash.1
+--- bash-4.0/doc/bash.1.requires	2009-01-21 15:28:16.000000000 +0100
++++ bash-4.0/doc/bash.1	2009-01-21 15:28:16.000000000 +0100
+@@ -231,6 +231,13 @@ The shell becomes restricted (see
  .B "RESTRICTED SHELL"
  below).
  .TP
@@ -66,10 +66,10 @@
  .B \-\-verbose
  Equivalent to  \fB\-v\fP.
  .TP
-diff -up bash-3.2/make_cmd.c.requires bash-3.2/make_cmd.c
---- bash-3.2/make_cmd.c.requires	2006-09-12 15:21:22.000000000 +0200
-+++ bash-3.2/make_cmd.c	2008-12-09 14:02:02.000000000 +0100
-@@ -41,11 +41,15 @@ Foundation, 59 Temple Place, Suite 330, 
+diff -up bash-4.0/make_cmd.c.requires bash-4.0/make_cmd.c
+--- bash-4.0/make_cmd.c.requires	2009-01-04 20:32:38.000000000 +0100
++++ bash-4.0/make_cmd.c	2009-01-21 15:28:16.000000000 +0100
+@@ -41,11 +41,15 @@
  #include "flags.h"
  #include "make_cmd.h"
  #include "dispose_cmd.h"
@@ -85,7 +85,7 @@
  
  #if defined (JOB_CONTROL)
  #include "jobs.h"
-@@ -55,6 +59,10 @@ Foundation, 59 Temple Place, Suite 330, 
+@@ -55,6 +59,10 @@
  
  extern int line_number, current_command_line_count;
  extern int last_command_exit_value;
@@ -96,8 +96,8 @@
  
  /* Object caching */
  sh_obj_cache_t wdcache = {0, 0, 0};
-@@ -789,6 +797,27 @@ make_subshell_command (command)
-   return (make_command (cm_subshell, (SIMPLE_COM *)temp));
+@@ -810,6 +818,27 @@ make_coproc_command (name, command)
+   return (make_command (cm_coproc, (SIMPLE_COM *)temp));
  }
  
 +static void
@@ -124,7 +124,7 @@
  /* Reverse the word list and redirection list in the simple command
     has just been parsed.  It seems simpler to do this here the one
     time then by any other method that I can think of. */
-@@ -806,6 +835,27 @@ clean_simple_command (command)
+@@ -827,6 +856,27 @@ clean_simple_command (command)
  	REVERSE_LIST (command->value.Simple->redirects, REDIRECT *);
      }
  
@@ -152,10 +152,10 @@
    return (command);
  }
  
-diff -up bash-3.2/execute_cmd.c.requires bash-3.2/execute_cmd.c
---- bash-3.2/execute_cmd.c.requires	2008-12-09 14:02:02.000000000 +0100
-+++ bash-3.2/execute_cmd.c	2008-12-09 15:19:29.000000000 +0100
-@@ -476,6 +476,8 @@ async_redirect_stdin ()
+diff -up bash-4.0/execute_cmd.c.requires bash-4.0/execute_cmd.c
+--- bash-4.0/execute_cmd.c.requires	2009-01-21 15:28:16.000000000 +0100
++++ bash-4.0/execute_cmd.c	2009-01-21 15:28:16.000000000 +0100
+@@ -497,6 +497,8 @@ async_redirect_stdin ()
  
  #define DESCRIBE_PID(pid) do { if (interactive) describe_pid (pid); } while (0)
  
@@ -164,7 +164,7 @@
  /* Execute the command passed in COMMAND, perhaps doing it asynchrounously.
     COMMAND is exactly what read_command () places into GLOBAL_COMMAND.
     ASYNCHROUNOUS, if non-zero, says to do this command in the background.
-@@ -507,8 +509,13 @@ execute_command_internal (command, async
+@@ -528,8 +530,13 @@ execute_command_internal (command, async
  #else
    if (breaking || continuing)
      return (last_command_exit_value);
@@ -179,18 +179,18 @@
  #endif
  
    QUIT;
-@@ -4073,7 +4080,7 @@ execute_intern_function (name, function)
+@@ -4859,7 +4866,7 @@ execute_intern_function (name, function)
  
    if (check_identifier (name, posixly_correct) == 0)
      {
 -      if (posixly_correct && interactive_shell == 0)
 +      if (posixly_correct && interactive_shell == 0 && rpm_requires == 0)
  	{
- 	  last_command_exit_value = EX_USAGE;
+ 	  last_command_exit_value = EX_BADUSAGE;
  	  jump_to_top_level (ERREXIT);
-diff -up bash-3.2/execute_cmd.h.requires bash-3.2/execute_cmd.h
---- bash-3.2/execute_cmd.h.requires	2001-05-07 16:39:37.000000000 +0200
-+++ bash-3.2/execute_cmd.h	2008-12-09 14:02:02.000000000 +0100
+diff -up bash-4.0/execute_cmd.h.requires bash-4.0/execute_cmd.h
+--- bash-4.0/execute_cmd.h.requires	2009-01-04 20:32:29.000000000 +0100
++++ bash-4.0/execute_cmd.h	2009-01-21 15:28:16.000000000 +0100
 @@ -22,6 +22,8 @@
  #define _EXECUTE_CMD_H_
  
@@ -200,20 +200,21 @@
  
  extern struct fd_bitmap *new_fd_bitmap __P((int));
  extern void dispose_fd_bitmap __P((struct fd_bitmap *));
-diff -up bash-3.2/builtins.h.requires bash-3.2/builtins.h
---- bash-3.2/builtins.h.requires	2004-12-30 19:59:05.000000000 +0100
-+++ bash-3.2/builtins.h	2008-12-09 14:02:02.000000000 +0100
-@@ -40,6 +40,7 @@
- #define STATIC_BUILTIN  0x4	/* This builtin is not dynamically loaded. */
- #define SPECIAL_BUILTIN 0x8	/* This is a Posix `special' builtin. */
+diff -up bash-4.0/builtins.h.requires bash-4.0/builtins.h
+--- bash-4.0/builtins.h.requires	2009-01-04 20:32:23.000000000 +0100
++++ bash-4.0/builtins.h	2009-01-21 16:10:39.000000000 +0100
+@@ -41,6 +41,8 @@
+ #define SPECIAL_BUILTIN 0x08	/* This is a Posix `special' builtin. */
  #define ASSIGNMENT_BUILTIN 0x10	/* This builtin takes assignment statements. */
-+#define REQUIRES_BUILTIN 0x20	/* This builtin requires other files. */
+ #define POSIX_BUILTIN	0x20	/* This builtins is special in the Posix command search order. */
++#define REQUIRES_BUILTIN 0x40	/* This builtin requires other files. */
++
  
  #define BASE_INDENT	4
  
-diff -up bash-3.2/eval.c.requires bash-3.2/eval.c
---- bash-3.2/eval.c.requires	2006-03-19 23:30:26.000000000 +0100
-+++ bash-3.2/eval.c	2008-12-09 14:02:02.000000000 +0100
+diff -up bash-4.0/eval.c.requires bash-4.0/eval.c
+--- bash-4.0/eval.c.requires	2009-01-04 20:32:26.000000000 +0100
++++ bash-4.0/eval.c	2009-01-21 15:28:16.000000000 +0100
 @@ -53,6 +53,7 @@ extern int last_command_exit_value, stdi
  extern int need_here_doc;
  extern int current_command_number, current_command_line_count, line_number;
@@ -222,7 +223,7 @@
  
  static void send_pwd_to_eterm __P((void));
  static sighandler alrm_catcher __P((int));
-@@ -131,7 +132,7 @@ reader_loop ()
+@@ -136,7 +137,7 @@ reader_loop ()
  
        if (read_command () == 0)
  	{
@@ -231,10 +232,10 @@
  	    {
  	      last_command_exit_value = EXECUTION_SUCCESS;
  	      dispose_command (global_command);
-diff -up bash-3.2/builtins/mkbuiltins.c.requires bash-3.2/builtins/mkbuiltins.c
---- bash-3.2/builtins/mkbuiltins.c.requires	2006-03-07 22:41:57.000000000 +0100
-+++ bash-3.2/builtins/mkbuiltins.c	2008-12-09 14:02:02.000000000 +0100
-@@ -69,8 +69,13 @@ extern char *strcpy ();
+diff -up bash-4.0/builtins/mkbuiltins.c.requires bash-4.0/builtins/mkbuiltins.c
+--- bash-4.0/builtins/mkbuiltins.c.requires	2009-01-04 20:32:23.000000000 +0100
++++ bash-4.0/builtins/mkbuiltins.c	2009-01-21 16:16:05.000000000 +0100
+@@ -69,9 +69,15 @@ extern char *strcpy ();
  #define whitespace(c) (((c) == ' ') || ((c) == '\t'))
  
  /* Flag values that builtins can have. */
@@ -244,11 +245,13 @@
 +    in ../builtins.h */
  #define BUILTIN_FLAG_SPECIAL	0x01
  #define BUILTIN_FLAG_ASSIGNMENT 0x02
-+#define BUILTIN_FLAG_REQUIRES	0x04
+ #define BUILTIN_FLAG_POSIX_BUILTIN 0x04
++#define BUILTIN_FLAG_REQUIRES	0x08
++
  
  #define BASE_INDENT	4
  
-@@ -154,9 +159,17 @@ char *assignment_builtins[] =
+@@ -163,10 +169,18 @@ char *posix_builtins[] =
    (char *)NULL
  };
  
@@ -262,34 +265,37 @@
  /* Forward declarations. */
  static int is_special_builtin ();
  static int is_assignment_builtin ();
+ static int is_posix_builtin ();
 +static int is_requires_builtin ();
  
  #if !defined (HAVE_RENAME)
  static int rename ();
-@@ -800,6 +813,8 @@ builtin_handler (self, defs, arg)
-     new->flags |= BUILTIN_FLAG_SPECIAL;
-   if (is_assignment_builtin (name))
+@@ -812,6 +826,9 @@ builtin_handler (self, defs, arg)
      new->flags |= BUILTIN_FLAG_ASSIGNMENT;
+   if (is_posix_builtin (name))
+     new->flags |= BUILTIN_FLAG_POSIX_BUILTIN;
 +  if (is_requires_builtin (name))
 +    new->flags |= BUILTIN_FLAG_REQUIRES;
++
  
    array_add ((char *)new, defs->builtins);
    building_builtin = 1;
-@@ -1217,10 +1232,11 @@ write_builtins (defs, structfile, extern
+@@ -1229,11 +1246,12 @@ write_builtins (defs, structfile, extern
  		  else
  		    fprintf (structfile, "(sh_builtin_func_t *)0x0, ");
  
--		  fprintf (structfile, "%s%s%s, %s_doc,\n",
-+		  fprintf (structfile, "%s%s%s%s, %s_doc,\n",
+-		  fprintf (structfile, "%s%s%s%s, %s_doc,\n",
++		  fprintf (structfile, "%s%s%s%s%s, %s_doc,\n",
  		    "BUILTIN_ENABLED | STATIC_BUILTIN",
  		    (builtin->flags & BUILTIN_FLAG_SPECIAL) ? " | SPECIAL_BUILTIN" : "",
  		    (builtin->flags & BUILTIN_FLAG_ASSIGNMENT) ? " | ASSIGNMENT_BUILTIN" : "",
+ 		    (builtin->flags & BUILTIN_FLAG_POSIX_BUILTIN) ? " | POSIX_BUILTIN" : "",
 +		    (builtin->flags & BUILTIN_FLAG_REQUIRES) ? " | REQUIRES_BUILTIN" : "",
  		    document_name (builtin));
  
  		  fprintf
-@@ -1561,6 +1577,13 @@ is_assignment_builtin (name)
-   return (_find_in_table (name, assignment_builtins));
+@@ -1581,6 +1599,13 @@ is_posix_builtin (name)
+   return (_find_in_table (name, posix_builtins));
  }
  
 +static int

bash-tty-tests.patch:

Index: bash-tty-tests.patch
===================================================================
RCS file: /cvs/extras/rpms/bash/devel/bash-tty-tests.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- bash-tty-tests.patch	10 Sep 2004 15:51:07 -0000	1.1
+++ bash-tty-tests.patch	26 Jan 2009 11:50:44 -0000	1.2
@@ -1,6 +1,7 @@
---- bash-3.0/tests/read.tests.tty-tests	2004-03-14 22:18:02.000000000 +0000
-+++ bash-3.0/tests/read.tests	2004-09-10 16:41:32.746099025 +0100
-@@ -82,9 +82,6 @@
+diff -up bash-4.0/tests/read.tests.tty_tests bash-4.0/tests/read.tests
+--- bash-4.0/tests/read.tests.tty_tests	2008-09-06 19:09:11.000000000 +0200
++++ bash-4.0/tests/read.tests	2009-01-21 16:21:48.000000000 +0100
+@@ -82,9 +82,6 @@ echo " foo" | { IFS=$':' ; read line; re
  # test read -d delim behavior
  ${THIS_SH} ./read1.sub
  
@@ -10,19 +11,20 @@
  # test read -n nchars behavior
  ${THIS_SH} ./read3.sub
  
---- bash-3.0/tests/read.right.tty-tests	2004-03-14 22:18:16.000000000 +0000
-+++ bash-3.0/tests/read.right	2004-09-10 16:41:32.751098072 +0100
-@@ -33,14 +33,6 @@
+diff -up bash-4.0/tests/read.right.tty_tests bash-4.0/tests/read.right
+--- bash-4.0/tests/read.right.tty_tests	2008-09-06 19:10:14.000000000 +0200
++++ bash-4.0/tests/read.right	2009-01-21 16:30:03.000000000 +0100
+@@ -33,14 +33,6 @@ a = abcdefg
  a = xyz
  a = -xyz 123-
  a = abc
+-timeout 1: ok
+-
+-timeout 2: ok
+-
+-./read2.sub: line 23: read: -3: invalid timeout specification
 -1
--4
--1
--4
--./read2.sub: line 13: read: -3: invalid timeout specification
--1
--4
+-
 -abcde
  ./read3.sub: line 4: read: -1: invalid number
  abc

bash-ulimit-m.patch:

Index: bash-ulimit-m.patch
===================================================================
RCS file: /cvs/extras/rpms/bash/devel/bash-ulimit-m.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- bash-ulimit-m.patch	4 Jul 2007 15:43:18 -0000	1.1
+++ bash-ulimit-m.patch	26 Jan 2009 11:50:44 -0000	1.2
@@ -1,17 +1,7 @@
---- bash-3.2/builtins/ulimit.def.ulimit-m	2006-03-23 20:51:51.000000000 +0000
-+++ bash-3.2/builtins/ulimit.def	2007-07-04 16:42:12.000000000 +0100
-@@ -38,7 +38,7 @@
-     -f	the maximum size of files written by the shell and its children
-     -i	the maximum number of pending signals
-     -l	the maximum size a process may lock into memory
--    -m	the maximum resident set size
-+    -m	the maximum resident set size (has no effect on Linux)
-     -n	the maximum number of open file descriptors
-     -p	the pipe buffer size
-     -q	the maximum number of bytes in POSIX message queues
---- bash-3.2/doc/bash.1.ulimit-m	2007-07-04 16:41:59.000000000 +0100
-+++ bash-3.2/doc/bash.1	2007-07-04 16:42:12.000000000 +0100
-@@ -8545,7 +8545,7 @@
+diff -up bash-4.0/doc/bash.1.ulimit-m bash-4.0/doc/bash.1
+--- bash-4.0/doc/bash.1.ulimit-m	2009-01-21 16:31:19.000000000 +0100
++++ bash-4.0/doc/bash.1	2009-01-21 16:31:19.000000000 +0100
+@@ -9044,7 +9044,7 @@ The maximum number of pending signals
  The maximum size that may be locked into memory
  .TP
  .B \-m
@@ -20,3 +10,15 @@
  .TP
  .B \-n
  The maximum number of open file descriptors (most systems do not
+diff -up bash-4.0/builtins/ulimit.def.ulimit-m bash-4.0/builtins/ulimit.def
+--- bash-4.0/builtins/ulimit.def.ulimit-m	2009-01-04 20:32:23.000000000 +0100
++++ bash-4.0/builtins/ulimit.def	2009-01-21 16:36:12.000000000 +0100
+@@ -40,7 +40,7 @@ Options:
+   -f	the maximum size of files written by the shell and its children
+   -i	the maximum number of pending signals
+   -l	the maximum size a process may lock into memory
+-  -m	the maximum resident set size
++  -m	the maximum resident set size (has no effect on Linux)
+   -n	the maximum number of open file descriptors
+   -p	the pipe buffer size
+   -q	the maximum number of bytes in POSIX message queues


Index: bash.spec
===================================================================
RCS file: /cvs/extras/rpms/bash/devel/bash.spec,v
retrieving revision 1.167
retrieving revision 1.168
diff -u -r1.167 -r1.168
--- bash.spec	15 Dec 2008 13:47:06 -0000	1.167
+++ bash.spec	26 Jan 2009 11:50:44 -0000	1.168
@@ -1,94 +1,43 @@
-Version: 3.2
+Version: 4.0
 Name: bash
 Summary: The GNU Bourne Again shell version %{version}
-Release: 33%{?dist}
+Release: rc1.1%{?dist}
 Group: System Environment/Shells
 License: GPLv2+
 Url: http://www.gnu.org/software/bash
 Source0: ftp://ftp.gnu.org/gnu/bash/bash-%{version}.tar.gz
-Source2: ftp://ftp.gnu.org/gnu/bash/bash-doc-%{version}.tar.gz
-Source3: dot-bashrc
-Source4: dot-bash_profile
-Source5: dot-bash_logout
+
+# For now there isn't any doc
+#Source2: ftp://ftp.gnu.org/gnu/bash/bash-doc-%{version}.tar.gz
+
+Source1: dot-bashrc
+Source2: dot-bash_profile
+Source3: dot-bash_logout
 
 # Official upstream patches
-Patch1: ftp://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-001
-Patch2: ftp://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-002
-Patch3: ftp://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-003
-Patch4: ftp://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-004
-Patch5: ftp://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-005
-Patch6: ftp://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-006
-Patch7: ftp://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-007
-Patch8: ftp://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-008
-Patch9: ftp://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-009
-Patch10: ftp://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-010
-Patch11: ftp://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-011
-Patch12: ftp://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-012
-Patch13: ftp://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-013
-Patch14: ftp://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-014
-Patch15: ftp://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-015
-Patch16: ftp://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-016
-Patch17: ftp://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-017
-Patch18: ftp://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-018
-Patch19: ftp://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-019
-Patch20: ftp://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-020
-Patch21: ftp://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-021
-Patch22: ftp://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-022
-Patch23: ftp://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-023
-Patch24: ftp://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-024
-Patch25: ftp://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-025
-Patch26: ftp://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-026
-Patch27: ftp://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-027
-Patch28: ftp://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-028
-Patch29: ftp://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-029
-Patch30: ftp://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-030
-Patch31: ftp://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-031
-Patch32: ftp://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-032
-Patch33: ftp://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-033
-Patch34: ftp://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-034
-Patch35: ftp://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-035
-Patch36: ftp://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-036
-Patch37: ftp://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-037
-Patch38: ftp://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-038
-Patch39: ftp://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-039
-Patch40: ftp://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-040
-Patch41: ftp://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-041
-Patch42: ftp://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-042
-Patch43: ftp://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-043
-Patch44: ftp://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-044
-Patch45: ftp://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-045
-Patch46: ftp://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-046
-Patch47: ftp://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-047
-Patch48: ftp://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-048
+# not any :)
 
 # Other patches
-Patch100: bash-2.03-paths.patch
 Patch101: bash-2.02-security.patch
-Patch102: bash-2.03-profile.patch
-Patch103: bash-requires.patch
-Patch107: bash-2.05a-interpreter.patch
+Patch102: bash-2.03-paths.patch
+Patch103: bash-2.03-profile.patch
+Patch104: bash-2.05a-interpreter.patch
+Patch105: bash-2.05b-debuginfo.patch
+Patch106: bash-2.05b-manso.patch
+Patch107: bash-2.05b-pgrp_sync.patch
 Patch108: bash-2.05b-readline-oom.patch
-Patch114: bash-2.05b-xcc.patch
-Patch115: bash-2.05b-pgrp_sync.patch
-Patch116: bash-2.05b-manso.patch
-Patch117: bash-2.05b-debuginfo.patch
+Patch109: bash-2.05b-xcc.patch
+Patch110: bash-3.2-audit.patch
+#Patch111: bash-3.2-rng.patch
+Patch112: bash-3.2-ssh_source_bash.patch
+Patch113: bash-bashbug.patch
+Patch114: bash-cond-rmatch.patch
+Patch115: bash-infotags.patch
+Patch116: bash-requires.patch
+Patch117: bash-setlocale.patch
 Patch118: bash-tty-tests.patch
-Patch126: bash-setlocale.patch
-Patch130: bash-infotags.patch
-Patch131: bash-cond-rmatch.patch
-Patch132: bash-ulimit-m.patch
-Patch133: bash-3.2-rng.patch
-Patch136: bash-3.2-344411.patch
-Patch137: bash-3.2-190350.patch
-Patch138: bash-3.2-comp_wordbreaks.patch
-Patch139: bash-3.2-manpage.patch
-Patch140: bash-3.2-man-page-suspend.patch
-Patch141: bash-3.2-patch035.patch
-Patch142: bash-3.2-execve_catch_signals.patch
-Patch143: bash-3.2-ssh_source_bash.patch
-Patch144: bash-3.2-command_not_found.patch
-Patch145: bash-3.2-audit.patch
-Patch146: bash-3.2-fc.patch
+Patch119: bash-ulimit-m.patch
+Patch120: bash-4.0-no_debug_output.patch
 
 Requires(post): ncurses-libs
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -107,92 +56,37 @@
 
 %prep
 
-%setup -q -a 2
-# patching official upstream patches
-#%patch141 -p0 -b .patch035
+#%setup -q -a 2
+%setup -q
 
 # Official upstream patches
-%patch1 -p0 -b .001
-%patch2 -p0 -b .002
-%patch3 -p0 -b .003
-%patch4 -p0 -b .004
-%patch5 -p0 -b .005
-%patch6 -p0 -b .006
-%patch7 -p0 -b .007
-%patch8 -p0 -b .008
-%patch9 -p0 -b .009
-%patch10 -p0 -b .010
-%patch11 -p0 -b .011
-%patch12 -p0 -b .012
-%patch13 -p0 -b .013
-%patch14 -p0 -b .014
-%patch15 -p0 -b .015
-%patch16 -p0 -b .016
-%patch17 -p0 -b .017
-%patch18 -p0 -b .018
-%patch19 -p0 -b .019
-%patch20 -p0 -b .020
-%patch21 -p0 -b .021
-%patch22 -p0 -b .022
-%patch23 -p0 -b .023
-%patch24 -p0 -b .024
-%patch25 -p0 -b .025
-%patch26 -p0 -b .026
-%patch27 -p0 -b .027
-%patch28 -p0 -b .028
-%patch29 -p0 -b .029
-%patch30 -p0 -b .030
-%patch31 -p0 -b .031
-%patch32 -p0 -b .032
-%patch33 -p0 -b .033
-%patch34 -p0 -b .034
-%patch35 -p0 -b .035
-%patch36 -p0 -b .036
-%patch37 -p0 -b .037
-%patch38 -p0 -b .038
-%patch39 -p0 -b .039
-%patch40 -p0 -b .040
-%patch41 -p0 -b .041
-%patch42 -p0 -b .042
-%patch43 -p0 -b .043
-%patch44 -p0 -b .044
-%patch45 -p0 -b .045
-%patch46 -p0 -b .046
-%patch47 -p0 -b .047
-%patch48 -p0 -b .048
-
 # Other patches
-%patch100 -p1 -b .paths
 %patch101 -p1 -b .security
-%patch102 -p1 -b .profile
-%patch103 -p1 -b .requires
-%patch107 -p1 -b .interpreter
-%patch108 -p1 -b .readline-oom
-%patch114 -p1 -b .xcc
-%patch115 -p1 -b .pgrp_sync
-%patch116 -p1 -b .manso
-%patch117 -p1 -b .debuginfo
-%patch118 -p1 -b .tty-tests
-%patch126 -p1 -b .setlocale
-%patch130 -p1 -b .infotags
-%patch131 -p1 -b .cond-rmatch
-%patch132 -p1 -b .ulimit-m
-%patch133 -p1 -b .rng.patch
-%patch136 -p1 -b .344411
-%patch137 -p1 -b .190350
-%patch138 -p1 -b .comp_wordbreaks
-%patch139 -p1 -b .manpage
-%patch140 -p1 -b .man-page-suspend
-%patch142 -p1 -b .execve_catch_signals
-%patch143 -p1 -b .ssh_source_bash
-%patch144 -p1 -b .command_not_found
-%patch145 -p1 -b .audit
-%patch146 -p1 -b .fc
+%patch102 -p1 -b .paths
+%patch103 -p1 -b .profile
+%patch104 -p1 -b .interpreter
+%patch105 -p1 -b .debuginfo
+%patch106 -p1 -b .manso
+%patch107 -p1 -b .pgrp_sync
+%patch108 -p1 -b .readline_oom
+%patch109 -p1 -b .xcc
+%patch110 -p1 -b .audit
+#%patch111 -p1 -b .rng
+%patch112 -p1 -b .ssh_source_bash
+%patch113 -p1 -b .bashbug
+%patch114 -p1 -b .cond_rmatch
+%patch115 -p1 -b .infotags
+%patch116 -p1 -b .requires
+%patch117 -p1 -b .setlocale
+%patch118 -p1 -b .tty_tests
+%patch119 -p1 -b .ulimit-m
+%patch120 -p1 -b .no_debug_output
 
 echo %{version} > _distribution
 echo %{release} > _patchlevel
 
 %build
+chmod a+x ./configure
 autoconf
 %configure --with-bash-malloc=no --with-afs
 make "CPPFLAGS=-D_GNU_SOURCE `getconf LFS_CFLAGS`"
@@ -243,8 +137,10 @@
 # Link bash man page to sh so that man sh works.
 ln -s bash.1 ${RPM_BUILD_ROOT}%{_mandir}/man1/sh.1
 
-# Not for printf (conflict with coreutils)
+# Not for printf, true and false (conflict with coreutils)
 rm -f $RPM_BUILD_ROOT/%{_mandir}/man1/printf.1
+rm -f $RPM_BUILD_ROOT/%{_mandir}/man1/true.1
+rm -f $RPM_BUILD_ROOT/%{_mandir}/man1/false.1
 
 pushd $RPM_BUILD_ROOT
 mkdir ./bin
@@ -253,9 +149,9 @@
 rm -f .%{_infodir}/dir
 popd
 mkdir -p $RPM_BUILD_ROOT/etc/skel
-install -c -m644 %SOURCE3 $RPM_BUILD_ROOT/etc/skel/.bashrc
-install -c -m644 %SOURCE4 $RPM_BUILD_ROOT/etc/skel/.bash_profile
-install -c -m644 %SOURCE5 $RPM_BUILD_ROOT/etc/skel/.bash_logout
+install -c -m644 %SOURCE1 $RPM_BUILD_ROOT/etc/skel/.bashrc
+install -c -m644 %SOURCE2 $RPM_BUILD_ROOT/etc/skel/.bash_profile
+install -c -m644 %SOURCE3 $RPM_BUILD_ROOT/etc/skel/.bash_logout
 LONG_BIT=$(getconf LONG_BIT)
 mv $RPM_BUILD_ROOT%{_bindir}/bashbug \
    $RPM_BUILD_ROOT%{_bindir}/bashbug-"${LONG_BIT}"
@@ -316,7 +212,7 @@
 %defattr(-,root,root)
 %doc CHANGES COMPAT NEWS NOTES POSIX
 %doc doc/FAQ doc/INTRO doc/article.ms
-%doc -P examples/bashdb/ examples/functions/ examples/misc/
+%doc -P examples/obashdb/ examples/functions/ examples/misc/
 %doc -P examples/scripts.noah/ examples/scripts.v2/ examples/scripts/
 %doc -P examples/startup-files/ examples/complete/
 %config(noreplace) /etc/skel/.b*
@@ -326,9 +222,14 @@
 %{_infodir}/bash.info*
 %{_mandir}/*/*
 %{_mandir}/*/..1*
-%doc doc/*.ps doc/*.0 doc/*.html doc/article.txt
+
+# For now there isn't any doc
+#%doc doc/*.ps doc/*.0 doc/*.html doc/article.txt
 
 %changelog
+* Wed Jan 21 2009 Roman Rakus <rrakus at redhat.com> - 4.0-rc1.1
+- Bump to upstream bash-4.0-rc1
+
 * Mon Dec 15 2008 Roman Rakus <rrakus at redhat.com> - 3.2-33
 - fc builtin fix
   Resolves: #438841


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/bash/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	15 Dec 2006 18:02:32 -0000	1.13
+++ sources	26 Jan 2009 11:50:44 -0000	1.14
@@ -1,2 +1 @@
-00bfa16d58e034e3c2aa27f390390d30  bash-3.2.tar.gz
-0e904cb46ca873fcfa65df19b024bec9  bash-doc-3.2.tar.gz
+463e18d547555dd570695842a21dbc75  bash-4.0.tar.gz



From mmaslano at fedoraproject.org  Mon Jan 26 12:03:11 2009
From: mmaslano at fedoraproject.org (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?=)
Date: Mon, 26 Jan 2009 12:03:11 +0000 (UTC)
Subject: rpms/crontabs/devel crontabs.spec,1.29,1.30
Message-ID: <20090126120311.664327010C@cvs1.fedora.phx.redhat.com>

Author: mmaslano

Update of /cvs/pkgs/rpms/crontabs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9330

Modified Files:
	crontabs.spec 
Log Message:
Change from /etc/cron.d/ to cronie because nothing providing /etc/cron.d/ yet.



Index: crontabs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/crontabs/devel/crontabs.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- crontabs.spec	26 Jan 2009 09:25:39 -0000	1.29
+++ crontabs.spec	26 Jan 2009 12:02:41 -0000	1.30
@@ -8,7 +8,7 @@
 Source1: run-parts
 Source2: config
 BuildArch: noarch
-Requires: /etc/cron.d/
+Requires: cronie
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description



From ltinkl at fedoraproject.org  Mon Jan 26 12:06:28 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Mon, 26 Jan 2009 12:06:28 +0000 (UTC)
Subject: rpms/phonon/F-9 gstreamer-logo.svg,NONE,1.1
Message-ID: <20090126120628.F1FE27010C@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/phonon/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10353

Added Files:
	gstreamer-logo.svg 
Log Message:
missing file



--- NEW FILE gstreamer-logo.svg ---
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 12.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 51448)  -->
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
	<!ENTITY ns_svg "http://www.w3.org/2000/svg">
	<!ENTITY ns_xlink "http://www.w3.org/1999/xlink">
]>
<svg  version="1.1" id="Layer_1" xmlns="&ns_svg;" xmlns:xlink="&ns_xlink;" width="280.22" height="69.387"
	 viewBox="0 0 280.22 69.387" overflow="visible" enable-background="new 0 0 280.22 69.387" xml:space="preserve">
<path fill="#8C8C8C" d="M199.551,58.684c-0.334-6.834,2.636-22.747,9.47-21.247c2.913,0.64,2.118,4.655,1.166,9
	c-1.282,5.85-3.5,12.237-3.5,12.237s8.334,0.333,8.167,0c0.833-10.5,3.039-21.928,9.167-21.071
	c5.081,0.71-1.441,21.071-1.441,21.071s6.27,0,7.587,0c-0.272-3.453,1.59-11.495,2.635-17.311s-1.181-8.36-5.86-8.405
	s-9.314,4.044-9.314,4.044c0.182-3.498-4.429-4.05-4.429-4.05c-4.93-0.313-9.655,3.005-9.655,3.005l0.438-2.57h-7.425
	c0,0-0.365,4.088-1.867,11.549s-3.51,13.738-3.51,13.738L199.551,58.684z"/>
<path fill="#8C8C8C" d="M250.388,32.759c-10.167,0-14.7,7.178-14.7,14.511s4.332,12.167,13.166,12.167c4.15,0,6.5-3.834,6.5-3.834
	s0.134-1.049-0.65-0.612s-2.92,1.352-5.71,1.352s-5.806-2.654-5.806-9.239c0,0,16.166,0,16,0
	C260.021,44.437,260.555,32.759,250.388,32.759z M251.871,44.136h-7.76c0-5.362,4.29-9.412,7.211-7.974
	C253.982,37.397,251.871,44.136,251.871,44.136z"/>
<path fill="#8C8C8C" d="M154.888,32.759c-10.167,0-14.7,7.178-14.7,14.511s4.332,12.167,13.166,12.167c4.15,0,6.5-3.834,6.5-3.834
	s0.134-1.049-0.65-0.612s-2.92,1.352-5.71,1.352s-5.806-2.654-5.806-9.239c0,0,16.166,0,16,0
	C164.521,44.437,165.055,32.759,154.888,32.759z M156.371,44.136h-7.76c0-5.362,3.621-8.836,6.542-7.397
	C157.813,37.973,156.371,44.136,156.371,44.136z"/>
<path fill="#8C8C8C" d="M268.725,59.088h-8.198c0,0,4.786-17.192,5.203-25.621c-0.072,0.072,7.11,0,7.11,0s-0.617,1.9-0.885,3.559
	c2.031-2.249,2.719-4.272,8.232-4.272c0.072,0,0,7.109,0,7.109s-5.15-1.275-7,0.574S269.354,43.77,268.725,59.088z"/>
<path fill="#8C8C8C" d="M127.225,59.088h-8.198c0,0,4.786-17.192,5.203-25.621c-0.072,0.072,7.11,0,7.11,0s-0.617,1.9-0.885,3.559
	c2.031-2.249,2.719-4.272,8.232-4.272c0.072,0,0,7.109,0,7.109s-5.15-1.275-7,0.574S127.854,43.77,127.225,59.088z"/>
<path fill="#8C8C8C" d="M117.227,24.633l-6.705,2.325l-1.541,6.244h-4.273v4.105h3.374c0,0-3.598,12.875-2.924,16.812
	c0.675,4.273,4.836,5.172,7.31,5.06s3.149-1.911,3.036-2.586s-3.487,0.644-3.824-2.393c-0.225-1.799,2.812-16.893,2.812-16.893
	h5.285v-4.105h-4.161L117.227,24.633z"/>
<path fill="#8C8C8C" d="M187.104,58.691c0.994-0.821,0.33-2.463-0.53-2.661c-0.97-2.011,2.023-13.763,2.023-16.98
	s-5.397-9.671-16.53-3.599c-1.079,0.686-0.682,1.808-0.416,2.183s0.766,0.625,1,0.375c1.047-1.141,5.602-2.333,7.737-0.084
	c1.462,1.35,1.396,3.958,0.383,4.97c-1.236,0.112-13.427-0.246-14.889,7.513c-2.522,13.777,12.92,6.522,13.719,5.96
	s0.706,1.626,2.003,2.548C185.125,59.223,186.41,59.264,187.104,58.691z M179.396,52.935c-1.25,3.292-5.891,2.789-6.166,0.459
	c-1-7.792,7.041-7.209,7.041-7.209S180.646,49.643,179.396,52.935z"/>
<path fill="#8C8C8C" d="M98.272,40.792l2.332-3.939c0,0-1.9-4.045-7.511-4.045s-8.848,4.046-8.848,8.848s10.682,8.417,8.093,13.164
	c-4.316,4.424-8.872-2.792-8.782-3.266c-0.326,0.47-2.56,3.549-2.452,3.549c0.54,1.079,2.5,4.5,8.752,4.572
	c5.179,0.06,8.309-3.776,8.417-8.523c0.108-6.366-9.172-9.604-9.28-12.517S95.144,32.375,98.272,40.792z"/>
<path d="M86.042,31.416c-1-0.938-1.75,0.313-4,1.25s-3,0.813-5.25,0.5c-3.688-0.813-10.17-0.57-11.875,0.25
	c-11.386,4.572-5.281,13.031-3.422,14.719c-0.016,0-2.773,1.453-3.176,3.735c-0.518,2.933,0.831,4.52,0.873,4.561
	c-3.72,0.193-6.112,3.934-5.536,6.997c0.62,3.299,4.553,5.931,10.184,5.953c11.904,0.259,12.521-7.353,12.521-7.353
	c1.629-9.258-6.222-9.685-11.817-9.25c-2.025-1.809-0.445-3.496-0.531-3.496C82.917,49.728,78.158,37.12,78.158,37.12
	C81.35,36.343,87.604,32.916,86.042,31.416z M60.722,57.939c7.405,1.336,10.385-0.362,10.892,3.413
	c0.219,3.684-2.908,4.737-6.545,4.963s-6.287-1.612-6.433-3.975C58.491,59.977,60.555,60.221,60.722,57.939z M72.161,41.835
	c-0.684,3.028-2.782,5.136-4.687,4.706c-1.905-0.431-2.894-3.234-2.211-6.263c0.684-3.029,2.782-5.137,4.687-4.707
	C71.855,36.002,72.845,38.806,72.161,41.835z"/>
<path fill="#FF3131" d="M47.141,5.199c-5.409,0-13.323-4.407-21.036-4.407S13.785,5.199,12.983,5.8
	c-0.801,0.601-1.303,2.904,1.102,2.203s4.407-0.701,8.214-0.701s12.922,5.209,22.138,5.209S61.365,5.4,63.068,2.895
	s0.1-3.306-1.202-2.704C60.563,0.792,52.15,5.199,47.141,5.199z"/>
<path fill="#319831" d="M70.639,18.921c-5.683,0-13.997-4.406-22.1-4.406s-12.944,4.406-13.786,5.008s-1.369,2.904,1.157,2.203
	s4.63-0.701,8.629-0.701c3.999,0,13.576,5.209,23.257,5.209s17.785-7.111,19.574-9.615c1.789-2.505,0.105-3.307-1.263-2.705
	S75.901,18.921,70.639,18.921z"/>
<path fill="#3232CC" d="M37.936,34.063c-5.893,0-14.515-4.761-22.918-4.761c-8.403,0-13.424,4.761-14.297,5.41
	s-1.419,3.137,1.2,2.379c2.62-0.757,4.802-0.757,8.949-0.757S24.949,41.96,34.99,41.96c10.04,0,18.443-7.681,20.299-10.386
	s0.109-3.57-1.31-2.921C52.56,29.302,43.393,34.063,37.936,34.063z"/>
</svg>



From ltinkl at fedoraproject.org  Mon Jan 26 12:11:16 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Mon, 26 Jan 2009 12:11:16 +0000 (UTC)
Subject: rpms/automoc/F-9 automoc.spec,1.4,1.5
Message-ID: <20090126121116.2AE257010C@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/automoc/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11255

Modified Files:
	automoc.spec 
Log Message:
KDE 4.2.0



Index: automoc.spec
===================================================================
RCS file: /cvs/extras/rpms/automoc/F-9/automoc.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- automoc.spec	26 Jan 2009 10:47:26 -0000	1.4
+++ automoc.spec	26 Jan 2009 12:10:45 -0000	1.5
@@ -5,22 +5,26 @@
 Name:           automoc
 Version:        1.0
 Release:        0.11.%{?beta_tag}%{?dist}
-Summary:        KDE4 automoc
+Summary:        Automatic moc for Qt 4
 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/stable/automoc4/%{beta}/automoc4-%{beta}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Provides: automoc4 = %{beta}
 
 Requires:       cmake >= 2.4.5
 BuildRequires:  cmake >= 2.4.5
-BuildRequires:  qt4-devel 
+BuildRequires:  qt4-devel
 BuildRequires:  kde-filesystem
 
 %description
-KDE4 automoc
+This package contains the automoc4 binary which is used to run moc on the
+right source files in a Qt 4 or KDE 4 application.
+Moc is the meta object compiler which is a widely used tool with Qt and
+creates standard C++ files to provide syntactic sugar of the signal/slots
+mechanism.
 
 
 %prep
@@ -52,7 +56,16 @@
 
 
 %changelog
-* Mon Jan 26 2009 Luk???? Tinkl <ltinkl at redhat.com> 1.0-0.9.88.rc3
+* Thu Jan 22 2009 Rex Dieter <rdieter at fedoraproject.org> 1.0-0.11.rc3
+- automoc4-0.9.88 (1.0-rc3)
+
+* Sat Nov 22 2008 Lorenzo Villani <lvillani at binaryhelix.net> - 1.0-0.10.rc2
+- fix package summary and descriptions (as requested by Richard Hughes)
+- match cmake minimum required version with the contents of CMakeLists.txt
+  (paranoid fix)
+
+* 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)



From mmaslano at fedoraproject.org  Mon Jan 26 12:12:45 2009
From: mmaslano at fedoraproject.org (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?=)
Date: Mon, 26 Jan 2009 12:12:45 +0000 (UTC)
Subject: rpms/crontabs/devel crontabs.spec,1.30,1.31
Message-ID: <20090126121245.3B9E17010C@cvs1.fedora.phx.redhat.com>

Author: mmaslano

Update of /cvs/pkgs/rpms/crontabs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11563

Modified Files:
	crontabs.spec 
Log Message:
* Mon Jan 26 2009 Marcela Ma??l????ov?? <mmaslano at redhat.com> 1.10-27
- Change requires back to cronie.



Index: crontabs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/crontabs/devel/crontabs.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- crontabs.spec	26 Jan 2009 12:02:41 -0000	1.30
+++ crontabs.spec	26 Jan 2009 12:12:14 -0000	1.31
@@ -1,7 +1,7 @@
 Summary: Root crontab files used to schedule the execution of programs
 Name: crontabs
 Version: 1.10
-Release: 26%{?dist}
+Release: 27%{?dist}
 License: Public Domain and GPLv2
 Group: System Environment/Base
 Source0: crontab
@@ -44,6 +44,9 @@
 %dir /etc/cron.monthly
 
 %changelog
+* Mon Jan 26 2009 Marcela Ma??l????ov?? <mmaslano at redhat.com> 1.10-27
+- Change requires back to cronie.
+
 * Mon Jan 26 2009 Marcela Ma??l????ov?? <mmaslano at redhat.com> 1.10-26
 - change /etc/crontab. All anacron jobs in cron.daily,weekly,...
  are check by anacron every hour. Anacron run them if they didn't



From rspanton at fedoraproject.org  Mon Jan 26 12:52:40 2009
From: rspanton at fedoraproject.org (Robert Spanton)
Date: Mon, 26 Jan 2009 12:52:40 +0000 (UTC)
Subject: rpms/msp430-binutils/devel 01-binutils-2.19.patch, NONE,
	1.1 import.log, NONE, 1.1 msp430-binutils.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090126125240.ACC377010C@cvs1.fedora.phx.redhat.com>

Author: rspanton

Update of /cvs/pkgs/rpms/msp430-binutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18823/devel

Modified Files:
	.cvsignore sources 
Added Files:
	01-binutils-2.19.patch import.log msp430-binutils.spec 
Log Message:
* Mon 26 Jan 2009 Rob Spanton rspanton at zepler.net 2.19-2
 - Import SRPM into devel branch


01-binutils-2.19.patch:

--- NEW FILE 01-binutils-2.19.patch ---
diff -rNU 5 binutils-2.19-orig/bfd/archures.c binutils-2.19-msp/bfd/archures.c
--- binutils-2.19-orig/bfd/archures.c	2008-08-09 15:35:12.000000000 +1000
+++ binutils-2.19-msp/bfd/archures.c	2009-01-02 15:28:42.000000000 +1100
@@ -383,18 +383,28 @@
 .#define bfd_mach_msp12          12
 .#define bfd_mach_msp13          13
 .#define bfd_mach_msp14          14
 .#define bfd_mach_msp15          15
 .#define bfd_mach_msp16          16
+.#define bfd_mach_msp20          20
 .#define bfd_mach_msp21          21
+.#define bfd_mach_msp22          22
+.#define bfd_mach_msp23          23
+.#define bfd_mach_msp24          24
+.#define bfd_mach_msp241         241
+.#define bfd_mach_msp26          26
 .#define bfd_mach_msp31          31
 .#define bfd_mach_msp32          32
 .#define bfd_mach_msp33          33
 .#define bfd_mach_msp41          41
 .#define bfd_mach_msp42          42
 .#define bfd_mach_msp43          43
 .#define bfd_mach_msp44          44
+.#define bfd_mach_msp46          46
+.#define bfd_mach_msp47          47
+.#define bfd_mach_msp471         471
+.#define bfd_mach_msp54          54
 .  bfd_arch_xc16x,     {* Infineon's XC16X Series.               *}
 .#define bfd_mach_xc16x         1
 .#define bfd_mach_xc16xl        2
 .#define bfd_mach_xc16xs         3
 .  bfd_arch_xtensa,    {* Tensilica's Xtensa cores.  *}
diff -rNU 5 binutils-2.19-orig/bfd/bfd-in2.h binutils-2.19-msp/bfd/bfd-in2.h
--- binutils-2.19-orig/bfd/bfd-in2.h	2008-08-21 09:28:57.000000000 +1000
+++ binutils-2.19-msp/bfd/bfd-in2.h	2009-01-02 15:28:42.000000000 +1100
@@ -2005,18 +2005,28 @@
 #define bfd_mach_msp12          12
 #define bfd_mach_msp13          13
 #define bfd_mach_msp14          14
 #define bfd_mach_msp15          15
 #define bfd_mach_msp16          16
+#define bfd_mach_msp20          20
 #define bfd_mach_msp21          21
+#define bfd_mach_msp22          22
+#define bfd_mach_msp23          23
+#define bfd_mach_msp24          24
+#define bfd_mach_msp241         241
+#define bfd_mach_msp26          26
 #define bfd_mach_msp31          31
 #define bfd_mach_msp32          32
 #define bfd_mach_msp33          33
 #define bfd_mach_msp41          41
 #define bfd_mach_msp42          42
 #define bfd_mach_msp43          43
 #define bfd_mach_msp44          44
+#define bfd_mach_msp46          46
+#define bfd_mach_msp47          47
+#define bfd_mach_msp471         471
+#define bfd_mach_msp54          54
   bfd_arch_xc16x,     /* Infineon's XC16X Series.               */
 #define bfd_mach_xc16x         1
 #define bfd_mach_xc16xl        2
 #define bfd_mach_xc16xs         3
   bfd_arch_xtensa,    /* Tensilica's Xtensa cores.  */
@@ -4282,10 +4292,29 @@
   BFD_RELOC_MSP430_16,
   BFD_RELOC_MSP430_16_PCREL_BYTE,
   BFD_RELOC_MSP430_16_BYTE,
   BFD_RELOC_MSP430_2X_PCREL,
   BFD_RELOC_MSP430_RL_PCREL,
+  BFD_RELOC_MSP430X_SRC_BYTE,
+  BFD_RELOC_MSP430X_SRC,
+  BFD_RELOC_MSP430X_DST_BYTE,
+  BFD_RELOC_MSP430X_DST,
+  BFD_RELOC_MSP430X_DST_2ND_BYTE,
+  BFD_RELOC_MSP430X_DST_2ND,
+  BFD_RELOC_MSP430X_PCREL_SRC_BYTE,
+  BFD_RELOC_MSP430X_PCREL_SRC,
+  BFD_RELOC_MSP430X_PCREL_DST_BYTE,
+  BFD_RELOC_MSP430X_PCREL_DST,
+  BFD_RELOC_MSP430X_PCREL_DST_2ND,
+  BFD_RELOC_MSP430X_PCREL_DST_2ND_BYTE,
+  BFD_RELOC_MSP430X_S_BYTE,
+  BFD_RELOC_MSP430X_S,
+  BFD_RELOC_MSP430X_D_BYTE,
+  BFD_RELOC_MSP430X_D,
+  BFD_RELOC_MSP430X_PCREL_D,
+  BFD_RELOC_MSP430X_INDXD,
+  BFD_RELOC_MSP430X_PCREL_INDXD,
 
 /* IQ2000 Relocations.  */
   BFD_RELOC_IQ2000_OFFSET_16,
   BFD_RELOC_IQ2000_OFFSET_21,
   BFD_RELOC_IQ2000_UHI16,
diff -rNU 5 binutils-2.19-orig/bfd/cpu-msp430.c binutils-2.19-msp/bfd/cpu-msp430.c
--- binutils-2.19-orig/bfd/cpu-msp430.c	2007-07-04 00:26:40.000000000 +1000
+++ binutils-2.19-msp/bfd/cpu-msp430.c	2009-01-02 15:28:42.000000000 +1100
@@ -63,33 +63,64 @@
   N (16, bfd_mach_msp15, "msp:15", FALSE, & arch_info_struct[6]),
   
   /* msp430x16x.  */
   N (16, bfd_mach_msp16, "msp:16", FALSE, & arch_info_struct[7]),
 
+  /* msp430x20x.  */
+  N (16, bfd_mach_msp20, "msp:20", FALSE, & arch_info_struct[8]),
+
   /* msp430x21x.  */
-  N (16, bfd_mach_msp21, "msp:21", FALSE, & arch_info_struct[8]),
+  N (16, bfd_mach_msp21, "msp:21", FALSE, & arch_info_struct[9]),
+
+  /* msp430x22x.  */
+  N (16, bfd_mach_msp22, "msp:22", FALSE, & arch_info_struct[10]),
+
+  /* msp430x23x0.  */
+  N (16, bfd_mach_msp23, "msp:23", FALSE, & arch_info_struct[11]),
+
+  /* msp430x24x including msp430x2410 */
+  N (16, bfd_mach_msp24, "msp:24", FALSE, & arch_info_struct[12]),
+
+  /* msp430x241x except msp430x2410 (extended address range) */
+  N (20, bfd_mach_msp241, "msp:241", FALSE, & arch_info_struct[13]),
+
+  /* msp430x26x.  */
+  N (20, bfd_mach_msp26, "msp:26", FALSE, & arch_info_struct[14]),
 
   /* msp430x31x.  */
-  N (16, bfd_mach_msp31, "msp:31", FALSE, & arch_info_struct[9]), 
+  N (16, bfd_mach_msp31, "msp:31", FALSE, & arch_info_struct[15]), 
 
   /* msp430x32x.  */
-  N (16, bfd_mach_msp32, "msp:32", FALSE, & arch_info_struct[10]), 
+  N (16, bfd_mach_msp32, "msp:32", FALSE, & arch_info_struct[16]), 
 
   /* msp430x33x.  */
-  N (16, bfd_mach_msp33, "msp:33", FALSE, & arch_info_struct[11]),
+  N (16, bfd_mach_msp33, "msp:33", FALSE, & arch_info_struct[17]),
   
   /* msp430x41x.  */
-  N (16, bfd_mach_msp41, "msp:41", FALSE, & arch_info_struct[12]),
+  N (16, bfd_mach_msp41, "msp:41", FALSE, & arch_info_struct[18]),
 
   /* msp430x42x.  */
-  N (16, bfd_mach_msp42, "msp:42", FALSE, & arch_info_struct[13]),
+  N (16, bfd_mach_msp42, "msp:42", FALSE, & arch_info_struct[19]),
 
   /* msp430x43x.  */
-  N (16, bfd_mach_msp43, "msp:43", FALSE, & arch_info_struct[14]),
+  N (16, bfd_mach_msp43, "msp:43", FALSE, & arch_info_struct[20]),
 
   /* msp430x44x.  */
-  N (16, bfd_mach_msp43, "msp:44", FALSE, NULL)
+  N (16, bfd_mach_msp44, "msp:44", FALSE, & arch_info_struct[21]),
+
+  /* msp430x46xx.  */
+  N (20, bfd_mach_msp46, "msp:46", FALSE, & arch_info_struct[22]),
+
+  /* msp430x47x3, 47x4.  */
+  N (16, bfd_mach_msp47, "msp:47", FALSE, & arch_info_struct[23]),
+
+  /* msp430x471x6, 471x7.  */
+  N (20, bfd_mach_msp471, "msp:471", FALSE, & arch_info_struct[24]),
+
+  /* msp430x54xx.  */
+  N (20, bfd_mach_msp54, "msp:54", FALSE, NULL)
+
 };
 
 const bfd_arch_info_type bfd_msp430_arch =
   N (16, bfd_mach_msp14, "msp:14", TRUE, & arch_info_struct[0]);
 
diff -rNU 5 binutils-2.19-orig/bfd/doc/archures.texi binutils-2.19-msp/bfd/doc/archures.texi
--- binutils-2.19-orig/bfd/doc/archures.texi	2008-09-10 17:50:16.000000000 +1000
+++ binutils-2.19-msp/bfd/doc/archures.texi	2009-01-02 15:28:42.000000000 +1100
@@ -348,18 +348,24 @@
 #define bfd_mach_msp12          12
 #define bfd_mach_msp13          13
 #define bfd_mach_msp14          14
 #define bfd_mach_msp15          15
 #define bfd_mach_msp16          16
+#define bfd_mach_msp20          20
 #define bfd_mach_msp21          21
+#define bfd_mach_msp22          22
+#define bfd_mach_msp24          24
+#define bfd_mach_msp241         241
+#define bfd_mach_msp26          26
 #define bfd_mach_msp31          31
 #define bfd_mach_msp32          32
 #define bfd_mach_msp33          33
 #define bfd_mach_msp41          41
 #define bfd_mach_msp42          42
 #define bfd_mach_msp43          43
 #define bfd_mach_msp44          44
+#define bfd_mach_msp46          46
   bfd_arch_xc16x,     /* Infineon's XC16X Series.               */
 #define bfd_mach_xc16x         1
 #define bfd_mach_xc16xl        2
 #define bfd_mach_xc16xs         3
   bfd_arch_xtensa,    /* Tensilica's Xtensa cores.  */
@@ -605,6 +611,5 @@
[...6939 lines suppressed...]
+    {"", "", ".b", ".a" };
+    
   insn = msp430dis_opcode (addr, info);
-  sprintf (dinfo, "0x%04x", insn);
 
-  if (((int) addr & 0xffff) > 0xffdf)
+  if (info->mach == 241 || info->mach == 26 || info->mach == 46 || info->mach == 471)
+    {
+      core = CORE_430X;
+    }
+  else if (info->mach == 54)
+    {
+      core = CORE_430X2;
+    }
+    
+  if ( (core == CORE_430 && ((int) addr & 0xffff) >= 0xffe0)
+      || ( core == CORE_430X && (((int) addr & 0xfffff) >= 0xffc0) && ((int) addr & 0xfffff) < 0x10000)
+      || ( core == CORE_430X2 && (((int) addr & 0xfffff) >= 0xff80) && ((int) addr & 0xfffff) < 0x10000)
+     )
     {
       (*prin) (stream, "interrupt service routine at 0x%04x", 0xffff & insn);
       return 2;
     }
 
+  if (core > CORE_430 && ((insn & 0xf800) == 0x1800))    // Extended instruction
+     insn |= msp430dis_opcode(addr + 2, info) << 16;
+
   *comm1 = 0;
   *comm2 = 0;
 
   for (opcode = msp430_opcodes; opcode->name; opcode++)
     {
       if ((insn & opcode->bin_mask) == opcode->bin_opcode
-	  && opcode->bin_opcode != 0x9300)
+//	  && opcode->bin_opcode != 0x9300       // was disasm tst instruction as cmp #0, dst?
+         )
 	{
 	  *op1 = 0;
 	  *op2 = 0;
 	  *comm1 = 0;
 	  *comm2 = 0;
 
-	  /* r0 as destination. Ad should be zero.  */
-	  if (opcode->insn_opnumb == 3 && (insn & 0x000f) == 0
-	      && (0x0080 & insn) == 0)
+          /* unsupported instruction */
+          if(opcode_format(opcode) >= FMT_X && core < CORE_430X)
+            break;
+
+	  /* r0 as destination. Ad should be zero. Rdst=0 and Ad=0 are encoded in opcode & opcode_mask */
+	  if (opcode_format(opcode) == FMT_EMULATED && opcode_variant(opcode) == V_BR)
 	    {
 	      cmd_len =
-		msp430_branchinstr (info, opcode, addr, insn, op1, comm1,
-				    &cycles);
+		msp430_branchinstr (info, opcode, addr, insn, op1, comm1);
 	      if (cmd_len)
 		break;
 	    }
-
-	  switch (opcode->insn_opnumb)
-	    {
-	    case 0:
-	      cmd_len = msp430_nooperands (opcode, addr, insn, comm1, &cycles);
-	      break;
-	    case 2:
-	      cmd_len =
-		msp430_doubleoperand (info, opcode, addr, insn, op1, op2,
-				      comm1, comm2, &cycles);
-	      if (insn & BYTE_OPERATION)
-		bc = ".b";
-	      break;
-	    case 1:
-	      cmd_len =
-		msp430_singleoperand (info, opcode, addr, insn, op1, comm1,
-				      &cycles);
-	      if (insn & BYTE_OPERATION && opcode->fmt != 3)
-		bc = ".b";
-	      break;
-	    default:
-	      break;
-	    }
+          if(opcode_format(opcode) < FMT_X)
+  	    switch (opcode->insn_opnumb)
+	      {
+	      case 0:
+	        cmd_len = msp430_nooperands (opcode, addr, insn, comm1);
+	        break;
+	      case 2:
+	        cmd_len =
+		  msp430_doubleoperand (info, opcode, addr, insn, op1, op2,
+				        comm1, comm2);
+	        if (insn & BYTE_OPERATION)
+		  op_width = BYTE_OP;
+	        break;
+	      case 1:
+	        cmd_len =
+		  msp430_singleoperand (info, opcode, addr, insn, op1, comm1);
+	        if (insn & BYTE_OPERATION && opcode_format(opcode) != FMT_JUMP)
+		  op_width = BYTE_OP;
+	        break;
+	      default:
+	        break;
+	      }
+          else  // 430x instruction
+            switch(opcode_format(opcode))
+              {
+              case FMT_X_SINGLE_OPERAND:
+                if( opcode_variant(opcode) == V_SWPSXT                          // swpbx, sxtx
+                   && (insn & (NON_ADDR_OPERATION | BYTE_OPERATION_X)) == 0)    // .a, special case
+                      insn ^= BYTE_OPERATION_X;                                 // make A/L, B/W as ordinary
+
+                op_width = msp430x_opwidth(insn);
+
+                if( opcode_variant(opcode) == V_SWPSXT && op_width == BYTE_OP)         // swpbx, sxtx
+                  strcpy (comm1, _("Illegal A/L, B/W bits setting"));
+
+                cmd_len = msp430x_singleoperand (info, opcode, addr, insn, op1, comm1,
+				                 &repeats);
+                break;
+              case FMT_X_EXCEPTION:
+                cmd_len = msp430x_exception (info, opcode, addr, insn, op1, op2, 
+                                                 comm1, comm2, &op_width);
+                break;
+              case FMT_X_DOUBLE_OPERAND:
+                cmd_len = msp430x_doubleoperand (info, opcode, addr, insn, op1, op2, 
+                                                 comm1, comm2, &op_width, &repeats);
+                break;
+              case FMT_X_EMULATED:
+                cmd_len = msp430x_emulated (info, opcode, addr, insn, op1,
+                                            comm1, &op_width, &repeats);
+                break;
+
+              case FMT_X_ADDRESS:
+                cmd_len = msp430x_address (info, addr, insn, op1, op2,
+                                           comm1, comm2);
+                break;
+              default:
+                break;
+              }
 	}
 
       if (cmd_len)
 	break;
     }
 
-  dinfo[5] = 0;
-
   if (cmd_len < 1)
     {
       /* Unknown opcode, or invalid combination of operands.  */
-      (*prin) (stream, ".word	0x%04x;	????", PS (insn));
+      (*prin) (stream, ".word	0x%04x;	????\t%s%s", PS (insn), comm1, comm2);
       return 2;
     }
 
-  (*prin) (stream, "%s%s", opcode->name, bc);
+    
+  if (repeats)
+    {
+      if (repeats < 0)
+        (*prin) (stream, ".rpt\t#%d\n\t\t\t\t", 0 - repeats);
+      else
+        (*prin) (stream, ".rpt\tr%d\n\t\t\t\t", repeats);
+    }
+  
+  (*prin) (stream, "%s%s", opcode->name, width_modifier[op_width]);
 
   if (*op1)
     (*prin) (stream, "\t%s", op1);
   if (*op2)
     (*prin) (stream, ",");
@@ -763,25 +822,13 @@
   if (strlen (op2) < 8)
     (*prin) (stream, "\t");
 
   if (*comm1 || *comm2)
     (*prin) (stream, ";");
-  else if (cycles)
-    {
-      if (*op2)
-	(*prin) (stream, ";");
-      else
-	{
-	  if (strlen (op1) < 7)
-	    (*prin) (stream, ";");
-	  else
-	    (*prin) (stream, "\t;");
-	}
-    }
   if (*comm1)
     (*prin) (stream, "%s", comm1);
   if (*comm1 && *comm2)
-    (*prin) (stream, ",");
+    (*prin) (stream, ", ");
   if (*comm2)
-    (*prin) (stream, " %s", comm2);
+    (*prin) (stream, "%s", comm2);
   return cmd_len;
 }


--- NEW FILE import.log ---
msp430-binutils-2_19-2_fc10:HEAD:msp430-binutils-2.19-2.fc10.src.rpm:1232974270


--- NEW FILE msp430-binutils.spec ---
%define target msp430

Name:		%{target}-binutils
Version:	2.19
Release:	2%{?dist}
Summary:	Cross Compiling GNU binutils targeted at %{target}
Group:		Development/Tools
License:	GPLv2+
URL:		http://www.gnu.org/software/binutils/
Source0:	http://ftp.gnu.org/gnu/binutils/binutils-%{version}.tar.bz2
# I have attempted to get this patch upstream.
# See mailing list post: http://article.gmane.org/gmane.comp.gnu.binutils/39694
Patch0:		01-binutils-2.19.patch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:	texinfo

%description
This is a Cross Compiling version of GNU binutils, which can be used to
assemble and link binaries for the %{target} platform, instead of for the
native %{_arch} platform.

%prep
%setup -q -c -n msp430-binutils
pushd binutils-%{version}
%patch0 -p1
popd

%build
mkdir -p build
cd build
CFLAGS="$RPM_OPT_FLAGS" ../binutils-%{version}/configure --prefix=%{_prefix} \
	--libdir=%{_libdir} --mandir=%{_mandir} --infodir=%{_infodir} \
	--target=%{target} --disable-werror --disable-nls

make %{?_smp_mflags}

%install
cd build
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
# these are for win targets only
rm -f $RPM_BUILD_ROOT%{_mandir}/man1/%{target}-{dlltool,nlmconv,windres,windmc}.1
# we don't want these as this is a cross-compiler
rm -rf $RPM_BUILD_ROOT%{_infodir}
rm -f $RPM_BUILD_ROOT%{_libdir}/libiberty.a

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%{_prefix}/%{target}

%{_bindir}/%{target}-*
%{_mandir}/man1/%{target}-*.1.gz

%changelog
* Thu Jan 15 2009 Rob Spanton rspanton at zepler.net 2.19-2
- Add comment about getting patch upstream.

* Tue Jan 13 2009 Rob Spanton rspanton at zepler.net 2.19-1
- Bump up to binutils 2.19.
- Use the bundled 2.19 patch from mspgcc packaging.
- Don't install man pages about windows utilities.
- Reduce a number of lines from the files section to just one line.
- Don't delete the debug information.

* Thu Aug 28 2007 Rob Spanton rspanton at zepler.net 2.18-1
- Initial release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/msp430-binutils/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	23 Jan 2009 23:32:06 -0000	1.1
+++ .cvsignore	26 Jan 2009 12:52:10 -0000	1.2
@@ -0,0 +1 @@
+binutils-2.19.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/msp430-binutils/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	23 Jan 2009 23:32:06 -0000	1.1
+++ sources	26 Jan 2009 12:52:10 -0000	1.2
@@ -0,0 +1 @@
+17a52219dee5a76c1a9d9b0bfd337d66  binutils-2.19.tar.bz2



From jcollie at fedoraproject.org  Mon Jan 26 13:07:57 2009
From: jcollie at fedoraproject.org (Jeffrey C. Ollie)
Date: Mon, 26 Jan 2009 13:07:57 +0000 (UTC)
Subject: rpms/python-lxml/devel .cvsignore, 1.21, 1.22 python-lxml.spec, 1.29,
	1.30 sources, 1.21, 1.22
Message-ID: <20090126130757.151387010C@cvs1.fedora.phx.redhat.com>

Author: jcollie

Update of /cvs/pkgs/rpms/python-lxml/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22251

Modified Files:
	.cvsignore python-lxml.spec sources 
Log Message:
* Sun Jan 25 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 2.2-0.5.beta2
- 2.2beta2 (2009-01-25)
- Bugs fixed
- 
-    * Potential memory leak on exception handling. This was due to a
-      problem in Cython, not lxml itself.
-    * iter_links (and related link-rewriting functions) in lxml.html would
-      interpret CSS like url("link") incorrectly (treating the quotation
-      marks as part of the link).
-    * Failing import on systems that have an io module.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-lxml/devel/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- .cvsignore	13 Dec 2008 01:05:57 -0000	1.21
+++ .cvsignore	26 Jan 2009 13:07:26 -0000	1.22
@@ -1 +1 @@
-lxml-2.2beta1.tar.gz
+lxml-2.2beta2.tar.gz


Index: python-lxml.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-lxml/devel/python-lxml.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- python-lxml.spec	13 Dec 2008 01:05:57 -0000	1.29
+++ python-lxml.spec	26 Jan 2009 13:07:26 -0000	1.30
@@ -1,9 +1,9 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
-%define beta 1
+%define beta 2
 
 Name:           python-lxml
 Version:        2.2
-Release:        0.4.beta%{beta}%{?dist}
+Release:        0.5.beta%{beta}%{?dist}
 Summary:        ElementTree-like Python bindings for libxml2 and libxslt
 
 Group:          Development/Libraries
@@ -50,6 +50,17 @@
 %{python_sitearch}/*
 
 %changelog
+* Sun Jan 25 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 2.2-0.5.beta2
+- 2.2beta2 (2009-01-25)
+- Bugs fixed
+- 
+-    * Potential memory leak on exception handling. This was due to a
+-      problem in Cython, not lxml itself.
+-    * iter_links (and related link-rewriting functions) in lxml.html would
+-      interpret CSS like url("link") incorrectly (treating the quotation
+-      marks as part of the link).
+-    * Failing import on systems that have an io module.
+
 * Fri Dec 12 2008 Jeffrey C. Ollie <jeff at ocjtech.us> - 2.2-0.4.beta1
 - 2.2beta1 (2008-12-12)
 - Features added


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-lxml/devel/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sources	13 Dec 2008 01:05:57 -0000	1.21
+++ sources	26 Jan 2009 13:07:26 -0000	1.22
@@ -1 +1 @@
-f811008505aba17ed09dd494c4ccc20a  lxml-2.2beta1.tar.gz
+3c580423364591d527aa21fbe186307d  lxml-2.2beta2.tar.gz



From rspanton at fedoraproject.org  Mon Jan 26 13:10:19 2009
From: rspanton at fedoraproject.org (Robert Spanton)
Date: Mon, 26 Jan 2009 13:10:19 +0000 (UTC)
Subject: rpms/msp430-binutils/F-10 01-binutils-2.19.patch, NONE,
	1.1 import.log, 
	NONE, 1.1 msp430-binutils.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090126131019.BE7BB7010C@cvs1.fedora.phx.redhat.com>

Author: rspanton

Update of /cvs/pkgs/rpms/msp430-binutils/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22683/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	01-binutils-2.19.patch import.log msp430-binutils.spec 
Log Message:
* Mon 26 Jan 2009 Rob Spanton rspanton at zepler.net 2.19-2
- Import msp430-binutils SRPM into F-10 branch


01-binutils-2.19.patch:

--- NEW FILE 01-binutils-2.19.patch ---
diff -rNU 5 binutils-2.19-orig/bfd/archures.c binutils-2.19-msp/bfd/archures.c
--- binutils-2.19-orig/bfd/archures.c	2008-08-09 15:35:12.000000000 +1000
+++ binutils-2.19-msp/bfd/archures.c	2009-01-02 15:28:42.000000000 +1100
@@ -383,18 +383,28 @@
 .#define bfd_mach_msp12          12
 .#define bfd_mach_msp13          13
 .#define bfd_mach_msp14          14
 .#define bfd_mach_msp15          15
 .#define bfd_mach_msp16          16
+.#define bfd_mach_msp20          20
 .#define bfd_mach_msp21          21
+.#define bfd_mach_msp22          22
+.#define bfd_mach_msp23          23
+.#define bfd_mach_msp24          24
+.#define bfd_mach_msp241         241
+.#define bfd_mach_msp26          26
 .#define bfd_mach_msp31          31
 .#define bfd_mach_msp32          32
 .#define bfd_mach_msp33          33
 .#define bfd_mach_msp41          41
 .#define bfd_mach_msp42          42
 .#define bfd_mach_msp43          43
 .#define bfd_mach_msp44          44
+.#define bfd_mach_msp46          46
+.#define bfd_mach_msp47          47
+.#define bfd_mach_msp471         471
+.#define bfd_mach_msp54          54
 .  bfd_arch_xc16x,     {* Infineon's XC16X Series.               *}
 .#define bfd_mach_xc16x         1
 .#define bfd_mach_xc16xl        2
 .#define bfd_mach_xc16xs         3
 .  bfd_arch_xtensa,    {* Tensilica's Xtensa cores.  *}
diff -rNU 5 binutils-2.19-orig/bfd/bfd-in2.h binutils-2.19-msp/bfd/bfd-in2.h
--- binutils-2.19-orig/bfd/bfd-in2.h	2008-08-21 09:28:57.000000000 +1000
+++ binutils-2.19-msp/bfd/bfd-in2.h	2009-01-02 15:28:42.000000000 +1100
@@ -2005,18 +2005,28 @@
 #define bfd_mach_msp12          12
 #define bfd_mach_msp13          13
 #define bfd_mach_msp14          14
 #define bfd_mach_msp15          15
 #define bfd_mach_msp16          16
+#define bfd_mach_msp20          20
 #define bfd_mach_msp21          21
+#define bfd_mach_msp22          22
+#define bfd_mach_msp23          23
+#define bfd_mach_msp24          24
+#define bfd_mach_msp241         241
+#define bfd_mach_msp26          26
 #define bfd_mach_msp31          31
 #define bfd_mach_msp32          32
 #define bfd_mach_msp33          33
 #define bfd_mach_msp41          41
 #define bfd_mach_msp42          42
 #define bfd_mach_msp43          43
 #define bfd_mach_msp44          44
+#define bfd_mach_msp46          46
+#define bfd_mach_msp47          47
+#define bfd_mach_msp471         471
+#define bfd_mach_msp54          54
   bfd_arch_xc16x,     /* Infineon's XC16X Series.               */
 #define bfd_mach_xc16x         1
 #define bfd_mach_xc16xl        2
 #define bfd_mach_xc16xs         3
   bfd_arch_xtensa,    /* Tensilica's Xtensa cores.  */
@@ -4282,10 +4292,29 @@
   BFD_RELOC_MSP430_16,
   BFD_RELOC_MSP430_16_PCREL_BYTE,
   BFD_RELOC_MSP430_16_BYTE,
   BFD_RELOC_MSP430_2X_PCREL,
   BFD_RELOC_MSP430_RL_PCREL,
+  BFD_RELOC_MSP430X_SRC_BYTE,
+  BFD_RELOC_MSP430X_SRC,
+  BFD_RELOC_MSP430X_DST_BYTE,
+  BFD_RELOC_MSP430X_DST,
+  BFD_RELOC_MSP430X_DST_2ND_BYTE,
+  BFD_RELOC_MSP430X_DST_2ND,
+  BFD_RELOC_MSP430X_PCREL_SRC_BYTE,
+  BFD_RELOC_MSP430X_PCREL_SRC,
+  BFD_RELOC_MSP430X_PCREL_DST_BYTE,
+  BFD_RELOC_MSP430X_PCREL_DST,
+  BFD_RELOC_MSP430X_PCREL_DST_2ND,
+  BFD_RELOC_MSP430X_PCREL_DST_2ND_BYTE,
+  BFD_RELOC_MSP430X_S_BYTE,
+  BFD_RELOC_MSP430X_S,
+  BFD_RELOC_MSP430X_D_BYTE,
+  BFD_RELOC_MSP430X_D,
+  BFD_RELOC_MSP430X_PCREL_D,
+  BFD_RELOC_MSP430X_INDXD,
+  BFD_RELOC_MSP430X_PCREL_INDXD,
 
 /* IQ2000 Relocations.  */
   BFD_RELOC_IQ2000_OFFSET_16,
   BFD_RELOC_IQ2000_OFFSET_21,
   BFD_RELOC_IQ2000_UHI16,
diff -rNU 5 binutils-2.19-orig/bfd/cpu-msp430.c binutils-2.19-msp/bfd/cpu-msp430.c
--- binutils-2.19-orig/bfd/cpu-msp430.c	2007-07-04 00:26:40.000000000 +1000
+++ binutils-2.19-msp/bfd/cpu-msp430.c	2009-01-02 15:28:42.000000000 +1100
@@ -63,33 +63,64 @@
   N (16, bfd_mach_msp15, "msp:15", FALSE, & arch_info_struct[6]),
   
   /* msp430x16x.  */
   N (16, bfd_mach_msp16, "msp:16", FALSE, & arch_info_struct[7]),
 
+  /* msp430x20x.  */
+  N (16, bfd_mach_msp20, "msp:20", FALSE, & arch_info_struct[8]),
+
   /* msp430x21x.  */
-  N (16, bfd_mach_msp21, "msp:21", FALSE, & arch_info_struct[8]),
+  N (16, bfd_mach_msp21, "msp:21", FALSE, & arch_info_struct[9]),
+
+  /* msp430x22x.  */
+  N (16, bfd_mach_msp22, "msp:22", FALSE, & arch_info_struct[10]),
+
+  /* msp430x23x0.  */
+  N (16, bfd_mach_msp23, "msp:23", FALSE, & arch_info_struct[11]),
+
+  /* msp430x24x including msp430x2410 */
+  N (16, bfd_mach_msp24, "msp:24", FALSE, & arch_info_struct[12]),
+
+  /* msp430x241x except msp430x2410 (extended address range) */
+  N (20, bfd_mach_msp241, "msp:241", FALSE, & arch_info_struct[13]),
+
+  /* msp430x26x.  */
+  N (20, bfd_mach_msp26, "msp:26", FALSE, & arch_info_struct[14]),
 
   /* msp430x31x.  */
-  N (16, bfd_mach_msp31, "msp:31", FALSE, & arch_info_struct[9]), 
+  N (16, bfd_mach_msp31, "msp:31", FALSE, & arch_info_struct[15]), 
 
   /* msp430x32x.  */
-  N (16, bfd_mach_msp32, "msp:32", FALSE, & arch_info_struct[10]), 
+  N (16, bfd_mach_msp32, "msp:32", FALSE, & arch_info_struct[16]), 
 
   /* msp430x33x.  */
-  N (16, bfd_mach_msp33, "msp:33", FALSE, & arch_info_struct[11]),
+  N (16, bfd_mach_msp33, "msp:33", FALSE, & arch_info_struct[17]),
   
   /* msp430x41x.  */
-  N (16, bfd_mach_msp41, "msp:41", FALSE, & arch_info_struct[12]),
+  N (16, bfd_mach_msp41, "msp:41", FALSE, & arch_info_struct[18]),
 
   /* msp430x42x.  */
-  N (16, bfd_mach_msp42, "msp:42", FALSE, & arch_info_struct[13]),
+  N (16, bfd_mach_msp42, "msp:42", FALSE, & arch_info_struct[19]),
 
   /* msp430x43x.  */
-  N (16, bfd_mach_msp43, "msp:43", FALSE, & arch_info_struct[14]),
+  N (16, bfd_mach_msp43, "msp:43", FALSE, & arch_info_struct[20]),
 
   /* msp430x44x.  */
-  N (16, bfd_mach_msp43, "msp:44", FALSE, NULL)
+  N (16, bfd_mach_msp44, "msp:44", FALSE, & arch_info_struct[21]),
+
+  /* msp430x46xx.  */
+  N (20, bfd_mach_msp46, "msp:46", FALSE, & arch_info_struct[22]),
+
+  /* msp430x47x3, 47x4.  */
+  N (16, bfd_mach_msp47, "msp:47", FALSE, & arch_info_struct[23]),
+
+  /* msp430x471x6, 471x7.  */
+  N (20, bfd_mach_msp471, "msp:471", FALSE, & arch_info_struct[24]),
+
+  /* msp430x54xx.  */
+  N (20, bfd_mach_msp54, "msp:54", FALSE, NULL)
+
 };
 
 const bfd_arch_info_type bfd_msp430_arch =
   N (16, bfd_mach_msp14, "msp:14", TRUE, & arch_info_struct[0]);
 
diff -rNU 5 binutils-2.19-orig/bfd/doc/archures.texi binutils-2.19-msp/bfd/doc/archures.texi
--- binutils-2.19-orig/bfd/doc/archures.texi	2008-09-10 17:50:16.000000000 +1000
+++ binutils-2.19-msp/bfd/doc/archures.texi	2009-01-02 15:28:42.000000000 +1100
@@ -348,18 +348,24 @@
 #define bfd_mach_msp12          12
 #define bfd_mach_msp13          13
 #define bfd_mach_msp14          14
 #define bfd_mach_msp15          15
 #define bfd_mach_msp16          16
+#define bfd_mach_msp20          20
 #define bfd_mach_msp21          21
+#define bfd_mach_msp22          22
+#define bfd_mach_msp24          24
+#define bfd_mach_msp241         241
+#define bfd_mach_msp26          26
 #define bfd_mach_msp31          31
 #define bfd_mach_msp32          32
 #define bfd_mach_msp33          33
 #define bfd_mach_msp41          41
 #define bfd_mach_msp42          42
 #define bfd_mach_msp43          43
 #define bfd_mach_msp44          44
+#define bfd_mach_msp46          46
   bfd_arch_xc16x,     /* Infineon's XC16X Series.               */
 #define bfd_mach_xc16x         1
 #define bfd_mach_xc16xl        2
 #define bfd_mach_xc16xs         3
   bfd_arch_xtensa,    /* Tensilica's Xtensa cores.  */
@@ -605,6 +611,5 @@
[...6939 lines suppressed...]
+    {"", "", ".b", ".a" };
+    
   insn = msp430dis_opcode (addr, info);
-  sprintf (dinfo, "0x%04x", insn);
 
-  if (((int) addr & 0xffff) > 0xffdf)
+  if (info->mach == 241 || info->mach == 26 || info->mach == 46 || info->mach == 471)
+    {
+      core = CORE_430X;
+    }
+  else if (info->mach == 54)
+    {
+      core = CORE_430X2;
+    }
+    
+  if ( (core == CORE_430 && ((int) addr & 0xffff) >= 0xffe0)
+      || ( core == CORE_430X && (((int) addr & 0xfffff) >= 0xffc0) && ((int) addr & 0xfffff) < 0x10000)
+      || ( core == CORE_430X2 && (((int) addr & 0xfffff) >= 0xff80) && ((int) addr & 0xfffff) < 0x10000)
+     )
     {
       (*prin) (stream, "interrupt service routine at 0x%04x", 0xffff & insn);
       return 2;
     }
 
+  if (core > CORE_430 && ((insn & 0xf800) == 0x1800))    // Extended instruction
+     insn |= msp430dis_opcode(addr + 2, info) << 16;
+
   *comm1 = 0;
   *comm2 = 0;
 
   for (opcode = msp430_opcodes; opcode->name; opcode++)
     {
       if ((insn & opcode->bin_mask) == opcode->bin_opcode
-	  && opcode->bin_opcode != 0x9300)
+//	  && opcode->bin_opcode != 0x9300       // was disasm tst instruction as cmp #0, dst?
+         )
 	{
 	  *op1 = 0;
 	  *op2 = 0;
 	  *comm1 = 0;
 	  *comm2 = 0;
 
-	  /* r0 as destination. Ad should be zero.  */
-	  if (opcode->insn_opnumb == 3 && (insn & 0x000f) == 0
-	      && (0x0080 & insn) == 0)
+          /* unsupported instruction */
+          if(opcode_format(opcode) >= FMT_X && core < CORE_430X)
+            break;
+
+	  /* r0 as destination. Ad should be zero. Rdst=0 and Ad=0 are encoded in opcode & opcode_mask */
+	  if (opcode_format(opcode) == FMT_EMULATED && opcode_variant(opcode) == V_BR)
 	    {
 	      cmd_len =
-		msp430_branchinstr (info, opcode, addr, insn, op1, comm1,
-				    &cycles);
+		msp430_branchinstr (info, opcode, addr, insn, op1, comm1);
 	      if (cmd_len)
 		break;
 	    }
-
-	  switch (opcode->insn_opnumb)
-	    {
-	    case 0:
-	      cmd_len = msp430_nooperands (opcode, addr, insn, comm1, &cycles);
-	      break;
-	    case 2:
-	      cmd_len =
-		msp430_doubleoperand (info, opcode, addr, insn, op1, op2,
-				      comm1, comm2, &cycles);
-	      if (insn & BYTE_OPERATION)
-		bc = ".b";
-	      break;
-	    case 1:
-	      cmd_len =
-		msp430_singleoperand (info, opcode, addr, insn, op1, comm1,
-				      &cycles);
-	      if (insn & BYTE_OPERATION && opcode->fmt != 3)
-		bc = ".b";
-	      break;
-	    default:
-	      break;
-	    }
+          if(opcode_format(opcode) < FMT_X)
+  	    switch (opcode->insn_opnumb)
+	      {
+	      case 0:
+	        cmd_len = msp430_nooperands (opcode, addr, insn, comm1);
+	        break;
+	      case 2:
+	        cmd_len =
+		  msp430_doubleoperand (info, opcode, addr, insn, op1, op2,
+				        comm1, comm2);
+	        if (insn & BYTE_OPERATION)
+		  op_width = BYTE_OP;
+	        break;
+	      case 1:
+	        cmd_len =
+		  msp430_singleoperand (info, opcode, addr, insn, op1, comm1);
+	        if (insn & BYTE_OPERATION && opcode_format(opcode) != FMT_JUMP)
+		  op_width = BYTE_OP;
+	        break;
+	      default:
+	        break;
+	      }
+          else  // 430x instruction
+            switch(opcode_format(opcode))
+              {
+              case FMT_X_SINGLE_OPERAND:
+                if( opcode_variant(opcode) == V_SWPSXT                          // swpbx, sxtx
+                   && (insn & (NON_ADDR_OPERATION | BYTE_OPERATION_X)) == 0)    // .a, special case
+                      insn ^= BYTE_OPERATION_X;                                 // make A/L, B/W as ordinary
+
+                op_width = msp430x_opwidth(insn);
+
+                if( opcode_variant(opcode) == V_SWPSXT && op_width == BYTE_OP)         // swpbx, sxtx
+                  strcpy (comm1, _("Illegal A/L, B/W bits setting"));
+
+                cmd_len = msp430x_singleoperand (info, opcode, addr, insn, op1, comm1,
+				                 &repeats);
+                break;
+              case FMT_X_EXCEPTION:
+                cmd_len = msp430x_exception (info, opcode, addr, insn, op1, op2, 
+                                                 comm1, comm2, &op_width);
+                break;
+              case FMT_X_DOUBLE_OPERAND:
+                cmd_len = msp430x_doubleoperand (info, opcode, addr, insn, op1, op2, 
+                                                 comm1, comm2, &op_width, &repeats);
+                break;
+              case FMT_X_EMULATED:
+                cmd_len = msp430x_emulated (info, opcode, addr, insn, op1,
+                                            comm1, &op_width, &repeats);
+                break;
+
+              case FMT_X_ADDRESS:
+                cmd_len = msp430x_address (info, addr, insn, op1, op2,
+                                           comm1, comm2);
+                break;
+              default:
+                break;
+              }
 	}
 
       if (cmd_len)
 	break;
     }
 
-  dinfo[5] = 0;
-
   if (cmd_len < 1)
     {
       /* Unknown opcode, or invalid combination of operands.  */
-      (*prin) (stream, ".word	0x%04x;	????", PS (insn));
+      (*prin) (stream, ".word	0x%04x;	????\t%s%s", PS (insn), comm1, comm2);
       return 2;
     }
 
-  (*prin) (stream, "%s%s", opcode->name, bc);
+    
+  if (repeats)
+    {
+      if (repeats < 0)
+        (*prin) (stream, ".rpt\t#%d\n\t\t\t\t", 0 - repeats);
+      else
+        (*prin) (stream, ".rpt\tr%d\n\t\t\t\t", repeats);
+    }
+  
+  (*prin) (stream, "%s%s", opcode->name, width_modifier[op_width]);
 
   if (*op1)
     (*prin) (stream, "\t%s", op1);
   if (*op2)
     (*prin) (stream, ",");
@@ -763,25 +822,13 @@
   if (strlen (op2) < 8)
     (*prin) (stream, "\t");
 
   if (*comm1 || *comm2)
     (*prin) (stream, ";");
-  else if (cycles)
-    {
-      if (*op2)
-	(*prin) (stream, ";");
-      else
-	{
-	  if (strlen (op1) < 7)
-	    (*prin) (stream, ";");
-	  else
-	    (*prin) (stream, "\t;");
-	}
-    }
   if (*comm1)
     (*prin) (stream, "%s", comm1);
   if (*comm1 && *comm2)
-    (*prin) (stream, ",");
+    (*prin) (stream, ", ");
   if (*comm2)
-    (*prin) (stream, " %s", comm2);
+    (*prin) (stream, "%s", comm2);
   return cmd_len;
 }


--- NEW FILE import.log ---
msp430-binutils-2_19-2_fc10:F-10:msp430-binutils-2.19-2.fc10.src.rpm:1232975312


--- NEW FILE msp430-binutils.spec ---
%define target msp430

Name:		%{target}-binutils
Version:	2.19
Release:	2%{?dist}
Summary:	Cross Compiling GNU binutils targeted at %{target}
Group:		Development/Tools
License:	GPLv2+
URL:		http://www.gnu.org/software/binutils/
Source0:	http://ftp.gnu.org/gnu/binutils/binutils-%{version}.tar.bz2
# I have attempted to get this patch upstream.
# See mailing list post: http://article.gmane.org/gmane.comp.gnu.binutils/39694
Patch0:		01-binutils-2.19.patch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:	texinfo

%description
This is a Cross Compiling version of GNU binutils, which can be used to
assemble and link binaries for the %{target} platform, instead of for the
native %{_arch} platform.

%prep
%setup -q -c -n msp430-binutils
pushd binutils-%{version}
%patch0 -p1
popd

%build
mkdir -p build
cd build
CFLAGS="$RPM_OPT_FLAGS" ../binutils-%{version}/configure --prefix=%{_prefix} \
	--libdir=%{_libdir} --mandir=%{_mandir} --infodir=%{_infodir} \
	--target=%{target} --disable-werror --disable-nls

make %{?_smp_mflags}

%install
cd build
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
# these are for win targets only
rm -f $RPM_BUILD_ROOT%{_mandir}/man1/%{target}-{dlltool,nlmconv,windres,windmc}.1
# we don't want these as this is a cross-compiler
rm -rf $RPM_BUILD_ROOT%{_infodir}
rm -f $RPM_BUILD_ROOT%{_libdir}/libiberty.a

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%{_prefix}/%{target}

%{_bindir}/%{target}-*
%{_mandir}/man1/%{target}-*.1.gz

%changelog
* Thu Jan 15 2009 Rob Spanton rspanton at zepler.net 2.19-2
- Add comment about getting patch upstream.

* Tue Jan 13 2009 Rob Spanton rspanton at zepler.net 2.19-1
- Bump up to binutils 2.19.
- Use the bundled 2.19 patch from mspgcc packaging.
- Don't install man pages about windows utilities.
- Reduce a number of lines from the files section to just one line.
- Don't delete the debug information.

* Thu Aug 28 2007 Rob Spanton rspanton at zepler.net 2.18-1
- Initial release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/msp430-binutils/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	23 Jan 2009 23:32:06 -0000	1.1
+++ .cvsignore	26 Jan 2009 13:09:49 -0000	1.2
@@ -0,0 +1 @@
+binutils-2.19.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/msp430-binutils/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	23 Jan 2009 23:32:06 -0000	1.1
+++ sources	26 Jan 2009 13:09:49 -0000	1.2
@@ -0,0 +1 @@
+17a52219dee5a76c1a9d9b0bfd337d66  binutils-2.19.tar.bz2



From pkgdb at fedoraproject.org  Mon Jan 26 13:19:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Jan 2009 13:19:31 +0000
Subject: [pkgdb] sugar-turtleart had acl change status
Message-ID: <20090126131931.4F86A208487@bastion.fedora.phx.redhat.com>

bkearney has set the watchbugzilla acl on sugar-turtleart (Fedora devel) to Approved for fab

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-turtleart



From pkgdb at fedoraproject.org  Mon Jan 26 13:19:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Jan 2009 13:19:33 +0000
Subject: [pkgdb] sugar-turtleart had acl change status
Message-ID: <20090126131933.2F9CD20848C@bastion.fedora.phx.redhat.com>

bkearney has set the watchcommits acl on sugar-turtleart (Fedora devel) to Approved for fab

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-turtleart



From mkasik at fedoraproject.org  Mon Jan 26 13:25:00 2009
From: mkasik at fedoraproject.org (=?utf-8?b?TWFyZWsgS2HFocOtaw==?=)
Date: Mon, 26 Jan 2009 13:25:00 +0000 (UTC)
Subject: rpms/cups-pk-helper/devel pk_order.patch, NONE,
	1.1 cups-pk-helper.spec, 1.1, 1.2
Message-ID: <20090126132500.636917010C@cvs1.fedora.phx.redhat.com>

Author: mkasik

Update of /cvs/pkgs/rpms/cups-pk-helper/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25438

Modified Files:
	cups-pk-helper.spec 
Added Files:
	pk_order.patch 
Log Message:
* Tue Jan 26 2009 Marek Kasik <mkasik at redhat.com> 0.0.3-2
- Add handling of file:/ protocol
- Change order of checked policies so the PolicyKit asks only for
  "printer-enable" policy when enabling/disabling a printer
- Change order of checked policies so the PolicyKit asks only for
  "printer-set-default" policy when setting default printer


pk_order.patch:

--- NEW FILE pk_order.patch ---
--- src/cups.c	2008-11-21 07:04:28.000000000 +0100
+++ src/cups.c	2009-01-23 16:28:07.000000000 +0100
@@ -1606,6 +1606,7 @@ cph_cups_is_printer_uri_local (const cha
             g_str_has_prefix (lower_uri, "beh:") ||
             g_str_has_prefix (lower_uri, "scsi:") ||
             g_str_has_prefix (lower_uri, "serial:") ||
+            g_str_has_prefix (lower_uri, "file:") ||
             g_str_has_prefix (lower_uri, "pipe:")) {
                 g_free (lower_uri);
                 return TRUE;
--- src/cups-pk-helper-mechanism.c	2008-11-21 07:28:20.000000000 +0100
+++ src/cups-pk-helper-mechanism.c	2009-01-26 13:54:44.000000000 +0100
@@ -901,21 +901,18 @@ cph_mechanism_printer_set_default (CphMe
                                    DBusGMethodInvocation *context)
 {
         gboolean    ret;
-        const char *last_action;
+        const char *action;
 
         reset_killtimer (mechanism);
 
-        last_action = _cph_mechanism_get_action_for_name (mechanism, name);
+        action = _cph_mechanism_get_action_for_name (mechanism, name);
         if (!_check_polkit_for_action_v (mechanism, context,
                                          "printeraddremove",
-                                         /* this is not the last check because
-                                          * it's likely most useful to the user
-                                          * to give "printer-X-edit" powers */
-                                         "printer-default",
                                          /* quite important, since it's
                                           * automatically called after adding a
                                           * printer */
-                                         last_action,
+                                         action,
+                                         "printer-set-default",
                                          NULL))
                 return FALSE;
 
@@ -932,21 +929,19 @@ cph_mechanism_printer_set_enabled (CphMe
                                    DBusGMethodInvocation *context)
 {
         gboolean    ret;
-        const char *last_action;
+        const char *action;
 
         reset_killtimer (mechanism);
 
-        last_action = _cph_mechanism_get_action_for_name (mechanism, name);
+        action = _cph_mechanism_get_action_for_name (mechanism, name);
+
         if (!_check_polkit_for_action_v (mechanism, context,
                                          "printeraddremove",
-                                         /* this is not the last check because
-                                          * it's likely most useful to the user
-                                          * to give "printer-X-edit" powers */
-                                         "printer-enable",
                                          /* quite important, since it's
                                           * automatically called after adding a
                                           * printer */
-                                         last_action,
+                                         action,
+                                         "printer-enable",
                                          NULL))
                 return FALSE;
 


Index: cups-pk-helper.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups-pk-helper/devel/cups-pk-helper.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cups-pk-helper.spec	20 Jan 2009 12:30:21 -0000	1.1
+++ cups-pk-helper.spec	26 Jan 2009 13:24:30 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           cups-pk-helper
 Version:        0.0.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A helper that makes system-config-printer use PolicyKit
 
 Group:          System Environment/Base
@@ -9,6 +9,7 @@
 Source0:        http://www.vuntz.net/download/cups-pk-helper/cups-pk-helper-%{version}.tar.bz2
 
 Patch0:         dependencies.patch
+Patch1:         pk_order.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -32,6 +33,7 @@
 %setup -q
 
 %patch0 -p0 -b .dependencies
+%patch1 -p0 -b .pk-order
 
 %build
 %configure
@@ -58,6 +60,12 @@
 
 
 %changelog
+* Tue Jan 26 2009 Marek Kasik <mkasik at redhat.com> 0.0.3-2
+- Add handling of file:/ protocol
+- Change order of checked policies so the PolicyKit asks only for
+  "printer-enable" policy when enabling/disabling a printer
+- Change order of checked policies so the PolicyKit asks only for
+  "printer-set-default" policy when setting default printer
 
 * Tue Jan 13 2009 Marek Kasik <mkasik at redhat.com> 0.0.3-1
 - Initial spec file.



From red at fedoraproject.org  Mon Jan 26 13:30:07 2009
From: red at fedoraproject.org (Sandro Mathys)
Date: Mon, 26 Jan 2009 13:30:07 +0000 (UTC)
Subject: rpms/xtvd/devel import.log, NONE, 1.1 xtvd.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090126133007.C25AD7010C@cvs1.fedora.phx.redhat.com>

Author: red

Update of /cvs/pkgs/rpms/xtvd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26043/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log xtvd.spec 
Log Message:
* Mon Jan 26 2009 Sandro Mathys <red at fedoraproject.org> - 2.0.1-2
- initial commit



--- NEW FILE import.log ---
xtvd-2_0_1-2_fc11:HEAD:xtvd-2.0.1-2.fc11.src.rpm:1232976445


--- NEW FILE xtvd.spec ---
Name:           xtvd
Version:        2.0.1
Release:        2%{?dist}
Summary:        A client java library for easy access to the tv data from schedulesdirect.org 
Group:          Development/Libraries
License:        GPL+
URL:            http://xtvdclient.sourceforge.net/
#svn co https://xtvdclient.svn.sourceforge.net/svnroot/xtvdclient/tags/2.0.1 xtvd-2.0.1
Source0:        %{name}-%{version}.tar.bz2
BuildArch:      noarch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:     java-devel >= 1:1.6.0
BuildRequires:     jpackage-utils
BuildRequires:     jdom

%description
A client java library for easy access to the tv data from schedulesdirect.org.


%package lib
Summary:           A client java library for easy access to the tv data from schedulesdirect.org
Group:             Development/Libraries
Requires:          java >= 1:1.6.0
Requires:          jpackage-utils

%description lib
A client java library for easy access to the tv data from schedulesdirect.org.


%package gui
Summary:           This client is only a small demonstration for the usage of the library
Group:             Applications/Multimedia
Requires:          java >= 1:1.6.0
Requires:          jpackage-utils
Requires:          %{name}-lib = %{version}-%{release}

%description gui
This client is only a small demonstration for the usage of the library.
It's an enhanced verison of the old XTVD WEBSERVICE CLIENT by Tribune
Media Services, Inc.


%package lib-javadoc
Summary:           Javadocs for xtvd-lib
Group:             Documentation
Requires:          %{name}-lib = %{version}-%{release}
Requires:          jpackage-utils

%description lib-javadoc
xtvd-lib development documentation.


%prep
%setup -q # -n %{name}-%{version}

%build
# lib
pushd %{name}-lib
rm -rf target
mkdir target
javac -d target `find -name '*.java'`

jar -cf ../%{name}-lib-%{version}.jar -C target .

# lib-javadoc
javadoc -d doc `find src -name '*.java'`

popd


# gui
pushd %{name}-gui
rm -rf target
mkdir target
javac -d target -cp ../%{name}-lib-%{version}.jar:`build-classpath jdom` `find -name '*.java'`
jar -cf ../%{name}-gui-%{version}.jar -C target .
popd


%install
rm -rf $RPM_BUILD_ROOT

install -d $RPM_BUILD_ROOT%{_javadir}

# lib
install -m644 %{name}-lib-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-lib-%{version}.jar
ln -s %{name}-lib-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-lib.jar

# gui
install -m644 %{name}-gui-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-gui-%{version}.jar
ln -s %{name}-gui-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-gui.jar

# lib-javadoc
install -d $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
cp -rp %{name}-lib/doc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}


%clean
rm -rf $RPM_BUILD_ROOT


%files lib
%defattr(-,root,root,-)
%doc %{name}-lib/LICENSE
%{_javadir}/%{name}-lib.jar
%{_javadir}/%{name}-lib-%{version}.jar

%files gui
%defattr(-,root,root,-)
%doc %{name}-gui/LICENSE
%{_javadir}/%{name}-gui.jar
%{_javadir}/%{name}-gui-%{version}.jar

%files lib-javadoc
%defattr(-,root,root,-)
%dir %{_javadocdir}/%{name}-%{version}
%{_javadocdir}/%{name}
%{_javadocdir}/%{name}-%{version}/*

%changelog
* Thu Dec 18 2008 Sandro Mathys <red at fedoraproject.org> - 2.0.1-2
- For the javac call, the classpath is no longer hardcoded with the
  absolute paths to the javadir (currently that's only jdom). Instead,
  build-classpath is used.

* Tue Dec 16 2008 Sandro Mathys <red at fedoraproject.org> - 2.0.1-1
- initial build


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xtvd/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	17 Jan 2009 03:33:17 -0000	1.1
+++ .cvsignore	26 Jan 2009 13:29:37 -0000	1.2
@@ -0,0 +1 @@
+xtvd-2.0.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xtvd/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	17 Jan 2009 03:33:17 -0000	1.1
+++ sources	26 Jan 2009 13:29:37 -0000	1.2
@@ -0,0 +1 @@
+bec29595844698245bf2f28660b35377  xtvd-2.0.1.tar.bz2



From red at fedoraproject.org  Mon Jan 26 13:32:25 2009
From: red at fedoraproject.org (Sandro Mathys)
Date: Mon, 26 Jan 2009 13:32:25 +0000 (UTC)
Subject: rpms/xtvd/F-9 import.log, NONE, 1.1 xtvd.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090126133225.402AD7010C@cvs1.fedora.phx.redhat.com>

Author: red

Update of /cvs/pkgs/rpms/xtvd/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26877/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	import.log xtvd.spec 
Log Message:
* Mon Jan 26 2009 Sandro Mathys <red at fedoraproject.org> - 2.0.1-2
- initial commit




--- NEW FILE import.log ---
xtvd-2_0_1-2_fc11:F-9:xtvd-2.0.1-2.fc11.src.rpm:1232976669


--- NEW FILE xtvd.spec ---
Name:           xtvd
Version:        2.0.1
Release:        2%{?dist}
Summary:        A client java library for easy access to the tv data from schedulesdirect.org 
Group:          Development/Libraries
License:        GPL+
URL:            http://xtvdclient.sourceforge.net/
#svn co https://xtvdclient.svn.sourceforge.net/svnroot/xtvdclient/tags/2.0.1 xtvd-2.0.1
Source0:        %{name}-%{version}.tar.bz2
BuildArch:      noarch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:     java-devel >= 1:1.6.0
BuildRequires:     jpackage-utils
BuildRequires:     jdom

%description
A client java library for easy access to the tv data from schedulesdirect.org.


%package lib
Summary:           A client java library for easy access to the tv data from schedulesdirect.org
Group:             Development/Libraries
Requires:          java >= 1:1.6.0
Requires:          jpackage-utils

%description lib
A client java library for easy access to the tv data from schedulesdirect.org.


%package gui
Summary:           This client is only a small demonstration for the usage of the library
Group:             Applications/Multimedia
Requires:          java >= 1:1.6.0
Requires:          jpackage-utils
Requires:          %{name}-lib = %{version}-%{release}

%description gui
This client is only a small demonstration for the usage of the library.
It's an enhanced verison of the old XTVD WEBSERVICE CLIENT by Tribune
Media Services, Inc.


%package lib-javadoc
Summary:           Javadocs for xtvd-lib
Group:             Documentation
Requires:          %{name}-lib = %{version}-%{release}
Requires:          jpackage-utils

%description lib-javadoc
xtvd-lib development documentation.


%prep
%setup -q # -n %{name}-%{version}

%build
# lib
pushd %{name}-lib
rm -rf target
mkdir target
javac -d target `find -name '*.java'`

jar -cf ../%{name}-lib-%{version}.jar -C target .

# lib-javadoc
javadoc -d doc `find src -name '*.java'`

popd


# gui
pushd %{name}-gui
rm -rf target
mkdir target
javac -d target -cp ../%{name}-lib-%{version}.jar:`build-classpath jdom` `find -name '*.java'`
jar -cf ../%{name}-gui-%{version}.jar -C target .
popd


%install
rm -rf $RPM_BUILD_ROOT

install -d $RPM_BUILD_ROOT%{_javadir}

# lib
install -m644 %{name}-lib-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-lib-%{version}.jar
ln -s %{name}-lib-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-lib.jar

# gui
install -m644 %{name}-gui-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-gui-%{version}.jar
ln -s %{name}-gui-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-gui.jar

# lib-javadoc
install -d $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
cp -rp %{name}-lib/doc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}


%clean
rm -rf $RPM_BUILD_ROOT


%files lib
%defattr(-,root,root,-)
%doc %{name}-lib/LICENSE
%{_javadir}/%{name}-lib.jar
%{_javadir}/%{name}-lib-%{version}.jar

%files gui
%defattr(-,root,root,-)
%doc %{name}-gui/LICENSE
%{_javadir}/%{name}-gui.jar
%{_javadir}/%{name}-gui-%{version}.jar

%files lib-javadoc
%defattr(-,root,root,-)
%dir %{_javadocdir}/%{name}-%{version}
%{_javadocdir}/%{name}
%{_javadocdir}/%{name}-%{version}/*

%changelog
* Thu Dec 18 2008 Sandro Mathys <red at fedoraproject.org> - 2.0.1-2
- For the javac call, the classpath is no longer hardcoded with the
  absolute paths to the javadir (currently that's only jdom). Instead,
  build-classpath is used.

* Tue Dec 16 2008 Sandro Mathys <red at fedoraproject.org> - 2.0.1-1
- initial build


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xtvd/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	17 Jan 2009 03:33:17 -0000	1.1
+++ .cvsignore	26 Jan 2009 13:31:54 -0000	1.2
@@ -0,0 +1 @@
+xtvd-2.0.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xtvd/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	17 Jan 2009 03:33:17 -0000	1.1
+++ sources	26 Jan 2009 13:31:54 -0000	1.2
@@ -0,0 +1 @@
+bec29595844698245bf2f28660b35377  xtvd-2.0.1.tar.bz2



From red at fedoraproject.org  Mon Jan 26 13:34:57 2009
From: red at fedoraproject.org (Sandro Mathys)
Date: Mon, 26 Jan 2009 13:34:57 +0000 (UTC)
Subject: rpms/xtvd/F-10 import.log, NONE, 1.1 xtvd.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090126133457.25D927010C@cvs1.fedora.phx.redhat.com>

Author: red

Update of /cvs/pkgs/rpms/xtvd/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27549/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	import.log xtvd.spec 
Log Message:
* Mon Jan 26 2009 Sandro Mathys <red at fedoraproject.org> - 2.0.1-2
- initial commit




--- NEW FILE import.log ---
xtvd-2_0_1-2_fc11:F-10:xtvd-2.0.1-2.fc11.src.rpm:1232976834


--- NEW FILE xtvd.spec ---
Name:           xtvd
Version:        2.0.1
Release:        2%{?dist}
Summary:        A client java library for easy access to the tv data from schedulesdirect.org 
Group:          Development/Libraries
License:        GPL+
URL:            http://xtvdclient.sourceforge.net/
#svn co https://xtvdclient.svn.sourceforge.net/svnroot/xtvdclient/tags/2.0.1 xtvd-2.0.1
Source0:        %{name}-%{version}.tar.bz2
BuildArch:      noarch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:     java-devel >= 1:1.6.0
BuildRequires:     jpackage-utils
BuildRequires:     jdom

%description
A client java library for easy access to the tv data from schedulesdirect.org.


%package lib
Summary:           A client java library for easy access to the tv data from schedulesdirect.org
Group:             Development/Libraries
Requires:          java >= 1:1.6.0
Requires:          jpackage-utils

%description lib
A client java library for easy access to the tv data from schedulesdirect.org.


%package gui
Summary:           This client is only a small demonstration for the usage of the library
Group:             Applications/Multimedia
Requires:          java >= 1:1.6.0
Requires:          jpackage-utils
Requires:          %{name}-lib = %{version}-%{release}

%description gui
This client is only a small demonstration for the usage of the library.
It's an enhanced verison of the old XTVD WEBSERVICE CLIENT by Tribune
Media Services, Inc.


%package lib-javadoc
Summary:           Javadocs for xtvd-lib
Group:             Documentation
Requires:          %{name}-lib = %{version}-%{release}
Requires:          jpackage-utils

%description lib-javadoc
xtvd-lib development documentation.


%prep
%setup -q # -n %{name}-%{version}

%build
# lib
pushd %{name}-lib
rm -rf target
mkdir target
javac -d target `find -name '*.java'`

jar -cf ../%{name}-lib-%{version}.jar -C target .

# lib-javadoc
javadoc -d doc `find src -name '*.java'`

popd


# gui
pushd %{name}-gui
rm -rf target
mkdir target
javac -d target -cp ../%{name}-lib-%{version}.jar:`build-classpath jdom` `find -name '*.java'`
jar -cf ../%{name}-gui-%{version}.jar -C target .
popd


%install
rm -rf $RPM_BUILD_ROOT

install -d $RPM_BUILD_ROOT%{_javadir}

# lib
install -m644 %{name}-lib-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-lib-%{version}.jar
ln -s %{name}-lib-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-lib.jar

# gui
install -m644 %{name}-gui-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-gui-%{version}.jar
ln -s %{name}-gui-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-gui.jar

# lib-javadoc
install -d $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
cp -rp %{name}-lib/doc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}


%clean
rm -rf $RPM_BUILD_ROOT


%files lib
%defattr(-,root,root,-)
%doc %{name}-lib/LICENSE
%{_javadir}/%{name}-lib.jar
%{_javadir}/%{name}-lib-%{version}.jar

%files gui
%defattr(-,root,root,-)
%doc %{name}-gui/LICENSE
%{_javadir}/%{name}-gui.jar
%{_javadir}/%{name}-gui-%{version}.jar

%files lib-javadoc
%defattr(-,root,root,-)
%dir %{_javadocdir}/%{name}-%{version}
%{_javadocdir}/%{name}
%{_javadocdir}/%{name}-%{version}/*

%changelog
* Thu Dec 18 2008 Sandro Mathys <red at fedoraproject.org> - 2.0.1-2
- For the javac call, the classpath is no longer hardcoded with the
  absolute paths to the javadir (currently that's only jdom). Instead,
  build-classpath is used.

* Tue Dec 16 2008 Sandro Mathys <red at fedoraproject.org> - 2.0.1-1
- initial build


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xtvd/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	17 Jan 2009 03:33:17 -0000	1.1
+++ .cvsignore	26 Jan 2009 13:34:26 -0000	1.2
@@ -0,0 +1 @@
+xtvd-2.0.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xtvd/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	17 Jan 2009 03:33:17 -0000	1.1
+++ sources	26 Jan 2009 13:34:26 -0000	1.2
@@ -0,0 +1 @@
+bec29595844698245bf2f28660b35377  xtvd-2.0.1.tar.bz2



From nphilipp at fedoraproject.org  Mon Jan 26 13:40:38 2009
From: nphilipp at fedoraproject.org (Nils Philippsen)
Date: Mon, 26 Jan 2009 13:40:38 +0000 (UTC)
Subject: rpms/frozen-bubble/devel .cvsignore, 1.4, 1.5 frozen-bubble.spec,
	1.12, 1.13 sources, 1.4, 1.5
Message-ID: <20090126134038.A593B7010C@cvs1.fedora.phx.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/frozen-bubble/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28527

Modified Files:
	.cvsignore frozen-bubble.spec sources 
Log Message:
Update to 2.2.0 (#479431)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/frozen-bubble/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	29 Nov 2006 10:25:16 -0000	1.4
+++ .cvsignore	26 Jan 2009 13:40:08 -0000	1.5
@@ -1 +1 @@
-frozen-bubble-2.1.0.tar.bz2
+frozen-bubble-2.2.0.tar.bz2


Index: frozen-bubble.spec
===================================================================
RCS file: /cvs/pkgs/rpms/frozen-bubble/devel/frozen-bubble.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- frozen-bubble.spec	6 Jul 2008 11:53:49 -0000	1.12
+++ frozen-bubble.spec	26 Jan 2009 13:40:08 -0000	1.13
@@ -1,7 +1,7 @@
 Summary: Frozen Bubble arcade game
 Name: frozen-bubble
-Version: 2.1.0
-Release: 9%{?dist}
+Version: 2.2.0
+Release: 1%{?dist}
 License: GPLv2
 Group: Amusements/Games
 URL: http://www.frozen-bubble.org/
@@ -161,6 +161,9 @@
 
 
 %changelog
+* Mon Jan 26 2009 Nils Philippsen <nils at redhat.com> 2.2.0-1
+- Update to 2.2.0 (#479431)
+
 * Sun Jul  6 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 2.1.0-9
 - Fix audio on bigendian archs (bz 454109), patch by Ian Chapman
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/frozen-bubble/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	29 Nov 2006 10:25:16 -0000	1.4
+++ sources	26 Jan 2009 13:40:08 -0000	1.5
@@ -1 +1 @@
-f5eb984897e1ccd52a0d8820d8359861  frozen-bubble-2.1.0.tar.bz2
+f7987201470d6755ed309762d348e0dd  frozen-bubble-2.2.0.tar.bz2



From red at fedoraproject.org  Mon Jan 26 13:51:24 2009
From: red at fedoraproject.org (Sandro Mathys)
Date: Mon, 26 Jan 2009 13:51:24 +0000 (UTC)
Subject: rpms/TVAnytimeAPI/devel TVAnytimeAPI.spec, NONE, 1.1 import.log,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090126135124.0AFBA7010C@cvs1.fedora.phx.redhat.com>

Author: red

Update of /cvs/pkgs/rpms/TVAnytimeAPI/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30370/devel

Modified Files:
	.cvsignore sources 
Added Files:
	TVAnytimeAPI.spec import.log 
Log Message:
* Mon Jan 26 2009 Sandro Mathys <red at fedoraproject.org> - 2.0.1-2
- initial commit




--- NEW FILE TVAnytimeAPI.spec ---
Name:           TVAnytimeAPI
Version:        1.3
Release:        3%{?dist}
Summary:        A java API for parsing, manipulating and creating TV-Anytime metadata
Group:          Development/Libraries
License:        LGPLv2+
URL:            http://tvanytimeapi.sourceforge.net/
#Source0:         http://downloads.sourceforge.net/%{name}/%{name}_July05_release.zip
# Modified the source archive because of legal problems (mainly the xml/subdir)
Source0:        %{name}-%{version}.tar.bz2
BuildArch:      noarch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:     java-devel >= 1:1.6.0
BuildRequires:     jpackage-utils
Requires:          java >= 1:1.6.0
Requires:          jpackage-utils

%description
A java API for parsing, manipulating and creating TV-Anytime metadata.
TV-Anytime is an open standard for metadata describing TV and radio
programmes that is designed to support Personal Video Recoders (PVRs),
programme guides and related technologies.


%package javadoc
Summary:           Javadocs for TVAnytimeAPI
Group:             Documentation
Requires:          %{name} = %{version}-%{release}
Requires:          jpackage-utils

%description javadoc
TVAnytimeAPI development documentation.


%prep
%setup -q # -n %{name}-%{version}

%{__sed} -i 's/\r//' examples/APICodeExamples.java
%{__sed} -i 's/\r//' examples/CreateProgInfoTable.java


%build
pushd java
javac -d ../lib/ `find -name '*.java'`
popd
pushd lib
jar -cvf0 TVAnytimeAPI.jar bbc
popd
javadoc -author -version -overview java/overview.html -public -d doc `find java -name '*.java'`


%install
rm -rf $RPM_BUILD_ROOT

# jar
install -d $RPM_BUILD_ROOT%{_javadir}
install -m644 lib/%{name}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar

# javadoc
install -d $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
cp -rp doc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc COPYING examples
%{_javadir}/%{name}.jar
%{_javadir}/%{name}-%{version}.jar

%files javadoc
%defattr(-,root,root,-)
%dir %{_javadocdir}/%{name}-%{version}
%{_javadocdir}/%{name}
%{_javadocdir}/%{name}-%{version}/*


%changelog
* Thu Jan 15 2009 Sandro Mathys <red at fedoraproject.org> - 1.3-3
- License was wrong.

* Fri Jan 09 2009 Sandro Mathys <red at fedoraproject.org> - 1.3-2
- Removed the xml/ subdir for legal problems.
- Also removed lib/* and docs because I was already modifying the source archive anyway.
- Added examples/ to the docs

* Tue Dec 16 2008 Sandro Mathys <red at fedoraproject.org> - 1.3-1
- initial build


--- NEW FILE import.log ---
TVAnytimeAPI-1_3-3_fc11:HEAD:TVAnytimeAPI-1.3-3.fc11.src.rpm:1232977819


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/TVAnytimeAPI/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	17 Jan 2009 03:31:49 -0000	1.1
+++ .cvsignore	26 Jan 2009 13:50:53 -0000	1.2
@@ -0,0 +1 @@
+TVAnytimeAPI-1.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/TVAnytimeAPI/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	17 Jan 2009 03:31:49 -0000	1.1
+++ sources	26 Jan 2009 13:50:53 -0000	1.2
@@ -0,0 +1 @@
+8e1af36a53356571259ece8f89691d4b  TVAnytimeAPI-1.3.tar.bz2



From red at fedoraproject.org  Mon Jan 26 13:53:23 2009
From: red at fedoraproject.org (Sandro Mathys)
Date: Mon, 26 Jan 2009 13:53:23 +0000 (UTC)
Subject: rpms/TVAnytimeAPI/F-9 TVAnytimeAPI.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090126135323.D52227010C@cvs1.fedora.phx.redhat.com>

Author: red

Update of /cvs/pkgs/rpms/TVAnytimeAPI/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31146/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	TVAnytimeAPI.spec import.log 
Log Message:
* Mon Jan 26 2009 Sandro Mathys <red at fedoraproject.org> - 2.0.1-2
- initial commit




--- NEW FILE TVAnytimeAPI.spec ---
Name:           TVAnytimeAPI
Version:        1.3
Release:        3%{?dist}
Summary:        A java API for parsing, manipulating and creating TV-Anytime metadata
Group:          Development/Libraries
License:        LGPLv2+
URL:            http://tvanytimeapi.sourceforge.net/
#Source0:         http://downloads.sourceforge.net/%{name}/%{name}_July05_release.zip
# Modified the source archive because of legal problems (mainly the xml/subdir)
Source0:        %{name}-%{version}.tar.bz2
BuildArch:      noarch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:     java-devel >= 1:1.6.0
BuildRequires:     jpackage-utils
Requires:          java >= 1:1.6.0
Requires:          jpackage-utils

%description
A java API for parsing, manipulating and creating TV-Anytime metadata.
TV-Anytime is an open standard for metadata describing TV and radio
programmes that is designed to support Personal Video Recoders (PVRs),
programme guides and related technologies.


%package javadoc
Summary:           Javadocs for TVAnytimeAPI
Group:             Documentation
Requires:          %{name} = %{version}-%{release}
Requires:          jpackage-utils

%description javadoc
TVAnytimeAPI development documentation.


%prep
%setup -q # -n %{name}-%{version}

%{__sed} -i 's/\r//' examples/APICodeExamples.java
%{__sed} -i 's/\r//' examples/CreateProgInfoTable.java


%build
pushd java
javac -d ../lib/ `find -name '*.java'`
popd
pushd lib
jar -cvf0 TVAnytimeAPI.jar bbc
popd
javadoc -author -version -overview java/overview.html -public -d doc `find java -name '*.java'`


%install
rm -rf $RPM_BUILD_ROOT

# jar
install -d $RPM_BUILD_ROOT%{_javadir}
install -m644 lib/%{name}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar

# javadoc
install -d $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
cp -rp doc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc COPYING examples
%{_javadir}/%{name}.jar
%{_javadir}/%{name}-%{version}.jar

%files javadoc
%defattr(-,root,root,-)
%dir %{_javadocdir}/%{name}-%{version}
%{_javadocdir}/%{name}
%{_javadocdir}/%{name}-%{version}/*


%changelog
* Thu Jan 15 2009 Sandro Mathys <red at fedoraproject.org> - 1.3-3
- License was wrong.

* Fri Jan 09 2009 Sandro Mathys <red at fedoraproject.org> - 1.3-2
- Removed the xml/ subdir for legal problems.
- Also removed lib/* and docs because I was already modifying the source archive anyway.
- Added examples/ to the docs

* Tue Dec 16 2008 Sandro Mathys <red at fedoraproject.org> - 1.3-1
- initial build


--- NEW FILE import.log ---
TVAnytimeAPI-1_3-3_fc11:F-9:TVAnytimeAPI-1.3-3.fc11.src.rpm:1232977938


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/TVAnytimeAPI/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	17 Jan 2009 03:31:49 -0000	1.1
+++ .cvsignore	26 Jan 2009 13:52:53 -0000	1.2
@@ -0,0 +1 @@
+TVAnytimeAPI-1.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/TVAnytimeAPI/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	17 Jan 2009 03:31:49 -0000	1.1
+++ sources	26 Jan 2009 13:52:53 -0000	1.2
@@ -0,0 +1 @@
+8e1af36a53356571259ece8f89691d4b  TVAnytimeAPI-1.3.tar.bz2



From red at fedoraproject.org  Mon Jan 26 13:55:26 2009
From: red at fedoraproject.org (Sandro Mathys)
Date: Mon, 26 Jan 2009 13:55:26 +0000 (UTC)
Subject: rpms/TVAnytimeAPI/F-10 TVAnytimeAPI.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090126135526.8D61D7010C@cvs1.fedora.phx.redhat.com>

Author: red

Update of /cvs/pkgs/rpms/TVAnytimeAPI/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32056/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	TVAnytimeAPI.spec import.log 
Log Message:
* Mon Jan 26 2009 Sandro Mathys <red at fedoraproject.org> - 2.0.1-2
- initial commit




--- NEW FILE TVAnytimeAPI.spec ---
Name:           TVAnytimeAPI
Version:        1.3
Release:        3%{?dist}
Summary:        A java API for parsing, manipulating and creating TV-Anytime metadata
Group:          Development/Libraries
License:        LGPLv2+
URL:            http://tvanytimeapi.sourceforge.net/
#Source0:         http://downloads.sourceforge.net/%{name}/%{name}_July05_release.zip
# Modified the source archive because of legal problems (mainly the xml/subdir)
Source0:        %{name}-%{version}.tar.bz2
BuildArch:      noarch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:     java-devel >= 1:1.6.0
BuildRequires:     jpackage-utils
Requires:          java >= 1:1.6.0
Requires:          jpackage-utils

%description
A java API for parsing, manipulating and creating TV-Anytime metadata.
TV-Anytime is an open standard for metadata describing TV and radio
programmes that is designed to support Personal Video Recoders (PVRs),
programme guides and related technologies.


%package javadoc
Summary:           Javadocs for TVAnytimeAPI
Group:             Documentation
Requires:          %{name} = %{version}-%{release}
Requires:          jpackage-utils

%description javadoc
TVAnytimeAPI development documentation.


%prep
%setup -q # -n %{name}-%{version}

%{__sed} -i 's/\r//' examples/APICodeExamples.java
%{__sed} -i 's/\r//' examples/CreateProgInfoTable.java


%build
pushd java
javac -d ../lib/ `find -name '*.java'`
popd
pushd lib
jar -cvf0 TVAnytimeAPI.jar bbc
popd
javadoc -author -version -overview java/overview.html -public -d doc `find java -name '*.java'`


%install
rm -rf $RPM_BUILD_ROOT

# jar
install -d $RPM_BUILD_ROOT%{_javadir}
install -m644 lib/%{name}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar

# javadoc
install -d $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
cp -rp doc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc COPYING examples
%{_javadir}/%{name}.jar
%{_javadir}/%{name}-%{version}.jar

%files javadoc
%defattr(-,root,root,-)
%dir %{_javadocdir}/%{name}-%{version}
%{_javadocdir}/%{name}
%{_javadocdir}/%{name}-%{version}/*


%changelog
* Thu Jan 15 2009 Sandro Mathys <red at fedoraproject.org> - 1.3-3
- License was wrong.

* Fri Jan 09 2009 Sandro Mathys <red at fedoraproject.org> - 1.3-2
- Removed the xml/ subdir for legal problems.
- Also removed lib/* and docs because I was already modifying the source archive anyway.
- Added examples/ to the docs

* Tue Dec 16 2008 Sandro Mathys <red at fedoraproject.org> - 1.3-1
- initial build


--- NEW FILE import.log ---
TVAnytimeAPI-1_3-3_fc11:F-10:TVAnytimeAPI-1.3-3.fc11.src.rpm:1232978066


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/TVAnytimeAPI/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	17 Jan 2009 03:31:49 -0000	1.1
+++ .cvsignore	26 Jan 2009 13:54:56 -0000	1.2
@@ -0,0 +1 @@
+TVAnytimeAPI-1.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/TVAnytimeAPI/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	17 Jan 2009 03:31:49 -0000	1.1
+++ sources	26 Jan 2009 13:54:56 -0000	1.2
@@ -0,0 +1 @@
+8e1af36a53356571259ece8f89691d4b  TVAnytimeAPI-1.3.tar.bz2



From tmraz at fedoraproject.org  Mon Jan 26 14:02:56 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Mon, 26 Jan 2009 14:02:56 +0000 (UTC)
Subject: rpms/qca-ossl/devel qca-ossl-2.0.0-no-whirlpool.patch, NONE,
	1.1 qca-ossl.spec, 1.6, 1.7
Message-ID: <20090126140256.8D57B7010C@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/qca-ossl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv897

Modified Files:
	qca-ossl.spec 
Added Files:
	qca-ossl-2.0.0-no-whirlpool.patch 
Log Message:
* Mon Jan 26 2009 Tomas Mraz <tmraz at redhat.com> - 2.0.0-0.5.beta3
- rebuild with new openssl
- fix the test for whirlpool support


qca-ossl-2.0.0-no-whirlpool.patch:

--- NEW FILE qca-ossl-2.0.0-no-whirlpool.patch ---
diff -up qca-ossl-2.0.0-beta3/qca-ossl.cpp.no-whirlpool qca-ossl-2.0.0-beta3/qca-ossl.cpp
--- qca-ossl-2.0.0-beta3/qca-ossl.cpp.no-whirlpool	2007-12-11 07:34:57.000000000 +0100
+++ qca-ossl-2.0.0-beta3/qca-ossl.cpp	2009-01-26 14:59:42.000000000 +0100
@@ -6597,7 +6597,7 @@ static QStringList all_hash_types()
 #ifdef SHA512_DIGEST_LENGTH
 	list += "sha512";
 #endif
-#ifdef OBJ_whirlpool
+#ifdef WHIRLPOOL_DIGEST_LENGTH
 	list += "whirlpool";
 #endif
 	return list;
@@ -6810,7 +6810,7 @@ public:
 		else if ( type == "sha512" )
 			return new opensslHashContext( EVP_sha512(), this, type);
 #endif
-#ifdef OBJ_whirlpool
+#ifdef WHIRLPOOL_DIGEST_LENGTH
 		else if ( type == "whirlpool" )
 			return new opensslHashContext( EVP_whirlpool(), this, type);
 #endif


Index: qca-ossl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qca-ossl/devel/qca-ossl.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- qca-ossl.spec	17 Jan 2009 20:17:31 -0000	1.6
+++ qca-ossl.spec	26 Jan 2009 14:02:26 -0000	1.7
@@ -9,6 +9,7 @@
 Group:      System Environment/Libraries
 URL:        http://delta.affinix.com/qca/
 Source0:    http://delta.affinix.com/download/qca/2.0/plugins/qca-ossl-%{version}-beta%{beta}.tar.bz2
+Patch1:     qca-ossl-2.0.0-no-whirlpool.patch
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: qt4-devel, qca2-devel >= 2.0.0-1
@@ -23,7 +24,7 @@
 
 %prep
 %setup -q -n %{name}-%{version}-beta%{beta}
-
+%patch1 -p1 -b .no-whirlpool
 
 %build
 unset QTDIR
@@ -51,8 +52,9 @@
 
 
 %changelog
-* Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> - 2.0.0-0.5.beta3
+* Mon Jan 26 2009 Tomas Mraz <tmraz at redhat.com> - 2.0.0-0.5.beta3
 - rebuild with new openssl
+- fix the test for whirlpool support
 
 * Mon Feb 18 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 2.0.0-0.4.beta3
 - Autorebuild for GCC 4.3



From ruben at fedoraproject.org  Mon Jan 26 14:10:46 2009
From: ruben at fedoraproject.org (Ruben Kerkhof)
Date: Mon, 26 Jan 2009 14:10:46 +0000 (UTC)
Subject: rpms/pdns/devel .cvsignore, 1.7, 1.8 pdns.spec, 1.16, 1.17 sources, 
	1.7, 1.8
Message-ID: <20090126141046.DEAA87010C@cvs1.fedora.phx.redhat.com>

Author: ruben

Update of /cvs/pkgs/rpms/pdns/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2146

Modified Files:
	.cvsignore pdns.spec sources 
Log Message:
* Mon Jan 26 2009 Ruben Kerkhof <ruben at rubenkerkhof.com> 2.9.22-3
- Upstream released new version



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pdns/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	19 Jan 2009 13:04:50 -0000	1.7
+++ .cvsignore	26 Jan 2009 14:10:16 -0000	1.8
@@ -1 +1 @@
-pdns-2.9.22-rc3.tar.gz
+pdns-2.9.22.tar.gz


Index: pdns.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pdns/devel/pdns.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- pdns.spec	23 Jan 2009 11:53:02 -0000	1.16
+++ pdns.spec	26 Jan 2009 14:10:16 -0000	1.17
@@ -1,14 +1,13 @@
-%define alphatag rc3
 Summary:	A modern, advanced and high performance authoritative-only nameserver
 Name:		pdns
 Version:	2.9.22
-Release:	2.%{alphatag}%{?dist}
+Release:	3%{?dist}
 
 Group:		System Environment/Daemons
 License:	GPLv2
 URL:		http://powerdns.com
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Source0:	http://downloads.powerdns.com/releases/%{name}-%{version}-%{alphatag}.tar.gz
+Source0:	http://downloads.powerdns.com/releases/%{name}-%{version}.tar.gz
 Patch0:		%{name}-fixinit.patch
 
 Requires(post):	%{_sbindir}/useradd, /sbin/chkconfig
@@ -79,7 +78,7 @@
 
 
 %prep
-%setup -q -n %{name}-%{version}-%{alphatag}
+%setup -q
 %patch0 -p1 -b .fixinit
 
 %build
@@ -180,6 +179,9 @@
 
 
 %changelog
+* Mon Jan 26 2009 Ruben Kerkhof <ruben at rubenkerkhof.com> 2.9.22-3
+- Upstream released new version
+
 * Fri Jan 23 2009 Ruben Kerkhof <ruben at rubenkerkhof.com> 2.9.22-2.rc3
 - Rebuild for new libmysqlclient
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pdns/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	19 Jan 2009 13:04:50 -0000	1.7
+++ sources	26 Jan 2009 14:10:16 -0000	1.8
@@ -1 +1 @@
-b562932743696db3b9fc93667dd06487  pdns-2.9.22-rc3.tar.gz
+8a6ff842733aca885577eb54e983a1ff  pdns-2.9.22.tar.gz



From langel at fedoraproject.org  Mon Jan 26 14:11:43 2009
From: langel at fedoraproject.org (Lillian Angel)
Date: Mon, 26 Jan 2009 14:11:43 +0000 (UTC)
Subject: rpms/java-1.6.0-openjdk/F-10 java-1.6.0-openjdk.spec, 1.99,
	1.100 sources, 1.52, 1.53
Message-ID: <20090126141143.C91FD7010C@cvs1.fedora.phx.redhat.com>

Author: langel

Update of /cvs/pkgs/rpms/java-1.6.0-openjdk/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2346

Modified Files:
	java-1.6.0-openjdk.spec sources 
Log Message:
* Mon Jan 26 2009 Lillian Angel <langel at redhat.com> - 1:1.6.0-10.b14
- Updated sources.



Index: java-1.6.0-openjdk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/F-10/java-1.6.0-openjdk.spec,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -r1.99 -r1.100
--- java-1.6.0-openjdk.spec	23 Jan 2009 17:22:55 -0000	1.99
+++ java-1.6.0-openjdk.spec	26 Jan 2009 14:11:13 -0000	1.100
@@ -890,6 +890,9 @@
 %{_jvmdir}/%{jredir}/lib/%{archinstall}/IcedTeaPlugin.so
 
 %changelog
+* Mon Jan 26 2009 Lillian Angel <langel at redhat.com> - 1:1.6.0-10.b14
+- Updated sources.
+
 * Fri Jan 23 2009 Lillian Angel <langel at redhat.com> - 1:1.6.0-10.b14
 - Added accessibility patch.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/F-10/sources,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- sources	22 Jan 2009 20:08:08 -0000	1.52
+++ sources	26 Jan 2009 14:11:13 -0000	1.53
@@ -3,4 +3,4 @@
 a9cdc5f050eb6e97c1b15ddd39978710  mauve-2008-10-22.tar.gz
 79d9511129158fa4fd3798a506757a5d  openjdk-6-src-b14-25_nov_2008-fedora.tar.gz
 c8f78d48ac83987bc2adebeebcd354e9  hotspot.tar.gz
-b7b296cf88952e5e96f70a4db8b2b8ad  icedtea6-1.4.tar.gz
+dc332ed85806b9d8bb271deb0f1ee1fb  icedtea6-1.4.tar.gz



From langel at fedoraproject.org  Mon Jan 26 14:14:17 2009
From: langel at fedoraproject.org (Lillian Angel)
Date: Mon, 26 Jan 2009 14:14:17 +0000 (UTC)
Subject: rpms/java-1.6.0-openjdk/devel java-1.6.0-openjdk.spec, 1.102,
	1.103 sources, 1.57, 1.58
Message-ID: <20090126141417.1C7677010C@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-serv2961

Modified Files:
	java-1.6.0-openjdk.spec sources 
Log Message:
* Mon Jan 26 2009 Lillian Angel <langel at redhat.com> - 1:1.6.0-10.b14
- Updated sources.



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.102
retrieving revision 1.103
diff -u -r1.102 -r1.103
--- java-1.6.0-openjdk.spec	23 Jan 2009 17:24:44 -0000	1.102
+++ java-1.6.0-openjdk.spec	26 Jan 2009 14:13:46 -0000	1.103
@@ -890,6 +890,9 @@
 %{_jvmdir}/%{jredir}/lib/%{archinstall}/IcedTeaPlugin.so
 
 %changelog
+* Mon Jan 26 2009 Lillian Angel <langel at redhat.com> - 1:1.6.0-10.b14
+- Updated sources.
+
 * Fri Jan 23 2009 Lillian Angel <langel at redhat.com> - 1:1.6.0-10.b14
 - Added accessibility patch.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/devel/sources,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- sources	22 Jan 2009 20:07:57 -0000	1.57
+++ sources	26 Jan 2009 14:13:46 -0000	1.58
@@ -3,4 +3,4 @@
 a9cdc5f050eb6e97c1b15ddd39978710  mauve-2008-10-22.tar.gz
 bd07d61915e403a55a6ef42842b0cf8c  openjdk-6-src-b14-25_nov_2008-fedora.tar.gz
 c8f78d48ac83987bc2adebeebcd354e9  hotspot.tar.gz
-b7b296cf88952e5e96f70a4db8b2b8ad  icedtea6-1.4.tar.gz
+dc332ed85806b9d8bb271deb0f1ee1fb  icedtea6-1.4.tar.gz



From tmraz at fedoraproject.org  Mon Jan 26 14:15:56 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Mon, 26 Jan 2009 14:15:56 +0000 (UTC)
Subject: rpms/ruby/devel ruby-1.8.6-ossl-rand-range.patch, NONE,
	1.1 ruby.spec, 1.125, 1.126
Message-ID: <20090126141556.765017010C@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/ruby/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3414

Modified Files:
	ruby.spec 
Added Files:
	ruby-1.8.6-ossl-rand-range.patch 
Log Message:
* Mon Jan 26 2009 Tomas Mraz <tmraz at redhat.com> - 1.8.6.287-3
- rebuild with new openssl
- BN_rand_range functions are now constified


ruby-1.8.6-ossl-rand-range.patch:

--- NEW FILE ruby-1.8.6-ossl-rand-range.patch ---
diff -up ruby-1.8.6-p287/ext/openssl/openssl_missing.h.rand-range ruby-1.8.6-p287/ext/openssl/openssl_missing.h
--- ruby-1.8.6-p287/ext/openssl/openssl_missing.h.rand-range	2008-08-04 06:43:34.000000000 +0200
+++ ruby-1.8.6-p287/ext/openssl/openssl_missing.h	2009-01-26 15:11:23.000000000 +0100
@@ -120,8 +120,8 @@ int X509_CRL_add0_revoked(X509_CRL *crl,
 int BN_mod_sqr(BIGNUM *r, const BIGNUM *a, const BIGNUM *m, BN_CTX *ctx);
 int BN_mod_add(BIGNUM *r, const BIGNUM *a, const BIGNUM *b, const BIGNUM *m, BN_CTX *ctx);
 int BN_mod_sub(BIGNUM *r, const BIGNUM *a, const BIGNUM *b, const BIGNUM *m, BN_CTX *ctx);
-int BN_rand_range(BIGNUM *r, BIGNUM *range);
-int BN_pseudo_rand_range(BIGNUM *r, BIGNUM *range);
+int BN_rand_range(BIGNUM *r, const BIGNUM *range);
+int BN_pseudo_rand_range(BIGNUM *r, const BIGNUM *range);
 char *CONF_get1_default_config_file(void);
 int PEM_def_callback(char *buf, int num, int w, void *key);
 


Index: ruby.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ruby/devel/ruby.spec,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -r1.125 -r1.126
--- ruby.spec	17 Jan 2009 20:59:44 -0000	1.125
+++ ruby.spec	26 Jan 2009 14:15:26 -0000	1.126
@@ -35,6 +35,7 @@
 Patch23:	ruby-multilib.patch
 Patch25:	ruby-1.8.6.111-gcc43.patch
 Patch26:	ruby-1.8.6-rexml-CVE-2008-3790.patch
+Patch27:        ruby-1.8.6-ossl-rand-range.patch
 
 Summary:	An interpreter of object-oriented scripting language
 Group:		Development/Languages
@@ -154,6 +155,7 @@
 %endif
 %patch25 -p1
 %patch26 -p1
+%patch27 -p1
 popd
 
 %build
@@ -504,8 +506,9 @@
 %{_datadir}/emacs/site-lisp/site-start.d/ruby-mode-init.el
 
 %changelog
-* Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> - 1.8.6.287-3
+* Mon Jan 26 2009 Tomas Mraz <tmraz at redhat.com> - 1.8.6.287-3
 - rebuild with new openssl
+- BN_rand_range functions are now constified
 
 * Wed Oct  8 2008 Akira TAGOH <tagoh at redhat.com> - 1.8.6.287-2
 - CVE-2008-3790: DoS vulnerability in the REXML module.



From langel at fedoraproject.org  Mon Jan 26 14:17:20 2009
From: langel at fedoraproject.org (Lillian Angel)
Date: Mon, 26 Jan 2009 14:17:20 +0000 (UTC)
Subject: rpms/java-1.6.0-openjdk/devel
	java-1.6.0-openjdk-accessible-toolkit.patch, NONE, 1.1
Message-ID: <20090126141720.444A47010C@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-serv3845

Added Files:
	java-1.6.0-openjdk-accessible-toolkit.patch 
Log Message:
Added patch



java-1.6.0-openjdk-accessible-toolkit.patch:

--- NEW FILE java-1.6.0-openjdk-accessible-toolkit.patch ---
diff -uNr openjdk-orig/jdk/src/share/classes/java/awt/Toolkit.java openjdk/jdk/src/share/classes/java/awt/Toolkit.java
--- openjdk-orig/jdk/src/share/classes/java/awt/Toolkit.java	2009-01-23 11:59:47.000000000 -0500
+++ openjdk/jdk/src/share/classes/java/awt/Toolkit.java	2009-01-23 12:05:20.000000000 -0500
@@ -871,7 +871,11 @@
                         return null;
                     }
                 });
-                loadAssistiveTechnologies();
+                try {
+                    loadAssistiveTechnologies();
+                } catch ( AWTError error) {
+                    // ignore silently
+                }
             } finally {
                 // Make sure to always re-enable the JIT.
                 java.lang.Compiler.enable();



From hadess at fedoraproject.org  Mon Jan 26 14:22:44 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Mon, 26 Jan 2009 14:22:44 +0000 (UTC)
Subject: rpms/fprintd/devel fprintd.spec,1.4,1.5
Message-ID: <20090126142244.3988D7010C@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/fprintd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4723

Modified Files:
	fprintd.spec 
Log Message:
Some new files



Index: fprintd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fprintd/devel/fprintd.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- fprintd.spec	26 Jan 2009 10:42:27 -0000	1.4
+++ fprintd.spec	26 Jan 2009 14:22:13 -0000	1.5
@@ -90,6 +90,8 @@
 %files devel
 %defattr(-,root,root,-)
 %{_datadir}/gtk-doc/html/fprintd
+%{_datadir}/dbus-1/interfaces/net.reactivated.Fprint.Device.xml
+%{_datadir}/dbus-1/interfaces/net.reactivated.Fprint.Manager.xml
 
 %changelog
 * Mon Jan 26 2009 - Bastien Nocera <bnocera at redhat.com> - 0.1-6.git04fd09cfa



From lmacken at fedoraproject.org  Mon Jan 26 14:40:25 2009
From: lmacken at fedoraproject.org (Luke Macken)
Date: Mon, 26 Jan 2009 14:40:25 +0000 (UTC)
Subject: rpms/gobby/devel gobby.spec,1.33,1.34
Message-ID: <20090126144025.157967010C@cvs1.fedora.phx.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/gobby/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7862

Modified Files:
	gobby.spec 
Log Message:
Add intltool to the build requirements


Index: gobby.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gobby/devel/gobby.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- gobby.spec	26 Jan 2009 05:16:47 -0000	1.33
+++ gobby.spec	26 Jan 2009 14:39:54 -0000	1.34
@@ -1,6 +1,6 @@
 Name:           gobby
 Version:        0.4.10
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Free collaborative editor
 
 Group:          Applications/Internet
@@ -13,6 +13,7 @@
 BuildRequires:  desktop-file-utils, libXau-devel, libXdmcp-devel
 BuildRequires:  gnome-vfs2-devel, gettext-devel
 BuildRequires:  avahi-devel, avahi-glib-devel
+BuildRequires:  intltool
 
 Requires(post): desktop-file-utils
 Requires(postun): desktop-file-utils
@@ -73,6 +74,9 @@
 
 
 %changelog
+* Mon Jan 26 2009 Luke Macken <lmacken at redhat.com> - 0.4.10-2
+- Add intltool to the build requirements
+
 * Sun Jan 25 2009 Luke Macken <lmacken at redhat.com> - 0.4.10-1
 - Update to 0.4.10
 



From ruben at fedoraproject.org  Mon Jan 26 14:44:04 2009
From: ruben at fedoraproject.org (Ruben Kerkhof)
Date: Mon, 26 Jan 2009 14:44:04 +0000 (UTC)
Subject: rpms/pdns/F-10 .cvsignore, 1.5, 1.6 pdns.spec, 1.13, 1.14 sources,
	1.5, 
	1.6 pdns-avoid-version.patch, 1.2, NONE pdns-bz461768.patch, 1.1,
	NONE pdns-gcc43.patch, 1.1, NONE
Message-ID: <20090126144404.5B5F97010C@cvs1.fedora.phx.redhat.com>

Author: ruben

Update of /cvs/pkgs/rpms/pdns/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8456

Modified Files:
	.cvsignore pdns.spec sources 
Removed Files:
	pdns-avoid-version.patch pdns-bz461768.patch pdns-gcc43.patch 
Log Message:
* Mon Jan 26 2009 Ruben Kerkhof <ruben at rubenkerkhof.com> 2.9.22-3
- Upstream released new version



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pdns/F-10/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	18 Nov 2008 21:28:36 -0000	1.5
+++ .cvsignore	26 Jan 2009 14:43:33 -0000	1.6
@@ -1 +1 @@
-pdns-2.9.21.2.tar.gz
+pdns-2.9.22.tar.gz


Index: pdns.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pdns/F-10/pdns.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- pdns.spec	18 Nov 2008 21:28:36 -0000	1.13
+++ pdns.spec	26 Jan 2009 14:43:33 -0000	1.14
@@ -1,7 +1,7 @@
 Summary:	A modern, advanced and high performance authoritative-only nameserver
 Name:		pdns
-Version:	2.9.21.2
-Release:	1%{?dist}
+Version:	2.9.22
+Release:	3%{?dist}
 
 Group:		System Environment/Daemons
 License:	GPLv2
@@ -9,9 +9,6 @@
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Source0:	http://downloads.powerdns.com/releases/%{name}-%{version}.tar.gz
 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
@@ -83,9 +80,6 @@
 %prep
 %setup -q
 %patch0 -p1 -b .fixinit
-%patch1 -p1 -b .avoid-version
-%patch2 -p1
-%patch3 -p3
 
 %build
 export CPPFLAGS="-DLDAP_DEPRECATED %{optflags}"
@@ -185,6 +179,9 @@
 
 
 %changelog
+* Mon Jan 26 2009 Ruben Kerkhof <ruben at rubenkerkhof.com> 2.9.22-3
+- Upstream released new version
+
 * Mon Nov 17 2008 Ruben Kerkhof <ruben at rubenkerkhof.com> 2.9.21.2-1
 - Upstream released new version
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pdns/F-10/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	18 Nov 2008 21:28:36 -0000	1.5
+++ sources	26 Jan 2009 14:43:33 -0000	1.6
@@ -1 +1 @@
-2aa79c1d120a071298340ed2d4e02165  pdns-2.9.21.2.tar.gz
+8a6ff842733aca885577eb54e983a1ff  pdns-2.9.22.tar.gz


--- pdns-avoid-version.patch DELETED ---


--- pdns-bz461768.patch DELETED ---


--- pdns-gcc43.patch DELETED ---



From jreznik at fedoraproject.org  Mon Jan 26 14:46:16 2009
From: jreznik at fedoraproject.org (Jaroslav Reznik)
Date: Mon, 26 Jan 2009 14:46:16 +0000 (UTC)
Subject: rpms/kdenetwork/F-10 kdenetwork-4.2.0-handle-enc-message.patch, NONE,
	1.1 kdenetwork.spec, 1.162, 1.163
Message-ID: <20090126144616.605C77010C@cvs1.fedora.phx.redhat.com>

Author: jreznik

Update of /cvs/pkgs/rpms/kdenetwork/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8783

Modified Files:
	kdenetwork.spec 
Added Files:
	kdenetwork-4.2.0-handle-enc-message.patch 
Log Message:
fix kopete jabber protocol encrypted messages handling (#473412)


kdenetwork-4.2.0-handle-enc-message.patch:

--- NEW FILE kdenetwork-4.2.0-handle-enc-message.patch ---
diff -up kdenetwork-4.2.0/kopete/protocols/jabber/jabbercontact.cpp.handle-enc-message kdenetwork-4.2.0/kopete/protocols/jabber/jabbercontact.cpp
--- kdenetwork-4.2.0/kopete/protocols/jabber/jabbercontact.cpp.handle-enc-message	2008-11-19 11:19:43.000000000 +0100
+++ kdenetwork-4.2.0/kopete/protocols/jabber/jabbercontact.cpp	2009-01-26 14:12:35.000000000 +0100
@@ -51,6 +51,7 @@
 #include "kopetechatsessionmanager.h"
 #include "kopeteaccountmanager.h"
 #include "kopetemetacontact.h"
+#include "kopetepluginmanager.h"
 #include "jabberprotocol.h"
 #include "jabberaccount.h"
 #include "jabberclient.h"
@@ -392,9 +393,15 @@ void JabberContact::handleIncomingMessag
 		QString body = message.body ();
 		if( !message.xencrypted().isEmpty() )
 		{
-			body = QString ("-----BEGIN PGP MESSAGE-----\n\n") + message.xencrypted () + QString ("\n-----END PGP MESSAGE-----\n");
+			kDebug ( JABBER_DEBUG_GLOBAL ) << "Received encrypted message";
+			if (Kopete::PluginManager::self()->plugin("kopete_cryptography"))
+			{
+				kDebug( JABBER_DEBUG_GLOBAL ) << "Kopete cryptography plugin loaded";
+				body = QString ("-----BEGIN PGP MESSAGE-----\n\n") + message.xencrypted () + QString ("\n-----END PGP MESSAGE-----\n");
+			}
 		}
-		else if( message.containsHTML() )
+
+		if( message.containsHTML() )
 		{
 			kDebug ( JABBER_DEBUG_GLOBAL ) << "Received a xHTML message";
 			newMessage = new Kopete::Message ( this, contactList );
diff -up kdenetwork-4.2.0/kopete/protocols/jabber/jabbergroupcontact.cpp.handle-enc-message kdenetwork-4.2.0/kopete/protocols/jabber/jabbergroupcontact.cpp
--- kdenetwork-4.2.0/kopete/protocols/jabber/jabbergroupcontact.cpp.handle-enc-message	2008-10-09 11:48:21.000000000 +0200
+++ kdenetwork-4.2.0/kopete/protocols/jabber/jabbergroupcontact.cpp	2009-01-26 14:12:35.000000000 +0100
@@ -32,6 +32,7 @@
 #include "jabbergroupmembercontact.h"
 #include "jabbercontactpool.h"
 #include "kopetemetacontact.h"
+#include "kopetepluginmanager.h"
 #include "xmpp_tasks.h"
 
 /**
@@ -181,7 +182,11 @@ void JabberGroupContact::handleIncomingM
 
 		if( !message.xencrypted().isEmpty () )
 		{
-			body = QString ("-----BEGIN PGP MESSAGE-----\n\n") + message.xencrypted () + QString ("\n-----END PGP MESSAGE-----\n");
+			if (Kopete::PluginManager::self()->plugin("kopete_cryptography"))
+			{
+				kDebug( JABBER_DEBUG_GLOBAL ) << "Kopete cryptography plugin loaded";
+				body = QString ("-----BEGIN PGP MESSAGE-----\n\n") + message.xencrypted () + QString ("\n-----END PGP MESSAGE-----\n");
+			}
 		}
 
 		// locate the originating contact


Index: kdenetwork.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdenetwork/F-10/kdenetwork.spec,v
retrieving revision 1.162
retrieving revision 1.163
diff -u -r1.162 -r1.163
--- kdenetwork.spec	24 Jan 2009 17:45:09 -0000	1.162
+++ kdenetwork.spec	26 Jan 2009 14:45:45 -0000	1.163
@@ -2,12 +2,13 @@
 Name: kdenetwork
 Epoch: 7
 Version: 4.2.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPLv2
 Group: Applications/Internet
 URL: http://www.kde.org
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
+Patch0: kdenetwork-4.2.0-handle-enc-message.patch
 # build Kopete against the system libgadu (backported from 4.3)
 # http://websvn.kde.org/?view=rev&revision=909144
 # http://websvn.kde.org/?view=rev&revision=909145
@@ -87,6 +88,7 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .handle-enc-message
 %patch100 -p0 -b .system-libgadu
 rm -rf kopete/protocols/gadu/libgadu/
 
@@ -162,6 +164,9 @@
 
 
 %changelog
+* Mon Jan 26 2009 Jaroslav Reznik <jreznik at redhat.com> - 4.2.0-2
+- fix kopete jabber protocol encrypted messages handling (#473412)
+
 * Thu Jan 22 2009 Than Ngo <than at redhat.com> - 4.2.0-1
 - 4.2.0
 



From jreznik at fedoraproject.org  Mon Jan 26 14:47:50 2009
From: jreznik at fedoraproject.org (Jaroslav Reznik)
Date: Mon, 26 Jan 2009 14:47:50 +0000 (UTC)
Subject: rpms/kdenetwork/devel kdenetwork-4.2.0-handle-enc-message.patch,
	NONE, 1.1 kdenetwork.spec, 1.169, 1.170
Message-ID: <20090126144750.2AA357010C@cvs1.fedora.phx.redhat.com>

Author: jreznik

Update of /cvs/pkgs/rpms/kdenetwork/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9022

Modified Files:
	kdenetwork.spec 
Added Files:
	kdenetwork-4.2.0-handle-enc-message.patch 
Log Message:
fix kopete jabber protocol encrypted messages handling (#473412)


kdenetwork-4.2.0-handle-enc-message.patch:

--- NEW FILE kdenetwork-4.2.0-handle-enc-message.patch ---
diff -up kdenetwork-4.2.0/kopete/protocols/jabber/jabbercontact.cpp.handle-enc-message kdenetwork-4.2.0/kopete/protocols/jabber/jabbercontact.cpp
--- kdenetwork-4.2.0/kopete/protocols/jabber/jabbercontact.cpp.handle-enc-message	2008-11-19 11:19:43.000000000 +0100
+++ kdenetwork-4.2.0/kopete/protocols/jabber/jabbercontact.cpp	2009-01-26 14:12:35.000000000 +0100
@@ -51,6 +51,7 @@
 #include "kopetechatsessionmanager.h"
 #include "kopeteaccountmanager.h"
 #include "kopetemetacontact.h"
+#include "kopetepluginmanager.h"
 #include "jabberprotocol.h"
 #include "jabberaccount.h"
 #include "jabberclient.h"
@@ -392,9 +393,15 @@ void JabberContact::handleIncomingMessag
 		QString body = message.body ();
 		if( !message.xencrypted().isEmpty() )
 		{
-			body = QString ("-----BEGIN PGP MESSAGE-----\n\n") + message.xencrypted () + QString ("\n-----END PGP MESSAGE-----\n");
+			kDebug ( JABBER_DEBUG_GLOBAL ) << "Received encrypted message";
+			if (Kopete::PluginManager::self()->plugin("kopete_cryptography"))
+			{
+				kDebug( JABBER_DEBUG_GLOBAL ) << "Kopete cryptography plugin loaded";
+				body = QString ("-----BEGIN PGP MESSAGE-----\n\n") + message.xencrypted () + QString ("\n-----END PGP MESSAGE-----\n");
+			}
 		}
-		else if( message.containsHTML() )
+
+		if( message.containsHTML() )
 		{
 			kDebug ( JABBER_DEBUG_GLOBAL ) << "Received a xHTML message";
 			newMessage = new Kopete::Message ( this, contactList );
diff -up kdenetwork-4.2.0/kopete/protocols/jabber/jabbergroupcontact.cpp.handle-enc-message kdenetwork-4.2.0/kopete/protocols/jabber/jabbergroupcontact.cpp
--- kdenetwork-4.2.0/kopete/protocols/jabber/jabbergroupcontact.cpp.handle-enc-message	2008-10-09 11:48:21.000000000 +0200
+++ kdenetwork-4.2.0/kopete/protocols/jabber/jabbergroupcontact.cpp	2009-01-26 14:12:35.000000000 +0100
@@ -32,6 +32,7 @@
 #include "jabbergroupmembercontact.h"
 #include "jabbercontactpool.h"
 #include "kopetemetacontact.h"
+#include "kopetepluginmanager.h"
 #include "xmpp_tasks.h"
 
 /**
@@ -181,7 +182,11 @@ void JabberGroupContact::handleIncomingM
 
 		if( !message.xencrypted().isEmpty () )
 		{
-			body = QString ("-----BEGIN PGP MESSAGE-----\n\n") + message.xencrypted () + QString ("\n-----END PGP MESSAGE-----\n");
+			if (Kopete::PluginManager::self()->plugin("kopete_cryptography"))
+			{
+				kDebug( JABBER_DEBUG_GLOBAL ) << "Kopete cryptography plugin loaded";
+				body = QString ("-----BEGIN PGP MESSAGE-----\n\n") + message.xencrypted () + QString ("\n-----END PGP MESSAGE-----\n");
+			}
 		}
 
 		// locate the originating contact


Index: kdenetwork.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdenetwork/devel/kdenetwork.spec,v
retrieving revision 1.169
retrieving revision 1.170
diff -u -r1.169 -r1.170
--- kdenetwork.spec	22 Jan 2009 11:37:52 -0000	1.169
+++ kdenetwork.spec	26 Jan 2009 14:47:19 -0000	1.170
@@ -2,12 +2,13 @@
 Name: kdenetwork
 Epoch: 7
 Version: 4.2.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPLv2
 Group: Applications/Internet
 URL: http://www.kde.org
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
+Patch0: kdenetwork-4.2.0-handle-enc-message.patch
 # build Kopete against the system libgadu (backported from 4.3)
 # http://websvn.kde.org/?view=rev&revision=909144
 # http://websvn.kde.org/?view=rev&revision=909145
@@ -87,6 +88,7 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .handle-enc-message
 %patch100 -p0 -b .system-libgadu
 rm -rf kopete/protocols/gadu/libgadu/
 
@@ -162,6 +164,9 @@
 
 
 %changelog
+* Mon Jan 26 2009 Jaroslav Reznik <jreznik at redhat.com> - 4.2.0-2
+- fix kopete jabber protocol encrypted messages handling (#473412)
+
 * Thu Jan 22 2009 Than Ngo <than at redhat.com> - 4.2.0-1
 - 4.2.0
 



From lmacken at fedoraproject.org  Mon Jan 26 14:55:26 2009
From: lmacken at fedoraproject.org (Luke Macken)
Date: Mon, 26 Jan 2009 14:55:26 +0000 (UTC)
Subject: rpms/net6/F-10 .cvsignore, 1.13, 1.14 net6.spec, 1.22, 1.23 sources,
	1.13, 1.14
Message-ID: <20090126145526.15ABB7010C@cvs1.fedora.phx.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/net6/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10757

Modified Files:
	.cvsignore net6.spec sources 
Log Message:
Update to the latest upstream version


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/net6/F-10/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	26 Jul 2008 18:58:22 -0000	1.13
+++ .cvsignore	26 Jan 2009 14:54:55 -0000	1.14
@@ -1 +1 @@
-net6-1.3.6.tar.gz
+net6-1.3.9.tar.gz


Index: net6.spec
===================================================================
RCS file: /cvs/pkgs/rpms/net6/F-10/net6.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- net6.spec	26 Jul 2008 18:58:23 -0000	1.22
+++ net6.spec	26 Jan 2009 14:54:55 -0000	1.23
@@ -1,5 +1,5 @@
 Name:           net6
-Version:        1.3.6
+Version:        1.3.9
 Release:        1%{?dist}
 Summary:        A TCP protocol abstraction for library C++
 
@@ -71,6 +71,9 @@
 
 
 %changelog
+* Sun Jan 25 2009 Luke Macken <lmacken at redhat.com> - 1.3.9-1
+- Update to 1.3.9
+
 * Sat Jul 26 2008 Luke Macken <lmacken at redhat.com> - 1.3.6-1
 - Update to the latest upstream release.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/net6/F-10/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	26 Jul 2008 18:58:23 -0000	1.13
+++ sources	26 Jan 2009 14:54:55 -0000	1.14
@@ -1 +1 @@
-033734dff97af88741f41633fbe992bc  net6-1.3.6.tar.gz
+afab12d33fc201a7dbc2cfa116218079  net6-1.3.9.tar.gz



From lmacken at fedoraproject.org  Mon Jan 26 14:56:17 2009
From: lmacken at fedoraproject.org (Luke Macken)
Date: Mon, 26 Jan 2009 14:56:17 +0000 (UTC)
Subject: rpms/net6/F-9 .cvsignore, 1.12, 1.13 net6.spec, 1.21, 1.22 sources, 
	1.13, 1.14
Message-ID: <20090126145617.49CC47010C@cvs1.fedora.phx.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/net6/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10996

Modified Files:
	.cvsignore net6.spec sources 
Log Message:
Update to the latest upstream version


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/net6/F-9/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	16 Jun 2007 19:55:44 -0000	1.12
+++ .cvsignore	26 Jan 2009 14:55:47 -0000	1.13
@@ -1 +1 @@
-net6-1.3.5.tar.gz
+net6-1.3.9.tar.gz


Index: net6.spec
===================================================================
RCS file: /cvs/pkgs/rpms/net6/F-9/net6.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- net6.spec	1 Aug 2008 17:40:14 -0000	1.21
+++ net6.spec	26 Jan 2009 14:55:47 -0000	1.22
@@ -1,5 +1,5 @@
 Name:           net6
-Version:        1.3.6
+Version:        1.3.9
 Release:        1%{?dist}
 Summary:        A TCP protocol abstraction for library C++
 
@@ -71,6 +71,9 @@
 
 
 %changelog
+* Sun Jan 25 2009 Luke Macken <lmacken at redhat.com> - 1.3.9-1
+- Update to 1.3.9
+
 * Sat Jul 26 2008 Luke Macken <lmacken at redhat.com> - 1.3.6-1
 - Update to the latest upstream release.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/net6/F-9/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	1 Aug 2008 17:40:14 -0000	1.13
+++ sources	26 Jan 2009 14:55:47 -0000	1.14
@@ -1 +1 @@
-033734dff97af88741f41633fbe992bc  net6-1.3.6.tar.gz
+afab12d33fc201a7dbc2cfa116218079  net6-1.3.9.tar.gz



From lmacken at fedoraproject.org  Mon Jan 26 14:57:05 2009
From: lmacken at fedoraproject.org (Luke Macken)
Date: Mon, 26 Jan 2009 14:57:05 +0000 (UTC)
Subject: rpms/obby/F-10 .cvsignore, 1.13, 1.14 obby.spec, 1.32, 1.33 sources,
	1.13, 1.14
Message-ID: <20090126145705.4FD737010C@cvs1.fedora.phx.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/obby/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11197

Modified Files:
	.cvsignore obby.spec sources 
Log Message:
Update to the latest upstream version


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/obby/F-10/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	13 Sep 2008 00:16:52 -0000	1.13
+++ .cvsignore	26 Jan 2009 14:56:34 -0000	1.14
@@ -1 +1 @@
-obby-0.4.6.tar.gz
+obby-0.4.7.tar.gz


Index: obby.spec
===================================================================
RCS file: /cvs/pkgs/rpms/obby/F-10/obby.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- obby.spec	13 Sep 2008 00:16:52 -0000	1.32
+++ obby.spec	26 Jan 2009 14:56:35 -0000	1.33
@@ -1,5 +1,5 @@
 Name:           obby
-Version:        0.4.6
+Version:        0.4.7
 Release:        1%{?dist}
 Summary:        A library which provides synced document buffers
 
@@ -65,6 +65,9 @@
 
 
 %changelog
+* Sun Jan 25 2009 Luke Macken <lmacken at redhat.com> - 0.4.7-1
+- Update to 0.4.7
+
 * Thu Sep 11 2008 Luke Macken <lmacken at redhat.com> - 0.4.6-1
 - Update to the latest upstream release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/obby/F-10/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	13 Sep 2008 00:16:52 -0000	1.13
+++ sources	26 Jan 2009 14:56:35 -0000	1.14
@@ -1 +1 @@
-500c23f64249967596259daddf97f711  obby-0.4.6.tar.gz
+33fac4228c1efc1a1635bacf6480dc31  obby-0.4.7.tar.gz



From lmacken at fedoraproject.org  Mon Jan 26 14:57:53 2009
From: lmacken at fedoraproject.org (Luke Macken)
Date: Mon, 26 Jan 2009 14:57:53 +0000 (UTC)
Subject: rpms/obby/F-9 .cvsignore, 1.11, 1.12 obby.spec, 1.30, 1.31 sources, 
	1.12, 1.13
Message-ID: <20090126145753.118A47010C@cvs1.fedora.phx.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/obby/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11419

Modified Files:
	.cvsignore obby.spec sources 
Log Message:
Update to the latest upstream version


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/obby/F-9/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	26 Apr 2007 04:32:54 -0000	1.11
+++ .cvsignore	26 Jan 2009 14:57:22 -0000	1.12
@@ -1 +1 @@
-obby-0.4.4.tar.gz
+obby-0.4.7.tar.gz


Index: obby.spec
===================================================================
RCS file: /cvs/pkgs/rpms/obby/F-9/obby.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- obby.spec	1 Aug 2008 18:23:34 -0000	1.30
+++ obby.spec	26 Jan 2009 14:57:22 -0000	1.31
@@ -1,5 +1,5 @@
 Name:           obby
-Version:        0.4.5
+Version:        0.4.7
 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,12 @@
 
 
 %changelog
+* Sun Jan 25 2009 Luke Macken <lmacken at redhat.com> - 0.4.7-1
+- Update to 0.4.7
+
+* 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/F-9/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	1 Aug 2008 18:23:34 -0000	1.12
+++ sources	26 Jan 2009 14:57:22 -0000	1.13
@@ -1 +1 @@
-bc1e0d2bf7115fe53a54cb4d2d0776b7  obby-0.4.5.tar.gz
+33fac4228c1efc1a1635bacf6480dc31  obby-0.4.7.tar.gz



From lmacken at fedoraproject.org  Mon Jan 26 14:58:42 2009
From: lmacken at fedoraproject.org (Luke Macken)
Date: Mon, 26 Jan 2009 14:58:42 +0000 (UTC)
Subject: rpms/gobby/F-10 .cvsignore, 1.15, 1.16 gobby.spec, 1.31,
	1.32 sources, 1.15, 1.16
Message-ID: <20090126145842.1118E7010C@cvs1.fedora.phx.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/gobby/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11594

Modified Files:
	.cvsignore gobby.spec sources 
Log Message:
Update to the latest upstream version


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gobby/F-10/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	13 Sep 2008 00:17:43 -0000	1.15
+++ .cvsignore	26 Jan 2009 14:58:11 -0000	1.16
@@ -1 +1 @@
-gobby-0.4.7.tar.gz
+gobby-0.4.10.tar.gz


Index: gobby.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gobby/F-10/gobby.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- gobby.spec	13 Sep 2008 00:17:43 -0000	1.31
+++ gobby.spec	26 Jan 2009 14:58:11 -0000	1.32
@@ -1,10 +1,10 @@
 Name:           gobby
-Version:        0.4.7
-Release:        1%{?dist}
+Version:        0.4.10
+Release:        2%{?dist}
 Summary:        Free collaborative editor
 
 Group:          Applications/Internet
-License:        GPLv2
+License:        GPLv2+
 URL:            http://gobby.0x539.de
 Source0:        http://releases.0x539.de/gobby/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -13,6 +13,7 @@
 BuildRequires:  desktop-file-utils, libXau-devel, libXdmcp-devel
 BuildRequires:  gnome-vfs2-devel, gettext-devel
 BuildRequires:  avahi-devel, avahi-glib-devel
+BuildRequires:  intltool
 
 Requires(post): desktop-file-utils
 Requires(postun): desktop-file-utils
@@ -64,11 +65,24 @@
 %doc README NEWS AUTHORS COPYING ChangeLog
 %{_bindir}/gobby
 %{_datadir}/applications/fedora-gobby.desktop
-%{_datadir}/pixmaps/*
+%{_datadir}/icons/hicolor/48x48/apps/gobby.png
+%{_datadir}/icons/hicolor/scalable/apps/gobby.svg
+%{_datadir}/icons/HighContrastLargePrintInverse/48x48/apps/gobby.png
+%{_datadir}/icons/HighContrastLargePrintInverse/scalable/apps/gobby.svg
+%{_datadir}/pixmaps/gobby/
 %{_mandir}/man1/*
 
 
 %changelog
+* Mon Jan 26 2009 Luke Macken <lmacken at redhat.com> - 0.4.10-2
+- Add intltool to the build requirements
+
+* Sun Jan 25 2009 Luke Macken <lmacken at redhat.com> - 0.4.10-1
+- Update to 0.4.10
+
+* Fri Nov 21 2008 Luke Macken <lmacken at redhat.com> - 0.4.7-2
+- Change license tag to GPLv2+ (#461663)
+
 * 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


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gobby/F-10/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	13 Sep 2008 00:17:43 -0000	1.15
+++ sources	26 Jan 2009 14:58:11 -0000	1.16
@@ -1 +1 @@
-88b1bd42d643f73fbaac18c8973f4853  gobby-0.4.7.tar.gz
+f100f0bfa51970f0d093f870a695054f  gobby-0.4.10.tar.gz



From lmacken at fedoraproject.org  Mon Jan 26 14:59:32 2009
From: lmacken at fedoraproject.org (Luke Macken)
Date: Mon, 26 Jan 2009 14:59:32 +0000 (UTC)
Subject: rpms/gobby/F-9 .cvsignore, 1.13, 1.14 gobby.spec, 1.28, 1.29 sources,
	1.13, 1.14
Message-ID: <20090126145932.232657010C@cvs1.fedora.phx.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/gobby/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11798

Modified Files:
	.cvsignore gobby.spec sources 
Log Message:
Update to the latest upstream version


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gobby/F-9/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	21 Aug 2007 20:30:36 -0000	1.13
+++ .cvsignore	26 Jan 2009 14:59:01 -0000	1.14
@@ -1 +1 @@
-gobby-0.4.5.tar.gz
+gobby-0.4.10.tar.gz


Index: gobby.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gobby/F-9/gobby.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- gobby.spec	9 Feb 2008 04:10:25 -0000	1.28
+++ gobby.spec	26 Jan 2009 14:59:01 -0000	1.29
@@ -1,19 +1,19 @@
 Name:           gobby
-Version:        0.4.5
-Release:        3%{?dist}
+Version:        0.4.10
+Release:        2%{?dist}
 Summary:        Free collaborative editor
 
 Group:          Applications/Internet
-License:        GPLv2
+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
+BuildRequires:  intltool
 
 Requires(post): desktop-file-utils
 Requires(postun): desktop-file-utils
@@ -29,7 +29,6 @@
 
 %prep
 %setup -q
-%patch0
 
 
 %build
@@ -66,11 +65,34 @@
 %doc README NEWS AUTHORS COPYING ChangeLog
 %{_bindir}/gobby
 %{_datadir}/applications/fedora-gobby.desktop
-%{_datadir}/pixmaps/*
+%{_datadir}/icons/hicolor/48x48/apps/gobby.png
+%{_datadir}/icons/hicolor/scalable/apps/gobby.svg
+%{_datadir}/icons/HighContrastLargePrintInverse/48x48/apps/gobby.png
+%{_datadir}/icons/HighContrastLargePrintInverse/scalable/apps/gobby.svg
+%{_datadir}/pixmaps/gobby/
 %{_mandir}/man1/*
 
 
 %changelog
+* Mon Jan 26 2009 Luke Macken <lmacken at redhat.com> - 0.4.10-2
+- Add intltool to the build requirements
+
+* Sun Jan 25 2009 Luke Macken <lmacken at redhat.com> - 0.4.10-1
+- Update to 0.4.10
+
+* Fri Nov 21 2008 Luke Macken <lmacken at redhat.com> - 0.4.7-2
+- Change license tag to GPLv2+ (#461663)
+
+* 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.
+
+* Wed Jun 25 2008 Tomas Mraz <tmraz at redhat.com> - 0.4.5-4
+- rebuild with new gnutls
+
 * Fri Feb  8 2008 Luke Macken <lmacken at redhat.com> - 0.4.5-3
 - Add a patch to fix gcc4.3 compilation errors
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gobby/F-9/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	21 Aug 2007 20:30:36 -0000	1.13
+++ sources	26 Jan 2009 14:59:01 -0000	1.14
@@ -1 +1 @@
-e5501d37f4199938dfe97d30fdf14e9a  gobby-0.4.5.tar.gz
+f100f0bfa51970f0d093f870a695054f  gobby-0.4.10.tar.gz



From overholt at fedoraproject.org  Mon Jan 26 15:17:56 2009
From: overholt at fedoraproject.org (Andrew Overholt)
Date: Mon, 26 Jan 2009 15:17:56 +0000 (UTC)
Subject: rpms/eclipse-linuxprofilingframework/devel
	eclipse-linuxprofilingframework-fetch-src.sh, NONE,
	1.1 eclipse-linuxprofilingframework.spec, NONE, 1.1 import.log,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090126151756.C63C77010C@cvs1.fedora.phx.redhat.com>

Author: overholt

Update of /cvs/pkgs/rpms/eclipse-linuxprofilingframework/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15081/devel

Modified Files:
	.cvsignore sources 
Added Files:
	eclipse-linuxprofilingframework-fetch-src.sh 
	eclipse-linuxprofilingframework.spec import.log 
Log Message:
Initial import.



--- NEW FILE eclipse-linuxprofilingframework-fetch-src.sh ---
#!/bin/sh
usage="usage: $0 <tag>"
name=eclipse-linuxprofilingframework
tag=$1
tar_name=$name-fetched-src-$tag

if [ "x${tag}"x = "xx" ]; then
   echo >&2 ${usage}
   exit 1
fi

rm -fr $tar_name && mkdir $tar_name
pushd $tar_name

svn export http://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/profiling/tags/$tag/
mv $tag/* .
rmdir $tag

popd
# create archive
tar -cjf $tar_name.tar.bz2 $tar_name


--- NEW FILE eclipse-linuxprofilingframework.spec ---
%define src_repo_tag   RELEASE_0_1
%define eclipse_base   %{_libdir}/eclipse
%define install_loc    %{_datadir}/eclipse/dropins/linuxprofilingframework
# When final 0.1 release is tagged upstream, update qualifier to match
%define qualifier      200901131137

Name:           eclipse-linuxprofilingframework
Version:        0.1.0
# Including qualifier in release makes the resulting filenames too long.
# It'll be 0.1.0-1 soon enough
Release:        0.1%{?dist}
Summary:        Eclipse Linux Tools Profiling Framework

Group:          Development/Tools
License:        EPL
URL:            http://eclipse.org/linuxtools
# sh -x ./eclipse-linuxprofilingframework-fetch-src.sh %{src_repo_tag}
Source0:        %{name}-fetched-src-%{src_repo_tag}.tar.bz2
Source1:        eclipse-linuxprofilingframework-fetch-src.sh
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch: noarch

BuildRequires: eclipse-pde >= 1:3.4.0
Requires: eclipse-platform >= 1:3.4.0
BuildRequires: eclipse-cdt >= 1:4.0.0
Requires: eclipse-cdt >= 1:4.0.0

%description
Plugins common to Eclipse Linux Tools profiling tools.

%prep
%setup -q -n %{name}-fetched-src-%{src_repo_tag}

%build
%{eclipse_base}/buildscripts/pdebuild -d cdt -f org.eclipse.linuxtools.profiling.feature \
 -a "-DjavacSource=1.5 -DjavacTarget=1.5 -DforceContextQualifier=%{qualifier}" \
 -j -DJ2SE-1.5=%{_jvmdir}/java/jre/lib/rt.jar \

%install
rm -rf %{buildroot}
install -d -m 755 $RPM_BUILD_ROOT%{install_loc}

unzip -q -d $RPM_BUILD_ROOT%{install_loc} \
     build/rpmBuild/org.eclipse.linuxtools.profiling.feature.zip

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc org.eclipse.linuxtools.profiling-feature/epl-v10.html
%{install_loc}

%changelog
* Tue Jan 13 2009 Andrew Overholt <overholt at redhat.com> 0.1.0-0.1
- Initial release.  Pre-0.1.0 upstream.

--- NEW FILE import.log ---
eclipse-linuxprofilingframework-0_1_0-0_1_fc10:HEAD:eclipse-linuxprofilingframework-0.1.0-0.1.fc10.src.rpm:1232982786


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-linuxprofilingframework/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	23 Jan 2009 23:08:51 -0000	1.1
+++ .cvsignore	26 Jan 2009 15:17:26 -0000	1.2
@@ -0,0 +1 @@
+eclipse-linuxprofilingframework-fetched-src-RELEASE_0_1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-linuxprofilingframework/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	23 Jan 2009 23:08:51 -0000	1.1
+++ sources	26 Jan 2009 15:17:26 -0000	1.2
@@ -0,0 +1 @@
+c6e38824a77f6fb23dc565958f843fc2  eclipse-linuxprofilingframework-fetched-src-RELEASE_0_1.tar.bz2



From vcrhonek at fedoraproject.org  Mon Jan 26 15:22:45 2009
From: vcrhonek at fedoraproject.org (Vitezslav Crhonek)
Date: Mon, 26 Jan 2009 15:22:45 +0000 (UTC)
Subject: rpms/ypbind/devel ypbind-mt-1.20.4-nm.patch, NONE, 1.1 ypbind.spec, 
	1.56, 1.57
Message-ID: <20090126152245.F0C617010C@cvs1.fedora.phx.redhat.com>

Author: vcrhonek

Update of /cvs/extras/rpms/ypbind/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16009

Modified Files:
	ypbind.spec 
Added Files:
	ypbind-mt-1.20.4-nm.patch 
Log Message:
Fix ypbind can fail to bind if started soon after NetworkManager

ypbind-mt-1.20.4-nm.patch:

--- NEW FILE ypbind-mt-1.20.4-nm.patch ---
diff -up ypbind-mt-1.20.4/src/ypbind_dbus_nm.c.nm ypbind-mt-1.20.4/src/ypbind_dbus_nm.c
--- ypbind-mt-1.20.4/src/ypbind_dbus_nm.c.nm	2007-02-14 14:01:57.000000000 +0100
+++ ypbind-mt-1.20.4/src/ypbind_dbus_nm.c	2009-01-26 16:05:58.000000000 +0100
@@ -320,13 +320,13 @@ dbus_init (void)
       if (check_online (connection) == 1)
 	{
 	  if (debug_flag)
-	    log_msg (LOG_DEBUG, "Are already online");
-	  is_online = 1;
+	    log_msg (LOG_DEBUG, "Network is available now");
+	  go_online();
 	}
       else
 	{
 	  if (debug_flag)
-	    log_msg (LOG_DEBUG, "Are offline");
+	    log_msg (LOG_DEBUG, "No network is available now");
 	  is_online = 0;
 	}
       return 1;
diff -up ypbind-mt-1.20.4/src/ypbind-mt.c.nm ypbind-mt-1.20.4/src/ypbind-mt.c
--- ypbind-mt-1.20.4/src/ypbind-mt.c.nm	2009-01-26 16:05:58.000000000 +0100
+++ ypbind-mt-1.20.4/src/ypbind-mt.c	2009-01-26 16:05:58.000000000 +0100
@@ -765,9 +765,17 @@ main (int argc, char **argv)
 	       BINDINGDIR, strerror (errno));
       exit (1);
     }
-
-  if (!use_broadcast && (load_config (0) != 0))
-    use_broadcast = 1;
+  /*
+   * Load config if we're not using DBUS/NetworkManager, since we
+   * assume the network is available now.  If we're using NetworkManager,
+   * the config will be loaded when a network becomes available.
+   */
+  if (disable_dbus)
+    {
+      /* Load the configuration.  If the load fails, set up broadcast mode. */
+      if (!use_broadcast && (load_config (0) != 0))
+        use_broadcast = 1;
+    }
   if (use_broadcast)
     add_server (domain, NULL, 0);
 


Index: ypbind.spec
===================================================================
RCS file: /cvs/extras/rpms/ypbind/devel/ypbind.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- ypbind.spec	5 Jan 2009 14:55:47 -0000	1.56
+++ ypbind.spec	26 Jan 2009 15:22:15 -0000	1.57
@@ -1,7 +1,7 @@
 Summary: The NIS daemon which binds NIS clients to an NIS domain
 Name: ypbind
 Version: 1.20.4
-Release: 12%{?dist}
+Release: 13%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 Source0: ftp://ftp.us.kernel.org/pub/linux/utils/net/NIS/ypbind-mt-%{version}.tar.bz2
@@ -14,6 +14,7 @@
 Patch4: ypbind-mt-1.20.4-log-binds.patch
 Patch5: ypbind-mt-1.20.4-smartwrite.patch
 Patch6: ypbind-mt-1.20.4-man-port.patch
+Patch7: ypbind-mt-1.20.4-nm.patch
 
 Requires(post): chkconfig
 Requires(preun): chkconfig
@@ -51,6 +52,7 @@
 %patch4 -p1 -b .log-binds
 %patch5 -p1 -b .smartwrite
 %patch6 -p1 -b .man-port
+%patch7 -p1 -b .nm
 
 %build
 %configure --sbindir=/sbin
@@ -95,6 +97,10 @@
 %doc README NEWS
 
 %changelog
+* Mon Jan 26 2009 Vitezslav Crhonek <vcrhonek at redhat.com> - 3:1.20.4-13
+- Fix ypbind can fail to bind if started soon after NetworkManager
+  Resolves: #480096
+
 * Mon Jan  5 2009 Vitezslav Crhonek <vcrhonek at redhat.com> - 3:1.20.4-12
 - Ship helper script for dhclient
 



From rdieter at fedoraproject.org  Mon Jan 26 15:26:47 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 26 Jan 2009 15:26:47 +0000 (UTC)
Subject: rpms/phonon/devel phonon.spec,1.23,1.24
Message-ID: <20090126152647.189827010C@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/phonon/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17284

Modified Files:
	phonon.spec 
Log Message:
* Mon Jan 26 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.0-3
- BR: automoc4 >= 0.9.86



Index: phonon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/phonon/devel/phonon.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- phonon.spec	23 Jan 2009 14:14:22 -0000	1.23
+++ phonon.spec	26 Jan 2009 15:26:16 -0000	1.24
@@ -1,7 +1,7 @@
 Summary: Multimedia framework api
 Name:    phonon
 Version: 4.3.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 Group:   System Environment/Libraries
 License: LGPLv2+
@@ -18,7 +18,7 @@
 Patch1:  phonon-4.2.96-xine-pulseaudio.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires: automoc4
+BuildRequires: automoc4 >= 0.9.86
 BuildRequires: cmake >= 2.6.0
 BuildRequires: glib2-devel
 BuildRequires: gstreamer-devel
@@ -140,6 +140,9 @@
 
 
 %changelog
+* Mon Jan 26 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.0-3
+- BR: automoc4 >= 0.9.86
+
 * Fri Jan 23 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.0-2
 - fix typo in postun scriptlet (introduced in 4.2.96-3)
 



From ruben at fedoraproject.org  Mon Jan 26 15:30:55 2009
From: ruben at fedoraproject.org (Ruben Kerkhof)
Date: Mon, 26 Jan 2009 15:30:55 +0000 (UTC)
Subject: rpms/pdns/F-9 pdns.spec, 1.13, 1.14 pdns-avoid-version.patch, 1.2, 
	NONE pdns-bz461768.patch, 1.1, NONE pdns-gcc43.patch, 1.1, NONE
Message-ID: <20090126153055.5A9B67010C@cvs1.fedora.phx.redhat.com>

Author: ruben

Update of /cvs/pkgs/rpms/pdns/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18011

Modified Files:
	pdns.spec 
Removed Files:
	pdns-avoid-version.patch pdns-bz461768.patch pdns-gcc43.patch 
Log Message:
* Mon Jan 26 2009 Ruben Kerkhof <ruben at rubenkerkhof.com> 2.9.22-3
- Upstream released new version



Index: pdns.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pdns/F-9/pdns.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- pdns.spec	17 Nov 2008 09:46:03 -0000	1.13
+++ pdns.spec	26 Jan 2009 15:30:25 -0000	1.14
@@ -1,7 +1,7 @@
 Summary:	A modern, advanced and high performance authoritative-only nameserver
 Name:		pdns
-Version:	2.9.21.2
-Release:	1%{?dist}
+Version:	2.9.22
+Release:	3%{?dist}
 
 Group:		System Environment/Daemons
 License:	GPLv2
@@ -9,9 +9,6 @@
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Source0:	http://downloads.powerdns.com/releases/%{name}-%{version}.tar.gz
 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
@@ -83,9 +80,6 @@
 %prep
 %setup -q
 %patch0 -p1 -b .fixinit
-%patch1 -p1 -b .avoid-version
-%patch2 -p1
-%patch3 -p3
 
 %build
 export CPPFLAGS="-DLDAP_DEPRECATED %{optflags}"
@@ -185,6 +179,9 @@
 
 
 %changelog
+* Mon Jan 26 2009 Ruben Kerkhof <ruben at rubenkerkhof.com> 2.9.22-3
+- Upstream released new version
+
 * Mon Nov 17 2008 Ruben Kerkhof <ruben at rubenkerkhof.com> 2.9.21.2-1
 - Upstream released new version
 


--- pdns-avoid-version.patch DELETED ---


--- pdns-bz461768.patch DELETED ---


--- pdns-gcc43.patch DELETED ---



From ruben at fedoraproject.org  Mon Jan 26 15:31:52 2009
From: ruben at fedoraproject.org (Ruben Kerkhof)
Date: Mon, 26 Jan 2009 15:31:52 +0000 (UTC)
Subject: rpms/pdns/F-9 .cvsignore,1.5,1.6 sources,1.5,1.6
Message-ID: <20090126153152.D8A807010C@cvs1.fedora.phx.redhat.com>

Author: ruben

Update of /cvs/pkgs/rpms/pdns/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18263

Modified Files:
	.cvsignore sources 
Log Message:
Add sources



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pdns/F-9/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	17 Nov 2008 09:46:03 -0000	1.5
+++ .cvsignore	26 Jan 2009 15:31:22 -0000	1.6
@@ -1 +1 @@
-pdns-2.9.21.2.tar.gz
+pdns-2.9.22.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pdns/F-9/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	17 Nov 2008 09:46:03 -0000	1.5
+++ sources	26 Jan 2009 15:31:22 -0000	1.6
@@ -1 +1 @@
-2aa79c1d120a071298340ed2d4e02165  pdns-2.9.21.2.tar.gz
+8a6ff842733aca885577eb54e983a1ff  pdns-2.9.22.tar.gz



From itamarjp at fedoraproject.org  Mon Jan 26 15:32:32 2009
From: itamarjp at fedoraproject.org (Itamar Reis Peixoto)
Date: Mon, 26 Jan 2009 15:32:32 +0000 (UTC)
Subject: rpms/pg_top/devel import.log, NONE, 1.1 pg_top.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090126153232.A187C7010C@cvs1.fedora.phx.redhat.com>

Author: itamarjp

Update of /cvs/pkgs/rpms/pg_top/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18460/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log pg_top.spec 
Log Message:
Initial RPM release



--- NEW FILE import.log ---
pg_top-3_6_2-3_fc10:HEAD:pg_top-3.6.2-3.fc10.src.rpm:1232983876


--- NEW FILE pg_top.spec ---
Summary:	'top' for PostgreSQL process
Name:		pg_top
Version:	3.6.2
Release:	3%{?dist}
License:	BSD
Group:		Applications/Databases
Source0:	http://pgfoundry.org/frs/download.php/1780/%{name}-%{version}.tar.bz2
URL:		http://pgfoundry.org/projects/ptop
BuildRequires:	postgresql-devel
BuildRequires:	libtermcap-devel
BuildRequires:	elfutils-libelf-devel
Requires:	postgresql-server
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)


%description
pg_top is 'top' for PostgreSQL processes. See running queries, 
query plans, issued locks, and table and index statistics.

%prep
%setup -q -n %{name}-%{version}

%build
%configure
make %{?_smp_mflags} CFLAGS="%{optflags}"

%install
rm -rf %{buildroot}

install -Dp -m 755 %{name} %{buildroot}%{_bindir}/%{name}
install -Dp -m 644 %{name}.1 %{buildroot}%{_mandir}/man1/%{name}.1

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%{_mandir}/man1/%{name}*
%{_bindir}/%{name}
%doc FAQ HISTORY INSTALL LICENSE README TODO Y2K

%changelog
* Wed Jan 21 2009 - Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 3.6.2-3
- include %%{optflags} during compilation.
- include DOC files, including license file
- fix %%defattr
- remove pointless patch
- include BR elfutils-libelf-devel

* Wed Jan 21 2009 - Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 3.6.2-2
- Rebuild for Fedora 10

* Thu May 15 2008 - Devrim GUNDUZ <devrim at commandprompt.com> 3.6.2-1
- Update to 3.6.2

* Sat Apr 12 2008 - Devrim GUNDUZ <devrim at commandprompt.com> 3.6.2-0.1.beta3
- Rename to pg_top
- Update to 3.6.2 beta3

* Mon Mar 10 2008 - Devrim GUNDUZ <devrim at commandprompt.com> 3.6.1-1
- Update to 3.6.1

* Sun Jan 20 2008 - Devrim GUNDUZ <devrim at commandprompt.com> 3.6.1-1.beta3
- Update to 3.6.1-beta3

* Mon Dec 13 2007 - Devrim GUNDUZ <devrim at commandprompt.com> 3.6.1-1.beta2
- Initial RPM packaging for Fedora


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pg_top/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	23 Jan 2009 23:34:03 -0000	1.1
+++ .cvsignore	26 Jan 2009 15:32:02 -0000	1.2
@@ -0,0 +1 @@
+pg_top-3.6.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pg_top/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	23 Jan 2009 23:34:03 -0000	1.1
+++ sources	26 Jan 2009 15:32:02 -0000	1.2
@@ -0,0 +1 @@
+f1d7a895c4afc50a1ec05682c1f8344c  pg_top-3.6.2.tar.bz2



From nphilipp at fedoraproject.org  Mon Jan 26 15:33:17 2009
From: nphilipp at fedoraproject.org (Nils Philippsen)
Date: Mon, 26 Jan 2009 15:33:17 +0000 (UTC)
Subject: rpms/frozen-bubble/F-10 .cvsignore, 1.4, 1.5 frozen-bubble.spec,
	1.12, 1.13 sources, 1.4, 1.5
Message-ID: <20090126153317.E3A447010C@cvs1.fedora.phx.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/frozen-bubble/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18622

Modified Files:
	.cvsignore frozen-bubble.spec sources 
Log Message:
Update to 2.2.0 (#479431)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/frozen-bubble/F-10/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	29 Nov 2006 10:25:16 -0000	1.4
+++ .cvsignore	26 Jan 2009 15:32:47 -0000	1.5
@@ -1 +1 @@
-frozen-bubble-2.1.0.tar.bz2
+frozen-bubble-2.2.0.tar.bz2


Index: frozen-bubble.spec
===================================================================
RCS file: /cvs/pkgs/rpms/frozen-bubble/F-10/frozen-bubble.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- frozen-bubble.spec	6 Jul 2008 11:53:49 -0000	1.12
+++ frozen-bubble.spec	26 Jan 2009 15:32:47 -0000	1.13
@@ -1,7 +1,7 @@
 Summary: Frozen Bubble arcade game
 Name: frozen-bubble
-Version: 2.1.0
-Release: 9%{?dist}
+Version: 2.2.0
+Release: 1%{?dist}
 License: GPLv2
 Group: Amusements/Games
 URL: http://www.frozen-bubble.org/
@@ -161,6 +161,9 @@
 
 
 %changelog
+* Mon Jan 26 2009 Nils Philippsen <nils at redhat.com> 2.2.0-1
+- Update to 2.2.0 (#479431)
+
 * Sun Jul  6 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 2.1.0-9
 - Fix audio on bigendian archs (bz 454109), patch by Ian Chapman
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/frozen-bubble/F-10/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	29 Nov 2006 10:25:16 -0000	1.4
+++ sources	26 Jan 2009 15:32:47 -0000	1.5
@@ -1 +1 @@
-f5eb984897e1ccd52a0d8820d8359861  frozen-bubble-2.1.0.tar.bz2
+f7987201470d6755ed309762d348e0dd  frozen-bubble-2.2.0.tar.bz2



From nphilipp at fedoraproject.org  Mon Jan 26 15:33:30 2009
From: nphilipp at fedoraproject.org (Nils Philippsen)
Date: Mon, 26 Jan 2009 15:33:30 +0000 (UTC)
Subject: rpms/frozen-bubble/F-9 .cvsignore, 1.4, 1.5 frozen-bubble.spec, 1.12,
	1.13 sources, 1.4, 1.5
Message-ID: <20090126153330.4EE637010C@cvs1.fedora.phx.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/frozen-bubble/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18738

Modified Files:
	.cvsignore frozen-bubble.spec sources 
Log Message:
Update to 2.2.0 (#479431)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/frozen-bubble/F-9/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	29 Nov 2006 10:25:16 -0000	1.4
+++ .cvsignore	26 Jan 2009 15:33:00 -0000	1.5
@@ -1 +1 @@
-frozen-bubble-2.1.0.tar.bz2
+frozen-bubble-2.2.0.tar.bz2


Index: frozen-bubble.spec
===================================================================
RCS file: /cvs/pkgs/rpms/frozen-bubble/F-9/frozen-bubble.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- frozen-bubble.spec	6 Jul 2008 11:55:39 -0000	1.12
+++ frozen-bubble.spec	26 Jan 2009 15:33:00 -0000	1.13
@@ -1,7 +1,7 @@
 Summary: Frozen Bubble arcade game
 Name: frozen-bubble
-Version: 2.1.0
-Release: 9%{?dist}
+Version: 2.2.0
+Release: 1%{?dist}
 License: GPLv2
 Group: Amusements/Games
 URL: http://www.frozen-bubble.org/
@@ -161,6 +161,9 @@
 
 
 %changelog
+* Mon Jan 26 2009 Nils Philippsen <nils at redhat.com> 2.2.0-1
+- Update to 2.2.0 (#479431)
+
 * Sun Jul  6 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 2.1.0-9
 - Fix audio on bigendian archs (bz 454109), patch by Ian Chapman
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/frozen-bubble/F-9/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	29 Nov 2006 10:25:16 -0000	1.4
+++ sources	26 Jan 2009 15:33:00 -0000	1.5
@@ -1 +1 @@
-f5eb984897e1ccd52a0d8820d8359861  frozen-bubble-2.1.0.tar.bz2
+f7987201470d6755ed309762d348e0dd  frozen-bubble-2.2.0.tar.bz2



From itamarjp at fedoraproject.org  Mon Jan 26 15:36:34 2009
From: itamarjp at fedoraproject.org (Itamar Reis Peixoto)
Date: Mon, 26 Jan 2009 15:36:34 +0000 (UTC)
Subject: rpms/pg_top/F-10 import.log, NONE, 1.1 pg_top.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090126153634.978FF7010C@cvs1.fedora.phx.redhat.com>

Author: itamarjp

Update of /cvs/pkgs/rpms/pg_top/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19487/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	import.log pg_top.spec 
Log Message:
Initial RPM release



--- NEW FILE import.log ---
pg_top-3_6_2-3_fc10:F-10:pg_top-3.6.2-3.fc10.src.rpm:1232984021


--- NEW FILE pg_top.spec ---
Summary:	'top' for PostgreSQL process
Name:		pg_top
Version:	3.6.2
Release:	3%{?dist}
License:	BSD
Group:		Applications/Databases
Source0:	http://pgfoundry.org/frs/download.php/1780/%{name}-%{version}.tar.bz2
URL:		http://pgfoundry.org/projects/ptop
BuildRequires:	postgresql-devel
BuildRequires:	libtermcap-devel
BuildRequires:	elfutils-libelf-devel
Requires:	postgresql-server
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)


%description
pg_top is 'top' for PostgreSQL processes. See running queries, 
query plans, issued locks, and table and index statistics.

%prep
%setup -q -n %{name}-%{version}

%build
%configure
make %{?_smp_mflags} CFLAGS="%{optflags}"

%install
rm -rf %{buildroot}

install -Dp -m 755 %{name} %{buildroot}%{_bindir}/%{name}
install -Dp -m 644 %{name}.1 %{buildroot}%{_mandir}/man1/%{name}.1

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%{_mandir}/man1/%{name}*
%{_bindir}/%{name}
%doc FAQ HISTORY INSTALL LICENSE README TODO Y2K

%changelog
* Wed Jan 21 2009 - Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 3.6.2-3
- include %%{optflags} during compilation.
- include DOC files, including license file
- fix %%defattr
- remove pointless patch
- include BR elfutils-libelf-devel

* Wed Jan 21 2009 - Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 3.6.2-2
- Rebuild for Fedora 10

* Thu May 15 2008 - Devrim GUNDUZ <devrim at commandprompt.com> 3.6.2-1
- Update to 3.6.2

* Sat Apr 12 2008 - Devrim GUNDUZ <devrim at commandprompt.com> 3.6.2-0.1.beta3
- Rename to pg_top
- Update to 3.6.2 beta3

* Mon Mar 10 2008 - Devrim GUNDUZ <devrim at commandprompt.com> 3.6.1-1
- Update to 3.6.1

* Sun Jan 20 2008 - Devrim GUNDUZ <devrim at commandprompt.com> 3.6.1-1.beta3
- Update to 3.6.1-beta3

* Mon Dec 13 2007 - Devrim GUNDUZ <devrim at commandprompt.com> 3.6.1-1.beta2
- Initial RPM packaging for Fedora


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pg_top/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	23 Jan 2009 23:34:03 -0000	1.1
+++ .cvsignore	26 Jan 2009 15:36:04 -0000	1.2
@@ -0,0 +1 @@
+pg_top-3.6.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pg_top/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	23 Jan 2009 23:34:03 -0000	1.1
+++ sources	26 Jan 2009 15:36:04 -0000	1.2
@@ -0,0 +1 @@
+f1d7a895c4afc50a1ec05682c1f8344c  pg_top-3.6.2.tar.bz2



From itamarjp at fedoraproject.org  Mon Jan 26 15:39:40 2009
From: itamarjp at fedoraproject.org (Itamar Reis Peixoto)
Date: Mon, 26 Jan 2009 15:39:40 +0000 (UTC)
Subject: rpms/pg_top/F-9 import.log, NONE, 1.1 pg_top.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090126153940.2F0177010C@cvs1.fedora.phx.redhat.com>

Author: itamarjp

Update of /cvs/pkgs/rpms/pg_top/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20102/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	import.log pg_top.spec 
Log Message:
Initial RPM release



--- NEW FILE import.log ---
pg_top-3_6_2-3_fc10:F-9:pg_top-3.6.2-3.fc10.src.rpm:1232984274


--- NEW FILE pg_top.spec ---
Summary:	'top' for PostgreSQL process
Name:		pg_top
Version:	3.6.2
Release:	3%{?dist}
License:	BSD
Group:		Applications/Databases
Source0:	http://pgfoundry.org/frs/download.php/1780/%{name}-%{version}.tar.bz2
URL:		http://pgfoundry.org/projects/ptop
BuildRequires:	postgresql-devel
BuildRequires:	libtermcap-devel
BuildRequires:	elfutils-libelf-devel
Requires:	postgresql-server
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)


%description
pg_top is 'top' for PostgreSQL processes. See running queries, 
query plans, issued locks, and table and index statistics.

%prep
%setup -q -n %{name}-%{version}

%build
%configure
make %{?_smp_mflags} CFLAGS="%{optflags}"

%install
rm -rf %{buildroot}

install -Dp -m 755 %{name} %{buildroot}%{_bindir}/%{name}
install -Dp -m 644 %{name}.1 %{buildroot}%{_mandir}/man1/%{name}.1

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%{_mandir}/man1/%{name}*
%{_bindir}/%{name}
%doc FAQ HISTORY INSTALL LICENSE README TODO Y2K

%changelog
* Wed Jan 21 2009 - Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 3.6.2-3
- include %%{optflags} during compilation.
- include DOC files, including license file
- fix %%defattr
- remove pointless patch
- include BR elfutils-libelf-devel

* Wed Jan 21 2009 - Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 3.6.2-2
- Rebuild for Fedora 10

* Thu May 15 2008 - Devrim GUNDUZ <devrim at commandprompt.com> 3.6.2-1
- Update to 3.6.2

* Sat Apr 12 2008 - Devrim GUNDUZ <devrim at commandprompt.com> 3.6.2-0.1.beta3
- Rename to pg_top
- Update to 3.6.2 beta3

* Mon Mar 10 2008 - Devrim GUNDUZ <devrim at commandprompt.com> 3.6.1-1
- Update to 3.6.1

* Sun Jan 20 2008 - Devrim GUNDUZ <devrim at commandprompt.com> 3.6.1-1.beta3
- Update to 3.6.1-beta3

* Mon Dec 13 2007 - Devrim GUNDUZ <devrim at commandprompt.com> 3.6.1-1.beta2
- Initial RPM packaging for Fedora


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pg_top/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	23 Jan 2009 23:34:03 -0000	1.1
+++ .cvsignore	26 Jan 2009 15:39:09 -0000	1.2
@@ -0,0 +1 @@
+pg_top-3.6.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pg_top/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	23 Jan 2009 23:34:03 -0000	1.1
+++ sources	26 Jan 2009 15:39:09 -0000	1.2
@@ -0,0 +1 @@
+f1d7a895c4afc50a1ec05682c1f8344c  pg_top-3.6.2.tar.bz2



From s4504kr at fedoraproject.org  Mon Jan 26 15:57:59 2009
From: s4504kr at fedoraproject.org (Jochen Schmitt)
Date: Mon, 26 Jan 2009 15:57:59 +0000 (UTC)
Subject: rpms/blender/devel blender-wrapper, 1.5, 1.6 blender.spec, 1.100,
	1.101
Message-ID: <20090126155759.AC4847010C@cvs1.fedora.phx.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/blender/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23631

Modified Files:
	blender-wrapper blender.spec 
Log Message:
Do some fixes on blender-wrapper


Index: blender-wrapper
===================================================================
RCS file: /cvs/extras/rpms/blender/devel/blender-wrapper,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- blender-wrapper	26 Oct 2008 20:38:52 -0000	1.5
+++ blender-wrapper	26 Jan 2009 15:57:28 -0000	1.6
@@ -17,8 +17,18 @@
     install -d ~/.blender/plugins/texture
 
     install -d ~/.blender/scripts
-    ln -sf /usr/share/blender/scripts/bpydata ~/blender/scripts/bpydata
-    ln -sf /usr/share/blender/scripts/bpymodules ~/blender/scripts/pbymodules
+
+    if [ -L ~/.blender/scripts/bpydata ]; then
+	rm ~/.blender/scripts/bpydata
+    fi
+
+    if [ -d ~/.blender/scripts/bpydata ]; then
+	mkdir -p ~/blender/scripts/bpydata
+	mkdir -p ~/blender/scripts/bpydata/config
+	cp -R /usr/share/blender/scripts/bpydata/* ~/.blender/scripts/bpydata/
+    fi
+
+    ln -sf /usr/share/blender/scripts/bpymodules ~/.blender/scripts/pbymodules
     ln -sf /usr/share/blender/scripts/* ~/.blender/scripts/
 fi
 
@@ -26,7 +36,7 @@
 # Fully update the plugins every time blender is launched.
 #
 
-rm -r ~/.blender/scripts/*.p*
+# rm -r ~/.blender/scripts/*.p*
 
 for s in /usr/share/blender/scripts/*.p* ; do
     s=`basename $s`


Index: blender.spec
===================================================================
RCS file: /cvs/extras/rpms/blender/devel/blender.spec,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -r1.100 -r1.101
--- blender.spec	18 Jan 2009 16:10:39 -0000	1.100
+++ blender.spec	26 Jan 2009 15:57:28 -0000	1.101
@@ -5,7 +5,7 @@
 
 Name:           blender
 Version:        2.48a
-Release: 	12%{?dist}
+Release: 	13%{?dist}
 
 Summary:        3D modeling, animation, rendering and post-production
 
@@ -195,6 +195,9 @@
 %{_datadir}/mime/packages/blender.xml
 
 %changelog
+* Wed Jan 21 2009 Jochen Schmitt <Jochen herr-schmitt de> 2.48a-13
+- Do some fixes on blender-wrapeer
+
 * Sun Jan 18 2009 Jochen Schmitt <Jochen herr-schmitt de> 2.48a-12
 - Change Req. for font package because fonts naming was changed (#480444)
 



From erikos at fedoraproject.org  Mon Jan 26 16:13:29 2009
From: erikos at fedoraproject.org (Simon Schampijer)
Date: Mon, 26 Jan 2009 16:13:29 +0000 (UTC)
Subject: rpms/hulahop/F-10 .cvsignore, 1.2, 1.3 hulahop.spec, 1.7,
	1.8 sources, 1.4, 1.5
Message-ID: <20090126161329.85EB77010C@cvs1.fedora.phx.redhat.com>

Author: erikos

Update of /cvs/pkgs/rpms/hulahop/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25847

Modified Files:
	.cvsignore hulahop.spec sources 
Log Message:
* Thu Jan 26 2009 Simon Schampijer <simon at schampijer.de> - 0.4.6-5
- undo the update to 0.4.7 sources




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hulahop/F-10/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	3 Nov 2008 10:31:01 -0000	1.2
+++ .cvsignore	26 Jan 2009 16:12:59 -0000	1.3
@@ -1 +1 @@
-hulahop-0.4.7.tar.bz2
+hulahop-0.4.6.tar.bz2


Index: hulahop.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hulahop/F-10/hulahop.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- hulahop.spec	3 Nov 2008 10:31:01 -0000	1.7
+++ hulahop.spec	26 Jan 2009 16:12:59 -0000	1.8
@@ -1,8 +1,9 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name: hulahop
-Version: 0.4.7
-Release: 1%{?dist}
+Version: 0.4.6
+Release: 5%{?dist}
+Epoch: 1
 Summary: A pygtk widget for embedding mozilla
 
 Group: System Environment/Libraries
@@ -56,6 +57,9 @@
 %{python_sitearch}/*
 
 %changelog
+* Thu Jan 26 2009 Simon Schampijer <simon at schampijer.de> - 0.4.6-5
+- undo the update to 0.4.7 sources 
+
 * Thu Nov 03 2008 Simon Schampijer <simon at laptop.org> - 0.4.7-1
 - Provide the ground to make downloads and uploads work for 
 multiple instances (marco)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hulahop/F-10/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	3 Nov 2008 10:31:01 -0000	1.4
+++ sources	26 Jan 2009 16:12:59 -0000	1.5
@@ -1 +1 @@
-78e6ac1da11faab3d8e3d4bfbe35dcf3  hulahop-0.4.7.tar.bz2
+d6a1c444d2f9e052504c7edf3f849248  hulahop-0.4.6.tar.bz2



From dwalsh at fedoraproject.org  Mon Jan 26 16:21:59 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Mon, 26 Jan 2009 16:21:59 +0000 (UTC)
Subject: rpms/selinux-policy/devel policy-20090105.patch, 1.20,
	1.21 selinux-policy.spec, 1.775, 1.776
Message-ID: <20090126162159.C5DDA7010C@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27593

Modified Files:
	policy-20090105.patch selinux-policy.spec 
Log Message:
* Mon Jan 26 2009 Dan Walsh <dwalsh at redhat.com> 3.6.3-9
- More mls/rpm fixes 


policy-20090105.patch:

Index: policy-20090105.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-20090105.patch,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- policy-20090105.patch	23 Jan 2009 21:48:22 -0000	1.20
+++ policy-20090105.patch	26 Jan 2009 16:21:58 -0000	1.21
@@ -561,10 +561,54 @@
  	pcmcia_use_cardmgr_fds(ping_t)
  ')
  
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/prelink.fc serefpolicy-3.6.3/policy/modules/admin/prelink.fc
+--- nsaserefpolicy/policy/modules/admin/prelink.fc	2008-08-07 11:15:13.000000000 -0400
++++ serefpolicy-3.6.3/policy/modules/admin/prelink.fc	2009-01-26 09:28:03.000000000 -0500
+@@ -5,3 +5,5 @@
+ 
+ /var/log/prelink\.log		--	gen_context(system_u:object_r:prelink_log_t,s0)
+ /var/log/prelink(/.*)?			gen_context(system_u:object_r:prelink_log_t,s0)
++
++/var/lib/misc/prelink\*		--	gen_context(system_u:object_r:prelink_var_lib_t,s0)
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/prelink.if serefpolicy-3.6.3/policy/modules/admin/prelink.if
+--- nsaserefpolicy/policy/modules/admin/prelink.if	2008-11-11 16:13:49.000000000 -0500
++++ serefpolicy-3.6.3/policy/modules/admin/prelink.if	2009-01-26 09:29:12.000000000 -0500
+@@ -120,3 +120,23 @@
+ 	logging_search_logs($1)
+ 	manage_files_pattern($1, prelink_log_t, prelink_log_t)
+ ')
++
++########################################
++## <summary>
++##	Create, read, write, and delete
++##	prelink var_lib files.
++## </summary>
++## <param name="file_type">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`prelink_manage_var_lib',`
++	gen_require(`
++		type prelink_var_lib_t;
++	')
++
++	files_search_var_lib($1)
++	manage_files_pattern($1, prelink_var_lib_t, prelink_var_lib_t)
++')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/prelink.te serefpolicy-3.6.3/policy/modules/admin/prelink.te
 --- nsaserefpolicy/policy/modules/admin/prelink.te	2009-01-05 15:39:44.000000000 -0500
-+++ serefpolicy-3.6.3/policy/modules/admin/prelink.te	2009-01-19 13:10:02.000000000 -0500
-@@ -26,7 +26,7 @@
++++ serefpolicy-3.6.3/policy/modules/admin/prelink.te	2009-01-26 09:33:41.000000000 -0500
+@@ -21,12 +21,15 @@
+ type prelink_tmp_t;
+ files_tmp_file(prelink_tmp_t)
+ 
++type prelink_var_lib_t;
++files_tmp_file(prelink_var_lib_t)
++
+ ########################################
+ #
  # Local policy
  #
  
@@ -573,7 +617,7 @@
  allow prelink_t self:process { execheap execmem execstack signal };
  allow prelink_t self:fifo_file rw_fifo_file_perms;
  
-@@ -40,7 +40,7 @@
+@@ -40,17 +43,20 @@
  read_lnk_files_pattern(prelink_t, prelink_log_t, prelink_log_t)
  logging_log_filetrans(prelink_t, prelink_log_t, file)
  
@@ -582,7 +626,12 @@
  files_tmp_filetrans(prelink_t, prelink_tmp_t, file)
  fs_tmpfs_filetrans(prelink_t, prelink_tmp_t, file)
  
-@@ -49,8 +49,7 @@
++manage_dirs_pattern(prelink_t, prelink_var_lib_t, prelink_var_lib_t)
++manage_files_pattern(prelink_t, prelink_var_lib_t, prelink_var_lib_t)
++files_search_var_lib(prelink_t)
++
+ # prelink misc objects that are not system
+ # libraries or entrypoints
  allow prelink_t prelink_object:file { manage_file_perms execute relabelto relabelfrom };
  
  kernel_read_system_state(prelink_t)
@@ -592,7 +641,7 @@
  
  corecmd_manage_all_executables(prelink_t)
  corecmd_relabel_all_executables(prelink_t)
-@@ -65,6 +64,8 @@
+@@ -65,6 +71,8 @@
  files_read_etc_files(prelink_t)
  files_read_etc_runtime_files(prelink_t)
  files_dontaudit_read_all_symlinks(prelink_t)
@@ -601,19 +650,17 @@
  
  fs_getattr_xattr_fs(prelink_t)
  
-@@ -81,6 +82,11 @@
+@@ -81,6 +89,9 @@
  
  userdom_use_user_terminals(prelink_t)
  
 +# prelink executables in the user homedir
-+userdom_manage_user_home_content_files(prelink_t)
-+userdom_mmap_user_home_content_files(prelink_t)
-+userdom_manage_user_home_content_symlinks(prelink_t)
++userdom_manage_home_role(system_r, prelink_t)
 +
  optional_policy(`
  	amanda_manage_lib(prelink_t)
  ')
-@@ -88,3 +94,7 @@
+@@ -88,3 +99,7 @@
  optional_policy(`
  	cron_system_entry(prelink_t, prelink_exec_t)
  ')
@@ -656,7 +703,7 @@
  ifdef(`distro_suse', `
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/rpm.if serefpolicy-3.6.3/policy/modules/admin/rpm.if
 --- nsaserefpolicy/policy/modules/admin/rpm.if	2008-11-11 16:13:49.000000000 -0500
-+++ serefpolicy-3.6.3/policy/modules/admin/rpm.if	2009-01-19 13:10:02.000000000 -0500
++++ serefpolicy-3.6.3/policy/modules/admin/rpm.if	2009-01-26 08:58:21.000000000 -0500
 @@ -146,6 +146,24 @@
  
  ########################################
@@ -989,7 +1036,7 @@
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/rpm.te serefpolicy-3.6.3/policy/modules/admin/rpm.te
 --- nsaserefpolicy/policy/modules/admin/rpm.te	2009-01-19 11:07:34.000000000 -0500
-+++ serefpolicy-3.6.3/policy/modules/admin/rpm.te	2009-01-19 13:10:02.000000000 -0500
++++ serefpolicy-3.6.3/policy/modules/admin/rpm.te	2009-01-26 09:14:27.000000000 -0500
 @@ -31,6 +31,9 @@
  files_type(rpm_var_lib_t)
  typealias rpm_var_lib_t alias var_lib_rpm_t;
@@ -1000,16 +1047,18 @@
  type rpm_script_t;
  type rpm_script_exec_t;
  domain_obj_id_change_exemption(rpm_script_t)
-@@ -52,7 +55,8 @@
+@@ -52,8 +55,9 @@
  # 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:process ~{ ptrace setcurrent setexec setfscreate setrlimit execmem execstack execheap };
 +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 ~{ ptrace setcurrent setexec setfscreate setrlimit execstack execheap };
  allow rpm_t self:process { getattr setexec setfscreate setrlimit };
  allow rpm_t self:fd use;
+ allow rpm_t self:fifo_file rw_fifo_file_perms;
 @@ -68,6 +72,8 @@
  allow rpm_t self:sem create_sem_perms;
  allow rpm_t self:msgq create_msgq_perms;
@@ -1032,15 +1081,16 @@
  
  corecmd_exec_all_executables(rpm_t)
  
-@@ -115,6 +125,7 @@
+@@ -115,6 +125,8 @@
  fs_manage_nfs_symlinks(rpm_t)
  fs_getattr_all_fs(rpm_t)
  fs_search_auto_mountpoints(rpm_t)
 +fs_list_inotifyfs(rpm_t)
++fs_getattr_all_fs(rpm_t)
  
  mls_file_read_all_levels(rpm_t)
  mls_file_write_all_levels(rpm_t)
-@@ -132,6 +143,8 @@
+@@ -132,6 +144,8 @@
  # for installing kernel packages
  storage_raw_read_fixed_disk(rpm_t)
  
@@ -1049,7 +1099,15 @@
  auth_relabel_all_files_except_shadow(rpm_t)
  auth_manage_all_files_except_shadow(rpm_t)
  auth_dontaudit_read_shadow(rpm_t)
-@@ -174,10 +187,20 @@
+@@ -155,6 +169,7 @@
+ files_exec_etc_files(rpm_t)
+ 
+ init_domtrans_script(rpm_t)
++init_use_script_ptys(rpm_t)
+ 
+ libs_exec_ld_so(rpm_t)
+ libs_exec_lib_files(rpm_t)
+@@ -174,10 +189,20 @@
  ')
  
  optional_policy(`
@@ -1070,7 +1128,7 @@
  	prelink_domtrans(rpm_t)
  ')
  
-@@ -185,6 +208,7 @@
+@@ -185,6 +210,7 @@
  	unconfined_domain(rpm_t)
  	# yum-updatesd requires this
  	unconfined_dbus_chat(rpm_t)
@@ -1078,18 +1136,18 @@
  ')
  
  ifdef(`TODO',`
-@@ -210,8 +234,8 @@
+@@ -210,8 +236,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: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:capability { chown dac_override dac_read_search fowner fsetid setgid setuid ipc_lock sys_admin sys_chroot sys_ptrace sys_nice mknod kill net_admin };
 +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;
-@@ -222,12 +246,15 @@
+@@ -222,12 +248,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 };
@@ -1105,7 +1163,24 @@
  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)
-@@ -272,12 +299,15 @@
+@@ -239,6 +268,8 @@
+ 
+ kernel_read_kernel_sysctls(rpm_script_t)
+ kernel_read_system_state(rpm_script_t)
++kernel_read_network_state(rpm_script_t)
++kernel_list_all_proc(rpm_script_t)
+ 
+ dev_list_sysfs(rpm_script_t)
+ 
+@@ -255,6 +286,7 @@
+ fs_mount_xattr_fs(rpm_script_t)
+ fs_unmount_xattr_fs(rpm_script_t)
+ fs_search_auto_mountpoints(rpm_script_t)
++fs_getattr_all_fs(rpm_script_t)
+ 
+ mcs_killall(rpm_script_t)
+ mcs_ptrace_all(rpm_script_t)
+@@ -272,14 +304,19 @@
  storage_raw_read_fixed_disk(rpm_script_t)
  storage_raw_write_fixed_disk(rpm_script_t)
  
@@ -1120,8 +1195,12 @@
 +auth_relabel_shadow(rpm_script_t)
  
  corecmd_exec_all_executables(rpm_script_t)
++can_exec(rpm_script_t, rpm_script_tmp_t)
++can_exec(rpm_script_t, rpm_script_tmpfs_t)
  
-@@ -291,6 +321,7 @@
+ domain_read_all_domains_state(rpm_script_t)
+ domain_getattr_all_domains(rpm_script_t)
+@@ -291,6 +328,7 @@
  files_exec_etc_files(rpm_script_t)
  files_read_etc_runtime_files(rpm_script_t)
  files_exec_usr_files(rpm_script_t)
@@ -1129,15 +1208,18 @@
  
  init_domtrans_script(rpm_script_t)
  
-@@ -308,6 +339,7 @@
+@@ -308,8 +346,10 @@
  seutil_domtrans_loadpolicy(rpm_script_t)
  seutil_domtrans_setfiles(rpm_script_t)
  seutil_domtrans_semanage(rpm_script_t)
 +seutil_domtrans_setsebool(rpm_script_t)
  
  userdom_use_all_users_fds(rpm_script_t)
++userdom_exec_admin_home_files(rpm_script_t)
  
-@@ -326,6 +358,10 @@
+ ifdef(`distro_redhat',`
+ 	optional_policy(`
+@@ -326,6 +366,10 @@
  ')
  
  optional_policy(`
@@ -1148,7 +1230,7 @@
  	tzdata_domtrans(rpm_t)
  	tzdata_domtrans(rpm_script_t)
  ')
-@@ -333,6 +369,7 @@
+@@ -333,6 +377,7 @@
  optional_policy(`
  	unconfined_domain(rpm_script_t)
  	unconfined_domtrans(rpm_script_t)
@@ -5472,7 +5554,7 @@
 +/dev/shm		-d	gen_context(system_u:object_r:tmpfs_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/filesystem.if serefpolicy-3.6.3/policy/modules/kernel/filesystem.if
 --- nsaserefpolicy/policy/modules/kernel/filesystem.if	2009-01-05 15:39:38.000000000 -0500
-+++ serefpolicy-3.6.3/policy/modules/kernel/filesystem.if	2009-01-21 13:00:37.000000000 -0500
++++ serefpolicy-3.6.3/policy/modules/kernel/filesystem.if	2009-01-26 08:55:48.000000000 -0500
 @@ -534,6 +534,24 @@
  
  ########################################
@@ -5916,16 +5998,35 @@
  #
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/kernel.if serefpolicy-3.6.3/policy/modules/kernel/kernel.if
 --- nsaserefpolicy/policy/modules/kernel/kernel.if	2009-01-05 15:39:38.000000000 -0500
-+++ serefpolicy-3.6.3/policy/modules/kernel/kernel.if	2009-01-21 17:29:54.000000000 -0500
-@@ -1197,6 +1197,7 @@
++++ serefpolicy-3.6.3/policy/modules/kernel/kernel.if	2009-01-26 08:54:44.000000000 -0500
+@@ -1197,6 +1197,26 @@
  	')
  
  	dontaudit $1 proc_type:dir list_dir_perms;
 +	dontaudit $1 proc_type:file getattr;
++')
++
++########################################
++## <summary>
++##	Allow attempts to list all proc directories.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain to not audit.
++##	</summary>
++## </param>
++#
++interface(`kernel_list_all_proc',`
++	gen_require(`
++		attribute proc_type;
++	')
++
++	allow $1 proc_type:dir list_dir_perms;
++	allow $1 proc_type:file getattr;
  ')
  
  ########################################
-@@ -1233,9 +1234,11 @@
+@@ -1233,9 +1253,11 @@
  interface(`kernel_read_sysctl',`
  	gen_require(`
  		type sysctl_t;
@@ -5937,7 +6038,7 @@
  ')
  
  ########################################
-@@ -1568,6 +1571,26 @@
+@@ -1568,6 +1590,26 @@
  
  ########################################
  ## <summary>
@@ -5964,7 +6065,7 @@
  ##	Read generic kernel sysctls.
  ## </summary>
  ## <param name="domain">
-@@ -1767,6 +1790,7 @@
+@@ -1767,6 +1809,7 @@
  	')
  
  	dontaudit $1 sysctl_type:dir list_dir_perms;
@@ -5972,7 +6073,7 @@
  ')
  
  ########################################
-@@ -2580,6 +2604,24 @@
+@@ -2580,6 +2623,24 @@
  
  ########################################
  ## <summary>
@@ -5997,7 +6098,7 @@
  ##	Unconfined access to kernel module resources.
  ## </summary>
  ## <param name="domain">
-@@ -2595,3 +2637,23 @@
+@@ -2595,3 +2656,23 @@
  
  	typeattribute $1 kern_unconfined;
  ')
@@ -6975,7 +7076,7 @@
  ##	requiring the caller to use setexeccon().
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/roles/sysadm.te serefpolicy-3.6.3/policy/modules/roles/sysadm.te
 --- nsaserefpolicy/policy/modules/roles/sysadm.te	2009-01-19 11:07:34.000000000 -0500
-+++ serefpolicy-3.6.3/policy/modules/roles/sysadm.te	2009-01-19 13:10:02.000000000 -0500
++++ serefpolicy-3.6.3/policy/modules/roles/sysadm.te	2009-01-26 09:04:25.000000000 -0500
 @@ -15,7 +15,7 @@
  
  role sysadm_r;
@@ -7138,7 +7239,7 @@
  	quota_run(sysadm_t, sysadm_r)
  ')
  
-@@ -320,10 +254,6 @@
+@@ -320,22 +254,10 @@
  ')
  
  optional_policy(`
@@ -7149,10 +7250,11 @@
  	rpc_domtrans_nfsd(sysadm_t)
  ')
  
-@@ -332,10 +262,6 @@
- ')
- 
  optional_policy(`
+-	rpm_run(sysadm_t, sysadm_r)
+-')
+-
+-optional_policy(`
 -	rssh_role(sysadm_r, sysadm_t)
 -')
 -
@@ -7160,7 +7262,7 @@
  	rsync_exec(sysadm_t)
  ')
  
-@@ -345,10 +271,6 @@
+@@ -345,10 +267,6 @@
  ')
  
  optional_policy(`
@@ -7171,7 +7273,7 @@
  	secadm_role_change(sysadm_r)
  ')
  
-@@ -358,35 +280,15 @@
+@@ -358,35 +276,15 @@
  ')
  
  optional_policy(`
@@ -7207,7 +7309,7 @@
  	tripwire_run_siggen(sysadm_t, sysadm_r)
  	tripwire_run_tripwire(sysadm_t, sysadm_r)
  	tripwire_run_twadmin(sysadm_t, sysadm_r)
-@@ -394,18 +296,10 @@
+@@ -394,18 +292,10 @@
  ')
  
  optional_policy(`
@@ -7226,7 +7328,7 @@
  	unconfined_domtrans(sysadm_t)
  ')
  
-@@ -418,20 +312,12 @@
+@@ -418,20 +308,12 @@
  ')
  
  optional_policy(`
@@ -7247,7 +7349,7 @@
  	vpn_run(sysadm_t, sysadm_r)
  ')
  
-@@ -440,13 +326,5 @@
+@@ -440,13 +322,5 @@
  ')
  
  optional_policy(`
@@ -10438,7 +10540,7 @@
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cron.te serefpolicy-3.6.3/policy/modules/services/cron.te
 --- nsaserefpolicy/policy/modules/services/cron.te	2009-01-19 11:06:49.000000000 -0500
-+++ serefpolicy-3.6.3/policy/modules/services/cron.te	2009-01-23 15:14:37.000000000 -0500
++++ serefpolicy-3.6.3/policy/modules/services/cron.te	2009-01-26 09:29:38.000000000 -0500
 @@ -38,6 +38,10 @@
  type cron_var_lib_t;
  files_type(cron_var_lib_t)
@@ -10671,7 +10773,15 @@
  ')
  
  optional_policy(`
-@@ -460,8 +529,7 @@
+@@ -447,6 +516,7 @@
+ 	prelink_read_cache(system_cronjob_t)
+ 	prelink_manage_log(system_cronjob_t)
+ 	prelink_delete_cache(system_cronjob_t)
++	prelink_manage_var_lib(system_cronjob_t)
+ ')
+ 
+ optional_policy(`
+@@ -460,8 +530,7 @@
  ')
  
  optional_policy(`
@@ -10681,7 +10791,7 @@
  ')
  
  optional_policy(`
-@@ -469,24 +537,17 @@
+@@ -469,24 +538,17 @@
  ')
  
  optional_policy(`
@@ -10709,7 +10819,7 @@
  allow cronjob_t self:process { signal_perms setsched };
  allow cronjob_t self:fifo_file rw_fifo_file_perms;
  allow cronjob_t self:unix_stream_socket create_stream_socket_perms;
-@@ -570,6 +631,9 @@
+@@ -570,6 +632,9 @@
  userdom_manage_user_home_content_sockets(cronjob_t)
  #userdom_user_home_dir_filetrans_user_home_content(cronjob_t, notdevfile_class_set)
  
@@ -13777,7 +13887,7 @@
 -#')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mta.if serefpolicy-3.6.3/policy/modules/services/mta.if
 --- nsaserefpolicy/policy/modules/services/mta.if	2009-01-19 11:06:49.000000000 -0500
-+++ serefpolicy-3.6.3/policy/modules/services/mta.if	2009-01-19 13:10:02.000000000 -0500
++++ serefpolicy-3.6.3/policy/modules/services/mta.if	2009-01-26 09:31:15.000000000 -0500
 @@ -130,6 +130,15 @@
  		sendmail_create_log($1_mail_t)
  	')
@@ -18605,8 +18715,16 @@
  		mysql_search_db(httpd_prewikka_script_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/procmail.te serefpolicy-3.6.3/policy/modules/services/procmail.te
 --- nsaserefpolicy/policy/modules/services/procmail.te	2009-01-19 11:06:49.000000000 -0500
-+++ serefpolicy-3.6.3/policy/modules/services/procmail.te	2009-01-19 13:10:02.000000000 -0500
-@@ -128,6 +128,10 @@
++++ serefpolicy-3.6.3/policy/modules/services/procmail.te	2009-01-26 09:31:20.000000000 -0500
+@@ -92,6 +92,7 @@
+ userdom_dontaudit_search_user_home_dirs(procmail_t)
+ 
+ mta_manage_spool(procmail_t)
++mta_read_queue(procmail_t)
+ 
+ ifdef(`hide_broken_symptoms',`
+ 	mta_dontaudit_rw_queue(procmail_t)
+@@ -128,6 +129,10 @@
  ')
  
  optional_policy(`
@@ -18617,7 +18735,7 @@
  	pyzor_domtrans(procmail_t)
  	pyzor_signal(procmail_t)
  ')
-@@ -148,3 +152,7 @@
+@@ -148,3 +153,7 @@
  	spamassassin_domtrans_client(procmail_t)
  	spamassassin_read_lib_files(procmail_t)
  ')
@@ -22818,7 +22936,7 @@
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.te serefpolicy-3.6.3/policy/modules/services/xserver.te
 --- nsaserefpolicy/policy/modules/services/xserver.te	2009-01-19 11:06:49.000000000 -0500
-+++ serefpolicy-3.6.3/policy/modules/services/xserver.te	2009-01-23 16:45:11.000000000 -0500
++++ serefpolicy-3.6.3/policy/modules/services/xserver.te	2009-01-26 09:17:40.000000000 -0500
 @@ -34,6 +34,13 @@
  
  ## <desc>
@@ -23347,7 +23465,11 @@
  
  # Label pid and temporary files with derived types.
  manage_files_pattern(xserver_t, xdm_tmp_t, xdm_tmp_t)
-@@ -830,6 +960,10 @@
+@@ -827,9 +957,14 @@
+ # to read ROLE_home_t - examine this in more detail
+ # (xauth?)
+ userdom_read_user_home_content_files(xserver_t)
++userdom_read_all_users_state(xserver_t)
  
  xserver_use_user_fonts(xserver_t)
  
@@ -23358,7 +23480,7 @@
  tunable_policy(`use_nfs_home_dirs',`
  	fs_manage_nfs_dirs(xserver_t)
  	fs_manage_nfs_files(xserver_t)
-@@ -844,11 +978,14 @@
+@@ -844,11 +979,14 @@
  
  optional_policy(`
  	dbus_system_bus_client(xserver_t)
@@ -23374,7 +23496,7 @@
  ')
  
  optional_policy(`
-@@ -856,6 +993,11 @@
+@@ -856,6 +994,11 @@
  	rhgb_rw_tmpfs_files(xserver_t)
  ')
  
@@ -23386,7 +23508,7 @@
  ########################################
  #
  # Rules common to all X window domains
-@@ -972,6 +1114,37 @@
+@@ -972,6 +1115,37 @@
  allow xserver_unconfined_type { x_domain xserver_t }:x_resource *;
  allow xserver_unconfined_type xevent_type:{ x_event x_synthetic_event } *;
  
@@ -23424,7 +23546,7 @@
  ifdef(`TODO',`
  tunable_policy(`allow_polyinstantiation',`
  # xdm needs access for linking .X11-unix to poly /tmp
-@@ -986,3 +1159,13 @@
+@@ -986,3 +1160,13 @@
  #
  allow xdm_t user_home_type:file unlink;
  ') dnl end TODO
@@ -23995,7 +24117,7 @@
  /sbin/partx		--	gen_context(system_u:object_r:fsadm_exec_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/fstools.te serefpolicy-3.6.3/policy/modules/system/fstools.te
 --- nsaserefpolicy/policy/modules/system/fstools.te	2009-01-05 15:39:43.000000000 -0500
-+++ serefpolicy-3.6.3/policy/modules/system/fstools.te	2009-01-19 13:10:02.000000000 -0500
++++ serefpolicy-3.6.3/policy/modules/system/fstools.te	2009-01-26 11:19:02.000000000 -0500
 @@ -97,6 +97,10 @@
  fs_getattr_tmpfs_dirs(fsadm_t)
  fs_read_tmpfs_symlinks(fsadm_t)
@@ -24007,7 +24129,17 @@
  mls_file_read_all_levels(fsadm_t)
  mls_file_write_all_levels(fsadm_t)
  
-@@ -182,4 +186,9 @@
+@@ -150,8 +154,7 @@
+ 
+ seutil_read_config(fsadm_t)
+ 
+-userdom_use_user_terminals(fsadm_t)
+-userdom_use_unpriv_users_fds(fsadm_t)
++term_use_all_terms(fsadm_t)
+ 
+ tunable_policy(`read_default_t',`
+ 	files_list_default(fsadm_t)
+@@ -182,4 +185,9 @@
  
  optional_policy(`
  	xen_append_log(fsadm_t)
@@ -24055,7 +24187,7 @@
  #
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.if serefpolicy-3.6.3/policy/modules/system/init.if
 --- nsaserefpolicy/policy/modules/system/init.if	2009-01-05 15:39:43.000000000 -0500
-+++ serefpolicy-3.6.3/policy/modules/system/init.if	2009-01-21 16:19:55.000000000 -0500
++++ serefpolicy-3.6.3/policy/modules/system/init.if	2009-01-26 11:20:14.000000000 -0500
 @@ -280,6 +280,27 @@
  			kernel_dontaudit_use_fds($1)
  		')
@@ -25141,7 +25273,7 @@
 +/var/run/dmevent.*		gen_context(system_u:object_r:lvm_var_run_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/lvm.te serefpolicy-3.6.3/policy/modules/system/lvm.te
 --- nsaserefpolicy/policy/modules/system/lvm.te	2009-01-19 11:07:34.000000000 -0500
-+++ serefpolicy-3.6.3/policy/modules/system/lvm.te	2009-01-20 15:26:33.000000000 -0500
++++ serefpolicy-3.6.3/policy/modules/system/lvm.te	2009-01-26 11:20:23.000000000 -0500
 @@ -10,6 +10,9 @@
  type clvmd_exec_t;
  init_daemon_domain(clvmd_t,clvmd_exec_t)
@@ -25298,11 +25430,12 @@
  
  fs_getattr_xattr_fs(lvm_t)
  fs_search_auto_mountpoints(lvm_t)
-@@ -239,12 +276,16 @@
+@@ -239,12 +276,17 @@
  storage_dev_filetrans_fixed_disk(lvm_t)
  # Access raw devices and old /dev/lvm (c 109,0).  Is this needed?
  storage_manage_fixed_disk(lvm_t)
 +mls_file_read_all_levels(lvm_t)
++mls_file_write_to_clearance(lvm_t)
 +
 +term_use_all_terms(lvm_t)
  
@@ -25315,7 +25448,15 @@
  files_read_etc_files(lvm_t)
  files_read_etc_runtime_files(lvm_t)
  # for when /usr is not mounted:
-@@ -283,5 +324,18 @@
+@@ -253,6 +295,7 @@
+ init_use_fds(lvm_t)
+ init_dontaudit_getattr_initctl(lvm_t)
+ init_use_script_ptys(lvm_t)
++init_read_script_state(lvm_t)
+ 
+ logging_send_syslog_msg(lvm_t)
+ 
+@@ -283,5 +326,22 @@
  ')
  
  optional_policy(`
@@ -25323,6 +25464,10 @@
 +')
 +
 +optional_policy(`
++	rpm_manage_script_tmp_files(lvm_t)
++')
++
++optional_policy(`
  	udev_read_db(lvm_t)
  ')
 +
@@ -25334,6 +25479,17 @@
 +	xen_append_log(lvm_t)
 +	xen_dontaudit_rw_unix_stream_sockets(lvm_t)
 +')
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/miscfiles.fc serefpolicy-3.6.3/policy/modules/system/miscfiles.fc
+--- nsaserefpolicy/policy/modules/system/miscfiles.fc	2008-08-07 11:15:12.000000000 -0400
++++ serefpolicy-3.6.3/policy/modules/system/miscfiles.fc	2009-01-26 09:39:13.000000000 -0500
+@@ -35,6 +35,7 @@
+ /usr/lib(64)?/perl5/man(/.*)?	gen_context(system_u:object_r:man_t,s0)
+ 
+ /usr/local/man(/.*)?		gen_context(system_u:object_r:man_t,s0)
++/usr/local/share/man(/.*)?	gen_context(system_u:object_r:man_t,s0)
+ 
+ /usr/local/share/fonts(/.*)?	gen_context(system_u:object_r:fonts_t,s0)
+ 
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/miscfiles.if serefpolicy-3.6.3/policy/modules/system/miscfiles.if
 --- nsaserefpolicy/policy/modules/system/miscfiles.if	2008-08-07 11:15:12.000000000 -0400
 +++ serefpolicy-3.6.3/policy/modules/system/miscfiles.if	2009-01-21 13:05:22.000000000 -0500
@@ -26180,7 +26336,7 @@
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.te serefpolicy-3.6.3/policy/modules/system/selinuxutil.te
 --- nsaserefpolicy/policy/modules/system/selinuxutil.te	2009-01-19 11:07:34.000000000 -0500
-+++ serefpolicy-3.6.3/policy/modules/system/selinuxutil.te	2009-01-19 13:10:02.000000000 -0500
++++ serefpolicy-3.6.3/policy/modules/system/selinuxutil.te	2009-01-26 09:04:44.000000000 -0500
 @@ -23,6 +23,9 @@
  type selinux_config_t;
  files_type(selinux_config_t)
@@ -26300,7 +26456,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
-@@ -383,7 +391,6 @@
+@@ -383,10 +391,10 @@
  
  auth_use_nsswitch(run_init_t)
  auth_domtrans_chk_passwd(run_init_t)
@@ -26308,7 +26464,22 @@
  auth_dontaudit_read_shadow(run_init_t)
  
  init_spec_domtrans_script(run_init_t)
-@@ -421,61 +428,22 @@
++	
+ # for utmp
+ init_rw_utmp(run_init_t)
+ 
+@@ -406,6 +414,10 @@
+ 	')
+ ')
+ 
++optional_policy(`
++	rpm_domtrans(run_init_t)
++')
++
+ ifdef(`distro_ubuntu',`
+ 	optional_policy(`
+ 		unconfined_domain(run_init_t)
+@@ -421,61 +433,22 @@
  # semodule local policy
  #
  
@@ -26316,22 +26487,22 @@
 -allow semanage_t self:unix_stream_socket create_stream_socket_perms;
 -allow semanage_t self:unix_dgram_socket create_socket_perms;
 -allow semanage_t self:netlink_audit_socket { create_netlink_socket_perms nlmsg_relay };
--
++seutil_semanage_policy(semanage_t)
++allow semanage_t self:fifo_file rw_fifo_file_perms;
+ 
 -allow semanage_t policy_config_t:file rw_file_perms;
--
++manage_dirs_pattern(semanage_t, selinux_var_lib_t,  selinux_var_lib_t)
++manage_files_pattern(semanage_t, selinux_var_lib_t,  selinux_var_lib_t)
+ 
 -allow semanage_t semanage_tmp_t:dir manage_dir_perms;
 -allow semanage_t semanage_tmp_t:file manage_file_perms;
 -files_tmp_filetrans(semanage_t, semanage_tmp_t, { file dir })
 -
 -kernel_read_system_state(semanage_t)
 -kernel_read_kernel_sysctls(semanage_t)
-+seutil_semanage_policy(semanage_t)
-+allow semanage_t self:fifo_file rw_fifo_file_perms;
- 
+-
 -corecmd_exec_bin(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)
- 
+-
 -dev_read_urand(semanage_t)
 -
 -domain_use_interactive_fds(semanage_t)
@@ -26352,14 +26523,14 @@
 +can_exec(semanage_t, semanage_exec_t)
  
 -term_use_all_terms(semanage_t)
--
++# Admins are creating pp files in random locations
++auth_read_all_files_except_shadow(semanage_t)
+ 
 -# Running genhomedircon requires this for finding all users
 -auth_use_nsswitch(semanage_t)
 -
 -locallogin_use_fds(semanage_t)
-+# Admins are creating pp files in random locations
-+auth_read_all_files_except_shadow(semanage_t)
- 
+-
 -logging_send_syslog_msg(semanage_t)
 -
 -miscfiles_read_localization(semanage_t)
@@ -26378,7 +26549,7 @@
  # netfilter_contexts:
  seutil_manage_default_contexts(semanage_t)
  
-@@ -484,12 +452,23 @@
+@@ -484,12 +457,23 @@
  	files_read_var_lib_symlinks(semanage_t)
  ')
  
@@ -26402,7 +26573,7 @@
  # cjp: need a more general way to handle this:
  ifdef(`enable_mls',`
  	# read secadm tmp files
-@@ -499,111 +478,36 @@
+@@ -499,111 +483,36 @@
  	userdom_read_user_tmp_files(semanage_t)
  ')
  
@@ -26484,15 +26655,15 @@
 -userdom_use_all_users_fds(setfiles_t)
 -# for config files in a home directory
 -userdom_read_user_home_content_files(setfiles_t)
-+init_dontaudit_use_fds(setsebool_t)
- 
+-
 -ifdef(`distro_debian',`
 -	# udev tmpfs is populated with static device nodes
 -	# and then relabeled afterwards; thus
 -	# /dev/console has the tmpfs type
 -	fs_rw_tmpfs_chr_files(setfiles_t)
 -')
--
++init_dontaudit_use_fds(setsebool_t)
+ 
 -ifdef(`distro_redhat', `
 -	fs_rw_tmpfs_chr_files(setfiles_t)
 -	fs_rw_tmpfs_blk_files(setfiles_t)
@@ -27642,7 +27813,7 @@
 +/dev/shm/mono.*		gen_context(system_u:object_r:user_tmpfs_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-3.6.3/policy/modules/system/userdomain.if
 --- nsaserefpolicy/policy/modules/system/userdomain.if	2009-01-19 11:07:34.000000000 -0500
-+++ serefpolicy-3.6.3/policy/modules/system/userdomain.if	2009-01-23 15:07:13.000000000 -0500
++++ serefpolicy-3.6.3/policy/modules/system/userdomain.if	2009-01-26 09:38:49.000000000 -0500
 @@ -30,8 +30,9 @@
  	')
  
@@ -28969,43 +29140,87 @@
  ##	Create, read, write, and delete files
  ##	in a user home subdirectory.
  ## </summary>
-@@ -1921,6 +2108,36 @@
+@@ -1921,7 +2108,7 @@
  
  ########################################
  ## <summary>
+-##	Create objects in a user home directory
 +##	Create objects in the /root directory
-+##	with an automatic type transition to
+ ##	with an automatic type transition to
+ ##	a specified private type.
+ ## </summary>
+@@ -1941,34 +2128,64 @@
+ ##	</summary>
+ ## </param>
+ #
+-interface(`userdom_user_home_content_filetrans',`
++interface(`userdom_admin_home_dir_filetrans',`
+ 	gen_require(`
+-		type user_home_dir_t, user_home_t;
++		type admin_home_t;
+ 	')
+ 
+-	filetrans_pattern($1, user_home_t, $2, $3)
+-	allow $1 user_home_dir_t:dir search_dir_perms;
+-	files_search_home($1)
++	filetrans_pattern($1, admin_home_t, $2, $3)
+ ')
+ 
+ ########################################
+ ## <summary>
+ ##	Create objects in a user home directory
+ ##	with an automatic type transition to
+-##	the user home file type.
 +##	a specified private type.
-+## </summary>
-+## <param name="domain">
-+##	<summary>
-+##	Domain allowed access.
-+##	</summary>
-+## </param>
+ ## </summary>
+ ## <param name="domain">
+ ##	<summary>
+ ##	Domain allowed access.
+ ##	</summary>
+ ## </param>
 +## <param name="private_type">
 +##	<summary>
 +##	The type of the object to create.
 +##	</summary>
 +## </param>
-+## <param name="object_class">
-+##	<summary>
-+##	The class of the object to be created.
-+##	</summary>
-+## </param>
-+#
-+interface(`userdom_admin_home_dir_filetrans',`
+ ## <param name="object_class">
+ ##	<summary>
+ ##	The class of the object to be created.
+ ##	</summary>
+ ## </param>
+ #
+-interface(`userdom_user_home_dir_filetrans_user_home_content',`
++interface(`userdom_user_home_content_filetrans',`
 +	gen_require(`
-+		type admin_home_t;
++		type user_home_dir_t, user_home_t;
 +	')
 +
-+	filetrans_pattern($1, admin_home_t, $2, $3)
++	filetrans_pattern($1, user_home_t, $2, $3)
++	allow $1 user_home_dir_t:dir search_dir_perms;
++	files_search_home($1)
 +')
 +
 +########################################
 +## <summary>
- ##	Create objects in a user home directory
- ##	with an automatic type transition to
- ##	a specified private type.
++##	Create objects in a user home directory
++##	with an automatic type transition to
++##	the user home file type.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++## <param name="object_class">
++##	<summary>
++##	The class of the object to be created.
++##	</summary>
++## </param>
++#
++interface(`userdom_user_home_dir_filetrans_user_home_content',`
+ 	gen_require(`
+ 		type user_home_dir_t, user_home_t;
+ 	')
 @@ -2819,6 +3036,24 @@
  
  ########################################
@@ -29064,7 +29279,7 @@
  ##	Send a dbus message to all user domains.
  ## </summary>
  ## <param name="domain">
-@@ -2981,3 +3235,264 @@
+@@ -2981,3 +3235,284 @@
  
  	allow $1 userdomain:dbus send_msg;
  ')
@@ -29329,6 +29544,26 @@
 +
 +	allow $1 user_home_t:file execmod;
 +')
++
++########################################
++## <summary>
++##	Execute user home files.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++## <rolecap/>
++#
++interface(`userdom_exec_admin_home_files',`
++	gen_require(`
++		type admin_home_t;
++	')
++
++	exec_files_pattern($1, admin_home_t, admin_home_t)
++')
++
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-3.6.3/policy/modules/system/userdomain.te
 --- nsaserefpolicy/policy/modules/system/userdomain.te	2009-01-19 11:07:34.000000000 -0500
 +++ serefpolicy-3.6.3/policy/modules/system/userdomain.te	2009-01-19 13:10:02.000000000 -0500


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.775
retrieving revision 1.776
diff -u -r1.775 -r1.776
--- selinux-policy.spec	23 Jan 2009 20:35:45 -0000	1.775
+++ selinux-policy.spec	26 Jan 2009 16:21:59 -0000	1.776
@@ -20,7 +20,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.6.3
-Release: 8%{?dist}
+Release: 9%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -444,6 +444,9 @@
 %endif
 
 %changelog
+* Mon Jan 26 2009 Dan Walsh <dwalsh at redhat.com> 3.6.3-9
+- More mls/rpm fixes 
+
 * Fri Jan 23 2009 Dan Walsh <dwalsh at redhat.com> 3.6.3-8
 - Add policy to make dbus/nm-applet work
 



From peter at fedoraproject.org  Mon Jan 26 16:43:28 2009
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Mon, 26 Jan 2009 16:43:28 +0000 (UTC)
Subject: rpms/ejabberd/devel ejabberd.sysconfig, NONE, 1.1 .cvsignore, 1.11, 
	1.12 ejabberd.init, 1.6, 1.7 ejabberd.spec, 1.32,
	1.33 import.log, 1.6, 1.7 sources, 1.13, 1.14
Message-ID: <20090126164328.C20757010C@cvs1.fedora.phx.redhat.com>

Author: peter

Update of /cvs/pkgs/rpms/ejabberd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31342/devel

Modified Files:
	.cvsignore ejabberd.init ejabberd.spec import.log sources 
Added Files:
	ejabberd.sysconfig 
Log Message:
Ver. 2.0.3


--- NEW FILE ejabberd.sysconfig ---
## Settings for ejabberd

## Where should ejabberd find its configuration file?
#
#CONFIG_FILE=/etc/ejabberd/ejabberd.cfg

## ULIMIT_MAX_FILES alters the number of files that ejabberd is
## allowed to have open at once.  If it is unset the system default
## (usually 1024) will be used.  ejabberd will want over twice as many
## open files as it has active connections, so if you have a few
## hundred or more users you will want to set this.
#
#ULIMIT_MAX_FILES=1024


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ejabberd/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	29 Aug 2008 20:16:17 -0000	1.11
+++ .cvsignore	26 Jan 2009 16:42:58 -0000	1.12
@@ -1 +1 @@
-ejabberd-2.0.2.tar.gz
+ejabberd-2.0.3.tar.gz


Index: ejabberd.init
===================================================================
RCS file: /cvs/pkgs/rpms/ejabberd/devel/ejabberd.init,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ejabberd.init	22 Jun 2008 18:56:07 -0000	1.6
+++ ejabberd.init	26 Jan 2009 16:42:58 -0000	1.7
@@ -17,15 +17,26 @@
 
 . /etc/rc.d/init.d/functions
 
+if [ -r /etc/sysconfig/ejabberd ]; then
+	. /etc/sysconfig/ejabberd
+fi
+
+if [ ! "$CONFIG_FILE" ]; then
+	CONFIG_FILE=/etc/ejabberd/ejabberd.cfg
+fi
+
 node=`hostname -s`
 
 start() {
         echo -n $"Starting ejabberd: "
+	if [ "$ULIMIT_MAX_FILES" ]; then
+		ulimit -n $ULIMIT_MAX_FILES
+	fi
         daemon --user=ejabberd --check=ejabberd \
 	    "erl" "-pa @libdir@/ejabberd/ebin \
                    -sname ejabberd \
                    -s ejabberd \
-                   -ejabberd config \\\"/etc/ejabberd/ejabberd.cfg\\\" \
+                   -ejabberd config \\\"$CONFIG_FILE\\\" \
                              log_path \\\"/var/log/ejabberd/ejabberd.log\\\" \
                    -sasl sasl_error_logger \\{file,\\\"/var/log/ejabberd/sasl.log\\\"\\} \
                    -mnesia dir \\\"/var/lib/ejabberd/spool\\\" \


Index: ejabberd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ejabberd/devel/ejabberd.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- ejabberd.spec	16 Jan 2009 08:58:57 -0000	1.32
+++ ejabberd.spec	26 Jan 2009 16:42:58 -0000	1.33
@@ -1,6 +1,6 @@
 Name:           ejabberd
-Version:        2.0.2
-Release:        4%{?dist}
+Version:        2.0.3
+Release:        1%{?dist}
 Summary:        A distributed, fault-tolerant Jabber/XMPP server
 
 Group:          Applications/Internet
@@ -9,6 +9,7 @@
 Source0:        http://www.process-one.net/downloads/%{name}/%{version}/%{name}-%{version}.tar.gz
 Source1:        ejabberd.init
 Source2:        ejabberd.logrotate
+Source3:	ejabberd.sysconfig
 
 # http://www.ejabberd.im/mod_ctlextra
 # svn export -r 557 https://svn.process-one.net/ejabberd-modules/mod_ctlextra/trunk/src/mod_ctlextra.erl
@@ -151,12 +152,14 @@
 install -D -p -m 0644 %{S:10} %{buildroot}%{_sysconfdir}/security/console.apps/ejabberdctl
 install -D -p -m 0644 %{S:11} %{buildroot}%{_sysconfdir}/pam.d/ejabberd
 
-mkdir -p %{buildroot}%{_initrddir}
-install -p -m 0755 %{S:1} %{buildroot}%{_initrddir}/ejabberd
-chmod a+x %{buildroot}%{_initrddir}/ejabberd
+# install init-script
+install -D -p -m 0755 %{S:1} %{buildroot}%{_initrddir}/ejabberd
 
-mkdir -p %{buildroot}%{_sysconfdir}/logrotate.d
-cp -p %{S:2} %{buildroot}%{_sysconfdir}/logrotate.d/ejabberd
+# install config for logrotate
+install -D -p -m 0644  %{S:2} %{buildroot}%{_sysconfdir}/logrotate.d/ejabberd
+
+# install sysconfig file
+install -D -p -m 0644  %{S:3} %{buildroot}%{_sysconfdir}/sysconfig/ejabberd
 
 %{__perl} -pi -e 's!\@libdir\@!%{_libdir}!g'  %{buildroot}%{_initrddir}/ejabberd %{buildroot}%{_sysconfdir}/logrotate.d/ejabberd %{buildroot}%{_sbindir}/ejabberdctl
 %{__perl} -pi -e 's!\@version\@!%{version}!g' %{buildroot}%{_initrddir}/ejabberd %{buildroot}%{_sysconfdir}/logrotate.d/ejabberd %{buildroot}%{_sbindir}/ejabberdctl
@@ -178,7 +181,7 @@
 
 %{_initrddir}/ejabberd
 %config(noreplace) %{_sysconfdir}/logrotate.d/ejabberd
-
+%config(noreplace) %{_sysconfdir}/sysconfig/ejabberd
 %config(noreplace) %{_sysconfdir}/pam.d/ejabberd
 %config(noreplace) %{_sysconfdir}/pam.d/ejabberdctl
 %config(noreplace) %{_sysconfdir}/security/console.apps/ejabberdctl
@@ -211,6 +214,10 @@
 %endif
 
 %changelog
+* Mon Jan 26 2009 Peter Lemenkov <lemenkov at gmail.com> 2.0.3-1
+- Ver. 2.0.3
+- Merged some stuff from git://dev.laptop.org/users/martin/ejabberd-xs.git
+
 * Fri Jan 16 2009 Tomas Mraz <tmraz at redhat.com> 2.0.2-4
 - rebuild with new openssl
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/ejabberd/devel/import.log,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- import.log	2 Oct 2008 05:28:56 -0000	1.6
+++ import.log	26 Jan 2009 16:42:58 -0000	1.7
@@ -4,3 +4,4 @@
 ejabberd-2_0_2-0_3_beta1_fc9:HEAD:ejabberd-2.0.2-0.3.beta1.fc9.src.rpm:1218350775
 ejabberd-2_0_2-1_fc9:HEAD:ejabberd-2.0.2-1.fc9.src.rpm:1220040866
 ejabberd-2_0_2-3_fc9:HEAD:ejabberd-2.0.2-3.fc9.src.rpm:1222925272
+ejabberd-2_0_3-1_fc10:HEAD:ejabberd-2.0.3-1.fc10.src.rpm:1232988133


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ejabberd/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	29 Aug 2008 20:16:17 -0000	1.13
+++ sources	26 Jan 2009 16:42:58 -0000	1.14
@@ -1 +1 @@
-eef7ab12fc1e3ed34669bb2d5e1d0448  ejabberd-2.0.2.tar.gz
+b647e74b0f94f030bd8747c8a8a4d0f9  ejabberd-2.0.3.tar.gz



From ruben at fedoraproject.org  Mon Jan 26 16:44:29 2009
From: ruben at fedoraproject.org (Ruben Kerkhof)
Date: Mon, 26 Jan 2009 16:44:29 +0000 (UTC)
Subject: rpms/pdns/EL-5 .cvsignore, 1.5, 1.6 pdns.spec, 1.9, 1.10 sources,
	1.5, 
	1.6 pdns-avoid-version.patch, 1.2, NONE pdns-bz461768.patch, 1.1, NONE
Message-ID: <20090126164429.59A067010C@cvs1.fedora.phx.redhat.com>

Author: ruben

Update of /cvs/pkgs/rpms/pdns/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31548

Modified Files:
	.cvsignore pdns.spec sources 
Removed Files:
	pdns-avoid-version.patch pdns-bz461768.patch 
Log Message:
* Mon Jan 26 2009 Ruben Kerkhof <ruben at rubenkerkhof.com> 2.9.22-3
- Upstream released new version



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pdns/EL-5/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	17 Nov 2008 10:15:05 -0000	1.5
+++ .cvsignore	26 Jan 2009 16:43:59 -0000	1.6
@@ -1 +1 @@
-pdns-2.9.21.2.tar.gz
+pdns-2.9.22.tar.gz


Index: pdns.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pdns/EL-5/pdns.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- pdns.spec	17 Nov 2008 10:15:05 -0000	1.9
+++ pdns.spec	26 Jan 2009 16:43:59 -0000	1.10
@@ -1,7 +1,7 @@
 Summary:	A modern, advanced and high performance authoritative-only nameserver
 Name:		pdns
-Version:	2.9.21.2
-Release:	1%{?dist}
+Version:	2.9.22
+Release:	3%{?dist}
 
 Group:		System Environment/Daemons
 License:	GPLv2
@@ -9,8 +9,6 @@
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 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,8 +80,6 @@
 %prep
 %setup -q
 %patch0 -p1 -b .fixinit
-%patch1 -p1 -b .avoid-version
-%patch2 -p3
 
 %build
 export CPPFLAGS="-DLDAP_DEPRECATED %{optflags}"
@@ -183,7 +179,10 @@
 
 
 %changelog
-* Mon Nov 17 2008 Ruben Kerkhof <ruben at rubenkerkhof.com> 29.21.2-1
+* Mon Jan 26 2009 Ruben Kerkhof <ruben at rubenkerkhof.com> 2.9.22-3
+- Upstream released new version
+
+* Mon Nov 17 2008 Ruben Kerkhof <ruben at rubenkerkhof.com> 2.9.21.2-1
 - Upstream released new version
 
 * Fri Sep 12 2008 Ruben Kerkhof <ruben at rubenkerkhof.com> 2.9.21.1-2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pdns/EL-5/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	17 Nov 2008 10:15:05 -0000	1.5
+++ sources	26 Jan 2009 16:43:59 -0000	1.6
@@ -1 +1 @@
-2aa79c1d120a071298340ed2d4e02165  pdns-2.9.21.2.tar.gz
+8a6ff842733aca885577eb54e983a1ff  pdns-2.9.22.tar.gz


--- pdns-avoid-version.patch DELETED ---


--- pdns-bz461768.patch DELETED ---



From peter at fedoraproject.org  Mon Jan 26 16:46:12 2009
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Mon, 26 Jan 2009 16:46:12 +0000 (UTC)
Subject: rpms/ejabberd/F-10 ejabberd.sysconfig, NONE, 1.1 .cvsignore, 1.11, 
	1.12 ejabberd.init, 1.6, 1.7 ejabberd.spec, 1.31,
	1.32 import.log, 1.6, 1.7 sources, 1.13, 1.14
Message-ID: <20090126164612.1CDCF7010C@cvs1.fedora.phx.redhat.com>

Author: peter

Update of /cvs/pkgs/rpms/ejabberd/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31866/F-10

Modified Files:
	.cvsignore ejabberd.init ejabberd.spec import.log sources 
Added Files:
	ejabberd.sysconfig 
Log Message:
Ver. 2.0.3


--- NEW FILE ejabberd.sysconfig ---
## Settings for ejabberd

## Where should ejabberd find its configuration file?
#
#CONFIG_FILE=/etc/ejabberd/ejabberd.cfg

## ULIMIT_MAX_FILES alters the number of files that ejabberd is
## allowed to have open at once.  If it is unset the system default
## (usually 1024) will be used.  ejabberd will want over twice as many
## open files as it has active connections, so if you have a few
## hundred or more users you will want to set this.
#
#ULIMIT_MAX_FILES=1024


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ejabberd/F-10/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	29 Aug 2008 20:16:17 -0000	1.11
+++ .cvsignore	26 Jan 2009 16:45:41 -0000	1.12
@@ -1 +1 @@
-ejabberd-2.0.2.tar.gz
+ejabberd-2.0.3.tar.gz


Index: ejabberd.init
===================================================================
RCS file: /cvs/pkgs/rpms/ejabberd/F-10/ejabberd.init,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ejabberd.init	22 Jun 2008 18:56:07 -0000	1.6
+++ ejabberd.init	26 Jan 2009 16:45:41 -0000	1.7
@@ -17,15 +17,26 @@
 
 . /etc/rc.d/init.d/functions
 
+if [ -r /etc/sysconfig/ejabberd ]; then
+	. /etc/sysconfig/ejabberd
+fi
+
+if [ ! "$CONFIG_FILE" ]; then
+	CONFIG_FILE=/etc/ejabberd/ejabberd.cfg
+fi
+
 node=`hostname -s`
 
 start() {
         echo -n $"Starting ejabberd: "
+	if [ "$ULIMIT_MAX_FILES" ]; then
+		ulimit -n $ULIMIT_MAX_FILES
+	fi
         daemon --user=ejabberd --check=ejabberd \
 	    "erl" "-pa @libdir@/ejabberd/ebin \
                    -sname ejabberd \
                    -s ejabberd \
-                   -ejabberd config \\\"/etc/ejabberd/ejabberd.cfg\\\" \
+                   -ejabberd config \\\"$CONFIG_FILE\\\" \
                              log_path \\\"/var/log/ejabberd/ejabberd.log\\\" \
                    -sasl sasl_error_logger \\{file,\\\"/var/log/ejabberd/sasl.log\\\"\\} \
                    -mnesia dir \\\"/var/lib/ejabberd/spool\\\" \


Index: ejabberd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ejabberd/F-10/ejabberd.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- ejabberd.spec	2 Oct 2008 05:28:56 -0000	1.31
+++ ejabberd.spec	26 Jan 2009 16:45:41 -0000	1.32
@@ -1,6 +1,6 @@
 Name:           ejabberd
-Version:        2.0.2
-Release:        3%{?dist}
+Version:        2.0.3
+Release:        1%{?dist}
 Summary:        A distributed, fault-tolerant Jabber/XMPP server
 
 Group:          Applications/Internet
@@ -9,6 +9,7 @@
 Source0:        http://www.process-one.net/downloads/%{name}/%{version}/%{name}-%{version}.tar.gz
 Source1:        ejabberd.init
 Source2:        ejabberd.logrotate
+Source3:	ejabberd.sysconfig
 
 # http://www.ejabberd.im/mod_ctlextra
 # svn export -r 557 https://svn.process-one.net/ejabberd-modules/mod_ctlextra/trunk/src/mod_ctlextra.erl
@@ -151,12 +152,14 @@
 install -D -p -m 0644 %{S:10} %{buildroot}%{_sysconfdir}/security/console.apps/ejabberdctl
 install -D -p -m 0644 %{S:11} %{buildroot}%{_sysconfdir}/pam.d/ejabberd
 
-mkdir -p %{buildroot}%{_initrddir}
-install -p -m 0755 %{S:1} %{buildroot}%{_initrddir}/ejabberd
-chmod a+x %{buildroot}%{_initrddir}/ejabberd
+# install init-script
+install -D -p -m 0755 %{S:1} %{buildroot}%{_initrddir}/ejabberd
 
-mkdir -p %{buildroot}%{_sysconfdir}/logrotate.d
-cp -p %{S:2} %{buildroot}%{_sysconfdir}/logrotate.d/ejabberd
+# install config for logrotate
+install -D -p -m 0644  %{S:2} %{buildroot}%{_sysconfdir}/logrotate.d/ejabberd
+
+# install sysconfig file
+install -D -p -m 0644  %{S:3} %{buildroot}%{_sysconfdir}/sysconfig/ejabberd
 
 %{__perl} -pi -e 's!\@libdir\@!%{_libdir}!g'  %{buildroot}%{_initrddir}/ejabberd %{buildroot}%{_sysconfdir}/logrotate.d/ejabberd %{buildroot}%{_sbindir}/ejabberdctl
 %{__perl} -pi -e 's!\@version\@!%{version}!g' %{buildroot}%{_initrddir}/ejabberd %{buildroot}%{_sysconfdir}/logrotate.d/ejabberd %{buildroot}%{_sbindir}/ejabberdctl
@@ -178,7 +181,7 @@
 
 %{_initrddir}/ejabberd
 %config(noreplace) %{_sysconfdir}/logrotate.d/ejabberd
-
+%config(noreplace) %{_sysconfdir}/sysconfig/ejabberd
 %config(noreplace) %{_sysconfdir}/pam.d/ejabberd
 %config(noreplace) %{_sysconfdir}/pam.d/ejabberdctl
 %config(noreplace) %{_sysconfdir}/security/console.apps/ejabberdctl
@@ -211,6 +214,13 @@
 %endif
 
 %changelog
+* Mon Jan 26 2009 Peter Lemenkov <lemenkov at gmail.com> 2.0.3-1
+- Ver. 2.0.3
+- Merged some stuff from git://dev.laptop.org/users/martin/ejabberd-xs.git
+
+* Fri Jan 16 2009 Tomas Mraz <tmraz at redhat.com> 2.0.2-4
+- rebuild with new openssl
+
 * Thu Oct  2 2008 Peter Lemenkov <lemenkov at gmail.com> 2.0.2-3
 - Fixed broken ejabberdctl (BZ# 465196)
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/ejabberd/F-10/import.log,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- import.log	2 Oct 2008 05:28:56 -0000	1.6
+++ import.log	26 Jan 2009 16:45:41 -0000	1.7
@@ -4,3 +4,4 @@
 ejabberd-2_0_2-0_3_beta1_fc9:HEAD:ejabberd-2.0.2-0.3.beta1.fc9.src.rpm:1218350775
 ejabberd-2_0_2-1_fc9:HEAD:ejabberd-2.0.2-1.fc9.src.rpm:1220040866
 ejabberd-2_0_2-3_fc9:HEAD:ejabberd-2.0.2-3.fc9.src.rpm:1222925272
+ejabberd-2_0_3-1_fc10:F-10:ejabberd-2.0.3-1.fc10.src.rpm:1232988288


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ejabberd/F-10/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	29 Aug 2008 20:16:17 -0000	1.13
+++ sources	26 Jan 2009 16:45:41 -0000	1.14
@@ -1 +1 @@
-eef7ab12fc1e3ed34669bb2d5e1d0448  ejabberd-2.0.2.tar.gz
+b647e74b0f94f030bd8747c8a8a4d0f9  ejabberd-2.0.3.tar.gz



From atkac at fedoraproject.org  Mon Jan 26 16:47:55 2009
From: atkac at fedoraproject.org (Adam Tkac)
Date: Mon, 26 Jan 2009 16:47:55 +0000 (UTC)
Subject: rpms/vnc/F-9 .cvsignore, 1.24, 1.25 sources, 1.25, 1.26 vnc.spec,
	1.193, 1.194
Message-ID: <20090126164755.898477010C@cvs1.fedora.phx.redhat.com>

Author: atkac

Update of /cvs/pkgs/rpms/vnc/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32148

Modified Files:
	.cvsignore sources vnc.spec 
Log Message:
- CVE-2008-4770



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/vnc/F-9/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- .cvsignore	11 Mar 2008 12:50:34 -0000	1.24
+++ .cvsignore	26 Jan 2009 16:47:25 -0000	1.25
@@ -1 +1 @@
-vnc-4_1_2-unixsrc.tar.gz
+vnc-4_1_3-unixsrc.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/vnc/F-9/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- sources	11 Mar 2008 12:50:34 -0000	1.25
+++ sources	26 Jan 2009 16:47:25 -0000	1.26
@@ -1 +1 @@
-cf9a6fe8f592286b5e0fdde686504ffb  vnc-4_1_2-unixsrc.tar.gz
+a119f3c75ad2767c0588260e2abe39be  vnc-4_1_3-unixsrc.tar.gz


Index: vnc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vnc/F-9/vnc.spec,v
retrieving revision 1.193
retrieving revision 1.194
diff -u -r1.193 -r1.194
--- vnc.spec	12 Nov 2008 13:35:14 -0000	1.193
+++ vnc.spec	26 Jan 2009 16:47:25 -0000	1.194
@@ -1,10 +1,10 @@
-%define vnc_version 4_1_2
+%define vnc_version 4_1_3
 %define _default_patch_fuzz 2
 
 Summary:   A remote display system
 Name:      vnc
-Version:   4.1.2
-Release:   32%{?dist}
+Version:   4.1.3
+Release:   1%{?dist}
 URL:       http://www.realvnc.com
 Source0:   http://www.realvnc.com/dist/vnc-%{vnc_version}-unixsrc.tar.gz
 Source1:   Makefile.am
@@ -332,6 +332,9 @@
 %{_libdir}/librfb.so.*
 
 %changelog
+* Mon Jan 26 2009 Adam Tkac <atkac redhat com> 4.1.3-1
+- updated to 4.1.3 (CVE-2008-4770)
+
 * Wed Nov 12 2008 Adam Tkac <atkac redhat com> 4.1.2-32
 - minor correction in configure flags to make GLX working (#471166)
 



From peter at fedoraproject.org  Mon Jan 26 16:49:42 2009
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Mon, 26 Jan 2009 16:49:42 +0000 (UTC)
Subject: rpms/ejabberd/F-9 ejabberd.sysconfig, NONE, 1.1 .cvsignore, 1.10,
	1.11 ejabberd.init, 1.6, 1.7 ejabberd.spec, 1.28,
	1.29 import.log, 1.4, 1.5 sources, 1.12, 1.13
Message-ID: <20090126164942.CF02B7010C@cvs1.fedora.phx.redhat.com>

Author: peter

Update of /cvs/pkgs/rpms/ejabberd/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32538/F-9

Modified Files:
	.cvsignore ejabberd.init ejabberd.spec import.log sources 
Added Files:
	ejabberd.sysconfig 
Log Message:
Ver. 2.0.3


--- NEW FILE ejabberd.sysconfig ---
## Settings for ejabberd

## Where should ejabberd find its configuration file?
#
#CONFIG_FILE=/etc/ejabberd/ejabberd.cfg

## ULIMIT_MAX_FILES alters the number of files that ejabberd is
## allowed to have open at once.  If it is unset the system default
## (usually 1024) will be used.  ejabberd will want over twice as many
## open files as it has active connections, so if you have a few
## hundred or more users you will want to set this.
#
#ULIMIT_MAX_FILES=1024


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ejabberd/F-9/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	29 Aug 2008 20:18:07 -0000	1.10
+++ .cvsignore	26 Jan 2009 16:49:12 -0000	1.11
@@ -1 +1 @@
-ejabberd-2.0.2.tar.gz
+ejabberd-2.0.3.tar.gz


Index: ejabberd.init
===================================================================
RCS file: /cvs/pkgs/rpms/ejabberd/F-9/ejabberd.init,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ejabberd.init	22 Jun 2008 18:59:20 -0000	1.6
+++ ejabberd.init	26 Jan 2009 16:49:12 -0000	1.7
@@ -17,15 +17,26 @@
 
 . /etc/rc.d/init.d/functions
 
+if [ -r /etc/sysconfig/ejabberd ]; then
+	. /etc/sysconfig/ejabberd
+fi
+
+if [ ! "$CONFIG_FILE" ]; then
+	CONFIG_FILE=/etc/ejabberd/ejabberd.cfg
+fi
+
 node=`hostname -s`
 
 start() {
         echo -n $"Starting ejabberd: "
+	if [ "$ULIMIT_MAX_FILES" ]; then
+		ulimit -n $ULIMIT_MAX_FILES
+	fi
         daemon --user=ejabberd --check=ejabberd \
 	    "erl" "-pa @libdir@/ejabberd/ebin \
                    -sname ejabberd \
                    -s ejabberd \
-                   -ejabberd config \\\"/etc/ejabberd/ejabberd.cfg\\\" \
+                   -ejabberd config \\\"$CONFIG_FILE\\\" \
                              log_path \\\"/var/log/ejabberd/ejabberd.log\\\" \
                    -sasl sasl_error_logger \\{file,\\\"/var/log/ejabberd/sasl.log\\\"\\} \
                    -mnesia dir \\\"/var/lib/ejabberd/spool\\\" \


Index: ejabberd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ejabberd/F-9/ejabberd.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- ejabberd.spec	2 Oct 2008 05:35:43 -0000	1.28
+++ ejabberd.spec	26 Jan 2009 16:49:12 -0000	1.29
@@ -1,6 +1,6 @@
 Name:           ejabberd
-Version:        2.0.2
-Release:        3%{?dist}
+Version:        2.0.3
+Release:        1%{?dist}
 Summary:        A distributed, fault-tolerant Jabber/XMPP server
 
 Group:          Applications/Internet
@@ -9,6 +9,7 @@
 Source0:        http://www.process-one.net/downloads/%{name}/%{version}/%{name}-%{version}.tar.gz
 Source1:        ejabberd.init
 Source2:        ejabberd.logrotate
+Source3:	ejabberd.sysconfig
 
 # http://www.ejabberd.im/mod_ctlextra
 # svn export -r 557 https://svn.process-one.net/ejabberd-modules/mod_ctlextra/trunk/src/mod_ctlextra.erl
@@ -151,12 +152,14 @@
 install -D -p -m 0644 %{S:10} %{buildroot}%{_sysconfdir}/security/console.apps/ejabberdctl
 install -D -p -m 0644 %{S:11} %{buildroot}%{_sysconfdir}/pam.d/ejabberd
 
-mkdir -p %{buildroot}%{_initrddir}
-install -p -m 0755 %{S:1} %{buildroot}%{_initrddir}/ejabberd
-chmod a+x %{buildroot}%{_initrddir}/ejabberd
+# install init-script
+install -D -p -m 0755 %{S:1} %{buildroot}%{_initrddir}/ejabberd
 
-mkdir -p %{buildroot}%{_sysconfdir}/logrotate.d
-cp -p %{S:2} %{buildroot}%{_sysconfdir}/logrotate.d/ejabberd
+# install config for logrotate
+install -D -p -m 0644  %{S:2} %{buildroot}%{_sysconfdir}/logrotate.d/ejabberd
+
+# install sysconfig file
+install -D -p -m 0644  %{S:3} %{buildroot}%{_sysconfdir}/sysconfig/ejabberd
 
 %{__perl} -pi -e 's!\@libdir\@!%{_libdir}!g'  %{buildroot}%{_initrddir}/ejabberd %{buildroot}%{_sysconfdir}/logrotate.d/ejabberd %{buildroot}%{_sbindir}/ejabberdctl
 %{__perl} -pi -e 's!\@version\@!%{version}!g' %{buildroot}%{_initrddir}/ejabberd %{buildroot}%{_sysconfdir}/logrotate.d/ejabberd %{buildroot}%{_sbindir}/ejabberdctl
@@ -178,7 +181,7 @@
 
 %{_initrddir}/ejabberd
 %config(noreplace) %{_sysconfdir}/logrotate.d/ejabberd
-
+%config(noreplace) %{_sysconfdir}/sysconfig/ejabberd
 %config(noreplace) %{_sysconfdir}/pam.d/ejabberd
 %config(noreplace) %{_sysconfdir}/pam.d/ejabberdctl
 %config(noreplace) %{_sysconfdir}/security/console.apps/ejabberdctl
@@ -211,6 +214,13 @@
 %endif
 
 %changelog
+* Mon Jan 26 2009 Peter Lemenkov <lemenkov at gmail.com> 2.0.3-1
+- Ver. 2.0.3
+- Merged some stuff from git://dev.laptop.org/users/martin/ejabberd-xs.git
+
+* Fri Jan 16 2009 Tomas Mraz <tmraz at redhat.com> 2.0.2-4
+- rebuild with new openssl
+
 * Thu Oct  2 2008 Peter Lemenkov <lemenkov at gmail.com> 2.0.2-3
 - Fixed broken ejabberdctl (BZ# 465196)
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/ejabberd/F-9/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- import.log	2 Oct 2008 05:35:43 -0000	1.4
+++ import.log	26 Jan 2009 16:49:12 -0000	1.5
@@ -2,3 +2,4 @@
 ejabberd-2_0_1-4_fc9:F-9:ejabberd-2.0.1-4.fc9.src.rpm:1214161076
 ejabberd-2_0_2-1_fc9:F-9:ejabberd-2.0.2-1.fc9.src.rpm:1220041051
 ejabberd-2_0_2-3_fc9:F-9:ejabberd-2.0.2-3.fc9.src.rpm:1222925461
+ejabberd-2_0_3-1_fc10:F-9:ejabberd-2.0.3-1.fc10.src.rpm:1232988519


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ejabberd/F-9/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	29 Aug 2008 20:18:07 -0000	1.12
+++ sources	26 Jan 2009 16:49:12 -0000	1.13
@@ -1 +1 @@
-eef7ab12fc1e3ed34669bb2d5e1d0448  ejabberd-2.0.2.tar.gz
+b647e74b0f94f030bd8747c8a8a4d0f9  ejabberd-2.0.3.tar.gz



From orion at fedoraproject.org  Mon Jan 26 16:52:34 2009
From: orion at fedoraproject.org (Orion Poplawski)
Date: Mon, 26 Jan 2009 16:52:34 +0000 (UTC)
Subject: rpms/gdl/devel gdl-0.9rc2-cvs.patch, NONE, 1.1 .cvsignore, 1.10,
	1.11 gdl-0.9rc1-gcc43.patch, 1.1, 1.2 gdl.spec, 1.39,
	1.40 sources, 1.10, 1.11 gdl-0.9rc1-cvs.patch, 1.1, NONE
Message-ID: <20090126165234.B3DC07010C@cvs1.fedora.phx.redhat.com>

Author: orion

Update of /cvs/pkgs/rpms/gdl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv679

Modified Files:
	.cvsignore gdl-0.9rc1-gcc43.patch gdl.spec sources 
Added Files:
	gdl-0.9rc2-cvs.patch 
Removed Files:
	gdl-0.9rc1-cvs.patch 
Log Message:
* Fri Jan 23 2009 - Orion Poplawski <orion at cora.nwra.com> - 0.9-0.rc2.1
- Update to 0.9rc2 based cvs


gdl-0.9rc2-cvs.patch:

--- NEW FILE gdl-0.9rc2-cvs.patch ---
diff -ru --unidirectional-new-file --exclude=CVS gdl-0.9rc2/configure cvs/gdl/configure
--- gdl-0.9rc2/configure	2009-01-20 12:33:51.000000000 -0700
+++ cvs/gdl/configure	2009-01-26 09:43:53.000000000 -0700
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for gdl 0.9rc1 CVS.
+# Generated by GNU Autoconf 2.61 for gdl 0.9rc2 CVS.
 #
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
 # 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
@@ -726,8 +726,8 @@
 # Identity of this package.
 PACKAGE_NAME='gdl'
 PACKAGE_TARNAME='gdl'
-PACKAGE_VERSION='0.9rc1 CVS'
-PACKAGE_STRING='gdl 0.9rc1 CVS'
+PACKAGE_VERSION='0.9rc2 CVS'
+PACKAGE_STRING='gdl 0.9rc2 CVS'
 PACKAGE_BUGREPORT=''
 
 # Factoring default headers for most tests.
@@ -1398,7 +1398,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures gdl 0.9rc1 CVS to adapt to many kinds of systems.
+\`configure' configures gdl 0.9rc2 CVS to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1468,7 +1468,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of gdl 0.9rc1 CVS:";;
+     short | recursive ) echo "Configuration of gdl 0.9rc2 CVS:";;
    esac
   cat <<\_ACEOF
 
@@ -1585,7 +1585,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-gdl configure 0.9rc1 CVS
+gdl configure 0.9rc2 CVS
 generated by GNU Autoconf 2.61
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1599,7 +1599,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by gdl $as_me 0.9rc1 CVS, which was
+It was created by gdl $as_me 0.9rc2 CVS, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
   $ $0 $@
@@ -2292,7 +2292,7 @@
 
 # Define the identity of the package.
  PACKAGE='gdl'
- VERSION='0.9rc1 CVS'
+ VERSION='0.9rc2 CVS'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -22298,7 +22298,7 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by gdl $as_me 0.9rc1 CVS, which was
+This file was extended by gdl $as_me 0.9rc2 CVS, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -22351,7 +22351,7 @@
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-gdl config.status 0.9rc1 CVS
+gdl config.status 0.9rc2 CVS
 configured by $0, generated by GNU Autoconf 2.61,
   with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 
diff -ru --unidirectional-new-file --exclude=CVS gdl-0.9rc2/configure.in cvs/gdl/configure.in
--- gdl-0.9rc2/configure.in	2009-01-22 15:31:48.000000000 -0700
+++ cvs/gdl/configure.in	2009-01-26 09:43:53.000000000 -0700
@@ -1,4 +1,4 @@
-AC_INIT(gdl, 0.9rc2)
+AC_INIT(gdl, 0.9rc2 CVS)
 
 AM_CONFIG_HEADER(config.h)
 AM_INIT_AUTOMAKE
diff -ru --unidirectional-new-file --exclude=CVS gdl-0.9rc2/README cvs/gdl/README
--- gdl-0.9rc2/README	2009-01-20 13:01:46.000000000 -0700
+++ cvs/gdl/README	2008-04-08 11:10:46.000000000 -0600
@@ -97,7 +97,6 @@
 compiler) is needed for compiling GDL.
 Note that due to problems with static casts g++ 3.3.1
 does NOT compile GDL, but 3.3.2 and 3.4.1 work fine again.
-Since 0.9rc2 GDL should compile with gcc 4.3 .
 GDL compiles under Mac OS X (10.2, 10.3) with g++ 3.3 . 
 
 The GNU readline library 4.3 is needed (actually GDL should compile
Only in gdl-0.9rc2/src: basic_fun.cpp.ori
diff -ru --unidirectional-new-file --exclude=CVS gdl-0.9rc2/src/basic_fun_jmg.cpp cvs/gdl/src/basic_fun_jmg.cpp
--- gdl-0.9rc2/src/basic_fun_jmg.cpp	2009-01-20 12:33:52.000000000 -0700
+++ cvs/gdl/src/basic_fun_jmg.cpp	2009-01-26 09:43:54.000000000 -0700
@@ -462,6 +462,11 @@
 
     SizeT nEl = p0->N_Elements();
     SizeT Rank = p0->Rank();
+//     if( Rank == 0)
+//       e->Throw( "Parameter must be an array in this context: " 
+// 		+ e->GetParString( 0));
+
+
     SizeT Type = p0->Type();
 
     dimension dim;
Only in gdl-0.9rc2/src: basic_pro.cpp.sav
diff -ru --unidirectional-new-file --exclude=CVS gdl-0.9rc2/src/dcompiler.cpp cvs/gdl/src/dcompiler.cpp
--- gdl-0.9rc2/src/dcompiler.cpp	2009-01-20 12:33:52.000000000 -0700
+++ cvs/gdl/src/dcompiler.cpp	2009-01-26 09:43:54.000000000 -0700
@@ -158,6 +158,12 @@
     }
 }
 
+void DCompiler::ContinueMainPro()
+{
+  env = GDLInterpreter::CallStack()[0];
+  pro = static_cast<DSubUD*>( env->GetPro());
+}
+
 void DCompiler::StartFun(const string& n,const string& o)
 {
   ClearOwnCommon();
diff -ru --unidirectional-new-file --exclude=CVS gdl-0.9rc2/src/dcompiler.hpp cvs/gdl/src/dcompiler.hpp
--- gdl-0.9rc2/src/dcompiler.hpp	2009-01-20 12:33:57.000000000 -0700
+++ cvs/gdl/src/dcompiler.hpp	2009-01-26 09:43:54.000000000 -0700
@@ -66,6 +66,7 @@
   void AddPar(const std::string&);                 // add parameter
   void AddKey(const std::string&,const std::string&);   // add keyword,varName
   void StartPro(const std::string&,const std::string& o = "");     
+  void ContinueMainPro();
   void EndFunPro();       
   void EndInteractiveStatement();
   void EndPro();       
@@ -88,6 +89,8 @@
   int  NDefLabel();
   bool IsActivePro( DSub* p);
   bool ActiveProCompiled() const { return activeProCompiled;}
+  EnvBaseT* GetEnv() const { return env;}
+  void SetEnv( EnvBaseT* e) { env = e;}
 };
 
 #endif
diff -ru --unidirectional-new-file --exclude=CVS gdl-0.9rc2/src/file.cpp cvs/gdl/src/file.cpp
--- gdl-0.9rc2/src/file.cpp	2009-01-20 12:33:57.000000000 -0700
+++ cvs/gdl/src/file.cpp	2008-11-12 17:03:31.000000000 -0700
@@ -165,6 +165,89 @@
     return res;
   }
 
+  BaseGDL* file_info( EnvT* e)
+  {
+    SizeT nParam=e->NParam( 1); 
+    
+    BaseGDL* p0 = e->GetParDefined( 0);
+
+    DStringGDL* p0S = dynamic_cast<DStringGDL*>( p0);
+    if( p0S == NULL)
+      e->Throw( "String expression required in this context: "+
+		e->GetParString(0));
+
+    static int directoryIx = e->KeywordIx( "NOEXPAND_PATH");
+    bool directory = e->KeywordSet( noexpand_pathIx);
+
+    DLongGDL* getMode = NULL; 
+    if( get_mode)
+      {
+	getMode = new DLongGDL( p0S->Dim()); // zero
+	e->SetKW( get_modeIx, getMode);
+      }
+    
+    DLongGDL* res = new DLongGDL( p0S->Dim()); // zero
+
+//     bool doStat = 
+//       zero_length || get_mode || directory || 
+//       regular || block_special || character_special || 
+//       named_pipe || socket || symlink;
+
+    SizeT nEl = p0S->N_Elements();
+    for( SizeT f=0; f<nEl; ++f)
+      {
+	const char* actFile = (*p0S)[ f].c_str();
+
+	struct stat statStruct;
[...8858 lines suppressed...]
+	_t = __t194;
 	_t = _t->getNextSibling();
 	uminus_AST = RefDNode(currentAST.root);
 	
@@ -6247,11 +6261,11 @@
 	RefDNode ex_AST = RefDNode(antlr::nullAST);
 	RefDNode ex = RefDNode(antlr::nullAST);
 	
-	RefDNode __t197 = _t;
+	RefDNode __t196 = _t;
 	e = (_t == RefDNode(ASTNULL)) ? RefDNode(antlr::nullAST) : _t;
 	RefDNode e_AST_in = RefDNode(antlr::nullAST);
 	e_AST = astFactory->create(antlr::RefAST(e));
-	antlr::ASTPair __currentAST197 = currentAST;
+	antlr::ASTPair __currentAST196 = currentAST;
 	currentAST.root = currentAST.child;
 	currentAST.child = RefDNode(antlr::nullAST);
 	match(antlr::RefAST(_t),EXPR);
@@ -6260,8 +6274,8 @@
 	expr(_t);
 	_t = _retTree;
 	ex_AST = returnAST;
-	currentAST = __currentAST197;
-	_t = __t197;
+	currentAST = __currentAST196;
+	_t = __t196;
 	_t = _t->getNextSibling();
 	brace_expr_AST = RefDNode(currentAST.root);
 	
@@ -6288,12 +6302,12 @@
 	RefDNode ex_AST = RefDNode(antlr::nullAST);
 	RefDNode ex = RefDNode(antlr::nullAST);
 	
-	RefDNode __t199 = _t;
+	RefDNode __t198 = _t;
 	RefDNode tmp76_AST = RefDNode(antlr::nullAST);
 	RefDNode tmp76_AST_in = RefDNode(antlr::nullAST);
 	tmp76_AST = astFactory->create(antlr::RefAST(_t));
 	tmp76_AST_in = _t;
-	antlr::ASTPair __currentAST199 = currentAST;
+	antlr::ASTPair __currentAST198 = currentAST;
 	currentAST.root = currentAST.child;
 	currentAST.child = RefDNode(antlr::nullAST);
 	match(antlr::RefAST(_t),EXPR);
@@ -6302,8 +6316,8 @@
 	expr(_t);
 	_t = _retTree;
 	ex_AST = returnAST;
-	currentAST = __currentAST199;
-	_t = __t199;
+	currentAST = __currentAST198;
+	_t = __t198;
 	_t = _t->getNextSibling();
 	unbrace_expr_AST = RefDNode(currentAST.root);
 	
@@ -6375,13 +6389,13 @@
 	switch ( _t->getType()) {
 	case ARRAYEXPR:
 	{
-		RefDNode __t202 = _t;
+		RefDNode __t201 = _t;
 		RefDNode tmp77_AST = RefDNode(antlr::nullAST);
 		RefDNode tmp77_AST_in = RefDNode(antlr::nullAST);
 		tmp77_AST = astFactory->create(antlr::RefAST(_t));
 		tmp77_AST_in = _t;
 		astFactory->addASTChild(currentAST, antlr::RefAST(tmp77_AST));
-		antlr::ASTPair __currentAST202 = currentAST;
+		antlr::ASTPair __currentAST201 = currentAST;
 		currentAST.root = currentAST.child;
 		currentAST.child = RefDNode(antlr::nullAST);
 		match(antlr::RefAST(_t),ARRAYEXPR);
@@ -6392,8 +6406,8 @@
 		arrayindex_list(_t);
 		_t = _retTree;
 		astFactory->addASTChild(currentAST, antlr::RefAST(returnAST));
-		currentAST = __currentAST202;
-		_t = __t202;
+		currentAST = __currentAST201;
+		_t = __t201;
 		_t = _t->getNextSibling();
 		array_expr_AST = RefDNode(currentAST.root);
 		break;
@@ -6470,13 +6484,13 @@
 	switch ( _t->getType()) {
 	case ARRAYEXPR:
 	{
-		RefDNode __t205 = _t;
+		RefDNode __t204 = _t;
 		RefDNode tmp78_AST = RefDNode(antlr::nullAST);
 		RefDNode tmp78_AST_in = RefDNode(antlr::nullAST);
 		tmp78_AST = astFactory->create(antlr::RefAST(_t));
 		tmp78_AST_in = _t;
 		astFactory->addASTChild(currentAST, antlr::RefAST(tmp78_AST));
-		antlr::ASTPair __currentAST205 = currentAST;
+		antlr::ASTPair __currentAST204 = currentAST;
 		currentAST.root = currentAST.child;
 		currentAST.child = RefDNode(antlr::nullAST);
 		match(antlr::RefAST(_t),ARRAYEXPR);
@@ -6487,8 +6501,8 @@
 		arrayindex_list(_t);
 		_t = _retTree;
 		astFactory->addASTChild(currentAST, antlr::RefAST(returnAST));
-		currentAST = __currentAST205;
-		_t = __t205;
+		currentAST = __currentAST204;
+		_t = __t204;
 		_t = _t->getNextSibling();
 		tag_array_expr_1st_AST = RefDNode(currentAST.root);
 		break;
@@ -6561,13 +6575,13 @@
 	switch ( _t->getType()) {
 	case ARRAYEXPR:
 	{
-		RefDNode __t208 = _t;
+		RefDNode __t207 = _t;
 		RefDNode tmp80_AST = RefDNode(antlr::nullAST);
 		RefDNode tmp80_AST_in = RefDNode(antlr::nullAST);
 		tmp80_AST = astFactory->create(antlr::RefAST(_t));
 		tmp80_AST_in = _t;
 		astFactory->addASTChild(currentAST, antlr::RefAST(tmp80_AST));
-		antlr::ASTPair __currentAST208 = currentAST;
+		antlr::ASTPair __currentAST207 = currentAST;
 		currentAST.root = currentAST.child;
 		currentAST.child = RefDNode(antlr::nullAST);
 		match(antlr::RefAST(_t),ARRAYEXPR);
@@ -6578,8 +6592,8 @@
 		arrayindex_list(_t);
 		_t = _retTree;
 		astFactory->addASTChild(currentAST, antlr::RefAST(returnAST));
-		currentAST = __currentAST208;
-		_t = __t208;
+		currentAST = __currentAST207;
+		_t = __t207;
 		_t = _t->getNextSibling();
 		tag_array_expr_AST = RefDNode(currentAST.root);
 		break;
diff -ru --unidirectional-new-file --exclude=CVS gdl-0.9rc2/src/GDLTreeParser.hpp cvs/gdl/src/GDLTreeParser.hpp
--- gdl-0.9rc2/src/GDLTreeParser.hpp	2009-01-20 12:33:52.000000000 -0700
+++ cvs/gdl/src/GDLTreeParser.hpp	2009-01-26 09:43:54.000000000 -0700
@@ -145,13 +145,12 @@
 	public: void procedure_def(RefDNode _t);
 	public: void function_def(RefDNode _t);
 	public: void forward_function(RefDNode _t);
-	public: void main_program(RefDNode _t);
+	public: void common_block(RefDNode _t);
+	public: void statement_list(RefDNode _t);
 	public: void interactive(RefDNode _t);
 	public: void statement(RefDNode _t);
-	public: void statement_list(RefDNode _t);
 	public: void parameter_declaration(RefDNode _t);
 	public: void keyword_declaration(RefDNode _t);
-	public: void common_block(RefDNode _t);
 	public: void caseswitch_body(RefDNode _t);
 	public: void expr(RefDNode _t);
 	public: void switch_statement(RefDNode _t);
Only in gdl-0.9rc2/src: KEYWORDS
diff -ru --unidirectional-new-file --exclude=CVS gdl-0.9rc2/src/prognode.cpp cvs/gdl/src/prognode.cpp
--- gdl-0.9rc2/src/prognode.cpp	2009-01-20 12:33:52.000000000 -0700
+++ cvs/gdl/src/prognode.cpp	2009-01-26 09:43:54.000000000 -0700
@@ -23,8 +23,25 @@
 
 #include "dinterpreter.hpp"
 
+#include "objects.hpp"
+
 using namespace std;
 
+bool ProgNode::ConstantNode()
+  {
+    if( this->getType() == GDLTokenTypes::SYSVAR)
+      {
+	// note: this works, because system variables are never 
+	//       passed by reference
+       SizeT rdOnlySize = sysVarRdOnlyList.size();
+         for( SizeT i=0; i<rdOnlySize; ++i)
+                  if( sysVarRdOnlyList[ i] == this->var)
+		    return true;
+      }
+
+    return this->getType() == GDLTokenTypes::CONSTANT;
+  }
+
 BaseGDL* ARRAYDEFNode::Eval()
 {
   // GDLInterpreter::
diff -ru --unidirectional-new-file --exclude=CVS gdl-0.9rc2/src/prognode.hpp cvs/gdl/src/prognode.hpp
--- gdl-0.9rc2/src/prognode.hpp	2009-01-20 12:33:54.000000000 -0700
+++ cvs/gdl/src/prognode.hpp	2009-01-26 09:43:54.000000000 -0700
@@ -91,10 +91,7 @@
   virtual BaseGDL* EvalNC(); // non-copy
   virtual void     Run();
 
-  bool ConstantNode()
-  {
-    return this->getType() == GDLTokenTypes::CONSTANT;
-  }
+  bool ConstantNode();
 
   ProgNodeP getFirstChild() const
   {


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gdl/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	6 Apr 2008 04:22:34 -0000	1.10
+++ .cvsignore	26 Jan 2009 16:52:04 -0000	1.11
@@ -1 +1 @@
-gdl-0.9rc1.tar.gz
+gdl-0.9rc2.tar.gz

gdl-0.9rc1-gcc43.patch:

Index: gdl-0.9rc1-gcc43.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gdl/devel/gdl-0.9rc1-gcc43.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gdl-0.9rc1-gcc43.patch	6 Sep 2008 04:17:49 -0000	1.1
+++ gdl-0.9rc1-gcc43.patch	26 Jan 2009 16:52:04 -0000	1.2
@@ -8,17 +8,6 @@
  #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 @@


Index: gdl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdl/devel/gdl.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- gdl.spec	1 Dec 2008 05:03:47 -0000	1.39
+++ gdl.spec	26 Jan 2009 16:52:04 -0000	1.40
@@ -1,15 +1,15 @@
 Name:           gdl
 Version:        0.9
-Release:        0.rc1.4%{?dist}.1
+Release:        0.rc2.1%{?dist}
 Summary:        GNU Data Language
 
 Group:          Applications/Engineering
 License:        GPLv2+
 URL:            http://gnudatalanguage.sourceforge.net/
-Source0:        http://downloads.sourceforge.net/gnudatalanguage/%{name}-%{version}rc1.tar.gz
+Source0:        http://downloads.sourceforge.net/gnudatalanguage/%{name}-%{version}rc2.tar.gz
 Source1:        gdl.csh
 Source2:        gdl.sh
-Patch0:         gdl-0.9rc1-cvs.patch
+Patch0:         gdl-0.9rc2-cvs.patch
 Patch1:         gdl-0.9pre5-ppc64.patch
 Patch2:         gdl-0.9rc1-gcc43.patch
 Patch3:         gdl-0.9rc1-magick.patch
@@ -32,7 +32,7 @@
 
 
 %prep
-%setup -q -n %{name}-%{version}rc1
+%setup -q -n %{name}-%{version}rc2
 %patch0 -p1 -b .cvs
 %patch1 -p1 -b .ppc64
 %patch2 -p1 -b .gcc43
@@ -75,6 +75,9 @@
 
 
 %changelog
+* Fri Jan 23 2009 - Orion Poplawski <orion at cora.nwra.com> - 0.9-0.rc2.1
+- Update to 0.9rc2 based cvs
+
 * Sun Nov 30 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 0.9-0.rc1.4.1
 - Rebuild for Python 2.6
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gdl/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	6 Apr 2008 04:22:34 -0000	1.10
+++ sources	26 Jan 2009 16:52:04 -0000	1.11
@@ -1 +1 @@
-9cf6c3603b71988761d5d2c4551ecb10  gdl-0.9rc1.tar.gz
+4ae52c19cdd6f4684b8e0b6ce8a9902c  gdl-0.9rc2.tar.gz


--- gdl-0.9rc1-cvs.patch DELETED ---



From tmraz at fedoraproject.org  Mon Jan 26 16:53:27 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Mon, 26 Jan 2009 16:53:27 +0000 (UTC)
Subject: rpms/authconfig/devel .cvsignore, 1.72, 1.73 authconfig.spec, 1.101,
	1.102 sources, 1.80, 1.81
Message-ID: <20090126165327.0E64F7010C@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/authconfig/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1006

Modified Files:
	.cvsignore authconfig.spec sources 
Log Message:
* Mon Jan 26 2009 Tomas Mraz <tmraz at redhat.com> - 5.4.7-1
- move the consolehelper symlinks to the gtk subpackage to remove
  the dependency on usermode in the base package (#480014)
- return nonzero exit codes on some more possible errors (#440461)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/authconfig/devel/.cvsignore,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- .cvsignore	19 Dec 2008 09:43:03 -0000	1.72
+++ .cvsignore	26 Jan 2009 16:52:56 -0000	1.73
@@ -1 +1 @@
-authconfig-5.4.6.tar.bz2
+authconfig-5.4.7.tar.bz2


Index: authconfig.spec
===================================================================
RCS file: /cvs/pkgs/rpms/authconfig/devel/authconfig.spec,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -r1.101 -r1.102
--- authconfig.spec	19 Dec 2008 09:43:03 -0000	1.101
+++ authconfig.spec	26 Jan 2009 16:52:56 -0000	1.102
@@ -1,6 +1,6 @@
 Summary: Command line tool for setting up authentication from network services
 Name: authconfig
-Version: 5.4.6
+Version: 5.4.7
 Release: 1%{?dist}
 License: GPLv2+
 ExclusiveOS: Linux
@@ -8,7 +8,7 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 URL: https://fedorahosted.org/authconfig
 Source: https://fedorahosted.org/releases/a/u/%{name}/%{name}-%{version}.tar.bz2
-Requires: newt-python, pam >= 0.99.10.0, usermode, python
+Requires: newt-python, pam >= 0.99.10.0, python
 Conflicts: pam_krb5 < 1.49, samba-common < 3.0, samba-client < 3.0
 Conflicts: nss_ldap < 254
 BuildRequires: glib2-devel, python >= 2.4.1, python-devel
@@ -59,8 +59,6 @@
 %doc COPYING NOTES TODO README.samba3
 %ghost %config(noreplace) %{_sysconfdir}/sysconfig/authconfig
 %ghost %config(noreplace) %{_sysconfdir}/pam.d/system-auth-ac
-%{_bindir}/authconfig
-%{_bindir}/authconfig-tui
 %{_sbindir}/cacertdir_rehash
 %{_sbindir}/authconfig
 %{_sbindir}/authconfig-tui
@@ -73,14 +71,12 @@
 %{_datadir}/%{name}/authinfo.py*
 %{_datadir}/%{name}/shvfile.py*
 %{_datadir}/%{name}/dnsclient.py*
-%config(noreplace) %{_sysconfdir}/pam.d/authconfig
-%config(noreplace) %{_sysconfdir}/pam.d/authconfig-tui
-%config(noreplace) %{_sysconfdir}/security/console.apps/authconfig
-%config(noreplace) %{_sysconfdir}/security/console.apps/authconfig-tui
 %attr(700,root,root) %dir %{_localstatedir}/lib/%{name}
 
 %files gtk
 %defattr(-,root,root,-)
+%{_bindir}/authconfig
+%{_bindir}/authconfig-tui
 %{_bindir}/authconfig-gtk
 %{_bindir}/system-config-authentication
 %{_sbindir}/authconfig-gtk
@@ -91,10 +87,19 @@
 %config(noreplace) %{_sysconfdir}/pam.d/system-config-authentication
 %config(noreplace) %{_sysconfdir}/security/console.apps/authconfig-gtk
 %config(noreplace) %{_sysconfdir}/security/console.apps/system-config-authentication
+%config(noreplace) %{_sysconfdir}/pam.d/authconfig
+%config(noreplace) %{_sysconfdir}/pam.d/authconfig-tui
+%config(noreplace) %{_sysconfdir}/security/console.apps/authconfig
+%config(noreplace) %{_sysconfdir}/security/console.apps/authconfig-tui
 %{_datadir}/applications/*
 %{_datadir}/pixmaps/*
 
 %changelog
+* Mon Jan 26 2009 Tomas Mraz <tmraz at redhat.com> - 5.4.7-1
+- move the consolehelper symlinks to the gtk subpackage to remove
+  the dependency on usermode in the base package (#480014)
+- return nonzero exit codes on some more possible errors (#440461)
+
 * Fri Dec 19 2008 Tomas Mraz <tmraz at redhat.com> - 5.4.6-1
 - fix typo in the fingerprint reader patch (#477080)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/authconfig/devel/sources,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- sources	19 Dec 2008 09:43:03 -0000	1.80
+++ sources	26 Jan 2009 16:52:56 -0000	1.81
@@ -1 +1 @@
-06e0feb9565ded2d9c64cabe356c3639  authconfig-5.4.6.tar.bz2
+f4dd25f64c7174f88149b17139c602b3  authconfig-5.4.7.tar.bz2



From peter at fedoraproject.org  Mon Jan 26 16:53:55 2009
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Mon, 26 Jan 2009 16:53:55 +0000 (UTC)
Subject: rpms/ejabberd/EL-5 ejabberd.sysconfig, NONE, 1.1 .cvsignore, 1.9,
	1.10 ejabberd.init, 1.6, 1.7 ejabberd.spec, 1.23,
	1.24 import.log, 1.4, 1.5 sources, 1.9, 1.10
Message-ID: <20090126165355.B918D7010C@cvs1.fedora.phx.redhat.com>

Author: peter

Update of /cvs/pkgs/rpms/ejabberd/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1113/EL-5

Modified Files:
	.cvsignore ejabberd.init ejabberd.spec import.log sources 
Added Files:
	ejabberd.sysconfig 
Log Message:
Ver. 2.0.3


--- NEW FILE ejabberd.sysconfig ---
## Settings for ejabberd

## Where should ejabberd find its configuration file?
#
#CONFIG_FILE=/etc/ejabberd/ejabberd.cfg

## ULIMIT_MAX_FILES alters the number of files that ejabberd is
## allowed to have open at once.  If it is unset the system default
## (usually 1024) will be used.  ejabberd will want over twice as many
## open files as it has active connections, so if you have a few
## hundred or more users you will want to set this.
#
#ULIMIT_MAX_FILES=1024


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ejabberd/EL-5/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	29 Aug 2008 20:21:45 -0000	1.9
+++ .cvsignore	26 Jan 2009 16:53:25 -0000	1.10
@@ -1 +1 @@
-ejabberd-2.0.2.tar.gz
+ejabberd-2.0.3.tar.gz


Index: ejabberd.init
===================================================================
RCS file: /cvs/pkgs/rpms/ejabberd/EL-5/ejabberd.init,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ejabberd.init	22 Jun 2008 19:14:52 -0000	1.6
+++ ejabberd.init	26 Jan 2009 16:53:25 -0000	1.7
@@ -17,15 +17,26 @@
 
 . /etc/rc.d/init.d/functions
 
+if [ -r /etc/sysconfig/ejabberd ]; then
+	. /etc/sysconfig/ejabberd
+fi
+
+if [ ! "$CONFIG_FILE" ]; then
+	CONFIG_FILE=/etc/ejabberd/ejabberd.cfg
+fi
+
 node=`hostname -s`
 
 start() {
         echo -n $"Starting ejabberd: "
+	if [ "$ULIMIT_MAX_FILES" ]; then
+		ulimit -n $ULIMIT_MAX_FILES
+	fi
         daemon --user=ejabberd --check=ejabberd \
 	    "erl" "-pa @libdir@/ejabberd/ebin \
                    -sname ejabberd \
                    -s ejabberd \
-                   -ejabberd config \\\"/etc/ejabberd/ejabberd.cfg\\\" \
+                   -ejabberd config \\\"$CONFIG_FILE\\\" \
                              log_path \\\"/var/log/ejabberd/ejabberd.log\\\" \
                    -sasl sasl_error_logger \\{file,\\\"/var/log/ejabberd/sasl.log\\\"\\} \
                    -mnesia dir \\\"/var/lib/ejabberd/spool\\\" \


Index: ejabberd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ejabberd/EL-5/ejabberd.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- ejabberd.spec	2 Oct 2008 05:49:49 -0000	1.23
+++ ejabberd.spec	26 Jan 2009 16:53:25 -0000	1.24
@@ -1,6 +1,6 @@
 Name:           ejabberd
-Version:        2.0.2
-Release:        3%{?dist}
+Version:        2.0.3
+Release:        1%{?dist}
 Summary:        A distributed, fault-tolerant Jabber/XMPP server
 
 Group:          Applications/Internet
@@ -9,6 +9,7 @@
 Source0:        http://www.process-one.net/downloads/%{name}/%{version}/%{name}-%{version}.tar.gz
 Source1:        ejabberd.init
 Source2:        ejabberd.logrotate
+Source3:	ejabberd.sysconfig
 
 # http://www.ejabberd.im/mod_ctlextra
 # svn export -r 557 https://svn.process-one.net/ejabberd-modules/mod_ctlextra/trunk/src/mod_ctlextra.erl
@@ -151,12 +152,14 @@
 install -D -p -m 0644 %{S:10} %{buildroot}%{_sysconfdir}/security/console.apps/ejabberdctl
 install -D -p -m 0644 %{S:11} %{buildroot}%{_sysconfdir}/pam.d/ejabberd
 
-mkdir -p %{buildroot}%{_initrddir}
-install -p -m 0755 %{S:1} %{buildroot}%{_initrddir}/ejabberd
-chmod a+x %{buildroot}%{_initrddir}/ejabberd
+# install init-script
+install -D -p -m 0755 %{S:1} %{buildroot}%{_initrddir}/ejabberd
 
-mkdir -p %{buildroot}%{_sysconfdir}/logrotate.d
-cp -p %{S:2} %{buildroot}%{_sysconfdir}/logrotate.d/ejabberd
+# install config for logrotate
+install -D -p -m 0644  %{S:2} %{buildroot}%{_sysconfdir}/logrotate.d/ejabberd
+
+# install sysconfig file
+install -D -p -m 0644  %{S:3} %{buildroot}%{_sysconfdir}/sysconfig/ejabberd
 
 %{__perl} -pi -e 's!\@libdir\@!%{_libdir}!g'  %{buildroot}%{_initrddir}/ejabberd %{buildroot}%{_sysconfdir}/logrotate.d/ejabberd %{buildroot}%{_sbindir}/ejabberdctl
 %{__perl} -pi -e 's!\@version\@!%{version}!g' %{buildroot}%{_initrddir}/ejabberd %{buildroot}%{_sysconfdir}/logrotate.d/ejabberd %{buildroot}%{_sbindir}/ejabberdctl
@@ -178,7 +181,7 @@
 
 %{_initrddir}/ejabberd
 %config(noreplace) %{_sysconfdir}/logrotate.d/ejabberd
-
+%config(noreplace) %{_sysconfdir}/sysconfig/ejabberd
 %config(noreplace) %{_sysconfdir}/pam.d/ejabberd
 %config(noreplace) %{_sysconfdir}/pam.d/ejabberdctl
 %config(noreplace) %{_sysconfdir}/security/console.apps/ejabberdctl
@@ -211,6 +214,13 @@
 %endif
 
 %changelog
+* Mon Jan 26 2009 Peter Lemenkov <lemenkov at gmail.com> 2.0.3-1
+- Ver. 2.0.3
+- Merged some stuff from git://dev.laptop.org/users/martin/ejabberd-xs.git
+
+* Fri Jan 16 2009 Tomas Mraz <tmraz at redhat.com> 2.0.2-4
+- rebuild with new openssl
+
 * Thu Oct  2 2008 Peter Lemenkov <lemenkov at gmail.com> 2.0.2-3
 - Fixed broken ejabberdctl (BZ# 465196)
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/ejabberd/EL-5/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- import.log	2 Oct 2008 05:49:49 -0000	1.4
+++ import.log	26 Jan 2009 16:53:25 -0000	1.5
@@ -2,3 +2,4 @@
 ejabberd-2_0_1-4_fc9:EL-5:ejabberd-2.0.1-4.fc9.src.rpm:1214161435
 ejabberd-2_0_2-1_fc9:EL-5:ejabberd-2.0.2-1.fc9.src.rpm:1220041261
 ejabberd-2_0_2-3_fc9:EL-5:ejabberd-2.0.2-3.fc9.src.rpm:1222926241
+ejabberd-2_0_3-1_fc10:EL-5:ejabberd-2.0.3-1.fc10.src.rpm:1232988681


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ejabberd/EL-5/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	29 Aug 2008 20:21:45 -0000	1.9
+++ sources	26 Jan 2009 16:53:25 -0000	1.10
@@ -1 +1 @@
-eef7ab12fc1e3ed34669bb2d5e1d0448  ejabberd-2.0.2.tar.gz
+b647e74b0f94f030bd8747c8a8a4d0f9  ejabberd-2.0.3.tar.gz



From jskala at fedoraproject.org  Mon Jan 26 16:57:46 2009
From: jskala at fedoraproject.org (Jiri Skala)
Date: Mon, 26 Jan 2009 16:57:46 +0000 (UTC)
Subject: rpms/netatalk/devel netatalk.spec,1.48,1.49
Message-ID: <20090126165746.D255170141@cvs1.fedora.phx.redhat.com>

Author: jskala

Update of /cvs/extras/rpms/netatalk/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1908

Modified Files:
	netatalk.spec 
Log Message:
* Fri Jan 23 2009 Jiri Skala <jskala at redhat.com> -4:3.0.3-24
- fix #473186 conflict timeout with coreutils



Index: netatalk.spec
===================================================================
RCS file: /cvs/extras/rpms/netatalk/devel/netatalk.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- netatalk.spec	17 Jan 2009 15:27:22 -0000	1.48
+++ netatalk.spec	26 Jan 2009 16:57:16 -0000	1.49
@@ -1,7 +1,7 @@
 Summary: AppleTalk networking programs
 Name:    netatalk
 Version: 2.0.3
-Release: 23%{?dist}
+Release: 24%{?dist}
 Epoch:   4
 License: GPLv2+
 Group:   System Environment/Daemons
@@ -31,6 +31,16 @@
 This package enables Linux to talk to Macintosh computers via the
 AppleTalk networking protocol. It includes a daemon to allow Linux
 to act as a file server over EtherTalk or IP for Mac's.
+The systems without coreutils 7.0 and later require netatalk-timeout package.
+
+%package timeout
+Summary: Timeout utility for the systems without coreutils
+Group:   System Environment/Daemons
+Requires: netatalk = %{version}-%{release}
+Conflicts: coreutils >= 7.0
+
+%description timeout
+The package contains the timeout utility that was a part of netatalk earlier. The coreutils 7.0 and later contains this utility too therefore the timeout is separated to sub-package for usage on the systems without coreutils.
 
 %package devel
 Summary: Headers for Appletalk development
@@ -174,13 +184,19 @@
 %{_sbindir}/*
 %{_bindir}/*
 %exclude %{_bindir}/netatalk-config
+%exclude %{_bindir}/timeout
 %{_mandir}/man*/*
 %exclude %{_mandir}/man*/netatalk-config*
+%exclude %{_mandir}/man1/timeout.1.gz
 %{_datadir}/netatalk
 %dir %{_libdir}/atalk
 %{_libdir}/atalk/*.so
 %{_libexecdir}/*
 
+%files timeout
+%{_bindir}/timeout
+%{_mandir}/man1/timeout.1.gz
+
 %files devel
 %defattr(-,root,root)
 %dir %{_includedir}/atalk
@@ -192,6 +208,9 @@
 %{_mandir}/man*/netatalk-config.1*
 
 %changelog
+* Fri Jan 23 2009 Jiri Skala <jskala at redhat.com> -4:3.0.3-24
+- fix #473186 conflict timeout with coreutils
+
 * Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> - 4:2.0.3-23
 - rebuild with new openssl
 



From atkac at fedoraproject.org  Mon Jan 26 16:58:41 2009
From: atkac at fedoraproject.org (Adam Tkac)
Date: Mon, 26 Jan 2009 16:58:41 +0000 (UTC)
Subject: rpms/vnc/F-10 .cvsignore, 1.24, 1.25 sources, 1.25,
	1.26 vnc-always_use_fb.patch, 1.2, 1.3 vnc-use-fb.patch, 1.5,
	1.6 vnc-via.patch, 1.6, 1.7 vnc-xorg.patch, 1.5, 1.6 vnc.spec,
	1.203, 1.204
Message-ID: <20090126165841.825DE7010C@cvs1.fedora.phx.redhat.com>

Author: atkac

Update of /cvs/pkgs/rpms/vnc/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2251

Modified Files:
	.cvsignore sources vnc-always_use_fb.patch vnc-use-fb.patch 
	vnc-via.patch vnc-xorg.patch vnc.spec 
Log Message:
- updated to 4.1.3 (CVE-2008-4770)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/vnc/F-10/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- .cvsignore	11 Mar 2008 12:50:34 -0000	1.24
+++ .cvsignore	26 Jan 2009 16:58:10 -0000	1.25
@@ -1 +1 @@
-vnc-4_1_2-unixsrc.tar.gz
+vnc-4_1_3-unixsrc.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/vnc/F-10/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- sources	11 Mar 2008 12:50:34 -0000	1.25
+++ sources	26 Jan 2009 16:58:10 -0000	1.26
@@ -1 +1 @@
-cf9a6fe8f592286b5e0fdde686504ffb  vnc-4_1_2-unixsrc.tar.gz
+a119f3c75ad2767c0588260e2abe39be  vnc-4_1_3-unixsrc.tar.gz

vnc-always_use_fb.patch:

Index: vnc-always_use_fb.patch
===================================================================
RCS file: /cvs/pkgs/rpms/vnc/F-10/vnc-always_use_fb.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- vnc-always_use_fb.patch	5 Mar 2007 15:12:02 -0000	1.2
+++ vnc-always_use_fb.patch	26 Jan 2009 16:58:10 -0000	1.3
@@ -63,7 +63,7 @@
 -#endif
  }
  
- #define XVNCVERSION "Free Edition 4.1.2"
+ #define XVNCVERSION "Free Edition 4.1.3"
 @@ -502,67 +491,6 @@
  }
  #endif

vnc-use-fb.patch:

Index: vnc-use-fb.patch
===================================================================
RCS file: /cvs/pkgs/rpms/vnc/F-10/vnc-use-fb.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- vnc-use-fb.patch	16 Jul 2008 11:40:44 -0000	1.5
+++ vnc-use-fb.patch	26 Jan 2009 16:58:10 -0000	1.6
@@ -29,7 +29,7 @@
 +#endif
  }
  
- #define XVNCVERSION "Free Edition 4.1.2"
+ #define XVNCVERSION "Free Edition 4.1.3"
 @@ -482,7 +488,7 @@ CARD32 GetTimeInMillis()
  }
  #endif

vnc-via.patch:

Index: vnc-via.patch
===================================================================
RCS file: /cvs/pkgs/rpms/vnc/F-10/vnc-via.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- vnc-via.patch	16 Jul 2008 11:40:44 -0000	1.6
+++ vnc-via.patch	26 Jan 2009 16:58:10 -0000	1.7
@@ -131,7 +131,7 @@
 +
  int main(int argc, char** argv)
  {
-   sprintf(aboutText, "VNC Viewer Free Edition 4.1.2 for X - built %s\n"
+   sprintf(aboutText, "VNC Viewer Free Edition 4.1.3 for X - built %s\n"
 @@ -190,8 +249,6 @@ int main(int argc, char** argv)
        usage();
      }

vnc-xorg.patch:

Index: vnc-xorg.patch
===================================================================
RCS file: /cvs/pkgs/rpms/vnc/F-10/vnc-xorg.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- vnc-xorg.patch	3 Oct 2008 12:51:54 -0000	1.5
+++ vnc-xorg.patch	26 Jan 2009 16:58:10 -0000	1.6
@@ -1,15 +1,16 @@
-diff -up vnc-4_1_2-unixsrc/unix/xorg-x11-server-source/configure.ac.vnc vnc-4_1_2-unixsrc/unix/xorg-x11-server-source/configure.ac
---- vnc-4_1_2-unixsrc/unix/xorg-x11-server-source/configure.ac.vnc	2008-10-03 14:27:43.000000000 +0200
-+++ vnc-4_1_2-unixsrc/unix/xorg-x11-server-source/configure.ac	2008-10-03 14:29:10.000000000 +0200
-@@ -30,7 +30,6 @@ AC_INIT([xorg-server], 1.5.1, [https://b
- RELEASE_DATE="23 September 2008"
+diff -up vnc-4_1_3-unixsrc/common/javabin/index.vnc vnc-4_1_3-unixsrc/common/javabin/index
+diff -up vnc-4_1_3-unixsrc/unix/xorg-x11-server-source/configure.ac.vnc vnc-4_1_3-unixsrc/unix/xorg-x11-server-source/configure.ac
+--- vnc-4_1_3-unixsrc/unix/xorg-x11-server-source/configure.ac.vnc	2009-01-26 17:52:43.000000000 +0100
++++ vnc-4_1_3-unixsrc/unix/xorg-x11-server-source/configure.ac	2009-01-26 17:53:04.000000000 +0100
+@@ -31,7 +31,6 @@ RELEASE_DATE="5 November 2008"
+ REMEMBER_REMEMBER="The Fifth of November"
  AC_CONFIG_SRCDIR([Makefile.am])
  AM_INIT_AUTOMAKE([dist-bzip2 foreign])
 -AM_MAINTAINER_MODE
  
  dnl this gets generated by autoheader, and thus contains all the defines.  we
  dnl don't ever actually use it, internally.
-@@ -1214,6 +1213,13 @@ if test "x$XVFB" = xyes; then
+@@ -1215,6 +1214,13 @@ if test "x$XVFB" = xyes; then
  	AC_SUBST([XVFB_SYS_LIBS])
  fi
  
@@ -23,7 +24,7 @@
  
  dnl Xnest DDX
  
-@@ -2178,6 +2184,7 @@ hw/dmx/input/Makefile
+@@ -2179,6 +2185,7 @@ hw/dmx/input/Makefile
  hw/dmx/glxProxy/Makefile
  hw/dmx/Makefile
  hw/vfb/Makefile
@@ -31,9 +32,9 @@
  hw/xgl/Makefile
  hw/xgl/egl/Makefile
  hw/xgl/egl/module/Makefile
-diff -up vnc-4_1_2-unixsrc/unix/xorg-x11-server-source/hw/Makefile.am.vnc vnc-4_1_2-unixsrc/unix/xorg-x11-server-source/hw/Makefile.am
---- vnc-4_1_2-unixsrc/unix/xorg-x11-server-source/hw/Makefile.am.vnc	2008-10-03 14:27:44.000000000 +0200
-+++ vnc-4_1_2-unixsrc/unix/xorg-x11-server-source/hw/Makefile.am	2008-10-03 14:27:47.000000000 +0200
+diff -up vnc-4_1_3-unixsrc/unix/xorg-x11-server-source/hw/Makefile.am.vnc vnc-4_1_3-unixsrc/unix/xorg-x11-server-source/hw/Makefile.am
+--- vnc-4_1_3-unixsrc/unix/xorg-x11-server-source/hw/Makefile.am.vnc	2009-01-26 17:52:43.000000000 +0100
++++ vnc-4_1_3-unixsrc/unix/xorg-x11-server-source/hw/Makefile.am	2009-01-26 17:52:46.000000000 +0100
 @@ -43,7 +43,8 @@ SUBDIRS =			\
  	$(DMX_SUBDIRS)		\
  	$(KDRIVE_SUBDIRS)	\
@@ -44,9 +45,9 @@
  
  DIST_SUBDIRS = dmx xfree86 vfb xnest xwin xquartz kdrive xgl xprint
  
-diff -up vnc-4_1_2-unixsrc/unix/xorg-x11-server-source/mi/miinitext.c.vnc vnc-4_1_2-unixsrc/unix/xorg-x11-server-source/mi/miinitext.c
---- vnc-4_1_2-unixsrc/unix/xorg-x11-server-source/mi/miinitext.c.vnc	2008-10-03 14:27:44.000000000 +0200
-+++ vnc-4_1_2-unixsrc/unix/xorg-x11-server-source/mi/miinitext.c	2008-10-03 14:27:47.000000000 +0200
+diff -up vnc-4_1_3-unixsrc/unix/xorg-x11-server-source/mi/miinitext.c.vnc vnc-4_1_3-unixsrc/unix/xorg-x11-server-source/mi/miinitext.c
+--- vnc-4_1_3-unixsrc/unix/xorg-x11-server-source/mi/miinitext.c.vnc	2009-01-26 17:52:43.000000000 +0100
++++ vnc-4_1_3-unixsrc/unix/xorg-x11-server-source/mi/miinitext.c	2009-01-26 17:52:46.000000000 +0100
 @@ -292,6 +292,7 @@ extern void BigReqExtensionInit(INITARGS
  #ifdef MITMISC
  extern void MITMiscExtensionInit(INITARGS);


Index: vnc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vnc/F-10/vnc.spec,v
retrieving revision 1.203
retrieving revision 1.204
diff -u -r1.203 -r1.204
--- vnc.spec	3 Oct 2008 12:51:55 -0000	1.203
+++ vnc.spec	26 Jan 2009 16:58:10 -0000	1.204
@@ -1,9 +1,9 @@
-%define vnc_version 4_1_2
+%define vnc_version 4_1_3
 
 Summary:   A remote display system
 Name:      vnc
-Version:   4.1.2
-Release:   35%{?dist}
+Version:   4.1.3
+Release:   1%{?dist}
 URL:       http://www.realvnc.com
 Source0:   http://www.realvnc.com/dist/vnc-%{vnc_version}-unixsrc.tar.gz
 Source1:   Makefile.am
@@ -332,6 +332,9 @@
 %{_libdir}/librfb.so.*
 
 %changelog
+* Mon Jan 26 2009 Adam Tkac <atkac redhat com> 4.1.3-1
+- updated to 4.1.3 (CVE-2008-4770)
+
 * Fri Oct 03 2008 Adam Tkac <atkac redhat com> 4.1.2-35
 - updated patches due rpm 4.6 (#465099)
 - build with -O2



From rdieter at fedoraproject.org  Mon Jan 26 16:59:18 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 26 Jan 2009 16:59:18 +0000 (UTC)
Subject: rpms/xine-lib/devel xine-lib.spec,1.61,1.62
Message-ID: <20090126165918.1F7A97010C@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/xine-lib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3009

Modified Files:
	xine-lib.spec 
Log Message:
* Mon Jan 26 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.1.16.1-2
- Provides: xine-lib(plugin-abi)%{?_isa} = %{abiver}
- touchup Summary/Description



Index: xine-lib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xine-lib/devel/xine-lib.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- xine-lib.spec	23 Jan 2009 14:32:05 -0000	1.61
+++ xine-lib.spec	26 Jan 2009 16:58:47 -0000	1.62
@@ -31,10 +31,10 @@
 %define _without_arts --without-arts
 %endif
 
-Summary:        Xine library
+Summary:        A multimedia engine 
 Name:           xine-lib
 Version:        1.1.16.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 License:        GPLv2+
 Group:          System Environment/Libraries
 URL:            http://xinehq.de/
@@ -57,6 +57,9 @@
 ## upstream patches
 
 Provides:       xine-lib(plugin-abi) = %{abiver}
+%if "%{?_isa}" != "%{nil}"
+Provides:       xine-lib(plugin-abi)%{?_isa} = %{abiver}
+%endif
 # X11
 BuildRequires:  libX11-devel
 BuildRequires:  libXv-devel
@@ -119,13 +122,10 @@
 BuildRequires:  libdvdnav-devel
 
 %description
-This package contains the Xine library. Xine is a free multimedia player.
-It can play back various media. It also decodes multimedia files from local
-disk drives, and displays multimedia streamed over the Internet. It
-interprets many of the most common multimedia formats available - and some
-of the most uncommon formats, too.  --with/--without rpmbuild options
-(some default values depend on target distribution): aalib, directfb,
-imagemagick, freetype, antialiasing (with freetype), pulseaudio, xcb.
+This package contains the Xine library.  It can be used to play back
+various media, decode multimedia files from local disk drives, and display
+multimedia streamed over the Internet. It interprets many of the most
+common multimedia formats available - and some uncommon formats, too. 
 
 %package        devel
 Summary:        Xine library development files
@@ -135,10 +135,10 @@
 Requires:       zlib-devel
 
 %description    devel
-This package contains development files for xine-lib.
+This package contains development files for %{name}.
 
 %package        arts
-Summary:        aRts plugin for xine-lib
+Summary:        aRts plugin for %{name} 
 Group:          System Environment/Libraries
 Requires:       %{name} = %{version}-%{release}
 #Requires:      xine-lib(plugin-abi) = %{abiver}
@@ -146,27 +146,27 @@
 Obsoletes:      xine-lib-extras < 1.1.7-3
 
 %description    arts
-This package contains the aRts extra plugin for xine-lib.
+This package contains the aRts plugin for %{name}.
 
 %package        pulseaudio
-Summary:        Pulseaudio plugin for xine-lib
+Summary:        Pulseaudio plugin for %{name} 
 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.
+This package contains the pulseaudio plugin for %{name}.
 
 
 %package        extras
-Summary:        Additional plugins for xine-lib
+Summary:        Additional plugins for %{name} 
 Group:          System Environment/Libraries
 Requires:       %{name} = %{version}-%{release}
 #Requires:      xine-lib(plugin-abi) = %{abiver}
 
 %description    extras
-This package contains extra plugins for xine-lib:
+This package contains extra plugins for %{name}:
   - EsounD
   - JACK
   - GDK-Pixbuf
@@ -434,6 +434,10 @@
 
 
 %changelog
+* Mon Jan 26 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.1.16.1-2
+- Provides: xine-lib(plugin-abi)%%{?_isa} = %%{abiver}
+- touchup Summary/Description
+
 * Fri Jan 23 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.1.16.1-1
 - xine-lib-1.1.16.1
 - include avsync patch (#470568)



From mtasaka at fedoraproject.org  Mon Jan 26 17:08:09 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Mon, 26 Jan 2009 17:08:09 +0000 (UTC)
Subject: rpms/comix/devel .cvsignore, 1.12, 1.13 comix.spec, 1.21,
	1.22 sources, 1.12, 1.13
Message-ID: <20090126170809.7E11C7010C@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/comix/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4616

Modified Files:
	.cvsignore comix.spec sources 
Log Message:
* Tue Jan 27 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 4.0.3-0.1.rc1
- 4.0.3 rc1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/comix/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	3 Jan 2009 17:28:17 -0000	1.12
+++ .cvsignore	26 Jan 2009 17:07:39 -0000	1.13
@@ -1 +1,2 @@
-comix-4.0.2.tar.gz
+comix-4.0.3-rc1.tar.gz
+comix-ja.po.gz


Index: comix.spec
===================================================================
RCS file: /cvs/extras/rpms/comix/devel/comix.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- comix.spec	3 Jan 2009 17:28:18 -0000	1.21
+++ comix.spec	26 Jan 2009 17:07:39 -0000	1.22
@@ -3,11 +3,11 @@
 # mv trunk comix-%%mainver
 # tar czf comix-%%mainver-%%alphatag.tar.gz comix-%%mainver
 
-%define		mainver		4.0.2
-%undefine		alphatag	
+%define		mainver		4.0.3
+%define		alphatag	rc1
 %define		comix4		1
 
-%undefine		ifalpha		
+%define		ifalpha		1
 %define		fedorarel	1
 
 Name:		comix
@@ -23,7 +23,7 @@
 %else
 Source0:	http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 %endif
-#Source1:	comix-ja.po.gz
+Source1:	comix-ja.po.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:	noarch
@@ -49,6 +49,7 @@
 
 %prep
 %setup -q -n %{name}-%{version}%{?ifalpha:-%alphatag}
+gzip -dc %SOURCE1 > messages/ja/LC_MESSAGES/comix.po
 
 %{__mkdir_p} TMPBIN
 cd TMPBIN
@@ -176,6 +177,9 @@
 
 
 %changelog
+* Tue Jan 27 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 4.0.3-0.1.rc1
+- 4.0.3 rc1
+
 * Sun Jan  4 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 4.0.2-1
 - 4.0.2
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/comix/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	3 Jan 2009 17:28:18 -0000	1.12
+++ sources	26 Jan 2009 17:07:39 -0000	1.13
@@ -1 +1,2 @@
-8bf2565dc258ccdc3752a75025dd130e  comix-4.0.2.tar.gz
+ceafa1334e0f0f9f091a1a8704d2262f  comix-4.0.3-rc1.tar.gz
+ab1b42af115291a39b09a9d9f33ed383  comix-ja.po.gz



From rdieter at fedoraproject.org  Mon Jan 26 17:08:58 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 26 Jan 2009 17:08:58 +0000 (UTC)
Subject: rpms/kdelibs/devel plasma-on-screensaver-security-fix.diff, NONE,
	1.1 kdelibs.spec, 1.420,
	1.421 kdelibs-4.0.5-fedora-buildtype.patch, 1.3,
	NONE kdelibs-4.1.96-crash.patch, 1.1, NONE
Message-ID: <20090126170858.A5F0A7010C@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdelibs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4790

Modified Files:
	kdelibs.spec 
Added Files:
	plasma-on-screensaver-security-fix.diff 
Removed Files:
	kdelibs-4.0.5-fedora-buildtype.patch 
	kdelibs-4.1.96-crash.patch 
Log Message:
* Mon Jan 26 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.0-2
- plasma-on-screensaver-security patch
- (Build)Req: automoc4 >= 0.9.88, phonon(-devel) >= 4.3.0
- Requires: strigi-libs >= 0.6.3
- use %{?_isa} to avoid potential multilib heartbreak


plasma-on-screensaver-security-fix.diff:

--- NEW FILE plasma-on-screensaver-security-fix.diff ---
Index: containment.cpp
===================================================================
--- containment.cpp	(revision 916284)
+++ containment.cpp	(working copy)
@@ -1602,12 +1602,10 @@
         }
 
         bool canConfig = unlocked || KAuthorized::authorize("PlasmaAllowConfigureWhenLocked");
-        if (canConfig) {
-            action = actions().action("activity settings");
-            if (action) {
-                action->setVisible(canConfig);
-                action->setEnabled(canConfig);
-            }
+        action = actions().action("activity settings");
+        if (action) {
+            action->setVisible(canConfig);
+            action->setEnabled(canConfig);
         }
 
         // tell the applets too


Index: kdelibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.420
retrieving revision 1.421
diff -u -r1.420 -r1.421
--- kdelibs.spec	22 Jan 2009 11:18:31 -0000	1.420
+++ kdelibs.spec	26 Jan 2009 17:08:28 -0000	1.421
@@ -1,6 +1,6 @@
 Summary: K Desktop Environment 4 - Libraries
 Version: 4.2.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs
@@ -44,8 +44,9 @@
 %if 0%{?fedora} >= 9
 Requires: hunspell
 %endif
-Requires: phonon >= 4.2.96
-Requires: soprano >= 2.1.64
+Requires: phonon%{?_isa} >= 4.3.0
+Requires: soprano%{?_isa} >= 2.1.64
+Requires: strigi-libs%{?_isa} >= 0.6.3
 
 Source1: kde4.sh
 Source2: kde4.csh
@@ -79,11 +80,12 @@
 Patch22: kdelibs-4.1.96-cmake.patch
 
 # upstream
+Patch100: plasma-on-screensaver-security-fix.diff
 # 4.3 branch
 Patch101: kdelibs-4.1.96-AllowExternalPaths.patch
 
 BuildRequires: qt4-devel >= 4.4.0
-Requires: qt4 >= %{_qt4_version}
+Requires: qt4%{?_isa} >= %{_qt4_version}
 Requires: xdg-utils
 Requires(post): /sbin/ldconfig xdg-utils
 Requires(postun): /sbin/ldconfig xdg-utils
@@ -93,7 +95,7 @@
 # we don't want a hard dependency on aspell on F9+, use enchant only
 BuildRequires: aspell-devel
 %endif
-BuildRequires: automoc
+BuildRequires: automoc4 >= 0.9.88
 BuildRequires: avahi-devel
 BuildRequires: bzip2-devel
 BuildRequires: cmake >= 2.6.2-3
@@ -114,7 +116,7 @@
 BuildRequires: OpenEXR-devel
 BuildRequires: openssl-devel
 BuildRequires: pcre-devel
-BuildRequires: phonon-devel >= 4.2.96
+BuildRequires: phonon-devel >= 4.3.0
 BuildRequires: shared-mime-info
 BuildRequires: soprano-devel >= 2.1.64
 BuildRequires: strigi-devel >= 0.6.3
@@ -153,11 +155,11 @@
 Provides:  kdelibs4-devel = %{version}-%{release}
 %endif
 Requires: cmake >= 2.6.2-3
-Requires: automoc
+Requires: automoc4 >= 0.9.88
 Requires: qt4-devel
 Requires: openssl-devel
-Requires: phonon-devel >= 4.2.96
-Requires: strigi-devel >= 0.6.3
+Requires: phonon-devel
+Requires: strigi-devel
 Requires: bzip2-devel gamin-devel libacl-devel zlib-devel libutempter-devel
 %{?x_deps:Requires: %{x_deps}}
 %description devel
@@ -207,6 +209,9 @@
 %patch22 -p1 -b .kdepimlibs-cmake
 
 # upstream patches
+pushd plasma
+%patch100 -p0 -b .plasma-on-screensaver-security-fix
+popd
 %patch101 -p1 -b .AllowExternalPaths
 
 %build
@@ -369,6 +374,12 @@
 
 
 %changelog
+* Mon Jan 26 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.0-2
+- plasma-on-screensaver-security patch
+- (Build)Req: automoc4 >= 0.9.88, phonon(-devel) >= 4.3.0
+- Requires: strigi-libs >= 0.6.3
+- use %%{?_isa} to avoid potential multilib heartbreak
+
 * Thu Jan 22 2009 Than Ngo <than at redhat.com> - 4.2.0-1
 - 4.2.0
 


--- kdelibs-4.0.5-fedora-buildtype.patch DELETED ---


--- kdelibs-4.1.96-crash.patch DELETED ---



From atkac at fedoraproject.org  Mon Jan 26 17:14:42 2009
From: atkac at fedoraproject.org (Adam Tkac)
Date: Mon, 26 Jan 2009 17:14:42 +0000 (UTC)
Subject: rpms/xorg-x11-server/devel xorg-x11-server.spec,1.390,1.391
Message-ID: <20090126171442.C383B7010C@cvs1.fedora.phx.redhat.com>

Author: atkac

Update of /cvs/pkgs/rpms/xorg-x11-server/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5787

Modified Files:
	xorg-x11-server.spec 
Log Message:
- rebuild against new openssl



Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.390
retrieving revision 1.391
diff -u -r1.390 -r1.391
--- xorg-x11-server.spec	12 Jan 2009 23:21:24 -0000	1.390
+++ xorg-x11-server.spec	26 Jan 2009 17:14:12 -0000	1.391
@@ -19,7 +19,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.5.99.901
-Release:   1%{?dist}
+Release:   2%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -492,6 +492,9 @@
 
 
 %changelog
+* Mon Jan 26 2009 Adam Tkac <atkac redhat com> 1.5.99.901-2
+- rebuild against new openssl
+
 * Tue Jan 13 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.5.99.901-1
 - xserver 1.6 RC 1
 - fix "git-xyz" to "git xyz"



From rjones at fedoraproject.org  Mon Jan 26 17:21:58 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Mon, 26 Jan 2009 17:21:58 +0000 (UTC)
Subject: rpms/mingw32-filesystem/devel mingw32-rpmlint.config, NONE,
	1.1 mingw32-filesystem.spec, 1.11, 1.12
Message-ID: <20090126172158.22FBE7010C@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/mingw32-filesystem/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6745

Modified Files:
	mingw32-filesystem.spec 
Added Files:
	mingw32-rpmlint.config 
Log Message:
* Mon Jan 26 2009 Richard W.M. Jones <rjones at redhat.com> - 44-1
- Install rpmlint overrides file to suppress some rpmlint warnings.



--- NEW FILE mingw32-rpmlint.config ---
# rpmlint overrides file.
# This file filters out MinGW warnings.
# See: http://fedoraproject.org/wiki/MinGW/Rpmlint

# Unconditionally remove devel-file-in-non-devel rpmlint warning.
addFilter ("^mingw32-.*devel-file-in-non-devel")

# /usr/i686-pc-mingw32 is permitted by MinGW packaging guidelines.
addFilter ("^mingw32-.*non-standard-dir-in-usr i686-pc-mingw32")

# Permit *.la files (error is a bit odd, but it's what rpmlint prints).
addFilter ("^mingw32-.*script-without-shebang.*\.la$")

# GCC and libtool create executable archive files.  It's not clear
# why, but we permit this for now.
addFilter ("^mingw32-.*spurious-executable-perm.*\.dll\.a$")

# *.dll.a files are permitted arch-independent objects.
addFilter ("^mingw32-.*arch-independent-package-contains-binary-or-object.*\.dll\.a$")


Index: mingw32-filesystem.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-filesystem/devel/mingw32-filesystem.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- mingw32-filesystem.spec	24 Jan 2009 18:11:43 -0000	1.11
+++ mingw32-filesystem.spec	26 Jan 2009 17:21:27 -0000	1.12
@@ -1,8 +1,8 @@
 %define debug_package %{nil}
 
 Name:           mingw32-filesystem
-Version:        43
-Release:        6%{?dist}
+Version:        44
+Release:        1%{?dist}
 Summary:        MinGW base filesystem and environment
 
 Group:          Development/Libraries
@@ -18,9 +18,13 @@
 Source4:        mingw32-find-requires.sh
 Source5:        mingw32-find-provides.sh
 Source6:        mingw32-scripts.sh
+Source7:        mingw32-rpmlint.config
 
 Requires:       setup
 Requires:       rpm
+Requires:       rpmlint >= 0.85-2
+
+BuildRequires:  rpmlint >= 0.85-2
 
 # Note about 'Provides: mingw32(foo.dll)'
 # ------------------------------------------------------------
@@ -88,6 +92,9 @@
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/rpm
 install -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/rpm/macros.mingw32
 
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/rpmlint
+install -m 644 %{SOURCE7} $RPM_BUILD_ROOT%{_sysconfdir}/rpmlint/
+
 mkdir -p $RPM_BUILD_ROOT%{_prefix}/i686-pc-mingw32
 
 # GCC requires these directories, even though they contain links
@@ -137,6 +144,7 @@
 %config(noreplace) %{_sysconfdir}/rpm/macros.mingw32
 %config(noreplace) %{_sysconfdir}/profile.d/mingw32.sh
 #%config(noreplace) %{_sysconfdir}/profile.d/mingw32.csh
+%config(noreplace) %{_sysconfdir}/rpmlint/mingw32-rpmlint.config
 %{_bindir}/mingw32-configure
 %{_bindir}/mingw32-make
 %{_libexecdir}/mingw32-scripts
@@ -145,6 +153,9 @@
 
 
 %changelog
+* Mon Jan 26 2009 Richard W.M. Jones <rjones at redhat.com> - 44-1
+- Install rpmlint overrides file to suppress some rpmlint warnings.
+
 * Sat Jan 24 2009 Richard W.M. Jones <rjones at redhat.com> - 43-6
 - Don't claim C++ compiler exists if it's not installed, as this
   breaks autoconf and (in particular) libtool.



From scop at fedoraproject.org  Mon Jan 26 17:29:47 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Mon, 26 Jan 2009 17:29:47 +0000 (UTC)
Subject: rpms/colordiff/F-10 colordiff-1.0.8a-cdiff.patch, NONE,
	1.1 colordiff-1.0.8a-destdir.patch, NONE, 1.1 .cvsignore, 1.6,
	1.7 colordiff.spec, 1.12, 1.13 sources, 1.7, 1.8
Message-ID: <20090126172947.21A5D7010C@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/colordiff/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8117/F-10

Modified Files:
	.cvsignore colordiff.spec sources 
Added Files:
	colordiff-1.0.8a-cdiff.patch colordiff-1.0.8a-destdir.patch 
Log Message:
* Mon Jan 26 2009 Ville Skytt?? <ville.skytta at iki.fi> - 1.0.8a-1
- 1.0.8a.
- Patch Makefile for DESTDIR support.
- Patch cdiff for lzma support, man page improvements.


colordiff-1.0.8a-cdiff.patch:

--- NEW FILE colordiff-1.0.8a-cdiff.patch ---
diff -up colordiff-1.0.8a/cdiff.sh~ colordiff-1.0.8a/cdiff.sh
--- colordiff-1.0.8a/cdiff.sh~	2005-03-28 22:33:07.000000000 +0300
+++ colordiff-1.0.8a/cdiff.sh	2009-01-26 19:03:48.000000000 +0200
@@ -23,12 +23,9 @@
     while [ "$1" != "" ]; do
         file=`echo "$1" | perl -pe 's|^file:/+|/|i'`
         case "$file" in
-        *.bz2)
-            cat="bzcat"
-            ;;
-        *)
-            cat="zcat -f"
-            ;;
+            *.bz2)   cat="bzip2 -dcf" ;;
+            *.lzma)  cat="lzma -dc"   ;;
+            *)       cat="gzip -dcf"  ;;
         esac
         case `echo "$file" | perl -ne 'print lc $_'` in
         http:*|https:*|ftp:*)
diff -up colordiff-1.0.8a/cdiff.xml~ colordiff-1.0.8a/cdiff.xml
--- colordiff-1.0.8a/cdiff.xml~	2009-01-25 13:18:50.000000000 +0200
+++ colordiff-1.0.8a/cdiff.xml	2009-01-26 19:04:56.000000000 +0200
@@ -22,19 +22,24 @@
 <refsynopsisdiv id='synopsis'>
   <cmdsynopsis>
     <command>cdiff</command>
-    <arg choice='req'><replaceable>URL</replaceable></arg>
+    <arg choice='req'><replaceable>URL|FILE</replaceable></arg>
   </cmdsynopsis>
 </refsynopsisdiv>
 
 <refsect1 id='description'><title>Description</title>
 
 <para>&cdiff; is a wrapper for colordiff and will add colour to a diff given
-in a URL, e.g.</para>
+in a URL or a file, e.g.</para>
 
 <screen>
 cdiff http://some.url.com/foo/thing.patch
 </screen>
 
+<para>It also adds support for reading gzip, bzip2 and lzma compressed diffs,
+and like colordiff, also supports reading diffs from standard input if URL
+or a filename is not specified.  &cdiff; pipes colordiff's output through
+less -R.</para>
+
 </refsect1>
 
 <refsect1 id='seealso'><title>See Also</title>

colordiff-1.0.8a-destdir.patch:

--- NEW FILE colordiff-1.0.8a-destdir.patch ---
diff -up colordiff-1.0.8a/Makefile~ colordiff-1.0.8a/Makefile
--- colordiff-1.0.8a/Makefile~	2009-01-25 20:54:04.000000000 +0200
+++ colordiff-1.0.8a/Makefile	2009-01-26 19:16:16.000000000 +0200
@@ -20,28 +20,32 @@ doc: colordiff.xml cdiff.xml
 	perl -p -i -e 's#<div class=\"refentry\"#<div id=\"content\"><div class=\"refentry\"#' colordiff.html
 	mv colordiff.html ../htdocs
 
-etc:
-	sed -e "s%/etc%$(ETC_DIR)%g" colordiff.pl > colordiff.pl.for.install
-
-install: etc
-	install -D colordiff.pl.for.install ${INSTALL_DIR}/colordiff
-	if [ ! -f ${INSTALL_DIR}/cdiff ] ; then \
-	  install cdiff.sh ${INSTALL_DIR}/cdiff; \
+install:
+	install -d ${DESTDIR}${INSTALL_DIR}
+	sed -e "s%/etc%${ETC_DIR}%g" colordiff.pl > \
+	  ${DESTDIR}${INSTALL_DIR}/colordiff
+	chmod +x ${DESTDIR}${INSTALL_DIR}/colordiff
+	if [ ! -f ${DESTDIR}${INSTALL_DIR}/cdiff ] ; then \
+	  install cdiff.sh ${DESTDIR}${INSTALL_DIR}/cdiff; \
 	fi
-	install -D colordiff.1 ${MAN_DIR}/colordiff.1
-	install -D cdiff.1 ${MAN_DIR}/cdiff.1
-	if [ -f ${ETC_DIR}/colordiffrc ]; then \
-	  mv -f ${ETC_DIR}/colordiffrc ${ETC_DIR}/colordiffrc.old; \
+	install -D colordiff.1 ${DESTDIR}${MAN_DIR}/colordiff.1
+	install -D cdiff.1 ${DESTDIR}${MAN_DIR}/cdiff.1
+	if [ -f ${DESTDIR}${ETC_DIR}/colordiffrc ]; then \
+	  mv -f ${DESTDIR}${ETC_DIR}/colordiffrc \
+	    ${DESTDIR}${ETC_DIR}/colordiffrc.old; \
+	else \
+	  install -d ${DESTDIR}${ETC_DIR}; \
 	fi
-	cp colordiffrc ${ETC_DIR}/colordiffrc
-	chown root.root ${ETC_DIR}/colordiffrc
-	chmod 644 ${ETC_DIR}/colordiffrc
-	rm -f colordiff.pl.for.install
+	cp colordiffrc ${DESTDIR}${ETC_DIR}/colordiffrc
+	-chown root.root ${DESTDIR}${ETC_DIR}/colordiffrc
+	chmod 644 ${DESTDIR}${ETC_DIR}/colordiffrc
 
-uninstall: etc
-	rm -f ${INSTALL_DIR}/colordiff
-	rm -f ${ETC_DIR}/colordiffrc
-	rm -f ${INSTALL_DIR}/cdiff
+uninstall:
+	rm -f ${DESTDIR}${INSTALL_DIR}/colordiff
+	rm -f ${DESTDIR}${ETC_DIR}/colordiffrc
+	rm -f ${DESTDIR}${INSTALL_DIR}/cdiff
+	rm -f ${DESTDIR}${MAN_DIR}/colordiff.1
+	rm -f ${DESTDIR}${MAN_DIR}/cdiff.1
 
 dist:
 	mkdir ${TMPDIR}


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/colordiff/F-10/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	5 Nov 2007 22:21:28 -0000	1.6
+++ .cvsignore	26 Jan 2009 17:29:16 -0000	1.7
@@ -1 +1 @@
-colordiff-1.0.7.tar.gz
+colordiff-1.0.8a.tar.gz


Index: colordiff.spec
===================================================================
RCS file: /cvs/pkgs/rpms/colordiff/F-10/colordiff.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- colordiff.spec	10 Apr 2008 20:08:51 -0000	1.12
+++ colordiff.spec	26 Jan 2009 17:29:16 -0000	1.13
@@ -1,17 +1,26 @@
 Name:           colordiff
-Version:        1.0.7
-Release:        3
+Version:        1.0.8a
+Release:        1
 Summary:        Color terminal highlighter for diff files
 
 Group:          Applications/Text
 License:        GPLv2+
 URL:            http://colordiff.sourceforge.net/
 Source0:        http://colordiff.sourceforge.net/%{name}-%{version}.tar.gz
+# Non-upstream, better default colors for Fedora default desktop themes
 Patch0:         %{name}-1.0.6-colors.patch
+# Sent upstream 2008-04-??
 Patch1:         %{name}-1.0.7-wget111-441862.patch
+# Sent upstream 2009-01-26
+Patch2:         %{name}-1.0.8a-destdir.patch
+# Sent upstream 2009-01-26
+Patch3:         %{name}-1.0.8a-cdiff.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
+# xmlto, docbook-dtds for patch3
+BuildRequires:  xmlto, docbook-dtd412-xml
+Requires:       lzma
 Requires:       bzip2
 Requires:       gzip
 Requires:       less
@@ -28,19 +37,20 @@
 %setup -q
 %patch0 -p1
 %patch1 -p1
-mv colordiffrc colordiffrc-darkbg
+%patch2 -p1
+%patch3 -p1
+mv colordiffrc colordiffrc-darkbg ; cp -p colordiffrc-lightbg colordiffrc
 f=CHANGES ; iconv -f iso-8859-1 -t utf-8 $f > $f.utf8 ; mv $f.utf8 $f
 
 
 %build
+xmlto -vv man cdiff.xml
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -Dpm 755 colordiff.pl $RPM_BUILD_ROOT%{_bindir}/colordiff
-install -pm 755 cdiff.sh $RPM_BUILD_ROOT%{_bindir}/cdiff
-install -Dpm 644 colordiff.1 $RPM_BUILD_ROOT%{_mandir}/man1/colordiff.1
-install -Dpm 644 colordiffrc-lightbg $RPM_BUILD_ROOT%{_sysconfdir}/colordiffrc
+make install DESTDIR=$RPM_BUILD_ROOT INSTALL_DIR=%{_bindir} \
+    ETC_DIR=%{_sysconfdir} MAN_DIR=%{_mandir}/man1
 
 
 %clean
@@ -53,10 +63,16 @@
 %config(noreplace) %{_sysconfdir}/colordiffrc
 %{_bindir}/cdiff
 %{_bindir}/colordiff
+%{_mandir}/man1/cdiff.1*
 %{_mandir}/man1/colordiff.1*
 
 
 %changelog
+* Mon Jan 26 2009 Ville Skytt?? <ville.skytta at iki.fi> - 1.0.8a-1
+- 1.0.8a.
+- Patch Makefile for DESTDIR support.
+- Patch cdiff for lzma support, man page improvements.
+
 * Thu Apr 10 2008 Ville Skytt?? <ville.skytta at iki.fi> - 1.0.7-3
 - Patch to work around wget 1.11 regression, prefer curl over wget (#441862).
 - Drop disttag.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/colordiff/F-10/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	6 Nov 2007 19:30:51 -0000	1.7
+++ sources	26 Jan 2009 17:29:16 -0000	1.8
@@ -1 +1 @@
-940d4d1c388e66d352bce0887a39a3c5  colordiff-1.0.7.tar.gz
+2355debed9a9a0183c33ef27c62feb3b  colordiff-1.0.8a.tar.gz



From scop at fedoraproject.org  Mon Jan 26 17:29:47 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Mon, 26 Jan 2009 17:29:47 +0000 (UTC)
Subject: rpms/colordiff/devel colordiff-1.0.8a-cdiff.patch, NONE,
	1.1 colordiff-1.0.8a-destdir.patch, NONE, 1.1 .cvsignore, 1.6,
	1.7 colordiff.spec, 1.12, 1.13 sources, 1.7, 1.8
Message-ID: <20090126172947.842627010C@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/colordiff/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8117/devel

Modified Files:
	.cvsignore colordiff.spec sources 
Added Files:
	colordiff-1.0.8a-cdiff.patch colordiff-1.0.8a-destdir.patch 
Log Message:
* Mon Jan 26 2009 Ville Skytt?? <ville.skytta at iki.fi> - 1.0.8a-1
- 1.0.8a.
- Patch Makefile for DESTDIR support.
- Patch cdiff for lzma support, man page improvements.


colordiff-1.0.8a-cdiff.patch:

--- NEW FILE colordiff-1.0.8a-cdiff.patch ---
diff -up colordiff-1.0.8a/cdiff.sh~ colordiff-1.0.8a/cdiff.sh
--- colordiff-1.0.8a/cdiff.sh~	2005-03-28 22:33:07.000000000 +0300
+++ colordiff-1.0.8a/cdiff.sh	2009-01-26 19:03:48.000000000 +0200
@@ -23,12 +23,9 @@
     while [ "$1" != "" ]; do
         file=`echo "$1" | perl -pe 's|^file:/+|/|i'`
         case "$file" in
-        *.bz2)
-            cat="bzcat"
-            ;;
-        *)
-            cat="zcat -f"
-            ;;
+            *.bz2)   cat="bzip2 -dcf" ;;
+            *.lzma)  cat="lzma -dc"   ;;
+            *)       cat="gzip -dcf"  ;;
         esac
         case `echo "$file" | perl -ne 'print lc $_'` in
         http:*|https:*|ftp:*)
diff -up colordiff-1.0.8a/cdiff.xml~ colordiff-1.0.8a/cdiff.xml
--- colordiff-1.0.8a/cdiff.xml~	2009-01-25 13:18:50.000000000 +0200
+++ colordiff-1.0.8a/cdiff.xml	2009-01-26 19:04:56.000000000 +0200
@@ -22,19 +22,24 @@
 <refsynopsisdiv id='synopsis'>
   <cmdsynopsis>
     <command>cdiff</command>
-    <arg choice='req'><replaceable>URL</replaceable></arg>
+    <arg choice='req'><replaceable>URL|FILE</replaceable></arg>
   </cmdsynopsis>
 </refsynopsisdiv>
 
 <refsect1 id='description'><title>Description</title>
 
 <para>&cdiff; is a wrapper for colordiff and will add colour to a diff given
-in a URL, e.g.</para>
+in a URL or a file, e.g.</para>
 
 <screen>
 cdiff http://some.url.com/foo/thing.patch
 </screen>
 
+<para>It also adds support for reading gzip, bzip2 and lzma compressed diffs,
+and like colordiff, also supports reading diffs from standard input if URL
+or a filename is not specified.  &cdiff; pipes colordiff's output through
+less -R.</para>
+
 </refsect1>
 
 <refsect1 id='seealso'><title>See Also</title>

colordiff-1.0.8a-destdir.patch:

--- NEW FILE colordiff-1.0.8a-destdir.patch ---
diff -up colordiff-1.0.8a/Makefile~ colordiff-1.0.8a/Makefile
--- colordiff-1.0.8a/Makefile~	2009-01-25 20:54:04.000000000 +0200
+++ colordiff-1.0.8a/Makefile	2009-01-26 19:16:16.000000000 +0200
@@ -20,28 +20,32 @@ doc: colordiff.xml cdiff.xml
 	perl -p -i -e 's#<div class=\"refentry\"#<div id=\"content\"><div class=\"refentry\"#' colordiff.html
 	mv colordiff.html ../htdocs
 
-etc:
-	sed -e "s%/etc%$(ETC_DIR)%g" colordiff.pl > colordiff.pl.for.install
-
-install: etc
-	install -D colordiff.pl.for.install ${INSTALL_DIR}/colordiff
-	if [ ! -f ${INSTALL_DIR}/cdiff ] ; then \
-	  install cdiff.sh ${INSTALL_DIR}/cdiff; \
+install:
+	install -d ${DESTDIR}${INSTALL_DIR}
+	sed -e "s%/etc%${ETC_DIR}%g" colordiff.pl > \
+	  ${DESTDIR}${INSTALL_DIR}/colordiff
+	chmod +x ${DESTDIR}${INSTALL_DIR}/colordiff
+	if [ ! -f ${DESTDIR}${INSTALL_DIR}/cdiff ] ; then \
+	  install cdiff.sh ${DESTDIR}${INSTALL_DIR}/cdiff; \
 	fi
-	install -D colordiff.1 ${MAN_DIR}/colordiff.1
-	install -D cdiff.1 ${MAN_DIR}/cdiff.1
-	if [ -f ${ETC_DIR}/colordiffrc ]; then \
-	  mv -f ${ETC_DIR}/colordiffrc ${ETC_DIR}/colordiffrc.old; \
+	install -D colordiff.1 ${DESTDIR}${MAN_DIR}/colordiff.1
+	install -D cdiff.1 ${DESTDIR}${MAN_DIR}/cdiff.1
+	if [ -f ${DESTDIR}${ETC_DIR}/colordiffrc ]; then \
+	  mv -f ${DESTDIR}${ETC_DIR}/colordiffrc \
+	    ${DESTDIR}${ETC_DIR}/colordiffrc.old; \
+	else \
+	  install -d ${DESTDIR}${ETC_DIR}; \
 	fi
-	cp colordiffrc ${ETC_DIR}/colordiffrc
-	chown root.root ${ETC_DIR}/colordiffrc
-	chmod 644 ${ETC_DIR}/colordiffrc
-	rm -f colordiff.pl.for.install
+	cp colordiffrc ${DESTDIR}${ETC_DIR}/colordiffrc
+	-chown root.root ${DESTDIR}${ETC_DIR}/colordiffrc
+	chmod 644 ${DESTDIR}${ETC_DIR}/colordiffrc
 
-uninstall: etc
-	rm -f ${INSTALL_DIR}/colordiff
-	rm -f ${ETC_DIR}/colordiffrc
-	rm -f ${INSTALL_DIR}/cdiff
+uninstall:
+	rm -f ${DESTDIR}${INSTALL_DIR}/colordiff
+	rm -f ${DESTDIR}${ETC_DIR}/colordiffrc
+	rm -f ${DESTDIR}${INSTALL_DIR}/cdiff
+	rm -f ${DESTDIR}${MAN_DIR}/colordiff.1
+	rm -f ${DESTDIR}${MAN_DIR}/cdiff.1
 
 dist:
 	mkdir ${TMPDIR}


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/colordiff/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	5 Nov 2007 22:21:28 -0000	1.6
+++ .cvsignore	26 Jan 2009 17:29:16 -0000	1.7
@@ -1 +1 @@
-colordiff-1.0.7.tar.gz
+colordiff-1.0.8a.tar.gz


Index: colordiff.spec
===================================================================
RCS file: /cvs/pkgs/rpms/colordiff/devel/colordiff.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- colordiff.spec	10 Apr 2008 20:08:51 -0000	1.12
+++ colordiff.spec	26 Jan 2009 17:29:17 -0000	1.13
@@ -1,17 +1,26 @@
 Name:           colordiff
-Version:        1.0.7
-Release:        3
+Version:        1.0.8a
+Release:        1
 Summary:        Color terminal highlighter for diff files
 
 Group:          Applications/Text
 License:        GPLv2+
 URL:            http://colordiff.sourceforge.net/
 Source0:        http://colordiff.sourceforge.net/%{name}-%{version}.tar.gz
+# Non-upstream, better default colors for Fedora default desktop themes
 Patch0:         %{name}-1.0.6-colors.patch
+# Sent upstream 2008-04-??
 Patch1:         %{name}-1.0.7-wget111-441862.patch
+# Sent upstream 2009-01-26
+Patch2:         %{name}-1.0.8a-destdir.patch
+# Sent upstream 2009-01-26
+Patch3:         %{name}-1.0.8a-cdiff.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
+# xmlto, docbook-dtds for patch3
+BuildRequires:  xmlto, docbook-dtd412-xml
+Requires:       lzma
 Requires:       bzip2
 Requires:       gzip
 Requires:       less
@@ -28,19 +37,20 @@
 %setup -q
 %patch0 -p1
 %patch1 -p1
-mv colordiffrc colordiffrc-darkbg
+%patch2 -p1
+%patch3 -p1
+mv colordiffrc colordiffrc-darkbg ; cp -p colordiffrc-lightbg colordiffrc
 f=CHANGES ; iconv -f iso-8859-1 -t utf-8 $f > $f.utf8 ; mv $f.utf8 $f
 
 
 %build
+xmlto -vv man cdiff.xml
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -Dpm 755 colordiff.pl $RPM_BUILD_ROOT%{_bindir}/colordiff
-install -pm 755 cdiff.sh $RPM_BUILD_ROOT%{_bindir}/cdiff
-install -Dpm 644 colordiff.1 $RPM_BUILD_ROOT%{_mandir}/man1/colordiff.1
-install -Dpm 644 colordiffrc-lightbg $RPM_BUILD_ROOT%{_sysconfdir}/colordiffrc
+make install DESTDIR=$RPM_BUILD_ROOT INSTALL_DIR=%{_bindir} \
+    ETC_DIR=%{_sysconfdir} MAN_DIR=%{_mandir}/man1
 
 
 %clean
@@ -53,10 +63,16 @@
 %config(noreplace) %{_sysconfdir}/colordiffrc
 %{_bindir}/cdiff
 %{_bindir}/colordiff
+%{_mandir}/man1/cdiff.1*
 %{_mandir}/man1/colordiff.1*
 
 
 %changelog
+* Mon Jan 26 2009 Ville Skytt?? <ville.skytta at iki.fi> - 1.0.8a-1
+- 1.0.8a.
+- Patch Makefile for DESTDIR support.
+- Patch cdiff for lzma support, man page improvements.
+
 * Thu Apr 10 2008 Ville Skytt?? <ville.skytta at iki.fi> - 1.0.7-3
 - Patch to work around wget 1.11 regression, prefer curl over wget (#441862).
 - Drop disttag.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/colordiff/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	6 Nov 2007 19:30:51 -0000	1.7
+++ sources	26 Jan 2009 17:29:17 -0000	1.8
@@ -1 +1 @@
-940d4d1c388e66d352bce0887a39a3c5  colordiff-1.0.7.tar.gz
+2355debed9a9a0183c33ef27c62feb3b  colordiff-1.0.8a.tar.gz



From rdieter at fedoraproject.org  Mon Jan 26 17:39:02 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 26 Jan 2009 17:39:02 +0000 (UTC)
Subject: rpms/kdebase-runtime/devel kdebase-runtime-4.2.0-kde#178479.patch, 
	NONE, 1.1 kdebase-runtime.spec, 1.89, 1.90
Message-ID: <20090126173902.0F6107010C@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdebase-runtime/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10145

Modified Files:
	kdebase-runtime.spec 
Added Files:
	kdebase-runtime-4.2.0-kde#178479.patch 
Log Message:
* Mon Jan 26 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.0-2
- Files not trashed to the correct location in Dolphin/Konqueror 
  (#481598, kdebug#178479)
- omit --with-samba crud


kdebase-runtime-4.2.0-kde#178479.patch:

--- NEW FILE kdebase-runtime-4.2.0-kde#178479.patch ---
--- branches/KDE/4.2/kdebase/runtime/kioslave/trash/trashimpl.cpp	2009/01/26 16:31:17	916986
+++ branches/KDE/4.2/kdebase/runtime/kioslave/trash/trashimpl.cpp	2009/01/26 16:41:07	916987
@@ -766,8 +766,10 @@
         return 0;
 
     KMountPoint::Ptr mp = KMountPoint::currentMountPoints().findByPath( origPath );
-    if (!mp)
+    if (!mp) {
+        kDebug() << "KMountPoint found no mount point for" << origPath;
         return 0;
+    }
     QString mountPoint = mp->mountPoint();
     const QString trashDir = trashForMountPoint( mountPoint, true );
     kDebug() << "mountPoint=" << mountPoint << " trashDir=" << trashDir;
@@ -861,7 +863,7 @@
         if ( (S_ISDIR(buff.st_mode)) // must be a dir
              && (!S_ISLNK(buff.st_mode)) // not a symlink
              && ((buff.st_mode & requiredBits) == requiredBits)
-             && (::access(rootTrashDir_c, W_OK))
+             && (::access(rootTrashDir_c, W_OK) == 0) // must be user-writable
             ) {
             const QString trashDir = rootTrashDir + '/' + QString::number( uid );
             const QByteArray trashDir_c = QFile::encodeName( trashDir );


Index: kdebase-runtime.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-runtime/devel/kdebase-runtime.spec,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -r1.89 -r1.90
--- kdebase-runtime.spec	22 Jan 2009 16:01:40 -0000	1.89
+++ kdebase-runtime.spec	26 Jan 2009 17:38:31 -0000	1.90
@@ -3,24 +3,26 @@
 %define kde3_desktop 1
 %endif
 
-%define _with_samba --with-samba
-
 Name:          kdebase-runtime
 Summary:       K Desktop Environment - Runtime
 Version:       4.2.0
-Release:       1%{?dist}
+Release:       2%{?dist}
 
 License:       GPLv2
 Group:         User Interface/Desktops
 URL:           http://www.kde.org/
 Source0:       ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-runtime-%{version}.tar.bz2
 Source1:       khelpcenter.desktop
+BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
 Patch0:        kdebase-runtime-4.1.70-pulseaudio.patch
 Patch1:        kdebase-runtime-4.1.x-searchproviders-shortcuts.patch
 Patch2:        kdebase-runtime-4.1.1-knetattach.patch
 Patch3:        kdebase-runtime-4.1.1-iconthemes-inherit.patch
-# Upstream patches
-BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+## Upstream patches
+# http://bugs.kde.org/178479
+Patch100: kdebase-runtime-4.2.0-kde#178479.patch
 
 %ifarch noarch
 %define icons 1
@@ -41,7 +43,7 @@
 %{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
 Requires(post): xdg-utils
 Requires(postun): xdg-utils
-Requires: kdepimlibs >= %{version}
+Requires: kdepimlibs%{?_isa} >= %{version}
 %ifnarch s390 s390x
 Requires: eject
 %endif
@@ -51,7 +53,7 @@
 BuildRequires: hal-devel
 BuildRequires: kdelibs4-devel >= %{version}
 BuildRequires: kdepimlibs-devel >= %{version}
-%{?_with_samba:BuildRequires: libsmbclient-devel}
+BuildRequires: libsmbclient-devel
 # needed for phonon-xine VideoWidget, also need xine-lib built with libxcb support
 BuildRequires: libxcb-devel
 BuildRequires: libXScrnSaver-devel
@@ -106,16 +108,17 @@
 %patch3 -p1 -b .iconthemes-inherit
 
 # upstream patches
+%patch100 -p5 -b .kde#178479
 
-%build
 
+%build
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
 %{cmake_kde4} ..
 popd
 
 %if 0%{?rest}
-make %{?_smp_mflags} -C %{_target_platform} VERBOSE=1
+make %{?_smp_mflags} -C %{_target_platform}
 %endif
 
 
@@ -336,6 +339,11 @@
 
 
 %changelog
+* Mon Jan 26 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.0-2
+- Files not trashed to the correct location in Dolphin/Konqueror 
+  (#481598, kdebug#178479)
+- omit --with-samba crud
+
 * Thu Jan 22 2009 Than Ngo <than at redhat.com> - 4.2.0-1
 - 4.2.0
 - +BR: pulseaudio-libs-devel xine-lib-devel



From vpv at fedoraproject.org  Mon Jan 26 17:42:11 2009
From: vpv at fedoraproject.org (Ville-Pekka Vainio)
Date: Mon, 26 Jan 2009 17:42:11 +0000 (UTC)
Subject: comps comps-f11.xml.in,1.80,1.81
Message-ID: <20090126174211.7CACF7010C@cvs1.fedora.phx.redhat.com>

Author: vpv

Update of /cvs/pkgs/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10774

Modified Files:
	comps-f11.xml.in 
Log Message:
Change mozvoikko to conditional, requires firefox in the Finnish support group


Index: comps-f11.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f11.xml.in,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- comps-f11.xml.in	25 Jan 2009 17:37:05 -0000	1.80
+++ comps-f11.xml.in	26 Jan 2009 17:41:40 -0000	1.81
@@ -1405,10 +1405,10 @@
       <packagereq type="conditional" requires="kdelibs">kde-l10n-Finnish</packagereq>
       <packagereq type="conditional" requires="koffice-core">koffice-langpack-fi</packagereq>
       <packagereq type="conditional" requires="moodle">moodle-fi</packagereq>
+      <packagereq type="conditional" requires="firefox">mozvoikko</packagereq>
       <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-fi_FI</packagereq>
       <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-voikko</packagereq>
       <packagereq type="default">enchant-voikko</packagereq>
-      <packagereq type="optional">mozvoikko</packagereq>
       <packagereq type="optional">tmispell-voikko</packagereq>
     </packagelist>
   </group>



From rstrode at fedoraproject.org  Mon Jan 26 17:43:42 2009
From: rstrode at fedoraproject.org (Ray Strode)
Date: Mon, 26 Jan 2009 17:43:42 +0000 (UTC)
Subject: rpms/gedit/devel gedit-2.25.5-fix-python-path.patch, NONE,
	1.1 gedit.spec, 1.183, 1.184
Message-ID: <20090126174342.F20CB7010C@cvs1.fedora.phx.redhat.com>

Author: rstrode

Update of /cvs/pkgs/rpms/gedit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10965

Modified Files:
	gedit.spec 
Added Files:
	gedit-2.25.5-fix-python-path.patch 
Log Message:
- Fix up python plugin path to close up a security attack
  vectors (bug 481556).


gedit-2.25.5-fix-python-path.patch:

--- NEW FILE gedit-2.25.5-fix-python-path.patch ---
diff -up gedit-2.25.5/plugin-loaders/python/gedit-plugin-loader-python.c.fix-python-path gedit-2.25.5/plugin-loaders/python/gedit-plugin-loader-python.c
--- gedit-2.25.5/plugin-loaders/python/gedit-plugin-loader-python.c.fix-python-path	2009-01-26 12:36:50.289751027 -0500
+++ gedit-2.25.5/plugin-loaders/python/gedit-plugin-loader-python.c	2009-01-26 12:39:23.668963430 -0500
@@ -541,6 +541,9 @@ gedit_python_init (GeditPluginLoaderPyth
 
 	PySys_SetArgv (1, argv);
 
+	/* Sanitize sys.path, see http://bugzilla.gnome.org/show_bug.cgi?id=569214 */
+	PyRun_SimpleString ("import sys; sys.path = filter(None, sys.path)");
+
 	if (!gedit_check_pygtk2 ())
 	{
 		/* Warning message already printed in check_pygtk2 */


Index: gedit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gedit/devel/gedit.spec,v
retrieving revision 1.183
retrieving revision 1.184
diff -u -r1.183 -r1.184
--- gedit.spec	20 Jan 2009 18:07:26 -0000	1.183
+++ gedit.spec	26 Jan 2009 17:43:12 -0000	1.184
@@ -18,7 +18,7 @@
 Summary:	Text editor for the GNOME desktop
 Name:		gedit
 Version: 	2.25.5
-Release: 	1%{?dist}
+Release: 	2%{?dist}
 Epoch:		1
 License:	GPLv2+ and GFDL
 Group:		Applications/Editors
@@ -42,6 +42,9 @@
 Patch1: gedit-2.13.90-libdir.patch
 %endif
 
+# http://bugzilla.gnome.org/show_bug.cgi?id=569214
+Patch2: gedit-2.25.5-fix-python-path.patch
+
 BuildRequires: gnome-common
 BuildRequires: glib2-devel >= %{glib2_version}
 BuildRequires: pango-devel >= %{pango_version}
@@ -106,6 +109,8 @@
 %patch1 -p1 -b .libdir
 %endif
 
+%patch2 -p1 -b .fix-python-path
+
 %build
 autoreconf -f -i
 %configure \
@@ -220,6 +225,10 @@
 
 
 %changelog
+* Mon Jan 26 2009 Ray Strode <rstrode at redhat.com> - 1:2.25.5-2
+- Fix up python plugin path to close up a security attack
+  vectors (bug 481556).
+
 * Tue Jan 20 2009 Matthias Clasen <mclasen at redhat.com> - 1:2.25.5-1
 - Update to 2.25.5
 



From rstrode at fedoraproject.org  Mon Jan 26 17:51:23 2009
From: rstrode at fedoraproject.org (Ray Strode)
Date: Mon, 26 Jan 2009 17:51:23 +0000 (UTC)
Subject: rpms/gedit/F-10 gedit-2.24.3-fix-python-path.patch, NONE,
	1.1 gedit.spec, 1.174, 1.175
Message-ID: <20090126175123.1F59A7010C@cvs1.fedora.phx.redhat.com>

Author: rstrode

Update of /cvs/pkgs/rpms/gedit/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11967

Modified Files:
	gedit.spec 
Added Files:
	gedit-2.24.3-fix-python-path.patch 
Log Message:
- Fix up python plugin path to close up a security attack
  vectors (bug 481556).


gedit-2.24.3-fix-python-path.patch:

--- NEW FILE gedit-2.24.3-fix-python-path.patch ---
diff -up gedit-2.25.5/plugin-loaders/python/gedit-plugin-loader-python.c.fix-python-path gedit-2.25.5/plugin-loaders/python/gedit-plugin-loader-python.c
--- gedit-2.24.3/gedit/gedit-python-module.c.fix-python-path	2009-01-26 12:36:50.289751027 -0500
+++ gedit-2.24.3/gedit/gedit-python-module.c	2009-01-26 12:39:23.668963430 -0500
@@ -541,6 +541,9 @@ gedit_python_init (GeditPluginLoaderPyth
 
 	PySys_SetArgv (1, argv);
 
+	/* Sanitize sys.path, see http://bugzilla.gnome.org/show_bug.cgi?id=569214 */
+	PyRun_SimpleString ("import sys; sys.path = filter(None, sys.path)");
+
 	if (!gedit_check_pygtk2 ())
 	{
 		/* Warning message already printed in check_pygtk2 */


Index: gedit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gedit/F-10/gedit.spec,v
retrieving revision 1.174
retrieving revision 1.175
diff -u -r1.174 -r1.175
--- gedit.spec	16 Jan 2009 02:00:53 -0000	1.174
+++ gedit.spec	26 Jan 2009 17:50:52 -0000	1.175
@@ -18,7 +18,7 @@
 Summary:	gEdit is a small but powerful text editor for GNOME
 Name:		gedit
 Version: 	2.24.3
-Release: 	1%{?dist}
+Release: 	2%{?dist}
 Epoch:		1
 License:	GPLv2+ and GFDL
 Group:		Applications/Editors
@@ -42,6 +42,9 @@
 Patch1: gedit-2.13.90-libdir.patch
 %endif
 
+# http://bugzilla.gnome.org/show_bug.cgi?id=569214
+Patch2: gedit-2.24.3-fix-python-path.patch
+
 BuildRequires: gnome-common
 BuildRequires: glib2-devel >= %{glib2_version}
 BuildRequires: pango-devel >= %{pango_version}
@@ -104,6 +107,8 @@
 %patch1 -p1 -b .libdir
 %endif
 
+%patch2 -p1 -b .fix-python-path
+
 %build
 autoreconf
 %configure \
@@ -218,6 +223,10 @@
 
 
 %changelog
+* Mon Jan 26 2009 Ray Strode <rstrode at redhat.com> - 1:2.24.3-2
+- Fix up python plugin path to close up a security attack
+  vectors (bug 481556).
+
 * Thu Jan 15 2009 Matthias Clasen <mclasen at redhat.com> - 1:2.24.3-1
 - Update to 2.24.3
 



From rathann at fedoraproject.org  Mon Jan 26 17:56:01 2009
From: rathann at fedoraproject.org (Dominik Mierzejewski)
Date: Mon, 26 Jan 2009 17:56:01 +0000 (UTC)
Subject: rpms/dx/devel dx.spec,1.10,1.11
Message-ID: <20090126175601.BFFB67010C@cvs1.fedora.phx.redhat.com>

Author: rathann

Update of /cvs/pkgs/rpms/dx/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12699

Modified Files:
	dx.spec 
Log Message:
cosmetics: remove trailing whitespace


Index: dx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dx/devel/dx.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- dx.spec	24 Sep 2008 19:42:45 -0000	1.10
+++ dx.spec	26 Jan 2009 17:55:31 -0000	1.11
@@ -1,4 +1,4 @@
-Summary: Open source version of IBM's Visualization Data Explorer 
+Summary: Open source version of IBM's Visualization Data Explorer
 Name: dx
 Version: 4.4.4
 Release: 7%{?dist}
@@ -71,7 +71,7 @@
 	--enable-smp-linux \
 	--enable-new-keylayout \
 	--with-rsh=%{_bindir}/ssh
-                        
+
 make %{?_smp_mflags}
 
 %install



From rstrode at fedoraproject.org  Mon Jan 26 17:59:37 2009
From: rstrode at fedoraproject.org (Ray Strode)
Date: Mon, 26 Jan 2009 17:59:37 +0000 (UTC)
Subject: rpms/gedit/F-9 gedit-2.22.3-fix-python-path.patch, NONE,
	1.1 gedit.spec, 1.157, 1.158
Message-ID: <20090126175937.10A3470142@cvs1.fedora.phx.redhat.com>

Author: rstrode

Update of /cvs/pkgs/rpms/gedit/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13271

Modified Files:
	gedit.spec 
Added Files:
	gedit-2.22.3-fix-python-path.patch 
Log Message:
- Fix up python plugin path to close up a security attack
  vectors (bug 481556).


gedit-2.22.3-fix-python-path.patch:

--- NEW FILE gedit-2.22.3-fix-python-path.patch ---
diff -up gedit-2.25.5/plugin-loaders/python/gedit-plugin-loader-python.c.fix-python-path gedit-2.25.5/plugin-loaders/python/gedit-plugin-loader-python.c
--- gedit-2.24.3/gedit/gedit-python-module.c.fix-python-path	2009-01-26 12:36:50.289751027 -0500
+++ gedit-2.24.3/gedit/gedit-python-module.c	2009-01-26 12:39:23.668963430 -0500
@@ -541,6 +541,9 @@ gedit_python_init (GeditPluginLoaderPyth
 
 	PySys_SetArgv (1, argv);
 
+	/* Sanitize sys.path, see http://bugzilla.gnome.org/show_bug.cgi?id=569214 */
+	PyRun_SimpleString ("import sys; sys.path = filter(None, sys.path)");
+
 	if (!gedit_check_pygtk2 ())
 	{
 		/* Warning message already printed in check_pygtk2 */


Index: gedit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gedit/F-9/gedit.spec,v
retrieving revision 1.157
retrieving revision 1.158
diff -u -r1.157 -r1.158
--- gedit.spec	28 May 2008 16:33:16 -0000	1.157
+++ gedit.spec	26 Jan 2009 17:59:06 -0000	1.158
@@ -18,7 +18,7 @@
 Summary:	gEdit is a small but powerful text editor for GNOME
 Name:		gedit
 Version: 	2.22.3
-Release: 	1%{?dist}
+Release: 	2%{?dist}
 Epoch:		1
 License:	GPLv2+ and GFDL
 Group:		Applications/Editors
@@ -46,6 +46,9 @@
 # and I needed this patch to make autoconf happy
 Patch2: gedit-2.15.1-python.patch
 
+# http://bugzilla.gnome.org/show_bug.cgi?id=569214
+Patch3: gedit-2.22.3-fix-python-path.patch
+
 BuildRequires: glib2-devel >= %{glib2_version}
 BuildRequires: pango-devel >= %{pango_version}
 BuildRequires: gtk2-devel >= %{gtk2_version}
@@ -107,6 +110,7 @@
 %endif
 
 %patch2 -p1 -b .python
+%patch3 -p1 -b .fix-python-path
 
 %build
 autoreconf
@@ -193,6 +197,10 @@
 
 
 %changelog
+* Mon Jan 26 2009 Ray Strode <rstrode at redhat.com> - 1:2.22.3-2
+- Fix up python plugin path to close up a security attack
+  vectors (bug 481556).
+
 * Wed May 28 2008 Matthias Clasen <mclasen at redhat.com> - 1:2.22.3-1
 - Update to 2.22.3
 



From rstrode at fedoraproject.org  Mon Jan 26 18:05:15 2009
From: rstrode at fedoraproject.org (Ray Strode)
Date: Mon, 26 Jan 2009 18:05:15 +0000 (UTC)
Subject: rpms/gedit/F-10 gedit-2.24.3-fix-python-path.patch,1.1,1.2
Message-ID: <20090126180515.AFA167010C@cvs1.fedora.phx.redhat.com>

Author: rstrode

Update of /cvs/pkgs/rpms/gedit/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14880

Modified Files:
	gedit-2.24.3-fix-python-path.patch 
Log Message:
Regenerate patch to be less fuzzy


gedit-2.24.3-fix-python-path.patch:

Index: gedit-2.24.3-fix-python-path.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gedit/F-10/gedit-2.24.3-fix-python-path.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gedit-2.24.3-fix-python-path.patch	26 Jan 2009 17:50:52 -0000	1.1
+++ gedit-2.24.3-fix-python-path.patch	26 Jan 2009 18:04:45 -0000	1.2
@@ -1,13 +1,10 @@
-diff -up gedit-2.25.5/plugin-loaders/python/gedit-plugin-loader-python.c.fix-python-path gedit-2.25.5/plugin-loaders/python/gedit-plugin-loader-python.c
---- gedit-2.24.3/gedit/gedit-python-module.c.fix-python-path	2009-01-26 12:36:50.289751027 -0500
-+++ gedit-2.24.3/gedit/gedit-python-module.c	2009-01-26 12:39:23.668963430 -0500
-@@ -541,6 +541,9 @@ gedit_python_init (GeditPluginLoaderPyth
- 
- 	PySys_SetArgv (1, argv);
- 
+diff -up gedit-2.24.3/gedit/gedit-python-module.c.fix-python-path gedit-2.24.3/gedit/gedit-python-module.c
+--- gedit-2.24.3/gedit/gedit-python-module.c.fix-python-path	2009-01-07 10:39:41.000000000 -0500
++++ gedit-2.24.3/gedit/gedit-python-module.c	2009-01-26 13:03:23.198989913 -0500
+@@ -495,3 +495,6 @@ gedit_python_shutdown (void)
+ 		Py_Finalize ();
+ 	}
+ }
 +	/* Sanitize sys.path, see http://bugzilla.gnome.org/show_bug.cgi?id=569214 */
 +	PyRun_SimpleString ("import sys; sys.path = filter(None, sys.path)");
 +
- 	if (!gedit_check_pygtk2 ())
- 	{
- 		/* Warning message already printed in check_pygtk2 */



From rstrode at fedoraproject.org  Mon Jan 26 18:07:37 2009
From: rstrode at fedoraproject.org (Ray Strode)
Date: Mon, 26 Jan 2009 18:07:37 +0000 (UTC)
Subject: rpms/gedit/F-9 gedit-2.22.3-fix-python-path.patch,1.1,1.2
Message-ID: <20090126180737.66EDD7010C@cvs1.fedora.phx.redhat.com>

Author: rstrode

Update of /cvs/pkgs/rpms/gedit/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15339

Modified Files:
	gedit-2.22.3-fix-python-path.patch 
Log Message:
Regenerate patch to be less fuzzy


gedit-2.22.3-fix-python-path.patch:

Index: gedit-2.22.3-fix-python-path.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gedit/F-9/gedit-2.22.3-fix-python-path.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gedit-2.22.3-fix-python-path.patch	26 Jan 2009 17:59:06 -0000	1.1
+++ gedit-2.22.3-fix-python-path.patch	26 Jan 2009 18:07:06 -0000	1.2
@@ -1,13 +1,13 @@
-diff -up gedit-2.25.5/plugin-loaders/python/gedit-plugin-loader-python.c.fix-python-path gedit-2.25.5/plugin-loaders/python/gedit-plugin-loader-python.c
---- gedit-2.24.3/gedit/gedit-python-module.c.fix-python-path	2009-01-26 12:36:50.289751027 -0500
-+++ gedit-2.24.3/gedit/gedit-python-module.c	2009-01-26 12:39:23.668963430 -0500
-@@ -541,6 +541,9 @@ gedit_python_init (GeditPluginLoaderPyth
- 
- 	PySys_SetArgv (1, argv);
- 
+diff -up gedit-2.22.3/gedit/gedit-python-module.c.fix-python-path gedit-2.22.3/gedit/gedit-python-module.c
+--- gedit-2.22.3/gedit/gedit-python-module.c.fix-python-path	2008-05-25 06:35:36.000000000 -0400
++++ gedit-2.22.3/gedit/gedit-python-module.c	2009-01-26 13:05:26.784987984 -0500
+@@ -541,6 +541,9 @@ gedit_python_init (void)
+ 	PyObject_CallObject (install, gettext_args);
+ 	Py_DECREF (gettext_args);
+ 	
 +	/* Sanitize sys.path, see http://bugzilla.gnome.org/show_bug.cgi?id=569214 */
 +	PyRun_SimpleString ("import sys; sys.path = filter(None, sys.path)");
 +
- 	if (!gedit_check_pygtk2 ())
- 	{
- 		/* Warning message already printed in check_pygtk2 */
+ 	/* Python has been successfully initialized */
+ 	init_failed = FALSE;
+ 	



From rdieter at fedoraproject.org  Mon Jan 26 18:10:58 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 26 Jan 2009 18:10:58 +0000 (UTC)
Subject: rpms/kdelibs/F-10 plasma-on-screensaver-security-fix.diff, NONE,
	1.1 kdelibs.spec, 1.396, 1.397
Message-ID: <20090126181058.BBC287010C@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdelibs/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16035

Modified Files:
	kdelibs.spec 
Added Files:
	plasma-on-screensaver-security-fix.diff 
Log Message:
* Mon Jan 26 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.0-2
- plasma-on-screensaver-security patch
- (Build)Req: automoc4 >= 0.9.88, phonon(-devel) >= 4.3.0
- Requires: strigi-libs >= 0.6.3
- use %{?_isa} to avoid potential multilib heartbreak


plasma-on-screensaver-security-fix.diff:

--- NEW FILE plasma-on-screensaver-security-fix.diff ---
Index: containment.cpp
===================================================================
--- containment.cpp	(revision 916284)
+++ containment.cpp	(working copy)
@@ -1602,12 +1602,10 @@
         }
 
         bool canConfig = unlocked || KAuthorized::authorize("PlasmaAllowConfigureWhenLocked");
-        if (canConfig) {
-            action = actions().action("activity settings");
-            if (action) {
-                action->setVisible(canConfig);
-                action->setEnabled(canConfig);
-            }
+        action = actions().action("activity settings");
+        if (action) {
+            action->setVisible(canConfig);
+            action->setEnabled(canConfig);
         }
 
         // tell the applets too


Index: kdelibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/F-10/kdelibs.spec,v
retrieving revision 1.396
retrieving revision 1.397
diff -u -r1.396 -r1.397
--- kdelibs.spec	23 Jan 2009 18:59:58 -0000	1.396
+++ kdelibs.spec	26 Jan 2009 18:10:28 -0000	1.397
@@ -1,6 +1,6 @@
 Summary: K Desktop Environment 4 - Libraries
 Version: 4.2.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs
@@ -44,8 +44,9 @@
 %if 0%{?fedora} >= 9
 Requires: hunspell
 %endif
-Requires: phonon >= 4.2.96
-Requires: soprano >= 2.1.64
+Requires: phonon%{?_isa} >= 4.3.0
+Requires: soprano%{?_isa} >= 2.1.64
+Requires: strigi-libs%{?_isa} >= 0.6.3
 
 Source1: kde4.sh
 Source2: kde4.csh
@@ -79,11 +80,12 @@
 Patch22: kdelibs-4.1.96-cmake.patch
 
 # upstream
+Patch100: plasma-on-screensaver-security-fix.diff
 # 4.3 branch
 Patch101: kdelibs-4.1.96-AllowExternalPaths.patch
 
 BuildRequires: qt4-devel >= 4.4.0
-Requires: qt4 >= %{_qt4_version}
+Requires: qt4%{?_isa} >= %{_qt4_version}
 Requires: xdg-utils
 Requires(post): /sbin/ldconfig xdg-utils
 Requires(postun): /sbin/ldconfig xdg-utils
@@ -93,7 +95,7 @@
 # we don't want a hard dependency on aspell on F9+, use enchant only
 BuildRequires: aspell-devel
 %endif
-BuildRequires: automoc
+BuildRequires: automoc4 >= 0.9.88
 BuildRequires: avahi-devel
 BuildRequires: bzip2-devel
 BuildRequires: cmake >= 2.6.2-3
@@ -114,7 +116,7 @@
 BuildRequires: OpenEXR-devel
 BuildRequires: openssl-devel
 BuildRequires: pcre-devel
-BuildRequires: phonon-devel >= 4.2.96
+BuildRequires: phonon-devel >= 4.3.0
 BuildRequires: shared-mime-info
 BuildRequires: soprano-devel >= 2.1.64
 BuildRequires: strigi-devel >= 0.6.3
@@ -153,11 +155,11 @@
 Provides:  kdelibs4-devel = %{version}-%{release}
 %endif
 Requires: cmake >= 2.6.2-3
-Requires: automoc
+Requires: automoc4 >= 0.9.88
 Requires: qt4-devel
 Requires: openssl-devel
-Requires: phonon-devel >= 4.2.96
-Requires: strigi-devel >= 0.6.3
+Requires: phonon-devel
+Requires: strigi-devel
 Requires: bzip2-devel gamin-devel libacl-devel zlib-devel libutempter-devel
 %{?x_deps:Requires: %{x_deps}}
 %description devel
@@ -207,6 +209,9 @@
 %patch22 -p1 -b .kdepimlibs-cmake
 
 # upstream patches
+pushd plasma
+%patch100 -p0 -b .plasma-on-screensaver-security-fix
+popd
 %patch101 -p1 -b .AllowExternalPaths
 
 %build
@@ -369,6 +374,12 @@
 
 
 %changelog
+* Mon Jan 26 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.0-2
+- plasma-on-screensaver-security patch
+- (Build)Req: automoc4 >= 0.9.88, phonon(-devel) >= 4.3.0
+- Requires: strigi-libs >= 0.6.3
+- use %%{?_isa} to avoid potential multilib heartbreak
+
 * Thu Jan 22 2009 Than Ngo <than at redhat.com> - 4.2.0-1
 - 4.2.0
 



From rdieter at fedoraproject.org  Mon Jan 26 18:20:53 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 26 Jan 2009 18:20:53 +0000 (UTC)
Subject: rpms/kdelibs/devel kdelibs.spec,1.421,1.422 sources,1.83,1.84
Message-ID: <20090126182053.EFE767010C@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdelibs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17419

Modified Files:
	kdelibs.spec sources 
Log Message:
* Mon Jan 26 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.0-3
- respun tarball



Index: kdelibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.421
retrieving revision 1.422
diff -u -r1.421 -r1.422
--- kdelibs.spec	26 Jan 2009 17:08:28 -0000	1.421
+++ kdelibs.spec	26 Jan 2009 18:20:23 -0000	1.422
@@ -1,6 +1,6 @@
 Summary: K Desktop Environment 4 - Libraries
 Version: 4.2.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs
@@ -80,7 +80,6 @@
 Patch22: kdelibs-4.1.96-cmake.patch
 
 # upstream
-Patch100: plasma-on-screensaver-security-fix.diff
 # 4.3 branch
 Patch101: kdelibs-4.1.96-AllowExternalPaths.patch
 
@@ -209,11 +208,9 @@
 %patch22 -p1 -b .kdepimlibs-cmake
 
 # upstream patches
-pushd plasma
-%patch100 -p0 -b .plasma-on-screensaver-security-fix
-popd
 %patch101 -p1 -b .AllowExternalPaths
 
+
 %build
 
 mkdir -p %{_target_platform}
@@ -374,6 +371,9 @@
 
 
 %changelog
+* Mon Jan 26 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.0-3
+- respun tarball
+
 * Mon Jan 26 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.0-2
 - plasma-on-screensaver-security patch
 - (Build)Req: automoc4 >= 0.9.88, phonon(-devel) >= 4.3.0


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/sources,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- sources	23 Jan 2009 17:38:09 -0000	1.83
+++ sources	26 Jan 2009 18:20:23 -0000	1.84
@@ -1 +1 @@
-4ea13b88463125026a7f71937075bcec  kdelibs-4.2.0.tar.bz2
+2d830a922195fefe6e073111850247ac  kdelibs-4.2.0.tar.bz2



From atkac at fedoraproject.org  Mon Jan 26 18:21:50 2009
From: atkac at fedoraproject.org (Adam Tkac)
Date: Mon, 26 Jan 2009 18:21:50 +0000 (UTC)
Subject: rpms/xorg-x11-server/devel xorg-x11-server.spec, 1.391,
	1.392 xserver-1.5.99.3-broken-mtrr-header.patch, 1.2, 1.3
Message-ID: <20090126182150.190447010C@cvs1.fedora.phx.redhat.com>

Author: atkac

Update of /cvs/pkgs/rpms/xorg-x11-server/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17756

Modified Files:
	xorg-x11-server.spec xserver-1.5.99.3-broken-mtrr-header.patch 
Log Message:
- improved xserver-1.5.99.3-broken-mtrr-header.patch to unbreak mtrr.h again



Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.391
retrieving revision 1.392
diff -u -r1.391 -r1.392
--- xorg-x11-server.spec	26 Jan 2009 17:14:12 -0000	1.391
+++ xorg-x11-server.spec	26 Jan 2009 18:21:19 -0000	1.392
@@ -19,7 +19,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.5.99.901
-Release:   2%{?dist}
+Release:   3%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -492,6 +492,9 @@
 
 
 %changelog
+* Mon Jan 26 2009 Adam Tkac <atkac redhat com> 1.5.99.901-3
+- improved xserver-1.5.99.3-broken-mtrr-header.patch to unbreak mtrr.h again
+
 * Mon Jan 26 2009 Adam Tkac <atkac redhat com> 1.5.99.901-2
 - rebuild against new openssl
 

xserver-1.5.99.3-broken-mtrr-header.patch:

Index: xserver-1.5.99.3-broken-mtrr-header.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/xserver-1.5.99.3-broken-mtrr-header.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xserver-1.5.99.3-broken-mtrr-header.patch	8 Jan 2009 15:25:48 -0000	1.2
+++ xserver-1.5.99.3-broken-mtrr-header.patch	26 Jan 2009 18:21:19 -0000	1.3
@@ -16,8 +16,8 @@
  #include <unistd.h>
  #include <sys/mman.h>
  #ifdef HAVE_ASM_MTRR_H
-+typedef unsigned char u8;
-+typedef unsigned int u32;
++typedef unsigned char __u8;
++typedef unsigned int __u32;
  #include <asm/mtrr.h>
  #endif
  
@@ -29,8 +29,8 @@
  #endif
  
  #ifdef HAS_MTRR_SUPPORT
-+typedef unsigned char u8;
-+typedef unsigned int u32;
++typedef unsigned char __u8;
++typedef unsigned int __u32;
  #include <asm/mtrr.h>
  #endif
  



From jjames at fedoraproject.org  Mon Jan 26 18:23:00 2009
From: jjames at fedoraproject.org (Jerry James)
Date: Mon, 26 Jan 2009 18:23:00 +0000 (UTC)
Subject: comps comps-f11.xml.in,1.81,1.82
Message-ID: <20090126182300.9E67D7010C@cvs1.fedora.phx.redhat.com>

Author: jjames

Update of /cvs/pkgs/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17606

Modified Files:
	comps-f11.xml.in 
Log Message:
Add my packages, namely automaton, check, gcl-emacs, gcl-xemacs, idw-gpl,
jcip-annotations, jlint, jsr-305, mona, and their subpackages.



Index: comps-f11.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f11.xml.in,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- comps-f11.xml.in	26 Jan 2009 17:41:40 -0000	1.81
+++ comps-f11.xml.in	26 Jan 2009 18:22:30 -0000	1.82
@@ -804,7 +804,9 @@
       <packagereq type="default">python-devel</packagereq>
       <packagereq type="default">rpm-devel</packagereq>
       <packagereq type="default">slang-devel</packagereq>
+      <packagereq type="optional">check-devel</packagereq>
       <packagereq type="optional">libusb-devel</packagereq>
+      <packagereq type="optional">mona-devel</packagereq>
     </packagelist>
   </group>
   <group>
@@ -869,6 +871,7 @@
       <packagereq type="optional">bugzilla</packagereq>
       <packagereq type="optional">buildbot</packagereq>
       <packagereq type="optional">bzr</packagereq>
+      <packagereq type="optional">check</packagereq>
       <packagereq type="optional">clips</packagereq>
       <packagereq type="optional">clips-doc</packagereq>
       <packagereq type="optional">clips-xclips</packagereq>
@@ -910,6 +913,8 @@
       <packagereq basearchonly="true" type="optional">gcc-gnat</packagereq>
       <packagereq basearchonly="true" type="optional">gcc-objc</packagereq>
       <packagereq type="optional">gcl</packagereq>
+      <packagereq type="optional">gcl-emacs</packagereq>
+      <packagereq type="optional">gcl-xemacs</packagereq>
       <packagereq type="optional">gforth</packagereq>
       <packagereq type="optional">ghc</packagereq>
       <packagereq type="optional">giggle</packagereq>
@@ -1166,6 +1171,8 @@
       <packagereq type="optional">alliance</packagereq>
       <packagereq type="optional">asana-math-fonts</packagereq>
       <packagereq type="optional">atlas</packagereq>
+      <packagereq type="optional">automaton</packagereq>
+      <packagereq type="optional">automaton-javadoc</packagereq>
       <packagereq type="optional">blacs</packagereq>
       <packagereq type="optional">blas</packagereq>
       <packagereq type="optional">cdo</packagereq>
@@ -1233,6 +1240,10 @@
       <packagereq type="optional">mathml-fonts</packagereq>
       <packagereq type="optional">maxima</packagereq>
       <packagereq type="optional">maxima-gui</packagereq>
+      <packagereq type="optional">mona</packagereq>
+      <packagereq type="optional">mona-emacs</packagereq>
+      <packagereq type="optional">mona-examples</packagereq>
+      <packagereq type="optional">mona-xemacs</packagereq>
       <packagereq type="optional">ncl</packagereq>
       <packagereq type="optional">nco</packagereq>
       <packagereq type="optional">ncview</packagereq>
@@ -2978,7 +2989,15 @@
       <packagereq type="default">xml-commons-resolver-javadoc</packagereq>
       <packagereq type="default">xml-commons-which</packagereq>
       <packagereq type="default">xml-commons-which-javadoc</packagereq>
+      <packagereq type="optional">idw-gpl</packagereq>
+      <packagereq type="optional">idw-gpl-javadoc</packagereq>
       <packagereq type="optional">java-1.5.0-gcj-javadoc</packagereq>
+      <packagereq type="optional">jcip-annotations</packagereq>
+      <packagereq type="optional">jcip-annotations-javadoc</packagereq>
+      <packagereq type="optional">jlint</packagereq>
+      <packagereq type="optional">jsr-305</packagereq>
+      <packagereq type="optional">jsr-305-javadoc</packagereq>
+      <packagereq type="optional">pmd</packagereq>
     </packagelist>
   </group>
   <group>



From rdieter at fedoraproject.org  Mon Jan 26 18:25:00 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 26 Jan 2009 18:25:00 +0000 (UTC)
Subject: rpms/kdebase-runtime/devel .cvsignore, 1.27,
	1.28 kdebase-runtime.spec, 1.90, 1.91 sources, 1.28, 1.29
Message-ID: <20090126182500.6F7767010C@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdebase-runtime/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18369

Modified Files:
	.cvsignore kdebase-runtime.spec sources 
Log Message:
* Mon Jan 26 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.0-3
- respun tarball



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-runtime/devel/.cvsignore,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- .cvsignore	22 Jan 2009 10:27:03 -0000	1.27
+++ .cvsignore	26 Jan 2009 18:24:30 -0000	1.28
@@ -1,2 +1 @@
-kdebase-runtime-4.1.96.tar.bz2
 kdebase-runtime-4.2.0.tar.bz2


Index: kdebase-runtime.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-runtime/devel/kdebase-runtime.spec,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -r1.90 -r1.91
--- kdebase-runtime.spec	26 Jan 2009 17:38:31 -0000	1.90
+++ kdebase-runtime.spec	26 Jan 2009 18:24:30 -0000	1.91
@@ -6,7 +6,7 @@
 Name:          kdebase-runtime
 Summary:       K Desktop Environment - Runtime
 Version:       4.2.0
-Release:       2%{?dist}
+Release:       3%{?dist}
 
 License:       GPLv2
 Group:         User Interface/Desktops
@@ -339,6 +339,9 @@
 
 
 %changelog
+* Mon Jan 26 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.0-3
+- respun tarball
+
 * Mon Jan 26 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.0-2
 - Files not trashed to the correct location in Dolphin/Konqueror 
   (#481598, kdebug#178479)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-runtime/devel/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- sources	22 Jan 2009 10:27:03 -0000	1.28
+++ sources	26 Jan 2009 18:24:30 -0000	1.29
@@ -1 +1 @@
-9e56281e9daa579d56cfda794f1bbc10  kdebase-runtime-4.2.0.tar.bz2
+8ef48aae16a6dddb3055d81d7e5c375f  kdebase-runtime-4.2.0.tar.bz2



From mcepl at fedoraproject.org  Mon Jan 26 18:24:55 2009
From: mcepl at fedoraproject.org (Matej Cepl)
Date: Mon, 26 Jan 2009 18:24:55 +0000 (UTC)
Subject: rpms/xorg-x11-xdm/F-10 xdm-1.1.6-authDir-var-bug388431.patch, NONE, 
	1.1 xorg-x11-xdm.spec, 1.41, 1.42
Message-ID: <20090126182455.549C87010C@cvs1.fedora.phx.redhat.com>

Author: mcepl

Update of /cvs/extras/rpms/xorg-x11-xdm/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18337

Modified Files:
	xorg-x11-xdm.spec 
Added Files:
	xdm-1.1.6-authDir-var-bug388431.patch 
Log Message:
Add variable DisplayManager.authDir to /etc/X11/apps-defaults/xdm-confg (bug 388431)

xdm-1.1.6-authDir-var-bug388431.patch:

--- NEW FILE xdm-1.1.6-authDir-var-bug388431.patch ---
diff -up xdm-1.1.6/config/Makefile.am.authDir-var-bug388431 xdm-1.1.6/config/Makefile.am
--- xdm-1.1.6/config/Makefile.am.authDir-var-bug388431	2007-01-02 22:45:08.000000000 +0100
+++ xdm-1.1.6/config/Makefile.am	2009-01-26 14:04:09.000000000 +0100
@@ -52,6 +52,7 @@ MKTEMP_DEFINES = -DMKTEMP_COMMAND=$(MKTE
 
 CPP_FILES_FLAGS = -DBINDIR="$(bindir)" -DDEFAULTVT="$(DEFAULTVT)" \
     -DXDMDIR="$(XDMLIBDIR)" -DXDMLOGDIR="$(XDMLOGDIR)" \
+    -DXDMXAUTHDIR="$(XDMXAUTHDIR)" \
     -DXDMPIDDIR="$(XDMPIDDIR)" -DXDMCONFIGDIR="$(XDMCONFIGDIR)" \
     -DXDMSCRIPTDIR="$(XDMSCRIPTDIR)" -DSU="$(SU)" \
     -DCHOOSERPATH="$(XDMLIBDIR)/chooser" $(XPMDEFINES) \
diff -up xdm-1.1.6/config/Makefile.in.authDir-var-bug388431 xdm-1.1.6/config/Makefile.in
--- xdm-1.1.6/config/Makefile.in.authDir-var-bug388431	2007-08-16 23:47:52.000000000 +0200
+++ xdm-1.1.6/config/Makefile.in	2009-01-26 14:03:03.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# 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.
@@ -117,6 +117,7 @@ DMCP_CFLAGS = @DMCP_CFLAGS@
 DMCP_LIBS = @DMCP_LIBS@
 DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
 DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
+DSYMUTIL = @DSYMUTIL@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
@@ -149,6 +150,7 @@ MISC_MAN_DIR = @MISC_MAN_DIR@
 MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
 MKDIR_P = @MKDIR_P@
 MKTEMP_COMMAND = @MKTEMP_COMMAND@
+NMEDIT = @NMEDIT@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
@@ -163,6 +165,7 @@ RANDOMMANDEFS = @RANDOMMANDEFS@
 RANLIB = @RANLIB@
 RAWCPP = @RAWCPP@
 RAWCPPFLAGS = @RAWCPPFLAGS@
+SED = sed
 SERVERSTYPE = @SERVERSTYPE@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
@@ -181,6 +184,7 @@ XDMPIDDIR = @XDMPIDDIR@
 XDMSCRIPTDIR = @XDMSCRIPTDIR@
 XDMSHELL_CFLAGS = @XDMSHELL_CFLAGS@
 XDMSHELL_LIBS = @XDMSHELL_LIBS@
+XDMXAUTHDIR = @XDMXAUTHDIR@
 XDM_BWPIXMAP = @XDM_BWPIXMAP@
 XDM_CFLAGS = @XDM_CFLAGS@
 XDM_LDFLAGS = @XDM_LDFLAGS@
@@ -248,9 +252,9 @@ sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-SED = sed
 SUFFIXES = .cpp
 WCHAR32_FLAGS = -DWCHAR32=@WCHAR32@
 
diff -up xdm-1.1.6/configure.ac.authDir-var-bug388431 xdm-1.1.6/configure.ac
--- xdm-1.1.6/configure.ac.authDir-var-bug388431	2007-08-16 23:46:47.000000000 +0200
+++ xdm-1.1.6/configure.ac	2009-01-26 14:03:03.000000000 +0100
@@ -510,7 +510,13 @@ AC_DEFINE_DIR(DEF_CHOOSER, XDMLIBDIR/cho
 
 # -DDEF_AUTH_DIR="$(XDMDIR)"
 
-AC_DEFINE_DIR(DEF_AUTH_DIR, XDMCONFIGDIR, 
+AC_ARG_WITH(authdir,
+	AC_HELP_STRING([--with-authdir=<pathname>],
+	  [specify directory for X auth files (default=/var/lib/xdm)]),
+	[XDMXAUTHDIR="$withval"], [XDMXAUTHDIR="/var/lib/xdm"])
+AC_SUBST(XDMXAUTHDIR)
+
+AC_DEFINE_DIR(DEF_AUTH_DIR, XDMXAUTHDIR, 
 	[Define to pathname where authentication cookie files should be stored])
 
 # -DDEF_GREETER_LIB="$(XDMDIR)/libXdmGreet.so"
diff -up xdm-1.1.6/config/xdm-config.cpp.authDir-var-bug388431 xdm-1.1.6/config/xdm-config.cpp
--- xdm-1.1.6/config/xdm-config.cpp.authDir-var-bug388431	2009-01-26 14:03:03.000000000 +0100
+++ xdm-1.1.6/config/xdm-config.cpp	2009-01-26 14:03:03.000000000 +0100
@@ -12,6 +12,7 @@
 #ifndef XDMSCRIPTDIR
 #define XDMSCRIPTDIR XDMDIR
 #endif
+DisplayManager.authDir:	XDMXAUTHDIR
 DisplayManager.errorLogFile:	XDMLOGDIR/xdm.log
 DisplayManager.pidFile:		XDMPIDDIR/xdm.pid
 DisplayManager.keyFile:		XDMCONFIGDIR/xdm-keys


Index: xorg-x11-xdm.spec
===================================================================
RCS file: /cvs/extras/rpms/xorg-x11-xdm/F-10/xorg-x11-xdm.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- xorg-x11-xdm.spec	7 Nov 2008 22:47:57 -0000	1.41
+++ xorg-x11-xdm.spec	26 Jan 2009 18:24:24 -0000	1.42
@@ -3,7 +3,7 @@
 Summary: X.Org X11 xdm - X Display Manager
 Name: xorg-x11-%{pkgname}
 Version: 1.1.6
-Release: 6%{?dist}
+Release: 6.0.bug388431test.1%{?dist}
 # NOTE: Remove Epoch line if/when the package ever gets renamed.
 Epoch: 1
 License: MIT
@@ -25,6 +25,10 @@
 # Fix missing #endif in the Xresources (#470348)
 Patch12: xdm-1.1.6-redhat-Xresources-fix.patch
 
+# NOTE: Change authorization to be saved in /var/lib/xdm (for
+# cooperating with SELinux, see bug 388431 for more info)
+Patch13: xdm-1.1.6-authDir-var-bug388431.patch
+
 # FIXME: Temporary build dependencies for autotool dependence.
 BuildRequires: autoconf, automake, libtool
 
@@ -79,6 +83,7 @@
 %patch10 -p0 -b .redhat-xdm-config-fix
 %patch11 -p0 -b .redhat-sessreg-utmp-fix-bug177890
 %patch12 -p1 -b .redhat-xresources-bug470348
+%patch13 -p1 -b .authDir-var-bug388431
 
 %build
 # FIXME: Work around pointer aliasing warnings from compiler for now



From mcepl at fedoraproject.org  Mon Jan 26 18:25:16 2009
From: mcepl at fedoraproject.org (Matej Cepl)
Date: Mon, 26 Jan 2009 18:25:16 +0000 (UTC)
Subject: rpms/xorg-x11-xdm/devel xdm-1.1.6-authDir-var-bug388431.patch, NONE,
	1.1 xorg-x11-xdm.spec, 1.39, 1.40
Message-ID: <20090126182516.84B647010C@cvs1.fedora.phx.redhat.com>

Author: mcepl

Update of /cvs/extras/rpms/xorg-x11-xdm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18419

Modified Files:
	xorg-x11-xdm.spec 
Added Files:
	xdm-1.1.6-authDir-var-bug388431.patch 
Log Message:
Add variable DisplayManager.authDir to /etc/X11/apps-defaults/xdm-confg (bug 388431)

xdm-1.1.6-authDir-var-bug388431.patch:

--- NEW FILE xdm-1.1.6-authDir-var-bug388431.patch ---
diff -up xdm-1.1.6/config/Makefile.am.authDir-var-bug388431 xdm-1.1.6/config/Makefile.am
--- xdm-1.1.6/config/Makefile.am.authDir-var-bug388431	2007-01-02 22:45:08.000000000 +0100
+++ xdm-1.1.6/config/Makefile.am	2009-01-26 14:04:09.000000000 +0100
@@ -52,6 +52,7 @@ MKTEMP_DEFINES = -DMKTEMP_COMMAND=$(MKTE
 
 CPP_FILES_FLAGS = -DBINDIR="$(bindir)" -DDEFAULTVT="$(DEFAULTVT)" \
     -DXDMDIR="$(XDMLIBDIR)" -DXDMLOGDIR="$(XDMLOGDIR)" \
+    -DXDMXAUTHDIR="$(XDMXAUTHDIR)" \
     -DXDMPIDDIR="$(XDMPIDDIR)" -DXDMCONFIGDIR="$(XDMCONFIGDIR)" \
     -DXDMSCRIPTDIR="$(XDMSCRIPTDIR)" -DSU="$(SU)" \
     -DCHOOSERPATH="$(XDMLIBDIR)/chooser" $(XPMDEFINES) \
diff -up xdm-1.1.6/config/Makefile.in.authDir-var-bug388431 xdm-1.1.6/config/Makefile.in
--- xdm-1.1.6/config/Makefile.in.authDir-var-bug388431	2007-08-16 23:47:52.000000000 +0200
+++ xdm-1.1.6/config/Makefile.in	2009-01-26 14:03:03.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# 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.
@@ -117,6 +117,7 @@ DMCP_CFLAGS = @DMCP_CFLAGS@
 DMCP_LIBS = @DMCP_LIBS@
 DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
 DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
+DSYMUTIL = @DSYMUTIL@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
@@ -149,6 +150,7 @@ MISC_MAN_DIR = @MISC_MAN_DIR@
 MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
 MKDIR_P = @MKDIR_P@
 MKTEMP_COMMAND = @MKTEMP_COMMAND@
+NMEDIT = @NMEDIT@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
@@ -163,6 +165,7 @@ RANDOMMANDEFS = @RANDOMMANDEFS@
 RANLIB = @RANLIB@
 RAWCPP = @RAWCPP@
 RAWCPPFLAGS = @RAWCPPFLAGS@
+SED = sed
 SERVERSTYPE = @SERVERSTYPE@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
@@ -181,6 +184,7 @@ XDMPIDDIR = @XDMPIDDIR@
 XDMSCRIPTDIR = @XDMSCRIPTDIR@
 XDMSHELL_CFLAGS = @XDMSHELL_CFLAGS@
 XDMSHELL_LIBS = @XDMSHELL_LIBS@
+XDMXAUTHDIR = @XDMXAUTHDIR@
 XDM_BWPIXMAP = @XDM_BWPIXMAP@
 XDM_CFLAGS = @XDM_CFLAGS@
 XDM_LDFLAGS = @XDM_LDFLAGS@
@@ -248,9 +252,9 @@ sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-SED = sed
 SUFFIXES = .cpp
 WCHAR32_FLAGS = -DWCHAR32=@WCHAR32@
 
diff -up xdm-1.1.6/configure.ac.authDir-var-bug388431 xdm-1.1.6/configure.ac
--- xdm-1.1.6/configure.ac.authDir-var-bug388431	2007-08-16 23:46:47.000000000 +0200
+++ xdm-1.1.6/configure.ac	2009-01-26 14:03:03.000000000 +0100
@@ -510,7 +510,13 @@ AC_DEFINE_DIR(DEF_CHOOSER, XDMLIBDIR/cho
 
 # -DDEF_AUTH_DIR="$(XDMDIR)"
 
-AC_DEFINE_DIR(DEF_AUTH_DIR, XDMCONFIGDIR, 
+AC_ARG_WITH(authdir,
+	AC_HELP_STRING([--with-authdir=<pathname>],
+	  [specify directory for X auth files (default=/var/lib/xdm)]),
+	[XDMXAUTHDIR="$withval"], [XDMXAUTHDIR="/var/lib/xdm"])
+AC_SUBST(XDMXAUTHDIR)
+
+AC_DEFINE_DIR(DEF_AUTH_DIR, XDMXAUTHDIR, 
 	[Define to pathname where authentication cookie files should be stored])
 
 # -DDEF_GREETER_LIB="$(XDMDIR)/libXdmGreet.so"
diff -up xdm-1.1.6/config/xdm-config.cpp.authDir-var-bug388431 xdm-1.1.6/config/xdm-config.cpp
--- xdm-1.1.6/config/xdm-config.cpp.authDir-var-bug388431	2009-01-26 14:03:03.000000000 +0100
+++ xdm-1.1.6/config/xdm-config.cpp	2009-01-26 14:03:03.000000000 +0100
@@ -12,6 +12,7 @@
 #ifndef XDMSCRIPTDIR
 #define XDMSCRIPTDIR XDMDIR
 #endif
+DisplayManager.authDir:	XDMXAUTHDIR
 DisplayManager.errorLogFile:	XDMLOGDIR/xdm.log
 DisplayManager.pidFile:		XDMPIDDIR/xdm.pid
 DisplayManager.keyFile:		XDMCONFIGDIR/xdm-keys


Index: xorg-x11-xdm.spec
===================================================================
RCS file: /cvs/extras/rpms/xorg-x11-xdm/devel/xorg-x11-xdm.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- xorg-x11-xdm.spec	30 Oct 2008 18:15:46 -0000	1.39
+++ xorg-x11-xdm.spec	26 Jan 2009 18:24:46 -0000	1.40
@@ -3,7 +3,7 @@
 Summary: X.Org X11 xdm - X Display Manager
 Name: xorg-x11-%{pkgname}
 Version: 1.1.6
-Release: 5%{?dist}
+Release: 5.0.bug388431test.1%{?dist}
 # NOTE: Remove Epoch line if/when the package ever gets renamed.
 Epoch: 1
 License: MIT
@@ -22,6 +22,10 @@
 Patch10: xdm-1.0.1-redhat-xdm-config-fix.patch
 Patch11: xdm-1.0.5-sessreg-utmp-fix-bug177890.patch
 
+# NOTE: Change authorization to be saved in /var/lib/xdm (for
+# cooperating with SELinux, see bug 388431 for more info)
+Patch12: xdm-1.1.6-authDir-var-bug388431.patch
+
 # FIXME: Temporary build dependencies for autotool dependence.
 BuildRequires: autoconf, automake, libtool
 
@@ -75,6 +79,7 @@
 
 %patch10 -p0 -b .redhat-xdm-config-fix
 %patch11 -p0 -b .redhat-sessreg-utmp-fix-bug177890
+%patch12 -p1 -b .authDir-var-bug388431
 
 %build
 # FIXME: Work around pointer aliasing warnings from compiler for now



From rstrode at fedoraproject.org  Mon Jan 26 18:28:32 2009
From: rstrode at fedoraproject.org (Ray Strode)
Date: Mon, 26 Jan 2009 18:28:32 +0000 (UTC)
Subject: rpms/gedit/F-10 gedit-2.24.3-fix-python-path.patch,1.2,1.3
Message-ID: <20090126182832.0B26F7010C@cvs1.fedora.phx.redhat.com>

Author: rstrode

Update of /cvs/pkgs/rpms/gedit/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18854

Modified Files:
	gedit-2.24.3-fix-python-path.patch 
Log Message:
Try to regenerate the patch one more time


gedit-2.24.3-fix-python-path.patch:

Index: gedit-2.24.3-fix-python-path.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gedit/F-10/gedit-2.24.3-fix-python-path.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gedit-2.24.3-fix-python-path.patch	26 Jan 2009 18:04:45 -0000	1.2
+++ gedit-2.24.3-fix-python-path.patch	26 Jan 2009 18:28:01 -0000	1.3
@@ -1,10 +1,13 @@
 diff -up gedit-2.24.3/gedit/gedit-python-module.c.fix-python-path gedit-2.24.3/gedit/gedit-python-module.c
 --- gedit-2.24.3/gedit/gedit-python-module.c.fix-python-path	2009-01-07 10:39:41.000000000 -0500
-+++ gedit-2.24.3/gedit/gedit-python-module.c	2009-01-26 13:03:23.198989913 -0500
-@@ -495,3 +495,6 @@ gedit_python_shutdown (void)
- 		Py_Finalize ();
- 	}
- }
++++ gedit-2.24.3/gedit/gedit-python-module.c	2009-01-26 13:27:01.917963137 -0500
+@@ -373,6 +373,9 @@ gedit_python_init (void)
+ 
+ 	PySys_SetArgv (1, argv);
+ 
 +	/* Sanitize sys.path, see http://bugzilla.gnome.org/show_bug.cgi?id=569214 */
 +	PyRun_SimpleString ("import sys; sys.path = filter(None, sys.path)");
 +
+ 	if (!check_pygtk2 ())
+ 	{
+ 		/* Warning message already printed in check_pygtk2 */



From hadess at fedoraproject.org  Mon Jan 26 19:35:09 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Mon, 26 Jan 2009 19:35:09 +0000 (UTC)
Subject: rpms/gtk2/devel gtk-2.15.1-scale-marks-crasher.patch, NONE,
	1.1 gtk2.spec, 1.348, 1.349
Message-ID: <20090126193509.3C9C87010C@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/gtk2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28421

Modified Files:
	gtk2.spec 
Added Files:
	gtk-2.15.1-scale-marks-crasher.patch 
Log Message:
* Mon Jan 26 2009 - Bastien Nocera <bnocera at redhat.com> - 2.15.1-5
- Add patch to avoid crashes when destroying a GtkScale with marks


gtk-2.15.1-scale-marks-crasher.patch:

--- NEW FILE gtk-2.15.1-scale-marks-crasher.patch ---
Index: gtk/gtkrange.c
===================================================================
--- gtk/gtkrange.c	(revision 22222)
+++ gtk/gtkrange.c	(working copy)
@@ -1225,7 +1225,9 @@
   if (range->layout->n_marks)
     {
       g_free (range->layout->marks);
+      range->layout->marks = NULL;
       g_free (range->layout->mark_pos);
+      range->layout->mark_pos = NULL;
       range->layout->n_marks = 0;
     }
 


Index: gtk2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtk2/devel/gtk2.spec,v
retrieving revision 1.348
retrieving revision 1.349
diff -u -r1.348 -r1.349
--- gtk2.spec	26 Jan 2009 03:09:30 -0000	1.348
+++ gtk2.spec	26 Jan 2009 19:34:38 -0000	1.349
@@ -16,7 +16,7 @@
 Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X
 Name: gtk2
 Version: %{base_version}
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 Source: http://download.gnome.org/sources/gtk+/2.15/gtk+-%{version}.tar.bz2
@@ -30,6 +30,8 @@
 Patch2: workaround.patch
 # http://bugzilla.redhat.com/show_bug.cgi?id=478400
 Patch3: default_printer.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=569240
+Patch8: gtk-2.15.1-scale-marks-crasher.patch
 
 # fixed upstream
 Patch4: activatable-toolitem.patch
@@ -127,6 +129,7 @@
 %patch5 -p0 -b .imcontext-reset
 %patch6 -p1 -b .radio-proxy
 %patch7 -p0 -b .tool-proxy
+%patch8 -p0 -b .scale-marks
 
 %build
 libtoolize --force --copy
@@ -304,6 +307,9 @@
 %{_datadir}/gtk-2.0
 
 %changelog
+* Mon Jan 26 2009 - Bastien Nocera <bnocera at redhat.com> - 2.15.1-5
+- Add patch to avoid crashes when destroying a GtkScale with marks
+
 * Sun Jan 25 2009 Matthias Clasen <mclasen at redhat.com> - 2.15.1-4
 - Draw radio action proxies as radio menuitems
 - Fix issues with toolitem action proxies and overflow



From cebbert at fedoraproject.org  Mon Jan 26 19:40:51 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Mon, 26 Jan 2009 19:40:51 +0000 (UTC)
Subject: rpms/kernel/devel config-generic,1.226,1.227
Message-ID: <20090126194051.E03FD7010C@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29209

Modified Files:
	config-generic 
Log Message:
dont use =n in config files


Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-generic,v
retrieving revision 1.226
retrieving revision 1.227
diff -u -r1.226 -r1.227
--- config-generic	23 Jan 2009 22:40:24 -0000	1.226
+++ config-generic	26 Jan 2009 19:40:21 -0000	1.227
@@ -1248,7 +1248,7 @@
 CONFIG_R8169=m
 CONFIG_R8169_NAPI=y
 CONFIG_R8169_VLAN=y
-CONFIG_SFC=n
+# CONFIG_SFC is not set
 # CONFIG_SK98LIN is not set
 CONFIG_SKGE=m
 # CONFIG_SKGE_DEBUG is not set
@@ -1498,7 +1498,7 @@
 CONFIG_BPQETHER=m
 CONFIG_SCC=m
 CONFIG_DMASCC=m
-CONFIG_SCC_DELAY=n
+# CONFIG_SCC_DELAY is not set
 CONFIG_SCC_TRXECHO=y
 CONFIG_BAYCOM_SER_FDX=m
 CONFIG_BAYCOM_SER_HDX=m
@@ -2160,14 +2160,14 @@
 CONFIG_DRM_TDFX=m
 CONFIG_DRM_R128=m
 CONFIG_DRM_RADEON=m
-CONFIG_DRM_RADEON_KMS=n
+# CONFIG_DRM_RADEON_KMS is not set
 CONFIG_DRM_I810=m
 CONFIG_DRM_I830=m
 CONFIG_DRM_MGA=m
 CONFIG_DRM_SIS=m
 CONFIG_DRM_SAVAGE=m
 CONFIG_DRM_I915=m
-CONFIG_DRM_I915_KMS=n
+# CONFIG_DRM_I915_KMS is not set
 CONFIG_DRM_VIA=m
 CONFIG_DRM_NOUVEAU=m
 
@@ -2981,7 +2981,7 @@
 CONFIG_USB_UVCVIDEO=m
 CONFIG_USB_W9968CF=m
 CONFIG_USB_XUSBATM=m
-CONFIG_USB_ZC0301=n
+# CONFIG_USB_ZC0301 is not set
 CONFIG_USB_ZERO=m
 
 CONFIG_USB_ANNOUNCE_NEW_DEVICES=y



From rathann at fedoraproject.org  Mon Jan 26 19:46:02 2009
From: rathann at fedoraproject.org (Dominik Mierzejewski)
Date: Mon, 26 Jan 2009 19:46:02 +0000 (UTC)
Subject: rpms/dx/devel dx-errno.patch,NONE,1.1 dx.spec,1.11,1.12
Message-ID: <20090126194602.3CCC97010C@cvs1.fedora.phx.redhat.com>

Author: rathann

Update of /cvs/pkgs/rpms/dx/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30100

Modified Files:
	dx.spec 
Added Files:
	dx-errno.patch 
Log Message:
* Mon Jan 26 2009 Dominik Mierzejewski <rpm at greysector.net> 4.4.4-8
- fix leftover dxexec process consuming 100% CPU after quitting (bug #469664)


dx-errno.patch:

--- NEW FILE dx-errno.patch ---
diff -up dx-4.4.4/src/exec/dpexec/lex.c.errno dx-4.4.4/src/exec/dpexec/lex.c
--- dx-4.4.4/src/exec/dpexec/lex.c.errno	2006-01-09 23:57:34.000000000 +0100
+++ dx-4.4.4/src/exec/dpexec/lex.c	2009-01-26 19:16:20.000000000 +0100
@@ -504,6 +504,7 @@ int yylex(YYSTYPE *lvalp)
     for (;;)
     {
 	yyleng = 0;
+	errno = 0;
  
 	c = input();
  


Index: dx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dx/devel/dx.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- dx.spec	26 Jan 2009 17:55:31 -0000	1.11
+++ dx.spec	26 Jan 2009 19:45:31 -0000	1.12
@@ -1,7 +1,7 @@
 Summary: Open source version of IBM's Visualization Data Explorer
 Name: dx
 Version: 4.4.4
-Release: 7%{?dist}
+Release: 8%{?dist}
 URL: http://www.opendx.org/
 Group: Applications/Engineering
 Source0: http://opendx.npaci.edu/source/%{name}-%{version}.tar.gz
@@ -9,6 +9,8 @@
 Patch0: %{name}-rpm.patch
 Patch1: %{name}-open.patch
 Patch2: %{name}-gcc43.patch
+# fixes http://www.opendx.org/bugs/view.php?id=236
+Patch3: %{name}-errno.patch
 License: IBM
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: bison
@@ -57,6 +59,7 @@
 %patch0 -p1 -b .r
 %patch1 -p1 -b .open
 %patch2 -p1 -b .gcc43
+%patch3 -p1 -b .errno
 # fix debuginfo rpmlint warnings
 chmod a-x src/exec/{dxmods,dpexec,hwrender}/*.{c,h}
 
@@ -121,6 +124,9 @@
 %{_libdir}/lib*.so
 
 %changelog
+* Mon Jan 26 2009 Dominik Mierzejewski <rpm at greysector.net> 4.4.4-8
+- fix leftover dxexec process consuming 100% CPU after quitting (bug #469664)
+
 * Wed Sep 24 2008 Dominik Mierzejewski <rpm at greysector.net> 4.4.4-7
 - rediff patch to fix build with new rpm
 



From bpepple at fedoraproject.org  Mon Jan 26 20:08:42 2009
From: bpepple at fedoraproject.org (Brian Pepple)
Date: Mon, 26 Jan 2009 20:08:42 +0000 (UTC)
Subject: rpms/meld/F-10 .cvsignore, 1.11, 1.12 meld-scrollkeeper.patch, 1.3, 
	1.4 meld.spec, 1.27, 1.28 sources, 1.11, 1.12 desktop.patch, 1.1,
	NONE
Message-ID: <20090126200842.91FD97010C@cvs1.fedora.phx.redhat.com>

Author: bpepple

Update of /cvs/pkgs/rpms/meld/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1221

Modified Files:
	.cvsignore meld-scrollkeeper.patch meld.spec sources 
Removed Files:
	desktop.patch 
Log Message:
* Mon Jan 26 2009 Brian Pepple <bpepple at fedoraproject.org> - 1.2.1-1
- Update to 1.2.1. (#473256)
- Drop desktop file patch.  Fixed upstream.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/meld/F-10/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	3 Aug 2008 15:05:21 -0000	1.11
+++ .cvsignore	26 Jan 2009 20:08:12 -0000	1.12
@@ -1 +1 @@
-meld-1.2.tar.bz2
+meld-1.2.1.tar.bz2

meld-scrollkeeper.patch:

Index: meld-scrollkeeper.patch
===================================================================
RCS file: /cvs/pkgs/rpms/meld/F-10/meld-scrollkeeper.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- meld-scrollkeeper.patch	3 Aug 2008 15:05:21 -0000	1.3
+++ meld-scrollkeeper.patch	26 Jan 2009 20:08:12 -0000	1.4
@@ -1,7 +1,15 @@
-diff -urp meld-1.2.OLD/help/C/GNUmakefile meld-1.2/help/C/GNUmakefile
---- meld-1.2.OLD/help/C/GNUmakefile	2007-02-17 13:40:05.000000000 -0500
-+++ meld-1.2/help/C/GNUmakefile	2008-08-03 10:40:06.000000000 -0400
-@@ -19,7 +19,6 @@ install : $(OMF_NAME).install
+diff -urp meld-1.2.1.OLD/help/C/GNUmakefile meld-1.2.1/help/C/GNUmakefile
+--- meld-1.2.1.OLD/help/C/GNUmakefile	2007-02-17 13:40:05.000000000 -0500
++++ meld-1.2.1/help/C/GNUmakefile	2008-11-23 10:51:21.000000000 -0500
+@@ -11,7 +11,6 @@ INST_XML := $(helpdir_)/$(LANG)/meld.xml
+ 
+ .PHONY : all
+ all $(OMF_NAME).install : $(OMF_NAME)
+-	scrollkeeper-preinstall $(INST_XML) $(OMF_NAME) $(OMF_NAME).install
+ 
+ .PHONY : install
+ install : $(OMF_NAME).install
+@@ -19,7 +18,6 @@ install : $(OMF_NAME).install
  	install -m 644 meld.xml $(XML_DIR_)/meld.xml
  	install -m 644 figures/*.png $(XML_DIR_)/figures
  	-install -m 644 $< $(OMF_DIR_)/$(OMF_NAME)
@@ -9,7 +17,7 @@
  
  .PHONY : uninstall
  uninstall :
-@@ -28,7 +27,6 @@ uninstall :
+@@ -28,7 +26,6 @@ uninstall :
  		$(XML_DIR_)/figures/*.png
  	-rmdir $(XML_DIR_)/figures \
  		$(XML_DIR_)
@@ -17,10 +25,18 @@
  
  .PHONY : clean
  clean :
-diff -urp meld-1.2.OLD/help/es/GNUmakefile meld-1.2/help/es/GNUmakefile
---- meld-1.2.OLD/help/es/GNUmakefile	2007-02-17 13:40:05.000000000 -0500
-+++ meld-1.2/help/es/GNUmakefile	2008-08-03 10:40:32.000000000 -0400
-@@ -19,7 +19,6 @@ install : $(OMF_NAME).install
+diff -urp meld-1.2.1.OLD/help/es/GNUmakefile meld-1.2.1/help/es/GNUmakefile
+--- meld-1.2.1.OLD/help/es/GNUmakefile	2007-02-17 13:40:05.000000000 -0500
++++ meld-1.2.1/help/es/GNUmakefile	2008-11-23 10:51:54.000000000 -0500
+@@ -11,7 +11,6 @@ INST_XML := $(helpdir_)/$(LANG)/meld.xml
+ 
+ .PHONY : all
+ all $(OMF_NAME).install : $(OMF_NAME)
+-	scrollkeeper-preinstall $(INST_XML) $(OMF_NAME) $(OMF_NAME).install
+ 
+ .PHONY : install
+ install : $(OMF_NAME).install
+@@ -19,7 +18,6 @@ install : $(OMF_NAME).install
  	install -m 644 meld.$(LANG).xml $(XML_DIR_)/meld.xml
  	install -m 644 figures/*.png $(XML_DIR_)/figures
  	-install -m 644 $< $(OMF_DIR_)/$(OMF_NAME)
@@ -28,7 +44,7 @@
  
  .PHONY : uninstall
  uninstall :
-@@ -28,7 +27,6 @@ uninstall :
+@@ -28,7 +26,6 @@ uninstall :
  		$(XML_DIR_)/figures/*.png
  	-rmdir $(XML_DIR_)/figures \
  		$(XML_DIR_)
@@ -36,10 +52,16 @@
  
  .PHONY : clean
  clean :
-diff -urp meld-1.2.OLD/help/fr/GNUmakefile meld-1.2/help/fr/GNUmakefile
---- meld-1.2.OLD/help/fr/GNUmakefile	2008-03-31 16:44:53.000000000 -0400
-+++ meld-1.2/help/fr/GNUmakefile	2008-08-03 10:52:07.000000000 -0400
-@@ -17,18 +17,12 @@ all $(OMF_NAME).install : $(OMF_NAME)
+diff -urp meld-1.2.1.OLD/help/fr/GNUmakefile meld-1.2.1/help/fr/GNUmakefile
+--- meld-1.2.1.OLD/help/fr/GNUmakefile	2008-03-31 16:44:53.000000000 -0400
++++ meld-1.2.1/help/fr/GNUmakefile	2008-11-23 10:54:18.000000000 -0500
+@@ -11,24 +11,17 @@ INST_XML := $(helpdir_)/$(LANG)/meld.xml
+ 
+ .PHONY : all
+ all $(OMF_NAME).install : $(OMF_NAME)
+-	scrollkeeper-preinstall $(INST_XML) $(OMF_NAME) $(OMF_NAME).install
+ 
+ .PHONY : install
  install : $(OMF_NAME).install
  	-mkdir -m 755 -p $(OMF_DIR_) $(XML_DIR_) $(XML_DIR_)/figures
  	install -m 644 meld.$(LANG).xml $(XML_DIR_)/meld.xml


Index: meld.spec
===================================================================
RCS file: /cvs/pkgs/rpms/meld/F-10/meld.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- meld.spec	26 Aug 2008 15:07:38 -0000	1.27
+++ meld.spec	26 Jan 2009 20:08:12 -0000	1.28
@@ -1,13 +1,12 @@
 Name:		meld
-Version:	1.2
-Release:	2%{?dist}
+Version:	1.2.1
+Release:	1%{?dist}
 Summary:	Visual diff and merge tool
 
 Group:		Development/Tools
 License:	GPLv2+
 URL:		http://meld.sourceforge.net/
 Source0:	http://ftp.gnome.org/pub/gnome/sources/meld/1.1/meld-%{version}.tar.bz2
-Patch0:		desktop.patch
 Patch1:		%{name}-scrollkeeper.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -21,7 +20,7 @@
 Requires:	gnome-python2-canvas
 Requires:	gnome-python2-gconf
 Requires:	gnome-python2-gtksourceview
-Requires:	pygtk2 >= 2.6.0
+Requires:	pygtk2 >= 2.8.0
 Requires:	pygtk2-libglade
 
 Requires(post):	scrollkeeper
@@ -39,7 +38,6 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .desktop
 %patch1 -p1 -b .scrollkeeper
 
 
@@ -87,6 +85,10 @@
 
 
 %changelog
+* Mon Jan 26 2009 Brian Pepple <bpepple at fedoraproject.org> - 1.2.1-1
+- Update to 1.2.1. (#473256)
+- Drop desktop file patch.  Fixed upstream.
+
 * Tue Aug 26 2008 Brian Pepple <bpepple at fedoraproject.org> - 1.2-2
 - Change require to gnome-python2-gnome. (#460010)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/meld/F-10/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	3 Aug 2008 15:05:21 -0000	1.11
+++ sources	26 Jan 2009 20:08:12 -0000	1.12
@@ -1 +1 @@
-08e047ab4c8a8ae383674fcddde9fb87  meld-1.2.tar.bz2
+78f6084b14ee5334cf3578e62383b341  meld-1.2.1.tar.bz2


--- desktop.patch DELETED ---



From kyle at fedoraproject.org  Mon Jan 26 20:24:33 2009
From: kyle at fedoraproject.org (Kyle McMartin)
Date: Mon, 26 Jan 2009 20:24:33 +0000 (UTC)
Subject: rpms/kernel/devel config-arm,1.1,1.2
Message-ID: <20090126202433.169307010C@cvs1.fedora.phx.redhat.com>

Author: kyle

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3407

Modified Files:
	config-arm 
Log Message:
arm config


Index: config-arm
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-arm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- config-arm	26 Jan 2009 07:19:13 -0000	1.1
+++ config-arm	26 Jan 2009 20:24:02 -0000	1.2
@@ -5,6 +5,31 @@
 CONFIG_CC_OPTIMIZE_FOR_SIZE=y
 
 CONFIG_ARCH_VERSATILE=y
+CONFIG_ARCH_VERSATILE_PB=y
+CONFIG_MACH_VERSATILE_AB=y
+
+# CONFIG_CPU_ICACHE_DISABLE is not set
+# CONFIG_CPU_DCACHE_DISABLE is not set
+# CONFIG_CPU_DCACHE_WRITETHROUGH is not set
+# CONFIG_CPU_CACHE_ROUND_ROBIN is not set
+
+CONFIG_ZBOOT_ROM_TEXT=0
+CONFIG_ZBOOT_ROM_BSS=0
+
+# CONFIG_XIP_KERNEL is not set
+
+CONFIG_ATAGS_PROC=y
+
+# CONFIG_FPE_NWFPE is not set
+CONFIG_FPE_FASTFPE=y
+CONFIG_VFP=y
+
+CONFIG_PM=y
+# CONFIG_PM_DEBUG is not set
+# CONFIG_PM_TRACE is not set
+CONFIG_SUSPEND=y
+# CONFIG_PM_TEST_SUSPEND is not set
+CONFIG_APM_EMULATION=y
 
 CONFIG_ARM_THUMB=y
 
@@ -13,3 +38,56 @@
 
 CONFIG_CMDLINE="console=ttyAM0,115200 root=/dev/sda1 rootdelay=20"
 
+CONFIG_NO_HZ=y
+CONFIG_HIGH_RES_TIMERS=y
+
+# CONFIG_CPU_IDLE is not set
+
+CONFIG_LEDS=y
+CONFIG_LEDS_CPU=y
+
+CONFIG_MTD_AFS_PARTS=y
+CONFIG_MTD_ARM_INTEGRATOR=y
+CONFIG_MTD_IMPA7=y
+
+CONFIG_AX88796=m
+CONFIG_AX88796_93CX6=y
+CONFIG_SMC91X=m
+CONFIG_DM9000=m
+CONFIG_DM9000_DEBUGLEVEL=4
+# CONFIG_DM9000_FORCE_SIMPLE_PHY_POLL is not set
+CONFIG_SMC911X=m
+CONFIG_SMSC911X=m
+
+CONFIG_SERIO_AMBAKMI=m
+
+CONFIG_SERIAL_AMBA_PL011=y
+CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
+
+CONFIG_I2C_VERSATILE=y
+
+CONFIG_THERMAL=y
+
+# CONFIG_MFD_T7L66XB is not set
+# CONFIG_MFD_TC6387XB is not set
+
+CONFIG_FB_ARMCLCD=m
+
+CONFIG_SND_ARM=y
+CONFIG_SND_ARMAACI=m
+
+CONFIG_USB_MUSB_HDRC=m
+# CONFIG_MUSB_PIO_ONLY is not set
+CONFIG_USB_TUSB6010=y
+# CONFIG_USB_MUSB_DEBUG is not set
+
+CONFIG_MMC_ARMMMCI=m
+
+CONFIG_RTC_DRV_PL030=m
+CONFIG_RTC_DRV_PL031=m
+
+# CONFIG_SGI_IOC4 is not set
+
+# CONFIG_DEBUG_USER is not set
+# CONFIG_DEBUG_ERRORS is not set
+# CONFIG_DEBUG_LL is not set



From pkgdb at fedoraproject.org  Mon Jan 26 20:30:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Jan 2009 20:30:19 +0000
Subject: [pkgdb] grads ownership updated
Message-ID: <20090126203019.F1824208485@bastion.fedora.phx.redhat.com>

Package grads in Fedora devel is now owned by deji

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/grads



From pkgdb at fedoraproject.org  Mon Jan 26 20:30:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Jan 2009 20:30:42 +0000
Subject: [pkgdb] grads ownership updated
Message-ID: <20090126203042.B6D04208486@bastion.fedora.phx.redhat.com>

Package grads in Fedora 10 is now owned by deji

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/grads



From pkgdb at fedoraproject.org  Mon Jan 26 20:30:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Jan 2009 20:30:50 +0000
Subject: [pkgdb] grads ownership updated
Message-ID: <20090126203050.F0FED208488@bastion.fedora.phx.redhat.com>

Package grads in Fedora 9 is now owned by deji

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/grads



From rstrode at fedoraproject.org  Mon Jan 26 20:52:25 2009
From: rstrode at fedoraproject.org (Ray Strode)
Date: Mon, 26 Jan 2009 20:52:25 +0000 (UTC)
Subject: rpms/gedit/devel gedit-2.25.5-fix-python-path.patch, 1.1,
	1.2 gedit.spec, 1.184, 1.185
Message-ID: <20090126205225.7CE0F7010C@cvs1.fedora.phx.redhat.com>

Author: rstrode

Update of /cvs/pkgs/rpms/gedit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7780

Modified Files:
	gedit-2.25.5-fix-python-path.patch gedit.spec 
Log Message:
- Different, more functional fix for bug 481556.


gedit-2.25.5-fix-python-path.patch:

Index: gedit-2.25.5-fix-python-path.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gedit/devel/gedit-2.25.5-fix-python-path.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gedit-2.25.5-fix-python-path.patch	26 Jan 2009 17:43:12 -0000	1.1
+++ gedit-2.25.5-fix-python-path.patch	26 Jan 2009 20:52:25 -0000	1.2
@@ -1,13 +1,23 @@
 diff -up gedit-2.25.5/plugin-loaders/python/gedit-plugin-loader-python.c.fix-python-path gedit-2.25.5/plugin-loaders/python/gedit-plugin-loader-python.c
---- gedit-2.25.5/plugin-loaders/python/gedit-plugin-loader-python.c.fix-python-path	2009-01-26 12:36:50.289751027 -0500
-+++ gedit-2.25.5/plugin-loaders/python/gedit-plugin-loader-python.c	2009-01-26 12:39:23.668963430 -0500
-@@ -541,6 +541,9 @@ gedit_python_init (GeditPluginLoaderPyth
+--- gedit-2.25.5/plugin-loaders/python/gedit-plugin-loader-python.c.fix-python-path	2009-01-12 11:23:48.000000000 -0500
++++ gedit-2.25.5/plugin-loaders/python/gedit-plugin-loader-python.c	2009-01-26 15:35:30.672713673 -0500
+@@ -488,7 +488,7 @@ gedit_python_init (GeditPluginLoaderPyth
+ 	PyObject *gettext, *install, *gettext_args;
+ 	struct sigaction old_sigint;
+ 	gint res;
+-	char *argv[] = { "gedit", NULL };
++	char *argv[] = { GEDIT_PLUGINS_LIBS_DIR, NULL };
  
- 	PySys_SetArgv (1, argv);
- 
-+	/* Sanitize sys.path, see http://bugzilla.gnome.org/show_bug.cgi?id=569214 */
-+	PyRun_SimpleString ("import sys; sys.path = filter(None, sys.path)");
-+
- 	if (!gedit_check_pygtk2 ())
+ 	if (loader->priv->init_failed)
  	{
- 		/* Warning message already printed in check_pygtk2 */
+diff -up gedit-2.25.5/plugin-loaders/python/Makefile.am.fix-python-path gedit-2.25.5/plugin-loaders/python/Makefile.am
+--- gedit-2.25.5/plugin-loaders/python/Makefile.am.fix-python-path	2009-01-26 15:51:12.102965135 -0500
++++ gedit-2.25.5/plugin-loaders/python/Makefile.am	2009-01-26 15:35:49.978712718 -0500
+@@ -13,6 +13,7 @@ INCLUDES = \
+ 	$(DISABLE_DEPRECATED_CFLAGS)					\
+ 	$(PYGTK_CFLAGS)							\
+ 	$(PYTHON_CFLAGS)						\
++	-DGEDIT_PLUGINS_LIBS_DIR=\"$(GEDIT_PLUGINS_LIBS_DIR)\"		\
+ 	-DGEDIT_LOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\"
+ 
+ loader_LTLIBRARIES = libpythonloader.la


Index: gedit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gedit/devel/gedit.spec,v
retrieving revision 1.184
retrieving revision 1.185
diff -u -r1.184 -r1.185
--- gedit.spec	26 Jan 2009 17:43:12 -0000	1.184
+++ gedit.spec	26 Jan 2009 20:52:25 -0000	1.185
@@ -18,7 +18,7 @@
 Summary:	Text editor for the GNOME desktop
 Name:		gedit
 Version: 	2.25.5
-Release: 	2%{?dist}
+Release: 	3%{?dist}
 Epoch:		1
 License:	GPLv2+ and GFDL
 Group:		Applications/Editors
@@ -225,6 +225,9 @@
 
 
 %changelog
+* Mon Jan 26 2009 Ray Strode <rstrode at redhat.com> - 1:2.25.5-3
+- Different, more functional fix for bug 481556.
+
 * Mon Jan 26 2009 Ray Strode <rstrode at redhat.com> - 1:2.25.5-2
 - Fix up python plugin path to close up a security attack
   vectors (bug 481556).



From jjames at fedoraproject.org  Mon Jan 26 20:55:02 2009
From: jjames at fedoraproject.org (Jerry James)
Date: Mon, 26 Jan 2009 20:55:02 +0000 (UTC)
Subject: rpms/gcl/F-10 .cvsignore, 1.3, 1.4 gcl.spec, 1.29, 1.30 sources, 1.4,
	1.5
Message-ID: <20090126205502.3E9527010C@cvs1.fedora.phx.redhat.com>

Author: jjames

Update of /cvs/pkgs/rpms/gcl/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8096/F-10

Modified Files:
	.cvsignore gcl.spec sources 
Log Message:
* Mon Jan 26 2009 Jerry James <loganjerry at gmail.com> - 2.6.8-0.1.20080902cvs.2
- Add missing files required to build gcl.info, which is needed for the
  DESCRIBE function to work properly.
- Specify the info entries explicitly, else a mangled version is written.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gcl/F-10/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	16 Jan 2009 22:22:38 -0000	1.3
+++ .cvsignore	26 Jan 2009 20:54:31 -0000	1.4
@@ -1 +1,2 @@
 gcl-2.6.8.tar.bz2
+gcl-2.6.8-info.tar.bz2


Index: gcl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gcl/F-10/gcl.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- gcl.spec	18 Jan 2009 05:13:26 -0000	1.29
+++ gcl.spec	26 Jan 2009 20:54:31 -0000	1.30
@@ -28,7 +28,7 @@
 
 Name:           gcl
 Version:        2.6.8
-Release:        0.1.%{alphatag}.1%{?dist}
+Release:        0.1.%{alphatag}.2%{?dist}
 Summary:        GNU Common Lisp
 
 Group:          Development/Languages
@@ -41,6 +41,10 @@
 #   tar -cjvf gcl-2.6.8.tar.bz2 gcl-2.6.8
 Source0:        gcl-%{version}.tar.bz2
 Source1:        gcl.el
+# This is some info files that are needed for the DESCRIBE function to do
+# something useful.  These files are present in CVS HEAD (i.e., the upcoming
+# 2.7.0 release), but are missing in the 2.6 branch.
+Source2:        gcl-2.6.8-info.tar.bz2
 # This patch was last sent upstream on 29 Dec 2008.  It makes GCL use the
 # sigprocmask API instead of the deprecated sigblock API.
 Patch0:         gcl-2.6.8-sigprocmask-linux.patch
@@ -161,6 +165,7 @@
 
 %prep
 %setup -q
+%setup -q -T -D -a 2
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
@@ -198,6 +203,9 @@
 # FIXME: %%{?_smp_mflags} breaks the build
 make 
 
+# Build gcl.info, which is needed for DESCRIBE to work properly
+make -C info gcl.info
+
 # dwdoc needs one extra LaTeX run to resolve references
 cd xgcl-2
 pdflatex dwdoc.tex
@@ -263,9 +271,15 @@
 
 
 %post
-/sbin/install-info %{_infodir}/%{name}.info %{_infodir}/dir 2>/dev/null || :
-/sbin/install-info %{_infodir}/%{name}-si.info %{_infodir}/dir 2>/dev/null || :
-/sbin/install-info %{_infodir}/%{name}-tk.info %{_infodir}/dir 2>/dev/null || :
+/sbin/install-info %{_infodir}/%{name}.info %{_infodir}/dir \
+  --entry="* gcl: (gcl).	GNU Common Lisp Manual." \
+  2>/dev/null || :
+/sbin/install-info %{_infodir}/%{name}-si.info %{_infodir}/dir \
+  --entry="* gcl-si: (gcl-si).	GNU Common Lisp System Internals." \
+  2>/dev/null || :
+/sbin/install-info %{_infodir}/%{name}-tk.info %{_infodir}/dir \
+  --entry="* gcl-tk: (gcl-tk).	GNU Common Lisp Tk Manual." \
+  2>/dev/null || :
 /usr/sbin/semodule -i %{_datadir}/selinux/packages/gcl/gcl.pp || :
 /sbin/fixfiles -R gcl restore || :
 
@@ -314,6 +328,11 @@
 
 
 %changelog
+* Mon Jan 26 2009 Jerry James <loganjerry at gmail.com> - 2.6.8-0.1.20080902cvs.2
+- Add missing files required to build gcl.info, which is needed for the
+  DESCRIBE function to work properly.
+- Specify the info entries explicitly, else a mangled version is written.
+
 * Sat Jan 17 2009 Jerry James <loganjerry at gmail.com> - 2.6.8-0.1.20080902cvs.1
 - ExcludeArch ppc64 for now until I can figure out why it doesn't build
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gcl/F-10/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	16 Jan 2009 22:22:39 -0000	1.4
+++ sources	26 Jan 2009 20:54:31 -0000	1.5
@@ -1 +1,2 @@
 6f0453b7f1fb102322cfa69bf2a7275a  gcl-2.6.8.tar.bz2
+70b0cf146c7b0dc0f598b98cc7320116  gcl-2.6.8-info.tar.bz2



From jjames at fedoraproject.org  Mon Jan 26 20:55:02 2009
From: jjames at fedoraproject.org (Jerry James)
Date: Mon, 26 Jan 2009 20:55:02 +0000 (UTC)
Subject: rpms/gcl/F-9 .cvsignore,1.3,1.4 gcl.spec,1.29,1.30 sources,1.4,1.5
Message-ID: <20090126205502.6EF687010C@cvs1.fedora.phx.redhat.com>

Author: jjames

Update of /cvs/pkgs/rpms/gcl/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8096/F-9

Modified Files:
	.cvsignore gcl.spec sources 
Log Message:
* Mon Jan 26 2009 Jerry James <loganjerry at gmail.com> - 2.6.8-0.1.20080902cvs.2
- Add missing files required to build gcl.info, which is needed for the
  DESCRIBE function to work properly.
- Specify the info entries explicitly, else a mangled version is written.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gcl/F-9/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	16 Jan 2009 22:25:16 -0000	1.3
+++ .cvsignore	26 Jan 2009 20:54:32 -0000	1.4
@@ -1 +1,2 @@
 gcl-2.6.8.tar.bz2
+gcl-2.6.8-info.tar.bz2


Index: gcl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gcl/F-9/gcl.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- gcl.spec	18 Jan 2009 05:13:27 -0000	1.29
+++ gcl.spec	26 Jan 2009 20:54:32 -0000	1.30
@@ -28,7 +28,7 @@
 
 Name:           gcl
 Version:        2.6.8
-Release:        0.1.%{alphatag}.1%{?dist}
+Release:        0.1.%{alphatag}.2%{?dist}
 Summary:        GNU Common Lisp
 
 Group:          Development/Languages
@@ -41,6 +41,10 @@
 #   tar -cjvf gcl-2.6.8.tar.bz2 gcl-2.6.8
 Source0:        gcl-%{version}.tar.bz2
 Source1:        gcl.el
+# This is some info files that are needed for the DESCRIBE function to do
+# something useful.  These files are present in CVS HEAD (i.e., the upcoming
+# 2.7.0 release), but are missing in the 2.6 branch.
+Source2:        gcl-2.6.8-info.tar.bz2
 # This patch was last sent upstream on 29 Dec 2008.  It makes GCL use the
 # sigprocmask API instead of the deprecated sigblock API.
 Patch0:         gcl-2.6.8-sigprocmask-linux.patch
@@ -161,6 +165,7 @@
 
 %prep
 %setup -q
+%setup -q -T -D -a 2
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
@@ -198,6 +203,9 @@
 # FIXME: %%{?_smp_mflags} breaks the build
 make 
 
+# Build gcl.info, which is needed for DESCRIBE to work properly
+make -C info gcl.info
+
 # dwdoc needs one extra LaTeX run to resolve references
 cd xgcl-2
 pdflatex dwdoc.tex
@@ -263,9 +271,15 @@
 
 
 %post
-/sbin/install-info %{_infodir}/%{name}.info %{_infodir}/dir 2>/dev/null || :
-/sbin/install-info %{_infodir}/%{name}-si.info %{_infodir}/dir 2>/dev/null || :
-/sbin/install-info %{_infodir}/%{name}-tk.info %{_infodir}/dir 2>/dev/null || :
+/sbin/install-info %{_infodir}/%{name}.info %{_infodir}/dir \
+  --entry="* gcl: (gcl).	GNU Common Lisp Manual." \
+  2>/dev/null || :
+/sbin/install-info %{_infodir}/%{name}-si.info %{_infodir}/dir \
+  --entry="* gcl-si: (gcl-si).	GNU Common Lisp System Internals." \
+  2>/dev/null || :
+/sbin/install-info %{_infodir}/%{name}-tk.info %{_infodir}/dir \
+  --entry="* gcl-tk: (gcl-tk).	GNU Common Lisp Tk Manual." \
+  2>/dev/null || :
 /usr/sbin/semodule -i %{_datadir}/selinux/packages/gcl/gcl.pp || :
 /sbin/fixfiles -R gcl restore || :
 
@@ -314,6 +328,11 @@
 
 
 %changelog
+* Mon Jan 26 2009 Jerry James <loganjerry at gmail.com> - 2.6.8-0.1.20080902cvs.2
+- Add missing files required to build gcl.info, which is needed for the
+  DESCRIBE function to work properly.
+- Specify the info entries explicitly, else a mangled version is written.
+
 * Sat Jan 17 2009 Jerry James <loganjerry at gmail.com> - 2.6.8-0.1.20080902cvs.1
 - ExcludeArch ppc64 for now until I can figure out why it doesn't build
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gcl/F-9/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	16 Jan 2009 22:25:17 -0000	1.4
+++ sources	26 Jan 2009 20:54:32 -0000	1.5
@@ -1 +1,2 @@
 6f0453b7f1fb102322cfa69bf2a7275a  gcl-2.6.8.tar.bz2
+70b0cf146c7b0dc0f598b98cc7320116  gcl-2.6.8-info.tar.bz2



From jjames at fedoraproject.org  Mon Jan 26 20:55:02 2009
From: jjames at fedoraproject.org (Jerry James)
Date: Mon, 26 Jan 2009 20:55:02 +0000 (UTC)
Subject: rpms/gcl/devel .cvsignore, 1.3, 1.4 gcl.spec, 1.32, 1.33 sources,
	1.4, 1.5
Message-ID: <20090126205502.D4F207010C@cvs1.fedora.phx.redhat.com>

Author: jjames

Update of /cvs/pkgs/rpms/gcl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8096/devel

Modified Files:
	.cvsignore gcl.spec sources 
Log Message:
* Mon Jan 26 2009 Jerry James <loganjerry at gmail.com> - 2.6.8-0.1.20080902cvs.2
- Add missing files required to build gcl.info, which is needed for the
  DESCRIBE function to work properly.
- Specify the info entries explicitly, else a mangled version is written.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gcl/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	10 Jan 2009 05:23:17 -0000	1.3
+++ .cvsignore	26 Jan 2009 20:54:32 -0000	1.4
@@ -1 +1,2 @@
 gcl-2.6.8.tar.bz2
+gcl-2.6.8-info.tar.bz2


Index: gcl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gcl/devel/gcl.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- gcl.spec	18 Jan 2009 05:13:27 -0000	1.32
+++ gcl.spec	26 Jan 2009 20:54:32 -0000	1.33
@@ -28,7 +28,7 @@
 
 Name:           gcl
 Version:        2.6.8
-Release:        0.1.%{alphatag}.1%{?dist}
+Release:        0.1.%{alphatag}.2%{?dist}
 Summary:        GNU Common Lisp
 
 Group:          Development/Languages
@@ -41,6 +41,10 @@
 #   tar -cjvf gcl-2.6.8.tar.bz2 gcl-2.6.8
 Source0:        gcl-%{version}.tar.bz2
 Source1:        gcl.el
+# This is some info files that are needed for the DESCRIBE function to do
+# something useful.  These files are present in CVS HEAD (i.e., the upcoming
+# 2.7.0 release), but are missing in the 2.6 branch.
+Source2:        gcl-2.6.8-info.tar.bz2
 # This patch was last sent upstream on 29 Dec 2008.  It makes GCL use the
 # sigprocmask API instead of the deprecated sigblock API.
 Patch0:         gcl-2.6.8-sigprocmask-linux.patch
@@ -161,6 +165,7 @@
 
 %prep
 %setup -q
+%setup -q -T -D -a 2
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
@@ -198,6 +203,9 @@
 # FIXME: %%{?_smp_mflags} breaks the build
 make 
 
+# Build gcl.info, which is needed for DESCRIBE to work properly
+make -C info gcl.info
+
 # dwdoc needs one extra LaTeX run to resolve references
 cd xgcl-2
 pdflatex dwdoc.tex
@@ -263,9 +271,15 @@
 
 
 %post
-/sbin/install-info %{_infodir}/%{name}.info %{_infodir}/dir 2>/dev/null || :
-/sbin/install-info %{_infodir}/%{name}-si.info %{_infodir}/dir 2>/dev/null || :
-/sbin/install-info %{_infodir}/%{name}-tk.info %{_infodir}/dir 2>/dev/null || :
+/sbin/install-info %{_infodir}/%{name}.info %{_infodir}/dir \
+  --entry="* gcl: (gcl).	GNU Common Lisp Manual." \
+  2>/dev/null || :
+/sbin/install-info %{_infodir}/%{name}-si.info %{_infodir}/dir \
+  --entry="* gcl-si: (gcl-si).	GNU Common Lisp System Internals." \
+  2>/dev/null || :
+/sbin/install-info %{_infodir}/%{name}-tk.info %{_infodir}/dir \
+  --entry="* gcl-tk: (gcl-tk).	GNU Common Lisp Tk Manual." \
+  2>/dev/null || :
 /usr/sbin/semodule -i %{_datadir}/selinux/packages/gcl/gcl.pp || :
 /sbin/fixfiles -R gcl restore || :
 
@@ -314,6 +328,11 @@
 
 
 %changelog
+* Mon Jan 26 2009 Jerry James <loganjerry at gmail.com> - 2.6.8-0.1.20080902cvs.2
+- Add missing files required to build gcl.info, which is needed for the
+  DESCRIBE function to work properly.
+- Specify the info entries explicitly, else a mangled version is written.
+
 * Sat Jan 17 2009 Jerry James <loganjerry at gmail.com> - 2.6.8-0.1.20080902cvs.1
 - ExcludeArch ppc64 for now until I can figure out why it doesn't build
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gcl/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	10 Jan 2009 05:23:18 -0000	1.4
+++ sources	26 Jan 2009 20:54:32 -0000	1.5
@@ -1 +1,2 @@
 6f0453b7f1fb102322cfa69bf2a7275a  gcl-2.6.8.tar.bz2
+70b0cf146c7b0dc0f598b98cc7320116  gcl-2.6.8-info.tar.bz2



From tmraz at fedoraproject.org  Mon Jan 26 21:07:51 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Mon, 26 Jan 2009 21:07:51 +0000 (UTC)
Subject: rpms/openssl/devel openssl.spec,1.119,1.120
Message-ID: <20090126210752.04E767010C@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/openssl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11256

Modified Files:
	openssl.spec 
Log Message:
* Mon Jan 26 2009 Tomas Mraz <tmraz at redhat.com> 0.9.8j-6
- drop the temporary triggerpostun and symlinking in post
- fix the pkgconfig files and drop the unnecessary buildrequires
  on pkgconfig as it is a rpmbuild dependency (#481419)



Index: openssl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openssl/devel/openssl.spec,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -r1.119 -r1.120
--- openssl.spec	17 Jan 2009 20:49:48 -0000	1.119
+++ openssl.spec	26 Jan 2009 21:07:21 -0000	1.120
@@ -23,7 +23,7 @@
 Summary: A general purpose cryptography library with TLS implementation
 Name: openssl
 Version: 0.9.8j
-Release: 5%{?dist}
+Release: 6%{?dist}
 # We remove certain patented algorithms from the openssl source tarball
 # with the hobble-openssl script which is included below.
 Source: openssl-%{version}-usa.tar.bz2
@@ -72,7 +72,6 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: mktemp, krb5-devel, perl, sed, zlib-devel, /usr/bin/cmp
 BuildRequires: /usr/bin/rename
-BuildRequires: pkgconfig
 Requires: mktemp, ca-certificates >= 2008-5
 
 # Temporary hack
@@ -191,12 +190,11 @@
 # usable on all platforms.  The Configure script already knows to use -fPIC and
 # RPM_OPT_FLAGS, so we can skip specifiying them here.
 ./Configure \
-	--prefix=%{_prefix} --openssldir=%{_sysconfdir}/pki/tls ${sslflags} \
+	--prefix=/usr --openssldir=%{_sysconfdir}/pki/tls ${sslflags} \
 	zlib enable-camellia enable-seed enable-tlsext enable-rfc3779 \
 	enable-cms no-idea no-mdc2 no-rc5 no-ec no-ecdh no-ecdsa shared \
 	--with-krb5-flavor=MIT --enginesdir=%{_libdir}/openssl/engines \
-	-I%{_prefix}/kerberos/include -L%{_prefix}/kerberos/%{_lib} \
-	${sslarch} fipscanisterbuild
+	--with-krb5-dir=/usr ${sslarch} fipscanisterbuild
 
 # Add -Wa,--noexecstack here so that libcrypto's assembler modules will be
 # marked as not requiring an executable stack.
@@ -401,29 +399,18 @@
 %{_sysconfdir}/pki/tls/misc/*.pl
 %endif
 
-%post 
-if [ "$(readlink /%{_lib}/libcrypto.so.7)" != libcrypto.so.%{version} ] ; then
-    ln -sf libcrypto.so.%{version} /%{_lib}/libcrypto.so.7 || :
-fi
-if [ "$(readlink /%{_lib}/libssl.so.7)" != libssl.so.%{version} ] ; then
-    ln -sf libssl.so.%{version} /%{_lib}/libssl.so.7 || :
-fi
+%post
 /sbin/ldconfig -X
 
 %postun
 /sbin/ldconfig -X
 
-%triggerpostun -- openssl < 0.9.8j
-[ $1 != 0 ] || exit 0
-if [ "$(readlink /%{_lib}/libcrypto.so.7)" != libcrypto.so.%{version} ] ; then
-    ln -sf libcrypto.so.%{version} /%{_lib}/libcrypto.so.7 || :
-fi
-if [ "$(readlink /%{_lib}/libssl.so.7)" != libssl.so.%{version} ] ; then
-    ln -sf libssl.so.%{version} /%{_lib}/libssl.so.7 || :
-fi
-/sbin/ldconfig -X
-
 %changelog
+* Mon Jan 26 2009 Tomas Mraz <tmraz at redhat.com> 0.9.8j-6
+- drop the temporary triggerpostun and symlinking in post
+- fix the pkgconfig files and drop the unnecessary buildrequires
+  on pkgconfig as it is a rpmbuild dependency (#481419)
+
 * Sat Jan 16 2009 Tomas Mraz <tmraz at redhat.com> 0.9.8j-5
 - add temporary triggerpostun to reinstate the symlinks
 



From rdieter at fedoraproject.org  Mon Jan 26 21:08:36 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 26 Jan 2009 21:08:36 +0000 (UTC)
Subject: rpms/kde-settings/devel .cvsignore, 1.47, 1.48 kde-settings-svn.sh, 
	1.1, 1.2 kde-settings.spec, 1.64, 1.65 sources, 1.47, 1.48
Message-ID: <20090126210836.4F8E07010C@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kde-settings/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11556

Modified Files:
	.cvsignore kde-settings-svn.sh kde-settings.spec sources 
Log Message:
* Mon Jan 23 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2-1
- rev/branch 4.2 for F-11



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kde-settings/devel/.cvsignore,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- .cvsignore	16 Jan 2009 14:31:47 -0000	1.47
+++ .cvsignore	26 Jan 2009 21:08:05 -0000	1.48
@@ -1,2 +1 @@
-kde-settings-20081031svn.tar.bz2
-kde-settings-20090116svn.tar.bz2
+kde-settings-4.2-20090126svn.tar.bz2


Index: kde-settings-svn.sh
===================================================================
RCS file: /cvs/pkgs/rpms/kde-settings/devel/kde-settings-svn.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kde-settings-svn.sh	28 Oct 2008 18:03:23 -0000	1.1
+++ kde-settings-svn.sh	26 Jan 2009 21:08:05 -0000	1.2
@@ -1,7 +1,7 @@
 #/bin/sh
 
 DATE=$(date +%Y%m%d)
-EXPORT_DIR=kde-settings
+EXPORT_DIR=kde-settings-4.2
 
 set -x
 rm -rf $EXPORT_DIR


Index: kde-settings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kde-settings/devel/kde-settings.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- kde-settings.spec	16 Jan 2009 14:31:47 -0000	1.64
+++ kde-settings.spec	26 Jan 2009 21:08:05 -0000	1.65
@@ -1,19 +1,19 @@
-# THIS SPECFILE IS FOR F10+ ONLY!
+# THIS SPECFILE IS FOR F11 ONLY!
 # Sorry, it is just too different for conditionals to be worth it.
 # The actuall tarball also DIFFERS between releases!
-# Use kde-settings trunk for F10+, F-9 branch for F9, F-8 branch for F8.
+# Use kde-settings trunk for F11+, F-10 branch of F10, F-9 branch for F9.
 
-%define rel 20090116svn
+%define rel 20090126svn
 
 Summary: Config files for kde
 Name:    kde-settings
-Version: 4.1
-Release: 5.%{rel}%{?dist}
+Version: 4.2
+Release: 1.%{rel}%{?dist}
 
 Group:   System Environment/Base
 License: Public Domain
 Url:     http://fedorahosted.org/kde-settings
-Source0: kde-settings-%{rel}.tar.bz2
+Source0: kde-settings-%{version}-%{rel}.tar.bz2
 # used to generate Source0
 Source1: kde-settings-svn.sh
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -69,7 +69,7 @@
 
 
 %prep
-%setup -q -n %{name} 
+%setup -q 
 
 
 %build
@@ -157,6 +157,9 @@
 
 
 %changelog
+* Mon Jan 23 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2-1
+- rev/branch 4.2 for F-11
+
 * Fri Jan 16 2009 Than Ngo <than at redhat.com> - 4.1-5
 - wallpaper theme for new plasma in 4.2
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kde-settings/devel/sources,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- sources	16 Jan 2009 14:31:47 -0000	1.47
+++ sources	26 Jan 2009 21:08:06 -0000	1.48
@@ -1 +1 @@
-3e10d8fa6905b6ae9851668a5d640b97  kde-settings-20090116svn.tar.bz2
+353d9568d47e6ae15cbf01bddef9e158  kde-settings-4.2-20090126svn.tar.bz2



From rdieter at fedoraproject.org  Mon Jan 26 21:11:10 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 26 Jan 2009 21:11:10 +0000 (UTC)
Subject: rpms/kde-settings/F-10 .cvsignore, 1.46, 1.47 kde-settings-svn.sh,
	1.1, 1.2 kde-settings.spec, 1.63, 1.64 sources, 1.46, 1.47
Message-ID: <20090126211110.58DD37010C@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kde-settings/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12075

Modified Files:
	.cvsignore kde-settings-svn.sh kde-settings.spec sources 
Log Message:
* Mon Jan 26 2009 Rex Dieter <rdieter at fedoraproject.org> 4.1-5.20090129svn
- kwinrc: [Compositing] Enabled=false 



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kde-settings/F-10/.cvsignore,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- .cvsignore	31 Oct 2008 15:30:14 -0000	1.46
+++ .cvsignore	26 Jan 2009 21:10:39 -0000	1.47
@@ -1 +1 @@
-kde-settings-20081031svn.tar.bz2
+kde-settings-4.1-20090126svn.tar.bz2


Index: kde-settings-svn.sh
===================================================================
RCS file: /cvs/pkgs/rpms/kde-settings/F-10/kde-settings-svn.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kde-settings-svn.sh	28 Oct 2008 18:03:23 -0000	1.1
+++ kde-settings-svn.sh	26 Jan 2009 21:10:39 -0000	1.2
@@ -1,12 +1,12 @@
 #/bin/sh
 
 DATE=$(date +%Y%m%d)
-EXPORT_DIR=kde-settings
+EXPORT_DIR=kde-settings-4.1
 
 set -x
 rm -rf $EXPORT_DIR
 # app
-svn export http://svn.fedorahosted.org/svn/kde-settings/trunk $EXPORT_DIR/
+svn export http://svn.fedorahosted.org/svn/kde-settings/branches/F-10 $EXPORT_DIR/
 
 tar cjf $EXPORT_DIR-${DATE}svn.tar.bz2 $EXPORT_DIR
 


Index: kde-settings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kde-settings/F-10/kde-settings.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- kde-settings.spec	31 Oct 2008 15:30:14 -0000	1.63
+++ kde-settings.spec	26 Jan 2009 21:10:39 -0000	1.64
@@ -1,19 +1,19 @@
-# THIS SPECFILE IS FOR F10+ ONLY!
+# THIS SPECFILE IS FOR F10 ONLY!
 # Sorry, it is just too different for conditionals to be worth it.
 # The actuall tarball also DIFFERS between releases!
-# Use kde-settings trunk for F10+, F-9 branch for F9, F-8 branch for F8.
+# Use kde-settings trunk for F11+, F-10 branch of F10, F-9 branch for F9.
 
-%define rel 20081031svn
+%define rel 20090126svn
 
 Summary: Config files for kde
 Name:    kde-settings
 Version: 4.1
-Release: 4.%{rel}%{?dist}
+Release: 5.%{rel}%{?dist}
 
 Group:   System Environment/Base
 License: Public Domain
 Url:     http://fedorahosted.org/kde-settings
-Source0: kde-settings-%{rel}.tar.bz2
+Source0: kde-settings-%{version}-%{rel}.tar.bz2
 # used to generate Source0
 Source1: kde-settings-svn.sh
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -60,16 +60,17 @@
 Requires: %{name} = %{version}-%{release}
 Requires: pulseaudio
 Requires: pulseaudio-module-x11
-## kde3
+## kde3/legacy bits
 Requires: alsa-plugins-pulseaudio
 ## kde4
+#Requires: phonon-backend-xine
 Requires: xine-lib-pulseaudio
 %description pulseaudio
 %{summary}.
 
 
 %prep
-%setup -q -n %{name} 
+%setup -q
 
 
 %build
@@ -157,6 +158,9 @@
 
 
 %changelog
+* Mon Jan 26 2009 Rex Dieter <rdieter at fedoraproject.org> 4.1-5.20090129svn
+- kwinrc: [Compositing] Enabled=false 
+
 * Fri Oct 31 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1-4
 - KPackageKit: [CheckUpdate] autoUpdate=0 (#469375)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kde-settings/F-10/sources,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- sources	31 Oct 2008 15:30:14 -0000	1.46
+++ sources	26 Jan 2009 21:10:39 -0000	1.47
@@ -1 +1 @@
-39cf518718eaa92d14197551aef440b5  kde-settings-20081031svn.tar.bz2
+1c1f00aa8c3b2b91dcb030d51084d468  kde-settings-4.1-20090126svn.tar.bz2



From kyle at fedoraproject.org  Mon Jan 26 21:11:50 2009
From: kyle at fedoraproject.org (Kyle McMartin)
Date: Mon, 26 Jan 2009 21:11:50 +0000 (UTC)
Subject: rpms/kernel/F-10 patch-2.6.28.2.bz2.sign, NONE, 1.1 .cvsignore,
	1.965, 
	1.966 kernel.spec, 1.1228, 1.1229 sources, 1.927, 1.928 upstream,
	1.838, 1.839 patch-2.6.28.1.bz2.sign, 1.1,
	NONE patch-2.6.28.2-rc1.bz2.sign, 1.1, NONE
Message-ID: <20090126211150.89F167010C@cvs1.fedora.phx.redhat.com>

Author: kyle

Update of /cvs/pkgs/rpms/kernel/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12210

Modified Files:
	.cvsignore kernel.spec sources upstream 
Added Files:
	patch-2.6.28.2.bz2.sign 
Removed Files:
	patch-2.6.28.1.bz2.sign patch-2.6.28.2-rc1.bz2.sign 
Log Message:
* Mon Jan 26 2009 Kyle McMartin <kyle at redhat.com> 2.6.28.2-21
- 2.6.28.2 final



--- NEW FILE patch-2.6.28.2.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBJe7eiyGugalF9Dw4RAu+FAJ4rTDeg0RmoN0MxPtfZKWZUkvhq7gCfdD53
RcRA8bkT96pye/95mCtWkgQ=
=N2HZ
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/.cvsignore,v
retrieving revision 1.965
retrieving revision 1.966
diff -u -r1.965 -r1.966
--- .cvsignore	23 Jan 2009 20:57:53 -0000	1.965
+++ .cvsignore	26 Jan 2009 21:11:19 -0000	1.966
@@ -4,5 +4,4 @@
 temp-*
 kernel-2.6.28
 linux-2.6.28.tar.bz2
-patch-2.6.28.1.bz2
-patch-2.6.28.2-rc1.bz2
+patch-2.6.28.2.bz2


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/kernel.spec,v
retrieving revision 1.1228
retrieving revision 1.1229
diff -u -r1.1228 -r1.1229
--- kernel.spec	23 Jan 2009 20:57:53 -0000	1.1228
+++ kernel.spec	26 Jan 2009 21:11:19 -0000	1.1229
@@ -38,7 +38,7 @@
 # Do we have a -stable update to apply?
 %define stable_update 2
 # Is it a -stable RC?
-%define stable_rc 1
+%define stable_rc 0
 # Set rpm version accordingly
 %if 0%{?stable_update}
 %define stablerev .%{stable_update}
@@ -1782,6 +1782,9 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Mon Jan 26 2009 Kyle McMartin <kyle at redhat.com> 2.6.28.2-21
+- 2.6.28.2 final
+
 * Fri Jan 23 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.28.2-21.rc1
 - 2.6.28.2-rc1
   Dropped patches (merged upstream):


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/sources,v
retrieving revision 1.927
retrieving revision 1.928
diff -u -r1.927 -r1.928
--- sources	23 Jan 2009 20:57:53 -0000	1.927
+++ sources	26 Jan 2009 21:11:19 -0000	1.928
@@ -1,3 +1,2 @@
 d351e44709c9810b85e29b877f50968a  linux-2.6.28.tar.bz2
-137d854fbbb05d600de4006b74a9828c  patch-2.6.28.1.bz2
-b05e857840532cc1d15f1395103eec33  patch-2.6.28.2-rc1.bz2
+3a04439a0507847b45809b267c4db81b  patch-2.6.28.2.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/upstream,v
retrieving revision 1.838
retrieving revision 1.839
diff -u -r1.838 -r1.839
--- upstream	23 Jan 2009 20:57:53 -0000	1.838
+++ upstream	26 Jan 2009 21:11:20 -0000	1.839
@@ -1,3 +1,2 @@
 linux-2.6.28.tar.bz2
-patch-2.6.28.1.bz2
-patch-2.6.28.2-rc1.bz2
+patch-2.6.28.2.bz2


--- patch-2.6.28.1.bz2.sign DELETED ---


--- patch-2.6.28.2-rc1.bz2.sign DELETED ---



From hardaker at fedoraproject.org  Mon Jan 26 21:13:17 2009
From: hardaker at fedoraproject.org (Wes Hardaker)
Date: Mon, 26 Jan 2009 21:13:17 +0000 (UTC)
Subject: rpms/dnssec-tools/devel dnssec-tools-arpa-1.4.1.patch, NONE,
	1.1 dnssec-tools.spec, 1.20, 1.21
Message-ID: <20090126211317.957767010C@cvs1.fedora.phx.redhat.com>

Author: hardaker

Update of /cvs/extras/rpms/dnssec-tools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12582

Modified Files:
	dnssec-tools.spec 
Added Files:
	dnssec-tools-arpa-1.4.1.patch 
Log Message:
fixed compilation issue with new arpa header

dnssec-tools-arpa-1.4.1.patch:

--- NEW FILE dnssec-tools-arpa-1.4.1.patch ---
Index: validator/libsres/ns_parse.c
===================================================================
--- validator/libsres/ns_parse.c	(revision 4295)
+++ validator/libsres/ns_parse.c	(revision 4295)
@@ -54,7 +54,7 @@
 /*
  * These need to be in the same order as the nres.h:ns_flag enum. 
  */
-struct _ns_flagdata _ns_flagdata[16] = {
+struct _ns_flagdata _ns_flagdata_flags[16] = {
     {0x8000, 15},               /* qr. */
     {0x7800, 11},               /* opcode. */
     {0x0400, 10},               /* aa. */
@@ -77,15 +77,15 @@
  * ns_msg_getflag is a macro on linux, but Solaris and Darwin
  * both use defines of the function to map to other function
  * names.
+ *
+ * We completely rename the function for internal usage just to independent
  */
-#if !defined(ns_msg_getflag) || defined(sun) || defined(__APPLE__)
 int
-ns_msg_getflag(ns_msg han, int flag)
+libsres_msg_getflag(ns_msg han, int flag)
 {
-    return (((han)._flags & _ns_flagdata[flag].mask) >> _ns_flagdata[flag].
+    return (((han)._flags & _ns_flagdata_flags[flag].mask) >> _ns_flagdata_flags[flag].
             shift);
 }
-#endif
 
 int
 ns_skiprr(const u_char * ptr, const u_char * eom, ns_sect section,
--- validator/libsres/res_support.h	2008-07-22 20:24:09.000000000 -0700
+++ validator/libsres/res_support.h	2009-01-22 13:25:46.000000000 -0800
@@ -79,5 +79,6 @@
                                    int name_length);
 u_int16_t       retrieve_type(const u_int8_t * rr);
 u_int16_t       libsres_random(void);
+int             libsres_msg_getflag(ns_msg han, int flag);
 
 #endif                          /* RES_SUPPORT_H */
--- validator/libsres/res_debug.c	2008-07-22 20:07:30.000000000 -0700
+++ validator/libsres/res_debug.c	2009-01-22 13:25:46.000000000 -0800
@@ -191,7 +191,7 @@
         return;
     }
 
-    opcode = (ns_opcode) ns_msg_getflag(*handle, ns_f_opcode);
+    opcode = (ns_opcode) libsres_msg_getflag(*handle, ns_f_opcode);
     rrnum = 0;
     for (;;) {
         if (ns_parserr(handle, section, rrnum, &rr)) {
@@ -278,8 +278,8 @@
 
         return;
     }
-    opcode = ns_msg_getflag(handle, ns_f_opcode);
-    rcode = ns_msg_getflag(handle, ns_f_rcode);
+    opcode = libsres_msg_getflag(handle, ns_f_opcode);
+    rcode = libsres_msg_getflag(handle, ns_f_rcode);
     id = ns_msg_id(handle);
     qdcount = ns_msg_count(handle, ns_s_qd);
     ancount = ns_msg_count(handle, ns_s_an);
@@ -294,21 +294,21 @@
             _libsres_opcodes[opcode], p_rcode(rcode), id);
     putc(';', file);
     fprintf(file, "; flags:");
-    if (ns_msg_getflag(handle, ns_f_qr))
+    if (libsres_msg_getflag(handle, ns_f_qr))
         fprintf(file, " qr");
-    if (ns_msg_getflag(handle, ns_f_aa))
+    if (libsres_msg_getflag(handle, ns_f_aa))
         fprintf(file, " aa");
-    if (ns_msg_getflag(handle, ns_f_tc))
+    if (libsres_msg_getflag(handle, ns_f_tc))
         fprintf(file, " tc");
-    if (ns_msg_getflag(handle, ns_f_rd))
+    if (libsres_msg_getflag(handle, ns_f_rd))
         fprintf(file, " rd");
-    if (ns_msg_getflag(handle, ns_f_ra))
+    if (libsres_msg_getflag(handle, ns_f_ra))
         fprintf(file, " ra");
-    if (ns_msg_getflag(handle, ns_f_z))
+    if (libsres_msg_getflag(handle, ns_f_z))
         fprintf(file, " ??");
-    if (ns_msg_getflag(handle, ns_f_ad))
+    if (libsres_msg_getflag(handle, ns_f_ad))
         fprintf(file, " ad");
-    if (ns_msg_getflag(handle, ns_f_cd))
+    if (libsres_msg_getflag(handle, ns_f_cd))
         fprintf(file, " cd");
 
     fprintf(file, "; %s: %d", p_section(ns_s_qd, opcode), qdcount);


Index: dnssec-tools.spec
===================================================================
RCS file: /cvs/extras/rpms/dnssec-tools/devel/dnssec-tools.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- dnssec-tools.spec	16 Jan 2009 07:23:12 -0000	1.20
+++ dnssec-tools.spec	26 Jan 2009 21:12:47 -0000	1.21
@@ -1,7 +1,7 @@
 Summary: A suite of tools for managing dnssec aware DNS usage
 Name: dnssec-tools
 Version: 1.4.1
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: BSD
 Group: System Environment/Base
 URL: http://www.dnssec-tools.org/
@@ -18,6 +18,7 @@
 BuildRequires: perl(Test) perl(ExtUtils::MakeMaker)
 
 Patch4: dnssec-tools-linux-conf-paths-1.2.patch
+Patch5: dnssec-tools-arpa-1.4.1.patch
 
 %description
 
@@ -55,6 +56,7 @@
 %setup -q
 
 %patch4 -p0
+%patch5 -p0
 
 %build
 %configure --with-validator-testcases-file=%{_datadir}/dnssec-tools/validator-testcases --with-perl-build-args="INSTALLDIRS=vendor OPTIMIZE='$RPM_OPT_FLAGS'" --sysconfdir=/etc --with-root-hints=/etc/named.root.hints --with-resolv-conf=/etc/resolv.conf
@@ -282,6 +284,9 @@
 %{_mandir}/man3/val_freeaddrinfo.3.gz
 
 %changelog
+* Mon Jan 26 2009 Wes Hardaker <wjhns174 at hardakers.net> - 1.4.1-5
+- Fixed arpa header compile conflict
+
 * Thu Jan 15 2009 Tomas Mraz <tmraz at redhat.com> - 1.4.1-4
 - rebuild with new openssl
 



From rdieter at fedoraproject.org  Mon Jan 26 21:13:26 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 26 Jan 2009 21:13:26 +0000 (UTC)
Subject: rpms/kde-settings/F-9 .cvsignore, 1.40, 1.41 kde-settings.spec, 1.57,
	1.58 sources, 1.39, 1.40
Message-ID: <20090126211326.3EBFF7010C@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kde-settings/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12623

Modified Files:
	.cvsignore kde-settings.spec sources 
Log Message:
* Mon Jan 26 2009 Rex Dieter <rdieter at fedoraproject.org> 4.0-31.20090129svn
- kwinrc: [Compositing] Enabled=false
- backport default wallpaper mods for 4.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kde-settings/F-9/.cvsignore,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- .cvsignore	25 Nov 2008 04:05:22 -0000	1.40
+++ .cvsignore	26 Jan 2009 21:12:55 -0000	1.41
@@ -1 +1 @@
-kde-settings-4.0-30.tar.bz2
+kde-settings-4.0-20090126svn.tar.bz2


Index: kde-settings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kde-settings/F-9/kde-settings.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- kde-settings.spec	25 Nov 2008 04:09:48 -0000	1.57
+++ kde-settings.spec	26 Jan 2009 21:12:55 -0000	1.58
@@ -1,14 +1,14 @@
 # THIS SPECFILE IS FOR F9 ONLY!
 # Sorry, it is just too different for conditionals to be worth it.
 # The actuall tarball also DIFFERS between releases!
-# Use kde-settings trunk for F10+, F-9 branch for F9, F-8 branch for F8.
+# Use kde-settings trunk for F11+, F-10 branch of F10, F-9 branch for F9.
 
-%define rel 30
+%define rel 20090126svn
 
 Summary: Config files for kde
 Name:    kde-settings
 Version: 4.0
-Release: %{rel}%{?dist}
+Release: 31.%{rel}%{?dist}
 
 Group:   System Environment/Base
 License: Public Domain
@@ -16,6 +16,8 @@
 # This is a package which is specific to our distribution.  
 # Thus the source is only available from within this srpm.
 Source0: kde-settings-%{version}-%{rel}.tar.bz2
+# used to generate Source0
+Source1: kde-settings-svn.sh
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 
@@ -68,7 +70,7 @@
 
 
 %prep
-%setup -q -c -n %{name}
+%setup -q 
 
 
 %build
@@ -156,6 +158,10 @@
 
 
 %changelog
+* Mon Jan 26 2009 Rex Dieter <rdieter at fedoraproject.org> 4.0-31.20090129svn
+- kwinrc: [Compositing] Enabled=false
+- backport default wallpaper mods for 4.2
+
 * Tue Nov 25 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.0-30
 - KPackageKit: [CheckUpdate] autoUpdate=0 (#469375)
 - add Url tag


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kde-settings/F-9/sources,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- sources	25 Nov 2008 04:05:22 -0000	1.39
+++ sources	26 Jan 2009 21:12:55 -0000	1.40
@@ -1 +1 @@
-9aaa9c3e1c7649296ba6f8ba4e1ddcf4  kde-settings-4.0-30.tar.bz2
+35b55f420f684a7b473225ac73b3b8cc  kde-settings-4.0-20090126svn.tar.bz2



From kyle at fedoraproject.org  Mon Jan 26 21:14:00 2009
From: kyle at fedoraproject.org (Kyle McMartin)
Date: Mon, 26 Jan 2009 21:14:00 +0000 (UTC)
Subject: rpms/kernel/F-10 kernel.spec,1.1229,1.1230
Message-ID: <20090126211400.1A9C47010C@cvs1.fedora.phx.redhat.com>

Author: kyle

Update of /cvs/pkgs/rpms/kernel/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12733

Modified Files:
	kernel.spec 
Log Message:
forgot to bump verrel. sigh.


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/kernel.spec,v
retrieving revision 1.1229
retrieving revision 1.1230
diff -u -r1.1229 -r1.1230
--- kernel.spec	26 Jan 2009 21:11:19 -0000	1.1229
+++ kernel.spec	26 Jan 2009 21:13:29 -0000	1.1230
@@ -1782,7 +1782,7 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
-* Mon Jan 26 2009 Kyle McMartin <kyle at redhat.com> 2.6.28.2-21
+* Mon Jan 26 2009 Kyle McMartin <kyle at redhat.com> 2.6.28.2-22
 - 2.6.28.2 final
 
 * Fri Jan 23 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.28.2-21.rc1



From rdieter at fedoraproject.org  Mon Jan 26 21:15:52 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 26 Jan 2009 21:15:52 +0000 (UTC)
Subject: rpms/kde-settings/F-9 kde-settings-svn.sh,NONE,1.1
Message-ID: <20090126211552.DDBDC7010C@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kde-settings/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13286

Added Files:
	kde-settings-svn.sh 
Log Message:
import



--- NEW FILE kde-settings-svn.sh ---
#/bin/sh

DATE=$(date +%Y%m%d)
EXPORT_DIR=kde-settings-4.0

set -x
rm -rf $EXPORT_DIR
# app
svn export http://svn.fedorahosted.org/svn/kde-settings/branches/F-9 $EXPORT_DIR/

tar cjf $EXPORT_DIR-${DATE}svn.tar.bz2 $EXPORT_DIR

# cleanup
rm -rf $EXPORT_DIR




From kyle at fedoraproject.org  Mon Jan 26 21:18:53 2009
From: kyle at fedoraproject.org (Kyle McMartin)
Date: Mon, 26 Jan 2009 21:18:53 +0000 (UTC)
Subject: rpms/kernel/F-9 patch-2.6.28.2.bz2.sign, NONE, 1.1 .cvsignore, 1.838,
	1.839 kernel.spec, 1.896, 1.897 sources, 1.799, 1.800 upstream, 1.718,
	1.719
	linux-2.6-ath5k-ignore-the-return-value-of-ath5k_hw_noise_floor_calibration.patch,
	1.1,
	NONE linux-2.6-iwlwifi-use-GFP_KERNEL-to-allocate-Rx-SKB-memory.patch,
	1.1, NONE
Message-ID: <20090126211853.8A8527010C@cvs1.fedora.phx.redhat.com>

Author: kyle

Update of /cvs/pkgs/rpms/kernel/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13844

Modified Files:
	.cvsignore kernel.spec sources upstream 
Added Files:
	patch-2.6.28.2.bz2.sign 
Removed Files:
	linux-2.6-ath5k-ignore-the-return-value-of-ath5k_hw_noise_floor_calibration.patch 
	linux-2.6-iwlwifi-use-GFP_KERNEL-to-allocate-Rx-SKB-memory.patch 
Log Message:
* Mon Jan 26 2009 Kyle McMartin <kyle at redhat.com> - kernel-2.6.28.2-5.fc9
- 2.6.28.2 final



--- NEW FILE patch-2.6.28.2.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBJe7eiyGugalF9Dw4RAu+FAJ4rTDeg0RmoN0MxPtfZKWZUkvhq7gCfdD53
RcRA8bkT96pye/95mCtWkgQ=
=N2HZ
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/.cvsignore,v
retrieving revision 1.838
retrieving revision 1.839
diff -u -r1.838 -r1.839
--- .cvsignore	12 Jan 2009 19:54:16 -0000	1.838
+++ .cvsignore	26 Jan 2009 21:18:22 -0000	1.839
@@ -4,3 +4,4 @@
 temp-*
 kernel-2.6.28
 linux-2.6.28.tar.bz2
+patch-2.6.28.2.bz2


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/kernel.spec,v
retrieving revision 1.896
retrieving revision 1.897
diff -u -r1.896 -r1.897
--- kernel.spec	19 Jan 2009 06:22:36 -0000	1.896
+++ kernel.spec	26 Jan 2009 21:18:22 -0000	1.897
@@ -36,7 +36,7 @@
 %if 0%{?released_kernel}
 
 # Do we have a -stable update to apply?
-%define stable_update 0
+%define stable_update 2
 # Is it a -stable RC?
 %define stable_rc 0
 # Set rpm version accordingly
@@ -628,9 +628,6 @@
 
 Patch670: linux-2.6-ata-quirk.patch
 
-Patch680: linux-2.6-iwlwifi-use-GFP_KERNEL-to-allocate-Rx-SKB-memory.patch
-Patch681: linux-2.6-ath5k-ignore-the-return-value-of-ath5k_hw_noise_floor_calibration.patch
-
 Patch690: linux-2.6-at76.patch
 
 # webcam fixes
@@ -1150,12 +1147,6 @@
 # ia64 ata quirk
 ApplyPatch linux-2.6-ata-quirk.patch
 
-# iwlwifi: use GFP_KERNEL to allocate Rx SKB memory
-ApplyPatch linux-2.6-iwlwifi-use-GFP_KERNEL-to-allocate-Rx-SKB-memory.patch
-
-# ath5k: ignore the return value of ath5k_hw_noise_floor_calibration
-ApplyPatch linux-2.6-ath5k-ignore-the-return-value-of-ath5k_hw_noise_floor_calibration.patch
-
 # Add misc wireless bits from upstream wireless tree
 ApplyPatch linux-2.6-at76.patch
 
@@ -1779,6 +1770,9 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Mon Jan 26 2009 Kyle McMartin <kyle at redhat.com> - kernel-2.6.28.2-5.fc9
+- 2.6.28.2 final
+
 * Mon Jan 19 2009 Kyle McMartin <kyle at redhat.com>
 - execshield fixes: should no longer generate spurious handled GPFs,
   fixes randomization of executables. also some clean ups.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/sources,v
retrieving revision 1.799
retrieving revision 1.800
diff -u -r1.799 -r1.800
--- sources	12 Jan 2009 19:54:18 -0000	1.799
+++ sources	26 Jan 2009 21:18:22 -0000	1.800
@@ -1 +1,2 @@
 d351e44709c9810b85e29b877f50968a  linux-2.6.28.tar.bz2
+3a04439a0507847b45809b267c4db81b  patch-2.6.28.2.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/upstream,v
retrieving revision 1.718
retrieving revision 1.719
diff -u -r1.718 -r1.719
--- upstream	12 Jan 2009 19:54:18 -0000	1.718
+++ upstream	26 Jan 2009 21:18:22 -0000	1.719
@@ -1 +1,2 @@
 linux-2.6.28.tar.bz2
+patch-2.6.28.2.bz2


--- linux-2.6-ath5k-ignore-the-return-value-of-ath5k_hw_noise_floor_calibration.patch DELETED ---


--- linux-2.6-iwlwifi-use-GFP_KERNEL-to-allocate-Rx-SKB-memory.patch DELETED ---



From scop at fedoraproject.org  Mon Jan 26 21:18:39 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Mon, 26 Jan 2009 21:18:39 +0000 (UTC)
Subject: rpms/colordiff/devel colordiff-1.0.8a-destdir.patch, 1.1,
	1.2 colordiff.spec, 1.13, 1.14
Message-ID: <20090126211839.C54597010C@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/colordiff/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13851/devel

Modified Files:
	colordiff-1.0.8a-destdir.patch colordiff.spec 
Log Message:
* Mon Jan 26 2009 Ville Skytt?? <ville.skytta at iki.fi> - 1.0.8a-2
- Fix man page permissions.


colordiff-1.0.8a-destdir.patch:

Index: colordiff-1.0.8a-destdir.patch
===================================================================
RCS file: /cvs/pkgs/rpms/colordiff/devel/colordiff-1.0.8a-destdir.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- colordiff-1.0.8a-destdir.patch	26 Jan 2009 17:29:17 -0000	1.1
+++ colordiff-1.0.8a-destdir.patch	26 Jan 2009 21:18:38 -0000	1.2
@@ -24,8 +24,8 @@
 -	install -D cdiff.1 ${MAN_DIR}/cdiff.1
 -	if [ -f ${ETC_DIR}/colordiffrc ]; then \
 -	  mv -f ${ETC_DIR}/colordiffrc ${ETC_DIR}/colordiffrc.old; \
-+	install -D colordiff.1 ${DESTDIR}${MAN_DIR}/colordiff.1
-+	install -D cdiff.1 ${DESTDIR}${MAN_DIR}/cdiff.1
++	install -Dm 644 colordiff.1 ${DESTDIR}${MAN_DIR}/colordiff.1
++	install -m 644 cdiff.1 ${DESTDIR}${MAN_DIR}
 +	if [ -f ${DESTDIR}${ETC_DIR}/colordiffrc ]; then \
 +	  mv -f ${DESTDIR}${ETC_DIR}/colordiffrc \
 +	    ${DESTDIR}${ETC_DIR}/colordiffrc.old; \


Index: colordiff.spec
===================================================================
RCS file: /cvs/pkgs/rpms/colordiff/devel/colordiff.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- colordiff.spec	26 Jan 2009 17:29:17 -0000	1.13
+++ colordiff.spec	26 Jan 2009 21:18:38 -0000	1.14
@@ -1,6 +1,6 @@
 Name:           colordiff
 Version:        1.0.8a
-Release:        1
+Release:        2
 Summary:        Color terminal highlighter for diff files
 
 Group:          Applications/Text
@@ -68,6 +68,9 @@
 
 
 %changelog
+* Mon Jan 26 2009 Ville Skytt?? <ville.skytta at iki.fi> - 1.0.8a-2
+- Fix man page permissions.
+
 * Mon Jan 26 2009 Ville Skytt?? <ville.skytta at iki.fi> - 1.0.8a-1
 - 1.0.8a.
 - Patch Makefile for DESTDIR support.



From scop at fedoraproject.org  Mon Jan 26 21:19:08 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Mon, 26 Jan 2009 21:19:08 +0000 (UTC)
Subject: rpms/colordiff/F-10 colordiff-1.0.8a-destdir.patch, 1.1,
	1.2 colordiff.spec, 1.13, 1.14
Message-ID: <20090126211908.D09CB7010C@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/colordiff/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13851/F-10

Modified Files:
	colordiff-1.0.8a-destdir.patch colordiff.spec 
Log Message:
* Mon Jan 26 2009 Ville Skytt?? <ville.skytta at iki.fi> - 1.0.8a-2
- Fix man page permissions.


colordiff-1.0.8a-destdir.patch:

Index: colordiff-1.0.8a-destdir.patch
===================================================================
RCS file: /cvs/pkgs/rpms/colordiff/F-10/colordiff-1.0.8a-destdir.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- colordiff-1.0.8a-destdir.patch	26 Jan 2009 17:29:16 -0000	1.1
+++ colordiff-1.0.8a-destdir.patch	26 Jan 2009 21:18:38 -0000	1.2
@@ -24,8 +24,8 @@
 -	install -D cdiff.1 ${MAN_DIR}/cdiff.1
 -	if [ -f ${ETC_DIR}/colordiffrc ]; then \
 -	  mv -f ${ETC_DIR}/colordiffrc ${ETC_DIR}/colordiffrc.old; \
-+	install -D colordiff.1 ${DESTDIR}${MAN_DIR}/colordiff.1
-+	install -D cdiff.1 ${DESTDIR}${MAN_DIR}/cdiff.1
++	install -Dm 644 colordiff.1 ${DESTDIR}${MAN_DIR}/colordiff.1
++	install -m 644 cdiff.1 ${DESTDIR}${MAN_DIR}
 +	if [ -f ${DESTDIR}${ETC_DIR}/colordiffrc ]; then \
 +	  mv -f ${DESTDIR}${ETC_DIR}/colordiffrc \
 +	    ${DESTDIR}${ETC_DIR}/colordiffrc.old; \


Index: colordiff.spec
===================================================================
RCS file: /cvs/pkgs/rpms/colordiff/F-10/colordiff.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- colordiff.spec	26 Jan 2009 17:29:16 -0000	1.13
+++ colordiff.spec	26 Jan 2009 21:18:38 -0000	1.14
@@ -1,6 +1,6 @@
 Name:           colordiff
 Version:        1.0.8a
-Release:        1
+Release:        2
 Summary:        Color terminal highlighter for diff files
 
 Group:          Applications/Text
@@ -68,6 +68,9 @@
 
 
 %changelog
+* Mon Jan 26 2009 Ville Skytt?? <ville.skytta at iki.fi> - 1.0.8a-2
+- Fix man page permissions.
+
 * Mon Jan 26 2009 Ville Skytt?? <ville.skytta at iki.fi> - 1.0.8a-1
 - 1.0.8a.
 - Patch Makefile for DESTDIR support.



From remi at fedoraproject.org  Mon Jan 26 21:19:38 2009
From: remi at fedoraproject.org (Remi Collet)
Date: Mon, 26 Jan 2009 21:19:38 +0000 (UTC)
Subject: rpms/glpi/devel .cvsignore, 1.13, 1.14 glpi.spec, 1.20, 1.21 sources,
	1.15, 1.16
Message-ID: <20090126211938.5E5627010C@cvs1.fedora.phx.redhat.com>

Author: remi

Update of /cvs/extras/rpms/glpi/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14008

Modified Files:
	.cvsignore glpi.spec sources 
Log Message:
update to 0.71.5 (regression fix)


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/glpi/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	26 Jan 2009 05:47:22 -0000	1.13
+++ .cvsignore	26 Jan 2009 21:19:07 -0000	1.14
@@ -1 +1 @@
-glpi-0.71.4.tar.gz
+glpi-0.71.5.tar.gz


Index: glpi.spec
===================================================================
RCS file: /cvs/extras/rpms/glpi/devel/glpi.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- glpi.spec	26 Jan 2009 05:47:22 -0000	1.20
+++ glpi.spec	26 Jan 2009 21:19:07 -0000	1.21
@@ -5,7 +5,7 @@
 %endif
 
 Name:           glpi
-Version:        0.71.4
+Version:        0.71.5
 Release:        1%{?dist}
 Summary:        Free IT asset management software
 Summary(fr):    Gestion Libre de Parc Informatique
@@ -230,6 +230,9 @@
 
 
 %changelog
+* Mon Jan 26 2009 Remi Collet <Fedora at FamilleCollet.com> - 0.71.5-1
+- update to 0.71.5 (Fix regression in 0.71.4)
+
 * Mon Jan 26 2009 Remi Collet <Fedora at FamilleCollet.com> - 0.71.4-1
 - update to 0.71.4 (Security Release)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/glpi/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	26 Jan 2009 05:47:22 -0000	1.15
+++ sources	26 Jan 2009 21:19:07 -0000	1.16
@@ -1 +1 @@
-d7e4ae789408616b67ea6d598bc3cc51  glpi-0.71.4.tar.gz
+033c223432e5eb77919a668e1807f2f7  glpi-0.71.5.tar.gz



From kyle at fedoraproject.org  Mon Jan 26 21:24:10 2009
From: kyle at fedoraproject.org (Kyle McMartin)
Date: Mon, 26 Jan 2009 21:24:10 +0000 (UTC)
Subject: rpms/kernel/F-9 patch-2.6.27.13.bz2.sign, NONE, 1.1.2.1 .cvsignore, 
	1.837.2.4, 1.837.2.5 kernel.spec, 1.891.2.10, 1.891.2.11 sources,
	1.798.2.4, 1.798.2.5 upstream, 1.717.2.4,
	1.717.2.5 patch-2.6.27.12.bz2.sign, 1.1.2.1,
	NONE patch-2.6.27.13-rc1.bz2.sign, 1.1.2.1, NONE
Message-ID: <20090126212410.3E36F7010C@cvs1.fedora.phx.redhat.com>

Author: kyle

Update of /cvs/pkgs/rpms/kernel/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15070

Modified Files:
      Tag: private-fedora-9-2_6_27-branch
	.cvsignore kernel.spec sources upstream 
Added Files:
      Tag: private-fedora-9-2_6_27-branch
	patch-2.6.27.13.bz2.sign 
Removed Files:
      Tag: private-fedora-9-2_6_27-branch
	patch-2.6.27.12.bz2.sign patch-2.6.27.13-rc1.bz2.sign 
Log Message:
* Mon Jan 26 2009 Kyle McMartin <kyle at redhat.com> kernel-2.6.27.13-78.2.11
- 2.6.27.13 final



--- NEW FILE patch-2.6.27.13.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBJe7dvyGugalF9Dw4RAk3uAJ4vL3t6jpay0HhLGG8sJljxr158HACeN+8G
+YQypxk/Ch77OQcSQHQ9GY0=
=gRa+
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/.cvsignore,v
retrieving revision 1.837.2.4
retrieving revision 1.837.2.5
diff -u -r1.837.2.4 -r1.837.2.5
--- .cvsignore	23 Jan 2009 21:04:31 -0000	1.837.2.4
+++ .cvsignore	26 Jan 2009 21:23:39 -0000	1.837.2.5
@@ -4,5 +4,4 @@
 temp-*
 kernel-2.6.27
 linux-2.6.27.tar.bz2
-patch-2.6.27.12.bz2
-patch-2.6.27.13-rc1.bz2
+patch-2.6.27.13.bz2


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/kernel.spec,v
retrieving revision 1.891.2.10
retrieving revision 1.891.2.11
diff -u -r1.891.2.10 -r1.891.2.11
--- kernel.spec	23 Jan 2009 21:04:31 -0000	1.891.2.10
+++ kernel.spec	26 Jan 2009 21:23:39 -0000	1.891.2.11
@@ -38,7 +38,7 @@
 # Do we have a -stable update to apply?
 %define stable_update 13
 # Is it a -stable RC?
-%define stable_rc 1
+%define stable_rc 0
 # Set rpm version accordingly
 %if 0%{?stable_update}
 %define stablerev .%{stable_update}
@@ -1910,6 +1910,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 Jan 26 2009 Kyle McMartin <kyle at redhat.com> kernel-2.6.27.13-78.2.11
+- 2.6.27.13 final
+
 * Fri Jan 23 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.27.13-78.2.10
 - 2.6.27.13-rc1
   Dropped patches (merged upstream):


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/sources,v
retrieving revision 1.798.2.4
retrieving revision 1.798.2.5
diff -u -r1.798.2.4 -r1.798.2.5
--- sources	23 Jan 2009 21:04:31 -0000	1.798.2.4
+++ sources	26 Jan 2009 21:23:39 -0000	1.798.2.5
@@ -1,3 +1,2 @@
 b3e78977aa79d3754cb7f8143d7ddabd  linux-2.6.27.tar.bz2
-6ec5b819521600fc5bd20b17a939113d  patch-2.6.27.12.bz2
-f4cc0a09c5c0d1cab14586d906ce9d8f  patch-2.6.27.13-rc1.bz2
+ead4980144479f23f7ca9b22ea9ee44f  patch-2.6.27.13.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/upstream,v
retrieving revision 1.717.2.4
retrieving revision 1.717.2.5
diff -u -r1.717.2.4 -r1.717.2.5
--- upstream	23 Jan 2009 21:04:31 -0000	1.717.2.4
+++ upstream	26 Jan 2009 21:23:39 -0000	1.717.2.5
@@ -1,3 +1,2 @@
 linux-2.6.27.tar.bz2
-patch-2.6.27.12.bz2
-patch-2.6.27.13-rc1.bz2
+patch-2.6.27.13.bz2


--- patch-2.6.27.12.bz2.sign DELETED ---


--- patch-2.6.27.13-rc1.bz2.sign DELETED ---



From remi at fedoraproject.org  Mon Jan 26 21:25:01 2009
From: remi at fedoraproject.org (Remi Collet)
Date: Mon, 26 Jan 2009 21:25:01 +0000 (UTC)
Subject: rpms/glpi/F-10 glpi.spec,1.20,1.21 sources,1.15,1.16
Message-ID: <20090126212501.515BB7010C@cvs1.fedora.phx.redhat.com>

Author: remi

Update of /cvs/extras/rpms/glpi/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15236

Modified Files:
	glpi.spec sources 
Log Message:
update to 0.71.5 (regression fix)


Index: glpi.spec
===================================================================
RCS file: /cvs/extras/rpms/glpi/F-10/glpi.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- glpi.spec	26 Jan 2009 05:53:12 -0000	1.20
+++ glpi.spec	26 Jan 2009 21:24:31 -0000	1.21
@@ -5,7 +5,7 @@
 %endif
 
 Name:           glpi
-Version:        0.71.4
+Version:        0.71.5
 Release:        1%{?dist}
 Summary:        Free IT asset management software
 Summary(fr):    Gestion Libre de Parc Informatique
@@ -230,6 +230,9 @@
 
 
 %changelog
+* Mon Jan 26 2009 Remi Collet <Fedora at FamilleCollet.com> - 0.71.5-1
+- update to 0.71.5 (Fix regression in 0.71.4)
+
 * Mon Jan 26 2009 Remi Collet <Fedora at FamilleCollet.com> - 0.71.4-1
 - update to 0.71.4 (Security Release)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/glpi/F-10/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	26 Jan 2009 05:53:12 -0000	1.15
+++ sources	26 Jan 2009 21:24:31 -0000	1.16
@@ -1 +1 @@
-d7e4ae789408616b67ea6d598bc3cc51  glpi-0.71.4.tar.gz
+033c223432e5eb77919a668e1807f2f7  glpi-0.71.5.tar.gz



From kyle at fedoraproject.org  Mon Jan 26 21:26:56 2009
From: kyle at fedoraproject.org (Kyle McMartin)
Date: Mon, 26 Jan 2009 21:26:56 +0000 (UTC)
Subject: rpms/kernel/F-10 patch-2.6.27.13.bz2.sign, NONE, 1.1.2.1 .cvsignore,
	1.960.2.1, 1.960.2.2 kernel.spec, 1.1206.2.5, 1.1206.2.6 sources,
	1.922.2.1, 1.922.2.2 upstream, 1.834.2.1,
	1.834.2.2 patch-2.6.27.12.bz2.sign, 1.1.2.1, NONE
Message-ID: <20090126212656.6E0F87010C@cvs1.fedora.phx.redhat.com>

Author: kyle

Update of /cvs/pkgs/rpms/kernel/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15655

Modified Files:
      Tag: private-fedora-10-2_6_27
	.cvsignore kernel.spec sources upstream 
Added Files:
      Tag: private-fedora-10-2_6_27
	patch-2.6.27.13.bz2.sign 
Removed Files:
      Tag: private-fedora-10-2_6_27
	patch-2.6.27.12.bz2.sign 
Log Message:
* Mon Jan 26 2009 Kyle McMartin <kyle at redhat.com> 2.6.27.13-170.2.6
- 2.6.27.13 final



--- NEW FILE patch-2.6.27.13.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBJe7dvyGugalF9Dw4RAk3uAJ4vL3t6jpay0HhLGG8sJljxr158HACeN+8G
+YQypxk/Ch77OQcSQHQ9GY0=
=gRa+
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/.cvsignore,v
retrieving revision 1.960.2.1
retrieving revision 1.960.2.2
diff -u -r1.960.2.1 -r1.960.2.2
--- .cvsignore	19 Jan 2009 07:35:12 -0000	1.960.2.1
+++ .cvsignore	26 Jan 2009 21:26:25 -0000	1.960.2.2
@@ -4,4 +4,4 @@
 temp-*
 kernel-2.6.27
 linux-2.6.27.tar.bz2
-patch-2.6.27.12.bz2
+patch-2.6.27.13.bz2


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/kernel.spec,v
retrieving revision 1.1206.2.5
retrieving revision 1.1206.2.6
diff -u -r1.1206.2.5 -r1.1206.2.6
--- kernel.spec	21 Jan 2009 06:16:42 -0000	1.1206.2.5
+++ kernel.spec	26 Jan 2009 21:26:25 -0000	1.1206.2.6
@@ -36,7 +36,7 @@
 %if 0%{?released_kernel}
 
 # Do we have a -stable update to apply?
-%define stable_update 12
+%define stable_update 13
 # Is it a -stable RC?
 %define stable_rc 0
 # Set rpm version accordingly
@@ -1916,6 +1916,9 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Mon Jan 26 2009 Kyle McMartin <kyle at redhat.com> 2.6.27.13-170.2.6
+- 2.6.27.13 final
+
 * Tue Jan 20 2009 Chuck Ebbert <cebbert at redhat.com>
 - ath5k: ignore the return value of ath5k_hw_noise_floor_calibration
   (backport to 2.6.27)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/sources,v
retrieving revision 1.922.2.1
retrieving revision 1.922.2.2
diff -u -r1.922.2.1 -r1.922.2.2
--- sources	19 Jan 2009 07:35:13 -0000	1.922.2.1
+++ sources	26 Jan 2009 21:26:25 -0000	1.922.2.2
@@ -1,2 +1,2 @@
 b3e78977aa79d3754cb7f8143d7ddabd  linux-2.6.27.tar.bz2
-6ec5b819521600fc5bd20b17a939113d  patch-2.6.27.12.bz2
+ead4980144479f23f7ca9b22ea9ee44f  patch-2.6.27.13.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/upstream,v
retrieving revision 1.834.2.1
retrieving revision 1.834.2.2
diff -u -r1.834.2.1 -r1.834.2.2
--- upstream	19 Jan 2009 07:35:13 -0000	1.834.2.1
+++ upstream	26 Jan 2009 21:26:25 -0000	1.834.2.2
@@ -1,2 +1,2 @@
 linux-2.6.27.tar.bz2
-patch-2.6.27.12.bz2
+patch-2.6.27.13.bz2


--- patch-2.6.27.12.bz2.sign DELETED ---



From remi at fedoraproject.org  Mon Jan 26 21:27:04 2009
From: remi at fedoraproject.org (Remi Collet)
Date: Mon, 26 Jan 2009 21:27:04 +0000 (UTC)
Subject: rpms/glpi/EL-5 glpi.spec,1.11,1.12 sources,1.8,1.9
Message-ID: <20090126212704.A95C87010C@cvs1.fedora.phx.redhat.com>

Author: remi

Update of /cvs/extras/rpms/glpi/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15697

Modified Files:
	glpi.spec sources 
Log Message:
update to 0.71.5 (regression fix)


Index: glpi.spec
===================================================================
RCS file: /cvs/extras/rpms/glpi/EL-5/glpi.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- glpi.spec	26 Jan 2009 05:56:47 -0000	1.11
+++ glpi.spec	26 Jan 2009 21:26:34 -0000	1.12
@@ -5,7 +5,7 @@
 %endif
 
 Name:           glpi
-Version:        0.71.4
+Version:        0.71.5
 Release:        1%{?dist}
 Summary:        Free IT asset management software
 Summary(fr):    Gestion Libre de Parc Informatique
@@ -230,6 +230,9 @@
 
 
 %changelog
+* Mon Jan 26 2009 Remi Collet <Fedora at FamilleCollet.com> - 0.71.5-1
+- update to 0.71.5 (Fix regression in 0.71.4)
+
 * Mon Jan 26 2009 Remi Collet <Fedora at FamilleCollet.com> - 0.71.4-1
 - update to 0.71.4 (Security Release)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/glpi/EL-5/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	26 Jan 2009 05:56:47 -0000	1.8
+++ sources	26 Jan 2009 21:26:34 -0000	1.9
@@ -1 +1 @@
-d7e4ae789408616b67ea6d598bc3cc51  glpi-0.71.4.tar.gz
+033c223432e5eb77919a668e1807f2f7  glpi-0.71.5.tar.gz



From remi at fedoraproject.org  Mon Jan 26 21:28:17 2009
From: remi at fedoraproject.org (Remi Collet)
Date: Mon, 26 Jan 2009 21:28:17 +0000 (UTC)
Subject: rpms/glpi/F-9 glpi.spec,1.20,1.21 sources,1.15,1.16
Message-ID: <20090126212817.EF42B7010C@cvs1.fedora.phx.redhat.com>

Author: remi

Update of /cvs/extras/rpms/glpi/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15964

Modified Files:
	glpi.spec sources 
Log Message:
update to 0.71.5 (regression fix)


Index: glpi.spec
===================================================================
RCS file: /cvs/extras/rpms/glpi/F-9/glpi.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- glpi.spec	26 Jan 2009 05:54:46 -0000	1.20
+++ glpi.spec	26 Jan 2009 21:27:47 -0000	1.21
@@ -5,7 +5,7 @@
 %endif
 
 Name:           glpi
-Version:        0.71.4
+Version:        0.71.5
 Release:        1%{?dist}
 Summary:        Free IT asset management software
 Summary(fr):    Gestion Libre de Parc Informatique
@@ -230,6 +230,9 @@
 
 
 %changelog
+* Mon Jan 26 2009 Remi Collet <Fedora at FamilleCollet.com> - 0.71.5-1
+- update to 0.71.5 (Fix regression in 0.71.4)
+
 * Mon Jan 26 2009 Remi Collet <Fedora at FamilleCollet.com> - 0.71.4-1
 - update to 0.71.4 (Security Release)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/glpi/F-9/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	26 Jan 2009 05:54:46 -0000	1.15
+++ sources	26 Jan 2009 21:27:47 -0000	1.16
@@ -1 +1 @@
-d7e4ae789408616b67ea6d598bc3cc51  glpi-0.71.4.tar.gz
+033c223432e5eb77919a668e1807f2f7  glpi-0.71.5.tar.gz



From kyle at fedoraproject.org  Mon Jan 26 21:28:44 2009
From: kyle at fedoraproject.org (Kyle McMartin)
Date: Mon, 26 Jan 2009 21:28:44 +0000 (UTC)
Subject: rpms/kernel/F-9 kernel.spec,1.891.2.11,1.891.2.12
Message-ID: <20090126212844.3A2797010C@cvs1.fedora.phx.redhat.com>

Author: kyle

Update of /cvs/pkgs/rpms/kernel/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16092

Modified Files:
      Tag: private-fedora-9-2_6_27-branch
	kernel.spec 
Log Message:
de-muppeterize version


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/kernel.spec,v
retrieving revision 1.891.2.11
retrieving revision 1.891.2.12
diff -u -r1.891.2.11 -r1.891.2.12
--- kernel.spec	26 Jan 2009 21:23:39 -0000	1.891.2.11
+++ kernel.spec	26 Jan 2009 21:28:13 -0000	1.891.2.12
@@ -1910,7 +1910,7 @@
 %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 Jan 26 2009 Kyle McMartin <kyle at redhat.com> kernel-2.6.27.13-78.2.11
+* Mon Jan 26 2009 Kyle McMartin <kyle at redhat.com> 2.6.27.13-78.2.12
 - 2.6.27.13 final
 
 * Fri Jan 23 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.27.13-78.2.10



From rstrode at fedoraproject.org  Mon Jan 26 21:30:01 2009
From: rstrode at fedoraproject.org (Ray Strode)
Date: Mon, 26 Jan 2009 21:30:01 +0000 (UTC)
Subject: rpms/gedit/F-10 gedit-2.24.3-fix-python-path.patch, 1.3,
	1.4 gedit.spec, 1.175, 1.176
Message-ID: <20090126213001.B6EC27010C@cvs1.fedora.phx.redhat.com>

Author: rstrode

Update of /cvs/pkgs/rpms/gedit/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16380

Modified Files:
	gedit-2.24.3-fix-python-path.patch gedit.spec 
Log Message:
- Fix bug 481556 in a more functional way


gedit-2.24.3-fix-python-path.patch:

Index: gedit-2.24.3-fix-python-path.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gedit/F-10/gedit-2.24.3-fix-python-path.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gedit-2.24.3-fix-python-path.patch	26 Jan 2009 18:28:01 -0000	1.3
+++ gedit-2.24.3-fix-python-path.patch	26 Jan 2009 21:29:31 -0000	1.4
@@ -1,13 +1,12 @@
 diff -up gedit-2.24.3/gedit/gedit-python-module.c.fix-python-path gedit-2.24.3/gedit/gedit-python-module.c
 --- gedit-2.24.3/gedit/gedit-python-module.c.fix-python-path	2009-01-07 10:39:41.000000000 -0500
-+++ gedit-2.24.3/gedit/gedit-python-module.c	2009-01-26 13:27:01.917963137 -0500
-@@ -373,6 +373,9 @@ gedit_python_init (void)
++++ gedit-2.24.3/gedit/gedit-python-module.c	2009-01-26 16:27:27.028988285 -0500
+@@ -318,7 +318,7 @@ gedit_python_init (void)
+ 	PyObject *gettext, *install, *gettext_args;
+ 	struct sigaction old_sigint;
+ 	gint res;
+-	char *argv[] = { "gedit", NULL };
++	char *argv[] = { GEDIT_PLUGINS_DIR, NULL };
+ 	
+ 	static gboolean init_failed = FALSE;
  
- 	PySys_SetArgv (1, argv);
- 
-+	/* Sanitize sys.path, see http://bugzilla.gnome.org/show_bug.cgi?id=569214 */
-+	PyRun_SimpleString ("import sys; sys.path = filter(None, sys.path)");
-+
- 	if (!check_pygtk2 ())
- 	{
- 		/* Warning message already printed in check_pygtk2 */


Index: gedit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gedit/F-10/gedit.spec,v
retrieving revision 1.175
retrieving revision 1.176
diff -u -r1.175 -r1.176
--- gedit.spec	26 Jan 2009 17:50:52 -0000	1.175
+++ gedit.spec	26 Jan 2009 21:29:31 -0000	1.176
@@ -18,7 +18,7 @@
 Summary:	gEdit is a small but powerful text editor for GNOME
 Name:		gedit
 Version: 	2.24.3
-Release: 	2%{?dist}
+Release: 	3%{?dist}
 Epoch:		1
 License:	GPLv2+ and GFDL
 Group:		Applications/Editors
@@ -223,6 +223,9 @@
 
 
 %changelog
+* Mon Jan 26 2009 Ray Strode <rstrode at redhat.com> - 1:2.24.3-3
+- Fix bug 481556 in a more functional way
+
 * Mon Jan 26 2009 Ray Strode <rstrode at redhat.com> - 1:2.24.3-2
 - Fix up python plugin path to close up a security attack
   vectors (bug 481556).



From remi at fedoraproject.org  Mon Jan 26 21:31:08 2009
From: remi at fedoraproject.org (Remi Collet)
Date: Mon, 26 Jan 2009 21:31:08 +0000 (UTC)
Subject: rpms/glpi/EL-4 glpi.spec,1.9,1.10 sources,1.8,1.9
Message-ID: <20090126213108.43E247010C@cvs1.fedora.phx.redhat.com>

Author: remi

Update of /cvs/extras/rpms/glpi/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16581

Modified Files:
	glpi.spec sources 
Log Message:
update to 0.71.5 (regression fix)


Index: glpi.spec
===================================================================
RCS file: /cvs/extras/rpms/glpi/EL-4/glpi.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- glpi.spec	26 Jan 2009 05:58:23 -0000	1.9
+++ glpi.spec	26 Jan 2009 21:30:37 -0000	1.10
@@ -5,7 +5,7 @@
 %endif
 
 Name:           glpi
-Version:        0.71.4
+Version:        0.71.5
 Release:        1%{?dist}
 Summary:        Free IT asset management software
 Summary(fr):    Gestion Libre de Parc Informatique
@@ -230,6 +230,9 @@
 
 
 %changelog
+* Mon Jan 26 2009 Remi Collet <Fedora at FamilleCollet.com> - 0.71.5-1
+- update to 0.71.5 (Fix regression in 0.71.4)
+
 * Mon Jan 26 2009 Remi Collet <Fedora at FamilleCollet.com> - 0.71.4-1
 - update to 0.71.4 (Security Release)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/glpi/EL-4/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	26 Jan 2009 05:58:23 -0000	1.8
+++ sources	26 Jan 2009 21:30:37 -0000	1.9
@@ -1 +1 @@
-d7e4ae789408616b67ea6d598bc3cc51  glpi-0.71.4.tar.gz
+033c223432e5eb77919a668e1807f2f7  glpi-0.71.5.tar.gz



From rstrode at fedoraproject.org  Mon Jan 26 21:39:39 2009
From: rstrode at fedoraproject.org (Ray Strode)
Date: Mon, 26 Jan 2009 21:39:39 +0000 (UTC)
Subject: rpms/gedit/F-9 gedit-2.22.3-fix-python-path.patch, 1.2,
	1.3 gedit.spec, 1.158, 1.159
Message-ID: <20090126213939.8B5467010C@cvs1.fedora.phx.redhat.com>

Author: rstrode

Update of /cvs/pkgs/rpms/gedit/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18816

Modified Files:
	gedit-2.22.3-fix-python-path.patch gedit.spec 
Log Message:
- Fix bug 481556 in a more functional way.


gedit-2.22.3-fix-python-path.patch:

Index: gedit-2.22.3-fix-python-path.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gedit/F-9/gedit-2.22.3-fix-python-path.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gedit-2.22.3-fix-python-path.patch	26 Jan 2009 18:07:06 -0000	1.2
+++ gedit-2.22.3-fix-python-path.patch	26 Jan 2009 21:39:09 -0000	1.3
@@ -1,13 +1,12 @@
 diff -up gedit-2.22.3/gedit/gedit-python-module.c.fix-python-path gedit-2.22.3/gedit/gedit-python-module.c
 --- gedit-2.22.3/gedit/gedit-python-module.c.fix-python-path	2008-05-25 06:35:36.000000000 -0400
-+++ gedit-2.22.3/gedit/gedit-python-module.c	2009-01-26 13:05:26.784987984 -0500
-@@ -541,6 +541,9 @@ gedit_python_init (void)
- 	PyObject_CallObject (install, gettext_args);
- 	Py_DECREF (gettext_args);
- 	
-+	/* Sanitize sys.path, see http://bugzilla.gnome.org/show_bug.cgi?id=569214 */
-+	PyRun_SimpleString ("import sys; sys.path = filter(None, sys.path)");
-+
- 	/* Python has been successfully initialized */
- 	init_failed = FALSE;
++++ gedit-2.22.3/gedit/gedit-python-module.c	2009-01-26 16:35:38.137711691 -0500
+@@ -398,7 +398,7 @@ gedit_python_init (void)
+ 	PyObject *gettext, *install, *gettext_args;
+ 	struct sigaction old_sigint;
+ 	gint res;
+-	char *argv[] = { "gedit", NULL };
++	char *argv[] = { GEDIT_PLUGINDIR, NULL };
  	
+ 	static gboolean init_failed = FALSE;
+ 


Index: gedit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gedit/F-9/gedit.spec,v
retrieving revision 1.158
retrieving revision 1.159
diff -u -r1.158 -r1.159
--- gedit.spec	26 Jan 2009 17:59:06 -0000	1.158
+++ gedit.spec	26 Jan 2009 21:39:09 -0000	1.159
@@ -18,7 +18,7 @@
 Summary:	gEdit is a small but powerful text editor for GNOME
 Name:		gedit
 Version: 	2.22.3
-Release: 	2%{?dist}
+Release: 	3%{?dist}
 Epoch:		1
 License:	GPLv2+ and GFDL
 Group:		Applications/Editors
@@ -197,6 +197,9 @@
 
 
 %changelog
+* Mon Jan 26 2009 Ray Strode <rstrode at redhat.com> - 1:2.22.3-3
+- Fix bug 481556 in a more functional way.
+
 * Mon Jan 26 2009 Ray Strode <rstrode at redhat.com> - 1:2.22.3-2
 - Fix up python plugin path to close up a security attack
   vectors (bug 481556).



From rdieter at fedoraproject.org  Mon Jan 26 21:45:37 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 26 Jan 2009 21:45:37 +0000 (UTC)
Subject: rpms/kdelibs/F-10 kdelibs.spec,1.397,1.398 sources,1.74,1.75
Message-ID: <20090126214537.4F7907010C@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdelibs/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19876

Modified Files:
	kdelibs.spec sources 
Log Message:
* Mon Jan 26 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.0-3
- respun tarball



Index: kdelibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/F-10/kdelibs.spec,v
retrieving revision 1.397
retrieving revision 1.398
diff -u -r1.397 -r1.398
--- kdelibs.spec	26 Jan 2009 18:10:28 -0000	1.397
+++ kdelibs.spec	26 Jan 2009 21:45:06 -0000	1.398
@@ -1,6 +1,6 @@
 Summary: K Desktop Environment 4 - Libraries
 Version: 4.2.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs
@@ -80,7 +80,6 @@
 Patch22: kdelibs-4.1.96-cmake.patch
 
 # upstream
-Patch100: plasma-on-screensaver-security-fix.diff
 # 4.3 branch
 Patch101: kdelibs-4.1.96-AllowExternalPaths.patch
 
@@ -209,11 +208,9 @@
 %patch22 -p1 -b .kdepimlibs-cmake
 
 # upstream patches
-pushd plasma
-%patch100 -p0 -b .plasma-on-screensaver-security-fix
-popd
 %patch101 -p1 -b .AllowExternalPaths
 
+
 %build
 
 mkdir -p %{_target_platform}
@@ -374,6 +371,9 @@
 
 
 %changelog
+* Mon Jan 26 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.0-3
+- respun tarball
+
 * Mon Jan 26 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.0-2
 - plasma-on-screensaver-security patch
 - (Build)Req: automoc4 >= 0.9.88, phonon(-devel) >= 4.3.0


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/F-10/sources,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- sources	23 Jan 2009 18:59:58 -0000	1.74
+++ sources	26 Jan 2009 21:45:06 -0000	1.75
@@ -1 +1 @@
-4ea13b88463125026a7f71937075bcec  kdelibs-4.2.0.tar.bz2
+2d830a922195fefe6e073111850247ac  kdelibs-4.2.0.tar.bz2



From kyle at fedoraproject.org  Mon Jan 26 21:46:34 2009
From: kyle at fedoraproject.org (Kyle McMartin)
Date: Mon, 26 Jan 2009 21:46:34 +0000 (UTC)
Subject: rpms/kernel/devel git-linus.diff, 1.13, 1.14 kernel.spec, 1.1231,
	1.1232 linux-2.6.28-sunrpc-ipv6-rpcbind.patch, 1.1, 1.2
Message-ID: <20090126214634.768BC7010C@cvs1.fedora.phx.redhat.com>

Author: kyle

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20312

Modified Files:
	git-linus.diff kernel.spec 
	linux-2.6.28-sunrpc-ipv6-rpcbind.patch 
Log Message:
* Mon Jan 26 2009 Kyle McMartin <kyle at redhat.com>
- Update git-linus.diff to bf50c903faba4ec7686ee8a570ac384b0f20814d.
- drm-next.patch merged.
- linux-2.6.28-sunrpc-ipv6-rpcbind.patch: update for Kconfig moves.


git-linus.diff:

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.13 -r 1.14 git-linus.diff
Index: git-linus.diff
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/git-linus.diff,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- git-linus.diff	6 Oct 2008 14:26:12 -0000	1.13
+++ git-linus.diff	26 Jan 2009 21:46:32 -0000	1.14
@@ -0,0 +1,91654 @@
+diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
+index 8511d35..d8362cf 100644
+--- a/Documentation/kernel-parameters.txt
++++ b/Documentation/kernel-parameters.txt
+@@ -577,9 +577,6 @@ and is between 256 and 4096 characters. It is defined in the file
+ 			a memory unit (amount[KMG]). See also
+ 			Documentation/kdump/kdump.txt for a example.
+ 
+-	cs4232=		[HW,OSS]
+-			Format: <io>,<irq>,<dma>,<dma2>,<mpuio>,<mpuirq>
+-
+ 	cs89x0_dma=	[HW,NET]
+ 			Format: <dma>
+ 
+@@ -732,10 +729,6 @@ and is between 256 and 4096 characters. It is defined in the file
+ 			Default value is 0.
+ 			Value can be changed at runtime via /selinux/enforce.
+ 
+-	es1371=		[HW,OSS]
+-			Format: <spdif>,[<nomix>,[<amplifier>]]
+-			See also header of sound/oss/es1371.c.
+-
+ 	ether=		[HW,NET] Ethernet cards parameters
+ 			This option is obsoleted by the "netdev=" option, which
+ 			has equivalent usage. See its documentation for details.
+diff --git a/Documentation/sound/alsa/HD-Audio-Models.txt b/Documentation/sound/alsa/HD-Audio-Models.txt
+index 64eb110..0f5d26b 100644
+--- a/Documentation/sound/alsa/HD-Audio-Models.txt
++++ b/Documentation/sound/alsa/HD-Audio-Models.txt
+@@ -349,6 +349,7 @@ STAC92HD73*
+ STAC92HD83*
+ ===========
+   ref		Reference board
++  mic-ref	Reference board with power managment for ports
+ 
+ STAC9872
+ ========
+diff --git a/Makefile b/Makefile
+index 207303d..93b81bc 100644
+--- a/Makefile
++++ b/Makefile
+@@ -213,6 +213,10 @@ endif
+ # Where to locate arch specific headers
+ hdr-arch  := $(SRCARCH)
+ 
++ifeq ($(ARCH),m68knommu)
++       hdr-arch  := m68k
++endif
++
+ KCONFIG_CONFIG	?= .config
+ 
+ # SHELL used by kbuild
+diff --git a/arch/arm/plat-mxc/include/mach/ipu.h b/arch/arm/plat-mxc/include/mach/ipu.h
+new file mode 100644
+index 0000000..a9221f1
+--- /dev/null
++++ b/arch/arm/plat-mxc/include/mach/ipu.h
+@@ -0,0 +1,181 @@
++/*
++ * Copyright (C) 2008
++ * Guennadi Liakhovetski, DENX Software Engineering, <lg at denx.de>
++ *
++ * Copyright (C) 2005-2007 Freescale Semiconductor, Inc.
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License version 2 as
++ * published by the Free Software Foundation.
++ */
++
++#ifndef _IPU_H_
++#define _IPU_H_
++
++#include <linux/types.h>
++#include <linux/dmaengine.h>
++
++/* IPU DMA Controller channel definitions. */
++enum ipu_channel {
++	IDMAC_IC_0 = 0,		/* IC (encoding task) to memory */
++	IDMAC_IC_1 = 1,		/* IC (viewfinder task) to memory */
++	IDMAC_ADC_0 = 1,
++	IDMAC_IC_2 = 2,
++	IDMAC_ADC_1 = 2,
++	IDMAC_IC_3 = 3,
++	IDMAC_IC_4 = 4,
++	IDMAC_IC_5 = 5,
++	IDMAC_IC_6 = 6,
++	IDMAC_IC_7 = 7,		/* IC (sensor data) to memory */
++	IDMAC_IC_8 = 8,
++	IDMAC_IC_9 = 9,
++	IDMAC_IC_10 = 10,
++	IDMAC_IC_11 = 11,
++	IDMAC_IC_12 = 12,
++	IDMAC_IC_13 = 13,
++	IDMAC_SDC_0 = 14,	/* Background synchronous display data */
++	IDMAC_SDC_1 = 15,	/* Foreground data (overlay) */
++	IDMAC_SDC_2 = 16,
++	IDMAC_SDC_3 = 17,
++	IDMAC_ADC_2 = 18,
++	IDMAC_ADC_3 = 19,
++	IDMAC_ADC_4 = 20,
++	IDMAC_ADC_5 = 21,
++	IDMAC_ADC_6 = 22,
++	IDMAC_ADC_7 = 23,
++	IDMAC_PF_0 = 24,
++	IDMAC_PF_1 = 25,
++	IDMAC_PF_2 = 26,
++	IDMAC_PF_3 = 27,
++	IDMAC_PF_4 = 28,
++	IDMAC_PF_5 = 29,
++	IDMAC_PF_6 = 30,
++	IDMAC_PF_7 = 31,
++};
++
++/* Order significant! */
++enum ipu_channel_status {
++	IPU_CHANNEL_FREE,
++	IPU_CHANNEL_INITIALIZED,
++	IPU_CHANNEL_READY,
++	IPU_CHANNEL_ENABLED,
++};
++
++#define IPU_CHANNELS_NUM 32
++
++enum pixel_fmt {
++	/* 1 byte */
++	IPU_PIX_FMT_GENERIC,
++	IPU_PIX_FMT_RGB332,
++	IPU_PIX_FMT_YUV420P,
++	IPU_PIX_FMT_YUV422P,
++	IPU_PIX_FMT_YUV420P2,
++	IPU_PIX_FMT_YVU422P,
++	/* 2 bytes */
++	IPU_PIX_FMT_RGB565,
++	IPU_PIX_FMT_RGB666,
++	IPU_PIX_FMT_BGR666,
++	IPU_PIX_FMT_YUYV,
++	IPU_PIX_FMT_UYVY,
++	/* 3 bytes */
++	IPU_PIX_FMT_RGB24,
++	IPU_PIX_FMT_BGR24,
++	/* 4 bytes */
++	IPU_PIX_FMT_GENERIC_32,
++	IPU_PIX_FMT_RGB32,
++	IPU_PIX_FMT_BGR32,
++	IPU_PIX_FMT_ABGR32,
++	IPU_PIX_FMT_BGRA32,
++	IPU_PIX_FMT_RGBA32,
++};
++
++enum ipu_color_space {
++	IPU_COLORSPACE_RGB,
++	IPU_COLORSPACE_YCBCR,
++	IPU_COLORSPACE_YUV
++};
++
++/*
++ * Enumeration of IPU rotation modes
++ */
++enum ipu_rotate_mode {
++	/* Note the enum values correspond to BAM value */
++	IPU_ROTATE_NONE = 0,
++	IPU_ROTATE_VERT_FLIP = 1,
++	IPU_ROTATE_HORIZ_FLIP = 2,
++	IPU_ROTATE_180 = 3,
++	IPU_ROTATE_90_RIGHT = 4,
++	IPU_ROTATE_90_RIGHT_VFLIP = 5,
++	IPU_ROTATE_90_RIGHT_HFLIP = 6,
++	IPU_ROTATE_90_LEFT = 7,
++};
++
++struct ipu_platform_data {
++	unsigned int	irq_base;
++};
++
++/*
++ * Enumeration of DI ports for ADC.
++ */
++enum display_port {
++	DISP0,
++	DISP1,
++	DISP2,
++	DISP3
++};
++
++struct idmac_video_param {
++	unsigned short		in_width;
++	unsigned short		in_height;
++	uint32_t		in_pixel_fmt;
++	unsigned short		out_width;
++	unsigned short		out_height;
++	uint32_t		out_pixel_fmt;
[...91263 lines suppressed...]
+ static hda_nid_t stac92hd83xxx_amp_nids[1] = {
+@@ -841,10 +842,6 @@ static struct hda_verb stac92hd73xx_10ch_core_init[] = {
+ };
+ 
+ static struct hda_verb stac92hd83xxx_core_init[] = {
+-	/* start of config #1 */
+-	{ 0xe, AC_VERB_SET_CONNECT_SEL, 0x3},
+-
+-	/* start of config #2 */
+ 	{ 0xa, AC_VERB_SET_CONNECT_SEL, 0x0},
+ 	{ 0xb, AC_VERB_SET_CONNECT_SEL, 0x0},
+ 	{ 0xd, AC_VERB_SET_CONNECT_SEL, 0x1},
+@@ -885,8 +882,8 @@ static struct hda_verb stac92hd71bxx_analog_core_init[] = {
+ static struct hda_verb stac925x_core_init[] = {
+ 	/* set dac0mux for dac converter */
+ 	{ 0x06, AC_VERB_SET_CONNECT_SEL, 0x00},
+-	/* unmute and set max the selector */
+-	{ 0x0e, AC_VERB_SET_AMP_GAIN_MUTE, 0xb01f },
++	/* mute the master volume */
++	{ 0x0e, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE },
+ 	{}
+ };
+ 
+@@ -1138,6 +1135,8 @@ static struct snd_kcontrol_new stac92hd71bxx_mixer[] = {
+ };
+ 
+ static struct snd_kcontrol_new stac925x_mixer[] = {
++	HDA_CODEC_VOLUME("Master Playback Volume", 0x0e, 0, HDA_OUTPUT),
++	HDA_CODEC_MUTE("Master Playback Switch", 0x0e, 0, HDA_OUTPUT),
+ 	STAC_INPUT_SOURCE(1),
+ 	HDA_CODEC_VOLUME("Capture Volume", 0x09, 0, HDA_OUTPUT),
+ 	HDA_CODEC_MUTE("Capture Switch", 0x14, 0, HDA_OUTPUT),
+@@ -1736,10 +1735,12 @@ static unsigned int ref92hd83xxx_pin_configs[14] = {
+ 
+ static unsigned int *stac92hd83xxx_brd_tbl[STAC_92HD83XXX_MODELS] = {
+ 	[STAC_92HD83XXX_REF] = ref92hd83xxx_pin_configs,
++	[STAC_92HD83XXX_PWR_REF] = ref92hd83xxx_pin_configs,
+ };
+ 
+ static const char *stac92hd83xxx_models[STAC_92HD83XXX_MODELS] = {
+ 	[STAC_92HD83XXX_REF] = "ref",
++	[STAC_92HD83XXX_PWR_REF] = "mic-ref",
+ };
+ 
+ static struct snd_pci_quirk stac92hd83xxx_cfg_tbl[] = {
+@@ -1799,6 +1800,8 @@ static struct snd_pci_quirk stac92hd71bxx_cfg_tbl[] = {
+ 		      "HP dv5", STAC_HP_M4),
+ 	SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x30f4,
+ 		      "HP dv7", STAC_HP_M4),
++	SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x30f7,
++		      "HP dv4", STAC_HP_DV5),
+ 	SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x30fc,
+ 		      "HP dv7", STAC_HP_M4),
+ 	SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x3603,
+@@ -3573,13 +3576,12 @@ static int stac92xx_parse_auto_config(struct hda_codec *codec, hda_nid_t dig_out
+ 		err = stac92xx_auto_fill_dac_nids(codec);
+ 		if (err < 0)
+ 			return err;
++		err = stac92xx_auto_create_multi_out_ctls(codec,
++							  &spec->autocfg);
++		if (err < 0)
++			return err;
+ 	}
+ 
+-	err = stac92xx_auto_create_multi_out_ctls(codec, &spec->autocfg);
+-
+-	if (err < 0)
+-		return err;
+-
+ 	/* setup analog beep controls */
+ 	if (spec->anabeep_nid > 0) {
+ 		err = stac92xx_auto_create_beep_ctls(codec,
+@@ -4753,7 +4755,9 @@ static struct hda_input_mux stac92hd83xxx_dmux = {
+ static int patch_stac92hd83xxx(struct hda_codec *codec)
+ {
+ 	struct sigmatel_spec *spec;
++	hda_nid_t conn[STAC92HD83_DAC_COUNT + 1];
+ 	int err;
++	int num_dacs;
+ 
+ 	spec  = kzalloc(sizeof(*spec), GFP_KERNEL);
+ 	if (spec == NULL)
+@@ -4772,15 +4776,16 @@ static int patch_stac92hd83xxx(struct hda_codec *codec)
+ 	spec->num_pwrs = ARRAY_SIZE(stac92hd83xxx_pwr_nids);
+ 	spec->multiout.dac_nids = spec->dac_nids;
+ 
+-	spec->init = stac92hd83xxx_core_init;
+-	switch (codec->vendor_id) {
+-	case 0x111d7605:
+-		break;
+-	default:
+-		spec->num_pwrs--;
+-		spec->init++; /* switch to config #2 */
+-	}
+ 
++	/* set port 0xe to select the last DAC
++	 */
++	num_dacs = snd_hda_get_connections(codec, 0x0e,
++		conn, STAC92HD83_DAC_COUNT + 1) - 1;
++
++	snd_hda_codec_write_cache(codec, 0xe, 0,
++		AC_VERB_SET_CONNECT_SEL, num_dacs);
++
++	spec->init = stac92hd83xxx_core_init;
+ 	spec->mixer = stac92hd83xxx_mixer;
+ 	spec->num_pins = ARRAY_SIZE(stac92hd83xxx_pin_nids);
+ 	spec->num_dmuxes = ARRAY_SIZE(stac92hd83xxx_dmux_nids);
+@@ -4806,6 +4811,15 @@ again:
+ 		return err;
+ 	}
+ 
++	switch (codec->vendor_id) {
++	case 0x111d7604:
++	case 0x111d7605:
++		if (spec->board_config == STAC_92HD83XXX_PWR_REF)
++			break;
++		spec->num_pwrs = 0;
++		break;
++	}
++
+ 	err = stac92xx_parse_auto_config(codec, 0x1d, 0);
+ 	if (!err) {
+ 		if (spec->board_config < 0) {
+diff --git a/sound/pci/oxygen/virtuoso.c b/sound/pci/oxygen/virtuoso.c
+index e9e829e..18c7c91 100644
+--- a/sound/pci/oxygen/virtuoso.c
++++ b/sound/pci/oxygen/virtuoso.c
+@@ -683,7 +683,7 @@ static void xonar_hdav_uart_input(struct oxygen *chip)
+ 	if (chip->uart_input_count >= 2 &&
+ 	    chip->uart_input[chip->uart_input_count - 2] == 'O' &&
+ 	    chip->uart_input[chip->uart_input_count - 1] == 'K') {
+-		printk(KERN_DEBUG "message from Xonar HDAV HDMI chip received:");
++		printk(KERN_DEBUG "message from Xonar HDAV HDMI chip received:\n");
+ 		print_hex_dump_bytes("", DUMP_PREFIX_OFFSET,
+ 				     chip->uart_input, chip->uart_input_count);
+ 		chip->uart_input_count = 0;
+@@ -908,6 +908,7 @@ static const struct oxygen_model model_xonar_hdav = {
+ 	.dac_channels = 8,
+ 	.dac_volume_min = 0x0f,
+ 	.dac_volume_max = 0xff,
++	.misc_flags = OXYGEN_MISC_MIDI,
+ 	.function_flags = OXYGEN_FUNCTION_2WIRE,
+ 	.dac_i2s_format = OXYGEN_I2S_FORMAT_LJUST,
+ 	.adc_i2s_format = OXYGEN_I2S_FORMAT_LJUST,
+diff --git a/sound/soc/atmel/atmel-pcm.c b/sound/soc/atmel/atmel-pcm.c
+index 1fac5ef..3dcdc4e 100644
+--- a/sound/soc/atmel/atmel-pcm.c
++++ b/sound/soc/atmel/atmel-pcm.c
+@@ -44,8 +44,6 @@
+ #include <sound/pcm_params.h>
+ #include <sound/soc.h>
+ 
+-#include <mach/hardware.h>
+-
+ #include "atmel-pcm.h"
+ 
+ 
+diff --git a/sound/soc/fsl/mpc8610_hpcd.c b/sound/soc/fsl/mpc8610_hpcd.c
+index bcec3f6..acf39a6 100644
+--- a/sound/soc/fsl/mpc8610_hpcd.c
++++ b/sound/soc/fsl/mpc8610_hpcd.c
+@@ -183,16 +183,6 @@ static struct snd_soc_ops mpc8610_hpcd_ops = {
+ };
+ 
+ /**
+- * mpc8610_hpcd_machine: ASoC machine data
+- */
+-static struct snd_soc_card mpc8610_hpcd_machine = {
+-	.probe = mpc8610_hpcd_machine_probe,
+-	.remove = mpc8610_hpcd_machine_remove,
+-	.name = "MPC8610 HPCD",
+-	.num_links = 1,
+-};
+-
+-/**
+  * mpc8610_hpcd_probe: OF probe function for the fabric driver
+  *
+  * This function gets called when an SSI node is found in the device tree.
+@@ -455,7 +445,11 @@ static int mpc8610_hpcd_probe(struct of_device *ofdev,
+ 	machine_data->dai.codec_dai = &cs4270_dai; /* The codec_dai we want */
+ 	machine_data->dai.ops = &mpc8610_hpcd_ops;
+ 
+-	mpc8610_hpcd_machine.dai_link = &machine_data->dai;
++	machine_data->machine.probe = mpc8610_hpcd_machine_probe;
++	machine_data->machine.remove = mpc8610_hpcd_machine_remove;
++	machine_data->machine.name = "MPC8610 HPCD";
++	machine_data->machine.num_links = 1;
++	machine_data->machine.dai_link = &machine_data->dai;
+ 
+ 	/* Allocate a new audio platform device structure */
+ 	sound_device = platform_device_alloc("soc-audio", -1);
+@@ -465,7 +459,7 @@ static int mpc8610_hpcd_probe(struct of_device *ofdev,
+ 		goto error;
+ 	}
+ 
+-	machine_data->sound_devdata.card = &mpc8610_hpcd_machine;
++	machine_data->sound_devdata.card = &machine_data->machine;
+ 	machine_data->sound_devdata.codec_dev = &soc_codec_device_cs4270;
+ 	machine_data->machine.platform = &fsl_soc_platform;
+ 


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1231
retrieving revision 1.1232
diff -u -r1.1231 -r1.1232
--- kernel.spec	26 Jan 2009 07:19:13 -0000	1.1231
+++ kernel.spec	26 Jan 2009 21:46:33 -0000	1.1232
@@ -1006,7 +1006,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
@@ -1172,7 +1172,7 @@
 ApplyPatch linux-2.6-net-tulip-interrupt.patch
 
 # Nouveau DRM + drm fixes
-ApplyPatch drm-next.patch
+#ApplyPatch drm-next.patch
 ApplyPatch drm-modesetting-radeon.patch
 #ApplyPatch drm-nouveau.patch
 
@@ -1772,6 +1772,11 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Mon Jan 26 2009 Kyle McMartin <kyle at redhat.com>
+- Update git-linus.diff to bf50c903faba4ec7686ee8a570ac384b0f20814d.
+- drm-next.patch merged.
+- linux-2.6.28-sunrpc-ipv6-rpcbind.patch: update for Kconfig moves.
+
 * Sat Jan 24 2009 Hans de Goede <hdegoede at redhat.com>
 - Fix atk0110 sensor numbering
 

linux-2.6.28-sunrpc-ipv6-rpcbind.patch:

Index: linux-2.6.28-sunrpc-ipv6-rpcbind.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6.28-sunrpc-ipv6-rpcbind.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6.28-sunrpc-ipv6-rpcbind.patch	23 Jan 2009 20:19:55 -0000	1.1
+++ linux-2.6.28-sunrpc-ipv6-rpcbind.patch	26 Jan 2009 21:46:33 -0000	1.2
@@ -1,7 +1,28 @@
-diff -up linux-2.6.28.i686/fs/Kconfig.save linux-2.6.28.i686/fs/Kconfig
---- linux-2.6.28.i686/fs/Kconfig.save	2009-01-23 14:04:47.000000000 -0500
-+++ linux-2.6.28.i686/fs/Kconfig	2009-01-23 14:15:31.000000000 -0500
-@@ -1401,28 +1401,6 @@ config SUNRPC_XPRT_RDMA
+diff --git a/fs/lockd/svc.c b/fs/lockd/svc.c
+index 64f1c31..cc3bf45 100644
+--- a/fs/lockd/svc.c
++++ b/fs/lockd/svc.c
+@@ -56,12 +56,11 @@ unsigned long			nlmsvc_timeout;
+  * If the kernel has IPv6 support available, always listen for
+  * both AF_INET and AF_INET6 requests.
+  */
+-#if (defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)) && \
+-	defined(CONFIG_SUNRPC_REGISTER_V4)
++#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
+ static const sa_family_t	nlmsvc_family = AF_INET6;
+-#else	/* (CONFIG_IPV6 || CONFIG_IPV6_MODULE) && CONFIG_SUNRPC_REGISTER_V4 */
++#else	/* CONFIG_IPV6 || CONFIG_IPV6_MODULE */
+ static const sa_family_t	nlmsvc_family = AF_INET;
+-#endif	/* (CONFIG_IPV6 || CONFIG_IPV6_MODULE) && CONFIG_SUNRPC_REGISTER_V4 */
++#endif	/* CONFIG_IPV6 || CONFIG_IPV6_MODULE */
+ 
+ /*
+  * These can be set at insmod time (useful for NFS as root filesystem),
+diff --git a/net/sunrpc/Kconfig b/net/sunrpc/Kconfig
+index eda4a7a..d143c05 100644
+--- a/net/sunrpc/Kconfig
++++ b/net/sunrpc/Kconfig
+@@ -18,28 +18,6 @@ config SUNRPC_XPRT_RDMA
  
  	  If unsure, say N.
  
@@ -30,29 +51,11 @@
  config RPCSEC_GSS_KRB5
  	tristate "Secure RPC: Kerberos V mechanism (EXPERIMENTAL)"
  	depends on SUNRPC && EXPERIMENTAL
-diff -up linux-2.6.28.i686/fs/lockd/svc.c.save linux-2.6.28.i686/fs/lockd/svc.c
---- linux-2.6.28.i686/fs/lockd/svc.c.save	2009-01-23 14:04:47.000000000 -0500
-+++ linux-2.6.28.i686/fs/lockd/svc.c	2009-01-23 14:15:31.000000000 -0500
-@@ -56,12 +56,11 @@ unsigned long			nlmsvc_timeout;
-  * If the kernel has IPv6 support available, always listen for
-  * both AF_INET and AF_INET6 requests.
-  */
--#if (defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)) && \
--	defined(CONFIG_SUNRPC_REGISTER_V4)
-+#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
- static const sa_family_t	nlmsvc_family = AF_INET6;
--#else	/* (CONFIG_IPV6 || CONFIG_IPV6_MODULE) && CONFIG_SUNRPC_REGISTER_V4 */
-+#else	/* CONFIG_IPV6 || CONFIG_IPV6_MODULE */
- static const sa_family_t	nlmsvc_family = AF_INET;
--#endif	/* (CONFIG_IPV6 || CONFIG_IPV6_MODULE) && CONFIG_SUNRPC_REGISTER_V4 */
-+#endif	/* CONFIG_IPV6 || CONFIG_IPV6_MODULE */
- 
- /*
-  * These can be set at insmod time (useful for NFS as root filesystem),
-diff -up linux-2.6.28.i686/net/sunrpc/rpcb_clnt.c.save linux-2.6.28.i686/net/sunrpc/rpcb_clnt.c
---- linux-2.6.28.i686/net/sunrpc/rpcb_clnt.c.save	2009-01-23 14:04:47.000000000 -0500
-+++ linux-2.6.28.i686/net/sunrpc/rpcb_clnt.c	2009-01-23 14:14:41.000000000 -0500
-@@ -124,12 +124,6 @@ static const struct sockaddr_in rpcb_ina
+diff --git a/net/sunrpc/rpcb_clnt.c b/net/sunrpc/rpcb_clnt.c
+index 03ae007..888c205 100644
+--- a/net/sunrpc/rpcb_clnt.c
++++ b/net/sunrpc/rpcb_clnt.c
+@@ -124,12 +124,6 @@ static const struct sockaddr_in rpcb_inaddr_loopback = {
  	.sin_port		= htons(RPCBIND_PORT),
  };
  
@@ -65,7 +68,7 @@
  static struct rpc_clnt *rpcb_create_local(struct sockaddr *addr,
  					  size_t addrlen, u32 version)
  {
-@@ -176,9 +170,10 @@ static struct rpc_clnt *rpcb_create(char
+@@ -176,9 +170,10 @@ static struct rpc_clnt *rpcb_create(char *hostname, struct sockaddr *srvaddr,
  	return rpc_create(&args);
  }
  
@@ -78,7 +81,7 @@
  	struct rpc_clnt *rpcb_clnt;
  	int result, error = 0;
  
-@@ -192,7 +187,7 @@ static int rpcb_register_call(struct soc
+@@ -192,7 +187,7 @@ static int rpcb_register_call(struct sockaddr *addr, size_t addrlen,
  		error = PTR_ERR(rpcb_clnt);
  
  	if (error < 0) {
@@ -87,7 +90,7 @@
  				"server (errno %d).\n", -error);
  		return error;
  	}
-@@ -254,9 +249,7 @@ int rpcb_register(u32 prog, u32 vers, in
+@@ -254,9 +249,7 @@ int rpcb_register(u32 prog, u32 vers, int prot, unsigned short port)
  	if (port)
  		msg.rpc_proc = &rpcb_procedures2[RPCBPROC_SET];
  
@@ -98,7 +101,7 @@
  }
  
  /*
-@@ -284,9 +277,7 @@ static int rpcb_register_netid4(struct s
+@@ -284,9 +277,7 @@ static int rpcb_register_netid4(struct sockaddr_in *address_to_register,
  	if (port)
  		msg->rpc_proc = &rpcb_procedures4[RPCBPROC_SET];
  
@@ -109,7 +112,7 @@
  }
  
  /*
-@@ -318,9 +309,7 @@ static int rpcb_register_netid6(struct s
+@@ -318,9 +309,7 @@ static int rpcb_register_netid6(struct sockaddr_in6 *address_to_register,
  	if (port)
  		msg->rpc_proc = &rpcb_procedures4[RPCBPROC_SET];
  
@@ -120,9 +123,10 @@
  }
  
  /**
-diff -up linux-2.6.28.i686/net/sunrpc/svc.c.save linux-2.6.28.i686/net/sunrpc/svc.c
---- linux-2.6.28.i686/net/sunrpc/svc.c.save	2009-01-23 14:04:47.000000000 -0500
-+++ linux-2.6.28.i686/net/sunrpc/svc.c	2009-01-23 14:14:41.000000000 -0500
+diff --git a/net/sunrpc/svc.c b/net/sunrpc/svc.c
+index c51fed4..5baac0a 100644
+--- a/net/sunrpc/svc.c
++++ b/net/sunrpc/svc.c
 @@ -719,8 +719,6 @@ svc_exit_thread(struct svc_rqst *rqstp)
  }
  EXPORT_SYMBOL_GPL(svc_exit_thread);
@@ -132,7 +136,7 @@
  /*
   * Register an "inet" protocol family netid with the local
   * rpcbind daemon via an rpcbind v4 SET request.
-@@ -741,6 +739,7 @@ static int __svc_rpcb_register4(const u3
+@@ -741,6 +739,7 @@ static int __svc_rpcb_register4(const u32 program, const u32 version,
  		.sin_port		= htons(port),
  	};
  	char *netid;
@@ -140,7 +144,7 @@
  
  	switch (protocol) {
  	case IPPROTO_UDP:
-@@ -750,11 +749,20 @@ static int __svc_rpcb_register4(const u3
+@@ -750,11 +749,20 @@ static int __svc_rpcb_register4(const u32 program, const u32 version,
  		netid = RPCBIND_NETID_TCP;
  		break;
  	default:
@@ -164,7 +168,7 @@
  }
  
  /*
-@@ -777,6 +785,7 @@ static int __svc_rpcb_register6(const u3
+@@ -777,6 +785,7 @@ static int __svc_rpcb_register6(const u32 program, const u32 version,
  		.sin6_port		= htons(port),
  	};
  	char *netid;
@@ -172,7 +176,7 @@
  
  	switch (protocol) {
  	case IPPROTO_UDP:
-@@ -786,11 +795,21 @@ static int __svc_rpcb_register6(const u3
+@@ -786,11 +795,21 @@ static int __svc_rpcb_register6(const u32 program, const u32 version,
  		netid = RPCBIND_NETID_TCP6;
  		break;
  	default:
@@ -196,7 +200,7 @@
  }
  
  /*
-@@ -799,7 +818,8 @@ static int __svc_rpcb_register6(const u3
+@@ -799,7 +818,8 @@ static int __svc_rpcb_register6(const u32 program, const u32 version,
   * Returns zero on success; a negative errno value is returned
   * if any error occurs.
   */
@@ -206,7 +210,7 @@
  			  const sa_family_t family,
  			  const unsigned short protocol,
  			  const unsigned short port)
-@@ -808,13 +828,14 @@ static int __svc_register(const u32 prog
+@@ -808,13 +828,14 @@ static int __svc_register(const u32 program, const u32 version,
  
  	switch (family) {
  	case AF_INET:
@@ -223,7 +227,7 @@
  
  		/*
  		 * Work around bug in some versions of Linux rpcbind
-@@ -825,33 +846,17 @@ static int __svc_register(const u32 prog
+@@ -825,33 +846,17 @@ static int __svc_register(const u32 program, const u32 version,
  		 */
  		__svc_rpcb_register4(program, version,
  						protocol, port);
@@ -264,7 +268,7 @@
  /**
   * svc_register - register an RPC service with the local portmapper
   * @serv: svc_serv struct for the service to register
-@@ -886,8 +891,9 @@ int svc_register(const struct svc_serv *
+@@ -886,8 +891,9 @@ int svc_register(const struct svc_serv *serv, const unsigned short proto,
  			if (progp->pg_vers[i]->vs_hidden)
  				continue;
  
@@ -276,7 +280,7 @@
  			if (error < 0)
  				break;
  		}
-@@ -896,26 +902,10 @@ int svc_register(const struct svc_serv *
+@@ -896,26 +902,10 @@ int svc_register(const struct svc_serv *serv, const unsigned short proto,
  	return error;
  }
  
@@ -307,7 +311,7 @@
  static void __svc_unregister(const u32 program, const u32 version,
  			     const char *progname)
  {
-@@ -926,8 +916,6 @@ static void __svc_unregister(const u32 p
+@@ -926,8 +916,6 @@ static void __svc_unregister(const u32 program, const u32 version,
  			__func__, progname, version, error);
  }
  



From rstrode at fedoraproject.org  Mon Jan 26 21:47:36 2009
From: rstrode at fedoraproject.org (Ray Strode)
Date: Mon, 26 Jan 2009 21:47:36 +0000 (UTC)
Subject: rpms/gedit/F-10 gedit-2.24.3-fix-python-path.patch,1.4,1.5
Message-ID: <20090126214736.DFBB67010C@cvs1.fedora.phx.redhat.com>

Author: rstrode

Update of /cvs/pkgs/rpms/gedit/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20506

Modified Files:
	gedit-2.24.3-fix-python-path.patch 
Log Message:
fix plugindir name


gedit-2.24.3-fix-python-path.patch:

Index: gedit-2.24.3-fix-python-path.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gedit/F-10/gedit-2.24.3-fix-python-path.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gedit-2.24.3-fix-python-path.patch	26 Jan 2009 21:29:31 -0000	1.4
+++ gedit-2.24.3-fix-python-path.patch	26 Jan 2009 21:47:06 -0000	1.5
@@ -6,7 +6,7 @@
  	struct sigaction old_sigint;
  	gint res;
 -	char *argv[] = { "gedit", NULL };
-+	char *argv[] = { GEDIT_PLUGINS_DIR, NULL };
++	char *argv[] = { GEDIT_PLUGINDIR, NULL };
  	
  	static gboolean init_failed = FALSE;
  



From rdieter at fedoraproject.org  Mon Jan 26 21:51:46 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 26 Jan 2009 21:51:46 +0000 (UTC)
Subject: rpms/kdebase-runtime/F-10 kdebase-runtime-4.2.0-kde#178479.patch,
	NONE, 1.1 .cvsignore, 1.24, 1.25 kdebase-runtime.spec, 1.80,
	1.81 sources, 1.26, 1.27
Message-ID: <20090126215147.098A77010C@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdebase-runtime/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21228

Modified Files:
	.cvsignore kdebase-runtime.spec sources 
Added Files:
	kdebase-runtime-4.2.0-kde#178479.patch 
Log Message:
* Mon Jan 26 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.0-3
- respun tarball


kdebase-runtime-4.2.0-kde#178479.patch:

--- NEW FILE kdebase-runtime-4.2.0-kde#178479.patch ---
--- branches/KDE/4.2/kdebase/runtime/kioslave/trash/trashimpl.cpp	2009/01/26 16:31:17	916986
+++ branches/KDE/4.2/kdebase/runtime/kioslave/trash/trashimpl.cpp	2009/01/26 16:41:07	916987
@@ -766,8 +766,10 @@
         return 0;
 
     KMountPoint::Ptr mp = KMountPoint::currentMountPoints().findByPath( origPath );
-    if (!mp)
+    if (!mp) {
+        kDebug() << "KMountPoint found no mount point for" << origPath;
         return 0;
+    }
     QString mountPoint = mp->mountPoint();
     const QString trashDir = trashForMountPoint( mountPoint, true );
     kDebug() << "mountPoint=" << mountPoint << " trashDir=" << trashDir;
@@ -861,7 +863,7 @@
         if ( (S_ISDIR(buff.st_mode)) // must be a dir
              && (!S_ISLNK(buff.st_mode)) // not a symlink
              && ((buff.st_mode & requiredBits) == requiredBits)
-             && (::access(rootTrashDir_c, W_OK))
+             && (::access(rootTrashDir_c, W_OK) == 0) // must be user-writable
             ) {
             const QString trashDir = rootTrashDir + '/' + QString::number( uid );
             const QByteArray trashDir_c = QFile::encodeName( trashDir );


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-runtime/F-10/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- .cvsignore	23 Jan 2009 22:33:19 -0000	1.24
+++ .cvsignore	26 Jan 2009 21:51:15 -0000	1.25
@@ -1,2 +1 @@
-kdebase-runtime-4.1.96.tar.bz2
 kdebase-runtime-4.2.0.tar.bz2


Index: kdebase-runtime.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-runtime/F-10/kdebase-runtime.spec,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- kdebase-runtime.spec	23 Jan 2009 22:33:19 -0000	1.80
+++ kdebase-runtime.spec	26 Jan 2009 21:51:16 -0000	1.81
@@ -3,24 +3,26 @@
 %define kde3_desktop 1
 %endif
 
-%define _with_samba --with-samba
-
 Name:          kdebase-runtime
 Summary:       K Desktop Environment - Runtime
 Version:       4.2.0
-Release:       1%{?dist}
+Release:       3%{?dist}
 
 License:       GPLv2
 Group:         User Interface/Desktops
 URL:           http://www.kde.org/
 Source0:       ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-runtime-%{version}.tar.bz2
 Source1:       khelpcenter.desktop
+BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
 Patch0:        kdebase-runtime-4.1.70-pulseaudio.patch
 Patch1:        kdebase-runtime-4.1.x-searchproviders-shortcuts.patch
 Patch2:        kdebase-runtime-4.1.1-knetattach.patch
 Patch3:        kdebase-runtime-4.1.1-iconthemes-inherit.patch
-# Upstream patches
-BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+## Upstream patches
+# http://bugs.kde.org/178479
+Patch100: kdebase-runtime-4.2.0-kde#178479.patch
 
 %ifarch noarch
 %define icons 1
@@ -41,7 +43,7 @@
 %{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
 Requires(post): xdg-utils
 Requires(postun): xdg-utils
-Requires: kdepimlibs >= %{version}
+Requires: kdepimlibs%{?_isa} >= %{version}
 %ifnarch s390 s390x
 Requires: eject
 %endif
@@ -51,7 +53,7 @@
 BuildRequires: hal-devel
 BuildRequires: kdelibs4-devel >= %{version}
 BuildRequires: kdepimlibs-devel >= %{version}
-%{?_with_samba:BuildRequires: libsmbclient-devel}
+BuildRequires: libsmbclient-devel
 # needed for phonon-xine VideoWidget, also need xine-lib built with libxcb support
 BuildRequires: libxcb-devel
 BuildRequires: libXScrnSaver-devel
@@ -106,16 +108,17 @@
 %patch3 -p1 -b .iconthemes-inherit
 
 # upstream patches
+%patch100 -p5 -b .kde#178479
 
-%build
 
+%build
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
 %{cmake_kde4} ..
 popd
 
 %if 0%{?rest}
-make %{?_smp_mflags} -C %{_target_platform} VERBOSE=1
+make %{?_smp_mflags} -C %{_target_platform}
 %endif
 
 
@@ -336,6 +339,14 @@
 
 
 %changelog
+* Mon Jan 26 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.0-3
+- respun tarball
+
+* Mon Jan 26 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.0-2
+- Files not trashed to the correct location in Dolphin/Konqueror 
+  (#481598, kdebug#178479)
+- omit --with-samba crud
+
 * Thu Jan 22 2009 Than Ngo <than at redhat.com> - 4.2.0-1
 - 4.2.0
 - +BR: pulseaudio-libs-devel xine-lib-devel


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-runtime/F-10/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- sources	23 Jan 2009 22:33:19 -0000	1.26
+++ sources	26 Jan 2009 21:51:16 -0000	1.27
@@ -1 +1 @@
-9e56281e9daa579d56cfda794f1bbc10  kdebase-runtime-4.2.0.tar.bz2
+8ef48aae16a6dddb3055d81d7e5c375f  kdebase-runtime-4.2.0.tar.bz2



From pkgdb at fedoraproject.org  Mon Jan 26 22:09:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Jan 2009 22:09:38 +0000
Subject: [pkgdb] crda was added for linville
Message-ID: <20090126220939.31399208484@bastion.fedora.phx.redhat.com>

kevin has added Package crda with summary Regulatory compliance daemon for 802.11 wireless networking
kevin has approved Package crda
kevin has added a Fedora devel branch for crda with an owner of linville
kevin has approved crda in Fedora devel
kevin has approved Package crda
kevin has set commit to Approved for provenpackager on crda (Fedora devel)
kevin has set build to Approved for provenpackager on crda (Fedora devel)
kevin has set checkout to Approved for provenpackager on crda (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/crda



From pkgdb at fedoraproject.org  Mon Jan 26 22:09:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Jan 2009 22:09:40 +0000
Subject: [pkgdb] crda (Fedora, 10) updated by kevin
Message-ID: <20090126220941.A4916208487@bastion.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for crda
kevin has set commit to Approved for provenpackager on crda (Fedora 10)
kevin has set build to Approved for provenpackager on crda (Fedora 10)
kevin has set checkout to Approved for provenpackager on crda (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/crda



From kevin at fedoraproject.org  Mon Jan 26 22:10:04 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 26 Jan 2009 22:10:04 +0000 (UTC)
Subject: rpms/crda/devel - New directory
Message-ID: <20090126221004.A755C70141@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/crda/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsY25105/rpms/crda/devel

Log Message:
Directory /cvs/pkgs/rpms/crda/devel added to the repository




From kevin at fedoraproject.org  Mon Jan 26 22:10:04 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 26 Jan 2009 22:10:04 +0000 (UTC)
Subject: rpms/crda - New directory
Message-ID: <20090126221004.554507010C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/crda
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsY25105/rpms/crda

Log Message:
Directory /cvs/pkgs/rpms/crda added to the repository




From kevin at fedoraproject.org  Mon Jan 26 22:10:28 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 26 Jan 2009 22:10:28 +0000 (UTC)
Subject: rpms/crda Makefile,NONE,1.1
Message-ID: <20090126221028.A96017010C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/crda
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsY25105/rpms/crda

Added Files:
	Makefile 
Log Message:
Setup of module crda


--- NEW FILE Makefile ---
# Top level Makefile for module crda
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Jan 26 22:10:29 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 26 Jan 2009 22:10:29 +0000 (UTC)
Subject: rpms/crda/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <20090126221029.190827010C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/crda/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsY25105/rpms/crda/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module crda


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: crda
# $Id: Makefile,v 1.1 2009/01/26 22:10:28 kevin Exp $
NAME := crda
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Jan 26 22:11:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Jan 2009 22:11:53 +0000
Subject: [pkgdb] perl-MD5 (Fedora EPEL, 5) updated by kevin
Message-ID: <20090126221153.53C13208484@bastion.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for perl-MD5
kevin has set commit to Approved for provenpackager on perl-MD5 (Fedora EPEL 5)
kevin has set build to Approved for provenpackager on perl-MD5 (Fedora EPEL 5)
kevin has set checkout to Approved for provenpackager on perl-MD5 (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-MD5



From pkgdb at fedoraproject.org  Mon Jan 26 22:11:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Jan 2009 22:11:53 +0000
Subject: [pkgdb] perl-MD5 (Fedora EPEL, 4) updated by kevin
Message-ID: <20090126221154.80541208487@bastion.fedora.phx.redhat.com>

kevin added a Fedora EPEL 4 branch for perl-MD5
kevin has set commit to Approved for provenpackager on perl-MD5 (Fedora EPEL 4)
kevin has set build to Approved for provenpackager on perl-MD5 (Fedora EPEL 4)
kevin has set checkout to Approved for provenpackager on perl-MD5 (Fedora EPEL 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-MD5



From kyle at fedoraproject.org  Mon Jan 26 22:12:15 2009
From: kyle at fedoraproject.org (Kyle McMartin)
Date: Mon, 26 Jan 2009 22:12:15 +0000 (UTC)
Subject: rpms/kernel/devel kernel.spec,1.1232,1.1233
Message-ID: <20090126221215.E67397010C@cvs1.fedora.phx.redhat.com>

Author: kyle

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25515

Modified Files:
	kernel.spec 
Log Message:
fixup bongs in kernel.spec, wtf.


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1232
retrieving revision 1.1233
diff -u -r1.1232 -r1.1233
--- kernel.spec	26 Jan 2009 21:46:33 -0000	1.1232
+++ kernel.spec	26 Jan 2009 22:11:45 -0000	1.1233
@@ -542,7 +542,6 @@
 
 Source100: config-arm
 
-%if %{using_upstream_branch}
 # Here should be only the patches up to the upstream canonical Linus tree.
 
 # For a stable release kernel
@@ -573,6 +572,7 @@
 %endif
 %endif
 
+%if %{using_upstream_branch}
 ### BRANCH PATCH ###
 %endif
 



From pkgdb at fedoraproject.org  Mon Jan 26 22:14:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Jan 2009 22:14:28 +0000
Subject: [pkgdb] kurdit-unikurd-web-fonts was added for mnowak
Message-ID: <20090126221428.E1196208485@bastion.fedora.phx.redhat.com>

kevin has added Package kurdit-unikurd-web-fonts with summary A widely used Kurdish font
kevin has approved Package kurdit-unikurd-web-fonts
kevin has added a Fedora devel branch for kurdit-unikurd-web-fonts with an owner of mnowak
kevin has approved kurdit-unikurd-web-fonts in Fedora devel
kevin has approved Package kurdit-unikurd-web-fonts
kevin has set commit to Approved for provenpackager on kurdit-unikurd-web-fonts (Fedora devel)
kevin has set build to Approved for provenpackager on kurdit-unikurd-web-fonts (Fedora devel)
kevin has set checkout to Approved for provenpackager on kurdit-unikurd-web-fonts (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kurdit-unikurd-web-fonts



From kevin at fedoraproject.org  Mon Jan 26 22:14:44 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 26 Jan 2009 22:14:44 +0000 (UTC)
Subject: rpms/kurdit-unikurd-web-fonts - New directory
Message-ID: <20090126221444.30A377010C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/kurdit-unikurd-web-fonts
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsU26142/rpms/kurdit-unikurd-web-fonts

Log Message:
Directory /cvs/pkgs/rpms/kurdit-unikurd-web-fonts added to the repository




From pkgdb at fedoraproject.org  Mon Jan 26 22:14:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Jan 2009 22:14:30 +0000
Subject: [pkgdb] kurdit-unikurd-web-fonts (Fedora, devel) updated by kevin
Message-ID: <20090126221430.E8B97208489@bastion.fedora.phx.redhat.com>

kevin approved watchbugzilla on kurdit-unikurd-web-fonts (Fedora devel) for fonts-sig
kevin approved watchcommits on kurdit-unikurd-web-fonts (Fedora devel) for fonts-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kurdit-unikurd-web-fonts



From kevin at fedoraproject.org  Mon Jan 26 22:14:44 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 26 Jan 2009 22:14:44 +0000 (UTC)
Subject: rpms/kurdit-unikurd-web-fonts/devel - New directory
Message-ID: <20090126221444.88EE57010C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/kurdit-unikurd-web-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsU26142/rpms/kurdit-unikurd-web-fonts/devel

Log Message:
Directory /cvs/pkgs/rpms/kurdit-unikurd-web-fonts/devel added to the repository




From kevin at fedoraproject.org  Mon Jan 26 22:15:09 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 26 Jan 2009 22:15:09 +0000 (UTC)
Subject: rpms/kurdit-unikurd-web-fonts Makefile,NONE,1.1
Message-ID: <20090126221509.DA54D7010C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/kurdit-unikurd-web-fonts
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsU26142/rpms/kurdit-unikurd-web-fonts

Added Files:
	Makefile 
Log Message:
Setup of module kurdit-unikurd-web-fonts


--- NEW FILE Makefile ---
# Top level Makefile for module kurdit-unikurd-web-fonts
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Mon Jan 26 22:15:10 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 26 Jan 2009 22:15:10 +0000 (UTC)
Subject: rpms/kurdit-unikurd-web-fonts/devel .cvsignore, NONE, 1.1 Makefile, 
	NONE, 1.1 sources, NONE, 1.1
Message-ID: <20090126221510.404477010C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/kurdit-unikurd-web-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsU26142/rpms/kurdit-unikurd-web-fonts/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module kurdit-unikurd-web-fonts


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: kurdit-unikurd-web-fonts
# $Id: Makefile,v 1.1 2009/01/26 22:15:10 kevin Exp $
NAME := kurdit-unikurd-web-fonts
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Mon Jan 26 22:15:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Jan 2009 22:15:23 +0000
Subject: [pkgdb] mingw32-cairo was added for rjones
Message-ID: <20090126221524.12C1D20848B@bastion.fedora.phx.redhat.com>

kevin has added Package mingw32-cairo with summary MinGW Windows Cairo library
kevin has approved Package mingw32-cairo
kevin has added a Fedora devel branch for mingw32-cairo with an owner of rjones
kevin has approved mingw32-cairo in Fedora devel
kevin has approved Package mingw32-cairo
kevin has set commit to Approved for provenpackager on mingw32-cairo (Fedora devel)
kevin has set build to Approved for provenpackager on mingw32-cairo (Fedora devel)
kevin has set checkout to Approved for provenpackager on mingw32-cairo (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-cairo



From pkgdb at fedoraproject.org  Mon Jan 26 22:15:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Jan 2009 22:15:27 +0000
Subject: [pkgdb] mingw32-cairo (Fedora, devel) updated by kevin
Message-ID: <20090126221532.01741208487@bastion.fedora.phx.redhat.com>

kevin approved watchbugzilla on mingw32-cairo (Fedora devel) for berrange
kevin approved watchcommits on mingw32-cairo (Fedora devel) for berrange
kevin approved commit on mingw32-cairo (Fedora devel) for berrange
kevin approved build on mingw32-cairo (Fedora devel) for berrange
kevin approved approveacls on mingw32-cairo (Fedora devel) for berrange
kevin approved watchbugzilla on mingw32-cairo (Fedora devel) for lfarkas
kevin approved watchcommits on mingw32-cairo (Fedora devel) for lfarkas
kevin approved commit on mingw32-cairo (Fedora devel) for lfarkas
kevin approved build on mingw32-cairo (Fedora devel) for lfarkas
kevin approved approveacls on mingw32-cairo (Fedora devel) for lfarkas

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-cairo



From pkgdb at fedoraproject.org  Mon Jan 26 22:15:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Jan 2009 22:15:27 +0000
Subject: [pkgdb] mingw32-cairo (Fedora, 10) updated by kevin
Message-ID: <20090126221536.80A71208486@bastion.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for mingw32-cairo
kevin has set commit to Approved for provenpackager on mingw32-cairo (Fedora 10)
kevin has set build to Approved for provenpackager on mingw32-cairo (Fedora 10)
kevin has set checkout to Approved for provenpackager on mingw32-cairo (Fedora 10)
kevin approved watchbugzilla on mingw32-cairo (Fedora 10) for berrange
kevin approved watchcommits on mingw32-cairo (Fedora 10) for berrange
kevin approved commit on mingw32-cairo (Fedora 10) for berrange
kevin approved build on mingw32-cairo (Fedora 10) for berrange
kevin approved approveacls on mingw32-cairo (Fedora 10) for berrange
kevin approved watchbugzilla on mingw32-cairo (Fedora 10) for lfarkas
kevin approved watchcommits on mingw32-cairo (Fedora 10) for lfarkas
kevin approved commit on mingw32-cairo (Fedora 10) for lfarkas
kevin approved build on mingw32-cairo (Fedora 10) for lfarkas
kevin approved approveacls on mingw32-cairo (Fedora 10) for lfarkas

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-cairo



From kevin at fedoraproject.org  Mon Jan 26 22:15:44 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 26 Jan 2009 22:15:44 +0000 (UTC)
Subject: rpms/mingw32-cairo - New directory
Message-ID: <20090126221544.388777010C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/mingw32-cairo
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsY26316/rpms/mingw32-cairo

Log Message:
Directory /cvs/pkgs/rpms/mingw32-cairo added to the repository




From pkgdb at fedoraproject.org  Mon Jan 26 22:15:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Jan 2009 22:15:27 +0000
Subject: [pkgdb] mingw32-cairo (Fedora EPEL, 5) updated by kevin
Message-ID: <20090126221534.89077208609@bastion.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for mingw32-cairo
kevin has set commit to Approved for provenpackager on mingw32-cairo (Fedora EPEL 5)
kevin has set build to Approved for provenpackager on mingw32-cairo (Fedora EPEL 5)
kevin has set checkout to Approved for provenpackager on mingw32-cairo (Fedora EPEL 5)
kevin approved watchbugzilla on mingw32-cairo (Fedora EPEL 5) for berrange
kevin approved watchcommits on mingw32-cairo (Fedora EPEL 5) for berrange
kevin approved commit on mingw32-cairo (Fedora EPEL 5) for berrange
kevin approved build on mingw32-cairo (Fedora EPEL 5) for berrange
kevin approved approveacls on mingw32-cairo (Fedora EPEL 5) for berrange
kevin approved watchbugzilla on mingw32-cairo (Fedora EPEL 5) for lfarkas
kevin approved watchcommits on mingw32-cairo (Fedora EPEL 5) for lfarkas
kevin approved commit on mingw32-cairo (Fedora EPEL 5) for lfarkas
kevin approved build on mingw32-cairo (Fedora EPEL 5) for lfarkas
kevin approved approveacls on mingw32-cairo (Fedora EPEL 5) for lfarkas

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-cairo



From kevin at fedoraproject.org  Mon Jan 26 22:15:44 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 26 Jan 2009 22:15:44 +0000 (UTC)
Subject: rpms/mingw32-cairo/devel - New directory
Message-ID: <20090126221544.92BC570141@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/mingw32-cairo/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsY26316/rpms/mingw32-cairo/devel

Log Message:
Directory /cvs/pkgs/rpms/mingw32-cairo/devel added to the repository




From kevin at fedoraproject.org  Mon Jan 26 22:16:07 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 26 Jan 2009 22:16:07 +0000 (UTC)
Subject: rpms/mingw32-cairo Makefile,NONE,1.1
Message-ID: <20090126221607.C04AD7010C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/mingw32-cairo
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsY26316/rpms/mingw32-cairo

Added Files:
	Makefile 
Log Message:
Setup of module mingw32-cairo


--- NEW FILE Makefile ---
# Top level Makefile for module mingw32-cairo
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Jan 26 22:16:08 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 26 Jan 2009 22:16:08 +0000 (UTC)
Subject: rpms/mingw32-cairo/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090126221608.3537D7010C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/mingw32-cairo/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsY26316/rpms/mingw32-cairo/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module mingw32-cairo


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: mingw32-cairo
# $Id: Makefile,v 1.1 2009/01/26 22:16:07 kevin Exp $
NAME := mingw32-cairo
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Jan 26 22:18:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Jan 2009 22:18:15 +0000
Subject: [pkgdb] cmconvert was added for pcfe
Message-ID: <20090126221818.B4D102084B6@bastion.fedora.phx.redhat.com>

kevin has added Package cmconvert with summary CacheMate import file converter
kevin has approved Package cmconvert
kevin has added a Fedora devel branch for cmconvert with an owner of pcfe
kevin has approved cmconvert in Fedora devel
kevin has approved Package cmconvert
kevin has set commit to Approved for provenpackager on cmconvert (Fedora devel)
kevin has set build to Approved for provenpackager on cmconvert (Fedora devel)
kevin has set checkout to Approved for provenpackager on cmconvert (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cmconvert



From pkgdb at fedoraproject.org  Mon Jan 26 22:18:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Jan 2009 22:18:22 +0000
Subject: [pkgdb] cmconvert (Fedora, devel) updated by kevin
Message-ID: <20090126221823.E14D7208485@bastion.fedora.phx.redhat.com>

kevin approved watchbugzilla on cmconvert (Fedora devel) for fab
kevin approved watchcommits on cmconvert (Fedora devel) for fab

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cmconvert



From pkgdb at fedoraproject.org  Mon Jan 26 22:18:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Jan 2009 22:18:22 +0000
Subject: [pkgdb] cmconvert (Fedora, 10) updated by kevin
Message-ID: <20090126221824.8FB9520848C@bastion.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for cmconvert
kevin has set commit to Approved for provenpackager on cmconvert (Fedora 10)
kevin has set build to Approved for provenpackager on cmconvert (Fedora 10)
kevin has set checkout to Approved for provenpackager on cmconvert (Fedora 10)
kevin approved watchbugzilla on cmconvert (Fedora 10) for fab
kevin approved watchcommits on cmconvert (Fedora 10) for fab

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cmconvert



From kevin at fedoraproject.org  Mon Jan 26 22:18:37 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 26 Jan 2009 22:18:37 +0000 (UTC)
Subject: rpms/cmconvert - New directory
Message-ID: <20090126221837.3989E7010C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/cmconvert
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvss26860/rpms/cmconvert

Log Message:
Directory /cvs/pkgs/rpms/cmconvert added to the repository




From kevin at fedoraproject.org  Mon Jan 26 22:18:37 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 26 Jan 2009 22:18:37 +0000 (UTC)
Subject: rpms/cmconvert/devel - New directory
Message-ID: <20090126221837.8D25D7010C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/cmconvert/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvss26860/rpms/cmconvert/devel

Log Message:
Directory /cvs/pkgs/rpms/cmconvert/devel added to the repository




From kevin at fedoraproject.org  Mon Jan 26 22:18:59 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 26 Jan 2009 22:18:59 +0000 (UTC)
Subject: rpms/cmconvert Makefile,NONE,1.1
Message-ID: <20090126221859.52DF87010C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/cmconvert
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvss26860/rpms/cmconvert

Added Files:
	Makefile 
Log Message:
Setup of module cmconvert


--- NEW FILE Makefile ---
# Top level Makefile for module cmconvert
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Jan 26 22:18:59 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 26 Jan 2009 22:18:59 +0000 (UTC)
Subject: rpms/cmconvert/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090126221859.95A8C70141@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/cmconvert/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvss26860/rpms/cmconvert/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module cmconvert


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: cmconvert
# $Id: Makefile,v 1.1 2009/01/26 22:18:59 kevin Exp $
NAME := cmconvert
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Jan 26 22:19:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Jan 2009 22:19:01 +0000
Subject: [pkgdb] backup-manager was added for llaumgui
Message-ID: <20090126221901.D545A20848B@bastion.fedora.phx.redhat.com>

kevin has added Package backup-manager with summary A command line backup tool for GNU/Linux
kevin has approved Package backup-manager
kevin has added a Fedora devel branch for backup-manager with an owner of llaumgui
kevin has approved backup-manager in Fedora devel
kevin has approved Package backup-manager
kevin has set commit to Approved for provenpackager on backup-manager (Fedora devel)
kevin has set build to Approved for provenpackager on backup-manager (Fedora devel)
kevin has set checkout to Approved for provenpackager on backup-manager (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/backup-manager



From pkgdb at fedoraproject.org  Mon Jan 26 22:19:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Jan 2009 22:19:03 +0000
Subject: [pkgdb] backup-manager (Fedora, 9) updated by kevin
Message-ID: <20090126221903.F0FA3208490@bastion.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for backup-manager
kevin has set commit to Approved for provenpackager on backup-manager (Fedora 9)
kevin has set build to Approved for provenpackager on backup-manager (Fedora 9)
kevin has set checkout to Approved for provenpackager on backup-manager (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/backup-manager



From pkgdb at fedoraproject.org  Mon Jan 26 22:19:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Jan 2009 22:19:03 +0000
Subject: [pkgdb] backup-manager (Fedora EPEL, 5) updated by kevin
Message-ID: <20090126221904.21534208493@bastion.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for backup-manager
kevin has set commit to Approved for provenpackager on backup-manager (Fedora EPEL 5)
kevin has set build to Approved for provenpackager on backup-manager (Fedora EPEL 5)
kevin has set checkout to Approved for provenpackager on backup-manager (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/backup-manager



From pkgdb at fedoraproject.org  Mon Jan 26 22:19:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Jan 2009 22:19:03 +0000
Subject: [pkgdb] backup-manager (Fedora, 10) updated by kevin
Message-ID: <20090126221904.4BC45208496@bastion.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for backup-manager
kevin has set commit to Approved for provenpackager on backup-manager (Fedora 10)
kevin has set build to Approved for provenpackager on backup-manager (Fedora 10)
kevin has set checkout to Approved for provenpackager on backup-manager (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/backup-manager



From kevin at fedoraproject.org  Mon Jan 26 22:19:23 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 26 Jan 2009 22:19:23 +0000 (UTC)
Subject: rpms/backup-manager - New directory
Message-ID: <20090126221923.2E34A7010C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/backup-manager
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsW27134/rpms/backup-manager

Log Message:
Directory /cvs/pkgs/rpms/backup-manager added to the repository




From kevin at fedoraproject.org  Mon Jan 26 22:19:23 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 26 Jan 2009 22:19:23 +0000 (UTC)
Subject: rpms/backup-manager/devel - New directory
Message-ID: <20090126221923.69BB270143@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/backup-manager/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsW27134/rpms/backup-manager/devel

Log Message:
Directory /cvs/pkgs/rpms/backup-manager/devel added to the repository




From kevin at fedoraproject.org  Mon Jan 26 22:19:43 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 26 Jan 2009 22:19:43 +0000 (UTC)
Subject: rpms/backup-manager Makefile,NONE,1.1
Message-ID: <20090126221943.F0E097010C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/backup-manager
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsW27134/rpms/backup-manager

Added Files:
	Makefile 
Log Message:
Setup of module backup-manager


--- NEW FILE Makefile ---
# Top level Makefile for module backup-manager
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Mon Jan 26 22:19:44 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 26 Jan 2009 22:19:44 +0000 (UTC)
Subject: rpms/backup-manager/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090126221944.818E070143@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/backup-manager/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsW27134/rpms/backup-manager/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module backup-manager


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: backup-manager
# $Id: Makefile,v 1.1 2009/01/26 22:19:44 kevin Exp $
NAME := backup-manager
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Jan 26 22:20:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Jan 2009 22:20:02 +0000
Subject: [pkgdb] tse3 was added for oget
Message-ID: <20090126222003.05822208487@bastion.fedora.phx.redhat.com>

kevin has added Package tse3 with summary MIDI Sequencer Engine
kevin has approved Package tse3
kevin has added a Fedora devel branch for tse3 with an owner of oget
kevin has approved tse3 in Fedora devel
kevin has approved Package tse3
kevin has set commit to Approved for provenpackager on tse3 (Fedora devel)
kevin has set build to Approved for provenpackager on tse3 (Fedora devel)
kevin has set checkout to Approved for provenpackager on tse3 (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/tse3



From pkgdb at fedoraproject.org  Mon Jan 26 22:20:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Jan 2009 22:20:06 +0000
Subject: [pkgdb] tse3 (Fedora, 9) updated by kevin
Message-ID: <20090126222006.A1E6D208485@bastion.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for tse3
kevin has set commit to Approved for provenpackager on tse3 (Fedora 9)
kevin has set build to Approved for provenpackager on tse3 (Fedora 9)
kevin has set checkout to Approved for provenpackager on tse3 (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/tse3



From pkgdb at fedoraproject.org  Mon Jan 26 22:20:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Jan 2009 22:20:06 +0000
Subject: [pkgdb] tse3 (Fedora, 10) updated by kevin
Message-ID: <20090126222006.BFEB220848C@bastion.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for tse3
kevin has set commit to Approved for provenpackager on tse3 (Fedora 10)
kevin has set build to Approved for provenpackager on tse3 (Fedora 10)
kevin has set checkout to Approved for provenpackager on tse3 (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/tse3



From kevin at fedoraproject.org  Mon Jan 26 22:20:26 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 26 Jan 2009 22:20:26 +0000 (UTC)
Subject: rpms/tse3 - New directory
Message-ID: <20090126222026.3922B7010C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/tse3
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsR27557/rpms/tse3

Log Message:
Directory /cvs/pkgs/rpms/tse3 added to the repository




From kevin at fedoraproject.org  Mon Jan 26 22:20:26 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 26 Jan 2009 22:20:26 +0000 (UTC)
Subject: rpms/tse3/devel - New directory
Message-ID: <20090126222026.8AF857010C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/tse3/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsR27557/rpms/tse3/devel

Log Message:
Directory /cvs/pkgs/rpms/tse3/devel added to the repository




From kevin at fedoraproject.org  Mon Jan 26 22:20:46 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 26 Jan 2009 22:20:46 +0000 (UTC)
Subject: rpms/tse3 Makefile,NONE,1.1
Message-ID: <20090126222046.74FF37010C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/tse3
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsR27557/rpms/tse3

Added Files:
	Makefile 
Log Message:
Setup of module tse3


--- NEW FILE Makefile ---
# Top level Makefile for module tse3
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Jan 26 22:20:46 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 26 Jan 2009 22:20:46 +0000 (UTC)
Subject: rpms/tse3/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <20090126222046.BE9C27010C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/tse3/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsR27557/rpms/tse3/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module tse3


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: tse3
# $Id: Makefile,v 1.1 2009/01/26 22:20:46 kevin Exp $
NAME := tse3
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Jan 26 22:21:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Jan 2009 22:21:12 +0000
Subject: [pkgdb] libxnm was added for fab
Message-ID: <20090126222114.622C0208486@bastion.fedora.phx.redhat.com>

kevin has added Package libxnm with summary A library for parsing the XNM format
kevin has approved Package libxnm
kevin has added a Fedora devel branch for libxnm with an owner of fab
kevin has approved libxnm in Fedora devel
kevin has approved Package libxnm
kevin has set commit to Approved for provenpackager on libxnm (Fedora devel)
kevin has set build to Approved for provenpackager on libxnm (Fedora devel)
kevin has set checkout to Approved for provenpackager on libxnm (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libxnm



From pkgdb at fedoraproject.org  Mon Jan 26 22:21:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Jan 2009 22:21:16 +0000
Subject: [pkgdb] libxnm (Fedora, 9) updated by kevin
Message-ID: <20090126222116.D7621208489@bastion.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for libxnm
kevin has set commit to Approved for provenpackager on libxnm (Fedora 9)
kevin has set build to Approved for provenpackager on libxnm (Fedora 9)
kevin has set checkout to Approved for provenpackager on libxnm (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libxnm



From pkgdb at fedoraproject.org  Mon Jan 26 22:21:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Jan 2009 22:21:16 +0000
Subject: [pkgdb] libxnm (Fedora, 10) updated by kevin
Message-ID: <20090126222116.EDF7A20848E@bastion.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for libxnm
kevin has set commit to Approved for provenpackager on libxnm (Fedora 10)
kevin has set build to Approved for provenpackager on libxnm (Fedora 10)
kevin has set checkout to Approved for provenpackager on libxnm (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libxnm



From kevin at fedoraproject.org  Mon Jan 26 22:21:29 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 26 Jan 2009 22:21:29 +0000 (UTC)
Subject: rpms/libxnm - New directory
Message-ID: <20090126222129.262C37010C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/libxnm
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsM28001/rpms/libxnm

Log Message:
Directory /cvs/pkgs/rpms/libxnm added to the repository




From kevin at fedoraproject.org  Mon Jan 26 22:21:29 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 26 Jan 2009 22:21:29 +0000 (UTC)
Subject: rpms/libxnm/devel - New directory
Message-ID: <20090126222129.5A45C7010C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/libxnm/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsM28001/rpms/libxnm/devel

Log Message:
Directory /cvs/pkgs/rpms/libxnm/devel added to the repository




From kevin at fedoraproject.org  Mon Jan 26 22:21:46 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 26 Jan 2009 22:21:46 +0000 (UTC)
Subject: rpms/libxnm Makefile,NONE,1.1
Message-ID: <20090126222146.2C3357010C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/libxnm
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsM28001/rpms/libxnm

Added Files:
	Makefile 
Log Message:
Setup of module libxnm


--- NEW FILE Makefile ---
# Top level Makefile for module libxnm
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Jan 26 22:21:46 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 26 Jan 2009 22:21:46 +0000 (UTC)
Subject: rpms/libxnm/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <20090126222146.757D97010C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/libxnm/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsM28001/rpms/libxnm/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module libxnm


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: libxnm
# $Id: Makefile,v 1.1 2009/01/26 22:21:46 kevin Exp $
NAME := libxnm
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Jan 26 22:22:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Jan 2009 22:22:15 +0000
Subject: [pkgdb] python-wokkel was added for ruben
Message-ID: <20090126222216.0CCC5208484@bastion.fedora.phx.redhat.com>

kevin has added Package python-wokkel with summary Enhancements to the Twisted XMPP protocol implementation
kevin has approved Package python-wokkel
kevin has added a Fedora devel branch for python-wokkel with an owner of ruben
kevin has approved python-wokkel in Fedora devel
kevin has approved Package python-wokkel
kevin has set commit to Approved for provenpackager on python-wokkel (Fedora devel)
kevin has set build to Approved for provenpackager on python-wokkel (Fedora devel)
kevin has set checkout to Approved for provenpackager on python-wokkel (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-wokkel



From pkgdb at fedoraproject.org  Mon Jan 26 22:22:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Jan 2009 22:22:19 +0000
Subject: [pkgdb] python-wokkel (Fedora, 10) updated by kevin
Message-ID: <20090126222219.3276E208487@bastion.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for python-wokkel
kevin has set commit to Approved for provenpackager on python-wokkel (Fedora 10)
kevin has set build to Approved for provenpackager on python-wokkel (Fedora 10)
kevin has set checkout to Approved for provenpackager on python-wokkel (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-wokkel



From kevin at fedoraproject.org  Mon Jan 26 22:22:34 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 26 Jan 2009 22:22:34 +0000 (UTC)
Subject: rpms/python-wokkel - New directory
Message-ID: <20090126222234.2DC1C7010C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/python-wokkel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsE28275/rpms/python-wokkel

Log Message:
Directory /cvs/pkgs/rpms/python-wokkel added to the repository




From kevin at fedoraproject.org  Mon Jan 26 22:22:34 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 26 Jan 2009 22:22:34 +0000 (UTC)
Subject: rpms/python-wokkel/devel - New directory
Message-ID: <20090126222234.707697010C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/python-wokkel/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsE28275/rpms/python-wokkel/devel

Log Message:
Directory /cvs/pkgs/rpms/python-wokkel/devel added to the repository




From kevin at fedoraproject.org  Mon Jan 26 22:22:52 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 26 Jan 2009 22:22:52 +0000 (UTC)
Subject: rpms/python-wokkel Makefile,NONE,1.1
Message-ID: <20090126222252.C5E2B7010C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/python-wokkel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsE28275/rpms/python-wokkel

Added Files:
	Makefile 
Log Message:
Setup of module python-wokkel


--- NEW FILE Makefile ---
# Top level Makefile for module python-wokkel
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Jan 26 22:22:53 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 26 Jan 2009 22:22:53 +0000 (UTC)
Subject: rpms/python-wokkel/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090126222253.207B570143@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/python-wokkel/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsE28275/rpms/python-wokkel/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module python-wokkel


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: python-wokkel
# $Id: Makefile,v 1.1 2009/01/26 22:22:52 kevin Exp $
NAME := python-wokkel
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Jan 26 22:24:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Jan 2009 22:24:20 +0000
Subject: [pkgdb] perl-Mail-POP3Client was added for corsepiu
Message-ID: <20090126222420.8EEF6208486@bastion.fedora.phx.redhat.com>

kevin has added Package perl-Mail-POP3Client with summary Perl 5 module to talk to a POP3 (RFC1939) server
kevin has approved Package perl-Mail-POP3Client
kevin has added a Fedora devel branch for perl-Mail-POP3Client with an owner of corsepiu
kevin has approved perl-Mail-POP3Client in Fedora devel
kevin has approved Package perl-Mail-POP3Client
kevin has set commit to Approved for provenpackager on perl-Mail-POP3Client (Fedora devel)
kevin has set build to Approved for provenpackager on perl-Mail-POP3Client (Fedora devel)
kevin has set checkout to Approved for provenpackager on perl-Mail-POP3Client (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Mail-POP3Client



From pkgdb at fedoraproject.org  Mon Jan 26 22:24:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Jan 2009 22:24:22 +0000
Subject: [pkgdb] perl-Mail-POP3Client (Fedora, 9) updated by kevin
Message-ID: <20090126222422.40519208489@bastion.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for perl-Mail-POP3Client
kevin has set commit to Approved for provenpackager on perl-Mail-POP3Client (Fedora 9)
kevin has set build to Approved for provenpackager on perl-Mail-POP3Client (Fedora 9)
kevin has set checkout to Approved for provenpackager on perl-Mail-POP3Client (Fedora 9)
kevin approved watchbugzilla on perl-Mail-POP3Client (Fedora 9) for perl-sig
kevin approved watchcommits on perl-Mail-POP3Client (Fedora 9) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Mail-POP3Client



From pkgdb at fedoraproject.org  Mon Jan 26 22:24:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Jan 2009 22:24:22 +0000
Subject: [pkgdb] perl-Mail-POP3Client (Fedora, 10) updated by kevin
Message-ID: <20090126222422.6709B20848E@bastion.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for perl-Mail-POP3Client
kevin has set commit to Approved for provenpackager on perl-Mail-POP3Client (Fedora 10)
kevin has set build to Approved for provenpackager on perl-Mail-POP3Client (Fedora 10)
kevin has set checkout to Approved for provenpackager on perl-Mail-POP3Client (Fedora 10)
kevin approved watchbugzilla on perl-Mail-POP3Client (Fedora 10) for perl-sig
kevin approved watchcommits on perl-Mail-POP3Client (Fedora 10) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Mail-POP3Client



From pkgdb at fedoraproject.org  Mon Jan 26 22:24:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Jan 2009 22:24:22 +0000
Subject: [pkgdb] perl-Mail-POP3Client (Fedora, devel) updated by kevin
Message-ID: <20090126222422.9800E208491@bastion.fedora.phx.redhat.com>

kevin approved watchbugzilla on perl-Mail-POP3Client (Fedora devel) for perl-sig
kevin approved watchcommits on perl-Mail-POP3Client (Fedora devel) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Mail-POP3Client



From kevin at fedoraproject.org  Mon Jan 26 22:24:39 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 26 Jan 2009 22:24:39 +0000 (UTC)
Subject: rpms/perl-Mail-POP3Client - New directory
Message-ID: <20090126222439.271CB7010C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Mail-POP3Client
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsH28612/rpms/perl-Mail-POP3Client

Log Message:
Directory /cvs/pkgs/rpms/perl-Mail-POP3Client added to the repository




From kevin at fedoraproject.org  Mon Jan 26 22:24:39 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 26 Jan 2009 22:24:39 +0000 (UTC)
Subject: rpms/perl-Mail-POP3Client/devel - New directory
Message-ID: <20090126222439.6383C70143@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Mail-POP3Client/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsH28612/rpms/perl-Mail-POP3Client/devel

Log Message:
Directory /cvs/pkgs/rpms/perl-Mail-POP3Client/devel added to the repository




From kevin at fedoraproject.org  Mon Jan 26 22:24:57 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 26 Jan 2009 22:24:57 +0000 (UTC)
Subject: rpms/perl-Mail-POP3Client Makefile,NONE,1.1
Message-ID: <20090126222457.3AB597010C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Mail-POP3Client
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsH28612/rpms/perl-Mail-POP3Client

Added Files:
	Makefile 
Log Message:
Setup of module perl-Mail-POP3Client


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Mail-POP3Client
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Jan 26 22:24:57 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 26 Jan 2009 22:24:57 +0000 (UTC)
Subject: rpms/perl-Mail-POP3Client/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090126222457.ABC0A7010C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Mail-POP3Client/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsH28612/rpms/perl-Mail-POP3Client/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Mail-POP3Client


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: perl-Mail-POP3Client
# $Id: Makefile,v 1.1 2009/01/26 22:24:57 kevin Exp $
NAME := perl-Mail-POP3Client
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Jan 26 22:25:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Jan 2009 22:25:09 +0000
Subject: [pkgdb] vhybridize was added for fab
Message-ID: <20090126222509.8F47F208480@bastion.fedora.phx.redhat.com>

kevin has added Package vhybridize with summary Virtual Hybridization tools
kevin has approved Package vhybridize
kevin has added a Fedora devel branch for vhybridize with an owner of fab
kevin has approved vhybridize in Fedora devel
kevin has approved Package vhybridize
kevin has set commit to Approved for provenpackager on vhybridize (Fedora devel)
kevin has set build to Approved for provenpackager on vhybridize (Fedora devel)
kevin has set checkout to Approved for provenpackager on vhybridize (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/vhybridize



From pkgdb at fedoraproject.org  Mon Jan 26 22:25:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Jan 2009 22:25:12 +0000
Subject: [pkgdb] vhybridize (Fedora, 9) updated by kevin
Message-ID: <20090126222512.9984D20848E@bastion.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for vhybridize
kevin has set commit to Approved for provenpackager on vhybridize (Fedora 9)
kevin has set build to Approved for provenpackager on vhybridize (Fedora 9)
kevin has set checkout to Approved for provenpackager on vhybridize (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/vhybridize



From kevin at fedoraproject.org  Mon Jan 26 22:25:25 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 26 Jan 2009 22:25:25 +0000 (UTC)
Subject: rpms/vhybridize - New directory
Message-ID: <20090126222525.26C8B7010C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/vhybridize
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsL28853/rpms/vhybridize

Log Message:
Directory /cvs/pkgs/rpms/vhybridize added to the repository




From pkgdb at fedoraproject.org  Mon Jan 26 22:25:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Jan 2009 22:25:12 +0000
Subject: [pkgdb] vhybridize (Fedora, 10) updated by kevin
Message-ID: <20090126222512.A27B9208491@bastion.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for vhybridize
kevin has set commit to Approved for provenpackager on vhybridize (Fedora 10)
kevin has set build to Approved for provenpackager on vhybridize (Fedora 10)
kevin has set checkout to Approved for provenpackager on vhybridize (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/vhybridize



From kevin at fedoraproject.org  Mon Jan 26 22:25:25 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 26 Jan 2009 22:25:25 +0000 (UTC)
Subject: rpms/vhybridize/devel - New directory
Message-ID: <20090126222525.646FA7010C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/vhybridize/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsL28853/rpms/vhybridize/devel

Log Message:
Directory /cvs/pkgs/rpms/vhybridize/devel added to the repository




From kevin at fedoraproject.org  Mon Jan 26 22:25:41 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 26 Jan 2009 22:25:41 +0000 (UTC)
Subject: rpms/vhybridize Makefile,NONE,1.1
Message-ID: <20090126222541.1713E7010C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/vhybridize
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsL28853/rpms/vhybridize

Added Files:
	Makefile 
Log Message:
Setup of module vhybridize


--- NEW FILE Makefile ---
# Top level Makefile for module vhybridize
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Jan 26 22:25:41 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 26 Jan 2009 22:25:41 +0000 (UTC)
Subject: rpms/vhybridize/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090126222541.54CC87010C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/vhybridize/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsL28853/rpms/vhybridize/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module vhybridize


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: vhybridize
# $Id: Makefile,v 1.1 2009/01/26 22:25:41 kevin Exp $
NAME := vhybridize
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Jan 26 22:26:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Jan 2009 22:26:30 +0000
Subject: [pkgdb] perl-Bio-Graphics was added for alexlan
Message-ID: <20090126222630.80983208487@bastion.fedora.phx.redhat.com>

kevin has added Package perl-Bio-Graphics with summary Graphics support for generating images of BioPerl objects
kevin has approved Package perl-Bio-Graphics
kevin has added a Fedora devel branch for perl-Bio-Graphics with an owner of alexlan
kevin has approved perl-Bio-Graphics in Fedora devel
kevin has approved Package perl-Bio-Graphics
kevin has set commit to Approved for provenpackager on perl-Bio-Graphics (Fedora devel)
kevin has set build to Approved for provenpackager on perl-Bio-Graphics (Fedora devel)
kevin has set checkout to Approved for provenpackager on perl-Bio-Graphics (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Bio-Graphics



From pkgdb at fedoraproject.org  Mon Jan 26 22:26:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Jan 2009 22:26:33 +0000
Subject: [pkgdb] perl-Bio-Graphics (Fedora, 9) updated by kevin
Message-ID: <20090126222633.88E13208489@bastion.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for perl-Bio-Graphics
kevin has set commit to Approved for provenpackager on perl-Bio-Graphics (Fedora 9)
kevin has set build to Approved for provenpackager on perl-Bio-Graphics (Fedora 9)
kevin has set checkout to Approved for provenpackager on perl-Bio-Graphics (Fedora 9)
kevin approved watchbugzilla on perl-Bio-Graphics (Fedora 9) for perl-sig
kevin approved watchcommits on perl-Bio-Graphics (Fedora 9) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Bio-Graphics



From pkgdb at fedoraproject.org  Mon Jan 26 22:26:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Jan 2009 22:26:33 +0000
Subject: [pkgdb] perl-Bio-Graphics (Fedora, 10) updated by kevin
Message-ID: <20090126222633.B65C220848F@bastion.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for perl-Bio-Graphics
kevin has set commit to Approved for provenpackager on perl-Bio-Graphics (Fedora 10)
kevin has set build to Approved for provenpackager on perl-Bio-Graphics (Fedora 10)
kevin has set checkout to Approved for provenpackager on perl-Bio-Graphics (Fedora 10)
kevin approved watchbugzilla on perl-Bio-Graphics (Fedora 10) for perl-sig
kevin approved watchcommits on perl-Bio-Graphics (Fedora 10) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Bio-Graphics



From kevin at fedoraproject.org  Mon Jan 26 22:26:46 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 26 Jan 2009 22:26:46 +0000 (UTC)
Subject: rpms/perl-Bio-Graphics - New directory
Message-ID: <20090126222646.2FF4F7010C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Bio-Graphics
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsa29198/rpms/perl-Bio-Graphics

Log Message:
Directory /cvs/pkgs/rpms/perl-Bio-Graphics added to the repository




From pkgdb at fedoraproject.org  Mon Jan 26 22:26:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Jan 2009 22:26:33 +0000
Subject: [pkgdb] perl-Bio-Graphics (Fedora, devel) updated by kevin
Message-ID: <20090126222633.C709A208492@bastion.fedora.phx.redhat.com>

kevin approved watchbugzilla on perl-Bio-Graphics (Fedora devel) for perl-sig
kevin approved watchcommits on perl-Bio-Graphics (Fedora devel) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Bio-Graphics



From kevin at fedoraproject.org  Mon Jan 26 22:26:46 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 26 Jan 2009 22:26:46 +0000 (UTC)
Subject: rpms/perl-Bio-Graphics/devel - New directory
Message-ID: <20090126222646.7159970143@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Bio-Graphics/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsa29198/rpms/perl-Bio-Graphics/devel

Log Message:
Directory /cvs/pkgs/rpms/perl-Bio-Graphics/devel added to the repository




From kevin at fedoraproject.org  Mon Jan 26 22:27:03 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 26 Jan 2009 22:27:03 +0000 (UTC)
Subject: rpms/perl-Bio-Graphics Makefile,NONE,1.1
Message-ID: <20090126222703.5D0B37010C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Bio-Graphics
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsa29198/rpms/perl-Bio-Graphics

Added Files:
	Makefile 
Log Message:
Setup of module perl-Bio-Graphics


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Bio-Graphics
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Jan 26 22:27:03 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 26 Jan 2009 22:27:03 +0000 (UTC)
Subject: rpms/perl-Bio-Graphics/devel .cvsignore, NONE, 1.1 Makefile, NONE, 
	1.1 sources, NONE, 1.1
Message-ID: <20090126222703.B3E077010C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Bio-Graphics/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsa29198/rpms/perl-Bio-Graphics/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Bio-Graphics


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: perl-Bio-Graphics
# $Id: Makefile,v 1.1 2009/01/26 22:27:03 kevin Exp $
NAME := perl-Bio-Graphics
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Jan 26 22:28:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Jan 2009 22:28:06 +0000
Subject: [pkgdb] perl-MooseX-Async was added for allisson
Message-ID: <20090126222807.4F5A3208484@bastion.fedora.phx.redhat.com>

kevin has added Package perl-MooseX-Async with summary Set of Metaclasses for MooseX::POE and it's siblings
kevin has approved Package perl-MooseX-Async
kevin has added a Fedora devel branch for perl-MooseX-Async with an owner of allisson
kevin has approved perl-MooseX-Async in Fedora devel
kevin has approved Package perl-MooseX-Async
kevin has set commit to Approved for provenpackager on perl-MooseX-Async (Fedora devel)
kevin has set build to Approved for provenpackager on perl-MooseX-Async (Fedora devel)
kevin has set checkout to Approved for provenpackager on perl-MooseX-Async (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-MooseX-Async



From pkgdb at fedoraproject.org  Mon Jan 26 22:28:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Jan 2009 22:28:08 +0000
Subject: [pkgdb] perl-MooseX-Async (Fedora, devel) updated by kevin
Message-ID: <20090126222808.884ED208489@bastion.fedora.phx.redhat.com>

kevin approved watchbugzilla on perl-MooseX-Async (Fedora devel) for perl-sig
kevin approved watchcommits on perl-MooseX-Async (Fedora devel) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-MooseX-Async



From pkgdb at fedoraproject.org  Mon Jan 26 22:28:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Jan 2009 22:28:08 +0000
Subject: [pkgdb] perl-MooseX-Async (Fedora, 10) updated by kevin
Message-ID: <20090126222808.A0E63208491@bastion.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for perl-MooseX-Async
kevin has set commit to Approved for provenpackager on perl-MooseX-Async (Fedora 10)
kevin has set build to Approved for provenpackager on perl-MooseX-Async (Fedora 10)
kevin has set checkout to Approved for provenpackager on perl-MooseX-Async (Fedora 10)
kevin approved watchbugzilla on perl-MooseX-Async (Fedora 10) for perl-sig
kevin approved watchcommits on perl-MooseX-Async (Fedora 10) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-MooseX-Async



From pkgdb at fedoraproject.org  Mon Jan 26 22:28:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Jan 2009 22:28:08 +0000
Subject: [pkgdb] perl-MooseX-Async (Fedora, 9) updated by kevin
Message-ID: <20090126222808.9265620848E@bastion.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for perl-MooseX-Async
kevin has set commit to Approved for provenpackager on perl-MooseX-Async (Fedora 9)
kevin has set build to Approved for provenpackager on perl-MooseX-Async (Fedora 9)
kevin has set checkout to Approved for provenpackager on perl-MooseX-Async (Fedora 9)
kevin approved watchbugzilla on perl-MooseX-Async (Fedora 9) for perl-sig
kevin approved watchcommits on perl-MooseX-Async (Fedora 9) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-MooseX-Async



From kevin at fedoraproject.org  Mon Jan 26 22:28:25 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 26 Jan 2009 22:28:25 +0000 (UTC)
Subject: rpms/perl-MooseX-Async - New directory
Message-ID: <20090126222825.24EBE7010C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-MooseX-Async
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsN29526/rpms/perl-MooseX-Async

Log Message:
Directory /cvs/pkgs/rpms/perl-MooseX-Async added to the repository




From kevin at fedoraproject.org  Mon Jan 26 22:28:25 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 26 Jan 2009 22:28:25 +0000 (UTC)
Subject: rpms/perl-MooseX-Async/devel - New directory
Message-ID: <20090126222825.592997010C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-MooseX-Async/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsN29526/rpms/perl-MooseX-Async/devel

Log Message:
Directory /cvs/pkgs/rpms/perl-MooseX-Async/devel added to the repository




From kevin at fedoraproject.org  Mon Jan 26 22:28:41 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 26 Jan 2009 22:28:41 +0000 (UTC)
Subject: rpms/perl-MooseX-Async Makefile,NONE,1.1
Message-ID: <20090126222841.C4DF37010C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-MooseX-Async
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsN29526/rpms/perl-MooseX-Async

Added Files:
	Makefile 
Log Message:
Setup of module perl-MooseX-Async


--- NEW FILE Makefile ---
# Top level Makefile for module perl-MooseX-Async
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Mon Jan 26 22:28:42 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 26 Jan 2009 22:28:42 +0000 (UTC)
Subject: rpms/perl-MooseX-Async/devel .cvsignore, NONE, 1.1 Makefile, NONE, 
	1.1 sources, NONE, 1.1
Message-ID: <20090126222842.3230E7010C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-MooseX-Async/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsN29526/rpms/perl-MooseX-Async/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-MooseX-Async


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: perl-MooseX-Async
# $Id: Makefile,v 1.1 2009/01/26 22:28:42 kevin Exp $
NAME := perl-MooseX-Async
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Mon Jan 26 22:29:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Jan 2009 22:29:19 +0000
Subject: [pkgdb] sj-fonts was added for slankes
Message-ID: <20090126222919.3DA8D20848F@bastion.fedora.phx.redhat.com>

kevin has added Package sj-fonts with summary Two fonts by Steve Jordi released under the GPL
kevin has approved Package sj-fonts
kevin has added a Fedora devel branch for sj-fonts with an owner of slankes
kevin has approved sj-fonts in Fedora devel
kevin has approved Package sj-fonts
kevin has set commit to Approved for provenpackager on sj-fonts (Fedora devel)
kevin has set build to Approved for provenpackager on sj-fonts (Fedora devel)
kevin has set checkout to Approved for provenpackager on sj-fonts (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sj-fonts



From pkgdb at fedoraproject.org  Mon Jan 26 22:29:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Jan 2009 22:29:23 +0000
Subject: [pkgdb] sj-fonts (Fedora, 9) updated by kevin
Message-ID: <20090126222923.3E037208490@bastion.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for sj-fonts
kevin has set commit to Approved for provenpackager on sj-fonts (Fedora 9)
kevin has set build to Approved for provenpackager on sj-fonts (Fedora 9)
kevin has set checkout to Approved for provenpackager on sj-fonts (Fedora 9)
kevin approved watchbugzilla on sj-fonts (Fedora 9) for fonts-sig
kevin approved watchcommits on sj-fonts (Fedora 9) for fonts-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sj-fonts



From pkgdb at fedoraproject.org  Mon Jan 26 22:29:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Jan 2009 22:29:23 +0000
Subject: [pkgdb] sj-fonts (Fedora, devel) updated by kevin
Message-ID: <20090126222923.49924208493@bastion.fedora.phx.redhat.com>

kevin approved watchbugzilla on sj-fonts (Fedora devel) for fonts-sig
kevin approved watchcommits on sj-fonts (Fedora devel) for fonts-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sj-fonts



From kevin at fedoraproject.org  Mon Jan 26 22:29:36 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 26 Jan 2009 22:29:36 +0000 (UTC)
Subject: rpms/sj-fonts - New directory
Message-ID: <20090126222936.24D157010C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/sj-fonts
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsr29854/rpms/sj-fonts

Log Message:
Directory /cvs/pkgs/rpms/sj-fonts added to the repository




From kevin at fedoraproject.org  Mon Jan 26 22:29:36 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 26 Jan 2009 22:29:36 +0000 (UTC)
Subject: rpms/sj-fonts/devel - New directory
Message-ID: <20090126222936.5EAD47010C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/sj-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsr29854/rpms/sj-fonts/devel

Log Message:
Directory /cvs/pkgs/rpms/sj-fonts/devel added to the repository




From pkgdb at fedoraproject.org  Mon Jan 26 22:29:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Jan 2009 22:29:23 +0000
Subject: [pkgdb] sj-fonts (Fedora, 10) updated by kevin
Message-ID: <20090126222923.6A14D208497@bastion.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for sj-fonts
kevin has set commit to Approved for provenpackager on sj-fonts (Fedora 10)
kevin has set build to Approved for provenpackager on sj-fonts (Fedora 10)
kevin has set checkout to Approved for provenpackager on sj-fonts (Fedora 10)
kevin approved watchbugzilla on sj-fonts (Fedora 10) for fonts-sig
kevin approved watchcommits on sj-fonts (Fedora 10) for fonts-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sj-fonts



From kevin at fedoraproject.org  Mon Jan 26 22:29:53 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 26 Jan 2009 22:29:53 +0000 (UTC)
Subject: rpms/sj-fonts Makefile,NONE,1.1
Message-ID: <20090126222953.7F94D7010C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/sj-fonts
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsr29854/rpms/sj-fonts

Added Files:
	Makefile 
Log Message:
Setup of module sj-fonts


--- NEW FILE Makefile ---
# Top level Makefile for module sj-fonts
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Mon Jan 26 22:29:53 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 26 Jan 2009 22:29:53 +0000 (UTC)
Subject: rpms/sj-fonts/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090126222953.CD7477010C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/sj-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsr29854/rpms/sj-fonts/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module sj-fonts


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: sj-fonts
# $Id: Makefile,v 1.1 2009/01/26 22:29:53 kevin Exp $
NAME := sj-fonts
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From rathann at fedoraproject.org  Mon Jan 26 22:35:07 2009
From: rathann at fedoraproject.org (Dominik Mierzejewski)
Date: Mon, 26 Jan 2009 22:35:07 +0000 (UTC)
Subject: rpms/dx/F-10 dx.spec,1.10,1.11
Message-ID: <20090126223507.46EEE7010C@cvs1.fedora.phx.redhat.com>

Author: rathann

Update of /cvs/pkgs/rpms/dx/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30880

Modified Files:
	dx.spec 
Log Message:
cosmetics: remove trailing whitespace


Index: dx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dx/F-10/dx.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- dx.spec	24 Sep 2008 19:42:45 -0000	1.10
+++ dx.spec	26 Jan 2009 22:34:36 -0000	1.11
@@ -1,4 +1,4 @@
-Summary: Open source version of IBM's Visualization Data Explorer 
+Summary: Open source version of IBM's Visualization Data Explorer
 Name: dx
 Version: 4.4.4
 Release: 7%{?dist}
@@ -71,7 +71,7 @@
 	--enable-smp-linux \
 	--enable-new-keylayout \
 	--with-rsh=%{_bindir}/ssh
-                        
+
 make %{?_smp_mflags}
 
 %install



From mnowak at fedoraproject.org  Mon Jan 26 22:38:45 2009
From: mnowak at fedoraproject.org (Michal Nowak)
Date: Mon, 26 Jan 2009 22:38:45 +0000 (UTC)
Subject: rpms/kurdit-unikurd-web-fonts/devel import.log, NONE,
	1.1 kurdit-unikurd-web-fonts.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090126223845.B28257010C@cvs1.fedora.phx.redhat.com>

Author: mnowak

Update of /cvs/pkgs/rpms/kurdit-unikurd-web-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31501/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log kurdit-unikurd-web-fonts.spec 
Log Message:
init



--- NEW FILE import.log ---
kurdit-unikurd-web-fonts-20020502-2_fc10:HEAD:kurdit-unikurd-web-fonts-20020502-2.fc10.src.rpm:1233009424


--- NEW FILE kurdit-unikurd-web-fonts.spec ---
# TODO: proper fontconfig hints are nice to have
%define fontname kurdit-unikurd-web
#%%define fontconf 65-%{fontname}.conf

%define archivename unikurdweb

Name:    %{fontname}-fonts
Version: 20020502
Release: 2%{?dist}
Summary: A widely used Kurdish font for Arabic-like scripts and Latin

Group:     User Interface/X
License:   GPLv3
URL:       http://www.kurditgroup.org/node/1337
Source0:   http://www.kurditgroup.org/download/1337/%{archivename}.zip
#Source1:   %{name}-fontconfig.conf
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:     noarch
BuildRequires: fontpackages-devel
Requires:      fontpackages-filesystem
Obsoletes:     unikurd-web-font < 20020502-2


%description
A widely used Kurdish font which supports various Arabic-like scripts
(Arabic, Kurdish, Persian) and also Latin.


%prep
%setup -q -c %{archivename}


%build


%install
rm -rf %{buildroot}

install -m 0755 -d %{buildroot}%{_fontdir}
install -m 0644 -p *.ttf %{buildroot}%{_fontdir}

#install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} \
#                   %{buildroot}%{_fontconfig_confdir}

#install -m 0644 -p %{SOURCE1} \
#        %{buildroot}%{_fontconfig_templatedir}/%{fontconf}
#ln -s %{_fontconfig_templatedir}/%{fontconf} \
#      %{buildroot}%{_fontconfig_confdir}/%{fontconf}


%clean
rm -rf %{buildroot}


#%%_font_pkg -f %{fontconf} *.ttf
%_font_pkg *.ttf

%doc gpl.txt
%dir %{_fontdir}


%changelog
* Sun Jan 25 2009 Michal Nowak <mnowak at redhat.com> - 20020502-2
- repackage to save myself a grief

* Sun Jan 25 2009 Michal Nowak <mnowak at redhat.com> - 20020502-1
- renamed from unikurd-web-font -> kurdit-unikurd-web-fonts
- enhanced %%description field
- changes for F11 fonts rules
- add Obsoletes: unikurd-web-font <= 20020502-1

* Tue Oct 14 2008 Michal Nowak <mnowak at redhat.com> - 20020502
- version is now based on date of last issue of the font
- %%defattr(-,root,root,-) -> %%defattr(644,root,root,755)

* Mon Oct 13 2008 Michal Nowak <mnowak at redhat.com> - 1.00-2
- got rid of -web sub-package
- changed name from unikurd-fonts-web to unikurd-web-font
- minor structural changes in SPEC file

* Tue Jul 30 2008 Michal Nowak <mnowak at redhat.com> - 1.00-1
- initial packaging
- this package should be prepared for another unikurd fonts
  in sub-packages because on the KurdIT group/unikurd web there
  are plenthora of them, but probably not under suitable licenses



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kurdit-unikurd-web-fonts/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	26 Jan 2009 22:15:09 -0000	1.1
+++ .cvsignore	26 Jan 2009 22:38:15 -0000	1.2
@@ -0,0 +1 @@
+unikurdweb.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kurdit-unikurd-web-fonts/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	26 Jan 2009 22:15:10 -0000	1.1
+++ sources	26 Jan 2009 22:38:15 -0000	1.2
@@ -0,0 +1 @@
+1d0af629e8f4ce4e1722d0cacf2e26b0  unikurdweb.zip



From pkgdb at fedoraproject.org  Mon Jan 26 22:38:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Jan 2009 22:38:57 +0000
Subject: [pkgdb] dustin-domestic-manners-fonts was added for slankes
Message-ID: <20090126223857.63448208494@bastion.fedora.phx.redhat.com>

kevin has added Package dustin-domestic-manners-fonts with summary Handwriting font by Dustin Norlander
kevin has approved Package dustin-domestic-manners-fonts
kevin has added a Fedora devel branch for dustin-domestic-manners-fonts with an owner of slankes
kevin has approved dustin-domestic-manners-fonts in Fedora devel
kevin has approved Package dustin-domestic-manners-fonts
kevin has set commit to Approved for provenpackager on dustin-domestic-manners-fonts (Fedora devel)
kevin has set build to Approved for provenpackager on dustin-domestic-manners-fonts (Fedora devel)
kevin has set checkout to Approved for provenpackager on dustin-domestic-manners-fonts (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/dustin-domestic-manners-fonts



From pkgdb at fedoraproject.org  Mon Jan 26 22:39:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Jan 2009 22:39:00 +0000
Subject: [pkgdb] dustin-domestic-manners-fonts (Fedora, 9) updated by kevin
Message-ID: <20090126223900.C5C8F208495@bastion.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for dustin-domestic-manners-fonts
kevin has set commit to Approved for provenpackager on dustin-domestic-manners-fonts (Fedora 9)
kevin has set build to Approved for provenpackager on dustin-domestic-manners-fonts (Fedora 9)
kevin has set checkout to Approved for provenpackager on dustin-domestic-manners-fonts (Fedora 9)
kevin approved watchbugzilla on dustin-domestic-manners-fonts (Fedora 9) for fonts-sig
kevin approved watchcommits on dustin-domestic-manners-fonts (Fedora 9) for fonts-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/dustin-domestic-manners-fonts



From pkgdb at fedoraproject.org  Mon Jan 26 22:39:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Jan 2009 22:39:00 +0000
Subject: [pkgdb] dustin-domestic-manners-fonts (Fedora,
	devel) updated by kevin
Message-ID: <20090126223900.E1A242084B6@bastion.fedora.phx.redhat.com>

kevin approved watchbugzilla on dustin-domestic-manners-fonts (Fedora devel) for fonts-sig
kevin approved watchcommits on dustin-domestic-manners-fonts (Fedora devel) for fonts-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/dustin-domestic-manners-fonts



From kevin at fedoraproject.org  Mon Jan 26 22:39:17 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 26 Jan 2009 22:39:17 +0000 (UTC)
Subject: rpms/dustin-domestic-manners-fonts - New directory
Message-ID: <20090126223917.380BF70142@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/dustin-domestic-manners-fonts
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsM31817/rpms/dustin-domestic-manners-fonts

Log Message:
Directory /cvs/pkgs/rpms/dustin-domestic-manners-fonts added to the repository




From kevin at fedoraproject.org  Mon Jan 26 22:39:17 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 26 Jan 2009 22:39:17 +0000 (UTC)
Subject: rpms/dustin-domestic-manners-fonts/devel - New directory
Message-ID: <20090126223917.7F00070142@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/dustin-domestic-manners-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsM31817/rpms/dustin-domestic-manners-fonts/devel

Log Message:
Directory /cvs/pkgs/rpms/dustin-domestic-manners-fonts/devel added to the repository




From pkgdb at fedoraproject.org  Mon Jan 26 22:39:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Jan 2009 22:39:00 +0000
Subject: [pkgdb] dustin-domestic-manners-fonts (Fedora, 10) updated by kevin
Message-ID: <20090126223901.01A342084BD@bastion.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for dustin-domestic-manners-fonts
kevin has set commit to Approved for provenpackager on dustin-domestic-manners-fonts (Fedora 10)
kevin has set build to Approved for provenpackager on dustin-domestic-manners-fonts (Fedora 10)
kevin has set checkout to Approved for provenpackager on dustin-domestic-manners-fonts (Fedora 10)
kevin approved watchbugzilla on dustin-domestic-manners-fonts (Fedora 10) for fonts-sig
kevin approved watchcommits on dustin-domestic-manners-fonts (Fedora 10) for fonts-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/dustin-domestic-manners-fonts



From kevin at fedoraproject.org  Mon Jan 26 22:39:40 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 26 Jan 2009 22:39:40 +0000 (UTC)
Subject: rpms/dustin-domestic-manners-fonts Makefile,NONE,1.1
Message-ID: <20090126223940.9262D70142@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/dustin-domestic-manners-fonts
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsM31817/rpms/dustin-domestic-manners-fonts

Added Files:
	Makefile 
Log Message:
Setup of module dustin-domestic-manners-fonts


--- NEW FILE Makefile ---
# Top level Makefile for module dustin-domestic-manners-fonts
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Mon Jan 26 22:39:41 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 26 Jan 2009 22:39:41 +0000 (UTC)
Subject: rpms/dustin-domestic-manners-fonts/devel .cvsignore, NONE,
	1.1 Makefile, NONE, 1.1 sources, NONE, 1.1
Message-ID: <20090126223941.567E370142@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/dustin-domestic-manners-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsM31817/rpms/dustin-domestic-manners-fonts/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module dustin-domestic-manners-fonts


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: dustin-domestic-manners-fonts
# $Id: Makefile,v 1.1 2009/01/26 22:39:40 kevin Exp $
NAME := dustin-domestic-manners-fonts
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From corsepiu at fedoraproject.org  Mon Jan 26 22:42:20 2009
From: corsepiu at fedoraproject.org (=?utf-8?q?Ralf_Cors=C3=A9pius?=)
Date: Mon, 26 Jan 2009 22:42:20 +0000 (UTC)
Subject: rpms/perl-Mail-POP3Client/devel import.log, NONE,
	1.1 perl-Mail-POP3Client.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090126224220.1CECC7010C@cvs1.fedora.phx.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-Mail-POP3Client/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv764/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-Mail-POP3Client.spec 
Log Message:



--- NEW FILE import.log ---
perl-Mail-POP3Client-2_18-1_fc10:HEAD:perl-Mail-POP3Client-2.18-1.fc10.src.rpm:1233009696


--- NEW FILE perl-Mail-POP3Client.spec ---
Name:           perl-Mail-POP3Client
Version:        2.18
Release:        1%{?dist}
Summary:        Perl 5 module to talk to a POP3 (RFC1939) server
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Mail-POP3Client/
Source0:        http://www.cpan.org/authors/id/S/SD/SDOWD/Mail-POP3Client-%{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
This module implements an Object-Oriented interface to a POP3 server. It
implements RFC1939 (http://www.faqs.org/rfcs/rfc1939.html)

%prep
%setup -q -n Mail-POP3Client-%{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 FAQ README
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Sat Jan 24 2009 Ralf Cors??pius <corsepiu at fedoraproject.org> 2.18-1
- Specfile autogenerated by cpanspec 1.77.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Mail-POP3Client/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	26 Jan 2009 22:24:57 -0000	1.1
+++ .cvsignore	26 Jan 2009 22:42:19 -0000	1.2
@@ -0,0 +1 @@
+Mail-POP3Client-2.18.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Mail-POP3Client/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	26 Jan 2009 22:24:57 -0000	1.1
+++ sources	26 Jan 2009 22:42:19 -0000	1.2
@@ -0,0 +1 @@
+27b99775072f6ad4b585f7484c47405d  Mail-POP3Client-2.18.tar.gz



From rathann at fedoraproject.org  Mon Jan 26 22:42:59 2009
From: rathann at fedoraproject.org (Dominik Mierzejewski)
Date: Mon, 26 Jan 2009 22:42:59 +0000 (UTC)
Subject: rpms/dx/F-10 dx-errno.patch,NONE,1.1 dx.spec,1.11,1.12
Message-ID: <20090126224259.83A857010C@cvs1.fedora.phx.redhat.com>

Author: rathann

Update of /cvs/pkgs/rpms/dx/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv889

Modified Files:
	dx.spec 
Added Files:
	dx-errno.patch 
Log Message:
* Mon Jan 26 2009 Dominik Mierzejewski <rpm at greysector.net> 4.4.4-8
- fix leftover dxexec process consuming 100% CPU after quitting (bug #469664)


dx-errno.patch:

--- NEW FILE dx-errno.patch ---
diff -up dx-4.4.4/src/exec/dpexec/lex.c.errno dx-4.4.4/src/exec/dpexec/lex.c
--- dx-4.4.4/src/exec/dpexec/lex.c.errno	2006-01-09 23:57:34.000000000 +0100
+++ dx-4.4.4/src/exec/dpexec/lex.c	2009-01-26 19:16:20.000000000 +0100
@@ -504,6 +504,7 @@ int yylex(YYSTYPE *lvalp)
     for (;;)
     {
 	yyleng = 0;
+	errno = 0;
  
 	c = input();
  


Index: dx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dx/F-10/dx.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- dx.spec	26 Jan 2009 22:34:36 -0000	1.11
+++ dx.spec	26 Jan 2009 22:42:29 -0000	1.12
@@ -1,7 +1,7 @@
 Summary: Open source version of IBM's Visualization Data Explorer
 Name: dx
 Version: 4.4.4
-Release: 7%{?dist}
+Release: 8%{?dist}
 URL: http://www.opendx.org/
 Group: Applications/Engineering
 Source0: http://opendx.npaci.edu/source/%{name}-%{version}.tar.gz
@@ -9,6 +9,8 @@
 Patch0: %{name}-rpm.patch
 Patch1: %{name}-open.patch
 Patch2: %{name}-gcc43.patch
+# fixes http://www.opendx.org/bugs/view.php?id=236
+Patch3: %{name}-errno.patch
 License: IBM
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: bison
@@ -57,6 +59,7 @@
 %patch0 -p1 -b .r
 %patch1 -p1 -b .open
 %patch2 -p1 -b .gcc43
+%patch3 -p1 -b .errno
 # fix debuginfo rpmlint warnings
 chmod a-x src/exec/{dxmods,dpexec,hwrender}/*.{c,h}
 
@@ -121,6 +124,9 @@
 %{_libdir}/lib*.so
 
 %changelog
+* Mon Jan 26 2009 Dominik Mierzejewski <rpm at greysector.net> 4.4.4-8
+- fix leftover dxexec process consuming 100% CPU after quitting (bug #469664)
+
 * Wed Sep 24 2008 Dominik Mierzejewski <rpm at greysector.net> 4.4.4-7
 - rediff patch to fix build with new rpm
 



From pkgdb at fedoraproject.org  Mon Jan 26 22:43:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Jan 2009 22:43:24 +0000
Subject: [pkgdb] mingw32-glib2 was added for rjones
Message-ID: <20090126224324.7DD3C208494@bastion.fedora.phx.redhat.com>

kevin has added Package mingw32-glib2 with summary MinGW Windows GLib2 library
kevin has approved Package mingw32-glib2
kevin has added a Fedora devel branch for mingw32-glib2 with an owner of rjones
kevin has approved mingw32-glib2 in Fedora devel
kevin has approved Package mingw32-glib2
kevin has set commit to Approved for provenpackager on mingw32-glib2 (Fedora devel)
kevin has set build to Approved for provenpackager on mingw32-glib2 (Fedora devel)
kevin has set checkout to Approved for provenpackager on mingw32-glib2 (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-glib2



From pkgdb at fedoraproject.org  Mon Jan 26 22:43:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Jan 2009 22:43:27 +0000
Subject: [pkgdb] mingw32-glib2 (Fedora, devel) updated by kevin
Message-ID: <20090126224327.6FC1D2084B6@bastion.fedora.phx.redhat.com>

kevin approved watchbugzilla on mingw32-glib2 (Fedora devel) for berrange
kevin approved watchcommits on mingw32-glib2 (Fedora devel) for berrange
kevin approved commit on mingw32-glib2 (Fedora devel) for berrange
kevin approved build on mingw32-glib2 (Fedora devel) for berrange
kevin approved approveacls on mingw32-glib2 (Fedora devel) for berrange
kevin approved watchbugzilla on mingw32-glib2 (Fedora devel) for lfarkas
kevin approved watchcommits on mingw32-glib2 (Fedora devel) for lfarkas
kevin approved commit on mingw32-glib2 (Fedora devel) for lfarkas
kevin approved build on mingw32-glib2 (Fedora devel) for lfarkas
kevin approved approveacls on mingw32-glib2 (Fedora devel) for lfarkas

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-glib2



From pkgdb at fedoraproject.org  Mon Jan 26 22:43:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Jan 2009 22:43:27 +0000
Subject: [pkgdb] mingw32-glib2 (Fedora EPEL, 5) updated by kevin
Message-ID: <20090126224327.ED6A7208609@bastion.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for mingw32-glib2
kevin has set commit to Approved for provenpackager on mingw32-glib2 (Fedora EPEL 5)
kevin has set build to Approved for provenpackager on mingw32-glib2 (Fedora EPEL 5)
kevin has set checkout to Approved for provenpackager on mingw32-glib2 (Fedora EPEL 5)
kevin approved watchbugzilla on mingw32-glib2 (Fedora EPEL 5) for berrange
kevin approved watchcommits on mingw32-glib2 (Fedora EPEL 5) for berrange
kevin approved commit on mingw32-glib2 (Fedora EPEL 5) for berrange
kevin approved build on mingw32-glib2 (Fedora EPEL 5) for berrange
kevin approved approveacls on mingw32-glib2 (Fedora EPEL 5) for berrange
kevin approved watchbugzilla on mingw32-glib2 (Fedora EPEL 5) for lfarkas
kevin approved watchcommits on mingw32-glib2 (Fedora EPEL 5) for lfarkas
kevin approved commit on mingw32-glib2 (Fedora EPEL 5) for lfarkas
kevin approved build on mingw32-glib2 (Fedora EPEL 5) for lfarkas
kevin approved approveacls on mingw32-glib2 (Fedora EPEL 5) for lfarkas

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-glib2



From pkgdb at fedoraproject.org  Mon Jan 26 22:43:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Jan 2009 22:43:27 +0000
Subject: [pkgdb] mingw32-glib2 (Fedora, 10) updated by kevin
Message-ID: <20090126224328.7872A208480@bastion.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for mingw32-glib2
kevin has set commit to Approved for provenpackager on mingw32-glib2 (Fedora 10)
kevin has set build to Approved for provenpackager on mingw32-glib2 (Fedora 10)
kevin has set checkout to Approved for provenpackager on mingw32-glib2 (Fedora 10)
kevin approved watchbugzilla on mingw32-glib2 (Fedora 10) for berrange
kevin approved watchcommits on mingw32-glib2 (Fedora 10) for berrange
kevin approved commit on mingw32-glib2 (Fedora 10) for berrange
kevin approved build on mingw32-glib2 (Fedora 10) for berrange
kevin approved approveacls on mingw32-glib2 (Fedora 10) for berrange
kevin approved watchbugzilla on mingw32-glib2 (Fedora 10) for lfarkas
kevin approved watchcommits on mingw32-glib2 (Fedora 10) for lfarkas
kevin approved commit on mingw32-glib2 (Fedora 10) for lfarkas
kevin approved build on mingw32-glib2 (Fedora 10) for lfarkas
kevin approved approveacls on mingw32-glib2 (Fedora 10) for lfarkas

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-glib2



From kevin at fedoraproject.org  Mon Jan 26 22:43:45 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 26 Jan 2009 22:43:45 +0000 (UTC)
Subject: rpms/mingw32-glib2 - New directory
Message-ID: <20090126224345.4021F7010C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/mingw32-glib2
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsYW1380/rpms/mingw32-glib2

Log Message:
Directory /cvs/pkgs/rpms/mingw32-glib2 added to the repository




From kevin at fedoraproject.org  Mon Jan 26 22:43:45 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 26 Jan 2009 22:43:45 +0000 (UTC)
Subject: rpms/mingw32-glib2/devel - New directory
Message-ID: <20090126224345.9A5077010C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/mingw32-glib2/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsYW1380/rpms/mingw32-glib2/devel

Log Message:
Directory /cvs/pkgs/rpms/mingw32-glib2/devel added to the repository




From corsepiu at fedoraproject.org  Mon Jan 26 22:43:57 2009
From: corsepiu at fedoraproject.org (=?utf-8?q?Ralf_Cors=C3=A9pius?=)
Date: Mon, 26 Jan 2009 22:43:57 +0000 (UTC)
Subject: rpms/perl-Mail-POP3Client/devel import.log,1.1,NONE
Message-ID: <20090126224357.2AC587010C@cvs1.fedora.phx.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-Mail-POP3Client/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1421

Removed Files:
	import.log 
Log Message:
Remove.


--- import.log DELETED ---



From kevin at fedoraproject.org  Mon Jan 26 22:44:06 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 26 Jan 2009 22:44:06 +0000 (UTC)
Subject: rpms/mingw32-glib2 Makefile,NONE,1.1
Message-ID: <20090126224406.CC0227010C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/mingw32-glib2
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsYW1380/rpms/mingw32-glib2

Added Files:
	Makefile 
Log Message:
Setup of module mingw32-glib2


--- NEW FILE Makefile ---
# Top level Makefile for module mingw32-glib2
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Jan 26 22:44:07 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 26 Jan 2009 22:44:07 +0000 (UTC)
Subject: rpms/mingw32-glib2/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090126224407.41BBE7010C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/mingw32-glib2/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsYW1380/rpms/mingw32-glib2/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module mingw32-glib2


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: mingw32-glib2
# $Id: Makefile,v 1.1 2009/01/26 22:44:07 kevin Exp $
NAME := mingw32-glib2
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Jan 26 22:44:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Jan 2009 22:44:36 +0000
Subject: [pkgdb] mingw32-libxml2 was added for rjones
Message-ID: <20090126224436.D27BD208493@bastion.fedora.phx.redhat.com>

kevin has added Package mingw32-libxml2 with summary MinGW Windows libxml2 XML processing library
kevin has approved Package mingw32-libxml2
kevin has added a Fedora devel branch for mingw32-libxml2 with an owner of rjones
kevin has approved mingw32-libxml2 in Fedora devel
kevin has approved Package mingw32-libxml2
kevin has set commit to Approved for provenpackager on mingw32-libxml2 (Fedora devel)
kevin has set build to Approved for provenpackager on mingw32-libxml2 (Fedora devel)
kevin has set checkout to Approved for provenpackager on mingw32-libxml2 (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-libxml2



From pkgdb at fedoraproject.org  Mon Jan 26 22:44:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Jan 2009 22:44:39 +0000
Subject: [pkgdb] mingw32-libxml2 (Fedora EPEL, 5) updated by kevin
Message-ID: <20090126224439.D2FC52084A7@bastion.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for mingw32-libxml2
kevin has set commit to Approved for provenpackager on mingw32-libxml2 (Fedora EPEL 5)
kevin has set build to Approved for provenpackager on mingw32-libxml2 (Fedora EPEL 5)
kevin has set checkout to Approved for provenpackager on mingw32-libxml2 (Fedora EPEL 5)
kevin approved watchbugzilla on mingw32-libxml2 (Fedora EPEL 5) for berrange
kevin approved watchcommits on mingw32-libxml2 (Fedora EPEL 5) for berrange
kevin approved commit on mingw32-libxml2 (Fedora EPEL 5) for berrange
kevin approved build on mingw32-libxml2 (Fedora EPEL 5) for berrange
kevin approved approveacls on mingw32-libxml2 (Fedora EPEL 5) for berrange
kevin approved watchbugzilla on mingw32-libxml2 (Fedora EPEL 5) for lfarkas
kevin approved watchcommits on mingw32-libxml2 (Fedora EPEL 5) for lfarkas
kevin approved commit on mingw32-libxml2 (Fedora EPEL 5) for lfarkas
kevin approved build on mingw32-libxml2 (Fedora EPEL 5) for lfarkas
kevin approved approveacls on mingw32-libxml2 (Fedora EPEL 5) for lfarkas

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-libxml2



From pkgdb at fedoraproject.org  Mon Jan 26 22:44:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Jan 2009 22:44:39 +0000
Subject: [pkgdb] mingw32-libxml2 (Fedora, devel) updated by kevin
Message-ID: <20090126224440.B5C55208609@bastion.fedora.phx.redhat.com>

kevin approved watchbugzilla on mingw32-libxml2 (Fedora devel) for berrange
kevin approved watchcommits on mingw32-libxml2 (Fedora devel) for berrange
kevin approved commit on mingw32-libxml2 (Fedora devel) for berrange
kevin approved build on mingw32-libxml2 (Fedora devel) for berrange
kevin approved approveacls on mingw32-libxml2 (Fedora devel) for berrange
kevin approved watchbugzilla on mingw32-libxml2 (Fedora devel) for lfarkas
kevin approved watchcommits on mingw32-libxml2 (Fedora devel) for lfarkas
kevin approved commit on mingw32-libxml2 (Fedora devel) for lfarkas
kevin approved build on mingw32-libxml2 (Fedora devel) for lfarkas
kevin approved approveacls on mingw32-libxml2 (Fedora devel) for lfarkas

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-libxml2



From pkgdb at fedoraproject.org  Mon Jan 26 22:44:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Jan 2009 22:44:39 +0000
Subject: [pkgdb] mingw32-libxml2 (Fedora, 10) updated by kevin
Message-ID: <20090126224440.BED5220860D@bastion.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for mingw32-libxml2
kevin has set commit to Approved for provenpackager on mingw32-libxml2 (Fedora 10)
kevin has set build to Approved for provenpackager on mingw32-libxml2 (Fedora 10)
kevin has set checkout to Approved for provenpackager on mingw32-libxml2 (Fedora 10)
kevin approved watchbugzilla on mingw32-libxml2 (Fedora 10) for berrange
kevin approved watchcommits on mingw32-libxml2 (Fedora 10) for berrange
kevin approved commit on mingw32-libxml2 (Fedora 10) for berrange
kevin approved build on mingw32-libxml2 (Fedora 10) for berrange
kevin approved approveacls on mingw32-libxml2 (Fedora 10) for berrange
kevin approved watchbugzilla on mingw32-libxml2 (Fedora 10) for lfarkas
kevin approved watchcommits on mingw32-libxml2 (Fedora 10) for lfarkas
kevin approved commit on mingw32-libxml2 (Fedora 10) for lfarkas
kevin approved build on mingw32-libxml2 (Fedora 10) for lfarkas
kevin approved approveacls on mingw32-libxml2 (Fedora 10) for lfarkas

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-libxml2



From kevin at fedoraproject.org  Mon Jan 26 22:44:54 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 26 Jan 2009 22:44:54 +0000 (UTC)
Subject: rpms/mingw32-libxml2 - New directory
Message-ID: <20090126224454.2B0737010C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/mingw32-libxml2
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvszA1822/rpms/mingw32-libxml2

Log Message:
Directory /cvs/pkgs/rpms/mingw32-libxml2 added to the repository




From kevin at fedoraproject.org  Mon Jan 26 22:44:54 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 26 Jan 2009 22:44:54 +0000 (UTC)
Subject: rpms/mingw32-libxml2/devel - New directory
Message-ID: <20090126224454.C51337010C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/mingw32-libxml2/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvszA1822/rpms/mingw32-libxml2/devel

Log Message:
Directory /cvs/pkgs/rpms/mingw32-libxml2/devel added to the repository




From kevin at fedoraproject.org  Mon Jan 26 22:45:14 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 26 Jan 2009 22:45:14 +0000 (UTC)
Subject: rpms/mingw32-libxml2 Makefile,NONE,1.1
Message-ID: <20090126224514.5DAB47010C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/mingw32-libxml2
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvszA1822/rpms/mingw32-libxml2

Added Files:
	Makefile 
Log Message:
Setup of module mingw32-libxml2


--- NEW FILE Makefile ---
# Top level Makefile for module mingw32-libxml2
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Jan 26 22:45:14 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 26 Jan 2009 22:45:14 +0000 (UTC)
Subject: rpms/mingw32-libxml2/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090126224514.E92207010C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/mingw32-libxml2/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvszA1822/rpms/mingw32-libxml2/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module mingw32-libxml2


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: mingw32-libxml2
# $Id: Makefile,v 1.1 2009/01/26 22:45:14 kevin Exp $
NAME := mingw32-libxml2
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Jan 26 22:46:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Jan 2009 22:46:08 +0000
Subject: [pkgdb] pidgin-privacy-please was added for llaumgui
Message-ID: <20090126224608.9F9EA208485@bastion.fedora.phx.redhat.com>

kevin has added Package pidgin-privacy-please with summary Security and Privacy plugin for Pidgin
kevin has approved Package pidgin-privacy-please
kevin has added a Fedora devel branch for pidgin-privacy-please with an owner of llaumgui
kevin has approved pidgin-privacy-please in Fedora devel
kevin has approved Package pidgin-privacy-please
kevin has set commit to Approved for provenpackager on pidgin-privacy-please (Fedora devel)
kevin has set build to Approved for provenpackager on pidgin-privacy-please (Fedora devel)
kevin has set checkout to Approved for provenpackager on pidgin-privacy-please (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pidgin-privacy-please



From pkgdb at fedoraproject.org  Mon Jan 26 22:46:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Jan 2009 22:46:10 +0000
Subject: [pkgdb] pidgin-privacy-please (Fedora, 9) updated by kevin
Message-ID: <20090126224610.E7BC7208497@bastion.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for pidgin-privacy-please
kevin has set commit to Approved for provenpackager on pidgin-privacy-please (Fedora 9)
kevin has set build to Approved for provenpackager on pidgin-privacy-please (Fedora 9)
kevin has set checkout to Approved for provenpackager on pidgin-privacy-please (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pidgin-privacy-please



From kevin at fedoraproject.org  Mon Jan 26 22:46:28 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 26 Jan 2009 22:46:28 +0000 (UTC)
Subject: rpms/pidgin-privacy-please - New directory
Message-ID: <20090126224628.2EC3E7010C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/pidgin-privacy-please
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsZy2242/rpms/pidgin-privacy-please

Log Message:
Directory /cvs/pkgs/rpms/pidgin-privacy-please added to the repository




From pkgdb at fedoraproject.org  Mon Jan 26 22:46:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Jan 2009 22:46:10 +0000
Subject: [pkgdb] pidgin-privacy-please (Fedora, 10) updated by kevin
Message-ID: <20090126224611.0CDC82084B7@bastion.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for pidgin-privacy-please
kevin has set commit to Approved for provenpackager on pidgin-privacy-please (Fedora 10)
kevin has set build to Approved for provenpackager on pidgin-privacy-please (Fedora 10)
kevin has set checkout to Approved for provenpackager on pidgin-privacy-please (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pidgin-privacy-please



From rathann at fedoraproject.org  Mon Jan 26 22:46:37 2009
From: rathann at fedoraproject.org (Dominik Mierzejewski)
Date: Mon, 26 Jan 2009 22:46:37 +0000 (UTC)
Subject: rpms/dx/F-9 dx.spec,1.8,1.9
Message-ID: <20090126224637.07D8E7010C@cvs1.fedora.phx.redhat.com>

Author: rathann

Update of /cvs/pkgs/rpms/dx/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2158

Modified Files:
	dx.spec 
Log Message:
cosmetics: remove trailing whitespace


Index: dx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dx/F-9/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	26 Jan 2009 22:46:06 -0000	1.9
@@ -1,4 +1,4 @@
-Summary: Open source version of IBM's Visualization Data Explorer 
+Summary: Open source version of IBM's Visualization Data Explorer
 Name: dx
 Version: 4.4.4
 Release: 6%{?dist}
@@ -71,7 +71,7 @@
 	--enable-smp-linux \
 	--enable-new-keylayout \
 	--with-rsh=%{_bindir}/ssh
-                        
+
 make %{?_smp_mflags}
 
 %install



From kevin at fedoraproject.org  Mon Jan 26 22:46:28 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 26 Jan 2009 22:46:28 +0000 (UTC)
Subject: rpms/pidgin-privacy-please/devel - New directory
Message-ID: <20090126224628.83FBC7010C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/pidgin-privacy-please/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsZy2242/rpms/pidgin-privacy-please/devel

Log Message:
Directory /cvs/pkgs/rpms/pidgin-privacy-please/devel added to the repository




From kevin at fedoraproject.org  Mon Jan 26 22:46:51 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 26 Jan 2009 22:46:51 +0000 (UTC)
Subject: rpms/pidgin-privacy-please Makefile,NONE,1.1
Message-ID: <20090126224651.BBB567010C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/pidgin-privacy-please
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsZy2242/rpms/pidgin-privacy-please

Added Files:
	Makefile 
Log Message:
Setup of module pidgin-privacy-please


--- NEW FILE Makefile ---
# Top level Makefile for module pidgin-privacy-please
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Jan 26 22:46:52 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 26 Jan 2009 22:46:52 +0000 (UTC)
Subject: rpms/pidgin-privacy-please/devel .cvsignore, NONE, 1.1 Makefile,
	NONE, 1.1 sources, NONE, 1.1
Message-ID: <20090126224652.33EE37010C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/pidgin-privacy-please/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsZy2242/rpms/pidgin-privacy-please/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module pidgin-privacy-please


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: pidgin-privacy-please
# $Id: Makefile,v 1.1 2009/01/26 22:46:52 kevin Exp $
NAME := pidgin-privacy-please
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From allisson at fedoraproject.org  Mon Jan 26 22:47:30 2009
From: allisson at fedoraproject.org (Allisson Azevedo)
Date: Mon, 26 Jan 2009 22:47:30 +0000 (UTC)
Subject: rpms/perl-MooseX-Async/F-9 import.log, NONE,
	1.1 perl-MooseX-Async.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090126224730.2FCE37010C@cvs1.fedora.phx.redhat.com>

Author: allisson

Update of /cvs/pkgs/rpms/perl-MooseX-Async/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2271/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-MooseX-Async.spec 
Log Message:

First import for F-9.



--- NEW FILE import.log ---
perl-MooseX-Async-0_07-1_fc10:F-9:perl-MooseX-Async-0.07-1.fc10.src.rpm:1233009793


--- NEW FILE perl-MooseX-Async.spec ---
%define tarname MooseX-Async
Name:           perl-MooseX-Async
Version:        0.07
Release:        1%{?dist}
Summary:        Set of Metaclasses for MooseX::POE and it's siblings

Group:          Development/Libraries
License:        GPL+ or Artistic
URL:            http://search.cpan.org/dist/MooseX-Async/
Source0:        http://search.cpan.org/CPAN/authors/id/P/PE/PERIGRIN/%{tarname}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
# Correct for lots of packages, other common choices include eg. Module::Build
BuildRequires:  perl(ExtUtils::MakeMaker) perl(Test::More) perl(Moose)
BuildRequires:  perl(MooseX::AttributeHelpers)
Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
MooseX::Async is a set of Metaclasses for MooseX::POE and it's siblings.

%prep
%setup -q -n MooseX-Async-%{version}


%build
# Remove OPTIMIZE=... from noarch packages (unneeded)
%{__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 {} ';'
# Remove the next line from noarch packages (unneeded)
find $RPM_BUILD_ROOT -type f -name '*.bs' -a -size 0 -exec rm -f {} ';'
find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null ';'
chmod -R u+w $RPM_BUILD_ROOT/*


%check
make test


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc
# For noarch packages: vendorlib
%{perl_vendorlib}/*
# For arch-specific packages: vendorarch
#%{perl_vendorarch}/*
#%exclude %dir %{perl_vendorarch}/auto/
%{_mandir}/man3/*.3*


%changelog

* Sat May 24 2008 Allisson Azevedo <allisson at gmail.com> 0.07-1
- Initial RPM release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-MooseX-Async/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	26 Jan 2009 22:28:41 -0000	1.1
+++ .cvsignore	26 Jan 2009 22:46:59 -0000	1.2
@@ -0,0 +1 @@
+MooseX-Async-0.07.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-MooseX-Async/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	26 Jan 2009 22:28:42 -0000	1.1
+++ sources	26 Jan 2009 22:46:59 -0000	1.2
@@ -0,0 +1 @@
+bddb5edbe0e3e325d84eb4e5c6a49e7d  MooseX-Async-0.07.tar.gz



From corsepiu at fedoraproject.org  Mon Jan 26 22:47:43 2009
From: corsepiu at fedoraproject.org (=?utf-8?q?Ralf_Cors=C3=A9pius?=)
Date: Mon, 26 Jan 2009 22:47:43 +0000 (UTC)
Subject: rpms/perl-Mail-POP3Client/F-10 perl-Mail-POP3Client.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090126224743.95D747010C@cvs1.fedora.phx.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-Mail-POP3Client/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2529

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Mail-POP3Client.spec 
Log Message:
Import.


--- NEW FILE perl-Mail-POP3Client.spec ---
Name:           perl-Mail-POP3Client
Version:        2.18
Release:        1%{?dist}
Summary:        Perl 5 module to talk to a POP3 (RFC1939) server
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Mail-POP3Client/
Source0:        http://www.cpan.org/authors/id/S/SD/SDOWD/Mail-POP3Client-%{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
This module implements an Object-Oriented interface to a POP3 server. It
implements RFC1939 (http://www.faqs.org/rfcs/rfc1939.html)

%prep
%setup -q -n Mail-POP3Client-%{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 FAQ README
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Sat Jan 24 2009 Ralf Cors??pius <corsepiu at fedoraproject.org> 2.18-1
- Specfile autogenerated by cpanspec 1.77.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Mail-POP3Client/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	26 Jan 2009 22:24:57 -0000	1.1
+++ .cvsignore	26 Jan 2009 22:47:13 -0000	1.2
@@ -0,0 +1 @@
+Mail-POP3Client-2.18.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Mail-POP3Client/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	26 Jan 2009 22:24:57 -0000	1.1
+++ sources	26 Jan 2009 22:47:13 -0000	1.2
@@ -0,0 +1 @@
+27b99775072f6ad4b585f7484c47405d  Mail-POP3Client-2.18.tar.gz



From rathann at fedoraproject.org  Mon Jan 26 22:49:12 2009
From: rathann at fedoraproject.org (Dominik Mierzejewski)
Date: Mon, 26 Jan 2009 22:49:12 +0000 (UTC)
Subject: rpms/dx/F-9 dx-errno.patch,NONE,1.1 dx.spec,1.9,1.10
Message-ID: <20090126224912.41D1C7010C@cvs1.fedora.phx.redhat.com>

Author: rathann

Update of /cvs/pkgs/rpms/dx/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3070

Modified Files:
	dx.spec 
Added Files:
	dx-errno.patch 
Log Message:
* Mon Jan 26 2009 Dominik Mierzejewski <rpm at greysector.net> 4.4.4-7
- fix leftover dxexec process consuming 100% CPU after quitting (bug #469664)


dx-errno.patch:

--- NEW FILE dx-errno.patch ---
diff -up dx-4.4.4/src/exec/dpexec/lex.c.errno dx-4.4.4/src/exec/dpexec/lex.c
--- dx-4.4.4/src/exec/dpexec/lex.c.errno	2006-01-09 23:57:34.000000000 +0100
+++ dx-4.4.4/src/exec/dpexec/lex.c	2009-01-26 19:16:20.000000000 +0100
@@ -504,6 +504,7 @@ int yylex(YYSTYPE *lvalp)
     for (;;)
     {
 	yyleng = 0;
+	errno = 0;
  
 	c = input();
  


Index: dx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dx/F-9/dx.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- dx.spec	26 Jan 2009 22:46:06 -0000	1.9
+++ dx.spec	26 Jan 2009 22:48:41 -0000	1.10
@@ -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
@@ -9,6 +9,8 @@
 Patch0: %{name}-rpm.patch
 Patch1: %{name}-open.patch
 Patch2: %{name}-gcc43.patch
+# fixes http://www.opendx.org/bugs/view.php?id=236
+Patch3: %{name}-errno.patch
 License: IBM
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: bison
@@ -57,6 +59,7 @@
 %patch0 -p1 -b .r
 %patch1 -p1 -b .open
 %patch2 -p1 -b .gcc43
+%patch3 -p1 -b .errno
 # fix debuginfo rpmlint warnings
 chmod a-x src/exec/{dxmods,dpexec,hwrender}/*.{c,h}
 
@@ -121,6 +124,9 @@
 %{_libdir}/lib*.so
 
 %changelog
+* Mon Jan 26 2009 Dominik Mierzejewski <rpm at greysector.net> 4.4.4-7
+- fix leftover dxexec process consuming 100% CPU after quitting (bug #469664)
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 4.4.4-6
 - Autorebuild for GCC 4.3
 



From corsepiu at fedoraproject.org  Mon Jan 26 22:49:31 2009
From: corsepiu at fedoraproject.org (=?utf-8?q?Ralf_Cors=C3=A9pius?=)
Date: Mon, 26 Jan 2009 22:49:31 +0000 (UTC)
Subject: rpms/perl-Mail-POP3Client/F-9 perl-Mail-POP3Client.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090126224931.704537010C@cvs1.fedora.phx.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-Mail-POP3Client/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3212

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Mail-POP3Client.spec 
Log Message:
Import.


--- NEW FILE perl-Mail-POP3Client.spec ---
Name:           perl-Mail-POP3Client
Version:        2.18
Release:        1%{?dist}
Summary:        Perl 5 module to talk to a POP3 (RFC1939) server
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Mail-POP3Client/
Source0:        http://www.cpan.org/authors/id/S/SD/SDOWD/Mail-POP3Client-%{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
This module implements an Object-Oriented interface to a POP3 server. It
implements RFC1939 (http://www.faqs.org/rfcs/rfc1939.html)

%prep
%setup -q -n Mail-POP3Client-%{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 FAQ README
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Sat Jan 24 2009 Ralf Cors??pius <corsepiu at fedoraproject.org> 2.18-1
- Specfile autogenerated by cpanspec 1.77.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Mail-POP3Client/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	26 Jan 2009 22:24:57 -0000	1.1
+++ .cvsignore	26 Jan 2009 22:49:01 -0000	1.2
@@ -0,0 +1 @@
+Mail-POP3Client-2.18.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Mail-POP3Client/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	26 Jan 2009 22:24:57 -0000	1.1
+++ sources	26 Jan 2009 22:49:01 -0000	1.2
@@ -0,0 +1 @@
+27b99775072f6ad4b585f7484c47405d  Mail-POP3Client-2.18.tar.gz



From pkgdb at fedoraproject.org  Mon Jan 26 22:49:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Jan 2009 22:49:41 +0000
Subject: [pkgdb] chisholm-to-be-continued-fonts was added for herlo
Message-ID: <20090126224941.D04FC2086F0@bastion.fedora.phx.redhat.com>

kevin has added Package chisholm-to-be-continued-fonts with summary To Be Continued is a decorative/graffiti sans-serif font
kevin has approved Package chisholm-to-be-continued-fonts
kevin has added a Fedora devel branch for chisholm-to-be-continued-fonts with an owner of herlo
kevin has approved chisholm-to-be-continued-fonts in Fedora devel
kevin has approved Package chisholm-to-be-continued-fonts
kevin has set commit to Approved for provenpackager on chisholm-to-be-continued-fonts (Fedora devel)
kevin has set build to Approved for provenpackager on chisholm-to-be-continued-fonts (Fedora devel)
kevin has set checkout to Approved for provenpackager on chisholm-to-be-continued-fonts (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/chisholm-to-be-continued-fonts



From pkgdb at fedoraproject.org  Mon Jan 26 22:49:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Jan 2009 22:49:43 +0000
Subject: [pkgdb] chisholm-to-be-continued-fonts (Fedora, 9) updated by kevin
Message-ID: <20090126224943.AC7D0208605@bastion.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for chisholm-to-be-continued-fonts
kevin has set commit to Approved for provenpackager on chisholm-to-be-continued-fonts (Fedora 9)
kevin has set build to Approved for provenpackager on chisholm-to-be-continued-fonts (Fedora 9)
kevin has set checkout to Approved for provenpackager on chisholm-to-be-continued-fonts (Fedora 9)
kevin approved watchbugzilla on chisholm-to-be-continued-fonts (Fedora 9) for fonts-sig
kevin approved watchcommits on chisholm-to-be-continued-fonts (Fedora 9) for fonts-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/chisholm-to-be-continued-fonts



From pkgdb at fedoraproject.org  Mon Jan 26 22:49:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Jan 2009 22:49:43 +0000
Subject: [pkgdb] chisholm-to-be-continued-fonts (Fedora, 10) updated by kevin
Message-ID: <20090126224943.BA2EE2086F2@bastion.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for chisholm-to-be-continued-fonts
kevin has set commit to Approved for provenpackager on chisholm-to-be-continued-fonts (Fedora 10)
kevin has set build to Approved for provenpackager on chisholm-to-be-continued-fonts (Fedora 10)
kevin has set checkout to Approved for provenpackager on chisholm-to-be-continued-fonts (Fedora 10)
kevin approved watchbugzilla on chisholm-to-be-continued-fonts (Fedora 10) for fonts-sig
kevin approved watchcommits on chisholm-to-be-continued-fonts (Fedora 10) for fonts-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/chisholm-to-be-continued-fonts



From kevin at fedoraproject.org  Mon Jan 26 22:49:56 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 26 Jan 2009 22:49:56 +0000 (UTC)
Subject: rpms/chisholm-to-be-continued-fonts - New directory
Message-ID: <20090126224956.2965F7010C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/chisholm-to-be-continued-fonts
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvspN3490/rpms/chisholm-to-be-continued-fonts

Log Message:
Directory /cvs/pkgs/rpms/chisholm-to-be-continued-fonts added to the repository




From kevin at fedoraproject.org  Mon Jan 26 22:49:56 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 26 Jan 2009 22:49:56 +0000 (UTC)
Subject: rpms/chisholm-to-be-continued-fonts/devel - New directory
Message-ID: <20090126224956.635247010C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/chisholm-to-be-continued-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvspN3490/rpms/chisholm-to-be-continued-fonts/devel

Log Message:
Directory /cvs/pkgs/rpms/chisholm-to-be-continued-fonts/devel added to the repository




From pkgdb at fedoraproject.org  Mon Jan 26 22:49:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Jan 2009 22:49:43 +0000
Subject: [pkgdb] chisholm-to-be-continued-fonts (Fedora,
	devel) updated by kevin
Message-ID: <20090126224943.C4221208701@bastion.fedora.phx.redhat.com>

kevin approved watchbugzilla on chisholm-to-be-continued-fonts (Fedora devel) for fonts-sig
kevin approved watchcommits on chisholm-to-be-continued-fonts (Fedora devel) for fonts-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/chisholm-to-be-continued-fonts



From kevin at fedoraproject.org  Mon Jan 26 22:50:13 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 26 Jan 2009 22:50:13 +0000 (UTC)
Subject: rpms/chisholm-to-be-continued-fonts Makefile,NONE,1.1
Message-ID: <20090126225013.806E07010C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/chisholm-to-be-continued-fonts
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvspN3490/rpms/chisholm-to-be-continued-fonts

Added Files:
	Makefile 
Log Message:
Setup of module chisholm-to-be-continued-fonts


--- NEW FILE Makefile ---
# Top level Makefile for module chisholm-to-be-continued-fonts
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Mon Jan 26 22:50:14 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 26 Jan 2009 22:50:14 +0000 (UTC)
Subject: rpms/chisholm-to-be-continued-fonts/devel .cvsignore, NONE,
	1.1 Makefile, NONE, 1.1 sources, NONE, 1.1
Message-ID: <20090126225014.205107010C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/chisholm-to-be-continued-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvspN3490/rpms/chisholm-to-be-continued-fonts/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module chisholm-to-be-continued-fonts


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: chisholm-to-be-continued-fonts
# $Id: Makefile,v 1.1 2009/01/26 22:50:13 kevin Exp $
NAME := chisholm-to-be-continued-fonts
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From allisson at fedoraproject.org  Mon Jan 26 22:51:01 2009
From: allisson at fedoraproject.org (Allisson Azevedo)
Date: Mon, 26 Jan 2009 22:51:01 +0000 (UTC)
Subject: rpms/perl-MooseX-Async/F-10 import.log, NONE,
	1.1 perl-MooseX-Async.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090126225101.B38B47010C@cvs1.fedora.phx.redhat.com>

Author: allisson

Update of /cvs/pkgs/rpms/perl-MooseX-Async/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3390/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-MooseX-Async.spec 
Log Message:

First import for F-10



--- NEW FILE import.log ---
perl-MooseX-Async-0_07-1_fc10:F-10:perl-MooseX-Async-0.07-1.fc10.src.rpm:1233009997


--- NEW FILE perl-MooseX-Async.spec ---
%define tarname MooseX-Async
Name:           perl-MooseX-Async
Version:        0.07
Release:        1%{?dist}
Summary:        Set of Metaclasses for MooseX::POE and it's siblings

Group:          Development/Libraries
License:        GPL+ or Artistic
URL:            http://search.cpan.org/dist/MooseX-Async/
Source0:        http://search.cpan.org/CPAN/authors/id/P/PE/PERIGRIN/%{tarname}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
# Correct for lots of packages, other common choices include eg. Module::Build
BuildRequires:  perl(ExtUtils::MakeMaker) perl(Test::More) perl(Moose)
BuildRequires:  perl(MooseX::AttributeHelpers)
Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
MooseX::Async is a set of Metaclasses for MooseX::POE and it's siblings.

%prep
%setup -q -n MooseX-Async-%{version}


%build
# Remove OPTIMIZE=... from noarch packages (unneeded)
%{__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 {} ';'
# Remove the next line from noarch packages (unneeded)
find $RPM_BUILD_ROOT -type f -name '*.bs' -a -size 0 -exec rm -f {} ';'
find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null ';'
chmod -R u+w $RPM_BUILD_ROOT/*


%check
make test


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc
# For noarch packages: vendorlib
%{perl_vendorlib}/*
# For arch-specific packages: vendorarch
#%{perl_vendorarch}/*
#%exclude %dir %{perl_vendorarch}/auto/
%{_mandir}/man3/*.3*


%changelog

* Sat May 24 2008 Allisson Azevedo <allisson at gmail.com> 0.07-1
- Initial RPM release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-MooseX-Async/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	26 Jan 2009 22:28:41 -0000	1.1
+++ .cvsignore	26 Jan 2009 22:50:31 -0000	1.2
@@ -0,0 +1 @@
+MooseX-Async-0.07.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-MooseX-Async/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	26 Jan 2009 22:28:42 -0000	1.1
+++ sources	26 Jan 2009 22:50:31 -0000	1.2
@@ -0,0 +1 @@
+bddb5edbe0e3e325d84eb4e5c6a49e7d  MooseX-Async-0.07.tar.gz



From pkgdb at fedoraproject.org  Mon Jan 26 22:52:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Jan 2009 22:52:11 +0000
Subject: [pkgdb] purple-msn-pecan was added for itamarjp
Message-ID: <20090126225211.7ACED208493@bastion.fedora.phx.redhat.com>

kevin has added Package purple-msn-pecan with summary Alternative MSN protocol plugin for libpurple
kevin has approved Package purple-msn-pecan
kevin has added a Fedora devel branch for purple-msn-pecan with an owner of itamarjp
kevin has approved purple-msn-pecan in Fedora devel
kevin has approved Package purple-msn-pecan
kevin has set commit to Approved for provenpackager on purple-msn-pecan (Fedora devel)
kevin has set build to Approved for provenpackager on purple-msn-pecan (Fedora devel)
kevin has set checkout to Approved for provenpackager on purple-msn-pecan (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/purple-msn-pecan



From pkgdb at fedoraproject.org  Mon Jan 26 22:52:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Jan 2009 22:52:15 +0000
Subject: [pkgdb] purple-msn-pecan (Fedora, 9) updated by kevin
Message-ID: <20090126225215.45E3220860E@bastion.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for purple-msn-pecan
kevin has set commit to Approved for provenpackager on purple-msn-pecan (Fedora 9)
kevin has set build to Approved for provenpackager on purple-msn-pecan (Fedora 9)
kevin has set checkout to Approved for provenpackager on purple-msn-pecan (Fedora 9)
kevin approved watchbugzilla on purple-msn-pecan (Fedora 9) for madko
kevin approved watchcommits on purple-msn-pecan (Fedora 9) for madko
kevin approved commit on purple-msn-pecan (Fedora 9) for madko
kevin approved build on purple-msn-pecan (Fedora 9) for madko
kevin approved approveacls on purple-msn-pecan (Fedora 9) for madko

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/purple-msn-pecan



From pkgdb at fedoraproject.org  Mon Jan 26 22:52:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Jan 2009 22:52:15 +0000
Subject: [pkgdb] purple-msn-pecan (Fedora, 10) updated by kevin
Message-ID: <20090126225215.82D19208678@bastion.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for purple-msn-pecan
kevin has set commit to Approved for provenpackager on purple-msn-pecan (Fedora 10)
kevin has set build to Approved for provenpackager on purple-msn-pecan (Fedora 10)
kevin has set checkout to Approved for provenpackager on purple-msn-pecan (Fedora 10)
kevin approved watchbugzilla on purple-msn-pecan (Fedora 10) for madko
kevin approved watchcommits on purple-msn-pecan (Fedora 10) for madko
kevin approved commit on purple-msn-pecan (Fedora 10) for madko
kevin approved build on purple-msn-pecan (Fedora 10) for madko
kevin approved approveacls on purple-msn-pecan (Fedora 10) for madko

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/purple-msn-pecan



From pkgdb at fedoraproject.org  Mon Jan 26 22:52:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Jan 2009 22:52:15 +0000
Subject: [pkgdb] purple-msn-pecan (Fedora, devel) updated by kevin
Message-ID: <20090126225215.8AAC32086F7@bastion.fedora.phx.redhat.com>

kevin approved watchbugzilla on purple-msn-pecan (Fedora devel) for madko
kevin approved watchcommits on purple-msn-pecan (Fedora devel) for madko
kevin approved commit on purple-msn-pecan (Fedora devel) for madko
kevin approved build on purple-msn-pecan (Fedora devel) for madko
kevin approved approveacls on purple-msn-pecan (Fedora devel) for madko

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/purple-msn-pecan



From kevin at fedoraproject.org  Mon Jan 26 22:52:59 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 26 Jan 2009 22:52:59 +0000 (UTC)
Subject: rpms/purple-msn-pecan - New directory
Message-ID: <20090126225259.239B07010C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/purple-msn-pecan
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsiT4276/rpms/purple-msn-pecan

Log Message:
Directory /cvs/pkgs/rpms/purple-msn-pecan added to the repository




From kevin at fedoraproject.org  Mon Jan 26 22:52:59 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 26 Jan 2009 22:52:59 +0000 (UTC)
Subject: rpms/purple-msn-pecan/devel - New directory
Message-ID: <20090126225259.6174B7010C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/purple-msn-pecan/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsiT4276/rpms/purple-msn-pecan/devel

Log Message:
Directory /cvs/pkgs/rpms/purple-msn-pecan/devel added to the repository




From kevin at fedoraproject.org  Mon Jan 26 22:53:16 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 26 Jan 2009 22:53:16 +0000 (UTC)
Subject: rpms/purple-msn-pecan Makefile,NONE,1.1
Message-ID: <20090126225316.C762E7010C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/purple-msn-pecan
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsiT4276/rpms/purple-msn-pecan

Added Files:
	Makefile 
Log Message:
Setup of module purple-msn-pecan


--- NEW FILE Makefile ---
# Top level Makefile for module purple-msn-pecan
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Jan 26 22:53:17 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 26 Jan 2009 22:53:17 +0000 (UTC)
Subject: rpms/purple-msn-pecan/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090126225317.490B27010C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/purple-msn-pecan/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsiT4276/rpms/purple-msn-pecan/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module purple-msn-pecan


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: purple-msn-pecan
# $Id: Makefile,v 1.1 2009/01/26 22:53:17 kevin Exp $
NAME := purple-msn-pecan
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From allisson at fedoraproject.org  Mon Jan 26 22:53:25 2009
From: allisson at fedoraproject.org (Allisson Azevedo)
Date: Mon, 26 Jan 2009 22:53:25 +0000 (UTC)
Subject: rpms/perl-MooseX-Async/devel import.log, NONE,
	1.1 perl-MooseX-Async.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090126225325.968687010C@cvs1.fedora.phx.redhat.com>

Author: allisson

Update of /cvs/pkgs/rpms/perl-MooseX-Async/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4176/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-MooseX-Async.spec 
Log Message:

First import for devel.



--- NEW FILE import.log ---
perl-MooseX-Async-0_07-1_fc10:HEAD:perl-MooseX-Async-0.07-1.fc10.src.rpm:1233010211


--- NEW FILE perl-MooseX-Async.spec ---
%define tarname MooseX-Async
Name:           perl-MooseX-Async
Version:        0.07
Release:        1%{?dist}
Summary:        Set of Metaclasses for MooseX::POE and it's siblings

Group:          Development/Libraries
License:        GPL+ or Artistic
URL:            http://search.cpan.org/dist/MooseX-Async/
Source0:        http://search.cpan.org/CPAN/authors/id/P/PE/PERIGRIN/%{tarname}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
# Correct for lots of packages, other common choices include eg. Module::Build
BuildRequires:  perl(ExtUtils::MakeMaker) perl(Test::More) perl(Moose)
BuildRequires:  perl(MooseX::AttributeHelpers)
Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
MooseX::Async is a set of Metaclasses for MooseX::POE and it's siblings.

%prep
%setup -q -n MooseX-Async-%{version}


%build
# Remove OPTIMIZE=... from noarch packages (unneeded)
%{__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 {} ';'
# Remove the next line from noarch packages (unneeded)
find $RPM_BUILD_ROOT -type f -name '*.bs' -a -size 0 -exec rm -f {} ';'
find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null ';'
chmod -R u+w $RPM_BUILD_ROOT/*


%check
make test


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc
# For noarch packages: vendorlib
%{perl_vendorlib}/*
# For arch-specific packages: vendorarch
#%{perl_vendorarch}/*
#%exclude %dir %{perl_vendorarch}/auto/
%{_mandir}/man3/*.3*


%changelog

* Sat May 24 2008 Allisson Azevedo <allisson at gmail.com> 0.07-1
- Initial RPM release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-MooseX-Async/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	26 Jan 2009 22:28:41 -0000	1.1
+++ .cvsignore	26 Jan 2009 22:52:55 -0000	1.2
@@ -0,0 +1 @@
+MooseX-Async-0.07.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-MooseX-Async/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	26 Jan 2009 22:28:42 -0000	1.1
+++ sources	26 Jan 2009 22:52:55 -0000	1.2
@@ -0,0 +1 @@
+bddb5edbe0e3e325d84eb4e5c6a49e7d  MooseX-Async-0.07.tar.gz



From pkgdb at fedoraproject.org  Mon Jan 26 22:53:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Jan 2009 22:53:35 +0000
Subject: [pkgdb] libnss-pgsql was added for madko
Message-ID: <20090126225335.92D7B208494@bastion.fedora.phx.redhat.com>

kevin has added Package libnss-pgsql with summary Name Service Switch library that interface with PostgreSQL
kevin has approved Package libnss-pgsql
kevin has added a Fedora devel branch for libnss-pgsql with an owner of madko
kevin has approved libnss-pgsql in Fedora devel
kevin has approved Package libnss-pgsql
kevin has set commit to Approved for provenpackager on libnss-pgsql (Fedora devel)
kevin has set build to Approved for provenpackager on libnss-pgsql (Fedora devel)
kevin has set checkout to Approved for provenpackager on libnss-pgsql (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libnss-pgsql



From pkgdb at fedoraproject.org  Mon Jan 26 22:53:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Jan 2009 22:53:36 +0000
Subject: [pkgdb] libnss-pgsql (Fedora, 9) updated by kevin
Message-ID: <20090126225336.EA34B2084B6@bastion.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for libnss-pgsql
kevin has set commit to Approved for provenpackager on libnss-pgsql (Fedora 9)
kevin has set build to Approved for provenpackager on libnss-pgsql (Fedora 9)
kevin has set checkout to Approved for provenpackager on libnss-pgsql (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libnss-pgsql



From pkgdb at fedoraproject.org  Mon Jan 26 22:53:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Jan 2009 22:53:36 +0000
Subject: [pkgdb] libnss-pgsql (Fedora, 10) updated by kevin
Message-ID: <20090126225336.F34F42084BD@bastion.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for libnss-pgsql
kevin has set commit to Approved for provenpackager on libnss-pgsql (Fedora 10)
kevin has set build to Approved for provenpackager on libnss-pgsql (Fedora 10)
kevin has set checkout to Approved for provenpackager on libnss-pgsql (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libnss-pgsql



From kevin at fedoraproject.org  Mon Jan 26 22:54:00 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 26 Jan 2009 22:54:00 +0000 (UTC)
Subject: rpms/libnss-pgsql/devel - New directory
Message-ID: <20090126225400.746EB7010C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/libnss-pgsql/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsYS4661/rpms/libnss-pgsql/devel

Log Message:
Directory /cvs/pkgs/rpms/libnss-pgsql/devel added to the repository




From kevin at fedoraproject.org  Mon Jan 26 22:54:00 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 26 Jan 2009 22:54:00 +0000 (UTC)
Subject: rpms/libnss-pgsql - New directory
Message-ID: <20090126225400.2D46D7010C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/libnss-pgsql
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsYS4661/rpms/libnss-pgsql

Log Message:
Directory /cvs/pkgs/rpms/libnss-pgsql added to the repository




From kevin at fedoraproject.org  Mon Jan 26 22:54:20 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 26 Jan 2009 22:54:20 +0000 (UTC)
Subject: rpms/libnss-pgsql Makefile,NONE,1.1
Message-ID: <20090126225420.703E37010C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/libnss-pgsql
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsYS4661/rpms/libnss-pgsql

Added Files:
	Makefile 
Log Message:
Setup of module libnss-pgsql


--- NEW FILE Makefile ---
# Top level Makefile for module libnss-pgsql
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Jan 26 22:54:20 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 26 Jan 2009 22:54:20 +0000 (UTC)
Subject: rpms/libnss-pgsql/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090126225420.CA48E7010C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/libnss-pgsql/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsYS4661/rpms/libnss-pgsql/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module libnss-pgsql


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: libnss-pgsql
# $Id: Makefile,v 1.1 2009/01/26 22:54:20 kevin Exp $
NAME := libnss-pgsql
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Jan 26 22:55:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Jan 2009 22:55:44 +0000
Subject: [pkgdb] apanov-edrip-fonts was added for nim
Message-ID: <20090126225545.74C0A208484@bastion.fedora.phx.redhat.com>

kevin has added Package apanov-edrip-fonts with summary A decorative contrast sans-serif font
kevin has approved Package apanov-edrip-fonts
kevin has added a Fedora devel branch for apanov-edrip-fonts with an owner of nim
kevin has approved apanov-edrip-fonts in Fedora devel
kevin has approved Package apanov-edrip-fonts
kevin has set commit to Approved for provenpackager on apanov-edrip-fonts (Fedora devel)
kevin has set build to Approved for provenpackager on apanov-edrip-fonts (Fedora devel)
kevin has set checkout to Approved for provenpackager on apanov-edrip-fonts (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/apanov-edrip-fonts



From pkgdb at fedoraproject.org  Mon Jan 26 22:55:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Jan 2009 22:55:46 +0000
Subject: [pkgdb] apanov-edrip-fonts (Fedora, devel) updated by kevin
Message-ID: <20090126225546.BE756208494@bastion.fedora.phx.redhat.com>

kevin approved watchbugzilla on apanov-edrip-fonts (Fedora devel) for fonts-sig
kevin approved watchcommits on apanov-edrip-fonts (Fedora devel) for fonts-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/apanov-edrip-fonts



From kevin at fedoraproject.org  Mon Jan 26 22:56:00 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 26 Jan 2009 22:56:00 +0000 (UTC)
Subject: rpms/apanov-edrip-fonts - New directory
Message-ID: <20090126225600.3EA187010C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/apanov-edrip-fonts
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsYe5271/rpms/apanov-edrip-fonts

Log Message:
Directory /cvs/pkgs/rpms/apanov-edrip-fonts added to the repository




From kevin at fedoraproject.org  Mon Jan 26 22:56:00 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 26 Jan 2009 22:56:00 +0000 (UTC)
Subject: rpms/apanov-edrip-fonts/devel - New directory
Message-ID: <20090126225600.6EC027010C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/apanov-edrip-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsYe5271/rpms/apanov-edrip-fonts/devel

Log Message:
Directory /cvs/pkgs/rpms/apanov-edrip-fonts/devel added to the repository




From kevin at fedoraproject.org  Mon Jan 26 22:56:20 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 26 Jan 2009 22:56:20 +0000 (UTC)
Subject: rpms/apanov-edrip-fonts Makefile,NONE,1.1
Message-ID: <20090126225620.A20597010C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/apanov-edrip-fonts
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsYe5271/rpms/apanov-edrip-fonts

Added Files:
	Makefile 
Log Message:
Setup of module apanov-edrip-fonts


--- NEW FILE Makefile ---
# Top level Makefile for module apanov-edrip-fonts
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Mon Jan 26 22:56:20 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 26 Jan 2009 22:56:20 +0000 (UTC)
Subject: rpms/apanov-edrip-fonts/devel .cvsignore, NONE, 1.1 Makefile, NONE, 
	1.1 sources, NONE, 1.1
Message-ID: <20090126225620.EED287010C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/apanov-edrip-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsYe5271/rpms/apanov-edrip-fonts/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module apanov-edrip-fonts


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: apanov-edrip-fonts
# $Id: Makefile,v 1.1 2009/01/26 22:56:20 kevin Exp $
NAME := apanov-edrip-fonts
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Mon Jan 26 22:59:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Jan 2009 22:59:22 +0000
Subject: [pkgdb] sil-charis-fonts was added for nim
Message-ID: <20090126225922.B5AA2208484@bastion.fedora.phx.redhat.com>

kevin has added Package sil-charis-fonts with summary A decorative contrast sans-serif font
kevin has approved Package sil-charis-fonts
kevin has added a Fedora devel branch for sil-charis-fonts with an owner of nim
kevin has approved sil-charis-fonts in Fedora devel
kevin has approved Package sil-charis-fonts
kevin has set commit to Approved for provenpackager on sil-charis-fonts (Fedora devel)
kevin has set build to Approved for provenpackager on sil-charis-fonts (Fedora devel)
kevin has set checkout to Approved for provenpackager on sil-charis-fonts (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sil-charis-fonts



From pkgdb at fedoraproject.org  Mon Jan 26 22:59:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Jan 2009 22:59:30 +0000
Subject: [pkgdb] sil-charis-fonts (Fedora, devel) updated by kevin
Message-ID: <20090126225930.1CB45208497@bastion.fedora.phx.redhat.com>

kevin approved watchbugzilla on sil-charis-fonts (Fedora devel) for fonts-sig
kevin approved watchcommits on sil-charis-fonts (Fedora devel) for fonts-sig
kevin approved watchbugzilla on sil-charis-fonts (Fedora devel) for kevin
kevin approved watchcommits on sil-charis-fonts (Fedora devel) for kevin
kevin approved commit on sil-charis-fonts (Fedora devel) for kevin
kevin approved build on sil-charis-fonts (Fedora devel) for kevin
kevin approved approveacls on sil-charis-fonts (Fedora devel) for kevin
kevin approved watchbugzilla on sil-charis-fonts (Fedora devel) for roozbeh
kevin approved watchcommits on sil-charis-fonts (Fedora devel) for roozbeh
kevin approved commit on sil-charis-fonts (Fedora devel) for roozbeh
kevin approved build on sil-charis-fonts (Fedora devel) for roozbeh
kevin approved approveacls on sil-charis-fonts (Fedora devel) for roozbeh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sil-charis-fonts



From kevin at fedoraproject.org  Mon Jan 26 22:59:45 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 26 Jan 2009 22:59:45 +0000 (UTC)
Subject: rpms/sil-charis-fonts - New directory
Message-ID: <20090126225945.321C57010C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/sil-charis-fonts
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsDK6169/rpms/sil-charis-fonts

Log Message:
Directory /cvs/pkgs/rpms/sil-charis-fonts added to the repository




From kevin at fedoraproject.org  Mon Jan 26 22:59:45 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 26 Jan 2009 22:59:45 +0000 (UTC)
Subject: rpms/sil-charis-fonts/devel - New directory
Message-ID: <20090126225945.82BB47010C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/sil-charis-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsDK6169/rpms/sil-charis-fonts/devel

Log Message:
Directory /cvs/pkgs/rpms/sil-charis-fonts/devel added to the repository




From kevin at fedoraproject.org  Mon Jan 26 23:00:06 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 26 Jan 2009 23:00:06 +0000 (UTC)
Subject: rpms/sil-charis-fonts Makefile,NONE,1.1
Message-ID: <20090126230006.9C45E7010C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/sil-charis-fonts
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsDK6169/rpms/sil-charis-fonts

Added Files:
	Makefile 
Log Message:
Setup of module sil-charis-fonts


--- NEW FILE Makefile ---
# Top level Makefile for module sil-charis-fonts
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Mon Jan 26 23:00:07 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 26 Jan 2009 23:00:07 +0000 (UTC)
Subject: rpms/sil-charis-fonts/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090126230007.016E97010C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/sil-charis-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsDK6169/rpms/sil-charis-fonts/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module sil-charis-fonts


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: sil-charis-fonts
# $Id: Makefile,v 1.1 2009/01/26 23:00:06 kevin Exp $
NAME := sil-charis-fonts
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Mon Jan 26 23:01:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Jan 2009 23:01:40 +0000
Subject: [pkgdb] sil-andika-fonts was added for nim
Message-ID: <20090126230140.2BD14208484@bastion.fedora.phx.redhat.com>

kevin has added Package sil-andika-fonts with summary A font for literacy and beginning readers
kevin has approved Package sil-andika-fonts
kevin has added a Fedora devel branch for sil-andika-fonts with an owner of nim
kevin has approved sil-andika-fonts in Fedora devel
kevin has approved Package sil-andika-fonts
kevin has set commit to Approved for provenpackager on sil-andika-fonts (Fedora devel)
kevin has set build to Approved for provenpackager on sil-andika-fonts (Fedora devel)
kevin has set checkout to Approved for provenpackager on sil-andika-fonts (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sil-andika-fonts



From pkgdb at fedoraproject.org  Mon Jan 26 23:01:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Jan 2009 23:01:46 +0000
Subject: [pkgdb] sil-andika-fonts (Fedora, devel) updated by kevin
Message-ID: <20090126230146.47576208495@bastion.fedora.phx.redhat.com>

kevin approved watchbugzilla on sil-andika-fonts (Fedora devel) for fonts-sig
kevin approved watchcommits on sil-andika-fonts (Fedora devel) for fonts-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sil-andika-fonts



From kevin at fedoraproject.org  Mon Jan 26 23:02:03 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 26 Jan 2009 23:02:03 +0000 (UTC)
Subject: rpms/sil-andika-fonts - New directory
Message-ID: <20090126230203.2D9387010C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/sil-andika-fonts
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsBk6609/rpms/sil-andika-fonts

Log Message:
Directory /cvs/pkgs/rpms/sil-andika-fonts added to the repository




From kevin at fedoraproject.org  Mon Jan 26 23:02:03 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 26 Jan 2009 23:02:03 +0000 (UTC)
Subject: rpms/sil-andika-fonts/devel - New directory
Message-ID: <20090126230203.8FDA17010C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/sil-andika-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsBk6609/rpms/sil-andika-fonts/devel

Log Message:
Directory /cvs/pkgs/rpms/sil-andika-fonts/devel added to the repository




From kevin at fedoraproject.org  Mon Jan 26 23:02:25 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 26 Jan 2009 23:02:25 +0000 (UTC)
Subject: rpms/sil-andika-fonts Makefile,NONE,1.1
Message-ID: <20090126230225.55BB07010C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/sil-andika-fonts
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsBk6609/rpms/sil-andika-fonts

Added Files:
	Makefile 
Log Message:
Setup of module sil-andika-fonts


--- NEW FILE Makefile ---
# Top level Makefile for module sil-andika-fonts
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Mon Jan 26 23:02:25 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 26 Jan 2009 23:02:25 +0000 (UTC)
Subject: rpms/sil-andika-fonts/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090126230225.C73707010C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/sil-andika-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsBk6609/rpms/sil-andika-fonts/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module sil-andika-fonts


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: sil-andika-fonts
# $Id: Makefile,v 1.1 2009/01/26 23:02:25 kevin Exp $
NAME := sil-andika-fonts
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pwouters at fedoraproject.org  Mon Jan 26 23:02:53 2009
From: pwouters at fedoraproject.org (Paul Wouters)
Date: Mon, 26 Jan 2009 23:02:53 +0000 (UTC)
Subject: rpms/unbound/devel sources,1.7,1.8 unbound.init,1.5,1.6
Message-ID: <20090126230253.22ABA7010C@cvs1.fedora.phx.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/unbound/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6517

Modified Files:
	sources unbound.init 
Log Message:
Added support to init script for when /var/run is mounted as tmpfs,
and /var/run/unbound does not exist. Also fixed daemon call to supply
the pidfile (since it is in a subdir and not straight in /var/run.



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/unbound/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	14 Jan 2009 14:54:22 -0000	1.7
+++ sources	26 Jan 2009 23:02:22 -0000	1.8
@@ -1,2 +1 @@
-43586f18b4d917887c92a35ff460c923  unbound-1.1.1.tar.gz
 2517f811ec4939c0ea602c99a6fdea23  unbound-1.2.0.tar.gz


Index: unbound.init
===================================================================
RCS file: /cvs/extras/rpms/unbound/devel/unbound.init,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- unbound.init	28 Nov 2008 09:46:49 -0000	1.5
+++ unbound.init	26 Jan 2009 23:02:22 -0000	1.6
@@ -25,6 +25,7 @@
 config="/etc/unbound/unbound.conf"
 rootdir="/var/lib/unbound"
 pidfile="/var/run/unbound/unbound.pid"
+piddir=`dirname $pidfile`
 
 [ -e /etc/sysconfig/unbound ] && . /etc/sysconfig/unbound
 
@@ -33,6 +34,8 @@
 start() {
     [ -x $exec ] || exit 5
     [ -f $config ] || exit 6
+    # /var/run could (and should) be tmpfs
+    [ -d $piddir ] || mkdir $piddir
 
     if [ ! -f /etc/unbound/unbound_control.key ]
     then
@@ -46,7 +49,7 @@
     echo -n $"Starting unbound: "
 
     # if not running, start it up here
-    daemon $exec
+    daemon --pidfile=$pidfile $exec
     retval=$?
     [ $retval -eq 0 ] && touch $lockfile
     echo



From pkgdb at fedoraproject.org  Mon Jan 26 23:02:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Jan 2009 23:02:54 +0000
Subject: [pkgdb] eclipse-rpmstubby was added for akurtakov
Message-ID: <20090126230254.A0A71208493@bastion.fedora.phx.redhat.com>

kevin has added Package eclipse-rpmstubby with summary Rpm specfile generator for Eclipse features
kevin has approved Package eclipse-rpmstubby
kevin has added a Fedora devel branch for eclipse-rpmstubby with an owner of akurtakov
kevin has approved eclipse-rpmstubby in Fedora devel
kevin has approved Package eclipse-rpmstubby
kevin has set commit to Approved for provenpackager on eclipse-rpmstubby (Fedora devel)
kevin has set build to Approved for provenpackager on eclipse-rpmstubby (Fedora devel)
kevin has set checkout to Approved for provenpackager on eclipse-rpmstubby (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/eclipse-rpmstubby



From pkgdb at fedoraproject.org  Mon Jan 26 23:02:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Jan 2009 23:02:57 +0000
Subject: [pkgdb] eclipse-rpmstubby (Fedora, 10) updated by kevin
Message-ID: <20090126230257.A6A09208497@bastion.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for eclipse-rpmstubby
kevin has set commit to Approved for provenpackager on eclipse-rpmstubby (Fedora 10)
kevin has set build to Approved for provenpackager on eclipse-rpmstubby (Fedora 10)
kevin has set checkout to Approved for provenpackager on eclipse-rpmstubby (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/eclipse-rpmstubby



From kevin at fedoraproject.org  Mon Jan 26 23:03:20 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 26 Jan 2009 23:03:20 +0000 (UTC)
Subject: rpms/eclipse-rpmstubby - New directory
Message-ID: <20090126230320.2C4607010C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/eclipse-rpmstubby
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsbI6865/rpms/eclipse-rpmstubby

Log Message:
Directory /cvs/pkgs/rpms/eclipse-rpmstubby added to the repository




From kevin at fedoraproject.org  Mon Jan 26 23:03:20 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 26 Jan 2009 23:03:20 +0000 (UTC)
Subject: rpms/eclipse-rpmstubby/devel - New directory
Message-ID: <20090126230320.718BE7010C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/eclipse-rpmstubby/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsbI6865/rpms/eclipse-rpmstubby/devel

Log Message:
Directory /cvs/pkgs/rpms/eclipse-rpmstubby/devel added to the repository




From kevin at fedoraproject.org  Mon Jan 26 23:03:46 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 26 Jan 2009 23:03:46 +0000 (UTC)
Subject: rpms/eclipse-rpmstubby/devel .cvsignore, NONE, 1.1 Makefile, NONE, 
	1.1 sources, NONE, 1.1
Message-ID: <20090126230346.177847010C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/eclipse-rpmstubby/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsbI6865/rpms/eclipse-rpmstubby/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module eclipse-rpmstubby


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: eclipse-rpmstubby
# $Id: Makefile,v 1.1 2009/01/26 23:03:45 kevin Exp $
NAME := eclipse-rpmstubby
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out 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 Jan 26 23:03:45 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 26 Jan 2009 23:03:45 +0000 (UTC)
Subject: rpms/eclipse-rpmstubby Makefile,NONE,1.1
Message-ID: <20090126230345.B1D057010C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/eclipse-rpmstubby
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsbI6865/rpms/eclipse-rpmstubby

Added Files:
	Makefile 
Log Message:
Setup of module eclipse-rpmstubby


--- NEW FILE Makefile ---
# Top level Makefile for module eclipse-rpmstubby
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout 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 Jan 26 23:04:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Jan 2009 23:04:01 +0000
Subject: [pkgdb] perl-Fedora-Bugzilla was added for cweyl
Message-ID: <20090126230401.6348A208485@bastion.fedora.phx.redhat.com>

kevin has added Package perl-Fedora-Bugzilla with summary Access Fedora's Bugzilla
kevin has approved Package perl-Fedora-Bugzilla
kevin has added a Fedora devel branch for perl-Fedora-Bugzilla with an owner of cweyl
kevin has approved perl-Fedora-Bugzilla in Fedora devel
kevin has approved Package perl-Fedora-Bugzilla
kevin has set commit to Approved for provenpackager on perl-Fedora-Bugzilla (Fedora devel)
kevin has set build to Approved for provenpackager on perl-Fedora-Bugzilla (Fedora devel)
kevin has set checkout to Approved for provenpackager on perl-Fedora-Bugzilla (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Fedora-Bugzilla



From pkgdb at fedoraproject.org  Mon Jan 26 23:04:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Jan 2009 23:04:06 +0000
Subject: [pkgdb] perl-Fedora-Bugzilla (Fedora, 9) updated by kevin
Message-ID: <20090126230407.67A39208497@bastion.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for perl-Fedora-Bugzilla
kevin has set commit to Approved for provenpackager on perl-Fedora-Bugzilla (Fedora 9)
kevin has set build to Approved for provenpackager on perl-Fedora-Bugzilla (Fedora 9)
kevin has set checkout to Approved for provenpackager on perl-Fedora-Bugzilla (Fedora 9)
kevin approved watchbugzilla on perl-Fedora-Bugzilla (Fedora 9) for perl-sig
kevin approved watchcommits on perl-Fedora-Bugzilla (Fedora 9) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Fedora-Bugzilla



From pkgdb at fedoraproject.org  Mon Jan 26 23:04:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Jan 2009 23:04:06 +0000
Subject: [pkgdb] perl-Fedora-Bugzilla (Fedora, devel) updated by kevin
Message-ID: <20090126230407.A33B52084B7@bastion.fedora.phx.redhat.com>

kevin approved watchbugzilla on perl-Fedora-Bugzilla (Fedora devel) for perl-sig
kevin approved watchcommits on perl-Fedora-Bugzilla (Fedora devel) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Fedora-Bugzilla



From pkgdb at fedoraproject.org  Mon Jan 26 23:04:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Jan 2009 23:04:06 +0000
Subject: [pkgdb] perl-Fedora-Bugzilla (Fedora, 10) updated by kevin
Message-ID: <20090126230407.CB2F0208605@bastion.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for perl-Fedora-Bugzilla
kevin has set commit to Approved for provenpackager on perl-Fedora-Bugzilla (Fedora 10)
kevin has set build to Approved for provenpackager on perl-Fedora-Bugzilla (Fedora 10)
kevin has set checkout to Approved for provenpackager on perl-Fedora-Bugzilla (Fedora 10)
kevin approved watchbugzilla on perl-Fedora-Bugzilla (Fedora 10) for perl-sig
kevin approved watchcommits on perl-Fedora-Bugzilla (Fedora 10) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Fedora-Bugzilla



From kevin at fedoraproject.org  Mon Jan 26 23:04:28 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 26 Jan 2009 23:04:28 +0000 (UTC)
Subject: rpms/perl-Fedora-Bugzilla - New directory
Message-ID: <20090126230428.358047010C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Fedora-Bugzilla
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsvs7120/rpms/perl-Fedora-Bugzilla

Log Message:
Directory /cvs/pkgs/rpms/perl-Fedora-Bugzilla added to the repository




From kevin at fedoraproject.org  Mon Jan 26 23:04:28 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 26 Jan 2009 23:04:28 +0000 (UTC)
Subject: rpms/perl-Fedora-Bugzilla/devel - New directory
Message-ID: <20090126230428.9085E7010C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Fedora-Bugzilla/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsvs7120/rpms/perl-Fedora-Bugzilla/devel

Log Message:
Directory /cvs/pkgs/rpms/perl-Fedora-Bugzilla/devel added to the repository




From kevin at fedoraproject.org  Mon Jan 26 23:04:53 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 26 Jan 2009 23:04:53 +0000 (UTC)
Subject: rpms/perl-Fedora-Bugzilla Makefile,NONE,1.1
Message-ID: <20090126230453.92EC77010C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Fedora-Bugzilla
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsvs7120/rpms/perl-Fedora-Bugzilla

Added Files:
	Makefile 
Log Message:
Setup of module perl-Fedora-Bugzilla


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Fedora-Bugzilla
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Jan 26 23:04:54 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 26 Jan 2009 23:04:54 +0000 (UTC)
Subject: rpms/perl-Fedora-Bugzilla/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090126230454.1C6DE7010C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Fedora-Bugzilla/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsvs7120/rpms/perl-Fedora-Bugzilla/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Fedora-Bugzilla


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: perl-Fedora-Bugzilla
# $Id: Makefile,v 1.1 2009/01/26 23:04:53 kevin Exp $
NAME := perl-Fedora-Bugzilla
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Jan 26 23:04:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Jan 2009 23:04:55 +0000
Subject: [pkgdb] code2html was added for rakesh
Message-ID: <20090126230455.51D5D2084BA@bastion.fedora.phx.redhat.com>

kevin has added Package code2html with summary Covert source code to HTML
kevin has approved Package code2html
kevin has added a Fedora devel branch for code2html with an owner of rakesh
kevin has approved code2html in Fedora devel
kevin has approved Package code2html
kevin has set commit to Approved for provenpackager on code2html (Fedora devel)
kevin has set build to Approved for provenpackager on code2html (Fedora devel)
kevin has set checkout to Approved for provenpackager on code2html (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/code2html



From pkgdb at fedoraproject.org  Mon Jan 26 23:04:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Jan 2009 23:04:57 +0000
Subject: [pkgdb] code2html (Fedora, 9) updated by kevin
Message-ID: <20090126230457.5A01C20860B@bastion.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for code2html
kevin has set commit to Approved for provenpackager on code2html (Fedora 9)
kevin has set build to Approved for provenpackager on code2html (Fedora 9)
kevin has set checkout to Approved for provenpackager on code2html (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/code2html



From pkgdb at fedoraproject.org  Mon Jan 26 23:04:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Jan 2009 23:04:57 +0000
Subject: [pkgdb] code2html (Fedora, 10) updated by kevin
Message-ID: <20090126230457.8CF3B20860D@bastion.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for code2html
kevin has set commit to Approved for provenpackager on code2html (Fedora 10)
kevin has set build to Approved for provenpackager on code2html (Fedora 10)
kevin has set checkout to Approved for provenpackager on code2html (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/code2html



From kevin at fedoraproject.org  Mon Jan 26 23:05:16 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 26 Jan 2009 23:05:16 +0000 (UTC)
Subject: rpms/code2html/devel - New directory
Message-ID: <20090126230516.7DFF57010C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/code2html/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsPr7374/rpms/code2html/devel

Log Message:
Directory /cvs/pkgs/rpms/code2html/devel added to the repository




From kevin at fedoraproject.org  Mon Jan 26 23:05:16 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 26 Jan 2009 23:05:16 +0000 (UTC)
Subject: rpms/code2html - New directory
Message-ID: <20090126230516.3D1887010C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/code2html
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsPr7374/rpms/code2html

Log Message:
Directory /cvs/pkgs/rpms/code2html added to the repository




From kevin at fedoraproject.org  Mon Jan 26 23:05:39 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 26 Jan 2009 23:05:39 +0000 (UTC)
Subject: rpms/code2html Makefile,NONE,1.1
Message-ID: <20090126230539.3E5317010C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/code2html
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsPr7374/rpms/code2html

Added Files:
	Makefile 
Log Message:
Setup of module code2html


--- NEW FILE Makefile ---
# Top level Makefile for module code2html
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Jan 26 23:05:39 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Mon, 26 Jan 2009 23:05:39 +0000 (UTC)
Subject: rpms/code2html/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090126230539.A61947010C@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/code2html/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsPr7374/rpms/code2html/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module code2html


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: code2html
# $Id: Makefile,v 1.1 2009/01/26 23:05:39 kevin Exp $
NAME := code2html
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From robert at fedoraproject.org  Mon Jan 26 23:29:19 2009
From: robert at fedoraproject.org (Robert Scheck)
Date: Mon, 26 Jan 2009 23:29:19 +0000 (UTC)
Subject: rpms/perl-Convert-UUlib/EL-5 .cvsignore, 1.5,
	1.6 perl-Convert-UUlib.spec, 1.17, 1.18 sources, 1.5, 1.6
Message-ID: <20090126232919.CED297010C@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/pkgs/rpms/perl-Convert-UUlib/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12500/EL-5

Modified Files:
	.cvsignore perl-Convert-UUlib.spec sources 
Log Message:
Upgrade to 1.11



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Convert-UUlib/EL-5/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	12 Aug 2007 22:12:31 -0000	1.5
+++ .cvsignore	26 Jan 2009 23:28:49 -0000	1.6
@@ -1 +1 @@
-Convert-UUlib-1.09.tar.gz
+Convert-UUlib-1.11.tar.gz


Index: perl-Convert-UUlib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Convert-UUlib/EL-5/perl-Convert-UUlib.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- perl-Convert-UUlib.spec	31 May 2008 12:57:44 -0000	1.17
+++ perl-Convert-UUlib.spec	26 Jan 2009 23:28:49 -0000	1.18
@@ -1,68 +1,77 @@
-%define rname Convert-UUlib
+%define cpanname Convert-UUlib
 
-Name:      perl-%{rname}
-Version:   1.09
-Epoch:     1
-Release:   5%{?dist}
-
-Summary:   Perl interface to the uulib library
+Name:    perl-%{cpanname}
+Version: 1.11
+Epoch:   1
+Release: 1%{?dist}
+Summary: Perl interface to the uulib library
 
 Group:     Development/Libraries
 License:   GPL+ or Artistic
-URL:       http://search.cpan.org/dist/%{rname}/
-Source:    http://www.cpan.org/authors/id/M/ML/MLEHMANN/%{rname}-%{version}.tar.gz
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+URL:       http://search.cpan.org/dist/%{cpanname}/
+Source:    http://cpan.org/authors/id/M/ML/MLEHMANN/%{cpanname}-%{version}.tar.gz
+BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 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
 A perl interface to the uulib library (a.k.a. uudeview/uuenview)
 
+
 %prep
-%setup -q -n %{rname}-%{version}
+%setup -q -n %{cpanname}-%{version}
+
 
 %build
-CFLAGS="%{optflags}" %{__perl} Makefile.PL \
-        PREFIX="%{buildroot}%{_prefix}" \
-        INSTALLDIRS="vendor"
-make %{?_smp_mflags} OPTIMIZE="%{optflags}"
+%{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS"
+make %{?_smp_mflags}
+
 
 %install
 rm -fr %{buildroot}
-%makeinstall
+make pure_install PERL_INSTALL_ROOT=%{buildroot}
+
+find %{buildroot} -type f -name .packlist -exec rm -f {} ';'
+find %{buildroot} -type f -name '*.bs' -a -size 0 -exec rm -f {} ';'
+find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null ';'
 
-### Clean up buildroot
-find %{buildroot} -type f -name "perllocal.pod" -exec rm -f {} ';'
-find %{buildroot} -type f -name ".*" -exec rm -f {} ';'
-find %{buildroot} -type f -name "*.bs" -exec rm -f {} ';'
+chmod -R u+rwX,g+rX %{buildroot}/*
 
-# fix perms to enable stripping
-chmod -R u+rwX,g+rX  %{buildroot}
 
 %check
-make test || :
+make test
+
 
 %clean
 rm -fr %{buildroot}
 
+
 %files
-%defattr(0644, root, root, 0755)
+%defattr(0644,root,root,0755)
 %doc Changes COPYING* README doc/*
-%doc %{_mandir}/man?/Convert::UUlib*
+
 %dir %{perl_vendorarch}/Convert
 %dir %{perl_vendorarch}/auto/Convert
 %dir %{perl_vendorarch}/auto/Convert/UUlib
+
 %{perl_vendorarch}/Convert/*.pm
 %attr(0755,root,root) %{perl_vendorarch}/auto/Convert/UUlib/*.so
 
+%{_mandir}/man?/Convert::UUlib*
+
 
 %changelog
-* Sun May 31 2008 Robert Scheck <robert at fedoraproject.org> 1:1.09-5
+* Fri Jul 11 2008 <nicolas.mailhot at laposte.net>
+- 1:1.11-1
+??? Fedora 10 alpha general package cleanup
+
+* Sun May 31 2008 Robert Scheck <robert at fedoraproject.org>
+- 1:1.09-5
 - Fixed %%check section in order to get the package built
 
-* Thu Mar 06 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1:1.09-4
+* Thu Mar 06 2008 Tom "spot" Callaway <tcallawa at redhat.com>
+- 1:1.09-4
 - Rebuild for new perl
 
 * Fri Feb 08 2008  Nicolas Mailhot <nicolas.mailhot at laposte.net>


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Convert-UUlib/EL-5/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	12 Aug 2007 22:12:31 -0000	1.5
+++ sources	26 Jan 2009 23:28:49 -0000	1.6
@@ -1 +1 @@
-f4cfa860176f60a83b56816d5917e71a  Convert-UUlib-1.09.tar.gz
+629ef452dd98b446f191b0bb37c39091  Convert-UUlib-1.11.tar.gz



From robert at fedoraproject.org  Mon Jan 26 23:29:19 2009
From: robert at fedoraproject.org (Robert Scheck)
Date: Mon, 26 Jan 2009 23:29:19 +0000 (UTC)
Subject: rpms/perl-Convert-UUlib/EL-4 .cvsignore, 1.4,
	1.5 perl-Convert-UUlib.spec, 1.9, 1.10 sources, 1.4, 1.5
Message-ID: <20090126232919.89BD37010C@cvs1.fedora.phx.redhat.com>

Author: robert

Update of /cvs/pkgs/rpms/perl-Convert-UUlib/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12500/EL-4

Modified Files:
	.cvsignore perl-Convert-UUlib.spec sources 
Log Message:
Upgrade to 1.11



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Convert-UUlib/EL-4/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	12 Aug 2007 22:13:38 -0000	1.4
+++ .cvsignore	26 Jan 2009 23:28:48 -0000	1.5
@@ -1 +1 @@
-Convert-UUlib-1.09.tar.gz
+Convert-UUlib-1.11.tar.gz


Index: perl-Convert-UUlib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Convert-UUlib/EL-4/perl-Convert-UUlib.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- perl-Convert-UUlib.spec	31 May 2008 12:57:08 -0000	1.9
+++ perl-Convert-UUlib.spec	26 Jan 2009 23:28:49 -0000	1.10
@@ -1,68 +1,77 @@
-%define rname Convert-UUlib
+%define cpanname Convert-UUlib
 
-Name:      perl-%{rname}
-Version:   1.09
-Epoch:     1
-Release:   5%{?dist}
-
-Summary:   Perl interface to the uulib library
+Name:    perl-%{cpanname}
+Version: 1.11
+Epoch:   1
+Release: 1%{?dist}
+Summary: Perl interface to the uulib library
 
 Group:     Development/Libraries
 License:   GPL+ or Artistic
-URL:       http://search.cpan.org/dist/%{rname}/
-Source:    http://www.cpan.org/authors/id/M/ML/MLEHMANN/%{rname}-%{version}.tar.gz
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+URL:       http://search.cpan.org/dist/%{cpanname}/
+Source:    http://cpan.org/authors/id/M/ML/MLEHMANN/%{cpanname}-%{version}.tar.gz
+BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 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
 A perl interface to the uulib library (a.k.a. uudeview/uuenview)
 
+
 %prep
-%setup -q -n %{rname}-%{version}
+%setup -q -n %{cpanname}-%{version}
+
 
 %build
-CFLAGS="%{optflags}" %{__perl} Makefile.PL \
-        PREFIX="%{buildroot}%{_prefix}" \
-        INSTALLDIRS="vendor"
-make %{?_smp_mflags} OPTIMIZE="%{optflags}"
+%{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS"
+make %{?_smp_mflags}
+
 
 %install
 rm -fr %{buildroot}
-%makeinstall
+make pure_install PERL_INSTALL_ROOT=%{buildroot}
+
+find %{buildroot} -type f -name .packlist -exec rm -f {} ';'
+find %{buildroot} -type f -name '*.bs' -a -size 0 -exec rm -f {} ';'
+find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null ';'
 
-### Clean up buildroot
-find %{buildroot} -type f -name "perllocal.pod" -exec rm -f {} ';'
-find %{buildroot} -type f -name ".*" -exec rm -f {} ';'
-find %{buildroot} -type f -name "*.bs" -exec rm -f {} ';'
+chmod -R u+rwX,g+rX %{buildroot}/*
 
-# fix perms to enable stripping
-chmod -R u+rwX,g+rX  %{buildroot}
 
 %check
-make test || :
+make test
+
 
 %clean
 rm -fr %{buildroot}
 
+
 %files
-%defattr(0644, root, root, 0755)
+%defattr(0644,root,root,0755)
 %doc Changes COPYING* README doc/*
-%doc %{_mandir}/man?/Convert::UUlib*
+
 %dir %{perl_vendorarch}/Convert
 %dir %{perl_vendorarch}/auto/Convert
 %dir %{perl_vendorarch}/auto/Convert/UUlib
+
 %{perl_vendorarch}/Convert/*.pm
 %attr(0755,root,root) %{perl_vendorarch}/auto/Convert/UUlib/*.so
 
+%{_mandir}/man?/Convert::UUlib*
+
 
 %changelog
-* Sun May 31 2008 Robert Scheck <robert at fedoraproject.org> 1:1.09-5
+* Fri Jul 11 2008 <nicolas.mailhot at laposte.net>
+- 1:1.11-1
+??? Fedora 10 alpha general package cleanup
+
+* Sun May 31 2008 Robert Scheck <robert at fedoraproject.org>
+- 1:1.09-5
 - Fixed %%check section in order to get the package built
 
-* Thu Mar 06 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1:1.09-4
+* Thu Mar 06 2008 Tom "spot" Callaway <tcallawa at redhat.com>
+- 1:1.09-4
 - Rebuild for new perl
 
 * Fri Feb 08 2008  Nicolas Mailhot <nicolas.mailhot at laposte.net>


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Convert-UUlib/EL-4/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	12 Aug 2007 22:13:38 -0000	1.4
+++ sources	26 Jan 2009 23:28:49 -0000	1.5
@@ -1 +1 @@
-f4cfa860176f60a83b56816d5917e71a  Convert-UUlib-1.09.tar.gz
+629ef452dd98b446f191b0bb37c39091  Convert-UUlib-1.11.tar.gz



From rathann at fedoraproject.org  Mon Jan 26 23:35:11 2009
From: rathann at fedoraproject.org (Dominik Mierzejewski)
Date: Mon, 26 Jan 2009 23:35:11 +0000 (UTC)
Subject: rpms/dx/devel dx-rpm.patch,1.3,1.4 dx.spec,1.12,1.13
Message-ID: <20090126233511.27D4A7010C@cvs1.fedora.phx.redhat.com>

Author: rathann

Update of /cvs/pkgs/rpms/dx/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13558

Modified Files:
	dx-rpm.patch dx.spec 
Log Message:
- fix building with current libtool/autoconf

dx-rpm.patch:

Index: dx-rpm.patch
===================================================================
RCS file: /cvs/pkgs/rpms/dx/devel/dx-rpm.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- dx-rpm.patch	24 Sep 2008 19:12:06 -0000	1.3
+++ dx-rpm.patch	26 Jan 2009 23:34:40 -0000	1.4
@@ -1,6 +1,6 @@
 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
++++ dx-4.4.4/bin/dx.in	2009-01-26 23:57:11.000000000 +0100
 @@ -60,14 +60,7 @@ exit 1
  #
  longhelp() {
@@ -107,7 +107,7 @@
      cmd2="cp $CfgName ${EncodedBase}.cfg"
 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
++++ dx-4.4.4/bin/Makefile.am	2009-01-26 23:57:11.000000000 +0100
 @@ -1,6 +1,6 @@
  ## Process this file with automake to produce Makefile.in
  
@@ -118,7 +118,7 @@
  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
++++ dx-4.4.4/bin/mdf2c.in	2009-01-26 23:57:11.000000000 +0100
 @@ -1,6 +1,6 @@
  #!/bin/sh
  # Configure is looking for the following line
@@ -129,7 +129,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
++++ dx-4.4.4/bin/url_handler.sh	2009-01-26 23:57:11.000000000 +0100
 @@ -39,8 +39,8 @@ case $method in
  		if [ $use_xbrowser = n ]; then
  			lynx "$url" 
@@ -143,8 +143,16 @@
  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
++++ dx-4.4.4/configure.ac	2009-01-27 00:16:18.000000000 +0100
+@@ -218,6 +218,7 @@ AC_DEFINE_UNQUOTED(BSH, "$bsh_path", [Pa
+ dnl End of command line options configuration
+ 
+ dnl Start DX configuration
++AC_PROG_CXX
+ AC_LANG([C++])
+ AC_CHECK_HEADERS(stdlib.h)
+ AC_LANG([C])
+@@ -677,7 +678,7 @@ if test "$ARCH" = "intelnt" ; then
      fi
  dnl -- check for unix
  else
@@ -153,7 +161,7 @@
      AC_MSG_CHECKING(if HDF package is complete)
      if test $passed -gt 0
      then
-@@ -686,7 +686,7 @@ else
+@@ -686,7 +687,7 @@ else
  	AC_MSG_RESULT(no -- some components failed test)
          have_hdf='no (failed tests)'
      else
@@ -162,7 +170,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])
-@@ -766,8 +766,8 @@ then
+@@ -766,8 +767,8 @@ then
      AS_MESSAGE([checking for NETCDF support ......])
      failed=0;
      passed=0;
@@ -173,7 +181,7 @@
      AC_MSG_CHECKING(if NETCDF package is complete)
      if test $passed -gt 0
      then
-@@ -776,7 +776,7 @@ then
+@@ -776,7 +777,7 @@ then
  	AC_MSG_RESULT(no -- some components failed test)
          have_netcdf='no (failed tests)'
      else
@@ -182,7 +190,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])
-@@ -1011,7 +1011,7 @@ DX_CHECK_HEADERS( \
+@@ -1011,7 +1012,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 \
@@ -193,7 +201,7 @@
    sys/svs.h sys/sysconfig.h sys/syslimits.h sys/sysmacros.h ulocks.h x11/xlibxtra.h \
 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
++++ dx-4.4.4/doc/Makefile.am	2009-01-26 23:57:11.000000000 +0100
 @@ -1,6 +1,6 @@
  ## Process this file with automake to produce Makefile.in
  
@@ -204,7 +212,7 @@
  	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
++++ dx-4.4.4/fonts/Makefile.am	2009-01-26 23:57:11.000000000 +0100
 @@ -1,6 +1,6 @@
  ## Process this file with automake to produce Makefile.in
  
@@ -215,7 +223,7 @@
  	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
++++ dx-4.4.4/help/Makefile.am	2009-01-26 23:57:11.000000000 +0100
 @@ -1,6 +1,6 @@
  ## Process this file with automake to produce Makefile.in
  
@@ -243,7 +251,7 @@
  	'
 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
++++ dx-4.4.4/html/images/Makefile.am	2009-01-26 23:57:11.000000000 +0100
 @@ -1,5 +1,5 @@
  
 -imagesdir = $(prefix)/dx/html/images
@@ -253,7 +261,7 @@
  	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
++++ dx-4.4.4/html/Makefile.am	2009-01-26 23:57:11.000000000 +0100
 @@ -1,6 +1,6 @@
  ## Process this file with automake to produce Makefile.in
  
@@ -264,7 +272,7 @@
  
 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
++++ dx-4.4.4/html/pages/Makefile.am	2009-01-26 23:57:11.000000000 +0100
 @@ -1,4 +1,4 @@
 -pagesdir = $(prefix)/dx/html/pages
 +pagesdir = $(datadir)/dx/html/pages
@@ -273,7 +281,7 @@
  	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
++++ dx-4.4.4/include/dx/Makefile.am	2009-01-26 23:57:11.000000000 +0100
 @@ -1,6 +1,6 @@
  ## Process this file with automake to produce Makefile.in
  
@@ -284,7 +292,7 @@
  	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
++++ dx-4.4.4/include/Makefile.am	2009-01-26 23:57:11.000000000 +0100
 @@ -1,4 +1,4 @@
 -dxincdir = $(prefix)/dx/include
 +dxincdir = $(prefix)/include
@@ -293,7 +301,7 @@
  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
++++ dx-4.4.4/lib/Makefile.am	2009-01-26 23:57:11.000000000 +0100
 @@ -1,4 +1,4 @@
 -libsdir = $(prefix)/dx/lib
 +libsdir = $(datadir)/dx/lib
@@ -302,7 +310,7 @@
  	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
++++ dx-4.4.4/man/Makefile.am	2009-01-26 23:57:11.000000000 +0100
 @@ -1,4 +1,4 @@
  ## Process this file with automake to produce Makefile.in
  
@@ -311,7 +319,7 @@
  
 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
++++ dx-4.4.4/man/manl/Makefile.am	2009-01-26 23:57:11.000000000 +0100
 @@ -1,6 +1,6 @@
  ## Process this file with automake to produce Makefile.in
  
@@ -322,7 +330,7 @@
  EXTRA_DIST = $(man_MANS)
 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
++++ dx-4.4.4/src/exec/dxexec/Makefile.am	2009-01-26 23:57:11.000000000 +0100
 @@ -9,7 +9,7 @@ noinst_LTLIBRARIES = libDXEXEC.la
  libDXEXEC_la_SOURCES = main.c
  libDXEXEC_la_CFLAGS = $(AM_CFLAGS)
@@ -334,7 +342,7 @@
  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
++++ dx-4.4.4/src/exec/dxmods/local.mk.in	2009-01-26 23:57:11.000000000 +0100
 @@ -14,23 +14,23 @@ user.c:  dx.mdf
  
  dxcm.mdf:  ${srcdir}/dxmdf.src
@@ -370,7 +378,7 @@
  	$(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
++++ dx-4.4.4/src/exec/dxmods/Makefile.am	2009-01-26 23:57:11.000000000 +0100
 @@ -1,8 +1,9 @@
  ## Process this file with automake to produce Makefile.in
  
@@ -393,7 +401,7 @@
  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
++++ dx-4.4.4/src/exec/libdx/Makefile.am	2009-01-26 23:57:11.000000000 +0100
 @@ -7,7 +7,7 @@ MICRO_VERSION=@MICRO_VERSION@
  #INCLUDES = -I../../../include  -D at ARCH@
  INCLUDES = -I${top_srcdir}/include  -D at ARCH@
@@ -405,7 +413,7 @@
  #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
++++ dx-4.4.4/src/exec/libdx/memory.c	2009-01-26 23:57:11.000000000 +0100
 @@ -66,7 +66,6 @@
  
  #if linux
@@ -416,7 +424,7 @@
  
 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
++++ dx-4.4.4/src/exec/Makefile.am	2009-01-26 23:57:11.000000000 +0100
 @@ -1,6 +1,6 @@
  SUBDIRS = libdx dxmods hwrender dpexec dxexec
  
@@ -427,7 +435,7 @@
  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
++++ dx-4.4.4/src/misc/Makefile.am	2009-01-26 23:57:11.000000000 +0100
 @@ -4,7 +4,7 @@ INCLUDES = -I${top_srcdir}/include -D at AR
  
  dxbindir = $(prefix)/bin
@@ -446,7 +454,7 @@
  	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
++++ dx-4.4.4/src/uipp/dxl/Makefile.am	2009-01-26 23:57:11.000000000 +0100
 @@ -7,7 +7,7 @@ MICRO_VERSION=@MICRO_VERSION@
  
  INCLUDES = -I${top_srcdir}/include  -D at ARCH@
@@ -458,7 +466,7 @@
  	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
++++ dx-4.4.4/src/uipp/dxui/Makefile.am	2009-01-26 23:57:11.000000000 +0100
 @@ -2,7 +2,7 @@
  
  INCLUDES = -I${srcdir}/../base -I${top_srcdir}/include -I${srcdir}/../dxuilib -D at ARCH@
@@ -470,7 +478,7 @@
  
 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
++++ dx-4.4.4/src/uipp/java/Makefile.am	2009-01-26 23:57:11.000000000 +0100
 @@ -27,12 +27,12 @@
  ## libtool and the -shrext flag to make this much more 
  ## portable.
@@ -489,7 +497,7 @@
  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
++++ dx-4.4.4/src/uipp/java/server/macros/Makefile.am	2009-01-26 23:57:11.000000000 +0100
 @@ -1,6 +1,6 @@
  ##  Process this file with automake to produce Makefile.in
  
@@ -500,7 +508,7 @@
  
 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
++++ dx-4.4.4/src/uipp/java/server/Makefile.am	2009-01-26 23:57:11.000000000 +0100
 @@ -1,6 +1,6 @@
 -srvbindir = $(prefix)/dx/java/server/bin
 -srvoutputdir = $(prefix)/dx/java/output
@@ -513,7 +521,7 @@
  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
++++ dx-4.4.4/src/uipp/mb/Makefile.am	2009-01-26 23:57:11.000000000 +0100
 @@ -2,7 +2,7 @@
  
  INCLUDES = -I${top_srcdir}/include -I${srcdir}/../base -I${srcdir}/../widgets -D at ARCH@
@@ -525,7 +533,7 @@
  
 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
++++ dx-4.4.4/src/uipp/prompter/Makefile.am	2009-01-26 23:57:11.000000000 +0100
 @@ -2,7 +2,7 @@
  
  INCLUDES =  -I${srcdir}/../base -I${top_srcdir}/include -D at ARCH@
@@ -537,7 +545,7 @@
  
 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
++++ dx-4.4.4/src/uipp/startup/Makefile.am	2009-01-26 23:57:11.000000000 +0100
 @@ -2,7 +2,7 @@
  
  INCLUDES =  -I${top_srcdir}/include -I${srcdir}/../base -D at ARCH@
@@ -549,7 +557,7 @@
  
 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
++++ dx-4.4.4/src/uipp/tutor/Makefile.am	2009-01-26 23:57:11.000000000 +0100
 @@ -2,7 +2,7 @@
  
  INCLUDES = -I${top_srcdir}/include -I${srcdir}/../base -D at ARCH@
@@ -561,7 +569,7 @@
  
 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
++++ dx-4.4.4/src/uipp/ui/Makefile.am	2009-01-26 23:57:11.000000000 +0100
 @@ -1,6 +1,6 @@
  ## Process this file with automake to produce Makefile.in
  


Index: dx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dx/devel/dx.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- dx.spec	26 Jan 2009 19:45:31 -0000	1.12
+++ dx.spec	26 Jan 2009 23:34:40 -0000	1.13
@@ -126,6 +126,7 @@
 %changelog
 * Mon Jan 26 2009 Dominik Mierzejewski <rpm at greysector.net> 4.4.4-8
 - fix leftover dxexec process consuming 100% CPU after quitting (bug #469664)
+- fix building with current libtool/autoconf
 
 * Wed Sep 24 2008 Dominik Mierzejewski <rpm at greysector.net> 4.4.4-7
 - rediff patch to fix build with new rpm



From airlied at fedoraproject.org  Mon Jan 26 23:47:42 2009
From: airlied at fedoraproject.org (Dave Airlie)
Date: Mon, 26 Jan 2009 23:47:42 +0000 (UTC)
Subject: rpms/xorg-x11-server/devel xserver-1.5.99.3-fix-core-fonts.patch,
	NONE, 1.1 xorg-x11-server.spec, 1.392, 1.393
Message-ID: <20090126234742.609287010C@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-serv16285

Modified Files:
	xorg-x11-server.spec 
Added Files:
	xserver-1.5.99.3-fix-core-fonts.patch 
Log Message:
* Tue Jan 27 2009 Dave Airlie <airlied at redhat.com> 1.5.99.901-4
- xserver-1.5.99.3-fix-core-fonts.patch (#478999)


xserver-1.5.99.3-fix-core-fonts.patch:

--- NEW FILE xserver-1.5.99.3-fix-core-fonts.patch ---
>From 49b93df8a3002db7196aa3fc1fd8dca1c12a55d6 Mon Sep 17 00:00:00 2001
From: Paulo Cesar Pereira de Andrade<pcpa at mandriva.com.br>
Date: Wed, 07  Jan  2009  21:37:03  +0000
Subject: Default to use standard bitmap fonts, with builtins as fallback

  The builtin-fonts configure option was removed, as it at best should
have been a runtime option. Instead, now it always register all "font
path element" backends, and adds built-ins fonts at the end of the
default font path.
  This should be a more reasonable solution, to "correct" the most
common Xorg FAQ (could not open default font 'fixed'), and also don't
break by default applications that use only the standard/historical
X Font rendering.
---
diff --git a/configure.ac b/configure.ac
index 22a09b0..ae455de 100644
--- a/configure.ac
+++ b/configure.ac
@@ -507,9 +507,6 @@ AC_ARG_ENABLE(install-libxf86config,
 				[Install libxf86config (default: disabled)]),
 				[INSTALL_LIBXF86CONFIG=$enableval],
 				[INSTALL_LIBXF86CONFIG=no])
-AC_ARG_ENABLE(builtin-fonts,  AS_HELP_STRING([--enable-builtin-fonts], [Use only built-in fonts (default: yes)]),
-                                [BUILTIN_FONTS=$enableval],
-                                [BUILTIN_FONTS=yes])
 AC_ARG_ENABLE(null-root-cursor, AS_HELP_STRING([--enable-null-root-cursor], [Use an empty root cursor (default: use core cursor)]),
                                  [NULL_ROOT_CURSOR=$enableval],
                                  [NULL_ROOT_CURSOR=no])
@@ -963,11 +960,6 @@ if test "x$DPMSExtension" = xyes; then
 	AC_DEFINE(DPMSExtension, 1, [Support DPMS extension])
 fi
 
-if test "x$BUILTIN_FONTS" = xyes; then
-       AC_DEFINE(BUILTIN_FONTS, 1, [Use only built-in fonts])
-       FONTPATH="built-ins"
-fi
-
 if test "x$XCALIBRATE" = xyes && test "$KDRIVE" = yes; then
    AC_DEFINE(XCALIBRATE, 1, [Build XCalibrate extension])
    REQUIRED_MODULES="$REQUIRED_MODULES xcalibrateproto"
diff --git a/dix/dixfonts.c b/dix/dixfonts.c
index 15d011c..b0fbed2 100644
--- a/dix/dixfonts.c
+++ b/dix/dixfonts.c
@@ -1906,12 +1906,9 @@ InitFonts (void)
 {
     patternCache = MakeFontPatternCache();
 
-#ifdef BUILTIN_FONTS
     BuiltinRegisterFpeFunctions();
-#else
     FontFileRegisterFpeFunctions();
     fs_register_fpe_functions();
-#endif
 }
 
 int
diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c
index 48d8efd..198b20f 100644
--- a/hw/xfree86/common/xf86Config.c
+++ b/hw/xfree86/common/xf86Config.c
@@ -110,8 +110,6 @@ extern DeviceAssocRec mouse_assoc;
 #define PROJECTROOT	"/usr/X11R6"
 #endif
 
-static char *fontPath = NULL;
-
 static ModuleDefault ModuleDefaults[] = {
     {.name = "extmod",   .toLoad = TRUE,    .load_opt=NULL},
     {.name = "dbe",      .toLoad = TRUE,    .load_opt=NULL},
@@ -586,90 +584,55 @@ xf86ConfigError(char *msg, ...)
 static void
 configFiles(XF86ConfFilesPtr fileconf)
 {
-  MessageType pathFrom = X_DEFAULT;
-  int countDirs;
-  char *temp_path;
-  char *log_buf;
-
-  /* FontPath */
-  /* Try XF86Config FontPath first */
-  if (!xf86fpFlag) {
-   if (fileconf) {
-    if (fileconf->file_fontpath) {
-      char *f = xf86ValidateFontPath(fileconf->file_fontpath);
-      pathFrom = X_CONFIG;
-      if (*f) {
-        if (xf86Info.useDefaultFontPath) {
-          char *g;
-          xf86Msg(X_DEFAULT, "Including the default font path %s.\n", defaultFontPath);
-	  g = xnfalloc(strlen(defaultFontPath) + strlen(f) + 3);
-          strcpy(g, f);
-          strcat(g, ",");
-          defaultFontPath = strcat(g, defaultFontPath);
-          xfree(f);
-        } else {
-          defaultFontPath = f;
-        }
-      } else {
-	xf86Msg(X_WARNING,
-	    "FontPath is completely invalid.  Using compiled-in default.\n");
-        fontPath = NULL;
-        pathFrom = X_DEFAULT;
-      }
-    } 
-   } else {
-      xf86Msg(X_DEFAULT,
-	    "No FontPath specified.  Using compiled-in default.\n");
-      pathFrom = X_DEFAULT;
-   }
-  } else {
-    /* Use fontpath specified with '-fp' */
-    if (fontPath)
-    {
-      fontPath = NULL;
+    MessageType	 pathFrom;
+    Bool	 must_copy;
+    int		 size, countDirs;
+    char	*temp_path, *log_buf, *start, *end;
+
+    /* FontPath */
+    must_copy = TRUE;
+
+    temp_path = defaultFontPath ? defaultFontPath : "";
+    if (xf86fpFlag)
+	pathFrom = X_CMDLINE;
+    else if (fileconf && fileconf->file_fontpath) {
+	pathFrom = X_CONFIG;
+	if (xf86Info.useDefaultFontPath) {
+	    defaultFontPath = Xprintf("%s%s%s",
+				      fileconf->file_fontpath,
+				      *temp_path ? "," : "", temp_path);
+	    must_copy = FALSE;
+	}
+	else
+	    defaultFontPath = fileconf->file_fontpath;
     }
-    pathFrom = X_CMDLINE;
-  }
-  if (!fileconf) {
-      /* xf86ValidateFontPath will write into it's arg, but defaultFontPath
-       could be static, so we make a copy. */
-    char *f = xnfalloc(strlen(defaultFontPath) + 1);
-    f[0] = '\0';
-    strcpy (f, defaultFontPath);
-    defaultFontPath = xf86ValidateFontPath(f);
-    xfree(f);
-  } else {
-   if (fileconf) {
-    if (!fileconf->file_fontpath) {
-      /* xf86ValidateFontPath will write into it's arg, but defaultFontPath
-       could be static, so we make a copy. */
-     char *f = xnfalloc(strlen(defaultFontPath) + 1);
-     f[0] = '\0';
-     strcpy (f, defaultFontPath);
-     defaultFontPath = xf86ValidateFontPath(f);
-     xfree(f);
-    }
-   }
-  }
-
-  /* If defaultFontPath is still empty, exit here */
-
-  if (! *defaultFontPath)
-    FatalError("No valid FontPath could be found.");
-
-  /* make fontpath more readable in the logfiles */
-  countDirs = 1;
-  temp_path = defaultFontPath;
-  while((temp_path = index(temp_path, ',')) != NULL) {
-    countDirs++;
-    temp_path++;
-  }
-  log_buf = xnfalloc(strlen(defaultFontPath) + (2 * countDirs) + 1);
-  if(!log_buf) /* fallback to old method */
-    xf86Msg(pathFrom, "FontPath set to \"%s\"\n", defaultFontPath);
-  else {
-    char *start, *end;
-    int size;
+    else
+	pathFrom = X_DEFAULT;
+    temp_path = defaultFontPath ? defaultFontPath : "";
+
+    /* ensure defaultFontPath contains "built-ins" */
+    start = strstr(temp_path, "built-ins");
+    end = start + strlen("built-ins");
+    if (start == NULL ||
+	!((start == temp_path || start[-1] == ',') && (!*end || *end == ','))) {
+	defaultFontPath = Xprintf("%s%sbuilt-ins",
+				  temp_path, *temp_path ? "," : "");
+	must_copy = FALSE;
+    }
+    /* xf86ValidateFontPath modifies its argument, but returns a copy of it. */
+    temp_path = must_copy ? XNFstrdup(defaultFontPath) : defaultFontPath;
+    defaultFontPath = xf86ValidateFontPath(temp_path);
+    free(temp_path);
+
+    /* make fontpath more readable in the logfiles */
+    countDirs = 1;
+    temp_path = defaultFontPath;
+    while ((temp_path = index(temp_path, ',')) != NULL) {
+	countDirs++;
+	temp_path++;
+    }
+
+    log_buf = xnfalloc(strlen(defaultFontPath) + (2 * countDirs) + 1);
     temp_path = log_buf;
     start = defaultFontPath;
     while((end = index(start, ',')) != NULL) {
@@ -685,7 +648,6 @@ configFiles(XF86ConfFilesPtr fileconf)
     strcpy(temp_path, start);
     xf86Msg(pathFrom, "FontPath set to:\n%s\n", log_buf);
     xfree(log_buf);
-  }
 
 
   if (fileconf && fileconf->file_inputdevs) {
diff --git a/include/dixfont.h b/include/dixfont.h
index 97bd712..e444a20 100644
--- a/include/dixfont.h
+++ b/include/dixfont.h
@@ -142,4 +142,6 @@
 
 extern void SetGlyphCachingMode(int /*newmode*/);
 
+extern void BuiltinRegisterFpeFunctions(void);
+
 #endif				/* DIXFONT_H */
--
cgit v0.8.1-24-ge5fb


Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.392
retrieving revision 1.393
diff -u -r1.392 -r1.393
--- xorg-x11-server.spec	26 Jan 2009 18:21:19 -0000	1.392
+++ xorg-x11-server.spec	26 Jan 2009 23:47:11 -0000	1.393
@@ -19,7 +19,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.5.99.901
-Release:   3%{?dist}
+Release:   4%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -76,6 +76,8 @@
 # hack around broken mtrr.h.  drop me as soon as possible.
 Patch6007: xserver-1.5.99.3-broken-mtrr-header.patch
 
+Patch6008: xserver-1.5.99.3-fix-core-fonts.patch
+
 %define moduledir	%{_libdir}/xorg/modules
 %define drimoduledir	%{_libdir}/dri
 %define sdkdir		%{_includedir}/xorg
@@ -492,6 +494,9 @@
 
 
 %changelog
+* Tue Jan 27 2009 Dave Airlie <airlied at redhat.com> 1.5.99.901-4
+- xserver-1.5.99.3-fix-core-fonts.patch (#478999)
+
 * Mon Jan 26 2009 Adam Tkac <atkac redhat com> 1.5.99.901-3
 - improved xserver-1.5.99.3-broken-mtrr-header.patch to unbreak mtrr.h again
 



From rathann at fedoraproject.org  Mon Jan 26 23:47:55 2009
From: rathann at fedoraproject.org (Dominik Mierzejewski)
Date: Mon, 26 Jan 2009 23:47:55 +0000 (UTC)
Subject: rpms/crm114/devel .cvsignore,1.5,1.6 sources,1.5,1.6
Message-ID: <20090126234755.3CB857010C@cvs1.fedora.phx.redhat.com>

Author: rathann

Update of /cvs/pkgs/rpms/crm114/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16344

Modified Files:
	.cvsignore sources 
Log Message:
- remove references to old source


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/crm114/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	9 Jul 2008 18:38:45 -0000	1.5
+++ .cvsignore	26 Jan 2009 23:47:24 -0000	1.6
@@ -1,2 +1 @@
-crm114-20070810-BlameTheSegfault.src.tar.gz
 crm114-20080703-BlameVT.src.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/crm114/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	9 Jul 2008 18:38:45 -0000	1.5
+++ sources	26 Jan 2009 23:47:24 -0000	1.6
@@ -1,2 +1 @@
-50419b5d563da414c5c0c0f256236fbc  crm114-20070810-BlameTheSegfault.src.tar.gz
 51ba5490d9787de9461a28a79da59586  crm114-20080703-BlameVT.src.tar.gz



From cchance at fedoraproject.org  Mon Jan 26 23:56:42 2009
From: cchance at fedoraproject.org (Caius Chance)
Date: Mon, 26 Jan 2009 23:56:42 +0000 (UTC)
Subject: rpms/baekmuk-ttf-fonts/devel baekmuk-ttf-fonts.spec,1.12,1.13
Message-ID: <20090126235642.E3A05700DD@cvs1.fedora.phx.redhat.com>

Author: cchance

Update of /cvs/pkgs/rpms/baekmuk-ttf-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17869

Modified Files:
	baekmuk-ttf-fonts.spec 
Log Message:
* Tue Jan 27 2009 Caius Chance <cchance at redhat.com> - 2.2-17.fc11
- Resolves: rhbz#477332
- Fixed obsoletion of baekmuk-ttf-common-fonts.




Index: baekmuk-ttf-fonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/baekmuk-ttf-fonts/devel/baekmuk-ttf-fonts.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- baekmuk-ttf-fonts.spec	22 Jan 2009 05:49:22 -0000	1.12
+++ baekmuk-ttf-fonts.spec	26 Jan 2009 23:56:12 -0000	1.13
@@ -8,7 +8,7 @@
 
 Name:           %{fontname}-fonts
 Version:        2.2
-Release:        16%{?dist}
+Release:        17%{?dist}
 Summary:        Free Korean TrueType fonts
 
 Group:          User Interface/X
@@ -89,6 +89,7 @@
 Group:          User Interface/X
 Conflicts:      fonts-korean < 2.2-5
 Obsoletes:      ttfonts-ko < 1.0.11-33, fonts-korean < 2.2-5
+Obsoletes:      baekmuk-ttf-common-fonts < 2.2-16
 
 %description -n %{fontname}-fonts-common
 %common_desc
@@ -151,6 +152,10 @@
 %__rm -rf %{buildroot}
 
 %changelog
+* Tue Jan 27 2009 Caius Chance <cchance at redhat.com> - 2.2-17.fc11
+- Resolves: rhbz#477332
+- Fixed obsoletion of baekmuk-ttf-common-fonts.
+
 * Thu Jan 22 2009 Caius Chance <cchance at redhat.com> - 2.2-16.fc11
 - Resolves: rhbz#477332
 - Refined dependencies.



From pkgdb at fedoraproject.org  Mon Jan 26 23:57:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Mon, 26 Jan 2009 23:57:21 +0000
Subject: [pkgdb] translate-toolkit had acl change status
Message-ID: <20090126235721.4C5CE2084A7@bastion.fedora.phx.redhat.com>

petersen has set the watchcommits acl on translate-toolkit (Fedora devel) to Obsolete for i18n-team

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/translate-toolkit



From rdieter at fedoraproject.org  Mon Jan 26 23:58:47 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Mon, 26 Jan 2009 23:58:47 +0000 (UTC)
Subject: rpms/qt/devel qt.spec,1.222,1.223
Message-ID: <20090126235847.98F11700DD@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/qt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18254

Modified Files:
	qt.spec 
Log Message:
* Mon Jan 26 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.4.3-13
- Provides: qt4%{?_isa} = %version-%release



Index: qt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qt/devel/qt.spec,v
retrieving revision 1.222
retrieving revision 1.223
diff -u -r1.222 -r1.223
--- qt.spec	22 Jan 2009 21:10:00 -0000	1.222
+++ qt.spec	26 Jan 2009 23:58:16 -0000	1.223
@@ -9,7 +9,7 @@
 Name:    qt4
 %endif
 Version: 4.4.3
-Release: 12%{?dist}
+Release: 13%{?dist}
 
 # GPLv2 exceptions(see GPL_EXCEPTIONS*.txt)
 License: GPLv3 with exceptions or GPLv2 with exceptions
@@ -21,6 +21,7 @@
 %if "%{name}" != "qt4"
 Obsoletes: qt4 < %{version}-%{release}
 Provides: qt4 = %{version}-%{release}
+%{?_isa:Provides: qt4%{?_isa} = %{version}-%{release}}
 %endif
 
 Source4: Trolltech.conf
@@ -731,6 +732,9 @@
 
 
 %changelog
+* Mon Jan 26 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.4.3-13
+- Provides: qt4%%{?_isa} = %%version-%%release
+
 * Thu Jan 22 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.4.3-12 
 - respin (mysql)
 



From cchance at fedoraproject.org  Tue Jan 27 00:01:34 2009
From: cchance at fedoraproject.org (Caius Chance)
Date: Tue, 27 Jan 2009 00:01:34 +0000 (UTC)
Subject: rpms/baekmuk-ttf-fonts/devel baekmuk-ttf-fonts.spec,1.13,1.14
Message-ID: <20090127000134.B821C7010B@cvs1.fedora.phx.redhat.com>

Author: cchance

Update of /cvs/pkgs/rpms/baekmuk-ttf-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18491

Modified Files:
	baekmuk-ttf-fonts.spec 
Log Message:
corrected -common-fonts obsoletion version number



Index: baekmuk-ttf-fonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/baekmuk-ttf-fonts/devel/baekmuk-ttf-fonts.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- baekmuk-ttf-fonts.spec	26 Jan 2009 23:56:12 -0000	1.13
+++ baekmuk-ttf-fonts.spec	27 Jan 2009 00:01:04 -0000	1.14
@@ -89,7 +89,7 @@
 Group:          User Interface/X
 Conflicts:      fonts-korean < 2.2-5
 Obsoletes:      ttfonts-ko < 1.0.11-33, fonts-korean < 2.2-5
-Obsoletes:      baekmuk-ttf-common-fonts < 2.2-16
+Obsoletes:      baekmuk-ttf-common-fonts < 2.2-17
 
 %description -n %{fontname}-fonts-common
 %common_desc



From rdieter at fedoraproject.org  Tue Jan 27 00:16:10 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Tue, 27 Jan 2009 00:16:10 +0000 (UTC)
Subject: rpms/qt/devel qt.spec,1.223,1.224
Message-ID: <20090127001610.EB73F7010B@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/qt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21182

Modified Files:
	qt.spec 
Log Message:
Add %%_qt4 to macros.qt4
VS: ----------------------------------------------------------------------



Index: qt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qt/devel/qt.spec,v
retrieving revision 1.223
retrieving revision 1.224
diff -u -r1.223 -r1.224
--- qt.spec	26 Jan 2009 23:58:16 -0000	1.223
+++ qt.spec	27 Jan 2009 00:15:40 -0000	1.224
@@ -79,6 +79,7 @@
 %endif
 
 # See http://bugzilla.redhat.com/196901
+%define _qt4 %{name}
 %define _qt4_prefix %{_libdir}/qt4
 %define _qt4_bindir %{_qt4_prefix}/bin
 # _qt4_datadir is not multilib clean, and hacks to workaround that breaks stuff.
@@ -515,6 +516,7 @@
 # rpm macros
 mkdir -p %{buildroot}%{_sysconfdir}/rpm
 cat >%{buildroot}%{_sysconfdir}/rpm/macros.qt4<<EOF
+%%_qt4 %{name}
 %%_qt4_version %{version}
 %%_qt4_prefix %%{_libdir}/qt4
 %%_qt4_bindir %%{_qt4_prefix}/bin
@@ -734,6 +736,7 @@
 %changelog
 * Mon Jan 26 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.4.3-13
 - Provides: qt4%%{?_isa} = %%version-%%release
+- add %%_qt4 to macros.qt4
 
 * Thu Jan 22 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.4.3-12 
 - respin (mysql)



From rdieter at fedoraproject.org  Tue Jan 27 00:23:22 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Tue, 27 Jan 2009 00:23:22 +0000 (UTC)
Subject: rpms/kdelibs/devel kdelibs.spec,1.422,1.423
Message-ID: <20090127002322.154477010B@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdelibs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22118

Modified Files:
	kdelibs.spec 
Log Message:
* Mon Jan 26 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.0-4
- revert Requires: qt4%{_isa}



Index: kdelibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.422
retrieving revision 1.423
diff -u -r1.422 -r1.423
--- kdelibs.spec	26 Jan 2009 18:20:23 -0000	1.422
+++ kdelibs.spec	27 Jan 2009 00:22:51 -0000	1.423
@@ -1,6 +1,6 @@
 Summary: K Desktop Environment 4 - Libraries
 Version: 4.2.0
-Release: 3%{?dist}
+Release: 4%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs
@@ -84,7 +84,9 @@
 Patch101: kdelibs-4.1.96-AllowExternalPaths.patch
 
 BuildRequires: qt4-devel >= 4.4.0
-Requires: qt4%{?_isa} >= %{_qt4_version}
+# qt4%{_?_isa} isn't provided yet -- Rex
+#Requires: qt4%{?_isa} >= %{_qt4_version}
+Requires: qt4 >= %{_qt4_version}
 Requires: xdg-utils
 Requires(post): /sbin/ldconfig xdg-utils
 Requires(postun): /sbin/ldconfig xdg-utils
@@ -371,6 +373,9 @@
 
 
 %changelog
+* Mon Jan 26 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.0-4
+- revert Requires: qt4%%{_isa}
+
 * Mon Jan 26 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.0-3
 - respun tarball
 



From rdieter at fedoraproject.org  Tue Jan 27 00:24:20 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Tue, 27 Jan 2009 00:24:20 +0000 (UTC)
Subject: rpms/kdelibs/F-10 kdelibs.spec,1.398,1.399
Message-ID: <20090127002420.75D1E7010B@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdelibs/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22375

Modified Files:
	kdelibs.spec 
Log Message:
* Mon Jan 26 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.0-4
- revert Requires: qt4%{_isa}



Index: kdelibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/F-10/kdelibs.spec,v
retrieving revision 1.398
retrieving revision 1.399
diff -u -r1.398 -r1.399
--- kdelibs.spec	26 Jan 2009 21:45:06 -0000	1.398
+++ kdelibs.spec	27 Jan 2009 00:23:50 -0000	1.399
@@ -1,6 +1,6 @@
 Summary: K Desktop Environment 4 - Libraries
 Version: 4.2.0
-Release: 3%{?dist}
+Release: 4%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs
@@ -84,7 +84,9 @@
 Patch101: kdelibs-4.1.96-AllowExternalPaths.patch
 
 BuildRequires: qt4-devel >= 4.4.0
-Requires: qt4%{?_isa} >= %{_qt4_version}
+# qt4%{_?_isa} isn't provided yet -- Rex
+#Requires: qt4%{?_isa} >= %{_qt4_version}
+Requires: qt4 >= %{_qt4_version}
 Requires: xdg-utils
 Requires(post): /sbin/ldconfig xdg-utils
 Requires(postun): /sbin/ldconfig xdg-utils
@@ -371,6 +373,9 @@
 
 
 %changelog
+* Mon Jan 26 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.0-4
+- revert Requires: qt4%%{_isa}
+
 * Mon Jan 26 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.0-3
 - respun tarball
 



From rathann at fedoraproject.org  Tue Jan 27 00:28:45 2009
From: rathann at fedoraproject.org (Dominik Mierzejewski)
Date: Tue, 27 Jan 2009 00:28:45 +0000 (UTC)
Subject: rpms/mnemosyne/devel .cvsignore, 1.2, 1.3 mnemosyne.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <20090127002845.C11857010B@cvs1.fedora.phx.redhat.com>

Author: rathann

Update of /cvs/pkgs/rpms/mnemosyne/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22985

Modified Files:
	.cvsignore mnemosyne.spec sources 
Log Message:
* Tue Jan 27 2009 Dominik Mierzejewski <rpm at greysector.net> 1.2-1.r1
- updated to 1.2-r1, fixes https://bugs.launchpad.net/mnemosyne-proj/+bug/252152



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mnemosyne/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	24 Jan 2009 15:33:49 -0000	1.2
+++ .cvsignore	27 Jan 2009 00:28:15 -0000	1.3
@@ -1 +1 @@
-mnemosyne-1.1.1-r1.tgz
+mnemosyne-1.2-r1.tgz


Index: mnemosyne.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mnemosyne/devel/mnemosyne.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mnemosyne.spec	24 Jan 2009 15:33:50 -0000	1.1
+++ mnemosyne.spec	27 Jan 2009 00:28:15 -0000	1.2
@@ -2,8 +2,8 @@
 
 Name:		mnemosyne
 Summary:	Flash-card learning tool
-Version:	1.1.1
-Release:	3.r1%{?dist}
+Version:	1.2
+Release:	1.r1%{?dist}
 URL:		http://www.mnemosyne-proj.org/
 Source0:	http://downloads.sourceforge.net/sourceforge/mnemosyne-proj/%{name}-%{version}-r1.tgz
 Patch0:		%{name}-desktop.patch
@@ -72,6 +72,9 @@
 %{_datadir}/icons/hicolor/*/apps/%{name}.png
 
 %changelog
+* Tue Jan 27 2009 Dominik Mierzejewski <rpm at greysector.net> 1.2-1.r1
+- updated to 1.2-r1, fixes https://bugs.launchpad.net/mnemosyne-proj/+bug/252152
+
 * Tue Nov 11 2008 Dominik Mierzejewski <rpm at greysector.net> 1.1.1-3.r1
 - fixed .desktop file comment to conform to GNOME HIG
 - removed a redundant python setup.py install call


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mnemosyne/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	24 Jan 2009 15:33:50 -0000	1.2
+++ sources	27 Jan 2009 00:28:15 -0000	1.3
@@ -1 +1 @@
-2c08f6b0465f3280fcd2b17960b797bc  mnemosyne-1.1.1-r1.tgz
+156f9e80352ea1012ea707bcbeaf2cfb  mnemosyne-1.2-r1.tgz



From lutter at fedoraproject.org  Tue Jan 27 00:42:40 2009
From: lutter at fedoraproject.org (David Lutterkort)
Date: Tue, 27 Jan 2009 00:42:40 +0000 (UTC)
Subject: rpms/augeas/EL-5 .cvsignore, 1.12, 1.13 augeas.spec, 1.11,
	1.12 sources, 1.12, 1.13
Message-ID: <20090127004240.1160F7010B@cvs1.fedora.phx.redhat.com>

Author: lutter

Update of /cvs/pkgs/rpms/augeas/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25520/EL-5

Modified Files:
	.cvsignore augeas.spec sources 
Log Message:
Version 0.3.6


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/augeas/EL-5/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	24 Dec 2008 06:24:01 -0000	1.12
+++ .cvsignore	27 Jan 2009 00:42:09 -0000	1.13
@@ -1 +1 @@
-augeas-0.3.5.tar.gz
+augeas-0.3.6.tar.gz


Index: augeas.spec
===================================================================
RCS file: /cvs/pkgs/rpms/augeas/EL-5/augeas.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- augeas.spec	24 Dec 2008 06:24:01 -0000	1.11
+++ augeas.spec	27 Jan 2009 00:42:09 -0000	1.12
@@ -1,5 +1,5 @@
 Name:           augeas
-Version:        0.3.5
+Version:        0.3.6
 Release:        1%{?dist}
 Summary:        A library for changing configuration files
 
@@ -80,6 +80,9 @@
 %{_libdir}/pkgconfig/augeas.pc
 
 %changelog
+* Mon Jan 26 2009 David Lutterkort <lutter at redhat.com> - 0.3.6-1
+- New version
+
 * Tue Dec 23 2008 David Lutterkort <lutter at redhat.com> - 0.3.5-1
 - New version
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/augeas/EL-5/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	24 Dec 2008 06:24:01 -0000	1.12
+++ sources	27 Jan 2009 00:42:09 -0000	1.13
@@ -1 +1 @@
-de061f7104902a0f4072e23eacc85609  augeas-0.3.5.tar.gz
+ca0f9447ec43fd13c24356dbd5d8c5f8  augeas-0.3.6.tar.gz



From lutter at fedoraproject.org  Tue Jan 27 00:42:40 2009
From: lutter at fedoraproject.org (David Lutterkort)
Date: Tue, 27 Jan 2009 00:42:40 +0000 (UTC)
Subject: rpms/augeas/F-10 .cvsignore, 1.12, 1.13 augeas.spec, 1.11,
	1.12 sources, 1.12, 1.13
Message-ID: <20090127004240.5ABF27010B@cvs1.fedora.phx.redhat.com>

Author: lutter

Update of /cvs/pkgs/rpms/augeas/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25520/F-10

Modified Files:
	.cvsignore augeas.spec sources 
Log Message:
Version 0.3.6


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/augeas/F-10/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	24 Dec 2008 06:24:01 -0000	1.12
+++ .cvsignore	27 Jan 2009 00:42:10 -0000	1.13
@@ -1 +1 @@
-augeas-0.3.5.tar.gz
+augeas-0.3.6.tar.gz


Index: augeas.spec
===================================================================
RCS file: /cvs/pkgs/rpms/augeas/F-10/augeas.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- augeas.spec	24 Dec 2008 06:24:01 -0000	1.11
+++ augeas.spec	27 Jan 2009 00:42:10 -0000	1.12
@@ -1,5 +1,5 @@
 Name:           augeas
-Version:        0.3.5
+Version:        0.3.6
 Release:        1%{?dist}
 Summary:        A library for changing configuration files
 
@@ -80,6 +80,9 @@
 %{_libdir}/pkgconfig/augeas.pc
 
 %changelog
+* Mon Jan 26 2009 David Lutterkort <lutter at redhat.com> - 0.3.6-1
+- New version
+
 * Tue Dec 23 2008 David Lutterkort <lutter at redhat.com> - 0.3.5-1
 - New version
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/augeas/F-10/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	24 Dec 2008 06:24:01 -0000	1.12
+++ sources	27 Jan 2009 00:42:10 -0000	1.13
@@ -1 +1 @@
-de061f7104902a0f4072e23eacc85609  augeas-0.3.5.tar.gz
+ca0f9447ec43fd13c24356dbd5d8c5f8  augeas-0.3.6.tar.gz



From lutter at fedoraproject.org  Tue Jan 27 00:42:41 2009
From: lutter at fedoraproject.org (David Lutterkort)
Date: Tue, 27 Jan 2009 00:42:41 +0000 (UTC)
Subject: rpms/augeas/devel .cvsignore, 1.12, 1.13 augeas.spec, 1.11,
	1.12 sources, 1.12, 1.13
Message-ID: <20090127004241.08AC97010B@cvs1.fedora.phx.redhat.com>

Author: lutter

Update of /cvs/pkgs/rpms/augeas/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25520/devel

Modified Files:
	.cvsignore augeas.spec sources 
Log Message:
Version 0.3.6


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/augeas/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	24 Dec 2008 06:24:02 -0000	1.12
+++ .cvsignore	27 Jan 2009 00:42:10 -0000	1.13
@@ -1 +1 @@
-augeas-0.3.5.tar.gz
+augeas-0.3.6.tar.gz


Index: augeas.spec
===================================================================
RCS file: /cvs/pkgs/rpms/augeas/devel/augeas.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- augeas.spec	24 Dec 2008 06:24:02 -0000	1.11
+++ augeas.spec	27 Jan 2009 00:42:10 -0000	1.12
@@ -1,5 +1,5 @@
 Name:           augeas
-Version:        0.3.5
+Version:        0.3.6
 Release:        1%{?dist}
 Summary:        A library for changing configuration files
 
@@ -80,6 +80,9 @@
 %{_libdir}/pkgconfig/augeas.pc
 
 %changelog
+* Mon Jan 26 2009 David Lutterkort <lutter at redhat.com> - 0.3.6-1
+- New version
+
 * Tue Dec 23 2008 David Lutterkort <lutter at redhat.com> - 0.3.5-1
 - New version
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/augeas/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	24 Dec 2008 06:24:02 -0000	1.12
+++ sources	27 Jan 2009 00:42:10 -0000	1.13
@@ -1 +1 @@
-de061f7104902a0f4072e23eacc85609  augeas-0.3.5.tar.gz
+ca0f9447ec43fd13c24356dbd5d8c5f8  augeas-0.3.6.tar.gz



From lutter at fedoraproject.org  Tue Jan 27 00:42:40 2009
From: lutter at fedoraproject.org (David Lutterkort)
Date: Tue, 27 Jan 2009 00:42:40 +0000 (UTC)
Subject: rpms/augeas/F-9 .cvsignore, 1.12, 1.13 augeas.spec, 1.11,
	1.12 sources, 1.12, 1.13
Message-ID: <20090127004240.A7C637010B@cvs1.fedora.phx.redhat.com>

Author: lutter

Update of /cvs/pkgs/rpms/augeas/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25520/F-9

Modified Files:
	.cvsignore augeas.spec sources 
Log Message:
Version 0.3.6


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/augeas/F-9/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	24 Dec 2008 06:24:02 -0000	1.12
+++ .cvsignore	27 Jan 2009 00:42:10 -0000	1.13
@@ -1 +1 @@
-augeas-0.3.5.tar.gz
+augeas-0.3.6.tar.gz


Index: augeas.spec
===================================================================
RCS file: /cvs/pkgs/rpms/augeas/F-9/augeas.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- augeas.spec	24 Dec 2008 06:24:02 -0000	1.11
+++ augeas.spec	27 Jan 2009 00:42:10 -0000	1.12
@@ -1,5 +1,5 @@
 Name:           augeas
-Version:        0.3.5
+Version:        0.3.6
 Release:        1%{?dist}
 Summary:        A library for changing configuration files
 
@@ -80,6 +80,9 @@
 %{_libdir}/pkgconfig/augeas.pc
 
 %changelog
+* Mon Jan 26 2009 David Lutterkort <lutter at redhat.com> - 0.3.6-1
+- New version
+
 * Tue Dec 23 2008 David Lutterkort <lutter at redhat.com> - 0.3.5-1
 - New version
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/augeas/F-9/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	24 Dec 2008 06:24:02 -0000	1.12
+++ sources	27 Jan 2009 00:42:10 -0000	1.13
@@ -1 +1 @@
-de061f7104902a0f4072e23eacc85609  augeas-0.3.5.tar.gz
+ca0f9447ec43fd13c24356dbd5d8c5f8  augeas-0.3.6.tar.gz



From lutter at fedoraproject.org  Tue Jan 27 00:42:39 2009
From: lutter at fedoraproject.org (David Lutterkort)
Date: Tue, 27 Jan 2009 00:42:39 +0000 (UTC)
Subject: rpms/augeas/EL-4 .cvsignore, 1.12, 1.13 augeas.spec, 1.12,
	1.13 sources, 1.12, 1.13
Message-ID: <20090127004239.CCC267010B@cvs1.fedora.phx.redhat.com>

Author: lutter

Update of /cvs/pkgs/rpms/augeas/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25520/EL-4

Modified Files:
	.cvsignore augeas.spec sources 
Log Message:
Version 0.3.6


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/augeas/EL-4/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	24 Dec 2008 06:24:01 -0000	1.12
+++ .cvsignore	27 Jan 2009 00:42:09 -0000	1.13
@@ -1 +1 @@
-augeas-0.3.5.tar.gz
+augeas-0.3.6.tar.gz


Index: augeas.spec
===================================================================
RCS file: /cvs/pkgs/rpms/augeas/EL-4/augeas.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- augeas.spec	5 Jan 2009 04:21:47 -0000	1.12
+++ augeas.spec	27 Jan 2009 00:42:09 -0000	1.13
@@ -1,13 +1,12 @@
 Name:           augeas
-Version:        0.3.5
-Release:        2%{?dist}
+Version:        0.3.6
+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/%{name}-%{version}.tar.gz
-Patch0:         datadir.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  readline-devel
@@ -44,7 +43,6 @@
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
 %configure --disable-static
@@ -82,8 +80,8 @@
 %{_libdir}/pkgconfig/augeas.pc
 
 %changelog
-* Sun Jan  4 2009 David Lutterkort <lutter at redhat.com> - 0.3.5-2
-- Add patch to fix bz478619
+* Mon Jan 26 2009 David Lutterkort <lutter at redhat.com> - 0.3.6-1
+- New version
 
 * Tue Dec 23 2008 David Lutterkort <lutter at redhat.com> - 0.3.5-1
 - New version


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/augeas/EL-4/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	24 Dec 2008 06:24:01 -0000	1.12
+++ sources	27 Jan 2009 00:42:09 -0000	1.13
@@ -1 +1 @@
-de061f7104902a0f4072e23eacc85609  augeas-0.3.5.tar.gz
+ca0f9447ec43fd13c24356dbd5d8c5f8  augeas-0.3.6.tar.gz



From whot at fedoraproject.org  Tue Jan 27 00:48:15 2009
From: whot at fedoraproject.org (Peter Hutterer)
Date: Tue, 27 Jan 2009 00:48:15 +0000 (UTC)
Subject: rpms/xorg-x11-server/devel fedora-setup-keyboard, 1.1,
	1.2 xorg-x11-server.spec, 1.393, 1.394
Message-ID: <20090127004816.02A437010B@cvs1.fedora.phx.redhat.com>

Author: whot

Update of /cvs/pkgs/rpms/xorg-x11-server/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27223

Modified Files:
	fedora-setup-keyboard xorg-x11-server.spec 
Log Message:
* Tue Jan 27 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.5.99.901-5
- replace fedora-setup-keyboard with pure python one (#478431)




Index: fedora-setup-keyboard
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/fedora-setup-keyboard,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- fedora-setup-keyboard	4 Aug 2008 21:15:46 -0000	1.1
+++ fedora-setup-keyboard	27 Jan 2009 00:47:45 -0000	1.2
@@ -1,33 +1,48 @@
-#!/bin/sh
-#
-# Trivial egregious hack to load the console keyboard layout into XKB.
-#
-# Yes, this should really just be written in python.  If you can figure
-# out how to make hal callouts written in python _work_, then please
-# let me know.  In the meantime, we'll do this.
-
-[[ -x /usr/bin/python ]] || exit 0
-[[ -x /usr/bin/hal-set-property ]] || exit 0
-
-source /etc/sysconfig/keyboard >& /dev/null || exit 0
-
-[[ -n "$KEYTABLE" ]] || exit 0
-
-rhplquery () {
-    /usr/bin/python -c "import rhpl.keyboard_models; m = rhpl.keyboard_models.KeyboardModels().get_models(); print \"junk='%s' layout='%s' model='%s' variant='%s' options='%s'\" % tuple(m[\"$1\"])" || echo "exit 0"
-}
-
-eval `rhplquery $KEYTABLE`
-
-hal_set () {
-    if [[ -n "${!1}" ]]; then
-	/usr/bin/hal-set-property --direct --udi "$UDI" --key input.xkb.$1 --string "${!1}"
-    else
-	/usr/bin/hal-set-property --direct --udi "$UDI" --key input.xkb.$1 --remove
-    fi
-}
-
-hal_set layout
-hal_set model
-hal_set variant
-hal_set options
+#!/usr/bin/env python
+# encoding: utf-8
+# vim: tabstop=4 expandtab autoindent shiftwidth=4 fileencoding=utf-8
+"""
+fedora-setup-keyboard.py
+
+Written by Alexander D. Kanevskiy <kad at blackcatlinux.com>
+"""
+
+import sys, os, dbus
+import rhpl.keyboard_models
+from rhpl.simpleconfig import SimpleConfigFile
+
+KBDCONFIG = "/etc/sysconfig/keyboard"
+
+def main():
+    # Sanity checks
+    if 'UDI' not in os.environ:
+        sys.exit(1)
+    if not os.access(KBDCONFIG, os.R_OK):
+        sys.exit(0)
+    # Read config
+    kbd_config = SimpleConfigFile()
+    kbd_config.read(KBDCONFIG)
+    kbd_models = rhpl.keyboard_models.KeyboardModels().get_models()
+    (layout, model, variant, options) = tuple(kbd_models.get(kbd_config.info.get('KEYTABLE',''), ['', '', '', '', ''])[1:])
+    result_dict = { 'layout': layout, 'model': model, 'variant': variant, 'options': options }
+    
+    # Now let's dbus fun begin
+    if 'HALD_DIRECT_ADDR' in os.environ:
+        bus = dbus.connection.Connection(os.environ['HALD_DIRECT_ADDR'])
+    else:
+        bus = dbus.SystemBus()
+    kbd = dbus.Interface(bus.get_object("org.freedesktop.Hal", os.environ['UDI']), 'org.freedesktop.Hal.Device')
+    for key in result_dict:
+        # Respect user settings
+        value = kbd_config.info.get(key.upper(), result_dict[key])
+        if not value:
+            try:
+                kbd.RemoveProperty("input.xkb.%s" % key)
+            except dbus.exceptions.DBusException:
+                pass # key already not exist
+        else:
+            kbd.SetPropertyString("input.xkb.%s" % key, value)
+
+
+if __name__ == '__main__':
+    main()


Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.393
retrieving revision 1.394
diff -u -r1.393 -r1.394
--- xorg-x11-server.spec	26 Jan 2009 23:47:11 -0000	1.393
+++ xorg-x11-server.spec	27 Jan 2009 00:47:45 -0000	1.394
@@ -19,7 +19,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.5.99.901
-Release:   4%{?dist}
+Release:   5%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -494,6 +494,9 @@
 
 
 %changelog
+* Tue Jan 27 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.5.99.901-5
+- replace fedora-setup-keyboard with pure python one (#478431)
+
 * Tue Jan 27 2009 Dave Airlie <airlied at redhat.com> 1.5.99.901-4
 - xserver-1.5.99.3-fix-core-fonts.patch (#478999)
 



From lutter at fedoraproject.org  Tue Jan 27 00:48:51 2009
From: lutter at fedoraproject.org (David Lutterkort)
Date: Tue, 27 Jan 2009 00:48:51 +0000 (UTC)
Subject: rpms/augeas/EL-4 augeas.spec,1.13,1.14
Message-ID: <20090127004851.B6B3A7010B@cvs1.fedora.phx.redhat.com>

Author: lutter

Update of /cvs/pkgs/rpms/augeas/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27302/EL-4

Modified Files:
	augeas.spec 
Log Message:
Bump release, since I tagged the wrong version


Index: augeas.spec
===================================================================
RCS file: /cvs/pkgs/rpms/augeas/EL-4/augeas.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- augeas.spec	27 Jan 2009 00:42:09 -0000	1.13
+++ augeas.spec	27 Jan 2009 00:48:21 -0000	1.14
@@ -1,6 +1,6 @@
 Name:           augeas
 Version:        0.3.6
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A library for changing configuration files
 
 Group:          System Environment/Libraries



From lutter at fedoraproject.org  Tue Jan 27 00:48:52 2009
From: lutter at fedoraproject.org (David Lutterkort)
Date: Tue, 27 Jan 2009 00:48:52 +0000 (UTC)
Subject: rpms/augeas/EL-5 augeas.spec,1.12,1.13
Message-ID: <20090127004852.092177010B@cvs1.fedora.phx.redhat.com>

Author: lutter

Update of /cvs/pkgs/rpms/augeas/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27302/EL-5

Modified Files:
	augeas.spec 
Log Message:
Bump release, since I tagged the wrong version


Index: augeas.spec
===================================================================
RCS file: /cvs/pkgs/rpms/augeas/EL-5/augeas.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- augeas.spec	27 Jan 2009 00:42:09 -0000	1.12
+++ augeas.spec	27 Jan 2009 00:48:21 -0000	1.13
@@ -1,6 +1,6 @@
 Name:           augeas
 Version:        0.3.6
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A library for changing configuration files
 
 Group:          System Environment/Libraries



From kkofler at fedoraproject.org  Tue Jan 27 00:49:33 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Tue, 27 Jan 2009 00:49:33 +0000 (UTC)
Subject: rpms/glpk/devel .cvsignore, 1.14, 1.15 glpk.spec, 1.20, 1.21 sources,
	1.14, 1.15
Message-ID: <20090127004933.466B97010B@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/glpk/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27539/devel

Modified Files:
	.cvsignore glpk.spec sources 
Log Message:
* Tue Jan 27 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.35-1
- Update to 4.35.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/glpk/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	13 Dec 2008 02:47:37 -0000	1.14
+++ .cvsignore	27 Jan 2009 00:49:02 -0000	1.15
@@ -1 +1 @@
-glpk-4.34.tar.gz
+glpk-4.35.tar.gz


Index: glpk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/glpk/devel/glpk.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- glpk.spec	13 Dec 2008 02:47:37 -0000	1.20
+++ glpk.spec	27 Jan 2009 00:49:03 -0000	1.21
@@ -1,5 +1,5 @@
 Name:           glpk
-Version:        4.34
+Version:        4.35
 Release:        1%{?dist}
 Summary:        GNU Linear Programming Kit
 
@@ -104,6 +104,9 @@
 
 
 %changelog
+* Tue Jan 27 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.35-1
+- Update to 4.35.
+
 * Fri Dec 12 2008 Conrad Meyer <konrad at tylerc.org> 4.34-1
 - Update to 4.34.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/glpk/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	13 Dec 2008 02:47:37 -0000	1.14
+++ sources	27 Jan 2009 00:49:03 -0000	1.15
@@ -1 +1 @@
-be85bd4ee1e878535fa19ad37a1c77c4  glpk-4.34.tar.gz
+d3277283a90c80d68d10832af6f63338  glpk-4.35.tar.gz



From crobinso at fedoraproject.org  Tue Jan 27 00:50:01 2009
From: crobinso at fedoraproject.org (Cole Robinson)
Date: Tue, 27 Jan 2009 00:50:01 +0000 (UTC)
Subject: rpms/python-virtinst/devel virtinst-0.400.1-fix-extra-args.patch,
	NONE, 1.1 .cvsignore, 1.15, 1.16 python-virtinst.spec, 1.51,
	1.52 sources, 1.15,
	1.16 virtinst-0.400.0-bridge-network-collision.patch, 1.1,
	NONE virtinst-0.400.0-disk-pool-fixes.patch, 1.1,
	NONE virtinst-0.400.0-fix-translated-help.patch, 1.1,
	NONE virtinst-0.400.0-log-fail-traceback.patch, 1.1,
	NONE virtinst-0.400.0-missing-variable.patch, 1.1,
	NONE virtinst-0.400.0-qemu-conn-check.patch, 1.1,
	NONE virtinst-0.400.0-refresh-storage-pool.patch, 1.1,
	NONE virtinst-0.400.0-undo-pxe-virtio.patch, 1.1,
	NONE virtinst-0.400.0-update-translations.patch, 1.1,
	NONE virtinst-0.400.0-virt-convert-dict.patch, 1.1,
	NONE virtinst-0.400.0-virtio-f9.patch, 1.1,
	NONE virtinst-0.400.0-win64-entry.patch, 1.1, NONE
Message-ID: <20090127005001.A109C7010B@cvs1.fedora.phx.redhat.com>

Author: crobinso

Update of /cvs/pkgs/rpms/python-virtinst/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27181

Modified Files:
	.cvsignore python-virtinst.spec sources 
Added Files:
	virtinst-0.400.1-fix-extra-args.patch 
Removed Files:
	virtinst-0.400.0-bridge-network-collision.patch 
	virtinst-0.400.0-disk-pool-fixes.patch 
	virtinst-0.400.0-fix-translated-help.patch 
	virtinst-0.400.0-log-fail-traceback.patch 
	virtinst-0.400.0-missing-variable.patch 
	virtinst-0.400.0-qemu-conn-check.patch 
	virtinst-0.400.0-refresh-storage-pool.patch 
	virtinst-0.400.0-undo-pxe-virtio.patch 
	virtinst-0.400.0-update-translations.patch 
	virtinst-0.400.0-virt-convert-dict.patch 
	virtinst-0.400.0-virtio-f9.patch 
	virtinst-0.400.0-win64-entry.patch 
Log Message:
Update to 0.400.1
virt-convert virt-image -> vmx support
virt-image checksum support
Improved URL fetching support (Debian Xen, Ubuntu kernel + boot.iso)



virtinst-0.400.1-fix-extra-args.patch:

--- NEW FILE virtinst-0.400.1-fix-extra-args.patch ---
# HG changeset patch
# User Cole Robinson <crobinso at redhat.com>
# Date 1233003236 18000
# Node ID 5ea2332d65ff0a0e54d3b51cc88d450c4a498b10
# Parent  689089a334811719a5d643424a7aaf1e1bc54b04
Argh, unbreak URL install with extra kernel arguments.

diff -r 689089a33481 -r 5ea2332d65ff virtinst/OSDistro.py
--- a/virtinst/OSDistro.py	Mon Jan 26 14:29:40 2009 -0500
+++ b/virtinst/OSDistro.py	Mon Jan 26 15:53:56 2009 -0500
@@ -174,7 +174,8 @@
 
         return False
 
-    def _kernelFetchHelper(self, fetcher, guest, progresscb, kernelpath, initrdpath):
+    def _kernelFetchHelper(self, fetcher, guest, progresscb, kernelpath,
+                           initrdpath):
         # Simple helper for fetching kernel + initrd and performing
         # cleanup if neccessary
         kernel = fetcher.acquireFile(kernelpath, progresscb)
@@ -184,7 +185,7 @@
             args += "method=" + fetcher.location
 
         if guest.extraargs:
-            args += guest.extraargs
+            args += " " + guest.extraargs
 
         try:
             initrd = fetcher.acquireFile(initrdpath, progresscb)


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-virtinst/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	10 Sep 2008 22:31:40 -0000	1.15
+++ .cvsignore	27 Jan 2009 00:49:30 -0000	1.16
@@ -1 +1 @@
-virtinst-0.400.0.tar.gz
+virtinst-0.400.1.tar.gz


Index: python-virtinst.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-virtinst/devel/python-virtinst.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- python-virtinst.spec	4 Dec 2008 18:09:21 -0000	1.51
+++ python-virtinst.spec	27 Jan 2009 00:49:30 -0000	1.52
@@ -10,21 +10,10 @@
 
 Summary: Python modules and utilities for installing virtual machines
 Name: python-%{appname}
-Version: 0.400.0
-Release: 7%{_extra_release}
+Version: 0.400.1
+Release: 1%{_extra_release}
 Source0: http://virt-manager.org/download/sources/%{appname}/%{appname}-%{version}.tar.gz
-Patch1: %{appname}-%{version}-qemu-conn-check.patch
-Patch2: %{appname}-%{version}-virt-convert-dict.patch
-Patch3: %{appname}-%{version}-virtio-f9.patch
-Patch4: %{appname}-%{version}-log-fail-traceback.patch
-Patch5: %{appname}-%{version}-bridge-network-collision.patch
-Patch6: %{appname}-%{version}-refresh-storage-pool.patch
-Patch7: %{appname}-%{version}-missing-variable.patch
-Patch8: %{appname}-%{version}-disk-pool-fixes.patch
-Patch9: %{appname}-%{version}-win64-entry.patch
-Patch10: %{appname}-%{version}-update-translations.patch
-Patch11: %{appname}-%{version}-undo-pxe-virtio.patch
-Patch12: %{appname}-%{version}-fix-translated-help.patch
+Patch1: %{appname}-%{version}-fix-extra-args.patch
 License: GPLv2+
 Group: Development/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -54,17 +43,6 @@
 %prep
 %setup -q -n %{appname}-%{version}
 %patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
-%patch9 -p1
-%patch10 -p1
-%patch11 -p1
-%patch12 -p1
 
 %build
 python setup.py build
@@ -95,10 +73,15 @@
 %{_bindir}/virt-install
 %{_bindir}/virt-clone
 %{_bindir}/virt-image
-%{_bindir}/virt-pack
 %{_bindir}/virt-convert
 
 %changelog
+* Mon Jan 26 2009 Cole Robinson <crobinso at redhat.com> - 0.400.1-1.fc11
+- Update to 0.400.1
+- virt-convert virt-image -> vmx support
+- virt-image checksum support
+- Improved URL fetching support (Debian Xen, Ubuntu kernel + boot.iso)
+
 * Thu Dec 04 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 0.400.0-7
 - Rebuild for Python 2.6
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-virtinst/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	10 Sep 2008 22:31:40 -0000	1.15
+++ sources	27 Jan 2009 00:49:30 -0000	1.16
@@ -1 +1 @@
-484792dfe05abc75082d44fc51b811f3  virtinst-0.400.0.tar.gz
+f7fa786880929ed98e28982fa8ec5343  virtinst-0.400.1.tar.gz


--- virtinst-0.400.0-bridge-network-collision.patch DELETED ---


--- virtinst-0.400.0-disk-pool-fixes.patch DELETED ---


--- virtinst-0.400.0-fix-translated-help.patch DELETED ---


--- virtinst-0.400.0-log-fail-traceback.patch DELETED ---


--- virtinst-0.400.0-missing-variable.patch DELETED ---


--- virtinst-0.400.0-qemu-conn-check.patch DELETED ---


--- virtinst-0.400.0-refresh-storage-pool.patch DELETED ---


--- virtinst-0.400.0-undo-pxe-virtio.patch DELETED ---


--- virtinst-0.400.0-update-translations.patch DELETED ---


--- virtinst-0.400.0-virt-convert-dict.patch DELETED ---


--- virtinst-0.400.0-virtio-f9.patch DELETED ---


--- virtinst-0.400.0-win64-entry.patch DELETED ---



From oget at fedoraproject.org  Tue Jan 27 00:55:38 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Tue, 27 Jan 2009 00:55:38 +0000 (UTC)
Subject: rpms/tse3/devel import.log, NONE, 1.1 tse3-gcc43.patch, NONE,
	1.1 tse3-size_t-64bit.patch, NONE, 1.1 tse3.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090127005538.50E197010B@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/tse3/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28963/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log tse3-gcc43.patch tse3-size_t-64bit.patch tse3.spec 
Log Message:
* Sun Jan 25 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 0.3.1-2
- Move the HTML documentation into an HTML subdirectory
- Use INSTALL="install -p"
- Drop the oss support, and the related patch

* Tue Jan 20 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 0.3.1-1
- Initial Fedora build



--- NEW FILE import.log ---
tse3-0_3_1-2_fc10:HEAD:tse3-0.3.1-2.fc10.src.rpm:1233017661

tse3-gcc43.patch:

--- NEW FILE tse3-gcc43.patch ---
diff -rupN old/tse3-0.3.1/src/examples/recording/recording.cpp new/tse3-0.3.1/src/examples/recording/recording.cpp
--- old/tse3-0.3.1/src/examples/recording/recording.cpp	2005-07-25 07:22:31.000000000 -0400
+++ new/tse3-0.3.1/src/examples/recording/recording.cpp	2009-01-20 21:29:27.000000000 -0500
@@ -27,6 +27,7 @@
      **************************************************************/
 
 #include <iostream>
+#include <cstdlib>
 
 // Used in step 1
 #include "tse3/Metronome.h"
diff -rupN old/tse3-0.3.1/src/tse3/cmd/Phrase.h new/tse3-0.3.1/src/tse3/cmd/Phrase.h
--- old/tse3-0.3.1/src/tse3/cmd/Phrase.h	2005-07-25 07:22:38.000000000 -0400
+++ new/tse3-0.3.1/src/tse3/cmd/Phrase.h	2009-01-20 21:29:27.000000000 -0500
@@ -29,6 +29,7 @@ namespace TSE3
     class Phrase;
     class Song;
     class Part;
+    class PhraseEdit;
 
     namespace Cmd
     {
diff -rupN old/tse3-0.3.1/src/tse3/MidiFile.cpp new/tse3-0.3.1/src/tse3/MidiFile.cpp
--- old/tse3-0.3.1/src/tse3/MidiFile.cpp	2005-07-25 07:23:00.000000000 -0400
+++ new/tse3-0.3.1/src/tse3/MidiFile.cpp	2009-01-20 21:29:27.000000000 -0500
@@ -32,6 +32,7 @@
 #include <string>
 #include <queue>
 #include <math.h>
+#include <cstring>
 
 using namespace TSE3;
 
diff -rupN old/tse3-0.3.1/src/tse3/plt/OSS.cpp new/tse3-0.3.1/src/tse3/plt/OSS.cpp
--- old/tse3-0.3.1/src/tse3/plt/OSS.cpp	2005-07-25 07:22:56.000000000 -0400
+++ new/tse3-0.3.1/src/tse3/plt/OSS.cpp	2009-01-20 21:29:27.000000000 -0500
@@ -25,6 +25,7 @@
 #include <fcntl.h>
 #include <stdarg.h>
 #include <sys/types.h>
+#include <cstring>
 
 // These #includes are linux specific and I need to do some autoconf
 // magic to work out how to conditionally include them
diff -rupN old/tse3-0.3.1/src/tse3/Serializable.h new/tse3-0.3.1/src/tse3/Serializable.h
--- old/tse3-0.3.1/src/tse3/Serializable.h	2005-07-25 07:23:00.000000000 -0400
+++ new/tse3-0.3.1/src/tse3/Serializable.h	2009-01-20 21:29:27.000000000 -0500
@@ -20,6 +20,7 @@
 #include <iosfwd>
 #include <iomanip>
 #include <cstddef>
+#include <iostream>
 
 namespace TSE3
 {
diff -rupN old/tse3-0.3.1/src/tse3/TSE2MDL.cpp new/tse3-0.3.1/src/tse3/TSE2MDL.cpp
--- old/tse3-0.3.1/src/tse3/TSE2MDL.cpp	2005-07-25 07:23:00.000000000 -0400
+++ new/tse3-0.3.1/src/tse3/TSE2MDL.cpp	2009-01-20 21:29:27.000000000 -0500
@@ -38,6 +38,7 @@
 #include "tse3/Progress.h"
 
 #include <fstream>
+#include <cstring>
 
 using namespace TSE3;
 
diff -rupN old/tse3-0.3.1/src/tse3play/tse3play.cpp new/tse3-0.3.1/src/tse3play/tse3play.cpp
--- old/tse3-0.3.1/src/tse3play/tse3play.cpp	2005-08-23 08:58:35.000000000 -0400
+++ new/tse3-0.3.1/src/tse3play/tse3play.cpp	2009-01-20 21:29:27.000000000 -0500
@@ -32,6 +32,7 @@
 #include "tse3/Error.h"
 #include "tse3/Metronome.h"
 #include <fstream>
+#include <cstdlib>
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"

tse3-size_t-64bit.patch:

--- NEW FILE tse3-size_t-64bit.patch ---
diff -rupN old/tse3-0.3.1/src/tse3/file/XML.cpp new/tse3-0.3.1/src/tse3/file/XML.cpp
--- old/tse3-0.3.1/src/tse3/file/XML.cpp	2005-08-23 08:32:53.000000000 -0400
+++ new/tse3-0.3.1/src/tse3/file/XML.cpp	2009-01-20 21:28:22.000000000 -0500
@@ -117,6 +117,13 @@ void TSE3::File::XmlFileWriter::element(
 }
 
 
+void TSE3::File::XmlFileWriter::element(const std::string &name, unsigned long value)
+{
+    indent(out);
+    out << "<" << name << " value=\"" << value << "\"/>\n";
+}
+
+
 void TSE3::File::XmlFileWriter::element(const std::string &name, bool value)
 {
     indent(out);
diff -rupN old/tse3-0.3.1/src/tse3/file/XML.h new/tse3-0.3.1/src/tse3/file/XML.h
--- old/tse3-0.3.1/src/tse3/file/XML.h	2005-08-23 08:37:53.000000000 -0400
+++ new/tse3-0.3.1/src/tse3/file/XML.h	2009-01-20 21:28:22.000000000 -0500
@@ -154,6 +154,7 @@ namespace TSE3
                 void element(const std::string &name, const char        *value);
                 void element(const std::string &name, int                value);
                 void element(const std::string &name, unsigned int       value);
+                void element(const std::string &name, unsigned long      value);
                 void element(const std::string &name, bool               value);
 
                 void comment(const std::string &comment);


--- NEW FILE tse3.spec ---
Name:           tse3
Version:        0.3.1
Release:        2%{?dist}
Summary:        MIDI Sequencer Engine
Group:          System Environment/Libraries
License:        GPL+
URL:            http://tse3.sourceforge.net/
Source:         http://downloads.sourceforge.net/tse3/%{name}-%{version}.tar.gz
# patch for archs where size_t != unsigned int
# Fixes tse3 on amd64 systems, possibly others.
# Adapted from ALT Linux
#Patch0:         tse3-0.2.7-size_t-64bit.patch
Patch0:         tse3-size_t-64bit.patch
# This one is to fix compilation issues with gcc 4.3
Patch1:         tse3-gcc43.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  alsa-lib-devel

%description
TSE3 is a powerful open source sequencer engine written in C++. It is a 
'sequencer engine' because it provides the actual driving force elements of a
sequencer but provides no form of user interface. Sequencer applications or 
multimedia presentation packages will incorporate the TSE3 libraries to 
provide a user with MIDI sequencing facilities.

%package devel
Group:          System Environment/Libraries
Summary:        Development packages for the TSE3 MIDI Sequencer Library
Requires:       %{name} == %{version}-%{release}

%description devel
TSE3 is a powerful open source sequencer engine written in C++. It is a 
'sequencer engine' because it provides the actual driving force elements of a
sequencer but provides no form of user interface. Sequencer applications or 
multimedia presentation packages will incorporate the TSE3 libraries to 
provide a user with MIDI sequencing facilities.

This package holds the development documentation, examples and header files 
for TSE3.

%prep
%setup -q
%patch0 -p2 -b .64bit
%patch1 -p2 -b .gcc43

# Fix strange permissions issues
find . -name "*.cpp" -executable -exec chmod 644 {} \;
find . -name "*.h" -executable -exec chmod 644 {} \;

# Fix encoding issues
for i in demos/Demo.tse3 doc/History; do
    iconv -o $i.iso88591 -f iso88591 -t utf8 $i
    touch -r $i $i.iso88591
    mv -f $i.iso88591 $i
done


%build
# OSS is being deprecated
%configure --with-alsa --with-mutex --with-doc-install --without-oss
# Parallel make not supported
make

%install
make install DESTDIR=%{buildroot} INSTALL="install -p" \
     docsdir=%{_docdir}/%{name}-devel-%{version}/HTML

# Sort out the development documentation. We don't want everything cluttered.

# These files belong to the devel documentation contentwise:
install -pm 0644 ChangeLog NEWS README THANKS TODO \
        %{buildroot}%{_docdir}/%{name}-devel-%{version}/

# Create a demos subdir and install all available demos in there:
install -d -m 0755 %{buildroot}%{_docdir}/%{name}-devel-%{version}/demos/
mv %{buildroot}%{_docdir}/%{name}-devel-%{version}/HTML/*.tse* \
    %{buildroot}%{_docdir}/%{name}-devel-%{version}/demos/
install -pm 0644 demos/*.ins demos/*.mid demos/*.tse* \
    %{buildroot}%{_docdir}/%{name}-devel-%{version}/demos/

# Provide the example source files in devel documentation:
make -C src/examples/ clean
cp -a src/examples/ %{buildroot}%{_docdir}/%{name}-devel-%{version}/

# Remove unneeded files:
rm -rf %{buildroot}%{_docdir}/%{name}-devel-%{version}/*/.deps \
       %{buildroot}%{_docdir}/%{name}-devel-%{version}/*/*/.deps

# Remove the library with the non-standard filename (this is a carbon copy
# of lib%{name}.so.x so we are not losing anything) and the .la file.
rm -rf %{buildroot}/%{_libdir}/lib%{name}-%{version}.so \
       %{buildroot}/%{_libdir}/*.la

%clean
rm -rf %{buildroot}

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING 
%{_bindir}/*
%{_libdir}/libtse3.so.*
%{_mandir}/man1/*


%files devel
%defattr(-,root,root,-)
%doc %{_docdir}/%{name}-devel-%{version}
%{_includedir}/*
%{_mandir}/man3/*
%{_libdir}/libtse3.so

%changelog
* Sun Jan 25 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 0.3.1-2
- Move the HTML documentation into an HTML subdirectory
- Use INSTALL="install -p"
- Drop the oss support, and the related patch

* Tue Jan 20 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 0.3.1-1
- Initial Fedora build


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/tse3/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	26 Jan 2009 22:20:46 -0000	1.1
+++ .cvsignore	27 Jan 2009 00:55:07 -0000	1.2
@@ -0,0 +1 @@
+tse3-0.3.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tse3/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	26 Jan 2009 22:20:46 -0000	1.1
+++ sources	27 Jan 2009 00:55:07 -0000	1.2
@@ -0,0 +1 @@
+3b7e35505160e2d761e5b43abb636f3c  tse3-0.3.1.tar.gz



From whot at fedoraproject.org  Tue Jan 27 00:55:51 2009
From: whot at fedoraproject.org (Peter Hutterer)
Date: Tue, 27 Jan 2009 00:55:51 +0000 (UTC)
Subject: rpms/xorg-x11-server/F-10 fedora-setup-keyboard, 1.1,
	1.2 xorg-x11-server.spec, 1.387, 1.388
Message-ID: <20090127005551.3BCF77010B@cvs1.fedora.phx.redhat.com>

Author: whot

Update of /cvs/pkgs/rpms/xorg-x11-server/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29031

Modified Files:
	fedora-setup-keyboard xorg-x11-server.spec 
Log Message:
* Tue Jan 27 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.5.3-9
- replace fedora-setup-keyboard with pure python one (#478431)




Index: fedora-setup-keyboard
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/F-10/fedora-setup-keyboard,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- fedora-setup-keyboard	4 Aug 2008 21:15:46 -0000	1.1
+++ fedora-setup-keyboard	27 Jan 2009 00:55:20 -0000	1.2
@@ -1,33 +1,48 @@
-#!/bin/sh
-#
-# Trivial egregious hack to load the console keyboard layout into XKB.
-#
-# Yes, this should really just be written in python.  If you can figure
-# out how to make hal callouts written in python _work_, then please
-# let me know.  In the meantime, we'll do this.
-
-[[ -x /usr/bin/python ]] || exit 0
-[[ -x /usr/bin/hal-set-property ]] || exit 0
-
-source /etc/sysconfig/keyboard >& /dev/null || exit 0
-
-[[ -n "$KEYTABLE" ]] || exit 0
-
-rhplquery () {
-    /usr/bin/python -c "import rhpl.keyboard_models; m = rhpl.keyboard_models.KeyboardModels().get_models(); print \"junk='%s' layout='%s' model='%s' variant='%s' options='%s'\" % tuple(m[\"$1\"])" || echo "exit 0"
-}
-
-eval `rhplquery $KEYTABLE`
-
-hal_set () {
-    if [[ -n "${!1}" ]]; then
-	/usr/bin/hal-set-property --direct --udi "$UDI" --key input.xkb.$1 --string "${!1}"
-    else
-	/usr/bin/hal-set-property --direct --udi "$UDI" --key input.xkb.$1 --remove
-    fi
-}
-
-hal_set layout
-hal_set model
-hal_set variant
-hal_set options
+#!/usr/bin/env python
+# encoding: utf-8
+# vim: tabstop=4 expandtab autoindent shiftwidth=4 fileencoding=utf-8
+"""
+fedora-setup-keyboard.py
+
+Written by Alexander D. Kanevskiy <kad at blackcatlinux.com>
+"""
+
+import sys, os, dbus
+import rhpl.keyboard_models
+from rhpl.simpleconfig import SimpleConfigFile
+
+KBDCONFIG = "/etc/sysconfig/keyboard"
+
+def main():
+    # Sanity checks
+    if 'UDI' not in os.environ:
+        sys.exit(1)
+    if not os.access(KBDCONFIG, os.R_OK):
+        sys.exit(0)
+    # Read config
+    kbd_config = SimpleConfigFile()
+    kbd_config.read(KBDCONFIG)
+    kbd_models = rhpl.keyboard_models.KeyboardModels().get_models()
+    (layout, model, variant, options) = tuple(kbd_models.get(kbd_config.info.get('KEYTABLE',''), ['', '', '', '', ''])[1:])
+    result_dict = { 'layout': layout, 'model': model, 'variant': variant, 'options': options }
+    
+    # Now let's dbus fun begin
+    if 'HALD_DIRECT_ADDR' in os.environ:
+        bus = dbus.connection.Connection(os.environ['HALD_DIRECT_ADDR'])
+    else:
+        bus = dbus.SystemBus()
+    kbd = dbus.Interface(bus.get_object("org.freedesktop.Hal", os.environ['UDI']), 'org.freedesktop.Hal.Device')
+    for key in result_dict:
+        # Respect user settings
+        value = kbd_config.info.get(key.upper(), result_dict[key])
+        if not value:
+            try:
+                kbd.RemoveProperty("input.xkb.%s" % key)
+            except dbus.exceptions.DBusException:
+                pass # key already not exist
+        else:
+            kbd.SetPropertyString("input.xkb.%s" % key, value)
+
+
+if __name__ == '__main__':
+    main()


Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/F-10/xorg-x11-server.spec,v
retrieving revision 1.387
retrieving revision 1.388
diff -u -r1.387 -r1.388
--- xorg-x11-server.spec	22 Dec 2008 18:40:09 -0000	1.387
+++ xorg-x11-server.spec	27 Jan 2009 00:55:20 -0000	1.388
@@ -19,7 +19,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.5.3
-Release:   8%{?dist}
+Release:   9%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -528,6 +528,9 @@
 
 
 %changelog
+* Tue Jan 27 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.5.3-9
+- replace fedora-setup-keyboard with pure python one (#478431)
+
 * Mon Dec 22 2008 Adam Jackson <ajax at redhat.com> 1.5.3-8
 - xserver-1.5.3-aspect-me-harder.patch: Fix mode selection when only one
   monitor is present and it doesn't claim a preferred mode.



From rathann at fedoraproject.org  Tue Jan 27 00:56:05 2009
From: rathann at fedoraproject.org (Dominik Mierzejewski)
Date: Tue, 27 Jan 2009 00:56:05 +0000 (UTC)
Subject: rpms/mnemosyne/F-10 .cvsignore, 1.2, 1.3 mnemosyne.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <20090127005605.D20367010B@cvs1.fedora.phx.redhat.com>

Author: rathann

Update of /cvs/pkgs/rpms/mnemosyne/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29145

Modified Files:
	.cvsignore mnemosyne.spec sources 
Log Message:
* Tue Jan 27 2009 Dominik Mierzejewski <rpm at greysector.net> 1.2-1.r1
- updated to 1.2-r1, fixes https://bugs.launchpad.net/mnemosyne-proj/+bug/252152



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mnemosyne/F-10/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	24 Jan 2009 16:03:48 -0000	1.2
+++ .cvsignore	27 Jan 2009 00:55:35 -0000	1.3
@@ -1 +1 @@
-mnemosyne-1.1.1-r1.tgz
+mnemosyne-1.2-r1.tgz


Index: mnemosyne.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mnemosyne/F-10/mnemosyne.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mnemosyne.spec	24 Jan 2009 16:03:49 -0000	1.1
+++ mnemosyne.spec	27 Jan 2009 00:55:35 -0000	1.2
@@ -2,8 +2,8 @@
 
 Name:		mnemosyne
 Summary:	Flash-card learning tool
-Version:	1.1.1
-Release:	3.r1%{?dist}
+Version:	1.2
+Release:	1.r1%{?dist}
 URL:		http://www.mnemosyne-proj.org/
 Source0:	http://downloads.sourceforge.net/sourceforge/mnemosyne-proj/%{name}-%{version}-r1.tgz
 Patch0:		%{name}-desktop.patch
@@ -72,6 +72,9 @@
 %{_datadir}/icons/hicolor/*/apps/%{name}.png
 
 %changelog
+* Tue Jan 27 2009 Dominik Mierzejewski <rpm at greysector.net> 1.2-1.r1
+- updated to 1.2-r1, fixes https://bugs.launchpad.net/mnemosyne-proj/+bug/252152
+
 * Tue Nov 11 2008 Dominik Mierzejewski <rpm at greysector.net> 1.1.1-3.r1
 - fixed .desktop file comment to conform to GNOME HIG
 - removed a redundant python setup.py install call


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mnemosyne/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	24 Jan 2009 16:03:49 -0000	1.2
+++ sources	27 Jan 2009 00:55:35 -0000	1.3
@@ -1 +1 @@
-2c08f6b0465f3280fcd2b17960b797bc  mnemosyne-1.1.1-r1.tgz
+156f9e80352ea1012ea707bcbeaf2cfb  mnemosyne-1.2-r1.tgz



From oget at fedoraproject.org  Tue Jan 27 00:57:30 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Tue, 27 Jan 2009 00:57:30 +0000 (UTC)
Subject: rpms/tse3/F-10 import.log, NONE, 1.1 tse3-gcc43.patch, NONE,
	1.1 tse3-size_t-64bit.patch, NONE, 1.1 tse3.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090127005730.DFB637010B@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/tse3/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29674/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	import.log tse3-gcc43.patch tse3-size_t-64bit.patch tse3.spec 
Log Message:
* Sun Jan 25 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 0.3.1-2
- Move the HTML documentation into an HTML subdirectory
- Use INSTALL="install -p"
- Drop the oss support, and the related patch

* Tue Jan 20 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 0.3.1-1
- Initial Fedora build



--- NEW FILE import.log ---
tse3-0_3_1-2_fc10:F-10:tse3-0.3.1-2.fc10.src.rpm:1233017783

tse3-gcc43.patch:

--- NEW FILE tse3-gcc43.patch ---
diff -rupN old/tse3-0.3.1/src/examples/recording/recording.cpp new/tse3-0.3.1/src/examples/recording/recording.cpp
--- old/tse3-0.3.1/src/examples/recording/recording.cpp	2005-07-25 07:22:31.000000000 -0400
+++ new/tse3-0.3.1/src/examples/recording/recording.cpp	2009-01-20 21:29:27.000000000 -0500
@@ -27,6 +27,7 @@
      **************************************************************/
 
 #include <iostream>
+#include <cstdlib>
 
 // Used in step 1
 #include "tse3/Metronome.h"
diff -rupN old/tse3-0.3.1/src/tse3/cmd/Phrase.h new/tse3-0.3.1/src/tse3/cmd/Phrase.h
--- old/tse3-0.3.1/src/tse3/cmd/Phrase.h	2005-07-25 07:22:38.000000000 -0400
+++ new/tse3-0.3.1/src/tse3/cmd/Phrase.h	2009-01-20 21:29:27.000000000 -0500
@@ -29,6 +29,7 @@ namespace TSE3
     class Phrase;
     class Song;
     class Part;
+    class PhraseEdit;
 
     namespace Cmd
     {
diff -rupN old/tse3-0.3.1/src/tse3/MidiFile.cpp new/tse3-0.3.1/src/tse3/MidiFile.cpp
--- old/tse3-0.3.1/src/tse3/MidiFile.cpp	2005-07-25 07:23:00.000000000 -0400
+++ new/tse3-0.3.1/src/tse3/MidiFile.cpp	2009-01-20 21:29:27.000000000 -0500
@@ -32,6 +32,7 @@
 #include <string>
 #include <queue>
 #include <math.h>
+#include <cstring>
 
 using namespace TSE3;
 
diff -rupN old/tse3-0.3.1/src/tse3/plt/OSS.cpp new/tse3-0.3.1/src/tse3/plt/OSS.cpp
--- old/tse3-0.3.1/src/tse3/plt/OSS.cpp	2005-07-25 07:22:56.000000000 -0400
+++ new/tse3-0.3.1/src/tse3/plt/OSS.cpp	2009-01-20 21:29:27.000000000 -0500
@@ -25,6 +25,7 @@
 #include <fcntl.h>
 #include <stdarg.h>
 #include <sys/types.h>
+#include <cstring>
 
 // These #includes are linux specific and I need to do some autoconf
 // magic to work out how to conditionally include them
diff -rupN old/tse3-0.3.1/src/tse3/Serializable.h new/tse3-0.3.1/src/tse3/Serializable.h
--- old/tse3-0.3.1/src/tse3/Serializable.h	2005-07-25 07:23:00.000000000 -0400
+++ new/tse3-0.3.1/src/tse3/Serializable.h	2009-01-20 21:29:27.000000000 -0500
@@ -20,6 +20,7 @@
 #include <iosfwd>
 #include <iomanip>
 #include <cstddef>
+#include <iostream>
 
 namespace TSE3
 {
diff -rupN old/tse3-0.3.1/src/tse3/TSE2MDL.cpp new/tse3-0.3.1/src/tse3/TSE2MDL.cpp
--- old/tse3-0.3.1/src/tse3/TSE2MDL.cpp	2005-07-25 07:23:00.000000000 -0400
+++ new/tse3-0.3.1/src/tse3/TSE2MDL.cpp	2009-01-20 21:29:27.000000000 -0500
@@ -38,6 +38,7 @@
 #include "tse3/Progress.h"
 
 #include <fstream>
+#include <cstring>
 
 using namespace TSE3;
 
diff -rupN old/tse3-0.3.1/src/tse3play/tse3play.cpp new/tse3-0.3.1/src/tse3play/tse3play.cpp
--- old/tse3-0.3.1/src/tse3play/tse3play.cpp	2005-08-23 08:58:35.000000000 -0400
+++ new/tse3-0.3.1/src/tse3play/tse3play.cpp	2009-01-20 21:29:27.000000000 -0500
@@ -32,6 +32,7 @@
 #include "tse3/Error.h"
 #include "tse3/Metronome.h"
 #include <fstream>
+#include <cstdlib>
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"

tse3-size_t-64bit.patch:

--- NEW FILE tse3-size_t-64bit.patch ---
diff -rupN old/tse3-0.3.1/src/tse3/file/XML.cpp new/tse3-0.3.1/src/tse3/file/XML.cpp
--- old/tse3-0.3.1/src/tse3/file/XML.cpp	2005-08-23 08:32:53.000000000 -0400
+++ new/tse3-0.3.1/src/tse3/file/XML.cpp	2009-01-20 21:28:22.000000000 -0500
@@ -117,6 +117,13 @@ void TSE3::File::XmlFileWriter::element(
 }
 
 
+void TSE3::File::XmlFileWriter::element(const std::string &name, unsigned long value)
+{
+    indent(out);
+    out << "<" << name << " value=\"" << value << "\"/>\n";
+}
+
+
 void TSE3::File::XmlFileWriter::element(const std::string &name, bool value)
 {
     indent(out);
diff -rupN old/tse3-0.3.1/src/tse3/file/XML.h new/tse3-0.3.1/src/tse3/file/XML.h
--- old/tse3-0.3.1/src/tse3/file/XML.h	2005-08-23 08:37:53.000000000 -0400
+++ new/tse3-0.3.1/src/tse3/file/XML.h	2009-01-20 21:28:22.000000000 -0500
@@ -154,6 +154,7 @@ namespace TSE3
                 void element(const std::string &name, const char        *value);
                 void element(const std::string &name, int                value);
                 void element(const std::string &name, unsigned int       value);
+                void element(const std::string &name, unsigned long      value);
                 void element(const std::string &name, bool               value);
 
                 void comment(const std::string &comment);


--- NEW FILE tse3.spec ---
Name:           tse3
Version:        0.3.1
Release:        2%{?dist}
Summary:        MIDI Sequencer Engine
Group:          System Environment/Libraries
License:        GPL+
URL:            http://tse3.sourceforge.net/
Source:         http://downloads.sourceforge.net/tse3/%{name}-%{version}.tar.gz
# patch for archs where size_t != unsigned int
# Fixes tse3 on amd64 systems, possibly others.
# Adapted from ALT Linux
#Patch0:         tse3-0.2.7-size_t-64bit.patch
Patch0:         tse3-size_t-64bit.patch
# This one is to fix compilation issues with gcc 4.3
Patch1:         tse3-gcc43.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  alsa-lib-devel

%description
TSE3 is a powerful open source sequencer engine written in C++. It is a 
'sequencer engine' because it provides the actual driving force elements of a
sequencer but provides no form of user interface. Sequencer applications or 
multimedia presentation packages will incorporate the TSE3 libraries to 
provide a user with MIDI sequencing facilities.

%package devel
Group:          System Environment/Libraries
Summary:        Development packages for the TSE3 MIDI Sequencer Library
Requires:       %{name} == %{version}-%{release}

%description devel
TSE3 is a powerful open source sequencer engine written in C++. It is a 
'sequencer engine' because it provides the actual driving force elements of a
sequencer but provides no form of user interface. Sequencer applications or 
multimedia presentation packages will incorporate the TSE3 libraries to 
provide a user with MIDI sequencing facilities.

This package holds the development documentation, examples and header files 
for TSE3.

%prep
%setup -q
%patch0 -p2 -b .64bit
%patch1 -p2 -b .gcc43

# Fix strange permissions issues
find . -name "*.cpp" -executable -exec chmod 644 {} \;
find . -name "*.h" -executable -exec chmod 644 {} \;

# Fix encoding issues
for i in demos/Demo.tse3 doc/History; do
    iconv -o $i.iso88591 -f iso88591 -t utf8 $i
    touch -r $i $i.iso88591
    mv -f $i.iso88591 $i
done


%build
# OSS is being deprecated
%configure --with-alsa --with-mutex --with-doc-install --without-oss
# Parallel make not supported
make

%install
make install DESTDIR=%{buildroot} INSTALL="install -p" \
     docsdir=%{_docdir}/%{name}-devel-%{version}/HTML

# Sort out the development documentation. We don't want everything cluttered.

# These files belong to the devel documentation contentwise:
install -pm 0644 ChangeLog NEWS README THANKS TODO \
        %{buildroot}%{_docdir}/%{name}-devel-%{version}/

# Create a demos subdir and install all available demos in there:
install -d -m 0755 %{buildroot}%{_docdir}/%{name}-devel-%{version}/demos/
mv %{buildroot}%{_docdir}/%{name}-devel-%{version}/HTML/*.tse* \
    %{buildroot}%{_docdir}/%{name}-devel-%{version}/demos/
install -pm 0644 demos/*.ins demos/*.mid demos/*.tse* \
    %{buildroot}%{_docdir}/%{name}-devel-%{version}/demos/

# Provide the example source files in devel documentation:
make -C src/examples/ clean
cp -a src/examples/ %{buildroot}%{_docdir}/%{name}-devel-%{version}/

# Remove unneeded files:
rm -rf %{buildroot}%{_docdir}/%{name}-devel-%{version}/*/.deps \
       %{buildroot}%{_docdir}/%{name}-devel-%{version}/*/*/.deps

# Remove the library with the non-standard filename (this is a carbon copy
# of lib%{name}.so.x so we are not losing anything) and the .la file.
rm -rf %{buildroot}/%{_libdir}/lib%{name}-%{version}.so \
       %{buildroot}/%{_libdir}/*.la

%clean
rm -rf %{buildroot}

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING 
%{_bindir}/*
%{_libdir}/libtse3.so.*
%{_mandir}/man1/*


%files devel
%defattr(-,root,root,-)
%doc %{_docdir}/%{name}-devel-%{version}
%{_includedir}/*
%{_mandir}/man3/*
%{_libdir}/libtse3.so

%changelog
* Sun Jan 25 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 0.3.1-2
- Move the HTML documentation into an HTML subdirectory
- Use INSTALL="install -p"
- Drop the oss support, and the related patch

* Tue Jan 20 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 0.3.1-1
- Initial Fedora build


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/tse3/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	26 Jan 2009 22:20:46 -0000	1.1
+++ .cvsignore	27 Jan 2009 00:57:00 -0000	1.2
@@ -0,0 +1 @@
+tse3-0.3.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tse3/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	26 Jan 2009 22:20:46 -0000	1.1
+++ sources	27 Jan 2009 00:57:00 -0000	1.2
@@ -0,0 +1 @@
+3b7e35505160e2d761e5b43abb636f3c  tse3-0.3.1.tar.gz



From oget at fedoraproject.org  Tue Jan 27 00:59:13 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Tue, 27 Jan 2009 00:59:13 +0000 (UTC)
Subject: rpms/tse3/F-9 import.log, NONE, 1.1 tse3-gcc43.patch, NONE,
	1.1 tse3-size_t-64bit.patch, NONE, 1.1 tse3.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090127005913.744AB7010B@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/tse3/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30169/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	import.log tse3-gcc43.patch tse3-size_t-64bit.patch tse3.spec 
Log Message:
* Sun Jan 25 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 0.3.1-2
- Move the HTML documentation into an HTML subdirectory
- Use INSTALL="install -p"
- Drop the oss support, and the related patch

* Tue Jan 20 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 0.3.1-1
- Initial Fedora build



--- NEW FILE import.log ---
tse3-0_3_1-2_fc10:F-9:tse3-0.3.1-2.fc10.src.rpm:1233017896

tse3-gcc43.patch:

--- NEW FILE tse3-gcc43.patch ---
diff -rupN old/tse3-0.3.1/src/examples/recording/recording.cpp new/tse3-0.3.1/src/examples/recording/recording.cpp
--- old/tse3-0.3.1/src/examples/recording/recording.cpp	2005-07-25 07:22:31.000000000 -0400
+++ new/tse3-0.3.1/src/examples/recording/recording.cpp	2009-01-20 21:29:27.000000000 -0500
@@ -27,6 +27,7 @@
      **************************************************************/
 
 #include <iostream>
+#include <cstdlib>
 
 // Used in step 1
 #include "tse3/Metronome.h"
diff -rupN old/tse3-0.3.1/src/tse3/cmd/Phrase.h new/tse3-0.3.1/src/tse3/cmd/Phrase.h
--- old/tse3-0.3.1/src/tse3/cmd/Phrase.h	2005-07-25 07:22:38.000000000 -0400
+++ new/tse3-0.3.1/src/tse3/cmd/Phrase.h	2009-01-20 21:29:27.000000000 -0500
@@ -29,6 +29,7 @@ namespace TSE3
     class Phrase;
     class Song;
     class Part;
+    class PhraseEdit;
 
     namespace Cmd
     {
diff -rupN old/tse3-0.3.1/src/tse3/MidiFile.cpp new/tse3-0.3.1/src/tse3/MidiFile.cpp
--- old/tse3-0.3.1/src/tse3/MidiFile.cpp	2005-07-25 07:23:00.000000000 -0400
+++ new/tse3-0.3.1/src/tse3/MidiFile.cpp	2009-01-20 21:29:27.000000000 -0500
@@ -32,6 +32,7 @@
 #include <string>
 #include <queue>
 #include <math.h>
+#include <cstring>
 
 using namespace TSE3;
 
diff -rupN old/tse3-0.3.1/src/tse3/plt/OSS.cpp new/tse3-0.3.1/src/tse3/plt/OSS.cpp
--- old/tse3-0.3.1/src/tse3/plt/OSS.cpp	2005-07-25 07:22:56.000000000 -0400
+++ new/tse3-0.3.1/src/tse3/plt/OSS.cpp	2009-01-20 21:29:27.000000000 -0500
@@ -25,6 +25,7 @@
 #include <fcntl.h>
 #include <stdarg.h>
 #include <sys/types.h>
+#include <cstring>
 
 // These #includes are linux specific and I need to do some autoconf
 // magic to work out how to conditionally include them
diff -rupN old/tse3-0.3.1/src/tse3/Serializable.h new/tse3-0.3.1/src/tse3/Serializable.h
--- old/tse3-0.3.1/src/tse3/Serializable.h	2005-07-25 07:23:00.000000000 -0400
+++ new/tse3-0.3.1/src/tse3/Serializable.h	2009-01-20 21:29:27.000000000 -0500
@@ -20,6 +20,7 @@
 #include <iosfwd>
 #include <iomanip>
 #include <cstddef>
+#include <iostream>
 
 namespace TSE3
 {
diff -rupN old/tse3-0.3.1/src/tse3/TSE2MDL.cpp new/tse3-0.3.1/src/tse3/TSE2MDL.cpp
--- old/tse3-0.3.1/src/tse3/TSE2MDL.cpp	2005-07-25 07:23:00.000000000 -0400
+++ new/tse3-0.3.1/src/tse3/TSE2MDL.cpp	2009-01-20 21:29:27.000000000 -0500
@@ -38,6 +38,7 @@
 #include "tse3/Progress.h"
 
 #include <fstream>
+#include <cstring>
 
 using namespace TSE3;
 
diff -rupN old/tse3-0.3.1/src/tse3play/tse3play.cpp new/tse3-0.3.1/src/tse3play/tse3play.cpp
--- old/tse3-0.3.1/src/tse3play/tse3play.cpp	2005-08-23 08:58:35.000000000 -0400
+++ new/tse3-0.3.1/src/tse3play/tse3play.cpp	2009-01-20 21:29:27.000000000 -0500
@@ -32,6 +32,7 @@
 #include "tse3/Error.h"
 #include "tse3/Metronome.h"
 #include <fstream>
+#include <cstdlib>
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"

tse3-size_t-64bit.patch:

--- NEW FILE tse3-size_t-64bit.patch ---
diff -rupN old/tse3-0.3.1/src/tse3/file/XML.cpp new/tse3-0.3.1/src/tse3/file/XML.cpp
--- old/tse3-0.3.1/src/tse3/file/XML.cpp	2005-08-23 08:32:53.000000000 -0400
+++ new/tse3-0.3.1/src/tse3/file/XML.cpp	2009-01-20 21:28:22.000000000 -0500
@@ -117,6 +117,13 @@ void TSE3::File::XmlFileWriter::element(
 }
 
 
+void TSE3::File::XmlFileWriter::element(const std::string &name, unsigned long value)
+{
+    indent(out);
+    out << "<" << name << " value=\"" << value << "\"/>\n";
+}
+
+
 void TSE3::File::XmlFileWriter::element(const std::string &name, bool value)
 {
     indent(out);
diff -rupN old/tse3-0.3.1/src/tse3/file/XML.h new/tse3-0.3.1/src/tse3/file/XML.h
--- old/tse3-0.3.1/src/tse3/file/XML.h	2005-08-23 08:37:53.000000000 -0400
+++ new/tse3-0.3.1/src/tse3/file/XML.h	2009-01-20 21:28:22.000000000 -0500
@@ -154,6 +154,7 @@ namespace TSE3
                 void element(const std::string &name, const char        *value);
                 void element(const std::string &name, int                value);
                 void element(const std::string &name, unsigned int       value);
+                void element(const std::string &name, unsigned long      value);
                 void element(const std::string &name, bool               value);
 
                 void comment(const std::string &comment);


--- NEW FILE tse3.spec ---
Name:           tse3
Version:        0.3.1
Release:        2%{?dist}
Summary:        MIDI Sequencer Engine
Group:          System Environment/Libraries
License:        GPL+
URL:            http://tse3.sourceforge.net/
Source:         http://downloads.sourceforge.net/tse3/%{name}-%{version}.tar.gz
# patch for archs where size_t != unsigned int
# Fixes tse3 on amd64 systems, possibly others.
# Adapted from ALT Linux
#Patch0:         tse3-0.2.7-size_t-64bit.patch
Patch0:         tse3-size_t-64bit.patch
# This one is to fix compilation issues with gcc 4.3
Patch1:         tse3-gcc43.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  alsa-lib-devel

%description
TSE3 is a powerful open source sequencer engine written in C++. It is a 
'sequencer engine' because it provides the actual driving force elements of a
sequencer but provides no form of user interface. Sequencer applications or 
multimedia presentation packages will incorporate the TSE3 libraries to 
provide a user with MIDI sequencing facilities.

%package devel
Group:          System Environment/Libraries
Summary:        Development packages for the TSE3 MIDI Sequencer Library
Requires:       %{name} == %{version}-%{release}

%description devel
TSE3 is a powerful open source sequencer engine written in C++. It is a 
'sequencer engine' because it provides the actual driving force elements of a
sequencer but provides no form of user interface. Sequencer applications or 
multimedia presentation packages will incorporate the TSE3 libraries to 
provide a user with MIDI sequencing facilities.

This package holds the development documentation, examples and header files 
for TSE3.

%prep
%setup -q
%patch0 -p2 -b .64bit
%patch1 -p2 -b .gcc43

# Fix strange permissions issues
find . -name "*.cpp" -executable -exec chmod 644 {} \;
find . -name "*.h" -executable -exec chmod 644 {} \;

# Fix encoding issues
for i in demos/Demo.tse3 doc/History; do
    iconv -o $i.iso88591 -f iso88591 -t utf8 $i
    touch -r $i $i.iso88591
    mv -f $i.iso88591 $i
done


%build
# OSS is being deprecated
%configure --with-alsa --with-mutex --with-doc-install --without-oss
# Parallel make not supported
make

%install
make install DESTDIR=%{buildroot} INSTALL="install -p" \
     docsdir=%{_docdir}/%{name}-devel-%{version}/HTML

# Sort out the development documentation. We don't want everything cluttered.

# These files belong to the devel documentation contentwise:
install -pm 0644 ChangeLog NEWS README THANKS TODO \
        %{buildroot}%{_docdir}/%{name}-devel-%{version}/

# Create a demos subdir and install all available demos in there:
install -d -m 0755 %{buildroot}%{_docdir}/%{name}-devel-%{version}/demos/
mv %{buildroot}%{_docdir}/%{name}-devel-%{version}/HTML/*.tse* \
    %{buildroot}%{_docdir}/%{name}-devel-%{version}/demos/
install -pm 0644 demos/*.ins demos/*.mid demos/*.tse* \
    %{buildroot}%{_docdir}/%{name}-devel-%{version}/demos/

# Provide the example source files in devel documentation:
make -C src/examples/ clean
cp -a src/examples/ %{buildroot}%{_docdir}/%{name}-devel-%{version}/

# Remove unneeded files:
rm -rf %{buildroot}%{_docdir}/%{name}-devel-%{version}/*/.deps \
       %{buildroot}%{_docdir}/%{name}-devel-%{version}/*/*/.deps

# Remove the library with the non-standard filename (this is a carbon copy
# of lib%{name}.so.x so we are not losing anything) and the .la file.
rm -rf %{buildroot}/%{_libdir}/lib%{name}-%{version}.so \
       %{buildroot}/%{_libdir}/*.la

%clean
rm -rf %{buildroot}

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING 
%{_bindir}/*
%{_libdir}/libtse3.so.*
%{_mandir}/man1/*


%files devel
%defattr(-,root,root,-)
%doc %{_docdir}/%{name}-devel-%{version}
%{_includedir}/*
%{_mandir}/man3/*
%{_libdir}/libtse3.so

%changelog
* Sun Jan 25 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 0.3.1-2
- Move the HTML documentation into an HTML subdirectory
- Use INSTALL="install -p"
- Drop the oss support, and the related patch

* Tue Jan 20 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 0.3.1-1
- Initial Fedora build


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/tse3/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	26 Jan 2009 22:20:46 -0000	1.1
+++ .cvsignore	27 Jan 2009 00:58:43 -0000	1.2
@@ -0,0 +1 @@
+tse3-0.3.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tse3/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	26 Jan 2009 22:20:46 -0000	1.1
+++ sources	27 Jan 2009 00:58:43 -0000	1.2
@@ -0,0 +1 @@
+3b7e35505160e2d761e5b43abb636f3c  tse3-0.3.1.tar.gz



From icon at fedoraproject.org  Tue Jan 27 01:02:27 2009
From: icon at fedoraproject.org (Konstantin Ryabitsev)
Date: Tue, 27 Jan 2009 01:02:27 +0000 (UTC)
Subject: rpms/python-kiwi/EL-5 .cvsignore, 1.6, 1.7 python-kiwi.spec, 1.7,
	1.8 sources, 1.6, 1.7
Message-ID: <20090127010227.16C277010B@cvs1.fedora.phx.redhat.com>

Author: icon

Update of /cvs/extras/rpms/python-kiwi/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30798

Modified Files:
	.cvsignore python-kiwi.spec sources 
Log Message:
Update to latest and build.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-kiwi/EL-5/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	1 Apr 2007 21:14:40 -0000	1.6
+++ .cvsignore	27 Jan 2009 01:01:56 -0000	1.7
@@ -1 +1 @@
-kiwi-1.9.14.tar.bz2
+kiwi-1.9.23.tar.gz


Index: python-kiwi.spec
===================================================================
RCS file: /cvs/extras/rpms/python-kiwi/EL-5/python-kiwi.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- python-kiwi.spec	1 Apr 2007 21:14:40 -0000	1.7
+++ python-kiwi.spec	27 Jan 2009 01:01:56 -0000	1.8
@@ -2,15 +2,15 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           python-kiwi
-Version:        1.9.14
-Release:        1%{?dist}
+Version:        1.9.23
+Release:        2%{?dist}
 Summary:        Framework for Python GUI applications
 
 Group:          Development/Libraries
-License:        LGPL
+License:        LGPLv2+
 URL:            http://www.async.com.br/projects/kiwi/
-Source0:        http://download.gnome.org/sources/kiwi/1.9/kiwi-%{version}.tar.bz2
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Source0:        http://ftp.gnome.org/pub/GNOME/sources/kiwi/1.9/kiwi-%{version}.tar.gz
+BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 BuildArch:      noarch
 BuildRequires:  python-devel, pygtk2-devel >= 2.8, gettext, pkgconfig
@@ -93,6 +93,38 @@
 
 
 %changelog
+* Mon Jan 26 2009 Konstantin Ryabitsev <icon at fedoraproject.org> - 1.9.23-2
+- Build for EL-5
+- Do not package .egg-info
+
+* Mon Dec 29 2008 Konstantin Ryabitsev <icon at fedoraproject.org> - 1.9.23-1
+- Upstream 1.9.23
+
+* Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 1.9.22-2
+- Rebuild for Python 2.6
+
+* Mon Jun 30 2008 Konstantin Ryabitsev <icon at fedoraproject.org> - 1.9.22-1
+- Upstream 1.9.22
+
+* Sat May 10 2008 Konstantin Ryabitsev <icon at fedoraproject.org> - 1.9.21-1
+- Upstream 1.9.21
+
+* Sun Feb 17 2008 Konstantin Ryabitsev <icon at fedoraproject.org> - 1.9.20-2
+- Upstream 1.9.20
+
+* Thu Jan 17 2008 Konstantin Ryabitsev <icon at fedoraproject.org> - 1.9.19-2
+- Package the egg-info file.
+
+* Sun Dec 23 2007 Konstantin Ryabitsev <icon at fedoraproject.org> - 1.9.19-1
+- Upstream 1.9.19
+
+* Fri Aug 17 2007 Konstantin Ryabitsev <icon at fedoraproject.org> - 1.9.16-1
+- Upstream 1.9.16
+- Appease license naming gods -- LGPLv2+
+
+* Mon Jun 11 2007 Konstantin Ryabitsev <icon at fedoraproject.org> - 1.9.15-1
+- Upstream 1.9.15
+
 * Sun Apr 01 2007 Konstantin Ryabitsev <icon at fedoraproject.org> - 1.9.14-1
 - Upstream 1.9.14
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-kiwi/EL-5/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	1 Apr 2007 21:14:40 -0000	1.6
+++ sources	27 Jan 2009 01:01:56 -0000	1.7
@@ -1 +1 @@
-4779754c73e70cdd7c23e025a1830eb7  kiwi-1.9.14.tar.bz2
+e68e3da96c3848ac534fbd200ffcd35a  kiwi-1.9.23.tar.gz



From rathann at fedoraproject.org  Tue Jan 27 01:02:30 2009
From: rathann at fedoraproject.org (Dominik Mierzejewski)
Date: Tue, 27 Jan 2009 01:02:30 +0000 (UTC)
Subject: rpms/mnemosyne/F-9 .cvsignore, 1.2, 1.3 mnemosyne.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <20090127010230.E02697010B@cvs1.fedora.phx.redhat.com>

Author: rathann

Update of /cvs/pkgs/rpms/mnemosyne/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30837

Modified Files:
	.cvsignore mnemosyne.spec sources 
Log Message:
* Tue Jan 27 2009 Dominik Mierzejewski <rpm at greysector.net> 1.2-1.r1
- updated to 1.2-r1, fixes https://bugs.launchpad.net/mnemosyne-proj/+bug/252152



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mnemosyne/F-9/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	24 Jan 2009 16:12:06 -0000	1.2
+++ .cvsignore	27 Jan 2009 01:02:00 -0000	1.3
@@ -1 +1 @@
-mnemosyne-1.1.1-r1.tgz
+mnemosyne-1.2-r1.tgz


Index: mnemosyne.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mnemosyne/F-9/mnemosyne.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mnemosyne.spec	24 Jan 2009 16:12:06 -0000	1.1
+++ mnemosyne.spec	27 Jan 2009 01:02:00 -0000	1.2
@@ -2,8 +2,8 @@
 
 Name:		mnemosyne
 Summary:	Flash-card learning tool
-Version:	1.1.1
-Release:	3.r1%{?dist}
+Version:	1.2
+Release:	1.r1%{?dist}
 URL:		http://www.mnemosyne-proj.org/
 Source0:	http://downloads.sourceforge.net/sourceforge/mnemosyne-proj/%{name}-%{version}-r1.tgz
 Patch0:		%{name}-desktop.patch
@@ -72,6 +72,9 @@
 %{_datadir}/icons/hicolor/*/apps/%{name}.png
 
 %changelog
+* Tue Jan 27 2009 Dominik Mierzejewski <rpm at greysector.net> 1.2-1.r1
+- updated to 1.2-r1, fixes https://bugs.launchpad.net/mnemosyne-proj/+bug/252152
+
 * Tue Nov 11 2008 Dominik Mierzejewski <rpm at greysector.net> 1.1.1-3.r1
 - fixed .desktop file comment to conform to GNOME HIG
 - removed a redundant python setup.py install call


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mnemosyne/F-9/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	24 Jan 2009 16:12:06 -0000	1.2
+++ sources	27 Jan 2009 01:02:00 -0000	1.3
@@ -1 +1 @@
-2c08f6b0465f3280fcd2b17960b797bc  mnemosyne-1.1.1-r1.tgz
+156f9e80352ea1012ea707bcbeaf2cfb  mnemosyne-1.2-r1.tgz



From tmz at fedoraproject.org  Tue Jan 27 01:25:33 2009
From: tmz at fedoraproject.org (Todd M. Zullinger)
Date: Tue, 27 Jan 2009 01:25:33 +0000 (UTC)
Subject: rpms/git/devel .cvsignore, 1.69, 1.70 git.spec, 1.77, 1.78 sources, 
	1.69, 1.70
Message-ID: <20090127012533.C3CD67010B@cvs1.fedora.phx.redhat.com>

Author: tmz

Update of /cvs/extras/rpms/git/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1883

Modified Files:
	.cvsignore git.spec sources 
Log Message:
Update to git-1.6.1.1

Also, make the compile more verbose.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/git/devel/.cvsignore,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- .cvsignore	3 Jan 2009 16:36:21 -0000	1.69
+++ .cvsignore	27 Jan 2009 01:25:02 -0000	1.70
@@ -1 +1 @@
-git-1.6.1.tar.bz2
+git-1.6.1.1.tar.bz2


Index: git.spec
===================================================================
RCS file: /cvs/extras/rpms/git/devel/git.spec,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- git.spec	16 Jan 2009 15:16:36 -0000	1.77
+++ git.spec	27 Jan 2009 01:25:02 -0000	1.78
@@ -1,7 +1,7 @@
 # Pass --without docs to rpmbuild if you don't want the documentation
 Name:           git
-Version:        1.6.1
-Release:        2%{?dist}
+Version:        1.6.1.1
+Release:        1%{?dist}
 Summary:        Core git tools
 License:        GPLv2
 Group:          Development/Tools
@@ -134,7 +134,7 @@
 # Use these same options for every invocation of 'make'.
 # Otherwise it will rebuild in %%install due to flags changes.
 %define make_git \
-make %{_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" \\\
+make %{_smp_mflags} V=1 CFLAGS="$RPM_OPT_FLAGS" \\\
      ETC_GITCONFIG=%{_sysconfdir}/gitconfig \\\
      DESTDIR=$RPM_BUILD_ROOT \\\
      DOCBOOK_XSL_172=YesPlease \\\
@@ -273,6 +273,10 @@
 # No files for you!
 
 %changelog
+* Mon Jan 26 2009 Todd Zullinger <tmz at pobox.com> 1.6.1.1-1
+- git-1.6.1.1
+- Make compile more verbose
+
 * Fri Jan 16 2009 Tomas Mraz <tmraz at redhat.com> 1.6.1-2
 - rebuild with new openssl
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/git/devel/sources,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- sources	3 Jan 2009 16:36:21 -0000	1.69
+++ sources	27 Jan 2009 01:25:02 -0000	1.70
@@ -1 +1 @@
-66265d85593473b23290232b9dccef77  git-1.6.1.tar.bz2
+d2b6925cb03e1e33911fdf9392946747  git-1.6.1.1.tar.bz2



From crobinso at fedoraproject.org  Tue Jan 27 01:28:50 2009
From: crobinso at fedoraproject.org (Cole Robinson)
Date: Tue, 27 Jan 2009 01:28:50 +0000 (UTC)
Subject: rpms/virt-manager/devel .cvsignore, 1.20, 1.21 sources, 1.20,
	1.21 virt-manager.spec, 1.42,
	1.43 virt-manager-0.6.0-conn-details-sensitivity.patch, 1.1,
	NONE virt-manager-0.6.0-connect-variable-typo.patch, 1.1,
	NONE virt-manager-0.6.0-fix-virt-type-desc.patch, 1.2,
	NONE virt-manager-0.6.0-ignore-sighup.patch, 1.1,
	NONE virt-manager-0.6.0-multiple-sound-dev.patch, 1.1,
	NONE virt-manager-0.6.0-polkit-root.patch, 1.2,
	NONE virt-manager-0.6.0-populate-hostinfo-early.patch, 1.1,
	NONE virt-manager-0.6.0-update-potfiles.patch, 1.1,
	NONE virt-manager-0.6.0-update-translations.patch, 1.1,
	NONE virt-manager-0.6.0-vol-copy-popup.patch, 1.1, NONE
Message-ID: <20090127012850.17E917010B@cvs1.fedora.phx.redhat.com>

Author: crobinso

Update of /cvs/pkgs/rpms/virt-manager/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2226

Modified Files:
	.cvsignore sources virt-manager.spec 
Removed Files:
	virt-manager-0.6.0-conn-details-sensitivity.patch 
	virt-manager-0.6.0-connect-variable-typo.patch 
	virt-manager-0.6.0-fix-virt-type-desc.patch 
	virt-manager-0.6.0-ignore-sighup.patch 
	virt-manager-0.6.0-multiple-sound-dev.patch 
	virt-manager-0.6.0-polkit-root.patch 
	virt-manager-0.6.0-populate-hostinfo-early.patch 
	virt-manager-0.6.0-update-potfiles.patch 
	virt-manager-0.6.0-update-translations.patch 
	virt-manager-0.6.0-vol-copy-popup.patch 
Log Message:
Update to 0.6.1 release
Disk and Network VM stats reporting
VM Migration support
Support adding sound devices to existing VMs
Allow specifying device model when adding a network device to an existing VM



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/virt-manager/devel/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- .cvsignore	10 Sep 2008 23:06:21 -0000	1.20
+++ .cvsignore	27 Jan 2009 01:28:18 -0000	1.21
@@ -1 +1 @@
-virt-manager-0.6.0.tar.gz
+virt-manager-0.6.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/virt-manager/devel/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources	10 Sep 2008 23:06:21 -0000	1.20
+++ sources	27 Jan 2009 01:28:18 -0000	1.21
@@ -1 +1 @@
-fd0acd111f180a0766b08d5f42cf5468  virt-manager-0.6.0.tar.gz
+9c4eeaf447919b425f890b6bff715512  virt-manager-0.6.1.tar.gz


Index: virt-manager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/virt-manager/devel/virt-manager.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- virt-manager.spec	20 Jan 2009 18:10:50 -0000	1.42
+++ virt-manager.spec	27 Jan 2009 01:28:19 -0000	1.43
@@ -7,8 +7,8 @@
 %define _extra_release %{?dist:%{dist}}%{!?dist:%{?extra_release:%{extra_release}}}
 
 Name: virt-manager
-Version: 0.6.0
-Release: 7%{_extra_release}
+Version: 0.6.1
+Release: 1%{_extra_release}
 Summary: Virtual Machine Manager
 
 Group: Applications/Emulators
@@ -17,16 +17,6 @@
 Source0: http://virt-manager.org/download/sources/%{name}/%{name}-%{version}.tar.gz
 Source1: %{name}.pam
 Source2: %{name}.console
-Patch1: %{name}-%{version}-polkit-root.patch
-Patch2: %{name}-%{version}-conn-details-sensitivity.patch
-Patch3: %{name}-%{version}-populate-hostinfo-early.patch
-Patch4: %{name}-%{version}-update-potfiles.patch
-Patch5: %{name}-%{version}-update-translations.patch
-Patch6: %{name}-%{version}-multiple-sound-dev.patch
-Patch7: %{name}-%{version}-vol-copy-popup.patch
-Patch8: %{name}-%{version}-connect-variable-typo.patch
-Patch9: %{name}-%{version}-fix-virt-type-desc.patch
-Patch10: %{name}-%{version}-ignore-sighup.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # These two are just the oldest version tested
@@ -53,7 +43,7 @@
 # Minimum we've tested with
 Requires: libxml2-python >= 2.6.23
 # Required to install Xen & QEMU guests
-Requires: python-virtinst >= 0.400.0
+Requires: python-virtinst >= 0.400.1
 # Required for loading the glade UI
 Requires: pygtk2-libglade
 # Required for our graphics which are currently SVG format
@@ -96,16 +86,6 @@
 
 %prep
 %setup -q
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
-%patch9 -p1
-%patch10 -p1
 
 %build
 %configure
@@ -195,6 +175,13 @@
 %{_datadir}/dbus-1/services/%{name}.service
 
 %changelog
+* Mon Jan 26 2009 Cole Robinson <crobinso at redhat.com> - 0.6.1-1
+- Update to 0.6.1 release
+- Disk and Network VM stats reporting
+- VM Migration support
+- Support adding sound devices to existing VMs
+- Allow specifying device model when adding a network device to an existing VM
+
 * Tue Jan 20 2009 Mark McLoughlin <markmc at redhat.com> - 0.6.0-7
 - Add patch to ignore fix crash on force-poweroff with serial console (#470548)
 


--- virt-manager-0.6.0-conn-details-sensitivity.patch DELETED ---


--- virt-manager-0.6.0-connect-variable-typo.patch DELETED ---


--- virt-manager-0.6.0-fix-virt-type-desc.patch DELETED ---


--- virt-manager-0.6.0-ignore-sighup.patch DELETED ---


--- virt-manager-0.6.0-multiple-sound-dev.patch DELETED ---


--- virt-manager-0.6.0-polkit-root.patch DELETED ---


--- virt-manager-0.6.0-populate-hostinfo-early.patch DELETED ---


--- virt-manager-0.6.0-update-potfiles.patch DELETED ---


--- virt-manager-0.6.0-update-translations.patch DELETED ---


--- virt-manager-0.6.0-vol-copy-popup.patch DELETED ---



From rakesh at fedoraproject.org  Tue Jan 27 01:56:36 2009
From: rakesh at fedoraproject.org (Rakesh Pandit)
Date: Tue, 27 Jan 2009 01:56:36 +0000 (UTC)
Subject: rpms/code2html/devel code2html.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090127015636.881BC7010B@cvs1.fedora.phx.redhat.com>

Author: rakesh

Update of /cvs/pkgs/rpms/code2html/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6236/devel

Modified Files:
	.cvsignore sources 
Added Files:
	code2html.spec import.log 
Log Message:
Initial import



--- NEW FILE code2html.spec ---
Name:           code2html
Version:        0.9.1
Release:        2%{?dist}
Summary:        Convert source code to HTML

Group:          Applications/Publishing     
License:        MIT
URL:            http://search.cpan.org/dist/code2html/
Source0:        http://www.palfrader.org/code2html/all/latest.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
Code2HTML converts a program source code to syntax highlighted HTML.

%prep
%setup -q
iconv -f iso8859-1 -t utf-8 %{name}.1 > %{name}.1.conv && mv -f %{name}.1.conv %{name}.1

%build
# Empty build


%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_bindir}
install -p -m 755 %{name} $RPM_BUILD_ROOT%{_bindir}/

mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
install -p -m 644 ChangeLog  CREDITS  LICENSE  README $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/

mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
install -p -m 644 %{name}.1 $RPM_BUILD_ROOT%{_mandir}/man1/


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc ChangeLog  CREDITS  LICENSE  README
%{_bindir}/%{name}
%{_mandir}/man1/%{name}.1.gz


%changelog
* Mon Jan 26 2009 Rakesh Pandit <rakesh at fedoraproject.org> 0.9.1-2
- Fixed wrong license field and used -p while installing

* Mon Jan 26 2009 Rakesh Pandit <rakesh at fedoraproject.org> 0.9.1-1
- Initial package


--- NEW FILE import.log ---
code2html-0_9_1-2_fc10:HEAD:code2html-0.9.1-2.fc10.src.rpm:1233021094


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/code2html/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	26 Jan 2009 23:05:39 -0000	1.1
+++ .cvsignore	27 Jan 2009 01:56:05 -0000	1.2
@@ -0,0 +1 @@
+latest.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/code2html/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	26 Jan 2009 23:05:39 -0000	1.1
+++ sources	27 Jan 2009 01:56:05 -0000	1.2
@@ -0,0 +1 @@
+368377696547026c79c51a274571dc39  latest.tar.gz



From oget at fedoraproject.org  Tue Jan 27 02:05:31 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Tue, 27 Jan 2009 02:05:31 +0000 (UTC)
Subject: rpms/tse3/F-9 tse3.spec,1.1,1.2
Message-ID: <20090127020531.CC6B57010B@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/tse3/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7670

Modified Files:
	tse3.spec 
Log Message:
* Mon Jan 26 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 0.3.1-2.1
- Use -perm /111 instead of -executable for find, because it fails to work in F-9



Index: tse3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tse3/F-9/tse3.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tse3.spec	27 Jan 2009 00:58:43 -0000	1.1
+++ tse3.spec	27 Jan 2009 02:05:01 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           tse3
 Version:        0.3.1
-Release:        2%{?dist}
+Release:        2%{?dist}.1
 Summary:        MIDI Sequencer Engine
 Group:          System Environment/Libraries
 License:        GPL+
@@ -44,8 +44,8 @@
 %patch1 -p2 -b .gcc43
 
 # Fix strange permissions issues
-find . -name "*.cpp" -executable -exec chmod 644 {} \;
-find . -name "*.h" -executable -exec chmod 644 {} \;
+find . -name "*.cpp" -perm /111 -exec chmod 644 {} \;
+find . -name "*.h" -perm /111 -exec chmod 644 {} \;
 
 # Fix encoding issues
 for i in demos/Demo.tse3 doc/History; do
@@ -114,6 +114,9 @@
 %{_libdir}/libtse3.so
 
 %changelog
+* Mon Jan 26 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 0.3.1-2.1
+- Use -perm /111 instead of -executable for find, because it fails to work in F-9
+
 * Sun Jan 25 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 0.3.1-2
 - Move the HTML documentation into an HTML subdirectory
 - Use INSTALL="install -p"



From rakesh at fedoraproject.org  Tue Jan 27 02:10:52 2009
From: rakesh at fedoraproject.org (Rakesh Pandit)
Date: Tue, 27 Jan 2009 02:10:52 +0000 (UTC)
Subject: rpms/code2html/F-10 code2html.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090127021052.D9F487010B@cvs1.fedora.phx.redhat.com>

Author: rakesh

Update of /cvs/pkgs/rpms/code2html/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8241/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	code2html.spec import.log 
Log Message:
Initial import



--- NEW FILE code2html.spec ---
Name:           code2html
Version:        0.9.1
Release:        2%{?dist}
Summary:        Convert source code to HTML

Group:          Applications/Publishing     
License:        MIT
URL:            http://search.cpan.org/dist/code2html/
Source0:        http://www.palfrader.org/code2html/all/latest.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
Code2HTML converts a program source code to syntax highlighted HTML.

%prep
%setup -q
iconv -f iso8859-1 -t utf-8 %{name}.1 > %{name}.1.conv && mv -f %{name}.1.conv %{name}.1

%build
# Empty build


%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_bindir}
install -p -m 755 %{name} $RPM_BUILD_ROOT%{_bindir}/

mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
install -p -m 644 ChangeLog  CREDITS  LICENSE  README $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/

mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
install -p -m 644 %{name}.1 $RPM_BUILD_ROOT%{_mandir}/man1/


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc ChangeLog  CREDITS  LICENSE  README
%{_bindir}/%{name}
%{_mandir}/man1/%{name}.1.gz


%changelog
* Mon Jan 26 2009 Rakesh Pandit <rakesh at fedoraproject.org> 0.9.1-2
- Fixed wrong license field and used -p while installing

* Mon Jan 26 2009 Rakesh Pandit <rakesh at fedoraproject.org> 0.9.1-1
- Initial package


--- NEW FILE import.log ---
code2html-0_9_1-2_fc10:F-10:code2html-0.9.1-2.fc10.src.rpm:1233021438


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/code2html/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	26 Jan 2009 23:05:39 -0000	1.1
+++ .cvsignore	27 Jan 2009 02:10:22 -0000	1.2
@@ -0,0 +1 @@
+latest.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/code2html/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	26 Jan 2009 23:05:39 -0000	1.1
+++ sources	27 Jan 2009 02:10:22 -0000	1.2
@@ -0,0 +1 @@
+368377696547026c79c51a274571dc39  latest.tar.gz



From rakesh at fedoraproject.org  Tue Jan 27 02:18:20 2009
From: rakesh at fedoraproject.org (Rakesh Pandit)
Date: Tue, 27 Jan 2009 02:18:20 +0000 (UTC)
Subject: rpms/code2html/F-9 code2html.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090127021820.CB11A7010B@cvs1.fedora.phx.redhat.com>

Author: rakesh

Update of /cvs/pkgs/rpms/code2html/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9241/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	code2html.spec import.log 
Log Message:
Initial import



--- NEW FILE code2html.spec ---
Name:           code2html
Version:        0.9.1
Release:        2%{?dist}
Summary:        Convert source code to HTML

Group:          Applications/Publishing     
License:        MIT
URL:            http://search.cpan.org/dist/code2html/
Source0:        http://www.palfrader.org/code2html/all/latest.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
Code2HTML converts a program source code to syntax highlighted HTML.

%prep
%setup -q
iconv -f iso8859-1 -t utf-8 %{name}.1 > %{name}.1.conv && mv -f %{name}.1.conv %{name}.1

%build
# Empty build


%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_bindir}
install -p -m 755 %{name} $RPM_BUILD_ROOT%{_bindir}/

mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
install -p -m 644 ChangeLog  CREDITS  LICENSE  README $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/

mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
install -p -m 644 %{name}.1 $RPM_BUILD_ROOT%{_mandir}/man1/


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc ChangeLog  CREDITS  LICENSE  README
%{_bindir}/%{name}
%{_mandir}/man1/%{name}.1.gz


%changelog
* Mon Jan 26 2009 Rakesh Pandit <rakesh at fedoraproject.org> 0.9.1-2
- Fixed wrong license field and used -p while installing

* Mon Jan 26 2009 Rakesh Pandit <rakesh at fedoraproject.org> 0.9.1-1
- Initial package


--- NEW FILE import.log ---
code2html-0_9_1-2_fc10:F-9:code2html-0.9.1-2.fc10.src.rpm:1233022146


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/code2html/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	26 Jan 2009 23:05:39 -0000	1.1
+++ .cvsignore	27 Jan 2009 02:17:50 -0000	1.2
@@ -0,0 +1 @@
+latest.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/code2html/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	26 Jan 2009 23:05:39 -0000	1.1
+++ sources	27 Jan 2009 02:17:50 -0000	1.2
@@ -0,0 +1 @@
+368377696547026c79c51a274571dc39  latest.tar.gz



From alexlan at fedoraproject.org  Tue Jan 27 02:40:00 2009
From: alexlan at fedoraproject.org (Alex Lancaster)
Date: Tue, 27 Jan 2009 02:40:00 +0000 (UTC)
Subject: rpms/perl-Bio-Graphics/devel import.log, NONE,
	1.1 perl-Bio-Graphics-tests.patch, NONE,
	1.1 perl-Bio-Graphics.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090127024000.8BA3F7010B@cvs1.fedora.phx.redhat.com>

Author: alexlan

Update of /cvs/pkgs/rpms/perl-Bio-Graphics/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13231/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-Bio-Graphics-tests.patch 
	perl-Bio-Graphics.spec 
Log Message:
Initial import.



--- NEW FILE import.log ---
perl-Bio-Graphics-1_83-2_fc11:HEAD:perl-Bio-Graphics-1.83-2.fc11.src.rpm:1233023947

perl-Bio-Graphics-tests.patch:

--- NEW FILE perl-Bio-Graphics-tests.patch ---
--- t/BioGraphics.t.orig	2009-01-26 01:22:13.000000000 -0700
+++ t/BioGraphics.t	2009-01-26 01:22:21.000000000 -0700
@@ -14,7 +14,7 @@
 
 # for now, the image tests are turned off
 
-use constant IMAGE_TESTS => 1;
+use constant IMAGE_TESTS => 0;
 
 BEGIN { 
   use lib '.';


--- NEW FILE perl-Bio-Graphics.spec ---
Name:           perl-Bio-Graphics
Version:        1.83
Release:        2%{?dist}
Summary:        Generate GD images of Bio::Seq objects
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Bio-Graphics/
Source0:        http://www.cpan.org/authors/id/L/LD/LDS/Bio-Graphics-%{version}.tar.gz
Patch0:         perl-Bio-Graphics-tests.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(Bio::Root::Version) >= 1.005009
BuildRequires:  perl(GD) >= 2.3
BuildRequires:  perl(GD::SVG)
BuildRequires:  perl(Module::Build)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
Bio::Graphics is a simple GD-based renderer (diagram drawer) for DNA
and protein sequences.  The Bio::Graphics::Panel class provides
drawing and formatting services for any object that implements the
Bio::SeqFeatureI interface, including Ace::Sequence::Feature,
Das::Segment::Feature and Bio::DB::Graphics objects.  It can be used
to draw sequence annotations, physical (contig) maps, protein domains,
or any other type of map in which a set of discrete ranges need to be
laid out on the number line

%prep
%setup -q -n Bio-Graphics-%{version}
%patch0 -p0 -b .tests

%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 DISCLAIMER.txt README README.bioperl
%{_bindir}/*
%{perl_vendorlib}/*
%{_mandir}/man1/*
%{_mandir}/man3/*

%changelog
* Mon Jan 26 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 1.83-2
- Patch to disable some tests (image tests currently don't work)
- Fix file list to include scripts

* Mon Jan 26 2009 Alex Lancaster <alexlan[AT]fedoraproject org> 1.83-1
- Specfile autogenerated by cpanspec 1.77.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Bio-Graphics/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	26 Jan 2009 22:27:03 -0000	1.1
+++ .cvsignore	27 Jan 2009 02:39:30 -0000	1.2
@@ -0,0 +1 @@
+Bio-Graphics-1.83.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Bio-Graphics/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	26 Jan 2009 22:27:03 -0000	1.1
+++ sources	27 Jan 2009 02:39:30 -0000	1.2
@@ -0,0 +1 @@
+1c1de50c9261b3e6a1b20e2f38701aa7  Bio-Graphics-1.83.tar.gz



From kyle at fedoraproject.org  Tue Jan 27 02:40:13 2009
From: kyle at fedoraproject.org (Kyle McMartin)
Date: Tue, 27 Jan 2009 02:40:13 +0000 (UTC)
Subject: rpms/kernel/devel patch-2.6.29-rc2-git2.bz2.sign, NONE,
	1.1 .cvsignore, 
	1.996, 1.997 config-generic, 1.227, 1.228 git-linus.diff, 1.14,
	1.15 kernel.spec, 1.1233, 1.1234 linux-2.6-hdpvr.patch, 1.3,
	1.4 sources, 1.958, 1.959 upstream, 1.870,
	1.871 patch-2.6.29-rc2-git1.bz2.sign, 1.1, NONE
Message-ID: <20090127024013.C18117010B@cvs1.fedora.phx.redhat.com>

Author: kyle

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13291

Modified Files:
	.cvsignore config-generic git-linus.diff kernel.spec 
	linux-2.6-hdpvr.patch sources upstream 
Added Files:
	patch-2.6.29-rc2-git2.bz2.sign 
Removed Files:
	patch-2.6.29-rc2-git1.bz2.sign 
Log Message:
* Mon Jan 26 2009 Kyle McMartin <kyle at redhat.com>
- 2.6.29-rc2-git2



--- NEW FILE patch-2.6.29-rc2-git2.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBJfk+wyGugalF9Dw4RAnbnAKCTc0URuMBFjAtqBbRCyRgVBKc2JQCfRbkX
oXMoY0XTpyuo1xKX9i6dANo=
=2+Fo
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.996
retrieving revision 1.997
diff -u -r1.996 -r1.997
--- .cvsignore	18 Jan 2009 01:49:11 -0000	1.996
+++ .cvsignore	27 Jan 2009 02:39:41 -0000	1.997
@@ -5,4 +5,4 @@
 kernel-2.6.28
 linux-2.6.28.tar.bz2
 patch-2.6.29-rc2.bz2
-patch-2.6.29-rc2-git1.bz2
+patch-2.6.29-rc2-git2.bz2


Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-generic,v
retrieving revision 1.227
retrieving revision 1.228
diff -u -r1.227 -r1.228
--- config-generic	26 Jan 2009 19:40:21 -0000	1.227
+++ config-generic	27 Jan 2009 02:39:41 -0000	1.228
@@ -3703,6 +3703,8 @@
 
 # CONFIG_PHANTOM is not set
 CONFIG_EEPROM_93CX6=m
+CONFIG_EEPROM_AT24=m
+CONFIG_EEPROM_LEGACY=m
 
 CONFIG_POWER_SUPPLY=m
 # CONFIG_POWER_SUPPLY_DEBUG is not set

git-linus.diff:

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.14 -r 1.15 git-linus.diff
Index: git-linus.diff
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/git-linus.diff,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- git-linus.diff	26 Jan 2009 21:46:32 -0000	1.14
+++ git-linus.diff	27 Jan 2009 02:39:41 -0000	1.15
@@ -1,91654 +0,0 @@
-diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
-index 8511d35..d8362cf 100644
---- a/Documentation/kernel-parameters.txt
-+++ b/Documentation/kernel-parameters.txt
-@@ -577,9 +577,6 @@ and is between 256 and 4096 characters. It is defined in the file
- 			a memory unit (amount[KMG]). See also
- 			Documentation/kdump/kdump.txt for a example.
- 
--	cs4232=		[HW,OSS]
--			Format: <io>,<irq>,<dma>,<dma2>,<mpuio>,<mpuirq>
--
- 	cs89x0_dma=	[HW,NET]
- 			Format: <dma>
- 
-@@ -732,10 +729,6 @@ and is between 256 and 4096 characters. It is defined in the file
- 			Default value is 0.
- 			Value can be changed at runtime via /selinux/enforce.
- 
--	es1371=		[HW,OSS]
--			Format: <spdif>,[<nomix>,[<amplifier>]]
--			See also header of sound/oss/es1371.c.
--
- 	ether=		[HW,NET] Ethernet cards parameters
- 			This option is obsoleted by the "netdev=" option, which
- 			has equivalent usage. See its documentation for details.
-diff --git a/Documentation/sound/alsa/HD-Audio-Models.txt b/Documentation/sound/alsa/HD-Audio-Models.txt
-index 64eb110..0f5d26b 100644
---- a/Documentation/sound/alsa/HD-Audio-Models.txt
-+++ b/Documentation/sound/alsa/HD-Audio-Models.txt
-@@ -349,6 +349,7 @@ STAC92HD73*
- STAC92HD83*
- ===========
-   ref		Reference board
-+  mic-ref	Reference board with power managment for ports
- 
- STAC9872
- ========
-diff --git a/Makefile b/Makefile
-index 207303d..93b81bc 100644
---- a/Makefile
-+++ b/Makefile
-@@ -213,6 +213,10 @@ endif
- # Where to locate arch specific headers
- hdr-arch  := $(SRCARCH)
- 
-+ifeq ($(ARCH),m68knommu)
-+       hdr-arch  := m68k
-+endif
-+
- KCONFIG_CONFIG	?= .config
- 
- # SHELL used by kbuild
-diff --git a/arch/arm/plat-mxc/include/mach/ipu.h b/arch/arm/plat-mxc/include/mach/ipu.h
-new file mode 100644
-index 0000000..a9221f1
---- /dev/null
-+++ b/arch/arm/plat-mxc/include/mach/ipu.h
-@@ -0,0 +1,181 @@
-+/*
-+ * Copyright (C) 2008
-+ * Guennadi Liakhovetski, DENX Software Engineering, <lg at denx.de>
-+ *
-+ * Copyright (C) 2005-2007 Freescale Semiconductor, Inc.
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License version 2 as
-+ * published by the Free Software Foundation.
-+ */
-+
-+#ifndef _IPU_H_
-+#define _IPU_H_
-+
-+#include <linux/types.h>
-+#include <linux/dmaengine.h>
-+
-+/* IPU DMA Controller channel definitions. */
-+enum ipu_channel {
-+	IDMAC_IC_0 = 0,		/* IC (encoding task) to memory */
-+	IDMAC_IC_1 = 1,		/* IC (viewfinder task) to memory */
-+	IDMAC_ADC_0 = 1,
-+	IDMAC_IC_2 = 2,
-+	IDMAC_ADC_1 = 2,
-+	IDMAC_IC_3 = 3,
-+	IDMAC_IC_4 = 4,
-+	IDMAC_IC_5 = 5,
-+	IDMAC_IC_6 = 6,
-+	IDMAC_IC_7 = 7,		/* IC (sensor data) to memory */
-+	IDMAC_IC_8 = 8,
-+	IDMAC_IC_9 = 9,
-+	IDMAC_IC_10 = 10,
-+	IDMAC_IC_11 = 11,
-+	IDMAC_IC_12 = 12,
-+	IDMAC_IC_13 = 13,
-+	IDMAC_SDC_0 = 14,	/* Background synchronous display data */
-+	IDMAC_SDC_1 = 15,	/* Foreground data (overlay) */
-+	IDMAC_SDC_2 = 16,
-+	IDMAC_SDC_3 = 17,
-+	IDMAC_ADC_2 = 18,
-+	IDMAC_ADC_3 = 19,
-+	IDMAC_ADC_4 = 20,
-+	IDMAC_ADC_5 = 21,
-+	IDMAC_ADC_6 = 22,
-+	IDMAC_ADC_7 = 23,
-+	IDMAC_PF_0 = 24,
-+	IDMAC_PF_1 = 25,
-+	IDMAC_PF_2 = 26,
-+	IDMAC_PF_3 = 27,
-+	IDMAC_PF_4 = 28,
-+	IDMAC_PF_5 = 29,
-+	IDMAC_PF_6 = 30,
-+	IDMAC_PF_7 = 31,
-+};
-+
-+/* Order significant! */
-+enum ipu_channel_status {
-+	IPU_CHANNEL_FREE,
-+	IPU_CHANNEL_INITIALIZED,
-+	IPU_CHANNEL_READY,
-+	IPU_CHANNEL_ENABLED,
-+};
-+
-+#define IPU_CHANNELS_NUM 32
-+
-+enum pixel_fmt {
-+	/* 1 byte */
-+	IPU_PIX_FMT_GENERIC,
-+	IPU_PIX_FMT_RGB332,
-+	IPU_PIX_FMT_YUV420P,
-+	IPU_PIX_FMT_YUV422P,
-+	IPU_PIX_FMT_YUV420P2,
-+	IPU_PIX_FMT_YVU422P,
-+	/* 2 bytes */
-+	IPU_PIX_FMT_RGB565,
-+	IPU_PIX_FMT_RGB666,
-+	IPU_PIX_FMT_BGR666,
-+	IPU_PIX_FMT_YUYV,
-+	IPU_PIX_FMT_UYVY,
-+	/* 3 bytes */
-+	IPU_PIX_FMT_RGB24,
-+	IPU_PIX_FMT_BGR24,
-+	/* 4 bytes */
-+	IPU_PIX_FMT_GENERIC_32,
-+	IPU_PIX_FMT_RGB32,
-+	IPU_PIX_FMT_BGR32,
-+	IPU_PIX_FMT_ABGR32,
-+	IPU_PIX_FMT_BGRA32,
-+	IPU_PIX_FMT_RGBA32,
-+};
-+
-+enum ipu_color_space {
-+	IPU_COLORSPACE_RGB,
-+	IPU_COLORSPACE_YCBCR,
-+	IPU_COLORSPACE_YUV
-+};
-+
-+/*
-+ * Enumeration of IPU rotation modes
-+ */
-+enum ipu_rotate_mode {
-+	/* Note the enum values correspond to BAM value */
-+	IPU_ROTATE_NONE = 0,
-+	IPU_ROTATE_VERT_FLIP = 1,
-+	IPU_ROTATE_HORIZ_FLIP = 2,
-+	IPU_ROTATE_180 = 3,
-+	IPU_ROTATE_90_RIGHT = 4,
-+	IPU_ROTATE_90_RIGHT_VFLIP = 5,
-+	IPU_ROTATE_90_RIGHT_HFLIP = 6,
-+	IPU_ROTATE_90_LEFT = 7,
-+};
-+
-+struct ipu_platform_data {
-+	unsigned int	irq_base;
-+};
-+
-+/*
-+ * Enumeration of DI ports for ADC.
-+ */
-+enum display_port {
-+	DISP0,
-+	DISP1,
-+	DISP2,
-+	DISP3
-+};
-+
-+struct idmac_video_param {
-+	unsigned short		in_width;
-+	unsigned short		in_height;
-+	uint32_t		in_pixel_fmt;
-+	unsigned short		out_width;
-+	unsigned short		out_height;
-+	uint32_t		out_pixel_fmt;
[...91263 lines suppressed...]
- static hda_nid_t stac92hd83xxx_amp_nids[1] = {
-@@ -841,10 +842,6 @@ static struct hda_verb stac92hd73xx_10ch_core_init[] = {
- };
- 
- static struct hda_verb stac92hd83xxx_core_init[] = {
--	/* start of config #1 */
--	{ 0xe, AC_VERB_SET_CONNECT_SEL, 0x3},
--
--	/* start of config #2 */
- 	{ 0xa, AC_VERB_SET_CONNECT_SEL, 0x0},
- 	{ 0xb, AC_VERB_SET_CONNECT_SEL, 0x0},
- 	{ 0xd, AC_VERB_SET_CONNECT_SEL, 0x1},
-@@ -885,8 +882,8 @@ static struct hda_verb stac92hd71bxx_analog_core_init[] = {
- static struct hda_verb stac925x_core_init[] = {
- 	/* set dac0mux for dac converter */
- 	{ 0x06, AC_VERB_SET_CONNECT_SEL, 0x00},
--	/* unmute and set max the selector */
--	{ 0x0e, AC_VERB_SET_AMP_GAIN_MUTE, 0xb01f },
-+	/* mute the master volume */
-+	{ 0x0e, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE },
- 	{}
- };
- 
-@@ -1138,6 +1135,8 @@ static struct snd_kcontrol_new stac92hd71bxx_mixer[] = {
- };
- 
- static struct snd_kcontrol_new stac925x_mixer[] = {
-+	HDA_CODEC_VOLUME("Master Playback Volume", 0x0e, 0, HDA_OUTPUT),
-+	HDA_CODEC_MUTE("Master Playback Switch", 0x0e, 0, HDA_OUTPUT),
- 	STAC_INPUT_SOURCE(1),
- 	HDA_CODEC_VOLUME("Capture Volume", 0x09, 0, HDA_OUTPUT),
- 	HDA_CODEC_MUTE("Capture Switch", 0x14, 0, HDA_OUTPUT),
-@@ -1736,10 +1735,12 @@ static unsigned int ref92hd83xxx_pin_configs[14] = {
- 
- static unsigned int *stac92hd83xxx_brd_tbl[STAC_92HD83XXX_MODELS] = {
- 	[STAC_92HD83XXX_REF] = ref92hd83xxx_pin_configs,
-+	[STAC_92HD83XXX_PWR_REF] = ref92hd83xxx_pin_configs,
- };
- 
- static const char *stac92hd83xxx_models[STAC_92HD83XXX_MODELS] = {
- 	[STAC_92HD83XXX_REF] = "ref",
-+	[STAC_92HD83XXX_PWR_REF] = "mic-ref",
- };
- 
- static struct snd_pci_quirk stac92hd83xxx_cfg_tbl[] = {
-@@ -1799,6 +1800,8 @@ static struct snd_pci_quirk stac92hd71bxx_cfg_tbl[] = {
- 		      "HP dv5", STAC_HP_M4),
- 	SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x30f4,
- 		      "HP dv7", STAC_HP_M4),
-+	SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x30f7,
-+		      "HP dv4", STAC_HP_DV5),
- 	SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x30fc,
- 		      "HP dv7", STAC_HP_M4),
- 	SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x3603,
-@@ -3573,13 +3576,12 @@ static int stac92xx_parse_auto_config(struct hda_codec *codec, hda_nid_t dig_out
- 		err = stac92xx_auto_fill_dac_nids(codec);
- 		if (err < 0)
- 			return err;
-+		err = stac92xx_auto_create_multi_out_ctls(codec,
-+							  &spec->autocfg);
-+		if (err < 0)
-+			return err;
- 	}
- 
--	err = stac92xx_auto_create_multi_out_ctls(codec, &spec->autocfg);
--
--	if (err < 0)
--		return err;
--
- 	/* setup analog beep controls */
- 	if (spec->anabeep_nid > 0) {
- 		err = stac92xx_auto_create_beep_ctls(codec,
-@@ -4753,7 +4755,9 @@ static struct hda_input_mux stac92hd83xxx_dmux = {
- static int patch_stac92hd83xxx(struct hda_codec *codec)
- {
- 	struct sigmatel_spec *spec;
-+	hda_nid_t conn[STAC92HD83_DAC_COUNT + 1];
- 	int err;
-+	int num_dacs;
- 
- 	spec  = kzalloc(sizeof(*spec), GFP_KERNEL);
- 	if (spec == NULL)
-@@ -4772,15 +4776,16 @@ static int patch_stac92hd83xxx(struct hda_codec *codec)
- 	spec->num_pwrs = ARRAY_SIZE(stac92hd83xxx_pwr_nids);
- 	spec->multiout.dac_nids = spec->dac_nids;
- 
--	spec->init = stac92hd83xxx_core_init;
--	switch (codec->vendor_id) {
--	case 0x111d7605:
--		break;
--	default:
--		spec->num_pwrs--;
--		spec->init++; /* switch to config #2 */
--	}
- 
-+	/* set port 0xe to select the last DAC
-+	 */
-+	num_dacs = snd_hda_get_connections(codec, 0x0e,
-+		conn, STAC92HD83_DAC_COUNT + 1) - 1;
-+
-+	snd_hda_codec_write_cache(codec, 0xe, 0,
-+		AC_VERB_SET_CONNECT_SEL, num_dacs);
-+
-+	spec->init = stac92hd83xxx_core_init;
- 	spec->mixer = stac92hd83xxx_mixer;
- 	spec->num_pins = ARRAY_SIZE(stac92hd83xxx_pin_nids);
- 	spec->num_dmuxes = ARRAY_SIZE(stac92hd83xxx_dmux_nids);
-@@ -4806,6 +4811,15 @@ again:
- 		return err;
- 	}
- 
-+	switch (codec->vendor_id) {
-+	case 0x111d7604:
-+	case 0x111d7605:
-+		if (spec->board_config == STAC_92HD83XXX_PWR_REF)
-+			break;
-+		spec->num_pwrs = 0;
-+		break;
-+	}
-+
- 	err = stac92xx_parse_auto_config(codec, 0x1d, 0);
- 	if (!err) {
- 		if (spec->board_config < 0) {
-diff --git a/sound/pci/oxygen/virtuoso.c b/sound/pci/oxygen/virtuoso.c
-index e9e829e..18c7c91 100644
---- a/sound/pci/oxygen/virtuoso.c
-+++ b/sound/pci/oxygen/virtuoso.c
-@@ -683,7 +683,7 @@ static void xonar_hdav_uart_input(struct oxygen *chip)
- 	if (chip->uart_input_count >= 2 &&
- 	    chip->uart_input[chip->uart_input_count - 2] == 'O' &&
- 	    chip->uart_input[chip->uart_input_count - 1] == 'K') {
--		printk(KERN_DEBUG "message from Xonar HDAV HDMI chip received:");
-+		printk(KERN_DEBUG "message from Xonar HDAV HDMI chip received:\n");
- 		print_hex_dump_bytes("", DUMP_PREFIX_OFFSET,
- 				     chip->uart_input, chip->uart_input_count);
- 		chip->uart_input_count = 0;
-@@ -908,6 +908,7 @@ static const struct oxygen_model model_xonar_hdav = {
- 	.dac_channels = 8,
- 	.dac_volume_min = 0x0f,
- 	.dac_volume_max = 0xff,
-+	.misc_flags = OXYGEN_MISC_MIDI,
- 	.function_flags = OXYGEN_FUNCTION_2WIRE,
- 	.dac_i2s_format = OXYGEN_I2S_FORMAT_LJUST,
- 	.adc_i2s_format = OXYGEN_I2S_FORMAT_LJUST,
-diff --git a/sound/soc/atmel/atmel-pcm.c b/sound/soc/atmel/atmel-pcm.c
-index 1fac5ef..3dcdc4e 100644
---- a/sound/soc/atmel/atmel-pcm.c
-+++ b/sound/soc/atmel/atmel-pcm.c
-@@ -44,8 +44,6 @@
- #include <sound/pcm_params.h>
- #include <sound/soc.h>
- 
--#include <mach/hardware.h>
--
- #include "atmel-pcm.h"
- 
- 
-diff --git a/sound/soc/fsl/mpc8610_hpcd.c b/sound/soc/fsl/mpc8610_hpcd.c
-index bcec3f6..acf39a6 100644
---- a/sound/soc/fsl/mpc8610_hpcd.c
-+++ b/sound/soc/fsl/mpc8610_hpcd.c
-@@ -183,16 +183,6 @@ static struct snd_soc_ops mpc8610_hpcd_ops = {
- };
- 
- /**
-- * mpc8610_hpcd_machine: ASoC machine data
-- */
--static struct snd_soc_card mpc8610_hpcd_machine = {
--	.probe = mpc8610_hpcd_machine_probe,
--	.remove = mpc8610_hpcd_machine_remove,
--	.name = "MPC8610 HPCD",
--	.num_links = 1,
--};
--
--/**
-  * mpc8610_hpcd_probe: OF probe function for the fabric driver
-  *
-  * This function gets called when an SSI node is found in the device tree.
-@@ -455,7 +445,11 @@ static int mpc8610_hpcd_probe(struct of_device *ofdev,
- 	machine_data->dai.codec_dai = &cs4270_dai; /* The codec_dai we want */
- 	machine_data->dai.ops = &mpc8610_hpcd_ops;
- 
--	mpc8610_hpcd_machine.dai_link = &machine_data->dai;
-+	machine_data->machine.probe = mpc8610_hpcd_machine_probe;
-+	machine_data->machine.remove = mpc8610_hpcd_machine_remove;
-+	machine_data->machine.name = "MPC8610 HPCD";
-+	machine_data->machine.num_links = 1;
-+	machine_data->machine.dai_link = &machine_data->dai;
- 
- 	/* Allocate a new audio platform device structure */
- 	sound_device = platform_device_alloc("soc-audio", -1);
-@@ -465,7 +459,7 @@ static int mpc8610_hpcd_probe(struct of_device *ofdev,
- 		goto error;
- 	}
- 
--	machine_data->sound_devdata.card = &mpc8610_hpcd_machine;
-+	machine_data->sound_devdata.card = &machine_data->machine;
- 	machine_data->sound_devdata.codec_dev = &soc_codec_device_cs4270;
- 	machine_data->machine.platform = &fsl_soc_platform;
- 


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1233
retrieving revision 1.1234
diff -u -r1.1233 -r1.1234
--- kernel.spec	26 Jan 2009 22:11:45 -0000	1.1233
+++ kernel.spec	27 Jan 2009 02:39:42 -0000	1.1234
@@ -58,7 +58,7 @@
 # The rc snapshot level
 %define rcrev 2
 # The git snapshot level
-%define gitrev 1
+%define gitrev 2
 # Set rpm version accordingly
 %define rpmversion 2.6.%{upstream_sublevel}
 %endif
@@ -1006,7 +1006,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
@@ -1773,6 +1773,9 @@
 
 %changelog
 * Mon Jan 26 2009 Kyle McMartin <kyle at redhat.com>
+- 2.6.29-rc2-git2
+
+* Mon Jan 26 2009 Kyle McMartin <kyle at redhat.com>
 - Update git-linus.diff to bf50c903faba4ec7686ee8a570ac384b0f20814d.
 - drm-next.patch merged.
 - linux-2.6.28-sunrpc-ipv6-rpcbind.patch: update for Kconfig moves.

linux-2.6-hdpvr.patch:

Index: linux-2.6-hdpvr.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-hdpvr.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- linux-2.6-hdpvr.patch	15 Jan 2009 07:39:31 -0000	1.3
+++ linux-2.6-hdpvr.patch	27 Jan 2009 02:39:42 -0000	1.4
@@ -2499,14 +2499,14 @@
  	/* MPEG controls */
  	case V4L2_CID_MPEG_AUDIO_SAMPLING_FREQ:
 diff --git a/include/linux/i2c-id.h b/include/linux/i2c-id.h
-index 01d67ba..1a08b81 100644
+index 1ffc23b..e77f81b 100644
 --- a/include/linux/i2c-id.h
 +++ b/include/linux/i2c-id.h
-@@ -110,6 +110,7 @@
- #define I2C_HW_B_INTELFB	0x010021 /* intel framebuffer driver */
+@@ -87,6 +87,7 @@
+ #define I2C_HW_B_CX2341X	0x010020 /* Conexant CX2341X MPEG encoder cards */
  #define I2C_HW_B_CX23885	0x010022 /* conexant 23885 based tv cards (bus1) */
  #define I2C_HW_B_AU0828		0x010023 /* auvitek au0828 usb bridge */
 +#define I2C_HW_B_HDPVR		0x010024 /* Hauppauge HD PVR */
  
- /* --- PCF 8584 based algorithms					*/
- #define I2C_HW_P_ELEK		0x020002 /* Elektor ISA Bus inteface card */
+ /* --- SGI adapters							*/
+ #define I2C_HW_SGI_VINO		0x160000


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v
retrieving revision 1.958
retrieving revision 1.959
diff -u -r1.958 -r1.959
--- sources	18 Jan 2009 01:49:11 -0000	1.958
+++ sources	27 Jan 2009 02:39:42 -0000	1.959
@@ -1,3 +1,3 @@
 d351e44709c9810b85e29b877f50968a  linux-2.6.28.tar.bz2
 c8b4ae394659c8723aae2f1bafcb55dc  patch-2.6.29-rc2.bz2
-dd06feab96f652440954dbf352349ba4  patch-2.6.29-rc2-git1.bz2
+64c3f0c6f254a4284ebe8436350d9836  patch-2.6.29-rc2-git2.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v
retrieving revision 1.870
retrieving revision 1.871
diff -u -r1.870 -r1.871
--- upstream	18 Jan 2009 01:49:11 -0000	1.870
+++ upstream	27 Jan 2009 02:39:42 -0000	1.871
@@ -1,3 +1,3 @@
 linux-2.6.28.tar.bz2
 patch-2.6.29-rc2.bz2
-patch-2.6.29-rc2-git1.bz2
+patch-2.6.29-rc2-git2.bz2


--- patch-2.6.29-rc2-git1.bz2.sign DELETED ---



From pwouters at fedoraproject.org  Tue Jan 27 02:59:36 2009
From: pwouters at fedoraproject.org (Paul Wouters)
Date: Tue, 27 Jan 2009 02:59:36 +0000 (UTC)
Subject: rpms/nsd/devel nsd.spec,1.43,1.44
Message-ID: <20090127025936.F318B7010B@cvs1.fedora.phx.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/nsd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16694

Modified Files:
	nsd.spec 
Log Message:
* Mon Jan 26 2009 Paul Wouters <paul at xelerance.com> - 3.2.1-1
updates to new version 3.2.1



Index: nsd.spec
===================================================================
RCS file: /cvs/extras/rpms/nsd/devel/nsd.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- nsd.spec	17 Jan 2009 15:44:22 -0000	1.43
+++ nsd.spec	27 Jan 2009 02:59:06 -0000	1.44
@@ -1,7 +1,12 @@
 Summary: fast and lean authoritative DNS name server
 Name: nsd
+<<<<<<< nsd.spec
+Version: 3.2.1
+Release: 1%{?dist}
+=======
 Version: 3.2.0
 Release: 4%{?dist}
+>>>>>>> 1.43
 License: BSD
 Url: http://www.nlnetlabs.nl/%{name}/
 #Source: http://www.nlnetlabs.nl/downloads/%{name}/%{name}-%{version}.tar.gz
@@ -92,6 +97,9 @@
 fi
 
 %changelog
+* Mon Jan 26 2009 Paul Wouters <paul at xelerance.com> - 3.2.1-1
+- Updated to new version 3.2.1
+
 * Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> - 3.2.0-4
 - rebuild with new openssl
 



From pwouters at fedoraproject.org  Tue Jan 27 03:00:34 2009
From: pwouters at fedoraproject.org (Paul Wouters)
Date: Tue, 27 Jan 2009 03:00:34 +0000 (UTC)
Subject: rpms/nsd/devel nsd.spec,1.44,1.45
Message-ID: <20090127030034.A299A7010B@cvs1.fedora.phx.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/nsd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16849

Modified Files:
	nsd.spec 
Log Message:
fix cvs anomaly



Index: nsd.spec
===================================================================
RCS file: /cvs/extras/rpms/nsd/devel/nsd.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- nsd.spec	27 Jan 2009 02:59:06 -0000	1.44
+++ nsd.spec	27 Jan 2009 03:00:04 -0000	1.45
@@ -1,12 +1,7 @@
 Summary: fast and lean authoritative DNS name server
 Name: nsd
-<<<<<<< nsd.spec
 Version: 3.2.1
 Release: 1%{?dist}
-=======
-Version: 3.2.0
-Release: 4%{?dist}
->>>>>>> 1.43
 License: BSD
 Url: http://www.nlnetlabs.nl/%{name}/
 #Source: http://www.nlnetlabs.nl/downloads/%{name}/%{name}-%{version}.tar.gz



From kyle at fedoraproject.org  Tue Jan 27 03:09:18 2009
From: kyle at fedoraproject.org (Kyle McMartin)
Date: Tue, 27 Jan 2009 03:09:18 +0000 (UTC)
Subject: rpms/kernel/devel drm-modesetting-radeon.patch,1.53,1.54
Message-ID: <20090127030918.D8B587010B@cvs1.fedora.phx.redhat.com>

Author: kyle

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18308

Modified Files:
	drm-modesetting-radeon.patch 
Log Message:
modesetting fix

drm-modesetting-radeon.patch:

Index: drm-modesetting-radeon.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/drm-modesetting-radeon.patch,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- drm-modesetting-radeon.patch	22 Jan 2009 06:26:04 -0000	1.53
+++ drm-modesetting-radeon.patch	27 Jan 2009 03:09:18 -0000	1.54
@@ -1,1337 +1,5 @@
-commit fabf04e993e0d98412921b6073ff3f85fc45ab4c
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Sun Jan 11 19:50:23 2009 +1000
-
-    radeon: add missing Kconfig text
-
-commit a0dad0aeb1a8d1ad3ab2a3d2b5f71cc906e79194
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Sun Jan 11 19:47:39 2009 +1000
-
-    drm: fix merge issue that messes up irq
-
-commit 96da5b704fc484873f9088b9680d017265dd8d8d
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Sat Jan 10 12:40:42 2009 +1000
-
-    radeon: add getparam to get pci device from userspace
-
-commit 3a0d78939b79836d2752e6eeccaea525e952d7ab
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Thu Dec 18 23:01:12 2008 +1000
-
-    drm: don't set cached bits on pages from uncached allocator.
-    
-    This should make AGP no corrupt itself to all buggery
-    (cherry picked from commit 55c0a3f1d3693cb5c3b65f37d4bb6e8a3c025460)
-
-commit a3765cd4dcf51f2eb88b7504aeee502ce61d6bfa
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Tue Dec 2 16:38:04 2008 +1000
-
-    drop old CS
-
-commit 22104beca6bb2de1b854b03613e6eadeab845060
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Mon Dec 1 15:09:27 2008 +1000
-
-    radeon: update with latest CS bits
-
-commit 2ffdea015e8083eb72882413f440cd0a7972702a
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Wed Dec 17 06:56:36 2008 +1000
-
-    fixups post rebase
-
-commit a4c11f07eace4caf76f194330f6a701145f46b0f
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Thu Dec 11 01:35:09 2008 +1000
-
-    radeon: fix agp mode when kms isn't enabled
-
-commit cd6313975be73ca0a603f8d01611d76b0317dd07
-Author: Dave Airlie <airlied at ppcg5.localdomain>
-Date:   Wed Dec 3 17:22:07 2008 +1100
-
-    radeon: add support for accessing disabled ROMs.
-
-commit 58d100df04840ddedae9edf61775d8b4a4373911
-Author: Dave Airlie <airlied at ppcg5.localdomain>
-Date:   Wed Dec 3 17:19:02 2008 +1100
-
-    radeon: make cail do pll read/write via actual PLL functions
-
-commit 9300656a2ac3a2a37b22806d650ba65b6e0a1663
-Author: Dave Airlie <airlied at ppcg5.localdomain>
-Date:   Wed Dec 3 16:36:00 2008 +1100
-
-    radeon: atom fixes for endianness
-
-commit b4ea8869b74f97062c8532e67256ef718b5a9050
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Wed Dec 3 20:28:05 2008 +1000
-
-    radeon: AGP fixes round 2.
-    
-    More I can't believe its not AGP fixes.
-    Limit the AGP aperture to the GART size, and init the registers
-    in the right place
-
-commit 9434248185c63f98f1a007174727d337312c9ad9
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Tue Dec 2 12:49:17 2008 +1000
-
-    radeon: AGP fixes
-    
-    1. Proper PCIE fallback on PCIE cards.
-    2. Setup agp base + location regs properly
-
-commit 837d24fdb560c1fdee4027d80e7b66599a6f40c3
-Author: Michal Schmidt <mschmidt at redhat.com>
-Date:   Tue Dec 2 08:06:59 2008 +1000
-
-    radeon: fix IGP GART calcs
-    
-    fedora bz 473895
-
-commit 76cc2b13e393035ab833086e2f78067f8b23963d
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Thu Nov 27 17:14:40 2008 +1000
-
-    radeon: post any GPUs that aren't posted
-
-commit b3c456829fa1f28688e8f5d89e86eda54cf4cb33
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Mon Nov 24 15:18:31 2008 +1000
-
-    radeon: enable larger GART size on PCIE/IGP
-    
-    Allocate a larger GART on PCIE and IGP chipsets controlled by the gart_size
-    command line option.
-    
-    Default to 512MB gart.
-
-commit bbb6801c89ce6222827f7026967de85087d58ed2
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Mon Nov 24 15:17:49 2008 +1000
-
-    radeon: add some missing feature checks for modesetting
-
-commit 4e7e428255271524e7916a02041ea5a63f77fe7b
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Mon Nov 24 11:41:06 2008 +1100
-
-    radeon: make rs480/rs690 gart invalidate work properly.
-    
-    we really need to read back to make sure the invalidate has happened
-    before continuing along happily in life.
-
-commit 274edc5dd1f652e79012f7218517ad6be2a8f390
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Sun Nov 23 19:19:02 2008 +1000
-
-    drm: we have discardable now so don't do special cases
-
-commit 670615b961fb02c779d036eecac024bee2af6c20
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Fri Nov 21 14:52:25 2008 +1000
-
-    atom: fix bug in parser for MC reads
-
-commit d13d09fec893d35a3a811b253c3526ba62a50d20
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Mon Nov 17 18:14:28 2008 +1000
-
-    radeon: turn of VRAM zeroing by default for now - needs work
-
-commit f4c672a610f9cce1f3807b921e58cf372e76843a
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Mon Nov 17 09:03:36 2008 +1000
-
-    radeon: fix return value for no relocs
-
-commit a2a2d6edb04da35115d201cb4b6cde6d4ef41ed8
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Mon Nov 17 09:03:01 2008 +1000
-
-    ttm: add discard for VRAM buffers
-
-commit 9d8eaffc8272e870e4f0197a813a57faec2205be
-Author: Dave Airlie <airlied at dhcp-1-203.bne.redhat.com>
-Date:   Fri Nov 14 15:52:32 2008 +1000
-
-    drm: fix the exit path of the bo unlocking
-
-commit 81067ed4a7a1ad1c81e25706c6e036b656eda783
-Author: Dave Airlie <airlied at dhcp-1-203.bne.redhat.com>
-Date:   Fri Nov 14 15:51:44 2008 +1000
-
-    radeon: fixup relocate to work on locate write buffers in VRAM first.
-    
-    Fixup failure paths and make EAGAIN work
-
-commit 0318f294394a8c1eb6ba1c2d2ee66ebca96682b0
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Thu Nov 13 17:22:26 2008 +1100
-
-    radeon: fix some issues since last rebase
-
-commit e7ca0933175eb024d1697368e785b16efb842873
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Wed Nov 12 09:01:14 2008 +1000
-
-    radeon: fix more build
-
-commit 66faa9f9ff56d78986c9246a5f663205ca2d9d23
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Wed Nov 12 08:59:04 2008 +1000
-
-    radeon: fix compile
-
-commit a00e2703ef67a2357bc50be24c30b144d9f89d8d
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Mon Nov 10 15:39:25 2008 +1000
-
-    radeon: fix dumbness in cp ring check
-
-commit f6355f7bdba65ef6aaf0cfe0fc3877c0061f1c96
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Mon Nov 10 14:26:11 2008 +1000
-
-    radeon: add gart useable size to report to userspace
-
-commit 8af8549bef9dbf151d0c6c2ffba77b9939882603
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Sun Nov 9 20:34:49 2008 +1000
-
-    radeon: fix powerpc oops on rv280
-
-commit 5f3cd9859189330526d17b02ac09c20d2a712c25
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Sun Nov 9 10:23:43 2008 +1000
-
-    radeon: upgrade atom headers
-
-commit 47909abba376596a7aab995cba3385294eef6256
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Sat Nov 8 14:39:41 2008 +1000
-
-    radeon: fix fence race condition hopefully
-    
-    For some reason reading the SCRATCH reg from RAM causes some race to occur.
-    Hopefully fix this.
-
-commit eecd14d30bb788c41fae0bafcaf548960002dd65
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Sat Nov 8 11:31:03 2008 +1000
-
-    drm/radeon: add dpms connector functions
-
-commit b2b0b1e93323f3669caaa576d57b42d61e69d0ef
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Fri Nov 7 16:22:22 2008 +1000
-
-    radeon: avivo cursors are across the full surface.
-    
-    fixes cursor on second head
-
-commit 5b50020eb47c8f45495c654858eb2160d5e4d4aa
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Fri Nov 7 16:21:03 2008 +1000
-
-    modesetting: set the crtc x,y after the mode base change
-
-commit 729a2e4f6042034492489e69bfc5129664ba0d8f
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Wed Nov 5 10:23:35 2008 +1000
-
-    drm/radeon: add uncached allocator to drm ttm code.
-    
-    This allows re-use of uc/wc marked pages
-
-commit 721abc483e6ba4e56cee3026bf4de338508389cc
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Wed Nov 5 10:22:27 2008 +1000
-
-    radeon: fix ring tail overflow issue since alignment
-
-commit 707172ea02ea117314a96f6890205f02bfe2c8dc
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Tue Nov 4 13:18:02 2008 +1000
-
-    radeon: disable HDP read cache for now
-
-commit e36b8aca5e134674cb73d275854366c729087989
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Tue Nov 4 12:02:55 2008 +1000
-
-    radeon: force all ring writes to 16-dword alignment.
-    
-    Also set the fetch size to what tcore/fglrx uses.
-
-commit bb934ff77c704bebec6b863e80d51730d6a1ba6b
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Mon Nov 3 15:43:08 2008 +1000
-
-    radeon: fixup vram visible calculation to take a/c pinned objects for now
-
-commit 3d9f9d7e5e4b618f175fe9e3adeaa8d3fd7d3ba3
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Mon Nov 3 09:56:02 2008 +1100
-
-    radeon: if modesetting state is unknown make it known so pm-utils can use it
-
-commit bd85708456d83413d407c2a36ba5039397d0ca84
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Fri Oct 31 14:40:12 2008 +1000
-
-    radeon: fix ROP values for the paint ROP
-
-commit 1fb8f17a2e4782cb475aa2f3ade76bef7018f0cc
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Thu Oct 30 14:00:39 2008 +1000
-
-    radeon: add mtrr support for VRAM aperture.
-    
-    This speeds things up a bit
-
-commit 0a4fdc5ef901677e2d349e1474d97cdb1c6a429e
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Thu Oct 30 14:00:15 2008 +1000
-
-    radeon: disable AGP for certain chips if not specified until we figure it out
-
-commit e1c3d0eec7a76136cbe20aa618ae76336d2da1d8
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Wed Oct 29 15:45:47 2008 +1000
-
-    radeon: disable debugging message
-
-commit 9f306b893acba7b8f7d06f3ad72f2c3caf45541f
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Wed Oct 29 15:37:32 2008 +1000
-
-    radeon: commit ring after emitting the buffer discards
-
-commit 85fd1d17bcaac0e3c4303820859c5ee9c22f4c5d
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Wed Oct 29 17:39:27 2008 +1100
-
-    radeon: fix whitespace in encoders C file
-
-commit 97a2ff55b3c02400cb2d1905c4c3cff00d9073ac
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Wed Oct 29 17:39:08 2008 +1100
-
-    radeon: add more HDMI bits
-
-commit 2d174b6f57dcc40feac3a4f7fff07e5e92d4db06
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Thu Oct 30 01:41:34 2008 +1000
-
-    radeon: set dma bufs bo type to a kernel type
-
-commit 3ba9006eac872596c2f2bb7007da40019759effd
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Wed Oct 29 15:46:16 2008 +1100
-
-    radeon: enable DVI-D + HDMI connectors.
-    
-    This allows the rs690 to work on DVI
-
-commit 95bf25c1f4d7c22eb4f8e6a5b1584d7eaf377d0b
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Tue Oct 28 20:33:13 2008 +1000
-
-    radeon: setup isync cntl properly
-
-commit fcfd38b7cc9a004a4c41b70e716d7469e8826016
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Tue Oct 28 20:31:27 2008 +1000
-
-    radeon: add more debugging
-
-commit f4872b9bbbf8044a0ec106f8ed5fb9302c3c30bf
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Tue Oct 28 20:26:04 2008 +1000
-
-    radeon: overhaul ring interactions
-    
-    emit in 16-dword blocks, emit irqs at same time as everything else
-
-commit 509d9e1532e43ca5b4e21bc9c5736579ccf27c9d
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Tue Oct 28 16:49:09 2008 +1000
-
-    radeon: fix race in sysfs
-
-commit 483e17068cbc746ecfdf0677b04fabbc6836f160
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Tue Oct 28 16:46:47 2008 +1000
-
-    radeon: add proc debugging for interrupts/ring
-
-commit 2baefa25b5c4740ea0b506919ccf6cf03262c20f
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Tue Oct 28 16:44:54 2008 +1000
-
-    radeon: only enable dynclks if asked for
-
-commit 3404a96018c635c3481a315ee44b32e731a0deaa
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Tue Oct 28 06:35:10 2008 +1000
-
-    radeon: add wait rendering API
-
-commit 21f635d4a9bda3eb20458021a4d719793ac923ec
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Tue Oct 28 06:05:58 2008 +1000
-
-    radeon: rs480 fixes for bus mastering
-
-commit e684f06b823eb1fdb0ac149db923f50e9ac5a3cb
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Mon Oct 27 18:30:15 2008 +1000
-
-    radeon: remove unused gem indirect ioctl
-
-commit 36992266b7cb234b7ac624bbdfa181e117b22c8b
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Mon Oct 27 16:41:09 2008 +1000
-
-    radeon: fix some warnings
-
-commit 2df3aeb2033a11da3d0a59393c54eee2e03ba897
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Mon Oct 27 16:40:34 2008 +1000
-
-    radeon: fix free after refcount
-
-commit 94b8fa6cfe0d8a8a35dc1828e0012e90e47b9ee0
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Mon Oct 27 16:40:15 2008 +1000
-
-    radeon: CS2 make it all work with new relocs style
-
-commit e84c24bedf744cb37b3c15223ce7f9aff74115cc
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Mon Oct 27 16:39:12 2008 +1000
-
-    radeon: don't copy to user the cs ids
-
-commit 7cd4ee42379d89a8bb78805b0a8653b6ca9fd9b6
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Mon Oct 27 14:23:22 2008 +1000
-
-    radeon: make new CS2 command submission interface port older interface to this
-
-commit a082938f31b43d30859c78b6e921562e773854d1
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Thu Oct 23 19:13:50 2008 +1000
-
-    radeon: release agp on module unload
-
-commit ee9efed1861ed464592b5d9801f67a45463e6180
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Tue Oct 21 14:15:23 2008 +1000
-
-    radeon: add r423 bits to modesetting
-
-commit 94fa4d750cb556a7d29ae8571cab1f116e87e95b
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Tue Oct 21 14:12:38 2008 +1000
-
-    radeon: pull bus master enable into its own function
-
-commit 367adf738edd5ad14a6ab53f5fc4fa0474383385
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Mon Oct 20 14:44:23 2008 +1000
-
-    radeon: fix accessible VRAM sizing.
-    
-    We actually were passing accessible to userspace, but I thought
-    the code sized it correctly, however it doesn't seem to.
-
-commit 6626eace0701669c79b88f00a40ad21e27f83eb1
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Mon Oct 20 13:41:05 2008 +1000
-
-    radeon: update proper chip family
-
-commit 06312cbfc12555408af963da9406344cd933b159
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Mon Oct 20 12:08:50 2008 +1000
-
-    radeon: fixup scratch register interactions properly
-
-commit ef7b8f3d7ed5780f5dbe2cf742f625be2633b7b0
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Mon Oct 20 10:27:50 2008 +1000
-
-    radeon: make writeback work again
-
-commit e4eb0c1c62c067674e3ab19cfa3d3dc761f7679b
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Mon Oct 20 09:20:23 2008 +1000
-
-    drm: cleanup some warnings
-
-commit 8fcf8c1bf2f2030343032bbe13aa93f04f4707d4
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Thu Oct 16 16:29:08 2008 +1000
-
-    radeon: fix small typo in agp code
-
-commit ff20a206799107be0ea27897e8e2c4cc9633f9c6
-Author: Dave Airlie <airlied at panoply-rh.(none)>
-Date:   Thu Oct 16 16:17:01 2008 +1000
-
-    radeon: workaround failure to parse some rs48x edid
-
-commit 7d0e0de275851d3af3474f6b1bde53fe628da2cc
-Author: Dave Airlie <airlied at panoply-rh.(none)>
-Date:   Thu Oct 16 16:15:08 2008 +1000
-
-    radeon: don't enable dynclks on rs48x
-
-commit 29f3c9cf8f6dee9bbffd8a40d79882a4117e37c4
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Wed Oct 15 15:12:20 2008 +1000
-
-    radeon: allow r100/r200 modesetting to be forced on by users
-
-commit 36c197a4ee9e6a38748c3b955091b6bfa33d455e
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Thu Oct 16 22:06:00 2008 +1000
-
-    radeon: fix unused agp functionality
-
-commit e009ce15bf612db7805d4e7e1e7104f0930a4879
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Thu Oct 16 22:05:02 2008 +1000
-
-    radeon: add some more r100 support to test AGP
-
-commit e12b1afbb16c07a23324d50bdcc0a1e9bc432c56
-Author: airlied <airlied at redhat.com>
-Date:   Wed Oct 15 23:58:03 2008 +1000
-
-    radeon: add initial agp support.
-    
-    This add agpmode command line option.
-
-commit ac2dc3e0575fc854b4cb40a50a370e567b11aa89
-Author: airlied <airlied at redhat.com>
-Date:   Wed Oct 15 23:57:21 2008 +1000
-
-    radeon: add CS support for r100/r200 in 2D driver
-
-commit 790b681b38354f07b53b5482f818ce34573dc9c0
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Thu Oct 9 16:37:23 2008 +1100
-
-    radeon: fixup interrupt suspend/resume
-
-commit a39512adaa1f96b3ab50c513a4a3a4c9e2b11e24
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Wed Oct 8 16:57:12 2008 +1000
-
-    radeon: fixup suspend/resume bus master enable
-
-commit 81a4fbe62cc2ada352978183d06c3b2357c81a4b
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Wed Oct 8 16:56:04 2008 +1000
-
-    radeon: re-enable hw blits for copying from VRAM
-
-commit 8b9fe35ee8265e65133b85d90e862f70aded2afb
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Wed Oct 8 16:53:43 2008 +1000
-
-    radeon: fix buffer copying for VRAM->TT
-
-commit 4e81836d3e37b79281ce5ceb9cdaa58b77e5c455
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Wed Oct 8 16:51:58 2008 +1000
-
-    radeon: move memcpy until after CP is stopped
-
-commit c146982ac9312c0bd6d47a532082e0e5b3a1ec87
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Tue Oct 7 16:34:12 2008 +1000
-
-    drm: remove stray debug code
-
-commit 5622b6ebef242abaa16bd4840cbcc4d5a8ddab6b
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Tue Oct 7 16:31:22 2008 +1000
-
-    radeon: use discardable flags on no backing store objects
-
-commit 7734c188b2e5570b892fe3f4cce8594f8c2829c4
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Tue Oct 7 16:30:09 2008 +1000
-
-    drm: add discardable flag.
-    
-    This discards memory contents on suspend/resume with the
-    hope the upper layers know something we don't.
-
-commit 598d967566d02325fb01aabc26c5344f519ccec1
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Tue Oct 7 16:27:31 2008 +1000
-
-    drm/radeon: initial suspend/resume fix.
-    
-    This enables the evict code and also sets radeon up
-    to allow evict from VRAM to LOCAL
-
-commit e4ecd1ec002aa0bb100b4ef8ad0ce69d21927291
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Mon Oct 6 16:20:38 2008 +1000
-
-    radeon: fixup alignment between GEM and TTM
-    
-    fixup the interface between gem and ttm for alignment. makes Xv work better
-
-commit 88f1a76309df8823a610213454769ec0ecacee3c
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Wed Oct 1 11:27:02 2008 +1000
-
-    radeon: fixup GEM pinned offset retrieval for mesa
-
-commit 014150b2567074dc234eea3d39cc969045817604
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Wed Oct 1 11:25:54 2008 +1000
-
-    drm: fixup clean flag handling properly
-
-commit 12137517df80edd31f6b12ffba829adbf0bcb633
-Author: Alex Deucher <alexdeucher at gmail.com>
-Date:   Mon Sep 29 14:57:11 2008 +1000
-
-    radeon: use atom for ext tmds on r4xx
-
-commit d267e4365479324464aa9c74790f4baf46313e3c
-Author: Alex Deucher <alexdeucher at gmail.com>
-Date:   Mon Sep 29 14:56:32 2008 +1000
-
-    radeon: make atom on r4xx a module option
-    
-    default is legacy modesetting.  pass module option r4xx_atom
-    to try using atom on r4xx.
-
-commit e9c16b99ea46f123b816a83c61041665d50e40aa
-Author: Alex Deucher <alexdeucher at gmail.com>
-Date:   Mon Sep 29 14:55:16 2008 +1000
-
-    radeon: first pass at using atombios on r4xx hw
-
-commit 32cce8eeec8c915796709a0b4fa73233a602c159
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Mon Sep 29 14:50:47 2008 +1000
-
-    radeon: add r600 modesetting registers writes
-
-commit 7928f80e01dfb05bb47df169a4a612c9857fcc0c
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Mon Sep 29 14:45:11 2008 +1000
-
-    radeon: parse object tables for connectors on r600
-
-commit b05136e7bc90be8de8cc5ec6dcd881eb7c4403ce
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Tue Sep 23 16:34:55 2008 +1000
-
-    radeon: fix minor cursor disappearing issues
-
-commit 54e33fa8ace243761ac4d7742f978768adffc9cc
-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 c333d2c111abae0028990abc5bc213f955442210
-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 f67f849c4594b016736fe703260c4b27e999bb52
-Author: Dave Airlie <airlied at linux.ie>
-Date:   Sun Sep 21 09:48:51 2008 +1000
-
-    drm: fixups on top of rebase
-
-commit 1f47dfb3329c47d76d048e313aa2741e812f608d
-Author: Dave Airlie <airlied at linux.ie>
-Date:   Sat Sep 20 03:08:05 2008 +1000
-
-    radeon: rmx_fixup() fixes for legacy chips
-
-commit e61ef4082a5812cd5c0d0a8060f2a490462c90b9
-Author: Dave Airlie <airlied at linux.ie>
-Date:   Sat Sep 20 01:55:27 2008 +1000
-
-    radeon: fix combios
-
-commit 69f98d9cb79f7efcdaf08a1d355c0962e710ab16
-Author: Dave Airlie <airlied at linux.ie>
-Date:   Fri Sep 19 09:17:36 2008 +1000
-
-    radeon: port Alexs patches from modesetting-gem
-
-commit 8658360826acf2b1c6b3db5d0a3f9dd54116aa12
-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 04eb5deb4c78c8348a03b54923ab80177da61530
-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 919d4300a0310eec0dea91f5230eed4777febdfb
-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 4dca8490d06133fd3aa970f323ce544bf0f2e49b
-Author: Alex Deucher <alexdeucher at gmail.com>
-Date:   Thu Sep 18 09:55:14 2008 +1000
-
-    radeon: further LVDS fixes
-
-commit c5b7e9585bcccffdf8d1e1b0cf3662f25da74e1b
-Author: Alex Deucher <alexdeucher at gmail.com>
-Date:   Thu Sep 18 09:54:12 2008 +1000
-
-    radeon: legacy lvds updates
-
-commit 3bec58a490d6a17b5f6d4282e58234316c3d1874
-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 61c866ab5cb626c64eff8e042b9d2875dfe34aef
-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 c0c6ef14b9eef905fe2f7f9c2eee23b0110e57ac
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Thu Sep 11 17:13:32 2008 +1000
-
-    radeon: disable blit moves
-
-commit 6128a67b2b05e539f0f699491d0624e0a298e404
-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 2baf9ed316ee2fd6a8f32cc341d0ced5ab952cb9
-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 83787829d64f32cff66010178f813d954a72165a
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Wed Sep 10 14:35:08 2008 +1000
-
-    radeon: fix return value
-
-commit e0e8f18eb92f444c9da2054a6131e3436e915ab3
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Wed Sep 10 14:34:39 2008 +1000
-
-    radeon: fixup reference counting properly
-
-commit 2953d06e8bc677db4611d7c70398cb7514855267
-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 b9f23d86c70eae33119f686b36d3d9c99d392b38
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Mon Sep 8 11:37:26 2008 +1000
-
-    radeon: remove unneeded debugging
-
-commit 2e46b91a138677187c5935e499b06bf4341ddaa2
-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 3f7e1afb07a418e12b3d02d6727892094de11249
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Mon Sep 8 10:27:48 2008 +1000
-
-    radeon: disable debugging that sneaky itself on
-
-commit 739bcbf35675ddd59b559912a771093734934895
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Mon Sep 8 10:20:44 2008 +1000
-
-    radeon: make text reserve 256k
-
-commit 6af8d873aad603a7efd67955f8e2317d1c214b92
-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 b461cf38deb707f0afe797d6026af0e399470515
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Fri Sep 5 16:12:59 2008 +1000
-
-    radeon: further suspend/resume support
-
-commit 45f8c7cc94ee2815af61bea5813b07f04e3055a4
-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 b446e37474947319ad6ddade241d6c4b76272429
-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 6e3e88d1d7afabcc7c9da49a69caa7265e6b5a4b
-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 821cbaf71968f2641ee1a280273b7a686ca29484
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Thu Sep 4 11:58:08 2008 +1000
-
-    drm/radeon: fixup some avivo/rs690 checks
-
-commit 79dc0b37b6f2bbea6cafba489810072755ba2066
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Fri Aug 29 09:59:02 2008 +1000
-
-    drm: move text mode check to driver.
-    
-    also change name from text to nomodeset
-
-commit ca5b11014c39862712cb3af42c675ba5d80223fc
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Thu Aug 28 21:22:27 2008 +1000
-
-    radeon: fix up LVDS panel mode
-    
-    also don't explode on lack of DDC
-
-commit f194154331ebe89bec59cf2d05b6ea9a493c8afc
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Thu Aug 28 18:31:50 2008 +1000
-
-    drm: fix dev->master convert
-
-commit 2973ad931c307c58627e94f335fc884ad84f812c
-Author: Kristian H??gsberg <krh at redhat.com>
-Date:   Wed Aug 20 11:24:13 2008 -0400
-
-    drm: Set up a kernel side hw_lock, so userspace isn't required to do so.
-    
-    DRI2 doesn't use a user space lock, so don't require one to be set up.
-    Old DRI can still provide a lock containing map as before, which will
-    override the default kernel-side lock.
-    
-    Signed-off-by: Kristian H??gsberg <krh at redhat.com>
-
-commit e42302521c82411455952b15ef3d3b480a383aa9
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Thu Aug 28 16:38:49 2008 +1000
-
-    radeon: fix LVDS on atombios - typos
-
-commit 6a59e3be99ce037c4c7e6750ebb71941297b0283
-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 e371ca47f8cab9b02a8fcdf175ac5eb52fb452dc
-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 de311f42d559d9b6267bf12d39fb04a1ef0b0596
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Wed Aug 27 15:39:17 2008 +1000
-
-    radeon: fix after rebase
-
-commit 6ddac3240bf7c745563ec10112f4e64da22e4d94
-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 f68122d97ac2cb531a40bf00a784711b9616bd0b
-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 85a32a1ff18f03af94d5da0dfd6c72c1c87273ff
-Author: Alex Deucher <alexdeucher at gmail.com>
-Date:   Tue Aug 26 17:22:37 2008 +1000
-
-    radeon: first pass at legacy dac detect
-    
-    - done: primary dac, vga on tvdac
-    - todo: ext dac, tv on tvdac
-
-commit 5240ebb96373d6784882d6b8bf0164bee96d63e5
-Author: Alex Deucher <alexdeucher at gmail.com>
-Date:   Tue Aug 26 17:22:11 2008 +1000
-
-    radeon: first pass at bios scratch regs
-    
-    - todo: updated connected status
-
-commit b410ffa7a96dd3634aeafdf65da3535841e851b7
-Author: Alex Deucher <alexdeucher at gmail.com>
-Date:   Tue Aug 26 17:20:54 2008 +1000
-
-    radeon: remove unused legacy state
-
-commit 03ba71e8779fbb3fdce234395e39756188c5c57f
-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 158074d069e05fea9db42c50d8ec802403e85b9c
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Tue Aug 26 17:03:13 2008 +1000
-
-    x86: export pat_enabled
-
-commit ef6ff34bc3df4955c878b9ace6290b0036f5eae8
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Tue Aug 26 17:02:43 2008 +1000
-
-    drm: enable PAT and writecombining support.
-    
-    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 a888bea0ac65dac03f2ad8d80faa865263a6680f
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Tue Aug 26 17:01:35 2008 +1000
-
-    radeon: add more domain support to GEM code.
-    
-    move domain validate function to separate function
-    call it from correct places
-
-commit 746c4194898a9469685b7871457cc5b626ebe834
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Tue Aug 26 17:00:49 2008 +1000
-
-    radeon: implement zero fill for VRAM migration
-    
-    If a BO hasn't been dirtied, do a solid fill on VRAM instead of
-    migrating pages to VRAM
-
-commit a4449f0a75730329a52350df4b580ab106b3ede5
-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 9d769ad7295df7fc8a7e766d25282d826b4c9f17
-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 f3400715966e70d76edfcac679f95bd0899571d7
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Fri Aug 22 10:16:01 2008 +1000
-
-    radeon_gem: fix some misplace ==
-
-commit 26f8dd79369ef2b11639d7d6370812fad653bd89
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Fri Aug 22 10:13:25 2008 +1000
-
-    radeon: get buffer upload working
-
-commit fd4d5f1d7a59e756d71060977bdc4614fd43bf7a
-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 6aaa94d45e0857387e0b99af19776634f3f815b5
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Fri Aug 22 10:11:55 2008 +1000
-
-    drm: export buffer zeroing function for sw fallback
-    
-    We need a buffer zeroing function for before we have
-    accel running etc
-
-commit b02b9c4005c2a2936860e3c8b2a33cf1f72c9eaa
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Fri Aug 22 09:49:16 2008 +1000
-
-    ttm: add clean bo flags
-    
-    This can be used to denote a bo hasn't been mapped or validated yet.
-    
-    Primarily for the move code when we get a buffer in VRAM, we don't need
-    to copy the contents just zero them.
-
-commit 5cdcbe22b990bae5a94ed23459d7da0cbff9c5d1
-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 5772269ca5faee789888b6d88f7e004bc82c3c5c
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Fri Aug 22 09:35:26 2008 +1000
-
-    drm: remove tlb flush logic from ttm
-
-commit 2cae6ae322331b526c298327194019c35ea8884d
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Tue Aug 19 12:15:10 2008 +1000
-
-    radeon: fix bug in scratch retreival
-
-commit e151aff46f512d3affa21d863cba29d9082d9769
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Tue Aug 19 12:14:38 2008 +1000
-
-    radeon: add GTT domain
-
-commit 3dbbfb73b8dcfb7a905554686bb5aecfa528848a
-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 694234245e2a44a5e1dd993226366d7856329332
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Thu Aug 14 18:14:56 2008 +1000
-
-    disable modeset on < r300
-
-commit f4fc2f0c02bb4ba4a37dc0f9016893def2aeb8ae
-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 c39c8ba622bb1fd586c0ffa9e0196467d6409df0
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Fri Aug 15 09:35:55 2008 +1000
-
-    radeon: fix LVDS modes problem
-
-commit 65e372632a9ca30f6525a857498c7c6ed6fc7b8e
-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 8b3759c0b0ebc40568e9d4129d7417333bd28383
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Thu Aug 14 14:38:27 2008 +1000
-
-    radeon: add support for init memory map
-    
-    This gets RN50 to initialise correctly
-
-commit 464beca8505b83d9d3793ea36545a1f4c795bbdb
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Thu Aug 14 14:37:25 2008 +1000
-
-    radeon: add copy/solid regs for rn50
-
-commit 8a5df2edce3956dfa4dea93e54e9a555a8091aa7
-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 4dc9ae60710587d6eb4528adf6f9fd6d3bf98ac7
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Thu Aug 14 09:59:31 2008 +1000
-
-    radeon: add quirks from DDX
-
-commit 23bead7936fa5837857f04382fb2ead5888a651d
-Author: Alex Deucher <alexdeucher at gmail.com>
-Date:   Thu Aug 14 09:59:12 2008 +1000
-
-    radeon: fix warnings
-
-commit c7f1f3b70bb39a4c93cf62bc42e16da579579f08
-Author: Alex Deucher <alexdeucher at gmail.com>
-Date:   Thu Aug 14 09:58:47 2008 +1000
-
-    radeon: get legacy working
-    
-    - extra ~ in RADEON_WRITE_P()
-    - re-arrange crtc setup a bit
-    - add debugging for tracing calls
-    - fix pitch calculation
-
-commit b15eb2aeaa6a79567d7981be209279a65e4d5116
-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 a03e1f4e90327e311005fb2976a2bdd28343483c
-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 714c5345309568da83139f303eb0e77cf8f7ea73
-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 5c8ff762cbd904ef4ce006eb09e32e6f9aee010c
-Author: Alex Deucher <alexdeucher at gmail.com>
-Date:   Thu Aug 14 09:53:08 2008 +1000
-
-    radeon/atom: implement crtc lock
-
-commit a542e1b20c5f45ed9b51bb0a49cc9282b8c2c462
-Author: Alex Deucher <alexdeucher at gmail.com>
-Date:   Thu Aug 14 09:50:15 2008 +1000
-
-    LUT updates
-    
-    - Add gamma set for legacy chips
-    - Add 16 bpp gamma set
-
-commit 7d876277c79ad07ebab759da39578756f3944963
-Author: Alex Deucher <alexdeucher at gmail.com>
-Date:   Thu Aug 14 09:49:55 2008 +1000
-
-    radeon: various cleanups
-    
-    - white space
-    - move i2c_lock to radeon_i2c.c
-    - enable tv dac on legacy
-
-commit b519c41feb3b01ceced81ca7cb7530c9cb4896a9
-Author: Alex Deucher <alexdeucher at gmail.com>
-Date:   Thu Aug 14 09:49:30 2008 +1000
-
-    radeon: Add legacy dac detect stubs
-
-commit 758640fb5728e929f1fb4f930dd155630e2a2fa3
-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 20cf1cd244c2eb1a6a9f536d2c8943052bfaa779
-Author: Alex Deucher <alexdeucher at gmail.com>
-Date:   Thu Aug 14 09:48:50 2008 +1000
-
-    Brute force port of legacy crtc/encoder code
-    
-    - removed save/init/restore chain with set functions
-
-commit 3097d314424e7c80badc5cd2466f6a3a9c11ff8b
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Thu Aug 14 08:54:04 2008 +1000
-
-    FEDORA: radeon set gart buffers start
-
-commit 8aa9ac91119156f7d5d72cb520df90c1302d4294
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Thu Aug 14 08:52:41 2008 +1000
-
-    radeon: command submission remove debug
-
-commit bd08e1834974cb46bd32f1dec51bba23b5ff4f83
-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 21774fce3f12c8d33c0c54f83ae25e7437b8dae9
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Tue Aug 12 12:19:05 2008 +1000
-
-    radeon: hack it up so we get front/back offsets
-    
-    in the correct place in the drm so buffer swaps work again
-
-commit bb5e57c623c4aabc2789f5f16f021ace1414722c
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Tue Aug 12 12:18:08 2008 +1000
-
-    radeon: add mm supported call for userspace
-
-commit 9a0b19a7de6789f9365cba2799c98d1a2bfce240
-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 4c7cad754cca0db3add06de03349605be258ee2f
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Fri Aug 8 15:57:10 2008 +1000
-
-    radeon: add initial code to support legacy crtc/encoders.
-    
-    This adds the CRTC and PLL setting code, it doesn't work
-    yet but its all heading in the right direction.
-
-commit d8bfa6722b1940d14f2bbacef9d57cfdb8e2e2af
-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 a7d190848a64a17f194b8981e9e91ac59f20f94d
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Wed Aug 6 16:01:22 2008 +1000
-
-    radeon: set new memmap on gem enable
-
-commit 679d86cb502aebbc5e569e65689e2ef4412de72a
-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 c48fd543563acc4d997bfc1588711c8bc3dc82b7
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Wed Aug 6 15:44:38 2008 +1000
-
-    radeon: set gart table size
-
-commit 6862fa69fa8abd2b7b3663f59b8b142a42bbb5d8
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Wed Aug 6 15:44:18 2008 +1000
-
-    radeon: fix buffer evict slection
-
-commit 7b7b8f8e037ee4a85ada62d361b7a375c88f4651
-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 d5451c8890bd98c7603ddb42fbf53872e64692e9
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Tue Aug 5 11:22:24 2008 +1000
-
-    radeon: fix defines so blit works again
-
-commit 55d92569cad01c22671ce571e26a329f6d443b83
-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 f29b834f2c1c63e25c99917fb54ca8825043178c
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Mon Aug 4 14:21:22 2008 +1000
-
-    drm: fix unneeded debug
-
-commit 570fb9a4d9d77277b31e674a3ae7542a6c9fe12d
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Mon Aug 4 14:20:47 2008 +1000
-
-    radeon: add setparam for userspace to init the memory manager.
-    
-    if kms enabled memory manager will be enabled by default
-
-commit 1b187e68832c2842a32e815c770a59c9256ba7d2
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Mon Aug 4 14:20:26 2008 +1000
-
-    drm: kill bo after driver lastclose
-
-commit 878f9624518bf887ed09fd124832508da1eb5ba7
-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 7654d8e8ab46be45f554047646f137391a68886d
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Sat Aug 2 08:06:26 2008 +1000
-
-    drm: fix release locking
-
-commit ecf1ed7bba13913efbcc3150861cbcbba3e5cea3
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Fri Aug 1 16:55:34 2008 +1000
-
-    drm: add radeon modesetting support
-
-commit 8a499ba39b78eb4cf9a2af8f351f05c0b2e906e3
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Fri Aug 1 14:06:12 2008 +1000
-
-    drm: add TTM VM changes
-
-commit 13e1e589837ebbecf5f57d9835f495154bd2d8df
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Thu Jul 31 15:27:27 2008 +1000
-
-    drm: import TTM basic objects
-
-commit a033be0c17d760198bc73ad7e6924adb7074471c
-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
 diff --git a/arch/x86/mm/pat.c b/arch/x86/mm/pat.c
-index 8b08fb9..ae77b2f 100644
+index 7b61036..fad583a 100644
 --- a/arch/x86/mm/pat.c
 +++ b/arch/x86/mm/pat.c
 @@ -11,6 +11,7 @@
@@ -25976,10 +24644,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..94a485b
+index 0000000..1cd47bc
 --- /dev/null
 +++ b/drivers/gpu/drm/radeon/radeon_i2c.c
-@@ -0,0 +1,196 @@
+@@ -0,0 +1,195 @@
 +/*
 + * Copyright 2007-8 Advanced Micro Devices, Inc.
 + * Copyright 2008 Red Hat Inc.
@@ -26136,7 +24804,6 @@
 +		return NULL;
 +
 +	i2c->adapter.owner = THIS_MODULE;
-+	i2c->adapter.id = I2C_HW_B_RADEON;
 +	i2c->adapter.algo_data = &i2c->algo;
 +	i2c->dev = dev;
 +	i2c->algo.setsda = set_data;



From pwouters at fedoraproject.org  Tue Jan 27 03:17:39 2009
From: pwouters at fedoraproject.org (Paul Wouters)
Date: Tue, 27 Jan 2009 03:17:39 +0000 (UTC)
Subject: rpms/nsd/devel nsd.spec,1.45,1.46
Message-ID: <20090127031739.EED7E7010B@cvs1.fedora.phx.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/nsd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19503

Modified Files:
	nsd.spec 
Log Message:
* Mon Jan 26 2009 Paul Wouters <paul at xelerance.com> - 3.2.1-2
- Change bogus initrddir for the real initdir



Index: nsd.spec
===================================================================
RCS file: /cvs/extras/rpms/nsd/devel/nsd.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- nsd.spec	27 Jan 2009 03:00:04 -0000	1.45
+++ nsd.spec	27 Jan 2009 03:17:09 -0000	1.46
@@ -1,7 +1,7 @@
 Summary: fast and lean authoritative DNS name server
 Name: nsd
 Version: 3.2.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: BSD
 Url: http://www.nlnetlabs.nl/%{name}/
 #Source: http://www.nlnetlabs.nl/downloads/%{name}/%{name}-%{version}.tar.gz
@@ -40,10 +40,10 @@
 %install
 rm -rf %{buildroot}
 %{__make} DESTDIR=%{buildroot} install
-install -d -m 0755 %{buildroot}%{_initrddir}
+install -d -m 0755 %{buildroot}%{_initdir}
 install -d -m 0755 $RPM_BUILD_ROOT%{_sysconfdir}/cron.hourly
 install -c -m 0755 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/cron.hourly/nsd
-install -m 0755 %{SOURCE1} %{buildroot}/%{_initrddir}/nsd
+install -m 0755 %{SOURCE1} %{buildroot}/%{_initdir}/nsd
 install -d -m 0700 %{buildroot}%{_localstatedir}/run/%{name}
 install -d -m 0700 %{buildroot}%{_localstatedir}/lib/%{name}
 
@@ -63,7 +63,7 @@
 %dir %{_sysconfdir}/nsd/
 %attr(0644,root,root) %config(noreplace) %{_sysconfdir}/nsd/nsd.conf
 #%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/nsd/nsd.zones
-%attr(0755,root,root) %{_initrddir}/%{name}
+%attr(0755,root,root) %{_initdir}/%{name}
 %{_sysconfdir}/cron.hourly/nsd
 %attr(0755,%{name},%{name}) %dir %{_localstatedir}/run/%{name}
 %attr(0755,%{name},%{name}) %dir %{_localstatedir}/lib/%{name}
@@ -92,6 +92,9 @@
 fi
 
 %changelog
+* Mon Jan 26 2009 Paul Wouters <paul at xelerance.com> - 3.2.1-2
+- Change bogus initrddir for the real initdir
+
 * Mon Jan 26 2009 Paul Wouters <paul at xelerance.com> - 3.2.1-1
 - Updated to new version 3.2.1
 



From kyle at fedoraproject.org  Tue Jan 27 03:54:04 2009
From: kyle at fedoraproject.org (Kyle McMartin)
Date: Tue, 27 Jan 2009 03:54:04 +0000 (UTC)
Subject: rpms/kernel/F-9 skip-sanity-check-of-busy-resources.patch, NONE,
	1.1 kernel.spec, 1.897, 1.898
Message-ID: <20090127035404.8236D7010B@cvs1.fedora.phx.redhat.com>

Author: kyle

Update of /cvs/pkgs/rpms/kernel/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25382

Modified Files:
	kernel.spec 
Added Files:
	skip-sanity-check-of-busy-resources.patch 
Log Message:
* Mon Jan 26 2009 Kyle McMartin <kyle at redhat.com> - 2.6.28.2-6
- add skip-sanity-check-of-busy-resources.patch, fixes #480700, ioremap
  sanity check WARN_ON due to acpi ec.
  3ac52669c7a24b93663acfcab606d1065ed1accd upstream.


skip-sanity-check-of-busy-resources.patch:

--- NEW FILE skip-sanity-check-of-busy-resources.patch ---
commit 3ac52669c7a24b93663acfcab606d1065ed1accd
Author: Arjan van de Ven <arjan at linux.intel.com>
Date:   Sat Dec 13 09:15:27 2008 -0800

    resources: skip sanity check of busy resources
    
    Impact: reduce false positives in iomem_map_sanity_check()
    
    Some drivers (vesafb) only map/reserve a portion of a resource.
    If then some other driver comes in and maps the whole resource,
    the current code WARN_ON's. This is not the intent of the checks
    in iomem_map_sanity_check(); rather these checks want to
    warn when crossing *hardware* resources only.
    
    This patch skips BUSY resources as suggested by Linus.
    
    Note: having two drivers talk to the same hardware at the same
    time is obviously not optimal behavior, but that's a separate story.
    
    Signed-off-by: Arjan van de Ven <arjan at linux.intel.com>
    Signed-off-by: Ingo Molnar <mingo at elte.hu>

diff --git a/kernel/resource.c b/kernel/resource.c
index 4337063..e633106 100644
--- a/kernel/resource.c
+++ b/kernel/resource.c
@@ -853,6 +853,15 @@ int iomem_map_sanity_check(resource_size_t addr, unsigned long size)
 		if (PFN_DOWN(p->start) <= PFN_DOWN(addr) &&
 		    PFN_DOWN(p->end) >= PFN_DOWN(addr + size - 1))
 			continue;
+		/*
+		 * if a resource is "BUSY", it's not a hardware resource
+		 * but a driver mapping of such a resource; we don't want
+		 * to warn for those; some drivers legitimately map only
+		 * partial hardware resources. (example: vesafb)
+		 */
+		if (p->flags & IORESOURCE_BUSY)
+			continue;
+
 		printk(KERN_WARNING "resource map sanity check conflict: "
 		       "0x%llx 0x%llx 0x%llx 0x%llx %s\n",
 		       (unsigned long long)addr,


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/kernel.spec,v
retrieving revision 1.897
retrieving revision 1.898
diff -u -r1.897 -r1.898
--- kernel.spec	26 Jan 2009 21:18:22 -0000	1.897
+++ kernel.spec	27 Jan 2009 03:53:33 -0000	1.898
@@ -677,6 +677,8 @@
 # ui
 Patch3130: disable-p4-cpufreq-ui.patch
 
+Patch9000: skip-sanity-check-of-busy-resources.patch
+
 %endif
 
 BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -1195,6 +1197,9 @@
 
 ApplyPatch disable-p4-cpufreq-ui.patch
 
+# fix #480700, acpi ec ioremap WARN_ON
+ApplyPatch skip-sanity-check-of-busy-resources.patch
+
 # END OF PATCH APPLICATIONS
 
 %endif
@@ -1770,7 +1775,12 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
-* Mon Jan 26 2009 Kyle McMartin <kyle at redhat.com> - kernel-2.6.28.2-5.fc9
+* Mon Jan 26 2009 Kyle McMartin <kyle at redhat.com> - 2.6.28.2-6
+- add skip-sanity-check-of-busy-resources.patch, fixes #480700, ioremap
+  sanity check WARN_ON due to acpi ec.
+  3ac52669c7a24b93663acfcab606d1065ed1accd upstream.
+
+* Mon Jan 26 2009 Kyle McMartin <kyle at redhat.com> - 2.6.28.2-5
 - 2.6.28.2 final
 
 * Mon Jan 19 2009 Kyle McMartin <kyle at redhat.com>



From pwouters at fedoraproject.org  Tue Jan 27 03:55:43 2009
From: pwouters at fedoraproject.org (Paul Wouters)
Date: Tue, 27 Jan 2009 03:55:43 +0000 (UTC)
Subject: rpms/nsd/devel nsd.init,1.9,1.10 nsd.spec,1.46,1.47
Message-ID: <20090127035543.E04E07010B@cvs1.fedora.phx.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/nsd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25649

Modified Files:
	nsd.init nsd.spec 
Log Message:
* Mon Jan 26 2009 Paul Wouters <paul at xelerance.com> - 3.2.1-3
- Fix init script 'unary operator' error.



Index: nsd.init
===================================================================
RCS file: /cvs/extras/rpms/nsd/devel/nsd.init,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- nsd.init	10 Nov 2008 04:51:54 -0000	1.9
+++ nsd.init	27 Jan 2009 03:55:13 -0000	1.10
@@ -27,7 +27,7 @@
 [ -r /etc/sysconfig/nsd ] && . /etc/sysconfig/nsd
 
 # Check that networking is configured.
-[ ${NETWORKING} = "no" ] && exit 0
+[ "${NETWORKING}" = "no" ] && exit 0
 
 start() {
   # Source networking configuration.


Index: nsd.spec
===================================================================
RCS file: /cvs/extras/rpms/nsd/devel/nsd.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- nsd.spec	27 Jan 2009 03:17:09 -0000	1.46
+++ nsd.spec	27 Jan 2009 03:55:13 -0000	1.47
@@ -1,7 +1,7 @@
 Summary: fast and lean authoritative DNS name server
 Name: nsd
 Version: 3.2.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: BSD
 Url: http://www.nlnetlabs.nl/%{name}/
 #Source: http://www.nlnetlabs.nl/downloads/%{name}/%{name}-%{version}.tar.gz
@@ -40,10 +40,10 @@
 %install
 rm -rf %{buildroot}
 %{__make} DESTDIR=%{buildroot} install
-install -d -m 0755 %{buildroot}%{_initdir}
+install -d -m 0755 %{buildroot}%{_initrddir}
 install -d -m 0755 $RPM_BUILD_ROOT%{_sysconfdir}/cron.hourly
 install -c -m 0755 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/cron.hourly/nsd
-install -m 0755 %{SOURCE1} %{buildroot}/%{_initdir}/nsd
+install -m 0755 %{SOURCE1} %{buildroot}/%{_initrddir}/nsd
 install -d -m 0700 %{buildroot}%{_localstatedir}/run/%{name}
 install -d -m 0700 %{buildroot}%{_localstatedir}/lib/%{name}
 
@@ -63,7 +63,7 @@
 %dir %{_sysconfdir}/nsd/
 %attr(0644,root,root) %config(noreplace) %{_sysconfdir}/nsd/nsd.conf
 #%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/nsd/nsd.zones
-%attr(0755,root,root) %{_initdir}/%{name}
+%attr(0755,root,root) %{_initrddir}/%{name}
 %{_sysconfdir}/cron.hourly/nsd
 %attr(0755,%{name},%{name}) %dir %{_localstatedir}/run/%{name}
 %attr(0755,%{name},%{name}) %dir %{_localstatedir}/lib/%{name}
@@ -92,8 +92,8 @@
 fi
 
 %changelog
-* Mon Jan 26 2009 Paul Wouters <paul at xelerance.com> - 3.2.1-2
-- Change bogus initrddir for the real initdir
+* Mon Jan 26 2009 Paul Wouters <paul at xelerance.com> - 3.2.1-3
+- Fix init script 'unary operator' error.
 
 * Mon Jan 26 2009 Paul Wouters <paul at xelerance.com> - 3.2.1-1
 - Updated to new version 3.2.1



From kyle at fedoraproject.org  Tue Jan 27 03:54:32 2009
From: kyle at fedoraproject.org (Kyle McMartin)
Date: Tue, 27 Jan 2009 03:54:32 +0000 (UTC)
Subject: rpms/kernel/F-10 skip-sanity-check-of-busy-resources.patch, NONE,
	1.1 kernel.spec, 1.1230, 1.1231
Message-ID: <20090127035432.EFF737010B@cvs1.fedora.phx.redhat.com>

Author: kyle

Update of /cvs/pkgs/rpms/kernel/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25454

Modified Files:
	kernel.spec 
Added Files:
	skip-sanity-check-of-busy-resources.patch 
Log Message:
* Mon Jan 26 2009 Kyle McMartin <kyle at redhat.com> 2.6.28.2-24
- add skip-sanity-check-of-busy-resources.patch, fixes #480700, ioremap
  sanity check WARN_ON due to acpi ec.
  3ac52669c7a24b93663acfcab606d1065ed1accd upstream.


skip-sanity-check-of-busy-resources.patch:

--- NEW FILE skip-sanity-check-of-busy-resources.patch ---
commit 3ac52669c7a24b93663acfcab606d1065ed1accd
Author: Arjan van de Ven <arjan at linux.intel.com>
Date:   Sat Dec 13 09:15:27 2008 -0800

    resources: skip sanity check of busy resources
    
    Impact: reduce false positives in iomem_map_sanity_check()
    
    Some drivers (vesafb) only map/reserve a portion of a resource.
    If then some other driver comes in and maps the whole resource,
    the current code WARN_ON's. This is not the intent of the checks
    in iomem_map_sanity_check(); rather these checks want to
    warn when crossing *hardware* resources only.
    
    This patch skips BUSY resources as suggested by Linus.
    
    Note: having two drivers talk to the same hardware at the same
    time is obviously not optimal behavior, but that's a separate story.
    
    Signed-off-by: Arjan van de Ven <arjan at linux.intel.com>
    Signed-off-by: Ingo Molnar <mingo at elte.hu>

diff --git a/kernel/resource.c b/kernel/resource.c
index 4337063..e633106 100644
--- a/kernel/resource.c
+++ b/kernel/resource.c
@@ -853,6 +853,15 @@ int iomem_map_sanity_check(resource_size_t addr, unsigned long size)
 		if (PFN_DOWN(p->start) <= PFN_DOWN(addr) &&
 		    PFN_DOWN(p->end) >= PFN_DOWN(addr + size - 1))
 			continue;
+		/*
+		 * if a resource is "BUSY", it's not a hardware resource
+		 * but a driver mapping of such a resource; we don't want
+		 * to warn for those; some drivers legitimately map only
+		 * partial hardware resources. (example: vesafb)
+		 */
+		if (p->flags & IORESOURCE_BUSY)
+			continue;
+
 		printk(KERN_WARNING "resource map sanity check conflict: "
 		       "0x%llx 0x%llx 0x%llx 0x%llx %s\n",
 		       (unsigned long long)addr,


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/kernel.spec,v
retrieving revision 1.1230
retrieving revision 1.1231
diff -u -r1.1230 -r1.1231
--- kernel.spec	26 Jan 2009 21:13:29 -0000	1.1230
+++ kernel.spec	27 Jan 2009 03:54:02 -0000	1.1231
@@ -680,6 +680,8 @@
 # ui
 Patch3130: disable-p4-cpufreq-ui.patch
 
+Patch9000: skip-sanity-check-of-busy-resources.patch
+
 %endif
 
 BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -1206,6 +1208,9 @@
 
 ApplyPatch disable-p4-cpufreq-ui.patch
 
+# fix #480700, acpi ec ioremap WARN_ON
+ApplyPatch skip-sanity-check-of-busy-resources.patch
+
 # END OF PATCH APPLICATIONS
 
 %endif
@@ -1782,6 +1787,11 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Mon Jan 26 2009 Kyle McMartin <kyle at redhat.com> 2.6.28.2-24
+- add skip-sanity-check-of-busy-resources.patch, fixes #480700, ioremap
+  sanity check WARN_ON due to acpi ec.
+  3ac52669c7a24b93663acfcab606d1065ed1accd upstream.
+
 * Mon Jan 26 2009 Kyle McMartin <kyle at redhat.com> 2.6.28.2-22
 - 2.6.28.2 final
 



From kyle at fedoraproject.org  Tue Jan 27 03:54:32 2009
From: kyle at fedoraproject.org (Kyle McMartin)
Date: Tue, 27 Jan 2009 03:54:32 +0000 (UTC)
Subject: rpms/kernel/F-10 skip-sanity-check-of-busy-resources.patch, NONE,
	1.1 kernel.spec, 1.1230, 1.1231
Message-ID: <20090127035432.EFF737010B@cvs1.fedora.phx.redhat.com>

Author: kyle

Update of /cvs/pkgs/rpms/kernel/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25454

Modified Files:
	kernel.spec 
Added Files:
	skip-sanity-check-of-busy-resources.patch 
Log Message:
* Mon Jan 26 2009 Kyle McMartin <kyle at redhat.com> 2.6.28.2-24
- add skip-sanity-check-of-busy-resources.patch, fixes #480700, ioremap
  sanity check WARN_ON due to acpi ec.
  3ac52669c7a24b93663acfcab606d1065ed1accd upstream.


skip-sanity-check-of-busy-resources.patch:

--- NEW FILE skip-sanity-check-of-busy-resources.patch ---
commit 3ac52669c7a24b93663acfcab606d1065ed1accd
Author: Arjan van de Ven <arjan at linux.intel.com>
Date:   Sat Dec 13 09:15:27 2008 -0800

    resources: skip sanity check of busy resources
    
    Impact: reduce false positives in iomem_map_sanity_check()
    
    Some drivers (vesafb) only map/reserve a portion of a resource.
    If then some other driver comes in and maps the whole resource,
    the current code WARN_ON's. This is not the intent of the checks
    in iomem_map_sanity_check(); rather these checks want to
    warn when crossing *hardware* resources only.
    
    This patch skips BUSY resources as suggested by Linus.
    
    Note: having two drivers talk to the same hardware at the same
    time is obviously not optimal behavior, but that's a separate story.
    
    Signed-off-by: Arjan van de Ven <arjan at linux.intel.com>
    Signed-off-by: Ingo Molnar <mingo at elte.hu>

diff --git a/kernel/resource.c b/kernel/resource.c
index 4337063..e633106 100644
--- a/kernel/resource.c
+++ b/kernel/resource.c
@@ -853,6 +853,15 @@ int iomem_map_sanity_check(resource_size_t addr, unsigned long size)
 		if (PFN_DOWN(p->start) <= PFN_DOWN(addr) &&
 		    PFN_DOWN(p->end) >= PFN_DOWN(addr + size - 1))
 			continue;
+		/*
+		 * if a resource is "BUSY", it's not a hardware resource
+		 * but a driver mapping of such a resource; we don't want
+		 * to warn for those; some drivers legitimately map only
+		 * partial hardware resources. (example: vesafb)
+		 */
+		if (p->flags & IORESOURCE_BUSY)
+			continue;
+
 		printk(KERN_WARNING "resource map sanity check conflict: "
 		       "0x%llx 0x%llx 0x%llx 0x%llx %s\n",
 		       (unsigned long long)addr,


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/kernel.spec,v
retrieving revision 1.1230
retrieving revision 1.1231
diff -u -r1.1230 -r1.1231
--- kernel.spec	26 Jan 2009 21:13:29 -0000	1.1230
+++ kernel.spec	27 Jan 2009 03:54:02 -0000	1.1231
@@ -680,6 +680,8 @@
 # ui
 Patch3130: disable-p4-cpufreq-ui.patch
 
+Patch9000: skip-sanity-check-of-busy-resources.patch
+
 %endif
 
 BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -1206,6 +1208,9 @@
 
 ApplyPatch disable-p4-cpufreq-ui.patch
 
+# fix #480700, acpi ec ioremap WARN_ON
+ApplyPatch skip-sanity-check-of-busy-resources.patch
+
 # END OF PATCH APPLICATIONS
 
 %endif
@@ -1782,6 +1787,11 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Mon Jan 26 2009 Kyle McMartin <kyle at redhat.com> 2.6.28.2-24
+- add skip-sanity-check-of-busy-resources.patch, fixes #480700, ioremap
+  sanity check WARN_ON due to acpi ec.
+  3ac52669c7a24b93663acfcab606d1065ed1accd upstream.
+
 * Mon Jan 26 2009 Kyle McMartin <kyle at redhat.com> 2.6.28.2-22
 - 2.6.28.2 final
 



From jwilson at fedoraproject.org  Tue Jan 27 04:47:58 2009
From: jwilson at fedoraproject.org (Jarod Wilson)
Date: Tue, 27 Jan 2009 04:47:58 +0000 (UTC)
Subject: rpms/kernel/devel linux-2.6.29-lirc.patch, NONE, 1.1 config-generic,
	1.228, 1.229 kernel.spec, 1.1234,
	1.1235 linux-2.6-firewire-git-pending.patch, 1.32,
	1.33 linux-2.6-firewire-git-update.patch, 1.18,
	1.19 linux-2.6.27-lirc.patch, 1.4, NONE
Message-ID: <20090127044758.94D187010B@cvs1.fedora.phx.redhat.com>

Author: jwilson

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1207

Modified Files:
	config-generic kernel.spec 
	linux-2.6-firewire-git-pending.patch 
	linux-2.6-firewire-git-update.patch 
Added Files:
	linux-2.6.29-lirc.patch 
Removed Files:
	linux-2.6.27-lirc.patch 
Log Message:
* Mon Jan 26 2009 Jarod Wilson <jarod at redhat.com>
- Update to firewire to latest linux1394-2.6.git tree
  * Adds iso resource allocation code from our own Jay Fenlason
  * Increases AT retry attempts, should fix some cranky dv cams (#449252)
- Update lirc to latest git tree
  * Adds support for several new mceusb2 and imon devices
- Nuke some config cruft from EEPROM symbol renames


linux-2.6.29-lirc.patch:

--- NEW FILE linux-2.6.29-lirc.patch ---
 drivers/input/Kconfig                 |    2 +
 drivers/input/Makefile                |    2 +
 drivers/input/lirc/Kconfig            |  118 +++
 drivers/input/lirc/Makefile           |   21 +
 drivers/input/lirc/lirc.h             |  100 +++
 drivers/input/lirc/lirc_bt829.c       |  381 +++++++++
 drivers/input/lirc/lirc_dev.c         |  754 ++++++++++++++++++
 drivers/input/lirc/lirc_dev.h         |  178 +++++
 drivers/input/lirc/lirc_i2c.c         |  649 ++++++++++++++++
 drivers/input/lirc/lirc_igorplugusb.c |  554 +++++++++++++
 drivers/input/lirc/lirc_imon.c        | 1369 ++++++++++++++++++++++++++++++++
 drivers/input/lirc/lirc_it87.c        |  984 +++++++++++++++++++++++
 drivers/input/lirc/lirc_it87.h        |  116 +++
 drivers/input/lirc/lirc_ite8709.c     |  539 +++++++++++++
 drivers/input/lirc/lirc_mceusb.c      |  784 +++++++++++++++++++
 drivers/input/lirc/lirc_mceusb2.c     | 1119 ++++++++++++++++++++++++++
 drivers/input/lirc/lirc_parallel.c    |  709 +++++++++++++++++
 drivers/input/lirc/lirc_parallel.h    |   26 +
 drivers/input/lirc/lirc_sasem.c       |  933 ++++++++++++++++++++++
 drivers/input/lirc/lirc_serial.c      | 1321 +++++++++++++++++++++++++++++++
 drivers/input/lirc/lirc_sir.c         | 1294 ++++++++++++++++++++++++++++++
 drivers/input/lirc/lirc_streamzap.c   |  772 ++++++++++++++++++
 drivers/input/lirc/lirc_ttusbir.c     |  396 ++++++++++
 drivers/input/lirc/lirc_zilog.c       | 1382 +++++++++++++++++++++++++++++++++
 24 files changed, 14503 insertions(+), 0 deletions(-)

diff --git a/drivers/input/Kconfig b/drivers/input/Kconfig
index 5f9d860..2ba0904 100644
--- a/drivers/input/Kconfig
+++ b/drivers/input/Kconfig
@@ -170,6 +170,8 @@ source "drivers/input/tablet/Kconfig"
 
 source "drivers/input/touchscreen/Kconfig"
 
+source "drivers/input/lirc/Kconfig"
+
 source "drivers/input/misc/Kconfig"
 
 endif
diff --git a/drivers/input/Makefile b/drivers/input/Makefile
index 98c4f9a..6a1049b 100644
--- a/drivers/input/Makefile
+++ b/drivers/input/Makefile
@@ -25,3 +25,5 @@ obj-$(CONFIG_INPUT_MISC)	+= misc/
 obj-$(CONFIG_INPUT_APMPOWER)	+= apm-power.o
 
 obj-$(CONFIG_XEN_KBDDEV_FRONTEND)	+= xen-kbdfront.o
+
+obj-$(CONFIG_INPUT_LIRC)       += lirc/
diff --git a/drivers/input/lirc/Kconfig b/drivers/input/lirc/Kconfig
new file mode 100644
index 0000000..0482bb9
--- /dev/null
+++ b/drivers/input/lirc/Kconfig
@@ -0,0 +1,118 @@
+#
+# LIRC driver(s) configuration
+#
+menuconfig INPUT_LIRC
+	bool "Linux Infrared Remote Control IR receiver/transmitter drivers"
+	help
+	  Say Y here, and all supported Linux Infrared Remote Control IR and
+	  RF receiver and transmitter drivers will be displayed. When paired
+	  with a remote control and the lirc daemon, the receiver drivers
+	  allow control of your Linux system via remote control.
+
+if INPUT_LIRC
+
+config LIRC_DEV
+	tristate "LIRC device loadable module support"
+	help
+	  LIRC device loadable module support, required for most LIRC drivers
+
+config LIRC_BT829
+        tristate "BT829 based hardware"
+	depends on LIRC_DEV
+	help
+	  Driver for the IR interface on BT829-based hardware
+
+config LIRC_I2C
+	tristate "I2C Based IR Receivers"
+	depends on LIRC_DEV
+	help
+	  Driver for I2C-based IR receivers, such as those commonly
+	  found onboard Hauppauge PVR-150/250/350 video capture cards
+
+config LIRC_IGORPLUGUSB
+	tristate "Igor Cesko's USB IR Receiver"
+	depends on LIRC_DEV && USB
+	help
+	  Driver for Igor Cesko's USB IR Receiver
+
+config LIRC_IMON
+	tristate "Soundgraph IMON Receiver"
+	depends on LIRC_DEV
+	help
+	  Driver for the Soundgraph IMON IR Receiver
+
+config LIRC_IT87
+	tristate "ITE IT87XX CIR Port Receiver"
+	depends on LIRC_DEV
+	help
+	  Driver for the ITE IT87xx IR Receiver
+
+config LIRC_ITE8709
+	tristate "ITE8709 CIR Port Receiver"
+	depends on LIRC_DEV && PNP
+	help
+	  Driver for the ITE8709 IR Receiver
+
+config LIRC_MCEUSB
+	tristate "Microsoft Media Center Ed. Receiver, v1"
+	depends on LIRC_DEV && USB
+	help
+	  Driver for the Microsoft Media Center Ed. Receiver, v1
+
+config LIRC_MCEUSB2
+	tristate "Microsoft Media Center Ed. Receiver, v2"
+	depends on LIRC_DEV && USB
+	help
+	  Driver for the Microsoft Media Center Ed. Receiver, v2
+
+config LIRC_PARALLEL
+	tristate "Homebrew Parallel Port Receiver"
+	depends on LIRC_DEV && !SMP
+	help
+	  Driver for Homebrew Parallel Port Receivers
+
+config LIRC_SASEM
+	tristate "Sasem USB IR Remote"
+	depends on LIRC_DEV
+	help
+	  Driver for the Sasem OnAir Remocon-V or Dign HV5 HTPC IR/VFD Module
+
+config LIRC_SERIAL
+	tristate "Homebrew Serial Port Receiver"
+	depends on LIRC_DEV
+	help
+	  Driver for Homebrew Serial Port Receivers
+
+config LIRC_SERIAL_TRANSMITTER
+	bool "Serial Port Transmitter"
+	default y
+	depends on LIRC_SERIAL
+	help
+	  Serial Port Transmitter support
+
+config LIRC_SIR
+	tristate "Built-in SIR IrDA port"
+	depends on LIRC_DEV
+	help
+	  Driver for the SIR IrDA port
+
+config LIRC_STREAMZAP
+	tristate "Streamzap PC Receiver"
+	depends on LIRC_DEV
+	help
+	  Driver for the Streamzap PC Receiver
+
+config LIRC_TTUSBIR
+	tristate "Technotrend USB IR Receiver"
+	depends on LIRC_DEV && USB
+	help
+	  Driver for the Technotrend USB IR Receiver
+
+config LIRC_ZILOG
+	tristate "Zilog/Hauppauge IR Transmitter"
+	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..a22df78
--- /dev/null
+++ b/drivers/input/lirc/Makefile
@@ -0,0 +1,21 @@
+# Makefile for the lirc drivers.
+#
+
+# Each configuration option enables a list of files.
+
+obj-$(CONFIG_LIRC_DEV)		+= lirc_dev.o
+obj-$(CONFIG_LIRC_BT829)	+= lirc_bt829.o
+obj-$(CONFIG_LIRC_I2C)		+= lirc_i2c.o
+obj-$(CONFIG_LIRC_IGORPLUGUSB)	+= lirc_igorplugusb.o
+obj-$(CONFIG_LIRC_IMON)		+= lirc_imon.o
+obj-$(CONFIG_LIRC_IT87)		+= lirc_it87.o
+obj-$(CONFIG_LIRC_ITE8709)	+= lirc_ite8709.o
+obj-$(CONFIG_LIRC_MCEUSB)	+= lirc_mceusb.o
+obj-$(CONFIG_LIRC_MCEUSB2)	+= lirc_mceusb2.o
+obj-$(CONFIG_LIRC_PARALLEL)	+= lirc_parallel.o
+obj-$(CONFIG_LIRC_SASEM)	+= lirc_sasem.o
+obj-$(CONFIG_LIRC_SERIAL)	+= lirc_serial.o
+obj-$(CONFIG_LIRC_SIR)		+= lirc_sir.o
+obj-$(CONFIG_LIRC_STREAMZAP)	+= lirc_streamzap.o
+obj-$(CONFIG_LIRC_TTUSBIR)	+= lirc_ttusbir.o
[...14281 lines suppressed...]
+				    "poll thread\n");
+			goto err;
+		}
+		wait_for_completion(&tn);
+		ir->t_notify = NULL;
+	}
+
+	/* initialise TX device */
+	memcpy(&ir->c_tx, &client_template, sizeof(struct i2c_client));
+	if (have_tx) {
+		/* I2C attach to device */
+		ir->c_tx.addr = 0x70;
+		strncpy(ir->c_tx.name, "Zilog/Hauppauge TX", I2C_NAME_SIZE);
+		ret = i2c_attach(&ir->c_tx, ir);
+		if (ret != 0)
+			goto err;
+	}
+
+	/* set lirc_dev stuff */
+	ir->l.code_length = 13;
+	ir->l.rbuf	  = &ir->buf;
+	ir->l.fops	= &lirc_fops;
+	ir->l.data	= ir;
+	ir->l.minor       = minor;
+	ir->l.sample_rate = 0;
+
+	/* register with lirc */
+	ir->l.minor = lirc_register_driver(&ir->l);
+	if (ir->l.minor < 0 || ir->l.minor >= MAX_IRCTL_DEVICES) {
+		zilog_error("ir_attach: \"minor\" must be between 0 and %d "
+			    "(%d)!\n", MAX_IRCTL_DEVICES-1, ir->l.minor);
+		ret = -EBADRQC;
+		goto err;
+	}
+
+	/* store this for getting back in open() later on */
+	ir_devices[ir->l.minor] = ir;
+
+	/*
+	 * if we have the tx device, load the 'firmware'.  We do this
+	 * after registering with lirc as otherwise hotplug seems to take
+	 * 10s to create the lirc device.
+	 */
+	if (have_tx) {
+		/* Special TX init */
+		ret = tx_init(ir);
+		if (ret != 0)
+			goto err;
+	}
+	return 0;
+
+err:
+	/* undo everything, hopefully... */
+	if (ir->c_rx.addr)
+		ir_detach(&ir->c_rx);
+	if (ir->c_tx.addr)
+		ir_detach(&ir->c_tx);
+	return ret;
+}
+
+static int ir_detach(struct i2c_client *client)
+{
+	struct IR *ir = i2c_get_clientdata(client);
+	mutex_lock(&ir->lock);
+
+	if (client == &ir->c_rx) {
+		DECLARE_COMPLETION(tn);
+		DECLARE_COMPLETION(tn2);
+
+		/* end up polling thread */
+		if (ir->task && !IS_ERR(ir->task)) {
+			ir->t_notify = &tn;
+			ir->t_notify2 = &tn2;
+			ir->shutdown = 1;
+			wake_up_process(ir->task);
+			complete(&tn2);
+			wait_for_completion(&tn);
+			ir->t_notify = NULL;
+			ir->t_notify2 = NULL;
+		}
+
+		/* unregister device */
+		i2c_detach_client(&ir->c_rx);
+	} else if (client == &ir->c_tx) {
+		i2c_detach_client(&ir->c_tx);
+	} else {
+		mutex_unlock(&ir->lock);
+		zilog_error("ir_detach: detached from something we didn't "
+			    "attach to\n");
+		return -ENODEV;
+	}
+
+	--ir->devs;
+	if (ir->devs < 0) {
+		mutex_unlock(&ir->lock);
+		zilog_error("ir_detach: invalid device count\n");
+		return -ENODEV;
+	} else if (ir->devs == 0) {
+		/* unregister lirc driver */
+		if (ir->l.minor >= 0 && ir->l.minor < MAX_IRCTL_DEVICES) {
+			lirc_unregister_driver(ir->l.minor);
+			ir_devices[ir->l.minor] = NULL;
+		}
+
+		/* free memory */
+		lirc_buffer_free(&ir->buf);
+		mutex_unlock(&ir->lock);
+		kfree(ir);
+		return 0;
+	}
+	mutex_unlock(&ir->lock);
+	return 0;
+}
+
+static int ir_probe(struct i2c_adapter *adap)
+{
+	struct i2c_client c;
+	char buf;
+	memset(&c, 0, sizeof(c));
+
+	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 i2c address 0x71.
+		 * The IR transmitter is at 0x70.
+		 */
+		c.adapter = adap;
+		c.addr = 0x70;
+
+		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);
+	}
+
+	return 0;
+}
+
+static int ir_command(struct i2c_client *client, unsigned int cmd, void *arg)
+{
+	/* nothing */
+	return 0;
+}
+
+static int __init zilog_init(void)
+{
+	mutex_init(&tx_data_lock);
+	request_module("ivtv");
+	request_module("firmware_class");
+	i2c_add_driver(&driver);
+	return 0;
+}
+
+static void __exit zilog_exit(void)
+{
+	i2c_del_driver(&driver);
+	/* if loaded */
+	fw_unload();
+}
+
+module_init(zilog_init);
+module_exit(zilog_exit);
+
+MODULE_DESCRIPTION("Zilog/Hauppauge infrared transmitter driver (i2c stack)");
+MODULE_AUTHOR("Gerd Knorr, Michal Kochanowicz, Christoph Bartelmus, "
+	      "Ulrich Mueller, Stefan Jahn, Jerome Brock, Mark Weaver");
+MODULE_LICENSE("GPL");
+/* for compat with old name, which isn't all that accurate anymore */
+MODULE_ALIAS("lirc_pvr150");
+
+module_param(minor, int, 0444);
+MODULE_PARM_DESC(minor, "Preferred minor device number");
+
+module_param(debug, bool, 0644);
+MODULE_PARM_DESC(debug, "Enable debugging messages");
+
+module_param(disable_rx, bool, 0644);
+MODULE_PARM_DESC(disable_rx, "Disable the IR receiver device");
+
+module_param(disable_tx, bool, 0644);
+MODULE_PARM_DESC(disable_tx, "Disable the IR transmitter device");


Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-generic,v
retrieving revision 1.228
retrieving revision 1.229
diff -u -r1.228 -r1.229
--- config-generic	27 Jan 2009 02:39:41 -0000	1.228
+++ config-generic	27 Jan 2009 04:47:26 -0000	1.229
@@ -1924,7 +1924,7 @@
 # CONFIG_I2C_I810 is not set
 # CONFIG_I2C_ISCH is not set
 # CONFIG_I2C_NFORCE2_S4985 is not set
-CONFIG_AT24=m
+CONFIG_EEPROM_AT24=m
 
 CONFIG_I2C_NFORCE2=m
 # CONFIG_I2C_OCORES is not set
@@ -1975,7 +1975,7 @@
 CONFIG_SENSORS_DS1337=m
 CONFIG_SENSORS_DS1374=m
 # CONFIG_DS1682 is not set
-CONFIG_SENSORS_EEPROM=m
+CONFIG_EEPROM_LEGACY=m
 CONFIG_SENSORS_FSCHER=m
 CONFIG_SENSORS_FSCPOS=m
 CONFIG_SENSORS_F71805F=m
@@ -3703,8 +3703,6 @@
 
 # CONFIG_PHANTOM is not set
 CONFIG_EEPROM_93CX6=m
-CONFIG_EEPROM_AT24=m
-CONFIG_EEPROM_LEGACY=m
 
 CONFIG_POWER_SUPPLY=m
 # CONFIG_POWER_SUPPLY_DEBUG is not set
@@ -3743,6 +3741,7 @@
 CONFIG_LIRC_ZILOG=m
 CONFIG_LIRC_PARALLEL=m
 CONFIG_LIRC_SERIAL=m
+CONFIG_LIRC_SERIAL_TRANSMITTER=y
 CONFIG_LIRC_SASEM=m
 CONFIG_LIRC_SIR=m
 CONFIG_LIRC_STREAMZAP=m


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1234
retrieving revision 1.1235
diff -u -r1.1234 -r1.1235
--- kernel.spec	27 Jan 2009 02:39:42 -0000	1.1234
+++ kernel.spec	27 Jan 2009 04:47:26 -0000	1.1235
@@ -644,7 +644,7 @@
 Patch900: linux-2.6-gspca-git.patch
 Patch901: linux-2.6-gspca-stv06xx-git.patch
 
-Patch1515: linux-2.6.27-lirc.patch
+Patch1515: linux-2.6.29-lirc.patch
 Patch1520: linux-2.6-hdpvr.patch
 
 # Fix the return code CD accesses when the CDROM drive door is closed
@@ -1156,7 +1156,7 @@
 #ApplyPatch linux-2.6-gspca-stv06xx-git.patch
 
 # http://www.lirc.org/
-ApplyPatch linux-2.6.27-lirc.patch
+ApplyPatch linux-2.6.29-lirc.patch
 # http://hg.jannau.net/hdpvr/
 ApplyPatch linux-2.6-hdpvr.patch
 
@@ -1177,7 +1177,7 @@
 #ApplyPatch drm-nouveau.patch
 
 # linux1394 git patches
-#ApplyPatch linux-2.6-firewire-git-update.patch
+ApplyPatch linux-2.6-firewire-git-update.patch
 C=$(wc -l $RPM_SOURCE_DIR/linux-2.6-firewire-git-pending.patch | awk '{print $1}')
 if [ "$C" -gt 10 ]; then
 ApplyPatch linux-2.6-firewire-git-pending.patch
@@ -1772,6 +1772,14 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Mon Jan 26 2009 Jarod Wilson <jarod at redhat.com>
+- Update to firewire to latest linux1394-2.6.git tree
+  * Adds iso resource allocation code from our own Jay Fenlason
+  * Increases AT retry attempts, should fix some cranky dv cams (#449252)
+- Update lirc to latest git tree
+  * Adds support for several new mceusb2 and imon devices
+- Nuke some config cruft from EEPROM symbol renames
+
 * Mon Jan 26 2009 Kyle McMartin <kyle at redhat.com>
 - 2.6.29-rc2-git2
 

linux-2.6-firewire-git-pending.patch:

Index: linux-2.6-firewire-git-pending.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-firewire-git-pending.patch,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- linux-2.6-firewire-git-pending.patch	12 Nov 2008 16:28:22 -0000	1.32
+++ linux-2.6-firewire-git-pending.patch	27 Jan 2009 04:47:27 -0000	1.33
@@ -3,3 +3,303 @@
 # tree (and/or in by the time your read this), which we want...
 #
 
+Date: Sat, 24 Jan 2009 19:42:21 +0100 (CET)
+From: Stefan Richter <stefanr at s5r6.in-berlin.de>
+Subject: [PATCH 1/7] firewire: sbp2: fix payload limit at S1600 and S3200
+To: linux1394-devel at lists.sourceforge.net
+Cc: linux-kernel at vger.kernel.org
+
+1394-2008 clause 16.3.4.1 (1394b-2002 clause 16.3.1.1) defines tighter
+limits than 1394-2008 clause 6.2.2.3 (1394a-2000 clause 6.2.2.3).
+
+Our previously too large limit doesn't matter though if the controller
+reports its max_receive correctly.
+
+Signed-off-by: Stefan Richter <stefanr at s5r6.in-berlin.de>
+---
+ drivers/firewire/fw-sbp2.c |   23 ++++++++++++-----------
+ 1 file changed, 12 insertions(+), 11 deletions(-)
+
+Index: linux/drivers/firewire/fw-sbp2.c
+===================================================================
+--- linux.orig/drivers/firewire/fw-sbp2.c
++++ linux/drivers/firewire/fw-sbp2.c
+@@ -168,6 +168,7 @@ struct sbp2_target {
+ 	int address_high;
+ 	unsigned int workarounds;
+ 	unsigned int mgt_orb_timeout;
++	unsigned int max_payload;
+ 
+ 	int dont_block;	/* counter for each logical unit */
+ 	int blocked;	/* ditto */
+@@ -1150,6 +1151,15 @@ static int sbp2_probe(struct device *dev
+ 
+ 	sbp2_init_workarounds(tgt, model, firmware_revision);
+ 
++	/*
++	 * At S100 we can do 512 bytes per packet, at S200 1024 bytes,
++	 * and so on up to 4096 bytes.  The SBP-2 max_payload field
++	 * specifies the max payload size as 2 ^ (max_payload + 2), so
++	 * if we set this to max_speed + 7, we get the right value.
++	 */
++	tgt->max_payload = min(device->max_speed + 7, 10U);
++	tgt->max_payload = min(tgt->max_payload, device->card->max_receive - 1);
++
+ 	/* Do the login in a workqueue so we can easily reschedule retries. */
+ 	list_for_each_entry(lu, &tgt->lu_list, link)
+ 		sbp2_queue_work(lu, DIV_ROUND_UP(HZ, 5));
+@@ -1426,7 +1436,6 @@ static int sbp2_scsi_queuecommand(struct
+ 	struct sbp2_logical_unit *lu = cmd->device->hostdata;
+ 	struct fw_device *device = fw_device(lu->tgt->unit->device.parent);
+ 	struct sbp2_command_orb *orb;
+-	unsigned int max_payload;
+ 	int generation, retval = SCSI_MLQUEUE_HOST_BUSY;
+ 
+ 	/*
+@@ -1454,17 +1463,9 @@ static int sbp2_scsi_queuecommand(struct
+ 	orb->done = done;
+ 	orb->cmd  = cmd;
+ 
+-	orb->request.next.high   = cpu_to_be32(SBP2_ORB_NULL);
+-	/*
+-	 * At speed 100 we can do 512 bytes per packet, at speed 200,
+-	 * 1024 bytes per packet etc.  The SBP-2 max_payload field
+-	 * specifies the max payload size as 2 ^ (max_payload + 2), so
+-	 * if we set this to max_speed + 7, we get the right value.
+-	 */
+-	max_payload = min(device->max_speed + 7,
+-			  device->card->max_receive - 1);
++	orb->request.next.high = cpu_to_be32(SBP2_ORB_NULL);
+ 	orb->request.misc = cpu_to_be32(
+-		COMMAND_ORB_MAX_PAYLOAD(max_payload) |
++		COMMAND_ORB_MAX_PAYLOAD(lu->tgt->max_payload) |
+ 		COMMAND_ORB_SPEED(device->max_speed) |
+ 		COMMAND_ORB_NOTIFY);
+ 
+
+-- 
+Stefan Richter
+-=====-==--= ---= ==---
+http://arcgraph.de/sr/
+
+
+
+Date: Sat, 24 Jan 2009 19:42:47 +0100 (CET)
+From: Stefan Richter <stefanr at s5r6.in-berlin.de>
+Subject: [PATCH 2/7] firewire: sbp2: define some magic numbers as macros
+To: linux1394-devel at lists.sourceforge.net
+Cc: linux-kernel at vger.kernel.org
+
+Signed-off-by: Stefan Richter <stefanr at s5r6.in-berlin.de>
+---
+ drivers/firewire/fw-sbp2.c |   23 ++++++++++++-----------
+ 1 file changed, 12 insertions(+), 11 deletions(-)
+
+Index: linux/drivers/firewire/fw-sbp2.c
+===================================================================
+--- linux.orig/drivers/firewire/fw-sbp2.c
++++ linux/drivers/firewire/fw-sbp2.c
+@@ -311,14 +311,16 @@ struct sbp2_command_orb {
+ 	dma_addr_t page_table_bus;
+ };
+ 
++#define SBP2_ROM_VALUE_WILDCARD ~0         /* match all */
++#define SBP2_ROM_VALUE_MISSING  0xff000000 /* not present in the unit dir. */
++
+ /*
+  * List of devices with known bugs.
+  *
+  * The firmware_revision field, masked with 0xffff00, is the best
+  * indicator for the type of bridge chip of a device.  It yields a few
+  * false positives but this did not break correctly behaving devices
+- * so far.  We use ~0 as a wildcard, since the 24 bit values we get
+- * from the config rom can never match that.
++ * so far.
+  */
+ static const struct {
+ 	u32 firmware_revision;
+@@ -340,22 +342,22 @@ static const struct {
+ 	},
+ 	/* Initio bridges, actually only needed for some older ones */ {
+ 		.firmware_revision	= 0x000200,
+-		.model			= ~0,
++		.model			= SBP2_ROM_VALUE_WILDCARD,
+ 		.workarounds		= SBP2_WORKAROUND_INQUIRY_36,
+ 	},
+ 	/* PL-3507 bridge with Prolific firmware */ {
+ 		.firmware_revision	= 0x012800,
+-		.model			= ~0,
++		.model			= SBP2_ROM_VALUE_WILDCARD,
+ 		.workarounds		= SBP2_WORKAROUND_POWER_CONDITION,
+ 	},
+ 	/* Symbios bridge */ {
+ 		.firmware_revision	= 0xa0b800,
+-		.model			= ~0,
++		.model			= SBP2_ROM_VALUE_WILDCARD,
+ 		.workarounds		= SBP2_WORKAROUND_128K_MAX_TRANS,
+ 	},
+ 	/* Datafab MD2-FW2 with Symbios/LSILogic SYM13FW500 bridge */ {
+ 		.firmware_revision	= 0x002600,
+-		.model			= ~0,
++		.model			= SBP2_ROM_VALUE_WILDCARD,
+ 		.workarounds		= SBP2_WORKAROUND_128K_MAX_TRANS,
+ 	},
+ 
+@@ -1087,7 +1089,7 @@ static void sbp2_init_workarounds(struct
+ 			continue;
+ 
+ 		if (sbp2_workarounds_table[i].model != model &&
+-		    sbp2_workarounds_table[i].model != ~0)
++		    sbp2_workarounds_table[i].model != SBP2_ROM_VALUE_WILDCARD)
+ 			continue;
+ 
+ 		w |= sbp2_workarounds_table[i].workarounds;
+@@ -1137,14 +1139,13 @@ static int sbp2_probe(struct device *dev
+ 	fw_device_get(device);
+ 	fw_unit_get(unit);
+ 
+-	/* Initialize to values that won't match anything in our table. */
+-	firmware_revision = 0xff000000;
+-	model = 0xff000000;
+-
+ 	/* implicit directory ID */
+ 	tgt->directory_id = ((unit->directory - device->config_rom) * 4
+ 			     + CSR_CONFIG_ROM) & 0xffffff;
+ 
++	firmware_revision = SBP2_ROM_VALUE_MISSING;
++	model		  = SBP2_ROM_VALUE_MISSING;
++
+ 	if (sbp2_scan_unit_dir(tgt, unit->directory, &model,
+ 			       &firmware_revision) < 0)
+ 		goto fail_tgt_put;
+
+-- 
+Stefan Richter
+-=====-==--= ---= ==---
+http://arcgraph.de/sr/
+
+
+
+Date: Sat, 24 Jan 2009 19:41:46 +0100 (CET)
+From: Stefan Richter <stefanr at s5r6.in-berlin.de>
+Subject: firewire: sbp2: add workarounds for 2nd and 3rd generation iPods
+
+According to https://bugs.launchpad.net/bugs/294391
+  - 3rd generation iPods need the "fix capacity" workaround after all
+    (apparently they crash after the last sector was accessed),
+  - 2nd generation iPods need the "128 kB maximum request size"
+    workaround.
+
+Furthermore, Kristian H??gsberg mentioned that 2nd generation iPods
+treat page tables (scatter-gather lists) as data buffers, i.e. ignore
+the page_table_present bit of command block ORBs.  If this is true, then
+the 128 kB limit is not a sufficient workaround; instead we have to
+guarantee that all requests have only a single s/g element.  This could
+be up to 64 kByte - 4 Bytes in size.  But I expect the block layer to
+typically emit much smaller elements than that, alas.
+
+Alas both iPod generations feature the same model ID in the config ROM,
+hence we can only define a shared quirks list entry for them.  This is
+bad since
+  - the "fix capacity" workaround prevents access to the very last
+    sector if a device does not actually have this bug,
+  - the "no page tables" workaround dramatically reduces throughput,
+    e.g. from 25 to 9 MB/s without gap count optimization, and from 36
+    11 MB/s with gap count optimization (as per hdparm with a regular
+    3.5" S400 disk on an i686 PC without IOMMU).  Whether this matters
+    with the already slow iPod disk is not yet known.
+
+This patch needs testing by somebody who has the hardware:
+  - Do 2nd and 3rd gen. iPods actually have a model_id == 0, or do they
+    have in fact no model_id at all?
+  - Does the "fix capacity" workaround harm usage of 2nd gen. iPods?
+  - Is the "no page tables" workaround really necessary for 2nd gen.
+    iPods, or is the 128k limit sufficient as reported for the Ubuntu
+    8.10 kernel?
+  - How badly does the "no page tables" workaround affect throughput of
+    3rd gen. iPods which don't need it?
+
+A side note:  Apple computers in target mode (or at least an x86 Mac
+mini) don't have firmware_version and model_id, hence none of the iPod
+quirks list entries is active for them.
+
+Signed-off-by: Stefan Richter <stefanr at s5r6.in-berlin.de>
+---
+ drivers/firewire/fw-sbp2.c |   27 +++++++++++++++++++--------
+ 1 file changed, 19 insertions(+), 8 deletions(-)
+
+Index: linux/drivers/firewire/fw-sbp2.c
+===================================================================
+--- linux.orig/drivers/firewire/fw-sbp2.c
++++ linux/drivers/firewire/fw-sbp2.c
+@@ -92,6 +92,10 @@ MODULE_PARM_DESC(exclusive_login, "Exclu
+  *   sd_mod on suspend, resume, and shutdown (if manage_start_stop is on).
+  *   Some disks need this to spin down or to resume properly.
+  *
++ * - no page tables
++ *   Limit data buffers to a single scatter/ gather element for buggy devices
++ *   which ignore the page_table_present bit in command block ORBs.
++ *
+  * - override internal blacklist
+  *   Instead of adding to the built-in blacklist, use only the workarounds
+  *   specified in the module load parameter.
+@@ -104,6 +108,7 @@ MODULE_PARM_DESC(exclusive_login, "Exclu
+ #define SBP2_WORKAROUND_DELAY_INQUIRY	0x10
+ #define SBP2_INQUIRY_DELAY		12
+ #define SBP2_WORKAROUND_POWER_CONDITION	0x20
++#define SBP2_WORKAROUND_NO_PAGE_TABLES	0x40
+ #define SBP2_WORKAROUND_OVERRIDE	0x100
+ 
+ static int sbp2_param_workarounds;
+@@ -116,6 +121,7 @@ MODULE_PARM_DESC(workarounds, "Work arou
+ 	", delay inquiry = "      __stringify(SBP2_WORKAROUND_DELAY_INQUIRY)
+ 	", set power condition in start stop unit = "
+ 				  __stringify(SBP2_WORKAROUND_POWER_CONDITION)
++	", no page tables = "     __stringify(SBP2_WORKAROUND_NO_PAGE_TABLES)
+ 	", override internal blacklist = " __stringify(SBP2_WORKAROUND_OVERRIDE)
+ 	", or a combination)");
+ 
+@@ -325,7 +331,7 @@ struct sbp2_command_orb {
+ static const struct {
+ 	u32 firmware_revision;
+ 	u32 model;
+-	unsigned int workarounds;
++	unsigned workarounds;
+ } sbp2_workarounds_table[] = {
+ 	/* DViCO Momobay CX-1 with TSB42AA9 bridge */ {
+ 		.firmware_revision	= 0x002800,
+@@ -360,15 +366,17 @@ static const struct {
+ 		.model			= SBP2_ROM_VALUE_WILDCARD,
+ 		.workarounds		= SBP2_WORKAROUND_128K_MAX_TRANS,
+ 	},
+-
+ 	/*
+-	 * There are iPods (2nd gen, 3rd gen) with model_id == 0, but
+-	 * these iPods do not feature the read_capacity bug according
+-	 * to one report.  Read_capacity behaviour as well as model_id
+-	 * could change due to Apple-supplied firmware updates though.
++	 * iPod 2nd generation: needs no-page-tables workaround
++	 * iPod 3rd generation: needs fix-capacity workaround
+ 	 */
+-
+-	/* iPod 4th generation. */ {
++	{
++		.firmware_revision	= 0x0a2700,
++		.model			= 0x000000,
++		.workarounds		= SBP2_WORKAROUND_NO_PAGE_TABLES |
++					  SBP2_WORKAROUND_FIX_CAPACITY,
++	},
++	/* iPod 4th generation */ {
+ 		.firmware_revision	= 0x0a2700,
+ 		.model			= 0x000021,
+ 		.workarounds		= SBP2_WORKAROUND_FIX_CAPACITY,
+@@ -1540,6 +1548,9 @@ static int sbp2_scsi_slave_configure(str
+ 	if (lu->tgt->workarounds & SBP2_WORKAROUND_128K_MAX_TRANS)
+ 		blk_queue_max_sectors(sdev->request_queue, 128 * 1024 / 512);
+ 
++	if (lu->tgt->workarounds & SBP2_WORKAROUND_NO_PAGE_TABLES)
++		blk_queue_max_hw_segments(sdev->request_queue, 1);
++
+ 	blk_queue_max_segment_size(sdev->request_queue, SBP2_MAX_SEG_SIZE);
+ 
+ 	return 0;

linux-2.6-firewire-git-update.patch:

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.18 -r 1.19 linux-2.6-firewire-git-update.patch
Index: linux-2.6-firewire-git-update.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-firewire-git-update.patch,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- linux-2.6-firewire-git-update.patch	29 Oct 2008 15:32:05 -0000	1.18
+++ linux-2.6-firewire-git-update.patch	27 Jan 2009 04:47:27 -0000	1.19
@@ -1,77 +1,86 @@
-Git diff in linux1394-2.6-git at commit 3346610742cdef8b1670d090008aca0911e95880
-vs. tag v2.6.27, on 2008-10-29.
+git diff -p --stat v2.6.29-rc2 -- drivers/firewire/ include/linux/ in
+linux1394-2.6.git, done on 20090126 by Jarod.
 
 ---
-
- drivers/firewire/fw-card.c         |   58 ++------
- drivers/firewire/fw-cdev.c         |   42 +++---
- drivers/firewire/fw-device.c       |   40 ++----
- drivers/firewire/fw-device.h       |    4 +
- drivers/firewire/fw-ohci.c         |  123 ++++++++++------
- drivers/firewire/fw-sbp2.c         |  154 +++++++++-----------
- drivers/firewire/fw-topology.c     |   18 ++-
- drivers/firewire/fw-transaction.c  |   48 ++++++-
- drivers/firewire/fw-transaction.h  |   20 ++-
- drivers/ieee1394/csr1212.c         |    2 +-
- drivers/ieee1394/dv1394.c          |    2 +-
- drivers/ieee1394/eth1394.c         |    2 +-
- drivers/ieee1394/nodemgr.c         |  279 ++++++++++++++----------------------
- drivers/ieee1394/nodemgr.h         |    2 +-
- drivers/ieee1394/raw1394-private.h |    1 +
- drivers/ieee1394/raw1394.c         |  230 ++++++++++++++++-------------
- drivers/ieee1394/sbp2.c            |  218 ++++++++++++----------------
- drivers/ieee1394/sbp2.h            |   33 ++---
- drivers/ieee1394/video1394.c       |    8 +-
- include/linux/firewire-cdev.h      |    9 +-
- 20 files changed, 622 insertions(+), 671 deletions(-)
+ drivers/firewire/fw-card.c        |   70 +--
+ drivers/firewire/fw-cdev.c        | 1006 +++++++++++++++++++++++++------------
+ drivers/firewire/fw-device.c      |  164 +++++--
+ drivers/firewire/fw-device.h      |    8 +-
+ drivers/firewire/fw-iso.c         |  225 +++++++--
+ drivers/firewire/fw-ohci.c        |  242 +++++-----
+ drivers/firewire/fw-sbp2.c        |   57 +--
+ drivers/firewire/fw-topology.c    |   40 +-
+ drivers/firewire/fw-topology.h    |   19 +-
+ drivers/firewire/fw-transaction.c |  151 +++----
+ drivers/firewire/fw-transaction.h |  136 ++----
+ include/linux/firewire-cdev.h     |  170 ++++++-
+ 12 files changed, 1481 insertions(+), 807 deletions(-)
 
 diff --git a/drivers/firewire/fw-card.c b/drivers/firewire/fw-card.c
-index bbd73a4..94cf070 100644
+index 6bd91a1..bed7994 100644
 --- a/drivers/firewire/fw-card.c
 +++ b/drivers/firewire/fw-card.c
-@@ -189,39 +189,16 @@ static const char gap_count_table[] = {
+@@ -63,8 +63,7 @@ static int descriptor_count;
+ #define BIB_CMC			((1) << 30)
+ #define BIB_IMC			((1) << 31)
+ 
+-static u32 *
+-generate_config_rom(struct fw_card *card, size_t *config_rom_length)
++static u32 *generate_config_rom(struct fw_card *card, size_t *config_rom_length)
+ {
+ 	struct fw_descriptor *desc;
+ 	static u32 config_rom[256];
+@@ -128,8 +127,7 @@ generate_config_rom(struct fw_card *card, size_t *config_rom_length)
+ 	return config_rom;
+ }
+ 
+-static void
+-update_config_roms(void)
++static void update_config_roms(void)
+ {
+ 	struct fw_card *card;
+ 	u32 *config_rom;
+@@ -141,8 +139,7 @@ update_config_roms(void)
+ 	}
+ }
+ 
+-int
+-fw_core_add_descriptor(struct fw_descriptor *desc)
++int fw_core_add_descriptor(struct fw_descriptor *desc)
+ {
+ 	size_t i;
+ 
+@@ -171,8 +168,7 @@ fw_core_add_descriptor(struct fw_descriptor *desc)
+ 	return 0;
+ }
+ 
+-void
+-fw_core_remove_descriptor(struct fw_descriptor *desc)
++void fw_core_remove_descriptor(struct fw_descriptor *desc)
+ {
+ 	mutex_lock(&card_mutex);
+ 
+@@ -189,8 +185,7 @@ static const char gap_count_table[] = {
  	63, 5, 7, 8, 10, 13, 16, 18, 21, 24, 26, 29, 32, 35, 37, 40
  };
  
--struct bm_data {
--	struct fw_transaction t;
--	struct {
--		__be32 arg;
--		__be32 data;
--	} lock;
--	u32 old;
--	int rcode;
--	struct completion done;
--};
--
+-void
+-fw_schedule_bm_work(struct fw_card *card, unsigned long delay)
++void fw_schedule_bm_work(struct fw_card *card, unsigned long delay)
+ {
+ 	int scheduled;
+ 
+@@ -200,8 +195,7 @@ fw_schedule_bm_work(struct fw_card *card, unsigned long delay)
+ 		fw_card_put(card);
+ }
+ 
 -static void
--complete_bm_lock(struct fw_card *card, int rcode,
--		 void *payload, size_t length, void *data)
--{
--	struct bm_data *bmd = data;
--
--	if (rcode == RCODE_COMPLETE)
--		bmd->old = be32_to_cpu(*(__be32 *) payload);
--	bmd->rcode = rcode;
--	complete(&bmd->done);
--}
--
- static void
- fw_card_bm_work(struct work_struct *work)
+-fw_card_bm_work(struct work_struct *work)
++static void fw_card_bm_work(struct work_struct *work)
  {
  	struct fw_card *card = container_of(work, struct fw_card, work.work);
  	struct fw_device *root_device;
- 	struct fw_node *root_node, *local_node;
--	struct bm_data bmd;
- 	unsigned long flags;
--	int root_id, new_root_id, irm_id, gap_count, generation, grace;
-+	int root_id, new_root_id, irm_id, gap_count, generation, grace, rcode;
- 	bool do_reset = false;
-+	__be32 lock_data[2];
- 
- 	spin_lock_irqsave(&card->lock, flags);
- 	local_node = card->local_node;
-@@ -241,7 +218,7 @@ fw_card_bm_work(struct work_struct *work)
+@@ -232,7 +226,7 @@ fw_card_bm_work(struct work_struct *work)
  	root_id = root_node->node_id;
  	grace = time_after(jiffies, card->reset_jiffies + DIV_ROUND_UP(HZ, 10));
  
@@ -80,69 +89,342 @@
  	    (card->bm_generation != generation && grace)) {
  		/*
  		 * This first step is to figure out who is IRM and
-@@ -263,33 +240,28 @@ fw_card_bm_work(struct work_struct *work)
- 			goto pick_me;
- 		}
+@@ -371,17 +365,16 @@ fw_card_bm_work(struct work_struct *work)
+ 	fw_card_put(card);
+ }
  
--		bmd.lock.arg = cpu_to_be32(0x3f);
--		bmd.lock.data = cpu_to_be32(local_node->node_id);
-+		lock_data[0] = cpu_to_be32(0x3f);
-+		lock_data[1] = cpu_to_be32(local_node->node_id);
- 
- 		spin_unlock_irqrestore(&card->lock, flags);
- 
--		init_completion(&bmd.done);
--		fw_send_request(card, &bmd.t, TCODE_LOCK_COMPARE_SWAP,
--				irm_id, generation,
--				SCODE_100, CSR_REGISTER_BASE + CSR_BUS_MANAGER_ID,
--				&bmd.lock, sizeof(bmd.lock),
--				complete_bm_lock, &bmd);
--		wait_for_completion(&bmd.done);
-+		rcode = fw_run_transaction(card, TCODE_LOCK_COMPARE_SWAP,
-+				irm_id, generation, SCODE_100,
-+				CSR_REGISTER_BASE + CSR_BUS_MANAGER_ID,
-+				lock_data, sizeof(lock_data));
+-static void
+-flush_timer_callback(unsigned long data)
++static void flush_timer_callback(unsigned long data)
+ {
+ 	struct fw_card *card = (struct fw_card *)data;
  
--		if (bmd.rcode == RCODE_GENERATION) {
--			/*
--			 * Another bus reset happened. Just return,
--			 * the BM work has been rescheduled.
--			 */
-+		if (rcode == RCODE_GENERATION)
-+			/* Another bus reset, BM work has been rescheduled. */
- 			goto out;
--		}
[...5696 lines suppressed...]
++	__u32 type;
++	__u32 handle;
++	__s32 channel;
++	__s32 bandwidth;
++};
++
++/**
+  * union fw_cdev_event - Convenience union of fw_cdev_event_ types
+  * @common:        Valid for all types
+  * @bus_reset:     Valid if @common.type == %FW_CDEV_EVENT_BUS_RESET
+  * @response:      Valid if @common.type == %FW_CDEV_EVENT_RESPONSE
   * @request:       Valid if @common.type == %FW_CDEV_EVENT_REQUEST
   * @iso_interrupt: Valid if @common.type == %FW_CDEV_EVENT_ISO_INTERRUPT
++ * @iso_resource:  Valid if @common.type ==
++ *				%FW_CDEV_EVENT_ISO_RESOURCE_ALLOCATED or
++ *				%FW_CDEV_EVENT_ISO_RESOURCE_DEALLOCATED
   *
-- * Convenience union for userspace use.  Events could be read(2) into a char
-- * buffer and then cast to this union for further processing.
-+ * Convenience union for userspace use.  Events could be read(2) into an
-+ * appropriately aligned char buffer and then cast to this union for further
-+ * processing.  Note that for a request, response or iso_interrupt event,
-+ * the data[] or header[] may make the size of the full event larger than
-+ * sizeof(union fw_cdev_event).  Also note that if you attempt to read(2)
-+ * an event into a buffer that is not large enough for it, the data that does
-+ * not fit will be discarded so that the next read(2) will return a new event.
+  * Convenience union for userspace use.  Events could be read(2) into an
+  * appropriately aligned char buffer and then cast to this union for further
+@@ -163,13 +214,15 @@ struct fw_cdev_event_iso_interrupt {
+  * not fit will be discarded so that the next read(2) will return a new event.
   */
  union fw_cdev_event {
- 	struct fw_cdev_event_common common;
+-	struct fw_cdev_event_common common;
+-	struct fw_cdev_event_bus_reset bus_reset;
+-	struct fw_cdev_event_response response;
+-	struct fw_cdev_event_request request;
+-	struct fw_cdev_event_iso_interrupt iso_interrupt;
++	struct fw_cdev_event_common		common;
++	struct fw_cdev_event_bus_reset		bus_reset;
++	struct fw_cdev_event_response		response;
++	struct fw_cdev_event_request		request;
++	struct fw_cdev_event_iso_interrupt	iso_interrupt;
++	struct fw_cdev_event_iso_resource	iso_resource;
+ };
+ 
++/* available since kernel version 2.6.22 */
+ #define FW_CDEV_IOC_GET_INFO		_IOWR('#', 0x00, struct fw_cdev_get_info)
+ #define FW_CDEV_IOC_SEND_REQUEST	_IOW('#', 0x01, struct fw_cdev_send_request)
+ #define FW_CDEV_IOC_ALLOCATE		_IOWR('#', 0x02, struct fw_cdev_allocate)
+@@ -178,18 +231,29 @@ union fw_cdev_event {
+ #define FW_CDEV_IOC_INITIATE_BUS_RESET	_IOW('#', 0x05, struct fw_cdev_initiate_bus_reset)
+ #define FW_CDEV_IOC_ADD_DESCRIPTOR	_IOWR('#', 0x06, struct fw_cdev_add_descriptor)
+ #define FW_CDEV_IOC_REMOVE_DESCRIPTOR	_IOW('#', 0x07, struct fw_cdev_remove_descriptor)
+-
+ #define FW_CDEV_IOC_CREATE_ISO_CONTEXT	_IOWR('#', 0x08, struct fw_cdev_create_iso_context)
+ #define FW_CDEV_IOC_QUEUE_ISO		_IOWR('#', 0x09, struct fw_cdev_queue_iso)
+ #define FW_CDEV_IOC_START_ISO		_IOW('#', 0x0a, struct fw_cdev_start_iso)
+ #define FW_CDEV_IOC_STOP_ISO		_IOW('#', 0x0b, struct fw_cdev_stop_iso)
++
++/* available since kernel version 2.6.24 */
+ #define FW_CDEV_IOC_GET_CYCLE_TIMER	_IOR('#', 0x0c, struct fw_cdev_get_cycle_timer)
+ 
+-/* FW_CDEV_VERSION History
+- *
+- * 1	Feb 18, 2007:  Initial version.
++/* available since kernel version 2.6.30 */
++#define FW_CDEV_IOC_ALLOCATE_ISO_RESOURCE       _IOWR('#', 0x0d, struct fw_cdev_allocate_iso_resource)
++#define FW_CDEV_IOC_DEALLOCATE_ISO_RESOURCE      _IOW('#', 0x0e, struct fw_cdev_deallocate)
++#define FW_CDEV_IOC_ALLOCATE_ISO_RESOURCE_ONCE   _IOW('#', 0x0f, struct fw_cdev_allocate_iso_resource)
++#define FW_CDEV_IOC_DEALLOCATE_ISO_RESOURCE_ONCE _IOW('#', 0x10, struct fw_cdev_allocate_iso_resource)
++#define FW_CDEV_IOC_GET_SPEED                    _IOR('#', 0x11, struct fw_cdev_get_speed)
++#define FW_CDEV_IOC_SEND_BROADCAST_REQUEST       _IOW('#', 0x12, struct fw_cdev_send_request)
++
++/*
++ * FW_CDEV_VERSION History
++ *  1  (2.6.22)  - initial version
++ *  2  (2.6.30)  - changed &fw_cdev_event_iso_interrupt.header if
++ *                 &fw_cdev_create_iso_context.header_size is 8 or more
+  */
+-#define FW_CDEV_VERSION		1
++#define FW_CDEV_VERSION 2
+ 
+ /**
+  * struct fw_cdev_get_info - General purpose information ioctl
+@@ -201,7 +265,7 @@ union fw_cdev_event {
+  *		case, @rom_length is updated with the actual length of the
+  *		configuration ROM.
+  * @rom:	If non-zero, address of a buffer to be filled by a copy of the
+- *		local node's configuration ROM
++ *		device's configuration ROM
+  * @bus_reset:	If non-zero, address of a buffer to be filled by a
+  *		&struct fw_cdev_event_bus_reset with the current state
+  *		of the bus.  This does not cause a bus reset to happen.
+@@ -229,7 +293,7 @@ struct fw_cdev_get_info {
+  * Send a request to the device.  This ioctl implements all outgoing requests.
+  * Both quadlet and block request specify the payload as a pointer to the data
+  * in the @data field.  Once the transaction completes, the kernel writes an
+- * &fw_cdev_event_request event back.  The @closure field is passed back to
++ * &fw_cdev_event_response event back.  The @closure field is passed back to
+  * user space in the response event.
+  */
+ struct fw_cdev_send_request {
+@@ -284,9 +348,9 @@ struct fw_cdev_allocate {
+ };
+ 
+ /**
+- * struct fw_cdev_deallocate - Free an address range allocation
+- * @handle:	Handle to the address range, as returned by the kernel when the
+- *		range was allocated
++ * struct fw_cdev_deallocate - Free a CSR address range or isochronous resource
++ * @handle:	Handle to the address range or iso resource, as returned by the
++ *		kernel when the range or resource was allocated
+  */
+ struct fw_cdev_deallocate {
+ 	__u32 handle;
+@@ -370,6 +434,9 @@ struct fw_cdev_remove_descriptor {
+  *
+  * If a context was successfully created, the kernel writes back a handle to the
+  * context, which must be passed in for subsequent operations on that context.
++ *
++ * Note that the effect of a @header_size > 4 depends on
++ * &fw_cdev_get_info.version, as documented at &fw_cdev_event_iso_interrupt.
+  */
+ struct fw_cdev_create_iso_context {
+ 	__u32 type;
+@@ -473,10 +540,73 @@ struct fw_cdev_stop_iso {
+  * The %FW_CDEV_IOC_GET_CYCLE_TIMER ioctl reads the isochronous cycle timer
+  * and also the system clock.  This allows to express the receive time of an
+  * isochronous packet as a system time with microsecond accuracy.
++ *
++ * @cycle_timer consists of 7 bits cycleSeconds, 13 bits cycleCount, and
++ * 12 bits cycleOffset, in host byte order.
+  */
+ struct fw_cdev_get_cycle_timer {
+ 	__u64 local_time;
+ 	__u32 cycle_timer;
+ };
+ 
++/**
++ * struct fw_cdev_allocate_iso_resource - (De)allocate a channel or bandwidth
++ * @closure:	Passed back to userspace in correponding iso resource events
++ * @channels:	Isochronous channels of which one is to be (de)allocated
++ * @bandwidth:	Isochronous bandwidth units to be (de)allocated
++ * @handle:	Handle to the allocation, written by the kernel (only valid in
++ *		case of %FW_CDEV_IOC_ALLOCATE_ISO_RESOURCE ioctls)
++ *
++ * The %FW_CDEV_IOC_ALLOCATE_ISO_RESOURCE ioctl initiates allocation of an
++ * isochronous channel and/or of isochronous bandwidth at the isochronous
++ * resource manager (IRM).  Only one of the channels specified in @channels is
++ * allocated.  An %FW_CDEV_EVENT_ISO_RESOURCE_ALLOCATED is sent after
++ * communication with the IRM, indicating success or failure in the event data.
++ * The kernel will automatically reallocate the resources after bus resets.
++ * Should a reallocation fail, an %FW_CDEV_EVENT_ISO_RESOURCE_DEALLOCATED event
++ * will be sent.  The kernel will also automatically deallocate the resources
++ * when the file descriptor is closed.
++ *
++ * The %FW_CDEV_IOC_DEALLOCATE_ISO_RESOURCE ioctl can be used to initiate
++ * deallocation of resources which were allocated as described above.
++ * An %FW_CDEV_EVENT_ISO_RESOURCE_DEALLOCATED event concludes this operation.
++ *
++ * The %FW_CDEV_IOC_ALLOCATE_ISO_RESOURCE_ONCE ioctl is a variant of allocation
++ * without automatic re- or deallocation.
++ * An %FW_CDEV_EVENT_ISO_RESOURCE_ALLOCATED event concludes this operation,
++ * indicating success or failure in its data.
++ *
++ * The %FW_CDEV_IOC_DEALLOCATE_ISO_RESOURCE_ONCE ioctl works like
++ * %FW_CDEV_IOC_ALLOCATE_ISO_RESOURCE_ONCE except that resources are freed
++ * instead of allocated.
++ * An %FW_CDEV_EVENT_ISO_RESOURCE_DEALLOCATED event concludes this operation.
++ *
++ * To summarize, %FW_CDEV_IOC_DEALLOCATE_ISO_RESOURCE allocates iso resources
++ * for the lifetime of the fd or handle.
++ * In contrast, %FW_CDEV_IOC_ALLOCATE_ISO_RESOURCE_ONCE allocates iso resources
++ * for the duration of a bus generation.
++ *
++ * @channels is a host-endian bitfield with the least significant bit
++ * representing channel 0 and the most significant bit representing channel 63:
++ * 1ULL << c for each channel c that is a candidate for (de)allocation.
++ *
++ * @bandwidth is expressed in bandwidth allocation units, i.e. the time to send
++ * one quadlet of data (payload or header data) at speed S1600.
++ */
++struct fw_cdev_allocate_iso_resource {
++	__u64 closure;
++	__u64 channels;
++	__u32 bandwidth;
++	__u32 handle;
++};
++
++/**
++ * struct fw_cdev_get_speed - Query maximum speed to or from this device
++ * @max_speed:	Speed code; minimum of the device's link speed, the local node's
++ *		link speed, and all PHY port speeds between the two links
++ */
++struct fw_cdev_get_speed {
++	__u32 max_speed;
++};
++
+ #endif /* _LINUX_FIREWIRE_CDEV_H */


--- linux-2.6.27-lirc.patch DELETED ---



From pwouters at fedoraproject.org  Tue Jan 27 04:48:02 2009
From: pwouters at fedoraproject.org (Paul Wouters)
Date: Tue, 27 Jan 2009 04:48:02 +0000 (UTC)
Subject: rpms/dnssec-conf/F-9 dnssec-conf.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090127044802.548097010B@cvs1.fedora.phx.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/dnssec-conf/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1258

Modified Files:
	.cvsignore sources 
Added Files:
	dnssec-conf.spec 
Log Message:
initial build of dnssec-conf for F-9



--- NEW FILE dnssec-conf.spec ---
Summary: DNSSEC and DLV configuration tool (and TLD repository until the root is signed)
Name: dnssec-conf
Version: 1.13
Release: 3%{?dist}
License: GPLv2+
Url: http://www.xelerance.com/software/dnssec-conf/
Source: http://www.xelerance.com/software/%{name}/%{name}-%{version}.tar.gz
Group: System Environment/Daemons
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
Buildrequires: xmlto
Requires: python-dns, curl, unbound >= 1.1.1-7
#Requires: a caching nameserver
#Requires bind 9.4.0 if bind is reconfigured.....

%description
DNSSEC configuration and priming tool. Keys are required until the root
is signed, as well as for local unpublished DNSSEC keys to be preloaded
into the recursive nameserver. These DNSSEC configuration files can be
directly included in the bind or unbound nameserver configuration files.
dnssec-conf includes a commandline configuration client for Bind and
Unbound, known DNSSEC keys, URL's to official publication pages of keys,
and harvested keys, as well a script to harvest DNSKEY's from DNS.

%prep
%setup -q -n %{name}-%{version}

%build
make 

%install
rm -rf ${RPM_BUILD_ROOT}
make DESTDIR=${RPM_BUILD_ROOT} install

%clean
rm -rf ${RPM_BUILD_ROOT}

%files 
%defattr(-,root,root)
%doc LICENSE README
%attr(0755,root,root) %dir %{_sysconfdir}/pki/dnssec-keys
%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/pki/dnssec-keys/*/*
%attr(0755,root,root) %dir %{_sysconfdir}/pki/dnssec-keys/production
%attr(0755,root,root) %dir %{_sysconfdir}/pki/dnssec-keys/production/reverse
%attr(0755,root,root) %dir %{_sysconfdir}/pki/dnssec-keys/testing
%attr(0755,root,root) %dir %{_sysconfdir}/pki/dnssec-keys/harvest
%attr(0755,root,root) %dir %{_sysconfdir}/pki/dnssec-keys/dlv
%{_bindir}/dnskey-pull
%{_sbindir}/dnssec-configure
%{_mandir}/*/*

%changelog
* Sun Jan 25 2009 Paul Wouters <paul at xelerance.com> - 1.13-3
- bump version tag

* Wed Jan 21 2009 Paul Wouters <paul at xelerance.com> - 1.13-2
- Upstream made source available :=)
- removed macros from changes.

* Wed Jan 21 2009 Paul Wouters <paul at xelerance.com> - 1.13-1
- Clarify license
- Fix mixed use of RPM_BUILD_ROOT and buildroot
- Source tag fully qualified now

* Sat Jan 17 2009 Paul Wouters <paul at xelerance.com> - 1.10-1
- Updated to 1.10. Adds --set and --query and show option to use with system-config-dnssec
- Updated RIPE's reverse keys

* Tue Jan 13 2009 Paul Wouters <paul at xelerance.com> - 1.09-1
- Added testing key for gr.

* Mon Jan  5 2009 Paul Wouters <paul at xelerance.com> 1.08-1
- Upgrade to 'upstream'

* Mon Jan  5 2009 Paul Wouters <paul at xelerance.com> 1.07-1
- Require unbound >= 1.1.1-7

* Mon Jan  5 2009 Paul Wouters <paul at xelerance.com> 1.06-1
- Package renamed to dnssec-conf
- Added punycode test keys
- Fix for dnskey-pull and UTF8
- No longer requires the use of generating .conf files, by using
  a patch for unbound

* Fri Nov  7 2008 Paul Wouters <paul at xelerance.com> 1.0-1
- Initial release



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/dnssec-conf/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	23 Jan 2009 23:20:51 -0000	1.1
+++ .cvsignore	27 Jan 2009 04:47:32 -0000	1.2
@@ -0,0 +1 @@
+dnssec-conf-1.13.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/dnssec-conf/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	23 Jan 2009 23:20:51 -0000	1.1
+++ sources	27 Jan 2009 04:47:32 -0000	1.2
@@ -0,0 +1 @@
+c998c8050c77c14eda496b26891bb4c1  dnssec-conf-1.13.tar.gz



From alexlan at fedoraproject.org  Tue Jan 27 04:55:26 2009
From: alexlan at fedoraproject.org (Alex Lancaster)
Date: Tue, 27 Jan 2009 04:55:26 +0000 (UTC)
Subject: rpms/perl-Bio-Graphics/F-10 import.log, NONE,
	1.1 perl-Bio-Graphics-tests.patch, NONE,
	1.1 perl-Bio-Graphics.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090127045526.7E0B97010B@cvs1.fedora.phx.redhat.com>

Author: alexlan

Update of /cvs/extras/rpms/perl-Bio-Graphics/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3257/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-Bio-Graphics-tests.patch 
	perl-Bio-Graphics.spec 
Log Message:
Initial import on F-10 branch.



--- NEW FILE import.log ---
perl-Bio-Graphics-1_83-2_fc11:F-10:perl-Bio-Graphics-1.83-2.fc11.src.rpm:1233032036

perl-Bio-Graphics-tests.patch:

--- NEW FILE perl-Bio-Graphics-tests.patch ---
--- t/BioGraphics.t.orig	2009-01-26 01:22:13.000000000 -0700
+++ t/BioGraphics.t	2009-01-26 01:22:21.000000000 -0700
@@ -14,7 +14,7 @@
 
 # for now, the image tests are turned off
 
-use constant IMAGE_TESTS => 1;
+use constant IMAGE_TESTS => 0;
 
 BEGIN { 
   use lib '.';


--- NEW FILE perl-Bio-Graphics.spec ---
Name:           perl-Bio-Graphics
Version:        1.83
Release:        2%{?dist}
Summary:        Generate GD images of Bio::Seq objects
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Bio-Graphics/
Source0:        http://www.cpan.org/authors/id/L/LD/LDS/Bio-Graphics-%{version}.tar.gz
Patch0:         perl-Bio-Graphics-tests.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(Bio::Root::Version) >= 1.005009
BuildRequires:  perl(GD) >= 2.3
BuildRequires:  perl(GD::SVG)
BuildRequires:  perl(Module::Build)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
Bio::Graphics is a simple GD-based renderer (diagram drawer) for DNA
and protein sequences.  The Bio::Graphics::Panel class provides
drawing and formatting services for any object that implements the
Bio::SeqFeatureI interface, including Ace::Sequence::Feature,
Das::Segment::Feature and Bio::DB::Graphics objects.  It can be used
to draw sequence annotations, physical (contig) maps, protein domains,
or any other type of map in which a set of discrete ranges need to be
laid out on the number line

%prep
%setup -q -n Bio-Graphics-%{version}
%patch0 -p0 -b .tests

%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 DISCLAIMER.txt README README.bioperl
%{_bindir}/*
%{perl_vendorlib}/*
%{_mandir}/man1/*
%{_mandir}/man3/*

%changelog
* Mon Jan 26 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 1.83-2
- Patch to disable some tests (image tests currently don't work)
- Fix file list to include scripts

* Mon Jan 26 2009 Alex Lancaster <alexlan[AT]fedoraproject org> 1.83-1
- Specfile autogenerated by cpanspec 1.77.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Bio-Graphics/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	26 Jan 2009 22:27:03 -0000	1.1
+++ .cvsignore	27 Jan 2009 04:54:56 -0000	1.2
@@ -0,0 +1 @@
+Bio-Graphics-1.83.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Bio-Graphics/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	26 Jan 2009 22:27:03 -0000	1.1
+++ sources	27 Jan 2009 04:54:56 -0000	1.2
@@ -0,0 +1 @@
+1c1de50c9261b3e6a1b20e2f38701aa7  Bio-Graphics-1.83.tar.gz



From alexlan at fedoraproject.org  Tue Jan 27 04:57:48 2009
From: alexlan at fedoraproject.org (Alex Lancaster)
Date: Tue, 27 Jan 2009 04:57:48 +0000 (UTC)
Subject: rpms/perl-Bio-Graphics/F-9 import.log, NONE,
	1.1 perl-Bio-Graphics-tests.patch, NONE,
	1.1 perl-Bio-Graphics.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090127045748.BAE837010B@cvs1.fedora.phx.redhat.com>

Author: alexlan

Update of /cvs/extras/rpms/perl-Bio-Graphics/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3896/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-Bio-Graphics-tests.patch 
	perl-Bio-Graphics.spec 
Log Message:
Initial F-9 import.



--- NEW FILE import.log ---
perl-Bio-Graphics-1_83-2_fc11:F-9:perl-Bio-Graphics-1.83-2.fc11.src.rpm:1233032190

perl-Bio-Graphics-tests.patch:

--- NEW FILE perl-Bio-Graphics-tests.patch ---
--- t/BioGraphics.t.orig	2009-01-26 01:22:13.000000000 -0700
+++ t/BioGraphics.t	2009-01-26 01:22:21.000000000 -0700
@@ -14,7 +14,7 @@
 
 # for now, the image tests are turned off
 
-use constant IMAGE_TESTS => 1;
+use constant IMAGE_TESTS => 0;
 
 BEGIN { 
   use lib '.';


--- NEW FILE perl-Bio-Graphics.spec ---
Name:           perl-Bio-Graphics
Version:        1.83
Release:        2%{?dist}
Summary:        Generate GD images of Bio::Seq objects
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Bio-Graphics/
Source0:        http://www.cpan.org/authors/id/L/LD/LDS/Bio-Graphics-%{version}.tar.gz
Patch0:         perl-Bio-Graphics-tests.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(Bio::Root::Version) >= 1.005009
BuildRequires:  perl(GD) >= 2.3
BuildRequires:  perl(GD::SVG)
BuildRequires:  perl(Module::Build)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
Bio::Graphics is a simple GD-based renderer (diagram drawer) for DNA
and protein sequences.  The Bio::Graphics::Panel class provides
drawing and formatting services for any object that implements the
Bio::SeqFeatureI interface, including Ace::Sequence::Feature,
Das::Segment::Feature and Bio::DB::Graphics objects.  It can be used
to draw sequence annotations, physical (contig) maps, protein domains,
or any other type of map in which a set of discrete ranges need to be
laid out on the number line

%prep
%setup -q -n Bio-Graphics-%{version}
%patch0 -p0 -b .tests

%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 DISCLAIMER.txt README README.bioperl
%{_bindir}/*
%{perl_vendorlib}/*
%{_mandir}/man1/*
%{_mandir}/man3/*

%changelog
* Mon Jan 26 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 1.83-2
- Patch to disable some tests (image tests currently don't work)
- Fix file list to include scripts

* Mon Jan 26 2009 Alex Lancaster <alexlan[AT]fedoraproject org> 1.83-1
- Specfile autogenerated by cpanspec 1.77.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Bio-Graphics/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	26 Jan 2009 22:27:03 -0000	1.1
+++ .cvsignore	27 Jan 2009 04:57:18 -0000	1.2
@@ -0,0 +1 @@
+Bio-Graphics-1.83.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Bio-Graphics/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	26 Jan 2009 22:27:03 -0000	1.1
+++ sources	27 Jan 2009 04:57:18 -0000	1.2
@@ -0,0 +1 @@
+1c1de50c9261b3e6a1b20e2f38701aa7  Bio-Graphics-1.83.tar.gz



From mtasaka at fedoraproject.org  Tue Jan 27 05:27:41 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Tue, 27 Jan 2009 05:27:41 +0000 (UTC)
Subject: rpms/cairo-dock/devel .cvsignore, 1.107, 1.108 cairo-dock.spec,
	1.144, 1.145 sources, 1.107, 1.108
Message-ID: <20090127052741.3DD7B7010B@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/cairo-dock/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8527

Modified Files:
	.cvsignore cairo-dock.spec sources 
Log Message:
* Tue Jan 27 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
- rev 1504



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cairo-dock/devel/.cvsignore,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -r1.107 -r1.108
--- .cvsignore	26 Jan 2009 05:30:34 -0000	1.107
+++ .cvsignore	27 Jan 2009 05:27:10 -0000	1.108
@@ -1 +1 @@
-cairo-dock-sources-svn1501_trunk.tar.bz2
+cairo-dock-sources-svn1504_trunk.tar.bz2


Index: cairo-dock.spec
===================================================================
RCS file: /cvs/extras/rpms/cairo-dock/devel/cairo-dock.spec,v
retrieving revision 1.144
retrieving revision 1.145
diff -u -r1.144 -r1.145
--- cairo-dock.spec	26 Jan 2009 05:30:34 -0000	1.144
+++ cairo-dock.spec	27 Jan 2009 05:27:10 -0000	1.145
@@ -639,8 +639,8 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
-* Mon Jan 26 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
-- rev 1501
+* Tue Jan 27 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- rev 1504
 
 * Thu Jan 22 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
 - rev 1496


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cairo-dock/devel/sources,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -r1.107 -r1.108
--- sources	26 Jan 2009 05:30:34 -0000	1.107
+++ sources	27 Jan 2009 05:27:10 -0000	1.108
@@ -1 +1 @@
-74ed0cc55f3f7f5c7d52896d4a6bda35  cairo-dock-sources-svn1501_trunk.tar.bz2
+a7a2a9f8ec8583e53b54720d78514ef6  cairo-dock-sources-svn1504_trunk.tar.bz2



From mtasaka at fedoraproject.org  Tue Jan 27 05:46:03 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Tue, 27 Jan 2009 05:46:03 +0000 (UTC)
Subject: rpms/cairo-dock/devel cairo-dock.spec,1.145,1.146
Message-ID: <20090127054603.2E8F17010B@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/cairo-dock/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11212

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.145
retrieving revision 1.146
diff -u -r1.145 -r1.146
--- cairo-dock.spec	27 Jan 2009 05:27:10 -0000	1.145
+++ cairo-dock.spec	27 Jan 2009 05:45:32 -0000	1.146
@@ -14,7 +14,7 @@
 %undefine		betaver		
 %define		build_webkit	1
 %define		build_xfce	1
-%define		tarballver	svn1501_trunk
+%define		tarballver	svn1504_trunk
 
 %define		fedora_main_rel	3
 



From bernie at fedoraproject.org  Tue Jan 27 05:57:25 2009
From: bernie at fedoraproject.org (Bernie Innocenti)
Date: Tue, 27 Jan 2009 05:57:25 +0000 (UTC)
Subject: rpms/sugar/devel sugar.spec,1.42,1.43
Message-ID: <20090127055725.B2E547010B@cvs1.fedora.phx.redhat.com>

Author: bernie

Update of /cvs/pkgs/rpms/sugar/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13720

Modified Files:
	sugar.spec 
Log Message:
+* Wed Jan 27 2008 Bernie Innocenti <bernie at codewiz.org> - 0.83.5-2
+- Obsolete sugar-journal



Index: sugar.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar/devel/sugar.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- sugar.spec	20 Jan 2009 15:35:42 -0000	1.42
+++ sugar.spec	27 Jan 2009 05:56:55 -0000	1.43
@@ -6,7 +6,7 @@
 Summary: Constructionist learning platform
 Name: sugar
 Version: 0.83.5
-Release: 1%{?dist}
+Release: 2%{?dist}
 URL: http://sugarlabs.org/
 Source0: http://download.sugarlabs.org/sources/sucrose/glucose/%{name}/%{name}-%{version}.tar.bz2
 License: GPLv2+
@@ -34,6 +34,8 @@
 # for ssh-keygen
 Requires: openssh
 
+Obsoletes: sugar-journal <= 99
+
 %description
 
 Sugar provides simple yet powerful means of engaging young
@@ -131,6 +133,9 @@
 %{_bindir}/sugar-emulator
 
 %changelog
+* Wed Jan 27 2008 Bernie Innocenti <bernie at codewiz.org> - 0.83.5-2
+- Obsolete sugar-journal
+
 * Tue Jan 20 2009 Marco Pesenti Gritti <mpg at redhat.com> - 0.83.5-1
 - make the journal entries in the favorites palette resumable
 - simplify the constants used to identify favorite layouts



From bernie at fedoraproject.org  Tue Jan 27 06:00:26 2009
From: bernie at fedoraproject.org (Bernie Innocenti)
Date: Tue, 27 Jan 2009 06:00:26 +0000 (UTC)
Subject: rpms/sugar/devel sugar.spec,1.43,1.44
Message-ID: <20090127060026.757487010B@cvs1.fedora.phx.redhat.com>

Author: bernie

Update of /cvs/pkgs/rpms/sugar/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14390

Modified Files:
	sugar.spec 
Log Message:
Fix year in changelog


Index: sugar.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar/devel/sugar.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- sugar.spec	27 Jan 2009 05:56:55 -0000	1.43
+++ sugar.spec	27 Jan 2009 05:59:56 -0000	1.44
@@ -133,7 +133,7 @@
 %{_bindir}/sugar-emulator
 
 %changelog
-* Wed Jan 27 2008 Bernie Innocenti <bernie at codewiz.org> - 0.83.5-2
+* Tue Jan 27 2009 Bernie Innocenti <bernie at codewiz.org> - 0.83.5-2
 - Obsolete sugar-journal
 
 * Tue Jan 20 2009 Marco Pesenti Gritti <mpg at redhat.com> - 0.83.5-1



From bernie at fedoraproject.org  Tue Jan 27 06:01:58 2009
From: bernie at fedoraproject.org (Bernie Innocenti)
Date: Tue, 27 Jan 2009 06:01:58 +0000 (UTC)
Subject: rpms/xkeyboard-config/devel xkeyboard-config-1.4-it-olpc.patch, NONE,
	1.1 xkeyboard-config.spec, 1.30, 1.31
Message-ID: <20090127060158.DEB377010B@cvs1.fedora.phx.redhat.com>

Author: bernie

Update of /cvs/pkgs/rpms/xkeyboard-config/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14770

Modified Files:
	xkeyboard-config.spec 
Added Files:
	xkeyboard-config-1.4-it-olpc.patch 
Log Message:
+* Tue Jan 27 2009 Bernie Innocenti <bernie at codewiz.org> 1.4-9
+- Backport fix for the it(olpc) layout


xkeyboard-config-1.4-it-olpc.patch:

--- NEW FILE xkeyboard-config-1.4-it-olpc.patch ---
>From c7ae1807611d0f11d32a2e99e94e794d6a52bf7b Mon Sep 17 00:00:00 2001
From: Sergey V. Udaltsov <svu at gnome.org>
Date: Tue, 18 Nov 2008 21:21:09 +0000
Subject: [PATCH] fixing it(olpc), b.fd.o#18565
Organization: Sugar Labs

---
 symbols/it |    2 +-
 2 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/symbols/it b/symbols/it
index 92fa50a..e91a9f8 100644
--- a/symbols/it
+++ b/symbols/it
@@ -169,7 +169,7 @@ xkb_symbols "geo" {
 // OLPC Section
 xkb_symbols "olpc" {
 
-    include "basic"
+    include "it(basic)"
 
     key <AE12> { [ igrave,  asciicircum,    asciitilde,     dead_tilde ] };
     key <BKSL> { [ ugrave,      section,        Egrave,     dead_breve ] };
-- 
1.6.0.4



Index: xkeyboard-config.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xkeyboard-config/devel/xkeyboard-config.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- xkeyboard-config.spec	4 Jan 2009 23:08:22 -0000	1.30
+++ xkeyboard-config.spec	27 Jan 2009 06:01:28 -0000	1.31
@@ -4,7 +4,7 @@
 Summary: X Keyboard Extension configuration data
 Name: xkeyboard-config
 Version: 1.4
-Release: 8%{?dist}
+Release: 9%{?dist}
 License: MIT
 Group: User Interface/X
 URL: http://www.freedesktop.org/wiki/Software/XKeyboardConfig
@@ -102,6 +102,9 @@
 %{_datadir}/X11/xkb/rules/xorg.xml
 
 %changelog
+* Tue Jan 27 2009 Bernie Innocenti <bernie at codewiz.org> 1.4-9
+- Backport fix for the it(olpc) layout
+
 * Mon Jan 05 2009 Peter Hutterer <peter.hutterer at redhat.com> - 1.4-8
 - xkeyboard-config-1.4-abnt2.patch: fix , and . mixup in abnt2 (#470153)
 



From mclasen at fedoraproject.org  Tue Jan 27 06:28:37 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 27 Jan 2009 06:28:37 +0000 (UTC)
Subject: rpms/gtk2/devel .cvsignore, 1.98, 1.99 gtk2.spec, 1.349,
	1.350 sources, 1.107, 1.108 activatable-toolitem.patch, 1.1,
	NONE gtk+-2.11.1-set-invisible-char-to-bullet.patch, 1.1,
	NONE imcontext-reset.patch, 1.1, NONE radio-proxy.patch, 1.1,
	NONE tool-proxy.patch, 1.1, NONE
Message-ID: <20090127062837.359387010B@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gtk2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20107

Modified Files:
	.cvsignore gtk2.spec sources 
Removed Files:
	activatable-toolitem.patch 
	gtk+-2.11.1-set-invisible-char-to-bullet.patch 
	imcontext-reset.patch radio-proxy.patch tool-proxy.patch 
Log Message:
2.15.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gtk2/devel/.cvsignore,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -r1.98 -r1.99
--- .cvsignore	24 Jan 2009 00:16:33 -0000	1.98
+++ .cvsignore	27 Jan 2009 06:28:06 -0000	1.99
@@ -1 +1 @@
-gtk+-2.15.1.tar.bz2
+gtk+-2.15.2.tar.bz2


Index: gtk2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtk2/devel/gtk2.spec,v
retrieving revision 1.349
retrieving revision 1.350
diff -u -r1.349 -r1.350
--- gtk2.spec	26 Jan 2009 19:34:38 -0000	1.349
+++ gtk2.spec	27 Jan 2009 06:28:06 -0000	1.350
@@ -10,13 +10,13 @@
 %define cairo_version %{cairo_base_version}-1
 %define libpng_version 2:1.2.2-16
 
-%define base_version 2.15.1
+%define base_version 2.15.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.15/gtk+-%{version}.tar.bz2
@@ -30,14 +30,6 @@
 Patch2: workaround.patch
 # http://bugzilla.redhat.com/show_bug.cgi?id=478400
 Patch3: default_printer.patch
-# http://bugzilla.gnome.org/show_bug.cgi?id=569240
-Patch8: gtk-2.15.1-scale-marks-crasher.patch
-
-# fixed upstream
-Patch4: activatable-toolitem.patch
-Patch5: imcontext-reset.patch
-Patch6: radio-proxy.patch
-Patch7: tool-proxy.patch
 
 BuildRequires: atk-devel >= %{atk_version}
 BuildRequires: pango-devel >= %{pango_version}
@@ -125,11 +117,6 @@
 %patch0 -p1 -b .lib64
 %patch2 -p1 -b .workaround
 %patch3 -p0 -b .default-printer
-%patch4 -p0 -b .activatable-toolitem
-%patch5 -p0 -b .imcontext-reset
-%patch6 -p1 -b .radio-proxy
-%patch7 -p0 -b .tool-proxy
-%patch8 -p0 -b .scale-marks
 
 %build
 libtoolize --force --copy
@@ -307,6 +294,9 @@
 %{_datadir}/gtk-2.0
 
 %changelog
+* Tue Jan 27 2009 Matthias Clasen <mclasen at redhat.com> - 2.15.2-1
+- Update to 2.15.2
+
 * Mon Jan 26 2009 - Bastien Nocera <bnocera at redhat.com> - 2.15.1-5
 - Add patch to avoid crashes when destroying a GtkScale with marks
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gtk2/devel/sources,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -r1.107 -r1.108
--- sources	24 Jan 2009 00:16:33 -0000	1.107
+++ sources	27 Jan 2009 06:28:06 -0000	1.108
@@ -1 +1 @@
-08bd30294bec395078a2554d642d3b2d  gtk+-2.15.1.tar.bz2
+1c230eeb1bf24b69b480d0a35da34794  gtk+-2.15.2.tar.bz2


--- activatable-toolitem.patch DELETED ---


--- gtk+-2.11.1-set-invisible-char-to-bullet.patch DELETED ---


--- imcontext-reset.patch DELETED ---


--- radio-proxy.patch DELETED ---


--- tool-proxy.patch DELETED ---



From nim at fedoraproject.org  Tue Jan 27 06:56:27 2009
From: nim at fedoraproject.org (Nicolas Mailhot)
Date: Tue, 27 Jan 2009 06:56:27 +0000 (UTC)
Subject: rpms/apanov-edrip-fonts/devel apanov-edrip-fonts-fontconfig.conf,
	NONE, 1.1 apanov-edrip-fonts-license.patch, NONE,
	1.1 apanov-edrip-fonts.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090127065627.889707010B@cvs1.fedora.phx.redhat.com>

Author: nim

Update of /cvs/extras/rpms/apanov-edrip-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25060/devel

Modified Files:
	.cvsignore sources 
Added Files:
	apanov-edrip-fonts-fontconfig.conf 
	apanov-edrip-fonts-license.patch apanov-edrip-fonts.spec 
	import.log 
Log Message:
edrip-fonts ??? apanov-edrip-fonts


--- NEW FILE apanov-edrip-fonts-fontconfig.conf ---
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
<fontconfig>
  <alias>
    <family>fantasy</family>
    <prefer>
      <family>Edrip</family>
    </prefer>
  </alias>
  <alias>
    <family>Edrip</family>
    <default>
      <family>fantasy</family>
    </default>
  </alias>
  <alias binding="same">
    <family>Teams</family>
    <accept>
      <family>Edrip</family>
    </accept>
  </alias>
</fontconfig>

apanov-edrip-fonts-license.patch:

--- NEW FILE apanov-edrip-fonts-license.patch ---
--- edrip-src-20080317.orig/OFL.txt	2008-03-08 04:31:55.000000000 +0100
+++ edrip-src-20080317/OFL.txt	2008-03-27 00:04:29.000000000 +0100
@@ -5,6 +5,36 @@
 This license is copied below, and is also available with a FAQ at:
 http://scripts.sil.org/OFL
 
+The Font Software incorporates work covered by the following copyright and
+permission notice:
+
+%<----------------------------------------------------------------------------
+The Teams font without an explicit copyright is covered by the following 
+copyright/license:
+
+Copyright (C) 1994-2000 The TopTeam Co. 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 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 
+TOPTEAM CO. BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN 
+ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION 
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+Except as contained in this notice, the name of TopTeam Co. shall not be used 
+in advertising or otherwise to promote the sale, use or other dealings in this 
+Software without prior written authorization from TopTeam Co.
+%<----------------------------------------------------------------------------
 
 -----------------------------------------------------------
 SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007


--- NEW FILE apanov-edrip-fonts.spec ---
%define fontname apanov-edrip
%define fontconf 61-%{fontname}.conf

%define archivename edrip-src-%{version}

Name:    %{fontname}-fonts
Version: 20081007
Release: 3%{?dist}
Summary: A decorative contrast sans-serif font

Group:     User Interface/X
License:   OFL
URL:       ftp://ftp.dvo.ru/pub/Font/%{fontname}/
Source0:   %{url}%{archivename}.tar.bz2
Source1:   %{name}-fontconfig.conf
Patch0:    %{name}-license.patch
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

BuildArch:     noarch
BuildRequires: fontpackages-devel
BuildRequires: xgridfit
BuildRequires: fontforge
Requires:      fontpackages-filesystem
Obsoletes:     edrip-fonts < 20081007-3

%description
Edrip font is a contrast sans-serif font. It is based on the Teams font
released on 2000 by TopTeam Co. Edrip contains symbols for basic Cyrillic and
Latin alphabets.


%prep
%setup -q -c
%patch0 -p1

%build
make %{?_smp_mflags} all


%install
rm -fr %{buildroot}

install -m 0755 -d %{buildroot}%{_fontdir}
install -m 0644 -p *.ttf %{buildroot}%{_fontdir}

install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} \
                   %{buildroot}%{_fontconfig_confdir}

install -m 0644 -p %{SOURCE1} \
        %{buildroot}%{_fontconfig_templatedir}/%{fontconf}
ln -s %{_fontconfig_templatedir}/%{fontconf} \
      %{buildroot}%{_fontconfig_confdir}/%{fontconf}


%clean
rm -fr %{buildroot}


%_font_pkg -f %{fontconf} *.ttf

%doc *.txt README
%dir %{_fontdir}


%changelog
* Sun Jan 25 2009 <nicolas.mailhot at laposte.net>
- 20081007-3
??? renamed to ???apanov-edrip-fonts??? to apply Packaging:FontsPolicy#Naming

* Sun Nov 23 2008 <nicolas.mailhot at laposte.net>
- 20081007-2
??? ???rpm-fonts??? renamed to ???fontpackages???

* Fri Nov 14 2008 <nicolas.mailhot at laposte.net>
- 20081007-1
??? Rebuild using new ????rpm-fonts????

* 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

* Fri Jul 17 2008 <nicolas.mailhot at laposte.net>
- 20080717-1
???? More cyrillic coverage

* Fri Jul 11 2008 <nicolas.mailhot at laposte.net>
- 20080710-1
??? Fedora 10 alpha general package cleanup

* Wed Jun 4 2008 <nicolas.mailhot at laposte.net>
- 20080523-2
??? Fix URL
??? Register in new fantasy generic

* Mon May 26 2008 <nicolas.mailhot at laposte.net>
- 20080523-1
?? Add bold italic typeface to the font package
?? Use new upstream makefile magic to simplify spec

* Sun May 18 2008 <nicolas.mailhot at laposte.net>
- 20080515-2
??? Add bold & italic typeface to the font package

* Fri Apr 4 2008 <nicolas.mailhot at laposte.net>
- 20080330-1
??? Fast upstream changes

* Tue Mar 27 2008 <nicolas.mailhot at laposte.net>
- 20080317-3
??? Fix source URL
??? Add more fontconfig magic

* Wed Mar 26 2008 <nicolas.mailhot at laposte.net>
- 20080317-1
??? Fedora import

* Thu Mar 13 2008 <nicolas.mailhot at laposte.net>
- 20080310-1
??? Initial packaging


--- NEW FILE import.log ---
apanov-edrip-fonts-20081007-3_fc11:HEAD:apanov-edrip-fonts-20081007-3.fc11.src.rpm:1233039319


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/apanov-edrip-fonts/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	26 Jan 2009 22:56:20 -0000	1.1
+++ .cvsignore	27 Jan 2009 06:55:56 -0000	1.2
@@ -0,0 +1 @@
+edrip-src-20081007.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/apanov-edrip-fonts/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	26 Jan 2009 22:56:20 -0000	1.1
+++ sources	27 Jan 2009 06:55:57 -0000	1.2
@@ -0,0 +1 @@
+b745af94b865df2b0c20fe72ff58b568  edrip-src-20081007.tar.bz2



From nim at fedoraproject.org  Tue Jan 27 06:57:51 2009
From: nim at fedoraproject.org (Nicolas Mailhot)
Date: Tue, 27 Jan 2009 06:57:51 +0000 (UTC)
Subject: rpms/sil-andika-fonts/devel import.log, NONE,
	1.1 sil-andika-fonts-fontconfig.conf, NONE,
	1.1 sil-andika-fonts.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090127065751.59FD37010B@cvs1.fedora.phx.redhat.com>

Author: nim

Update of /cvs/extras/rpms/sil-andika-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25698/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log sil-andika-fonts-fontconfig.conf 
	sil-andika-fonts.spec 
Log Message:
andika-fonts ??? sil-andika-fonts


--- NEW FILE import.log ---
sil-andika-fonts-1_0-4_fc11:HEAD:sil-andika-fonts-1.0-4.fc11.src.rpm:1233039407


--- NEW FILE sil-andika-fonts-fontconfig.conf ---
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
<fontconfig>
  <alias>
    <family>sans-serif</family>
    <prefer>
      <family>Andika</family>
    </prefer>
  </alias>
  <alias>
    <family>Andika</family>
    <default>
      <family>sans-serif</family>
    </default>
  </alias>
</fontconfig>


--- NEW FILE sil-andika-fonts.spec ---
%define fontname sil-andika
%define fontconf 60-%{fontname}.conf

# Someday SIL will release sanely named archives
%define archivename AndikaBasicR_10

Name:    %{fontname}-fonts
Version: 1.0
Release: 4%{?dist}
Summary: A font for literacy and beginning readers

Group:     User Interface/X
License:   OFL
URL:       http://scripts.sil.org/Andika
# Actual download URL
# http://scripts.sil.org/cms/scripts/render_download.php?site_id=nrsi&format=file&media_id=%{archivename}&filename=%{archivename}.zip
Source0:   %{archivename}.zip
Source1:   %{name}-fontconfig.conf
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

BuildArch:     noarch
BuildRequires: fontpackages-devel
Requires:      fontpackages-filesystem
Obsoletes:     andika-fonts < 1.0-4

%description
Andika is a sans serif, Unicode-compliant font designed especially for
literacy use, taking into account the needs of beginning readers. The focus is
on clear, easy-to-perceive letterforms that will not be readily confused with
one another.

A sans serif font is preferred by some literacy personnel for teaching people
to read. Its forms are simpler and less cluttered than those of most serif
fonts. For years, literacy workers have had to make do with fonts that were
not really suitable for beginning readers and writers. In some cases, literacy
specialists have had to tediously assemble letters from a variety of fonts in
order to get all of the characters they need for their particular language
project, resulting in confusing and unattractive publications. Andika
addresses those issues.


%prep
%setup -q -n %{archivename}

# Text files sanitization
for txt in *.txt ; do
   # Unicode compliant, check
   iconv -f WINDOWS-1252 -t UTF-8 -o $txt.1 $txt
   fold -s $txt.1 > $txt.2
   sed -i 's/\r//' $txt.2
   touch -r $txt $txt.2
   mv $txt.2 $txt
   rm $txt.1
done


%build


%install
rm -fr %{buildroot}

install -m 0755 -d %{buildroot}%{_fontdir}
install -m 0644 -p *.ttf %{buildroot}%{_fontdir}

install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} \
                   %{buildroot}%{_fontconfig_confdir}

install -m 0644 -p %{SOURCE1} \
        %{buildroot}%{_fontconfig_templatedir}/%{fontconf}
ln -s %{_fontconfig_templatedir}/%{fontconf} \
      %{buildroot}%{_fontconfig_confdir}/%{fontconf}


%clean
rm -fr %{buildroot}


%_font_pkg -f %{fontconf} *.ttf

%doc *.txt
%dir %{_fontdir}


%changelog
* Sun Jan 25 2009 <nicolas.mailhot at laposte.net>
- 1.0-4
??? renamed to ???sil-andika-fonts??? to apply Packaging:FontsPolicy#Naming

* Sun Nov 23 2008 <nicolas.mailhot at laposte.net>
- 1.0-3
??? ???rpm-fonts??? renamed to ???fontpackages???

* Fri Nov 14 2008 <nicolas.mailhot at laposte.net>
- 1.0-2
??? Rebuild using new ????rpm-fonts????

* Tue Jun 24 2008 <nicolas.mailhot at laposte.net>
- 1.0-1
??? Initial packaging


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sil-andika-fonts/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	26 Jan 2009 23:02:25 -0000	1.1
+++ .cvsignore	27 Jan 2009 06:57:20 -0000	1.2
@@ -0,0 +1 @@
+AndikaBasicR_10.zip


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sil-andika-fonts/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	26 Jan 2009 23:02:25 -0000	1.1
+++ sources	27 Jan 2009 06:57:21 -0000	1.2
@@ -0,0 +1 @@
+1a8b028ccea53e93fc4f34ca226f2b02  AndikaBasicR_10.zip



From nim at fedoraproject.org  Tue Jan 27 07:14:49 2009
From: nim at fedoraproject.org (Nicolas Mailhot)
Date: Tue, 27 Jan 2009 07:14:49 +0000 (UTC)
Subject: rpms/sil-charis-fonts/devel import.log, NONE,
	1.1 sil-charis-fonts-fontconfig.conf, NONE,
	1.1 sil-charis-fonts.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090127071449.312127010B@cvs1.fedora.phx.redhat.com>

Author: nim

Update of /cvs/extras/rpms/sil-charis-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29227/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log sil-charis-fonts-fontconfig.conf 
	sil-charis-fonts.spec 
Log Message:
charis-fonts ??? sil-charis-fonts


--- NEW FILE import.log ---
sil-charis-fonts-4_104-6_fc11:HEAD:sil-charis-fonts-4.104-6.fc11.src.rpm:1233040224


--- NEW FILE sil-charis-fonts-fontconfig.conf ---
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
<fontconfig>
  <alias>
    <family>serif</family>
    <prefer>
      <family>Charis SIL</family>
    </prefer>
  </alias>
  <alias>
    <family>Charis SIL</family>
    <default>
      <family>serif</family>
    </default>
  </alias>
  <alias binding="same">
    <family>Bitstream Charter</family>
    <accept>
      <family>Charis SIL</family>
    </accept>
  </alias>
  <alias binding="same">
    <family>Charis SIL Literacy</family>
    <accept>
      <family>Charis SIL</family>
    </accept>
  </alias>
</fontconfig>


--- NEW FILE sil-charis-fonts.spec ---
%define fontname sil-charis
%define fontconf 60-%{fontname}.conf

%define archivename CharisSIL

Name:    %{fontname}-fonts
Version: 4.104
Release: 6%{?dist}
Summary: A serif smart font similar to Bitstream Charter

Group:     User Interface/X
License:   OFL
URL:       http://scripts.sil.org/CharisSILFont
# Actual download URL
# http://scripts.sil.org/cms/scripts/render_download.php?site_id=nrsi&format=file&media_id=%{archivename}.zip&filename=%{archivename}%{version}.zip
Source0:   %{archivename}%{version}.zip
Source1:   %{name}-fontconfig.conf
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

BuildArch:     noarch
BuildRequires: fontpackages-devel
Requires:      fontpackages-filesystem
Obsoletes:     charis-fonts < 4.104-5

%description
Charis SIL provides glyphs for a wide range of Latin and Cyrillic characters.
Charis is similar to Bitstream Charter, one of the first fonts designed
specifically for laser printers. It is highly readable and holds up well in
less-than-ideal reproduction environments. It also has a full set of styles
??? regular, italic, bold, bold italic ??? and so is more useful in general
publishing than Doulos SIL. Charis is a serif proportionally spaced font
optimized for readability in long printed documents.


%prep
%setup -q -n %{archivename}
for txt in *.txt ; do
   fold -s $txt > $txt.new
   sed -i 's/\r//' $txt.new
   touch -r $txt $txt.new
   mv $txt.new $txt
done


%build


%install
rm -fr %{buildroot}

install -m 0755 -d %{buildroot}%{_fontdir}
install -m 0644 -p *.ttf %{buildroot}%{_fontdir}

install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} \
                   %{buildroot}%{_fontconfig_confdir}

install -m 0644 -p %{SOURCE1} \
        %{buildroot}%{_fontconfig_templatedir}/%{fontconf}
ln -s %{_fontconfig_templatedir}/%{fontconf} \
      %{buildroot}%{_fontconfig_confdir}/%{fontconf}


%clean
rm -fr %{buildroot}


%_font_pkg -f %{fontconf} *.ttf

%doc *.txt *.pdf
%dir %{_fontdir}


%changelog
* Tue Jan 27 2009 <nicolas.mailhot at laposte.net>
- 4.104-6
??? renamed to ???sil-charis-fonts??? to apply Packaging:FontsPolicy#Naming

* Sun Nov 23 2008 <nicolas.mailhot at laposte.net>
- 4.104-4
??? ???rpm-fonts??? renamed to ???fontpackages???

* Fri Nov 14 2008 <nicolas.mailhot at laposte.net>
- 4.104-3
??? Rebuild using new ????rpm-fonts????

* Fri Jul 11 2008 <nicolas.mailhot at laposte.net>
- 4.104-2
??? Fedora 10 alpha general package cleanup

* Sun May 18 2008 <nicolas.mailhot at laposte.net>
- 4.104-1
??? New Unicode 5.1 compliant release, with some glyphs moved out of PUA

* Sat Nov 3 2007 <nicolas.mailhot at laposte.net>
??? 4.100-5
??? Sync with guidelines
??? fix config file misplacement

* Thu Nov 1 2007 <nicolas.mailhot at laposte.net>
??? 4.100-4
??? Sync with guidelines
??? new fontconfig aliasing syntax

* Tue Aug 28 2007 Nicolas Mailhot <nicolas.mailhot at laposte.net>
??? 4.100-3
??? Sync with dejavu spec
??? Licence++

* Thu Jun 21 2007 Nicolas Mailhot <nicolas.mailhot at laposte.net>
??? 4.100-2
??? Fix URL (bug #245101)

* Thu May 31 2007 Nicolas Mailhot <nicolas.mailhot at laposte.net>
??? 4.100-1
??? add fontconfig setup file
??? make spec closer to the dejavu one to simplify maintenance

* Thu Nov 09 2006 Roozbeh Pournader <roozbeh at farsiweb.info> - 4.0.02-3
- Remove ghost-ed fontconfig cache files

* Tue Sep 19 2006 Kevin Fenzi <kevin at tummy.com> - 4.0.02-2
- Rebuild for fc6
- Add dist tag

* Sat Feb 18 2006 Roozbeh Pournader <roozbeh at farsiweb.info> - 4.0.02-1
- Initial packaging, based on gentium-fonts


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sil-charis-fonts/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	26 Jan 2009 23:00:06 -0000	1.1
+++ .cvsignore	27 Jan 2009 07:14:18 -0000	1.2
@@ -0,0 +1 @@
+CharisSIL4.104.zip


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sil-charis-fonts/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	26 Jan 2009 23:00:06 -0000	1.1
+++ sources	27 Jan 2009 07:14:18 -0000	1.2
@@ -0,0 +1 @@
+acc153c243b90e3e5d0bb53476ab894e  CharisSIL4.104.zip



From nim at fedoraproject.org  Tue Jan 27 07:29:29 2009
From: nim at fedoraproject.org (Nicolas Mailhot)
Date: Tue, 27 Jan 2009 07:29:29 +0000 (UTC)
Subject: comps comps-f11.xml.in,1.82,1.83
Message-ID: <20090127072929.F0CA17010B@cvs1.fedora.phx.redhat.com>

Author: nim

Update of /cvs/extras/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32490

Modified Files:
	comps-f11.xml.in 
Log Message:
rename andika, charis, edrip


Index: comps-f11.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-f11.xml.in,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -r1.82 -r1.83
--- comps-f11.xml.in	26 Jan 2009 18:22:30 -0000	1.82
+++ comps-f11.xml.in	27 Jan 2009 07:28:59 -0000	1.83
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE comps PUBLIC "-//Red Hat, Inc.//DTD Comps info//EN" "comps.dtd">
-<comps>
+<comps xmlns="">
   <group>
     <id>admin-tools</id>
     <_name>Administration Tools</_name>
@@ -406,7 +406,7 @@
       <packagereq type="conditional" requires="hunspell">hunspell-be</packagereq>
       <packagereq type="conditional" requires="kdelibs">kde-l10n-Belarusian</packagereq>
       <packagereq type="conditional" requires="moodle">moodle-be</packagereq>
-      <packagereq type="optional">edrip-fonts</packagereq>
+      <packagereq type="optional">apanov-edrip-fonts</packagereq>
     </packagelist>
   </group>
   <group>
@@ -544,7 +544,7 @@
       <packagereq type="conditional" requires="koffice-core">koffice-langpack-bg</packagereq>
       <packagereq type="conditional" requires="moodle">moodle-bg</packagereq>
       <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-bg_BG</packagereq>
-      <packagereq type="optional">edrip-fonts</packagereq>
+      <packagereq type="optional">apanov-edrip-fonts</packagereq>
       <packagereq type="optional">fonts-ISO8859-2</packagereq>
       <packagereq type="optional">fonts-ISO8859-2-100dpi</packagereq>
       <packagereq type="optional">fonts-ISO8859-2-75dpi</packagereq>
@@ -1337,7 +1337,7 @@
       <packagereq type="conditional" requires="koffice-core">koffice-langpack-et</packagereq>
       <packagereq type="conditional" requires="moodle">moodle-et</packagereq>
       <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-et_EE</packagereq>
-      <packagereq type="optional">edrip-fonts</packagereq>
+      <packagereq type="optional">apanov-edrip-fonts</packagereq>
       <packagereq type="optional">fonts-ISO8859-2</packagereq>
       <packagereq type="optional">fonts-ISO8859-2-100dpi</packagereq>
       <packagereq type="optional">fonts-ISO8859-2-75dpi</packagereq>
@@ -1499,7 +1499,7 @@
       <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">apanov-edrip-fonts</packagereq>
       <packagereq type="optional">apanov-heuristica-fonts</packagereq>
       <packagereq type="optional">asana-math-fonts</packagereq>
       <packagereq type="optional">baekmuk-ttf-fonts-batang</packagereq>
@@ -1510,7 +1510,6 @@
       <packagereq type="optional">bitstream-vera-sans-mono-fonts</packagereq>
       <packagereq type="optional">bitstream-vera-serif-fonts</packagereq>
       <packagereq type="optional">brettfont-fonts</packagereq>
-      <packagereq type="optional">charis-fonts</packagereq>
       <packagereq type="optional">cjkuni-ukai-fonts</packagereq>
       <packagereq type="optional">ctan-cm-lgc-roman-fonts</packagereq>
       <packagereq type="optional">ctan-cm-lgc-sans-fonts</packagereq>
@@ -1527,7 +1526,6 @@
       <packagereq type="optional">dustin-dustismo-fonts</packagereq>
       <packagereq type="optional">ecolier-court-fonts</packagereq>
       <packagereq type="optional">ecolier-court-lignes-fonts</packagereq>
-      <packagereq type="optional">edrip-fonts</packagereq>
       <packagereq type="optional">fonts-truetype-apl</packagereq>
       <packagereq type="optional">freecol-shadowedblack-fonts</packagereq>
       <packagereq type="optional">freefont</packagereq>
@@ -1593,6 +1591,8 @@
       <packagereq type="optional">sazanami-fonts-gothic</packagereq>
       <packagereq type="optional">sazanami-fonts-mincho</packagereq>
       <packagereq type="optional">serafettin-cartoon-fonts</packagereq>
+      <packagereq type="optional">sil-andika-fonts</packagereq>
+      <packagereq type="optional">sil-charis-fonts</packagereq>
       <packagereq type="optional">silkscreen-fonts</packagereq>
       <packagereq type="optional">smc-fonts-anjalioldlipi</packagereq>
       <packagereq type="optional">smc-fonts-dyuthi</packagereq>
@@ -4026,8 +4026,8 @@
       <packagereq type="conditional" requires="man-pages">man-pages-ru</packagereq>
       <packagereq type="conditional" requires="moodle">moodle-ru</packagereq>
       <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-ru</packagereq>
+      <packagereq type="optional">apanov-edrip-fonts</packagereq>
       <packagereq type="optional">apanov-heuristica-fonts</packagereq>
-      <packagereq type="optional">edrip-fonts</packagereq>
       <packagereq type="optional">fonts-KOI8-R</packagereq>
       <packagereq type="optional">fonts-KOI8-R-100dpi</packagereq>
       <packagereq type="optional">fonts-KOI8-R-75dpi</packagereq>
@@ -4068,7 +4068,7 @@
       <packagereq type="conditional" requires="moodle">moodle-sr_cr_bo</packagereq>
       <packagereq type="conditional" requires="moodle">moodle-sr_lt</packagereq>
       <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-sr</packagereq>
-      <packagereq type="optional">edrip-fonts</packagereq>
+      <packagereq type="optional">apanov-edrip-fonts</packagereq>
       <packagereq type="optional">fonts-ISO8859-2</packagereq>
       <packagereq type="optional">fonts-ISO8859-2-100dpi</packagereq>
       <packagereq type="optional">fonts-ISO8859-2-75dpi</packagereq>
@@ -4853,7 +4853,7 @@
       <packagereq type="conditional" requires="man-pages">man-pages-uk</packagereq>
       <packagereq type="conditional" requires="moodle">moodle-uk</packagereq>
       <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-uk</packagereq>
-      <packagereq type="optional">edrip-fonts</packagereq>
+      <packagereq type="optional">apanov-edrip-fonts</packagereq>
       <packagereq type="optional">fonts-KOI8-R</packagereq>
       <packagereq type="optional">fonts-KOI8-R-100dpi</packagereq>
       <packagereq type="optional">fonts-KOI8-R-75dpi</packagereq>



From pkgdb at fedoraproject.org  Tue Jan 27 08:22:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 27 Jan 2009 08:22:14 +0000
Subject: [pkgdb] msp430-binutils: swhiteho has requested watchcommits
Message-ID: <20090127082214.D4F7E208494@bastion.fedora.phx.redhat.com>

swhiteho has requested the watchcommits acl on msp430-binutils (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/msp430-binutils



From pkgdb at fedoraproject.org  Tue Jan 27 08:22:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 27 Jan 2009 08:22:14 +0000
Subject: [pkgdb] msp430-binutils: swhiteho has requested watchbugzilla
Message-ID: <20090127082214.5D2A7208485@bastion.fedora.phx.redhat.com>

swhiteho has requested the watchbugzilla acl on msp430-binutils (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/msp430-binutils



From pkgdb at fedoraproject.org  Tue Jan 27 08:22:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 27 Jan 2009 08:22:16 +0000
Subject: [pkgdb] msp430-binutils: swhiteho has requested watchbugzilla
Message-ID: <20090127082216.43AE9208497@bastion.fedora.phx.redhat.com>

swhiteho has requested the watchbugzilla acl on msp430-binutils (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/msp430-binutils



From pkgdb at fedoraproject.org  Tue Jan 27 08:22:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 27 Jan 2009 08:22:16 +0000
Subject: [pkgdb] msp430-binutils: swhiteho has requested watchcommits
Message-ID: <20090127082216.779F52084BD@bastion.fedora.phx.redhat.com>

swhiteho has requested the watchcommits acl on msp430-binutils (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/msp430-binutils



From ensc at fedoraproject.org  Tue Jan 27 08:22:46 2009
From: ensc at fedoraproject.org (Enrico Scholz)
Date: Tue, 27 Jan 2009 08:22:46 +0000 (UTC)
Subject: rpms/libtasn1/devel .cvsignore, 1.6, 1.7 lastver, 1.3,
	1.4 libtasn1.spec, 1.28, 1.29 sources, 1.16, 1.17 verinfo, 1.1, 1.2
Message-ID: <20090127082246.6C9517010B@cvs1.fedora.phx.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/libtasn1/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10895

Modified Files:
	.cvsignore lastver libtasn1.spec sources verinfo 
Log Message:
updated


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libtasn1/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	21 Nov 2008 11:15:26 -0000	1.6
+++ .cvsignore	27 Jan 2009 08:22:15 -0000	1.7
@@ -1 +1,2 @@
-libtasn1-1.7.tar.gz
+libtasn1-1.8.tar.gz
+libtasn1-1.8.tar.gz.sig


Index: lastver
===================================================================
RCS file: /cvs/extras/rpms/libtasn1/devel/lastver,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- lastver	13 Feb 2008 12:51:44 -0000	1.3
+++ lastver	27 Jan 2009 08:22:15 -0000	1.4
@@ -1 +1 @@
-1.3
+1.8


Index: libtasn1.spec
===================================================================
RCS file: /cvs/extras/rpms/libtasn1/devel/libtasn1.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- libtasn1.spec	12 Dec 2008 09:22:41 -0000	1.28
+++ libtasn1.spec	27 Jan 2009 08:22:15 -0000	1.29
@@ -2,15 +2,15 @@
 
 Summary:	This is the ASN.1 library used in GNUTLS
 Name:		libtasn1
-Version:	1.7
-Release: 	%release_func 2
+Version:	1.8
+Release: 	%release_func 1
 
 # The libtasn1 library is LGPLv2+, utilities are GPLv3+
-License: GPLv3+ and LGPLv2+
+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
-Source1:	http://www.gnu.org/software/gnutls/releases/libtasn1/%name-%version.tar.gz.sig
+Source0:	http://ftp.gnu.org/pub/gnu/gnutls/%name-%version.tar.gz
+Source1:	http://ftp.gnu.org/pub/gnu/gnutls/%name-%version.tar.gz.sig
 Patch0:		libtasn1-1.3-pkgconfig.patch
 BuildRoot:	%_tmppath/%name-%version-%release-buildroot
 BuildRequires:	bison, pkgconfig
@@ -62,7 +62,8 @@
 %configure --disable-static
 sed -i 's|^sys_lib_dlsearch_path_spec=.*|sys_lib_dlsearch_path_spec="/%{_lib} %{_libdir} "|g' libtool
 
-make %{?_smp_mflags}
+## SMP builds broke at 1.8
+make #{?_smp_mflags}
 
 
 %install
@@ -121,6 +122,11 @@
 
 
 %changelog
+* Tue Jan 27 2009 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 1.8-1
+- updated to 1.8
+- updated URLs
+- disabled SMP builds for now
+
 * Fri Dec 12 2008 Caol??n McNamara <caolanm at redhat.com> - 1.7-2
 - rebuild to get provides pkgconfig(libtasn1)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libtasn1/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources	21 Nov 2008 11:15:26 -0000	1.16
+++ sources	27 Jan 2009 08:22:16 -0000	1.17
@@ -1 +1,2 @@
-ebfd69b3514d8e8830057f0e9df6a5f9  libtasn1-1.7.tar.gz
+6b87c159e7dcb6e58204cce1edb0fecc  libtasn1-1.8.tar.gz
+bcef3fb9557c0298eb45521a0d125e9b  libtasn1-1.8.tar.gz.sig


Index: verinfo
===================================================================
RCS file: /cvs/extras/rpms/libtasn1/devel/verinfo,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- verinfo	1 Sep 2007 14:45:05 -0000	1.1
+++ verinfo	27 Jan 2009 08:22:16 -0000	1.2
@@ -1,2 +1,2 @@
-ftp://ftp.gnutls.org/pub/gnutls/libtasn1/
+http://ftp.gnu.org/pub/gnu/gnutls/
 libtasn1-(.*?)\.tar\.



From ensc at fedoraproject.org  Tue Jan 27 08:28:17 2009
From: ensc at fedoraproject.org (Enrico Scholz)
Date: Tue, 27 Jan 2009 08:28:17 +0000 (UTC)
Subject: rpms/libtasn1/F-10 .cvsignore, 1.5, 1.6 lastver, 1.3,
	1.4 libtasn1.spec, 1.26, 1.27 sources, 1.15, 1.16 verinfo, 1.1, 1.2
Message-ID: <20090127082817.558117010B@cvs1.fedora.phx.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/libtasn1/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11981

Modified Files:
	.cvsignore lastver libtasn1.spec sources verinfo 
Log Message:
updated


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libtasn1/F-10/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	30 Sep 2008 19:52:56 -0000	1.5
+++ .cvsignore	27 Jan 2009 08:27:46 -0000	1.6
@@ -1 +1,2 @@
-libtasn1-1.5.tar.gz
+libtasn1-1.8.tar.gz
+libtasn1-1.8.tar.gz.sig


Index: lastver
===================================================================
RCS file: /cvs/extras/rpms/libtasn1/F-10/lastver,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- lastver	13 Feb 2008 12:51:44 -0000	1.3
+++ lastver	27 Jan 2009 08:27:46 -0000	1.4
@@ -1 +1 @@
-1.3
+1.8


Index: libtasn1.spec
===================================================================
RCS file: /cvs/extras/rpms/libtasn1/F-10/libtasn1.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- libtasn1.spec	30 Sep 2008 19:52:56 -0000	1.26
+++ libtasn1.spec	27 Jan 2009 08:27:46 -0000	1.27
@@ -2,18 +2,18 @@
 
 Summary:	This is the ASN.1 library used in GNUTLS
 Name:		libtasn1
-Version:	1.5
+Version:	1.8
 Release: 	%release_func 1
 
 # The libtasn1 library is LGPLv2+, utilities are GPLv3+
-License: GPLv3+ and LGPLv2+
+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
-Source1:	http://www.gnu.org/software/gnutls/releases/libtasn1/%name-%version.tar.gz.sig
+Source0:	http://ftp.gnu.org/pub/gnu/gnutls/%name-%version.tar.gz
+Source1:	http://ftp.gnu.org/pub/gnu/gnutls/%name-%version.tar.gz.sig
 Patch0:		libtasn1-1.3-pkgconfig.patch
 BuildRoot:	%_tmppath/%name-%version-%release-buildroot
-BuildRequires:	bison
+BuildRequires:	bison, pkgconfig
 %ifarch %ix86 x86_64 ppc ppc64
 BuildRequires:	valgrind
 %endif
@@ -24,8 +24,6 @@
 Group:		Development/Libraries
 Requires:	%name = %version-%release
 Requires:	pkgconfig
-Requires(pre):		automake
-Requires(postun):	automake
 Requires(post):		/sbin/install-info
 Requires(postun):	/sbin/install-info
 
@@ -64,7 +62,8 @@
 %configure --disable-static
 sed -i 's|^sys_lib_dlsearch_path_spec=.*|sys_lib_dlsearch_path_spec="/%{_lib} %{_libdir} "|g' libtool
 
-make %{?_smp_mflags}
+## SMP builds broke at 1.8
+make #{?_smp_mflags}
 
 
 %install
@@ -118,12 +117,16 @@
 %_libdir/*.so
 %_libdir/pkgconfig/*.pc
 %_includedir/*
-%_datadir/aclocal/libtasn1.m4
 %_infodir/*.info.*
 %_mandir/man3/*asn1*
 
 
 %changelog
+* Tue Jan 27 2009 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 1.8-1
+- updated to 1.8
+- updated URLs
+- disabled SMP builds for now
+
 * Tue Sep 30 2008 Tomas Mraz <tmraz at redhat.com> - 1.5-1
 - updated to new upstream version
 - fix license tag


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libtasn1/F-10/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	30 Sep 2008 19:52:56 -0000	1.15
+++ sources	27 Jan 2009 08:27:46 -0000	1.16
@@ -1 +1,2 @@
-7d7e8e21d1159a0b4c0aa69469eef565  libtasn1-1.5.tar.gz
+6b87c159e7dcb6e58204cce1edb0fecc  libtasn1-1.8.tar.gz
+bcef3fb9557c0298eb45521a0d125e9b  libtasn1-1.8.tar.gz.sig


Index: verinfo
===================================================================
RCS file: /cvs/extras/rpms/libtasn1/F-10/verinfo,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- verinfo	1 Sep 2007 14:45:05 -0000	1.1
+++ verinfo	27 Jan 2009 08:27:46 -0000	1.2
@@ -1,2 +1,2 @@
-ftp://ftp.gnutls.org/pub/gnutls/libtasn1/
+http://ftp.gnu.org/pub/gnu/gnutls/
 libtasn1-(.*?)\.tar\.



From alexlan at fedoraproject.org  Tue Jan 27 08:37:51 2009
From: alexlan at fedoraproject.org (Alex Lancaster)
Date: Tue, 27 Jan 2009 08:37:51 +0000 (UTC)
Subject: rpms/perl-Bio-Graphics/devel perl-Bio-Graphics.spec,1.1,1.2
Message-ID: <20090127083751.2F5DC7010B@cvs1.fedora.phx.redhat.com>

Author: alexlan

Update of /cvs/extras/rpms/perl-Bio-Graphics/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14381

Modified Files:
	perl-Bio-Graphics.spec 
Log Message:
- Temporarily remove Bio::Graphics::Wiggle::Loader and
  Bio::Graphics::Glyph::trace modules from being installed until their
  deps are packaged



Index: perl-Bio-Graphics.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Bio-Graphics/devel/perl-Bio-Graphics.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Bio-Graphics.spec	27 Jan 2009 02:39:30 -0000	1.1
+++ perl-Bio-Graphics.spec	27 Jan 2009 08:37:20 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-Bio-Graphics
 Version:        1.83
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Generate GD images of Bio::Seq objects
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -29,6 +29,12 @@
 %setup -q -n Bio-Graphics-%{version}
 %patch0 -p0 -b .tests
 
+# temporarily remove modules Bio/Graphics/Glyph/trace.pm and 
+# Bio/Graphics/Wiggle/Loader.pm until their dependencies:
+# Bio::SCF and Bio::Graphics::Browser::Util are packaged
+rm lib/Bio/Graphics/Glyph/trace.pm
+rm lib/Bio/Graphics/Wiggle/Loader.pm
+
 %build
 %{__perl} Build.PL installdirs=vendor
 ./Build
@@ -41,6 +47,7 @@
 
 %{_fixperms} $RPM_BUILD_ROOT/*
 
+
 %check
 ./Build test
 
@@ -56,6 +63,11 @@
 %{_mandir}/man3/*
 
 %changelog
+* Tue Jan 27 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 1.83-3
+- Temporarily remove Bio::Graphics::Wiggle::Loader and
+  Bio::Graphics::Glyph::trace modules from being installed until their
+  deps are packaged
+
 * Mon Jan 26 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 1.83-2
 - Patch to disable some tests (image tests currently don't work)
 - Fix file list to include scripts



From ensc at fedoraproject.org  Tue Jan 27 08:38:56 2009
From: ensc at fedoraproject.org (Enrico Scholz)
Date: Tue, 27 Jan 2009 08:38:56 +0000 (UTC)
Subject: rpms/libtasn1/F-9 .cvsignore, 1.3, 1.4 lastver, 1.3,
	1.4 libtasn1.spec, 1.22, 1.23 sources, 1.13, 1.14 verinfo, 1.1, 1.2
Message-ID: <20090127083856.C38647010B@cvs1.fedora.phx.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/libtasn1/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14668

Modified Files:
	.cvsignore lastver libtasn1.spec sources verinfo 
Log Message:
updated


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libtasn1/F-9/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	6 Mar 2006 11:21:46 -0000	1.3
+++ .cvsignore	27 Jan 2009 08:38:26 -0000	1.4
@@ -1,2 +1,2 @@
-libtasn1-*.tar.gz
-libtasn1-*.tar.gz.sig
+libtasn1-1.8.tar.gz
+libtasn1-1.8.tar.gz.sig


Index: lastver
===================================================================
RCS file: /cvs/extras/rpms/libtasn1/F-9/lastver,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- lastver	13 Feb 2008 12:51:44 -0000	1.3
+++ lastver	27 Jan 2009 08:38:26 -0000	1.4
@@ -1 +1 @@
-1.3
+1.8


Index: libtasn1.spec
===================================================================
RCS file: /cvs/extras/rpms/libtasn1/F-9/libtasn1.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- libtasn1.spec	21 Jun 2008 15:04:58 -0000	1.22
+++ libtasn1.spec	27 Jan 2009 08:38:26 -0000	1.23
@@ -2,17 +2,18 @@
 
 Summary:	This is the ASN.1 library used in GNUTLS
 Name:		libtasn1
-Version:	1.3
+Version:	1.8
 Release: 	%release_func 1
 
-License:	LGPL
+# 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:	ftp://ftp.gnutls.org/pub/gnutls/libtasn1/%name-%version.tar.gz
-Source1:	ftp://ftp.gnutls.org/pub/gnutls/libtasn1/%name-%version.tar.gz.sig
+Source0:	http://ftp.gnu.org/pub/gnu/gnutls/%name-%version.tar.gz
+Source1:	http://ftp.gnu.org/pub/gnu/gnutls/%name-%version.tar.gz.sig
 Patch0:		libtasn1-1.3-pkgconfig.patch
 BuildRoot:	%_tmppath/%name-%version-%release-buildroot
-BuildRequires:	bison
+BuildRequires:	bison, pkgconfig
 %ifarch %ix86 x86_64 ppc ppc64
 BuildRequires:	valgrind
 %endif
@@ -23,8 +24,6 @@
 Group:		Development/Libraries
 Requires:	%name = %version-%release
 Requires:	pkgconfig
-Requires(pre):		automake
-Requires(postun):	automake
 Requires(post):		/sbin/install-info
 Requires(postun):	/sbin/install-info
 
@@ -32,6 +31,7 @@
 %package tools
 Summary:	Some ASN.1 tools
 Group:		Applications/Text
+License:	GPLv3+
 Requires:	%name = %version-%release
 
 
@@ -60,7 +60,10 @@
 
 %build
 %configure --disable-static
-make %{?_smp_mflags}
+sed -i 's|^sys_lib_dlsearch_path_spec=.*|sys_lib_dlsearch_path_spec="/%{_lib} %{_libdir} "|g' libtool
+
+## SMP builds broke at 1.8
+make #{?_smp_mflags}
 
 
 %install
@@ -113,12 +116,20 @@
 %_libdir/*.so
 %_libdir/pkgconfig/*.pc
 %_includedir/*
-%_datadir/aclocal/libtasn1.m4
 %_infodir/*.info.*
 %_mandir/man3/*asn1*
 
 
 %changelog
+* Tue Jan 27 2009 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 1.8-1
+- updated to 1.8
+- updated URLs
+- disabled SMP builds for now
+
+* Tue Sep 30 2008 Tomas Mraz <tmraz at redhat.com>
+- fix license tag
+- fix spurious rpath in the tool binaries
+
 * Wed Feb 13 2008 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 1.3-1
 - updated to 1.3 (#426488, #431334)
 - use wrapper around libtasn1-config which should make it multilib


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libtasn1/F-9/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	13 Feb 2008 12:51:44 -0000	1.13
+++ sources	27 Jan 2009 08:38:26 -0000	1.14
@@ -1,2 +1,2 @@
-8e6c9d4760f70758e64fe9d70d5ccfea  libtasn1-1.3.tar.gz
-d911846864012b92ad478fe9dbbd311a  libtasn1-1.3.tar.gz.sig
+6b87c159e7dcb6e58204cce1edb0fecc  libtasn1-1.8.tar.gz
+bcef3fb9557c0298eb45521a0d125e9b  libtasn1-1.8.tar.gz.sig


Index: verinfo
===================================================================
RCS file: /cvs/extras/rpms/libtasn1/F-9/verinfo,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- verinfo	1 Sep 2007 14:45:05 -0000	1.1
+++ verinfo	27 Jan 2009 08:38:26 -0000	1.2
@@ -1,2 +1,2 @@
-ftp://ftp.gnutls.org/pub/gnutls/libtasn1/
+http://ftp.gnu.org/pub/gnu/gnutls/
 libtasn1-(.*?)\.tar\.



From behdad at fedoraproject.org  Tue Jan 27 09:03:12 2009
From: behdad at fedoraproject.org (Behdad Esfahbod)
Date: Tue, 27 Jan 2009 09:03:12 +0000 (UTC)
Subject: rpms/fontconfig/devel .cvsignore, 1.35, 1.36 fontconfig.spec, 1.117,
	1.118 sources, 1.36, 1.37
Message-ID: <20090127090312.188AB7010B@cvs1.fedora.phx.redhat.com>

Author: behdad

Update of /cvs/pkgs/rpms/fontconfig/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20645

Modified Files:
	.cvsignore fontconfig.spec sources 
Log Message:
* Tue Jan 27 2009 Behdad Esfahbod <besfahbo at redhat.com> -
* 2.6.95-1.git.66.gb162bfb
- Update to 2.6.95-1.git.66.gb162bfb




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fontconfig/devel/.cvsignore,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- .cvsignore	23 Jan 2009 19:21:24 -0000	1.35
+++ .cvsignore	27 Jan 2009 09:02:41 -0000	1.36
@@ -1 +1 @@
-fontconfig-2.6.94.tar.gz
+fontconfig-2.6.95.tar.gz


Index: fontconfig.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fontconfig/devel/fontconfig.spec,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -r1.117 -r1.118
--- fontconfig.spec	23 Jan 2009 19:21:24 -0000	1.117
+++ fontconfig.spec	27 Jan 2009 09:02:41 -0000	1.118
@@ -2,8 +2,8 @@
 
 Summary: Font configuration and customization library
 Name: fontconfig
-Version: 2.6.94
-Release: 1.git.65.g628ee83%{?dist}
+Version: 2.6.95
+Release: 1.git.66.gb162bfb%{?dist}
 License: MIT
 Group: System Environment/Libraries
 Source: http://fontconfig.org/release/fontconfig-%{version}.tar.gz
@@ -131,6 +131,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Tue Jan 27 2009 Behdad Esfahbod <besfahbo at redhat.com> - 2.6.95-1.git.66.gb162bfb
+- Update to 2.6.95-1.git.66.gb162bfb
+
 * Fri Jan 23 2009 Behdad Esfahbod <besfahbo at redhat.com> - 2.6.94-1.git.65.g628ee83
 - Update to 2.6.94-1.git.65.g628ee83
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fontconfig/devel/sources,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- sources	23 Jan 2009 19:21:24 -0000	1.36
+++ sources	27 Jan 2009 09:02:41 -0000	1.37
@@ -1 +1 @@
-ba79ff72570a91698fb2f76ef255e5e4  fontconfig-2.6.94.tar.gz
+d568673bb06705503b66eac28c2a2e51  fontconfig-2.6.95.tar.gz



From petersen at fedoraproject.org  Tue Jan 27 09:07:50 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Tue, 27 Jan 2009 09:07:50 +0000 (UTC)
Subject: rpms/scim/devel ta.po, NONE,
	1.1 scim-1.4.7-translation-update-431995.patch, 1.1,
	1.2 scim.spec, 1.137, 1.138 initial-locale-hotkey-186861.patch,
	1.7, NONE scim-configure-libtool2.patch, 1.2,
	NONE scim-fix-unload-segfault.patch, 1.1, NONE
Message-ID: <20090127090750.2647D7010B@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/scim/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21460

Modified Files:
	scim-1.4.7-translation-update-431995.patch scim.spec 
Added Files:
	ta.po 
Removed Files:
	initial-locale-hotkey-186861.patch 
	scim-configure-libtool2.patch scim-fix-unload-segfault.patch 
Log Message:
- update to 1.4.8 release
- initial-locale-hotkey-186861.patch no longer needed
- drop scim-1.4.7_translation-update.tar.bz2 and just add ta.po
- update scim-1.4.7-translation-update-431995.patch
- scim-fix-unload-segfault.patch no longer needed

drop scim-configure-libtool2.patch which didn't help with getting scim
to build with libtool2




--- NEW FILE ta.po ---
# translation of ta.po to Tamil
# Tamil translations for PACKAGE package.
# Copyright (C) 2008 THE PACKAGE'S COPYRIGHT HOLDER
# This file is distributed under the same license as the PACKAGE package.
#
# Automatically generated, 2008.
# I. Felix <ifelix at redhat.com>, 2008.
msgid ""
msgstr ""
"Project-Id-Version: ta\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2007-06-22 11:40-0700\n"
"PO-Revision-Date: 2008-04-02 13:45+0530\n"
"Last-Translator: I. Felix <ifelix at redhat.com>\n"
"Language-Team: Tamil <fedora-trans-ta at redhat.com>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: KBabel 1.11.4\n"
"Plural-Forms: nplurals=2; plural=(n!=1);\n\n\n"
"\n"
"\n"
"\n"
"\n"

#: ../src/scim_compose_key.cpp:126
msgid "English/European"
msgstr "????????????????????????/?????????????????????"

#. Append an entry for forward mode.
#: ../src/scim_imengine.cpp:638 ../src/scim_utility.cpp:693
#: ../modules/FrontEnd/scim_x11_frontend.cpp:1897
#: ../extras/gtk2_immodule/gtkimcontextscim.cpp:1281
#: ../extras/panel/scim_panel_gtk.cpp:2814
msgid "English/Keyboard"
msgstr "????????????????????????/??????????????????????????????"

#: ../src/scim_utility.cpp:694
msgid "Amharic"
msgstr "????????????????????????"

#: ../src/scim_utility.cpp:695
msgid "Arabic"
msgstr "????????????????????????"

#: ../src/scim_utility.cpp:696
msgid "Arabic (Egypt)"
msgstr "????????????????????? (?????????????????????)"

#: ../src/scim_utility.cpp:697
msgid "Arabic (Lebanon)"
msgstr "????????????????????? (?????????????????????)"

#: ../src/scim_utility.cpp:698
msgid "Assamese"
msgstr "???????????????"

#: ../src/scim_utility.cpp:699
msgid "Azerbaijani"
msgstr "??????????????????????????????"

#: ../src/scim_utility.cpp:700
msgid "Belarusian"
msgstr "?????????????????????????????????"

#: ../src/scim_utility.cpp:701
msgid "Bulgarian"
msgstr "??????????????????????????????"

#: ../src/scim_utility.cpp:702 ../src/scim_utility.cpp:703
msgid "Bengali"
msgstr "????????????????????????"

#: ../src/scim_utility.cpp:704
msgid "Bengali (India)"
msgstr "???????????????????????? (?????????????????????)"

#: ../src/scim_utility.cpp:705
msgid "Tibetan"
msgstr "?????????????????????????????????"

#: ../src/scim_utility.cpp:706
msgid "Bosnian"
msgstr "???????????????????????????"

#: ../src/scim_utility.cpp:707
msgid "Catalan"
msgstr "???????????????????????????"

#: ../src/scim_utility.cpp:708 ../src/scim_keyboard_layout_data.h:4595
msgid "Czech"
msgstr "????????????"

#: ../src/scim_utility.cpp:709
msgid "Welsh"
msgstr "??????????????????"

#: ../src/scim_utility.cpp:710 ../src/scim_keyboard_layout_data.h:4597
msgid "Danish"
msgstr "??????????????????"

#: ../src/scim_utility.cpp:711 ../src/scim_keyboard_layout_data.h:4605
msgid "German"
msgstr "?????????????????????"

#: ../src/scim_utility.cpp:712
msgid "Divehi"
msgstr "??????????????????"

#: ../src/scim_utility.cpp:713 ../src/scim_keyboard_layout_data.h:4608
msgid "Greek"
msgstr "???????????????????????????"

#: ../src/scim_utility.cpp:714
msgid "English"
msgstr "????????????????????????"

#: ../src/scim_utility.cpp:715
msgid "English (Australian)"
msgstr "???????????????????????? (????????????????????????????????????)"

#: ../src/scim_utility.cpp:716
msgid "English (Canadian)"
msgstr "???????????????????????? (?????????????????????)"

#: ../src/scim_utility.cpp:717
msgid "English (British)"
msgstr "???????????????????????? (??????????????????????????????)"

#: ../src/scim_utility.cpp:718
msgid "English (Ireland)"
msgstr "???????????????????????? (??????????????????????????????)"

#: ../src/scim_utility.cpp:719
msgid "English (American)"
msgstr "???????????????????????? (??????????????????????????????)"

#: ../src/scim_utility.cpp:720 ../src/scim_utility.cpp:721
#: ../src/scim_keyboard_layout_data.h:4621
msgid "Spanish"
msgstr "????????????????????????"

#: ../src/scim_utility.cpp:722
msgid "Spanish (Mexico)"
msgstr "???????????????????????? (????????????????????????)"

#: ../src/scim_utility.cpp:723 ../src/scim_keyboard_layout_data.h:4600
msgid "Estonian"
msgstr "??????????????????????????????"

#: ../src/scim_utility.cpp:724
msgid "Basque"
msgstr "????????????????????????"

#: ../src/scim_utility.cpp:725
msgid "Persian"
msgstr "???????????????????????????"

#: ../src/scim_utility.cpp:726 ../src/scim_keyboard_layout_data.h:4601
msgid "Finnish"
msgstr "?????????????????????"

#: ../src/scim_utility.cpp:727 ../src/scim_keyboard_layout_data.h:4602
msgid "French"
msgstr "????????????????????????"

#: ../src/scim_utility.cpp:728
msgid "Irish"
msgstr "???????????????"

#: ../src/scim_utility.cpp:729
msgid "Galician"
msgstr "???????????????????????????"

#: ../src/scim_utility.cpp:730
msgid "Gujarati"
msgstr "???????????????????????????"

#: ../src/scim_utility.cpp:731 ../src/scim_utility.cpp:740
msgid "Hebrew"
msgstr "????????????????????????"

#: ../src/scim_utility.cpp:732
msgid "Hindi"
msgstr "???????????????"

#: ../src/scim_utility.cpp:733 ../src/scim_keyboard_layout_data.h:4594
msgid "Croatian"
msgstr "???????????????????????????"

#: ../src/scim_utility.cpp:734 ../src/scim_keyboard_layout_data.h:4609
msgid "Hungarian"
msgstr "??????????????????????????????"

#: ../src/scim_utility.cpp:735
msgid "Armenian"
msgstr "??????????????????????????????"

#: ../src/scim_utility.cpp:736
msgid "Interlingua"
msgstr "????????????????????????????????????"

#: ../src/scim_utility.cpp:737
msgid "Indonesian"
msgstr "????????????????????????????????????"

#: ../src/scim_utility.cpp:738 ../src/scim_keyboard_layout_data.h:4627
msgid "Icelandic"
msgstr "???????????????????????????"

#: ../src/scim_utility.cpp:739 ../src/scim_keyboard_layout_data.h:4610
msgid "Italian"
msgstr "??????????????????????????????"

#: ../src/scim_utility.cpp:741 ../src/scim_keyboard_layout_data.h:4611
msgid "Japanese"
msgstr "????????????????????????"

#: ../src/scim_utility.cpp:742
msgid "Georgian"
msgstr "???????????????????????????"

#: ../src/scim_utility.cpp:743
msgid "Kazakh"
msgstr "????????????"

#: ../src/scim_utility.cpp:744
msgid "Cambodian"
msgstr "??????????????????????????????"

#: ../src/scim_utility.cpp:745
msgid "Kannada"
msgstr "?????????????????????"

#: ../src/scim_utility.cpp:746
msgid "Korean"
msgstr "?????????????????????"

#: ../src/scim_utility.cpp:747
msgid "Laothian"
msgstr "?????????????????????"

#: ../src/scim_utility.cpp:748 ../src/scim_keyboard_layout_data.h:4628
msgid "Lithuanian"
msgstr "?????????????????????????????????"

#: ../src/scim_utility.cpp:749
msgid "Latvian"
msgstr "?????????????????????????????????"

#: ../src/scim_utility.cpp:750
msgid "Macedonian"
msgstr "?????????????????????????????????"

#: ../src/scim_utility.cpp:751
msgid "Malayalam"
msgstr "????????????????????????"

#: ../src/scim_utility.cpp:752
msgid "Mongolian"
msgstr "??????????????????????????????"

#: ../src/scim_utility.cpp:753
msgid "Marathi"
msgstr "?????????????????????"

#: ../src/scim_utility.cpp:754
msgid "Malay"
msgstr "???????????????"

#: ../src/scim_utility.cpp:755
msgid "Burmese"
msgstr "?????????????????????"

#: ../src/scim_utility.cpp:756
msgid "Nepali"
msgstr "??????????????????"

#: ../src/scim_utility.cpp:757 ../src/scim_keyboard_layout_data.h:4598
msgid "Dutch"
msgstr "???????????????"

#: ../src/scim_utility.cpp:758
msgid "Norwegian (nynorsk)"
msgstr "????????????????????????????????? (nynorsk)"

#: ../src/scim_utility.cpp:759
msgid "Norwegian (bokmal)"
msgstr "????????????????????????????????? (bokmal)"

#: ../src/scim_utility.cpp:760
msgid "Oriya"
msgstr "???????????????"

#: ../src/scim_utility.cpp:761
msgid "Punjabi"
msgstr "?????????????????????"

#: ../src/scim_utility.cpp:762 ../src/scim_keyboard_layout_data.h:4613
msgid "Polish"
msgstr "??????????????????"

#: ../src/scim_utility.cpp:763 ../src/scim_utility.cpp:765
#: ../src/scim_keyboard_layout_data.h:4614
msgid "Portuguese"
msgstr "?????????????????????????????????????????????"

#: ../src/scim_utility.cpp:764 ../src/scim_keyboard_layout_data.h:4615
msgid "Portuguese (Brazil)"
msgstr "???????????????????????????????????? (????????????????????????)"

#: ../src/scim_utility.cpp:766
msgid "Romanian"
msgstr "???????????????????????????"

#: ../src/scim_utility.cpp:767 ../src/scim_keyboard_layout_data.h:4617
msgid "Russian"
msgstr "??????????????????"

#: ../src/scim_utility.cpp:768
msgid "Sinhala"
msgstr "????????????????????????"

#: ../src/scim_utility.cpp:769 ../src/scim_keyboard_layout_data.h:4618
msgid "Slovak"
msgstr "????????????????????????"

#: ../src/scim_utility.cpp:770 ../src/scim_keyboard_layout_data.h:4620
msgid "Slovenian"
msgstr "?????????????????????????????????"

#: ../src/scim_utility.cpp:771
msgid "Albanian"
msgstr "???????????????????????????"

#: ../src/scim_utility.cpp:772 ../src/scim_utility.cpp:773
#: ../src/scim_utility.cpp:774
msgid "Serbian"
msgstr "???????????????????????????"

#: ../src/scim_utility.cpp:775 ../src/scim_utility.cpp:777
#: ../src/scim_keyboard_layout_data.h:4624
msgid "Swedish"
msgstr "????????????????????????"

#: ../src/scim_utility.cpp:776
msgid "Swedish (Finland)"
msgstr "???????????????????????? (??????????????????????????????)"

#: ../src/scim_utility.cpp:778
msgid "Tamil"
msgstr "???????????????"

#: ../src/scim_utility.cpp:779
msgid "Telugu"
msgstr "????????????????????????"

#: ../src/scim_utility.cpp:780
msgid "Thai"
msgstr "????????????"

#: ../src/scim_utility.cpp:781 ../src/scim_keyboard_layout_data.h:4625
msgid "Turkish"
msgstr "????????????????????????"

#: ../src/scim_utility.cpp:782
msgid "Uighur"
msgstr "??????????????????"

#: ../src/scim_utility.cpp:783 ../src/scim_keyboard_layout_data.h:4629
msgid "Ukrainian"
msgstr "??????????????????????????????"

#: ../src/scim_utility.cpp:784
msgid "Urdu"
msgstr "???????????????"

#: ../src/scim_utility.cpp:785
msgid "Uzbek"
msgstr "?????????????????????"

#: ../src/scim_utility.cpp:786
msgid "Vietnamese"
msgstr "????????????????????????????????????"

#: ../src/scim_utility.cpp:787
msgid "Walloon"
msgstr "???????????????"

#: ../src/scim_utility.cpp:788 ../src/scim_utility.cpp:789
msgid "Yiddish"
msgstr "???????????????"

#: ../src/scim_utility.cpp:790
msgid "Chinese"
msgstr "???????????????"

#: ../src/scim_utility.cpp:791 ../src/scim_utility.cpp:793
msgid "Chinese (simplified)"
msgstr "??????????????? (??????????????????)"

#: ../src/scim_utility.cpp:792 ../src/scim_utility.cpp:794
msgid "Chinese (traditional)"
msgstr "??????????????? (??????????????????????????????)"

#: ../src/scim_utility.cpp:876
msgid "Other"
msgstr "????????????"

#: ../src/scim_keyboard_layout_data.h:4591
#: ../modules/IMEngine/scim_socket_imengine.cpp:386
#: ../modules/IMEngine/scim_socket_imengine.cpp:416
#: ../modules/IMEngine/scim_socket_imengine.cpp:501
#: ../modules/IMEngine/scim_socket_imengine.cpp:531
#: ../modules/IMEngine/scim_socket_imengine.cpp:561
msgid "Unknown"
msgstr "?????????????????????"

#: ../src/scim_keyboard_layout_data.h:4592
msgid "English (US)"
msgstr "???????????????????????? (???????????????????????????)"

#: ../src/scim_keyboard_layout_data.h:4593
msgid "Belgian"
msgstr "???????????????????????????"

#: ../src/scim_keyboard_layout_data.h:4596
msgid "Czech (qwerty)"
msgstr "???????????? (qwerty)"

#: ../src/scim_keyboard_layout_data.h:4599
msgid "Dvorak"
msgstr "????????????????????????"

#: ../src/scim_keyboard_layout_data.h:4603
msgid "French (Canadian)"
msgstr "????????????????????? (?????????????????????)"

#: ../src/scim_keyboard_layout_data.h:4604
msgid "French (Switzerland)"
msgstr "????????????????????? (?????????????????????????????????????????????)"

#: ../src/scim_keyboard_layout_data.h:4606
msgid "German (with deadkeys)"
msgstr "????????????????????? (??????????????????????????????????????????)"

#: ../src/scim_keyboard_layout_data.h:4607
msgid "German (Swiss)"
msgstr "????????????????????? (??????????????????)"

#: ../src/scim_keyboard_layout_data.h:4612
msgid "Norwegian"
msgstr "?????????????????????????????????"

#: ../src/scim_keyboard_layout_data.h:4616
msgid "Portuguese (Brazil US accents)"
msgstr "???????????????????????????????????? (???????????????????????? ??????????????? ????????????)"

#: ../src/scim_keyboard_layout_data.h:4619
msgid "Slovak (qwerty)"
msgstr "???????????????????????? (qwerty)"

#: ../src/scim_keyboard_layout_data.h:4622
msgid "Spanish (CP 850)"
msgstr "???????????????????????? (CP 850)"

#: ../src/scim_keyboard_layout_data.h:4623
msgid "Spanish (Latin America)"
msgstr "???????????????????????? (????????????????????? ???????????????????????????)"

#: ../src/scim_keyboard_layout_data.h:4626
msgid "English (UK)"
msgstr "???????????????????????? (???????????????????????????)"

#: ../modules/Filter/scim_sctc_filter.cpp:57
msgid "Simplified-Traditional Chinese Conversion"
msgstr "????????????-???????????? ????????? ????????????????????????"

#: ../modules/Filter/scim_sctc_filter.cpp:60
msgid "Convert between Simplified Chinese and Traditional Chinese"
msgstr "???????????? ????????????????????? ???????????? ????????????????????????????????????????????? ?????????????????????"

#: ../modules/Filter/scim_sctc_filter.cpp:71
msgid "SC-TC"
msgstr "SC-TC"

#: ../modules/Filter/scim_sctc_filter.cpp:73
#: ../modules/Filter/scim_sctc_filter.cpp:78
msgid "Simplified-Traditional Chinese conversion"
msgstr "????????????-???????????? ????????? ????????????????????????"

#: ../modules/Filter/scim_sctc_filter.cpp:76
msgid "No Conversion"
msgstr "????????????????????? ???????????????"

#: ../modules/Filter/scim_sctc_filter.cpp:81
msgid "Simplified to Traditional"
msgstr "????????????????????????????????????????????? ????????????????????????"

#: ../modules/Filter/scim_sctc_filter.cpp:83
msgid "Convert Simplified Chinese to Traditional Chinese"
msgstr "???????????? ????????????????????????????????????????????? ???????????? ????????????????????????????????? ???????????????????????????"

#: ../modules/Filter/scim_sctc_filter.cpp:86
msgid "Traditional to Simplified"
msgstr "???????????????????????????????????? ???????????????????????????"

#: ../modules/Filter/scim_sctc_filter.cpp:88
msgid "Convert Traditional Chinese to Simplified Chinese"
msgstr "???????????? ????????????????????????????????????????????? ???????????? ????????????????????????????????? ???????????????????????????"

#: ../modules/Filter/scim_sctc_filter.cpp:300
msgid "James Su <suzhe at tsinghua.org.cn>"
msgstr "James Su <suzhe at tsinghua.org.cn>"

#: ../modules/Filter/scim_sctc_filter.cpp:425
#: ../modules/Filter/scim_sctc_filter.cpp:555
#: ../modules/Filter/scim_sctc_filter.cpp:571
msgid "SC->TC"
msgstr "SC->TC"

#: ../modules/Filter/scim_sctc_filter.cpp:431
#: ../modules/Filter/scim_sctc_filter.cpp:559
#: ../modules/Filter/scim_sctc_filter.cpp:575
msgid "TC->SC"
msgstr "TC->SC"

#: ../modules/FrontEnd/scim_x11_frontend.cpp:1845
#: ../extras/gtk2_immodule/gtkimcontextscim.cpp:1231
#: ../extras/panel/scim_panel_gtk.cpp:2304
msgid "Smart Common Input Method platform "
msgstr "Smart Common Input Method ????????????"

#: ../modules/FrontEnd/scim_x11_frontend.cpp:1847
#: ../extras/gtk2_immodule/gtkimcontextscim.cpp:1233
msgid ""
"\n"
"(C) 2002-2005 James Su <suzhe at tsinghua.org.cn>\n"
"\n"
msgstr ""
"\n"
"(C) 2002-2005 James Su <suzhe at tsinghua.org.cn>\n"
"\n"

#: ../modules/FrontEnd/scim_x11_frontend.cpp:1851
#: ../extras/gtk2_immodule/gtkimcontextscim.cpp:1238
msgid ""
":\n"
"\n"
msgstr ""
":\n"
"\n"

#: ../modules/FrontEnd/scim_x11_frontend.cpp:1854
#: ../modules/FrontEnd/scim_x11_frontend.cpp:1857
#: ../extras/gtk2_immodule/gtkimcontextscim.cpp:1241
#: ../extras/gtk2_immodule/gtkimcontextscim.cpp:1244
msgid ""
"\n"
"\n"
msgstr ""
"\n"
"\n"

#: ../modules/IMEngine/scim_rawcode_imengine.cpp:120
msgid "RAW CODE"
msgstr "RAW CODE"

#: ../modules/IMEngine/scim_rawcode_imengine.cpp:127
msgid "(C) 2002-2006 James Su <suzhe at tsinghua.org.cn>"
msgstr "(C) 2002-2006 James Su <suzhe at tsinghua.org.cn>"

#: ../modules/IMEngine/scim_rawcode_imengine.cpp:140
msgid ""
"Hot Keys:\n"
"\n"
"  Control+u:\n"
"    switch between Multibyte encoding and Unicode.\n"
"\n"
"  Esc:\n"
"    reset the input method.\n"
msgstr ""
"?????????????????????????????????????????????:\n"
"\n"
"  Control+u:\n"
"    ?????? ???????????? ?????????????????????????????????????????????????????? ??????????????????????????????????????? ???????????????????????????.\n"
"\n"
"  Esc:\n"
"    ????????????????????? ???????????????????????? ????????? ??????????????? ?????????????????????.\n"

#: ../modules/IMEngine/scim_rawcode_imengine.cpp:407
#: ../modules/IMEngine/scim_rawcode_imengine.cpp:423
msgid "The status of the current input method. Click to change it."
msgstr "?????????????????? ????????????????????? ???????????????????????? ????????????. ??????????????? ?????????????????????????????????."

#: ../modules/IMEngine/scim_rawcode_imengine.cpp:409
msgid "Unicode"
msgstr "??????????????????????????????"

#: ../modules/SetupUI/scim_frontend_setup.cpp:82
#: ../modules/SetupUI/scim_imengine_setup.cpp:88
msgid "Global Setup"
msgstr "??????????????????????????? ???????????????"

#: ../modules/SetupUI/scim_frontend_setup.cpp:87
msgid ""
"Setup the global options used by All FrontEnd modules, including X11 "
"FrontEnd, GTK IMModule, QT IMModule etc."
msgstr "X11 FrontEnd, GTK IMModule, QT IMModule ?????????????????????????????????????????? ????????????????????????, ????????????????????? FrontEnd ????????????????????????????????? ???????????????????????????????????????????????? ??????????????????????????? ???????????????????????????????????? ??????????????????????????????."

#. label
#: ../modules/SetupUI/scim_frontend_setup.cpp:143
msgid "_Trigger:"
msgstr "???????????????????????? (_T):"

#. title
#: ../modules/SetupUI/scim_frontend_setup.cpp:145
msgid "Select the trigger keys"
msgstr "???????????????????????? ????????????????????? ???????????????????????????????????????????????????"

#. tooltip
#: ../modules/SetupUI/scim_frontend_setup.cpp:147
msgid ""
"The key events to turn on/off SCIM input method. Click on the button on the "
"right to edit it."
msgstr "SCIM ????????????????????? ?????????????????? ????????????????????????/?????????????????????????????? ???????????? ??????????????????????????????. ???????????? ?????????????????? ??????????????????????????? ???????????????????????? ???????????????????????? ???????????? ?????????????????????????????????."

#. label
#: ../modules/SetupUI/scim_frontend_setup.cpp:160
msgid "Turn _On:"
msgstr "??????????????????????????? (_O):"

#. title
#: ../modules/SetupUI/scim_frontend_setup.cpp:162
msgid "Select the Turn On keys"
msgstr "???????????????????????? ????????????????????? ?????????????????????????????????????????????"

#. tooltip
#: ../modules/SetupUI/scim_frontend_setup.cpp:164
msgid ""
"The key events to turn on SCIM input method. Click on the button on the "
"right to edit it."
msgstr "SCIM ????????????????????? ?????????????????? ???????????????????????? ???????????? ??????????????????????????????. ???????????? ?????????????????? ??????????????????????????? ???????????????????????? ???????????????????????? ???????????? ?????????????????????????????????."

#. label
#: ../modules/SetupUI/scim_frontend_setup.cpp:177
msgid "Turn O_ff:"
msgstr "????????????????????????????????? (_f):"

#. title
#: ../modules/SetupUI/scim_frontend_setup.cpp:179
msgid "Select the Turn Off keys"
msgstr "?????????????????????????????? ????????????????????? ?????????????????????????????????????????????"

#. tooltip
#: ../modules/SetupUI/scim_frontend_setup.cpp:181
msgid ""
"The key events to turn off SCIM input method. Click on the button on the "
"right to edit it."
msgstr "SCIM ????????????????????? ?????????????????? ?????????????????????????????? ???????????? ??????????????????????????????. ???????????? ?????????????????? ??????????????????????????? ???????????????????????? ???????????????????????? ???????????? ?????????????????????????????????."

#. label
#: ../modules/SetupUI/scim_frontend_setup.cpp:194
msgid "_Next input method:"
msgstr "?????????????????? ????????????????????? ???????????? (_N):"

#. title
#: ../modules/SetupUI/scim_frontend_setup.cpp:196
msgid "Select the next input method keys"
msgstr "?????????????????? ????????????????????? ???????????? ????????????????????? ???????????????????????????????????????????????????"

#. tooltip
#: ../modules/SetupUI/scim_frontend_setup.cpp:198
msgid ""
"The key events to switch to the next input method. Click on the button on "
"the right to edit it."
msgstr "?????????????????? ????????????????????? ???????????????????????? ???????????????????????? ???????????? ??????????????????????????????. ???????????? ?????????????????? ??????????????????????????? ???????????????????????? ???????????????????????? ???????????? ?????????????????????????????????."

#. label
#: ../modules/SetupUI/scim_frontend_setup.cpp:213
msgid "_Previous input method:"
msgstr "????????????????????? ????????????????????? ???????????? (_P):"

#. title
#: ../modules/SetupUI/scim_frontend_setup.cpp:215
msgid "Select the previous input method keys"
msgstr "????????????????????? ????????????????????? ???????????? ????????????????????? ???????????????????????????????????????????????????"

#. tooltip
#: ../modules/SetupUI/scim_frontend_setup.cpp:217
msgid ""
"The key events to switch to the previous input method. Click on the button "
"on the right to edit it."
msgstr "????????????????????? ????????????????????? ???????????????????????? ???????????????????????? ???????????? ??????????????????????????????. ???????????? ?????????????????? ??????????????????????????? ???????????????????????? ???????????????????????? ???????????? ?????????????????????????????????."

#. label
#: ../modules/SetupUI/scim_frontend_setup.cpp:232
msgid "Show input method _menu:"
msgstr "????????????????????? ???????????? ????????????????????? ??????????????????????????? (_m):"

#. title
#: ../modules/SetupUI/scim_frontend_setup.cpp:234
msgid "Select the show input method menu keys"
msgstr "????????????????????? ???????????? ??????????????? ????????????????????? ??????????????????????????? ???????????????????????????????????????????????????"

#. tooltip
#: ../modules/SetupUI/scim_frontend_setup.cpp:236
msgid ""
"The key events to show the input method menu. Click on the button on the "
"right to edit it."
msgstr "????????????????????? ???????????? ????????????????????? ???????????????????????? ???????????? ??????????????????????????????. ???????????? ?????????????????? ??????????????????????????? ???????????????????????? ???????????????????????? ???????????? ?????????????????????????????????."

#: ../modules/SetupUI/scim_frontend_setup.cpp:306
msgid "Options"
msgstr "????????????????????????????????????"

#: ../modules/SetupUI/scim_frontend_setup.cpp:321
msgid "_Keyboard Layout:"
msgstr "?????????????????????????????? ????????????????????? (_K):"

#: ../modules/SetupUI/scim_frontend_setup.cpp:342
msgid ""
"You should choose your currently used keyboard layout here so that input "
"methods, who care about keyboard layout, could work correctly."
msgstr "????????????????????? ????????????????????? ???????????????????????????????????? ?????????????????????????????? ????????????????????? ??????????????? ??????????????????????????????????????? ????????????????????????. ???????????? ?????????????????????????????? ????????????????????????????????? ???????????????????????????????????? ????????????????????? ????????????????????? ?????????????????? ???????????? ????????????????????????."

#. On The Spot.
#: ../modules/SetupUI/scim_frontend_setup.cpp:346
msgid "_Embed Preedit String into client window"
msgstr "????????????????????? ?????????????????????????????? ??????????????????????????????????????????  ??????????????????????????????????????????????????? ???????????? (_E)"

#: ../modules/SetupUI/scim_frontend_setup.cpp:351
msgid ""
"If this option is checked, the preedit string will be displayed directly in "
"the client input window, rather than in a independent float window."
msgstr "???????????? ??????????????????????????? ??????????????????????????????????????????????????????????????????, ???????????? ??????????????????????????????????????? ???????????? ????????????????????? ????????????????????? ?????????????????????????????? ???????????????????????? ????????????????????????????????????."

#. Shared input method.
#: ../modules/SetupUI/scim_frontend_setup.cpp:360
msgid "_Share the same input method among all applications"
msgstr "????????????????????? ????????????????????????????????????????????? ????????? ????????????????????? ?????????????????? ???????????????????????? (_S)"

#: ../modules/SetupUI/scim_frontend_setup.cpp:365
msgid ""
"If this option is checked, then only one input method could be used by all "
"applications at the same time.Otherwise different input method could be used "
"by each application."
msgstr "???????????? ??????????????????????????? ??????????????????????????????????????????????????????????????????, ???????????? ????????? ????????? ????????????????????? ???????????? ????????????????????? ??????????????????????????????????????? ????????? ??????????????????????????? ?????????????????????????????? ????????????????????????. ????????????????????????????????? ???????????? ????????????????????? ???????????? ????????????????????? ?????????????????????????????????????????? ???????????????????????????????????????????????????."

#: ../modules/SetupUI/scim_frontend_setup.cpp:373
#: ../modules/SetupUI/scim_imengine_setup.cpp:453
msgid "Hotkeys"
msgstr "?????????????????????????????????????????????"

#: ../modules/SetupUI/scim_imengine_setup.cpp:93
msgid "You can enable/disable input methods and set hotkeys for input methods here."
msgstr "????????????????????? ????????????????????? ????????????????????? ?????????????????????????????????????????????/??????????????????????????? ????????????????????? ????????????????????? ????????????????????????????????? ??????????????? ????????????????????????????????????????????? ??????????????????????????????."

#: ../modules/SetupUI/scim_imengine_setup.cpp:296
msgid "The installed input method services:"
msgstr "????????????????????????????????? ????????????????????? ???????????? ?????????????????????:"

#. Create hotkey and filter button before factory list view, because
#. factory_list_selection_changed_callback may access these two buttons.
#: ../modules/SetupUI/scim_imengine_setup.cpp:311
msgid "Edit _Hotkeys"
msgstr "????????????????????????????????????????????? ????????????????????????????????? (_H)"

#: ../modules/SetupUI/scim_imengine_setup.cpp:320
msgid "Edit Hotkeys associated with the selected input method."
msgstr "????????????????????????????????????????????????????????? ????????????????????? ??????????????????????????? ????????????????????????????????????????????? ?????????????????????????????????."

#: ../modules/SetupUI/scim_imengine_setup.cpp:322
msgid "Select _Filters"
msgstr "?????????????????????????????? ????????????????????????????????????????????? (_F)"

#: ../modules/SetupUI/scim_imengine_setup.cpp:331
msgid "Select the Filters which will be attached to this input method."
msgstr "???????????? ????????????????????? ???????????????????????? ???????????????????????????????????? ?????????????????????????????? ???????????????????????????????????????????????????."

#: ../modules/SetupUI/scim_imengine_setup.cpp:348
msgid "_Expand"
msgstr "??????????????????????????????????????? (_E)"

#: ../modules/SetupUI/scim_imengine_setup.cpp:357
msgid "Expand all language categories."
msgstr "????????????????????? ???????????? ?????????????????????????????? ???????????????????????????????????????"

#: ../modules/SetupUI/scim_imengine_setup.cpp:359
msgid "_Collapse"
msgstr "????????????????????????????????? (_C)"

#: ../modules/SetupUI/scim_imengine_setup.cpp:368
msgid "Collapse all language categories."
msgstr "????????????????????? ???????????? ???????????????????????????????????? ?????????????????????????????????"

#: ../modules/SetupUI/scim_imengine_setup.cpp:370
msgid "E_nable All"
msgstr "????????????????????????????????? ??????????????????????????????????????? (_n)"

#: ../modules/SetupUI/scim_imengine_setup.cpp:379
msgid "Enable all input methods."
msgstr "????????????????????? ????????????????????? ????????????????????????????????? ???????????????????????????????????????."

#: ../modules/SetupUI/scim_imengine_setup.cpp:381
msgid "_Disable All"
msgstr "????????????????????????????????? ?????????????????????????????????????????? (_D)"

#: ../modules/SetupUI/scim_imengine_setup.cpp:390
msgid "Disable all input methods."
msgstr "????????????????????? ????????????????????? ????????????????????????????????? ??????????????????????????????????????????"

#: ../modules/SetupUI/scim_imengine_setup.cpp:414
#: ../modules/SetupUI/scim_imengine_setup.cpp:541
msgid "Name"
msgstr "???????????????"

#: ../modules/SetupUI/scim_imengine_setup.cpp:432
#: ../modules/SetupUI/scim_imengine_setup.cpp:522
msgid "Enable"
msgstr "???????????????????????????????????????"

#: ../modules/SetupUI/scim_imengine_setup.cpp:467
msgid "Filters"
msgstr "??????????????????????????????"

#: ../modules/SetupUI/scim_imengine_setup.cpp:560
msgid "Languages"
msgstr "?????????????????????"

#: ../modules/SetupUI/scim_imengine_setup.cpp:574
msgid "Description"
msgstr "????????????????????????"

#: ../modules/SetupUI/scim_imengine_setup.cpp:1190
#, c-format
msgid "Edit Hotkeys for %s"
msgstr "%s???????????? ???????????????????????? ????????????????????? ?????????????????????????????????"

#: ../modules/SetupUI/scim_imengine_setup.cpp:1417
#, c-format
msgid "Select Filters for %s"
msgstr "%s???????????? ?????????????????????????????? ?????????????????????????????????????????????"

#: ../modules/SetupUI/scim_imengine_setup.cpp:1450
msgid "Move _Up"
msgstr "???????????? ??????????????????????????? (_U)"

#: ../modules/SetupUI/scim_imengine_setup.cpp:1457
msgid "Move _Down"
msgstr "???????????? ??????????????????????????? (_D)"

#: ../modules/SetupUI/scim_panel_gtk_setup.cpp:95
msgid "GTK"
msgstr "GTK"

#: ../modules/SetupUI/scim_panel_gtk_setup.cpp:100
msgid "A panel daemon based on GTK+-2.x library."
msgstr "GTK+-2.x ???????????????????????? ????????????????????????????????? ??????????????? ????????? ????????? ??????????????????."

#: ../modules/SetupUI/scim_panel_gtk_setup.cpp:163
msgid "Always"
msgstr "???????????????????????????"

#: ../modules/SetupUI/scim_panel_gtk_setup.cpp:164
msgid "On demand"
msgstr "?????????????????????????????????"

#: ../modules/SetupUI/scim_panel_gtk_setup.cpp:165
msgid "Never"
msgstr "???????????????????????????"

#. Create the ToolBar setup block.
#: ../modules/SetupUI/scim_panel_gtk_setup.cpp:211
msgid "ToolBar"
msgstr "????????????????????????????????????"

#: ../modules/SetupUI/scim_panel_gtk_setup.cpp:229
msgid "_Show:"
msgstr "??????????????????????????? (_S):"

#: ../modules/SetupUI/scim_panel_gtk_setup.cpp:245
msgid "Auto s_nap"
msgstr "??????????????? ???????????????????????? (_n)"

#: ../modules/SetupUI/scim_panel_gtk_setup.cpp:251
msgid "Show _input method icon"
msgstr "????????????????????? ???????????? ????????????????????????????????? ??????????????????????????? (_i)"

#: ../modules/SetupUI/scim_panel_gtk_setup.cpp:257
msgid "Show inp_ut method name"
msgstr "????????????????????? ???????????? ??????????????? ??????????????????????????? (_u)"

#: ../modules/SetupUI/scim_panel_gtk_setup.cpp:269
msgid "Hide time_out:"
msgstr "??????????????? ????????????????????? ???????????????????????? (_o):"

#: ../modules/SetupUI/scim_panel_gtk_setup.cpp:282
msgid "Show s_tick icon"
msgstr "??????????????? ????????????????????????????????? ??????????????????????????? (_t)"

#: ../modules/SetupUI/scim_panel_gtk_setup.cpp:288
msgid "Show m_enu icon"
msgstr "??????????????? ????????????????????????????????? ??????????????????????????? (_e)"

#: ../modules/SetupUI/scim_panel_gtk_setup.cpp:294
msgid "Show _help icon"
msgstr "???????????? ????????????????????????????????? ??????????????????????????? (_h)"

#: ../modules/SetupUI/scim_panel_gtk_setup.cpp:300
msgid "Show _property label"
msgstr "??????????????? ?????????????????? ??????????????????????????? (_p)"

#. Create the Input Window setup block
#: ../modules/SetupUI/scim_panel_gtk_setup.cpp:311
msgid "Input window"
msgstr "????????????????????? ??????????????????"

#: ../modules/SetupUI/scim_panel_gtk_setup.cpp:320
msgid "E_mbedded lookup table"
msgstr "?????????????????????????????????????????? ?????????????????? ????????????????????? (_m)"

#: ../modules/SetupUI/scim_panel_gtk_setup.cpp:324
msgid "_Vertical lookup table"
msgstr "?????????????????????????????? ?????????????????? ????????????????????? (_V)"

#: ../modules/SetupUI/scim_panel_gtk_setup.cpp:328
msgid "Misc"
msgstr "??????????????????"

#: ../modules/SetupUI/scim_panel_gtk_setup.cpp:337
msgid "Show tra_y icon"
msgstr "??????????????? ??????????????????????????? ??????????????????????????? (_y)"

#: ../modules/SetupUI/scim_panel_gtk_setup.cpp:341
msgid "Stick _windows"
msgstr "????????????????????? ??????????????????????????? (_w)"

#: ../modules/SetupUI/scim_panel_gtk_setup.cpp:349
msgid "_Font:"
msgstr "??????????????????????????? (_F):"

#: ../modules/SetupUI/scim_panel_gtk_setup.cpp:419
msgid ""
"If option \"Always\" is selected, the toolbar will always be shown on the "
"screen. If option \"On demand\" is selected, it will only be shown when SCIM "
"is activated. If option \"Never\" is selected, it will never be shown."
msgstr "\"???????????????????????????\" ???????????? ??????????????????????????? ??????????????????????????????????????????????????????????????????, ???????????????????????????????????? ??????????????????????????? ???????????????????????? ????????????????????????. \"???????????????????????? ?????????\" ???????????? ??????????????????????????? ?????????????????????????????????????????????????????????????????? SCIM ???????????????????????????????????????????????????????????? ????????????????????? ????????????????????????????????????. \"??????????????????????????? ???????????????\" ???????????? ??????????????????????????? ??????????????????????????????????????????????????????????????????, ????????? ??????????????????????????? ????????????????????????."

#: ../modules/SetupUI/scim_panel_gtk_setup.cpp:426
msgid "If this option is checked, the toolbar will be snapped to the screen border."
msgstr "???????????? ??????????????????????????? ????????????????????????????????????????????????, ???????????????????????????????????? ???????????? ??????????????????????????? ?????????????????????????????????."

#: ../modules/SetupUI/scim_panel_gtk_setup.cpp:431
msgid ""
"The toolbar will be hidden out after this timeout is elapsed. This option is "
"only valid when \"Always show\" is selected. Set to zero to disable this "
"behavior."
msgstr "?????????????????????????????? ???????????? ??????????????? ????????????????????????????????? ???????????????????????????????????????. ???????????? ??????????????????????????? \"??????????????????????????? ???????????????????????????\" ?????????????????? ?????????????????????????????????????????????????????????????????? ????????????????????? ???????????????????????????. ???????????? ?????????????????????????????? ??????????????????????????? ?????? ??????????????????????????????."

#: ../modules/SetupUI/scim_panel_gtk_setup.cpp:438
msgid ""
"If this option is checked, the input method icon will be showed on the "
"toolbar."
msgstr "???????????? ??????????????????????????? ????????????????????????????????????????????????, ????????????????????? ???????????? ????????????????????? ???????????????????????????????????????????????? ????????????????????????????????????."

#: ../modules/SetupUI/scim_panel_gtk_setup.cpp:442
msgid ""
"If this option is checked, the input method name will be showed on the "
"toolbar."
msgstr "???????????? ??????????????????????????? ????????????????????????????????????????????????, ????????????????????? ???????????? ??????????????? ???????????????????????????????????????????????? ????????????????????????????????????."

#: ../modules/SetupUI/scim_panel_gtk_setup.cpp:446
msgid "If this option is checked, the stick icon will be showed on the toolbar."
msgstr "???????????? ??????????????????????????? ????????????????????????????????????????????????, ??????????????? ????????????????????? ???????????????????????????????????????????????? ????????????????????????????????????."

#: ../modules/SetupUI/scim_panel_gtk_setup.cpp:450
msgid "If this option is checked, the menu icon will be showed on the toolbar."
msgstr "???????????? ??????????????????????????? ????????????????????????????????????????????????, ??????????????? ????????????????????? ???????????????????????????????????????????????? ????????????????????????????????????."

#: ../modules/SetupUI/scim_panel_gtk_setup.cpp:454
msgid "If this option is checked, the help icon will be showed on the toolbar."
msgstr "???????????? ??????????????????????????? ????????????????????????????????????????????????, ???????????? ????????????????????? ???????????????????????????????????????????????? ????????????????????????????????????."

#: ../modules/SetupUI/scim_panel_gtk_setup.cpp:458
msgid ""
"If this option is checked, the text label of input method properties will be "
"showed on the toolbar."
msgstr "???????????? ??????????????????????????? ????????????????????????????????????????????????, ????????????????????? ???????????? ?????????????????????????????? ????????? ?????????????????? ???????????????????????????????????????????????? ????????????????????????????????????."

#: ../modules/SetupUI/scim_panel_gtk_setup.cpp:462
msgid ""
"If this option is checked, the lookup table will be embedded into the input "
"window."
msgstr "???????????? ??????????????????????????? ????????????????????????????????????????????????, ????????????????????? ????????????????????? ?????????????????????????????? ?????????????????????????????????????????????."

#: ../modules/SetupUI/scim_panel_gtk_setup.cpp:467
msgid "If this option is checked, the lookup table will be displayed vertically."
msgstr "???????????? ??????????????????????????? ????????????????????????????????????????????????, ????????????????????? ????????????????????????????????? ????????????????????????."

#: ../modules/SetupUI/scim_panel_gtk_setup.cpp:472
msgid ""
"If this option is checked, the tray icon will be showed on the desktop's "
"taskbar."
msgstr "???????????? ??????????????????????????? ????????????????????????????????????????????????, ??????????????? ????????????????????? ????????????????????? ???????????????????????????????????? ????????????????????????????????????."

#: ../modules/SetupUI/scim_panel_gtk_setup.cpp:476
msgid ""
"If this option is checked, the toolbar, input and lookup table windows will "
"be sticked to its original position."
msgstr "???????????? ??????????????????????????? ????????????????????????????????????????????????, ????????????????????????????????????, ????????????????????? ????????????????????? ????????????????????? ??????????????????????????? ???????????? ??????????????????????????? ?????????????????????????????????."

#: ../modules/SetupUI/scim_panel_gtk_setup.cpp:482
msgid "The font setting will be used in the input and lookup table windows."
msgstr "??????????????????????????? ??????????????? ????????????????????????????????? ??????????????????????????????????????????????????? ????????????????????? ????????????????????????????????? ???????????????????????????."

#: ../modules/SetupUI/scim_panel_gtk_setup.cpp:801
msgid "Select Interface Font"
msgstr "????????????????????? ????????????????????????????????? ?????????????????????????????????????????????"

#: ../extras/setup/scim_setup_ui.cpp:47
msgid "SCIM"
msgstr "SCIM"

#: ../extras/setup/scim_setup_ui.cpp:48
msgid "FrontEnd"
msgstr "???????????????????????????"

#: ../extras/setup/scim_setup_ui.cpp:49
msgid "IMEngine"
msgstr "IMEngine"

#: ../extras/setup/scim_setup_ui.cpp:50
msgid "Panel"
msgstr "???????????????"

#: ../extras/setup/scim_setup_ui.cpp:51
msgid "Extra"
msgstr "??????????????????"

#.
#. vi:ts=4:nowrap:ai:expandtab
#.
#: ../extras/setup/scim_setup_ui.cpp:230
#: ../extras/setup/scim-setup.desktop.in.h:1
msgid "SCIM Input Method Setup"
msgstr "SCIM ????????????????????? ???????????? ???????????????"

#: ../extras/setup/scim_setup_ui.cpp:369
msgid ""
" <span size=\"20000\">Smart Common Input Method platform</span> \n"
"\n"
"<span size=\"16000\" style=\"italic\">GUI Setup Utility</span>\n"
"\n"
"\n"
"\n"
"<span size=\"12000\">Copyright 2002-2004, James Su &lt;suzhe at tsinghua.org."
"cn&gt;</span>"
msgstr ""
" <span size=\"20000\">Smart Common Input Method platform</span> \n"
"\n"
"<span size=\"16000\" style=\"italic\">?????????????????? ??????????????? ????????????</span>\n"
"\n"
"\n"
"\n"
"<span size=\"12000\">????????????????????????????????? 2002-2004, James Su &lt;suzhe at tsinghua.org."
"cn&gt;</span>"

#: ../extras/setup/scim_setup_ui.cpp:394
#, c-format
msgid "<span size=\"x-large\">The Setup for %s modules.</span>"
msgstr "<span size=\"x-large\">%s ?????????????????????????????????????????? ???????????????.</span>"

#: ../extras/setup/scim_setup_ui.cpp:456
msgid "Are you sure you want to quit SCIM Setup?"
msgstr "????????????????????? SCIM ??????????????? ?????????????????? ????????????????????? ?????????????????????????"

#: ../extras/setup/scim_setup_ui.cpp:685
msgid ""
"Not all configuration can be reloaded on the fly. Don't forget to restart "
"SCIM in order to let all of the new configuration take effect."
msgstr "????????????????????? ?????????????????????????????? ???????????????????????? ?????????????????????????????????. ????????????????????? ??????????????? ?????????????????????????????? ????????????????????? SCIM ??? ???????????????????????? ??????????????????????????????."

#: ../extras/setup/scim_setup_helper.cpp:49
msgid "SCIM Setup"
msgstr "SCIM ???????????????"

#: ../extras/setup/scim_setup_helper.cpp:51
msgid "Integrated Setup Utility based on GTK Widget library."
msgstr "GTK ???????????? ???????????????????????? ????????????????????????????????? ??????????????? ?????????????????????????????????????????????????????? ??????????????? ????????????."

#: ../extras/setup/scim-setup.desktop.in.h:2
msgid "Setup utility for Smart Common Input Method platform"
msgstr "Smart Common Input Method ?????????????????????????????? ??????????????? ????????????"

#: ../extras/panel/scim_panel_gtk.cpp:982
msgid "SCIM Help"
msgstr "SCIM ????????????"

#: ../extras/panel/scim_panel_gtk.cpp:999
msgid "Smart Common Input Method"
msgstr "Smart Common Input Method"

#: ../extras/panel/scim_panel_gtk.cpp:1058
msgid "Stick/unstick the input window and the toolbar."
msgstr "?????????????????????/?????????????????? ????????????????????? ?????????????????? ????????????????????? ????????????????????????????????????."

#: ../extras/panel/scim_panel_gtk.cpp:1063
msgid "Show a brief help about SCIM and the current input method."
msgstr "SCIM ????????????????????? ?????????????????? ????????????????????? ???????????? ??????????????? ?????????????????????????????? ?????????????????? ???????????????????????????."

#: ../extras/panel/scim_panel_gtk.cpp:1068
msgid "Show command menu."
msgstr "?????????????????? ????????????????????? ???????????????????????????."

#: ../extras/panel/scim_panel_gtk.cpp:2306
msgid ""
"\n"
"(C) 2002-2005 James Su <suzhe at tsinghua.org.cn>"
msgstr ""
"\n"
"(C) 2002-2005 James Su <suzhe at tsinghua.org.cn>"

#. Reload Configuration.
#: ../extras/panel/scim_panel_gtk.cpp:2385
msgid "Reload Configuration"
msgstr "?????????????????????????????? ???????????????????????? ????????????????????????"

#. Stick
#: ../extras/panel/scim_panel_gtk.cpp:2395
msgid "Stick Windows"
msgstr "????????????????????? ???????????????????????????"

#. Toolbar
#: ../extras/panel/scim_panel_gtk.cpp:2404
msgid "Hide Toolbar"
msgstr "?????????????????????????????????????????? ????????????????????????"

#. Help
#: ../extras/panel/scim_panel_gtk.cpp:2413
msgid "Help ..."
msgstr "???????????? ..."

#. Clients exit.
#: ../extras/panel/scim_panel_gtk.cpp:2431
msgid "Exit"
msgstr "?????????????????????????????????"

#: ../utils/scimstringview.c:196
msgid "Cursor Position"
msgstr "?????????????????????????????? ????????????"

#: ../utils/scimstringview.c:197
msgid "The current position of the insertion cursor in chars."
msgstr "?????????????????????????????????????????? ??????????????????????????? ???????????????????????????????????????????????? ?????????????????? ????????????."

#: ../utils/scimstringview.c:206
msgid "Maximum length"
msgstr "???????????????????????? ???????????????????????????"

#: ../utils/scimstringview.c:207
msgid "Maximum number of characters for this string view. Zero if no maximum."
msgstr "???????????? ?????? ?????????????????????????????? ???????????????????????? ?????????????????????????????????????????? ???????????????????????????. ?????????????????????????????? ????????????????????????????????? ???????????????????????????."

#: ../utils/scimstringview.c:216
msgid "Maximum width"
msgstr "???????????????????????? ???????????????"

#: ../utils/scimstringview.c:217
msgid "Maximum width of this string view."
msgstr "???????????? ?????? ?????????????????????????????? ???????????????????????? ???????????????."

#: ../utils/scimstringview.c:226
msgid "Has Frame"
msgstr "?????????????????? ??????????????????"

#: ../utils/scimstringview.c:227
msgid "FALSE removes outside bevel from string view."
msgstr "??????????????? ?????? ???????????????????????????????????????????????? ??????????????????????????? ??????????????? ?????????????????????????????????."

#: ../utils/scimstringview.c:234
msgid "Draw cursor"
msgstr "?????????????????????????????????????????? ????????????????????????"

#: ../utils/scimstringview.c:235
msgid "TRUE draw blinking cursor."
msgstr "????????? ?????????????????????????????? ?????????????????????????????????????????? ????????????????????????"

#: ../utils/scimstringview.c:242
msgid "Auto move cursor"
msgstr "???????????????????????? ?????????????????????????????? ???????????????????????????"

#: ../utils/scimstringview.c:243
msgid "TRUE auto move cursor position when mouse clicking."
msgstr "????????? ???????????????????????? ?????????????????????????????? ???????????? ??????????????? ?????????????????? ?????????????????????????????? ????????????."

#: ../utils/scimstringview.c:250
msgid "Forward button press event"
msgstr "?????????????????????????????? ???????????????????????? ??????????????????????????? ?????????????????????"

#: ../utils/scimstringview.c:251
msgid "TRUE forward button press event to user program."
msgstr "????????? ??????????????? ????????????????????? ?????????????????????????????? ???????????????????????? ??????????????????????????? ?????????????????????."

#: ../utils/scimstringview.c:258
msgid "Auto resize the widget to fit the string"
msgstr "??????????????? ???????????? ?????????????????????????????? ????????????????????? ???????????????????????????????????????"

#: ../utils/scimstringview.c:259
msgid "TRUE Auto resize on."
msgstr "????????? ???????????????????????? ????????? ??????????????? ??????????????????."

#: ../utils/scimstringview.c:266
msgid "Width in chars"
msgstr "??????????????? ??????????????????????????????????????????"

#: ../utils/scimstringview.c:267
msgid "Number of characters to leave space for in the string view."
msgstr "?????? ?????????????????????????????? ?????????????????? ????????? ????????????????????? ?????????????????????????????????????????? ???????????????????????????."

#: ../utils/scimstringview.c:276
msgid "Scroll offset"
msgstr "????????????????????? ?????????????????????"

#: ../utils/scimstringview.c:277
msgid "Number of pixels of the string view scrolled off the screen to the left"
msgstr "?????? ?????????????????????????????? ???????????????????????? ????????????????????? ??????????????????????????? ???????????????????????????"

#: ../utils/scimstringview.c:286
msgid "Text"
msgstr "?????????"

#: ../utils/scimstringview.c:287
msgid "The contents of the string view"
msgstr "?????????????????????????????????????????? ???????????????????????????????????????"

#: ../utils/scimkeyselection.cpp:155
msgid "Selected _Keys:"
msgstr "????????????????????????????????????????????????????????? ????????????????????? (_K):"

#: ../utils/scimkeyselection.cpp:200
msgid "Key Code:"
msgstr "??????????????????????????????????????????:"

#: ../utils/scimkeyselection.cpp:218
msgid "..."
msgstr "..."

#: ../utils/scimkeyselection.cpp:223
msgid "Modifiers:"
msgstr "???????????????????????????:"

#: ../utils/scimkeyselection.cpp:236
msgid "_Ctrl"
msgstr "_Ctrl"

#: ../utils/scimkeyselection.cpp:240
msgid "A_lt"
msgstr "A_lt"

#: ../utils/scimkeyselection.cpp:244
msgid "_Shift"
msgstr "_Shift"

#: ../utils/scimkeyselection.cpp:248
msgid "_Release"
msgstr "_Release"

#: ../utils/scimkeyselection.cpp:258
msgid "_Meta"
msgstr "_Meta"

#: ../utils/scimkeyselection.cpp:262
msgid "S_uper"
msgstr "S_uper"

#: ../utils/scimkeyselection.cpp:266
msgid "_Hyper"
msgstr "_Hyper"

#: ../utils/scimkeyselection.cpp:331
msgid "Please enter a Key Code first."
msgstr "????????????????????? ????????? ???????????????????????????????????????????????? ??????????????????????????????."

#: ../utils/scimkeyselection.cpp:385
msgid ""
"Press a key (or a key combination).\n"
"This dialog will be closed when the key is released."
msgstr ""
"????????? ?????????????????? (?????????????????? ????????? ???????????? ?????????????????????????????????) ??????????????????????????????. \n"
"???????????? ???????????????????????? ?????????????????? ?????????????????? ???????????? ??????????????????."

#: ../utils/scimkeyselection.cpp:388
msgid "Grabbing a key."
msgstr "????????? ?????????????????? ????????????????????????"

#: ../utils/scimkeyselection.cpp:678
msgid "Key Selection"
msgstr "???????????? ?????????????????????????????????????????????"

#: ../utils/scimtrayicon.c:108
msgid "Orientation"
msgstr "?????????????????????????????????"

#: ../utils/scimtrayicon.c:109
msgid "The orientation of the tray."
msgstr "????????????????????? ?????????????????????????????????."


scim-1.4.7-translation-update-431995.patch:

Index: scim-1.4.7-translation-update-431995.patch
===================================================================
RCS file: /cvs/extras/rpms/scim/devel/scim-1.4.7-translation-update-431995.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- scim-1.4.7-translation-update-431995.patch	8 Apr 2008 14:30:52 -0000	1.1
+++ scim-1.4.7-translation-update-431995.patch	27 Jan 2009 09:07:19 -0000	1.2
@@ -5,8 +5,8 @@
  AM_CONFIG_HEADER([config.h])
  
  # Init gettext
--ALL_LINGUAS="zh_CN zh_TW ja ko de fr it cs pa fi sv nl"
-+ALL_LINGUAS="as bn_IN cs de es fi fr gu hi it ja kn ko ml mr nl pa pt_BR ru sk sv ta te vi zh_CN zh_TW"
+-ALL_LINGUAS="as bn_IN ca cs de es fi fr gu hi it ja kn ko ml mr nl pa pt_BR ru sk sv te vi zh_CN zh_TW"
++ALL_LINGUAS="as bn_IN ca cs de es fi fr gu hi it ja kn ko ml mr nl pa pt_BR ru sk sv ta te vi zh_CN zh_TW"
  AM_GNU_GETTEXT
  
  # Init libtool


Index: scim.spec
===================================================================
RCS file: /cvs/extras/rpms/scim/devel/scim.spec,v
retrieving revision 1.137
retrieving revision 1.138
diff -u -r1.137 -r1.138
--- scim.spec	2 Dec 2008 03:20:58 -0000	1.137
+++ scim.spec	27 Jan 2009 09:07:19 -0000	1.138
@@ -2,8 +2,8 @@
 %define snapshot 0%{?snapdate:1}
 
 Name:      scim
-Version:   1.4.7
-Release:   37%{?dist}
+Version:   1.4.8
+Release:   1%{?dist}
 Summary:   Smart Common Input Method platform
 
 License:   LGPLv2+
@@ -14,7 +14,7 @@
 Source2:   scim-icons-0.7.tar.gz
 Source3:   scim-system-config
 Source4:   scim-system-global
-Source5:   scim-1.4.7_translation-update.tar.bz2
+Source5:   ta.po
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: gtk2-devel, libXt-devel
@@ -31,10 +31,8 @@
 Obsoletes: iiimf-gtk <= 1:12.2, iiimf-gnome-im-switcher <= 1:12.2, iiimf-server <= 1:12.2, iiimf-x <= 1:12.2
 Patch1:    scim-add-restart.patch
 Patch7:    scim_panel_gtk-emacs-cc-style.patch
-Patch8:    initial-locale-hotkey-186861.patch
 Patch9:    scim_panel_gtk-icon-size-fixes.patch
 Patch11:   scim-1.4.5-panel-menu-fixes.patch
-Patch12:   scim-fix-unload-segfault.patch
 Patch14:   scim_x11_frontend-ic-focus-LTC27940-215953.patch
 Patch15:   scim-gtkimm-default-snooper-off-213796.patch
 Patch17:   scim-1.4.5-no-rpath-libdir.patch
@@ -50,7 +48,6 @@
 Patch28:   scim-1.4.7-xim-wrong-format.patch
 Patch29:   scim-1.4.7-bz462820.patch
 Patch30:   scim-1.4.7-imdkit-read-property-properly.patch
-Patch31:   scim-configure-libtool2.patch
 
 %description
 SCIM is a user friendly and full featured input method user interface and
@@ -152,7 +149,7 @@
 
 
 %prep
-%setup -q %{?snapdate:-n %{name}-%{version}-%{snapdate}} -a2 -a5
+%setup -q %{?snapdate:-n %{name}-%{version}-%{snapdate}} -a2
 
 cp -p scim-icons/icons/*.png data/icons
 cp -p scim-icons/pixmaps/*.png data/pixmaps
@@ -163,13 +160,12 @@
 mv configs/global{,.orig} 
 cp -p %{SOURCE4} configs/global
 
-cp -p scim_translations/*.po po
+# Tamil translation
+cp -pi %{SOURCE5} po
 
 %patch7 -p1 -b .7-emacs-ccmode~
-%patch8 -p1 -b .8-hotkey~
 %patch9 -p1 -b .9-icon-size~
 %patch11 -p1 -b .11-factory-menu~
-%patch12 -p1 -b .12-unloadsegfault~
 %patch14 -p1 -b .14-xim-focus~
 %patch15 -p1 -b .15-key-snooper~
 %patch17 -p1 -b .17-rpath~
@@ -185,15 +181,9 @@
 %patch28 -p1 -b .28-xim-wrong-format
 %patch29 -p1 -b .29-bz462820
 %patch30 -p1 -b .30-bz466657
-%patch31 -p1 -b .31-libtool2
 
-
-%if %{snapshot}
+# patch17, patch24 touch configure.ac and Makefile.am
 ./bootstrap
-%else
-# patch1, patch17, patch24 touch configure.ac and Makefile.am
-autoreconf
-%endif
 
 
 %build
@@ -321,9 +311,15 @@
 
 
 %changelog
+* Tue Jan 27 2009 Jens Petersen <petersen at redhat.com> - 1.4.8-1
+- update to 1.4.8 release
+- initial-locale-hotkey-186861.patch no longer needed
+- drop scim-1.4.7_translation-update.tar.bz2 and just add ta.po
+- update scim-1.4.7-translation-update-431995.patch
+- scim-fix-unload-segfault.patch no longer needed
+
 * Tue Dec  2 2008 Jens Petersen <petersen at redhat.com> - 1.4.7-37
 - make libs subpackage own its dirs for multilib (#473664)
-- init libtool for C++ in configure.ac to build with libtool-2.2
 
 * Fri Nov 21 2008 Huang Peng <phuang at redhat.com> - 1.4.7-36
 - Redownload scim-1.4.7.tar.gz from upstream to fix BADSOURCE.


--- initial-locale-hotkey-186861.patch DELETED ---


--- scim-configure-libtool2.patch DELETED ---


--- scim-fix-unload-segfault.patch DELETED ---



From petersen at fedoraproject.org  Tue Jan 27 09:18:54 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Tue, 27 Jan 2009 09:18:54 +0000 (UTC)
Subject: rpms/scim/devel .cvsignore,1.25,1.26 sources,1.27,1.28
Message-ID: <20090127091854.C78957010B@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/scim/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23626

Modified Files:
	.cvsignore sources 
Log Message:
upload new source


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/scim/devel/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- .cvsignore	8 Apr 2008 14:30:52 -0000	1.25
+++ .cvsignore	27 Jan 2009 09:18:24 -0000	1.26
@@ -1,3 +1 @@
-scim-icons-0.7.tar.gz
-scim-1.4.7.tar.gz
-scim-1.4.7_translation-update.tar.bz2
+scim-1.4.8.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/scim/devel/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- sources	21 Nov 2008 06:27:04 -0000	1.27
+++ sources	27 Jan 2009 09:18:24 -0000	1.28
@@ -1,3 +1 @@
-2308b7fc4a5f981d08c7f00c90a7291b  scim-icons-0.7.tar.gz
-840dcfd4264a1443478c188ff747984e  scim-1.4.7.tar.gz
-2e23aae84d2be81cd2111fb3508c21a3  scim-1.4.7_translation-update.tar.bz2
+c52da019d48df4ba44cbd01558203cc7  scim-1.4.8.tar.gz



From caolanm at fedoraproject.org  Tue Jan 27 09:22:42 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Tue, 27 Jan 2009 09:22:42 +0000 (UTC)
Subject: rpms/openoffice.org/devel workspace.cmcfixes54.patch, NONE,
	1.1 workspace.jl115.patch, NONE, 1.1 openoffice.org.spec, 1.1772,
	1.1773 openoffice.org-3.0.0.ooo94938.unopkg.handleexception.patch,
	1.1, NONE openoffice.org-3.0.1.ooo98288.ucb.neonchange.patch,
	1.1, NONE
Message-ID: <20090127092242.EB4AC7010B@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24421

Modified Files:
	openoffice.org.spec 
Added Files:
	workspace.cmcfixes54.patch workspace.jl115.patch 
Removed Files:
	openoffice.org-3.0.0.ooo94938.unopkg.handleexception.patch 
	openoffice.org-3.0.1.ooo98288.ucb.neonchange.patch 
Log Message:
rename to accepted upstream workspaces

workspace.cmcfixes54.patch:

--- NEW FILE workspace.cmcfixes54.patch ---
Index: source/ucp/webdav/NeonPropFindRequest.cxx
===================================================================
RCS file: /cvs/ucb/ucb/source/ucp/webdav/NeonPropFindRequest.cxx,v
retrieving revision 1.24
diff -u -r1.24 NeonPropFindRequest.cxx
--- openoffice.org.orig/ucb/source/ucp/webdav/NeonPropFindRequest.cxx	10 Apr 2008 15:40:55 -0000	1.24
+++ openoffice.org/ucb/source/ucp/webdav/NeonPropFindRequest.cxx	20 Jan 2009 16:21:07 -0000
@@ -103,8 +104,12 @@
 			if ( aValue.getLength() )
 			{
                 aValue = aValue.toAsciiLowerCase();
-				if ( aValue.compareTo(
-						RTL_CONSTASCII_STRINGPARAM( "<collection" ) ) == 0 )
+				if (
+				    ( aValue.compareTo(
+						RTL_CONSTASCII_STRINGPARAM( "<collection" ) ) == 0 ) ||
+				    ( aValue.compareTo(
+						RTL_CONSTASCII_STRINGPARAM( "<dav:collection" ) ) == 0 )
+				   )
 				{
 					thePropertyValue.Value
 						<<= OUString::createFromAscii( "collection" );

workspace.jl115.patch:

--- NEW FILE workspace.jl115.patch ---
diff -ru desktop/source/deployment/manager/dp_manager.cxx desktop/source/deployment/manager/dp_manager.cxx
--- openoffice.org.orig/desktop/source/deployment/manager/dp_manager.cxx	2008-10-14 16:04:24.000000000 +0100
+++ openoffice.org/desktop/source/deployment/manager/dp_manager.cxx	2008-10-14 16:06:25.000000000 +0100
@@ -1074,6 +1074,12 @@
             OSL_ENSURE( 0, ::rtl::OUStringToOString(
                             exc.Message, RTL_TEXTENCODING_UTF8 ).getStr() );
         }
+        catch (deployment::DeploymentException& exc) {
+            // ignore
+            (void) exc; // avoid warnings
+            OSL_ENSURE( 0, ::rtl::OUStringToOString(
+                            exc.Message, RTL_TEXTENCODING_UTF8 ).getStr() );
+        }
     }
     return comphelper::containerToSequence(packages);
 }


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1772
retrieving revision 1.1773
diff -u -r1.1772 -r1.1773
--- openoffice.org.spec	24 Jan 2009 22:48:22 -0000	1.1772
+++ openoffice.org.spec	27 Jan 2009 09:22:12 -0000	1.1773
@@ -108,7 +108,7 @@
 Patch37: workspace.cmcfixes50.patch
 Patch38: workspace.vcl94.patch
 Patch39: workspace.vcl95.patch
-Patch40: openoffice.org-3.0.0.ooo94938.unopkg.handleexception.patch
+Patch40: workspace.jl115.patch
 Patch41: workspace.mhu17.patch
 Patch42: openoffice.org-3.0.0.ooo95018.sal.fdwarnings.patch
 Patch43: openoffice.org-3.0.0.ooo95318.system-showicons.patch
@@ -133,7 +133,7 @@
 Patch62: workspace.fwk99.patch
 Patch63: openoffice.org-3.1.0.ooo98137.filter.redeclared-variables.patch
 Patch64: openoffice.org-3.0.1.ooo98240.sc.basicworkaround.patch
-Patch65: openoffice.org-3.0.1.ooo98288.ucb.neonchange.patch
+Patch65: workspace.cmcfixes54.patch
 Patch66: openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch
 
 %define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
@@ -1395,7 +1395,7 @@
 %patch37 -p1 -b .workspace.cmcfixes50.patch
 %patch38 -p1 -b .workspace.vcl94.patch
 %patch39 -p1 -b .workspace.vcl95.patch
-%patch40 -p1 -b .ooo94938.unopkg.handleexception.patch
+%patch40 -p1 -b .workspace.jl115.patch
 %patch41 -p1 -b .workspace.mhu17.patch
 %patch42 -p1 -b .ooo95018.sal.fdwarnings.patch
 %patch43 -p1 -b .ooo95318.system-showicons.patch
@@ -1420,7 +1420,7 @@
 %patch62 -p1 -b .workspace.fwk99.patch
 %patch63 -p1 -b .ooo98137.filter.redeclared-variables.patch
 %patch64 -p1 -b .ooo98240.sc.basicworkaround.patch
-%patch65 -p1 -b .ooo98288.ucb.neonchange.patch
+%patch65 -p1 -b .workspace.cmcfixes54.patch
 %patch66 -p1 -b .gccXXXXX.solenv.javaregistration.patch
 
 %build


--- openoffice.org-3.0.0.ooo94938.unopkg.handleexception.patch DELETED ---


--- openoffice.org-3.0.1.ooo98288.ucb.neonchange.patch DELETED ---



From jwrdegoede at fedoraproject.org  Tue Jan 27 09:24:35 2009
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Tue, 27 Jan 2009 09:24:35 +0000 (UTC)
Subject: rpms/quake3/devel quake3-1.34-rc4-demo-pak.patch, 1.1,
	1.2 quake3-1.34-syslibs.patch, 1.1, 1.2 quake3-update.autodlrc,
	1.1, 1.2 quake3.autodlrc, 1.1, 1.2 quake3.spec, 1.7,
	1.8 urbanterror.autodlrc, 1.2, 1.3 worldofpadman.autodlrc, 1.1, 1.2
Message-ID: <20090127092435.C28E07010B@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/quake3/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24867

Modified Files:
	quake3-1.34-rc4-demo-pak.patch quake3-1.34-syslibs.patch 
	quake3-update.autodlrc quake3.autodlrc quake3.spec 
	urbanterror.autodlrc worldofpadman.autodlrc 
Log Message:
* Tue Jan 27 2009 Hans de Goede <hdegoede at redhat.com> 1.34-0.10.rc4
- Update (fix) autodlrc mirror URL's (rh 481592)


quake3-1.34-rc4-demo-pak.patch:

Index: quake3-1.34-rc4-demo-pak.patch
===================================================================
RCS file: /cvs/extras/rpms/quake3/devel/quake3-1.34-rc4-demo-pak.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- quake3-1.34-rc4-demo-pak.patch	17 Jan 2008 10:04:47 -0000	1.1
+++ quake3-1.34-rc4-demo-pak.patch	27 Jan 2009 09:24:35 -0000	1.2
@@ -1,8 +1,7 @@
-diff -up quake3-1.34-rc4/code/qcommon/files.c~ quake3-1.34-rc4/code/qcommon/files.c
---- quake3-1.34-rc4/code/qcommon/files.c~	2008-01-17 10:46:50.000000000 +0100
-+++ quake3-1.34-rc4/code/qcommon/files.c	2008-01-17 10:46:50.000000000 +0100
-@@ -2916,19 +2916,17 @@ static void FS_CheckPak0( void )
- 
+diff -up quake3-1.34-rc4/code/qcommon/files.c.foobar quake3-1.34-rc4/code/qcommon/files.c
+--- quake3-1.34-rc4/code/qcommon/files.c.foobar	2009-01-27 09:56:46.000000000 +0100
++++ quake3-1.34-rc4/code/qcommon/files.c	2009-01-27 09:57:29.000000000 +0100
+@@ -2917,18 +2917,16 @@ static void FS_CheckPak0( void )
  		if(!path->pack)
  			continue;
  

quake3-1.34-syslibs.patch:

Index: quake3-1.34-syslibs.patch
===================================================================
RCS file: /cvs/extras/rpms/quake3/devel/quake3-1.34-syslibs.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- quake3-1.34-syslibs.patch	29 Sep 2007 08:04:58 -0000	1.1
+++ quake3-1.34-syslibs.patch	27 Jan 2009 09:24:35 -0000	1.2
@@ -1,6 +1,181 @@
+diff -up quake3-1.34-rc4/Makefile.syslibs quake3-1.34-rc4/Makefile
+--- quake3-1.34-rc4/Makefile.syslibs	2007-09-26 16:29:52.000000000 +0200
++++ quake3-1.34-rc4/Makefile	2009-01-27 09:55:12.000000000 +0100
+@@ -96,6 +96,10 @@ ifndef USE_OPENAL
+ USE_OPENAL=1
+ endif
+ 
++ifndef USE_SYSTEM_JPEG
++USE_SYSTEM_JPEG=1
++endif
++
+ ifndef USE_OPENAL_DLOPEN
+ USE_OPENAL_DLOPEN=0
+ endif
+@@ -180,7 +184,7 @@ ifeq ($(PLATFORM),linux)
+   endif
+   endif
+ 
+-  BASE_CFLAGS = -Wall -fno-strict-aliasing -Wimplicit -Wstrict-prototypes -pipe
++  BASE_CFLAGS = 
+ 
+   ifeq ($(USE_OPENAL),1)
+     BASE_CFLAGS += -DUSE_OPENAL=1
+@@ -200,6 +204,10 @@ ifeq ($(PLATFORM),linux)
+     BASE_CFLAGS += -DUSE_CODEC_VORBIS=1
+   endif
+ 
++  ifeq ($(USE_SYSTEM_JPEG),1)
++    BASE_CFLAGS += -DUSE_SYSTEM_JPEG=1
++  endif
++
+   ifeq ($(USE_SDL),1)
+     BASE_CFLAGS += -DUSE_SDL_VIDEO=1 -DUSE_SDL_SOUND=1 $(shell sdl-config --cflags)
+   else
+@@ -265,6 +273,10 @@ ifeq ($(PLATFORM),linux)
+     CLIENT_LDFLAGS += -lvorbisfile -lvorbis -logg
+   endif
+ 
++  ifeq ($(USE_SYSTEM_JPEG),1)
++    CLIENT_LDFLAGS += -ljpeg
++  endif
++
+   ifeq ($(ARCH),i386)
+     # linux32 make ...
+     BASE_CFLAGS += -m32
+@@ -970,40 +982,7 @@ Q3OBJ = \
+   $(B)/client/l_script.o \
+   $(B)/client/l_struct.o \
+   \
+-  $(B)/client/jcapimin.o \
+-  $(B)/client/jchuff.o   \
+-  $(B)/client/jcinit.o \
+-  $(B)/client/jccoefct.o  \
+-  $(B)/client/jccolor.o \
+-  $(B)/client/jfdctflt.o \
+-  $(B)/client/jcdctmgr.o \
+-  $(B)/client/jcphuff.o \
+-  $(B)/client/jcmainct.o \
+-  $(B)/client/jcmarker.o \
+-  $(B)/client/jcmaster.o \
+-  $(B)/client/jcomapi.o \
+-  $(B)/client/jcparam.o \
+-  $(B)/client/jcprepct.o \
+-  $(B)/client/jcsample.o \
+-  $(B)/client/jdapimin.o \
+-  $(B)/client/jdapistd.o \
+-  $(B)/client/jdatasrc.o \
+-  $(B)/client/jdcoefct.o \
+-  $(B)/client/jdcolor.o \
+-  $(B)/client/jddctmgr.o \
+-  $(B)/client/jdhuff.o \
+-  $(B)/client/jdinput.o \
+-  $(B)/client/jdmainct.o \
+-  $(B)/client/jdmarker.o \
+-  $(B)/client/jdmaster.o \
+-  $(B)/client/jdpostct.o \
+-  $(B)/client/jdsample.o \
+-  $(B)/client/jdtrans.o \
+-  $(B)/client/jerror.o \
+-  $(B)/client/jidctflt.o \
+-  $(B)/client/jmemmgr.o \
+   $(B)/client/jmemnobs.o \
+-  $(B)/client/jutils.o \
+   \
+   $(B)/client/tr_animation.o \
+   $(B)/client/tr_backend.o \
+@@ -1027,7 +1006,46 @@ Q3OBJ = \
+   $(B)/client/tr_shadows.o \
+   $(B)/client/tr_sky.o \
+   $(B)/client/tr_surface.o \
+-  $(B)/client/tr_world.o \
++  $(B)/client/tr_world.o
++
++ifneq ($(USE_SYSTEM_JPEG),1)
++  Q3OBJ += \
++    $(B)/client/jcapimin.o \
++    $(B)/client/jchuff.o   \
++    $(B)/client/jcinit.o \
++    $(B)/client/jccoefct.o  \
++    $(B)/client/jccolor.o \
++    $(B)/client/jfdctflt.o \
++    $(B)/client/jcdctmgr.o \
++    $(B)/client/jcphuff.o \
++    $(B)/client/jcmainct.o \
++    $(B)/client/jcmarker.o \
++    $(B)/client/jcmaster.o \
++    $(B)/client/jcomapi.o \
++    $(B)/client/jcparam.o \
++    $(B)/client/jcprepct.o \
++    $(B)/client/jcsample.o \
++    $(B)/client/jdapimin.o \
++    $(B)/client/jdapistd.o \
++    $(B)/client/jdatasrc.o \
++    $(B)/client/jdcoefct.o \
++    $(B)/client/jdcolor.o \
++    $(B)/client/jddctmgr.o \
++    $(B)/client/jdhuff.o \
++    $(B)/client/jdinput.o \
++    $(B)/client/jdmainct.o \
++    $(B)/client/jdmarker.o \
++    $(B)/client/jdmaster.o \
++    $(B)/client/jdpostct.o \
++    $(B)/client/jdsample.o \
++    $(B)/client/jdtrans.o \
++    $(B)/client/jerror.o \
++    $(B)/client/jidctflt.o \
++    $(B)/client/jmemmgr.o \
++    $(B)/client/jutils.o
++else
++Q3OBJ += $(B)/client/jpeg_memsrc.o
++endif
+ 
+ ifeq ($(ARCH),i386)
+   Q3OBJ += \
+diff -up quake3-1.34-rc4/code/jpeg-6/jmemnobs.c.syslibs quake3-1.34-rc4/code/jpeg-6/jmemnobs.c
+--- quake3-1.34-rc4/code/jpeg-6/jmemnobs.c.syslibs	2007-09-26 16:29:40.000000000 +0200
++++ quake3-1.34-rc4/code/jpeg-6/jmemnobs.c	2009-01-27 09:55:12.000000000 +0100
+@@ -17,10 +17,23 @@
+ 
+ #include "../renderer/tr_local.h"
+ 
++#ifdef USE_SYSTEM_JPEG
++#include <stdio.h>
++#include <stdlib.h>
++#include <jpeglib.h>
++
++#undef GLOBAL
++#define GLOBAL
++#define FAR
++
++typedef void * backing_store_ptr;
++
++#else
+ #define JPEG_INTERNALS
+ #include "jinclude.h"
+ #include "jpeglib.h"
+ #include "jmemsys.h"		/* import the system-dependent declarations */
++#endif
+ 
+ /*
+  * Memory allocation and ri.Freeing are controlled by the regular library
+@@ -83,7 +96,13 @@ GLOBAL void
+ jpeg_open_backing_store (j_common_ptr cinfo, backing_store_ptr info,
+ 			 long total_bytes_needed)
+ {
++#ifdef USE_SYSTEM_JPEG
++  fprintf(stderr,
++    "jmemnobs.c: jpeg_open_backing_store() call, this should never happen!\n");
++  exit(1);
++#else
+   ERREXIT(cinfo, JERR_NO_BACKING_STORE);
++#endif
+ }
+ 
+ 
 diff -up /dev/null quake3-1.34-rc4/code/renderer/jpeg_memsrc.c
---- /dev/null	2007-09-24 08:32:51.587004947 +0200
-+++ quake3-1.34-rc4/code/renderer/jpeg_memsrc.c	2007-09-26 14:11:49.000000000 +0200
+--- /dev/null	2009-01-27 08:51:13.290004978 +0100
++++ quake3-1.34-rc4/code/renderer/jpeg_memsrc.c	2009-01-27 09:55:12.000000000 +0100
 @@ -0,0 +1,163 @@
 +/*
 +* memsrc.c
@@ -165,9 +340,18 @@
 +src->pub.next_input_byte = buffer;
 +src->pub.bytes_in_buffer = bufsize;
 +}
+diff -up /dev/null quake3-1.34-rc4/code/renderer/jpeg_memsrc.h
+--- /dev/null	2009-01-27 08:51:13.290004978 +0100
++++ quake3-1.34-rc4/code/renderer/jpeg_memsrc.h	2009-01-27 09:55:12.000000000 +0100
+@@ -0,0 +1,5 @@
++#include <stdio.h>
++#include <jpeglib.h>
++
++void jpeg_memory_src (j_decompress_ptr cinfo, const JOCTET * buffer,
++  size_t bufsize);
 diff -up quake3-1.34-rc4/code/renderer/tr_image.c.syslibs quake3-1.34-rc4/code/renderer/tr_image.c
---- quake3-1.34-rc4/code/renderer/tr_image.c.syslibs	2007-09-25 19:37:48.000000000 +0200
-+++ quake3-1.34-rc4/code/renderer/tr_image.c	2007-09-26 14:11:49.000000000 +0200
+--- quake3-1.34-rc4/code/renderer/tr_image.c.syslibs	2007-09-26 16:29:48.000000000 +0200
++++ quake3-1.34-rc4/code/renderer/tr_image.c	2009-01-27 09:55:12.000000000 +0100
 @@ -30,9 +30,13 @@ Foundation, Inc., 51 Franklin St, Fifth 
   * You may also wish to include "jerror.h".
   */
@@ -266,187 +450,3 @@
  /*
   * Terminate destination --- called by jpeg_finish_compress
   * after all data has been written.  Usually needs to flush buffer.
-diff -up /dev/null quake3-1.34-rc4/code/renderer/jpeg_memsrc.h
---- /dev/null	2007-09-24 08:32:51.587004947 +0200
-+++ quake3-1.34-rc4/code/renderer/jpeg_memsrc.h	2007-09-26 14:11:49.000000000 +0200
-@@ -0,0 +1,5 @@
-+#include <stdio.h>
-+#include <jpeglib.h>
-+
-+void jpeg_memory_src (j_decompress_ptr cinfo, const JOCTET * buffer,
-+  size_t bufsize);
-diff -up quake3-1.34-rc4/code/jpeg-6/jmemnobs.c.syslibs quake3-1.34-rc4/code/jpeg-6/jmemnobs.c
---- quake3-1.34-rc4/code/jpeg-6/jmemnobs.c.syslibs	2007-09-26 16:17:27.000000000 +0200
-+++ quake3-1.34-rc4/code/jpeg-6/jmemnobs.c	2007-09-26 16:26:01.000000000 +0200
-@@ -15,10 +15,23 @@
-  * Note that the max_memory_to_use option is ignored by this implementation.
-  */
- 
-+#ifdef USE_SYSTEM_JPEG
-+#include <stdio.h>
-+#include <stdlib.h>
-+#include <jpeglib.h>
-+
-+#undef GLOBAL
-+#define GLOBAL
-+#define FAR
-+
-+typedef void * backing_store_ptr;
-+
-+#else
- #define JPEG_INTERNALS
- #include "jinclude.h"
- #include "jpeglib.h"
- #include "jmemsys.h"		/* import the system-dependent declarations */
-+#endif
- 
- #include "../renderer/tr_local.h"
- 
-@@ -83,7 +96,13 @@ GLOBAL void
- jpeg_open_backing_store (j_common_ptr cinfo, backing_store_ptr info,
- 			 long total_bytes_needed)
- {
-+#ifdef USE_SYSTEM_JPEG
-+  fprintf(stderr,
-+    "jmemnobs.c: jpeg_open_backing_store() call, this should never happen!\n");
-+  exit(1);
-+#else
-   ERREXIT(cinfo, JERR_NO_BACKING_STORE);
-+#endif
- }
- 
- 
-diff -up quake3-1.34-rc4/Makefile.syslibs quake3-1.34-rc4/Makefile
---- quake3-1.34-rc4/Makefile.syslibs	2007-09-25 19:37:57.000000000 +0200
-+++ quake3-1.34-rc4/Makefile	2007-09-26 16:15:46.000000000 +0200
-@@ -96,6 +96,10 @@ ifndef USE_OPENAL
- USE_OPENAL=1
- endif
- 
-+ifndef USE_SYSTEM_JPEG
-+USE_SYSTEM_JPEG=1
-+endif
-+
- ifndef USE_OPENAL_DLOPEN
- USE_OPENAL_DLOPEN=0
- endif
-@@ -180,7 +184,7 @@ ifeq ($(PLATFORM),linux)
-   endif
-   endif
- 
--  BASE_CFLAGS = -Wall -fno-strict-aliasing -Wimplicit -Wstrict-prototypes -pipe
-+  BASE_CFLAGS = 
- 
-   ifeq ($(USE_OPENAL),1)
-     BASE_CFLAGS += -DUSE_OPENAL=1
-@@ -200,6 +204,10 @@ ifeq ($(PLATFORM),linux)
-     BASE_CFLAGS += -DUSE_CODEC_VORBIS=1
-   endif
- 
-+  ifeq ($(USE_SYSTEM_JPEG),1)
-+    BASE_CFLAGS += -DUSE_SYSTEM_JPEG=1
-+  endif
-+
-   ifeq ($(USE_SDL),1)
-     BASE_CFLAGS += -DUSE_SDL_VIDEO=1 -DUSE_SDL_SOUND=1 $(shell sdl-config --cflags)
-   else
-@@ -265,6 +273,10 @@ ifeq ($(PLATFORM),linux)
-     CLIENT_LDFLAGS += -lvorbisfile -lvorbis -logg
-   endif
- 
-+  ifeq ($(USE_SYSTEM_JPEG),1)
-+    CLIENT_LDFLAGS += -ljpeg
-+  endif
-+
-   ifeq ($(ARCH),i386)
-     # linux32 make ...
-     BASE_CFLAGS += -m32
-@@ -970,40 +982,7 @@ Q3OBJ = \
-   $(B)/client/l_script.o \
-   $(B)/client/l_struct.o \
-   \
--  $(B)/client/jcapimin.o \
--  $(B)/client/jchuff.o   \
--  $(B)/client/jcinit.o \
--  $(B)/client/jccoefct.o  \
--  $(B)/client/jccolor.o \
--  $(B)/client/jfdctflt.o \
--  $(B)/client/jcdctmgr.o \
--  $(B)/client/jcphuff.o \
--  $(B)/client/jcmainct.o \
--  $(B)/client/jcmarker.o \
--  $(B)/client/jcmaster.o \
--  $(B)/client/jcomapi.o \
--  $(B)/client/jcparam.o \
--  $(B)/client/jcprepct.o \
--  $(B)/client/jcsample.o \
--  $(B)/client/jdapimin.o \
--  $(B)/client/jdapistd.o \
--  $(B)/client/jdatasrc.o \
--  $(B)/client/jdcoefct.o \
--  $(B)/client/jdcolor.o \
--  $(B)/client/jddctmgr.o \
--  $(B)/client/jdhuff.o \
--  $(B)/client/jdinput.o \
--  $(B)/client/jdmainct.o \
--  $(B)/client/jdmarker.o \
--  $(B)/client/jdmaster.o \
--  $(B)/client/jdpostct.o \
--  $(B)/client/jdsample.o \
--  $(B)/client/jdtrans.o \
--  $(B)/client/jerror.o \
--  $(B)/client/jidctflt.o \
--  $(B)/client/jmemmgr.o \
-   $(B)/client/jmemnobs.o \
--  $(B)/client/jutils.o \
-   \
-   $(B)/client/tr_animation.o \
-   $(B)/client/tr_backend.o \
-@@ -1027,7 +1006,46 @@ Q3OBJ = \
-   $(B)/client/tr_shadows.o \
-   $(B)/client/tr_sky.o \
-   $(B)/client/tr_surface.o \
--  $(B)/client/tr_world.o \
-+  $(B)/client/tr_world.o
-+
-+ifneq ($(USE_SYSTEM_JPEG),1)
-+  Q3OBJ += \
-+    $(B)/client/jcapimin.o \
-+    $(B)/client/jchuff.o   \
-+    $(B)/client/jcinit.o \
-+    $(B)/client/jccoefct.o  \
-+    $(B)/client/jccolor.o \
-+    $(B)/client/jfdctflt.o \
-+    $(B)/client/jcdctmgr.o \
-+    $(B)/client/jcphuff.o \
-+    $(B)/client/jcmainct.o \
-+    $(B)/client/jcmarker.o \
-+    $(B)/client/jcmaster.o \
-+    $(B)/client/jcomapi.o \
-+    $(B)/client/jcparam.o \
-+    $(B)/client/jcprepct.o \
-+    $(B)/client/jcsample.o \
-+    $(B)/client/jdapimin.o \
-+    $(B)/client/jdapistd.o \
-+    $(B)/client/jdatasrc.o \
-+    $(B)/client/jdcoefct.o \
-+    $(B)/client/jdcolor.o \
-+    $(B)/client/jddctmgr.o \
-+    $(B)/client/jdhuff.o \
-+    $(B)/client/jdinput.o \
-+    $(B)/client/jdmainct.o \
-+    $(B)/client/jdmarker.o \
-+    $(B)/client/jdmaster.o \
-+    $(B)/client/jdpostct.o \
-+    $(B)/client/jdsample.o \
-+    $(B)/client/jdtrans.o \
-+    $(B)/client/jerror.o \
-+    $(B)/client/jidctflt.o \
-+    $(B)/client/jmemmgr.o \
-+    $(B)/client/jutils.o
-+else
-+Q3OBJ += $(B)/client/jpeg_memsrc.o
-+endif
- 
- ifeq ($(ARCH),i386)
-   Q3OBJ += \


Index: quake3-update.autodlrc
===================================================================
RCS file: /cvs/extras/rpms/quake3/devel/quake3-update.autodlrc,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- quake3-update.autodlrc	13 Dec 2007 12:24:27 -0000	1.1
+++ quake3-update.autodlrc	27 Jan 2009 09:24:35 -0000	1.2
@@ -110,11 +110,7 @@
 	[PATH]$HOME/.q3a[/PATH]
 	[MIRRORS]
 		[URL]ftp://ftp.fu-berlin.de/pc/games/idgames/idstuff/quake3/linux/linuxq3apoint-1.32b-3.x86.run[/URL]
-		[URL]ftp://ftp.cs.rpi.edu/mirrors/FreeBSD/ports/distfiles/linuxq3apoint-1.32b-3.x86.run[/URL]
-		[URL]ftp://ftp.informatik.rwth-aachen.de/pub/mirror/FreeBSD/ports/distfiles/linuxq3apoint-1.32b-3.x86.run[/URL]
-		[URL]ftp://ftp.sunsite.org.uk/sites/ftp.idsoftware.com/idstuff/quake3/linux/linuxq3apoint-1.32b-3.x86.run[/URL]
 		[URL]ftp://ftp.univie.ac.at/systems/FreeBSD/ports/distfiles/linuxq3apoint-1.32b-3.x86.run[/URL]
-		[URL]ftp://sunsite.cnlab-switch.ch/mirror/FreeBSD/ports/distfiles/linuxq3apoint-1.32b-3.x86.run[/URL]
 		[URL]ftp://ftp.idsoftware.com/idstuff/quake3/linux/linuxq3apoint-1.32b-3.x86.run[/URL]
 	[/MIRRORS]
 [/FILE]


Index: quake3.autodlrc
===================================================================
RCS file: /cvs/extras/rpms/quake3/devel/quake3.autodlrc,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- quake3.autodlrc	29 Sep 2007 08:04:58 -0000	1.1
+++ quake3.autodlrc	27 Jan 2009 09:24:35 -0000	1.2
@@ -74,11 +74,7 @@
 	[PATH]$HOME/.q3a[/PATH]
 	[MIRRORS]
 		[URL]ftp://ftp.fu-berlin.de/pc/games/idgames/idstuff/quake3/linux/linuxq3ademo-1.11-6.x86.gz.sh[/URL]
-		[URL]ftp://ftp.cs.rpi.edu/mirrors/FreeBSD/ports/distfiles/linuxq3ademo-1.11-6.x86.gz.sh[/URL]
-		[URL]ftp://ftp.informatik.rwth-aachen.de/pub/mirror/FreeBSD/ports/distfiles/linuxq3ademo-1.11-6.x86.gz.sh[/URL]
-		[URL]ftp://ftp.sunsite.org.uk/sites/ftp.idsoftware.com/idstuff/quake3/linux/linuxq3ademo-1.11-6.x86.gz.sh[/URL]
 		[URL]ftp://ftp.univie.ac.at/systems/FreeBSD/ports/distfiles/linuxq3ademo-1.11-6.x86.gz.sh[/URL]
-		[URL]ftp://sunsite.cnlab-switch.ch/mirror/FreeBSD/ports/distfiles/linuxq3ademo-1.11-6.x86.gz.sh[/URL]
 		[URL]ftp://ftp.idsoftware.com/idstuff/quake3/linux/linuxq3ademo-1.11-6.x86.gz.sh[/URL]
 	[/MIRRORS]
 [/FILE]


Index: quake3.spec
===================================================================
RCS file: /cvs/extras/rpms/quake3/devel/quake3.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- quake3.spec	19 Feb 2008 09:33:28 -0000	1.7
+++ quake3.spec	27 Jan 2009 09:24:35 -0000	1.8
@@ -2,7 +2,7 @@
 
 Name:           quake3
 Version:        1.34
-Release:        0.9.%{prever}%{?dist}
+Release:        0.10.%{prever}%{?dist}
 Summary:        Quake 3 Arena engine (ioquake3 version)
 Group:          Amusements/Games
 License:        GPLv2+
@@ -271,6 +271,9 @@
 
 
 %changelog
+* Tue Jan 27 2009 Hans de Goede <hdegoede at redhat.com> 1.34-0.10.rc4
+- Update (fix) autodlrc mirror URL's (rh 481592)
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1.34-0.9.rc4
 - Autorebuild for GCC 4.3
 


Index: urbanterror.autodlrc
===================================================================
RCS file: /cvs/extras/rpms/quake3/devel/urbanterror.autodlrc,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- urbanterror.autodlrc	23 Dec 2007 18:53:49 -0000	1.2
+++ urbanterror.autodlrc	27 Jan 2009 09:24:35 -0000	1.3
@@ -20,12 +20,10 @@
 	[MD5]1370306ea236f65f595e7ca70765e469[/MD5]
 	[PATH]$HOME/.q3a[/PATH]
 	[MIRRORS]
+		[URL]ftp://ftp.snt.utwente.nl/pub/games/urbanterror/UrbanTerror_41_FULL.zip[/URL]
+		[URL]http://dls.urt.voxel.net/q3ut4/UrbanTerror_41_FULL.zip[/URL]
 		[URL]http://vlaai.snt.utwente.nl/pub/games/urbanterror/UrbanTerror_41_FULL.zip[/URL]
-		[URL]http://www.complex-microcosm.com/4711_UrbanTerror_41_FULL.zip[/URL]
-		[URL]http://mirror.kickassctf.com/UrbanTerror_41_FULL.zip[/URL]
-		[URL]http://mrsentry.net/release/UrbanTerror_41_FULL.zip[/URL]
-		[URL]http://www.iourt.com/urt41/UrbanTerror_41_FULL.zip[/URL]
-		[URL]http://mirror.ncsa.uiuc.edu/ut4/urbanterror/UrbanTerror_41_FULL.zip[/URL]
+		[URL]http://files.uaaportal.com/gamefiles/current-version/UrbanTerror_41_FULL.zip[/URL]
 	[/MIRRORS]
 [/FILE]
 [/FILELIST]


Index: worldofpadman.autodlrc
===================================================================
RCS file: /cvs/extras/rpms/quake3/devel/worldofpadman.autodlrc,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- worldofpadman.autodlrc	23 Dec 2007 14:40:07 -0000	1.1
+++ worldofpadman.autodlrc	27 Jan 2009 09:24:35 -0000	1.2
@@ -29,8 +29,6 @@
 		[URL]ftp://ftp.snt.utwente.nl/pub/games/worldofpadman/linux/worldofpadman.run[/URL]
 		[URL]http://thilo.kickchat.com/download/worldofpadman.run[/URL]
 		[URL]http://btc3x6.che.uni-bayreuth.de/~tl/wop_final/worldofpadman.run[/URL]
-		[URL]http://www.extreme-players.de/download.php?id=12217[/URL]
-		[URL]http://download.cfs.game-host.org/get.php?get=/pub/games/wop/worldofpadman.run[/URL]
 	[/MIRRORS]
 [/FILE]
 [FILE]



From jwrdegoede at fedoraproject.org  Tue Jan 27 09:29:09 2009
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Tue, 27 Jan 2009 09:29:09 +0000 (UTC)
Subject: rpms/quake3/F-10 quake3-1.34-rc4-demo-pak.patch, 1.1,
	1.2 quake3-1.34-syslibs.patch, 1.1, 1.2 quake3-update.autodlrc,
	1.1, 1.2 quake3.autodlrc, 1.1, 1.2 quake3.spec, 1.7,
	1.8 urbanterror.autodlrc, 1.2, 1.3 worldofpadman.autodlrc, 1.1, 1.2
Message-ID: <20090127092909.720B37010B@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/quake3/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25747

Modified Files:
	quake3-1.34-rc4-demo-pak.patch quake3-1.34-syslibs.patch 
	quake3-update.autodlrc quake3.autodlrc quake3.spec 
	urbanterror.autodlrc worldofpadman.autodlrc 
Log Message:
* Tue Jan 27 2009 Hans de Goede <hdegoede at redhat.com> 1.34-0.10.rc4
- Update (fix) autodlrc mirror URL's (rh 481592)


quake3-1.34-rc4-demo-pak.patch:

Index: quake3-1.34-rc4-demo-pak.patch
===================================================================
RCS file: /cvs/extras/rpms/quake3/F-10/quake3-1.34-rc4-demo-pak.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- quake3-1.34-rc4-demo-pak.patch	17 Jan 2008 10:04:47 -0000	1.1
+++ quake3-1.34-rc4-demo-pak.patch	27 Jan 2009 09:28:38 -0000	1.2
@@ -1,8 +1,7 @@
-diff -up quake3-1.34-rc4/code/qcommon/files.c~ quake3-1.34-rc4/code/qcommon/files.c
---- quake3-1.34-rc4/code/qcommon/files.c~	2008-01-17 10:46:50.000000000 +0100
-+++ quake3-1.34-rc4/code/qcommon/files.c	2008-01-17 10:46:50.000000000 +0100
-@@ -2916,19 +2916,17 @@ static void FS_CheckPak0( void )
- 
+diff -up quake3-1.34-rc4/code/qcommon/files.c.foobar quake3-1.34-rc4/code/qcommon/files.c
+--- quake3-1.34-rc4/code/qcommon/files.c.foobar	2009-01-27 09:56:46.000000000 +0100
++++ quake3-1.34-rc4/code/qcommon/files.c	2009-01-27 09:57:29.000000000 +0100
+@@ -2917,18 +2917,16 @@ static void FS_CheckPak0( void )
  		if(!path->pack)
  			continue;
  

quake3-1.34-syslibs.patch:

Index: quake3-1.34-syslibs.patch
===================================================================
RCS file: /cvs/extras/rpms/quake3/F-10/quake3-1.34-syslibs.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- quake3-1.34-syslibs.patch	29 Sep 2007 08:04:58 -0000	1.1
+++ quake3-1.34-syslibs.patch	27 Jan 2009 09:28:38 -0000	1.2
@@ -1,6 +1,181 @@
+diff -up quake3-1.34-rc4/Makefile.syslibs quake3-1.34-rc4/Makefile
+--- quake3-1.34-rc4/Makefile.syslibs	2007-09-26 16:29:52.000000000 +0200
++++ quake3-1.34-rc4/Makefile	2009-01-27 09:55:12.000000000 +0100
+@@ -96,6 +96,10 @@ ifndef USE_OPENAL
+ USE_OPENAL=1
+ endif
+ 
++ifndef USE_SYSTEM_JPEG
++USE_SYSTEM_JPEG=1
++endif
++
+ ifndef USE_OPENAL_DLOPEN
+ USE_OPENAL_DLOPEN=0
+ endif
+@@ -180,7 +184,7 @@ ifeq ($(PLATFORM),linux)
+   endif
+   endif
+ 
+-  BASE_CFLAGS = -Wall -fno-strict-aliasing -Wimplicit -Wstrict-prototypes -pipe
++  BASE_CFLAGS = 
+ 
+   ifeq ($(USE_OPENAL),1)
+     BASE_CFLAGS += -DUSE_OPENAL=1
+@@ -200,6 +204,10 @@ ifeq ($(PLATFORM),linux)
+     BASE_CFLAGS += -DUSE_CODEC_VORBIS=1
+   endif
+ 
++  ifeq ($(USE_SYSTEM_JPEG),1)
++    BASE_CFLAGS += -DUSE_SYSTEM_JPEG=1
++  endif
++
+   ifeq ($(USE_SDL),1)
+     BASE_CFLAGS += -DUSE_SDL_VIDEO=1 -DUSE_SDL_SOUND=1 $(shell sdl-config --cflags)
+   else
+@@ -265,6 +273,10 @@ ifeq ($(PLATFORM),linux)
+     CLIENT_LDFLAGS += -lvorbisfile -lvorbis -logg
+   endif
+ 
++  ifeq ($(USE_SYSTEM_JPEG),1)
++    CLIENT_LDFLAGS += -ljpeg
++  endif
++
+   ifeq ($(ARCH),i386)
+     # linux32 make ...
+     BASE_CFLAGS += -m32
+@@ -970,40 +982,7 @@ Q3OBJ = \
+   $(B)/client/l_script.o \
+   $(B)/client/l_struct.o \
+   \
+-  $(B)/client/jcapimin.o \
+-  $(B)/client/jchuff.o   \
+-  $(B)/client/jcinit.o \
+-  $(B)/client/jccoefct.o  \
+-  $(B)/client/jccolor.o \
+-  $(B)/client/jfdctflt.o \
+-  $(B)/client/jcdctmgr.o \
+-  $(B)/client/jcphuff.o \
+-  $(B)/client/jcmainct.o \
+-  $(B)/client/jcmarker.o \
+-  $(B)/client/jcmaster.o \
+-  $(B)/client/jcomapi.o \
+-  $(B)/client/jcparam.o \
+-  $(B)/client/jcprepct.o \
+-  $(B)/client/jcsample.o \
+-  $(B)/client/jdapimin.o \
+-  $(B)/client/jdapistd.o \
+-  $(B)/client/jdatasrc.o \
+-  $(B)/client/jdcoefct.o \
+-  $(B)/client/jdcolor.o \
+-  $(B)/client/jddctmgr.o \
+-  $(B)/client/jdhuff.o \
+-  $(B)/client/jdinput.o \
+-  $(B)/client/jdmainct.o \
+-  $(B)/client/jdmarker.o \
+-  $(B)/client/jdmaster.o \
+-  $(B)/client/jdpostct.o \
+-  $(B)/client/jdsample.o \
+-  $(B)/client/jdtrans.o \
+-  $(B)/client/jerror.o \
+-  $(B)/client/jidctflt.o \
+-  $(B)/client/jmemmgr.o \
+   $(B)/client/jmemnobs.o \
+-  $(B)/client/jutils.o \
+   \
+   $(B)/client/tr_animation.o \
+   $(B)/client/tr_backend.o \
+@@ -1027,7 +1006,46 @@ Q3OBJ = \
+   $(B)/client/tr_shadows.o \
+   $(B)/client/tr_sky.o \
+   $(B)/client/tr_surface.o \
+-  $(B)/client/tr_world.o \
++  $(B)/client/tr_world.o
++
++ifneq ($(USE_SYSTEM_JPEG),1)
++  Q3OBJ += \
++    $(B)/client/jcapimin.o \
++    $(B)/client/jchuff.o   \
++    $(B)/client/jcinit.o \
++    $(B)/client/jccoefct.o  \
++    $(B)/client/jccolor.o \
++    $(B)/client/jfdctflt.o \
++    $(B)/client/jcdctmgr.o \
++    $(B)/client/jcphuff.o \
++    $(B)/client/jcmainct.o \
++    $(B)/client/jcmarker.o \
++    $(B)/client/jcmaster.o \
++    $(B)/client/jcomapi.o \
++    $(B)/client/jcparam.o \
++    $(B)/client/jcprepct.o \
++    $(B)/client/jcsample.o \
++    $(B)/client/jdapimin.o \
++    $(B)/client/jdapistd.o \
++    $(B)/client/jdatasrc.o \
++    $(B)/client/jdcoefct.o \
++    $(B)/client/jdcolor.o \
++    $(B)/client/jddctmgr.o \
++    $(B)/client/jdhuff.o \
++    $(B)/client/jdinput.o \
++    $(B)/client/jdmainct.o \
++    $(B)/client/jdmarker.o \
++    $(B)/client/jdmaster.o \
++    $(B)/client/jdpostct.o \
++    $(B)/client/jdsample.o \
++    $(B)/client/jdtrans.o \
++    $(B)/client/jerror.o \
++    $(B)/client/jidctflt.o \
++    $(B)/client/jmemmgr.o \
++    $(B)/client/jutils.o
++else
++Q3OBJ += $(B)/client/jpeg_memsrc.o
++endif
+ 
+ ifeq ($(ARCH),i386)
+   Q3OBJ += \
+diff -up quake3-1.34-rc4/code/jpeg-6/jmemnobs.c.syslibs quake3-1.34-rc4/code/jpeg-6/jmemnobs.c
+--- quake3-1.34-rc4/code/jpeg-6/jmemnobs.c.syslibs	2007-09-26 16:29:40.000000000 +0200
++++ quake3-1.34-rc4/code/jpeg-6/jmemnobs.c	2009-01-27 09:55:12.000000000 +0100
+@@ -17,10 +17,23 @@
+ 
+ #include "../renderer/tr_local.h"
+ 
++#ifdef USE_SYSTEM_JPEG
++#include <stdio.h>
++#include <stdlib.h>
++#include <jpeglib.h>
++
++#undef GLOBAL
++#define GLOBAL
++#define FAR
++
++typedef void * backing_store_ptr;
++
++#else
+ #define JPEG_INTERNALS
+ #include "jinclude.h"
+ #include "jpeglib.h"
+ #include "jmemsys.h"		/* import the system-dependent declarations */
++#endif
+ 
+ /*
+  * Memory allocation and ri.Freeing are controlled by the regular library
+@@ -83,7 +96,13 @@ GLOBAL void
+ jpeg_open_backing_store (j_common_ptr cinfo, backing_store_ptr info,
+ 			 long total_bytes_needed)
+ {
++#ifdef USE_SYSTEM_JPEG
++  fprintf(stderr,
++    "jmemnobs.c: jpeg_open_backing_store() call, this should never happen!\n");
++  exit(1);
++#else
+   ERREXIT(cinfo, JERR_NO_BACKING_STORE);
++#endif
+ }
+ 
+ 
 diff -up /dev/null quake3-1.34-rc4/code/renderer/jpeg_memsrc.c
---- /dev/null	2007-09-24 08:32:51.587004947 +0200
-+++ quake3-1.34-rc4/code/renderer/jpeg_memsrc.c	2007-09-26 14:11:49.000000000 +0200
+--- /dev/null	2009-01-27 08:51:13.290004978 +0100
++++ quake3-1.34-rc4/code/renderer/jpeg_memsrc.c	2009-01-27 09:55:12.000000000 +0100
 @@ -0,0 +1,163 @@
 +/*
 +* memsrc.c
@@ -165,9 +340,18 @@
 +src->pub.next_input_byte = buffer;
 +src->pub.bytes_in_buffer = bufsize;
 +}
+diff -up /dev/null quake3-1.34-rc4/code/renderer/jpeg_memsrc.h
+--- /dev/null	2009-01-27 08:51:13.290004978 +0100
++++ quake3-1.34-rc4/code/renderer/jpeg_memsrc.h	2009-01-27 09:55:12.000000000 +0100
+@@ -0,0 +1,5 @@
++#include <stdio.h>
++#include <jpeglib.h>
++
++void jpeg_memory_src (j_decompress_ptr cinfo, const JOCTET * buffer,
++  size_t bufsize);
 diff -up quake3-1.34-rc4/code/renderer/tr_image.c.syslibs quake3-1.34-rc4/code/renderer/tr_image.c
---- quake3-1.34-rc4/code/renderer/tr_image.c.syslibs	2007-09-25 19:37:48.000000000 +0200
-+++ quake3-1.34-rc4/code/renderer/tr_image.c	2007-09-26 14:11:49.000000000 +0200
+--- quake3-1.34-rc4/code/renderer/tr_image.c.syslibs	2007-09-26 16:29:48.000000000 +0200
++++ quake3-1.34-rc4/code/renderer/tr_image.c	2009-01-27 09:55:12.000000000 +0100
 @@ -30,9 +30,13 @@ Foundation, Inc., 51 Franklin St, Fifth 
   * You may also wish to include "jerror.h".
   */
@@ -266,187 +450,3 @@
  /*
   * Terminate destination --- called by jpeg_finish_compress
   * after all data has been written.  Usually needs to flush buffer.
-diff -up /dev/null quake3-1.34-rc4/code/renderer/jpeg_memsrc.h
---- /dev/null	2007-09-24 08:32:51.587004947 +0200
-+++ quake3-1.34-rc4/code/renderer/jpeg_memsrc.h	2007-09-26 14:11:49.000000000 +0200
-@@ -0,0 +1,5 @@
-+#include <stdio.h>
-+#include <jpeglib.h>
-+
-+void jpeg_memory_src (j_decompress_ptr cinfo, const JOCTET * buffer,
-+  size_t bufsize);
-diff -up quake3-1.34-rc4/code/jpeg-6/jmemnobs.c.syslibs quake3-1.34-rc4/code/jpeg-6/jmemnobs.c
---- quake3-1.34-rc4/code/jpeg-6/jmemnobs.c.syslibs	2007-09-26 16:17:27.000000000 +0200
-+++ quake3-1.34-rc4/code/jpeg-6/jmemnobs.c	2007-09-26 16:26:01.000000000 +0200
-@@ -15,10 +15,23 @@
-  * Note that the max_memory_to_use option is ignored by this implementation.
-  */
- 
-+#ifdef USE_SYSTEM_JPEG
-+#include <stdio.h>
-+#include <stdlib.h>
-+#include <jpeglib.h>
-+
-+#undef GLOBAL
-+#define GLOBAL
-+#define FAR
-+
-+typedef void * backing_store_ptr;
-+
-+#else
- #define JPEG_INTERNALS
- #include "jinclude.h"
- #include "jpeglib.h"
- #include "jmemsys.h"		/* import the system-dependent declarations */
-+#endif
- 
- #include "../renderer/tr_local.h"
- 
-@@ -83,7 +96,13 @@ GLOBAL void
- jpeg_open_backing_store (j_common_ptr cinfo, backing_store_ptr info,
- 			 long total_bytes_needed)
- {
-+#ifdef USE_SYSTEM_JPEG
-+  fprintf(stderr,
-+    "jmemnobs.c: jpeg_open_backing_store() call, this should never happen!\n");
-+  exit(1);
-+#else
-   ERREXIT(cinfo, JERR_NO_BACKING_STORE);
-+#endif
- }
- 
- 
-diff -up quake3-1.34-rc4/Makefile.syslibs quake3-1.34-rc4/Makefile
---- quake3-1.34-rc4/Makefile.syslibs	2007-09-25 19:37:57.000000000 +0200
-+++ quake3-1.34-rc4/Makefile	2007-09-26 16:15:46.000000000 +0200
-@@ -96,6 +96,10 @@ ifndef USE_OPENAL
- USE_OPENAL=1
- endif
- 
-+ifndef USE_SYSTEM_JPEG
-+USE_SYSTEM_JPEG=1
-+endif
-+
- ifndef USE_OPENAL_DLOPEN
- USE_OPENAL_DLOPEN=0
- endif
-@@ -180,7 +184,7 @@ ifeq ($(PLATFORM),linux)
-   endif
-   endif
- 
--  BASE_CFLAGS = -Wall -fno-strict-aliasing -Wimplicit -Wstrict-prototypes -pipe
-+  BASE_CFLAGS = 
- 
-   ifeq ($(USE_OPENAL),1)
-     BASE_CFLAGS += -DUSE_OPENAL=1
-@@ -200,6 +204,10 @@ ifeq ($(PLATFORM),linux)
-     BASE_CFLAGS += -DUSE_CODEC_VORBIS=1
-   endif
- 
-+  ifeq ($(USE_SYSTEM_JPEG),1)
-+    BASE_CFLAGS += -DUSE_SYSTEM_JPEG=1
-+  endif
-+
-   ifeq ($(USE_SDL),1)
-     BASE_CFLAGS += -DUSE_SDL_VIDEO=1 -DUSE_SDL_SOUND=1 $(shell sdl-config --cflags)
-   else
-@@ -265,6 +273,10 @@ ifeq ($(PLATFORM),linux)
-     CLIENT_LDFLAGS += -lvorbisfile -lvorbis -logg
-   endif
- 
-+  ifeq ($(USE_SYSTEM_JPEG),1)
-+    CLIENT_LDFLAGS += -ljpeg
-+  endif
-+
-   ifeq ($(ARCH),i386)
-     # linux32 make ...
-     BASE_CFLAGS += -m32
-@@ -970,40 +982,7 @@ Q3OBJ = \
-   $(B)/client/l_script.o \
-   $(B)/client/l_struct.o \
-   \
--  $(B)/client/jcapimin.o \
--  $(B)/client/jchuff.o   \
--  $(B)/client/jcinit.o \
--  $(B)/client/jccoefct.o  \
--  $(B)/client/jccolor.o \
--  $(B)/client/jfdctflt.o \
--  $(B)/client/jcdctmgr.o \
--  $(B)/client/jcphuff.o \
--  $(B)/client/jcmainct.o \
--  $(B)/client/jcmarker.o \
--  $(B)/client/jcmaster.o \
--  $(B)/client/jcomapi.o \
--  $(B)/client/jcparam.o \
--  $(B)/client/jcprepct.o \
--  $(B)/client/jcsample.o \
--  $(B)/client/jdapimin.o \
--  $(B)/client/jdapistd.o \
--  $(B)/client/jdatasrc.o \
--  $(B)/client/jdcoefct.o \
--  $(B)/client/jdcolor.o \
--  $(B)/client/jddctmgr.o \
--  $(B)/client/jdhuff.o \
--  $(B)/client/jdinput.o \
--  $(B)/client/jdmainct.o \
--  $(B)/client/jdmarker.o \
--  $(B)/client/jdmaster.o \
--  $(B)/client/jdpostct.o \
--  $(B)/client/jdsample.o \
--  $(B)/client/jdtrans.o \
--  $(B)/client/jerror.o \
--  $(B)/client/jidctflt.o \
--  $(B)/client/jmemmgr.o \
-   $(B)/client/jmemnobs.o \
--  $(B)/client/jutils.o \
-   \
-   $(B)/client/tr_animation.o \
-   $(B)/client/tr_backend.o \
-@@ -1027,7 +1006,46 @@ Q3OBJ = \
-   $(B)/client/tr_shadows.o \
-   $(B)/client/tr_sky.o \
-   $(B)/client/tr_surface.o \
--  $(B)/client/tr_world.o \
-+  $(B)/client/tr_world.o
-+
-+ifneq ($(USE_SYSTEM_JPEG),1)
-+  Q3OBJ += \
-+    $(B)/client/jcapimin.o \
-+    $(B)/client/jchuff.o   \
-+    $(B)/client/jcinit.o \
-+    $(B)/client/jccoefct.o  \
-+    $(B)/client/jccolor.o \
-+    $(B)/client/jfdctflt.o \
-+    $(B)/client/jcdctmgr.o \
-+    $(B)/client/jcphuff.o \
-+    $(B)/client/jcmainct.o \
-+    $(B)/client/jcmarker.o \
-+    $(B)/client/jcmaster.o \
-+    $(B)/client/jcomapi.o \
-+    $(B)/client/jcparam.o \
-+    $(B)/client/jcprepct.o \
-+    $(B)/client/jcsample.o \
-+    $(B)/client/jdapimin.o \
-+    $(B)/client/jdapistd.o \
-+    $(B)/client/jdatasrc.o \
-+    $(B)/client/jdcoefct.o \
-+    $(B)/client/jdcolor.o \
-+    $(B)/client/jddctmgr.o \
-+    $(B)/client/jdhuff.o \
-+    $(B)/client/jdinput.o \
-+    $(B)/client/jdmainct.o \
-+    $(B)/client/jdmarker.o \
-+    $(B)/client/jdmaster.o \
-+    $(B)/client/jdpostct.o \
-+    $(B)/client/jdsample.o \
-+    $(B)/client/jdtrans.o \
-+    $(B)/client/jerror.o \
-+    $(B)/client/jidctflt.o \
-+    $(B)/client/jmemmgr.o \
-+    $(B)/client/jutils.o
-+else
-+Q3OBJ += $(B)/client/jpeg_memsrc.o
-+endif
- 
- ifeq ($(ARCH),i386)
-   Q3OBJ += \


Index: quake3-update.autodlrc
===================================================================
RCS file: /cvs/extras/rpms/quake3/F-10/quake3-update.autodlrc,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- quake3-update.autodlrc	13 Dec 2007 12:24:27 -0000	1.1
+++ quake3-update.autodlrc	27 Jan 2009 09:28:38 -0000	1.2
@@ -110,11 +110,7 @@
 	[PATH]$HOME/.q3a[/PATH]
 	[MIRRORS]
 		[URL]ftp://ftp.fu-berlin.de/pc/games/idgames/idstuff/quake3/linux/linuxq3apoint-1.32b-3.x86.run[/URL]
-		[URL]ftp://ftp.cs.rpi.edu/mirrors/FreeBSD/ports/distfiles/linuxq3apoint-1.32b-3.x86.run[/URL]
-		[URL]ftp://ftp.informatik.rwth-aachen.de/pub/mirror/FreeBSD/ports/distfiles/linuxq3apoint-1.32b-3.x86.run[/URL]
-		[URL]ftp://ftp.sunsite.org.uk/sites/ftp.idsoftware.com/idstuff/quake3/linux/linuxq3apoint-1.32b-3.x86.run[/URL]
 		[URL]ftp://ftp.univie.ac.at/systems/FreeBSD/ports/distfiles/linuxq3apoint-1.32b-3.x86.run[/URL]
-		[URL]ftp://sunsite.cnlab-switch.ch/mirror/FreeBSD/ports/distfiles/linuxq3apoint-1.32b-3.x86.run[/URL]
 		[URL]ftp://ftp.idsoftware.com/idstuff/quake3/linux/linuxq3apoint-1.32b-3.x86.run[/URL]
 	[/MIRRORS]
 [/FILE]


Index: quake3.autodlrc
===================================================================
RCS file: /cvs/extras/rpms/quake3/F-10/quake3.autodlrc,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- quake3.autodlrc	29 Sep 2007 08:04:58 -0000	1.1
+++ quake3.autodlrc	27 Jan 2009 09:28:38 -0000	1.2
@@ -74,11 +74,7 @@
 	[PATH]$HOME/.q3a[/PATH]
 	[MIRRORS]
 		[URL]ftp://ftp.fu-berlin.de/pc/games/idgames/idstuff/quake3/linux/linuxq3ademo-1.11-6.x86.gz.sh[/URL]
-		[URL]ftp://ftp.cs.rpi.edu/mirrors/FreeBSD/ports/distfiles/linuxq3ademo-1.11-6.x86.gz.sh[/URL]
-		[URL]ftp://ftp.informatik.rwth-aachen.de/pub/mirror/FreeBSD/ports/distfiles/linuxq3ademo-1.11-6.x86.gz.sh[/URL]
-		[URL]ftp://ftp.sunsite.org.uk/sites/ftp.idsoftware.com/idstuff/quake3/linux/linuxq3ademo-1.11-6.x86.gz.sh[/URL]
 		[URL]ftp://ftp.univie.ac.at/systems/FreeBSD/ports/distfiles/linuxq3ademo-1.11-6.x86.gz.sh[/URL]
-		[URL]ftp://sunsite.cnlab-switch.ch/mirror/FreeBSD/ports/distfiles/linuxq3ademo-1.11-6.x86.gz.sh[/URL]
 		[URL]ftp://ftp.idsoftware.com/idstuff/quake3/linux/linuxq3ademo-1.11-6.x86.gz.sh[/URL]
 	[/MIRRORS]
 [/FILE]


Index: quake3.spec
===================================================================
RCS file: /cvs/extras/rpms/quake3/F-10/quake3.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- quake3.spec	19 Feb 2008 09:33:28 -0000	1.7
+++ quake3.spec	27 Jan 2009 09:28:38 -0000	1.8
@@ -2,7 +2,7 @@
 
 Name:           quake3
 Version:        1.34
-Release:        0.9.%{prever}%{?dist}
+Release:        0.10.%{prever}%{?dist}
 Summary:        Quake 3 Arena engine (ioquake3 version)
 Group:          Amusements/Games
 License:        GPLv2+
@@ -271,6 +271,9 @@
 
 
 %changelog
+* Tue Jan 27 2009 Hans de Goede <hdegoede at redhat.com> 1.34-0.10.rc4
+- Update (fix) autodlrc mirror URL's (rh 481592)
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1.34-0.9.rc4
 - Autorebuild for GCC 4.3
 


Index: urbanterror.autodlrc
===================================================================
RCS file: /cvs/extras/rpms/quake3/F-10/urbanterror.autodlrc,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- urbanterror.autodlrc	23 Dec 2007 18:53:49 -0000	1.2
+++ urbanterror.autodlrc	27 Jan 2009 09:28:38 -0000	1.3
@@ -20,12 +20,10 @@
 	[MD5]1370306ea236f65f595e7ca70765e469[/MD5]
 	[PATH]$HOME/.q3a[/PATH]
 	[MIRRORS]
+		[URL]ftp://ftp.snt.utwente.nl/pub/games/urbanterror/UrbanTerror_41_FULL.zip[/URL]
+		[URL]http://dls.urt.voxel.net/q3ut4/UrbanTerror_41_FULL.zip[/URL]
 		[URL]http://vlaai.snt.utwente.nl/pub/games/urbanterror/UrbanTerror_41_FULL.zip[/URL]
-		[URL]http://www.complex-microcosm.com/4711_UrbanTerror_41_FULL.zip[/URL]
-		[URL]http://mirror.kickassctf.com/UrbanTerror_41_FULL.zip[/URL]
-		[URL]http://mrsentry.net/release/UrbanTerror_41_FULL.zip[/URL]
-		[URL]http://www.iourt.com/urt41/UrbanTerror_41_FULL.zip[/URL]
-		[URL]http://mirror.ncsa.uiuc.edu/ut4/urbanterror/UrbanTerror_41_FULL.zip[/URL]
+		[URL]http://files.uaaportal.com/gamefiles/current-version/UrbanTerror_41_FULL.zip[/URL]
 	[/MIRRORS]
 [/FILE]
 [/FILELIST]


Index: worldofpadman.autodlrc
===================================================================
RCS file: /cvs/extras/rpms/quake3/F-10/worldofpadman.autodlrc,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- worldofpadman.autodlrc	23 Dec 2007 14:40:07 -0000	1.1
+++ worldofpadman.autodlrc	27 Jan 2009 09:28:38 -0000	1.2
@@ -29,8 +29,6 @@
 		[URL]ftp://ftp.snt.utwente.nl/pub/games/worldofpadman/linux/worldofpadman.run[/URL]
 		[URL]http://thilo.kickchat.com/download/worldofpadman.run[/URL]
 		[URL]http://btc3x6.che.uni-bayreuth.de/~tl/wop_final/worldofpadman.run[/URL]
-		[URL]http://www.extreme-players.de/download.php?id=12217[/URL]
-		[URL]http://download.cfs.game-host.org/get.php?get=/pub/games/wop/worldofpadman.run[/URL]
 	[/MIRRORS]
 [/FILE]
 [FILE]



From jwrdegoede at fedoraproject.org  Tue Jan 27 09:31:00 2009
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Tue, 27 Jan 2009 09:31:00 +0000 (UTC)
Subject: rpms/quake3/F-9 quake3-1.34-rc4-demo-pak.patch, 1.1,
	1.2 quake3-1.34-syslibs.patch, 1.1, 1.2 quake3-update.autodlrc,
	1.1, 1.2 quake3.autodlrc, 1.1, 1.2 quake3.spec, 1.7,
	1.8 urbanterror.autodlrc, 1.2, 1.3 worldofpadman.autodlrc, 1.1, 1.2
Message-ID: <20090127093100.AFBC27010B@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/quake3/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26333

Modified Files:
	quake3-1.34-rc4-demo-pak.patch quake3-1.34-syslibs.patch 
	quake3-update.autodlrc quake3.autodlrc quake3.spec 
	urbanterror.autodlrc worldofpadman.autodlrc 
Log Message:
* Tue Jan 27 2009 Hans de Goede <hdegoede at redhat.com> 1.34-0.10.rc4
- Update (fix) autodlrc mirror URL's (rh 481592)


quake3-1.34-rc4-demo-pak.patch:

Index: quake3-1.34-rc4-demo-pak.patch
===================================================================
RCS file: /cvs/extras/rpms/quake3/F-9/quake3-1.34-rc4-demo-pak.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- quake3-1.34-rc4-demo-pak.patch	17 Jan 2008 10:04:47 -0000	1.1
+++ quake3-1.34-rc4-demo-pak.patch	27 Jan 2009 09:31:00 -0000	1.2
@@ -1,8 +1,7 @@
-diff -up quake3-1.34-rc4/code/qcommon/files.c~ quake3-1.34-rc4/code/qcommon/files.c
---- quake3-1.34-rc4/code/qcommon/files.c~	2008-01-17 10:46:50.000000000 +0100
-+++ quake3-1.34-rc4/code/qcommon/files.c	2008-01-17 10:46:50.000000000 +0100
-@@ -2916,19 +2916,17 @@ static void FS_CheckPak0( void )
- 
+diff -up quake3-1.34-rc4/code/qcommon/files.c.foobar quake3-1.34-rc4/code/qcommon/files.c
+--- quake3-1.34-rc4/code/qcommon/files.c.foobar	2009-01-27 09:56:46.000000000 +0100
++++ quake3-1.34-rc4/code/qcommon/files.c	2009-01-27 09:57:29.000000000 +0100
+@@ -2917,18 +2917,16 @@ static void FS_CheckPak0( void )
  		if(!path->pack)
  			continue;
  

quake3-1.34-syslibs.patch:

Index: quake3-1.34-syslibs.patch
===================================================================
RCS file: /cvs/extras/rpms/quake3/F-9/quake3-1.34-syslibs.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- quake3-1.34-syslibs.patch	29 Sep 2007 08:04:58 -0000	1.1
+++ quake3-1.34-syslibs.patch	27 Jan 2009 09:31:00 -0000	1.2
@@ -1,6 +1,181 @@
+diff -up quake3-1.34-rc4/Makefile.syslibs quake3-1.34-rc4/Makefile
+--- quake3-1.34-rc4/Makefile.syslibs	2007-09-26 16:29:52.000000000 +0200
++++ quake3-1.34-rc4/Makefile	2009-01-27 09:55:12.000000000 +0100
+@@ -96,6 +96,10 @@ ifndef USE_OPENAL
+ USE_OPENAL=1
+ endif
+ 
++ifndef USE_SYSTEM_JPEG
++USE_SYSTEM_JPEG=1
++endif
++
+ ifndef USE_OPENAL_DLOPEN
+ USE_OPENAL_DLOPEN=0
+ endif
+@@ -180,7 +184,7 @@ ifeq ($(PLATFORM),linux)
+   endif
+   endif
+ 
+-  BASE_CFLAGS = -Wall -fno-strict-aliasing -Wimplicit -Wstrict-prototypes -pipe
++  BASE_CFLAGS = 
+ 
+   ifeq ($(USE_OPENAL),1)
+     BASE_CFLAGS += -DUSE_OPENAL=1
+@@ -200,6 +204,10 @@ ifeq ($(PLATFORM),linux)
+     BASE_CFLAGS += -DUSE_CODEC_VORBIS=1
+   endif
+ 
++  ifeq ($(USE_SYSTEM_JPEG),1)
++    BASE_CFLAGS += -DUSE_SYSTEM_JPEG=1
++  endif
++
+   ifeq ($(USE_SDL),1)
+     BASE_CFLAGS += -DUSE_SDL_VIDEO=1 -DUSE_SDL_SOUND=1 $(shell sdl-config --cflags)
+   else
+@@ -265,6 +273,10 @@ ifeq ($(PLATFORM),linux)
+     CLIENT_LDFLAGS += -lvorbisfile -lvorbis -logg
+   endif
+ 
++  ifeq ($(USE_SYSTEM_JPEG),1)
++    CLIENT_LDFLAGS += -ljpeg
++  endif
++
+   ifeq ($(ARCH),i386)
+     # linux32 make ...
+     BASE_CFLAGS += -m32
+@@ -970,40 +982,7 @@ Q3OBJ = \
+   $(B)/client/l_script.o \
+   $(B)/client/l_struct.o \
+   \
+-  $(B)/client/jcapimin.o \
+-  $(B)/client/jchuff.o   \
+-  $(B)/client/jcinit.o \
+-  $(B)/client/jccoefct.o  \
+-  $(B)/client/jccolor.o \
+-  $(B)/client/jfdctflt.o \
+-  $(B)/client/jcdctmgr.o \
+-  $(B)/client/jcphuff.o \
+-  $(B)/client/jcmainct.o \
+-  $(B)/client/jcmarker.o \
+-  $(B)/client/jcmaster.o \
+-  $(B)/client/jcomapi.o \
+-  $(B)/client/jcparam.o \
+-  $(B)/client/jcprepct.o \
+-  $(B)/client/jcsample.o \
+-  $(B)/client/jdapimin.o \
+-  $(B)/client/jdapistd.o \
+-  $(B)/client/jdatasrc.o \
+-  $(B)/client/jdcoefct.o \
+-  $(B)/client/jdcolor.o \
+-  $(B)/client/jddctmgr.o \
+-  $(B)/client/jdhuff.o \
+-  $(B)/client/jdinput.o \
+-  $(B)/client/jdmainct.o \
+-  $(B)/client/jdmarker.o \
+-  $(B)/client/jdmaster.o \
+-  $(B)/client/jdpostct.o \
+-  $(B)/client/jdsample.o \
+-  $(B)/client/jdtrans.o \
+-  $(B)/client/jerror.o \
+-  $(B)/client/jidctflt.o \
+-  $(B)/client/jmemmgr.o \
+   $(B)/client/jmemnobs.o \
+-  $(B)/client/jutils.o \
+   \
+   $(B)/client/tr_animation.o \
+   $(B)/client/tr_backend.o \
+@@ -1027,7 +1006,46 @@ Q3OBJ = \
+   $(B)/client/tr_shadows.o \
+   $(B)/client/tr_sky.o \
+   $(B)/client/tr_surface.o \
+-  $(B)/client/tr_world.o \
++  $(B)/client/tr_world.o
++
++ifneq ($(USE_SYSTEM_JPEG),1)
++  Q3OBJ += \
++    $(B)/client/jcapimin.o \
++    $(B)/client/jchuff.o   \
++    $(B)/client/jcinit.o \
++    $(B)/client/jccoefct.o  \
++    $(B)/client/jccolor.o \
++    $(B)/client/jfdctflt.o \
++    $(B)/client/jcdctmgr.o \
++    $(B)/client/jcphuff.o \
++    $(B)/client/jcmainct.o \
++    $(B)/client/jcmarker.o \
++    $(B)/client/jcmaster.o \
++    $(B)/client/jcomapi.o \
++    $(B)/client/jcparam.o \
++    $(B)/client/jcprepct.o \
++    $(B)/client/jcsample.o \
++    $(B)/client/jdapimin.o \
++    $(B)/client/jdapistd.o \
++    $(B)/client/jdatasrc.o \
++    $(B)/client/jdcoefct.o \
++    $(B)/client/jdcolor.o \
++    $(B)/client/jddctmgr.o \
++    $(B)/client/jdhuff.o \
++    $(B)/client/jdinput.o \
++    $(B)/client/jdmainct.o \
++    $(B)/client/jdmarker.o \
++    $(B)/client/jdmaster.o \
++    $(B)/client/jdpostct.o \
++    $(B)/client/jdsample.o \
++    $(B)/client/jdtrans.o \
++    $(B)/client/jerror.o \
++    $(B)/client/jidctflt.o \
++    $(B)/client/jmemmgr.o \
++    $(B)/client/jutils.o
++else
++Q3OBJ += $(B)/client/jpeg_memsrc.o
++endif
+ 
+ ifeq ($(ARCH),i386)
+   Q3OBJ += \
+diff -up quake3-1.34-rc4/code/jpeg-6/jmemnobs.c.syslibs quake3-1.34-rc4/code/jpeg-6/jmemnobs.c
+--- quake3-1.34-rc4/code/jpeg-6/jmemnobs.c.syslibs	2007-09-26 16:29:40.000000000 +0200
++++ quake3-1.34-rc4/code/jpeg-6/jmemnobs.c	2009-01-27 09:55:12.000000000 +0100
+@@ -17,10 +17,23 @@
+ 
+ #include "../renderer/tr_local.h"
+ 
++#ifdef USE_SYSTEM_JPEG
++#include <stdio.h>
++#include <stdlib.h>
++#include <jpeglib.h>
++
++#undef GLOBAL
++#define GLOBAL
++#define FAR
++
++typedef void * backing_store_ptr;
++
++#else
+ #define JPEG_INTERNALS
+ #include "jinclude.h"
+ #include "jpeglib.h"
+ #include "jmemsys.h"		/* import the system-dependent declarations */
++#endif
+ 
+ /*
+  * Memory allocation and ri.Freeing are controlled by the regular library
+@@ -83,7 +96,13 @@ GLOBAL void
+ jpeg_open_backing_store (j_common_ptr cinfo, backing_store_ptr info,
+ 			 long total_bytes_needed)
+ {
++#ifdef USE_SYSTEM_JPEG
++  fprintf(stderr,
++    "jmemnobs.c: jpeg_open_backing_store() call, this should never happen!\n");
++  exit(1);
++#else
+   ERREXIT(cinfo, JERR_NO_BACKING_STORE);
++#endif
+ }
+ 
+ 
 diff -up /dev/null quake3-1.34-rc4/code/renderer/jpeg_memsrc.c
---- /dev/null	2007-09-24 08:32:51.587004947 +0200
-+++ quake3-1.34-rc4/code/renderer/jpeg_memsrc.c	2007-09-26 14:11:49.000000000 +0200
+--- /dev/null	2009-01-27 08:51:13.290004978 +0100
++++ quake3-1.34-rc4/code/renderer/jpeg_memsrc.c	2009-01-27 09:55:12.000000000 +0100
 @@ -0,0 +1,163 @@
 +/*
 +* memsrc.c
@@ -165,9 +340,18 @@
 +src->pub.next_input_byte = buffer;
 +src->pub.bytes_in_buffer = bufsize;
 +}
+diff -up /dev/null quake3-1.34-rc4/code/renderer/jpeg_memsrc.h
+--- /dev/null	2009-01-27 08:51:13.290004978 +0100
++++ quake3-1.34-rc4/code/renderer/jpeg_memsrc.h	2009-01-27 09:55:12.000000000 +0100
+@@ -0,0 +1,5 @@
++#include <stdio.h>
++#include <jpeglib.h>
++
++void jpeg_memory_src (j_decompress_ptr cinfo, const JOCTET * buffer,
++  size_t bufsize);
 diff -up quake3-1.34-rc4/code/renderer/tr_image.c.syslibs quake3-1.34-rc4/code/renderer/tr_image.c
---- quake3-1.34-rc4/code/renderer/tr_image.c.syslibs	2007-09-25 19:37:48.000000000 +0200
-+++ quake3-1.34-rc4/code/renderer/tr_image.c	2007-09-26 14:11:49.000000000 +0200
+--- quake3-1.34-rc4/code/renderer/tr_image.c.syslibs	2007-09-26 16:29:48.000000000 +0200
++++ quake3-1.34-rc4/code/renderer/tr_image.c	2009-01-27 09:55:12.000000000 +0100
 @@ -30,9 +30,13 @@ Foundation, Inc., 51 Franklin St, Fifth 
   * You may also wish to include "jerror.h".
   */
@@ -266,187 +450,3 @@
  /*
   * Terminate destination --- called by jpeg_finish_compress
   * after all data has been written.  Usually needs to flush buffer.
-diff -up /dev/null quake3-1.34-rc4/code/renderer/jpeg_memsrc.h
---- /dev/null	2007-09-24 08:32:51.587004947 +0200
-+++ quake3-1.34-rc4/code/renderer/jpeg_memsrc.h	2007-09-26 14:11:49.000000000 +0200
-@@ -0,0 +1,5 @@
-+#include <stdio.h>
-+#include <jpeglib.h>
-+
-+void jpeg_memory_src (j_decompress_ptr cinfo, const JOCTET * buffer,
-+  size_t bufsize);
-diff -up quake3-1.34-rc4/code/jpeg-6/jmemnobs.c.syslibs quake3-1.34-rc4/code/jpeg-6/jmemnobs.c
---- quake3-1.34-rc4/code/jpeg-6/jmemnobs.c.syslibs	2007-09-26 16:17:27.000000000 +0200
-+++ quake3-1.34-rc4/code/jpeg-6/jmemnobs.c	2007-09-26 16:26:01.000000000 +0200
-@@ -15,10 +15,23 @@
-  * Note that the max_memory_to_use option is ignored by this implementation.
-  */
- 
-+#ifdef USE_SYSTEM_JPEG
-+#include <stdio.h>
-+#include <stdlib.h>
-+#include <jpeglib.h>
-+
-+#undef GLOBAL
-+#define GLOBAL
-+#define FAR
-+
-+typedef void * backing_store_ptr;
-+
-+#else
- #define JPEG_INTERNALS
- #include "jinclude.h"
- #include "jpeglib.h"
- #include "jmemsys.h"		/* import the system-dependent declarations */
-+#endif
- 
- #include "../renderer/tr_local.h"
- 
-@@ -83,7 +96,13 @@ GLOBAL void
- jpeg_open_backing_store (j_common_ptr cinfo, backing_store_ptr info,
- 			 long total_bytes_needed)
- {
-+#ifdef USE_SYSTEM_JPEG
-+  fprintf(stderr,
-+    "jmemnobs.c: jpeg_open_backing_store() call, this should never happen!\n");
-+  exit(1);
-+#else
-   ERREXIT(cinfo, JERR_NO_BACKING_STORE);
-+#endif
- }
- 
- 
-diff -up quake3-1.34-rc4/Makefile.syslibs quake3-1.34-rc4/Makefile
---- quake3-1.34-rc4/Makefile.syslibs	2007-09-25 19:37:57.000000000 +0200
-+++ quake3-1.34-rc4/Makefile	2007-09-26 16:15:46.000000000 +0200
-@@ -96,6 +96,10 @@ ifndef USE_OPENAL
- USE_OPENAL=1
- endif
- 
-+ifndef USE_SYSTEM_JPEG
-+USE_SYSTEM_JPEG=1
-+endif
-+
- ifndef USE_OPENAL_DLOPEN
- USE_OPENAL_DLOPEN=0
- endif
-@@ -180,7 +184,7 @@ ifeq ($(PLATFORM),linux)
-   endif
-   endif
- 
--  BASE_CFLAGS = -Wall -fno-strict-aliasing -Wimplicit -Wstrict-prototypes -pipe
-+  BASE_CFLAGS = 
- 
-   ifeq ($(USE_OPENAL),1)
-     BASE_CFLAGS += -DUSE_OPENAL=1
-@@ -200,6 +204,10 @@ ifeq ($(PLATFORM),linux)
-     BASE_CFLAGS += -DUSE_CODEC_VORBIS=1
-   endif
- 
-+  ifeq ($(USE_SYSTEM_JPEG),1)
-+    BASE_CFLAGS += -DUSE_SYSTEM_JPEG=1
-+  endif
-+
-   ifeq ($(USE_SDL),1)
-     BASE_CFLAGS += -DUSE_SDL_VIDEO=1 -DUSE_SDL_SOUND=1 $(shell sdl-config --cflags)
-   else
-@@ -265,6 +273,10 @@ ifeq ($(PLATFORM),linux)
-     CLIENT_LDFLAGS += -lvorbisfile -lvorbis -logg
-   endif
- 
-+  ifeq ($(USE_SYSTEM_JPEG),1)
-+    CLIENT_LDFLAGS += -ljpeg
-+  endif
-+
-   ifeq ($(ARCH),i386)
-     # linux32 make ...
-     BASE_CFLAGS += -m32
-@@ -970,40 +982,7 @@ Q3OBJ = \
-   $(B)/client/l_script.o \
-   $(B)/client/l_struct.o \
-   \
--  $(B)/client/jcapimin.o \
--  $(B)/client/jchuff.o   \
--  $(B)/client/jcinit.o \
--  $(B)/client/jccoefct.o  \
--  $(B)/client/jccolor.o \
--  $(B)/client/jfdctflt.o \
--  $(B)/client/jcdctmgr.o \
--  $(B)/client/jcphuff.o \
--  $(B)/client/jcmainct.o \
--  $(B)/client/jcmarker.o \
--  $(B)/client/jcmaster.o \
--  $(B)/client/jcomapi.o \
--  $(B)/client/jcparam.o \
--  $(B)/client/jcprepct.o \
--  $(B)/client/jcsample.o \
--  $(B)/client/jdapimin.o \
--  $(B)/client/jdapistd.o \
--  $(B)/client/jdatasrc.o \
--  $(B)/client/jdcoefct.o \
--  $(B)/client/jdcolor.o \
--  $(B)/client/jddctmgr.o \
--  $(B)/client/jdhuff.o \
--  $(B)/client/jdinput.o \
--  $(B)/client/jdmainct.o \
--  $(B)/client/jdmarker.o \
--  $(B)/client/jdmaster.o \
--  $(B)/client/jdpostct.o \
--  $(B)/client/jdsample.o \
--  $(B)/client/jdtrans.o \
--  $(B)/client/jerror.o \
--  $(B)/client/jidctflt.o \
--  $(B)/client/jmemmgr.o \
-   $(B)/client/jmemnobs.o \
--  $(B)/client/jutils.o \
-   \
-   $(B)/client/tr_animation.o \
-   $(B)/client/tr_backend.o \
-@@ -1027,7 +1006,46 @@ Q3OBJ = \
-   $(B)/client/tr_shadows.o \
-   $(B)/client/tr_sky.o \
-   $(B)/client/tr_surface.o \
--  $(B)/client/tr_world.o \
-+  $(B)/client/tr_world.o
-+
-+ifneq ($(USE_SYSTEM_JPEG),1)
-+  Q3OBJ += \
-+    $(B)/client/jcapimin.o \
-+    $(B)/client/jchuff.o   \
-+    $(B)/client/jcinit.o \
-+    $(B)/client/jccoefct.o  \
-+    $(B)/client/jccolor.o \
-+    $(B)/client/jfdctflt.o \
-+    $(B)/client/jcdctmgr.o \
-+    $(B)/client/jcphuff.o \
-+    $(B)/client/jcmainct.o \
-+    $(B)/client/jcmarker.o \
-+    $(B)/client/jcmaster.o \
-+    $(B)/client/jcomapi.o \
-+    $(B)/client/jcparam.o \
-+    $(B)/client/jcprepct.o \
-+    $(B)/client/jcsample.o \
-+    $(B)/client/jdapimin.o \
-+    $(B)/client/jdapistd.o \
-+    $(B)/client/jdatasrc.o \
-+    $(B)/client/jdcoefct.o \
-+    $(B)/client/jdcolor.o \
-+    $(B)/client/jddctmgr.o \
-+    $(B)/client/jdhuff.o \
-+    $(B)/client/jdinput.o \
-+    $(B)/client/jdmainct.o \
-+    $(B)/client/jdmarker.o \
-+    $(B)/client/jdmaster.o \
-+    $(B)/client/jdpostct.o \
-+    $(B)/client/jdsample.o \
-+    $(B)/client/jdtrans.o \
-+    $(B)/client/jerror.o \
-+    $(B)/client/jidctflt.o \
-+    $(B)/client/jmemmgr.o \
-+    $(B)/client/jutils.o
-+else
-+Q3OBJ += $(B)/client/jpeg_memsrc.o
-+endif
- 
- ifeq ($(ARCH),i386)
-   Q3OBJ += \


Index: quake3-update.autodlrc
===================================================================
RCS file: /cvs/extras/rpms/quake3/F-9/quake3-update.autodlrc,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- quake3-update.autodlrc	13 Dec 2007 12:24:27 -0000	1.1
+++ quake3-update.autodlrc	27 Jan 2009 09:31:00 -0000	1.2
@@ -110,11 +110,7 @@
 	[PATH]$HOME/.q3a[/PATH]
 	[MIRRORS]
 		[URL]ftp://ftp.fu-berlin.de/pc/games/idgames/idstuff/quake3/linux/linuxq3apoint-1.32b-3.x86.run[/URL]
-		[URL]ftp://ftp.cs.rpi.edu/mirrors/FreeBSD/ports/distfiles/linuxq3apoint-1.32b-3.x86.run[/URL]
-		[URL]ftp://ftp.informatik.rwth-aachen.de/pub/mirror/FreeBSD/ports/distfiles/linuxq3apoint-1.32b-3.x86.run[/URL]
-		[URL]ftp://ftp.sunsite.org.uk/sites/ftp.idsoftware.com/idstuff/quake3/linux/linuxq3apoint-1.32b-3.x86.run[/URL]
 		[URL]ftp://ftp.univie.ac.at/systems/FreeBSD/ports/distfiles/linuxq3apoint-1.32b-3.x86.run[/URL]
-		[URL]ftp://sunsite.cnlab-switch.ch/mirror/FreeBSD/ports/distfiles/linuxq3apoint-1.32b-3.x86.run[/URL]
 		[URL]ftp://ftp.idsoftware.com/idstuff/quake3/linux/linuxq3apoint-1.32b-3.x86.run[/URL]
 	[/MIRRORS]
 [/FILE]


Index: quake3.autodlrc
===================================================================
RCS file: /cvs/extras/rpms/quake3/F-9/quake3.autodlrc,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- quake3.autodlrc	29 Sep 2007 08:04:58 -0000	1.1
+++ quake3.autodlrc	27 Jan 2009 09:31:00 -0000	1.2
@@ -74,11 +74,7 @@
 	[PATH]$HOME/.q3a[/PATH]
 	[MIRRORS]
 		[URL]ftp://ftp.fu-berlin.de/pc/games/idgames/idstuff/quake3/linux/linuxq3ademo-1.11-6.x86.gz.sh[/URL]
-		[URL]ftp://ftp.cs.rpi.edu/mirrors/FreeBSD/ports/distfiles/linuxq3ademo-1.11-6.x86.gz.sh[/URL]
-		[URL]ftp://ftp.informatik.rwth-aachen.de/pub/mirror/FreeBSD/ports/distfiles/linuxq3ademo-1.11-6.x86.gz.sh[/URL]
-		[URL]ftp://ftp.sunsite.org.uk/sites/ftp.idsoftware.com/idstuff/quake3/linux/linuxq3ademo-1.11-6.x86.gz.sh[/URL]
 		[URL]ftp://ftp.univie.ac.at/systems/FreeBSD/ports/distfiles/linuxq3ademo-1.11-6.x86.gz.sh[/URL]
-		[URL]ftp://sunsite.cnlab-switch.ch/mirror/FreeBSD/ports/distfiles/linuxq3ademo-1.11-6.x86.gz.sh[/URL]
 		[URL]ftp://ftp.idsoftware.com/idstuff/quake3/linux/linuxq3ademo-1.11-6.x86.gz.sh[/URL]
 	[/MIRRORS]
 [/FILE]


Index: quake3.spec
===================================================================
RCS file: /cvs/extras/rpms/quake3/F-9/quake3.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- quake3.spec	19 Feb 2008 09:33:28 -0000	1.7
+++ quake3.spec	27 Jan 2009 09:31:00 -0000	1.8
@@ -2,7 +2,7 @@
 
 Name:           quake3
 Version:        1.34
-Release:        0.9.%{prever}%{?dist}
+Release:        0.10.%{prever}%{?dist}
 Summary:        Quake 3 Arena engine (ioquake3 version)
 Group:          Amusements/Games
 License:        GPLv2+
@@ -271,6 +271,9 @@
 
 
 %changelog
+* Tue Jan 27 2009 Hans de Goede <hdegoede at redhat.com> 1.34-0.10.rc4
+- Update (fix) autodlrc mirror URL's (rh 481592)
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1.34-0.9.rc4
 - Autorebuild for GCC 4.3
 


Index: urbanterror.autodlrc
===================================================================
RCS file: /cvs/extras/rpms/quake3/F-9/urbanterror.autodlrc,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- urbanterror.autodlrc	23 Dec 2007 18:53:49 -0000	1.2
+++ urbanterror.autodlrc	27 Jan 2009 09:31:00 -0000	1.3
@@ -20,12 +20,10 @@
 	[MD5]1370306ea236f65f595e7ca70765e469[/MD5]
 	[PATH]$HOME/.q3a[/PATH]
 	[MIRRORS]
+		[URL]ftp://ftp.snt.utwente.nl/pub/games/urbanterror/UrbanTerror_41_FULL.zip[/URL]
+		[URL]http://dls.urt.voxel.net/q3ut4/UrbanTerror_41_FULL.zip[/URL]
 		[URL]http://vlaai.snt.utwente.nl/pub/games/urbanterror/UrbanTerror_41_FULL.zip[/URL]
-		[URL]http://www.complex-microcosm.com/4711_UrbanTerror_41_FULL.zip[/URL]
-		[URL]http://mirror.kickassctf.com/UrbanTerror_41_FULL.zip[/URL]
-		[URL]http://mrsentry.net/release/UrbanTerror_41_FULL.zip[/URL]
-		[URL]http://www.iourt.com/urt41/UrbanTerror_41_FULL.zip[/URL]
-		[URL]http://mirror.ncsa.uiuc.edu/ut4/urbanterror/UrbanTerror_41_FULL.zip[/URL]
+		[URL]http://files.uaaportal.com/gamefiles/current-version/UrbanTerror_41_FULL.zip[/URL]
 	[/MIRRORS]
 [/FILE]
 [/FILELIST]


Index: worldofpadman.autodlrc
===================================================================
RCS file: /cvs/extras/rpms/quake3/F-9/worldofpadman.autodlrc,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- worldofpadman.autodlrc	23 Dec 2007 14:40:07 -0000	1.1
+++ worldofpadman.autodlrc	27 Jan 2009 09:31:00 -0000	1.2
@@ -29,8 +29,6 @@
 		[URL]ftp://ftp.snt.utwente.nl/pub/games/worldofpadman/linux/worldofpadman.run[/URL]
 		[URL]http://thilo.kickchat.com/download/worldofpadman.run[/URL]
 		[URL]http://btc3x6.che.uni-bayreuth.de/~tl/wop_final/worldofpadman.run[/URL]
-		[URL]http://www.extreme-players.de/download.php?id=12217[/URL]
-		[URL]http://download.cfs.game-host.org/get.php?get=/pub/games/wop/worldofpadman.run[/URL]
 	[/MIRRORS]
 [/FILE]
 [FILE]



From petersen at fedoraproject.org  Tue Jan 27 09:32:51 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Tue, 27 Jan 2009 09:32:51 +0000 (UTC)
Subject: rpms/scim/devel .cvsignore,1.26,1.27 sources,1.28,1.29
Message-ID: <20090127093251.E9CB470141@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/scim/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26703

Modified Files:
	.cvsignore sources 
Log Message:
bring back scim-icons-0.7.tar.gz


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/scim/devel/.cvsignore,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- .cvsignore	27 Jan 2009 09:18:24 -0000	1.26
+++ .cvsignore	27 Jan 2009 09:32:21 -0000	1.27
@@ -1 +1,2 @@
+scim-icons-0.7.tar.gz
 scim-1.4.8.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/scim/devel/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- sources	27 Jan 2009 09:18:24 -0000	1.28
+++ sources	27 Jan 2009 09:32:21 -0000	1.29
@@ -1 +1,2 @@
+2308b7fc4a5f981d08c7f00c90a7291b  scim-icons-0.7.tar.gz
 c52da019d48df4ba44cbd01558203cc7  scim-1.4.8.tar.gz



From rhughes at fedoraproject.org  Tue Jan 27 09:50:03 2009
From: rhughes at fedoraproject.org (Richard Hughes)
Date: Tue, 27 Jan 2009 09:50:03 +0000 (UTC)
Subject: rpms/fontpackages/devel fontconfig.prov, NONE, 1.1 macros.fontconfig,
	NONE, 1.1 fontpackages.spec, 1.7, 1.8
Message-ID: <20090127095003.C83927010B@cvs1.fedora.phx.redhat.com>

Author: rhughes

Update of /cvs/pkgs/rpms/fontpackages/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30318

Modified Files:
	fontpackages.spec 
Added Files:
	fontconfig.prov macros.fontconfig 
Log Message:
* Tue Jan 27 2009 Richard Hughes <rhughes at redhat.com>
- 1.16-2
- Add fontconfig.prov and macros.fontconfig so that we can automatically
  generate font provides for packages at build time.
  This lets us do some cool things with PackageKit in the future.



--- NEW FILE fontconfig.prov ---
#!/bin/bash
#
# Script to install in:
# /usr/lib/rpm/redhat/find-provides.d
#
# Transform font files into RPM provides
# Requires fontconfig >= 2.6.90
#
# Author: Behdad Esfahbod <behdad at redhat.com>
# Based on other provides scripts from RPM
#

grep '^/usr/share/fonts/' |
xargs fc-query --format '%{family}\n:lang=%{lang}\n' |
while read line; do
	case $line in
	:lang=*)
		langs=${line#:lang=}
		OLDIFS=$IFS
		IFS='|'
		for lang in $langs; do
			echo :lang=$lang
		done
		IFS=$OLDIFS
	;;
	*)
		echo "$line" | tr 'A-Z_' 'a-z-' | tr -d -c 'a-z0-9-\n'
	;;
	esac
done |
sed 's/\(.*\)/Font(\1)/' |
sort -u


--- NEW FILE macros.fontconfig ---
%__fontconfig_provides  /usr/lib/rpm/fontconfig.prov


Index: fontpackages.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fontpackages/devel/fontpackages.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- fontpackages.spec	21 Jan 2009 21:45:16 -0000	1.7
+++ fontpackages.spec	27 Jan 2009 09:49:32 -0000	1.8
@@ -4,7 +4,7 @@
 
 Name:    fontpackages
 Version: 1.16
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: Common directory and macro definitions used by font packages
 
 Group:     Development/System
@@ -13,6 +13,8 @@
 License:   LGPLv3+
 URL:       http://fedoraproject.org/wiki/fontpackages/
 Source0:   http://fedorahosted.org/releases/f/o/%{name}/%{name}-%{version}.tar.bz2
+Source1:   fontconfig.prov
+Source2:   macros.fontconfig
 BuildArch: noarch
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
@@ -69,6 +71,8 @@
 install -m 0644 -p spec-templates/*.spec  %{buildroot}%{spectemplatedir}
 install -m 0644 -p fontconfig-templates/* %{buildroot}%{ftcgtemplatedir}
 install -m 0644 -p macros/macros*         %{buildroot}%{rpmmacrodir}
+install -m 0755 -D -p %{SOURCE1}          %{buildroot}%{_libdir}/rpm/fontconfig.prov
+install -m 0755 -D -p %{SOURCE2}          %{buildroot}%{_sysconfdir}/rpm/macros.fontconfig
 
 cat <<EOF > %{name}-%{version}.files
 %defattr(0644,root,root,0755)
@@ -85,6 +89,8 @@
 %files filesystem -f %{name}-%{version}.files
 %defattr(0644,root,root,0755)
 %dir %{_datadir}/fontconfig
+%{_libdir}/rpm/fontconfig.prov
+%{_sysconfdir}/rpm/macros.fontconfig
 
 
 %files devel
@@ -97,6 +103,12 @@
 
 
 %changelog
+* Tue Jan 27 2009 Richard Hughes <rhughes at redhat.com>
+- 1.16-2
+- Add fontconfig.prov and macros.fontconfig so that we can automatically
+  generate font provides for packages at build time.
+  This lets us do some cool things with PackageKit in the future.
+
 * Wed Jan 22 2009 Nicolas Mailhot <nim at fedoraproject dot org>
 - 1.16-1
 



From akurtakov at fedoraproject.org  Tue Jan 27 09:53:54 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Tue, 27 Jan 2009 09:53:54 +0000 (UTC)
Subject: rpms/eclipse-rpmstubby/devel eclipse-rpmstubby.spec, NONE,
	1.1 eclipse-rpmstubby-fetch-src.sh, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090127095354.9DC807010B@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/eclipse-rpmstubby/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31841/devel

Modified Files:
	.cvsignore sources 
Added Files:
	eclipse-rpmstubby.spec eclipse-rpmstubby-fetch-src.sh 
Log Message:
Initial version.


--- NEW FILE eclipse-rpmstubby.spec ---
%define eclipse_base   %{_libdir}/eclipse
%define install_loc    %{_datadir}/eclipse/dropins/rpmstubby

Name:           eclipse-rpmstubby
Version:        0.1.0
Release:        2%{?dist}
Summary:        Rpm specfile generator for Eclipse features

Group:          Development/Tools
License:        EPL
URL:            http://www.eclipse.org/linuxtools/projectPages/rpmstubby/
#sh eclipse-rpmstubby-fetch-src.sh
Source0:        %{name}-fetched-src-%{version}.tar.bz2
Source1:        eclipse-rpmstubby-fetch-src.sh
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch: noarch

BuildRequires: eclipse-pde >= 1:3.4.0
Requires: eclipse-platform >= 3.4.0

%description
RPM Stubby Plug-in is a plugin aiming to auto-generate RPM specfile from
feature.xml.

%prep
%setup -q -n %{name}-fetched-src-%{version}
cp org.eclipse.linuxtools.rpmstubby-feature/ChangeLog org.eclipse.linuxtools.rpmstubby-feature/ChangeLog.feature

%build
%{eclipse_base}/buildscripts/pdebuild -a "-DjavacSource=1.5 -DjavacTarget=1.5"

%install
%{__rm} -rf %{buildroot}
install -d -m 755 %{buildroot}%{install_loc}

%{__unzip} -q -d %{buildroot}%{install_loc} \
     build/rpmBuild/org.eclipse.linuxtools.rpmstubby.feature.zip 

%clean
%{__rm} -rf %{buildroot}

%files
%defattr(-,root,root,-)
%{install_loc}
%doc org.eclipse.linuxtools.rpmstubby-feature/license.html
%doc org.eclipse.linuxtools.rpmstubby-feature/epl-v10.html
%doc org.eclipse.linuxtools.rpmstubby-feature/ChangeLog.feature
%doc org.eclipse.linuxtools.rpmstubby/ChangeLog

%changelog
* Sun Jan 25 2009 Alexander Kurtakov <akurtako at redhat.com> 0.1.0-2
- Fix URL to point to the new homepage.
- Use %{buildroot} only.
- Package Changelog files.

* Wed Dec 10 2008 Alexander Kurtakov <akurtako at redhat.com> 0.1.0-1
-Initial packaging.

--- NEW FILE eclipse-rpmstubby-fetch-src.sh ---
#!/bin/sh
usage='usage: $0 <tag>'
name=eclipse-rpmstubby
tag=R0_1_0
tar_name=$name-fetched-src-0.1.0

# example of fetch command:
# fetch_cmd=cvs -d:pserver:anonymous at dev.eclipse.org:/cvsroot/dsdp \
# export -r $tag org.eclipse.tm.rse/features/$f;

fetch_cmd="svn export svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/rpmstubby/tags/$tag/ $tar_name"

if [ 'x$tag'x = 'xx' ]; then
   echo >&2 '$usage'
   exit 1
fi

# Fetch plugins
$fetch_cmd

popd
# create archive
tar -cjf $tar_name.tar.bz2 $tar_name


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-rpmstubby/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	26 Jan 2009 23:03:45 -0000	1.1
+++ .cvsignore	27 Jan 2009 09:53:24 -0000	1.2
@@ -0,0 +1 @@
+eclipse-rpmstubby-fetched-src-0.1.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-rpmstubby/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	26 Jan 2009 23:03:45 -0000	1.1
+++ sources	27 Jan 2009 09:53:24 -0000	1.2
@@ -0,0 +1 @@
+ad4e77a96b9e4224fe047e7d7c393e6a  eclipse-rpmstubby-fetched-src-0.1.0.tar.bz2



From erikos at fedoraproject.org  Tue Jan 27 10:08:29 2009
From: erikos at fedoraproject.org (Simon Schampijer)
Date: Tue, 27 Jan 2009 10:08:29 +0000 (UTC)
Subject: rpms/sugar-journal/OLPC-3 .cvsignore, 1.11, 1.12 sources, 1.12,
	1.13 sugar-journal.spec, 1.17, 1.18
Message-ID: <20090127100829.28ED27010B@cvs1.fedora.phx.redhat.com>

Author: erikos

Update of /cvs/pkgs/rpms/sugar-journal/OLPC-3
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2361

Modified Files:
	.cvsignore sources sugar-journal.spec 
Log Message:
* Wed Jan 27 2009 Simon Schampijer <simon at laptop.org> - 101-1
- new spanish translations for 'your journal is full' #8745




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-journal/OLPC-3/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	10 Dec 2008 14:48:02 -0000	1.11
+++ .cvsignore	27 Jan 2009 10:07:58 -0000	1.12
@@ -1 +1 @@
-Journal-100.tar.bz2
+Journal-101.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-journal/OLPC-3/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	10 Dec 2008 14:48:03 -0000	1.12
+++ sources	27 Jan 2009 10:07:58 -0000	1.13
@@ -1 +1 @@
-28c4a21a189824b0420bd587a0981dd5  Journal-100.tar.bz2
+cdb902cabf44378f840aa65e0e43afbc  Journal-101.tar.bz2


Index: sugar-journal.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-journal/OLPC-3/sugar-journal.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sugar-journal.spec	10 Dec 2008 14:48:03 -0000	1.17
+++ sugar-journal.spec	27 Jan 2009 10:07:58 -0000	1.18
@@ -2,7 +2,7 @@
 %define alphatag 20081210git%{commitid}
 
 Name:           sugar-journal
-Version:        100
+Version:        101
 Release:        1%{?dist}
 #Release:        4.%{alphatag}%{?dist}
 Summary:        Journal for Sugar
@@ -48,6 +48,9 @@
 %{sugaractivitydir}/Journal.activity/
 
 %changelog
+* Wed Jan 27 2009 Simon Schampijer <simon at laptop.org> - 101-1
+- new spanish translations for 'your journal is full' #8745
+
 * Wed Dec 10 2008 Simon Schampijer <simon at laptop.org> - 100-1
 - updated translations 
 - spanish translations for 'your journal is full' #8745



From jskala at fedoraproject.org  Tue Jan 27 10:26:57 2009
From: jskala at fedoraproject.org (Jiri Skala)
Date: Tue, 27 Jan 2009 10:26:57 +0000 (UTC)
Subject: rpms/netatalk/devel netatalk.spec,1.49,1.50
Message-ID: <20090127102657.7B4EE7010B@cvs1.fedora.phx.redhat.com>

Author: jskala

Update of /cvs/extras/rpms/netatalk/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5239

Modified Files:
	netatalk.spec 
Log Message:
* Tue Jan 27 2009 Jiri Skala <jskala at redhat.com> -4:3.0.3-25
- fixed epoch in the subpackage requires



Index: netatalk.spec
===================================================================
RCS file: /cvs/extras/rpms/netatalk/devel/netatalk.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- netatalk.spec	26 Jan 2009 16:57:16 -0000	1.49
+++ netatalk.spec	27 Jan 2009 10:26:26 -0000	1.50
@@ -1,7 +1,7 @@
 Summary: AppleTalk networking programs
 Name:    netatalk
 Version: 2.0.3
-Release: 24%{?dist}
+Release: 25%{?dist}
 Epoch:   4
 License: GPLv2+
 Group:   System Environment/Daemons
@@ -36,7 +36,7 @@
 %package timeout
 Summary: Timeout utility for the systems without coreutils
 Group:   System Environment/Daemons
-Requires: netatalk = %{version}-%{release}
+Requires: %{name} = %{epoch}:%{version}-%{release}
 Conflicts: coreutils >= 7.0
 
 %description timeout
@@ -208,6 +208,9 @@
 %{_mandir}/man*/netatalk-config.1*
 
 %changelog
+* Tue Jan 27 2009 Jiri Skala <jskala at redhat.com> -4:3.0.3-25
+- fixed epoch in the subpackage requires
+
 * Fri Jan 23 2009 Jiri Skala <jskala at redhat.com> -4:3.0.3-24
 - fix #473186 conflict timeout with coreutils
 



From ltinkl at fedoraproject.org  Tue Jan 27 10:40:31 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Tue, 27 Jan 2009 10:40:31 +0000 (UTC)
Subject: rpms/kdelibs/F-9 plasma-on-screensaver-security-fix.diff, NONE,
	1.1 kdelibs.spec, 1.374, 1.375 sources, 1.68, 1.69
Message-ID: <20090127104031.55F447010B@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kdelibs/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7987

Modified Files:
	kdelibs.spec sources 
Added Files:
	plasma-on-screensaver-security-fix.diff 
Log Message:
respun 4.2.0 tarball, plasma security fix


plasma-on-screensaver-security-fix.diff:

--- NEW FILE plasma-on-screensaver-security-fix.diff ---
Index: containment.cpp
===================================================================
--- containment.cpp	(revision 916284)
+++ containment.cpp	(working copy)
@@ -1602,12 +1602,10 @@
         }
 
         bool canConfig = unlocked || KAuthorized::authorize("PlasmaAllowConfigureWhenLocked");
-        if (canConfig) {
-            action = actions().action("activity settings");
-            if (action) {
-                action->setVisible(canConfig);
-                action->setEnabled(canConfig);
-            }
+        action = actions().action("activity settings");
+        if (action) {
+            action->setVisible(canConfig);
+            action->setEnabled(canConfig);
         }
 
         // tell the applets too


Index: kdelibs.spec
===================================================================
RCS file: /cvs/extras/rpms/kdelibs/F-9/kdelibs.spec,v
retrieving revision 1.374
retrieving revision 1.375
diff -u -r1.374 -r1.375
--- kdelibs.spec	26 Jan 2009 10:39:58 -0000	1.374
+++ kdelibs.spec	27 Jan 2009 10:40:00 -0000	1.375
@@ -1,6 +1,6 @@
 Summary: K Desktop Environment 4 - Libraries
 Version: 4.2.0
-Release: 1%{?dist}
+Release: 4%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs
@@ -44,8 +44,9 @@
 %if 0%{?fedora} >= 9
 Requires: hunspell
 %endif
-Requires: phonon >= 4.2.96
-Requires: soprano >= 2.1.64
+Requires: phonon%{?_isa} >= 4.3.0
+Requires: soprano%{?_isa} >= 2.1.64
+Requires: strigi-libs%{?_isa} >= 0.6.3
 
 Source1: kde4.sh
 Source2: kde4.csh
@@ -83,6 +84,8 @@
 Patch101: kdelibs-4.1.96-AllowExternalPaths.patch
 
 BuildRequires: qt4-devel >= 4.4.0
+# qt4%{_?_isa} isn't provided yet -- Rex
+#Requires: qt4%{?_isa} >= %{_qt4_version}
 Requires: qt4 >= %{_qt4_version}
 Requires: xdg-utils
 Requires(post): /sbin/ldconfig xdg-utils
@@ -93,7 +96,7 @@
 # we don't want a hard dependency on aspell on F9+, use enchant only
 BuildRequires: aspell-devel
 %endif
-BuildRequires: automoc
+BuildRequires: automoc4 >= 0.9.88
 BuildRequires: avahi-devel
 BuildRequires: bzip2-devel
 BuildRequires: cmake >= 2.6.2-3
@@ -114,7 +117,7 @@
 BuildRequires: OpenEXR-devel
 BuildRequires: openssl-devel
 BuildRequires: pcre-devel
-BuildRequires: phonon-devel >= 4.2.96
+BuildRequires: phonon-devel >= 4.3.0
 BuildRequires: shared-mime-info
 BuildRequires: soprano-devel >= 2.1.64
 BuildRequires: strigi-devel >= 0.6.3
@@ -153,11 +156,11 @@
 Provides:  kdelibs4-devel = %{version}-%{release}
 %endif
 Requires: cmake >= 2.6.2-3
-Requires: automoc
+Requires: automoc4 >= 0.9.88
 Requires: qt4-devel
 Requires: openssl-devel
-Requires: phonon-devel >= 4.2.96
-Requires: strigi-devel >= 0.6.3
+Requires: phonon-devel
+Requires: strigi-devel
 Requires: bzip2-devel gamin-devel libacl-devel zlib-devel libutempter-devel
 %{?x_deps:Requires: %{x_deps}}
 %description devel
@@ -209,6 +212,7 @@
 # upstream patches
 %patch101 -p1 -b .AllowExternalPaths
 
+
 %build
 
 mkdir -p %{_target_platform}
@@ -369,26 +373,111 @@
 
 
 %changelog
-* Mon Jan 26 2009 Luk???? Tinkl <ltinkl at redhat.com> 4.2.0-1
-- KDE 4.2.0
+* Mon Jan 26 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.0-4
+- revert Requires: qt4%%{_isa}
+
+* Mon Jan 26 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.0-3
+- respun tarball
 
-* Thu Jan 08 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.4-2
-- restore AWOL NTFS workaround yet again
+* Mon Jan 26 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.0-2
+- plasma-on-screensaver-security patch
+- (Build)Req: automoc4 >= 0.9.88, phonon(-devel) >= 4.3.0
+- Requires: strigi-libs >= 0.6.3
+- use %%{?_isa} to avoid potential multilib heartbreak
 
-* Wed Jan  7 2009 Luk???? Tinkl <ltinkl at redhat.com> 4.1.4-1
-- KDE 4.1.4
+* Thu Jan 22 2009 Than Ngo <than at redhat.com> - 4.2.0-1
+- 4.2.0
 
-* Mon Dec 08 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.3-4
-- restore NTFS workaround which accidentally got dropped in the 4.1.3 update
+* Fri Jan 16 2009 Than Ngo <than at redhat.com> - 4.1.96-9
+- drop kdelibs-4.1.85-plasma-default-wallpaper.patch, it's not needed
+  since new plasma allows to define default wallpaper, new kde-setting
+  is required
+- backport fix from trunk to allow symlinks in wallpaper theme
 
-* Thu Nov 20 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.3-3
-- unmess Utilities menu (kdebug:161117)
+* Fri Jan 16 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.1.96-8
+- rebuild for new OpenSSL
 
-* Fri Nov 07 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.3-2
-- backport http_cache_cleaner fix (kdebug:172182)
+* Mon Jan 12 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.1.96-7
+- Slight speedup to profile.d/kde.sh (#465370)
+- (Build)Req: strigi(-devel) >= 0.6.3
+
+* Mon Jan 12 2009 Than Ngo <than at redhat.com> - 4.1.96-6
+- fix a crash (appearing in KSMServer)
+
+* Sat Jan 10 2009 Than Ngo <than at redhat.com> - 4.1.96-5
+- kdeworkspace cmake files in correct place
+
+* Fri Jan 09 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.1.96-4
+- bump min deps (cmake, kde-filesystem, phonon)
+- kde.(sh|csh): cleanup QT_PLUGIN_PATH handling
+- Requires: coreutils grep
+
+* Fri Jan 09 2009 Than Ngo <than at redhat.com> - 4.1.96-3
+- BR soprano >= 2.1.64
+
+* Thu Jan 08 2009 Than Ngo <than at redhat.com> - 4.1.96-2
+- kdepim cmake files in correct place
+
+* Wed Jan 07 2009 Than Ngo <than at redhat.com> - 4.1.96-1
+- 4.2rc1
+
+* Fri Dec 19 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.85-6
+- add plasma-default-wallpaper libplasma patch from kdebase-workspace-4.1
+
+* Tue Dec 16 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.85-5
+- respun tarball, integrates kde-l10n-systemsettings patch
+
+* Tue Dec 16 2008 Than Ngo <than at redhat.com> - 4.1.85-4
+- add missing ENTITY systemsettings in pt, that fixes kde-l10
+  build breakage
 
-* Tue Nov  4 2008 Luk???? Tinkl <ltinkl at redhat.com> 4.1.3-1
-- KDE 4.1.3
+* Mon Dec 15 2008 Than Ngo <than at redhat.com> - 4.1.85-3
+- add missing ENTITY systemsettings in ru/gl/es/pt, that fixes kde-l10
+  build breakage
+- rename suffix .xxcmake to avoid install .cmake
+
+* Sun Dec 14 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.1.85-2
+- tweak parallel_devel patch to get a -L flag for the symlink directory
+
+* Thu Dec 11 2008 Than Ngo <than at redhat.com> -  4.1.85-1
+- 4.2beta2
+
+* Tue Dec 09 2008 Lorenzo Villani <lvillani at binaryhelix.net> - 6:4.1.82-2
+- rebase parallel devel patch and kde149705 patch
+
+* Mon Dec 08 2008 Lorenzo Villani <lvillani at binaryhelix.net> - 6:4.1.82-1
+- 4.1.82
+
+* Tue Nov 25 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.80-5
+- remove workaround BR on phonon-backend-gstreamer, it's ineffective since
+  phonon now explicitly Requires: phonon-backend-xine and the dependency is no
+  longer circular anyway
+- update parallel_devel patch
+- fix minimum strigi version (only 0.5.9 needed)
+
+* Tue Nov 25 2008 Than Ngo <than at redhat.com> 4.1.80-4
+- respin
+
+* Thu Nov 20 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.80-3
+- -devel: Provides: plasma-devel
+
+* Thu Nov 20 2008 Than Ngo <than at redhat.com> 4.1.80-2
+- merged
+
+* Thu Nov 20 2008 Lorenzo Villani <lvillani at binaryhelix.net> - 6:4.1.80-1
+- 4.1.80
+- BR strigi 0.60
+- BR cmake 2.6
+- make install/fast
+- rebase policykit patch
+- rebase cmake patch
+- rebase a couple of patches and drop _default_patch_fuzz 2
+
+* Wed Nov 12 2008 Than Ngo <than at redhat.com> 4.1.3-1
+- 4.1.3
+
+* Fri Nov 07 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-6
+- backport http_cache_cleaner fix (kdebug:172182)
 
 * Wed Oct 15 2008 Luk???? Tinkl <ltinkl at redhat.com> 4.1.2-5
 - backport fix for faulty window resizing (kdebug:172042)
@@ -840,7 +929,7 @@
 
 * Wed Jun 27 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.91.0-1
 - kde-3.91.0
-- CMAKE_BUILD_TYPE=debug 
+- CMAKE_BUILD_TYPE=debug
 
 * Sat Jun 23 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.90.1-3
 - specfile cleanup (%%prefix issues mostly)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdelibs/F-9/sources,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- sources	26 Jan 2009 11:49:14 -0000	1.68
+++ sources	27 Jan 2009 10:40:00 -0000	1.69
@@ -1 +1 @@
-4ea13b88463125026a7f71937075bcec  kdelibs-4.2.0.tar.bz2
+2d830a922195fefe6e073111850247ac  kdelibs-4.2.0.tar.bz2



From fabbione at fedoraproject.org  Tue Jan 27 10:45:26 2009
From: fabbione at fedoraproject.org (Fabio M. Di Nitto)
Date: Tue, 27 Jan 2009 10:45:26 +0000 (UTC)
Subject: rpms/corosync/devel corosync-trunk-1750.diff, NONE,
	1.1 corosync.spec, 1.5, 1.6 corosync-trunk-1709.diff, 1.1, NONE
Message-ID: <20090127104527.037ED7010B@cvs1.fedora.phx.redhat.com>

Author: fabbione

Update of /cvs/pkgs/rpms/corosync/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8871

Modified Files:
	corosync.spec 
Added Files:
	corosync-trunk-1750.diff 
Removed Files:
	corosync-trunk-1709.diff 
Log Message:
Update to latest svn snapshot


corosync-trunk-1750.diff:

--- NEW FILE corosync-trunk-1750.diff ---
diff -Naurd corosync-0.92/exec/apidef.c corosync-trunk/exec/apidef.c
--- corosync-0.92/exec/apidef.c	2008-09-17 21:15:00.000000000 +0200
+++ corosync-trunk/exec/apidef.c	2008-12-08 16:55:41.000000000 +0100
@@ -46,6 +46,7 @@
 #include "main.h"
 #include "ipc.h"
 #include "sync.h"
+#include "quorum.h"
 #include <corosync/engine/coroapi.h>
 #include "service.h"
 #include <corosync/lcr/lcr_ifact.h>
@@ -55,11 +56,16 @@
 /*
  * Remove compile warnings about type name changes
  */
-typedef int (*typedef_tpg_join) (corosync_tpg_handle, struct corosync_tpg_group *, int);
-typedef int (*typedef_tpg_leave) (corosync_tpg_handle, struct corosync_tpg_group *, int);
-typedef int (*typedef_tpg_groups_mcast) (corosync_tpg_handle, int, struct corosync_tpg_group *, int groups_cnt, struct iovec *, int);
-typedef int (*typedef_tpg_groups_send_ok) (corosync_tpg_handle, struct corosync_tpg_group *, int groups_cnt, struct iovec *, int);
+typedef int (*typedef_tpg_join) (cs_tpg_handle, struct corosync_tpg_group *, int);
+typedef int (*typedef_tpg_leave) (cs_tpg_handle, struct corosync_tpg_group *, int);
+typedef int (*typedef_tpg_groups_mcast) (cs_tpg_handle, int, struct corosync_tpg_group *, int groups_cnt, struct iovec *, int);
+typedef int (*typedef_tpg_groups_send_ok) (cs_tpg_handle, struct corosync_tpg_group *, int groups_cnt, struct iovec *, int);
 
+static inline void _corosync_public_exit_error (
+	cs_fatal_error_t err, const char *file, unsigned int line)
+{
+	_corosync_exit_error (err, file, line);
+}
 
 static struct corosync_api_v1 apidef_corosync_api_v1 = {
 	.timer_add_duration = corosync_timer_add_duration,
@@ -68,16 +74,16 @@
 	.timer_time_get = NULL,
 	.ipc_source_set = message_source_set,
 	.ipc_source_is_local = message_source_is_local,
-	.ipc_private_data_get = corosync_conn_private_data_get,
+	.ipc_private_data_get = cs_conn_private_data_get,
 	.ipc_response_send = NULL,
-	.ipc_response_no_fcc = corosync_conn_send_response_no_fcc,
+	.ipc_response_no_fcc = cs_conn_send_response_no_fcc,
 	.ipc_dispatch_send = NULL,
-	.ipc_conn_send_response = corosync_conn_send_response,
-	.ipc_conn_partner_get = corosync_conn_partner_get,
-	.ipc_refcnt_inc =  corosync_ipc_flow_control_local_increment,
-	.ipc_refcnt_dec = corosync_ipc_flow_control_local_decrement,
-	.ipc_fc_create = corosync_ipc_flow_control_create,
-	.ipc_fc_destroy = corosync_ipc_flow_control_destroy,
+	.ipc_conn_send_response = cs_conn_send_response,
+	.ipc_conn_partner_get = cs_conn_partner_get,
+	.ipc_refcnt_inc =  cs_ipc_flow_control_local_increment,
+	.ipc_refcnt_dec = cs_ipc_flow_control_local_decrement,
+	.ipc_fc_create = cs_ipc_flow_control_create,
+	.ipc_fc_destroy = cs_ipc_flow_control_destroy,
 	.totem_nodeid_get = totempg_my_nodeid_get,
 	.totem_family_get = totempg_my_family_get,
 	.totem_ring_reenable = totempg_ring_reenable,
@@ -86,6 +92,7 @@
 	.totem_ifaces_get = totempg_ifaces_get,
 	.totem_ifaces_print = totempg_ifaces_print,
 	.totem_ip_print = totemip_print,
+	.totem_callback_token_create = totempg_callback_token_create,
 	.tpg_init = totempg_groups_initialize,
 	.tpg_exit = NULL, /* missing from totempg api */
 	.tpg_join = (typedef_tpg_join)totempg_groups_join,
@@ -95,12 +102,16 @@
 	.tpg_groups_mcast = (typedef_tpg_groups_mcast)totempg_groups_mcast_groups,
 	.tpg_groups_send_ok = (typedef_tpg_groups_send_ok)totempg_groups_send_ok_groups,
 	.sync_request = sync_request,
+	.quorum_is_quorate = corosync_quorum_is_quorate,
+	.quorum_register_callback = corosync_quorum_register_callback,
+	.quorum_unregister_callback = corosync_quorum_unregister_callback,
+	.quorum_initialize = corosync_quorum_initialize,
 	.service_link_and_init = corosync_service_link_and_init,
 	.service_unlink_and_exit = corosync_service_unlink_and_exit,
 	.plugin_interface_reference = lcr_ifact_reference,
 	.plugin_interface_release = lcr_ifact_release,
 	.error_memory_failure = _corosync_out_of_memory_error,
-	.fatal_error = _corosync_exit_error
+	.fatal_error = _corosync_public_exit_error
 };
 
 void apidef_init (struct objdb_iface_ver0 *objdb) {
diff -Naurd corosync-0.92/exec/coropoll.c corosync-trunk/exec/coropoll.c
--- corosync-0.92/exec/coropoll.c	2008-08-14 18:44:26.000000000 +0200
+++ corosync-trunk/exec/coropoll.c	2009-01-20 18:59:10.000000000 +0100
@@ -59,6 +59,7 @@
 	struct timerlist timerlist;
 	void (*serialize_lock_fn) (void);
 	void (*serialize_unlock_fn) (void);
+	int stop_requested;
 };
 
 /*
@@ -92,6 +93,7 @@
 	poll_instance->poll_entries = 0;
 	poll_instance->ufds = 0;
 	poll_instance->poll_entry_count = 0;
+	poll_instance->stop_requested = 0;
 	poll_instance->serialize_lock_fn = serialize_lock_fn;
 	poll_instance->serialize_unlock_fn = serialize_unlock_fn;
 	timerlist_init (&poll_instance->timerlist);
@@ -291,18 +293,18 @@
 	struct poll_instance *poll_instance;
 	int res = 0;
 
+	if (timer_handle_out == NULL) {
+		res -ENOENT;
+		goto error_exit;
+	}
+
 	res = hdb_handle_get (&poll_instance_database, handle,
 		(void *)&poll_instance);
 	if (res != 0) {
 		res = -ENOENT;
-		
 		goto error_exit;
 	}
 
-	if (timer_handle_out == 0) {
-		res = -ENOENT;
-	}
-
 	timerlist_add_duration (&poll_instance->timerlist,
 		timer_fn, data, ((unsigned long long)msec_duration) * 1000000ULL, timer_handle_out);
 
@@ -336,6 +338,27 @@
 	return (res);
 }
 
+int poll_stop (
+	poll_handle handle)
+{
+	struct poll_instance *poll_instance;
+	unsigned int res;
+
+	res = hdb_handle_get (&poll_instance_database, handle,
+		(void *)&poll_instance);
+	if (res != 0) {
+		res = -ENOENT;
+		goto error_exit;
+	}
+	
+	poll_instance->stop_requested = 1;
+
+	hdb_handle_put (&poll_instance_database, handle);
+error_exit:
+	return (res);
+}
+
+
 int poll_run (
 	poll_handle handle)
 {
@@ -366,6 +389,10 @@
 retry_poll:
 		res = poll (poll_instance->ufds,
 			poll_instance->poll_entry_count, expire_timeout_msec);
+		if (poll_instance->stop_requested) {
+			printf ("poll should stop\n");
+			return (0);
+		}
 		if (errno == EINTR && res == -1) {
 			goto retry_poll;
 		} else
@@ -403,9 +430,6 @@
 	return (-1);
 }
 
-int poll_stop (
-	poll_handle handle);
-
 #ifdef COMPILE_OUT
 void poll_print_state (
 	poll_handle handle,
diff -Naurd corosync-0.92/exec/crypto.c corosync-trunk/exec/crypto.c
--- corosync-0.92/exec/crypto.c	2008-08-15 08:15:26.000000000 +0200
+++ corosync-trunk/exec/crypto.c	2009-01-26 21:22:28.000000000 +0100
@@ -20,13 +20,14 @@
 #endif
 #include <fcntl.h>
 #include <unistd.h>
+#include <stdint.h>
 
 #include "crypto.h"
 
 #define CONST64(n) n ## ULL
 
-typedef unsigned long ulong32;
-typedef unsigned long long ulong64;
+typedef uint32_t ulong32;
+typedef uint64_t ulong64;
 
 #if __BYTE_ORDER == __LITTLE_ENDIAN
 #define ENDIAN_LITTLE
@@ -41,10 +42,10 @@
 #endif
 
 #if defined(COROSYNC_LINUX)
[...22126 lines suppressed...]
-	if (res != CONFDB_OK) {
+	if (res != CS_OK) {
 		fprintf (stderr, "Could not enable tracking on object \"%s\". Error %d\n",
 				 name_pt, res);
 		return;
@@ -501,10 +507,10 @@
 
 static void stop_tracking(confdb_handle_t handle)
 {
-	confdb_error_t res;
+	cs_error_t res;
 
 	res = confdb_stop_track_changes (handle);
-	if (res != CONFDB_OK) {
+	if (res != CS_OK) {
 		fprintf (stderr, "Could not stop tracking. Error %d\n", res);
 		return;
 	}
@@ -512,14 +518,14 @@
 
 static void delete_object(confdb_handle_t handle, char * name_pt)
 {
-	confdb_error_t res;
+	cs_error_t res;
 	uint32_t obj_handle;
 	res = find_object (handle, name_pt, FIND_OBJECT_ONLY, &obj_handle);
 
-	if (res == CONFDB_OK) {
+	if (res == CS_OK) {
 		res = confdb_object_destroy (handle, obj_handle);
 
-		if (res != CONFDB_OK)
+		if (res != CS_OK)
 			fprintf(stderr, "Failed to find object \"%s\" to delete. Error %d\n", name_pt, res);
 	} else {
 		char parent_name[OBJ_NAME_SIZE];
@@ -531,7 +537,7 @@
 		get_key(name_pt, key_name, key_value);
 		res = find_object (handle, parent_name, FIND_OBJECT_ONLY, &obj_handle);
 
-		if (res != CONFDB_OK) {
+		if (res != CS_OK) {
 			fprintf(stderr, "Failed to find the key's parent object \"%s\". Error %d\n", parent_name, res);
 			exit (EXIT_FAILURE);
 		}
@@ -543,7 +549,7 @@
 								 key_value,
 								 strlen(key_value));
 
-		if (res != CONFDB_OK)
+		if (res != CS_OK)
 			fprintf(stderr, "Failed to delete key \"%s=%s\" from object \"%s\". Error %d\n",
 					key_name, key_value, parent_name, res);
 	}
@@ -552,8 +558,8 @@
 
 int main (int argc, char *argv[]) {
 	confdb_handle_t handle;
-	confdb_error_t result;
-	char c;
+	cs_error_t result;
+	int c;
 
 	action = ACTION_READ;
 
@@ -603,7 +609,7 @@
 	}
 
 	result = confdb_initialize (&handle, &callbacks);
-	if (result != CONFDB_OK) {
+	if (result != CS_OK) {
 		fprintf (stderr, "Failed to initialize the objdb API. Error %d\n", result);
 		exit (EXIT_FAILURE);
 	}
@@ -633,7 +639,7 @@
 	}
 
 	result = confdb_finalize (handle);
-	if (result != CONFDB_OK) {
+	if (result != CS_OK) {
 		fprintf (stderr, "Error finalizing objdb API. Error %d\n", result);
 		exit(EXIT_FAILURE);
 	}
diff -Naurd corosync-0.92/tools/corosync-pload.c corosync-trunk/tools/corosync-pload.c
--- corosync-0.92/tools/corosync-pload.c	1970-01-01 01:00:00.000000000 +0100
+++ corosync-trunk/tools/corosync-pload.c	2008-11-06 22:49:07.000000000 +0100
@@ -0,0 +1,76 @@
+/*
+ * Copyright (c) 2008 Red Hat, Inc.
+ *
+ * All rights reserved.
+ *
+ * Author: Steven Dake (sdake at redhat.com)
+ *
+ * This software licensed under BSD license, the text of which follows:
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * - Redistributions of source code must retain the above copyright notice,
+ *   this list of conditions and the following disclaimer.
+ * - 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.
+ * - Neither the name of the MontaVista Software, Inc. nor the names of its
+ *   contributors may be used to endorse or promote products derived from this
+ *   software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <signal.h>
+#include <unistd.h>
+#include <errno.h>
+#include <unistd.h>
+#include <time.h>
+#include <sys/time.h>
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <sys/select.h>
+#include <sys/un.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+
+#include <corosync/corotypes.h>
+#include <corosync/pload.h>
+
+#define timersub(a, b, result)						\
+do {									\
+	(result)->tv_sec = (a)->tv_sec - (b)->tv_sec;			\
+	(result)->tv_usec = (a)->tv_usec - (b)->tv_usec;		\
+	if ((result)->tv_usec < 0) {					\
+		--(result)->tv_sec;					\
+		(result)->tv_usec += 1000000;				\
+	}								\
+} while (0)
+
+int main (void) {
+	pload_error_t result;
+	pload_handle_t handle;
+
+	result = pload_initialize (&handle, NULL);
+	printf ("Init result %d\n", result);
+	result = pload_start (
+		handle,
+		0, /* code */
+		150000000, /* count */
+		300); /* size */
+	return (0);
+}
diff -Naurd corosync-0.92/tools/Makefile corosync-trunk/tools/Makefile
--- corosync-0.92/tools/Makefile	2008-08-15 08:15:26.000000000 +0200
+++ corosync-trunk/tools/Makefile	2008-11-11 18:28:22.000000000 +0100
@@ -41,8 +41,8 @@
 	override LDFLAGS += -lnsl -lsocket -lrt
 endif
 
-LIBS = ../lib/libconfdb.a ../lib/libcfg.a
-BINARIES=corosync-objctl corosync-cfgtool corosync-keygen
+LIBS = ../lib/libconfdb.a ../lib/libcfg.a ../lib/libpload.a
+BINARIES=corosync-objctl corosync-cfgtool corosync-keygen corosync-fplay corosync-pload
 APPS_SRC=$(addsuffix .c,$(BINARIES))
 EXTRA_CFLAGS = -I$(srcdir)include
 
@@ -57,9 +57,22 @@
 corosync-keygen: corosync-keygen.o
 	$(CC) $(LDFLAGS) -o $@ $<
 
+corosync-fplay: corosync-fplay.o
+	$(CC) $(LDFLAGS) -o $@ $<
+
+corosync-pload: corosync-pload.o
+	$(CC) $(LDFLAGS) -o $@ $< $(LIBS)
+
 clean:
 	rm -f *.o $(BINARIES)
 
+lint:
+	-splint $(LINT_FLAGS) $(CFLAGS) corosync-objctl.c
+	-splint $(LINT_FLAGS) $(CFLAGS) corosync-cfgtool.c
+	-splint $(LINT_FLAGS) $(CFLAGS) corosync-keygen.c
+	-splint $(LINT_FLAGS) $(CFLAGS) corosync-fplay.c
+	-splint $(LINT_FLAGS) $(CFLAGS) corosync-pload.c
+
 %.o: %.c
 	$(CC) $(CFLAGS) $(CPPFLAGS) $(EXTRA_CFLAGS) -c -o $@ $<
 


Index: corosync.spec
===================================================================
RCS file: /cvs/pkgs/rpms/corosync/devel/corosync.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- corosync.spec	15 Dec 2008 18:15:18 -0000	1.5
+++ corosync.spec	27 Jan 2009 10:44:56 -0000	1.6
@@ -1,14 +1,14 @@
-%define alphatag svn1709
+%define alphatag svn1750
 
 Name: corosync
 Summary: The Corosync Cluster Engine and Application Programming Interfaces
 Version: 0.92
-Release: 5%{?alphatag:.%{alphatag}}%{?dist}
+Release: 6%{?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
-Patch0: corosync-trunk-1709.diff
+Patch0: corosync-trunk-1750.diff
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires(pre): /usr/sbin/useradd
@@ -94,6 +94,7 @@
 %{_libexecdir}/lcrso/service_evs.lcrso
 %{_libexecdir}/lcrso/service_confdb.lcrso
 %{_libexecdir}/lcrso/service_pload.lcrso
+%{_libexecdir}/lcrso/service_votequorum.lcrso
 %{_libexecdir}/lcrso/testquorum.lcrso
 %{_libexecdir}/lcrso/vsf_quorum.lcrso
 %{_libexecdir}/lcrso/vsf_ykd.lcrso
@@ -105,6 +106,8 @@
 %{_libdir}/corosync/libtotem_pg.so.*
 %{_libdir}/corosync/liblogsys.so.*
 %{_libdir}/corosync/libcoroutil.so.*
+%{_libdir}/corosync/libquorum.so.*
+%{_libdir}/corosync/libvotequorum.so.*
 %{_mandir}/man8/corosync_overview.8*
 %{_mandir}/man8/corosync-objctl.8*
 %{_mandir}/man5/corosync.conf.5*
@@ -125,6 +128,8 @@
 %{_includedir}/corosync/list.h
 %{_includedir}/corosync/mar_gen.h
 %{_includedir}/corosync/swab.h
+%{_includedir}/corosync/quorum.h
+%{_includedir}/corosync/votequorum.h
 %dir %{_includedir}/corosync/totem/
 %{_includedir}/corosync/totem/coropoll.h
 %{_includedir}/corosync/totem/totem.h
@@ -147,15 +152,23 @@
 %{_libdir}/corosync/libtotem_pg.so
 %{_libdir}/corosync/liblogsys.so
 %{_libdir}/corosync/libcoroutil.so
+%{_libdir}/corosync/libquorum.so
+%{_libdir}/corosync/libvotequorum.so
 %{_mandir}/man3/cpg_*3*
 %{_mandir}/man3/evs_*3*
 %{_mandir}/man3/confdb_*3*
+%{_mandir}/man3/votequorum_*3*
 %{_mandir}/man8/cpg_overview.8*
 %{_mandir}/man8/evs_overview.8*
 %{_mandir}/man8/confdb_overview.8*
 %{_mandir}/man8/logsys_overview.8*
+%{_mandir}/man8/votequorum_overview.8*
 
 %changelog
+* Tue Jan 27 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 0.92-6.svn1750
+- Update to svn trunk at revision 1750 from upstream.
+- Include new quorum service in the packaging.
+
 * Mon Dec 15 2008 Fabio M. Di Nitto <fdinitto at redhat.com> - 0.92-5.svn1709
 - Update to svn trunk at revision 1709 from upstream.
 - Update spec file to include new include files.


--- corosync-trunk-1709.diff DELETED ---



From fabbione at fedoraproject.org  Tue Jan 27 10:46:33 2009
From: fabbione at fedoraproject.org (Fabio M. Di Nitto)
Date: Tue, 27 Jan 2009 10:46:33 +0000 (UTC)
Subject: rpms/openais/devel openais-trunk-1682.diff, NONE, 1.1 openais.spec, 
	1.32, 1.33 openais-trunk-1667.diff, 1.1, NONE
Message-ID: <20090127104633.18EA27010B@cvs1.fedora.phx.redhat.com>

Author: fabbione

Update of /cvs/pkgs/rpms/openais/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9109

Modified Files:
	openais.spec 
Added Files:
	openais-trunk-1682.diff 
Removed Files:
	openais-trunk-1667.diff 
Log Message:
Update to latest svn snapshot


openais-trunk-1682.diff:

--- NEW FILE openais-trunk-1682.diff ---
diff -Naurd openais-0.91/include/mar_clm.h openais-trunk/include/mar_clm.h
--- openais-0.91/include/mar_clm.h	2008-08-14 17:00:36.000000000 +0200
+++ openais-trunk/include/mar_clm.h	2008-11-25 18:39:02.000000000 +0100
@@ -39,6 +39,7 @@
 #include <corosync/swab.h>
 #include "saAis.h"
 #include "saClm.h"
+#include "mar_sa.h"
 #include <corosync/mar_gen.h>
 
 #define MAR_CLM_MAX_ADDRESS_LENGTH 64
@@ -110,7 +111,7 @@
 	dest->node_id = src->nodeId;
 	marshall_to_mar_clm_node_address_t (&dest->node_address,
 		&src->nodeAddress);
-	marshall_to_mar_name_t (&dest->node_name, &src->nodeName);
+	marshall_SaNameT_to_mar_name_t (&dest->node_name, &src->nodeName);
 	dest->member = src->member;
 	dest->boot_timestamp = src->bootTimestamp;
 	dest->initial_view_number = src->initialViewNumber;
@@ -123,7 +124,7 @@
 	dest->nodeId = src->node_id;
 	marshall_from_mar_clm_node_address_t (&dest->nodeAddress,
 		&src->node_address);
-	marshall_from_mar_name_t (&dest->nodeName, &src->node_name);
+	marshall_mar_name_t_to_SaNameT (&dest->nodeName, &src->node_name);
 	dest->member = src->member;
 	dest->bootTimestamp = src->boot_timestamp;
 	dest->initialViewNumber = src->initial_view_number;
diff -Naurd openais-0.91/include/mar_sa.h openais-trunk/include/mar_sa.h
--- openais-0.91/include/mar_sa.h	1970-01-01 01:00:00.000000000 +0100
+++ openais-trunk/include/mar_sa.h	2008-12-07 18:43:30.000000000 +0100
@@ -0,0 +1,55 @@
+/*
+ * Copyright 2008, Allied Telesis Labs, New Zealand
+ *
+ * All rights reserved.
+ *
+ * Author: Angus Salkeld (ahsalkeld at gmail.com)
+ *
+ * This software licensed under BSD license, the text of which follows:
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * - Redistributions of source code must retain the above copyright notice,
+ *   this list of conditions and the following disclaimer.
+ * - 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.
+ * - Neither the name of the MontaVista Software, Inc. nor the names of its
+ *   contributors may be used to endorse or promote products derived from this
+ *   software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef AIS_MAR_SA_H_DEFINED
+#define AIS_MAR_SA_H_DEFINED
+
+static inline void marshall_SaNameT_to_mar_name_t (
+	mar_name_t *dest,
+	const SaNameT *src)
+{
+	dest->length = src->length;
+	memcpy (dest->value, src->value, SA_MAX_NAME_LENGTH);
+}
+
+static inline void marshall_mar_name_t_to_SaNameT (
+	SaNameT *dest,
+	const mar_name_t *src)
+{
+	dest->length = src->length;
+	memcpy (dest->value, src->value, SA_MAX_NAME_LENGTH);
+}
+
+#endif /* AIS_MAR_SA_H_DEFINED */
+
diff -Naurd openais-0.91/lib/amf.c openais-trunk/lib/amf.c
--- openais-0.91/lib/amf.c	2008-09-17 21:18:35.000000000 +0200
+++ openais-trunk/lib/amf.c	2008-11-25 18:39:02.000000000 +0100
@@ -49,7 +49,7 @@
 #include <saAmf.h>
 #include <corosync/ipc_gen.h>
 #include <ipc_amf.h>
-#include <corosync/ais_util.h>
+#include "util.h"
 
 
 struct res_overlay {
diff -Naurd openais-0.91/lib/ckpt.c openais-trunk/lib/ckpt.c
--- openais-0.91/lib/ckpt.c	2008-07-24 15:20:09.000000000 +0200
+++ openais-trunk/lib/ckpt.c	2009-01-06 04:58:18.000000000 +0100
@@ -53,8 +53,9 @@
 #include "../include/saCkpt.h"
 #include "../include/ipc_ckpt.h"
 #include "../include/mar_ckpt.h"
+#include "../include/mar_sa.h"
 
-#include <corosync/ais_util.h>
+#include "util.h"
 
 struct message_overlay {
 	mar_res_header_t header __attribute__((aligned(8)));
@@ -634,7 +635,7 @@
 
 	req_lib_ckpt_checkpointopen.header.size = sizeof (struct req_lib_ckpt_checkpointopen);
 	req_lib_ckpt_checkpointopen.header.id = MESSAGE_REQ_CKPT_CHECKPOINT_CHECKPOINTOPEN;
-	marshall_to_mar_name_t (&req_lib_ckpt_checkpointopen.checkpoint_name,
+	marshall_SaNameT_to_mar_name_t (&req_lib_ckpt_checkpointopen.checkpoint_name,
 		(SaNameT *)checkpointName);
 	memcpy (&ckptCheckpointInstance->checkpointName, checkpointName, sizeof (SaNameT));
 	req_lib_ckpt_checkpointopen.async_call = 0;
@@ -759,7 +760,7 @@
 	if (failWithError == SA_AIS_OK) {
 		memcpy (&ckptCheckpointInstance->checkpointName, checkpointName,
 			sizeof (SaNameT));
-		marshall_to_mar_name_t (&req_lib_ckpt_checkpointopen.checkpoint_name,
+		marshall_SaNameT_to_mar_name_t (&req_lib_ckpt_checkpointopen.checkpoint_name,
 			(SaNameT *)checkpointName);
 	}
 
@@ -800,7 +801,7 @@
 
 	saHandleInstancePut (&ckptHandleDatabase, ckptHandle);
 
-	return (error == SA_AIS_OK ? res_lib_ckpt_checkpointopenasync.header.error : error);
+	return (SA_AIS_OK);
 
 error_put_destroy:
 	saHandleInstancePut (&checkpointHandleDatabase, checkpointHandle);
@@ -829,7 +830,7 @@
 
 	req_lib_ckpt_checkpointclose.header.size = sizeof (struct req_lib_ckpt_checkpointclose);
 	req_lib_ckpt_checkpointclose.header.id = MESSAGE_REQ_CKPT_CHECKPOINT_CHECKPOINTCLOSE;
-	marshall_to_mar_name_t (&req_lib_ckpt_checkpointclose.checkpoint_name,
+	marshall_SaNameT_to_mar_name_t (&req_lib_ckpt_checkpointclose.checkpoint_name,
 		&ckptCheckpointInstance->checkpointName);
 	req_lib_ckpt_checkpointclose.ckpt_id =
 		ckptCheckpointInstance->checkpointId;
@@ -877,7 +878,7 @@
 
 	req_lib_ckpt_checkpointunlink.header.size = sizeof (struct req_lib_ckpt_checkpointunlink);
 	req_lib_ckpt_checkpointunlink.header.id = MESSAGE_REQ_CKPT_CHECKPOINT_CHECKPOINTUNLINK;
-	marshall_to_mar_name_t (&req_lib_ckpt_checkpointunlink.checkpoint_name,
+	marshall_SaNameT_to_mar_name_t (&req_lib_ckpt_checkpointunlink.checkpoint_name,
 		(SaNameT *)checkpointName);
 
 	pthread_mutex_lock (&ckptInstance->response_mutex);
@@ -916,7 +917,7 @@
 	req_lib_ckpt_checkpointretentiondurationset.header.id = MESSAGE_REQ_CKPT_CHECKPOINT_CHECKPOINTRETENTIONDURATIONSET;
 
 	req_lib_ckpt_checkpointretentiondurationset.retention_duration = retentionDuration;
-	marshall_to_mar_name_t (&req_lib_ckpt_checkpointretentiondurationset.checkpoint_name,
+	marshall_SaNameT_to_mar_name_t (&req_lib_ckpt_checkpointretentiondurationset.checkpoint_name,
 		&ckptCheckpointInstance->checkpointName);
 	req_lib_ckpt_checkpointretentiondurationset.ckpt_id =
 		ckptCheckpointInstance->checkpointId;
@@ -957,7 +958,7 @@
 
 	req_lib_ckpt_activereplicaset.header.size = sizeof (struct req_lib_ckpt_activereplicaset);
 	req_lib_ckpt_activereplicaset.header.id = MESSAGE_REQ_CKPT_ACTIVEREPLICASET;
-	marshall_to_mar_name_t (&req_lib_ckpt_activereplicaset.checkpoint_name,
+	marshall_SaNameT_to_mar_name_t (&req_lib_ckpt_activereplicaset.checkpoint_name,
 		&ckptCheckpointInstance->checkpointName);
 	req_lib_ckpt_activereplicaset.ckpt_id =
 		ckptCheckpointInstance->checkpointId;
@@ -1000,7 +1001,7 @@
 	req_lib_ckpt_checkpointstatusget.header.size = sizeof (struct req_lib_ckpt_checkpointstatusget);
 	req_lib_ckpt_checkpointstatusget.header.id = MESSAGE_REQ_CKPT_CHECKPOINT_CHECKPOINTSTATUSGET;
 
-	marshall_to_mar_name_t (&req_lib_ckpt_checkpointstatusget.checkpoint_name,
+	marshall_SaNameT_to_mar_name_t (&req_lib_ckpt_checkpointstatusget.checkpoint_name,
 		&ckptCheckpointInstance->checkpointName);
 	req_lib_ckpt_checkpointstatusget.ckpt_id =
 		ckptCheckpointInstance->checkpointId;
@@ -1065,7 +1066,7 @@
 	req_lib_ckpt_sectioncreate.expiration_time = sectionCreationAttributes->expirationTime;
 	req_lib_ckpt_sectioncreate.initial_data_size = initialDataSize;
 
-	marshall_to_mar_name_t (&req_lib_ckpt_sectioncreate.checkpoint_name,
+	marshall_SaNameT_to_mar_name_t (&req_lib_ckpt_sectioncreate.checkpoint_name,
 		&ckptCheckpointInstance->checkpointName);
 	req_lib_ckpt_sectioncreate.ckpt_id =
 		ckptCheckpointInstance->checkpointId;
@@ -1137,7 +1138,7 @@
 	req_lib_ckpt_sectiondelete.header.id = MESSAGE_REQ_CKPT_CHECKPOINT_SECTIONDELETE;
 	req_lib_ckpt_sectiondelete.id_len = sectionId->idLen;
 
[...2279 lines suppressed...]
@@ -1754,7 +1754,7 @@
 		&checkpoint_list_head,
 		&req_exec_ckpt_sectioncreate->checkpoint_name,
 		req_exec_ckpt_sectioncreate->ckpt_id);
-	if (checkpoint == 0) {
+	if (checkpoint == NULL) {
 		error = SA_AIS_ERR_NOT_EXIST;
 		goto error_exit;
 	}
@@ -1917,7 +1917,7 @@
 		&checkpoint_list_head,
 		&req_exec_ckpt_sectiondelete->checkpoint_name,
 		req_exec_ckpt_sectiondelete->ckpt_id);
-	if (checkpoint == 0) {
+	if (checkpoint == NULL) {
 		error = SA_AIS_ERR_NOT_EXIST;
 		goto error_exit;
 	}
@@ -1985,7 +1985,7 @@
 		&checkpoint_list_head,
 		&req_exec_ckpt_sectionexpirationtimeset->checkpoint_name,
 		req_exec_ckpt_sectionexpirationtimeset->ckpt_id);
-	if (checkpoint == 0) {
+	if (checkpoint == NULL) {
 		error = SA_AIS_ERR_NOT_EXIST;
 		goto error_exit;
 	}
@@ -2079,7 +2079,7 @@
 		&checkpoint_list_head,
 		&req_exec_ckpt_sectionwrite->checkpoint_name,
 		req_exec_ckpt_sectionwrite->ckpt_id);
-	if (checkpoint == 0) {
+	if (checkpoint == NULL) {
 		log_printf (LOG_LEVEL_ERROR, "checkpoint_find returned 0 Calling error_exit.\n");
 		error = SA_AIS_ERR_NOT_EXIST;
 		goto error_exit;
@@ -2188,7 +2188,7 @@
 		&checkpoint_list_head,
 		&req_exec_ckpt_sectionoverwrite->checkpoint_name,
 		req_exec_ckpt_sectionoverwrite->ckpt_id);
-	if (checkpoint == 0) {
+	if (checkpoint == NULL) {
 		error = SA_AIS_ERR_NOT_EXIST;
 		goto error_exit;
 	}
@@ -2288,7 +2288,7 @@
 		&checkpoint_list_head,
 		&req_exec_ckpt_sectionread->checkpoint_name,
 		req_exec_ckpt_sectionread->ckpt_id);
-	if (checkpoint == 0) {
+	if (checkpoint == NULL) {
 		error = SA_AIS_ERR_LIBRARY;
 		goto error_exit;
 	}
@@ -2566,11 +2566,15 @@
 	/*
 	 * Make sure checkpoint is collocated and async update option
 	 */
+	if (checkpoint == NULL) {
+		error = SA_AIS_ERR_NOT_EXIST;
+	} else
 	if (((checkpoint->checkpoint_creation_attributes.creation_flags & SA_CKPT_CHECKPOINT_COLLOCATED) == 0) ||
 		(checkpoint->checkpoint_creation_attributes.creation_flags & (SA_CKPT_WR_ACTIVE_REPLICA | SA_CKPT_WR_ACTIVE_REPLICA_WEAK)) == 0) {
 		error = SA_AIS_ERR_BAD_OPERATION;
+	} else {
+		checkpoint->active_replica_set = 1;
 	}
-	checkpoint->active_replica_set = 1;
 	res_lib_ckpt_activereplicaset.header.size = sizeof (struct res_lib_ckpt_activereplicaset);
 	res_lib_ckpt_activereplicaset.header.id = MESSAGE_RES_CKPT_ACTIVEREPLICASET;
 	res_lib_ckpt_activereplicaset.header.error = error;
@@ -2952,6 +2956,9 @@
 		&checkpoint_list_head,
 		&req_lib_ckpt_checkpointsynchronize->checkpoint_name,
 		req_lib_ckpt_checkpointsynchronize->ckpt_id);
+	if (checkpoint == NULL) {
+		res_lib_ckpt_checkpointsynchronize.header.error = SA_AIS_ERR_NOT_EXIST;	
+	} else
 	if ((checkpoint->checkpoint_creation_attributes.creation_flags & (SA_CKPT_WR_ACTIVE_REPLICA | SA_CKPT_WR_ACTIVE_REPLICA_WEAK)) == 0) {
 		res_lib_ckpt_checkpointsynchronize.header.error = SA_AIS_ERR_BAD_OPERATION;
 	} else
@@ -2982,6 +2989,9 @@
 		&checkpoint_list_head,
 		&req_lib_ckpt_checkpointsynchronizeasync->checkpoint_name,
 		req_lib_ckpt_checkpointsynchronizeasync->ckpt_id);
+	if (checkpoint == NULL) {
+		res_lib_ckpt_checkpointsynchronizeasync.header.error = SA_AIS_ERR_NOT_EXIST;
+	} else
 	if ((checkpoint->checkpoint_creation_attributes.creation_flags & (SA_CKPT_WR_ACTIVE_REPLICA | SA_CKPT_WR_ACTIVE_REPLICA_WEAK)) == 0) {
 		res_lib_ckpt_checkpointsynchronizeasync.header.error = SA_AIS_ERR_BAD_OPERATION;
 	} else
@@ -3127,9 +3137,10 @@
 	res_lib_ckpt_sectioniterationinitialize.header.id = MESSAGE_RES_CKPT_SECTIONITERATIONINITIALIZE;
 	res_lib_ckpt_sectioniterationinitialize.header.error = error;
 	res_lib_ckpt_sectioniterationinitialize.iteration_handle = iteration_handle;
-	res_lib_ckpt_sectioniterationinitialize.max_section_id_size =
-		checkpoint->checkpoint_creation_attributes.max_section_id_size;
-
+	if (checkpoint != NULL) {
+		res_lib_ckpt_sectioniterationinitialize.max_section_id_size =
+			checkpoint->checkpoint_creation_attributes.max_section_id_size;
+	}
 	api->ipc_conn_send_response (
 		conn,
 		&res_lib_ckpt_sectioniterationinitialize,
diff -Naurd openais-0.91/services/Makefile openais-trunk/services/Makefile
--- openais-0.91/services/Makefile	2008-09-17 21:18:35.000000000 +0200
+++ openais-trunk/services/Makefile	2008-12-08 17:12:43.000000000 +0100
@@ -63,6 +63,8 @@
 
 ifeq (${OPENAIS_COMPAT}, DARWIN)
 
+COROSYNC_BIN=$(PREFIX)/sbin/corosync
+
 service_evs.lcrso: evs.o
 	$(CC) $(LDFLAGS) -bundle $(LDFLAGS) -bundle_loader $(COROSYNC_BIN) -bind_at_load evs.o -o $@
 
diff -Naurd openais-0.91/test/ckptbench.c openais-trunk/test/ckptbench.c
--- openais-0.91/test/ckptbench.c	2008-07-21 10:21:13.000000000 +0200
+++ openais-trunk/test/ckptbench.c	2009-01-20 19:11:04.000000000 +0100
@@ -1,7 +1,7 @@
 #define _BSD_SOURCE
 /*
  * Copyright (c) 2002-2004 MontaVista Software, Inc.
- * Copyright (c) 2006 Sun Microsystems, Inc.
+ * Copyright (c) 2006-2009 Red Hat, Inc.
  *
  * All rights reserved.
  *
@@ -97,29 +97,29 @@
 SaCkptCheckpointCreationAttributesT checkpointCreationAttributes = {
         .creationFlags =        SA_CKPT_WR_ALL_REPLICAS,
         .checkpointSize =       250000,
-        .retentionDuration =    0,
+        .retentionDuration =    SA_TIME_END,
         .maxSections =          5,
         .maxSectionSize =       250000,
         .maxSectionIdSize =     15
 };
 
 SaCkptSectionIdT sectionId1 = {
-	14,
+	13,
 	(SaUint8T *) "section ID #1"
 };
 
 SaCkptSectionIdT sectionId2 = {
-	14,
+	13,
 	(SaUint8T *) "section ID #2"
 };
 SaCkptSectionCreationAttributesT sectionCreationAttributes1 = {
 	&sectionId1,
-	0xFFFFFFFF
+	SA_TIME_END
 };
 
 SaCkptSectionCreationAttributesT sectionCreationAttributes2 = {
 	&sectionId2,
-	0xFFFFFFFF
+	SA_TIME_END
 };
 
 char readBuffer1[1025];
@@ -129,7 +129,7 @@
 SaCkptIOVectorElementT ReadVectorElements[] = {
 	{
 		{
-			14,
+			13,
 			(SaUint8T *) "section ID #1"
 		},
 		readBuffer1,
@@ -139,7 +139,7 @@
 	},
 	{
 		{
-			14,
+			13,
 			(SaUint8T *) "section ID #2"
 		},
 		readBuffer2,
@@ -156,7 +156,7 @@
 SaCkptIOVectorElementT WriteVectorElements[] = {
 	{
 		{
-			14,
+			13,
 			(SaUint8T *) "section ID #1"
 		},
 		data, /*"written data #1, this should extend past end of old section data", */
@@ -167,7 +167,7 @@
 #ifdef COMPILE_OUT
 	{
 		{
-			14,
+			13,
 			(SaUint8T *) "section ID #2"
 		},
 		data, /*"written data #2, this should extend past end of old section data" */


Index: openais.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openais/devel/openais.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- openais.spec	15 Dec 2008 18:14:47 -0000	1.32
+++ openais.spec	27 Jan 2009 10:46:02 -0000	1.33
@@ -1,20 +1,20 @@
-%define alphatag svn1667
+%define alphatag svn1682
 
 Name: openais
 Summary: The openais Standards-Based Cluster Framework executive and APIs
 Version: 0.91
-Release: 4%{?alphatag:.%{alphatag}}%{?dist}
+Release: 5%{?alphatag:.%{alphatag}}%{?dist}
 License: BSD
 Group: System Environment/Base
 URL: http://developer.osdl.org/dev/openais/
 Source0: http://www.osdl.org/downloads/openais-%{version}/openais-%{version}.tar.gz
-Patch0: openais-trunk-1667.diff
+Patch0: openais-trunk-1682.diff
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires(post): /sbin/chkconfig
 Requires(preun): /sbin/chkconfig
-Requires: corosync >= 0.92-5
-BuildRequires: corosync-devel >= 0.92-5
+Requires: corosync >= 0.92-6
+BuildRequires: corosync-devel >= 0.92-6
 Conflicts: openais-devel <= 0.89
 
 %description 
@@ -116,6 +116,9 @@
 %{_libdir}/openais/libSaMsg.so
 
 %changelog
+* Tue Jan 27 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 0.91-5.svn1682
+- Update to svn trunk at revision 1682 from upstream.
+
 * Mon Dec 15 2008 Fabio M. Di Nitto <fdinitto at redhat.com> - 0.91-4.svn1667
 - No change rebuild against newer corosync.
 


--- openais-trunk-1667.diff DELETED ---



From hadess at fedoraproject.org  Tue Jan 27 10:50:31 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Tue, 27 Jan 2009 10:50:31 +0000 (UTC)
Subject: comps comps-f11.xml.in,1.83,1.84
Message-ID: <20090127105031.A31497010B@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9827

Modified Files:
	comps-f11.xml.in 
Log Message:
- Add fprintd-pam as one of the default packages, to get fingerprint
  reader support out of the box



Index: comps-f11.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f11.xml.in,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- comps-f11.xml.in	27 Jan 2009 07:28:59 -0000	1.83
+++ comps-f11.xml.in	27 Jan 2009 10:50:00 -0000	1.84
@@ -213,6 +213,7 @@
       <packagereq type="default">eject</packagereq>
       <packagereq type="default">fbset</packagereq>
       <packagereq type="default">finger</packagereq>
+      <packagereq type="default">fprintd-pam</packagereq>
       <packagereq type="default">ftp</packagereq>
       <packagereq type="default">gnupg</packagereq>
       <packagereq type="default">hunspell</packagereq>



From mcepl at fedoraproject.org  Tue Jan 27 10:53:39 2009
From: mcepl at fedoraproject.org (Matej Cepl)
Date: Tue, 27 Jan 2009 10:53:39 +0000 (UTC)
Subject: rpms/python-libasyncns/devel .cvsignore, 1.2,
	1.3 python-libasyncns.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20090127105339.11FE77010B@cvs1.fedora.phx.redhat.com>

Author: mcepl

Update of /cvs/extras/rpms/python-libasyncns/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10431

Modified Files:
	.cvsignore python-libasyncns.spec sources 
Log Message:
New upstream release (basically adding license to test/ files)


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-libasyncns/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	17 Jan 2009 10:21:28 -0000	1.2
+++ .cvsignore	27 Jan 2009 10:53:08 -0000	1.3
@@ -1 +1 @@
-libasyncns-python-0.7.tar.bz2
+libasyncns-python-0.7.1.tar.bz2


Index: python-libasyncns.spec
===================================================================
RCS file: /cvs/extras/rpms/python-libasyncns/devel/python-libasyncns.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- python-libasyncns.spec	17 Jan 2009 10:21:28 -0000	1.1
+++ python-libasyncns.spec	27 Jan 2009 10:53:08 -0000	1.2
@@ -1,8 +1,8 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           python-libasyncns
-Version:        0.7
-Release:        2%{?dist}
+Version:        0.7.1
+Release:        1%{?dist}
 Summary:        Python binding for libasyncns
 
 Group:          Development/Languages
@@ -43,6 +43,9 @@
 
 
 %changelog
+* Tue Jan 27 2009 Matej Cepl <mcepl at redhat.com> 0.7.1-1
+- New upstream release (basically adding license to test/ files).
+
 * Thu Jan 15 2009 Mat??j Cepl <mcepl at redhat.com> 0.7-2
 - Modified according to reviewers comments.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-libasyncns/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	17 Jan 2009 10:21:28 -0000	1.2
+++ sources	27 Jan 2009 10:53:08 -0000	1.3
@@ -1 +1 @@
-a121964ef8ad9aa6b553326b595aaf0c  libasyncns-python-0.7.tar.bz2
+99c6595915efaf2309d52bed3c17f13d  libasyncns-python-0.7.1.tar.bz2



From mcepl at fedoraproject.org  Tue Jan 27 10:55:05 2009
From: mcepl at fedoraproject.org (Matej Cepl)
Date: Tue, 27 Jan 2009 10:55:05 +0000 (UTC)
Subject: rpms/python-libasyncns/F-10 python-libasyncns.spec, 1.1, 1.2 sources,
	1.2, 1.3
Message-ID: <20090127105505.2EF807010B@cvs1.fedora.phx.redhat.com>

Author: mcepl

Update of /cvs/extras/rpms/python-libasyncns/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10878

Modified Files:
	python-libasyncns.spec sources 
Log Message:
New upstream release (basically adding license to test/ files)


Index: python-libasyncns.spec
===================================================================
RCS file: /cvs/extras/rpms/python-libasyncns/F-10/python-libasyncns.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- python-libasyncns.spec	17 Jan 2009 10:24:51 -0000	1.1
+++ python-libasyncns.spec	27 Jan 2009 10:54:34 -0000	1.2
@@ -1,8 +1,8 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           python-libasyncns
-Version:        0.7
-Release:        2%{?dist}
+Version:        0.7.1
+Release:        1%{?dist}
 Summary:        Python binding for libasyncns
 
 Group:          Development/Languages
@@ -43,6 +43,9 @@
 
 
 %changelog
+* Tue Jan 27 2009 Matej Cepl <mcepl at redhat.com> 0.7.1-1
+- New upstream release (basically adding license to test/ files).
+
 * Thu Jan 15 2009 Mat??j Cepl <mcepl at redhat.com> 0.7-2
 - Modified according to reviewers comments.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-libasyncns/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	17 Jan 2009 10:24:51 -0000	1.2
+++ sources	27 Jan 2009 10:54:34 -0000	1.3
@@ -1 +1 @@
-a121964ef8ad9aa6b553326b595aaf0c  libasyncns-python-0.7.tar.bz2
+99c6595915efaf2309d52bed3c17f13d  libasyncns-python-0.7.1.tar.bz2



From peter at fedoraproject.org  Tue Jan 27 10:55:32 2009
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Tue, 27 Jan 2009 10:55:32 +0000 (UTC)
Subject: rpms/rtpproxy/devel rtpproxy--init.diff, NONE,
	1.1 rtpproxy.sysconfig, 
	NONE, 1.1 .cvsignore, 1.8, 1.9 import.log, 1.3,
	1.4 rtpproxy.spec, 1.8, 1.9 sources, 1.8,
	1.9 rtpproxy--init-disabled_by_default.diff, 1.1, NONE
Message-ID: <20090127105532.C08067010B@cvs1.fedora.phx.redhat.com>

Author: peter

Update of /cvs/pkgs/rpms/rtpproxy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11021/devel

Modified Files:
	.cvsignore import.log rtpproxy.spec sources 
Added Files:
	rtpproxy--init.diff rtpproxy.sysconfig 
Removed Files:
	rtpproxy--init-disabled_by_default.diff 
Log Message:
Snapshot 1.2.beta.200901120

rtpproxy--init.diff:

--- NEW FILE rtpproxy--init.diff ---
--- rpm/rtpproxy.init~	2007-11-29 03:46:26.000000000 +0300
+++ rpm/rtpproxy.init	2009-01-27 13:40:48.000000000 +0300
@@ -2,7 +2,7 @@
 #
 # Startup script for rtpproxy
 #
-# chkconfig: 345 85 15
+# chkconfig: - 85 15
 # description: A symmetric RTP proxy
 #
 # processname: rtpproxy
@@ -14,7 +14,8 @@
 rtpproxy=/usr/bin/rtpproxy
 prog=rtpproxy
 RETVAL=0
-OPTIONS=
+
+[ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog
 
 start() {
         echo -n $"Starting $prog: "


--- NEW FILE rtpproxy.sysconfig ---
OPTIONS="-u rtpproxy"



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rtpproxy/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	12 Aug 2008 20:19:52 -0000	1.8
+++ .cvsignore	27 Jan 2009 10:55:02 -0000	1.9
@@ -1 +1 @@
-rtpproxy-1.2.alpha.200807211.tar.gz
+rtpproxy-1.2.beta.200901120.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/rtpproxy/devel/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- import.log	6 Oct 2008 12:27:02 -0000	1.3
+++ import.log	27 Jan 2009 10:55:02 -0000	1.4
@@ -1,3 +1,4 @@
 rtpproxy-1_1-1_fc9:HEAD:rtpproxy-1.1-1.fc9.src.rpm:1213798723
 rtpproxy-1_2-0_1_alpha_200807211_fc9:HEAD:rtpproxy-1.2-0.1.alpha.200807211.fc9.src.rpm:1218572366
 rtpproxy-1_2-0_2_alpha_200807211_fc9:HEAD:rtpproxy-1.2-0.2.alpha.200807211.fc9.src.rpm:1223295887
+rtpproxy-1_2-0_3_beta_200901120_fc10:HEAD:rtpproxy-1.2-0.3.beta.200901120.fc10.src.rpm:1233053623


Index: rtpproxy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rtpproxy/devel/rtpproxy.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- rtpproxy.spec	6 Oct 2008 12:27:02 -0000	1.8
+++ rtpproxy.spec	27 Jan 2009 10:55:02 -0000	1.9
@@ -1,16 +1,18 @@
 Name:           rtpproxy
 Version:        1.2
-Release:        0.2.alpha.200807211%{?dist}
+Release:        0.3.beta.200901120%{?dist}
 Summary:        A symmetric RTP proxy
 Group:          Applications/Internet
 License:        BSD
 URL:            http://www.rtpproxy.org
-Source0:        http://b2bua.org/chrome/site/%{name}-%{version}.alpha.200807211.tar.gz
-Patch0:		rtpproxy--init-disabled_by_default.diff
+Source0:        http://b2bua.org/chrome/site/%{name}-%{version}.beta.200901120.tar.gz
+Source1:        rtpproxy.sysconfig
+# Fedora specific
+Patch0:         rtpproxy--init.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:	gsm-devel
-Requires(pre):	/usr/sbin/useradd
-Requires(post):	/sbin/chkconfig
+BuildRequires:  gsm-devel
+Requires(pre):  /usr/sbin/useradd
+Requires(post): /sbin/chkconfig
 Requires(preun):/sbin/chkconfig
 Requires(preun):/sbin/service
 
@@ -22,8 +24,8 @@
 
 
 %prep
-%setup -q -n %{name}-%{version}.alpha.200807211
-%patch0 -p0 -b .init_disable
+%setup -q -n %{name}-%{version}.beta.200901120
+%patch0 -p0 -b .init_fix
 
 
 %build
@@ -34,7 +36,8 @@
 %install
 rm -rf %{buildroot}
 make install DESTDIR=%{buildroot}
-install -D -p -m755 rpm/rtpproxy.init $RPM_BUILD_ROOT/%{_sysconfdir}/init.d/%{name}
+install -D -p -m 0755 rpm/rtpproxy.init $RPM_BUILD_ROOT%{_sysconfdir}/init.d/%{name}
+install -D -p -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/%{name}
 install -d $RPM_BUILD_ROOT%{_localstatedir}/lib/%{name}
 
 
@@ -60,7 +63,8 @@
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING README README.remote
-%config(noreplace) %{_sysconfdir}/init.d/%{name}
+%config(noreplace) %{_sysconfdir}/sysconfig/%{name}
+%{_sysconfdir}/init.d/%{name}
 %{_bindir}/rtpproxy
 %{_bindir}/makeann
 %{_mandir}/man8/rtpproxy.8*
@@ -68,6 +72,10 @@
 
 
 %changelog
+* Tue Jan 27 2009 Peter Lemenkov <lemenkov at gmail.com> - 1.2-0.3.beta.200901120
+- Snapshot 1.2.beta.200901120
+- Added sysconfig file
+
 * Mon Oct  6 2008 Peter Lemenkov <lemenkov at gmail.com> - 1.2-0.2.alpha.200807211
 - Added missing BuildRequires
 - Added init-script


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rtpproxy/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	12 Aug 2008 20:19:52 -0000	1.8
+++ sources	27 Jan 2009 10:55:02 -0000	1.9
@@ -1 +1 @@
-8657dd1f8f3e802f4a6220a45cb9bd46  rtpproxy-1.2.alpha.200807211.tar.gz
+555f3fdb400e03efd7f2166ea45677c9  rtpproxy-1.2.beta.200901120.tar.gz


--- rtpproxy--init-disabled_by_default.diff DELETED ---



From peter at fedoraproject.org  Tue Jan 27 10:58:25 2009
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Tue, 27 Jan 2009 10:58:25 +0000 (UTC)
Subject: rpms/rtpproxy/F-10 rtpproxy--init.diff, NONE, 1.1 rtpproxy.sysconfig,
	NONE, 1.1 .cvsignore, 1.8, 1.9 import.log, 1.3,
	1.4 rtpproxy.spec, 1.8, 1.9 sources, 1.8,
	1.9 rtpproxy--init-disabled_by_default.diff, 1.1, NONE
Message-ID: <20090127105825.7234A7010B@cvs1.fedora.phx.redhat.com>

Author: peter

Update of /cvs/pkgs/rpms/rtpproxy/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11741/F-10

Modified Files:
	.cvsignore import.log rtpproxy.spec sources 
Added Files:
	rtpproxy--init.diff rtpproxy.sysconfig 
Removed Files:
	rtpproxy--init-disabled_by_default.diff 
Log Message:
Snapshot 1.2.beta.200901120

rtpproxy--init.diff:

--- NEW FILE rtpproxy--init.diff ---
--- rpm/rtpproxy.init~	2007-11-29 03:46:26.000000000 +0300
+++ rpm/rtpproxy.init	2009-01-27 13:40:48.000000000 +0300
@@ -2,7 +2,7 @@
 #
 # Startup script for rtpproxy
 #
-# chkconfig: 345 85 15
+# chkconfig: - 85 15
 # description: A symmetric RTP proxy
 #
 # processname: rtpproxy
@@ -14,7 +14,8 @@
 rtpproxy=/usr/bin/rtpproxy
 prog=rtpproxy
 RETVAL=0
-OPTIONS=
+
+[ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog
 
 start() {
         echo -n $"Starting $prog: "


--- NEW FILE rtpproxy.sysconfig ---
OPTIONS="-u rtpproxy"



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rtpproxy/F-10/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	12 Aug 2008 20:19:52 -0000	1.8
+++ .cvsignore	27 Jan 2009 10:57:55 -0000	1.9
@@ -1 +1 @@
-rtpproxy-1.2.alpha.200807211.tar.gz
+rtpproxy-1.2.beta.200901120.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/rtpproxy/F-10/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- import.log	6 Oct 2008 12:27:02 -0000	1.3
+++ import.log	27 Jan 2009 10:57:55 -0000	1.4
@@ -1,3 +1,4 @@
 rtpproxy-1_1-1_fc9:HEAD:rtpproxy-1.1-1.fc9.src.rpm:1213798723
 rtpproxy-1_2-0_1_alpha_200807211_fc9:HEAD:rtpproxy-1.2-0.1.alpha.200807211.fc9.src.rpm:1218572366
 rtpproxy-1_2-0_2_alpha_200807211_fc9:HEAD:rtpproxy-1.2-0.2.alpha.200807211.fc9.src.rpm:1223295887
+rtpproxy-1_2-0_3_beta_200901120_fc10:F-10:rtpproxy-1.2-0.3.beta.200901120.fc10.src.rpm:1233053827


Index: rtpproxy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rtpproxy/F-10/rtpproxy.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- rtpproxy.spec	6 Oct 2008 12:27:02 -0000	1.8
+++ rtpproxy.spec	27 Jan 2009 10:57:55 -0000	1.9
@@ -1,16 +1,18 @@
 Name:           rtpproxy
 Version:        1.2
-Release:        0.2.alpha.200807211%{?dist}
+Release:        0.3.beta.200901120%{?dist}
 Summary:        A symmetric RTP proxy
 Group:          Applications/Internet
 License:        BSD
 URL:            http://www.rtpproxy.org
-Source0:        http://b2bua.org/chrome/site/%{name}-%{version}.alpha.200807211.tar.gz
-Patch0:		rtpproxy--init-disabled_by_default.diff
+Source0:        http://b2bua.org/chrome/site/%{name}-%{version}.beta.200901120.tar.gz
+Source1:        rtpproxy.sysconfig
+# Fedora specific
+Patch0:         rtpproxy--init.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:	gsm-devel
-Requires(pre):	/usr/sbin/useradd
-Requires(post):	/sbin/chkconfig
+BuildRequires:  gsm-devel
+Requires(pre):  /usr/sbin/useradd
+Requires(post): /sbin/chkconfig
 Requires(preun):/sbin/chkconfig
 Requires(preun):/sbin/service
 
@@ -22,8 +24,8 @@
 
 
 %prep
-%setup -q -n %{name}-%{version}.alpha.200807211
-%patch0 -p0 -b .init_disable
+%setup -q -n %{name}-%{version}.beta.200901120
+%patch0 -p0 -b .init_fix
 
 
 %build
@@ -34,7 +36,8 @@
 %install
 rm -rf %{buildroot}
 make install DESTDIR=%{buildroot}
-install -D -p -m755 rpm/rtpproxy.init $RPM_BUILD_ROOT/%{_sysconfdir}/init.d/%{name}
+install -D -p -m 0755 rpm/rtpproxy.init $RPM_BUILD_ROOT%{_sysconfdir}/init.d/%{name}
+install -D -p -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/%{name}
 install -d $RPM_BUILD_ROOT%{_localstatedir}/lib/%{name}
 
 
@@ -60,7 +63,8 @@
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING README README.remote
-%config(noreplace) %{_sysconfdir}/init.d/%{name}
+%config(noreplace) %{_sysconfdir}/sysconfig/%{name}
+%{_sysconfdir}/init.d/%{name}
 %{_bindir}/rtpproxy
 %{_bindir}/makeann
 %{_mandir}/man8/rtpproxy.8*
@@ -68,6 +72,10 @@
 
 
 %changelog
+* Tue Jan 27 2009 Peter Lemenkov <lemenkov at gmail.com> - 1.2-0.3.beta.200901120
+- Snapshot 1.2.beta.200901120
+- Added sysconfig file
+
 * Mon Oct  6 2008 Peter Lemenkov <lemenkov at gmail.com> - 1.2-0.2.alpha.200807211
 - Added missing BuildRequires
 - Added init-script


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rtpproxy/F-10/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	12 Aug 2008 20:19:52 -0000	1.8
+++ sources	27 Jan 2009 10:57:55 -0000	1.9
@@ -1 +1 @@
-8657dd1f8f3e802f4a6220a45cb9bd46  rtpproxy-1.2.alpha.200807211.tar.gz
+555f3fdb400e03efd7f2166ea45677c9  rtpproxy-1.2.beta.200901120.tar.gz


--- rtpproxy--init-disabled_by_default.diff DELETED ---



From peter at fedoraproject.org  Tue Jan 27 11:03:22 2009
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Tue, 27 Jan 2009 11:03:22 +0000 (UTC)
Subject: rpms/rtpproxy/F-9 rtpproxy--init.diff, NONE, 1.1 rtpproxy.sysconfig,
	NONE, 1.1 .cvsignore, 1.7, 1.8 import.log, 1.1,
	1.2 rtpproxy.spec, 1.6, 1.7 sources, 1.7, 1.8
Message-ID: <20090127110322.E34F77010B@cvs1.fedora.phx.redhat.com>

Author: peter

Update of /cvs/pkgs/rpms/rtpproxy/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12881/F-9

Modified Files:
	.cvsignore import.log rtpproxy.spec sources 
Added Files:
	rtpproxy--init.diff rtpproxy.sysconfig 
Log Message:
Snapshot 1.2.beta.200901120

rtpproxy--init.diff:

--- NEW FILE rtpproxy--init.diff ---
--- rpm/rtpproxy.init~	2007-11-29 03:46:26.000000000 +0300
+++ rpm/rtpproxy.init	2009-01-27 13:40:48.000000000 +0300
@@ -2,7 +2,7 @@
 #
 # Startup script for rtpproxy
 #
-# chkconfig: 345 85 15
+# chkconfig: - 85 15
 # description: A symmetric RTP proxy
 #
 # processname: rtpproxy
@@ -14,7 +14,8 @@
 rtpproxy=/usr/bin/rtpproxy
 prog=rtpproxy
 RETVAL=0
-OPTIONS=
+
+[ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog
 
 start() {
         echo -n $"Starting $prog: "


--- NEW FILE rtpproxy.sysconfig ---
OPTIONS="-u rtpproxy"



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rtpproxy/F-9/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	18 Jun 2008 14:24:07 -0000	1.7
+++ .cvsignore	27 Jan 2009 11:02:51 -0000	1.8
@@ -1 +1 @@
-rtpproxy-1.1.tar.gz
+rtpproxy-1.2.beta.200901120.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/rtpproxy/F-9/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	18 Jun 2008 14:24:07 -0000	1.1
+++ import.log	27 Jan 2009 11:02:52 -0000	1.2
@@ -1 +1,2 @@
 rtpproxy-1_1-1_fc9:F-9:rtpproxy-1.1-1.fc9.src.rpm:1213798901
+rtpproxy-1_2-0_3_beta_200901120_fc10:F-9:rtpproxy-1.2-0.3.beta.200901120.fc10.src.rpm:1233054060


Index: rtpproxy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rtpproxy/F-9/rtpproxy.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- rtpproxy.spec	18 Jun 2008 14:24:07 -0000	1.6
+++ rtpproxy.spec	27 Jan 2009 11:02:52 -0000	1.7
@@ -1,43 +1,88 @@
 Name:           rtpproxy
-Version:        1.1
-Release:        1%{?dist}
+Version:        1.2
+Release:        0.3.beta.200901120%{?dist}
 Summary:        A symmetric RTP proxy
-
 Group:          Applications/Internet
 License:        BSD
 URL:            http://www.rtpproxy.org
-Source0:        http://b2bua.org/chrome/site/%{name}-%{version}.tar.gz
+Source0:        http://b2bua.org/chrome/site/%{name}-%{version}.beta.200901120.tar.gz
+Source1:        rtpproxy.sysconfig
+# Fedora specific
+Patch0:         rtpproxy--init.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires:  gsm-devel
+Requires(pre):  /usr/sbin/useradd
+Requires(post): /sbin/chkconfig
+Requires(preun):/sbin/chkconfig
+Requires(preun):/sbin/service
+
 
 %description
 This is symmetric RTP proxy designed to be used in conjunction with
 the SIP Express Router (SER) or any other SIP proxy capable of
 rewriting SDP bodies in SIP messages that it processes.
 
+
 %prep
-%setup -q
+%setup -q -n %{name}-%{version}.beta.200901120
+%patch0 -p0 -b .init_fix
+
 
 %build
 %configure
 make %{?_smp_mflags}
 
+
 %install
 rm -rf %{buildroot}
 make install DESTDIR=%{buildroot}
+install -D -p -m 0755 rpm/rtpproxy.init $RPM_BUILD_ROOT%{_sysconfdir}/init.d/%{name}
+install -D -p -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/%{name}
+install -d $RPM_BUILD_ROOT%{_localstatedir}/lib/%{name}
 
 
 %clean
 rm -rf %{buildroot}
 
+%pre
+/usr/sbin/useradd -r -c "RTPProxy service"  -d %{_localstatedir}/lib/%{name} -s /sbin/nologin %{name} 2>/dev/null || :
+
+%post
+if [ $1 -eq 1 ]; then
+	/sbin/chkconfig  --add %{name} || :
+fi
+
+
+%preun
+if [ $1 -eq 0 ]; then
+	/sbin/service %{name} stop >/dev/null 2>&1 || :
+	/sbin/chkconfig --del %{name} || :
+fi
+
+
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING README README.remote
+%config(noreplace) %{_sysconfdir}/sysconfig/%{name}
+%{_sysconfdir}/init.d/%{name}
 %{_bindir}/rtpproxy
 %{_bindir}/makeann
 %{_mandir}/man8/rtpproxy.8*
+%dir %{_localstatedir}/lib/%{name}
 
 
 %changelog
+* Tue Jan 27 2009 Peter Lemenkov <lemenkov at gmail.com> - 1.2-0.3.beta.200901120
+- Snapshot 1.2.beta.200901120
+- Added sysconfig file
+
+* Mon Oct  6 2008 Peter Lemenkov <lemenkov at gmail.com> - 1.2-0.2.alpha.200807211
+- Added missing BuildRequires
+- Added init-script
+
+* Wed Aug 13 2008 Peter Lemenkov <lemenkov at gmail.com> - 1.2-0.1.alpha.200807211
+- Snapshot 1.2.alpha.200807211
+
 * Wed Jun 18 2008 Peter Lemenkov <lemenkov at gmail.com> - 1.1-1
 - Stable ver. 1.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rtpproxy/F-9/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	18 Jun 2008 14:24:07 -0000	1.7
+++ sources	27 Jan 2009 11:02:52 -0000	1.8
@@ -1 +1 @@
-76140b62c41932681a30714adcfa94a9  rtpproxy-1.1.tar.gz
+555f3fdb400e03efd7f2166ea45677c9  rtpproxy-1.2.beta.200901120.tar.gz



From peter at fedoraproject.org  Tue Jan 27 11:06:52 2009
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Tue, 27 Jan 2009 11:06:52 +0000 (UTC)
Subject: rpms/rtpproxy/EL-5 rtpproxy--init.diff, NONE, 1.1 rtpproxy.sysconfig,
	NONE, 1.1 .cvsignore, 1.7, 1.8 import.log, 1.1,
	1.2 rtpproxy.spec, 1.6, 1.7 sources, 1.7, 1.8
Message-ID: <20090127110652.5130F7010B@cvs1.fedora.phx.redhat.com>

Author: peter

Update of /cvs/pkgs/rpms/rtpproxy/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13787/EL-5

Modified Files:
	.cvsignore import.log rtpproxy.spec sources 
Added Files:
	rtpproxy--init.diff rtpproxy.sysconfig 
Log Message:
Snapshot 1.2.beta.200901120

rtpproxy--init.diff:

--- NEW FILE rtpproxy--init.diff ---
--- rpm/rtpproxy.init~	2007-11-29 03:46:26.000000000 +0300
+++ rpm/rtpproxy.init	2009-01-27 13:40:48.000000000 +0300
@@ -2,7 +2,7 @@
 #
 # Startup script for rtpproxy
 #
-# chkconfig: 345 85 15
+# chkconfig: - 85 15
 # description: A symmetric RTP proxy
 #
 # processname: rtpproxy
@@ -14,7 +14,8 @@
 rtpproxy=/usr/bin/rtpproxy
 prog=rtpproxy
 RETVAL=0
-OPTIONS=
+
+[ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog
 
 start() {
         echo -n $"Starting $prog: "


--- NEW FILE rtpproxy.sysconfig ---
OPTIONS="-u rtpproxy"



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rtpproxy/EL-5/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	18 Jun 2008 14:30:01 -0000	1.7
+++ .cvsignore	27 Jan 2009 11:06:21 -0000	1.8
@@ -1 +1 @@
-rtpproxy-1.1.tar.gz
+rtpproxy-1.2.beta.200901120.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/rtpproxy/EL-5/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	18 Jun 2008 14:30:01 -0000	1.1
+++ import.log	27 Jan 2009 11:06:21 -0000	1.2
@@ -1 +1,2 @@
 rtpproxy-1_1-1_fc9:EL-5:rtpproxy-1.1-1.fc9.src.rpm:1213799367
+rtpproxy-1_2-0_3_beta_200901120_fc10:EL-5:rtpproxy-1.2-0.3.beta.200901120.fc10.src.rpm:1233054245


Index: rtpproxy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rtpproxy/EL-5/rtpproxy.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- rtpproxy.spec	18 Jun 2008 14:30:01 -0000	1.6
+++ rtpproxy.spec	27 Jan 2009 11:06:21 -0000	1.7
@@ -1,43 +1,88 @@
 Name:           rtpproxy
-Version:        1.1
-Release:        1%{?dist}
+Version:        1.2
+Release:        0.3.beta.200901120%{?dist}
 Summary:        A symmetric RTP proxy
-
 Group:          Applications/Internet
 License:        BSD
 URL:            http://www.rtpproxy.org
-Source0:        http://b2bua.org/chrome/site/%{name}-%{version}.tar.gz
+Source0:        http://b2bua.org/chrome/site/%{name}-%{version}.beta.200901120.tar.gz
+Source1:        rtpproxy.sysconfig
+# Fedora specific
+Patch0:         rtpproxy--init.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires:  gsm-devel
+Requires(pre):  /usr/sbin/useradd
+Requires(post): /sbin/chkconfig
+Requires(preun):/sbin/chkconfig
+Requires(preun):/sbin/service
+
 
 %description
 This is symmetric RTP proxy designed to be used in conjunction with
 the SIP Express Router (SER) or any other SIP proxy capable of
 rewriting SDP bodies in SIP messages that it processes.
 
+
 %prep
-%setup -q
+%setup -q -n %{name}-%{version}.beta.200901120
+%patch0 -p0 -b .init_fix
+
 
 %build
 %configure
 make %{?_smp_mflags}
 
+
 %install
 rm -rf %{buildroot}
 make install DESTDIR=%{buildroot}
+install -D -p -m 0755 rpm/rtpproxy.init $RPM_BUILD_ROOT%{_sysconfdir}/init.d/%{name}
+install -D -p -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/%{name}
+install -d $RPM_BUILD_ROOT%{_localstatedir}/lib/%{name}
 
 
 %clean
 rm -rf %{buildroot}
 
+%pre
+/usr/sbin/useradd -r -c "RTPProxy service"  -d %{_localstatedir}/lib/%{name} -s /sbin/nologin %{name} 2>/dev/null || :
+
+%post
+if [ $1 -eq 1 ]; then
+	/sbin/chkconfig  --add %{name} || :
+fi
+
+
+%preun
+if [ $1 -eq 0 ]; then
+	/sbin/service %{name} stop >/dev/null 2>&1 || :
+	/sbin/chkconfig --del %{name} || :
+fi
+
+
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING README README.remote
+%config(noreplace) %{_sysconfdir}/sysconfig/%{name}
+%{_sysconfdir}/init.d/%{name}
 %{_bindir}/rtpproxy
 %{_bindir}/makeann
 %{_mandir}/man8/rtpproxy.8*
+%dir %{_localstatedir}/lib/%{name}
 
 
 %changelog
+* Tue Jan 27 2009 Peter Lemenkov <lemenkov at gmail.com> - 1.2-0.3.beta.200901120
+- Snapshot 1.2.beta.200901120
+- Added sysconfig file
+
+* Mon Oct  6 2008 Peter Lemenkov <lemenkov at gmail.com> - 1.2-0.2.alpha.200807211
+- Added missing BuildRequires
+- Added init-script
+
+* Wed Aug 13 2008 Peter Lemenkov <lemenkov at gmail.com> - 1.2-0.1.alpha.200807211
+- Snapshot 1.2.alpha.200807211
+
 * Wed Jun 18 2008 Peter Lemenkov <lemenkov at gmail.com> - 1.1-1
 - Stable ver. 1.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rtpproxy/EL-5/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	18 Jun 2008 14:30:01 -0000	1.7
+++ sources	27 Jan 2009 11:06:21 -0000	1.8
@@ -1 +1 @@
-76140b62c41932681a30714adcfa94a9  rtpproxy-1.1.tar.gz
+555f3fdb400e03efd7f2166ea45677c9  rtpproxy-1.2.beta.200901120.tar.gz



From peter at fedoraproject.org  Tue Jan 27 11:10:10 2009
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Tue, 27 Jan 2009 11:10:10 +0000 (UTC)
Subject: rpms/rtpproxy/EL-4 rtpproxy--init.diff, NONE, 1.1 rtpproxy.sysconfig,
	NONE, 1.1 .cvsignore, 1.7, 1.8 import.log, 1.1,
	1.2 rtpproxy.spec, 1.6, 1.7 sources, 1.7, 1.8
Message-ID: <20090127111010.5A2447010B@cvs1.fedora.phx.redhat.com>

Author: peter

Update of /cvs/pkgs/rpms/rtpproxy/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14912/EL-4

Modified Files:
	.cvsignore import.log rtpproxy.spec sources 
Added Files:
	rtpproxy--init.diff rtpproxy.sysconfig 
Log Message:
Snapshot 1.2.beta.200901120

rtpproxy--init.diff:

--- NEW FILE rtpproxy--init.diff ---
--- rpm/rtpproxy.init~	2007-11-29 03:46:26.000000000 +0300
+++ rpm/rtpproxy.init	2009-01-27 13:40:48.000000000 +0300
@@ -2,7 +2,7 @@
 #
 # Startup script for rtpproxy
 #
-# chkconfig: 345 85 15
+# chkconfig: - 85 15
 # description: A symmetric RTP proxy
 #
 # processname: rtpproxy
@@ -14,7 +14,8 @@
 rtpproxy=/usr/bin/rtpproxy
 prog=rtpproxy
 RETVAL=0
-OPTIONS=
+
+[ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog
 
 start() {
         echo -n $"Starting $prog: "


--- NEW FILE rtpproxy.sysconfig ---
OPTIONS="-u rtpproxy"



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rtpproxy/EL-4/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	18 Jun 2008 14:32:55 -0000	1.7
+++ .cvsignore	27 Jan 2009 11:09:39 -0000	1.8
@@ -1 +1 @@
-rtpproxy-1.1.tar.gz
+rtpproxy-1.2.beta.200901120.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/rtpproxy/EL-4/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	18 Jun 2008 14:32:55 -0000	1.1
+++ import.log	27 Jan 2009 11:09:39 -0000	1.2
@@ -1 +1,2 @@
 rtpproxy-1_1-1_fc9:EL-4:rtpproxy-1.1-1.fc9.src.rpm:1213799532
+rtpproxy-1_2-0_3_beta_200901120_fc10:EL-4:rtpproxy-1.2-0.3.beta.200901120.fc10.src.rpm:1233054461


Index: rtpproxy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rtpproxy/EL-4/rtpproxy.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- rtpproxy.spec	18 Jun 2008 14:32:55 -0000	1.6
+++ rtpproxy.spec	27 Jan 2009 11:09:39 -0000	1.7
@@ -1,43 +1,88 @@
 Name:           rtpproxy
-Version:        1.1
-Release:        1%{?dist}
+Version:        1.2
+Release:        0.3.beta.200901120%{?dist}
 Summary:        A symmetric RTP proxy
-
 Group:          Applications/Internet
 License:        BSD
 URL:            http://www.rtpproxy.org
-Source0:        http://b2bua.org/chrome/site/%{name}-%{version}.tar.gz
+Source0:        http://b2bua.org/chrome/site/%{name}-%{version}.beta.200901120.tar.gz
+Source1:        rtpproxy.sysconfig
+# Fedora specific
+Patch0:         rtpproxy--init.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires:  gsm-devel
+Requires(pre):  /usr/sbin/useradd
+Requires(post): /sbin/chkconfig
+Requires(preun):/sbin/chkconfig
+Requires(preun):/sbin/service
+
 
 %description
 This is symmetric RTP proxy designed to be used in conjunction with
 the SIP Express Router (SER) or any other SIP proxy capable of
 rewriting SDP bodies in SIP messages that it processes.
 
+
 %prep
-%setup -q
+%setup -q -n %{name}-%{version}.beta.200901120
+%patch0 -p0 -b .init_fix
+
 
 %build
 %configure
 make %{?_smp_mflags}
 
+
 %install
 rm -rf %{buildroot}
 make install DESTDIR=%{buildroot}
+install -D -p -m 0755 rpm/rtpproxy.init $RPM_BUILD_ROOT%{_sysconfdir}/init.d/%{name}
+install -D -p -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/%{name}
+install -d $RPM_BUILD_ROOT%{_localstatedir}/lib/%{name}
 
 
 %clean
 rm -rf %{buildroot}
 
+%pre
+/usr/sbin/useradd -r -c "RTPProxy service"  -d %{_localstatedir}/lib/%{name} -s /sbin/nologin %{name} 2>/dev/null || :
+
+%post
+if [ $1 -eq 1 ]; then
+	/sbin/chkconfig  --add %{name} || :
+fi
+
+
+%preun
+if [ $1 -eq 0 ]; then
+	/sbin/service %{name} stop >/dev/null 2>&1 || :
+	/sbin/chkconfig --del %{name} || :
+fi
+
+
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING README README.remote
+%config(noreplace) %{_sysconfdir}/sysconfig/%{name}
+%{_sysconfdir}/init.d/%{name}
 %{_bindir}/rtpproxy
 %{_bindir}/makeann
 %{_mandir}/man8/rtpproxy.8*
+%dir %{_localstatedir}/lib/%{name}
 
 
 %changelog
+* Tue Jan 27 2009 Peter Lemenkov <lemenkov at gmail.com> - 1.2-0.3.beta.200901120
+- Snapshot 1.2.beta.200901120
+- Added sysconfig file
+
+* Mon Oct  6 2008 Peter Lemenkov <lemenkov at gmail.com> - 1.2-0.2.alpha.200807211
+- Added missing BuildRequires
+- Added init-script
+
+* Wed Aug 13 2008 Peter Lemenkov <lemenkov at gmail.com> - 1.2-0.1.alpha.200807211
+- Snapshot 1.2.alpha.200807211
+
 * Wed Jun 18 2008 Peter Lemenkov <lemenkov at gmail.com> - 1.1-1
 - Stable ver. 1.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rtpproxy/EL-4/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	18 Jun 2008 14:32:55 -0000	1.7
+++ sources	27 Jan 2009 11:09:39 -0000	1.8
@@ -1 +1 @@
-76140b62c41932681a30714adcfa94a9  rtpproxy-1.1.tar.gz
+555f3fdb400e03efd7f2166ea45677c9  rtpproxy-1.2.beta.200901120.tar.gz



From fabbione at fedoraproject.org  Tue Jan 27 11:10:29 2009
From: fabbione at fedoraproject.org (Fabio M. Di Nitto)
Date: Tue, 27 Jan 2009 11:10:29 +0000 (UTC)
Subject: rpms/cluster/devel .cvsignore, 1.16, 1.17 cluster.spec, 1.32,
	1.33 sources, 1.16, 1.17
Message-ID: <20090127111029.773E27010B@cvs1.fedora.phx.redhat.com>

Author: fabbione

Update of /cvs/pkgs/rpms/cluster/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14976

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.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore	12 Jan 2009 07:17:37 -0000	1.16
+++ .cvsignore	27 Jan 2009 11:09:58 -0000	1.17
@@ -1 +1 @@
-cluster-3.0.0.alpha2.tar.gz
+cluster-3.0.0.alpha3.tar.gz


Index: cluster.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cluster/devel/cluster.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- cluster.spec	22 Jan 2009 05:51:36 -0000	1.32
+++ cluster.spec	27 Jan 2009 11:09:59 -0000	1.33
@@ -14,12 +14,12 @@
 # http://www.rpm.org/max-rpm/s1-rpm-subpack-spec-file-changes.html
 
 # keep around ready for later user
-%define alphatag alpha2
+%define alphatag alpha3
 
 Name: cluster
 Summary: Red Hat Cluster
 Version: 3.0.0
-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/
@@ -39,8 +39,8 @@
 BuildRequires: perl python
 BuildRequires: glibc-kernheaders glibc-devel
 BuildRequires: libxml2-devel ncurses-devel slang-devel libvolume_id-devel
-BuildRequires: corosync-devel >= 0.92-5 corosync-devel < 0.93
-BuildRequires: openais-devel >= 0.91-4 openais < 0.92
+BuildRequires: corosync-devel >= 0.92-6 corosync-devel < 0.93
+BuildRequires: openais-devel >= 0.91-5 openais < 0.92
 BuildRequires: openldap-devel perl(ExtUtils::MakeMaker)
 %if %{buildvirt}
 BuildRequires: nss-devel nspr-devel libvirt-devel xen-libs
@@ -111,8 +111,8 @@
 Requires(post): chkconfig
 Requires(preun): initscripts
 Requires(preun): chkconfig
-Requires: corosync >= 0.92-5 corosync < 0.93
-Requires: openais >= 0.91-4 openais < 0.92
+Requires: corosync >= 0.92-6 corosync < 0.93
+Requires: openais >= 0.91-5 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))
@@ -323,8 +323,12 @@
 %{_sbindir}/*.gfs
 %{_mandir}/man8/gfs.*
 %{_mandir}/man8/gfs_*
+%{_mandir}/man8/*.gfs.*
 
 %changelog
+* Tue Jan 27 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 3.0.0-4.alpha3
+- New upstream release
+
 * Wed Jan 21 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 3.0.0-3.alpha2
 - Move all binaries where they belong. All the legacy stuff is now dead.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cluster/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources	12 Jan 2009 07:17:37 -0000	1.16
+++ sources	27 Jan 2009 11:09:59 -0000	1.17
@@ -1 +1 @@
-2cd2df450caff6c3bd70d8c6e62faa03  cluster-3.0.0.alpha2.tar.gz
+7336dd3ca3bd117a4b81e91a6700be58  cluster-3.0.0.alpha3.tar.gz



From twaugh at fedoraproject.org  Tue Jan 27 11:22:32 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Tue, 27 Jan 2009 11:22:32 +0000 (UTC)
Subject: rpms/hplip/F-10 hplip.spec,1.195,1.196
Message-ID: <20090127112232.76B347010B@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/hplip/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16754

Modified Files:
	hplip.spec 
Log Message:
* Tue Jan 27 2009 Tim Waugh <twaugh at redhat.com> 2.8.12-6
- Only ship compressed PPD files.



Index: hplip.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/F-10/hplip.spec,v
retrieving revision 1.195
retrieving revision 1.196
diff -u -r1.195 -r1.196
--- hplip.spec	13 Jan 2009 17:52:27 -0000	1.195
+++ hplip.spec	27 Jan 2009 11:21:59 -0000	1.196
@@ -1,7 +1,7 @@
 Summary: HP Linux Imaging and Printing Project
 Name: hplip
 Version: 2.8.12
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPLv2+ and MIT
 Group: System Environment/Daemons
 Conflicts: system-config-printer < 0.6.132
@@ -158,7 +158,8 @@
 	%{buildroot}%{_libdir}/*.so \
 	%{buildroot}%{_libdir}/sane/*.la \
 	%{buildroot}%{_datadir}/cups/model/foomatic-ppds \
-	%{buildroot}%{_datadir}/applications/hplip.desktop
+	%{buildroot}%{_datadir}/applications/hplip.desktop \
+	%{buildroot}%{_datadir}/ppd/HP/*.ppd
 
 mkdir -p %{buildroot}%{_datadir}/applications
 sed -i -e '/^Categories=/d' hplip.desktop
@@ -294,7 +295,8 @@
 %files -n hpijs
 %defattr(-,root,root)
 %{_bindir}/hpijs
-%{_datadir}/ppd/HP
+%dir %{_datadir}/ppd/HP
+%{_datadir}/ppd/HP/*.ppd.gz
 %{_datadir}/cups/drv/*
 # Note: this must be /usr/lib not %{_libdir}, since that's the
 # CUPS serverbin directory.
@@ -326,6 +328,9 @@
 exit 0
 
 %changelog
+* Tue Jan 27 2009 Tim Waugh <twaugh at redhat.com> 2.8.12-6
+- Only ship compressed PPD files.
+
 * Tue Jan 13 2009 Tim Waugh <twaugh at redhat.com> 2.8.12-5
 - Fixed Quit menu item in device manager (bug #479751).
 



From twaugh at fedoraproject.org  Tue Jan 27 11:25:11 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Tue, 27 Jan 2009 11:25:11 +0000 (UTC)
Subject: rpms/hplip/devel hplip.spec,1.197,1.198
Message-ID: <20090127112511.E90957010B@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/hplip/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17234

Modified Files:
	hplip.spec 
Log Message:
* Tue Jan 27 2009 Tim Waugh <twaugh at redhat.com> 2.8.12-7
- Only ship compressed PPD files.



Index: hplip.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/devel/hplip.spec,v
retrieving revision 1.197
retrieving revision 1.198
diff -u -r1.197 -r1.198
--- hplip.spec	16 Jan 2009 17:58:33 -0000	1.197
+++ hplip.spec	27 Jan 2009 11:24:41 -0000	1.198
@@ -1,7 +1,7 @@
 Summary: HP Linux Imaging and Printing Project
 Name: hplip
 Version: 2.8.12
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: GPLv2+ and MIT
 Group: System Environment/Daemons
 Conflicts: system-config-printer < 0.6.132
@@ -158,7 +158,8 @@
 	%{buildroot}%{_libdir}/*.so \
 	%{buildroot}%{_libdir}/sane/*.la \
 	%{buildroot}%{_datadir}/cups/model/foomatic-ppds \
-	%{buildroot}%{_datadir}/applications/hplip.desktop
+	%{buildroot}%{_datadir}/applications/hplip.desktop \
+	%{buildroot}%{_datadir}/ppd/HP/*.ppd
 
 mkdir -p %{buildroot}%{_datadir}/applications
 sed -i -e '/^Categories=/d' hplip.desktop
@@ -294,7 +295,8 @@
 %files -n hpijs
 %defattr(-,root,root)
 %{_bindir}/hpijs
-%{_datadir}/ppd/HP
+%dir %{_datadir}/ppd/HP
+%{_datadir}/ppd/HP/*.ppd.gz
 %{_datadir}/cups/drv/*
 # Note: this must be /usr/lib not %{_libdir}, since that's the
 # CUPS serverbin directory.
@@ -326,6 +328,9 @@
 exit 0
 
 %changelog
+* Tue Jan 27 2009 Tim Waugh <twaugh at redhat.com> 2.8.12-7
+- Only ship compressed PPD files.
+
 * Fri Jan 16 2009 Tomas Mraz <tmraz at redhat.com> 2.8.12-6
 - rebuild with new openssl
 



From rrakus at fedoraproject.org  Tue Jan 27 12:03:12 2009
From: rrakus at fedoraproject.org (Roman Rakus)
Date: Tue, 27 Jan 2009 12:03:12 +0000 (UTC)
Subject: rpms/bash/devel bash.spec,1.168,1.169
Message-ID: <20090127120312.5799D7010B@cvs1.fedora.phx.redhat.com>

Author: rrakus

Update of /cvs/extras/rpms/bash/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23583

Modified Files:
	bash.spec 
Log Message:
Fixed release tag


Index: bash.spec
===================================================================
RCS file: /cvs/extras/rpms/bash/devel/bash.spec,v
retrieving revision 1.168
retrieving revision 1.169
diff -u -r1.168 -r1.169
--- bash.spec	26 Jan 2009 11:50:44 -0000	1.168
+++ bash.spec	27 Jan 2009 12:02:41 -0000	1.169
@@ -1,11 +1,13 @@
+%define beta_tag rc1
+
 Version: 4.0
 Name: bash
 Summary: The GNU Bourne Again shell version %{version}
-Release: rc1.1%{?dist}
+Release: 0.1.%{?beta_tag}%{?dist}
 Group: System Environment/Shells
 License: GPLv2+
 Url: http://www.gnu.org/software/bash
-Source0: ftp://ftp.gnu.org/gnu/bash/bash-%{version}.tar.gz
+Source0: ftp://ftp.gnu.org/gnu/bash/bash-%{version}-%{beta_tag}.tar.gz
 
 # For now there isn't any doc
 #Source2: ftp://ftp.gnu.org/gnu/bash/bash-doc-%{version}.tar.gz
@@ -57,7 +59,7 @@
 %prep
 
 #%setup -q -a 2
-%setup -q
+%setup -q -n bash-%{version}-%{beta_tag}
 
 # Official upstream patches
 # Other patches
@@ -227,6 +229,9 @@
 #%doc doc/*.ps doc/*.0 doc/*.html doc/article.txt
 
 %changelog
+* Mon Jan 26 2009 Roman Rakus <rrakus at redhat.com> - 4.0-0.1.rc1
+- Fixed release tag
+
 * Wed Jan 21 2009 Roman Rakus <rrakus at redhat.com> - 4.0-rc1.1
 - Bump to upstream bash-4.0-rc1
 



From mhlavink at fedoraproject.org  Tue Jan 27 12:04:59 2009
From: mhlavink at fedoraproject.org (Michal Hlavinka)
Date: Tue, 27 Jan 2009 12:04:59 +0000 (UTC)
Subject: rpms/dovecot/devel .cvsignore, 1.47, 1.48 dovecot.spec, 1.119,
	1.120 sources, 1.50, 1.51
Message-ID: <20090127120459.EFAF27010B@cvs1.fedora.phx.redhat.com>

Author: mhlavink

Update of /cvs/extras/rpms/dovecot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23923

Modified Files:
	.cvsignore dovecot.spec sources 
Log Message:
update to 1.1.10



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/dovecot/devel/.cvsignore,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- .cvsignore	13 Jan 2009 18:57:14 -0000	1.47
+++ .cvsignore	27 Jan 2009 12:04:29 -0000	1.48
@@ -1,7 +1,8 @@
-dovecot-1.1.8.tar.gz
-dovecot-1.1.8.tar.gz.sig
+dovecot-1.1.10-managesieve-0.10.5.diff.gz
+dovecot-1.1.10-managesieve-0.10.5.diff.gz.sig
+dovecot-1.1.10.tar.gz
+dovecot-1.1.10.tar.gz.sig
+dovecot-1.1-managesieve-0.10.5.tar.gz
+dovecot-1.1-managesieve-0.10.5.tar.gz.sig
 dovecot-sieve-1.1.6.tar.gz
 dovecot-sieve-1.1.6.tar.gz.sig
-dovecot-1.1.8-managesieve-0.10.4.diff.gz
-dovecot-1.1.8-managesieve-0.10.4.diff.gz.sig
-dovecot-1.1-managesieve-0.10.4.tar.gz


Index: dovecot.spec
===================================================================
RCS file: /cvs/extras/rpms/dovecot/devel/dovecot.spec,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -r1.119 -r1.120
--- dovecot.spec	24 Jan 2009 09:55:35 -0000	1.119
+++ dovecot.spec	27 Jan 2009 12:04:29 -0000	1.120
@@ -1,8 +1,8 @@
 Summary: Dovecot Secure imap server
 Name: dovecot
 Epoch: 1
-Version: 1.1.8
-Release: 3%{?dist}
+Version: 1.1.10
+Release: 1%{?dist}
 License: MIT and LGPLv2 and BSD with advertising
 Group: System Environment/Daemons
 
@@ -16,7 +16,7 @@
 %define build_managesieve 1
 %define sieve_version 1.1.6
 %define sieve_name dovecot-sieve
-%define managesieve_version 0.10.4
+%define managesieve_version 0.10.5
 %define managesieve_name dovecot-1.1-managesieve
 
 URL: http://www.dovecot.org/
@@ -425,6 +425,9 @@
 
 
 %changelog
+* Tue Jan 27 2009 Michal Hlavinka <mhlavink at redhat.com> - 1:1.1.10-1
+- updated to 1.1.10
+
 * Sat Jan 24 2009 Dan Horak <dan[at]danny.cz> - 1:1.1.8-3
 - rebuild with new mysql
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/dovecot/devel/sources,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- sources	13 Jan 2009 18:57:15 -0000	1.50
+++ sources	27 Jan 2009 12:04:29 -0000	1.51
@@ -1,7 +1,8 @@
-bc23a919c7ad2b3c5ba69e19f1b46eb2  dovecot-1.1.8.tar.gz
-085419d609721f2281f38cbda7c897fd  dovecot-1.1.8.tar.gz.sig
+bedd4cd6e3e878f12c6bfadb909b5b94  dovecot-1.1.10-managesieve-0.10.5.diff.gz
+5e88cf797b68b572648267e519d47563  dovecot-1.1.10-managesieve-0.10.5.diff.gz.sig
+39f1da81ae25981027a6bfbb42800ed5  dovecot-1.1.10.tar.gz
+f1b4c39c506521b19d6c68b176c13ec6  dovecot-1.1.10.tar.gz.sig
+972ad948be782b7cf37fc74bd17795e2  dovecot-1.1-managesieve-0.10.5.tar.gz
+7e68d7212ce1904f80064c466a525150  dovecot-1.1-managesieve-0.10.5.tar.gz.sig
 7acf3d98974a515b868addbdb73054eb  dovecot-sieve-1.1.6.tar.gz
 a9c6b8b2eab4d6a72395ffde1fb53327  dovecot-sieve-1.1.6.tar.gz.sig
-a2f663940115e136db4bf3b1b760759b  dovecot-1.1.8-managesieve-0.10.4.diff.gz
-5ec09d3a116ddbf3353a6efd703316b2  dovecot-1.1.8-managesieve-0.10.4.diff.gz.sig
-3e8e3490cb2d9cd58450d19e666c9a59  dovecot-1.1-managesieve-0.10.4.tar.gz



From rrakus at fedoraproject.org  Tue Jan 27 12:07:42 2009
From: rrakus at fedoraproject.org (Roman Rakus)
Date: Tue, 27 Jan 2009 12:07:42 +0000 (UTC)
Subject: rpms/bash/devel .cvsignore,1.11,1.12 sources,1.14,1.15
Message-ID: <20090127120742.A76BA7010B@cvs1.fedora.phx.redhat.com>

Author: rrakus

Update of /cvs/extras/rpms/bash/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24401

Modified Files:
	.cvsignore sources 
Log Message:
Uploaded new sources


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/bash/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	26 Jan 2009 11:50:44 -0000	1.11
+++ .cvsignore	27 Jan 2009 12:07:11 -0000	1.12
@@ -1 +1 @@
-bash-4.0.tar.gz
+bash-4.0-rc1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/bash/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	26 Jan 2009 11:50:44 -0000	1.14
+++ sources	27 Jan 2009 12:07:11 -0000	1.15
@@ -1 +1 @@
-463e18d547555dd570695842a21dbc75  bash-4.0.tar.gz
+185522513dcc910ef10feb5979bc4cbc  bash-4.0-rc1.tar.gz



From markmc at fedoraproject.org  Tue Jan 27 12:14:46 2009
From: markmc at fedoraproject.org (Mark McLoughlin)
Date: Tue, 27 Jan 2009 12:14:46 +0000 (UTC)
Subject: rpms/kvm/devel kvm.spec,1.83,1.84
Message-ID: <20090127121446.3369D7010B@cvs1.fedora.phx.redhat.com>

Author: markmc

Update of /cvs/pkgs/rpms/kvm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26383

Modified Files:
	kvm.spec 
Log Message:
add note for next release



Index: kvm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kvm/devel/kvm.spec,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- kvm.spec	20 Jan 2009 23:03:14 -0000	1.83
+++ kvm.spec	27 Jan 2009 12:14:15 -0000	1.84
@@ -45,6 +45,8 @@
 %patch0 -p1
 
 # "configure --kerneldir" looks for this
+# FIXME: kvm-84 or later shouldn't need this anymore, see:
+# http://git.kernel.org/?p=linux/kernel/git/marcelo/kvm-userspace.git;a=commit;h=4f45aa2db
 echo "%{name}-%{version}" > $(pwd)/kernel/.kernelrelease
 
 # we must not use any of the binaries from the qemu/pc-bios/ directory,



From ruben at fedoraproject.org  Tue Jan 27 12:19:48 2009
From: ruben at fedoraproject.org (Ruben Kerkhof)
Date: Tue, 27 Jan 2009 12:19:48 +0000 (UTC)
Subject: rpms/python-wokkel/devel import.log, NONE, 1.1 python-wokkel.spec, 
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090127121948.9F0717010B@cvs1.fedora.phx.redhat.com>

Author: ruben

Update of /cvs/pkgs/rpms/python-wokkel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27384/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log python-wokkel.spec 
Log Message:
Import into devel



--- NEW FILE import.log ---
python-wokkel-0_4_0-1_fc11:HEAD:python-wokkel-0.4.0-1.fc11.src.rpm:1233058702


--- NEW FILE python-wokkel.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
%define debug_package %{nil}

%define libname wokkel
Name:           python-%{libname}
Version:        0.4.0
Release:        1%{?dist}
Summary:        Enhancements to the Twisted XMPP protocol implementation

Group:          Development/Languages
License:        MIT
URL:            http://wokkel.ik.nu
Source0:        http://wokkel.ik.nu/releases/%{version}/%{libname}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  python-devel, python-setuptools, python-twisted-words, python-twisted-names
Requires:       python-twisted-words, python-twisted-names

%description
Wokkel is collection of enhancements on top of the Twisted networking
framework, written in Python. It mostly provides a testing ground
for enhancements to the Jabber/XMPP protocol implementation as found
in Twisted Words, that are meant to eventually move there.

Currently, Wokkel provides the following enhancements
on top of Twisted Words:

* A mechanism for easier implementation of XMPP Enhancement Protocols (XEPs)
  as so-called subprotocols.
* XMPP Client and server-side component support, that eases development
  and supports subprotocols.
* Subprotocol implementations for:
  o Generic presence, roster and message handling.
  o Service Discovery (XEP-0030), service side.
  o Publish-Subscribe (XEP-0060), client and service side.
  o Software Version (XEP-0092), service side. 
* Data format implementations for:
  o Data Forms (XEP-0004)
  o User Tune (XEP-0118)
  o User Mood (XEP-0107) 


%prep
%setup -q -n %{libname}-%{version}


%build
%{__python} setup.py build


%install
rm -rf %{buildroot}
%{__python} setup.py install -O1 --skip-build --root %{buildroot}

%check
trial wokkel/test/test_*.py
 
%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%doc LICENSE NEWS README
%{python_sitelib}/*


%changelog
* Thu Jan 22 2009 Ruben Kerkhof <ruben at rubenkerkhof.com> 0.4.0-1
- Initial import



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-wokkel/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	26 Jan 2009 22:22:52 -0000	1.1
+++ .cvsignore	27 Jan 2009 12:19:18 -0000	1.2
@@ -0,0 +1 @@
+wokkel-0.4.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-wokkel/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	26 Jan 2009 22:22:52 -0000	1.1
+++ sources	27 Jan 2009 12:19:18 -0000	1.2
@@ -0,0 +1 @@
+3f6acd2752ad12a3a67bd54ed02698e0  wokkel-0.4.0.tar.gz



From ruben at fedoraproject.org  Tue Jan 27 12:28:33 2009
From: ruben at fedoraproject.org (Ruben Kerkhof)
Date: Tue, 27 Jan 2009 12:28:33 +0000 (UTC)
Subject: rpms/python-wokkel/F-10 import.log, NONE, 1.1 python-wokkel.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090127122833.AFAEA7010B@cvs1.fedora.phx.redhat.com>

Author: ruben

Update of /cvs/pkgs/rpms/python-wokkel/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28853/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	import.log python-wokkel.spec 
Log Message:
Import into F-10



--- NEW FILE import.log ---
python-wokkel-0_4_0-1_fc11:F-10:python-wokkel-0.4.0-1.fc11.src.rpm:1233059250


--- NEW FILE python-wokkel.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
%define debug_package %{nil}

%define libname wokkel
Name:           python-%{libname}
Version:        0.4.0
Release:        1%{?dist}
Summary:        Enhancements to the Twisted XMPP protocol implementation

Group:          Development/Languages
License:        MIT
URL:            http://wokkel.ik.nu
Source0:        http://wokkel.ik.nu/releases/%{version}/%{libname}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  python-devel, python-setuptools, python-twisted-words, python-twisted-names
Requires:       python-twisted-words, python-twisted-names

%description
Wokkel is collection of enhancements on top of the Twisted networking
framework, written in Python. It mostly provides a testing ground
for enhancements to the Jabber/XMPP protocol implementation as found
in Twisted Words, that are meant to eventually move there.

Currently, Wokkel provides the following enhancements
on top of Twisted Words:

* A mechanism for easier implementation of XMPP Enhancement Protocols (XEPs)
  as so-called subprotocols.
* XMPP Client and server-side component support, that eases development
  and supports subprotocols.
* Subprotocol implementations for:
  o Generic presence, roster and message handling.
  o Service Discovery (XEP-0030), service side.
  o Publish-Subscribe (XEP-0060), client and service side.
  o Software Version (XEP-0092), service side. 
* Data format implementations for:
  o Data Forms (XEP-0004)
  o User Tune (XEP-0118)
  o User Mood (XEP-0107) 


%prep
%setup -q -n %{libname}-%{version}


%build
%{__python} setup.py build


%install
rm -rf %{buildroot}
%{__python} setup.py install -O1 --skip-build --root %{buildroot}

%check
trial wokkel/test/test_*.py
 
%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%doc LICENSE NEWS README
%{python_sitelib}/*


%changelog
* Thu Jan 22 2009 Ruben Kerkhof <ruben at rubenkerkhof.com> 0.4.0-1
- Initial import



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-wokkel/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	26 Jan 2009 22:22:52 -0000	1.1
+++ .cvsignore	27 Jan 2009 12:28:03 -0000	1.2
@@ -0,0 +1 @@
+wokkel-0.4.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-wokkel/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	26 Jan 2009 22:22:52 -0000	1.1
+++ sources	27 Jan 2009 12:28:03 -0000	1.2
@@ -0,0 +1 @@
+3f6acd2752ad12a3a67bd54ed02698e0  wokkel-0.4.0.tar.gz



From hadess at fedoraproject.org  Tue Jan 27 12:35:58 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Tue, 27 Jan 2009 12:35:58 +0000 (UTC)
Subject: rpms/fprintd/devel 0001-Detect-when-a-device-is-disconnected.patch, 
	NONE, 1.1 fprintd.spec, 1.5, 1.6
Message-ID: <20090127123558.AFF4C7010B@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/fprintd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30339

Modified Files:
	fprintd.spec 
Added Files:
	0001-Detect-when-a-device-is-disconnected.patch 
Log Message:
* Tue Jan 27 2009 - Bastien Nocera <bnocera at redhat.com> - 0.1-7.git04fd09cfa
- Add a patch to handle device disconnects


0001-Detect-when-a-device-is-disconnected.patch:

--- NEW FILE 0001-Detect-when-a-device-is-disconnected.patch ---
>From c94c8b437a9a1ce46fda7b14220a4737b30a8fae Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess at hadess.net>
Date: Tue, 27 Jan 2009 12:29:23 +0000
Subject: [PATCH] Detect when a device is disconnected

Pretty hacky way to detect whether the device we're handling has
been disconnected during a verify or enrollment. This should allow
us to avoid users having to wait when somebody pulls the plug.
---
 pam/pam_fprintd.c |    8 ++++++--
 src/device.c      |   40 ++++++++++++++++++++++++++++++++++++----
 src/device.xml    |   13 +++++++++++++
 tests/verify.c    |    2 +-
 4 files changed, 56 insertions(+), 7 deletions(-)

diff --git a/pam/pam_fprintd.c b/pam/pam_fprintd.c
index 9847f4a..5e8757c 100644
--- a/pam/pam_fprintd.c
+++ b/pam/pam_fprintd.c
@@ -154,7 +154,7 @@ static DBusGProxy *create_manager (pam_handle_t *pamh, DBusGConnection **ret_con
 	return manager;
 }
 
-static close_and_unref (DBusGConnection *connection)
+static void close_and_unref (DBusGConnection *connection)
 {
 	DBusConnection *conn;
 
@@ -335,7 +335,11 @@ static int do_verify(GMainLoop *loop, pam_handle_t *pamh, DBusGProxy *dev)
 				ret = PAM_SUCCESS;
 			else if (g_str_equal (data->result, "verify-unknown-error"))
 				ret = PAM_AUTHINFO_UNAVAIL;
-			else {
+			else if (g_str_equal (data->result, "verify-disconnected")) {
+				ret = PAM_AUTHINFO_UNAVAIL;
+				g_free (data->result);
+				break;
+			} else {
 				send_info_msg (data->pamh, "An unknown error occured");
 				ret = PAM_AUTH_ERR;
 				g_free (data->result);
diff --git a/src/device.c b/src/device.c
index 68a0b52..e1127da 100644
--- a/src/device.c
+++ b/src/device.c
@@ -28,6 +28,7 @@
 
 #include <sys/types.h>
 #include <pwd.h>
+#include <errno.h>
 
 #include "fprintd-marshal.h"
 #include "fprintd.h"
@@ -119,6 +120,8 @@ struct FprintDevicePrivate {
 	FprintDeviceAction current_action;
 	/* Whether we should ignore new signals on the device */
 	gboolean action_done;
+	/* Whether the device was disconnected */
+	gboolean disconnected;
 };
 
 typedef struct FprintDevicePrivate FprintDevicePrivate;
@@ -368,6 +371,8 @@ verify_result_to_name (int result)
 		return "verify-finger-not-centered";
 	case FP_VERIFY_RETRY_REMOVE_FINGER:
 		return "verify-remove-and-retry";
+	case -EPROTO:
+		return "verify-disconnected";
 	default:
 		return "verify-unknown-error";
 	}
@@ -391,11 +396,21 @@ enroll_result_to_name (int result)
 		return "enroll-finger-not-centered";
 	case FP_ENROLL_RETRY_REMOVE_FINGER:
 		return "enroll-remove-and-retry";
+	case -EPROTO:
+		return "enroll-disconnected";
 	default:
 		return "enroll-unknown-error";
 	}
 }
 
+static void
+set_disconnected (FprintDevicePrivate *priv, const char *res)
+{
+	if (g_str_equal (res, "enroll-disconnected") ||
+	    g_str_equal (res, "verify-disconnected"))
+		priv->disconnected = TRUE;
+}
+
 static gboolean
 _fprint_device_check_claimed (FprintDevice *rdev,
 			      DBusGMethodInvocation *context,
@@ -790,6 +805,7 @@ static void verify_cb(struct fp_dev *dev, int r, struct fp_img *img,
 
 	if (r == FP_VERIFY_NO_MATCH || r == FP_VERIFY_MATCH || r < 0)
 		priv->action_done = TRUE;
+	set_disconnected (priv, name);
 	g_signal_emit(rdev, signals[SIGNAL_VERIFY_STATUS], 0, name, priv->action_done);
 	fp_img_free(img);
 
@@ -813,6 +829,7 @@ static void identify_cb(struct fp_dev *dev, int r,
 
 	if (r == FP_VERIFY_NO_MATCH || r == FP_VERIFY_MATCH || r < 0)
 		priv->action_done = TRUE;
+	set_disconnected (priv, name);
 	g_signal_emit(rdev, signals[SIGNAL_VERIFY_STATUS], 0, name, priv->action_done);
 	fp_img_free(img);
 
@@ -986,7 +1003,10 @@ static void fprint_device_verify_stop(FprintDevice *rdev,
 			fp_print_data_free (priv->verify_data);
 			priv->verify_data = NULL;
 		}
-		r = fp_async_verify_stop(priv->dev, verify_stop_cb, context);
+		if (!priv->disconnected)
+			r = fp_async_verify_stop(priv->dev, verify_stop_cb, context);
+		else
+			r = 0;
 	} else if (priv->current_action == ACTION_IDENTIFY) {
 		if (priv->identify_data != NULL) {
 			guint i;
@@ -995,7 +1015,10 @@ static void fprint_device_verify_stop(FprintDevice *rdev,
 			g_free (priv->identify_data);
 			priv->identify_data = NULL;
 		}
-		r = fp_async_identify_stop(priv->dev, identify_stop_cb, context);
+		if (!priv->disconnected)
+			r = fp_async_identify_stop(priv->dev, identify_stop_cb, context);
+		else
+			r = 0;
 	} else {
 		g_set_error(&error, FPRINT_ERROR, FPRINT_ERROR_NO_ACTION_IN_PROGRESS,
 			    "No verification in progress");
@@ -1010,6 +1033,8 @@ static void fprint_device_verify_stop(FprintDevice *rdev,
 		dbus_g_method_return_error(context, error);
 		g_error_free (error);
 	}
+	if (priv->disconnected)
+		dbus_g_method_return(context);
 
 	priv->current_action = ACTION_NONE;
 }
@@ -1020,6 +1045,7 @@ static void enroll_stage_cb(struct fp_dev *dev, int result,
 	struct FprintDevice *rdev = user_data;
 	FprintDevicePrivate *priv = DEVICE_GET_PRIVATE(rdev);
 	struct session_data *session = priv->session;
+	const char *name = enroll_result_to_name (result);
 	int r;
 
 	/* We're done, ignore new events for the action */
@@ -1035,8 +1061,9 @@ static void enroll_stage_cb(struct fp_dev *dev, int result,
 
 	if (result == FP_ENROLL_COMPLETE || result == FP_ENROLL_FAIL || result < 0)
 		priv->action_done = TRUE;
+	set_disconnected (priv, name);
 
-	g_signal_emit(rdev, signals[SIGNAL_ENROLL_STATUS], 0, enroll_result_to_name (result), priv->action_done);
+	g_signal_emit(rdev, signals[SIGNAL_ENROLL_STATUS], 0, name, priv->action_done);
 
 	fp_img_free(img);
 	fp_print_data_free(print);
@@ -1129,13 +1156,18 @@ static void fprint_device_enroll_stop(FprintDevice *rdev,
 		return;
 	}
 
-	r = fp_async_enroll_stop(priv->dev, enroll_stop_cb, context);
+	if (!priv->disconnected)
+		r = fp_async_enroll_stop(priv->dev, enroll_stop_cb, context);
+	else
+		r = 0;
 	if (r < 0) {
 		g_set_error(&error, FPRINT_ERROR, FPRINT_ERROR_INTERNAL,
 			"Enroll stop failed with error %d", r);
 		dbus_g_method_return_error(context, error);
 		g_error_free (error);
 	}
+	if (priv->disconnected)
+		dbus_g_method_return(context);
 
 	priv->current_action = ACTION_NONE;
 }
diff --git a/src/device.xml b/src/device.xml
index 402c44b..99912ad 100644
--- a/src/device.xml
+++ b/src/device.xml
@@ -183,6 +183,12 @@
 						</doc:definition>
 					</doc:item>
 					<doc:item>
+						<doc:term>verify-disconnected</doc:term>
+						<doc:definition>
+							The device was disconnected during the verification, no other actions should be taken, and you shouldn't use the device any more.
+						</doc:definition>
+					</doc:item>
+					<doc:item>
 						<doc:term>verify-unknown-error</doc:term>
 						<doc:definition>
 							An unknown error occurred (usually a driver problem), <doc:ref type="method" to="Device.VerifyStop">Device.VerifyStop</doc:ref> should now be called.
@@ -240,6 +246,13 @@
 						</doc:definition>
 					</doc:item>
 					<doc:item>
+						<doc:term>enroll-disconnected</doc:term>
+						<doc:definition>
+							The device was disconnected during the enrollment, no other actions should be taken, and you shouldn't use the device any more.
+
+						</doc:definition>
+					</doc:item>
+					<doc:item>
 						<doc:term>enroll-unknown-error</doc:term>
 						<doc:definition>
 							An unknown error occurred (usually a driver problem), <doc:ref type="method" to="Device.EnrollStop">Device.EnrollStop</doc:ref> should now be called.
diff --git a/tests/verify.c b/tests/verify.c
index 999c402..eb739cb 100644
--- a/tests/verify.c
+++ b/tests/verify.c
@@ -100,7 +100,7 @@ static void find_finger(DBusGProxy *dev, const char *username)
 static void verify_result(GObject *object, const char *result, gboolean done, void *user_data)
 {
 	gboolean *verify_completed = user_data;
-	g_print("Verify result: %s\n", result);
+	g_print("Verify result: %s (%s)\n", result, done ? "done" : "not done");
 	if (done != FALSE)
 		*verify_completed = TRUE;
 }
-- 
1.6.0.6



Index: fprintd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fprintd/devel/fprintd.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- fprintd.spec	26 Jan 2009 14:22:13 -0000	1.5
+++ fprintd.spec	27 Jan 2009 12:35:28 -0000	1.6
@@ -3,7 +3,7 @@
 
 Name:		fprintd
 Version:	0.1
-Release:	6.git%{short_hash}%{?dist}
+Release:	7.git%{short_hash}%{?dist}
 Summary:	D-Bus service for Fingerprint reader access
 
 Group:		System Environment/Daemons
@@ -16,6 +16,7 @@
 Source0:	fprintd-0.1-%{short_hash}.tar.bz2
 # FIXME remove when we have a newer libfprint
 Patch0:		old-libfprint.patch
+Patch1:		0001-Detect-when-a-device-is-disconnected.patch
 Url:		http://www.reactivated.net/fprint/wiki/Fprintd
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -58,6 +59,7 @@
 %prep
 %setup -q -n %{name}-%{version}
 %patch0 -p1
+%patch1 -p1
 
 %build
 %configure --libdir=/%{_lib}/ --enable-gtk-doc --enable-pam
@@ -94,6 +96,9 @@
 %{_datadir}/dbus-1/interfaces/net.reactivated.Fprint.Manager.xml
 
 %changelog
+* Tue Jan 27 2009 - Bastien Nocera <bnocera at redhat.com> - 0.1-7.git04fd09cfa
+- Add a patch to handle device disconnects
+
 * Mon Jan 26 2009 - Bastien Nocera <bnocera at redhat.com> - 0.1-6.git04fd09cfa
 - Update to latest git, fixes some run-time warnings
 



From jreznik at fedoraproject.org  Tue Jan 27 12:40:56 2009
From: jreznik at fedoraproject.org (Jaroslav Reznik)
Date: Tue, 27 Jan 2009 12:40:56 +0000 (UTC)
Subject: rpms/kde-plasma-runcommand/devel .cvsignore, 1.5,
	1.6 kde-plasma-runcommand.spec, 1.5, 1.6 sources, 1.5, 1.6
Message-ID: <20090127124056.DAC5F7010B@cvs1.fedora.phx.redhat.com>

Author: jreznik

Update of /cvs/pkgs/rpms/kde-plasma-runcommand/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31659

Modified Files:
	.cvsignore kde-plasma-runcommand.spec sources 
Log Message:
* Tue Jan 27 2009 Jaroslav Reznik <jreznik at redhat.com> 1.0-1
- update to 1.0, cmake related changes



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-runcommand/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	2 Jan 2009 11:25:38 -0000	1.5
+++ .cvsignore	27 Jan 2009 12:40:25 -0000	1.6
@@ -1 +1 @@
-91495-runcommand_0.9.tar.bz2
+91495-runcommand_1.0.tar.bz2


Index: kde-plasma-runcommand.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-runcommand/devel/kde-plasma-runcommand.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- kde-plasma-runcommand.spec	2 Jan 2009 11:25:38 -0000	1.5
+++ kde-plasma-runcommand.spec	27 Jan 2009 12:40:25 -0000	1.6
@@ -1,5 +1,5 @@
 Name:           kde-plasma-runcommand
-Version:        0.9
+Version:        1.0
 Release:        1%{?dist}
 Summary:        Simple plasmoid to run commands without using terminal or KRunner
 
@@ -11,7 +11,7 @@
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  kdebase-workspace-devel >= 4.1.0
+BuildRequires:  kdebase-workspace-devel >= 4.2.0
 
 %description
 Simple plasmoid to run commands without using terminal or KRunner. Inspired by
@@ -47,6 +47,9 @@
 %{_kde4_datadir}/kde4/services/plasma-applet-runcommand.desktop
 
 %changelog
+* Tue Jan 27 2009 Jaroslav Reznik <jreznik at redhat.com> 1.0-1
+- update to 1.0, cmake related changes
+
 * Fri Jan 02 2009 Jaroslav Reznik <jreznik at redhat.com> 0.9-1
 - update to 0.9
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-runcommand/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	2 Jan 2009 11:25:38 -0000	1.5
+++ sources	27 Jan 2009 12:40:25 -0000	1.6
@@ -1 +1 @@
-a98d6e3f32b85eae3f299c06cb8432f2  91495-runcommand_0.9.tar.bz2
+2b84999f79af020156ee586cc08310df  91495-runcommand_1.0.tar.bz2



From mhlavink at fedoraproject.org  Tue Jan 27 12:51:32 2009
From: mhlavink at fedoraproject.org (Michal Hlavinka)
Date: Tue, 27 Jan 2009 12:51:32 +0000 (UTC)
Subject: rpms/ecryptfs-utils/devel .cvsignore, 1.20, 1.21 ecryptfs-utils.spec,
	1.35, 1.36 sources, 1.21, 1.22 ecryptfs-utils-68-headn1.patch,
	1.1, NONE
Message-ID: <20090127125132.9E0F77010B@cvs1.fedora.phx.redhat.com>

Author: mhlavink

Update of /cvs/extras/rpms/ecryptfs-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1559

Modified Files:
	.cvsignore ecryptfs-utils.spec sources 
Removed Files:
	ecryptfs-utils-68-headn1.patch 
Log Message:
updated to 69



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ecryptfs-utils/devel/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- .cvsignore	12 Jan 2009 16:57:50 -0000	1.20
+++ .cvsignore	27 Jan 2009 12:51:01 -0000	1.21
@@ -1 +1 @@
-ecryptfs-utils-68.tar.gz
+ecryptfs-utils_69.orig.tar.gz


Index: ecryptfs-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/ecryptfs-utils/devel/ecryptfs-utils.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- ecryptfs-utils.spec	16 Jan 2009 08:12:19 -0000	1.35
+++ ecryptfs-utils.spec	27 Jan 2009 12:51:02 -0000	1.36
@@ -2,20 +2,18 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name: ecryptfs-utils
-Version: 68
+Version: 69
 Release: 1%{?dist}
 Summary: The eCryptfs mount helper and support libraries
 Group: System Environment/Base
 License: GPLv2+
 URL: https://launchpad.net/ecryptfs
-Source0: http://launchpad.net/ecryptfs/trunk/%{version}/+download/ecryptfs-utils-%{version}.tar.gz
+Source0: http://launchpad.net/ecryptfs/trunk/%{version}/+download/ecryptfs-utils_%{version}.orig.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: libgcrypt-devel keyutils-libs-devel openssl-devel pam-devel
 BuildRequires: trousers-devel python python-devel nss-devel
 Conflicts: kernel < 2.6.19
 Patch0: ecryptfs-utils-67-nss3.patch
-#from upstream, required for version <= 68
-Patch1: ecryptfs-utils-68-headn1.patch
 
 %description
 eCryptfs is a stacked cryptographic filesystem that ships in Linux
@@ -47,7 +45,6 @@
 
 %setup -q
 %patch0 -p1 -b .nss3
-%patch1 -p1 -b .headn1
 
 %build
 %configure --disable-rpath --enable-tspi --enable-nss
@@ -128,8 +125,8 @@
 %{python_sitearch}/ecryptfs-utils/_libecryptfs.so
 
 %changelog
-* Thu Jan 15 2009 Tomas Mraz <tmraz at redhat.com> 68-1
-- rebuild with new openssl
+* Tue Jan 27 2009 Michal Hlavinka <mhlavink at redhat.com> 69-1
+- updated to 68
 
 * Mon Jan 12 2009 Michal Hlavinka <mhlavink at redhat.com> 68-0
 - updated to 68


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ecryptfs-utils/devel/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sources	12 Jan 2009 16:57:50 -0000	1.21
+++ sources	27 Jan 2009 12:51:02 -0000	1.22
@@ -1 +1 @@
-57428a8bf128bc1f076412c7b6478ca0  ecryptfs-utils-68.tar.gz
+9df6a132d6a9c40ec0befbb8b55575fa  ecryptfs-utils_69.orig.tar.gz


--- ecryptfs-utils-68-headn1.patch DELETED ---



From mhlavink at fedoraproject.org  Tue Jan 27 12:52:49 2009
From: mhlavink at fedoraproject.org (Michal Hlavinka)
Date: Tue, 27 Jan 2009 12:52:49 +0000 (UTC)
Subject: rpms/dovecot/F-10 .cvsignore, 1.46,
	1.47 dovecot-1.1-default-settings.patch, 1.3, 1.4 dovecot.spec,
	1.116, 1.117 sources, 1.49, 1.50
Message-ID: <20090127125249.6E8967010B@cvs1.fedora.phx.redhat.com>

Author: mhlavink

Update of /cvs/extras/rpms/dovecot/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1939

Modified Files:
	.cvsignore dovecot-1.1-default-settings.patch dovecot.spec 
	sources 
Log Message:
- update dovecot to 1.1.10
- added managesieve support



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/dovecot/F-10/.cvsignore,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- .cvsignore	8 Jan 2009 06:33:25 -0000	1.46
+++ .cvsignore	27 Jan 2009 12:52:19 -0000	1.47
@@ -1,4 +1,8 @@
-dovecot-1.1.8.tar.gz
-dovecot-1.1.8.tar.gz.sig
+dovecot-1.1.10-managesieve-0.10.5.diff.gz
+dovecot-1.1.10-managesieve-0.10.5.diff.gz.sig
+dovecot-1.1.10.tar.gz
+dovecot-1.1.10.tar.gz.sig
+dovecot-1.1-managesieve-0.10.5.tar.gz
+dovecot-1.1-managesieve-0.10.5.tar.gz.sig
 dovecot-sieve-1.1.6.tar.gz
 dovecot-sieve-1.1.6.tar.gz.sig

dovecot-1.1-default-settings.patch:

Index: dovecot-1.1-default-settings.patch
===================================================================
RCS file: /cvs/extras/rpms/dovecot/F-10/dovecot-1.1-default-settings.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- dovecot-1.1-default-settings.patch	2 Dec 2008 16:55:56 -0000	1.3
+++ dovecot-1.1-default-settings.patch	27 Jan 2009 12:52:19 -0000	1.4
@@ -1,6 +1,6 @@
-diff -up dovecot-1.1.7/dovecot-example.conf.default-settings dovecot-1.1.7/dovecot-example.conf
---- dovecot-1.1.7/dovecot-example.conf.default-settings	2008-11-23 22:53:53.000000000 +0100
-+++ dovecot-1.1.7/dovecot-example.conf	2008-12-02 15:18:54.961559642 +0100
+diff -up dovecot-1.1.8/dovecot-example.conf.default-settings dovecot-1.1.8/dovecot-example.conf
+--- dovecot-1.1.8/dovecot-example.conf.default-settings	2009-01-13 19:34:30.390937820 +0100
++++ dovecot-1.1.8/dovecot-example.conf	2009-01-13 19:37:00.217687707 +0100
 @@ -10,17 +10,14 @@
  # value inside quotes, eg.: key = "# char and trailing whitespace  "
  
@@ -14,15 +14,15 @@
  # Base directory where to store runtime data.
  #base_dir = /var/run/dovecot/
  
- # Protocols we want to be serving: imap imaps pop3 pop3s
+ # Protocols we want to be serving: imap imaps pop3 pop3s managesieve
  # If you only want to use dovecot-auth, you can set this to "none".
 -#protocols = imap imaps
 +#protocols = imap imaps pop3 pop3s
  
  # A space separated list of IP or host addresses where to listen in for
  # connections. "*" listens in all IPv4 interfaces. "[::]" listens in all IPv6
-@@ -38,13 +35,13 @@
- #     listen = *:10100
+@@ -42,13 +39,13 @@
+ #     listen = *:12000
  #     ..
  #   }
 -#listen = *
@@ -37,7 +37,7 @@
  
  # Should all IMAP and POP3 processes be killed when Dovecot master process
  # shuts down. Setting this to "no" means that Dovecot can be upgraded without
-@@ -90,8 +87,8 @@
+@@ -95,8 +92,8 @@
  # dropping root privileges, so keep the key file unreadable by anyone but
  # root. Included doc/mkcert.sh can be used to easily generate self-signed
  # certificate, just make sure to update the domains in dovecot-openssl.cnf
@@ -48,7 +48,7 @@
  
  # If key file is password protected, give the password here. Alternatively
  # give it when starting dovecot with -p parameter. Since this file is often
-@@ -449,7 +446,7 @@
+@@ -452,7 +449,7 @@
  # locking methods as well. Some operating systems don't allow using some of
  # them simultaneously.
  #mbox_read_locks = fcntl
@@ -57,9 +57,9 @@
  
  # Maximum time in seconds to wait for lock (all of them) before aborting.
  #mbox_lock_timeout = 300
-diff -up dovecot-1.1.7/src/master/master-settings.c.default-settings dovecot-1.1.7/src/master/master-settings.c
---- dovecot-1.1.7/src/master/master-settings.c.default-settings	2008-11-15 18:13:18.000000000 +0100
-+++ dovecot-1.1.7/src/master/master-settings.c	2008-12-02 15:17:11.762934079 +0100
+diff -up dovecot-1.1.8/src/master/master-settings.c.default-settings dovecot-1.1.8/src/master/master-settings.c
+--- dovecot-1.1.8/src/master/master-settings.c.default-settings	2009-01-13 19:34:30.408937169 +0100
++++ dovecot-1.1.8/src/master/master-settings.c	2009-01-13 19:34:30.419937312 +0100
 @@ -178,8 +178,8 @@ struct settings default_settings = {
  	MEMBER(syslog_facility) "mail",
  


Index: dovecot.spec
===================================================================
RCS file: /cvs/extras/rpms/dovecot/F-10/dovecot.spec,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -r1.116 -r1.117
--- dovecot.spec	8 Jan 2009 06:33:25 -0000	1.116
+++ dovecot.spec	27 Jan 2009 12:52:19 -0000	1.117
@@ -1,7 +1,7 @@
 Summary: Dovecot Secure imap server
 Name: dovecot
 Epoch: 1
-Version: 1.1.8
+Version: 1.1.10
 Release: 1%{?dist}
 License: MIT and LGPLv2 and BSD with advertising
 Group: System Environment/Daemons
@@ -13,8 +13,11 @@
 %define build_gssapi 1
 
 %define build_sieve 1
+%define build_managesieve 1
 %define sieve_version 1.1.6
 %define sieve_name dovecot-sieve
+%define managesieve_version 0.10.5
+%define managesieve_name dovecot-1.1-managesieve
 
 URL: http://www.dovecot.org/
 Source: http://www.dovecot.org/releases/1.1/%{name}-%{version}.tar.gz
@@ -27,6 +30,9 @@
 Source7: dovecot-REDHAT-FAQ.txt
 Source8: http://dovecot.org/releases/sieve/%{sieve_name}-%{sieve_version}.tar.gz
 Source9: dovecot.sysconfig
+Source10: http://www.rename-it.nl/dovecot/1.1/%{managesieve_name}-%{managesieve_version}.tar.gz
+Source11: http://www.rename-it.nl/dovecot/1.1/dovecot-%{version}-managesieve-%{managesieve_version}.diff.gz
+Patch0: dovecot-%{version}-managesieve-%{managesieve_version}.diff.gz
 Patch1: dovecot-1.1-default-settings.patch
 Patch2: dovecot-1.0.beta2-mkcert-permissions.patch
 # local filesystem rules
@@ -89,6 +95,17 @@
 This package provides the CMU Sieve plugin version %{sieve_version} for dovecot LDA.
 %endif
 
+%if %{build_managesieve}
+%package managesieve
+Requires: %{name} = %{epoch}:%{version}-%{release}
+Summary: Manage Sieve daemon for dovecot
+Group: System Environment/Daemons
+License: LGPLv2.1
+
+%description managesieve
+This package provides the Manage Sieve daemon version %{managesieve_version} for dovecot.
+%endif
+
 %if %{build_postgres}
 %package pgsql
 Requires: %{name} = %{epoch}:%{version}-%{release}
@@ -146,6 +163,7 @@
 
 %setup -q
 
+%patch0 -p1 -b .managesieve
 %patch1 -p1 -b .default-settings
 %patch2 -p1 -b .mkcert-permissions
 %patch3 -p1 -b .mkcert-paths
@@ -154,6 +172,10 @@
 %setup -q -D -T -a 8
 %endif
 
+%if %{build_managesieve}
+%setup -q -D -T -a 10
+%endif
+
 %build
 rm -f ./configure
 autoreconf -i -f
@@ -196,6 +218,21 @@
 make %{?_smp_mflags}
 %endif
 
+%if %{build_managesieve}
+cd ..
+cd %{managesieve_name}-%{managesieve_version}
+
+rm -f ./configure
+autoreconf -i -f
+%configure                           \
+    INSTALL_DATA="install -c -p -m644" \
+    --disable-static                 \
+    --with-dovecot=../               \
+    --with-dovecot-sieve=../%{sieve_name}-%{sieve_version}/
+
+make %{?_smp_mflags}
+%endif
+
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
@@ -258,6 +295,13 @@
 popd
 %endif
 
+%if %{build_managesieve}
+# dovecot-managesieve
+pushd %{managesieve_name}-%{managesieve_version}
+make install DESTDIR=$RPM_BUILD_ROOT
+popd
+%endif
+
 #remove the libtool archives
 find $RPM_BUILD_ROOT%{_libdir}/%{name}/ -name '*.la' | xargs rm -f
 
@@ -331,6 +375,13 @@
 %{_libdir}/%{name}/lda/lib90_cmusieve_plugin.so
 %endif
 
+%if %{build_managesieve}
+%files managesieve
+%defattr(-,root,root,-)
+%{_libexecdir}/%{name}/managesieve
+%{_libexecdir}/%{name}/managesieve-login
+%endif
+
 %if %{build_mysql}
 %files mysql
 %defattr(-,root,root,-)
@@ -374,6 +425,10 @@
 
 
 %changelog
+* Tue Jan 27 2009 Michal Hlavinka <mhlavink at redhat.com> - 1:1.1.10-1
+- update dovecot to 1.1.10
+- added managesieve support
+
 * Thu Jan 8 2009 Michal Hlavinka <mhlavink at redhat.com> - 1:1.1.8-1
 - update dovecot to 1.1.8 (Resolves: #475848)
 - update dovecot sieve plugin to 1.1.6


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/dovecot/F-10/sources,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- sources	8 Jan 2009 06:33:25 -0000	1.49
+++ sources	27 Jan 2009 12:52:19 -0000	1.50
@@ -1,4 +1,8 @@
-bc23a919c7ad2b3c5ba69e19f1b46eb2  dovecot-1.1.8.tar.gz
-085419d609721f2281f38cbda7c897fd  dovecot-1.1.8.tar.gz.sig
+bedd4cd6e3e878f12c6bfadb909b5b94  dovecot-1.1.10-managesieve-0.10.5.diff.gz
+5e88cf797b68b572648267e519d47563  dovecot-1.1.10-managesieve-0.10.5.diff.gz.sig
+39f1da81ae25981027a6bfbb42800ed5  dovecot-1.1.10.tar.gz
+f1b4c39c506521b19d6c68b176c13ec6  dovecot-1.1.10.tar.gz.sig
+972ad948be782b7cf37fc74bd17795e2  dovecot-1.1-managesieve-0.10.5.tar.gz
+7e68d7212ce1904f80064c466a525150  dovecot-1.1-managesieve-0.10.5.tar.gz.sig
 7acf3d98974a515b868addbdb73054eb  dovecot-sieve-1.1.6.tar.gz
 a9c6b8b2eab4d6a72395ffde1fb53327  dovecot-sieve-1.1.6.tar.gz.sig



From mhlavink at fedoraproject.org  Tue Jan 27 13:01:22 2009
From: mhlavink at fedoraproject.org (Michal Hlavinka)
Date: Tue, 27 Jan 2009 13:01:22 +0000 (UTC)
Subject: rpms/ecryptfs-utils/devel ecryptfs-utils.spec,1.36,1.37
Message-ID: <20090127130122.DC3AF7010B@cvs1.fedora.phx.redhat.com>

Author: mhlavink

Update of /cvs/extras/rpms/ecryptfs-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3579

Modified Files:
	ecryptfs-utils.spec 
Log Message:
fix changelog



Index: ecryptfs-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/ecryptfs-utils/devel/ecryptfs-utils.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- ecryptfs-utils.spec	27 Jan 2009 12:51:02 -0000	1.36
+++ ecryptfs-utils.spec	27 Jan 2009 13:00:52 -0000	1.37
@@ -126,7 +126,7 @@
 
 %changelog
 * Tue Jan 27 2009 Michal Hlavinka <mhlavink at redhat.com> 69-1
-- updated to 68
+- updated to 69
 
 * Mon Jan 12 2009 Michal Hlavinka <mhlavink at redhat.com> 68-0
 - updated to 68



From twaugh at fedoraproject.org  Tue Jan 27 13:24:12 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Tue, 27 Jan 2009 13:24:12 +0000 (UTC)
Subject: rpms/tree/devel .cvsignore, 1.8, 1.9 sources, 1.8, 1.9 tree.spec,
	1.33, 1.34
Message-ID: <20090127132412.B4C177010B@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/tree/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8713

Modified Files:
	.cvsignore sources tree.spec 
Log Message:
* Tue Jan 27 2009 Tim Waugh <twaugh at redhat.com> 1.5.2.2-1
- 1.5.2.2.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/tree/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	2 Sep 2008 14:01:22 -0000	1.8
+++ .cvsignore	27 Jan 2009 13:23:42 -0000	1.9
@@ -4,3 +4,4 @@
 tree-1.5.1.2.tgz
 tree-1.5.2.tgz
 tree-1.5.2.1.tgz
+tree-1.5.2.2.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tree/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	2 Sep 2008 14:01:22 -0000	1.8
+++ sources	27 Jan 2009 13:23:42 -0000	1.9
@@ -1 +1 @@
-73d5fa220dfef1ee9c1876c3966f1c18  tree-1.5.2.1.tgz
+a7731a898e2c0d7e422a57a84ffbb06c  tree-1.5.2.2.tgz


Index: tree.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tree/devel/tree.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- tree.spec	24 Nov 2008 09:53:14 -0000	1.33
+++ tree.spec	27 Jan 2009 13:23:42 -0000	1.34
@@ -1,7 +1,7 @@
 Summary: File system tree viewer
 Name: tree
-Version: 1.5.2.1
-Release: 2%{?dist}
+Version: 1.5.2.2
+Release: 1%{?dist}
 Group: Applications/File
 License: GPLv2+
 Url: http://mama.indstate.edu/users/ice/tree/
@@ -45,6 +45,9 @@
 %doc README LICENSE
 
 %changelog
+* Tue Jan 27 2009 Tim Waugh <twaugh at redhat.com> 1.5.2.2-1
+- 1.5.2.2.
+
 * Mon Nov 24 2008 Tim Waugh <twaugh at redhat.com> 1.5.2.1-2
 - Better summary.
 



From hno at fedoraproject.org  Tue Jan 27 13:25:09 2009
From: hno at fedoraproject.org (=?utf-8?q?Henrik_Nordstr=C3=B6m?=)
Date: Tue, 27 Jan 2009 13:25:09 +0000 (UTC)
Subject: rpms/squid/devel .cvsignore, 1.36, 1.37 sources, 1.39,
	1.40 squid.spec, 1.113, 1.114
Message-ID: <20090127132509.4C36F7010B@cvs1.fedora.phx.redhat.com>

Author: hno

Update of /cvs/pkgs/rpms/squid/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8905

Modified Files:
	.cvsignore sources squid.spec 
Log Message:
3.0.STABLE12



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/squid/devel/.cvsignore,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- .cvsignore	24 Oct 2008 19:40:20 -0000	1.36
+++ .cvsignore	27 Jan 2009 13:24:39 -0000	1.37
@@ -1 +1 @@
-squid-3.0.STABLE10.tar.bz2
+squid-3.0.STABLE12.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/squid/devel/sources,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- sources	24 Oct 2008 19:40:20 -0000	1.39
+++ sources	27 Jan 2009 13:24:39 -0000	1.40
@@ -1 +1 @@
-cfd37717230220a9f47177594e235f18  squid-3.0.STABLE10.tar.bz2
+50f10f79b78c322c9dc21b0ecdbcbefc  squid-3.0.STABLE12.tar.bz2


Index: squid.spec
===================================================================
RCS file: /cvs/pkgs/rpms/squid/devel/squid.spec,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -r1.113 -r1.114
--- squid.spec	18 Jan 2009 12:25:29 -0000	1.113
+++ squid.spec	27 Jan 2009 13:24:39 -0000	1.114
@@ -3,8 +3,8 @@
 ## % define __find_requires %{SOURCE99}
 
 Name:     squid
-Version:  3.0.STABLE10
-Release:  4%{?dist}
+Version:  3.0.STABLE12
+Release:  1%{?dist}
 Summary:  The Squid proxy caching server
 Epoch:    7
 License:  GPLv2+
@@ -20,8 +20,7 @@
 ## Source99: filter-requires-squid.sh
 
 # Upstream patches
-Patch001: http://www.squid-cache.org/Versions/v3/3.0/changesets/b8920.patch
-Patch002: http://www.squid-cache.org/Versions/v3/3.0/changesets/b8930.patch
+#Patch001: http://www.squid-cache.org/Versions/v3/3.0/changesets/bXXXX.patch
 
 # External patches
 
@@ -60,8 +59,6 @@
 %prep
 %setup -q
 
-%patch001 -p0 -b .b8920
-%patch002 -p0 -b .b8930
 %patch201 -p1 -b .config
 %patch202 -p1 -b .location
 %patch203 -p1 -b .build
@@ -341,6 +338,9 @@
     chgrp squid /var/cache/samba/winbindd_privileged >/dev/null 2>&1 || :
 
 %changelog
+* Tue Jan 27 2009 Henrik Nordstrom <henrik at henriknordstrom.net> - 7:3.0.STABLE12-1
+- upgrade to latest upstream
+
 * Sun Jan 18 2009 Tomas Mraz <tmraz at redhat.com> - 7:3.0.STABLE10-4
 - rebuild with new openssl
 



From mtasaka at fedoraproject.org  Tue Jan 27 13:26:22 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Tue, 27 Jan 2009 13:26:22 +0000 (UTC)
Subject: rpms/cairo-dock/devel cairo-dock.spec,1.146,1.147
Message-ID: <20090127132622.1F3817010B@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/cairo-dock/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9121

Modified Files:
	cairo-dock.spec 
Log Message:
source command in sh 4.0 does not search for the current directory


Index: cairo-dock.spec
===================================================================
RCS file: /cvs/extras/rpms/cairo-dock/devel/cairo-dock.spec,v
retrieving revision 1.146
retrieving revision 1.147
diff -u -r1.146 -r1.147
--- cairo-dock.spec	27 Jan 2009 05:45:32 -0000	1.146
+++ cairo-dock.spec	27 Jan 2009 13:25:51 -0000	1.147
@@ -274,7 +274,9 @@
 Subdirs_1=$(%{__sed} -n -e '\@SUBDIR@,\@^.*[^\\]$@p' Makefile.am | sed -e 's|\\$||' | tail -n +2)
 %{__sed} -n -e '\@_dir=@p' Makefile.am > eval.sh
 
-. eval.sh
+# Now bash 4.0 "source" command does not search for the current
+# directory when executed as "sh" (in posix mode)
+. ./eval.sh
 Subdirs=$(eval echo ${Subdirs_1})
 
 # gnome-integration: needs F-9+



From mhlavink at fedoraproject.org  Tue Jan 27 13:26:54 2009
From: mhlavink at fedoraproject.org (Michal Hlavinka)
Date: Tue, 27 Jan 2009 13:26:54 +0000 (UTC)
Subject: rpms/ecryptfs-utils/devel ecryptfs-utils.spec,1.37,1.38
Message-ID: <20090127132654.B33437010B@cvs1.fedora.phx.redhat.com>

Author: mhlavink

Update of /cvs/extras/rpms/ecryptfs-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9260

Modified Files:
	ecryptfs-utils.spec 
Log Message:
bump release for rebuild



Index: ecryptfs-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/ecryptfs-utils/devel/ecryptfs-utils.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- ecryptfs-utils.spec	27 Jan 2009 13:00:52 -0000	1.37
+++ ecryptfs-utils.spec	27 Jan 2009 13:26:24 -0000	1.38
@@ -3,7 +3,7 @@
 
 Name: ecryptfs-utils
 Version: 69
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: The eCryptfs mount helper and support libraries
 Group: System Environment/Base
 License: GPLv2+
@@ -125,6 +125,9 @@
 %{python_sitearch}/ecryptfs-utils/_libecryptfs.so
 
 %changelog
+* Tue Jan 27 2009 Michal Hlavinka <mhlavink at redhat.com> 69-2
+- bump release for rebuild
+
 * Tue Jan 27 2009 Michal Hlavinka <mhlavink at redhat.com> 69-1
 - updated to 69
 



From firewing at fedoraproject.org  Tue Jan 27 13:29:43 2009
From: firewing at fedoraproject.org (Stewart Adam)
Date: Tue, 27 Jan 2009 13:29:43 +0000 (UTC)
Subject: rpms/audio-convert-mod/F-10 .cvsignore, 1.6,
	1.7 audio-convert-mod.spec, 1.8, 1.9 sources, 1.6, 1.7
Message-ID: <20090127132943.9E2F17010B@cvs1.fedora.phx.redhat.com>

Author: firewing

Update of /cvs/extras/rpms/audio-convert-mod/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9751/F-10

Modified Files:
	.cvsignore audio-convert-mod.spec sources 
Log Message:
* Tue Jan 27 2009 Stewart Adam <s.adam at diffingo.com> - 3.45.5b-1
- Update to 3.45.5b (correctly updates the v3.45.4 prefs file)
- Drop NEWS and README



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/audio-convert-mod/F-10/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	13 Jan 2009 04:10:07 -0000	1.6
+++ .cvsignore	27 Jan 2009 13:29:13 -0000	1.7
@@ -1 +1 @@
-audio-convert-mod-3.45.5.tar.gz
+audio-convert-mod-3.45.5b.tar.gz


Index: audio-convert-mod.spec
===================================================================
RCS file: /cvs/extras/rpms/audio-convert-mod/F-10/audio-convert-mod.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- audio-convert-mod.spec	13 Jan 2009 04:10:07 -0000	1.8
+++ audio-convert-mod.spec	27 Jan 2009 13:29:13 -0000	1.9
@@ -1,5 +1,5 @@
 Name:              audio-convert-mod
-Version:           3.45.5
+Version:           3.45.5b
 Release:           1%{?dist}
 BuildArch:         noarch
 Summary:           A simple audio file converter which supports many formats
@@ -10,10 +10,10 @@
 BuildRoot:         %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:     desktop-file-utils
-BuildRequires:     gettext, intltool, automake, autoconf
-BuildRequires:     python-devel >= 2.4
+BuildRequires:     gettext, intltool
+BuildRequires:     python >= 2.4
 Requires:          python >= 2.4
-Requires:          pygtk2, pygtk2-libglade
+Requires:          pygtk2-libglade
 Requires:          notify-python
 
 # FOSS encoders, decoders, taggers
@@ -60,10 +60,14 @@
 %{_datadir}/%{name}/
 %{_datadir}/applications/fedora-*.desktop
 
-%doc AUTHORS ChangeLog COPYING NEWS INSTALL README TODO
+%doc AUTHORS ChangeLog COPYING README TODO
 
 
 %changelog
+* Tue Jan 27 2009 Stewart Adam <s.adam at diffingo.com> - 3.45.5b-1
+- Update to 3.45.5b (correctly updates the v3.45.4 prefs file)
+- Drop NEWS and README
+
 * Mon Jan 12 2009 Stewart Adam <s.adam at diffingo.com> 3.45.5-1
 - Update to 3.45.5 (see ChangeLog for details on version changes)
 - Add BR on autoconf


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/audio-convert-mod/F-10/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	13 Jan 2009 04:10:07 -0000	1.6
+++ sources	27 Jan 2009 13:29:13 -0000	1.7
@@ -1 +1 @@
-39bba3a8ecae014e58d72d56d5fd46ec  audio-convert-mod-3.45.5.tar.gz
+adf1b630c0ea19b03db8e7ebf2132d03  audio-convert-mod-3.45.5b.tar.gz



From firewing at fedoraproject.org  Tue Jan 27 13:29:43 2009
From: firewing at fedoraproject.org (Stewart Adam)
Date: Tue, 27 Jan 2009 13:29:43 +0000 (UTC)
Subject: rpms/audio-convert-mod/F-9 .cvsignore, 1.6,
	1.7 audio-convert-mod.spec, 1.10, 1.11 sources, 1.6, 1.7
Message-ID: <20090127132943.D7E6B7010D@cvs1.fedora.phx.redhat.com>

Author: firewing

Update of /cvs/extras/rpms/audio-convert-mod/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9751/F-9

Modified Files:
	.cvsignore audio-convert-mod.spec sources 
Log Message:
* Tue Jan 27 2009 Stewart Adam <s.adam at diffingo.com> - 3.45.5b-1
- Update to 3.45.5b (correctly updates the v3.45.4 prefs file)
- Drop NEWS and README



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/audio-convert-mod/F-9/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	13 Jan 2009 04:10:08 -0000	1.6
+++ .cvsignore	27 Jan 2009 13:29:13 -0000	1.7
@@ -1 +1 @@
-audio-convert-mod-3.45.5.tar.gz
+audio-convert-mod-3.45.5b.tar.gz


Index: audio-convert-mod.spec
===================================================================
RCS file: /cvs/extras/rpms/audio-convert-mod/F-9/audio-convert-mod.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- audio-convert-mod.spec	13 Jan 2009 04:18:14 -0000	1.10
+++ audio-convert-mod.spec	27 Jan 2009 13:29:13 -0000	1.11
@@ -1,6 +1,6 @@
 Name:              audio-convert-mod
-Version:           3.45.5
-Release:           1%{?dist}.1
+Version:           3.45.5b
+Release:           1%{?dist}
 BuildArch:         noarch
 Summary:           A simple audio file converter which supports many formats
 Group:             Applications/Multimedia
@@ -10,10 +10,10 @@
 BuildRoot:         %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:     desktop-file-utils
-BuildRequires:     gettext, intltool, automake, autoconf
-BuildRequires:     python-devel >= 2.4
+BuildRequires:     gettext, intltool
+BuildRequires:     python >= 2.4
 Requires:          python >= 2.4
-Requires:          pygtk2, pygtk2-libglade
+Requires:          pygtk2-libglade
 Requires:          notify-python
 
 # FOSS encoders, decoders, taggers
@@ -60,10 +60,15 @@
 %{_datadir}/%{name}/
 %{_datadir}/applications/fedora-*.desktop
 
-%doc AUTHORS ChangeLog COPYING NEWS INSTALL README TODO
+%doc AUTHORS ChangeLog COPYING README TODO
 
 
 %changelog
+* Tue Jan 27 2009 Stewart Adam <s.adam at diffingo.com> - 3.45.5b-1
+- Update to 3.45.5b (correctly updates the v3.45.4 prefs file)
+- Drop NEWS and README
+
+
 * Mon Jan 12 2009 Stewart Adam <s.adam at diffingo.com> 3.45.5-1.1
 - Bump for retag
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/audio-convert-mod/F-9/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	13 Jan 2009 04:10:08 -0000	1.6
+++ sources	27 Jan 2009 13:29:13 -0000	1.7
@@ -1 +1 @@
-39bba3a8ecae014e58d72d56d5fd46ec  audio-convert-mod-3.45.5.tar.gz
+adf1b630c0ea19b03db8e7ebf2132d03  audio-convert-mod-3.45.5b.tar.gz



From firewing at fedoraproject.org  Tue Jan 27 13:29:44 2009
From: firewing at fedoraproject.org (Stewart Adam)
Date: Tue, 27 Jan 2009 13:29:44 +0000 (UTC)
Subject: rpms/audio-convert-mod/devel .cvsignore, 1.6,
	1.7 audio-convert-mod.spec, 1.9, 1.10 sources, 1.6, 1.7
Message-ID: <20090127132944.1CD7F7010B@cvs1.fedora.phx.redhat.com>

Author: firewing

Update of /cvs/extras/rpms/audio-convert-mod/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9751/devel

Modified Files:
	.cvsignore audio-convert-mod.spec sources 
Log Message:
* Tue Jan 27 2009 Stewart Adam <s.adam at diffingo.com> - 3.45.5b-1
- Update to 3.45.5b (correctly updates the v3.45.4 prefs file)
- Drop NEWS and README



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/audio-convert-mod/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	13 Jan 2009 03:41:53 -0000	1.6
+++ .cvsignore	27 Jan 2009 13:29:13 -0000	1.7
@@ -1 +1 @@
-audio-convert-mod-3.45.5.tar.gz
+audio-convert-mod-3.45.5b.tar.gz


Index: audio-convert-mod.spec
===================================================================
RCS file: /cvs/extras/rpms/audio-convert-mod/devel/audio-convert-mod.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- audio-convert-mod.spec	13 Jan 2009 03:41:54 -0000	1.9
+++ audio-convert-mod.spec	27 Jan 2009 13:29:13 -0000	1.10
@@ -1,5 +1,5 @@
 Name:              audio-convert-mod
-Version:           3.45.5
+Version:           3.45.5b
 Release:           1%{?dist}
 BuildArch:         noarch
 Summary:           A simple audio file converter which supports many formats
@@ -10,10 +10,10 @@
 BuildRoot:         %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:     desktop-file-utils
-BuildRequires:     gettext, intltool, automake, autoconf
-BuildRequires:     python-devel >= 2.4
+BuildRequires:     gettext, intltool
+BuildRequires:     python >= 2.4
 Requires:          python >= 2.4
-Requires:          pygtk2, pygtk2-libglade
+Requires:          pygtk2-libglade
 Requires:          notify-python
 
 # FOSS encoders, decoders, taggers
@@ -60,10 +60,14 @@
 %{_datadir}/%{name}/
 %{_datadir}/applications/fedora-*.desktop
 
-%doc AUTHORS ChangeLog COPYING NEWS INSTALL README TODO
+%doc AUTHORS ChangeLog COPYING README TODO
 
 
 %changelog
+* Tue Jan 27 2009 Stewart Adam <s.adam at diffingo.com> - 3.45.5b-1
+- Update to 3.45.5b (correctly updates the v3.45.4 prefs file)
+- Drop NEWS and README
+
 * Mon Jan 12 2009 Stewart Adam <s.adam at diffingo.com> - 3.45.5-1
 - Update to 3.45.5 (see ChangeLog for details on version changes)
 - Add BR on autoconf


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/audio-convert-mod/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	13 Jan 2009 03:41:54 -0000	1.6
+++ sources	27 Jan 2009 13:29:13 -0000	1.7
@@ -1 +1 @@
-39bba3a8ecae014e58d72d56d5fd46ec  audio-convert-mod-3.45.5.tar.gz
+adf1b630c0ea19b03db8e7ebf2132d03  audio-convert-mod-3.45.5b.tar.gz



From mmaslano at fedoraproject.org  Tue Jan 27 13:32:51 2009
From: mmaslano at fedoraproject.org (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?=)
Date: Tue, 27 Jan 2009 13:32:51 +0000 (UTC)
Subject: rpms/crontabs/devel crontabs.spec,1.31,1.32
Message-ID: <20090127133251.C0DFE7010B@cvs1.fedora.phx.redhat.com>

Author: mmaslano

Update of /cvs/pkgs/rpms/crontabs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10627

Modified Files:
	crontabs.spec 
Log Message:
* Tue Jan 27 2009 Marcela Ma??l????ov?? <mmaslano at redhat.com> 1.10-28
- 474219 requires on /etc/cron.d



Index: crontabs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/crontabs/devel/crontabs.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- crontabs.spec	26 Jan 2009 12:12:14 -0000	1.31
+++ crontabs.spec	27 Jan 2009 13:32:21 -0000	1.32
@@ -1,22 +1,22 @@
 Summary: Root crontab files used to schedule the execution of programs
 Name: crontabs
 Version: 1.10
-Release: 27%{?dist}
+Release: 28%{?dist}
 License: Public Domain and GPLv2
 Group: System Environment/Base
 Source0: crontab
 Source1: run-parts
 Source2: config
 BuildArch: noarch
-Requires: cronie
+Requires: /etc/cron.d
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
-The crontabs package contains root crontab files.  Crontab is the
-program used to install, uninstall or list the tables used to drive the
-cron daemon.  The cron daemon checks the crontab files to see when
-particular commands are scheduled to be executed.  If commands are
-scheduled, it executes them.
+The crontabs package contains root crontab files and directories.
+You will need to install cron daemon to run the jobs from the crontabs.
+The cron daemon such as cronie or fcron checks the crontab files to
+see when particular commands are scheduled to be executed.  If commands
+are scheduled, it executes them.
 
 Crontabs handles a basic system function, so it should be installed on
 your system.
@@ -44,6 +44,9 @@
 %dir /etc/cron.monthly
 
 %changelog
+* Tue Jan 27 2009 Marcela Ma??l????ov?? <mmaslano at redhat.com> 1.10-28
+- 474219 requires on /etc/cron.d
+
 * Mon Jan 26 2009 Marcela Ma??l????ov?? <mmaslano at redhat.com> 1.10-27
 - Change requires back to cronie.
 



From than at fedoraproject.org  Tue Jan 27 14:12:57 2009
From: than at fedoraproject.org (Than Ngo)
Date: Tue, 27 Jan 2009 14:12:57 +0000 (UTC)
Subject: rpms/kdepim/devel kdepim-4.2.0-kpilot.patch, NONE, 1.1 kdepim.spec, 
	1.204, 1.205
Message-ID: <20090127141257.7C3327010D@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdepim/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17545

Modified Files:
	kdepim.spec 
Added Files:
	kdepim-4.2.0-kpilot.patch 
Log Message:
upstream patch, fix data corruption problems in KPilot


kdepim-4.2.0-kpilot.patch:

--- NEW FILE kdepim-4.2.0-kpilot.patch ---
Index: kpilot/conduits/todo/todoconduit.cc
===================================================================
--- kpilot/conduits/todo/todoconduit.cc	(Revision 915906)
+++ kpilot/conduits/todo/todoconduit.cc	(Revision 915907)
@@ -68,6 +68,7 @@
 	
 	TodoSettings::self()->readConfig();
 	d->fCollectionId = TodoSettings::akonadiCollection();
+	d->fPrevCollectionId = TodoSettings::prevAkonadiCollection();
 }
 
 bool TodoConduit::initDataProxies()
Index: kpilot/conduits/akonadibase/akonadirecord.cc
===================================================================
--- kpilot/conduits/akonadibase/akonadirecord.cc	(Revision 915830)
+++ kpilot/conduits/akonadibase/akonadirecord.cc	(Revision 915831)
@@ -47,12 +47,14 @@
 	d->fItem = item;
 	d->fLastSyncDateTime = lastSync.toUTC(); // Item times are saved in UTC time.
 	d->fDeleted = false;
+	d->fDummy = false;
 }
 
 AkonadiRecord::AkonadiRecord( const QString& id ) : d( new AkonadiRecordPrivate )
 {
 	d->fTempId = id;
 	d->fDeleted = true;
+	d->fDummy = false;
 }
 
 AkonadiRecord::~AkonadiRecord()
Index: kpilot/conduits/akonadibase/akonadirecord.cc
===================================================================
--- kpilot/conduits/akonadibase/akonadirecord.cc	(Revision 915836)
+++ kpilot/conduits/akonadibase/akonadirecord.cc	(Revision 915837)
@@ -50,11 +50,15 @@
 	d->fDummy = false;
 }
 
+/**
+ * This ctor is _only_ used for dummy records which are temporarily used to delete
+ * data.
+ */
 AkonadiRecord::AkonadiRecord( const QString& id ) : d( new AkonadiRecordPrivate )
 {
 	d->fTempId = id;
 	d->fDeleted = true;
-	d->fDummy = false;
+	d->fDummy = true;
 }
 
 AkonadiRecord::~AkonadiRecord()
@@ -123,6 +127,11 @@
 	d->fItem = item;
 	// Make sure that we return the right id after updating the itemobject.
 	setId( QString::number( item.id() ) );
+	/**
+	 * Assuming we're being passed a valid item to use, make sure fDummy
+	 * is not still false after this.
+	 */
+	setDummy( false );
 }
 
 void AkonadiRecord::synced()


Index: kdepim.spec
===================================================================
RCS file: /cvs/extras/rpms/kdepim/devel/kdepim.spec,v
retrieving revision 1.204
retrieving revision 1.205
diff -u -r1.204 -r1.205
--- kdepim.spec	22 Jan 2009 11:43:44 -0000	1.204
+++ kdepim.spec	27 Jan 2009 14:12:27 -0000	1.205
@@ -6,13 +6,15 @@
 Summary: PIM (Personal Information Manager) applications
 Epoch:   6
 Version: 4.2.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPLv2
 Group:   Applications/Productivity
-URL:	 http://www.kde.org/
+URL:	   http://www.kde.org/
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
 Patch0:  kdepim-4.1.80-libqgpgme-link-fix.patch
+# upstream patches
+Patch100: kdepim-4.2.0-kpilot.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Provides: kdepim4 = %{version}-%{release}
@@ -91,6 +93,7 @@
 %patch0 -p1 -b .libqgpgme-link-fix
 
 # upstream patches
+%patch100 -p0 -b .kpilot
 
 %build
 mkdir -p %{_target_platform}
@@ -180,6 +183,9 @@
 
 
 %changelog
+* Tue Jan 27 2009 Than Ngo <than at redhat.com> - 4.2.0-2
+- upstream patch, fix data corruption problems in KPilot
+
 * Thu Jan 22 2009 Than Ngo <than at redhat.com> - 4.2.0-1
 - 4.2.0
 



From pcfe at fedoraproject.org  Tue Jan 27 14:17:32 2009
From: pcfe at fedoraproject.org (=?utf-8?q?Patrick_Charles_Fran=C3=A7ois_Ernzer?=)
Date: Tue, 27 Jan 2009 14:17:32 +0000 (UTC)
Subject: rpms/cmconvert/devel cmconvert.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090127141732.181737010B@cvs1.fedora.phx.redhat.com>

Author: pcfe

Update of /cvs/pkgs/rpms/cmconvert/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18364/devel

Modified Files:
	.cvsignore sources 
Added Files:
	cmconvert.spec import.log 
Log Message:
* Tue Jan 27 2009 Patrick C. F. Ernzer <cmconvert.spec at pcfe.net>
- checking package in (#475000)



--- NEW FILE cmconvert.spec ---
Name: cmconvert
Summary: CacheMate import file converter 
Version: 1.9.5
Release: 5%{dist}
License: GPLv2+
Group: Applications/File
URL: http://www.smittyware.com/palm/cachemate/tools.php
Source0: http://www.smittyware.com/download/%{name}-%{version}.tar.gz
Buildroot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildRequires: expat-devel
BuildRequires: zziplib-devel
BuildRequires: zlib-devel


%description 
This program is used to convert EasyGPS XML file formats (LOC and GPX) to
a format that can be installed onto a Palm OS device and imported into
CacheMate.  Options are also available to list waypoints contained in an
XML file, and selectively convert specified waypoints.

%prep 
%setup -q 

%build 
%configure
make %{?_smp_mflags}

%install 
rm -fr %{buildroot}
make install DESTDIR=%{buildroot} INSTALL="install -p"

%clean 
rm -fr %{buildroot}

%files 
%defattr(-,root,root,-) 
%doc ChangeLog COPYING README
%{_bindir}/cmconvert
%{_mandir}/man1/cmconvert.1*

%changelog 
* Mon Jan 26 2009 Patrick C. F. Ernzer <cmconvert.spec at pcfe.net> 1.9.5-5
- incorporate feedback from Bug 475000 Comments #11
- also fixed wron date on changelog entries for -3 and -2

* Wed Dec 31 2008 Patrick C. F. Ernzer <cmconvert.spec at pcfe.net> 1.9.5-4
- incorporate feedback from Bug 475000 Comment #5

* Thu Dec 11 2008 Patrick C. F. Ernzer <cmconvert.spec at pcfe.net> 1.9.5-3
- incorporate feedback from Bug 475000 Comments #1 and #2

* Fri Dec 05 2008 Patrick C. F. Ernzer <cmconvert.spec at pcfe.net> 1.9.5-2
- fix rpmlint warnings and errors

* Fri Nov 10 2006 Patrick C. F. Ernzer <cmconvert.spec at pcfe.net> 1.9.5-1
- update to 1.9.5

* Mon Jul 10 2006 Patrick C. F. Ernzer <cmconvert.spec at pcfe.net> 1.9.4-1
- update to 1.9.4

* Sat Apr 22 2006 Patrick C. F. Ernzer <cmconvert.spec at pcfe.net> 1.9.3-1
- update to 1.9.3

* Mon May 09 2005 Patrick C. F. Ernzer <cmconvert.spec at pcfe.net> 1.9.0-1
- first build


--- NEW FILE import.log ---
cmconvert-1_9_5-5_fc10:HEAD:cmconvert-1.9.5-5.fc10.src.rpm:1233065574


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cmconvert/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	26 Jan 2009 22:18:59 -0000	1.1
+++ .cvsignore	27 Jan 2009 14:17:01 -0000	1.2
@@ -0,0 +1 @@
+cmconvert-1.9.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cmconvert/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	26 Jan 2009 22:18:59 -0000	1.1
+++ sources	27 Jan 2009 14:17:01 -0000	1.2
@@ -0,0 +1 @@
+66db83f66ee4eada22e8b4322acb6aa1  cmconvert-1.9.5.tar.gz



From pcfe at fedoraproject.org  Tue Jan 27 14:19:40 2009
From: pcfe at fedoraproject.org (=?utf-8?q?Patrick_Charles_Fran=C3=A7ois_Ernzer?=)
Date: Tue, 27 Jan 2009 14:19:40 +0000 (UTC)
Subject: rpms/cmconvert/F-10 cmconvert.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090127141940.CAC657010B@cvs1.fedora.phx.redhat.com>

Author: pcfe

Update of /cvs/pkgs/rpms/cmconvert/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19526/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	cmconvert.spec import.log 
Log Message:
* Tue Jan 27 2009 Patrick C. F. Ernzer <cmconvert.spec at pcfe.net>
- checking package in (#475000)



--- NEW FILE cmconvert.spec ---
Name: cmconvert
Summary: CacheMate import file converter 
Version: 1.9.5
Release: 5%{dist}
License: GPLv2+
Group: Applications/File
URL: http://www.smittyware.com/palm/cachemate/tools.php
Source0: http://www.smittyware.com/download/%{name}-%{version}.tar.gz
Buildroot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildRequires: expat-devel
BuildRequires: zziplib-devel
BuildRequires: zlib-devel


%description 
This program is used to convert EasyGPS XML file formats (LOC and GPX) to
a format that can be installed onto a Palm OS device and imported into
CacheMate.  Options are also available to list waypoints contained in an
XML file, and selectively convert specified waypoints.

%prep 
%setup -q 

%build 
%configure
make %{?_smp_mflags}

%install 
rm -fr %{buildroot}
make install DESTDIR=%{buildroot} INSTALL="install -p"

%clean 
rm -fr %{buildroot}

%files 
%defattr(-,root,root,-) 
%doc ChangeLog COPYING README
%{_bindir}/cmconvert
%{_mandir}/man1/cmconvert.1*

%changelog 
* Mon Jan 26 2009 Patrick C. F. Ernzer <cmconvert.spec at pcfe.net> 1.9.5-5
- incorporate feedback from Bug 475000 Comments #11
- also fixed wron date on changelog entries for -3 and -2

* Wed Dec 31 2008 Patrick C. F. Ernzer <cmconvert.spec at pcfe.net> 1.9.5-4
- incorporate feedback from Bug 475000 Comment #5

* Thu Dec 11 2008 Patrick C. F. Ernzer <cmconvert.spec at pcfe.net> 1.9.5-3
- incorporate feedback from Bug 475000 Comments #1 and #2

* Fri Dec 05 2008 Patrick C. F. Ernzer <cmconvert.spec at pcfe.net> 1.9.5-2
- fix rpmlint warnings and errors

* Fri Nov 10 2006 Patrick C. F. Ernzer <cmconvert.spec at pcfe.net> 1.9.5-1
- update to 1.9.5

* Mon Jul 10 2006 Patrick C. F. Ernzer <cmconvert.spec at pcfe.net> 1.9.4-1
- update to 1.9.4

* Sat Apr 22 2006 Patrick C. F. Ernzer <cmconvert.spec at pcfe.net> 1.9.3-1
- update to 1.9.3

* Mon May 09 2005 Patrick C. F. Ernzer <cmconvert.spec at pcfe.net> 1.9.0-1
- first build


--- NEW FILE import.log ---
cmconvert-1_9_5-5_fc10:F-10:cmconvert-1.9.5-5.fc10.src.rpm:1233065915


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cmconvert/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	26 Jan 2009 22:18:59 -0000	1.1
+++ .cvsignore	27 Jan 2009 14:19:10 -0000	1.2
@@ -0,0 +1 @@
+cmconvert-1.9.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cmconvert/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	26 Jan 2009 22:18:59 -0000	1.1
+++ sources	27 Jan 2009 14:19:10 -0000	1.2
@@ -0,0 +1 @@
+66db83f66ee4eada22e8b4322acb6aa1  cmconvert-1.9.5.tar.gz



From than at fedoraproject.org  Tue Jan 27 14:23:44 2009
From: than at fedoraproject.org (Than Ngo)
Date: Tue, 27 Jan 2009 14:23:44 +0000 (UTC)
Subject: rpms/kdepim/F-10 kdepim-4.2.0-kpilot.patch, NONE, 1.1 kdepim.spec, 
	1.202, 1.203
Message-ID: <20090127142344.E35667010B@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdepim/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20171

Modified Files:
	kdepim.spec 
Added Files:
	kdepim-4.2.0-kpilot.patch 
Log Message:
upstream patch, fix data corruption problems in KPilot



kdepim-4.2.0-kpilot.patch:

--- NEW FILE kdepim-4.2.0-kpilot.patch ---
Index: kpilot/conduits/todo/todoconduit.cc
===================================================================
--- kpilot/conduits/todo/todoconduit.cc	(Revision 915906)
+++ kpilot/conduits/todo/todoconduit.cc	(Revision 915907)
@@ -68,6 +68,7 @@
 	
 	TodoSettings::self()->readConfig();
 	d->fCollectionId = TodoSettings::akonadiCollection();
+	d->fPrevCollectionId = TodoSettings::prevAkonadiCollection();
 }
 
 bool TodoConduit::initDataProxies()
Index: kpilot/conduits/akonadibase/akonadirecord.cc
===================================================================
--- kpilot/conduits/akonadibase/akonadirecord.cc	(Revision 915830)
+++ kpilot/conduits/akonadibase/akonadirecord.cc	(Revision 915831)
@@ -47,12 +47,14 @@
 	d->fItem = item;
 	d->fLastSyncDateTime = lastSync.toUTC(); // Item times are saved in UTC time.
 	d->fDeleted = false;
+	d->fDummy = false;
 }
 
 AkonadiRecord::AkonadiRecord( const QString& id ) : d( new AkonadiRecordPrivate )
 {
 	d->fTempId = id;
 	d->fDeleted = true;
+	d->fDummy = false;
 }
 
 AkonadiRecord::~AkonadiRecord()
Index: kpilot/conduits/akonadibase/akonadirecord.cc
===================================================================
--- kpilot/conduits/akonadibase/akonadirecord.cc	(Revision 915836)
+++ kpilot/conduits/akonadibase/akonadirecord.cc	(Revision 915837)
@@ -50,11 +50,15 @@
 	d->fDummy = false;
 }
 
+/**
+ * This ctor is _only_ used for dummy records which are temporarily used to delete
+ * data.
+ */
 AkonadiRecord::AkonadiRecord( const QString& id ) : d( new AkonadiRecordPrivate )
 {
 	d->fTempId = id;
 	d->fDeleted = true;
-	d->fDummy = false;
+	d->fDummy = true;
 }
 
 AkonadiRecord::~AkonadiRecord()
@@ -123,6 +127,11 @@
 	d->fItem = item;
 	// Make sure that we return the right id after updating the itemobject.
 	setId( QString::number( item.id() ) );
+	/**
+	 * Assuming we're being passed a valid item to use, make sure fDummy
+	 * is not still false after this.
+	 */
+	setDummy( false );
 }
 
 void AkonadiRecord::synced()


Index: kdepim.spec
===================================================================
RCS file: /cvs/extras/rpms/kdepim/F-10/kdepim.spec,v
retrieving revision 1.202
retrieving revision 1.203
diff -u -r1.202 -r1.203
--- kdepim.spec	24 Jan 2009 06:02:23 -0000	1.202
+++ kdepim.spec	27 Jan 2009 14:23:14 -0000	1.203
@@ -6,13 +6,15 @@
 Summary: PIM (Personal Information Manager) applications
 Epoch:   6
 Version: 4.2.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPLv2
 Group:   Applications/Productivity
-URL:	 http://www.kde.org/
+URL:	   http://www.kde.org/
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
 Patch0:  kdepim-4.1.80-libqgpgme-link-fix.patch
+# upstream patches
+Patch100: kdepim-4.2.0-kpilot.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Provides: kdepim4 = %{version}-%{release}
@@ -91,6 +93,7 @@
 %patch0 -p1 -b .libqgpgme-link-fix
 
 # upstream patches
+%patch100 -p0 -b .kpilot
 
 %build
 mkdir -p %{_target_platform}
@@ -180,6 +183,9 @@
 
 
 %changelog
+* Tue Jan 27 2009 Than Ngo <than at redhat.com> - 4.2.0-2
+- upstream patch, fix data corruption problems in KPilot
+
 * Thu Jan 22 2009 Than Ngo <than at redhat.com> - 4.2.0-1
 - 4.2.0
 



From rrakus at fedoraproject.org  Tue Jan 27 14:48:24 2009
From: rrakus at fedoraproject.org (Roman Rakus)
Date: Tue, 27 Jan 2009 14:48:24 +0000 (UTC)
Subject: rpms/gperf/devel gperf.spec,1.28,1.29
Message-ID: <20090127144824.7A5DC7010B@cvs1.fedora.phx.redhat.com>

Author: rrakus

Update of /cvs/extras/rpms/gperf/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24457

Modified Files:
	gperf.spec 
Log Message:
Don't use makeinstall, Remove ps files from doc. Resolves: #225854


Index: gperf.spec
===================================================================
RCS file: /cvs/extras/rpms/gperf/devel/gperf.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- gperf.spec	19 Jan 2009 11:44:38 -0000	1.28
+++ gperf.spec	27 Jan 2009 14:47:54 -0000	1.29
@@ -1,7 +1,7 @@
 Summary: A perfect hash function generator
 Name: gperf
 Version: 3.0.3
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPLv2+
 Source: ftp://ftp.gnu.org/pub/gnu/gperf/gperf-%{version}.tar.gz
 Group: Development/Tools
@@ -27,7 +27,8 @@
 rm -rf $RPM_BUILD_ROOT
 #mkdir -p $RPM_BUILD_ROOT/usr/share/{man,info}
 
-%makeinstall
+make DESTDIR=$RPM_BUILD_ROOT install INSTALL='install -p'
+
 # remove the stuff from the buildroot
 rm -rf $RPM_BUILD_ROOT{%{_mandir}/{dvi,html},%{_datadir}/doc}
 
@@ -46,12 +47,17 @@
 
 %files
 %defattr(-,root,root)
-%doc README NEWS doc/*.{html,ps,pdf} COPYING
+%doc README NEWS doc/*.{html,pdf} COPYING
 %{_bindir}/%{name}
 %{_mandir}/man1/gperf.1*
 %{_infodir}/gperf.info*
 
 %changelog
+* Tue Jan 27 2009 Roman Rakus <rrakus at redhat.com> - 3.0.3-6
+- Don't use makeinstall
+- Remove ps files from doc
+  Resolves: #225854
+
 * Mon Jan 19 2009 Roman Rakus <rrakus at redhat.com> - 3.0.3-5
 - Specfile fixes
   Resolves: #225854



From twaugh at fedoraproject.org  Tue Jan 27 14:57:31 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Tue, 27 Jan 2009 14:57:31 +0000 (UTC)
Subject: rpms/cups/devel cups-local-protocols.patch, NONE, 1.1 cups.spec,
	1.454, 1.455
Message-ID: <20090127145731.2C4227010B@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/cups/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26075

Modified Files:
	cups.spec 
Added Files:
	cups-local-protocols.patch 
Log Message:
* Tue Jan 27 2009 Tim Waugh <twaugh at redhat.com> 1:1.4-0.b2.3
- Fixed default BrowseLocalProtocols (bug #481505).


cups-local-protocols.patch:

--- NEW FILE cups-local-protocols.patch ---
diff -up cups-1.4b2/CHANGES.txt.local-protocols cups-1.4b2/CHANGES.txt
diff -up cups-1.4b2/conf/cupsd.conf.in.local-protocols cups-1.4b2/conf/cupsd.conf.in
--- cups-1.4b2/conf/cupsd.conf.in.local-protocols	2009-01-09 16:47:15.000000000 +0000
+++ cups-1.4b2/conf/cupsd.conf.in	2009-01-27 14:46:59.000000000 +0000
@@ -23,7 +23,7 @@ Listen localhost:@DEFAULT_IPP_PORT@
 Browsing On
 BrowseOrder allow,deny
 BrowseAllow all
-BrowseLocalProtocols @CUPS_DEFAULT_BROWSE_LOCAL_PROTOCOLS@
+BrowseLocalProtocols @CUPS_BROWSE_LOCAL_PROTOCOLS@
 
 # Default authentication type, when authentication is required...
 DefaultAuthType Basic


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/devel/cups.spec,v
retrieving revision 1.454
retrieving revision 1.455
diff -u -r1.454 -r1.455
--- cups.spec	16 Dec 2008 16:59:28 -0000	1.454
+++ cups.spec	27 Jan 2009 14:57:00 -0000	1.455
@@ -7,7 +7,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.4
-Release: 0.%{pre}.2%{?dist}
+Release: 0.%{pre}.3%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 Source: ftp://ftp.easysw.com/pub/cups/test//cups-%{version}%{?pre}-source.tar.bz2
@@ -38,6 +38,7 @@
 Patch12: cups-lpr-help.patch
 Patch13: cups-peercred.patch
 Patch14: cups-pid.patch
+Patch15: cups-local-protocols.patch
 Patch16: cups-eggcups.patch
 Patch17: cups-getpass.patch
 Patch18: cups-driverd-timeout.patch
@@ -179,6 +180,7 @@
 %patch12 -p1 -b .lpr-help
 %patch13 -p1 -b .peercred
 %patch14 -p1 -b .pid
+%patch15 -p1 -b .local-protocols
 %patch16 -p1 -b .eggcups
 %patch17 -p1 -b .getpass
 %patch18 -p1 -b .driverd-timeout
@@ -452,6 +454,9 @@
 %{_libdir}/php/modules/*.so
 
 %changelog
+* Tue Jan 27 2009 Tim Waugh <twaugh at redhat.com> 1:1.4-0.b2.3
+- Fixed default BrowseLocalProtocols (bug #481505).
+
 * Tue Dec 16 2008 Tim Waugh <twaugh at redhat.com> 1:1.4-0.b2.2
 - 1.4b2.
 - No longer need CVE-2008-5183 patch.



From than at fedoraproject.org  Tue Jan 27 15:04:54 2009
From: than at fedoraproject.org (Than Ngo)
Date: Tue, 27 Jan 2009 15:04:54 +0000 (UTC)
Subject: rpms/kdepim/devel kdepim-4.2.0-kpilot.patch, 1.1, 1.2 kdepim.spec, 
	1.205, 1.206
Message-ID: <20090127150454.0A2387010B@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdepim/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27351

Modified Files:
	kdepim-4.2.0-kpilot.patch kdepim.spec 
Log Message:
upistream patch, fix data corruption problems in KPilot


kdepim-4.2.0-kpilot.patch:

Index: kdepim-4.2.0-kpilot.patch
===================================================================
RCS file: /cvs/extras/rpms/kdepim/devel/kdepim-4.2.0-kpilot.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kdepim-4.2.0-kpilot.patch	27 Jan 2009 14:12:27 -0000	1.1
+++ kdepim-4.2.0-kpilot.patch	27 Jan 2009 15:04:23 -0000	1.2
@@ -1,20 +1,7 @@
-Index: kpilot/conduits/todo/todoconduit.cc
-===================================================================
---- kpilot/conduits/todo/todoconduit.cc	(Revision 915906)
-+++ kpilot/conduits/todo/todoconduit.cc	(Revision 915907)
-@@ -68,6 +68,7 @@
- 	
- 	TodoSettings::self()->readConfig();
- 	d->fCollectionId = TodoSettings::akonadiCollection();
-+	d->fPrevCollectionId = TodoSettings::prevAkonadiCollection();
- }
- 
- bool TodoConduit::initDataProxies()
-Index: kpilot/conduits/akonadibase/akonadirecord.cc
-===================================================================
---- kpilot/conduits/akonadibase/akonadirecord.cc	(Revision 915830)
-+++ kpilot/conduits/akonadibase/akonadirecord.cc	(Revision 915831)
-@@ -47,12 +47,14 @@
+diff -up kdepim-4.2.0/kpilot/conduits/akonadibase/akonadirecord.cc.orig kdepim-4.2.0/kpilot/conduits/akonadibase/akonadirecord.cc
+--- kdepim-4.2.0/kpilot/conduits/akonadibase/akonadirecord.cc.orig	2009-01-27 15:47:05.000000000 +0100
++++ kdepim-4.2.0/kpilot/conduits/akonadibase/akonadirecord.cc	2009-01-27 15:58:11.000000000 +0100
+@@ -47,6 +47,7 @@ AkonadiRecord::AkonadiRecord( const Akon
  	d->fItem = item;
  	d->fLastSyncDateTime = lastSync.toUTC(); // Item times are saved in UTC time.
  	d->fDeleted = false;
@@ -22,35 +9,7 @@
  }
  
  AkonadiRecord::AkonadiRecord( const QString& id ) : d( new AkonadiRecordPrivate )
- {
- 	d->fTempId = id;
- 	d->fDeleted = true;
-+	d->fDummy = false;
- }
- 
- AkonadiRecord::~AkonadiRecord()
-Index: kpilot/conduits/akonadibase/akonadirecord.cc
-===================================================================
---- kpilot/conduits/akonadibase/akonadirecord.cc	(Revision 915836)
-+++ kpilot/conduits/akonadibase/akonadirecord.cc	(Revision 915837)
-@@ -50,11 +50,15 @@
- 	d->fDummy = false;
- }
- 
-+/**
-+ * This ctor is _only_ used for dummy records which are temporarily used to delete
-+ * data.
-+ */
- AkonadiRecord::AkonadiRecord( const QString& id ) : d( new AkonadiRecordPrivate )
- {
- 	d->fTempId = id;
- 	d->fDeleted = true;
--	d->fDummy = false;
-+	d->fDummy = true;
- }
- 
- AkonadiRecord::~AkonadiRecord()
-@@ -123,6 +127,11 @@
+@@ -122,6 +123,11 @@ void AkonadiRecord::setItem( const Akona
  	d->fItem = item;
  	// Make sure that we return the right id after updating the itemobject.
  	setId( QString::number( item.id() ) );
@@ -62,3 +21,32 @@
  }
  
  void AkonadiRecord::synced()
+@@ -130,9 +136,17 @@ void AkonadiRecord::synced()
+ 	// Nothing to do here.
+ }
+ 
++void AkonadiRecord::setDummy(bool dummy)
++{
++	FUNCTIONSETUPL(5);
++	DEBUGKPILOT << "dummy: " << dummy;
++	d->fDummy = dummy;
++}
++
+ bool AkonadiRecord::isValid() const
+ {
+ 	FUNCTIONSETUPL(5);
+ 	bool valid = ! d->fDummy;
++	DEBUGKPILOT << "valid: " << valid;
+ 	return valid;
+ }
+diff -up kdepim-4.2.0/kpilot/conduits/todo/todoconduit.cc.orig kdepim-4.2.0/kpilot/conduits/todo/todoconduit.cc
+--- kdepim-4.2.0/kpilot/conduits/todo/todoconduit.cc.orig	2009-01-27 16:02:28.000000000 +0100
++++ kdepim-4.2.0/kpilot/conduits/todo/todoconduit.cc	2009-01-27 16:02:43.000000000 +0100
+@@ -68,6 +68,7 @@ void TodoConduit::loadSettings()
+ 	
+ 	TodoSettings::self()->readConfig();
+ 	d->fCollectionId = TodoSettings::akonadiCollection();
++	d->fPrevCollectionId = TodoSettings::prevAkonadiCollection();
+ }
+ 
+ bool TodoConduit::initDataProxies()


Index: kdepim.spec
===================================================================
RCS file: /cvs/extras/rpms/kdepim/devel/kdepim.spec,v
retrieving revision 1.205
retrieving revision 1.206
diff -u -r1.205 -r1.206
--- kdepim.spec	27 Jan 2009 14:12:27 -0000	1.205
+++ kdepim.spec	27 Jan 2009 15:04:23 -0000	1.206
@@ -93,7 +93,7 @@
 %patch0 -p1 -b .libqgpgme-link-fix
 
 # upstream patches
-%patch100 -p0 -b .kpilot
+%patch100 -p1 -b .kpilot
 
 %build
 mkdir -p %{_target_platform}



From mclasen at fedoraproject.org  Tue Jan 27 15:08:29 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 27 Jan 2009 15:08:29 +0000 (UTC)
Subject: rpms/gtk2/devel togglebutton-crash.patch, NONE, 1.1 gtk2.spec, 1.350,
	1.351
Message-ID: <20090127150829.45C4A7010B@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gtk2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27992

Modified Files:
	gtk2.spec 
Added Files:
	togglebutton-crash.patch 
Log Message:
Fix crashes caused by togglebuttons


togglebutton-crash.patch:

--- NEW FILE togglebutton-crash.patch ---
Index: gtk/gtktogglebutton.c
===================================================================
--- gtk/gtktogglebutton.c	(revision 22218)
+++ gtk/gtktogglebutton.c	(working copy)
@@ -502,7 +502,8 @@
 
   g_object_notify (G_OBJECT (toggle_button), "active");
 
-  GTK_BUTTON_CLASS (gtk_toggle_button_parent_class)->clicked (button);
+  if (GTK_BUTTON_CLASS (gtk_toggle_button_parent_class)->clicked)
+    GTK_BUTTON_CLASS (gtk_toggle_button_parent_class)->clicked (button);
 }
 
 static void


Index: gtk2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtk2/devel/gtk2.spec,v
retrieving revision 1.350
retrieving revision 1.351
diff -u -r1.350 -r1.351
--- gtk2.spec	27 Jan 2009 06:28:06 -0000	1.350
+++ gtk2.spec	27 Jan 2009 15:07:58 -0000	1.351
@@ -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.15/gtk+-%{version}.tar.bz2
@@ -30,6 +30,8 @@
 Patch2: workaround.patch
 # http://bugzilla.redhat.com/show_bug.cgi?id=478400
 Patch3: default_printer.patch
+# fixed upstream
+Patch4: togglebutton-crash.patch
 
 BuildRequires: atk-devel >= %{atk_version}
 BuildRequires: pango-devel >= %{pango_version}
@@ -117,6 +119,7 @@
 %patch0 -p1 -b .lib64
 %patch2 -p1 -b .workaround
 %patch3 -p0 -b .default-printer
+%patch4 -p0 -b .togglebutton-crash
 
 %build
 libtoolize --force --copy
@@ -294,6 +297,9 @@
 %{_datadir}/gtk-2.0
 
 %changelog
+* Tue Jan 27 2009 Matthias Clasen <mclasen at redhat.com> - 2.15.2-2
+- Fix togglebuttons causing crashes
+
 * Tue Jan 27 2009 Matthias Clasen <mclasen at redhat.com> - 2.15.2-1
 - Update to 2.15.2
 



From than at fedoraproject.org  Tue Jan 27 15:09:26 2009
From: than at fedoraproject.org (Than Ngo)
Date: Tue, 27 Jan 2009 15:09:26 +0000 (UTC)
Subject: rpms/kdepim/F-10 kdepim-4.2.0-kpilot.patch, 1.1, 1.2 kdepim.spec,
	1.203, 1.204
Message-ID: <20090127150926.36DAD7010B@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdepim/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28122

Modified Files:
	kdepim-4.2.0-kpilot.patch kdepim.spec 
Log Message:
upstream patch, fix data corruption problems in KPilot


kdepim-4.2.0-kpilot.patch:

Index: kdepim-4.2.0-kpilot.patch
===================================================================
RCS file: /cvs/extras/rpms/kdepim/F-10/kdepim-4.2.0-kpilot.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kdepim-4.2.0-kpilot.patch	27 Jan 2009 14:23:14 -0000	1.1
+++ kdepim-4.2.0-kpilot.patch	27 Jan 2009 15:08:55 -0000	1.2
@@ -1,20 +1,7 @@
-Index: kpilot/conduits/todo/todoconduit.cc
-===================================================================
---- kpilot/conduits/todo/todoconduit.cc	(Revision 915906)
-+++ kpilot/conduits/todo/todoconduit.cc	(Revision 915907)
-@@ -68,6 +68,7 @@
- 	
- 	TodoSettings::self()->readConfig();
- 	d->fCollectionId = TodoSettings::akonadiCollection();
-+	d->fPrevCollectionId = TodoSettings::prevAkonadiCollection();
- }
- 
- bool TodoConduit::initDataProxies()
-Index: kpilot/conduits/akonadibase/akonadirecord.cc
-===================================================================
---- kpilot/conduits/akonadibase/akonadirecord.cc	(Revision 915830)
-+++ kpilot/conduits/akonadibase/akonadirecord.cc	(Revision 915831)
-@@ -47,12 +47,14 @@
+diff -up kdepim-4.2.0/kpilot/conduits/akonadibase/akonadirecord.cc.orig kdepim-4.2.0/kpilot/conduits/akonadibase/akonadirecord.cc
+--- kdepim-4.2.0/kpilot/conduits/akonadibase/akonadirecord.cc.orig	2009-01-27 15:47:05.000000000 +0100
++++ kdepim-4.2.0/kpilot/conduits/akonadibase/akonadirecord.cc	2009-01-27 15:58:11.000000000 +0100
+@@ -47,6 +47,7 @@ AkonadiRecord::AkonadiRecord( const Akon
  	d->fItem = item;
  	d->fLastSyncDateTime = lastSync.toUTC(); // Item times are saved in UTC time.
  	d->fDeleted = false;
@@ -22,35 +9,7 @@
  }
  
  AkonadiRecord::AkonadiRecord( const QString& id ) : d( new AkonadiRecordPrivate )
- {
- 	d->fTempId = id;
- 	d->fDeleted = true;
-+	d->fDummy = false;
- }
- 
- AkonadiRecord::~AkonadiRecord()
-Index: kpilot/conduits/akonadibase/akonadirecord.cc
-===================================================================
---- kpilot/conduits/akonadibase/akonadirecord.cc	(Revision 915836)
-+++ kpilot/conduits/akonadibase/akonadirecord.cc	(Revision 915837)
-@@ -50,11 +50,15 @@
- 	d->fDummy = false;
- }
- 
-+/**
-+ * This ctor is _only_ used for dummy records which are temporarily used to delete
-+ * data.
-+ */
- AkonadiRecord::AkonadiRecord( const QString& id ) : d( new AkonadiRecordPrivate )
- {
- 	d->fTempId = id;
- 	d->fDeleted = true;
--	d->fDummy = false;
-+	d->fDummy = true;
- }
- 
- AkonadiRecord::~AkonadiRecord()
-@@ -123,6 +127,11 @@
+@@ -122,6 +123,11 @@ void AkonadiRecord::setItem( const Akona
  	d->fItem = item;
  	// Make sure that we return the right id after updating the itemobject.
  	setId( QString::number( item.id() ) );
@@ -62,3 +21,32 @@
  }
  
  void AkonadiRecord::synced()
+@@ -130,9 +136,17 @@ void AkonadiRecord::synced()
+ 	// Nothing to do here.
+ }
+ 
++void AkonadiRecord::setDummy(bool dummy)
++{
++	FUNCTIONSETUPL(5);
++	DEBUGKPILOT << "dummy: " << dummy;
++	d->fDummy = dummy;
++}
++
+ bool AkonadiRecord::isValid() const
+ {
+ 	FUNCTIONSETUPL(5);
+ 	bool valid = ! d->fDummy;
++	DEBUGKPILOT << "valid: " << valid;
+ 	return valid;
+ }
+diff -up kdepim-4.2.0/kpilot/conduits/todo/todoconduit.cc.orig kdepim-4.2.0/kpilot/conduits/todo/todoconduit.cc
+--- kdepim-4.2.0/kpilot/conduits/todo/todoconduit.cc.orig	2009-01-27 16:02:28.000000000 +0100
++++ kdepim-4.2.0/kpilot/conduits/todo/todoconduit.cc	2009-01-27 16:02:43.000000000 +0100
+@@ -68,6 +68,7 @@ void TodoConduit::loadSettings()
+ 	
+ 	TodoSettings::self()->readConfig();
+ 	d->fCollectionId = TodoSettings::akonadiCollection();
++	d->fPrevCollectionId = TodoSettings::prevAkonadiCollection();
+ }
+ 
+ bool TodoConduit::initDataProxies()


Index: kdepim.spec
===================================================================
RCS file: /cvs/extras/rpms/kdepim/F-10/kdepim.spec,v
retrieving revision 1.203
retrieving revision 1.204
diff -u -r1.203 -r1.204
--- kdepim.spec	27 Jan 2009 14:23:14 -0000	1.203
+++ kdepim.spec	27 Jan 2009 15:08:55 -0000	1.204
@@ -93,7 +93,7 @@
 %patch0 -p1 -b .libqgpgme-link-fix
 
 # upstream patches
-%patch100 -p0 -b .kpilot
+%patch100 -p1 -b .kpilot
 
 %build
 mkdir -p %{_target_platform}



From kasal at fedoraproject.org  Tue Jan 27 15:17:52 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Tue, 27 Jan 2009 15:17:52 +0000 (UTC)
Subject: rpms/grep/devel grep.spec, 1.74, 1.75 grep-2.5.3-mem-exhausted.patch,
	1.1, NONE
Message-ID: <20090127151752.49FE07010B@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/extras/rpms/grep/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30226

Modified Files:
	grep.spec 
Removed Files:
	grep-2.5.3-mem-exhausted.patch 
Log Message:
drop grep-mem-exhausted.patch


Index: grep.spec
===================================================================
RCS file: /cvs/extras/rpms/grep/devel/grep.spec,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- grep.spec	8 Jan 2009 09:16:42 -0000	1.74
+++ grep.spec	27 Jan 2009 15:17:21 -0000	1.75
@@ -3,12 +3,11 @@
 Summary: Pattern matching utilities
 Name: grep
 Version: 2.5.3
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv3+
 Group: Applications/Text
 Source: ftp://ftp.gnu.org/pub/gnu/grep/grep-%{version}.tar.bz2
 Patch0: grep-2.5.3-fedora-tests.patch
-Patch1: grep-2.5.3-mem-exhausted.patch
 Patch2: grep-2.5.3-pcrewrap.patch
 Patch3: grep-2.5.3-case.patch
 Patch4: grep-2.5.3-egf-speedup.patch
@@ -32,7 +31,6 @@
 %prep
 %setup -q
 %patch0 -p1 -b .fedora-tests
-%patch1 -p1 -b .mem-exhausted
 %patch2 -p1 -b .pcrewrap
 %patch3 -p1 -b .case
 %patch4 -p1 -b .egf-speedup
@@ -76,6 +74,9 @@
 %{_mandir}/*/*
 
 %changelog
+* Tue Jan 27 2009 Stepan Kasal <skasal at redhat.com> 2.5.3-3
+- remove grep-mem-exhausted.patch (#481765, #198165)
+
 * Thu Jan  8 2009 Stepan Kasal <skasal at redhat.com> 2.5.3-2
 - fix bug #460641 (a.k.a. 479152)
 


--- grep-2.5.3-mem-exhausted.patch DELETED ---



From mgrepl at fedoraproject.org  Tue Jan 27 15:31:46 2009
From: mgrepl at fedoraproject.org (Miroslav Grepl)
Date: Tue, 27 Jan 2009 15:31:46 +0000 (UTC)
Subject: rpms/selinux-policy/F-10 modules-minimum.conf, 1.6,
	1.7 modules-targeted.conf, 1.110, 1.111 policy-20080710.patch,
	1.127, 1.128 selinux-policy.spec, 1.768, 1.769
Message-ID: <20090127153146.B38B17010B@cvs1.fedora.phx.redhat.com>

Author: mgrepl

Update of /cvs/extras/rpms/selinux-policy/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32065

Modified Files:
	modules-minimum.conf modules-targeted.conf 
	policy-20080710.patch selinux-policy.spec 
Log Message:
- Add psad policy
- Allow certwatch read httpd config files
- Allow ntpd, spamd, mailman (qrunner) to list inotify
- Fix wine labeling




Index: modules-minimum.conf
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-10/modules-minimum.conf,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- modules-minimum.conf	5 Nov 2008 18:26:36 -0000	1.6
+++ modules-minimum.conf	27 Jan 2009 15:31:15 -0000	1.7
@@ -505,6 +505,14 @@
 # 
 polkit = module
 
+# Layer: services
+# Module: psad
+# 
+# Analyze iptables log for hostile traffic
+#  
+psad = module
+
+
 # Layer: system
 # Module: hostname
 #


Index: modules-targeted.conf
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-10/modules-targeted.conf,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -r1.110 -r1.111
--- modules-targeted.conf	17 Nov 2008 21:12:45 -0000	1.110
+++ modules-targeted.conf	27 Jan 2009 15:31:15 -0000	1.111
@@ -505,6 +505,13 @@
 # 
 polkit = module
 
+# Layer: services
+# Module: psad
+# 
+# Analyze iptables log for hostile traffic
+#  
+psad = module
+
 # Layer: system
 # Module: hostname
 #

policy-20080710.patch:

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.127 -r 1.128 policy-20080710.patch
Index: policy-20080710.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-10/policy-20080710.patch,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -r1.127 -r1.128
--- policy-20080710.patch	20 Jan 2009 17:47:04 -0000	1.127
+++ policy-20080710.patch	27 Jan 2009 15:31:15 -0000	1.128
@@ -1,6 +1,6 @@
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/default_contexts serefpolicy-3.5.13/config/appconfig-mcs/default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/default_contexts	2008-10-17 14:49:10.000000000 +0200
-+++ serefpolicy-3.5.13/config/appconfig-mcs/default_contexts	2009-01-20 17:50:35.000000000 +0100
++++ serefpolicy-3.5.13/config/appconfig-mcs/default_contexts	2009-01-27 10:32:26.000000000 +0100
 @@ -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
@@ -24,13 +24,13 @@
 +system_r:xdm_t:s0		user_r:user_t:s0
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/failsafe_context serefpolicy-3.5.13/config/appconfig-mcs/failsafe_context
 --- nsaserefpolicy/config/appconfig-mcs/failsafe_context	2008-10-17 14:49:10.000000000 +0200
-+++ serefpolicy-3.5.13/config/appconfig-mcs/failsafe_context	2009-01-20 17:50:35.000000000 +0100
++++ serefpolicy-3.5.13/config/appconfig-mcs/failsafe_context	2009-01-27 10:32:26.000000000 +0100
 @@ -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.5.13/config/appconfig-mcs/guest_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/guest_u_default_contexts	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.5.13/config/appconfig-mcs/guest_u_default_contexts	2009-01-20 17:50:35.000000000 +0100
++++ serefpolicy-3.5.13/config/appconfig-mcs/guest_u_default_contexts	2009-01-27 10:32:26.000000000 +0100
 @@ -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
@@ -40,7 +40,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.5.13/config/appconfig-mcs/root_default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/root_default_contexts	2008-10-17 14:49:10.000000000 +0200
-+++ serefpolicy-3.5.13/config/appconfig-mcs/root_default_contexts	2009-01-20 17:50:35.000000000 +0100
++++ serefpolicy-3.5.13/config/appconfig-mcs/root_default_contexts	2009-01-27 10:32:26.000000000 +0100
 @@ -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
@@ -57,7 +57,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/seusers serefpolicy-3.5.13/config/appconfig-mcs/seusers
 --- nsaserefpolicy/config/appconfig-mcs/seusers	2008-10-17 14:49:10.000000000 +0200
-+++ serefpolicy-3.5.13/config/appconfig-mcs/seusers	2009-01-20 17:50:35.000000000 +0100
++++ serefpolicy-3.5.13/config/appconfig-mcs/seusers	2009-01-27 10:32:26.000000000 +0100
 @@ -1,3 +1,3 @@
  system_u:system_u:s0-mcs_systemhigh
 -root:root:s0-mcs_systemhigh
@@ -66,7 +66,7 @@
 +__default__:unconfined_u:s0-mcs_systemhigh
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/staff_u_default_contexts serefpolicy-3.5.13/config/appconfig-mcs/staff_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/staff_u_default_contexts	2008-10-17 14:49:10.000000000 +0200
-+++ serefpolicy-3.5.13/config/appconfig-mcs/staff_u_default_contexts	2009-01-20 17:50:35.000000000 +0100
++++ serefpolicy-3.5.13/config/appconfig-mcs/staff_u_default_contexts	2009-01-27 10:32:26.000000000 +0100
 @@ -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
@@ -83,7 +83,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/unconfined_u_default_contexts serefpolicy-3.5.13/config/appconfig-mcs/unconfined_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/unconfined_u_default_contexts	2008-10-17 14:49:10.000000000 +0200
-+++ serefpolicy-3.5.13/config/appconfig-mcs/unconfined_u_default_contexts	2009-01-20 17:50:35.000000000 +0100
++++ serefpolicy-3.5.13/config/appconfig-mcs/unconfined_u_default_contexts	2009-01-27 10:32:26.000000000 +0100
 @@ -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
@@ -93,13 +93,13 @@
  system_r:xdm_t:s0		unconfined_r:unconfined_t:s0
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/userhelper_context serefpolicy-3.5.13/config/appconfig-mcs/userhelper_context
 --- nsaserefpolicy/config/appconfig-mcs/userhelper_context	2008-10-17 14:49:10.000000000 +0200
-+++ serefpolicy-3.5.13/config/appconfig-mcs/userhelper_context	2009-01-20 17:50:35.000000000 +0100
++++ serefpolicy-3.5.13/config/appconfig-mcs/userhelper_context	2009-01-27 10:32:26.000000000 +0100
 @@ -1 +1 @@
 -system_u:sysadm_r:sysadm_t:s0
 +system_u:system_r:unconfined_t:s0	
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/user_u_default_contexts serefpolicy-3.5.13/config/appconfig-mcs/user_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/user_u_default_contexts	2008-10-17 14:49:10.000000000 +0200
-+++ serefpolicy-3.5.13/config/appconfig-mcs/user_u_default_contexts	2009-01-20 17:50:35.000000000 +0100
++++ serefpolicy-3.5.13/config/appconfig-mcs/user_u_default_contexts	2009-01-27 10:32:26.000000000 +0100
 @@ -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
@@ -114,7 +114,7 @@
 +user_r:user_t:s0		user_r:user_t:s0
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/xguest_u_default_contexts serefpolicy-3.5.13/config/appconfig-mcs/xguest_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/xguest_u_default_contexts	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.5.13/config/appconfig-mcs/xguest_u_default_contexts	2009-01-20 17:50:35.000000000 +0100
++++ serefpolicy-3.5.13/config/appconfig-mcs/xguest_u_default_contexts	2009-01-27 10:32:26.000000000 +0100
 @@ -0,0 +1,7 @@
 +system_r:local_login_t	xguest_r:xguest_t:s0
 +system_r:remote_login_t	xguest_r:xguest_t:s0
@@ -125,7 +125,7 @@
 +xguest_r:xguest_t:s0	xguest_r:xguest_t:s0
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/default_contexts serefpolicy-3.5.13/config/appconfig-mls/default_contexts
 --- nsaserefpolicy/config/appconfig-mls/default_contexts	2008-10-17 14:49:10.000000000 +0200
-+++ serefpolicy-3.5.13/config/appconfig-mls/default_contexts	2009-01-20 17:50:35.000000000 +0100
++++ serefpolicy-3.5.13/config/appconfig-mls/default_contexts	2009-01-27 10:32:26.000000000 +0100
 @@ -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
@@ -149,7 +149,7 @@
 +system_r:xdm_t:s0		user_r:user_t:s0
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/guest_u_default_contexts serefpolicy-3.5.13/config/appconfig-mls/guest_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mls/guest_u_default_contexts	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.5.13/config/appconfig-mls/guest_u_default_contexts	2009-01-20 17:50:35.000000000 +0100
++++ serefpolicy-3.5.13/config/appconfig-mls/guest_u_default_contexts	2009-01-27 10:32:26.000000000 +0100
 @@ -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
@@ -157,7 +157,7 @@
 +system_r:crond_t:s0		guest_r:guest_t:s0
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/root_default_contexts serefpolicy-3.5.13/config/appconfig-mls/root_default_contexts
 --- nsaserefpolicy/config/appconfig-mls/root_default_contexts	2008-10-17 14:49:10.000000000 +0200
-+++ serefpolicy-3.5.13/config/appconfig-mls/root_default_contexts	2009-01-20 17:50:35.000000000 +0100
++++ serefpolicy-3.5.13/config/appconfig-mls/root_default_contexts	2009-01-27 10:32:26.000000000 +0100
 @@ -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
@@ -178,7 +178,7 @@
 +#system_r:sshd_t:s0		sysadm_r:sysadm_t:s0 staff_r:staff_t:s0
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/staff_u_default_contexts serefpolicy-3.5.13/config/appconfig-mls/staff_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mls/staff_u_default_contexts	2008-10-17 14:49:10.000000000 +0200
-+++ serefpolicy-3.5.13/config/appconfig-mls/staff_u_default_contexts	2009-01-20 17:50:35.000000000 +0100
++++ serefpolicy-3.5.13/config/appconfig-mls/staff_u_default_contexts	2009-01-27 10:32:26.000000000 +0100
 @@ -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
@@ -190,7 +190,7 @@
  staff_r:staff_sudo_t:s0		staff_r:staff_t:s0
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/user_u_default_contexts serefpolicy-3.5.13/config/appconfig-mls/user_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mls/user_u_default_contexts	2008-10-17 14:49:10.000000000 +0200
-+++ serefpolicy-3.5.13/config/appconfig-mls/user_u_default_contexts	2009-01-20 17:50:35.000000000 +0100
++++ serefpolicy-3.5.13/config/appconfig-mls/user_u_default_contexts	2009-01-27 10:32:26.000000000 +0100
 @@ -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
@@ -202,7 +202,7 @@
  user_r:user_sudo_t:s0		user_r:user_t:s0
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/xguest_u_default_contexts serefpolicy-3.5.13/config/appconfig-mls/xguest_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mls/xguest_u_default_contexts	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.5.13/config/appconfig-mls/xguest_u_default_contexts	2009-01-20 17:50:35.000000000 +0100
++++ serefpolicy-3.5.13/config/appconfig-mls/xguest_u_default_contexts	2009-01-27 10:32:26.000000000 +0100
 @@ -0,0 +1,7 @@
 +system_r:local_login_t	xguest_r:xguest_t:s0
 +system_r:remote_login_t	xguest_r:xguest_t:s0
@@ -213,7 +213,7 @@
 +xguest_r:xguest_t:s0	xguest_r:xguest_t:s0
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-standard/guest_u_default_contexts serefpolicy-3.5.13/config/appconfig-standard/guest_u_default_contexts
 --- nsaserefpolicy/config/appconfig-standard/guest_u_default_contexts	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.5.13/config/appconfig-standard/guest_u_default_contexts	2009-01-20 17:50:35.000000000 +0100
++++ serefpolicy-3.5.13/config/appconfig-standard/guest_u_default_contexts	2009-01-27 10:32:26.000000000 +0100
 @@ -0,0 +1,4 @@
 +system_r:local_login_t	guest_r:guest_t
 +system_r:remote_login_t	guest_r:guest_t
@@ -221,7 +221,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.5.13/config/appconfig-standard/root_default_contexts
 --- nsaserefpolicy/config/appconfig-standard/root_default_contexts	2008-10-17 14:49:10.000000000 +0200
-+++ serefpolicy-3.5.13/config/appconfig-standard/root_default_contexts	2009-01-20 17:50:35.000000000 +0100
++++ serefpolicy-3.5.13/config/appconfig-standard/root_default_contexts	2009-01-27 10:32:26.000000000 +0100
 @@ -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
@@ -237,7 +237,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/staff_u_default_contexts serefpolicy-3.5.13/config/appconfig-standard/staff_u_default_contexts
 --- nsaserefpolicy/config/appconfig-standard/staff_u_default_contexts	2008-10-17 14:49:10.000000000 +0200
-+++ serefpolicy-3.5.13/config/appconfig-standard/staff_u_default_contexts	2009-01-20 17:50:35.000000000 +0100
++++ serefpolicy-3.5.13/config/appconfig-standard/staff_u_default_contexts	2009-01-27 10:32:26.000000000 +0100
 @@ -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
@@ -249,7 +249,7 @@
  staff_r:staff_sudo_t		staff_r:staff_t
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-standard/user_u_default_contexts serefpolicy-3.5.13/config/appconfig-standard/user_u_default_contexts
 --- nsaserefpolicy/config/appconfig-standard/user_u_default_contexts	2008-10-17 14:49:10.000000000 +0200
-+++ serefpolicy-3.5.13/config/appconfig-standard/user_u_default_contexts	2009-01-20 17:50:35.000000000 +0100
++++ serefpolicy-3.5.13/config/appconfig-standard/user_u_default_contexts	2009-01-27 10:32:26.000000000 +0100
 @@ -1,7 +1,7 @@
  system_r:local_login_t		user_r:user_t
  system_r:remote_login_t		user_r:user_t
@@ -261,7 +261,7 @@
  user_r:user_sudo_t		user_r:user_t
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-standard/xguest_u_default_contexts serefpolicy-3.5.13/config/appconfig-standard/xguest_u_default_contexts
 --- nsaserefpolicy/config/appconfig-standard/xguest_u_default_contexts	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.5.13/config/appconfig-standard/xguest_u_default_contexts	2009-01-20 17:50:35.000000000 +0100
++++ serefpolicy-3.5.13/config/appconfig-standard/xguest_u_default_contexts	2009-01-27 10:32:26.000000000 +0100
 @@ -0,0 +1,5 @@
 +system_r:local_login_t	xguest_r:xguest_t
 +system_r:remote_login_t	xguest_r:xguest_t
@@ -270,7 +270,7 @@
 +system_r:xdm_t		xguest_r:xguest_t
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/Makefile serefpolicy-3.5.13/Makefile
 --- nsaserefpolicy/Makefile	2008-10-17 14:49:11.000000000 +0200
-+++ serefpolicy-3.5.13/Makefile	2009-01-20 17:50:35.000000000 +0100
++++ serefpolicy-3.5.13/Makefile	2009-01-27 10:32:26.000000000 +0100
 @@ -311,20 +311,22 @@
  
[...4200 lines suppressed...]
  
  ########################################
@@ -32186,7 +32764,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.te serefpolicy-3.5.13/policy/modules/system/selinuxutil.te
 --- nsaserefpolicy/policy/modules/system/selinuxutil.te	2008-10-17 14:49:13.000000000 +0200
-+++ serefpolicy-3.5.13/policy/modules/system/selinuxutil.te	2009-01-20 17:50:35.000000000 +0100
++++ serefpolicy-3.5.13/policy/modules/system/selinuxutil.te	2009-01-27 10:32:26.000000000 +0100
 @@ -23,6 +23,9 @@
  type selinux_config_t;
  files_type(selinux_config_t)
@@ -32543,7 +33121,7 @@
  ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/setrans.if serefpolicy-3.5.13/policy/modules/system/setrans.if
 --- nsaserefpolicy/policy/modules/system/setrans.if	2008-10-17 14:49:13.000000000 +0200
-+++ serefpolicy-3.5.13/policy/modules/system/setrans.if	2009-01-20 17:50:35.000000000 +0100
++++ serefpolicy-3.5.13/policy/modules/system/setrans.if	2009-01-27 10:32:26.000000000 +0100
 @@ -21,3 +21,23 @@
  	stream_connect_pattern($1,setrans_var_run_t,setrans_var_run_t,setrans_t)
  	files_list_pids($1)
@@ -32570,7 +33148,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/sysnetwork.fc serefpolicy-3.5.13/policy/modules/system/sysnetwork.fc
 --- nsaserefpolicy/policy/modules/system/sysnetwork.fc	2008-10-17 14:49:13.000000000 +0200
-+++ serefpolicy-3.5.13/policy/modules/system/sysnetwork.fc	2009-01-20 17:50:35.000000000 +0100
++++ serefpolicy-3.5.13/policy/modules/system/sysnetwork.fc	2009-01-27 10:32:26.000000000 +0100
 @@ -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)
@@ -32595,7 +33173,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.5.13/policy/modules/system/sysnetwork.if
 --- nsaserefpolicy/policy/modules/system/sysnetwork.if	2008-10-17 14:49:13.000000000 +0200
-+++ serefpolicy-3.5.13/policy/modules/system/sysnetwork.if	2009-01-20 17:50:35.000000000 +0100
++++ serefpolicy-3.5.13/policy/modules/system/sysnetwork.if	2009-01-27 10:32:26.000000000 +0100
 @@ -198,7 +198,25 @@
  		type dhcpc_state_t;
  	')
@@ -32707,7 +33285,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/sysnetwork.te serefpolicy-3.5.13/policy/modules/system/sysnetwork.te
 --- nsaserefpolicy/policy/modules/system/sysnetwork.te	2008-10-17 14:49:13.000000000 +0200
-+++ serefpolicy-3.5.13/policy/modules/system/sysnetwork.te	2009-01-20 17:50:35.000000000 +0100
++++ serefpolicy-3.5.13/policy/modules/system/sysnetwork.te	2009-01-27 10:32:26.000000000 +0100
 @@ -20,6 +20,9 @@
  init_daemon_domain(dhcpc_t,dhcpc_exec_t)
  role system_r types dhcpc_t;
@@ -32897,7 +33475,7 @@
  	xen_append_log(ifconfig_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/udev.fc serefpolicy-3.5.13/policy/modules/system/udev.fc
 --- nsaserefpolicy/policy/modules/system/udev.fc	2008-10-17 14:49:13.000000000 +0200
-+++ serefpolicy-3.5.13/policy/modules/system/udev.fc	2009-01-20 17:50:35.000000000 +0100
++++ serefpolicy-3.5.13/policy/modules/system/udev.fc	2009-01-27 10:32:26.000000000 +0100
 @@ -13,8 +13,11 @@
  /sbin/start_udev --	gen_context(system_u:object_r:udev_exec_t,s0)
  /sbin/udev	--	gen_context(system_u:object_r:udev_exec_t,s0)
@@ -32912,7 +33490,7 @@
 +/var/run/PackageKit/udev(/.*)?		gen_context(system_u:object_r:udev_var_run_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/udev.if serefpolicy-3.5.13/policy/modules/system/udev.if
 --- nsaserefpolicy/policy/modules/system/udev.if	2008-10-17 14:49:13.000000000 +0200
-+++ serefpolicy-3.5.13/policy/modules/system/udev.if	2009-01-20 17:50:35.000000000 +0100
++++ serefpolicy-3.5.13/policy/modules/system/udev.if	2009-01-27 10:32:26.000000000 +0100
 @@ -96,6 +96,24 @@
  
  ########################################
@@ -32968,7 +33546,7 @@
  ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/udev.te serefpolicy-3.5.13/policy/modules/system/udev.te
 --- nsaserefpolicy/policy/modules/system/udev.te	2008-10-17 14:49:13.000000000 +0200
-+++ serefpolicy-3.5.13/policy/modules/system/udev.te	2009-01-20 17:50:35.000000000 +0100
++++ serefpolicy-3.5.13/policy/modules/system/udev.te	2009-01-27 10:32:26.000000000 +0100
 @@ -83,6 +83,7 @@
  kernel_rw_unix_dgram_sockets(udev_t)
  kernel_dgram_send(udev_t)
@@ -33027,7 +33605,7 @@
  ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.fc serefpolicy-3.5.13/policy/modules/system/unconfined.fc
 --- nsaserefpolicy/policy/modules/system/unconfined.fc	2008-10-17 14:49:13.000000000 +0200
-+++ serefpolicy-3.5.13/policy/modules/system/unconfined.fc	2009-01-20 17:50:35.000000000 +0100
++++ serefpolicy-3.5.13/policy/modules/system/unconfined.fc	2009-01-27 10:32:26.000000000 +0100
 @@ -2,15 +2,31 @@
  # e.g.:
  # /usr/local/bin/appsrv		--	gen_context(system_u:object_r:unconfined_exec_t,s0)
@@ -33071,7 +33649,7 @@
 +#/usr/lib(64)?/gcl-[^/]+/unixport/saved_.* 	--	gen_context(system_u:object_r:execmem_exec_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.if serefpolicy-3.5.13/policy/modules/system/unconfined.if
 --- nsaserefpolicy/policy/modules/system/unconfined.if	2008-10-17 14:49:13.000000000 +0200
-+++ serefpolicy-3.5.13/policy/modules/system/unconfined.if	2009-01-20 17:50:35.000000000 +0100
++++ serefpolicy-3.5.13/policy/modules/system/unconfined.if	2009-01-27 10:32:26.000000000 +0100
 @@ -12,14 +12,13 @@
  #
  interface(`unconfined_domain_noaudit',`
@@ -33421,7 +33999,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.te serefpolicy-3.5.13/policy/modules/system/unconfined.te
 --- nsaserefpolicy/policy/modules/system/unconfined.te	2008-10-17 14:49:13.000000000 +0200
-+++ serefpolicy-3.5.13/policy/modules/system/unconfined.te	2009-01-20 17:50:35.000000000 +0100
++++ serefpolicy-3.5.13/policy/modules/system/unconfined.te	2009-01-27 10:32:26.000000000 +0100
 @@ -6,35 +6,77 @@
  # Declarations
  #
@@ -33786,7 +34364,7 @@
 +gen_user(unconfined_u, user, unconfined_r system_r, s0, s0 - mls_systemhigh, mcs_allcats)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.fc serefpolicy-3.5.13/policy/modules/system/userdomain.fc
 --- nsaserefpolicy/policy/modules/system/userdomain.fc	2008-10-17 14:49:13.000000000 +0200
-+++ serefpolicy-3.5.13/policy/modules/system/userdomain.fc	2009-01-20 17:50:35.000000000 +0100
++++ serefpolicy-3.5.13/policy/modules/system/userdomain.fc	2009-01-27 10:32:26.000000000 +0100
 @@ -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)
@@ -33799,7 +34377,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.5.13/policy/modules/system/userdomain.if
 --- nsaserefpolicy/policy/modules/system/userdomain.if	2008-10-17 14:49:13.000000000 +0200
-+++ serefpolicy-3.5.13/policy/modules/system/userdomain.if	2009-01-20 17:50:35.000000000 +0100
++++ serefpolicy-3.5.13/policy/modules/system/userdomain.if	2009-01-27 10:32:26.000000000 +0100
 @@ -28,10 +28,14 @@
  		class context contains;
  	')
@@ -36552,7 +37130,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-3.5.13/policy/modules/system/userdomain.te
 --- nsaserefpolicy/policy/modules/system/userdomain.te	2008-10-17 14:49:13.000000000 +0200
-+++ serefpolicy-3.5.13/policy/modules/system/userdomain.te	2009-01-20 17:50:35.000000000 +0100
++++ serefpolicy-3.5.13/policy/modules/system/userdomain.te	2009-01-27 10:32:26.000000000 +0100
 @@ -8,13 +8,6 @@
  
  ## <desc>
@@ -36672,7 +37250,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.fc serefpolicy-3.5.13/policy/modules/system/xen.fc
 --- nsaserefpolicy/policy/modules/system/xen.fc	2008-10-17 14:49:13.000000000 +0200
-+++ serefpolicy-3.5.13/policy/modules/system/xen.fc	2009-01-20 17:50:35.000000000 +0100
++++ serefpolicy-3.5.13/policy/modules/system/xen.fc	2009-01-27 10:32:26.000000000 +0100
 @@ -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)
@@ -36683,7 +37261,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.if serefpolicy-3.5.13/policy/modules/system/xen.if
 --- nsaserefpolicy/policy/modules/system/xen.if	2008-10-17 14:49:13.000000000 +0200
-+++ serefpolicy-3.5.13/policy/modules/system/xen.if	2009-01-20 17:50:35.000000000 +0100
++++ serefpolicy-3.5.13/policy/modules/system/xen.if	2009-01-27 10:32:26.000000000 +0100
 @@ -155,7 +155,7 @@
  	stream_connect_pattern($1,xenstored_var_run_t,xenstored_var_run_t,xenstored_t)
  ')
@@ -36736,7 +37314,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.te serefpolicy-3.5.13/policy/modules/system/xen.te
 --- nsaserefpolicy/policy/modules/system/xen.te	2008-10-17 14:49:13.000000000 +0200
-+++ serefpolicy-3.5.13/policy/modules/system/xen.te	2009-01-20 17:50:35.000000000 +0100
++++ serefpolicy-3.5.13/policy/modules/system/xen.te	2009-01-27 10:32:26.000000000 +0100
 @@ -6,6 +6,13 @@
  # Declarations
  #
@@ -36970,7 +37548,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/policy_capabilities serefpolicy-3.5.13/policy/policy_capabilities
 --- nsaserefpolicy/policy/policy_capabilities	2008-10-17 14:49:14.000000000 +0200
-+++ serefpolicy-3.5.13/policy/policy_capabilities	2009-01-20 17:50:35.000000000 +0100
++++ serefpolicy-3.5.13/policy/policy_capabilities	2009-01-27 10:32:26.000000000 +0100
 @@ -29,4 +29,4 @@
  # chr_file: open
  # blk_file: open
@@ -36979,7 +37557,7 @@
 +#policycap open_perms;
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/support/obj_perm_sets.spt serefpolicy-3.5.13/policy/support/obj_perm_sets.spt
 --- nsaserefpolicy/policy/support/obj_perm_sets.spt	2008-10-17 14:49:14.000000000 +0200
-+++ serefpolicy-3.5.13/policy/support/obj_perm_sets.spt	2009-01-20 17:50:35.000000000 +0100
++++ serefpolicy-3.5.13/policy/support/obj_perm_sets.spt	2009-01-27 10:32:26.000000000 +0100
 @@ -59,22 +59,22 @@
  # 
  # Permissions for executing files.
@@ -37129,7 +37707,7 @@
 +define(`manage_key_perms', `{ create link read search setattr view write } ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/users serefpolicy-3.5.13/policy/users
 --- nsaserefpolicy/policy/users	2008-10-17 14:49:11.000000000 +0200
-+++ serefpolicy-3.5.13/policy/users	2009-01-20 17:50:35.000000000 +0100
++++ serefpolicy-3.5.13/policy/users	2009-01-27 10:32:26.000000000 +0100
 @@ -25,11 +25,8 @@
  # permit any access to such users, then remove this entry.
  #
@@ -37156,7 +37734,7 @@
 +gen_user(root, user, unconfined_r sysadm_r staff_r ifdef(`enable_mls',`secadm_r auditadm_r') system_r, s0, s0 - mls_systemhigh, mcs_allcats)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/Rules.modular serefpolicy-3.5.13/Rules.modular
 --- nsaserefpolicy/Rules.modular	2008-10-17 14:49:14.000000000 +0200
-+++ serefpolicy-3.5.13/Rules.modular	2009-01-20 17:50:35.000000000 +0100
++++ serefpolicy-3.5.13/Rules.modular	2009-01-27 10:32:26.000000000 +0100
 @@ -73,8 +73,8 @@
  $(tmpdir)/%.mod: $(m4support) $(tmpdir)/generated_definitions.conf $(tmpdir)/all_interfaces.conf %.te
  	@echo "Compliling $(NAME) $(@F) module"
@@ -37205,7 +37783,7 @@
  $(appdir)/customizable_types: $(base_conf)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/support/Makefile.devel serefpolicy-3.5.13/support/Makefile.devel
 --- nsaserefpolicy/support/Makefile.devel	2008-10-17 14:49:14.000000000 +0200
-+++ serefpolicy-3.5.13/support/Makefile.devel	2009-01-20 17:50:35.000000000 +0100
++++ serefpolicy-3.5.13/support/Makefile.devel	2009-01-27 10:32:26.000000000 +0100
 @@ -181,8 +181,7 @@
  tmp/%.mod: $(m4support) tmp/all_interfaces.conf %.te
  	@$(EINFO) "Compiling $(NAME) $(basename $(@F)) module"


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-10/selinux-policy.spec,v
retrieving revision 1.768
retrieving revision 1.769
diff -u -r1.768 -r1.769
--- selinux-policy.spec	19 Jan 2009 19:02:35 -0000	1.768
+++ selinux-policy.spec	27 Jan 2009 15:31:15 -0000	1.769
@@ -20,7 +20,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.5.13
-Release: 40%{?dist}
+Release: 41%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -459,6 +459,12 @@
 %endif
 
 %changelog
+* Tue Jan 27 2009 Miroslav Grepl <mgrepl at redhat.com> 3.5.13-41
+- Add psad policy
+- Allow certwatch read httpd config files
+- Allow ntpd, spamd, mailman (qrunner) to list inotify
+- Fix wine labeling
+
 * Mon Jan 19 2009 Miroslav Grepl <mgrepl at redhat.com> 3.5.13-40
 - Allow kismet read generic files in /usr
 - Add execstack for Podslueth policy  



From ehabkost at fedoraproject.org  Tue Jan 27 15:52:23 2009
From: ehabkost at fedoraproject.org (Eduardo Habkost)
Date: Tue, 27 Jan 2009 15:52:23 +0000 (UTC)
Subject: rpms/etherboot/devel strip-etherboot-tarball.sh, NONE,
	1.1 .cvsignore, 1.3, 1.4 etherboot.spec, 1.6, 1.7 sources, 1.3, 1.4
Message-ID: <20090127155223.592617010B@cvs1.fedora.phx.redhat.com>

Author: ehabkost

Update of /cvs/pkgs/rpms/etherboot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3511

Modified Files:
	.cvsignore etherboot.spec sources 
Added Files:
	strip-etherboot-tarball.sh 
Log Message:
strip proto_fsp.c from etherboot tarball due to license issues



--- NEW FILE strip-etherboot-tarball.sh ---
#!/bin/sh
# Strips proto_fsp.c from etherboot tarball
#
# Author: Eduardo Habkost <ehabkost at redhat.com>
#
# proto_fsp.c has a custom license that doesn't explicitly permit
# redistribution and has an additional indemnification requirement.

set -e

src="$1"
base="$(basename "$src" .tar.gz)"

tmpdir="$(mktemp -d)"
tar -C "$tmpdir" -zxf "$1"

if [ ! -d "${tmpdir}/${base}" ];then
	echo "Uh? Where is the $base directory?" >&2
	exit 1
fi


pushd "${tmpdir}/${base}"

# Sanity check:

# be conservative: look for all files with the problematic license
# and make sure it is the expected list of files.
lfiles="$(grep -r -l 'and that you hold the author' . | sort)"
expected="./src/core/proto_fsp.c"

if [ "$lfiles" != "$expected" ];then
	echo "Unexpected list of files." >&2
	echo "License list: $lfiles" >&2
	echo "Expected list: $expected" >&2
	exit 1
fi


# Clean the source files
rm -f src/core/proto_fsp.c

# proto_fsp.c is already inside a disabled-by-default #ifdef, so we
# can just make it empty and have the same build result.
echo '/* proto_fsp.c removed */' > src/core/proto_fsp.c

popd
tar -C "$tmpdir" -zcf "${base}-nofsp.tar.gz" "$base"


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/etherboot/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	1 Dec 2008 16:51:00 -0000	1.3
+++ .cvsignore	27 Jan 2009 15:51:52 -0000	1.4
@@ -1,2 +1,2 @@
-etherboot-5.4.4.tar.gz
 etherboot-binaries-5.4.4-6.fc11.i386.tar.bz
+etherboot-5.4.4-nofsp.tar.gz


Index: etherboot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/etherboot/devel/etherboot.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- etherboot.spec	1 Dec 2008 16:54:21 -0000	1.6
+++ etherboot.spec	27 Jan 2009 15:51:52 -0000	1.7
@@ -6,13 +6,19 @@
 
 Name: etherboot
 Version: 5.4.4
-Release: 7%{?dist}
+Release: 8%{?dist}
 Summary: Etherboot collection of boot roms
 
 Group: Development/Tools
 License: GPLv2
 URL: http://etherboot.org
-Source0: http://kernel.org/pub/software/utils/boot/etherboot/%{name}-%{version}.tar.gz
+
+# The original source:
+#Source0: http://kernel.org/pub/software/utils/boot/etherboot/%{name}-%{version}.tar.gz
+# The source without proto_fsp.c:
+Source0: %{name}-%{version}-nofsp.tar.gz
+# The script used to remove the proto_fsp.c files:
+Source1: strip-etherboot-tarball.sh
 
 # prebuilt binaries, from etherboot-*-5.4.4-6.fc11.i386.rpm:
 Source1: etherboot-binaries-5.4.4-6.fc11.i386.tar.bz
@@ -183,6 +189,9 @@
 
 
 %changelog
+* Tue Jan 27 2009 Eduardo Habkost <ehabkost at redhat.com> - 5.4.5-8
+- Strips proto_fsp.c from etherboot tarball due to licensing reasons
+
 * Mon Dec 01 2008 Eduardo Habkost <ehabkost at redhat.com> - 5.4.5-7
 - Updated prebuilt-binaries tarball to binaries from 5.4.5-6
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/etherboot/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	1 Dec 2008 16:51:00 -0000	1.3
+++ sources	27 Jan 2009 15:51:52 -0000	1.4
@@ -1,2 +1,2 @@
-5aff6c2a56f9dfa4747f4de94666c9ac  etherboot-5.4.4.tar.gz
 7fa38a869ba1b8a9d9830c89f500e18f  etherboot-binaries-5.4.4-6.fc11.i386.tar.bz
+1ba240156ab316863108138da6655315  etherboot-5.4.4-nofsp.tar.gz



From dsd at fedoraproject.org  Tue Jan 27 16:00:24 2009
From: dsd at fedoraproject.org (Daniel Drake)
Date: Tue, 27 Jan 2009 16:00:24 +0000 (UTC)
Subject: rpms/olpc-utils/OLPC-3 olpc-utils-pe_us_kbd.patch, NONE,
	1.1 olpc-utils.spec, 1.26, 1.27
Message-ID: <20090127160024.BB7D77010B@cvs1.fedora.phx.redhat.com>

Author: dsd

Update of /cvs/pkgs/rpms/olpc-utils/OLPC-3
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4744

Modified Files:
	olpc-utils.spec 
Added Files:
	olpc-utils-pe_us_kbd.patch 
Log Message:
Workaround/hack for US(Intl) keyboards in Peru (dlo #9126)

olpc-utils-pe_us_kbd.patch:

--- NEW FILE olpc-utils-pe_us_kbd.patch ---
diff --git a/etc/rc.d/init.d/olpc-configure b/etc/rc.d/init.d/olpc-configure
index 6cd2a79..ef2ab94 100755
--- a/etc/rc.d/init.d/olpc-configure
+++ b/etc/rc.d/init.d/olpc-configure
@@ -61,6 +61,13 @@ read_config() {
 			XKB_LAYOUT="`mfgtag_stripspaces KL`"
 			XKB_VARIANT="`mfgtag KV`"
 			SYS_LANG="`mfgtag LO`"
+            if [ "$SYS_LANG" = "es_MX.UTF-8" ] && [ "$XKB_LAYOUT" = "us" ] ; then
+              # We have some machines in Peru with US(Intl) keyboards and 
+              # they need some modifications to the standard layout
+              # See http://dev.laptop.org/ticket/9126
+              XKB_LAYOUT="es"
+              XKB_VARIANT="olpc2"
+            fi
 		elif [ "`cut -c 7-8 /ofw/openprom/model 2>/dev/null`" = "Q2" ] ; then
 			KB_HEADER=`read_nvram 0x44 2`
 			if [ "x$KB_HEADER" = "xKB" ] ; then


Index: olpc-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/olpc-utils/OLPC-3/olpc-utils.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- olpc-utils.spec	18 Oct 2008 18:22:08 -0000	1.26
+++ olpc-utils.spec	27 Jan 2009 15:59:53 -0000	1.27
@@ -1,6 +1,6 @@
 Name:       olpc-utils
 Version:    0.89
-Release:    4%{?dist}
+Release:    5%{?dist}
 Summary:    OLPC utilities
 URL:        http://dev.laptop.org/git?p=projects/olpc-utils;a=summary
 Group:      System Environment/Base
@@ -9,6 +9,7 @@
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Patch1: olpc-utils-dbus.patch
+Patch2: olpc-utils-pe_us_kbd.patch
 
 # for olpc-dm
 BuildRequires:  pam-devel
@@ -32,6 +33,7 @@
 %setup -q
 
 %patch1 -p1
+%patch2 -p1
 
 %build
 make -f Makefile.build %{?_smp_mflags}
@@ -91,6 +93,9 @@
 %config(noreplace) %{_sysconfdir}/ConsoleKit/run-session.d/pam-foreground-compat.ck
 
 %changelog
+* Tue Dec 23 2008 Sayamindu Dasgupta <sayamindu at laptop.org> 0.89-5
+- Workaround/hack for US(Intl) keyboards in Peru (dlo #9126)
+
 * Sat Oct  1 2008 Marco Pesenti Gritti <mpg at redhat.com> 0.89-4
 - Marco Pesenti Gritti (1):
     Fix typo in the dbus session patch.



From hadess at fedoraproject.org  Tue Jan 27 16:00:47 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Tue, 27 Jan 2009 16:00:47 +0000 (UTC)
Subject: rpms/gnome-user-share/devel .cvsignore, 1.14,
	1.15 gnome-user-share.spec, 1.43, 1.44 sources, 1.14, 1.15
Message-ID: <20090127160047.B7BF67010B@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-serv4701

Modified Files:
	.cvsignore gnome-user-share.spec sources 
Log Message:
* Tue Jan 27 2009 - Bastien Nocera <bnocera at redhat.com> - 2.25.5-1
- Update to 2.25.5



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-user-share/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	17 Dec 2008 10:01:57 -0000	1.14
+++ .cvsignore	27 Jan 2009 16:00:17 -0000	1.15
@@ -1 +1 @@
-gnome-user-share-0.41.tar.gz
+gnome-user-share-2.25.5.tar.bz2


Index: gnome-user-share.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-user-share/devel/gnome-user-share.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- gnome-user-share.spec	17 Dec 2008 10:01:57 -0000	1.43
+++ gnome-user-share.spec	27 Jan 2009 16:00:17 -0000	1.44
@@ -1,25 +1,29 @@
 Summary: Gnome user file sharing
 Name: gnome-user-share
-Version: 0.41
+Version: 2.25.5
 Release: 1%{?dist}
 License: GPLv2+
 Group: System Environment/Libraries
 URL: http://www.gnome.org
-Source0: http://download.gnome.org/sources/gnome-user-share/0.40/%{name}-%{version}.tar.gz
+Source0: http://download.gnome.org/sources/gnome-user-share/2.25/%{name}-%{version}.tar.bz2
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 Requires: httpd >= 2.2.0
 Requires: obex-data-server >= 0.3
-BuildRequires: GConf2-devel avahi-glib-devel >= 0.6 pkgconfig
+Requires: mod_dnssd
+BuildRequires: GConf2-devel pkgconfig
 BuildRequires: gtk2-devel >= 2.4.0
 BuildRequires: httpd >= 2.2.0
 BuildRequires: desktop-file-utils
+BuildRequires: gnome-doc-utils
 BuildRequires: libselinux-devel
 BuildRequires: dbus-glib-devel
 BuildRequires: libnotify-devel
 BuildRequires: gettext
 BuildRequires: perl(XML::Parser) intltool
 Requires(post): GConf2
+Requires(post): scrollkeeper
+Requires(postun): scrollkeeper
 Requires(pre): GConf2
 Requires(preun): GConf2
 
@@ -57,12 +61,29 @@
   --add-category X-Red-Hat-Base                                         \
   $RPM_BUILD_ROOT%{_datadir}/applications/*.desktop
 
-%find_lang gnome-user-share
+%find_lang gnome-user-share --with-gnome
+
+# save space by linking identical images in translated docs
+helpdir=$RPM_BUILD_ROOT%{_datadir}/gnome/help/%{name}
+for f in $helpdir/C/figures/*.png; do
+  b="$(basename $f)"
+  for d in $helpdir/*; do
+    if [ -d "$d" -a "$d" != "$helpdir/C" ]; then
+      g="$d/figures/$b"
+      if [ -f "$g" ]; then
+        if cmp -s $f $g; then
+          rm "$g"; ln -s "../../C/figures/$b" "$g"
+        fi
+      fi
+    fi
+  done
+done
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
+scrollkeeper-update -q
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
 gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/desktop_gnome_file_sharing.schemas > /dev/null || :
 if [ -x /usr/bin/gtk-update-icon-cache ]; then
@@ -82,6 +103,7 @@
 fi
 
 %postun
+scrollkeeper-update -q
 if [ -x /usr/bin/gtk-update-icon-cache ]; then
   /usr/bin/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor
 fi
@@ -98,6 +120,9 @@
 %{_datadir}/icons/hicolor/*/apps/gnome-obex-server.png
 
 %changelog
+* Tue Jan 27 2009 - Bastien Nocera <bnocera at redhat.com> - 2.25.5-1
+- Update to 2.25.5
+
 * Wed Dec 17 2008 - Bastien Nocera <bnocera at redhat.com> - 0.41-1
 - Update to 0.41
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-user-share/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	17 Dec 2008 10:01:57 -0000	1.14
+++ sources	27 Jan 2009 16:00:17 -0000	1.15
@@ -1 +1 @@
-af883363ff0dfeaa8733d4a048da9975  gnome-user-share-0.41.tar.gz
+f6f82430727b9fda6954d3de0d43b843  gnome-user-share-2.25.5.tar.bz2



From mclasen at fedoraproject.org  Tue Jan 27 16:08:31 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Tue, 27 Jan 2009 16:08:31 +0000 (UTC)
Subject: rpms/gnome-disk-utility/devel gnome-disk-utility.spec,1.2,1.3
Message-ID: <20090127160831.559D97010B@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-disk-utility/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6281

Modified Files:
	gnome-disk-utility.spec 
Log Message:
rebuild for pkgconfig provides



Index: gnome-disk-utility.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-disk-utility/devel/gnome-disk-utility.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gnome-disk-utility.spec	23 Nov 2008 05:53:00 -0000	1.2
+++ gnome-disk-utility.spec	27 Jan 2009 16:08:00 -0000	1.3
@@ -11,7 +11,7 @@
 Summary: Disk management application
 Name: gnome-disk-utility
 Version: 0.1
-Release: 0.git20080720.1%{?dist}
+Release: 0.git20080720.2%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 URL: http://gitweb.freedesktop.org/?p=users/david/gnome-disk-utility.git;a=summary
@@ -194,6 +194,9 @@
 %{_includedir}/gnome-disk-utility/gdu-gtk/*
 
 %changelog
+* Tue Jan 27 2009 Matthias Clasen <mclasen at redhat.com> 0.1-0.git20080720.2%{?dist}
+- Rebuild for pkgconfig provides
+
 * Sun Nov 23 2008 Matthias Clasen <mclasen at redhat.com> 0.1-0.git20080720.1%{?dist}
 - Improve %%summary and %%description
 



From ehabkost at fedoraproject.org  Tue Jan 27 16:24:07 2009
From: ehabkost at fedoraproject.org (Eduardo Habkost)
Date: Tue, 27 Jan 2009 16:24:07 +0000 (UTC)
Subject: rpms/etherboot/devel etherboot.spec,1.7,1.8
Message-ID: <20090127162407.3720F7010B@cvs1.fedora.phx.redhat.com>

Author: ehabkost

Update of /cvs/pkgs/rpms/etherboot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9351

Modified Files:
	etherboot.spec 
Log Message:
Fix strip-etherboot-tarball.sh SourceX number to not conflict with existing Source1



Index: etherboot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/etherboot/devel/etherboot.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- etherboot.spec	27 Jan 2009 15:51:52 -0000	1.7
+++ etherboot.spec	27 Jan 2009 16:23:36 -0000	1.8
@@ -17,11 +17,11 @@
 #Source0: http://kernel.org/pub/software/utils/boot/etherboot/%{name}-%{version}.tar.gz
 # The source without proto_fsp.c:
 Source0: %{name}-%{version}-nofsp.tar.gz
-# The script used to remove the proto_fsp.c files:
-Source1: strip-etherboot-tarball.sh
-
 # prebuilt binaries, from etherboot-*-5.4.4-6.fc11.i386.rpm:
 Source1: etherboot-binaries-5.4.4-6.fc11.i386.tar.bz
+# The script used to remove the proto_fsp.c files:
+Source2: strip-etherboot-tarball.sh
+
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 



From ltinkl at fedoraproject.org  Tue Jan 27 16:30:20 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Tue, 27 Jan 2009 16:30:20 +0000 (UTC)
Subject: rpms/kdebase-workspace/F-9
	kdebase-workspace-4.1.72-plasma-konsole.patch, NONE,
	1.1 kdebase-workspace-4.1.80-session-button.patch, NONE,
	1.1 kdebase-workspace-4.1.82-redhat-startkde.patch, NONE,
	1.1 kdebase-workspace-4.1.96-AllowExternalPaths.patch, NONE,
	1.1 kdebase-workspace-4.1.96-font.patch, NONE,
	1.1 kdebase-workspace-4.2.0-show-systemsettings.patch, NONE,
	1.1 kdebase-workspace.spec, 1.124, 1.125 sources, 1.19,
	1.20 kdebase-workspace-4.0.72-plasma-konsole.patch, 1.1,
	NONE kdebase-workspace-4.0.80-ksysguard-onlyshowin.patch, 1.1,
	NONE kdebase-workspace-4.0.98-consolekit-kdm.patch, 1.1,
	NONE kdebase-workspace-4.0.98-kickoff-suspend.patch, 1.1,
	NONE kdebase-workspace-4.1.0-enable-kwin-taskbarthumbnail.patch,
	1.1, NONE kdebase-workspace-4.1.0-kde#152914.patch, 1.1,
	NONE kdebase-workspace-4.1.0-plasma-tooltips.patch, 1.1,
	NONE kdebase-workspace-4.1.2-default_applets.patch, 1.2,
	NONE kdebase-workspace-4.1.2-multihead.patch, 1.1,
	NONE kdebase-workspace-4.1.2-panel-autohide-866998.patch, 1.1,
	NONE kdebase-workspace-4.1.2-panel-autohide-868231.patch, 1.1,
	NONE kdebase-workspace-4.1.2-panel-autohide-869277.patch, 1.1,
	NONE kdebase-workspace-4.1.2-panel-autohide-871058.patch, 1.1,
	NONE kdebase-workspace-4.1.2-panel-autohide-coords.patch, 1.1,
	NONE kdebase-workspace-4.1.2-panel-autohide-fix-flicker.patch,
	1.2, NONE kdebase-workspace-4.1.2-panel-autohide.patch, 1.2,
	NONE kdebase-workspace-4.1.2-redhat-startkde.patch, 1.1,
	NONE kdebase-workspace-4.1.2-session-button.patch, 1.1,
	NONE kdebase-workspace-4.1.4-krunnerhistory.patch, 1.1, NONE
Message-ID: <20090127163020.A47907010B@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kdebase-workspace/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10428

Modified Files:
	kdebase-workspace.spec sources 
Added Files:
	kdebase-workspace-4.1.72-plasma-konsole.patch 
	kdebase-workspace-4.1.80-session-button.patch 
	kdebase-workspace-4.1.82-redhat-startkde.patch 
	kdebase-workspace-4.1.96-AllowExternalPaths.patch 
	kdebase-workspace-4.1.96-font.patch 
	kdebase-workspace-4.2.0-show-systemsettings.patch 
Removed Files:
	kdebase-workspace-4.0.72-plasma-konsole.patch 
	kdebase-workspace-4.0.80-ksysguard-onlyshowin.patch 
	kdebase-workspace-4.0.98-consolekit-kdm.patch 
	kdebase-workspace-4.0.98-kickoff-suspend.patch 
	kdebase-workspace-4.1.0-enable-kwin-taskbarthumbnail.patch 
	kdebase-workspace-4.1.0-kde#152914.patch 
	kdebase-workspace-4.1.0-plasma-tooltips.patch 
	kdebase-workspace-4.1.2-default_applets.patch 
	kdebase-workspace-4.1.2-multihead.patch 
	kdebase-workspace-4.1.2-panel-autohide-866998.patch 
	kdebase-workspace-4.1.2-panel-autohide-868231.patch 
	kdebase-workspace-4.1.2-panel-autohide-869277.patch 
	kdebase-workspace-4.1.2-panel-autohide-871058.patch 
	kdebase-workspace-4.1.2-panel-autohide-coords.patch 
	kdebase-workspace-4.1.2-panel-autohide-fix-flicker.patch 
	kdebase-workspace-4.1.2-panel-autohide.patch 
	kdebase-workspace-4.1.2-redhat-startkde.patch 
	kdebase-workspace-4.1.2-session-button.patch 
	kdebase-workspace-4.1.4-krunnerhistory.patch 
Log Message:
KDE 4.2.0


kdebase-workspace-4.1.72-plasma-konsole.patch:

--- NEW FILE kdebase-workspace-4.1.72-plasma-konsole.patch ---
diff -Naur kdebase-workspace-4.1.72/plasma/containments/desktop/desktop.cpp kdebase-workspace-4.1.72.plasma-konsole/plasma/containments/desktop/desktop.cpp
--- kdebase-workspace-4.1.72/plasma/containments/desktop/desktop.cpp	2008-11-04 18:12:35.000000000 +0100
+++ kdebase-workspace-4.1.72.plasma-konsole/plasma/containments/desktop/desktop.cpp	2008-11-10 21:59:00.000000000 +0100
@@ -41,6 +41,7 @@
 #include <KRun>
 #include <KStandardDirs>
 #include <KWindowSystem>
+#include <KProcess>
 
 #include <Plasma/Corona>
 #include <Plasma/Animator>
@@ -63,6 +64,7 @@
       m_lockDesktopAction(0),
       m_appletBrowserAction(0),
       m_addPanelAction(0),
+      m_runKonsoleAction(0),
       m_runCommandAction(0),
       m_lockScreenAction(0),
       m_logoutAction(0),
@@ -132,6 +134,13 @@
     krunner.display();
 }
 
+void DefaultDesktop::runKonsole()
+{
+    KProcess proc;
+    proc << KStandardDirs::locate("exe", "konsole");
+    proc.execute();
+}
+
 void DefaultDesktop::lockScreen()
 {
     if (!KAuthorized::authorizeKAction("lock_screen")) {
@@ -161,6 +170,10 @@
         connect(m_addPanelAction, SIGNAL(triggered(bool)), this, SLOT(addPanel()));
         m_addPanelAction->setIcon(KIcon("list-add"));
 
+        m_runKonsoleAction = new QAction(i18n("Konsole"), this);
+        connect(m_runKonsoleAction, SIGNAL(triggered(bool)), this, SLOT(runKonsole()));
+        m_runKonsoleAction->setIcon(KIcon("terminal"));
+
         m_runCommandAction = new QAction(i18n("Run Command..."), this);
         connect(m_runCommandAction, SIGNAL(triggered(bool)), this, SLOT(runCommand()));
         m_runCommandAction->setIcon(KIcon("system-run"));
@@ -186,6 +199,8 @@
 
     QList<QAction*> actions;
 
+    actions.append(m_runKonsoleAction);
+
     if (KAuthorized::authorizeKAction("run_command")) {
         actions.append(m_runCommandAction);
     }
diff -Naur kdebase-workspace-4.1.72/plasma/containments/desktop/desktop.h kdebase-workspace-4.1.72.plasma-konsole/plasma/containments/desktop/desktop.h
--- kdebase-workspace-4.1.72/plasma/containments/desktop/desktop.h	2008-11-04 18:12:35.000000000 +0100
+++ kdebase-workspace-4.1.72.plasma-konsole/plasma/containments/desktop/desktop.h	2008-11-10 21:59:00.000000000 +0100
@@ -70,6 +70,7 @@
     void dropEvent(QGraphicsSceneDragDropEvent *event);
 
 protected Q_SLOTS:
+    void runKonsole();
     void runCommand();
 
     void lockScreen();
@@ -88,6 +89,7 @@
     QAction *m_lockDesktopAction;
     QAction *m_appletBrowserAction;
     QAction *m_addPanelAction;
+    QAction *m_runKonsoleAction;
     QAction *m_runCommandAction;
     QAction *m_setupDesktopAction;
     QAction *m_lockScreenAction;

kdebase-workspace-4.1.80-session-button.patch:

--- NEW FILE kdebase-workspace-4.1.80-session-button.patch ---
diff -up kdebase-workspace-4.1.80/kdm/kfrontend/kgreeter.cpp.orig kdebase-workspace-4.1.80/kdm/kfrontend/kgreeter.cpp
--- kdebase-workspace-4.1.80/kdm/kfrontend/kgreeter.cpp.orig	2008-11-19 23:44:43.000000000 +0100
+++ kdebase-workspace-4.1.80/kdm/kfrontend/kgreeter.cpp	2008-11-19 23:45:55.000000000 +0100
@@ -520,10 +520,12 @@ KGreeter::setPrevWM( QAction *wm )
 	if (curPrev != wm) {
 		if (curPrev)
 			curPrev->setText( sessionTypes[curPrev->data().toInt()].name );
-		if (wm)
+		if (wm) {
 			wm->setText( i18nc( "@item:inmenu session type",
 			                    "%1 (previous)",
 			                    sessionTypes[wm->data().toInt()].name ) );
+			wm->toggle();
+		}
 		curPrev = wm;
 	}
 }

kdebase-workspace-4.1.82-redhat-startkde.patch:

--- NEW FILE kdebase-workspace-4.1.82-redhat-startkde.patch ---
diff -Naurw kdebase-workspace-4.1.82/startkde.cmake kdebase-workspace-4.1.82.redhat-startkde/startkde.cmake
--- kdebase-workspace-4.1.82/startkde.cmake	2008-11-28 16:33:30.000000000 +0100
+++ kdebase-workspace-4.1.82.redhat-startkde/startkde.cmake	2008-12-10 20:10:42.000000000 +0100
@@ -19,12 +19,12 @@
         exit 1
 fi
 
-# Set the background to plain grey.
+# Set the background to the Red Hat default
 # The standard X background is nasty, causing moire effects and exploding
 # people's heads. We use colours from the standard KDE palette for those with
 # palettised displays.
 if test -z "$XDM_MANAGED" || echo "$XDM_MANAGED" | grep ",auto" > /dev/null; then
-  xsetroot -solid "#000000"
+  xsetroot -solid "#103D77"
 fi
 
 # we have to unset this for Darwin since it will screw up KDE's dynamic-loading
@@ -34,22 +34,6 @@
 MALLOC_CHECK_=2 
 export MALLOC_CHECK_
 
-# in case we have been started with full pathname spec without being in PATH
-bindir=`echo "$0" | sed -n 's,^\(/.*\)/[^/][^/]*$,\1,p'`
-if [ -n "$bindir" ]; then
-  qbindir=`$bindir/kde4-config --qt-binaries`
-  if [ -n "$qbindir" ]; then
-    case $PATH in
-      $qbindir|$qbindir:*|*:$qbindir|*:$qbindir:*) ;;
-      *) PATH=$qbindir:$PATH; export PATH;;
-    esac
-  fi
-  case $PATH in
-    $bindir|$bindir:*|*:$bindir|*:$bindir:*) ;;
-    *) PATH=$bindir:$PATH; export PATH;;
-  esac
-fi
-
 # Boot sequence:
 #
 # kdeinit is used to fork off processes which improves memory usage
@@ -87,6 +71,13 @@
 kcmfonts General forceFontDPI 0
 kdeglobals Locale Language '' # trigger requesting languages from KLocale
 EOF
+# read the default KSplash theme to use out of kde-settings
+if [ -e /usr/share/kde-settings/kde-profile/default/share/config/ksplashrc ]
+  then eval `grep '^Theme=' /usr/share/kde-settings/kde-profile/default/share/config/ksplashrc`
+       if [ -n "$Theme" ]
+         then sed -i -e "s/Default/$Theme/g" $kdehome/share/config/startupconfigkeys
+       fi
+fi
 kstartupconfig4
 returncode=$?
 if test $returncode -ne 0; then
@@ -207,8 +198,9 @@
 # better use the Autostart folder.
 
 libpath=`kde4-config --path lib | tr : '\n'`
+envpath=/etc/kde/env/
 
-for prefix in `echo "$libpath" | sed -n -e 's,/lib[^/]*/,/env/,p'`; do
+for prefix in `echo "$libpath" | sed -n -e 's,/lib[^/]*/,/env/,p'` $envpath ; do
   for file in "$prefix"*.sh; do
     test -r "$file" && . "$file"
   done
@@ -421,7 +413,8 @@
 echo 'startkde: Running shutdown scripts...'  1>&2
 
 # Run scripts found in $KDEDIRS/shutdown
-for prefix in `echo "$libpath" | sed -n -e 's,/lib[^/]*/,/shutdown/,p'`; do
+shutdownpath=/etc/kde/shutdown/
+for prefix in `echo "$libpath" | sed -n -e 's,/lib[^/]*/,/shutdown/,p'` $shutdownpath; do
   for file in `ls "$prefix" 2> /dev/null | egrep -v '(~|\.bak)$'`; do
     test -x "$prefix$file" && "$prefix$file"
   done

kdebase-workspace-4.1.96-AllowExternalPaths.patch:

--- NEW FILE kdebase-workspace-4.1.96-AllowExternalPaths.patch ---
diff -up kdebase-workspace-4.1.96/plasma/wallpapers/image/backgroundpackage.cpp.orig kdebase-workspace-4.1.96/plasma/wallpapers/image/backgroundpackage.cpp
--- kdebase-workspace-4.1.96/plasma/wallpapers/image/backgroundpackage.cpp.orig	2009-01-16 14:57:51.000000000 +0100
+++ kdebase-workspace-4.1.96/plasma/wallpapers/image/backgroundpackage.cpp	2009-01-16 14:58:43.000000000 +0100
@@ -157,6 +157,7 @@ BackgroundPackageStructure::BackgroundPa
 
     addDirectoryDefinition("images", "images", i18n("Images"));
     addFileDefinition("screenshot", "screenshot.png", i18n("Screenshot"));
+    setAllowExternalPaths(true);
 }
 
 

kdebase-workspace-4.1.96-font.patch:

--- NEW FILE kdebase-workspace-4.1.96-font.patch ---
diff -up kdebase-workspace-4.1.96/startkde.cmake.orig kdebase-workspace-4.1.96/startkde.cmake
--- kdebase-workspace-4.1.96/startkde.cmake.orig	2009-01-21 16:35:32.000000000 +0100
+++ kdebase-workspace-4.1.96/startkde.cmake	2009-01-21 16:35:53.000000000 +0100
@@ -214,48 +214,6 @@ else
 fi
 export QT_PLUGIN_PATH
 
-# Activate the kde font directories.
-#
-# There are 4 directories that may be used for supplying fonts for KDE.
-#
-# There are two system directories. These belong to the administrator.
-# There are two user directories, where the user may add her own fonts.
-#
-# The 'override' versions are for fonts that should come first in the list,
-# i.e. if you have a font in your 'override' directory, it will be used in
-# preference to any other.
-#
-# The preference order looks like this:
-# user override, system override, X, user, system
-#
-# Where X is the original font database that was set up before this script
-# runs.
-
-usr_odir=$HOME/.fonts/kde-override
-usr_fdir=$HOME/.fonts
-
-if test -n "$KDEDIRS"; then
-  kdedirs_first=`echo "$KDEDIRS"|sed -e 's/:.*//'`
-  sys_odir=$kdedirs_first/share/fonts/override
-  sys_fdir=$kdedirs_first/share/fonts
-else
-  sys_odir=$KDEDIR/share/fonts/override
-  sys_fdir=$KDEDIR/share/fonts
-fi
-
-# We run mkfontdir on the user's font dirs (if we have permission) to pick
-# up any new fonts they may have installed. If mkfontdir fails, we still
-# add the user's dirs to the font path, as they might simply have been made
-# read-only by the administrator, for whatever reason.
-
-test -d "$sys_odir" && xset +fp "$sys_odir"
-test -d "$usr_odir" && (mkfontdir "$usr_odir" ; xset +fp "$usr_odir")
-test -d "$usr_fdir" && (mkfontdir "$usr_fdir" ; xset fp+ "$usr_fdir")
-test -d "$sys_fdir" && xset fp+ "$sys_fdir"
-
-# Ask X11 to rebuild its font list.
-xset fp rehash
-
 # Set a left cursor instead of the standard X11 "X" cursor, since I've heard
 # from some users that they're confused and don't know what to do. This is
 # especially necessary on slow machines, where starting KDE takes one or two

kdebase-workspace-4.2.0-show-systemsettings.patch:

--- NEW FILE kdebase-workspace-4.2.0-show-systemsettings.patch ---
diff -up kdebase-workspace-4.2.0/plasma/applets/kickoff/core/applicationmodel.cpp.show-systemsettings kdebase-workspace-4.2.0/plasma/applets/kickoff/core/applicationmodel.cpp
--- kdebase-workspace-4.2.0/plasma/applets/kickoff/core/applicationmodel.cpp.show-systemsettings	2009-01-17 12:00:26.000000000 +0100
+++ kdebase-workspace-4.2.0/plasma/applets/kickoff/core/applicationmodel.cpp	2009-01-22 22:51:03.000000000 +0100
@@ -105,7 +105,6 @@ public:
               systemApplicationPolicy(ApplicationModel::ShowSystemOnlyPolicy),
               primaryNamePolicy(ApplicationModel::GenericNamePrimary)
     {
-        systemApplications = Kickoff::systemApplicationList();
     }
 
     ~ApplicationModelPrivate()
diff -up kdebase-workspace-4.2.0/systemsettings/systemsettings.desktop.show-systemsettings kdebase-workspace-4.2.0/systemsettings/systemsettings.desktop
--- kdebase-workspace-4.2.0/systemsettings/systemsettings.desktop.show-systemsettings	2009-01-17 11:59:33.000000000 +0100
+++ kdebase-workspace-4.2.0/systemsettings/systemsettings.desktop	2009-01-22 22:47:10.000000000 +0100
@@ -151,3 +151,4 @@ Name[zh_TW]=????????????
 
 X-DBUS-StartupType=Unique
 Categories=Qt;KDE;System;
+OnlyShowIn=KDE;


Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebase-workspace/F-9/kdebase-workspace.spec,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -r1.124 -r1.125
--- kdebase-workspace.spec	8 Jan 2009 11:50:15 -0000	1.124
+++ kdebase-workspace.spec	27 Jan 2009 16:29:50 -0000	1.125
@@ -1,8 +1,9 @@
-%define _default_patch_fuzz 2
+%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Summary: K Desktop Environment - Workspace
 Name: kdebase-workspace
-Version: 4.1.4
+Version: 4.2.0
+
 Release: 1%{?dist}
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-workspace-%{version}.tar.bz2
 License: GPLv2
@@ -10,75 +11,30 @@
 URL: http://www.kde.org/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Patch1: kdebase-workspace-4.1.2-redhat-startkde.patch
-Patch2: kdebase-workspace-4.0.98-consolekit-kdm.patch
-Patch3: kdebase-workspace-4.0.72-plasma-konsole.patch
-Patch4: kdebase-workspace-4.1.1-show-systemsettings.patch
-Patch5: kdebase-workspace-4.0.72-ck-shutdown.patch
+Patch1: kdebase-workspace-4.1.82-redhat-startkde.patch
+Patch2: kdebase-workspace-4.1.72-plasma-konsole.patch
+Patch3: kdebase-workspace-4.2.0-show-systemsettings.patch
+Patch4: kdebase-workspace-4.0.72-ck-shutdown.patch
 #??434824: KDE4 System Settings - No Method To Enter Administrative Mode
-Patch6: kdebase-workspace-4.1.2-rootprivs.patch
-Patch7: kdebase-workspace-4.0.3-timedate-kcm.patch
+Patch5: kdebase-workspace-4.1.2-rootprivs.patch
+Patch6: kdebase-workspace-4.0.3-timedate-kcm.patch
 #??441062: packagekit tools do not show icons correctly on KDE
-Patch8: kdebase-workspace-4.0.3-krdb.patch
-# originally from plasma-4.0-openSUSE
-Patch9: kdebase-workspace-4.0.98-kickoff-suspend.patch
-Patch10: kdebase-workspace-4.0.72-klipper-url.patch
-# allows to define a default wallpaper via plasmarc:wallpaper
-Patch11: kdebase-workspace-4.0.85-plasma-default-wallpaper.patch
-Patch12: kdebase-workspace-4.1.2-multihead.patch
-Patch13: kdebase-workspace-4.1.2-session-button.patch
-Patch14: kdebase-workspace-4.1.2-ldap.patch
-Patch15: kdebase-workspace-4.1.2-kdm-i18n.patch
-# omit battery applet from default panel
-Patch16: kdebase-workspace-4.1.2-default_applets.patch
+Patch7: kdebase-workspace-4.0.3-krdb.patch
+Patch8: kdebase-workspace-4.0.72-klipper-url.patch
+Patch9: kdebase-workspace-4.1.80-session-button.patch
+Patch10: kdebase-workspace-4.1.2-ldap.patch
+Patch11: kdebase-workspace-4.1.96-font.patch
 
 # upstream patches:
-# backport Plasma tooltip manager from KDE 4.2 (fixes regression from 4.0)
-# This is a cumulative patch from the following revisions/pairs: 833271:833299,
-# 833386, 833479:833545, 833581, 833587:833620, 834652, 836698, 837733, 837827.
-# This is backwards BC wrt 4.1, but the API of the new classes is not finalized.
-Patch100: kdebase-workspace-4.1.0-plasma-tooltips.patch
-# http://bugs.kde.org/152914
-Patch101: kdebase-workspace-4.1.0-kde#152914.patch
-# reenable KWin taskbarthumbnail effect (already done upstream in 4.2, was
-# disabled in 4.1 due to no tooltip support - see also Patch100)
-Patch102: kdebase-workspace-4.1.0-enable-kwin-taskbarthumbnail.patch
-
-# backport of panel autohide from KDE 4.2
-# from plasma-4.1-openSUSE: http://websvn.kde.org/?view=rev&revision=864493
-# Fedora changes:
-# * removed theme changes
-# * removed hunks from plasmacontroller.cpp which rename theme elements
-# * removed unrelated panelappletoverlay.cpp changes from
-#   http://websvn.kde.org/?view=rev&revision=857606 which need library changes
-Patch104: kdebase-workspace-4.1.2-panel-autohide.patch
-# panel autohide bugfixes
-# (use sed -i -e 's!plasma/shells/desktop!plasma/plasma!g' to backport):
-# http://websvn.kde.org/?view=rev&revision=866710
-# http://websvn.kde.org/?view=rev&revision=866715
-Patch105: kdebase-workspace-4.1.2-panel-autohide-fix-flicker.patch
-# http://websvn.kde.org/?view=rev&revision=866998
-Patch106: kdebase-workspace-4.1.2-panel-autohide-866998.patch
-# http://websvn.kde.org/?view=rev&revision=868231
-Patch107: kdebase-workspace-4.1.2-panel-autohide-868231.patch
-# http://websvn.kde.org/?view=rev&revision=869277
-Patch108: kdebase-workspace-4.1.2-panel-autohide-869277.patch
-# http://websvn.kde.org/?view=rev&revision=869882
-# http://websvn.kde.org/?view=rev&revision=869925
-# http://websvn.kde.org/?view=rev&revision=870041
-Patch109: kdebase-workspace-4.1.2-panel-autohide-coords.patch
-# http://websvn.kde.org/?view=rev&revision=871058
-Patch110: kdebase-workspace-4.1.2-panel-autohide-871058.patch
-# end panel autohide bugfixes
-
-# KDE Bug 159510: <----> krunner doesn't store settings
-Patch111: kdebase-workspace-4.1.4-krunnerhistory.patch
+# trunk
+Patch100: kdebase-workspace-4.1.96-AllowExternalPaths.patch
 
 # FIXME: "inconsistent naming System Monitor vs KSysGuard" http://bugs.kde.org/162151
 
 Provides: kdebase-kdm = 6:%{version}-%{release}
 Provides: kdm = %{version}-%{release}
 
+# FIXME: Should we restore this now that kdebase no longer depends on kdebase-workspace?
 %if 0%{?fedora} == 9
 # upgrade path: kdebase(3) -> kdebase-workspace
 Obsoletes: kdebase < 6:4
@@ -89,11 +45,15 @@
 # kdmtheme's functionality is now provided by kdebase-workspace itself
 Obsoletes: kdmtheme < 1.3
 
+%if 0%{?fedora} > 10
+# kpowersave -> powerdevil upgrade path
+Obsoletes: kpowersave < 0.7.3-10
+%endif
+
 BuildRequires: bluez-libs-devel
-BuildRequires: cmake
 BuildRequires: ConsoleKit-devel
+BuildRequires: google-gadgets-devel >= 0.10.5
 BuildRequires: glib2-devel
-BuildRequires: kde-filesystem >= 4
 BuildRequires: kdelibs4-devel >= %{version}
 BuildRequires: libcaptury-devel
 BuildRequires: libraw1394-devel
@@ -105,6 +65,11 @@
 BuildRequires: qimageblitz-devel
 BuildRequires: soprano-devel
 BuildRequires: openldap-devel
+BuildRequires: python-devel
+BuildRequires: PyKDE4-devel >= %{version}
+BuildRequires: qedje-devel
+# used for the Logitech mouse KCM, disabled until #399931 is fixed
+# BuildRequires: libusb-devel
 
 Requires: %{name}-libs = %{version}-%{release}
 Requires: kde-settings-kdm
@@ -112,7 +77,7 @@
 Requires(post): xdg-utils
 Requires(postun): xdg-utils
 
-# would much rather these deps be elsewhere, 
+# would much rather these deps be elsewhere,
 # but adding here doesn't hurt either -- Rex
 Requires: kdebase-runtime >= %{version}
 Requires: oxygen-icon-theme
@@ -135,7 +100,7 @@
 %endif
 
 %description
-The KDE Workspace consists of what is the desktop of the 
+The KDE Workspace consists of what is the desktop of the
 KDE Desktop Environment.
 
 This package contains:
@@ -154,7 +119,6 @@
 %package devel
 Group:    Development/Libraries
 Summary:  Development files for %{name}
-Provides: plasma-devel = %{version}-%{release}
 Requires: %{name}-libs = %{version}-%{release}
 Requires: kdelibs4-devel
 %description devel
@@ -164,16 +128,15 @@
 Summary: Runtime libraries for %{name}
 Group:   System Environment/Libraries
 Requires: kdelibs4 >= %{version}
-# out of paranoia really, may or may not be 100% essential.  -- Rex
 Requires: %{name} = %{version}-%{release}
 %description libs
 %{summary}.
 
-%package wallpapers 
-Summary: KDE wallpapers 
+%package wallpapers
+Summary: KDE wallpapers
 Group: User Interface/Desktops
 Requires: kde-filesystem
-%description wallpapers 
+%description wallpapers
 %{summary}.
 
 %package -n ksysguardd
@@ -182,10 +145,10 @@
 %description -n ksysguardd
 %{summary}.
 
-%package -n oxygen-cursor-themes 
-Summary: Oxygen cursor themes 
+%package -n oxygen-cursor-themes
+Summary: Oxygen cursor themes
 Group: User Interface/Desktops
-%description -n oxygen-cursor-themes 
+%description -n oxygen-cursor-themes
 %{summary}.
 
 
@@ -196,37 +159,22 @@
 
 # RH/Fedora-specific startkde changes
 %patch1 -p1 -b .redhat-startkde
-# ConsoleKit support for KDM (#228111, #430388, kde#147790)
-%patch2 -p1 -b .consolekit
-%patch3 -p1 -b .plasma-konsole
-%patch4 -p1 -b .show-systemsettings
+%patch2 -p1 -b .plasma-konsole
+%patch3 -p1 -b .show-systemsettings
 # ConsoleKit >= 0.2.4 shutdown/reboot support (needed for GDM 2.22)
-%patch5 -p1 -b .ck-shutdown
+%patch4 -p1 -b .ck-shutdown
 pushd systemsettings
-%patch6 -p0 -b .rootprivs
+%patch5 -p0 -b .rootprivs
 popd
-%patch7 -p0 -b .timedate-kcm
-%patch8 -p0 -b .krdb
-%patch9 -p1 -b .kickoff-suspend
-%patch10 -p1 -b .klipper-url
-%patch11 -p1 -b .plasma-default-wallpaper
-%patch12 -p1 -b .multihead
-%patch13 -p1 -b .session-button
-%patch14 -p1 -b .ldap
-%patch15 -p1 -b .kdm-i18n
-%patch16 -p1 -b .default_applets
+%patch6 -p0 -b .timedate-kcm
+%patch7 -p0 -b .krdb
+%patch8 -p1 -b .klipper-url
+%patch9 -p1 -b .session-button
+%patch10 -p1 -b .ldap
+%patch11 -p1 -b .font
 
 # upstream patches
-%patch100 -p1 -b .plasma-tooltips
-%patch102 -p0 -b .kwin-taskbarthumbnail
-%patch104 -p0 -b .panel-autohide
-%patch105 -p0 -b .panel-autohide2
-%patch106 -p0 -b .panel-autohide3
-%patch107 -p0 -b .panel-autohide4
-%patch108 -p0 -b .panel-autohide5
-%patch109 -p0 -b .panel-autohide6
-%patch110 -p0 -b .panel-autohide7
-%patch111 -p1 -b .krunnerhistory
+%patch100 -p1 -b .AllowExternalPaths
 
 %build
 
@@ -244,7 +192,7 @@
 %install
 rm -rf %{buildroot}
 
-make install DESTDIR=%{buildroot} -C %{_target_platform}
+make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
 # xsession support
 mkdir -p %{buildroot}%{_datadir}/xsessions/
@@ -260,28 +208,6 @@
 ln -sf ../pics/users/%{default_face_icon} .default.face.icon
 popd
 
-# move devel symlinks
-mkdir -p %{buildroot}%{_kde4_libdir}/kde4/devel
-pushd %{buildroot}%{_kde4_libdir}
-for i in lib*.so
-do
-  case "$i" in
-    libkdeinit*.so)
-      ;;
-    # leave libworkspace.so for kate
-    libkworkspace.so|libplasma.so)
-      linktarget=`readlink "$i"`
-      ln -sf "../../$linktarget" "kde4/devel/$i"
-      ;;
-    *)
-      linktarget=`readlink "$i"`
-      rm -f "$i"
-      ln -sf "../../$linktarget" "kde4/devel/$i"
-      ;;
-  esac
-done
-popd
-
 
 %clean
 rm -rf %{buildroot}
@@ -316,6 +242,7 @@
 %{_kde4_datadir}/autostart/*
 %{_kde4_datadir}/applications/kde4/*
 %{_datadir}/dbus-1/interfaces/*
+%{_datadir}/dbus-1/services/*
 %{_kde4_datadir}/config.kcfg/*
 %{_datadir}/xsessions/*
 %{_kde4_docdir}/HTML/en/*
@@ -326,18 +253,28 @@
 %{_libdir}/strigi/
 %{_kde4_libdir}/libkdeinit*.so
 %{_kde4_libdir}/kconf_update_bin/*
+%{python_sitearch}/PyKDE4/plasmascript.py*
 
 %files libs
 %defattr(-,root,root,-)
 %{_kde4_libdir}/lib*.so.*
+%{_kde4_libdir}/libplasma_applet-system-monitor.so
 
 %files devel
 %defattr(-,root,root,-)
 %{_kde4_includedir}/*
 %{_kde4_libdir}/lib*.so
-%{_kde4_libdir}/kde4/devel/lib*.so
 %{_kde4_libdir}/kde4/plugins/designer/ksysguardwidgets.so
+%{_kde4_libdir}/kde4/plugins/designer/ksysguardlsofwidgets.so
+# CMake seems to change behaviour between F11's cmake (2.6.3rc5)
+# and F10's cmake (2.6.2) -- Lorenzo
+%if 0%{?fedora} > 10
+%{_kde4_libdir}/cmake/KDE4Workspace*
+%else
+%{_kde4_libdir}/KDE4Workspace*
+%endif
 %exclude %{_kde4_libdir}/libkdeinit*.so
+%exclude %{_kde4_libdir}/libplasma_applet-system-monitor.so
 
 %files wallpapers
 %defattr(-,root,root,-)
@@ -363,20 +300,105 @@
 
 
 %changelog
-* Thu Jan  8 2009 Luk???? Tinkl <ltinkl at redhat.com> KDE 4.1.4-1
-- KDE 4.1.4
+* Thu Jan 22 2009 Than Ngo <than at redhat.com> - 4.2.0-1
+- 4.2.0
+
+* Fri Jan 16 2009 Than Ngo <than at redhat.com> - 4.1.96-4
+- backport fix from trunk to allow symlinks in wallpaper theme
+
+* Wed Jan 14 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.1.96-3
+- BR: google-gadgets-devel > 0.10.5
+
+* Fri Jan 09 2009 Than Ngo <than at redhat.com> - 4.1.96-2
+- remove Provides: plasma-devel  
+
+* Wed Jan 07 2009 Than Ngo <than at redhat.com> - 4.1.96-1
+- 4.2rc1
+
+* Tue Dec 23 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.85-7
+- Obsoletes: kpowersave (kpowersave -> powerdevil upgrade path, F-11+)
+
+* Mon Dec 22 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.85-6
+- (re)enable edje, google-gadget support
+
+* Thu Dec 18 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.85-5
+- drop BR edje-devel, we need QEdje instead, which we don't have yet
+- comment out BR google-gadgets-* for now, need 0.10.4, have 0.10.3
 
-* Thu Dec 11 2008 Luk???? Tinkl <ltinkl at redhat.com> 4.1.3-7
-- fix krunner (aka minicli) not remembering command history between
-  sessions (kdebug:159510)
+* Thu Dec 18 2008 Rex Dieter <rdieter at fedoraproject.org> - 4.1.85-4
+- BR: edje-devel
+- BR: google-gadgets-devel
+
+* Tue Dec 16 2008 Rex Dieter <rdieter at fedoraproject.org> - 4.1.85-3
+- respun tarball
+
+* Fri Dec 12 2008 Rex Dieter <rdieter at fedoraproject.org> - 4.1.85-2
+- BR: PyKDE4-devel >= %%version
+
+* Thu Dec 11 2008 Than Ngo <than at redhat.com> -  4.1.85-1
+- 4.2beta2
+
+* Wed Dec 10 2008 Lorenzo Villani <lvillani at binaryhelix.net> - 4.1.82-1
+- 4.1.82
+- rebase redhat-startkde patch
+
+* Fri Dec 05 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.80-12
+- move libplasma_applet-system-monitor.so from -devel to -libs (not a symlink)
+
+* Fri Dec 05 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.80-11
+- drop devel symlink (parallel -devel) hacks, not needed anymore in this package
+
+* Tue Dec 02 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.80-10
+- keep libtaskmanager.so in libdir
+
+* Tue Dec 02 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.80-9
+- keep libweather_ion.so in libdir
+
+* Tue Dec 02 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.80-8
+- keep libplasmaclock.so in libdir
+
+* Mon Dec 01 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.80-7
+- rebuild for Python 2.6
+
+* Thu Nov 27 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.80-6
+- disable Logitech mouse KCM again until #399931 is fixed
+
+* Thu Nov 27 2008 Lorenzo Villani <lvillani at binaryhelix.net> - 4.1.80-5
+- use python_sitearch for x86_64 systems
+- kephal seems to be disabled/removed, re-adapted file lists
+
+* Tue Nov 25 2008 Than Ngo <than at redhat.com> 4.1.80-4
+- respin
 
-* Thu Nov 20 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.3-6
-- -devel: Provides: plasma-devel
+* Sun Nov 23 2008 Lorenzo Villani <lvillani at binaryhelix.net> - 4.1.80-3
+- rebase kdebase-workspace-4.1.1-show-systemsettings.patch
+- new library: Kephal -> adapt file lists
+
+* Wed Nov 19 2008 Than Ngo <than at redhat.com> 4.1.80-2
+- merged
+- drop kdebase-workspace-4.1.2-kdm-i18n.patch, it's included in upstream
+- drop kdebase-workspace-4.0.85-plasma-default-wallpaper.patch, it's included in upstream
+- drop kdebase-workspace-4.1.65-consolekit-kdm.patch
+- add kdebase-workspace-4.1.80-session-button.patch
+- add kdebase-workspace-4.1.2-ldap.patch
+
+* Wed Nov 19 2008 Lorenzo Villani <lvillani at binaryhelix.net> - 4.1.80-1
+- 4.1.80
+- BR cmake >= 2.6.2
+- make install/fast
+- drop _default_patch_fuzz 2
+- rebase startkde patch
+- rebase plasma-konsole patch
+- rebase ck-shutdown patch
+- add PyKDE4-devel, python-devel and PyQt4-devel to build plasma's python
+  scripting interface
+- BR google-gadgets-devel for google gadgets scriptengine
+- BR libusb-devel for Logitech USB support in KControl
 
-* Thu Nov 13 2008 Than Ngo <than at redhat.com> 4.1.3-5
+* Thu Nov 13 2008 Than Ngo <than at redhat.com>??4.1.3-5
 - apply upstream patch to fix X crash when disabling compositing
 
-* Wed Nov 12 2008 Than Ngo <than at redhat.com> 4.1.3-4
+* Wed Nov 12 2008 Than Ngo <than at redhat.com> 4.1.3-1
 - 4.1.3
 
 * Fri Nov 07 2008 Than Ngo <than at redhat.com> 4.1.2-14
@@ -702,7 +724,7 @@
 - Obsoletes: kdmtheme
 
 * Mon Dec 17 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.97.0-3
-- Requires: coreutils dbus-x11 xorg-x11-apps xorg-x11-utils 
+- Requires: coreutils dbus-x11 xorg-x11-apps xorg-x11-utils
             xorg-x11-server-utils (used in startkde)
 - drop pam configs that were previously moved to kde-settings
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdebase-workspace/F-9/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources	8 Jan 2009 11:50:15 -0000	1.19
+++ sources	27 Jan 2009 16:29:50 -0000	1.20
@@ -1 +1 @@
-bdac9ac8055b976845587fe544d568be  kdebase-workspace-4.1.4.tar.bz2
+193e30b9ed0b55b0196289d9df43a904  kdebase-workspace-4.2.0.tar.bz2


--- kdebase-workspace-4.0.72-plasma-konsole.patch DELETED ---


--- kdebase-workspace-4.0.80-ksysguard-onlyshowin.patch DELETED ---


--- kdebase-workspace-4.0.98-consolekit-kdm.patch DELETED ---


--- kdebase-workspace-4.0.98-kickoff-suspend.patch DELETED ---


--- kdebase-workspace-4.1.0-enable-kwin-taskbarthumbnail.patch DELETED ---


--- kdebase-workspace-4.1.0-kde#152914.patch DELETED ---


--- kdebase-workspace-4.1.0-plasma-tooltips.patch DELETED ---


--- kdebase-workspace-4.1.2-default_applets.patch DELETED ---


--- kdebase-workspace-4.1.2-multihead.patch DELETED ---


--- kdebase-workspace-4.1.2-panel-autohide-866998.patch DELETED ---


--- kdebase-workspace-4.1.2-panel-autohide-868231.patch DELETED ---


--- kdebase-workspace-4.1.2-panel-autohide-869277.patch DELETED ---


--- kdebase-workspace-4.1.2-panel-autohide-871058.patch DELETED ---


--- kdebase-workspace-4.1.2-panel-autohide-coords.patch DELETED ---


--- kdebase-workspace-4.1.2-panel-autohide-fix-flicker.patch DELETED ---


--- kdebase-workspace-4.1.2-panel-autohide.patch DELETED ---


--- kdebase-workspace-4.1.2-redhat-startkde.patch DELETED ---


--- kdebase-workspace-4.1.2-session-button.patch DELETED ---


--- kdebase-workspace-4.1.4-krunnerhistory.patch DELETED ---



From jakub at fedoraproject.org  Tue Jan 27 16:37:30 2009
From: jakub at fedoraproject.org (Jakub Jelinek)
Date: Tue, 27 Jan 2009 16:37:30 +0000 (UTC)
Subject: rpms/gcc/devel .cvsignore, 1.249, 1.250 gcc.spec, 1.10,
	1.11 gcc44-hack.patch, 1.2, 1.3 sources, 1.252, 1.253
Message-ID: <20090127163730.978757010B@cvs1.fedora.phx.redhat.com>

Author: jakub

Update of /cvs/pkgs/rpms/gcc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11695

Modified Files:
	.cvsignore gcc.spec gcc44-hack.patch sources 
Log Message:
4.4.0-0.10


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/devel/.cvsignore,v
retrieving revision 1.249
retrieving revision 1.250
diff -u -r1.249 -r1.250
--- .cvsignore	21 Jan 2009 07:10:38 -0000	1.249
+++ .cvsignore	27 Jan 2009 16:36:59 -0000	1.250
@@ -1,2 +1,3 @@
 fastjar-0.97.tar.gz
-gcc-4.4.0-20090115.tar.bz2
+gcc-4.4.0-20090127.tar.bz2
+cloog-ppl-0.15.tar.gz


Index: gcc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/devel/gcc.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- gcc.spec	21 Jan 2009 07:10:38 -0000	1.10
+++ gcc.spec	27 Jan 2009 16:37:00 -0000	1.11
@@ -1,9 +1,9 @@
-%define DATE 20090115
-%define SVNREV 141601
+%define DATE 20090127
+%define SVNREV 143703
 %define gcc_version 4.4.0
 # 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 0.9
+%define gcc_release 0.10
 %define _unpackaged_files_terminate_build 0
 %define multilib_64_archs sparc64 ppc64 s390x x86_64
 %define include_gappletviewer 1
@@ -13,6 +13,7 @@
 %define build_ada 0
 %endif
 %define build_java 1
+%define build_cloog 1
 # If you don't have already a usable gcc-java and libgcj for your arch,
 # do on some arch which has it rpmbuild -bc --with java_tar gcc41.spec
 # which creates libjava-classes-%{version}-%{release}.tar.bz2
@@ -50,6 +51,7 @@
 Source3: protoize.1
 %define fastjar_ver 0.97
 Source4: http://download.savannah.nongnu.org/releases/fastjar/fastjar-%{fastjar_ver}.tar.gz
+Source5: ftp://gcc.gnu.org/pub/gcc/infrastructure/cloog-ppl-0.15.tar.gz
 URL: http://gcc.gnu.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # Need binutils with -pie support >= 2.14.90.0.4-4
@@ -89,6 +91,9 @@
 %ifarch ia64
 BuildRequires: libunwind >= 0.98
 %endif
+%if %{build_cloog}
+BuildRequires: ppl >= 0.10, ppl-devel >= 0.10
+%endif
 Requires: cpp = %{version}-%{release}
 # Need .eh_frame ld optimizations
 # Need proper visibility support
@@ -133,6 +138,7 @@
 Patch15: gcc44-sparc-config-detection.patch
 Patch16: gcc44-libgomp-omp_h-multilib.patch
 Patch20: gcc44-libtool-no-rpath.patch
+Patch21: gcc44-cloog-dl.patch
 
 Patch1000: fastjar-0.97-segfault.patch
 
@@ -415,11 +421,17 @@
 %patch15 -p0 -b .sparc-config-detection~
 %patch16 -p0 -b .libgomp-omp_h-multilib~
 %patch20 -p0 -b .libtool-no-rpath~
+%if %{build_cloog}
+%patch21 -p0 -b .cloog-dl~
+%endif
 
 # This testcase doesn't compile.
 rm libjava/testsuite/libjava.lang/PR35020*
 
 tar xzf %{SOURCE4}
+%if %{build_cloog}
+tar xzf %{SOURCE5}
+%endif
 
 %patch1000 -p0 -b .fastjar-0.97-segfault~
 
@@ -474,6 +486,16 @@
 cd ../../
 %endif
 
+%if %{build_cloog}
+mkdir cloog-ppl/obj-%{gcc_target_platform}
+cd cloog-ppl/obj-%{gcc_target_platform}
+../configure CFLAGS="$RPM_OPT_FLAGS" --prefix=/usr --with-ppl
+make %{?_smp_mflags}
+make check || :
+make install DESTDIR=`cd ../; pwd`/inst/
+cd ../..
+%endif
+
 rm -fr obj-%{gcc_target_platform}
 mkdir obj-%{gcc_target_platform}
 cd obj-%{gcc_target_platform}
@@ -564,6 +586,9 @@
 	--with-ecj-jar=/usr/share/java/eclipse-ecj.jar \
 	--disable-libjava-multilib \
 %endif
+%if %{build_cloog}
+	--with-ppl --with-cloog=`cd ../cloog-ppl/inst/usr/; pwd` \
+%endif
 %ifarch %{arm}
 	--disable-sjlj-exceptions \
 %endif
@@ -586,10 +611,16 @@
 	--build=%{gcc_target_platform} --target=%{gcc_target_platform} --with-cpu=default32
 %endif
 %ifarch %{ix86} x86_64
-	--with-cpu=generic \
+	--with-tune=generic \
+%endif
+%ifarch %{ix86}
+	--with-arch=i586 \
+%endif
+%ifarch x86_64
+	--with-arch_32=i586 \
 %endif
 %ifarch s390 s390x
-	--with-tune=z9-109 \
+	--with-arch=z9-109 --with-tune=z10 \
 %endif
 %ifnarch sparc sparcv9 ppc
 	--build=%{gcc_target_platform}
@@ -702,6 +733,10 @@
 FULLPATH=$RPM_BUILD_ROOT%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}
 FULLEPATH=$RPM_BUILD_ROOT%{_prefix}/libexec/gcc/%{gcc_target_platform}/%{gcc_version}
 
+%if %{build_cloog}
+cp -a ../cloog-ppl/inst/usr/lib/libcloog.so.0* $FULLPATH/
+%endif
+
 # fix some things
 ln -sf gcc $RPM_BUILD_ROOT%{_prefix}/bin/cc
 mkdir -p $RPM_BUILD_ROOT/lib
@@ -1276,6 +1311,9 @@
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/libgomp.spec
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/libgomp.a
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/libgomp.so
+%if %{build_cloog}
+%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/libcloog.so.0*
+%endif
 %ifarch sparcv9 ppc
 %dir %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/64
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/64/crt*.o
@@ -1709,6 +1747,19 @@
 %doc rpm.doc/changelogs/libmudflap/ChangeLog*
 
 %changelog
+* Tue Jan 27 2009 Jakub Jelinek <jakub at redhat.com> 4.4.0-0.10
+- update from trunk
+- add graphite support
+- change gcc default ISA and tuning:
+  i386 and x86_64 -m32:
+  -march=i586 -mtune=generic from -march=i386 -mtune=generic
+  x86_64 -m64 remains at:
+  -march=x86-64 -mtune=generic
+  s390 and s390x -m31:
+  -march=z9-109 -mtune=z10 from -march=g5 -mtune=z9-109
+  s390x -m64:
+  -march=z9-109 -mtune=z10 from -march=z900 -mtune=z9-109
+
 * Wed Jan 21 2009 Jakub Jelinek <jakub at redhat.com> 4.4.0-0.9
 - rebuilt without ppc64 ada bootstrap hacks
 

gcc44-hack.patch:

Index: gcc44-hack.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/devel/gcc44-hack.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gcc44-hack.patch	17 Jan 2009 00:44:35 -0000	1.2
+++ gcc44-hack.patch	27 Jan 2009 16:37:00 -0000	1.3
@@ -111,14 +111,3 @@
           then
              Add_Switch (Argv, Compiler, And_Save => And_Save);
              Add_Switch (Argv, Linker, And_Save => And_Save);
---- gcc/ada/gcc-interface/Makefile.in.jj	2009-01-02 19:54:27.000000000 +0100
-+++ gcc/ada/gcc-interface/Makefile.in	2009-01-16 18:56:29.848954175 +0100
-@@ -1492,7 +1492,7 @@ ifeq ($(strip $(filter-out powerpc% linu
-   LIBGNAT_TARGET_PAIRS_64 = \
-   system.ads<system-linux-ppc64.ads
- 
--  ifeq ($(strip $(MULTISUBDIR)),/64)
-+  ifeq ($(strip $(shell $(GCC_FOR_TARGET) $(GNATLIBCFLAGS) -print-multi-os-directory)),../lib64)
-     LIBGNAT_TARGET_PAIRS = \
-     $(LIBGNAT_TARGET_PAIRS_COMMON) $(LIBGNAT_TARGET_PAIRS_64)
-   else


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/devel/sources,v
retrieving revision 1.252
retrieving revision 1.253
diff -u -r1.252 -r1.253
--- sources	21 Jan 2009 07:10:38 -0000	1.252
+++ sources	27 Jan 2009 16:37:00 -0000	1.253
@@ -1,2 +1,3 @@
 2659f09c2e43ef8b7d4406321753f1b2  fastjar-0.97.tar.gz
-0fafcb0d23d420c978ab253702094ada  gcc-4.4.0-20090115.tar.bz2
+e5996e03cb7f5da8251e2a4deb87bc87  gcc-4.4.0-20090127.tar.bz2
+716b7a0823f96c9d02c1703a9c47d387  cloog-ppl-0.15.tar.gz



From mgrepl at fedoraproject.org  Tue Jan 27 16:44:32 2009
From: mgrepl at fedoraproject.org (Miroslav Grepl)
Date: Tue, 27 Jan 2009 16:44:32 +0000 (UTC)
Subject: rpms/selinux-policy/F-10 policy-20080710.patch,1.128,1.129
Message-ID: <20090127164432.BEDA57010B@cvs1.fedora.phx.redhat.com>

Author: mgrepl

Update of /cvs/extras/rpms/selinux-policy/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12814

Modified Files:
	policy-20080710.patch 
Log Message:
- Fix hald_acl_t to be able to getattr on mouse devices.



policy-20080710.patch:

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.128 -r 1.129 policy-20080710.patch
Index: policy-20080710.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-10/policy-20080710.patch,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -r1.128 -r1.129
--- policy-20080710.patch	27 Jan 2009 15:31:15 -0000	1.128
+++ policy-20080710.patch	27 Jan 2009 16:44:31 -0000	1.129
@@ -1,6 +1,6 @@
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/default_contexts serefpolicy-3.5.13/config/appconfig-mcs/default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/default_contexts	2008-10-17 14:49:10.000000000 +0200
-+++ serefpolicy-3.5.13/config/appconfig-mcs/default_contexts	2009-01-27 10:32:26.000000000 +0100
++++ serefpolicy-3.5.13/config/appconfig-mcs/default_contexts	2009-01-27 16:42:54.000000000 +0100
 @@ -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
@@ -24,13 +24,13 @@
 +system_r:xdm_t:s0		user_r:user_t:s0
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/failsafe_context serefpolicy-3.5.13/config/appconfig-mcs/failsafe_context
 --- nsaserefpolicy/config/appconfig-mcs/failsafe_context	2008-10-17 14:49:10.000000000 +0200
-+++ serefpolicy-3.5.13/config/appconfig-mcs/failsafe_context	2009-01-27 10:32:26.000000000 +0100
++++ serefpolicy-3.5.13/config/appconfig-mcs/failsafe_context	2009-01-27 16:42:54.000000000 +0100
 @@ -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.5.13/config/appconfig-mcs/guest_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/guest_u_default_contexts	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.5.13/config/appconfig-mcs/guest_u_default_contexts	2009-01-27 10:32:26.000000000 +0100
++++ serefpolicy-3.5.13/config/appconfig-mcs/guest_u_default_contexts	2009-01-27 16:42:54.000000000 +0100
 @@ -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
@@ -40,7 +40,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.5.13/config/appconfig-mcs/root_default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/root_default_contexts	2008-10-17 14:49:10.000000000 +0200
-+++ serefpolicy-3.5.13/config/appconfig-mcs/root_default_contexts	2009-01-27 10:32:26.000000000 +0100
++++ serefpolicy-3.5.13/config/appconfig-mcs/root_default_contexts	2009-01-27 16:42:54.000000000 +0100
 @@ -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
@@ -57,7 +57,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/seusers serefpolicy-3.5.13/config/appconfig-mcs/seusers
 --- nsaserefpolicy/config/appconfig-mcs/seusers	2008-10-17 14:49:10.000000000 +0200
-+++ serefpolicy-3.5.13/config/appconfig-mcs/seusers	2009-01-27 10:32:26.000000000 +0100
++++ serefpolicy-3.5.13/config/appconfig-mcs/seusers	2009-01-27 16:42:54.000000000 +0100
 @@ -1,3 +1,3 @@
  system_u:system_u:s0-mcs_systemhigh
 -root:root:s0-mcs_systemhigh
@@ -66,7 +66,7 @@
 +__default__:unconfined_u:s0-mcs_systemhigh
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/staff_u_default_contexts serefpolicy-3.5.13/config/appconfig-mcs/staff_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/staff_u_default_contexts	2008-10-17 14:49:10.000000000 +0200
-+++ serefpolicy-3.5.13/config/appconfig-mcs/staff_u_default_contexts	2009-01-27 10:32:26.000000000 +0100
++++ serefpolicy-3.5.13/config/appconfig-mcs/staff_u_default_contexts	2009-01-27 16:42:54.000000000 +0100
 @@ -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
@@ -83,7 +83,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/unconfined_u_default_contexts serefpolicy-3.5.13/config/appconfig-mcs/unconfined_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/unconfined_u_default_contexts	2008-10-17 14:49:10.000000000 +0200
-+++ serefpolicy-3.5.13/config/appconfig-mcs/unconfined_u_default_contexts	2009-01-27 10:32:26.000000000 +0100
++++ serefpolicy-3.5.13/config/appconfig-mcs/unconfined_u_default_contexts	2009-01-27 16:42:54.000000000 +0100
 @@ -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
@@ -93,13 +93,13 @@
  system_r:xdm_t:s0		unconfined_r:unconfined_t:s0
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/userhelper_context serefpolicy-3.5.13/config/appconfig-mcs/userhelper_context
 --- nsaserefpolicy/config/appconfig-mcs/userhelper_context	2008-10-17 14:49:10.000000000 +0200
-+++ serefpolicy-3.5.13/config/appconfig-mcs/userhelper_context	2009-01-27 10:32:26.000000000 +0100
++++ serefpolicy-3.5.13/config/appconfig-mcs/userhelper_context	2009-01-27 16:42:54.000000000 +0100
 @@ -1 +1 @@
 -system_u:sysadm_r:sysadm_t:s0
 +system_u:system_r:unconfined_t:s0	
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/user_u_default_contexts serefpolicy-3.5.13/config/appconfig-mcs/user_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/user_u_default_contexts	2008-10-17 14:49:10.000000000 +0200
-+++ serefpolicy-3.5.13/config/appconfig-mcs/user_u_default_contexts	2009-01-27 10:32:26.000000000 +0100
++++ serefpolicy-3.5.13/config/appconfig-mcs/user_u_default_contexts	2009-01-27 16:42:54.000000000 +0100
 @@ -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
@@ -114,7 +114,7 @@
 +user_r:user_t:s0		user_r:user_t:s0
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/xguest_u_default_contexts serefpolicy-3.5.13/config/appconfig-mcs/xguest_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/xguest_u_default_contexts	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.5.13/config/appconfig-mcs/xguest_u_default_contexts	2009-01-27 10:32:26.000000000 +0100
++++ serefpolicy-3.5.13/config/appconfig-mcs/xguest_u_default_contexts	2009-01-27 16:42:54.000000000 +0100
 @@ -0,0 +1,7 @@
 +system_r:local_login_t	xguest_r:xguest_t:s0
 +system_r:remote_login_t	xguest_r:xguest_t:s0
@@ -125,7 +125,7 @@
 +xguest_r:xguest_t:s0	xguest_r:xguest_t:s0
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/default_contexts serefpolicy-3.5.13/config/appconfig-mls/default_contexts
 --- nsaserefpolicy/config/appconfig-mls/default_contexts	2008-10-17 14:49:10.000000000 +0200
-+++ serefpolicy-3.5.13/config/appconfig-mls/default_contexts	2009-01-27 10:32:26.000000000 +0100
++++ serefpolicy-3.5.13/config/appconfig-mls/default_contexts	2009-01-27 16:42:54.000000000 +0100
 @@ -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
@@ -149,7 +149,7 @@
 +system_r:xdm_t:s0		user_r:user_t:s0
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/guest_u_default_contexts serefpolicy-3.5.13/config/appconfig-mls/guest_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mls/guest_u_default_contexts	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.5.13/config/appconfig-mls/guest_u_default_contexts	2009-01-27 10:32:26.000000000 +0100
++++ serefpolicy-3.5.13/config/appconfig-mls/guest_u_default_contexts	2009-01-27 16:42:54.000000000 +0100
 @@ -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
@@ -157,7 +157,7 @@
 +system_r:crond_t:s0		guest_r:guest_t:s0
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/root_default_contexts serefpolicy-3.5.13/config/appconfig-mls/root_default_contexts
 --- nsaserefpolicy/config/appconfig-mls/root_default_contexts	2008-10-17 14:49:10.000000000 +0200
-+++ serefpolicy-3.5.13/config/appconfig-mls/root_default_contexts	2009-01-27 10:32:26.000000000 +0100
++++ serefpolicy-3.5.13/config/appconfig-mls/root_default_contexts	2009-01-27 16:42:54.000000000 +0100
 @@ -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
@@ -178,7 +178,7 @@
 +#system_r:sshd_t:s0		sysadm_r:sysadm_t:s0 staff_r:staff_t:s0
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/staff_u_default_contexts serefpolicy-3.5.13/config/appconfig-mls/staff_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mls/staff_u_default_contexts	2008-10-17 14:49:10.000000000 +0200
-+++ serefpolicy-3.5.13/config/appconfig-mls/staff_u_default_contexts	2009-01-27 10:32:26.000000000 +0100
++++ serefpolicy-3.5.13/config/appconfig-mls/staff_u_default_contexts	2009-01-27 16:42:54.000000000 +0100
 @@ -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
@@ -190,7 +190,7 @@
  staff_r:staff_sudo_t:s0		staff_r:staff_t:s0
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/user_u_default_contexts serefpolicy-3.5.13/config/appconfig-mls/user_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mls/user_u_default_contexts	2008-10-17 14:49:10.000000000 +0200
-+++ serefpolicy-3.5.13/config/appconfig-mls/user_u_default_contexts	2009-01-27 10:32:26.000000000 +0100
++++ serefpolicy-3.5.13/config/appconfig-mls/user_u_default_contexts	2009-01-27 16:42:54.000000000 +0100
 @@ -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
@@ -202,7 +202,7 @@
  user_r:user_sudo_t:s0		user_r:user_t:s0
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/xguest_u_default_contexts serefpolicy-3.5.13/config/appconfig-mls/xguest_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mls/xguest_u_default_contexts	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.5.13/config/appconfig-mls/xguest_u_default_contexts	2009-01-27 10:32:26.000000000 +0100
++++ serefpolicy-3.5.13/config/appconfig-mls/xguest_u_default_contexts	2009-01-27 16:42:54.000000000 +0100
 @@ -0,0 +1,7 @@
 +system_r:local_login_t	xguest_r:xguest_t:s0
 +system_r:remote_login_t	xguest_r:xguest_t:s0
@@ -213,7 +213,7 @@
 +xguest_r:xguest_t:s0	xguest_r:xguest_t:s0
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-standard/guest_u_default_contexts serefpolicy-3.5.13/config/appconfig-standard/guest_u_default_contexts
 --- nsaserefpolicy/config/appconfig-standard/guest_u_default_contexts	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.5.13/config/appconfig-standard/guest_u_default_contexts	2009-01-27 10:32:26.000000000 +0100
++++ serefpolicy-3.5.13/config/appconfig-standard/guest_u_default_contexts	2009-01-27 16:42:54.000000000 +0100
 @@ -0,0 +1,4 @@
 +system_r:local_login_t	guest_r:guest_t
 +system_r:remote_login_t	guest_r:guest_t
@@ -221,7 +221,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.5.13/config/appconfig-standard/root_default_contexts
 --- nsaserefpolicy/config/appconfig-standard/root_default_contexts	2008-10-17 14:49:10.000000000 +0200
-+++ serefpolicy-3.5.13/config/appconfig-standard/root_default_contexts	2009-01-27 10:32:26.000000000 +0100
++++ serefpolicy-3.5.13/config/appconfig-standard/root_default_contexts	2009-01-27 16:42:54.000000000 +0100
 @@ -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
@@ -237,7 +237,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/staff_u_default_contexts serefpolicy-3.5.13/config/appconfig-standard/staff_u_default_contexts
 --- nsaserefpolicy/config/appconfig-standard/staff_u_default_contexts	2008-10-17 14:49:10.000000000 +0200
-+++ serefpolicy-3.5.13/config/appconfig-standard/staff_u_default_contexts	2009-01-27 10:32:26.000000000 +0100
++++ serefpolicy-3.5.13/config/appconfig-standard/staff_u_default_contexts	2009-01-27 16:42:54.000000000 +0100
 @@ -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
@@ -249,7 +249,7 @@
  staff_r:staff_sudo_t		staff_r:staff_t
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-standard/user_u_default_contexts serefpolicy-3.5.13/config/appconfig-standard/user_u_default_contexts
 --- nsaserefpolicy/config/appconfig-standard/user_u_default_contexts	2008-10-17 14:49:10.000000000 +0200
-+++ serefpolicy-3.5.13/config/appconfig-standard/user_u_default_contexts	2009-01-27 10:32:26.000000000 +0100
++++ serefpolicy-3.5.13/config/appconfig-standard/user_u_default_contexts	2009-01-27 16:42:54.000000000 +0100
 @@ -1,7 +1,7 @@
  system_r:local_login_t		user_r:user_t
  system_r:remote_login_t		user_r:user_t
@@ -261,7 +261,7 @@
  user_r:user_sudo_t		user_r:user_t
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-standard/xguest_u_default_contexts serefpolicy-3.5.13/config/appconfig-standard/xguest_u_default_contexts
 --- nsaserefpolicy/config/appconfig-standard/xguest_u_default_contexts	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.5.13/config/appconfig-standard/xguest_u_default_contexts	2009-01-27 10:32:26.000000000 +0100
++++ serefpolicy-3.5.13/config/appconfig-standard/xguest_u_default_contexts	2009-01-27 16:42:54.000000000 +0100
 @@ -0,0 +1,5 @@
 +system_r:local_login_t	xguest_r:xguest_t
 +system_r:remote_login_t	xguest_r:xguest_t
@@ -270,7 +270,7 @@
 +system_r:xdm_t		xguest_r:xguest_t
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/Makefile serefpolicy-3.5.13/Makefile
 --- nsaserefpolicy/Makefile	2008-10-17 14:49:11.000000000 +0200
-+++ serefpolicy-3.5.13/Makefile	2009-01-27 10:32:26.000000000 +0100
++++ serefpolicy-3.5.13/Makefile	2009-01-27 16:42:54.000000000 +0100
 @@ -311,20 +311,22 @@
  
[...3432 lines suppressed...]
  
  ########################################
@@ -32764,7 +32765,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.te serefpolicy-3.5.13/policy/modules/system/selinuxutil.te
 --- nsaserefpolicy/policy/modules/system/selinuxutil.te	2008-10-17 14:49:13.000000000 +0200
-+++ serefpolicy-3.5.13/policy/modules/system/selinuxutil.te	2009-01-27 10:32:26.000000000 +0100
++++ serefpolicy-3.5.13/policy/modules/system/selinuxutil.te	2009-01-27 16:42:54.000000000 +0100
 @@ -23,6 +23,9 @@
  type selinux_config_t;
  files_type(selinux_config_t)
@@ -33121,7 +33122,7 @@
  ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/setrans.if serefpolicy-3.5.13/policy/modules/system/setrans.if
 --- nsaserefpolicy/policy/modules/system/setrans.if	2008-10-17 14:49:13.000000000 +0200
-+++ serefpolicy-3.5.13/policy/modules/system/setrans.if	2009-01-27 10:32:26.000000000 +0100
++++ serefpolicy-3.5.13/policy/modules/system/setrans.if	2009-01-27 16:42:54.000000000 +0100
 @@ -21,3 +21,23 @@
  	stream_connect_pattern($1,setrans_var_run_t,setrans_var_run_t,setrans_t)
  	files_list_pids($1)
@@ -33148,7 +33149,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/sysnetwork.fc serefpolicy-3.5.13/policy/modules/system/sysnetwork.fc
 --- nsaserefpolicy/policy/modules/system/sysnetwork.fc	2008-10-17 14:49:13.000000000 +0200
-+++ serefpolicy-3.5.13/policy/modules/system/sysnetwork.fc	2009-01-27 10:32:26.000000000 +0100
++++ serefpolicy-3.5.13/policy/modules/system/sysnetwork.fc	2009-01-27 16:42:54.000000000 +0100
 @@ -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)
@@ -33173,7 +33174,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.5.13/policy/modules/system/sysnetwork.if
 --- nsaserefpolicy/policy/modules/system/sysnetwork.if	2008-10-17 14:49:13.000000000 +0200
-+++ serefpolicy-3.5.13/policy/modules/system/sysnetwork.if	2009-01-27 10:32:26.000000000 +0100
++++ serefpolicy-3.5.13/policy/modules/system/sysnetwork.if	2009-01-27 16:42:54.000000000 +0100
 @@ -198,7 +198,25 @@
  		type dhcpc_state_t;
  	')
@@ -33285,7 +33286,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/sysnetwork.te serefpolicy-3.5.13/policy/modules/system/sysnetwork.te
 --- nsaserefpolicy/policy/modules/system/sysnetwork.te	2008-10-17 14:49:13.000000000 +0200
-+++ serefpolicy-3.5.13/policy/modules/system/sysnetwork.te	2009-01-27 10:32:26.000000000 +0100
++++ serefpolicy-3.5.13/policy/modules/system/sysnetwork.te	2009-01-27 16:42:54.000000000 +0100
 @@ -20,6 +20,9 @@
  init_daemon_domain(dhcpc_t,dhcpc_exec_t)
  role system_r types dhcpc_t;
@@ -33475,7 +33476,7 @@
  	xen_append_log(ifconfig_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/udev.fc serefpolicy-3.5.13/policy/modules/system/udev.fc
 --- nsaserefpolicy/policy/modules/system/udev.fc	2008-10-17 14:49:13.000000000 +0200
-+++ serefpolicy-3.5.13/policy/modules/system/udev.fc	2009-01-27 10:32:26.000000000 +0100
++++ serefpolicy-3.5.13/policy/modules/system/udev.fc	2009-01-27 16:42:54.000000000 +0100
 @@ -13,8 +13,11 @@
  /sbin/start_udev --	gen_context(system_u:object_r:udev_exec_t,s0)
  /sbin/udev	--	gen_context(system_u:object_r:udev_exec_t,s0)
@@ -33490,7 +33491,7 @@
 +/var/run/PackageKit/udev(/.*)?		gen_context(system_u:object_r:udev_var_run_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/udev.if serefpolicy-3.5.13/policy/modules/system/udev.if
 --- nsaserefpolicy/policy/modules/system/udev.if	2008-10-17 14:49:13.000000000 +0200
-+++ serefpolicy-3.5.13/policy/modules/system/udev.if	2009-01-27 10:32:26.000000000 +0100
++++ serefpolicy-3.5.13/policy/modules/system/udev.if	2009-01-27 16:42:54.000000000 +0100
 @@ -96,6 +96,24 @@
  
  ########################################
@@ -33546,7 +33547,7 @@
  ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/udev.te serefpolicy-3.5.13/policy/modules/system/udev.te
 --- nsaserefpolicy/policy/modules/system/udev.te	2008-10-17 14:49:13.000000000 +0200
-+++ serefpolicy-3.5.13/policy/modules/system/udev.te	2009-01-27 10:32:26.000000000 +0100
++++ serefpolicy-3.5.13/policy/modules/system/udev.te	2009-01-27 16:42:54.000000000 +0100
 @@ -83,6 +83,7 @@
  kernel_rw_unix_dgram_sockets(udev_t)
  kernel_dgram_send(udev_t)
@@ -33605,7 +33606,7 @@
  ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.fc serefpolicy-3.5.13/policy/modules/system/unconfined.fc
 --- nsaserefpolicy/policy/modules/system/unconfined.fc	2008-10-17 14:49:13.000000000 +0200
-+++ serefpolicy-3.5.13/policy/modules/system/unconfined.fc	2009-01-27 10:32:26.000000000 +0100
++++ serefpolicy-3.5.13/policy/modules/system/unconfined.fc	2009-01-27 16:42:54.000000000 +0100
 @@ -2,15 +2,31 @@
  # e.g.:
  # /usr/local/bin/appsrv		--	gen_context(system_u:object_r:unconfined_exec_t,s0)
@@ -33649,7 +33650,7 @@
 +#/usr/lib(64)?/gcl-[^/]+/unixport/saved_.* 	--	gen_context(system_u:object_r:execmem_exec_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.if serefpolicy-3.5.13/policy/modules/system/unconfined.if
 --- nsaserefpolicy/policy/modules/system/unconfined.if	2008-10-17 14:49:13.000000000 +0200
-+++ serefpolicy-3.5.13/policy/modules/system/unconfined.if	2009-01-27 10:32:26.000000000 +0100
++++ serefpolicy-3.5.13/policy/modules/system/unconfined.if	2009-01-27 16:42:54.000000000 +0100
 @@ -12,14 +12,13 @@
  #
  interface(`unconfined_domain_noaudit',`
@@ -33999,7 +34000,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.te serefpolicy-3.5.13/policy/modules/system/unconfined.te
 --- nsaserefpolicy/policy/modules/system/unconfined.te	2008-10-17 14:49:13.000000000 +0200
-+++ serefpolicy-3.5.13/policy/modules/system/unconfined.te	2009-01-27 10:32:26.000000000 +0100
++++ serefpolicy-3.5.13/policy/modules/system/unconfined.te	2009-01-27 16:42:54.000000000 +0100
 @@ -6,35 +6,77 @@
  # Declarations
  #
@@ -34364,7 +34365,7 @@
 +gen_user(unconfined_u, user, unconfined_r system_r, s0, s0 - mls_systemhigh, mcs_allcats)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.fc serefpolicy-3.5.13/policy/modules/system/userdomain.fc
 --- nsaserefpolicy/policy/modules/system/userdomain.fc	2008-10-17 14:49:13.000000000 +0200
-+++ serefpolicy-3.5.13/policy/modules/system/userdomain.fc	2009-01-27 10:32:26.000000000 +0100
++++ serefpolicy-3.5.13/policy/modules/system/userdomain.fc	2009-01-27 16:42:54.000000000 +0100
 @@ -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)
@@ -34377,7 +34378,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.5.13/policy/modules/system/userdomain.if
 --- nsaserefpolicy/policy/modules/system/userdomain.if	2008-10-17 14:49:13.000000000 +0200
-+++ serefpolicy-3.5.13/policy/modules/system/userdomain.if	2009-01-27 10:32:26.000000000 +0100
++++ serefpolicy-3.5.13/policy/modules/system/userdomain.if	2009-01-27 16:42:54.000000000 +0100
 @@ -28,10 +28,14 @@
  		class context contains;
  	')
@@ -37130,7 +37131,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-3.5.13/policy/modules/system/userdomain.te
 --- nsaserefpolicy/policy/modules/system/userdomain.te	2008-10-17 14:49:13.000000000 +0200
-+++ serefpolicy-3.5.13/policy/modules/system/userdomain.te	2009-01-27 10:32:26.000000000 +0100
++++ serefpolicy-3.5.13/policy/modules/system/userdomain.te	2009-01-27 16:42:54.000000000 +0100
 @@ -8,13 +8,6 @@
  
  ## <desc>
@@ -37250,7 +37251,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.fc serefpolicy-3.5.13/policy/modules/system/xen.fc
 --- nsaserefpolicy/policy/modules/system/xen.fc	2008-10-17 14:49:13.000000000 +0200
-+++ serefpolicy-3.5.13/policy/modules/system/xen.fc	2009-01-27 10:32:26.000000000 +0100
++++ serefpolicy-3.5.13/policy/modules/system/xen.fc	2009-01-27 16:42:54.000000000 +0100
 @@ -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)
@@ -37261,7 +37262,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.if serefpolicy-3.5.13/policy/modules/system/xen.if
 --- nsaserefpolicy/policy/modules/system/xen.if	2008-10-17 14:49:13.000000000 +0200
-+++ serefpolicy-3.5.13/policy/modules/system/xen.if	2009-01-27 10:32:26.000000000 +0100
++++ serefpolicy-3.5.13/policy/modules/system/xen.if	2009-01-27 16:42:54.000000000 +0100
 @@ -155,7 +155,7 @@
  	stream_connect_pattern($1,xenstored_var_run_t,xenstored_var_run_t,xenstored_t)
  ')
@@ -37314,7 +37315,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.te serefpolicy-3.5.13/policy/modules/system/xen.te
 --- nsaserefpolicy/policy/modules/system/xen.te	2008-10-17 14:49:13.000000000 +0200
-+++ serefpolicy-3.5.13/policy/modules/system/xen.te	2009-01-27 10:32:26.000000000 +0100
++++ serefpolicy-3.5.13/policy/modules/system/xen.te	2009-01-27 16:42:54.000000000 +0100
 @@ -6,6 +6,13 @@
  # Declarations
  #
@@ -37548,7 +37549,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/policy_capabilities serefpolicy-3.5.13/policy/policy_capabilities
 --- nsaserefpolicy/policy/policy_capabilities	2008-10-17 14:49:14.000000000 +0200
-+++ serefpolicy-3.5.13/policy/policy_capabilities	2009-01-27 10:32:26.000000000 +0100
++++ serefpolicy-3.5.13/policy/policy_capabilities	2009-01-27 16:42:54.000000000 +0100
 @@ -29,4 +29,4 @@
  # chr_file: open
  # blk_file: open
@@ -37557,7 +37558,7 @@
 +#policycap open_perms;
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/support/obj_perm_sets.spt serefpolicy-3.5.13/policy/support/obj_perm_sets.spt
 --- nsaserefpolicy/policy/support/obj_perm_sets.spt	2008-10-17 14:49:14.000000000 +0200
-+++ serefpolicy-3.5.13/policy/support/obj_perm_sets.spt	2009-01-27 10:32:26.000000000 +0100
++++ serefpolicy-3.5.13/policy/support/obj_perm_sets.spt	2009-01-27 16:42:54.000000000 +0100
 @@ -59,22 +59,22 @@
  # 
  # Permissions for executing files.
@@ -37707,7 +37708,7 @@
 +define(`manage_key_perms', `{ create link read search setattr view write } ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/users serefpolicy-3.5.13/policy/users
 --- nsaserefpolicy/policy/users	2008-10-17 14:49:11.000000000 +0200
-+++ serefpolicy-3.5.13/policy/users	2009-01-27 10:32:26.000000000 +0100
++++ serefpolicy-3.5.13/policy/users	2009-01-27 16:42:54.000000000 +0100
 @@ -25,11 +25,8 @@
  # permit any access to such users, then remove this entry.
  #
@@ -37734,7 +37735,7 @@
 +gen_user(root, user, unconfined_r sysadm_r staff_r ifdef(`enable_mls',`secadm_r auditadm_r') system_r, s0, s0 - mls_systemhigh, mcs_allcats)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/Rules.modular serefpolicy-3.5.13/Rules.modular
 --- nsaserefpolicy/Rules.modular	2008-10-17 14:49:14.000000000 +0200
-+++ serefpolicy-3.5.13/Rules.modular	2009-01-27 10:32:26.000000000 +0100
++++ serefpolicy-3.5.13/Rules.modular	2009-01-27 16:42:54.000000000 +0100
 @@ -73,8 +73,8 @@
  $(tmpdir)/%.mod: $(m4support) $(tmpdir)/generated_definitions.conf $(tmpdir)/all_interfaces.conf %.te
  	@echo "Compliling $(NAME) $(@F) module"
@@ -37783,7 +37784,7 @@
  $(appdir)/customizable_types: $(base_conf)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/support/Makefile.devel serefpolicy-3.5.13/support/Makefile.devel
 --- nsaserefpolicy/support/Makefile.devel	2008-10-17 14:49:14.000000000 +0200
-+++ serefpolicy-3.5.13/support/Makefile.devel	2009-01-27 10:32:26.000000000 +0100
++++ serefpolicy-3.5.13/support/Makefile.devel	2009-01-27 16:42:54.000000000 +0100
 @@ -181,8 +181,7 @@
  tmp/%.mod: $(m4support) tmp/all_interfaces.conf %.te
  	@$(EINFO) "Compiling $(NAME) $(basename $(@F)) module"



From jakub at fedoraproject.org  Tue Jan 27 16:46:00 2009
From: jakub at fedoraproject.org (Jakub Jelinek)
Date: Tue, 27 Jan 2009 16:46:00 +0000 (UTC)
Subject: rpms/gcc/devel gcc44-cloog-dl.patch,NONE,1.1
Message-ID: <20090127164600.D6BC67010B@cvs1.fedora.phx.redhat.com>

Author: jakub

Update of /cvs/pkgs/rpms/gcc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13304

Added Files:
	gcc44-cloog-dl.patch 
Log Message:
gcc44-cloog-dl.patch

gcc44-cloog-dl.patch:

--- NEW FILE gcc44-cloog-dl.patch ---
2009-01-27  Jakub Jelinek  <jakub at redhat.com>

	* toplev.c (save_argv): No longer static.
	* Makefile.in (BACKENDLIBS): Link against -ldl instead of -lcloog -lppl.
	* graphite.c: Include <dlfcn.h>.  Reference libcloog and libppl symbols
	through pointers in cloog_pointers variable.
	(init_cloog_pointers): New function.
	(gcc_type_for_iv_of_clast_loop): Rename stmt_for argument to stmt_fora.
	(graphite_transform_loops): Call init_cloog_pointers.

--- gcc/toplev.c.jj	2008-12-09 23:59:10.000000000 +0100
+++ gcc/toplev.c	2009-01-27 14:33:52.000000000 +0100
@@ -128,7 +128,7 @@ static bool no_backend;
 const char *progname;
 
 /* Copy of argument vector to toplev_main.  */
-static const char **save_argv;
+const char **save_argv;
 
 /* Name of top-level original source file (what was input to cpp).
    This comes from the #-command at the beginning of the actual input.
--- gcc/Makefile.in.jj	2009-01-26 20:50:38.000000000 +0100
+++ gcc/Makefile.in	2009-01-27 14:18:10.000000000 +0100
@@ -915,7 +915,7 @@ BUILD_LIBDEPS= $(BUILD_LIBIBERTY)
 # How to link with both our special library facilities
 # and the system's installed libraries.
 LIBS = @LIBS@ $(CPPLIB) $(LIBINTL) $(LIBICONV) $(LIBIBERTY) $(LIBDECNUMBER)
-BACKENDLIBS = $(CLOOGLIBS) $(PPLLIBS) $(GMPLIBS)
+BACKENDLIBS = $(GMPLIBS) $(if $(CLOOGLIBS),-ldl)
 # Any system libraries needed just for GNAT.
 SYSLIBS = @GNAT_LIBEXC@
 
--- gcc/graphite.c.jj	2009-01-24 19:59:02.000000000 +0100
+++ gcc/graphite.c	2009-01-27 14:52:08.000000000 +0100
@@ -59,6 +59,138 @@ along with GCC; see the file COPYING3.  
 #include "cloog/cloog.h"
 #include "graphite.h"
 
+#include <dlfcn.h>
+#define DYNSYMS \
+  DYNSYM (cloog_block_alloc); \
+  DYNSYM (cloog_block_list_free); \
+  DYNSYM (cloog_block_list_malloc); \
+  DYNSYM (cloog_clast_create); \
+  DYNSYM (cloog_clast_free); \
+  DYNSYM (cloog_domain_free); \
+  DYNSYM (cloog_domain_matrix2domain); \
+  DYNSYM (cloog_initialize); \
+  DYNSYM (cloog_loop_malloc); \
+  DYNSYM (cloog_matrix_alloc); \
+  DYNSYM (cloog_matrix_copy); \
+  DYNSYM (cloog_matrix_free); \
+  DYNSYM (cloog_matrix_print); \
+  DYNSYM (cloog_names_malloc); \
+  DYNSYM (cloog_names_scalarize); \
+  DYNSYM (cloog_options_free); \
+  DYNSYM (cloog_options_malloc); \
+  DYNSYM (cloog_program_dump_cloog); \
+  DYNSYM (cloog_program_extract_scalars); \
+  DYNSYM (cloog_program_free); \
+  DYNSYM (cloog_program_generate); \
+  DYNSYM (cloog_program_malloc); \
+  DYNSYM (cloog_program_print); \
+  DYNSYM (cloog_program_scatter); \
+  DYNSYM (cloog_statement_alloc); \
+  DYNSYM (ppl_finalize); \
+  DYNSYM (pprint); \
+  DYNSYM (stmt_block); \
+  DYNSYM (stmt_for); \
+  DYNSYM (stmt_guard); \
+  DYNSYM (stmt_root); \
+  DYNSYM (stmt_user);
+static struct
+{
+  bool inited;
+  void *h;
+#define DYNSYM(x) __typeof (x) *p_##x
+  DYNSYMS
+#undef DYNSYM
+} cloog_pointers;
+
+#define cloog_block_alloc (*cloog_pointers.p_cloog_block_alloc)
+#define cloog_block_list_free (*cloog_pointers.p_cloog_block_list_free)
+#define cloog_block_list_malloc (*cloog_pointers.p_cloog_block_list_malloc)
+#define cloog_clast_create (*cloog_pointers.p_cloog_clast_create)
+#define cloog_clast_free (*cloog_pointers.p_cloog_clast_free)
+#define cloog_domain_free (*cloog_pointers.p_cloog_domain_free)
+#define cloog_domain_matrix2domain (*cloog_pointers.p_cloog_domain_matrix2domain)
+#define cloog_initialize (*cloog_pointers.p_cloog_initialize)
+#define cloog_loop_malloc (*cloog_pointers.p_cloog_loop_malloc)
+#define cloog_matrix_alloc (*cloog_pointers.p_cloog_matrix_alloc)
+#define cloog_matrix_copy (*cloog_pointers.p_cloog_matrix_copy)
+#define cloog_matrix_free (*cloog_pointers.p_cloog_matrix_free)
+#define cloog_matrix_print (*cloog_pointers.p_cloog_matrix_print)
+#define cloog_names_malloc (*cloog_pointers.p_cloog_names_malloc)
+#define cloog_names_scalarize (*cloog_pointers.p_cloog_names_scalarize)
+#define cloog_options_free (*cloog_pointers.p_cloog_options_free)
+#define cloog_options_malloc (*cloog_pointers.p_cloog_options_malloc)
+#define cloog_program_dump_cloog (*cloog_pointers.p_cloog_program_dump_cloog)
+#define cloog_program_extract_scalars (*cloog_pointers.p_cloog_program_extract_scalars)
+#define cloog_program_free (*cloog_pointers.p_cloog_program_free)
+#define cloog_program_generate (*cloog_pointers.p_cloog_program_generate)
+#define cloog_program_malloc (*cloog_pointers.p_cloog_program_malloc)
+#define cloog_program_print (*cloog_pointers.p_cloog_program_print)
+#define cloog_program_scatter (*cloog_pointers.p_cloog_program_scatter)
+#define cloog_statement_alloc (*cloog_pointers.p_cloog_statement_alloc)
+#define ppl_finalize (*cloog_pointers.p_ppl_finalize)
+#define pprint (*cloog_pointers.p_pprint)
+#define stmt_block (*cloog_pointers.p_stmt_block)
+#define stmt_for (*cloog_pointers.p_stmt_for)
+#define stmt_guard (*cloog_pointers.p_stmt_guard)
+#define stmt_root (*cloog_pointers.p_stmt_root)
+#define stmt_user (*cloog_pointers.p_stmt_user)
+
+#define cloog_finalize (*cloog_pointers.p_ppl_finalize)
+
+static bool
+init_cloog_pointers (void)
+{
+  void *h = NULL;
+  extern const char **save_argv;
+  char *buf, *p;
+  size_t len;
+
+  if (cloog_pointers.inited)
+    return cloog_pointers.h != NULL;
+  len = progname - save_argv[0];
+  buf = XALLOCAVAR (char, len + sizeof "libcloog.so.0");
+  memcpy (buf, save_argv[0], len);
+  strcpy (buf + len, "libcloog.so.0");
+  len += sizeof "libcloog.so.0";
+  p = strstr (buf, "/libexec/");
+  if (p != NULL)
+    {
+      while (1)
+	{
+	  char *q = strstr (p + 8, "/libexec/");
+	  if (q == NULL)
+	    break;
+	  p = q;
+	}
+      memmove (p + 4, p + 8, len - (p + 8 - buf));
+      h = dlopen (buf, RTLD_LAZY);
+      if (h == NULL)
+	{
+	  len = progname - save_argv[0];
+	  memcpy (buf, save_argv[0], len);
+	  strcpy (buf + len, "libcloog.so.0");
+	}
+    }
+  if (h == NULL)
+    h = dlopen (buf, RTLD_LAZY);
+  cloog_pointers.h = h;
+  if (h == NULL)
+    return false;
+#define DYNSYM(x) \
+  do \
+    { \
+      union { __typeof (cloog_pointers.p_##x) p; void *q; } u; \
+      u.q = dlsym (h, #x); \
+      if (u.q == NULL) \
+	return false; \
+      cloog_pointers.p_##x = u.p; \
+    } \
+  while (0)
+  DYNSYMS
+#undef DYNSYM
+  return true;
+}
+
 static VEC (scop_p, heap) *current_scops;
 
 /* Converts a GMP constant V to a tree and returns it.  */
@@ -4019,10 +4151,10 @@ clast_get_body_of_loop (struct clast_stm
    STMT.  */
 
 static tree
-gcc_type_for_iv_of_clast_loop (struct clast_for *stmt_for)
+gcc_type_for_iv_of_clast_loop (struct clast_for *stmt_fora)
 {
-  struct clast_user_stmt *stmt = clast_get_body_of_loop ((struct clast_stmt *) stmt_for);
-  const char *cloog_iv = stmt_for->iterator;
+  struct clast_user_stmt *stmt = clast_get_body_of_loop ((struct clast_stmt *) stmt_fora);
+  const char *cloog_iv = stmt_fora->iterator;
   CloogStatement *cs = stmt->statement;
   graphite_bb_p gbb = (graphite_bb_p) cloog_statement_usr (cs);
 
@@ -6061,6 +6193,12 @@ graphite_transform_loops (void)
   if (number_of_loops () <= 1)
     return;
 
+  if (!init_cloog_pointers ())
+    {
+      sorry ("Graphite loop optimizations cannot be used");
+      return;
+    }
+
   current_scops = VEC_alloc (scop_p, heap, 3);
   recompute_all_dominators ();
 



From jakub at fedoraproject.org  Tue Jan 27 16:47:08 2009
From: jakub at fedoraproject.org (Jakub Jelinek)
Date: Tue, 27 Jan 2009 16:47:08 +0000 (UTC)
Subject: rpms/gcc/devel gcc.spec,1.11,1.12
Message-ID: <20090127164708.C91977010B@cvs1.fedora.phx.redhat.com>

Author: jakub

Update of /cvs/pkgs/rpms/gcc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13620

Modified Files:
	gcc.spec 
Log Message:
4.4.0-0.11


Index: gcc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/devel/gcc.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- gcc.spec	27 Jan 2009 16:37:00 -0000	1.11
+++ gcc.spec	27 Jan 2009 16:46:38 -0000	1.12
@@ -3,7 +3,7 @@
 %define gcc_version 4.4.0
 # 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 0.10
+%define gcc_release 0.11
 %define _unpackaged_files_terminate_build 0
 %define multilib_64_archs sparc64 ppc64 s390x x86_64
 %define include_gappletviewer 1
@@ -1747,7 +1747,7 @@
 %doc rpm.doc/changelogs/libmudflap/ChangeLog*
 
 %changelog
-* Tue Jan 27 2009 Jakub Jelinek <jakub at redhat.com> 4.4.0-0.10
+* Tue Jan 27 2009 Jakub Jelinek <jakub at redhat.com> 4.4.0-0.11
 - update from trunk
 - add graphite support
 - change gcc default ISA and tuning:



From ltinkl at fedoraproject.org  Tue Jan 27 16:56:27 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Tue, 27 Jan 2009 16:56:27 +0000 (UTC)
Subject: rpms/kdebindings/F-9 kdebindings.spec, 1.111, 1.112 sources, 1.52,
	1.53
Message-ID: <20090127165627.265737010B@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kdebindings/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15868

Modified Files:
	kdebindings.spec sources 
Log Message:
KDE 4.2.0



Index: kdebindings.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebindings/F-9/kdebindings.spec,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -r1.111 -r1.112
--- kdebindings.spec	8 Jan 2009 18:25:14 -0000	1.111
+++ kdebindings.spec	27 Jan 2009 16:55:56 -0000	1.112
@@ -6,72 +6,75 @@
 
 # define to enable these optional bits
 #define csharp 1
+#define falcon 1
+#define php 1
 %define ruby 1
 %define smoke 1
-#define php 1
+# define to build kde-plasma-ruby bits, needs QtRuby-devel bootstrap
+# FIXME/TODO: ping upstream so it uses the just-built rbuic4
+#define kde_plasma_ruby 1
 
 %if 0%{?ruby}%{?smoke}
 %define devel 1
 %endif
 
-%{!?ruby_sitelib: %define ruby_sitelib %(ruby -rrbconfig -e 'puts Config::CONFIG["sitelibdir"]')}
-%{!?ruby_sitearch: %define ruby_sitearch %(ruby -rrbconfig -e 'puts Config::CONFIG["sitearchdir"]')}
+%global ruby_sitelib %(ruby -rrbconfig -e 'puts Config::CONFIG["sitelibdir"]')
+%global ruby_sitearch %(ruby -rrbconfig -e 'puts Config::CONFIG["sitearchdir"]')
 %global python_ver %(%{__python} -c "import sys ; print sys.version[:3]")
 %global python_sitelib  %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")
 %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")
 
 Name: kdebindings
-Version: 4.1.4
+Version: 4.2.0
 Release: 1%{?dist}
 Summary: KDE bindings to non-C++ languages
 
 Group: User Interface/Desktops
 License: GPLv2
 URL: http://developer.kde.org/language-bindings/
-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
+# upstream patches
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  kde-filesystem >= 4
+BuildRequires:  akonadi-devel >= 1.1.0
+BuildRequires:  plasma-devel >= %{version}
+# okular bindings
+BuildRequires:  kdegraphics-devel >= %{version}
 BuildRequires:  kdelibs4-devel >= %{version}
-BuildRequires:  kdebase-workspace-devel >= %{version}
 BuildRequires:  kdepimlibs-devel >= %{version}
-BuildRequires:  soprano-devel >= 2.0.97
-BuildRequires:  cmake
 %{?csharp:BuildRequires:  mono-core}
 BuildRequires:  python-devel
 %{?ruby:BuildRequires:  ruby-devel ruby}
-BuildRequires:  giflib-devel
-BuildRequires:  pcre-devel
-# causes smokeqt to fail to build
-#{?smoke:BuildRequires:  qwt-devel}
 BuildRequires:  PyQt4-devel >= 4.4.2
 %if 0%{?fedora} > 8
 BuildRequires:  qscintilla-devel >= 2.2
 %endif
+BuildRequires:  soprano-devel
+%if 0%{?kde_plasma_ruby}
+BuildRequires:  QtRuby-devel
+%endif
 
-# FIXME/TODO: are there other explicit Requires?
 Requires: kdelibs4 >= %{version}
-Requires: kdebase-workspace >= %{version}
 
 %{!?devel:Obsoletes: kdebindings-devel < %{version}-%{release}}
 
 %description
 KDE bindings to non-C++ languages
 
-%package -n PyKDE4 
+%package -n PyKDE4
 Group:    Development/Languages
-Summary:  Python bindings for KDE4 
+Summary:  Python bindings for KDE4
 Requires: kdelibs4 >= %{version}
 Requires: PyQt4
-%description -n PyKDE4 
+%description -n PyKDE4
 Header files for developing applications using %{name}.
 
 %package -n PyKDE4-devel
 Group:    Development/Languages
-Summary:  Files needed to build other bindings based on KDE4 
+Summary:  Files needed to build other bindings based on KDE4
 Requires: PyQt4-devel
 Requires: PyKDE4 = %{version}-%{release}
-%description -n PyKDE4-devel 
+%description -n PyKDE4-devel
 Files needed to build other bindings for C++ classes that inherit from any
 of the KDE4 classes.
 
@@ -79,10 +82,79 @@
 Group:    Development/Libraries
 Summary:  Header files for %{name}
 Requires: %{name} = %{version}-%{release}
-Requires: kdelibs4-devel kdebase-workspace-devel
+Requires: kdelibs4-devel
 %description devel
 Header files for developing applications using %{name}.
 
+%if 0%{?ruby}
+%package -n korundum
+Group:    Development/Languages
+Summary:  Ruby bindings for KDE4
+Requires: kdelibs4 >= %{version}
+Requires: QtRuby = %{version}-%{release}
+Provides: korundum4 = %{version}-%{release}
+%description -n korundum
+%{summary}.
+
+%package -n korundum-devel
+Group:    Development/Languages
+Summary:  Development files for korundum 
+Requires: QtRuby-devel
+Requires: korundum = %{version}-%{release}
+Provides: korundum4-devel = %{version}-%{release}
+%description -n korundum-devel
+%{summary}.
+
+%package -n QtRuby
+Group:    Development/Languages
+Summary:  Ruby bindings for Qt4
+Requires: qt4 >= %{_qt4_version} 
+Provides: QtRuby4 = %{version}-%{release}
+%description -n QtRuby
+%{summary}.
+
+%package -n QtRuby-devel
+Group:    Development/Languages
+Summary:  Development files for QtRuby 
+Requires: QtRuby = %{version}-%{release}
+Provides: QtRuby4-devel = %{version}-%{release}
+%description -n QtRuby-devel
+%{summary}.
+
+%package -n kde-plasma-ruby-digitalclock
+Group:    User Interface/Desktops
+Summary:  Digital clock plasmoid written in Ruby
+Requires: korundum = %{version}-%{release}
+%description -n kde-plasma-ruby-digitalclock
+%{summary}.
+
+%package -n kde-plasma-ruby-analogclock
+Group:    User Interface/Desktops
+Summary:  Analog clock plasmoid written in Ruby
+Requires: korundum = %{version}-%{release}
+%description -n kde-plasma-ruby-analogclock
+%{summary}.
+%endif
+
+%package -n kross-python
+Group:    Development/Languages
+Summary:  Kross plugin for python
+Requires: kdelibs4 >= %{version}
+Provides: kross(python) = ^{version]-%{release}
+%description -n kross-python
+Python plugin for the Kross archtecture in KDE4.
+
+%if 0%{?ruby}
+%package -n kross-ruby
+Group:    Development/Languages
+Summary:  Kross plugin for ruby
+Requires: ruby
+Requires: kdelibs4 >= %{version}
+Provides: kross(ruby) = %{version}-%{release}
+%description -n kross-ruby
+Ruby plugin for the Kross archtecture in KDE4.
+%endif
+
 
 %prep
 %setup -q
@@ -105,8 +177,7 @@
 
 %install
 rm -rf %{buildroot}
-mkdir -p %{buildroot}
-make install DESTDIR=%{buildroot} -C %{_target_platform}
+make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
 
 %clean
@@ -122,21 +193,17 @@
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING NEWS README
 %if 0%{?smoke}
-%{_kde4_libdir}/lib*.so.*
+%{_kde4_libdir}/libsmoke*.so.*
+%endif
+
+%if 0%{?devel}
+%files devel
+%defattr(-,root,root,-)
+%if 0%{?smoke}
+%{_includedir}/smoke.h
+%{_includedir}/smoke/
+%{_kde4_libdir}/libsmoke*.so
 %endif
-# unversioned library
-%{_kde4_libdir}/kde4/krosspython.so
-%if 0%{?ruby}
-%{_kde4_bindir}/*
-%{_kde4_appsdir}/plasma_scriptengine_ruby/
-%{_kde4_datadir}/kde4/services/plasma-scriptengine-ruby-*.desktop
-%{_kde4_libdir}/libqtruby4shared.so
-%{_kde4_libdir}/kde4/krossruby.so
-%{_kde4_libdir}/kde4/krubypluginfactory.so
-%{ruby_sitelib}/*
-%{ruby_sitearch}/*.so
-%{_kde4_datadir}/applications/kde4/dbpedia_references.desktop
-%{_kde4_appsdir}/dbpedia_references/
 %endif
 
 %files -n PyKDE4
@@ -144,33 +211,144 @@
 %doc COPYING
 %{python_sitearch}/PyKDE4/
 %{_kde4_appsdir}/pykde4/
+%{_kde4_libdir}/kde4/kpythonpluginfactory.so
 
 %files -n PyKDE4-devel
 %defattr(-,root,root,-)
-%doc %{_kde4_docdir}/HTML/en/pykde4/
+#doc %{_kde4_docdir}/HTML/en/pykde4/
 %{_kde4_datadir}/sip/PyKDE4/
 
-%if 0%{?devel}
-%files devel
-%defattr(-,root,root,-)
-%if 0%{?smoke}
-%{_includedir}/smoke.h
-%{_includedir}/smoke/
-%{_kde4_libdir}/lib*.so
-%endif
 %if 0%{?ruby}
+%files -n korundum
+%defattr(-,root,root,-)
+%{_kde4_bindir}/krubyapplication
+%{ruby_sitelib}/KDE/
+%{ruby_sitelib}/akonadi/
+%{ruby_sitelib}/khtml/
+%{ruby_sitelib}/ktexteditor/
+%{ruby_sitelib}/okular/
+%{ruby_sitelib}/solid/
+%{ruby_sitelib}/soprano/
+%{ruby_sitelib}/nepomuk/
+%{ruby_sitearch}/akonadi.so
+%{ruby_sitearch}/khtml.so
+%{ruby_sitearch}/korundum4.so
+%{ruby_sitearch}/ktexteditor.so
+%{ruby_sitearch}/okular.so
+%{ruby_sitearch}/plasma_applet.so
+%{ruby_sitearch}/solid.so
+%{ruby_sitearch}/soprano.so
+%{ruby_sitearch}/nepomuk.so
+%{_kde4_libdir}/kde4/krubypluginfactory.so
+%{_kde4_datadir}/applications/kde4/dbpedia_references.desktop
+%{_kde4_appsdir}/dbpedia_references/
+
+%files -n korundum-devel
+%defattr(-,root,root,-)
+%{_kde4_bindir}/rbkconfig_compiler4
 %{_includedir}/qtruby/
 %exclude %{_kde4_libdir}/libqtruby4shared.so
+
+%files -n QtRuby
+%defattr(-,root,root,-)
+%{ruby_sitelib}/Qt/
+%{ruby_sitelib}/Qt*.rb
+%{ruby_sitelib}/qtscript/
+%{ruby_sitelib}/qttest/
+%{ruby_sitelib}/qtuitools/
+%{ruby_sitelib}/qtwebkit/
+%{ruby_sitearch}/qt*.so
+%{_kde4_libdir}/libqtruby4shared.so.2
+%{_kde4_libdir}/libqtruby4shared.so.2.0.0
+
+%files -n QtRuby-devel
+%defattr(-,root,root,-)
+%{_kde4_bindir}/rbqtapi
+%{_kde4_bindir}/rbrcc
+%{_kde4_bindir}/rbuic4
+%{_kde4_libdir}/libqtruby4shared.so
+%endif
+
+%files -n kross-python
+%defattr(-,root,root,-)
+# unversioned library
+%{_kde4_libdir}/kde4/krosspython.so
+
+%if 0%{?ruby}
+%files -n kross-ruby
+%defattr(-,root,root,-)
+%{_kde4_libdir}/kde4/krossruby.so
+
+%if 0%{?kde_plasma_ruby}
+%files -n kde-plasma-ruby-analogclock
+%defattr(-,root,root,-)
+%{_kde4_sharedir}/kde4/apps/plasma_applet_ruby_clock/
+%{_kde4_sharedir}/kde4/services/plasma-applet-ruby-analogclock.desktop
+
+%files -n kde-plasma-ruby-digitalclock
+%defattr(-,root,root,-)
+%{_kde4_sharedir}/kde4/apps/plasma_ruby_digital_clock/
+%{_kde4_sharedir}/kde4/services/plasma-ruby-digital-clock-default.desktop
 %endif
 %endif
 
 
 %changelog
-* Thu Jan  8 2009 Luk???? Tinkl <ltinkl at redhat.com> 4.1.4-1
-- KDE 4.1.4
+* Thu Jan 22 2009 Than Ngo <than at redhat.com> - 4.2.0-1
+- 4.2.0
+
+* Thu Jan 15 2009 Rex Dieter <rdieter at fedoraproject.org> 4.1.96-5
+- toggle for QtRuby/kde-plasma-ruby bootstrap
+
+* Thu Jan 15 2009 Rex Dieter <rdieter at fedoraproject.org> 4.1.96-4
+- update %%description/%%summaries for new (sub)pkgs
+- use versioned Provides/Requires all over
+- BR: akonadi-devel kdegraphics-devel
+- don't package kde-plasma-ruby-* (cmake error "rbuic4 not found")
+
+* Thu Jan 15 2009 Ben Boeckel <MathStuf at gmail.com> 4.1.96-3
+- Fixed QtRuby version
+- Moved QtRuby tools to QtRuby-devel
+
+* Wed Jan 14 2009 Ben Boeckel <MathStuf at gmail.com> 4.1.96-2
+- Split out Ruby bindings and Kross modules
+
+* Wed Jan 07 2009 Than Ngo <than at redhat.com> - 4.1.96-1
+- 4.2rc1
+
+* Fri Dec 12 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.85-2
+- reenable smoke, ruby
+- disable NepomukSmoke for now: it wasn't actually used (the corresponding
+  Ruby binding is disabled by default and we don't build the C# bindings) and it
+  depends on nepomukquery libs from kdebase (which also means we need to sort
+  out the -devel symlink mess there first)
+
+* Fri Dec 12 2008 Than Ngo <than at redhat.com> 4.1.85-1
+- 4.2beta2
+
+* Mon Dec 01 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.80-5
+- rebuild for Python 2.6
+
+* Mon Dec 01 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.80-4
+- don't require kdebase-workspace(-devel)
+
+* Thu Nov 27 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.80-3
+- BR plasma-devel instead of kdebase-workspace-devel
+- disable smoke,ruby (for now, busted)
+
+* Thu Nov 20 2008 Than Ngo <than at redhat.com> 4.1.80-2
+- merged
+
+* Thu Nov 20 2008 Lorenzo Villani <lvillani at binaryhelix.net> - 4.1.80-1
+- 4.1.80
+- BR cmake >= 2.6.2
+- make install/fast
+
+* Mon Nov 17 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-2.1
+- respin (qscintilla)
 
-* Fri Nov  7 2008 Luk???? Tinkl <ltinkl at redhat.com> 4.1.3-1
-- KDE 4.1.3
+* Wed Nov 12 2008 Than Ngo <than at redhat.com> 4.1.3-1
+- 4.1.3
 
 * Mon Sep 29 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-2
 - make VERBOSE=1


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdebindings/F-9/sources,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- sources	8 Jan 2009 18:25:14 -0000	1.52
+++ sources	27 Jan 2009 16:55:56 -0000	1.53
@@ -1 +1 @@
-d96fc787abcc6d7d9b3f2f1467fe226b  kdebindings-4.1.4.tar.bz2
+6eae8fd968da83fe65e592993e416adc  kdebindings-4.2.0.tar.bz2



From pkgdb at fedoraproject.org  Tue Jan 27 17:07:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 27 Jan 2009 17:07:04 +0000
Subject: [pkgdb] xkeyboard-config: sayamind has requested commit
Message-ID: <20090127170704.3A3C5208493@bastion.fedora.phx.redhat.com>

sayamind has requested the commit acl on xkeyboard-config (Fedora OLPC 3)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/xkeyboard-config



From mhlavink at fedoraproject.org  Tue Jan 27 17:07:37 2009
From: mhlavink at fedoraproject.org (Michal Hlavinka)
Date: Tue, 27 Jan 2009 17:07:37 +0000 (UTC)
Subject: rpms/ecryptfs-utils/devel ecryptfs-utils.spec,1.38,1.39
Message-ID: <20090127170737.9BC067010B@cvs1.fedora.phx.redhat.com>

Author: mhlavink

Update of /cvs/extras/rpms/ecryptfs-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17972

Modified Files:
	ecryptfs-utils.spec 
Log Message:
add missing requires: keyutils



Index: ecryptfs-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/ecryptfs-utils/devel/ecryptfs-utils.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- ecryptfs-utils.spec	27 Jan 2009 13:26:24 -0000	1.38
+++ ecryptfs-utils.spec	27 Jan 2009 17:07:07 -0000	1.39
@@ -3,13 +3,14 @@
 
 Name: ecryptfs-utils
 Version: 69
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: The eCryptfs mount helper and support libraries
 Group: System Environment/Base
 License: GPLv2+
 URL: https://launchpad.net/ecryptfs
 Source0: http://launchpad.net/ecryptfs/trunk/%{version}/+download/ecryptfs-utils_%{version}.orig.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Requires: keyutils
 BuildRequires: libgcrypt-devel keyutils-libs-devel openssl-devel pam-devel
 BuildRequires: trousers-devel python python-devel nss-devel
 Conflicts: kernel < 2.6.19
@@ -125,6 +126,9 @@
 %{python_sitearch}/ecryptfs-utils/_libecryptfs.so
 
 %changelog
+* Tue Jan 27 2009 Michal Hlavinka <mhlavink at redhat.com> 69-3
+- add missing requires: keyutils
+
 * Tue Jan 27 2009 Michal Hlavinka <mhlavink at redhat.com> 69-2
 - bump release for rebuild
 



From dignan at fedoraproject.org  Tue Jan 27 17:10:26 2009
From: dignan at fedoraproject.org (Patrick Dignan)
Date: Tue, 27 Jan 2009 17:10:26 +0000 (UTC)
Subject: rpms/jpcap/devel jpcap.spec,1.1,1.2
Message-ID: <20090127171026.EAA547010B@cvs1.fedora.phx.redhat.com>

Author: dignan

Update of /cvs/pkgs/rpms/jpcap/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18627

Modified Files:
	jpcap.spec 
Log Message:
Fixed the .jar file to use System.load() and the exact path instead of System.loadLibrary


Index: jpcap.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jpcap/devel/jpcap.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- jpcap.spec	26 Jan 2009 03:58:36 -0000	1.1
+++ jpcap.spec	27 Jan 2009 17:09:56 -0000	1.2
@@ -7,7 +7,7 @@
 
 Name: jpcap
 Version: 0.7
-Release: 5%{?dist}
+Release: 6%{?dist}
 Summary: A Java library for capturing and sending network packets
 
 Group: Development/Libraries
@@ -35,6 +35,8 @@
 
 %prep
 %setup -q
+sed -i 's:System.loadLibrary("jpcap"):System.load("'%{_libdir}/%{name}/lib%{name}.so'"):g' src/java/%{name}/JpcapWriter.java
+sed -i 's:System.loadLibrary("jpcap"):System.load("'%{_libdir}/%{name}/lib%{name}.so'"):g' src/java/%{name}/JpcapCaptor.java
 rm -rf lib/*
 dos2unix ChangeLog
 dos2unix README
@@ -75,6 +77,8 @@
 
 
 %changelog
+* Tue Jan 27 2009 Patrick Dignan <dignan.patrick at, gmail.com> 0.7-6
+- Uses sed to change System.loadLibrary() to System.load and the exact path of the .so file.
 * Tue Jan 06 2009 Patrick Dignan <jpdota at, sourceforge.net> 0.7-5
 - Fixed End-of-line problems in README, ChangeLog, doc/javadoc/stylesheet.css, and doc/javadoc/package-list
 - Fixed Directory ownership of _libdir/name (macros)



From kevin at fedoraproject.org  Tue Jan 27 17:11:22 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 27 Jan 2009 17:11:22 +0000 (UTC)
Subject: rpms/libxfce4util/devel sources, 1.13, 1.14 .cvsignore, 1.13,
	1.14 libxfce4util.spec, 1.23, 1.24
Message-ID: <20090127171122.8E4F47010B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/libxfce4util/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18906

Modified Files:
	sources .cvsignore libxfce4util.spec 
Log Message:
Update to 4.5.99.1



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libxfce4util/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	16 Jan 2009 23:12:05 -0000	1.13
+++ sources	27 Jan 2009 17:10:52 -0000	1.14
@@ -1 +1 @@
-c0a7ae70609ba5df8d42c82c3d8cdb07  libxfce4util-4.5.93.tar.bz2
+03f9edc7dad7f17dae248cbe51c65d0d  libxfce4util-4.5.99.1.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libxfce4util/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	16 Jan 2009 23:12:05 -0000	1.13
+++ .cvsignore	27 Jan 2009 17:10:52 -0000	1.14
@@ -1 +1 @@
-libxfce4util-4.5.93.tar.bz2
+libxfce4util-4.5.99.1.tar.bz2


Index: libxfce4util.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libxfce4util/devel/libxfce4util.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- libxfce4util.spec	16 Jan 2009 23:12:05 -0000	1.23
+++ libxfce4util.spec	27 Jan 2009 17:10:52 -0000	1.24
@@ -1,6 +1,6 @@
 Summary: Utility library for the Xfce4 desktop environment
 Name: libxfce4util
-Version: 4.5.93
+Version: 4.5.99.1
 Release: 1%{?dist}
 License: LGPLv2+
 URL: http://www.xfce.org/
@@ -64,6 +64,9 @@
 %{_datadir}/gtk-doc/html/libxfce4util/
 
 %changelog
+* Mon Jan 26 2009 Kevin Fenzi <kevin at tummy.com> - 4.5.99.1-1
+- Update to 4.5.99.1
+
 * Tue Jan 13 2009 Kevin Fenzi <kevin at tummy.com> - 4.5.93-1
 - Update to 4.5.93
 



From mgrepl at fedoraproject.org  Tue Jan 27 17:12:05 2009
From: mgrepl at fedoraproject.org (Miroslav Grepl)
Date: Tue, 27 Jan 2009 17:12:05 +0000 (UTC)
Subject: rpms/selinux-policy/F-10 policy-20080710.patch,1.129,1.130
Message-ID: <20090127171205.2951E7010B@cvs1.fedora.phx.redhat.com>

Author: mgrepl

Update of /cvs/extras/rpms/selinux-policy/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19048

Modified Files:
	policy-20080710.patch 
Log Message:
- Allow bluetooth read the network state information



policy-20080710.patch:

Index: policy-20080710.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-10/policy-20080710.patch,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -r1.129 -r1.130
--- policy-20080710.patch	27 Jan 2009 16:44:31 -0000	1.129
+++ policy-20080710.patch	27 Jan 2009 17:12:04 -0000	1.130
@@ -12711,7 +12711,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bluetooth.te serefpolicy-3.5.13/policy/modules/services/bluetooth.te
 --- nsaserefpolicy/policy/modules/services/bluetooth.te	2008-10-17 14:49:13.000000000 +0200
-+++ serefpolicy-3.5.13/policy/modules/services/bluetooth.te	2009-01-27 16:42:54.000000000 +0100
++++ serefpolicy-3.5.13/policy/modules/services/bluetooth.te	2009-01-27 18:05:16.000000000 +0100
 @@ -20,6 +20,9 @@
  type bluetooth_helper_exec_t;
  application_executable_file(bluetooth_helper_exec_t)
@@ -12739,7 +12739,15 @@
  allow bluetooth_t self:tcp_socket create_stream_socket_perms;
  allow bluetooth_t self:udp_socket create_socket_perms;
  
-@@ -92,6 +95,7 @@
+@@ -76,6 +79,7 @@
+ 
+ kernel_read_kernel_sysctls(bluetooth_t)
+ kernel_read_system_state(bluetooth_t)
++kernel_read_network_state(bluetooth_t)
+ 
+ corenet_all_recvfrom_unlabeled(bluetooth_t)
+ corenet_all_recvfrom_netlabel(bluetooth_t)
+@@ -92,6 +96,7 @@
  dev_rw_usbfs(bluetooth_t)
  dev_rw_generic_usb_dev(bluetooth_t)
  dev_read_urand(bluetooth_t)
@@ -12747,7 +12755,7 @@
  
  fs_getattr_all_fs(bluetooth_t)
  fs_search_auto_mountpoints(bluetooth_t)
-@@ -110,6 +114,8 @@
+@@ -110,6 +115,8 @@
  files_read_etc_runtime_files(bluetooth_t)
  files_read_usr_files(bluetooth_t)
  
@@ -12756,7 +12764,7 @@
  libs_use_ld_so(bluetooth_t)
  libs_use_shared_libs(bluetooth_t)
  
-@@ -117,21 +123,24 @@
+@@ -117,21 +124,24 @@
  
  miscfiles_read_localization(bluetooth_t)
  miscfiles_read_fonts(bluetooth_t)



From dignan at fedoraproject.org  Tue Jan 27 17:16:15 2009
From: dignan at fedoraproject.org (Patrick Dignan)
Date: Tue, 27 Jan 2009 17:16:15 +0000 (UTC)
Subject: rpms/jpcap/F-10 jpcap.spec,1.1,1.2
Message-ID: <20090127171615.8C07E7010B@cvs1.fedora.phx.redhat.com>

Author: dignan

Update of /cvs/pkgs/rpms/jpcap/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19920

Modified Files:
	jpcap.spec 
Log Message:
* Tue Jan 27 2009 Patrick Dignan <dignan.patrick at, gmail.com> 0.7-6
- Fixed the .jar file to use System.load() and the exact path instead of System.loadLibrary



Index: jpcap.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jpcap/F-10/jpcap.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- jpcap.spec	26 Jan 2009 05:56:05 -0000	1.1
+++ jpcap.spec	27 Jan 2009 17:15:45 -0000	1.2
@@ -7,7 +7,7 @@
 
 Name: jpcap
 Version: 0.7
-Release: 5%{?dist}
+Release: 6%{?dist}
 Summary: A Java library for capturing and sending network packets
 
 Group: Development/Libraries
@@ -35,6 +35,8 @@
 
 %prep
 %setup -q
+sed -i 's:System.loadLibrary("jpcap"):System.load("'%{_libdir}/%{name}/lib%{name}.so'"):g' src/java/%{name}/JpcapWriter.java
+sed -i 's:System.loadLibrary("jpcap"):System.load("'%{_libdir}/%{name}/lib%{name}.so'"):g' src/java/%{name}/JpcapCaptor.java
 rm -rf lib/*
 dos2unix ChangeLog
 dos2unix README
@@ -75,6 +77,8 @@
 
 
 %changelog
+* Tue Jan 27 2009 Patrick Dignan <dignan.patrick at, gmail.com> 0.7-6
+- Uses sed to change System.loadLibrary() to System.load and the exact path of the .so file.
 * Tue Jan 06 2009 Patrick Dignan <jpdota at, sourceforge.net> 0.7-5
 - Fixed End-of-line problems in README, ChangeLog, doc/javadoc/stylesheet.css, and doc/javadoc/package-list
 - Fixed Directory ownership of _libdir/name (macros)



From ltinkl at fedoraproject.org  Tue Jan 27 17:17:06 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Tue, 27 Jan 2009 17:17:06 +0000 (UTC)
Subject: rpms/kdegraphics/F-9 kdegraphics.spec, 1.161, 1.162 sources, 1.53, 
	1.54 kdegraphics-4.1.3-libkdcraw-0.4.0.patch, 1.1,
	NONE kdegraphics-4.1.3-libkexiv2-0.5.0.patch, 1.1,
	NONE kdegraphics-4.1.3-libkipi-0.3.0.patch, 1.1, NONE
Message-ID: <20090127171706.8AACB7010B@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kdegraphics/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20380

Modified Files:
	kdegraphics.spec sources 
Removed Files:
	kdegraphics-4.1.3-libkdcraw-0.4.0.patch 
	kdegraphics-4.1.3-libkexiv2-0.5.0.patch 
	kdegraphics-4.1.3-libkipi-0.3.0.patch 
Log Message:
KDE 4.2.0



Index: kdegraphics.spec
===================================================================
RCS file: /cvs/extras/rpms/kdegraphics/F-9/kdegraphics.spec,v
retrieving revision 1.161
retrieving revision 1.162
diff -u -r1.161 -r1.162
--- kdegraphics.spec	9 Jan 2009 00:41:30 -0000	1.161
+++ kdegraphics.spec	27 Jan 2009 17:16:36 -0000	1.162
@@ -1,5 +1,4 @@
-
-%if 0%{?fedora} > 9 
+%if 0%{?fedora} > 9
 %define obsolete_kde3_kipi 1
 %else
 %define omit_kde3_conflicts 1
@@ -7,7 +6,7 @@
 
 Summary:        K Desktop Environment - Graphics Applications
 Epoch:          7
-Version:        4.1.4
+Version:        4.2.0
 Release:        1%{?dist}
 
 Name:           kdegraphics
@@ -22,26 +21,14 @@
 
 ## upstream patches
 
-## kipi framework backports from trunk (4.2)
-## don't bother updating these, rediff them from the next tag instead!
-# LANG=en_US.UTF-8 svn diff svn://anonsvn.kde.org/home/kde/tags/KDE/4.1.3/kdegraphics/libs/libkexiv2 \
-# svn://anonsvn.kde.org/home/kde/trunk/KDE/kdegraphics/libs/libkexiv2 >kdegraphics-4.1.3-libkexiv2-0.5.0.patch
-Patch200: kdegraphics-4.1.3-libkexiv2-0.5.0.patch
-# LANG=en_US.UTF-8 svn diff svn://anonsvn.kde.org/home/kde/tags/KDE/4.1.3/kdegraphics/libs/libkdcraw \
-# svn://anonsvn.kde.org/home/kde/trunk/KDE/kdegraphics/libs/libkdcraw >kdegraphics-4.1.3-libkdcraw-0.4.0.patch
-Patch201: kdegraphics-4.1.3-libkdcraw-0.4.0.patch
-# LANG=en_US.UTF-8 svn diff svn://anonsvn.kde.org/home/kde/tags/KDE/4.1.3/kdegraphics/libs/libkipi \
-# svn://anonsvn.kde.org/home/kde/trunk/KDE/kdegraphics/libs/libkipi >kdegraphics-4.1.3-libkipi-0.3.0.patch
-Patch202: kdegraphics-4.1.3-libkipi-0.3.0.patch
-
-BuildRequires:  kde-filesystem >= 4
 BuildRequires:  kdelibs4-devel >= %{version}
-BuildRequires:  cmake
+BuildRequires:  kdepimlibs-devel >= %{version}
 BuildRequires:  chmlib-devel
 BuildRequires:  djvulibre-devel
 BuildRequires:  ebook-tools-devel
 BuildRequires:  exiv2-devel
 BuildRequires:  giflib-devel
+BuildRequires:  lcms-devel
 %if 0%{?fedora} > 9
 BuildRequires:  libgphoto2-devel
 %else
@@ -55,12 +42,12 @@
 BuildRequires:  qca2-devel
 BuildRequires:  qimageblitz-devel
 BuildRequires:  sane-backends-devel
-BuildRequires:  lcms-devel
+BuildRequires:  soprano-devel
 
 %{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
 Requires: kdelibs4 >= %{version}
 Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: cups 
+Requires: cups
 Requires(post): xdg-utils
 Requires(postun): xdg-utils
 
@@ -84,8 +71,6 @@
 %if 0%{?obsolete_kde3_kipi}
 Obsoletes: libkdcraw < 0.2.0, libkexiv2 < 0.4.0, libkipi < 0.2.0
 %endif
-Requires(post): xdg-utils
-Requires(postun): xdg-utils
 %description libs
 %{summary}.
 
@@ -109,19 +94,6 @@
 %setup -q -n kdegraphics-%{version}
 
 # upstream patches
-# libkexiv2 backport
-pushd libs/libkexiv2
-%patch200 -p0
-popd
-# libkdcraw backport
-pushd libs/libkdcraw
-%patch201 -p0
-popd
-# libkipi backport
-pushd libs/libkipi
-%patch202 -p0
-popd
-
 
 %build
 
@@ -157,13 +129,9 @@
 %{_bindir}/xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
 %{_bindir}/xdg-desktop-menu forceupdate 2> /dev/null || :
 
-%post libs
-/sbin/ldconfig
-%{_bindir}/xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
+%post libs -p /sbin/ldconfig
 
-%postun libs
-/sbin/ldconfig
-%{_bindir}/xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
+%postun libs -p /sbin/ldconfig
 
 
 %files
@@ -176,7 +144,7 @@
 %{_kde4_datadir}/applications/kde4/*
 %{_kde4_datadir}/config.kcfg/*
 %{_kde4_datadir}/kde4/services/*
-%{_kde4_datadir}/kde4/servicetypes/okularGenerator.desktop
+%{_kde4_datadir}/kde4/servicetypes/*
 %{_kde4_docdir}/HTML/en/okular/
 %{_kde4_appsdir}/gvpart/
 %{_kde4_appsdir}/gwenview/
@@ -184,31 +152,16 @@
 %{_kde4_appsdir}/kruler/
 %{_kde4_appsdir}/svgpart/*
 %{_datadir}/dbus-1/interfaces/*
-%{_kde4_docdir}/HTML/en/gwenview/
-%{_kde4_docdir}/HTML/en/kamera/
-%{_kde4_docdir}/HTML/en/kgamma/
-%{_kde4_docdir}/HTML/en/kolourpaint/
-%{_kde4_docdir}/HTML/en/ksnapshot/
-%{_kde4_docdir}/HTML/en/kruler/
-%{_kde4_iconsdir}/hicolor/*/actions/*
-%{_kde4_iconsdir}/hicolor/*/apps/gwenview.*
-%{_kde4_iconsdir}/hicolor/*/apps/kcolorchooser.*
-%{_kde4_iconsdir}/hicolor/*/apps/kgamma.*
-%{_kde4_iconsdir}/hicolor/*/apps/kolourpaint.*
-%{_kde4_iconsdir}/hicolor/*/apps/kruler.*
-%{_kde4_iconsdir}/hicolor/*/apps/ksnapshot.*
-%{_kde4_iconsdir}/hicolor/*/apps/okular.*
+%{_kde4_docdir}/HTML/en/*/
+%{_kde4_iconsdir}/hicolor/*/*/*
 
-%files libs 
+%files libs
 %defattr(-,root,root,-)
 %{_kde4_appsdir}/kipi/
 %{_kde4_appsdir}/libkdcraw/
 %{_kde4_libdir}/lib*.so.*
 %{_kde4_libdir}/kde4/*
 %{_kde4_libdir}/strigi/*
-%{_kde4_iconsdir}/hicolor/*/apps/kdcraw.*
-%{_kde4_iconsdir}/hicolor/*/apps/kipi.*
-%{_kde4_datadir}/kde4/servicetypes/kipiplugin.desktop
 
 %files devel
 %defattr(-,root,root,-)
@@ -226,24 +179,39 @@
 
 
 %changelog
-* Fri Jan  9 2009 Luk???? Tinkl <ltinkl at redhat.com> 4.1.4-1
-- KDE 4.1.4
+* Thu Jan 22 2009 Than Ngo <than at redhat.com> - 4.2.0-1
+- 4.2.0
 
-* Thu Jan 08 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.3-6
-- BR ebook-tools-devel
+* Sat Jan 17 2009 Rakesh Pandit <rakesh at fedoraproject.org> - 4.1.96-2
+- Updated with new djvulibre
 
-* Mon Dec 22 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.3-5
-- libkipi backport too (makes kde42 transition easier later)
+* Wed Jan 07 2009 Than Ngo <than at redhat.com> - 4.1.96-1
+- 4.2rc1
 
-* Mon Dec 01 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.3-4
-- cleanup Obsoletes: kdegraphics-extras
+* Mon Dec 22 2008 Rex Dieter <rdieter at fedoraproject.org> - 4.1.85-4
+- -devel: Provides: libkipi-devel = 0.3.0
+
+* Thu Dec 18 2008 Rex Dieter <rdieter at fedoraproject.org> - 4.1.85-3 
+- respin (eviv2)
 
-* Tue Nov 25 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.3-3
-- respin libkdcraw/libkexiv2 patches
+* Mon Dec 15 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.85-2
+- BR: ebook-tools-devel
+
+* Fri Dec 12 2008 Than Ngo <than at redhat.com> 4.1.85-1
+- 4.2beta2
+- BR: soprano-devel
+
+* Mon Dec 01 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.80-3
 - Obsoletes: libkdcraw libkexiv2 libkipi (F10+)
+- cleanup Obsoletes: kdegraphics-extras
+
+* Thu Nov 20 2008 Than Ngo <than at redhat.com> 4.1.80-2
+- merged
 
-* Tue Nov 25 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.3-2
-- move (remaining) libkipi/libkdcraw runtime bits to -libs (#472874)
+* Thu Nov 20 2008 Lorenzo Villani <lvillani at binaryhelix.net> - 7:4.1.72-1
+- 4.1.80
+- BR cmake >= 2.6.2
+- make install/fast
 
 * Wed Nov 12 2008 Than Ngo <than at redhat.com> 4.1.3-1
 - 4.1.3
@@ -407,7 +375,7 @@
 - remove all but okular on fedora <= 9
 - +BR: kde4-macros(api)
 - remove unneeded require for kdepimlibs
-- add defattr to devel package 
+- add defattr to devel package
 
 * Thu Nov 15 2007 Sebastian Vahl <fedora at deadbabylon.de> 7:3.96.0-2
 - re-added epoch (from kdegraphics3)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdegraphics/F-9/sources,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- sources	9 Jan 2009 00:41:30 -0000	1.53
+++ sources	27 Jan 2009 17:16:36 -0000	1.54
@@ -1 +1 @@
-c2a67098d9df60e839d2af6b866989ef  kdegraphics-4.1.4.tar.bz2
+8beb6fe5d475d0b0245ea6d4cc7e9732  kdegraphics-4.2.0.tar.bz2


--- kdegraphics-4.1.3-libkdcraw-0.4.0.patch DELETED ---


--- kdegraphics-4.1.3-libkexiv2-0.5.0.patch DELETED ---


--- kdegraphics-4.1.3-libkipi-0.3.0.patch DELETED ---



From pkgdb at fedoraproject.org  Tue Jan 27 17:20:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 27 Jan 2009 17:20:51 +0000
Subject: [pkgdb] nagios: williamo has requested watchcommits
Message-ID: <20090127172051.0F4C0208484@bastion.fedora.phx.redhat.com>

williamo has requested the watchcommits acl on nagios (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/nagios



From pkgdb at fedoraproject.org  Tue Jan 27 17:21:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 27 Jan 2009 17:21:13 +0000
Subject: [pkgdb] nagios: williamo has given up watchcommits
Message-ID: <20090127172113.81A08208484@bastion.fedora.phx.redhat.com>

williamo has given up the watchcommits acl on nagios (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/nagios



From mhlavink at fedoraproject.org  Tue Jan 27 17:27:15 2009
From: mhlavink at fedoraproject.org (Michal Hlavinka)
Date: Tue, 27 Jan 2009 17:27:15 +0000 (UTC)
Subject: rpms/pciutils/devel pciutils-3.0.2-multilib.patch, 1.2,
	1.3 pciutils.spec, 1.65, 1.66
Message-ID: <20090127172715.0C3A57010B@cvs1.fedora.phx.redhat.com>

Author: mhlavink

Update of /cvs/extras/rpms/pciutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23196

Modified Files:
	pciutils-3.0.2-multilib.patch pciutils.spec 
Log Message:
fix typo in multilib patch


pciutils-3.0.2-multilib.patch:

Index: pciutils-3.0.2-multilib.patch
===================================================================
RCS file: /cvs/extras/rpms/pciutils/devel/pciutils-3.0.2-multilib.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- pciutils-3.0.2-multilib.patch	9 Dec 2008 18:12:14 -0000	1.2
+++ pciutils-3.0.2-multilib.patch	27 Jan 2009 17:26:44 -0000	1.3
@@ -25,7 +25,7 @@
 +#elif defined(__ppc__)  || defined(__powerpc__)
 +#define PCI_ARCH_PPC
 +#elif defined(__s390x__)
-+define PCI_ARCH_S390X
++#define PCI_ARCH_S390X
 +#elif defined(__s390__)
 +#define PCI_ARCH_S390
 +#elif defined(__alpha__)


Index: pciutils.spec
===================================================================
RCS file: /cvs/extras/rpms/pciutils/devel/pciutils.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- pciutils.spec	20 Jan 2009 10:08:34 -0000	1.65
+++ pciutils.spec	27 Jan 2009 17:26:44 -0000	1.66
@@ -1,6 +1,6 @@
 Name:		pciutils
 Version:	3.1.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
@@ -112,6 +112,9 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Tue Jan 27 2009 Michal Hlavinka <mhlavink at redhat.com> 3.1.0-2
+- fix typo in multilib patch - for s390x building
+
 * Mon Jan 19 2009 Michal Hlavinka <mhlavink at redhat.com> 3.1.0-1
 - version 3.1.0
 



From ltinkl at fedoraproject.org  Tue Jan 27 17:28:25 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Tue, 27 Jan 2009 17:28:25 +0000 (UTC)
Subject: rpms/kdepimlibs/F-9 kdepimlibs-4.1.85-debug-cmake-crash.patch, NONE,
	1.1 kdepimlibs.spec, 1.45, 1.46 sources, 1.23,
	1.24 kdepimlibs-4.1.4-system-libical.patch, 1.1, NONE
Message-ID: <20090127172825.4F0E97010B@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kdepimlibs/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23519

Modified Files:
	kdepimlibs.spec sources 
Added Files:
	kdepimlibs-4.1.85-debug-cmake-crash.patch 
Removed Files:
	kdepimlibs-4.1.4-system-libical.patch 
Log Message:
KDE 4.2.0


kdepimlibs-4.1.85-debug-cmake-crash.patch:

--- NEW FILE kdepimlibs-4.1.85-debug-cmake-crash.patch ---
diff -ur kdepimlibs-4.1.85/qgpgme/CMakeLists.txt kdepimlibs-4.1.85-debug-cmake-crash/qgpgme/CMakeLists.txt
--- kdepimlibs-4.1.85/qgpgme/CMakeLists.txt	2008-12-04 09:34:05.000000000 +0100
+++ kdepimlibs-4.1.85-debug-cmake-crash/qgpgme/CMakeLists.txt	2008-12-12 15:54:33.000000000 +0100
@@ -1,9 +1,13 @@
 
+message( STATUS "qgpgme section 1" )
+
 set( _any_gpgme_found false )
 
 set( _qgpgme_version 1.0.1 )
 set( _qgpgme_soversion 1 )
 
+message( STATUS "qgpgme section 2" )
+
 if ( WIN32 AND GPGME_VANILLA_FOUND )
 
    # on Windows, we require gpgme(-vanilla), which is thread-safe,
@@ -15,6 +19,8 @@
 
 endif ( WIN32 AND GPGME_VANILLA_FOUND )
 
+message( STATUS "qgpgme section 3" )
+
 if ( NOT WIN32 AND GPGME_PTHREAD_FOUND )
 
    # on Unix, we requrie gpgme-pthread (for convenience, since vanilla
@@ -30,6 +36,8 @@
 
 # build / install only if any useable gpgme was found:
 
+message( STATUS "qgpgme section 4" )
+
 if ( _any_gpgme_found )
 
    include_directories( ${GPGME_INCLUDES} ${CMAKE_SOURCE_DIR}/gpgme++ ${Boost_INCLUDE_DIR} )
@@ -59,3 +67,5 @@
      DESTINATION ${INCLUDE_INSTALL_DIR}/qgpgme COMPONENT Devel )
 
 endif ( _any_gpgme_found )
+
+message( STATUS "qgpgme end" )


Index: kdepimlibs.spec
===================================================================
RCS file: /cvs/extras/rpms/kdepimlibs/F-9/kdepimlibs.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- kdepimlibs.spec	8 Jan 2009 10:20:29 -0000	1.45
+++ kdepimlibs.spec	27 Jan 2009 17:27:54 -0000	1.46
@@ -11,15 +11,10 @@
 %define rest 1
 #endif
 
-%if 0%{?fedora} >= 9
-# Use system libical (requires libical-devel >= 0.33)
-# Disabled for now because of #469228
-%define with_libical 1
-%endif
+%define akonadi_version 1.1.1
 
 Name: kdepimlibs
-
-Version: 4.1.4
+Version: 4.2.0
 Release: 1%{?dist}
 Summary: K Desktop Environment 4 - PIM Libraries
 
@@ -28,24 +23,24 @@
 
 URL: http://www.kde.org/
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdepimlibs-%{version}.tar.bz2
-# Use system libical (will be in 4.2)
-Patch100:      kdepimlibs-4.1.4-system-libical.patch
+Patch0: kdepimlibs-4.1.85-debug-cmake-crash.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Requires: akonadi >= %{akonadi_version}
 Requires: kdelibs4 >= %{version}
 
-BuildRequires: akonadi-devel
+BuildRequires: akonadi-devel >= %{akonadi_version} 
 BuildRequires: boost-devel
-BuildRequires: cmake
 BuildRequires: cyrus-sasl-devel
 BuildRequires: gpgme-devel
 BuildRequires: kdelibs4-devel >= %{version}
 BuildRequires: libXpm-devel libXtst-devel
 BuildRequires: openldap-devel
-%if 0%{?with_libical}
 BuildRequires: libical-devel >= 0.33
-%endif
-%{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
+
+# work around circular dependency from kdelibs4-devel
+# pulling in phonon-backend-xine
+#BuildRequires: phonon-backend-gstreamer
 
 ## upstream patches
 
@@ -61,12 +56,14 @@
 
 %package devel
 Group:    Development/Libraries
-Summary:  Development files for %{name} 
+Summary:  Development files for %{name}
 Requires: %{name} = %{version}-%{release}
 Obsoletes: kdepimlibs4-devel < %{version}-%{release}
 Provides:  kdepimlibs4-devel = %{version}-%{release}
 Requires: kdelibs4-devel
 Requires: boost-devel
+# FIXME/HACK, bogus dep -- Rex
+Requires: libical-devel
 
 %description devel
 Header files for developing applications using %{name}.
@@ -83,18 +80,13 @@
 
 %prep
 %setup -q -n kdepimlibs-%{version}
-%if 0%{?with_libical}
-# use system libical
-%patch100 -p1
-rm -rf kcal/libical
-%endif
-
+%patch0 -p1
 
 %build
 
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
-%{cmake_kde4} ..
+%{cmake_kde4} --debug-output ..
 popd
 
 %if 0%{?rest}
@@ -112,7 +104,7 @@
 rm -rf %{buildroot}
 
 %if 0%{?rest}
-make install DESTDIR=%{buildroot} -C %{_target_platform}
+make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
 # move devel symlinks
 mkdir -p %{buildroot}%{_kde4_libdir}/kde4/devel
@@ -145,7 +137,7 @@
 
 
 %clean
-rm -rf %{buildroot} 
+rm -rf %{buildroot}
 
 
 %if 0%{?rest}
@@ -153,9 +145,6 @@
 %defattr(-,root,root,-)
 %{_kde4_appsdir}/akonadi-kde/
 %{_kde4_appsdir}/kabc/
-%if !0%{?with_libical}
-%{_kde4_appsdir}/libical/
-%endif
 %{_kde4_appsdir}/kconf_update/*
 %{_kde4_datadir}/config.kcfg/*
 %{_datadir}/dbus-1/interfaces/*
@@ -163,14 +152,27 @@
 %{_kde4_datadir}/kde4/servicetypes/*
 %{_kde4_libdir}/lib*.so.*
 %{_kde4_libdir}/kde4/*
-%{_kde4_libdir}/gpgmepp/
 %exclude %{_kde4_libdir}/kde4/devel/
+%{_kde4_libdir}/gpgmepp/
+%{_kde4_docdir}/HTML/en/*
+%if 0%{?apidocs}
+%exclude %{_kde4_docdir}/HTML/en/kdepimlibs-apidocs/
+%endif
 
 %files devel
 %defattr(-,root,root,-)
 %{_kde4_appsdir}/cmake/modules/*
 %{_kde4_includedir}/*
 %{_kde4_libdir}/kde4/devel/lib*.so
+
+# CMake seems to change behaviour between F11's cmake (2.6.3rc5)
+# and F10's cmake (2.6.2) -- Lorenzo
+%if 0%{?fedora} > 10
+%{_kde4_libdir}/cmake/KdepimLibs*
+%else
+%{_kde4_libdir}/KdepimLibs*
+%endif
+%{_kde4_libdir}/gpgmepp/
 %endif
 
 %if 0%{?apidocs}
@@ -181,11 +183,41 @@
 
 
 %changelog
-* Thu Jan 08 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.4-1
-- update to 4.1.4
-- reenable system libical, #469228 reportedly fixed upstream now
-- also use the system libical on F9
-- rebase system-libical patch (some line endings changed from CR LF to LF)
+* Thu Jan 22 2009 Than Ngo <than at redhat.com> - 4.2.0-1
+- 4.2.0
+- exclude kdepimlibs-apidocs from main pkg
+
+* Thu Jan 08 2009 Lorenzo Villani <lvillani at binaryhelix.net> - 4.1.96-2
+- fix build on Fedora 10 (cmake < 2.6.3 seems to have a different
+  behaviour here)
+
+* Wed Jan 07 2009 Than Ngo <than at redhat.com> - 4.1.96-1
+- 4.2rc1
+
+* Wed Dec 17 2008 Rex Dieter <rdieter at fedoraproject.org> - 4.1.85-2
+- versioned akonadi(-devel) deps
+
+* Thu Dec 11 2008 Lorenzo Villani <lvillani at binaryhelix.net> - 4.1.85-1
+- KDE 4.2beta2
+
+* Wed Dec 10 2008 Lorenzo Villani <lvillani at binaryhelix.net> - 4.1.82-2
+- add --debug-output to our cmake call, that should fix a reproducible
+  bug with cmake and ppc builds (this work-around should be
+  removed anyway)
+
+* Tue Dec 09 2008 Lorenzo Villani <lvillani at binaryhelix.net> - 4.1.82-1
+- 4.1.82
+
+* Tue Dec 02 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.80-3
+- -devel: Requires: libical-devel
+
+* Thu Nov 20 2008 Than Ngo <than at redhat.com> 4.1.80-2
+- merged
+
+* Thu Nov 20 2008 Lorenzo Villani <lvillani at binaryhelix.net> - 4.1.80-1
+- 4.1.80
+- BR cmake 2.6
+- make install/fast
 
 * Wed Nov 12 2008 Than Ngo <than at redhat.com> 4.1.3-1
 - 4.1.3
@@ -367,7 +399,7 @@
 - dropped -DCMAKE_SKIP_RPATH=TRUE from cmake
 - compiling with QA_RPATHS=0x0003; export QA_RPATHS
 - added libXtst-devel libXpm-devel as BR
-	
+
 * Fri Nov 24 2006 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> 3.80.2-0.2.20061003svn
 - parallel build support
 - added -DCMAKE_SKIP_RPATH=TRUE to cmake to skip rpath


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdepimlibs/F-9/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sources	8 Jan 2009 10:07:32 -0000	1.23
+++ sources	27 Jan 2009 17:27:54 -0000	1.24
@@ -1 +1 @@
-9546430309b1f34707bffdceec0fbc4b  kdepimlibs-4.1.4.tar.bz2
+8a91677e2dca7d4db26b33c78e239e5e  kdepimlibs-4.2.0.tar.bz2


--- kdepimlibs-4.1.4-system-libical.patch DELETED ---



From kkofler at fedoraproject.org  Tue Jan 27 17:31:13 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Tue, 27 Jan 2009 17:31:13 +0000 (UTC)
Subject: rpms/soprano/devel .cvsignore, 1.15, 1.16 soprano.spec, 1.25,
	1.26 sources, 1.15, 1.16
Message-ID: <20090127173113.66D167010B@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/soprano/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24047/devel

Modified Files:
	.cvsignore soprano.spec sources 
Log Message:
* Tue Jan 27 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 2.2-1
- update to 2.2


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/soprano/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	9 Jan 2009 12:58:06 -0000	1.15
+++ .cvsignore	27 Jan 2009 17:30:42 -0000	1.16
@@ -1,2 +1 @@
-soprano-2.1.1.tar.bz2
-soprano-2.1.64.tar.bz2
+soprano-2.2.tar.bz2


Index: soprano.spec
===================================================================
RCS file: /cvs/pkgs/rpms/soprano/devel/soprano.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- soprano.spec	9 Jan 2009 12:58:06 -0000	1.25
+++ soprano.spec	27 Jan 2009 17:30:42 -0000	1.26
@@ -6,7 +6,7 @@
 
 Summary: Qt wrapper API to different RDF storage solutions
 Name:    soprano
-Version: 2.1.64
+Version: 2.2
 Release: 1%{?dist}
 
 Group:   System Environment/Libraries
@@ -108,8 +108,11 @@
 
 
 %changelog
+* Tue Jan 27 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 2.2-1
+- update to 2.2
+
 * Fri Jan 09 2009 Than Ngo <than at redhat.com> - 2.1.64-1
-- update to 2.1.64
+- update to 2.1.64 (2.2 beta 1)
 
 * Sun Sep 28 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 2.1.1-1
 - update to 2.1.1


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/soprano/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	9 Jan 2009 12:58:06 -0000	1.15
+++ sources	27 Jan 2009 17:30:42 -0000	1.16
@@ -1 +1 @@
-f62267c1f904450ab0e9d8cab30d252b  soprano-2.1.64.tar.bz2
+a9642861b3c4f1916a7821847e3d094a  soprano-2.2.tar.bz2



From jakub at fedoraproject.org  Tue Jan 27 17:32:28 2009
From: jakub at fedoraproject.org (Jakub Jelinek)
Date: Tue, 27 Jan 2009 17:32:28 +0000 (UTC)
Subject: rpms/gcc/devel gcc.spec,1.12,1.13 gcc44-cloog-dl.patch,1.1,1.2
Message-ID: <20090127173228.396697010B@cvs1.fedora.phx.redhat.com>

Author: jakub

Update of /cvs/pkgs/rpms/gcc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24260

Modified Files:
	gcc.spec gcc44-cloog-dl.patch 
Log Message:
4.4.0-0.12


Index: gcc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/devel/gcc.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- gcc.spec	27 Jan 2009 16:46:38 -0000	1.12
+++ gcc.spec	27 Jan 2009 17:31:57 -0000	1.13
@@ -3,7 +3,7 @@
 %define gcc_version 4.4.0
 # 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 0.11
+%define gcc_release 0.12
 %define _unpackaged_files_terminate_build 0
 %define multilib_64_archs sparc64 ppc64 s390x x86_64
 %define include_gappletviewer 1
@@ -1747,7 +1747,7 @@
 %doc rpm.doc/changelogs/libmudflap/ChangeLog*
 
 %changelog
-* Tue Jan 27 2009 Jakub Jelinek <jakub at redhat.com> 4.4.0-0.11
+* Tue Jan 27 2009 Jakub Jelinek <jakub at redhat.com> 4.4.0-0.12
 - update from trunk
 - add graphite support
 - change gcc default ISA and tuning:

gcc44-cloog-dl.patch:

Index: gcc44-cloog-dl.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/devel/gcc44-cloog-dl.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gcc44-cloog-dl.patch	27 Jan 2009 16:46:00 -0000	1.1
+++ gcc44-cloog-dl.patch	27 Jan 2009 17:31:57 -0000	1.2
@@ -2,6 +2,7 @@
 
 	* toplev.c (save_argv): No longer static.
 	* Makefile.in (BACKENDLIBS): Link against -ldl instead of -lcloog -lppl.
+	(graphite.o): Force -O, remove -fkeep-inline-functions.
 	* graphite.c: Include <dlfcn.h>.  Reference libcloog and libppl symbols
 	through pointers in cloog_pointers variable.
 	(init_cloog_pointers): New function.
@@ -30,6 +31,16 @@
  # Any system libraries needed just for GNAT.
  SYSLIBS = @GNAT_LIBEXC@
  
+@@ -3076,6 +3076,9 @@ $(out_object_file): $(out_file) $(CONFIG
+ 	$(CC) -c $(ALL_CFLAGS) $(ALL_CPPFLAGS) \
+ 		$(out_file) $(OUTPUT_OPTION)
+ 
++graphite.o : \
++  ALL_CFLAGS := -O $(filter-out -fkeep-inline-functions, $(ALL_CFLAGS))
++
+ # Build auxiliary files that support ecoff format.
+ mips-tfile: mips-tfile.o version.o $(LIBDEPS)
+ 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ mips-tfile.o version.o $(LIBS)
 --- gcc/graphite.c.jj	2009-01-24 19:59:02.000000000 +0100
 +++ gcc/graphite.c	2009-01-27 14:52:08.000000000 +0100
 @@ -59,6 +59,138 @@ along with GCC; see the file COPYING3.  



From davej at fedoraproject.org  Tue Jan 27 17:43:32 2009
From: davej at fedoraproject.org (Dave Jones)
Date: Tue, 27 Jan 2009 17:43:32 +0000 (UTC)
Subject: rpms/kernel/devel patch-2.6.29-rc2-git3.bz2.sign, NONE,
	1.1 .cvsignore, 
	1.997, 1.998 kernel.spec, 1.1235, 1.1236 sources, 1.959,
	1.960 upstream, 1.871, 1.872 patch-2.6.29-rc2-git2.bz2.sign, 1.1, NONE
Message-ID: <20090127174332.AA37C7010B@cvs1.fedora.phx.redhat.com>

Author: davej

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26437

Modified Files:
	.cvsignore kernel.spec sources upstream 
Added Files:
	patch-2.6.29-rc2-git3.bz2.sign 
Removed Files:
	patch-2.6.29-rc2-git2.bz2.sign 
Log Message:
2.6.29-rc2-git3


--- NEW FILE patch-2.6.29-rc2-git3.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBJfve7yGugalF9Dw4RAgW8AJ424Q4v9H6RBeKv4kofpc+aO24WNACfcXkK
JHlq+1jAVSBGzOTU5xwPh58=
=++K1
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.997
retrieving revision 1.998
diff -u -r1.997 -r1.998
--- .cvsignore	27 Jan 2009 02:39:41 -0000	1.997
+++ .cvsignore	27 Jan 2009 17:43:01 -0000	1.998
@@ -5,4 +5,4 @@
 kernel-2.6.28
 linux-2.6.28.tar.bz2
 patch-2.6.29-rc2.bz2
-patch-2.6.29-rc2-git2.bz2
+patch-2.6.29-rc2-git3.bz2


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1235
retrieving revision 1.1236
diff -u -r1.1235 -r1.1236
--- kernel.spec	27 Jan 2009 04:47:26 -0000	1.1235
+++ kernel.spec	27 Jan 2009 17:43:01 -0000	1.1236
@@ -58,7 +58,7 @@
 # The rc snapshot level
 %define rcrev 2
 # The git snapshot level
-%define gitrev 2
+%define gitrev 3
 # Set rpm version accordingly
 %define rpmversion 2.6.%{upstream_sublevel}
 %endif
@@ -1772,6 +1772,9 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Tue Jan 27 2009 Dave Jones <davej at redhat.com>
+- 2.6.29-rc2-git3
+
 * Mon Jan 26 2009 Jarod Wilson <jarod at redhat.com>
 - Update to firewire to latest linux1394-2.6.git tree
   * Adds iso resource allocation code from our own Jay Fenlason


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v
retrieving revision 1.959
retrieving revision 1.960
diff -u -r1.959 -r1.960
--- sources	27 Jan 2009 02:39:42 -0000	1.959
+++ sources	27 Jan 2009 17:43:02 -0000	1.960
@@ -1,3 +1,3 @@
 d351e44709c9810b85e29b877f50968a  linux-2.6.28.tar.bz2
 c8b4ae394659c8723aae2f1bafcb55dc  patch-2.6.29-rc2.bz2
-64c3f0c6f254a4284ebe8436350d9836  patch-2.6.29-rc2-git2.bz2
+7cd3d5d92a64e265cd3e2131496697f2  patch-2.6.29-rc2-git3.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v
retrieving revision 1.871
retrieving revision 1.872
diff -u -r1.871 -r1.872
--- upstream	27 Jan 2009 02:39:42 -0000	1.871
+++ upstream	27 Jan 2009 17:43:02 -0000	1.872
@@ -1,3 +1,3 @@
 linux-2.6.28.tar.bz2
 patch-2.6.29-rc2.bz2
-patch-2.6.29-rc2-git2.bz2
+patch-2.6.29-rc2-git3.bz2


--- patch-2.6.29-rc2-git2.bz2.sign DELETED ---



From dignan at fedoraproject.org  Tue Jan 27 17:43:27 2009
From: dignan at fedoraproject.org (Patrick Dignan)
Date: Tue, 27 Jan 2009 17:43:27 +0000 (UTC)
Subject: rpms/jpcap/F-9 jpcap.spec,1.1,1.2
Message-ID: <20090127174327.34F177010B@cvs1.fedora.phx.redhat.com>

Author: dignan

Update of /cvs/pkgs/rpms/jpcap/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25979

Modified Files:
	jpcap.spec 
Log Message:
* Tue Jan 27 2009 Patrick Dignan <dignan.patrick at, gmail.com> 0.7-6
- Fixed the .jar file to use System.load() and the exact path instead of System.loadLibrary



Index: jpcap.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jpcap/F-9/jpcap.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- jpcap.spec	26 Jan 2009 05:44:10 -0000	1.1
+++ jpcap.spec	27 Jan 2009 17:42:56 -0000	1.2
@@ -7,7 +7,7 @@
 
 Name: jpcap
 Version: 0.7
-Release: 5%{?dist}
+Release: 6%{?dist}
 Summary: A Java library for capturing and sending network packets
 
 Group: Development/Libraries
@@ -35,6 +35,8 @@
 
 %prep
 %setup -q
+sed -i 's:System.loadLibrary("jpcap"):System.load("'%{_libdir}/%{name}/lib%{name}.so'"):g' src/java/%{name}/JpcapWriter.java
+sed -i 's:System.loadLibrary("jpcap"):System.load("'%{_libdir}/%{name}/lib%{name}.so'"):g' src/java/%{name}/JpcapCaptor.java
 rm -rf lib/*
 dos2unix ChangeLog
 dos2unix README
@@ -75,6 +77,8 @@
 
 
 %changelog
+* Tue Jan 27 2009 Patrick Dignan <dignan.patrick at, gmail.com> 0.7-6
+- Uses sed to change System.loadLibrary() to System.load and the exact path of the .so file.
 * Tue Jan 06 2009 Patrick Dignan <jpdota at, sourceforge.net> 0.7-5
 - Fixed End-of-line problems in README, ChangeLog, doc/javadoc/stylesheet.css, and doc/javadoc/package-list
 - Fixed Directory ownership of _libdir/name (macros)



From mhlavink at fedoraproject.org  Tue Jan 27 17:51:42 2009
From: mhlavink at fedoraproject.org (Michal Hlavinka)
Date: Tue, 27 Jan 2009 17:51:42 +0000 (UTC)
Subject: rpms/pciutils/F-10 pciutils-3.0.2-multilib.patch, 1.1,
	1.2 pciutils.spec, 1.63, 1.64
Message-ID: <20090127175142.DA0F77010B@cvs1.fedora.phx.redhat.com>

Author: mhlavink

Update of /cvs/extras/rpms/pciutils/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28381

Modified Files:
	pciutils-3.0.2-multilib.patch pciutils.spec 
Log Message:
fix typo in multilib patch


pciutils-3.0.2-multilib.patch:

Index: pciutils-3.0.2-multilib.patch
===================================================================
RCS file: /cvs/extras/rpms/pciutils/F-10/pciutils-3.0.2-multilib.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pciutils-3.0.2-multilib.patch	22 Sep 2008 08:58:32 -0000	1.1
+++ pciutils-3.0.2-multilib.patch	27 Jan 2009 17:51:12 -0000	1.2
@@ -25,7 +25,7 @@
 +#elif defined(__ppc__)  || defined(__powerpc__)
 +#define PCI_ARCH_PPC
 +#elif defined(__s390x__)
-+define PCI_ARCH_S390X
++#define PCI_ARCH_S390X
 +#elif defined(__s390__)
 +#define PCI_ARCH_S390
 +#elif defined(__alpha__)


Index: pciutils.spec
===================================================================
RCS file: /cvs/extras/rpms/pciutils/F-10/pciutils.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- pciutils.spec	22 Sep 2008 08:58:32 -0000	1.63
+++ pciutils.spec	27 Jan 2009 17:51:12 -0000	1.64
@@ -1,6 +1,6 @@
 Name:		pciutils
 Version:	3.0.2
-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
@@ -114,7 +114,10 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
-* Mon Sep 22 2008 Michal Hlavinka <mhlavink at redhat.com> 3.0.1-1
+* Tue Jan 27 2009 Michal Hlavinka <mhlavink at redhat.com> 3.0.2-1
+- fix typo in multilib patch
+
+* Mon Sep 22 2008 Michal Hlavinka <mhlavink at redhat.com> 3.0.2-1
 - version 3.0.2
 
 * Fri Sep 19 2008 Michal Hlavinka <mhlavink at redhat.com> 3.0.1-1



From rdieter at fedoraproject.org  Tue Jan 27 17:58:01 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Tue, 27 Jan 2009 17:58:01 +0000 (UTC)
Subject: rpms/google-gadgets/F-9 .cvsignore, 1.4, 1.5 google-gadgets.spec,
	1.9, 1.10 sources, 1.4, 1.5
Message-ID: <20090127175801.CA0C67010B@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/google-gadgets/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29614

Modified Files:
	.cvsignore google-gadgets.spec sources 
Log Message:
* Wed Jan 14 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.10.5-1
- 0.10.5, req'd by kde



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/google-gadgets/F-9/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	31 Dec 2008 08:43:57 -0000	1.4
+++ .cvsignore	27 Jan 2009 17:57:31 -0000	1.5
@@ -1 +1 @@
-google-gadgets-for-linux-0.10.4.tar.bz2
+google-gadgets-for-linux-0.10.5.tar.bz2


Index: google-gadgets.spec
===================================================================
RCS file: /cvs/pkgs/rpms/google-gadgets/F-9/google-gadgets.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- google-gadgets.spec	31 Dec 2008 08:43:57 -0000	1.9
+++ google-gadgets.spec	27 Jan 2009 17:57:31 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           google-gadgets
-Version:        0.10.4
-Release:        2%{?dist}
+Version:        0.10.5
+Release:        1%{?dist}
 Summary:        Google Gadgets for Linux
 
 Group:          User Interface/Desktops
@@ -189,6 +189,9 @@
 
 
 %changelog
+* Wed Jan 14 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.10.5-1
+- 0.10.5, req'd by kde
+
 * Tue Dec 30 2008 Michel Salim <salimma at fedoraproject.org> - 0.10.4-2
 - BR: Network-Manager-devel, startup-notification-devel
 - Pass the browser plugin directory to ./configure


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/google-gadgets/F-9/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	31 Dec 2008 08:43:57 -0000	1.4
+++ sources	27 Jan 2009 17:57:31 -0000	1.5
@@ -1 +1 @@
-0ef0a62e0a575388084a77759b646718  google-gadgets-for-linux-0.10.4.tar.bz2
+fdad6bd761b6c603e457b5d0d92ec2f9  google-gadgets-for-linux-0.10.5.tar.bz2



From rishi at fedoraproject.org  Tue Jan 27 18:10:08 2009
From: rishi at fedoraproject.org (Debarshi Ray)
Date: Tue, 27 Jan 2009 18:10:08 +0000 (UTC)
Subject: rpms/emacs-htmlize/F-9 emacs-htmlize.spec, NONE, 1.1 htmlize-init.el,
	NONE, 1.1 htmlize.el, NONE, 1.1 import.log, NONE, 1.1
Message-ID: <20090127181008.A64D07010B@cvs1.fedora.phx.redhat.com>

Author: rishi

Update of /cvs/pkgs/rpms/emacs-htmlize/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31986/F-9

Added Files:
	emacs-htmlize.spec htmlize-init.el htmlize.el import.log 
Log Message:
Initial import into F-9.
 
 Added Files:
 	F-9/emacs-htmlize.spec F-9/htmlize-init.el F-9/htmlize.el 
 	F-9/import.log 



--- NEW FILE emacs-htmlize.spec ---
%define pkg htmlize
%define pkgname HTMLize

%if %($(pkg-config emacs) ; echo $?)
%define emacs_lispdir %{_datadir}/emacs/site-lisp
%define emacs_startdir %{_datadir}/emacs/site-lisp/site-start.d
%define emacs_version 22.2
%else
%define emacs_lispdir %(pkg-config emacs --variable sitepkglispdir)
%define emacs_startdir %(pkg-config emacs --variable sitestartdir)
%define emacs_version %(pkg-config emacs --modversion)
%endif

Summary:	Convert buffer text and decorations to HTML
Name:		emacs-%{pkg}
Version:	1.34
Release:	2%{?dist}
License:	GPLv2+
Group:		Applications/Publishing
URL:		http://www.emacswiki.org/emacs-en/Htmlize
Source0:	http://fly.srk.fer.hr/~hniksic/emacs/%{pkg}.el
Source1:	%{pkg}-init.el

BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

Requires:	emacs(bin) >= emacs_version

BuildRequires:	emacs
BuildRequires:	emacs-el

BuildArch:	noarch

%description
%{pkgname} is an add-on package for GNU Emacs. It converts the buffer text and
the associated decorations to HTML. The conversion is quite sophisticated, it
understands non-ascii characters, looks up colours in the X11 RGB database,
and can generate either CSS or old style font bits.

%package el
Summary:	Emacs Lisp source files for %{name}
Group:		Development/Libraries

Requires:	%{name} = %{version}-%{release}

%description el
This package contains Emacs Lisp source files for %{name} under
GNU Emacs. You do not need to install this package to run %{pkgname}.
Install the %{name} package to use %{pkgname} with GNU Emacs.

%prep
%setup -cT
cp -p %{SOURCE0} .

%build
emacs -batch -f batch-byte-compile ./%{pkg}.el

%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{emacs_lispdir}/%{pkg}
mkdir -p $RPM_BUILD_ROOT%{emacs_startdir}

install -p -m644 ./%{pkg}.el $RPM_BUILD_ROOT%{emacs_lispdir}/%{pkg}
install -p -m644 ./%{pkg}.elc $RPM_BUILD_ROOT%{emacs_lispdir}/%{pkg}
install -p -m644 %{SOURCE1} $RPM_BUILD_ROOT%{emacs_startdir}

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%dir %{emacs_lispdir}/%{pkg}
%{emacs_lispdir}/%{pkg}/%{pkg}.elc
%{emacs_startdir}/%{pkg}-init.el

%files el
%defattr(-,root,root,-)
%{emacs_lispdir}/%{pkg}/%{pkg}.el

%changelog
* Fri Jan 23 2009 Debarshi Ray <rishi at fedoraproject.org> - 1.34-2
- Added copyright and distribution notices to htmlize-init.el.

* Sat Jan 17 2009 Debarshi Ray <rishi at fedoraproject.org> - 1.34-1
- Initial build.


--- NEW FILE htmlize-init.el ---
;; Generated autoloads from htmlize.el
;;
;; Copyright (C) 2009 Debarshi Ray <rishi at fedoraproject.org>
;;
;; All rights reserved.                                                        
;;
;; Copying and distribution of this file, with or without modification, are
;; permitted in any medium without royalty provided the copyright notice and
;; this notice are preserved.

(autoload (quote htmlize-buffer) "htmlize" "\
Convert BUFFER to HTML, preserving colors and decorations.

The generated HTML is available in a new buffer, which is returned.
When invoked interactively, the new buffer is selected in the current
window.  The title of the generated document will be set to the buffer's
file name or, if that's not available, to the buffer's name.

Note that htmlize doesn't fontify your buffers, it only uses the
decorations that are already present.  If you don't set up font-lock or
something else to fontify your buffers, the resulting HTML will be
plain.  Likewise, if you don't like the choice of colors, fix the mode
that created them, or simply alter the faces it uses.

\(fn &optional BUFFER)" t nil)

(autoload (quote htmlize-region) "htmlize" "\
Convert the region to HTML, preserving colors and decorations.
See `htmlize-buffer' for details.

\(fn BEG END)" t nil)

(autoload (quote htmlize-file) "htmlize" "\
Load FILE, fontify it, convert it to HTML, and save the result.

Contents of FILE are inserted into a temporary buffer, whose major mode
is set with `normal-mode' as appropriate for the file type.  The buffer
is subsequently fontified with `font-lock' and converted to HTML.  Note
that, unlike `htmlize-buffer', this function explicitly turns on
font-lock.  If a form of highlighting other than font-lock is desired,
please use `htmlize-buffer' directly on buffers so highlighted.

Buffers currently visiting FILE are unaffected by this function.  The
function does not change current buffer or move the point.

If TARGET is specified and names a directory, the resulting file will be
saved there instead of to FILE's directory.  If TARGET is specified and
does not name a directory, it will be used as output file name.

\(fn FILE &optional TARGET)" t nil)

(autoload (quote htmlize-many-files) "htmlize" "\
Convert FILES to HTML and save the corresponding HTML versions.

FILES should be a list of file names to convert.  This function calls
`htmlize-file' on each file; see that function for details.  When
invoked interactively, you are prompted for a list of files to convert,
terminated with RET.

If TARGET-DIRECTORY is specified, the HTML files will be saved to that
directory.  Normally, each HTML file is saved to the directory of the
corresponding source file.

\(fn FILES &optional TARGET-DIRECTORY)" t nil)

(autoload (quote htmlize-many-files-dired) "htmlize" "\
HTMLize dired-marked files.

\(fn ARG &optional TARGET-DIRECTORY)" t nil)


--- NEW FILE htmlize.el ---
;; htmlize.el -- Convert buffer text and decorations to HTML.

;; Copyright (C) 1997,1998,1999,2000,2001,2002,2003,2005,2006 Hrvoje Niksic

;; Author: Hrvoje Niksic <hniksic at xemacs.org>
;; Keywords: hypermedia, 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, 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; see the file COPYING.  If not, write to the
;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
;; Boston, MA 02111-1307, USA.

;;; Commentary:

;; This package converts the buffer text and the associated
;; decorations to HTML.  Mail to <hniksic at xemacs.org> to discuss
;; features and additions.  All suggestions are more than welcome.

;; To use this, just switch to the buffer you want HTML-ized and type
;; `M-x htmlize-buffer'.  You will be switched to a new buffer that
;; contains the resulting HTML code.  You can edit and inspect this
;; buffer, or you can just save it with C-x C-w.  `M-x htmlize-file'
;; will find a file, fontify it, and save the HTML version in
;; FILE.html, without any additional intervention.  `M-x
;; htmlize-many-files' allows you to htmlize any number of files in
;; the same manner.  `M-x htmlize-many-files-dired' does the same for
;; files marked in a dired buffer.

;; htmlize supports three types of HTML output, selected by setting
;; `htmlize-output-type': `css', `inline-css', and `font'.  In `css'
;; mode, htmlize uses cascading style sheets to specify colors; it
;; generates classes that correspond to Emacs faces and uses <span
;; class=FACE>...</span> to color parts of text.  In this mode, the
;; produced HTML is valid under the 4.01 strict DTD, as confirmed by
;; the W3C validator.  `inline-css' is like `css', except the CSS is
;; put directly in the STYLE attribute of the SPAN element, making it
;; possible to paste the generated HTML to other documents.  In `font'
;; mode, htmlize uses <font color="...">...</font> to colorize HTML,
;; which is not standard-compliant, but works better in older
;; browsers.  `css' mode is the default.

;; You can also use htmlize from your Emacs Lisp code.  When called
;; non-interactively, `htmlize-buffer' and `htmlize-region' will
;; return the resulting HTML buffer, but will not change current
;; buffer or move the point.

;; I tried to make the package elisp-compatible with multiple Emacsen,
;; specifically aiming for XEmacs 19.14+ and GNU Emacs 19.34+.  Please
;; let me know if it doesn't work on some of those, and I'll try to
;; fix it.  I relied heavily on the presence of CL extensions,
;; especially for cross-emacs compatibility; please don't try to
;; remove that particular dependency.  When byte-compiling under GNU
;; Emacs, you're likely to get some warnings; just ignore them.

;; The latest version should be available at:
;;
;;        <http://fly.srk.fer.hr/~hniksic/emacs/htmlize.el>
;;
;; You can find a sample of htmlize's output (possibly generated with
;; an older version) at:
;;
;;        <http://fly.srk.fer.hr/~hniksic/emacs/htmlize.el.html>

;; Thanks go to the multitudes of people who have sent reports and
;; contributed comments, suggestions, and fixes.  They include Ron
;; Gut, Bob Weiner, Toni Drabik, Peter Breton, Thomas Vogels, Juri
;; Linkov, Maciek Pasternacki, and many others.

;; User quotes: "You sir, are a sick, sick, _sick_ person. :)"
;;                  -- Bill Perry, author of Emacs/W3


;;; Code:

(require 'cl)
(eval-when-compile
  (if (string-match "XEmacs" emacs-version)
      (byte-compiler-options
	(warnings (- unresolved))))
  (defvar font-lock-auto-fontify)
  (defvar font-lock-support-mode)
  (defvar global-font-lock-mode)
  (when (and (eq emacs-major-version 19)
	     (not (string-match "XEmacs" emacs-version)))
    ;; Older versions of GNU Emacs fail to autoload cl-extra even when
    ;; `cl' is loaded.
    (load "cl-extra")))

(defconst htmlize-version "1.34")

;; Incantations to make custom stuff work without customize, e.g. on
;; XEmacs 19.14 or GNU Emacs 19.34.
(eval-and-compile
  (condition-case ()
      (require 'custom)
    (error nil))
  (if (and (featurep 'custom) (fboundp 'custom-declare-variable))
      nil				; we've got what we needed
    ;; No custom or obsolete custom, define surrogates.  Define all
    ;; three macros, so we don't hose another library that expects
    ;; e.g. `defface' to work after (fboundp 'defcustom) succeeds.
    (defmacro defgroup (&rest ignored) nil)
    (defmacro defcustom (var value doc &rest ignored)
      `(defvar ,var ,value ,doc))
    (defmacro defface (face value doc &rest stuff)
      `(make-face ,face))))

(defgroup htmlize nil
  "Convert buffer text and faces to HTML."
  :group 'hypermedia)

(defcustom htmlize-head-tags ""
  "*Additional tags to insert within HEAD of the generated document."
  :type 'string
  :group 'htmlize)

(defcustom htmlize-output-type 'css
  "*Output type of generated HTML, one of `css', `inline-css', or `font'.
When set to `css' (the default), htmlize will generate a style sheet
with description of faces, and use it in the HTML document, specifying
the faces in the actual text with <span class=\"FACE\">.

When set to `inline-css', the style will be generated as above, but
placed directly in the STYLE attribute of the span ELEMENT: <span
style=\"STYLE\">.  This makes it easier to paste the resulting HTML to
other documents.

When set to `font', the properties will be set using layout tags
<font>, <b>, <i>, <u>, and <strike>.

`css' output is normally preferred, but `font' is still useful for
supporting old, pre-CSS browsers, and both `inline-css' and `font' for
easier embedding of colorized text in foreign HTML documents (no style
sheet to carry around)."
  :type '(choice (const css) (const inline-css) (const font))
  :group 'htmlize)

(defcustom htmlize-generate-hyperlinks t
  "*Non-nil means generate the hyperlinks for URLs and mail addresses.
This is on by default; set it to nil if you don't want htmlize to
insert hyperlinks in the resulting HTML.  (In which case you can still
do your own hyperlinkification from htmlize-after-hook.)"
  :type 'boolean
  :group 'htmlize)

(defcustom htmlize-hyperlink-style "
      a {
        color: inherit;
        background-color: inherit;
        font: inherit;
        text-decoration: inherit;
      }
      a:hover {
        text-decoration: underline;
      }
"
  "*The CSS style used for hyperlinks when in CSS mode."
  :type 'string
  :group 'htmlize)

(defcustom htmlize-replace-form-feeds t
  "*Non-nil means replace form feeds in source code with HTML separators.
Form feeds are the ^L characters at line beginnings that are sometimes
used to separate sections of source code.  If this variable is set to
`t', form feed characters are replaced with the <hr> separator.  If this
is a string, it specifies the replacement to use.  Note that <pre> is
temporarily closed before the separator is inserted, so the default
replacement is effectively \"</pre><hr /><pre>\".  If you specify
another replacement, don't forget to close and reopen the <pre> if you
want the output to remain valid HTML.

If you need more elaborate processing, set this to nil and use
htmlize-after-hook."
  :type 'boolean
  :group 'htmlize)

(defcustom htmlize-html-charset nil
  "*The charset declared by the resulting HTML documents.
When non-nil, causes htmlize to insert the following in the HEAD section
of the generated HTML:

  <meta http-equiv=\"Content-Type\" content=\"text/html; charset=CHARSET\">

where CHARSET is the value you've set for htmlize-html-charset.  Valid
charsets are defined by MIME and include strings like \"iso-8859-1\",
\"iso-8859-15\", \"utf-8\", etc.

If you are using non-Latin-1 charsets, you might need to set this for
your documents to render correctly.  Also, the W3C validator requires
submitted HTML documents to declare a charset.  So if you care about
validation, you can use this to prevent the validator from bitching.

Needless to say, if you set this, you should actually make sure that
the buffer is in the encoding you're claiming it is in.  (Under Mule
that is done by ensuring the correct \"file coding system\" for the
buffer.)  If you don't understand what that means, this option is
probably not for you."
  :type '(choice (const :tag "Unset" nil)
		 string)
  :group 'htmlize)

(defcustom htmlize-convert-nonascii-to-entities (featurep 'mule)
  "*Whether non-ASCII characters should be converted to HTML entities.

When this is non-nil, characters with codes in the 128-255 range will be
considered Latin 1 and rewritten as \"&#CODE;\".  Characters with codes
above 255 will be converted to \"&#UCS;\", where UCS denotes the Unicode
code point of the character.  If the code point cannot be determined,
the character will be copied unchanged, as would be the case if the
option were nil.

When the option is nil, the non-ASCII characters are copied to HTML
without modification.  In that case, the web server and/or the browser
must be set to understand the encoding that was used when saving the
buffer.  (You might also want to specify it by setting
`htmlize-html-charset'.)

Note that in an HTML entity \"&#CODE;\", CODE is always a UCS code point,
which has nothing to do with the charset the page is in.  For example,
\"&#169;\" *always* refers to the copyright symbol, regardless of charset
specified by the META tag or the charset sent by the HTTP server.  In
other words, \"&#169;\" is exactly equivalent to \"&copy;\".

By default, entity conversion is turned on for Mule-enabled Emacsen and
turned off otherwise.  This is because Mule knows the charset of
non-ASCII characters in the buffer.  A non-Mule Emacs cannot tell
whether a character with code 0xA9 represents Latin 1 copyright symbol,
Latin 2 \"S with caron\", or something else altogether.  Setting this to
t without Mule means asserting that 128-255 characters always mean Latin
1.

For most people htmlize will work fine with this option left at the
default setting; don't change it unless you know what you're doing."
  :type 'sexp
  :group 'htmlize)

(defcustom htmlize-ignore-face-size 'absolute
  "*Whether face size should be ignored when generating HTML.
If this is nil, face sizes are used.  If set to t, sizes are ignored
If set to `absolute', only absolute size specifications are ignored.
Please note that font sizes only work with CSS-based output types."
  :type '(choice (const :tag "Don't ignore" nil)
		 (const :tag "Ignore all" t)
		 (const :tag "Ignore absolute" absolute))
  :group 'htmlize)

(defcustom htmlize-css-name-prefix ""
  "*The prefix used for CSS names.
The CSS names that htmlize generates from face names are often too
generic for CSS files; for example, `font-lock-type-face' is transformed
to `type'.  Use this variable to add a prefix to the generated names.
The string \"htmlize-\" is an example of a reasonable prefix."
  :type 'string
  :group 'htmlize)

(defcustom htmlize-use-rgb-txt t
  "*Whether `rgb.txt' should be used to convert color names to RGB.

This conversion means determining, for instance, that the color
\"IndianRed\" corresponds to the (205, 92, 92) RGB triple.  `rgb.txt'
is the X color database that maps hundreds of color names to such RGB
triples.  When this variable is non-nil, `htmlize' uses `rgb.txt' to
look up color names.

If this variable is nil, htmlize queries Emacs for RGB components of
colors using `color-instance-rgb-components' and `x-color-values'.
This can yield incorrect results on non-true-color displays.

If the `rgb.txt' file is not found (which will be the case if you're
running Emacs on non-X11 systems), this option is ignored."
  :type 'boolean
  :group 'htmlize)

(defcustom htmlize-html-major-mode nil
  "The mode the newly created HTML buffer will be put in.
Set this to nil if you prefer the default (fundamental) mode."
  :type '(radio (const :tag "No mode (fundamental)" nil)
		 (function-item html-mode)
		 (function :tag "User-defined major mode"))
  :group 'htmlize)

(defvar htmlize-before-hook nil
  "Hook run before htmlizing a buffer.
The hook functions are run in the source buffer (not the resulting HTML
buffer).")

(defvar htmlize-after-hook nil
  "Hook run after htmlizing a buffer.
Unlike `htmlize-before-hook', these functions are run in the generated
HTML buffer.  You may use them to modify the outlook of the final HTML
output.")

(defvar htmlize-file-hook nil
  "Hook run by `htmlize-file' after htmlizing a file, but before saving it.")

(defvar htmlize-buffer-places)

;;; Some cross-Emacs compatibility.

;; I try to conditionalize on features rather than Emacs version, but
;; in some cases checking against the version *is* necessary.
(defconst htmlize-running-xemacs (string-match "XEmacs" emacs-version))

(eval-and-compile
  ;; save-current-buffer, with-current-buffer, and with-temp-buffer
  ;; are not available in 19.34 and in older XEmacsen.  Strictly
  ;; speaking, we should stick to our own namespace and define and use
  ;; htmlize-save-current-buffer, etc.  But non-standard special forms
  ;; are a pain because they're not properly fontified or indented and
  ;; because they look weird and ugly.  So I'll just go ahead and
  ;; define the real ones if they're not available.  If someone
  ;; convinces me that this breaks something, I'll switch to the
  ;; "htmlize-" namespace.
  (unless (fboundp 'save-current-buffer)
    (defmacro save-current-buffer (&rest forms)
      `(let ((__scb_current (current-buffer)))
	 (unwind-protect
	     (progn , at forms)
	   (set-buffer __scb_current)))))
  (unless (fboundp 'with-current-buffer)
    (defmacro with-current-buffer (buffer &rest forms)
      `(save-current-buffer (set-buffer ,buffer) , at forms)))
  (unless (fboundp 'with-temp-buffer)
    (defmacro with-temp-buffer (&rest forms)
      (let ((temp-buffer (gensym "tb-")))
	`(let ((,temp-buffer
		(get-buffer-create (generate-new-buffer-name " *temp*"))))
	   (unwind-protect
	       (with-current-buffer ,temp-buffer
		 , at forms)
	     (and (buffer-live-p ,temp-buffer)
		  (kill-buffer ,temp-buffer))))))))

;; We need a function that efficiently finds the next change of a
;; property (usually `face'), preferably regardless of whether the
;; change occurred because of a text property or an extent/overlay.
;; As it turns out, it is not easy to do that compatibly.
;;
;; Under XEmacs, `next-single-property-change' does that.  Under GNU
;; Emacs beginning with version 21, `next-single-char-property-change'
;; is available and does the same.  GNU Emacs 20 had
;; `next-char-property-change', which we can use.  GNU Emacs 19 didn't
;; provide any means for simultaneously examining overlays and text
;; properties, so when using Emacs 19.34, we punt and fall back to
;; `next-single-property-change', thus ignoring overlays altogether.

(cond
 (htmlize-running-xemacs
  ;; XEmacs: good.
  (defun htmlize-next-change (pos prop &optional limit)
    (next-single-property-change pos prop nil (or limit (point-max)))))
 ((fboundp 'next-single-char-property-change)
  ;; GNU Emacs 21: good.
  (defun htmlize-next-change (pos prop &optional limit)
    (next-single-char-property-change pos prop nil limit)))
 ((fboundp 'next-char-property-change)
  ;; GNU Emacs 20: bad, but fixable.
  (defun htmlize-next-change (pos prop &optional limit)
    (let ((done nil)
	  (current-value (get-char-property pos prop))
	  newpos next-value)
      ;; Loop over positions returned by next-char-property-change
      ;; until the value of PROP changes or we've hit EOB.
      (while (not done)
	(setq newpos (next-char-property-change pos limit)
	      next-value (get-char-property newpos prop))
	(cond ((eq newpos pos)
	       ;; Possibly at EOB?  Whatever, just don't infloop.
	       (setq done t))
	      ((eq next-value current-value)
	       ;; PROP hasn't changed -- keep looping.
	       )
	      (t
	       (setq done t)))
	(setq pos newpos))
      pos)))
 (t
  ;; GNU Emacs 19.34: hopeless, cannot properly support overlays.
  (defun htmlize-next-change (pos prop &optional limit)
    (unless limit
      (setq limit (point-max)))
    (let ((res (next-single-property-change pos prop)))
      (if (or (null res)
	      (> res limit))
	  limit
	res)))))

;;; Transformation of buffer text: HTML escapes, untabification, etc.

(defvar htmlize-basic-character-table
  ;; Map characters in the 0-127 range to either one-character strings
  ;; or to numeric entities.
  (let ((table (make-vector 128 ?\0)))
    ;; Map characters in the 32-126 range to themselves, others to
    ;; &#CODE entities;
    (dotimes (i 128)
      (setf (aref table i) (if (and (>= i 32) (<= i 126))
			       (char-to-string i)
			     (format "&#%d;" i))))
    ;; Set exceptions manually.
    (setf
     ;; Don't escape newline, carriage return, and TAB.
     (aref table ?\n) "\n"
     (aref table ?\r) "\r"
     (aref table ?\t) "\t"
     ;; Escape &, <, and >.
     (aref table ?&) "&amp;"
     (aref table ?<) "&lt;"
     (aref table ?>) "&gt;"
     ;; Not escaping '"' buys us a measurable speedup.  It's only
     ;; necessary to quote it for strings used in attribute values,
     ;; which htmlize doesn't do.
     ;(aref table ?\") "&quot;"
     )
    table))

;; A cache of HTML representation of non-ASCII characters.  Depending
;; on availability of `encode-char' and the setting of
;; `htmlize-convert-nonascii-to-entities', this maps non-ASCII
;; characters to either "&#<code>;" or "<char>" (mapconcat's mapper
;; must always return strings).  It's only filled as characters are
;; encountered, so that in a buffer with e.g. French text, it will
;; only ever contain French accented characters as keys.  It's cleared
;; on each entry to htmlize-buffer-1 to allow modifications of
;; `htmlize-convert-nonascii-to-entities' to take effect.
(defvar htmlize-extended-character-cache (make-hash-table :test 'eq))

(defun htmlize-protect-string (string)
  "HTML-protect string, escaping HTML metacharacters and I18N chars."
  ;; Only protecting strings that actually contain unsafe or non-ASCII
  ;; chars removes a lot of unnecessary funcalls and consing.
  (if (not (string-match "[^\r\n\t -%'-;=?-~]" string))
      string
    (mapconcat (lambda (char)
		 (cond
		  ((< char 128)
		   ;; ASCII: use htmlize-basic-character-table.
		   (aref htmlize-basic-character-table char))
		  ((gethash char htmlize-extended-character-cache)
		   ;; We've already seen this char; return the cached
		   ;; string.
		   )
		  ((not htmlize-convert-nonascii-to-entities)
		   ;; If conversion to entities is not desired, always
		   ;; copy the char literally.
		   (setf (gethash char htmlize-extended-character-cache)
			 (char-to-string char)))
		  ((< char 256)
		   ;; Latin 1: no need to call encode-char.
		   (setf (gethash char htmlize-extended-character-cache)
			 (format "&#%d;" char)))
		  ((and (fboundp 'encode-char)
			;; Must check if encode-char works for CHAR;
			;; it fails for Arabic and possibly elsewhere.
			(encode-char char 'ucs))
		   (setf (gethash char htmlize-extended-character-cache)
			 (format "&#%d;" (encode-char char 'ucs))))
		  (t
		   ;; encode-char doesn't work for this char.  Copy it
		   ;; unchanged and hope for the best.
		   (setf (gethash char htmlize-extended-character-cache)
			 (char-to-string char)))))
	       string "")))

(defconst htmlize-ellipsis "...")
(put-text-property 0 (length htmlize-ellipsis) 'htmlize-ellipsis t htmlize-ellipsis)

(defun htmlize-buffer-substring-no-invisible (beg end)
  ;; Like buffer-substring-no-properties, but don't copy invisible
  ;; parts of the region.  Where buffer-substring-no-properties
  ;; mandates an ellipsis to be shown, htmlize-ellipsis is inserted.
  (let ((pos beg)
	visible-list invisible show next-change)
    ;; Iterate over the changes in the `invisible' property and filter
    ;; out the portions where it's non-nil, i.e. where the text is
    ;; invisible.
    (while (< pos end)
      (setq invisible (get-char-property pos 'invisible)
	    next-change (htmlize-next-change pos 'invisible end))
      (if (not (listp buffer-invisibility-spec))
	  ;; If buffer-invisibility-spec is not a list, then all
	  ;; characters with non-nil `invisible' property are visible.
	  (setq show (not invisible))
	;; Otherwise, the value of a non-nil `invisible' property can be:
	;; 1. a symbol -- make the text invisible if it matches
	;;    buffer-invisibility-spec.
	;; 2. a list of symbols -- make the text invisible if
	;;    any symbol in the list matches
	;;    buffer-invisibility-spec.
	;; If the match of buffer-invisibility-spec has a non-nil
	;; CDR, replace the invisible text with an ellipsis.
	(let (match)
	  (if (symbolp invisible)
	      (setq match (member* invisible buffer-invisibility-spec
				   :key (lambda (i)
					  (if (symbolp i) i (car i)))))
	    (setq match (block nil
			  (dolist (elem invisible)
			    (let ((m (member*
				      elem buffer-invisibility-spec
				      :key (lambda (i)
					     (if (symbolp i) i (car i))))))
			      (when m (return m))))
			  nil)))
	  (setq show (cond ((null match) t)
			   ((and (cdr-safe (car match))
				 ;; Conflate successive ellipses.
				 (not (eq show htmlize-ellipsis)))
			    htmlize-ellipsis)
			   (t nil)))))
      (cond ((eq show t)
	     (push (buffer-substring-no-properties pos next-change) visible-list))
	    ((stringp show)
	     (push show visible-list)))
      (setq pos next-change))
    (if (= (length visible-list) 1)
	;; If VISIBLE-LIST consists of only one element, return it
	;; without concatenation.  This avoids additional consing in
	;; regions without any invisible text.
	(car visible-list)
      (apply #'concat (nreverse visible-list)))))

(defun htmlize-trim-ellipsis (text)
  ;; Remove htmlize-ellipses ("...") from the beginning of TEXT if it
  ;; starts with it.  It checks for the special property of the
  ;; ellipsis so it doesn't work on ordinary text that begins with
  ;; "...".
  (if (get-text-property 0 'htmlize-ellipsis text)
      (substring text (length htmlize-ellipsis))
    text))

(defconst htmlize-tab-spaces
  ;; A table of strings with spaces.  (aref htmlize-tab-spaces 5) is
  ;; like (make-string 5 ?\ ), except it doesn't cons.
  (let ((v (make-vector 32 nil)))
    (dotimes (i (length v))
      (setf (aref v i) (make-string i ?\ )))
    v))

(defun htmlize-untabify (text start-column)
  "Untabify TEXT, assuming it starts at START-COLUMN."
  (let ((column start-column)
	(last-match 0)
	(chunk-start 0)
	chunks match-pos tab-size)
    (while (string-match "[\t\n]" text last-match)
      (setq match-pos (match-beginning 0))
      (cond ((eq (aref text match-pos) ?\t)
	     ;; Encountered a tab: create a chunk of text followed by
	     ;; the expanded tab.
	     (push (substring text chunk-start match-pos) chunks)
	     ;; Increase COLUMN by the length of the text we've
	     ;; skipped since last tab or newline.  (Encountering
	     ;; newline resets it.)
	     (incf column (- match-pos last-match))
	     ;; Calculate tab size based on tab-width and COLUMN.
	     (setq tab-size (- tab-width (% column tab-width)))
	     ;; Expand the tab.
	     (push (aref htmlize-tab-spaces tab-size) chunks)
	     (incf column tab-size)
	     (setq chunk-start (1+ match-pos)))
	    (t
	     ;; Reset COLUMN at beginning of line.
	     (setq column 0)))
      (setq last-match (1+ match-pos)))
    ;; If no chunks have been allocated, it means there have been no
    ;; tabs to expand.  Return TEXT unmodified.
    (if (null chunks)
	text
      (when (< chunk-start (length text))
	;; Push the remaining chunk.
	(push (substring text chunk-start) chunks))
      ;; Generate the output from the available chunks.
      (apply #'concat (nreverse chunks)))))

(defun htmlize-despam-address (string)
  "Replace every occurrence of '@' in STRING with &#64;.
`htmlize-make-hyperlinks' uses this to spam-protect mailto links
without modifying their meaning."
  ;; Suggested by Ville Skytta.
  (while (string-match "@" string)
    (setq string (replace-match "&#64;" nil t string)))
  string)

(defun htmlize-make-hyperlinks ()
  "Make hyperlinks in HTML."
  ;; Function originally submitted by Ville Skytta.  Rewritten by
  ;; Hrvoje Niksic, then modified by Ville Skytta and Hrvoje Niksic.
  (goto-char (point-min))
  (while (re-search-forward
	  "&lt;\\(\\(mailto:\\)?\\([-=+_.a-zA-Z0-9]+@[-_.a-zA-Z0-9]+\\)\\)&gt;"
	  nil t)
    (let ((address (match-string 3))
	  (link-text (match-string 1)))
      (delete-region (match-beginning 0) (match-end 0))
      (insert "&lt;<a href=\"mailto:"
	      (htmlize-despam-address address)
	      "\">"
	      (htmlize-despam-address link-text)
	      "</a>&gt;")))
  (goto-char (point-min))
  (while (re-search-forward "&lt;\\(\\(URL:\\)?\\([a-zA-Z]+://[^;]+\\)\\)&gt;"
			    nil t)
    (let ((url (match-string 3))
	  (link-text (match-string 1)))
      (delete-region (match-beginning 0) (match-end 0))
      (insert "&lt;<a href=\"" url "\">" link-text "</a>&gt;"))))

;; Tests for htmlize-make-hyperlinks:

;; <mailto:hniksic at xemacs.org>
;; <http://fly.srk.fer.hr>
;; <URL:http://www.xemacs.org>
;; <http://www.mail-archive.com/bbdb-info at xemacs.org/>
;; <hniksic at xemacs.org>
;; <xalan-dev-sc.10148567319.hacuhiucknfgmpfnjcpg-john=doe.com at xml.apache.org>

(defun htmlize-defang-local-variables ()
  ;; Juri Linkov reports that an HTML-ized "Local variables" can lead
  ;; visiting the HTML to fail with "Local variables list is not
  ;; properly terminated".  He suggested changing the phrase to
  ;; syntactically equivalent HTML that Emacs doesn't recognize.
  (goto-char (point-min))
  (while (search-forward "Local Variables:" nil t)
    (replace-match "Local Variables&#58;" nil t)))
  

;;; Color handling.

(if (fboundp 'locate-file)
    (defalias 'htmlize-locate-file 'locate-file)
  (defun htmlize-locate-file (file path)
    (dolist (dir path nil)
      (when (file-exists-p (expand-file-name file dir))
	(return (expand-file-name file dir))))))

(defvar htmlize-x-library-search-path
  '("/usr/X11R6/lib/X11/"
    "/usr/X11R5/lib/X11/"
    "/usr/lib/X11R6/X11/"
    "/usr/lib/X11R5/X11/"
    "/usr/local/X11R6/lib/X11/"
    "/usr/local/X11R5/lib/X11/"
    "/usr/local/lib/X11R6/X11/"
    "/usr/local/lib/X11R5/X11/"
    "/usr/X11/lib/X11/"
    "/usr/lib/X11/"
    "/usr/local/lib/X11/"
    "/usr/X386/lib/X11/"
    "/usr/x386/lib/X11/"
    "/usr/XFree86/lib/X11/"
    "/usr/unsupported/lib/X11/"
    "/usr/athena/lib/X11/"
    "/usr/local/x11r5/lib/X11/"
    "/usr/lpp/Xamples/lib/X11/"
    "/usr/openwin/lib/X11/"
    "/usr/openwin/share/lib/X11/"))

(defun htmlize-get-color-rgb-hash (&optional rgb-file)
  "Return a hash table mapping X color names to RGB values.
The keys in the hash table are X11 color names, and the values are the
#rrggbb RGB specifications, extracted from `rgb.txt'.

If RGB-FILE is nil, the function will try hard to find a suitable file
in the system directories.

If no rgb.txt file is found, return nil."
  (let ((rgb-file (or rgb-file (htmlize-locate-file
				"rgb.txt"
				htmlize-x-library-search-path)))
	(hash nil))
    (when rgb-file
      (with-temp-buffer
	(insert-file-contents rgb-file)
	(setq hash (make-hash-table :test 'equal))
	(while (not (eobp))
	  (cond ((looking-at "^\\s-*\\([!#]\\|$\\)")
		 ;; Skip comments and empty lines.
		 )
		((looking-at
		  "[ \t]*\\([0-9]+\\)[ \t]+\\([0-9]+\\)[ \t]+\\([0-9]+\\)[ \t]+\\(.*\\)")
		 (setf (gethash (downcase (match-string 4)) hash)
		       (format "#%02x%02x%02x"
			       (string-to-number (match-string 1))
			       (string-to-number (match-string 2))
			       (string-to-number (match-string 3)))))
		(t
		 (error
		  "Unrecognized line in %s: %s"
		  rgb-file
		  (buffer-substring (point) (progn (end-of-line) (point))))))
	  (forward-line 1))))
    hash))

;; Compile the RGB map when loaded.  On systems where rgb.txt is
;; missing, the value of the variable will be nil, and rgb.txt will
;; not be used.
(defvar htmlize-color-rgb-hash (htmlize-get-color-rgb-hash))

;;; Face handling.

(defun htmlize-face-specifies-property (face prop)
  ;; Return t if face specifies PROP, as opposed to it being inherited
  ;; from the default face.  The problem with e.g.
  ;; `face-foreground-instance' is that it returns an instance for
  ;; EVERY face because every face inherits from the default face.
  ;; However, we'd like htmlize-face-{fore,back}ground to return nil
  ;; when called with a face that doesn't specify its own foreground
  ;; or background.
  (or (eq face 'default)
      (assq 'global (specifier-spec-list (face-property face prop)))))

(defun htmlize-face-color-internal (face fg)
  ;; Used only under GNU Emacs.  Return the color of FACE, but don't
  ;; return "unspecified-fg" or "unspecified-bg".  If the face is
  ;; `default' and the color is unspecified, look up the color in
  ;; frame parameters.
  (let* ((function (if fg #'face-foreground #'face-background))
	 color)
    (if (>= emacs-major-version 22)
	;; For GNU Emacs 22+ set INHERIT to get the inherited values.
	(setq color (funcall function face nil t))
      (setq color (funcall function face))
      ;; For GNU Emacs 21 (which has `face-attribute'): if the color
      ;; is nil, recursively check for the face's parent.
      (when (and (null color)
		 (fboundp 'face-attribute)
		 (face-attribute face :inherit)
		 (not (eq (face-attribute face :inherit) 'unspecified)))
	(setq color (htmlize-face-color-internal
		     (face-attribute face :inherit) fg))))
    (when (and (eq face 'default) (null color))
      (setq color (cdr (assq (if fg 'foreground-color 'background-color)
			     (frame-parameters)))))
    (when (or (eq color 'unspecified)
	      (equal color "unspecified-fg")
	      (equal color "unspecified-bg"))
      (setq color nil))
    (when (and (eq face 'default)
	       (null color))
      ;; Assuming black on white doesn't seem right, but I can't think
      ;; of anything better to do.
      (setq color (if fg "black" "white")))
    color))

(defun htmlize-face-foreground (face)
  ;; Return the name of the foreground color of FACE.  If FACE does
  ;; not specify a foreground color, return nil.
  (cond (htmlize-running-xemacs
	 ;; XEmacs.
	 (and (htmlize-face-specifies-property face 'foreground)
	      (color-instance-name (face-foreground-instance face))))
	(t
	 ;; GNU Emacs.
	 (htmlize-face-color-internal face t))))

(defun htmlize-face-background (face)
  ;; Return the name of the background color of FACE.  If FACE does
  ;; not specify a background color, return nil.
  (cond (htmlize-running-xemacs
	 ;; XEmacs.
	 (and (htmlize-face-specifies-property face 'background)
	      (color-instance-name (face-background-instance face))))
	(t
	 ;; GNU Emacs.
	 (htmlize-face-color-internal face nil))))

;; Convert COLOR to the #RRGGBB string.  If COLOR is already in that
;; format, it's left unchanged.

(defun htmlize-color-to-rgb (color)
  (let ((rgb-string nil))
    (cond ((null color)
	   ;; Ignore nil COLOR because it means that the face is not
	   ;; specifying any color.  Hence (htmlize-color-to-rgb nil)
	   ;; returns nil.
	   )
	  ((string-match "\\`#" color)
	   ;; The color is already in #rrggbb format.
	   (setq rgb-string color))
	  ((and htmlize-use-rgb-txt
		htmlize-color-rgb-hash)
	   ;; Use of rgb.txt is requested, and it's available on the
	   ;; system.  Use it.
	   (setq rgb-string (gethash (downcase color) htmlize-color-rgb-hash)))
	  (t
	   ;; We're getting the RGB components from Emacs.
	   (let ((rgb
		  ;; Here I cannot conditionalize on (fboundp ...) 
		  ;; because ps-print under some versions of GNU Emacs
		  ;; defines its own dummy version of
		  ;; `color-instance-rgb-components'.
		  (if htmlize-running-xemacs
		      (mapcar (lambda (arg)
				(/ arg 256))
			      (color-instance-rgb-components
			       (make-color-instance color)))
		    (mapcar (lambda (arg)
			      (/ arg 256))
			    (x-color-values color)))))
	     (when rgb
	       (setq rgb-string (apply #'format "#%02x%02x%02x" rgb))))))
    ;; If RGB-STRING is still nil, it means the color cannot be found,
    ;; for whatever reason.  In that case just punt and return COLOR.
    ;; Most browsers support a decent set of color names anyway.
    (or rgb-string color)))

;; We store the face properties we care about into an
;; `htmlize-fstruct' type.  That way we only have to analyze face
;; properties, which can be time consuming, once per each face.  The
;; mapping between Emacs faces and htmlize-fstructs is established by
;; htmlize-make-face-map.  The name "fstruct" refers to variables of
;; type `htmlize-fstruct', while the term "face" is reserved for Emacs
;; faces.

(defstruct htmlize-fstruct
  foreground				; foreground color, #rrggbb
  background				; background color, #rrggbb
  size					; size
  boldp					; whether face is bold
  italicp				; whether face is italic
  underlinep				; whether face is underlined
  overlinep				; whether face is overlined
  strikep				; whether face is struck through
  css-name				; CSS name of face
  )

(defun htmlize-face-emacs21-attr (fstruct attr value)
  ;; For ATTR and VALUE, set the equivalent value in FSTRUCT.
  (case attr
    (:foreground
     (setf (htmlize-fstruct-foreground fstruct) (htmlize-color-to-rgb value)))
    (:background
     (setf (htmlize-fstruct-background fstruct) (htmlize-color-to-rgb value)))
    (:height
     (setf (htmlize-fstruct-size fstruct) value))
    (:weight
     (when (string-match (symbol-name value) "bold")
       (setf (htmlize-fstruct-boldp fstruct) t)))
    (:slant
     (setf (htmlize-fstruct-italicp fstruct) (or (eq value 'italic)
						 (eq value 'oblique))))
    (:bold
     (setf (htmlize-fstruct-boldp fstruct) value))
    (:italic
     (setf (htmlize-fstruct-italicp fstruct) value))
    (:underline
     (setf (htmlize-fstruct-underlinep fstruct) value))
    (:overline
     (setf (htmlize-fstruct-overlinep fstruct) value))
    (:strike-through
     (setf (htmlize-fstruct-strikep fstruct) value))))

(defun htmlize-face-size (face)
  ;; The size (height) of FACE, taking inheritance into account.
  ;; Only works in Emacs 21 and later.
  (let ((size-list
	 (loop
	  for f = face then (face-attribute f :inherit)
	  until (eq f 'unspecified)
	  for h = (face-attribute f :height)
	  collect (if (eq h 'unspecified) nil h))))
    (reduce 'htmlize-merge-size (cons nil size-list))))

(defun htmlize-face-to-fstruct (face)
  "Convert Emacs face FACE to fstruct."
  (let ((fstruct (make-htmlize-fstruct
		  :foreground (htmlize-color-to-rgb
			       (htmlize-face-foreground face))
		  :background (htmlize-color-to-rgb
			       (htmlize-face-background face)))))
    (cond (htmlize-running-xemacs
	   ;; XEmacs doesn't provide a way to detect whether a face is
	   ;; bold or italic, so we need to examine the font instance.
	   ;; #### This probably doesn't work under MS Windows and/or
	   ;; GTK devices.  I'll need help with those.
	   (let* ((font-instance (face-font-instance face))
		  (props (font-instance-properties font-instance)))
	     (when (equalp (cdr (assq 'WEIGHT_NAME props)) "bold")
	       (setf (htmlize-fstruct-boldp fstruct) t))
	     (when (or (equalp (cdr (assq 'SLANT props)) "i")
		       (equalp (cdr (assq 'SLANT props)) "o"))
	       (setf (htmlize-fstruct-italicp fstruct) t))
	     (setf (htmlize-fstruct-strikep fstruct)
		   (face-strikethru-p face))
	     (setf (htmlize-fstruct-underlinep fstruct)
		   (face-underline-p face))))
	  ((fboundp 'face-attribute)
	   ;; GNU Emacs 21 and further.
	   (dolist (attr '(:weight :slant :underline :overline :strike-through))
	     (let ((value (if (>= emacs-major-version 22)
			      ;; Use the INHERIT arg in GNU Emacs 22.
			      (face-attribute face attr nil t)
			    ;; Otherwise, fake it.
			    (let ((face face))
			      (while (and (eq (face-attribute face attr)
					      'unspecified)
					  (not (eq (face-attribute face :inherit)
						   'unspecified)))
				(setq face (face-attribute face :inherit)))
			      (face-attribute face attr)))))
	       (when (and value (not (eq value 'unspecified)))
		 (htmlize-face-emacs21-attr fstruct attr value))))
	   (let ((size (htmlize-face-size face)))
	     (unless (eql size 1.0) 	; ignore non-spec
	       (setf (htmlize-fstruct-size fstruct) size))))
	  (t
	   ;; Older GNU Emacs.  Some of these functions are only
	   ;; available under Emacs 20+, hence the guards.
	   (when (fboundp 'face-bold-p)
	     (setf (htmlize-fstruct-boldp fstruct) (face-bold-p face)))
	   (when (fboundp 'face-italic-p)
	     (setf (htmlize-fstruct-italicp fstruct) (face-italic-p face)))
	   (setf (htmlize-fstruct-underlinep fstruct)
		 (face-underline-p face))))
    ;; Generate the css-name property.  Emacs places no restrictions
    ;; on the names of symbols that represent faces -- any characters
    ;; may be in the name, even ^@.  We try hard to beat the face name
    ;; into shape, both esthetically and according to CSS1 specs.
    (setf (htmlize-fstruct-css-name fstruct)
	  (let ((name (downcase (symbol-name face))))
	    (when (string-match "\\`font-lock-" name)
	      ;; Change font-lock-FOO-face to FOO.
	      (setq name (replace-match "" t t name)))
	    (when (string-match "-face\\'" name)
	      ;; Drop the redundant "-face" suffix.
	      (setq name (replace-match "" t t name)))
	    (while (string-match "[^-a-zA-Z0-9]" name)
	      ;; Drop the non-alphanumerics.
	      (setq name (replace-match "X" t t name)))
	    (when (string-match "\\`[-0-9]" name)
	      ;; CSS identifiers may not start with a digit.
	      (setq name (concat "X" name)))
	    ;; After these transformations, the face could come
	    ;; out empty.
	    (when (equal name "")
	      (setq name "face"))
	    ;; Apply the prefix.
	    (setq name (concat htmlize-css-name-prefix name))
	    name))
    fstruct))

(defmacro htmlize-copy-attr-if-set (attr-list dest source)
  ;; Expand the code of the type
  ;; (and (htmlize-fstruct-ATTR source)
  ;;      (setf (htmlize-fstruct-ATTR dest) (htmlize-fstruct-ATTR source)))
  ;; for the given list of boolean attributes.
  (cons 'progn
	(loop for attr in attr-list
	      for attr-sym = (intern (format "htmlize-fstruct-%s" attr))
	      collect `(and (,attr-sym ,source)
			    (setf (,attr-sym ,dest) (,attr-sym ,source))))))

(defun htmlize-merge-size (merged next)
  ;; Calculate the size of the merge of MERGED and NEXT.
  (cond ((null merged)     next)
	((integerp next)   next)
	((null next)       merged)
	((floatp merged)   (* merged next))
	((integerp merged) (round (* merged next)))))

(defun htmlize-merge-two-faces (merged next)
  (htmlize-copy-attr-if-set
   (foreground background boldp italicp underlinep overlinep strikep)
   merged next)
  (setf (htmlize-fstruct-size merged)
	(htmlize-merge-size (htmlize-fstruct-size merged)
			    (htmlize-fstruct-size next)))
  merged)

(defun htmlize-merge-faces (fstruct-list)
  (cond ((null fstruct-list)
	 ;; Nothing to do, return a dummy face.
	 (make-htmlize-fstruct))
	((null (cdr fstruct-list))
	 ;; Optimize for the common case of a single face, simply
	 ;; return it.
	 (car fstruct-list))
	(t
	 (reduce #'htmlize-merge-two-faces
		 (cons (make-htmlize-fstruct) fstruct-list)))))

;; GNU Emacs 20+ supports attribute lists in `face' properties.  For
;; example, you can use `(:foreground "red" :weight bold)' as an
;; overlay's "face", or you can even use a list of such lists, etc.
;; We call those "attrlists".
;;
;; htmlize supports attrlist by converting them to fstructs, the same
;; as with regular faces.

(defun htmlize-attrlist-to-fstruct (attrlist)
  ;; Like htmlize-face-to-fstruct, but accepts an ATTRLIST as input.
  (let ((fstruct (make-htmlize-fstruct)))
    (cond ((eq (car attrlist) 'foreground-color)
	   ;; ATTRLIST is (foreground-color . COLOR)
	   (setf (htmlize-fstruct-foreground fstruct)
		 (htmlize-color-to-rgb (cdr attrlist))))
	  ((eq (car attrlist) 'background-color)
	   ;; ATTRLIST is (background-color . COLOR)
	   (setf (htmlize-fstruct-background fstruct)
		 (htmlize-color-to-rgb (cdr attrlist))))
	  (t
	   ;; ATTRLIST is a plist.
	   (while attrlist
	     (let ((attr (pop attrlist))
		   (value (pop attrlist)))
	       (when (and value (not (eq value 'unspecified)))
		 (htmlize-face-emacs21-attr fstruct attr value))))))
    (setf (htmlize-fstruct-css-name fstruct) "ATTRLIST")
    fstruct))

(defun htmlize-face-list-p (face-prop)
  "Return non-nil if FACE-PROP is a list of faces, nil otherwise."
  ;; If not for attrlists, this would return (listp face-prop).  This
  ;; way we have to be more careful because attrlist is also a list!
  (cond
   ((eq face-prop nil)
    ;; FACE-PROP being nil means empty list (no face), so return t.
    t)
   ((symbolp face-prop)
    ;; A symbol other than nil means that it's only one face, so return
    ;; nil.
    nil)
   ((not (consp face-prop))
    ;; Huh?  Not a symbol or cons -- treat it as a single element.
    nil)
   (t
    ;; We know that FACE-PROP is a cons: check whether it looks like an
    ;; ATTRLIST.
    (let* ((car (car face-prop))
	   (attrlist-p (and (symbolp car)
			    (or (eq car 'foreground-color)
				(eq car 'background-color)
				(eq (aref (symbol-name car) 0) ?:)))))
      ;; If FACE-PROP is not an ATTRLIST, it means it's a list of
      ;; faces.
      (not attrlist-p)))))

(defun htmlize-make-face-map (faces)
  ;; Return a hash table mapping Emacs faces to htmlize's fstructs.
  ;; The keys are either face symbols or attrlists, so the test
  ;; function must be `equal'.
  (let ((face-map (make-hash-table :test 'equal))
	css-names)
    (dolist (face faces)
      (unless (gethash face face-map)
	;; Haven't seen FACE yet; convert it to an fstruct and cache
	;; it.
	(let ((fstruct (if (symbolp face)
			   (htmlize-face-to-fstruct face)
			 (htmlize-attrlist-to-fstruct face))))
	  (setf (gethash face face-map) fstruct)
	  (let* ((css-name (htmlize-fstruct-css-name fstruct))
		 (new-name css-name)
		 (i 0))
	    ;; Uniquify the face's css-name by using NAME-1, NAME-2,
	    ;; etc.
	    (while (member new-name css-names)
	      (setq new-name (format "%s-%s" css-name (incf i))))
	    (unless (equal new-name css-name)
	      (setf (htmlize-fstruct-css-name fstruct) new-name))
	    (push new-name css-names)))))
    face-map))

(defun htmlize-unstringify-face (face)
  "If FACE is a string, return it interned, otherwise return it unchanged."
  (if (stringp face)
      (intern face)
    face))

(defun htmlize-faces-in-buffer ()
  "Return a list of faces used in the current buffer.
Under XEmacs, this returns the set of faces specified by the extents
with the `face' property.  (This covers text properties as well.)  Under
GNU Emacs, it returns the set of faces specified by the `face' text
property and by buffer overlays that specify `face'."
  (let (faces)
    ;; Testing for (fboundp 'map-extents) doesn't work because W3
    ;; defines `map-extents' under FSF.
    (if htmlize-running-xemacs
	(let (face-prop)
	  (map-extents (lambda (extent ignored)
			 (setq face-prop (extent-face extent)
			       ;; FACE-PROP can be a face or a list of
			       ;; faces.
			       faces (if (listp face-prop)
					 (union face-prop faces)
				       (adjoin face-prop faces)))
			 nil)
		       nil
		       ;; Specify endpoints explicitly to respect
		       ;; narrowing.
		       (point-min) (point-max) nil nil 'face))
      ;; FSF Emacs code.
      ;; Faces used by text properties.
      (let ((pos (point-min)) face-prop next)
	(while (< pos (point-max))
	  (setq face-prop (get-text-property pos 'face)
		next (or (next-single-property-change pos 'face) (point-max)))
	  ;; FACE-PROP can be a face/attrlist or a list thereof.
	  (setq faces (if (htmlize-face-list-p face-prop)
			  (nunion (mapcar #'htmlize-unstringify-face face-prop)
				  faces :test 'equal)
			(adjoin (htmlize-unstringify-face face-prop)
				faces :test 'equal)))
	  (setq pos next)))
      ;; Faces used by overlays.
      (dolist (overlay (overlays-in (point-min) (point-max)))
	(let ((face-prop (overlay-get overlay 'face)))
	  ;; FACE-PROP can be a face/attrlist or a list thereof.
	  (setq faces (if (htmlize-face-list-p face-prop)
			  (nunion (mapcar #'htmlize-unstringify-face face-prop)
				  faces :test 'equal)
			(adjoin (htmlize-unstringify-face face-prop)
				faces :test 'equal))))))
    faces))

;; htmlize-faces-at-point returns the faces in use at point.  The
;; faces are sorted by increasing priority, i.e. the last face takes
;; precedence.
;;
;; Under XEmacs, this returns all the faces in all the extents at
;; point.  Under GNU Emacs, this returns all the faces in the `face'
;; property and all the faces in the overlays at point.

(cond (htmlize-running-xemacs
       (defun htmlize-faces-at-point ()
	 (let (extent extent-list face-list face-prop)
	   (while (setq extent (extent-at (point) nil 'face extent))
	     (push extent extent-list))
	   ;; extent-list is in reverse display order, meaning that
	   ;; smallest ones come last.  That is the order we want,
	   ;; except it can be overridden by the `priority' property.
	   (setq extent-list (stable-sort extent-list #'<
					  :key #'extent-priority))
	   (dolist (extent extent-list)
	     (setq face-prop (extent-face extent))
	     ;; extent's face-list is in reverse order from what we
	     ;; want, but the `nreverse' below will take care of it.
	     (setq face-list (if (listp face-prop)
				 (append face-prop face-list)
			       (cons face-prop face-list))))
	   (nreverse face-list))))
      (t
       (defun htmlize-faces-at-point ()
	 (let (all-faces)
	   ;; Faces from text properties.
	   (let ((face-prop (get-text-property (point) 'face)))
	     (setq all-faces (if (htmlize-face-list-p face-prop)
				 (nreverse (mapcar #'htmlize-unstringify-face
						   face-prop))
			       (list (htmlize-unstringify-face face-prop)))))
	   ;; Faces from overlays.
	   (let ((overlays
		  ;; Collect overlays at point that specify `face'.
		  (delete-if-not (lambda (o)
				   (overlay-get o 'face))
				 (overlays-at (point))))
		 list face-prop)
	     ;; Sort the overlays so the smaller (more specific) ones
	     ;; come later.  The number of overlays at each one
	     ;; position should be very small, so the sort shouldn't
	     ;; slow things down.
	     (setq overlays (sort* overlays
				   ;; Sort by ascending...
				   #'<
				   ;; ...overlay size.
				   :key (lambda (o)
					  (- (overlay-end o)
					     (overlay-start o)))))
	     ;; Overlay priorities, if present, override the above
	     ;; established order.  Larger overlay priority takes
	     ;; precedence and therefore comes later in the list.
	     (setq overlays (stable-sort
			     overlays
			     ;; Reorder (stably) by acending...
			     #'<
			     ;; ...overlay priority.
			     :key (lambda (o)
				    (or (overlay-get o 'priority) 0))))
	     (dolist (overlay overlays)
	       (setq face-prop (overlay-get overlay 'face))
	       (setq list (if (htmlize-face-list-p face-prop)
			      (nconc (nreverse (mapcar
						#'htmlize-unstringify-face
						face-prop))
				     list)
			    (cons (htmlize-unstringify-face face-prop) list))))
	     ;; Under "Merging Faces" the manual explicitly states
	     ;; that faces specified by overlays take precedence over
	     ;; faces specified by text properties.
	     (setq all-faces (nconc all-faces list)))
	   all-faces))))

;; htmlize supports generating HTML in two several fundamentally
;; different ways, one with the use of CSS and nested <span> tags, and
;; the other with the use of the old <font> tags.  Rather than adding
;; a bunch of ifs to many places, we take a semi-OO approach.
;; `htmlize-buffer-1' calls a number of "methods", which indirect to
;; the functions that depend on `htmlize-output-type'.  The currently
;; used methods are `doctype', `insert-head', `body-tag', and
;; `insert-text'.  Not all output types define all methods.
;;
;; Methods are called either with (htmlize-method METHOD ARGS...) 
;; special form, or by accessing the function with
;; (htmlize-method-function 'METHOD) and calling (funcall FUNCTION).
;; The latter form is useful in tight loops because `htmlize-method'
;; conses.
;;
;; Currently defined output types are `css' and `font'.

(defmacro htmlize-method (method &rest args)
  ;; Expand to (htmlize-TYPE-METHOD ...ARGS...).  TYPE is the value of
  ;; `htmlize-output-type' at run time.
  `(funcall (htmlize-method-function ',method) , at args))

(defun htmlize-method-function (method)
  ;; Return METHOD's function definition for the current output type.
  ;; The returned object can be safely funcalled.
  (let ((sym (intern (format "htmlize-%s-%s" htmlize-output-type method))))
    (indirect-function (if (fboundp sym)
			   sym
			 (let ((default (intern (concat "htmlize-default-"
							(symbol-name method)))))
			   (if (fboundp default)
			       default
			     'ignore))))))

(defvar htmlize-memoization-table (make-hash-table :test 'equal))

(defmacro htmlize-memoize (key generator)
  "Return the value of GENERATOR, memoized as KEY.
That means that GENERATOR will be evaluated and returned the first time
it's called with the same value of KEY.  All other times, the cached
\(memoized) value will be returned."
  (let ((value (gensym)))
    `(let ((,value (gethash ,key htmlize-memoization-table)))
       (unless ,value
	 (setq ,value ,generator)
	 (setf (gethash ,key htmlize-memoization-table) ,value))
       ,value)))

;;; Default methods.

(defun htmlize-default-doctype ()
  nil					; no doc-string
  ;; According to DTDs published by the W3C, it is illegal to embed
  ;; <font> in <pre>.  This makes sense in general, but is bad for
  ;; htmlize's intended usage of <font> to specify the document color.

  ;; To make generated HTML legal, htmlize's `font' mode used to
  ;; specify the SGML declaration of "HTML Pro" DTD here.  HTML Pro
  ;; aka Silmaril DTD was a project whose goal was to produce a GPL'ed
  ;; DTD that would encompass all the incompatible HTML extensions
  ;; procured by Netscape, MSIE, and other players in the field.
  ;; Apparently the project got abandoned, the last available version
  ;; being "Draft 0 Revision 11" from January 1997, as documented at
  ;; <http://imbolc.ucc.ie/~pflynn/articles/htmlpro.html>.

  ;; Since by now HTML Pro is remembered by none but the most die-hard
  ;; early-web-days nostalgics and used by not even them, there is no
  ;; use in specifying it.  So we return the standard HTML 4.0
  ;; declaration, which makes generated HTML technically illegal.  If
  ;; you have a problem with that, use the `css' engine designed to
  ;; create fully conforming HTML.

  "<!DOCTYPE html PUBLIC \"-//W3C//DTD HTML 4.01//EN\">"

  ;; Now-abandoned HTML Pro declaration.
  ;"<!DOCTYPE HTML PUBLIC \"+//Silmaril//DTD HTML Pro v0r11 19970101//EN\">"
  )

(defun htmlize-default-body-tag (face-map)
  nil					; no doc-string
  "<body>")

;;; CSS based output support.

;; Internal function; not a method.
(defun htmlize-css-specs (fstruct)
  (let (result)
    (when (htmlize-fstruct-foreground fstruct)
      (push (format "color: %s;" (htmlize-fstruct-foreground fstruct))
	    result))
    (when (htmlize-fstruct-background fstruct)
      (push (format "background-color: %s;"
		    (htmlize-fstruct-background fstruct))
	    result))
    (let ((size (htmlize-fstruct-size fstruct)))
      (when (and size (not (eq htmlize-ignore-face-size t)))
	(cond ((floatp size)
	       (push (format "font-size: %d%%;" (* 100 size)) result))
	      ((not (eq htmlize-ignore-face-size 'absolute))
	       (push (format "font-size: %spt;" (/ size 10.0)) result)))))
    (when (htmlize-fstruct-boldp fstruct)
      (push "font-weight: bold;" result))
    (when (htmlize-fstruct-italicp fstruct)
      (push "font-style: italic;" result))
    (when (htmlize-fstruct-underlinep fstruct)
      (push "text-decoration: underline;" result))
    (when (htmlize-fstruct-overlinep fstruct)
      (push "text-decoration: overline;" result))
    (when (htmlize-fstruct-strikep fstruct)
      (push "text-decoration: line-through;" result))
    (nreverse result)))

(defun htmlize-css-insert-head (buffer-faces face-map)
  (insert "    <style type=\"text/css\">\n    <!--\n")
  (insert "      body {\n        "
	  (mapconcat #'identity
		     (htmlize-css-specs (gethash 'default face-map))
		     "\n        ")
	  "\n      }\n")
  (dolist (face (sort* (copy-list buffer-faces) #'string-lessp
		       :key (lambda (f)
			      (htmlize-fstruct-css-name (gethash f face-map)))))
    (let* ((fstruct (gethash face face-map))
	   (cleaned-up-face-name
	    (let ((s
		   ;; Use `prin1-to-string' rather than `symbol-name'
		   ;; to get the face name because the "face" can also
		   ;; be an attrlist, which is not a symbol.
		   (prin1-to-string face)))
	      ;; If the name contains `--' or `*/', remove them.
	      (while (string-match "--" s)
		(setq s (replace-match "-" t t s)))
	      (while (string-match "\\*/" s)
		(setq s (replace-match "XX" t t s)))
	      s))
	   (specs (htmlize-css-specs fstruct)))
      (insert "      ." (htmlize-fstruct-css-name fstruct))
      (if (null specs)
	  (insert " {")
	(insert " {\n        /* " cleaned-up-face-name " */\n        "
		(mapconcat #'identity specs "\n        ")))
      (insert "\n      }\n")))
  (insert htmlize-hyperlink-style
	  "    -->\n    </style>\n"))

(defun htmlize-css-insert-text (text fstruct-list buffer)
  ;; Insert TEXT colored with FACES into BUFFER.  In CSS mode, this is
  ;; easy: just nest the text in one <span class=...> tag for each
  ;; face in FSTRUCT-LIST.
  (dolist (fstruct fstruct-list)
    (princ "<span class=\"" buffer)
    (princ (htmlize-fstruct-css-name fstruct) buffer)
    (princ "\">" buffer))
  (princ text buffer)
  (dolist (fstruct fstruct-list)
    (ignore fstruct)			; shut up the byte-compiler
    (princ "</span>" buffer)))

;; `inline-css' output support.

(defun htmlize-inline-css-body-tag (face-map)
  (format "<body style=\"%s\">"
	  (mapconcat #'identity (htmlize-css-specs (gethash 'default face-map))
		     " ")))

(defun htmlize-inline-css-insert-text (text fstruct-list buffer)
  (let* ((merged (htmlize-merge-faces fstruct-list))
	 (style (htmlize-memoize
		 merged
		 (let ((specs (htmlize-css-specs merged)))
		   (and specs
			(mapconcat #'identity (htmlize-css-specs merged) " "))))))
    (when style
      (princ "<span style=\"" buffer)
      (princ style buffer)
      (princ "\">" buffer))
    (princ text buffer)
    (when style
      (princ "</span>" buffer))))

;;; `font' tag based output support.

(defun htmlize-font-body-tag (face-map)
  (let ((fstruct (gethash 'default face-map)))
    (format "<body text=\"%s\" bgcolor=\"%s\">"
	    (htmlize-fstruct-foreground fstruct)
	    (htmlize-fstruct-background fstruct))))
       
(defun htmlize-font-insert-text (text fstruct-list buffer)
  ;; In `font' mode, we use the traditional HTML means of altering
  ;; presentation: <font> tag for colors, <b> for bold, <u> for
  ;; underline, and <strike> for strike-through.
  (let* ((merged (htmlize-merge-faces fstruct-list))
	 (markup (htmlize-memoize
		  merged
		  (cons (concat
			 (and (htmlize-fstruct-foreground merged)
			      (format "<font color=\"%s\">" (htmlize-fstruct-foreground merged)))
			 (and (htmlize-fstruct-boldp merged)      "<b>")
			 (and (htmlize-fstruct-italicp merged)    "<i>")
			 (and (htmlize-fstruct-underlinep merged) "<u>")
			 (and (htmlize-fstruct-strikep merged)    "<strike>"))
			(concat
			 (and (htmlize-fstruct-strikep merged)    "</strike>")
			 (and (htmlize-fstruct-underlinep merged) "</u>")
			 (and (htmlize-fstruct-italicp merged)    "</i>")
			 (and (htmlize-fstruct-boldp merged)      "</b>")
			 (and (htmlize-fstruct-foreground merged) "</font>"))))))
    (princ (car markup) buffer)
    (princ text buffer)
    (princ (cdr markup) buffer)))

(defun htmlize-buffer-1 ()
  ;; Internal function; don't call it from outside this file.  Htmlize
  ;; current buffer, writing the resulting HTML to a new buffer, and
  ;; return it.  Unlike htmlize-buffer, this doesn't change current
  ;; buffer or use switch-to-buffer.
  (save-excursion
    ;; Protect against the hook changing the current buffer.
    (save-excursion
      (run-hooks 'htmlize-before-hook))
    ;; Convince font-lock support modes to fontify the entire buffer
    ;; in advance.
    (htmlize-ensure-fontified)
    (clrhash htmlize-extended-character-cache)
    (clrhash htmlize-memoization-table)
    (let* ((buffer-faces (htmlize-faces-in-buffer))
	   (face-map (htmlize-make-face-map (adjoin 'default buffer-faces)))
	   ;; Generate the new buffer.  It's important that it inherits
	   ;; default-directory from the current buffer.
	   (htmlbuf (generate-new-buffer (if (buffer-file-name)
					     (htmlize-make-file-name
					      (file-name-nondirectory
					       (buffer-file-name)))
					   "*html*")))
	   ;; Having a dummy value in the plist allows writing simply
	   ;; (plist-put places foo bar).
	   (places '(nil nil))
	   (title (if (buffer-file-name)
		      (file-name-nondirectory (buffer-file-name))
		    (buffer-name))))
      ;; Initialize HTMLBUF and insert the HTML prolog.
      (with-current-buffer htmlbuf
	(buffer-disable-undo)
	(insert (htmlize-method doctype) ?\n
		(format "<!-- Created by htmlize-%s in %s mode. -->\n"
			htmlize-version htmlize-output-type)
		"<html>\n  ")
	(plist-put places 'head-start (point-marker))
	(insert "<head>\n"
		"    <title>" (htmlize-protect-string title) "</title>\n"
		(if htmlize-html-charset
		    (format (concat "    <meta http-equiv=\"Content-Type\" "
				    "content=\"text/html; charset=%s\">\n")
			    htmlize-html-charset)
		  "")
		htmlize-head-tags)
	(htmlize-method insert-head buffer-faces face-map)
	(insert "  </head>")
	(plist-put places 'head-end (point-marker))
	(insert "\n  ")
	(plist-put places 'body-start (point-marker))
	(insert (htmlize-method body-tag face-map)
		"\n    ")
	(plist-put places 'content-start (point-marker))
	(insert "<pre>\n"))
      (let ((insert-text-method
	     ;; Get the inserter method, so we can funcall it inside
	     ;; the loop.  Not calling `htmlize-method' in the loop
	     ;; body yields a measurable speed increase.
	     (htmlize-method-function 'insert-text))
	    ;; Declare variables used in loop body outside the loop
	    ;; because it's faster to establish `let' bindings only
	    ;; once.
	    next-change text face-list fstruct-list trailing-ellipsis)
	;; This loop traverses and reads the source buffer, appending
	;; the resulting HTML to HTMLBUF with `princ'.  This method is
	;; fast because: 1) it doesn't require examining the text
	;; properties char by char (htmlize-next-change is used to
	;; move between runs with the same face), and 2) it doesn't
	;; require buffer switches, which are slow in Emacs.
	(goto-char (point-min))
	(while (not (eobp))
	  (setq next-change (htmlize-next-change (point) 'face))
	  ;; Get faces in use between (point) and NEXT-CHANGE, and
	  ;; convert them to fstructs.
	  (setq face-list (htmlize-faces-at-point)
		fstruct-list (delq nil (mapcar (lambda (f)
						 (gethash f face-map))
					       face-list)))
	  ;; Extract buffer text, sans the invisible parts.  Then
	  ;; untabify it and escape the HTML metacharacters.
	  (setq text (htmlize-buffer-substring-no-invisible
		      (point) next-change))
	  (when trailing-ellipsis
	    (setq text (htmlize-trim-ellipsis text)))
	  ;; If TEXT ends up empty, don't change trailing-ellipsis.
	  (when (> (length text) 0)
	    (setq trailing-ellipsis
		  (get-text-property (1- (length text))
				     'htmlize-ellipsis text)))
	  (setq text (htmlize-untabify text (current-column)))
	  (setq text (htmlize-protect-string text))
	  ;; Don't bother writing anything if there's no text (this
	  ;; happens in invisible regions).
	  (when (> (length text) 0)
	    ;; Insert the text, along with the necessary markup to
	    ;; represent faces in FSTRUCT-LIST.
	    (funcall insert-text-method text fstruct-list htmlbuf))
	  (goto-char next-change)))

      ;; Insert the epilog and post-process the buffer.
      (with-current-buffer htmlbuf
	(insert "</pre>")
	(plist-put places 'content-end (point-marker))
	(insert "\n  </body>")
	(plist-put places 'body-end (point-marker))
	(insert "\n</html>\n")
	(when htmlize-generate-hyperlinks
	  (htmlize-make-hyperlinks))
	(htmlize-defang-local-variables)
	(when htmlize-replace-form-feeds
	  ;; Change each "\n^L" to "<hr />".
	  (goto-char (point-min))
	  (let ((source
		 ;; ^L has already been escaped, so search for that.
		 (htmlize-protect-string "\n\^L"))
		(replacement
		 (if (stringp htmlize-replace-form-feeds)
		     htmlize-replace-form-feeds
		   "</pre><hr /><pre>")))
	    (while (search-forward source nil t)
	      (replace-match replacement t t))))
	(goto-char (point-min))
	(when htmlize-html-major-mode
	  ;; What sucks about this is that the minor modes, most notably
	  ;; font-lock-mode, won't be initialized.  Oh well.
	  (funcall htmlize-html-major-mode))
	(set (make-local-variable 'htmlize-buffer-places) places)
	(run-hooks 'htmlize-after-hook)
	(buffer-enable-undo))
      htmlbuf)))

;; Utility functions.

(defmacro htmlize-with-fontify-message (&rest body)
  ;; When forcing fontification of large buffers in
  ;; htmlize-ensure-fontified, inform the user that he is waiting for
  ;; font-lock, not for htmlize to finish.
  `(progn
     (if (> (buffer-size) 65536)
	 (message "Forcing fontification of %s..."
		  (buffer-name (current-buffer))))
     , at body
     (if (> (buffer-size) 65536)
	 (message "Forcing fontification of %s...done"
		  (buffer-name (current-buffer))))))

(defun htmlize-ensure-fontified ()
  ;; If font-lock is being used, ensure that the "support" modes
  ;; actually fontify the buffer.  If font-lock is not in use, we
  ;; don't care because, except in htmlize-file, we don't force
  ;; font-lock on the user.
  (when (and (boundp 'font-lock-mode)
	     font-lock-mode)
    ;; In part taken from ps-print-ensure-fontified in GNU Emacs 21.
    (cond
     ((and (boundp 'jit-lock-mode)
	   (symbol-value 'jit-lock-mode))
      (htmlize-with-fontify-message
       (jit-lock-fontify-now (point-min) (point-max))))
     ((and (boundp 'lazy-lock-mode)
	   (symbol-value 'lazy-lock-mode))
      (htmlize-with-fontify-message
       (lazy-lock-fontify-region (point-min) (point-max))))
     ((and (boundp 'lazy-shot-mode)
	   (symbol-value 'lazy-shot-mode))
      (htmlize-with-fontify-message
       ;; lazy-shot is amazing in that it must *refontify* the region,
       ;; even if the whole buffer has already been fontified.  <sigh>
       (lazy-shot-fontify-region (point-min) (point-max))))
     ;; There's also fast-lock, but we don't need to handle specially,
     ;; I think.  fast-lock doesn't really defer fontification, it
     ;; just saves it to an external cache so it's not done twice.
     )))


;;;###autoload
(defun htmlize-buffer (&optional buffer)
  "Convert BUFFER to HTML, preserving colors and decorations.

The generated HTML is available in a new buffer, which is returned.
When invoked interactively, the new buffer is selected in the current
window.  The title of the generated document will be set to the buffer's
file name or, if that's not available, to the buffer's name.

Note that htmlize doesn't fontify your buffers, it only uses the
decorations that are already present.  If you don't set up font-lock or
something else to fontify your buffers, the resulting HTML will be
plain.  Likewise, if you don't like the choice of colors, fix the mode
that created them, or simply alter the faces it uses."
  (interactive)
  (let ((htmlbuf (with-current-buffer (or buffer (current-buffer))
		   (htmlize-buffer-1))))
    (when (interactive-p)
      (switch-to-buffer htmlbuf))
    htmlbuf))

;;;###autoload
(defun htmlize-region (beg end)
  "Convert the region to HTML, preserving colors and decorations.
See `htmlize-buffer' for details."
  (interactive "r")
  ;; Don't let zmacs region highlighting end up in HTML.
  (when (fboundp 'zmacs-deactivate-region)
    (zmacs-deactivate-region))
  (let ((htmlbuf (save-restriction
		   (narrow-to-region beg end)
		   (htmlize-buffer-1))))
    (when (interactive-p)
      (switch-to-buffer htmlbuf))
    htmlbuf))

(defun htmlize-region-for-paste (beg end)
  "Htmlize the region and return just the HTML as a string.
This forces the `inline-css' style and only returns the HTML body,
but without the BODY tag.  This should make it useful for inserting
the text to another HTML buffer."
  (let* ((htmlize-output-type 'inline-css)
	 (htmlbuf (htmlize-region beg end)))
    (unwind-protect
	(with-current-buffer htmlbuf
	  (buffer-substring (plist-get htmlize-buffer-places 'content-start)
			    (plist-get htmlize-buffer-places 'content-end)))
      (kill-buffer htmlbuf))))

(defun htmlize-make-file-name (file)
  "Make an HTML file name from FILE.

In its default implementation, this simply appends `.html' to FILE.
This function is called by htmlize to create the buffer file name, and
by `htmlize-file' to create the target file name.

More elaborate transformations are conceivable, such as changing FILE's
extension to `.html' (\"file.c\" -> \"file.html\").  If you want them,
overload this function to do it and htmlize will comply."
  (concat file ".html"))

;; Older implementation of htmlize-make-file-name that changes FILE's
;; extension to ".html".
;(defun htmlize-make-file-name (file)
;  (let ((extension (file-name-extension file))
;	(sans-extension (file-name-sans-extension file)))
;    (if (or (equal extension "html")
;	    (equal extension "htm")
;	    (equal sans-extension ""))
;	(concat file ".html")
;      (concat sans-extension ".html"))))

;;;###autoload
(defun htmlize-file (file &optional target)
  "Load FILE, fontify it, convert it to HTML, and save the result.

Contents of FILE are inserted into a temporary buffer, whose major mode
is set with `normal-mode' as appropriate for the file type.  The buffer
is subsequently fontified with `font-lock' and converted to HTML.  Note
that, unlike `htmlize-buffer', this function explicitly turns on
font-lock.  If a form of highlighting other than font-lock is desired,
please use `htmlize-buffer' directly on buffers so highlighted.

Buffers currently visiting FILE are unaffected by this function.  The
function does not change current buffer or move the point.

If TARGET is specified and names a directory, the resulting file will be
saved there instead of to FILE's directory.  If TARGET is specified and
does not name a directory, it will be used as output file name."
  (interactive (list (read-file-name
		      "HTML-ize file: "
		      nil nil nil (and (buffer-file-name)
				       (file-name-nondirectory
					(buffer-file-name))))))
  (let ((output-file (if (and target (not (file-directory-p target)))
			 target
		       (expand-file-name
			(htmlize-make-file-name (file-name-nondirectory file))
			(or target (file-name-directory file)))))
	;; Try to prevent `find-file-noselect' from triggering
	;; font-lock because we'll fontify explicitly below.
	(font-lock-mode nil)
	(font-lock-auto-fontify nil)
	(global-font-lock-mode nil)
	;; Ignore the size limit for the purposes of htmlization.
	(font-lock-maximum-size nil)
	;; Disable font-lock support modes.  This will only work in
	;; more recent Emacs versions, so htmlize-buffer-1 still needs
	;; to call htmlize-ensure-fontified.
	(font-lock-support-mode nil))
    (with-temp-buffer
      ;; Insert FILE into the temporary buffer.
      (insert-file-contents file)
      ;; Set the file name so normal-mode and htmlize-buffer-1 pick it
      ;; up.  Restore it afterwards so with-temp-buffer's kill-buffer
      ;; doesn't complain about killing a modified buffer.
      (let ((buffer-file-name file))
	;; Set the major mode for the sake of font-lock.
	(normal-mode)
	(font-lock-mode 1)
	(unless font-lock-mode
	  ;; In GNU Emacs (font-lock-mode 1) doesn't force font-lock,
	  ;; contrary to the documentation.  This seems to work.
	  (font-lock-fontify-buffer))
	;; htmlize the buffer and save the HTML.
	(with-current-buffer (htmlize-buffer-1)
	  (unwind-protect
	      (progn
		(run-hooks 'htmlize-file-hook)
		(write-region (point-min) (point-max) output-file))
	    (kill-buffer (current-buffer)))))))
  ;; I haven't decided on a useful return value yet, so just return
  ;; nil.
  nil)

;;;###autoload
(defun htmlize-many-files (files &optional target-directory)
  "Convert FILES to HTML and save the corresponding HTML versions.

FILES should be a list of file names to convert.  This function calls
`htmlize-file' on each file; see that function for details.  When
invoked interactively, you are prompted for a list of files to convert,
terminated with RET.

If TARGET-DIRECTORY is specified, the HTML files will be saved to that
directory.  Normally, each HTML file is saved to the directory of the
corresponding source file."
  (interactive
   (list
    (let (list file)
      ;; Use empty string as DEFAULT because setting DEFAULT to nil
      ;; defaults to the directory name, which is not what we want.
      (while (not (equal (setq file (read-file-name
				     "HTML-ize file (RET to finish): "
				     (and list (file-name-directory
						(car list)))
				     "" t))
			 ""))
	(push file list))
      (nreverse list))))
  ;; Verify that TARGET-DIRECTORY is indeed a directory.  If it's a
  ;; file, htmlize-file will use it as target, and that doesn't make
  ;; sense.
  (and target-directory
       (not (file-directory-p target-directory))
       (error "target-directory must name a directory: %s" target-directory))
  (dolist (file files)
    (htmlize-file file target-directory)))

;;;###autoload
(defun htmlize-many-files-dired (arg &optional target-directory)
  "HTMLize dired-marked files."
  (interactive "P")
  (htmlize-many-files (dired-get-marked-files nil arg) target-directory))

(provide 'htmlize)

;;; htmlize.el ends here


--- NEW FILE import.log ---
emacs-htmlize-1_34-2_fc10:F-9:emacs-htmlize-1.34-2.fc10.src.rpm:1233059942



From oget at fedoraproject.org  Tue Jan 27 18:11:56 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Tue, 27 Jan 2009 18:11:56 +0000 (UTC)
Subject: rpms/tse3/devel tse3.spec,1.1,1.2
Message-ID: <20090127181156.4FB8F7010B@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/tse3/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32324

Modified Files:
	tse3.spec 
Log Message:
* Tue Jan 27 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 0.3.1-3
- Clean the %buildroot at the beginning of %install



Index: tse3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tse3/devel/tse3.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tse3.spec	27 Jan 2009 00:55:07 -0000	1.1
+++ tse3.spec	27 Jan 2009 18:11:25 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           tse3
 Version:        0.3.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        MIDI Sequencer Engine
 Group:          System Environment/Libraries
 License:        GPL+
@@ -44,8 +44,8 @@
 %patch1 -p2 -b .gcc43
 
 # Fix strange permissions issues
-find . -name "*.cpp" -executable -exec chmod 644 {} \;
-find . -name "*.h" -executable -exec chmod 644 {} \;
+find . -name "*.cpp" -perm /111 -exec chmod 644 {} \;
+find . -name "*.h" -perm /111 -exec chmod 644 {} \;
 
 # Fix encoding issues
 for i in demos/Demo.tse3 doc/History; do
@@ -62,6 +62,7 @@
 make
 
 %install
+rm -rf %{buildroot}
 make install DESTDIR=%{buildroot} INSTALL="install -p" \
      docsdir=%{_docdir}/%{name}-devel-%{version}/HTML
 
@@ -114,6 +115,12 @@
 %{_libdir}/libtse3.so
 
 %changelog
+* Tue Jan 27 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 0.3.1-3
+- Clean the %%buildroot at the beginning of %%install
+
+* Mon Jan 26 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 0.3.1-2.1
+- Use -perm /111 instead of -executable for find, because it fails to work in F-9
+
 * Sun Jan 25 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 0.3.1-2
 - Move the HTML documentation into an HTML subdirectory
 - Use INSTALL="install -p"



From oget at fedoraproject.org  Tue Jan 27 18:12:56 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Tue, 27 Jan 2009 18:12:56 +0000 (UTC)
Subject: rpms/tse3/F-10 tse3.spec,1.1,1.2
Message-ID: <20090127181256.3C80C7010B@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/tse3/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32665

Modified Files:
	tse3.spec 
Log Message:
* Tue Jan 27 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 0.3.1-3
- Clean the %buildroot at the beginning of %install



Index: tse3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tse3/F-10/tse3.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tse3.spec	27 Jan 2009 00:57:00 -0000	1.1
+++ tse3.spec	27 Jan 2009 18:12:55 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           tse3
 Version:        0.3.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        MIDI Sequencer Engine
 Group:          System Environment/Libraries
 License:        GPL+
@@ -44,8 +44,8 @@
 %patch1 -p2 -b .gcc43
 
 # Fix strange permissions issues
-find . -name "*.cpp" -executable -exec chmod 644 {} \;
-find . -name "*.h" -executable -exec chmod 644 {} \;
+find . -name "*.cpp" -perm /111 -exec chmod 644 {} \;
+find . -name "*.h" -perm /111 -exec chmod 644 {} \;
 
 # Fix encoding issues
 for i in demos/Demo.tse3 doc/History; do
@@ -62,6 +62,7 @@
 make
 
 %install
+rm -rf %{buildroot}
 make install DESTDIR=%{buildroot} INSTALL="install -p" \
      docsdir=%{_docdir}/%{name}-devel-%{version}/HTML
 
@@ -114,6 +115,12 @@
 %{_libdir}/libtse3.so
 
 %changelog
+* Tue Jan 27 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 0.3.1-3
+- Clean the %%buildroot at the beginning of %%install
+
+* Mon Jan 26 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 0.3.1-2.1
+- Use -perm /111 instead of -executable for find, because it fails to work in F-9
+
 * Sun Jan 25 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 0.3.1-2
 - Move the HTML documentation into an HTML subdirectory
 - Use INSTALL="install -p"



From oget at fedoraproject.org  Tue Jan 27 18:14:40 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Tue, 27 Jan 2009 18:14:40 +0000 (UTC)
Subject: rpms/tse3/F-9 tse3.spec,1.2,1.3
Message-ID: <20090127181440.6D9487010B@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/tse3/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv578

Modified Files:
	tse3.spec 
Log Message:
* Tue Jan 27 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 0.3.1-3
- Clean the %buildroot at the beginning of %install



Index: tse3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tse3/F-9/tse3.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- tse3.spec	27 Jan 2009 02:05:01 -0000	1.2
+++ tse3.spec	27 Jan 2009 18:14:09 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           tse3
 Version:        0.3.1
-Release:        2%{?dist}.1
+Release:        3%{?dist}
 Summary:        MIDI Sequencer Engine
 Group:          System Environment/Libraries
 License:        GPL+
@@ -62,6 +62,7 @@
 make
 
 %install
+rm -rf %{buildroot}
 make install DESTDIR=%{buildroot} INSTALL="install -p" \
      docsdir=%{_docdir}/%{name}-devel-%{version}/HTML
 
@@ -114,6 +115,9 @@
 %{_libdir}/libtse3.so
 
 %changelog
+* Tue Jan 27 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 0.3.1-3
+- Clean the %%buildroot at the beginning of %%install
+
 * Mon Jan 26 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 0.3.1-2.1
 - Use -perm /111 instead of -executable for find, because it fails to work in F-9
 



From rishi at fedoraproject.org  Tue Jan 27 18:15:58 2009
From: rishi at fedoraproject.org (Debarshi Ray)
Date: Tue, 27 Jan 2009 18:15:58 +0000 (UTC)
Subject: rpms/emacs-htmlize/F-10 emacs-htmlize.spec, NONE,
	1.1 htmlize-init.el, 
	NONE, 1.1 htmlize.el, NONE, 1.1 import.log, NONE, 1.1
Message-ID: <20090127181558.74B9C7010B@cvs1.fedora.phx.redhat.com>

Author: rishi

Update of /cvs/pkgs/rpms/emacs-htmlize/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv966/F-10

Added Files:
	emacs-htmlize.spec htmlize-init.el htmlize.el import.log 
Log Message:
Initial import into F-10.
 
 Added Files:
 	F-10/emacs-htmlize.spec F-10/htmlize-init.el F-10/htmlize.el 
 	F-10/import.log 



--- NEW FILE emacs-htmlize.spec ---
%define pkg htmlize
%define pkgname HTMLize

%if %($(pkg-config emacs) ; echo $?)
%define emacs_lispdir %{_datadir}/emacs/site-lisp
%define emacs_startdir %{_datadir}/emacs/site-lisp/site-start.d
%define emacs_version 22.2
%else
%define emacs_lispdir %(pkg-config emacs --variable sitepkglispdir)
%define emacs_startdir %(pkg-config emacs --variable sitestartdir)
%define emacs_version %(pkg-config emacs --modversion)
%endif

Summary:	Convert buffer text and decorations to HTML
Name:		emacs-%{pkg}
Version:	1.34
Release:	2%{?dist}
License:	GPLv2+
Group:		Applications/Publishing
URL:		http://www.emacswiki.org/emacs-en/Htmlize
Source0:	http://fly.srk.fer.hr/~hniksic/emacs/%{pkg}.el
Source1:	%{pkg}-init.el

BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

Requires:	emacs(bin) >= emacs_version

BuildRequires:	emacs
BuildRequires:	emacs-el

BuildArch:	noarch

%description
%{pkgname} is an add-on package for GNU Emacs. It converts the buffer text and
the associated decorations to HTML. The conversion is quite sophisticated, it
understands non-ascii characters, looks up colours in the X11 RGB database,
and can generate either CSS or old style font bits.

%package el
Summary:	Emacs Lisp source files for %{name}
Group:		Development/Libraries

Requires:	%{name} = %{version}-%{release}

%description el
This package contains Emacs Lisp source files for %{name} under
GNU Emacs. You do not need to install this package to run %{pkgname}.
Install the %{name} package to use %{pkgname} with GNU Emacs.

%prep
%setup -cT
cp -p %{SOURCE0} .

%build
emacs -batch -f batch-byte-compile ./%{pkg}.el

%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{emacs_lispdir}/%{pkg}
mkdir -p $RPM_BUILD_ROOT%{emacs_startdir}

install -p -m644 ./%{pkg}.el $RPM_BUILD_ROOT%{emacs_lispdir}/%{pkg}
install -p -m644 ./%{pkg}.elc $RPM_BUILD_ROOT%{emacs_lispdir}/%{pkg}
install -p -m644 %{SOURCE1} $RPM_BUILD_ROOT%{emacs_startdir}

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%dir %{emacs_lispdir}/%{pkg}
%{emacs_lispdir}/%{pkg}/%{pkg}.elc
%{emacs_startdir}/%{pkg}-init.el

%files el
%defattr(-,root,root,-)
%{emacs_lispdir}/%{pkg}/%{pkg}.el

%changelog
* Fri Jan 23 2009 Debarshi Ray <rishi at fedoraproject.org> - 1.34-2
- Added copyright and distribution notices to htmlize-init.el.

* Sat Jan 17 2009 Debarshi Ray <rishi at fedoraproject.org> - 1.34-1
- Initial build.


--- NEW FILE htmlize-init.el ---
;; Generated autoloads from htmlize.el
;;
;; Copyright (C) 2009 Debarshi Ray <rishi at fedoraproject.org>
;;
;; All rights reserved.                                                        
;;
;; Copying and distribution of this file, with or without modification, are
;; permitted in any medium without royalty provided the copyright notice and
;; this notice are preserved.

(autoload (quote htmlize-buffer) "htmlize" "\
Convert BUFFER to HTML, preserving colors and decorations.

The generated HTML is available in a new buffer, which is returned.
When invoked interactively, the new buffer is selected in the current
window.  The title of the generated document will be set to the buffer's
file name or, if that's not available, to the buffer's name.

Note that htmlize doesn't fontify your buffers, it only uses the
decorations that are already present.  If you don't set up font-lock or
something else to fontify your buffers, the resulting HTML will be
plain.  Likewise, if you don't like the choice of colors, fix the mode
that created them, or simply alter the faces it uses.

\(fn &optional BUFFER)" t nil)

(autoload (quote htmlize-region) "htmlize" "\
Convert the region to HTML, preserving colors and decorations.
See `htmlize-buffer' for details.

\(fn BEG END)" t nil)

(autoload (quote htmlize-file) "htmlize" "\
Load FILE, fontify it, convert it to HTML, and save the result.

Contents of FILE are inserted into a temporary buffer, whose major mode
is set with `normal-mode' as appropriate for the file type.  The buffer
is subsequently fontified with `font-lock' and converted to HTML.  Note
that, unlike `htmlize-buffer', this function explicitly turns on
font-lock.  If a form of highlighting other than font-lock is desired,
please use `htmlize-buffer' directly on buffers so highlighted.

Buffers currently visiting FILE are unaffected by this function.  The
function does not change current buffer or move the point.

If TARGET is specified and names a directory, the resulting file will be
saved there instead of to FILE's directory.  If TARGET is specified and
does not name a directory, it will be used as output file name.

\(fn FILE &optional TARGET)" t nil)

(autoload (quote htmlize-many-files) "htmlize" "\
Convert FILES to HTML and save the corresponding HTML versions.

FILES should be a list of file names to convert.  This function calls
`htmlize-file' on each file; see that function for details.  When
invoked interactively, you are prompted for a list of files to convert,
terminated with RET.

If TARGET-DIRECTORY is specified, the HTML files will be saved to that
directory.  Normally, each HTML file is saved to the directory of the
corresponding source file.

\(fn FILES &optional TARGET-DIRECTORY)" t nil)

(autoload (quote htmlize-many-files-dired) "htmlize" "\
HTMLize dired-marked files.

\(fn ARG &optional TARGET-DIRECTORY)" t nil)


--- NEW FILE htmlize.el ---
;; htmlize.el -- Convert buffer text and decorations to HTML.

;; Copyright (C) 1997,1998,1999,2000,2001,2002,2003,2005,2006 Hrvoje Niksic

;; Author: Hrvoje Niksic <hniksic at xemacs.org>
;; Keywords: hypermedia, 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, 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; see the file COPYING.  If not, write to the
;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
;; Boston, MA 02111-1307, USA.

;;; Commentary:

;; This package converts the buffer text and the associated
;; decorations to HTML.  Mail to <hniksic at xemacs.org> to discuss
;; features and additions.  All suggestions are more than welcome.

;; To use this, just switch to the buffer you want HTML-ized and type
;; `M-x htmlize-buffer'.  You will be switched to a new buffer that
;; contains the resulting HTML code.  You can edit and inspect this
;; buffer, or you can just save it with C-x C-w.  `M-x htmlize-file'
;; will find a file, fontify it, and save the HTML version in
;; FILE.html, without any additional intervention.  `M-x
;; htmlize-many-files' allows you to htmlize any number of files in
;; the same manner.  `M-x htmlize-many-files-dired' does the same for
;; files marked in a dired buffer.

;; htmlize supports three types of HTML output, selected by setting
;; `htmlize-output-type': `css', `inline-css', and `font'.  In `css'
;; mode, htmlize uses cascading style sheets to specify colors; it
;; generates classes that correspond to Emacs faces and uses <span
;; class=FACE>...</span> to color parts of text.  In this mode, the
;; produced HTML is valid under the 4.01 strict DTD, as confirmed by
;; the W3C validator.  `inline-css' is like `css', except the CSS is
;; put directly in the STYLE attribute of the SPAN element, making it
;; possible to paste the generated HTML to other documents.  In `font'
;; mode, htmlize uses <font color="...">...</font> to colorize HTML,
;; which is not standard-compliant, but works better in older
;; browsers.  `css' mode is the default.

;; You can also use htmlize from your Emacs Lisp code.  When called
;; non-interactively, `htmlize-buffer' and `htmlize-region' will
;; return the resulting HTML buffer, but will not change current
;; buffer or move the point.

;; I tried to make the package elisp-compatible with multiple Emacsen,
;; specifically aiming for XEmacs 19.14+ and GNU Emacs 19.34+.  Please
;; let me know if it doesn't work on some of those, and I'll try to
;; fix it.  I relied heavily on the presence of CL extensions,
;; especially for cross-emacs compatibility; please don't try to
;; remove that particular dependency.  When byte-compiling under GNU
;; Emacs, you're likely to get some warnings; just ignore them.

;; The latest version should be available at:
;;
;;        <http://fly.srk.fer.hr/~hniksic/emacs/htmlize.el>
;;
;; You can find a sample of htmlize's output (possibly generated with
;; an older version) at:
;;
;;        <http://fly.srk.fer.hr/~hniksic/emacs/htmlize.el.html>

;; Thanks go to the multitudes of people who have sent reports and
;; contributed comments, suggestions, and fixes.  They include Ron
;; Gut, Bob Weiner, Toni Drabik, Peter Breton, Thomas Vogels, Juri
;; Linkov, Maciek Pasternacki, and many others.

;; User quotes: "You sir, are a sick, sick, _sick_ person. :)"
;;                  -- Bill Perry, author of Emacs/W3


;;; Code:

(require 'cl)
(eval-when-compile
  (if (string-match "XEmacs" emacs-version)
      (byte-compiler-options
	(warnings (- unresolved))))
  (defvar font-lock-auto-fontify)
  (defvar font-lock-support-mode)
  (defvar global-font-lock-mode)
  (when (and (eq emacs-major-version 19)
	     (not (string-match "XEmacs" emacs-version)))
    ;; Older versions of GNU Emacs fail to autoload cl-extra even when
    ;; `cl' is loaded.
    (load "cl-extra")))

(defconst htmlize-version "1.34")

;; Incantations to make custom stuff work without customize, e.g. on
;; XEmacs 19.14 or GNU Emacs 19.34.
(eval-and-compile
  (condition-case ()
      (require 'custom)
    (error nil))
  (if (and (featurep 'custom) (fboundp 'custom-declare-variable))
      nil				; we've got what we needed
    ;; No custom or obsolete custom, define surrogates.  Define all
    ;; three macros, so we don't hose another library that expects
    ;; e.g. `defface' to work after (fboundp 'defcustom) succeeds.
    (defmacro defgroup (&rest ignored) nil)
    (defmacro defcustom (var value doc &rest ignored)
      `(defvar ,var ,value ,doc))
    (defmacro defface (face value doc &rest stuff)
      `(make-face ,face))))

(defgroup htmlize nil
  "Convert buffer text and faces to HTML."
  :group 'hypermedia)

(defcustom htmlize-head-tags ""
  "*Additional tags to insert within HEAD of the generated document."
  :type 'string
  :group 'htmlize)

(defcustom htmlize-output-type 'css
  "*Output type of generated HTML, one of `css', `inline-css', or `font'.
When set to `css' (the default), htmlize will generate a style sheet
with description of faces, and use it in the HTML document, specifying
the faces in the actual text with <span class=\"FACE\">.

When set to `inline-css', the style will be generated as above, but
placed directly in the STYLE attribute of the span ELEMENT: <span
style=\"STYLE\">.  This makes it easier to paste the resulting HTML to
other documents.

When set to `font', the properties will be set using layout tags
<font>, <b>, <i>, <u>, and <strike>.

`css' output is normally preferred, but `font' is still useful for
supporting old, pre-CSS browsers, and both `inline-css' and `font' for
easier embedding of colorized text in foreign HTML documents (no style
sheet to carry around)."
  :type '(choice (const css) (const inline-css) (const font))
  :group 'htmlize)

(defcustom htmlize-generate-hyperlinks t
  "*Non-nil means generate the hyperlinks for URLs and mail addresses.
This is on by default; set it to nil if you don't want htmlize to
insert hyperlinks in the resulting HTML.  (In which case you can still
do your own hyperlinkification from htmlize-after-hook.)"
  :type 'boolean
  :group 'htmlize)

(defcustom htmlize-hyperlink-style "
      a {
        color: inherit;
        background-color: inherit;
        font: inherit;
        text-decoration: inherit;
      }
      a:hover {
        text-decoration: underline;
      }
"
  "*The CSS style used for hyperlinks when in CSS mode."
  :type 'string
  :group 'htmlize)

(defcustom htmlize-replace-form-feeds t
  "*Non-nil means replace form feeds in source code with HTML separators.
Form feeds are the ^L characters at line beginnings that are sometimes
used to separate sections of source code.  If this variable is set to
`t', form feed characters are replaced with the <hr> separator.  If this
is a string, it specifies the replacement to use.  Note that <pre> is
temporarily closed before the separator is inserted, so the default
replacement is effectively \"</pre><hr /><pre>\".  If you specify
another replacement, don't forget to close and reopen the <pre> if you
want the output to remain valid HTML.

If you need more elaborate processing, set this to nil and use
htmlize-after-hook."
  :type 'boolean
  :group 'htmlize)

(defcustom htmlize-html-charset nil
  "*The charset declared by the resulting HTML documents.
When non-nil, causes htmlize to insert the following in the HEAD section
of the generated HTML:

  <meta http-equiv=\"Content-Type\" content=\"text/html; charset=CHARSET\">

where CHARSET is the value you've set for htmlize-html-charset.  Valid
charsets are defined by MIME and include strings like \"iso-8859-1\",
\"iso-8859-15\", \"utf-8\", etc.

If you are using non-Latin-1 charsets, you might need to set this for
your documents to render correctly.  Also, the W3C validator requires
submitted HTML documents to declare a charset.  So if you care about
validation, you can use this to prevent the validator from bitching.

Needless to say, if you set this, you should actually make sure that
the buffer is in the encoding you're claiming it is in.  (Under Mule
that is done by ensuring the correct \"file coding system\" for the
buffer.)  If you don't understand what that means, this option is
probably not for you."
  :type '(choice (const :tag "Unset" nil)
		 string)
  :group 'htmlize)

(defcustom htmlize-convert-nonascii-to-entities (featurep 'mule)
  "*Whether non-ASCII characters should be converted to HTML entities.

When this is non-nil, characters with codes in the 128-255 range will be
considered Latin 1 and rewritten as \"&#CODE;\".  Characters with codes
above 255 will be converted to \"&#UCS;\", where UCS denotes the Unicode
code point of the character.  If the code point cannot be determined,
the character will be copied unchanged, as would be the case if the
option were nil.

When the option is nil, the non-ASCII characters are copied to HTML
without modification.  In that case, the web server and/or the browser
must be set to understand the encoding that was used when saving the
buffer.  (You might also want to specify it by setting
`htmlize-html-charset'.)

Note that in an HTML entity \"&#CODE;\", CODE is always a UCS code point,
which has nothing to do with the charset the page is in.  For example,
\"&#169;\" *always* refers to the copyright symbol, regardless of charset
specified by the META tag or the charset sent by the HTTP server.  In
other words, \"&#169;\" is exactly equivalent to \"&copy;\".

By default, entity conversion is turned on for Mule-enabled Emacsen and
turned off otherwise.  This is because Mule knows the charset of
non-ASCII characters in the buffer.  A non-Mule Emacs cannot tell
whether a character with code 0xA9 represents Latin 1 copyright symbol,
Latin 2 \"S with caron\", or something else altogether.  Setting this to
t without Mule means asserting that 128-255 characters always mean Latin
1.

For most people htmlize will work fine with this option left at the
default setting; don't change it unless you know what you're doing."
  :type 'sexp
  :group 'htmlize)

(defcustom htmlize-ignore-face-size 'absolute
  "*Whether face size should be ignored when generating HTML.
If this is nil, face sizes are used.  If set to t, sizes are ignored
If set to `absolute', only absolute size specifications are ignored.
Please note that font sizes only work with CSS-based output types."
  :type '(choice (const :tag "Don't ignore" nil)
		 (const :tag "Ignore all" t)
		 (const :tag "Ignore absolute" absolute))
  :group 'htmlize)

(defcustom htmlize-css-name-prefix ""
  "*The prefix used for CSS names.
The CSS names that htmlize generates from face names are often too
generic for CSS files; for example, `font-lock-type-face' is transformed
to `type'.  Use this variable to add a prefix to the generated names.
The string \"htmlize-\" is an example of a reasonable prefix."
  :type 'string
  :group 'htmlize)

(defcustom htmlize-use-rgb-txt t
  "*Whether `rgb.txt' should be used to convert color names to RGB.

This conversion means determining, for instance, that the color
\"IndianRed\" corresponds to the (205, 92, 92) RGB triple.  `rgb.txt'
is the X color database that maps hundreds of color names to such RGB
triples.  When this variable is non-nil, `htmlize' uses `rgb.txt' to
look up color names.

If this variable is nil, htmlize queries Emacs for RGB components of
colors using `color-instance-rgb-components' and `x-color-values'.
This can yield incorrect results on non-true-color displays.

If the `rgb.txt' file is not found (which will be the case if you're
running Emacs on non-X11 systems), this option is ignored."
  :type 'boolean
  :group 'htmlize)

(defcustom htmlize-html-major-mode nil
  "The mode the newly created HTML buffer will be put in.
Set this to nil if you prefer the default (fundamental) mode."
  :type '(radio (const :tag "No mode (fundamental)" nil)
		 (function-item html-mode)
		 (function :tag "User-defined major mode"))
  :group 'htmlize)

(defvar htmlize-before-hook nil
  "Hook run before htmlizing a buffer.
The hook functions are run in the source buffer (not the resulting HTML
buffer).")

(defvar htmlize-after-hook nil
  "Hook run after htmlizing a buffer.
Unlike `htmlize-before-hook', these functions are run in the generated
HTML buffer.  You may use them to modify the outlook of the final HTML
output.")

(defvar htmlize-file-hook nil
  "Hook run by `htmlize-file' after htmlizing a file, but before saving it.")

(defvar htmlize-buffer-places)

;;; Some cross-Emacs compatibility.

;; I try to conditionalize on features rather than Emacs version, but
;; in some cases checking against the version *is* necessary.
(defconst htmlize-running-xemacs (string-match "XEmacs" emacs-version))

(eval-and-compile
  ;; save-current-buffer, with-current-buffer, and with-temp-buffer
  ;; are not available in 19.34 and in older XEmacsen.  Strictly
  ;; speaking, we should stick to our own namespace and define and use
  ;; htmlize-save-current-buffer, etc.  But non-standard special forms
  ;; are a pain because they're not properly fontified or indented and
  ;; because they look weird and ugly.  So I'll just go ahead and
  ;; define the real ones if they're not available.  If someone
  ;; convinces me that this breaks something, I'll switch to the
  ;; "htmlize-" namespace.
  (unless (fboundp 'save-current-buffer)
    (defmacro save-current-buffer (&rest forms)
      `(let ((__scb_current (current-buffer)))
	 (unwind-protect
	     (progn , at forms)
	   (set-buffer __scb_current)))))
  (unless (fboundp 'with-current-buffer)
    (defmacro with-current-buffer (buffer &rest forms)
      `(save-current-buffer (set-buffer ,buffer) , at forms)))
  (unless (fboundp 'with-temp-buffer)
    (defmacro with-temp-buffer (&rest forms)
      (let ((temp-buffer (gensym "tb-")))
	`(let ((,temp-buffer
		(get-buffer-create (generate-new-buffer-name " *temp*"))))
	   (unwind-protect
	       (with-current-buffer ,temp-buffer
		 , at forms)
	     (and (buffer-live-p ,temp-buffer)
		  (kill-buffer ,temp-buffer))))))))

;; We need a function that efficiently finds the next change of a
;; property (usually `face'), preferably regardless of whether the
;; change occurred because of a text property or an extent/overlay.
;; As it turns out, it is not easy to do that compatibly.
;;
;; Under XEmacs, `next-single-property-change' does that.  Under GNU
;; Emacs beginning with version 21, `next-single-char-property-change'
;; is available and does the same.  GNU Emacs 20 had
;; `next-char-property-change', which we can use.  GNU Emacs 19 didn't
;; provide any means for simultaneously examining overlays and text
;; properties, so when using Emacs 19.34, we punt and fall back to
;; `next-single-property-change', thus ignoring overlays altogether.

(cond
 (htmlize-running-xemacs
  ;; XEmacs: good.
  (defun htmlize-next-change (pos prop &optional limit)
    (next-single-property-change pos prop nil (or limit (point-max)))))
 ((fboundp 'next-single-char-property-change)
  ;; GNU Emacs 21: good.
  (defun htmlize-next-change (pos prop &optional limit)
    (next-single-char-property-change pos prop nil limit)))
 ((fboundp 'next-char-property-change)
  ;; GNU Emacs 20: bad, but fixable.
  (defun htmlize-next-change (pos prop &optional limit)
    (let ((done nil)
	  (current-value (get-char-property pos prop))
	  newpos next-value)
      ;; Loop over positions returned by next-char-property-change
      ;; until the value of PROP changes or we've hit EOB.
      (while (not done)
	(setq newpos (next-char-property-change pos limit)
	      next-value (get-char-property newpos prop))
	(cond ((eq newpos pos)
	       ;; Possibly at EOB?  Whatever, just don't infloop.
	       (setq done t))
	      ((eq next-value current-value)
	       ;; PROP hasn't changed -- keep looping.
	       )
	      (t
	       (setq done t)))
	(setq pos newpos))
      pos)))
 (t
  ;; GNU Emacs 19.34: hopeless, cannot properly support overlays.
  (defun htmlize-next-change (pos prop &optional limit)
    (unless limit
      (setq limit (point-max)))
    (let ((res (next-single-property-change pos prop)))
      (if (or (null res)
	      (> res limit))
	  limit
	res)))))

;;; Transformation of buffer text: HTML escapes, untabification, etc.

(defvar htmlize-basic-character-table
  ;; Map characters in the 0-127 range to either one-character strings
  ;; or to numeric entities.
  (let ((table (make-vector 128 ?\0)))
    ;; Map characters in the 32-126 range to themselves, others to
    ;; &#CODE entities;
    (dotimes (i 128)
      (setf (aref table i) (if (and (>= i 32) (<= i 126))
			       (char-to-string i)
			     (format "&#%d;" i))))
    ;; Set exceptions manually.
    (setf
     ;; Don't escape newline, carriage return, and TAB.
     (aref table ?\n) "\n"
     (aref table ?\r) "\r"
     (aref table ?\t) "\t"
     ;; Escape &, <, and >.
     (aref table ?&) "&amp;"
     (aref table ?<) "&lt;"
     (aref table ?>) "&gt;"
     ;; Not escaping '"' buys us a measurable speedup.  It's only
     ;; necessary to quote it for strings used in attribute values,
     ;; which htmlize doesn't do.
     ;(aref table ?\") "&quot;"
     )
    table))

;; A cache of HTML representation of non-ASCII characters.  Depending
;; on availability of `encode-char' and the setting of
;; `htmlize-convert-nonascii-to-entities', this maps non-ASCII
;; characters to either "&#<code>;" or "<char>" (mapconcat's mapper
;; must always return strings).  It's only filled as characters are
;; encountered, so that in a buffer with e.g. French text, it will
;; only ever contain French accented characters as keys.  It's cleared
;; on each entry to htmlize-buffer-1 to allow modifications of
;; `htmlize-convert-nonascii-to-entities' to take effect.
(defvar htmlize-extended-character-cache (make-hash-table :test 'eq))

(defun htmlize-protect-string (string)
  "HTML-protect string, escaping HTML metacharacters and I18N chars."
  ;; Only protecting strings that actually contain unsafe or non-ASCII
  ;; chars removes a lot of unnecessary funcalls and consing.
  (if (not (string-match "[^\r\n\t -%'-;=?-~]" string))
      string
    (mapconcat (lambda (char)
		 (cond
		  ((< char 128)
		   ;; ASCII: use htmlize-basic-character-table.
		   (aref htmlize-basic-character-table char))
		  ((gethash char htmlize-extended-character-cache)
		   ;; We've already seen this char; return the cached
		   ;; string.
		   )
		  ((not htmlize-convert-nonascii-to-entities)
		   ;; If conversion to entities is not desired, always
		   ;; copy the char literally.
		   (setf (gethash char htmlize-extended-character-cache)
			 (char-to-string char)))
		  ((< char 256)
		   ;; Latin 1: no need to call encode-char.
		   (setf (gethash char htmlize-extended-character-cache)
			 (format "&#%d;" char)))
		  ((and (fboundp 'encode-char)
			;; Must check if encode-char works for CHAR;
			;; it fails for Arabic and possibly elsewhere.
			(encode-char char 'ucs))
		   (setf (gethash char htmlize-extended-character-cache)
			 (format "&#%d;" (encode-char char 'ucs))))
		  (t
		   ;; encode-char doesn't work for this char.  Copy it
		   ;; unchanged and hope for the best.
		   (setf (gethash char htmlize-extended-character-cache)
			 (char-to-string char)))))
	       string "")))

(defconst htmlize-ellipsis "...")
(put-text-property 0 (length htmlize-ellipsis) 'htmlize-ellipsis t htmlize-ellipsis)

(defun htmlize-buffer-substring-no-invisible (beg end)
  ;; Like buffer-substring-no-properties, but don't copy invisible
  ;; parts of the region.  Where buffer-substring-no-properties
  ;; mandates an ellipsis to be shown, htmlize-ellipsis is inserted.
  (let ((pos beg)
	visible-list invisible show next-change)
    ;; Iterate over the changes in the `invisible' property and filter
    ;; out the portions where it's non-nil, i.e. where the text is
    ;; invisible.
    (while (< pos end)
      (setq invisible (get-char-property pos 'invisible)
	    next-change (htmlize-next-change pos 'invisible end))
      (if (not (listp buffer-invisibility-spec))
	  ;; If buffer-invisibility-spec is not a list, then all
	  ;; characters with non-nil `invisible' property are visible.
	  (setq show (not invisible))
	;; Otherwise, the value of a non-nil `invisible' property can be:
	;; 1. a symbol -- make the text invisible if it matches
	;;    buffer-invisibility-spec.
	;; 2. a list of symbols -- make the text invisible if
	;;    any symbol in the list matches
	;;    buffer-invisibility-spec.
	;; If the match of buffer-invisibility-spec has a non-nil
	;; CDR, replace the invisible text with an ellipsis.
	(let (match)
	  (if (symbolp invisible)
	      (setq match (member* invisible buffer-invisibility-spec
				   :key (lambda (i)
					  (if (symbolp i) i (car i)))))
	    (setq match (block nil
			  (dolist (elem invisible)
			    (let ((m (member*
				      elem buffer-invisibility-spec
				      :key (lambda (i)
					     (if (symbolp i) i (car i))))))
			      (when m (return m))))
			  nil)))
	  (setq show (cond ((null match) t)
			   ((and (cdr-safe (car match))
				 ;; Conflate successive ellipses.
				 (not (eq show htmlize-ellipsis)))
			    htmlize-ellipsis)
			   (t nil)))))
      (cond ((eq show t)
	     (push (buffer-substring-no-properties pos next-change) visible-list))
	    ((stringp show)
	     (push show visible-list)))
      (setq pos next-change))
    (if (= (length visible-list) 1)
	;; If VISIBLE-LIST consists of only one element, return it
	;; without concatenation.  This avoids additional consing in
	;; regions without any invisible text.
	(car visible-list)
      (apply #'concat (nreverse visible-list)))))

(defun htmlize-trim-ellipsis (text)
  ;; Remove htmlize-ellipses ("...") from the beginning of TEXT if it
  ;; starts with it.  It checks for the special property of the
  ;; ellipsis so it doesn't work on ordinary text that begins with
  ;; "...".
  (if (get-text-property 0 'htmlize-ellipsis text)
      (substring text (length htmlize-ellipsis))
    text))

(defconst htmlize-tab-spaces
  ;; A table of strings with spaces.  (aref htmlize-tab-spaces 5) is
  ;; like (make-string 5 ?\ ), except it doesn't cons.
  (let ((v (make-vector 32 nil)))
    (dotimes (i (length v))
      (setf (aref v i) (make-string i ?\ )))
    v))

(defun htmlize-untabify (text start-column)
  "Untabify TEXT, assuming it starts at START-COLUMN."
  (let ((column start-column)
	(last-match 0)
	(chunk-start 0)
	chunks match-pos tab-size)
    (while (string-match "[\t\n]" text last-match)
      (setq match-pos (match-beginning 0))
      (cond ((eq (aref text match-pos) ?\t)
	     ;; Encountered a tab: create a chunk of text followed by
	     ;; the expanded tab.
	     (push (substring text chunk-start match-pos) chunks)
	     ;; Increase COLUMN by the length of the text we've
	     ;; skipped since last tab or newline.  (Encountering
	     ;; newline resets it.)
	     (incf column (- match-pos last-match))
	     ;; Calculate tab size based on tab-width and COLUMN.
	     (setq tab-size (- tab-width (% column tab-width)))
	     ;; Expand the tab.
	     (push (aref htmlize-tab-spaces tab-size) chunks)
	     (incf column tab-size)
	     (setq chunk-start (1+ match-pos)))
	    (t
	     ;; Reset COLUMN at beginning of line.
	     (setq column 0)))
      (setq last-match (1+ match-pos)))
    ;; If no chunks have been allocated, it means there have been no
    ;; tabs to expand.  Return TEXT unmodified.
    (if (null chunks)
	text
      (when (< chunk-start (length text))
	;; Push the remaining chunk.
	(push (substring text chunk-start) chunks))
      ;; Generate the output from the available chunks.
      (apply #'concat (nreverse chunks)))))

(defun htmlize-despam-address (string)
  "Replace every occurrence of '@' in STRING with &#64;.
`htmlize-make-hyperlinks' uses this to spam-protect mailto links
without modifying their meaning."
  ;; Suggested by Ville Skytta.
  (while (string-match "@" string)
    (setq string (replace-match "&#64;" nil t string)))
  string)

(defun htmlize-make-hyperlinks ()
  "Make hyperlinks in HTML."
  ;; Function originally submitted by Ville Skytta.  Rewritten by
  ;; Hrvoje Niksic, then modified by Ville Skytta and Hrvoje Niksic.
  (goto-char (point-min))
  (while (re-search-forward
	  "&lt;\\(\\(mailto:\\)?\\([-=+_.a-zA-Z0-9]+@[-_.a-zA-Z0-9]+\\)\\)&gt;"
	  nil t)
    (let ((address (match-string 3))
	  (link-text (match-string 1)))
      (delete-region (match-beginning 0) (match-end 0))
      (insert "&lt;<a href=\"mailto:"
	      (htmlize-despam-address address)
	      "\">"
	      (htmlize-despam-address link-text)
	      "</a>&gt;")))
  (goto-char (point-min))
  (while (re-search-forward "&lt;\\(\\(URL:\\)?\\([a-zA-Z]+://[^;]+\\)\\)&gt;"
			    nil t)
    (let ((url (match-string 3))
	  (link-text (match-string 1)))
      (delete-region (match-beginning 0) (match-end 0))
      (insert "&lt;<a href=\"" url "\">" link-text "</a>&gt;"))))

;; Tests for htmlize-make-hyperlinks:

;; <mailto:hniksic at xemacs.org>
;; <http://fly.srk.fer.hr>
;; <URL:http://www.xemacs.org>
;; <http://www.mail-archive.com/bbdb-info at xemacs.org/>
;; <hniksic at xemacs.org>
;; <xalan-dev-sc.10148567319.hacuhiucknfgmpfnjcpg-john=doe.com at xml.apache.org>

(defun htmlize-defang-local-variables ()
  ;; Juri Linkov reports that an HTML-ized "Local variables" can lead
  ;; visiting the HTML to fail with "Local variables list is not
  ;; properly terminated".  He suggested changing the phrase to
  ;; syntactically equivalent HTML that Emacs doesn't recognize.
  (goto-char (point-min))
  (while (search-forward "Local Variables:" nil t)
    (replace-match "Local Variables&#58;" nil t)))
  

;;; Color handling.

(if (fboundp 'locate-file)
    (defalias 'htmlize-locate-file 'locate-file)
  (defun htmlize-locate-file (file path)
    (dolist (dir path nil)
      (when (file-exists-p (expand-file-name file dir))
	(return (expand-file-name file dir))))))

(defvar htmlize-x-library-search-path
  '("/usr/X11R6/lib/X11/"
    "/usr/X11R5/lib/X11/"
    "/usr/lib/X11R6/X11/"
    "/usr/lib/X11R5/X11/"
    "/usr/local/X11R6/lib/X11/"
    "/usr/local/X11R5/lib/X11/"
    "/usr/local/lib/X11R6/X11/"
    "/usr/local/lib/X11R5/X11/"
    "/usr/X11/lib/X11/"
    "/usr/lib/X11/"
    "/usr/local/lib/X11/"
    "/usr/X386/lib/X11/"
    "/usr/x386/lib/X11/"
    "/usr/XFree86/lib/X11/"
    "/usr/unsupported/lib/X11/"
    "/usr/athena/lib/X11/"
    "/usr/local/x11r5/lib/X11/"
    "/usr/lpp/Xamples/lib/X11/"
    "/usr/openwin/lib/X11/"
    "/usr/openwin/share/lib/X11/"))

(defun htmlize-get-color-rgb-hash (&optional rgb-file)
  "Return a hash table mapping X color names to RGB values.
The keys in the hash table are X11 color names, and the values are the
#rrggbb RGB specifications, extracted from `rgb.txt'.

If RGB-FILE is nil, the function will try hard to find a suitable file
in the system directories.

If no rgb.txt file is found, return nil."
  (let ((rgb-file (or rgb-file (htmlize-locate-file
				"rgb.txt"
				htmlize-x-library-search-path)))
	(hash nil))
    (when rgb-file
      (with-temp-buffer
	(insert-file-contents rgb-file)
	(setq hash (make-hash-table :test 'equal))
	(while (not (eobp))
	  (cond ((looking-at "^\\s-*\\([!#]\\|$\\)")
		 ;; Skip comments and empty lines.
		 )
		((looking-at
		  "[ \t]*\\([0-9]+\\)[ \t]+\\([0-9]+\\)[ \t]+\\([0-9]+\\)[ \t]+\\(.*\\)")
		 (setf (gethash (downcase (match-string 4)) hash)
		       (format "#%02x%02x%02x"
			       (string-to-number (match-string 1))
			       (string-to-number (match-string 2))
			       (string-to-number (match-string 3)))))
		(t
		 (error
		  "Unrecognized line in %s: %s"
		  rgb-file
		  (buffer-substring (point) (progn (end-of-line) (point))))))
	  (forward-line 1))))
    hash))

;; Compile the RGB map when loaded.  On systems where rgb.txt is
;; missing, the value of the variable will be nil, and rgb.txt will
;; not be used.
(defvar htmlize-color-rgb-hash (htmlize-get-color-rgb-hash))

;;; Face handling.

(defun htmlize-face-specifies-property (face prop)
  ;; Return t if face specifies PROP, as opposed to it being inherited
  ;; from the default face.  The problem with e.g.
  ;; `face-foreground-instance' is that it returns an instance for
  ;; EVERY face because every face inherits from the default face.
  ;; However, we'd like htmlize-face-{fore,back}ground to return nil
  ;; when called with a face that doesn't specify its own foreground
  ;; or background.
  (or (eq face 'default)
      (assq 'global (specifier-spec-list (face-property face prop)))))

(defun htmlize-face-color-internal (face fg)
  ;; Used only under GNU Emacs.  Return the color of FACE, but don't
  ;; return "unspecified-fg" or "unspecified-bg".  If the face is
  ;; `default' and the color is unspecified, look up the color in
  ;; frame parameters.
  (let* ((function (if fg #'face-foreground #'face-background))
	 color)
    (if (>= emacs-major-version 22)
	;; For GNU Emacs 22+ set INHERIT to get the inherited values.
	(setq color (funcall function face nil t))
      (setq color (funcall function face))
      ;; For GNU Emacs 21 (which has `face-attribute'): if the color
      ;; is nil, recursively check for the face's parent.
      (when (and (null color)
		 (fboundp 'face-attribute)
		 (face-attribute face :inherit)
		 (not (eq (face-attribute face :inherit) 'unspecified)))
	(setq color (htmlize-face-color-internal
		     (face-attribute face :inherit) fg))))
    (when (and (eq face 'default) (null color))
      (setq color (cdr (assq (if fg 'foreground-color 'background-color)
			     (frame-parameters)))))
    (when (or (eq color 'unspecified)
	      (equal color "unspecified-fg")
	      (equal color "unspecified-bg"))
      (setq color nil))
    (when (and (eq face 'default)
	       (null color))
      ;; Assuming black on white doesn't seem right, but I can't think
      ;; of anything better to do.
      (setq color (if fg "black" "white")))
    color))

(defun htmlize-face-foreground (face)
  ;; Return the name of the foreground color of FACE.  If FACE does
  ;; not specify a foreground color, return nil.
  (cond (htmlize-running-xemacs
	 ;; XEmacs.
	 (and (htmlize-face-specifies-property face 'foreground)
	      (color-instance-name (face-foreground-instance face))))
	(t
	 ;; GNU Emacs.
	 (htmlize-face-color-internal face t))))

(defun htmlize-face-background (face)
  ;; Return the name of the background color of FACE.  If FACE does
  ;; not specify a background color, return nil.
  (cond (htmlize-running-xemacs
	 ;; XEmacs.
	 (and (htmlize-face-specifies-property face 'background)
	      (color-instance-name (face-background-instance face))))
	(t
	 ;; GNU Emacs.
	 (htmlize-face-color-internal face nil))))

;; Convert COLOR to the #RRGGBB string.  If COLOR is already in that
;; format, it's left unchanged.

(defun htmlize-color-to-rgb (color)
  (let ((rgb-string nil))
    (cond ((null color)
	   ;; Ignore nil COLOR because it means that the face is not
	   ;; specifying any color.  Hence (htmlize-color-to-rgb nil)
	   ;; returns nil.
	   )
	  ((string-match "\\`#" color)
	   ;; The color is already in #rrggbb format.
	   (setq rgb-string color))
	  ((and htmlize-use-rgb-txt
		htmlize-color-rgb-hash)
	   ;; Use of rgb.txt is requested, and it's available on the
	   ;; system.  Use it.
	   (setq rgb-string (gethash (downcase color) htmlize-color-rgb-hash)))
	  (t
	   ;; We're getting the RGB components from Emacs.
	   (let ((rgb
		  ;; Here I cannot conditionalize on (fboundp ...) 
		  ;; because ps-print under some versions of GNU Emacs
		  ;; defines its own dummy version of
		  ;; `color-instance-rgb-components'.
		  (if htmlize-running-xemacs
		      (mapcar (lambda (arg)
				(/ arg 256))
			      (color-instance-rgb-components
			       (make-color-instance color)))
		    (mapcar (lambda (arg)
			      (/ arg 256))
			    (x-color-values color)))))
	     (when rgb
	       (setq rgb-string (apply #'format "#%02x%02x%02x" rgb))))))
    ;; If RGB-STRING is still nil, it means the color cannot be found,
    ;; for whatever reason.  In that case just punt and return COLOR.
    ;; Most browsers support a decent set of color names anyway.
    (or rgb-string color)))

;; We store the face properties we care about into an
;; `htmlize-fstruct' type.  That way we only have to analyze face
;; properties, which can be time consuming, once per each face.  The
;; mapping between Emacs faces and htmlize-fstructs is established by
;; htmlize-make-face-map.  The name "fstruct" refers to variables of
;; type `htmlize-fstruct', while the term "face" is reserved for Emacs
;; faces.

(defstruct htmlize-fstruct
  foreground				; foreground color, #rrggbb
  background				; background color, #rrggbb
  size					; size
  boldp					; whether face is bold
  italicp				; whether face is italic
  underlinep				; whether face is underlined
  overlinep				; whether face is overlined
  strikep				; whether face is struck through
  css-name				; CSS name of face
  )

(defun htmlize-face-emacs21-attr (fstruct attr value)
  ;; For ATTR and VALUE, set the equivalent value in FSTRUCT.
  (case attr
    (:foreground
     (setf (htmlize-fstruct-foreground fstruct) (htmlize-color-to-rgb value)))
    (:background
     (setf (htmlize-fstruct-background fstruct) (htmlize-color-to-rgb value)))
    (:height
     (setf (htmlize-fstruct-size fstruct) value))
    (:weight
     (when (string-match (symbol-name value) "bold")
       (setf (htmlize-fstruct-boldp fstruct) t)))
    (:slant
     (setf (htmlize-fstruct-italicp fstruct) (or (eq value 'italic)
						 (eq value 'oblique))))
    (:bold
     (setf (htmlize-fstruct-boldp fstruct) value))
    (:italic
     (setf (htmlize-fstruct-italicp fstruct) value))
    (:underline
     (setf (htmlize-fstruct-underlinep fstruct) value))
    (:overline
     (setf (htmlize-fstruct-overlinep fstruct) value))
    (:strike-through
     (setf (htmlize-fstruct-strikep fstruct) value))))

(defun htmlize-face-size (face)
  ;; The size (height) of FACE, taking inheritance into account.
  ;; Only works in Emacs 21 and later.
  (let ((size-list
	 (loop
	  for f = face then (face-attribute f :inherit)
	  until (eq f 'unspecified)
	  for h = (face-attribute f :height)
	  collect (if (eq h 'unspecified) nil h))))
    (reduce 'htmlize-merge-size (cons nil size-list))))

(defun htmlize-face-to-fstruct (face)
  "Convert Emacs face FACE to fstruct."
  (let ((fstruct (make-htmlize-fstruct
		  :foreground (htmlize-color-to-rgb
			       (htmlize-face-foreground face))
		  :background (htmlize-color-to-rgb
			       (htmlize-face-background face)))))
    (cond (htmlize-running-xemacs
	   ;; XEmacs doesn't provide a way to detect whether a face is
	   ;; bold or italic, so we need to examine the font instance.
	   ;; #### This probably doesn't work under MS Windows and/or
	   ;; GTK devices.  I'll need help with those.
	   (let* ((font-instance (face-font-instance face))
		  (props (font-instance-properties font-instance)))
	     (when (equalp (cdr (assq 'WEIGHT_NAME props)) "bold")
	       (setf (htmlize-fstruct-boldp fstruct) t))
	     (when (or (equalp (cdr (assq 'SLANT props)) "i")
		       (equalp (cdr (assq 'SLANT props)) "o"))
	       (setf (htmlize-fstruct-italicp fstruct) t))
	     (setf (htmlize-fstruct-strikep fstruct)
		   (face-strikethru-p face))
	     (setf (htmlize-fstruct-underlinep fstruct)
		   (face-underline-p face))))
	  ((fboundp 'face-attribute)
	   ;; GNU Emacs 21 and further.
	   (dolist (attr '(:weight :slant :underline :overline :strike-through))
	     (let ((value (if (>= emacs-major-version 22)
			      ;; Use the INHERIT arg in GNU Emacs 22.
			      (face-attribute face attr nil t)
			    ;; Otherwise, fake it.
			    (let ((face face))
			      (while (and (eq (face-attribute face attr)
					      'unspecified)
					  (not (eq (face-attribute face :inherit)
						   'unspecified)))
				(setq face (face-attribute face :inherit)))
			      (face-attribute face attr)))))
	       (when (and value (not (eq value 'unspecified)))
		 (htmlize-face-emacs21-attr fstruct attr value))))
	   (let ((size (htmlize-face-size face)))
	     (unless (eql size 1.0) 	; ignore non-spec
	       (setf (htmlize-fstruct-size fstruct) size))))
	  (t
	   ;; Older GNU Emacs.  Some of these functions are only
	   ;; available under Emacs 20+, hence the guards.
	   (when (fboundp 'face-bold-p)
	     (setf (htmlize-fstruct-boldp fstruct) (face-bold-p face)))
	   (when (fboundp 'face-italic-p)
	     (setf (htmlize-fstruct-italicp fstruct) (face-italic-p face)))
	   (setf (htmlize-fstruct-underlinep fstruct)
		 (face-underline-p face))))
    ;; Generate the css-name property.  Emacs places no restrictions
    ;; on the names of symbols that represent faces -- any characters
    ;; may be in the name, even ^@.  We try hard to beat the face name
    ;; into shape, both esthetically and according to CSS1 specs.
    (setf (htmlize-fstruct-css-name fstruct)
	  (let ((name (downcase (symbol-name face))))
	    (when (string-match "\\`font-lock-" name)
	      ;; Change font-lock-FOO-face to FOO.
	      (setq name (replace-match "" t t name)))
	    (when (string-match "-face\\'" name)
	      ;; Drop the redundant "-face" suffix.
	      (setq name (replace-match "" t t name)))
	    (while (string-match "[^-a-zA-Z0-9]" name)
	      ;; Drop the non-alphanumerics.
	      (setq name (replace-match "X" t t name)))
	    (when (string-match "\\`[-0-9]" name)
	      ;; CSS identifiers may not start with a digit.
	      (setq name (concat "X" name)))
	    ;; After these transformations, the face could come
	    ;; out empty.
	    (when (equal name "")
	      (setq name "face"))
	    ;; Apply the prefix.
	    (setq name (concat htmlize-css-name-prefix name))
	    name))
    fstruct))

(defmacro htmlize-copy-attr-if-set (attr-list dest source)
  ;; Expand the code of the type
  ;; (and (htmlize-fstruct-ATTR source)
  ;;      (setf (htmlize-fstruct-ATTR dest) (htmlize-fstruct-ATTR source)))
  ;; for the given list of boolean attributes.
  (cons 'progn
	(loop for attr in attr-list
	      for attr-sym = (intern (format "htmlize-fstruct-%s" attr))
	      collect `(and (,attr-sym ,source)
			    (setf (,attr-sym ,dest) (,attr-sym ,source))))))

(defun htmlize-merge-size (merged next)
  ;; Calculate the size of the merge of MERGED and NEXT.
  (cond ((null merged)     next)
	((integerp next)   next)
	((null next)       merged)
	((floatp merged)   (* merged next))
	((integerp merged) (round (* merged next)))))

(defun htmlize-merge-two-faces (merged next)
  (htmlize-copy-attr-if-set
   (foreground background boldp italicp underlinep overlinep strikep)
   merged next)
  (setf (htmlize-fstruct-size merged)
	(htmlize-merge-size (htmlize-fstruct-size merged)
			    (htmlize-fstruct-size next)))
  merged)

(defun htmlize-merge-faces (fstruct-list)
  (cond ((null fstruct-list)
	 ;; Nothing to do, return a dummy face.
	 (make-htmlize-fstruct))
	((null (cdr fstruct-list))
	 ;; Optimize for the common case of a single face, simply
	 ;; return it.
	 (car fstruct-list))
	(t
	 (reduce #'htmlize-merge-two-faces
		 (cons (make-htmlize-fstruct) fstruct-list)))))

;; GNU Emacs 20+ supports attribute lists in `face' properties.  For
;; example, you can use `(:foreground "red" :weight bold)' as an
;; overlay's "face", or you can even use a list of such lists, etc.
;; We call those "attrlists".
;;
;; htmlize supports attrlist by converting them to fstructs, the same
;; as with regular faces.

(defun htmlize-attrlist-to-fstruct (attrlist)
  ;; Like htmlize-face-to-fstruct, but accepts an ATTRLIST as input.
  (let ((fstruct (make-htmlize-fstruct)))
    (cond ((eq (car attrlist) 'foreground-color)
	   ;; ATTRLIST is (foreground-color . COLOR)
	   (setf (htmlize-fstruct-foreground fstruct)
		 (htmlize-color-to-rgb (cdr attrlist))))
	  ((eq (car attrlist) 'background-color)
	   ;; ATTRLIST is (background-color . COLOR)
	   (setf (htmlize-fstruct-background fstruct)
		 (htmlize-color-to-rgb (cdr attrlist))))
	  (t
	   ;; ATTRLIST is a plist.
	   (while attrlist
	     (let ((attr (pop attrlist))
		   (value (pop attrlist)))
	       (when (and value (not (eq value 'unspecified)))
		 (htmlize-face-emacs21-attr fstruct attr value))))))
    (setf (htmlize-fstruct-css-name fstruct) "ATTRLIST")
    fstruct))

(defun htmlize-face-list-p (face-prop)
  "Return non-nil if FACE-PROP is a list of faces, nil otherwise."
  ;; If not for attrlists, this would return (listp face-prop).  This
  ;; way we have to be more careful because attrlist is also a list!
  (cond
   ((eq face-prop nil)
    ;; FACE-PROP being nil means empty list (no face), so return t.
    t)
   ((symbolp face-prop)
    ;; A symbol other than nil means that it's only one face, so return
    ;; nil.
    nil)
   ((not (consp face-prop))
    ;; Huh?  Not a symbol or cons -- treat it as a single element.
    nil)
   (t
    ;; We know that FACE-PROP is a cons: check whether it looks like an
    ;; ATTRLIST.
    (let* ((car (car face-prop))
	   (attrlist-p (and (symbolp car)
			    (or (eq car 'foreground-color)
				(eq car 'background-color)
				(eq (aref (symbol-name car) 0) ?:)))))
      ;; If FACE-PROP is not an ATTRLIST, it means it's a list of
      ;; faces.
      (not attrlist-p)))))

(defun htmlize-make-face-map (faces)
  ;; Return a hash table mapping Emacs faces to htmlize's fstructs.
  ;; The keys are either face symbols or attrlists, so the test
  ;; function must be `equal'.
  (let ((face-map (make-hash-table :test 'equal))
	css-names)
    (dolist (face faces)
      (unless (gethash face face-map)
	;; Haven't seen FACE yet; convert it to an fstruct and cache
	;; it.
	(let ((fstruct (if (symbolp face)
			   (htmlize-face-to-fstruct face)
			 (htmlize-attrlist-to-fstruct face))))
	  (setf (gethash face face-map) fstruct)
	  (let* ((css-name (htmlize-fstruct-css-name fstruct))
		 (new-name css-name)
		 (i 0))
	    ;; Uniquify the face's css-name by using NAME-1, NAME-2,
	    ;; etc.
	    (while (member new-name css-names)
	      (setq new-name (format "%s-%s" css-name (incf i))))
	    (unless (equal new-name css-name)
	      (setf (htmlize-fstruct-css-name fstruct) new-name))
	    (push new-name css-names)))))
    face-map))

(defun htmlize-unstringify-face (face)
  "If FACE is a string, return it interned, otherwise return it unchanged."
  (if (stringp face)
      (intern face)
    face))

(defun htmlize-faces-in-buffer ()
  "Return a list of faces used in the current buffer.
Under XEmacs, this returns the set of faces specified by the extents
with the `face' property.  (This covers text properties as well.)  Under
GNU Emacs, it returns the set of faces specified by the `face' text
property and by buffer overlays that specify `face'."
  (let (faces)
    ;; Testing for (fboundp 'map-extents) doesn't work because W3
    ;; defines `map-extents' under FSF.
    (if htmlize-running-xemacs
	(let (face-prop)
	  (map-extents (lambda (extent ignored)
			 (setq face-prop (extent-face extent)
			       ;; FACE-PROP can be a face or a list of
			       ;; faces.
			       faces (if (listp face-prop)
					 (union face-prop faces)
				       (adjoin face-prop faces)))
			 nil)
		       nil
		       ;; Specify endpoints explicitly to respect
		       ;; narrowing.
		       (point-min) (point-max) nil nil 'face))
      ;; FSF Emacs code.
      ;; Faces used by text properties.
      (let ((pos (point-min)) face-prop next)
	(while (< pos (point-max))
	  (setq face-prop (get-text-property pos 'face)
		next (or (next-single-property-change pos 'face) (point-max)))
	  ;; FACE-PROP can be a face/attrlist or a list thereof.
	  (setq faces (if (htmlize-face-list-p face-prop)
			  (nunion (mapcar #'htmlize-unstringify-face face-prop)
				  faces :test 'equal)
			(adjoin (htmlize-unstringify-face face-prop)
				faces :test 'equal)))
	  (setq pos next)))
      ;; Faces used by overlays.
      (dolist (overlay (overlays-in (point-min) (point-max)))
	(let ((face-prop (overlay-get overlay 'face)))
	  ;; FACE-PROP can be a face/attrlist or a list thereof.
	  (setq faces (if (htmlize-face-list-p face-prop)
			  (nunion (mapcar #'htmlize-unstringify-face face-prop)
				  faces :test 'equal)
			(adjoin (htmlize-unstringify-face face-prop)
				faces :test 'equal))))))
    faces))

;; htmlize-faces-at-point returns the faces in use at point.  The
;; faces are sorted by increasing priority, i.e. the last face takes
;; precedence.
;;
;; Under XEmacs, this returns all the faces in all the extents at
;; point.  Under GNU Emacs, this returns all the faces in the `face'
;; property and all the faces in the overlays at point.

(cond (htmlize-running-xemacs
       (defun htmlize-faces-at-point ()
	 (let (extent extent-list face-list face-prop)
	   (while (setq extent (extent-at (point) nil 'face extent))
	     (push extent extent-list))
	   ;; extent-list is in reverse display order, meaning that
	   ;; smallest ones come last.  That is the order we want,
	   ;; except it can be overridden by the `priority' property.
	   (setq extent-list (stable-sort extent-list #'<
					  :key #'extent-priority))
	   (dolist (extent extent-list)
	     (setq face-prop (extent-face extent))
	     ;; extent's face-list is in reverse order from what we
	     ;; want, but the `nreverse' below will take care of it.
	     (setq face-list (if (listp face-prop)
				 (append face-prop face-list)
			       (cons face-prop face-list))))
	   (nreverse face-list))))
      (t
       (defun htmlize-faces-at-point ()
	 (let (all-faces)
	   ;; Faces from text properties.
	   (let ((face-prop (get-text-property (point) 'face)))
	     (setq all-faces (if (htmlize-face-list-p face-prop)
				 (nreverse (mapcar #'htmlize-unstringify-face
						   face-prop))
			       (list (htmlize-unstringify-face face-prop)))))
	   ;; Faces from overlays.
	   (let ((overlays
		  ;; Collect overlays at point that specify `face'.
		  (delete-if-not (lambda (o)
				   (overlay-get o 'face))
				 (overlays-at (point))))
		 list face-prop)
	     ;; Sort the overlays so the smaller (more specific) ones
	     ;; come later.  The number of overlays at each one
	     ;; position should be very small, so the sort shouldn't
	     ;; slow things down.
	     (setq overlays (sort* overlays
				   ;; Sort by ascending...
				   #'<
				   ;; ...overlay size.
				   :key (lambda (o)
					  (- (overlay-end o)
					     (overlay-start o)))))
	     ;; Overlay priorities, if present, override the above
	     ;; established order.  Larger overlay priority takes
	     ;; precedence and therefore comes later in the list.
	     (setq overlays (stable-sort
			     overlays
			     ;; Reorder (stably) by acending...
			     #'<
			     ;; ...overlay priority.
			     :key (lambda (o)
				    (or (overlay-get o 'priority) 0))))
	     (dolist (overlay overlays)
	       (setq face-prop (overlay-get overlay 'face))
	       (setq list (if (htmlize-face-list-p face-prop)
			      (nconc (nreverse (mapcar
						#'htmlize-unstringify-face
						face-prop))
				     list)
			    (cons (htmlize-unstringify-face face-prop) list))))
	     ;; Under "Merging Faces" the manual explicitly states
	     ;; that faces specified by overlays take precedence over
	     ;; faces specified by text properties.
	     (setq all-faces (nconc all-faces list)))
	   all-faces))))

;; htmlize supports generating HTML in two several fundamentally
;; different ways, one with the use of CSS and nested <span> tags, and
;; the other with the use of the old <font> tags.  Rather than adding
;; a bunch of ifs to many places, we take a semi-OO approach.
;; `htmlize-buffer-1' calls a number of "methods", which indirect to
;; the functions that depend on `htmlize-output-type'.  The currently
;; used methods are `doctype', `insert-head', `body-tag', and
;; `insert-text'.  Not all output types define all methods.
;;
;; Methods are called either with (htmlize-method METHOD ARGS...) 
;; special form, or by accessing the function with
;; (htmlize-method-function 'METHOD) and calling (funcall FUNCTION).
;; The latter form is useful in tight loops because `htmlize-method'
;; conses.
;;
;; Currently defined output types are `css' and `font'.

(defmacro htmlize-method (method &rest args)
  ;; Expand to (htmlize-TYPE-METHOD ...ARGS...).  TYPE is the value of
  ;; `htmlize-output-type' at run time.
  `(funcall (htmlize-method-function ',method) , at args))

(defun htmlize-method-function (method)
  ;; Return METHOD's function definition for the current output type.
  ;; The returned object can be safely funcalled.
  (let ((sym (intern (format "htmlize-%s-%s" htmlize-output-type method))))
    (indirect-function (if (fboundp sym)
			   sym
			 (let ((default (intern (concat "htmlize-default-"
							(symbol-name method)))))
			   (if (fboundp default)
			       default
			     'ignore))))))

(defvar htmlize-memoization-table (make-hash-table :test 'equal))

(defmacro htmlize-memoize (key generator)
  "Return the value of GENERATOR, memoized as KEY.
That means that GENERATOR will be evaluated and returned the first time
it's called with the same value of KEY.  All other times, the cached
\(memoized) value will be returned."
  (let ((value (gensym)))
    `(let ((,value (gethash ,key htmlize-memoization-table)))
       (unless ,value
	 (setq ,value ,generator)
	 (setf (gethash ,key htmlize-memoization-table) ,value))
       ,value)))

;;; Default methods.

(defun htmlize-default-doctype ()
  nil					; no doc-string
  ;; According to DTDs published by the W3C, it is illegal to embed
  ;; <font> in <pre>.  This makes sense in general, but is bad for
  ;; htmlize's intended usage of <font> to specify the document color.

  ;; To make generated HTML legal, htmlize's `font' mode used to
  ;; specify the SGML declaration of "HTML Pro" DTD here.  HTML Pro
  ;; aka Silmaril DTD was a project whose goal was to produce a GPL'ed
  ;; DTD that would encompass all the incompatible HTML extensions
  ;; procured by Netscape, MSIE, and other players in the field.
  ;; Apparently the project got abandoned, the last available version
  ;; being "Draft 0 Revision 11" from January 1997, as documented at
  ;; <http://imbolc.ucc.ie/~pflynn/articles/htmlpro.html>.

  ;; Since by now HTML Pro is remembered by none but the most die-hard
  ;; early-web-days nostalgics and used by not even them, there is no
  ;; use in specifying it.  So we return the standard HTML 4.0
  ;; declaration, which makes generated HTML technically illegal.  If
  ;; you have a problem with that, use the `css' engine designed to
  ;; create fully conforming HTML.

  "<!DOCTYPE html PUBLIC \"-//W3C//DTD HTML 4.01//EN\">"

  ;; Now-abandoned HTML Pro declaration.
  ;"<!DOCTYPE HTML PUBLIC \"+//Silmaril//DTD HTML Pro v0r11 19970101//EN\">"
  )

(defun htmlize-default-body-tag (face-map)
  nil					; no doc-string
  "<body>")

;;; CSS based output support.

;; Internal function; not a method.
(defun htmlize-css-specs (fstruct)
  (let (result)
    (when (htmlize-fstruct-foreground fstruct)
      (push (format "color: %s;" (htmlize-fstruct-foreground fstruct))
	    result))
    (when (htmlize-fstruct-background fstruct)
      (push (format "background-color: %s;"
		    (htmlize-fstruct-background fstruct))
	    result))
    (let ((size (htmlize-fstruct-size fstruct)))
      (when (and size (not (eq htmlize-ignore-face-size t)))
	(cond ((floatp size)
	       (push (format "font-size: %d%%;" (* 100 size)) result))
	      ((not (eq htmlize-ignore-face-size 'absolute))
	       (push (format "font-size: %spt;" (/ size 10.0)) result)))))
    (when (htmlize-fstruct-boldp fstruct)
      (push "font-weight: bold;" result))
    (when (htmlize-fstruct-italicp fstruct)
      (push "font-style: italic;" result))
    (when (htmlize-fstruct-underlinep fstruct)
      (push "text-decoration: underline;" result))
    (when (htmlize-fstruct-overlinep fstruct)
      (push "text-decoration: overline;" result))
    (when (htmlize-fstruct-strikep fstruct)
      (push "text-decoration: line-through;" result))
    (nreverse result)))

(defun htmlize-css-insert-head (buffer-faces face-map)
  (insert "    <style type=\"text/css\">\n    <!--\n")
  (insert "      body {\n        "
	  (mapconcat #'identity
		     (htmlize-css-specs (gethash 'default face-map))
		     "\n        ")
	  "\n      }\n")
  (dolist (face (sort* (copy-list buffer-faces) #'string-lessp
		       :key (lambda (f)
			      (htmlize-fstruct-css-name (gethash f face-map)))))
    (let* ((fstruct (gethash face face-map))
	   (cleaned-up-face-name
	    (let ((s
		   ;; Use `prin1-to-string' rather than `symbol-name'
		   ;; to get the face name because the "face" can also
		   ;; be an attrlist, which is not a symbol.
		   (prin1-to-string face)))
	      ;; If the name contains `--' or `*/', remove them.
	      (while (string-match "--" s)
		(setq s (replace-match "-" t t s)))
	      (while (string-match "\\*/" s)
		(setq s (replace-match "XX" t t s)))
	      s))
	   (specs (htmlize-css-specs fstruct)))
      (insert "      ." (htmlize-fstruct-css-name fstruct))
      (if (null specs)
	  (insert " {")
	(insert " {\n        /* " cleaned-up-face-name " */\n        "
		(mapconcat #'identity specs "\n        ")))
      (insert "\n      }\n")))
  (insert htmlize-hyperlink-style
	  "    -->\n    </style>\n"))

(defun htmlize-css-insert-text (text fstruct-list buffer)
  ;; Insert TEXT colored with FACES into BUFFER.  In CSS mode, this is
  ;; easy: just nest the text in one <span class=...> tag for each
  ;; face in FSTRUCT-LIST.
  (dolist (fstruct fstruct-list)
    (princ "<span class=\"" buffer)
    (princ (htmlize-fstruct-css-name fstruct) buffer)
    (princ "\">" buffer))
  (princ text buffer)
  (dolist (fstruct fstruct-list)
    (ignore fstruct)			; shut up the byte-compiler
    (princ "</span>" buffer)))

;; `inline-css' output support.

(defun htmlize-inline-css-body-tag (face-map)
  (format "<body style=\"%s\">"
	  (mapconcat #'identity (htmlize-css-specs (gethash 'default face-map))
		     " ")))

(defun htmlize-inline-css-insert-text (text fstruct-list buffer)
  (let* ((merged (htmlize-merge-faces fstruct-list))
	 (style (htmlize-memoize
		 merged
		 (let ((specs (htmlize-css-specs merged)))
		   (and specs
			(mapconcat #'identity (htmlize-css-specs merged) " "))))))
    (when style
      (princ "<span style=\"" buffer)
      (princ style buffer)
      (princ "\">" buffer))
    (princ text buffer)
    (when style
      (princ "</span>" buffer))))

;;; `font' tag based output support.

(defun htmlize-font-body-tag (face-map)
  (let ((fstruct (gethash 'default face-map)))
    (format "<body text=\"%s\" bgcolor=\"%s\">"
	    (htmlize-fstruct-foreground fstruct)
	    (htmlize-fstruct-background fstruct))))
       
(defun htmlize-font-insert-text (text fstruct-list buffer)
  ;; In `font' mode, we use the traditional HTML means of altering
  ;; presentation: <font> tag for colors, <b> for bold, <u> for
  ;; underline, and <strike> for strike-through.
  (let* ((merged (htmlize-merge-faces fstruct-list))
	 (markup (htmlize-memoize
		  merged
		  (cons (concat
			 (and (htmlize-fstruct-foreground merged)
			      (format "<font color=\"%s\">" (htmlize-fstruct-foreground merged)))
			 (and (htmlize-fstruct-boldp merged)      "<b>")
			 (and (htmlize-fstruct-italicp merged)    "<i>")
			 (and (htmlize-fstruct-underlinep merged) "<u>")
			 (and (htmlize-fstruct-strikep merged)    "<strike>"))
			(concat
			 (and (htmlize-fstruct-strikep merged)    "</strike>")
			 (and (htmlize-fstruct-underlinep merged) "</u>")
			 (and (htmlize-fstruct-italicp merged)    "</i>")
			 (and (htmlize-fstruct-boldp merged)      "</b>")
			 (and (htmlize-fstruct-foreground merged) "</font>"))))))
    (princ (car markup) buffer)
    (princ text buffer)
    (princ (cdr markup) buffer)))

(defun htmlize-buffer-1 ()
  ;; Internal function; don't call it from outside this file.  Htmlize
  ;; current buffer, writing the resulting HTML to a new buffer, and
  ;; return it.  Unlike htmlize-buffer, this doesn't change current
  ;; buffer or use switch-to-buffer.
  (save-excursion
    ;; Protect against the hook changing the current buffer.
    (save-excursion
      (run-hooks 'htmlize-before-hook))
    ;; Convince font-lock support modes to fontify the entire buffer
    ;; in advance.
    (htmlize-ensure-fontified)
    (clrhash htmlize-extended-character-cache)
    (clrhash htmlize-memoization-table)
    (let* ((buffer-faces (htmlize-faces-in-buffer))
	   (face-map (htmlize-make-face-map (adjoin 'default buffer-faces)))
	   ;; Generate the new buffer.  It's important that it inherits
	   ;; default-directory from the current buffer.
	   (htmlbuf (generate-new-buffer (if (buffer-file-name)
					     (htmlize-make-file-name
					      (file-name-nondirectory
					       (buffer-file-name)))
					   "*html*")))
	   ;; Having a dummy value in the plist allows writing simply
	   ;; (plist-put places foo bar).
	   (places '(nil nil))
	   (title (if (buffer-file-name)
		      (file-name-nondirectory (buffer-file-name))
		    (buffer-name))))
      ;; Initialize HTMLBUF and insert the HTML prolog.
      (with-current-buffer htmlbuf
	(buffer-disable-undo)
	(insert (htmlize-method doctype) ?\n
		(format "<!-- Created by htmlize-%s in %s mode. -->\n"
			htmlize-version htmlize-output-type)
		"<html>\n  ")
	(plist-put places 'head-start (point-marker))
	(insert "<head>\n"
		"    <title>" (htmlize-protect-string title) "</title>\n"
		(if htmlize-html-charset
		    (format (concat "    <meta http-equiv=\"Content-Type\" "
				    "content=\"text/html; charset=%s\">\n")
			    htmlize-html-charset)
		  "")
		htmlize-head-tags)
	(htmlize-method insert-head buffer-faces face-map)
	(insert "  </head>")
	(plist-put places 'head-end (point-marker))
	(insert "\n  ")
	(plist-put places 'body-start (point-marker))
	(insert (htmlize-method body-tag face-map)
		"\n    ")
	(plist-put places 'content-start (point-marker))
	(insert "<pre>\n"))
      (let ((insert-text-method
	     ;; Get the inserter method, so we can funcall it inside
	     ;; the loop.  Not calling `htmlize-method' in the loop
	     ;; body yields a measurable speed increase.
	     (htmlize-method-function 'insert-text))
	    ;; Declare variables used in loop body outside the loop
	    ;; because it's faster to establish `let' bindings only
	    ;; once.
	    next-change text face-list fstruct-list trailing-ellipsis)
	;; This loop traverses and reads the source buffer, appending
	;; the resulting HTML to HTMLBUF with `princ'.  This method is
	;; fast because: 1) it doesn't require examining the text
	;; properties char by char (htmlize-next-change is used to
	;; move between runs with the same face), and 2) it doesn't
	;; require buffer switches, which are slow in Emacs.
	(goto-char (point-min))
	(while (not (eobp))
	  (setq next-change (htmlize-next-change (point) 'face))
	  ;; Get faces in use between (point) and NEXT-CHANGE, and
	  ;; convert them to fstructs.
	  (setq face-list (htmlize-faces-at-point)
		fstruct-list (delq nil (mapcar (lambda (f)
						 (gethash f face-map))
					       face-list)))
	  ;; Extract buffer text, sans the invisible parts.  Then
	  ;; untabify it and escape the HTML metacharacters.
	  (setq text (htmlize-buffer-substring-no-invisible
		      (point) next-change))
	  (when trailing-ellipsis
	    (setq text (htmlize-trim-ellipsis text)))
	  ;; If TEXT ends up empty, don't change trailing-ellipsis.
	  (when (> (length text) 0)
	    (setq trailing-ellipsis
		  (get-text-property (1- (length text))
				     'htmlize-ellipsis text)))
	  (setq text (htmlize-untabify text (current-column)))
	  (setq text (htmlize-protect-string text))
	  ;; Don't bother writing anything if there's no text (this
	  ;; happens in invisible regions).
	  (when (> (length text) 0)
	    ;; Insert the text, along with the necessary markup to
	    ;; represent faces in FSTRUCT-LIST.
	    (funcall insert-text-method text fstruct-list htmlbuf))
	  (goto-char next-change)))

      ;; Insert the epilog and post-process the buffer.
      (with-current-buffer htmlbuf
	(insert "</pre>")
	(plist-put places 'content-end (point-marker))
	(insert "\n  </body>")
	(plist-put places 'body-end (point-marker))
	(insert "\n</html>\n")
	(when htmlize-generate-hyperlinks
	  (htmlize-make-hyperlinks))
	(htmlize-defang-local-variables)
	(when htmlize-replace-form-feeds
	  ;; Change each "\n^L" to "<hr />".
	  (goto-char (point-min))
	  (let ((source
		 ;; ^L has already been escaped, so search for that.
		 (htmlize-protect-string "\n\^L"))
		(replacement
		 (if (stringp htmlize-replace-form-feeds)
		     htmlize-replace-form-feeds
		   "</pre><hr /><pre>")))
	    (while (search-forward source nil t)
	      (replace-match replacement t t))))
	(goto-char (point-min))
	(when htmlize-html-major-mode
	  ;; What sucks about this is that the minor modes, most notably
	  ;; font-lock-mode, won't be initialized.  Oh well.
	  (funcall htmlize-html-major-mode))
	(set (make-local-variable 'htmlize-buffer-places) places)
	(run-hooks 'htmlize-after-hook)
	(buffer-enable-undo))
      htmlbuf)))

;; Utility functions.

(defmacro htmlize-with-fontify-message (&rest body)
  ;; When forcing fontification of large buffers in
  ;; htmlize-ensure-fontified, inform the user that he is waiting for
  ;; font-lock, not for htmlize to finish.
  `(progn
     (if (> (buffer-size) 65536)
	 (message "Forcing fontification of %s..."
		  (buffer-name (current-buffer))))
     , at body
     (if (> (buffer-size) 65536)
	 (message "Forcing fontification of %s...done"
		  (buffer-name (current-buffer))))))

(defun htmlize-ensure-fontified ()
  ;; If font-lock is being used, ensure that the "support" modes
  ;; actually fontify the buffer.  If font-lock is not in use, we
  ;; don't care because, except in htmlize-file, we don't force
  ;; font-lock on the user.
  (when (and (boundp 'font-lock-mode)
	     font-lock-mode)
    ;; In part taken from ps-print-ensure-fontified in GNU Emacs 21.
    (cond
     ((and (boundp 'jit-lock-mode)
	   (symbol-value 'jit-lock-mode))
      (htmlize-with-fontify-message
       (jit-lock-fontify-now (point-min) (point-max))))
     ((and (boundp 'lazy-lock-mode)
	   (symbol-value 'lazy-lock-mode))
      (htmlize-with-fontify-message
       (lazy-lock-fontify-region (point-min) (point-max))))
     ((and (boundp 'lazy-shot-mode)
	   (symbol-value 'lazy-shot-mode))
      (htmlize-with-fontify-message
       ;; lazy-shot is amazing in that it must *refontify* the region,
       ;; even if the whole buffer has already been fontified.  <sigh>
       (lazy-shot-fontify-region (point-min) (point-max))))
     ;; There's also fast-lock, but we don't need to handle specially,
     ;; I think.  fast-lock doesn't really defer fontification, it
     ;; just saves it to an external cache so it's not done twice.
     )))


;;;###autoload
(defun htmlize-buffer (&optional buffer)
  "Convert BUFFER to HTML, preserving colors and decorations.

The generated HTML is available in a new buffer, which is returned.
When invoked interactively, the new buffer is selected in the current
window.  The title of the generated document will be set to the buffer's
file name or, if that's not available, to the buffer's name.

Note that htmlize doesn't fontify your buffers, it only uses the
decorations that are already present.  If you don't set up font-lock or
something else to fontify your buffers, the resulting HTML will be
plain.  Likewise, if you don't like the choice of colors, fix the mode
that created them, or simply alter the faces it uses."
  (interactive)
  (let ((htmlbuf (with-current-buffer (or buffer (current-buffer))
		   (htmlize-buffer-1))))
    (when (interactive-p)
      (switch-to-buffer htmlbuf))
    htmlbuf))

;;;###autoload
(defun htmlize-region (beg end)
  "Convert the region to HTML, preserving colors and decorations.
See `htmlize-buffer' for details."
  (interactive "r")
  ;; Don't let zmacs region highlighting end up in HTML.
  (when (fboundp 'zmacs-deactivate-region)
    (zmacs-deactivate-region))
  (let ((htmlbuf (save-restriction
		   (narrow-to-region beg end)
		   (htmlize-buffer-1))))
    (when (interactive-p)
      (switch-to-buffer htmlbuf))
    htmlbuf))

(defun htmlize-region-for-paste (beg end)
  "Htmlize the region and return just the HTML as a string.
This forces the `inline-css' style and only returns the HTML body,
but without the BODY tag.  This should make it useful for inserting
the text to another HTML buffer."
  (let* ((htmlize-output-type 'inline-css)
	 (htmlbuf (htmlize-region beg end)))
    (unwind-protect
	(with-current-buffer htmlbuf
	  (buffer-substring (plist-get htmlize-buffer-places 'content-start)
			    (plist-get htmlize-buffer-places 'content-end)))
      (kill-buffer htmlbuf))))

(defun htmlize-make-file-name (file)
  "Make an HTML file name from FILE.

In its default implementation, this simply appends `.html' to FILE.
This function is called by htmlize to create the buffer file name, and
by `htmlize-file' to create the target file name.

More elaborate transformations are conceivable, such as changing FILE's
extension to `.html' (\"file.c\" -> \"file.html\").  If you want them,
overload this function to do it and htmlize will comply."
  (concat file ".html"))

;; Older implementation of htmlize-make-file-name that changes FILE's
;; extension to ".html".
;(defun htmlize-make-file-name (file)
;  (let ((extension (file-name-extension file))
;	(sans-extension (file-name-sans-extension file)))
;    (if (or (equal extension "html")
;	    (equal extension "htm")
;	    (equal sans-extension ""))
;	(concat file ".html")
;      (concat sans-extension ".html"))))

;;;###autoload
(defun htmlize-file (file &optional target)
  "Load FILE, fontify it, convert it to HTML, and save the result.

Contents of FILE are inserted into a temporary buffer, whose major mode
is set with `normal-mode' as appropriate for the file type.  The buffer
is subsequently fontified with `font-lock' and converted to HTML.  Note
that, unlike `htmlize-buffer', this function explicitly turns on
font-lock.  If a form of highlighting other than font-lock is desired,
please use `htmlize-buffer' directly on buffers so highlighted.

Buffers currently visiting FILE are unaffected by this function.  The
function does not change current buffer or move the point.

If TARGET is specified and names a directory, the resulting file will be
saved there instead of to FILE's directory.  If TARGET is specified and
does not name a directory, it will be used as output file name."
  (interactive (list (read-file-name
		      "HTML-ize file: "
		      nil nil nil (and (buffer-file-name)
				       (file-name-nondirectory
					(buffer-file-name))))))
  (let ((output-file (if (and target (not (file-directory-p target)))
			 target
		       (expand-file-name
			(htmlize-make-file-name (file-name-nondirectory file))
			(or target (file-name-directory file)))))
	;; Try to prevent `find-file-noselect' from triggering
	;; font-lock because we'll fontify explicitly below.
	(font-lock-mode nil)
	(font-lock-auto-fontify nil)
	(global-font-lock-mode nil)
	;; Ignore the size limit for the purposes of htmlization.
	(font-lock-maximum-size nil)
	;; Disable font-lock support modes.  This will only work in
	;; more recent Emacs versions, so htmlize-buffer-1 still needs
	;; to call htmlize-ensure-fontified.
	(font-lock-support-mode nil))
    (with-temp-buffer
      ;; Insert FILE into the temporary buffer.
      (insert-file-contents file)
      ;; Set the file name so normal-mode and htmlize-buffer-1 pick it
      ;; up.  Restore it afterwards so with-temp-buffer's kill-buffer
      ;; doesn't complain about killing a modified buffer.
      (let ((buffer-file-name file))
	;; Set the major mode for the sake of font-lock.
	(normal-mode)
	(font-lock-mode 1)
	(unless font-lock-mode
	  ;; In GNU Emacs (font-lock-mode 1) doesn't force font-lock,
	  ;; contrary to the documentation.  This seems to work.
	  (font-lock-fontify-buffer))
	;; htmlize the buffer and save the HTML.
	(with-current-buffer (htmlize-buffer-1)
	  (unwind-protect
	      (progn
		(run-hooks 'htmlize-file-hook)
		(write-region (point-min) (point-max) output-file))
	    (kill-buffer (current-buffer)))))))
  ;; I haven't decided on a useful return value yet, so just return
  ;; nil.
  nil)

;;;###autoload
(defun htmlize-many-files (files &optional target-directory)
  "Convert FILES to HTML and save the corresponding HTML versions.

FILES should be a list of file names to convert.  This function calls
`htmlize-file' on each file; see that function for details.  When
invoked interactively, you are prompted for a list of files to convert,
terminated with RET.

If TARGET-DIRECTORY is specified, the HTML files will be saved to that
directory.  Normally, each HTML file is saved to the directory of the
corresponding source file."
  (interactive
   (list
    (let (list file)
      ;; Use empty string as DEFAULT because setting DEFAULT to nil
      ;; defaults to the directory name, which is not what we want.
      (while (not (equal (setq file (read-file-name
				     "HTML-ize file (RET to finish): "
				     (and list (file-name-directory
						(car list)))
				     "" t))
			 ""))
	(push file list))
      (nreverse list))))
  ;; Verify that TARGET-DIRECTORY is indeed a directory.  If it's a
  ;; file, htmlize-file will use it as target, and that doesn't make
  ;; sense.
  (and target-directory
       (not (file-directory-p target-directory))
       (error "target-directory must name a directory: %s" target-directory))
  (dolist (file files)
    (htmlize-file file target-directory)))

;;;###autoload
(defun htmlize-many-files-dired (arg &optional target-directory)
  "HTMLize dired-marked files."
  (interactive "P")
  (htmlize-many-files (dired-get-marked-files nil arg) target-directory))

(provide 'htmlize)

;;; htmlize.el ends here


--- NEW FILE import.log ---
emacs-htmlize-1_34-2_fc10:F-10:emacs-htmlize-1.34-2.fc10.src.rpm:1233060288



From kevin at fedoraproject.org  Tue Jan 27 18:18:09 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 27 Jan 2009 18:18:09 +0000 (UTC)
Subject: rpms/xfconf/devel sources,1.3,1.4 .cvsignore,1.3,1.4
Message-ID: <20090127181809.62B7D7010B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/xfconf/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1407

Modified Files:
	sources .cvsignore 
Log Message:
Update to 4.5.99.1



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xfconf/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	16 Jan 2009 23:49:59 -0000	1.3
+++ sources	27 Jan 2009 18:17:38 -0000	1.4
@@ -1 +1 @@
-d426da2c79f9741aeea7a55ce967ffa3  xfconf-4.5.93.tar.bz2
+4c22977a41a46ad11bde08ea8c03af73  xfconf-4.5.99.1.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xfconf/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	16 Jan 2009 23:49:59 -0000	1.3
+++ .cvsignore	27 Jan 2009 18:17:39 -0000	1.4
@@ -1 +1 @@
-xfconf-4.5.93.tar.bz2
+xfconf-4.5.99.1.tar.bz2



From kevin at fedoraproject.org  Tue Jan 27 18:19:13 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 27 Jan 2009 18:19:13 +0000 (UTC)
Subject: rpms/xfconf/devel xfconf.spec,1.6,1.7
Message-ID: <20090127181913.7BB187010B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/xfconf/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1738

Modified Files:
	xfconf.spec 
Log Message:
Update to 4.5.99.1



Index: xfconf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfconf/devel/xfconf.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- xfconf.spec	22 Jan 2009 16:35:34 -0000	1.6
+++ xfconf.spec	27 Jan 2009 18:18:43 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           xfconf
-Version:        4.5.93
-Release:        3%{?dist}
+Version:        4.5.99.1
+Release:        1%{?dist}
 Summary:        Hierarchical configuration system for Xfce
 
 Group:          System Environment/Base
@@ -104,6 +104,9 @@
 %{_mandir}/man3/*.3*
 
 %changelog
+* Mon Jan 26 2009 Kevin Fenzi <kevin at tummy.com> - 4.5.99.1-1
+- Update to 4.5.99.1
+
 * Thu Jan 22 2009 Christoph Wickert <cwickert at fedoraproject.org> - 4.5.93-3
 - Let xfce4-settings Obsolete mcs manager and plugin packages
 



From kevin at fedoraproject.org  Tue Jan 27 18:21:49 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 27 Jan 2009 18:21:49 +0000 (UTC)
Subject: rpms/libxfcegui4/devel sources, 1.12, 1.13 .cvsignore, 1.12,
	1.13 libxfcegui4.spec, 1.27, 1.28
Message-ID: <20090127182149.1AD0B7010D@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/libxfcegui4/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2627

Modified Files:
	sources .cvsignore libxfcegui4.spec 
Log Message:
Update to 4.5.99.1



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libxfcegui4/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	17 Jan 2009 02:57:27 -0000	1.12
+++ sources	27 Jan 2009 18:21:18 -0000	1.13
@@ -1 +1 @@
-e8c760abcd08df81abe4a2f94ced26aa  libxfcegui4-4.5.93.tar.bz2
+71706c8a71821f39f4e8c5c419d05c40  libxfcegui4-4.5.99.1.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libxfcegui4/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	17 Jan 2009 02:57:27 -0000	1.12
+++ .cvsignore	27 Jan 2009 18:21:18 -0000	1.13
@@ -1 +1 @@
-libxfcegui4-4.5.93.tar.bz2
+libxfcegui4-4.5.99.1.tar.bz2


Index: libxfcegui4.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libxfcegui4/devel/libxfcegui4.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- libxfcegui4.spec	17 Jan 2009 02:57:27 -0000	1.27
+++ libxfcegui4.spec	27 Jan 2009 18:21:18 -0000	1.28
@@ -1,6 +1,6 @@
 Summary: GTK widgets for Xfce
 Name: libxfcegui4
-Version: 4.5.93
+Version: 4.5.99.1
 Release: 1%{?dist}
 License: LGPLv2+
 URL: http://www.xfce.org/
@@ -92,6 +92,9 @@
 %{_datadir}/glade3/pixmaps/hicolor/*/actions/*
 
 %changelog
+* Mon Jan 26 2009 Kevin Fenzi <kevin at tummy.com> - 4.5.99.1-1
+- Update to 4.5.99.1
+
 * Tue Jan 13 2009 Kevin Fenzi <kevin at tummy.com> - 4.5.93-1
 - Update to 4.5.93
 



From rishi at fedoraproject.org  Tue Jan 27 18:23:31 2009
From: rishi at fedoraproject.org (Debarshi Ray)
Date: Tue, 27 Jan 2009 18:23:31 +0000 (UTC)
Subject: rpms/emacs-htmlize/devel emacs-htmlize.spec, NONE,
	1.1 htmlize-init.el, 
	NONE, 1.1 htmlize.el, NONE, 1.1 import.log, NONE, 1.1
Message-ID: <20090127182331.8CC397010B@cvs1.fedora.phx.redhat.com>

Author: rishi

Update of /cvs/pkgs/rpms/emacs-htmlize/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3677/devel

Added Files:
	emacs-htmlize.spec htmlize-init.el htmlize.el import.log 
Log Message:
Initial import into devel.
 
 Added Files:
 	devel/emacs-htmlize.spec devel/htmlize-init.el 
 	devel/htmlize.el devel/import.log 



--- NEW FILE emacs-htmlize.spec ---
%define pkg htmlize
%define pkgname HTMLize

%if %($(pkg-config emacs) ; echo $?)
%define emacs_lispdir %{_datadir}/emacs/site-lisp
%define emacs_startdir %{_datadir}/emacs/site-lisp/site-start.d
%define emacs_version 22.2
%else
%define emacs_lispdir %(pkg-config emacs --variable sitepkglispdir)
%define emacs_startdir %(pkg-config emacs --variable sitestartdir)
%define emacs_version %(pkg-config emacs --modversion)
%endif

Summary:	Convert buffer text and decorations to HTML
Name:		emacs-%{pkg}
Version:	1.34
Release:	2%{?dist}
License:	GPLv2+
Group:		Applications/Publishing
URL:		http://www.emacswiki.org/emacs-en/Htmlize
Source0:	http://fly.srk.fer.hr/~hniksic/emacs/%{pkg}.el
Source1:	%{pkg}-init.el

BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

Requires:	emacs(bin) >= emacs_version

BuildRequires:	emacs
BuildRequires:	emacs-el

BuildArch:	noarch

%description
%{pkgname} is an add-on package for GNU Emacs. It converts the buffer text and
the associated decorations to HTML. The conversion is quite sophisticated, it
understands non-ascii characters, looks up colours in the X11 RGB database,
and can generate either CSS or old style font bits.

%package el
Summary:	Emacs Lisp source files for %{name}
Group:		Development/Libraries

Requires:	%{name} = %{version}-%{release}

%description el
This package contains Emacs Lisp source files for %{name} under
GNU Emacs. You do not need to install this package to run %{pkgname}.
Install the %{name} package to use %{pkgname} with GNU Emacs.

%prep
%setup -cT
cp -p %{SOURCE0} .

%build
emacs -batch -f batch-byte-compile ./%{pkg}.el

%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{emacs_lispdir}/%{pkg}
mkdir -p $RPM_BUILD_ROOT%{emacs_startdir}

install -p -m644 ./%{pkg}.el $RPM_BUILD_ROOT%{emacs_lispdir}/%{pkg}
install -p -m644 ./%{pkg}.elc $RPM_BUILD_ROOT%{emacs_lispdir}/%{pkg}
install -p -m644 %{SOURCE1} $RPM_BUILD_ROOT%{emacs_startdir}

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%dir %{emacs_lispdir}/%{pkg}
%{emacs_lispdir}/%{pkg}/%{pkg}.elc
%{emacs_startdir}/%{pkg}-init.el

%files el
%defattr(-,root,root,-)
%{emacs_lispdir}/%{pkg}/%{pkg}.el

%changelog
* Fri Jan 23 2009 Debarshi Ray <rishi at fedoraproject.org> - 1.34-2
- Added copyright and distribution notices to htmlize-init.el.

* Sat Jan 17 2009 Debarshi Ray <rishi at fedoraproject.org> - 1.34-1
- Initial build.


--- NEW FILE htmlize-init.el ---
;; Generated autoloads from htmlize.el
;;
;; Copyright (C) 2009 Debarshi Ray <rishi at fedoraproject.org>
;;
;; All rights reserved.                                                        
;;
;; Copying and distribution of this file, with or without modification, are
;; permitted in any medium without royalty provided the copyright notice and
;; this notice are preserved.

(autoload (quote htmlize-buffer) "htmlize" "\
Convert BUFFER to HTML, preserving colors and decorations.

The generated HTML is available in a new buffer, which is returned.
When invoked interactively, the new buffer is selected in the current
window.  The title of the generated document will be set to the buffer's
file name or, if that's not available, to the buffer's name.

Note that htmlize doesn't fontify your buffers, it only uses the
decorations that are already present.  If you don't set up font-lock or
something else to fontify your buffers, the resulting HTML will be
plain.  Likewise, if you don't like the choice of colors, fix the mode
that created them, or simply alter the faces it uses.

\(fn &optional BUFFER)" t nil)

(autoload (quote htmlize-region) "htmlize" "\
Convert the region to HTML, preserving colors and decorations.
See `htmlize-buffer' for details.

\(fn BEG END)" t nil)

(autoload (quote htmlize-file) "htmlize" "\
Load FILE, fontify it, convert it to HTML, and save the result.

Contents of FILE are inserted into a temporary buffer, whose major mode
is set with `normal-mode' as appropriate for the file type.  The buffer
is subsequently fontified with `font-lock' and converted to HTML.  Note
that, unlike `htmlize-buffer', this function explicitly turns on
font-lock.  If a form of highlighting other than font-lock is desired,
please use `htmlize-buffer' directly on buffers so highlighted.

Buffers currently visiting FILE are unaffected by this function.  The
function does not change current buffer or move the point.

If TARGET is specified and names a directory, the resulting file will be
saved there instead of to FILE's directory.  If TARGET is specified and
does not name a directory, it will be used as output file name.

\(fn FILE &optional TARGET)" t nil)

(autoload (quote htmlize-many-files) "htmlize" "\
Convert FILES to HTML and save the corresponding HTML versions.

FILES should be a list of file names to convert.  This function calls
`htmlize-file' on each file; see that function for details.  When
invoked interactively, you are prompted for a list of files to convert,
terminated with RET.

If TARGET-DIRECTORY is specified, the HTML files will be saved to that
directory.  Normally, each HTML file is saved to the directory of the
corresponding source file.

\(fn FILES &optional TARGET-DIRECTORY)" t nil)

(autoload (quote htmlize-many-files-dired) "htmlize" "\
HTMLize dired-marked files.

\(fn ARG &optional TARGET-DIRECTORY)" t nil)


--- NEW FILE htmlize.el ---
;; htmlize.el -- Convert buffer text and decorations to HTML.

;; Copyright (C) 1997,1998,1999,2000,2001,2002,2003,2005,2006 Hrvoje Niksic

;; Author: Hrvoje Niksic <hniksic at xemacs.org>
;; Keywords: hypermedia, 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, 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; see the file COPYING.  If not, write to the
;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
;; Boston, MA 02111-1307, USA.

;;; Commentary:

;; This package converts the buffer text and the associated
;; decorations to HTML.  Mail to <hniksic at xemacs.org> to discuss
;; features and additions.  All suggestions are more than welcome.

;; To use this, just switch to the buffer you want HTML-ized and type
;; `M-x htmlize-buffer'.  You will be switched to a new buffer that
;; contains the resulting HTML code.  You can edit and inspect this
;; buffer, or you can just save it with C-x C-w.  `M-x htmlize-file'
;; will find a file, fontify it, and save the HTML version in
;; FILE.html, without any additional intervention.  `M-x
;; htmlize-many-files' allows you to htmlize any number of files in
;; the same manner.  `M-x htmlize-many-files-dired' does the same for
;; files marked in a dired buffer.

;; htmlize supports three types of HTML output, selected by setting
;; `htmlize-output-type': `css', `inline-css', and `font'.  In `css'
;; mode, htmlize uses cascading style sheets to specify colors; it
;; generates classes that correspond to Emacs faces and uses <span
;; class=FACE>...</span> to color parts of text.  In this mode, the
;; produced HTML is valid under the 4.01 strict DTD, as confirmed by
;; the W3C validator.  `inline-css' is like `css', except the CSS is
;; put directly in the STYLE attribute of the SPAN element, making it
;; possible to paste the generated HTML to other documents.  In `font'
;; mode, htmlize uses <font color="...">...</font> to colorize HTML,
;; which is not standard-compliant, but works better in older
;; browsers.  `css' mode is the default.

;; You can also use htmlize from your Emacs Lisp code.  When called
;; non-interactively, `htmlize-buffer' and `htmlize-region' will
;; return the resulting HTML buffer, but will not change current
;; buffer or move the point.

;; I tried to make the package elisp-compatible with multiple Emacsen,
;; specifically aiming for XEmacs 19.14+ and GNU Emacs 19.34+.  Please
;; let me know if it doesn't work on some of those, and I'll try to
;; fix it.  I relied heavily on the presence of CL extensions,
;; especially for cross-emacs compatibility; please don't try to
;; remove that particular dependency.  When byte-compiling under GNU
;; Emacs, you're likely to get some warnings; just ignore them.

;; The latest version should be available at:
;;
;;        <http://fly.srk.fer.hr/~hniksic/emacs/htmlize.el>
;;
;; You can find a sample of htmlize's output (possibly generated with
;; an older version) at:
;;
;;        <http://fly.srk.fer.hr/~hniksic/emacs/htmlize.el.html>

;; Thanks go to the multitudes of people who have sent reports and
;; contributed comments, suggestions, and fixes.  They include Ron
;; Gut, Bob Weiner, Toni Drabik, Peter Breton, Thomas Vogels, Juri
;; Linkov, Maciek Pasternacki, and many others.

;; User quotes: "You sir, are a sick, sick, _sick_ person. :)"
;;                  -- Bill Perry, author of Emacs/W3


;;; Code:

(require 'cl)
(eval-when-compile
  (if (string-match "XEmacs" emacs-version)
      (byte-compiler-options
	(warnings (- unresolved))))
  (defvar font-lock-auto-fontify)
  (defvar font-lock-support-mode)
  (defvar global-font-lock-mode)
  (when (and (eq emacs-major-version 19)
	     (not (string-match "XEmacs" emacs-version)))
    ;; Older versions of GNU Emacs fail to autoload cl-extra even when
    ;; `cl' is loaded.
    (load "cl-extra")))

(defconst htmlize-version "1.34")

;; Incantations to make custom stuff work without customize, e.g. on
;; XEmacs 19.14 or GNU Emacs 19.34.
(eval-and-compile
  (condition-case ()
      (require 'custom)
    (error nil))
  (if (and (featurep 'custom) (fboundp 'custom-declare-variable))
      nil				; we've got what we needed
    ;; No custom or obsolete custom, define surrogates.  Define all
    ;; three macros, so we don't hose another library that expects
    ;; e.g. `defface' to work after (fboundp 'defcustom) succeeds.
    (defmacro defgroup (&rest ignored) nil)
    (defmacro defcustom (var value doc &rest ignored)
      `(defvar ,var ,value ,doc))
    (defmacro defface (face value doc &rest stuff)
      `(make-face ,face))))

(defgroup htmlize nil
  "Convert buffer text and faces to HTML."
  :group 'hypermedia)

(defcustom htmlize-head-tags ""
  "*Additional tags to insert within HEAD of the generated document."
  :type 'string
  :group 'htmlize)

(defcustom htmlize-output-type 'css
  "*Output type of generated HTML, one of `css', `inline-css', or `font'.
When set to `css' (the default), htmlize will generate a style sheet
with description of faces, and use it in the HTML document, specifying
the faces in the actual text with <span class=\"FACE\">.

When set to `inline-css', the style will be generated as above, but
placed directly in the STYLE attribute of the span ELEMENT: <span
style=\"STYLE\">.  This makes it easier to paste the resulting HTML to
other documents.

When set to `font', the properties will be set using layout tags
<font>, <b>, <i>, <u>, and <strike>.

`css' output is normally preferred, but `font' is still useful for
supporting old, pre-CSS browsers, and both `inline-css' and `font' for
easier embedding of colorized text in foreign HTML documents (no style
sheet to carry around)."
  :type '(choice (const css) (const inline-css) (const font))
  :group 'htmlize)

(defcustom htmlize-generate-hyperlinks t
  "*Non-nil means generate the hyperlinks for URLs and mail addresses.
This is on by default; set it to nil if you don't want htmlize to
insert hyperlinks in the resulting HTML.  (In which case you can still
do your own hyperlinkification from htmlize-after-hook.)"
  :type 'boolean
  :group 'htmlize)

(defcustom htmlize-hyperlink-style "
      a {
        color: inherit;
        background-color: inherit;
        font: inherit;
        text-decoration: inherit;
      }
      a:hover {
        text-decoration: underline;
      }
"
  "*The CSS style used for hyperlinks when in CSS mode."
  :type 'string
  :group 'htmlize)

(defcustom htmlize-replace-form-feeds t
  "*Non-nil means replace form feeds in source code with HTML separators.
Form feeds are the ^L characters at line beginnings that are sometimes
used to separate sections of source code.  If this variable is set to
`t', form feed characters are replaced with the <hr> separator.  If this
is a string, it specifies the replacement to use.  Note that <pre> is
temporarily closed before the separator is inserted, so the default
replacement is effectively \"</pre><hr /><pre>\".  If you specify
another replacement, don't forget to close and reopen the <pre> if you
want the output to remain valid HTML.

If you need more elaborate processing, set this to nil and use
htmlize-after-hook."
  :type 'boolean
  :group 'htmlize)

(defcustom htmlize-html-charset nil
  "*The charset declared by the resulting HTML documents.
When non-nil, causes htmlize to insert the following in the HEAD section
of the generated HTML:

  <meta http-equiv=\"Content-Type\" content=\"text/html; charset=CHARSET\">

where CHARSET is the value you've set for htmlize-html-charset.  Valid
charsets are defined by MIME and include strings like \"iso-8859-1\",
\"iso-8859-15\", \"utf-8\", etc.

If you are using non-Latin-1 charsets, you might need to set this for
your documents to render correctly.  Also, the W3C validator requires
submitted HTML documents to declare a charset.  So if you care about
validation, you can use this to prevent the validator from bitching.

Needless to say, if you set this, you should actually make sure that
the buffer is in the encoding you're claiming it is in.  (Under Mule
that is done by ensuring the correct \"file coding system\" for the
buffer.)  If you don't understand what that means, this option is
probably not for you."
  :type '(choice (const :tag "Unset" nil)
		 string)
  :group 'htmlize)

(defcustom htmlize-convert-nonascii-to-entities (featurep 'mule)
  "*Whether non-ASCII characters should be converted to HTML entities.

When this is non-nil, characters with codes in the 128-255 range will be
considered Latin 1 and rewritten as \"&#CODE;\".  Characters with codes
above 255 will be converted to \"&#UCS;\", where UCS denotes the Unicode
code point of the character.  If the code point cannot be determined,
the character will be copied unchanged, as would be the case if the
option were nil.

When the option is nil, the non-ASCII characters are copied to HTML
without modification.  In that case, the web server and/or the browser
must be set to understand the encoding that was used when saving the
buffer.  (You might also want to specify it by setting
`htmlize-html-charset'.)

Note that in an HTML entity \"&#CODE;\", CODE is always a UCS code point,
which has nothing to do with the charset the page is in.  For example,
\"&#169;\" *always* refers to the copyright symbol, regardless of charset
specified by the META tag or the charset sent by the HTTP server.  In
other words, \"&#169;\" is exactly equivalent to \"&copy;\".

By default, entity conversion is turned on for Mule-enabled Emacsen and
turned off otherwise.  This is because Mule knows the charset of
non-ASCII characters in the buffer.  A non-Mule Emacs cannot tell
whether a character with code 0xA9 represents Latin 1 copyright symbol,
Latin 2 \"S with caron\", or something else altogether.  Setting this to
t without Mule means asserting that 128-255 characters always mean Latin
1.

For most people htmlize will work fine with this option left at the
default setting; don't change it unless you know what you're doing."
  :type 'sexp
  :group 'htmlize)

(defcustom htmlize-ignore-face-size 'absolute
  "*Whether face size should be ignored when generating HTML.
If this is nil, face sizes are used.  If set to t, sizes are ignored
If set to `absolute', only absolute size specifications are ignored.
Please note that font sizes only work with CSS-based output types."
  :type '(choice (const :tag "Don't ignore" nil)
		 (const :tag "Ignore all" t)
		 (const :tag "Ignore absolute" absolute))
  :group 'htmlize)

(defcustom htmlize-css-name-prefix ""
  "*The prefix used for CSS names.
The CSS names that htmlize generates from face names are often too
generic for CSS files; for example, `font-lock-type-face' is transformed
to `type'.  Use this variable to add a prefix to the generated names.
The string \"htmlize-\" is an example of a reasonable prefix."
  :type 'string
  :group 'htmlize)

(defcustom htmlize-use-rgb-txt t
  "*Whether `rgb.txt' should be used to convert color names to RGB.

This conversion means determining, for instance, that the color
\"IndianRed\" corresponds to the (205, 92, 92) RGB triple.  `rgb.txt'
is the X color database that maps hundreds of color names to such RGB
triples.  When this variable is non-nil, `htmlize' uses `rgb.txt' to
look up color names.

If this variable is nil, htmlize queries Emacs for RGB components of
colors using `color-instance-rgb-components' and `x-color-values'.
This can yield incorrect results on non-true-color displays.

If the `rgb.txt' file is not found (which will be the case if you're
running Emacs on non-X11 systems), this option is ignored."
  :type 'boolean
  :group 'htmlize)

(defcustom htmlize-html-major-mode nil
  "The mode the newly created HTML buffer will be put in.
Set this to nil if you prefer the default (fundamental) mode."
  :type '(radio (const :tag "No mode (fundamental)" nil)
		 (function-item html-mode)
		 (function :tag "User-defined major mode"))
  :group 'htmlize)

(defvar htmlize-before-hook nil
  "Hook run before htmlizing a buffer.
The hook functions are run in the source buffer (not the resulting HTML
buffer).")

(defvar htmlize-after-hook nil
  "Hook run after htmlizing a buffer.
Unlike `htmlize-before-hook', these functions are run in the generated
HTML buffer.  You may use them to modify the outlook of the final HTML
output.")

(defvar htmlize-file-hook nil
  "Hook run by `htmlize-file' after htmlizing a file, but before saving it.")

(defvar htmlize-buffer-places)

;;; Some cross-Emacs compatibility.

;; I try to conditionalize on features rather than Emacs version, but
;; in some cases checking against the version *is* necessary.
(defconst htmlize-running-xemacs (string-match "XEmacs" emacs-version))

(eval-and-compile
  ;; save-current-buffer, with-current-buffer, and with-temp-buffer
  ;; are not available in 19.34 and in older XEmacsen.  Strictly
  ;; speaking, we should stick to our own namespace and define and use
  ;; htmlize-save-current-buffer, etc.  But non-standard special forms
  ;; are a pain because they're not properly fontified or indented and
  ;; because they look weird and ugly.  So I'll just go ahead and
  ;; define the real ones if they're not available.  If someone
  ;; convinces me that this breaks something, I'll switch to the
  ;; "htmlize-" namespace.
  (unless (fboundp 'save-current-buffer)
    (defmacro save-current-buffer (&rest forms)
      `(let ((__scb_current (current-buffer)))
	 (unwind-protect
	     (progn , at forms)
	   (set-buffer __scb_current)))))
  (unless (fboundp 'with-current-buffer)
    (defmacro with-current-buffer (buffer &rest forms)
      `(save-current-buffer (set-buffer ,buffer) , at forms)))
  (unless (fboundp 'with-temp-buffer)
    (defmacro with-temp-buffer (&rest forms)
      (let ((temp-buffer (gensym "tb-")))
	`(let ((,temp-buffer
		(get-buffer-create (generate-new-buffer-name " *temp*"))))
	   (unwind-protect
	       (with-current-buffer ,temp-buffer
		 , at forms)
	     (and (buffer-live-p ,temp-buffer)
		  (kill-buffer ,temp-buffer))))))))

;; We need a function that efficiently finds the next change of a
;; property (usually `face'), preferably regardless of whether the
;; change occurred because of a text property or an extent/overlay.
;; As it turns out, it is not easy to do that compatibly.
;;
;; Under XEmacs, `next-single-property-change' does that.  Under GNU
;; Emacs beginning with version 21, `next-single-char-property-change'
;; is available and does the same.  GNU Emacs 20 had
;; `next-char-property-change', which we can use.  GNU Emacs 19 didn't
;; provide any means for simultaneously examining overlays and text
;; properties, so when using Emacs 19.34, we punt and fall back to
;; `next-single-property-change', thus ignoring overlays altogether.

(cond
 (htmlize-running-xemacs
  ;; XEmacs: good.
  (defun htmlize-next-change (pos prop &optional limit)
    (next-single-property-change pos prop nil (or limit (point-max)))))
 ((fboundp 'next-single-char-property-change)
  ;; GNU Emacs 21: good.
  (defun htmlize-next-change (pos prop &optional limit)
    (next-single-char-property-change pos prop nil limit)))
 ((fboundp 'next-char-property-change)
  ;; GNU Emacs 20: bad, but fixable.
  (defun htmlize-next-change (pos prop &optional limit)
    (let ((done nil)
	  (current-value (get-char-property pos prop))
	  newpos next-value)
      ;; Loop over positions returned by next-char-property-change
      ;; until the value of PROP changes or we've hit EOB.
      (while (not done)
	(setq newpos (next-char-property-change pos limit)
	      next-value (get-char-property newpos prop))
	(cond ((eq newpos pos)
	       ;; Possibly at EOB?  Whatever, just don't infloop.
	       (setq done t))
	      ((eq next-value current-value)
	       ;; PROP hasn't changed -- keep looping.
	       )
	      (t
	       (setq done t)))
	(setq pos newpos))
      pos)))
 (t
  ;; GNU Emacs 19.34: hopeless, cannot properly support overlays.
  (defun htmlize-next-change (pos prop &optional limit)
    (unless limit
      (setq limit (point-max)))
    (let ((res (next-single-property-change pos prop)))
      (if (or (null res)
	      (> res limit))
	  limit
	res)))))

;;; Transformation of buffer text: HTML escapes, untabification, etc.

(defvar htmlize-basic-character-table
  ;; Map characters in the 0-127 range to either one-character strings
  ;; or to numeric entities.
  (let ((table (make-vector 128 ?\0)))
    ;; Map characters in the 32-126 range to themselves, others to
    ;; &#CODE entities;
    (dotimes (i 128)
      (setf (aref table i) (if (and (>= i 32) (<= i 126))
			       (char-to-string i)
			     (format "&#%d;" i))))
    ;; Set exceptions manually.
    (setf
     ;; Don't escape newline, carriage return, and TAB.
     (aref table ?\n) "\n"
     (aref table ?\r) "\r"
     (aref table ?\t) "\t"
     ;; Escape &, <, and >.
     (aref table ?&) "&amp;"
     (aref table ?<) "&lt;"
     (aref table ?>) "&gt;"
     ;; Not escaping '"' buys us a measurable speedup.  It's only
     ;; necessary to quote it for strings used in attribute values,
     ;; which htmlize doesn't do.
     ;(aref table ?\") "&quot;"
     )
    table))

;; A cache of HTML representation of non-ASCII characters.  Depending
;; on availability of `encode-char' and the setting of
;; `htmlize-convert-nonascii-to-entities', this maps non-ASCII
;; characters to either "&#<code>;" or "<char>" (mapconcat's mapper
;; must always return strings).  It's only filled as characters are
;; encountered, so that in a buffer with e.g. French text, it will
;; only ever contain French accented characters as keys.  It's cleared
;; on each entry to htmlize-buffer-1 to allow modifications of
;; `htmlize-convert-nonascii-to-entities' to take effect.
(defvar htmlize-extended-character-cache (make-hash-table :test 'eq))

(defun htmlize-protect-string (string)
  "HTML-protect string, escaping HTML metacharacters and I18N chars."
  ;; Only protecting strings that actually contain unsafe or non-ASCII
  ;; chars removes a lot of unnecessary funcalls and consing.
  (if (not (string-match "[^\r\n\t -%'-;=?-~]" string))
      string
    (mapconcat (lambda (char)
		 (cond
		  ((< char 128)
		   ;; ASCII: use htmlize-basic-character-table.
		   (aref htmlize-basic-character-table char))
		  ((gethash char htmlize-extended-character-cache)
		   ;; We've already seen this char; return the cached
		   ;; string.
		   )
		  ((not htmlize-convert-nonascii-to-entities)
		   ;; If conversion to entities is not desired, always
		   ;; copy the char literally.
		   (setf (gethash char htmlize-extended-character-cache)
			 (char-to-string char)))
		  ((< char 256)
		   ;; Latin 1: no need to call encode-char.
		   (setf (gethash char htmlize-extended-character-cache)
			 (format "&#%d;" char)))
		  ((and (fboundp 'encode-char)
			;; Must check if encode-char works for CHAR;
			;; it fails for Arabic and possibly elsewhere.
			(encode-char char 'ucs))
		   (setf (gethash char htmlize-extended-character-cache)
			 (format "&#%d;" (encode-char char 'ucs))))
		  (t
		   ;; encode-char doesn't work for this char.  Copy it
		   ;; unchanged and hope for the best.
		   (setf (gethash char htmlize-extended-character-cache)
			 (char-to-string char)))))
	       string "")))

(defconst htmlize-ellipsis "...")
(put-text-property 0 (length htmlize-ellipsis) 'htmlize-ellipsis t htmlize-ellipsis)

(defun htmlize-buffer-substring-no-invisible (beg end)
  ;; Like buffer-substring-no-properties, but don't copy invisible
  ;; parts of the region.  Where buffer-substring-no-properties
  ;; mandates an ellipsis to be shown, htmlize-ellipsis is inserted.
  (let ((pos beg)
	visible-list invisible show next-change)
    ;; Iterate over the changes in the `invisible' property and filter
    ;; out the portions where it's non-nil, i.e. where the text is
    ;; invisible.
    (while (< pos end)
      (setq invisible (get-char-property pos 'invisible)
	    next-change (htmlize-next-change pos 'invisible end))
      (if (not (listp buffer-invisibility-spec))
	  ;; If buffer-invisibility-spec is not a list, then all
	  ;; characters with non-nil `invisible' property are visible.
	  (setq show (not invisible))
	;; Otherwise, the value of a non-nil `invisible' property can be:
	;; 1. a symbol -- make the text invisible if it matches
	;;    buffer-invisibility-spec.
	;; 2. a list of symbols -- make the text invisible if
	;;    any symbol in the list matches
	;;    buffer-invisibility-spec.
	;; If the match of buffer-invisibility-spec has a non-nil
	;; CDR, replace the invisible text with an ellipsis.
	(let (match)
	  (if (symbolp invisible)
	      (setq match (member* invisible buffer-invisibility-spec
				   :key (lambda (i)
					  (if (symbolp i) i (car i)))))
	    (setq match (block nil
			  (dolist (elem invisible)
			    (let ((m (member*
				      elem buffer-invisibility-spec
				      :key (lambda (i)
					     (if (symbolp i) i (car i))))))
			      (when m (return m))))
			  nil)))
	  (setq show (cond ((null match) t)
			   ((and (cdr-safe (car match))
				 ;; Conflate successive ellipses.
				 (not (eq show htmlize-ellipsis)))
			    htmlize-ellipsis)
			   (t nil)))))
      (cond ((eq show t)
	     (push (buffer-substring-no-properties pos next-change) visible-list))
	    ((stringp show)
	     (push show visible-list)))
      (setq pos next-change))
    (if (= (length visible-list) 1)
	;; If VISIBLE-LIST consists of only one element, return it
	;; without concatenation.  This avoids additional consing in
	;; regions without any invisible text.
	(car visible-list)
      (apply #'concat (nreverse visible-list)))))

(defun htmlize-trim-ellipsis (text)
  ;; Remove htmlize-ellipses ("...") from the beginning of TEXT if it
  ;; starts with it.  It checks for the special property of the
  ;; ellipsis so it doesn't work on ordinary text that begins with
  ;; "...".
  (if (get-text-property 0 'htmlize-ellipsis text)
      (substring text (length htmlize-ellipsis))
    text))

(defconst htmlize-tab-spaces
  ;; A table of strings with spaces.  (aref htmlize-tab-spaces 5) is
  ;; like (make-string 5 ?\ ), except it doesn't cons.
  (let ((v (make-vector 32 nil)))
    (dotimes (i (length v))
      (setf (aref v i) (make-string i ?\ )))
    v))

(defun htmlize-untabify (text start-column)
  "Untabify TEXT, assuming it starts at START-COLUMN."
  (let ((column start-column)
	(last-match 0)
	(chunk-start 0)
	chunks match-pos tab-size)
    (while (string-match "[\t\n]" text last-match)
      (setq match-pos (match-beginning 0))
      (cond ((eq (aref text match-pos) ?\t)
	     ;; Encountered a tab: create a chunk of text followed by
	     ;; the expanded tab.
	     (push (substring text chunk-start match-pos) chunks)
	     ;; Increase COLUMN by the length of the text we've
	     ;; skipped since last tab or newline.  (Encountering
	     ;; newline resets it.)
	     (incf column (- match-pos last-match))
	     ;; Calculate tab size based on tab-width and COLUMN.
	     (setq tab-size (- tab-width (% column tab-width)))
	     ;; Expand the tab.
	     (push (aref htmlize-tab-spaces tab-size) chunks)
	     (incf column tab-size)
	     (setq chunk-start (1+ match-pos)))
	    (t
	     ;; Reset COLUMN at beginning of line.
	     (setq column 0)))
      (setq last-match (1+ match-pos)))
    ;; If no chunks have been allocated, it means there have been no
    ;; tabs to expand.  Return TEXT unmodified.
    (if (null chunks)
	text
      (when (< chunk-start (length text))
	;; Push the remaining chunk.
	(push (substring text chunk-start) chunks))
      ;; Generate the output from the available chunks.
      (apply #'concat (nreverse chunks)))))

(defun htmlize-despam-address (string)
  "Replace every occurrence of '@' in STRING with &#64;.
`htmlize-make-hyperlinks' uses this to spam-protect mailto links
without modifying their meaning."
  ;; Suggested by Ville Skytta.
  (while (string-match "@" string)
    (setq string (replace-match "&#64;" nil t string)))
  string)

(defun htmlize-make-hyperlinks ()
  "Make hyperlinks in HTML."
  ;; Function originally submitted by Ville Skytta.  Rewritten by
  ;; Hrvoje Niksic, then modified by Ville Skytta and Hrvoje Niksic.
  (goto-char (point-min))
  (while (re-search-forward
	  "&lt;\\(\\(mailto:\\)?\\([-=+_.a-zA-Z0-9]+@[-_.a-zA-Z0-9]+\\)\\)&gt;"
	  nil t)
    (let ((address (match-string 3))
	  (link-text (match-string 1)))
      (delete-region (match-beginning 0) (match-end 0))
      (insert "&lt;<a href=\"mailto:"
	      (htmlize-despam-address address)
	      "\">"
	      (htmlize-despam-address link-text)
	      "</a>&gt;")))
  (goto-char (point-min))
  (while (re-search-forward "&lt;\\(\\(URL:\\)?\\([a-zA-Z]+://[^;]+\\)\\)&gt;"
			    nil t)
    (let ((url (match-string 3))
	  (link-text (match-string 1)))
      (delete-region (match-beginning 0) (match-end 0))
      (insert "&lt;<a href=\"" url "\">" link-text "</a>&gt;"))))

;; Tests for htmlize-make-hyperlinks:

;; <mailto:hniksic at xemacs.org>
;; <http://fly.srk.fer.hr>
;; <URL:http://www.xemacs.org>
;; <http://www.mail-archive.com/bbdb-info at xemacs.org/>
;; <hniksic at xemacs.org>
;; <xalan-dev-sc.10148567319.hacuhiucknfgmpfnjcpg-john=doe.com at xml.apache.org>

(defun htmlize-defang-local-variables ()
  ;; Juri Linkov reports that an HTML-ized "Local variables" can lead
  ;; visiting the HTML to fail with "Local variables list is not
  ;; properly terminated".  He suggested changing the phrase to
  ;; syntactically equivalent HTML that Emacs doesn't recognize.
  (goto-char (point-min))
  (while (search-forward "Local Variables:" nil t)
    (replace-match "Local Variables&#58;" nil t)))
  

;;; Color handling.

(if (fboundp 'locate-file)
    (defalias 'htmlize-locate-file 'locate-file)
  (defun htmlize-locate-file (file path)
    (dolist (dir path nil)
      (when (file-exists-p (expand-file-name file dir))
	(return (expand-file-name file dir))))))

(defvar htmlize-x-library-search-path
  '("/usr/X11R6/lib/X11/"
    "/usr/X11R5/lib/X11/"
    "/usr/lib/X11R6/X11/"
    "/usr/lib/X11R5/X11/"
    "/usr/local/X11R6/lib/X11/"
    "/usr/local/X11R5/lib/X11/"
    "/usr/local/lib/X11R6/X11/"
    "/usr/local/lib/X11R5/X11/"
    "/usr/X11/lib/X11/"
    "/usr/lib/X11/"
    "/usr/local/lib/X11/"
    "/usr/X386/lib/X11/"
    "/usr/x386/lib/X11/"
    "/usr/XFree86/lib/X11/"
    "/usr/unsupported/lib/X11/"
    "/usr/athena/lib/X11/"
    "/usr/local/x11r5/lib/X11/"
    "/usr/lpp/Xamples/lib/X11/"
    "/usr/openwin/lib/X11/"
    "/usr/openwin/share/lib/X11/"))

(defun htmlize-get-color-rgb-hash (&optional rgb-file)
  "Return a hash table mapping X color names to RGB values.
The keys in the hash table are X11 color names, and the values are the
#rrggbb RGB specifications, extracted from `rgb.txt'.

If RGB-FILE is nil, the function will try hard to find a suitable file
in the system directories.

If no rgb.txt file is found, return nil."
  (let ((rgb-file (or rgb-file (htmlize-locate-file
				"rgb.txt"
				htmlize-x-library-search-path)))
	(hash nil))
    (when rgb-file
      (with-temp-buffer
	(insert-file-contents rgb-file)
	(setq hash (make-hash-table :test 'equal))
	(while (not (eobp))
	  (cond ((looking-at "^\\s-*\\([!#]\\|$\\)")
		 ;; Skip comments and empty lines.
		 )
		((looking-at
		  "[ \t]*\\([0-9]+\\)[ \t]+\\([0-9]+\\)[ \t]+\\([0-9]+\\)[ \t]+\\(.*\\)")
		 (setf (gethash (downcase (match-string 4)) hash)
		       (format "#%02x%02x%02x"
			       (string-to-number (match-string 1))
			       (string-to-number (match-string 2))
			       (string-to-number (match-string 3)))))
		(t
		 (error
		  "Unrecognized line in %s: %s"
		  rgb-file
		  (buffer-substring (point) (progn (end-of-line) (point))))))
	  (forward-line 1))))
    hash))

;; Compile the RGB map when loaded.  On systems where rgb.txt is
;; missing, the value of the variable will be nil, and rgb.txt will
;; not be used.
(defvar htmlize-color-rgb-hash (htmlize-get-color-rgb-hash))

;;; Face handling.

(defun htmlize-face-specifies-property (face prop)
  ;; Return t if face specifies PROP, as opposed to it being inherited
  ;; from the default face.  The problem with e.g.
  ;; `face-foreground-instance' is that it returns an instance for
  ;; EVERY face because every face inherits from the default face.
  ;; However, we'd like htmlize-face-{fore,back}ground to return nil
  ;; when called with a face that doesn't specify its own foreground
  ;; or background.
  (or (eq face 'default)
      (assq 'global (specifier-spec-list (face-property face prop)))))

(defun htmlize-face-color-internal (face fg)
  ;; Used only under GNU Emacs.  Return the color of FACE, but don't
  ;; return "unspecified-fg" or "unspecified-bg".  If the face is
  ;; `default' and the color is unspecified, look up the color in
  ;; frame parameters.
  (let* ((function (if fg #'face-foreground #'face-background))
	 color)
    (if (>= emacs-major-version 22)
	;; For GNU Emacs 22+ set INHERIT to get the inherited values.
	(setq color (funcall function face nil t))
      (setq color (funcall function face))
      ;; For GNU Emacs 21 (which has `face-attribute'): if the color
      ;; is nil, recursively check for the face's parent.
      (when (and (null color)
		 (fboundp 'face-attribute)
		 (face-attribute face :inherit)
		 (not (eq (face-attribute face :inherit) 'unspecified)))
	(setq color (htmlize-face-color-internal
		     (face-attribute face :inherit) fg))))
    (when (and (eq face 'default) (null color))
      (setq color (cdr (assq (if fg 'foreground-color 'background-color)
			     (frame-parameters)))))
    (when (or (eq color 'unspecified)
	      (equal color "unspecified-fg")
	      (equal color "unspecified-bg"))
      (setq color nil))
    (when (and (eq face 'default)
	       (null color))
      ;; Assuming black on white doesn't seem right, but I can't think
      ;; of anything better to do.
      (setq color (if fg "black" "white")))
    color))

(defun htmlize-face-foreground (face)
  ;; Return the name of the foreground color of FACE.  If FACE does
  ;; not specify a foreground color, return nil.
  (cond (htmlize-running-xemacs
	 ;; XEmacs.
	 (and (htmlize-face-specifies-property face 'foreground)
	      (color-instance-name (face-foreground-instance face))))
	(t
	 ;; GNU Emacs.
	 (htmlize-face-color-internal face t))))

(defun htmlize-face-background (face)
  ;; Return the name of the background color of FACE.  If FACE does
  ;; not specify a background color, return nil.
  (cond (htmlize-running-xemacs
	 ;; XEmacs.
	 (and (htmlize-face-specifies-property face 'background)
	      (color-instance-name (face-background-instance face))))
	(t
	 ;; GNU Emacs.
	 (htmlize-face-color-internal face nil))))

;; Convert COLOR to the #RRGGBB string.  If COLOR is already in that
;; format, it's left unchanged.

(defun htmlize-color-to-rgb (color)
  (let ((rgb-string nil))
    (cond ((null color)
	   ;; Ignore nil COLOR because it means that the face is not
	   ;; specifying any color.  Hence (htmlize-color-to-rgb nil)
	   ;; returns nil.
	   )
	  ((string-match "\\`#" color)
	   ;; The color is already in #rrggbb format.
	   (setq rgb-string color))
	  ((and htmlize-use-rgb-txt
		htmlize-color-rgb-hash)
	   ;; Use of rgb.txt is requested, and it's available on the
	   ;; system.  Use it.
	   (setq rgb-string (gethash (downcase color) htmlize-color-rgb-hash)))
	  (t
	   ;; We're getting the RGB components from Emacs.
	   (let ((rgb
		  ;; Here I cannot conditionalize on (fboundp ...) 
		  ;; because ps-print under some versions of GNU Emacs
		  ;; defines its own dummy version of
		  ;; `color-instance-rgb-components'.
		  (if htmlize-running-xemacs
		      (mapcar (lambda (arg)
				(/ arg 256))
			      (color-instance-rgb-components
			       (make-color-instance color)))
		    (mapcar (lambda (arg)
			      (/ arg 256))
			    (x-color-values color)))))
	     (when rgb
	       (setq rgb-string (apply #'format "#%02x%02x%02x" rgb))))))
    ;; If RGB-STRING is still nil, it means the color cannot be found,
    ;; for whatever reason.  In that case just punt and return COLOR.
    ;; Most browsers support a decent set of color names anyway.
    (or rgb-string color)))

;; We store the face properties we care about into an
;; `htmlize-fstruct' type.  That way we only have to analyze face
;; properties, which can be time consuming, once per each face.  The
;; mapping between Emacs faces and htmlize-fstructs is established by
;; htmlize-make-face-map.  The name "fstruct" refers to variables of
;; type `htmlize-fstruct', while the term "face" is reserved for Emacs
;; faces.

(defstruct htmlize-fstruct
  foreground				; foreground color, #rrggbb
  background				; background color, #rrggbb
  size					; size
  boldp					; whether face is bold
  italicp				; whether face is italic
  underlinep				; whether face is underlined
  overlinep				; whether face is overlined
  strikep				; whether face is struck through
  css-name				; CSS name of face
  )

(defun htmlize-face-emacs21-attr (fstruct attr value)
  ;; For ATTR and VALUE, set the equivalent value in FSTRUCT.
  (case attr
    (:foreground
     (setf (htmlize-fstruct-foreground fstruct) (htmlize-color-to-rgb value)))
    (:background
     (setf (htmlize-fstruct-background fstruct) (htmlize-color-to-rgb value)))
    (:height
     (setf (htmlize-fstruct-size fstruct) value))
    (:weight
     (when (string-match (symbol-name value) "bold")
       (setf (htmlize-fstruct-boldp fstruct) t)))
    (:slant
     (setf (htmlize-fstruct-italicp fstruct) (or (eq value 'italic)
						 (eq value 'oblique))))
    (:bold
     (setf (htmlize-fstruct-boldp fstruct) value))
    (:italic
     (setf (htmlize-fstruct-italicp fstruct) value))
    (:underline
     (setf (htmlize-fstruct-underlinep fstruct) value))
    (:overline
     (setf (htmlize-fstruct-overlinep fstruct) value))
    (:strike-through
     (setf (htmlize-fstruct-strikep fstruct) value))))

(defun htmlize-face-size (face)
  ;; The size (height) of FACE, taking inheritance into account.
  ;; Only works in Emacs 21 and later.
  (let ((size-list
	 (loop
	  for f = face then (face-attribute f :inherit)
	  until (eq f 'unspecified)
	  for h = (face-attribute f :height)
	  collect (if (eq h 'unspecified) nil h))))
    (reduce 'htmlize-merge-size (cons nil size-list))))

(defun htmlize-face-to-fstruct (face)
  "Convert Emacs face FACE to fstruct."
  (let ((fstruct (make-htmlize-fstruct
		  :foreground (htmlize-color-to-rgb
			       (htmlize-face-foreground face))
		  :background (htmlize-color-to-rgb
			       (htmlize-face-background face)))))
    (cond (htmlize-running-xemacs
	   ;; XEmacs doesn't provide a way to detect whether a face is
	   ;; bold or italic, so we need to examine the font instance.
	   ;; #### This probably doesn't work under MS Windows and/or
	   ;; GTK devices.  I'll need help with those.
	   (let* ((font-instance (face-font-instance face))
		  (props (font-instance-properties font-instance)))
	     (when (equalp (cdr (assq 'WEIGHT_NAME props)) "bold")
	       (setf (htmlize-fstruct-boldp fstruct) t))
	     (when (or (equalp (cdr (assq 'SLANT props)) "i")
		       (equalp (cdr (assq 'SLANT props)) "o"))
	       (setf (htmlize-fstruct-italicp fstruct) t))
	     (setf (htmlize-fstruct-strikep fstruct)
		   (face-strikethru-p face))
	     (setf (htmlize-fstruct-underlinep fstruct)
		   (face-underline-p face))))
	  ((fboundp 'face-attribute)
	   ;; GNU Emacs 21 and further.
	   (dolist (attr '(:weight :slant :underline :overline :strike-through))
	     (let ((value (if (>= emacs-major-version 22)
			      ;; Use the INHERIT arg in GNU Emacs 22.
			      (face-attribute face attr nil t)
			    ;; Otherwise, fake it.
			    (let ((face face))
			      (while (and (eq (face-attribute face attr)
					      'unspecified)
					  (not (eq (face-attribute face :inherit)
						   'unspecified)))
				(setq face (face-attribute face :inherit)))
			      (face-attribute face attr)))))
	       (when (and value (not (eq value 'unspecified)))
		 (htmlize-face-emacs21-attr fstruct attr value))))
	   (let ((size (htmlize-face-size face)))
	     (unless (eql size 1.0) 	; ignore non-spec
	       (setf (htmlize-fstruct-size fstruct) size))))
	  (t
	   ;; Older GNU Emacs.  Some of these functions are only
	   ;; available under Emacs 20+, hence the guards.
	   (when (fboundp 'face-bold-p)
	     (setf (htmlize-fstruct-boldp fstruct) (face-bold-p face)))
	   (when (fboundp 'face-italic-p)
	     (setf (htmlize-fstruct-italicp fstruct) (face-italic-p face)))
	   (setf (htmlize-fstruct-underlinep fstruct)
		 (face-underline-p face))))
    ;; Generate the css-name property.  Emacs places no restrictions
    ;; on the names of symbols that represent faces -- any characters
    ;; may be in the name, even ^@.  We try hard to beat the face name
    ;; into shape, both esthetically and according to CSS1 specs.
    (setf (htmlize-fstruct-css-name fstruct)
	  (let ((name (downcase (symbol-name face))))
	    (when (string-match "\\`font-lock-" name)
	      ;; Change font-lock-FOO-face to FOO.
	      (setq name (replace-match "" t t name)))
	    (when (string-match "-face\\'" name)
	      ;; Drop the redundant "-face" suffix.
	      (setq name (replace-match "" t t name)))
	    (while (string-match "[^-a-zA-Z0-9]" name)
	      ;; Drop the non-alphanumerics.
	      (setq name (replace-match "X" t t name)))
	    (when (string-match "\\`[-0-9]" name)
	      ;; CSS identifiers may not start with a digit.
	      (setq name (concat "X" name)))
	    ;; After these transformations, the face could come
	    ;; out empty.
	    (when (equal name "")
	      (setq name "face"))
	    ;; Apply the prefix.
	    (setq name (concat htmlize-css-name-prefix name))
	    name))
    fstruct))

(defmacro htmlize-copy-attr-if-set (attr-list dest source)
  ;; Expand the code of the type
  ;; (and (htmlize-fstruct-ATTR source)
  ;;      (setf (htmlize-fstruct-ATTR dest) (htmlize-fstruct-ATTR source)))
  ;; for the given list of boolean attributes.
  (cons 'progn
	(loop for attr in attr-list
	      for attr-sym = (intern (format "htmlize-fstruct-%s" attr))
	      collect `(and (,attr-sym ,source)
			    (setf (,attr-sym ,dest) (,attr-sym ,source))))))

(defun htmlize-merge-size (merged next)
  ;; Calculate the size of the merge of MERGED and NEXT.
  (cond ((null merged)     next)
	((integerp next)   next)
	((null next)       merged)
	((floatp merged)   (* merged next))
	((integerp merged) (round (* merged next)))))

(defun htmlize-merge-two-faces (merged next)
  (htmlize-copy-attr-if-set
   (foreground background boldp italicp underlinep overlinep strikep)
   merged next)
  (setf (htmlize-fstruct-size merged)
	(htmlize-merge-size (htmlize-fstruct-size merged)
			    (htmlize-fstruct-size next)))
  merged)

(defun htmlize-merge-faces (fstruct-list)
  (cond ((null fstruct-list)
	 ;; Nothing to do, return a dummy face.
	 (make-htmlize-fstruct))
	((null (cdr fstruct-list))
	 ;; Optimize for the common case of a single face, simply
	 ;; return it.
	 (car fstruct-list))
	(t
	 (reduce #'htmlize-merge-two-faces
		 (cons (make-htmlize-fstruct) fstruct-list)))))

;; GNU Emacs 20+ supports attribute lists in `face' properties.  For
;; example, you can use `(:foreground "red" :weight bold)' as an
;; overlay's "face", or you can even use a list of such lists, etc.
;; We call those "attrlists".
;;
;; htmlize supports attrlist by converting them to fstructs, the same
;; as with regular faces.

(defun htmlize-attrlist-to-fstruct (attrlist)
  ;; Like htmlize-face-to-fstruct, but accepts an ATTRLIST as input.
  (let ((fstruct (make-htmlize-fstruct)))
    (cond ((eq (car attrlist) 'foreground-color)
	   ;; ATTRLIST is (foreground-color . COLOR)
	   (setf (htmlize-fstruct-foreground fstruct)
		 (htmlize-color-to-rgb (cdr attrlist))))
	  ((eq (car attrlist) 'background-color)
	   ;; ATTRLIST is (background-color . COLOR)
	   (setf (htmlize-fstruct-background fstruct)
		 (htmlize-color-to-rgb (cdr attrlist))))
	  (t
	   ;; ATTRLIST is a plist.
	   (while attrlist
	     (let ((attr (pop attrlist))
		   (value (pop attrlist)))
	       (when (and value (not (eq value 'unspecified)))
		 (htmlize-face-emacs21-attr fstruct attr value))))))
    (setf (htmlize-fstruct-css-name fstruct) "ATTRLIST")
    fstruct))

(defun htmlize-face-list-p (face-prop)
  "Return non-nil if FACE-PROP is a list of faces, nil otherwise."
  ;; If not for attrlists, this would return (listp face-prop).  This
  ;; way we have to be more careful because attrlist is also a list!
  (cond
   ((eq face-prop nil)
    ;; FACE-PROP being nil means empty list (no face), so return t.
    t)
   ((symbolp face-prop)
    ;; A symbol other than nil means that it's only one face, so return
    ;; nil.
    nil)
   ((not (consp face-prop))
    ;; Huh?  Not a symbol or cons -- treat it as a single element.
    nil)
   (t
    ;; We know that FACE-PROP is a cons: check whether it looks like an
    ;; ATTRLIST.
    (let* ((car (car face-prop))
	   (attrlist-p (and (symbolp car)
			    (or (eq car 'foreground-color)
				(eq car 'background-color)
				(eq (aref (symbol-name car) 0) ?:)))))
      ;; If FACE-PROP is not an ATTRLIST, it means it's a list of
      ;; faces.
      (not attrlist-p)))))

(defun htmlize-make-face-map (faces)
  ;; Return a hash table mapping Emacs faces to htmlize's fstructs.
  ;; The keys are either face symbols or attrlists, so the test
  ;; function must be `equal'.
  (let ((face-map (make-hash-table :test 'equal))
	css-names)
    (dolist (face faces)
      (unless (gethash face face-map)
	;; Haven't seen FACE yet; convert it to an fstruct and cache
	;; it.
	(let ((fstruct (if (symbolp face)
			   (htmlize-face-to-fstruct face)
			 (htmlize-attrlist-to-fstruct face))))
	  (setf (gethash face face-map) fstruct)
	  (let* ((css-name (htmlize-fstruct-css-name fstruct))
		 (new-name css-name)
		 (i 0))
	    ;; Uniquify the face's css-name by using NAME-1, NAME-2,
	    ;; etc.
	    (while (member new-name css-names)
	      (setq new-name (format "%s-%s" css-name (incf i))))
	    (unless (equal new-name css-name)
	      (setf (htmlize-fstruct-css-name fstruct) new-name))
	    (push new-name css-names)))))
    face-map))

(defun htmlize-unstringify-face (face)
  "If FACE is a string, return it interned, otherwise return it unchanged."
  (if (stringp face)
      (intern face)
    face))

(defun htmlize-faces-in-buffer ()
  "Return a list of faces used in the current buffer.
Under XEmacs, this returns the set of faces specified by the extents
with the `face' property.  (This covers text properties as well.)  Under
GNU Emacs, it returns the set of faces specified by the `face' text
property and by buffer overlays that specify `face'."
  (let (faces)
    ;; Testing for (fboundp 'map-extents) doesn't work because W3
    ;; defines `map-extents' under FSF.
    (if htmlize-running-xemacs
	(let (face-prop)
	  (map-extents (lambda (extent ignored)
			 (setq face-prop (extent-face extent)
			       ;; FACE-PROP can be a face or a list of
			       ;; faces.
			       faces (if (listp face-prop)
					 (union face-prop faces)
				       (adjoin face-prop faces)))
			 nil)
		       nil
		       ;; Specify endpoints explicitly to respect
		       ;; narrowing.
		       (point-min) (point-max) nil nil 'face))
      ;; FSF Emacs code.
      ;; Faces used by text properties.
      (let ((pos (point-min)) face-prop next)
	(while (< pos (point-max))
	  (setq face-prop (get-text-property pos 'face)
		next (or (next-single-property-change pos 'face) (point-max)))
	  ;; FACE-PROP can be a face/attrlist or a list thereof.
	  (setq faces (if (htmlize-face-list-p face-prop)
			  (nunion (mapcar #'htmlize-unstringify-face face-prop)
				  faces :test 'equal)
			(adjoin (htmlize-unstringify-face face-prop)
				faces :test 'equal)))
	  (setq pos next)))
      ;; Faces used by overlays.
      (dolist (overlay (overlays-in (point-min) (point-max)))
	(let ((face-prop (overlay-get overlay 'face)))
	  ;; FACE-PROP can be a face/attrlist or a list thereof.
	  (setq faces (if (htmlize-face-list-p face-prop)
			  (nunion (mapcar #'htmlize-unstringify-face face-prop)
				  faces :test 'equal)
			(adjoin (htmlize-unstringify-face face-prop)
				faces :test 'equal))))))
    faces))

;; htmlize-faces-at-point returns the faces in use at point.  The
;; faces are sorted by increasing priority, i.e. the last face takes
;; precedence.
;;
;; Under XEmacs, this returns all the faces in all the extents at
;; point.  Under GNU Emacs, this returns all the faces in the `face'
;; property and all the faces in the overlays at point.

(cond (htmlize-running-xemacs
       (defun htmlize-faces-at-point ()
	 (let (extent extent-list face-list face-prop)
	   (while (setq extent (extent-at (point) nil 'face extent))
	     (push extent extent-list))
	   ;; extent-list is in reverse display order, meaning that
	   ;; smallest ones come last.  That is the order we want,
	   ;; except it can be overridden by the `priority' property.
	   (setq extent-list (stable-sort extent-list #'<
					  :key #'extent-priority))
	   (dolist (extent extent-list)
	     (setq face-prop (extent-face extent))
	     ;; extent's face-list is in reverse order from what we
	     ;; want, but the `nreverse' below will take care of it.
	     (setq face-list (if (listp face-prop)
				 (append face-prop face-list)
			       (cons face-prop face-list))))
	   (nreverse face-list))))
      (t
       (defun htmlize-faces-at-point ()
	 (let (all-faces)
	   ;; Faces from text properties.
	   (let ((face-prop (get-text-property (point) 'face)))
	     (setq all-faces (if (htmlize-face-list-p face-prop)
				 (nreverse (mapcar #'htmlize-unstringify-face
						   face-prop))
			       (list (htmlize-unstringify-face face-prop)))))
	   ;; Faces from overlays.
	   (let ((overlays
		  ;; Collect overlays at point that specify `face'.
		  (delete-if-not (lambda (o)
				   (overlay-get o 'face))
				 (overlays-at (point))))
		 list face-prop)
	     ;; Sort the overlays so the smaller (more specific) ones
	     ;; come later.  The number of overlays at each one
	     ;; position should be very small, so the sort shouldn't
	     ;; slow things down.
	     (setq overlays (sort* overlays
				   ;; Sort by ascending...
				   #'<
				   ;; ...overlay size.
				   :key (lambda (o)
					  (- (overlay-end o)
					     (overlay-start o)))))
	     ;; Overlay priorities, if present, override the above
	     ;; established order.  Larger overlay priority takes
	     ;; precedence and therefore comes later in the list.
	     (setq overlays (stable-sort
			     overlays
			     ;; Reorder (stably) by acending...
			     #'<
			     ;; ...overlay priority.
			     :key (lambda (o)
				    (or (overlay-get o 'priority) 0))))
	     (dolist (overlay overlays)
	       (setq face-prop (overlay-get overlay 'face))
	       (setq list (if (htmlize-face-list-p face-prop)
			      (nconc (nreverse (mapcar
						#'htmlize-unstringify-face
						face-prop))
				     list)
			    (cons (htmlize-unstringify-face face-prop) list))))
	     ;; Under "Merging Faces" the manual explicitly states
	     ;; that faces specified by overlays take precedence over
	     ;; faces specified by text properties.
	     (setq all-faces (nconc all-faces list)))
	   all-faces))))

;; htmlize supports generating HTML in two several fundamentally
;; different ways, one with the use of CSS and nested <span> tags, and
;; the other with the use of the old <font> tags.  Rather than adding
;; a bunch of ifs to many places, we take a semi-OO approach.
;; `htmlize-buffer-1' calls a number of "methods", which indirect to
;; the functions that depend on `htmlize-output-type'.  The currently
;; used methods are `doctype', `insert-head', `body-tag', and
;; `insert-text'.  Not all output types define all methods.
;;
;; Methods are called either with (htmlize-method METHOD ARGS...) 
;; special form, or by accessing the function with
;; (htmlize-method-function 'METHOD) and calling (funcall FUNCTION).
;; The latter form is useful in tight loops because `htmlize-method'
;; conses.
;;
;; Currently defined output types are `css' and `font'.

(defmacro htmlize-method (method &rest args)
  ;; Expand to (htmlize-TYPE-METHOD ...ARGS...).  TYPE is the value of
  ;; `htmlize-output-type' at run time.
  `(funcall (htmlize-method-function ',method) , at args))

(defun htmlize-method-function (method)
  ;; Return METHOD's function definition for the current output type.
  ;; The returned object can be safely funcalled.
  (let ((sym (intern (format "htmlize-%s-%s" htmlize-output-type method))))
    (indirect-function (if (fboundp sym)
			   sym
			 (let ((default (intern (concat "htmlize-default-"
							(symbol-name method)))))
			   (if (fboundp default)
			       default
			     'ignore))))))

(defvar htmlize-memoization-table (make-hash-table :test 'equal))

(defmacro htmlize-memoize (key generator)
  "Return the value of GENERATOR, memoized as KEY.
That means that GENERATOR will be evaluated and returned the first time
it's called with the same value of KEY.  All other times, the cached
\(memoized) value will be returned."
  (let ((value (gensym)))
    `(let ((,value (gethash ,key htmlize-memoization-table)))
       (unless ,value
	 (setq ,value ,generator)
	 (setf (gethash ,key htmlize-memoization-table) ,value))
       ,value)))

;;; Default methods.

(defun htmlize-default-doctype ()
  nil					; no doc-string
  ;; According to DTDs published by the W3C, it is illegal to embed
  ;; <font> in <pre>.  This makes sense in general, but is bad for
  ;; htmlize's intended usage of <font> to specify the document color.

  ;; To make generated HTML legal, htmlize's `font' mode used to
  ;; specify the SGML declaration of "HTML Pro" DTD here.  HTML Pro
  ;; aka Silmaril DTD was a project whose goal was to produce a GPL'ed
  ;; DTD that would encompass all the incompatible HTML extensions
  ;; procured by Netscape, MSIE, and other players in the field.
  ;; Apparently the project got abandoned, the last available version
  ;; being "Draft 0 Revision 11" from January 1997, as documented at
  ;; <http://imbolc.ucc.ie/~pflynn/articles/htmlpro.html>.

  ;; Since by now HTML Pro is remembered by none but the most die-hard
  ;; early-web-days nostalgics and used by not even them, there is no
  ;; use in specifying it.  So we return the standard HTML 4.0
  ;; declaration, which makes generated HTML technically illegal.  If
  ;; you have a problem with that, use the `css' engine designed to
  ;; create fully conforming HTML.

  "<!DOCTYPE html PUBLIC \"-//W3C//DTD HTML 4.01//EN\">"

  ;; Now-abandoned HTML Pro declaration.
  ;"<!DOCTYPE HTML PUBLIC \"+//Silmaril//DTD HTML Pro v0r11 19970101//EN\">"
  )

(defun htmlize-default-body-tag (face-map)
  nil					; no doc-string
  "<body>")

;;; CSS based output support.

;; Internal function; not a method.
(defun htmlize-css-specs (fstruct)
  (let (result)
    (when (htmlize-fstruct-foreground fstruct)
      (push (format "color: %s;" (htmlize-fstruct-foreground fstruct))
	    result))
    (when (htmlize-fstruct-background fstruct)
      (push (format "background-color: %s;"
		    (htmlize-fstruct-background fstruct))
	    result))
    (let ((size (htmlize-fstruct-size fstruct)))
      (when (and size (not (eq htmlize-ignore-face-size t)))
	(cond ((floatp size)
	       (push (format "font-size: %d%%;" (* 100 size)) result))
	      ((not (eq htmlize-ignore-face-size 'absolute))
	       (push (format "font-size: %spt;" (/ size 10.0)) result)))))
    (when (htmlize-fstruct-boldp fstruct)
      (push "font-weight: bold;" result))
    (when (htmlize-fstruct-italicp fstruct)
      (push "font-style: italic;" result))
    (when (htmlize-fstruct-underlinep fstruct)
      (push "text-decoration: underline;" result))
    (when (htmlize-fstruct-overlinep fstruct)
      (push "text-decoration: overline;" result))
    (when (htmlize-fstruct-strikep fstruct)
      (push "text-decoration: line-through;" result))
    (nreverse result)))

(defun htmlize-css-insert-head (buffer-faces face-map)
  (insert "    <style type=\"text/css\">\n    <!--\n")
  (insert "      body {\n        "
	  (mapconcat #'identity
		     (htmlize-css-specs (gethash 'default face-map))
		     "\n        ")
	  "\n      }\n")
  (dolist (face (sort* (copy-list buffer-faces) #'string-lessp
		       :key (lambda (f)
			      (htmlize-fstruct-css-name (gethash f face-map)))))
    (let* ((fstruct (gethash face face-map))
	   (cleaned-up-face-name
	    (let ((s
		   ;; Use `prin1-to-string' rather than `symbol-name'
		   ;; to get the face name because the "face" can also
		   ;; be an attrlist, which is not a symbol.
		   (prin1-to-string face)))
	      ;; If the name contains `--' or `*/', remove them.
	      (while (string-match "--" s)
		(setq s (replace-match "-" t t s)))
	      (while (string-match "\\*/" s)
		(setq s (replace-match "XX" t t s)))
	      s))
	   (specs (htmlize-css-specs fstruct)))
      (insert "      ." (htmlize-fstruct-css-name fstruct))
      (if (null specs)
	  (insert " {")
	(insert " {\n        /* " cleaned-up-face-name " */\n        "
		(mapconcat #'identity specs "\n        ")))
      (insert "\n      }\n")))
  (insert htmlize-hyperlink-style
	  "    -->\n    </style>\n"))

(defun htmlize-css-insert-text (text fstruct-list buffer)
  ;; Insert TEXT colored with FACES into BUFFER.  In CSS mode, this is
  ;; easy: just nest the text in one <span class=...> tag for each
  ;; face in FSTRUCT-LIST.
  (dolist (fstruct fstruct-list)
    (princ "<span class=\"" buffer)
    (princ (htmlize-fstruct-css-name fstruct) buffer)
    (princ "\">" buffer))
  (princ text buffer)
  (dolist (fstruct fstruct-list)
    (ignore fstruct)			; shut up the byte-compiler
    (princ "</span>" buffer)))

;; `inline-css' output support.

(defun htmlize-inline-css-body-tag (face-map)
  (format "<body style=\"%s\">"
	  (mapconcat #'identity (htmlize-css-specs (gethash 'default face-map))
		     " ")))

(defun htmlize-inline-css-insert-text (text fstruct-list buffer)
  (let* ((merged (htmlize-merge-faces fstruct-list))
	 (style (htmlize-memoize
		 merged
		 (let ((specs (htmlize-css-specs merged)))
		   (and specs
			(mapconcat #'identity (htmlize-css-specs merged) " "))))))
    (when style
      (princ "<span style=\"" buffer)
      (princ style buffer)
      (princ "\">" buffer))
    (princ text buffer)
    (when style
      (princ "</span>" buffer))))

;;; `font' tag based output support.

(defun htmlize-font-body-tag (face-map)
  (let ((fstruct (gethash 'default face-map)))
    (format "<body text=\"%s\" bgcolor=\"%s\">"
	    (htmlize-fstruct-foreground fstruct)
	    (htmlize-fstruct-background fstruct))))
       
(defun htmlize-font-insert-text (text fstruct-list buffer)
  ;; In `font' mode, we use the traditional HTML means of altering
  ;; presentation: <font> tag for colors, <b> for bold, <u> for
  ;; underline, and <strike> for strike-through.
  (let* ((merged (htmlize-merge-faces fstruct-list))
	 (markup (htmlize-memoize
		  merged
		  (cons (concat
			 (and (htmlize-fstruct-foreground merged)
			      (format "<font color=\"%s\">" (htmlize-fstruct-foreground merged)))
			 (and (htmlize-fstruct-boldp merged)      "<b>")
			 (and (htmlize-fstruct-italicp merged)    "<i>")
			 (and (htmlize-fstruct-underlinep merged) "<u>")
			 (and (htmlize-fstruct-strikep merged)    "<strike>"))
			(concat
			 (and (htmlize-fstruct-strikep merged)    "</strike>")
			 (and (htmlize-fstruct-underlinep merged) "</u>")
			 (and (htmlize-fstruct-italicp merged)    "</i>")
			 (and (htmlize-fstruct-boldp merged)      "</b>")
			 (and (htmlize-fstruct-foreground merged) "</font>"))))))
    (princ (car markup) buffer)
    (princ text buffer)
    (princ (cdr markup) buffer)))

(defun htmlize-buffer-1 ()
  ;; Internal function; don't call it from outside this file.  Htmlize
  ;; current buffer, writing the resulting HTML to a new buffer, and
  ;; return it.  Unlike htmlize-buffer, this doesn't change current
  ;; buffer or use switch-to-buffer.
  (save-excursion
    ;; Protect against the hook changing the current buffer.
    (save-excursion
      (run-hooks 'htmlize-before-hook))
    ;; Convince font-lock support modes to fontify the entire buffer
    ;; in advance.
    (htmlize-ensure-fontified)
    (clrhash htmlize-extended-character-cache)
    (clrhash htmlize-memoization-table)
    (let* ((buffer-faces (htmlize-faces-in-buffer))
	   (face-map (htmlize-make-face-map (adjoin 'default buffer-faces)))
	   ;; Generate the new buffer.  It's important that it inherits
	   ;; default-directory from the current buffer.
	   (htmlbuf (generate-new-buffer (if (buffer-file-name)
					     (htmlize-make-file-name
					      (file-name-nondirectory
					       (buffer-file-name)))
					   "*html*")))
	   ;; Having a dummy value in the plist allows writing simply
	   ;; (plist-put places foo bar).
	   (places '(nil nil))
	   (title (if (buffer-file-name)
		      (file-name-nondirectory (buffer-file-name))
		    (buffer-name))))
      ;; Initialize HTMLBUF and insert the HTML prolog.
      (with-current-buffer htmlbuf
	(buffer-disable-undo)
	(insert (htmlize-method doctype) ?\n
		(format "<!-- Created by htmlize-%s in %s mode. -->\n"
			htmlize-version htmlize-output-type)
		"<html>\n  ")
	(plist-put places 'head-start (point-marker))
	(insert "<head>\n"
		"    <title>" (htmlize-protect-string title) "</title>\n"
		(if htmlize-html-charset
		    (format (concat "    <meta http-equiv=\"Content-Type\" "
				    "content=\"text/html; charset=%s\">\n")
			    htmlize-html-charset)
		  "")
		htmlize-head-tags)
	(htmlize-method insert-head buffer-faces face-map)
	(insert "  </head>")
	(plist-put places 'head-end (point-marker))
	(insert "\n  ")
	(plist-put places 'body-start (point-marker))
	(insert (htmlize-method body-tag face-map)
		"\n    ")
	(plist-put places 'content-start (point-marker))
	(insert "<pre>\n"))
      (let ((insert-text-method
	     ;; Get the inserter method, so we can funcall it inside
	     ;; the loop.  Not calling `htmlize-method' in the loop
	     ;; body yields a measurable speed increase.
	     (htmlize-method-function 'insert-text))
	    ;; Declare variables used in loop body outside the loop
	    ;; because it's faster to establish `let' bindings only
	    ;; once.
	    next-change text face-list fstruct-list trailing-ellipsis)
	;; This loop traverses and reads the source buffer, appending
	;; the resulting HTML to HTMLBUF with `princ'.  This method is
	;; fast because: 1) it doesn't require examining the text
	;; properties char by char (htmlize-next-change is used to
	;; move between runs with the same face), and 2) it doesn't
	;; require buffer switches, which are slow in Emacs.
	(goto-char (point-min))
	(while (not (eobp))
	  (setq next-change (htmlize-next-change (point) 'face))
	  ;; Get faces in use between (point) and NEXT-CHANGE, and
	  ;; convert them to fstructs.
	  (setq face-list (htmlize-faces-at-point)
		fstruct-list (delq nil (mapcar (lambda (f)
						 (gethash f face-map))
					       face-list)))
	  ;; Extract buffer text, sans the invisible parts.  Then
	  ;; untabify it and escape the HTML metacharacters.
	  (setq text (htmlize-buffer-substring-no-invisible
		      (point) next-change))
	  (when trailing-ellipsis
	    (setq text (htmlize-trim-ellipsis text)))
	  ;; If TEXT ends up empty, don't change trailing-ellipsis.
	  (when (> (length text) 0)
	    (setq trailing-ellipsis
		  (get-text-property (1- (length text))
				     'htmlize-ellipsis text)))
	  (setq text (htmlize-untabify text (current-column)))
	  (setq text (htmlize-protect-string text))
	  ;; Don't bother writing anything if there's no text (this
	  ;; happens in invisible regions).
	  (when (> (length text) 0)
	    ;; Insert the text, along with the necessary markup to
	    ;; represent faces in FSTRUCT-LIST.
	    (funcall insert-text-method text fstruct-list htmlbuf))
	  (goto-char next-change)))

      ;; Insert the epilog and post-process the buffer.
      (with-current-buffer htmlbuf
	(insert "</pre>")
	(plist-put places 'content-end (point-marker))
	(insert "\n  </body>")
	(plist-put places 'body-end (point-marker))
	(insert "\n</html>\n")
	(when htmlize-generate-hyperlinks
	  (htmlize-make-hyperlinks))
	(htmlize-defang-local-variables)
	(when htmlize-replace-form-feeds
	  ;; Change each "\n^L" to "<hr />".
	  (goto-char (point-min))
	  (let ((source
		 ;; ^L has already been escaped, so search for that.
		 (htmlize-protect-string "\n\^L"))
		(replacement
		 (if (stringp htmlize-replace-form-feeds)
		     htmlize-replace-form-feeds
		   "</pre><hr /><pre>")))
	    (while (search-forward source nil t)
	      (replace-match replacement t t))))
	(goto-char (point-min))
	(when htmlize-html-major-mode
	  ;; What sucks about this is that the minor modes, most notably
	  ;; font-lock-mode, won't be initialized.  Oh well.
	  (funcall htmlize-html-major-mode))
	(set (make-local-variable 'htmlize-buffer-places) places)
	(run-hooks 'htmlize-after-hook)
	(buffer-enable-undo))
      htmlbuf)))

;; Utility functions.

(defmacro htmlize-with-fontify-message (&rest body)
  ;; When forcing fontification of large buffers in
  ;; htmlize-ensure-fontified, inform the user that he is waiting for
  ;; font-lock, not for htmlize to finish.
  `(progn
     (if (> (buffer-size) 65536)
	 (message "Forcing fontification of %s..."
		  (buffer-name (current-buffer))))
     , at body
     (if (> (buffer-size) 65536)
	 (message "Forcing fontification of %s...done"
		  (buffer-name (current-buffer))))))

(defun htmlize-ensure-fontified ()
  ;; If font-lock is being used, ensure that the "support" modes
  ;; actually fontify the buffer.  If font-lock is not in use, we
  ;; don't care because, except in htmlize-file, we don't force
  ;; font-lock on the user.
  (when (and (boundp 'font-lock-mode)
	     font-lock-mode)
    ;; In part taken from ps-print-ensure-fontified in GNU Emacs 21.
    (cond
     ((and (boundp 'jit-lock-mode)
	   (symbol-value 'jit-lock-mode))
      (htmlize-with-fontify-message
       (jit-lock-fontify-now (point-min) (point-max))))
     ((and (boundp 'lazy-lock-mode)
	   (symbol-value 'lazy-lock-mode))
      (htmlize-with-fontify-message
       (lazy-lock-fontify-region (point-min) (point-max))))
     ((and (boundp 'lazy-shot-mode)
	   (symbol-value 'lazy-shot-mode))
      (htmlize-with-fontify-message
       ;; lazy-shot is amazing in that it must *refontify* the region,
       ;; even if the whole buffer has already been fontified.  <sigh>
       (lazy-shot-fontify-region (point-min) (point-max))))
     ;; There's also fast-lock, but we don't need to handle specially,
     ;; I think.  fast-lock doesn't really defer fontification, it
     ;; just saves it to an external cache so it's not done twice.
     )))


;;;###autoload
(defun htmlize-buffer (&optional buffer)
  "Convert BUFFER to HTML, preserving colors and decorations.

The generated HTML is available in a new buffer, which is returned.
When invoked interactively, the new buffer is selected in the current
window.  The title of the generated document will be set to the buffer's
file name or, if that's not available, to the buffer's name.

Note that htmlize doesn't fontify your buffers, it only uses the
decorations that are already present.  If you don't set up font-lock or
something else to fontify your buffers, the resulting HTML will be
plain.  Likewise, if you don't like the choice of colors, fix the mode
that created them, or simply alter the faces it uses."
  (interactive)
  (let ((htmlbuf (with-current-buffer (or buffer (current-buffer))
		   (htmlize-buffer-1))))
    (when (interactive-p)
      (switch-to-buffer htmlbuf))
    htmlbuf))

;;;###autoload
(defun htmlize-region (beg end)
  "Convert the region to HTML, preserving colors and decorations.
See `htmlize-buffer' for details."
  (interactive "r")
  ;; Don't let zmacs region highlighting end up in HTML.
  (when (fboundp 'zmacs-deactivate-region)
    (zmacs-deactivate-region))
  (let ((htmlbuf (save-restriction
		   (narrow-to-region beg end)
		   (htmlize-buffer-1))))
    (when (interactive-p)
      (switch-to-buffer htmlbuf))
    htmlbuf))

(defun htmlize-region-for-paste (beg end)
  "Htmlize the region and return just the HTML as a string.
This forces the `inline-css' style and only returns the HTML body,
but without the BODY tag.  This should make it useful for inserting
the text to another HTML buffer."
  (let* ((htmlize-output-type 'inline-css)
	 (htmlbuf (htmlize-region beg end)))
    (unwind-protect
	(with-current-buffer htmlbuf
	  (buffer-substring (plist-get htmlize-buffer-places 'content-start)
			    (plist-get htmlize-buffer-places 'content-end)))
      (kill-buffer htmlbuf))))

(defun htmlize-make-file-name (file)
  "Make an HTML file name from FILE.

In its default implementation, this simply appends `.html' to FILE.
This function is called by htmlize to create the buffer file name, and
by `htmlize-file' to create the target file name.

More elaborate transformations are conceivable, such as changing FILE's
extension to `.html' (\"file.c\" -> \"file.html\").  If you want them,
overload this function to do it and htmlize will comply."
  (concat file ".html"))

;; Older implementation of htmlize-make-file-name that changes FILE's
;; extension to ".html".
;(defun htmlize-make-file-name (file)
;  (let ((extension (file-name-extension file))
;	(sans-extension (file-name-sans-extension file)))
;    (if (or (equal extension "html")
;	    (equal extension "htm")
;	    (equal sans-extension ""))
;	(concat file ".html")
;      (concat sans-extension ".html"))))

;;;###autoload
(defun htmlize-file (file &optional target)
  "Load FILE, fontify it, convert it to HTML, and save the result.

Contents of FILE are inserted into a temporary buffer, whose major mode
is set with `normal-mode' as appropriate for the file type.  The buffer
is subsequently fontified with `font-lock' and converted to HTML.  Note
that, unlike `htmlize-buffer', this function explicitly turns on
font-lock.  If a form of highlighting other than font-lock is desired,
please use `htmlize-buffer' directly on buffers so highlighted.

Buffers currently visiting FILE are unaffected by this function.  The
function does not change current buffer or move the point.

If TARGET is specified and names a directory, the resulting file will be
saved there instead of to FILE's directory.  If TARGET is specified and
does not name a directory, it will be used as output file name."
  (interactive (list (read-file-name
		      "HTML-ize file: "
		      nil nil nil (and (buffer-file-name)
				       (file-name-nondirectory
					(buffer-file-name))))))
  (let ((output-file (if (and target (not (file-directory-p target)))
			 target
		       (expand-file-name
			(htmlize-make-file-name (file-name-nondirectory file))
			(or target (file-name-directory file)))))
	;; Try to prevent `find-file-noselect' from triggering
	;; font-lock because we'll fontify explicitly below.
	(font-lock-mode nil)
	(font-lock-auto-fontify nil)
	(global-font-lock-mode nil)
	;; Ignore the size limit for the purposes of htmlization.
	(font-lock-maximum-size nil)
	;; Disable font-lock support modes.  This will only work in
	;; more recent Emacs versions, so htmlize-buffer-1 still needs
	;; to call htmlize-ensure-fontified.
	(font-lock-support-mode nil))
    (with-temp-buffer
      ;; Insert FILE into the temporary buffer.
      (insert-file-contents file)
      ;; Set the file name so normal-mode and htmlize-buffer-1 pick it
      ;; up.  Restore it afterwards so with-temp-buffer's kill-buffer
      ;; doesn't complain about killing a modified buffer.
      (let ((buffer-file-name file))
	;; Set the major mode for the sake of font-lock.
	(normal-mode)
	(font-lock-mode 1)
	(unless font-lock-mode
	  ;; In GNU Emacs (font-lock-mode 1) doesn't force font-lock,
	  ;; contrary to the documentation.  This seems to work.
	  (font-lock-fontify-buffer))
	;; htmlize the buffer and save the HTML.
	(with-current-buffer (htmlize-buffer-1)
	  (unwind-protect
	      (progn
		(run-hooks 'htmlize-file-hook)
		(write-region (point-min) (point-max) output-file))
	    (kill-buffer (current-buffer)))))))
  ;; I haven't decided on a useful return value yet, so just return
  ;; nil.
  nil)

;;;###autoload
(defun htmlize-many-files (files &optional target-directory)
  "Convert FILES to HTML and save the corresponding HTML versions.

FILES should be a list of file names to convert.  This function calls
`htmlize-file' on each file; see that function for details.  When
invoked interactively, you are prompted for a list of files to convert,
terminated with RET.

If TARGET-DIRECTORY is specified, the HTML files will be saved to that
directory.  Normally, each HTML file is saved to the directory of the
corresponding source file."
  (interactive
   (list
    (let (list file)
      ;; Use empty string as DEFAULT because setting DEFAULT to nil
      ;; defaults to the directory name, which is not what we want.
      (while (not (equal (setq file (read-file-name
				     "HTML-ize file (RET to finish): "
				     (and list (file-name-directory
						(car list)))
				     "" t))
			 ""))
	(push file list))
      (nreverse list))))
  ;; Verify that TARGET-DIRECTORY is indeed a directory.  If it's a
  ;; file, htmlize-file will use it as target, and that doesn't make
  ;; sense.
  (and target-directory
       (not (file-directory-p target-directory))
       (error "target-directory must name a directory: %s" target-directory))
  (dolist (file files)
    (htmlize-file file target-directory)))

;;;###autoload
(defun htmlize-many-files-dired (arg &optional target-directory)
  "HTMLize dired-marked files."
  (interactive "P")
  (htmlize-many-files (dired-get-marked-files nil arg) target-directory))

(provide 'htmlize)

;;; htmlize.el ends here


--- NEW FILE import.log ---
emacs-htmlize-1_34-2_fc10:HEAD:emacs-htmlize-1.34-2.fc10.src.rpm:1233060515



From kevin at fedoraproject.org  Tue Jan 27 18:24:43 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 27 Jan 2009 18:24:43 +0000 (UTC)
Subject: rpms/libxfce4menu/devel sources, 1.3, 1.4 .cvsignore, 1.3,
	1.4 libxfce4menu.spec, 1.2, 1.3
Message-ID: <20090127182443.1E0287010B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/libxfce4menu/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4118

Modified Files:
	sources .cvsignore libxfce4menu.spec 
Log Message:
Update to 4.5.99.1



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libxfce4menu/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	17 Jan 2009 03:10:14 -0000	1.3
+++ sources	27 Jan 2009 18:24:12 -0000	1.4
@@ -1 +1 @@
-54b75f848566f179fcfd463af03281ff  libxfce4menu-4.5.93.tar.bz2
+7d90178f6bc6632ad42366c609cce4eb  libxfce4menu-4.5.99.1.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libxfce4menu/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	17 Jan 2009 03:10:14 -0000	1.3
+++ .cvsignore	27 Jan 2009 18:24:12 -0000	1.4
@@ -1 +1 @@
-libxfce4menu-4.5.93.tar.bz2
+libxfce4menu-4.5.99.1.tar.bz2


Index: libxfce4menu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libxfce4menu/devel/libxfce4menu.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- libxfce4menu.spec	17 Jan 2009 03:10:14 -0000	1.2
+++ libxfce4menu.spec	27 Jan 2009 18:24:12 -0000	1.3
@@ -1,5 +1,5 @@
 Name:           libxfce4menu
-Version:        4.5.93
+Version:        4.5.99.1
 Release:        1%{?dist}
 Summary:        A freedesktop.org compliant menu implementation for Xfce
 
@@ -63,6 +63,9 @@
 %{_libdir}/pkgconfig/%{name}-0.1.pc
 
 %changelog
+* Mon Jan 26 2009 Kevin Fenzi <kevin at tummy.com> - 4.5.99.1-1
+- Update to 4.5.99.1
+
 * Tue Jan 13 2009 Kevin Fenzi <kevin at tummy.com> - 4.5.93-1
 - Update to 4.5.93
 



From llaumgui at fedoraproject.org  Tue Jan 27 18:25:33 2009
From: llaumgui at fedoraproject.org (Guillaume Kulakowski)
Date: Tue, 27 Jan 2009 18:25:33 +0000 (UTC)
Subject: rpms/backup-manager/devel backup-manager-0.7.7-configtpl.patch, NONE,
	1.1 backup-manager.cron.daily, NONE, 1.1 backup-manager.spec,
	NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090127182533.85A217010B@cvs1.fedora.phx.redhat.com>

Author: llaumgui

Update of /cvs/pkgs/rpms/backup-manager/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4259/devel

Modified Files:
	.cvsignore sources 
Added Files:
	backup-manager-0.7.7-configtpl.patch backup-manager.cron.daily 
	backup-manager.spec import.log 
Log Message:


backup-manager-0.7.7-configtpl.patch:

--- NEW FILE backup-manager-0.7.7-configtpl.patch ---
--- backup-manager-0.7.7/backup-manager.conf.tpl.configtpl	2008-04-14 19:58:43.000000000 +0200
+++ backup-manager-0.7.7/backup-manager.conf.tpl	2009-01-15 19:52:38.000000000 +0100
@@ -12,8 +12,11 @@
 # Repository - everything about where archives are
 #############################################################
 
+# RPM-specific : Enabled daily cron
+export BM_DAILY_CRON="false"
+
 # Where to store the archives
-export BM_REPOSITORY_ROOT="/var/archives"
+export BM_REPOSITORY_ROOT="/var/backup-manager"
 
 # Where to place temporary files
 export BM_TEMP_DIR="/tmp"


--- NEW FILE backup-manager.cron.daily ---
#!/bin/bash
#
# backup-manager's cron script
#
# This script do backup if option BM_DAILY_CRON in config is true

BM_PATH=$(which backup-manager)
eval $(grep BM_DAILY_CRON /etc/backup-manager.conf)

if [ ${BM_DAILY_CRON} = "true" ]; then
    ${BM_PATH} -v
else
    echo "[backup-manager] Daily cron is disabled"
fi
exit 0

--- NEW FILE backup-manager.spec ---
Name:           backup-manager
Version:        0.7.7
Release:        7%{?dist}
Summary:        A command line backup tool for GNU/Linux

Group:          Applications/System
License:        GPLv2+
URL:            http://www.backup-manager.org
Source0:        http://www.backup-manager.org/download/%{name}-%{version}.tar.gz
Source1:        %{name}.cron.daily
Patch0:         %{name}-%{version}-configtpl.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch

BuildRequires:  gettext 
BuildRequires:  perl

Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
Requires:       /bin/bash
Requires:       /usr/bin/cdrecord
Requires:       /usr/bin/logger
Requires:       /usr/bin/mkisofs
Requires:       bc
Requires:       bzip2
Requires:       coreutils
Requires:       diffutils
Requires:       dvd+rw-tools
Requires:       less
Requires:       ftp
Requires:       genisoimage
Requires:       gettext
Requires:       gnupg
Requires:       gzip
Requires:       openssh-clients
Requires:       rsync
Requires:       sed
Requires:       tar
Requires:       which



%description
Backup Manager is a command line backup tool for GNU/Linux, designed to help
you make daily archives of your file system. Written in bash and perl, it can
make archives in lots of open formats (tar, gzip, bzip2, lzma, dar, zip) and
provides lots of interesting features (such as network exports or CD/DVD
automated-burning).

The program is designed to be as easy to use as possible and is popular with
desktop users and sysadmins. The whole backup process is defined in one
full-documented configuration file which needs no more than 5 minutes to tune
for your needs.



%prep
%setup -q
%patch0 -p1 -b .configtpl

# Clean Makefile
sed -i -e "s at install --owner=root --group=root @install @" Makefile

# Replace #!/bin/sh by #!/bin/bash 
for file in t/*.sh; do sed -i -e "s@#!/bin/sh@#!/bin/bash@" "$file"; done
for file in doc/*; do sed -i -e "s@#!/bin/sh@#!/bin/bash@" "$file"; done

# rpmlint : Convert to utf-8
for file in AUTHORS ChangeLog COPYING NEWS README THANKS; do
    mv $file timestamp
    iconv -f ISO-8859-1 -t UTF-8 -o $file timestamp
    touch -r timestamp $file
done



%build
make %{?_smp_mflags}



%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot} \
             PERL5DIR=%{buildroot}%{perl_vendorlib}
             INSTALL="install -p" 
%find_lang %{name}

# Create backup directory
install -d %{buildroot}%{_localstatedir}/%{name}

# Copy configuration
install -p -D -m 0644 %{buildroot}%{_datadir}/%{name}/%{name}.conf.tpl \
                   %{buildroot}%{_sysconfdir}/%{name}.conf

# Add cron.daily                
install -p -D -m 0755 %{SOURCE1} %{buildroot}%{_sysconfdir}/cron.daily/%{name}.cron

# rpmlint : sanitize.sh is a non-executable-script
chmod 755 %{buildroot}%{_datadir}/%{name}/sanitize.sh



%clean
rm -rf %{buildroot}



%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog NEWS README THANKS
%{_bindir}/%{name}-purge
%{_bindir}/%{name}-upload
%{_sbindir}/%{name}
%{perl_vendorlib}/BackupManager
%{_datadir}/%{name}
%{_mandir}/man8/%{name}*
%config(noreplace) %{_sysconfdir}/%{name}.conf
%{_sysconfdir}/cron.daily/%{name}.cron
%{_localstatedir}/%{name}



%changelog
* Thu Jan 15 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 0.7.7-7
- Replace some sed by a patch
- Replace /bin/sh by /bin/bash 

* Wed Jan 13 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 0.7.7-6
- Fix Requires
- Fix use %%{_localstatedir} insted %%{_var}/lib

* Sun Jan 10 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 0.7.7-5
- Fix Requires
- Add  %%{_var}/lib/backup-manager directory
- Use %%{buildroot} insted $RPM_BUILD_ROOT

* Sun Jan 10 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 0.7.7-4
- Fix license
- Fix timestamp in install

* Fri Oct 10 2008 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 0.7.7-3
- Add a daily cron (backup-manager.cron.daily)

* Wed Aug 20 2008 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 0.7.7-2
- utf-8 correction with Iconv
- Configuration file correction

* Sun Aug 17 2008 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 0.7.7-1
- Initial packaging


--- NEW FILE import.log ---
backup-manager-0_7_7-7_fc10:HEAD:backup-manager-0.7.7-7.fc10.src.rpm:1233080620


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/backup-manager/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	26 Jan 2009 22:19:44 -0000	1.1
+++ .cvsignore	27 Jan 2009 18:25:03 -0000	1.2
@@ -0,0 +1 @@
+backup-manager-0.7.7.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/backup-manager/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	26 Jan 2009 22:19:44 -0000	1.1
+++ sources	27 Jan 2009 18:25:03 -0000	1.2
@@ -0,0 +1 @@
+076af845dee01453f450bd06d021fcc3  backup-manager-0.7.7.tar.gz



From kevin at fedoraproject.org  Tue Jan 27 18:27:44 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 27 Jan 2009 18:27:44 +0000 (UTC)
Subject: rpms/exo/devel sources, 1.9, 1.10 .cvsignore, 1.9, 1.10 exo.spec,
	1.30, 1.31
Message-ID: <20090127182744.097FC7010B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/exo/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4884

Modified Files:
	sources .cvsignore exo.spec 
Log Message:
Update to 0.3.99.1



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/exo/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	17 Jan 2009 07:28:47 -0000	1.9
+++ sources	27 Jan 2009 18:27:13 -0000	1.10
@@ -1 +1 @@
-5edbf2c2a2d7c43c7704b76a10cf46b8  exo-0.3.93.tar.bz2
+aa53c97c252aaedb996983e2f67b1dfe  exo-0.3.99.1.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/exo/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	17 Jan 2009 07:28:47 -0000	1.9
+++ .cvsignore	27 Jan 2009 18:27:13 -0000	1.10
@@ -1 +1 @@
-exo-0.3.93.tar.bz2
+exo-0.3.99.1.tar.bz2


Index: exo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/exo/devel/exo.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- exo.spec	17 Jan 2009 07:28:47 -0000	1.30
+++ exo.spec	27 Jan 2009 18:27:13 -0000	1.31
@@ -2,13 +2,13 @@
 
 Summary: Application library for the Xfce desktop environment
 Name: exo
-Version: 0.3.93
+Version: 0.3.99.1
 Release: 1%{?dist}
 # libexo-hal exo-helper mount-notify and exo-mount are all GPLv2+
 # everything else is LGPLv2+
 License: LGPLv2+ and GPLv2+
 URL: http://xfce.org/
-Source0: http://www.xfce.org/archive/xfce-4.5.93/src/exo-%{version}.tar.bz2
+Source0: http://www.xfce.org/archive/xfce-4.5.99.1/src/exo-%{version}.tar.bz2
 Patch0: exo-0.3.0-x86_64-build.patch
 Group: System Environment/Libraries
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -95,6 +95,7 @@
 %{_libdir}/lib*.so.*
 %{_datadir}/xfce4/helpers
 %{_datadir}/xfce4/doc/C
+%{_datadir}/xfce4/doc/es
 %{_datadir}/xfce4/doc/ja
 %{_datadir}/xfce4/doc/fr
 %{_datadir}/xfce4/doc/id
@@ -134,6 +135,9 @@
 %{python_sitearch}/pyexo.*
 
 %changelog
+* Mon Jan 26 2009 Kevin Fenzi <kevin at tummy.com> - 0.3.99.1-1
+- Update to 0.3.99.1
+
 * Tue Jan 13 2009 Kevin Fenzi <kevin at tummy.com> 0.3.93-1
 - Update to 0.3.93
 



From kevin at fedoraproject.org  Tue Jan 27 18:30:16 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 27 Jan 2009 18:30:16 +0000 (UTC)
Subject: rpms/xfce4-settings/devel sources, 1.3, 1.4 .cvsignore, 1.3,
	1.4 xfce4-settings.spec, 1.3, 1.4
Message-ID: <20090127183016.8212B7010B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/xfce4-settings/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5534

Modified Files:
	sources .cvsignore xfce4-settings.spec 
Log Message:
Update to 4.5.99.1



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-settings/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	17 Jan 2009 07:49:42 -0000	1.3
+++ sources	27 Jan 2009 18:29:46 -0000	1.4
@@ -1 +1 @@
-3873c76afcb8f1d174381825fc0467cf  xfce4-settings-4.5.93.tar.bz2
+7cd679a40b619adf27bf2edfb689b62f  xfce4-settings-4.5.99.1.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-settings/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	17 Jan 2009 07:49:42 -0000	1.3
+++ .cvsignore	27 Jan 2009 18:29:46 -0000	1.4
@@ -1 +1 @@
-xfce4-settings-4.5.93.tar.bz2
+xfce4-settings-4.5.99.1.tar.bz2


Index: xfce4-settings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-settings/devel/xfce4-settings.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xfce4-settings.spec	22 Jan 2009 16:50:32 -0000	1.3
+++ xfce4-settings.spec	27 Jan 2009 18:29:46 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           xfce4-settings
-Version:        4.5.93
-Release:        2%{?dist}
+Version:        4.5.99.1
+Release:        1%{?dist}
 Summary:        Settings Manager for Xfce
 
 Group:          User Interface/Desktops
@@ -109,6 +109,9 @@
 %{_datadir}/applications/xfce*.desktop
 
 %changelog
+* Mon Jan 26 2009 Kevin Fenzi <kevin at tummy.com> - 4.5.99.1-1
+- Update to 4.5.99.1
+
 * Thu Jan 22 2009 Christoph Wickert <cwickert at fedoraproject.org> - 4.5.93-2
 - Add Obsoletes for mcs packages to make sure xfce4-settings gets installed
 - Don't package desktop files twice



From llaumgui at fedoraproject.org  Tue Jan 27 18:31:56 2009
From: llaumgui at fedoraproject.org (Guillaume Kulakowski)
Date: Tue, 27 Jan 2009 18:31:56 +0000 (UTC)
Subject: rpms/backup-manager/F-9 backup-manager-0.7.7-configtpl.patch, NONE, 
	1.1 backup-manager.cron.daily, NONE, 1.1 backup-manager.spec,
	NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090127183156.A234E7010B@cvs1.fedora.phx.redhat.com>

Author: llaumgui

Update of /cvs/pkgs/rpms/backup-manager/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5844/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	backup-manager-0.7.7-configtpl.patch backup-manager.cron.daily 
	backup-manager.spec import.log 
Log Message:


backup-manager-0.7.7-configtpl.patch:

--- NEW FILE backup-manager-0.7.7-configtpl.patch ---
--- backup-manager-0.7.7/backup-manager.conf.tpl.configtpl	2008-04-14 19:58:43.000000000 +0200
+++ backup-manager-0.7.7/backup-manager.conf.tpl	2009-01-15 19:52:38.000000000 +0100
@@ -12,8 +12,11 @@
 # Repository - everything about where archives are
 #############################################################
 
+# RPM-specific : Enabled daily cron
+export BM_DAILY_CRON="false"
+
 # Where to store the archives
-export BM_REPOSITORY_ROOT="/var/archives"
+export BM_REPOSITORY_ROOT="/var/backup-manager"
 
 # Where to place temporary files
 export BM_TEMP_DIR="/tmp"


--- NEW FILE backup-manager.cron.daily ---
#!/bin/bash
#
# backup-manager's cron script
#
# This script do backup if option BM_DAILY_CRON in config is true

BM_PATH=$(which backup-manager)
eval $(grep BM_DAILY_CRON /etc/backup-manager.conf)

if [ ${BM_DAILY_CRON} = "true" ]; then
    ${BM_PATH} -v
else
    echo "[backup-manager] Daily cron is disabled"
fi
exit 0

--- NEW FILE backup-manager.spec ---
Name:           backup-manager
Version:        0.7.7
Release:        7%{?dist}
Summary:        A command line backup tool for GNU/Linux

Group:          Applications/System
License:        GPLv2+
URL:            http://www.backup-manager.org
Source0:        http://www.backup-manager.org/download/%{name}-%{version}.tar.gz
Source1:        %{name}.cron.daily
Patch0:         %{name}-%{version}-configtpl.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch

BuildRequires:  gettext 
BuildRequires:  perl

Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
Requires:       /bin/bash
Requires:       /usr/bin/cdrecord
Requires:       /usr/bin/logger
Requires:       /usr/bin/mkisofs
Requires:       bc
Requires:       bzip2
Requires:       coreutils
Requires:       diffutils
Requires:       dvd+rw-tools
Requires:       less
Requires:       ftp
Requires:       genisoimage
Requires:       gettext
Requires:       gnupg
Requires:       gzip
Requires:       openssh-clients
Requires:       rsync
Requires:       sed
Requires:       tar
Requires:       which



%description
Backup Manager is a command line backup tool for GNU/Linux, designed to help
you make daily archives of your file system. Written in bash and perl, it can
make archives in lots of open formats (tar, gzip, bzip2, lzma, dar, zip) and
provides lots of interesting features (such as network exports or CD/DVD
automated-burning).

The program is designed to be as easy to use as possible and is popular with
desktop users and sysadmins. The whole backup process is defined in one
full-documented configuration file which needs no more than 5 minutes to tune
for your needs.



%prep
%setup -q
%patch0 -p1 -b .configtpl

# Clean Makefile
sed -i -e "s at install --owner=root --group=root @install @" Makefile

# Replace #!/bin/sh by #!/bin/bash 
for file in t/*.sh; do sed -i -e "s@#!/bin/sh@#!/bin/bash@" "$file"; done
for file in doc/*; do sed -i -e "s@#!/bin/sh@#!/bin/bash@" "$file"; done

# rpmlint : Convert to utf-8
for file in AUTHORS ChangeLog COPYING NEWS README THANKS; do
    mv $file timestamp
    iconv -f ISO-8859-1 -t UTF-8 -o $file timestamp
    touch -r timestamp $file
done



%build
make %{?_smp_mflags}



%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot} \
             PERL5DIR=%{buildroot}%{perl_vendorlib}
             INSTALL="install -p" 
%find_lang %{name}

# Create backup directory
install -d %{buildroot}%{_localstatedir}/%{name}

# Copy configuration
install -p -D -m 0644 %{buildroot}%{_datadir}/%{name}/%{name}.conf.tpl \
                   %{buildroot}%{_sysconfdir}/%{name}.conf

# Add cron.daily                
install -p -D -m 0755 %{SOURCE1} %{buildroot}%{_sysconfdir}/cron.daily/%{name}.cron

# rpmlint : sanitize.sh is a non-executable-script
chmod 755 %{buildroot}%{_datadir}/%{name}/sanitize.sh



%clean
rm -rf %{buildroot}



%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog NEWS README THANKS
%{_bindir}/%{name}-purge
%{_bindir}/%{name}-upload
%{_sbindir}/%{name}
%{perl_vendorlib}/BackupManager
%{_datadir}/%{name}
%{_mandir}/man8/%{name}*
%config(noreplace) %{_sysconfdir}/%{name}.conf
%{_sysconfdir}/cron.daily/%{name}.cron
%{_localstatedir}/%{name}



%changelog
* Thu Jan 15 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 0.7.7-7
- Replace some sed by a patch
- Replace /bin/sh by /bin/bash 

* Wed Jan 13 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 0.7.7-6
- Fix Requires
- Fix use %%{_localstatedir} insted %%{_var}/lib

* Sun Jan 10 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 0.7.7-5
- Fix Requires
- Add  %%{_var}/lib/backup-manager directory
- Use %%{buildroot} insted $RPM_BUILD_ROOT

* Sun Jan 10 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 0.7.7-4
- Fix license
- Fix timestamp in install

* Fri Oct 10 2008 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 0.7.7-3
- Add a daily cron (backup-manager.cron.daily)

* Wed Aug 20 2008 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 0.7.7-2
- utf-8 correction with Iconv
- Configuration file correction

* Sun Aug 17 2008 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 0.7.7-1
- Initial packaging


--- NEW FILE import.log ---
backup-manager-0_7_7-7_fc10:F-9:backup-manager-0.7.7-7.fc10.src.rpm:1233080985


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/backup-manager/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	26 Jan 2009 22:19:44 -0000	1.1
+++ .cvsignore	27 Jan 2009 18:31:26 -0000	1.2
@@ -0,0 +1 @@
+backup-manager-0.7.7.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/backup-manager/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	26 Jan 2009 22:19:44 -0000	1.1
+++ sources	27 Jan 2009 18:31:26 -0000	1.2
@@ -0,0 +1 @@
+076af845dee01453f450bd06d021fcc3  backup-manager-0.7.7.tar.gz



From llaumgui at fedoraproject.org  Tue Jan 27 18:34:54 2009
From: llaumgui at fedoraproject.org (Guillaume Kulakowski)
Date: Tue, 27 Jan 2009 18:34:54 +0000 (UTC)
Subject: rpms/backup-manager/F-10 backup-manager-0.7.7-configtpl.patch, NONE,
	1.1 backup-manager.cron.daily, NONE, 1.1 backup-manager.spec,
	NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090127183454.E6FAE7010B@cvs1.fedora.phx.redhat.com>

Author: llaumgui

Update of /cvs/pkgs/rpms/backup-manager/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6499/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	backup-manager-0.7.7-configtpl.patch backup-manager.cron.daily 
	backup-manager.spec import.log 
Log Message:
-m initial import branch F10


backup-manager-0.7.7-configtpl.patch:

--- NEW FILE backup-manager-0.7.7-configtpl.patch ---
--- backup-manager-0.7.7/backup-manager.conf.tpl.configtpl	2008-04-14 19:58:43.000000000 +0200
+++ backup-manager-0.7.7/backup-manager.conf.tpl	2009-01-15 19:52:38.000000000 +0100
@@ -12,8 +12,11 @@
 # Repository - everything about where archives are
 #############################################################
 
+# RPM-specific : Enabled daily cron
+export BM_DAILY_CRON="false"
+
 # Where to store the archives
-export BM_REPOSITORY_ROOT="/var/archives"
+export BM_REPOSITORY_ROOT="/var/backup-manager"
 
 # Where to place temporary files
 export BM_TEMP_DIR="/tmp"


--- NEW FILE backup-manager.cron.daily ---
#!/bin/bash
#
# backup-manager's cron script
#
# This script do backup if option BM_DAILY_CRON in config is true

BM_PATH=$(which backup-manager)
eval $(grep BM_DAILY_CRON /etc/backup-manager.conf)

if [ ${BM_DAILY_CRON} = "true" ]; then
    ${BM_PATH} -v
else
    echo "[backup-manager] Daily cron is disabled"
fi
exit 0

--- NEW FILE backup-manager.spec ---
Name:           backup-manager
Version:        0.7.7
Release:        7%{?dist}
Summary:        A command line backup tool for GNU/Linux

Group:          Applications/System
License:        GPLv2+
URL:            http://www.backup-manager.org
Source0:        http://www.backup-manager.org/download/%{name}-%{version}.tar.gz
Source1:        %{name}.cron.daily
Patch0:         %{name}-%{version}-configtpl.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch

BuildRequires:  gettext 
BuildRequires:  perl

Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
Requires:       /bin/bash
Requires:       /usr/bin/cdrecord
Requires:       /usr/bin/logger
Requires:       /usr/bin/mkisofs
Requires:       bc
Requires:       bzip2
Requires:       coreutils
Requires:       diffutils
Requires:       dvd+rw-tools
Requires:       less
Requires:       ftp
Requires:       genisoimage
Requires:       gettext
Requires:       gnupg
Requires:       gzip
Requires:       openssh-clients
Requires:       rsync
Requires:       sed
Requires:       tar
Requires:       which



%description
Backup Manager is a command line backup tool for GNU/Linux, designed to help
you make daily archives of your file system. Written in bash and perl, it can
make archives in lots of open formats (tar, gzip, bzip2, lzma, dar, zip) and
provides lots of interesting features (such as network exports or CD/DVD
automated-burning).

The program is designed to be as easy to use as possible and is popular with
desktop users and sysadmins. The whole backup process is defined in one
full-documented configuration file which needs no more than 5 minutes to tune
for your needs.



%prep
%setup -q
%patch0 -p1 -b .configtpl

# Clean Makefile
sed -i -e "s at install --owner=root --group=root @install @" Makefile

# Replace #!/bin/sh by #!/bin/bash 
for file in t/*.sh; do sed -i -e "s@#!/bin/sh@#!/bin/bash@" "$file"; done
for file in doc/*; do sed -i -e "s@#!/bin/sh@#!/bin/bash@" "$file"; done

# rpmlint : Convert to utf-8
for file in AUTHORS ChangeLog COPYING NEWS README THANKS; do
    mv $file timestamp
    iconv -f ISO-8859-1 -t UTF-8 -o $file timestamp
    touch -r timestamp $file
done



%build
make %{?_smp_mflags}



%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot} \
             PERL5DIR=%{buildroot}%{perl_vendorlib}
             INSTALL="install -p" 
%find_lang %{name}

# Create backup directory
install -d %{buildroot}%{_localstatedir}/%{name}

# Copy configuration
install -p -D -m 0644 %{buildroot}%{_datadir}/%{name}/%{name}.conf.tpl \
                   %{buildroot}%{_sysconfdir}/%{name}.conf

# Add cron.daily                
install -p -D -m 0755 %{SOURCE1} %{buildroot}%{_sysconfdir}/cron.daily/%{name}.cron

# rpmlint : sanitize.sh is a non-executable-script
chmod 755 %{buildroot}%{_datadir}/%{name}/sanitize.sh



%clean
rm -rf %{buildroot}



%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog NEWS README THANKS
%{_bindir}/%{name}-purge
%{_bindir}/%{name}-upload
%{_sbindir}/%{name}
%{perl_vendorlib}/BackupManager
%{_datadir}/%{name}
%{_mandir}/man8/%{name}*
%config(noreplace) %{_sysconfdir}/%{name}.conf
%{_sysconfdir}/cron.daily/%{name}.cron
%{_localstatedir}/%{name}



%changelog
* Thu Jan 15 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 0.7.7-7
- Replace some sed by a patch
- Replace /bin/sh by /bin/bash 

* Wed Jan 13 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 0.7.7-6
- Fix Requires
- Fix use %%{_localstatedir} insted %%{_var}/lib

* Sun Jan 10 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 0.7.7-5
- Fix Requires
- Add  %%{_var}/lib/backup-manager directory
- Use %%{buildroot} insted $RPM_BUILD_ROOT

* Sun Jan 10 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 0.7.7-4
- Fix license
- Fix timestamp in install

* Fri Oct 10 2008 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 0.7.7-3
- Add a daily cron (backup-manager.cron.daily)

* Wed Aug 20 2008 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 0.7.7-2
- utf-8 correction with Iconv
- Configuration file correction

* Sun Aug 17 2008 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 0.7.7-1
- Initial packaging


--- NEW FILE import.log ---
backup-manager-0_7_7-7_fc10:F-10:backup-manager-0.7.7-7.fc10.src.rpm:1233081185


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/backup-manager/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	26 Jan 2009 22:19:44 -0000	1.1
+++ .cvsignore	27 Jan 2009 18:34:24 -0000	1.2
@@ -0,0 +1 @@
+backup-manager-0.7.7.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/backup-manager/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	26 Jan 2009 22:19:44 -0000	1.1
+++ sources	27 Jan 2009 18:34:24 -0000	1.2
@@ -0,0 +1 @@
+076af845dee01453f450bd06d021fcc3  backup-manager-0.7.7.tar.gz



From llaumgui at fedoraproject.org  Tue Jan 27 18:37:59 2009
From: llaumgui at fedoraproject.org (Guillaume Kulakowski)
Date: Tue, 27 Jan 2009 18:37:59 +0000 (UTC)
Subject: rpms/backup-manager/EL-5 backup-manager-0.7.7-configtpl.patch, NONE,
	1.1 backup-manager.cron.daily, NONE, 1.1 backup-manager.spec,
	NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090127183759.9BF6B7010B@cvs1.fedora.phx.redhat.com>

Author: llaumgui

Update of /cvs/pkgs/rpms/backup-manager/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7316/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	backup-manager-0.7.7-configtpl.patch backup-manager.cron.daily 
	backup-manager.spec import.log 
Log Message:
initial import branch EL5


backup-manager-0.7.7-configtpl.patch:

--- NEW FILE backup-manager-0.7.7-configtpl.patch ---
--- backup-manager-0.7.7/backup-manager.conf.tpl.configtpl	2008-04-14 19:58:43.000000000 +0200
+++ backup-manager-0.7.7/backup-manager.conf.tpl	2009-01-15 19:52:38.000000000 +0100
@@ -12,8 +12,11 @@
 # Repository - everything about where archives are
 #############################################################
 
+# RPM-specific : Enabled daily cron
+export BM_DAILY_CRON="false"
+
 # Where to store the archives
-export BM_REPOSITORY_ROOT="/var/archives"
+export BM_REPOSITORY_ROOT="/var/backup-manager"
 
 # Where to place temporary files
 export BM_TEMP_DIR="/tmp"


--- NEW FILE backup-manager.cron.daily ---
#!/bin/bash
#
# backup-manager's cron script
#
# This script do backup if option BM_DAILY_CRON in config is true

BM_PATH=$(which backup-manager)
eval $(grep BM_DAILY_CRON /etc/backup-manager.conf)

if [ ${BM_DAILY_CRON} = "true" ]; then
    ${BM_PATH} -v
else
    echo "[backup-manager] Daily cron is disabled"
fi
exit 0

--- NEW FILE backup-manager.spec ---
Name:           backup-manager
Version:        0.7.7
Release:        7%{?dist}
Summary:        A command line backup tool for GNU/Linux

Group:          Applications/System
License:        GPLv2+
URL:            http://www.backup-manager.org
Source0:        http://www.backup-manager.org/download/%{name}-%{version}.tar.gz
Source1:        %{name}.cron.daily
Patch0:         %{name}-%{version}-configtpl.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch

BuildRequires:  gettext 
BuildRequires:  perl

Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
Requires:       /bin/bash
Requires:       /usr/bin/cdrecord
Requires:       /usr/bin/logger
Requires:       /usr/bin/mkisofs
Requires:       bc
Requires:       bzip2
Requires:       coreutils
Requires:       diffutils
Requires:       dvd+rw-tools
Requires:       less
Requires:       ftp
Requires:       genisoimage
Requires:       gettext
Requires:       gnupg
Requires:       gzip
Requires:       openssh-clients
Requires:       rsync
Requires:       sed
Requires:       tar
Requires:       which



%description
Backup Manager is a command line backup tool for GNU/Linux, designed to help
you make daily archives of your file system. Written in bash and perl, it can
make archives in lots of open formats (tar, gzip, bzip2, lzma, dar, zip) and
provides lots of interesting features (such as network exports or CD/DVD
automated-burning).

The program is designed to be as easy to use as possible and is popular with
desktop users and sysadmins. The whole backup process is defined in one
full-documented configuration file which needs no more than 5 minutes to tune
for your needs.



%prep
%setup -q
%patch0 -p1 -b .configtpl

# Clean Makefile
sed -i -e "s at install --owner=root --group=root @install @" Makefile

# Replace #!/bin/sh by #!/bin/bash 
for file in t/*.sh; do sed -i -e "s@#!/bin/sh@#!/bin/bash@" "$file"; done
for file in doc/*; do sed -i -e "s@#!/bin/sh@#!/bin/bash@" "$file"; done

# rpmlint : Convert to utf-8
for file in AUTHORS ChangeLog COPYING NEWS README THANKS; do
    mv $file timestamp
    iconv -f ISO-8859-1 -t UTF-8 -o $file timestamp
    touch -r timestamp $file
done



%build
make %{?_smp_mflags}



%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot} \
             PERL5DIR=%{buildroot}%{perl_vendorlib}
             INSTALL="install -p" 
%find_lang %{name}

# Create backup directory
install -d %{buildroot}%{_localstatedir}/%{name}

# Copy configuration
install -p -D -m 0644 %{buildroot}%{_datadir}/%{name}/%{name}.conf.tpl \
                   %{buildroot}%{_sysconfdir}/%{name}.conf

# Add cron.daily                
install -p -D -m 0755 %{SOURCE1} %{buildroot}%{_sysconfdir}/cron.daily/%{name}.cron

# rpmlint : sanitize.sh is a non-executable-script
chmod 755 %{buildroot}%{_datadir}/%{name}/sanitize.sh



%clean
rm -rf %{buildroot}



%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog NEWS README THANKS
%{_bindir}/%{name}-purge
%{_bindir}/%{name}-upload
%{_sbindir}/%{name}
%{perl_vendorlib}/BackupManager
%{_datadir}/%{name}
%{_mandir}/man8/%{name}*
%config(noreplace) %{_sysconfdir}/%{name}.conf
%{_sysconfdir}/cron.daily/%{name}.cron
%{_localstatedir}/%{name}



%changelog
* Thu Jan 15 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 0.7.7-7
- Replace some sed by a patch
- Replace /bin/sh by /bin/bash 

* Wed Jan 13 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 0.7.7-6
- Fix Requires
- Fix use %%{_localstatedir} insted %%{_var}/lib

* Sun Jan 10 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 0.7.7-5
- Fix Requires
- Add  %%{_var}/lib/backup-manager directory
- Use %%{buildroot} insted $RPM_BUILD_ROOT

* Sun Jan 10 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 0.7.7-4
- Fix license
- Fix timestamp in install

* Fri Oct 10 2008 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 0.7.7-3
- Add a daily cron (backup-manager.cron.daily)

* Wed Aug 20 2008 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 0.7.7-2
- utf-8 correction with Iconv
- Configuration file correction

* Sun Aug 17 2008 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 0.7.7-1
- Initial packaging


--- NEW FILE import.log ---
backup-manager-0_7_7-7_fc10:EL-5:backup-manager-0.7.7-7.fc10.src.rpm:1233081406


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/backup-manager/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	26 Jan 2009 22:19:44 -0000	1.1
+++ .cvsignore	27 Jan 2009 18:37:29 -0000	1.2
@@ -0,0 +1 @@
+backup-manager-0.7.7.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/backup-manager/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	26 Jan 2009 22:19:44 -0000	1.1
+++ sources	27 Jan 2009 18:37:29 -0000	1.2
@@ -0,0 +1 @@
+076af845dee01453f450bd06d021fcc3  backup-manager-0.7.7.tar.gz



From linville at fedoraproject.org  Tue Jan 27 18:39:20 2009
From: linville at fedoraproject.org (John W. Linville)
Date: Tue, 27 Jan 2009 18:39:20 +0000 (UTC)
Subject: rpms/crda/devel crda.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090127183920.07A537010B@cvs1.fedora.phx.redhat.com>

Author: linville

Update of /cvs/pkgs/rpms/crda/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7747/devel

Modified Files:
	.cvsignore sources 
Added Files:
	crda.spec import.log 
Log Message:
Initial import...



--- NEW FILE crda.spec ---
%define         crda_version    v0.9.5
%define         regdb_version   2009-01-15

Name:           crda
Version:        %{crda_version}_%(echo %{regdb_version} | sed -e 's/-/_/g')
Release:        2%{?dist}
Summary:        Regulatory compliance daemon for 802.11 wireless networking

Group:          System Environment/Base
License:        BSD
URL:            http://www.linuxwireless.org/en/developers/Regulatory/CRDA
BuildRoot:      %{_tmppath}/%{name}-%{crda_version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  kernel-devel >= 2.6.27
BuildRequires:  libnl-devel >= 1.1
BuildRequires:  libgcrypt-devel
BuildRequires:  pkgconfig python m2crypto

Requires:       udev

Source0:        http://wireless.kernel.org/download/crda/crda-%{crda_version}.tar.bz2
Source1:        http://wireless.kernel.org/download/wireless-regdb/wireless-regdb-%{regdb_version}.tar.bz2

%description
CRDA acts as the udev helper for communication between the kernel
and userspace for regulatory compliance. It relies on nl80211
for communication. CRDA is intended to be run only through udev
communication from the kernel.

%prep
%setup -q -c
%setup -q -T -D -a 1

rm crda-%{crda_version}/pubkeys/*


%build

# Use our own signing key to generate regulatory.bin
cd wireless-regdb-%{regdb_version}

make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" maintainer-clean
make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" key.priv.pem
make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS"

# Build CRDA using the new key and regulatory.bin from above
cd ../crda-%{crda_version}
cp ../wireless-regdb-%{regdb_version}/key.pub.pem pubkeys

make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" REG_BIN=../wireless-regdb-%{regdb_version}/regulatory.bin


%install
rm -rf $RPM_BUILD_ROOT

cd crda-%{crda_version}
cp README README.crda
make install DESTDIR=$RPM_BUILD_ROOT

# Fixup some directory and file naming
mkdir -p ${RPM_BUILD_ROOT}/lib/udev/
mv ${RPM_BUILD_ROOT}/etc/udev/rules.d ${RPM_BUILD_ROOT}/lib/udev/rules.d
mv ${RPM_BUILD_ROOT}/lib/udev/rules.d/regulatory.rules ${RPM_BUILD_ROOT}/lib/udev/rules.d/10-regulatory.rules

cd ../wireless-regdb-%{regdb_version}
cp README README.wireless-regdb
make install PREFIX=${RPM_BUILD_ROOT}/usr


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
/sbin/%{name}
/sbin/regdbdump
/lib/udev/rules.d/10-regulatory.rules
/usr/lib/%{name}
%doc crda-%{crda_version}/LICENSE crda-%{crda_version}/README.crda
%doc wireless-regdb-%{regdb_version}/README.wireless-regdb

%changelog
* Thu Jan 22 2008 John W. Linville <linville at redhat.com> v0.9.5_2009_01_15-2
- Revamp based on package review comments

* Tue Jan 20 2008 John W. Linville <linville at redhat.com> v0.9.5_2009_01_15-1
- Initial build


--- NEW FILE import.log ---
crda-v0_9_5_2009_01_15-2_fc10:HEAD:crda-v0.9.5_2009_01_15-2.fc10.src.rpm:1233081456


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/crda/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	26 Jan 2009 22:10:28 -0000	1.1
+++ .cvsignore	27 Jan 2009 18:38:49 -0000	1.2
@@ -0,0 +1,2 @@
+crda-v0.9.5.tar.bz2
+wireless-regdb-2009-01-15.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/crda/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	26 Jan 2009 22:10:28 -0000	1.1
+++ sources	27 Jan 2009 18:38:49 -0000	1.2
@@ -0,0 +1,2 @@
+bef56c2b1d93779f08ed1ad037615218  crda-v0.9.5.tar.bz2
+7d132c16850eb9f9102194fe9c6e45d4  wireless-regdb-2009-01-15.tar.bz2



From kevin at fedoraproject.org  Tue Jan 27 18:41:16 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 27 Jan 2009 18:41:16 +0000 (UTC)
Subject: rpms/Thunar/devel sources, 1.8, 1.9 .cvsignore, 1.8, 1.9 Thunar.spec,
	1.20, 1.21
Message-ID: <20090127184116.81CF17010B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/Thunar/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8223

Modified Files:
	sources .cvsignore Thunar.spec 
Log Message:
Update to 0.9.99.1



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/Thunar/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	17 Jan 2009 08:04:20 -0000	1.8
+++ sources	27 Jan 2009 18:40:46 -0000	1.9
@@ -1 +1 @@
-8fb12c28284503929732dea8c185c413  Thunar-0.9.93.tar.bz2
+caa9f3c76981a1aed9b403240e6a550f  Thunar-0.9.99.1.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/Thunar/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	17 Jan 2009 08:04:20 -0000	1.8
+++ .cvsignore	27 Jan 2009 18:40:46 -0000	1.9
@@ -1 +1 @@
-Thunar-0.9.93.tar.bz2
+Thunar-0.9.99.1.tar.bz2


Index: Thunar.spec
===================================================================
RCS file: /cvs/pkgs/rpms/Thunar/devel/Thunar.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- Thunar.spec	20 Jan 2009 22:29:37 -0000	1.20
+++ Thunar.spec	27 Jan 2009 18:40:46 -0000	1.21
@@ -1,10 +1,10 @@
 Summary: Thunar File Manager
 Name: Thunar
-Version: 0.9.93
+Version: 0.9.99.1
 Release: 1%{?dist}
 License: GPLv2+
 URL: http://thunar.xfce.org/
-Source0: http://www.xfce.org/archive/xfce-4.5.93/src/Thunar-%{version}.tar.bz2
+Source0: http://www.xfce.org/archive/xfce-4.5.99.1/src/Thunar-%{version}.tar.bz2
 Source1: thunar-sendto-bluetooth.desktop
 Source2: thunar-sendto-audacious-playlist.desktop
 Group: User Interface/Desktops
@@ -198,6 +198,9 @@
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Mon Jan 26 2009 Kevin Fenzi <kevin at tummy.com> - 0.9.99.1-1
+- Update to 0.9.99.1
+
 * Tue Jan 13 2009 Kevin Fenzi <kevin at tummy.com> - 0.9.93-1
 - Update to 0.9.93
 



From linville at fedoraproject.org  Tue Jan 27 18:42:35 2009
From: linville at fedoraproject.org (John W. Linville)
Date: Tue, 27 Jan 2009 18:42:35 +0000 (UTC)
Subject: rpms/crda/F-10 crda.spec,NONE,1.1 sources,1.1,1.2
Message-ID: <20090127184235.C81557010B@cvs1.fedora.phx.redhat.com>

Author: linville

Update of /cvs/pkgs/rpms/crda/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8581

Modified Files:
	sources 
Added Files:
	crda.spec 
Log Message:
Initial import to F-10 branch...


--- NEW FILE crda.spec ---
%define         crda_version    v0.9.5
%define         regdb_version   2009-01-15

Name:           crda
Version:        %{crda_version}_%(echo %{regdb_version} | sed -e 's/-/_/g')
Release:        2%{?dist}
Summary:        Regulatory compliance daemon for 802.11 wireless networking

Group:          System Environment/Base
License:        BSD
URL:            http://www.linuxwireless.org/en/developers/Regulatory/CRDA
BuildRoot:      %{_tmppath}/%{name}-%{crda_version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  kernel-devel >= 2.6.27
BuildRequires:  libnl-devel >= 1.1
BuildRequires:  libgcrypt-devel
BuildRequires:  pkgconfig python m2crypto

Requires:       udev

Source0:        http://wireless.kernel.org/download/crda/crda-%{crda_version}.tar.bz2
Source1:        http://wireless.kernel.org/download/wireless-regdb/wireless-regdb-%{regdb_version}.tar.bz2

%description
CRDA acts as the udev helper for communication between the kernel
and userspace for regulatory compliance. It relies on nl80211
for communication. CRDA is intended to be run only through udev
communication from the kernel.

%prep
%setup -q -c
%setup -q -T -D -a 1

rm crda-%{crda_version}/pubkeys/*


%build

# Use our own signing key to generate regulatory.bin
cd wireless-regdb-%{regdb_version}

make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" maintainer-clean
make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" key.priv.pem
make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS"

# Build CRDA using the new key and regulatory.bin from above
cd ../crda-%{crda_version}
cp ../wireless-regdb-%{regdb_version}/key.pub.pem pubkeys

make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" REG_BIN=../wireless-regdb-%{regdb_version}/regulatory.bin


%install
rm -rf $RPM_BUILD_ROOT

cd crda-%{crda_version}
cp README README.crda
make install DESTDIR=$RPM_BUILD_ROOT

# Fixup some directory and file naming
mkdir -p ${RPM_BUILD_ROOT}/lib/udev/
mv ${RPM_BUILD_ROOT}/etc/udev/rules.d ${RPM_BUILD_ROOT}/lib/udev/rules.d
mv ${RPM_BUILD_ROOT}/lib/udev/rules.d/regulatory.rules ${RPM_BUILD_ROOT}/lib/udev/rules.d/10-regulatory.rules

cd ../wireless-regdb-%{regdb_version}
cp README README.wireless-regdb
make install PREFIX=${RPM_BUILD_ROOT}/usr


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
/sbin/%{name}
/sbin/regdbdump
/lib/udev/rules.d/10-regulatory.rules
/usr/lib/%{name}
%doc crda-%{crda_version}/LICENSE crda-%{crda_version}/README.crda
%doc wireless-regdb-%{regdb_version}/README.wireless-regdb

%changelog
* Thu Jan 22 2008 John W. Linville <linville at redhat.com> v0.9.5_2009_01_15-2
- Revamp based on package review comments

* Tue Jan 20 2008 John W. Linville <linville at redhat.com> v0.9.5_2009_01_15-1
- Initial build


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/crda/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	26 Jan 2009 22:10:28 -0000	1.1
+++ sources	27 Jan 2009 18:42:05 -0000	1.2
@@ -0,0 +1,2 @@
+bef56c2b1d93779f08ed1ad037615218  crda-v0.9.5.tar.bz2
+7d132c16850eb9f9102194fe9c6e45d4  wireless-regdb-2009-01-15.tar.bz2



From liquidat at fedoraproject.org  Tue Jan 27 18:46:21 2009
From: liquidat at fedoraproject.org (Roland Wolters)
Date: Tue, 27 Jan 2009 18:46:21 +0000 (UTC)
Subject: rpms/ktorrent/devel .cvsignore, 1.25, 1.26 ktorrent.spec, 1.82,
	1.83 sources, 1.25, 1.26
Message-ID: <20090127184621.ABD5E7010B@cvs1.fedora.phx.redhat.com>

Author: liquidat

Update of /cvs/extras/rpms/ktorrent/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9309

Modified Files:
	.cvsignore ktorrent.spec sources 
Log Message:
Update to ktorrent 3.1.6; CMAKE fix included already?


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ktorrent/devel/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- .cvsignore	17 Nov 2008 19:57:52 -0000	1.25
+++ .cvsignore	27 Jan 2009 18:45:51 -0000	1.26
@@ -1 +1 @@
-ktorrent-3.1.5.tar.bz2
+ktorrent-3.1.6.tar.bz2


Index: ktorrent.spec
===================================================================
RCS file: /cvs/extras/rpms/ktorrent/devel/ktorrent.spec,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -r1.82 -r1.83
--- ktorrent.spec	17 Nov 2008 20:04:53 -0000	1.82
+++ ktorrent.spec	27 Jan 2009 18:45:51 -0000	1.83
@@ -2,7 +2,7 @@
 # Fedora pkg review: http://bugzilla.redhat.com/187818
 
 Name:           ktorrent
-Version:        3.1.5
+Version:        3.1.6
 Release:        1%{?dist}
 Summary:        A BitTorrent program
 Group:          Applications/Internet
@@ -120,6 +120,9 @@
 %{_kde4_appsdir}/cmake/modules/FindBTCore.cmake
 
 %changelog
+* Tue Jan 27 2009 Roland Wolters <wolters.liste at gmx.net> - 3.1.6-1
+- ktorrent-3.1.6
+
 * Mon Nov 17 2008 Rex Dieter <rdieter at fedoraproject.org> - 3.1.5-1
 - ktorrent-3.1.5 (#469870)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ktorrent/devel/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- sources	17 Nov 2008 19:57:53 -0000	1.25
+++ sources	27 Jan 2009 18:45:51 -0000	1.26
@@ -1 +1 @@
-2b11f05f2bc70c5b1403335698761d64  ktorrent-3.1.5.tar.bz2
+bfaf1e558c29a2b6ae6cf51c7ab67984  ktorrent-3.1.6.tar.bz2



From kevin at fedoraproject.org  Tue Jan 27 18:46:37 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 27 Jan 2009 18:46:37 +0000 (UTC)
Subject: rpms/xfce4-appfinder/devel sources, 1.12, 1.13 .cvsignore, 1.12,
	1.13 xfce4-appfinder.spec, 1.19, 1.20
Message-ID: <20090127184637.BC8787010B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/xfce4-appfinder/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9360

Modified Files:
	sources .cvsignore xfce4-appfinder.spec 
Log Message:
Update to 4.5.99.1



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-appfinder/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	17 Jan 2009 08:20:16 -0000	1.12
+++ sources	27 Jan 2009 18:46:07 -0000	1.13
@@ -1 +1 @@
-75b37cd228cf85a85b36d227429fe9a3  xfce4-appfinder-4.5.93.tar.bz2
+75b80baaaf100a837888c0cccc1dee4b  xfce4-appfinder-4.5.99.1.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-appfinder/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	17 Jan 2009 08:20:16 -0000	1.12
+++ .cvsignore	27 Jan 2009 18:46:07 -0000	1.13
@@ -1 +1 @@
-xfce4-appfinder-4.5.93.tar.bz2
+xfce4-appfinder-4.5.99.1.tar.bz2


Index: xfce4-appfinder.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-appfinder/devel/xfce4-appfinder.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- xfce4-appfinder.spec	17 Jan 2009 08:20:16 -0000	1.19
+++ xfce4-appfinder.spec	27 Jan 2009 18:46:07 -0000	1.20
@@ -1,6 +1,6 @@
 Summary: Appfinder for the Xfce4 Desktop Environment
 Name: xfce4-appfinder
-Version: 4.5.93
+Version: 4.5.99.1
 Release: 1%{?dist}
 License: GPLv2+
 URL: http://www.xfce.org/
@@ -55,6 +55,9 @@
 %{_datadir}/icons/hicolor/48x48/apps/xfce4-appfinder.png
 
 %changelog
+* Mon Jan 26 2009 Kevin Fenzi <kevin at tummy.com> - 4.5.99.1-1
+- Update to 4.5.99.1
+
 * Tue Jan 13 2009 Kevin Fenzi <kevin at tummy.com> - 4.5.93-1
 - Update to 4.5.93
 



From madko at fedoraproject.org  Tue Jan 27 18:52:00 2009
From: madko at fedoraproject.org (Edouard Bourguignon)
Date: Tue, 27 Jan 2009 18:52:00 +0000 (UTC)
Subject: rpms/libnss-pgsql/devel import.log, NONE,
	1.1 libnss-pgsql-1.5.0-beta-exit-in-library.patch, NONE,
	1.1 libnss-pgsql-fix_include.patch, NONE, 1.1 libnss-pgsql.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090127185200.D20B37010D@cvs1.fedora.phx.redhat.com>

Author: madko

Update of /cvs/pkgs/rpms/libnss-pgsql/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10490/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log libnss-pgsql-1.5.0-beta-exit-in-library.patch 
	libnss-pgsql-fix_include.patch libnss-pgsql.spec 
Log Message:
Initial commit



--- NEW FILE import.log ---
libnss-pgsql-1_5_0-0_2_beta_fc10:HEAD:libnss-pgsql-1.5.0-0.2.beta.fc10.src.rpm:1233078626

libnss-pgsql-1.5.0-beta-exit-in-library.patch:

--- NEW FILE libnss-pgsql-1.5.0-beta-exit-in-library.patch ---
Only in libnss-pgsql-1.5.0-beta: Makefile
Only in libnss-pgsql-1.5.0-beta: config.h
Only in libnss-pgsql-1.5.0-beta: config.log
Only in libnss-pgsql-1.5.0-beta: config.status
Only in libnss-pgsql-1.5.0-beta: debugfiles.list
Only in libnss-pgsql-1.5.0-beta: debuglinks.list
Only in libnss-pgsql-1.5.0-beta: debugsources.list
Only in libnss-pgsql-1.5.0-beta/doc: Makefile
Only in libnss-pgsql-1.5.0-beta/doc: nss-pgsql.html
Only in libnss-pgsql-1.5.0-beta: libtool
Only in libnss-pgsql-1.5.0-beta/src: .deps
Only in libnss-pgsql-1.5.0-beta/src: .libs
Only in libnss-pgsql-1.5.0-beta/src: Makefile
Only in libnss-pgsql-1.5.0-beta/src: backend.lo
diff -ur libnss-pgsql-1.5.0-beta.debug/src/config.c libnss-pgsql-1.5.0-beta/src/config.c
--- libnss-pgsql-1.5.0-beta.debug/src/config.c	2008-08-19 18:44:37.000000000 +0900
+++ libnss-pgsql-1.5.0-beta/src/config.c	2009-01-24 23:59:21.000000000 +0900
@@ -95,11 +95,15 @@
 		/* read options */
 		if(sscanf(line, " %s = %[^\n]", key, val) < 2) {
 			print_err("line %d in %s is unparseable: \"%s\"\n", lineno, configfile, line);
+			fclose(cf);
+			return 1;
 		} else {
 			h = texthash(key);
 			if (type == CONNECTION_SHADOW) {
 				if (_shadowoptions[h] != NULL) {
 					print_err("line %d in %s is a duplicate hash: \"%s\"\n", lineno, configfile, key);
+					fclose(cf);
+					return 1;
 				} else {
 					_shadowoptions[h] = malloc(strlen(val)+1);
 					strcpy(_shadowoptions[h], val);
@@ -107,6 +111,8 @@
 			} else {
 				if (_options[h] != NULL ) {
 					print_err("line %d in %s is a duplicate hash: \"%s\"\n", lineno, configfile, key);
+					fclose(cf);
+					return 1;
 				} else {
 					_options[h] = malloc(strlen(val)+1);
 					strcpy(_options[h], val);
Only in libnss-pgsql-1.5.0-beta/src: config.c~
Only in libnss-pgsql-1.5.0-beta/src: config.lo
Only in libnss-pgsql-1.5.0-beta/src: interface.lo
Only in libnss-pgsql-1.5.0-beta/src: libnss_pgsql.la
diff -ur libnss-pgsql-1.5.0-beta.debug/src/util.c libnss-pgsql-1.5.0-beta/src/util.c
--- libnss-pgsql-1.5.0-beta.debug/src/util.c	2004-12-01 15:29:47.000000000 +0900
+++ libnss-pgsql-1.5.0-beta/src/util.c	2009-01-24 23:55:10.000000000 +0900
@@ -24,7 +24,6 @@
 	va_end(ap);
 
 	fflush(stderr);
-	exit(1);
 }
 
 void print_msg(const char *msg, ...)
Only in libnss-pgsql-1.5.0-beta/src: util.c~
Only in libnss-pgsql-1.5.0-beta/src: util.lo
Only in libnss-pgsql-1.5.0-beta: stamp-h


libnss-pgsql-fix_include.patch:

--- NEW FILE libnss-pgsql-fix_include.patch ---
diff -urN ../BUILD/libnss-pgsql-1.3/src/backend.c ../BUILD/libnss-pgsql-1.3.fix_include/src/backend.c
--- libnss-pgsql-1.3/src/backend.c	2005-03-25 23:05:49.000000000 +0100
+++ libnss-pgsql-1.3.fix_include/src/backend.c	2005-12-12 14:25:20.000000000 +0100
@@ -9,7 +9,7 @@
  */
 
 #include "nss-pgsql.h"
-#include <postgresql/libpq-fe.h>
+#include <libpq-fe.h>
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>



--- NEW FILE libnss-pgsql.spec ---
Name:           libnss-pgsql
Version:        1.5.0
Release:        0.2.beta%{?dist}
Summary:        Name Service Switch library that interface with PostgreSQL

Group:          System Environment/Libraries
License:        GPL+
URL:            http://pgfoundry.org/projects/sysauth/
Source0:        http://pgfoundry.org/frs/download.php/1878/%{name}-%{version}-beta.tgz
Patch0:         libnss-pgsql-fix_include.patch
Patch1:         libnss-pgsql-1.5.0-beta-exit-in-library.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  postgresql-devel, xmlto


%description
Name Service Switch library that interface with PostgreSQL.
See %{_docdir}/%{name}-%{version}/nss-pgsql.html for the config file.


%prep
%setup -q -n %{name}-%{version}-beta
%patch0 -p1 -b include.rej
%patch1 -p1 -b exit-in-library.rej


%build
%configure --disable-static
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=${RPM_BUILD_ROOT}
rm -rf ${RPM_BUILD_ROOT}/usr/doc
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,-)
%exclude %{_libdir}/*.so
%doc AUTHORS COPYING ChangeLog README doc/nss-pgsql.html doc/caution.png
%{_libdir}/libnss_pgsql.so.2.0.0
%{_libdir}/libnss_pgsql.so.2
%{_libdir}/libnss_pgsql.so


%changelog
* Sun Jan 25 2009 Edouard Bourguignon <madko at linuxed.net> - 1.5.0-0.2.beta
- Fix source URL
- Add a patch from M.Tasaka to remove exit() call in the library

* Fri Jan 23 2009 Edouard Bourguignon <madko at linuxed.net> - 1.5.0-0.1.beta
- Upgrade to 1.5.0 beta

* Mon Jan 12 2009 Edouard Bourguignon <madko at linuxed.net> - 1.4.0-2
- Add buildrequires on postgresql-devel

* Thu Jan  3 2008 Edouard Bourguignon <madko at linuxed.net> - 1.4.0-1
- Upgrade to version 1.4.0

* Mon Dec 12 2005 Edouard Bourguignon <madko at linuxed.net> - 1.3-1
- Initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libnss-pgsql/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	26 Jan 2009 22:54:20 -0000	1.1
+++ .cvsignore	27 Jan 2009 18:51:30 -0000	1.2
@@ -0,0 +1 @@
+libnss-pgsql-1.5.0-beta.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libnss-pgsql/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	26 Jan 2009 22:54:20 -0000	1.1
+++ sources	27 Jan 2009 18:51:30 -0000	1.2
@@ -0,0 +1 @@
+8d86f1dd93799c365691a3322e107732  libnss-pgsql-1.5.0-beta.tgz



From kevin at fedoraproject.org  Tue Jan 27 18:52:03 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 27 Jan 2009 18:52:03 +0000 (UTC)
Subject: rpms/xfce4-session/devel sources, 1.12, 1.13 .cvsignore, 1.12,
	1.13 xfce4-session.spec, 1.24, 1.25
Message-ID: <20090127185203.186F37010D@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/xfce4-session/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10537

Modified Files:
	sources .cvsignore xfce4-session.spec 
Log Message:
Update to 4.5.99.1



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-session/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	17 Jan 2009 08:23:07 -0000	1.12
+++ sources	27 Jan 2009 18:51:32 -0000	1.13
@@ -1 +1 @@
-7d3b5f1400cc053ef01ad61e209d5828  xfce4-session-4.5.93.tar.bz2
+780336c10d8d42d5a79221b5fabe3f20  xfce4-session-4.5.99.1.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-session/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	17 Jan 2009 08:23:07 -0000	1.12
+++ .cvsignore	27 Jan 2009 18:51:32 -0000	1.13
@@ -1 +1 @@
-xfce4-session-4.5.93.tar.bz2
+xfce4-session-4.5.99.1.tar.bz2


Index: xfce4-session.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-session/devel/xfce4-session.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- xfce4-session.spec	17 Jan 2009 08:23:07 -0000	1.24
+++ xfce4-session.spec	27 Jan 2009 18:51:32 -0000	1.25
@@ -1,6 +1,6 @@
 Summary: Xfce session manager
 Name: xfce4-session
-Version: 4.5.93
+Version: 4.5.99.1
 Release: 1%{?dist}
 License: GPLv2+
 URL: http://www.xfce.org/
@@ -125,6 +125,9 @@
 %{_libexecdir}/balou-*
 
 %changelog
+* Mon Jan 26 2009 Kevin Fenzi <kevin at tummy.com> - 4.5.99.1-1
+- Update to 4.5.99.1
+
 * Tue Jan 13 2009 Kevin Fenzi <kevin at tummy.com> - 4.5.93-1
 - Update to 4.5.93
 



From madko at fedoraproject.org  Tue Jan 27 18:54:47 2009
From: madko at fedoraproject.org (Edouard Bourguignon)
Date: Tue, 27 Jan 2009 18:54:47 +0000 (UTC)
Subject: rpms/libnss-pgsql/F-9 import.log, NONE,
	1.1 libnss-pgsql-1.5.0-beta-exit-in-library.patch, NONE,
	1.1 libnss-pgsql-fix_include.patch, NONE, 1.1 libnss-pgsql.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090127185447.4B4A67010B@cvs1.fedora.phx.redhat.com>

Author: madko

Update of /cvs/pkgs/rpms/libnss-pgsql/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11776/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	import.log libnss-pgsql-1.5.0-beta-exit-in-library.patch 
	libnss-pgsql-fix_include.patch libnss-pgsql.spec 
Log Message:
Commit to F9 branch



--- NEW FILE import.log ---
libnss-pgsql-1_5_0-0_2_beta_fc10:F-9:libnss-pgsql-1.5.0-0.2.beta.fc10.src.rpm:1233078796

libnss-pgsql-1.5.0-beta-exit-in-library.patch:

--- NEW FILE libnss-pgsql-1.5.0-beta-exit-in-library.patch ---
Only in libnss-pgsql-1.5.0-beta: Makefile
Only in libnss-pgsql-1.5.0-beta: config.h
Only in libnss-pgsql-1.5.0-beta: config.log
Only in libnss-pgsql-1.5.0-beta: config.status
Only in libnss-pgsql-1.5.0-beta: debugfiles.list
Only in libnss-pgsql-1.5.0-beta: debuglinks.list
Only in libnss-pgsql-1.5.0-beta: debugsources.list
Only in libnss-pgsql-1.5.0-beta/doc: Makefile
Only in libnss-pgsql-1.5.0-beta/doc: nss-pgsql.html
Only in libnss-pgsql-1.5.0-beta: libtool
Only in libnss-pgsql-1.5.0-beta/src: .deps
Only in libnss-pgsql-1.5.0-beta/src: .libs
Only in libnss-pgsql-1.5.0-beta/src: Makefile
Only in libnss-pgsql-1.5.0-beta/src: backend.lo
diff -ur libnss-pgsql-1.5.0-beta.debug/src/config.c libnss-pgsql-1.5.0-beta/src/config.c
--- libnss-pgsql-1.5.0-beta.debug/src/config.c	2008-08-19 18:44:37.000000000 +0900
+++ libnss-pgsql-1.5.0-beta/src/config.c	2009-01-24 23:59:21.000000000 +0900
@@ -95,11 +95,15 @@
 		/* read options */
 		if(sscanf(line, " %s = %[^\n]", key, val) < 2) {
 			print_err("line %d in %s is unparseable: \"%s\"\n", lineno, configfile, line);
+			fclose(cf);
+			return 1;
 		} else {
 			h = texthash(key);
 			if (type == CONNECTION_SHADOW) {
 				if (_shadowoptions[h] != NULL) {
 					print_err("line %d in %s is a duplicate hash: \"%s\"\n", lineno, configfile, key);
+					fclose(cf);
+					return 1;
 				} else {
 					_shadowoptions[h] = malloc(strlen(val)+1);
 					strcpy(_shadowoptions[h], val);
@@ -107,6 +111,8 @@
 			} else {
 				if (_options[h] != NULL ) {
 					print_err("line %d in %s is a duplicate hash: \"%s\"\n", lineno, configfile, key);
+					fclose(cf);
+					return 1;
 				} else {
 					_options[h] = malloc(strlen(val)+1);
 					strcpy(_options[h], val);
Only in libnss-pgsql-1.5.0-beta/src: config.c~
Only in libnss-pgsql-1.5.0-beta/src: config.lo
Only in libnss-pgsql-1.5.0-beta/src: interface.lo
Only in libnss-pgsql-1.5.0-beta/src: libnss_pgsql.la
diff -ur libnss-pgsql-1.5.0-beta.debug/src/util.c libnss-pgsql-1.5.0-beta/src/util.c
--- libnss-pgsql-1.5.0-beta.debug/src/util.c	2004-12-01 15:29:47.000000000 +0900
+++ libnss-pgsql-1.5.0-beta/src/util.c	2009-01-24 23:55:10.000000000 +0900
@@ -24,7 +24,6 @@
 	va_end(ap);
 
 	fflush(stderr);
-	exit(1);
 }
 
 void print_msg(const char *msg, ...)
Only in libnss-pgsql-1.5.0-beta/src: util.c~
Only in libnss-pgsql-1.5.0-beta/src: util.lo
Only in libnss-pgsql-1.5.0-beta: stamp-h


libnss-pgsql-fix_include.patch:

--- NEW FILE libnss-pgsql-fix_include.patch ---
diff -urN ../BUILD/libnss-pgsql-1.3/src/backend.c ../BUILD/libnss-pgsql-1.3.fix_include/src/backend.c
--- libnss-pgsql-1.3/src/backend.c	2005-03-25 23:05:49.000000000 +0100
+++ libnss-pgsql-1.3.fix_include/src/backend.c	2005-12-12 14:25:20.000000000 +0100
@@ -9,7 +9,7 @@
  */
 
 #include "nss-pgsql.h"
-#include <postgresql/libpq-fe.h>
+#include <libpq-fe.h>
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>



--- NEW FILE libnss-pgsql.spec ---
Name:           libnss-pgsql
Version:        1.5.0
Release:        0.2.beta%{?dist}
Summary:        Name Service Switch library that interface with PostgreSQL

Group:          System Environment/Libraries
License:        GPL+
URL:            http://pgfoundry.org/projects/sysauth/
Source0:        http://pgfoundry.org/frs/download.php/1878/%{name}-%{version}-beta.tgz
Patch0:         libnss-pgsql-fix_include.patch
Patch1:         libnss-pgsql-1.5.0-beta-exit-in-library.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  postgresql-devel, xmlto


%description
Name Service Switch library that interface with PostgreSQL.
See %{_docdir}/%{name}-%{version}/nss-pgsql.html for the config file.


%prep
%setup -q -n %{name}-%{version}-beta
%patch0 -p1 -b include.rej
%patch1 -p1 -b exit-in-library.rej


%build
%configure --disable-static
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=${RPM_BUILD_ROOT}
rm -rf ${RPM_BUILD_ROOT}/usr/doc
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,-)
%exclude %{_libdir}/*.so
%doc AUTHORS COPYING ChangeLog README doc/nss-pgsql.html doc/caution.png
%{_libdir}/libnss_pgsql.so.2.0.0
%{_libdir}/libnss_pgsql.so.2
%{_libdir}/libnss_pgsql.so


%changelog
* Sun Jan 25 2009 Edouard Bourguignon <madko at linuxed.net> - 1.5.0-0.2.beta
- Fix source URL
- Add a patch from M.Tasaka to remove exit() call in the library

* Fri Jan 23 2009 Edouard Bourguignon <madko at linuxed.net> - 1.5.0-0.1.beta
- Upgrade to 1.5.0 beta

* Mon Jan 12 2009 Edouard Bourguignon <madko at linuxed.net> - 1.4.0-2
- Add buildrequires on postgresql-devel

* Thu Jan  3 2008 Edouard Bourguignon <madko at linuxed.net> - 1.4.0-1
- Upgrade to version 1.4.0

* Mon Dec 12 2005 Edouard Bourguignon <madko at linuxed.net> - 1.3-1
- Initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libnss-pgsql/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	26 Jan 2009 22:54:20 -0000	1.1
+++ .cvsignore	27 Jan 2009 18:54:16 -0000	1.2
@@ -0,0 +1 @@
+libnss-pgsql-1.5.0-beta.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libnss-pgsql/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	26 Jan 2009 22:54:20 -0000	1.1
+++ sources	27 Jan 2009 18:54:16 -0000	1.2
@@ -0,0 +1 @@
+8d86f1dd93799c365691a3322e107732  libnss-pgsql-1.5.0-beta.tgz



From kevin at fedoraproject.org  Tue Jan 27 18:55:39 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 27 Jan 2009 18:55:39 +0000 (UTC)
Subject: rpms/xfce-utils/devel sources, 1.12, 1.13 .cvsignore, 1.12,
	1.13 xfce-utils.spec, 1.24, 1.25
Message-ID: <20090127185539.BED817010B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/xfce-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12158

Modified Files:
	sources .cvsignore xfce-utils.spec 
Log Message:
Update to 4.5.99.1



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xfce-utils/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	17 Jan 2009 20:19:55 -0000	1.12
+++ sources	27 Jan 2009 18:55:09 -0000	1.13
@@ -1 +1 @@
-dae0c86338acb3c66e433ba8a430a977  xfce-utils-4.5.93.tar.bz2
+bb605ee9aff15abcc7a7eb2d3d24b227  xfce-utils-4.5.99.1.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xfce-utils/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	17 Jan 2009 20:19:55 -0000	1.12
+++ .cvsignore	27 Jan 2009 18:55:09 -0000	1.13
@@ -1 +1 @@
-xfce-utils-4.5.93.tar.bz2
+xfce-utils-4.5.99.1.tar.bz2


Index: xfce-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfce-utils/devel/xfce-utils.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- xfce-utils.spec	17 Jan 2009 20:19:55 -0000	1.24
+++ xfce-utils.spec	27 Jan 2009 18:55:09 -0000	1.25
@@ -2,7 +2,7 @@
 
 Summary: Utilities for the Xfce Desktop Environment
 Name: xfce-utils
-Version: 4.5.93
+Version: 4.5.99.1
 Release: 1%{?dist}
 License: GPLv2+
 URL: http://www.xfce.org/
@@ -108,6 +108,9 @@
 %{_datadir}/dbus-1/services/org.xfce.RunDialog.service
 
 %changelog
+* Mon Jan 26 2009 Kevin Fenzi <kevin at tummy.com> - 4.5.99.1-1
+- Update to 4.5.99.1
+
 * Tue Jan 13 2009 Kevin Fenzi <kevin at tummy.com> - 4.5.93-1
 - Update to 4.5.93
 



From madko at fedoraproject.org  Tue Jan 27 18:57:08 2009
From: madko at fedoraproject.org (Edouard Bourguignon)
Date: Tue, 27 Jan 2009 18:57:08 +0000 (UTC)
Subject: rpms/libnss-pgsql/F-10 import.log, NONE,
	1.1 libnss-pgsql-1.5.0-beta-exit-in-library.patch, NONE,
	1.1 libnss-pgsql-fix_include.patch, NONE, 1.1 libnss-pgsql.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090127185708.153797010B@cvs1.fedora.phx.redhat.com>

Author: madko

Update of /cvs/pkgs/rpms/libnss-pgsql/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12690/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	import.log libnss-pgsql-1.5.0-beta-exit-in-library.patch 
	libnss-pgsql-fix_include.patch libnss-pgsql.spec 
Log Message:
Commit to F10 branch



--- NEW FILE import.log ---
libnss-pgsql-1_5_0-0_2_beta_fc10:F-10:libnss-pgsql-1.5.0-0.2.beta.fc10.src.rpm:1233078953

libnss-pgsql-1.5.0-beta-exit-in-library.patch:

--- NEW FILE libnss-pgsql-1.5.0-beta-exit-in-library.patch ---
Only in libnss-pgsql-1.5.0-beta: Makefile
Only in libnss-pgsql-1.5.0-beta: config.h
Only in libnss-pgsql-1.5.0-beta: config.log
Only in libnss-pgsql-1.5.0-beta: config.status
Only in libnss-pgsql-1.5.0-beta: debugfiles.list
Only in libnss-pgsql-1.5.0-beta: debuglinks.list
Only in libnss-pgsql-1.5.0-beta: debugsources.list
Only in libnss-pgsql-1.5.0-beta/doc: Makefile
Only in libnss-pgsql-1.5.0-beta/doc: nss-pgsql.html
Only in libnss-pgsql-1.5.0-beta: libtool
Only in libnss-pgsql-1.5.0-beta/src: .deps
Only in libnss-pgsql-1.5.0-beta/src: .libs
Only in libnss-pgsql-1.5.0-beta/src: Makefile
Only in libnss-pgsql-1.5.0-beta/src: backend.lo
diff -ur libnss-pgsql-1.5.0-beta.debug/src/config.c libnss-pgsql-1.5.0-beta/src/config.c
--- libnss-pgsql-1.5.0-beta.debug/src/config.c	2008-08-19 18:44:37.000000000 +0900
+++ libnss-pgsql-1.5.0-beta/src/config.c	2009-01-24 23:59:21.000000000 +0900
@@ -95,11 +95,15 @@
 		/* read options */
 		if(sscanf(line, " %s = %[^\n]", key, val) < 2) {
 			print_err("line %d in %s is unparseable: \"%s\"\n", lineno, configfile, line);
+			fclose(cf);
+			return 1;
 		} else {
 			h = texthash(key);
 			if (type == CONNECTION_SHADOW) {
 				if (_shadowoptions[h] != NULL) {
 					print_err("line %d in %s is a duplicate hash: \"%s\"\n", lineno, configfile, key);
+					fclose(cf);
+					return 1;
 				} else {
 					_shadowoptions[h] = malloc(strlen(val)+1);
 					strcpy(_shadowoptions[h], val);
@@ -107,6 +111,8 @@
 			} else {
 				if (_options[h] != NULL ) {
 					print_err("line %d in %s is a duplicate hash: \"%s\"\n", lineno, configfile, key);
+					fclose(cf);
+					return 1;
 				} else {
 					_options[h] = malloc(strlen(val)+1);
 					strcpy(_options[h], val);
Only in libnss-pgsql-1.5.0-beta/src: config.c~
Only in libnss-pgsql-1.5.0-beta/src: config.lo
Only in libnss-pgsql-1.5.0-beta/src: interface.lo
Only in libnss-pgsql-1.5.0-beta/src: libnss_pgsql.la
diff -ur libnss-pgsql-1.5.0-beta.debug/src/util.c libnss-pgsql-1.5.0-beta/src/util.c
--- libnss-pgsql-1.5.0-beta.debug/src/util.c	2004-12-01 15:29:47.000000000 +0900
+++ libnss-pgsql-1.5.0-beta/src/util.c	2009-01-24 23:55:10.000000000 +0900
@@ -24,7 +24,6 @@
 	va_end(ap);
 
 	fflush(stderr);
-	exit(1);
 }
 
 void print_msg(const char *msg, ...)
Only in libnss-pgsql-1.5.0-beta/src: util.c~
Only in libnss-pgsql-1.5.0-beta/src: util.lo
Only in libnss-pgsql-1.5.0-beta: stamp-h


libnss-pgsql-fix_include.patch:

--- NEW FILE libnss-pgsql-fix_include.patch ---
diff -urN ../BUILD/libnss-pgsql-1.3/src/backend.c ../BUILD/libnss-pgsql-1.3.fix_include/src/backend.c
--- libnss-pgsql-1.3/src/backend.c	2005-03-25 23:05:49.000000000 +0100
+++ libnss-pgsql-1.3.fix_include/src/backend.c	2005-12-12 14:25:20.000000000 +0100
@@ -9,7 +9,7 @@
  */
 
 #include "nss-pgsql.h"
-#include <postgresql/libpq-fe.h>
+#include <libpq-fe.h>
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>



--- NEW FILE libnss-pgsql.spec ---
Name:           libnss-pgsql
Version:        1.5.0
Release:        0.2.beta%{?dist}
Summary:        Name Service Switch library that interface with PostgreSQL

Group:          System Environment/Libraries
License:        GPL+
URL:            http://pgfoundry.org/projects/sysauth/
Source0:        http://pgfoundry.org/frs/download.php/1878/%{name}-%{version}-beta.tgz
Patch0:         libnss-pgsql-fix_include.patch
Patch1:         libnss-pgsql-1.5.0-beta-exit-in-library.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  postgresql-devel, xmlto


%description
Name Service Switch library that interface with PostgreSQL.
See %{_docdir}/%{name}-%{version}/nss-pgsql.html for the config file.


%prep
%setup -q -n %{name}-%{version}-beta
%patch0 -p1 -b include.rej
%patch1 -p1 -b exit-in-library.rej


%build
%configure --disable-static
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=${RPM_BUILD_ROOT}
rm -rf ${RPM_BUILD_ROOT}/usr/doc
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,-)
%exclude %{_libdir}/*.so
%doc AUTHORS COPYING ChangeLog README doc/nss-pgsql.html doc/caution.png
%{_libdir}/libnss_pgsql.so.2.0.0
%{_libdir}/libnss_pgsql.so.2
%{_libdir}/libnss_pgsql.so


%changelog
* Sun Jan 25 2009 Edouard Bourguignon <madko at linuxed.net> - 1.5.0-0.2.beta
- Fix source URL
- Add a patch from M.Tasaka to remove exit() call in the library

* Fri Jan 23 2009 Edouard Bourguignon <madko at linuxed.net> - 1.5.0-0.1.beta
- Upgrade to 1.5.0 beta

* Mon Jan 12 2009 Edouard Bourguignon <madko at linuxed.net> - 1.4.0-2
- Add buildrequires on postgresql-devel

* Thu Jan  3 2008 Edouard Bourguignon <madko at linuxed.net> - 1.4.0-1
- Upgrade to version 1.4.0

* Mon Dec 12 2005 Edouard Bourguignon <madko at linuxed.net> - 1.3-1
- Initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libnss-pgsql/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	26 Jan 2009 22:54:20 -0000	1.1
+++ .cvsignore	27 Jan 2009 18:56:37 -0000	1.2
@@ -0,0 +1 @@
+libnss-pgsql-1.5.0-beta.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libnss-pgsql/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	26 Jan 2009 22:54:20 -0000	1.1
+++ sources	27 Jan 2009 18:56:37 -0000	1.2
@@ -0,0 +1 @@
+8d86f1dd93799c365691a3322e107732  libnss-pgsql-1.5.0-beta.tgz



From kevin at fedoraproject.org  Tue Jan 27 18:58:41 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 27 Jan 2009 18:58:41 +0000 (UTC)
Subject: rpms/xfprint/devel sources, 1.12, 1.13 .cvsignore, 1.12,
	1.13 xfprint.spec, 1.24, 1.25
Message-ID: <20090127185841.B9E6E7010B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/xfprint/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13004

Modified Files:
	sources .cvsignore xfprint.spec 
Log Message:
Update to 4.5.99.1



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xfprint/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	17 Jan 2009 20:27:12 -0000	1.12
+++ sources	27 Jan 2009 18:58:11 -0000	1.13
@@ -1 +1 @@
-2d3b658167bfbe10ec3258d7c3d995d2  xfprint-4.5.93.tar.bz2
+fa5e680172156dfb0456a171534b1efd  xfprint-4.5.99.1.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xfprint/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	17 Jan 2009 20:27:12 -0000	1.12
+++ .cvsignore	27 Jan 2009 18:58:11 -0000	1.13
@@ -1 +1 @@
-xfprint-4.5.93.tar.bz2
+xfprint-4.5.99.1.tar.bz2


Index: xfprint.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfprint/devel/xfprint.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- xfprint.spec	17 Jan 2009 20:27:12 -0000	1.24
+++ xfprint.spec	27 Jan 2009 18:58:11 -0000	1.25
@@ -1,6 +1,6 @@
 Summary: Print dialog and printer manager for Xfce 4
 Name: xfprint
-Version: 4.5.93
+Version: 4.5.99.1
 Release: 1%{?dist}
 License: GPLv2+
 URL: http://www.xfce.org
@@ -84,6 +84,9 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Mon Jan 26 2009 Kevin Fenzi <kevin at tummy.com> - 4.5.99.1-1
+- Update to 4.5.99.1
+
 * Tue Jan 13 2009 Kevin Fenzi <kevin at tummy.com> - 4.5.93-1
 - Update to 4.5.93
 



From wart at fedoraproject.org  Tue Jan 27 19:01:52 2009
From: wart at fedoraproject.org (Michael Thomas)
Date: Tue, 27 Jan 2009 19:01:52 +0000 (UTC)
Subject: rpms/manaworld/devel .cvsignore, 1.12, 1.13 manaworld.spec, 1.15,
	1.16 sources, 1.12, 1.13
Message-ID: <20090127190152.925D17010B@cvs1.fedora.phx.redhat.com>

Author: wart

Update of /cvs/pkgs/rpms/manaworld/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13699

Modified Files:
	.cvsignore manaworld.spec sources 
Log Message:
Update to 0.0.28



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/manaworld/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	16 Dec 2008 04:48:02 -0000	1.12
+++ .cvsignore	27 Jan 2009 19:01:21 -0000	1.13
@@ -1 +1 @@
-tmw-0.0.27.tar.gz
+tmw-0.0.28.tar.gz


Index: manaworld.spec
===================================================================
RCS file: /cvs/pkgs/rpms/manaworld/devel/manaworld.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- manaworld.spec	16 Dec 2008 04:48:02 -0000	1.15
+++ manaworld.spec	27 Jan 2009 19:01:22 -0000	1.16
@@ -1,5 +1,5 @@
 Name:           manaworld
-Version:        0.0.27
+Version:        0.0.28
 Release:        1%{?dist}
 Summary:        2D MMORPG world
 
@@ -9,9 +9,10 @@
 Source0:        http://downloads.sourceforge.net/themanaworld/tmw-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Requires:       dejavu-sans-fonts
 BuildRequires:  guichan-devel >= 0.8.1 desktop-file-utils physfs-devel
 BuildRequires:  curl-devel libxml2-devel libpng-devel
-BuildRequires:  SDL_image-devel SDL_mixer-devel SDL_net-devel
+BuildRequires:  SDL_image-devel SDL_mixer-devel SDL_net-devel SDL_ttf-devel
 
 %description
 The Mana World (TMW) is a serious effort to create an innovative free and open
@@ -44,6 +45,13 @@
   $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps
 rmdir $RPM_BUILD_ROOT%{_datadir}/pixmaps
 
+# Use system fonts instead of bundled fonts
+
+rm -f $RPM_BUILD_ROOT%{_datadir}/tmw/data/fonts/dejavusans.ttf
+ln -s %{_datadir}/fonts/dejavu/DejaVuSans.ttf $RPM_BUILD_ROOT%{_datadir}/tmw/data/fonts/dejavusans.ttf
+
+%find_lang tmw
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -60,7 +68,7 @@
 fi
 
 
-%files
+%files -f tmw.lang
 %defattr(-,root,root,-)
 %{_bindir}/tmw
 %{_datadir}/tmw
@@ -72,6 +80,9 @@
 
 
 %changelog
+* Tue Jan 27 2009 Wart <wart at kobold.org> 0.0.28-1
+- Update to 0.0.28
+
 * Mon Dec 15 2008 Wart <wart at kobold.org> 0.0.27-1
 - Update to 0.0.27
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/manaworld/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	16 Dec 2008 04:48:02 -0000	1.12
+++ sources	27 Jan 2009 19:01:22 -0000	1.13
@@ -1 +1 @@
-8c237378bd1afb3cabdc9fd8ee7c93ce  tmw-0.0.27.tar.gz
+7d157a95e761ef7bee6f6a04645355ba  tmw-0.0.28.tar.gz



From madko at fedoraproject.org  Tue Jan 27 19:05:40 2009
From: madko at fedoraproject.org (Edouard Bourguignon)
Date: Tue, 27 Jan 2009 19:05:40 +0000 (UTC)
Subject: rpms/purple-msn-pecan/devel import.log, NONE,
	1.1 purple-msn-pecan.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090127190540.2D3727010B@cvs1.fedora.phx.redhat.com>

Author: madko

Update of /cvs/pkgs/rpms/purple-msn-pecan/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14343/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log purple-msn-pecan.spec 
Log Message:
Initial commit



--- NEW FILE import.log ---
purple-msn-pecan-0_0_17-4_fc10:HEAD:purple-msn-pecan-0.0.17-4.fc10.src.rpm:1233079153


--- NEW FILE purple-msn-pecan.spec ---
%define		realname msn-pecan
Name:		purple-%{realname}
Version:	0.0.17
Release:	4%{?dist}
Summary:	Alternative MSN protocol plugin for libpurple 

Group:		Applications/Internet 
License:	GPLv2+
URL:		http://code.google.com/p/msn-pecan/ 
Source0:	http://msn-pecan.googlecode.com/files/%{realname}-%{version}.tar.bz2
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	libpurple-devel 
BuildRequires:	gettext
BuildRequires:	check-devel


%description
The project aims to have a much faster development process, low barrier for
contributions, and close contact with the user-base.

Features include:

	* Support for personal messages
	* Server-side storage for display names (private alias)
	* Partial direct connection support
	* Improved network IO
	* Improved error handling
	* Network issues tested with netem
	* GObject usage 


%prep
%setup -q -n %{realname}-%{version}


%build
make CFLAGS="%{optflags}" %{?_smp_mflags} V=yes


%install
rm -rf $RPM_BUILD_ROOT
install -Dp -m 755 libmsn-pecan.so $RPM_BUILD_ROOT/%{_libdir}/purple-2/libmsn-pecan.so
make install_locales DESTDIR=$RPM_BUILD_ROOT
%find_lang libmsn-pecan 


%check
cd tests
make clean
make


%clean
rm -rf $RPM_BUILD_ROOT


%files -f libmsn-pecan.lang
%defattr(-, root, root, -)
%doc AUTHORS COPYING TODO README COPYRIGHT ChangeLog
%{_libdir}/purple-2/libmsn-pecan.so


%changelog
* Mon Jan 19 2009 Edouard Bourguignon <madko at linuxed.net> - 0.0.17-4
- Remove DEBUG make option
- V=1 changed to V=yes

* Sun Jan 18 2009 Edouard Bourguignon <madko at linuxed.net> - 0.0.17-3
- Add a check section
- Add make options V=1 DEBUG=1 to make build logs more verbose and debuginfo more usefull 

* Sun Jan 18 2009 Edouard Bourguignon <madko at linuxed.net> - 0.0.17-2
- Cosmetic fix about realname macro (added in Name item)
- Change license tag from GPLv2 to GPLv2+
- Add missing doc files
- Add translation files

* Wed Jan 14 2009 Edouard Bourguignon <madko at linuxed.net> - 0.0.17-1
- Upgrade to upstream version (0.0.17)
- Requires pidgin removed

* Fri Jun 13 2008 Edouard Bourguignon <edouard.bourguignon at oxalya.com> - 0.0.13-1
- Initial version


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/purple-msn-pecan/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	26 Jan 2009 22:53:17 -0000	1.1
+++ .cvsignore	27 Jan 2009 19:05:09 -0000	1.2
@@ -0,0 +1 @@
+msn-pecan-0.0.17.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/purple-msn-pecan/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	26 Jan 2009 22:53:17 -0000	1.1
+++ sources	27 Jan 2009 19:05:09 -0000	1.2
@@ -0,0 +1 @@
+d0539f835d02c94774d06a7877e575ac  msn-pecan-0.0.17.tar.bz2



From kevin at fedoraproject.org  Tue Jan 27 19:10:58 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 27 Jan 2009 19:10:58 +0000 (UTC)
Subject: rpms/xfwm4/devel sources, 1.13, 1.14 .cvsignore, 1.13,
	1.14 xfwm4.spec, 1.29, 1.30
Message-ID: <20090127191059.000127010B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/xfwm4/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15135

Modified Files:
	sources .cvsignore xfwm4.spec 
Log Message:
Update to 4.5.99.1



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xfwm4/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	17 Jan 2009 20:43:22 -0000	1.13
+++ sources	27 Jan 2009 19:10:28 -0000	1.14
@@ -1 +1 @@
-5655230f7323cda513cf3cc26b8bea78  xfwm4-4.5.93.tar.bz2
+b03becce68408bd58b2acd9e2c094e15  xfwm4-4.5.99.1.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xfwm4/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	17 Jan 2009 20:43:22 -0000	1.13
+++ .cvsignore	27 Jan 2009 19:10:28 -0000	1.14
@@ -1 +1 @@
-xfwm4-4.5.93.tar.bz2
+xfwm4-4.5.99.1.tar.bz2


Index: xfwm4.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfwm4/devel/xfwm4.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- xfwm4.spec	17 Jan 2009 20:43:22 -0000	1.29
+++ xfwm4.spec	27 Jan 2009 19:10:28 -0000	1.30
@@ -1,6 +1,6 @@
 Summary: Next generation window manager for Xfce
 Name: xfwm4
-Version: 4.5.93
+Version: 4.5.99.1
 Release: 1%{?dist}
 License: GPLv2+
 URL: http://www.xfce.org/
@@ -75,6 +75,9 @@
 %{_libexecdir}/xfce4
 
 %changelog
+* Mon Jan 26 2009 Kevin Fenzi <kevin at tummy.com> - 4.5.99.1-1
+- Update to 4.5.99.1
+
 * Tue Jan 13 2009 Kevin Fenzi <kevin at tummy.com> - 4.5.93-1
 - Update to 4.5.93
 



From kevin at fedoraproject.org  Tue Jan 27 19:14:00 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 27 Jan 2009 19:14:00 +0000 (UTC)
Subject: rpms/xfce4-panel/devel xfce4-panel.spec, 1.30, 1.31 sources, 1.12, 
	1.13 .cvsignore, 1.12, 1.13
Message-ID: <20090127191400.3B9DE7010B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/xfce4-panel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15714

Modified Files:
	xfce4-panel.spec sources .cvsignore 
Log Message:
Update to 4.5.99.1



Index: xfce4-panel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-panel/devel/xfce4-panel.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- xfce4-panel.spec	17 Jan 2009 20:50:11 -0000	1.30
+++ xfce4-panel.spec	27 Jan 2009 19:13:29 -0000	1.31
@@ -1,6 +1,6 @@
 Summary: Next generation panel for Xfce
 Name: xfce4-panel
-Version: 4.5.93
+Version: 4.5.99.1
 Release: 1%{?dist}
 License: GPLv2+ and LGPLv2+
 URL: http://www.xfce.org/
@@ -124,6 +124,9 @@
 %{_includedir}/xfce4/libxfce4panel
 
 %changelog
+* Mon Jan 26 2009 Kevin Fenzi <kevin at tummy.com> - 4.5.99.1-1
+- Update to 4.5.99.1
+
 * Tue Jan 13 2009 Kevin Fenzi <kevin at tummy.com> - 4.5.93-1
 - Update to 4.5.93
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-panel/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	17 Jan 2009 20:50:11 -0000	1.12
+++ sources	27 Jan 2009 19:13:29 -0000	1.13
@@ -1 +1 @@
-96c4cccf520aa789b267b14b491359ab  xfce4-panel-4.5.93.tar.bz2
+fc6b6db258bb779d02a44814e0389e86  xfce4-panel-4.5.99.1.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-panel/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	17 Jan 2009 20:50:11 -0000	1.12
+++ .cvsignore	27 Jan 2009 19:13:29 -0000	1.13
@@ -1 +1 @@
-xfce4-panel-4.5.93.tar.bz2
+xfce4-panel-4.5.99.1.tar.bz2



From llaumgui at fedoraproject.org  Tue Jan 27 19:15:48 2009
From: llaumgui at fedoraproject.org (Guillaume Kulakowski)
Date: Tue, 27 Jan 2009 19:15:48 +0000 (UTC)
Subject: rpms/pidgin-privacy-please/devel import.log, NONE,
	1.1 pidgin-privacy-please.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090127191548.154387010B@cvs1.fedora.phx.redhat.com>

Author: llaumgui

Update of /cvs/pkgs/rpms/pidgin-privacy-please/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16108/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log pidgin-privacy-please.spec 
Log Message:
Initial import branch F11



--- NEW FILE import.log ---
pidgin-privacy-please-0_5_2-2_fc10:HEAD:pidgin-privacy-please-0.5.2-2.fc10.src.rpm:1233083656


--- NEW FILE pidgin-privacy-please.spec ---
Name:            pidgin-privacy-please
Version:         0.5.2
Release:         2%{?dist}
Summary:         Security and Privacy plugin for Pidgin

Group:           Applications/Internet
License:         GPLv2+
URL:             http://code.google.com/p/pidgin-privacy-please/
Source0:         http://pidgin-privacy-please.googlecode.com/files/%{name}-%{version}.tar.gz
BuildRoot:       %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:   pidgin-devel
Requires:        pidgin


%description
pidgin privacy please is a pidgin plugin to stop spammers from annoying you.
It offers the following features:
  - Block certain users (with an optional auto-reply)
  - Block messages from people who are not on your contact list
    (with an optional auto-reply)
  - Suppress repeated authorization requests


%prep
%setup -q -n %{name}-%{version}%{?prever}


%build
%configure
make %{?_smp_mflags}


%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot} INSTALL="install -p" 

# remove .la file
rm %{buildroot}/%{_libdir}/pidgin/libpidgin_pp.la


%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING README
%{_libdir}/pidgin/libpidgin_pp.so


%changelog
* Mon Jan 05 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 0.5.2-2
- Correction on URL and Source0
- Correction on install and buildroot variable

* Mon Jan 05 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 0.5.2-1
- Initial package

Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pidgin-privacy-please/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	26 Jan 2009 22:46:51 -0000	1.1
+++ .cvsignore	27 Jan 2009 19:15:17 -0000	1.2
@@ -0,0 +1 @@
+pidgin-privacy-please-0.5.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pidgin-privacy-please/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	26 Jan 2009 22:46:52 -0000	1.1
+++ sources	27 Jan 2009 19:15:17 -0000	1.2
@@ -0,0 +1 @@
+9db291fab302a189fef27c9922f9432a  pidgin-privacy-please-0.5.2.tar.gz



From kevin at fedoraproject.org  Tue Jan 27 19:16:23 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 27 Jan 2009 19:16:23 +0000 (UTC)
Subject: rpms/xfce4-mixer/devel sources, 1.11, 1.12 .cvsignore, 1.11,
	1.12 xfce4-mixer.spec, 1.22, 1.23
Message-ID: <20090127191623.44A717010B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/xfce4-mixer/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16246

Modified Files:
	sources .cvsignore xfce4-mixer.spec 
Log Message:
Update to 4.5.99.1



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-mixer/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	17 Jan 2009 20:55:51 -0000	1.11
+++ sources	27 Jan 2009 19:15:52 -0000	1.12
@@ -1 +1 @@
-bb4c4b46873a576797c74e642da5c0ad  xfce4-mixer-4.5.93.tar.bz2
+ca8870c8c03c6033bdff790b494cc067  xfce4-mixer-4.5.99.1.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-mixer/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	17 Jan 2009 20:55:51 -0000	1.11
+++ .cvsignore	27 Jan 2009 19:15:52 -0000	1.12
@@ -1 +1 @@
-xfce4-mixer-4.5.93.tar.bz2
+xfce4-mixer-4.5.99.1.tar.bz2


Index: xfce4-mixer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-mixer/devel/xfce4-mixer.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- xfce4-mixer.spec	17 Jan 2009 20:58:50 -0000	1.22
+++ xfce4-mixer.spec	27 Jan 2009 19:15:53 -0000	1.23
@@ -1,6 +1,6 @@
 Summary: Volume control plugin for the Xfce 4 panel
 Name: xfce4-mixer
-Version: 4.5.93
+Version: 4.5.99.1
 Release: 1%{?dist}
 License: GPLv2+
 URL: http://www.xfce.org/
@@ -67,6 +67,9 @@
 %{_datadir}/xfce4/panel-plugins/xfce4-mixer-plugin.desktop
 
 %changelog
+* Mon Jan 26 2009 Kevin Fenzi <kevin at tummy.com> - 4.5.99.1-1
+- Update to 4.5.99.1
+
 * Tue Jan 13 2009 Kevin Fenzi <kevin at tummy.com> - 4.5.93-1
 - Update to 4.5.93
 



From dsd at fedoraproject.org  Tue Jan 27 19:18:56 2009
From: dsd at fedoraproject.org (Daniel Drake)
Date: Tue, 27 Jan 2009 19:18:56 +0000 (UTC)
Subject: rpms/xkeyboard-config/OLPC-3 olpc-xkeyboard-config-es.patch, NONE, 
	1.1 xkeyboard-config-olpc-mn.patch, NONE,
	1.1 xkeyboard-config-view_source.patch, NONE,
	1.1 xkeyboard-config-olpc-et.patch, 1.1,
	1.2 xkeyboard-config.spec, 1.21, 1.22
Message-ID: <20090127191856.371857010B@cvs1.fedora.phx.redhat.com>

Author: dsd

Update of /cvs/pkgs/rpms/xkeyboard-config/OLPC-3
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16846

Modified Files:
	xkeyboard-config-olpc-et.patch xkeyboard-config.spec 
Added Files:
	olpc-xkeyboard-config-es.patch xkeyboard-config-olpc-mn.patch 
	xkeyboard-config-view_source.patch 
Log Message:
OLPC fixes from sayamindu: view source, es, it, mn, et

olpc-xkeyboard-config-es.patch:

--- NEW FILE olpc-xkeyboard-config-es.patch ---
diff --git a/rules/base.ml_s.part b/rules/base.ml_s.part
index 877182b..f06eb37 100644
--- a/rules/base.ml_s.part
+++ b/rules/base.ml_s.part
@@ -19,6 +19,7 @@
   macintosh_old	*			=	macintosh_vndr/us(oldmac)+%l%(v)
  $macs		en_US			=	pc+macintosh_vndr/us(extended)
  $macs		$macvendorlayouts	=	pc+macintosh_vndr/%l%(v)
+  olpc      es                  =   olpc+es(%v)
   olpc		$olpclayouts		=	olpc+%l%(m)
   olpc		*			=	olpc+%l%(v)
   thinkpad   	br			=	pc+br(thinkpad)
diff --git a/symbols/es b/symbols/es
index 3f73ac0..9f9b80a 100644
--- a/symbols/es
+++ b/symbols/es
@@ -193,3 +193,18 @@ xkb_symbols "olpc" {
 
     include "level3(ralt_switch)"
 };
+
+partial alphanumeric_keys
+xkb_symbols "olpc2" {
+
+    // Modified variant of US International layout, specifically for Peru
+    // Contact: Sayamindu Dasgupta <sayamindu at laptop.org>
+
+    include "us(olpc)"
+    name[Group1]="Spain (OLPC2)";
+
+    key <AE03> { [  3, numbersign,   dead_grave,  dead_grave] }; // combining grave
+    key <I236>  { [ XF86Start ] }; 
+
+    include "level3(ralt_switch)"
+};

xkeyboard-config-olpc-mn.patch:

--- NEW FILE xkeyboard-config-olpc-mn.patch ---
diff --git a/symbols/mn b/symbols/mn
index 08109b7..af6bc85 100644
--- a/symbols/mn
+++ b/symbols/mn
@@ -76,6 +76,8 @@ xkb_symbols "olpc" {
 
   include "mn(basic)"
 
+  key <AE07> { [ 7,                 semicolon,          ampersand       ] };
+
   key <BKSL> { [ backslash,         bar,     		exclam          ] };
 
   include "group(olpc)"

xkeyboard-config-view_source.patch:

--- NEW FILE xkeyboard-config-view_source.patch ---
diff --git a/symbols/group b/symbols/group
index 53c046e..17dc457 100644
--- a/symbols/group
+++ b/symbols/group
@@ -331,5 +331,6 @@ xkb_symbols "alt_caps_toggle" {
 partial hidden modifier_keys
 xkb_symbols "olpc" {
   key <I219>  { [ ISO_Next_Group, ISO_Prev_Group ] };
+  key <I236>  { [ XF86Start ] };
 };
 

xkeyboard-config-olpc-et.patch:

Index: xkeyboard-config-olpc-et.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xkeyboard-config/OLPC-3/xkeyboard-config-olpc-et.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xkeyboard-config-olpc-et.patch	26 Jul 2008 15:05:13 -0000	1.1
+++ xkeyboard-config-olpc-et.patch	27 Jan 2009 19:18:55 -0000	1.2
@@ -1,8 +1,31 @@
-diff --git a/symbols/et b/symbols/et
-index e6d1ba7..f3d4a98 100644
---- a/symbols/et
-+++ b/symbols/et
-@@ -55,11 +55,11 @@ xkb_symbols "olpc" {
+diff -Naur xkeyboard-config-1.3/symbols/et xkeyboard-config-1.3.new/symbols/et
+--- xkeyboard-config-1.3/symbols/et	2008-01-25 04:51:06.000000000 +0530
++++ xkeyboard-config-1.3.new/symbols/et	2008-08-23 02:31:46.000000000 +0530
+@@ -33,18 +33,18 @@
+ 
+     key <AD01>	{ [        0x01001240,  0x01001250 ]	}; // q
+     key <AD02>	{ [        0x010012C8,  VoidSymbol ]	}; // w
+-    key <AD03>	{ [        e,           E          ]	}; // e
++    key <AD03>	{ [        0x0100FE69,  0x0100FE70 ]	}; // dead e
+     key <AD04>	{ [        0x01001228,  VoidSymbol ]	}; // r
+     key <AD05>	{ [        0x01001270,  0x01001320 ]	}; // t
+     key <AD06>	{ [        0x010012E8,  VoidSymbol ]	}; // y
+-    key <AD07>	{ [        u,           U          ]	}; // u
+-    key <AD08>	{ [        i,           I          ]	}; // i
+-    key <AD09>	{ [        o,           O          ]	}; // o
++    key <AD07>	{ [        0x0100FE75,  0x0100FE76 ]	}; // dead u
++    key <AD08>	{ [        0x0100FE71,  0x0100FE72 ]	}; // dead i
++    key <AD09>	{ [        0x0100FE73,  0x0100FE74 ]	}; // dead o
+     key <AD10>	{ [        0x01001350,  0x01001330 ]	}; // p
+     key <AD11>	{ [        0x01001340,  0x01001338 ]	}; // [
+     key <AD12>	{ [        0x01001328,  0x01001280 ]	}; // ]
+ 
+-    key <AC01>	{ [        a,           A          ]	}; // a
++    key <AC01>	{ [        0x0100FE67,  0x0100FE68 ]	}; // dead a
+     key <AC02>	{ [        0x01001230,  0x01001220 ]	}; // s
+     key <AC03>	{ [        0x010012F0,  0x010012F8 ]	}; // d
+     key <AC04>	{ [        0x01001348,  VoidSymbol ]	}; // f
+@@ -55,11 +55,11 @@
      key <AC09>	{ [        0x01001208,  VoidSymbol ]	}; // l
  
      key <AC10>	{ [        0x01001362,  0x01001361 ]	}; // :;
@@ -12,19 +35,19 @@
      key <AB01>	{ [        0x010012D8,  0x010012E0 ]	}; // z
      key <AB02>	{ [        0x010012A0,  0x010012D0 ]	}; // x
 -    key <AB03>	{ [        c,           C          ]	}; // c
-+    key <AB03>  { [        0x01001278,  VoidSymbol ]    }; // c
++    key <AB03>  { [        0x01001278,  0x0100FE78 ]    }; // c
      key <AB04>	{ [        0x01001238,  0x01001268 ]	}; // v
      key <AB05>	{ [        0x01001260,  VoidSymbol ]	}; // b
      key <AB06>	{ [        0x01001290,  0x01001298 ]	}; // n
-@@ -67,9 +67,9 @@ xkb_symbols "olpc" {
+@@ -67,9 +67,9 @@
  
      key <AB08>	{ [        0x01001363,  VoidSymbol ]	}; // <
      key <AB09>	{ [        0x01001364,  VoidSymbol ]	}; // >
 -    key <AB10>  { [        VoidSymbol,  question   ]    }; // ?
-+    key <AB10>  { [        0x01001367,  VoidSymbol ]    }; // ?
++    key <AB10>  { [        0x01001367,  question   ]    }; // ?
  
 -    key <BKSL> {  [        backslash,   VoidSymbol ]    }; // bksl
-+    key <BKSL> {  [        VoidSymbol,  0x01002010 ]    }; // bksl
++    key <BKSL> {  [        backslash,  0x01002010  ]    }; // bksl
  
      include "group(olpc)"
  };


Index: xkeyboard-config.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xkeyboard-config/OLPC-3/xkeyboard-config.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- xkeyboard-config.spec	17 Nov 2008 07:23:17 -0000	1.21
+++ xkeyboard-config.spec	27 Jan 2009 19:18:55 -0000	1.22
@@ -4,7 +4,7 @@
 Summary: xkeyboard-config alternative xkb data files
 Name: xkeyboard-config
 Version: 1.3
-Release: 3%{?dist}
+Release: 6%{?dist}
 License: MIT
 Group: User Interface/X
 URL: http://www.x.org
@@ -17,7 +17,10 @@
 Patch4: xkeyboard-config-olpc-ca-fr-typofix.patch
 Patch5: xkeyboard-config-olpc-et.patch
 Patch6: xkeyboard-config-olpc-af.patch
-Patch7: xkeyboard-config-olpc-it.patch
+Patch7: xkeyboard-config-view_source.patch
+Patch8: xkeyboard-config-olpc-mn.patch
+Patch9: xkeyboard-config-olpc-it.patch
+Patch10: olpc-xkeyboard-config-es.patch
 
 BuildArch: noarch
 
@@ -52,7 +55,10 @@
 %patch4 -p0 -b .ca
 %patch5 -p1 -b .et
 %patch6 -p1 -b .af
-%patch7 -p1 -b .it
+%patch7 -p1 -b .group
+%patch8 -p1 -b .mn
+%patch9 -p1 -b .it
+%patch10 -p1 -b .es
 
 %build
 %configure \
@@ -92,9 +98,22 @@
 %{_datadir}/X11/xkb/rules/xorg.xml
 
 %changelog
-* Sun Nov 17 2008 Bernie Innocenti <bernie at codewiz.org> 1.3-3
+* Tue Dec 23 2008 Sayamindu Dasgupta <sayamindu at laptop.org> 1.3-6
+- Fix the rules file for the previous patch
+
+* Tue Dec 23 2008 Sayamindu Dasgupta <sayamindu at laptop.org> 1.3-5
+- Add olpc-xkeyboard-config-es.patch (dlo #9126)
+
+* Sun Nov 17 2008 Bernie Innocenti <bernie at codewiz.org> 1.3-4
 - Add olpc-xkeyboard-config-it.patch
 
+* Wed Sep 17 2008 Sayamindu Dasgupta <sayamindu at laptop.org> - 1.3-3
+- xkeyboard-config-olpc-mn.patch: Fix Mongolian keybard (dlo #8488)
+- xkeyboard-config-view_source.patch: Make view source work all layouts (dlo #5060)
+
+* Sat Aug 23 2008 Sayamindu Dasgupta <sayamindu at laptop.org> - 1.3-2
+- More fixes for the Amharic keyboard (see OLPC bug #7474 for a discussion)
+
 * Sat Jul 26 2008 Sayamindu Dasgupta  <sayamindu at laptop.org> - 1.3-2
 - Add xkeyboard-config-olpc-tr.patch from OLPC-2 branch
 - Add xkeyboard-config-olpc-ca-fr-typofix.patch from OLPC-2 branch



From llaumgui at fedoraproject.org  Tue Jan 27 19:19:41 2009
From: llaumgui at fedoraproject.org (Guillaume Kulakowski)
Date: Tue, 27 Jan 2009 19:19:41 +0000 (UTC)
Subject: rpms/pidgin-privacy-please/F-10 import.log, NONE,
	1.1 pidgin-privacy-please.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090127191941.1DB277010B@cvs1.fedora.phx.redhat.com>

Author: llaumgui

Update of /cvs/pkgs/rpms/pidgin-privacy-please/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16872/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	import.log pidgin-privacy-please.spec 
Log Message:
initial import branch F10



--- NEW FILE import.log ---
pidgin-privacy-please-0_5_2-2_fc10:F-10:pidgin-privacy-please-0.5.2-2.fc10.src.rpm:1233083859


--- NEW FILE pidgin-privacy-please.spec ---
Name:            pidgin-privacy-please
Version:         0.5.2
Release:         2%{?dist}
Summary:         Security and Privacy plugin for Pidgin

Group:           Applications/Internet
License:         GPLv2+
URL:             http://code.google.com/p/pidgin-privacy-please/
Source0:         http://pidgin-privacy-please.googlecode.com/files/%{name}-%{version}.tar.gz
BuildRoot:       %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:   pidgin-devel
Requires:        pidgin


%description
pidgin privacy please is a pidgin plugin to stop spammers from annoying you.
It offers the following features:
  - Block certain users (with an optional auto-reply)
  - Block messages from people who are not on your contact list
    (with an optional auto-reply)
  - Suppress repeated authorization requests


%prep
%setup -q -n %{name}-%{version}%{?prever}


%build
%configure
make %{?_smp_mflags}


%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot} INSTALL="install -p" 

# remove .la file
rm %{buildroot}/%{_libdir}/pidgin/libpidgin_pp.la


%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING README
%{_libdir}/pidgin/libpidgin_pp.so


%changelog
* Mon Jan 05 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 0.5.2-2
- Correction on URL and Source0
- Correction on install and buildroot variable

* Mon Jan 05 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 0.5.2-1
- Initial package

Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pidgin-privacy-please/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	26 Jan 2009 22:46:51 -0000	1.1
+++ .cvsignore	27 Jan 2009 19:19:10 -0000	1.2
@@ -0,0 +1 @@
+pidgin-privacy-please-0.5.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pidgin-privacy-please/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	26 Jan 2009 22:46:52 -0000	1.1
+++ sources	27 Jan 2009 19:19:10 -0000	1.2
@@ -0,0 +1 @@
+9db291fab302a189fef27c9922f9432a  pidgin-privacy-please-0.5.2.tar.gz



From kevin at fedoraproject.org  Tue Jan 27 19:21:35 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 27 Jan 2009 19:21:35 +0000 (UTC)
Subject: rpms/orage/devel sources, 1.8, 1.9 .cvsignore, 1.8, 1.9 orage.spec, 
	1.14, 1.15
Message-ID: <20090127192135.847A07010B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/orage/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17451

Modified Files:
	sources .cvsignore orage.spec 
Log Message:
Update to 4.5.99.1



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/orage/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	17 Jan 2009 21:02:49 -0000	1.8
+++ sources	27 Jan 2009 19:21:05 -0000	1.9
@@ -1 +1 @@
-99066cda2994c54124e5666c91834bd3  orage-4.5.93.tar.bz2
+47d75c03e7334891d18ec38193ff1f87  orage-4.5.99.1.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/orage/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	17 Jan 2009 21:02:49 -0000	1.8
+++ .cvsignore	27 Jan 2009 19:21:05 -0000	1.9
@@ -1 +1 @@
-orage-4.5.93.tar.bz2
+orage-4.5.99.1.tar.bz2


Index: orage.spec
===================================================================
RCS file: /cvs/pkgs/rpms/orage/devel/orage.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- orage.spec	17 Jan 2009 21:02:49 -0000	1.14
+++ orage.spec	27 Jan 2009 19:21:05 -0000	1.15
@@ -1,6 +1,6 @@
 Summary: Time-managing application for Xfce4
 Name: orage
-Version: 4.5.93
+Version: 4.5.99.1
 Release: 1%{?dist}
 License: GPLv2+
 URL: http://www.xfce.org/
@@ -71,6 +71,9 @@
 %{_mandir}/man1/orage.1.gz
 
 %changelog
+* Mon Jan 26 2009 Kevin Fenzi <kevin at tummy.com> - 4.5.99.1-1
+- Update to 4.5.99.1
+
 * Tue Jan 13 2009 Kevin Fenzi <kevin at tummy.com> - 4.5.93-1
 - Update to 4.5.93
 



From llaumgui at fedoraproject.org  Tue Jan 27 19:21:58 2009
From: llaumgui at fedoraproject.org (Guillaume Kulakowski)
Date: Tue, 27 Jan 2009 19:21:58 +0000 (UTC)
Subject: rpms/pidgin-privacy-please/F-9 import.log, NONE,
	1.1 pidgin-privacy-please.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090127192158.8F4D87010B@cvs1.fedora.phx.redhat.com>

Author: llaumgui

Update of /cvs/pkgs/rpms/pidgin-privacy-please/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17411/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	import.log pidgin-privacy-please.spec 
Log Message:
initial import branch F9



--- NEW FILE import.log ---
pidgin-privacy-please-0_5_2-2_fc10:F-9:pidgin-privacy-please-0.5.2-2.fc10.src.rpm:1233084020


--- NEW FILE pidgin-privacy-please.spec ---
Name:            pidgin-privacy-please
Version:         0.5.2
Release:         2%{?dist}
Summary:         Security and Privacy plugin for Pidgin

Group:           Applications/Internet
License:         GPLv2+
URL:             http://code.google.com/p/pidgin-privacy-please/
Source0:         http://pidgin-privacy-please.googlecode.com/files/%{name}-%{version}.tar.gz
BuildRoot:       %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:   pidgin-devel
Requires:        pidgin


%description
pidgin privacy please is a pidgin plugin to stop spammers from annoying you.
It offers the following features:
  - Block certain users (with an optional auto-reply)
  - Block messages from people who are not on your contact list
    (with an optional auto-reply)
  - Suppress repeated authorization requests


%prep
%setup -q -n %{name}-%{version}%{?prever}


%build
%configure
make %{?_smp_mflags}


%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot} INSTALL="install -p" 

# remove .la file
rm %{buildroot}/%{_libdir}/pidgin/libpidgin_pp.la


%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING README
%{_libdir}/pidgin/libpidgin_pp.so


%changelog
* Mon Jan 05 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 0.5.2-2
- Correction on URL and Source0
- Correction on install and buildroot variable

* Mon Jan 05 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 0.5.2-1
- Initial package

Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pidgin-privacy-please/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	26 Jan 2009 22:46:51 -0000	1.1
+++ .cvsignore	27 Jan 2009 19:21:28 -0000	1.2
@@ -0,0 +1 @@
+pidgin-privacy-please-0.5.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pidgin-privacy-please/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	26 Jan 2009 22:46:52 -0000	1.1
+++ sources	27 Jan 2009 19:21:28 -0000	1.2
@@ -0,0 +1 @@
+9db291fab302a189fef27c9922f9432a  pidgin-privacy-please-0.5.2.tar.gz



From kevin at fedoraproject.org  Tue Jan 27 19:26:15 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 27 Jan 2009 19:26:15 +0000 (UTC)
Subject: rpms/xfdesktop/devel sources,1.10,1.11 .cvsignore,1.10,1.11
Message-ID: <20090127192615.6E8AD7010B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/xfdesktop/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18970

Modified Files:
	sources .cvsignore 
Log Message:
Update to 4.5.99.1



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xfdesktop/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	17 Jan 2009 22:28:59 -0000	1.10
+++ sources	27 Jan 2009 19:25:44 -0000	1.11
@@ -1 +1 @@
-9b56cf695a502a84878f154de077f593  xfdesktop-4.5.93.tar.bz2
+84343ef05823403c98981b933d3adfe6  xfdesktop-4.5.99.1.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xfdesktop/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	17 Jan 2009 22:28:59 -0000	1.10
+++ .cvsignore	27 Jan 2009 19:25:44 -0000	1.11
@@ -1 +1 @@
-xfdesktop-4.5.93.tar.bz2
+xfdesktop-4.5.99.1.tar.bz2



From kevin at fedoraproject.org  Tue Jan 27 19:27:03 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 27 Jan 2009 19:27:03 +0000 (UTC)
Subject: rpms/xfdesktop/devel xfdesktop.spec,1.26,1.27
Message-ID: <20090127192703.9F8FF7010B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/xfdesktop/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19113

Modified Files:
	xfdesktop.spec 
Log Message:
Update to 4.5.99.1



Index: xfdesktop.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfdesktop/devel/xfdesktop.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- xfdesktop.spec	17 Jan 2009 22:28:59 -0000	1.26
+++ xfdesktop.spec	27 Jan 2009 19:26:33 -0000	1.27
@@ -1,6 +1,6 @@
 Summary: Desktop manager for the XFce Desktop Environment
 Name: xfdesktop
-Version: 4.5.93
+Version: 4.5.99.1
 Release: 1%{?dist}
 License: GPLv2+
 URL: http://www.xfce.org/
@@ -85,6 +85,9 @@
 %{_datadir}/xfce4/panel-plugins/xfce4-menu.desktop
 
 %changelog
+* Mon Jan 26 2009 Kevin Fenzi <kevin at tummy.com> - 4.5.99.1-1
+- Update to 4.5.99.1
+
 * Tue Jan 13 2009 Kevin Fenzi <kevin at tummy.com> - 4.5.93-1
 - Update to 4.5.93
 



From kevin at fedoraproject.org  Tue Jan 27 19:29:50 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 27 Jan 2009 19:29:50 +0000 (UTC)
Subject: rpms/gtk-xfce-engine/devel sources, 1.11, 1.12 .cvsignore, 1.11,
	1.12 gtk-xfce-engine.spec, 1.22, 1.23
Message-ID: <20090127192950.182F67010B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/gtk-xfce-engine/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19667

Modified Files:
	sources .cvsignore gtk-xfce-engine.spec 
Log Message:
Update to 2.5.99.1



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gtk-xfce-engine/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	17 Jan 2009 21:35:54 -0000	1.11
+++ sources	27 Jan 2009 19:29:19 -0000	1.12
@@ -1 +1 @@
-5c90c0a07db3ee6d2185b4e9973627ec  gtk-xfce-engine-2.5.93.tar.bz2
+bcb1a09e0b268802d1079159842760a8  gtk-xfce-engine-2.5.99.1.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gtk-xfce-engine/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	17 Jan 2009 21:35:54 -0000	1.11
+++ .cvsignore	27 Jan 2009 19:29:19 -0000	1.12
@@ -1 +1 @@
-gtk-xfce-engine-2.5.93.tar.bz2
+gtk-xfce-engine-2.5.99.1.tar.bz2


Index: gtk-xfce-engine.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtk-xfce-engine/devel/gtk-xfce-engine.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- gtk-xfce-engine.spec	17 Jan 2009 21:35:54 -0000	1.22
+++ gtk-xfce-engine.spec	27 Jan 2009 19:29:19 -0000	1.23
@@ -1,10 +1,10 @@
 Summary: Port of Xfce engine to GTK+-2.0
 Name: gtk-xfce-engine
-Version: 2.5.93
+Version: 2.5.99.1
 Release: 1%{?dist}
 License: GPLv2+
 URL: http://www.xfce.org/
-Source0: http://www.xfce.org/archive/xfce-4.5.93/src/gtk-xfce-engine-%{version}.tar.bz2
+Source0: http://www.xfce.org/archive/xfce-4.5.99.1/src/gtk-xfce-engine-%{version}.tar.bz2
 Group: User Interface/Desktops
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: gtk2-devel >= 2.0.0
@@ -36,6 +36,9 @@
 %{_datadir}/themes/*
 
 %changelog
+* Mon Jan 26 2009 Kevin Fenzi <kevin at tummy.com> - 2.5.99.1-1
+- Update to 2.5.99.1
+
 * Tue Jan 13 2009 Kevin Fenzi <kevin at tummy.com> - 2.5.93-1
 - Update to 2.5.93
 



From kevin at fedoraproject.org  Tue Jan 27 19:32:12 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 27 Jan 2009 19:32:12 +0000 (UTC)
Subject: rpms/xfwm4-themes/devel xfwm4-themes.spec, 1.18, 1.19 sources, 1.11,
	1.12 .cvsignore, 1.11, 1.12
Message-ID: <20090127193212.C586B7010B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/xfwm4-themes/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20062

Modified Files:
	xfwm4-themes.spec sources .cvsignore 
Log Message:
Update to 4.5.99.1



Index: xfwm4-themes.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfwm4-themes/devel/xfwm4-themes.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- xfwm4-themes.spec	17 Jan 2009 21:40:56 -0000	1.18
+++ xfwm4-themes.spec	27 Jan 2009 19:31:42 -0000	1.19
@@ -1,6 +1,6 @@
 Summary: Additional themes for xfwm4
 Name: xfwm4-themes
-Version: 4.5.93
+Version: 4.5.99.1
 Release: 1%{?dist}
 License: GPL+ and BSD
 URL: http://www.xfce.org/
@@ -35,6 +35,9 @@
 %{_datadir}/themes/*
 
 %changelog
+* Mon Jan 26 2009 Kevin Fenzi <kevin at tummy.com> - 4.5.99.1-1
+- Update to 4.5.99.1
+
 * Tue Jan 13 2009 Kevin Fenzi <kevin at tummy.com> - 4.5.93-1
 - Update to 4.5.93
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xfwm4-themes/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	17 Jan 2009 21:40:56 -0000	1.11
+++ sources	27 Jan 2009 19:31:42 -0000	1.12
@@ -1 +1 @@
-0a0f34521e3c32ae04b349fe571fb9ce  xfwm4-themes-4.5.93.tar.bz2
+91fc3d42f7af94944ee1b64efaaf2b7b  xfwm4-themes-4.5.99.1.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xfwm4-themes/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	17 Jan 2009 21:40:56 -0000	1.11
+++ .cvsignore	27 Jan 2009 19:31:42 -0000	1.12
@@ -1 +1 @@
-xfwm4-themes-4.5.93.tar.bz2
+xfwm4-themes-4.5.99.1.tar.bz2



From kevin at fedoraproject.org  Tue Jan 27 19:34:05 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Tue, 27 Jan 2009 19:34:05 +0000 (UTC)
Subject: rpms/xfce4-dev-tools/devel sources, 1.6, 1.7 .cvsignore, 1.6,
	1.7 xfce4-dev-tools.spec, 1.7, 1.8
Message-ID: <20090127193405.719677010B@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/xfce4-dev-tools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20402

Modified Files:
	sources .cvsignore xfce4-dev-tools.spec 
Log Message:
Update to 4.5.99.1



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-dev-tools/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	17 Jan 2009 21:50:24 -0000	1.6
+++ sources	27 Jan 2009 19:33:34 -0000	1.7
@@ -1 +1 @@
-99d2362c4007d567dacec6b9cd1f05b9  xfce4-dev-tools-4.5.93.tar.bz2
+a25cc6c03ebe5144ce7236ff116bb7b0  xfce4-dev-tools-4.5.99.1.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-dev-tools/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	17 Jan 2009 21:50:24 -0000	1.6
+++ .cvsignore	27 Jan 2009 19:33:35 -0000	1.7
@@ -1 +1 @@
-xfce4-dev-tools-4.5.93.tar.bz2
+xfce4-dev-tools-4.5.99.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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- xfce4-dev-tools.spec	17 Jan 2009 21:50:24 -0000	1.7
+++ xfce4-dev-tools.spec	27 Jan 2009 19:33:35 -0000	1.8
@@ -1,5 +1,5 @@
 Name:		xfce4-dev-tools
-Version:	4.5.93
+Version:	4.5.99.1
 Release:	1%{?dist}
 Summary:	Xfce developer tools
 
@@ -43,6 +43,9 @@
 %{_datadir}/aclocal/*
 
 %changelog
+* Mon Jan 26 2009 Kevin Fenzi <kevin at tummy.com> - 4.5.99.1-1
+- Update to 4.5.99.1
+
 * Tue Jan 13 2009 Kevin Fenzi <kevin at tummy.com> - 4.5.93-1
 - Update to 4.5.93
 



From linville at fedoraproject.org  Tue Jan 27 19:43:10 2009
From: linville at fedoraproject.org (John W. Linville)
Date: Tue, 27 Jan 2009 19:43:10 +0000 (UTC)
Subject: rpms/crda/devel .cvsignore, 1.2, 1.3 crda.spec, 1.1, 1.2 sources,
	1.2, 1.3
Message-ID: <20090127194311.137D97010B@cvs1.fedora.phx.redhat.com>

Author: linville

Update of /cvs/pkgs/rpms/crda/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22219

Modified Files:
	.cvsignore crda.spec sources 
Log Message:
Update for CRDA verion 1.0.1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/crda/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	27 Jan 2009 18:38:49 -0000	1.2
+++ .cvsignore	27 Jan 2009 19:42:40 -0000	1.3
@@ -1,2 +1,2 @@
-crda-v0.9.5.tar.bz2
+crda-1.0.1.tar.bz2
 wireless-regdb-2009-01-15.tar.bz2


Index: crda.spec
===================================================================
RCS file: /cvs/pkgs/rpms/crda/devel/crda.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- crda.spec	27 Jan 2009 18:38:49 -0000	1.1
+++ crda.spec	27 Jan 2009 19:42:40 -0000	1.2
@@ -1,9 +1,9 @@
-%define         crda_version    v0.9.5
+%define         crda_version    1.0.1
 %define         regdb_version   2009-01-15
 
 Name:           crda
 Version:        %{crda_version}_%(echo %{regdb_version} | sed -e 's/-/_/g')
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Regulatory compliance daemon for 802.11 wireless networking
 
 Group:          System Environment/Base
@@ -81,6 +81,10 @@
 %doc wireless-regdb-%{regdb_version}/README.wireless-regdb
 
 %changelog
+* Tue Jan 27 2008 John W. Linville <linville at redhat.com> 1.0.1_2009_01_15-3
+- Update for CRDA verion 1.0.1
+- Account for lack of "v" in upstream release tarball naming
+
 * Thu Jan 22 2008 John W. Linville <linville at redhat.com> v0.9.5_2009_01_15-2
 - Revamp based on package review comments
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/crda/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	27 Jan 2009 18:38:49 -0000	1.2
+++ sources	27 Jan 2009 19:42:40 -0000	1.3
@@ -1,2 +1,2 @@
-bef56c2b1d93779f08ed1ad037615218  crda-v0.9.5.tar.bz2
+03554b71eef2626795befa17eb1d8b9e  crda-1.0.1.tar.bz2
 7d132c16850eb9f9102194fe9c6e45d4  wireless-regdb-2009-01-15.tar.bz2



From kkofler at fedoraproject.org  Tue Jan 27 19:43:28 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Tue, 27 Jan 2009 19:43:28 +0000 (UTC)
Subject: rpms/soprano/F-10 .cvsignore, 1.13, 1.14 soprano.spec, 1.23,
	1.24 sources, 1.13, 1.14
Message-ID: <20090127194328.CA2987010B@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/soprano/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22245/F-10

Modified Files:
	.cvsignore soprano.spec sources 
Log Message:
Sync from devel:

* Tue Jan 27 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 2.2-1
- update to 2.2


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/soprano/F-10/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	23 Jan 2009 16:52:32 -0000	1.13
+++ .cvsignore	27 Jan 2009 19:42:58 -0000	1.14
@@ -1,2 +1 @@
-soprano-2.1.1.tar.bz2
-soprano-2.1.64.tar.bz2
+soprano-2.2.tar.bz2


Index: soprano.spec
===================================================================
RCS file: /cvs/pkgs/rpms/soprano/F-10/soprano.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- soprano.spec	23 Jan 2009 16:52:33 -0000	1.23
+++ soprano.spec	27 Jan 2009 19:42:58 -0000	1.24
@@ -6,7 +6,7 @@
 
 Summary: Qt wrapper API to different RDF storage solutions
 Name:    soprano
-Version: 2.1.64
+Version: 2.2
 Release: 1%{?dist}
 
 Group:   System Environment/Libraries
@@ -108,8 +108,11 @@
 
 
 %changelog
+* Tue Jan 27 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 2.2-1
+- update to 2.2
+
 * Fri Jan 09 2009 Than Ngo <than at redhat.com> - 2.1.64-1
-- update to 2.1.64
+- update to 2.1.64 (2.2 beta 1)
 
 * Sun Sep 28 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 2.1.1-1
 - update to 2.1.1


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/soprano/F-10/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	23 Jan 2009 16:52:33 -0000	1.13
+++ sources	27 Jan 2009 19:42:58 -0000	1.14
@@ -1 +1 @@
-f62267c1f904450ab0e9d8cab30d252b  soprano-2.1.64.tar.bz2
+a9642861b3c4f1916a7821847e3d094a  soprano-2.2.tar.bz2



From kkofler at fedoraproject.org  Tue Jan 27 19:43:29 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Tue, 27 Jan 2009 19:43:29 +0000 (UTC)
Subject: rpms/soprano/F-9 .cvsignore, 1.10, 1.11 soprano.spec, 1.20,
	1.21 sources, 1.11, 1.12
Message-ID: <20090127194329.21D1C7010B@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/soprano/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22245/F-9

Modified Files:
	.cvsignore soprano.spec sources 
Log Message:
Sync from devel:

* Tue Jan 27 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 2.2-1
- update to 2.2


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/soprano/F-9/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	22 Jul 2008 21:07:23 -0000	1.10
+++ .cvsignore	27 Jan 2009 19:42:58 -0000	1.11
@@ -1 +1 @@
-soprano-2.1.tar.bz2
+soprano-2.2.tar.bz2


Index: soprano.spec
===================================================================
RCS file: /cvs/pkgs/rpms/soprano/F-9/soprano.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- soprano.spec	26 Jan 2009 11:14:03 -0000	1.20
+++ soprano.spec	27 Jan 2009 19:42:58 -0000	1.21
@@ -6,7 +6,7 @@
 
 Summary: Qt wrapper API to different RDF storage solutions
 Name:    soprano
-Version: 2.1.64
+Version: 2.2
 Release: 1%{?dist}
 
 Group:   System Environment/Libraries
@@ -108,8 +108,11 @@
 
 
 %changelog
+* Tue Jan 27 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 2.2-1
+- update to 2.2
+
 * Fri Jan 09 2009 Than Ngo <than at redhat.com> - 2.1.64-1
-- update to 2.1.64
+- update to 2.1.64 (2.2 beta 1)
 
 * Sun Sep 28 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 2.1.1-1
 - update to 2.1.1


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/soprano/F-9/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	26 Jan 2009 11:14:03 -0000	1.11
+++ sources	27 Jan 2009 19:42:58 -0000	1.12
@@ -1 +1 @@
-f62267c1f904450ab0e9d8cab30d252b  soprano-2.1.64.tar.bz2
+a9642861b3c4f1916a7821847e3d094a  soprano-2.2.tar.bz2



From linville at fedoraproject.org  Tue Jan 27 19:45:13 2009
From: linville at fedoraproject.org (John W. Linville)
Date: Tue, 27 Jan 2009 19:45:13 +0000 (UTC)
Subject: rpms/crda/F-10 crda.spec,1.1,1.2 sources,1.2,1.3
Message-ID: <20090127194513.EA5477010B@cvs1.fedora.phx.redhat.com>

Author: linville

Update of /cvs/pkgs/rpms/crda/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22573

Modified Files:
	crda.spec sources 
Log Message:
Update for CRDA verion 1.0.1


Index: crda.spec
===================================================================
RCS file: /cvs/pkgs/rpms/crda/F-10/crda.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- crda.spec	27 Jan 2009 18:42:05 -0000	1.1
+++ crda.spec	27 Jan 2009 19:44:43 -0000	1.2
@@ -1,9 +1,9 @@
-%define         crda_version    v0.9.5
+%define         crda_version    1.0.1
 %define         regdb_version   2009-01-15
 
 Name:           crda
 Version:        %{crda_version}_%(echo %{regdb_version} | sed -e 's/-/_/g')
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Regulatory compliance daemon for 802.11 wireless networking
 
 Group:          System Environment/Base
@@ -81,6 +81,10 @@
 %doc wireless-regdb-%{regdb_version}/README.wireless-regdb
 
 %changelog
+* Tue Jan 27 2008 John W. Linville <linville at redhat.com> 1.0.1_2009_01_15-3
+- Update for CRDA verion 1.0.1
+- Account for lack of "v" in upstream release tarball naming
+
 * Thu Jan 22 2008 John W. Linville <linville at redhat.com> v0.9.5_2009_01_15-2
 - Revamp based on package review comments
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/crda/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	27 Jan 2009 18:42:05 -0000	1.2
+++ sources	27 Jan 2009 19:44:43 -0000	1.3
@@ -1,2 +1,2 @@
-bef56c2b1d93779f08ed1ad037615218  crda-v0.9.5.tar.bz2
+03554b71eef2626795befa17eb1d8b9e  crda-1.0.1.tar.bz2
 7d132c16850eb9f9102194fe9c6e45d4  wireless-regdb-2009-01-15.tar.bz2



From pkgdb at fedoraproject.org  Tue Jan 27 19:47:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 27 Jan 2009 19:47:54 +0000
Subject: [pkgdb] javassist: john5342 has requested watchbugzilla
Message-ID: <20090127194754.CB5EE208496@bastion.fedora.phx.redhat.com>

john5342 has requested the watchbugzilla acl on javassist (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/javassist



From pkgdb at fedoraproject.org  Tue Jan 27 19:47:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 27 Jan 2009 19:47:54 +0000
Subject: [pkgdb] javassist: john5342 has requested commit
Message-ID: <20090127194755.21E8F2084B6@bastion.fedora.phx.redhat.com>

john5342 has requested the commit acl on javassist (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/javassist



From pkgdb at fedoraproject.org  Tue Jan 27 19:47:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 27 Jan 2009 19:47:58 +0000
Subject: [pkgdb] javassist: john5342 has requested watchcommits
Message-ID: <20090127194758.8A5FE2084BD@bastion.fedora.phx.redhat.com>

john5342 has requested the watchcommits acl on javassist (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/javassist



From pkgdb at fedoraproject.org  Tue Jan 27 19:48:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 27 Jan 2009 19:48:03 +0000
Subject: [pkgdb] javassist: john5342 has requested approveacls
Message-ID: <20090127194803.D07B520860A@bastion.fedora.phx.redhat.com>

john5342 has requested the approveacls acl on javassist (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/javassist



From pkgdb at fedoraproject.org  Tue Jan 27 19:48:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 27 Jan 2009 19:48:06 +0000
Subject: [pkgdb] javassist: john5342 has requested watchcommits
Message-ID: <20090127194807.02FB9208494@bastion.fedora.phx.redhat.com>

john5342 has requested the watchcommits acl on javassist (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/javassist



From pkgdb at fedoraproject.org  Tue Jan 27 19:48:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 27 Jan 2009 19:48:11 +0000
Subject: [pkgdb] javassist: john5342 has requested approveacls
Message-ID: <20090127194811.3956020860B@bastion.fedora.phx.redhat.com>

john5342 has requested the approveacls acl on javassist (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/javassist



From pkgdb at fedoraproject.org  Tue Jan 27 19:48:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 27 Jan 2009 19:48:17 +0000
Subject: [pkgdb] javassist: john5342 has requested commit
Message-ID: <20090127194818.2B19A2084A7@bastion.fedora.phx.redhat.com>

john5342 has requested the commit acl on javassist (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/javassist



From pkgdb at fedoraproject.org  Tue Jan 27 19:48:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 27 Jan 2009 19:48:18 +0000
Subject: [pkgdb] javassist: john5342 has requested watchbugzilla
Message-ID: <20090127194819.0CC6C20860E@bastion.fedora.phx.redhat.com>

john5342 has requested the watchbugzilla acl on javassist (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/javassist



From pkgdb at fedoraproject.org  Tue Jan 27 19:48:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 27 Jan 2009 19:48:27 +0000
Subject: [pkgdb] javassist: john5342 has requested watchbugzilla
Message-ID: <20090127194827.E705D208739@bastion.fedora.phx.redhat.com>

john5342 has requested the watchbugzilla acl on javassist (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/javassist



From pkgdb at fedoraproject.org  Tue Jan 27 19:48:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 27 Jan 2009 19:48:29 +0000
Subject: [pkgdb] javassist: john5342 has requested commit
Message-ID: <20090127194829.ED52B208745@bastion.fedora.phx.redhat.com>

john5342 has requested the commit acl on javassist (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/javassist



From pkgdb at fedoraproject.org  Tue Jan 27 19:48:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 27 Jan 2009 19:48:31 +0000
Subject: [pkgdb] javassist: john5342 has requested watchcommits
Message-ID: <20090127194831.8331C20874B@bastion.fedora.phx.redhat.com>

john5342 has requested the watchcommits acl on javassist (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/javassist



From pkgdb at fedoraproject.org  Tue Jan 27 19:48:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 27 Jan 2009 19:48:32 +0000
Subject: [pkgdb] javassist: john5342 has requested approveacls
Message-ID: <20090127194832.5FE4720876D@bastion.fedora.phx.redhat.com>

john5342 has requested the approveacls acl on javassist (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/javassist



From rdieter at fedoraproject.org  Tue Jan 27 19:48:46 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Tue, 27 Jan 2009 19:48:46 +0000 (UTC)
Subject: rpms/javassist/devel javassist.spec,1.1,1.2
Message-ID: <20090127194846.C67D87010B@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/javassist/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23295

Modified Files:
	javassist.spec 
Log Message:
flex supercow provenpackager muscles, in an effort to address
http://bugzilla.redhat.com/480428



Index: javassist.spec
===================================================================
RCS file: /cvs/pkgs/rpms/javassist/devel/javassist.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- javassist.spec	9 Jan 2009 21:53:27 -0000	1.1
+++ javassist.spec	27 Jan 2009 19:48:16 -0000	1.2
@@ -1,6 +1,8 @@
+%define ext_ver .GA
+
 Name:           javassist
 Version:        3.9.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        The Java Programming Assistant provides simple Java bytecode manipulation
 Group:          Development/Libraries
 License:        MPLv1.1 or LGPLv2+
@@ -12,10 +14,24 @@
 
 BuildRequires:     java-devel >= 1:1.6.0
 BuildRequires:     jpackage-utils
-BuildRequires:     ant
+
+BuildRequires:     maven2
+BuildRequires:     maven2-plugin-compiler
+BuildRequires:     maven2-plugin-install
+BuildRequires:     maven2-plugin-jar
+BuildRequires:     maven2-plugin-javadoc
+BuildRequires:     maven2-plugin-release
+BuildRequires:     maven2-plugin-resources
+BuildRequires:     maven2-plugin-surefire
+BuildRequires:     maven2-plugin-source
+BuildRequires:     maven2-plugin-antrun
+
 Requires:          java >= 1:1.6.0
 Requires:          jpackage-utils
 
+Requires(post): jpackage-utils
+Requires(postun): jpackage-utils
+
 %description
 Javassist enables Java programs to define a new class at runtime and to
 modify a class file when the JVM loads it. Unlike other similar
@@ -43,24 +59,36 @@
 %setup -q # -n %{name}-%{version}
 %patch0 -p0
 
-rm -rf *.jar html
+find . -name \*.jar -type f -delete
 
 
 %build
-ant clean jar javadocs
+
+export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
+mkdir -p $MAVEN_REPO_LOCAL
+
+mvn-jpp \
+-Dmaven.repo.local=$MAVEN_REPO_LOCAL \
+install javadoc:javadoc
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
+install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
+install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
+install -pm 644 pom.xml $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP-%{name}.pom
+%add_to_maven_depmap org.apache.maven %{name} %{version} JPP %{name}
+
+
 # jar
 install -d $RPM_BUILD_ROOT%{_javadir}
-install -m644 %{name}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
-ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
+install -m644 target/%{name}-%{version}%{ext_ver}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}%{ext_ver}.jar
+ln -s %{name}-%{version}%{ext_ver}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
 
 # javadoc
 install -d $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-cp -rp html/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
+cp -rp target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 
 
@@ -68,11 +96,21 @@
 rm -rf $RPM_BUILD_ROOT
 
 
+%post
+%update_maven_depmap
+
+%postun
+%update_maven_depmap
+
+
 %files
 %defattr(-,root,root,-)
 %doc License.html
 %{_javadir}/%{name}.jar
-%{_javadir}/%{name}-%{version}.jar
+%{_javadir}/%{name}-%{version}%{ext_ver}.jar
+%{_datadir}/maven2/poms
+%{_mavendepmapfragdir}
+
 
 %files javadoc
 %defattr(-,root,root,-)
@@ -82,5 +120,8 @@
 
 
 %changelog
+* Mon Jan 26 2009 John5342 <john5342 at, fedoraproject.org> - 3.9.0-2
+- Build using maven and install maven stuff (fixes bug 480428)
+
 * Tue Dec 16 2008 Sandro Mathys <red at fedoraproject.org> - 3.9.0-1
 - initial build



From linville at fedoraproject.org  Tue Jan 27 19:49:44 2009
From: linville at fedoraproject.org (John W. Linville)
Date: Tue, 27 Jan 2009 19:49:44 +0000 (UTC)
Subject: rpms/crda/devel crda.spec,1.2,1.3
Message-ID: <20090127194944.703BD7010B@cvs1.fedora.phx.redhat.com>

Author: linville

Update of /cvs/pkgs/rpms/crda/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23567

Modified Files:
	crda.spec 
Log Message:
fixup build breakage from version update


Index: crda.spec
===================================================================
RCS file: /cvs/pkgs/rpms/crda/devel/crda.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- crda.spec	27 Jan 2009 19:42:40 -0000	1.2
+++ crda.spec	27 Jan 2009 19:49:14 -0000	1.3
@@ -57,9 +57,7 @@
 cp README README.crda
 make install DESTDIR=$RPM_BUILD_ROOT
 
-# Fixup some directory and file naming
-mkdir -p ${RPM_BUILD_ROOT}/lib/udev/
-mv ${RPM_BUILD_ROOT}/etc/udev/rules.d ${RPM_BUILD_ROOT}/lib/udev/rules.d
+# Fixup some file naming
 mv ${RPM_BUILD_ROOT}/lib/udev/rules.d/regulatory.rules ${RPM_BUILD_ROOT}/lib/udev/rules.d/10-regulatory.rules
 
 cd ../wireless-regdb-%{regdb_version}



From rdieter at fedoraproject.org  Tue Jan 27 19:49:58 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Tue, 27 Jan 2009 19:49:58 +0000 (UTC)
Subject: rpms/javassist/devel javassist.spec,1.2,1.3
Message-ID: <20090127194958.D39497010B@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/javassist/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23609

Modified Files:
	javassist.spec 
Log Message:
fix poms dir ownership



Index: javassist.spec
===================================================================
RCS file: /cvs/pkgs/rpms/javassist/devel/javassist.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- javassist.spec	27 Jan 2009 19:48:16 -0000	1.2
+++ javassist.spec	27 Jan 2009 19:49:28 -0000	1.3
@@ -108,7 +108,7 @@
 %doc License.html
 %{_javadir}/%{name}.jar
 %{_javadir}/%{name}-%{version}%{ext_ver}.jar
-%{_datadir}/maven2/poms
+%{_datadir}/maven2/poms/*
 %{_mavendepmapfragdir}
 
 



From wtogami at fedoraproject.org  Tue Jan 27 19:49:59 2009
From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=)
Date: Tue, 27 Jan 2009 19:49:59 +0000 (UTC)
Subject: rpms/pidgin/devel pidgin.spec,1.65,1.66
Message-ID: <20090127194959.303E07010B@cvs1.fedora.phx.redhat.com>

Author: wtogami

Update of /cvs/pkgs/rpms/pidgin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23633

Modified Files:
	pidgin.spec 
Log Message:
- one_time_password plugin
- Eliminate RPATH



Index: pidgin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pidgin/devel/pidgin.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- pidgin.spec	12 Jan 2009 19:36:21 -0000	1.65
+++ pidgin.spec	27 Jan 2009 19:49:28 -0000	1.66
@@ -62,7 +62,7 @@
 
 Name:		pidgin
 Version:	2.5.4
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:        GPLv2+ and GPLv2 and MIT
 # GPLv2+ - libpurple, gnt, finch, pidgin, most prpls
 # GPLv2 - silc & novell prpls
@@ -89,6 +89,7 @@
 # - Browser "GNOME Default"
 # - Smiley Theme "Default"
 Source1:	purple-fedora-prefs.xml
+Source2:        one_time_password.c
 
 
 ## Patches 0-99: Fedora specific or upstream wont accept
@@ -115,6 +116,7 @@
 
 # Basic Library Requirements
 BuildRequires:  autoconf
+BuildRequires:  libtool
 BuildRequires:	startup-notification-devel
 BuildRequires:  cyrus-sasl-devel
 BuildRequires:	nss-devel
@@ -379,7 +381,13 @@
            --enable-tcl --enable-tk \
            --disable-schemas-install $SWITCHES
 
-make %{?_smp_mflags}
+make %{?_smp_mflags} LIBTOOL=/usr/bin/libtool
+
+# one_time_password plugin, to be merged upstream soon
+cp %{SOURCE2} libpurple/plugins/
+cd libpurple/plugins/
+make one_time_password.so
+cd -
 
 %if %{api_docs}
 make docs
@@ -388,7 +396,9 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make DESTDIR=$RPM_BUILD_ROOT install
+make DESTDIR=$RPM_BUILD_ROOT install LIBTOOL=/usr/bin/libtool
+
+install -m 0755 libpurple/plugins/one_time_password.so $RPM_BUILD_ROOT%{_libdir}/purple-2/
 
 desktop-file-install --vendor pidgin --delete-original       \
   --add-category X-Red-Hat-Base                            \
@@ -561,6 +571,10 @@
 %endif
 
 %changelog
+* Tue Jan 27 2009 Warren Togami <wtogami at redhat.com> 2.5.4-2
+- one_time_password plugin
+- Eliminate RPATH
+
 * Mon Jan 12 2009 Stu Tomlinson <stu at nosnilmot.com> 2.5.4-1
 - 2.5.4
 



From wart at fedoraproject.org  Tue Jan 27 19:51:03 2009
From: wart at fedoraproject.org (Michael Thomas)
Date: Tue, 27 Jan 2009 19:51:03 +0000 (UTC)
Subject: rpms/manaworld/F-10 .cvsignore, 1.12, 1.13 manaworld.spec, 1.15,
	1.16 sources, 1.12, 1.13
Message-ID: <20090127195103.D770E7010B@cvs1.fedora.phx.redhat.com>

Author: wart

Update of /cvs/pkgs/rpms/manaworld/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23990

Modified Files:
	.cvsignore manaworld.spec sources 
Log Message:
Update to 0.0.28




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/manaworld/F-10/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	18 Dec 2008 00:15:15 -0000	1.12
+++ .cvsignore	27 Jan 2009 19:50:33 -0000	1.13
@@ -1 +1 @@
-tmw-0.0.27.tar.gz
+tmw-0.0.28.tar.gz


Index: manaworld.spec
===================================================================
RCS file: /cvs/pkgs/rpms/manaworld/F-10/manaworld.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- manaworld.spec	18 Dec 2008 00:15:15 -0000	1.15
+++ manaworld.spec	27 Jan 2009 19:50:33 -0000	1.16
@@ -1,5 +1,5 @@
 Name:           manaworld
-Version:        0.0.27
+Version:        0.0.28
 Release:        1%{?dist}
 Summary:        2D MMORPG world
 
@@ -11,7 +11,8 @@
 
 BuildRequires:  guichan-devel >= 0.8.1 desktop-file-utils physfs-devel
 BuildRequires:  curl-devel libxml2-devel libpng-devel
-BuildRequires:  SDL_image-devel SDL_mixer-devel SDL_net-devel
+BuildRequires:  SDL_image-devel SDL_mixer-devel SDL_net-devel SDL_ttf-devel
+Requires:       dejavu-fonts
 
 %description
 The Mana World (TMW) is a serious effort to create an innovative free and open
@@ -44,6 +45,13 @@
   $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps
 rmdir $RPM_BUILD_ROOT%{_datadir}/pixmaps
 
+# Use system fonts instead of bundled fonts
+
+rm -f $RPM_BUILD_ROOT%{_datadir}/tmw/data/fonts/dejavusans.ttf
+ln -s %{_datadir}/fonts/dejavu/DejaVuSans.ttf $RPM_BUILD_ROOT%{_datadir}/tmw/data/fonts/dejavusans.ttf
+
+%find_lang tmw
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -60,7 +68,7 @@
 fi
 
 
-%files
+%files -f tmw.lang
 %defattr(-,root,root,-)
 %{_bindir}/tmw
 %{_datadir}/tmw
@@ -72,6 +80,9 @@
 
 
 %changelog
+* Tue Jan 27 2009 Wart <wart at kobold.org> 0.0.28-1
+- Update to 0.0.28
+
 * Mon Dec 15 2008 Wart <wart at kobold.org> 0.0.27-1
 - Update to 0.0.27
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/manaworld/F-10/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	18 Dec 2008 00:15:15 -0000	1.12
+++ sources	27 Jan 2009 19:50:33 -0000	1.13
@@ -1 +1 @@
-8c237378bd1afb3cabdc9fd8ee7c93ce  tmw-0.0.27.tar.gz
+7d157a95e761ef7bee6f6a04645355ba  tmw-0.0.28.tar.gz



From linville at fedoraproject.org  Tue Jan 27 19:51:30 2009
From: linville at fedoraproject.org (John W. Linville)
Date: Tue, 27 Jan 2009 19:51:30 +0000 (UTC)
Subject: rpms/crda/devel crda.spec,1.3,1.4
Message-ID: <20090127195130.CFAFB7010B@cvs1.fedora.phx.redhat.com>

Author: linville

Update of /cvs/pkgs/rpms/crda/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24116

Modified Files:
	crda.spec 
Log Message:
fixup build breakage from version update


Index: crda.spec
===================================================================
RCS file: /cvs/pkgs/rpms/crda/devel/crda.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- crda.spec	27 Jan 2009 19:49:14 -0000	1.3
+++ crda.spec	27 Jan 2009 19:51:00 -0000	1.4
@@ -57,9 +57,6 @@
 cp README README.crda
 make install DESTDIR=$RPM_BUILD_ROOT
 
-# Fixup some file naming
-mv ${RPM_BUILD_ROOT}/lib/udev/rules.d/regulatory.rules ${RPM_BUILD_ROOT}/lib/udev/rules.d/10-regulatory.rules
-
 cd ../wireless-regdb-%{regdb_version}
 cp README README.wireless-regdb
 make install PREFIX=${RPM_BUILD_ROOT}/usr



From rdieter at fedoraproject.org  Tue Jan 27 19:51:29 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Tue, 27 Jan 2009 19:51:29 +0000 (UTC)
Subject: rpms/javassist/F-10 javassist.spec,1.1,1.2
Message-ID: <20090127195129.36D7A7010B@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/javassist/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24049

Modified Files:
	javassist.spec 
Log Message:
flex supercow provenpackager muscles, in an effort to address
http://bugzilla.redhat.com/480428



Index: javassist.spec
===================================================================
RCS file: /cvs/pkgs/rpms/javassist/F-10/javassist.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- javassist.spec	9 Jan 2009 22:01:15 -0000	1.1
+++ javassist.spec	27 Jan 2009 19:50:58 -0000	1.2
@@ -1,6 +1,8 @@
+%define ext_ver .GA
+
 Name:           javassist
 Version:        3.9.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        The Java Programming Assistant provides simple Java bytecode manipulation
 Group:          Development/Libraries
 License:        MPLv1.1 or LGPLv2+
@@ -12,10 +14,24 @@
 
 BuildRequires:     java-devel >= 1:1.6.0
 BuildRequires:     jpackage-utils
-BuildRequires:     ant
+
+BuildRequires:     maven2
+BuildRequires:     maven2-plugin-compiler
+BuildRequires:     maven2-plugin-install
+BuildRequires:     maven2-plugin-jar
+BuildRequires:     maven2-plugin-javadoc
+BuildRequires:     maven2-plugin-release
+BuildRequires:     maven2-plugin-resources
+BuildRequires:     maven2-plugin-surefire
+BuildRequires:     maven2-plugin-source
+BuildRequires:     maven2-plugin-antrun
+
 Requires:          java >= 1:1.6.0
 Requires:          jpackage-utils
 
+Requires(post): jpackage-utils
+Requires(postun): jpackage-utils
+
 %description
 Javassist enables Java programs to define a new class at runtime and to
 modify a class file when the JVM loads it. Unlike other similar
@@ -43,24 +59,36 @@
 %setup -q # -n %{name}-%{version}
 %patch0 -p0
 
-rm -rf *.jar html
+find . -name \*.jar -type f -delete
 
 
 %build
-ant clean jar javadocs
+
+export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
+mkdir -p $MAVEN_REPO_LOCAL
+
+mvn-jpp \
+-Dmaven.repo.local=$MAVEN_REPO_LOCAL \
+install javadoc:javadoc
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
+install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
+install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
+install -pm 644 pom.xml $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP-%{name}.pom
+%add_to_maven_depmap org.apache.maven %{name} %{version} JPP %{name}
+
+
 # jar
 install -d $RPM_BUILD_ROOT%{_javadir}
-install -m644 %{name}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
-ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
+install -m644 target/%{name}-%{version}%{ext_ver}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}%{ext_ver}.jar
+ln -s %{name}-%{version}%{ext_ver}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
 
 # javadoc
 install -d $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-cp -rp html/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
+cp -rp target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 
 
@@ -68,11 +96,21 @@
 rm -rf $RPM_BUILD_ROOT
 
 
+%post
+%update_maven_depmap
+
+%postun
+%update_maven_depmap
+
+
 %files
 %defattr(-,root,root,-)
 %doc License.html
 %{_javadir}/%{name}.jar
-%{_javadir}/%{name}-%{version}.jar
+%{_javadir}/%{name}-%{version}%{ext_ver}.jar
+%{_datadir}/maven2/poms
+%{_mavendepmapfragdir}
+
 
 %files javadoc
 %defattr(-,root,root,-)
@@ -82,5 +120,8 @@
 
 
 %changelog
+* Mon Jan 26 2009 John5342 <john5342 at, fedoraproject.org> - 3.9.0-2
+- Build using maven and install maven stuff (fixes bug 480428)
+
 * Tue Dec 16 2008 Sandro Mathys <red at fedoraproject.org> - 3.9.0-1
 - initial build



From ovasik at fedoraproject.org  Tue Jan 27 19:51:50 2009
From: ovasik at fedoraproject.org (Ondrej Vasik)
Date: Tue, 27 Jan 2009 19:51:50 +0000 (UTC)
Subject: rpms/star/devel .cvsignore, 1.19, 1.20 sources, 1.20,
	1.21 star-1.5-selinux.patch, 1.9, 1.10 star.spec, 1.43, 1.44
Message-ID: <20090127195150.AF20B7010B@cvs1.fedora.phx.redhat.com>

Author: ovasik

Update of /cvs/extras/rpms/star/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24207

Modified Files:
	.cvsignore sources star-1.5-selinux.patch star.spec 
Log Message:
use final 1.5 version tarball insteadof last alpha 1.5a89, ship missing names.c separately, enable optimalization again (#255261)


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/star/devel/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- .cvsignore	3 Dec 2008 12:49:56 -0000	1.19
+++ .cvsignore	27 Jan 2009 19:51:19 -0000	1.20
@@ -1 +1,2 @@
-star-1.5a89.tar.bz2
+names.c
+star-1.5.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/star/devel/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources	3 Dec 2008 12:49:56 -0000	1.20
+++ sources	27 Jan 2009 19:51:20 -0000	1.21
@@ -1 +1,3 @@
-b75a14385aeaa7b8213d481c758f766d  star-1.5a89.tar.bz2
+a7b1a5e830935cc1bf1001a558c7f8c4  star-1.5.tar.bz2
+2ec266cafd989a1160ecbcada1de839b  names.c
+

star-1.5-selinux.patch:

Index: star-1.5-selinux.patch
===================================================================
RCS file: /cvs/extras/rpms/star/devel/star-1.5-selinux.patch,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- star-1.5-selinux.patch	3 Dec 2008 13:14:04 -0000	1.9
+++ star-1.5-selinux.patch	27 Jan 2009 19:51:20 -0000	1.10
@@ -1,25 +1,61 @@
---- star-1.5/star/suntar.mk.selinux	2007-02-17 15:51:23.000000000 +0100
-+++ star-1.5/star/suntar.mk	2007-08-24 11:51:13.000000000 +0200
-@@ -18,6 +18,7 @@
+diff -urNp star-1.5-orig/conf/configure.in star-1.5/conf/configure.in
+--- star-1.5-orig/conf/configure.in	2008-03-27 19:58:16.000000000 +0100
++++ star-1.5/conf/configure.in	2008-12-18 16:11:49.000000000 +0100
+@@ -452,6 +452,15 @@ AC_CHECK_FUNCS(sched_yield)
+ AC_CHECK_FUNCS(nanosleep)
+ LIBS="$ac_save_LIBS"
+ 
++AC_CHECK_HEADERS(selinux/selinux.h)
++if test "$ac_cv_header_selinux_selinux_h" = yes; then
++  AC_CHECKING(for SELinux support)
++  AC_CHECK_LIB(selinux, is_selinux_enabled, lib_selinux="-lselinux -lattr")
++  ac_save_LIBS="$LIBS"
++  LIBS="$LIBS $lib_selinux"
++  AC_CHECK_FUNCS(is_selinux_enabled)
++fi
++
+ dnl Misc OS checks.
+ AC_MSG_CHECKING(for /dev/tty)
+ if test -r /dev/tty; then
+@@ -543,5 +552,6 @@ AC_SUBST(lib_secdb)
+ AC_SUBST(lib_gen)
+ AC_SUBST(lib_pthread)
+ AC_SUBST(lib_rt)
++AC_SUBST(lib_selinux)
+ 
+ AC_OUTPUT(rules.cnf)
+diff -urNp star-1.5-orig/conf/rules.cnf.in star-1.5/conf/rules.cnf.in
+--- star-1.5-orig/conf/rules.cnf.in	2008-02-20 18:52:09.000000000 +0100
++++ star-1.5/conf/rules.cnf.in	2008-12-18 16:09:30.000000000 +0100
+@@ -21,3 +21,4 @@ LIB_SECDB = @lib_secdb@
+ LIB_GEN = @lib_gen@
+ LIB_PTHREAD = @lib_pthread@
+ LIB_RT = @lib_rt@
++LIB_SELINUX = @lib_selinux@
+diff -urNp star-1.5-orig/star/cpio.mk star-1.5/star/cpio.mk
+--- star-1.5-orig/star/cpio.mk	2008-04-06 20:01:45.000000000 +0200
++++ star-1.5/star/cpio.mk	2008-12-18 16:00:27.000000000 +0100
+@@ -19,6 +19,7 @@ CPPOPTS +=	-DUSE_FIND
  CPPOPTS +=	-DUSE_ACL
  CPPOPTS +=	-DUSE_XATTR
  CPPOPTS +=	-DUSE_FFLAGS
-+CPPOPTS +=      -DWITH_SELINUX
++CPPOPTS +=	-DWITH_SELINUX
  CPPOPTS +=	-DSCHILY_PRINT
- CFILES=		suntar.c header.c cpiohdr.c xheader.c xattr.c \
+ CFILES=		cpio.c header.c cpiohdr.c xheader.c xattr.c \
  		list.c extract.c create.c append.c diff.c restore.c \
-@@ -35,7 +36,7 @@
+@@ -34,7 +35,7 @@ CFILES=		cpio.c header.c cpiohdr.c xhead
+ HFILES=		star.h starsubs.h dirtime.h xtab.h xutimes.h \
+ 		movearch.h table.h props.h fifo.h diff.h \
  		checkerr.h dumpdate.h bitstring.h
- #LIBS=		-lunos
- #LIBS=		-lschily -lc /usr/local/lib/gcc-gnulib
--LIBS=		-ldeflt -lrmt -lschily $(LIB_ACL) $(LIB_ATTR) $(LIB_SOCKET)
-+LIBS=		-ldeflt -lrmt -lschily $(LIB_ACL) $(LIB_ATTR) $(LIB_SOCKET) $(LIB_SELINUX)
- XMK_FILE=	suntarman.mk
+-LIBS=		-ldeflt -lrmt -lfind -lschily $(LIB_ACL) $(LIB_ATTR) $(LIB_SOCKET) $(LIB_INTL)
++LIBS=		-ldeflt -lrmt -lfind -lschily $(LIB_ACL) $(LIB_ATTR) $(LIB_SOCKET) $(LIB_INTL) $(LIB_SELINUX)
+ XMK_FILE=	scpioman.mk
  
  ###########################################################################
---- star-1.5/star/extract.c.selinux	2007-06-03 17:06:52.000000000 +0200
-+++ star-1.5/star/extract.c	2007-08-24 11:51:13.000000000 +0200
-@@ -246,6 +246,17 @@
+diff -urNp star-1.5-orig/star/extract.c star-1.5/star/extract.c
+--- star-1.5-orig/star/extract.c	2008-04-06 17:32:15.000000000 +0200
++++ star-1.5/star/extract.c	2008-12-18 15:59:46.000000000 +0100
+@@ -253,6 +253,17 @@ extern	struct WALK walkstate;
  			continue;
  		}
  #endif
@@ -37,43 +73,31 @@
  		if (finfo.f_flags & F_BAD_META) {
  			if (!void_bad(&finfo))
  				break;
---- star-1.5/star/cpio.mk.selinux	2007-02-17 15:51:23.000000000 +0100
-+++ star-1.5/star/cpio.mk	2007-08-24 11:51:13.000000000 +0200
-@@ -18,6 +18,7 @@
+diff -urNp star-1.5-orig/star/gnutar.mk star-1.5/star/gnutar.mk
+--- star-1.5-orig/star/gnutar.mk	2008-04-06 20:01:45.000000000 +0200
++++ star-1.5/star/gnutar.mk	2008-12-18 16:08:54.000000000 +0100
+@@ -19,6 +19,7 @@ CPPOPTS +=	-DUSE_FIND
  CPPOPTS +=	-DUSE_ACL
  CPPOPTS +=	-DUSE_XATTR
  CPPOPTS +=	-DUSE_FFLAGS
 +CPPOPTS +=	-DWITH_SELINUX
  CPPOPTS +=	-DSCHILY_PRINT
- CFILES=		cpio.c header.c cpiohdr.c xheader.c xattr.c \
+ CFILES=		gnutar.c header.c cpiohdr.c xheader.c xattr.c \
  		list.c extract.c create.c append.c diff.c restore.c \
-@@ -35,7 +36,7 @@
+@@ -34,7 +35,7 @@ CFILES=		gnutar.c header.c cpiohdr.c xhe
+ HFILES=		star.h starsubs.h dirtime.h xtab.h xutimes.h \
+ 		movearch.h table.h props.h fifo.h diff.h \
  		checkerr.h dumpdate.h bitstring.h
- #LIBS=		-lunos
- #LIBS=		-lschily -lc /usr/local/lib/gcc-gnulib
--LIBS=		-ldeflt -lrmt -lschily $(LIB_ACL) $(LIB_ATTR) $(LIB_SOCKET)
-+LIBS=		-ldeflt -lrmt -lschily $(LIB_ACL) $(LIB_ATTR) $(LIB_SOCKET) $(LIB_SELINUX)
- XMK_FILE=	scpioman.mk
+-LIBS=		-ldeflt -lrmt -lfind -lschily $(LIB_ACL) $(LIB_ATTR) $(LIB_SOCKET) $(LIB_INTL)
++LIBS=		-ldeflt -lrmt -lfind -lschily $(LIB_ACL) $(LIB_ATTR) $(LIB_SOCKET) $(LIB_INTL) $(LIB_SELINUX)
+ XMK_FILE=	gnutarman.mk
  
  ###########################################################################
---- star-1.5/star/starsubs.h.selinux	2007-07-15 19:38:52.000000000 +0200
-+++ star-1.5/star/starsubs.h	2007-08-24 11:51:13.000000000 +0200
-@@ -297,6 +297,11 @@
- extern	BOOL	get_xattr	__PR((register FINFO *info));
- extern	BOOL	set_xattr	__PR((register FINFO *info));
- extern	void	free_xattr	__PR((star_xattr_t **xattr));
-+#ifdef WITH_SELINUX
-+#include <selinux/selinux.h>
-+extern BOOL    setselinux __PR((register FINFO *info));
-+extern int selinux_enabled;
-+#endif
- #endif
- 
- /*
---- star-1.5/star/Makefile.selinux	2007-06-16 16:46:18.000000000 +0200
-+++ star-1.5/star/Makefile	2007-08-24 11:51:13.000000000 +0200
-@@ -1,67 +1,19 @@
--#ident @(#)star_fat.mk	1.22 08/01/02 
+diff -urNp star-1.5-orig/star/Makefile star-1.5/star/Makefile
+--- star-1.5-orig/star/Makefile	2008-04-06 20:02:25.000000000 +0200
++++ star-1.5/star/Makefile	2008-12-18 16:02:39.000000000 +0100
+@@ -1,66 +1,19 @@
+-#ident @(#)star_fat.mk	1.23 08/04/06 
 +#ident @(#)all.mk	1.1 05/02/16 
  ###########################################################################
 -#include		$(MAKE_M_ARCH).def
@@ -84,7 +108,7 @@
  
  #
 -# This is star_fat.mk, it creates one "fat" binary for all functionality.
-+# This is all.mk, it creates several binaries, one for each function.
++# This is all.mk, it creates sevral binaries, one for each function.
  #
 -# If you like to create non "fat" binaries, remove Makefile
 -# and copy all.mk to Makefile.
@@ -112,29 +136,28 @@
 -		list.c extract.c create.c append.c diff.c restore.c \
 -		remove.c star_unix.c acl_unix.c acltext.c fflags.c \
 -		buffer.c dirtime.c lhash.c \
--		hole.c longnames.c names.c \
+-		hole.c longnames.c \
 -		movearch.c table.c props.c \
--		fetchdir.c \
 -		unicode.c \
 -		subst.c volhdr.c \
 -		chdir.c match.c defaults.c dumpdate.c \
 -		fifo.c device.c checkerr.c \
 -		\
--		findinfo.c find.c walk.c find_list.c find_misc.c
+-		findinfo.c
+ 
 -HFILES=		star.h starsubs.h dirtime.h xtab.h xutimes.h \
 -		movearch.h table.h props.h fifo.h diff.h restore.h \
--		checkerr.h dumpdate.h bitstring.h \
--		\
--		find.h fetchdir.h walk.h find_list.h find_misc.h
+-		checkerr.h dumpdate.h bitstring.h
+-
 -#LIBS=		-lunos
 -#LIBS=		-lschily -lc /usr/local/lib/gcc-gnulib
--LIBS=		-ldeflt -lrmt -lschily $(LIB_ACL) $(LIB_ATTR) $(LIB_SOCKET)
+-LIBS=		-ldeflt -lrmt -lfind -lschily $(LIB_ACL) $(LIB_ATTR) $(LIB_SOCKET) $(LIB_INTL)
 -#
 -#	Wenn -lfind, dann auch  $(LIB_INTL)
 -#
 -XMK_FILE=	Makefile.man starformatman.mk scpioman.mk gnutarman.mk \
 -		spaxman.mk suntarman.mk Makefile.dfl Makefile.doc
- 
+-
 -star_fat.c: star.c
 -	$(RM) $(RM_FORCE) $@; cp star.c $@
 +MK_FILES= star.mk pax.mk suntar.mk gnutar.mk cpio.mk 
@@ -146,50 +169,30 @@
 -count:	$(CFILES) $(HFILES)
 -	count $r1
 -
---- star-1.5/star/pax.mk.selinux	2007-02-17 15:51:23.000000000 +0100
-+++ star-1.5/star/pax.mk	2007-08-24 11:51:13.000000000 +0200
-@@ -18,8 +18,10 @@
+diff -urNp star-1.5-orig/star/pax.mk star-1.5/star/pax.mk
+--- star-1.5-orig/star/pax.mk	2008-04-06 20:01:45.000000000 +0200
++++ star-1.5/star/pax.mk	2008-12-18 16:03:42.000000000 +0100
+@@ -19,6 +19,7 @@ CPPOPTS +=	-DUSE_FIND
  CPPOPTS +=	-DUSE_ACL
  CPPOPTS +=	-DUSE_XATTR
  CPPOPTS +=	-DUSE_FFLAGS
-+CPPOPTS +=      -DWITH_SELINUX
++CPPOPTS +=	-DWITH_SELINUX
  CPPOPTS +=	-DPAX
  CPPOPTS +=	-DSCHILY_PRINT
-+
  CFILES=		pax.c header.c cpiohdr.c xheader.c xattr.c \
- 		list.c extract.c create.c append.c diff.c restore.c \
- 		remove.c star_unix.c acl_unix.c acltext.c fflags.c \
-@@ -36,7 +38,7 @@
+@@ -35,7 +36,7 @@ CFILES=		pax.c header.c cpiohdr.c xheade
+ HFILES=		star.h starsubs.h dirtime.h xtab.h xutimes.h \
+ 		movearch.h table.h props.h fifo.h diff.h \
  		checkerr.h dumpdate.h bitstring.h
- #LIBS=		-lunos
- #LIBS=		-lschily -lc /usr/local/lib/gcc-gnulib
--LIBS=		-ldeflt -lrmt -lschily $(LIB_ACL) $(LIB_ATTR) $(LIB_SOCKET)
-+LIBS=		-ldeflt -lrmt -lschily $(LIB_ACL) $(LIB_ATTR) $(LIB_SOCKET) $(LIB_SELINUX)
+-LIBS=		-ldeflt -lrmt -lfind -lschily $(LIB_ACL) $(LIB_ATTR) $(LIB_SOCKET) $(LIB_INTL)
++LIBS=		-ldeflt -lrmt -lfind -lschily $(LIB_ACL) $(LIB_ATTR) $(LIB_SOCKET) $(LIB_INTL) $(LIB_SELINUX)
  XMK_FILE=	spaxman.mk
  
  ###########################################################################
---- star-1.5/star/star_fat.mk.selinux	2007-06-16 16:46:18.000000000 +0200
-+++ star-1.5/star/star_fat.mk	2007-08-24 11:51:13.000000000 +0200
-@@ -29,6 +29,7 @@
- CPPOPTS +=	-DCOPY_LINKS_DELAYED
- CPPOPTS +=	-DSTAR_FAT
- CPPOPTS +=	-DSCHILY_PRINT
-+CPPOPTS +=      -DWITH_SELINUX
- CFILES=		star_fat.c header.c cpiohdr.c xheader.c xattr.c \
- 		list.c extract.c create.c append.c diff.c restore.c \
- 		remove.c star_unix.c acl_unix.c acltext.c fflags.c \
-@@ -49,7 +50,7 @@
- 		find.h fetchdir.h walk.h find_list.h find_misc.h
- #LIBS=		-lunos
- #LIBS=		-lschily -lc /usr/local/lib/gcc-gnulib
--LIBS=		-ldeflt -lrmt -lschily $(LIB_ACL) $(LIB_ATTR) $(LIB_SOCKET)
-+LIBS=		-ldeflt -lrmt -lschily $(LIB_ACL) $(LIB_ATTR) $(LIB_SOCKET) $(LIB_SELINUX)
- #
- #	Wenn -lfind, dann auch  $(LIB_INTL)
- #
---- star-1.5/star/star.c.selinux	2007-07-16 09:43:14.000000000 +0200
-+++ star-1.5/star/star.c	2007-08-24 11:51:13.000000000 +0200
-@@ -45,6 +45,10 @@
+diff -urNp star-1.5-orig/star/star.c star-1.5/star/star.c
+--- star-1.5-orig/star/star.c	2008-04-13 15:01:30.000000000 +0200
++++ star-1.5/star/star.c	2008-12-18 16:05:31.000000000 +0100
+@@ -46,6 +46,10 @@ static	char sccsid[] =
  #include "starsubs.h"
  #include "checkerr.h"
  
@@ -200,40 +203,96 @@
  EXPORT	int	main		__PR((int ac, char **av));
  LOCAL	void	star_create	__PR((int ac, char *const *av));
  LOCAL	void	checkdumptype	__PR((GINFO *gp));
-@@ -384,6 +388,11 @@
+@@ -388,6 +392,10 @@ main(ac, av)
  			comerr("Panic cannot set back effective uid.\n");
  	}
  	my_uid = geteuid();
 +
 +#ifdef WITH_SELINUX
-+    selinux_enabled=is_selinux_enabled()>0;
++	selinux_enabled=is_selinux_enabled()>0;
 +#endif
-+	
  	/*
  	 * WARNING: We now are no more able to open a new remote connection
  	 * unless we have been called by root.
---- star-1.5/star/star.mk.selinux	2007-02-17 15:51:23.000000000 +0100
-+++ star-1.5/star/star.mk	2007-08-24 11:51:13.000000000 +0200
-@@ -19,6 +19,7 @@
- CPPOPTS +=	-DUSE_XATTR
+diff -urNp star-1.5-orig/star/star_fat.mk star-1.5/star/star_fat.mk
+--- star-1.5-orig/star/star_fat.mk	2008-04-06 20:02:25.000000000 +0200
++++ star-1.5/star/star_fat.mk	2008-12-18 16:04:20.000000000 +0100
+@@ -29,6 +29,7 @@ CPPOPTS +=	-DUSE_FFLAGS
+ CPPOPTS +=	-DCOPY_LINKS_DELAYED
+ CPPOPTS +=	-DSTAR_FAT
+ CPPOPTS +=	-DSCHILY_PRINT
++CPPOPTS +=	-DWITH_SELINUX
+ CFILES=		star_fat.c header.c cpiohdr.c xheader.c xattr.c \
+ 		list.c extract.c create.c append.c diff.c restore.c \
+ 		remove.c star_unix.c acl_unix.c acltext.c fflags.c \
+@@ -48,7 +49,7 @@ HFILES=		star.h starsubs.h dirtime.h xta
+ 
+ #LIBS=		-lunos
+ #LIBS=		-lschily -lc /usr/local/lib/gcc-gnulib
+-LIBS=		-ldeflt -lrmt -lfind -lschily $(LIB_ACL) $(LIB_ATTR) $(LIB_SOCKET) $(LIB_INTL)
++LIBS=		-ldeflt -lrmt -lfind -lschily $(LIB_ACL) $(LIB_ATTR) $(LIB_SOCKET) $(LIB_INTL) $(LIB_SELINUX)
+ #
+ #	Wenn -lfind, dann auch  $(LIB_INTL)
+ #
+diff -urNp star-1.5-orig/star/star.mk star-1.5/star/star.mk
+--- star-1.5-orig/star/star.mk	2008-04-06 20:01:45.000000000 +0200
++++ star-1.5/star/star.mk	2008-12-18 16:06:07.000000000 +0100
+@@ -21,6 +21,7 @@ CPPOPTS +=	-DUSE_XATTR
  CPPOPTS +=	-DUSE_FFLAGS
  CPPOPTS +=	-DCOPY_LINKS_DELAYED
-+CPPOPTS +=      -DWITH_SELINUX
  CPPOPTS +=	-DSCHILY_PRINT
++CPPOPTS +=	-DWITH_SELINUX
  CFILES=		star.c header.c cpiohdr.c xheader.c xattr.c \
  		list.c extract.c create.c append.c diff.c restore.c \
-@@ -36,7 +37,7 @@
+ 		remove.c star_unix.c acl_unix.c acltext.c fflags.c \
+@@ -35,7 +36,7 @@ CFILES=		star.c header.c cpiohdr.c xhead
+ HFILES=		star.h starsubs.h dirtime.h xtab.h xutimes.h \
+ 		movearch.h table.h props.h fifo.h diff.h restore.h \
  		checkerr.h dumpdate.h bitstring.h
- #LIBS=		-lunos
- #LIBS=		-lschily -lc /usr/local/lib/gcc-gnulib
--LIBS=		-ldeflt -lrmt -lschily $(LIB_ACL) $(LIB_ATTR) $(LIB_SOCKET)
-+LIBS=		-ldeflt -lrmt -lschily $(LIB_ACL) $(LIB_ATTR) $(LIB_SOCKET) $(LIB_SELINUX)
+-LIBS=		-ldeflt -lrmt -lfind -lschily $(LIB_ACL) $(LIB_ATTR) $(LIB_SOCKET) $(LIB_INTL)
++LIBS=		-ldeflt -lrmt -lfind -lschily $(LIB_ACL) $(LIB_ATTR) $(LIB_SOCKET) $(LIB_INTL) $(LIB_SELINUX)
  XMK_FILE=	Makefile.man starformatman.mk
  
  ###########################################################################
---- star-1.5/star/xattr.c.selinux	2006-09-13 18:24:20.000000000 +0200
-+++ star-1.5/star/xattr.c	2007-08-24 11:53:56.000000000 +0200
-@@ -184,6 +184,28 @@
+diff -urNp star-1.5-orig/star/starsubs.h star-1.5/star/starsubs.h
+--- star-1.5-orig/star/starsubs.h	2008-04-06 17:32:15.000000000 +0200
++++ star-1.5/star/starsubs.h	2008-12-18 16:01:15.000000000 +0100
+@@ -304,6 +304,11 @@ extern	void	opt_xattr	__PR((void));
+ extern	BOOL	get_xattr	__PR((register FINFO *info));
+ extern	BOOL	set_xattr	__PR((register FINFO *info));
+ extern	void	free_xattr	__PR((star_xattr_t **xattr));
++# ifdef WITH_SELINUX
++#include <selinux/selinux.h>
++extern BOOL    setselinux __PR((register FINFO *info));
++extern int selinux_enabled;
++# endif
+ #endif
+ 
+ /*
+diff -urNp star-1.5-orig/star/suntar.mk star-1.5/star/suntar.mk
+--- star-1.5-orig/star/suntar.mk	2008-04-06 20:01:45.000000000 +0200
++++ star-1.5/star/suntar.mk	2008-12-18 15:58:44.000000000 +0100
+@@ -19,6 +19,7 @@ CPPOPTS +=	-DUSE_FIND
+ CPPOPTS +=	-DUSE_ACL
+ CPPOPTS +=	-DUSE_XATTR
+ CPPOPTS +=	-DUSE_FFLAGS
++CPPOPTS +=	-DWITH_SELINUX
+ CPPOPTS +=	-DSCHILY_PRINT
+ CFILES=		suntar.c header.c cpiohdr.c xheader.c xattr.c \
+ 		list.c extract.c create.c append.c diff.c restore.c \
+@@ -34,7 +35,7 @@ CFILES=		suntar.c header.c cpiohdr.c xhe
+ HFILES=		star.h starsubs.h dirtime.h xtab.h xutimes.h \
+ 		movearch.h table.h props.h fifo.h diff.h \
+ 		checkerr.h dumpdate.h bitstring.h
+-LIBS=		-ldeflt -lrmt -lfind -lschily $(LIB_ACL) $(LIB_ATTR) $(LIB_SOCKET) $(LIB_INTL)
++LIBS=		-ldeflt -lrmt -lfind -lschily $(LIB_ACL) $(LIB_ATTR) $(LIB_SOCKET) $(LIB_INTL) $(LIB_SELINUX)
+ XMK_FILE=	suntarman.mk
+ 
+ ###########################################################################
+diff -urNp star-1.5-orig/star/xattr.c star-1.5/star/xattr.c
+--- star-1.5-orig/star/xattr.c	2008-03-16 16:40:41.000000000 +0100
++++ star-1.5/star/xattr.c	2008-12-18 16:08:15.000000000 +0100
+@@ -196,6 +196,27 @@ fail:
  #endif  /* USE_XATTR */
  }
  
@@ -258,81 +317,17 @@
 +}
 +#endif
 +
-+
  /* ARGSUSED */
  EXPORT BOOL
  set_xattr(info)
-@@ -197,6 +219,10 @@
+@@ -209,6 +230,10 @@ set_xattr(info)
  		return (TRUE);
  
  	for (xap = info->f_xattr; xap->name != NULL; xap++) {
 +#ifdef WITH_SELINUX
-+               	if (selinux_enabled && (strcmp(xap->name, "security.selinux") == 0))
-+                    continue;
++		if (selinux_enabled && (strcmp(xap->name, "security.selinux") == 0))
++			continue;
 +#endif
  		if (lsetxattr(info->f_name, xap->name, xap->value,
  		    xap->value_len, 0) != 0) {
  			if (!errhidden(E_SETXATTR, info->f_name)) {
---- star-1.5/star/gnutar.mk.selinux	2007-02-17 15:51:23.000000000 +0100
-+++ star-1.5/star/gnutar.mk	2007-08-24 11:51:13.000000000 +0200
-@@ -18,6 +18,7 @@
- CPPOPTS +=	-DUSE_ACL
- CPPOPTS +=	-DUSE_XATTR
- CPPOPTS +=	-DUSE_FFLAGS
-+CPPOPTS +=      -DWITH_SELINUX
- CPPOPTS +=	-DSCHILY_PRINT
- CFILES=		gnutar.c header.c cpiohdr.c xheader.c xattr.c \
- 		list.c extract.c create.c append.c diff.c restore.c \
-@@ -35,7 +36,7 @@
- 		checkerr.h dumpdate.h bitstring.h
- #LIBS=		-lunos
- #LIBS=		-lschily -lc /usr/local/lib/gcc-gnulib
--LIBS=		-ldeflt -lrmt -lschily $(LIB_ACL) $(LIB_ATTR) $(LIB_SOCKET)
-+LIBS=		-ldeflt -lrmt -lschily $(LIB_ACL) $(LIB_ATTR) $(LIB_SOCKET) $(LIB_SELINUX)
- XMK_FILE=	gnutarman.mk
- 
- ###########################################################################
---- star-1.5/conf/rules.cnf.in.selinux	2007-05-19 14:52:46.000000000 +0200
-+++ star-1.5/conf/rules.cnf.in	2007-08-24 11:51:13.000000000 +0200
-@@ -20,3 +20,4 @@
- LIB_GEN = @lib_gen@
- LIB_PTHREAD = @lib_pthread@
- LIB_RT = @lib_rt@
-+LIB_SELINUX = @lib_selinux@
---- star-1.5/conf/configure.in.selinux	2007-07-10 05:58:54.000000000 +0200
-+++ star-1.5/conf/configure.in	2007-08-24 11:51:13.000000000 +0200
-@@ -403,6 +403,8 @@
-   LIBS="$ac_save_LIBS"
- fi
- 
-+
-+
- AC_CHECKING(for RBAC support)
- AC_CHECK_LIB(secdb, getuserattr, lib_secdb="-lsecdb")
- ac_save_LIBS="$LIBS"
-@@ -441,6 +443,18 @@
- else
- 	echo no
- fi
-+
-+AC_CHECK_HEADERS(selinux/selinux.h)
-+if test "$ac_cv_header_selinux_selinux_h" = yes; then
-+  AC_CHECKING(for SELinux support)
-+  AC_CHECK_LIB(selinux, is_selinux_enabled, lib_selinux="-lselinux -lattr")
-+  ac_save_LIBS="$LIBS"
-+  LIBS="$LIBS $lib_selinux"
-+  AC_CHECK_FUNCS(is_selinux_enabled)
-+fi
-+
-+
-+
- AC_MSG_CHECKING(for /dev/null)
- if test -r /dev/null; then
- 	echo yes
-@@ -523,5 +537,6 @@
- AC_SUBST(lib_gen)
- AC_SUBST(lib_pthread)
- AC_SUBST(lib_rt)
-+AC_SUBST(lib_selinux)
- 
- AC_OUTPUT(rules.cnf)


Index: star.spec
===================================================================
RCS file: /cvs/extras/rpms/star/devel/star.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- star.spec	3 Dec 2008 12:51:46 -0000	1.43
+++ star.spec	27 Jan 2009 19:51:20 -0000	1.44
@@ -3,19 +3,21 @@
 %endif
 Summary:  An archiving tool with ACL support
 Name: star
-Version: 1.5a89
+Version: 1.5
 Release: 1%{?dist}
 URL: http://cdrecord.berlios.de/old/private/star.html
-Source: ftp://ftp.berlios.de/pub/star/alpha/%{name}-%{version}.tar.bz2
+Source: ftp://ftp.berlios.de/pub/star/%{name}-%{version}.tar.bz2
+#names.c dissapeared from upstream tarball, but is necessary for build
+Source1: names.c
 Patch1: star-1.5-newMake.patch
 Patch2: star-1.5-selinux.patch
 Patch3: star-1.5-changewarnSegv.patch
 License: CDDL
 Group: Applications/Archiving
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
-BuildRequires: libattr-devel libacl-devel libtool libselinux-devel 
+BuildRequires: libattr-devel libacl-devel libtool libselinux-devel
 BuildRequires: e2fsprogs-devel gawk
- 
+
 %description
 Star saves many files together into a single tape or disk archive,
 and can restore individual files from the archive. Star supports ACL.
@@ -27,6 +29,8 @@
 %patch2 -p1 -b .selinux
 %endif
 %patch3 -p1 -b .changewarnSegv
+cp -a %{SOURCE1} ./libfind/
+cp -a %{SOURCE1} ./star/
 
 for PLAT in %{arm} x86_64 ppc64 s390 s390x sh3 sh4 sh4a sparcv9; do
         for AFILE in gcc cc; do
@@ -45,7 +49,7 @@
 
 #make %{?_smp_mflags} PARCH=%{_target_cpu} CPPOPTX="-DNO_FSYNC" \
 make %{?_smp_mflags} PARCH=%{_target_cpu} \
-	COPTX='-O0' \
+  COPTX='-DTRY_EXT2_FS' \
 	K_ARCH=%{_target_cpu} \
 	CONFFLAGS="%{_target_platform} --prefix=%{_prefix} \
 	--exec-prefix=%{_exec_prefix} --bindir=%{_bindir} \
@@ -60,9 +64,9 @@
 rm -rf ${RPM_BUILD_ROOT}
 mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/man1
 %makeinstall RPM_INSTALLDIR=${RPM_BUILD_ROOT} PARCH=%{_target_cpu} K_ARCH=%{_target_cpu} < /dev/null
-rm -rf $RPM_BUILD_ROOT/usr/share/man
-rm -rf $RPM_BUILD_ROOT/usr/share/doc/rmt
-mv $RPM_BUILD_ROOT/usr/man $RPM_BUILD_ROOT%{_mandir}
+rm -rf ${RPM_BUILD_ROOT}/usr/share/man
+rm -rf ${RPM_BUILD_ROOT}/usr/share/doc/rmt
+mv ${RPM_BUILD_ROOT}/usr/man ${RPM_BUILD_ROOT}%{_mandir}
 
 # XXX Nuke unpackaged files.
 ( cd ${RPM_BUILD_ROOT}
@@ -98,6 +102,11 @@
 %{_mandir}/man1/spax.1*
 
 %changelog
+* Tue Jan 27 2009 Ondrej Vasik <ovasik at redhat.com> 1.5-1
+- use final instead of beta
+- ship missing names.c separately
+- enable optimalization again
+
 * Wed Dec 03 2008 Ondrej Vasik <ovasik at redhat.com> 1.5a89-1
 - update to latest upstream release
 



From linville at fedoraproject.org  Tue Jan 27 20:01:30 2009
From: linville at fedoraproject.org (John W. Linville)
Date: Tue, 27 Jan 2009 20:01:30 +0000 (UTC)
Subject: rpms/crda/devel
	wireless-regdb-2009-01-15-non-root-install-fix.patch, 
	NONE, 1.1 crda.spec, 1.4, 1.5
Message-ID: <20090127200130.987B27010B@cvs1.fedora.phx.redhat.com>

Author: linville

Update of /cvs/pkgs/rpms/crda/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26561

Modified Files:
	crda.spec 
Added Files:
	wireless-regdb-2009-01-15-non-root-install-fix.patch 
Log Message:
more build fixing

wireless-regdb-2009-01-15-non-root-install-fix.patch:

--- NEW FILE wireless-regdb-2009-01-15-non-root-install-fix.patch ---
diff -up wireless-regdb-2009-01-15/Makefile.orig wireless-regdb-2009-01-15/Makefile
--- wireless-regdb-2009-01-15/Makefile.orig	2009-01-20 15:32:18.000000000 -0500
+++ wireless-regdb-2009-01-15/Makefile	2009-01-20 15:32:27.000000000 -0500
@@ -24,5 +24,5 @@ key.priv.pem:
 	openssl genrsa -out key.priv.pem 2048
 
 install:
-	install -o 0 -g 0 -m 755 -d $(CDRA_PATH)
-	install -o 0 -g 0 -m 644 regulatory.bin $(CDRA_PATH)/regulatory.bin
+	install -m 755 -d $(CDRA_PATH)
+	install -m 644 regulatory.bin $(CDRA_PATH)/regulatory.bin


Index: crda.spec
===================================================================
RCS file: /cvs/pkgs/rpms/crda/devel/crda.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- crda.spec	27 Jan 2009 19:51:00 -0000	1.4
+++ crda.spec	27 Jan 2009 20:01:00 -0000	1.5
@@ -21,6 +21,8 @@
 Source0:        http://wireless.kernel.org/download/crda/crda-%{crda_version}.tar.bz2
 Source1:        http://wireless.kernel.org/download/wireless-regdb/wireless-regdb-%{regdb_version}.tar.bz2
 
+Patch0:         wireless-regdb-2009-01-15-non-root-install-fix.patch
+
 %description
 CRDA acts as the udev helper for communication between the kernel
 and userspace for regulatory compliance. It relies on nl80211
@@ -31,6 +33,8 @@
 %setup -q -c
 %setup -q -T -D -a 1
 
+%patch0 -p0
+
 rm crda-%{crda_version}/pubkeys/*
 
 
@@ -79,6 +83,7 @@
 * Tue Jan 27 2008 John W. Linville <linville at redhat.com> 1.0.1_2009_01_15-3
 - Update for CRDA verion 1.0.1
 - Account for lack of "v" in upstream release tarball naming
+- Add patch to let wireless-regdb install w/o being root
 
 * Thu Jan 22 2008 John W. Linville <linville at redhat.com> v0.9.5_2009_01_15-2
 - Revamp based on package review comments



From dwalsh at fedoraproject.org  Tue Jan 27 20:01:17 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Tue, 27 Jan 2009 20:01:17 +0000 (UTC)
Subject: rpms/libselinux/devel libselinux-rhat.patch, 1.180,
	1.181 libselinux.spec, 1.354, 1.355 sources, 1.181, 1.182
Message-ID: <20090127200117.90DA17010B@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/libselinux/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26477

Modified Files:
	libselinux-rhat.patch libselinux.spec sources 
Log Message:
* Tue Jan 6 2009 Dan Walsh <dwalsh at redhat.com> - 2.0.77-3
- Throw exeptions in python swig bindings on failures


libselinux-rhat.patch:

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.180 -r 1.181 libselinux-rhat.patch
Index: libselinux-rhat.patch
===================================================================
RCS file: /cvs/extras/rpms/libselinux/devel/libselinux-rhat.patch,v
retrieving revision 1.180
retrieving revision 1.181
diff -u -r1.180 -r1.181
--- libselinux-rhat.patch	6 Jan 2009 15:44:49 -0000	1.180
+++ libselinux-rhat.patch	27 Jan 2009 20:00:46 -0000	1.181
@@ -1,7 +1,7 @@
-diff --exclude-from=exclude -N -u -r nsalibselinux/include/selinux/selinux.h libselinux-2.0.76/include/selinux/selinux.h
---- nsalibselinux/include/selinux/selinux.h	2008-08-28 09:34:24.000000000 -0400
-+++ libselinux-2.0.76/include/selinux/selinux.h	2008-12-12 10:06:21.000000000 -0500
-@@ -511,6 +511,14 @@
+diff --exclude-from=exclude -N -u -r nsalibselinux/include/selinux/selinux.h libselinux-2.0.77/include/selinux/selinux.h
+--- nsalibselinux/include/selinux/selinux.h	2009-01-05 17:45:35.000000000 -0500
++++ libselinux-2.0.77/include/selinux/selinux.h	2009-01-27 14:49:41.000000000 -0500
+@@ -520,6 +520,14 @@
     Caller must free the returned strings via free. */
  extern int getseuserbyname(const char *linuxuser, char **seuser, char **level);
  
@@ -16,9 +16,9 @@
  /* Compare two file contexts, return 0 if equivalent. */
  int selinux_file_context_cmp(const security_context_t a,
  			     const security_context_t b);
-diff --exclude-from=exclude -N -u -r nsalibselinux/man/man8/selinuxconlist.8 libselinux-2.0.76/man/man8/selinuxconlist.8
+diff --exclude-from=exclude -N -u -r nsalibselinux/man/man8/selinuxconlist.8 libselinux-2.0.77/man/man8/selinuxconlist.8
 --- nsalibselinux/man/man8/selinuxconlist.8	1969-12-31 19:00:00.000000000 -0500
-+++ libselinux-2.0.76/man/man8/selinuxconlist.8	2008-12-02 09:14:48.000000000 -0500
++++ libselinux-2.0.77/man/man8/selinuxconlist.8	2009-01-27 14:49:41.000000000 -0500
 @@ -0,0 +1,18 @@
 +.TH "selinuxconlist" "1" "7 May 2008" "dwalsh at redhat.com" "SELinux Command Line documentation"
 +.SH "NAME"
@@ -38,9 +38,9 @@
 +
 +.SH "SEE ALSO"
 +secon(8), selinuxdefcon(8)
-diff --exclude-from=exclude -N -u -r nsalibselinux/man/man8/selinuxdefcon.8 libselinux-2.0.76/man/man8/selinuxdefcon.8
+diff --exclude-from=exclude -N -u -r nsalibselinux/man/man8/selinuxdefcon.8 libselinux-2.0.77/man/man8/selinuxdefcon.8
 --- nsalibselinux/man/man8/selinuxdefcon.8	1969-12-31 19:00:00.000000000 -0500
-+++ libselinux-2.0.76/man/man8/selinuxdefcon.8	2008-12-02 09:14:48.000000000 -0500
++++ libselinux-2.0.77/man/man8/selinuxdefcon.8	2009-01-27 14:49:41.000000000 -0500
 @@ -0,0 +1,19 @@
 +.TH "selinuxdefcon" "1" "7 May 2008" "dwalsh at redhat.com" "SELinux Command Line documentation"
 +.SH "NAME"
@@ -61,9 +61,9 @@
 +
 +.SH "SEE ALSO"
 +secon(8), selinuxconlist(8)
-diff --exclude-from=exclude -N -u -r nsalibselinux/src/callbacks.c libselinux-2.0.76/src/callbacks.c
+diff --exclude-from=exclude -N -u -r nsalibselinux/src/callbacks.c libselinux-2.0.77/src/callbacks.c
 --- nsalibselinux/src/callbacks.c	2008-08-28 09:34:24.000000000 -0400
-+++ libselinux-2.0.76/src/callbacks.c	2008-12-02 09:14:48.000000000 -0500
++++ libselinux-2.0.77/src/callbacks.c	2009-01-27 14:49:41.000000000 -0500
 @@ -16,6 +16,7 @@
  {
  	int rc;
@@ -72,9 +72,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.76/src/matchpathcon.c
+diff --exclude-from=exclude -N -u -r nsalibselinux/src/matchpathcon.c libselinux-2.0.77/src/matchpathcon.c
 --- nsalibselinux/src/matchpathcon.c	2008-08-28 09:34:24.000000000 -0400
-+++ libselinux-2.0.76/src/matchpathcon.c	2008-12-02 09:14:48.000000000 -0500
++++ libselinux-2.0.77/src/matchpathcon.c	2009-01-27 14:49:41.000000000 -0500
 @@ -2,6 +2,7 @@
  #include <string.h>
  #include <errno.h>
@@ -92,33 +92,20 @@
  	va_end(ap);
  }
  
-diff --exclude-from=exclude -N -u -r nsalibselinux/src/selinux.py libselinux-2.0.76/src/selinux.py
---- nsalibselinux/src/selinux.py	2008-08-28 09:34:24.000000000 -0400
-+++ libselinux-2.0.76/src/selinux.py	2008-12-12 10:08:01.000000000 -0500
+diff --exclude-from=exclude -N -u -r nsalibselinux/src/selinux.py libselinux-2.0.77/src/selinux.py
+--- nsalibselinux/src/selinux.py	2009-01-13 08:45:35.000000000 -0500
++++ libselinux-2.0.77/src/selinux.py	2009-01-27 14:56:18.000000000 -0500
 @@ -1,5 +1,5 @@
  # This file was automatically generated by SWIG (http://www.swig.org).
--# Version 1.3.33
+-# Version 1.3.35
 +# Version 1.3.36
  #
  # Don't modify this file, modify the SWIG interface instead.
  # This file is compatible with both classic and new-style classes.
-@@ -48,6 +48,29 @@
- del types
+@@ -61,6 +61,15 @@
+                              map(restorecon, [os.path.join(dirname, fname)
+                                               for fname in fnames]), None)
  
- 
-+import shutil, os, stat
-+
-+def restorecon(path, recursive=False):
-+    """ Restore SELinux context on a given path """
-+    mode = os.lstat(path)[stat.ST_MODE]
-+    status, context = matchpathcon(path, mode)
-+    if status == 0:
-+        lsetfilecon(path, context)
-+        if recursive:
-+            os.path.walk(path, lambda arg, dirname, fnames:
-+                             map(restorecon, [os.path.join(dirname, fname)
-+                                              for fname in fnames]), None)
-+
 +def copytree(src, dest):
 +    """ An SELinux-friendly shutil.copytree method """
 +    shutil.copytree(src, dest)
@@ -128,40 +115,432 @@
 +    """ An SELinux-friendly shutil.move method """
 +    shutil.move(src, dest)
 +    restorecon(dest, recursive=True)
-+
+ 
  is_selinux_enabled = _selinux.is_selinux_enabled
  is_selinux_mls_enabled = _selinux.is_selinux_mls_enabled
- getcon = _selinux.getcon
-@@ -297,6 +320,7 @@
+@@ -102,86 +111,9 @@
+ fsetfilecon_raw = _selinux.fsetfilecon_raw
+ getpeercon = _selinux.getpeercon
+ getpeercon_raw = _selinux.getpeercon_raw
+-class av_decision(_object):
+-    __swig_setmethods__ = {}
+-    __setattr__ = lambda self, name, value: _swig_setattr(self, av_decision, name, value)
+-    __swig_getmethods__ = {}
+-    __getattr__ = lambda self, name: _swig_getattr(self, av_decision, name)
+-    __repr__ = _swig_repr
+-    __swig_setmethods__["allowed"] = _selinux.av_decision_allowed_set
+-    __swig_getmethods__["allowed"] = _selinux.av_decision_allowed_get
+-    if _newclass:allowed = _swig_property(_selinux.av_decision_allowed_get, _selinux.av_decision_allowed_set)
+-    __swig_setmethods__["decided"] = _selinux.av_decision_decided_set
+-    __swig_getmethods__["decided"] = _selinux.av_decision_decided_get
+-    if _newclass:decided = _swig_property(_selinux.av_decision_decided_get, _selinux.av_decision_decided_set)
+-    __swig_setmethods__["auditallow"] = _selinux.av_decision_auditallow_set
+-    __swig_getmethods__["auditallow"] = _selinux.av_decision_auditallow_get
+-    if _newclass:auditallow = _swig_property(_selinux.av_decision_auditallow_get, _selinux.av_decision_auditallow_set)
+-    __swig_setmethods__["auditdeny"] = _selinux.av_decision_auditdeny_set
+-    __swig_getmethods__["auditdeny"] = _selinux.av_decision_auditdeny_get
+-    if _newclass:auditdeny = _swig_property(_selinux.av_decision_auditdeny_get, _selinux.av_decision_auditdeny_set)
+-    __swig_setmethods__["seqno"] = _selinux.av_decision_seqno_set
+-    __swig_getmethods__["seqno"] = _selinux.av_decision_seqno_get
+-    if _newclass:seqno = _swig_property(_selinux.av_decision_seqno_get, _selinux.av_decision_seqno_set)
+-    def __init__(self, *args): 
+-        this = _selinux.new_av_decision(*args)
+-        try: self.this.append(this)
+-        except: self.this = this
+-    __swig_destroy__ = _selinux.delete_av_decision
+-    __del__ = lambda self : None;
+-av_decision_swigregister = _selinux.av_decision_swigregister
+-av_decision_swigregister(av_decision)
+-
+-class selinux_opt(_object):
+-    __swig_setmethods__ = {}
+-    __setattr__ = lambda self, name, value: _swig_setattr(self, selinux_opt, name, value)
+-    __swig_getmethods__ = {}
+-    __getattr__ = lambda self, name: _swig_getattr(self, selinux_opt, name)
+-    __repr__ = _swig_repr
+-    __swig_setmethods__["type"] = _selinux.selinux_opt_type_set
+-    __swig_getmethods__["type"] = _selinux.selinux_opt_type_get
+-    if _newclass:type = _swig_property(_selinux.selinux_opt_type_get, _selinux.selinux_opt_type_set)
+-    __swig_setmethods__["value"] = _selinux.selinux_opt_value_set
+-    __swig_getmethods__["value"] = _selinux.selinux_opt_value_get
+-    if _newclass:value = _swig_property(_selinux.selinux_opt_value_get, _selinux.selinux_opt_value_set)
+-    def __init__(self, *args): 
+-        this = _selinux.new_selinux_opt(*args)
+-        try: self.this.append(this)
+-        except: self.this = this
+-    __swig_destroy__ = _selinux.delete_selinux_opt
+-    __del__ = lambda self : None;
+-selinux_opt_swigregister = _selinux.selinux_opt_swigregister
+-selinux_opt_swigregister(selinux_opt)
+-
+-class selinux_callback(_object):
+-    __swig_setmethods__ = {}
+-    __setattr__ = lambda self, name, value: _swig_setattr(self, selinux_callback, name, value)
+-    __swig_getmethods__ = {}
+-    __getattr__ = lambda self, name: _swig_getattr(self, selinux_callback, name)
+-    __repr__ = _swig_repr
+-    __swig_setmethods__["func_log"] = _selinux.selinux_callback_func_log_set
+-    __swig_getmethods__["func_log"] = _selinux.selinux_callback_func_log_get
+-    if _newclass:func_log = _swig_property(_selinux.selinux_callback_func_log_get, _selinux.selinux_callback_func_log_set)
+-    __swig_setmethods__["func_audit"] = _selinux.selinux_callback_func_audit_set
+-    __swig_getmethods__["func_audit"] = _selinux.selinux_callback_func_audit_get
+-    if _newclass:func_audit = _swig_property(_selinux.selinux_callback_func_audit_get, _selinux.selinux_callback_func_audit_set)
+-    __swig_setmethods__["func_validate"] = _selinux.selinux_callback_func_validate_set
+-    __swig_getmethods__["func_validate"] = _selinux.selinux_callback_func_validate_get
+-    if _newclass:func_validate = _swig_property(_selinux.selinux_callback_func_validate_get, _selinux.selinux_callback_func_validate_set)
+-    def __init__(self, *args): 
+-        this = _selinux.new_selinux_callback(*args)
+-        try: self.this.append(this)
+-        except: self.this = this
+-    __swig_destroy__ = _selinux.delete_selinux_callback
+-    __del__ = lambda self : None;
+-selinux_callback_swigregister = _selinux.selinux_callback_swigregister
+-selinux_callback_swigregister(selinux_callback)
+-
+ SELINUX_CB_LOG = _selinux.SELINUX_CB_LOG
+ SELINUX_CB_AUDIT = _selinux.SELINUX_CB_AUDIT
[...11501 lines suppressed...]
+-	 { (char *)"avc_cache_stats_entry_misses_set", _wrap_avc_cache_stats_entry_misses_set, METH_VARARGS, NULL},
+-	 { (char *)"avc_cache_stats_entry_misses_get", _wrap_avc_cache_stats_entry_misses_get, METH_VARARGS, NULL},
+-	 { (char *)"avc_cache_stats_entry_discards_set", _wrap_avc_cache_stats_entry_discards_set, METH_VARARGS, NULL},
+-	 { (char *)"avc_cache_stats_entry_discards_get", _wrap_avc_cache_stats_entry_discards_get, METH_VARARGS, NULL},
+-	 { (char *)"avc_cache_stats_cav_lookups_set", _wrap_avc_cache_stats_cav_lookups_set, METH_VARARGS, NULL},
+-	 { (char *)"avc_cache_stats_cav_lookups_get", _wrap_avc_cache_stats_cav_lookups_get, METH_VARARGS, NULL},
+-	 { (char *)"avc_cache_stats_cav_hits_set", _wrap_avc_cache_stats_cav_hits_set, METH_VARARGS, NULL},
+-	 { (char *)"avc_cache_stats_cav_hits_get", _wrap_avc_cache_stats_cav_hits_get, METH_VARARGS, NULL},
+-	 { (char *)"avc_cache_stats_cav_probes_set", _wrap_avc_cache_stats_cav_probes_set, METH_VARARGS, NULL},
+-	 { (char *)"avc_cache_stats_cav_probes_get", _wrap_avc_cache_stats_cav_probes_get, METH_VARARGS, NULL},
+-	 { (char *)"avc_cache_stats_cav_misses_set", _wrap_avc_cache_stats_cav_misses_set, METH_VARARGS, NULL},
+-	 { (char *)"avc_cache_stats_cav_misses_get", _wrap_avc_cache_stats_cav_misses_get, METH_VARARGS, NULL},
+-	 { (char *)"new_avc_cache_stats", _wrap_new_avc_cache_stats, METH_VARARGS, NULL},
+-	 { (char *)"delete_avc_cache_stats", _wrap_delete_avc_cache_stats, METH_VARARGS, NULL},
+-	 { (char *)"avc_cache_stats_swigregister", avc_cache_stats_swigregister, METH_VARARGS, NULL},
+-	 { (char *)"avc_av_stats", _wrap_avc_av_stats, METH_VARARGS, NULL},
+-	 { (char *)"avc_sid_stats", _wrap_avc_sid_stats, METH_VARARGS, NULL},
+ 	 { (char *)"selinux_default_type_path", _wrap_selinux_default_type_path, METH_VARARGS, NULL},
+ 	 { (char *)"get_default_type", _wrap_get_default_type, METH_VARARGS, NULL},
+ 	 { (char *)"get_ordered_context_list", _wrap_get_ordered_context_list, METH_VARARGS, NULL},
+@@ -10389,64 +8455,38 @@
+ /* -------- TYPE CONVERSION AND EQUIVALENCE RULES (BEGIN) -------- */
+ 
+ static swig_type_info _swigt__p_SELboolean = {"_p_SELboolean", "SELboolean *", 0, 0, (void*)0, 0};
+-static swig_type_info _swigt__p_av_decision = {"_p_av_decision", "struct av_decision *|av_decision *", 0, 0, (void*)0, 0};
+-static swig_type_info _swigt__p_avc_cache_stats = {"_p_avc_cache_stats", "struct avc_cache_stats *|avc_cache_stats *", 0, 0, (void*)0, 0};
+-static swig_type_info _swigt__p_avc_entry = {"_p_avc_entry", "struct avc_entry *", 0, 0, (void*)0, 0};
+-static swig_type_info _swigt__p_avc_entry_ref = {"_p_avc_entry_ref", "struct avc_entry_ref *|avc_entry_ref *", 0, 0, (void*)0, 0};
+-static swig_type_info _swigt__p_avc_lock_callback = {"_p_avc_lock_callback", "struct avc_lock_callback *|avc_lock_callback *", 0, 0, (void*)0, 0};
+-static swig_type_info _swigt__p_avc_log_callback = {"_p_avc_log_callback", "struct avc_log_callback *|avc_log_callback *", 0, 0, (void*)0, 0};
+-static swig_type_info _swigt__p_avc_memory_callback = {"_p_avc_memory_callback", "struct avc_memory_callback *|avc_memory_callback *", 0, 0, (void*)0, 0};
+-static swig_type_info _swigt__p_avc_thread_callback = {"_p_avc_thread_callback", "struct avc_thread_callback *|avc_thread_callback *", 0, 0, (void*)0, 0};
++static swig_type_info _swigt__p_av_decision = {"_p_av_decision", "struct av_decision *", 0, 0, (void*)0, 0};
++static swig_type_info _swigt__p_avc_entry_ref = {"_p_avc_entry_ref", "struct avc_entry_ref *", 0, 0, (void*)0, 0};
++static swig_type_info _swigt__p_avc_lock_callback = {"_p_avc_lock_callback", "struct avc_lock_callback *", 0, 0, (void*)0, 0};
++static swig_type_info _swigt__p_avc_log_callback = {"_p_avc_log_callback", "struct avc_log_callback *", 0, 0, (void*)0, 0};
++static swig_type_info _swigt__p_avc_memory_callback = {"_p_avc_memory_callback", "struct avc_memory_callback *", 0, 0, (void*)0, 0};
++static swig_type_info _swigt__p_avc_thread_callback = {"_p_avc_thread_callback", "struct avc_thread_callback *", 0, 0, (void*)0, 0};
+ static swig_type_info _swigt__p_char = {"_p_char", "char *", 0, 0, (void*)0, 0};
+-static swig_type_info _swigt__p_f_int_p_q_const__char_v_______int = {"_p_f_int_p_q_const__char_v_______int", "int (*)(int,char const *,...)", 0, 0, (void*)0, 0};
+-static swig_type_info _swigt__p_f_p_f_void__void__p_void = {"_p_f_p_f_void__void__p_void", "void *(*)(void (*)(void))", 0, 0, (void*)0, 0};
+-static swig_type_info _swigt__p_f_p_p_char__int = {"_p_f_p_p_char__int", "int (*)(char **)|int (*)(security_context_t *)", 0, 0, (void*)0, 0};
+-static swig_type_info _swigt__p_f_p_q_const__char_v_______void = {"_p_f_p_q_const__char_v_______void", "void (*)(char const *,...)", 0, 0, (void*)0, 0};
+-static swig_type_info _swigt__p_f_p_void__void = {"_p_f_p_void__void", "void (*)(void *)", 0, 0, (void*)0, 0};
+-static swig_type_info _swigt__p_f_p_void_unsigned_short_p_char_size_t__int = {"_p_f_p_void_unsigned_short_p_char_size_t__int", "int (*)(void *,unsigned short,char *,size_t)|int (*)(void *,security_class_t,char *,size_t)", 0, 0, (void*)0, 0};
+-static swig_type_info _swigt__p_f_p_void_unsigned_short_p_char_size_t__void = {"_p_f_p_void_unsigned_short_p_char_size_t__void", "void (*)(void *,unsigned short,char *,size_t)|void (*)(void *,security_class_t,char *,size_t)", 0, 0, (void*)0, 0};
+-static swig_type_info _swigt__p_f_size_t__p_void = {"_p_f_size_t__p_void", "void *(*)(size_t)", 0, 0, (void*)0, 0};
+-static swig_type_info _swigt__p_f_void__p_void = {"_p_f_void__p_void", "void *(*)(void)", 0, 0, (void*)0, 0};
+ static swig_type_info _swigt__p_ino_t = {"_p_ino_t", "ino_t *", 0, 0, (void*)0, 0};
+ static swig_type_info _swigt__p_int = {"_p_int", "int *", 0, 0, (void*)0, 0};
+ static swig_type_info _swigt__p_p_char = {"_p_p_char", "char **|security_context_t *", 0, 0, (void*)0, 0};
+ static swig_type_info _swigt__p_p_p_char = {"_p_p_p_char", "char ***|security_context_t **", 0, 0, (void*)0, 0};
+ static swig_type_info _swigt__p_p_security_id = {"_p_p_security_id", "struct security_id **|security_id_t *", 0, 0, (void*)0, 0};
+-static swig_type_info _swigt__p_security_class_mapping = {"_p_security_class_mapping", "struct security_class_mapping *|security_class_mapping *", 0, 0, (void*)0, 0};
+-static swig_type_info _swigt__p_security_id = {"_p_security_id", "security_id_t|struct security_id *|security_id *", 0, 0, (void*)0, 0};
+-static swig_type_info _swigt__p_selinux_callback = {"_p_selinux_callback", "union selinux_callback *|selinux_callback *", 0, 0, (void*)0, 0};
+-static swig_type_info _swigt__p_selinux_opt = {"_p_selinux_opt", "struct selinux_opt *|selinux_opt *", 0, 0, (void*)0, 0};
++static swig_type_info _swigt__p_security_id = {"_p_security_id", "security_id_t|struct security_id *", 0, 0, (void*)0, 0};
++static swig_type_info _swigt__p_selinux_opt = {"_p_selinux_opt", "struct selinux_opt *", 0, 0, (void*)0, 0};
+ static swig_type_info _swigt__p_unsigned_int = {"_p_unsigned_int", "unsigned int *|access_vector_t *|mode_t *|pid_t *", 0, 0, (void*)0, 0};
+ static swig_type_info _swigt__p_unsigned_short = {"_p_unsigned_short", "security_class_t *|unsigned short *", 0, 0, (void*)0, 0};
+ 
+ static swig_type_info *swig_type_initial[] = {
+   &_swigt__p_SELboolean,
+   &_swigt__p_av_decision,
+-  &_swigt__p_avc_cache_stats,
+-  &_swigt__p_avc_entry,
+   &_swigt__p_avc_entry_ref,
+   &_swigt__p_avc_lock_callback,
+   &_swigt__p_avc_log_callback,
+   &_swigt__p_avc_memory_callback,
+   &_swigt__p_avc_thread_callback,
+   &_swigt__p_char,
+-  &_swigt__p_f_int_p_q_const__char_v_______int,
+-  &_swigt__p_f_p_f_void__void__p_void,
+-  &_swigt__p_f_p_p_char__int,
+-  &_swigt__p_f_p_q_const__char_v_______void,
+-  &_swigt__p_f_p_void__void,
+-  &_swigt__p_f_p_void_unsigned_short_p_char_size_t__int,
+-  &_swigt__p_f_p_void_unsigned_short_p_char_size_t__void,
+-  &_swigt__p_f_size_t__p_void,
+-  &_swigt__p_f_void__p_void,
+   &_swigt__p_ino_t,
+   &_swigt__p_int,
+   &_swigt__p_p_char,
+   &_swigt__p_p_p_char,
+   &_swigt__p_p_security_id,
+-  &_swigt__p_security_class_mapping,
+   &_swigt__p_security_id,
+-  &_swigt__p_selinux_callback,
+   &_swigt__p_selinux_opt,
+   &_swigt__p_unsigned_int,
+   &_swigt__p_unsigned_short,
+@@ -10454,31 +8494,18 @@
+ 
+ static swig_cast_info _swigc__p_SELboolean[] = {  {&_swigt__p_SELboolean, 0, 0, 0},{0, 0, 0, 0}};
+ static swig_cast_info _swigc__p_av_decision[] = {  {&_swigt__p_av_decision, 0, 0, 0},{0, 0, 0, 0}};
+-static swig_cast_info _swigc__p_avc_cache_stats[] = {  {&_swigt__p_avc_cache_stats, 0, 0, 0},{0, 0, 0, 0}};
+-static swig_cast_info _swigc__p_avc_entry[] = {  {&_swigt__p_avc_entry, 0, 0, 0},{0, 0, 0, 0}};
+ static swig_cast_info _swigc__p_avc_entry_ref[] = {  {&_swigt__p_avc_entry_ref, 0, 0, 0},{0, 0, 0, 0}};
+ static swig_cast_info _swigc__p_avc_lock_callback[] = {  {&_swigt__p_avc_lock_callback, 0, 0, 0},{0, 0, 0, 0}};
+ static swig_cast_info _swigc__p_avc_log_callback[] = {  {&_swigt__p_avc_log_callback, 0, 0, 0},{0, 0, 0, 0}};
+ static swig_cast_info _swigc__p_avc_memory_callback[] = {  {&_swigt__p_avc_memory_callback, 0, 0, 0},{0, 0, 0, 0}};
+ static swig_cast_info _swigc__p_avc_thread_callback[] = {  {&_swigt__p_avc_thread_callback, 0, 0, 0},{0, 0, 0, 0}};
+ static swig_cast_info _swigc__p_char[] = {  {&_swigt__p_char, 0, 0, 0},{0, 0, 0, 0}};
+-static swig_cast_info _swigc__p_f_int_p_q_const__char_v_______int[] = {  {&_swigt__p_f_int_p_q_const__char_v_______int, 0, 0, 0},{0, 0, 0, 0}};
+-static swig_cast_info _swigc__p_f_p_f_void__void__p_void[] = {  {&_swigt__p_f_p_f_void__void__p_void, 0, 0, 0},{0, 0, 0, 0}};
+-static swig_cast_info _swigc__p_f_p_p_char__int[] = {  {&_swigt__p_f_p_p_char__int, 0, 0, 0},{0, 0, 0, 0}};
+-static swig_cast_info _swigc__p_f_p_q_const__char_v_______void[] = {  {&_swigt__p_f_p_q_const__char_v_______void, 0, 0, 0},{0, 0, 0, 0}};
+-static swig_cast_info _swigc__p_f_p_void__void[] = {  {&_swigt__p_f_p_void__void, 0, 0, 0},{0, 0, 0, 0}};
+-static swig_cast_info _swigc__p_f_p_void_unsigned_short_p_char_size_t__int[] = {  {&_swigt__p_f_p_void_unsigned_short_p_char_size_t__int, 0, 0, 0},{0, 0, 0, 0}};
+-static swig_cast_info _swigc__p_f_p_void_unsigned_short_p_char_size_t__void[] = {  {&_swigt__p_f_p_void_unsigned_short_p_char_size_t__void, 0, 0, 0},{0, 0, 0, 0}};
+-static swig_cast_info _swigc__p_f_size_t__p_void[] = {  {&_swigt__p_f_size_t__p_void, 0, 0, 0},{0, 0, 0, 0}};
+-static swig_cast_info _swigc__p_f_void__p_void[] = {  {&_swigt__p_f_void__p_void, 0, 0, 0},{0, 0, 0, 0}};
+ static swig_cast_info _swigc__p_ino_t[] = {  {&_swigt__p_ino_t, 0, 0, 0},{0, 0, 0, 0}};
+ static swig_cast_info _swigc__p_int[] = {  {&_swigt__p_int, 0, 0, 0},{0, 0, 0, 0}};
+ static swig_cast_info _swigc__p_p_char[] = {  {&_swigt__p_p_char, 0, 0, 0},{0, 0, 0, 0}};
+ static swig_cast_info _swigc__p_p_p_char[] = {  {&_swigt__p_p_p_char, 0, 0, 0},{0, 0, 0, 0}};
+ static swig_cast_info _swigc__p_p_security_id[] = {  {&_swigt__p_p_security_id, 0, 0, 0},{0, 0, 0, 0}};
+-static swig_cast_info _swigc__p_security_class_mapping[] = {  {&_swigt__p_security_class_mapping, 0, 0, 0},{0, 0, 0, 0}};
+ static swig_cast_info _swigc__p_security_id[] = {  {&_swigt__p_security_id, 0, 0, 0},{0, 0, 0, 0}};
+-static swig_cast_info _swigc__p_selinux_callback[] = {  {&_swigt__p_selinux_callback, 0, 0, 0},{0, 0, 0, 0}};
+ static swig_cast_info _swigc__p_selinux_opt[] = {  {&_swigt__p_selinux_opt, 0, 0, 0},{0, 0, 0, 0}};
+ static swig_cast_info _swigc__p_unsigned_int[] = {  {&_swigt__p_unsigned_int, 0, 0, 0},{0, 0, 0, 0}};
+ static swig_cast_info _swigc__p_unsigned_short[] = {  {&_swigt__p_unsigned_short, 0, 0, 0},{0, 0, 0, 0}};
+@@ -10486,31 +8513,18 @@
+ static swig_cast_info *swig_cast_initial[] = {
+   _swigc__p_SELboolean,
+   _swigc__p_av_decision,
+-  _swigc__p_avc_cache_stats,
+-  _swigc__p_avc_entry,
+   _swigc__p_avc_entry_ref,
+   _swigc__p_avc_lock_callback,
+   _swigc__p_avc_log_callback,
+   _swigc__p_avc_memory_callback,
+   _swigc__p_avc_thread_callback,
+   _swigc__p_char,
+-  _swigc__p_f_int_p_q_const__char_v_______int,
+-  _swigc__p_f_p_f_void__void__p_void,
+-  _swigc__p_f_p_p_char__int,
+-  _swigc__p_f_p_q_const__char_v_______void,
+-  _swigc__p_f_p_void__void,
+-  _swigc__p_f_p_void_unsigned_short_p_char_size_t__int,
+-  _swigc__p_f_p_void_unsigned_short_p_char_size_t__void,
+-  _swigc__p_f_size_t__p_void,
+-  _swigc__p_f_void__p_void,
+   _swigc__p_ino_t,
+   _swigc__p_int,
+   _swigc__p_p_char,
+   _swigc__p_p_p_char,
+   _swigc__p_p_security_id,
+-  _swigc__p_security_class_mapping,
+   _swigc__p_security_id,
+-  _swigc__p_selinux_callback,
+   _swigc__p_selinux_opt,
+   _swigc__p_unsigned_int,
+   _swigc__p_unsigned_short,
+diff --exclude-from=exclude -N -u -r nsalibselinux/src/seusers.c libselinux-2.0.77/src/seusers.c
 --- nsalibselinux/src/seusers.c	2008-08-28 09:34:24.000000000 -0400
-+++ libselinux-2.0.76/src/seusers.c	2008-12-16 09:36:39.000000000 -0500
++++ libselinux-2.0.77/src/seusers.c	2009-01-27 14:49:41.000000000 -0500
 @@ -243,3 +243,67 @@
  	*r_level = NULL;
  	return 0;
@@ -3030,9 +10300,9 @@
 +
 +	return (ret ? getseuserbyname(username, r_seuser, r_level) : ret);
 +}
-diff --exclude-from=exclude -N -u -r nsalibselinux/utils/getdefaultcon.c libselinux-2.0.76/utils/getdefaultcon.c
+diff --exclude-from=exclude -N -u -r nsalibselinux/utils/getdefaultcon.c libselinux-2.0.77/utils/getdefaultcon.c
 --- nsalibselinux/utils/getdefaultcon.c	2008-08-28 09:34:24.000000000 -0400
-+++ libselinux-2.0.76/utils/getdefaultcon.c	2008-12-02 09:33:14.000000000 -0500
++++ libselinux-2.0.77/utils/getdefaultcon.c	2009-01-27 14:49:41.000000000 -0500
 @@ -22,8 +22,9 @@
  	security_context_t usercon = NULL, cur_context = NULL;
  	char *user = NULL, *level = NULL, *role=NULL, *seuser=NULL, *dlevel=NULL;
@@ -3078,9 +10348,9 @@
 -	return 0;
 +	return ret >= 0;
  }
-diff --exclude-from=exclude -N -u -r nsalibselinux/utils/Makefile libselinux-2.0.76/utils/Makefile
+diff --exclude-from=exclude -N -u -r nsalibselinux/utils/Makefile libselinux-2.0.77/utils/Makefile
 --- nsalibselinux/utils/Makefile	2008-08-28 09:34:24.000000000 -0400
-+++ libselinux-2.0.76/utils/Makefile	2008-12-19 15:55:54.000000000 -0500
++++ libselinux-2.0.77/utils/Makefile	2009-01-27 14:49:41.000000000 -0500
 @@ -2,28 +2,33 @@
  PREFIX ?= $(DESTDIR)/usr
  LIBDIR ?= $(PREFIX)/lib
@@ -3119,9 +10389,9 @@
  
  indent:
  	../../scripts/Lindent $(wildcard *.[ch])
-diff --exclude-from=exclude -N -u -r nsalibselinux/utils/matchpathcon.c libselinux-2.0.76/utils/matchpathcon.c
+diff --exclude-from=exclude -N -u -r nsalibselinux/utils/matchpathcon.c libselinux-2.0.77/utils/matchpathcon.c
 --- nsalibselinux/utils/matchpathcon.c	2008-10-28 10:06:51.000000000 -0400
-+++ libselinux-2.0.76/utils/matchpathcon.c	2008-12-19 15:14:20.000000000 -0500
++++ libselinux-2.0.77/utils/matchpathcon.c	2009-01-27 14:49:41.000000000 -0500
 @@ -101,6 +101,11 @@
  	for (i = optind; i < argc; i++) {
  		int mode = 0;


Index: libselinux.spec
===================================================================
RCS file: /cvs/extras/rpms/libselinux/devel/libselinux.spec,v
retrieving revision 1.354
retrieving revision 1.355
diff -u -r1.354 -r1.355
--- libselinux.spec	6 Jan 2009 15:44:49 -0000	1.354
+++ libselinux.spec	27 Jan 2009 20:00:46 -0000	1.355
@@ -5,7 +5,7 @@
 Summary: SELinux library and simple utilities
 Name: libselinux
 Version: 2.0.77
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: Public Domain
 Group: System Environment/Libraries
 Source: http://www.nsa.gov/selinux/archives/%{name}-%{version}.tgz
@@ -164,6 +164,9 @@
 %{ruby_sitearch}/selinux.so
 
 %changelog
+* Tue Jan 6 2009 Dan Walsh <dwalsh at redhat.com> - 2.0.77-3
+- Throw exeptions in python swig bindings on failures
+
 * Tue Jan 6 2009 Dan Walsh <dwalsh at redhat.com> - 2.0.77-2
 - Fix restorecon python code
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libselinux/devel/sources,v
retrieving revision 1.181
retrieving revision 1.182
diff -u -r1.181 -r1.182
--- sources	6 Jan 2009 14:31:47 -0000	1.181
+++ sources	27 Jan 2009 20:00:47 -0000	1.182
@@ -1 +1 @@
-f0660b8d415b25e39d20f31717d48f2c  libselinux-2.0.77.tgz
+d6c274a09a741d28ba30e5a0dc89839b  libselinux-2.0.77.tgz



From linville at fedoraproject.org  Tue Jan 27 20:06:04 2009
From: linville at fedoraproject.org (John W. Linville)
Date: Tue, 27 Jan 2009 20:06:04 +0000 (UTC)
Subject: rpms/crda/devel crda.spec,1.5,1.6
Message-ID: <20090127200604.1165C7010B@cvs1.fedora.phx.redhat.com>

Author: linville

Update of /cvs/pkgs/rpms/crda/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27258

Modified Files:
	crda.spec 
Log Message:
one more build fixup


Index: crda.spec
===================================================================
RCS file: /cvs/pkgs/rpms/crda/devel/crda.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- crda.spec	27 Jan 2009 20:01:00 -0000	1.5
+++ crda.spec	27 Jan 2009 20:05:33 -0000	1.6
@@ -74,7 +74,7 @@
 %defattr(-,root,root,-)
 /sbin/%{name}
 /sbin/regdbdump
-/lib/udev/rules.d/10-regulatory.rules
+/lib/udev/rules.d/85-regulatory.rules
 /usr/lib/%{name}
 %doc crda-%{crda_version}/LICENSE crda-%{crda_version}/README.crda
 %doc wireless-regdb-%{regdb_version}/README.wireless-regdb



From kaitlin at fedoraproject.org  Tue Jan 27 20:07:09 2009
From: kaitlin at fedoraproject.org (Kaitlin Rupert)
Date: Tue, 27 Jan 2009 20:07:09 +0000 (UTC)
Subject: rpms/libvirt-cim/devel emu_1_sdc.patch, NONE,
	1.1 host_enum_sys.patch, 
	NONE, 1.1 .cvsignore, 1.10, 1.11 libvirt-cim.spec, 1.22,
	1.23 sources, 1.12, 1.13
Message-ID: <20090127200709.BCAF17010B@cvs1.fedora.phx.redhat.com>

Author: kaitlin

Update of /cvs/pkgs/rpms/libvirt-cim/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27384

Modified Files:
	.cvsignore libvirt-cim.spec sources 
Added Files:
	emu_1_sdc.patch host_enum_sys.patch 
Log Message:
Add patch files, update spec to include patches, also update source tarball.



emu_1_sdc.patch:

--- NEW FILE emu_1_sdc.patch ---
# HG changeset patch
# User Kaitlin Rupert <karupert at us.ibm.com>
# Date 1232129948 28800
# Node ID c87e67c92f7ceaf556e8be90547de324026f315b
# Parent  13150c7e28270567aad061e9ad521b0e8dd44ef6
Add support for EmulatedType 1 to SDC.

Also fix a bug with the if statement in set_disk_props() and a spacing bug.

Signed-off-by: Kaitlin Rupert <karupert at us.ibm.com>

diff -r 13150c7e2827 -r c87e67c92f7c src/Virt_SettingsDefineCapabilities.c
--- a/src/Virt_SettingsDefineCapabilities.c	Thu Jan 22 11:29:29 2009 -0800
+++ b/src/Virt_SettingsDefineCapabilities.c	Fri Jan 16 10:19:08 2009 -0800
@@ -611,13 +611,13 @@
                                  const CMPIObjectPath *ref,
                                  const char *id,
                                  uint64_t disk_size,
+                                 uint16_t emu_type,
                                  struct inst_list *list)
 {
         const char *addr;
         const char *dev;
         CMPIInstance *inst;
         CMPIStatus s = {CMPI_RC_OK, NULL};
-        uint16_t emu_type = 0;
 
         if (type == DOMAIN_LXC) {
                 addr = "/tmp";
@@ -646,7 +646,7 @@
                         dev = "xvda";
                         CMSetProperty(inst, "Caption",
                                       (CMPIValue *)"PV disk", CMPI_chars);
-                } else if (type, DOMAIN_XENFV) {
+                } else if (type == DOMAIN_XENFV) {
                         CMSetProperty(inst, "Caption",
                                       (CMPIValue *)"FV disk", CMPI_chars);
                 }
@@ -671,6 +671,7 @@
         char *pfx;
         const char *id;
         uint64_t disk_size;
+        uint16_t emu_type = 0;
         CMPIStatus s = {CMPI_RC_OK, NULL};
 
         switch(template_type) {
@@ -702,16 +703,54 @@
         pfx = class_prefix_name(CLASSNAME(ref));
 
         if (STREQ(pfx, "Xen")) {
-                s = set_disk_props(DOMAIN_XENPV, ref, id, disk_size, list); 
-                
+                int xen_type[2] = {DOMAIN_XENFV, DOMAIN_XENPV};
+                int i = 0;
+ 
+                for (; i < 2; i++) {
+                        emu_type = 0;
+                        s = set_disk_props(xen_type[i],
+                                           ref, 
+                                           id, 
+                                           disk_size, 
+                                           emu_type, 
+                                           list); 
+                        if (s.rc != CMPI_RC_OK)
+                                goto out;
+
+                        emu_type = 1;
+                        s = set_disk_props(xen_type[i],
+                                           ref, 
+                                           id, 
+                                           disk_size, 
+                                           emu_type, 
+                                           list); 
+                        if (s.rc != CMPI_RC_OK)
+                                goto out;
+                }
+        } else if (STREQ(pfx, "KVM")) {
+                s = set_disk_props(DOMAIN_KVM,
+                                   ref, 
+                                   id, 
+                                   disk_size, 
+                                   emu_type, 
+                                   list); 
                 if (s.rc != CMPI_RC_OK)
-                       goto out;
+                        goto out;
 
-                s = set_disk_props(DOMAIN_XENFV, ref, id, disk_size, list); 
-        } else if (STREQ(pfx, "KVM")) {
-                s = set_disk_props(DOMAIN_KVM, ref, id, disk_size, list); 
+                emu_type = 1; 
+                s = set_disk_props(DOMAIN_KVM,
+                                   ref, 
+                                   id, 
+                                   disk_size, 
+                                   emu_type, 
+                                   list); 
         } else if (STREQ(pfx, "LXC")) {
-                s = set_disk_props(DOMAIN_LXC, ref, id, disk_size, list); 
+                s = set_disk_props(DOMAIN_LXC,
+                                   ref, 
+                                   id, 
+                                   disk_size, 
+                                   emu_type, 
+                                   list); 
         } else {
                 cu_statusf(_BROKER, &s, 
                             CMPI_RC_ERR_FAILED,

host_enum_sys.patch:

--- NEW FILE host_enum_sys.patch ---
# HG changeset patch
# User Kaitlin Rupert <karupert at us.ibm.com>
# Date 1232562000 28800
# Node ID 189cc68a2f5a3251be1204bdaddfd90bb8740789
# Parent  eb2df7761596b0fdb38c02aa741c00592e8ddf08
Replace CBGetInstance() with CBEnumInstances() in Virt_HostSystem

This is a work around to deal with the way the SBLIM provider determines the
FQDN of a host system.  The value the SBLIM provider returns can depend on
how the /etc/hosts file is formatted, as well as other factors (running
dnsdomainname caused the provider to print two different values on my system).

Signed-off-by: Kaitlin Rupert <karupert at us.ibm.com>

diff -r eb2df7761596 -r 189cc68a2f5a src/Virt_HostSystem.c
--- a/src/Virt_HostSystem.c	Fri Jan 23 11:48:46 2009 -0800
+++ b/src/Virt_HostSystem.c	Wed Jan 21 10:20:00 2009 -0800
@@ -144,16 +144,10 @@
                              CMPIInstance **inst)
 {
         CMPIObjectPath *path;
+        CMPIEnumeration *en  = NULL;
+        CMPIData data;
         CMPIStatus s;
         const char *cn = "Linux_ComputerSystem";
-        char name[256];
-
-        if (get_fqdn(name, sizeof(name)) != 0) {
-                cu_statusf(broker, &s,
-                           CMPI_RC_ERR_FAILED,
-                           "Unable to get hostname: %m");
-                return s;
-        }
 
         path = CMNewObjectPath(broker, "root/cimv2", cn, &s);
         if ((path == NULL) || (s.rc != CMPI_RC_OK)) {
@@ -163,11 +157,33 @@
                 return s;
         }
 
-        CMAddKey(path, "CreationClassName", cn, CMPI_chars);
-        CMAddKey(path, "Name", name, CMPI_chars);
+        /* FIXME:  This approach may return the wrong instance if more than
+           one SBLIM Linux_ComputerSystem instance exists on the system.
+           This isn't likely to happen in most cases, but a better approach 
+           should be used here.
+         */
+        en = CBEnumInstances(broker, context, path, NULL, &s);
+        if (en == NULL) {
+                cu_statusf(broker, &s,
+                           CMPI_RC_ERR_FAILED,
+                           "Upcall EnumInstances of %s class failed",
+                           cn);
+                goto out;
+        }
 
-        *inst = CBGetInstance(broker, context, path, NULL, &s);
+        if (CMHasNext(en, &s)) {
+                data = CMGetNext(en, &s);
+                if (CMIsNullObject(data.value.inst)) {
+                        cu_statusf(broker, &s,
+                                   CMPI_RC_ERR_FAILED,
+                                   "Failed to retrieve enumeration entry");
+                        goto out;
+                }
 
+                *inst = data.value.inst;
+        }
+
+ out:
         if (s.rc != CMPI_RC_OK) {
                 CU_DEBUG("SBLIM: %i %s", s.rc, CMGetCharPtr(s.msg));
         } else {


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt-cim/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	15 Jan 2009 21:36:46 -0000	1.10
+++ .cvsignore	27 Jan 2009 20:06:39 -0000	1.11
@@ -1,7 +1 @@
-libvirt-cim-0.3.tar.gz
-kvm_method.patch
-registeredprofile.patch
-libvirt-cim-0.5.tar.gz
-libvirt-cim-0.5.1.tar.gz
-libvirt-cim-0.5.2.tar.gz
 libvirt-cim-0.5.3.tar.gz


Index: libvirt-cim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt-cim/devel/libvirt-cim.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- libvirt-cim.spec	15 Jan 2009 21:36:46 -0000	1.22
+++ libvirt-cim.spec	27 Jan 2009 20:06:39 -0000	1.23
@@ -3,13 +3,14 @@
 Summary: A CIM provider for libvirt
 Name: libvirt-cim
 Version: 0.5.3
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: LGPLv2+
 Group: Development/Libraries
 Source: libvirt-cim-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 URL: http://libvirt.org/CIM/
 Requires: unzip
+Requires: tog-pegasus 
 BuildRequires: libcmpiutil >= 0.4
 BuildRequires: tog-pegasus-devel
 BuildRequires: libvirt-devel >= 0.3.2
@@ -17,6 +18,8 @@
 BuildRequires: libxml2-devel
 BuildRequires: libcmpiutil-devel
 BuildConflicts: sblim-cmpi-devel
+Patch0: emu_1_sdc.patch
+Patch1: host_enum_sys.patch 
 
 %description
 Libvirt-cim is a CMPI CIM provider that implements the DMTF SVPC
@@ -28,6 +31,8 @@
 %setup -q
 chmod -f -x src/* libxkutil/* schema/* README doc/* #base_schema/README*
 chmod +X src/* libxkutil/* schema/*
+%patch0 -p1
+%patch1 -p1
 
 %build
 %configure --disable-werror
@@ -57,7 +62,10 @@
 %define SCHEMA %{_datadir}/%{name}/*.mof
 
 %define INTEROP_REG %{_datadir}/%{name}/{RegisteredProfile,ElementConformsToProfile,ReferencedProfile}.registration
-%define INTEROP_MOF %{_datadir}/%{name}/{ComputerSystem,HostSystem,RegisteredProfile,ElementConformsToProfile,ReferencedProfile}.mof
+%define INTEROP_MOF %{_datadir}/%{name}/{ComputerSystem,HostSystem,RegisteredProfile,DiskPool,MemoryPool,NetPool,ProcessorPool,VSMigrationService,ElementConformsToProfile,ReferencedProfile}.mof
+
+%define CIMV2_REG %{_datadir}/%{name}/{HostedResourcePool,ElementCapabilities,HostedService,HostedDependency,ElementConformsToProfile,HostedAccessPoint}.registration
+%define CIMV2_MOF %{_datadir}/%{name}/{HostedResourcePool,ElementCapabilities,HostedService,HostedDependency,RegisteredProfile,ComputerSystem,ElementConformsToProfile,HostedAccessPoint}.mof
 
 # _If_ there is already a version of this installed, we must deregister
 # the classes we plan to install in post, otherwise we may corrupt
@@ -82,6 +90,9 @@
 %{_datadir}/%{name}/provider-register.sh -t pegasus \
 	-n root/interop \
 	-r %{INTEROP_REG} -m %{INTEROP_MOF} -v >/dev/null 2>&1 || true
+%{_datadir}/%{name}/provider-register.sh -t pegasus \
+	-n root/cimv2\
+	-r %{CIMV2_REG} -m %{CIMV2_MOF} -v >/dev/null 2>&1 || true
 
 %preun
 %{_datadir}/%{name}/provider-register.sh -d -t pegasus \
@@ -103,12 +114,19 @@
 %{_datadir}/libvirt-cim/*.sh
 %{_datadir}/libvirt-cim/*.mof
 %{_datadir}/libvirt-cim/cimv*-interop_mof
+%{_datadir}/libvirt-cim/cimv*-cimv2_mof
 %{_datadir}/libvirt-cim/*.registration
 %{_datadir}/libvirt-cim/fix_schema.patch
 %{_datadir}/libvirt-cim/cimv*-MOFs.zip
 /etc/ld.so.conf.d/libvirt-cim.conf
 
 %changelog
+* Tue Jan 27 2009 Kaitlin Rupert <kaitlin at us.ibm.com> - 0.5.3-2
+- Added Requires tag to ensure tog-pegasus dependency
+- Fixed root/cimv2 ns registration in spec 
+- Added emu_1_sdc.patch to expose template DiskRASDs with EmulatedType = 1
+- Added host_enum_sys.patch to use CBEnumInst() to check for SBLIM inst 
+
 * Thu Jan 15 2009 Kaitlin Rupert <kaitlin at us.ibm.com> - 0.5.3-1
 - Updated to latest upstream source
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt-cim/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	15 Jan 2009 21:36:46 -0000	1.12
+++ sources	27 Jan 2009 20:06:39 -0000	1.13
@@ -1,7 +1 @@
-528908c9daf98c077f90b7df6fdf1c0a  libvirt-cim-0.3.tar.gz
-36bbef64cba0015daf6eb34d054a2751  kvm_method.patch
-4dc7a3c5b5ed780eb57524f945fc5f5a  registeredprofile.patch
-2dbe3753cc661baaf43c7b462bda4d01  libvirt-cim-0.5.tar.gz
-24dd6b86a9e9b060107694d7ac982c77  libvirt-cim-0.5.1.tar.gz
-f0d8962114b77e380c35af0f21a86f3f  libvirt-cim-0.5.2.tar.gz
-a60d1516af3105cf4bb60ee1f7ccc4ad  libvirt-cim-0.5.3.tar.gz
+69ad4eb18622482e6cd99c4c20ed01b0  libvirt-cim-0.5.3.tar.gz



From linville at fedoraproject.org  Tue Jan 27 20:11:29 2009
From: linville at fedoraproject.org (John W. Linville)
Date: Tue, 27 Jan 2009 20:11:29 +0000 (UTC)
Subject: rpms/crda/devel crda.spec,1.6,1.7
Message-ID: <20090127201129.72C947010B@cvs1.fedora.phx.redhat.com>

Author: linville

Update of /cvs/pkgs/rpms/crda/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28021

Modified Files:
	crda.spec 
Log Message:
add extra files from install


Index: crda.spec
===================================================================
RCS file: /cvs/pkgs/rpms/crda/devel/crda.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- crda.spec	27 Jan 2009 20:05:33 -0000	1.6
+++ crda.spec	27 Jan 2009 20:10:59 -0000	1.7
@@ -76,6 +76,8 @@
 /sbin/regdbdump
 /lib/udev/rules.d/85-regulatory.rules
 /usr/lib/%{name}
+/usr/share/man/man8/crda.8.gz
+/usr/share/man/man8/regdbdump.8.gz
 %doc crda-%{crda_version}/LICENSE crda-%{crda_version}/README.crda
 %doc wireless-regdb-%{regdb_version}/README.wireless-regdb
 



From linville at fedoraproject.org  Tue Jan 27 20:20:52 2009
From: linville at fedoraproject.org (John W. Linville)
Date: Tue, 27 Jan 2009 20:20:52 +0000 (UTC)
Subject: rpms/crda/F-10 crda.spec,1.2,1.3
Message-ID: <20090127202052.0F0A87010B@cvs1.fedora.phx.redhat.com>

Author: linville

Update of /cvs/pkgs/rpms/crda/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29176

Modified Files:
	crda.spec 
Log Message:
build fixes


Index: crda.spec
===================================================================
RCS file: /cvs/pkgs/rpms/crda/F-10/crda.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- crda.spec	27 Jan 2009 19:44:43 -0000	1.2
+++ crda.spec	27 Jan 2009 20:20:21 -0000	1.3
@@ -21,6 +21,8 @@
 Source0:        http://wireless.kernel.org/download/crda/crda-%{crda_version}.tar.bz2
 Source1:        http://wireless.kernel.org/download/wireless-regdb/wireless-regdb-%{regdb_version}.tar.bz2
 
+Patch0:         wireless-regdb-2009-01-15-non-root-install-fix.patch
+
 %description
 CRDA acts as the udev helper for communication between the kernel
 and userspace for regulatory compliance. It relies on nl80211
@@ -31,6 +33,8 @@
 %setup -q -c
 %setup -q -T -D -a 1
 
+%patch0 -p0
+
 rm crda-%{crda_version}/pubkeys/*
 
 
@@ -57,11 +61,6 @@
 cp README README.crda
 make install DESTDIR=$RPM_BUILD_ROOT
 
-# Fixup some directory and file naming
-mkdir -p ${RPM_BUILD_ROOT}/lib/udev/
-mv ${RPM_BUILD_ROOT}/etc/udev/rules.d ${RPM_BUILD_ROOT}/lib/udev/rules.d
-mv ${RPM_BUILD_ROOT}/lib/udev/rules.d/regulatory.rules ${RPM_BUILD_ROOT}/lib/udev/rules.d/10-regulatory.rules
-
 cd ../wireless-regdb-%{regdb_version}
 cp README README.wireless-regdb
 make install PREFIX=${RPM_BUILD_ROOT}/usr
@@ -75,8 +74,10 @@
 %defattr(-,root,root,-)
 /sbin/%{name}
 /sbin/regdbdump
-/lib/udev/rules.d/10-regulatory.rules
+/lib/udev/rules.d/85-regulatory.rules
 /usr/lib/%{name}
+/usr/share/man/man8/crda.8.gz
+/usr/share/man/man8/regdbdump.8.gz
 %doc crda-%{crda_version}/LICENSE crda-%{crda_version}/README.crda
 %doc wireless-regdb-%{regdb_version}/README.wireless-regdb
 
@@ -84,6 +85,7 @@
 * Tue Jan 27 2008 John W. Linville <linville at redhat.com> 1.0.1_2009_01_15-3
 - Update for CRDA verion 1.0.1
 - Account for lack of "v" in upstream release tarball naming
+- Add patch to let wireless-regdb install w/o being root
 
 * Thu Jan 22 2008 John W. Linville <linville at redhat.com> v0.9.5_2009_01_15-2
 - Revamp based on package review comments



From linville at fedoraproject.org  Tue Jan 27 20:24:24 2009
From: linville at fedoraproject.org (John W. Linville)
Date: Tue, 27 Jan 2009 20:24:24 +0000 (UTC)
Subject: rpms/crda/F-10 wireless-regdb-2009-01-15-non-root-install-fix.patch,
	NONE, 1.1
Message-ID: <20090127202424.5BADB7010B@cvs1.fedora.phx.redhat.com>

Author: linville

Update of /cvs/pkgs/rpms/crda/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30044

Added Files:
	wireless-regdb-2009-01-15-non-root-install-fix.patch 
Log Message:
oops...forgot new patch

wireless-regdb-2009-01-15-non-root-install-fix.patch:

--- NEW FILE wireless-regdb-2009-01-15-non-root-install-fix.patch ---
diff -up wireless-regdb-2009-01-15/Makefile.orig wireless-regdb-2009-01-15/Makefile
--- wireless-regdb-2009-01-15/Makefile.orig	2009-01-20 15:32:18.000000000 -0500
+++ wireless-regdb-2009-01-15/Makefile	2009-01-20 15:32:27.000000000 -0500
@@ -24,5 +24,5 @@ key.priv.pem:
 	openssl genrsa -out key.priv.pem 2048
 
 install:
-	install -o 0 -g 0 -m 755 -d $(CDRA_PATH)
-	install -o 0 -g 0 -m 644 regulatory.bin $(CDRA_PATH)/regulatory.bin
+	install -m 755 -d $(CDRA_PATH)
+	install -m 644 regulatory.bin $(CDRA_PATH)/regulatory.bin



From nalin at fedoraproject.org  Tue Jan 27 20:45:42 2009
From: nalin at fedoraproject.org (Nalin Dahyabhai)
Date: Tue, 27 Jan 2009 20:45:42 +0000 (UTC)
Subject: rpms/nss_ldap/devel .cvsignore, 1.43, 1.44 nss_ldap.spec, 1.104,
	1.105 sources, 1.44, 1.45 nss_ldap-259-parse2.patch, 1.4, NONE
Message-ID: <20090127204542.984517010B@cvs1.fedora.phx.redhat.com>

Author: nalin

Update of /cvs/pkgs/rpms/nss_ldap/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1160

Modified Files:
	.cvsignore nss_ldap.spec sources 
Removed Files:
	nss_ldap-259-parse2.patch 
Log Message:
- update to 264, pulling in Luke's patch for #248, among others
- add optional checking of nsRole to pam_ldap (upstream #382)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/nss_ldap/devel/.cvsignore,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- .cvsignore	29 Oct 2008 21:20:18 -0000	1.43
+++ .cvsignore	27 Jan 2009 20:45:12 -0000	1.44
@@ -30,3 +30,4 @@
 nss_ldap-261.tar.gz
 nss_ldap-262.tar.gz
 nss_ldap-263.tar.gz
+nss_ldap-264.tar.gz


Index: nss_ldap.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nss_ldap/devel/nss_ldap.spec,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -r1.104 -r1.105
--- nss_ldap.spec	22 Dec 2008 18:43:15 -0000	1.104
+++ nss_ldap.spec	27 Jan 2009 20:45:12 -0000	1.105
@@ -1,8 +1,8 @@
 %define pam_ldap_version 184
 Summary: NSS library and PAM module for LDAP
 Name: nss_ldap
-Version: 263
-Release: 2%{?dist}
+Version: 264
+Release: 1%{?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
@@ -12,7 +12,6 @@
 Source7: dlopen.sh
 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
 Patch4: pam_ldap-180-bind.patch
 Patch6: nss_ldap-257-over-recursion.patch
@@ -62,7 +61,6 @@
 cp nss_ldap-%{version}/snprintf.h pam_ldap-%{pam_ldap_version}/
 
 pushd nss_ldap-%{version}
-%patch2 -p1 -b .parse2
 %patch8 -p1 -b .soname
 %patch17 -p1 -b .res_init
 autoreconf -f -i
@@ -77,7 +75,7 @@
 %patch13 -p1 -b .exop-modify
 %patch16 -p1 -b .referral-passwd2
 %patch19 -p1 -b .broken-sasl-rebind
-#%patch20 -p1 -b .nsrole
+%patch20 -p1 -b .nsrole
 autoreconf -f -i
 popd
 
@@ -192,6 +190,10 @@
 %doc pam_ldap-%{pam_ldap_version}/ns-pwd-policy.schema
 
 %changelog
+* Tue Jan 27 2009 Nalin Dahyabhai <nalin at redhat.com> - 264-1
+- update to 264, pulling in Luke's patch for #248, among others
+- add optional checking of nsRole to pam_ldap (upstream #382)
+
 * Mon Dec 22 2008 Nalin Dahyabhai <nalin at redhat.com> - 263-2
 - correct some build errors
 - add but do not apply proposed pam_ldap patch to add nsrole support


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nss_ldap/devel/sources,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- sources	29 Oct 2008 21:20:18 -0000	1.44
+++ sources	27 Jan 2009 20:45:12 -0000	1.45
@@ -1,2 +1,2 @@
-5c14e6cdbbdde2872cf78d56b39ae24c  nss_ldap-263.tar.gz
+eebab40c6ce2f54e5c377b4895c0c93a  nss_ldap-264.tar.gz
 01bf1ad8576f0d1b58d9eddc68987a47  pam_ldap-184.tar.gz


--- nss_ldap-259-parse2.patch DELETED ---



From mnowak at fedoraproject.org  Tue Jan 27 20:53:36 2009
From: mnowak at fedoraproject.org (Michal Nowak)
Date: Tue, 27 Jan 2009 20:53:36 +0000 (UTC)
Subject: rpms/unikurd-web-font/devel dead.package, NONE, 1.1 Makefile, 1.1, 
	NONE import.log, 1.1, NONE sources, 1.2,
	NONE unikurd-web-font.spec, 1.1, NONE
Message-ID: <20090127205336.70E107010B@cvs1.fedora.phx.redhat.com>

Author: mnowak

Update of /cvs/pkgs/rpms/unikurd-web-font/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2567

Added Files:
	dead.package 
Removed Files:
	Makefile import.log sources unikurd-web-font.spec 
Log Message:
Renamed to kurdit-unikurd-web-fonts




--- NEW FILE dead.package ---
Renamed to kurdit-unikurd-web-fonts


--- Makefile DELETED ---


--- import.log DELETED ---


--- sources DELETED ---


--- unikurd-web-font.spec DELETED ---



From nalin at fedoraproject.org  Tue Jan 27 20:54:38 2009
From: nalin at fedoraproject.org (Nalin Dahyabhai)
Date: Tue, 27 Jan 2009 20:54:38 +0000 (UTC)
Subject: rpms/nss_ldap/devel nss_ldap.spec,1.105,1.106
Message-ID: <20090127205438.9AA6D7010B@cvs1.fedora.phx.redhat.com>

Author: nalin

Update of /cvs/pkgs/rpms/nss_ldap/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2705

Modified Files:
	nss_ldap.spec 
Log Message:
- note the local bug ID



Index: nss_ldap.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nss_ldap/devel/nss_ldap.spec,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -r1.105 -r1.106
--- nss_ldap.spec	27 Jan 2009 20:45:12 -0000	1.105
+++ nss_ldap.spec	27 Jan 2009 20:54:08 -0000	1.106
@@ -192,7 +192,7 @@
 %changelog
 * Tue Jan 27 2009 Nalin Dahyabhai <nalin at redhat.com> - 264-1
 - update to 264, pulling in Luke's patch for #248, among others
-- add optional checking of nsRole to pam_ldap (upstream #382)
+- add optional checking of nsRole to pam_ldap (#202135, upstream #382)
 
 * Mon Dec 22 2008 Nalin Dahyabhai <nalin at redhat.com> - 263-2
 - correct some build errors



From nalin at fedoraproject.org  Tue Jan 27 20:55:35 2009
From: nalin at fedoraproject.org (Nalin Dahyabhai)
Date: Tue, 27 Jan 2009 20:55:35 +0000 (UTC)
Subject: rpms/nss_db/devel nss_db.spec,1.42,1.43
Message-ID: <20090127205535.45F457010B@cvs1.fedora.phx.redhat.com>

Author: nalin

Update of /cvs/pkgs/rpms/nss_db/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2896

Modified Files:
	nss_db.spec 
Log Message:
fix a typo


Index: nss_db.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nss_db/devel/nss_db.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- nss_db.spec	11 Aug 2008 20:26:18 -0000	1.42
+++ nss_db.spec	27 Jan 2009 20:55:05 -0000	1.43
@@ -125,7 +125,7 @@
 - fix license tag
 
 * Thu Aug  7 2008 Nalin Dahyabhai <nalin at redhat.com> - 2.2-42%{?dist}
-- turn of crypto, hash, queue, and replication support, which aren't used,
+- turn off crypto, hash, queue, and replication support, which aren't used,
   reduces the package size, and sidesteps needing to patch anything for #347741
 - create and populate new db files, moving them in place afterward so that we
   never have a partially-built db file "live" (patch from Kelsey Cummings,



From vpv at fedoraproject.org  Tue Jan 27 21:09:19 2009
From: vpv at fedoraproject.org (Ville-Pekka Vainio)
Date: Tue, 27 Jan 2009 21:09:19 +0000 (UTC)
Subject: rpms/mozvoikko/devel 90_modify-makefile-to-use-pkg-config.patch,
	NONE, 1.1 91_mozvoikko-Makefile-xulrunner-cleanup.patch, NONE,
	1.1 92_mozvoikko-link-as-needed.patch, NONE, 1.1 mozvoikko.spec,
	1.4, 1.5 mozvoikko-fedora-includes.patch, 1.1, NONE
Message-ID: <20090127210919.B89F77010B@cvs1.fedora.phx.redhat.com>

Author: vpv

Update of /cvs/pkgs/rpms/mozvoikko/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5370

Modified Files:
	mozvoikko.spec 
Added Files:
	90_modify-makefile-to-use-pkg-config.patch 
	91_mozvoikko-Makefile-xulrunner-cleanup.patch 
	92_mozvoikko-link-as-needed.patch 
Removed Files:
	mozvoikko-fedora-includes.patch 
Log Message:
* Tue Jan 27 2009 Ville-Pekka Vainio <vpivaini AT cs.helsinki.fi> - 0.9.5-6
- Add a series of patches developed together with upstream and the
  Ubuntu/Debian maintainer: 
  - Uses pkg-config --cflags and --libs, no rpath anymore
  - Cleans up some unneeded cruft from Makefile.xulrunner
  - Uses -Wl,--as-needed to reduce shared library dependencies
  - Some discussion about pkg-config and rpath in Launchpad #297169


90_modify-makefile-to-use-pkg-config.patch:

--- NEW FILE 90_modify-makefile-to-use-pkg-config.patch ---
--- mozvoikko-0.9.5/src/Makefile.xulrunner	2009-01-13 20:18:49.000000000 +0200
+++ mozvoikko-0.9.5/src/Makefile.xulrunner	2009-01-13 20:20:19.000000000 +0200
@@ -14,23 +14,14 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
-XULRUNNER_SDK=$(shell pkg-config --variable=sdkdir libxul)
-XULRUNNER_INCDIR=$(shell pkg-config --variable=includedir libxul)
 NSPR_INCLUDES=$(shell pkg-config --cflags-only-I nspr)
 DESTDIR=/usr/lib/firefox
 CC=g++ -c
 CC_LINK=g++ -shared -Wl,--no-undefined
 include ../mozvoikko.config
 
-XULRUNNER_INCLUDES=-I$(XULRUNNER_SDK)/sdk/include -I$(XULRUNNER_SDK)/include \
--I$(XULRUNNER_INCDIR)/xpcom \
--I$(XULRUNNER_INCDIR)/spellchecker \
--I$(XULRUNNER_INCDIR)/uconv \
--I$(XULRUNNER_INCDIR)/unicharutil \
--I$(XULRUNNER_INCDIR)/xulapp \
--I$(XULRUNNER_INCDIR)/unstable
-XULRUNNER_LIBS=-L$(XULRUNNER_SDK)/sdk/lib -L$(XULRUNNER_SDK)/sdk/bin \
--Wl,-rpath-link,$(XULRUNNER_SDK)/sdk/bin -lxpcomglue_s -lxpcom -lnspr4
+XULRUNNER_INCLUDES=$(shell pkg-config --cflags libxul-unstable)
+XULRUNNER_LIBS=$(shell pkg-config --libs libxul-unstable)
 
 HEADERS=mozVoikko.hxx mozVoikkoSpell.hxx mozVoikkoUtils.hxx
 OBJECTS=mozVoikko mozVoikkoSpell mozVoikkoUtils mozVoikkoSpellFactory

91_mozvoikko-Makefile-xulrunner-cleanup.patch:

--- NEW FILE 91_mozvoikko-Makefile-xulrunner-cleanup.patch ---
Index: src/Makefile.xulrunner
===================================================================
--- src/Makefile.xulrunner	(revision 2472)
+++ src/Makefile.xulrunner	(working copy)
@@ -14,7 +14,6 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
-NSPR_INCLUDES=$(shell pkg-config --cflags-only-I nspr)
 DESTDIR=/usr/lib/firefox
 CC=g++ -c
 CC_LINK=g++ -shared -Wl,--no-undefined
@@ -32,8 +31,8 @@
 ifndef CFLAGS
 	CFLAGS=-O2
 endif
-CC_FLAGS=$(CFLAGS) -Wall -Werror -Wno-non-virtual-dtor -fno-rtti -fno-exceptions -fshort-wchar -fPIC
-CC_INCLUDES=$(NSPR_INCLUDES) $(XULRUNNER_INCLUDES) \
+CC_FLAGS=$(CFLAGS) -Wall -Werror -Wno-non-virtual-dtor -fno-rtti -fno-exceptions -fPIC
+CC_INCLUDES=$(XULRUNNER_INCLUDES) \
 -include mozilla-config.h -include xpcom-config.h
 CC_DEFINES=-DSYSTEM_LIBVOIKKO
 CC_LIBS=$(XULRUNNER_LIBS)

92_mozvoikko-link-as-needed.patch:

--- NEW FILE 92_mozvoikko-link-as-needed.patch ---
diff -Nur mozvoikko-0.9.5-1/src/Makefile.xulrunner mozvoikko-0.9.5-2/src/Makefile.xulrunner
--- mozvoikko-0.9.5-1/src/Makefile.xulrunner	2009-01-27 22:30:51.000000000 +0200
+++ mozvoikko-0.9.5-2/src/Makefile.xulrunner	2009-01-27 22:36:12.000000000 +0200
@@ -35,7 +35,7 @@
 CC_INCLUDES=$(XULRUNNER_INCLUDES) \
 -include mozilla-config.h -include xpcom-config.h
 CC_DEFINES=-DSYSTEM_LIBVOIKKO
-CC_LIBS=$(XULRUNNER_LIBS)
+CC_LIBS=-Wl,--as-needed $(XULRUNNER_LIBS)
 
 .PHONY: all clean xpi extension-files install-unpacked
 


Index: mozvoikko.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mozvoikko/devel/mozvoikko.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- mozvoikko.spec	25 Dec 2008 23:46:29 -0000	1.4
+++ mozvoikko.spec	27 Jan 2009 21:08:49 -0000	1.5
@@ -12,15 +12,18 @@
 
 Name:           mozvoikko
 Version:        0.9.5
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Finnish Voikko spell-checker extension for Mozilla programs
 Group:          Applications/Internet
 License:        GPLv2+
 URL:            http://voikko.sourceforge.net
 Source0:        http://downloads.sourceforge.net/voikko/%{name}-%{version}.tar.gz
-# Simplify the includes, we only need the stable and unstable header dirs in
-# Fedora
-Patch0:         mozvoikko-fedora-includes.patch
+# Use more pkg-config queries, from upstream
+Patch0:         90_modify-makefile-to-use-pkg-config.patch
+# Clean up unneeded parts of the Makefile, sent upstream
+Patch1:         91_mozvoikko-Makefile-xulrunner-cleanup.patch
+# Use -Wl,--as-needed to reduce dependencies, suggested by upstream
+Patch2:         92_mozvoikko-link-as-needed.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # For xulrunner unstable
@@ -43,6 +46,8 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p0
+%patch2 -p1
 
 
 %build
@@ -70,6 +75,14 @@
 
 
 %changelog
+* Tue Jan 27 2009 Ville-Pekka Vainio <vpivaini AT cs.helsinki.fi> - 0.9.5-6
+- Add a series of patches developed together with upstream and the
+  Ubuntu/Debian maintainer: 
+  - Uses pkg-config --cflags and --libs, no rpath anymore
+  - Cleans up some unneeded cruft from Makefile.xulrunner
+  - Uses -Wl,--as-needed to reduce shared library dependencies
+  - Some discussion about pkg-config and rpath in Launchpad #297169
+
 * Fri Dec 26 2008 Ville-Pekka Vainio <vpivaini AT cs.helsinki.fi> - 0.9.5-5
 - Rebuild against gecko 1.9.1
 - Bump Release so that it's at least as high as in F10 and F9


--- mozvoikko-fedora-includes.patch DELETED ---



From wtogami at fedoraproject.org  Tue Jan 27 21:14:01 2009
From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=)
Date: Tue, 27 Jan 2009 21:14:01 +0000 (UTC)
Subject: rpms/pidgin/devel one_time_password.c,NONE,1.1
Message-ID: <20090127211401.C1F627010B@cvs1.fedora.phx.redhat.com>

Author: wtogami

Update of /cvs/pkgs/rpms/pidgin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6133

Added Files:
	one_time_password.c 
Log Message:
add source




--- NEW FILE one_time_password.c ---
/*
 * One Time Password support plugin for libpurple
 *
 * Copyright (C) 2009, Daniel Atallah <datallah at pidgin.im>
 *
 * This program is free software; you can redistribute it and/or
 * modify it under the terms of the GNU General Public License as
 * published by the Free Software Foundation; either version 2 of the
 * License, or (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful, but
 * WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 * General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program; if not, write to the Free Software
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 * 02111-1301, USA.
 */
#include "internal.h"
#include "debug.h"
#include "plugin.h"
#include "version.h"
#include "account.h"
#include "accountopt.h"

#define PLUGIN_ID "core-one_time_password"
#define PREF_NAME PLUGIN_ID "_enabled"

static void
signed_on_cb(PurpleConnection *conn, void *data)
{
	PurpleAccount *account = purple_connection_get_account(conn);

	if (purple_account_get_bool(account, PREF_NAME, FALSE)) {
		if(purple_account_get_remember_password(account))
			purple_debug_error("One Time Password",
					   "Unable to enforce one time password for account %s (%s).\n"
					   "Account is set to remember the password.\n",
					   purple_account_get_username(account),
					   purple_account_get_protocol_name(account));
		else {

			purple_debug_info("One Time Password", "Clearing password for account %s (%s).\n",
					  purple_account_get_username(account),
					  purple_account_get_protocol_name(account));

			purple_account_set_password(account, NULL);
			/* TODO: Do we need to somehow clear conn->password ? */
		}
	}
}

static gboolean
plugin_load(PurplePlugin *plugin)
{
	PurplePlugin *prpl;
	PurplePluginProtocolInfo *prpl_info;
	PurpleAccountOption *option;
	GList *l;

	/* Register protocol preference. */
	for (l = purple_plugins_get_protocols(); l != NULL; l = l->next) {
		prpl = (PurplePlugin *)l->data;
		prpl_info = PURPLE_PLUGIN_PROTOCOL_INFO(prpl);
		if (prpl_info != NULL && !(prpl_info->options & OPT_PROTO_NO_PASSWORD)) {
			option = purple_account_option_bool_new(_("One Time Password"),
								PREF_NAME, FALSE);
			prpl_info->protocol_options = g_list_append(prpl_info->protocol_options, option);
		}
	}

	/* Register callback. */
	purple_signal_connect(purple_connections_get_handle(), "signed-on",
			      plugin, PURPLE_CALLBACK(signed_on_cb), NULL);

	return TRUE;
}

static gboolean
plugin_unload(PurplePlugin *plugin)
{
	PurplePlugin *prpl;
	PurplePluginProtocolInfo *prpl_info;
	PurpleAccountOption *option;
	GList *l, *options;

	/* Remove protocol preference. */
	for (l = purple_plugins_get_protocols(); l != NULL; l = l->next) {
		prpl = (PurplePlugin *)l->data;
		prpl_info = PURPLE_PLUGIN_PROTOCOL_INFO(prpl);
		if (prpl_info != NULL && !(prpl_info->options & OPT_PROTO_NO_PASSWORD)) {
			options = prpl_info->protocol_options;
			while (options != NULL) {
				option = (PurpleAccountOption *) options->data;
				if (strcmp(PREF_NAME, purple_account_option_get_setting(option)) == 0) {
					prpl_info->protocol_options = g_list_delete_link(prpl_info->protocol_options, options);
					purple_account_option_destroy(option);
					break;
				}
				options = options->next;
			}
		}
	}

	/* Callback will be automagically unregistered */

	return TRUE;
}

static PurplePluginInfo info =
{
	PURPLE_PLUGIN_MAGIC,
	PURPLE_MAJOR_VERSION,
	PURPLE_MINOR_VERSION,
	PURPLE_PLUGIN_STANDARD,				/**< type           */
	NULL,						/**< ui_requirement */
	0,						/**< flags          */
	NULL,						/**< dependencies   */
	PURPLE_PRIORITY_DEFAULT,			/**< priority       */
	PLUGIN_ID,					/**< id             */
	N_("One Time Password Support"),		/**< name           */
	DISPLAY_VERSION,				/**< version        */
							/**  summary        */
	N_("Enforce that passwords are used only once."),
							/**  description    */
	N_("Allows you to enforce on a per-account basis that passwords not "
	   "being saved are only used in a single successful connection.\n"
	   "Note: The account password must not be saved for this to work."),
	"Daniel Atallah <datallah at pidgin.im>",		/**< author         */
	PURPLE_WEBSITE,					/**< homepage       */
	plugin_load,					/**< load           */
	plugin_unload,					/**< unload         */
	NULL,						/**< destroy        */
	NULL,						/**< ui_info        */
	NULL,						/**< extra_info     */
	NULL,						/**< prefs_info     */
	NULL,						/**< actions        */
	NULL,						/**< reserved 1     */
	NULL,						/**< reserved 2     */
	NULL,						/**< reserved 3     */
	NULL						/**< reserved 4     */
};

static void
init_plugin(PurplePlugin *plugin)
{
}

PURPLE_INIT_PLUGIN(one_time_password, init_plugin, info)



From agk at fedoraproject.org  Tue Jan 27 21:16:11 2009
From: agk at fedoraproject.org (Alasdair Kergon)
Date: Tue, 27 Jan 2009 21:16:11 +0000 (UTC)
Subject: rpms/lvm2/devel LVM2.2.02.44.tgz.asc, NONE, 1.1 .cvsignore, 1.63,
	1.64 lvm2.spec, 1.151, 1.152 sources, 1.67, 1.68 upstream, 1.56,
	1.57 LVM2.2.02.43.tgz.asc, 1.2, NONE
Message-ID: <20090127211611.448297010B@cvs1.fedora.phx.redhat.com>

Author: agk

Update of /cvs/pkgs/rpms/lvm2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6410

Modified Files:
	.cvsignore lvm2.spec sources upstream 
Added Files:
	LVM2.2.02.44.tgz.asc 
Removed Files:
	LVM2.2.02.43.tgz.asc 
Log Message:
New upstream release.



--- NEW FILE LVM2.2.02.44.tgz.asc ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.1 (GNU/Linux)

iD8DBQBJfcvPIoGRwVZ+LBcRAkX6AKCJdsyCBtRu0aPfiFgKwFqaTQ2qqACfRLez
2q2O5e0K48m3OcqVWujczg0=
=VArT
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/lvm2/devel/.cvsignore,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- .cvsignore	10 Nov 2008 21:04:39 -0000	1.63
+++ .cvsignore	27 Jan 2009 21:15:40 -0000	1.64
@@ -1 +1 @@
-LVM2.2.02.43.tgz
+LVM2.2.02.44.tgz


Index: lvm2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lvm2/devel/lvm2.spec,v
retrieving revision 1.151
retrieving revision 1.152
diff -u -r1.151 -r1.152
--- lvm2.spec	10 Nov 2008 21:04:39 -0000	1.151
+++ lvm2.spec	27 Jan 2009 21:15:40 -0000	1.152
@@ -1,11 +1,11 @@
-%define device_mapper_version 1.02.29
+%define device_mapper_version 1.02.30
 
 # Do not reset Release to 1 unless both lvm2 and device-mapper 
 # versions are increased together.
 
 Summary: Userland logical volume management tools 
 Name: lvm2
-Version: 2.02.43
+Version: 2.02.44
 Release: 1%{?dist}
 License: GPLv2
 Group: System Environment/Base
@@ -56,7 +56,7 @@
 install -m 0700 -d $RPM_BUILD_ROOT/var/lock/lvm
 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
+install scripts/clvmd_init_red_hat $RPM_BUILD_ROOT/etc/rc.d/init.d/clvmd
 install -m 0755 scripts/lvmconf.sh $RPM_BUILD_ROOT/sbin/lvmconf
 
 %clean
@@ -257,6 +257,31 @@
 
 
 %changelog
+* Tue Jan 27 2009 Alasdair Kergon <agk at redhat.com>> - 2.02.44-1
+- Add --nameprefixes, --unquoted, --rows to pvs, vgs, lvs man pages.
+- Fix lvresize size conversion for fsadm when block size is not 1K.
+- Fix pvs segfault when run with orphan PV and some VG fields.
+- Display a 'dev_size' of zero for missing devices in reports.
+- Add pv_mda_size to pvs and vg_mda_size to vgs.
+- Fix lvmdump /sys listing to include virtual devices directory.
+- Add "--refresh" functionality to vgchange and vgmknodes.
+- Avoid exceeding LV size when wiping device.
+- Calculate mirror log size instead of using 1 extent.
+- Ensure requested device number is available before activating with it.
+- Fix incorrect exit status from 'help <command>'.
+- Fix vgrename using UUID if there are VGs with identical names.
+- Fix segfault when invalid field given in reporting commands.
+- Use better random seed value in temp file creation.
+- Add read_urandom to read /dev/urandom. Use in uuid calculation.
+- Fix race in vgcreate that would result in second caller overwriting first.
+- Fix uninitialised lv_count in vgdisplay -c.
+- Don't skip updating pvid hash when lvmcache_info struct got swapped.
+- Fix startup race in clvmd.
+- Cope with snapshot dependencies when removing a whole VG with lvremove.
+- Make man pages and tool help text consistent using | for alternative options.
+- Add "all" field to reports expanding to all fields of report type.
+- Enforce device name length and character limitations in libdm.
+
 * Mon Nov 10 2008 Alasdair Kergon <agk at redhat.com>> - 2.02.43-1
 - Upstream merge of device-mapper and lvm2 source.
 - Correct prototype for --permission on lvchange and lvcreate man pages.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/lvm2/devel/sources,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- sources	10 Nov 2008 21:29:29 -0000	1.67
+++ sources	27 Jan 2009 21:15:40 -0000	1.68
@@ -1 +1 @@
-fc34655706a2aa116b92328b24fad619  LVM2.2.02.43.tgz
+4ed7b99903a6fc5165b7b0b8def42486  LVM2.2.02.44.tgz


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/lvm2/devel/upstream,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- upstream	10 Nov 2008 21:04:39 -0000	1.56
+++ upstream	27 Jan 2009 21:15:40 -0000	1.57
@@ -1 +1 @@
-LVM2.2.02.43.tgz
+LVM2.2.02.44.tgz


--- LVM2.2.02.43.tgz.asc DELETED ---



From drago01 at fedoraproject.org  Tue Jan 27 21:16:43 2009
From: drago01 at fedoraproject.org (Adel Gadllah)
Date: Tue, 27 Jan 2009 21:16:43 +0000 (UTC)
Subject: rpms/compiz/devel compiz-0.7.8-gnome-terminal.patch, NONE,
	1.1 compiz.spec, 1.153, 1.154
Message-ID: <20090127211643.B24017010B@cvs1.fedora.phx.redhat.com>

Author: drago01

Update of /cvs/pkgs/rpms/compiz/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6543

Modified Files:
	compiz.spec 
Added Files:
	compiz-0.7.8-gnome-terminal.patch 
Log Message:
Make the terminal keybinding work (RH #439665)

compiz-0.7.8-gnome-terminal.patch:

--- NEW FILE compiz-0.7.8-gnome-terminal.patch ---
diff -upNr compiz-0.7.8.orign/metadata/core.xml.in compiz-0.7.8/metadata/core.xml.in
--- compiz-0.7.8.orign/metadata/core.xml.in	2008-08-28 13:34:41.000000000 +0200
+++ compiz-0.7.8/metadata/core.xml.in	2009-01-27 22:11:55.000000000 +0100
@@ -315,7 +315,7 @@
 	    <option name="command_terminal" type="string">
 		<_short>Terminal command line</_short>
 		<_long>Terminal command line</_long>
-		<default></default>
+		<default>gnome-terminal</default>
 	    </option>
 	    <option name="run_command_terminal_key" type="key">
 		<_short>Open a terminal</_short>


Index: compiz.spec
===================================================================
RCS file: /cvs/pkgs/rpms/compiz/devel/compiz.spec,v
retrieving revision 1.153
retrieving revision 1.154
diff -u -r1.153 -r1.154
--- compiz.spec	18 Dec 2008 18:35:26 -0000	1.153
+++ compiz.spec	27 Jan 2009 21:16:13 -0000	1.154
@@ -14,7 +14,7 @@
 License:        GPLv2+ and LGPLv2+ and MIT
 Group:          User Interface/Desktops
 Version:        0.7.8
-Release:        10%{?dist}
+Release:        11%{?dist}
 
 Summary:        OpenGL window and compositing manager
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -77,6 +77,9 @@
 # Memory leak fixes from upstream
 Patch124: compiz-0.7.8-mem-leak-fixes.patch
 
+# Make the terminal keybinding work (RH #439665)
+Patch125: compiz-0.7.8-gnome-terminal.patch
+
 %description
 Compiz is one of the first OpenGL-accelerated compositing window
 managers for the X Window System. The integration allows it to perform
@@ -160,6 +163,7 @@
 %patch122 -p1 -b .fullscreen-top
 %patch123 -p1 -b .initial-plugins
 %patch124 -p1 -b .mem-leaks
+%patch125 -p1 -b .terminal
 
 %build
 rm -rf $RPM_BUILD_ROOT
@@ -376,6 +380,9 @@
 
 
 %changelog
+* Tue Jan 27 2009 Adel Gadllah <adel.gadllah at gmail.com> - 0.7.8-11
+- Make the terminal keybinding work (RH #439665)
+
 * Thu Dec 18 2008 Matthias Clasen <mclasen at redhat.com> - 0.7.8-10
 - Rebuild against new gnome-desktop
 



From drago01 at fedoraproject.org  Tue Jan 27 21:19:55 2009
From: drago01 at fedoraproject.org (Adel Gadllah)
Date: Tue, 27 Jan 2009 21:19:55 +0000 (UTC)
Subject: rpms/compiz/F-10 compiz-0.7.8-gnome-terminal.patch, NONE,
	1.1 compiz.spec, 1.143, 1.144
Message-ID: <20090127211955.284027010B@cvs1.fedora.phx.redhat.com>

Author: drago01

Update of /cvs/pkgs/rpms/compiz/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7066

Modified Files:
	compiz.spec 
Added Files:
	compiz-0.7.8-gnome-terminal.patch 
Log Message:
Make the terminal keybinding work (RH #439665)

compiz-0.7.8-gnome-terminal.patch:

--- NEW FILE compiz-0.7.8-gnome-terminal.patch ---
diff -upNr compiz-0.7.8.orign/metadata/core.xml.in compiz-0.7.8/metadata/core.xml.in
--- compiz-0.7.8.orign/metadata/core.xml.in	2008-08-28 13:34:41.000000000 +0200
+++ compiz-0.7.8/metadata/core.xml.in	2009-01-27 22:11:55.000000000 +0100
@@ -315,7 +315,7 @@
 	    <option name="command_terminal" type="string">
 		<_short>Terminal command line</_short>
 		<_long>Terminal command line</_long>
-		<default></default>
+		<default>gnome-terminal</default>
 	    </option>
 	    <option name="run_command_terminal_key" type="key">
 		<_short>Open a terminal</_short>


Index: compiz.spec
===================================================================
RCS file: /cvs/pkgs/rpms/compiz/F-10/compiz.spec,v
retrieving revision 1.143
retrieving revision 1.144
diff -u -r1.143 -r1.144
--- compiz.spec	8 Dec 2008 12:02:12 -0000	1.143
+++ compiz.spec	27 Jan 2009 21:19:24 -0000	1.144
@@ -14,7 +14,7 @@
 License:        GPLv2+ and LGPLv2+ and MIT
 Group:          User Interface/Desktops
 Version:        0.7.8
-Release:        4%{?dist}
+Release:        5%{?dist}
 
 Summary:        OpenGL window and compositing manager
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -70,8 +70,13 @@
 
 # Make sure configuration plugins never get unloaded
 Patch123: compiz-0.7.8-pin-initial-plugins.patch
+
+# Memory leak fixes from upstream
 Patch124: compiz-0.7.8-mem-leak-fixes.patch
 
+# Make the terminal keybinding work (RH #439665)
+Patch125: compiz-0.7.8-gnome-terminal.patch
+
 %description
 Compiz is one of the first OpenGL-accelerated compositing window
 managers for the X Window System. The integration allows it to perform
@@ -150,6 +155,7 @@
 %patch122 -p1 -b .fullscreen-top
 %patch123 -p1 -b .initial-plugins
 %patch124 -p1 -b .mem-leaks
+%patch125 -p1 -b .terminal
 
 %build
 rm -rf $RPM_BUILD_ROOT
@@ -366,6 +372,9 @@
 
 
 %changelog
+* Tue Jan 27 2009 Adel Gadllah <adel.gadllah at gmail.com> - 0.7.8-5
+- Make the terminal keybinding work (RH #439665)
+
 * Mon Dec 08 2008 Adel Gadllah <adel.gadllah at gmail.com> - 0.7.8-4
 - Remove direct rendering check for now
 



From nalin at fedoraproject.org  Tue Jan 27 21:26:05 2009
From: nalin at fedoraproject.org (Nalin Dahyabhai)
Date: Tue, 27 Jan 2009 21:26:05 +0000 (UTC)
Subject: rpms/nss_ldap/F-9 nss_ldap.spec, 1.100, 1.101 sources, 1.42,
	1.43 nss_ldap-259-parse2.patch, 1.4, NONE
Message-ID: <20090127212605.C871B7010B@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-serv8257/F-9

Modified Files:
	nss_ldap.spec sources 
Removed Files:
	nss_ldap-259-parse2.patch 
Log Message:
- update to nss_ldap 264, so that we can drop one of our patches



Index: nss_ldap.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nss_ldap/F-9/nss_ldap.spec,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -r1.100 -r1.101
--- nss_ldap.spec	29 Oct 2008 21:25:24 -0000	1.100
+++ nss_ldap.spec	27 Jan 2009 21:25:35 -0000	1.101
@@ -1,7 +1,7 @@
 %define pam_ldap_version 184
 Summary: NSS library and PAM module for LDAP
 Name: nss_ldap
-Version: 263
+Version: 264
 Release: 1%{?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
@@ -12,7 +12,6 @@
 Source7: dlopen.sh
 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
 Patch4: pam_ldap-180-bind.patch
 Patch6: nss_ldap-257-over-recursion.patch
@@ -61,7 +60,6 @@
 cp nss_ldap-%{version}/snprintf.h pam_ldap-%{pam_ldap_version}/
 
 pushd nss_ldap-%{version}
-%patch2 -p1 -b .parse2
 %patch8 -p1 -b .soname
 %patch17 -p1 -b .res_init
 autoreconf -f -i
@@ -190,6 +188,9 @@
 %doc pam_ldap-%{pam_ldap_version}/ns-pwd-policy.schema
 
 %changelog
+* Tue Jan 27 2009 Nalin Dahyabhai <nalin at redhat.com> - 264-1
+- update to 264, pulling in Luke's patch for #248
+
 * Wed Oct 29 2008 Nalin Dahyabhai <nalin at redhat.com> - 263-1
 - update to 263, pulling in Luke's patch for #374 (#445972) which doesn't
   leak the result message, and the fix for #376 (#466794)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nss_ldap/F-9/sources,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- sources	29 Oct 2008 21:25:24 -0000	1.42
+++ sources	27 Jan 2009 21:25:35 -0000	1.43
@@ -1,2 +1,2 @@
-5c14e6cdbbdde2872cf78d56b39ae24c  nss_ldap-263.tar.gz
+eebab40c6ce2f54e5c377b4895c0c93a  nss_ldap-264.tar.gz
 01bf1ad8576f0d1b58d9eddc68987a47  pam_ldap-184.tar.gz


--- nss_ldap-259-parse2.patch DELETED ---



From nalin at fedoraproject.org  Tue Jan 27 21:26:06 2009
From: nalin at fedoraproject.org (Nalin Dahyabhai)
Date: Tue, 27 Jan 2009 21:26:06 +0000 (UTC)
Subject: rpms/nss_ldap/F-10 nss_ldap.spec, 1.103, 1.104 sources, 1.44,
	1.45 nss_ldap-259-parse2.patch, 1.4, NONE
Message-ID: <20090127212606.0DA627010B@cvs1.fedora.phx.redhat.com>

Author: nalin

Update of /cvs/pkgs/rpms/nss_ldap/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8257/F-10

Modified Files:
	nss_ldap.spec sources 
Removed Files:
	nss_ldap-259-parse2.patch 
Log Message:
- update to nss_ldap 264, so that we can drop one of our patches



Index: nss_ldap.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nss_ldap/F-10/nss_ldap.spec,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -r1.103 -r1.104
--- nss_ldap.spec	29 Oct 2008 21:20:18 -0000	1.103
+++ nss_ldap.spec	27 Jan 2009 21:25:35 -0000	1.104
@@ -1,7 +1,7 @@
 %define pam_ldap_version 184
 Summary: NSS library and PAM module for LDAP
 Name: nss_ldap
-Version: 263
+Version: 264
 Release: 1%{?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
@@ -12,7 +12,6 @@
 Source7: dlopen.sh
 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
 Patch4: pam_ldap-180-bind.patch
 Patch6: nss_ldap-257-over-recursion.patch
@@ -61,7 +60,6 @@
 cp nss_ldap-%{version}/snprintf.h pam_ldap-%{pam_ldap_version}/
 
 pushd nss_ldap-%{version}
-%patch2 -p1 -b .parse2
 %patch8 -p1 -b .soname
 %patch17 -p1 -b .res_init
 autoreconf -f -i
@@ -190,6 +188,9 @@
 %doc pam_ldap-%{pam_ldap_version}/ns-pwd-policy.schema
 
 %changelog
+* Tue Jan 27 2009 Nalin Dahyabhai <nalin at redhat.com> - 264-1
+- update to 264, pulling in Luke's patch for #248, among others
+
 * Wed Oct 29 2008 Nalin Dahyabhai <nalin at redhat.com> - 263-1
 - update to 263, pulling in Luke's patch for #374 (#445972) which doesn't
   leak the result message, and the fix for #376 (#466794)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nss_ldap/F-10/sources,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- sources	29 Oct 2008 21:20:18 -0000	1.44
+++ sources	27 Jan 2009 21:25:35 -0000	1.45
@@ -1,2 +1,2 @@
-5c14e6cdbbdde2872cf78d56b39ae24c  nss_ldap-263.tar.gz
+eebab40c6ce2f54e5c377b4895c0c93a  nss_ldap-264.tar.gz
 01bf1ad8576f0d1b58d9eddc68987a47  pam_ldap-184.tar.gz


--- nss_ldap-259-parse2.patch DELETED ---



From kyle at fedoraproject.org  Tue Jan 27 21:30:09 2009
From: kyle at fedoraproject.org (Kyle McMartin)
Date: Tue, 27 Jan 2009 21:30:09 +0000 (UTC)
Subject: rpms/kernel/devel drm-nouveau.patch, 1.3, 1.4 kernel.spec, 1.1236, 
	1.1237
Message-ID: <20090127213009.624A07010B@cvs1.fedora.phx.redhat.com>

Author: kyle

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9559

Modified Files:
	drm-nouveau.patch kernel.spec 
Log Message:
* Tue Jan 27 2009 Kyle McMartin <kyle at redhat.com>
- Re-enable nouveau.


drm-nouveau.patch:

Index: drm-nouveau.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/drm-nouveau.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- drm-nouveau.patch	2 Sep 2008 14:56:52 -0000	1.3
+++ drm-nouveau.patch	27 Jan 2009 21:30:08 -0000	1.4
@@ -1,8 +1,8 @@
 diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig
-index 649757f..014fa6f 100644
+index 5130b72..f29b63b 100644
 --- a/drivers/gpu/drm/Kconfig
 +++ b/drivers/gpu/drm/Kconfig
-@@ -113,3 +113,9 @@ config DRM_SAVAGE
+@@ -123,3 +123,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.
@@ -13,17 +13,17 @@
 +	help
 +	  Choose for nvidia support
 diff --git a/drivers/gpu/drm/Makefile b/drivers/gpu/drm/Makefile
-index 48567a9..e68042b 100644
+index 30022c4..1cccfaf 100644
 --- a/drivers/gpu/drm/Makefile
 +++ b/drivers/gpu/drm/Makefile
-@@ -26,4 +26,5 @@ obj-$(CONFIG_DRM_I915)  += i915/
+@@ -25,4 +25,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
+index 72c667f..414b52b 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
@@ -5602,7 +5602,7 @@
 +#define NV40_RAMFC_UNK_50                                        0x50
 diff --git a/drivers/gpu/drm/nouveau/nouveau_sgdma.c b/drivers/gpu/drm/nouveau/nouveau_sgdma.c
 new file mode 100644
-index 0000000..b35bfb7
+index 0000000..ca17394
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/nouveau_sgdma.c
 @@ -0,0 +1,342 @@
@@ -15428,7 +15428,7 @@
 +{
 +}
 diff --git a/include/drm/Kbuild b/include/drm/Kbuild
-index 82b6983..d65553c 100644
+index b940fdf..cfa6af4 100644
 --- a/include/drm/Kbuild
 +++ b/include/drm/Kbuild
 @@ -8,3 +8,4 @@ unifdef-y += radeon_drm.h
@@ -15437,10 +15437,10 @@
  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
+index afb7858..d8dae5f 100644
 --- a/include/drm/drmP.h
 +++ b/include/drm/drmP.h
-@@ -1136,6 +1136,8 @@ extern void drm_idlelock_release(struct drm_lock_data *lock_data);
+@@ -1160,6 +1160,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) */


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1236
retrieving revision 1.1237
diff -u -r1.1236 -r1.1237
--- kernel.spec	27 Jan 2009 17:43:01 -0000	1.1236
+++ kernel.spec	27 Jan 2009 21:30:08 -0000	1.1237
@@ -1174,7 +1174,7 @@
 # Nouveau DRM + drm fixes
 #ApplyPatch drm-next.patch
 ApplyPatch drm-modesetting-radeon.patch
-#ApplyPatch drm-nouveau.patch
+ApplyPatch drm-nouveau.patch
 
 # linux1394 git patches
 ApplyPatch linux-2.6-firewire-git-update.patch
@@ -1772,6 +1772,9 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Tue Jan 27 2009 Kyle McMartin <kyle at redhat.com>
+- Re-enable nouveau.
+
 * Tue Jan 27 2009 Dave Jones <davej at redhat.com>
 - 2.6.29-rc2-git3
 



From hadess at fedoraproject.org  Tue Jan 27 22:05:26 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Tue, 27 Jan 2009 22:05:26 +0000 (UTC)
Subject: rpms/gnome-user-share/devel gnome-user-share.spec,1.44,1.45
Message-ID: <20090127220526.9E3097010B@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-serv14244

Modified Files:
	gnome-user-share.spec 
Log Message:
Add mod_dnssd BR



Index: gnome-user-share.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-user-share/devel/gnome-user-share.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- gnome-user-share.spec	27 Jan 2009 16:00:17 -0000	1.44
+++ gnome-user-share.spec	27 Jan 2009 22:04:55 -0000	1.45
@@ -13,7 +13,7 @@
 Requires: mod_dnssd
 BuildRequires: GConf2-devel pkgconfig
 BuildRequires: gtk2-devel >= 2.4.0
-BuildRequires: httpd >= 2.2.0
+BuildRequires: httpd >= 2.2.0 mod_dnssd
 BuildRequires: desktop-file-utils
 BuildRequires: gnome-doc-utils
 BuildRequires: libselinux-devel



From drago01 at fedoraproject.org  Tue Jan 27 22:05:30 2009
From: drago01 at fedoraproject.org (Adel Gadllah)
Date: Tue, 27 Jan 2009 22:05:30 +0000 (UTC)
Subject: rpms/compiz/F-10 compiz-0.7.8-kde42.patch, NONE, 1.1 compiz.spec,
	1.144, 1.145
Message-ID: <20090127220530.01F3D7010B@cvs1.fedora.phx.redhat.com>

Author: drago01

Update of /cvs/pkgs/rpms/compiz/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14280

Modified Files:
	compiz.spec 
Added Files:
	compiz-0.7.8-kde42.patch 
Log Message:
Fix build against KDE-4.2

compiz-0.7.8-kde42.patch:

--- NEW FILE compiz-0.7.8-kde42.patch ---
diff -ur compiz-0.7.8/configure compiz-0.7.8-kde42/configure
--- compiz-0.7.8/configure	2008-09-17 13:34:28.000000000 +0200
+++ compiz-0.7.8-kde42/configure	2008-12-01 19:07:49.000000000 +0100
@@ -25429,7 +25429,7 @@
   kde4libs=`kde4-config --install lib --expandvars 2>/dev/null`
   kde4incs=`kde4-config --install include --expandvars 2>/dev/null`
 
-  kde4_test_includes="kdecoration.h kcommondecoration.h kdecorationbridge.h plasma/panelsvg.h"
+  kde4_test_includes="kdecoration.h kcommondecoration.h kdecorationbridge.h plasma/framesvg.h"
 
     { echo "$as_me:$LINENO: checking for KWin headers" >&5
 echo $ECHO_N "checking for KWin headers... $ECHO_C" >&6; }
diff -ur compiz-0.7.8/configure.ac compiz-0.7.8-kde42/configure.ac
--- compiz-0.7.8/configure.ac	2008-09-17 13:33:40.000000000 +0200
+++ compiz-0.7.8-kde42/configure.ac	2008-12-01 19:07:33.000000000 +0100
@@ -487,7 +487,7 @@
   kde4libs=`kde4-config --install lib --expandvars 2>/dev/null`
   kde4incs=`kde4-config --install include --expandvars 2>/dev/null`
 
-  kde4_test_includes="kdecoration.h kcommondecoration.h kdecorationbridge.h plasma/panelsvg.h"
+  kde4_test_includes="kdecoration.h kcommondecoration.h kdecorationbridge.h plasma/framesvg.h"
 
   dnl Check for KWin headers
   AC_MSG_CHECKING([for KWin headers])
diff -ur compiz-0.7.8/kde/window-decorator-kde4/switcher.cpp compiz-0.7.8-kde42/kde/window-decorator-kde4/switcher.cpp
--- compiz-0.7.8/kde/window-decorator-kde4/switcher.cpp	2008-08-08 13:20:31.000000000 +0200
+++ compiz-0.7.8-kde42/kde/window-decorator-kde4/switcher.cpp	2008-12-01 19:13:18.000000000 +0100
@@ -30,7 +30,7 @@
 
 #include <fixx11h.h>
 
-#include <KDE/Plasma/PanelSvg>
+#include <KDE/Plasma/FrameSvg>
 #include <KDE/Plasma/Theme>
 
 #include <kwindowsystem.h>
@@ -46,9 +46,9 @@
     QColor   color;
     color = Plasma::Theme::defaultTheme ()->color (Plasma::Theme::TextColor);
 
-    mBackground = new Plasma::PanelSvg();
+    mBackground = new Plasma::FrameSvg();
     mBackground->setImagePath ("dialogs/background");
-    mBackground->setEnabledBorders(Plasma::PanelSvg::AllBorders);
+    mBackground->setEnabledBorders(Plasma::FrameSvg::AllBorders);
 
     mBorder.left   = mBackground->marginSize(Plasma::LeftMargin);
     mBorder.right  = mBackground->marginSize(Plasma::RightMargin);
@@ -131,8 +131,8 @@
     p.setCompositionMode (QPainter::CompositionMode_Source);
     p.setRenderHint (QPainter::SmoothPixmapTransform);
 
-    mBackground->resizePanel (QSizeF (contentWidth, contentHeight));
-    mBackground->paintPanel (&p, QRect (0, 0, contentWidth,
+    mBackground->resizeFrame (QSizeF (contentWidth, contentHeight));
+    mBackground->paintFrame (&p, QRect (0, 0, contentWidth,
 			contentHeight));
 
     mBackgroundPixmap = mPixmap.copy (mBorder.left, mBorder.top,
@@ -168,7 +168,7 @@
     p.setCompositionMode (QPainter::CompositionMode_Source);
 
 
-    mBackground->paintPanel (&p, QRect (mBorder.left, mBorder.top +
+    mBackground->paintFrame (&p, QRect (mBorder.left, mBorder.top +
 			mGeometry.height () + 5, mGeometry.width (),
 			fm.height ()));
 
diff -ur compiz-0.7.8/kde/window-decorator-kde4/switcher.h compiz-0.7.8-kde42/kde/window-decorator-kde4/switcher.h
--- compiz-0.7.8/kde/window-decorator-kde4/switcher.h	2008-08-08 13:20:31.000000000 +0200
+++ compiz-0.7.8-kde42/kde/window-decorator-kde4/switcher.h	2008-12-01 19:28:37.000000000 +0100
@@ -30,7 +30,7 @@
 
 namespace Plasma
 {
-class PanelSvg;
+class FrameSvg;
 }
 
 class QSpacerItem;
@@ -70,7 +70,7 @@
 
 	QRect mGeometry;
 
-	Plasma::PanelSvg *mBackground;
+	Plasma::FrameSvg *mBackground;
 	QPixmap mPixmap;
 	QPixmap mBackgroundPixmap;
 


Index: compiz.spec
===================================================================
RCS file: /cvs/pkgs/rpms/compiz/F-10/compiz.spec,v
retrieving revision 1.144
retrieving revision 1.145
diff -u -r1.144 -r1.145
--- compiz.spec	27 Jan 2009 21:19:24 -0000	1.144
+++ compiz.spec	27 Jan 2009 22:04:59 -0000	1.145
@@ -14,7 +14,7 @@
 License:        GPLv2+ and LGPLv2+ and MIT
 Group:          User Interface/Desktops
 Version:        0.7.8
-Release:        5%{?dist}
+Release:        6%{?dist}
 
 Summary:        OpenGL window and compositing manager
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -64,6 +64,9 @@
 Patch115: desktop-effects-linguas.patch
 Patch116: compiz-0.7.6-utility-windows.patch
 
+# make kde4-window-decorator build against KDE 4.2's libplasma
+Patch120: compiz-0.7.8-kde42.patch
+
 # backports from git
 Patch121: compiz-0.7.8-decoration-placement.patch
 Patch122: compiz-0.7.8-fullscreen-top.patch
@@ -150,6 +153,10 @@
 %endif
 #%patch110 -p1 -b .scale-key
 
+%patch120 -p1 -b .kde42
+sleep 1
+touch configure
+
 %patch116 -p1 -b .utility
 %patch121 -p1 -b .decoration-placement
 %patch122 -p1 -b .fullscreen-top
@@ -372,6 +379,9 @@
 
 
 %changelog
+* Tue Jan 27 2009 Adel Gadllah <adel.gadllah at gmail.com> - 0.7.8-6
+- Fix build against KDE-4.2
+
 * Tue Jan 27 2009 Adel Gadllah <adel.gadllah at gmail.com> - 0.7.8-5
 - Make the terminal keybinding work (RH #439665)
 



From slankes at fedoraproject.org  Tue Jan 27 22:08:20 2009
From: slankes at fedoraproject.org (Sven Lankes)
Date: Tue, 27 Jan 2009 22:08:20 +0000 (UTC)
Subject: rpms/sj-fonts/devel import.log, NONE,
	1.1 sj-fonts-delphine-fontconfig.conf, NONE,
	1.1 sj-fonts-stevehand-fontconfig.conf, NONE, 1.1 sj-fonts.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090127220821.023D27010B@cvs1.fedora.phx.redhat.com>

Author: slankes

Update of /cvs/pkgs/rpms/sj-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14948/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log sj-fonts-delphine-fontconfig.conf 
	sj-fonts-stevehand-fontconfig.conf sj-fonts.spec 
Log Message:
initial import



--- NEW FILE import.log ---
sj-fonts-2_0_2-1_fc10:HEAD:sj-fonts-2.0.2-1.fc10.src.rpm:1233094032


--- NEW FILE sj-fonts-delphine-fontconfig.conf ---
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
<fontconfig>
  <alias>
    <family>fantasy</family>
    <prefer>
      <family>Delphine</family>
    </prefer>
  </alias>
  <alias>
    <family>Delphine</family>
    <default>
      <family>fantasy</family>
    </default>
  </alias>
</fontconfig>



--- NEW FILE sj-fonts-stevehand-fontconfig.conf ---
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
<fontconfig>
  <alias>
    <family>fantasy</family>
    <prefer>
      <family>SteveHand</family>
    </prefer>
  </alias>
  <alias>
    <family>SteveHand</family>
    <default>
      <family>fantasy</family>
    </default>
  </alias>
</fontconfig>



--- NEW FILE sj-fonts.spec ---
%define fontname sj
%define fontconf 63-%{fontname}

%define common_desc Two fonts by Steve Jordi released under the GPL 

Name:          %{fontname}-fonts
Version:       2.0.2
Release:       1%{?dist}
Summary:       Two fonts by Steve Jordi released under the GPL

Group:         User Interface/X
License:       GPLv2 with exceptions
URL:           http://sjfonts.sourceforge.net
Source0:       sjfonts-source-2.0.2.tar.bz2
Source1:       %{name}-delphine-fontconfig.conf
Source2:       %{name}-stevehand-fontconfig.conf
BuildRoot:     %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

BuildArch:     noarch
BuildRequires: fontpackages-devel
BuildRequires: fontforge

%description
%common_desc

%package common
Summary:       Common files for %{name}
Group:         User Interface/X
Requires:      fontpackages-filesystem

%description common
%common_desc

This package consists of files used by other %{name} packages.

%package -n %{fontname}-delphine-fonts
Summary:       Handwriting font
Group:         User Interface/X
Requires:      %{name}-common = %{version}-%{release}

%description -n %{fontname}-delphine-fonts
%common_desc

Handwriting font by Steve Jordi covering latin glyphs.

%_font_pkg -n delphine -f %{fontconf}-delphine.conf Delphine.ttf

%package -n %{fontname}-stevehand-fonts
Summary:       Handwriting font
Group:         User Interface/X
Requires:      %{name}-common = %{version}-%{release}

%description -n %{fontname}-stevehand-fonts
%common_desc

Handwriting font by Steve Jordi covering latin glyphs.

%_font_pkg -n stevehand -f %{fontconf}-stevehand.conf SteveHand.ttf

%prep
%setup -q -c %{name}-%{version}

%build
fontforge -script "-" Delphine.sfd SteveHand.sfd <<EOF
i = 1
while ( i < \$argc )
  Open (\$argv[i], 1)
  Generate (\$fontname + ".ttf")
  PrintSetup (5)
  PrintFont (0, 0, "", \$fontname + "-sample.pdf")
  Close()
  i++
endloop
EOF

%install
rm -rf $RPM_BUILD_ROOT

install -m 0755 -d %{buildroot}%{_fontdir}
install -m 0644 -p *.ttf %{buildroot}%{_fontdir}

install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} %{buildroot}%{_fontconfig_confdir}

install -m 0644 -p %{SOURCE1} %{buildroot}%{_fontconfig_templatedir}/%{fontconf}-delphine.conf
install -m 0644 -p %{SOURCE2} %{buildroot}%{_fontconfig_templatedir}/%{fontconf}-stevehand.conf

for fontconf in %{fontconf}-delphine.conf %{fontconf}-stevehand.conf ; do
  ln -s %{_fontconfig_templatedir}/$fontconf %{buildroot}%{_fontconfig_confdir}/$fontconf
done

%clean
rm -rf $RPM_BUILD_ROOT

%files common
%defattr(0644,root,root,0755)
%doc COPYING
%doc README

%dir %{_fontdir}

%changelog
* Sun Jan 25 2008 Sven Lankes <sven at lank.es> - 2.0.2-1
- Initial packaging



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sj-fonts/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	26 Jan 2009 22:29:53 -0000	1.1
+++ .cvsignore	27 Jan 2009 22:07:50 -0000	1.2
@@ -0,0 +1 @@
+sjfonts-source-2.0.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sj-fonts/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	26 Jan 2009 22:29:53 -0000	1.1
+++ sources	27 Jan 2009 22:07:50 -0000	1.2
@@ -0,0 +1 @@
+f06986cab16248de493109bb2bd1027e  sjfonts-source-2.0.2.tar.bz2



From slankes at fedoraproject.org  Tue Jan 27 22:12:14 2009
From: slankes at fedoraproject.org (Sven Lankes)
Date: Tue, 27 Jan 2009 22:12:14 +0000 (UTC)
Subject: rpms/dustin-domestic-manners-fonts/devel
	dustin-domestic-manners-fonts-fontconfig.conf, NONE,
	1.1 dustin-domestic-manners-fonts.spec, NONE, 1.1 import.log,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090127221214.7BCF67010B@cvs1.fedora.phx.redhat.com>

Author: slankes

Update of /cvs/pkgs/rpms/dustin-domestic-manners-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15621/devel

Modified Files:
	.cvsignore sources 
Added Files:
	dustin-domestic-manners-fonts-fontconfig.conf 
	dustin-domestic-manners-fonts.spec import.log 
Log Message:
initial import



--- NEW FILE dustin-domestic-manners-fonts-fontconfig.conf ---
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
<fontconfig>
  <alias>
    <family>fantasy</family>
    <prefer>
      <family>Domestic Manners</family>
    </prefer>
  </alias>
  <alias>
    <family>Domestic Manners</family>
    <default>
      <family>fantasy</family>
    </default>
  </alias>
</fontconfig>



--- NEW FILE dustin-domestic-manners-fonts.spec ---
%define fontname dustin-domestic-manners
%define fontconf 63-%{fontname}.conf

Name:          %{fontname}-fonts
Version:       20030527
Release:       1%{?dist}
Summary:       Handwriting font by Dustin Norlander

Group:         User Interface/X
License:       GPLv2+
URL:           http://www.dustismo.com
# Actual download URL
#URL:           http://ftp.de.debian.org/debian/pool/main/t/ttf-dustin/ttf-dustin_20030517.orig.tar.gz 
Source0:       Domestic_Manners.zip
Source1:       %{name}-fontconfig.conf
BuildRoot:     %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

BuildArch:     noarch
BuildRequires: fontpackages-devel
Requires:      fontpackages-filesystem

%description 

This font mimics the authors handwriting. The name come from the book 
Domestic Manners of the Americans, by Fanny Trollope.

Font contains, letters, numbers, punctuation, accented characters and 
some special characters (most European Latin characters).

%prep
%setup -q -c %{name}
sed -i 's/\r//' license.txt

%build

%install
rm -fr %{buildroot}
install -m 0755 -d %{buildroot}%{_fontdir}
install -m 0644 -p *.ttf %{buildroot}%{_fontdir}

install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} %{buildroot}%{_fontconfig_confdir}

install -m 0644 -p %{SOURCE1} %{buildroot}%{_fontconfig_templatedir}/%{fontconf}

ln -s %{_fontconfig_templatedir}/%{fontconf} %{buildroot}%{_fontconfig_confdir}/%{fontconf}

%clean
rm -rf $RPM_BUILD_ROOT

%_font_pkg -f %{fontconf} *.ttf

%doc license.txt
%dir %{_fontdir}

%changelog
* Sun Jan 25 2009 Sven Lankes <sven at lank.es> - 20030527-1
- Initial packaging



--- NEW FILE import.log ---
dustin-domestic-manners-fonts-20030527-1_fc10:HEAD:dustin-domestic-manners-fonts-20030527-1.fc10.src.rpm:1233094261


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/dustin-domestic-manners-fonts/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	26 Jan 2009 22:39:40 -0000	1.1
+++ .cvsignore	27 Jan 2009 22:11:44 -0000	1.2
@@ -0,0 +1 @@
+Domestic_Manners.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dustin-domestic-manners-fonts/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	26 Jan 2009 22:39:40 -0000	1.1
+++ sources	27 Jan 2009 22:11:44 -0000	1.2
@@ -0,0 +1 @@
+3f5d0178f3b9f9bbabd697090f89c3b9  Domestic_Manners.zip



From slankes at fedoraproject.org  Tue Jan 27 22:27:04 2009
From: slankes at fedoraproject.org (Sven Lankes)
Date: Tue, 27 Jan 2009 22:27:04 +0000 (UTC)
Subject: rpms/dustin-domestic-manners-fonts/F-10
	dustin-domestic-manners-fonts-fontconfig.conf, NONE,
	1.1 dustin-domestic-manners-fonts.spec, NONE, 1.1 sources, 1.1, 1.2
Message-ID: <20090127222704.D68057010B@cvs1.fedora.phx.redhat.com>

Author: slankes

Update of /cvs/pkgs/rpms/dustin-domestic-manners-fonts/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17579/F-10

Modified Files:
	sources 
Added Files:
	dustin-domestic-manners-fonts-fontconfig.conf 
	dustin-domestic-manners-fonts.spec 
Log Message:
initial import


--- NEW FILE dustin-domestic-manners-fonts-fontconfig.conf ---
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
<fontconfig>
  <alias>
    <family>fantasy</family>
    <prefer>
      <family>Domestic Manners</family>
    </prefer>
  </alias>
  <alias>
    <family>Domestic Manners</family>
    <default>
      <family>fantasy</family>
    </default>
  </alias>
</fontconfig>



--- NEW FILE dustin-domestic-manners-fonts.spec ---
%define fontname dustin-domestic-manners
%define fontconf 63-%{fontname}.conf

Name:          %{fontname}-fonts
Version:       20030527
Release:       1%{?dist}
Summary:       Handwriting font by Dustin Norlander

Group:         User Interface/X
License:       GPLv2+
URL:           http://www.dustismo.com
# Actual download URL
#URL:           http://ftp.de.debian.org/debian/pool/main/t/ttf-dustin/ttf-dustin_20030517.orig.tar.gz 
Source0:       Domestic_Manners.zip
Source1:       %{name}-fontconfig.conf
BuildRoot:     %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

BuildArch:     noarch
BuildRequires: fontpackages-devel
Requires:      fontpackages-filesystem

%description 

This font mimics the authors handwriting. The name come from the book 
Domestic Manners of the Americans, by Fanny Trollope.

Font contains, letters, numbers, punctuation, accented characters and 
some special characters (most European Latin characters).

%prep
%setup -q -c %{name}
sed -i 's/\r//' license.txt

%build

%install
rm -fr %{buildroot}
install -m 0755 -d %{buildroot}%{_fontdir}
install -m 0644 -p *.ttf %{buildroot}%{_fontdir}

install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} %{buildroot}%{_fontconfig_confdir}

install -m 0644 -p %{SOURCE1} %{buildroot}%{_fontconfig_templatedir}/%{fontconf}

ln -s %{_fontconfig_templatedir}/%{fontconf} %{buildroot}%{_fontconfig_confdir}/%{fontconf}

%clean
rm -rf $RPM_BUILD_ROOT

%_font_pkg -f %{fontconf} *.ttf

%doc license.txt
%dir %{_fontdir}

%changelog
* Sun Jan 25 2009 Sven Lankes <sven at lank.es> - 20030527-1
- Initial packaging



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dustin-domestic-manners-fonts/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	26 Jan 2009 22:39:40 -0000	1.1
+++ sources	27 Jan 2009 22:26:34 -0000	1.2
@@ -0,0 +1 @@
+3f5d0178f3b9f9bbabd697090f89c3b9  Domestic_Manners.zip



From slankes at fedoraproject.org  Tue Jan 27 22:27:05 2009
From: slankes at fedoraproject.org (Sven Lankes)
Date: Tue, 27 Jan 2009 22:27:05 +0000 (UTC)
Subject: rpms/dustin-domestic-manners-fonts/F-9
	dustin-domestic-manners-fonts-fontconfig.conf, NONE,
	1.1 dustin-domestic-manners-fonts.spec, NONE, 1.1 sources, 1.1, 1.2
Message-ID: <20090127222705.08DC77010B@cvs1.fedora.phx.redhat.com>

Author: slankes

Update of /cvs/pkgs/rpms/dustin-domestic-manners-fonts/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17579/F-9

Modified Files:
	sources 
Added Files:
	dustin-domestic-manners-fonts-fontconfig.conf 
	dustin-domestic-manners-fonts.spec 
Log Message:
initial import


--- NEW FILE dustin-domestic-manners-fonts-fontconfig.conf ---
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
<fontconfig>
  <alias>
    <family>fantasy</family>
    <prefer>
      <family>Domestic Manners</family>
    </prefer>
  </alias>
  <alias>
    <family>Domestic Manners</family>
    <default>
      <family>fantasy</family>
    </default>
  </alias>
</fontconfig>



--- NEW FILE dustin-domestic-manners-fonts.spec ---
%define fontname dustin-domestic-manners
%define fontconf 63-%{fontname}.conf

Name:          %{fontname}-fonts
Version:       20030527
Release:       1%{?dist}
Summary:       Handwriting font by Dustin Norlander

Group:         User Interface/X
License:       GPLv2+
URL:           http://www.dustismo.com
# Actual download URL
#URL:           http://ftp.de.debian.org/debian/pool/main/t/ttf-dustin/ttf-dustin_20030517.orig.tar.gz 
Source0:       Domestic_Manners.zip
Source1:       %{name}-fontconfig.conf
BuildRoot:     %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

BuildArch:     noarch
BuildRequires: fontpackages-devel
Requires:      fontpackages-filesystem

%description 

This font mimics the authors handwriting. The name come from the book 
Domestic Manners of the Americans, by Fanny Trollope.

Font contains, letters, numbers, punctuation, accented characters and 
some special characters (most European Latin characters).

%prep
%setup -q -c %{name}
sed -i 's/\r//' license.txt

%build

%install
rm -fr %{buildroot}
install -m 0755 -d %{buildroot}%{_fontdir}
install -m 0644 -p *.ttf %{buildroot}%{_fontdir}

install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} %{buildroot}%{_fontconfig_confdir}

install -m 0644 -p %{SOURCE1} %{buildroot}%{_fontconfig_templatedir}/%{fontconf}

ln -s %{_fontconfig_templatedir}/%{fontconf} %{buildroot}%{_fontconfig_confdir}/%{fontconf}

%clean
rm -rf $RPM_BUILD_ROOT

%_font_pkg -f %{fontconf} *.ttf

%doc license.txt
%dir %{_fontdir}

%changelog
* Sun Jan 25 2009 Sven Lankes <sven at lank.es> - 20030527-1
- Initial packaging



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dustin-domestic-manners-fonts/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	26 Jan 2009 22:39:40 -0000	1.1
+++ sources	27 Jan 2009 22:26:34 -0000	1.2
@@ -0,0 +1 @@
+3f5d0178f3b9f9bbabd697090f89c3b9  Domestic_Manners.zip



From slankes at fedoraproject.org  Tue Jan 27 22:33:47 2009
From: slankes at fedoraproject.org (Sven Lankes)
Date: Tue, 27 Jan 2009 22:33:47 +0000 (UTC)
Subject: rpms/sj-fonts/F-10 sj-fonts-delphine-fontconfig.conf, NONE,
	1.1 sj-fonts-stevehand-fontconfig.conf, NONE, 1.1 sj-fonts.spec,
	NONE, 1.1 sources, 1.1, 1.2
Message-ID: <20090127223348.06A7D7010B@cvs1.fedora.phx.redhat.com>

Author: slankes

Update of /cvs/pkgs/rpms/sj-fonts/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19218/F-10

Modified Files:
	sources 
Added Files:
	sj-fonts-delphine-fontconfig.conf 
	sj-fonts-stevehand-fontconfig.conf sj-fonts.spec 
Log Message:
initial commit


--- NEW FILE sj-fonts-delphine-fontconfig.conf ---
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
<fontconfig>
  <alias>
    <family>fantasy</family>
    <prefer>
      <family>Delphine</family>
    </prefer>
  </alias>
  <alias>
    <family>Delphine</family>
    <default>
      <family>fantasy</family>
    </default>
  </alias>
</fontconfig>



--- NEW FILE sj-fonts-stevehand-fontconfig.conf ---
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
<fontconfig>
  <alias>
    <family>fantasy</family>
    <prefer>
      <family>SteveHand</family>
    </prefer>
  </alias>
  <alias>
    <family>SteveHand</family>
    <default>
      <family>fantasy</family>
    </default>
  </alias>
</fontconfig>



--- NEW FILE sj-fonts.spec ---
%define fontname sj
%define fontconf 63-%{fontname}

%define common_desc Two fonts by Steve Jordi released under the GPL 

Name:          %{fontname}-fonts
Version:       2.0.2
Release:       1%{?dist}
Summary:       Two fonts by Steve Jordi released under the GPL

Group:         User Interface/X
License:       GPLv2 with exceptions
URL:           http://sjfonts.sourceforge.net
Source0:       sjfonts-source-2.0.2.tar.bz2
Source1:       %{name}-delphine-fontconfig.conf
Source2:       %{name}-stevehand-fontconfig.conf
BuildRoot:     %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

BuildArch:     noarch
BuildRequires: fontpackages-devel
BuildRequires: fontforge

%description
%common_desc

%package common
Summary:       Common files for %{name}
Group:         User Interface/X
Requires:      fontpackages-filesystem

%description common
%common_desc

This package consists of files used by other %{name} packages.

%package -n %{fontname}-delphine-fonts
Summary:       Handwriting font
Group:         User Interface/X
Requires:      %{name}-common = %{version}-%{release}

%description -n %{fontname}-delphine-fonts
%common_desc

Handwriting font by Steve Jordi covering latin glyphs.

%_font_pkg -n delphine -f %{fontconf}-delphine.conf Delphine.ttf

%package -n %{fontname}-stevehand-fonts
Summary:       Handwriting font
Group:         User Interface/X
Requires:      %{name}-common = %{version}-%{release}

%description -n %{fontname}-stevehand-fonts
%common_desc

Handwriting font by Steve Jordi covering latin glyphs.

%_font_pkg -n stevehand -f %{fontconf}-stevehand.conf SteveHand.ttf

%prep
%setup -q -c %{name}-%{version}

%build
fontforge -script "-" Delphine.sfd SteveHand.sfd <<EOF
i = 1
while ( i < \$argc )
  Open (\$argv[i], 1)
  Generate (\$fontname + ".ttf")
  PrintSetup (5)
  PrintFont (0, 0, "", \$fontname + "-sample.pdf")
  Close()
  i++
endloop
EOF

%install
rm -rf $RPM_BUILD_ROOT

install -m 0755 -d %{buildroot}%{_fontdir}
install -m 0644 -p *.ttf %{buildroot}%{_fontdir}

install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} %{buildroot}%{_fontconfig_confdir}

install -m 0644 -p %{SOURCE1} %{buildroot}%{_fontconfig_templatedir}/%{fontconf}-delphine.conf
install -m 0644 -p %{SOURCE2} %{buildroot}%{_fontconfig_templatedir}/%{fontconf}-stevehand.conf

for fontconf in %{fontconf}-delphine.conf %{fontconf}-stevehand.conf ; do
  ln -s %{_fontconfig_templatedir}/$fontconf %{buildroot}%{_fontconfig_confdir}/$fontconf
done

%clean
rm -rf $RPM_BUILD_ROOT

%files common
%defattr(0644,root,root,0755)
%doc COPYING
%doc README

%dir %{_fontdir}

%changelog
* Sun Jan 25 2008 Sven Lankes <sven at lank.es> - 2.0.2-1
- Initial packaging



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sj-fonts/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	26 Jan 2009 22:29:53 -0000	1.1
+++ sources	27 Jan 2009 22:33:17 -0000	1.2
@@ -0,0 +1 @@
+f06986cab16248de493109bb2bd1027e  sjfonts-source-2.0.2.tar.bz2



From slankes at fedoraproject.org  Tue Jan 27 22:33:48 2009
From: slankes at fedoraproject.org (Sven Lankes)
Date: Tue, 27 Jan 2009 22:33:48 +0000 (UTC)
Subject: rpms/sj-fonts/F-9 sj-fonts-delphine-fontconfig.conf, NONE,
	1.1 sj-fonts-stevehand-fontconfig.conf, NONE, 1.1 sj-fonts.spec,
	NONE, 1.1 sources, 1.1, 1.2
Message-ID: <20090127223348.2F7F370141@cvs1.fedora.phx.redhat.com>

Author: slankes

Update of /cvs/pkgs/rpms/sj-fonts/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19218/F-9

Modified Files:
	sources 
Added Files:
	sj-fonts-delphine-fontconfig.conf 
	sj-fonts-stevehand-fontconfig.conf sj-fonts.spec 
Log Message:
initial commit


--- NEW FILE sj-fonts-delphine-fontconfig.conf ---
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
<fontconfig>
  <alias>
    <family>fantasy</family>
    <prefer>
      <family>Delphine</family>
    </prefer>
  </alias>
  <alias>
    <family>Delphine</family>
    <default>
      <family>fantasy</family>
    </default>
  </alias>
</fontconfig>



--- NEW FILE sj-fonts-stevehand-fontconfig.conf ---
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
<fontconfig>
  <alias>
    <family>fantasy</family>
    <prefer>
      <family>SteveHand</family>
    </prefer>
  </alias>
  <alias>
    <family>SteveHand</family>
    <default>
      <family>fantasy</family>
    </default>
  </alias>
</fontconfig>



--- NEW FILE sj-fonts.spec ---
%define fontname sj
%define fontconf 63-%{fontname}

%define common_desc Two fonts by Steve Jordi released under the GPL 

Name:          %{fontname}-fonts
Version:       2.0.2
Release:       1%{?dist}
Summary:       Two fonts by Steve Jordi released under the GPL

Group:         User Interface/X
License:       GPLv2 with exceptions
URL:           http://sjfonts.sourceforge.net
Source0:       sjfonts-source-2.0.2.tar.bz2
Source1:       %{name}-delphine-fontconfig.conf
Source2:       %{name}-stevehand-fontconfig.conf
BuildRoot:     %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

BuildArch:     noarch
BuildRequires: fontpackages-devel
BuildRequires: fontforge

%description
%common_desc

%package common
Summary:       Common files for %{name}
Group:         User Interface/X
Requires:      fontpackages-filesystem

%description common
%common_desc

This package consists of files used by other %{name} packages.

%package -n %{fontname}-delphine-fonts
Summary:       Handwriting font
Group:         User Interface/X
Requires:      %{name}-common = %{version}-%{release}

%description -n %{fontname}-delphine-fonts
%common_desc

Handwriting font by Steve Jordi covering latin glyphs.

%_font_pkg -n delphine -f %{fontconf}-delphine.conf Delphine.ttf

%package -n %{fontname}-stevehand-fonts
Summary:       Handwriting font
Group:         User Interface/X
Requires:      %{name}-common = %{version}-%{release}

%description -n %{fontname}-stevehand-fonts
%common_desc

Handwriting font by Steve Jordi covering latin glyphs.

%_font_pkg -n stevehand -f %{fontconf}-stevehand.conf SteveHand.ttf

%prep
%setup -q -c %{name}-%{version}

%build
fontforge -script "-" Delphine.sfd SteveHand.sfd <<EOF
i = 1
while ( i < \$argc )
  Open (\$argv[i], 1)
  Generate (\$fontname + ".ttf")
  PrintSetup (5)
  PrintFont (0, 0, "", \$fontname + "-sample.pdf")
  Close()
  i++
endloop
EOF

%install
rm -rf $RPM_BUILD_ROOT

install -m 0755 -d %{buildroot}%{_fontdir}
install -m 0644 -p *.ttf %{buildroot}%{_fontdir}

install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} %{buildroot}%{_fontconfig_confdir}

install -m 0644 -p %{SOURCE1} %{buildroot}%{_fontconfig_templatedir}/%{fontconf}-delphine.conf
install -m 0644 -p %{SOURCE2} %{buildroot}%{_fontconfig_templatedir}/%{fontconf}-stevehand.conf

for fontconf in %{fontconf}-delphine.conf %{fontconf}-stevehand.conf ; do
  ln -s %{_fontconfig_templatedir}/$fontconf %{buildroot}%{_fontconfig_confdir}/$fontconf
done

%clean
rm -rf $RPM_BUILD_ROOT

%files common
%defattr(0644,root,root,0755)
%doc COPYING
%doc README

%dir %{_fontdir}

%changelog
* Sun Jan 25 2008 Sven Lankes <sven at lank.es> - 2.0.2-1
- Initial packaging



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sj-fonts/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	26 Jan 2009 22:29:53 -0000	1.1
+++ sources	27 Jan 2009 22:33:17 -0000	1.2
@@ -0,0 +1 @@
+f06986cab16248de493109bb2bd1027e  sjfonts-source-2.0.2.tar.bz2



From pkgdb at fedoraproject.org  Tue Jan 27 22:35:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 27 Jan 2009 22:35:40 +0000
Subject: [pkgdb] javassist had acl change status
Message-ID: <20090127223540.E8547208494@bastion.fedora.phx.redhat.com>

red has set the watchbugzilla acl on javassist (Fedora devel) to Approved for john5342

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/javassist



From pkgdb at fedoraproject.org  Tue Jan 27 22:35:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 27 Jan 2009 22:35:39 +0000
Subject: [pkgdb] javassist had acl change status
Message-ID: <20090127223539.92DDF208485@bastion.fedora.phx.redhat.com>

red has set the watchcommits acl on javassist (Fedora devel) to Approved for john5342

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/javassist



From pkgdb at fedoraproject.org  Tue Jan 27 22:35:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 27 Jan 2009 22:35:47 +0000
Subject: [pkgdb] javassist had acl change status
Message-ID: <20090127223547.AF7B3208497@bastion.fedora.phx.redhat.com>

red has set the commit acl on javassist (Fedora devel) to Approved for john5342

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/javassist



From pkgdb at fedoraproject.org  Tue Jan 27 22:35:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 27 Jan 2009 22:35:48 +0000
Subject: [pkgdb] javassist had acl change status
Message-ID: <20090127223548.83EEC2084B7@bastion.fedora.phx.redhat.com>

red has set the approveacls acl on javassist (Fedora devel) to Approved for john5342

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/javassist



From pkgdb at fedoraproject.org  Tue Jan 27 22:35:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 27 Jan 2009 22:35:54 +0000
Subject: [pkgdb] javassist had acl change status
Message-ID: <20090127223554.DB64A208605@bastion.fedora.phx.redhat.com>

red has set the approveacls acl on javassist (Fedora 10) to Approved for john5342

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/javassist



From pkgdb at fedoraproject.org  Tue Jan 27 22:35:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 27 Jan 2009 22:35:59 +0000
Subject: [pkgdb] javassist had acl change status
Message-ID: <20090127223559.B5B3220860B@bastion.fedora.phx.redhat.com>

red has set the watchbugzilla acl on javassist (Fedora 10) to Approved for john5342

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/javassist



From pkgdb at fedoraproject.org  Tue Jan 27 22:36:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 27 Jan 2009 22:36:07 +0000
Subject: [pkgdb] javassist had acl change status
Message-ID: <20090127223607.4758320860C@bastion.fedora.phx.redhat.com>

red has set the commit acl on javassist (Fedora 10) to Approved for john5342

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/javassist



From pkgdb at fedoraproject.org  Tue Jan 27 22:36:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 27 Jan 2009 22:36:05 +0000
Subject: [pkgdb] javassist had acl change status
Message-ID: <20090127223605.88455208493@bastion.fedora.phx.redhat.com>

red has set the watchcommits acl on javassist (Fedora 10) to Approved for john5342

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/javassist



From pkgdb at fedoraproject.org  Tue Jan 27 22:36:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 27 Jan 2009 22:36:11 +0000
Subject: [pkgdb] javassist had acl change status
Message-ID: <20090127223611.7A881208679@bastion.fedora.phx.redhat.com>

red has set the watchcommits acl on javassist (Fedora 9) to Approved for john5342

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/javassist



From pkgdb at fedoraproject.org  Tue Jan 27 22:36:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 27 Jan 2009 22:36:10 +0000
Subject: [pkgdb] javassist had acl change status
Message-ID: <20090127223610.3914020860F@bastion.fedora.phx.redhat.com>

red has set the watchbugzilla acl on javassist (Fedora 9) to Approved for john5342

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/javassist



From pkgdb at fedoraproject.org  Tue Jan 27 22:36:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 27 Jan 2009 22:36:16 +0000
Subject: [pkgdb] javassist had acl change status
Message-ID: <20090127223616.A4E742084A7@bastion.fedora.phx.redhat.com>

red has set the commit acl on javassist (Fedora 9) to Approved for john5342

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/javassist



From pkgdb at fedoraproject.org  Tue Jan 27 22:36:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Tue, 27 Jan 2009 22:36:18 +0000
Subject: [pkgdb] javassist had acl change status
Message-ID: <20090127223618.8C14A2086F2@bastion.fedora.phx.redhat.com>

red has set the approveacls acl on javassist (Fedora 9) to Approved for john5342

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/javassist



From steved at fedoraproject.org  Tue Jan 27 23:03:19 2009
From: steved at fedoraproject.org (Steve Dickson)
Date: Tue, 27 Jan 2009 23:03:19 +0000 (UTC)
Subject: rpms/nfs-utils/devel nfs-utils-1.1.4-mount-textbased.patch, NONE,
	1.1 nfs-utils.spec, 1.208, 1.209
Message-ID: <20090127230319.84B3D7010B@cvs1.fedora.phx.redhat.com>

Author: steved

Update of /cvs/pkgs/rpms/nfs-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23675

Modified Files:
	nfs-utils.spec 
Added Files:
	nfs-utils-1.1.4-mount-textbased.patch 
Log Message:
- text-based mount command: make po_rightmost() work for N options
- text-based mount command: Function to stuff "struct pmap" from mount options
- text-based mount options: Use new pmap stuffer when	rewriting mount options
- text-based mount command: fix mount option rewriting logic
- text-based mount command: support AF_INET6 in rewrite_mount_options()


nfs-utils-1.1.4-mount-textbased.patch:

--- NEW FILE nfs-utils-1.1.4-mount-textbased.patch ---
text-based mount command: make po_rightmost() work for N options

Sometimes we need to choose the rightmost option among multiple
different mount options.  For example, we want to find the rightmost
of "proto," "tcp," and "udp".  Or, the rightmost of "vers," "nfsvers,"
"v2," and "v3".

Update po_rightmost() to choose among N options instead of just two.

Signed-off-by: Chuck Lever <chuck.lever at oracle.com>
---

 utils/mount/parse_opt.c |   28 ++++++++++++++++------------
 utils/mount/parse_opt.h |    9 ++-------
 utils/mount/stropts.c   |   28 +++++++++++++++++++++++-----
 3 files changed, 41 insertions(+), 24 deletions(-)

diff --git a/utils/mount/parse_opt.c b/utils/mount/parse_opt.c
index f61d0dd..4934508 100644
--- a/utils/mount/parse_opt.c
+++ b/utils/mount/parse_opt.c
@@ -421,34 +421,38 @@ po_found_t po_get_numeric(struct mount_options *options, char *keyword, long *va
 #endif	/* HAVE_STRTOL */
 
 /**
- * po_rightmost - determine the relative position of two options
+ * po_rightmost - determine the relative position of several options
  * @options: pointer to mount options
- * @key1: pointer to a C string containing an option keyword
- * @key2: pointer to a C string containing another option keyword
+ * @keys: pointer to an array of C strings containing option keywords
+ *
+ * This function can be used to determine which of several similar
+ * options will be the one to take effect.
  *
  * The kernel parses the mount option string from left to right.
  * If an option is specified more than once (for example, "intr"
  * and "nointr", the rightmost option is the last to be parsed,
  * and it therefore takes precedence over previous similar options.
  *
- * This function can be used to determine which of two similar
- * options will be the one to take effect.
+ * This can also distinguish among multiple synonymous options, such
+ * as "proto=," "udp" and "tcp."
+ *
+ * Returns the index into @keys of the option that is rightmost.
+ * If none of the options are present, returns zero.
  */
-po_rightmost_t po_rightmost(struct mount_options *options,
-			    char *key1, char *key2)
+unsigned int po_rightmost(struct mount_options *options, const char *keys[])
 {
 	struct mount_option *option;
+	unsigned int i;
 
 	if (options) {
 		for (option = options->tail; option; option = option->prev) {
-			if (key2 && strcmp(option->keyword, key2) == 0)
-				return PO_KEY2_RIGHTMOST;
-			if (key1 && strcmp(option->keyword, key1) == 0)
-				return PO_KEY1_RIGHTMOST;
+			for (i = 0; keys[i] != NULL; i++)
+				if (strcmp(option->keyword, keys[i]) == 0)
+					return i;
 		}
 	}
 
-	return PO_NEITHER_FOUND;
+	return 0;
 }
 
 /**
diff --git a/utils/mount/parse_opt.h b/utils/mount/parse_opt.h
index 199630f..e132b1c 100644
--- a/utils/mount/parse_opt.h
+++ b/utils/mount/parse_opt.h
@@ -35,12 +35,6 @@ typedef enum {
 	PO_BAD_VALUE = 2,
 } po_found_t;
 
-typedef enum {
-	PO_KEY1_RIGHTMOST = -1,
-	PO_NEITHER_FOUND = 0,
-	PO_KEY2_RIGHTMOST = 1,
-} po_rightmost_t;
-
 struct mount_options;
 
 struct mount_options *	po_split(char *);
@@ -53,7 +47,8 @@ po_found_t		po_contains(struct mount_options *, char *);
 char *			po_get(struct mount_options *, char *);
 po_found_t		po_get_numeric(struct mount_options *,
 					char *, long *);
-po_rightmost_t		po_rightmost(struct mount_options *, char *, char *);
+unsigned int		po_rightmost(struct mount_options *,
+					const char *keys[]);
 po_found_t		po_remove_all(struct mount_options *, char *);
 void			po_destroy(struct mount_options *);
 
diff --git a/utils/mount/stropts.c b/utils/mount/stropts.c
index 43791e6..bd127ab 100644
--- a/utils/mount/stropts.c
+++ b/utils/mount/stropts.c
@@ -224,9 +224,15 @@ static int nfs_fix_mounthost_option(const sa_family_t family,
  * Returns zero if the "lock" option is in effect, but statd
  * can't be started.  Otherwise, returns 1.
  */
+static const char *nfs_lock_opttbl[] = {
+	"nolock",
+	"lock",
+	NULL,
+};
+
 static int nfs_verify_lock_option(struct mount_options *options)
 {
-	if (po_rightmost(options, "nolock", "lock") == PO_KEY1_RIGHTMOST)
+	if (po_rightmost(options, nfs_lock_opttbl) == 1)
 		return 1;
 
 	if (!start_statd()) {
@@ -316,6 +322,12 @@ static int nfs_is_permanent_error(int error)
  * Returns a new group of mount options if successful; otherwise
  * NULL is returned if some failure occurred.
  */
+static const char *nfs_transport_opttbl[] = {
+	"udp",
+	"tcp",
+	NULL,
+};
+
 static struct mount_options *nfs_rewrite_mount_options(char *str)
 {
 	struct mount_options *options;
@@ -395,12 +407,12 @@ static struct mount_options *nfs_rewrite_mount_options(char *str)
 			po_remove_all(options, "proto");
 		}
 	}
-	p = po_rightmost(options, "tcp", "udp");
+	p = po_rightmost(options, nfs_transport_opttbl);
 	switch (p) {
-	case PO_KEY2_RIGHTMOST:
+	case 1:
 		nfs_server.pmap.pm_prot = IPPROTO_UDP;
 		break;
-	case PO_KEY1_RIGHTMOST:
+	case 2:
 		nfs_server.pmap.pm_prot = IPPROTO_TCP;
 		break;
 	}
@@ -722,12 +734,18 @@ static int nfsmount_bg(struct nfsmount_info *mi)
  *
  * Returns a valid mount command exit code.
  */
+static const char *nfs_background_opttbl[] = {
+	"bg",
+	"fg",
+	NULL,
+};
+
 static int nfsmount_start(struct nfsmount_info *mi)
 {
 	if (!nfs_validate_options(mi))
 		return EX_FAIL;
 
-	if (po_rightmost(mi->options, "bg", "fg") == PO_KEY1_RIGHTMOST)
+	if (po_rightmost(mi->options, nfs_background_opttbl) == 1)
 		return nfsmount_bg(mi);
 	else
 		return nfsmount_fg(mi);

text-based mount command: Function to stuff "struct pmap" from mount options

Both the text-based mount.nfs command and the umount.nfs command need
to fill in a pmap structure based on string mount options.  Introduce
a shared function that can do this.

Signed-off-by: Chuck Lever <chuck.lever at oracle.com>
---

 utils/mount/network.c |  214 +++++++++++++++++++++++++++++++++++++++++++++++++
 utils/mount/network.h |    5 +
 2 files changed, 219 insertions(+), 0 deletions(-)

diff --git a/utils/mount/network.c b/utils/mount/network.c
index d262e94..91a005c 100644
--- a/utils/mount/network.c
+++ b/utils/mount/network.c
@@ -48,6 +48,7 @@
 #include "nfs_mount.h"
 #include "mount_constants.h"
 #include "nfsrpc.h"
+#include "parse_opt.h"
 #include "network.h"
 
 #define PMAP_TIMEOUT	(10)
@@ -67,6 +68,33 @@ static const char *nfs_ns_pgmtbl[] = {
 	NULL,
 };
 
+static const char *nfs_mnt_pgmtbl[] = {
+	"mount",
+	"mountd",
+	NULL,
+};
+
+static const char *nfs_nfs_pgmtbl[] = {
+	"nfs",
+	"nfsprog",
+	NULL,
+};
+
+static const char *nfs_transport_opttbl[] = {
+	"udp",
+	"tcp",
+	"proto",
+	NULL,
+};
+
+static const char *nfs_version_opttbl[] = {
+	"v2",
+	"v3",
+	"vers",
+	"nfsvers",
+	NULL,
+};
+
 static const unsigned long nfs_to_mnt[] = {
 	0,
 	0,
@@ -1111,3 +1139,189 @@ out_failed:
 	return 0;
 
 }
+
+/*
+ * "nfsprog" is only supported by the legacy mount command.  The
+ * kernel mount client does not support this option.
+ *
+ * Returns the value set by the nfsprog= option, the value of
+ * the RPC NFS program specified in /etc/rpc, or a baked-in
+ * default program number, if all fails.
+ */
+static rpcprog_t nfs_nfs_program(struct mount_options *options)
+{
+	long tmp;
+
+	if (po_get_numeric(options, "nfsprog", &tmp) == PO_FOUND)
+		if (tmp >= 0)
+			return tmp;
+	return nfs_getrpcbyname(NFSPROG, nfs_nfs_pgmtbl);
+}
+
+
+/*
+ * Returns the RPC version number specified by the given mount
+ * options for the NFS service, or zero if all fails.
+ */
+static rpcvers_t nfs_nfs_version(struct mount_options *options)
+{
+	long tmp;
+
+	switch (po_rightmost(options, nfs_version_opttbl)) {
+	case 1:	/* v2 */
+		return 2;
+	case 2: /* v3 */
+		return 3;
+	case 3:	/* vers */
+		if (po_get_numeric(options, "vers", &tmp) == PO_FOUND)
+			if (tmp >= 2 && tmp <= 3)
+				return tmp;
+		break;
+	case 4: /* nfsvers */
+		if (po_get_numeric(options, "nfsvers", &tmp) == PO_FOUND)
+			if (tmp >= 2 && tmp <= 3)
+				return tmp;
+		break;
+	}
+
+	return 0;
+}
+
+/*
+ * Returns the NFS transport protocol specified by the given mount options
+ *
+ * Returns the IPPROTO_ value specified by the given mount options, or
+ * IPPROTO_UDP if all fails.
+ */
+static unsigned short nfs_nfs_protocol(struct mount_options *options)
+{
+	char *option;
+
+	switch (po_rightmost(options, nfs_transport_opttbl)) {
+	case 1:	/* udp */
+		return IPPROTO_UDP;
+	case 2: /* tcp */
+		return IPPROTO_TCP;
+	case 3: /* proto */
+		option = po_get(options, "proto");
+		if (option) {
+			if (strcmp(option, "tcp") == 0)
+				return IPPROTO_TCP;
+			if (strcmp(option, "udp") == 0)
+				return IPPROTO_UDP;
+		}
+	}
+	return IPPROTO_UDP;
+}
+
+/*
+ * Returns the NFS server's port number specified by the given
+ * mount options, or zero if all fails.  Zero results in a portmap
+ * query to discover the server's mountd service port.
+ *
+ * port=0 will guarantee an rpcbind request precedes the first
+ * NFS RPC so the client can determine the server's port number.
+ */
+static unsigned short nfs_nfs_port(struct mount_options *options)
+{
+	long tmp;
+
+	if (po_get_numeric(options, "port", &tmp) == PO_FOUND)
+		if (tmp >= 0 && tmp <= 65535)
+			return tmp;
+	return 0;
+}
+
+/*
+ * "mountprog" is only supported by the legacy mount command.  The
+ * kernel mount client does not support this option.
+ *
+ * Returns the value set by the mountprog= option, the value of
+ * the RPC mount program specified in /etc/rpc, or a baked-in
+ * default program number, if all fails.
+ */
+static rpcprog_t nfs_mount_program(struct mount_options *options)
+{
+	long tmp;
+
+	if (po_get_numeric(options, "mountprog", &tmp) == PO_FOUND)
+		if (tmp >= 0)
+			return tmp;
+	return nfs_getrpcbyname(MOUNTPROG, nfs_mnt_pgmtbl);
+}
+
+/*
+ * Returns the RPC version number specified by the given mount options,
+ * or the version "3" if all fails.
+ */
+static rpcvers_t nfs_mount_version(struct mount_options *options)
+{
+	long tmp;
+
+	if (po_get_numeric(options, "mountvers", &tmp) == PO_FOUND)
+		if (tmp >= 1 && tmp <= 4)
+			return tmp;
+
+	return nfsvers_to_mnt(nfs_nfs_version(options));
+}
+
+/*
+ * Returns the transport protocol to use for the mount service
+ *
+ * Returns the IPPROTO_ value specified by the mountproto option, or
+ * if that doesn't exist, the IPPROTO_ value specified for NFS
+ * itself.
+ */
+static unsigned short nfs_mount_protocol(struct mount_options *options)
+{
+	char *option;
+
+	option = po_get(options, "mountproto");
+	if (option) {
+		if (strcmp(option, "tcp") == 0)
+			return IPPROTO_TCP;
+		if (strcmp(option, "udp") == 0)
+			return IPPROTO_UDP;
+	}
+
+	return nfs_nfs_version(options);
+}
+
+/*
+ * Returns the mountd server's port number specified by the given
+ * mount options, or zero if all fails.  Zero results in a portmap
+ * query to discover the server's mountd service port.
+ *
+ * port=0 will guarantee an rpcbind request precedes the mount
+ * RPC so the client can determine the server's port number.
+ */
+static unsigned short nfs_mount_port(struct mount_options *options)
+{
+	long tmp;
+
+	if (po_get_numeric(options, "mountport", &tmp) == PO_FOUND)
+		if (tmp >= 0 && tmp <= 65535)
+			return tmp;
+	return 0;
+}
+
+/**
+ * nfs_options2pmap - set up pmap structs based on mount options
+ * @options: pointer to mount options
+ * @nfs_pmap: OUT: pointer to pmap arguments for NFS server
+ * @mnt_pmap: OUT: pointer to pmap arguments for mountd server
+ *
+ */
+void nfs_options2pmap(struct mount_options *options,
+		      struct pmap *nfs_pmap, struct pmap *mnt_pmap)
+{
+	nfs_pmap->pm_prog = nfs_nfs_program(options);
+	nfs_pmap->pm_vers = nfs_nfs_version(options);
+	nfs_pmap->pm_prot = nfs_nfs_protocol(options);
+	nfs_pmap->pm_port = nfs_nfs_port(options);
+
+	mnt_pmap->pm_prog = nfs_mount_program(options);
+	mnt_pmap->pm_vers = nfs_mount_version(options);
+	mnt_pmap->pm_prot = nfs_mount_protocol(options);
+	mnt_pmap->pm_port = nfs_mount_port(options);
+}
diff --git a/utils/mount/network.h b/utils/mount/network.h
index 075093d..25060ab 100644
--- a/utils/mount/network.h
+++ b/utils/mount/network.h
@@ -57,6 +57,11 @@ int clnt_ping(struct sockaddr_in *, const unsigned long,
 		const unsigned long, const unsigned int,
 		struct sockaddr_in *);
 
+struct mount_options;
+
+void nfs_options2pmap(struct mount_options *,
+		      struct pmap *, struct pmap *);
+
 int start_statd(void);
 
 unsigned long nfsvers_to_mnt(const unsigned long);

text-based mount options: Use new pmap stuffer when	rewriting mount options

all nfs_options2pmap() in nfs_rewrite_mount_options() instead of
open-coding the logic to convert mount options to a pmap struct.
The new nfs_options2pmap() function is more careful about avoiding
invalid mount option values, and handles multiply-specified transport
protocol options correctly.

Signed-off-by: Chuck Lever <chuck.lever at oracle.com>
---

 utils/mount/stropts.c |   68 ++++---------------------------------------------
 1 files changed, 5 insertions(+), 63 deletions(-)

diff --git a/utils/mount/stropts.c b/utils/mount/stropts.c
index bd127ab..99be0f3 100644
--- a/utils/mount/stropts.c
+++ b/utils/mount/stropts.c
@@ -322,19 +322,12 @@ static int nfs_is_permanent_error(int error)
  * Returns a new group of mount options if successful; otherwise
  * NULL is returned if some failure occurred.
  */
-static const char *nfs_transport_opttbl[] = {
-	"udp",
-	"tcp",
-	NULL,
-};
-
 static struct mount_options *nfs_rewrite_mount_options(char *str)
 {
 	struct mount_options *options;
 	char *option, new_option[64];
 	clnt_addr_t mnt_server = { };
 	clnt_addr_t nfs_server = { };
-	int p;
 
 	options = po_split(str);
 	if (!options) {
@@ -360,64 +353,13 @@ static struct mount_options *nfs_rewrite_mount_options(char *str)
 		memcpy(&mnt_server.saddr, &nfs_server.saddr,
 				sizeof(mnt_server.saddr));
 
-	option = po_get(options, "mountport");
-	if (option)
-		mnt_server.pmap.pm_port = atoi(option);
-	mnt_server.pmap.pm_prog = MOUNTPROG;
-	option = po_get(options, "mountvers");
-	if (option)
-		mnt_server.pmap.pm_vers = atoi(option);
-	option = po_get(options, "mountproto");
-	if (option) {
-		if (strcmp(option, "tcp") == 0) {
-			mnt_server.pmap.pm_prot = IPPROTO_TCP;
-			po_remove_all(options, "mountproto");
-		}
-		if (strcmp(option, "udp") == 0) {
-			mnt_server.pmap.pm_prot = IPPROTO_UDP;
-			po_remove_all(options, "mountproto");
-		}
-	}
+	nfs_options2pmap(options, &nfs_server.pmap, &mnt_server.pmap);
 
-	option = po_get(options, "port");
-	if (option) {
-		nfs_server.pmap.pm_port = atoi(option);
-		po_remove_all(options, "port");
-	}
+	/* The kernel NFS client doesn't support changing the RPC program
+	 * number for these services, so reset these fields before probing
+	 * the server's ports.  */
 	nfs_server.pmap.pm_prog = NFS_PROGRAM;
-
-	option = po_get(options, "nfsvers");
-	if (option) {
-		nfs_server.pmap.pm_vers = atoi(option);
-		po_remove_all(options, "nfsvers");
-	}
-	option = po_get(options, "vers");
-	if (option) {
-		nfs_server.pmap.pm_vers = atoi(option);
-		po_remove_all(options, "vers");
-	}
-	option = po_get(options, "proto");
-	if (option) {
-		if (strcmp(option, "tcp") == 0) {
-			nfs_server.pmap.pm_prot = IPPROTO_TCP;
-			po_remove_all(options, "proto");
-		}
-		if (strcmp(option, "udp") == 0) {
-			nfs_server.pmap.pm_prot = IPPROTO_UDP;
-			po_remove_all(options, "proto");
-		}
-	}
-	p = po_rightmost(options, nfs_transport_opttbl);
-	switch (p) {
-	case 1:
-		nfs_server.pmap.pm_prot = IPPROTO_UDP;
-		break;
-	case 2:
-		nfs_server.pmap.pm_prot = IPPROTO_TCP;
-		break;
-	}
-	po_remove_all(options, "tcp");
-	po_remove_all(options, "udp");
+	mnt_server.pmap.pm_prog = MOUNTPROG;
 
 	if (!probe_bothports(&mnt_server, &nfs_server)) {
 		errno = ESPIPE;

text-based mount command: fix mount option rewriting logic

Fix a bunch of corner cases in the text-based mount option rewriting logic.

Signed-off-by: Chuck Lever <chuck.lever at oracle.com>
---

 utils/mount/stropts.c |  113 ++++++++++++++++++++++++++++++++++---------------
 1 files changed, 79 insertions(+), 34 deletions(-)

diff --git a/utils/mount/stropts.c b/utils/mount/stropts.c
index 99be0f3..319be71 100644
--- a/utils/mount/stropts.c
+++ b/utils/mount/stropts.c
@@ -309,6 +309,81 @@ static int nfs_is_permanent_error(int error)
 	}
 }
 
+static int nfs_construct_new_options(struct mount_options *options,
+				     struct pmap *nfs_pmap,
+				     struct pmap *mnt_pmap)
+{
+	char new_option[64];
+
+	po_remove_all(options, "nfsprog");
+	po_remove_all(options, "mountprog");
+
+	po_remove_all(options, "v2");
+	po_remove_all(options, "v3");
+	po_remove_all(options, "vers");
+	po_remove_all(options, "nfsvers");
+	snprintf(new_option, sizeof(new_option) - 1,
+		 "vers=%lu", nfs_pmap->pm_vers);
+	if (po_append(options, new_option) == PO_FAILED)
+		return 0;
+
+	po_remove_all(options, "proto");
+	po_remove_all(options, "udp");
+	po_remove_all(options, "tcp");
+	switch (nfs_pmap->pm_prot) {
+	case IPPROTO_TCP:
+		snprintf(new_option, sizeof(new_option) - 1,
+			 "proto=tcp");
+		if (po_append(options, new_option) == PO_FAILED)
+			return 0;
+		break;
+	case IPPROTO_UDP:
+		snprintf(new_option, sizeof(new_option) - 1,
+			 "proto=udp");
+		if (po_append(options, new_option) == PO_FAILED)
+			return 0;
+		break;
+	}
+
+	po_remove_all(options, "port");
+	if (nfs_pmap->pm_port != NFS_PORT) {
+		snprintf(new_option, sizeof(new_option) - 1,
+			 "port=%lu", nfs_pmap->pm_port);
+		if (po_append(options, new_option) == PO_FAILED)
+			return 0;
+	}
+
+	po_remove_all(options, "mountvers");
+	snprintf(new_option, sizeof(new_option) - 1,
+		 "mountvers=%lu", mnt_pmap->pm_vers);
+	if (po_append(options, new_option) == PO_FAILED)
+		return 0;
+
+	po_remove_all(options, "mountproto");
+	switch (mnt_pmap->pm_prot) {
+	case IPPROTO_TCP:
+		snprintf(new_option, sizeof(new_option) - 1,
+			 "mountproto=tcp");
+		if (po_append(options, new_option) == PO_FAILED)
+			return 0;
+		break;
+	case IPPROTO_UDP:
+		snprintf(new_option, sizeof(new_option) - 1,
+			 "mountproto=udp");
+		if (po_append(options, new_option) == PO_FAILED)
+			return 0;
+		break;
+	}
+
+	po_remove_all(options, "mountport");
+	snprintf(new_option, sizeof(new_option) - 1,
+		 "mountport=%lu", mnt_pmap->pm_port);
+	if (po_append(options, new_option) == PO_FAILED)
+		return 0;
+
+	return 1;
+}
+
 /*
  * Reconstruct the mount option string based on a portmapper probe
  * of the server.  Returns one if the server's portmapper returned
@@ -325,7 +400,7 @@ static int nfs_is_permanent_error(int error)
 static struct mount_options *nfs_rewrite_mount_options(char *str)
 {
 	struct mount_options *options;
-	char *option, new_option[64];
+	char *option;
 	clnt_addr_t mnt_server = { };
 	clnt_addr_t nfs_server = { };
 
@@ -366,42 +441,12 @@ static struct mount_options *nfs_rewrite_mount_options(char *str)
 		goto err;
 	}
 
-	snprintf(new_option, sizeof(new_option) - 1,
-		 "nfsvers=%lu", nfs_server.pmap.pm_vers);
-	if (po_append(options, new_option) == PO_FAILED)
+	if (!nfs_construct_new_options(options,
+					&nfs_server.pmap, &mnt_server.pmap)) {
+		errno = EINVAL;
 		goto err;
-
-	if (nfs_server.pmap.pm_prot == IPPROTO_TCP)
-		snprintf(new_option, sizeof(new_option) - 1,
-			 "proto=tcp");
-	else
-		snprintf(new_option, sizeof(new_option) - 1,
-			 "proto=udp");
-	if (po_append(options, new_option) == PO_FAILED)
-		goto err;
-
-	if (nfs_server.pmap.pm_port != NFS_PORT) {
-		snprintf(new_option, sizeof(new_option) - 1,
-			 "port=%lu", nfs_server.pmap.pm_port);
-		if (po_append(options, new_option) == PO_FAILED)
-			goto err;
-
 	}
 
-	if (mnt_server.pmap.pm_prot == IPPROTO_TCP)
-		snprintf(new_option, sizeof(new_option) - 1,
-			 "mountproto=tcp");
-	else
-		snprintf(new_option, sizeof(new_option) - 1,
-			 "mountproto=udp");
-	if (po_append(options, new_option) == PO_FAILED)
-		goto err;
-
-	snprintf(new_option, sizeof(new_option) - 1,
-		 "mountport=%lu", mnt_server.pmap.pm_port);
-	if (po_append(options, new_option) == PO_FAILED)
-		goto err;
-
 	errno = 0;
 	return options;
 

text-based mount command: support AF_INET6 in	rewrite_mount_options()

Now that we have an AF_INET6-capable probe_bothports(), we can support
AF_INET6 when rewriting text-based NFS mount options.  This should be
adequate to support NFS transport protocol and version negotiation with
AF_INET6 NFS servers.

Signed-off-by: Chuck Lever <chuck.lever at oracle.com>
---

 utils/mount/stropts.c |   74 ++++++++++++++++++++++++++++++++-----------------
 1 files changed, 49 insertions(+), 25 deletions(-)

diff --git a/utils/mount/stropts.c b/utils/mount/stropts.c
index 319be71..6d44bb7 100644
--- a/utils/mount/stropts.c
+++ b/utils/mount/stropts.c
@@ -309,6 +309,37 @@ static int nfs_is_permanent_error(int error)
 	}
 }
 
+/*
+ * Get NFS/mnt server addresses from mount options
+ *
+ * Returns 1 and fills in @nfs_saddr, @nfs_salen, @mnt_saddr, and @mnt_salen
+ * if all goes well; otherwise zero.
+ */
+static int nfs_extract_server_addresses(struct mount_options *options,
+					struct sockaddr *nfs_saddr,
+					socklen_t *nfs_salen,
+					struct sockaddr *mnt_saddr,
+					socklen_t *mnt_salen)
+{
+	char *option;
+
+	option = po_get(options, "addr");
+	if (option == NULL)
+		return 0;
+	if (!nfs_string_to_sockaddr(option, strlen(option),
+						nfs_saddr, nfs_salen))
+		return 0;
+
+	option = po_get(options, "mountaddr");
+	if (option == NULL)
+		memcpy(mnt_saddr, nfs_saddr, *nfs_salen);
+	else if (!nfs_string_to_sockaddr(option, strlen(option),
+						mnt_saddr, mnt_salen))
+		return 0;
+
+	return 1;
+}
+
 static int nfs_construct_new_options(struct mount_options *options,
 				     struct pmap *nfs_pmap,
 				     struct pmap *mnt_pmap)
@@ -400,9 +431,14 @@ static int nfs_construct_new_options(struct mount_options *options,
 static struct mount_options *nfs_rewrite_mount_options(char *str)
 {
 	struct mount_options *options;
-	char *option;
-	clnt_addr_t mnt_server = { };
-	clnt_addr_t nfs_server = { };
+	struct sockaddr_storage nfs_address;
+	struct sockaddr *nfs_saddr = (struct sockaddr *)&nfs_address;
+	socklen_t nfs_salen;
+	struct pmap nfs_pmap;
+	struct sockaddr_storage mnt_address;
+	struct sockaddr *mnt_saddr = (struct sockaddr *)&mnt_address;
+	socklen_t mnt_salen;
+	struct pmap mnt_pmap;
 
 	options = po_split(str);
 	if (!options) {
@@ -410,39 +446,27 @@ static struct mount_options *nfs_rewrite_mount_options(char *str)
 		return NULL;
 	}
 
-	errno = EINVAL;
-	option = po_get(options, "addr");
-	if (option) {
-		nfs_server.saddr.sin_family = AF_INET;
-		if (!inet_aton((const char *)option, &nfs_server.saddr.sin_addr))
-			goto err;
-	} else
+	if (!nfs_extract_server_addresses(options, nfs_saddr, &nfs_salen,
+						mnt_saddr, &mnt_salen)) {
+		errno = EINVAL;
 		goto err;
+	}
 
-	option = po_get(options, "mountaddr");
-	if (option) {
-		mnt_server.saddr.sin_family = AF_INET;
-		if (!inet_aton((const char *)option, &mnt_server.saddr.sin_addr))
-			goto err;
-	} else
-		memcpy(&mnt_server.saddr, &nfs_server.saddr,
-				sizeof(mnt_server.saddr));
-
-	nfs_options2pmap(options, &nfs_server.pmap, &mnt_server.pmap);
+	nfs_options2pmap(options, &nfs_pmap, &mnt_pmap);
 
 	/* The kernel NFS client doesn't support changing the RPC program
 	 * number for these services, so reset these fields before probing
 	 * the server's ports.  */
-	nfs_server.pmap.pm_prog = NFS_PROGRAM;
-	mnt_server.pmap.pm_prog = MOUNTPROG;
+	nfs_pmap.pm_prog = NFS_PROGRAM;
+	mnt_pmap.pm_prog = MOUNTPROG;
 
-	if (!probe_bothports(&mnt_server, &nfs_server)) {
+	if (!nfs_probe_bothports(mnt_saddr, mnt_salen, &mnt_pmap,
+				 nfs_saddr, nfs_salen, &nfs_pmap)) {
 		errno = ESPIPE;
 		goto err;
 	}
 
-	if (!nfs_construct_new_options(options,
-					&nfs_server.pmap, &mnt_server.pmap)) {
+	if (!nfs_construct_new_options(options, &nfs_pmap, &mnt_pmap)) {
 		errno = EINVAL;
 		goto err;
 	}



Index: nfs-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nfs-utils/devel/nfs-utils.spec,v
retrieving revision 1.208
retrieving revision 1.209
diff -u -r1.208 -r1.209
--- nfs-utils.spec	20 Jan 2009 11:34:28 -0000	1.208
+++ nfs-utils.spec	27 Jan 2009 23:02:49 -0000	1.209
@@ -2,7 +2,7 @@
 Name: nfs-utils
 URL: http://sourceforge.net/projects/nfs
 Version: 1.1.4
-Release: 13%{?dist}
+Release: 14%{?dist}
 Epoch: 1
 
 # group all 32bit related archs
@@ -45,6 +45,7 @@
 Patch116: nfs-utils-1.1.4-configure-uuid.patch
 Patch117: nfs-utils-1.1.4-configure-tirpc.patch
 Patch118: nfs-utils-1.1.4-tcpwrap-rulecheck.patch
+Patch119: nfs-utils-1.1.4-mount-textbased.patch
 
 %if %{enablefscache}
 Patch90: nfs-utils-1.1.0-mount-fsc.patch
@@ -118,6 +119,7 @@
 %patch116 -p1
 %patch117 -p1
 %patch118 -p1
+%patch119 -p1
 
 %if %{enablefscache}
 %patch90 -p1
@@ -281,6 +283,13 @@
 %attr(4755,root,root)   /sbin/umount.nfs4
 
 %changelog
+* Tue Jan 27 2009 Steve Dickson <steved at redhat.com> 1.1.4-14
+- text-based mount command: make po_rightmost() work for N options
+- text-based mount command: Function to stuff "struct pmap" from mount options
+- text-based mount options: Use new pmap stuffer when	rewriting mount options
+- text-based mount command: fix mount option rewriting logic
+- text-based mount command: support AF_INET6 in rewrite_mount_options()
+
 * Tue Jan 20 2009 Steve Dickson <steved at redhat.com> 1.1.4-13
 - mountd: Don't do tcp wrapper check when there are no rules (bz 448898)
 



From than at fedoraproject.org  Tue Jan 27 23:13:52 2009
From: than at fedoraproject.org (Than Ngo)
Date: Tue, 27 Jan 2009 23:13:52 +0000 (UTC)
Subject: rpms/kdepim/devel kdepim-4.2.0-kpilot.patch,1.2,1.3
Message-ID: <20090127231352.0F25D7010B@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdepim/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25235

Modified Files:
	kdepim-4.2.0-kpilot.patch 
Log Message:
upstream patch, fix data corruption problems in KPilot


kdepim-4.2.0-kpilot.patch:

Index: kdepim-4.2.0-kpilot.patch
===================================================================
RCS file: /cvs/extras/rpms/kdepim/devel/kdepim-4.2.0-kpilot.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- kdepim-4.2.0-kpilot.patch	27 Jan 2009 15:04:23 -0000	1.2
+++ kdepim-4.2.0-kpilot.patch	27 Jan 2009 23:13:51 -0000	1.3
@@ -1,6 +1,17 @@
-diff -up kdepim-4.2.0/kpilot/conduits/akonadibase/akonadirecord.cc.orig kdepim-4.2.0/kpilot/conduits/akonadibase/akonadirecord.cc
---- kdepim-4.2.0/kpilot/conduits/akonadibase/akonadirecord.cc.orig	2009-01-27 15:47:05.000000000 +0100
-+++ kdepim-4.2.0/kpilot/conduits/akonadibase/akonadirecord.cc	2009-01-27 15:58:11.000000000 +0100
+diff -up kdepim-4.2.0/kpilot/conduits/akonadibase/akonadidataproxy.cc.kpilot kdepim-4.2.0/kpilot/conduits/akonadibase/akonadidataproxy.cc
+--- kdepim-4.2.0/kpilot/conduits/akonadibase/akonadidataproxy.cc.kpilot	2009-01-28 00:04:07.000000000 +0100
++++ kdepim-4.2.0/kpilot/conduits/akonadibase/akonadidataproxy.cc	2009-01-28 00:04:33.000000000 +0100
+@@ -136,6 +136,7 @@ void AkonadiDataProxy::loadAllRecords()
+ 				// Well the record with id mPcId doesn't seem to be in the akonadi
+ 				// resource any more so it is deleted.
+ 				AkonadiRecord* ar = createDeletedAkonadiRecord( mPcId );
++				ar->setDummy();
+ 				Q_ASSERT( ar->isDeleted() );
+ 				Q_ASSERT( ar->isModified() );
+ 				Q_ASSERT( ar->id() == mPcId );
+diff -up kdepim-4.2.0/kpilot/conduits/akonadibase/akonadirecord.cc.kpilot kdepim-4.2.0/kpilot/conduits/akonadibase/akonadirecord.cc
+--- kdepim-4.2.0/kpilot/conduits/akonadibase/akonadirecord.cc.kpilot	2009-01-21 11:28:32.000000000 +0100
++++ kdepim-4.2.0/kpilot/conduits/akonadibase/akonadirecord.cc	2009-01-27 16:56:39.000000000 +0100
 @@ -47,6 +47,7 @@ AkonadiRecord::AkonadiRecord( const Akon
  	d->fItem = item;
  	d->fLastSyncDateTime = lastSync.toUTC(); // Item times are saved in UTC time.
@@ -39,9 +50,25 @@
 +	DEBUGKPILOT << "valid: " << valid;
  	return valid;
  }
-diff -up kdepim-4.2.0/kpilot/conduits/todo/todoconduit.cc.orig kdepim-4.2.0/kpilot/conduits/todo/todoconduit.cc
---- kdepim-4.2.0/kpilot/conduits/todo/todoconduit.cc.orig	2009-01-27 16:02:28.000000000 +0100
-+++ kdepim-4.2.0/kpilot/conduits/todo/todoconduit.cc	2009-01-27 16:02:43.000000000 +0100
+diff -up kdepim-4.2.0/kpilot/conduits/akonadibase/akonadirecord.h.kpilot kdepim-4.2.0/kpilot/conduits/akonadibase/akonadirecord.h
+--- kdepim-4.2.0/kpilot/conduits/akonadibase/akonadirecord.h.kpilot	2009-01-28 00:05:26.000000000 +0100
++++ kdepim-4.2.0/kpilot/conduits/akonadibase/akonadirecord.h	2009-01-28 00:07:20.000000000 +0100
+@@ -103,6 +103,12 @@ public:
+ 	 */
+ 	/* virtual */ bool isValid() const;
+ 
++	/**
++	  * Explicit set of whether this is a dummy (intended only for delete)
++	  * record.
++	  */
++	void setDummy( bool dummy = true );
++
+ private:
+ 	QSharedDataPointer<AkonadiRecordPrivate> d;
+ };
+diff -up kdepim-4.2.0/kpilot/conduits/todo/todoconduit.cc.kpilot kdepim-4.2.0/kpilot/conduits/todo/todoconduit.cc
+--- kdepim-4.2.0/kpilot/conduits/todo/todoconduit.cc.kpilot	2009-01-21 11:28:32.000000000 +0100
++++ kdepim-4.2.0/kpilot/conduits/todo/todoconduit.cc	2009-01-27 16:56:39.000000000 +0100
 @@ -68,6 +68,7 @@ void TodoConduit::loadSettings()
  	
  	TodoSettings::self()->readConfig();



From than at fedoraproject.org  Tue Jan 27 23:17:42 2009
From: than at fedoraproject.org (Than Ngo)
Date: Tue, 27 Jan 2009 23:17:42 +0000 (UTC)
Subject: rpms/kdepim/F-10 kdepim-4.2.0-kpilot.patch,1.2,1.3
Message-ID: <20090127231742.B74F77010B@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdepim/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25782

Modified Files:
	kdepim-4.2.0-kpilot.patch 
Log Message:
upstream patch, fix data corruption problems in KPilot


kdepim-4.2.0-kpilot.patch:

Index: kdepim-4.2.0-kpilot.patch
===================================================================
RCS file: /cvs/extras/rpms/kdepim/F-10/kdepim-4.2.0-kpilot.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- kdepim-4.2.0-kpilot.patch	27 Jan 2009 15:08:55 -0000	1.2
+++ kdepim-4.2.0-kpilot.patch	27 Jan 2009 23:17:12 -0000	1.3
@@ -1,6 +1,17 @@
-diff -up kdepim-4.2.0/kpilot/conduits/akonadibase/akonadirecord.cc.orig kdepim-4.2.0/kpilot/conduits/akonadibase/akonadirecord.cc
---- kdepim-4.2.0/kpilot/conduits/akonadibase/akonadirecord.cc.orig	2009-01-27 15:47:05.000000000 +0100
-+++ kdepim-4.2.0/kpilot/conduits/akonadibase/akonadirecord.cc	2009-01-27 15:58:11.000000000 +0100
+diff -up kdepim-4.2.0/kpilot/conduits/akonadibase/akonadidataproxy.cc.kpilot kdepim-4.2.0/kpilot/conduits/akonadibase/akonadidataproxy.cc
+--- kdepim-4.2.0/kpilot/conduits/akonadibase/akonadidataproxy.cc.kpilot	2009-01-28 00:04:07.000000000 +0100
++++ kdepim-4.2.0/kpilot/conduits/akonadibase/akonadidataproxy.cc	2009-01-28 00:04:33.000000000 +0100
+@@ -136,6 +136,7 @@ void AkonadiDataProxy::loadAllRecords()
+ 				// Well the record with id mPcId doesn't seem to be in the akonadi
+ 				// resource any more so it is deleted.
+ 				AkonadiRecord* ar = createDeletedAkonadiRecord( mPcId );
++				ar->setDummy();
+ 				Q_ASSERT( ar->isDeleted() );
+ 				Q_ASSERT( ar->isModified() );
+ 				Q_ASSERT( ar->id() == mPcId );
+diff -up kdepim-4.2.0/kpilot/conduits/akonadibase/akonadirecord.cc.kpilot kdepim-4.2.0/kpilot/conduits/akonadibase/akonadirecord.cc
+--- kdepim-4.2.0/kpilot/conduits/akonadibase/akonadirecord.cc.kpilot	2009-01-21 11:28:32.000000000 +0100
++++ kdepim-4.2.0/kpilot/conduits/akonadibase/akonadirecord.cc	2009-01-27 16:56:39.000000000 +0100
 @@ -47,6 +47,7 @@ AkonadiRecord::AkonadiRecord( const Akon
  	d->fItem = item;
  	d->fLastSyncDateTime = lastSync.toUTC(); // Item times are saved in UTC time.
@@ -39,9 +50,25 @@
 +	DEBUGKPILOT << "valid: " << valid;
  	return valid;
  }
-diff -up kdepim-4.2.0/kpilot/conduits/todo/todoconduit.cc.orig kdepim-4.2.0/kpilot/conduits/todo/todoconduit.cc
---- kdepim-4.2.0/kpilot/conduits/todo/todoconduit.cc.orig	2009-01-27 16:02:28.000000000 +0100
-+++ kdepim-4.2.0/kpilot/conduits/todo/todoconduit.cc	2009-01-27 16:02:43.000000000 +0100
+diff -up kdepim-4.2.0/kpilot/conduits/akonadibase/akonadirecord.h.kpilot kdepim-4.2.0/kpilot/conduits/akonadibase/akonadirecord.h
+--- kdepim-4.2.0/kpilot/conduits/akonadibase/akonadirecord.h.kpilot	2009-01-28 00:05:26.000000000 +0100
++++ kdepim-4.2.0/kpilot/conduits/akonadibase/akonadirecord.h	2009-01-28 00:07:20.000000000 +0100
+@@ -103,6 +103,12 @@ public:
+ 	 */
+ 	/* virtual */ bool isValid() const;
+ 
++	/**
++	  * Explicit set of whether this is a dummy (intended only for delete)
++	  * record.
++	  */
++	void setDummy( bool dummy = true );
++
+ private:
+ 	QSharedDataPointer<AkonadiRecordPrivate> d;
+ };
+diff -up kdepim-4.2.0/kpilot/conduits/todo/todoconduit.cc.kpilot kdepim-4.2.0/kpilot/conduits/todo/todoconduit.cc
+--- kdepim-4.2.0/kpilot/conduits/todo/todoconduit.cc.kpilot	2009-01-21 11:28:32.000000000 +0100
++++ kdepim-4.2.0/kpilot/conduits/todo/todoconduit.cc	2009-01-27 16:56:39.000000000 +0100
 @@ -68,6 +68,7 @@ void TodoConduit::loadSettings()
  	
  	TodoSettings::self()->readConfig();



From jakub at fedoraproject.org  Tue Jan 27 23:41:08 2009
From: jakub at fedoraproject.org (Jakub Jelinek)
Date: Tue, 27 Jan 2009 23:41:08 +0000 (UTC)
Subject: rpms/gcc/devel gcc.spec,1.13,1.14
Message-ID: <20090127234108.ABA7C7010B@cvs1.fedora.phx.redhat.com>

Author: jakub

Update of /cvs/pkgs/rpms/gcc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29320

Modified Files:
	gcc.spec 
Log Message:
4.4.0-0.13


Index: gcc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/devel/gcc.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- gcc.spec	27 Jan 2009 17:31:57 -0000	1.13
+++ gcc.spec	27 Jan 2009 23:40:38 -0000	1.14
@@ -3,7 +3,7 @@
 %define gcc_version 4.4.0
 # 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 0.12
+%define gcc_release 0.13
 %define _unpackaged_files_terminate_build 0
 %define multilib_64_archs sparc64 ppc64 s390x x86_64
 %define include_gappletviewer 1
@@ -629,6 +629,10 @@
 #GCJFLAGS="$OPT_FLAGS" make %{?_smp_mflags} BOOT_CFLAGS="$OPT_FLAGS" bootstrap
 GCJFLAGS="$OPT_FLAGS" make %{?_smp_mflags} BOOT_CFLAGS="$OPT_FLAGS" profiledbootstrap
 
+%if %{build_cloog}
+cp -a ../cloog-ppl/inst/usr/lib/libcloog.so.0* gcc/
+%endif
+
 # run the tests.
 make %{?_smp_mflags} -k check ALT_CC_UNDER_TEST=gcc ALT_CXX_UNDER_TEST=g++ RUNTESTFLAGS="--target_board=unix/'{,-fstack-protector}'" || :
 echo ====================TESTING=========================
@@ -1747,6 +1751,9 @@
 %doc rpm.doc/changelogs/libmudflap/ChangeLog*
 
 %changelog
+* Wed Jan 28 2009 Jakub Jelinek <jakub at redhat.com> 4.4.0-0.13
+- fix graphite make check
+
 * Tue Jan 27 2009 Jakub Jelinek <jakub at redhat.com> 4.4.0-0.12
 - update from trunk
 - add graphite support



From iburrell at fedoraproject.org  Tue Jan 27 23:55:05 2009
From: iburrell at fedoraproject.org (Ian Burrell)
Date: Tue, 27 Jan 2009 23:55:05 +0000 (UTC)
Subject: rpms/js/EL-5 js-1.7.0-make.patch, NONE,
	1.1 js-1.7.0-threadsafe.patch, 
	NONE, 1.1 .cvsignore, 1.4, 1.5 js.spec, 1.14, 1.15 sources, 1.4, 1.5
Message-ID: <20090127235505.D0E1270110@cvs1.fedora.phx.redhat.com>

Author: iburrell

Update of /cvs/pkgs/rpms/js/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31519

Modified Files:
	.cvsignore js.spec sources 
Added Files:
	js-1.7.0-make.patch js-1.7.0-threadsafe.patch 
Log Message:
merge 1.70 from F-9

js-1.7.0-make.patch:

--- NEW FILE js-1.7.0-make.patch ---
diff -Naupr js.orig/src/Makefile.ref js/src/Makefile.ref
--- js.orig/src/Makefile.ref	2006-07-26 21:16:47.000000000 +0200
+++ js/src/Makefile.ref	2007-11-20 22:00:35.000000000 +0100
@@ -335,8 +335,8 @@ ifdef USE_MSVC
 $(PROGRAM): $(PROG_OBJS) $(LIBRARY)
 	link.exe -out:"$@" $(EXE_LINK_FLAGS) $^
 else
-$(PROGRAM): $(PROG_OBJS) $(LIBRARY)
-	$(CC) -o $@ $(CFLAGS) $(PROG_OBJS) $(LIBRARY) $(LDFLAGS) $(OTHER_LIBS) \
+$(PROGRAM): $(PROG_OBJS) $(SHARED_LIBRARY)
+	$(CC) -o $@ $(CFLAGS) $(PROG_OBJS) -L$(OBJDIR) -ljs $(LDFLAGS) $(OTHER_LIBS) \
 	    $(PROG_LIBS)
 endif
 

js-1.7.0-threadsafe.patch:

--- NEW FILE js-1.7.0-threadsafe.patch ---
diff -Naupr js.orig/src/Makefile.ref js/src/Makefile.ref
--- js.orig/src/Makefile.ref	2006-07-26 21:16:47.000000000 +0200
+++ js/src/Makefile.ref	2007-11-20 22:03:59.000000000 +0100
@@ -63,11 +63,11 @@ INCLUDES   += -I$(OBJDIR)
 
 ifdef JS_THREADSAFE
 DEFINES += -DJS_THREADSAFE
-INCLUDES += -I$(DIST)/include/nspr
+INCLUDES += $(shell nspr-config --cflags)
 ifdef USE_MSVC
 OTHER_LIBS += $(DIST)/lib/libnspr$(NSPR_LIBSUFFIX).lib
 else
-OTHER_LIBS += -L$(DIST)/lib -lnspr$(NSPR_LIBSUFFIX)
+OTHER_LIBS += $(shell nspr-config --libs)
 endif
 endif
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/js/EL-5/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	2 Feb 2007 12:26:40 -0000	1.4
+++ .cvsignore	27 Jan 2009 23:54:35 -0000	1.5
@@ -1 +1 @@
-js-1.60.tar.gz
+js-1.7.0.tar.gz


Index: js.spec
===================================================================
RCS file: /cvs/pkgs/rpms/js/EL-5/js.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- js.spec	2 Feb 2007 12:26:41 -0000	1.14
+++ js.spec	27 Jan 2009 23:54:35 -0000	1.15
@@ -1,28 +1,28 @@
-%{!?perl_vendorarch: %define perl_vendorarch %(eval "`%{__perl} -V:installvendorarch`"; echo $installvendorarch)}
+%define real_version 1.7.0
 
 Summary: JavaScript interpreter and libraries
 Name: js
-Version: 1.60
-Release: 1%{?dist}
+Version: 1.70
+Release: 3%{?dist}
+# The sources are triple licensed, but when we link against readline which is
+# GPL, the result can only be GPL.
 %if 0%{?_without_readline:1}
-License: MPL/GPL/LGPL
+License: GPLv2+ or LGPLv2+ or MPLv1.1
 %else
-License: GPL
+License: GPLv2+
 %endif
 Group: Development/Languages
 URL: http://www.mozilla.org/js/
-Source: http://ftp.mozilla.org/pub/mozilla.org/js/js-%{version}.tar.gz
-Patch0: js-make.patch
+Source: http://ftp.mozilla.org/pub/mozilla.org/js/js-%{real_version}.tar.gz
+Patch0: js-1.7.0-make.patch
 Patch1: js-shlib.patch
 Patch2: js-1.5-va_copy.patch
 Patch3: js-ldflags.patch
-Patch4: js-1.5-threadsafe.patch
+Patch4: js-1.7.0-threadsafe.patch
 Patch5: js-1.60-ncurses.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
-BuildRequires: perl >= 1:5.6.1, readline-devel, ncurses-devel, nspr-devel
-# Temporary fix (#226970 - nspr-devel should require pkgconfig)
-Buildrequires: pkgconfig
+Buildrequires: nspr-devel
+Buildrequires: readline-devel, ncurses-devel
 Provides: libjs = %{version}-%{release}
 
 %description
@@ -34,7 +34,8 @@
 %package devel
 Summary: Header files, libraries and development documentation for %{name}
 Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}, pkgconfig
+Requires: %{name} = %{version}-%{release}
+Requires: pkgconfig
 Provides: libjs-devel = %{version}-%{release}
 
 %description devel
@@ -45,13 +46,12 @@
 
 %prep
 %setup -q -n %{name}
-%patch0 -p0 -b .make
+%patch0 -p1 -b .make
 %patch1 -p0 -b .shlib
 %patch2 -p1 -b .vacopy
 %patch3 -p0 -b .ldflags
 %patch4 -p1 -b .threadsafe
 %patch5 -p1 -b .ncurses
-%{__cp} src/perlconnect/README.html src/README.perlconnect.html
 
 # Create pkgconfig file
 %{__cat} > libjs.pc << 'EOF'
@@ -63,7 +63,7 @@
 Name: libjs
 Description: JS library
 Requires:
-Version: %{version}
+Version: %{real_version}
 Libs: -L${libdir} -ljs
 Cflags: -I${includedir}
 EOF
@@ -71,19 +71,13 @@
 
 %build
 export BUILD_OPT=1
-%{__make} -C src -f Makefile.ref \
+%{__make} %{?_smp_mflags} -C src -f Makefile.ref \
     JS_THREADSAFE="1" \
     XCFLAGS="%{optflags} -fPIC" \
     BUILD_OPT="1" \
 %if 0%{!?_without_readline:1}
-    JS_READLINE="1" \
+    JS_READLINE="1"
 %endif
-    JS_PERLCONNECT="1"
-
-cd src/perlconnect
-    MAKEFLAGS=-s %{__perl} Makefile.PL INSTALLDIRS=vendor
-    %{__make} %{?_smp_mflags} OPTIMIZE="%{optflags}"
-cd -
 
 
 %install
@@ -93,54 +87,73 @@
              %{buildroot}%{_includedir}
 %{__install} -m 0755 src/Linux_All_OPT.OBJ/{js,jscpucfg} \
     %{buildroot}%{_bindir}/
-%{__install} -m 0755 src/Linux_All_OPT.OBJ/libjs.{a,so} \
+%{__install} -m 0644 src/Linux_All_OPT.OBJ/libjs.a \
+    %{buildroot}%{_libdir}/
+%{__install} -m 0755 src/Linux_All_OPT.OBJ/libjs.so \
     %{buildroot}%{_libdir}/
 %{__mv} %{buildroot}%{_libdir}/libjs.so %{buildroot}%{_libdir}/libjs.so.1
 %{__ln_s} -nf libjs.so.1 %{buildroot}%{_libdir}/libjs.so
-%{__install} -m 0644 src/js*.h src/Linux_All_OPT.OBJ/jsautocfg.h \
-  %{buildroot}%{_includedir}/
+%{__install} -m 0644 src/js*.h src/js.msg src/*.tbl \
+    src/Linux_All_OPT.OBJ/jsautocfg.h \
+    %{buildroot}%{_includedir}/
 %{__install} -m 0644 libjs.pc \
     %{buildroot}%{_libdir}/pkgconfig/
-%{__make} -C src/perlconnect pure_install PERL_INSTALL_ROOT=%{buildroot}
-# Remove unwanted perl related files
-find %{buildroot} -type f -name .packlist -o -name jsperlbuild.pl | xargs -r rm
-find %{buildroot} -type f -name '*.bs' -a -size 0 | xargs -r rm
-# For some reason, the pure_install above doesn't set u+w :-(
-find %{buildroot}%{perl_vendorarch} -type f -exec %{__chmod} u+w {} \;
 
 
 %clean
 %{__rm} -rf %{buildroot}
 
 
-%check || :
-ln -s libjs.so src/Linux_All_OPT.OBJ/libjs.so.1
-LD_LIBRARY_PATH=`pwd`/src/Linux_All_OPT.OBJ %{__make} -C src/perlconnect test
-
-
 %post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
 
 
 %files
-%defattr(-, root, root, 0755)
-%doc src/README*.html src/perlconnect/bg.jpg
+%defattr(-,root,root,-)
+%doc src/README.html
 %{_bindir}/js
 %{_libdir}/*.so.*
-%{perl_vendorarch}/auto/JS/
-%{perl_vendorarch}/*.pm
 
 %files devel
-%defattr(-, root, root, 0755)
+%defattr(-,root,root,-)
 %{_bindir}/jscpucfg
 %{_libdir}/pkgconfig/*.pc
 %{_libdir}/*.so
 %{_libdir}/*.a
 %{_includedir}/js*.h
+%{_includedir}/*.tbl
+%{_includedir}/js.msg
 
 
 %changelog
+* Wed Jun  4 2008 Jon McCann <jmccann at redhat.com> - 1.70-3
+- Add two missing files (#449715)
+
+* Wed Feb 27 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1.70-2
+- Rebuild for perl 5.10 (again)
+
+* Sun Feb  3 2008 Matthias Saou <http://freshrpms.net/> 1.70-1
+- Update to 1.7.0, as 1.70 to avoid introducing an epoch for now...
+- Remove no longer provided perlconnect parts.
+
+* Thu Jan 24 2008 Tom "spot" Callaway <tcallawa at redhat.com> 1.60-6
+- BR: perl(ExtUtils::Embed)
+
+* Sun Jan 20 2008 Tom "spot" Callaway <tcallawa at redhat.com> 1.60-5
+- rebuild for new perl
+
+* Wed Aug 22 2007 Matthias Saou <http://freshrpms.net/> 1.60-4
+- Rebuild for new BuildID feature.
+
+* Mon Aug  6 2007 Matthias Saou <http://freshrpms.net/> 1.60-3
+- Update License field.
+- Add perl(ExtUtils::MakeMaker) build requirement to pull in perl-devel.
+
+* Fri Feb  2 2007 Matthias Saou <http://freshrpms.net/> 1.60-2
+- Include jsopcode.tbl and js.msg in devel (#235481).
+- Install static lib mode 644 instead of 755.
+
 * Fri Feb  2 2007 Matthias Saou <http://freshrpms.net/> 1.60-1
 - Update to 1.60.
 - Rebuild in order to link against ncurses instead of termcap (#226773).
@@ -178,7 +191,7 @@
 - rebuilt
 
 * Mon Feb 14 2005 David Woodhouse <dwmw2 at infradead.org> - 1.5-0.rc6a.4
-- Take js-va_copy.patch out of %ifarch x86_64 so it fixes the PPC build too
+- Take js-va_copy.patch out of %%ifarch x86_64 so it fixes the PPC build too
 
 * Sun Feb 13 2005 Thorsten Leemhuis <fedora at leemhuis dot info> - 1.5-0.rc6a.3
 - Add js-va_copy.patch to fix x86_64; Patch was found in a Mandrake srpm


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/js/EL-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	2 Feb 2007 12:26:41 -0000	1.4
+++ sources	27 Jan 2009 23:54:35 -0000	1.5
@@ -1 +1 @@
-bd8f021e43a8fbbec55ac2cd3d483243  js-1.60.tar.gz
+5571134c3863686b623ebe4e6b1f6fe6  js-1.7.0.tar.gz



From pkgdb at fedoraproject.org  Wed Jan 28 00:25:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Jan 2009 00:25:31 +0000
Subject: [pkgdb] javassist ownership updated
Message-ID: <20090128002532.121AE208495@bastion.fedora.phx.redhat.com>

Package javassist in Fedora 10 was orphaned by red

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/javassist



From pkgdb at fedoraproject.org  Wed Jan 28 00:25:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Jan 2009 00:25:24 +0000
Subject: [pkgdb] javassist ownership updated
Message-ID: <20090128002524.7D206208485@bastion.fedora.phx.redhat.com>

Package javassist in Fedora devel was orphaned by red

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/javassist



From pkgdb at fedoraproject.org  Wed Jan 28 00:25:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Jan 2009 00:25:35 +0000
Subject: [pkgdb] javassist ownership updated
Message-ID: <20090128002535.B38682084A7@bastion.fedora.phx.redhat.com>

Package javassist in Fedora 9 was orphaned by red

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/javassist



From hadess at fedoraproject.org  Wed Jan 28 00:47:33 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Wed, 28 Jan 2009 00:47:33 +0000 (UTC)
Subject: rpms/totem/devel totem.spec,1.217,1.218
Message-ID: <20090128004733.680727010D@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/totem/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9073

Modified Files:
	totem.spec 
Log Message:
* Wed Jan 28 2009 - Bastien Nocera <bnocera at redhat.com> - 2.25.3-9
- Remove gnome-desktop requires, it's not needed



Index: totem.spec
===================================================================
RCS file: /cvs/pkgs/rpms/totem/devel/totem.spec,v
retrieving revision 1.217
retrieving revision 1.218
diff -u -r1.217 -r1.218
--- totem.spec	23 Jan 2009 14:42:18 -0000	1.217
+++ totem.spec	28 Jan 2009 00:47:03 -0000	1.218
@@ -4,13 +4,12 @@
 %define gstreamer_plugins_base_version 0.10.17.2-4
 %define gstreamer_plugins_good_version 0.10.0
 %define gstreamer_plugins_flumpegdemux_version 0.10.15
-%define gtk2_version 2.12.1
 %define xine_version 1.1.7
 
 Summary: Movie player for GNOME
 Name: totem
 Version: 2.25.3
-Release: 8%{?dist}
+Release: 9%{?dist}
 License: GPLv2+ with exceptions
 Group: Applications/Multimedia
 URL: http://projects.gnome.org/totem/
@@ -26,10 +25,8 @@
 Requires(postun): desktop-file-utils
 Requires(postun): scrollkeeper
 
-Requires: gnome-desktop >= 2.6.0
 Requires: iso-codes
 Requires: gnome-themes
-Requires: gtk2 >= %gtk2_version
 # FIXME?
 #Requires: %{name}-backend = %{version}-%{release}
 Requires: %{name}-gstreamer
@@ -462,6 +459,9 @@
 %endif
 
 %changelog
+* Wed Jan 28 2009 - Bastien Nocera <bnocera at redhat.com> - 2.25.3-9
+- Remove gnome-desktop requires, it's not needed
+
 * Fri Jan 23 2009 - Bastien Nocera <bnocera at redhat.com> - 2.25.3-8
 - Rebuild for new MySQL libraries
 



From herlo at fedoraproject.org  Wed Jan 28 00:56:21 2009
From: herlo at fedoraproject.org (Clint Savage)
Date: Wed, 28 Jan 2009 00:56:21 +0000 (UTC)
Subject: rpms/chisholm-to-be-continued-fonts/devel
	chisholm-to-be-continued-fonts-fontconfig.conf, NONE,
	1.1 chisholm-to-be-continued-fonts.spec, NONE, 1.1 import.log,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090128005621.E3D857010D@cvs1.fedora.phx.redhat.com>

Author: herlo

Update of /cvs/pkgs/rpms/chisholm-to-be-continued-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10665/devel

Modified Files:
	.cvsignore sources 
Added Files:
	chisholm-to-be-continued-fonts-fontconfig.conf 
	chisholm-to-be-continued-fonts.spec import.log 
Log Message:
initial commit of the chisholm-to-be-continued-fonts



--- NEW FILE chisholm-to-be-continued-fonts-fontconfig.conf ---
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
<fontconfig>
  <alias>
    <family>ToBeContinued</family>
    <default>
      <family>fantasy</family>
    </default>
  </alias>
  <alias>
    <family>fantasy</family>
    <prefer>
      <family>ToBeContinued</family>
    </prefer>
  </alias>
</fontconfig>


--- NEW FILE chisholm-to-be-continued-fonts.spec ---
%define fontname chisholm-to-be-continued
%define fontconf 61-%{fontname}.conf

Name:           %{fontname}-fonts
Version:        20090124
Release:        1%{?dist}
Summary:        Decorative Sans Serif Font

Group:          User Interface/X
License:        OFL
URL:            http://www.theory.org/~matt/fonts/free/?font=2bc
Source0:        http://www.theory.org/~matt/fonts/free/download/2bc.zip
Source1:        %{name}-fontconfig.conf
BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

BuildArch:      noarch
BuildRequires:  fontpackages-devel
Requires:       fontpackages-filesystem

%description
To Be Continued is a decorative/graffiti sans-serif font.

%prep
%setup -q -c %{name}-%{version}

%build


%install
rm -fr %{buildroot}

install -m 0755 -d %{buildroot}%{_fontdir}
install -m 0644 -p *.ttf %{buildroot}%{_fontdir}

install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} \
                   %{buildroot}%{_fontconfig_confdir}

install -m 0644 -p %{SOURCE1} \
        %{buildroot}%{_fontconfig_templatedir}/%{fontconf}

ln -s %{_fontconfig_templatedir}/%{fontconf} \
      %{buildroot}%{_fontconfig_confdir}/%{fontconf}

%clean
rm -fr %{buildroot}


%_font_pkg -f %{fontconf} *.ttf

%doc

%dir %{_fontdir}

%changelog
* Sun Jan 25 2009 Clint Savage <herlo at fedoraproject.org> 19990319-1
Correctly licensed font
* Fri Jan 23 2009 Clint Savage <herlo at fedoraproject.org> 19990319-1
Initial rpm package


--- NEW FILE import.log ---
chisholm-to-be-continued-fonts-20090124-1_fc10:HEAD:chisholm-to-be-continued-fonts-20090124-1.fc10.src.rpm:1233104074


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/chisholm-to-be-continued-fonts/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	26 Jan 2009 22:50:13 -0000	1.1
+++ .cvsignore	28 Jan 2009 00:55:51 -0000	1.2
@@ -0,0 +1 @@
+2bc.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/chisholm-to-be-continued-fonts/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	26 Jan 2009 22:50:13 -0000	1.1
+++ sources	28 Jan 2009 00:55:51 -0000	1.2
@@ -0,0 +1 @@
+d6d137543eefbee592b8364b0eca5ff4  2bc.zip



From herlo at fedoraproject.org  Wed Jan 28 00:58:44 2009
From: herlo at fedoraproject.org (Clint Savage)
Date: Wed, 28 Jan 2009 00:58:44 +0000 (UTC)
Subject: rpms/chisholm-to-be-continued-fonts/F-9
	chisholm-to-be-continued-fonts-fontconfig.conf, NONE,
	1.1 chisholm-to-be-continued-fonts.spec, NONE, 1.1 import.log,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090128005844.758517010D@cvs1.fedora.phx.redhat.com>

Author: herlo

Update of /cvs/pkgs/rpms/chisholm-to-be-continued-fonts/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11179/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	chisholm-to-be-continued-fonts-fontconfig.conf 
	chisholm-to-be-continued-fonts.spec import.log 
Log Message:
initial commit for the chisholm-to-be-continued-fonts for F-9



--- NEW FILE chisholm-to-be-continued-fonts-fontconfig.conf ---
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
<fontconfig>
  <alias>
    <family>ToBeContinued</family>
    <default>
      <family>fantasy</family>
    </default>
  </alias>
  <alias>
    <family>fantasy</family>
    <prefer>
      <family>ToBeContinued</family>
    </prefer>
  </alias>
</fontconfig>


--- NEW FILE chisholm-to-be-continued-fonts.spec ---
%define fontname chisholm-to-be-continued
%define fontconf 61-%{fontname}.conf

Name:           %{fontname}-fonts
Version:        20090124
Release:        1%{?dist}
Summary:        Decorative Sans Serif Font

Group:          User Interface/X
License:        OFL
URL:            http://www.theory.org/~matt/fonts/free/?font=2bc
Source0:        http://www.theory.org/~matt/fonts/free/download/2bc.zip
Source1:        %{name}-fontconfig.conf
BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

BuildArch:      noarch
BuildRequires:  fontpackages-devel
Requires:       fontpackages-filesystem

%description
To Be Continued is a decorative/graffiti sans-serif font.

%prep
%setup -q -c %{name}-%{version}

%build


%install
rm -fr %{buildroot}

install -m 0755 -d %{buildroot}%{_fontdir}
install -m 0644 -p *.ttf %{buildroot}%{_fontdir}

install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} \
                   %{buildroot}%{_fontconfig_confdir}

install -m 0644 -p %{SOURCE1} \
        %{buildroot}%{_fontconfig_templatedir}/%{fontconf}

ln -s %{_fontconfig_templatedir}/%{fontconf} \
      %{buildroot}%{_fontconfig_confdir}/%{fontconf}

%clean
rm -fr %{buildroot}


%_font_pkg -f %{fontconf} *.ttf

%doc

%dir %{_fontdir}

%changelog
* Sun Jan 25 2009 Clint Savage <herlo at fedoraproject.org> 19990319-1
Correctly licensed font
* Fri Jan 23 2009 Clint Savage <herlo at fedoraproject.org> 19990319-1
Initial rpm package


--- NEW FILE import.log ---
chisholm-to-be-continued-fonts-20090124-1_fc10:F-9:chisholm-to-be-continued-fonts-20090124-1.fc10.src.rpm:1233104203


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/chisholm-to-be-continued-fonts/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	26 Jan 2009 22:50:13 -0000	1.1
+++ .cvsignore	28 Jan 2009 00:58:13 -0000	1.2
@@ -0,0 +1 @@
+2bc.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/chisholm-to-be-continued-fonts/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	26 Jan 2009 22:50:13 -0000	1.1
+++ sources	28 Jan 2009 00:58:14 -0000	1.2
@@ -0,0 +1 @@
+d6d137543eefbee592b8364b0eca5ff4  2bc.zip



From herlo at fedoraproject.org  Wed Jan 28 01:01:07 2009
From: herlo at fedoraproject.org (Clint Savage)
Date: Wed, 28 Jan 2009 01:01:07 +0000 (UTC)
Subject: rpms/chisholm-to-be-continued-fonts/F-10
	chisholm-to-be-continued-fonts-fontconfig.conf, NONE,
	1.1 chisholm-to-be-continued-fonts.spec, NONE, 1.1 import.log,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090128010107.C05957010D@cvs1.fedora.phx.redhat.com>

Author: herlo

Update of /cvs/pkgs/rpms/chisholm-to-be-continued-fonts/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11846/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	chisholm-to-be-continued-fonts-fontconfig.conf 
	chisholm-to-be-continued-fonts.spec import.log 
Log Message:
initial commit for the chisholm-to-be-continued-fonts for F-10



--- NEW FILE chisholm-to-be-continued-fonts-fontconfig.conf ---
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
<fontconfig>
  <alias>
    <family>ToBeContinued</family>
    <default>
      <family>fantasy</family>
    </default>
  </alias>
  <alias>
    <family>fantasy</family>
    <prefer>
      <family>ToBeContinued</family>
    </prefer>
  </alias>
</fontconfig>


--- NEW FILE chisholm-to-be-continued-fonts.spec ---
%define fontname chisholm-to-be-continued
%define fontconf 61-%{fontname}.conf

Name:           %{fontname}-fonts
Version:        20090124
Release:        1%{?dist}
Summary:        Decorative Sans Serif Font

Group:          User Interface/X
License:        OFL
URL:            http://www.theory.org/~matt/fonts/free/?font=2bc
Source0:        http://www.theory.org/~matt/fonts/free/download/2bc.zip
Source1:        %{name}-fontconfig.conf
BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

BuildArch:      noarch
BuildRequires:  fontpackages-devel
Requires:       fontpackages-filesystem

%description
To Be Continued is a decorative/graffiti sans-serif font.

%prep
%setup -q -c %{name}-%{version}

%build


%install
rm -fr %{buildroot}

install -m 0755 -d %{buildroot}%{_fontdir}
install -m 0644 -p *.ttf %{buildroot}%{_fontdir}

install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} \
                   %{buildroot}%{_fontconfig_confdir}

install -m 0644 -p %{SOURCE1} \
        %{buildroot}%{_fontconfig_templatedir}/%{fontconf}

ln -s %{_fontconfig_templatedir}/%{fontconf} \
      %{buildroot}%{_fontconfig_confdir}/%{fontconf}

%clean
rm -fr %{buildroot}


%_font_pkg -f %{fontconf} *.ttf

%doc

%dir %{_fontdir}

%changelog
* Sun Jan 25 2009 Clint Savage <herlo at fedoraproject.org> 19990319-1
Correctly licensed font
* Fri Jan 23 2009 Clint Savage <herlo at fedoraproject.org> 19990319-1
Initial rpm package


--- NEW FILE import.log ---
chisholm-to-be-continued-fonts-20090124-1_fc10:F-10:chisholm-to-be-continued-fonts-20090124-1.fc10.src.rpm:1233104317


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/chisholm-to-be-continued-fonts/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	26 Jan 2009 22:50:13 -0000	1.1
+++ .cvsignore	28 Jan 2009 01:00:37 -0000	1.2
@@ -0,0 +1 @@
+2bc.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/chisholm-to-be-continued-fonts/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	26 Jan 2009 22:50:13 -0000	1.1
+++ sources	28 Jan 2009 01:00:37 -0000	1.2
@@ -0,0 +1 @@
+d6d137543eefbee592b8364b0eca5ff4  2bc.zip



From alexlan at fedoraproject.org  Wed Jan 28 01:15:24 2009
From: alexlan at fedoraproject.org (Alex Lancaster)
Date: Wed, 28 Jan 2009 01:15:24 +0000 (UTC)
Subject: rpms/perl-Bio-Graphics/devel .cvsignore, 1.2,
	1.3 perl-Bio-Graphics.spec, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <20090128011524.E30857010D@cvs1.fedora.phx.redhat.com>

Author: alexlan

Update of /cvs/pkgs/rpms/perl-Bio-Graphics/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14560

Modified Files:
	.cvsignore perl-Bio-Graphics.spec sources 
Log Message:
- Update to upstream that fixes the bogus dependency on perl(GBrowse).
- Add BR: Statistics::Descriptive
- Continue to leave out the optional package
  Bio::Graphics::Glyph::trace until Bio::SCF is packaged



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Bio-Graphics/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	27 Jan 2009 02:39:30 -0000	1.2
+++ .cvsignore	28 Jan 2009 01:14:54 -0000	1.3
@@ -1 +1 @@
-Bio-Graphics-1.83.tar.gz
+Bio-Graphics-1.84.tar.gz


Index: perl-Bio-Graphics.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Bio-Graphics/devel/perl-Bio-Graphics.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-Bio-Graphics.spec	27 Jan 2009 08:37:20 -0000	1.2
+++ perl-Bio-Graphics.spec	28 Jan 2009 01:14:54 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-Bio-Graphics
-Version:        1.83
-Release:        3%{?dist}
+Version:        1.84
+Release:        1%{?dist}
 Summary:        Generate GD images of Bio::Seq objects
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -12,6 +12,7 @@
 BuildRequires:  perl(Bio::Root::Version) >= 1.005009
 BuildRequires:  perl(GD) >= 2.3
 BuildRequires:  perl(GD::SVG)
+BuildRequires:  perl(Statistics::Descriptive) >= 2.6
 BuildRequires:  perl(Module::Build)
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
@@ -29,11 +30,9 @@
 %setup -q -n Bio-Graphics-%{version}
 %patch0 -p0 -b .tests
 
-# temporarily remove modules Bio/Graphics/Glyph/trace.pm and 
-# Bio/Graphics/Wiggle/Loader.pm until their dependencies:
-# Bio::SCF and Bio::Graphics::Browser::Util are packaged
+# temporarily remove modules Bio/Graphics/Glyph/trace.pm until the dependency:
+# Bio::SCF is packaged
 rm lib/Bio/Graphics/Glyph/trace.pm
-rm lib/Bio/Graphics/Wiggle/Loader.pm
 
 %build
 %{__perl} Build.PL installdirs=vendor
@@ -63,6 +62,12 @@
 %{_mandir}/man3/*
 
 %changelog
+* Tue Jan 27 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 1.84-1
+- Update to upstream that fixes the bogus dependency on perl(GBrowse).
+- Add BR: Statistics::Descriptive
+- Continue to leave out the optional package
+  Bio::Graphics::Glyph::trace until Bio::SCF is packaged
+
 * Tue Jan 27 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 1.83-3
 - Temporarily remove Bio::Graphics::Wiggle::Loader and
   Bio::Graphics::Glyph::trace modules from being installed until their


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Bio-Graphics/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	27 Jan 2009 02:39:30 -0000	1.2
+++ sources	28 Jan 2009 01:14:54 -0000	1.3
@@ -1 +1 @@
-1c1de50c9261b3e6a1b20e2f38701aa7  Bio-Graphics-1.83.tar.gz
+ff4e72484d345d5d711b80606426faff  Bio-Graphics-1.84.tar.gz



From herlo at fedoraproject.org  Wed Jan 28 01:27:36 2009
From: herlo at fedoraproject.org (Clint Savage)
Date: Wed, 28 Jan 2009 01:27:36 +0000 (UTC)
Subject: rpms/chisholm-to-be-continued-fonts/devel
	chisholm-to-be-continued-fonts.spec, 1.1, 1.2 import.log, 1.1, 1.2
Message-ID: <20090128012736.5005E7010D@cvs1.fedora.phx.redhat.com>

Author: herlo

Update of /cvs/pkgs/rpms/chisholm-to-be-continued-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16478/devel

Modified Files:
	chisholm-to-be-continued-fonts.spec import.log 
Log Message:
the change log was incorrect, fixed.



Index: chisholm-to-be-continued-fonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/chisholm-to-be-continued-fonts/devel/chisholm-to-be-continued-fonts.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- chisholm-to-be-continued-fonts.spec	28 Jan 2009 00:55:51 -0000	1.1
+++ chisholm-to-be-continued-fonts.spec	28 Jan 2009 01:27:05 -0000	1.2
@@ -52,7 +52,7 @@
 %dir %{_fontdir}
 
 %changelog
-* Sun Jan 25 2009 Clint Savage <herlo at fedoraproject.org> 19990319-1
+* Sun Jan 25 2009 Clint Savage <herlo at fedoraproject.org> 20090124-1
 Correctly licensed font
 * Fri Jan 23 2009 Clint Savage <herlo at fedoraproject.org> 19990319-1
 Initial rpm package


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/chisholm-to-be-continued-fonts/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	28 Jan 2009 00:55:51 -0000	1.1
+++ import.log	28 Jan 2009 01:27:05 -0000	1.2
@@ -1 +1,2 @@
 chisholm-to-be-continued-fonts-20090124-1_fc10:HEAD:chisholm-to-be-continued-fonts-20090124-1.fc10.src.rpm:1233104074
+chisholm-to-be-continued-fonts-20090124-1_fc10:HEAD:chisholm-to-be-continued-fonts-20090124-1.fc10.src.rpm:1233105943



From herlo at fedoraproject.org  Wed Jan 28 01:49:42 2009
From: herlo at fedoraproject.org (Clint Savage)
Date: Wed, 28 Jan 2009 01:49:42 +0000 (UTC)
Subject: rpms/chisholm-to-be-continued-fonts/devel
	chisholm-to-be-continued-fonts.spec, 1.2, 1.3 import.log, 1.2, 1.3
Message-ID: <20090128014942.D745B7010D@cvs1.fedora.phx.redhat.com>

Author: herlo

Update of /cvs/pkgs/rpms/chisholm-to-be-continued-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20014/devel

Modified Files:
	chisholm-to-be-continued-fonts.spec import.log 
Log Message:
fixing a typo in the spec changelog



Index: chisholm-to-be-continued-fonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/chisholm-to-be-continued-fonts/devel/chisholm-to-be-continued-fonts.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- chisholm-to-be-continued-fonts.spec	28 Jan 2009 01:27:05 -0000	1.2
+++ chisholm-to-be-continued-fonts.spec	28 Jan 2009 01:49:12 -0000	1.3
@@ -3,7 +3,7 @@
 
 Name:           %{fontname}-fonts
 Version:        20090124
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Decorative Sans Serif Font
 
 Group:          User Interface/X
@@ -52,6 +52,8 @@
 %dir %{_fontdir}
 
 %changelog
+* Tue Jan 27 2009 Clint Savage <herlo at fedoraproject.org> 20090124-2
+Fixed a typo in the changelog
 * Sun Jan 25 2009 Clint Savage <herlo at fedoraproject.org> 20090124-1
 Correctly licensed font
 * Fri Jan 23 2009 Clint Savage <herlo at fedoraproject.org> 19990319-1


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/chisholm-to-be-continued-fonts/devel/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	28 Jan 2009 01:27:05 -0000	1.2
+++ import.log	28 Jan 2009 01:49:12 -0000	1.3
@@ -1,2 +1,3 @@
 chisholm-to-be-continued-fonts-20090124-1_fc10:HEAD:chisholm-to-be-continued-fonts-20090124-1.fc10.src.rpm:1233104074
 chisholm-to-be-continued-fonts-20090124-1_fc10:HEAD:chisholm-to-be-continued-fonts-20090124-1.fc10.src.rpm:1233105943
+chisholm-to-be-continued-fonts-20090124-2_fc10:HEAD:chisholm-to-be-continued-fonts-20090124-2.fc10.src.rpm:1233107275



From toshio at fedoraproject.org  Wed Jan 28 01:51:30 2009
From: toshio at fedoraproject.org (=?utf-8?b?VG9zaGlvIOOBj+OCieOBqOOBvw==?=)
Date: Wed, 28 Jan 2009 01:51:30 +0000 (UTC)
Subject: rpms/python-migrate/devel python-migrate-disable-test_fk.patch, NONE,
	1.1 python-migrate-unittests.patch, NONE, 1.1 .cvsignore, 1.3,
	1.4 python-migrate-sqlalchemy-migrate.patch, 1.1,
	1.2 python-migrate.spec, 1.6, 1.7 sources, 1.3,
	1.4 python-migrate-disable-pytest.patch, 1.1,
	NONE python-migrate-migrate_repository.patch, 1.1, NONE
Message-ID: <20090128015130.B1B8C7010D@cvs1.fedora.phx.redhat.com>

Author: toshio

Update of /cvs/pkgs/rpms/python-migrate/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20441

Modified Files:
	.cvsignore python-migrate-sqlalchemy-migrate.patch 
	python-migrate.spec sources 
Added Files:
	python-migrate-disable-test_fk.patch 
	python-migrate-unittests.patch 
Removed Files:
	python-migrate-disable-pytest.patch 
	python-migrate-migrate_repository.patch 
Log Message:

* Mon Jan 26 2009 Toshio Kuratomi <toshio at fedoraproject.org> 0.5.1-0.1.20090122.svn479
- Update to snapshot so that it works with sqlalchemy-0.5
- Enable test suite


python-migrate-disable-test_fk.patch:

--- NEW FILE python-migrate-disable-test_fk.patch ---
diff -up sqlalchemy-migrate-0.5.1.dev-r479/test/changeset/test_changeset.py.bak sqlalchemy-migrate-0.5.1.dev-r479/test/changeset/test_changeset.py
--- sqlalchemy-migrate-0.5.1.dev-r479/test/changeset/test_changeset.py.bak	2009-01-26 17:42:59.000000000 -0800
+++ sqlalchemy-migrate-0.5.1.dev-r479/test/changeset/test_changeset.py	2009-01-26 17:43:34.000000000 -0800
@@ -150,26 +150,26 @@ class TestAddDropColumn(fixture.DB):
             return drop_column(col.name,self.table)
         return self.run_(add_func,drop_func)
 
-    @fixture.usedb()
-    def test_fk(self):
-        """Can create columns with foreign keys"""
-        reftable = Table('tmp_ref',self.meta,
-            Column('id',Integer,primary_key=True),
-        )
-        # create FK's target
-        if self.engine.has_table(reftable.name):
-            reftable.drop()
-        reftable.create()
-        def add_func(col):
-            self.table.append_column(col)
-            return create_column(col.name,self.table)
-        def drop_func(col):
-            ret = drop_column(col.name,self.table)
-            if self.engine.has_table(reftable.name):
-                reftable.drop()
-            return ret
-        return self.run_(add_func,drop_func,Integer,
-                         ForeignKey(reftable.c.id))
+    #@fixture.usedb()
+    #def test_fk(self):
+    #    """Can create columns with foreign keys"""
+    #    reftable = Table('tmp_ref',self.meta,
+    #        Column('id',Integer,primary_key=True),
+    #    )
+    #    # create FK's target
+    #    if self.engine.has_table(reftable.name):
+    #        reftable.drop()
+    #    reftable.create()
+    #    def add_func(col):
+    #        self.table.append_column(col)
+    #        return create_column(col.name,self.table)
+    #    def drop_func(col):
+    #        ret = drop_column(col.name,self.table)
+    #        if self.engine.has_table(reftable.name):
+    #            reftable.drop()
+    #        return ret
+    #    return self.run_(add_func,drop_func,Integer,
+    #                     ForeignKey(reftable.c.id))
 
     #@fixture.usedb()
     #def xtest_pk(self):

python-migrate-unittests.patch:

--- NEW FILE python-migrate-unittests.patch ---
Index: test/versioning/test_shell.py
===================================================================
--- test/versioning/test_shell.py	(revision 479)
+++ test/versioning/test_shell.py	(working copy)
@@ -1,6 +1,7 @@
 import sys
 import traceback
 from StringIO import StringIO
+from types import FileType
 import os,shutil
 from test import fixture
 from migrate.versioning.repository import Repository
@@ -19,7 +20,7 @@
     def execute(self,shell_cmd,runshell=None):
         """A crude simulation of a shell command, to speed things up"""
         # If we get an fd, the command is already done
-        if isinstance(shell_cmd,file) or isinstance(shell_cmd,StringIO):
+        if isinstance(shell_cmd, FileType) or isinstance(shell_cmd, StringIO):
             return shell_cmd
         # Analyze the command; see if we can 'fake' the shell
         try:


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-migrate/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	25 Jul 2008 05:22:43 -0000	1.3
+++ .cvsignore	28 Jan 2009 01:51:00 -0000	1.4
@@ -1 +1 @@
-sqlalchemy-migrate-0.4.5.tar.gz
+sqlalchemy-migrate-0.5.1.dev-r479.tar.gz

python-migrate-sqlalchemy-migrate.patch:

Index: python-migrate-sqlalchemy-migrate.patch
===================================================================
RCS file: /cvs/pkgs/rpms/python-migrate/devel/python-migrate-sqlalchemy-migrate.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- python-migrate-sqlalchemy-migrate.patch	30 Jul 2008 04:32:59 -0000	1.1
+++ python-migrate-sqlalchemy-migrate.patch	28 Jan 2009 01:51:00 -0000	1.2
@@ -1,8 +1,8 @@
-Index: sqlalchemy-migrate-0.4.5/setup.py
+Index: sqlalchemy-migrate-0.5.1.dev-r479/setup.py
 ===================================================================
---- sqlalchemy-migrate-0.4.5.orig/setup.py
-+++ sqlalchemy-migrate-0.4.5/setup.py
-@@ -34,8 +34,8 @@ Migrate extends SQLAlchemy to have datab
+--- sqlalchemy-migrate-0.5.1.dev-r479.orig/setup.py
++++ sqlalchemy-migrate-0.5.1.dev-r479/setup.py
+@@ -31,8 +31,8 @@ Migrate extends SQLAlchemy to have datab
  
      entry_points = """
      [console_scripts]
@@ -11,5 +11,5 @@
 +    sqlalchemy-migrate = migrate.versioning.shell:main
 +    sqlalchemy-migrate-repository = migrate.versioning.migrate_repository:main
      """,
-     test_suite = "py.test.cmdline.main",
+     test_suite = "nose.collector",
  )


Index: python-migrate.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-migrate/devel/python-migrate.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- python-migrate.spec	29 Nov 2008 15:36:10 -0000	1.6
+++ python-migrate.spec	28 Jan 2009 01:51:00 -0000	1.7
@@ -3,27 +3,35 @@
 %define srcname sqlalchemy-migrate
 
 Name: python-migrate
-Version: 0.4.5
-Release: 4%{?dist}
+Version: 0.5.1
+Release: 0.1.20090122.svn479%{?dist}
 Summary: Schema migration tools for SQLAlchemy
 
 Group: Development/Languages
 License: MIT
 URL: http://code.google.com/p/%{srcname}/
-Source0: http://%{srcname}.googlecode.com/files/%{srcname}-%{version}.tar.gz
-# Local patch to disable py.test.  Needed until py.test is in Fedora.
-Patch0: python-migrate-disable-pytest.patch
-# Patch sent upstream to generate a script for the repository upgrade script
-Patch1: python-migrate-migrate_repository.patch
+# Build from a snapshot so we get this working with sqlalchemy-0.5
+# svn checkout http://sqlalchemy-migrate.googlecode.com/svn/trunk/ sqlalchemy-migrate -r479
+# cd sqlalchemy-migrate
+# python setup.py sdist
+# tarball is in dist/sqlalchemy-migrate-0.5.1.dev-r479.tar.gz
+Source0: %{srcname}-%{version}.dev-r479.tar.gz
+#Source0: http://%{srcname}.googlecode.com/files/%{srcname}-%{version}.tar.gz
 # Local patch to rename /usr/bin/migrate to sqlalchemy-migrate
-Patch2: python-migrate-sqlalchemy-migrate.patch
+Patch0: python-migrate-sqlalchemy-migrate.patch
+# Sent upstream to fix a unittest failure
+Patch1: python-migrate-unittests.patch
+# Disable one unittest for now.  In the future we want this to work
+Patch2: python-migrate-disable-test_fk.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch: noarch
 BuildRequires: python-devel
+BuildRequires: python-sqlalchemy
 BuildRequires: python-setuptools-devel
-Requires: python-sqlalchemy >= 0.3.10
+BuildRequires: python-nose
+Requires: python-sqlalchemy >= 0.5
 Requires: python-setuptools
 
 %description
@@ -33,10 +41,11 @@
 atabase change sets and database repository versioning.
 
 %prep
-%setup -q -n %{srcname}-%{version}
-%patch0 -p1 -b .pytest
-%patch1 -p0 -b .repomigrate
-%patch2 -p1 -b .rename
+%setup -q -n %{srcname}-%{version}.dev-r479
+%patch0 -p1 -b .rename
+%patch1 -p0 -b .testing
+# Try removing this patch on every update
+%patch2 -p1 -b .disable-test
 
 %build
 %{__python} setup.py build
@@ -48,12 +57,9 @@
 %clean
 %{__rm} -rf %{buildroot}
 
-# Check needs py.test in order to run
-#%check
-#echo 'sqlite:///__tmp__' > test_db.cfg
-# setuptools doesn't appear to be compatible with py.test
-# %{__python} setup.py test
-#%{__python} -c 'from py.test.cmdline import main; main(["test"])'
+%check
+echo 'sqlite:///__tmp__' > test_db.cfg
+%{__python} setup.py test
 
 %files
 %defattr(-,root,root,-)
@@ -62,6 +68,10 @@
 %{python_sitelib}/*
 
 %changelog
+* Mon Jan 26 2009 Toshio Kuratomi <toshio at fedoraproject.org> 0.5.1-0.1.20090122.svn479
+- Update to snapshot so that it works with sqlalchemy-0.5
+- Enable test suite
+
 * Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 0.4.5-4
 - Rebuild for Python 2.6
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-migrate/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	25 Jul 2008 05:22:43 -0000	1.3
+++ sources	28 Jan 2009 01:51:00 -0000	1.4
@@ -1 +1 @@
-d4f17e2c7fcfbb7bd0df628d974c8e3e  sqlalchemy-migrate-0.4.5.tar.gz
+bff7f5c013497fdc7c2f79e48b6a38ad  sqlalchemy-migrate-0.5.1.dev-r479.tar.gz


--- python-migrate-disable-pytest.patch DELETED ---


--- python-migrate-migrate_repository.patch DELETED ---



From herlo at fedoraproject.org  Wed Jan 28 01:52:07 2009
From: herlo at fedoraproject.org (Clint Savage)
Date: Wed, 28 Jan 2009 01:52:07 +0000 (UTC)
Subject: rpms/chisholm-to-be-continued-fonts/F-10
	chisholm-to-be-continued-fonts.spec, 1.1, 1.2 import.log, 1.1, 1.2
Message-ID: <20090128015207.0E1C07010D@cvs1.fedora.phx.redhat.com>

Author: herlo

Update of /cvs/pkgs/rpms/chisholm-to-be-continued-fonts/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20601/F-10

Modified Files:
	chisholm-to-be-continued-fonts.spec import.log 
Log Message:
fixed a typo in the changelog



Index: chisholm-to-be-continued-fonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/chisholm-to-be-continued-fonts/F-10/chisholm-to-be-continued-fonts.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- chisholm-to-be-continued-fonts.spec	28 Jan 2009 01:00:37 -0000	1.1
+++ chisholm-to-be-continued-fonts.spec	28 Jan 2009 01:51:36 -0000	1.2
@@ -3,7 +3,7 @@
 
 Name:           %{fontname}-fonts
 Version:        20090124
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Decorative Sans Serif Font
 
 Group:          User Interface/X
@@ -52,7 +52,9 @@
 %dir %{_fontdir}
 
 %changelog
-* Sun Jan 25 2009 Clint Savage <herlo at fedoraproject.org> 19990319-1
+* Tue Jan 27 2009 Clint Savage <herlo at fedoraproject.org> 20090124-2
+Fixed a typo in the changelog
+* Sun Jan 25 2009 Clint Savage <herlo at fedoraproject.org> 20090124-1
 Correctly licensed font
 * Fri Jan 23 2009 Clint Savage <herlo at fedoraproject.org> 19990319-1
 Initial rpm package


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/chisholm-to-be-continued-fonts/F-10/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	28 Jan 2009 01:00:37 -0000	1.1
+++ import.log	28 Jan 2009 01:51:36 -0000	1.2
@@ -1 +1,2 @@
 chisholm-to-be-continued-fonts-20090124-1_fc10:F-10:chisholm-to-be-continued-fonts-20090124-1.fc10.src.rpm:1233104317
+chisholm-to-be-continued-fonts-20090124-2_fc10:F-10:chisholm-to-be-continued-fonts-20090124-2.fc10.src.rpm:1233107414



From herlo at fedoraproject.org  Wed Jan 28 01:55:15 2009
From: herlo at fedoraproject.org (Clint Savage)
Date: Wed, 28 Jan 2009 01:55:15 +0000 (UTC)
Subject: rpms/chisholm-to-be-continued-fonts/F-9
	chisholm-to-be-continued-fonts.spec, 1.1, 1.2 import.log, 1.1, 1.2
Message-ID: <20090128015515.AE7D57010D@cvs1.fedora.phx.redhat.com>

Author: herlo

Update of /cvs/pkgs/rpms/chisholm-to-be-continued-fonts/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21117/F-9

Modified Files:
	chisholm-to-be-continued-fonts.spec import.log 
Log Message:
fixed a typo in the changelog



Index: chisholm-to-be-continued-fonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/chisholm-to-be-continued-fonts/F-9/chisholm-to-be-continued-fonts.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- chisholm-to-be-continued-fonts.spec	28 Jan 2009 00:58:14 -0000	1.1
+++ chisholm-to-be-continued-fonts.spec	28 Jan 2009 01:54:45 -0000	1.2
@@ -3,7 +3,7 @@
 
 Name:           %{fontname}-fonts
 Version:        20090124
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Decorative Sans Serif Font
 
 Group:          User Interface/X
@@ -52,7 +52,9 @@
 %dir %{_fontdir}
 
 %changelog
-* Sun Jan 25 2009 Clint Savage <herlo at fedoraproject.org> 19990319-1
+* Tue Jan 27 2009 Clint Savage <herlo at fedoraproject.org> 20090124-2
+Fixed a typo in the changelog
+* Sun Jan 25 2009 Clint Savage <herlo at fedoraproject.org> 20090124-1
 Correctly licensed font
 * Fri Jan 23 2009 Clint Savage <herlo at fedoraproject.org> 19990319-1
 Initial rpm package


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/chisholm-to-be-continued-fonts/F-9/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	28 Jan 2009 00:58:14 -0000	1.1
+++ import.log	28 Jan 2009 01:54:45 -0000	1.2
@@ -1 +1,2 @@
 chisholm-to-be-continued-fonts-20090124-1_fc10:F-9:chisholm-to-be-continued-fonts-20090124-1.fc10.src.rpm:1233104203
+chisholm-to-be-continued-fonts-20090124-2_fc10:F-9:chisholm-to-be-continued-fonts-20090124-2.fc10.src.rpm:1233107501



From whot at fedoraproject.org  Wed Jan 28 02:11:30 2009
From: whot at fedoraproject.org (Peter Hutterer)
Date: Wed, 28 Jan 2009 02:11:30 +0000 (UTC)
Subject: rpms/xkeyboard-config/devel .cvsignore, 1.8, 1.9 sources, 1.9,
	1.10 usinet.patch, 1.3, 1.4 xkeyboard-config.spec, 1.31, 1.32
Message-ID: <20090128021130.690367010D@cvs1.fedora.phx.redhat.com>

Author: whot

Update of /cvs/pkgs/rpms/xkeyboard-config/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23846

Modified Files:
	.cvsignore sources usinet.patch xkeyboard-config.spec 
Log Message:
* Wed Jan 28 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.5-1
- xkeyboard-config 1.5




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xkeyboard-config/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	1 Oct 2008 16:51:06 -0000	1.8
+++ .cvsignore	28 Jan 2009 02:10:59 -0000	1.9
@@ -1 +1 @@
-xkeyboard-config-1.4.tar.bz2
+xkeyboard-config-1.5.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xkeyboard-config/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	1 Oct 2008 16:51:06 -0000	1.9
+++ sources	28 Jan 2009 02:10:59 -0000	1.10
@@ -1 +1 @@
-a9fe7efbc67a6966c4d4501f0cf88073  xkeyboard-config-1.4.tar.bz2
+43c74312d303863b1b929554fa9ed9b3  xkeyboard-config-1.5.tar.bz2

usinet.patch:

Index: usinet.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xkeyboard-config/devel/usinet.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- usinet.patch	24 Nov 2008 03:56:27 -0000	1.3
+++ usinet.patch	28 Jan 2009 02:10:59 -0000	1.4
@@ -1,39 +1,38 @@
-From f6b527515a6eb088c7ff6eb66bda454e20df371e Mon Sep 17 00:00:00 2001
+From e0e521d790e050f48c996673820c8be372a9856f Mon Sep 17 00:00:00 2001
 From: Fedora X Ninjas <x at fedoraproject.org>
-Date: Mon, 24 Nov 2008 13:10:56 +1000
+Date: Wed, 28 Jan 2009 12:05:47 +1000
 Subject: [PATCH] Add include inet(media_nav_common) by default for pc105
 
 ---
  rules/base.lists.part |    1 +
- symbols/inet          |    6 ++++++
- 2 files changed, 7 insertions(+), 0 deletions(-)
+ symbols/inet          |    5 +++++
+ 2 files changed, 6 insertions(+), 0 deletions(-)
 
 diff --git a/rules/base.lists.part b/rules/base.lists.part
-index b08ab24..f9207b6 100644
+index e1897b1..1a752eb 100644
 --- a/rules/base.lists.part
 +++ b/rules/base.lists.part
-@@ -53,6 +53,7 @@
+@@ -54,6 +54,7 @@
                microsoftoffice microsoftmult \
                mx1998 mx2500 mx2750 \
                oretec \
 +              pc105 \
                presario propeller \
                qtronix \
-               rapidaccess rapidaccess2 rapidaccess2a thinkpad thinkpad60 \
+               rapidaccess rapidaccess2 thinkpad60 \
 diff --git a/symbols/inet b/symbols/inet
-index 54ec241..568cc4a 100644
+index 339b72d..ba55f43 100644
 --- a/symbols/inet
 +++ b/symbols/inet
-@@ -2234,3 +2234,9 @@ xkb_symbols "classmate" {
-     key <I30>   {       [ XF86AudioRaiseVolume  ] };
+@@ -1797,3 +1797,8 @@ xkb_symbols "compalfl90" {
+     key <II65>  {       [ XF86MonBrightnessDown ]       };
  };
  
-+
 +// Generic
 +partial alphanumeric_keys
 +xkb_symbols "pc105" {
 +    include "inet(media_nav_common)"
 +};
 -- 
-1.6.0.3
+1.6.0.6
 


Index: xkeyboard-config.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xkeyboard-config/devel/xkeyboard-config.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- xkeyboard-config.spec	27 Jan 2009 06:01:28 -0000	1.31
+++ xkeyboard-config.spec	28 Jan 2009 02:10:59 -0000	1.32
@@ -3,24 +3,19 @@
 
 Summary: X Keyboard Extension configuration data
 Name: xkeyboard-config
-Version: 1.4
-Release: 9%{?dist}
+Version: 1.5
+Release: 1%{?dist}
 License: MIT
 Group: User Interface/X
 URL: http://www.freedesktop.org/wiki/Software/XKeyboardConfig
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0: http://xlibs.freedesktop.org/xkbdesc/%{name}-%{version}.tar.bz2
-Patch1: olpc-xkeyboard-config-kz-group.patch
 Patch2: usinet.patch
-# FDO Bug 17975 (FIXED), taken from git.
-Patch3: xkeyboard-config-1.4-tj-variant.patch
 # Sent to svu, not committed yet (he's waiting for libX11 release)
 Patch4: xkeyboard-config-1.4-battery.patch
 # Sent to svu
 Patch5: xkeyboard-config-1.4-jp-tilde.patch
-# RH 470153, FDO Bug 18712 (fixed), taken from git
-Patch6: xkeyboard-config-1.4-abnt2.patch
 
 BuildArch: noarch
 
@@ -102,6 +97,9 @@
 %{_datadir}/X11/xkb/rules/xorg.xml
 
 %changelog
+* Wed Jan 28 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.5-1
+- xkeyboard-config 1.5
+
 * Tue Jan 27 2009 Bernie Innocenti <bernie at codewiz.org> 1.4-9
 - Backport fix for the it(olpc) layout
 



From wart at fedoraproject.org  Wed Jan 28 02:46:26 2009
From: wart at fedoraproject.org (Michael Thomas)
Date: Wed, 28 Jan 2009 02:46:26 +0000 (UTC)
Subject: rpms/tklib/devel .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 tklib.spec, 
	1.5, 1.6
Message-ID: <20090128024626.AB1177010D@cvs1.fedora.phx.redhat.com>

Author: wart

Update of /cvs/pkgs/rpms/tklib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28770

Modified Files:
	.cvsignore sources tklib.spec 
Log Message:
Update to 0.5.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/tklib/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	2 Dec 2005 16:25:11 -0000	1.2
+++ .cvsignore	28 Jan 2009 02:45:55 -0000	1.3
@@ -1 +1 @@
-tklib-0.4.1.tar.gz
+tklib-0.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tklib/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	2 Dec 2005 16:25:11 -0000	1.2
+++ sources	28 Jan 2009 02:45:56 -0000	1.3
@@ -1 +1 @@
-4b6919112bc2b9bd816120a8210170b5  tklib-0.4.1.tar.gz
+c8b84f3eb4dafbd4e5818e29d408faea  tklib-0.5.tar.gz


Index: tklib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tklib/devel/tklib.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- tklib.spec	3 Jan 2008 20:35:44 -0000	1.5
+++ tklib.spec	28 Jan 2009 02:45:56 -0000	1.6
@@ -3,11 +3,11 @@
 
 Summary: Collection of widgets and other packages for Tk
 Name: tklib
-Version: 0.4.1
-Release: 7%{?dist}
+Version: 0.5
+Release: 1%{?dist}
 License: TCL
 Group: Development/Libraries
-Source: http://downloads.sourceforge.net/tcllib/tklib-0.4.1.tar.gz
+Source: http://downloads.sourceforge.net/tcllib/tklib-0.5.tar.gz
 Patch0: tklib-0.4.1-makecheck.patch
 URL: http://tcllib.sourceforge.net/
 BuildArch: noarch
@@ -27,6 +27,10 @@
 # to suppress some rpmlint warnings.
 chmod a-x modules/plotchart/*.tcl
 chmod a-x modules/swaplist/*.tcl
+chmod a-x modules/widget/*.tcl
+chmod a-x modules/diagrams/*.tcl
+chmod a-x modules/khim/*.tcl
+chmod a-x modules/khim/*.msg
 
 iconv --from=ISO-8859-1 --to=UTF-8 modules/ctext/ctext.man > modules/ctext/ctext.man.new
 mv -f modules/ctext/ctext.man.new modules/ctext/ctext.man
@@ -55,6 +59,9 @@
 %{_mandir}/*/*
 
 %changelog
+* Tue Jan 27 2009 Wart <wart at kobold.org> 0.5-1
+- Update to 0.5
+
 * Thu Jan 3 2008 Wart <wart at kobold.org> 0.4.1-7
 - Rebuild for Tcl 8.5
 



From lennart at fedoraproject.org  Wed Jan 28 02:46:58 2009
From: lennart at fedoraproject.org (Lennart Poettering)
Date: Wed, 28 Jan 2009 02:46:58 +0000 (UTC)
Subject: rpms/mod_dnssd/devel .cvsignore, 1.2, 1.3 mod_dnssd.spec, 1.7,
	1.8 sources, 1.2, 1.3 mod_dnssd-r63-uid.patch, 1.1, NONE
Message-ID: <20090128024658.B5B307010D@cvs1.fedora.phx.redhat.com>

Author: lennart

Update of /cvs/pkgs/rpms/mod_dnssd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28887

Modified Files:
	.cvsignore mod_dnssd.spec sources 
Removed Files:
	mod_dnssd-r63-uid.patch 
Log Message:
New upstream


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mod_dnssd/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	26 Jun 2007 17:50:35 -0000	1.2
+++ .cvsignore	28 Jan 2009 02:46:28 -0000	1.3
@@ -1 +1 @@
-mod_dnssd-0.5.tar.gz
+mod_dnssd-0.6.tar.gz


Index: mod_dnssd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mod_dnssd/devel/mod_dnssd.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- mod_dnssd.spec	11 Aug 2008 15:11:02 -0000	1.7
+++ mod_dnssd.spec	28 Jan 2009 02:46:28 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           mod_dnssd
-Version:        0.5
-Release:        7%{?dist}
+Version:        0.6
+Release:        1%{?dist}
 Summary:        An Apache HTTPD module which adds Zeroconf support
 
 Group:          System Environment/Daemons
@@ -8,7 +8,6 @@
 URL:            http://0pointer.de/lennart/projects/mod_dnssd/
 Source0:        http://0pointer.de/lennart/projects/mod_dnssd/%{name}-%{version}.tar.gz
 Source1:        mod_dnssd.conf-httpd
-Patch0:         mod_dnssd-r63-uid.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  httpd-devel avahi-devel e2fsprogs-devel
@@ -19,7 +18,6 @@
 
 %prep
 %setup -q
-%patch0 -p2 -b .uid
 
 %build
 %configure --disable-lynx
@@ -40,6 +38,9 @@
 %{_libdir}/httpd/modules/mod_dnssd.so
 
 %changelog
+* Wed Jan 28 2009 Lennart Poettering <lpoetter at redhat.com> - 0.6-1
+- New upstream
+
 * Mon Aug 11 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.5-7
 - fix license tag
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mod_dnssd/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	26 Jun 2007 17:50:35 -0000	1.2
+++ sources	28 Jan 2009 02:46:28 -0000	1.3
@@ -1 +1 @@
-43db8be45fbc5f1b70fed2de37001a23  mod_dnssd-0.5.tar.gz
+bed3d95a98168bf0515922d1c05020c5  mod_dnssd-0.6.tar.gz


--- mod_dnssd-r63-uid.patch DELETED ---



From itamarjp at fedoraproject.org  Wed Jan 28 03:03:40 2009
From: itamarjp at fedoraproject.org (Itamar Reis Peixoto)
Date: Wed, 28 Jan 2009 03:03:40 +0000 (UTC)
Subject: rpms/purple-msn-pecan/F-10 import.log, NONE,
	1.1 purple-msn-pecan.spec, 
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090128030340.5555E7010D@cvs1.fedora.phx.redhat.com>

Author: itamarjp

Update of /cvs/pkgs/rpms/purple-msn-pecan/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31364/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	import.log purple-msn-pecan.spec 
Log Message:
Initial RPM release



--- NEW FILE import.log ---
purple-msn-pecan-0_0_17-4_fc11:F-10:purple-msn-pecan-0.0.17-4.fc11.src.rpm:1233111713


--- NEW FILE purple-msn-pecan.spec ---
%define		realname msn-pecan
Name:		purple-%{realname}
Version:	0.0.17
Release:	4%{?dist}
Summary:	Alternative MSN protocol plugin for libpurple 

Group:		Applications/Internet 
License:	GPLv2+
URL:		http://code.google.com/p/msn-pecan/ 
Source0:	http://msn-pecan.googlecode.com/files/%{realname}-%{version}.tar.bz2
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	libpurple-devel 
BuildRequires:	gettext
BuildRequires:	check-devel


%description
The project aims to have a much faster development process, low barrier for
contributions, and close contact with the user-base.

Features include:

	* Support for personal messages
	* Server-side storage for display names (private alias)
	* Partial direct connection support
	* Improved network IO
	* Improved error handling
	* Network issues tested with netem
	* GObject usage 


%prep
%setup -q -n %{realname}-%{version}


%build
make CFLAGS="%{optflags}" %{?_smp_mflags} V=yes


%install
rm -rf $RPM_BUILD_ROOT
install -Dp -m 755 libmsn-pecan.so $RPM_BUILD_ROOT/%{_libdir}/purple-2/libmsn-pecan.so
make install_locales DESTDIR=$RPM_BUILD_ROOT
%find_lang libmsn-pecan 


%check
cd tests
make clean
make


%clean
rm -rf $RPM_BUILD_ROOT


%files -f libmsn-pecan.lang
%defattr(-, root, root, -)
%doc AUTHORS COPYING TODO README COPYRIGHT ChangeLog
%{_libdir}/purple-2/libmsn-pecan.so


%changelog
* Mon Jan 19 2009 Edouard Bourguignon <madko at linuxed.net> - 0.0.17-4
- Remove DEBUG make option
- V=1 changed to V=yes

* Sun Jan 18 2009 Edouard Bourguignon <madko at linuxed.net> - 0.0.17-3
- Add a check section
- Add make options V=1 DEBUG=1 to make build logs more verbose and debuginfo more usefull 

* Sun Jan 18 2009 Edouard Bourguignon <madko at linuxed.net> - 0.0.17-2
- Cosmetic fix about realname macro (added in Name item)
- Change license tag from GPLv2 to GPLv2+
- Add missing doc files
- Add translation files

* Wed Jan 14 2009 Edouard Bourguignon <madko at linuxed.net> - 0.0.17-1
- Upgrade to upstream version (0.0.17)
- Requires pidgin removed

* Fri Jun 13 2008 Edouard Bourguignon <edouard.bourguignon at oxalya.com> - 0.0.13-1
- Initial version


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/purple-msn-pecan/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	26 Jan 2009 22:53:17 -0000	1.1
+++ .cvsignore	28 Jan 2009 03:03:09 -0000	1.2
@@ -0,0 +1 @@
+msn-pecan-0.0.17.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/purple-msn-pecan/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	26 Jan 2009 22:53:17 -0000	1.1
+++ sources	28 Jan 2009 03:03:09 -0000	1.2
@@ -0,0 +1 @@
+d0539f835d02c94774d06a7877e575ac  msn-pecan-0.0.17.tar.bz2



From itamarjp at fedoraproject.org  Wed Jan 28 04:19:43 2009
From: itamarjp at fedoraproject.org (Itamar Reis Peixoto)
Date: Wed, 28 Jan 2009 04:19:43 +0000 (UTC)
Subject: rpms/ss5/devel import.log, NONE, 1.1 ss5_init.patch, NONE,
	1.1 ss5.spec, 1.8, 1.9
Message-ID: <20090128041943.E24CB7010D@cvs1.fedora.phx.redhat.com>

Author: itamarjp

Update of /cvs/pkgs/rpms/ss5/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10028/devel

Modified Files:
	ss5.spec 
Added Files:
	import.log ss5_init.patch 
Log Message:
fix for BZ #478702



--- NEW FILE import.log ---
ss5-3_6_4-2_fc9:HEAD:ss5-3.6.4-2.fc9.src.rpm:1233115244

ss5_init.patch:

--- NEW FILE ss5_init.patch ---
diff -ruNp ss5-3.6.4.old/conf/ss5.init ss5-3.6.4.new/conf/ss5.init
--- ss5-3.6.4.old/conf/ss5.init	2007-04-17 11:40:43.000000000 -0300
+++ ss5-3.6.4.new/conf/ss5.init	2009-01-28 01:08:43.000000000 -0200
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# chkconfig: 345 20 80
+# chkconfig: - 20 80
 # description: This script takes care of starting \
 #              and stopping ss5
 #
@@ -31,7 +31,7 @@ case "$1" in
 	if [ $OS = "Linux" ]; then
             daemon /usr/sbin/ss5 -t $SS5_OPTS
             touch /var/lock/subsys/ss5
-	if [ $OS = "SunOS" ]; then
+	elif [ $OS = "SunOS" ]; then
             /usr/sbin/ss5 -t 
             touch /var/lock/subsys/ss5
 	else


Index: ss5.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ss5/devel/ss5.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ss5.spec	5 Sep 2008 20:17:59 -0000	1.8
+++ ss5.spec	28 Jan 2009 04:19:12 -0000	1.9
@@ -1,7 +1,7 @@
 Summary: Socks Server 5 
 Name: ss5
 Version: 3.6.4
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Group: Applications/Internet
 URL: http://sourceforge.net/projects/ss5
@@ -11,12 +11,15 @@
 Requires(post): chkconfig
 Requires(preun): chkconfig, initscripts
 
+Patch0: ss5_init.patch
+
 %description
 ss5 is a socks server, which supports both SOCKS4 and SOCKS5 protocols,
 that runs on Linux/Solaris platforms. 
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %configure --with-libpath=%{_libdir} 
@@ -42,12 +45,11 @@
 fi
 
 %files
-%defattr(755,root,root,-)
+%defattr(-,root,root,-)
 %{_sbindir}/ss5
 %{_initrddir}/ss5
 %{_libdir}/ss5/
 
-%defattr(644,root,root,-)
 %dir %{_docdir}/ss5
 %{_docdir}/ss5/License
 %{_docdir}/ss5/README.pam
@@ -65,17 +67,20 @@
 %{_mandir}/man5/ss5.pam.5.gz
 %{_mandir}/man5/ss5.ha.5.gz
 
-%defattr(755,root,root)
 %{_localstatedir}/log/ss5
 
 %dir %{_sysconfdir}/opt/ss5
-%defattr(0640,root,root)
 %config(noreplace) %{_sysconfdir}/opt/ss5/ss5.conf
 %config(noreplace) %{_sysconfdir}/opt/ss5/ss5.passwd
 %config(noreplace) %{_sysconfdir}/pam.d/ss5
 %doc ChangeLog
 
 %changelog
+* Wed Jan 28 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 3.6.4-2
+- fix init script BZ #478702
+- replace some tabs with spaces in changelog
+- fix wrong permissions in spec file
+
 * Fri Sep  5 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 3.6.4-1
 - fix license tag
 - update to 3.6.4
@@ -106,7 +111,7 @@
         * Fix DNS buffer as RFC
 
 *Fri May  05 2006 Matteo Ricchetti <matteo.ricchetti at libero.it>
-	* SS5-v3.5.8-2 released
+        * SS5-v3.5.8-2 released
         * Fix startup script
 
 *Wed Apr  26 2006 Matteo Ricchetti <matteo.ricchetti at libero.it>
@@ -114,13 +119,13 @@
         * Fix EAP (thx to Jakob Perz)
 
 *Mon Apr  24 2006 Matteo Ricchetti <matteo.ricchetti at libero.it>
-	* SS5-v3.5.7-1 released
-	* Fix replica feature
+        * SS5-v3.5.7-1 released
+        * Fix replica feature
         * Fix configure file
         * Fix man file for ss5.peers
 
 *Mon Apr  10 2006 Matteo Ricchetti <matteo.ricchetti at libero.it>
-	* SS5-v3.5.6-1 released
+        * SS5-v3.5.6-1 released
         * Fix startup script 
 
 *Thu Apr  06 2006 Matteo Ricchetti <matteo.ricchetti at libero.it>
@@ -136,11 +141,11 @@
         * Fix external authentication program 
 
 *Sun Mar  19 2006 Matteo Ricchetti <matteo.ricchetti at libero.it>
-	* SS5-v3.5.3-2 released
+        * SS5-v3.5.3-2 released
         * Fix package for Fedora naming guidelines
 
 *Thu Mar  09 2006 Matteo Ricchetti <matteo.ricchetti at libero.it>
-	* SS5-v3.5.3-1 released
+        * SS5-v3.5.3-1 released
         * Add security feature to centralized management
 
 *Thu Mar  09 2006 Matteo Ricchetti <matteo.ricchetti at libero.it>
@@ -180,14 +185,14 @@
         * New configure file (thx to Walter Franzini)
 
 *Tue Feb  07 2006 Matteo Ricchetti <matteo.ricchetti at libero.it>
-	* SS5-v3.3r5 released
+        * SS5-v3.3r5 released
         * Fix Solaris 10 compatibility with ctime_r() call
         * Fix netbios default domain
 
 *Mon Feb  06 2006 Matteo Ricchetti <matteo.ricchetti at libero.it>
         * SS5-v3.3r4 released
         * Add default netbios domain
-	* Fix externalprogram
+        * Fix externalprogram
 
 *Sat Feb  04 2006 Matteo Ricchetti <matteo.ricchetti at libero.it>
         * SS5-v3.3r3 released
@@ -201,7 +206,7 @@
 
 *Mon Jan  20 2006 Matteo Ricchetti <matteo.ricchetti at libero.it>
         * SS5-v3.3r1 released
-	* Add multiple directory store support
+        * Add multiple directory store support
         * Add netbios compatibility in authorization module
         * Add noproxy rule in mod_socks5
 
@@ -215,7 +220,7 @@
         * Fix module authentication (pam)
 
 *Mon Dec  16 2005 Matteo Ricchetti <matteo.ricchetti at libero.it>
-	* SS5-v3.2r5 released
+        * SS5-v3.2r5 released
         * Fix makefile for gcc old version
 
 *Mon Dec  04 2005 Matteo Ricchetti <matteo.ricchetti at libero.it>
@@ -257,7 +262,7 @@
         * Fix recv call
 
 *Mon Aug  22 2005 Matteo Ricchetti <matteo.ricchetti at libero.it>
-	* SS5-v3.0r9 released
+        * SS5-v3.0r9 released
         * Fix SS5_AUTHCACHEAGE option
 
 *Thu Aug  18 2005 Matteo Ricchetti <matteo.ricchetti at libero.it>
@@ -274,15 +279,15 @@
 
 *Thu May  10 2005 Matteo Ricchetti <matteo.ricchetti at libero.it>
         * SS5-v3.0r5 released
-	* Fix connect response using dns
+        * Fix connect response using dns
         * Increase authentication buffer
-	* Fix profiling bug
+        * Fix profiling bug
         * Modify package structure
 
 *Thu Apr  10 2005 Matteo Ricchetti <matteo.ricchetti at libero.it>
         * SS5-v3.0r4 released
         * Added comment into group file
-	
+
 *Thu Mar  10 2005 Matteo Ricchetti <matteo.ricchetti at libero.it>
         * SS5-v3.0r3 released
         * Pam module fix
@@ -323,7 +328,7 @@
 *Thu Dec  30 2003 Matteo Ricchetti <matteo.ricchetti at libero.it>
         * SS5-v2.4r5 released
         * Fix Solaris documentation
-	* Fix admin access check
+        * Fix admin access check
         * Add statistics information
 
 *Thu Dec  24 2003 Matteo Ricchetti <matteo.ricchetti at libero.it>
@@ -337,10 +342,10 @@
 *Thu Nov  15 2003 Matteo Ricchetti <matteo.ricchetti at libero.it>
         * SS5-v2.4r2 released
         * Fix some potential buffer overflow 
-	* Fix udp bind problem
+        * Fix udp bind problem
 
 *Thu Oct  29 2003 Matteo Ricchetti <matteo.ricchetti at libero.it>
-	* SS5-v2.4r1 released
+        * SS5-v2.4r1 released
         * Add session affinity in balanced connections
         * Add socks statistics about connections
         * Add fake authentication
@@ -369,8 +374,8 @@
         * SS5-v2.3r1 released
         * Add source-if feature for connect operation
         * Add better control in ldap base configuration
-	* Add better detail on log messages
-	* Threads creation improvement
+        * Add better detail on log messages
+        * Threads creation improvement
         * Fix automatic configuration reload (every 30 seconds)
 
 *Thu Aug  14  2003 Matteo Ricchetti <matteo.ricchetti at libero.it>
@@ -378,7 +383,7 @@
         * Add ldap profile feature
         * Add PAM authentication
         * Add username for ss5 execution
-	* Add server balancing feature !!!
+        * Add server balancing feature !!!
         * Add ssl fixup
         * Add pop3 fixup
         * Add imap fixup



From ianweller at fedoraproject.org  Wed Jan 28 04:39:59 2009
From: ianweller at fedoraproject.org (Ian Weller)
Date: Wed, 28 Jan 2009 04:39:59 +0000 (UTC)
Subject: rpms/gwibber/devel .cvsignore, 1.6, 1.7 gwibber.spec, 1.11,
	1.12 import.log, 1.6, 1.7 sources, 1.6, 1.7
Message-ID: <20090128043959.E7B1A7010D@cvs1.fedora.phx.redhat.com>

Author: ianweller

Update of /cvs/pkgs/rpms/gwibber/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13173/devel

Modified Files:
	.cvsignore gwibber.spec import.log sources 
Log Message:
importing gwibber-0.7.3-1.196bzr in devel


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gwibber/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	21 Dec 2008 16:37:42 -0000	1.6
+++ .cvsignore	28 Jan 2009 04:39:28 -0000	1.7
@@ -1 +1 @@
-gwibber-165bzr.tar.gz
+gwibber-196bzr.tar.gz


Index: gwibber.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gwibber/devel/gwibber.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- gwibber.spec	17 Jan 2009 13:13:42 -0000	1.11
+++ gwibber.spec	28 Jan 2009 04:39:28 -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()")}
 
-%define bzr_rev 165
+%define bzr_rev 196
 
 Name:           gwibber
-Version:        0.7.2
-Release:        5.%{bzr_rev}bzr%{?dist}
+Version:        0.7.3
+Release:        1.%{bzr_rev}bzr%{?dist}
 Summary:        An open source microblogging client for GNOME developed with Python and GTK
 
 Group:          Applications/Internet
@@ -13,17 +13,14 @@
 # The source for this package was pulled from upstream's vcs.  Use the
 # following commands to generate the tarball:
 #  bzr branch -r %{bzr_rev} lp:gwibber
-#  rm -rf gwibber/.bzr/
+#  rm -rf gwibber/.bzr*
 #  tar -czvf gwibber-%{bzr_rev}bzr.tar.gz gwibber
 Source0:        %{name}-%{bzr_rev}bzr.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  python-devel desktop-file-utils
-
-Requires:       python pygtk2 dbus-python gnome-python2-gconf PyXML
-Requires:       pywebkitgtk mx python-feedparser pyxdg python-imaging
-Requires:       python-sexy python-simplejson >= 1.9.1
-
+Requires:       python pygtk2 dbus-python gnome-python2-gconf PyXML pywebkitgtk mx python-feedparser pyxdg python-imaging
+Requires:       python-simplejson >= 1.9.1
+BuildRequires:  python-devel desktop-file-utils python-distutils-extra intltool gettext
 BuildArch:      noarch
 
 %description
@@ -33,6 +30,8 @@
 
 %prep
 %setup -q -n gwibber
+sed -i -e 's/version="0.7",/version="%{version}",/' setup.py
+sed -i -e '/^#! \?\//, 1d' $(find %{name} | grep "\.py$")
 
 
 %build
@@ -42,19 +41,25 @@
 %install
 rm -rf %{buildroot}
 %{__python} setup.py install --prefix %{_prefix} -O1 --skip-build --root %{buildroot}
-sed -i '/#! \?\/usr\/bin\/env python/d' $(find %{buildroot}%{python_sitelib}/%{name}/ | grep "\.py$")
+
+## Reinstall .desktop file
 rm -rf %{buildroot}%{_datadir}/applications
-desktop-file-install --vendor="fedora" --dir=%{buildroot}%{_datadir}/applications %{name}.desktop
+desktop-file-install --vendor="fedora" --dir=%{buildroot}%{_datadir}/applications build/share/applications/%{name}.desktop
+
+## Install i18n data  (THIS MUST COME LAST)
+cp -a build/mo %{buildroot}%{_datadir}/locale
+%find_lang %{name}
 
  
 %clean
 rm -rf %{buildroot}
 
 
-%files
+%files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING README
-%{python_sitelib}/*
+%{python_sitelib}/%{name}
+%{python_sitelib}/%{name}-*.egg-info
 %{_bindir}/%{name}
 %{_datadir}/%{name}
 %{_datadir}/pixmaps/%{name}.svg
@@ -62,11 +67,13 @@
 
 
 %changelog
-* Sat Jan 17 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.7.2-5.165bzr%{?dist}
-- Enable spell checking by adding missing requires on python-sexy.
-
-* Wed Jan 14 2009 Ian Weller <ianweller at gmail.com> 0.7.2-4.165bzr
-- Add python-imaging to Requires
+* Wed Jan 14 2009 Ian Weller <ianweller at gmail.com> 0.7.3-1.196bzr
+- Add Requires: python-imaging (PIL)
+- Add BuildRequires: python-distutils-extra, intltool and gettext for i18n
+- Add build and installation lines for i18n support
+- Move shebang remover to setup
+- Fix version in setup.py
+- Update upstream
 
 * Sun Dec 21 2008 Ian Weller <ianweller at gmail.com> 0.7.2-3.165bzr
 - Update upstream


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/gwibber/devel/import.log,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- import.log	21 Dec 2008 16:37:42 -0000	1.6
+++ import.log	28 Jan 2009 04:39:28 -0000	1.7
@@ -4,3 +4,4 @@
 gwibber-0_7_1-1_134bzr_fc9:HEAD:gwibber-0.7.1-1.134bzr.fc9.src.rpm:1226968773
 gwibber-0_7_2-1_156bzr_fc9:HEAD:gwibber-0.7.2-1.156bzr.fc9.src.rpm:1229563836
 gwibber-0_7_2-3_165bzr_fc9:HEAD:gwibber-0.7.2-3.165bzr.fc9.src.rpm:1229877434
+gwibber-0_7_3-1_196bzr_fc10:HEAD:gwibber-0.7.3-1.196bzr.fc10.src.rpm:1233117544


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gwibber/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	21 Dec 2008 16:37:42 -0000	1.6
+++ sources	28 Jan 2009 04:39:28 -0000	1.7
@@ -1 +1 @@
-a3d96ce81ca5bfd60f8f2c61e2497ba2  gwibber-165bzr.tar.gz
+c5d44825595388560e15d1dd09c5741a  gwibber-196bzr.tar.gz



From ianweller at fedoraproject.org  Wed Jan 28 04:43:24 2009
From: ianweller at fedoraproject.org (Ian Weller)
Date: Wed, 28 Jan 2009 04:43:24 +0000 (UTC)
Subject: rpms/gwibber/devel gwibber.spec,1.12,1.13 import.log,1.7,1.8
Message-ID: <20090128044324.D2D6D7010D@cvs1.fedora.phx.redhat.com>

Author: ianweller

Update of /cvs/pkgs/rpms/gwibber/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14501/devel

Modified Files:
	gwibber.spec import.log 
Log Message:
importing gwibber-0.7.3-2.196bzr in devel


Index: gwibber.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gwibber/devel/gwibber.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- gwibber.spec	28 Jan 2009 04:39:28 -0000	1.12
+++ gwibber.spec	28 Jan 2009 04:42:54 -0000	1.13
@@ -4,7 +4,7 @@
 
 Name:           gwibber
 Version:        0.7.3
-Release:        1.%{bzr_rev}bzr%{?dist}
+Release:        2.%{bzr_rev}bzr%{?dist}
 Summary:        An open source microblogging client for GNOME developed with Python and GTK
 
 Group:          Applications/Internet
@@ -18,8 +18,9 @@
 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 mx python-feedparser pyxdg python-imaging
-Requires:       python-simplejson >= 1.9.1
+Requires:       python pygtk2 dbus-python gnome-python2-gconf PyXML
+Requires:       pywebkitgtk mx python-feedparser pyxdg python-imaging
+Requires:       python-sexy python-simplejson >= 1.9.1
 BuildRequires:  python-devel desktop-file-utils python-distutils-extra intltool gettext
 BuildArch:      noarch
 
@@ -67,7 +68,10 @@
 
 
 %changelog
-* Wed Jan 14 2009 Ian Weller <ianweller at gmail.com> 0.7.3-1.196bzr
+* Tue Jan 27 2009 Ian Weller <ianweller at gmail.com> 0.7.3-2.196bzr
+- Restore the Requires on python-sexy that I accidentally overwrote
+
+* Tue Jan 27 2009 Ian Weller <ianweller at gmail.com> 0.7.3-1.196bzr
 - Add Requires: python-imaging (PIL)
 - Add BuildRequires: python-distutils-extra, intltool and gettext for i18n
 - Add build and installation lines for i18n support
@@ -75,6 +79,9 @@
 - Fix version in setup.py
 - Update upstream
 
+* Sat Jan 17 2009 Brian Pepple <bpepple at fedoraproject.org> 0.7.2-5.165bzr
+- Enable spell checking by adding missing requires on python-sexy.
+
 * Sun Dec 21 2008 Ian Weller <ianweller at gmail.com> 0.7.2-3.165bzr
 - Update upstream
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/gwibber/devel/import.log,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- import.log	28 Jan 2009 04:39:28 -0000	1.7
+++ import.log	28 Jan 2009 04:42:54 -0000	1.8
@@ -5,3 +5,4 @@
 gwibber-0_7_2-1_156bzr_fc9:HEAD:gwibber-0.7.2-1.156bzr.fc9.src.rpm:1229563836
 gwibber-0_7_2-3_165bzr_fc9:HEAD:gwibber-0.7.2-3.165bzr.fc9.src.rpm:1229877434
 gwibber-0_7_3-1_196bzr_fc10:HEAD:gwibber-0.7.3-1.196bzr.fc10.src.rpm:1233117544
+gwibber-0_7_3-2_196bzr_fc10:HEAD:gwibber-0.7.3-2.196bzr.fc10.src.rpm:1233117748



From ianweller at fedoraproject.org  Wed Jan 28 04:44:48 2009
From: ianweller at fedoraproject.org (Ian Weller)
Date: Wed, 28 Jan 2009 04:44:48 +0000 (UTC)
Subject: rpms/gwibber/F-10 .cvsignore, 1.6, 1.7 gwibber.spec, 1.10,
	1.11 import.log, 1.6, 1.7 sources, 1.6, 1.7
Message-ID: <20090128044448.C45817010D@cvs1.fedora.phx.redhat.com>

Author: ianweller

Update of /cvs/pkgs/rpms/gwibber/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15042/F-10

Modified Files:
	.cvsignore gwibber.spec import.log sources 
Log Message:
importing gwibber-0.7.3-2.196bzr in F-10


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gwibber/F-10/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	21 Dec 2008 16:42:55 -0000	1.6
+++ .cvsignore	28 Jan 2009 04:44:18 -0000	1.7
@@ -1 +1 @@
-gwibber-165bzr.tar.gz
+gwibber-196bzr.tar.gz


Index: gwibber.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gwibber/F-10/gwibber.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- gwibber.spec	17 Jan 2009 13:17:46 -0000	1.10
+++ gwibber.spec	28 Jan 2009 04:44:18 -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()")}
 
-%define bzr_rev 165
+%define bzr_rev 196
 
 Name:           gwibber
-Version:        0.7.2
-Release:        5.%{bzr_rev}bzr%{?dist}
+Version:        0.7.3
+Release:        2.%{bzr_rev}bzr%{?dist}
 Summary:        An open source microblogging client for GNOME developed with Python and GTK
 
 Group:          Applications/Internet
@@ -13,17 +13,15 @@
 # The source for this package was pulled from upstream's vcs.  Use the
 # following commands to generate the tarball:
 #  bzr branch -r %{bzr_rev} lp:gwibber
-#  rm -rf gwibber/.bzr/
+#  rm -rf gwibber/.bzr*
 #  tar -czvf gwibber-%{bzr_rev}bzr.tar.gz gwibber
 Source0:        %{name}-%{bzr_rev}bzr.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  python-devel desktop-file-utils
-
 Requires:       python pygtk2 dbus-python gnome-python2-gconf PyXML
 Requires:       pywebkitgtk mx python-feedparser pyxdg python-imaging
 Requires:       python-sexy python-simplejson >= 1.9.1
-
+BuildRequires:  python-devel desktop-file-utils python-distutils-extra intltool gettext
 BuildArch:      noarch
 
 %description
@@ -33,6 +31,8 @@
 
 %prep
 %setup -q -n gwibber
+sed -i -e 's/version="0.7",/version="%{version}",/' setup.py
+sed -i -e '/^#! \?\//, 1d' $(find %{name} | grep "\.py$")
 
 
 %build
@@ -42,19 +42,25 @@
 %install
 rm -rf %{buildroot}
 %{__python} setup.py install --prefix %{_prefix} -O1 --skip-build --root %{buildroot}
-sed -i '/#! \?\/usr\/bin\/env python/d' $(find %{buildroot}%{python_sitelib}/%{name}/ | grep "\.py$")
+
+## Reinstall .desktop file
 rm -rf %{buildroot}%{_datadir}/applications
-desktop-file-install --vendor="fedora" --dir=%{buildroot}%{_datadir}/applications %{name}.desktop
+desktop-file-install --vendor="fedora" --dir=%{buildroot}%{_datadir}/applications build/share/applications/%{name}.desktop
+
+## Install i18n data  (THIS MUST COME LAST)
+cp -a build/mo %{buildroot}%{_datadir}/locale
+%find_lang %{name}
 
  
 %clean
 rm -rf %{buildroot}
 
 
-%files
+%files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING README
-%{python_sitelib}/*
+%{python_sitelib}/%{name}
+%{python_sitelib}/%{name}-*.egg-info
 %{_bindir}/%{name}
 %{_datadir}/%{name}
 %{_datadir}/pixmaps/%{name}.svg
@@ -62,11 +68,19 @@
 
 
 %changelog
-* Sat Jan 17 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.7.2-5.165bzr
-- Enable spell checking by adding missing requires on python-sexy.
+* Tue Jan 27 2009 Ian Weller <ianweller at gmail.com> 0.7.3-2.196bzr
+- Restore the Requires on python-sexy that I accidentally overwrote
+
+* Tue Jan 27 2009 Ian Weller <ianweller at gmail.com> 0.7.3-1.196bzr
+- Add Requires: python-imaging (PIL)
+- Add BuildRequires: python-distutils-extra, intltool and gettext for i18n
+- Add build and installation lines for i18n support
+- Move shebang remover to setup
+- Fix version in setup.py
+- Update upstream
 
-* Wed Jan 14 2009 Ian Weller <ianweller at gmail.com> 0.7.2-4.165bzr
-- Add python-imaging to Requires
+* Sat Jan 17 2009 Brian Pepple <bpepple at fedoraproject.org> 0.7.2-5.165bzr
+- Enable spell checking by adding missing requires on python-sexy.
 
 * Sun Dec 21 2008 Ian Weller <ianweller at gmail.com> 0.7.2-3.165bzr
 - Update upstream


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/gwibber/F-10/import.log,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- import.log	21 Dec 2008 16:42:55 -0000	1.6
+++ import.log	28 Jan 2009 04:44:18 -0000	1.7
@@ -4,3 +4,4 @@
 gwibber-0_7_1-1_134bzr_fc9:F-10:gwibber-0.7.1-1.134bzr.fc9.src.rpm:1226969056
 gwibber-0_7_2-1_156bzr_fc9:F-10:gwibber-0.7.2-1.156bzr.fc9.src.rpm:1229563933
 gwibber-0_7_2-3_165bzr_fc9:F-10:gwibber-0.7.2-3.165bzr.fc9.src.rpm:1229877508
+gwibber-0_7_3-2_196bzr_fc10:F-10:gwibber-0.7.3-2.196bzr.fc10.src.rpm:1233117818


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gwibber/F-10/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	21 Dec 2008 16:42:55 -0000	1.6
+++ sources	28 Jan 2009 04:44:18 -0000	1.7
@@ -1 +1 @@
-a3d96ce81ca5bfd60f8f2c61e2497ba2  gwibber-165bzr.tar.gz
+c5d44825595388560e15d1dd09c5741a  gwibber-196bzr.tar.gz



From ianweller at fedoraproject.org  Wed Jan 28 04:46:05 2009
From: ianweller at fedoraproject.org (Ian Weller)
Date: Wed, 28 Jan 2009 04:46:05 +0000 (UTC)
Subject: rpms/gwibber/F-9 .cvsignore, 1.6, 1.7 gwibber.spec, 1.9,
	1.10 import.log, 1.6, 1.7 sources, 1.6, 1.7
Message-ID: <20090128044605.E69367010D@cvs1.fedora.phx.redhat.com>

Author: ianweller

Update of /cvs/pkgs/rpms/gwibber/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15377/F-9

Modified Files:
	.cvsignore gwibber.spec import.log sources 
Log Message:
importing gwibber-0.7.3-2.196bzr in F-9


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gwibber/F-9/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	21 Dec 2008 16:44:17 -0000	1.6
+++ .cvsignore	28 Jan 2009 04:45:35 -0000	1.7
@@ -1 +1 @@
-gwibber-165bzr.tar.gz
+gwibber-196bzr.tar.gz


Index: gwibber.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gwibber/F-9/gwibber.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- gwibber.spec	15 Jan 2009 01:58:01 -0000	1.9
+++ gwibber.spec	28 Jan 2009 04:45:35 -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()")}
 
-%define bzr_rev 165
+%define bzr_rev 196
 
 Name:           gwibber
-Version:        0.7.2
-Release:        4.%{bzr_rev}bzr%{?dist}
+Version:        0.7.3
+Release:        2.%{bzr_rev}bzr%{?dist}
 Summary:        An open source microblogging client for GNOME developed with Python and GTK
 
 Group:          Applications/Internet
@@ -13,14 +13,15 @@
 # The source for this package was pulled from upstream's vcs.  Use the
 # following commands to generate the tarball:
 #  bzr branch -r %{bzr_rev} lp:gwibber
-#  rm -rf gwibber/.bzr/
+#  rm -rf gwibber/.bzr*
 #  tar -czvf gwibber-%{bzr_rev}bzr.tar.gz gwibber
 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 mx python-feedparser pyxdg python-imaging
-Requires:       python-simplejson >= 1.9.1
-BuildRequires:  python-devel desktop-file-utils
+Requires:       python pygtk2 dbus-python gnome-python2-gconf PyXML
+Requires:       pywebkitgtk mx python-feedparser pyxdg python-imaging
+Requires:       python-sexy python-simplejson >= 1.9.1
+BuildRequires:  python-devel desktop-file-utils python-distutils-extra intltool gettext
 BuildArch:      noarch
 
 %description
@@ -30,6 +31,8 @@
 
 %prep
 %setup -q -n gwibber
+sed -i -e 's/version="0.7",/version="%{version}",/' setup.py
+sed -i -e '/^#! \?\//, 1d' $(find %{name} | grep "\.py$")
 
 
 %build
@@ -39,19 +42,25 @@
 %install
 rm -rf %{buildroot}
 %{__python} setup.py install --prefix %{_prefix} -O1 --skip-build --root %{buildroot}
-sed -i '/#! \?\/usr\/bin\/env python/d' $(find %{buildroot}%{python_sitelib}/%{name}/ | grep "\.py$")
+
+## Reinstall .desktop file
 rm -rf %{buildroot}%{_datadir}/applications
-desktop-file-install --vendor="fedora" --dir=%{buildroot}%{_datadir}/applications %{name}.desktop
+desktop-file-install --vendor="fedora" --dir=%{buildroot}%{_datadir}/applications build/share/applications/%{name}.desktop
+
+## Install i18n data  (THIS MUST COME LAST)
+cp -a build/mo %{buildroot}%{_datadir}/locale
+%find_lang %{name}
 
  
 %clean
 rm -rf %{buildroot}
 
 
-%files
+%files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING README
-%{python_sitelib}/*
+%{python_sitelib}/%{name}
+%{python_sitelib}/%{name}-*.egg-info
 %{_bindir}/%{name}
 %{_datadir}/%{name}
 %{_datadir}/pixmaps/%{name}.svg
@@ -59,8 +68,19 @@
 
 
 %changelog
-* Wed Jan 14 2009 Ian Weller <ianweller at gmail.com> 0.7.2-4.165bzr
-- Add python-imaging to Requires
+* Tue Jan 27 2009 Ian Weller <ianweller at gmail.com> 0.7.3-2.196bzr
+- Restore the Requires on python-sexy that I accidentally overwrote
+
+* Tue Jan 27 2009 Ian Weller <ianweller at gmail.com> 0.7.3-1.196bzr
+- Add Requires: python-imaging (PIL)
+- Add BuildRequires: python-distutils-extra, intltool and gettext for i18n
+- Add build and installation lines for i18n support
+- Move shebang remover to setup
+- Fix version in setup.py
+- Update upstream
+
+* Sat Jan 17 2009 Brian Pepple <bpepple at fedoraproject.org> 0.7.2-5.165bzr
+- Enable spell checking by adding missing requires on python-sexy.
 
 * Sun Dec 21 2008 Ian Weller <ianweller at gmail.com> 0.7.2-3.165bzr
 - Update upstream


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/gwibber/F-9/import.log,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- import.log	21 Dec 2008 16:44:17 -0000	1.6
+++ import.log	28 Jan 2009 04:45:35 -0000	1.7
@@ -4,3 +4,4 @@
 gwibber-0_7_1-1_134bzr_fc9:F-9:gwibber-0.7.1-1.134bzr.fc9.src.rpm:1226968916
 gwibber-0_7_2-1_156bzr_fc9:F-9:gwibber-0.7.2-1.156bzr.fc9.src.rpm:1229564004
 gwibber-0_7_2-3_165bzr_fc9:F-9:gwibber-0.7.2-3.165bzr.fc9.src.rpm:1229877822
+gwibber-0_7_3-2_196bzr_fc10:F-9:gwibber-0.7.3-2.196bzr.fc10.src.rpm:1233117901


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gwibber/F-9/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	21 Dec 2008 16:44:17 -0000	1.6
+++ sources	28 Jan 2009 04:45:35 -0000	1.7
@@ -1 +1 @@
-a3d96ce81ca5bfd60f8f2c61e2497ba2  gwibber-165bzr.tar.gz
+c5d44825595388560e15d1dd09c5741a  gwibber-196bzr.tar.gz



From jwilson at fedoraproject.org  Wed Jan 28 04:52:07 2009
From: jwilson at fedoraproject.org (Jarod Wilson)
Date: Wed, 28 Jan 2009 04:52:07 +0000 (UTC)
Subject: rpms/kernel/devel kernel.spec, 1.1237,
	1.1238 linux-2.6.29-lirc.patch, 1.1, 1.2
Message-ID: <20090128045207.C1B547010D@cvs1.fedora.phx.redhat.com>

Author: jwilson

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16515

Modified Files:
	kernel.spec linux-2.6.29-lirc.patch 
Log Message:
* Tue Jan 27 2009 Jarod Wilson <jarod at redhat.com>
- Tell hiddev to leave antec-branded imon display/ir devices alone



Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1237
retrieving revision 1.1238
diff -u -r1.1237 -r1.1238
--- kernel.spec	27 Jan 2009 21:30:08 -0000	1.1237
+++ kernel.spec	28 Jan 2009 04:51:37 -0000	1.1238
@@ -1772,6 +1772,9 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Tue Jan 27 2009 Jarod Wilson <jarod at redhat.com>
+- Tell hiddev to leave antec-branded imon display/ir devices alone
+
 * Tue Jan 27 2009 Kyle McMartin <kyle at redhat.com>
 - Re-enable nouveau.
 

linux-2.6.29-lirc.patch:

Index: linux-2.6.29-lirc.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6.29-lirc.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6.29-lirc.patch	27 Jan 2009 04:47:27 -0000	1.1
+++ linux-2.6.29-lirc.patch	28 Jan 2009 04:51:37 -0000	1.2
@@ -1,3 +1,5 @@
+ drivers/hid/hid-core.c                |    2 +
+ drivers/hid/hid-ids.h                 |    2 +
  drivers/input/Kconfig                 |    2 +
  drivers/input/Makefile                |    2 +
  drivers/input/lirc/Kconfig            |  118 +++
@@ -22,7 +24,8 @@
  drivers/input/lirc/lirc_streamzap.c   |  772 ++++++++++++++++++
  drivers/input/lirc/lirc_ttusbir.c     |  396 ++++++++++
  drivers/input/lirc/lirc_zilog.c       | 1382 +++++++++++++++++++++++++++++++++
- 24 files changed, 14503 insertions(+), 0 deletions(-)
+
+ 26 files changed, 14507 insertions(+), 0 deletions(-)
 
 diff --git a/drivers/input/Kconfig b/drivers/input/Kconfig
 index 5f9d860..2ba0904 100644
@@ -14678,3 +14681,29 @@
 +
 +module_param(disable_tx, bool, 0644);
 +MODULE_PARM_DESC(disable_tx, "Disable the IR transmitter device");
+diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
+index 5d7640e..7001c31 100644
+--- a/drivers/hid/hid-core.c
++++ b/drivers/hid/hid-core.c
+@@ -1606,6 +1606,8 @@ static const struct hid_device_id hid_ignore_list[] = {
+ 	{ HID_USB_DEVICE(USB_VENDOR_ID_SOUNDGRAPH, USB_DEVICE_ID_SOUNDGRAPH_IMON_LCD) },
+ 	{ HID_USB_DEVICE(USB_VENDOR_ID_SOUNDGRAPH, USB_DEVICE_ID_SOUNDGRAPH_IMON_LCD2) },
+ 	{ HID_USB_DEVICE(USB_VENDOR_ID_SOUNDGRAPH, USB_DEVICE_ID_SOUNDGRAPH_IMON_LCD3) },
++	{ HID_USB_DEVICE(USB_VENDOR_ID_SOUNDGRAPH, USB_DEVICE_ID_SOUNDGRAPH_IMON_LCD4) },
++	{ HID_USB_DEVICE(USB_VENDOR_ID_SOUNDGRAPH, USB_DEVICE_ID_SOUNDGRAPH_IMON_LCD5) },
+ 	{ HID_USB_DEVICE(USB_VENDOR_ID_TENX, USB_DEVICE_ID_TENX_IBUDDY1) },
+ 	{ HID_USB_DEVICE(USB_VENDOR_ID_TENX, USB_DEVICE_ID_TENX_IBUDDY2) },
+ 	{ HID_USB_DEVICE(USB_VENDOR_ID_THRUSTMASTER, 0xb300) },
+diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
+index acc1abc..e899f51 100644
+--- a/drivers/hid/hid-ids.h
++++ b/drivers/hid/hid-ids.h
+@@ -362,6 +362,8 @@
+ #define USB_DEVICE_ID_SOUNDGRAPH_IMON_LCD	0x0038
+ #define USB_DEVICE_ID_SOUNDGRAPH_IMON_LCD2	0x0036
+ #define USB_DEVICE_ID_SOUNDGRAPH_IMON_LCD3	0x0034
++#define USB_DEVICE_ID_SOUNDGRAPH_IMON_LCD4	0x0044
++#define USB_DEVICE_ID_SOUNDGRAPH_IMON_LCD5	0x0045
+ 
+ #define USB_VENDOR_ID_SUN		0x0430
+ #define USB_DEVICE_ID_RARITAN_KVM_DONGLE	0xcdab



From pkgdb at fedoraproject.org  Wed Jan 28 05:11:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Jan 2009 05:11:01 +0000
Subject: [pkgdb] ldm: ryan52 has requested watchbugzilla
Message-ID: <20090128051101.AD0FE208486@bastion.fedora.phx.redhat.com>

ryan52 has requested the watchbugzilla acl on ldm (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ldm



From pkgdb at fedoraproject.org  Wed Jan 28 05:11:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Jan 2009 05:11:10 +0000
Subject: [pkgdb] ldm: ryan52 has requested watchcommits
Message-ID: <20090128051110.CA36B208497@bastion.fedora.phx.redhat.com>

ryan52 has requested the watchcommits acl on ldm (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ldm



From pkgdb at fedoraproject.org  Wed Jan 28 05:11:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Jan 2009 05:11:10 +0000
Subject: [pkgdb] ldm: ryan52 has requested commit
Message-ID: <20090128051111.10D26208605@bastion.fedora.phx.redhat.com>

ryan52 has requested the commit acl on ldm (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ldm



From pkgdb at fedoraproject.org  Wed Jan 28 05:11:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Jan 2009 05:11:23 +0000
Subject: [pkgdb] ldm: ryan52 has requested watchcommits
Message-ID: <20090128051123.6A4D1208610@bastion.fedora.phx.redhat.com>

ryan52 has requested the watchcommits acl on ldm (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ldm



From pkgdb at fedoraproject.org  Wed Jan 28 05:11:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Jan 2009 05:11:25 +0000
Subject: [pkgdb] ldm: ryan52 has requested commit
Message-ID: <20090128051126.8D09B208493@bastion.fedora.phx.redhat.com>

ryan52 has requested the commit acl on ldm (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ldm



From pkgdb at fedoraproject.org  Wed Jan 28 05:11:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Jan 2009 05:11:28 +0000
Subject: [pkgdb] ldm: ryan52 has requested watchbugzilla
Message-ID: <20090128051128.87E172086F2@bastion.fedora.phx.redhat.com>

ryan52 has requested the watchbugzilla acl on ldm (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ldm



From pkgdb at fedoraproject.org  Wed Jan 28 05:11:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Jan 2009 05:11:31 +0000
Subject: [pkgdb] ldm: ryan52 has requested watchcommits
Message-ID: <20090128051131.63A9420873D@bastion.fedora.phx.redhat.com>

ryan52 has requested the watchcommits acl on ldm (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ldm



From pkgdb at fedoraproject.org  Wed Jan 28 05:11:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Jan 2009 05:11:33 +0000
Subject: [pkgdb] ldm: ryan52 has requested commit
Message-ID: <20090128051133.330CA208748@bastion.fedora.phx.redhat.com>

ryan52 has requested the commit acl on ldm (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ldm



From pkgdb at fedoraproject.org  Wed Jan 28 05:11:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Jan 2009 05:11:36 +0000
Subject: [pkgdb] ldm: ryan52 has requested watchbugzilla
Message-ID: <20090128051136.998922084BD@bastion.fedora.phx.redhat.com>

ryan52 has requested the watchbugzilla acl on ldm (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ldm



From pkgdb at fedoraproject.org  Wed Jan 28 05:11:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Jan 2009 05:11:54 +0000
Subject: [pkgdb] ltspfs: ryan52 has requested watchcommits
Message-ID: <20090128051154.E7B54208605@bastion.fedora.phx.redhat.com>

ryan52 has requested the watchcommits acl on ltspfs (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ltspfs



From pkgdb at fedoraproject.org  Wed Jan 28 05:11:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Jan 2009 05:11:55 +0000
Subject: [pkgdb] ltspfs: ryan52 has requested commit
Message-ID: <20090128051155.EEFAE20860B@bastion.fedora.phx.redhat.com>

ryan52 has requested the commit acl on ltspfs (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ltspfs



From pkgdb at fedoraproject.org  Wed Jan 28 05:11:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Jan 2009 05:11:57 +0000
Subject: [pkgdb] ltspfs: ryan52 has requested watchbugzilla
Message-ID: <20090128051157.146DF208966@bastion.fedora.phx.redhat.com>

ryan52 has requested the watchbugzilla acl on ltspfs (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ltspfs



From pkgdb at fedoraproject.org  Wed Jan 28 05:12:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Jan 2009 05:12:01 +0000
Subject: [pkgdb] ltspfs: ryan52 has requested watchcommits
Message-ID: <20090128051201.B12E620860F@bastion.fedora.phx.redhat.com>

ryan52 has requested the watchcommits acl on ltspfs (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ltspfs



From pkgdb at fedoraproject.org  Wed Jan 28 05:12:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Jan 2009 05:12:05 +0000
Subject: [pkgdb] ltspfs: ryan52 has requested commit
Message-ID: <20090128051205.4CA4A208973@bastion.fedora.phx.redhat.com>

ryan52 has requested the commit acl on ltspfs (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ltspfs



From pkgdb at fedoraproject.org  Wed Jan 28 05:12:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Jan 2009 05:12:07 +0000
Subject: [pkgdb] ltspfs: ryan52 has requested watchcommits
Message-ID: <20090128051207.5D81620897A@bastion.fedora.phx.redhat.com>

ryan52 has requested the watchcommits acl on ltspfs (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ltspfs



From pkgdb at fedoraproject.org  Wed Jan 28 05:12:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Jan 2009 05:12:08 +0000
Subject: [pkgdb] ltspfs: ryan52 has requested watchbugzilla
Message-ID: <20090128051208.7E78420897D@bastion.fedora.phx.redhat.com>

ryan52 has requested the watchbugzilla acl on ltspfs (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ltspfs



From pkgdb at fedoraproject.org  Wed Jan 28 05:12:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Jan 2009 05:12:57 +0000
Subject: [pkgdb] ltspfs: ryan52 has requested commit
Message-ID: <20090128051257.A04E92084A7@bastion.fedora.phx.redhat.com>

ryan52 has requested the commit acl on ltspfs (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ltspfs



From pkgdb at fedoraproject.org  Wed Jan 28 05:12:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Jan 2009 05:12:57 +0000
Subject: [pkgdb] ltspfs: ryan52 has requested watchbugzilla
Message-ID: <20090128051257.B6FEC208679@bastion.fedora.phx.redhat.com>

ryan52 has requested the watchbugzilla acl on ltspfs (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ltspfs



From pkgdb at fedoraproject.org  Wed Jan 28 05:13:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Jan 2009 05:13:25 +0000
Subject: [pkgdb] ltsp: ryan52 has requested watchcommits
Message-ID: <20090128051325.D718B2084BD@bastion.fedora.phx.redhat.com>

ryan52 has requested the watchcommits acl on ltsp (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ltsp



From pkgdb at fedoraproject.org  Wed Jan 28 05:13:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Jan 2009 05:13:26 +0000
Subject: [pkgdb] ltsp: ryan52 has requested watchbugzilla
Message-ID: <20090128051326.E6DAE20860A@bastion.fedora.phx.redhat.com>

ryan52 has requested the watchbugzilla acl on ltsp (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ltsp



From pkgdb at fedoraproject.org  Wed Jan 28 05:13:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Jan 2009 05:13:33 +0000
Subject: [pkgdb] ltsp: ryan52 has requested commit
Message-ID: <20090128051333.DE858208700@bastion.fedora.phx.redhat.com>

ryan52 has requested the commit acl on ltsp (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ltsp



From pkgdb at fedoraproject.org  Wed Jan 28 05:13:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Jan 2009 05:13:40 +0000
Subject: [pkgdb] ltsp: ryan52 has requested watchcommits
Message-ID: <20090128051340.6F4C420860D@bastion.fedora.phx.redhat.com>

ryan52 has requested the watchcommits acl on ltsp (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ltsp



From pkgdb at fedoraproject.org  Wed Jan 28 05:13:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Jan 2009 05:13:42 +0000
Subject: [pkgdb] ltsp: ryan52 has requested commit
Message-ID: <20090128051342.B39682086F2@bastion.fedora.phx.redhat.com>

ryan52 has requested the commit acl on ltsp (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ltsp



From pkgdb at fedoraproject.org  Wed Jan 28 05:13:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Jan 2009 05:13:44 +0000
Subject: [pkgdb] ltsp: ryan52 has requested watchbugzilla
Message-ID: <20090128051344.418B320873F@bastion.fedora.phx.redhat.com>

ryan52 has requested the watchbugzilla acl on ltsp (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ltsp



From pkgdb at fedoraproject.org  Wed Jan 28 05:13:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Jan 2009 05:13:49 +0000
Subject: [pkgdb] ltsp: ryan52 has requested watchbugzilla
Message-ID: <20090128051352.4ED5B20874A@bastion.fedora.phx.redhat.com>

ryan52 has requested the watchbugzilla acl on ltsp (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ltsp



From pkgdb at fedoraproject.org  Wed Jan 28 05:13:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Jan 2009 05:13:55 +0000
Subject: [pkgdb] ltsp: ryan52 has requested commit
Message-ID: <20090128051355.3E60920876B@bastion.fedora.phx.redhat.com>

ryan52 has requested the commit acl on ltsp (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ltsp



From pkgdb at fedoraproject.org  Wed Jan 28 05:13:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Jan 2009 05:13:56 +0000
Subject: [pkgdb] ltsp: ryan52 has requested watchcommits
Message-ID: <20090128051356.2D466208966@bastion.fedora.phx.redhat.com>

ryan52 has requested the watchcommits acl on ltsp (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ltsp



From pkgdb at fedoraproject.org  Wed Jan 28 05:14:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Jan 2009 05:14:07 +0000
Subject: [pkgdb] mkdst: ryan52 has requested watchbugzilla
Message-ID: <20090128051408.C3B0220866E@bastion.fedora.phx.redhat.com>

ryan52 has requested the watchbugzilla acl on mkdst (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mkdst



From pkgdb at fedoraproject.org  Wed Jan 28 05:14:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Jan 2009 05:14:09 +0000
Subject: [pkgdb] mkdst: ryan52 has requested watchcommits
Message-ID: <20090128051409.4BDA320896F@bastion.fedora.phx.redhat.com>

ryan52 has requested the watchcommits acl on mkdst (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mkdst



From pkgdb at fedoraproject.org  Wed Jan 28 05:14:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Jan 2009 05:14:12 +0000
Subject: [pkgdb] mkdst: ryan52 has requested commit
Message-ID: <20090128051412.EDAD8208495@bastion.fedora.phx.redhat.com>

ryan52 has requested the commit acl on mkdst (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mkdst



From pkgdb at fedoraproject.org  Wed Jan 28 05:14:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Jan 2009 05:14:16 +0000
Subject: [pkgdb] mkdst: ryan52 has requested watchcommits
Message-ID: <20090128051416.35C4920897C@bastion.fedora.phx.redhat.com>

ryan52 has requested the watchcommits acl on mkdst (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mkdst



From pkgdb at fedoraproject.org  Wed Jan 28 05:14:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Jan 2009 05:14:16 +0000
Subject: [pkgdb] mkdst: ryan52 has requested watchbugzilla
Message-ID: <20090128051416.D8DB7208A5F@bastion.fedora.phx.redhat.com>

ryan52 has requested the watchbugzilla acl on mkdst (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mkdst



From pkgdb at fedoraproject.org  Wed Jan 28 05:14:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Jan 2009 05:14:22 +0000
Subject: [pkgdb] mkdst: ryan52 has requested commit
Message-ID: <20090128051422.E0490208D07@bastion.fedora.phx.redhat.com>

ryan52 has requested the commit acl on mkdst (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mkdst



From pkgdb at fedoraproject.org  Wed Jan 28 05:14:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Jan 2009 05:14:22 +0000
Subject: [pkgdb] mkdst: ryan52 has requested watchbugzilla
Message-ID: <20090128051422.E5FBF208D1F@bastion.fedora.phx.redhat.com>

ryan52 has requested the watchbugzilla acl on mkdst (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mkdst



From pkgdb at fedoraproject.org  Wed Jan 28 05:14:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Jan 2009 05:14:25 +0000
Subject: [pkgdb] mkdst: ryan52 has requested commit
Message-ID: <20090128051425.772AA208678@bastion.fedora.phx.redhat.com>

ryan52 has requested the commit acl on mkdst (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mkdst



From pkgdb at fedoraproject.org  Wed Jan 28 05:14:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Jan 2009 05:14:25 +0000
Subject: [pkgdb] mkdst: ryan52 has requested watchcommits
Message-ID: <20090128051425.DE98E208D5E@bastion.fedora.phx.redhat.com>

ryan52 has requested the watchcommits acl on mkdst (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mkdst



From pkgdb at fedoraproject.org  Wed Jan 28 05:15:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Jan 2009 05:15:57 +0000
Subject: [pkgdb] ltsp had acl change status
Message-ID: <20090128051557.773D0208701@bastion.fedora.phx.redhat.com>

wtogami has set the watchbugzilla acl on ltsp (Fedora devel) to Approved for ryan52

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ltsp



From pkgdb at fedoraproject.org  Wed Jan 28 05:15:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Jan 2009 05:15:59 +0000
Subject: [pkgdb] ltsp had acl change status
Message-ID: <20090128051600.4391120873F@bastion.fedora.phx.redhat.com>

wtogami has set the watchcommits acl on ltsp (Fedora devel) to Approved for ryan52

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ltsp



From pkgdb at fedoraproject.org  Wed Jan 28 05:16:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Jan 2009 05:16:03 +0000
Subject: [pkgdb] ltsp had acl change status
Message-ID: <20090128051603.602C6208742@bastion.fedora.phx.redhat.com>

wtogami has set the commit acl on ltsp (Fedora devel) to Approved for ryan52

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ltsp



From wtogami at fedoraproject.org  Wed Jan 28 05:19:54 2009
From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=)
Date: Wed, 28 Jan 2009 05:19:54 +0000 (UTC)
Subject: rpms/ltsp-utils/devel dead.package, NONE, 1.1 Makefile, 1.1,
	NONE ltsp-utils.spec, 1.4, NONE sources, 1.2, NONE
Message-ID: <20090128051954.485277010D@cvs1.fedora.phx.redhat.com>

Author: wtogami

Update of /cvs/pkgs/rpms/ltsp-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20791

Added Files:
	dead.package 
Removed Files:
	Makefile ltsp-utils.spec sources 
Log Message:
This package should have died years ago.



--- NEW FILE dead.package ---


--- Makefile DELETED ---


--- ltsp-utils.spec DELETED ---


--- sources DELETED ---



From pkgdb at fedoraproject.org  Wed Jan 28 05:22:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Jan 2009 05:22:57 +0000
Subject: [pkgdb] ltsp (Fedora, 10) updated by wtogami
Message-ID: <20090128052257.7C841208486@bastion.fedora.phx.redhat.com>

wtogami changed owner of ltsp in Fedora 10 to wtogami
wtogami approved watchbugzilla on ltsp (Fedora 10) for ryan52
wtogami approved watchcommits on ltsp (Fedora 10) for ryan52
wtogami approved commit on ltsp (Fedora 10) for ryan52
wtogami approved build on ltsp (Fedora 10) for ryan52
wtogami approved approveacls on ltsp (Fedora 10) for ryan52

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ltsp



From pkgdb at fedoraproject.org  Wed Jan 28 05:22:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Jan 2009 05:22:57 +0000
Subject: [pkgdb] ltsp (Fedora, 9) updated by wtogami
Message-ID: <20090128052257.91F25208495@bastion.fedora.phx.redhat.com>

wtogami changed owner of ltsp in Fedora 9 to wtogami
wtogami approved watchbugzilla on ltsp (Fedora 9) for ryan52
wtogami approved watchcommits on ltsp (Fedora 9) for ryan52
wtogami approved commit on ltsp (Fedora 9) for ryan52
wtogami approved build on ltsp (Fedora 9) for ryan52
wtogami approved approveacls on ltsp (Fedora 9) for ryan52

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ltsp



From pkgdb at fedoraproject.org  Wed Jan 28 05:23:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Jan 2009 05:23:08 +0000
Subject: [pkgdb] ltspfs (Fedora, 9) updated by wtogami
Message-ID: <20090128052308.3B6EF2084BD@bastion.fedora.phx.redhat.com>

wtogami changed owner of ltspfs in Fedora 9 to wtogami
wtogami approved watchbugzilla on ltspfs (Fedora 9) for ryan52
wtogami approved watchcommits on ltspfs (Fedora 9) for ryan52
wtogami approved commit on ltspfs (Fedora 9) for ryan52
wtogami approved build on ltspfs (Fedora 9) for ryan52
wtogami approved approveacls on ltspfs (Fedora 9) for ryan52

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ltspfs



From pkgdb at fedoraproject.org  Wed Jan 28 05:22:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Jan 2009 05:22:57 +0000
Subject: [pkgdb] ltsp (Fedora, devel) updated by wtogami
Message-ID: <20090128052257.A4F0C2084A7@bastion.fedora.phx.redhat.com>

wtogami changed owner of ltsp in Fedora devel to wtogami
wtogami approved watchbugzilla on ltsp (Fedora devel) for ryan52
wtogami approved watchcommits on ltsp (Fedora devel) for ryan52
wtogami approved commit on ltsp (Fedora devel) for ryan52
wtogami approved build on ltsp (Fedora devel) for ryan52
wtogami approved approveacls on ltsp (Fedora devel) for ryan52

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ltsp



From pkgdb at fedoraproject.org  Wed Jan 28 05:23:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Jan 2009 05:23:08 +0000
Subject: [pkgdb] ltspfs (Fedora, devel) updated by wtogami
Message-ID: <20090128052308.535A620860A@bastion.fedora.phx.redhat.com>

wtogami changed owner of ltspfs in Fedora devel to wtogami
wtogami approved watchbugzilla on ltspfs (Fedora devel) for ryan52
wtogami approved watchcommits on ltspfs (Fedora devel) for ryan52
wtogami approved commit on ltspfs (Fedora devel) for ryan52
wtogami approved build on ltspfs (Fedora devel) for ryan52
wtogami approved approveacls on ltspfs (Fedora devel) for ryan52

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ltspfs



From pkgdb at fedoraproject.org  Wed Jan 28 05:23:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Jan 2009 05:23:08 +0000
Subject: [pkgdb] ltspfs (Fedora, 10) updated by wtogami
Message-ID: <20090128052308.6F93520860D@bastion.fedora.phx.redhat.com>

wtogami changed owner of ltspfs in Fedora 10 to wtogami
wtogami approved watchbugzilla on ltspfs (Fedora 10) for ryan52
wtogami approved watchcommits on ltspfs (Fedora 10) for ryan52
wtogami approved commit on ltspfs (Fedora 10) for ryan52
wtogami approved build on ltspfs (Fedora 10) for ryan52
wtogami approved approveacls on ltspfs (Fedora 10) for ryan52

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ltspfs



From pkgdb at fedoraproject.org  Wed Jan 28 05:23:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Jan 2009 05:23:16 +0000
Subject: [pkgdb] ldm (Fedora, 9) updated by wtogami
Message-ID: <20090128052316.B1E1D20860F@bastion.fedora.phx.redhat.com>

wtogami changed owner of ldm in Fedora 9 to wtogami
wtogami approved watchbugzilla on ldm (Fedora 9) for ryan52
wtogami approved watchcommits on ldm (Fedora 9) for ryan52
wtogami approved commit on ldm (Fedora 9) for ryan52
wtogami approved build on ldm (Fedora 9) for ryan52
wtogami approved approveacls on ldm (Fedora 9) for ryan52

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ldm



From pkgdb at fedoraproject.org  Wed Jan 28 05:23:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Jan 2009 05:23:16 +0000
Subject: [pkgdb] ldm (Fedora, devel) updated by wtogami
Message-ID: <20090128052316.C562F2086F2@bastion.fedora.phx.redhat.com>

wtogami changed owner of ldm in Fedora devel to wtogami
wtogami approved watchbugzilla on ldm (Fedora devel) for ryan52
wtogami approved watchcommits on ldm (Fedora devel) for ryan52
wtogami approved commit on ldm (Fedora devel) for ryan52
wtogami approved build on ldm (Fedora devel) for ryan52
wtogami approved approveacls on ldm (Fedora devel) for ryan52

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ldm



From pkgdb at fedoraproject.org  Wed Jan 28 05:23:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Jan 2009 05:23:16 +0000
Subject: [pkgdb] ldm (Fedora, 10) updated by wtogami
Message-ID: <20090128052316.E9DE6208739@bastion.fedora.phx.redhat.com>

wtogami changed owner of ldm in Fedora 10 to wtogami
wtogami approved watchbugzilla on ldm (Fedora 10) for ryan52
wtogami approved watchcommits on ldm (Fedora 10) for ryan52
wtogami approved commit on ldm (Fedora 10) for ryan52
wtogami approved build on ldm (Fedora 10) for ryan52
wtogami approved approveacls on ldm (Fedora 10) for ryan52

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ldm



From pkgdb at fedoraproject.org  Wed Jan 28 05:23:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Jan 2009 05:23:22 +0000
Subject: [pkgdb] ltsp-utils ownership updated
Message-ID: <20090128052323.5251D208493@bastion.fedora.phx.redhat.com>

Package ltsp-utils in Fedora devel was orphaned by wtogami

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ltsp-utils



From pkgdb at fedoraproject.org  Wed Jan 28 05:23:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Jan 2009 05:23:56 +0000
Subject: [pkgdb] mkdst (Fedora, 9) updated by wtogami
Message-ID: <20090128052356.C9834208496@bastion.fedora.phx.redhat.com>

wtogami changed owner of mkdst in Fedora 9 to wtogami
wtogami approved watchbugzilla on mkdst (Fedora 9) for ryan52
wtogami approved watchcommits on mkdst (Fedora 9) for ryan52
wtogami approved commit on mkdst (Fedora 9) for ryan52
wtogami approved build on mkdst (Fedora 9) for ryan52
wtogami approved approveacls on mkdst (Fedora 9) for ryan52

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mkdst



From pkgdb at fedoraproject.org  Wed Jan 28 05:23:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Jan 2009 05:23:56 +0000
Subject: [pkgdb] mkdst (Fedora, 10) updated by wtogami
Message-ID: <20090128052357.43C4A2084B6@bastion.fedora.phx.redhat.com>

wtogami changed owner of mkdst in Fedora 10 to wtogami
wtogami approved watchbugzilla on mkdst (Fedora 10) for ryan52
wtogami approved watchcommits on mkdst (Fedora 10) for ryan52
wtogami approved commit on mkdst (Fedora 10) for ryan52
wtogami approved build on mkdst (Fedora 10) for ryan52
wtogami approved approveacls on mkdst (Fedora 10) for ryan52

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mkdst



From pkgdb at fedoraproject.org  Wed Jan 28 05:23:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Jan 2009 05:23:56 +0000
Subject: [pkgdb] mkdst (Fedora, devel) updated by wtogami
Message-ID: <20090128052357.57535208605@bastion.fedora.phx.redhat.com>

wtogami changed owner of mkdst in Fedora devel to wtogami
wtogami approved watchbugzilla on mkdst (Fedora devel) for ryan52
wtogami approved watchcommits on mkdst (Fedora devel) for ryan52
wtogami approved commit on mkdst (Fedora devel) for ryan52
wtogami approved build on mkdst (Fedora devel) for ryan52
wtogami approved approveacls on mkdst (Fedora devel) for ryan52

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mkdst



From pkgdb at fedoraproject.org  Wed Jan 28 05:33:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Jan 2009 05:33:05 +0000
Subject: [pkgdb] portmidi was added for oget
Message-ID: <20090128053305.ABDF9208486@bastion.fedora.phx.redhat.com>

kevin has added Package portmidi with summary Real-time Midi I/O Library
kevin has approved Package portmidi
kevin has added a Fedora devel branch for portmidi with an owner of oget
kevin has approved portmidi in Fedora devel
kevin has approved Package portmidi
kevin has set commit to Approved for provenpackager on portmidi (Fedora devel)
kevin has set build to Approved for provenpackager on portmidi (Fedora devel)
kevin has set checkout to Approved for provenpackager on portmidi (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/portmidi



From pkgdb at fedoraproject.org  Wed Jan 28 05:33:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Jan 2009 05:33:08 +0000
Subject: [pkgdb] portmidi (Fedora, 10) updated by kevin
Message-ID: <20090128053308.58573208495@bastion.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for portmidi
kevin has set commit to Approved for provenpackager on portmidi (Fedora 10)
kevin has set build to Approved for provenpackager on portmidi (Fedora 10)
kevin has set checkout to Approved for provenpackager on portmidi (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/portmidi



From kevin at fedoraproject.org  Wed Jan 28 05:33:23 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 28 Jan 2009 05:33:23 +0000 (UTC)
Subject: rpms/portmidi - New directory
Message-ID: <20090128053323.2F1287010D@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/portmidi
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsP22580/rpms/portmidi

Log Message:
Directory /cvs/pkgs/rpms/portmidi added to the repository




From kevin at fedoraproject.org  Wed Jan 28 05:33:23 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 28 Jan 2009 05:33:23 +0000 (UTC)
Subject: rpms/portmidi/devel - New directory
Message-ID: <20090128053323.73AC37010D@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/portmidi/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsP22580/rpms/portmidi/devel

Log Message:
Directory /cvs/pkgs/rpms/portmidi/devel added to the repository




From kevin at fedoraproject.org  Wed Jan 28 05:33:41 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 28 Jan 2009 05:33:41 +0000 (UTC)
Subject: rpms/portmidi Makefile,NONE,1.1
Message-ID: <20090128053341.77C077010D@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/portmidi
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsP22580/rpms/portmidi

Added Files:
	Makefile 
Log Message:
Setup of module portmidi


--- NEW FILE Makefile ---
# Top level Makefile for module portmidi
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Jan 28 05:33:41 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 28 Jan 2009 05:33:41 +0000 (UTC)
Subject: rpms/portmidi/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090128053341.C31007010D@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/portmidi/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsP22580/rpms/portmidi/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module portmidi


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: portmidi
# $Id: Makefile,v 1.1 2009/01/28 05:33:41 kevin Exp $
NAME := portmidi
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Jan 28 05:34:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Jan 2009 05:34:50 +0000
Subject: [pkgdb] emacs-mew was added for tagoh
Message-ID: <20090128053450.401CB208494@bastion.fedora.phx.redhat.com>

kevin has added Package emacs-mew with summary Email client for GNU Emacs
kevin has approved Package emacs-mew
kevin has added a Fedora devel branch for emacs-mew with an owner of tagoh
kevin has approved emacs-mew in Fedora devel
kevin has approved Package emacs-mew
kevin has set commit to Approved for provenpackager on emacs-mew (Fedora devel)
kevin has set build to Approved for provenpackager on emacs-mew (Fedora devel)
kevin has set checkout to Approved for provenpackager on emacs-mew (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/emacs-mew



From pkgdb at fedoraproject.org  Wed Jan 28 05:34:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Jan 2009 05:34:51 +0000
Subject: [pkgdb] emacs-mew (Fedora, 10) updated by kevin
Message-ID: <20090128053452.D7A5E2084B6@bastion.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for emacs-mew
kevin has set commit to Approved for provenpackager on emacs-mew (Fedora 10)
kevin has set build to Approved for provenpackager on emacs-mew (Fedora 10)
kevin has set checkout to Approved for provenpackager on emacs-mew (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/emacs-mew



From pkgdb at fedoraproject.org  Wed Jan 28 05:34:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Jan 2009 05:34:51 +0000
Subject: [pkgdb] emacs-mew (Fedora, 9) updated by kevin
Message-ID: <20090128053452.62071208496@bastion.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for emacs-mew
kevin has set commit to Approved for provenpackager on emacs-mew (Fedora 9)
kevin has set build to Approved for provenpackager on emacs-mew (Fedora 9)
kevin has set checkout to Approved for provenpackager on emacs-mew (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/emacs-mew



From kevin at fedoraproject.org  Wed Jan 28 05:35:06 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 28 Jan 2009 05:35:06 +0000 (UTC)
Subject: rpms/emacs-mew - New directory
Message-ID: <20090128053506.3BCB57010D@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/emacs-mew
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsa22816/rpms/emacs-mew

Log Message:
Directory /cvs/pkgs/rpms/emacs-mew added to the repository




From kevin at fedoraproject.org  Wed Jan 28 05:35:06 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 28 Jan 2009 05:35:06 +0000 (UTC)
Subject: rpms/emacs-mew/devel - New directory
Message-ID: <20090128053506.86EC370143@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/emacs-mew/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsa22816/rpms/emacs-mew/devel

Log Message:
Directory /cvs/pkgs/rpms/emacs-mew/devel added to the repository




From kevin at fedoraproject.org  Wed Jan 28 05:35:24 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 28 Jan 2009 05:35:24 +0000 (UTC)
Subject: rpms/emacs-mew Makefile,NONE,1.1
Message-ID: <20090128053524.1DAC37010D@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/emacs-mew
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsa22816/rpms/emacs-mew

Added Files:
	Makefile 
Log Message:
Setup of module emacs-mew


--- NEW FILE Makefile ---
# Top level Makefile for module emacs-mew
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Jan 28 05:35:24 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 28 Jan 2009 05:35:24 +0000 (UTC)
Subject: rpms/emacs-mew/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090128053524.705457010D@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/emacs-mew/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsa22816/rpms/emacs-mew/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module emacs-mew


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: emacs-mew
# $Id: Makefile,v 1.1 2009/01/28 05:35:24 kevin Exp $
NAME := emacs-mew
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Jan 28 05:36:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Jan 2009 05:36:00 +0000
Subject: [pkgdb] perl-Perl6-Junction was added for allisson
Message-ID: <20090128053600.78754208486@bastion.fedora.phx.redhat.com>

kevin has added Package perl-Perl6-Junction with summary Perl6 style Junction operators in Perl5
kevin has approved Package perl-Perl6-Junction
kevin has added a Fedora devel branch for perl-Perl6-Junction with an owner of allisson
kevin has approved perl-Perl6-Junction in Fedora devel
kevin has approved Package perl-Perl6-Junction
kevin has set commit to Approved for provenpackager on perl-Perl6-Junction (Fedora devel)
kevin has set build to Approved for provenpackager on perl-Perl6-Junction (Fedora devel)
kevin has set checkout to Approved for provenpackager on perl-Perl6-Junction (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Perl6-Junction



From pkgdb at fedoraproject.org  Wed Jan 28 05:36:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Jan 2009 05:36:08 +0000
Subject: [pkgdb] perl-Perl6-Junction (Fedora, 9) updated by kevin
Message-ID: <20090128053608.79C16208495@bastion.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for perl-Perl6-Junction
kevin has set commit to Approved for provenpackager on perl-Perl6-Junction (Fedora 9)
kevin has set build to Approved for provenpackager on perl-Perl6-Junction (Fedora 9)
kevin has set checkout to Approved for provenpackager on perl-Perl6-Junction (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Perl6-Junction



From kevin at fedoraproject.org  Wed Jan 28 05:36:21 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 28 Jan 2009 05:36:21 +0000 (UTC)
Subject: rpms/perl-Perl6-Junction - New directory
Message-ID: <20090128053621.260937010D@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Perl6-Junction
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsW23087/rpms/perl-Perl6-Junction

Log Message:
Directory /cvs/pkgs/rpms/perl-Perl6-Junction added to the repository




From kevin at fedoraproject.org  Wed Jan 28 05:36:21 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 28 Jan 2009 05:36:21 +0000 (UTC)
Subject: rpms/perl-Perl6-Junction/devel - New directory
Message-ID: <20090128053621.6182D7010D@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Perl6-Junction/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsW23087/rpms/perl-Perl6-Junction/devel

Log Message:
Directory /cvs/pkgs/rpms/perl-Perl6-Junction/devel added to the repository




From pkgdb at fedoraproject.org  Wed Jan 28 05:36:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Jan 2009 05:36:08 +0000
Subject: [pkgdb] perl-Perl6-Junction (Fedora, 10) updated by kevin
Message-ID: <20090128053608.8A1972084A7@bastion.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for perl-Perl6-Junction
kevin has set commit to Approved for provenpackager on perl-Perl6-Junction (Fedora 10)
kevin has set build to Approved for provenpackager on perl-Perl6-Junction (Fedora 10)
kevin has set checkout to Approved for provenpackager on perl-Perl6-Junction (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Perl6-Junction



From kevin at fedoraproject.org  Wed Jan 28 05:36:37 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 28 Jan 2009 05:36:37 +0000 (UTC)
Subject: rpms/perl-Perl6-Junction Makefile,NONE,1.1
Message-ID: <20090128053637.4F6F67010D@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Perl6-Junction
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsW23087/rpms/perl-Perl6-Junction

Added Files:
	Makefile 
Log Message:
Setup of module perl-Perl6-Junction


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Perl6-Junction
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Jan 28 05:36:37 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 28 Jan 2009 05:36:37 +0000 (UTC)
Subject: rpms/perl-Perl6-Junction/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090128053637.B1D587010D@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Perl6-Junction/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsW23087/rpms/perl-Perl6-Junction/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Perl6-Junction


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: perl-Perl6-Junction
# $Id: Makefile,v 1.1 2009/01/28 05:36:37 kevin Exp $
NAME := perl-Perl6-Junction
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Jan 28 05:37:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Jan 2009 05:37:10 +0000
Subject: [pkgdb] PyQwt was added for tadej
Message-ID: <20090128053711.170AD208486@bastion.fedora.phx.redhat.com>

kevin has added Package PyQwt with summary Python bindings for Qwt
kevin has approved Package PyQwt
kevin has added a Fedora devel branch for PyQwt with an owner of tadej
kevin has approved PyQwt in Fedora devel
kevin has approved Package PyQwt
kevin has set commit to Approved for provenpackager on PyQwt (Fedora devel)
kevin has set build to Approved for provenpackager on PyQwt (Fedora devel)
kevin has set checkout to Approved for provenpackager on PyQwt (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/PyQwt



From pkgdb at fedoraproject.org  Wed Jan 28 05:37:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Jan 2009 05:37:13 +0000
Subject: [pkgdb] PyQwt (Fedora, 9) updated by kevin
Message-ID: <20090128053714.8DAB6208495@bastion.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for PyQwt
kevin has set commit to Approved for provenpackager on PyQwt (Fedora 9)
kevin has set build to Approved for provenpackager on PyQwt (Fedora 9)
kevin has set checkout to Approved for provenpackager on PyQwt (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/PyQwt



From kevin at fedoraproject.org  Wed Jan 28 05:37:31 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 28 Jan 2009 05:37:31 +0000 (UTC)
Subject: rpms/PyQwt - New directory
Message-ID: <20090128053731.2B56A7010D@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/PyQwt
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsT23363/rpms/PyQwt

Log Message:
Directory /cvs/pkgs/rpms/PyQwt added to the repository




From kevin at fedoraproject.org  Wed Jan 28 05:37:31 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 28 Jan 2009 05:37:31 +0000 (UTC)
Subject: rpms/PyQwt/devel - New directory
Message-ID: <20090128053731.7EEFA7010D@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/PyQwt/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsT23363/rpms/PyQwt/devel

Log Message:
Directory /cvs/pkgs/rpms/PyQwt/devel added to the repository




From pkgdb at fedoraproject.org  Wed Jan 28 05:37:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Jan 2009 05:37:13 +0000
Subject: [pkgdb] PyQwt (Fedora, 10) updated by kevin
Message-ID: <20090128053714.9A7652084A7@bastion.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for PyQwt
kevin has set commit to Approved for provenpackager on PyQwt (Fedora 10)
kevin has set build to Approved for provenpackager on PyQwt (Fedora 10)
kevin has set checkout to Approved for provenpackager on PyQwt (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/PyQwt



From kevin at fedoraproject.org  Wed Jan 28 05:37:50 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 28 Jan 2009 05:37:50 +0000 (UTC)
Subject: rpms/PyQwt Makefile,NONE,1.1
Message-ID: <20090128053750.1D4907010D@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/PyQwt
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsT23363/rpms/PyQwt

Added Files:
	Makefile 
Log Message:
Setup of module PyQwt


--- NEW FILE Makefile ---
# Top level Makefile for module PyQwt
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Jan 28 05:37:50 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 28 Jan 2009 05:37:50 +0000 (UTC)
Subject: rpms/PyQwt/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <20090128053750.633EB7010D@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/PyQwt/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsT23363/rpms/PyQwt/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module PyQwt


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: PyQwt
# $Id: Makefile,v 1.1 2009/01/28 05:37:50 kevin Exp $
NAME := PyQwt
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Jan 28 05:38:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Jan 2009 05:38:54 +0000
Subject: [pkgdb] ibus-table: cchance has requested watchcommits
Message-ID: <20090128053854.8C25D208486@bastion.fedora.phx.redhat.com>

cchance has requested the watchcommits acl on ibus-table (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ibus-table



From pkgdb at fedoraproject.org  Wed Jan 28 05:38:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Jan 2009 05:38:55 +0000
Subject: [pkgdb] ibus-table: cchance has requested commit
Message-ID: <20090128053855.F1010208495@bastion.fedora.phx.redhat.com>

cchance has requested the commit acl on ibus-table (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ibus-table



From pkgdb at fedoraproject.org  Wed Jan 28 05:38:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Jan 2009 05:38:58 +0000
Subject: [pkgdb] ibus-table: cchance has requested watchbugzilla
Message-ID: <20090128053858.4A1BA2084A7@bastion.fedora.phx.redhat.com>

cchance has requested the watchbugzilla acl on ibus-table (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ibus-table



From pkgdb at fedoraproject.org  Wed Jan 28 05:39:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Jan 2009 05:39:28 +0000
Subject: [pkgdb] sugar-connect was added for fab
Message-ID: <20090128053928.845AF208493@bastion.fedora.phx.redhat.com>

kevin has added Package sugar-connect with summary Connect for Sugar
kevin has approved Package sugar-connect
kevin has added a Fedora devel branch for sugar-connect with an owner of fab
kevin has approved sugar-connect in Fedora devel
kevin has approved Package sugar-connect
kevin has set commit to Approved for provenpackager on sugar-connect (Fedora devel)
kevin has set build to Approved for provenpackager on sugar-connect (Fedora devel)
kevin has set checkout to Approved for provenpackager on sugar-connect (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-connect



From pkgdb at fedoraproject.org  Wed Jan 28 05:39:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Jan 2009 05:39:30 +0000
Subject: [pkgdb] sugar-connect (Fedora, 10) updated by kevin
Message-ID: <20090128053930.8463E208496@bastion.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for sugar-connect
kevin has set commit to Approved for provenpackager on sugar-connect (Fedora 10)
kevin has set build to Approved for provenpackager on sugar-connect (Fedora 10)
kevin has set checkout to Approved for provenpackager on sugar-connect (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-connect



From kevin at fedoraproject.org  Wed Jan 28 05:39:51 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 28 Jan 2009 05:39:51 +0000 (UTC)
Subject: rpms/sugar-connect - New directory
Message-ID: <20090128053951.2732F7010D@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/sugar-connect
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsJ23737/rpms/sugar-connect

Log Message:
Directory /cvs/pkgs/rpms/sugar-connect added to the repository




From kevin at fedoraproject.org  Wed Jan 28 05:39:51 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 28 Jan 2009 05:39:51 +0000 (UTC)
Subject: rpms/sugar-connect/devel - New directory
Message-ID: <20090128053951.6433370144@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/sugar-connect/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsJ23737/rpms/sugar-connect/devel

Log Message:
Directory /cvs/pkgs/rpms/sugar-connect/devel added to the repository




From kevin at fedoraproject.org  Wed Jan 28 05:40:12 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 28 Jan 2009 05:40:12 +0000 (UTC)
Subject: rpms/sugar-connect/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090128054012.3F98170143@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/sugar-connect/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsJ23737/rpms/sugar-connect/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module sugar-connect


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: sugar-connect
# $Id: Makefile,v 1.1 2009/01/28 05:40:12 kevin Exp $
NAME := sugar-connect
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out 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 Jan 28 05:40:11 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 28 Jan 2009 05:40:11 +0000 (UTC)
Subject: rpms/sugar-connect Makefile,NONE,1.1
Message-ID: <20090128054011.F08807010D@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/sugar-connect
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsJ23737/rpms/sugar-connect

Added Files:
	Makefile 
Log Message:
Setup of module sugar-connect


--- NEW FILE Makefile ---
# Top level Makefile for module sugar-connect
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout 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 Jan 28 05:41:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Jan 2009 05:41:43 +0000
Subject: [pkgdb] sugar-imageviewer was added for fab
Message-ID: <20090128054143.481FC208493@bastion.fedora.phx.redhat.com>

kevin has added Package sugar-imageviewer with summary Simple image viewer for Sugar
kevin has approved Package sugar-imageviewer
kevin has added a Fedora devel branch for sugar-imageviewer with an owner of fab
kevin has approved sugar-imageviewer in Fedora devel
kevin has approved Package sugar-imageviewer
kevin has set commit to Approved for provenpackager on sugar-imageviewer (Fedora devel)
kevin has set build to Approved for provenpackager on sugar-imageviewer (Fedora devel)
kevin has set checkout to Approved for provenpackager on sugar-imageviewer (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-imageviewer



From kevin at fedoraproject.org  Wed Jan 28 05:42:01 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 28 Jan 2009 05:42:01 +0000 (UTC)
Subject: rpms/sugar-imageviewer - New directory
Message-ID: <20090128054201.2E6027010D@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/sugar-imageviewer
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsh24133/rpms/sugar-imageviewer

Log Message:
Directory /cvs/pkgs/rpms/sugar-imageviewer added to the repository




From pkgdb at fedoraproject.org  Wed Jan 28 05:41:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Jan 2009 05:41:46 +0000
Subject: [pkgdb] sugar-imageviewer (Fedora, 10) updated by kevin
Message-ID: <20090128054146.D0C21208496@bastion.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for sugar-imageviewer
kevin has set commit to Approved for provenpackager on sugar-imageviewer (Fedora 10)
kevin has set build to Approved for provenpackager on sugar-imageviewer (Fedora 10)
kevin has set checkout to Approved for provenpackager on sugar-imageviewer (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-imageviewer



From kevin at fedoraproject.org  Wed Jan 28 05:42:01 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 28 Jan 2009 05:42:01 +0000 (UTC)
Subject: rpms/sugar-imageviewer/devel - New directory
Message-ID: <20090128054201.73FB870141@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/sugar-imageviewer/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsh24133/rpms/sugar-imageviewer/devel

Log Message:
Directory /cvs/pkgs/rpms/sugar-imageviewer/devel added to the repository




From kevin at fedoraproject.org  Wed Jan 28 05:42:18 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 28 Jan 2009 05:42:18 +0000 (UTC)
Subject: rpms/sugar-imageviewer Makefile,NONE,1.1
Message-ID: <20090128054218.9B5D17010D@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/sugar-imageviewer
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsh24133/rpms/sugar-imageviewer

Added Files:
	Makefile 
Log Message:
Setup of module sugar-imageviewer


--- NEW FILE Makefile ---
# Top level Makefile for module sugar-imageviewer
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Jan 28 05:42:18 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 28 Jan 2009 05:42:18 +0000 (UTC)
Subject: rpms/sugar-imageviewer/devel .cvsignore, NONE, 1.1 Makefile, NONE, 
	1.1 sources, NONE, 1.1
Message-ID: <20090128054218.D92F97010D@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/sugar-imageviewer/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsh24133/rpms/sugar-imageviewer/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module sugar-imageviewer


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: sugar-imageviewer
# $Id: Makefile,v 1.1 2009/01/28 05:42:18 kevin Exp $
NAME := sugar-imageviewer
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Jan 28 05:43:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Jan 2009 05:43:15 +0000
Subject: [pkgdb] perl-MooseX-ClassAttribute was added for allisson
Message-ID: <20090128054316.D56C2208201@bastion.fedora.phx.redhat.com>

kevin has added Package perl-MooseX-ClassAttribute with summary Declare class attributes Moose-style
kevin has approved Package perl-MooseX-ClassAttribute
kevin has added a Fedora devel branch for perl-MooseX-ClassAttribute with an owner of allisson
kevin has approved perl-MooseX-ClassAttribute in Fedora devel
kevin has approved Package perl-MooseX-ClassAttribute
kevin has set commit to Approved for provenpackager on perl-MooseX-ClassAttribute (Fedora devel)
kevin has set build to Approved for provenpackager on perl-MooseX-ClassAttribute (Fedora devel)
kevin has set checkout to Approved for provenpackager on perl-MooseX-ClassAttribute (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-MooseX-ClassAttribute



From pkgdb at fedoraproject.org  Wed Jan 28 05:43:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Jan 2009 05:43:21 +0000
Subject: [pkgdb] perl-MooseX-ClassAttribute (Fedora, 9) updated by kevin
Message-ID: <20090128054321.E7E55208496@bastion.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for perl-MooseX-ClassAttribute
kevin has set commit to Approved for provenpackager on perl-MooseX-ClassAttribute (Fedora 9)
kevin has set build to Approved for provenpackager on perl-MooseX-ClassAttribute (Fedora 9)
kevin has set checkout to Approved for provenpackager on perl-MooseX-ClassAttribute (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-MooseX-ClassAttribute



From kevin at fedoraproject.org  Wed Jan 28 05:43:34 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 28 Jan 2009 05:43:34 +0000 (UTC)
Subject: rpms/perl-MooseX-ClassAttribute/devel - New directory
Message-ID: <20090128054334.67A9570144@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-MooseX-ClassAttribute/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsB24569/rpms/perl-MooseX-ClassAttribute/devel

Log Message:
Directory /cvs/pkgs/rpms/perl-MooseX-ClassAttribute/devel added to the repository




From kevin at fedoraproject.org  Wed Jan 28 05:43:34 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 28 Jan 2009 05:43:34 +0000 (UTC)
Subject: rpms/perl-MooseX-ClassAttribute - New directory
Message-ID: <20090128054334.2367970142@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-MooseX-ClassAttribute
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsB24569/rpms/perl-MooseX-ClassAttribute

Log Message:
Directory /cvs/pkgs/rpms/perl-MooseX-ClassAttribute added to the repository




From pkgdb at fedoraproject.org  Wed Jan 28 05:43:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Jan 2009 05:43:21 +0000
Subject: [pkgdb] perl-MooseX-ClassAttribute (Fedora, 10) updated by kevin
Message-ID: <20090128054322.033842084B6@bastion.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for perl-MooseX-ClassAttribute
kevin has set commit to Approved for provenpackager on perl-MooseX-ClassAttribute (Fedora 10)
kevin has set build to Approved for provenpackager on perl-MooseX-ClassAttribute (Fedora 10)
kevin has set checkout to Approved for provenpackager on perl-MooseX-ClassAttribute (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-MooseX-ClassAttribute



From kevin at fedoraproject.org  Wed Jan 28 05:43:53 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 28 Jan 2009 05:43:53 +0000 (UTC)
Subject: rpms/perl-MooseX-ClassAttribute Makefile,NONE,1.1
Message-ID: <20090128054353.224B670142@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-MooseX-ClassAttribute
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsB24569/rpms/perl-MooseX-ClassAttribute

Added Files:
	Makefile 
Log Message:
Setup of module perl-MooseX-ClassAttribute


--- NEW FILE Makefile ---
# Top level Makefile for module perl-MooseX-ClassAttribute
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Jan 28 05:43:53 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 28 Jan 2009 05:43:53 +0000 (UTC)
Subject: rpms/perl-MooseX-ClassAttribute/devel .cvsignore, NONE, 1.1 Makefile,
	NONE, 1.1 sources, NONE, 1.1
Message-ID: <20090128054353.60C4270142@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-MooseX-ClassAttribute/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsB24569/rpms/perl-MooseX-ClassAttribute/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-MooseX-ClassAttribute


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: perl-MooseX-ClassAttribute
# $Id: Makefile,v 1.1 2009/01/28 05:43:53 kevin Exp $
NAME := perl-MooseX-ClassAttribute
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Jan 28 05:44:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Jan 2009 05:44:45 +0000
Subject: [pkgdb] opencsv was added for red
Message-ID: <20090128054445.69F83208486@bastion.fedora.phx.redhat.com>

kevin has added Package opencsv with summary A very simple csv (comma-separated values) parser library for java
kevin has approved Package opencsv
kevin has added a Fedora devel branch for opencsv with an owner of red
kevin has approved opencsv in Fedora devel
kevin has approved Package opencsv
kevin has set commit to Approved for provenpackager on opencsv (Fedora devel)
kevin has set build to Approved for provenpackager on opencsv (Fedora devel)
kevin has set checkout to Approved for provenpackager on opencsv (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/opencsv



From pkgdb at fedoraproject.org  Wed Jan 28 05:44:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Jan 2009 05:44:46 +0000
Subject: [pkgdb] opencsv (Fedora, 9) updated by kevin
Message-ID: <20090128054446.C32F5208495@bastion.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for opencsv
kevin has set commit to Approved for provenpackager on opencsv (Fedora 9)
kevin has set build to Approved for provenpackager on opencsv (Fedora 9)
kevin has set checkout to Approved for provenpackager on opencsv (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/opencsv



From kevin at fedoraproject.org  Wed Jan 28 05:45:07 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 28 Jan 2009 05:45:07 +0000 (UTC)
Subject: rpms/opencsv/devel - New directory
Message-ID: <20090128054507.85C2E7010D@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/opencsv/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsu25564/rpms/opencsv/devel

Log Message:
Directory /cvs/pkgs/rpms/opencsv/devel added to the repository




From kevin at fedoraproject.org  Wed Jan 28 05:45:07 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 28 Jan 2009 05:45:07 +0000 (UTC)
Subject: rpms/opencsv - New directory
Message-ID: <20090128054507.291BB7010D@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/opencsv
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsu25564/rpms/opencsv

Log Message:
Directory /cvs/pkgs/rpms/opencsv added to the repository




From pkgdb at fedoraproject.org  Wed Jan 28 05:44:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Jan 2009 05:44:46 +0000
Subject: [pkgdb] opencsv (Fedora, 10) updated by kevin
Message-ID: <20090128054446.DDF0F2084A7@bastion.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for opencsv
kevin has set commit to Approved for provenpackager on opencsv (Fedora 10)
kevin has set build to Approved for provenpackager on opencsv (Fedora 10)
kevin has set checkout to Approved for provenpackager on opencsv (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/opencsv



From kevin at fedoraproject.org  Wed Jan 28 05:45:24 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 28 Jan 2009 05:45:24 +0000 (UTC)
Subject: rpms/opencsv Makefile,NONE,1.1
Message-ID: <20090128054524.682A87010D@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/opencsv
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsu25564/rpms/opencsv

Added Files:
	Makefile 
Log Message:
Setup of module opencsv


--- NEW FILE Makefile ---
# Top level Makefile for module opencsv
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Jan 28 05:45:24 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Wed, 28 Jan 2009 05:45:24 +0000 (UTC)
Subject: rpms/opencsv/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <20090128054524.B9C817010D@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/opencsv/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsu25564/rpms/opencsv/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module opencsv


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: opencsv
# $Id: Makefile,v 1.1 2009/01/28 05:45:24 kevin Exp $
NAME := opencsv
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From herlo at fedoraproject.org  Wed Jan 28 05:46:07 2009
From: herlo at fedoraproject.org (Clint Savage)
Date: Wed, 28 Jan 2009 05:46:07 +0000 (UTC)
Subject: comps comps-f10.xml.in, 1.209, 1.210 comps-f11.xml.in, 1.84,
	1.85 comps-f9.xml.in, 1.434, 1.435
Message-ID: <20090128054607.575DB7010D@cvs1.fedora.phx.redhat.com>

Author: herlo

Update of /cvs/pkgs/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25673

Modified Files:
	comps-f10.xml.in comps-f11.xml.in comps-f9.xml.in 
Log Message:
added chisholm-to-be-continued-fonts as optional to fonts group


Index: comps-f10.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f10.xml.in,v
retrieving revision 1.209
retrieving revision 1.210
diff -u -r1.209 -r1.210
--- comps-f10.xml.in	21 Jan 2009 02:26:07 -0000	1.209
+++ comps-f10.xml.in	28 Jan 2009 05:45:36 -0000	1.210
@@ -1434,6 +1434,7 @@
       <packagereq type="optional">bitstream-vera-fonts</packagereq>
       <packagereq type="optional">brettfont-fonts</packagereq>
       <packagereq type="optional">charis-fonts</packagereq>
+      <packagereq type="optional">chisholm-to-be-continued-fonts</packagereq>
       <packagereq type="optional">cjkunifonts-ukai</packagereq>
       <packagereq type="optional">darkgarden-fonts</packagereq>
       <packagereq type="optional">dejavu-lgc-fonts</packagereq>


Index: comps-f11.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f11.xml.in,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -r1.84 -r1.85
--- comps-f11.xml.in	27 Jan 2009 10:50:00 -0000	1.84
+++ comps-f11.xml.in	28 Jan 2009 05:45:36 -0000	1.85
@@ -1511,6 +1511,7 @@
       <packagereq type="optional">bitstream-vera-sans-mono-fonts</packagereq>
       <packagereq type="optional">bitstream-vera-serif-fonts</packagereq>
       <packagereq type="optional">brettfont-fonts</packagereq>
+      <packagereq type="optional">chisholm-to-be-continued-fonts</packagereq>
       <packagereq type="optional">cjkuni-ukai-fonts</packagereq>
       <packagereq type="optional">ctan-cm-lgc-roman-fonts</packagereq>
       <packagereq type="optional">ctan-cm-lgc-sans-fonts</packagereq>


Index: comps-f9.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f9.xml.in,v
retrieving revision 1.434
retrieving revision 1.435
diff -u -r1.434 -r1.435
--- comps-f9.xml.in	21 Jan 2009 02:26:07 -0000	1.434
+++ comps-f9.xml.in	28 Jan 2009 05:45:36 -0000	1.435
@@ -1375,6 +1375,7 @@
       <packagereq type="optional">bitstream-vera-fonts</packagereq>
       <packagereq type="optional">brettfont-fonts</packagereq>
       <packagereq type="optional">charis-fonts</packagereq>
+      <packagereq type="optional">chisholm-to-be-continued-fonts</packagereq>
       <packagereq type="optional">cjkunifonts-ukai</packagereq>
       <packagereq type="optional">dejavu-lgc-fonts</packagereq>
       <packagereq type="optional">doulos-fonts</packagereq>



From pkgdb at fedoraproject.org  Wed Jan 28 05:45:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Jan 2009 05:45:58 +0000
Subject: [pkgdb] perl-Data-Dump-Streamer (Fedora EPEL, 5) updated by kevin
Message-ID: <20090128054558.B202D208486@bastion.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for perl-Data-Dump-Streamer
kevin has set commit to Approved for provenpackager on perl-Data-Dump-Streamer (Fedora EPEL 5)
kevin has set build to Approved for provenpackager on perl-Data-Dump-Streamer (Fedora EPEL 5)
kevin has set checkout to Approved for provenpackager on perl-Data-Dump-Streamer (Fedora EPEL 5)
kevin changed owner of perl-Data-Dump-Streamer in Fedora EPEL 5 to iarnell
kevin approved watchbugzilla on perl-Data-Dump-Streamer (Fedora EPEL 5) for perl-sig
kevin approved watchcommits on perl-Data-Dump-Streamer (Fedora EPEL 5) for perl-sig
kevin approved watchbugzilla on perl-Data-Dump-Streamer (Fedora EPEL 5) for iburrell
kevin approved watchcommits on perl-Data-Dump-Streamer (Fedora EPEL 5) for iburrell
kevin approved commit on perl-Data-Dump-Streamer (Fedora EPEL 5) for iburrell
kevin approved build on perl-Data-Dump-Streamer (Fedora EPEL 5) for iburrell
kevin approved approveacls on perl-Data-Dump-Streamer (Fedora EPEL 5) for iburrell

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Data-Dump-Streamer



From pkgdb at fedoraproject.org  Wed Jan 28 05:48:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Jan 2009 05:48:42 +0000
Subject: [pkgdb] perl-Sub-Override (Fedora EPEL, 5) updated by kevin
Message-ID: <20090128054842.96508208493@bastion.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for perl-Sub-Override
kevin has set commit to Approved for provenpackager on perl-Sub-Override (Fedora EPEL 5)
kevin has set build to Approved for provenpackager on perl-Sub-Override (Fedora EPEL 5)
kevin has set checkout to Approved for provenpackager on perl-Sub-Override (Fedora EPEL 5)
kevin changed owner of perl-Sub-Override in Fedora EPEL 5 to iarnell
kevin approved watchbugzilla on perl-Sub-Override (Fedora EPEL 5) for perl-sig
kevin approved watchcommits on perl-Sub-Override (Fedora EPEL 5) for perl-sig
kevin approved watchbugzilla on perl-Sub-Override (Fedora EPEL 5) for iburrell
kevin approved watchcommits on perl-Sub-Override (Fedora EPEL 5) for iburrell
kevin approved commit on perl-Sub-Override (Fedora EPEL 5) for iburrell
kevin approved build on perl-Sub-Override (Fedora EPEL 5) for iburrell
kevin approved approveacls on perl-Sub-Override (Fedora EPEL 5) for iburrell

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Sub-Override



From pkgdb at fedoraproject.org  Wed Jan 28 05:49:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Jan 2009 05:49:49 +0000
Subject: [pkgdb] perl-HTML-TokeParser-Simple (Fedora EPEL,
	5) updated by kevin
Message-ID: <20090128054949.43079208486@bastion.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for perl-HTML-TokeParser-Simple
kevin has set commit to Approved for provenpackager on perl-HTML-TokeParser-Simple (Fedora EPEL 5)
kevin has set build to Approved for provenpackager on perl-HTML-TokeParser-Simple (Fedora EPEL 5)
kevin has set checkout to Approved for provenpackager on perl-HTML-TokeParser-Simple (Fedora EPEL 5)
kevin changed owner of perl-HTML-TokeParser-Simple in Fedora EPEL 5 to iarnell
kevin approved watchbugzilla on perl-HTML-TokeParser-Simple (Fedora EPEL 5) for perl-sig
kevin approved watchcommits on perl-HTML-TokeParser-Simple (Fedora EPEL 5) for perl-sig
kevin approved watchbugzilla on perl-HTML-TokeParser-Simple (Fedora EPEL 5) for iburrell
kevin approved watchcommits on perl-HTML-TokeParser-Simple (Fedora EPEL 5) for iburrell
kevin approved commit on perl-HTML-TokeParser-Simple (Fedora EPEL 5) for iburrell
kevin approved build on perl-HTML-TokeParser-Simple (Fedora EPEL 5) for iburrell
kevin approved approveacls on perl-HTML-TokeParser-Simple (Fedora EPEL 5) for iburrell

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-HTML-TokeParser-Simple



From pkgdb at fedoraproject.org  Wed Jan 28 05:50:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Jan 2009 05:50:33 +0000
Subject: [pkgdb] tbcload (Fedora EPEL, 4) updated by kevin
Message-ID: <20090128055033.5664C208493@bastion.fedora.phx.redhat.com>

kevin added a Fedora EPEL 4 branch for tbcload
kevin has set commit to Approved for provenpackager on tbcload (Fedora EPEL 4)
kevin has set build to Approved for provenpackager on tbcload (Fedora EPEL 4)
kevin has set checkout to Approved for provenpackager on tbcload (Fedora EPEL 4)
kevin changed owner of tbcload in Fedora EPEL 4 to wart

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/tbcload



From pkgdb at fedoraproject.org  Wed Jan 28 05:50:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Jan 2009 05:50:33 +0000
Subject: [pkgdb] tbcload (Fedora EPEL, 5) updated by kevin
Message-ID: <20090128055033.6AFFF208496@bastion.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for tbcload
kevin has set commit to Approved for provenpackager on tbcload (Fedora EPEL 5)
kevin has set build to Approved for provenpackager on tbcload (Fedora EPEL 5)
kevin has set checkout to Approved for provenpackager on tbcload (Fedora EPEL 5)
kevin changed owner of tbcload in Fedora EPEL 5 to wart

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/tbcload



From pkgdb at fedoraproject.org  Wed Jan 28 05:51:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Jan 2009 05:51:10 +0000
Subject: [pkgdb] tclcompiler (Fedora EPEL, 4) updated by kevin
Message-ID: <20090128055110.9800C208486@bastion.fedora.phx.redhat.com>

kevin added a Fedora EPEL 4 branch for tclcompiler
kevin has set commit to Approved for provenpackager on tclcompiler (Fedora EPEL 4)
kevin has set build to Approved for provenpackager on tclcompiler (Fedora EPEL 4)
kevin has set checkout to Approved for provenpackager on tclcompiler (Fedora EPEL 4)
kevin changed owner of tclcompiler in Fedora EPEL 4 to wart

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/tclcompiler



From pkgdb at fedoraproject.org  Wed Jan 28 05:51:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Jan 2009 05:51:10 +0000
Subject: [pkgdb] tclcompiler (Fedora EPEL, 5) updated by kevin
Message-ID: <20090128055110.AB163208496@bastion.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for tclcompiler
kevin has set commit to Approved for provenpackager on tclcompiler (Fedora EPEL 5)
kevin has set build to Approved for provenpackager on tclcompiler (Fedora EPEL 5)
kevin has set checkout to Approved for provenpackager on tclcompiler (Fedora EPEL 5)
kevin changed owner of tclcompiler in Fedora EPEL 5 to wart

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/tclcompiler



From pkgdb at fedoraproject.org  Wed Jan 28 05:56:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Jan 2009 05:56:53 +0000
Subject: [pkgdb] tclparser (Fedora EPEL, 4) updated by kevin
Message-ID: <20090128055653.95528208486@bastion.fedora.phx.redhat.com>

kevin added a Fedora EPEL 4 branch for tclparser
kevin has set commit to Approved for provenpackager on tclparser (Fedora EPEL 4)
kevin has set build to Approved for provenpackager on tclparser (Fedora EPEL 4)
kevin has set checkout to Approved for provenpackager on tclparser (Fedora EPEL 4)
kevin changed owner of tclparser in Fedora EPEL 4 to wart

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/tclparser



From pkgdb at fedoraproject.org  Wed Jan 28 05:56:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Jan 2009 05:56:53 +0000
Subject: [pkgdb] tclparser (Fedora EPEL, 5) updated by kevin
Message-ID: <20090128055653.AAC2D208495@bastion.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for tclparser
kevin has set commit to Approved for provenpackager on tclparser (Fedora EPEL 5)
kevin has set build to Approved for provenpackager on tclparser (Fedora EPEL 5)
kevin has set checkout to Approved for provenpackager on tclparser (Fedora EPEL 5)
kevin changed owner of tclparser in Fedora EPEL 5 to wart

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/tclparser



From pkgdb at fedoraproject.org  Wed Jan 28 05:57:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Jan 2009 05:57:53 +0000
Subject: [pkgdb] tclchecker (Fedora EPEL, 4) updated by kevin
Message-ID: <20090128055753.82B12208493@bastion.fedora.phx.redhat.com>

kevin added a Fedora EPEL 4 branch for tclchecker
kevin has set commit to Approved for provenpackager on tclchecker (Fedora EPEL 4)
kevin has set build to Approved for provenpackager on tclchecker (Fedora EPEL 4)
kevin has set checkout to Approved for provenpackager on tclchecker (Fedora EPEL 4)
kevin changed owner of tclchecker in Fedora EPEL 4 to wart

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/tclchecker



From pkgdb at fedoraproject.org  Wed Jan 28 05:57:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Jan 2009 05:57:53 +0000
Subject: [pkgdb] tclchecker (Fedora EPEL, 5) updated by kevin
Message-ID: <20090128055753.8FB33208496@bastion.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for tclchecker
kevin has set commit to Approved for provenpackager on tclchecker (Fedora EPEL 5)
kevin has set build to Approved for provenpackager on tclchecker (Fedora EPEL 5)
kevin has set checkout to Approved for provenpackager on tclchecker (Fedora EPEL 5)
kevin changed owner of tclchecker in Fedora EPEL 5 to wart

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/tclchecker



From pkgdb at fedoraproject.org  Wed Jan 28 05:58:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Jan 2009 05:58:34 +0000
Subject: [pkgdb] tcldebugger (Fedora EPEL, 4) updated by kevin
Message-ID: <20090128055834.C1E3A208493@bastion.fedora.phx.redhat.com>

kevin added a Fedora EPEL 4 branch for tcldebugger
kevin has set commit to Approved for provenpackager on tcldebugger (Fedora EPEL 4)
kevin has set build to Approved for provenpackager on tcldebugger (Fedora EPEL 4)
kevin has set checkout to Approved for provenpackager on tcldebugger (Fedora EPEL 4)
kevin changed owner of tcldebugger in Fedora EPEL 4 to wart

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/tcldebugger



From pkgdb at fedoraproject.org  Wed Jan 28 05:58:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Jan 2009 05:58:34 +0000
Subject: [pkgdb] tcldebugger (Fedora EPEL, 5) updated by kevin
Message-ID: <20090128055834.CE28F208496@bastion.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for tcldebugger
kevin has set commit to Approved for provenpackager on tcldebugger (Fedora EPEL 5)
kevin has set build to Approved for provenpackager on tcldebugger (Fedora EPEL 5)
kevin has set checkout to Approved for provenpackager on tcldebugger (Fedora EPEL 5)
kevin changed owner of tcldebugger in Fedora EPEL 5 to wart

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/tcldebugger



From pkgdb at fedoraproject.org  Wed Jan 28 05:59:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Jan 2009 05:59:04 +0000
Subject: [pkgdb] tclpro (Fedora EPEL, 4) updated by kevin
Message-ID: <20090128055904.B8390208485@bastion.fedora.phx.redhat.com>

kevin added a Fedora EPEL 4 branch for tclpro
kevin has set commit to Approved for provenpackager on tclpro (Fedora EPEL 4)
kevin has set build to Approved for provenpackager on tclpro (Fedora EPEL 4)
kevin has set checkout to Approved for provenpackager on tclpro (Fedora EPEL 4)
kevin changed owner of tclpro in Fedora EPEL 4 to wart

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/tclpro



From pkgdb at fedoraproject.org  Wed Jan 28 05:59:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Jan 2009 05:59:04 +0000
Subject: [pkgdb] tclpro (Fedora EPEL, 5) updated by kevin
Message-ID: <20090128055904.CD8A5208494@bastion.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for tclpro
kevin has set commit to Approved for provenpackager on tclpro (Fedora EPEL 5)
kevin has set build to Approved for provenpackager on tclpro (Fedora EPEL 5)
kevin has set checkout to Approved for provenpackager on tclpro (Fedora EPEL 5)
kevin changed owner of tclpro in Fedora EPEL 5 to wart

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/tclpro



From pkgdb at fedoraproject.org  Wed Jan 28 06:00:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Jan 2009 06:00:00 +0000
Subject: [pkgdb] perl-B-Utils (Fedora EPEL, 5) updated by kevin
Message-ID: <20090128060000.71B58208485@bastion.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for perl-B-Utils
kevin has set commit to Approved for provenpackager on perl-B-Utils (Fedora EPEL 5)
kevin has set build to Approved for provenpackager on perl-B-Utils (Fedora EPEL 5)
kevin has set checkout to Approved for provenpackager on perl-B-Utils (Fedora EPEL 5)
kevin changed owner of perl-B-Utils in Fedora EPEL 5 to iarnell
kevin approved watchbugzilla on perl-B-Utils (Fedora EPEL 5) for perl-sig
kevin approved watchcommits on perl-B-Utils (Fedora EPEL 5) for perl-sig
kevin approved watchbugzilla on perl-B-Utils (Fedora EPEL 5) for iburrell
kevin approved watchcommits on perl-B-Utils (Fedora EPEL 5) for iburrell
kevin approved commit on perl-B-Utils (Fedora EPEL 5) for iburrell
kevin approved build on perl-B-Utils (Fedora EPEL 5) for iburrell
kevin approved approveacls on perl-B-Utils (Fedora EPEL 5) for iburrell

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-B-Utils



From pkgdb at fedoraproject.org  Wed Jan 28 06:08:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Jan 2009 06:08:42 +0000
Subject: [pkgdb] libtranslate: dwayne has requested watchbugzilla
Message-ID: <20090128060842.D1DC0208484@bastion.fedora.phx.redhat.com>

dwayne has requested the watchbugzilla acl on libtranslate (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libtranslate



From pkgdb at fedoraproject.org  Wed Jan 28 06:08:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Jan 2009 06:08:48 +0000
Subject: [pkgdb] libtranslate: dwayne has requested watchcommits
Message-ID: <20090128060848.75238208493@bastion.fedora.phx.redhat.com>

dwayne has requested the watchcommits acl on libtranslate (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libtranslate



From pkgdb at fedoraproject.org  Wed Jan 28 06:09:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Jan 2009 06:09:00 +0000
Subject: [pkgdb] libtranslate: dwayne has requested watchcommits
Message-ID: <20090128060900.58179208496@bastion.fedora.phx.redhat.com>

dwayne has requested the watchcommits acl on libtranslate (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libtranslate



From pkgdb at fedoraproject.org  Wed Jan 28 06:09:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Jan 2009 06:09:00 +0000
Subject: [pkgdb] libtranslate: dwayne has requested watchbugzilla
Message-ID: <20090128060900.B38932084B7@bastion.fedora.phx.redhat.com>

dwayne has requested the watchbugzilla acl on libtranslate (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libtranslate



From itamarjp at fedoraproject.org  Wed Jan 28 06:09:19 2009
From: itamarjp at fedoraproject.org (Itamar Reis Peixoto)
Date: Wed, 28 Jan 2009 06:09:19 +0000 (UTC)
Subject: rpms/ss5/F-10 import.log, NONE, 1.1 ss5_init.patch, NONE,
	1.1 ss5.spec, 1.8, 1.9
Message-ID: <20090128060919.255EC7010D@cvs1.fedora.phx.redhat.com>

Author: itamarjp

Update of /cvs/pkgs/rpms/ss5/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30385/F-10

Modified Files:
	ss5.spec 
Added Files:
	import.log ss5_init.patch 
Log Message:
fix for BZ #478702



--- NEW FILE import.log ---
ss5-3_6_4-2_fc11:F-10:ss5-3.6.4-2.fc11.src.rpm:1233122875

ss5_init.patch:

--- NEW FILE ss5_init.patch ---
diff -ruNp ss5-3.6.4.old/conf/ss5.init ss5-3.6.4.new/conf/ss5.init
--- ss5-3.6.4.old/conf/ss5.init	2007-04-17 11:40:43.000000000 -0300
+++ ss5-3.6.4.new/conf/ss5.init	2009-01-28 01:08:43.000000000 -0200
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# chkconfig: 345 20 80
+# chkconfig: - 20 80
 # description: This script takes care of starting \
 #              and stopping ss5
 #
@@ -31,7 +31,7 @@ case "$1" in
 	if [ $OS = "Linux" ]; then
             daemon /usr/sbin/ss5 -t $SS5_OPTS
             touch /var/lock/subsys/ss5
-	if [ $OS = "SunOS" ]; then
+	elif [ $OS = "SunOS" ]; then
             /usr/sbin/ss5 -t 
             touch /var/lock/subsys/ss5
 	else


Index: ss5.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ss5/F-10/ss5.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ss5.spec	5 Sep 2008 20:17:59 -0000	1.8
+++ ss5.spec	28 Jan 2009 06:08:48 -0000	1.9
@@ -1,7 +1,7 @@
 Summary: Socks Server 5 
 Name: ss5
 Version: 3.6.4
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Group: Applications/Internet
 URL: http://sourceforge.net/projects/ss5
@@ -11,12 +11,15 @@
 Requires(post): chkconfig
 Requires(preun): chkconfig, initscripts
 
+Patch0: ss5_init.patch
+
 %description
 ss5 is a socks server, which supports both SOCKS4 and SOCKS5 protocols,
 that runs on Linux/Solaris platforms. 
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %configure --with-libpath=%{_libdir} 
@@ -42,12 +45,11 @@
 fi
 
 %files
-%defattr(755,root,root,-)
+%defattr(-,root,root,-)
 %{_sbindir}/ss5
 %{_initrddir}/ss5
 %{_libdir}/ss5/
 
-%defattr(644,root,root,-)
 %dir %{_docdir}/ss5
 %{_docdir}/ss5/License
 %{_docdir}/ss5/README.pam
@@ -65,17 +67,20 @@
 %{_mandir}/man5/ss5.pam.5.gz
 %{_mandir}/man5/ss5.ha.5.gz
 
-%defattr(755,root,root)
 %{_localstatedir}/log/ss5
 
 %dir %{_sysconfdir}/opt/ss5
-%defattr(0640,root,root)
 %config(noreplace) %{_sysconfdir}/opt/ss5/ss5.conf
 %config(noreplace) %{_sysconfdir}/opt/ss5/ss5.passwd
 %config(noreplace) %{_sysconfdir}/pam.d/ss5
 %doc ChangeLog
 
 %changelog
+* Wed Jan 28 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 3.6.4-2
+- fix init script BZ #478702
+- replace some tabs with spaces in changelog
+- fix wrong permissions in spec file
+
 * Fri Sep  5 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 3.6.4-1
 - fix license tag
 - update to 3.6.4
@@ -106,7 +111,7 @@
         * Fix DNS buffer as RFC
 
 *Fri May  05 2006 Matteo Ricchetti <matteo.ricchetti at libero.it>
-	* SS5-v3.5.8-2 released
+        * SS5-v3.5.8-2 released
         * Fix startup script
 
 *Wed Apr  26 2006 Matteo Ricchetti <matteo.ricchetti at libero.it>
@@ -114,13 +119,13 @@
         * Fix EAP (thx to Jakob Perz)
 
 *Mon Apr  24 2006 Matteo Ricchetti <matteo.ricchetti at libero.it>
-	* SS5-v3.5.7-1 released
-	* Fix replica feature
+        * SS5-v3.5.7-1 released
+        * Fix replica feature
         * Fix configure file
         * Fix man file for ss5.peers
 
 *Mon Apr  10 2006 Matteo Ricchetti <matteo.ricchetti at libero.it>
-	* SS5-v3.5.6-1 released
+        * SS5-v3.5.6-1 released
         * Fix startup script 
 
 *Thu Apr  06 2006 Matteo Ricchetti <matteo.ricchetti at libero.it>
@@ -136,11 +141,11 @@
         * Fix external authentication program 
 
 *Sun Mar  19 2006 Matteo Ricchetti <matteo.ricchetti at libero.it>
-	* SS5-v3.5.3-2 released
+        * SS5-v3.5.3-2 released
         * Fix package for Fedora naming guidelines
 
 *Thu Mar  09 2006 Matteo Ricchetti <matteo.ricchetti at libero.it>
-	* SS5-v3.5.3-1 released
+        * SS5-v3.5.3-1 released
         * Add security feature to centralized management
 
 *Thu Mar  09 2006 Matteo Ricchetti <matteo.ricchetti at libero.it>
@@ -180,14 +185,14 @@
         * New configure file (thx to Walter Franzini)
 
 *Tue Feb  07 2006 Matteo Ricchetti <matteo.ricchetti at libero.it>
-	* SS5-v3.3r5 released
+        * SS5-v3.3r5 released
         * Fix Solaris 10 compatibility with ctime_r() call
         * Fix netbios default domain
 
 *Mon Feb  06 2006 Matteo Ricchetti <matteo.ricchetti at libero.it>
         * SS5-v3.3r4 released
         * Add default netbios domain
-	* Fix externalprogram
+        * Fix externalprogram
 
 *Sat Feb  04 2006 Matteo Ricchetti <matteo.ricchetti at libero.it>
         * SS5-v3.3r3 released
@@ -201,7 +206,7 @@
 
 *Mon Jan  20 2006 Matteo Ricchetti <matteo.ricchetti at libero.it>
         * SS5-v3.3r1 released
-	* Add multiple directory store support
+        * Add multiple directory store support
         * Add netbios compatibility in authorization module
         * Add noproxy rule in mod_socks5
 
@@ -215,7 +220,7 @@
         * Fix module authentication (pam)
 
 *Mon Dec  16 2005 Matteo Ricchetti <matteo.ricchetti at libero.it>
-	* SS5-v3.2r5 released
+        * SS5-v3.2r5 released
         * Fix makefile for gcc old version
 
 *Mon Dec  04 2005 Matteo Ricchetti <matteo.ricchetti at libero.it>
@@ -257,7 +262,7 @@
         * Fix recv call
 
 *Mon Aug  22 2005 Matteo Ricchetti <matteo.ricchetti at libero.it>
-	* SS5-v3.0r9 released
+        * SS5-v3.0r9 released
         * Fix SS5_AUTHCACHEAGE option
 
 *Thu Aug  18 2005 Matteo Ricchetti <matteo.ricchetti at libero.it>
@@ -274,15 +279,15 @@
 
 *Thu May  10 2005 Matteo Ricchetti <matteo.ricchetti at libero.it>
         * SS5-v3.0r5 released
-	* Fix connect response using dns
+        * Fix connect response using dns
         * Increase authentication buffer
-	* Fix profiling bug
+        * Fix profiling bug
         * Modify package structure
 
 *Thu Apr  10 2005 Matteo Ricchetti <matteo.ricchetti at libero.it>
         * SS5-v3.0r4 released
         * Added comment into group file
-	
+
 *Thu Mar  10 2005 Matteo Ricchetti <matteo.ricchetti at libero.it>
         * SS5-v3.0r3 released
         * Pam module fix
@@ -323,7 +328,7 @@
 *Thu Dec  30 2003 Matteo Ricchetti <matteo.ricchetti at libero.it>
         * SS5-v2.4r5 released
         * Fix Solaris documentation
-	* Fix admin access check
+        * Fix admin access check
         * Add statistics information
 
 *Thu Dec  24 2003 Matteo Ricchetti <matteo.ricchetti at libero.it>
@@ -337,10 +342,10 @@
 *Thu Nov  15 2003 Matteo Ricchetti <matteo.ricchetti at libero.it>
         * SS5-v2.4r2 released
         * Fix some potential buffer overflow 
-	* Fix udp bind problem
+        * Fix udp bind problem
 
 *Thu Oct  29 2003 Matteo Ricchetti <matteo.ricchetti at libero.it>
-	* SS5-v2.4r1 released
+        * SS5-v2.4r1 released
         * Add session affinity in balanced connections
         * Add socks statistics about connections
         * Add fake authentication
@@ -369,8 +374,8 @@
         * SS5-v2.3r1 released
         * Add source-if feature for connect operation
         * Add better control in ldap base configuration
-	* Add better detail on log messages
-	* Threads creation improvement
+        * Add better detail on log messages
+        * Threads creation improvement
         * Fix automatic configuration reload (every 30 seconds)
 
 *Thu Aug  14  2003 Matteo Ricchetti <matteo.ricchetti at libero.it>
@@ -378,7 +383,7 @@
         * Add ldap profile feature
         * Add PAM authentication
         * Add username for ss5 execution
-	* Add server balancing feature !!!
+        * Add server balancing feature !!!
         * Add ssl fixup
         * Add pop3 fixup
         * Add imap fixup



From petersen at fedoraproject.org  Wed Jan 28 06:21:35 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Wed, 28 Jan 2009 06:21:35 +0000 (UTC)
Subject: rpms/scim/devel scim-1.4.7-syslibltdl.patch, NONE, 1.1 scim.spec,
	1.138, 1.139
Message-ID: <20090128062135.2B3727010D@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/scim/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv942

Modified Files:
	scim.spec 
Added Files:
	scim-1.4.7-syslibltdl.patch 
Log Message:
add scim-1.4.7-syslibltdl.patch from Gentoo to build with libtool2

scim-1.4.7-syslibltdl.patch:

--- NEW FILE scim-1.4.7-syslibltdl.patch ---
Index: scim-1.4.7/src/Makefile.am
===================================================================
--- scim-1.4.7.orig/src/Makefile.am
+++ scim-1.4.7/src/Makefile.am
@@ -33,7 +33,7 @@ INCLUDES		= -I$(top_builddir) \
 			  -DSCIM_MODULE_PATH=\"@SCIM_MODULE_PATH@\"
 
 
-noinst_HEADERS		= ltdl.h \
+noinst_HEADERS		= \
 			  scim_private.h \
 			  scim_compose_key_data.h \
 			  scim_keyboard_layout_data.h \
@@ -84,11 +84,6 @@ libsciminclude_HEADERS 	= scim.h \
 			  scim_utility.h
 
 
-noinst_LTLIBRARIES	= libltdlc.la
-
-libltdlc_la_SOURCES	= ltdl.cpp
-libltdlc_la_LIBADD	= $(LIBADD_DL)
-
 if SCIM_LD_VERSION_SCRIPT
 LD_VERSION_SCRIPT_OPTION="-Wl,--version-script=$(srcdir)/libscim.version-script"
 endif
@@ -137,7 +132,7 @@ libscim at SCIM_EPOCH@_la_LDFLAGS= -version
 			  @LTLIBINTL@ \
 			  -lstdc++
 
-libscim at SCIM_EPOCH@_la_LIBADD	= libltdlc.la
+libscim at SCIM_EPOCH@_la_LIBADD	= -lltdl
 
 
 bin_PROGRAMS		= scim scim-config-agent
Index: scim-1.4.7/src/scim_module.cpp
===================================================================
--- scim-1.4.7.orig/src/scim_module.cpp
+++ scim-1.4.7/src/scim_module.cpp
@@ -27,7 +27,9 @@
 #define Uses_STL_ALGORITHM
 #include "scim_private.h"
 #include "scim.h"
-#include "ltdl.h"
+extern "C" {
+  #include <ltdl.h>
+}
 #include <dirent.h>
 #include <sys/types.h>
 #include <sys/stat.h>
Index: scim-1.4.7/configure.ac
===================================================================
--- scim-1.4.7.orig/configure.ac
+++ scim-1.4.7/configure.ac
@@ -71,7 +71,6 @@ AM_GNU_GETTEXT
 # Init libtool
 AC_LIBTOOL_DLOPEN
 AC_PROG_LIBTOOL
-AC_LIB_LTDL
 AC_SUBST(LIBTOOL_DEPS)
 
 # libtool option to control which symbols are exported


Index: scim.spec
===================================================================
RCS file: /cvs/extras/rpms/scim/devel/scim.spec,v
retrieving revision 1.138
retrieving revision 1.139
diff -u -r1.138 -r1.139
--- scim.spec	27 Jan 2009 09:07:19 -0000	1.138
+++ scim.spec	28 Jan 2009 06:21:04 -0000	1.139
@@ -48,6 +48,7 @@
 Patch28:   scim-1.4.7-xim-wrong-format.patch
 Patch29:   scim-1.4.7-bz462820.patch
 Patch30:   scim-1.4.7-imdkit-read-property-properly.patch
+Patch31:   scim-1.4.7-syslibltdl.patch
 
 %description
 SCIM is a user friendly and full featured input method user interface and
@@ -181,6 +182,7 @@
 %patch28 -p1 -b .28-xim-wrong-format
 %patch29 -p1 -b .29-bz462820
 %patch30 -p1 -b .30-bz466657
+%patch31 -p1 -b .31-sysltdl
 
 # patch17, patch24 touch configure.ac and Makefile.am
 ./bootstrap
@@ -317,6 +319,7 @@
 - drop scim-1.4.7_translation-update.tar.bz2 and just add ta.po
 - update scim-1.4.7-translation-update-431995.patch
 - scim-fix-unload-segfault.patch no longer needed
+- add scim-1.4.7-syslibltdl.patch from Gentoo to build with libtool2
 
 * Tue Dec  2 2008 Jens Petersen <petersen at redhat.com> - 1.4.7-37
 - make libs subpackage own its dirs for multilib (#473664)



From oget at fedoraproject.org  Wed Jan 28 06:32:23 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Wed, 28 Jan 2009 06:32:23 +0000 (UTC)
Subject: rpms/portmidi/devel import.log, NONE, 1.1 portmidi-shared.patch,
	NONE, 
	1.1 portmidi.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090128063223.441457010D@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/portmidi/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2696/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log portmidi-shared.patch portmidi.spec 
Log Message:
* Tue Jan 27 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 131-2
- Build and add doxygen documentation
- Preserve some timestamps

* Sun Jan 11 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 131-1
- New upstream release.

* Sun Dec 07 2008 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 82-1
- Initial release.




--- NEW FILE import.log ---
portmidi-131-2_fc10:HEAD:portmidi-131-2.fc10.src.rpm:1233124282

portmidi-shared.patch:

--- NEW FILE portmidi-shared.patch ---
diff -rupN portmidi.old/pm_common/portmidi.c portmidi/pm_common/portmidi.c
--- portmidi.old/pm_common/portmidi.c	2009-01-02 18:06:13.000000000 -0500
+++ portmidi/pm_common/portmidi.c	2009-01-11 01:20:21.000000000 -0500
@@ -56,7 +56,7 @@ static void prompt_and_exit(void)
     printf("type ENTER...");
     fgets(line, STRING_MAX, stdin);
     /* this will clean up open ports: */
-    exit(-1);
+    // DO NOT EXIT SINCE THIS IS BEING COMPILED AS A SHARED LIBRARY // exit(-1);
 }
 
 
diff -rupN portmidi.old/pm_linux/Makefile portmidi/pm_linux/Makefile
--- portmidi.old/pm_linux/Makefile	2008-06-13 20:23:43.000000000 -0400
+++ portmidi/pm_linux/Makefile	2009-01-11 01:24:28.000000000 -0500
@@ -30,11 +30,13 @@ VFLAGS = -DPMALSA
 # ALSALIB = 
 # VFLAGS = -DPMNULL
 
-pmlib = pm_linux/libportmidi.a
+pmlib = pm_linux/libportmidi.so.0$(VERSION)
 
-ptlib = porttime/libporttime.a
+ptlib = porttime/libporttime.so.0$(VERSION)
 
-CC = gcc $(VFLAGS) $(PMFLAGS) -g -Ipm_common -Iporttime
+CC = gcc $(CFLAGS) $(VFLAGS) $(PMFLAGS) -g -Ipm_common -Iporttime
+
+INSTALL = install
 
 pmobjects = pm_common/pmutil.o $(versions) pm_linux/pmlinux.o  \
 	pm_common/portmidi.o
@@ -43,14 +45,18 @@ ptobjects = porttime/porttime.o porttime
 
 current: all
 
-all: $(pmlib) $(ptlib) pm_test/test pm_test/sysex pm_test/midithread \
+all: $(ptlib) $(pmlib) pm_test/test pm_test/sysex pm_test/midithread \
 	pm_test/latency pm_test/midithru pm_test/qtest pm_test/mm
 
 $(pmlib): pm_linux/Makefile $(pmobjects)
-	ar -cr $(pmlib) $(pmobjects)
+	$(CC) -shared $(ALSALIB) $(pmobjects) -Wl,-soname -Wl,libportmidi.so.0 -Lporttime -lporttime -o $(pmlib)
+	ln -sf libportmidi.so.0$(VERSION) pm_linux/libportmidi.so
+	ln -sf libportmidi.so.0$(VERSION) pm_linux/libportmidi.so.0
 
 $(ptlib): pm_linux/Makefile $(ptobjects)
-	ar -cr $(ptlib) $(ptobjects)
+	$(CC) -shared $(ptobjects) -Wl,-soname -Wl,libporttime.so.0 -Wl,-l,pthread -o $(ptlib)
+	ln -sf libporttime.so.0$(VERSION) porttime/libporttime.so
+	ln -sf libporttime.so.0$(VERSION) porttime/libporttime.so.0
 
 pm_linux/pmlinuxalsa.o: pm_linux/Makefile pm_linux/pmlinuxalsa.c pm_linux/pmlinuxalsa.h
 	$(CC) -c pm_linux/pmlinuxalsa.c -o pm_linux/pmlinuxalsa.o
@@ -96,3 +102,15 @@ cleanest: cleaner
 
 backup: cleanest
 	cd ..; zip -r portmidi.zip portmidi
+
+install:
+	$(INSTALL) -d $(DESTDIR)/$(INCLUDEDIR)/
+	$(INSTALL) -m 644 pm_common/portmidi.h $(DESTDIR)/$(INCLUDEDIR)/
+	$(INSTALL) -m 644 porttime/porttime.h $(DESTDIR)/$(INCLUDEDIR)/
+	$(INSTALL) -d $(DESTDIR)/$(LIBDIR)/
+	$(INSTALL) pm_linux/libportmidi.so.0.* $(DESTDIR)/$(LIBDIR)/
+	$(INSTALL) porttime/libporttime.so.0.* $(DESTDIR)/$(LIBDIR)/
+	cp -a porttime/libporttime.so $(DESTDIR)/$(LIBDIR)/
+	cp -a porttime/libporttime.so.0 $(DESTDIR)/$(LIBDIR)/
+	cp -a pm_linux/libportmidi.so $(DESTDIR)/$(LIBDIR)/
+	cp -a pm_linux/libportmidi.so.0 $(DESTDIR)/$(LIBDIR)/
diff -rupN portmidi.old/pm_linux/pmlinuxalsa.c portmidi/pm_linux/pmlinuxalsa.c
--- portmidi.old/pm_linux/pmlinuxalsa.c	2008-06-13 20:23:43.000000000 -0400
+++ portmidi/pm_linux/pmlinuxalsa.c	2009-01-11 01:26:06.000000000 -0500
@@ -243,8 +243,8 @@ static PmError alsa_out_close(PmInternal
     alsa_descriptor_type desc = (alsa_descriptor_type) midi->descriptor;
     if (!desc) return pmBadPtr;
 
-    if (pm_hosterror = snd_seq_disconnect_to(seq, desc->this_port, 
-                                             desc->client, desc->port)) {
+    if ((pm_hosterror = snd_seq_disconnect_to(seq, desc->this_port, 
+					      desc->client, desc->port))) {
         // if there's an error, try to delete the port anyway, but don't
         // change the pm_hosterror value so we retain the first error
         snd_seq_delete_port(seq, desc->this_port);
@@ -333,8 +333,8 @@ static PmError alsa_in_close(PmInternal 
 {
     alsa_descriptor_type desc = (alsa_descriptor_type) midi->descriptor;
     if (!desc) return pmBadPtr;
-    if (pm_hosterror = snd_seq_disconnect_from(seq, desc->this_port, 
-                                               desc->client, desc->port)) {
+    if ((pm_hosterror = snd_seq_disconnect_from(seq, desc->this_port, 
+						desc->client, desc->port))) {
         snd_seq_delete_port(seq, desc->this_port); /* try to close port */
     } else {
         pm_hosterror = snd_seq_delete_port(seq, desc->this_port);
diff -rupN portmidi.old/pm_linux/pmlinux.c portmidi/pm_linux/pmlinux.c
--- portmidi.old/pm_linux/pmlinux.c	2006-11-29 18:37:09.000000000 -0500
+++ portmidi/pm_linux/pmlinux.c	2009-01-11 01:26:48.000000000 -0500
@@ -28,10 +28,10 @@ PmError pm_init()
      * devices.
      */
     #ifdef PMALSA
-	pm_linuxalsa_init();
+	return pm_linuxalsa_init();
     #endif
     #ifdef PMNULL
-        pm_linuxnull_init();
+        return pm_linuxnull_init();
     #endif
     return pmNoError;
 }


--- NEW FILE portmidi.spec ---
Summary:        Real-time Midi I/O Library
Name:           portmidi
Version:        131
Release:        2%{?dist}
License:        MIT
Group:          System Environment/Libraries
URL:            http://portmedia.sourceforge.net/
Source0:        http://downloads.sourceforge.net/portmedia/%{name}-src-%{version}.zip
# For building shared libraries:
Patch0:         portmidi-shared.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  alsa-lib-devel doxygen tex(latex)

%description
PortMedia is a set of simple clean APIs and cross-platform library
implementations for music and other media. PortMidi subproject provides a
real-time MIDI input/output library. This package contains the PortMidi
libraries and some test applications.

%package devel
Summary:        Headers for developing programs that will use %{name}
Group:          System Environment/Libraries
Requires:       %{name} = %{version}-%{release}

%description devel
PortMedia is a set of simple clean APIs and cross-platform library
implementations for music and other media. PortMidi subproject provides a
real-time MIDI input/output library. This package contains the header files
and the documentation of PortMidi libraries.


%prep
%setup -q -n %{name}
%patch0 -p1

# Fix permissions and encoding issues:
find . -name "*.c" -exec chmod -x {} \;
find . -name "*.h" -exec chmod -x {} \;
for i in *.txt */*.txt ; do
   sed 's|\r||' $i > $i.tmp
   touch -r $i $i.tmp
   mv -f $i.tmp $i
done

# Preserve timestamps:
sed -i 's|\(INSTALL = install\)|\1 -p|' pm_linux/Makefile

%build
# Parallel make not supported
make -f pm_linux/Makefile \
     CFLAGS="%{optflags} -fPIC" \
     VERSION=".%{version}" 

# Build the doxygen documentation:
doxygen
pushd latex
   make %{?_smp_flags}
popd

%install
rm -rf %{buildroot}
# Install the libraries and headers:
make -f pm_linux/Makefile install \
     DESTDIR=%{buildroot} \
     LIBDIR=%{_libdir} \
     INCLUDEDIR=%{_includedir}

# Install the test applications:
install -d %{buildroot}%{_libdir}/%{name}
for app in latency midithread midithru mm qtest sysex test; do
   install -m 0755 pm_test/$app %{buildroot}%{_libdir}/%{name}
done

%clean
rm -rf %{buildroot}

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files
%defattr(-,root,root,-)
%doc CHANGELOG.txt license.txt
%{_libdir}/*.so.*
%{_libdir}/%{name}

%files devel
%defattr(-,root,root,-)
%doc CHANGELOG.txt license.txt README.txt pm_linux/README_LINUX.txt
%doc html latex/*.pdf
%{_includedir}/*
%{_libdir}/*.so

%changelog
* Tue Jan 27 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 131-2
- Build and add doxygen documentation
- Preserve some timestamps

* Sun Jan 11 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 131-1
- New upstream release.

* Sun Dec 07 2008 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 82-1
- Initial release.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/portmidi/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	28 Jan 2009 05:33:41 -0000	1.1
+++ .cvsignore	28 Jan 2009 06:31:52 -0000	1.2
@@ -0,0 +1 @@
+portmidi-src-131.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/portmidi/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	28 Jan 2009 05:33:41 -0000	1.1
+++ sources	28 Jan 2009 06:31:53 -0000	1.2
@@ -0,0 +1 @@
+1715bb3d9f63c6b259720709ef43b534  portmidi-src-131.zip



From oget at fedoraproject.org  Wed Jan 28 06:33:20 2009
From: oget at fedoraproject.org (Orcan Ogetbil)
Date: Wed, 28 Jan 2009 06:33:20 +0000 (UTC)
Subject: rpms/portmidi/F-10 import.log, NONE, 1.1 portmidi-shared.patch, NONE,
	1.1 portmidi.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090128063320.6DCF27010D@cvs1.fedora.phx.redhat.com>

Author: oget

Update of /cvs/pkgs/rpms/portmidi/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2984/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	import.log portmidi-shared.patch portmidi.spec 
Log Message:
* Tue Jan 27 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 131-2
- Build and add doxygen documentation
- Preserve some timestamps

* Sun Jan 11 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 131-1
- New upstream release.

* Sun Dec 07 2008 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 82-1
- Initial release.



--- NEW FILE import.log ---
portmidi-131-2_fc10:F-10:portmidi-131-2.fc10.src.rpm:1233124298

portmidi-shared.patch:

--- NEW FILE portmidi-shared.patch ---
diff -rupN portmidi.old/pm_common/portmidi.c portmidi/pm_common/portmidi.c
--- portmidi.old/pm_common/portmidi.c	2009-01-02 18:06:13.000000000 -0500
+++ portmidi/pm_common/portmidi.c	2009-01-11 01:20:21.000000000 -0500
@@ -56,7 +56,7 @@ static void prompt_and_exit(void)
     printf("type ENTER...");
     fgets(line, STRING_MAX, stdin);
     /* this will clean up open ports: */
-    exit(-1);
+    // DO NOT EXIT SINCE THIS IS BEING COMPILED AS A SHARED LIBRARY // exit(-1);
 }
 
 
diff -rupN portmidi.old/pm_linux/Makefile portmidi/pm_linux/Makefile
--- portmidi.old/pm_linux/Makefile	2008-06-13 20:23:43.000000000 -0400
+++ portmidi/pm_linux/Makefile	2009-01-11 01:24:28.000000000 -0500
@@ -30,11 +30,13 @@ VFLAGS = -DPMALSA
 # ALSALIB = 
 # VFLAGS = -DPMNULL
 
-pmlib = pm_linux/libportmidi.a
+pmlib = pm_linux/libportmidi.so.0$(VERSION)
 
-ptlib = porttime/libporttime.a
+ptlib = porttime/libporttime.so.0$(VERSION)
 
-CC = gcc $(VFLAGS) $(PMFLAGS) -g -Ipm_common -Iporttime
+CC = gcc $(CFLAGS) $(VFLAGS) $(PMFLAGS) -g -Ipm_common -Iporttime
+
+INSTALL = install
 
 pmobjects = pm_common/pmutil.o $(versions) pm_linux/pmlinux.o  \
 	pm_common/portmidi.o
@@ -43,14 +45,18 @@ ptobjects = porttime/porttime.o porttime
 
 current: all
 
-all: $(pmlib) $(ptlib) pm_test/test pm_test/sysex pm_test/midithread \
+all: $(ptlib) $(pmlib) pm_test/test pm_test/sysex pm_test/midithread \
 	pm_test/latency pm_test/midithru pm_test/qtest pm_test/mm
 
 $(pmlib): pm_linux/Makefile $(pmobjects)
-	ar -cr $(pmlib) $(pmobjects)
+	$(CC) -shared $(ALSALIB) $(pmobjects) -Wl,-soname -Wl,libportmidi.so.0 -Lporttime -lporttime -o $(pmlib)
+	ln -sf libportmidi.so.0$(VERSION) pm_linux/libportmidi.so
+	ln -sf libportmidi.so.0$(VERSION) pm_linux/libportmidi.so.0
 
 $(ptlib): pm_linux/Makefile $(ptobjects)
-	ar -cr $(ptlib) $(ptobjects)
+	$(CC) -shared $(ptobjects) -Wl,-soname -Wl,libporttime.so.0 -Wl,-l,pthread -o $(ptlib)
+	ln -sf libporttime.so.0$(VERSION) porttime/libporttime.so
+	ln -sf libporttime.so.0$(VERSION) porttime/libporttime.so.0
 
 pm_linux/pmlinuxalsa.o: pm_linux/Makefile pm_linux/pmlinuxalsa.c pm_linux/pmlinuxalsa.h
 	$(CC) -c pm_linux/pmlinuxalsa.c -o pm_linux/pmlinuxalsa.o
@@ -96,3 +102,15 @@ cleanest: cleaner
 
 backup: cleanest
 	cd ..; zip -r portmidi.zip portmidi
+
+install:
+	$(INSTALL) -d $(DESTDIR)/$(INCLUDEDIR)/
+	$(INSTALL) -m 644 pm_common/portmidi.h $(DESTDIR)/$(INCLUDEDIR)/
+	$(INSTALL) -m 644 porttime/porttime.h $(DESTDIR)/$(INCLUDEDIR)/
+	$(INSTALL) -d $(DESTDIR)/$(LIBDIR)/
+	$(INSTALL) pm_linux/libportmidi.so.0.* $(DESTDIR)/$(LIBDIR)/
+	$(INSTALL) porttime/libporttime.so.0.* $(DESTDIR)/$(LIBDIR)/
+	cp -a porttime/libporttime.so $(DESTDIR)/$(LIBDIR)/
+	cp -a porttime/libporttime.so.0 $(DESTDIR)/$(LIBDIR)/
+	cp -a pm_linux/libportmidi.so $(DESTDIR)/$(LIBDIR)/
+	cp -a pm_linux/libportmidi.so.0 $(DESTDIR)/$(LIBDIR)/
diff -rupN portmidi.old/pm_linux/pmlinuxalsa.c portmidi/pm_linux/pmlinuxalsa.c
--- portmidi.old/pm_linux/pmlinuxalsa.c	2008-06-13 20:23:43.000000000 -0400
+++ portmidi/pm_linux/pmlinuxalsa.c	2009-01-11 01:26:06.000000000 -0500
@@ -243,8 +243,8 @@ static PmError alsa_out_close(PmInternal
     alsa_descriptor_type desc = (alsa_descriptor_type) midi->descriptor;
     if (!desc) return pmBadPtr;
 
-    if (pm_hosterror = snd_seq_disconnect_to(seq, desc->this_port, 
-                                             desc->client, desc->port)) {
+    if ((pm_hosterror = snd_seq_disconnect_to(seq, desc->this_port, 
+					      desc->client, desc->port))) {
         // if there's an error, try to delete the port anyway, but don't
         // change the pm_hosterror value so we retain the first error
         snd_seq_delete_port(seq, desc->this_port);
@@ -333,8 +333,8 @@ static PmError alsa_in_close(PmInternal 
 {
     alsa_descriptor_type desc = (alsa_descriptor_type) midi->descriptor;
     if (!desc) return pmBadPtr;
-    if (pm_hosterror = snd_seq_disconnect_from(seq, desc->this_port, 
-                                               desc->client, desc->port)) {
+    if ((pm_hosterror = snd_seq_disconnect_from(seq, desc->this_port, 
+						desc->client, desc->port))) {
         snd_seq_delete_port(seq, desc->this_port); /* try to close port */
     } else {
         pm_hosterror = snd_seq_delete_port(seq, desc->this_port);
diff -rupN portmidi.old/pm_linux/pmlinux.c portmidi/pm_linux/pmlinux.c
--- portmidi.old/pm_linux/pmlinux.c	2006-11-29 18:37:09.000000000 -0500
+++ portmidi/pm_linux/pmlinux.c	2009-01-11 01:26:48.000000000 -0500
@@ -28,10 +28,10 @@ PmError pm_init()
      * devices.
      */
     #ifdef PMALSA
-	pm_linuxalsa_init();
+	return pm_linuxalsa_init();
     #endif
     #ifdef PMNULL
-        pm_linuxnull_init();
+        return pm_linuxnull_init();
     #endif
     return pmNoError;
 }


--- NEW FILE portmidi.spec ---
Summary:        Real-time Midi I/O Library
Name:           portmidi
Version:        131
Release:        2%{?dist}
License:        MIT
Group:          System Environment/Libraries
URL:            http://portmedia.sourceforge.net/
Source0:        http://downloads.sourceforge.net/portmedia/%{name}-src-%{version}.zip
# For building shared libraries:
Patch0:         portmidi-shared.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  alsa-lib-devel doxygen tex(latex)

%description
PortMedia is a set of simple clean APIs and cross-platform library
implementations for music and other media. PortMidi subproject provides a
real-time MIDI input/output library. This package contains the PortMidi
libraries and some test applications.

%package devel
Summary:        Headers for developing programs that will use %{name}
Group:          System Environment/Libraries
Requires:       %{name} = %{version}-%{release}

%description devel
PortMedia is a set of simple clean APIs and cross-platform library
implementations for music and other media. PortMidi subproject provides a
real-time MIDI input/output library. This package contains the header files
and the documentation of PortMidi libraries.


%prep
%setup -q -n %{name}
%patch0 -p1

# Fix permissions and encoding issues:
find . -name "*.c" -exec chmod -x {} \;
find . -name "*.h" -exec chmod -x {} \;
for i in *.txt */*.txt ; do
   sed 's|\r||' $i > $i.tmp
   touch -r $i $i.tmp
   mv -f $i.tmp $i
done

# Preserve timestamps:
sed -i 's|\(INSTALL = install\)|\1 -p|' pm_linux/Makefile

%build
# Parallel make not supported
make -f pm_linux/Makefile \
     CFLAGS="%{optflags} -fPIC" \
     VERSION=".%{version}" 

# Build the doxygen documentation:
doxygen
pushd latex
   make %{?_smp_flags}
popd

%install
rm -rf %{buildroot}
# Install the libraries and headers:
make -f pm_linux/Makefile install \
     DESTDIR=%{buildroot} \
     LIBDIR=%{_libdir} \
     INCLUDEDIR=%{_includedir}

# Install the test applications:
install -d %{buildroot}%{_libdir}/%{name}
for app in latency midithread midithru mm qtest sysex test; do
   install -m 0755 pm_test/$app %{buildroot}%{_libdir}/%{name}
done

%clean
rm -rf %{buildroot}

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files
%defattr(-,root,root,-)
%doc CHANGELOG.txt license.txt
%{_libdir}/*.so.*
%{_libdir}/%{name}

%files devel
%defattr(-,root,root,-)
%doc CHANGELOG.txt license.txt README.txt pm_linux/README_LINUX.txt
%doc html latex/*.pdf
%{_includedir}/*
%{_libdir}/*.so

%changelog
* Tue Jan 27 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 131-2
- Build and add doxygen documentation
- Preserve some timestamps

* Sun Jan 11 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 131-1
- New upstream release.

* Sun Dec 07 2008 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 82-1
- Initial release.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/portmidi/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	28 Jan 2009 05:33:41 -0000	1.1
+++ .cvsignore	28 Jan 2009 06:32:50 -0000	1.2
@@ -0,0 +1 @@
+portmidi-src-131.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/portmidi/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	28 Jan 2009 05:33:41 -0000	1.1
+++ sources	28 Jan 2009 06:32:50 -0000	1.2
@@ -0,0 +1 @@
+1715bb3d9f63c6b259720709ef43b534  portmidi-src-131.zip



From salimma at fedoraproject.org  Wed Jan 28 06:33:38 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Wed, 28 Jan 2009 06:33:38 +0000 (UTC)
Subject: rpms/vala/F-10 .cvsignore, 1.18, 1.19 sources, 1.18, 1.19 vala.spec,
	1.33, 1.34
Message-ID: <20090128063338.802D87010D@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/vala/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3004/F-10

Modified Files:
	.cvsignore sources vala.spec 
Log Message:
* Tue Jan 27 2009 Michel Salim <salimma at fedoraproject.org> - 0.5.6-1
- Update to 0.5.6



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/vala/F-10/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- .cvsignore	17 Dec 2008 02:23:52 -0000	1.18
+++ .cvsignore	28 Jan 2009 06:33:08 -0000	1.19
@@ -1 +1 @@
-vala-0.5.3.tar.bz2
+vala-0.5.6.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/vala/F-10/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources	17 Dec 2008 02:23:53 -0000	1.18
+++ sources	28 Jan 2009 06:33:08 -0000	1.19
@@ -1 +1 @@
-92216c6ffb9fe0dee80c22603ee0bbb0  vala-0.5.3.tar.bz2
+c4e3d285ffacd6c5971788215588420b  vala-0.5.6.tar.bz2


Index: vala.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vala/F-10/vala.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- vala.spec	17 Dec 2008 02:23:53 -0000	1.33
+++ vala.spec	28 Jan 2009 06:33:08 -0000	1.34
@@ -5,6 +5,7 @@
 %if 0%{?fedora} < 9
 %define emacs_version 22.1
 %else
+# This will get overridden by pkg-config; defaulting to the version in F9
 %define emacs_version 22.2
 %endif
 %endif
@@ -17,7 +18,7 @@
 %endif
 
 Name:           vala
-Version:        0.5.3
+Version:        0.5.6
 Release:        1%{?dist}
 Summary:        A modern programming language for GNOME
 
@@ -187,6 +188,9 @@
 
 
 %changelog
+* Tue Jan 27 2009 Michel Salim <salimma at fedoraproject.org> - 0.5.6-1
+- Update to 0.5.6
+
 * Tue Dec 16 2008 Michel Salim <salimma at fedoraproject.org> - 0.5.3-1
 - Update to 0.5.3
 



From salimma at fedoraproject.org  Wed Jan 28 06:33:38 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Wed, 28 Jan 2009 06:33:38 +0000 (UTC)
Subject: rpms/vala/F-9 .cvsignore, 1.18, 1.19 sources, 1.18, 1.19 vala.spec, 
	1.33, 1.34
Message-ID: <20090128063338.DEDB77010D@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/vala/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3004/F-9

Modified Files:
	.cvsignore sources vala.spec 
Log Message:
* Tue Jan 27 2009 Michel Salim <salimma at fedoraproject.org> - 0.5.6-1
- Update to 0.5.6



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/vala/F-9/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- .cvsignore	17 Dec 2008 02:23:53 -0000	1.18
+++ .cvsignore	28 Jan 2009 06:33:08 -0000	1.19
@@ -1 +1 @@
-vala-0.5.3.tar.bz2
+vala-0.5.6.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/vala/F-9/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources	17 Dec 2008 02:23:53 -0000	1.18
+++ sources	28 Jan 2009 06:33:08 -0000	1.19
@@ -1 +1 @@
-92216c6ffb9fe0dee80c22603ee0bbb0  vala-0.5.3.tar.bz2
+c4e3d285ffacd6c5971788215588420b  vala-0.5.6.tar.bz2


Index: vala.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vala/F-9/vala.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- vala.spec	17 Dec 2008 02:23:53 -0000	1.33
+++ vala.spec	28 Jan 2009 06:33:08 -0000	1.34
@@ -5,6 +5,7 @@
 %if 0%{?fedora} < 9
 %define emacs_version 22.1
 %else
+# This will get overridden by pkg-config; defaulting to the version in F9
 %define emacs_version 22.2
 %endif
 %endif
@@ -17,7 +18,7 @@
 %endif
 
 Name:           vala
-Version:        0.5.3
+Version:        0.5.6
 Release:        1%{?dist}
 Summary:        A modern programming language for GNOME
 
@@ -187,6 +188,9 @@
 
 
 %changelog
+* Tue Jan 27 2009 Michel Salim <salimma at fedoraproject.org> - 0.5.6-1
+- Update to 0.5.6
+
 * Tue Dec 16 2008 Michel Salim <salimma at fedoraproject.org> - 0.5.3-1
 - Update to 0.5.3
 



From salimma at fedoraproject.org  Wed Jan 28 06:33:38 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Wed, 28 Jan 2009 06:33:38 +0000 (UTC)
Subject: rpms/vala/EL-5 .cvsignore, 1.18, 1.19 sources, 1.18, 1.19 vala.spec,
	1.27, 1.28
Message-ID: <20090128063338.27E057010D@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/vala/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3004/EL-5

Modified Files:
	.cvsignore sources vala.spec 
Log Message:
* Tue Jan 27 2009 Michel Salim <salimma at fedoraproject.org> - 0.5.6-1
- Update to 0.5.6



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/vala/EL-5/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- .cvsignore	17 Dec 2008 17:17:34 -0000	1.18
+++ .cvsignore	28 Jan 2009 06:33:07 -0000	1.19
@@ -1 +1 @@
-vala-0.5.2.tar.bz2
+vala-0.5.6.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/vala/EL-5/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources	17 Dec 2008 17:17:34 -0000	1.18
+++ sources	28 Jan 2009 06:33:07 -0000	1.19
@@ -1 +1 @@
-e5b2ee7a4ff5f551a278e64a3e502f50  vala-0.5.2.tar.bz2
+c4e3d285ffacd6c5971788215588420b  vala-0.5.6.tar.bz2


Index: vala.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vala/EL-5/vala.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- vala.spec	19 Dec 2008 18:29:02 -0000	1.27
+++ vala.spec	28 Jan 2009 06:33:07 -0000	1.28
@@ -1,5 +1,14 @@
 %if %($(pkg-config emacs) ; echo $?)
+%if 0%{?rhel}
+%define emacs_version 21.4
+%else
+%if 0%{?fedora} < 9
 %define emacs_version 22.1
+%else
+# This will get overridden by pkg-config; defaulting to the version in F9
+%define emacs_version 22.2
+%endif
+%endif
 %define emacs_lispdir %{_datadir}/emacs/site-lisp
 %define emacs_startdir %{_datadir}/emacs/site-lisp/site-start.d
 %else
@@ -9,8 +18,8 @@
 %endif
 
 Name:           vala
-Version:        0.5.2
-Release:        4%{?dist}
+Version:        0.5.6
+Release:        1%{?dist}
 Summary:        A modern programming language for GNOME
 
 Group:          Development/Languages
@@ -18,11 +27,7 @@
 License:        LGPLv2+ and BSD
 URL:            http://live.gnome.org/Vala
 Source0:        http://download.gnome.org/sources/vala/0.5/vala-%{version}.tar.bz2
-%if 0%{?rhel}
-Source1:	vala-mode.rhel.el
-%else
 Source1:	vala-mode.el
-%endif
 Source2:	vala-init.el
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -104,11 +109,7 @@
 Summary:        Vala mode for Emacs
 Group:          Applications/Editors
 License:        GPLv2+
-%if 0%{?rhel}
-Requires:       emacs >= 21.4
-%else
-Requires:	emacs(bin) >= %{emacs_version}
-%endif
+Requires:       emacs(bin) >= %{emacs_version}
 
 
 %description -n emacs-vala
@@ -126,7 +127,7 @@
 sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
 make %{?_smp_mflags}
 # Compile emacs module
-mkdir emacs-vala && cd emacs-vala && cp -p %{SOURCE1} vala-mode.el
+mkdir emacs-vala && cd emacs-vala && cp -p %{SOURCE1} .
 emacs -batch -f batch-byte-compile vala-mode.el
 
 
@@ -187,9 +188,11 @@
 
 
 %changelog
-* Fri Dec 19 2008 Michel Salim <salimma at fedoraproject.org> - 0.5.2-4
-- [RHEL/emacs-vala] depend on emacs, not emacs-bin
-- [RHEL/emacs-vala] compatibility fix
+* Tue Jan 27 2009 Michel Salim <salimma at fedoraproject.org> - 0.5.6-1
+- Update to 0.5.6
+
+* Tue Dec 16 2008 Michel Salim <salimma at fedoraproject.org> - 0.5.3-1
+- Update to 0.5.3
 
 * Mon Dec 15 2008 Michel Salim <salimma at fedoraproject.org> - 0.5.2-3
 - Fix bug in Emacs version detection



From salimma at fedoraproject.org  Wed Jan 28 06:33:39 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Wed, 28 Jan 2009 06:33:39 +0000 (UTC)
Subject: rpms/vala/devel .cvsignore, 1.18, 1.19 sources, 1.18, 1.19 vala.spec,
	1.34, 1.35
Message-ID: <20090128063339.35D9E7010D@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/vala/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3004/devel

Modified Files:
	.cvsignore sources vala.spec 
Log Message:
* Tue Jan 27 2009 Michel Salim <salimma at fedoraproject.org> - 0.5.6-1
- Update to 0.5.6



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/vala/devel/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- .cvsignore	17 Dec 2008 02:23:53 -0000	1.18
+++ .cvsignore	28 Jan 2009 06:33:08 -0000	1.19
@@ -1 +1 @@
-vala-0.5.3.tar.bz2
+vala-0.5.6.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/vala/devel/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources	17 Dec 2008 02:23:53 -0000	1.18
+++ sources	28 Jan 2009 06:33:08 -0000	1.19
@@ -1 +1 @@
-92216c6ffb9fe0dee80c22603ee0bbb0  vala-0.5.3.tar.bz2
+c4e3d285ffacd6c5971788215588420b  vala-0.5.6.tar.bz2


Index: vala.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vala/devel/vala.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- vala.spec	17 Dec 2008 02:23:53 -0000	1.34
+++ vala.spec	28 Jan 2009 06:33:08 -0000	1.35
@@ -5,6 +5,7 @@
 %if 0%{?fedora} < 9
 %define emacs_version 22.1
 %else
+# This will get overridden by pkg-config; defaulting to the version in F9
 %define emacs_version 22.2
 %endif
 %endif
@@ -17,7 +18,7 @@
 %endif
 
 Name:           vala
-Version:        0.5.3
+Version:        0.5.6
 Release:        1%{?dist}
 Summary:        A modern programming language for GNOME
 
@@ -187,6 +188,9 @@
 
 
 %changelog
+* Tue Jan 27 2009 Michel Salim <salimma at fedoraproject.org> - 0.5.6-1
+- Update to 0.5.6
+
 * Tue Dec 16 2008 Michel Salim <salimma at fedoraproject.org> - 0.5.3-1
 - Update to 0.5.3
 



From tagoh at fedoraproject.org  Wed Jan 28 06:43:43 2009
From: tagoh at fedoraproject.org (Akira TAGOH)
Date: Wed, 28 Jan 2009 06:43:43 +0000 (UTC)
Subject: rpms/emacs-mew/devel emacs-mew.spec, NONE, 1.1 import.log, NONE,
	1.1 mew-init.el, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090128064343.E83D47010D@cvs1.fedora.phx.redhat.com>

Author: tagoh

Update of /cvs/pkgs/rpms/emacs-mew/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4775/devel

Modified Files:
	.cvsignore sources 
Added Files:
	emacs-mew.spec import.log mew-init.el 
Log Message:
Initial import for emacs-mew.



--- NEW FILE emacs-mew.spec ---
%define _use_internal_dependency_generator 0
%define	srcver		6.2

%define	pkg		mew
%define	pkgname		Mew

%if %($(pkg-config emacs) ; echo $?)
%define	emacs_version	22.1
%define	emacs_lispdir	%{_datadir}/emacs/site-lisp
%define	emacs_startdir	%{_datadir}/emacs/site-lisp/site-start.d
%else
%define	emacs_version	%(pkg-config emacs --modversion)
%define	emacs_lispdir	%(pkg-config emacs --variable sitepkglispdir)
%define	emacs_startdir	%(pkg-config emacs --variable sitestartdir)
%endif

Name:			emacs-%{pkg}
Version:		6.2
Release:		4%{?dist}
Summary:		Email client for GNU Emacs

Group:			Applications/Internet
License:		BSD
URL:			http://www.mew.org/
#Source0:		ftp://ftp.mew.org/pub/Mew/mew-%{version}.tar.gz
Source0:		http://www.mew.org/Release/mew-%{srcver}.tar.gz
#Source0:		http://www.mew.org/Beta/mew-%{srcver}.tar.gz
Source1:		mew-init.el

BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:		emacs emacs-el
Requires:		emacs(bin) >= %{emacs_version}
Requires:		ruby(abi) = 1.8
Requires(post):		/sbin/install-info
Requires(preun):	/sbin/install-info
Provides:		mew = %{version}-%{release}, mew-common = %{version}-%{release}
Obsoletes:		mew < 6.2-1, mew-common < 6.2-1, mew-xemacs < 6.2-1

%description
Mew provides a very easy user interface to email, MIME and PGP
(Pretty Good Privacy) on the Emacs and the Editors derived from
the Emacs and so on.

%package el
Summary:		Elisp source files for %{pkgname} under GNU Emacs
Group:			Applications/Internet
Requires:		%{name} = %{version}-%{release}
Obsoletes:		mew < 6.2-1

%description el
This package contains the elisp source files for %{pkgname} under GNU Emacs. You
do not need to install this package to run %{pkgname}. Install the %{name}
package to use %{pkgname} with GNU Emacs.


%prep
%setup -q -n %{pkg}-%{srcver}

%build
%configure

%install
rm -rf $RPM_BUILD_ROOT

install -dm 0755 $RPM_BUILD_ROOT%{_bindir}
install -dm 0755 $RPM_BUILD_ROOT%{_infodir}
install -dm 0755 $RPM_BUILD_ROOT%{_datadir}/pixmaps
install -dm 0755 $RPM_BUILD_ROOT%{emacs_lispdir}
install -dm 0755 $RPM_BUILD_ROOT%{emacs_startdir}


#
make	prefix=%{_prefix} \
	CFLAGS="$RPM_OPT_FLAGS" \
	EMACS=/usr/bin/emacs \
	elispdir=%{emacs_lispdir}/%{pkg} \
	etcdir=%{_datadir}/pixmaps/Mew
make EMACS=/usr/bin/emacs infodir=%{_infodir} info
make EMACS=/usr/bin/emacs infodir=%{_infodir} jinfo

make install DESTDIR=$RPM_BUILD_ROOT \
	elispdir=%{emacs_lispdir}/%{pkg} \
	etcdir=%{_datadir}/pixmaps/Mew

make install-jinfo	\
	infodir=$RPM_BUILD_ROOT%{_infodir}

install -pm 0644 %{SOURCE1} \
	$RPM_BUILD_ROOT%{emacs_startdir}

# Fixed detect an invalid file dependent.
(cd $RPM_BUILD_DIR/%{pkg}-%{srcver}/contrib && \
	for i in *; do \
		sed -e s,/usr/local/bin/perl,/usr/bin/perl,g $i > $i.new && mv $i.new $i; \
	done \
)
chmod a-x $RPM_BUILD_DIR/%{pkg}-%{srcver}/contrib/*
# Update permissions
chmod 0755 $RPM_BUILD_ROOT%{_bindir}/*

# clean the unnecessary files
rm -f $RPM_BUILD_ROOT%{_infodir}/dir

%clean
rm -rf $RPM_BUILD_ROOT


%post
/sbin/install-info %{_infodir}/mew.info.gz \
	%{_infodir}/dir --section="Message User Agent" || :
/sbin/install-info %{_infodir}/mew.jis.info.gz \
	%{_infodir}/dir --section="Message User Agent" || :

%preun
if [ "$1" = 0 ]; then
  /sbin/install-info --delete %{_infodir}/mew.info.gz \
  	%{_infodir}/dir --section="Message User Agent" || :
  /sbin/install-info --delete %{_infodir}/mew.jis.info.gz \
  	%{_infodir}/dir --section="Message User Agent" || :
fi


%files 
%defattr (-, root, root, -)
%doc 00changes* 00copyright 00diff 00readme 00api mew.dot.emacs mew.dot.mew mew.dot.theme contrib/
%lang(ja) %doc 00copyright.jis
%{emacs_lispdir}/%{pkg}/*.elc
%{emacs_startdir}/*.el
%dir %{emacs_lispdir}/%{pkg}
%dir %{_datadir}/pixmaps/Mew
%{_bindir}/*
%{_datadir}/pixmaps/Mew/*
%{_infodir}/mew.info.gz
%{_infodir}/mew.info-*
%{_infodir}/mew.jis.info.gz
%{_infodir}/mew.jis.info-*
%{_mandir}/man1/*

%files el
%defattr(-, root, root, -)
%{emacs_lispdir}/%{pkg}/*.el

%changelog
* Mon Jan 26 2009 Akira TAGOH <tagoh at redhat.com> - 6.2-4
- correct permissions for %%{_bindir}/*
- escape macro in changelog
- convert the spec file to utf-8.
- fix a warning on %%post and %%preun.

* Mon Jan 19 2009 Akira TAGOH <tagoh at redhat.com> - 6.2-3
- Add Obsoletes: mew-xemacs.

* Thu Jan 15 2009 Akira TAGOH <tagoh at redhat.com> - 6.2-2
- Add Provides: mew-common thing to emacs-mew.
- improve the spec file a bit.

* Wed Jan 14 2009 Akira TAGOH <tagoh at redhat.com> - 6.2-1
- New upstream release.
- upstream doesn't support xemacs anymore.
- make it as single package now.
- update summary.

* Fri Nov 21 2008 Akira TAGOH <tagoh at redhat.com> - 6.1.51-1
- New upstream release.

* 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.

* Wed May 28 2008 Akira TAGOH <tagoh at redhat.com> - 6.1-0.1.rc1
- New upstream release.

* Wed May 14 2008 Akira TAGOH <tagoh at redhat.com> - 6.0.51-1
- New upstream release.

* Thu Apr 17 2008 Akira TAGOH <tagoh at redhat.com> - 6.0.50-1
- New upstream release.

* Wed Apr  2 2008 Akira TAGOH <tagoh at redhat.com> - 5.2.55-1
- New upstream release.

* Wed Mar 19 2008 Akira TAGOH <tagoh at redhat.com> - 5.2.54-1
- New upstream release.

* Thu Feb 14 2008 Akira TAGOH <tagoh at redhat.com> - 5.2.53-1
- New upstream release.

* Tue Feb 12 2008 Akira TAGOH <tagoh at redhat.com> - 5.2.52-2
- Rebuild for gcc-4.3.

* Tue Jan  8 2008 Akira TAGOH <tagoh at redhat.com>
- Use evince instead of xpdf for displaying a pdf file.

* Wed Dec  5 2007 Akira TAGOH <tagoh at redhat.com> - 5.2.52-1
- New upstream release.

* Wed Oct 31 2007 Akira TAGOH <tagoh at redhat.com> - 5.2.51-1
- New upstream release.

* Thu Aug 23 2007 Akira TAGOH <tagoh at redhat.com> - 5.2.50-3
- Rebuild

* Mon Aug 13 2007 Akira TAGOH <tagoh at redhat.com> - 5.2.50-2
- Fix an open-missing-mode error.

* Thu Aug  9 2007 Akira TAGOH <tagoh at redhat.com>
- Update License tag.

* Fri Jul 27 2007 Akira TAGOH <tagoh at redhat.com> - 5.2.50-1
- New upstream release.

* Fri Mar  9 2007 Akira TAGOH <tagoh at redhat.com> - 5.2-3
- Rebuild

* Fri Feb  9 2007 Akira TAGOH <tagoh at redhat.com> - 5.2-2
- Remove all MIME handler definitions in mew-init.el so that it's no longer needed.

* Wed Feb  7 2007 Akira TAGOH <tagoh at redhat.com> - 5.2-1
- New upstream release.

* Tue Dec 19 2006 Akira TAGOh <tagoh at redhat.com> - 5.1-3
- makes it failsafe to run install-info. (#219402)

* Mon Sep 11 2006 Akira TAGOH <tagoh at redhat.com> - 5.1-2
- rebuilt
- add xemacs-packages-extra to BR and R.

* Wed Jul 19 2006 Akira TAGOH <tagoh at redhat.com> - 5.1-1
- New upstream release.
- mew-2.2-makefile.patch: removed.
- clean up the spec file a bit.
- mew-init.el: updated for the OpenDocument's MIME types.

* Thu Mar  2 2006 Akira TAGOH <tagoh at redhat.com> - 4.2-2
- rebuilt.

* Mon May 30 2005 Akira TAGOH <tagoh at redhat.com> - 4.2-1
- Updates to 4.2.
- import into Extras.

* Mon Nov 22 2004 Akira TAGOH <tagoh at redhat.com> - 4.1-1
- New upstream release.
  - improved IMAP support.
  - added the spam filter hook.
- mew-init.el: added the proper location for stunnel.

* Wed Oct  6 2004 Akira TAGOH <tagoh at redhat.com> - 3.3-4
- require emacs-common instead of emacs.
- require xemacs-common instead of xemacs.

* Mon Sep 27 2004 Akira TAGOH <tagoh at redhat.com> - 3.3-3
- rebuilt

* Fri Feb 13 2004 Elliot Lee <sopwith at redhat.com>
- rebuilt

* Tue Sep 02 2003 Akira TAGOH <tagoh at redhat.com> 3.3-1
- New upstream release.
- moved the install path to xemacs-packages.

* Fri Jun 27 2003 Akira TAGOH <tagoh at redhat.com> 3.2-5
- rebuild

* Wed Jun 04 2003 Elliot Lee <sopwith at redhat.com>
- rebuilt

* Fri May  9 2003 Akira TAGOH <tagoh at redhat.com> 3.2-3
- mew-init.el: add some MIME type for OpenOffice.org

* Thu Apr 03 2003 Akira TAGOH <tagoh at redhat.com> 3.2-2
- mew-init.el: use OpenOffice.org for MS documents.
- removed im. it's no longer used from Mew. (#85167)
- don't excludearch.

* Mon Mar 17 2003 Akira TAGOH <tagoh at redhat.com> 3.2-1
- New upstream release.
- mew-3.1-installinfo.patch: removed.

* Tue Feb  4 2003 Akira TAGOH <tagoh at redhat.com> 3.1-8
- build on x86_64 and ppc.

* Wed Jan 22 2003 Tim Powers <timp at redhat.com>
- rebuilt

* Fri Jan 10 2003 Akira TAGOH <tagoh at redhat.com> 3.1-6
- according to xemacs 21.4.11, moved the install path for elisp.
- add ExcludeArch alpha ia64 ppc. right now our xemacs doesn't support these arch.

* Mon Dec 16 2002 Akira TAGOH <tagoh at redhat.com> 3.1-5
- updates to im-143.

* Sat Dec 14 2002 Tim Powers <timp at redhat.com> 3.1-4
- don't use rpms internal dep generator

* Mon Dec  9 2002 Akira TAGOH <tagoh at redhat.com> 3.1-3
- updates to im-142
- im-141-securityfix.patch: removed.

* Fri Dec  6 2002 Akira TAGOH <tagoh at redhat.com> 3.1-2
- updates to im-141
- im-141-securityfix.patch: applied to fix a locally security issue.

* Wed Dec  4 2002 Akira TAGOH <tagoh at redhat.com> 3.1-1
- New upstream release.
- mew-3.1-installinfo.patch: applied to install mew.info-4.
- fix some missing files.
- use installvendorlib instead of installsitelib.
- ExcludeArch x86_64 until fix load-path issue on xemacs.

* Mon Jun 24 2002 Akira TAGOH <tagoh at redhat.com> 2.2-5
- fix the description. (Bug#65556)

* Fri Jun 21 2002 Tim Powers <timp at redhat.com>
- automated rebuild

* Thu May 23 2002 Tim Powers <timp at redhat.com>
- automated rebuild

* Wed Feb 27 2002 Akira TAGOH <tagoh at redhat.com> 2.2-2
- disable alpha because nothing is xemacs for alpha now.
- enable ia64.

* Wed Feb 27 2002 Akira TAGOH <tagoh at redhat.com> 2.2-1
- New upstream release.
- mew-2.2-makefile.patch: updates.

* Wed Jan 30 2002 Akira TAGOH <tagoh at redhat.com> 2.1-3
- merged im.

* Wed Jan 09 2002 Tim Powers <timp at redhat.com>
- automated rebuild

* Thu Nov  1 2001 Akira TAGOH <tagoh at redhat.com> 2.1-1
- New upstream release.

* Mon Oct 15 2001 Akira TAGOH <tagoh at redhat.com> 2.0-1
- New upstream release.
- Replaced the appropriate rpmmacros.
- Added package for xemacs.
- Split the common files of emacs and xemacs.

* Wed Oct  3 2001 Trond Eivind Glomsr??d <teg at redhat.com> 1.94.2-12
- Fix broken %%post script ("oops!" is not a binary)
- s/Copyright/License/
- Don't define version and release on top of the file, and then use these to set
  the header values. Once is enough.

* Tue Oct  2 2001 Jens Petersen <petersen at redhat.com>  1.94.2-11
- put localhost in mew-mail-domain-list (mew-init.el) to avoid startup error

* Fri Sep  7 2001 SATO Satoru <ssato at redhat.com>  1.94.2-10
- added the line for the missing files in %%files (#54235)

* Wed Jul 17 2001 SATO Satoru <ssato at redhat.com>  1.94.2-9
- s/Emacs\=emacs/Emacs\=\/usr\/bin\/emacs/

* Mon Jul 10 2001 SATO Satoru <ssato at redhat.com>
- fix the group (close #47279)
- BuildPrereq: emacs >= %%{emacsver}
- BuildRequires: emacs >= %%{emacsver}

* Mon Jun 25 2001 Bill Nottingham <notting at redhat.com>
- this is *not* a noarch package

* Mon Jun 25 2001 SATO Satoru <ssato at redhat.com>
- rebuild (mew-*.tar.bz was corrupted)
- modified mew-init.el

* Tue Jun  5 2001 SATO Satoru <ssato at redhat.com>
- remove the Japanese messages
- fix Copyright term.
- clean up SPEC
- add mew-init.el
- BuildArch: noarch
- shorten lengthy description
- build for 7.2

* Tue Aug 29 2000 ISHIKAWA Mutsumi <ishikawa at redhat.com>
- fix License Term.
- adopt FHS
- built on RedHat 7.0

* Wed Jun  7 2000 Lisa Sagami <czs14350 at nifty.ne.jp>
- fix description: mess up with mule/emacs/xemacs...
- added BuildRequires and Conflicts

* Wed Apr 26 2000 Lisa Sagami <czs14350 at nifty.ne.jp>
- updated 1.94.2

* Wed Apr 26 2000 Lisa Sagami <czs14350 at nifty.ne.jp>
- added PreReq: /sbin/install-info
- attrib +x for /usr/bin/uumerge
- CFLAGS="$RPM_OPT_FLAGS"

* Fri Jan 07 2000 MATSUBAYASHI 'Shaolin' Kohji <shaolin at rins.st.ryukoku.ac.jp>
 - 1.94.1-2
 - changed destination to /usr/share/emacs/site-lisp/mew

* Sat Nov 27 1999 MATSUBAYASHI 'Shaolin' Kohji <shaolin at rins.st.ryukoku.ac.jp>
 - 1.94.1-1
 - updated in sync with 1.94.1 release
 - fixed %%post and %%preun section
 - Obsoletes: mew now changed to Obsoletes: mew-mule

* Fri Oct  8 1999 Yasushi Karino <kari-p at mc.kcom.ne.jp>
 - fixed info path & install info
 - fixed '%%description'

* Sat Oct  2 1999 Yasushi Karino <kari-p at mc.kcom.ne.jp>
 - removed extra packages
 - fixed char-set "euc" of the spec file.
 - slight modifications for Vine-1.9

* Wed Sep 29 1999 MATSUBAYASHI 'Shaolin' Kohji <shaolin at rins.st.ryukoku.ac.jp>
  - 1.94-3
  - package name changed from mew-emacs to mew
  - make info, make jinfo now processed even under emacs

* Thu Sep 16 1999 Ushio Tadaaki <t-ushio at fb3.so-net.ne.jp>
- Released as version "1.94-2".

Changed from "mew-emacs 1.94-1".
- Deleted "NoSource: 0", the definition part of data. 
- Revised some, the definition part of data. 
- Revised some, part of "%%post, %%postun".
- Changerd "%%postun" => "%%preun".

* Mon Sep  6 1999 Ushio Tadaaki <t-ushio at fb3.so-net.ne.jp>
- First release.


--- NEW FILE import.log ---
emacs-mew-6_2-4_fc11:HEAD:emacs-mew-6.2-4.fc11.src.rpm:1233124721


--- NEW FILE mew-init.el ---
;; mew-init.el
;; Created: 2001-06-05
;;
;; see mew.el for more information

(autoload 'mew "mew" nil t)
(autoload 'mew-send "mew" nil t)

(and (or (featurep 'xemacs) (>= emacs-major-version 21))
	(defvar mew-icon-directory "/usr/share/pixmaps/Mew"))

;; (setq mew-icon-directory "/usr/share/pixmaps")

;; Optional setup (e.g. for C-xm):
;; (autoload 'mew-user-agent-compose "mew" nil t)
;;   (if (boundp 'mail-user-agent)
;;     (setq mail-user-agent 'mew-user-agent))
;;   (if (fboundp 'define-mail-user-agent)
;;     (define-mail-user-agent
;;            'mew-user-agent
;;            'mew-user-agent-compose
;;            'mew-draft-send-letter
;;            'mew-draft-kill
;;            'mew-send-hook))

;; Set your domain name when mew append garbage to the From: line
;; /etc/im/SiteConfig is also used to set this domain name.
(setq mew-mail-domain-list '("localhost"))

;; Set proper applications
(setq mew-prog-msword '("ooffice" nil t))
(setq mew-prog-msexcel '("ooffice" nil t))
(setq mew-prog-mspowerpoint '("ooffice" nil t))
(setq mew-prog-pdf '("evince" nil t))
(setq mew-prog-ssl "/usr/sbin/stunnel")



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/emacs-mew/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	28 Jan 2009 05:35:24 -0000	1.1
+++ .cvsignore	28 Jan 2009 06:43:13 -0000	1.2
@@ -0,0 +1 @@
+mew-6.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/emacs-mew/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	28 Jan 2009 05:35:24 -0000	1.1
+++ sources	28 Jan 2009 06:43:13 -0000	1.2
@@ -0,0 +1 @@
+615de2bc3c511f244311d22485306bb9  mew-6.2.tar.gz



From petersen at fedoraproject.org  Wed Jan 28 06:48:07 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Wed, 28 Jan 2009 06:48:07 +0000 (UTC)
Subject: rpms/scim/devel scim.spec,1.139,1.140
Message-ID: <20090128064807.2E19A7010D@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/scim/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6099

Modified Files:
	scim.spec 
Log Message:
buildrequire libtool-ltdl-devel


Index: scim.spec
===================================================================
RCS file: /cvs/extras/rpms/scim/devel/scim.spec,v
retrieving revision 1.139
retrieving revision 1.140
diff -u -r1.139 -r1.140
--- scim.spec	28 Jan 2009 06:21:04 -0000	1.139
+++ scim.spec	28 Jan 2009 06:47:36 -0000	1.140
@@ -20,6 +20,8 @@
 BuildRequires: gtk2-devel, libXt-devel
 # for autoreconf
 Buildrequires: autoconf automake gettext libtool
+# for system ltdl
+Buildrequires: libtool-ltdl-devel
 %if %{snapshot}
 # for devel docs
 BuildRequires: doxygen
@@ -320,6 +322,7 @@
 - update scim-1.4.7-translation-update-431995.patch
 - scim-fix-unload-segfault.patch no longer needed
 - add scim-1.4.7-syslibltdl.patch from Gentoo to build with libtool2
+- buildrequire libtool-ltdl-devel
 
 * Tue Dec  2 2008 Jens Petersen <petersen at redhat.com> - 1.4.7-37
 - make libs subpackage own its dirs for multilib (#473664)



From tagoh at fedoraproject.org  Wed Jan 28 06:51:22 2009
From: tagoh at fedoraproject.org (Akira TAGOH)
Date: Wed, 28 Jan 2009 06:51:22 +0000 (UTC)
Subject: rpms/emacs-mew/devel .cvsignore, 1.2, 1.3 emacs-mew.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <20090128065122.E261C7010D@cvs1.fedora.phx.redhat.com>

Author: tagoh

Update of /cvs/pkgs/rpms/emacs-mew/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6680

Modified Files:
	.cvsignore emacs-mew.spec sources 
Log Message:
* Wed Jan 28 2009 Akira TAGOH <tagoh at redhat.com> - 6.2.50-1
- New upstream release.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/emacs-mew/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	28 Jan 2009 06:43:13 -0000	1.2
+++ .cvsignore	28 Jan 2009 06:50:52 -0000	1.3
@@ -1 +1,2 @@
 mew-6.2.tar.gz
+mew-6.2.50.tar.gz


Index: emacs-mew.spec
===================================================================
RCS file: /cvs/pkgs/rpms/emacs-mew/devel/emacs-mew.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- emacs-mew.spec	28 Jan 2009 06:43:13 -0000	1.1
+++ emacs-mew.spec	28 Jan 2009 06:50:52 -0000	1.2
@@ -1,5 +1,5 @@
 %define _use_internal_dependency_generator 0
-%define	srcver		6.2
+%define	srcver		6.2.50
 
 %define	pkg		mew
 %define	pkgname		Mew
@@ -15,16 +15,16 @@
 %endif
 
 Name:			emacs-%{pkg}
-Version:		6.2
-Release:		4%{?dist}
+Version:		6.2.50
+Release:		1%{?dist}
 Summary:		Email client for GNU Emacs
 
 Group:			Applications/Internet
 License:		BSD
 URL:			http://www.mew.org/
 #Source0:		ftp://ftp.mew.org/pub/Mew/mew-%{version}.tar.gz
-Source0:		http://www.mew.org/Release/mew-%{srcver}.tar.gz
-#Source0:		http://www.mew.org/Beta/mew-%{srcver}.tar.gz
+#Source0:		http://www.mew.org/Release/mew-%{srcver}.tar.gz
+Source0:		http://www.mew.org/Beta/mew-%{srcver}.tar.gz
 Source1:		mew-init.el
 
 BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -141,6 +141,9 @@
 %{emacs_lispdir}/%{pkg}/*.el
 
 %changelog
+* Wed Jan 28 2009 Akira TAGOH <tagoh at redhat.com> - 6.2.50-1
+- New upstream release.
+
 * Mon Jan 26 2009 Akira TAGOH <tagoh at redhat.com> - 6.2-4
 - correct permissions for %%{_bindir}/*
 - escape macro in changelog


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/emacs-mew/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	28 Jan 2009 06:43:13 -0000	1.2
+++ sources	28 Jan 2009 06:50:52 -0000	1.3
@@ -1 +1 @@
-615de2bc3c511f244311d22485306bb9  mew-6.2.tar.gz
+0bdfcd96015486bda2a4ebb83659a45c  mew-6.2.50.tar.gz



From tagoh at fedoraproject.org  Wed Jan 28 06:56:59 2009
From: tagoh at fedoraproject.org (Akira TAGOH)
Date: Wed, 28 Jan 2009 06:56:59 +0000 (UTC)
Subject: rpms/mew/devel dead.package, NONE, 1.1 Makefile, 1.1,
	NONE mew-5.2.50-missing-mode.patch, 1.1, NONE mew-init.el, 1.4,
	NONE mew.spec, 1.31, NONE sources, 1.17, NONE
Message-ID: <20090128065700.3805F7010D@cvs1.fedora.phx.redhat.com>

Author: tagoh

Update of /cvs/pkgs/rpms/mew/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7541

Added Files:
	dead.package 
Removed Files:
	Makefile mew-5.2.50-missing-mode.patch mew-init.el mew.spec 
	sources 
Log Message:
This package has renamed to emacs-mew.


--- NEW FILE dead.package ---
This package has renamed to emacs-mew.


--- Makefile DELETED ---


--- mew-5.2.50-missing-mode.patch DELETED ---


--- mew-init.el DELETED ---


--- mew.spec DELETED ---


--- sources DELETED ---



From tagoh at fedoraproject.org  Wed Jan 28 07:00:02 2009
From: tagoh at fedoraproject.org (Akira TAGOH)
Date: Wed, 28 Jan 2009 07:00:02 +0000 (UTC)
Subject: comps comps-f11.xml.in,1.85,1.86
Message-ID: <20090128070002.658877010D@cvs1.fedora.phx.redhat.com>

Author: tagoh

Update of /cvs/pkgs/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7918

Modified Files:
	comps-f11.xml.in 
Log Message:
renamed mew to emacs-mew.


Index: comps-f11.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f11.xml.in,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -r1.85 -r1.86
--- comps-f11.xml.in	28 Jan 2009 05:45:36 -0000	1.85
+++ comps-f11.xml.in	28 Jan 2009 06:59:31 -0000	1.86
@@ -4722,7 +4722,7 @@
       <packagereq type="optional">irssi</packagereq>
       <packagereq type="optional">libtranslate</packagereq>
       <packagereq type="optional">lynx</packagereq>
-      <packagereq type="optional">mew</packagereq>
+      <packagereq type="optional">emacs-mew</packagereq>
       <packagereq type="optional">nail</packagereq>
       <packagereq type="optional">naim</packagereq>
       <packagereq type="optional">ncftp</packagereq>



From tagoh at fedoraproject.org  Wed Jan 28 07:03:50 2009
From: tagoh at fedoraproject.org (Akira TAGOH)
Date: Wed, 28 Jan 2009 07:03:50 +0000 (UTC)
Subject: rpms/emacs-mew/F-10 emacs-mew.spec, NONE, 1.1 import.log, NONE,
	1.1 mew-init.el, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090128070350.8BADA7010D@cvs1.fedora.phx.redhat.com>

Author: tagoh

Update of /cvs/pkgs/rpms/emacs-mew/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8637/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	emacs-mew.spec import.log mew-init.el 
Log Message:
Initial import to F-10 branch for emacs-mew


--- NEW FILE emacs-mew.spec ---
%define _use_internal_dependency_generator 0
%define	srcver		6.2.50

%define	pkg		mew
%define	pkgname		Mew

%if %($(pkg-config emacs) ; echo $?)
%define	emacs_version	22.1
%define	emacs_lispdir	%{_datadir}/emacs/site-lisp
%define	emacs_startdir	%{_datadir}/emacs/site-lisp/site-start.d
%else
%define	emacs_version	%(pkg-config emacs --modversion)
%define	emacs_lispdir	%(pkg-config emacs --variable sitepkglispdir)
%define	emacs_startdir	%(pkg-config emacs --variable sitestartdir)
%endif

Name:			emacs-%{pkg}
Version:		6.2.50
Release:		1%{?dist}
Summary:		Email client for GNU Emacs

Group:			Applications/Internet
License:		BSD
URL:			http://www.mew.org/
#Source0:		ftp://ftp.mew.org/pub/Mew/mew-%{version}.tar.gz
#Source0:		http://www.mew.org/Release/mew-%{srcver}.tar.gz
Source0:		http://www.mew.org/Beta/mew-%{srcver}.tar.gz
Source1:		mew-init.el

BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:		emacs emacs-el
Requires:		emacs(bin) >= %{emacs_version}
Requires:		ruby(abi) = 1.8
Requires(post):		/sbin/install-info
Requires(preun):	/sbin/install-info
Provides:		mew = %{version}-%{release}, mew-common = %{version}-%{release}
Obsoletes:		mew < 6.2-1, mew-common < 6.2-1, mew-xemacs < 6.2-1

%description
Mew provides a very easy user interface to email, MIME and PGP
(Pretty Good Privacy) on the Emacs and the Editors derived from
the Emacs and so on.

%package el
Summary:		Elisp source files for %{pkgname} under GNU Emacs
Group:			Applications/Internet
Requires:		%{name} = %{version}-%{release}
Obsoletes:		mew < 6.2-1

%description el
This package contains the elisp source files for %{pkgname} under GNU Emacs. You
do not need to install this package to run %{pkgname}. Install the %{name}
package to use %{pkgname} with GNU Emacs.


%prep
%setup -q -n %{pkg}-%{srcver}

%build
%configure

%install
rm -rf $RPM_BUILD_ROOT

install -dm 0755 $RPM_BUILD_ROOT%{_bindir}
install -dm 0755 $RPM_BUILD_ROOT%{_infodir}
install -dm 0755 $RPM_BUILD_ROOT%{_datadir}/pixmaps
install -dm 0755 $RPM_BUILD_ROOT%{emacs_lispdir}
install -dm 0755 $RPM_BUILD_ROOT%{emacs_startdir}


#
make	prefix=%{_prefix} \
	CFLAGS="$RPM_OPT_FLAGS" \
	EMACS=/usr/bin/emacs \
	elispdir=%{emacs_lispdir}/%{pkg} \
	etcdir=%{_datadir}/pixmaps/Mew
make EMACS=/usr/bin/emacs infodir=%{_infodir} info
make EMACS=/usr/bin/emacs infodir=%{_infodir} jinfo

make install DESTDIR=$RPM_BUILD_ROOT \
	elispdir=%{emacs_lispdir}/%{pkg} \
	etcdir=%{_datadir}/pixmaps/Mew

make install-jinfo	\
	infodir=$RPM_BUILD_ROOT%{_infodir}

install -pm 0644 %{SOURCE1} \
	$RPM_BUILD_ROOT%{emacs_startdir}

# Fixed detect an invalid file dependent.
(cd $RPM_BUILD_DIR/%{pkg}-%{srcver}/contrib && \
	for i in *; do \
		sed -e s,/usr/local/bin/perl,/usr/bin/perl,g $i > $i.new && mv $i.new $i; \
	done \
)
chmod a-x $RPM_BUILD_DIR/%{pkg}-%{srcver}/contrib/*
# Update permissions
chmod 0755 $RPM_BUILD_ROOT%{_bindir}/*

# clean the unnecessary files
rm -f $RPM_BUILD_ROOT%{_infodir}/dir

%clean
rm -rf $RPM_BUILD_ROOT


%post
/sbin/install-info %{_infodir}/mew.info.gz \
	%{_infodir}/dir --section="Message User Agent" || :
/sbin/install-info %{_infodir}/mew.jis.info.gz \
	%{_infodir}/dir --section="Message User Agent" || :

%preun
if [ "$1" = 0 ]; then
  /sbin/install-info --delete %{_infodir}/mew.info.gz \
  	%{_infodir}/dir --section="Message User Agent" || :
  /sbin/install-info --delete %{_infodir}/mew.jis.info.gz \
  	%{_infodir}/dir --section="Message User Agent" || :
fi


%files 
%defattr (-, root, root, -)
%doc 00changes* 00copyright 00diff 00readme 00api mew.dot.emacs mew.dot.mew mew.dot.theme contrib/
%lang(ja) %doc 00copyright.jis
%{emacs_lispdir}/%{pkg}/*.elc
%{emacs_startdir}/*.el
%dir %{emacs_lispdir}/%{pkg}
%dir %{_datadir}/pixmaps/Mew
%{_bindir}/*
%{_datadir}/pixmaps/Mew/*
%{_infodir}/mew.info.gz
%{_infodir}/mew.info-*
%{_infodir}/mew.jis.info.gz
%{_infodir}/mew.jis.info-*
%{_mandir}/man1/*

%files el
%defattr(-, root, root, -)
%{emacs_lispdir}/%{pkg}/*.el

%changelog
* Wed Jan 28 2009 Akira TAGOH <tagoh at redhat.com> - 6.2.50-1
- New upstream release.

* Mon Jan 26 2009 Akira TAGOH <tagoh at redhat.com> - 6.2-4
- correct permissions for %%{_bindir}/*
- escape macro in changelog
- convert the spec file to utf-8.
- fix a warning on %%post and %%preun.

* Mon Jan 19 2009 Akira TAGOH <tagoh at redhat.com> - 6.2-3
- Add Obsoletes: mew-xemacs.

* Thu Jan 15 2009 Akira TAGOH <tagoh at redhat.com> - 6.2-2
- Add Provides: mew-common thing to emacs-mew.
- improve the spec file a bit.

* Wed Jan 14 2009 Akira TAGOH <tagoh at redhat.com> - 6.2-1
- New upstream release.
- upstream doesn't support xemacs anymore.
- make it as single package now.
- update summary.

* Fri Nov 21 2008 Akira TAGOH <tagoh at redhat.com> - 6.1.51-1
- New upstream release.

* 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.

* Wed May 28 2008 Akira TAGOH <tagoh at redhat.com> - 6.1-0.1.rc1
- New upstream release.

* Wed May 14 2008 Akira TAGOH <tagoh at redhat.com> - 6.0.51-1
- New upstream release.

* Thu Apr 17 2008 Akira TAGOH <tagoh at redhat.com> - 6.0.50-1
- New upstream release.

* Wed Apr  2 2008 Akira TAGOH <tagoh at redhat.com> - 5.2.55-1
- New upstream release.

* Wed Mar 19 2008 Akira TAGOH <tagoh at redhat.com> - 5.2.54-1
- New upstream release.

* Thu Feb 14 2008 Akira TAGOH <tagoh at redhat.com> - 5.2.53-1
- New upstream release.

* Tue Feb 12 2008 Akira TAGOH <tagoh at redhat.com> - 5.2.52-2
- Rebuild for gcc-4.3.

* Tue Jan  8 2008 Akira TAGOH <tagoh at redhat.com>
- Use evince instead of xpdf for displaying a pdf file.

* Wed Dec  5 2007 Akira TAGOH <tagoh at redhat.com> - 5.2.52-1
- New upstream release.

* Wed Oct 31 2007 Akira TAGOH <tagoh at redhat.com> - 5.2.51-1
- New upstream release.

* Thu Aug 23 2007 Akira TAGOH <tagoh at redhat.com> - 5.2.50-3
- Rebuild

* Mon Aug 13 2007 Akira TAGOH <tagoh at redhat.com> - 5.2.50-2
- Fix an open-missing-mode error.

* Thu Aug  9 2007 Akira TAGOH <tagoh at redhat.com>
- Update License tag.

* Fri Jul 27 2007 Akira TAGOH <tagoh at redhat.com> - 5.2.50-1
- New upstream release.

* Fri Mar  9 2007 Akira TAGOH <tagoh at redhat.com> - 5.2-3
- Rebuild

* Fri Feb  9 2007 Akira TAGOH <tagoh at redhat.com> - 5.2-2
- Remove all MIME handler definitions in mew-init.el so that it's no longer needed.

* Wed Feb  7 2007 Akira TAGOH <tagoh at redhat.com> - 5.2-1
- New upstream release.

* Tue Dec 19 2006 Akira TAGOh <tagoh at redhat.com> - 5.1-3
- makes it failsafe to run install-info. (#219402)

* Mon Sep 11 2006 Akira TAGOH <tagoh at redhat.com> - 5.1-2
- rebuilt
- add xemacs-packages-extra to BR and R.

* Wed Jul 19 2006 Akira TAGOH <tagoh at redhat.com> - 5.1-1
- New upstream release.
- mew-2.2-makefile.patch: removed.
- clean up the spec file a bit.
- mew-init.el: updated for the OpenDocument's MIME types.

* Thu Mar  2 2006 Akira TAGOH <tagoh at redhat.com> - 4.2-2
- rebuilt.

* Mon May 30 2005 Akira TAGOH <tagoh at redhat.com> - 4.2-1
- Updates to 4.2.
- import into Extras.

* Mon Nov 22 2004 Akira TAGOH <tagoh at redhat.com> - 4.1-1
- New upstream release.
  - improved IMAP support.
  - added the spam filter hook.
- mew-init.el: added the proper location for stunnel.

* Wed Oct  6 2004 Akira TAGOH <tagoh at redhat.com> - 3.3-4
- require emacs-common instead of emacs.
- require xemacs-common instead of xemacs.

* Mon Sep 27 2004 Akira TAGOH <tagoh at redhat.com> - 3.3-3
- rebuilt

* Fri Feb 13 2004 Elliot Lee <sopwith at redhat.com>
- rebuilt

* Tue Sep 02 2003 Akira TAGOH <tagoh at redhat.com> 3.3-1
- New upstream release.
- moved the install path to xemacs-packages.

* Fri Jun 27 2003 Akira TAGOH <tagoh at redhat.com> 3.2-5
- rebuild

* Wed Jun 04 2003 Elliot Lee <sopwith at redhat.com>
- rebuilt

* Fri May  9 2003 Akira TAGOH <tagoh at redhat.com> 3.2-3
- mew-init.el: add some MIME type for OpenOffice.org

* Thu Apr 03 2003 Akira TAGOH <tagoh at redhat.com> 3.2-2
- mew-init.el: use OpenOffice.org for MS documents.
- removed im. it's no longer used from Mew. (#85167)
- don't excludearch.

* Mon Mar 17 2003 Akira TAGOH <tagoh at redhat.com> 3.2-1
- New upstream release.
- mew-3.1-installinfo.patch: removed.

* Tue Feb  4 2003 Akira TAGOH <tagoh at redhat.com> 3.1-8
- build on x86_64 and ppc.

* Wed Jan 22 2003 Tim Powers <timp at redhat.com>
- rebuilt

* Fri Jan 10 2003 Akira TAGOH <tagoh at redhat.com> 3.1-6
- according to xemacs 21.4.11, moved the install path for elisp.
- add ExcludeArch alpha ia64 ppc. right now our xemacs doesn't support these arch.

* Mon Dec 16 2002 Akira TAGOH <tagoh at redhat.com> 3.1-5
- updates to im-143.

* Sat Dec 14 2002 Tim Powers <timp at redhat.com> 3.1-4
- don't use rpms internal dep generator

* Mon Dec  9 2002 Akira TAGOH <tagoh at redhat.com> 3.1-3
- updates to im-142
- im-141-securityfix.patch: removed.

* Fri Dec  6 2002 Akira TAGOH <tagoh at redhat.com> 3.1-2
- updates to im-141
- im-141-securityfix.patch: applied to fix a locally security issue.

* Wed Dec  4 2002 Akira TAGOH <tagoh at redhat.com> 3.1-1
- New upstream release.
- mew-3.1-installinfo.patch: applied to install mew.info-4.
- fix some missing files.
- use installvendorlib instead of installsitelib.
- ExcludeArch x86_64 until fix load-path issue on xemacs.

* Mon Jun 24 2002 Akira TAGOH <tagoh at redhat.com> 2.2-5
- fix the description. (Bug#65556)

* Fri Jun 21 2002 Tim Powers <timp at redhat.com>
- automated rebuild

* Thu May 23 2002 Tim Powers <timp at redhat.com>
- automated rebuild

* Wed Feb 27 2002 Akira TAGOH <tagoh at redhat.com> 2.2-2
- disable alpha because nothing is xemacs for alpha now.
- enable ia64.

* Wed Feb 27 2002 Akira TAGOH <tagoh at redhat.com> 2.2-1
- New upstream release.
- mew-2.2-makefile.patch: updates.

* Wed Jan 30 2002 Akira TAGOH <tagoh at redhat.com> 2.1-3
- merged im.

* Wed Jan 09 2002 Tim Powers <timp at redhat.com>
- automated rebuild

* Thu Nov  1 2001 Akira TAGOH <tagoh at redhat.com> 2.1-1
- New upstream release.

* Mon Oct 15 2001 Akira TAGOH <tagoh at redhat.com> 2.0-1
- New upstream release.
- Replaced the appropriate rpmmacros.
- Added package for xemacs.
- Split the common files of emacs and xemacs.

* Wed Oct  3 2001 Trond Eivind Glomsr??d <teg at redhat.com> 1.94.2-12
- Fix broken %%post script ("oops!" is not a binary)
- s/Copyright/License/
- Don't define version and release on top of the file, and then use these to set
  the header values. Once is enough.

* Tue Oct  2 2001 Jens Petersen <petersen at redhat.com>  1.94.2-11
- put localhost in mew-mail-domain-list (mew-init.el) to avoid startup error

* Fri Sep  7 2001 SATO Satoru <ssato at redhat.com>  1.94.2-10
- added the line for the missing files in %%files (#54235)

* Wed Jul 17 2001 SATO Satoru <ssato at redhat.com>  1.94.2-9
- s/Emacs\=emacs/Emacs\=\/usr\/bin\/emacs/

* Mon Jul 10 2001 SATO Satoru <ssato at redhat.com>
- fix the group (close #47279)
- BuildPrereq: emacs >= %%{emacsver}
- BuildRequires: emacs >= %%{emacsver}

* Mon Jun 25 2001 Bill Nottingham <notting at redhat.com>
- this is *not* a noarch package

* Mon Jun 25 2001 SATO Satoru <ssato at redhat.com>
- rebuild (mew-*.tar.bz was corrupted)
- modified mew-init.el

* Tue Jun  5 2001 SATO Satoru <ssato at redhat.com>
- remove the Japanese messages
- fix Copyright term.
- clean up SPEC
- add mew-init.el
- BuildArch: noarch
- shorten lengthy description
- build for 7.2

* Tue Aug 29 2000 ISHIKAWA Mutsumi <ishikawa at redhat.com>
- fix License Term.
- adopt FHS
- built on RedHat 7.0

* Wed Jun  7 2000 Lisa Sagami <czs14350 at nifty.ne.jp>
- fix description: mess up with mule/emacs/xemacs...
- added BuildRequires and Conflicts

* Wed Apr 26 2000 Lisa Sagami <czs14350 at nifty.ne.jp>
- updated 1.94.2

* Wed Apr 26 2000 Lisa Sagami <czs14350 at nifty.ne.jp>
- added PreReq: /sbin/install-info
- attrib +x for /usr/bin/uumerge
- CFLAGS="$RPM_OPT_FLAGS"

* Fri Jan 07 2000 MATSUBAYASHI 'Shaolin' Kohji <shaolin at rins.st.ryukoku.ac.jp>
 - 1.94.1-2
 - changed destination to /usr/share/emacs/site-lisp/mew

* Sat Nov 27 1999 MATSUBAYASHI 'Shaolin' Kohji <shaolin at rins.st.ryukoku.ac.jp>
 - 1.94.1-1
 - updated in sync with 1.94.1 release
 - fixed %%post and %%preun section
 - Obsoletes: mew now changed to Obsoletes: mew-mule

* Fri Oct  8 1999 Yasushi Karino <kari-p at mc.kcom.ne.jp>
 - fixed info path & install info
 - fixed '%%description'

* Sat Oct  2 1999 Yasushi Karino <kari-p at mc.kcom.ne.jp>
 - removed extra packages
 - fixed char-set "euc" of the spec file.
 - slight modifications for Vine-1.9

* Wed Sep 29 1999 MATSUBAYASHI 'Shaolin' Kohji <shaolin at rins.st.ryukoku.ac.jp>
  - 1.94-3
  - package name changed from mew-emacs to mew
  - make info, make jinfo now processed even under emacs

* Thu Sep 16 1999 Ushio Tadaaki <t-ushio at fb3.so-net.ne.jp>
- Released as version "1.94-2".

Changed from "mew-emacs 1.94-1".
- Deleted "NoSource: 0", the definition part of data. 
- Revised some, the definition part of data. 
- Revised some, part of "%%post, %%postun".
- Changerd "%%postun" => "%%preun".

* Mon Sep  6 1999 Ushio Tadaaki <t-ushio at fb3.so-net.ne.jp>
- First release.


--- NEW FILE import.log ---
emacs-mew-6_2_50-1_fc11:F-10:emacs-mew-6.2.50-1.fc11.src.rpm:1233126122


--- NEW FILE mew-init.el ---
;; mew-init.el
;; Created: 2001-06-05
;;
;; see mew.el for more information

(autoload 'mew "mew" nil t)
(autoload 'mew-send "mew" nil t)

(and (or (featurep 'xemacs) (>= emacs-major-version 21))
	(defvar mew-icon-directory "/usr/share/pixmaps/Mew"))

;; (setq mew-icon-directory "/usr/share/pixmaps")

;; Optional setup (e.g. for C-xm):
;; (autoload 'mew-user-agent-compose "mew" nil t)
;;   (if (boundp 'mail-user-agent)
;;     (setq mail-user-agent 'mew-user-agent))
;;   (if (fboundp 'define-mail-user-agent)
;;     (define-mail-user-agent
;;            'mew-user-agent
;;            'mew-user-agent-compose
;;            'mew-draft-send-letter
;;            'mew-draft-kill
;;            'mew-send-hook))

;; Set your domain name when mew append garbage to the From: line
;; /etc/im/SiteConfig is also used to set this domain name.
(setq mew-mail-domain-list '("localhost"))

;; Set proper applications
(setq mew-prog-msword '("ooffice" nil t))
(setq mew-prog-msexcel '("ooffice" nil t))
(setq mew-prog-mspowerpoint '("ooffice" nil t))
(setq mew-prog-pdf '("evince" nil t))
(setq mew-prog-ssl "/usr/sbin/stunnel")



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/emacs-mew/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	28 Jan 2009 05:35:24 -0000	1.1
+++ .cvsignore	28 Jan 2009 07:03:19 -0000	1.2
@@ -0,0 +1 @@
+mew-6.2.50.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/emacs-mew/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	28 Jan 2009 05:35:24 -0000	1.1
+++ sources	28 Jan 2009 07:03:20 -0000	1.2
@@ -0,0 +1 @@
+0bdfcd96015486bda2a4ebb83659a45c  mew-6.2.50.tar.gz



From tagoh at fedoraproject.org  Wed Jan 28 07:06:24 2009
From: tagoh at fedoraproject.org (Akira TAGOH)
Date: Wed, 28 Jan 2009 07:06:24 +0000 (UTC)
Subject: rpms/mew/F-10 dead.package, NONE, 1.1 Makefile, 1.1, NONE branch,
	1.1, 
	NONE mew-5.2.50-missing-mode.patch, 1.1, NONE mew-init.el, 1.4,
	NONE mew.spec, 1.30, NONE sources, 1.16, NONE
Message-ID: <20090128070624.A2AE27010D@cvs1.fedora.phx.redhat.com>

Author: tagoh

Update of /cvs/pkgs/rpms/mew/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9121

Added Files:
	dead.package 
Removed Files:
	Makefile branch mew-5.2.50-missing-mode.patch mew-init.el 
	mew.spec sources 
Log Message:
This package has renamed to emacs-mew.


--- NEW FILE dead.package ---
This package has renamed to emacs-mew.


--- Makefile DELETED ---


--- branch DELETED ---


--- mew-5.2.50-missing-mode.patch DELETED ---


--- mew-init.el DELETED ---


--- mew.spec DELETED ---


--- sources DELETED ---



From tagoh at fedoraproject.org  Wed Jan 28 07:11:42 2009
From: tagoh at fedoraproject.org (Akira TAGOH)
Date: Wed, 28 Jan 2009 07:11:42 +0000 (UTC)
Subject: comps comps-f10.xml.in,1.210,1.211
Message-ID: <20090128071142.311207010D@cvs1.fedora.phx.redhat.com>

Author: tagoh

Update of /cvs/pkgs/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9762

Modified Files:
	comps-f10.xml.in 
Log Message:
renamed mew to emacs-mew.


Index: comps-f10.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f10.xml.in,v
retrieving revision 1.210
retrieving revision 1.211
diff -u -r1.210 -r1.211
--- comps-f10.xml.in	28 Jan 2009 05:45:36 -0000	1.210
+++ comps-f10.xml.in	28 Jan 2009 07:11:11 -0000	1.211
@@ -4564,7 +4564,7 @@
       <packagereq type="optional">irssi</packagereq>
       <packagereq type="optional">libtranslate</packagereq>
       <packagereq type="optional">lynx</packagereq>
-      <packagereq type="optional">mew</packagereq>
+      <packagereq type="optional">emacs-mew</packagereq>
       <packagereq type="optional">nail</packagereq>
       <packagereq type="optional">naim</packagereq>
       <packagereq type="optional">ncftp</packagereq>



From tagoh at fedoraproject.org  Wed Jan 28 07:13:14 2009
From: tagoh at fedoraproject.org (Akira TAGOH)
Date: Wed, 28 Jan 2009 07:13:14 +0000 (UTC)
Subject: rpms/emacs-mew/F-9 emacs-mew.spec, NONE, 1.1 import.log, NONE,
	1.1 mew-init.el, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090128071314.489017010D@cvs1.fedora.phx.redhat.com>

Author: tagoh

Update of /cvs/pkgs/rpms/emacs-mew/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10217/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	emacs-mew.spec import.log mew-init.el 
Log Message:
Initial import to F-9 branch for emacs-mew


--- NEW FILE emacs-mew.spec ---
%define _use_internal_dependency_generator 0
%define	srcver		6.2.50

%define	pkg		mew
%define	pkgname		Mew

%if %($(pkg-config emacs) ; echo $?)
%define	emacs_version	22.1
%define	emacs_lispdir	%{_datadir}/emacs/site-lisp
%define	emacs_startdir	%{_datadir}/emacs/site-lisp/site-start.d
%else
%define	emacs_version	%(pkg-config emacs --modversion)
%define	emacs_lispdir	%(pkg-config emacs --variable sitepkglispdir)
%define	emacs_startdir	%(pkg-config emacs --variable sitestartdir)
%endif

Name:			emacs-%{pkg}
Version:		6.2.50
Release:		1%{?dist}
Summary:		Email client for GNU Emacs

Group:			Applications/Internet
License:		BSD
URL:			http://www.mew.org/
#Source0:		ftp://ftp.mew.org/pub/Mew/mew-%{version}.tar.gz
#Source0:		http://www.mew.org/Release/mew-%{srcver}.tar.gz
Source0:		http://www.mew.org/Beta/mew-%{srcver}.tar.gz
Source1:		mew-init.el

BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:		emacs emacs-el
Requires:		emacs(bin) >= %{emacs_version}
Requires:		ruby(abi) = 1.8
Requires(post):		/sbin/install-info
Requires(preun):	/sbin/install-info
Provides:		mew = %{version}-%{release}, mew-common = %{version}-%{release}
Obsoletes:		mew < 6.2-1, mew-common < 6.2-1, mew-xemacs < 6.2-1

%description
Mew provides a very easy user interface to email, MIME and PGP
(Pretty Good Privacy) on the Emacs and the Editors derived from
the Emacs and so on.

%package el
Summary:		Elisp source files for %{pkgname} under GNU Emacs
Group:			Applications/Internet
Requires:		%{name} = %{version}-%{release}
Obsoletes:		mew < 6.2-1

%description el
This package contains the elisp source files for %{pkgname} under GNU Emacs. You
do not need to install this package to run %{pkgname}. Install the %{name}
package to use %{pkgname} with GNU Emacs.


%prep
%setup -q -n %{pkg}-%{srcver}

%build
%configure

%install
rm -rf $RPM_BUILD_ROOT

install -dm 0755 $RPM_BUILD_ROOT%{_bindir}
install -dm 0755 $RPM_BUILD_ROOT%{_infodir}
install -dm 0755 $RPM_BUILD_ROOT%{_datadir}/pixmaps
install -dm 0755 $RPM_BUILD_ROOT%{emacs_lispdir}
install -dm 0755 $RPM_BUILD_ROOT%{emacs_startdir}


#
make	prefix=%{_prefix} \
	CFLAGS="$RPM_OPT_FLAGS" \
	EMACS=/usr/bin/emacs \
	elispdir=%{emacs_lispdir}/%{pkg} \
	etcdir=%{_datadir}/pixmaps/Mew
make EMACS=/usr/bin/emacs infodir=%{_infodir} info
make EMACS=/usr/bin/emacs infodir=%{_infodir} jinfo

make install DESTDIR=$RPM_BUILD_ROOT \
	elispdir=%{emacs_lispdir}/%{pkg} \
	etcdir=%{_datadir}/pixmaps/Mew

make install-jinfo	\
	infodir=$RPM_BUILD_ROOT%{_infodir}

install -pm 0644 %{SOURCE1} \
	$RPM_BUILD_ROOT%{emacs_startdir}

# Fixed detect an invalid file dependent.
(cd $RPM_BUILD_DIR/%{pkg}-%{srcver}/contrib && \
	for i in *; do \
		sed -e s,/usr/local/bin/perl,/usr/bin/perl,g $i > $i.new && mv $i.new $i; \
	done \
)
chmod a-x $RPM_BUILD_DIR/%{pkg}-%{srcver}/contrib/*
# Update permissions
chmod 0755 $RPM_BUILD_ROOT%{_bindir}/*

# clean the unnecessary files
rm -f $RPM_BUILD_ROOT%{_infodir}/dir

%clean
rm -rf $RPM_BUILD_ROOT


%post
/sbin/install-info %{_infodir}/mew.info.gz \
	%{_infodir}/dir --section="Message User Agent" || :
/sbin/install-info %{_infodir}/mew.jis.info.gz \
	%{_infodir}/dir --section="Message User Agent" || :

%preun
if [ "$1" = 0 ]; then
  /sbin/install-info --delete %{_infodir}/mew.info.gz \
  	%{_infodir}/dir --section="Message User Agent" || :
  /sbin/install-info --delete %{_infodir}/mew.jis.info.gz \
  	%{_infodir}/dir --section="Message User Agent" || :
fi


%files 
%defattr (-, root, root, -)
%doc 00changes* 00copyright 00diff 00readme 00api mew.dot.emacs mew.dot.mew mew.dot.theme contrib/
%lang(ja) %doc 00copyright.jis
%{emacs_lispdir}/%{pkg}/*.elc
%{emacs_startdir}/*.el
%dir %{emacs_lispdir}/%{pkg}
%dir %{_datadir}/pixmaps/Mew
%{_bindir}/*
%{_datadir}/pixmaps/Mew/*
%{_infodir}/mew.info.gz
%{_infodir}/mew.info-*
%{_infodir}/mew.jis.info.gz
%{_infodir}/mew.jis.info-*
%{_mandir}/man1/*

%files el
%defattr(-, root, root, -)
%{emacs_lispdir}/%{pkg}/*.el

%changelog
* Wed Jan 28 2009 Akira TAGOH <tagoh at redhat.com> - 6.2.50-1
- New upstream release.

* Mon Jan 26 2009 Akira TAGOH <tagoh at redhat.com> - 6.2-4
- correct permissions for %%{_bindir}/*
- escape macro in changelog
- convert the spec file to utf-8.
- fix a warning on %%post and %%preun.

* Mon Jan 19 2009 Akira TAGOH <tagoh at redhat.com> - 6.2-3
- Add Obsoletes: mew-xemacs.

* Thu Jan 15 2009 Akira TAGOH <tagoh at redhat.com> - 6.2-2
- Add Provides: mew-common thing to emacs-mew.
- improve the spec file a bit.

* Wed Jan 14 2009 Akira TAGOH <tagoh at redhat.com> - 6.2-1
- New upstream release.
- upstream doesn't support xemacs anymore.
- make it as single package now.
- update summary.

* Fri Nov 21 2008 Akira TAGOH <tagoh at redhat.com> - 6.1.51-1
- New upstream release.

* 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.

* Wed May 28 2008 Akira TAGOH <tagoh at redhat.com> - 6.1-0.1.rc1
- New upstream release.

* Wed May 14 2008 Akira TAGOH <tagoh at redhat.com> - 6.0.51-1
- New upstream release.

* Thu Apr 17 2008 Akira TAGOH <tagoh at redhat.com> - 6.0.50-1
- New upstream release.

* Wed Apr  2 2008 Akira TAGOH <tagoh at redhat.com> - 5.2.55-1
- New upstream release.

* Wed Mar 19 2008 Akira TAGOH <tagoh at redhat.com> - 5.2.54-1
- New upstream release.

* Thu Feb 14 2008 Akira TAGOH <tagoh at redhat.com> - 5.2.53-1
- New upstream release.

* Tue Feb 12 2008 Akira TAGOH <tagoh at redhat.com> - 5.2.52-2
- Rebuild for gcc-4.3.

* Tue Jan  8 2008 Akira TAGOH <tagoh at redhat.com>
- Use evince instead of xpdf for displaying a pdf file.

* Wed Dec  5 2007 Akira TAGOH <tagoh at redhat.com> - 5.2.52-1
- New upstream release.

* Wed Oct 31 2007 Akira TAGOH <tagoh at redhat.com> - 5.2.51-1
- New upstream release.

* Thu Aug 23 2007 Akira TAGOH <tagoh at redhat.com> - 5.2.50-3
- Rebuild

* Mon Aug 13 2007 Akira TAGOH <tagoh at redhat.com> - 5.2.50-2
- Fix an open-missing-mode error.

* Thu Aug  9 2007 Akira TAGOH <tagoh at redhat.com>
- Update License tag.

* Fri Jul 27 2007 Akira TAGOH <tagoh at redhat.com> - 5.2.50-1
- New upstream release.

* Fri Mar  9 2007 Akira TAGOH <tagoh at redhat.com> - 5.2-3
- Rebuild

* Fri Feb  9 2007 Akira TAGOH <tagoh at redhat.com> - 5.2-2
- Remove all MIME handler definitions in mew-init.el so that it's no longer needed.

* Wed Feb  7 2007 Akira TAGOH <tagoh at redhat.com> - 5.2-1
- New upstream release.

* Tue Dec 19 2006 Akira TAGOh <tagoh at redhat.com> - 5.1-3
- makes it failsafe to run install-info. (#219402)

* Mon Sep 11 2006 Akira TAGOH <tagoh at redhat.com> - 5.1-2
- rebuilt
- add xemacs-packages-extra to BR and R.

* Wed Jul 19 2006 Akira TAGOH <tagoh at redhat.com> - 5.1-1
- New upstream release.
- mew-2.2-makefile.patch: removed.
- clean up the spec file a bit.
- mew-init.el: updated for the OpenDocument's MIME types.

* Thu Mar  2 2006 Akira TAGOH <tagoh at redhat.com> - 4.2-2
- rebuilt.

* Mon May 30 2005 Akira TAGOH <tagoh at redhat.com> - 4.2-1
- Updates to 4.2.
- import into Extras.

* Mon Nov 22 2004 Akira TAGOH <tagoh at redhat.com> - 4.1-1
- New upstream release.
  - improved IMAP support.
  - added the spam filter hook.
- mew-init.el: added the proper location for stunnel.

* Wed Oct  6 2004 Akira TAGOH <tagoh at redhat.com> - 3.3-4
- require emacs-common instead of emacs.
- require xemacs-common instead of xemacs.

* Mon Sep 27 2004 Akira TAGOH <tagoh at redhat.com> - 3.3-3
- rebuilt

* Fri Feb 13 2004 Elliot Lee <sopwith at redhat.com>
- rebuilt

* Tue Sep 02 2003 Akira TAGOH <tagoh at redhat.com> 3.3-1
- New upstream release.
- moved the install path to xemacs-packages.

* Fri Jun 27 2003 Akira TAGOH <tagoh at redhat.com> 3.2-5
- rebuild

* Wed Jun 04 2003 Elliot Lee <sopwith at redhat.com>
- rebuilt

* Fri May  9 2003 Akira TAGOH <tagoh at redhat.com> 3.2-3
- mew-init.el: add some MIME type for OpenOffice.org

* Thu Apr 03 2003 Akira TAGOH <tagoh at redhat.com> 3.2-2
- mew-init.el: use OpenOffice.org for MS documents.
- removed im. it's no longer used from Mew. (#85167)
- don't excludearch.

* Mon Mar 17 2003 Akira TAGOH <tagoh at redhat.com> 3.2-1
- New upstream release.
- mew-3.1-installinfo.patch: removed.

* Tue Feb  4 2003 Akira TAGOH <tagoh at redhat.com> 3.1-8
- build on x86_64 and ppc.

* Wed Jan 22 2003 Tim Powers <timp at redhat.com>
- rebuilt

* Fri Jan 10 2003 Akira TAGOH <tagoh at redhat.com> 3.1-6
- according to xemacs 21.4.11, moved the install path for elisp.
- add ExcludeArch alpha ia64 ppc. right now our xemacs doesn't support these arch.

* Mon Dec 16 2002 Akira TAGOH <tagoh at redhat.com> 3.1-5
- updates to im-143.

* Sat Dec 14 2002 Tim Powers <timp at redhat.com> 3.1-4
- don't use rpms internal dep generator

* Mon Dec  9 2002 Akira TAGOH <tagoh at redhat.com> 3.1-3
- updates to im-142
- im-141-securityfix.patch: removed.

* Fri Dec  6 2002 Akira TAGOH <tagoh at redhat.com> 3.1-2
- updates to im-141
- im-141-securityfix.patch: applied to fix a locally security issue.

* Wed Dec  4 2002 Akira TAGOH <tagoh at redhat.com> 3.1-1
- New upstream release.
- mew-3.1-installinfo.patch: applied to install mew.info-4.
- fix some missing files.
- use installvendorlib instead of installsitelib.
- ExcludeArch x86_64 until fix load-path issue on xemacs.

* Mon Jun 24 2002 Akira TAGOH <tagoh at redhat.com> 2.2-5
- fix the description. (Bug#65556)

* Fri Jun 21 2002 Tim Powers <timp at redhat.com>
- automated rebuild

* Thu May 23 2002 Tim Powers <timp at redhat.com>
- automated rebuild

* Wed Feb 27 2002 Akira TAGOH <tagoh at redhat.com> 2.2-2
- disable alpha because nothing is xemacs for alpha now.
- enable ia64.

* Wed Feb 27 2002 Akira TAGOH <tagoh at redhat.com> 2.2-1
- New upstream release.
- mew-2.2-makefile.patch: updates.

* Wed Jan 30 2002 Akira TAGOH <tagoh at redhat.com> 2.1-3
- merged im.

* Wed Jan 09 2002 Tim Powers <timp at redhat.com>
- automated rebuild

* Thu Nov  1 2001 Akira TAGOH <tagoh at redhat.com> 2.1-1
- New upstream release.

* Mon Oct 15 2001 Akira TAGOH <tagoh at redhat.com> 2.0-1
- New upstream release.
- Replaced the appropriate rpmmacros.
- Added package for xemacs.
- Split the common files of emacs and xemacs.

* Wed Oct  3 2001 Trond Eivind Glomsr??d <teg at redhat.com> 1.94.2-12
- Fix broken %%post script ("oops!" is not a binary)
- s/Copyright/License/
- Don't define version and release on top of the file, and then use these to set
  the header values. Once is enough.

* Tue Oct  2 2001 Jens Petersen <petersen at redhat.com>  1.94.2-11
- put localhost in mew-mail-domain-list (mew-init.el) to avoid startup error

* Fri Sep  7 2001 SATO Satoru <ssato at redhat.com>  1.94.2-10
- added the line for the missing files in %%files (#54235)

* Wed Jul 17 2001 SATO Satoru <ssato at redhat.com>  1.94.2-9
- s/Emacs\=emacs/Emacs\=\/usr\/bin\/emacs/

* Mon Jul 10 2001 SATO Satoru <ssato at redhat.com>
- fix the group (close #47279)
- BuildPrereq: emacs >= %%{emacsver}
- BuildRequires: emacs >= %%{emacsver}

* Mon Jun 25 2001 Bill Nottingham <notting at redhat.com>
- this is *not* a noarch package

* Mon Jun 25 2001 SATO Satoru <ssato at redhat.com>
- rebuild (mew-*.tar.bz was corrupted)
- modified mew-init.el

* Tue Jun  5 2001 SATO Satoru <ssato at redhat.com>
- remove the Japanese messages
- fix Copyright term.
- clean up SPEC
- add mew-init.el
- BuildArch: noarch
- shorten lengthy description
- build for 7.2

* Tue Aug 29 2000 ISHIKAWA Mutsumi <ishikawa at redhat.com>
- fix License Term.
- adopt FHS
- built on RedHat 7.0

* Wed Jun  7 2000 Lisa Sagami <czs14350 at nifty.ne.jp>
- fix description: mess up with mule/emacs/xemacs...
- added BuildRequires and Conflicts

* Wed Apr 26 2000 Lisa Sagami <czs14350 at nifty.ne.jp>
- updated 1.94.2

* Wed Apr 26 2000 Lisa Sagami <czs14350 at nifty.ne.jp>
- added PreReq: /sbin/install-info
- attrib +x for /usr/bin/uumerge
- CFLAGS="$RPM_OPT_FLAGS"

* Fri Jan 07 2000 MATSUBAYASHI 'Shaolin' Kohji <shaolin at rins.st.ryukoku.ac.jp>
 - 1.94.1-2
 - changed destination to /usr/share/emacs/site-lisp/mew

* Sat Nov 27 1999 MATSUBAYASHI 'Shaolin' Kohji <shaolin at rins.st.ryukoku.ac.jp>
 - 1.94.1-1
 - updated in sync with 1.94.1 release
 - fixed %%post and %%preun section
 - Obsoletes: mew now changed to Obsoletes: mew-mule

* Fri Oct  8 1999 Yasushi Karino <kari-p at mc.kcom.ne.jp>
 - fixed info path & install info
 - fixed '%%description'

* Sat Oct  2 1999 Yasushi Karino <kari-p at mc.kcom.ne.jp>
 - removed extra packages
 - fixed char-set "euc" of the spec file.
 - slight modifications for Vine-1.9

* Wed Sep 29 1999 MATSUBAYASHI 'Shaolin' Kohji <shaolin at rins.st.ryukoku.ac.jp>
  - 1.94-3
  - package name changed from mew-emacs to mew
  - make info, make jinfo now processed even under emacs

* Thu Sep 16 1999 Ushio Tadaaki <t-ushio at fb3.so-net.ne.jp>
- Released as version "1.94-2".

Changed from "mew-emacs 1.94-1".
- Deleted "NoSource: 0", the definition part of data. 
- Revised some, the definition part of data. 
- Revised some, part of "%%post, %%postun".
- Changerd "%%postun" => "%%preun".

* Mon Sep  6 1999 Ushio Tadaaki <t-ushio at fb3.so-net.ne.jp>
- First release.


--- NEW FILE import.log ---
emacs-mew-6_2_50-1_fc11:F-9:emacs-mew-6.2.50-1.fc11.src.rpm:1233126730


--- NEW FILE mew-init.el ---
;; mew-init.el
;; Created: 2001-06-05
;;
;; see mew.el for more information

(autoload 'mew "mew" nil t)
(autoload 'mew-send "mew" nil t)

(and (or (featurep 'xemacs) (>= emacs-major-version 21))
	(defvar mew-icon-directory "/usr/share/pixmaps/Mew"))

;; (setq mew-icon-directory "/usr/share/pixmaps")

;; Optional setup (e.g. for C-xm):
;; (autoload 'mew-user-agent-compose "mew" nil t)
;;   (if (boundp 'mail-user-agent)
;;     (setq mail-user-agent 'mew-user-agent))
;;   (if (fboundp 'define-mail-user-agent)
;;     (define-mail-user-agent
;;            'mew-user-agent
;;            'mew-user-agent-compose
;;            'mew-draft-send-letter
;;            'mew-draft-kill
;;            'mew-send-hook))

;; Set your domain name when mew append garbage to the From: line
;; /etc/im/SiteConfig is also used to set this domain name.
(setq mew-mail-domain-list '("localhost"))

;; Set proper applications
(setq mew-prog-msword '("ooffice" nil t))
(setq mew-prog-msexcel '("ooffice" nil t))
(setq mew-prog-mspowerpoint '("ooffice" nil t))
(setq mew-prog-pdf '("evince" nil t))
(setq mew-prog-ssl "/usr/sbin/stunnel")



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/emacs-mew/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	28 Jan 2009 05:35:24 -0000	1.1
+++ .cvsignore	28 Jan 2009 07:12:43 -0000	1.2
@@ -0,0 +1 @@
+mew-6.2.50.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/emacs-mew/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	28 Jan 2009 05:35:24 -0000	1.1
+++ sources	28 Jan 2009 07:12:43 -0000	1.2
@@ -0,0 +1 @@
+0bdfcd96015486bda2a4ebb83659a45c  mew-6.2.50.tar.gz



From tagoh at fedoraproject.org  Wed Jan 28 07:14:37 2009
From: tagoh at fedoraproject.org (Akira TAGOH)
Date: Wed, 28 Jan 2009 07:14:37 +0000 (UTC)
Subject: rpms/mew/F-9 dead.package, NONE, 1.1 Makefile, 1.1, NONE branch, 1.1,
	NONE mew-5.2.50-missing-mode.patch, 1.1, NONE mew-init.el, 1.4,
	NONE mew.spec, 1.27, NONE sources, 1.13, NONE
Message-ID: <20090128071437.482D37010D@cvs1.fedora.phx.redhat.com>

Author: tagoh

Update of /cvs/pkgs/rpms/mew/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10536

Added Files:
	dead.package 
Removed Files:
	Makefile branch mew-5.2.50-missing-mode.patch mew-init.el 
	mew.spec sources 
Log Message:
This package has renamed to emacs-mew.


--- NEW FILE dead.package ---
This package has renamed to emacs-mew.


--- Makefile DELETED ---


--- branch DELETED ---


--- mew-5.2.50-missing-mode.patch DELETED ---


--- mew-init.el DELETED ---


--- mew.spec DELETED ---


--- sources DELETED ---



From markmc at fedoraproject.org  Wed Jan 28 07:50:56 2009
From: markmc at fedoraproject.org (Mark McLoughlin)
Date: Wed, 28 Jan 2009 07:50:56 +0000 (UTC)
Subject: rpms/kernel/devel config-generic, 1.229, 1.230 kernel.spec, 1.1238, 
	1.1239
Message-ID: <20090128075056.A10657010D@cvs1.fedora.phx.redhat.com>

Author: markmc

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17689

Modified Files:
	config-generic kernel.spec 
Log Message:
* Wed Jan 28 2009 Mark McLoughlin <markmc at redhat.com>
- Enable CONFIG_PCI_STUB for KVM (#482792)



Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-generic,v
retrieving revision 1.229
retrieving revision 1.230
diff -u -r1.229 -r1.230
--- config-generic	27 Jan 2009 04:47:26 -0000	1.229
+++ config-generic	28 Jan 2009 07:50:25 -0000	1.230
@@ -77,7 +77,7 @@
 #
 CONFIG_PCI=y
 # CONFIG_PCI_DEBUG is not set
-# CONFIG_PCI_STUB is not set
+CONFIG_PCI_STUB=y
 CONFIG_HT_IRQ=y
 CONFIG_PCI_MSI=y
 CONFIG_PCIEPORTBUS=y


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1238
retrieving revision 1.1239
diff -u -r1.1238 -r1.1239
--- kernel.spec	28 Jan 2009 04:51:37 -0000	1.1238
+++ kernel.spec	28 Jan 2009 07:50:25 -0000	1.1239
@@ -1772,6 +1772,9 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Wed Jan 28 2009 Mark McLoughlin <markmc at redhat.com>
+- Enable CONFIG_PCI_STUB for KVM (#482792)
+
 * Tue Jan 27 2009 Jarod Wilson <jarod at redhat.com>
 - Tell hiddev to leave antec-branded imon display/ir devices alone
 



From till at fedoraproject.org  Wed Jan 28 08:17:29 2009
From: till at fedoraproject.org (Till Maas)
Date: Wed, 28 Jan 2009 08:17:29 +0000 (UTC)
Subject: rpms/pam_mount/devel .cvsignore, 1.19, 1.20 pam_mount.spec, 1.49,
	1.50 sources, 1.20, 1.21 pam_mount-1.4-fsck.patch, 1.1, NONE
Message-ID: <20090128081729.ABC7F7010D@cvs1.fedora.phx.redhat.com>

Author: till

Update of /cvs/pkgs/rpms/pam_mount/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21395

Modified Files:
	.cvsignore pam_mount.spec sources 
Removed Files:
	pam_mount-1.4-fsck.patch 
Log Message:
Update to new release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pam_mount/devel/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- .cvsignore	27 Nov 2008 14:44:11 -0000	1.19
+++ .cvsignore	28 Jan 2009 08:16:59 -0000	1.20
@@ -1,2 +1,2 @@
-pam_mount-1.4.tar.lz
-pam_mount-1.4.tar.lz.asc
+pam_mount-1.9.tar.bz2
+pam_mount-1.9.tar.bz2.asc


Index: pam_mount.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pam_mount/devel/pam_mount.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- pam_mount.spec	17 Jan 2009 16:37:12 -0000	1.49
+++ pam_mount.spec	28 Jan 2009 08:16:59 -0000	1.50
@@ -1,6 +1,8 @@
+%define packext bz2
+
 Name:           pam_mount
-Version:        1.4
-Release:        2%{?dist}
+Version:        1.9
+Release:        1%{?dist}
 Summary:        A PAM module that can mount volumes for a user session
 
 Group:          System Environment/Base
@@ -9,18 +11,20 @@
 # mount.encfs13 and pmt-ofl are Public Domain
 License:        LGPLv2+ and (LGPLv2 or LGPLv3) and Public Domain
 URL:            http://pam-mount.sourceforge.net/
-Source0:        http://downloads.sourceforge.net/pam-mount/%{name}-%{version}.tar.lz
-Source1:        http://downloads.sourceforge.net/pam-mount/%{name}-%{version}.tar.lz.asc
-# From upstream scm:
-Patch0:         pam_mount-1.4-fsck.patch
+Source0:        http://downloads.sourceforge.net/pam-mount/%{name}-%{version}.tar.%{packext}
+Source1:        http://downloads.sourceforge.net/pam-mount/%{name}-%{version}.tar.%{packext}.asc
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  glib2-devel, pam-devel, openssl-devel
 BuildRequires:  libxml2-devel
-BuildRequires:  libHX-devel >= 1.25
+BuildRequires:  libHX-devel >= 2.2
 BuildRequires:  lzip
 Requires:       pam
-Requires:       libHX >= 1.25
+
+# for /etc/catalog and xmlcatalog
+#Requires:         xml-common
+#Requires(post):   xml-common libxml2
+#Requires(postun): xml-common libxml2
 
 
 %description
@@ -43,13 +47,16 @@
 
 
 %prep
+%if %packext == lz
 %setup -q -T -c
 lzip -c -d %SOURCE0 | tar -xvvf - -C ..
-%patch0 -p1 -b .fsck
+%else
+%setup -q
+%endif
 
 
 %build
-%configure --with-slibdir=/%{_lib}
+%configure --with-slibdir=/%{_lib} --with-dtd
 make %{?_smp_mflags} V=verbose
 
 
@@ -65,6 +72,16 @@
 rm -rf $RPM_BUILD_ROOT
 
 
+#%post
+#/usr/bin/xmlcatalog --noout --add "rewriteSystem" "http://dev.medozas.de/gitweb.cgi?p=pam_mount;a=blob_plain;hb=HEAD;f=config/pam_mount.conf.xml.dtd" file://%{_datadir}/xml/pam_mount/dtds/pam_mount.conf.xml.dtd %{_sysconfdir}/xml/catalog &> /dev/null || :
+
+
+#%postun
+#if [ $1 = 0 ]; then
+#/usr/bin/xmlcatalog --noout --del file://%{_datadir}/xml/pam_mount/dtds/pam_mount.conf.xml.dtd %{_sysconfdir}/catalog
+#fi
+
+
 %files
 %defattr(-,root,root,-)
 %doc doc/bugs.txt doc/changelog.txt doc/faq.txt doc/options.txt doc/pam_mount.txt doc/todo.txt
@@ -86,9 +103,18 @@
 /sbin/umount.crypto_LUKS
 %{_mandir}/man?/*
 %{_localstatedir}/run/pam_mount
+%dir %{_datadir}/xml/pam_mount/
+%dir %{_datadir}/xml/pam_mount/dtd/
+%{_datadir}/xml/pam_mount/dtd/pam_mount.conf.xml.dtd
 
 
 %changelog
+* Wed Jan 28 2009 Till Maas <opensource at till.name> - 1.9-1
+- Update to new release
+
+* Tue Jan 20 2009 Till Maas <opensource at till.name> - 1.8-1
+- Update to new release
+
 * Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> - 1.4-2
 - rebuild with new openssl
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pam_mount/devel/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources	27 Nov 2008 14:44:11 -0000	1.20
+++ sources	28 Jan 2009 08:16:59 -0000	1.21
@@ -1,2 +1,2 @@
-0868825d438d80697ee03d020e5fa90f  pam_mount-1.4.tar.lz
-63fa0f99b2ee011b03528a3be2fef1f0  pam_mount-1.4.tar.lz.asc
+59980ad2f5037e8f56f9410238f6c972  pam_mount-1.9.tar.bz2
+ecd792a06cbef1397433e31729b9032d  pam_mount-1.9.tar.bz2.asc


--- pam_mount-1.4-fsck.patch DELETED ---



From madko at fedoraproject.org  Wed Jan 28 08:26:04 2009
From: madko at fedoraproject.org (Edouard Bourguignon)
Date: Wed, 28 Jan 2009 08:26:04 +0000 (UTC)
Subject: rpms/purple-msn-pecan/F-9 import.log, NONE,
	1.1 purple-msn-pecan.spec, 
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090128082604.B37C87010D@cvs1.fedora.phx.redhat.com>

Author: madko

Update of /cvs/pkgs/rpms/purple-msn-pecan/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23473/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	import.log purple-msn-pecan.spec 
Log Message:
Initial RPM release




--- NEW FILE import.log ---
purple-msn-pecan-0_0_17-4_fc10:F-9:purple-msn-pecan-0.0.17-4.fc10.src.rpm:1233131097


--- NEW FILE purple-msn-pecan.spec ---
%define		realname msn-pecan
Name:		purple-%{realname}
Version:	0.0.17
Release:	4%{?dist}
Summary:	Alternative MSN protocol plugin for libpurple 

Group:		Applications/Internet 
License:	GPLv2+
URL:		http://code.google.com/p/msn-pecan/ 
Source0:	http://msn-pecan.googlecode.com/files/%{realname}-%{version}.tar.bz2
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	libpurple-devel 
BuildRequires:	gettext
BuildRequires:	check-devel


%description
The project aims to have a much faster development process, low barrier for
contributions, and close contact with the user-base.

Features include:

	* Support for personal messages
	* Server-side storage for display names (private alias)
	* Partial direct connection support
	* Improved network IO
	* Improved error handling
	* Network issues tested with netem
	* GObject usage 


%prep
%setup -q -n %{realname}-%{version}


%build
make CFLAGS="%{optflags}" %{?_smp_mflags} V=yes


%install
rm -rf $RPM_BUILD_ROOT
install -Dp -m 755 libmsn-pecan.so $RPM_BUILD_ROOT/%{_libdir}/purple-2/libmsn-pecan.so
make install_locales DESTDIR=$RPM_BUILD_ROOT
%find_lang libmsn-pecan 


%check
cd tests
make clean
make


%clean
rm -rf $RPM_BUILD_ROOT


%files -f libmsn-pecan.lang
%defattr(-, root, root, -)
%doc AUTHORS COPYING TODO README COPYRIGHT ChangeLog
%{_libdir}/purple-2/libmsn-pecan.so


%changelog
* Mon Jan 19 2009 Edouard Bourguignon <madko at linuxed.net> - 0.0.17-4
- Remove DEBUG make option
- V=1 changed to V=yes

* Sun Jan 18 2009 Edouard Bourguignon <madko at linuxed.net> - 0.0.17-3
- Add a check section
- Add make options V=1 DEBUG=1 to make build logs more verbose and debuginfo more usefull 

* Sun Jan 18 2009 Edouard Bourguignon <madko at linuxed.net> - 0.0.17-2
- Cosmetic fix about realname macro (added in Name item)
- Change license tag from GPLv2 to GPLv2+
- Add missing doc files
- Add translation files

* Wed Jan 14 2009 Edouard Bourguignon <madko at linuxed.net> - 0.0.17-1
- Upgrade to upstream version (0.0.17)
- Requires pidgin removed

* Fri Jun 13 2008 Edouard Bourguignon <edouard.bourguignon at oxalya.com> - 0.0.13-1
- Initial version


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/purple-msn-pecan/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	26 Jan 2009 22:53:17 -0000	1.1
+++ .cvsignore	28 Jan 2009 08:25:34 -0000	1.2
@@ -0,0 +1 @@
+msn-pecan-0.0.17.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/purple-msn-pecan/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	26 Jan 2009 22:53:17 -0000	1.1
+++ sources	28 Jan 2009 08:25:34 -0000	1.2
@@ -0,0 +1 @@
+d0539f835d02c94774d06a7877e575ac  msn-pecan-0.0.17.tar.bz2



From till at fedoraproject.org  Wed Jan 28 08:32:31 2009
From: till at fedoraproject.org (Till Maas)
Date: Wed, 28 Jan 2009 08:32:31 +0000 (UTC)
Subject: rpms/pam_mount/devel pam_mount.spec,1.50,1.51
Message-ID: <20090128083231.3CEF77010D@cvs1.fedora.phx.redhat.com>

Author: till

Update of /cvs/pkgs/rpms/pam_mount/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24598

Modified Files:
	pam_mount.spec 
Log Message:
* Wed Jan 28 2009 Till Maas <opensource at till.name> - 1.17-1
- Update to new release



Index: pam_mount.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pam_mount/devel/pam_mount.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- pam_mount.spec	28 Jan 2009 08:16:59 -0000	1.50
+++ pam_mount.spec	28 Jan 2009 08:32:00 -0000	1.51
@@ -1,7 +1,7 @@
 %define packext bz2
 
 Name:           pam_mount
-Version:        1.9
+Version:        1.17
 Release:        1%{?dist}
 Summary:        A PAM module that can mount volumes for a user session
 
@@ -109,6 +109,9 @@
 
 
 %changelog
+* Wed Jan 28 2009 Till Maas <opensource at till.name> - 1.17-1
+- Update to new release
+
 * Wed Jan 28 2009 Till Maas <opensource at till.name> - 1.9-1
 - Update to new release
 



From till at fedoraproject.org  Wed Jan 28 08:42:26 2009
From: till at fedoraproject.org (Till Maas)
Date: Wed, 28 Jan 2009 08:42:26 +0000 (UTC)
Subject: rpms/pam_mount/devel .cvsignore,1.20,1.21 sources,1.21,1.22
Message-ID: <20090128084226.2C9D47010D@cvs1.fedora.phx.redhat.com>

Author: till

Update of /cvs/pkgs/rpms/pam_mount/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25908

Modified Files:
	.cvsignore sources 
Log Message:
* Wed Jan 28 2009 Till Maas <opensource at till.name> - 1.17-1
- Update to new release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pam_mount/devel/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- .cvsignore	28 Jan 2009 08:16:59 -0000	1.20
+++ .cvsignore	28 Jan 2009 08:41:55 -0000	1.21
@@ -1,2 +1,2 @@
-pam_mount-1.9.tar.bz2
-pam_mount-1.9.tar.bz2.asc
+pam_mount-1.17.tar.bz2
+pam_mount-1.17.tar.bz2.asc


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pam_mount/devel/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sources	28 Jan 2009 08:16:59 -0000	1.21
+++ sources	28 Jan 2009 08:41:55 -0000	1.22
@@ -1,2 +1,2 @@
-59980ad2f5037e8f56f9410238f6c972  pam_mount-1.9.tar.bz2
-ecd792a06cbef1397433e31729b9032d  pam_mount-1.9.tar.bz2.asc
+6d975a3e5614967410a61fa9747118d2  pam_mount-1.17.tar.bz2
+c2275026821d4e7664ccdf6da69f5117  pam_mount-1.17.tar.bz2.asc



From ovasik at fedoraproject.org  Wed Jan 28 09:21:39 2009
From: ovasik at fedoraproject.org (Ondrej Vasik)
Date: Wed, 28 Jan 2009 09:21:39 +0000 (UTC)
Subject: rpms/star/devel star-1.5-removenames_c.patch, NONE, 1.1 .cvsignore, 
	1.20, 1.21 sources, 1.21, 1.22 star.spec, 1.44, 1.45
Message-ID: <20090128092139.76D8D70141@cvs1.fedora.phx.redhat.com>

Author: ovasik

Update of /cvs/extras/rpms/star/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31662

Modified Files:
	.cvsignore sources star.spec 
Added Files:
	star-1.5-removenames_c.patch 
Log Message:
remove names.c requirements from non-fat Makefiles, do not ship names.c separately (#255261 for details)

star-1.5-removenames_c.patch:

--- NEW FILE star-1.5-removenames_c.patch ---
diff -urNp star-1.5-orig/star/cpio.mk star-1.5/star/cpio.mk
--- star-1.5-orig/star/cpio.mk	2009-01-28 09:46:18.000000000 +0100
+++ star-1.5/star/cpio.mk	2009-01-28 09:47:00.000000000 +0100
@@ -25,7 +25,7 @@ CFILES=		cpio.c header.c cpiohdr.c xhead
 		list.c extract.c create.c append.c diff.c restore.c \
 		remove.c star_unix.c acl_unix.c acltext.c fflags.c \
 		buffer.c dirtime.c lhash.c \
-		hole.c longnames.c names.c \
+		hole.c longnames.c \
 		movearch.c table.c props.c \
 		unicode.c \
 		subst.c volhdr.c \
diff -urNp star-1.5-orig/star/gnutar.mk star-1.5/star/gnutar.mk
--- star-1.5-orig/star/gnutar.mk	2009-01-28 09:46:18.000000000 +0100
+++ star-1.5/star/gnutar.mk	2009-01-28 09:47:13.000000000 +0100
@@ -25,7 +25,7 @@ CFILES=		gnutar.c header.c cpiohdr.c xhe
 		list.c extract.c create.c append.c diff.c restore.c \
 		remove.c star_unix.c acl_unix.c acltext.c fflags.c \
 		buffer.c dirtime.c lhash.c \
-		hole.c longnames.c names.c \
+		hole.c longnames.c \
 		movearch.c table.c props.c \
 		unicode.c \
 		subst.c volhdr.c \
diff -urNp star-1.5-orig/star/pax.mk star-1.5/star/pax.mk
--- star-1.5-orig/star/pax.mk	2009-01-28 09:46:18.000000000 +0100
+++ star-1.5/star/pax.mk	2009-01-28 09:47:32.000000000 +0100
@@ -26,7 +26,7 @@ CFILES=		pax.c header.c cpiohdr.c xheade
 		list.c extract.c create.c append.c diff.c restore.c \
 		remove.c star_unix.c acl_unix.c acltext.c fflags.c \
 		buffer.c dirtime.c lhash.c \
-		hole.c longnames.c names.c \
+		hole.c longnames.c \
 		movearch.c table.c props.c \
 		unicode.c \
 		subst.c volhdr.c \
diff -urNp star-1.5-orig/star/star.mk star-1.5/star/star.mk
--- star-1.5-orig/star/star.mk	2009-01-28 09:46:18.000000000 +0100
+++ star-1.5/star/star.mk	2009-01-28 09:49:05.000000000 +0100
@@ -26,7 +26,7 @@ CFILES=		star.c header.c cpiohdr.c xhead
 		list.c extract.c create.c append.c diff.c restore.c \
 		remove.c star_unix.c acl_unix.c acltext.c fflags.c \
 		buffer.c dirtime.c lhash.c \
-		hole.c longnames.c names.c \
+		hole.c longnames.c \
 		movearch.c table.c props.c \
 		unicode.c \
 		subst.c volhdr.c \
diff -urNp star-1.5-orig/star/suntar.mk star-1.5/star/suntar.mk
--- star-1.5-orig/star/suntar.mk	2009-01-28 09:46:18.000000000 +0100
+++ star-1.5/star/suntar.mk	2009-01-28 09:51:01.000000000 +0100
@@ -25,7 +25,7 @@ CFILES=		suntar.c header.c cpiohdr.c xhe
 		list.c extract.c create.c append.c diff.c restore.c \
 		remove.c star_unix.c acl_unix.c acltext.c fflags.c \
 		buffer.c dirtime.c lhash.c \
-		hole.c longnames.c names.c \
+		hole.c longnames.c \
 		movearch.c table.c props.c \
 		unicode.c \
 		subst.c volhdr.c \


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/star/devel/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- .cvsignore	27 Jan 2009 19:51:19 -0000	1.20
+++ .cvsignore	28 Jan 2009 09:21:08 -0000	1.21
@@ -1,2 +1 @@
-names.c
 star-1.5.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/star/devel/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sources	27 Jan 2009 19:51:20 -0000	1.21
+++ sources	28 Jan 2009 09:21:09 -0000	1.22
@@ -1,3 +1 @@
 a7b1a5e830935cc1bf1001a558c7f8c4  star-1.5.tar.bz2
-2ec266cafd989a1160ecbcada1de839b  names.c
-


Index: star.spec
===================================================================
RCS file: /cvs/extras/rpms/star/devel/star.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- star.spec	27 Jan 2009 19:51:20 -0000	1.44
+++ star.spec	28 Jan 2009 09:21:09 -0000	1.45
@@ -4,14 +4,13 @@
 Summary:  An archiving tool with ACL support
 Name: star
 Version: 1.5
-Release: 1%{?dist}
+Release: 2%{?dist}
 URL: http://cdrecord.berlios.de/old/private/star.html
 Source: ftp://ftp.berlios.de/pub/star/%{name}-%{version}.tar.bz2
-#names.c dissapeared from upstream tarball, but is necessary for build
-Source1: names.c
 Patch1: star-1.5-newMake.patch
 Patch2: star-1.5-selinux.patch
 Patch3: star-1.5-changewarnSegv.patch
+Patch4: star-1.5-removenames_c.patch
 License: CDDL
 Group: Applications/Archiving
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
@@ -29,8 +28,7 @@
 %patch2 -p1 -b .selinux
 %endif
 %patch3 -p1 -b .changewarnSegv
-cp -a %{SOURCE1} ./libfind/
-cp -a %{SOURCE1} ./star/
+%patch4 -p1 -b .removenames
 
 for PLAT in %{arm} x86_64 ppc64 s390 s390x sh3 sh4 sh4a sparcv9; do
         for AFILE in gcc cc; do
@@ -102,6 +100,9 @@
 %{_mandir}/man1/spax.1*
 
 %changelog
+* Wed Jan 28 2009 Ondrej Vasik <ovasik at redhat.com> 1.5-2
+- remove names.c requirements from non-fat Makefiles,
+  do not ship names.c (#255261 for details)
 * Tue Jan 27 2009 Ondrej Vasik <ovasik at redhat.com> 1.5-1
 - use final instead of beta
 - ship missing names.c separately



From pkgdb at fedoraproject.org  Wed Jan 28 09:29:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Jan 2009 09:29:44 +0000
Subject: [pkgdb] javassist ownership updated
Message-ID: <20090128092944.31F1F208484@bastion.fedora.phx.redhat.com>

Package javassist in Fedora devel is now owned by john5342

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/javassist



From pkgdb at fedoraproject.org  Wed Jan 28 09:29:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Jan 2009 09:29:53 +0000
Subject: [pkgdb] javassist ownership updated
Message-ID: <20090128092953.0A473208493@bastion.fedora.phx.redhat.com>

Package javassist in Fedora 10 is now owned by john5342

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/javassist



From pkgdb at fedoraproject.org  Wed Jan 28 09:29:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Jan 2009 09:29:56 +0000
Subject: [pkgdb] javassist ownership updated
Message-ID: <20090128092956.D70EC208494@bastion.fedora.phx.redhat.com>

Package javassist in Fedora 9 is now owned by john5342

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/javassist



From drago01 at fedoraproject.org  Wed Jan 28 09:44:26 2009
From: drago01 at fedoraproject.org (Adel Gadllah)
Date: Wed, 28 Jan 2009 09:44:26 +0000 (UTC)
Subject: rpms/compiz/devel compiz-0.7.8-kde42-crash.patch, NONE,
	1.1 compiz-0.7.8-kde42-krunner.patch, NONE, 1.1 compiz.spec,
	1.154, 1.155
Message-ID: <20090128094426.BEC597010D@cvs1.fedora.phx.redhat.com>

Author: drago01

Update of /cvs/pkgs/rpms/compiz/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2947

Modified Files:
	compiz.spec 
Added Files:
	compiz-0.7.8-kde42-crash.patch 
	compiz-0.7.8-kde42-krunner.patch 
Log Message:
Backport some KDE-4.2 fixes from upstream

compiz-0.7.8-kde42-crash.patch:

--- NEW FILE compiz-0.7.8-kde42-crash.patch ---
Implement KDecorationBridge unstable API, needed for KDE 4.2.
---

diff --git a/kde/window-decorator-kde4/window.cpp b/kde/window-decorator-kde4/window.cpp
index d2d362b..68c856b 100644
--- a/kde/window-decorator-kde4/window.cpp
+++ b/kde/window-decorator-kde4/window.cpp
@@ -764,6 +764,31 @@ KWD::Window::grabXServer (bool)
 }
 
 void
+KWD::Window::repaintShadow (void)
+{
+}
+
+bool
+KWD::Window::compositingActive (void) const
+{
+    return true;
+}
+
+bool
+KWD::Window::shadowsActive (void) const
+{
+    /* we are drawing the shadows ourselves, no need for the
+       decoration engine to do so */
+    return false;
+}
+
+double
+KWD::Window::opacity (void) const
+{
+    return 1.0;
+}
+
+void
 KWD::Window::createDecoration (void)
 {
     KDecoration *decor;
diff --git a/kde/window-decorator-kde4/window.h b/kde/window-decorator-kde4/window.h
index bdf2c47..034e6fe 100644
--- a/kde/window-decorator-kde4/window.h
+++ b/kde/window-decorator-kde4/window.h
@@ -45,7 +45,7 @@ class QMenu;
 
 namespace KWD
 {
-class Window:public QWidget, public KDecorationBridge {
+class Window:public QWidget, public KDecorationBridgeUnstable {
     Q_OBJECT public:
 
 	enum Type
@@ -104,6 +104,12 @@ class Window:public QWidget, public KDecorationBridge {
 	virtual Qt::WFlags initialWFlags (void) const;
 	virtual void grabXServer (bool grab);
 
+	/* unstable API */
+	virtual void repaintShadow ();
+	virtual bool compositingActive () const;
+	virtual bool shadowsActive () const;
+	virtual double opacity () const;
+
 	void handleActiveChange (void);
 	void updateFrame (WId frame);
 	void updateWindowGeometry (void);


compiz-0.7.8-kde42-krunner.patch:

--- NEW FILE compiz-0.7.8-kde42-krunner.patch ---
diff --git a/kde/window-decorator-kde4/decorator.cpp b/kde/window-decorator-kde4/decorator.cpp
index 96b818d..0bf4718 100644
--- a/kde/window-decorator-kde4/decorator.cpp
+++ b/kde/window-decorator-kde4/decorator.cpp
@@ -649,9 +649,10 @@ KWD::Decorator::x11EventFilter (XEvent *xevent)
 	    }
 	    else if (action == Atoms::toolkitActionRunDialogAtom)
 	    {
-		QDBusInterface krunner ("org.kde.krunner", "/Interface",
-					"org.kde.krunner.Interface");
-		krunner.call ("display", "");
+		QDBusInterface krunner ("org.kde.krunner", "/App",
+					"org.kde.krunner.App");
+		if (krunner.isValid ())
+		    krunner.call ("display");
 	    }
 	    else if (action == Atoms::toolkitActionForceQuitDialogAtom)
 	    {



Index: compiz.spec
===================================================================
RCS file: /cvs/pkgs/rpms/compiz/devel/compiz.spec,v
retrieving revision 1.154
retrieving revision 1.155
diff -u -r1.154 -r1.155
--- compiz.spec	27 Jan 2009 21:16:13 -0000	1.154
+++ compiz.spec	28 Jan 2009 09:43:55 -0000	1.155
@@ -14,7 +14,7 @@
 License:        GPLv2+ and LGPLv2+ and MIT
 Group:          User Interface/Desktops
 Version:        0.7.8
-Release:        11%{?dist}
+Release:        12%{?dist}
 
 Summary:        OpenGL window and compositing manager
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -80,6 +80,12 @@
 # Make the terminal keybinding work (RH #439665)
 Patch125: compiz-0.7.8-gnome-terminal.patch
 
+# KDE-4.2 fixes from upstream:
+# 814809ffffe47f829b784f7bd246026bfcdecf0f
+Patch126: compiz-0.7.8-kde42-crash.patch
+# 4cc1d813a9748c3740662233a2add3fe65a4c533
+Patch127: compiz-0.7.8-kde42-krunner.patch
+
 %description
 Compiz is one of the first OpenGL-accelerated compositing window
 managers for the X Window System. The integration allows it to perform
@@ -164,6 +170,8 @@
 %patch123 -p1 -b .initial-plugins
 %patch124 -p1 -b .mem-leaks
 %patch125 -p1 -b .terminal
+%patch126 -p1 -b .kde-crash
+%patch127 -p1 -b .krunner
 
 %build
 rm -rf $RPM_BUILD_ROOT
@@ -380,6 +388,9 @@
 
 
 %changelog
+* Wed Jan 28 2009 Adel Gadllah <adel.gadllah at gmail.com> - 0.7.8-12
+- Backport some KDE-4.2 fixes from upstream
+
 * Tue Jan 27 2009 Adel Gadllah <adel.gadllah at gmail.com> - 0.7.8-11
 - Make the terminal keybinding work (RH #439665)
 



From mmaslano at fedoraproject.org  Wed Jan 28 09:47:09 2009
From: mmaslano at fedoraproject.org (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?=)
Date: Wed, 28 Jan 2009 09:47:09 +0000 (UTC)
Subject: rpms/anacron/devel anacron.init,1.21,1.22 anacron.spec,1.55,1.56
Message-ID: <20090128094709.34F3F7010D@cvs1.fedora.phx.redhat.com>

Author: mmaslano

Update of /cvs/pkgs/rpms/anacron/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3519

Modified Files:
	anacron.init anacron.spec 
Log Message:
* Thr Jan 28 2009 Marcela Ma??l????ov?? <mmaslano at redhat.com> 2.3-67
- 482782 output in init script redirected



Index: anacron.init
===================================================================
RCS file: /cvs/pkgs/rpms/anacron/devel/anacron.init,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- anacron.init	26 Jan 2009 09:25:53 -0000	1.21
+++ anacron.init	28 Jan 2009 09:46:38 -0000	1.22
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Startup script for anacron
 #
-# chkconfig: 2345 95 05
+# chkconfig: - 95 05
 # description: Run cron jobs that were left out due to downtime
 # pidfile: /var/run/anacron.pid
 #
@@ -26,7 +26,7 @@
     echo -n $"Starting $prog: " 
     # on_ac_power doesn't exist, on_ac_power returns 0 (ac power being used)
     if [ -x /usr/bin/on_ac_power ]; then
-        /usr/bin/on_ac_power > /dev/null
+        /usr/bin/on_ac_power > /dev/null 2>&1
         if [ $? -eq 1 ]; then
             echo "deferred while on battery power."
             RETVAL=0


Index: anacron.spec
===================================================================
RCS file: /cvs/pkgs/rpms/anacron/devel/anacron.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- anacron.spec	26 Jan 2009 09:25:53 -0000	1.55
+++ anacron.spec	28 Jan 2009 09:46:38 -0000	1.56
@@ -1,7 +1,7 @@
 Summary: A cron-like program that can run jobs lost during downtime
 Name: anacron
 Version: 2.3
-Release: 66%{?dist}
+Release: 67%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 URL: http://packages.debian.org/stable/source/anacron
@@ -116,6 +116,9 @@
 #%dir /etc/cron.monthly/0anacron
 
 %changelog
+* Thr Jan 28 2009 Marcela Ma??l????ov?? <mmaslano at redhat.com> 2.3-67
+- 482782 output in init script redirected
+
 * Mon Jan 26 2009 Marcela Ma??l????ov?? <mmaslano at redhat.com> 2.3-66
 - cron.{daily,weekly,hourly,monthly} should be owned by crontabs, because
 	some don't have installed anacron and other cron like programmes could



From drago01 at fedoraproject.org  Wed Jan 28 09:47:24 2009
From: drago01 at fedoraproject.org (Adel Gadllah)
Date: Wed, 28 Jan 2009 09:47:24 +0000 (UTC)
Subject: rpms/compiz/F-10 compiz-0.7.8-kde42-crash.patch, NONE,
	1.1 compiz-0.7.8-kde42-krunner.patch, NONE, 1.1 compiz.spec,
	1.145, 1.146
Message-ID: <20090128094724.491837010D@cvs1.fedora.phx.redhat.com>

Author: drago01

Update of /cvs/pkgs/rpms/compiz/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3576

Modified Files:
	compiz.spec 
Added Files:
	compiz-0.7.8-kde42-crash.patch 
	compiz-0.7.8-kde42-krunner.patch 
Log Message:
Backport some KDE-4.2 fixes from upstream

compiz-0.7.8-kde42-crash.patch:

--- NEW FILE compiz-0.7.8-kde42-crash.patch ---
Implement KDecorationBridge unstable API, needed for KDE 4.2.
---

diff --git a/kde/window-decorator-kde4/window.cpp b/kde/window-decorator-kde4/window.cpp
index d2d362b..68c856b 100644
--- a/kde/window-decorator-kde4/window.cpp
+++ b/kde/window-decorator-kde4/window.cpp
@@ -764,6 +764,31 @@ KWD::Window::grabXServer (bool)
 }
 
 void
+KWD::Window::repaintShadow (void)
+{
+}
+
+bool
+KWD::Window::compositingActive (void) const
+{
+    return true;
+}
+
+bool
+KWD::Window::shadowsActive (void) const
+{
+    /* we are drawing the shadows ourselves, no need for the
+       decoration engine to do so */
+    return false;
+}
+
+double
+KWD::Window::opacity (void) const
+{
+    return 1.0;
+}
+
+void
 KWD::Window::createDecoration (void)
 {
     KDecoration *decor;
diff --git a/kde/window-decorator-kde4/window.h b/kde/window-decorator-kde4/window.h
index bdf2c47..034e6fe 100644
--- a/kde/window-decorator-kde4/window.h
+++ b/kde/window-decorator-kde4/window.h
@@ -45,7 +45,7 @@ class QMenu;
 
 namespace KWD
 {
-class Window:public QWidget, public KDecorationBridge {
+class Window:public QWidget, public KDecorationBridgeUnstable {
     Q_OBJECT public:
 
 	enum Type
@@ -104,6 +104,12 @@ class Window:public QWidget, public KDecorationBridge {
 	virtual Qt::WFlags initialWFlags (void) const;
 	virtual void grabXServer (bool grab);
 
+	/* unstable API */
+	virtual void repaintShadow ();
+	virtual bool compositingActive () const;
+	virtual bool shadowsActive () const;
+	virtual double opacity () const;
+
 	void handleActiveChange (void);
 	void updateFrame (WId frame);
 	void updateWindowGeometry (void);


compiz-0.7.8-kde42-krunner.patch:

--- NEW FILE compiz-0.7.8-kde42-krunner.patch ---
diff --git a/kde/window-decorator-kde4/decorator.cpp b/kde/window-decorator-kde4/decorator.cpp
index 96b818d..0bf4718 100644
--- a/kde/window-decorator-kde4/decorator.cpp
+++ b/kde/window-decorator-kde4/decorator.cpp
@@ -649,9 +649,10 @@ KWD::Decorator::x11EventFilter (XEvent *xevent)
 	    }
 	    else if (action == Atoms::toolkitActionRunDialogAtom)
 	    {
-		QDBusInterface krunner ("org.kde.krunner", "/Interface",
-					"org.kde.krunner.Interface");
-		krunner.call ("display", "");
+		QDBusInterface krunner ("org.kde.krunner", "/App",
+					"org.kde.krunner.App");
+		if (krunner.isValid ())
+		    krunner.call ("display");
 	    }
 	    else if (action == Atoms::toolkitActionForceQuitDialogAtom)
 	    {



Index: compiz.spec
===================================================================
RCS file: /cvs/pkgs/rpms/compiz/F-10/compiz.spec,v
retrieving revision 1.145
retrieving revision 1.146
diff -u -r1.145 -r1.146
--- compiz.spec	27 Jan 2009 22:04:59 -0000	1.145
+++ compiz.spec	28 Jan 2009 09:46:53 -0000	1.146
@@ -14,7 +14,7 @@
 License:        GPLv2+ and LGPLv2+ and MIT
 Group:          User Interface/Desktops
 Version:        0.7.8
-Release:        6%{?dist}
+Release:        7%{?dist}
 
 Summary:        OpenGL window and compositing manager
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -80,6 +80,12 @@
 # Make the terminal keybinding work (RH #439665)
 Patch125: compiz-0.7.8-gnome-terminal.patch
 
+# KDE-4.2 fixes from upstream:
+# 814809ffffe47f829b784f7bd246026bfcdecf0f
+Patch126: compiz-0.7.8-kde42-crash.patch
+# 4cc1d813a9748c3740662233a2add3fe65a4c533
+Patch127: compiz-0.7.8-kde42-krunner.patch
+
 %description
 Compiz is one of the first OpenGL-accelerated compositing window
 managers for the X Window System. The integration allows it to perform
@@ -163,6 +169,8 @@
 %patch123 -p1 -b .initial-plugins
 %patch124 -p1 -b .mem-leaks
 %patch125 -p1 -b .terminal
+%patch126 -p1 -b .kde-crash
+%patch127 -p1 -b .krunner
 
 %build
 rm -rf $RPM_BUILD_ROOT
@@ -379,6 +387,9 @@
 
 
 %changelog
+* Wed Jan 28 2009 Adel Gadllah <adel.gadllah at gmail.com> - 0.7.8-7
+- Backport some KDE-4.2 fixes from upstream
+
 * Tue Jan 27 2009 Adel Gadllah <adel.gadllah at gmail.com> - 0.7.8-6
 - Fix build against KDE-4.2
 



From karsten at fedoraproject.org  Wed Jan 28 09:51:07 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Wed, 28 Jan 2009 09:51:07 +0000 (UTC)
Subject: rpms/hwdata/F-9 .cvsignore, 1.95, 1.96 hwdata.spec, 1.103,
	1.104 sources, 1.98, 1.99
Message-ID: <20090128095108.07FA47010D@cvs1.fedora.phx.redhat.com>

Author: karsten

Update of /cvs/extras/rpms/hwdata/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4085

Modified Files:
	.cvsignore hwdata.spec sources 
Log Message:
- update usb.ids pci.ids oui.txt and build for all current releases 
  Fixes p.e. #465440                                                
- add new monitor entries from Mandriva hardware database (Thierry Vignaud)
- make generic entries have properly formated frequencies (Thierry Vignaud)
- remove duplicate Dell monitor entries (Thierry Vignaud)                  
- more vendor name fixes
- fix extra field in 'Compudyne KD-1500N' definition (Thierry Vignaud)
- make Dell monitors case consistent (Thierry Vignaud)
- make all GoldStar monitors have the same vendor name (Thierry Vignaud)
- add URL of git repository
- fix spacing (Thierry Vignaud)
- sort MonitorDB file with LANG=C sort -f -t ";" -k1,2
- add Samsung SyncMaster 2443BWX (Marc van den Dikkenberg)
- add some Lenovo monitors (Im Sza)
- update pci.ids, usb.ids, oui.txt
- MonitorsDB: add some Samsung monitors (Ronald Warsow)
- MonitorsDB: add Dell E1609W (Matt Domsch)
- MonitorsDB: add 7 Dell monitors (Matt Domsch)
- MonitorsDB: add a bunch of Hyundai and ImageQuest monitors
- add BenQ FP2091 monitor (Peter Williams)
- add a bunch of Hyundai and ImageQuest monitors
- update pci.ids, usb.ids, oui.txt
- blacklist snd-pcsp (#448425)
- add some Acer monitors (Im Sz)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/hwdata/F-9/.cvsignore,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -r1.95 -r1.96
--- .cvsignore	1 Apr 2008 14:27:17 -0000	1.95
+++ .cvsignore	28 Jan 2009 09:50:37 -0000	1.96
@@ -1 +1 @@
-hwdata-0.217.tar.bz2
+hwdata-0.222.tar.bz2


Index: hwdata.spec
===================================================================
RCS file: /cvs/extras/rpms/hwdata/F-9/hwdata.spec,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -r1.103 -r1.104
--- hwdata.spec	1 Apr 2008 14:27:17 -0000	1.103
+++ hwdata.spec	28 Jan 2009 09:50:37 -0000	1.104
@@ -1,10 +1,11 @@
 Name: hwdata
 Summary: Hardware identification and configuration data
-Version: 0.217
+Version: 0.222
 Release: 1%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Base
 Source: hwdata-%{version}.tar.bz2
+URL:    http://git.fedorahosted.org/git/hwdata.git
 BuildArch: noarch
 Conflicts: Xconfigurator, system-config-display < 1.0.31, pcmcia-cs, kudzu < 1.2.0
 Requires: module-init-tools >= 3.2
@@ -36,6 +37,45 @@
 %{_datadir}/%{name}/*
 
 %changelog
+* Wed Jan 28 2009 Karsten Hopp <karsten at redhat.com> 0.222-1
+- update usb.ids pci.ids oui.txt and build for all current releases
+  Fixes p.e. #465440
+
+* Wed Jan 21 2009 Karsten Hopp <karsten at redhat.com> 0.221-1
+- update usb.ids pci.ids oui.txt
+
+* Tue Dec 02 2008 Karsten Hopp <karsten at redhat.com> 0.220-1
+- add new monitor entries from Mandriva hardware database (Thierry Vignaud)
+- make generic entries have properly formated frequencies (Thierry Vignaud)
+- remove duplicate Dell monitor entries (Thierry Vignaud)
+- more vendor name fixes
+- fix extra field in 'Compudyne KD-1500N' definition (Thierry Vignaud)
+- make Dell monitors case consistent (Thierry Vignaud)
+- make all GoldStar monitors have the same vendor name (Thierry Vignaud)
+- add URL of git repository
+- fix spacing (Thierry Vignaud)
+- sort MonitorDB file with LANG=C sort -f -t ";" -k1,2
+- add Samsung SyncMaster 2443BWX (Marc van den Dikkenberg)
+- add some Lenovo monitors (Im Sza)
+
+* Wed Jul 23 2008 Karsten Hopp <karsten at redhat.com> 0.220-1
+- update pci.ids, usb.ids, oui.txt
+- MonitorsDB: add some Samsung monitors (Ronald Warsow)
+- MonitorsDB: add Dell E1609W (Matt Domsch)
+- MonitorsDB: add 7 Dell monitors (Matt Domsch)
+- MonitorsDB: add a bunch of Hyundai and ImageQuest monitors
+
+* Mon Jun 09 2008 Karsten Hopp <karsten at redhat.com> 0.219-1
+- add BenQ FP2091 monitor (Peter Williams)
+- add a bunch of Hyundai and ImageQuest monitors
+
+* Mon Jun 02 2008 Karsten Hopp <karsten at redhat.com> 0.219-1
+- update pci.ids, usb.ids, oui.txt
+- blacklist snd-pcsp (#448425)
+
+* Mon May 19 2008 Karsten Hopp <karsten at redhat.com> 0.218-1
+- add some Acer monitors (Im Sz)
+
 * Tue Apr 01 2008 Karsten Hopp <karsten at redhat.com> 0.217-1
 - update pci.ids, oui.txt
 - update usb.ids, fixes #439963


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/hwdata/F-9/sources,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -r1.98 -r1.99
--- sources	1 Apr 2008 14:27:17 -0000	1.98
+++ sources	28 Jan 2009 09:50:37 -0000	1.99
@@ -1 +1 @@
-421cc661d5bf3b38b97d2050b6a8cc83  hwdata-0.217.tar.bz2
+d7216c0d58fee68b67253af6b31d9fbd  hwdata-0.222.tar.bz2



From karsten at fedoraproject.org  Wed Jan 28 09:52:47 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Wed, 28 Jan 2009 09:52:47 +0000 (UTC)
Subject: rpms/hwdata/devel .cvsignore, 1.99, 1.100 hwdata.spec, 1.107,
	1.108 sources, 1.102, 1.103
Message-ID: <20090128095247.C872670142@cvs1.fedora.phx.redhat.com>

Author: karsten

Update of /cvs/extras/rpms/hwdata/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4736

Modified Files:
	.cvsignore hwdata.spec sources 
Log Message:
- update usb.ids pci.ids oui.txt and build for all current releases
  Fixes p.e. #465440



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/hwdata/devel/.cvsignore,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -r1.99 -r1.100
--- .cvsignore	21 Jan 2009 13:15:45 -0000	1.99
+++ .cvsignore	28 Jan 2009 09:52:17 -0000	1.100
@@ -1 +1 @@
-hwdata-0.221.tar.bz2
+hwdata-0.222.tar.bz2


Index: hwdata.spec
===================================================================
RCS file: /cvs/extras/rpms/hwdata/devel/hwdata.spec,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -r1.107 -r1.108
--- hwdata.spec	21 Jan 2009 13:15:45 -0000	1.107
+++ hwdata.spec	28 Jan 2009 09:52:17 -0000	1.108
@@ -1,6 +1,6 @@
 Name: hwdata
 Summary: Hardware identification and configuration data
-Version: 0.221
+Version: 0.222
 Release: 1%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Base
@@ -37,6 +37,10 @@
 %{_datadir}/%{name}/*
 
 %changelog
+* Wed Jan 28 2009 Karsten Hopp <karsten at redhat.com> 0.222-1
+- update usb.ids pci.ids oui.txt and build for all current releases
+  Fixes p.e. #465440
+
 * Wed Jan 21 2009 Karsten Hopp <karsten at redhat.com> 0.221-1
 - update usb.ids pci.ids oui.txt
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/hwdata/devel/sources,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -r1.102 -r1.103
--- sources	21 Jan 2009 13:15:45 -0000	1.102
+++ sources	28 Jan 2009 09:52:17 -0000	1.103
@@ -1 +1 @@
-75b0f190c5b9ec165c0a793a2e298f49  hwdata-0.221.tar.bz2
+d7216c0d58fee68b67253af6b31d9fbd  hwdata-0.222.tar.bz2



From karsten at fedoraproject.org  Wed Jan 28 09:55:24 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Wed, 28 Jan 2009 09:55:24 +0000 (UTC)
Subject: rpms/hwdata/F-10 .cvsignore, 1.98, 1.99 hwdata.spec, 1.106,
	1.107 sources, 1.101, 1.102
Message-ID: <20090128095524.1AE2D7010D@cvs1.fedora.phx.redhat.com>

Author: karsten

Update of /cvs/extras/rpms/hwdata/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5832

Modified Files:
	.cvsignore hwdata.spec sources 
Log Message:
- update usb.ids pci.ids oui.txt and build for all current releases
  Fixes p.e. #465440
- add new monitor entries from Mandriva hardware database (Thierry Vignaud)
- make generic entries have properly formated frequencies (Thierry Vignaud)
- remove duplicate Dell monitor entries (Thierry Vignaud)
- more vendor name fixes
- fix extra field in 'Compudyne KD-1500N' definition (Thierry Vignaud)
- make Dell monitors case consistent (Thierry Vignaud)
- make all GoldStar monitors have the same vendor name (Thierry Vignaud)
- add URL of git repository
- fix spacing (Thierry Vignaud)
- sort MonitorDB file with LANG=C sort -f -t ";" -k1,2
- add Samsung SyncMaster 2443BWX (Marc van den Dikkenberg)
- add some Lenovo monitors (Im Sza)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/hwdata/F-10/.cvsignore,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -r1.98 -r1.99
--- .cvsignore	23 Jul 2008 10:20:23 -0000	1.98
+++ .cvsignore	28 Jan 2009 09:54:53 -0000	1.99
@@ -1 +1 @@
-hwdata-0.220.tar.bz2
+hwdata-0.222.tar.bz2


Index: hwdata.spec
===================================================================
RCS file: /cvs/extras/rpms/hwdata/F-10/hwdata.spec,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -r1.106 -r1.107
--- hwdata.spec	23 Jul 2008 10:20:23 -0000	1.106
+++ hwdata.spec	28 Jan 2009 09:54:53 -0000	1.107
@@ -1,10 +1,11 @@
 Name: hwdata
 Summary: Hardware identification and configuration data
-Version: 0.220
+Version: 0.222
 Release: 1%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Base
 Source: hwdata-%{version}.tar.bz2
+URL:    http://git.fedorahosted.org/git/hwdata.git
 BuildArch: noarch
 Conflicts: Xconfigurator, system-config-display < 1.0.31, pcmcia-cs, kudzu < 1.2.0
 Requires: module-init-tools >= 3.2
@@ -36,6 +37,27 @@
 %{_datadir}/%{name}/*
 
 %changelog
+* Wed Jan 28 2009 Karsten Hopp <karsten at redhat.com> 0.222-1
+- update usb.ids pci.ids oui.txt and build for all current releases
+  Fixes p.e. #465440
+
+* Wed Jan 21 2009 Karsten Hopp <karsten at redhat.com> 0.221-1
+- update usb.ids pci.ids oui.txt
+
+* Tue Dec 02 2008 Karsten Hopp <karsten at redhat.com> 0.220-1
+- add new monitor entries from Mandriva hardware database (Thierry Vignaud)
+- make generic entries have properly formated frequencies (Thierry Vignaud)
+- remove duplicate Dell monitor entries (Thierry Vignaud)
+- more vendor name fixes
+- fix extra field in 'Compudyne KD-1500N' definition (Thierry Vignaud)
+- make Dell monitors case consistent (Thierry Vignaud)
+- make all GoldStar monitors have the same vendor name (Thierry Vignaud)
+- add URL of git repository
+- fix spacing (Thierry Vignaud)
+- sort MonitorDB file with LANG=C sort -f -t ";" -k1,2
+- add Samsung SyncMaster 2443BWX (Marc van den Dikkenberg)
+- add some Lenovo monitors (Im Sza)
+
 * Wed Jul 23 2008 Karsten Hopp <karsten at redhat.com> 0.220-1
 - update pci.ids, usb.ids, oui.txt
 - MonitorsDB: add some Samsung monitors (Ronald Warsow)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/hwdata/F-10/sources,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -r1.101 -r1.102
--- sources	23 Jul 2008 10:20:23 -0000	1.101
+++ sources	28 Jan 2009 09:54:53 -0000	1.102
@@ -1 +1 @@
-80b74064c7bae6a18013b5525c6ceae6  hwdata-0.220.tar.bz2
+d7216c0d58fee68b67253af6b31d9fbd  hwdata-0.222.tar.bz2



From red at fedoraproject.org  Wed Jan 28 10:20:21 2009
From: red at fedoraproject.org (Sandro Mathys)
Date: Wed, 28 Jan 2009 10:20:21 +0000 (UTC)
Subject: rpms/opencsv/devel import.log, NONE, 1.1 opencsv.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090128102021.CA9737010D@cvs1.fedora.phx.redhat.com>

Author: red

Update of /cvs/pkgs/rpms/opencsv/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9716/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log opencsv.spec 
Log Message:
* Wed Jan 28 2009 Sandro Mathys <red at fedoraproject.org> - 1.8-2
- initial commit




--- NEW FILE import.log ---
opencsv-1_8-2_fc11:HEAD:opencsv-1.8-2.fc11.src.rpm:1233137827


--- NEW FILE opencsv.spec ---
Name:           opencsv
Version:        1.8
Release:        2%{?dist}
Summary:        A very simple csv (comma-separated values) parser library for Java
Group:          Development/Libraries
License:        ASL 2.0
URL:            http://opencsv.sourceforge.net/
Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}-src-with-libs.tar.gz
BuildArch:      noarch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:     java-devel >= 1:1.6.0
BuildRequires:     jpackage-utils
BuildRequires:     ant
BuildRequires:     junit
BuildRequires:     ant-junit
Requires:          java >= 1:1.6.0
Requires:          jpackage-utils

%description
Support for all the basic csv-type things you're likely to want to do.


%package javadoc
Summary:           Javadocs for opencsv
Group:             Documentation
Requires:          %{name} = %{version}-%{release}
Requires:          jpackage-utils

%description javadoc
opencsv development documentation.


%prep
%setup -q # -n %{name}-%{version}

### making sure we dont use it
rm -rf lib/* doc deploy

%{__sed} -i 's/\r//' examples/MockResultSet.java
%{__sed} -i 's/\r//' examples/JdbcExample.java
%{__sed} -i 's/\r//' examples/addresses.csv
%{__sed} -i 's/\r//' examples/AddressExample.java


%build
ant jar # includes clean & build
ant test
ant javadoc


%install
rm -rf $RPM_BUILD_ROOT

# jar
install -d $RPM_BUILD_ROOT%{_javadir}
install -m644 deploy/%{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar

# javadoc
install -d $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
cp -rp doc/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc examples
%{_javadir}/%{name}.jar
%{_javadir}/%{name}-%{version}.jar

%files javadoc
%defattr(-,root,root,-)
%dir %{_javadocdir}/%{name}-%{version}
%{_javadocdir}/%{name}
%{_javadocdir}/%{name}-%{version}/*


%changelog
* Mon Jan 26 2009 Sandro Mathys <red at fedoraproject.org> - 1.8-2
- Examples now docs
- Removed feature list in description
- Added symlink to the javadocs (name-version -> name)

* Tue Dec 16 2008 Sandro Mathys <red at fedoraproject.org> - 1.8-1
- initial build (thanks Rudolf 'che' Kastl for the help)


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/opencsv/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	28 Jan 2009 05:45:24 -0000	1.1
+++ .cvsignore	28 Jan 2009 10:19:51 -0000	1.2
@@ -0,0 +1 @@
+opencsv-1.8-src-with-libs.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/opencsv/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	28 Jan 2009 05:45:24 -0000	1.1
+++ sources	28 Jan 2009 10:19:51 -0000	1.2
@@ -0,0 +1 @@
+39fb372ec7af16c187d4dc3a6de66305  opencsv-1.8-src-with-libs.tar.gz



From red at fedoraproject.org  Wed Jan 28 10:24:19 2009
From: red at fedoraproject.org (Sandro Mathys)
Date: Wed, 28 Jan 2009 10:24:19 +0000 (UTC)
Subject: rpms/opencsv/F-9 import.log, NONE, 1.1 opencsv.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090128102419.9C92E7010D@cvs1.fedora.phx.redhat.com>

Author: red

Update of /cvs/pkgs/rpms/opencsv/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10867/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	import.log opencsv.spec 
Log Message:
* Wed Jan 28 2009 Sandro Mathys <red at fedoraproject.org> - 1.8-2
- initial commit




--- NEW FILE import.log ---
opencsv-1_8-2_fc11:F-9:opencsv-1.8-2.fc11.src.rpm:1233138131


--- NEW FILE opencsv.spec ---
Name:           opencsv
Version:        1.8
Release:        2%{?dist}
Summary:        A very simple csv (comma-separated values) parser library for Java
Group:          Development/Libraries
License:        ASL 2.0
URL:            http://opencsv.sourceforge.net/
Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}-src-with-libs.tar.gz
BuildArch:      noarch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:     java-devel >= 1:1.6.0
BuildRequires:     jpackage-utils
BuildRequires:     ant
BuildRequires:     junit
BuildRequires:     ant-junit
Requires:          java >= 1:1.6.0
Requires:          jpackage-utils

%description
Support for all the basic csv-type things you're likely to want to do.


%package javadoc
Summary:           Javadocs for opencsv
Group:             Documentation
Requires:          %{name} = %{version}-%{release}
Requires:          jpackage-utils

%description javadoc
opencsv development documentation.


%prep
%setup -q # -n %{name}-%{version}

### making sure we dont use it
rm -rf lib/* doc deploy

%{__sed} -i 's/\r//' examples/MockResultSet.java
%{__sed} -i 's/\r//' examples/JdbcExample.java
%{__sed} -i 's/\r//' examples/addresses.csv
%{__sed} -i 's/\r//' examples/AddressExample.java


%build
ant jar # includes clean & build
ant test
ant javadoc


%install
rm -rf $RPM_BUILD_ROOT

# jar
install -d $RPM_BUILD_ROOT%{_javadir}
install -m644 deploy/%{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar

# javadoc
install -d $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
cp -rp doc/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc examples
%{_javadir}/%{name}.jar
%{_javadir}/%{name}-%{version}.jar

%files javadoc
%defattr(-,root,root,-)
%dir %{_javadocdir}/%{name}-%{version}
%{_javadocdir}/%{name}
%{_javadocdir}/%{name}-%{version}/*


%changelog
* Mon Jan 26 2009 Sandro Mathys <red at fedoraproject.org> - 1.8-2
- Examples now docs
- Removed feature list in description
- Added symlink to the javadocs (name-version -> name)

* Tue Dec 16 2008 Sandro Mathys <red at fedoraproject.org> - 1.8-1
- initial build (thanks Rudolf 'che' Kastl for the help)


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/opencsv/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	28 Jan 2009 05:45:24 -0000	1.1
+++ .cvsignore	28 Jan 2009 10:23:49 -0000	1.2
@@ -0,0 +1 @@
+opencsv-1.8-src-with-libs.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/opencsv/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	28 Jan 2009 05:45:24 -0000	1.1
+++ sources	28 Jan 2009 10:23:49 -0000	1.2
@@ -0,0 +1 @@
+39fb372ec7af16c187d4dc3a6de66305  opencsv-1.8-src-with-libs.tar.gz



From mschwendt at fedoraproject.org  Wed Jan 28 10:24:38 2009
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Wed, 28 Jan 2009 10:24:38 +0000 (UTC)
Subject: rpms/geeqie/devel geeqie-1.0alpha3-docdirs.patch, NONE,
	1.1 geeqie-1.0alpha3-lirc.patch, NONE, 1.1 geeqie.spec, 1.13, 1.14
Message-ID: <20090128102438.A10917010D@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/pkgs/rpms/geeqie/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11645

Modified Files:
	geeqie.spec 
Added Files:
	geeqie-1.0alpha3-docdirs.patch geeqie-1.0alpha3-lirc.patch 
Log Message:
* Wed Jan 28 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.0-0.13.alpha3
- ignore .helpdir/.htmldir values in geeqierc to fix "Help"
- add --enable-lirc again to build with LIRC


geeqie-1.0alpha3-docdirs.patch:

--- NEW FILE geeqie-1.0alpha3-docdirs.patch ---
diff -Nur geeqie-1.0alpha3-orig/src/rcfile.c geeqie-1.0alpha3/src/rcfile.c
--- geeqie-1.0alpha3-orig/src/rcfile.c	2009-01-25 19:53:32.000000000 +0100
+++ geeqie-1.0alpha3/src/rcfile.c	2009-01-28 11:11:52.000000000 +0100
@@ -921,9 +921,10 @@
 		READ_BOOL(metadata.confirm_on_dir_change);
 
 		/* Documentation */
+/* Rely on defaults to make version upgrades work.
 		READ_CHAR(documentation.helpdir);
 		READ_CHAR(documentation.htmldir);
-		
+*/
 		}
 
 	fclose(f);

geeqie-1.0alpha3-lirc.patch:

--- NEW FILE geeqie-1.0alpha3-lirc.patch ---
diff -Nur geeqie-1.0alpha3-orig/src/lirc.c geeqie-1.0alpha3/src/lirc.c
--- geeqie-1.0alpha3-orig/src/lirc.c	2009-01-25 19:53:32.000000000 +0100
+++ geeqie-1.0alpha3/src/lirc.c	2009-01-28 10:53:37.000000000 +0100
@@ -176,7 +176,7 @@
 		}
 	if (x != 0 || y != 0)
 		{
-		layout_image_scroll(lw, x, y);
+		layout_image_scroll(lw, x, y, FALSE);
 		}
 
 	if (ret == -1)


Index: geeqie.spec
===================================================================
RCS file: /cvs/pkgs/rpms/geeqie/devel/geeqie.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- geeqie.spec	26 Jan 2009 09:38:57 -0000	1.13
+++ geeqie.spec	28 Jan 2009 10:24:08 -0000	1.14
@@ -3,7 +3,7 @@
 Summary: Image browser and viewer
 Name: geeqie
 Version: 1.0
-Release: 0.12.alpha3%{?dist}
+Release: 0.13.alpha3%{?dist}
 License: GPLv3
 Group: User Interface/X
 # svn + autogen
@@ -14,12 +14,14 @@
 # bz 222639
 Patch3: geeqie-1.0alpha1-print-pagesize.patch
 Patch4: geeqie-1.0alpha2-gcc-warn.patch
+Patch5: geeqie-1.0alpha3-lirc.patch
+Patch6: geeqie-1.0alpha3-docdirs.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n)
 URL: http://geeqie.sourceforge.net/
 BuildRequires: gtk2-devel
 BuildRequires: lcms-devel
 BuildRequires: exiv2-devel
-#BuildRequires: lirc-devel
+BuildRequires: lirc-devel
 BuildRequires: gettext desktop-file-utils
 
 # Something for the future:
@@ -44,10 +46,12 @@
 %patch2 -p1 -b .editors
 %patch3 -p1 -b .print-pagesize
 %patch4 -p1 -b .gcc-warn
+%patch5 -p1 -b .lirc
+%patch6 -p1 -b .docdirs
 
 
 %build
-%configure --disable-lirc
+%configure --enable-lirc
 make clean
 make %{?_smp_mflags}
 
@@ -93,6 +97,10 @@
 
 
 %changelog
+* Wed Jan 28 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.0-0.13.alpha3
+- ignore .helpdir/.htmldir values in geeqierc to fix "Help"
+- add --enable-lirc again to build with LIRC
+
 * Mon Jan 26 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.0-0.12.alpha3
 - update to alpha3 tarball
 



From red at fedoraproject.org  Wed Jan 28 10:31:08 2009
From: red at fedoraproject.org (Sandro Mathys)
Date: Wed, 28 Jan 2009 10:31:08 +0000 (UTC)
Subject: rpms/opencsv/F-10 import.log, NONE, 1.1 opencsv.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090128103108.877117010D@cvs1.fedora.phx.redhat.com>

Author: red

Update of /cvs/pkgs/rpms/opencsv/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13215/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	import.log opencsv.spec 
Log Message:
* Wed Jan 28 2009 Sandro Mathys <red at fedoraproject.org> - 1.8-2
- initial commit




--- NEW FILE import.log ---
opencsv-1_8-2_fc11:F-10:opencsv-1.8-2.fc11.src.rpm:1233138484


--- NEW FILE opencsv.spec ---
Name:           opencsv
Version:        1.8
Release:        2%{?dist}
Summary:        A very simple csv (comma-separated values) parser library for Java
Group:          Development/Libraries
License:        ASL 2.0
URL:            http://opencsv.sourceforge.net/
Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}-src-with-libs.tar.gz
BuildArch:      noarch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:     java-devel >= 1:1.6.0
BuildRequires:     jpackage-utils
BuildRequires:     ant
BuildRequires:     junit
BuildRequires:     ant-junit
Requires:          java >= 1:1.6.0
Requires:          jpackage-utils

%description
Support for all the basic csv-type things you're likely to want to do.


%package javadoc
Summary:           Javadocs for opencsv
Group:             Documentation
Requires:          %{name} = %{version}-%{release}
Requires:          jpackage-utils

%description javadoc
opencsv development documentation.


%prep
%setup -q # -n %{name}-%{version}

### making sure we dont use it
rm -rf lib/* doc deploy

%{__sed} -i 's/\r//' examples/MockResultSet.java
%{__sed} -i 's/\r//' examples/JdbcExample.java
%{__sed} -i 's/\r//' examples/addresses.csv
%{__sed} -i 's/\r//' examples/AddressExample.java


%build
ant jar # includes clean & build
ant test
ant javadoc


%install
rm -rf $RPM_BUILD_ROOT

# jar
install -d $RPM_BUILD_ROOT%{_javadir}
install -m644 deploy/%{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar

# javadoc
install -d $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
cp -rp doc/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc examples
%{_javadir}/%{name}.jar
%{_javadir}/%{name}-%{version}.jar

%files javadoc
%defattr(-,root,root,-)
%dir %{_javadocdir}/%{name}-%{version}
%{_javadocdir}/%{name}
%{_javadocdir}/%{name}-%{version}/*


%changelog
* Mon Jan 26 2009 Sandro Mathys <red at fedoraproject.org> - 1.8-2
- Examples now docs
- Removed feature list in description
- Added symlink to the javadocs (name-version -> name)

* Tue Dec 16 2008 Sandro Mathys <red at fedoraproject.org> - 1.8-1
- initial build (thanks Rudolf 'che' Kastl for the help)


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/opencsv/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	28 Jan 2009 05:45:24 -0000	1.1
+++ .cvsignore	28 Jan 2009 10:30:38 -0000	1.2
@@ -0,0 +1 @@
+opencsv-1.8-src-with-libs.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/opencsv/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	28 Jan 2009 05:45:24 -0000	1.1
+++ sources	28 Jan 2009 10:30:38 -0000	1.2
@@ -0,0 +1 @@
+39fb372ec7af16c187d4dc3a6de66305  opencsv-1.8-src-with-libs.tar.gz



From hedayat at fedoraproject.org  Wed Jan 28 10:34:16 2009
From: hedayat at fedoraproject.org (Hedayat Vatankhah)
Date: Wed, 28 Jan 2009 10:34:16 +0000 (UTC)
Subject: rpms/rcssserver3d/devel rcssserver3d.spec,1.7,1.8
Message-ID: <20090128103416.69A877010D@cvs1.fedora.phx.redhat.com>

Author: hedayat

Update of /cvs/pkgs/rpms/rcssserver3d/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13836

Modified Files:
	rcssserver3d.spec 
Log Message:
added a changelog entry for the fix in the year number in changlog docs in the previous commit.


Index: rcssserver3d.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rcssserver3d/devel/rcssserver3d.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- rcssserver3d.spec	14 Jan 2009 18:37:50 -0000	1.7
+++ rcssserver3d.spec	28 Jan 2009 10:33:45 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           rcssserver3d
 Version:        0.6
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Robocup 3D Soccer Simulation Server
 
 Group:          Applications/System
@@ -171,6 +171,9 @@
 %endif
 
 %changelog
+* Wed Jan 28 2009 Hedayat Vatankhah <hedayat at grad.com> 0.6-8
+- Fixed the year number in changelog documents (fixed in the previous commit).
+
 * Wed Jan 14 2009 Hedayat Vatankhah <hedayat at grad.com> 0.6-7
 - Removing VeraMono.ttf from the package because of new Fedora font guidelines.
 - Adding dejavu-fonts-sans-mono as a requirement for VeraMono.ttf replacement.



From tagoh at fedoraproject.org  Wed Jan 28 10:50:39 2009
From: tagoh at fedoraproject.org (Akira TAGOH)
Date: Wed, 28 Jan 2009 10:50:39 +0000 (UTC)
Subject: rpms/sazanami-fonts/devel sazanami-fonts.spec,1.4,1.5
Message-ID: <20090128105039.2513E7010D@cvs1.fedora.phx.redhat.com>

Author: tagoh

Update of /cvs/pkgs/rpms/sazanami-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16599

Modified Files:
	sazanami-fonts.spec 
Log Message:
* Wed Jan 28 2009 Akira TAGOH <tagoh at redhat.com> - 0.20040629-6.20061016
- Rename the package name again.


Index: sazanami-fonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sazanami-fonts/devel/sazanami-fonts.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sazanami-fonts.spec	25 Dec 2008 05:59:47 -0000	1.4
+++ sazanami-fonts.spec	28 Jan 2009 10:50:08 -0000	1.5
@@ -10,7 +10,7 @@
 
 Name:		%{fontname}-fonts
 Version:	0.20040629
-Release:	5.%{fontver}%{?dist}
+Release:	6.%{fontver}%{?dist}
 BuildArch:	noarch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	ttmkfdir >= 3.0.6
@@ -44,30 +44,30 @@
 
 This package consists of files used by other %{name} packages.
 
-%package	gothic
+%package -n	%{fontname}-gothic-fonts
 Summary:	Sazanami Gothic Japanese TrueType font
 License:	BSD
 Group:		User Interface/X
 Conflicts:	fonts-japanese <= 0.20061016-9.fc8
-Provides:	ttfonts-ja = 1.2-37
-Obsoletes:	ttfonts-ja < 1.2-37
+Provides:	ttfonts-ja = 1.2-37, %{fontname}-fonts-gothic = %{version}-%{release}
+Obsoletes:	ttfonts-ja < 1.2-37, %{fontname}-fonts-gothic < 0.20040629-6.20061016
 Requires:	%{name}-common = %{version}-%{release}
 
-%description	gothic
+%description -n	%{fontname}-gothic-fonts
 %common_desc
 
 This package contains Japanese TrueType font for Gothic type face.
 
-%package	mincho
+%package -n	%{fontname}-mincho-fonts
 Summary:	Sazanami Mincho Japanese TrueType font
 License:	BSD
 Group:		User Interface/X
 Conflicts:	fonts-japanese <= 0.20061016-9.fc8
-Provides:	ttfonts-ja = 1.2-37
-Obsoletes:	ttfonts-ja < 1.2-37
+Provides:	ttfonts-ja = 1.2-37, %{fontname}-fonts-mincho = %{version}-%{release}
+Obsoletes:	ttfonts-ja < 1.2-37, %{fontname}-fonts-mincho < 0.20040629-6.20061016
 Requires:	%{name}-common = %{version}-%{release}
 
-%description	mincho
+%description -n	%{fontname}-mincho-fonts
 %common_desc
 
 This package contains Japanese TrueType font for Mincho type face.
@@ -133,6 +133,9 @@
 %dir %{_fontdir}
 
 %changelog
+* Wed Jan 28 2009 Akira TAGOH <tagoh at redhat.com> - 0.20040629-6.20061016
+- Rename the package name again.
+
 * Thu Dec 25 2008 Akira TAGOH <tagoh at redhat.com> - 0.20040629-5.20061016
 - Update the spec file to fit into new guideline. (#477453)
 



From karsten at fedoraproject.org  Wed Jan 28 11:23:30 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Wed, 28 Jan 2009 11:23:30 +0000 (UTC)
Subject: rpms/prctl/devel prctl.spec,1.17,1.18
Message-ID: <20090128112330.913627010D@cvs1.fedora.phx.redhat.com>

Author: karsten

Update of /cvs/extras/rpms/prctl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22151

Modified Files:
	prctl.spec 
Log Message:
- add comment why this packages has Exclusivearch: ia64 (#226314)



Index: prctl.spec
===================================================================
RCS file: /cvs/extras/rpms/prctl/devel/prctl.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- prctl.spec	29 Aug 2008 19:19:16 -0000	1.17
+++ prctl.spec	28 Jan 2009 11:22:58 -0000	1.18
@@ -1,13 +1,17 @@
 Summary: Utility to perform process operations
 Name: prctl
 Version: 1.5
-Release: 3
+Release: 4
 License: GPLv2
 Group: Applications/System
 URL:	http://sourceforge.net/projects/prctl
 Source: http://prdownloads.sourceforge.net/prctl/prctl-%{version}.tar.gz
 Patch0: prctl-1.5-destdir.patch
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+# The only parameters of prctl that do anything other than printing help are
+# --unaligned= and --fpemu=. 
+# Both work only on ia64, on other archs you'll get this output:
+#'ERROR: Kernel on this platform may not implement this prctl feature.'
 ExclusiveArch: ia64
 
 %description
@@ -37,6 +41,9 @@
 %{_mandir}/man1/prctl.*
 
 %changelog
+* Wed Jan 28 2009 Karsten Hopp <karsten at redhat.com> 1.5-4
+- add comment why this package is ia64 only (#226314)
+
 * Fri Aug 29 2008 Tom "spot" Callaway <tcallawa at redhat.com> 1.5-3
 - fix license tag
 



From laxathom at fedoraproject.org  Wed Jan 28 11:31:38 2009
From: laxathom at fedoraproject.org (Xavier LAMIEN)
Date: Wed, 28 Jan 2009 11:31:38 +0000 (UTC)
Subject: rpms/gammu/devel gammu.spec,1.20,1.21
Message-ID: <20090128113139.1E1F97010D@cvs1.fedora.phx.redhat.com>

Author: laxathom

Update of /cvs/pkgs/rpms/gammu/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24096

Modified Files:
	gammu.spec 
Log Message:
update libdir


Index: gammu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gammu/devel/gammu.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- gammu.spec	26 Jan 2009 09:19:01 -0000	1.20
+++ gammu.spec	28 Jan 2009 11:31:07 -0000	1.21
@@ -1,6 +1,6 @@
 Name:		gammu
 Version:        1.22.90
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Command Line utility to work with mobile phones
 
 Group:          Applications/System
@@ -59,6 +59,8 @@
 	-DWITH_NOKIA_SUPPORT=ON		\
 	-DWITH_Bluez=ON			\
 	-DWITH_IrDA=On			\
+	-DINSTALL_LIB_DIR=%{_libdir}	\
+	-DINSTALL_LIBDATA_DIR=%{_libdir} \
 	../
 make
 popd
@@ -128,6 +130,9 @@
 
 
 %changelog
+* Mon Jan 26 2009 Xavier Lamien <lxtnow at gmail.com> - 1.22.90-3
+- Make _libdir in a good shape.
+
 * Mon Jan 26 2009 Tomas Mraz <tmraz at redhat.com> - 1.22.90-2
 - rebuild with new openssl and mysql
 



From pkgdb at fedoraproject.org  Wed Jan 28 11:48:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Jan 2009 11:48:49 +0000
Subject: [pkgdb] libtranslate had acl change status
Message-ID: <20090128114850.D8F4F208484@bastion.fedora.phx.redhat.com>

buc has set the watchbugzilla acl on libtranslate (Fedora devel) to Approved for dwayne

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libtranslate



From pkgdb at fedoraproject.org  Wed Jan 28 11:48:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Jan 2009 11:48:53 +0000
Subject: [pkgdb] libtranslate had acl change status
Message-ID: <20090128114854.33A30208494@bastion.fedora.phx.redhat.com>

buc has set the watchcommits acl on libtranslate (Fedora devel) to Approved for dwayne

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libtranslate



From pkgdb at fedoraproject.org  Wed Jan 28 11:49:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Jan 2009 11:49:07 +0000
Subject: [pkgdb] libtranslate had acl change status
Message-ID: <20090128114907.216E2208484@bastion.fedora.phx.redhat.com>

buc has set the watchbugzilla acl on libtranslate (Fedora 10) to Approved for dwayne

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libtranslate



From pkgdb at fedoraproject.org  Wed Jan 28 11:49:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Jan 2009 11:49:11 +0000
Subject: [pkgdb] libtranslate had acl change status
Message-ID: <20090128114911.5DA0D2084A7@bastion.fedora.phx.redhat.com>

buc has set the watchcommits acl on libtranslate (Fedora 10) to Approved for dwayne

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libtranslate



From rjones at fedoraproject.org  Wed Jan 28 11:49:37 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Wed, 28 Jan 2009 11:49:37 +0000 (UTC)
Subject: rpms/mingw32-cairo/devel import.log, NONE, 1.1 mingw32-cairo.spec, 
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090128114937.74A8C7010D@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/mingw32-cairo/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27538/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log mingw32-cairo.spec 
Log Message:
Initial import.



--- NEW FILE import.log ---
mingw32-cairo-1_8_0-6_fc11:HEAD:mingw32-cairo-1.8.0-6.fc11.src.rpm:1233143079


--- NEW FILE mingw32-cairo.spec ---
%define __strip %{_mingw32_strip}
%define __objdump %{_mingw32_objdump}
%define _use_internal_dependency_generator 0
%define __find_requires %{_mingw32_findrequires}
%define __find_provides %{_mingw32_findprovides}

Name:           mingw32-cairo
Version:        1.8.0
Release:        6%{?dist}
Summary:        MinGW Windows Cairo library

License:        LGPLv2 or MPLv1.1
URL:            http://cairographics.org
Source0:        http://cairographics.org/snapshots/cairo-%{version}.tar.gz
Group:          Development/Libraries
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch

BuildRequires:  mingw32-filesystem >= 23
BuildRequires:  mingw32-gcc
BuildRequires:  mingw32-binutils
BuildRequires:  mingw32-libxml2
BuildRequires:  mingw32-pixman
BuildRequires:  mingw32-libpng
BuildRequires:  mingw32-dlfcn
BuildRequires:  mingw32-iconv
BuildRequires:  mingw32-zlib
BuildRequires:  pkgconfig

# These are BRs for the base package, but are not needed on Win32
# because Cairo includes a separate Win32 font rendering back end
# (thanks to: Erik van Pienbroek).
#BuildRequires:  mingw32-fontconfig
#BuildRequires:  mingw32-freetype

Requires:       pkgconfig


%description
MinGW Windows Cairo library.


%prep
%setup -q -n cairo-%{version}


%build
%{_mingw32_configure} \
  --disable-xlib \
  --disable-xcb \
  --enable-win32 \
  --enable-png \
  --disable-static \
  --disable-ft
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT

make DESTDIR=$RPM_BUILD_ROOT install

rm -f $RPM_BUILD_ROOT%{_mingw32_libdir}/charset.alias


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root)
%doc COPYING COPYING-LGPL-2.1 COPYING-MPL-1.1
%{_mingw32_bindir}/libcairo-2.dll
%{_mingw32_includedir}/cairo/
%{_mingw32_libdir}/libcairo.dll.a
%{_mingw32_libdir}/libcairo.la
%{_mingw32_libdir}/pkgconfig/cairo-pdf.pc
%{_mingw32_libdir}/pkgconfig/cairo-png.pc
%{_mingw32_libdir}/pkgconfig/cairo-ps.pc
%{_mingw32_libdir}/pkgconfig/cairo-svg.pc
%{_mingw32_libdir}/pkgconfig/cairo-win32-font.pc
%{_mingw32_libdir}/pkgconfig/cairo-win32.pc
%{_mingw32_libdir}/pkgconfig/cairo.pc
%{_mingw32_datadir}/gtk-doc/html/cairo/


%changelog
* Mon Jan 26 2009 Richard W.M. Jones <rjones at redhat.com> - 1.8.0-6
- Requires pkgconfig (Erik van Pienbroek).

* Mon Jan 26 2009 Richard W.M. Jones <rjones at redhat.com> - 1.8.0-5
- Don't need to remove extra pkgconfig file in install section.

* Mon Jan 26 2009 Richard W.M. Jones <rjones at redhat.com> - 1.8.0-4
- Disable freetype in configure so it doesn't break if freetype
  or fontconfig are actually installed. (Erik van Pienbroek).

* Mon Jan 19 2009 Richard W.M. Jones <rjones at redhat.com> - 1.8.0-3
- Include license file in documentation section.
- Disable building static library to save time.
- Remove BRs on mingw32-fontconfig and mingw32-freetype which are
  not needed on Win32.
- Use _smp_mflags.
- Added BRs mingw32-dlfcn, mingw32-iconv, mingw32-zlib.

* Wed Oct 29 2008 Richard W.M. Jones <rjones at redhat.com> - 1.8.0-2
- Fix mixed spaces/tabs in specfile.

* Fri Oct 24 2008 Richard W.M. Jones <rjones at redhat.com> - 1.8.0-1
- New upstream version 1.8.0.

* Wed Sep 24 2008 Richard W.M. Jones <rjones at redhat.com> - 1.7.4-4
- Rename mingw -> mingw32.

* Thu Sep 11 2008 Daniel P. Berrange <berrange at redhat.com> - 1.7.4-3
- Added dep on pkgconfig

* Wed Sep 10 2008 Richard W.M. Jones <rjones at redhat.com> - 1.7.4-2
- Remove static libraries.
- Fix source URL.

* Tue Sep  9 2008 Daniel P. Berrange <berrange at redhat.com> - 1.7.4-1
- Initial RPM release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-cairo/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	26 Jan 2009 22:16:07 -0000	1.1
+++ .cvsignore	28 Jan 2009 11:49:06 -0000	1.2
@@ -0,0 +1 @@
+cairo-1.8.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-cairo/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	26 Jan 2009 22:16:07 -0000	1.1
+++ sources	28 Jan 2009 11:49:06 -0000	1.2
@@ -0,0 +1 @@
+4ea70ea87b47e92d318d4e7f5b940f47  cairo-1.8.0.tar.gz



From rjones at fedoraproject.org  Wed Jan 28 11:49:42 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Wed, 28 Jan 2009 11:49:42 +0000 (UTC)
Subject: rpms/mingw32-glib2/devel glib-i386-atomic.patch, NONE,
	1.1 import.log, 
	NONE, 1.1 mingw32-glib2.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090128114942.4D0167010D@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/mingw32-glib2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27578/devel

Modified Files:
	.cvsignore sources 
Added Files:
	glib-i386-atomic.patch import.log mingw32-glib2.spec 
Log Message:
Initial import.


glib-i386-atomic.patch:

--- NEW FILE glib-i386-atomic.patch ---
diff -up glib-2.16.6/configure.atomic glib-2.16.6/configure
--- glib-2.16.6/configure.atomic	2008-10-27 18:24:20.000000000 -0400
+++ glib-2.16.6/configure	2008-10-27 18:24:31.000000000 -0400
@@ -42742,11 +42742,6 @@ $as_echo_n "checking whether to use asse
 
 if test x"$GCC" = xyes; then
   case $host_cpu in
-    i386)
-      { $as_echo "$as_me:$LINENO: result: none" >&5
-$as_echo "none" >&6; }
-      glib_memory_barrier_needed=no
-      ;;
     i?86)
       { $as_echo "$as_me:$LINENO: result: i486" >&5
 $as_echo "i486" >&6; }


--- NEW FILE import.log ---
mingw32-glib2-2_19_5-2_fc11:HEAD:mingw32-glib2-2.19.5-2.fc11.src.rpm:1233143135


--- NEW FILE mingw32-glib2.spec ---
%define __strip %{_mingw32_strip}
%define __objdump %{_mingw32_objdump}
%define _use_internal_dependency_generator 0
%define __find_requires %{_mingw32_findrequires}
%define __find_provides %{_mingw32_findprovides}

Name:           mingw32-glib2
Version:        2.19.5
Release:        2%{?dist}
Summary:        MinGW Windows GLib2 library

License:        LGPLv2+
Group:          Development/Libraries
URL:            http://www.gtk.org
Source0:        http://download.gnome.org/sources/glib/2.19/glib-%{version}.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch

Patch0:         glib-i386-atomic.patch

BuildRequires:  mingw32-filesystem >= 43-6
BuildRequires:  mingw32-gcc
BuildRequires:  mingw32-binutils
BuildRequires:  mingw32-dlfcn
BuildRequires:  mingw32-iconv
BuildRequires:  mingw32-gettext

BuildRequires:  pkgconfig
# Native version required for msgfmt use in build
BuildRequires:  gettext
# Native version required for glib-genmarshal
BuildRequires:  glib2-devel

# These are required for the glib-i386-atomic patch.
BuildRequires:  autoconf, automake, libtool, gettext-devel, gtk-doc

%description
MinGW Windows Glib2 library.


%prep
%setup -q -n glib-%{version}
%patch0 -p1 -b .i386-atomic

# Required for the glib-i386-atomic patch.
libtoolize --force --copy
autoreconf


%build
%{_mingw32_configure} --disable-static
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT

make DESTDIR=$RPM_BUILD_ROOT install

rm -f $RPM_BUILD_ROOT/%{_mingw32_libdir}/charset.alias

# Remove manpages which duplicate Fedora native.
rm -rf $RPM_BUILD_ROOT%{_mingw32_mandir}

%find_lang glib20


%clean
rm -rf $RPM_BUILD_ROOT


%files -f glib20.lang
%defattr(-,root,root)
%{_mingw32_bindir}/glib-genmarshal.exe
%{_mingw32_bindir}/glib-gettextize
%{_mingw32_bindir}/glib-mkenums
%{_mingw32_bindir}/gobject-query.exe
%{_mingw32_bindir}/gspawn-win32-helper-console.exe
%{_mingw32_bindir}/gspawn-win32-helper.exe
%{_mingw32_bindir}/libgio-2.0-0.dll
%{_mingw32_bindir}/libglib-2.0-0.dll
%{_mingw32_bindir}/libgmodule-2.0-0.dll
%{_mingw32_bindir}/libgobject-2.0-0.dll
%{_mingw32_bindir}/libgthread-2.0-0.dll
%{_mingw32_includedir}/glib-2.0/
%{_mingw32_libdir}/gio-2.0.def
%{_mingw32_libdir}/glib-2.0.def
%{_mingw32_libdir}/glib-2.0/
%{_mingw32_libdir}/gmodule-2.0.def
%{_mingw32_libdir}/gobject-2.0.def
%{_mingw32_libdir}/gthread-2.0.def
%{_mingw32_libdir}/libgio-2.0.dll.a
%{_mingw32_libdir}/libgio-2.0.la
%{_mingw32_libdir}/libglib-2.0.dll.a
%{_mingw32_libdir}/libglib-2.0.la
%{_mingw32_libdir}/libgmodule-2.0.dll.a
%{_mingw32_libdir}/libgmodule-2.0.la
%{_mingw32_libdir}/libgobject-2.0.dll.a
%{_mingw32_libdir}/libgobject-2.0.la
%{_mingw32_libdir}/libgthread-2.0.dll.a
%{_mingw32_libdir}/libgthread-2.0.la
%{_mingw32_libdir}/pkgconfig/gio-2.0.pc
%{_mingw32_libdir}/pkgconfig/gio-unix-2.0.pc
%{_mingw32_libdir}/pkgconfig/glib-2.0.pc
%{_mingw32_libdir}/pkgconfig/gmodule-2.0.pc
%{_mingw32_libdir}/pkgconfig/gmodule-export-2.0.pc
%{_mingw32_libdir}/pkgconfig/gmodule-no-export-2.0.pc
%{_mingw32_libdir}/pkgconfig/gobject-2.0.pc
%{_mingw32_libdir}/pkgconfig/gthread-2.0.pc
%{_mingw32_datadir}/aclocal/glib-2.0.m4
%{_mingw32_datadir}/aclocal/glib-gettext.m4
%{_mingw32_datadir}/glib-2.0/
%{_mingw32_datadir}/gtk-doc/html/gio/
%{_mingw32_datadir}/gtk-doc/html/glib/
%{_mingw32_datadir}/gtk-doc/html/gobject/


%changelog
* Fri Jan 23 2009 Richard W.M. Jones <rjones at redhat.com> - 2.19.5-2
- Rebase to native Fedora version 2.19.5.
- Use _smp_mflags.
- Use find_lang.
- Don't build static libraries.
- +BR dlfcn.

* Wed Sep 24 2008 Richard W.M. Jones <rjones at redhat.com> - 2.18.1-2
- Rename mingw -> mingw32.

* Mon Sep 22 2008 Daniel P. Berrange <berrange at redhat.com> - 2.18.1-1
- Update to 2.18.1 release

* Sun Sep 21 2008 Richard W.M. Jones <rjones at redhat.com> - 2.18.0-3
- Remove manpages which duplicate Fedora native.

* Thu Sep 11 2008 Daniel P. Berrange <berrange at redhat.com> - 2.18.0-2
- Add BR on pkgconfig, gettext and glib2 (native)

* Tue Sep  9 2008 Daniel P. Berrange <berrange at redhat.com> - 2.18.0-1
- Initial RPM release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-glib2/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	26 Jan 2009 22:44:07 -0000	1.1
+++ .cvsignore	28 Jan 2009 11:49:11 -0000	1.2
@@ -0,0 +1 @@
+glib-2.19.5.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-glib2/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	26 Jan 2009 22:44:07 -0000	1.1
+++ sources	28 Jan 2009 11:49:11 -0000	1.2
@@ -0,0 +1 @@
+b9f8453dd38266108641c448ea8d5bee  glib-2.19.5.tar.bz2



From rjones at fedoraproject.org  Wed Jan 28 11:49:46 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Wed, 28 Jan 2009 11:49:46 +0000 (UTC)
Subject: rpms/mingw32-libxml2/devel import.log, NONE,
	1.1 mingw32-libxml2-2.7.2-with-modules.patch, NONE,
	1.1 mingw32-libxml2.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <20090128114946.CFB5B7010D@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/mingw32-libxml2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27702/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log mingw32-libxml2-2.7.2-with-modules.patch 
	mingw32-libxml2.spec 
Log Message:
Initial import.



--- NEW FILE import.log ---
mingw32-libxml2-2_7_2-6_fc11:HEAD:mingw32-libxml2-2.7.2-6.fc11.src.rpm:1233143139

mingw32-libxml2-2.7.2-with-modules.patch:

--- NEW FILE mingw32-libxml2-2.7.2-with-modules.patch ---
--- libxml2-2.7.2/configure.in~	2008-10-03 08:09:55.000000000 +0100
+++ libxml2-2.7.2/configure.in	2008-10-25 23:14:18.000000000 +0100
@@ -751,6 +751,12 @@
     AC_DEFINE([HAVE_DLOPEN], [], [Have dlopen based dso])
   ])
   ;;
+  *-*-mingw*)
+  # If I configured --with-modules then I damn well want
+  # modules and don't try to second-guess me.
+  MODULE_EXTENSION=".dll"
+  WITH_MODULES=1
+  ;;
   *)
   AC_CHECK_FUNC(shl_load, libxml_have_shl_load=yes, [
     AC_CHECK_LIB(dld, shl_load, [


--- NEW FILE mingw32-libxml2.spec ---
%define __strip %{_mingw32_strip}
%define __objdump %{_mingw32_objdump}
%define _use_internal_dependency_generator 0
%define __find_requires %{_mingw32_findrequires}
%define __find_provides %{_mingw32_findprovides}

Name:           mingw32-libxml2
Version:        2.7.2
Release:        6%{?dist}
Summary:        MinGW Windows libxml2 XML processing library

License:        MIT
Group:          Development/Libraries
URL:            http://xmlsoft.org/
Source0:        ftp://xmlsoft.org/libxml2/libxml2-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

# Not required for MinGW.
#Patch0:         libxml2-multilib.patch

# MinGW-specific patches.
Patch1000:      mingw32-libxml2-2.7.2-with-modules.patch

BuildArch:      noarch

BuildRequires:  mingw32-filesystem >= 23
BuildRequires:  mingw32-gcc
BuildRequires:  mingw32-binutils

BuildRequires:  mingw32-dlfcn
BuildRequires:  mingw32-gettext
BuildRequires:  mingw32-iconv
BuildRequires:  mingw32-zlib

BuildRequires:  autoconf, automake, libtool

Requires:       pkgconfig


%description
MinGW Windows libxml2 XML processing library.


%prep
%setup -q -n libxml2-%{version}

%patch1000 -p1

# Patched configure.in, so rebuild configure.
libtoolize --force --copy
autoreconf


%build
LDFLAGS="-no-undefined" \
%{_mingw32_configure} --without-python --with-modules --disable-static
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT

make DESTDIR=$RPM_BUILD_ROOT install

# Remove manpages which duplicate Fedora native.
rm -rf $RPM_BUILD_ROOT%{_mingw32_mandir}


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root)
%{_mingw32_bindir}/libxml2-2.dll
%{_mingw32_bindir}/xml2-config
%{_mingw32_bindir}/xmlcatalog.exe
%{_mingw32_bindir}/xmllint.exe
%{_mingw32_libdir}/libxml2.dll.a
%{_mingw32_libdir}/libxml2.la
%{_mingw32_libdir}/pkgconfig
%{_mingw32_libdir}/pkgconfig/libxml-2.0.pc
%{_mingw32_libdir}/xml2Conf.sh
%{_mingw32_includedir}/libxml2
%{_mingw32_datadir}/aclocal/*
%{_mingw32_docdir}/libxml2-%{version}/
%{_mingw32_datadir}/gtk-doc/html/libxml2/


%changelog
* Mon Jan 26 2009 Richard W.M. Jones <rjones at redhat.com> - 2.7.2-6
- Rerun autoreconf after patching configure.in (Erik van Pienbroek).
- Rebuild libtool for Rawhide / libtool 2.
- Add BRs dlfcn and iconv.

* Fri Jan 23 2009 Richard W.M. Jones <rjones at redhat.com> - 2.7.2-5
- Use _smp_mflags.
- Disable static libraries.

* Tue Jan 13 2009 Richard W.M. Jones <rjones at redhat.com> - 2.7.2-4
- Requires pkgconfig.

* Sat Oct 25 2008 Richard W.M. Jones <rjones at redhat.com> - 2.7.2-3
- Enable modules support for libxslt.

* Fri Oct 17 2008 Richard W.M. Jones <rjones at redhat.com> - 2.7.2-1
- Resynch to native Fedora package + patch.

* Wed Sep 24 2008 Richard W.M. Jones <rjones at redhat.com> - 2.7.1-2
- Rename mingw -> mingw32.

* Mon Sep 22 2008 Daniel P. Berrange <berrange at redhat.com> - 2.7.1-1
- Update to 2.7.1 release

* Sun Sep 21 2008 Richard W.M. Jones <rjones at redhat.com> - 2.6.32-5
- Remove manpages which duplicate Fedora native.

* Wed Sep 10 2008 Richard W.M. Jones <rjones at redhat.com> - 2.6.32-4
- Remove static libraries.
- List libdir files explicitly.

* Fri Sep  5 2008 Richard W.M. Jones <rjones at redhat.com> - 2.6.32-3
- Use RPM macros from mingw-filesystem.
- BuildArch is noarch.

* Mon Jul  7 2008 Richard W.M. Jones <rjones at redhat.com> - 2.6.32-1
- Initial RPM release, largely based on earlier work from several sources.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-libxml2/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	26 Jan 2009 22:45:14 -0000	1.1
+++ .cvsignore	28 Jan 2009 11:49:15 -0000	1.2
@@ -0,0 +1 @@
+libxml2-2.7.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-libxml2/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	26 Jan 2009 22:45:14 -0000	1.1
+++ sources	28 Jan 2009 11:49:16 -0000	1.2
@@ -0,0 +1 @@
+dc43ff7ae6aded45f578c87b7b0c8766  libxml2-2.7.2.tar.gz



From rjones at fedoraproject.org  Wed Jan 28 11:50:19 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Wed, 28 Jan 2009 11:50:19 +0000 (UTC)
Subject: rpms/mingw32-glib2/F-10 glib-i386-atomic.patch, NONE, 1.1 import.log,
	NONE, 1.1 mingw32-glib2.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090128115019.9CA8E7010D@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/mingw32-glib2/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28695/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	glib-i386-atomic.patch import.log mingw32-glib2.spec 
Log Message:
Initial import.


glib-i386-atomic.patch:

--- NEW FILE glib-i386-atomic.patch ---
diff -up glib-2.16.6/configure.atomic glib-2.16.6/configure
--- glib-2.16.6/configure.atomic	2008-10-27 18:24:20.000000000 -0400
+++ glib-2.16.6/configure	2008-10-27 18:24:31.000000000 -0400
@@ -42742,11 +42742,6 @@ $as_echo_n "checking whether to use asse
 
 if test x"$GCC" = xyes; then
   case $host_cpu in
-    i386)
-      { $as_echo "$as_me:$LINENO: result: none" >&5
-$as_echo "none" >&6; }
-      glib_memory_barrier_needed=no
-      ;;
     i?86)
       { $as_echo "$as_me:$LINENO: result: i486" >&5
 $as_echo "i486" >&6; }


--- NEW FILE import.log ---
mingw32-glib2-2_19_5-2_fc11:F-10:mingw32-glib2-2.19.5-2.fc11.src.rpm:1233143197


--- NEW FILE mingw32-glib2.spec ---
%define __strip %{_mingw32_strip}
%define __objdump %{_mingw32_objdump}
%define _use_internal_dependency_generator 0
%define __find_requires %{_mingw32_findrequires}
%define __find_provides %{_mingw32_findprovides}

Name:           mingw32-glib2
Version:        2.19.5
Release:        2%{?dist}
Summary:        MinGW Windows GLib2 library

License:        LGPLv2+
Group:          Development/Libraries
URL:            http://www.gtk.org
Source0:        http://download.gnome.org/sources/glib/2.19/glib-%{version}.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch

Patch0:         glib-i386-atomic.patch

BuildRequires:  mingw32-filesystem >= 43-6
BuildRequires:  mingw32-gcc
BuildRequires:  mingw32-binutils
BuildRequires:  mingw32-dlfcn
BuildRequires:  mingw32-iconv
BuildRequires:  mingw32-gettext

BuildRequires:  pkgconfig
# Native version required for msgfmt use in build
BuildRequires:  gettext
# Native version required for glib-genmarshal
BuildRequires:  glib2-devel

# These are required for the glib-i386-atomic patch.
BuildRequires:  autoconf, automake, libtool, gettext-devel, gtk-doc

%description
MinGW Windows Glib2 library.


%prep
%setup -q -n glib-%{version}
%patch0 -p1 -b .i386-atomic

# Required for the glib-i386-atomic patch.
libtoolize --force --copy
autoreconf


%build
%{_mingw32_configure} --disable-static
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT

make DESTDIR=$RPM_BUILD_ROOT install

rm -f $RPM_BUILD_ROOT/%{_mingw32_libdir}/charset.alias

# Remove manpages which duplicate Fedora native.
rm -rf $RPM_BUILD_ROOT%{_mingw32_mandir}

%find_lang glib20


%clean
rm -rf $RPM_BUILD_ROOT


%files -f glib20.lang
%defattr(-,root,root)
%{_mingw32_bindir}/glib-genmarshal.exe
%{_mingw32_bindir}/glib-gettextize
%{_mingw32_bindir}/glib-mkenums
%{_mingw32_bindir}/gobject-query.exe
%{_mingw32_bindir}/gspawn-win32-helper-console.exe
%{_mingw32_bindir}/gspawn-win32-helper.exe
%{_mingw32_bindir}/libgio-2.0-0.dll
%{_mingw32_bindir}/libglib-2.0-0.dll
%{_mingw32_bindir}/libgmodule-2.0-0.dll
%{_mingw32_bindir}/libgobject-2.0-0.dll
%{_mingw32_bindir}/libgthread-2.0-0.dll
%{_mingw32_includedir}/glib-2.0/
%{_mingw32_libdir}/gio-2.0.def
%{_mingw32_libdir}/glib-2.0.def
%{_mingw32_libdir}/glib-2.0/
%{_mingw32_libdir}/gmodule-2.0.def
%{_mingw32_libdir}/gobject-2.0.def
%{_mingw32_libdir}/gthread-2.0.def
%{_mingw32_libdir}/libgio-2.0.dll.a
%{_mingw32_libdir}/libgio-2.0.la
%{_mingw32_libdir}/libglib-2.0.dll.a
%{_mingw32_libdir}/libglib-2.0.la
%{_mingw32_libdir}/libgmodule-2.0.dll.a
%{_mingw32_libdir}/libgmodule-2.0.la
%{_mingw32_libdir}/libgobject-2.0.dll.a
%{_mingw32_libdir}/libgobject-2.0.la
%{_mingw32_libdir}/libgthread-2.0.dll.a
%{_mingw32_libdir}/libgthread-2.0.la
%{_mingw32_libdir}/pkgconfig/gio-2.0.pc
%{_mingw32_libdir}/pkgconfig/gio-unix-2.0.pc
%{_mingw32_libdir}/pkgconfig/glib-2.0.pc
%{_mingw32_libdir}/pkgconfig/gmodule-2.0.pc
%{_mingw32_libdir}/pkgconfig/gmodule-export-2.0.pc
%{_mingw32_libdir}/pkgconfig/gmodule-no-export-2.0.pc
%{_mingw32_libdir}/pkgconfig/gobject-2.0.pc
%{_mingw32_libdir}/pkgconfig/gthread-2.0.pc
%{_mingw32_datadir}/aclocal/glib-2.0.m4
%{_mingw32_datadir}/aclocal/glib-gettext.m4
%{_mingw32_datadir}/glib-2.0/
%{_mingw32_datadir}/gtk-doc/html/gio/
%{_mingw32_datadir}/gtk-doc/html/glib/
%{_mingw32_datadir}/gtk-doc/html/gobject/


%changelog
* Fri Jan 23 2009 Richard W.M. Jones <rjones at redhat.com> - 2.19.5-2
- Rebase to native Fedora version 2.19.5.
- Use _smp_mflags.
- Use find_lang.
- Don't build static libraries.
- +BR dlfcn.

* Wed Sep 24 2008 Richard W.M. Jones <rjones at redhat.com> - 2.18.1-2
- Rename mingw -> mingw32.

* Mon Sep 22 2008 Daniel P. Berrange <berrange at redhat.com> - 2.18.1-1
- Update to 2.18.1 release

* Sun Sep 21 2008 Richard W.M. Jones <rjones at redhat.com> - 2.18.0-3
- Remove manpages which duplicate Fedora native.

* Thu Sep 11 2008 Daniel P. Berrange <berrange at redhat.com> - 2.18.0-2
- Add BR on pkgconfig, gettext and glib2 (native)

* Tue Sep  9 2008 Daniel P. Berrange <berrange at redhat.com> - 2.18.0-1
- Initial RPM release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-glib2/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	26 Jan 2009 22:44:07 -0000	1.1
+++ .cvsignore	28 Jan 2009 11:50:18 -0000	1.2
@@ -0,0 +1 @@
+glib-2.19.5.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-glib2/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	26 Jan 2009 22:44:07 -0000	1.1
+++ sources	28 Jan 2009 11:50:18 -0000	1.2
@@ -0,0 +1 @@
+b9f8453dd38266108641c448ea8d5bee  glib-2.19.5.tar.bz2



From rjones at fedoraproject.org  Wed Jan 28 11:50:19 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Wed, 28 Jan 2009 11:50:19 +0000 (UTC)
Subject: rpms/mingw32-cairo/EL-5 import.log, NONE, 1.1 mingw32-cairo.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090128115019.B845B70141@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/mingw32-cairo/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28213/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	import.log mingw32-cairo.spec 
Log Message:
Initial import.



--- NEW FILE import.log ---
mingw32-cairo-1_8_0-6_fc11:EL-5:mingw32-cairo-1.8.0-6.fc11.src.rpm:1233143138


--- NEW FILE mingw32-cairo.spec ---
%define __strip %{_mingw32_strip}
%define __objdump %{_mingw32_objdump}
%define _use_internal_dependency_generator 0
%define __find_requires %{_mingw32_findrequires}
%define __find_provides %{_mingw32_findprovides}

Name:           mingw32-cairo
Version:        1.8.0
Release:        6%{?dist}
Summary:        MinGW Windows Cairo library

License:        LGPLv2 or MPLv1.1
URL:            http://cairographics.org
Source0:        http://cairographics.org/snapshots/cairo-%{version}.tar.gz
Group:          Development/Libraries
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch

BuildRequires:  mingw32-filesystem >= 23
BuildRequires:  mingw32-gcc
BuildRequires:  mingw32-binutils
BuildRequires:  mingw32-libxml2
BuildRequires:  mingw32-pixman
BuildRequires:  mingw32-libpng
BuildRequires:  mingw32-dlfcn
BuildRequires:  mingw32-iconv
BuildRequires:  mingw32-zlib
BuildRequires:  pkgconfig

# These are BRs for the base package, but are not needed on Win32
# because Cairo includes a separate Win32 font rendering back end
# (thanks to: Erik van Pienbroek).
#BuildRequires:  mingw32-fontconfig
#BuildRequires:  mingw32-freetype

Requires:       pkgconfig


%description
MinGW Windows Cairo library.


%prep
%setup -q -n cairo-%{version}


%build
%{_mingw32_configure} \
  --disable-xlib \
  --disable-xcb \
  --enable-win32 \
  --enable-png \
  --disable-static \
  --disable-ft
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT

make DESTDIR=$RPM_BUILD_ROOT install

rm -f $RPM_BUILD_ROOT%{_mingw32_libdir}/charset.alias


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root)
%doc COPYING COPYING-LGPL-2.1 COPYING-MPL-1.1
%{_mingw32_bindir}/libcairo-2.dll
%{_mingw32_includedir}/cairo/
%{_mingw32_libdir}/libcairo.dll.a
%{_mingw32_libdir}/libcairo.la
%{_mingw32_libdir}/pkgconfig/cairo-pdf.pc
%{_mingw32_libdir}/pkgconfig/cairo-png.pc
%{_mingw32_libdir}/pkgconfig/cairo-ps.pc
%{_mingw32_libdir}/pkgconfig/cairo-svg.pc
%{_mingw32_libdir}/pkgconfig/cairo-win32-font.pc
%{_mingw32_libdir}/pkgconfig/cairo-win32.pc
%{_mingw32_libdir}/pkgconfig/cairo.pc
%{_mingw32_datadir}/gtk-doc/html/cairo/


%changelog
* Mon Jan 26 2009 Richard W.M. Jones <rjones at redhat.com> - 1.8.0-6
- Requires pkgconfig (Erik van Pienbroek).

* Mon Jan 26 2009 Richard W.M. Jones <rjones at redhat.com> - 1.8.0-5
- Don't need to remove extra pkgconfig file in install section.

* Mon Jan 26 2009 Richard W.M. Jones <rjones at redhat.com> - 1.8.0-4
- Disable freetype in configure so it doesn't break if freetype
  or fontconfig are actually installed. (Erik van Pienbroek).

* Mon Jan 19 2009 Richard W.M. Jones <rjones at redhat.com> - 1.8.0-3
- Include license file in documentation section.
- Disable building static library to save time.
- Remove BRs on mingw32-fontconfig and mingw32-freetype which are
  not needed on Win32.
- Use _smp_mflags.
- Added BRs mingw32-dlfcn, mingw32-iconv, mingw32-zlib.

* Wed Oct 29 2008 Richard W.M. Jones <rjones at redhat.com> - 1.8.0-2
- Fix mixed spaces/tabs in specfile.

* Fri Oct 24 2008 Richard W.M. Jones <rjones at redhat.com> - 1.8.0-1
- New upstream version 1.8.0.

* Wed Sep 24 2008 Richard W.M. Jones <rjones at redhat.com> - 1.7.4-4
- Rename mingw -> mingw32.

* Thu Sep 11 2008 Daniel P. Berrange <berrange at redhat.com> - 1.7.4-3
- Added dep on pkgconfig

* Wed Sep 10 2008 Richard W.M. Jones <rjones at redhat.com> - 1.7.4-2
- Remove static libraries.
- Fix source URL.

* Tue Sep  9 2008 Daniel P. Berrange <berrange at redhat.com> - 1.7.4-1
- Initial RPM release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-cairo/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	26 Jan 2009 22:16:07 -0000	1.1
+++ .cvsignore	28 Jan 2009 11:49:48 -0000	1.2
@@ -0,0 +1 @@
+cairo-1.8.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-cairo/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	26 Jan 2009 22:16:07 -0000	1.1
+++ sources	28 Jan 2009 11:49:49 -0000	1.2
@@ -0,0 +1 @@
+4ea70ea87b47e92d318d4e7f5b940f47  cairo-1.8.0.tar.gz



From rjones at fedoraproject.org  Wed Jan 28 11:50:38 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Wed, 28 Jan 2009 11:50:38 +0000 (UTC)
Subject: rpms/mingw32-cairo/F-10 import.log, NONE, 1.1 mingw32-cairo.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090128115038.CE3FC7010D@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/mingw32-cairo/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28389/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	import.log mingw32-cairo.spec 
Log Message:
Initial import.



--- NEW FILE import.log ---
mingw32-cairo-1_8_0-6_fc11:F-10:mingw32-cairo-1.8.0-6.fc11.src.rpm:1233143139


--- NEW FILE mingw32-cairo.spec ---
%define __strip %{_mingw32_strip}
%define __objdump %{_mingw32_objdump}
%define _use_internal_dependency_generator 0
%define __find_requires %{_mingw32_findrequires}
%define __find_provides %{_mingw32_findprovides}

Name:           mingw32-cairo
Version:        1.8.0
Release:        6%{?dist}
Summary:        MinGW Windows Cairo library

License:        LGPLv2 or MPLv1.1
URL:            http://cairographics.org
Source0:        http://cairographics.org/snapshots/cairo-%{version}.tar.gz
Group:          Development/Libraries
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch

BuildRequires:  mingw32-filesystem >= 23
BuildRequires:  mingw32-gcc
BuildRequires:  mingw32-binutils
BuildRequires:  mingw32-libxml2
BuildRequires:  mingw32-pixman
BuildRequires:  mingw32-libpng
BuildRequires:  mingw32-dlfcn
BuildRequires:  mingw32-iconv
BuildRequires:  mingw32-zlib
BuildRequires:  pkgconfig

# These are BRs for the base package, but are not needed on Win32
# because Cairo includes a separate Win32 font rendering back end
# (thanks to: Erik van Pienbroek).
#BuildRequires:  mingw32-fontconfig
#BuildRequires:  mingw32-freetype

Requires:       pkgconfig


%description
MinGW Windows Cairo library.


%prep
%setup -q -n cairo-%{version}


%build
%{_mingw32_configure} \
  --disable-xlib \
  --disable-xcb \
  --enable-win32 \
  --enable-png \
  --disable-static \
  --disable-ft
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT

make DESTDIR=$RPM_BUILD_ROOT install

rm -f $RPM_BUILD_ROOT%{_mingw32_libdir}/charset.alias


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root)
%doc COPYING COPYING-LGPL-2.1 COPYING-MPL-1.1
%{_mingw32_bindir}/libcairo-2.dll
%{_mingw32_includedir}/cairo/
%{_mingw32_libdir}/libcairo.dll.a
%{_mingw32_libdir}/libcairo.la
%{_mingw32_libdir}/pkgconfig/cairo-pdf.pc
%{_mingw32_libdir}/pkgconfig/cairo-png.pc
%{_mingw32_libdir}/pkgconfig/cairo-ps.pc
%{_mingw32_libdir}/pkgconfig/cairo-svg.pc
%{_mingw32_libdir}/pkgconfig/cairo-win32-font.pc
%{_mingw32_libdir}/pkgconfig/cairo-win32.pc
%{_mingw32_libdir}/pkgconfig/cairo.pc
%{_mingw32_datadir}/gtk-doc/html/cairo/


%changelog
* Mon Jan 26 2009 Richard W.M. Jones <rjones at redhat.com> - 1.8.0-6
- Requires pkgconfig (Erik van Pienbroek).

* Mon Jan 26 2009 Richard W.M. Jones <rjones at redhat.com> - 1.8.0-5
- Don't need to remove extra pkgconfig file in install section.

* Mon Jan 26 2009 Richard W.M. Jones <rjones at redhat.com> - 1.8.0-4
- Disable freetype in configure so it doesn't break if freetype
  or fontconfig are actually installed. (Erik van Pienbroek).

* Mon Jan 19 2009 Richard W.M. Jones <rjones at redhat.com> - 1.8.0-3
- Include license file in documentation section.
- Disable building static library to save time.
- Remove BRs on mingw32-fontconfig and mingw32-freetype which are
  not needed on Win32.
- Use _smp_mflags.
- Added BRs mingw32-dlfcn, mingw32-iconv, mingw32-zlib.

* Wed Oct 29 2008 Richard W.M. Jones <rjones at redhat.com> - 1.8.0-2
- Fix mixed spaces/tabs in specfile.

* Fri Oct 24 2008 Richard W.M. Jones <rjones at redhat.com> - 1.8.0-1
- New upstream version 1.8.0.

* Wed Sep 24 2008 Richard W.M. Jones <rjones at redhat.com> - 1.7.4-4
- Rename mingw -> mingw32.

* Thu Sep 11 2008 Daniel P. Berrange <berrange at redhat.com> - 1.7.4-3
- Added dep on pkgconfig

* Wed Sep 10 2008 Richard W.M. Jones <rjones at redhat.com> - 1.7.4-2
- Remove static libraries.
- Fix source URL.

* Tue Sep  9 2008 Daniel P. Berrange <berrange at redhat.com> - 1.7.4-1
- Initial RPM release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-cairo/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	26 Jan 2009 22:16:07 -0000	1.1
+++ .cvsignore	28 Jan 2009 11:50:08 -0000	1.2
@@ -0,0 +1 @@
+cairo-1.8.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-cairo/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	26 Jan 2009 22:16:07 -0000	1.1
+++ sources	28 Jan 2009 11:50:08 -0000	1.2
@@ -0,0 +1 @@
+4ea70ea87b47e92d318d4e7f5b940f47  cairo-1.8.0.tar.gz



From rjones at fedoraproject.org  Wed Jan 28 11:50:56 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Wed, 28 Jan 2009 11:50:56 +0000 (UTC)
Subject: rpms/mingw32-libxml2/F-10 import.log, NONE,
	1.1 mingw32-libxml2-2.7.2-with-modules.patch, NONE,
	1.1 mingw32-libxml2.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <20090128115056.6FD5A7010D@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/mingw32-libxml2/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28718/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	import.log mingw32-libxml2-2.7.2-with-modules.patch 
	mingw32-libxml2.spec 
Log Message:
Initial import.



--- NEW FILE import.log ---
mingw32-libxml2-2_7_2-6_fc11:F-10:mingw32-libxml2-2.7.2-6.fc11.src.rpm:1233143206

mingw32-libxml2-2.7.2-with-modules.patch:

--- NEW FILE mingw32-libxml2-2.7.2-with-modules.patch ---
--- libxml2-2.7.2/configure.in~	2008-10-03 08:09:55.000000000 +0100
+++ libxml2-2.7.2/configure.in	2008-10-25 23:14:18.000000000 +0100
@@ -751,6 +751,12 @@
     AC_DEFINE([HAVE_DLOPEN], [], [Have dlopen based dso])
   ])
   ;;
+  *-*-mingw*)
+  # If I configured --with-modules then I damn well want
+  # modules and don't try to second-guess me.
+  MODULE_EXTENSION=".dll"
+  WITH_MODULES=1
+  ;;
   *)
   AC_CHECK_FUNC(shl_load, libxml_have_shl_load=yes, [
     AC_CHECK_LIB(dld, shl_load, [


--- NEW FILE mingw32-libxml2.spec ---
%define __strip %{_mingw32_strip}
%define __objdump %{_mingw32_objdump}
%define _use_internal_dependency_generator 0
%define __find_requires %{_mingw32_findrequires}
%define __find_provides %{_mingw32_findprovides}

Name:           mingw32-libxml2
Version:        2.7.2
Release:        6%{?dist}
Summary:        MinGW Windows libxml2 XML processing library

License:        MIT
Group:          Development/Libraries
URL:            http://xmlsoft.org/
Source0:        ftp://xmlsoft.org/libxml2/libxml2-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

# Not required for MinGW.
#Patch0:         libxml2-multilib.patch

# MinGW-specific patches.
Patch1000:      mingw32-libxml2-2.7.2-with-modules.patch

BuildArch:      noarch

BuildRequires:  mingw32-filesystem >= 23
BuildRequires:  mingw32-gcc
BuildRequires:  mingw32-binutils

BuildRequires:  mingw32-dlfcn
BuildRequires:  mingw32-gettext
BuildRequires:  mingw32-iconv
BuildRequires:  mingw32-zlib

BuildRequires:  autoconf, automake, libtool

Requires:       pkgconfig


%description
MinGW Windows libxml2 XML processing library.


%prep
%setup -q -n libxml2-%{version}

%patch1000 -p1

# Patched configure.in, so rebuild configure.
libtoolize --force --copy
autoreconf


%build
LDFLAGS="-no-undefined" \
%{_mingw32_configure} --without-python --with-modules --disable-static
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT

make DESTDIR=$RPM_BUILD_ROOT install

# Remove manpages which duplicate Fedora native.
rm -rf $RPM_BUILD_ROOT%{_mingw32_mandir}


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root)
%{_mingw32_bindir}/libxml2-2.dll
%{_mingw32_bindir}/xml2-config
%{_mingw32_bindir}/xmlcatalog.exe
%{_mingw32_bindir}/xmllint.exe
%{_mingw32_libdir}/libxml2.dll.a
%{_mingw32_libdir}/libxml2.la
%{_mingw32_libdir}/pkgconfig
%{_mingw32_libdir}/pkgconfig/libxml-2.0.pc
%{_mingw32_libdir}/xml2Conf.sh
%{_mingw32_includedir}/libxml2
%{_mingw32_datadir}/aclocal/*
%{_mingw32_docdir}/libxml2-%{version}/
%{_mingw32_datadir}/gtk-doc/html/libxml2/


%changelog
* Mon Jan 26 2009 Richard W.M. Jones <rjones at redhat.com> - 2.7.2-6
- Rerun autoreconf after patching configure.in (Erik van Pienbroek).
- Rebuild libtool for Rawhide / libtool 2.
- Add BRs dlfcn and iconv.

* Fri Jan 23 2009 Richard W.M. Jones <rjones at redhat.com> - 2.7.2-5
- Use _smp_mflags.
- Disable static libraries.

* Tue Jan 13 2009 Richard W.M. Jones <rjones at redhat.com> - 2.7.2-4
- Requires pkgconfig.

* Sat Oct 25 2008 Richard W.M. Jones <rjones at redhat.com> - 2.7.2-3
- Enable modules support for libxslt.

* Fri Oct 17 2008 Richard W.M. Jones <rjones at redhat.com> - 2.7.2-1
- Resynch to native Fedora package + patch.

* Wed Sep 24 2008 Richard W.M. Jones <rjones at redhat.com> - 2.7.1-2
- Rename mingw -> mingw32.

* Mon Sep 22 2008 Daniel P. Berrange <berrange at redhat.com> - 2.7.1-1
- Update to 2.7.1 release

* Sun Sep 21 2008 Richard W.M. Jones <rjones at redhat.com> - 2.6.32-5
- Remove manpages which duplicate Fedora native.

* Wed Sep 10 2008 Richard W.M. Jones <rjones at redhat.com> - 2.6.32-4
- Remove static libraries.
- List libdir files explicitly.

* Fri Sep  5 2008 Richard W.M. Jones <rjones at redhat.com> - 2.6.32-3
- Use RPM macros from mingw-filesystem.
- BuildArch is noarch.

* Mon Jul  7 2008 Richard W.M. Jones <rjones at redhat.com> - 2.6.32-1
- Initial RPM release, largely based on earlier work from several sources.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-libxml2/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	26 Jan 2009 22:45:14 -0000	1.1
+++ .cvsignore	28 Jan 2009 11:50:25 -0000	1.2
@@ -0,0 +1 @@
+libxml2-2.7.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-libxml2/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	26 Jan 2009 22:45:14 -0000	1.1
+++ sources	28 Jan 2009 11:50:26 -0000	1.2
@@ -0,0 +1 @@
+dc43ff7ae6aded45f578c87b7b0c8766  libxml2-2.7.2.tar.gz



From rjones at fedoraproject.org  Wed Jan 28 11:51:01 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Wed, 28 Jan 2009 11:51:01 +0000 (UTC)
Subject: rpms/mingw32-libxml2/EL-5 import.log, NONE,
	1.1 mingw32-libxml2-2.7.2-with-modules.patch, NONE,
	1.1 mingw32-libxml2.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <20090128115101.364D07010D@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/mingw32-libxml2/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28747/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	import.log mingw32-libxml2-2.7.2-with-modules.patch 
	mingw32-libxml2.spec 
Log Message:
Initial import.



--- NEW FILE import.log ---
mingw32-libxml2-2_7_2-6_fc11:EL-5:mingw32-libxml2-2.7.2-6.fc11.src.rpm:1233143197

mingw32-libxml2-2.7.2-with-modules.patch:

--- NEW FILE mingw32-libxml2-2.7.2-with-modules.patch ---
--- libxml2-2.7.2/configure.in~	2008-10-03 08:09:55.000000000 +0100
+++ libxml2-2.7.2/configure.in	2008-10-25 23:14:18.000000000 +0100
@@ -751,6 +751,12 @@
     AC_DEFINE([HAVE_DLOPEN], [], [Have dlopen based dso])
   ])
   ;;
+  *-*-mingw*)
+  # If I configured --with-modules then I damn well want
+  # modules and don't try to second-guess me.
+  MODULE_EXTENSION=".dll"
+  WITH_MODULES=1
+  ;;
   *)
   AC_CHECK_FUNC(shl_load, libxml_have_shl_load=yes, [
     AC_CHECK_LIB(dld, shl_load, [


--- NEW FILE mingw32-libxml2.spec ---
%define __strip %{_mingw32_strip}
%define __objdump %{_mingw32_objdump}
%define _use_internal_dependency_generator 0
%define __find_requires %{_mingw32_findrequires}
%define __find_provides %{_mingw32_findprovides}

Name:           mingw32-libxml2
Version:        2.7.2
Release:        6%{?dist}
Summary:        MinGW Windows libxml2 XML processing library

License:        MIT
Group:          Development/Libraries
URL:            http://xmlsoft.org/
Source0:        ftp://xmlsoft.org/libxml2/libxml2-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

# Not required for MinGW.
#Patch0:         libxml2-multilib.patch

# MinGW-specific patches.
Patch1000:      mingw32-libxml2-2.7.2-with-modules.patch

BuildArch:      noarch

BuildRequires:  mingw32-filesystem >= 23
BuildRequires:  mingw32-gcc
BuildRequires:  mingw32-binutils

BuildRequires:  mingw32-dlfcn
BuildRequires:  mingw32-gettext
BuildRequires:  mingw32-iconv
BuildRequires:  mingw32-zlib

BuildRequires:  autoconf, automake, libtool

Requires:       pkgconfig


%description
MinGW Windows libxml2 XML processing library.


%prep
%setup -q -n libxml2-%{version}

%patch1000 -p1

# Patched configure.in, so rebuild configure.
libtoolize --force --copy
autoreconf


%build
LDFLAGS="-no-undefined" \
%{_mingw32_configure} --without-python --with-modules --disable-static
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT

make DESTDIR=$RPM_BUILD_ROOT install

# Remove manpages which duplicate Fedora native.
rm -rf $RPM_BUILD_ROOT%{_mingw32_mandir}


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root)
%{_mingw32_bindir}/libxml2-2.dll
%{_mingw32_bindir}/xml2-config
%{_mingw32_bindir}/xmlcatalog.exe
%{_mingw32_bindir}/xmllint.exe
%{_mingw32_libdir}/libxml2.dll.a
%{_mingw32_libdir}/libxml2.la
%{_mingw32_libdir}/pkgconfig
%{_mingw32_libdir}/pkgconfig/libxml-2.0.pc
%{_mingw32_libdir}/xml2Conf.sh
%{_mingw32_includedir}/libxml2
%{_mingw32_datadir}/aclocal/*
%{_mingw32_docdir}/libxml2-%{version}/
%{_mingw32_datadir}/gtk-doc/html/libxml2/


%changelog
* Mon Jan 26 2009 Richard W.M. Jones <rjones at redhat.com> - 2.7.2-6
- Rerun autoreconf after patching configure.in (Erik van Pienbroek).
- Rebuild libtool for Rawhide / libtool 2.
- Add BRs dlfcn and iconv.

* Fri Jan 23 2009 Richard W.M. Jones <rjones at redhat.com> - 2.7.2-5
- Use _smp_mflags.
- Disable static libraries.

* Tue Jan 13 2009 Richard W.M. Jones <rjones at redhat.com> - 2.7.2-4
- Requires pkgconfig.

* Sat Oct 25 2008 Richard W.M. Jones <rjones at redhat.com> - 2.7.2-3
- Enable modules support for libxslt.

* Fri Oct 17 2008 Richard W.M. Jones <rjones at redhat.com> - 2.7.2-1
- Resynch to native Fedora package + patch.

* Wed Sep 24 2008 Richard W.M. Jones <rjones at redhat.com> - 2.7.1-2
- Rename mingw -> mingw32.

* Mon Sep 22 2008 Daniel P. Berrange <berrange at redhat.com> - 2.7.1-1
- Update to 2.7.1 release

* Sun Sep 21 2008 Richard W.M. Jones <rjones at redhat.com> - 2.6.32-5
- Remove manpages which duplicate Fedora native.

* Wed Sep 10 2008 Richard W.M. Jones <rjones at redhat.com> - 2.6.32-4
- Remove static libraries.
- List libdir files explicitly.

* Fri Sep  5 2008 Richard W.M. Jones <rjones at redhat.com> - 2.6.32-3
- Use RPM macros from mingw-filesystem.
- BuildArch is noarch.

* Mon Jul  7 2008 Richard W.M. Jones <rjones at redhat.com> - 2.6.32-1
- Initial RPM release, largely based on earlier work from several sources.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-libxml2/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	26 Jan 2009 22:45:14 -0000	1.1
+++ .cvsignore	28 Jan 2009 11:50:30 -0000	1.2
@@ -0,0 +1 @@
+libxml2-2.7.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-libxml2/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	26 Jan 2009 22:45:14 -0000	1.1
+++ sources	28 Jan 2009 11:50:30 -0000	1.2
@@ -0,0 +1 @@
+dc43ff7ae6aded45f578c87b7b0c8766  libxml2-2.7.2.tar.gz



From rjones at fedoraproject.org  Wed Jan 28 11:51:03 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Wed, 28 Jan 2009 11:51:03 +0000 (UTC)
Subject: rpms/mingw32-glib2/EL-5 glib-i386-atomic.patch, NONE, 1.1 import.log,
	NONE, 1.1 mingw32-glib2.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090128115103.553AF7010D@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/mingw32-glib2/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28794/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	glib-i386-atomic.patch import.log mingw32-glib2.spec 
Log Message:
Initial import.


glib-i386-atomic.patch:

--- NEW FILE glib-i386-atomic.patch ---
diff -up glib-2.16.6/configure.atomic glib-2.16.6/configure
--- glib-2.16.6/configure.atomic	2008-10-27 18:24:20.000000000 -0400
+++ glib-2.16.6/configure	2008-10-27 18:24:31.000000000 -0400
@@ -42742,11 +42742,6 @@ $as_echo_n "checking whether to use asse
 
 if test x"$GCC" = xyes; then
   case $host_cpu in
-    i386)
-      { $as_echo "$as_me:$LINENO: result: none" >&5
-$as_echo "none" >&6; }
-      glib_memory_barrier_needed=no
-      ;;
     i?86)
       { $as_echo "$as_me:$LINENO: result: i486" >&5
 $as_echo "i486" >&6; }


--- NEW FILE import.log ---
mingw32-glib2-2_19_5-2_fc11:EL-5:mingw32-glib2-2.19.5-2.fc11.src.rpm:1233143189


--- NEW FILE mingw32-glib2.spec ---
%define __strip %{_mingw32_strip}
%define __objdump %{_mingw32_objdump}
%define _use_internal_dependency_generator 0
%define __find_requires %{_mingw32_findrequires}
%define __find_provides %{_mingw32_findprovides}

Name:           mingw32-glib2
Version:        2.19.5
Release:        2%{?dist}
Summary:        MinGW Windows GLib2 library

License:        LGPLv2+
Group:          Development/Libraries
URL:            http://www.gtk.org
Source0:        http://download.gnome.org/sources/glib/2.19/glib-%{version}.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch

Patch0:         glib-i386-atomic.patch

BuildRequires:  mingw32-filesystem >= 43-6
BuildRequires:  mingw32-gcc
BuildRequires:  mingw32-binutils
BuildRequires:  mingw32-dlfcn
BuildRequires:  mingw32-iconv
BuildRequires:  mingw32-gettext

BuildRequires:  pkgconfig
# Native version required for msgfmt use in build
BuildRequires:  gettext
# Native version required for glib-genmarshal
BuildRequires:  glib2-devel

# These are required for the glib-i386-atomic patch.
BuildRequires:  autoconf, automake, libtool, gettext-devel, gtk-doc

%description
MinGW Windows Glib2 library.


%prep
%setup -q -n glib-%{version}
%patch0 -p1 -b .i386-atomic

# Required for the glib-i386-atomic patch.
libtoolize --force --copy
autoreconf


%build
%{_mingw32_configure} --disable-static
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT

make DESTDIR=$RPM_BUILD_ROOT install

rm -f $RPM_BUILD_ROOT/%{_mingw32_libdir}/charset.alias

# Remove manpages which duplicate Fedora native.
rm -rf $RPM_BUILD_ROOT%{_mingw32_mandir}

%find_lang glib20


%clean
rm -rf $RPM_BUILD_ROOT


%files -f glib20.lang
%defattr(-,root,root)
%{_mingw32_bindir}/glib-genmarshal.exe
%{_mingw32_bindir}/glib-gettextize
%{_mingw32_bindir}/glib-mkenums
%{_mingw32_bindir}/gobject-query.exe
%{_mingw32_bindir}/gspawn-win32-helper-console.exe
%{_mingw32_bindir}/gspawn-win32-helper.exe
%{_mingw32_bindir}/libgio-2.0-0.dll
%{_mingw32_bindir}/libglib-2.0-0.dll
%{_mingw32_bindir}/libgmodule-2.0-0.dll
%{_mingw32_bindir}/libgobject-2.0-0.dll
%{_mingw32_bindir}/libgthread-2.0-0.dll
%{_mingw32_includedir}/glib-2.0/
%{_mingw32_libdir}/gio-2.0.def
%{_mingw32_libdir}/glib-2.0.def
%{_mingw32_libdir}/glib-2.0/
%{_mingw32_libdir}/gmodule-2.0.def
%{_mingw32_libdir}/gobject-2.0.def
%{_mingw32_libdir}/gthread-2.0.def
%{_mingw32_libdir}/libgio-2.0.dll.a
%{_mingw32_libdir}/libgio-2.0.la
%{_mingw32_libdir}/libglib-2.0.dll.a
%{_mingw32_libdir}/libglib-2.0.la
%{_mingw32_libdir}/libgmodule-2.0.dll.a
%{_mingw32_libdir}/libgmodule-2.0.la
%{_mingw32_libdir}/libgobject-2.0.dll.a
%{_mingw32_libdir}/libgobject-2.0.la
%{_mingw32_libdir}/libgthread-2.0.dll.a
%{_mingw32_libdir}/libgthread-2.0.la
%{_mingw32_libdir}/pkgconfig/gio-2.0.pc
%{_mingw32_libdir}/pkgconfig/gio-unix-2.0.pc
%{_mingw32_libdir}/pkgconfig/glib-2.0.pc
%{_mingw32_libdir}/pkgconfig/gmodule-2.0.pc
%{_mingw32_libdir}/pkgconfig/gmodule-export-2.0.pc
%{_mingw32_libdir}/pkgconfig/gmodule-no-export-2.0.pc
%{_mingw32_libdir}/pkgconfig/gobject-2.0.pc
%{_mingw32_libdir}/pkgconfig/gthread-2.0.pc
%{_mingw32_datadir}/aclocal/glib-2.0.m4
%{_mingw32_datadir}/aclocal/glib-gettext.m4
%{_mingw32_datadir}/glib-2.0/
%{_mingw32_datadir}/gtk-doc/html/gio/
%{_mingw32_datadir}/gtk-doc/html/glib/
%{_mingw32_datadir}/gtk-doc/html/gobject/


%changelog
* Fri Jan 23 2009 Richard W.M. Jones <rjones at redhat.com> - 2.19.5-2
- Rebase to native Fedora version 2.19.5.
- Use _smp_mflags.
- Use find_lang.
- Don't build static libraries.
- +BR dlfcn.

* Wed Sep 24 2008 Richard W.M. Jones <rjones at redhat.com> - 2.18.1-2
- Rename mingw -> mingw32.

* Mon Sep 22 2008 Daniel P. Berrange <berrange at redhat.com> - 2.18.1-1
- Update to 2.18.1 release

* Sun Sep 21 2008 Richard W.M. Jones <rjones at redhat.com> - 2.18.0-3
- Remove manpages which duplicate Fedora native.

* Thu Sep 11 2008 Daniel P. Berrange <berrange at redhat.com> - 2.18.0-2
- Add BR on pkgconfig, gettext and glib2 (native)

* Tue Sep  9 2008 Daniel P. Berrange <berrange at redhat.com> - 2.18.0-1
- Initial RPM release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-glib2/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	26 Jan 2009 22:44:07 -0000	1.1
+++ .cvsignore	28 Jan 2009 11:50:32 -0000	1.2
@@ -0,0 +1 @@
+glib-2.19.5.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-glib2/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	26 Jan 2009 22:44:07 -0000	1.1
+++ sources	28 Jan 2009 11:50:33 -0000	1.2
@@ -0,0 +1 @@
+b9f8453dd38266108641c448ea8d5bee  glib-2.19.5.tar.bz2



From ovasik at fedoraproject.org  Wed Jan 28 12:02:03 2009
From: ovasik at fedoraproject.org (Ondrej Vasik)
Date: Wed, 28 Jan 2009 12:02:03 +0000 (UTC)
Subject: rpms/xmlto/devel xmlto-libpaper.patch, NONE,
	1.1 xmlto-xmllintoptions.patch, NONE, 1.1 xmlto.spec, 1.43, 1.44
Message-ID: <20090128120203.2F80B7010D@cvs1.fedora.phx.redhat.com>

Author: ovasik

Update of /cvs/extras/rpms/xmlto/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32130

Modified Files:
	xmlto.spec 
Added Files:
	xmlto-libpaper.patch xmlto-xmllintoptions.patch 
Log Message:
fix cleaning up of temporary files with libpaper(Debian), fix xmllint postvalid (added noent option), use nonet switch

xmlto-libpaper.patch:

--- NEW FILE xmlto-libpaper.patch ---
diff -urNp xmlto-0.0.21-orig/xmlto.in xmlto-0.0.21/xmlto.in
--- xmlto-0.0.21-orig/xmlto.in	2009-01-28 12:32:29.000000000 +0100
+++ xmlto-0.0.21/xmlto.in	2009-01-28 12:35:10.000000000 +0100
@@ -1,5 +1,5 @@
 #!@BASH@
-# 
+#
 # @PACKAGE@ - apply an XSL stylesheet to an XML document
 # Copyright (C) 2001, 2002, 2003  Tim Waugh <twaugh at redhat.com>
 
@@ -106,6 +106,8 @@ then
   if [ -n "$paperheight" -a -n "$paperwidth" ]
   then
     papersizemod=$(${MKTEMP} ${TMPDIR:-/tmp}/@PACKAGE at -xsl.XXXXXX)
+    CLEANFILES[$CLEANFILE_COUNT]="$papersizemod"
+    CLEANFILE_COUNT=$(($CLEANFILE_COUNT + 1))
     cat << EOF > "$papersizemod"
 <?xml version='1.0'?>
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
@@ -337,8 +339,6 @@ case "$DEST_FORMAT" in
   fo | pdf | ps | dvi)
     if [ -n "$papersizemod" ]
     then
-      CLEANFILES[$CLEANFILE_COUNT]="$papersizemod"
-      CLEANFILE_COUNT=$(($CLEANFILE_COUNT + 1))
       XSL_MODS[$XSL_MOD_COUNT]="$papersizemod"
       XSL_MOD_COUNT=$(($XSL_MOD_COUNT + 1))
     fi

xmlto-xmllintoptions.patch:

--- NEW FILE xmlto-xmllintoptions.patch ---
diff -urNp xmlto-0.0.21-orig/xmlto.in xmlto-0.0.21/xmlto.in
--- xmlto-0.0.21-orig/xmlto.in	2009-01-28 12:51:19.000000000 +0100
+++ xmlto-0.0.21/xmlto.in	2009-01-28 12:54:35.000000000 +0100
@@ -427,8 +427,10 @@ if [ "$SKIP_VALIDATION" -eq 0 ] && [ "$S
 then
   VALIDATION="${XSLT_PROCESSED_DIR}/validation-errors"
   [ "$VERBOSE" -ge 1 ] && \
-    echo >&2 "xmllint >/dev/null --xinclude --postvalid \"$INPUT_FILE\""
-  xmllint >/dev/null --xinclude --postvalid "$INPUT_FILE" 2>"${VALIDATION}"
+  echo >&2 \
+    "xmllint >/dev/null --nonet --xinclude --postvalid --noent \"$INPUT_FILE\""
+  xmllint >/dev/null --nonet --xinclude --postvalid --noent \
+    "$INPUT_FILE" 2>"${VALIDATION}"
   xmllint_status=$?
   if [ $xmllint_status -ne 0 ]
   then


Index: xmlto.spec
===================================================================
RCS file: /cvs/extras/rpms/xmlto/devel/xmlto.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- xmlto.spec	5 Jan 2009 17:01:32 -0000	1.43
+++ xmlto.spec	28 Jan 2009 12:01:32 -0000	1.44
@@ -1,7 +1,7 @@
 Summary: A tool for converting XML files to various formats
 Name: xmlto
 Version: 0.0.21
-Release: 5%{?dist}
+Release: 6%{?dist}
 #xmlto is released under GPLv2+ license, xmlif under GPL+ license
 License: GPLv2+ and GPL+
 Group: Applications/System
@@ -11,6 +11,8 @@
 URL: https://fedorahosted.org/xmlto/
 Source0: https://fedorahosted.org/releases/x/m/%{name}/%{name}-%{version}.tar.bz2
 Patch0: xmlto-stringparam.patch
+Patch1: xmlto-libpaper.patch
+Patch2: xmlto-xmllintoptions.patch
 
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -45,6 +47,8 @@
 %prep
 %setup -q
 %patch0 -p1 -b .stringparam
+%patch1 -p1 -b .libpapercleanup
+%patch2 -p1 -b .xmllintoptions
 
 %build
 %configure
@@ -77,6 +81,11 @@
 %{_datadir}/xmlto/format/fo/pdf
 
 %changelog
+* Wed Jan 28 2009 Ondrej Vasik <ovasik at redhat.com> - 0.0.21-6
+- fix cleaning up of temporary files with libpaper(Debian)
+- fix xmllint postvalid (added noent option), use nonet
+  switch
+
 * Mon Jan 05 2009 Ondrej Vasik <ovasik at redhat.com> - 0.0.21-5
 - fix stringparam option functionality
 



From drago01 at fedoraproject.org  Wed Jan 28 12:03:45 2009
From: drago01 at fedoraproject.org (Adel Gadllah)
Date: Wed, 28 Jan 2009 12:03:45 +0000 (UTC)
Subject: rpms/beagle/devel beagle-0.3.9-gmime24.patch, NONE,
	1.1 beagle-0.3.9-libgnome-desktop-soname.patch, NONE,
	1.1 .cvsignore, 1.31, 1.32 beagle-0.2.15.1-libdir.patch, 1.1,
	1.2 beagle-0.3.8-epiphany.patch, 1.2, 1.3 beagle.spec, 1.158,
	1.159 sources, 1.34, 1.35 beagle-0.3.8-category-crash.patch, 1.2,
	NONE beagle-0.3.8-desktop-parser.patch, 1.1,
	NONE beagle-0.3.8-gmime-2.4.patch, 1.1,
	NONE beagle-0.3.8-libgnome-desktop-soname.patch, 1.2,
	NONE beagle-0.3.8-typo-fix.patch, 1.1, NONE
Message-ID: <20090128120345.CCC707010D@cvs1.fedora.phx.redhat.com>

Author: drago01

Update of /cvs/pkgs/rpms/beagle/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32487

Modified Files:
	.cvsignore beagle-0.2.15.1-libdir.patch 
	beagle-0.3.8-epiphany.patch beagle.spec sources 
Added Files:
	beagle-0.3.9-gmime24.patch 
	beagle-0.3.9-libgnome-desktop-soname.patch 
Removed Files:
	beagle-0.3.8-category-crash.patch 
	beagle-0.3.8-desktop-parser.patch beagle-0.3.8-gmime-2.4.patch 
	beagle-0.3.8-libgnome-desktop-soname.patch 
	beagle-0.3.8-typo-fix.patch 
Log Message:
Update to 0.3.9

beagle-0.3.9-gmime24.patch:

--- NEW FILE beagle-0.3.9-gmime24.patch ---
diff -upNr beagle-0.3.9.orign/beagled/EvolutionMailQueryable/EvolutionMailIndexableGenerator.cs beagle-0.3.9/beagled/EvolutionMailQueryable/EvolutionMailIndexableGenerator.cs
--- beagle-0.3.9.orign/beagled/EvolutionMailQueryable/EvolutionMailIndexableGenerator.cs	2008-04-25 20:17:04.000000000 +0200
+++ beagle-0.3.9/beagled/EvolutionMailQueryable/EvolutionMailIndexableGenerator.cs	2009-01-28 12:33:17.000000000 +0100
@@ -333,28 +333,46 @@ namespace Beagle.Daemon.EvolutionMailQue
                         indexable.AddProperty (Property.NewUnsearched ("fixme:folder", this.folder_name));
 
 			GMime.InternetAddressList addrs;
-
-			addrs = message.GetRecipients (GMime.Message.RecipientType.To);
-			foreach (GMime.InternetAddress ia in addrs) {
-				if (this.folder_name == "Sent" && ia.AddressType != GMime.InternetAddressType.Group)
-					indexable.AddProperty (Property.NewUnsearched ("fixme:sentTo", ia.Addr));
+			
+			if (this.folder_name == "Sent") {
+				addrs = message.GetRecipients (GMime.RecipientType.To);
+				foreach (GMime.InternetAddress ia in addrs) {
+					if (ia is GMime.InternetAddressMailbox) {
+						GMime.InternetAddressMailbox mailbox = ia as GMime.InternetAddressMailbox;
+						
+						indexable.AddProperty (Property.NewUnsearched ("fixme:sentTo", mailbox.Address));
+					}
+				}
+				
+				addrs.Dispose ();
 			}
-			addrs.Dispose ();
-
-			addrs = message.GetRecipients (GMime.Message.RecipientType.Cc);
-			foreach (GMime.InternetAddress ia in addrs) {
-				if (this.folder_name == "Sent"  && ia.AddressType != GMime.InternetAddressType.Group)
-					indexable.AddProperty (Property.NewUnsearched ("fixme:sentTo", ia.Addr));
+			
+			if (this.folder_name == "Sent") {
+				addrs = message.GetRecipients (GMime.RecipientType.Cc);
+				foreach (GMime.InternetAddress ia in addrs) {
+					if (ia is GMime.InternetAddressMailbox) {
+						GMime.InternetAddressMailbox mailbox = ia as GMime.InternetAddressMailbox;
+						
+						indexable.AddProperty (Property.NewUnsearched ("fixme:sentTo", mailbox.Address));
+					}
+				}
+				
+				addrs.Dispose ();
 			}
-			addrs.Dispose ();
-
-			addrs = GMime.InternetAddressList.ParseString (GMime.Utils.HeaderDecodePhrase (message.Sender));
-			foreach (GMime.InternetAddress ia in addrs) {
-				if (this.folder_name != "Sent"  && ia.AddressType != GMime.InternetAddressType.Group)
-					indexable.AddProperty (Property.NewUnsearched ("fixme:gotFrom", ia.Addr));
+			
+			if (this.folder_name != "Sent") {
+				addrs = GMime.InternetAddressList.Parse (message.Sender);
+				foreach (GMime.InternetAddress ia in addrs) {
+					if (ia is GMime.InternetAddressMailbox) {
+						GMime.InternetAddressMailbox mailbox = ia as GMime.InternetAddressMailbox;
+					
+						indexable.AddProperty (Property.NewUnsearched ("fixme:gotFrom", mailbox.Address));
+					}
+				}
+				
+				addrs.Dispose ();
 			}
-			addrs.Dispose ();
-
+			
 			if (this.folder_name == "Sent")
 				indexable.AddProperty (Property.NewFlag ("fixme:isSent"));
 
@@ -750,48 +768,54 @@ namespace Beagle.Daemon.EvolutionMailQue
 			}
 
 			GMime.InternetAddressList addrs;
-			addrs = GMime.InternetAddressList.ParseString (messageInfo.to);
+			addrs = GMime.InternetAddressList.Parse (messageInfo.to);
 			foreach (GMime.InternetAddress ia in addrs) {
+				GMime.InternetAddressMailbox mailbox = ia as GMime.InternetAddressMailbox;
+				
 				if (!have_content) {
 					indexable.AddProperty (Property.NewUnsearched ("fixme:to", ia.ToString (false)));
-					if (ia.AddressType != GMime.InternetAddressType.Group)
-						indexable.AddProperty (Property.New ("fixme:to_address", ia.Addr));
-
+					if (ia is GMime.InternetAddressMailbox)
+						indexable.AddProperty (Property.New ("fixme:to_address", mailbox.Address));
+					
 					indexable.AddProperty (Property.New ("fixme:to_name", ia.Name));
 				}
-
-				if (this.folder_name == "Sent" && ia.AddressType != GMime.InternetAddressType.Group)
-					indexable.AddProperty (Property.NewUnsearched ("fixme:sentTo", ia.Addr));
+				
+				if (this.folder_name == "Sent" && ia is GMime.InternetAddressMailbox)
+					indexable.AddProperty (Property.NewUnsearched ("fixme:sentTo", mailbox.Address));
 			}
 			addrs.Dispose ();
 
-			addrs = GMime.InternetAddressList.ParseString (messageInfo.cc);
+			addrs = GMime.InternetAddressList.Parse (messageInfo.cc);
 			foreach (GMime.InternetAddress ia in addrs) {
+				GMime.InternetAddressMailbox mailbox = ia as GMime.InternetAddressMailbox;
+				
 				if (!have_content) {
 					indexable.AddProperty (Property.NewUnsearched ("fixme:cc", ia.ToString (false)));
-					if (ia.AddressType != GMime.InternetAddressType.Group)
-						indexable.AddProperty (Property.New ("fixme:cc_address", ia.Addr));
-
+					if (ia is GMime.InternetAddressMailbox)
+						indexable.AddProperty (Property.New ("fixme:cc_address", mailbox.Address));
+					
 					indexable.AddProperty (Property.New ("fixme:cc_name", ia.Name));
 				}
-
-				if (this.folder_name == "Sent" && ia.AddressType != GMime.InternetAddressType.Group)
-					indexable.AddProperty (Property.NewUnsearched ("fixme:sentTo", ia.Addr));
+				
+				if (this.folder_name == "Sent" && ia is GMime.InternetAddressMailbox)
+					indexable.AddProperty (Property.NewUnsearched ("fixme:sentTo", mailbox.Address));
 			}
 			addrs.Dispose ();
 
-			addrs = GMime.InternetAddressList.ParseString (messageInfo.from);
+			addrs = GMime.InternetAddressList.Parse (messageInfo.from);
 			foreach (GMime.InternetAddress ia in addrs) {
+				GMime.InternetAddressMailbox mailbox = ia as GMime.InternetAddressMailbox;
+				
 				if (!have_content) {
 					indexable.AddProperty (Property.NewUnsearched ("fixme:from", ia.ToString (false)));
-					if (ia.AddressType != GMime.InternetAddressType.Group)
-						indexable.AddProperty (Property.New ("fixme:from_address", ia.Addr));
-
+					if (ia is GMime.InternetAddressMailbox)
+						indexable.AddProperty (Property.New ("fixme:from_address", mailbox.Address));
+					
 					indexable.AddProperty (Property.New ("fixme:from_name", ia.Name));
 				}
 
-				if (this.folder_name != "Sent" && ia.AddressType != GMime.InternetAddressType.Group)
-					indexable.AddProperty (Property.NewUnsearched ("fixme:gotFrom", ia.Addr));
+				if (this.folder_name != "Sent" && ia is GMime.InternetAddressMailbox)
+					indexable.AddProperty (Property.NewUnsearched ("fixme:gotFrom", mailbox.Address));
 			}
 			addrs.Dispose ();
 
diff -upNr beagle-0.3.9.orign/beagled/GoogleBackends/GMailSearchDriver.cs beagle-0.3.9/beagled/GoogleBackends/GMailSearchDriver.cs
--- beagle-0.3.9.orign/beagled/GoogleBackends/GMailSearchDriver.cs	2008-04-25 21:26:19.000000000 +0200
+++ beagle-0.3.9/beagled/GoogleBackends/GMailSearchDriver.cs	2009-01-28 12:33:17.000000000 +0100
@@ -322,38 +322,47 @@ namespace Beagle.Daemon.GoogleBackend {
 			hit.AddProperty (Property.NewDate ("fixme:date", message.Date.ToUniversalTime ()));
 
 			GMime.InternetAddressList addrs;
-			addrs = message.GetRecipients (GMime.Message.RecipientType.To);
+			addrs = message.GetRecipients (GMime.RecipientType.To);
 			foreach (GMime.InternetAddress ia in addrs) {
 				hit.AddProperty (Property.NewUnsearched ("fixme:to", ia.ToString (false)));
-				if (ia.AddressType != GMime.InternetAddressType.Group)
-					hit.AddProperty (Property.New ("fixme:to_address", ia.Addr));
-
+				if (ia is GMime.InternetAddressMailbox) {
+					GMime.InternetAddressMailbox mailbox = ia as GMime.InternetAddressMailbox;
+					
+					hit.AddProperty (Property.New ("fixme:to_address", mailbox.Address));
+				}
+				
 				hit.AddProperty (Property.New ("fixme:to_name", ia.Name));
 			}
 			addrs.Dispose ();
 
-			addrs = message.GetRecipients (GMime.Message.RecipientType.Cc);
+			addrs = message.GetRecipients (GMime.RecipientType.Cc);
 			foreach (GMime.InternetAddress ia in addrs) {
 				hit.AddProperty (Property.NewUnsearched ("fixme:cc", ia.ToString (false)));
-				if (ia.AddressType != GMime.InternetAddressType.Group)
-					hit.AddProperty (Property.New ("fixme:cc_address", ia.Addr));
-
+				if (ia is GMime.InternetAddressMailbox) {
+					GMime.InternetAddressMailbox mailbox = ia as GMime.InternetAddressMailbox;
+					
+					hit.AddProperty (Property.New ("fixme:cc_address", mailbox.Address));
+				}
+				
 				hit.AddProperty (Property.New ("fixme:cc_name", ia.Name));
 			}
 			addrs.Dispose ();
 
-			addrs = GMime.InternetAddressList.ParseString (GMime.Utils.HeaderDecodePhrase (message.Sender));
+			addrs = GMime.InternetAddressList.Parse (message.Sender);
 			foreach (GMime.InternetAddress ia in addrs) {
 				hit.AddProperty (Property.NewUnsearched ("fixme:from", ia.ToString (false)));
-				if (ia.AddressType != GMime.InternetAddressType.Group)
-					hit.AddProperty (Property.New ("fixme:from_address", ia.Addr));
-
+				if (ia is GMime.InternetAddressMailbox) {
+					GMime.InternetAddressMailbox mailbox = ia as GMime.InternetAddressMailbox;
+					
+					hit.AddProperty (Property.New ("fixme:from_address", mailbox.Address));
+				}
+				
 				hit.AddProperty (Property.New ("fixme:from_name", ia.Name));
 			}
 			addrs.Dispose ();
 
 			foreach (GMime.References refs in message.References)
-				hit.AddProperty (Property.NewUnsearched ("fixme:reference", refs.Msgid));
+				hit.AddProperty (Property.NewUnsearched ("fixme:reference", refs.MessageId));
 
 			string list_id = message.GetHeader ("List-Id");
 			if (list_id != null)
diff -upNr beagle-0.3.9.orign/beagled/KMailQueryable/KMailIndexer.cs beagle-0.3.9/beagled/KMailQueryable/KMailIndexer.cs
--- beagle-0.3.9.orign/beagled/KMailQueryable/KMailIndexer.cs	2008-02-10 21:24:19.000000000 +0100
+++ beagle-0.3.9/beagled/KMailQueryable/KMailIndexer.cs	2009-01-28 12:33:17.000000000 +0100
@@ -407,28 +407,46 @@ namespace Beagle.Daemon.KMailQueryable {
                         indexable.AddProperty (Property.NewUnsearched ("fixme:folder", folder_name));
 
 			GMime.InternetAddressList addrs;
-
-			addrs = message.GetRecipients (GMime.Message.RecipientType.To);
-			foreach (GMime.InternetAddress ia in addrs) {
-				if (folder_name == Queryable.SentMailFolderName && ia.AddressType != GMime.InternetAddressType.Group)
-					indexable.AddProperty (Property.NewKeyword ("fixme:sentTo", ia.Addr));
-			}
-			addrs.Dispose ();
-
-			addrs = message.GetRecipients (GMime.Message.RecipientType.Cc);
-			foreach (GMime.InternetAddress ia in addrs) {
-				if (folder_name == Queryable.SentMailFolderName && ia.AddressType != GMime.InternetAddressType.Group)
-					indexable.AddProperty (Property.NewKeyword ("fixme:sentTo", ia.Addr));
-			}
-			addrs.Dispose ();
-
-			addrs = GMime.InternetAddressList.ParseString (GMime.Utils.HeaderDecodePhrase (message.Sender));
-			foreach (GMime.InternetAddress ia in addrs) {
-				if (folder_name != Queryable.SentMailFolderName && ia.AddressType != GMime.InternetAddressType.Group)
-					indexable.AddProperty (Property.NewKeyword ("fixme:gotFrom", ia.Addr));
+			
+			if (folder_name == Queryable.SentMailFolderName) {
+				addrs = message.GetRecipients (GMime.RecipientType.To);
+				foreach (GMime.InternetAddress ia in addrs) {
+					if (ia is GMime.InternetAddressMailbox) {
+						GMime.InternetAddressMailbox mailbox = ia as GMime.InternetAddressMailbox;
+						
+						indexable.AddProperty (Property.NewKeyword ("fixme:sentTo", mailbox.Address));
+					}
+				}
+				
+				addrs.Dispose ();
 			}
-			addrs.Dispose ();
-
+			
+			if (folder_name == Queryable.SentMailFolderName) {
+				addrs = message.GetRecipients (GMime.RecipientType.Cc);
+				foreach (GMime.InternetAddress ia in addrs) {
+					if (ia is GMime.InternetAddressMailbox) {
+						GMime.InternetAddressMailbox mailbox = ia as GMime.InternetAddressMailbox;
+						
+						indexable.AddProperty (Property.NewKeyword ("fixme:sentTo", mailbox.Address));
+					}
+				}
+				
+				addrs.Dispose ();
+			}
+			
+			if (folder_name != Queryable.SentMailFolderName) {
+				addrs = GMime.InternetAddressList.Parse (message.Sender);
+				foreach (GMime.InternetAddress ia in addrs) {
+					if (ia is GMime.InternetAddressMailbox) {
+						GMime.InternetAddressMailbox mailbox = ia as GMime.InternetAddressMailbox;
+						
+						indexable.AddProperty (Property.NewKeyword ("fixme:gotFrom", mailbox.Address));
+					}
+				}
+				
+				addrs.Dispose ();
+			}
+			
 			if (folder_name == Queryable.SentMailFolderName)
 				indexable.AddProperty (Property.NewFlag ("fixme:isSent"));
 			else {
diff -upNr beagle-0.3.9.orign/beagled/ThunderbirdQueryable/ThunderbirdQueryable.cs beagle-0.3.9/beagled/ThunderbirdQueryable/ThunderbirdQueryable.cs
--- beagle-0.3.9.orign/beagled/ThunderbirdQueryable/ThunderbirdQueryable.cs	2008-07-18 16:27:59.000000000 +0200
+++ beagle-0.3.9/beagled/ThunderbirdQueryable/ThunderbirdQueryable.cs	2009-01-28 12:33:17.000000000 +0100
@@ -367,9 +367,14 @@ namespace Beagle.Daemon.ThunderbirdQuery
 			message.Subject = Mime.HeaderDecodeText (GetText (document, "Subject"));
 			message.Sender = Mime.HeaderDecodePhrase (GetText (document, "Author"));
 			message.MessageId = GetText (document, "MessageId");
-			message.SetDate (DateTimeUtil.UnixToDateTimeUtc (Convert.ToInt64 (GetText (document, "Date"))), 0);
-			message.AddRecipientsFromString ("To", Mime.HeaderDecodePhrase (GetText (document, "Recipients")));
-
+			message.Date = DateTimeUtil.UnixToDateTimeUtc (Convert.ToInt64 (GetText (document, "Date")));
+			
+			string str = GetText (document, "Recipients");
+			GMime.InternetAddressList recipients = GMime.InternetAddressList.Parse (str);
+			foreach (GMime.InternetAddress ia in recipients)
+				message.To.Add (ia);
+			recipients.Dispose ();
+			
 			return message;
 		}
 		
@@ -434,7 +439,7 @@ namespace Beagle.Daemon.ThunderbirdQuery
 			
 			// We _know_ that the stream comes from a StreamReader, which uses UTF8 by
 			// default. So we use that here when parsing our string.
-			return (str != null ? Encoding.UTF8.GetString (str, 0, pos) : string.Empty);
+			return (str != null ? System.Text.Encoding.UTF8.GetString (str, 0, pos) : string.Empty);
 		}
 		
 		// This spell "charset="
@@ -462,7 +467,7 @@ namespace Beagle.Daemon.ThunderbirdQuery
 			// instead of UTF-8 in some cases and that will really mess things up.
 			byte[] buffer = null;
 			int c, header_length = 0, newlines = 0, charset_pos = 0;
-			Encoding enc = Encoding.UTF8;
+			System.Text.Encoding enc = System.Text.Encoding.UTF8;
 			try {
 				do {
 					c = stream.BaseStream.ReadByte ();
@@ -491,7 +496,7 @@ namespace Beagle.Daemon.ThunderbirdQuery
 				stream.BaseStream.Read (buffer, 0, buffer.Length);
 				
 				// We need to use correct encoding
-				enc = Encoding.GetEncoding (encoding_str);
+				enc = System.Text.Encoding.GetEncoding (encoding_str);
 			} catch {
 			} finally {
 				stream.Close ();
diff -upNr beagle-0.3.9.orign/configure beagle-0.3.9/configure
--- beagle-0.3.9.orign/configure	2008-07-19 13:20:36.000000000 +0200
+++ beagle-0.3.9/configure	2009-01-28 12:35:43.000000000 +0100
@@ -2791,7 +2791,7 @@ MONODOC_REQUIRED=1.2.4
 NDESK_DBUS_REQUIRED=0.5.2
 NDESK_DBUS_GLIB_REQUIRED=0.3.0
 GTK_SHARP_REQUIRED=2.10.0
-GMIME_SHARP_REQUIRED=2.2.0
+GMIME_SHARP_REQUIRED=2.4.0
 EVOLUTION_SHARP_REQUIRED=0.13.3
 GSF_SHARP_REQUIRED=0.6
 GTK_REQUIRED=2.10.0
@@ -25660,7 +25660,7 @@ if test -n "$PKG_CONFIG"; then
 	glade-sharp-2.0 >= \$GTK_SHARP_REQUIRED
 	gnome-sharp-2.0 >= \$GTK_SHARP_REQUIRED
 	gnome-vfs-sharp-2.0 >= \$GTK_SHARP_REQUIRED
-	gmime-sharp >= \$GMIME_SHARP_REQUIRED
+	gmime-sharp-2.4 >= \$GMIME_SHARP_REQUIRED
 \"") >&5
   ($PKG_CONFIG --exists --print-errors "
 	gtk-sharp-2.0 >= $GTK_SHARP_REQUIRED
@@ -25668,7 +25668,7 @@ if test -n "$PKG_CONFIG"; then
 	glade-sharp-2.0 >= $GTK_SHARP_REQUIRED
 	gnome-sharp-2.0 >= $GTK_SHARP_REQUIRED
 	gnome-vfs-sharp-2.0 >= $GTK_SHARP_REQUIRED
-	gmime-sharp >= $GMIME_SHARP_REQUIRED
+	gmime-sharp-2.4 >= $GMIME_SHARP_REQUIRED
 ") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -25679,7 +25679,7 @@ if test -n "$PKG_CONFIG"; then
 	glade-sharp-2.0 >= $GTK_SHARP_REQUIRED
 	gnome-sharp-2.0 >= $GTK_SHARP_REQUIRED
 	gnome-vfs-sharp-2.0 >= $GTK_SHARP_REQUIRED
-	gmime-sharp >= $GMIME_SHARP_REQUIRED
+	gmime-sharp-2.4 >= $GMIME_SHARP_REQUIRED
 " 2>/dev/null`
 else
   pkg_failed=yes
@@ -25699,7 +25699,7 @@ if test -n "$PKG_CONFIG"; then
 	glade-sharp-2.0 >= \$GTK_SHARP_REQUIRED
 	gnome-sharp-2.0 >= \$GTK_SHARP_REQUIRED
 	gnome-vfs-sharp-2.0 >= \$GTK_SHARP_REQUIRED
-	gmime-sharp >= \$GMIME_SHARP_REQUIRED
+	gmime-sharp-2.4 >= \$GMIME_SHARP_REQUIRED
 \"") >&5
   ($PKG_CONFIG --exists --print-errors "
 	gtk-sharp-2.0 >= $GTK_SHARP_REQUIRED
@@ -25707,7 +25707,7 @@ if test -n "$PKG_CONFIG"; then
 	glade-sharp-2.0 >= $GTK_SHARP_REQUIRED
 	gnome-sharp-2.0 >= $GTK_SHARP_REQUIRED
 	gnome-vfs-sharp-2.0 >= $GTK_SHARP_REQUIRED
-	gmime-sharp >= $GMIME_SHARP_REQUIRED
+	gmime-sharp-2.4 >= $GMIME_SHARP_REQUIRED
 ") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -25718,7 +25718,7 @@ if test -n "$PKG_CONFIG"; then
 	glade-sharp-2.0 >= $GTK_SHARP_REQUIRED
 	gnome-sharp-2.0 >= $GTK_SHARP_REQUIRED
 	gnome-vfs-sharp-2.0 >= $GTK_SHARP_REQUIRED
-	gmime-sharp >= $GMIME_SHARP_REQUIRED
+	gmime-sharp-2.4 >= $GMIME_SHARP_REQUIRED
 " 2>/dev/null`
 else
   pkg_failed=yes
@@ -25744,7 +25744,7 @@ fi
 	glade-sharp-2.0 >= $GTK_SHARP_REQUIRED
 	gnome-sharp-2.0 >= $GTK_SHARP_REQUIRED
 	gnome-vfs-sharp-2.0 >= $GTK_SHARP_REQUIRED
-	gmime-sharp >= $GMIME_SHARP_REQUIRED
+	gmime-sharp-2.4 >= $GMIME_SHARP_REQUIRED
 "`
         else
 	        BEAGLE_UI_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "
@@ -25753,7 +25753,7 @@ fi
 	glade-sharp-2.0 >= $GTK_SHARP_REQUIRED
 	gnome-sharp-2.0 >= $GTK_SHARP_REQUIRED
 	gnome-vfs-sharp-2.0 >= $GTK_SHARP_REQUIRED
-	gmime-sharp >= $GMIME_SHARP_REQUIRED
+	gmime-sharp-2.4 >= $GMIME_SHARP_REQUIRED
 "`
         fi
 	# Put the nasty error message in config.log where it belongs
@@ -25765,7 +25765,7 @@ fi
 	glade-sharp-2.0 >= $GTK_SHARP_REQUIRED
 	gnome-sharp-2.0 >= $GTK_SHARP_REQUIRED
 	gnome-vfs-sharp-2.0 >= $GTK_SHARP_REQUIRED
-	gmime-sharp >= $GMIME_SHARP_REQUIRED
+	gmime-sharp-2.4 >= $GMIME_SHARP_REQUIRED
 ) were not met:
 
 $BEAGLE_UI_PKG_ERRORS
@@ -25783,7 +25783,7 @@ echo "$as_me: error: Package requirement
 	glade-sharp-2.0 >= $GTK_SHARP_REQUIRED
 	gnome-sharp-2.0 >= $GTK_SHARP_REQUIRED
 	gnome-vfs-sharp-2.0 >= $GTK_SHARP_REQUIRED
-	gmime-sharp >= $GMIME_SHARP_REQUIRED
+	gmime-sharp-2.4 >= $GMIME_SHARP_REQUIRED
 ) were not met:
 
 $BEAGLE_UI_PKG_ERRORS
@@ -26167,18 +26167,18 @@ if test -n "$PKG_CONFIG"; then
     { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"evolution-sharp >= \$EVOLUTION_SHARP_REQUIRED 	\\
                   gconf-sharp-2.0 >= \$GTK_SHARP_REQUIRED	\\
 		  glib-sharp-2.0 >= \$GTK_SHARP_REQUIRED
-                  gmime-sharp >= \$GMIME_SHARP_REQUIRED\"") >&5
+                  gmime-sharp-2.4 >= \$GMIME_SHARP_REQUIRED\"") >&5
   ($PKG_CONFIG --exists --print-errors "evolution-sharp >= $EVOLUTION_SHARP_REQUIRED 	\
                   gconf-sharp-2.0 >= $GTK_SHARP_REQUIRED	\
 		  glib-sharp-2.0 >= $GTK_SHARP_REQUIRED
-                  gmime-sharp >= $GMIME_SHARP_REQUIRED") 2>&5
+                  gmime-sharp-2.4 >= $GMIME_SHARP_REQUIRED") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
   pkg_cv_EVO_CFLAGS=`$PKG_CONFIG --cflags "evolution-sharp >= $EVOLUTION_SHARP_REQUIRED 	\
                   gconf-sharp-2.0 >= $GTK_SHARP_REQUIRED	\
 		  glib-sharp-2.0 >= $GTK_SHARP_REQUIRED
-                  gmime-sharp >= $GMIME_SHARP_REQUIRED" 2>/dev/null`
+                  gmime-sharp-2.4 >= $GMIME_SHARP_REQUIRED" 2>/dev/null`
 else
   pkg_failed=yes
 fi
@@ -26194,18 +26194,18 @@ if test -n "$PKG_CONFIG"; then
     { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"evolution-sharp >= \$EVOLUTION_SHARP_REQUIRED 	\\
                   gconf-sharp-2.0 >= \$GTK_SHARP_REQUIRED	\\
 		  glib-sharp-2.0 >= \$GTK_SHARP_REQUIRED
-                  gmime-sharp >= \$GMIME_SHARP_REQUIRED\"") >&5
+                  gmime-sharp-2.4 >= \$GMIME_SHARP_REQUIRED\"") >&5
   ($PKG_CONFIG --exists --print-errors "evolution-sharp >= $EVOLUTION_SHARP_REQUIRED 	\
                   gconf-sharp-2.0 >= $GTK_SHARP_REQUIRED	\
 		  glib-sharp-2.0 >= $GTK_SHARP_REQUIRED
-                  gmime-sharp >= $GMIME_SHARP_REQUIRED") 2>&5
+                  gmime-sharp-2.4 >= $GMIME_SHARP_REQUIRED") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
   pkg_cv_EVO_LIBS=`$PKG_CONFIG --libs "evolution-sharp >= $EVOLUTION_SHARP_REQUIRED 	\
                   gconf-sharp-2.0 >= $GTK_SHARP_REQUIRED	\
 		  glib-sharp-2.0 >= $GTK_SHARP_REQUIRED
-                  gmime-sharp >= $GMIME_SHARP_REQUIRED" 2>/dev/null`
+                  gmime-sharp-2.4 >= $GMIME_SHARP_REQUIRED" 2>/dev/null`
 else
   pkg_failed=yes
 fi
@@ -26227,12 +26227,12 @@ fi
 	        EVO_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "evolution-sharp >= $EVOLUTION_SHARP_REQUIRED 	\
                   gconf-sharp-2.0 >= $GTK_SHARP_REQUIRED	\
 		  glib-sharp-2.0 >= $GTK_SHARP_REQUIRED
-                  gmime-sharp >= $GMIME_SHARP_REQUIRED"`
+                  gmime-sharp-2.4 >= $GMIME_SHARP_REQUIRED"`
         else
 	        EVO_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "evolution-sharp >= $EVOLUTION_SHARP_REQUIRED 	\
                   gconf-sharp-2.0 >= $GTK_SHARP_REQUIRED	\
 		  glib-sharp-2.0 >= $GTK_SHARP_REQUIRED
-                  gmime-sharp >= $GMIME_SHARP_REQUIRED"`
+                  gmime-sharp-2.4 >= $GMIME_SHARP_REQUIRED"`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$EVO_PKG_ERRORS" >&5
@@ -26781,12 +26781,12 @@ if test -n "$PKG_CONFIG"; then
         if test -n "$PKG_CONFIG" && \
     { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"
 	shared-mime-info
-	gmime-sharp >= \$GMIME_SHARP_REQUIRED
+	gmime-sharp-2.4 >= \$GMIME_SHARP_REQUIRED
 	glib-sharp-2.0 >= \$GTK_SHARP_REQUIRED
 \"") >&5
   ($PKG_CONFIG --exists --print-errors "
 	shared-mime-info
-	gmime-sharp >= $GMIME_SHARP_REQUIRED
+	gmime-sharp-2.4 >= $GMIME_SHARP_REQUIRED
 	glib-sharp-2.0 >= $GTK_SHARP_REQUIRED
 ") 2>&5
   ac_status=$?
@@ -26794,7 +26794,7 @@ if test -n "$PKG_CONFIG"; then
   (exit $ac_status); }; then
   pkg_cv_BEAGLED_CFLAGS=`$PKG_CONFIG --cflags "
 	shared-mime-info
-	gmime-sharp >= $GMIME_SHARP_REQUIRED
+	gmime-sharp-2.4 >= $GMIME_SHARP_REQUIRED
 	glib-sharp-2.0 >= $GTK_SHARP_REQUIRED
 " 2>/dev/null`
 else
@@ -26811,12 +26811,12 @@ if test -n "$PKG_CONFIG"; then
         if test -n "$PKG_CONFIG" && \
     { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"
 	shared-mime-info
-	gmime-sharp >= \$GMIME_SHARP_REQUIRED
+	gmime-sharp-2.4 >= \$GMIME_SHARP_REQUIRED
 	glib-sharp-2.0 >= \$GTK_SHARP_REQUIRED
 \"") >&5
   ($PKG_CONFIG --exists --print-errors "
 	shared-mime-info
-	gmime-sharp >= $GMIME_SHARP_REQUIRED
+	gmime-sharp-2.4 >= $GMIME_SHARP_REQUIRED
 	glib-sharp-2.0 >= $GTK_SHARP_REQUIRED
 ") 2>&5
   ac_status=$?
@@ -26824,7 +26824,7 @@ if test -n "$PKG_CONFIG"; then
   (exit $ac_status); }; then
   pkg_cv_BEAGLED_LIBS=`$PKG_CONFIG --libs "
 	shared-mime-info
-	gmime-sharp >= $GMIME_SHARP_REQUIRED
+	gmime-sharp-2.4 >= $GMIME_SHARP_REQUIRED
 	glib-sharp-2.0 >= $GTK_SHARP_REQUIRED
 " 2>/dev/null`
 else
@@ -26847,13 +26847,13 @@ fi
         if test $_pkg_short_errors_supported = yes; then
 	        BEAGLED_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "
 	shared-mime-info
-	gmime-sharp >= $GMIME_SHARP_REQUIRED
+	gmime-sharp-2.4 >= $GMIME_SHARP_REQUIRED
 	glib-sharp-2.0 >= $GTK_SHARP_REQUIRED
 "`
         else
 	        BEAGLED_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "
 	shared-mime-info
-	gmime-sharp >= $GMIME_SHARP_REQUIRED
+	gmime-sharp-2.4 >= $GMIME_SHARP_REQUIRED
 	glib-sharp-2.0 >= $GTK_SHARP_REQUIRED
 "`
         fi
@@ -26862,7 +26862,7 @@ fi
 
 	{ { echo "$as_me:$LINENO: error: Package requirements (
 	shared-mime-info
-	gmime-sharp >= $GMIME_SHARP_REQUIRED
+	gmime-sharp-2.4 >= $GMIME_SHARP_REQUIRED
 	glib-sharp-2.0 >= $GTK_SHARP_REQUIRED
 ) were not met:
 
@@ -26877,7 +26877,7 @@ See the pkg-config man page for more det
 " >&5
 echo "$as_me: error: Package requirements (
 	shared-mime-info
-	gmime-sharp >= $GMIME_SHARP_REQUIRED
+	gmime-sharp-2.4 >= $GMIME_SHARP_REQUIRED
 	glib-sharp-2.0 >= $GTK_SHARP_REQUIRED
 ) were not met:
 
@@ -26924,7 +26924,7 @@ BEAGLED_LIBS="$BEAGLED_LIBS $GSF_SHARP_L
 
 
 GSF_SHARP_PREFIX=`$PKG_CONFIG --variable=prefix gsf-sharp`
-GMIME_SHARP_PREFIX=`$PKG_CONFIG --variable=prefix gmime-sharp`
+GMIME_SHARP_PREFIX=`$PKG_CONFIG --variable=prefix gmime-sharp-2.4`
 
 
 # Check whether --enable-epiphany-extension was given.
diff -upNr beagle-0.3.9.orign/Filters/FilterMail.cs beagle-0.3.9/Filters/FilterMail.cs
--- beagle-0.3.9.orign/Filters/FilterMail.cs	2008-06-12 02:20:07.000000000 +0200
+++ beagle-0.3.9/Filters/FilterMail.cs	2009-01-28 12:33:17.000000000 +0100
@@ -126,7 +126,7 @@ namespace Beagle.Filters {
 
 			// Messages that are multipart/alternative shouldn't be considered as having
 			// attachments.  Unless of course they do.
-			if (mime_part is GMime.Multipart && mime_part.ContentType.Subtype.ToLower () != "alternative")
+			if (mime_part is GMime.Multipart && mime_part.ContentType.MediaSubtype.ToLower () != "alternative")
 				return true;
 
 			return false;
@@ -140,34 +140,43 @@ namespace Beagle.Filters {
 			AddProperty (Property.NewDate ("fixme:date", message.Date.ToUniversalTime ()));
 
 			GMime.InternetAddressList addrs;
-			addrs = this.message.GetRecipients (GMime.Message.RecipientType.To);
+			addrs = this.message.GetRecipients (GMime.RecipientType.To);
 			foreach (GMime.InternetAddress ia in addrs) {
 				AddProperty (Property.NewUnsearched ("fixme:to", ia.ToString (false)));
-				if (ia.AddressType != GMime.InternetAddressType.Group)
-					AddProperty (Property.New ("fixme:to_address", ia.Addr));
-
+				if (ia is GMime.InternetAddressMailbox) {
+					GMime.InternetAddressMailbox mailbox = ia as GMime.InternetAddressMailbox;
+					
+					AddProperty (Property.New ("fixme:to_address", mailbox.Address));
+				}
+				
 				AddProperty (Property.New ("fixme:to_name", ia.Name));
 				AddEmailLink (ia);
 			}
 			addrs.Dispose ();
 
-			addrs = this.message.GetRecipients (GMime.Message.RecipientType.Cc);
+			addrs = this.message.GetRecipients (GMime.RecipientType.Cc);
 			foreach (GMime.InternetAddress ia in addrs) {
 				AddProperty (Property.NewUnsearched ("fixme:cc", ia.ToString (false)));
-				if (ia.AddressType != GMime.InternetAddressType.Group)
-					AddProperty (Property.New ("fixme:cc_address", ia.Addr));
-
+				if (ia is GMime.InternetAddressMailbox) {
+					GMime.InternetAddressMailbox mailbox = ia as GMime.InternetAddressMailbox;
+					
+					AddProperty (Property.New ("fixme:cc_address", mailbox.Address));
+				}
+				
 				AddProperty (Property.New ("fixme:cc_name", ia.Name));
 				AddEmailLink (ia);
 			}
 			addrs.Dispose ();
 
-			addrs = GMime.InternetAddressList.ParseString (GMime.Utils.HeaderDecodePhrase (this.message.Sender));
+			addrs = GMime.InternetAddressList.Parse (this.message.Sender);
 			foreach (GMime.InternetAddress ia in addrs) {
 				AddProperty (Property.NewUnsearched ("fixme:from", ia.ToString (false)));
-				if (ia.AddressType != GMime.InternetAddressType.Group)
-					AddProperty (Property.New ("fixme:from_address", ia.Addr));
-
+				if (ia is GMime.InternetAddressMailbox) {
+					GMime.InternetAddressMailbox mailbox = ia as GMime.InternetAddressMailbox;
+					
+					AddProperty (Property.New ("fixme:from_address", mailbox.Address));
+				}
+				
 				AddProperty (Property.New ("fixme:from_name", ia.Name));
 				AddEmailLink (ia);
 			}
@@ -184,7 +193,7 @@ namespace Beagle.Filters {
 				AddProperty (Property.NewUnsearched ("fixme:msgid", GMime.Utils.DecodeMessageId (msgid)));
 
 			foreach (GMime.References refs in this.message.References)
-				AddProperty (Property.NewUnsearched ("fixme:reference", refs.Msgid));
+				AddProperty (Property.NewUnsearched ("fixme:reference", refs.MessageId));
 
 			string list_id = this.message.GetHeader ("List-Id");
 			if (list_id != null)
@@ -345,16 +354,15 @@ namespace Beagle.Filters {
 					}
 				} else if (mime_part is GMime.Multipart) {
 					GMime.Multipart multipart = (GMime.Multipart) mime_part;
-
-					int num_parts = multipart.Number;
+					int num_parts = multipart.Count;
 
 					// If the mimetype is multipart/alternative, we only want to index
 					// one part -- the richest one we can filter.
-					if (mime_part.ContentType.Subtype.ToLower () == "alternative") {
+					if (mime_part.ContentType.MediaSubtype.ToLower () == "alternative") {
 						// The richest formats are at the end, so work from there
 						// backward.
 						for (int i = num_parts - 1; i >= 0; i--) {
-							GMime.Object subpart = multipart.GetPart (i);
+							GMime.Object subpart = multipart[i];
 
 							if (IsMimeTypeHandled (subpart.ContentType.ToString ())) {
 								part = subpart;
@@ -370,7 +378,7 @@ namespace Beagle.Filters {
 					// the parts, treat them like a bunch of attachments.
 					if (part == null) {
 						for (int i = 0; i < num_parts; i++) {
-							using (GMime.Object subpart = multipart.GetPart (i))
+							using (GMime.Object subpart = multipart[i])
 								this.OnEachPart (subpart);
 						}
 					}
@@ -400,7 +408,7 @@ namespace Beagle.Filters {
 						} else if (mime_type == "text/html") {
 							no_child_needed = true;
 							html_part = true;
-							string enc = part.GetContentTypeParameter ("charset"); 
+							string enc = part.ContentType.GetParameter ("charset"); 
 							// DataWrapper.Stream is a very limited stream
 							// and does not allow Seek or Tell
 							// HtmlFilter requires Stream.Position=0.
@@ -473,7 +481,7 @@ namespace Beagle.Filters {
 							if (length != -1)
 								child.AddProperty (Property.NewUnsearched ("fixme:filesize", length));
 
-							if (part.ContentType.Type.ToLower () == "text")
+							if (part.ContentType.MediaType.ToLower () == "text")
 								child.SetTextReader (new StreamReader (stream));
 							else
 								child.SetBinaryStream (stream);

beagle-0.3.9-libgnome-desktop-soname.patch:

--- NEW FILE beagle-0.3.9-libgnome-desktop-soname.patch ---
diff -upNr beagle-0.3.9.orign/search/Beagle.Search.exe.config beagle-0.3.9/search/Beagle.Search.exe.config
--- beagle-0.3.9.orign/search/Beagle.Search.exe.config	2008-07-17 10:59:14.000000000 +0200
+++ beagle-0.3.9/search/Beagle.Search.exe.config	2009-01-28 12:51:07.000000000 +0100
@@ -1,4 +1,4 @@
 <configuration>
-	<dllmap dll="libgnome-desktop-2" target="libgnome-desktop-2.so.2" />
+	<dllmap dll="libgnome-desktop-2" target="libgnome-desktop-2.so.11" />
 </configuration>
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/beagle/devel/.cvsignore,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- .cvsignore	15 Jul 2008 12:23:23 -0000	1.31
+++ .cvsignore	28 Jan 2009 12:03:14 -0000	1.32
@@ -1 +1 @@
-beagle-0.3.8.tar.bz2
+beagle-0.3.9.tar.bz2

beagle-0.2.15.1-libdir.patch:

Index: beagle-0.2.15.1-libdir.patch
===================================================================
RCS file: /cvs/pkgs/rpms/beagle/devel/beagle-0.2.15.1-libdir.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- beagle-0.2.15.1-libdir.patch	5 Feb 2007 14:42:26 -0000	1.1
+++ beagle-0.2.15.1-libdir.patch	28 Jan 2009 12:03:14 -0000	1.2
@@ -1,11 +1,12 @@
---- beagle-0.2.15.1/configure.in.libdir	2007-02-05 13:35:26.000000000 +0100
-+++ beagle-0.2.15.1/configure.in	2007-02-05 13:37:10.000000000 +0100
-@@ -77,7 +77,7 @@
- needed_dlls="Mono.Data.SqliteClient Mono.Posix System.Runtime.Remoting System.Web System.Web.Services ICSharpCode.SharpZipLib"
- for i in $needed_dlls; do
-   AC_MSG_CHECKING([for $i.dll])
--  if test ! -e `$PKG_CONFIG --variable=prefix mono`/lib/mono/2.0/$i.dll; then
-+  if test ! -e `monodir`/2.0/$i.dll; then
-     AC_MSG_ERROR([missing required mono DLL: $i.dll])
-   else
-     AC_MSG_RESULT([found])
+diff -upNr beagle-0.3.9.orign/configure beagle-0.3.9/configure
+--- beagle-0.3.9.orign/configure	2008-07-19 13:20:36.000000000 +0200
++++ beagle-0.3.9/configure	2009-01-28 12:26:18.000000000 +0100
+@@ -27512,7 +27512,7 @@ if test "x$enable_qt" != "xno" -a "x$has
+ 	i="qt-dotnet"
+ 	{ echo "$as_me:$LINENO: checking for $i.dll" >&5
+ echo $ECHO_N "checking for $i.dll... $ECHO_C" >&6; }
+-	if test ! -e `$PKG_CONFIG --variable=prefix mono`/lib/mono/2.0/$i.dll; then
++	if test ! -e `monodir`/2.0/$i.dll; then
+ 		{ { echo "$as_me:$LINENO: error: missing required mono DLL: $i.dll" >&5
+ echo "$as_me: error: missing required mono DLL: $i.dll" >&2;}
+    { (exit 1); exit 1; }; }

beagle-0.3.8-epiphany.patch:

Index: beagle-0.3.8-epiphany.patch
===================================================================
RCS file: /cvs/pkgs/rpms/beagle/devel/beagle-0.3.8-epiphany.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- beagle-0.3.8-epiphany.patch	4 Oct 2008 12:44:40 -0000	1.2
+++ beagle-0.3.8-epiphany.patch	28 Jan 2009 12:03:14 -0000	1.3
@@ -1,12 +1,12 @@
-diff -upNr beagle-0.3.8.orign/configure.in beagle-0.3.8/configure.in
---- beagle-0.3.8.orign/configure.in	2008-06-12 18:06:25.000000000 +0200
-+++ beagle-0.3.8/configure.in	2008-07-24 14:17:24.000000000 +0200
-@@ -402,7 +402,7 @@ if test "x$enable_epiphany_extension" !=
- 	dnl If you want to add anything but a <major>.<minor> version here, you
- 	dnl need to see the handling of the epiphany_version variable in the
- 	dnl epiphany extension code
--	VALID_EPIPHANY_VERSIONS="2.22 2.20 2.19 2.18 2.17 2.16 2.15 2.14 1.8 1.6"
-+	VALID_EPIPHANY_VERSIONS="2.24 2.22 2.20 2.19 2.18 2.17 2.16 2.15 2.14 1.8 1.6"
+diff -upNr beagle-0.3.9.orign/configure beagle-0.3.9/configure
+--- beagle-0.3.9.orign/configure	2008-07-19 13:20:36.000000000 +0200
++++ beagle-0.3.9/configure	2009-01-28 12:54:38.000000000 +0100
+@@ -26942,7 +26942,7 @@ echo $ECHO_N "checking for Epiphany... $
+ 	{ echo "$as_me:$LINENO: result: " >&5
+ echo "${ECHO_T}" >&6; }
+ 
+-				VALID_EPIPHANY_VERSIONS="2.22 2.20 2.19 2.18 2.17 2.16 2.15 2.14 1.8 1.6"
++				VALID_EPIPHANY_VERSIONS="2.26 2.25 2.24 2.22 2.20 2.19 2.18 2.17 2.16 2.15 2.14 1.8 1.6"
  	for v in $VALID_EPIPHANY_VERSIONS; do
- 	
- 		AC_MSG_CHECKING([for Epiphany $v])
+ 
+ 		{ echo "$as_me:$LINENO: checking for Epiphany $v" >&5


Index: beagle.spec
===================================================================
RCS file: /cvs/pkgs/rpms/beagle/devel/beagle.spec,v
retrieving revision 1.158
retrieving revision 1.159
diff -u -r1.158 -r1.159
--- beagle.spec	26 Dec 2008 10:46:27 -0000	1.158
+++ beagle.spec	28 Jan 2009 12:03:15 -0000	1.159
@@ -1,6 +1,6 @@
 Name:		beagle
-Version:	0.3.8
-Release:	18%{?dist}
+Version:	0.3.9
+Release:	1%{?dist}
 Summary:	The Beagle Search Infrastructure
 Group:		User Interface/Desktops
 # see COPYING for details
@@ -55,33 +55,26 @@
 Patch4: beagle-0.3.0-runuser.patch
 Patch5: beagle-0.2.15.1-libdir.patch
 Patch6: beagle-monodoc.patch
-Patch7: beagle-0.3.8-typo-fix.patch
-Patch8: beagle-0.3.8-epiphany.patch
-Patch9: beagle-0.3.8-desktop-parser.patch
-Patch10: beagle-0.3.8-libgnome-desktop-soname.patch
-#svn commit r4855
-Patch11: beagle-0.3.8-category-crash.patch
-#gmime-2.4 
-Patch12: beagle-0.3.8-gmime-2.4.patch
+Patch7: beagle-0.3.8-epiphany.patch
+
+#gmime-2.4
+Patch8: beagle-0.3.9-gmime24.patch
+
 #firefox 3.1
-Patch13: beagle-0.3.8-fx31.patch
+Patch9: beagle-0.3.8-fx31.patch
+
+#gnome-desktop
+Patch10: beagle-0.3.9-libgnome-desktop-soname.patch
+
 # Mono is not available on these arches 
 ExcludeArch: s390 s390x sparc64 ppc64
 
-# Fedora 9 and above ships xulrunner
-%if 0%{?fedora} > 8
 BuildRequires:	xulrunner-devel
-%else
-BuildRequires:	firefox-devel
-%endif
 
 # firefox app id for beagle firefox extension
 %define firefox_app_id \{ec8030f7-c20a-464f-9b0e-13a3a9e97384\}
 %define firefox_ext_id \{fda00e13-8c62-4f63-9d19-d168115b11ca\}
 
-# thunderbird version and ext id for beagle extension
-%define tb_ext_id \{b656ef18-fd76-45e6-95cc-8043f26361e7\}
-
 %description
 A general infrastructure for making your data easy to find. 
 
@@ -152,16 +145,12 @@
 %patch4 -p1 -b .runuser
 %patch5 -p1 -b .libdir
 %patch6 -p1 -b .monodoc
-%patch7 -p1 -b .typo
-%patch8 -p1 -b .epiphany
-%patch9 -p1 -b .desktop-parser
+%patch7 -p1 -b .epiphany
+%patch8 -p1 -b .gmime-2.4
+%patch9 -p1 -b .firefox-3.1
 %patch10 -p1 -b .gnome-desktop
-%patch11 -p1 -b .category-crash
-%patch12 -p1 -b .gmime-2.4
-%patch13 -p1 -b .firefox-3.1
 
 %build
-autoconf
 export MONO_SHARED_DIR=%{_builddir}/%{?buildsubdir}
 %configure --enable-wv1 --disable-googlebackends
 make %{?_smp_mflags}
@@ -350,6 +339,10 @@
 %{_libdir}/pkgconfig/beagle*.pc
 
 %changelog
+* Wed Jan 28 2009 Adel Gadllah <adel.gadllah at gmail.com> - 0.3.9-1
+- Update t 0.3.9
+- Drop obsolete patches
+
 * Fri Dec 26 2008 Adel Gadllah <adel.gadllah at gmail.com> - 0.3.8-18
 - Bump supported firefox version to 3.1.x
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/beagle/devel/sources,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- sources	15 Jul 2008 12:23:23 -0000	1.34
+++ sources	28 Jan 2009 12:03:15 -0000	1.35
@@ -1 +1 @@
-fcafad26efa65a3bf06a019268ae6230  beagle-0.3.8.tar.bz2
+b73c12423d2d67133dbb05933f4c8fe1  beagle-0.3.9.tar.bz2


--- beagle-0.3.8-category-crash.patch DELETED ---


--- beagle-0.3.8-desktop-parser.patch DELETED ---


--- beagle-0.3.8-gmime-2.4.patch DELETED ---


--- beagle-0.3.8-libgnome-desktop-soname.patch DELETED ---


--- beagle-0.3.8-typo-fix.patch DELETED ---



From mkasik at fedoraproject.org  Wed Jan 28 12:08:32 2009
From: mkasik at fedoraproject.org (=?utf-8?b?TWFyZWsgS2HFocOtaw==?=)
Date: Wed, 28 Jan 2009 12:08:32 +0000 (UTC)
Subject: rpms/cups-pk-helper/devel pk_jobs.patch, NONE,
	1.1 cups-pk-helper.spec, 1.2, 1.3
Message-ID: <20090128120832.16AC47010D@cvs1.fedora.phx.redhat.com>

Author: mkasik

Update of /cvs/pkgs/rpms/cups-pk-helper/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1162

Modified Files:
	cups-pk-helper.spec 
Added Files:
	pk_jobs.patch 
Log Message:
* Tue Jan 28 2009 Marek Kasik <mkasik at redhat.com> 0.0.3-3
- Add functions for handling jobs (JobRestart, JobCancel, JobSetHoldUntil)


pk_jobs.patch:

--- NEW FILE pk_jobs.patch ---
--- src/cups.c	2009-01-28 12:51:49.000000000 +0100
+++ src/cups.c	2009-01-28 10:59:36.000000000 +0100
@@ -381,6 +381,18 @@ _cph_cups_add_class_uri (ipp_t      *req
 }
 
 static void
+_cph_cups_add_job_uri (ipp_t      *request,
+                       gint        job_id)
+{
+        char uri[HTTP_MAX_URI + 1];
+
+        g_snprintf (uri, sizeof (uri),
+                    "ipp://localhost/jobs/%d", job_id);
+        ippAddString (request, IPP_TAG_OPERATION, IPP_TAG_URI,
+		      "job-uri", NULL, uri);
+}
+
+static void
 _cph_cups_set_internal_status (CphCups    *cups,
                                const char *status)
 {
@@ -541,6 +553,41 @@ _cph_cups_send_new_printer_class_request
         return _cph_cups_send_request (cups, request, CPH_RESOURCE_ADMIN);
 }
 
+static gboolean
+_cph_cups_send_new_simple_job_request (CphCups     *cups,
+                                       ipp_op_t     op,
+                                       gint         job_id,
+                                       CphResource  resource)
+{
+        ipp_t *request;
+
+        request = ippNewRequest (op);
+        _cph_cups_add_job_uri (request, job_id);
+
+        return _cph_cups_send_request (cups, request, resource);
+}
+
+static gboolean
+_cph_cups_send_new_job_attributes_request (CphCups     *cups,
+                                           gint         job_id,
+                                           const char  *name,
+                                           const char  *value,
+                                           CphResource  resource)
+{
+        cups_option_t *options = NULL;
+        ipp_t         *request;
+        gint           num_options = 0;
+
+        request = ippNewRequest (IPP_SET_JOB_ATTRIBUTES);
+        _cph_cups_add_job_uri (request, job_id);
+
+        num_options = cupsAddOption (name, value,
+                                     num_options, &options);
+        cupsEncodeOptions (request, num_options, options);
+
+        return _cph_cups_send_request (cups, request, resource);
+}
+
 static int
 _cph_cups_class_has_printer (CphCups     *cups,
                              const char  *class_name,
@@ -1581,6 +1628,42 @@ cph_cups_server_set_settings (CphCups   
         return TRUE;
 }
 
+gboolean
+cph_cups_job_cancel (CphCups *cups,
+                     gint     job_id)
+{
+        g_return_val_if_fail (CPH_IS_CUPS (cups), FALSE);
+
+        return _cph_cups_send_new_simple_job_request (cups, IPP_CANCEL_JOB,
+                                                      job_id,
+                                                      CPH_RESOURCE_ADMIN);
+}
+
+gboolean
+cph_cups_job_restart (CphCups *cups,
+                      gint     job_id)
+{
+        g_return_val_if_fail (CPH_IS_CUPS (cups), FALSE);
+
+        return _cph_cups_send_new_simple_job_request (cups, IPP_RESTART_JOB,
+                                                      job_id,
+                                                      CPH_RESOURCE_ADMIN);
+}
+
+gboolean
+cph_cups_job_set_hold_until (CphCups    *cups,
+                             gint        job_id,
+                             const char *job_hold_until)
+{
+        g_return_val_if_fail (CPH_IS_CUPS (cups), FALSE);
+
+        return _cph_cups_send_new_job_attributes_request (cups,
+                                                          job_id,
+                                                          "job-hold-until",
+                                                          job_hold_until,
+                                                          CPH_RESOURCE_ADMIN);
+}
+
 /******************************************************
  * Non-object functions
  ******************************************************/
@@ -1647,3 +1730,28 @@ cph_cups_is_printer_uri_local (const cha
         /* we don't know, so we assume it's not local */
         return FALSE;
 }
+
+gboolean
+cph_cups_is_job_owner (CphCups    *cups,
+                       gint        job_id,
+                       const char *user)
+{
+        cups_job_t  *jobs;
+        gboolean     user_job = FALSE;
+        gint         num_jobs = 0;
+        gint         i;
+
+        g_return_val_if_fail (CPH_IS_CUPS (cups), FALSE);
+
+        if (user == NULL)
+                return FALSE;
+
+        num_jobs = cupsGetJobs2 (cups->priv->connection, &jobs, NULL, 0, 0);
+
+        for (i = 0; i < num_jobs; i++) {
+                if (jobs[i].id == job_id && g_strcmp0 (jobs[i].user, user) == 0)
+                        user_job = TRUE;
+        }
+
+        return user_job;
+}
--- src/cups.h	2008-11-21 01:50:42.000000000 +0100
+++ src/cups.h	2009-01-27 17:33:00.000000000 +0100
@@ -160,6 +160,20 @@ gboolean cph_cups_is_printer_local (CphC
 
 gboolean cph_cups_is_printer_uri_local (const char *uri);
 
+gboolean cph_cups_job_cancel (CphCups    *cups,
+                              gint        job_id);
+
+gboolean cph_cups_job_restart (CphCups    *cups,
+                               gint        job_id);
+
+gboolean cph_cups_job_set_hold_until (CphCups    *cups,
+                                      gint        job_id,
+                                      const char *job_hold_until);
+
+gboolean cph_cups_is_job_owner (CphCups    *cups,
+                                gint        job_id,
+                                const char *user);
+
 G_END_DECLS
 
 #endif /* CPH_CUPS_H */
--- src/cups-pk-helper-mechanism.c	2009-01-28 12:51:49.000000000 +0100
+++ src/cups-pk-helper-mechanism.c	2009-01-28 11:39:16.000000000 +0100
@@ -47,6 +47,10 @@
 
 #include <polkit-dbus/polkit-dbus.h>
 
+#include <cups/cups.h>
+
+#include <pwd.h>
+
 #include "cups-pk-helper-mechanism.h"
 #include "cups-pk-helper-mechanism-glue.h"
 #include "cups.h"
@@ -1011,3 +1015,116 @@ cph_mechanism_server_set_settings (CphMe
 
         return TRUE;
 }
+
+gchar *
+cph_mechanism_get_callers_user_name (CphMechanism          *mechanism,
+                                     DBusGMethodInvocation *context)
+{
+        unsigned long  sender_uid;
+        struct passwd *password_entry;
+        const gchar   *sender;
+        DBusError      dbus_error;
+        gchar         *user_name = NULL;
+
+        sender = dbus_g_method_get_sender (context);
+        dbus_error_init (&dbus_error);
+        sender_uid = dbus_bus_get_unix_user (dbus_g_connection_get_connection (mechanism->priv->system_bus_connection), sender, &dbus_error);
+        password_entry = getpwuid ((uid_t) sender_uid);
+
+        if (password_entry != NULL) {
+          user_name = g_strdup(password_entry->pw_name);
+        }
+
+        return user_name;
+}
+
+gboolean
+cph_mechanism_job_cancel (CphMechanism          *mechanism,
+                          gint                   id,
+                          DBusGMethodInvocation *context)
+{
+        gboolean       ret;
+        gboolean       callers_job = FALSE;
+        char          *user_name = NULL;
+
+        reset_killtimer (mechanism);
+
+        user_name = cph_mechanism_get_callers_user_name (mechanism, context);
+        callers_job = cph_cups_is_job_owner (mechanism->priv->cups, id, user_name);
+        g_free (user_name);
+
+        if (callers_job) {
+                if (!_check_polkit_for_action (mechanism, context, "job-cancel"))
+                        return FALSE;
+        }
+        else {
+                if (!_check_polkit_for_action (mechanism, context, "job-cancel-another-owner"))
+                        return FALSE;
+        }
+
+        ret = cph_cups_job_cancel (mechanism->priv->cups, id);
+        _cph_mechanism_return_error (mechanism, context, !ret);
+
+        return TRUE;
+}
+
+gboolean
+cph_mechanism_job_restart (CphMechanism          *mechanism,
+                           gint                   id,
+                           DBusGMethodInvocation *context)
+{
+        gboolean       ret;
+        gboolean       callers_job = FALSE;
+        char          *user_name = NULL;
+
+        reset_killtimer (mechanism);
+
+        user_name = cph_mechanism_get_callers_user_name (mechanism, context);
+        callers_job = cph_cups_is_job_owner (mechanism->priv->cups, id, user_name);
+        g_free (user_name);
+
+        if (callers_job) {
+                if (!_check_polkit_for_action (mechanism, context, "job-restart"))
+                        return FALSE;
+        }
+        else {
+                if (!_check_polkit_for_action (mechanism, context, "job-restart-another-owner"))
+                        return FALSE;
+        }
+
+        ret = cph_cups_job_restart (mechanism->priv->cups, id);
+        _cph_mechanism_return_error (mechanism, context, !ret);
+
+        return TRUE;
+}
+
+gboolean
+cph_mechanism_job_set_hold_until (CphMechanism          *mechanism,
+                                  gint                   id,
+                                  const char            *job_hold_until,
+                                  DBusGMethodInvocation *context)
+{
+        gboolean       ret;
+        gboolean       callers_job = FALSE;
+        char          *user_name = NULL;
+
+        reset_killtimer (mechanism);
+
+        user_name = cph_mechanism_get_callers_user_name (mechanism, context);
+        callers_job = cph_cups_is_job_owner (mechanism->priv->cups, id, user_name);
+        g_free (user_name);
+
+        if (callers_job) {
+                if (!_check_polkit_for_action (mechanism, context, "job-set-hold-until"))
+                        return FALSE;
+        }
+        else {
+                if (!_check_polkit_for_action (mechanism, context, "job-set-hold-until-another-owner"))
+                        return FALSE;
+        }
+
+        ret = cph_cups_job_set_hold_until (mechanism->priv->cups, id, job_hold_until);
+        _cph_mechanism_return_error (mechanism, context, !ret);
+
+        return TRUE;
+}
--- src/cups-pk-helper-mechanism.h	2008-11-21 01:57:03.000000000 +0100
+++ src/cups-pk-helper-mechanism.h	2009-01-27 17:31:20.000000000 +0100
@@ -220,6 +220,22 @@ cph_mechanism_server_set_settings (CphMe
                                    GHashTable            *settings,
                                    DBusGMethodInvocation *context);
 
+gboolean
+cph_mechanism_job_cancel (CphMechanism          *mechanism,
+                          gint                   id,
+                          DBusGMethodInvocation *context);
+
+gboolean
+cph_mechanism_job_restart (CphMechanism          *mechanism,
+                           gint                   id,
+                           DBusGMethodInvocation *context);
+
+gboolean
+cph_mechanism_job_set_hold_until (CphMechanism          *mechanism,
+                                  gint                   id,
+                                  const char            *job_hold_until,
+                                  DBusGMethodInvocation *context);
+
 G_END_DECLS
 
 #endif /* CPH_MECHANISM_H */
--- src/cups-pk-helper-mechanism.xml	2008-11-21 01:55:52.000000000 +0100
+++ src/cups-pk-helper-mechanism.xml	2009-01-27 17:26:57.000000000 +0100
@@ -174,5 +174,23 @@
       <arg name="error"    direction="out" type="s"/>
     </method>
 
+    <method name="JobCancel">
+      <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
+      <arg name="jobid"    direction="in"  type="i"/>
+      <arg name="error"    direction="out" type="s"/>
+    </method>
+
+    <method name="JobRestart">
+      <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
+      <arg name="jobid"    direction="in"  type="i"/>
+      <arg name="error"    direction="out" type="s"/>
+    </method>
+
+    <method name="JobSetHoldUntil">
+      <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
+      <arg name="jobid"          direction="in"  type="i"/>
+      <arg name="job_hold_until" direction="in"  type="s"/>
+      <arg name="error"          direction="out" type="s"/>
+    </method>
   </interface>
 </node>
--- src/org.opensuse.cupspkhelper.mechanism.policy.in	2008-11-21 00:58:16.000000000 +0100
+++ src/org.opensuse.cupspkhelper.mechanism.policy.in	2009-01-28 12:47:49.000000000 +0100
@@ -68,6 +68,60 @@
     </defaults>
   </action>
 
+  <action id="org.opensuse.cupspkhelper.mechanism.job-cancel">
+    <_description>Cancel a job</_description>
+    <_message>Privileges are required to cancel a job.</_message>
+    <defaults>
+      <allow_inactive>no</allow_inactive>
+      <allow_active>auth_self</allow_active>
+    </defaults>
+  </action>
+
+  <action id="org.opensuse.cupspkhelper.mechanism.job-cancel-another-owner">
+    <_description>Cancel a job owned by another user</_description>
+    <_message>Privileges are required to cancel a job owned by another user.</_message>
+    <defaults>
+      <allow_inactive>no</allow_inactive>
+      <allow_active>auth_admin</allow_active>
+    </defaults>
+  </action>
+
+  <action id="org.opensuse.cupspkhelper.mechanism.job-restart">
+    <_description>Restart a job</_description>
+    <_message>Privileges are required to restart a job.</_message>
+    <defaults>
+      <allow_inactive>no</allow_inactive>
+      <allow_active>yes</allow_active>
+    </defaults>
+  </action>
+
+  <action id="org.opensuse.cupspkhelper.mechanism.job-restart-another-owner">
+    <_description>Restart a job owned by another user</_description>
+    <_message>Privileges are required to restart a job owned by another user.</_message>
+    <defaults>
+      <allow_inactive>no</allow_inactive>
+      <allow_active>auth_admin</allow_active>
+    </defaults>
+  </action>
+
+  <action id="org.opensuse.cupspkhelper.mechanism.job-set-hold-until">
+    <_description>Set hold-until time of a job</_description>
+    <_message>Privileges are required to set hold-until time of a job.</_message>
+    <defaults>
+      <allow_inactive>no</allow_inactive>
+      <allow_active>yes</allow_active>
+    </defaults>
+  </action>
+
+  <action id="org.opensuse.cupspkhelper.mechanism.job-set-hold-until-another-owner">
+    <_description>Set hold-until time of a job owned by another</_description>
+    <_message>Privileges are required to set hold-until time of a job owned by another user.</_message>
+    <defaults>
+      <allow_inactive>no</allow_inactive>
+      <allow_active>auth_admin</allow_active>
+    </defaults>
+  </action>
+
   <!-- Deprecated -->
   <action id="org.opensuse.cupspkhelper.mechanism.printeraddremove">
     <_description>Add/Remove/Edit a printer</_description>


Index: cups-pk-helper.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups-pk-helper/devel/cups-pk-helper.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- cups-pk-helper.spec	26 Jan 2009 13:24:30 -0000	1.2
+++ cups-pk-helper.spec	28 Jan 2009 12:08:29 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           cups-pk-helper
 Version:        0.0.3
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A helper that makes system-config-printer use PolicyKit
 
 Group:          System Environment/Base
@@ -10,6 +10,7 @@
 
 Patch0:         dependencies.patch
 Patch1:         pk_order.patch
+Patch2:         pk_jobs.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -34,6 +35,7 @@
 
 %patch0 -p0 -b .dependencies
 %patch1 -p0 -b .pk-order
+%patch2 -p0 -b .pk-jobs
 
 %build
 %configure
@@ -60,6 +62,9 @@
 
 
 %changelog
+* Tue Jan 28 2009 Marek Kasik <mkasik at redhat.com> 0.0.3-3
+- Add functions for handling jobs (JobRestart, JobCancel, JobSetHoldUntil)
+
 * Tue Jan 26 2009 Marek Kasik <mkasik at redhat.com> 0.0.3-2
 - Add handling of file:/ protocol
 - Change order of checked policies so the PolicyKit asks only for



From rjones at fedoraproject.org  Wed Jan 28 12:08:47 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Wed, 28 Jan 2009 12:08:47 +0000 (UTC)
Subject: rpms/mingw32-glib2/F-10 mingw32-glib2.spec,1.1,1.2
Message-ID: <20090128120847.CF3977010D@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/mingw32-glib2/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1108

Modified Files:
	mingw32-glib2.spec 
Log Message:
- Doesn't really depend on mingw32-filesystem >= 43 (the one with the
  C++ compiler detection fix), since this bug didn't affect Fedora 10.



Index: mingw32-glib2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-glib2/F-10/mingw32-glib2.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mingw32-glib2.spec	28 Jan 2009 11:50:18 -0000	1.1
+++ mingw32-glib2.spec	28 Jan 2009 12:08:16 -0000	1.2
@@ -6,7 +6,7 @@
 
 Name:           mingw32-glib2
 Version:        2.19.5
-Release:        2%{?dist}
+Release:        2.1%{?dist}
 Summary:        MinGW Windows GLib2 library
 
 License:        LGPLv2+
@@ -19,7 +19,7 @@
 
 Patch0:         glib-i386-atomic.patch
 
-BuildRequires:  mingw32-filesystem >= 43-6
+BuildRequires:  mingw32-filesystem
 BuildRequires:  mingw32-gcc
 BuildRequires:  mingw32-binutils
 BuildRequires:  mingw32-dlfcn
@@ -117,6 +117,10 @@
 
 
 %changelog
+* Wed Jan 28 2009 Richard W.M. Jones <rjones at redhat.com> - 2.19.5-2.1
+- Doesn't really depend on mingw32-filesystem >= 43 (the one with the
+  C++ compiler detection fix), since this bug didn't affect Fedora 10.
+
 * Fri Jan 23 2009 Richard W.M. Jones <rjones at redhat.com> - 2.19.5-2
 - Rebase to native Fedora version 2.19.5.
 - Use _smp_mflags.



From rjones at fedoraproject.org  Wed Jan 28 12:16:33 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Wed, 28 Jan 2009 12:16:33 +0000 (UTC)
Subject: rpms/mingw32-glib2/EL-5 mingw32-glib2.spec,1.1,1.2
Message-ID: <20090128121633.5F8DD7010D@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/mingw32-glib2/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2883

Modified Files:
	mingw32-glib2.spec 
Log Message:
- Doesn't really depend on mingw32-filesystem >= 43 (the one with the
  C++ compiler detection fix), since this bug didn't affect Fedora 10.



Index: mingw32-glib2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-glib2/EL-5/mingw32-glib2.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mingw32-glib2.spec	28 Jan 2009 11:50:33 -0000	1.1
+++ mingw32-glib2.spec	28 Jan 2009 12:16:03 -0000	1.2
@@ -6,7 +6,7 @@
 
 Name:           mingw32-glib2
 Version:        2.19.5
-Release:        2%{?dist}
+Release:        2.1%{?dist}
 Summary:        MinGW Windows GLib2 library
 
 License:        LGPLv2+
@@ -19,7 +19,7 @@
 
 Patch0:         glib-i386-atomic.patch
 
-BuildRequires:  mingw32-filesystem >= 43-6
+BuildRequires:  mingw32-filesystem
 BuildRequires:  mingw32-gcc
 BuildRequires:  mingw32-binutils
 BuildRequires:  mingw32-dlfcn
@@ -117,6 +117,10 @@
 
 
 %changelog
+* Wed Jan 28 2009 Richard W.M. Jones <rjones at redhat.com> - 2.19.5-2.1
+- Doesn't really depend on mingw32-filesystem >= 43 (the one with the
+  C++ compiler detection fix), since this bug didn't affect Fedora 10.
+
 * Fri Jan 23 2009 Richard W.M. Jones <rjones at redhat.com> - 2.19.5-2
 - Rebase to native Fedora version 2.19.5.
 - Use _smp_mflags.



From drago01 at fedoraproject.org  Wed Jan 28 12:17:32 2009
From: drago01 at fedoraproject.org (Adel Gadllah)
Date: Wed, 28 Jan 2009 12:17:32 +0000 (UTC)
Subject: rpms/beagle/devel beagle-0.2.15.1-libdir.patch,1.2,1.3
Message-ID: <20090128121732.761B77010D@cvs1.fedora.phx.redhat.com>

Author: drago01

Update of /cvs/pkgs/rpms/beagle/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3161

Modified Files:
	beagle-0.2.15.1-libdir.patch 
Log Message:
fix build

beagle-0.2.15.1-libdir.patch:

Index: beagle-0.2.15.1-libdir.patch
===================================================================
RCS file: /cvs/pkgs/rpms/beagle/devel/beagle-0.2.15.1-libdir.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- beagle-0.2.15.1-libdir.patch	28 Jan 2009 12:03:14 -0000	1.2
+++ beagle-0.2.15.1-libdir.patch	28 Jan 2009 12:17:02 -0000	1.3
@@ -1,6 +1,24 @@
 diff -upNr beagle-0.3.9.orign/configure beagle-0.3.9/configure
 --- beagle-0.3.9.orign/configure	2008-07-19 13:20:36.000000000 +0200
-+++ beagle-0.3.9/configure	2009-01-28 12:26:18.000000000 +0100
++++ beagle-0.3.9/configure	2009-01-28 13:16:04.000000000 +0100
+@@ -21191,7 +21191,7 @@ needed_dlls="Mono.Data.Sqlite Mono.Posix
+ for i in $needed_dlls; do
+   { echo "$as_me:$LINENO: checking for $i.dll" >&5
+ echo $ECHO_N "checking for $i.dll... $ECHO_C" >&6; }
+-  if test ! -e `$PKG_CONFIG --variable=prefix mono`/lib/mono/2.0/$i.dll; then
++  if test ! -e `monodir`/2.0/$i.dll; then
+     { { echo "$as_me:$LINENO: error: missing required mono DLL: $i.dll" >&5
+ echo "$as_me: error: missing required mono DLL: $i.dll" >&2;}
+    { (exit 1); exit 1; }; }
+@@ -25613,7 +25613,7 @@ if test "x$enable_google" = "xyes"; then
+   i="System.Security"
+   { echo "$as_me:$LINENO: checking for $i.dll (needed by Google backends)" >&5
+ echo $ECHO_N "checking for $i.dll (needed by Google backends)... $ECHO_C" >&6; }
+-  if test ! -e `$PKG_CONFIG --variable=prefix mono`/lib/mono/2.0/$i.dll; then
++  if test ! -e `monodir`/2.0/$i.dll; then
+     { { echo "$as_me:$LINENO: error: missing required mono DLL: $i.dll" >&5
+ echo "$as_me: error: missing required mono DLL: $i.dll" >&2;}
+    { (exit 1); exit 1; }; }
 @@ -27512,7 +27512,7 @@ if test "x$enable_qt" != "xno" -a "x$has
  	i="qt-dotnet"
  	{ echo "$as_me:$LINENO: checking for $i.dll" >&5



From than at fedoraproject.org  Wed Jan 28 12:22:38 2009
From: than at fedoraproject.org (Than Ngo)
Date: Wed, 28 Jan 2009 12:22:38 +0000 (UTC)
Subject: rpms/kdebase-workspace/F-10
	kdebase-workspace-4.0.85-plasma-default-wallpaper.patch, 1.1, NONE
Message-ID: <20090128122238.559617010D@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdebase-workspace/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4511

Removed Files:
	kdebase-workspace-4.0.85-plasma-default-wallpaper.patch 
Log Message:
drop unneeded kdebase-workspace-4.0.85-plasma-default-wallpaper.patch



--- kdebase-workspace-4.0.85-plasma-default-wallpaper.patch DELETED ---



From rjones at fedoraproject.org  Wed Jan 28 12:22:43 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Wed, 28 Jan 2009 12:22:43 +0000 (UTC)
Subject: rpms/mingw32-cairo/devel mingw32-cairo.spec,1.1,1.2
Message-ID: <20090128122243.904337010D@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/mingw32-cairo/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4380

Modified Files:
	mingw32-cairo.spec 
Log Message:
Remove gtk-doc (Levente Farkas).


Index: mingw32-cairo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-cairo/devel/mingw32-cairo.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mingw32-cairo.spec	28 Jan 2009 11:49:06 -0000	1.1
+++ mingw32-cairo.spec	28 Jan 2009 12:22:13 -0000	1.2
@@ -6,7 +6,7 @@
 
 Name:           mingw32-cairo
 Version:        1.8.0
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        MinGW Windows Cairo library
 
 License:        LGPLv2 or MPLv1.1
@@ -62,7 +62,7 @@
 make DESTDIR=$RPM_BUILD_ROOT install
 
 rm -f $RPM_BUILD_ROOT%{_mingw32_libdir}/charset.alias
-
+rm -r $RPM_BUILD_ROOT%{_mingw32_datadir}/gtk-doc/html/cairo/
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -82,10 +82,12 @@
 %{_mingw32_libdir}/pkgconfig/cairo-win32-font.pc
 %{_mingw32_libdir}/pkgconfig/cairo-win32.pc
 %{_mingw32_libdir}/pkgconfig/cairo.pc
-%{_mingw32_datadir}/gtk-doc/html/cairo/
 
 
 %changelog
+* Wed Jan 28 2009 Richard W.M. Jones <rjones at redhat.com> - 1.8.0-7
+- Remove gtk-doc (Levente Farkas).
+
 * Mon Jan 26 2009 Richard W.M. Jones <rjones at redhat.com> - 1.8.0-6
 - Requires pkgconfig (Erik van Pienbroek).
 



From ovasik at fedoraproject.org  Wed Jan 28 12:22:53 2009
From: ovasik at fedoraproject.org (Ondrej Vasik)
Date: Wed, 28 Jan 2009 12:22:53 +0000 (UTC)
Subject: rpms/xmlto/F-10 xmlto-libpaper.patch, NONE,
	1.1 xmlto-stringparam.patch, NONE,
	1.1 xmlto-xmllintoptions.patch, NONE, 1.1 xmlto.spec, 1.40, 1.41
Message-ID: <20090128122253.391377010D@cvs1.fedora.phx.redhat.com>

Author: ovasik

Update of /cvs/extras/rpms/xmlto/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4448

Modified Files:
	xmlto.spec 
Added Files:
	xmlto-libpaper.patch xmlto-stringparam.patch 
	xmlto-xmllintoptions.patch 
Log Message:
fix cleaning up of temporary files with libpaper, fix xmllint postvalid (added noent option), fix stringparam functionality, ship documentation files, spec file cleanup(merge review)

xmlto-libpaper.patch:

--- NEW FILE xmlto-libpaper.patch ---
diff -urNp xmlto-0.0.21-orig/xmlto.in xmlto-0.0.21/xmlto.in
--- xmlto-0.0.21-orig/xmlto.in	2009-01-28 12:32:29.000000000 +0100
+++ xmlto-0.0.21/xmlto.in	2009-01-28 12:35:10.000000000 +0100
@@ -1,5 +1,5 @@
 #!@BASH@
-# 
+#
 # @PACKAGE@ - apply an XSL stylesheet to an XML document
 # Copyright (C) 2001, 2002, 2003  Tim Waugh <twaugh at redhat.com>
 
@@ -106,6 +106,8 @@ then
   if [ -n "$paperheight" -a -n "$paperwidth" ]
   then
     papersizemod=$(${MKTEMP} ${TMPDIR:-/tmp}/@PACKAGE at -xsl.XXXXXX)
+    CLEANFILES[$CLEANFILE_COUNT]="$papersizemod"
+    CLEANFILE_COUNT=$(($CLEANFILE_COUNT + 1))
     cat << EOF > "$papersizemod"
 <?xml version='1.0'?>
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
@@ -337,8 +339,6 @@ case "$DEST_FORMAT" in
   fo | pdf | ps | dvi)
     if [ -n "$papersizemod" ]
     then
-      CLEANFILES[$CLEANFILE_COUNT]="$papersizemod"
-      CLEANFILE_COUNT=$(($CLEANFILE_COUNT + 1))
       XSL_MODS[$XSL_MOD_COUNT]="$papersizemod"
       XSL_MOD_COUNT=$(($XSL_MOD_COUNT + 1))
     fi

xmlto-stringparam.patch:

--- NEW FILE xmlto-stringparam.patch ---
diff -urNp xmlto-0.0.21-orig/THANKS xmlto-0.0.21/THANKS
--- xmlto-0.0.21-orig/THANKS	2008-02-25 15:24:59.000000000 +0100
+++ xmlto-0.0.21/THANKS	2009-01-05 17:55:58.000000000 +0100
@@ -11,3 +11,4 @@ Shlomi Fish <shlomif at gmail.com>
 Braden McDaniel <braden at endoframe.com>
 Andreas Hoenen <andreas.hoenen at arcor.de>
 Graham Wilson <graham at debian.org>
+Joseph Parmelee <jparmele at wildbear.com>
diff -urNp xmlto-0.0.21-orig/xmlto.in xmlto-0.0.21/xmlto.in
--- xmlto-0.0.21-orig/xmlto.in	2008-05-30 15:41:31.000000000 +0200
+++ xmlto-0.0.21/xmlto.in	2009-01-05 17:55:12.000000000 +0100
@@ -273,8 +273,8 @@ while [ "$#" -gt "0" ]; do
 	;;
   --stringparam)
 	MYPARAM="$2"
-	XSLTPARAMS="XSLTPARAMS --stringparam ${MYPARAM%=*}"
-	XSLTPARAMS="XSLTPARAMS $MYPARAM#*=}"
+	XSLTPARAMS="$XSLTPARAMS --stringparam ${MYPARAM%=*}"
+	XSLTPARAMS="$XSLTPARAMS ${MYPARAM#*=}"
 	shift 2
 	;;
   --noclean)

xmlto-xmllintoptions.patch:

--- NEW FILE xmlto-xmllintoptions.patch ---
diff -urNp xmlto-0.0.21-orig/xmlto.in xmlto-0.0.21/xmlto.in
--- xmlto-0.0.21-orig/xmlto.in	2009-01-28 12:51:19.000000000 +0100
+++ xmlto-0.0.21/xmlto.in	2009-01-28 12:54:35.000000000 +0100
@@ -427,8 +427,10 @@ if [ "$SKIP_VALIDATION" -eq 0 ] && [ "$S
 then
   VALIDATION="${XSLT_PROCESSED_DIR}/validation-errors"
   [ "$VERBOSE" -ge 1 ] && \
-    echo >&2 "xmllint >/dev/null --xinclude --postvalid \"$INPUT_FILE\""
-  xmllint >/dev/null --xinclude --postvalid "$INPUT_FILE" 2>"${VALIDATION}"
+  echo >&2 \
+    "xmllint >/dev/null --xinclude --postvalid --noent \"$INPUT_FILE\""
+  xmllint >/dev/null --xinclude --postvalid --noent \
+    "$INPUT_FILE" 2>"${VALIDATION}"
   xmllint_status=$?
   if [ $xmllint_status -ne 0 ]
   then


Index: xmlto.spec
===================================================================
RCS file: /cvs/extras/rpms/xmlto/F-10/xmlto.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- xmlto.spec	14 Jul 2008 14:20:49 -0000	1.40
+++ xmlto.spec	28 Jan 2009 12:22:22 -0000	1.41
@@ -1,25 +1,29 @@
 Summary: A tool for converting XML files to various formats
 Name: xmlto
 Version: 0.0.21
-Release: 2%{?dist}
-License: GPLv2
+Release: 3%{?dist}
+#xmlto is released under GPLv2+ license, xmlif under GPL+ license
+License: GPLv2+ and GPL+
 Group: Applications/System
 #Older versions up to xmlto-0.0.20
 #URL: http://cyberelk.net/tim/xmlto/
 #Source0: http://cyberelk.net/tim/data/xmlto/stable/%{name}-%{version}.tar.bz2
 URL: https://fedorahosted.org/xmlto/
 Source0: http://svn.fedorahosted.org/svn/%{name}/%{name}-%{version}.tar.bz2
+Patch0: xmlto-stringparam.patch
+Patch1: xmlto-libpaper.patch
+Patch2: xmlto-xmllintoptions.patch
 
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: docbook-xsl >= 1.56.0
-BuildRequires: /usr/bin/xsltproc
+BuildRequires: libxslt
 BuildRequires: util-linux, flex
 
 # We rely heavily on the DocBook XSL stylesheets!
 Requires: docbook-xsl >= 1.56.0
 Requires: text-www-browser
-Requires: /usr/bin/xsltproc
+Requires: libxslt
 Requires: docbook-dtds
 Requires: util-linux, flex
 
@@ -30,7 +34,7 @@
 %package tex
 Group: Applications/System
 License: GPLv2
-Summary: A set of xmlto backends with TeX requirements 
+Summary: A set of xmlto backends with TeX requirements
 # For full functionality, we need passivetex.
 Requires: passivetex >= 1.11
 # We require main package
@@ -42,24 +46,28 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .stringparam
+%patch1 -p1 -b .libpapercleanup
+%patch2 -p1 -b .xmllintoptions
 
 %build
 touch doc/xmlto.xml doc/xmlif.xml
 %configure
-make
+make %{?_smp_mflags}
 
 %check
 make check
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%makeinstall
+make install DESTDIR=$RPM_BUILD_ROOT
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
-%defattr(-,root,root)
+%defattr(-,root,root,-)
+%doc COPYING ChangeLog README AUTHORS NEWS
 %{_bindir}/*
 %{_mandir}/*/*
 %{_datadir}/xmlto
@@ -68,14 +76,21 @@
 %exclude %{_datadir}/xmlto/format/fo/pdf
 
 %files tex
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %{_datadir}/xmlto/format/fo/dvi
 %{_datadir}/xmlto/format/fo/ps
 %{_datadir}/xmlto/format/fo/pdf
 
 %changelog
+* Wed Jan 28 2009 Ondrej Vasik <ovasik at redhat.com> - 0.0.21-3
+- fix cleaning up of temporary files with libpaper(Debian)
+- fix xmllint postvalid (added noent option)
+- fix stringparam option functionality
+- correct doc filelist attributes, fix license, ship
+  documentation files, spec file cleanup
+
 * Fri Jul 11 2008 Ondrej Vasik <ovasik at redhat.com> - 0.0.21-2
-- xmlto-tex subpackage to prevent requirements for 
+- xmlto-tex subpackage to prevent requirements for
   passivetex/tex for all backends(#454341)
 
 * Mon Jun 20 2008 Ondrej Vasik <ovasik at redhat.com> - 0.0.21-1



From than at fedoraproject.org  Wed Jan 28 12:25:03 2009
From: than at fedoraproject.org (Than Ngo)
Date: Wed, 28 Jan 2009 12:25:03 +0000 (UTC)
Subject: rpms/kdebase-workspace/F-10
	kdebase-workspace-4.1.1-show-systemsettings.patch, 1.1, NONE
Message-ID: <20090128122503.EE1C47010D@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdebase-workspace/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5166

Removed Files:
	kdebase-workspace-4.1.1-show-systemsettings.patch 
Log Message:
drop 



--- kdebase-workspace-4.1.1-show-systemsettings.patch DELETED ---



From allisson at fedoraproject.org  Wed Jan 28 12:34:29 2009
From: allisson at fedoraproject.org (Allisson Azevedo)
Date: Wed, 28 Jan 2009 12:34:29 +0000 (UTC)
Subject: rpms/perl-Perl6-Junction/F-9 import.log, NONE,
	1.1 perl-Perl6-Junction.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090128123429.A41227010D@cvs1.fedora.phx.redhat.com>

Author: allisson

Update of /cvs/pkgs/rpms/perl-Perl6-Junction/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7341/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-Perl6-Junction.spec 
Log Message:

First F-9 import



--- NEW FILE import.log ---
perl-Perl6-Junction-1_40000-1_fc10:F-9:perl-Perl6-Junction-1.40000-1.fc10.src.rpm:1233145868


--- NEW FILE perl-Perl6-Junction.spec ---
%define tarname Perl6-Junction
Name:           perl-Perl6-Junction
Version:        1.40000
Release:        1%{?dist}
Summary:        Perl6 style Junction operators in Perl5

Group:          Development/Libraries
License:        GPL+ or Artistic
URL:            http://search.cpan.org/dist/Perl6-Junction/
Source0:        http://search.cpan.org/CPAN/authors/id/C/CF/CFRANKS/%{tarname}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
# Correct for lots of packages, other common choices include eg. Module::Build
BuildRequires:  perl(ExtUtils::MakeMaker) perl(Test::More)
Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
Perl6 style Junction operators in Perl5.

This is a lightweight module which provides 'Junction' operators, the most 
commonly used being 'any' and 'all'.

Inspired by the Perl6 design docs, 
<http://dev.perl.org/perl6/doc/design/exe/E06.html.

Provides a limited subset of the functionality of L<Quantum::Superpositions>.

%prep
%setup -q -n Perl6-Junction-%{version}


%build
# Remove OPTIMIZE=... from noarch packages (unneeded)
%{__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 {} ';'
# Remove the next line from noarch packages (unneeded)
find $RPM_BUILD_ROOT -type f -name '*.bs' -a -size 0 -exec rm -f {} ';'
find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null ';'
chmod -R u+w $RPM_BUILD_ROOT/*


%check
make test


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc
# For noarch packages: vendorlib
%{perl_vendorlib}/*
# For arch-specific packages: vendorarch
#%{perl_vendorarch}/*
#%exclude %dir %{perl_vendorarch}/auto/
%{_mandir}/man3/*.3*


%changelog

* Sun Jan 25 2009 Allisson Azevedo <allisson at gmail.com> 1.40000-1
- Initial RPM release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Perl6-Junction/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	28 Jan 2009 05:36:37 -0000	1.1
+++ .cvsignore	28 Jan 2009 12:33:59 -0000	1.2
@@ -0,0 +1 @@
+Perl6-Junction-1.40000.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Perl6-Junction/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	28 Jan 2009 05:36:37 -0000	1.1
+++ sources	28 Jan 2009 12:33:59 -0000	1.2
@@ -0,0 +1 @@
+0d94cc39ac646175ad38451ef752e982  Perl6-Junction-1.40000.tar.gz



From mmaslano at fedoraproject.org  Wed Jan 28 12:35:13 2009
From: mmaslano at fedoraproject.org (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?=)
Date: Wed, 28 Jan 2009 12:35:13 +0000 (UTC)
Subject: rpms/anacron/devel anacron.spec,1.56,1.57
Message-ID: <20090128123513.E9BF67010D@cvs1.fedora.phx.redhat.com>

Author: mmaslano

Update of /cvs/pkgs/rpms/anacron/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7521

Modified Files:
	anacron.spec 
Log Message:
* Thu Jan 28 2009 Marcela Ma??l????ov?? <mmaslano at redhat.com> 2.3-67
- 482782 output in init script redirected



Index: anacron.spec
===================================================================
RCS file: /cvs/pkgs/rpms/anacron/devel/anacron.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- anacron.spec	28 Jan 2009 09:46:38 -0000	1.56
+++ anacron.spec	28 Jan 2009 12:34:43 -0000	1.57
@@ -116,7 +116,7 @@
 #%dir /etc/cron.monthly/0anacron
 
 %changelog
-* Thr Jan 28 2009 Marcela Ma??l????ov?? <mmaslano at redhat.com> 2.3-67
+* Thu Jan 28 2009 Marcela Ma??l????ov?? <mmaslano at redhat.com> 2.3-67
 - 482782 output in init script redirected
 
 * Mon Jan 26 2009 Marcela Ma??l????ov?? <mmaslano at redhat.com> 2.3-66



From allisson at fedoraproject.org  Wed Jan 28 12:39:55 2009
From: allisson at fedoraproject.org (Allisson Azevedo)
Date: Wed, 28 Jan 2009 12:39:55 +0000 (UTC)
Subject: rpms/perl-Perl6-Junction/F-10 import.log, NONE,
	1.1 perl-Perl6-Junction.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090128123955.46EFF7010D@cvs1.fedora.phx.redhat.com>

Author: allisson

Update of /cvs/pkgs/rpms/perl-Perl6-Junction/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8403/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-Perl6-Junction.spec 
Log Message:

First import for F-10



--- NEW FILE import.log ---
perl-Perl6-Junction-1_40000-1_fc10:F-10:perl-Perl6-Junction-1.40000-1.fc10.src.rpm:1233146032


--- NEW FILE perl-Perl6-Junction.spec ---
%define tarname Perl6-Junction
Name:           perl-Perl6-Junction
Version:        1.40000
Release:        1%{?dist}
Summary:        Perl6 style Junction operators in Perl5

Group:          Development/Libraries
License:        GPL+ or Artistic
URL:            http://search.cpan.org/dist/Perl6-Junction/
Source0:        http://search.cpan.org/CPAN/authors/id/C/CF/CFRANKS/%{tarname}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
# Correct for lots of packages, other common choices include eg. Module::Build
BuildRequires:  perl(ExtUtils::MakeMaker) perl(Test::More)
Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
Perl6 style Junction operators in Perl5.

This is a lightweight module which provides 'Junction' operators, the most 
commonly used being 'any' and 'all'.

Inspired by the Perl6 design docs, 
<http://dev.perl.org/perl6/doc/design/exe/E06.html.

Provides a limited subset of the functionality of L<Quantum::Superpositions>.

%prep
%setup -q -n Perl6-Junction-%{version}


%build
# Remove OPTIMIZE=... from noarch packages (unneeded)
%{__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 {} ';'
# Remove the next line from noarch packages (unneeded)
find $RPM_BUILD_ROOT -type f -name '*.bs' -a -size 0 -exec rm -f {} ';'
find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null ';'
chmod -R u+w $RPM_BUILD_ROOT/*


%check
make test


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc
# For noarch packages: vendorlib
%{perl_vendorlib}/*
# For arch-specific packages: vendorarch
#%{perl_vendorarch}/*
#%exclude %dir %{perl_vendorarch}/auto/
%{_mandir}/man3/*.3*


%changelog

* Sun Jan 25 2009 Allisson Azevedo <allisson at gmail.com> 1.40000-1
- Initial RPM release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Perl6-Junction/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	28 Jan 2009 05:36:37 -0000	1.1
+++ .cvsignore	28 Jan 2009 12:39:24 -0000	1.2
@@ -0,0 +1 @@
+Perl6-Junction-1.40000.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Perl6-Junction/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	28 Jan 2009 05:36:37 -0000	1.1
+++ sources	28 Jan 2009 12:39:24 -0000	1.2
@@ -0,0 +1 @@
+0d94cc39ac646175ad38451ef752e982  Perl6-Junction-1.40000.tar.gz



From allisson at fedoraproject.org  Wed Jan 28 12:43:04 2009
From: allisson at fedoraproject.org (Allisson Azevedo)
Date: Wed, 28 Jan 2009 12:43:04 +0000 (UTC)
Subject: rpms/perl-Perl6-Junction/devel import.log, NONE,
	1.1 perl-Perl6-Junction.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090128124304.B652A7010D@cvs1.fedora.phx.redhat.com>

Author: allisson

Update of /cvs/pkgs/rpms/perl-Perl6-Junction/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9058/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-Perl6-Junction.spec 
Log Message:

First import for devel.



--- NEW FILE import.log ---
perl-Perl6-Junction-1_40000-1_fc10:HEAD:perl-Perl6-Junction-1.40000-1.fc10.src.rpm:1233146369


--- NEW FILE perl-Perl6-Junction.spec ---
%define tarname Perl6-Junction
Name:           perl-Perl6-Junction
Version:        1.40000
Release:        1%{?dist}
Summary:        Perl6 style Junction operators in Perl5

Group:          Development/Libraries
License:        GPL+ or Artistic
URL:            http://search.cpan.org/dist/Perl6-Junction/
Source0:        http://search.cpan.org/CPAN/authors/id/C/CF/CFRANKS/%{tarname}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
# Correct for lots of packages, other common choices include eg. Module::Build
BuildRequires:  perl(ExtUtils::MakeMaker) perl(Test::More)
Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
Perl6 style Junction operators in Perl5.

This is a lightweight module which provides 'Junction' operators, the most 
commonly used being 'any' and 'all'.

Inspired by the Perl6 design docs, 
<http://dev.perl.org/perl6/doc/design/exe/E06.html.

Provides a limited subset of the functionality of L<Quantum::Superpositions>.

%prep
%setup -q -n Perl6-Junction-%{version}


%build
# Remove OPTIMIZE=... from noarch packages (unneeded)
%{__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 {} ';'
# Remove the next line from noarch packages (unneeded)
find $RPM_BUILD_ROOT -type f -name '*.bs' -a -size 0 -exec rm -f {} ';'
find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null ';'
chmod -R u+w $RPM_BUILD_ROOT/*


%check
make test


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc
# For noarch packages: vendorlib
%{perl_vendorlib}/*
# For arch-specific packages: vendorarch
#%{perl_vendorarch}/*
#%exclude %dir %{perl_vendorarch}/auto/
%{_mandir}/man3/*.3*


%changelog

* Sun Jan 25 2009 Allisson Azevedo <allisson at gmail.com> 1.40000-1
- Initial RPM release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Perl6-Junction/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	28 Jan 2009 05:36:37 -0000	1.1
+++ .cvsignore	28 Jan 2009 12:42:34 -0000	1.2
@@ -0,0 +1 @@
+Perl6-Junction-1.40000.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Perl6-Junction/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	28 Jan 2009 05:36:37 -0000	1.1
+++ sources	28 Jan 2009 12:42:34 -0000	1.2
@@ -0,0 +1 @@
+0d94cc39ac646175ad38451ef752e982  Perl6-Junction-1.40000.tar.gz



From allisson at fedoraproject.org  Wed Jan 28 12:47:11 2009
From: allisson at fedoraproject.org (Allisson Azevedo)
Date: Wed, 28 Jan 2009 12:47:11 +0000 (UTC)
Subject: rpms/perl-MooseX-ClassAttribute/F-9 import.log, NONE,
	1.1 perl-MooseX-ClassAttribute.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090128124711.BAD9A7010D@cvs1.fedora.phx.redhat.com>

Author: allisson

Update of /cvs/pkgs/rpms/perl-MooseX-ClassAttribute/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9777/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-MooseX-ClassAttribute.spec 
Log Message:

First import for F-10.



--- NEW FILE import.log ---
perl-MooseX-ClassAttribute-0_07-1_fc10:F-9:perl-MooseX-ClassAttribute-0.07-1.fc10.src.rpm:1233146589


--- NEW FILE perl-MooseX-ClassAttribute.spec ---
%define tarname MooseX-ClassAttribute
Name:           perl-MooseX-ClassAttribute
Version:        0.07
Release:        1%{?dist}
Summary:        Declare class attributes Moose-style

Group:          Development/Libraries
License:        GPL+ or Artistic
URL:            http://search.cpan.org/dist/MooseX-ClassAttribute/
Source0:        http://search.cpan.org/CPAN/authors/id/D/DR/DROLSKY/%{tarname}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
# Correct for lots of packages, other common choices include eg. Module::Build
BuildRequires:  perl(ExtUtils::MakeMaker) perl(Module::Build) perl(Test::More)
BuildRequires:  perl(Moose) perl(MooseX::AttributeHelpers)
Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
This module allows you to declare class attributes in exactly the same way as 
object attributes, using class_has() instead of has().

You can use any feature of Moose's attribute declarations, including overriding 
a parent's attributes, delegation (handles), and attribute metaclasses, and it 
should just work. The one exception is the "required" flag, which is not 
allowed for class attributes.

The accessor methods for class attribute may be called on the class directly, 
or on objects of that class. Passing a class attribute to the constructor will 
not set it.

%prep
%setup -q -n MooseX-ClassAttribute-%{version}


%build
# Remove OPTIMIZE=... from noarch packages (unneeded)
%{__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 {} ';'
# Remove the next line from noarch packages (unneeded)
find $RPM_BUILD_ROOT -type f -name '*.bs' -a -size 0 -exec rm -f {} ';'
find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null ';'
chmod -R u+w $RPM_BUILD_ROOT/*


%check
make test


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc
# For noarch packages: vendorlib
%{perl_vendorlib}/*
# For arch-specific packages: vendorarch
#%{perl_vendorarch}/*
#%exclude %dir %{perl_vendorarch}/auto/
%{_mandir}/man3/*.3*


%changelog

* Sun Jan 25 2009 Allisson Azevedo <allisson at gmail.com> 0.07-1
- Initial RPM release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-MooseX-ClassAttribute/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	28 Jan 2009 05:43:53 -0000	1.1
+++ .cvsignore	28 Jan 2009 12:46:41 -0000	1.2
@@ -0,0 +1 @@
+MooseX-ClassAttribute-0.07.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-MooseX-ClassAttribute/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	28 Jan 2009 05:43:53 -0000	1.1
+++ sources	28 Jan 2009 12:46:41 -0000	1.2
@@ -0,0 +1 @@
+18608a4839d51c079d2465fb9eb6c964  MooseX-ClassAttribute-0.07.tar.gz



From ltinkl at fedoraproject.org  Wed Jan 28 12:47:39 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Wed, 28 Jan 2009 12:47:39 +0000 (UTC)
Subject: rpms/kdebase-workspace/F-9
	kdebase-workspace-4.0.85-plasma-default-wallpaper.patch, 1.1,
	NONE kdebase-workspace-4.1.1-show-systemsettings.patch, 1.1, NONE
Message-ID: <20090128124739.9FCA07010D@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kdebase-workspace/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10086

Removed Files:
	kdebase-workspace-4.0.85-plasma-default-wallpaper.patch 
	kdebase-workspace-4.1.1-show-systemsettings.patch 
Log Message:
drop unused patches for 4.2.0



--- kdebase-workspace-4.0.85-plasma-default-wallpaper.patch DELETED ---


--- kdebase-workspace-4.1.1-show-systemsettings.patch DELETED ---



From than at fedoraproject.org  Wed Jan 28 12:47:57 2009
From: than at fedoraproject.org (Than Ngo)
Date: Wed, 28 Jan 2009 12:47:57 +0000 (UTC)
Subject: rpms/kdebase-workspace/devel
	kdebase-workspace-4.2.0-default_applets.patch, NONE,
	1.1 kdebase-workspace.spec, 1.170, 1.171
Message-ID: <20090128124757.86AE57010D@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdebase-workspace/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10011

Modified Files:
	kdebase-workspace.spec 
Added Files:
	kdebase-workspace-4.2.0-default_applets.patch 
Log Message:
readd the patch that omist battery applet when guidance-power-manager is installed



kdebase-workspace-4.2.0-default_applets.patch:

--- NEW FILE kdebase-workspace-4.2.0-default_applets.patch ---
diff -up kdebase-workspace-4.2.0/plasma/shells/desktop/desktopcorona.cpp.orig kdebase-workspace-4.2.0/plasma/shells/desktop/desktopcorona.cpp
--- kdebase-workspace-4.2.0/plasma/shells/desktop/desktopcorona.cpp.orig	2009-01-28 13:33:19.000000000 +0100
+++ kdebase-workspace-4.2.0/plasma/shells/desktop/desktopcorona.cpp	2009-01-28 13:39:47.000000000 +0100
@@ -200,15 +200,17 @@ void DesktopCorona::loadDefaultLayout()
     loadDefaultApplet("tasks", panel);
     loadDefaultApplet("systemtray", panel);
 
-    Plasma::DataEngineManager *engines = Plasma::DataEngineManager::self();
-    Plasma::DataEngine *power = engines->loadEngine("powermanagement");
-    if (power) {
-        const QStringList &batteries = power->query("Battery")["sources"].toStringList();
-        if (!batteries.isEmpty()) {
-            loadDefaultApplet("battery", panel);
-        }
+    if (!QFile::exists("/usr/share/autostart/guidance-power-manager.desktop")) {
+       Plasma::DataEngineManager *engines = Plasma::DataEngineManager::self();
+       Plasma::DataEngine *power = engines->loadEngine("powermanagement");
+       if (power) {
+          const QStringList &batteries = power->query("Battery")["sources"].toStringList();
+          if (!batteries.isEmpty()) {
+             loadDefaultApplet("battery", panel);
+          }
+       }
+       engines->unloadEngine("powermanagement");
     }
-    engines->unloadEngine("powermanagement");
 
     loadDefaultApplet("digital-clock", panel);
     emit containmentAdded(panel);


Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebase-workspace/devel/kdebase-workspace.spec,v
retrieving revision 1.170
retrieving revision 1.171
diff -u -r1.170 -r1.171
--- kdebase-workspace.spec	22 Jan 2009 21:54:49 -0000	1.170
+++ kdebase-workspace.spec	28 Jan 2009 12:47:27 -0000	1.171
@@ -4,7 +4,7 @@
 Name: kdebase-workspace
 Version: 4.2.0
 
-Release: 1%{?dist}
+Release: 2%{?dist}
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-workspace-%{version}.tar.bz2
 License: GPLv2
 Group: User Interface/Desktops
@@ -24,6 +24,7 @@
 Patch9: kdebase-workspace-4.1.80-session-button.patch
 Patch10: kdebase-workspace-4.1.2-ldap.patch
 Patch11: kdebase-workspace-4.1.96-font.patch
+Patch12: kdebase-workspace-4.2.0-default_applets.patch
 
 # upstream patches:
 # trunk
@@ -172,6 +173,7 @@
 %patch9 -p1 -b .session-button
 %patch10 -p1 -b .ldap
 %patch11 -p1 -b .font
+%patch12 -p1 -b .default_applets
 
 # upstream patches
 %patch100 -p1 -b .AllowExternalPaths
@@ -300,6 +302,9 @@
 
 
 %changelog
+* Wed Jan 28 2009 Than Ngo <than at redhat.com> - 4.2.0-2
+- readd the patch that omist battery applet when guidance-power-manager is installed
+
 * Thu Jan 22 2009 Than Ngo <than at redhat.com> - 4.2.0-1
 - 4.2.0
 



From allisson at fedoraproject.org  Wed Jan 28 12:50:07 2009
From: allisson at fedoraproject.org (Allisson Azevedo)
Date: Wed, 28 Jan 2009 12:50:07 +0000 (UTC)
Subject: rpms/perl-MooseX-ClassAttribute/F-10 import.log, NONE,
	1.1 perl-MooseX-ClassAttribute.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090128125007.78EC47010D@cvs1.fedora.phx.redhat.com>

Author: allisson

Update of /cvs/pkgs/rpms/perl-MooseX-ClassAttribute/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10618/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-MooseX-ClassAttribute.spec 
Log Message:

First import for F-10



--- NEW FILE import.log ---
perl-MooseX-ClassAttribute-0_07-1_fc10:F-10:perl-MooseX-ClassAttribute-0.07-1.fc10.src.rpm:1233146797


--- NEW FILE perl-MooseX-ClassAttribute.spec ---
%define tarname MooseX-ClassAttribute
Name:           perl-MooseX-ClassAttribute
Version:        0.07
Release:        1%{?dist}
Summary:        Declare class attributes Moose-style

Group:          Development/Libraries
License:        GPL+ or Artistic
URL:            http://search.cpan.org/dist/MooseX-ClassAttribute/
Source0:        http://search.cpan.org/CPAN/authors/id/D/DR/DROLSKY/%{tarname}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
# Correct for lots of packages, other common choices include eg. Module::Build
BuildRequires:  perl(ExtUtils::MakeMaker) perl(Module::Build) perl(Test::More)
BuildRequires:  perl(Moose) perl(MooseX::AttributeHelpers)
Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
This module allows you to declare class attributes in exactly the same way as 
object attributes, using class_has() instead of has().

You can use any feature of Moose's attribute declarations, including overriding 
a parent's attributes, delegation (handles), and attribute metaclasses, and it 
should just work. The one exception is the "required" flag, which is not 
allowed for class attributes.

The accessor methods for class attribute may be called on the class directly, 
or on objects of that class. Passing a class attribute to the constructor will 
not set it.

%prep
%setup -q -n MooseX-ClassAttribute-%{version}


%build
# Remove OPTIMIZE=... from noarch packages (unneeded)
%{__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 {} ';'
# Remove the next line from noarch packages (unneeded)
find $RPM_BUILD_ROOT -type f -name '*.bs' -a -size 0 -exec rm -f {} ';'
find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null ';'
chmod -R u+w $RPM_BUILD_ROOT/*


%check
make test


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc
# For noarch packages: vendorlib
%{perl_vendorlib}/*
# For arch-specific packages: vendorarch
#%{perl_vendorarch}/*
#%exclude %dir %{perl_vendorarch}/auto/
%{_mandir}/man3/*.3*


%changelog

* Sun Jan 25 2009 Allisson Azevedo <allisson at gmail.com> 0.07-1
- Initial RPM release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-MooseX-ClassAttribute/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	28 Jan 2009 05:43:53 -0000	1.1
+++ .cvsignore	28 Jan 2009 12:49:37 -0000	1.2
@@ -0,0 +1 @@
+MooseX-ClassAttribute-0.07.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-MooseX-ClassAttribute/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	28 Jan 2009 05:43:53 -0000	1.1
+++ sources	28 Jan 2009 12:49:37 -0000	1.2
@@ -0,0 +1 @@
+18608a4839d51c079d2465fb9eb6c964  MooseX-ClassAttribute-0.07.tar.gz



From than at fedoraproject.org  Wed Jan 28 12:51:01 2009
From: than at fedoraproject.org (Than Ngo)
Date: Wed, 28 Jan 2009 12:51:01 +0000 (UTC)
Subject: rpms/kdebase-workspace/F-10
	kdebase-workspace-4.2.0-default_applets.patch, NONE,
	1.1 kdebase-workspace.spec, 1.149, 1.150
Message-ID: <20090128125101.215437010D@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdebase-workspace/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10823

Modified Files:
	kdebase-workspace.spec 
Added Files:
	kdebase-workspace-4.2.0-default_applets.patch 
Log Message:
readd the patch that omist battery applet when guidance-power-manager is installed



kdebase-workspace-4.2.0-default_applets.patch:

--- NEW FILE kdebase-workspace-4.2.0-default_applets.patch ---
diff -up kdebase-workspace-4.2.0/plasma/shells/desktop/desktopcorona.cpp.orig kdebase-workspace-4.2.0/plasma/shells/desktop/desktopcorona.cpp
--- kdebase-workspace-4.2.0/plasma/shells/desktop/desktopcorona.cpp.orig	2009-01-28 13:33:19.000000000 +0100
+++ kdebase-workspace-4.2.0/plasma/shells/desktop/desktopcorona.cpp	2009-01-28 13:39:47.000000000 +0100
@@ -200,15 +200,17 @@ void DesktopCorona::loadDefaultLayout()
     loadDefaultApplet("tasks", panel);
     loadDefaultApplet("systemtray", panel);
 
-    Plasma::DataEngineManager *engines = Plasma::DataEngineManager::self();
-    Plasma::DataEngine *power = engines->loadEngine("powermanagement");
-    if (power) {
-        const QStringList &batteries = power->query("Battery")["sources"].toStringList();
-        if (!batteries.isEmpty()) {
-            loadDefaultApplet("battery", panel);
-        }
+    if (!QFile::exists("/usr/share/autostart/guidance-power-manager.desktop")) {
+       Plasma::DataEngineManager *engines = Plasma::DataEngineManager::self();
+       Plasma::DataEngine *power = engines->loadEngine("powermanagement");
+       if (power) {
+          const QStringList &batteries = power->query("Battery")["sources"].toStringList();
+          if (!batteries.isEmpty()) {
+             loadDefaultApplet("battery", panel);
+          }
+       }
+       engines->unloadEngine("powermanagement");
     }
-    engines->unloadEngine("powermanagement");
 
     loadDefaultApplet("digital-clock", panel);
     emit containmentAdded(panel);


Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebase-workspace/F-10/kdebase-workspace.spec,v
retrieving revision 1.149
retrieving revision 1.150
diff -u -r1.149 -r1.150
--- kdebase-workspace.spec	24 Jan 2009 06:17:59 -0000	1.149
+++ kdebase-workspace.spec	28 Jan 2009 12:50:30 -0000	1.150
@@ -4,7 +4,7 @@
 Name: kdebase-workspace
 Version: 4.2.0
 
-Release: 1%{?dist}
+Release: 2%{?dist}
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-workspace-%{version}.tar.bz2
 License: GPLv2
 Group: User Interface/Desktops
@@ -24,6 +24,7 @@
 Patch9: kdebase-workspace-4.1.80-session-button.patch
 Patch10: kdebase-workspace-4.1.2-ldap.patch
 Patch11: kdebase-workspace-4.1.96-font.patch
+Patch12: kdebase-workspace-4.2.0-default_applets.patch
 
 # upstream patches:
 # trunk
@@ -172,6 +173,7 @@
 %patch9 -p1 -b .session-button
 %patch10 -p1 -b .ldap
 %patch11 -p1 -b .font
+%patch12 -p1 -b .default_applets
 
 # upstream patches
 %patch100 -p1 -b .AllowExternalPaths
@@ -300,6 +302,9 @@
 
 
 %changelog
+* Wed Jan 28 2009 Than Ngo <than at redhat.com> - 4.2.0-2
+- readd the patch that omist battery applet when guidance-power-manager is installed
+
 * Thu Jan 22 2009 Than Ngo <than at redhat.com> - 4.2.0-1
 - 4.2.0
 



From allisson at fedoraproject.org  Wed Jan 28 12:52:57 2009
From: allisson at fedoraproject.org (Allisson Azevedo)
Date: Wed, 28 Jan 2009 12:52:57 +0000 (UTC)
Subject: rpms/perl-MooseX-ClassAttribute/devel import.log, NONE,
	1.1 perl-MooseX-ClassAttribute.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090128125257.E242B7010D@cvs1.fedora.phx.redhat.com>

Author: allisson

Update of /cvs/pkgs/rpms/perl-MooseX-ClassAttribute/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11409/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-MooseX-ClassAttribute.spec 
Log Message:

First import for devel.



--- NEW FILE import.log ---
perl-MooseX-ClassAttribute-0_07-1_fc10:HEAD:perl-MooseX-ClassAttribute-0.07-1.fc10.src.rpm:1233146973


--- NEW FILE perl-MooseX-ClassAttribute.spec ---
%define tarname MooseX-ClassAttribute
Name:           perl-MooseX-ClassAttribute
Version:        0.07
Release:        1%{?dist}
Summary:        Declare class attributes Moose-style

Group:          Development/Libraries
License:        GPL+ or Artistic
URL:            http://search.cpan.org/dist/MooseX-ClassAttribute/
Source0:        http://search.cpan.org/CPAN/authors/id/D/DR/DROLSKY/%{tarname}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
# Correct for lots of packages, other common choices include eg. Module::Build
BuildRequires:  perl(ExtUtils::MakeMaker) perl(Module::Build) perl(Test::More)
BuildRequires:  perl(Moose) perl(MooseX::AttributeHelpers)
Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
This module allows you to declare class attributes in exactly the same way as 
object attributes, using class_has() instead of has().

You can use any feature of Moose's attribute declarations, including overriding 
a parent's attributes, delegation (handles), and attribute metaclasses, and it 
should just work. The one exception is the "required" flag, which is not 
allowed for class attributes.

The accessor methods for class attribute may be called on the class directly, 
or on objects of that class. Passing a class attribute to the constructor will 
not set it.

%prep
%setup -q -n MooseX-ClassAttribute-%{version}


%build
# Remove OPTIMIZE=... from noarch packages (unneeded)
%{__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 {} ';'
# Remove the next line from noarch packages (unneeded)
find $RPM_BUILD_ROOT -type f -name '*.bs' -a -size 0 -exec rm -f {} ';'
find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null ';'
chmod -R u+w $RPM_BUILD_ROOT/*


%check
make test


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc
# For noarch packages: vendorlib
%{perl_vendorlib}/*
# For arch-specific packages: vendorarch
#%{perl_vendorarch}/*
#%exclude %dir %{perl_vendorarch}/auto/
%{_mandir}/man3/*.3*


%changelog

* Sun Jan 25 2009 Allisson Azevedo <allisson at gmail.com> 0.07-1
- Initial RPM release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-MooseX-ClassAttribute/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	28 Jan 2009 05:43:53 -0000	1.1
+++ .cvsignore	28 Jan 2009 12:52:27 -0000	1.2
@@ -0,0 +1 @@
+MooseX-ClassAttribute-0.07.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-MooseX-ClassAttribute/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	28 Jan 2009 05:43:53 -0000	1.1
+++ sources	28 Jan 2009 12:52:27 -0000	1.2
@@ -0,0 +1 @@
+18608a4839d51c079d2465fb9eb6c964  MooseX-ClassAttribute-0.07.tar.gz



From ltinkl at fedoraproject.org  Wed Jan 28 12:53:02 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Wed, 28 Jan 2009 12:53:02 +0000 (UTC)
Subject: rpms/kdebase-runtime/F-9 kdebase-runtime-4.1.70-pulseaudio.patch,
	NONE, 1.1 kdebase-runtime-4.2.0-kde#178479.patch, NONE,
	1.1 kdebase-runtime.spec, 1.62, 1.63 sources, 1.20,
	1.21 kdebase-runtime-4.1.0-pulseaudio.patch, 1.1, NONE
Message-ID: <20090128125302.44A3D7010D@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kdebase-runtime/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11373

Modified Files:
	kdebase-runtime.spec sources 
Added Files:
	kdebase-runtime-4.1.70-pulseaudio.patch 
	kdebase-runtime-4.2.0-kde#178479.patch 
Removed Files:
	kdebase-runtime-4.1.0-pulseaudio.patch 
Log Message:
KDE 4.2.0


kdebase-runtime-4.1.70-pulseaudio.patch:

--- NEW FILE kdebase-runtime-4.1.70-pulseaudio.patch ---
diff -Naur kdebase-runtime-4.1.70/phonon/kcm/globalconfig.cpp kdebase-runtime-4.1.70.pulseaudio/phonon/kcm/globalconfig.cpp
--- kdebase-runtime-4.1.70/phonon/kcm/globalconfig.cpp	2008-07-17 23:32:48.000000000 +0200
+++ kdebase-runtime-4.1.70.pulseaudio/phonon/kcm/globalconfig.cpp	2008-10-21 18:49:35.000000000 +0200
@@ -28,6 +28,7 @@
 #include "phononnamespace_p.h"
 
 #include <QtCore/QList>
+#include <QtCore/QHash>
 #include <QtCore/QVariant>
 
 QT_BEGIN_NAMESPACE
@@ -158,6 +159,15 @@
                     | (defaultList.isEmpty() ? 0 : FilterHardwareDevices)
                     );
         }
+        // make PulseAudio the global default (assume it is already default in this list)
+        if (!list.isEmpty()) {
+            int firstIndex = list.first();
+            if (backendIface->objectDescriptionProperties(Phonon::AudioOutputDeviceType,
+                  firstIndex)["name"].toString() == "PulseAudio") {
+                list.removeFirst();
+                defaultList.prepend(firstIndex);
+            }
+        }
         defaultList += list;
     }
 
@@ -212,6 +222,15 @@
                     | (defaultList.isEmpty() ? 0 : FilterHardwareDevices)
                   );
         }
+        // make PulseAudio the global default (assume it is already default in this list)
+        if (!list.isEmpty()) {
+            int firstIndex = list.first();
+            if (backendIface->objectDescriptionProperties(Phonon::AudioCaptureDeviceType,
+                  firstIndex)["name"].toString() == "PulseAudio") {
+                list.removeFirst();
+                defaultList.prepend(firstIndex);
+            }
+        }
         defaultList += list;
     }
 

kdebase-runtime-4.2.0-kde#178479.patch:

--- NEW FILE kdebase-runtime-4.2.0-kde#178479.patch ---
--- branches/KDE/4.2/kdebase/runtime/kioslave/trash/trashimpl.cpp	2009/01/26 16:31:17	916986
+++ branches/KDE/4.2/kdebase/runtime/kioslave/trash/trashimpl.cpp	2009/01/26 16:41:07	916987
@@ -766,8 +766,10 @@
         return 0;
 
     KMountPoint::Ptr mp = KMountPoint::currentMountPoints().findByPath( origPath );
-    if (!mp)
+    if (!mp) {
+        kDebug() << "KMountPoint found no mount point for" << origPath;
         return 0;
+    }
     QString mountPoint = mp->mountPoint();
     const QString trashDir = trashForMountPoint( mountPoint, true );
     kDebug() << "mountPoint=" << mountPoint << " trashDir=" << trashDir;
@@ -861,7 +863,7 @@
         if ( (S_ISDIR(buff.st_mode)) // must be a dir
              && (!S_ISLNK(buff.st_mode)) // not a symlink
              && ((buff.st_mode & requiredBits) == requiredBits)
-             && (::access(rootTrashDir_c, W_OK))
+             && (::access(rootTrashDir_c, W_OK) == 0) // must be user-writable
             ) {
             const QString trashDir = rootTrashDir + '/' + QString::number( uid );
             const QByteArray trashDir_c = QFile::encodeName( trashDir );


Index: kdebase-runtime.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebase-runtime/F-9/kdebase-runtime.spec,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- kdebase-runtime.spec	22 Jan 2009 14:08:10 -0000	1.62
+++ kdebase-runtime.spec	28 Jan 2009 12:52:31 -0000	1.63
@@ -1,37 +1,28 @@
-%define _default_patch_fuzz 2
-
 %if 0%{?fedora} < 9
 # # kde3_desktop=1 -> kde3 is primary desktop, omit conflicting bits here
 %define kde3_desktop 1
 %endif
 
-%define _with_samba --with-samba
-
 Name:          kdebase-runtime
-Summary:       K Desktop Environment - Runtime 
-Version:       4.1.4
-Release:       2%{?dist}
+Summary:       K Desktop Environment - Runtime
+Version:       4.2.0
+Release:       3%{?dist}
 
 License:       GPLv2
 Group:         User Interface/Desktops
 URL:           http://www.kde.org/
 Source0:       ftp://ftp.kde.org/pub/kde/stable/%{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
+BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Patch0:        kdebase-runtime-4.1.70-pulseaudio.patch
 Patch1:        kdebase-runtime-4.1.x-searchproviders-shortcuts.patch
 Patch2:        kdebase-runtime-4.1.1-knetattach.patch
 Patch3:        kdebase-runtime-4.1.1-iconthemes-inherit.patch
-# Upstream patces
-BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+## Upstream patches
+# http://bugs.kde.org/178479
+Patch100: kdebase-runtime-4.2.0-kde#178479.patch
 
 %ifarch noarch
 %define icons 1
@@ -52,30 +43,27 @@
 %{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
 Requires(post): xdg-utils
 Requires(postun): xdg-utils
-Requires: kdepimlibs >= %{version}
+Requires: kdepimlibs%{?_isa} >= %{version}
 %ifnarch s390 s390x
 Requires: eject
 %endif
 
 BuildRequires: alsa-lib-devel
-BuildRequires: cmake
 BuildRequires: clucene-core-devel
-BuildRequires: giflib-devel
 BuildRequires: hal-devel
 BuildRequires: kdelibs4-devel >= %{version}
 BuildRequires: kdepimlibs-devel >= %{version}
-%{?_with_samba:BuildRequires: libsmbclient-devel}
+BuildRequires: libsmbclient-devel
+# needed for phonon-xine VideoWidget, also need xine-lib built with libxcb support
+BuildRequires: libxcb-devel
 BuildRequires: libXScrnSaver-devel
 BuildRequires: OpenEXR-devel
 BuildRequires: openssl-devel
-BuildRequires: pcre-devel
 BuildRequires: pkgconfig
+BuildRequires: pulseaudio-libs-devel
 BuildRequires: qimageblitz-devel
-BuildRequires: soprano-devel >= 2.0.97
-BuildRequires: strigi-devel >= 0.5.7
+BuildRequires: soprano-devel
 BuildRequires: xine-lib-devel
-# needed for phonon-xine VideoWidget, also need xine-lib built with libxcb support
-BuildRequires: libxcb-devel
 # needed?
 BuildRequires: xorg-x11-font-utils
 BuildRequires: xorg-x11-proto-devel
@@ -111,15 +99,6 @@
 %description -n oxygen-icon-theme-scalable
 %{summary}.
 
-%package -n phonon-backend-xine
-Summary: Xine phonon backend
-Group:   Applications/Multimedia
-# not sure exactly how best to version this one -- Rex
-Provides: phonon-backend = 4.2 
-%description -n phonon-backend-xine 
-%{summary}.
-
-
 %prep
 %setup -q -n kdebase-runtime-%{version}
 
@@ -129,16 +108,17 @@
 %patch3 -p1 -b .iconthemes-inherit
 
 # upstream patches
+%patch100 -p5 -b .kde#178479
 
-%build
 
-mkdir -p %{_target_platform} 
+%build
+mkdir -p %{_target_platform}
 pushd %{_target_platform}
 %{cmake_kde4} ..
 popd
 
 %if 0%{?rest}
-make %{?_smp_mflags} -C %{_target_platform} VERBOSE=1
+make %{?_smp_mflags} -C %{_target_platform}
 %endif
 
 
@@ -153,19 +133,8 @@
 %endif
 
 %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
+make install/fast DESTDIR=%{buildroot} -C %{_target_platform}/pics/oxygen
+
 %if ! 0%{?rest}
 ln -sf oxygen %{buildroot}%{_kde4_iconsdir}/default.kde4
 %endif
@@ -271,10 +240,7 @@
 # FIXME: -devel type files, omit for now
 rm -rf %{buildroot}%{_kde4_includedir}/phonon/
 rm -f  %{buildroot}%{_kde4_libdir}/libkaudiodevicelist.so
-#   /usr/include/kde4/phonon/audiodevice.h
-#   /usr/include/kde4/phonon/audiodeviceenumerator.h
-#   /usr/include/kde4/phonon/kaudiodevicelist_export.h
-#   /usr/lib64/libkaudiodevicelist.so
+rm -f  %{buildroot}%{_kde4_libdir}/libkwalletbackend.so
 
 %endif
 
@@ -294,7 +260,6 @@
 xdg-desktop-menu forceupdate 2> /dev/null || :
 
 %post libs -p /sbin/ldconfig
-
 %postun libs -p /sbin/ldconfig
 
 %if 0%{?icons}
@@ -318,6 +283,7 @@
 %files
 %defattr(-,root,root,-)
 %{_kde4_bindir}/*
+# FIXME(?), currently contains cmake/modules -- Rex
 %{_kde4_appsdir}/*
 %{_kde4_configdir}/*.knsrc
 %{_kde4_datadir}/autostart/nepomukserver.desktop
@@ -331,14 +297,11 @@
 %{_kde4_libdir}/libkdeinit4_*.so
 %{_kde4_libdir}/kde4/kcm_*.so
 %{_kde4_libdir}/kde4/kded_*.so
+%{_kde4_libdir}/libkwalletbackend.so.*
 %{_kde4_libexecdir}/*
 %{_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/*
@@ -356,20 +319,9 @@
 
 %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
-
-%files -n phonon-backend-xine
-%defattr(-,root,root,-)
-%{_kde4_libdir}/kde4/kcm_phononxine.so
-%{_kde4_datadir}/kde4/services/kcm_phononxine.desktop
-%{_kde4_libdir}/kde4/phonon_xine.so
-%{_kde4_datadir}/kde4/services/phononbackends/xine.desktop
 
 %endif
 
@@ -387,14 +339,61 @@
 
 
 %changelog
-* Wed Jan 21 2009 Rex Dieter <rdieter at fedoraproject.org> 4.1.4-2
+* Mon Jan 26 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.0-3
+- respun tarball
+
+* Mon Jan 26 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.0-2
+- Files not trashed to the correct location in Dolphin/Konqueror 
+  (#481598, kdebug#178479)
+- omit --with-samba crud
+
+* Thu Jan 22 2009 Than Ngo <than at redhat.com> - 4.2.0-1
+- 4.2.0
+- +BR: pulseaudio-libs-devel xine-lib-devel
+- -BR: giflib-devel pcre-devel
+
+* Tue Jan 13 2009 Rex Dieter <rdieter at fedoraproject.org> 4.1.96-2
+- tarball respin
+- drop extraneous deps (that are in kdelibs)
+
+* Wed Jan 07 2009 Than Ngo <than at redhat.com> - 4.1.96-1
+- 4.2rc1
+
+* Mon Dec 22 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.85-2
 - include %%_bindir/kdesu symlink
 
-* Thu Jan  8 2009 Luk???? Tinkl <ltinkl at redhat.com> 4.1.4-1
-- KDE 4.1.4
+* Thu Dec 11 2008 Than Ngo <than at redhat.com> 4.1.85-1
+- 4.2beta2
+
+* Mon Dec 01 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.80-5
+- don't ship libkwalletbackend.so devel symlink (conflicts with kdelibs3-devel,
+  and should be in a -devel package if it gets shipped)
+
+* Thu Nov 27 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.80-4
+- BR strigi-devel >= 0.5.11.1 because 0.5.11 is broken
+
+* Thu Nov 20 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.80-3
+- readd still relevant part of the Phonon PulseAudio patch (for the KCM)
+
+* Wed Nov 19 2008 Than Ngo <than at redhat.com> 4.1.80-2
+- drop kdebase-runtime-4.0.72-pulseaudio.patch/icons, it's part of phonon
+
+* Fri Nov 19 2008 Lorenzo Villani <lvillani at binaryhelix.net> - 4.1.80-1
+- 4.1.80
+- Drop upstreamed patch kdebase-runtime-4.1.2-kioexec.patch
+- BR cmake >= 2.6.2
+- Use 'make install/fast'
+- Drop subpkg phonon-backend-xine and related file entries: this has to be
+  part of phonon now that it moved there
+- Drop xine-lib-devel BR
+- Add libkwalletbackend to files list
+- Drop _default_patch_fuzz 2
+
+* Thu Nov 13 2008 Than Ngo <than at redhat.com> 4.1.3-5
+- apply upstream patch to fix X crash when disabling compositing
 
 * Wed Nov 12 2008 Than Ngo <than at redhat.com> 4.1.3-1
-- KDE 4.1.3
+- 4.1.3
 
 * Tue Oct 14 2008 Than Ngo <than at redhat.com> 4.1.2-5
 - apply upstream patch, kioexec processes never terminate
@@ -465,7 +464,7 @@
 - 4.0.82
 
 * Thu Jun 05 2008 Than Ngo <than at redhat.com> 4.0.80-2
-- add searchproviders-shortcuts for redhat bugzilla 
+- add searchproviders-shortcuts for redhat bugzilla
 
 * Mon May 26 2008 Than Ngo <than at redhat.com> 4.0.80-1
 - 4.1 beta 1
@@ -515,7 +514,7 @@
 - 4.0.3
 
 * Thu Mar 20 2008 Rex Dieter <rdieter at fedoraproject.org> 4.0.2-5
-- don't own %%_kde4_docdir/HTML/en/ 
+- don't own %%_kde4_docdir/HTML/en/
 
 * Thu Mar 20 2008 Rex Dieter <rdieter at fedoraproject.org> 4.0.2-4
 - oxygen-icon-theme, oxygen-icon-theme-scalable pkgs
@@ -551,7 +550,7 @@
 * Wed Dec 05 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.97.0-1
 - kde-3.97.0
 
-* Tue Dec 04 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.96.2-4 
+* Tue Dec 04 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.96.2-4
 - disable kioslave/smb (f9+, samba-3.2.x/gplv3 ickiness)
 
 * Sun Dec 02 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.96.2-3


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdebase-runtime/F-9/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources	8 Jan 2009 14:16:57 -0000	1.20
+++ sources	28 Jan 2009 12:52:31 -0000	1.21
@@ -1,9 +1 @@
-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
-fad82875745bacbb52001eabf9c71202  kdebase-runtime-4.1.4.tar.bz2
+8ef48aae16a6dddb3055d81d7e5c375f  kdebase-runtime-4.2.0.tar.bz2


--- kdebase-runtime-4.1.0-pulseaudio.patch DELETED ---



From than at fedoraproject.org  Wed Jan 28 12:55:28 2009
From: than at fedoraproject.org (Than Ngo)
Date: Wed, 28 Jan 2009 12:55:28 +0000 (UTC)
Subject: rpms/kdebase-workspace/F-9
	kdebase-workspace-4.2.0-default_applets.patch, NONE,
	1.1 kdebase-workspace.spec, 1.125, 1.126
Message-ID: <20090128125528.5AB477010D@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdebase-workspace/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12125

Modified Files:
	kdebase-workspace.spec 
Added Files:
	kdebase-workspace-4.2.0-default_applets.patch 
Log Message:
- readd the patch that omist battery applet when guidance-power-manager is installed



kdebase-workspace-4.2.0-default_applets.patch:

--- NEW FILE kdebase-workspace-4.2.0-default_applets.patch ---
diff -up kdebase-workspace-4.2.0/plasma/shells/desktop/desktopcorona.cpp.orig kdebase-workspace-4.2.0/plasma/shells/desktop/desktopcorona.cpp
--- kdebase-workspace-4.2.0/plasma/shells/desktop/desktopcorona.cpp.orig	2009-01-28 13:33:19.000000000 +0100
+++ kdebase-workspace-4.2.0/plasma/shells/desktop/desktopcorona.cpp	2009-01-28 13:39:47.000000000 +0100
@@ -200,15 +200,17 @@ void DesktopCorona::loadDefaultLayout()
     loadDefaultApplet("tasks", panel);
     loadDefaultApplet("systemtray", panel);
 
-    Plasma::DataEngineManager *engines = Plasma::DataEngineManager::self();
-    Plasma::DataEngine *power = engines->loadEngine("powermanagement");
-    if (power) {
-        const QStringList &batteries = power->query("Battery")["sources"].toStringList();
-        if (!batteries.isEmpty()) {
-            loadDefaultApplet("battery", panel);
-        }
+    if (!QFile::exists("/usr/share/autostart/guidance-power-manager.desktop")) {
+       Plasma::DataEngineManager *engines = Plasma::DataEngineManager::self();
+       Plasma::DataEngine *power = engines->loadEngine("powermanagement");
+       if (power) {
+          const QStringList &batteries = power->query("Battery")["sources"].toStringList();
+          if (!batteries.isEmpty()) {
+             loadDefaultApplet("battery", panel);
+          }
+       }
+       engines->unloadEngine("powermanagement");
     }
-    engines->unloadEngine("powermanagement");
 
     loadDefaultApplet("digital-clock", panel);
     emit containmentAdded(panel);


Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebase-workspace/F-9/kdebase-workspace.spec,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -r1.125 -r1.126
--- kdebase-workspace.spec	27 Jan 2009 16:29:50 -0000	1.125
+++ kdebase-workspace.spec	28 Jan 2009 12:54:57 -0000	1.126
@@ -4,7 +4,7 @@
 Name: kdebase-workspace
 Version: 4.2.0
 
-Release: 1%{?dist}
+Release: 2%{?dist}
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-workspace-%{version}.tar.bz2
 License: GPLv2
 Group: User Interface/Desktops
@@ -24,6 +24,7 @@
 Patch9: kdebase-workspace-4.1.80-session-button.patch
 Patch10: kdebase-workspace-4.1.2-ldap.patch
 Patch11: kdebase-workspace-4.1.96-font.patch
+Patch12: kdebase-workspace-4.2.0-default_applets.patch
 
 # upstream patches:
 # trunk
@@ -172,6 +173,7 @@
 %patch9 -p1 -b .session-button
 %patch10 -p1 -b .ldap
 %patch11 -p1 -b .font
+%patch12 -p1 -b .default_applets
 
 # upstream patches
 %patch100 -p1 -b .AllowExternalPaths
@@ -300,6 +302,9 @@
 
 
 %changelog
+* Wed Jan 28 2009 Than Ngo <than at redhat.com> - 4.2.0-2
+- readd the patch that omist battery applet when guidance-power-manager is installed
+
 * Thu Jan 22 2009 Than Ngo <than at redhat.com> - 4.2.0-1
 - 4.2.0
 



From ltinkl at fedoraproject.org  Wed Jan 28 12:58:46 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Wed, 28 Jan 2009 12:58:46 +0000 (UTC)
Subject: rpms/kdebase/F-9 kdebase-4.1.70-konsole-session.patch, NONE,
	1.1 kdebase-4.1.80-nsplugins-paths.patch, NONE, 1.1 kdebase.spec,
	1.341, 1.342 sources, 1.100,
	1.101 kdebase-4.1.2-konsole-kde#156636.patch, 1.3,
	NONE kdebase-4.1.2-konsole-session-1.patch, 1.3,
	NONE kdebase-4.1.2-konsole-session.patch, 1.1,
	NONE kdebase-nsplugins-paths.patch, 1.1, NONE
Message-ID: <20090128125846.25FE970141@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kdebase/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12858

Modified Files:
	kdebase.spec sources 
Added Files:
	kdebase-4.1.70-konsole-session.patch 
	kdebase-4.1.80-nsplugins-paths.patch 
Removed Files:
	kdebase-4.1.2-konsole-kde#156636.patch 
	kdebase-4.1.2-konsole-session-1.patch 
	kdebase-4.1.2-konsole-session.patch 
	kdebase-nsplugins-paths.patch 
Log Message:
KDE 4.2.0


kdebase-4.1.70-konsole-session.patch:

--- NEW FILE kdebase-4.1.70-konsole-session.patch ---
diff -Naur kdebase-4.1.70/apps/konsole/src/ViewManager.cpp kdebase-4.1.70.konsole-session/apps/konsole/src/ViewManager.cpp
--- kdebase-4.1.70/apps/konsole/src/ViewManager.cpp	2008-10-09 11:46:34.000000000 +0200
+++ kdebase-4.1.70.konsole-session/apps/konsole/src/ViewManager.cpp	2008-10-29 16:14:04.000000000 +0100
@@ -885,7 +885,7 @@
         Q_ASSERT(view);
         Session *session = _sessionMap[view];
         ids << SessionManager::instance()->getRestoreId(session);
-        if (view == activeview) group.writeEntry("Active", tab);
+        if (view == activeview) group.writeEntry("ActiveTabIndex", tab);
         unique.insert(session, 1);
         tab++;
     }
@@ -905,24 +905,37 @@
 void ViewManager::restoreSessions(const KConfigGroup& group)
 {
     QList<int> ids = group.readEntry("Sessions", QList<int>());
-    int activeTab  = group.readEntry("Active", 0);
-    TerminalDisplay *display = 0;
 
-    int tab = 1;
-    foreach(int id, ids)
+    if (ids.isEmpty())
     {
-        Session *session = SessionManager::instance()->idToSession(id);
+        // Incomplete session file, e.g. from a KDE3 session. Create a
+        // default session so that we don't end up with an empty window.
+        kWarning() << i18n("Unable to restore saved tabs. Possibly unsupported KDE 3 session data.");
+        Session *session = SessionManager::instance()->createSession();
         createView(session);
-        if (!session->isRunning())
-            session->run();
-        if (tab++ == activeTab)
-            display = dynamic_cast<TerminalDisplay*>(activeView());
+        session->run();
     }
-
-    if (display)
+    else
     {
-        _viewSplitter->activeContainer()->setActiveView(display);
-        display->setFocus(Qt::OtherFocusReason);
+        int activeTab = group.readEntry("ActiveTabIndex", 0);
+        int tab = 1;
+        QWidget *focusView = 0;
+
+        foreach(int id, ids)
+        {
+            Session *session = SessionManager::instance()->idToSession(id);
+            createView(session);
+            if (!session->isRunning())
+                session->run();
+            if (tab++ == activeTab)
+                focusView = activeView();
+        }
+
+        if (focusView)
+        {
+            _viewSplitter->activeContainer()->setActiveView(focusView);
+            focusView->setFocus(Qt::OtherFocusReason);
+        }
     }
 }
 

kdebase-4.1.80-nsplugins-paths.patch:

--- NEW FILE kdebase-4.1.80-nsplugins-paths.patch ---
diff -Naur kdebase-4.1.80/apps/konqueror/settings/konqhtml/pluginopts.cpp kdebase-4.1.80.nsplugins-path/apps/konqueror/settings/konqhtml/pluginopts.cpp
--- kdebase-4.1.80/apps/konqueror/settings/konqhtml/pluginopts.cpp	2008-10-19 18:53:24.000000000 +0200
+++ kdebase-4.1.80.nsplugins-path/apps/konqueror/settings/konqhtml/pluginopts.cpp	2008-11-23 22:43:09.000000000 +0100
@@ -430,6 +430,8 @@
         paths.append("/usr/lib/mozilla/plugins");
 	paths.append("/usr/lib64/netscape/plugins");
 	paths.append("/usr/lib64/mozilla/plugins");
+	paths.append("/usr/lib64/mozilla/plugins-wrapped");
+	paths.append("/usr/lib/mozilla/plugins-wrapped");
         paths.append("$MOZILLA_HOME/plugins");
     }

diff -Naur kdebase-4.1.80/apps/nsplugins/plugin_paths.cpp kdebase-4.1.80.nsplugins-path/apps/nsplugins/plugin_paths.cpp
--- kdebase-4.1.80/apps/nsplugins/plugin_paths.cpp	2008-11-11 22:58:32.000000000 +0100
+++ kdebase-4.1.80.nsplugins-path/apps/nsplugins/plugin_paths.cpp	2008-11-23 22:43:09.000000000 +0100
@@ -54,6 +54,8 @@
         paths.append("/usr/lib/mozilla/plugins");
 	paths.append("/usr/lib64/netscape/plugins");
 	paths.append("/usr/lib64/mozilla/plugins");
+	paths.append("/usr/lib64/mozilla/plugins-wrapped");
+	paths.append("/usr/lib/mozilla/plugins-wrapped");
         paths.append("$MOZILLA_HOME/plugins");
         config.writeEntry( "scanPaths", paths );
     }


Index: kdebase.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebase/F-9/kdebase.spec,v
retrieving revision 1.341
retrieving revision 1.342
diff -u -r1.341 -r1.342
--- kdebase.spec	13 Jan 2009 11:58:32 -0000	1.341
+++ kdebase.spec	28 Jan 2009 12:58:15 -0000	1.342
@@ -1,7 +1,6 @@
-
 Summary: K Desktop Environment 4 - Core Files
-Version: 4.1.4
-Release: 2%{?dist}
+Version: 4.2.0
+Release: 1%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdebase
@@ -26,20 +25,12 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # fedora specific nsplugins paths
-Patch1:   kdebase-nsplugins-paths.patch
-Patch2:   kdebase-4.1.2-konsole-session.patch
-Patch3:   kdebase-4.1.2-konsole-session-1.patch
+Patch0:   kdebase-4.1.80-nsplugins-paths.patch
+# Konsole patches
+Patch1:   kdebase-4.1.70-konsole-session.patch
 
 ## upstream patches
-# http://bugs.kde.org/show_bug.cgi?id=156636 (backported from 4.2)
-# Add keyboard actions for switching to the 1st-10th tab in Konsole
-# PLEASE DON'T DROP THIS BEFORE 4.2!
-Patch100: kdebase-4.1.2-konsole-kde#156636.patch
-
-BuildRequires: kde-filesystem >= 4
-%{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
-Requires(post): xdg-utils
-Requires(postun): xdg-utils
+
 %ifnarch s390 s390x
 Requires: eject
 %endif
@@ -61,17 +52,18 @@
 # FIXME: remove BRs which are only needed for stuff now in -runtime
 BuildRequires: alsa-lib-devel
 BuildRequires: bzip2-devel
-BuildRequires: cmake
+BuildRequires: cmake >= 2.6.2
 BuildRequires: cyrus-sasl-devel
 BuildRequires: doxygen
 BuildRequires: fontconfig-devel
 BuildRequires: gettext
 BuildRequires: giflib-devel
 BuildRequires: hal-devel
+BuildRequires: pcre-devel
 BuildRequires: kdelibs4-devel >= %{version}
 BuildRequires: kdepimlibs-devel >= %{version}
 %if "%{name}" == "kdebase"
-BuildRequires: kdebase-workspace-devel >= %{version}
+BuildRequires: plasma-devel >= %{version}
 %endif
 %ifnarch s390 s390x
 BuildRequires: libraw1394-devel
@@ -108,7 +100,7 @@
 
 %if 0%{?libs}
 %package libs
-Summary: Runtime libraries for %{name} 
+Summary: Runtime libraries for %{name}
 Group:   System Environment/Libraries
 Requires: kdelibs4 >= %{version}, kdepimlibs >= %{version}
 %description libs
@@ -117,7 +109,7 @@
 
 %package devel
 Group:    Development/Libraries
-Summary:  Development files for %{name} 
+Summary:  Development files for %{name}
 Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}
 %if "%{name}" != "kdebase4"
 Obsoletes: kdebase4-devel < %{version}-%{release}
@@ -130,16 +122,14 @@
 
 %prep
 %setup -q -n kdebase-%{version}
-%patch1 -p0 -b .nsplugins-paths
-%patch2 -p1 -b .konsole-session
-%patch3 -p1 -b .konsole-session-1
-%patch100 -p0 -b .kde#156636
+%patch0 -p1 -b .nsplugins-paths
+%patch1 -p1 -b .konsole-session
 
 # fix incorrect assumption that we're building in a combined kdebase tree
 sed -i -e 's/EXISTS "${kdebase_SOURCE_DIR}"/0/g' apps/CMakeLists.txt
 
 %build
-mkdir -p %{_target_platform} 
+mkdir -p %{_target_platform}
 pushd %{_target_platform}
 %{cmake_kde4} ..
 popd
@@ -149,7 +139,7 @@
 
 %install
 rm -rf %{buildroot}
-make install DESTDIR=%{buildroot} -C %{_target_platform}
+make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
 %if "%{name}" != "kdebase"
 # remove files which conflict with KDE 3
@@ -291,7 +281,7 @@
 %{_kde4_docdir}/HTML/en/*
 %{_kde4_libdir}/kde4/*
 %exclude %{_kde4_libdir}/kde4/devel/
-
+%{_mandir}/man1/*
 %if "%{name}" == "kdebase"
 %{_kde4_datadir}/autostart/*
 %{_kde4_configdir}/*
@@ -314,11 +304,31 @@
 
 
 %changelog
-* Tue Jan 13 2009 Than Ngo <than at redhat.com> - 4.1.4-2
-- respin
+* Thu Jan 22 2009 Than Ngo <than at redhat.com> - 4.2.0-1
+- 4.2.0
+
+* Wed Jan 07 2009 Than Ngo <than at redhat.com> - 4.1.96-1
+- 4.2rc1
+
+* Thu Dec 11 2008 Than Ngo <than at redhat.com> -  4.1.85-1
+- 4.2beta2
 
-* Thu Jan  8 2009 Luk???? Tinkl <ltinkl at redhat.com> 4.1.4-1
-- KDE 4.1.4
+* Thu Nov 27 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 6:4.1.80-4
+- BR plasma-devel instead of kdebase-workspace-devel
+
+* Sun Nov 23 2008 Lorenzo Villani <lvillani at binaryhelix.net> - 6:4.1.80-3
+- rebase nsplugins-path patch
+
+* Thu Nov 20 2008 Than Ngo <than at redhat.com>  4.1.80-2
+- merged
+
+* Wed Nov 19 2008 Lorenzo Villani <lvillani at binaryhelix.net> - 6:4.1.80-1
+- 4.1.80
+- patch100 was backported from 4.2 (4.1.6x), removed from patch list
+- ported 4.1.2 konsole patches
+- drop the second konsole patch (upstreamed)
+- using make install/fast
+- BR cmake >= 2.6.2
 
 * Wed Nov 12 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.3-2
 - readd kde#156636 patch (Konsole keyboard actions backport)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdebase/F-9/sources,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -r1.100 -r1.101
--- sources	13 Jan 2009 11:58:32 -0000	1.100
+++ sources	28 Jan 2009 12:58:15 -0000	1.101
@@ -1 +1 @@
-9a76438f5453a3ba4f773db6847825f7  kdebase-4.1.4.tar.bz2
+da86a8ad624e86eda3a7509f39272060  kdebase-4.2.0.tar.bz2


--- kdebase-4.1.2-konsole-kde#156636.patch DELETED ---


--- kdebase-4.1.2-konsole-session-1.patch DELETED ---


--- kdebase-4.1.2-konsole-session.patch DELETED ---


--- kdebase-nsplugins-paths.patch DELETED ---



From hadess at fedoraproject.org  Wed Jan 28 13:01:34 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Wed, 28 Jan 2009 13:01:34 +0000 (UTC)
Subject: rpms/gvfs/F-10 obex-write-v3.patch,NONE,1.1 gvfs.spec,1.95,1.96
Message-ID: <20090128130134.B1CF97010D@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/gvfs/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14019

Modified Files:
	gvfs.spec 
Added Files:
	obex-write-v3.patch 
Log Message:
* Wed Jan 28 2009 - Bastien Nocera <bnocera at redhat.com> - 1.0.3-5
- Add ObexFTP write support


obex-write-v3.patch:

--- NEW FILE obex-write-v3.patch ---
Index: obexftp-marshal.list
===================================================================
--- obexftp-marshal.list	(revision 2178)
+++ obexftp-marshal.list	(working copy)
@@ -1,4 +1,5 @@
 VOID:STRING
+VOID:UINT64
 VOID:STRING,STRING
 VOID:STRING,STRING,STRING
 VOID:STRING,STRING,UINT64
Index: gvfsbackendobexftp.c
===================================================================
--- gvfsbackendobexftp.c	(revision 2178)
+++ gvfsbackendobexftp.c	(working copy)
@@ -17,7 +17,8 @@
  * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
  * Boston, MA 02111-1307, USA.
  *
- * Author: Bastien Nocera <hadess at hadess.net>
+ * Authors: Bastien Nocera <hadess at hadess.net>
+ *          Cosimo Cecchi  <cosimoc at gnome.org>
  */
 
 #include <config.h>
@@ -57,7 +58,8 @@
 
 #define BDADDR_LEN 17
 
-#define ASYNC_SUCCESS 1
+#define ASYNC_SUCCESS 2
+#define ASYNC_RUNNING 1
 #define ASYNC_PENDING 0
 #define ASYNC_ERROR -1
 
@@ -443,6 +445,13 @@
 }
 
 static void
+_invalidate_cache_helper (GVfsBackendObexftp *op_backend)
+{
+  g_free (op_backend->directory);
+  op_backend->directory = NULL;
+}
+
+static void
 error_occurred_cb (DBusGProxy *proxy, const gchar *error_name, const gchar *error_message, gpointer user_data)
 {
   GVfsBackendObexftp *op_backend = G_VFS_BACKEND_OBEXFTP (user_data);
@@ -632,6 +641,10 @@
 
   dbus_g_proxy_add_signal(op_backend->session_proxy, "TransferStarted",
                           G_TYPE_STRING, G_TYPE_STRING, G_TYPE_UINT64, G_TYPE_INVALID);
+  dbus_g_proxy_add_signal(op_backend->session_proxy, "TransferCompleted",
+                          G_TYPE_INVALID);
+  dbus_g_proxy_add_signal(op_backend->session_proxy, "TransferProgress",
+                          G_TYPE_UINT64, G_TYPE_INVALID);
 
   /* Now wait until the device is connected */
   count = 0;
@@ -1186,7 +1199,327 @@
   g_print ("- do_enumerate\n");
 }
 
+typedef struct {
+  GVfsBackendObexftp *op_backend;
+  GFileProgressCallback progress_callback;
+  gpointer progress_callback_data;
+  goffset total_bytes;
+} PushData;
+
 static void
+push_transfer_started_cb (DBusGProxy *proxy,
+                          const gchar *filename,
+                          const gchar *local_path,
+                          guint64 total_bytes,
+                          gpointer user_data)
+{
+  PushData *job_data = (PushData *) user_data;
+  GVfsBackendObexftp *op_backend = job_data->op_backend;
+
+  g_message ("transfer of %s to %s started", filename, local_path);
+
+  g_mutex_lock (op_backend->mutex);
+
+  op_backend->status = ASYNC_RUNNING;
+  job_data->total_bytes = (goffset) total_bytes;
+  job_data->progress_callback (0, job_data->total_bytes,
+                               job_data->progress_callback_data);
+
+  g_cond_signal (op_backend->cond);
+  g_mutex_unlock (op_backend->mutex);
+}
+
+static void
+push_transfer_completed_cb (DBusGProxy *proxy,
+                            gpointer user_data)
+{
+  PushData *job_data = (PushData *) user_data;
+  GVfsBackendObexftp *op_backend = job_data->op_backend;
+
+  g_message ("transfer completed");
+
+  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
+push_transfer_progress_cb (DBusGProxy *proxy,
+                           guint64 bytes_transferred,
+                           gpointer user_data)
+{
+  PushData *job_data = (PushData *) user_data;
+
+  g_message ("transfer progress");
+
+  job_data->progress_callback ((goffset) bytes_transferred,
+                               job_data->total_bytes,
+                               job_data->progress_callback_data);
+}
+
+static void
+push_data_free (PushData *job_data)
+{
+  g_object_unref (job_data->op_backend);
+  g_slice_free (PushData, job_data);
+}
+
+static gboolean
+_push_single_file_helper (GVfsBackendObexftp *op_backend,
+                          GVfsJobPush *job,
+                          const char *local_path,
+                          const char *destination,
+                          GError **error,
+                          PushData *job_data)
+{
+  char *dirname;
+  int success;
+
+  dirname = g_path_get_dirname (destination);
+
+  if (_change_directory (op_backend, dirname, error) == FALSE)
+    {
+      g_free (dirname);
+      return FALSE;
+    }
+
+  g_free (dirname);
+
+  if (g_vfs_job_is_cancelled (G_VFS_JOB (job)))
+    {
+      g_set_error (error, G_IO_ERROR,
+                   G_IO_ERROR_CANCELLED,
+                   _("Operation was cancelled"));
+      return FALSE;
+    }
+
+  op_backend->status = ASYNC_PENDING;
+
+  /* connect to the transfer signals */
+  dbus_g_proxy_connect_signal (op_backend->session_proxy, "TransferStarted",
+                               G_CALLBACK (push_transfer_started_cb), job_data,
+                               NULL);
+  dbus_g_proxy_connect_signal (op_backend->session_proxy, "TransferCompleted",
+                               G_CALLBACK (push_transfer_completed_cb), job_data,
+                               NULL);
+  dbus_g_proxy_connect_signal (op_backend->session_proxy, "TransferProgress",
+                               G_CALLBACK (push_transfer_progress_cb), job_data,
+                               NULL);
+
+  if (dbus_g_proxy_call (op_backend->session_proxy, "SendFile", error,
+                         G_TYPE_STRING, local_path, G_TYPE_INVALID,
+                         G_TYPE_INVALID) == FALSE)
+    {
+      dbus_g_proxy_disconnect_signal (op_backend->session_proxy, "TransferStarted", 
+                                      G_CALLBACK (push_transfer_started_cb), job_data);
+      dbus_g_proxy_disconnect_signal (op_backend->session_proxy, "TransferCompleted", 
+                                      G_CALLBACK (push_transfer_completed_cb), job_data);
+      dbus_g_proxy_disconnect_signal (op_backend->session_proxy, "TransferProgress", 
+                                      G_CALLBACK (push_transfer_progress_cb), job_data);
+      return FALSE;
+    }
+
+  /* wait for the TransferStarted or ErrorOccurred signal */
+  while (op_backend->status == ASYNC_PENDING)
+    g_cond_wait (op_backend->cond, op_backend->mutex);
+
+  dbus_g_proxy_disconnect_signal (op_backend->session_proxy, "TransferStarted",
+                                  G_CALLBACK (push_transfer_started_cb), job_data);
+  success = op_backend->status;
+
+  /* we either got the operation running or an error */
+  if (success == ASYNC_ERROR)
+    {
+      dbus_g_proxy_disconnect_signal (op_backend->session_proxy, "TransferCompleted", 
+                                      G_CALLBACK (push_transfer_completed_cb), job_data);
+      dbus_g_proxy_disconnect_signal (op_backend->session_proxy, "TransferProgress", 
+                                      G_CALLBACK (push_transfer_progress_cb), job_data);
+
+      *error = g_error_copy (op_backend->error);
+      g_error_free (op_backend->error);
+      op_backend->error = NULL;
+      return FALSE;
+    }
+
+  while (op_backend->status == ASYNC_RUNNING)
+    g_cond_wait (op_backend->cond, op_backend->mutex);
+
+  dbus_g_proxy_disconnect_signal (op_backend->session_proxy, "TransferCompleted", 
+                                  G_CALLBACK (push_transfer_completed_cb), job_data);
+  dbus_g_proxy_disconnect_signal (op_backend->session_proxy, "TransferProgress", 
+                                  G_CALLBACK (push_transfer_progress_cb), job_data);
+  success = op_backend->status;
+
+  /* same as before, either we have success or an error */
+  if (success == ASYNC_ERROR)
+    {
+      *error = g_error_copy (op_backend->error);
+      g_error_free (op_backend->error);
+      op_backend->error = NULL;
+      return FALSE;
+    }
+
+  return TRUE;
+}
+
+static void
+do_push (GVfsBackend *backend,
+         GVfsJobPush *job,
+         const char *destination,
+         const char *local_path,
+         GFileCopyFlags flags,
+         gboolean remove_source,
+         GFileProgressCallback progress_callback,
+         gpointer progress_callback_data)
+{
+  GVfsBackendObexftp *op_backend = G_VFS_BACKEND_OBEXFTP (backend);
+  GError *error = NULL;
+  gboolean is_dir, overwrite, res;
+  GFileType target_type;
+  PushData *job_data;
+  GFileInfo *info;
+
+  g_print ("+ do_push, destination: %s, local_path: %s\n", destination, local_path);
+
+  g_mutex_lock (op_backend->mutex);
+  op_backend->doing_io = TRUE;
+
+  overwrite = (flags & G_FILE_COPY_OVERWRITE);
+  is_dir = g_file_test (local_path, G_FILE_TEST_IS_DIR);
+  info = g_file_info_new ();
+  target_type = 0;
+
+  if (g_vfs_job_is_cancelled (G_VFS_JOB (job)))
+    {
+      op_backend->doing_io = FALSE;
+      g_mutex_unlock (op_backend->mutex);
+
+      g_vfs_job_failed (G_VFS_JOB (job), G_IO_ERROR,
+                        G_IO_ERROR_CANCELLED,
+                        _("Operation was cancelled"));
+      return;
+    }
+
+  res = _query_file_info_helper (backend, destination, info, &error);
+
+  if (error != NULL)
+    {
+      if (!g_error_matches (error, G_IO_ERROR, G_IO_ERROR_NOT_FOUND))
+        {
+          op_backend->doing_io = FALSE;
+          g_mutex_unlock (op_backend->mutex);
+
+          g_vfs_job_failed_from_error (G_VFS_JOB (job), error);
+          g_error_free (error);
+
+          return;
+        }
+      else
+        {
+          g_clear_error (&error);
+          res = TRUE;
+        }
+    }
+
+  if (res)
+    target_type = g_file_info_get_file_type (info);
+
+  g_object_unref (info);
+
+  /* error handling */
+  if (is_dir)
+    {
+      op_backend->doing_io = FALSE;
+      g_mutex_unlock (op_backend->mutex);
+
+      if (target_type != 0)
+        {
+          if (overwrite)
+            {
+              if (target_type == G_FILE_TYPE_DIRECTORY)
+                {
+                  g_vfs_job_failed (G_VFS_JOB (job), G_IO_ERROR,
+                                    G_IO_ERROR_WOULD_MERGE,
+                                   _("Can't copy directory over directory"));
+                  return;
+                }
+            }
+          else
+            {
+              g_vfs_job_failed (G_VFS_JOB (job), G_IO_ERROR,
+                                G_IO_ERROR_EXISTS,
+                                _("Target file exists"));
+              return;
+            }
+        }
+
+      g_vfs_job_failed (G_VFS_JOB (job), G_IO_ERROR,
+                        G_IO_ERROR_WOULD_RECURSE,
+                        _("Can't recursively copy directory"));
+      return;
+    }
+  else
+    {
+      if (target_type != 0)
+        {
+          op_backend->doing_io = FALSE;
+          g_mutex_unlock (op_backend->mutex);
+
+          if (overwrite)
+            {
+              if (target_type == G_FILE_TYPE_DIRECTORY)
+                {
+                  g_vfs_job_failed (G_VFS_JOB (job), G_IO_ERROR,
+                                    G_IO_ERROR_IS_DIRECTORY,
+                                    _("Can't copy file over directory"));
+                  return;
+                }
+            }
+          else
+            {
+              g_vfs_job_failed (G_VFS_JOB (job), G_IO_ERROR,
+                                G_IO_ERROR_EXISTS,
+                                _("Target file exists"));
+              return;
+            }
+        }
+    }
+
+  job_data = g_slice_new0 (PushData);
+  job_data->op_backend = g_object_ref (op_backend);
+  job_data->progress_callback = progress_callback;
+  job_data->progress_callback_data = progress_callback_data;
+
+  /* start the actual transfer operation */
+  if (_push_single_file_helper (op_backend, job, local_path, destination,
+                                &error, job_data) == FALSE)
+    {
+      op_backend->doing_io = FALSE;
+      g_mutex_unlock (op_backend->mutex);
+      push_data_free (job_data);
+
+      g_vfs_job_failed_from_error (G_VFS_JOB (job), error);
+    }
+
+  push_data_free (job_data);
+
+  /* we called _query_file_info_helper (), so we need to invalidate the
+   * cache, as a query_info () will be called on us after we return.
+   */
+  _invalidate_cache_helper (op_backend);
+
+  g_vfs_job_succeeded (G_VFS_JOB (job));
+
+  op_backend->doing_io = FALSE;
+  g_mutex_unlock (op_backend->mutex);
+
+  g_print ("- do_push\n");
+}
+
+static void
 do_delete (GVfsBackend *backend,
            GVfsJobDelete *job,
            const char *filename)
@@ -1379,6 +1712,9 @@
       return;
     }
 
+  if (error)
+    g_clear_error (&error);
+
   if (g_vfs_job_is_cancelled (G_VFS_JOB (job)))
     {
       g_mutex_unlock (op_backend->mutex);
@@ -1413,17 +1749,23 @@
                          G_TYPE_INVALID) == FALSE)
     {
       g_mutex_unlock (op_backend->mutex);
+      g_free (basename);
       g_vfs_job_failed_from_error (G_VFS_JOB (job), error);
       g_error_free (error);
       return;
     }
   g_free (basename);
 
+  /* reset the current directory so that we won't cache when querying
+   * info after this has succeeded.
+   */
+  _invalidate_cache_helper (op_backend);
+
   g_vfs_job_succeeded (G_VFS_JOB (job));
 
   g_mutex_unlock (op_backend->mutex);
 
-  g_print ("+ do_make_directory\n");
+  g_print ("- do_make_directory\n");
 }
 
 static void
@@ -1443,6 +1785,7 @@
   backend_class->enumerate = do_enumerate;
   backend_class->delete = do_delete;
   backend_class->make_directory = do_make_directory;
+  backend_class->push = do_push;
 
   /* ErrorOccurred */
   dbus_g_object_register_marshaller (obexftp_marshal_VOID__STRING_STRING,
@@ -1451,6 +1794,9 @@
   /* 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);
+  /* TransferProgress */
+  dbus_g_object_register_marshaller(obexftp_marshal_VOID__UINT64,
+                                    G_TYPE_NONE, 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);


Index: gvfs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gvfs/F-10/gvfs.spec,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -r1.95 -r1.96
--- gvfs.spec	16 Dec 2008 16:38:27 -0000	1.95
+++ gvfs.spec	28 Jan 2009 13:01:04 -0000	1.96
@@ -1,7 +1,7 @@
 Summary: Backends for the gio framework in GLib
 Name: gvfs
 Version: 1.0.3
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 URL: http://www.gtk.org
@@ -49,6 +49,9 @@
 # https://bugzilla.redhat.com/show_bug.cgi?id=461337
 Patch9: gvfs-1.1.2-http-leak.patch
 
+# http://bugzilla.gnome.org/show_bug.cgi?id=519071
+Patch10: obex-write-v3.patch
+
 %description
 The gvfs package provides backend implementations for the gio 
 framework in GLib. It includes ftp, sftp, cifs. 
@@ -136,7 +139,9 @@
 %patch7 -p0 -b .smb-timestamps
 %patch8 -p0 -b .smb-auth
 %patch9 -p0 -b .http-leaks
-
+pushd daemon/
+%patch10 -p0 -b .obexftp-write
+popd
 
 %build
 
@@ -274,6 +279,9 @@
 
 
 %changelog
+* Wed Jan 28 2009 - Bastien Nocera <bnocera at redhat.com> - 1.0.3-5
+- Add ObexFTP write support
+
 * Tue Dec 16 2008 Tomas Bzatek <tbzatek at redhat.com> - 1.0.3-4
 - Fix several leaks in the http backend (#461337)
 - Update the smb-browse auth patch



From hadess at fedoraproject.org  Wed Jan 28 13:03:07 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Wed, 28 Jan 2009 13:03:07 +0000 (UTC)
Subject: rpms/gvfs/devel obex-write-v3.patch,NONE,1.1 gvfs.spec,1.104,1.105
Message-ID: <20090128130307.D525F7010D@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/gvfs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14417

Modified Files:
	gvfs.spec 
Added Files:
	obex-write-v3.patch 
Log Message:
* Wed Jan 28 2009 - Bastien Nocera <bnocera at redhat.com> - 1.1.4-2
- ObexFTP write support


obex-write-v3.patch:

--- NEW FILE obex-write-v3.patch ---
Index: obexftp-marshal.list
===================================================================
--- obexftp-marshal.list	(revision 2178)
+++ obexftp-marshal.list	(working copy)
@@ -1,4 +1,5 @@
 VOID:STRING
+VOID:UINT64
 VOID:STRING,STRING
 VOID:STRING,STRING,STRING
 VOID:STRING,STRING,UINT64
Index: gvfsbackendobexftp.c
===================================================================
--- gvfsbackendobexftp.c	(revision 2178)
+++ gvfsbackendobexftp.c	(working copy)
@@ -17,7 +17,8 @@
  * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
  * Boston, MA 02111-1307, USA.
  *
- * Author: Bastien Nocera <hadess at hadess.net>
+ * Authors: Bastien Nocera <hadess at hadess.net>
+ *          Cosimo Cecchi  <cosimoc at gnome.org>
  */
 
 #include <config.h>
@@ -57,7 +58,8 @@
 
 #define BDADDR_LEN 17
 
-#define ASYNC_SUCCESS 1
+#define ASYNC_SUCCESS 2
+#define ASYNC_RUNNING 1
 #define ASYNC_PENDING 0
 #define ASYNC_ERROR -1
 
@@ -443,6 +445,13 @@
 }
 
 static void
+_invalidate_cache_helper (GVfsBackendObexftp *op_backend)
+{
+  g_free (op_backend->directory);
+  op_backend->directory = NULL;
+}
+
+static void
 error_occurred_cb (DBusGProxy *proxy, const gchar *error_name, const gchar *error_message, gpointer user_data)
 {
   GVfsBackendObexftp *op_backend = G_VFS_BACKEND_OBEXFTP (user_data);
@@ -632,6 +641,10 @@
 
   dbus_g_proxy_add_signal(op_backend->session_proxy, "TransferStarted",
                           G_TYPE_STRING, G_TYPE_STRING, G_TYPE_UINT64, G_TYPE_INVALID);
+  dbus_g_proxy_add_signal(op_backend->session_proxy, "TransferCompleted",
+                          G_TYPE_INVALID);
+  dbus_g_proxy_add_signal(op_backend->session_proxy, "TransferProgress",
+                          G_TYPE_UINT64, G_TYPE_INVALID);
 
   /* Now wait until the device is connected */
   count = 0;
@@ -1186,7 +1199,327 @@
   g_print ("- do_enumerate\n");
 }
 
+typedef struct {
+  GVfsBackendObexftp *op_backend;
+  GFileProgressCallback progress_callback;
+  gpointer progress_callback_data;
+  goffset total_bytes;
+} PushData;
+
 static void
+push_transfer_started_cb (DBusGProxy *proxy,
+                          const gchar *filename,
+                          const gchar *local_path,
+                          guint64 total_bytes,
+                          gpointer user_data)
+{
+  PushData *job_data = (PushData *) user_data;
+  GVfsBackendObexftp *op_backend = job_data->op_backend;
+
+  g_message ("transfer of %s to %s started", filename, local_path);
+
+  g_mutex_lock (op_backend->mutex);
+
+  op_backend->status = ASYNC_RUNNING;
+  job_data->total_bytes = (goffset) total_bytes;
+  job_data->progress_callback (0, job_data->total_bytes,
+                               job_data->progress_callback_data);
+
+  g_cond_signal (op_backend->cond);
+  g_mutex_unlock (op_backend->mutex);
+}
+
+static void
+push_transfer_completed_cb (DBusGProxy *proxy,
+                            gpointer user_data)
+{
+  PushData *job_data = (PushData *) user_data;
+  GVfsBackendObexftp *op_backend = job_data->op_backend;
+
+  g_message ("transfer completed");
+
+  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
+push_transfer_progress_cb (DBusGProxy *proxy,
+                           guint64 bytes_transferred,
+                           gpointer user_data)
+{
+  PushData *job_data = (PushData *) user_data;
+
+  g_message ("transfer progress");
+
+  job_data->progress_callback ((goffset) bytes_transferred,
+                               job_data->total_bytes,
+                               job_data->progress_callback_data);
+}
+
+static void
+push_data_free (PushData *job_data)
+{
+  g_object_unref (job_data->op_backend);
+  g_slice_free (PushData, job_data);
+}
+
+static gboolean
+_push_single_file_helper (GVfsBackendObexftp *op_backend,
+                          GVfsJobPush *job,
+                          const char *local_path,
+                          const char *destination,
+                          GError **error,
+                          PushData *job_data)
+{
+  char *dirname;
+  int success;
+
+  dirname = g_path_get_dirname (destination);
+
+  if (_change_directory (op_backend, dirname, error) == FALSE)
+    {
+      g_free (dirname);
+      return FALSE;
+    }
+
+  g_free (dirname);
+
+  if (g_vfs_job_is_cancelled (G_VFS_JOB (job)))
+    {
+      g_set_error (error, G_IO_ERROR,
+                   G_IO_ERROR_CANCELLED,
+                   _("Operation was cancelled"));
+      return FALSE;
+    }
+
+  op_backend->status = ASYNC_PENDING;
+
+  /* connect to the transfer signals */
+  dbus_g_proxy_connect_signal (op_backend->session_proxy, "TransferStarted",
+                               G_CALLBACK (push_transfer_started_cb), job_data,
+                               NULL);
+  dbus_g_proxy_connect_signal (op_backend->session_proxy, "TransferCompleted",
+                               G_CALLBACK (push_transfer_completed_cb), job_data,
+                               NULL);
+  dbus_g_proxy_connect_signal (op_backend->session_proxy, "TransferProgress",
+                               G_CALLBACK (push_transfer_progress_cb), job_data,
+                               NULL);
+
+  if (dbus_g_proxy_call (op_backend->session_proxy, "SendFile", error,
+                         G_TYPE_STRING, local_path, G_TYPE_INVALID,
+                         G_TYPE_INVALID) == FALSE)
+    {
+      dbus_g_proxy_disconnect_signal (op_backend->session_proxy, "TransferStarted", 
+                                      G_CALLBACK (push_transfer_started_cb), job_data);
+      dbus_g_proxy_disconnect_signal (op_backend->session_proxy, "TransferCompleted", 
+                                      G_CALLBACK (push_transfer_completed_cb), job_data);
+      dbus_g_proxy_disconnect_signal (op_backend->session_proxy, "TransferProgress", 
+                                      G_CALLBACK (push_transfer_progress_cb), job_data);
+      return FALSE;
+    }
+
+  /* wait for the TransferStarted or ErrorOccurred signal */
+  while (op_backend->status == ASYNC_PENDING)
+    g_cond_wait (op_backend->cond, op_backend->mutex);
+
+  dbus_g_proxy_disconnect_signal (op_backend->session_proxy, "TransferStarted",
+                                  G_CALLBACK (push_transfer_started_cb), job_data);
+  success = op_backend->status;
+
+  /* we either got the operation running or an error */
+  if (success == ASYNC_ERROR)
+    {
+      dbus_g_proxy_disconnect_signal (op_backend->session_proxy, "TransferCompleted", 
+                                      G_CALLBACK (push_transfer_completed_cb), job_data);
+      dbus_g_proxy_disconnect_signal (op_backend->session_proxy, "TransferProgress", 
+                                      G_CALLBACK (push_transfer_progress_cb), job_data);
+
+      *error = g_error_copy (op_backend->error);
+      g_error_free (op_backend->error);
+      op_backend->error = NULL;
+      return FALSE;
+    }
+
+  while (op_backend->status == ASYNC_RUNNING)
+    g_cond_wait (op_backend->cond, op_backend->mutex);
+
+  dbus_g_proxy_disconnect_signal (op_backend->session_proxy, "TransferCompleted", 
+                                  G_CALLBACK (push_transfer_completed_cb), job_data);
+  dbus_g_proxy_disconnect_signal (op_backend->session_proxy, "TransferProgress", 
+                                  G_CALLBACK (push_transfer_progress_cb), job_data);
+  success = op_backend->status;
+
+  /* same as before, either we have success or an error */
+  if (success == ASYNC_ERROR)
+    {
+      *error = g_error_copy (op_backend->error);
+      g_error_free (op_backend->error);
+      op_backend->error = NULL;
+      return FALSE;
+    }
+
+  return TRUE;
+}
+
+static void
+do_push (GVfsBackend *backend,
+         GVfsJobPush *job,
+         const char *destination,
+         const char *local_path,
+         GFileCopyFlags flags,
+         gboolean remove_source,
+         GFileProgressCallback progress_callback,
+         gpointer progress_callback_data)
+{
+  GVfsBackendObexftp *op_backend = G_VFS_BACKEND_OBEXFTP (backend);
+  GError *error = NULL;
+  gboolean is_dir, overwrite, res;
+  GFileType target_type;
+  PushData *job_data;
+  GFileInfo *info;
+
+  g_print ("+ do_push, destination: %s, local_path: %s\n", destination, local_path);
+
+  g_mutex_lock (op_backend->mutex);
+  op_backend->doing_io = TRUE;
+
+  overwrite = (flags & G_FILE_COPY_OVERWRITE);
+  is_dir = g_file_test (local_path, G_FILE_TEST_IS_DIR);
+  info = g_file_info_new ();
+  target_type = 0;
+
+  if (g_vfs_job_is_cancelled (G_VFS_JOB (job)))
+    {
+      op_backend->doing_io = FALSE;
+      g_mutex_unlock (op_backend->mutex);
+
+      g_vfs_job_failed (G_VFS_JOB (job), G_IO_ERROR,
+                        G_IO_ERROR_CANCELLED,
+                        _("Operation was cancelled"));
+      return;
+    }
+
+  res = _query_file_info_helper (backend, destination, info, &error);
+
+  if (error != NULL)
+    {
+      if (!g_error_matches (error, G_IO_ERROR, G_IO_ERROR_NOT_FOUND))
+        {
+          op_backend->doing_io = FALSE;
+          g_mutex_unlock (op_backend->mutex);
+
+          g_vfs_job_failed_from_error (G_VFS_JOB (job), error);
+          g_error_free (error);
+
+          return;
+        }
+      else
+        {
+          g_clear_error (&error);
+          res = TRUE;
+        }
+    }
+
+  if (res)
+    target_type = g_file_info_get_file_type (info);
+
+  g_object_unref (info);
+
+  /* error handling */
+  if (is_dir)
+    {
+      op_backend->doing_io = FALSE;
+      g_mutex_unlock (op_backend->mutex);
+
+      if (target_type != 0)
+        {
+          if (overwrite)
+            {
+              if (target_type == G_FILE_TYPE_DIRECTORY)
+                {
+                  g_vfs_job_failed (G_VFS_JOB (job), G_IO_ERROR,
+                                    G_IO_ERROR_WOULD_MERGE,
+                                   _("Can't copy directory over directory"));
+                  return;
+                }
+            }
+          else
+            {
+              g_vfs_job_failed (G_VFS_JOB (job), G_IO_ERROR,
+                                G_IO_ERROR_EXISTS,
+                                _("Target file exists"));
+              return;
+            }
+        }
+
+      g_vfs_job_failed (G_VFS_JOB (job), G_IO_ERROR,
+                        G_IO_ERROR_WOULD_RECURSE,
+                        _("Can't recursively copy directory"));
+      return;
+    }
+  else
+    {
+      if (target_type != 0)
+        {
+          op_backend->doing_io = FALSE;
+          g_mutex_unlock (op_backend->mutex);
+
+          if (overwrite)
+            {
+              if (target_type == G_FILE_TYPE_DIRECTORY)
+                {
+                  g_vfs_job_failed (G_VFS_JOB (job), G_IO_ERROR,
+                                    G_IO_ERROR_IS_DIRECTORY,
+                                    _("Can't copy file over directory"));
+                  return;
+                }
+            }
+          else
+            {
+              g_vfs_job_failed (G_VFS_JOB (job), G_IO_ERROR,
+                                G_IO_ERROR_EXISTS,
+                                _("Target file exists"));
+              return;
+            }
+        }
+    }
+
+  job_data = g_slice_new0 (PushData);
+  job_data->op_backend = g_object_ref (op_backend);
+  job_data->progress_callback = progress_callback;
+  job_data->progress_callback_data = progress_callback_data;
+
+  /* start the actual transfer operation */
+  if (_push_single_file_helper (op_backend, job, local_path, destination,
+                                &error, job_data) == FALSE)
+    {
+      op_backend->doing_io = FALSE;
+      g_mutex_unlock (op_backend->mutex);
+      push_data_free (job_data);
+
+      g_vfs_job_failed_from_error (G_VFS_JOB (job), error);
+    }
+
+  push_data_free (job_data);
+
+  /* we called _query_file_info_helper (), so we need to invalidate the
+   * cache, as a query_info () will be called on us after we return.
+   */
+  _invalidate_cache_helper (op_backend);
+
+  g_vfs_job_succeeded (G_VFS_JOB (job));
+
+  op_backend->doing_io = FALSE;
+  g_mutex_unlock (op_backend->mutex);
+
+  g_print ("- do_push\n");
+}
+
+static void
 do_delete (GVfsBackend *backend,
            GVfsJobDelete *job,
            const char *filename)
@@ -1379,6 +1712,9 @@
       return;
     }
 
+  if (error)
+    g_clear_error (&error);
+
   if (g_vfs_job_is_cancelled (G_VFS_JOB (job)))
     {
       g_mutex_unlock (op_backend->mutex);
@@ -1413,17 +1749,23 @@
                          G_TYPE_INVALID) == FALSE)
     {
       g_mutex_unlock (op_backend->mutex);
+      g_free (basename);
       g_vfs_job_failed_from_error (G_VFS_JOB (job), error);
       g_error_free (error);
       return;
     }
   g_free (basename);
 
+  /* reset the current directory so that we won't cache when querying
+   * info after this has succeeded.
+   */
+  _invalidate_cache_helper (op_backend);
+
   g_vfs_job_succeeded (G_VFS_JOB (job));
 
   g_mutex_unlock (op_backend->mutex);
 
-  g_print ("+ do_make_directory\n");
+  g_print ("- do_make_directory\n");
 }
 
 static void
@@ -1443,6 +1785,7 @@
   backend_class->enumerate = do_enumerate;
   backend_class->delete = do_delete;
   backend_class->make_directory = do_make_directory;
+  backend_class->push = do_push;
 
   /* ErrorOccurred */
   dbus_g_object_register_marshaller (obexftp_marshal_VOID__STRING_STRING,
@@ -1451,6 +1794,9 @@
   /* 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);
+  /* TransferProgress */
+  dbus_g_object_register_marshaller(obexftp_marshal_VOID__UINT64,
+                                    G_TYPE_NONE, 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);


Index: gvfs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gvfs/devel/gvfs.spec,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -r1.104 -r1.105
--- gvfs.spec	20 Jan 2009 09:16:21 -0000	1.104
+++ gvfs.spec	28 Jan 2009 13:02:37 -0000	1.105
@@ -1,7 +1,7 @@
 Summary: Backends for the gio framework in GLib
 Name: gvfs
 Version: 1.1.4
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 URL: http://www.gtk.org
@@ -34,6 +34,9 @@
 # http://bugzilla.gnome.org/show_bug.cgi?id=565041
 Patch2: gvfs-burn-move.patch
 
+# http://bugzilla.gnome.org/show_bug.cgi?id=519071
+Patch3: obex-write-v3.patch
+
 %description
 The gvfs package provides backend implementations for the gio 
 framework in GLib. It includes ftp, sftp, cifs. 
@@ -116,6 +119,9 @@
 %setup -q
 %patch1 -p0 -b .archive-integration
 %patch2 -p0 -b .burn-move
+pushd daemon/
+%patch3 -p0 -b .obexftp-write
+popd
 
 %build
 
@@ -256,6 +262,9 @@
 
 
 %changelog
+* Wed Jan 28 2009 - Bastien Nocera <bnocera at redhat.com> - 1.1.4-2
+- ObexFTP write support
+
 * Tue Jan 20 2009 Tomas Bzatek <tbzatek at redhat.com> - 1.1.4-1
 - Update to 1.1.4
 



From mmaslano at fedoraproject.org  Wed Jan 28 13:16:13 2009
From: mmaslano at fedoraproject.org (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?=)
Date: Wed, 28 Jan 2009 13:16:13 +0000 (UTC)
Subject: rpms/crontabs/F-10 .cvsignore, 1.4, 1.5 crontabs.spec, 1.30,
	1.31 sources, 1.5, 1.6
Message-ID: <20090128131613.32EB97010D@cvs1.fedora.phx.redhat.com>

Author: mmaslano

Update of /cvs/pkgs/rpms/crontabs/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16732

Modified Files:
	.cvsignore crontabs.spec sources 
Log Message:
* Thu Jan 28 2009 Marcela Maslanova <mmaslano at redhat.com> 1.10-26
- 477709 hack around jobs running twice
- switch off random delay for anacron jobs as default in sysconfig



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/crontabs/F-10/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	28 May 2008 14:00:16 -0000	1.4
+++ .cvsignore	28 Jan 2009 13:15:42 -0000	1.5
@@ -1 +1,4 @@
 config
+crontab
+run-parts
+000-delay.cron


Index: crontabs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/crontabs/F-10/crontabs.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- crontabs.spec	1 Dec 2008 07:37:15 -0000	1.30
+++ crontabs.spec	28 Jan 2009 13:15:42 -0000	1.31
@@ -1,12 +1,13 @@
 Summary: Root crontab files used to schedule the execution of programs
 Name: crontabs
 Version: 1.10
-Release: 25%{?dist}
+Release: 26%{?dist}
 License: Public Domain and GPLv2
 Group: System Environment/Base
 Source0: crontab
 Source1: run-parts
-Source2: config
+Source2: 000-delay.cron
+Source3: config
 BuildArch: noarch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -25,9 +26,12 @@
 mkdir -p $RPM_BUILD_ROOT/etc/cron.{hourly,daily,weekly,monthly}
 mkdir -p $RPM_BUILD_ROOT/usr/bin
 mkdir -p $RPM_BUILD_ROOT/etc/sysconfig
-cp -p %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/crontab
+cp -p %{SOURCE3} $RPM_BUILD_ROOT/etc/sysconfig/crontab
 install -m644 $RPM_SOURCE_DIR/crontab $RPM_BUILD_ROOT/etc/crontab
 install -m755 $RPM_SOURCE_DIR/run-parts $RPM_BUILD_ROOT/usr/bin/run-parts
+install -m755 $RPM_SOURCE_DIR/000-delay.cron $RPM_BUILD_ROOT/etc/cron.daily/000-delay.cron
+ln -s ../cron.daily/000-delay.cron $RPM_BUILD_ROOT/etc/cron.weekly/000-delay.cron
+ln -s ../cron.daily/000-delay.cron $RPM_BUILD_ROOT/etc/cron.monthly/000-delay.cron
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -41,8 +45,16 @@
 %dir /etc/cron.daily
 %dir /etc/cron.weekly
 %dir /etc/cron.monthly
+%dir /etc/cron.daily/000-delay.cron
+%dir /etc/cron.weekly/000-delay.cron
+%dir /etc/cron.monthly/000-delay.cron
+%config(noreplace) /etc/sysconfig/crontab
 
 %changelog
+* Thu Jan 28 2009 Marcela Maslanova <mmaslano at redhat.com> 1.10-26
+- 477709 hack around jobs running twice
+- switch off random delay for anacron jobs as default in sysconfig
+
 * Mon Dec  1 2008 Jan ONDREJ (SAL) <ondrejj(at)salstar.sk> 1.10-25
 - Added /etc/cron.{hourly,daily,weekly,monthly} dirs again. bz#473353
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/crontabs/F-10/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	28 May 2008 14:00:16 -0000	1.5
+++ sources	28 Jan 2009 13:15:42 -0000	1.6
@@ -1 +1,4 @@
 ba1e7d606a110d281c16d9d49c6f335d  config
+03fa15e550843194a8ba55b473a6549a  crontab
+9b3ddd391150661ba50667a2a32cbda6  run-parts
+159145e4bdd9f0fc6efaf040cba3480c  000-delay.cron



From mmaslano at fedoraproject.org  Wed Jan 28 13:22:26 2009
From: mmaslano at fedoraproject.org (=?utf-8?b?TWFyY2VsYSBNYcWhbMOhxYhvdsOh?=)
Date: Wed, 28 Jan 2009 13:22:26 +0000 (UTC)
Subject: rpms/anacron/F-10 .cvsignore, 1.3, 1.4 anacron.spec, 1.54,
	1.55 sources, 1.3, 1.4 anacron-2.3-hourly.patch, 1.2, NONE
Message-ID: <20090128132226.447817010D@cvs1.fedora.phx.redhat.com>

Author: mmaslano

Update of /cvs/pkgs/rpms/anacron/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18063

Modified Files:
	.cvsignore anacron.spec sources 
Removed Files:
	anacron-2.3-hourly.patch 
Log Message:
* Thu Jan 28 2009 Marcela Ma??l????ov?? <mmaslano at redhat.com> 2.3-66
- 477709 hack aroung problems with running jobs twice



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/anacron/F-10/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	6 Feb 2007 14:35:24 -0000	1.3
+++ .cvsignore	28 Jan 2009 13:21:55 -0000	1.4
@@ -1,2 +1,5 @@
 anacron_2.3.orig.tar.gz
 anacron.init
+anacrontab
+runanacron
+anacron.cron


Index: anacron.spec
===================================================================
RCS file: /cvs/pkgs/rpms/anacron/F-10/anacron.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- anacron.spec	24 Oct 2008 13:02:50 -0000	1.54
+++ anacron.spec	28 Jan 2009 13:21:55 -0000	1.55
@@ -1,20 +1,21 @@
 Summary: A cron-like program that can run jobs lost during downtime
 Name: anacron
 Version: 2.3
-Release: 65%{?dist}
+Release: 66%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 URL: http://packages.debian.org/stable/source/anacron
 Source: http://ftp.debian.org/debian/pool/main/a/anacron/%{name}_%{version}.orig.tar.gz
 Source1: anacrontab
 Source2: anacron.init
+Source3: runanacron
+Source4: anacron.cron
 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
@@ -47,7 +48,6 @@
 %patch4 -p1 -b .pic
 %patch5 -p1 -b .memleaking
 %patch6 -p1 -b .spool
-%patch7 -p1
 
 %build
 make CFLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags}
@@ -62,16 +62,22 @@
 cp anacrontab.5 $RPM_BUILD_ROOT/%{_mandir}/man5/
 cp %SOURCE1 $RPM_BUILD_ROOT/etc
 
-for i in cron.daily cron.weekly cron.monthly cron.hourly;do
+for i in cron.daily cron.weekly cron.monthly;do
 mkdir -p $RPM_BUILD_ROOT/etc/$i/
 done
 
-install -m755 fedora/anacron.daily $RPM_BUILD_ROOT/etc/cron.daily/0anacron
-ln -s ../cron.daily/0anacron $RPM_BUILD_ROOT/etc/cron.weekly/0anacron
-ln -s ../cron.daily/0anacron $RPM_BUILD_ROOT/etc/cron.monthly/0anacron
+cp debian/0anacron.daily $RPM_BUILD_ROOT/etc/cron.daily/0anacron
+cp debian/0anacron.monthly $RPM_BUILD_ROOT/etc/cron.monthly/0anacron
+cp debian/0anacron.weekly $RPM_BUILD_ROOT/etc/cron.weekly/0anacron
+#install -m755 fedora/anacron.daily $RPM_BUILD_ROOT/etc/cron.daily/0anacron
+#ln -s ../cron.daily/0anacron $RPM_BUILD_ROOT/etc/cron.weekly/0anacron
+#ln -s ../cron.daily/0anacron $RPM_BUILD_ROOT/etc/cron.monthly/0anacron
 
 mkdir -p $RPM_BUILD_ROOT/etc/rc.d/init.d/
 install -c -m755 %SOURCE2 $RPM_BUILD_ROOT/etc/rc.d/init.d/anacron
+install -c -m755 %SOURCE3 $RPM_BUILD_ROOT/usr/sbin/runanacron
+mkdir -p $RPM_BUILD_ROOT/etc/cron.d
+install -m644 %SOURCE4 $RPM_BUILD_ROOT/etc/cron.d/anacron
 
 %clean 
 rm -rf $RPM_BUILD_ROOT
@@ -102,15 +108,16 @@
 /%{_mandir}/man5/*
 /%{_mandir}/man8/*
 /usr/sbin/anacron
-%dir /etc/cron.hourly
-%dir /etc/cron.daily
-%dir /etc/cron.weekly
-%dir /etc/cron.monthly
-%dir /etc/cron.daily/0anacron
-%dir /etc/cron.weekly/0anacron
-%dir /etc/cron.monthly/0anacron
+/usr/sbin/runanacron
+/etc/cron.d/anacron
+%attr(755,root,root) %dir /etc/cron.daily/0anacron
+%attr(755,root,root) %dir /etc/cron.monthly/0anacron
+%attr(755,root,root) %dir /etc/cron.weekly/0anacron
 
 %changelog
+* Thu Jan 28 2009 Marcela Ma??l????ov?? <mmaslano at redhat.com> 2.3-66
+- 477709 hack aroung problems with running jobs twice
+
 * Fri Oct 24 2008 Marcela Ma??l????ov?? <mmaslano at redhat.com> 2.3-65
 - rewrite init script - using fedora guidelines SysVInitScript
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/anacron/F-10/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	6 Feb 2007 14:35:24 -0000	1.3
+++ sources	28 Jan 2009 13:21:55 -0000	1.4
@@ -1,2 +1,5 @@
 9fdfc50f5741643332722a9145146278  anacron_2.3.orig.tar.gz
 094af5e05723d2c4924d60f73d738509  anacron.init
+e4368e8f686c710f63027af0f213cfe5  anacrontab
+1e65b1fcb49c7929645a1bd0baffd7ef  runanacron
+312b5eed93765e26e9d21f23bccc72c9  anacron.cron


--- anacron-2.3-hourly.patch DELETED ---



From prarit at fedoraproject.org  Wed Jan 28 13:25:55 2009
From: prarit at fedoraproject.org (Prarit Bhargava)
Date: Wed, 28 Jan 2009 13:25:55 +0000 (UTC)
Subject: rpms/dmidecode/devel dmidecode.spec,1.31,1.32
Message-ID: <20090128132555.A09E57010D@cvs1.fedora.phx.redhat.com>

Author: prarit

Update of /cvs/pkgs/rpms/dmidecode/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18614

Modified Files:
	dmidecode.spec 
Log Message:
BZ 225698: Removed "." from Summary in spec file



Index: dmidecode.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dmidecode/devel/dmidecode.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- dmidecode.spec	16 Jul 2008 21:16:30 -0000	1.31
+++ dmidecode.spec	28 Jan 2009 13:25:25 -0000	1.32
@@ -1,4 +1,4 @@
-Summary:        Tool to analyse BIOS DMI data.
+Summary:        Tool to analyse BIOS DMI data
 Name:           dmidecode
 Version:        2.9
 Release: %(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})%{?dist}
@@ -48,6 +48,8 @@
 %{_mandir}/man8/*
 
 %changelog
+* Wed Jan 28 2009 Prarit Bhargava <prarit at redhat.com> 1:2.9-1.32
+- fix Summary field (BZ 225698)
 * Wed Jul 16 2008 Tom "spot" Callaway <tcallawa at redhat.com> 1:2.9-1.30
 - fix license tag
 



From limb at fedoraproject.org  Wed Jan 28 13:33:23 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Wed, 28 Jan 2009 13:33:23 +0000 (UTC)
Subject: rpms/moodle/devel moodle.spec,1.35,1.36
Message-ID: <20090128133323.4B5797010D@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/moodle/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20555

Modified Files:
	moodle.spec 
Log Message:
khmeros fix.



Index: moodle.spec
===================================================================
RCS file: /cvs/pkgs/rpms/moodle/devel/moodle.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- moodle.spec	21 Jan 2009 13:06:52 -0000	1.35
+++ moodle.spec	28 Jan 2009 13:32:52 -0000	1.36
@@ -7,7 +7,7 @@
 
 Name:           moodle
 Version:        1.9.3
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        A Course Management System
 
 Group:          Applications/Publishing
@@ -732,6 +732,7 @@
 Summary:        Moodle language pack for Khmer
 Group:          Applications/Publishing
 Requires:       moodle = %{version}-%{release}
+Requires:	khmeros-base-fonts
 
 %description    km
 This package contains the files needed to display Moodle in Khmer.
@@ -1514,6 +1515,10 @@
 rm -f $RPM_BUILD_ROOT%{moodlewebdir}/lib/default.ttf
 ln -s /usr/share/fonts/freefont/FreeSans.ttf $RPM_BUILD_ROOT%{moodlewebdir}/lib/default.ttf
 
+#symlink to khmeros-base-fonts
+rm -f $RPM_BUILD_ROOT%{moodlewebdir}/lang/km_utf8/fonts/default.ttf
+ln -s /usr/share/fonts/khmeros/KhmerOS_sys.ttf $RPM_BUILD_ROOT%{moodlewebdir}/lang/km_utf8/fonts/default.ttf
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -1666,6 +1671,9 @@
 %{_sbindir}/%{name}-cron
 
 %changelog
+* Tue Jan 27 2009 Jon Ciesla <limb at jcomserv.net> - 1.9.3-6
+- Dropped and symlinked to khmeros-base-fonts.
+
 * Thu Jan 20 2009 Jon Ciesla <limb at jcomserv.net> - 1.9.3-5
 - Dropped and symlinked illegal sm and to fonts.
 - Symlinking to FreeSans.



From karsten at fedoraproject.org  Wed Jan 28 13:42:43 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Wed, 28 Jan 2009 13:42:43 +0000 (UTC)
Subject: rpms/dictd/devel dictd.spec,1.36,1.37
Message-ID: <20090128134243.67FF17010D@cvs1.fedora.phx.redhat.com>

Author: karsten

Update of /cvs/extras/rpms/dictd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21989

Modified Files:
	dictd.spec 
Log Message:
- add disttag


Index: dictd.spec
===================================================================
RCS file: /cvs/extras/rpms/dictd/devel/dictd.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- dictd.spec	22 Jan 2009 15:35:44 -0000	1.36
+++ dictd.spec	28 Jan 2009 13:42:13 -0000	1.37
@@ -2,7 +2,7 @@
 Summary:   DICT protocol (RFC 2229) command-line client
 Name:      dictd
 Version:   1.11.0
-Release:   2
+Release:   3%{?dist}
 License:   GPL+ and zlib and MIT
 Group:     Applications/Internet
 Source0:   http://downloads.sourceforge.net/dict/%{name}-%{version}.tar.gz
@@ -67,6 +67,9 @@
 %config(noreplace) %{_sysconfdir}/sysconfig/dictd
 
 %changelog
+* Wed Jan 28 2009 Karsten Hopp <karsten at redhat.com> 1.11.0-3
+- add disttag
+
 * Thu Jan 22 2009 Karsten Hopp <karsten at redhat.com> 1.11.0-2
 - add postun script (#225694)
 - fix file permissions (defattr)



From overholt at fedoraproject.org  Wed Jan 28 13:58:57 2009
From: overholt at fedoraproject.org (Andrew Overholt)
Date: Wed, 28 Jan 2009 13:58:57 +0000 (UTC)
Subject: rpms/eclipse-linuxprofilingframework/devel
	eclipse-linuxprofilingframework.spec, 1.1, 1.2
Message-ID: <20090128135857.14E847010D@cvs1.fedora.phx.redhat.com>

Author: overholt

Update of /cvs/pkgs/rpms/eclipse-linuxprofilingframework/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24728

Modified Files:
	eclipse-linuxprofilingframework.spec 
Log Message:
* Wed Jan 28 2009 Andrew Overholt <overholt at redhat.com> 0.1.0-0.2
- No CDT on ppc64 -> ExcludeArch.


Index: eclipse-linuxprofilingframework.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-linuxprofilingframework/devel/eclipse-linuxprofilingframework.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- eclipse-linuxprofilingframework.spec	26 Jan 2009 15:17:26 -0000	1.1
+++ eclipse-linuxprofilingframework.spec	28 Jan 2009 13:58:26 -0000	1.2
@@ -8,7 +8,7 @@
 Version:        0.1.0
 # Including qualifier in release makes the resulting filenames too long.
 # It'll be 0.1.0-1 soon enough
-Release:        0.1%{?dist}
+Release:        0.2%{?dist}
 Summary:        Eclipse Linux Tools Profiling Framework
 
 Group:          Development/Tools
@@ -21,6 +21,9 @@
 
 BuildArch: noarch
 
+# No CDT on ppc64
+ExcludeArch: ppc64
+
 BuildRequires: eclipse-pde >= 1:3.4.0
 Requires: eclipse-platform >= 1:3.4.0
 BuildRequires: eclipse-cdt >= 1:4.0.0
@@ -53,5 +56,8 @@
 %{install_loc}
 
 %changelog
+* Wed Jan 28 2009 Andrew Overholt <overholt at redhat.com> 0.1.0-0.2
+- No CDT on ppc64 -> ExcludeArch.
+
 * Tue Jan 13 2009 Andrew Overholt <overholt at redhat.com> 0.1.0-0.1
-- Initial release.  Pre-0.1.0 upstream.
\ No newline at end of file
+- Initial release.  Pre-0.1.0 upstream.



From pkgdb at fedoraproject.org  Wed Jan 28 14:01:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Jan 2009 14:01:19 +0000
Subject: [pkgdb] msp430-binutils had acl change status
Message-ID: <20090128140119.7595C208496@bastion.fedora.phx.redhat.com>

rspanton has set the watchbugzilla acl on msp430-binutils (Fedora devel) to Approved for swhiteho

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/msp430-binutils



From pkgdb at fedoraproject.org  Wed Jan 28 14:01:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Jan 2009 14:01:19 +0000
Subject: [pkgdb] msp430-binutils had acl change status
Message-ID: <20090128140119.258E8208493@bastion.fedora.phx.redhat.com>

rspanton has set the watchcommits acl on msp430-binutils (Fedora devel) to Approved for swhiteho

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/msp430-binutils



From pkgdb at fedoraproject.org  Wed Jan 28 14:01:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Jan 2009 14:01:22 +0000
Subject: [pkgdb] msp430-binutils had acl change status
Message-ID: <20090128140122.1E2A5208485@bastion.fedora.phx.redhat.com>

rspanton has set the watchbugzilla acl on msp430-binutils (Fedora 10) to Approved for swhiteho

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/msp430-binutils



From pkgdb at fedoraproject.org  Wed Jan 28 14:01:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Jan 2009 14:01:25 +0000
Subject: [pkgdb] msp430-binutils had acl change status
Message-ID: <20090128140125.D1B5F2084B7@bastion.fedora.phx.redhat.com>

rspanton has set the watchcommits acl on msp430-binutils (Fedora 10) to Approved for swhiteho

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/msp430-binutils



From ltinkl at fedoraproject.org  Wed Jan 28 14:15:02 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Wed, 28 Jan 2009 14:15:02 +0000 (UTC)
Subject: rpms/kdeaccessibility/F-9 kdeaccessibility.spec, 1.57, 1.58 sources,
	1.30, 1.31
Message-ID: <20090128141502.972137010D@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kdeaccessibility/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27973

Modified Files:
	kdeaccessibility.spec sources 
Log Message:
KDE 4.2.0



Index: kdeaccessibility.spec
===================================================================
RCS file: /cvs/extras/rpms/kdeaccessibility/F-9/kdeaccessibility.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- kdeaccessibility.spec	7 Jan 2009 10:41:58 -0000	1.57
+++ kdeaccessibility.spec	28 Jan 2009 14:14:32 -0000	1.58
@@ -1,7 +1,7 @@
 Summary:        K Desktop Environment - Accessibility
 Name:           kdeaccessibility
 Epoch:          1
-Version:        4.1.4
+Version:        4.2.0
 Release:        1%{?dist}
 
 Group:          User Interface/Desktops
@@ -11,31 +11,34 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: alsa-lib-devel
-BuildRequires: cmake
 BuildRequires: festival
 # workaround (hopefully) temporary borkage
 %ifnarch sparcv9 sparc64
 BuildRequires: flite-devel
 %endif
-BuildRequires: kde-filesystem >= 4
 BuildRequires: kdelibs4-devel >= %{version}
-BuildRequires: kdebase-workspace-devel >= %{version}
+BuildRequires: plasma-devel >= %{version}
+## cmake output to check on
+#-- The KTTSD Epos plugin will be built but the pos executable was not found.
+#-- The KTTSD FreeTTS plugin will be built but the freetts.jar file was not found.
+#-- The KTTSD Hadifix plugin will be built but the txt2pho executable was not found.
+#-- The KTTSD Hadifix plugin will be built but the mbrola executable was not found.
 
-# FIXME/TODO: are there other explicit Requires?
 Requires(post): /sbin/ldconfig xdg-utils
 Requires(postun): /sbin/ldconfig xdg-utils
-%{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
 Requires: kdelibs4 >= %{version}
-Requires: kdebase-workspace >= %{version}
 
-Obsoletes: %{name}-devel < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes: kdeaccessibility-devel < 1:3.5.8 
+
+#noarch ?  -- Rex
 Provides: mono-icon-theme = %{version}-%{release}
 
 %description
 Included with this package are:
-* kmag, a screen magnifier,
-* kmousetool, a program for people whom it hurts to click the mouse,
-* kmouth, program that allows people who have lost their voice
+* kmag: a screen magnifier
+* kmousetool: a program for people whom it hurts to click the mouse
+* kmouth: program that allows people who have lost their voice
+* ktts: text to speech support
 
 
 %prep
@@ -44,7 +47,7 @@
 
 %build
 
-mkdir -p %{_target_platform} 
+mkdir -p %{_target_platform}
 pushd %{_target_platform}
 %{cmake_kde4} ..
 popd
@@ -54,8 +57,7 @@
 
 %install
 rm -rf %{buildroot}
-
-make install DESTDIR=%{buildroot} -C %{_target_platform}
+make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
 
 %clean
@@ -95,11 +97,38 @@
 %{_kde4_libdir}/lib*.so.*
 %{_kde4_libdir}/lib*.so
 %{_kde4_libdir}/kde4/*
+%{_mandir}/*/*.gz
 
 
 %changelog
-* Wed Jan 07 2009 Than Ngo <than at redhat.com> - 4.1.4-1
-- 4.1.4
+* Thu Jan 22 2009 Than Ngo <than at redhat.com> - 4.2.0-1
+- 4.2.0
+
+* Fri Jan 09 2009 Lorenzo Villani <lvillani at binaryhelix.net> - 1:4.1.96-2
+- rebuilt
+- fix file list
+
+* Wed Jan 07 2009 Than Ngo <than at redhat.com> - 4.1.96-1
+- 4.2rc1
+
+* Thu Dec 11 2008 Than Ngo <than at redhat.com> -  4.1.85-1
+- 4.2beta2
+
+* Thu Dec 04 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.80-4
+- rebuild for fixed kde-filesystem (macros.kde4) (get rid of rpaths)
+
+* Thu Dec 04 2008 Rex Dieter <rdieter at fedoraproject.or> 4.1.80-3
+- drop (Build)Requires: kdebase-workspace(-devel)
+- BR: plasma-devel
+- better, versioned Obsoletes: kdeaccessibility-devel ...
+
+* Thu Nov 20 2008 Than Ngo <than at redhat.com> 4.1.80-2
+- remove duplicated BR on cmake, it's already done in kdelibs-devel
+
+* Wed Nov 19 2008 Lorenzo Villani <lvillani at binaryhelix.net> - 1:4.1.80-1
+- 4.1.80
+- BR cmake >= 2.6.2
+- make install/fast
 
 * Tue Nov 11 2008 Than Ngo <than at redhat.com> 4.1.3-1
 - KDE 4.1.3
@@ -252,7 +281,7 @@
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1:3.5.1-1.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 
-* Fri Feb 03 2006 Than Ngo <than at redhat.com> 1:3.5.1-1 
+* Fri Feb 03 2006 Than Ngo <than at redhat.com> 1:3.5.1-1
 - 3.5.1
 
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdeaccessibility/F-9/sources,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- sources	7 Jan 2009 10:41:58 -0000	1.30
+++ sources	28 Jan 2009 14:14:32 -0000	1.31
@@ -1 +1 @@
-da6c157741d73eb1445cd60d9b78cd2e  kdeaccessibility-4.1.4.tar.bz2
+f32f24c4f07906b7af39ca18d47b5e27  kdeaccessibility-4.2.0.tar.bz2



From ltinkl at fedoraproject.org  Wed Jan 28 14:16:38 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Wed, 28 Jan 2009 14:16:38 +0000 (UTC)
Subject: rpms/kdeadmin/F-9 kdeadmin.spec,1.100,1.101 sources,1.52,1.53
Message-ID: <20090128141638.4058C7010D@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kdeadmin/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28283

Modified Files:
	kdeadmin.spec sources 
Log Message:
KDE 4.2.0



Index: kdeadmin.spec
===================================================================
RCS file: /cvs/extras/rpms/kdeadmin/F-9/kdeadmin.spec,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -r1.100 -r1.101
--- kdeadmin.spec	7 Jan 2009 10:53:05 -0000	1.100
+++ kdeadmin.spec	28 Jan 2009 14:16:07 -0000	1.101
@@ -1,7 +1,7 @@
 Name:           kdeadmin
 Epoch:          7
-Version:        4.1.4
-Release:        1%{?dist}
+Version:        4.2.0
+Release:        1%{?dist}.1
 Summary:        K Desktop Environment - Administrative tools
 
 Group:          User Interface/Desktops
@@ -13,20 +13,16 @@
 Source1:        kuser.pam
 Source2:        kuser.pamd
 
-BuildRequires:  cmake
-BuildRequires:  kde-filesystem >= 4
-%{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
 BuildRequires:  kdelibs4-devel >= %{version}
 BuildRequires:  kdepimlibs-devel >= %{version}
-BuildRequires:  openldap-devel
+BuildRequires:  python-devel
+BuildRequires:  PyKDE4-devel >= %{version}
+BuildRequires:  system-config-printer-libs
 
 Requires(post): /sbin/ldconfig xdg-utils
 Requires(postun): /sbin/ldconfig xdg-utils
 Requires: kdelibs4 >= %{version}
 Requires: kdepimlibs >= %{version}
-# kcron/knetworkconf kcm modules
-Requires: kdebase-workspace
-
 
 %description
 The %{name} package includes administrative tools including:
@@ -47,6 +43,15 @@
 
 It is based upon the "Smart Package Manager".
 
+%package -n system-config-printer-kde
+Summary: A printer administration tool for KDE 
+Group: System Environment/Base
+Requires: PyKDE4 >= %{version}
+Requires: system-config-printer-libs
+%description -n system-config-printer-kde
+A printer administration tool for KDE that allows the user to configure
+a CUPS print server.
+
 
 %prep
 %setup -q
@@ -65,7 +70,7 @@
 %install
 rm -rf %{buildroot}
 
-make install DESTDIR=%{buildroot} -C %{_target_platform}
+make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
 # remove broken .pc file which has no business to be in a non-devel pkg anyway
 rm -rf %{buildroot}%{_libdir}/pkgconfig
@@ -104,8 +109,10 @@
 %{_kde4_docdir}/HTML/en/kcron/
 %{_kde4_docdir}/HTML/en/ksystemlog/
 %{_kde4_docdir}/HTML/en/kuser/
-%{_kde4_iconsdir}/hicolor/*/*/*
-%exclude %{_kde4_iconsdir}/hicolor/*/*/kpackage*
+%{_kde4_iconsdir}/hicolor/*/*/knetworkconf.*
+%{_kde4_iconsdir}/hicolor/*/*/ksystemlog.*
+%{_kde4_iconsdir}/hicolor/*/*/kuser.*
+%{_kde4_iconsdir}/hicolor/*/*/network*
 %{_kde4_libdir}/kde4/kcm_cron.so
 %{_kde4_libdir}/kde4/kcm_knetworkconfmodule.so
 
@@ -118,10 +125,40 @@
 %{_kde4_docdir}/HTML/en/kpackage/
 %{_kde4_iconsdir}/hicolor/*/*/kpackage*
 
+%files -n system-config-printer-kde
+%defattr(-,root,root,-)
+%{_kde4_bindir}/system-config-printer-kde
+%{_kde4_datadir}/applications/kde4/system-config-printer-kde.desktop
+%{_kde4_appsdir}/system-config-printer-kde/
+
 
 %changelog
-* Wed Jan 07 2009 Than Ngo <than at redhat.com> - 4.1.4-1
-- 4.1.4
+* Thu Jan 22 2009 Than Ngo <than at redhat.com> - 4.2.0-1
+- 4.2.0
+
+* Wed Jan 14 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.1.96-2
+- include system-config-printer-kde
+
+* Wed Jan 07 2009 Than Ngo <than at redhat.com> - 4.1.96-1
+- 4.2rc1
+
+* Thu Dec 11 2008 Than Ngo <than at redhat.com> -  4.1.85-1
+- 4.2beta2
+
+* Thu Dec 04 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.80-4
+- rebuild for fixed kde-filesystem (macros.kde4) (get rid of rpaths)
+
+* Thu Dec 04 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.80-3
+- drop Requires: kdebase-workspace
+
+* Thu Nov 20 2008 Than Ngo <than at redhat.com> 4.1.80-2
+- get rid of duplicated BRs
+
+* Wed Nov 19 2008 Lorenzo Villani <lvillani at binaryhelix.net> - 7:4.1.80-1
+- 4.1.80
+- BR cmake 2.6
+- BR python-devel
+- make install/fast
 
 * Tue Nov 11 2008 Than Ngo <than at redhat.com> 4.1.3-1
 - 4.1.3
@@ -237,7 +274,7 @@
 - +BR: kde4-macros(api)
 
 * Thu Nov 15 2007 Sebastian Vahl <fedora at deadbabylon.de> 7:3.96.0-2
-- included AUTHORS 
+- included AUTHORS
 - added %%post and %%postun
 - BR: kde-filesystem
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdeadmin/F-9/sources,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- sources	7 Jan 2009 10:53:05 -0000	1.52
+++ sources	28 Jan 2009 14:16:07 -0000	1.53
@@ -1 +1 @@
-c3194bc30daacae33322993f2dba0074  kdeadmin-4.1.4.tar.bz2
+2c5b33477b5679bcd9fdbc1f8017e6fb  kdeadmin-4.2.0.tar.bz2



From pkgdb at fedoraproject.org  Wed Jan 28 14:17:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Jan 2009 14:17:22 +0000
Subject: [pkgdb] msp430-binutils: swhiteho has requested commit
Message-ID: <20090128141722.C94DF208485@bastion.fedora.phx.redhat.com>

swhiteho has requested the commit acl on msp430-binutils (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/msp430-binutils



From pkgdb at fedoraproject.org  Wed Jan 28 14:17:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Jan 2009 14:17:22 +0000
Subject: [pkgdb] msp430-binutils: swhiteho has requested approveacls
Message-ID: <20090128141722.E10EF208495@bastion.fedora.phx.redhat.com>

swhiteho has requested the approveacls acl on msp430-binutils (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/msp430-binutils



From pkgdb at fedoraproject.org  Wed Jan 28 14:17:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Jan 2009 14:17:25 +0000
Subject: [pkgdb] msp430-binutils: swhiteho has requested commit
Message-ID: <20090128141725.618352084B6@bastion.fedora.phx.redhat.com>

swhiteho has requested the commit acl on msp430-binutils (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/msp430-binutils



From pkgdb at fedoraproject.org  Wed Jan 28 14:17:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Jan 2009 14:17:25 +0000
Subject: [pkgdb] msp430-binutils: swhiteho has requested approveacls
Message-ID: <20090128141725.619262084B7@bastion.fedora.phx.redhat.com>

swhiteho has requested the approveacls acl on msp430-binutils (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/msp430-binutils



From ltinkl at fedoraproject.org  Wed Jan 28 14:18:30 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Wed, 28 Jan 2009 14:18:30 +0000 (UTC)
Subject: rpms/kdeartwork/F-9 kdeartwork.spec,1.88,1.89 sources,1.49,1.50
Message-ID: <20090128141830.6422D7010D@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kdeartwork/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28561

Modified Files:
	kdeartwork.spec sources 
Log Message:
KDE 4.2.0



Index: kdeartwork.spec
===================================================================
RCS file: /cvs/extras/rpms/kdeartwork/F-9/kdeartwork.spec,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -r1.88 -r1.89
--- kdeartwork.spec	7 Jan 2009 11:14:09 -0000	1.88
+++ kdeartwork.spec	28 Jan 2009 14:17:59 -0000	1.89
@@ -1,5 +1,5 @@
 Name:           kdeartwork
-Version:        4.1.4
+Version:        4.2.0
 Release:        1%{?dist}
 Summary:        Additional artwork (themes, sound themes, ...) for KDE
 
@@ -21,9 +21,6 @@
 # TODO: Revisit this issue once the renaming is complete. -- Kevin
 #define include_crystalsvg 1
 
-BuildRequires:  cmake
-BuildRequires:  kde-filesystem >= 4
-%{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
 BuildRequires:  kdelibs4-devel >= %{version}
 BuildRequires:  kdebase-workspace-devel >= %{version}
 
@@ -44,7 +41,7 @@
 Provides:  kdeartwork-icons-crystalsvg = %{version}-%{release}
 Requires(post): xdg-utils
 Requires(postun): xdg-utils
-%description -n crystalsvg-icon-theme 
+%description -n crystalsvg-icon-theme
 This package contains the crystalsvg icon theme.
 It was the standard theme in KDE3 and is needed for KDE3 applications.
 %endif
@@ -52,21 +49,12 @@
 %package icons
 Summary: Additional icon themes
 Group: User Interface/Desktops
-Provides: Locolor-icon-theme = %{version}-%{release}
-Provides: nuvola-icon-theme = %{version}-%{release}
-Provides: ikons-icon-theme = %{version}-%{release}
 Provides: kdeclassic-icon-theme = %{version}-%{release}
-Provides: kids-icon-theme = %{version}-%{release}
-Provides: slick-icon-theme = %{version}-%{release} 
 Requires(post): xdg-utils
 Requires(postun): xdg-utils
 %description icons
 This contains icon themes:
-* Locolor
-* ikons
 * kdeclassic
-* kids
-* slick
 
 %package extras
 Summary: Artwork Extras, including xscreensaver-based screensavers
@@ -110,11 +98,11 @@
 rm -rf %{buildroot}
 
 %if 0%{?rest}
-make install DESTDIR=%{buildroot} -C %{_target_platform}
+make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 %endif
 
 %if 0%{?icons}
-make install DESTDIR=%{buildroot} -C %{_target_platform}/IconThemes
+make install/fast DESTDIR=%{buildroot} -C %{_target_platform}/IconThemes
 %if ! 0%{?include_crystalsvg}
 rm -rf %{buildroot}%{_kde4_iconsdir}/crystalsvg/
 %endif
@@ -128,12 +116,7 @@
 
 %if 0%{?icons}
 %post icons
-%{_bindir}/xdg-icon-resource forceupdate --theme Locolor 2> /dev/null || :
-%{_bindir}/xdg-icon-resource forceupdate --theme nuvola 2> /dev/null || :
-%{_bindir}/xdg-icon-resource forceupdate --theme ikons 2> /dev/null || :
 %{_bindir}/xdg-icon-resource forceupdate --theme kdeclassic 2> /dev/null || :
-%{_bindir}/xdg-icon-resource forceupdate --theme kids 2> /dev/null || :
-%{_bindir}/xdg-icon-resource forceupdate --theme slick 2> /dev/null || :
 
 %if 0%{?include_crystalsvg}
 %post -n crystalsvg-icon-theme
@@ -141,12 +124,7 @@
 %endif
 
 %postun icons
-%{_bindir}/xdg-icon-resource forceupdate --theme Locolor 2> /dev/null || :
-%{_bindir}/xdg-icon-resource forceupdate --theme nuvola 2> /dev/null || :
-%{_bindir}/xdg-icon-resource forceupdate --theme ikons 2> /dev/null || :
 %{_bindir}/xdg-icon-resource forceupdate --theme kdeclassic 2> /dev/null || :
-%{_bindir}/xdg-icon-resource forceupdate --theme kids 2> /dev/null || :
-%{_bindir}/xdg-icon-resource forceupdate --theme slick 2> /dev/null || :
 
 %if 0%{?include_crystalsvg}
 %postun -n crystalsvg-icon-theme
@@ -179,15 +157,10 @@
 %if 0%{?icons}
 %files icons
 %defattr(-,root,root,-)
-%{_kde4_iconsdir}/Locolor/
-%{_kde4_iconsdir}/nuvola/
-%{_kde4_iconsdir}/ikons/
 %{_kde4_iconsdir}/kdeclassic/
-%{_kde4_iconsdir}/kids/
-%{_kde4_iconsdir}/slick/
 
 %if 0%{?include_crystalsvg}
-%files -n crystalsvg-icon-theme 
+%files -n crystalsvg-icon-theme
 %defattr(-,root,root,-)
 %{_kde4_iconsdir}/crystalsvg/
 %endif
@@ -195,11 +168,28 @@
 
 
 %changelog
-* Wed Jan 07 2009 Than Ngo <than at redhat.com> - 4.1.4-1
-- 4.1.4
+* Thu Jan 22 2009 Than Ngo <than at redhat.com> - 4.2.0-1
+- 4.2.0
 
-* Thu Nov 27 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.3-3
-- reenable webcollage since xscreensaver now has a sane default setting for it
+* Sat Jan 10 2009 Than Ngo <than at redhat.com> - 4.1.96-2
+- fix file list
+
+* Wed Jan 07 2009 Than Ngo <than at redhat.com> - 4.1.96-1
+- 4.2rc1
+
+* Thu Dec 11 2008 Than Ngo <than at redhat.com> -  4.1.85-1
+- 4.2beta2
+
+* Wed Nov 26 2008 Than Ngo <than at redhat.com> 4.1.80-3
+- enable webcollage since xscreensaver has sane default setting
+
+* Thu Nov 20 2008 Than Ngo <than at redhat.com> 4.1.80-2
+- drop duplicated BRs
+
+* Wed Nov 19 2008 Lorenzo Villani <lvillani at binaryhelix.net> - 4.1.80-1
+- 4.1.80
+- BR cmake 2.6
+- make install/fast
 
 * Tue Nov 18 2008 Than Ngo <than at redhat.com> 4.1.3-2
 - drop webcollage bz#461926
@@ -362,12 +352,12 @@
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 3.5.1-1.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 
-* Fri Feb 03 2006 Than Ngo <than at redhat.com> 3.5.1-1 
+* Fri Feb 03 2006 Than Ngo <than at redhat.com> 3.5.1-1
 - 3.5.1
 
-* Sat Dec 17 2005 Than Ngo <than at redhat.com> 3.5.0-2 
+* Sat Dec 17 2005 Than Ngo <than at redhat.com> 3.5.0-2
 - requires on xscreensaver-extras
-  
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 
@@ -383,7 +373,7 @@
 * Tue Aug 09 2005 Than Ngo <than at redhat.com> 3.4.2-1
 - update to 3.4.2
 
-* Thu Jun 30 2005 Than Ngo <than at redhat.com> 3.4.1-2 
+* Thu Jun 30 2005 Than Ngo <than at redhat.com> 3.4.1-2
 - configure script does not look the right xscreensaver dirs
   apply patch to fix this problem, #161312, thanks to Rex Dieter
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdeartwork/F-9/sources,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- sources	7 Jan 2009 11:14:10 -0000	1.49
+++ sources	28 Jan 2009 14:18:00 -0000	1.50
@@ -1 +1 @@
-6b53365e45fdcd227e7e7c546e25cb36  kdeartwork-4.1.4.tar.bz2
+d81623b60c7deb314bc2e28a52254ac2  kdeartwork-4.2.0.tar.bz2



From steved at fedoraproject.org  Wed Jan 28 14:28:54 2009
From: steved at fedoraproject.org (Steve Dickson)
Date: Wed, 28 Jan 2009 14:28:54 +0000 (UTC)
Subject: rpms/libtirpc/devel libtirpc-0.1.10-svcreq-compat.patch, NONE,
	1.1 libtirpc.spec, 1.38, 1.39
Message-ID: <20090128142854.D05797010D@cvs1.fedora.phx.redhat.com>

Author: steved

Update of /cvs/pkgs/rpms/libtirpc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30310

Modified Files:
	libtirpc.spec 
Added Files:
	libtirpc-0.1.10-svcreq-compat.patch 
Log Message:
backwards compatibility: fix order of fields in TI-RPC's svc_req



libtirpc-0.1.10-svcreq-compat.patch:

--- NEW FILE libtirpc-0.1.10-svcreq-compat.patch ---
commit 2bb4c8d7ec8a98e1be9133d5901149a81ea9b5d9
Author: Chuck Lever <chuck.lever at oracle.com>
Date:   Wed Jan 28 09:19:07 2009 -0500

    backwards compatibility: fix order of fields in TI-RPC's svc_req
    
    Preserve ABI compatibility between glibc's RPC implementation and
    the legacy RPC implementation in libtirpc by moving the rq_xprt
    field in the TI-RPC version of the svc_req struct so it is
    backwards compatible with the legacy version of this structure.
    
    Linux's legacy svc_req struct, from /usr/include/rpc/svc.h, looks
    like this:
    
    struct svc_req {
      rpcprog_t rq_prog;		/* service program number */
      rpcvers_t rq_vers;		/* service protocol version */
      rpcproc_t rq_proc;		/* the desired procedure */
      struct opaque_auth rq_cred;	/* raw creds from the wire */
      caddr_t rq_clntcred;		/* read only cooked cred */
      SVCXPRT *rq_xprt;		/* associated transport */
    };
    
    The new TI-RPC svc_req struct, from /usr/include/tirpc/rpc/svc.h,
    looks like this:
    
    struct svc_req {
      u_int32_t rq_prog;		/* service program number */
      u_int32_t rq_vers;		/* service protocol version */
      u_int32_t rq_proc;		/* the desired procedure */
      struct opaque_auth rq_cred;	/* raw creds from the wire */
      void *rq_clntcred;		/* read only cooked cred */
      caddr_t rq_clntname;		/* read only client name */
      caddr_t rq_svcname;		/* read only cooked service cred */
      SVCXPRT *rq_xprt;		/* associated transport */
    };
    
    Note the extra fields rq_clntname and rq_svcname.  These are used for
    TI-RPC's RPCSEC GSS flavor support.
    
    This issue came to light because rpc.statd still uses only legacy RPC
    calls, and thus includes /usr/include/rpc/svc.h.  However, other parts
    of nfs-utils now link with TI-RPC, so the legacy RPC functions in
    libtirpc are used in favor of glibc's RPC functions.  The libtirpc svc
    functions use the new svc_req struct, but rpc.statd uses the old
    svc_req struct.
    
    Since the svc_req fields were different, rpc.statd broke after recent
    IPv6-related changes, even though I hadn't made any changes to it.
    Note that rpc.mountd also references the rq_xprt field, so it has the
    same issue.
    
    In most operating systems, there is only one rpc/svc.h and one version
    of svc_req so this is not a problem.  We should audit all of the
    structures and functions under /usr/include/rpc and
    /usr/include/tirpc/rpc to ensure we have a reasonable level of
    backwards compatibility until such a time it is decided to merge these
    implementations or get rid of RPC support in glibc.
    
    Signed-off-by: Chuck Lever <chuck.lever at oracle.com>
    Signed-off-by: Steve Dickson <steved at redhat.com>

diff --git a/tirpc/rpc/svc.h b/tirpc/rpc/svc.h
index ec5914f..ea2985d 100644
--- a/tirpc/rpc/svc.h
+++ b/tirpc/rpc/svc.h
@@ -131,14 +131,17 @@ typedef struct __rpc_svcxprt {
  * Service request
  */
 struct svc_req {
+	/* ORDER: compatibility with legacy RPC */
 	u_int32_t	rq_prog;	/* service program number */
 	u_int32_t	rq_vers;	/* service protocol version */
 	u_int32_t	rq_proc;	/* the desired procedure */
 	struct opaque_auth rq_cred;	/* raw creds from the wire */
 	void		*rq_clntcred;	/* read only cooked cred */
+	SVCXPRT		*rq_xprt;	/* associated transport */
+
+	/* New with TI-RPC */
 	caddr_t		rq_clntname;	/* read only client name */
 	caddr_t		rq_svcname;	/* read only cooked service cred */
-	SVCXPRT		*rq_xprt;	/* associated transport */
 };
 
 /*


Index: libtirpc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libtirpc/devel/libtirpc.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- libtirpc.spec	22 Jan 2009 17:47:44 -0000	1.38
+++ libtirpc.spec	28 Jan 2009 14:28:24 -0000	1.39
@@ -1,6 +1,6 @@
 Name:		   libtirpc
 Version:		0.1.10
-Release:		2%{?dist}
+Release:		3%{?dist}
 Summary:		Transport Independent RPC Library
 Group:		  	System Environment/Libraries
 License:		SISSL
@@ -33,6 +33,7 @@
 Patch01: libtirpc-0.1.10-dg-unlock.patch
 Patch02: libtirpc-0.1.10-errmess-unlock.patch
 Patch03: libtirpc-0.1.10-C++declares.patch
+Patch04: libtirpc-0.1.10-svcreq-compat.patch
 
 Patch100: libtirpc-0.1.7-compile.patch
 
@@ -46,6 +47,7 @@
 %patch01	-p1
 %patch02	-p1
 %patch03	-p1
+%patch04	-p1
 
 %patch100	-p1
 
@@ -144,6 +146,9 @@
 %{_mandir}/*/*
 
 %changelog
+* Wed Jan 28 2009 Steve Dickson  <steved at redhat.com> 0.1.10-3
+- backwards compatibility: fix order of fields in TI-RPC's svc_req
+
 * Thu Jan 22 2009 Steve Dickson  <steved at redhat.com> 0.1.10-2
 - Header file fixes for C++
 



From steved at fedoraproject.org  Wed Jan 28 14:30:54 2009
From: steved at fedoraproject.org (Steve Dickson)
Date: Wed, 28 Jan 2009 14:30:54 +0000 (UTC)
Subject: rpms/libtirpc/devel libtirpc.spec,1.39,1.40
Message-ID: <20090128143054.1F00E7010D@cvs1.fedora.phx.redhat.com>

Author: steved

Update of /cvs/pkgs/rpms/libtirpc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30632

Modified Files:
	libtirpc.spec 
Log Message:
Added bz481388 to changelog



Index: libtirpc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libtirpc/devel/libtirpc.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- libtirpc.spec	28 Jan 2009 14:28:24 -0000	1.39
+++ libtirpc.spec	28 Jan 2009 14:30:23 -0000	1.40
@@ -148,6 +148,7 @@
 %changelog
 * Wed Jan 28 2009 Steve Dickson  <steved at redhat.com> 0.1.10-3
 - backwards compatibility: fix order of fields in TI-RPC's svc_req
+  (bz 481388)
 
 * Thu Jan 22 2009 Steve Dickson  <steved at redhat.com> 0.1.10-2
 - Header file fixes for C++



From mkasik at fedoraproject.org  Wed Jan 28 14:45:49 2009
From: mkasik at fedoraproject.org (=?utf-8?b?TWFyZWsgS2HFocOtaw==?=)
Date: Wed, 28 Jan 2009 14:45:49 +0000 (UTC)
Subject: rpms/gtk2/F-10 default_printer.patch,1.1,1.2 gtk2.spec,1.341,1.342
Message-ID: <20090128144549.4D35F7010D@cvs1.fedora.phx.redhat.com>

Author: mkasik

Update of /cvs/pkgs/rpms/gtk2/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1428

Modified Files:
	default_printer.patch gtk2.spec 
Log Message:
* Wed Jan 28 2009 Marek Kasik <mkasik at redhat.com> - 2.14.7-3
- modify default_printer.patch to show a network default printer
  in the case of no local default printer
- Resolves: #478400


default_printer.patch:

Index: default_printer.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gtk2/F-10/default_printer.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- default_printer.patch	19 Jan 2009 13:41:29 -0000	1.1
+++ default_printer.patch	28 Jan 2009 14:45:18 -0000	1.2
@@ -1,12 +1,76 @@
 --- modules/printbackends/cups/gtkprintbackendcups.c	2009-01-07 17:33:32.000000000 +0100
-+++ modules/printbackends/cups/gtkprintbackendcups.c	2009-01-19 13:20:05.000000000 +0100
-@@ -1247,7 +1247,8 @@ cups_request_printer_list_cb (GtkPrintBa
-         else if (strcmp (attr->name, "printer-type") == 0)
-           {
-             got_printer_type = TRUE;
--            if (attr->values[0].integer & 0x00020000)
-+            if ((attr->values[0].integer & 0x00020000) &&
-+               !(attr->values[0].integer & 0x00000002))
++++ modules/printbackends/cups/gtkprintbackendcups.c	2009-01-21 14:16:18.000000000 +0100
+@@ -1047,6 +1047,7 @@ cups_request_printer_list_cb (GtkPrintBa
+   ipp_t *response;
+   gboolean list_has_changed;
+   GList *removed_printer_checklist;
++  gchar *remote_default_printer = NULL;
+ 
+   GDK_THREADS_ENTER ();
+ 
+@@ -1134,6 +1135,7 @@ cups_request_printer_list_cb (GtkPrintBa
+       gboolean is_accepting_jobs = TRUE;
+       gboolean default_printer = FALSE;
+       gboolean got_printer_type = FALSE;
++      gboolean remote_printer = FALSE;
+       
+       /* Skip leading attributes until we hit a printer...
+        */
+@@ -1251,6 +1253,11 @@ cups_request_printer_list_cb (GtkPrintBa
                default_printer = TRUE;
              else
                default_printer = FALSE;
++
++            if (attr->values[0].integer & 0x00000002)
++              remote_printer = TRUE;
++            else
++              remote_printer = FALSE;
+           }
+         else
+ 	  {
+@@ -1274,8 +1281,16 @@ cups_request_printer_list_cb (GtkPrintBa
+         {
+           if (default_printer && !cups_backend->got_default_printer)
+             {
+-              cups_backend->got_default_printer = TRUE;
+-              cups_backend->default_printer = g_strdup (printer_name);
++              if (!remote_printer)
++                {
++                  cups_backend->got_default_printer = TRUE;
++                  cups_backend->default_printer = g_strdup (printer_name);
++                }
++              else
++                {
++                  if (remote_default_printer == NULL)
++                    remote_default_printer = g_strdup (printer_name);
++                }
+             }
+         }
+       else
+@@ -1496,6 +1511,26 @@ done:
+   
+   gtk_print_backend_set_list_done (backend);
+ 
++  if (!cups_backend->got_default_printer && remote_default_printer != NULL)
++    {
++      cups_backend->default_printer = g_strdup (remote_default_printer);
++      cups_backend->got_default_printer = TRUE;
++      g_free (remote_default_printer);
++
++      if (cups_backend->default_printer != NULL)
++        {
++          GtkPrinter *default_printer = NULL;
++          default_printer = gtk_print_backend_find_printer (GTK_PRINT_BACKEND (cups_backend),
++                                                            cups_backend->default_printer);
++          if (default_printer != NULL)
++            {
++              gtk_printer_set_is_default (default_printer, TRUE);
++              g_signal_emit_by_name (GTK_PRINT_BACKEND (cups_backend),
++                                     "printer-status-changed", default_printer);
++            }
++        }
++    }
++
+   GDK_THREADS_LEAVE ();
+ }
+ 


Index: gtk2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtk2/F-10/gtk2.spec,v
retrieving revision 1.341
retrieving revision 1.342
diff -u -r1.341 -r1.342
--- gtk2.spec	19 Jan 2009 13:41:29 -0000	1.341
+++ gtk2.spec	28 Jan 2009 14:45:18 -0000	1.342
@@ -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
@@ -300,6 +300,11 @@
 %{_datadir}/gtk-2.0
 
 %changelog
+* Wed Jan 28 2009 Marek Kasik <mkasik at redhat.com> - 2.14.7-3
+- modify default_printer.patch to show a network default printer
+  in the case of no local default printer
+- Resolves: #478400
+
 * Mon Jan 19 2009 Marek Kasik <mkasik at redhat.com> - 2.14.7-2
 - fix a problem with default printer in a network
 - Resolves: #478400



From mkasik at fedoraproject.org  Wed Jan 28 14:46:57 2009
From: mkasik at fedoraproject.org (=?utf-8?b?TWFyZWsgS2HFocOtaw==?=)
Date: Wed, 28 Jan 2009 14:46:57 +0000 (UTC)
Subject: rpms/gtk2/devel default_printer.patch, 1.1, 1.2 gtk2.spec, 1.351,
	1.352
Message-ID: <20090128144657.D48907010D@cvs1.fedora.phx.redhat.com>

Author: mkasik

Update of /cvs/pkgs/rpms/gtk2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1695

Modified Files:
	default_printer.patch gtk2.spec 
Log Message:
* Wed Jan 28 2009 Marek Kasik <mkasik at redhat.com> - 2.15.2-3
- modify default_printer.patch to show a network default printer
  in the case of no local default printer
- Resolves: #478400


default_printer.patch:

Index: default_printer.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gtk2/devel/default_printer.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- default_printer.patch	19 Jan 2009 13:44:41 -0000	1.1
+++ default_printer.patch	28 Jan 2009 14:46:27 -0000	1.2
@@ -1,12 +1,76 @@
 --- modules/printbackends/cups/gtkprintbackendcups.c	2009-01-01 20:41:58.000000000 +0100
-+++ modules/printbackends/cups/gtkprintbackendcups.c	2009-01-19 13:31:59.000000000 +0100
-@@ -1303,7 +1303,8 @@ cups_request_printer_list_cb (GtkPrintBa
-         else if (strcmp (attr->name, "printer-type") == 0)
-           {
-             got_printer_type = TRUE;
--            if (attr->values[0].integer & 0x00020000)
-+            if ((attr->values[0].integer & 0x00020000) &&
-+               !(attr->values[0].integer & 0x00000002))
++++ modules/printbackends/cups/gtkprintbackendcups.c	2009-01-21 13:54:39.000000000 +0100
+@@ -1103,6 +1103,7 @@ cups_request_printer_list_cb (GtkPrintBa
+   ipp_t *response;
+   gboolean list_has_changed;
+   GList *removed_printer_checklist;
++  gchar *remote_default_printer = NULL;
+ 
+   GDK_THREADS_ENTER ();
+ 
+@@ -1190,6 +1191,7 @@ cups_request_printer_list_cb (GtkPrintBa
+       gboolean is_accepting_jobs = TRUE;
+       gboolean default_printer = FALSE;
+       gboolean got_printer_type = FALSE;
++      gboolean remote_printer = FALSE;
+       
+       /* Skip leading attributes until we hit a printer...
+        */
+@@ -1307,6 +1309,11 @@ cups_request_printer_list_cb (GtkPrintBa
                default_printer = TRUE;
              else
                default_printer = FALSE;
++
++            if (attr->values[0].integer & 0x00000002)
++              remote_printer = TRUE;
++            else
++              remote_printer = FALSE;
+           }
+         else
+ 	  {
+@@ -1330,8 +1337,16 @@ cups_request_printer_list_cb (GtkPrintBa
+         {
+           if (default_printer && !cups_backend->got_default_printer)
+             {
+-              cups_backend->got_default_printer = TRUE;
+-              cups_backend->default_printer = g_strdup (printer_name);
++              if (!remote_printer)
++                {
++                  cups_backend->got_default_printer = TRUE;
++                  cups_backend->default_printer = g_strdup (printer_name);
++                }
++              else
++                {
++                  if (remote_default_printer == NULL)
++                    remote_default_printer = g_strdup (printer_name);
++                }
+             }
+         }
+       else
+@@ -1552,6 +1567,26 @@ done:
+   
+   gtk_print_backend_set_list_done (backend);
+ 
++  if (!cups_backend->got_default_printer && remote_default_printer != NULL)
++    {
++      cups_backend->default_printer = g_strdup (remote_default_printer);
++      cups_backend->got_default_printer = TRUE;
++      g_free (remote_default_printer);
++
++      if (cups_backend->default_printer != NULL)
++        {
++          GtkPrinter *default_printer = NULL;
++          default_printer = gtk_print_backend_find_printer (GTK_PRINT_BACKEND (cups_backend),
++                                                            cups_backend->default_printer);
++          if (default_printer != NULL)
++            {
++              gtk_printer_set_is_default (default_printer, TRUE);
++              g_signal_emit_by_name (GTK_PRINT_BACKEND (cups_backend),
++                                     "printer-status-changed", default_printer);
++            }
++        }
++    }
++
+   GDK_THREADS_LEAVE ();
+ }
+ 


Index: gtk2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtk2/devel/gtk2.spec,v
retrieving revision 1.351
retrieving revision 1.352
diff -u -r1.351 -r1.352
--- gtk2.spec	27 Jan 2009 15:07:58 -0000	1.351
+++ gtk2.spec	28 Jan 2009 14:46:27 -0000	1.352
@@ -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.15/gtk+-%{version}.tar.bz2
@@ -297,6 +297,11 @@
 %{_datadir}/gtk-2.0
 
 %changelog
+* Wed Jan 28 2009 Marek Kasik <mkasik at redhat.com> - 2.15.2-3
+- modify default_printer.patch to show a network default printer
+  in the case of no local default printer
+- Resolves: #478400
+
 * Tue Jan 27 2009 Matthias Clasen <mclasen at redhat.com> - 2.15.2-2
 - Fix togglebuttons causing crashes
 



From pkgdb at fedoraproject.org  Wed Jan 28 14:51:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Jan 2009 14:51:29 +0000
Subject: [pkgdb] msp430-binutils had acl change status
Message-ID: <20090128145129.B01D3208485@bastion.fedora.phx.redhat.com>

rspanton has set the approveacls acl on msp430-binutils (Fedora devel) to Approved for swhiteho

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/msp430-binutils



From pkgdb at fedoraproject.org  Wed Jan 28 14:51:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Jan 2009 14:51:29 +0000
Subject: [pkgdb] msp430-binutils had acl change status
Message-ID: <20090128145130.F080B208494@bastion.fedora.phx.redhat.com>

rspanton has set the commit acl on msp430-binutils (Fedora devel) to Approved for swhiteho

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/msp430-binutils



From pkgdb at fedoraproject.org  Wed Jan 28 14:51:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Jan 2009 14:51:31 +0000
Subject: [pkgdb] msp430-binutils had acl change status
Message-ID: <20090128145131.B4612208496@bastion.fedora.phx.redhat.com>

rspanton has set the approveacls acl on msp430-binutils (Fedora 10) to Approved for swhiteho

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/msp430-binutils



From pkgdb at fedoraproject.org  Wed Jan 28 14:51:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Jan 2009 14:51:33 +0000
Subject: [pkgdb] msp430-binutils had acl change status
Message-ID: <20090128145133.F41B42084B7@bastion.fedora.phx.redhat.com>

rspanton has set the commit acl on msp430-binutils (Fedora 10) to Approved for swhiteho

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/msp430-binutils



From jreznik at fedoraproject.org  Wed Jan 28 15:06:52 2009
From: jreznik at fedoraproject.org (Jaroslav Reznik)
Date: Wed, 28 Jan 2009 15:06:52 +0000 (UTC)
Subject: rpms/system-config-netboot/devel .cvsignore, 1.36, 1.37 sources,
	1.39, 1.40 system-config-netboot.spec, 1.60, 1.61
Message-ID: <20090128150652.268BB7010D@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-serv5663

Modified Files:
	.cvsignore sources system-config-netboot.spec 
Log Message:
* Tue Jan 27 2009 Jaroslav Reznik <jreznik at redhat.com> - 0.1.45.4-1
- merge review: fixes permissions (bz#226463)

* Fri Jan 09 2009 Jaroslav Reznik <jreznik at redhat.com> - 0.1.45.3-5
- requires usermode-gtk
- merge review: rpmlint output (bz#226463)

* Mon Jan 05 2009 Jaroslav Reznik <jreznik at redhat.com> - 0.1.45.3-4
- merge review: rpmlint output (bz#226463)




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-netboot/devel/.cvsignore,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- .cvsignore	16 Sep 2008 12:47:13 -0000	1.36
+++ .cvsignore	28 Jan 2009 15:06:21 -0000	1.37
@@ -1 +1 @@
-system-config-netboot-0.1.45.3.tar.gz
+system-config-netboot-0.1.45.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-netboot/devel/sources,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- sources	16 Sep 2008 12:47:13 -0000	1.39
+++ sources	28 Jan 2009 15:06:21 -0000	1.40
@@ -1 +1 @@
-cb0b32e0db36fcd50ea84161fcb50cf1  system-config-netboot-0.1.45.3.tar.gz
+cd6791af45551480ea41ea3a80c80f41  system-config-netboot-0.1.45.4.tar.gz


Index: system-config-netboot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-netboot/devel/system-config-netboot.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- system-config-netboot.spec	19 Dec 2008 10:55:34 -0000	1.60
+++ system-config-netboot.spec	28 Jan 2009 15:06:21 -0000	1.61
@@ -1,8 +1,8 @@
 # -*- RPM-SPEC -*-
-Summary: network booting/install configuration utility (GUI)
+Summary: Network booting/install configuration utility (GUI)
 Name: system-config-netboot
-Version: 0.1.45.3
-Release: 3%{?dist}
+Version: 0.1.45.4
+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
@@ -10,19 +10,21 @@
 Group: Applications/System
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 Requires: gnome-python2-gnome, pygtk2, pygtk2-libglade, gnome-python2-canvas, alchemist
+Requires: usermode usermode-gtk
 Requires: %{name}-cmd = %{version}-%{release}
 Requires(post): hicolor-icon-theme
 BuildRequires: autoconf, automake, gettext, intltool, python, perl, perl-XML-Parser
 #ExclusiveArch: i386 x86_64
 BuildArch: noarch
-Obsoletes: redhat-config-netboot
+Obsoletes: redhat-config-netboot <= 0.1.2-2
+Provides: redhat-config-netboot = 0.1.2-2
 
 %description
 system-config-netboot is a utility which allows you to configure 
 diskless environments and network installations.
 
 %package cmd
-Summary: network booting/install configuration utility
+Summary: Network booting/install configuration utility
 Group: Applications/System
 Requires: tftp-server >= 0.29-3 
 
@@ -99,6 +101,16 @@
 %config(noreplace) %{_sysconfdir}/security/console.apps/system-config-netboot
 
 %changelog
+* Tue Jan 27 2009 Jaroslav Reznik <jreznik at redhat.com> - 0.1.45.4-1
+- merge review: fixes permissions (bz#226463)
+ 
+* Fri Jan 09 2009 Jaroslav Reznik <jreznik at redhat.com> - 0.1.45.3-5
+- requires usermode-gtk
+- merge review: rpmlint output (bz#226463)
+
+* Mon Jan 05 2009 Jaroslav Reznik <jreznik at redhat.com> - 0.1.45.3-4
+- merge review: rpmlint output (bz#226463)
+ 
 * Fri Dec 19 2008 Jaroslav Reznik <jreznik at redhat.com> - 0.1.45.3-3
 - merge review: fix defattr (bz#226463)
 - merge review: parallel make (bz#226463)
@@ -272,9 +284,9 @@
 
 * Thu Apr 21 2005 Dan Walsh <dwalsh at redhat.com> 0.1.14-1
 - Apply Ronny Buchmann patch
-	system-config-netboot.glade has a wrong id for the kickstart file input.
-	pxeosdialog.py wants osKickstartEntry and produces a traceback later, 
-	because it didn't get a node for it.	
+    system-config-netboot.glade has a wrong id for the kickstart file input.
+    pxeosdialog.py wants osKickstartEntry and produces a traceback later, 
+    because it didn't get a node for it.	
 
 * Fri Apr 1 2005 Dan Walsh <dwalsh at redhat.com> 0.1.13-1
 - Fix python gtk.False -> False



From steved at fedoraproject.org  Wed Jan 28 15:08:49 2009
From: steved at fedoraproject.org (Steve Dickson)
Date: Wed, 28 Jan 2009 15:08:49 +0000 (UTC)
Subject: rpms/libtirpc/devel libtirpc-0.1.10-warnings.patch, NONE,
	1.1 libtirpc.spec, 1.40, 1.41
Message-ID: <20090128150849.385ED7010D@cvs1.fedora.phx.redhat.com>

Author: steved

Update of /cvs/pkgs/rpms/libtirpc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6094

Modified Files:
	libtirpc.spec 
Added Files:
	libtirpc-0.1.10-warnings.patch 
Log Message:
- Removed a number warnings


libtirpc-0.1.10-warnings.patch:

--- NEW FILE libtirpc-0.1.10-warnings.patch ---
commit 5bc80ccd81e0c7ef185de34e7f34a7766bce0e27
Author: Steve Dickson <steved at redhat.com>
Date:   Wed Jan 28 09:56:10 2009 -0500

    Removed a number warnings by adding a number of type casts.
    
    Signed-off-by: Steve Dickson <steved at redhat.com>

diff --git a/src/auth_gss.c b/src/auth_gss.c
index 8f7919c..bf6cba6 100644
--- a/src/auth_gss.c
+++ b/src/auth_gss.c
@@ -221,7 +221,7 @@ authgss_create_default(CLIENT *clnt, char *service, struct rpc_gss_sec *sec)
 	sname.length = strlen(service);
 
 	maj_stat = gss_import_name(&min_stat, &sname,
-		GSS_C_NT_HOSTBASED_SERVICE,
+		(gss_OID)GSS_C_NT_HOSTBASED_SERVICE,
 		&name);
 
 	if (maj_stat != GSS_S_COMPLETE) {
diff --git a/src/authgss_prot.c b/src/authgss_prot.c
index 97724f1..be0d1a6 100644
--- a/src/authgss_prot.c
+++ b/src/authgss_prot.c
@@ -176,10 +176,11 @@ xdr_rpc_gss_unwrap_data(XDR *xdrs, xdrproc_t xdr_func, caddr_t xdr_ptr,
 	XDR		tmpxdrs;
 	gss_buffer_desc	databuf, wrapbuf;
 	OM_uint32	maj_stat, min_stat;
-	u_int		seq_num, conf_state, qop_state;
+	u_int		seq_num, qop_state;
+	int			conf_state;
 	bool_t		xdr_stat;
 
-	if (xdr_func == xdr_void || xdr_ptr == NULL)
+	if (xdr_func == (xdrproc_t)xdr_void || xdr_ptr == NULL)
 		return (TRUE);
 
 	memset(&databuf, 0, sizeof(databuf));
diff --git a/src/svc_auth_gss.c b/src/svc_auth_gss.c
index 346e5b1..9e9ff81 100644
--- a/src/svc_auth_gss.c
+++ b/src/svc_auth_gss.c
@@ -190,7 +190,7 @@ svcauth_gss_accept_sec_context(struct svc_req *rqst,
 	/* Deserialize arguments. */
 	memset(&recv_tok, 0, sizeof(recv_tok));
 
-	if (!svc_getargs(rqst->rq_xprt, xdr_rpc_gss_init_args,
+	if (!svc_getargs(rqst->rq_xprt, (xdrproc_t)xdr_rpc_gss_init_args,
 			 (caddr_t)&recv_tok))
 		return (FALSE);
 
@@ -469,8 +469,8 @@ _svcauth_gss(struct svc_req *rqst, struct rpc_msg *msg, bool_t *no_dispatch)
 
 		*no_dispatch = TRUE;
 
-		call_stat = svc_sendreply(rqst->rq_xprt, xdr_rpc_gss_init_res,
-					  (caddr_t)&gr);
+		call_stat = svc_sendreply(rqst->rq_xprt, 
+			(xdrproc_t)xdr_rpc_gss_init_res, (caddr_t)&gr);
 
 		if (!call_stat)
 			return (AUTH_FAILED);


Index: libtirpc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libtirpc/devel/libtirpc.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- libtirpc.spec	28 Jan 2009 14:30:23 -0000	1.40
+++ libtirpc.spec	28 Jan 2009 15:08:18 -0000	1.41
@@ -34,6 +34,7 @@
 Patch02: libtirpc-0.1.10-errmess-unlock.patch
 Patch03: libtirpc-0.1.10-C++declares.patch
 Patch04: libtirpc-0.1.10-svcreq-compat.patch
+Patch05: libtirpc-0.1.10-warnings.patch
 
 Patch100: libtirpc-0.1.7-compile.patch
 
@@ -48,6 +49,7 @@
 %patch02	-p1
 %patch03	-p1
 %patch04	-p1
+%patch05	-p1
 
 %patch100	-p1
 
@@ -147,8 +149,9 @@
 
 %changelog
 * Wed Jan 28 2009 Steve Dickson  <steved at redhat.com> 0.1.10-3
-- backwards compatibility: fix order of fields in TI-RPC's svc_req
-  (bz 481388)
+- backwards compatibility: fix order of fields in TI-RPC's 
+  svc_req (bz 481388)
+- Removed a number warnings.
 
 * Thu Jan 22 2009 Steve Dickson  <steved at redhat.com> 0.1.10-2
 - Header file fixes for C++



From jreznik at fedoraproject.org  Wed Jan 28 15:11:31 2009
From: jreznik at fedoraproject.org (Jaroslav Reznik)
Date: Wed, 28 Jan 2009 15:11:31 +0000 (UTC)
Subject: rpms/system-config-netboot/devel system-config-netboot.spec, 1.61, 
	1.62
Message-ID: <20090128151131.308E67010D@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-serv6788

Modified Files:
	system-config-netboot.spec 
Log Message:
* Wed Jan 28 2009 Jaroslav Reznik <jreznik at redhat.com> - 0.1.45.4-2
- release bump




Index: system-config-netboot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-netboot/devel/system-config-netboot.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- system-config-netboot.spec	28 Jan 2009 15:06:21 -0000	1.61
+++ system-config-netboot.spec	28 Jan 2009 15:11:00 -0000	1.62
@@ -2,7 +2,7 @@
 Summary: Network booting/install configuration utility (GUI)
 Name: system-config-netboot
 Version: 0.1.45.4
-Release: 1%{?dist}
+Release: 2%{?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
@@ -101,6 +101,9 @@
 %config(noreplace) %{_sysconfdir}/security/console.apps/system-config-netboot
 
 %changelog
+* Wed Jan 28 2009 Jaroslav Reznik <jreznik at redhat.com> - 0.1.45.4-2
+- release bump
+
 * Tue Jan 27 2009 Jaroslav Reznik <jreznik at redhat.com> - 0.1.45.4-1
 - merge review: fixes permissions (bz#226463)
  



From remi at fedoraproject.org  Wed Jan 28 15:13:22 2009
From: remi at fedoraproject.org (Remi Collet)
Date: Wed, 28 Jan 2009 15:13:22 +0000 (UTC)
Subject: rpms/php-pear-Net-Ping/devel .cvsignore, 1.4,
	1.5 php-pear-Net-Ping.spec, 1.3, 1.4 sources, 1.4, 1.5
Message-ID: <20090128151322.C3D297010D@cvs1.fedora.phx.redhat.com>

Author: remi

Update of /cvs/extras/rpms/php-pear-Net-Ping/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7296

Modified Files:
	.cvsignore php-pear-Net-Ping.spec sources 
Log Message:
    update to 2.4.4 (bugfix)


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Net-Ping/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	28 Dec 2007 22:12:03 -0000	1.4
+++ .cvsignore	28 Jan 2009 15:12:52 -0000	1.5
@@ -1 +1 @@
-Net_Ping-2.4.3.tgz
+Net_Ping-2.4.4.tgz


Index: php-pear-Net-Ping.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Net-Ping/devel/php-pear-Net-Ping.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- php-pear-Net-Ping.spec	28 Dec 2007 22:12:03 -0000	1.3
+++ php-pear-Net-Ping.spec	28 Jan 2009 15:12:52 -0000	1.4
@@ -2,7 +2,7 @@
 %define pear_name Net_Ping
 
 Name:           php-pear-Net-Ping
-Version:        2.4.3
+Version:        2.4.4
 Release:        1%{?dist}
 Summary:        Execute ping
 
@@ -26,6 +26,7 @@
 
 %prep
 %setup -q -c
+# package.xml is V2
 %{_bindir}/php -n %{SOURCE2} package.xml >CHANGELOG
 mv package.xml %{pear_name}-%{version}/%{pear_name}.xml
 
@@ -83,6 +84,9 @@
 
 
 %changelog
+* Wed Jan 28 2009 Remi Collet <Fedora at FamilleCollet.com> 2.4.4-1
+- update to 2.4.4 (bugfix)
+
 * Fri Dec 28 2007 Remi Collet <Fedora at FamilleCollet.com> 2.4.3-1
 - update to 2.4.3
 
@@ -100,3 +104,4 @@
 - initial RPM (generated specfile + cleanup)
 - add CHANGELOG and LICENSE
 - convert package.xml to package2.xml
+


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Net-Ping/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	28 Dec 2007 22:12:03 -0000	1.4
+++ sources	28 Jan 2009 15:12:52 -0000	1.5
@@ -1 +1 @@
-340ca27cfa1c0aab31991928d423cffb  Net_Ping-2.4.3.tgz
+572a4039c475beca53fa59ac4e407da8  Net_Ping-2.4.4.tgz



From pkgdb at fedoraproject.org  Wed Jan 28 15:17:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Jan 2009 15:17:35 +0000
Subject: [pkgdb] rhpl had group_acl changed
Message-ID: <20090128151735.83C21208485@bastion.fedora.phx.redhat.com>

katzj has set the commit acl on rhpl (Fedora devel) to Denied for provenpackager

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rhpl



From pkgdb at fedoraproject.org  Wed Jan 28 15:17:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Jan 2009 15:17:42 +0000
Subject: [pkgdb] rhpl had group_acl changed
Message-ID: <20090128151742.B1B8D208493@bastion.fedora.phx.redhat.com>

katzj has set the commit acl on rhpl (Fedora devel) to Approved for provenpackager

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rhpl



From pkgdb at fedoraproject.org  Wed Jan 28 15:20:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Jan 2009 15:20:48 +0000
Subject: [pkgdb] rhpl: msivak has requested commit
Message-ID: <20090128152048.5E691208493@bastion.fedora.phx.redhat.com>

msivak has requested the commit acl on rhpl (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rhpl



From pkgdb at fedoraproject.org  Wed Jan 28 15:20:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Jan 2009 15:20:49 +0000
Subject: [pkgdb] rhpl: msivak has requested watchcommits
Message-ID: <20090128152049.A411C208496@bastion.fedora.phx.redhat.com>

msivak has requested the watchcommits acl on rhpl (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rhpl



From pkgdb at fedoraproject.org  Wed Jan 28 15:20:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Jan 2009 15:20:50 +0000
Subject: [pkgdb] rhpl: msivak has requested watchbugzilla
Message-ID: <20090128152050.B726A208497@bastion.fedora.phx.redhat.com>

msivak has requested the watchbugzilla acl on rhpl (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rhpl



From pkgdb at fedoraproject.org  Wed Jan 28 15:22:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Jan 2009 15:22:10 +0000
Subject: [pkgdb] rhpl had acl change status
Message-ID: <20090128152210.6285C2084A7@bastion.fedora.phx.redhat.com>

katzj has set the watchcommits acl on rhpl (Fedora devel) to Approved for msivak

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rhpl



From pkgdb at fedoraproject.org  Wed Jan 28 15:22:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Jan 2009 15:22:11 +0000
Subject: [pkgdb] rhpl had acl change status
Message-ID: <20090128152212.1AC3C208495@bastion.fedora.phx.redhat.com>

katzj has set the watchbugzilla acl on rhpl (Fedora devel) to Approved for msivak

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rhpl



From pkgdb at fedoraproject.org  Wed Jan 28 15:22:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Jan 2009 15:22:13 +0000
Subject: [pkgdb] rhpl had acl change status
Message-ID: <20090128152213.672792084B6@bastion.fedora.phx.redhat.com>

katzj has set the commit acl on rhpl (Fedora devel) to Approved for msivak

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rhpl



From steved at fedoraproject.org  Wed Jan 28 15:22:54 2009
From: steved at fedoraproject.org (Steve Dickson)
Date: Wed, 28 Jan 2009 15:22:54 +0000 (UTC)
Subject: rpms/libtirpc/F-10 libtirpc-0.1.10-C++declares.patch, NONE,
	1.1 libtirpc-0.1.10-svcreq-compat.patch, NONE,
	1.1 libtirpc-0.1.10-warnings.patch, NONE, 1.1 libtirpc.spec,
	1.37, 1.38
Message-ID: <20090128152254.0E8F57010D@cvs1.fedora.phx.redhat.com>

Author: steved

Update of /cvs/pkgs/rpms/libtirpc/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8641

Modified Files:
	libtirpc.spec 
Added Files:
	libtirpc-0.1.10-C++declares.patch 
	libtirpc-0.1.10-svcreq-compat.patch 
	libtirpc-0.1.10-warnings.patch 
Log Message:
- backwards compatibility: fix order of fields in TI-RPC's 
  svc_req (bz 481388)
- Removed a number warnings.
- Header file fixes for C++


libtirpc-0.1.10-C++declares.patch:

--- NEW FILE libtirpc-0.1.10-C++declares.patch ---
commit 12129663ddc356aed44434aeda28ff1ce2dfc786
Author: Sandeep Josh <sdjres at yahoo.com>
Date:   Thu Jan 22 12:34:19 2009 -0500

    tirpc header file fixes for C++
    
    Added a __THROW to a couple extern declarations.
    
    Signed-off-by: Steve Dickson <steved at redhat.com>

diff --git a/tirpc/rpc/rpc.h b/tirpc/rpc/rpc.h
index 23e3197..f93479e 100644
--- a/tirpc/rpc/rpc.h
+++ b/tirpc/rpc/rpc.h
@@ -83,7 +83,7 @@
 
 __BEGIN_DECLS
 extern int get_myaddress(struct sockaddr_in *);
-extern int bindresvport(int, struct sockaddr_in *);
+extern int bindresvport(int, struct sockaddr_in *) __THROW;
 extern int registerrpc(int, int, int, char *(*)(char [UDPMSGSIZE]),
     xdrproc_t, xdrproc_t);
 extern int callrpc(const char *, int, int, int, xdrproc_t, void *,
diff --git a/tirpc/rpc/rpcent.h b/tirpc/rpc/rpcent.h
index eff86aa..1cee74c 100644
--- a/tirpc/rpc/rpcent.h
+++ b/tirpc/rpc/rpcent.h
@@ -62,8 +62,8 @@ __BEGIN_DECLS
 //extern struct rpcent *getrpcbyname(char *);
 //extern struct rpcent *getrpcbynumber(int);
 //extern struct rpcent *getrpcent(void);
-extern void setrpcent(int);
-extern void endrpcent(void);
+extern void setrpcent(int) __THROW;
+extern void endrpcent(void) __THROW;
 __END_DECLS
 
 #endif /* !_RPC_CENT_H */

libtirpc-0.1.10-svcreq-compat.patch:

--- NEW FILE libtirpc-0.1.10-svcreq-compat.patch ---
commit 2bb4c8d7ec8a98e1be9133d5901149a81ea9b5d9
Author: Chuck Lever <chuck.lever at oracle.com>
Date:   Wed Jan 28 09:19:07 2009 -0500

    backwards compatibility: fix order of fields in TI-RPC's svc_req
    
    Preserve ABI compatibility between glibc's RPC implementation and
    the legacy RPC implementation in libtirpc by moving the rq_xprt
    field in the TI-RPC version of the svc_req struct so it is
    backwards compatible with the legacy version of this structure.
    
    Linux's legacy svc_req struct, from /usr/include/rpc/svc.h, looks
    like this:
    
    struct svc_req {
      rpcprog_t rq_prog;		/* service program number */
      rpcvers_t rq_vers;		/* service protocol version */
      rpcproc_t rq_proc;		/* the desired procedure */
      struct opaque_auth rq_cred;	/* raw creds from the wire */
      caddr_t rq_clntcred;		/* read only cooked cred */
      SVCXPRT *rq_xprt;		/* associated transport */
    };
    
    The new TI-RPC svc_req struct, from /usr/include/tirpc/rpc/svc.h,
    looks like this:
    
    struct svc_req {
      u_int32_t rq_prog;		/* service program number */
      u_int32_t rq_vers;		/* service protocol version */
      u_int32_t rq_proc;		/* the desired procedure */
      struct opaque_auth rq_cred;	/* raw creds from the wire */
      void *rq_clntcred;		/* read only cooked cred */
      caddr_t rq_clntname;		/* read only client name */
      caddr_t rq_svcname;		/* read only cooked service cred */
      SVCXPRT *rq_xprt;		/* associated transport */
    };
    
    Note the extra fields rq_clntname and rq_svcname.  These are used for
    TI-RPC's RPCSEC GSS flavor support.
    
    This issue came to light because rpc.statd still uses only legacy RPC
    calls, and thus includes /usr/include/rpc/svc.h.  However, other parts
    of nfs-utils now link with TI-RPC, so the legacy RPC functions in
    libtirpc are used in favor of glibc's RPC functions.  The libtirpc svc
    functions use the new svc_req struct, but rpc.statd uses the old
    svc_req struct.
    
    Since the svc_req fields were different, rpc.statd broke after recent
    IPv6-related changes, even though I hadn't made any changes to it.
    Note that rpc.mountd also references the rq_xprt field, so it has the
    same issue.
    
    In most operating systems, there is only one rpc/svc.h and one version
    of svc_req so this is not a problem.  We should audit all of the
    structures and functions under /usr/include/rpc and
    /usr/include/tirpc/rpc to ensure we have a reasonable level of
    backwards compatibility until such a time it is decided to merge these
    implementations or get rid of RPC support in glibc.
    
    Signed-off-by: Chuck Lever <chuck.lever at oracle.com>
    Signed-off-by: Steve Dickson <steved at redhat.com>

diff --git a/tirpc/rpc/svc.h b/tirpc/rpc/svc.h
index ec5914f..ea2985d 100644
--- a/tirpc/rpc/svc.h
+++ b/tirpc/rpc/svc.h
@@ -131,14 +131,17 @@ typedef struct __rpc_svcxprt {
  * Service request
  */
 struct svc_req {
+	/* ORDER: compatibility with legacy RPC */
 	u_int32_t	rq_prog;	/* service program number */
 	u_int32_t	rq_vers;	/* service protocol version */
 	u_int32_t	rq_proc;	/* the desired procedure */
 	struct opaque_auth rq_cred;	/* raw creds from the wire */
 	void		*rq_clntcred;	/* read only cooked cred */
+	SVCXPRT		*rq_xprt;	/* associated transport */
+
+	/* New with TI-RPC */
 	caddr_t		rq_clntname;	/* read only client name */
 	caddr_t		rq_svcname;	/* read only cooked service cred */
-	SVCXPRT		*rq_xprt;	/* associated transport */
 };
 
 /*

libtirpc-0.1.10-warnings.patch:

--- NEW FILE libtirpc-0.1.10-warnings.patch ---
commit 5bc80ccd81e0c7ef185de34e7f34a7766bce0e27
Author: Steve Dickson <steved at redhat.com>
Date:   Wed Jan 28 09:56:10 2009 -0500

    Removed a number warnings by adding a number of type casts.
    
    Signed-off-by: Steve Dickson <steved at redhat.com>

diff --git a/src/auth_gss.c b/src/auth_gss.c
index 8f7919c..bf6cba6 100644
--- a/src/auth_gss.c
+++ b/src/auth_gss.c
@@ -221,7 +221,7 @@ authgss_create_default(CLIENT *clnt, char *service, struct rpc_gss_sec *sec)
 	sname.length = strlen(service);
 
 	maj_stat = gss_import_name(&min_stat, &sname,
-		GSS_C_NT_HOSTBASED_SERVICE,
+		(gss_OID)GSS_C_NT_HOSTBASED_SERVICE,
 		&name);
 
 	if (maj_stat != GSS_S_COMPLETE) {
diff --git a/src/authgss_prot.c b/src/authgss_prot.c
index 97724f1..be0d1a6 100644
--- a/src/authgss_prot.c
+++ b/src/authgss_prot.c
@@ -176,10 +176,11 @@ xdr_rpc_gss_unwrap_data(XDR *xdrs, xdrproc_t xdr_func, caddr_t xdr_ptr,
 	XDR		tmpxdrs;
 	gss_buffer_desc	databuf, wrapbuf;
 	OM_uint32	maj_stat, min_stat;
-	u_int		seq_num, conf_state, qop_state;
+	u_int		seq_num, qop_state;
+	int			conf_state;
 	bool_t		xdr_stat;
 
-	if (xdr_func == xdr_void || xdr_ptr == NULL)
+	if (xdr_func == (xdrproc_t)xdr_void || xdr_ptr == NULL)
 		return (TRUE);
 
 	memset(&databuf, 0, sizeof(databuf));
diff --git a/src/svc_auth_gss.c b/src/svc_auth_gss.c
index 346e5b1..9e9ff81 100644
--- a/src/svc_auth_gss.c
+++ b/src/svc_auth_gss.c
@@ -190,7 +190,7 @@ svcauth_gss_accept_sec_context(struct svc_req *rqst,
 	/* Deserialize arguments. */
 	memset(&recv_tok, 0, sizeof(recv_tok));
 
-	if (!svc_getargs(rqst->rq_xprt, xdr_rpc_gss_init_args,
+	if (!svc_getargs(rqst->rq_xprt, (xdrproc_t)xdr_rpc_gss_init_args,
 			 (caddr_t)&recv_tok))
 		return (FALSE);
 
@@ -469,8 +469,8 @@ _svcauth_gss(struct svc_req *rqst, struct rpc_msg *msg, bool_t *no_dispatch)
 
 		*no_dispatch = TRUE;
 
-		call_stat = svc_sendreply(rqst->rq_xprt, xdr_rpc_gss_init_res,
-					  (caddr_t)&gr);
+		call_stat = svc_sendreply(rqst->rq_xprt, 
+			(xdrproc_t)xdr_rpc_gss_init_res, (caddr_t)&gr);
 
 		if (!call_stat)
 			return (AUTH_FAILED);


Index: libtirpc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libtirpc/F-10/libtirpc.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- libtirpc.spec	20 Nov 2008 15:18:01 -0000	1.37
+++ libtirpc.spec	28 Jan 2009 15:22:23 -0000	1.38
@@ -1,6 +1,6 @@
 Name:		   libtirpc
 Version:		0.1.10
-Release:		1%{?dist}
+Release:		2%{?dist}
 Summary:		Transport Independent RPC Library
 Group:		  	System Environment/Libraries
 License:		SISSL
@@ -32,6 +32,9 @@
 
 Patch01:  libtirpc-0.1.10-dg-unlock.patch
 Patch02:  libtirpc-0.1.10-errmess-unlock.patch
+Patch03:  libtirpc-0.1.10-C++declares.patch
+Patch04:  libtirpc-0.1.10-svcreq-compat.patch
+Patch05:  libtirpc-0.1.10-warnings.patch
 
 Patch100: libtirpc-0.1.7-compile.patch
 
@@ -44,6 +47,9 @@
 %setup -q
 %patch01	-p1 
 %patch02	-p1
+%patch03	-p1
+%patch04	-p1
+%patch05	-p1
 
 %patch100	-p1
 
@@ -142,6 +148,12 @@
 %{_mandir}/*/*
 
 %changelog
+* Wed Jan 28 2009 Steve Dickson  <steved at redhat.com> 0.1.10-2
+- backwards compatibility: fix order of fields in TI-RPC's 
+  svc_req (bz 481388)
+- Removed a number warnings.
+- Header file fixes for C++
+
 * Thu Nov 20 2008 Steve Dickson  <steved at redhat.com> 0.1.10-1
 - Update to latest upstream release: 0.1.10
 



From jreznik at fedoraproject.org  Wed Jan 28 15:33:15 2009
From: jreznik at fedoraproject.org (Jaroslav Reznik)
Date: Wed, 28 Jan 2009 15:33:15 +0000 (UTC)
Subject: rpms/system-config-netboot/devel system-config-netboot.spec, 1.62, 
	1.63
Message-ID: <20090128153315.BD9BE7010D@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-serv10357

Modified Files:
	system-config-netboot.spec 
Log Message:
* Wed Jan 28 2009 Jaroslav Reznik <jreznik at redhat.com> - 0.1.45.4-3
- desktop file install




Index: system-config-netboot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-netboot/devel/system-config-netboot.spec,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- system-config-netboot.spec	28 Jan 2009 15:11:00 -0000	1.62
+++ system-config-netboot.spec	28 Jan 2009 15:32:45 -0000	1.63
@@ -2,7 +2,7 @@
 Summary: Network booting/install configuration utility (GUI)
 Name: system-config-netboot
 Version: 0.1.45.4
-Release: 2%{?dist}
+Release: 3%{?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
@@ -14,6 +14,7 @@
 Requires: %{name}-cmd = %{version}-%{release}
 Requires(post): hicolor-icon-theme
 BuildRequires: autoconf, automake, gettext, intltool, python, perl, perl-XML-Parser
+BuildRequires: desktop-file-utils
 #ExclusiveArch: i386 x86_64
 BuildArch: noarch
 Obsoletes: redhat-config-netboot <= 0.1.2-2
@@ -52,6 +53,11 @@
 rm -f %{buildroot}/docs/Makefile*
 %find_lang %name
 
+desktop-file-install --delete-original \
+   --dir %{buildroot}%{_datadir}/applications \
+   --add-category X-Red-Hat-Base \
+   %{buildroot}%{_datadir}/applications/system-config-netboot.desktop
+
 %post
 if [ "$1" -eq 1 ]; then
    /bin/touch --no-create %{_datadir}/icons/hicolor
@@ -101,6 +107,9 @@
 %config(noreplace) %{_sysconfdir}/security/console.apps/system-config-netboot
 
 %changelog
+* Wed Jan 28 2009 Jaroslav Reznik <jreznik at redhat.com> - 0.1.45.4-3
+- desktop file install
+
 * Wed Jan 28 2009 Jaroslav Reznik <jreznik at redhat.com> - 0.1.45.4-2
 - release bump
 



From ltinkl at fedoraproject.org  Wed Jan 28 15:41:12 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Wed, 28 Jan 2009 15:41:12 +0000 (UTC)
Subject: rpms/kdeedu/F-9 kdeedu.spec,1.112,1.113 sources,1.54,1.55
Message-ID: <20090128154112.33EFD7010D@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kdeedu/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12316

Modified Files:
	kdeedu.spec sources 
Log Message:
KDE 4.2.0



Index: kdeedu.spec
===================================================================
RCS file: /cvs/extras/rpms/kdeedu/F-9/kdeedu.spec,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -r1.112 -r1.113
--- kdeedu.spec	8 Jan 2009 23:14:28 -0000	1.112
+++ kdeedu.spec	28 Jan 2009 15:40:41 -0000	1.113
@@ -12,24 +12,20 @@
 %endif
 
 Name:    kdeedu
-Summary: Educational/Edutainment applications 
-Version: 4.1.4
-Release: 1%{?dist}
+Summary: Educational/Edutainment applications
+Version: 4.2.0
+Release: 2%{?dist}
 
 License: GPLv2
 Group:	 Amusements/Games
 URL:     http://www.kde.org/
-Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdeedu-%{version}.tar.bz2
+Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdeedu-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # http://bugzilla.redhat.com/371121
 Obsoletes: kalgebra < 1:0.7-7
 Provides:  kalgebra = 1:0.7-7
 
-# http://bugzilla.redhat.com/394011
-Obsoletes: marble < 1:0.5.1-1
-Provides:  marble = 1:0.5.1-1
-
 Obsoletes: kdeedu4 < %{version}-%{release}
 Provides:  kdeedu4 = %{version}-%{release}
 
@@ -37,18 +33,13 @@
 BuildRequires: boost-devel
 # CFITSIO Library is needed by KStars for many INDI drivers & for KStars FITS Viewer.
 BuildRequires: cfitsio-devel
-BuildRequires: cmake 
 BuildRequires: desktop-file-utils
 BuildRequires: eigen-devel
-BuildRequires: giflib-devel
 BuildRequires: gmm-devel
 BuildRequires: gpsd-devel
 BuildRequires: gsl-devel
-# for libplasma
-BuildRequires: kdebase-workspace-devel >= %{version}
-BuildRequires: kdelibs4-devel >= %{version}
+BuildRequires: plasma-devel >= %{version}
 # for macros.kde4
-BuildRequires: kde-filesystem
 BuildRequires: libnova-devel
 BuildRequires: libqalculate-devel
 BuildRequires: libusb-devel
@@ -59,17 +50,25 @@
 BuildRequires: ocaml-facile-devel
 %endif
 BuildRequires: openbabel-devel >= 2.2.0-0.4.b5
-BuildRequires: pcre-devel
 BuildRequires: python-devel python
 BuildRequires: readline-devel
+BuildRequires: python-devel
+
 ## BR's FIXME/TODO:
-#+ libsbigudrv, 1.00: SBIG Universal Driver is needed by KStars <http://indi.sourceforge.net/>
+#-- The following OPTIONAL packages could NOT be located on your system.
+#+ Experimental Python binding support for the Marble library: Experimental Python binding support for the Marble library <http://techbase.kde.org/Development/Languages/Python>
+#Experimental Python binding support for the Marble library. To activate it pass -DEXPERIMENTAL_PYTHON_BINDINGS=TRUE to cmake.
+#+ libindi, 0.6 or higher: A framework for controlling astronomical devices such as telescopes, CCDs, filter wheels..etc. <http://indi.sf.net>
+#Gives KStars support for controlling astronomical devices.
 
 %{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
 Requires: %{name}-libs = %{version}-%{release}
 # split pkgs, (temporary?) upgrade path -- Rex
 Requires: %{name}-kstars = %{version}-%{release}
+Requires: %{name}-marble = %{version}-%{release}
 Requires: %{name}-math = %{version}-%{release}
+# khangman
+Requires: dustin-dustismo-roman-fonts
 Requires(post): xdg-utils
 Requires(postun): xdg-utils
 
@@ -82,10 +81,9 @@
 * khangman: Hangman Game
 * kiten: Japanese Reference/Study Tool
 * klettres: French alphabet tutor
-* ktouch: Learn and practice touch typing 
+* ktouch: Learn and practice touch typing
 * kturtle: Logo Programming Environment
 * kwordquiz: Flashcard and vocabulary learning
-* marble: A World Atlas 
 * parley: Vocabulary Trainer
 * step: Interactive physical simulator
 
@@ -97,28 +95,41 @@
 
 %package devel
 Group:    Development/Libraries
-Summary:  Developer files for %{name} 
+Summary:  Developer files for %{name}
 Requires: %{name}-libs = %{version}-%{release}
+# libmarble
+Requires: %{name}-marble = %{version}-%{release}
 Obsoletes: kdeedu4-devel < %{version}-%{release}
 Provides:  kdeedu4-devel = %{version}-%{release}
 # http://bugzilla.redhat.com/394011
 Obsoletes: marble-devel < 1:0.5.1-1
-Provides:  marble-devel = 1:0.5.1-1
+Provides:  marble-devel = 1:0.7-%{release}
 Requires: kdelibs4-devel
-Requires: giflib-devel
-Requires: pcre-devel
 %description devel
 %{summary}.
 
 %package kstars
 Group:   Amusements/Games
-Summary: Desktop Planetarium 
+Summary: Desktop Planetarium
 Requires: %{name}-libs = %{version}-%{release}
 Requires(post): xdg-utils
 Requires(postun): xdg-utils
 %description kstars
 %{summary}.
 
+%package marble 
+Summary: A World Atlas
+Group:   Amusements/Games
+# http://bugzilla.redhat.com/394011
+Obsoletes: marble < 1:0.5.1-1
+Provides:  marble = 1:0.7-%{release}
+Requires: %{name}-libs = %{version}-%{release}
+Requires(post): xdg-utils
+Requires(postun): xdg-utils
+%description marble 
+%{summary}.
+
+
 %package math
 Group:	 Amusements/Games
 Summary: Math applications
@@ -129,10 +140,9 @@
 %description math
 Educational/Edutainment Math applications:
 * kalgebra: MathML-based graph calculator
-* kbruch: Exercise Fractions
+* kbruch: Exercise Fractions and Percentages
 * kig: Interactive Geometry
 * kmplot: Mathematical Function Plotter
-* kpercentage: Excersize Percentages
 
 
 %prep
@@ -152,19 +162,22 @@
 %install
 rm -rf %{buildroot}
 
-make install DESTDIR=%{buildroot} -C %{_target_platform}
+make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
 # #unpackaged files
 # omit stuff for which there isn't a clear public API
 rm -f %{buildroot}%{_kde4_libdir}/lib{SatLib,analitza,compoundviewer,htmesh,sbigudrv}.{a,so}
 
+# omti dustismo roman font
+rm -f %{buildroot}%{_kde4_appsdir}/khangman/fonts/Dustismo_Roman.ttf
+
 
 %post
 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 
+%postun
 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 || :
@@ -179,10 +192,18 @@
 %postun kstars
 xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
 
-%post math 
+%post marble 
+/sbin/ldconfig
+xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
+
+%postun marble 
+/sbin/ldconfig
+xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
+
+%post math
 xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
 
-%postun math 
+%postun math
 xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
 
 
@@ -195,7 +216,6 @@
 # FIXME/TODO : sort file list into per-app sections. ? -- Rex
 %{_kde4_bindir}/blinken
 %{_kde4_bindir}/geodatatest
-%{_kde4_bindir}/indi*
 %{_kde4_bindir}/kalzium
 %{_kde4_bindir}/kanagram
 %{_kde4_bindir}/kgeography
@@ -207,7 +227,6 @@
 %{_kde4_bindir}/ktouch
 %{_kde4_bindir}/kturtle
 %{_kde4_bindir}/kwordquiz
-%{_kde4_bindir}/marble
 %{_kde4_bindir}/parley
 %{_kde4_bindir}/step
 %{_kde4_bindir}/tilecreator
@@ -226,19 +245,22 @@
 %{_kde4_appsdir}/kturtle/
 %{_kde4_appsdir}/kvtml/
 %{_kde4_appsdir}/kwordquiz/
-%{_kde4_appsdir}/marble/
-%{_kde4_appsdir}/marble_part/
 %{_kde4_appsdir}/parley/
 %{_kde4_appsdir}/step/
 
-%{_kde4_datadir}/kde4/services/marble_part.desktop
+%{_kde4_datadir}/kde4/services/plasma-applet-kworldclock.desktop
 %{_kde4_datadir}/kde4/services/plasma-dataengine-parley.desktop
 %{_kde4_datadir}/kde4/services/plasma_parley.desktop
+%{_kde4_datadir}/kde4/services/plasma-dataengine-kalzium.desktop
+%{_kde4_datadir}/kde4/services/plasma_didyouknow.desktop
 
-%{_kde4_libdir}/kde4/libmarble_part.so
 %{_kde4_libdir}/kde4/plasma_applet_kalgebra.so
+%{_kde4_libdir}/kde4/plasma_applet_worldclock.so
 %{_kde4_libdir}/kde4/plasma_applet_parley.so
 %{_kde4_libdir}/kde4/plasma_engine_parley.so
+%{_kde4_libdir}/kde4/plasma_applet_didyouknow.so
+%{_kde4_libdir}/kde4/plasma_engine_kalzium.so
+
 %{_kde4_datadir}/applications/kde4/blinken.desktop
 %{_kde4_datadir}/applications/kde4/kalzium.desktop
 %{_kde4_datadir}/applications/kde4/kanagram.desktop
@@ -249,7 +271,6 @@
 %{_kde4_datadir}/applications/kde4/ktouch.desktop
 %{_kde4_datadir}/applications/kde4/kturtle.desktop
 %{_kde4_datadir}/applications/kde4/kwordquiz.desktop
-%{_kde4_datadir}/applications/kde4/marble.desktop
 %{_kde4_datadir}/applications/kde4/parley.desktop
 %{_kde4_datadir}/applications/kde4/step.desktop
 
@@ -264,7 +285,6 @@
 %{_kde4_datadir}/config.kcfg/ktouch.kcfg
 %{_kde4_datadir}/config.kcfg/kwordquiz.kcfg
 %{_kde4_datadir}/config.kcfg/languagesettings.kcfg
-%{_kde4_datadir}/config.kcfg/marble.kcfg
 %{_kde4_datadir}/config.kcfg/parley.kcfg
 %{_kde4_datadir}/config.kcfg/step.kcfg
 %{_kde4_datadir}/config/kalzium.knsrc
@@ -285,7 +305,6 @@
 %{_kde4_docdir}/HTML/en/ktouch/
 %{_kde4_docdir}/HTML/en/kturtle
 %{_kde4_docdir}/HTML/en/kwordquiz/
-%{_kde4_docdir}/HTML/en/marble/
 %{_kde4_docdir}/HTML/en/parley/
 %{_kde4_docdir}/HTML/en/step/
 
@@ -299,28 +318,25 @@
 %{_kde4_iconsdir}/hicolor/*/*/ktouch.*
 %{_kde4_iconsdir}/hicolor/*/*/kturtle.*
 %{_kde4_iconsdir}/hicolor/*/*/kwordquiz.*
-%{_kde4_iconsdir}/hicolor/*/*/marble.*
 %{_kde4_iconsdir}/hicolor/*/*/parley*.*
 %{_kde4_iconsdir}/hicolor/*/*/step.*
 %{_kde4_iconsdir}/oxygen/*/*/*
 
-%{_kde4_libdir}/avogadro-kalzium/
-# marble
-%{_kde4_libdir}/libcompoundviewer.so.*
+%{_mandir}/man1/kalzium.*
+%{_mandir}/man1/ktouch.*
+%{_mandir}/man6/khangman.*
 
-%files libs 
+%files libs
 %defattr(-,root,root,-)
 %doc COPYING README
 %{_kde4_libdir}/libanalitza.so.*
+%{_kde4_libdir}/avogadro-kalzium/
 %{_kde4_libdir}/libavogadro-kalzium.so.*
+%{_kde4_appsdir}/libkdeedu/
 %{_kde4_libdir}/libkdeedu*.so.*
 %{_kde4_libdir}/libkeduvocdocument.so.*
 %{_kde4_libdir}/libkiten.so.*
-%{_kde4_libdir}/libmarble*.so.*
-%{_kde4_libdir}/libsbigudrv.so.*
 %{_kde4_libdir}/libscience.so.*
-%{_kde4_appsdir}/libkdeedu/
-%{_kde4_libdir}/kde4/plugins/marble/
 
 %files devel
 %defattr(-,root,root,-)
@@ -332,8 +348,8 @@
 %{_kde4_libdir}/libkdeedu*.so
 %{_kde4_libdir}/libkeduvocdocument.so
 %{_kde4_libdir}/libkiten.so
-%{_kde4_libdir}/libmarble*.so
 %{_kde4_libdir}/libscience.so
+%{_kde4_libdir}/libmarble*.so
 %{_kde4_libdir}/kde4/plugins/designer/kalziumuiwidgets.so
 
 %files kstars
@@ -347,6 +363,21 @@
 %{_kde4_iconsdir}/hicolor/*/*/kstars.*
 %{_kde4_libdir}/libSatLib.so.*
 
+%files marble
+%defattr(-,root,root,-)
+%{_kde4_appsdir}/marble/
+%{_kde4_appsdir}/marble_part/
+%{_kde4_bindir}/marble
+%{_kde4_datadir}/applications/kde4/marble.desktop
+%{_kde4_datadir}/config.kcfg/marble.kcfg
+%{_kde4_datadir}/kde4/services/marble_part.desktop
+%{_kde4_docdir}/HTML/en/marble/
+%{_kde4_libdir}/libcompoundviewer.so.*
+%{_kde4_libdir}/libmarble*.so.*
+%{_kde4_libdir}/kde4/libmarble_part.so
+%{_kde4_libdir}/kde4/plugins/marble/
+%{_kde4_iconsdir}/hicolor/*/*/marble.*
+
 %files math
 %defattr(-,root,root,-)
 %doc COPYING README
@@ -355,7 +386,6 @@
 %{_kde4_bindir}/kbruch
 %{_kde4_bindir}/kig
 %{_kde4_bindir}/kmplot
-%{_kde4_bindir}/kpercentage
 %{_kde4_bindir}/pykig.*
 %{_kde4_libdir}/kde4/kigpart.*
 %{_kde4_libdir}/kde4/libkmplotpart.*
@@ -363,11 +393,9 @@
 %{_kde4_datadir}/applications/kde4/kbruch.desktop
 %{_kde4_datadir}/applications/kde4/kig.desktop
 %{_kde4_datadir}/applications/kde4/kmplot.desktop
-%{_kde4_datadir}/applications/kde4/kpercentage.desktop
 %{_kde4_datadir}/config.kcfg/kbruch.kcfg
 %{_kde4_datadir}/config.kcfg/kmplot.kcfg
 %{_datadir}/dbus-1/interfaces/org.kde.kmplot.*
-%{_kde4_docdir}/HTML/en/kpercentage/
 %{_kde4_docdir}/HTML/en/kalgebra/
 %{_kde4_docdir}/HTML/en/kbruch/
 %{_kde4_docdir}/HTML/en/kig/
@@ -376,21 +404,88 @@
 %{_kde4_iconsdir}/hicolor/*/*/kbruch.*
 %{_kde4_iconsdir}/hicolor/*/*/kig.*
 %{_kde4_iconsdir}/hicolor/*/*/kmplot.*
-%{_kde4_iconsdir}/hicolor/*/*/kpercentage.*
 %{_kde4_iconsdir}/hicolor/*/*/application-x-kig.*
 %{_kde4_appsdir}/katepart/syntax/python-kig.xml
 %{_kde4_appsdir}/kbruch/
 %{_kde4_appsdir}/kig/
 %{_kde4_appsdir}/kmplot/
-%{_kde4_appsdir}/kpercentage/
 %{_kde4_datadir}/kde4/services/kalgebraplasmoid.desktop
 %{_kde4_datadir}/kde4/services/kig_part.desktop
 %{_kde4_datadir}/kde4/services/kmplot_part.desktop
+%{_mandir}/man1/kbruch.*
+%{_mandir}/man1/kig.*
+%{_mandir}/man1/kmplot.*
 
 
 %changelog
-* Thu Jan  8 2009 Luk???? Tinkl <ltinkl at redhat.com> 4.1.4-1
-- KDE 4.1.4
+* Sat Jan 24 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.0-2
+- Requires: dustin-dustismo-roman-fonts
+
+* Thu Jan 22 2009 Than Ngo <than at redhat.com> - 4.2.0-1
+- 4.2.0
+
+* Mon Jan 12 2009 Rex Dieter <rdieter at fedoraproject.org> 4.1.96-4
+- drop extraneous giflib pcre deps
+
+* Mon Jan 12 2009 Rex Dieter <rdieter at fedoraproject.org> 4.1.96-3
+- sane marble packaging (#470577)
+- use system dustismo-roman font (#477406)
+
+* Fri Jan 09 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.96-2
+- drop upstreamed cfitsio patch
+- package manpages
+
+* Wed Jan 07 2009 Than Ngo <than at redhat.com> 4.1.96-1
+- 4.2rc1
+
+* Thu Dec 18 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.85-5
+- and fix cfitsio detection yet again (upstream revision 898747)
+
+* Thu Dec 18 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.85-4
+- respin (upstreamable) cfitsio patch
+
+* Thu Dec 18 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.85-3
+- fix cfitsio detection yet again
+
+* Thu Dec 18 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.85-2
+- rebuild for new boost
+
+* Fri Dec 12 2008 Than Ngo <than at redhat.com> 4.1.85-1
+- 4.2beta2
+
+* Fri Dec 05 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.80-9
+- rebuild for fixed kde-filesystem (macros.kde4) (get rid of rpaths)
+
+* Thu Dec 04 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 4.1.80-8
+- Rebuild for Python 2.6
+
+* Tue Dec 02 2008 Steven M. Parrish <smparrish at shallowcreek.net> 4.1.80-7
+- rebuild for gmm 3.1 
+
+* Mon Dec 01 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.80-6
+- rebuild for Python 2.6
+
+* Mon Dec 01 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.80-5
+- BR plasma-devel instead of kdebase-workspace-devel
+- fix file list
+
+* Sun Nov 30 2008 Lorenzo Villani <lvillani at binaryhelix.net> - 4.1.80-4
+- adjust file lists (and fix build)
+
+* Thu Nov 20 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.80-3
+- readd kbruch, has been reenabled in 4.1.80
+- remove kpercentage, has been dropped in favor of percentage exercises newly
+  added to kbruch
+
+* Thu Nov 20 2008 Than Ngo <than at redhat.com> 4.1.80-2
+- merged
+
+* Thu Nov 20 2008 Lorenzo Villani <lvillani at binaryhelix.net> - 4.1.80-1
+- 4.1.80
+- BR cmake 2.6.2
+- BR python-devel
+- make install/fast
+- drop kbruch and related files from filelists
 
 * Mon Nov 10 2008 Luk???? Tinkl <ltinkl at redhat.com> 4.1.3-1
 - KDE 4.1.3
@@ -533,7 +628,7 @@
 - kde-3.96.0
 
 * Fri Nov 09 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.95.2-1
-- kdeedu-3.95.2 
+- kdeedu-3.95.2
 - resume ppc, ppc64 builds (#370771)
 
 * Wed Nov 07 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.95.0-4
@@ -603,7 +698,7 @@
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 3.5.1-1.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 
-* Sat Feb 04 2006 Than Ngo <than at redhat.com> 3.5.1-1 
+* Sat Feb 04 2006 Than Ngo <than at redhat.com> 3.5.1-1
 - 3.5.1
 
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
@@ -613,7 +708,7 @@
 - 3.5 final
 
 * Fri Nov 11 2005 Than Ngo <than at redhat.com> 3.4.92-2
-- fix #172887 
+- fix #172887
 
 * Tue Oct 25 2005 Than Ngo <than at redhat.com> 3.4.92-1
 - update to 3.5 beta2
@@ -643,7 +738,7 @@
 * Fri Mar 04 2005 Than Ngo <than at redhat.com> 3.4.0-0.rc1.2
 - rebuilt against gcc-4.0.0-0.31
 
-* Tue Mar 01 2005 Than Ngo <than at redhat.com> 3.4.0-0.rc1.1 
+* Tue Mar 01 2005 Than Ngo <than at redhat.com> 3.4.0-0.rc1.1
 - 3.4.0 rc1
 
 * Wed Feb 16 2005 Than Ngo <than at redhat.com> 3.3.92-0.1
@@ -778,7 +873,7 @@
 * Fri Aug  9 2002 Than Ngo <than at redhat.com> 3.0.2-3
 - desktop file issues
 - fixed a bug in install (bug #69414)
- 
+
 * Tue Jul 23 2002 Tim Powers <timp at redhat.com> 3.0.2-2
 - build using gcc-3.2-0.1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdeedu/F-9/sources,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- sources	8 Jan 2009 22:53:26 -0000	1.54
+++ sources	28 Jan 2009 15:40:41 -0000	1.55
@@ -1 +1 @@
-28840fa475571184994824d12a0b7684  kdeedu-4.1.4.tar.bz2
+aaddbdab29e1d284ad8ee67a78b4c597  kdeedu-4.2.0.tar.bz2



From ltinkl at fedoraproject.org  Wed Jan 28 15:43:27 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Wed, 28 Jan 2009 15:43:27 +0000 (UTC)
Subject: rpms/kdegames/F-9 kdegames.spec,1.97,1.98 sources,1.58,1.59
Message-ID: <20090128154327.E26A07010D@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kdegames/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12672

Modified Files:
	kdegames.spec sources 
Log Message:
KDE 4.2.0



Index: kdegames.spec
===================================================================
RCS file: /cvs/extras/rpms/kdegames/F-9/kdegames.spec,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -r1.97 -r1.98
--- kdegames.spec	9 Jan 2009 00:05:00 -0000	1.97
+++ kdegames.spec	28 Jan 2009 15:42:57 -0000	1.98
@@ -1,15 +1,14 @@
-%define _default_patch_fuzz 2
 %{!?_ggz_datadir:%define _ggz_datadir %(ggz-config --datadir >& /dev/null ||:)}
 
 Name:    kdegames
 Summary: K Desktop Environment 4 - Games
 Epoch:   6
-Version: 4.1.4
+Version: 4.2.0
 Release: 1%{?dist}
 
 License: GPLv2
 URL:     http://www.kde.org/
-Group:   Amusements/Games 
+Group:   Amusements/Games
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdegames-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -22,11 +21,9 @@
 Obsoletes: ksirk < %{version}-%{release}
 Provides:  ksirk = %{version}-%{release}
 
-BuildRequires: cmake 
 BuildRequires: ggz-client-libs-devel
 BuildRequires: kdelibs4-devel >= %{version}
-# for macros.kde4
-BuildRequires: kde-filesystem
+BuildRequires: qca2-devel
 
 %{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
 Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}
@@ -36,7 +33,9 @@
 
 %description
 Games for the K Desktop Environment 4, including:
+* bomber
 * bovo
+* kapman
 * katomic
 * kbackgammon
 * kbattleship
@@ -47,6 +46,7 @@
 * kdiamond
 * kfourinline
 * kgoldrunner
+* killbots
 * kiriki
 * kjumpingcube
 * klines
@@ -103,7 +103,7 @@
 %install
 rm -rf %{buildroot}
 
-make install DESTDIR=%{buildroot} -C %{_target_platform}
+make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
 # HACK, FIXME
 install -m644 -p -D ./kbattleship/src/module.dsc %{buildroot}%{_ggz_datadir}/kbattleship.dsc
@@ -130,7 +130,7 @@
 %{_ggz_config} --remove --modfile=%{_ggz_datadir}/ksquares.dsc ||:
 fi
 
-%postun 
+%postun
 xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
 xdg-icon-resource forceupdate --theme locolor 2> /dev/null || :
 xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || :
@@ -152,6 +152,8 @@
 %{_kde4_appsdir}/*
 %exclude %{_kde4_appsdir}/cmake/
 %{_kde4_configdir}/*
+%{_kde4_datadir}/sounds/*.ogg
+%{_kde4_datadir}/sounds/*/*.ogg
 %{_kde4_datadir}/applications/kde4/*
 %{_kde4_datadir}/config.kcfg/*
 %{_kde4_docdir}/HTML/en/*
@@ -162,7 +164,7 @@
 %{_ggz_datadir}/kreversi.dsc
 %{_ggz_datadir}/ksquares.dsc
 
-%files libs 
+%files libs
 %defattr(-,root,root,-)
 %doc COPYING
 %{_kde4_libdir}/lib*.so.*
@@ -175,11 +177,33 @@
 
 
 %changelog
-* Fri Jan  9 2009 Luk???? Tinkl <ltinkl at redhat.com> 4.1.4-1
-- KDE 4.1.4
+* Thu Jan 22 2009 Than Ngo <than at redhat.com> - 4.2.0-1
+- 4.2.0
 
-* Wed Nov  5 2008 Luk???? Tinkl <ltinkl at redhat.com> 4.1.3-1
-- KDE 4.1.3
+* Wed Jan 07 2009 Than Ngo <than at redhat.com> - 4.1.96-1
+- 4.2rc1
+
+* Fri Dec 12 2008 <than at redhat.com> 4.1.85-1
+- 4.2beta2
+
+* Fri Dec 05 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 6:4.1.80-4
+- rebuild for fixed kde-filesystem (macros.kde4) (get rid of rpaths)
+
+* Thu Dec 04 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 6:4.1.80-3
+- add missing BR qca2-devel (for ksirk)
+- add killbots, kapman and bomber to the description
+
+* Thu Nov 20 2008 Than Ngo <than at redhat.com> 4.1.80-2
+- merged
+
+* Thu Nov 20 2008 Lorenzo Villani <lvillani at binaryhelix.net> 6:4.1.80-1
+- 4.1.80
+- BR cmake >= 2.6.2
+- make install/fast
+- drop _default_patch_fuzz 2
+
+* Wed Nov 12 2008 Than Ngo <than at redhat.com> 4.1.3-1
+- 4.1.3
 
 * Mon Sep 29 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-2
 - make VERBOSE=1
@@ -318,7 +342,7 @@
 - cleanup
 
 * Tue Mar 06 2007 Than Ngo <than at redhat.com> - 6:3.5.6-2.fc7
-- cleanup 
+- cleanup
 
 * Wed Feb 07 2007 Than Ngo <than at redhat.com> 6:3.5.6-1.fc7
 - 3.5.6
@@ -351,7 +375,7 @@
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 6:3.5.1-1.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 
-* Fri Feb 03 2006 Than Ngo <than at redhat.com> 6:3.5.1-1 
+* Fri Feb 03 2006 Than Ngo <than at redhat.com> 6:3.5.1-1
 - 3.5.1
 
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
@@ -396,7 +420,7 @@
 * Mon Oct 18 2004 Than Ngo <than at redhat.com> 6:3.3.1-2
 - add missing klickety icons #135614
 
-* Wed Oct 13 2004 Than Ngo <than at redhat.com> 6:3.3.1-1 
+* Wed Oct 13 2004 Than Ngo <than at redhat.com> 6:3.3.1-1
 - update to 3.3.1
 
 * Fri Oct 08 2004 Than Ngo <than at redhat.com> 6:3.3.0-2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdegames/F-9/sources,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- sources	9 Jan 2009 00:05:00 -0000	1.58
+++ sources	28 Jan 2009 15:42:57 -0000	1.59
@@ -1 +1 @@
-b18b4b89c83ea20a76bab5fac03bcc0b  kdegames-4.1.4.tar.bz2
+68cefd627025be99ba136e5a4e35e554  kdegames-4.2.0.tar.bz2



From notting at fedoraproject.org  Wed Jan 28 15:47:10 2009
From: notting at fedoraproject.org (Bill Nottingham)
Date: Wed, 28 Jan 2009 15:47:10 +0000 (UTC)
Subject: rpms/kernel/devel kernel.spec,1.1239,1.1240
Message-ID: <20090128154710.BB6047010D@cvs1.fedora.phx.redhat.com>

Author: notting

Update of /cvs/extras/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13429

Modified Files:
	kernel.spec 
Log Message:
Conflict with older squashfs-tools.



Index: kernel.spec
===================================================================
RCS file: /cvs/extras/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1239
retrieving revision 1.1240
diff -u -r1.1239 -r1.1240
--- kernel.spec	28 Jan 2009 07:50:25 -0000	1.1239
+++ kernel.spec	28 Jan 2009 15:46:39 -0000	1.1240
@@ -409,7 +409,7 @@
 # problems with the newer kernel or lack certain things that make
 # integration in the distro harder than needed.
 #
-%define package_conflicts initscripts < 7.23, udev < 063-6, iptables < 1.3.2-1, ipw2200-firmware < 2.4, iwl4965-firmware < 228.57.2, selinux-policy-targeted < 1.25.3-14
+%define package_conflicts initscripts < 7.23, udev < 063-6, iptables < 1.3.2-1, ipw2200-firmware < 2.4, iwl4965-firmware < 228.57.2, selinux-policy-targeted < 1.25.3-14, squashfs-tools < 4.0
 
 #
 # The ld.so.conf.d file we install uses syntax older ldconfig's don't grok.



From ltinkl at fedoraproject.org  Wed Jan 28 15:47:26 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Wed, 28 Jan 2009 15:47:26 +0000 (UTC)
Subject: rpms/kdemultimedia/F-9 kdemultimedia.spec, 1.119, 1.120 sources,
	1.54, 1.55
Message-ID: <20090128154726.897AC7010D@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kdemultimedia/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13491

Modified Files:
	kdemultimedia.spec sources 
Log Message:
KDE 4.2.0



Index: kdemultimedia.spec
===================================================================
RCS file: /cvs/extras/rpms/kdemultimedia/F-9/kdemultimedia.spec,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -r1.119 -r1.120
--- kdemultimedia.spec	9 Jan 2009 01:03:28 -0000	1.119
+++ kdemultimedia.spec	28 Jan 2009 15:46:56 -0000	1.120
@@ -1,7 +1,7 @@
 Name: kdemultimedia
 Epoch: 6
-Version: 4.1.4
-Release: 1%{?dist}
+Version: 4.2.0
+Release: 1%{?dist}.1
 Summary: K Desktop Environment - Multimedia applications
 
 Group:     Applications/Multimedia
@@ -16,19 +16,16 @@
 
 BuildRequires: alsa-lib-devel
 BuildRequires: cdparanoia-devel cdparanoia
-BuildRequires: cmake
 BuildRequires: flac-devel
 BuildRequires: giflib-devel
-BuildRequires: kde-filesystem >= 4
-BuildRequires: kdelibs4-devel >= %{version}
 BuildRequires: kdebase-workspace-devel >= %{version}
-BuildRequires: libmusicbrainz-devel
 BuildRequires: libtheora-devel
-BuildRequires: libtunepimp-devel
+## needed to build Kscd, keep for now -- Kevin
+BuildRequires: libtunepimp-devel libmusicbrainz-devel
 BuildRequires: libvorbis-devel
 BuildRequires: pcre-devel
 BuildRequires: taglib-devel
-BuildRequires: xine-lib-devel
+BuildRequires: xine-lib-devel libxcb-devel
 
 Requires(post): xdg-utils
 Requires(postun): xdg-utils
@@ -53,10 +50,7 @@
 License: LGPLv2+ and GPLv2+
 Summary: Runtime libraries for %{name}
 Group:   System Environment/Libraries
-Obsoletes: %{name}-extras-libs < %{?epoch:%{epoch}:}%{version}-%{release} 
-
-# force replacing old standalone dragonplayer with the main package
-# otherwise, dragonplayer conflicts with this over dragonpart.so
+Obsoletes: %{name}-extras-libs < %{?epoch:%{epoch}:}%{version}-%{release}
 Conflicts: dragonplayer < 2.0.2-0.1
 
 %description libs
@@ -64,10 +58,10 @@
 
 %package devel
 Group:    Development/Libraries
-Summary:  Developer files for %{name} 
+Summary:  Developer files for %{name}
 License:  LGPLv2+ and GPLv2+
 Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: kdelibs4-devel kdebase-workspace-devel
+Requires: kdelibs4-devel
 %description devel
 %{summary}.
 
@@ -78,7 +72,7 @@
 
 %build
 
-mkdir -p %{_target_platform} 
+mkdir -p %{_target_platform}
 pushd %{_target_platform}
 %{cmake_kde4} ..
 popd
@@ -89,7 +83,7 @@
 %install
 rm -rf %{buildroot}
 
-make install DESTDIR=%{buildroot} -C %{_target_platform}
+make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
 
 %clean
@@ -119,6 +113,8 @@
 %{_kde4_appsdir}/kconf_update/*
 %{_kde4_appsdir}/konqsidebartng/
 %{_kde4_appsdir}/profiles/*
+%{_kde4_appsdir}/kscd/skin/
+%{_kde4_appsdir}/solid/actions/dragonplayer-opendvd.desktop
 %{_kde4_configdir}/dragonplayerrc
 %{_kde4_datadir}/applications/kde4/*
 %{_kde4_datadir}/autostart/*
@@ -129,8 +125,10 @@
 %{_kde4_docdir}/HTML/en/juk/
 %{_kde4_docdir}/HTML/en/kmix/
 %{_kde4_docdir}/HTML/en/kscd/
+%{_kde4_docdir}/HTML/en/kioslave/
 %{_kde4_iconsdir}/hicolor/*/*/*
 %{_kde4_iconsdir}/oxygen/*/actions/player-volume-muted.*
+%{_kde4_iconsdir}/oxygen/*/actions/kscd-dock.*
 %{_kde4_libdir}/libkdeinit*.so
 
 %files libs
@@ -148,13 +146,35 @@
 
 
 %changelog
-* Fri Jan  9 2009 Luk???? Tinkl <ltinkl at redhat.com> 4.1.4-1
-- KDE 4.1.4
+* Thu Jan 22 2009 Than Ngo <than at redhat.com> - 4.2.0-1
+- 4.2.0
+
+* Wed Jan 07 2009 Than Ngo <than at redhat.com> - 4.1.96-1
+- 4.2rc1
+
+* Sat Dec 13 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.85-2
+- restore BR libtunepimp-devel libmusicbrainz-devel for now, needed by Kscd
+
+* Fri Dec 12 2008 Than Ngo <than at redhat.com> 4.1.85-1
+- 4.2beta2
 
-* Thu Nov 20 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.3-2
+* Fri Nov 28 2008 Lorenzo Villani <lvillani at binaryhelix.net> - 6:4.1.80-3
+- dragon documentation disappeared (at least with my mock build), update file
+  lists
+- add kioslave documentation to file lists
+
+* Thu Nov 20 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.80-3
 - -devel: drop Req: kdebase-workspace-devel
 
-* Wed Nov 12 2008 Than Ngo <than at redhat.com>  4.1.3-1
+* Thu Nov 20 2008 Than Ngo <than at redhat.com> 4.1.80-2
+- merged
+
+* Thu Nov 20 2008 Lorenzo Villani <lvillani at binaryhelix.net> - 6:4.1.80-1
+- 4.1.80
+- BR cmake >= 2.6.2
+- make install/fast
+
+* Wed Nov 12 2008 Than Ngo <than at redhat.com> 4.1.3-1
 - 4.1.3
 
 * Mon Sep 29 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-2
@@ -165,7 +185,7 @@
 - 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 
+- 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


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdemultimedia/F-9/sources,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- sources	9 Jan 2009 01:03:28 -0000	1.54
+++ sources	28 Jan 2009 15:46:56 -0000	1.55
@@ -1 +1 @@
-4a4e046f0b862e7be9e916e0e29ed188  kdemultimedia-4.1.4.tar.bz2
+3e944c87888ac1ac5b11d3722dd31f88  kdemultimedia-4.2.0.tar.bz2



From jwrdegoede at fedoraproject.org  Wed Jan 28 15:47:48 2009
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Wed, 28 Jan 2009 15:47:48 +0000 (UTC)
Subject: rpms/iscsi-initiator-utils/devel
	open-iscsi-2.0-870.1-add-libiscsi.patch, NONE,
	1.1 open-iscsi-2.0-870.1-no-exit.patch, NONE,
	1.1 iscsi-initiator-utils.spec, 1.35, 1.36
Message-ID: <20090128154748.71BBA7010D@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-serv13705

Modified Files:
	iscsi-initiator-utils.spec 
Added Files:
	open-iscsi-2.0-870.1-add-libiscsi.patch 
	open-iscsi-2.0-870.1-no-exit.patch 
Log Message:
* Wed Jan 28 2009 Hans de Goede <hdegoede at redhat.com> 6.2.0.870-2
- Add libiscsi iscsi administartion library and -devel subpackage


open-iscsi-2.0-870.1-add-libiscsi.patch:

--- NEW FILE open-iscsi-2.0-870.1-add-libiscsi.patch ---
diff -urN open-iscsi-2.0-870.1.orig/libiscsi/Makefile open-iscsi-2.0-870.1/libiscsi/Makefile
--- open-iscsi-2.0-870.1.orig/libiscsi/Makefile	1970-01-01 01:00:00.000000000 +0100
+++ open-iscsi-2.0-870.1/libiscsi/Makefile	2009-01-28 14:28:54.000000000 +0100
@@ -0,0 +1,54 @@
+# This Makefile will work only with GNU make.
+
+OSNAME=$(shell uname -s)
+OPTFLAGS ?= -O2 -g
+WARNFLAGS ?= -Wall -Wstrict-prototypes
+CFLAGS = $(OPTFLAGS) $(WARNFLAGS) -I../include -I../usr -D$(OSNAME) -fPIC -D_GNU_SOURCE -fvisibility=hidden
+LIB = libiscsi.so.0
+TESTS = tests/test_discovery_sendtargets tests/test_discovery_firmware
+TESTS += tests/test_login tests/test_logout tests/test_params
+TESTS += tests/test_get_network_config tests/test_get_initiator_name
+TESTS += tests/test_set_auth tests/test_get_auth
+
+# sources shared between iscsid, iscsiadm and iscsistart
+ISCSI_LIB_SRCS = util.o io.o auth.o login.o log.o md5.o sha1.o iface.o idbm.o sysdeps.o sysfs.o iscsi_sysfs.o
+FW_PARAM_SRCS = fwparam_ibft.o fw_entry.o prom_lex.o prom_parse.tab.o fwparam_ppc.o fwparam_ibft_sysfs.o
+
+# sources shared with the userspace utils, note we build these separately
+# to get PIC versions.
+USR_OBJS = $(patsubst %.o, usr-objs/%.o, $(ISCSI_LIB_SRCS) strings.o \
+discovery.o)
+FW_OBJS = $(patsubst %.o, fw-objs/%.o, $(FW_PARAM_SRCS))
+
+# Flags for the tests
+tests/% : CFLAGS = $(OPTFLAGS) $(WARNFLAGS) -I.
+
+all: lib tests html
+
+lib: $(LIB)
+tests: $(TESTS)
+
+usr-objs/%.o: ../usr/%.c
+	mkdir -p usr-objs
+	$(CC) $(CFLAGS) -c $< -o $@
+
+fw-objs/%.o: ../utils/fwparam_ibft/%.c
+	mkdir -p fw-objs
+	$(CC) $(CFLAGS) -c $< -o $@
+
+$(LIB): $(USR_OBJS) $(FW_OBJS) libiscsi.o
+	$(CC) $(CFLAGS) -shared -Wl,-soname,$(LIB) $^ -o $@
+	ln -s -f $(LIB) libiscsi.so
+
+$(TESTS): $(USR_OBJS) $(LIB)
+
+html: libiscsi.h libiscsi.doxy
+	doxygen libiscsi.doxy
+
+clean:
+	rm -rf *.o usr-objs fw-objs libiscsi.so* .depend *~ html $(TESTS) tests/*~
+
+depend:
+	gcc $(CFLAGS) -M `ls *.c` > .depend
+
+-include .depend ../usr/.depend
diff -urN open-iscsi-2.0-870.1.orig/libiscsi/libiscsi.c open-iscsi-2.0-870.1/libiscsi/libiscsi.c
--- open-iscsi-2.0-870.1.orig/libiscsi/libiscsi.c	1970-01-01 01:00:00.000000000 +0100
+++ open-iscsi-2.0-870.1/libiscsi/libiscsi.c	2009-01-28 14:22:55.000000000 +0100
@@ -0,0 +1,567 @@
+/*
+ * iSCSI Administration library
+ *
+ * Copyright (C) 2008-2009 Red Hat, Inc. All rights reserved.
+ * Copyright (C) 2008-2009 Hans de Goede <hdegoede at redhat.com>
+ * maintained by open-iscsi at googlegroups.com
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published
+ * by the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * See the file COPYING included with this distribution for more details.
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <errno.h>
+#include <unistd.h>
+#include <sys/syslog.h>
+#include "libiscsi.h"
+#include "idbm.h"
+#include "iscsiadm.h"
+#include "log.h"
+#include "sysfs.h"
+#include "iscsi_sysfs.h"
+#include "util.h"
+#include "sysdeps.h"
+#include "iface.h"
+#include "iscsi_proto.h"
+#include "fw_context.h"
+
+#define CHECK(a) { context->error_str[0] = 0; rc = a; if (rc) goto leave; }
+
+struct libiscsi_context {
+	char error_str[256];
+	/* For get_parameter_helper() */
+	const char *parameter;
+	char *value;
+};
+
+static void libiscsi_log(int prio, void *priv, const char *fmt, va_list ap)
+{
+	struct libiscsi_context *context = priv;
+
+	if (prio > LOG_ERR) /* We are only interested in errors (or worse) */
+		return;
+
+	vsnprintf(context->error_str, sizeof(context->error_str), fmt, ap);
+}
+
+struct libiscsi_context *libiscsi_init(void)
+{
+	struct libiscsi_context *context;
+
+	context = calloc(1, sizeof *context);
+	if (!context)
+		return NULL;
+
+	log_init("libiscsi", 1024, libiscsi_log, context);
+	sysfs_init();
+	increase_max_files();
+	if (idbm_init(NULL)) {
+		sysfs_cleanup();
+		free(context);
+		return NULL;
+	}
+
+	iface_setup_host_bindings();
+
+	return context;
+}
+
+void libiscsi_cleanup(struct libiscsi_context *context)
+{
+	idbm_terminate();
+	free_transports();
+	sysfs_cleanup();
+	free(context);
+}
+
+static void free_rec_list(struct list_head *rec_list)
+{
+	struct node_rec *rec, *tmp;
+	
+	list_for_each_entry_safe(rec, tmp, rec_list, list) {
+		list_del(&rec->list);
+		free(rec);
+	}
+}
+
+int libiscsi_discover_sendtargets(struct libiscsi_context *context,
+	const char *address, int port,
+	const struct libiscsi_auth_info *auth_info,
+	int *nr_found, struct libiscsi_node **found_nodes)
+{
+	struct discovery_rec drec;
+	LIST_HEAD(new_rec_list);
+	LIST_HEAD(bound_rec_list);
+	struct node_rec *rec;
+	int rc = 0, found = 0;
+
+	INIT_LIST_HEAD(&new_rec_list);
+	INIT_LIST_HEAD(&bound_rec_list);
+
+	if (nr_found)
+		*nr_found = 0;
+	if (found_nodes)
+		*found_nodes = NULL;
+
+	CHECK(libiscsi_verify_auth_info(context, auth_info))
+
+	/* Fill the drec struct with all needed info */
+	memset(&drec, 0, sizeof drec);
+	idbm_sendtargets_defaults(&drec.u.sendtargets);
+	drec.type = DISCOVERY_TYPE_SENDTARGETS;
+	strlcpy(drec.address, address, sizeof(drec.address));
+	drec.port = port ? port : ISCSI_LISTEN_PORT;
+	switch(auth_info ? auth_info->method : libiscsi_auth_none) {
+	case libiscsi_auth_chap:
+		drec.u.sendtargets.auth.authmethod = AUTH_METHOD_CHAP;
+		strlcpy(drec.u.sendtargets.auth.username,
+			auth_info->chap.username, AUTH_STR_MAX_LEN);
+		strlcpy((char *)drec.u.sendtargets.auth.password,
+			auth_info->chap.password, AUTH_STR_MAX_LEN);
+		drec.u.sendtargets.auth.password_length =
+			strlen((char *)drec.u.sendtargets.auth.password);
+		strlcpy(drec.u.sendtargets.auth.username_in,
+			auth_info->chap.reverse_username, AUTH_STR_MAX_LEN);
+		strlcpy((char *)drec.u.sendtargets.auth.password_in,
+			auth_info->chap.reverse_password, AUTH_STR_MAX_LEN);
[...3575 lines suppressed...]
@@ -370,7 +371,8 @@
 	}
 
 	/* initialize logger */
-	log_pid = log_init(program_name, DEFAULT_AREA_SIZE);
+	log_pid = log_init(program_name, DEFAULT_AREA_SIZE,
+		      daemonize ? log_do_log_daemon : log_do_log_stderr, NULL);
 	if (log_pid < 0)
 		exit(1);
 
@@ -402,7 +404,7 @@
 		exit(1);
 	}
 
-	if (log_daemon) {
+	if (daemonize) {
 		char buf[64];
 		int fd;
 
diff -urN open-iscsi-2.0-870.1.orig/usr/iscsistart.c open-iscsi-2.0-870.1/usr/iscsistart.c
--- open-iscsi-2.0-870.1.orig/usr/iscsistart.c	2009-01-27 21:43:16.000000000 +0100
+++ open-iscsi-2.0-870.1/usr/iscsistart.c	2009-01-28 10:26:36.000000000 +0100
@@ -311,8 +311,7 @@
 	}
 
 	/* initialize logger */
-	log_daemon = 0;
-	log_init(program_name, DEFAULT_AREA_SIZE);
+	log_init(program_name, DEFAULT_AREA_SIZE, log_do_log_stderr, NULL);
 
 	sysfs_init();
 	if (iscsi_sysfs_check_class_version())
diff -urN open-iscsi-2.0-870.1.orig/usr/log.c open-iscsi-2.0-870.1/usr/log.c
--- open-iscsi-2.0-870.1.orig/usr/log.c	2008-11-22 18:06:46.000000000 +0100
+++ open-iscsi-2.0-870.1/usr/log.c	2009-01-28 10:26:36.000000000 +0100
@@ -32,10 +32,11 @@
 #endif
 
 char *log_name;
-int log_daemon = 1;
 int log_level = 0;
 
 static int log_stop_daemon = 0;
+static void (*log_func)(int prio, void *priv, const char *fmt, va_list ap);
+static void *log_func_priv;
 
 static void free_logarea (void)
 {
@@ -258,35 +259,34 @@
 	syslog(msg->prio, "%s", (char *)&msg->str);
 }
 
-static void dolog(int prio, const char *fmt, va_list ap)
+void log_do_log_daemon(int prio, void *priv, const char *fmt, va_list ap)
 {
-	if (log_daemon) {
-		la->ops[0].sem_op = -1;
-		if (semop(la->semid, la->ops, 1) < 0) {
-			syslog(LOG_ERR, "semop up failed %d", errno);
-			return;
-		}
+	la->ops[0].sem_op = -1;
+	if (semop(la->semid, la->ops, 1) < 0) {
+		syslog(LOG_ERR, "semop up failed %d", errno);
+		return;
+	}
 
-		log_enqueue(prio, fmt, ap);
+	log_enqueue(prio, fmt, ap);
 
-		la->ops[0].sem_op = 1;
-		if (semop(la->semid, la->ops, 1) < 0) {
-			syslog(LOG_ERR, "semop down failed");
-			return;
-		}
-	} else {
-		fprintf(stderr, "%s: ", log_name);
-		vfprintf(stderr, fmt, ap);
-		fprintf(stderr, "\n");
-		fflush(stderr);
-	}
+	la->ops[0].sem_op = 1;
+	if (semop(la->semid, la->ops, 1) < 0)
+		syslog(LOG_ERR, "semop down failed");
+}
+
+void log_do_log_stderr(int prio, void *priv, const char *fmt, va_list ap)
+{
+	fprintf(stderr, "%s: ", log_name);
+	vfprintf(stderr, fmt, ap);
+	fprintf(stderr, "\n");
+	fflush(stderr);
 }
 
 void log_warning(const char *fmt, ...)
 {
 	va_list ap;
 	va_start(ap, fmt);
-	dolog(LOG_WARNING, fmt, ap);
+	log_func(LOG_WARNING, log_func_priv, fmt, ap);
 	va_end(ap);
 }
 
@@ -294,7 +294,7 @@
 {
 	va_list ap;
 	va_start(ap, fmt);
-	dolog(LOG_ERR, fmt, ap);
+	log_func(LOG_ERR, log_func_priv, fmt, ap);
 	va_end(ap);
 }
 
@@ -303,7 +303,7 @@
 	if (log_level > level) {
 		va_list ap;
 		va_start(ap, fmt);
-		dolog(LOG_DEBUG, fmt, ap);
+		log_func(LOG_DEBUG, log_func_priv, fmt, ap);
 		va_end(ap);
 	}
 }
@@ -379,19 +379,23 @@
 
 static void __log_close(void)
 {
-	if (log_daemon) {
+	if (log_func == log_do_log_daemon) {
 		log_flush();
 		closelog();
 		free_logarea();
 	}
 }
 
-int log_init(char *program_name, int size)
+int log_init(char *program_name, int size,
+	void (*func)(int prio, void *priv, const char *fmt, va_list ap),
+	void *priv)
 {
 	logdbg(stderr,"enter log_init\n");
 	log_name = program_name;
+	log_func = func;
+	log_func_priv = priv;
 
-	if (log_daemon) {
+	if (log_func == log_do_log_daemon) {
 		struct sigaction sa_old;
 		struct sigaction sa_new;
 		pid_t pid;
@@ -437,11 +441,12 @@
 
 	return 0;
 }
+
 void log_close(pid_t pid)
 {
 	int status;
 
-	if (!log_daemon || pid < 0) {
+	if (log_func != log_do_log_daemon || pid < 0) {
 		__log_close();
 		return;
 	}
diff -urN open-iscsi-2.0-870.1.orig/usr/log.h open-iscsi-2.0-870.1/usr/log.h
--- open-iscsi-2.0-870.1.orig/usr/log.h	2008-11-22 18:06:46.000000000 +0100
+++ open-iscsi-2.0-870.1/usr/log.h	2009-01-28 10:26:36.000000000 +0100
@@ -26,6 +26,7 @@
 #ifndef LOG_H
 #define LOG_H
 
+#include <stdarg.h>
 #include "iscsid.h"
 
 #if defined(Linux)
@@ -41,7 +42,6 @@
 #define DEFAULT_AREA_SIZE 16384
 #define MAX_MSG_SIZE 256
 
-extern int log_daemon;
 extern int log_level;
 
 struct logmsg {
@@ -67,7 +67,9 @@
 
 struct logarea *la;
 
-extern int log_init (char * progname, int size);
+extern int log_init(char *program_name, int size,
+	void (*func)(int prio, void *priv, const char *fmt, va_list ap),
+	void *priv);
 extern void log_close (pid_t pid);
 extern void dump_logmsg (void *);
 extern void log_warning(const char *fmt, ...)
@@ -77,4 +79,7 @@
 extern void log_debug(int level, const char *fmt, ...)
 	__attribute__ ((format (printf, 2, 3)));
 
+extern void log_do_log_daemon(int prio, void *priv, const char *fmt, va_list ap);
+extern void log_do_log_stderr(int prio, void *priv, const char *fmt, va_list ap);
+
 #endif	/* LOG_H */

open-iscsi-2.0-870.1-no-exit.patch:

--- NEW FILE open-iscsi-2.0-870.1-no-exit.patch ---
--- open-iscsi-2.0-870.1/usr/idbm.c~	2009-01-28 13:23:47.000000000 +0100
+++ open-iscsi-2.0-870.1/usr/idbm.c	2009-01-28 13:25:06.000000000 +0100
@@ -843,7 +843,7 @@ int idbm_lock(void)
 	if (access(LOCK_DIR, F_OK) != 0) {
 		if (mkdir(LOCK_DIR, 0660) != 0) {
 			log_error("Could not open %s. Exiting\n", LOCK_DIR);
-			exit(-1);
+			return errno;
 		}
 	}
 
@@ -857,10 +857,10 @@ int idbm_lock(void)
 			break;
 
 		if (errno != EEXIST) {
+			log_error("Maybe you are not root?");
 			log_error("Could not lock discovery DB: %s: %s",
 					LOCK_WRITE_FILE, strerror(errno));
-			log_error("Maybe you are not root?");
-			exit(-1);
+			return errno;
 		} else if (i == 0)
 			log_debug(2, "Waiting for discovery DB lock");
 
@@ -915,7 +915,10 @@ static int __idbm_rec_read(node_rec_t *o
 	if (!info)
 		return ENOMEM;
 
-	idbm_lock();
+	rc = idbm_lock();
+	if (rc)
+		goto free_info;
+
 	f = fopen(conf, "r");
 	if (!f) {
 		log_debug(5, "Could not open %s err %d\n", conf, errno);
@@ -931,6 +934,7 @@ static int __idbm_rec_read(node_rec_t *o
 
 unlock:
 	idbm_unlock();
+free_info:
 	free(info);
 	return rc;
 }
@@ -1386,14 +1390,18 @@ idbm_discovery_read(discovery_rec_t *out
 		return ENOMEM;
 
 	portal = malloc(PATH_MAX);
-	if (!portal)
+	if (!portal) {
+		rc = ENOMEM;
 		goto free_info;
+	}
 
 	snprintf(portal, PATH_MAX, "%s/%s,%d", ST_CONFIG_DIR,
 		 addr, port);
 	log_debug(5, "Looking for config file %s\n", portal);
 
-	idbm_lock();
+	rc = idbm_lock();
+	if (rc)
+		goto free_info;
 
 	f = idbm_open_rec_r(portal, ST_CONFIG_NAME);
 	if (!f) {
@@ -1494,7 +1502,9 @@ static int idbm_rec_write(node_rec_t *re
 		 rec->name, rec->conn[0].address, rec->conn[0].port);
 	log_debug(5, "Looking for config file %s", portal);
 
-	idbm_lock();
+	rc = idbm_lock();
+	if (rc)
+		goto free_portal;
 
 	rc = stat(portal, &statb);
 	if (rc) {
@@ -1579,13 +1589,16 @@ idbm_discovery_write(discovery_rec_t *re
 		return ENOMEM;
 	}
 
-	idbm_lock();
+	rc = idbm_lock();
+	if (rc)
+		goto free_portal;
+
 	snprintf(portal, PATH_MAX, "%s", ST_CONFIG_DIR);
 	if (access(portal, F_OK) != 0) {
 		if (mkdir(portal, 0660) != 0) {
 			log_error("Could not make %s\n", portal);
 			rc = errno;
-			goto free_portal;
+			goto unlock;
 		}
 	}
 
@@ -1596,13 +1609,14 @@ idbm_discovery_write(discovery_rec_t *re
 	if (!f) {
 		log_error("Could not open %s err %d\n", portal, errno);
 		rc = errno;
-		goto free_portal;
+		goto unlock;
 	}
 
 	idbm_print(IDBM_PRINT_TYPE_DISCOVERY, rec, 1, f);
 	fclose(f);
-free_portal:
+unlock:
 	idbm_unlock();
+free_portal:
 	free(portal);
 	return rc;
 }
@@ -1722,7 +1736,10 @@ int idbm_add_node(node_rec_t *newrec, di
 	log_debug(7, "node addition making link from %s to %s", node_portal,
 		 disc_portal);
 
-	idbm_lock();
+	rc = idbm_lock();
+	if (rc)
+		goto free_portal;
+
 	if (symlink(node_portal, disc_portal)) {
 		if (errno == EEXIST)
 			log_debug(7, "link from %s to %s exists", node_portal,
@@ -2009,7 +2026,10 @@ static int idbm_remove_disc_to_node_link
 	if (rc)
 		goto done;
 
-	idbm_lock();
+	rc = idbm_lock();
+	if (rc)
+		goto done;
+
 	if (!stat(portal, &statb)) {
 		if (unlink(portal)) {
 			log_error("Could not remove link %s err %d\n",
@@ -2046,7 +2066,10 @@ int idbm_delete_node(node_rec_t *rec)
 	log_debug(5, "Removing config file %s iface id %s\n",
 		  portal, rec->iface.name);
 
-	idbm_lock();
+	rc = idbm_lock();
+	if (rc)
+		goto free_portal;
+
 	if (!stat(portal, &statb))
 		goto rm_conf;
 
diff -up open-iscsi-2.0-870.1/usr/iface.c~ open-iscsi-2.0-870.1/usr/iface.c
--- open-iscsi-2.0-870.1/usr/iface.c~	2009-01-28 13:29:31.000000000 +0100
+++ open-iscsi-2.0-870.1/usr/iface.c	2009-01-28 13:29:31.000000000 +0100
@@ -208,7 +208,10 @@ int iface_conf_read(struct iface_rec *if
 		return 0;
 	}
 
-	idbm_lock();
+	rc = idbm_lock();
+	if (rc)
+		return rc;
+
 	rc = __iface_conf_read(iface);
 	idbm_unlock();
 	return rc;
@@ -232,11 +235,15 @@ int iface_conf_delete(struct iface_rec *
 		return ENOMEM;
 
 	sprintf(iface_conf, "%s/%s", IFACE_CONFIG_DIR, iface->name);
-	idbm_lock();
+	rc = idbm_lock();
+	if (rc)
+		goto free_conf;
+
 	if (unlink(iface_conf))
 		rc = errno;
 	idbm_unlock();
 
+free_conf:
 	free(iface_conf);
 	return rc;
 }
@@ -267,10 +274,14 @@ int iface_conf_write(struct iface_rec *i
 		goto free_conf;
 	}
 
-	idbm_lock();
+	rc = idbm_lock();
+	if (rc)
+		goto close_f;
+
 	idbm_print(IDBM_PRINT_TYPE_IFACE, iface, 1, f);
 	idbm_unlock();
 
+close_f:
 	fclose(f);
 free_conf:
 	free(iface_conf);
@@ -471,7 +482,9 @@ void iface_setup_host_bindings(void)
 {
 	int nr_found = 0;
 
-	idbm_lock();
+	if (idbm_lock())
+		return;
+
 	if (access(IFACE_CONFIG_DIR, F_OK) != 0) {
 		if (mkdir(IFACE_CONFIG_DIR, 0660) != 0) {
 			log_error("Could not make %s. HW/OFFLOAD iscsi "
@@ -658,7 +671,12 @@ int iface_for_each_iface(void *data, int
 			continue;
 		}
 
-		idbm_lock();
+		err = idbm_lock();
+		if (err) {
+			free(iface);
+			continue;
+		}
+
 		err = __iface_conf_read(iface);
 		idbm_unlock();
 		if (err) {


Index: iscsi-initiator-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/iscsi-initiator-utils/devel/iscsi-initiator-utils.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- iscsi-initiator-utils.spec	25 Nov 2008 18:17:13 -0000	1.35
+++ iscsi-initiator-utils.spec	28 Jan 2009 15:47:47 -0000	1.36
@@ -1,7 +1,9 @@
+%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
+
 Summary: iSCSI daemon and utility programs
 Name: iscsi-initiator-utils
 Version: 6.2.0.870
-Release: 1.0%{?dist}
+Release: 2%{?dist}
 Source0: http://www.open-iscsi.org/bits/open-iscsi-2.0-870.1.tar.gz
 Source1: iscsid.init
 Source2: iscsidevs.init
@@ -13,12 +15,14 @@
 Patch4: iscsi-initiator-utils-print-ibft-net-info.patch
 Patch5: iscsi-initiator-utils-only-root-use.patch
 Patch6: iscsi-initiator-utils-start-iscsid.patch
+Patch7: open-iscsi-2.0-870.1-add-libiscsi.patch
+Patch8: open-iscsi-2.0-870.1-no-exit.patch
 
 Group: System Environment/Daemons
 License: GPLv2+
 URL: http://www.open-iscsi.org
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: openssl-devel flex bison
+BuildRequires: openssl-devel flex bison python-devel
 Requires(post): chkconfig
 Requires(preun): chkconfig /sbin/service
 ExcludeArch: s390 s390x
@@ -29,6 +33,15 @@
 for distributed disk access using SCSI commands sent over Internet
 Protocol networks.
 
+%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 -n open-iscsi-2.0-870.1
 %patch0 -p1 -b .update-initscripts-and-docs
@@ -38,12 +51,18 @@
 %patch4 -p1 -b .print-ibft-net-info
 %patch5 -p1 -b .only-root
 %patch6 -p1 -b .start-iscsid
+%patch7 -p1
+%patch8 -p1
 
 
 %build
 make OPTFLAGS="%{optflags}" -C utils/fwparam_ibft
 make OPTFLAGS="%{optflags}" -C usr
 make OPTFLAGS="%{optflags}" -C utils
+make OPTFLAGS="%{optflags}" -C libiscsi
+pushd libiscsi
+python setup.py build
+popd
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -60,6 +79,9 @@
 mkdir -p $RPM_BUILD_ROOT/var/lib/iscsi/slp
 mkdir -p $RPM_BUILD_ROOT/var/lib/iscsi/ifaces
 mkdir -p $RPM_BUILD_ROOT/var/lock/iscsi
+mkdir -p $RPM_BUILD_ROOT%{_libdir}
+mkdir -p $RPM_BUILD_ROOT%{_includedir}
+mkdir -p $RPM_BUILD_ROOT%{python_sitearch}
 
 
 
@@ -72,11 +94,19 @@
 install -p -m 755 %{SOURCE2} $RPM_BUILD_ROOT%{_initrddir}/iscsi
 install -p -m 755 %{SOURCE3} $RPM_BUILD_ROOT/etc/NetworkManager/dispatcher.d
 
+install -p -m 755 libiscsi/libiscsi.so.0 $RPM_BUILD_ROOT%{_libdir}
+ln -s libiscsi.so.0 $RPM_BUILD_ROOT%{_libdir}/libiscsi.so
+install -p -m 644 libiscsi/libiscsi.h $RPM_BUILD_ROOT%{_includedir}
+
+install -p -m 755 libiscsi/build/lib.linux-*/libiscsimodule.so \
+	$RPM_BUILD_ROOT%{python_sitearch}
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
+/sbin/ldconfig
 if [ "$1" -eq "1" ]; then
 	if [ ! -f %{_sysconfdir}/iscsi/initiatorname.iscsi ]; then
 		echo "InitiatorName=`/sbin/iscsi-iname`" > %{_sysconfdir}/iscsi/initiatorname.iscsi
@@ -85,6 +115,8 @@
 	/sbin/chkconfig --add iscsi
 fi
 
+%postun -p /sbin/ldconfig
+
 %preun
 if [ "$1" = "0" ]; then
 	# stop iscsi
@@ -113,11 +145,21 @@
 %{_sysconfdir}/NetworkManager
 %attr(0600,root,root) %config(noreplace) %{_sysconfdir}/iscsi/iscsid.conf
 /sbin/*
+%{_libdir}/libiscsi.so.0
+%{python_sitearch}/libiscsimodule.so
 %{_mandir}/man8/*
 
+%files devel
+%defattr(-,root,root,-)
+%doc libiscsi/html
+%{_libdir}/libiscsi.so
+%{_includedir}/libiscsi.h
 
 %changelog
-* Tue Nov  25 2008 Mike Christie <mchrsiti at redhat.com> 6.2.0.870-1.0
+* Wed Jan 28 2009 Hans de Goede <hdegoede at redhat.com> 6.2.0.870-2
+- Add libiscsi iscsi administartion library and -devel subpackage
+
+* Tue Nov  25 2008 Mike Christie <mchristie at redhat.com> 6.2.0.870-1.0
 - Rebase to upstream
 
 * Thu Nov  6 2008 Hans de Goede <hdegoede at redhat.com> 6.2.0.870-0.2.rc1



From ltinkl at fedoraproject.org  Wed Jan 28 15:49:33 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Wed, 28 Jan 2009 15:49:33 +0000 (UTC)
Subject: rpms/kdenetwork/F-9 kdenetwork-4.1.96-system-libgadu.patch, NONE,
	1.1 kdenetwork-4.2.0-handle-enc-message.patch, NONE,
	1.1 kdenetwork.spec, 1.160, 1.161 sources, 1.61,
	1.62 kdenetwork-4.1.3-handle-enc-message.patch, 1.1,
	NONE kdenetwork-4.1.4-system-libgadu.patch, 1.1, NONE
Message-ID: <20090128154933.5BCB47010D@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kdenetwork/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14048

Modified Files:
	kdenetwork.spec sources 
Added Files:
	kdenetwork-4.1.96-system-libgadu.patch 
	kdenetwork-4.2.0-handle-enc-message.patch 
Removed Files:
	kdenetwork-4.1.3-handle-enc-message.patch 
	kdenetwork-4.1.4-system-libgadu.patch 
Log Message:
KDE 4.2.0


kdenetwork-4.1.96-system-libgadu.patch:

--- NEW FILE kdenetwork-4.1.96-system-libgadu.patch ---
Index: cmake/modules/FindLibgadu.cmake
===================================================================
--- cmake/modules/FindLibgadu.cmake	(Revision 0)
+++ cmake/modules/FindLibgadu.cmake	(Revision 909145)
@@ -0,0 +1,72 @@
+# - Try to find libgadu (Gadu Gadu protocol support library)
+# Once done this will define
+#
+#  LIBGADU_FOUND - system has LIBGADU
+#  LIBGADU_INCLUDE_DIR - the LIBGADU include directory
+#  LIBGADU_LIBRARIES - the libraries needed to use LIBGADU
+#  LIBGADU_DEFINITIONS - Compiler switches required for using LIBGADU
+#
+# use pkg-config to get the directories and then use these values
+# in the FIND_PATH() and FIND_LIBRARY() calls
+
+# Copyright (c) 2008, Maciej Mrozowski, <reavertm at poczta.fm>
+#
+# Redistribution and use is allowed according to the terms of the BSD license.
+# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+
+include (FindLibraryWithDebug)
+
+if (LIBGADU_INCLUDE_DIR AND LIBGADU_LIBRARIES)
+
+    # in cache already
+    set (LIBGADU_FOUND TRUE)
+
+else (LIBGADU_INCLUDE_DIR AND LIBGADU_LIBRARIES)
+
+    if (NOT WIN32)
+
+        find_package (PkgConfig)
+        pkg_check_modules (PC_LIBGADU libgadu)
+
+        # If pkgconfig found libgadu, get the full path to the library using find_library()
+        # but only in the path reported by pkgconfig.
+        # Otherwise do a normal search.
+        if (PC_LIBGADU_FOUND)
+
+            set (LIBGADU_DEFINITIONS ${PC_LIBGADU_CFLAGS})
+
+            if (PC_LIBGADU_INCLUDE_DIRS)
+                set (LIBGADU_INCLUDE_DIR ${PC_LIBGADU_INCLUDE_DIRS})
+            else (PC_LIBGADU_INCLUDE_DIRS)
+                find_path (LIBGADU_INCLUDE_DIR libgadu.h PATH_SUFFIXES libgadu)
+            endif (PC_LIBGADU_INCLUDE_DIRS)
+
+            find_library (LIBGADU_LIBRARIES NAMES gadu
+                PATHS
+                ${PC_LIBGADU_LIBDIR}
+                NO_DEFAULT_PATH
+            )
+
+        else (PC_LIBGADU_FOUND)
+
+            find_library (LIBGADU_LIBRARIES NAMES gadu)
+            find_path (LIBGADU_INCLUDE_DIR libgadu.h PATH_SUFFIXES libgadu)
+
+        endif (PC_LIBGADU_FOUND)
+
+    else (NOT WIN32)
+
+        find_library_with_debug (LIBGADU_LIBRARIES
+            WIN32_DEBUG_POSTFIX d
+            NAMES gadu
+        )
+        find_path (LIBGADU_INCLUDE_DIR libgadu.h PATH_SUFFIXES libgadu)
+
+    endif (NOT WIN32)
+
+    include (FindPackageHandleStandardArgs)
+    find_package_handle_standard_args (LIBGADU DEFAULT_MSG LIBGADU_LIBRARIES LIBGADU_INCLUDE_DIR)
+
+    mark_as_advanced (LIBGADU_INCLUDE_DIR LIBGADU_LIBRARIES)
+
+endif (LIBGADU_INCLUDE_DIR AND LIBGADU_LIBRARIES)
Index: kopete/protocols/gadu/CMakeLists.txt
===================================================================
--- kopete/protocols/gadu/CMakeLists.txt	(Revision 909143)
+++ kopete/protocols/gadu/CMakeLists.txt	(Revision 909145)
@@ -3,11 +3,8 @@
 KDE4_NO_ENABLE_FINAL(kopete)
 
 add_subdirectory( icons ) 
-add_subdirectory( libgadu )
 
-include_directories( ${KOPETE_INCLUDES} 
-${CMAKE_CURRENT_SOURCE_DIR}/libgadu/ 
-${CMAKE_CURRENT_BINARY_DIR}/libgadu/ 
+include_directories( ${KOPETE_INCLUDES} ${LIBGADU_INCLUDE_DIRS} }
 )
 
 
@@ -46,7 +43,7 @@
 kde4_add_plugin(kopete_gadu ${kopete_gadu_PART_SRCS})
 
 
-target_link_libraries(kopete_gadu ${KDE4_KIO_LIBS} ${QT_QTNETWORK_LIBRARY} ${KDE4_KDE3SUPPORT_LIBS} gadu_kopete kopete )
+target_link_libraries(kopete_gadu ${KDE4_KIO_LIBS} ${QT_QTNETWORK_LIBRARY} ${KDE4_KDE3SUPPORT_LIBS} ${LIBGADU_LIBRARIES} kopete )
 
 install(TARGETS kopete_gadu  DESTINATION ${PLUGIN_INSTALL_DIR})
 
Index: kopete/protocols/CMakeLists.txt
===================================================================
--- kopete/protocols/CMakeLists.txt	(Revision 909143)
+++ kopete/protocols/CMakeLists.txt	(Revision 909145)
@@ -1,6 +1,3 @@
-macro_optional_find_package(OpenSSL)
-macro_log_feature(OPENSSL_FOUND "OpenSSL" "A toolkit implementing the Secure Sockets Layer (SSL v2/v3) and Transport Layer Security (TLS v1) protocols" "http://openssl.org" FALSE "" "Required for the Kopete Gadu-Gadu protocol.")
-
 # On Solaris, some of the name resolution functions are in libnsl;
 # this needs to be linked in if found. Copied from kdelibs.
 check_library_exists(nsl gethostbyname "" HAVE_NSL_LIBRARY)
@@ -47,9 +44,9 @@
   if(WITH_winpopup)
     add_subdirectory( winpopup )
   endif(WITH_winpopup)
-  if(WITH_gadu AND OPENSSL_FOUND)
+  if(WITH_gadu AND LIBGADU_FOUND)
 	add_subdirectory( gadu )
-  endif(WITH_gadu AND OPENSSL_FOUND)
+  endif(WITH_gadu AND LIBGADU_FOUND)
   if(WITH_sms)
     add_subdirectory( sms )
   endif(WITH_sms)
Index: kopete/CMakeLists.txt
===================================================================
--- kopete/CMakeLists.txt	(Revision 909143)
+++ kopete/CMakeLists.txt	(Revision 909145)
@@ -37,6 +37,10 @@
 macro_bool_to_01(LIBMEANWHILE_FOUND HAVE_LIBMEANWHILE)
 macro_log_feature(LIBMEANWHILE_FOUND "libmeanwhile" "A library for protocol support for connection to Sametime servers" "http://meanwhile.sf.net" FALSE "" "Required for the Kopete Meanwhile protocol")
 
+macro_optional_find_package(Libgadu)
+macro_bool_to_01(LIBGADU_FOUND HAVE_LIBGADU)
+macro_log_feature(LIBGADU_FOUND "libgadu" "A library providing support for Gadu-Gadu protocol" "http://toxygen.net/libgadu/" FALSE "1.8.0" "Required for Kopete Gadu-Gadu protocol")
+
 check_include_files(valgrind/valgrind.h HAVE_VALGRIND_H)
 check_include_files(stdint.h HAVE_STDINT_H)
 check_include_files(inttypes.h HAVE_INTTYPES_H)

kdenetwork-4.2.0-handle-enc-message.patch:

--- NEW FILE kdenetwork-4.2.0-handle-enc-message.patch ---
diff -up kdenetwork-4.2.0/kopete/protocols/jabber/jabbercontact.cpp.handle-enc-message kdenetwork-4.2.0/kopete/protocols/jabber/jabbercontact.cpp
--- kdenetwork-4.2.0/kopete/protocols/jabber/jabbercontact.cpp.handle-enc-message	2008-11-19 11:19:43.000000000 +0100
+++ kdenetwork-4.2.0/kopete/protocols/jabber/jabbercontact.cpp	2009-01-26 14:12:35.000000000 +0100
@@ -51,6 +51,7 @@
 #include "kopetechatsessionmanager.h"
 #include "kopeteaccountmanager.h"
 #include "kopetemetacontact.h"
+#include "kopetepluginmanager.h"
 #include "jabberprotocol.h"
 #include "jabberaccount.h"
 #include "jabberclient.h"
@@ -392,9 +393,15 @@ void JabberContact::handleIncomingMessag
 		QString body = message.body ();
 		if( !message.xencrypted().isEmpty() )
 		{
-			body = QString ("-----BEGIN PGP MESSAGE-----\n\n") + message.xencrypted () + QString ("\n-----END PGP MESSAGE-----\n");
+			kDebug ( JABBER_DEBUG_GLOBAL ) << "Received encrypted message";
+			if (Kopete::PluginManager::self()->plugin("kopete_cryptography"))
+			{
+				kDebug( JABBER_DEBUG_GLOBAL ) << "Kopete cryptography plugin loaded";
+				body = QString ("-----BEGIN PGP MESSAGE-----\n\n") + message.xencrypted () + QString ("\n-----END PGP MESSAGE-----\n");
+			}
 		}
-		else if( message.containsHTML() )
+
+		if( message.containsHTML() )
 		{
 			kDebug ( JABBER_DEBUG_GLOBAL ) << "Received a xHTML message";
 			newMessage = new Kopete::Message ( this, contactList );
diff -up kdenetwork-4.2.0/kopete/protocols/jabber/jabbergroupcontact.cpp.handle-enc-message kdenetwork-4.2.0/kopete/protocols/jabber/jabbergroupcontact.cpp
--- kdenetwork-4.2.0/kopete/protocols/jabber/jabbergroupcontact.cpp.handle-enc-message	2008-10-09 11:48:21.000000000 +0200
+++ kdenetwork-4.2.0/kopete/protocols/jabber/jabbergroupcontact.cpp	2009-01-26 14:12:35.000000000 +0100
@@ -32,6 +32,7 @@
 #include "jabbergroupmembercontact.h"
 #include "jabbercontactpool.h"
 #include "kopetemetacontact.h"
+#include "kopetepluginmanager.h"
 #include "xmpp_tasks.h"
 
 /**
@@ -181,7 +182,11 @@ void JabberGroupContact::handleIncomingM
 
 		if( !message.xencrypted().isEmpty () )
 		{
-			body = QString ("-----BEGIN PGP MESSAGE-----\n\n") + message.xencrypted () + QString ("\n-----END PGP MESSAGE-----\n");
+			if (Kopete::PluginManager::self()->plugin("kopete_cryptography"))
+			{
+				kDebug( JABBER_DEBUG_GLOBAL ) << "Kopete cryptography plugin loaded";
+				body = QString ("-----BEGIN PGP MESSAGE-----\n\n") + message.xencrypted () + QString ("\n-----END PGP MESSAGE-----\n");
+			}
 		}
 
 		// locate the originating contact


Index: kdenetwork.spec
===================================================================
RCS file: /cvs/extras/rpms/kdenetwork/F-9/kdenetwork.spec,v
retrieving revision 1.160
retrieving revision 1.161
diff -u -r1.160 -r1.161
--- kdenetwork.spec	12 Jan 2009 18:40:24 -0000	1.160
+++ kdenetwork.spec	28 Jan 2009 15:49:02 -0000	1.161
@@ -1,61 +1,52 @@
-# FIXME/TODO: needed BuildRequires 
-# Decibel
-
 Summary: K Desktop Environment - Network Applications
 Name: kdenetwork
 Epoch: 7
-Version: 4.1.4
+Version: 4.2.0
 Release: 2%{?dist}
 
 License: GPLv2
 Group: Applications/Internet
 URL: http://www.kde.org
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
-Patch0: kdenetwork-4.1.3-handle-enc-message.patch
+Patch0: kdenetwork-4.2.0-handle-enc-message.patch
 # build Kopete against the system libgadu (backported from 4.3)
 # http://websvn.kde.org/?view=rev&revision=909144
 # http://websvn.kde.org/?view=rev&revision=909145
-Patch100: kdenetwork-4.1.4-system-libgadu.patch
-
-# upstream patches
-
+Patch100: kdenetwork-4.1.96-system-libgadu.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: avahi-compat-libdns_sd-devel
 BuildRequires: boost-devel
-BuildRequires: cmake
-# TODO
+# FIXME/TODO
 #BuildRequires: decibel-devel
 BuildRequires: giflib-devel
 BuildRequires: glib2-devel
 BuildRequires: gmp-devel
-BuildRequires: kde-filesystem >= 4
-%{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
-BuildRequires: kdelibs4-devel >= %{version}
 BuildRequires: kdepimlibs-devel >= %{version}
-BuildRequires: kdebase-workspace-devel >= %{version}
 BuildRequires: libgadu-devel >= 1.8.0
 BuildRequires: libidn-devel
+BuildRequires: libmsn-devel >= 4.0-0.4.beta2
 BuildRequires: libotr-devel
 BuildRequires: libvncserver-devel
 BuildRequires: libxslt-devel libxml2-devel
+BuildRequires: meanwhile-devel
 BuildRequires: openldap-devel
 BuildRequires: openslp-devel
+BuildRequires: ortp-devel
 BuildRequires: pcre-devel
 BuildRequires: qca2-devel
+BuildRequires: plasma-devel >= %{version}
 BuildRequires: qimageblitz-devel
 BuildRequires: soprano-devel >= 2.0.97
+BuildRequires: speex-devel
 BuildRequires: sqlite-devel
-# omit for now, save pulling in xmms-lib, gtk+ lib stack
-#BuildRequires: xmms-devel 
-
+# FIXME/TODO: libnxcl-devel
 
 # FIXME/TODO: are there other explicit Requires?
 Requires(post): xdg-utils
 Requires(postun): xdg-utils
-Requires: kdelibs4 >= %{version}
 Requires: kdepimlibs >= %{version}
-Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: %{name}-libs = %{epoch}:%{version}-%{release}
 
 # kopete/yahoo
 Requires(hint): jasper
@@ -66,14 +57,15 @@
 ## krdc
 Requires(hint): rdesktop
 
-Obsoletes: %{name}-extras < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes: %{name}-extras < 7:4.0.0 
+
+# kopete-bonjour review, https://bugzilla.redhat.com/451302
+Obsoletes: kopete-bonjour < 2
+Provides: kopete-bonjour = 2
 
-# FIXME/TODO: Taken from 3.5.8. review needed
 %description
 Networking applications, including:
 * kget: downloader manager
-* kio_lan: lan browsing kio slave
-* knewsticker: RDF newsticker applet
 * kopete: chat client
 * kppp: dialer and front end for pppd
 * krdc: a client for Desktop Sharing and other VNC servers
@@ -87,7 +79,7 @@
 
 %package devel
 Group:    Development/Libraries
-Summary:  Development files for %{name} 
+Summary:  Development files for %{name}
 Requires: %{name}-libs = %{epoch}:%{version}-%{release}
 Requires: kdelibs4-devel
 %description devel
@@ -97,7 +89,7 @@
 %prep
 %setup -q
 %patch0 -p1 -b .handle-enc-message
-%patch100 -p1 -b .system-libgadu
+%patch100 -p0 -b .system-libgadu
 rm -rf kopete/protocols/gadu/libgadu/
 
 %build
@@ -112,7 +104,7 @@
 %install
 rm -rf %{buildroot}
 
-make install DESTDIR=%{buildroot} -C %{_target_platform}
+make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
 
 %clean
@@ -120,10 +112,14 @@
 
 
 %post
-%{_bindir}/xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
+/sbin/ldconfig ||:
+xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
+xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || :
 
 %postun
-%{_bindir}/xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
+/sbin/ldconfig ||:
+xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
+xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || :
 
 %post libs -p /sbin/ldconfig
 
@@ -134,6 +130,7 @@
 %defattr(-,root,root,-)
 %doc COPYING README
 %{_kde4_bindir}/*
+%{_kde4_appsdir}/kconf_update/*
 %{_kde4_appsdir}/kget/
 %{_kde4_appsdir}/khtml/kpartplugins/kget_plug_in.rc
 %{_kde4_appsdir}/kopete*
@@ -141,46 +138,77 @@
 %{_kde4_appsdir}/krfb/
 %{_kde4_appsdir}/krdc/
 %{_kde4_appsdir}/remoteview/
+%{_kde4_appsdir}/desktoptheme/default/widgets/kget.svg
+%{_kde4_configdir}/kopeterc
 %{_kde4_datadir}/applications/kde4/*
 %{_kde4_datadir}/config.kcfg/*
 %{_datadir}/dbus-1/interfaces/*
 %{_kde4_datadir}/kde4/services/*
 %{_kde4_datadir}/kde4/servicetypes/*
 %{_kde4_datadir}/sounds/*
-%{_kde4_docdir}/HTML/en/kget/
-%{_kde4_docdir}/HTML/en/knewsticker/
-%{_kde4_docdir}/HTML/en/kopete/
-%{_kde4_docdir}/HTML/en/kppp/
-%{_kde4_docdir}/HTML/en/krfb/
-%{_kde4_docdir}/HTML/en/krdc/
+%{_kde4_docdir}/HTML/en/*/
 %{_kde4_iconsdir}/hicolor/*/*/*
-%{_kde4_configdir}/kopeterc
 %{_kde4_iconsdir}/oxygen/*/*/*
-%{_kde4_appsdir}/kconf_update/*
-%{_kde4_appsdir}/desktoptheme/default/widgets/kget.svg
 %{_kde4_libdir}/kde4/*
+%{_kde4_libdir}/libqgroupwise.so
 
 %files libs
 %defattr(-,root,root,-)
-%{_kde4_libdir}/libqgroupwise.so
 %{_kde4_libdir}/lib*.so.*
 
 %files devel
 %defattr(-,root,root,-)
-%{_kde4_includedir}/*
+%{_kde4_includedir}/kopete/
 %{_kde4_libdir}/lib*.so
 %exclude %{_kde4_libdir}/libqgroupwise.so
 
 
 %changelog
-* Mon Jan 12 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.4-2
+* Mon Jan 26 2009 Jaroslav Reznik <jreznik at redhat.com> - 4.2.0-2
+- fix kopete jabber protocol encrypted messages handling (#473412)
+
+* Thu Jan 22 2009 Than Ngo <than at redhat.com> - 4.2.0-1
+- 4.2.0
+
+* Fri Jan 16 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.96-3
+- rebuild for new OpenSSL
+
+* Mon Jan 12 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.96-2
 - build against system libgadu (trivial patch backported from 4.3)
 
-* Fri Jan  9 2009 Luk???? Tinkl <ltinkl at redhat.com> 4.1.4-1
-- KDE 4.1.4
+* Wed Jan 07 2009 Than Ngo <than at redhat.com> - 4.1.96-1
+- 4.2rc1
 
-* Wed Dec 10 2008 Jaroslav Reznik <jreznik at redhat.com> 4.1.3-2
-- fix kopete jabber protocol encrypted message handling (#473412)
+* Fri Dec 12 2008 Than Ngo <than at redhat.com> 4.1.85-1
+- 4.2beta2
+- BR: libmsn-devel
+
+* Thu Dec 11 2008 Rex Dieter <rdieter at fedoraproject.org> 7:4.1.80-7
+- Obsoletes/Provides: kopete-bonjour (#451302)
+
+* Thu Dec 04 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 7:4.1.80-6
+- rebuild for fixed kde-filesystem (macros.kde4) (get rid of rpaths)
+
+* Thu Dec 04 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 7:4.1.80-5
+- add missing BR meanwhile-devel (#474592)
+- add missing BR ortp-devel and speex-devel (for Jingle protocol)
+
+* Mon Dec 01 2008 Rex Dieter <rdieter at fedoraproject.org> 7:4.1.80-4
+- fix up %%description
+- versioned Obsoletes
+- scriptlets fixes
+- BR: plasma-devel
+
+* Fri Nov 28 2008 Lorenzo Villani <lvillani at binaryhelix.net> 7:4.1.80-3
+- fix build (updated file lists)
+
+* Thu Nov 20 2008 Than Ngo <than at redhat.com> 4.1.80-2
+- merged
+
+* Thu Nov 20 2008 Lorenzo Villani <lvillani at binaryhelix.net> 7:4.1.72-1
+- 4.1.80
+- BR cmake 2.6
+- make install/fast
 
 * Wed Nov 12 2008 Than Ngo <than at redhat.com> 4.1.3-1
 - 4.1.3
@@ -279,7 +307,7 @@
 - Obsoletes: -extras ...
 - Requires: rdesktop (#420801), for krdc
 - Requires: ppp , for kppp
-- Requires: jasper , for kopete 
+- Requires: jasper , for kopete
 
 * Wed Dec 12 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.97.0-4
 - rebuild for changed _kde4_includedir


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdenetwork/F-9/sources,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- sources	9 Jan 2009 10:38:40 -0000	1.61
+++ sources	28 Jan 2009 15:49:02 -0000	1.62
@@ -1 +1 @@
-c67114c0e28a4e44f1466bf467a7b8dd  kdenetwork-4.1.4.tar.bz2
+0ea1628e11d398fdf45276a35edd3cae  kdenetwork-4.2.0.tar.bz2


--- kdenetwork-4.1.3-handle-enc-message.patch DELETED ---


--- kdenetwork-4.1.4-system-libgadu.patch DELETED ---



From salimma at fedoraproject.org  Wed Jan 28 15:50:41 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Wed, 28 Jan 2009 15:50:41 +0000 (UTC)
Subject: rpms/fbreader/EL-5 .cvsignore, 1.8, 1.9 fbreader.spec, 1.10,
	1.11 sources, 1.8, 1.9
Message-ID: <20090128155041.151D27010D@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/fbreader/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14309/EL-5

Modified Files:
	.cvsignore fbreader.spec sources 
Log Message:
* Wed Jan 28 2009 Michel Salim <salimma at fedoraproject.org> - 0.10.2-1
- Update to 0.10.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fbreader/EL-5/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	14 Jan 2009 07:25:41 -0000	1.8
+++ .cvsignore	28 Jan 2009 15:50:10 -0000	1.9
@@ -1 +1 @@
-fbreader-sources-0.10.0.tgz
+fbreader-sources-0.10.2.tgz


Index: fbreader.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fbreader/EL-5/fbreader.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- fbreader.spec	14 Jan 2009 07:25:41 -0000	1.10
+++ fbreader.spec	28 Jan 2009 15:50:10 -0000	1.11
@@ -1,6 +1,6 @@
 # rebuild with --with qt4 to build optional qt4 UI
 Name:           fbreader
-Version:        0.10.0
+Version:        0.10.2
 Release:        1%{?dist}
 Summary:        E-book reader
 
@@ -117,6 +117,9 @@
 
 
 %changelog
+* Wed Jan 28 2009 Michel Salim <salimma at fedoraproject.org> - 0.10.2-1
+- Update to 0.10.2
+
 * Wed Jan 14 2009 Michel Salim <salimma at fedoraproject.org> - 0.10.0-1
 - Update to 0.10.0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fbreader/EL-5/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	14 Jan 2009 07:25:41 -0000	1.8
+++ sources	28 Jan 2009 15:50:10 -0000	1.9
@@ -1 +1 @@
-e2e4eb0a3de3c11475b0d077e49d5086  fbreader-sources-0.10.0.tgz
+0e38c9ee1b08c1dabfeff9a1e9f37e85  fbreader-sources-0.10.2.tgz



From salimma at fedoraproject.org  Wed Jan 28 15:50:41 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Wed, 28 Jan 2009 15:50:41 +0000 (UTC)
Subject: rpms/fbreader/F-10 .cvsignore, 1.8, 1.9 fbreader.spec, 1.13,
	1.14 sources, 1.8, 1.9
Message-ID: <20090128155041.8BD2C7010D@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/fbreader/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14309/F-10

Modified Files:
	.cvsignore fbreader.spec sources 
Log Message:
* Wed Jan 28 2009 Michel Salim <salimma at fedoraproject.org> - 0.10.2-1
- Update to 0.10.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fbreader/F-10/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	14 Jan 2009 07:25:41 -0000	1.8
+++ .cvsignore	28 Jan 2009 15:50:11 -0000	1.9
@@ -1 +1 @@
-fbreader-sources-0.10.0.tgz
+fbreader-sources-0.10.2.tgz


Index: fbreader.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fbreader/F-10/fbreader.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- fbreader.spec	14 Jan 2009 07:25:41 -0000	1.13
+++ fbreader.spec	28 Jan 2009 15:50:11 -0000	1.14
@@ -1,6 +1,6 @@
 # rebuild with --with qt4 to build optional qt4 UI
 Name:           fbreader
-Version:        0.10.0
+Version:        0.10.2
 Release:        1%{?dist}
 Summary:        E-book reader
 
@@ -117,6 +117,9 @@
 
 
 %changelog
+* Wed Jan 28 2009 Michel Salim <salimma at fedoraproject.org> - 0.10.2-1
+- Update to 0.10.2
+
 * Wed Jan 14 2009 Michel Salim <salimma at fedoraproject.org> - 0.10.0-1
 - Update to 0.10.0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fbreader/F-10/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	14 Jan 2009 07:25:41 -0000	1.8
+++ sources	28 Jan 2009 15:50:11 -0000	1.9
@@ -1 +1 @@
-e2e4eb0a3de3c11475b0d077e49d5086  fbreader-sources-0.10.0.tgz
+0e38c9ee1b08c1dabfeff9a1e9f37e85  fbreader-sources-0.10.2.tgz



From salimma at fedoraproject.org  Wed Jan 28 15:50:42 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Wed, 28 Jan 2009 15:50:42 +0000 (UTC)
Subject: rpms/fbreader/F-9 .cvsignore, 1.8, 1.9 fbreader.spec, 1.13,
	1.14 sources, 1.8, 1.9
Message-ID: <20090128155042.028517010D@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/fbreader/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14309/F-9

Modified Files:
	.cvsignore fbreader.spec sources 
Log Message:
* Wed Jan 28 2009 Michel Salim <salimma at fedoraproject.org> - 0.10.2-1
- Update to 0.10.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fbreader/F-9/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	14 Jan 2009 07:25:42 -0000	1.8
+++ .cvsignore	28 Jan 2009 15:50:11 -0000	1.9
@@ -1 +1 @@
-fbreader-sources-0.10.0.tgz
+fbreader-sources-0.10.2.tgz


Index: fbreader.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fbreader/F-9/fbreader.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- fbreader.spec	14 Jan 2009 07:25:42 -0000	1.13
+++ fbreader.spec	28 Jan 2009 15:50:11 -0000	1.14
@@ -1,6 +1,6 @@
 # rebuild with --with qt4 to build optional qt4 UI
 Name:           fbreader
-Version:        0.10.0
+Version:        0.10.2
 Release:        1%{?dist}
 Summary:        E-book reader
 
@@ -117,6 +117,9 @@
 
 
 %changelog
+* Wed Jan 28 2009 Michel Salim <salimma at fedoraproject.org> - 0.10.2-1
+- Update to 0.10.2
+
 * Wed Jan 14 2009 Michel Salim <salimma at fedoraproject.org> - 0.10.0-1
 - Update to 0.10.0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fbreader/F-9/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	14 Jan 2009 07:25:42 -0000	1.8
+++ sources	28 Jan 2009 15:50:11 -0000	1.9
@@ -1 +1 @@
-e2e4eb0a3de3c11475b0d077e49d5086  fbreader-sources-0.10.0.tgz
+0e38c9ee1b08c1dabfeff9a1e9f37e85  fbreader-sources-0.10.2.tgz



From salimma at fedoraproject.org  Wed Jan 28 15:50:42 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Wed, 28 Jan 2009 15:50:42 +0000 (UTC)
Subject: rpms/fbreader/devel .cvsignore, 1.8, 1.9 fbreader.spec, 1.13,
	1.14 sources, 1.8, 1.9
Message-ID: <20090128155042.68CD27010D@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/fbreader/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14309/devel

Modified Files:
	.cvsignore fbreader.spec sources 
Log Message:
* Wed Jan 28 2009 Michel Salim <salimma at fedoraproject.org> - 0.10.2-1
- Update to 0.10.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fbreader/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	14 Jan 2009 07:25:42 -0000	1.8
+++ .cvsignore	28 Jan 2009 15:50:12 -0000	1.9
@@ -1 +1 @@
-fbreader-sources-0.10.0.tgz
+fbreader-sources-0.10.2.tgz


Index: fbreader.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fbreader/devel/fbreader.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- fbreader.spec	14 Jan 2009 07:25:42 -0000	1.13
+++ fbreader.spec	28 Jan 2009 15:50:12 -0000	1.14
@@ -1,6 +1,6 @@
 # rebuild with --with qt4 to build optional qt4 UI
 Name:           fbreader
-Version:        0.10.0
+Version:        0.10.2
 Release:        1%{?dist}
 Summary:        E-book reader
 
@@ -117,6 +117,9 @@
 
 
 %changelog
+* Wed Jan 28 2009 Michel Salim <salimma at fedoraproject.org> - 0.10.2-1
+- Update to 0.10.2
+
 * Wed Jan 14 2009 Michel Salim <salimma at fedoraproject.org> - 0.10.0-1
 - Update to 0.10.0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fbreader/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	14 Jan 2009 07:25:42 -0000	1.8
+++ sources	28 Jan 2009 15:50:12 -0000	1.9
@@ -1 +1 @@
-e2e4eb0a3de3c11475b0d077e49d5086  fbreader-sources-0.10.0.tgz
+0e38c9ee1b08c1dabfeff9a1e9f37e85  fbreader-sources-0.10.2.tgz



From peter at fedoraproject.org  Wed Jan 28 15:50:41 2009
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Wed, 28 Jan 2009 15:50:41 +0000 (UTC)
Subject: rpms/fuse/devel fuse.spec, 1.34, 1.35 import.log, 1.2,
	1.3 fuse-chkconfig_support.diff, 1.2, NONE
Message-ID: <20090128155041.5957770141@cvs1.fedora.phx.redhat.com>

Author: peter

Update of /cvs/pkgs/rpms/fuse/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14450/devel

Modified Files:
	fuse.spec import.log 
Removed Files:
	fuse-chkconfig_support.diff 
Log Message:
Fixed BZ#479581


Index: fuse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fuse/devel/fuse.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- fuse.spec	28 Sep 2008 10:32:57 -0000	1.34
+++ fuse.spec	28 Jan 2009 15:50:10 -0000	1.35
@@ -1,25 +1,24 @@
 Name:           fuse
 Version:        2.7.4
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        File System in Userspace (FUSE) utilities
 
 Group:          System Environment/Base
 License:        GPL+
 URL:            http://fuse.sf.net
 Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
-Source1:	fuse-udev.nodes
-Source2:	fuse-makedev.d-fuse
+Source1:        fuse-udev.nodes
+Source2:        fuse-makedev.d-fuse
 
-Patch0:		fuse-udev_rules.patch
-Patch1:		fuse-openfix.patch
-Patch2:         fuse-chkconfig_support.diff
+Patch0:         fuse-udev_rules.patch
+Patch1:         fuse-openfix.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires:	kernel >= 2.6.14
-Requires:	which
-BuildRequires:	libselinux-devel
+Requires:       kernel >= 2.6.14
+Requires:       which
+BuildRequires:  libselinux-devel
 
 Requires(post): /sbin/chkconfig
-Requires(post):	/sbin/MAKEDEV
+Requires(post): /sbin/MAKEDEV
 Requires(preun): /sbin/chkconfig
 Requires(preun): /sbin/service
 Requires(postun):/sbin/service
@@ -42,8 +41,8 @@
 %package devel
 Summary:        File System in Userspace (FUSE) devel files
 Group:          Development/Libraries
-Requires:	%{name}-libs = %{version}-%{release}
-Requires:	pkgconfig
+Requires:       %{name}-libs = %{version}-%{release}
+Requires:       pkgconfig
 License:        LGPLv2+
 
 %description devel
@@ -58,7 +57,6 @@
 sed -i 's|mknod|echo Disabled: mknod |g' util/Makefile.in
 %patch0 -p0 -b .patch0
 %patch1 -p0 -b .patch1
-%patch2 -p0 -b .patch2
 
 %build
 # Can't pass --disable-static here, or else the utils don't build
@@ -75,8 +73,8 @@
 make install DESTDIR=$RPM_BUILD_ROOT
 find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
 # FIXME change from 60 to 99
-install -D -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT/%{_sysconfdir}/udev/makedev.d/99-fuse.nodes
-install -D -p -m 644 %{SOURCE2} $RPM_BUILD_ROOT/%{_sysconfdir}/makedev.d/z-fuse
+install -D -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/udev/makedev.d/99-fuse.nodes
+install -D -p -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/makedev.d/z-fuse
 # change from 4755 to 0755 to allow stripping -- fixed later in files
 chmod 0755 $RPM_BUILD_ROOT/bin/fusermount
 # Put pc file in correct place
@@ -85,6 +83,7 @@
 
 # Get rid of static libs
 rm -f $RPM_BUILD_ROOT/%{_lib}/*.a
+rm -f $RPM_BUILD_ROOT%{_sysconfdir}/init.d/fuse
 
 # Compatibility symlinks
 mkdir -p $RPM_BUILD_ROOT%{_bindir}
@@ -97,18 +96,13 @@
 
 %post
 /sbin/MAKEDEV fuse
-/sbin/chkconfig --add fuse
 
 %preun
-if [ $1 = 0 ]; then
-        /sbin/service fuse stop >/dev/null 2>&1
-        /sbin/chkconfig --del fuse
+if [ -f /etc/init.d/fuse ] ; then
+    /sbin/service fuse stop >/dev/null 2>&1
+    /sbin/chkconfig --del fuse
 fi
 
-%postun
-if [ "$1" -ge "1" ]; then
-        /sbin/service fuse condrestart >/dev/null 2>&1 || :
-fi
 
 %post libs -p /sbin/ldconfig
 
@@ -120,7 +114,6 @@
 /sbin/mount.fuse
 %attr(4755,root,root) /bin/fusermount
 /bin/ulockmgr_server
-%{_sysconfdir}/init.d/fuse
 %{_sysconfdir}/makedev.d/z-fuse
 # Compat symlinks
 %{_bindir}/fusermount
@@ -144,6 +137,9 @@
 %{_includedir}/fuse
 
 %changelog
+* Wed Jan 28 2009 Peter Lemenkov <lemenkov at gmail.com> 2.7.4-2
+- Fixed BZ#479581
+
 * Sat Aug 23 2008 Peter Lemenkov <lemenkov at gmail.com> 2.7.4-1
 - Ver. 2.7.4
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/fuse/devel/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	28 Sep 2008 10:32:57 -0000	1.2
+++ import.log	28 Jan 2009 15:50:11 -0000	1.3
@@ -1,2 +1,3 @@
 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
+fuse-2_7_4-2_fc10:HEAD:fuse-2.7.4-2.fc10.src.rpm:1233157758


--- fuse-chkconfig_support.diff DELETED ---



From mkasik at fedoraproject.org  Wed Jan 28 15:52:50 2009
From: mkasik at fedoraproject.org (=?utf-8?b?TWFyZWsgS2HFocOtaw==?=)
Date: Wed, 28 Jan 2009 15:52:50 +0000 (UTC)
Subject: rpms/gtk2/F-10 gtk2.spec,1.342,1.343
Message-ID: <20090128155250.97AB17010D@cvs1.fedora.phx.redhat.com>

Author: mkasik

Update of /cvs/pkgs/rpms/gtk2/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15007

Modified Files:
	gtk2.spec 
Log Message:
* Wed Jan 28 2009 Marek Kasik <mkasik at redhat.com> - 2.14.7-4
- Add conversion from local time to utc time for scheduled printing



Index: gtk2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtk2/F-10/gtk2.spec,v
retrieving revision 1.342
retrieving revision 1.343
diff -u -r1.342 -r1.343
--- gtk2.spec	28 Jan 2009 14:45:18 -0000	1.342
+++ gtk2.spec	28 Jan 2009 15:52:20 -0000	1.343
@@ -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,6 +32,8 @@
 Patch2: workaround.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=478400
 Patch3: default_printer.patch
+# https://bugzilla.redhat.com/show_bug.cgi?id=471419
+Patch4: print_at_local_time.patch
 
 BuildRequires: atk-devel >= %{atk_version}
 BuildRequires: pango-devel >= %{pango_version}
@@ -300,6 +302,9 @@
 %{_datadir}/gtk-2.0
 
 %changelog
+* Wed Jan 28 2009 Marek Kasik <mkasik at redhat.com> - 2.14.7-4
+- Add conversion from local time to utc time for scheduled printing
+
 * Wed Jan 28 2009 Marek Kasik <mkasik at redhat.com> - 2.14.7-3
 - modify default_printer.patch to show a network default printer
   in the case of no local default printer



From ltinkl at fedoraproject.org  Wed Jan 28 15:55:04 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Wed, 28 Jan 2009 15:55:04 +0000 (UTC)
Subject: rpms/kdeplasma-addons/F-9 kdeplasma-addons.spec, 1.7, 1.8 sources,
	1.7, 1.8
Message-ID: <20090128155504.2C4017010D@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kdeplasma-addons/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15572

Modified Files:
	kdeplasma-addons.spec sources 
Log Message:
KDE 4.2.0



Index: kdeplasma-addons.spec
===================================================================
RCS file: /cvs/extras/rpms/kdeplasma-addons/F-9/kdeplasma-addons.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- kdeplasma-addons.spec	9 Jan 2009 12:20:24 -0000	1.7
+++ kdeplasma-addons.spec	28 Jan 2009 15:54:33 -0000	1.8
@@ -1,6 +1,5 @@
-
 Name:           kdeplasma-addons
-Version:        4.1.4
+Version:        4.2.0
 Release:        1%{?dist}
 Summary:        Additional plasmoids for KDE
 
@@ -10,24 +9,32 @@
 Source0:        ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdeplasma-addons-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  cmake
 BuildRequires:  boost-devel
 BuildRequires:  gettext
-BuildRequires:  kdelibs4-devel >= %{version}
 BuildRequires:  kdepimlibs-devel >= %{version}
+BuildRequires:  plasma-devel >= %{version}
+# for libplasmaclock
 BuildRequires:  kdebase-workspace-devel >= %{version}
 BuildRequires:  openldap-devel
 BuildRequires:  qimageblitz-devel
+%if 0%{?fedora} >= 10
+# Optional (but recommended), enables automatic rotation for frame applet
+# Not available on Fedora 9
+BuildRequires:  libkexiv2-devel >= 0.4.0
+%endif
 
 # most of former kdeaddons for KDE3 is now here
 Obsoletes: kdeaddons < 4
 # extragear-plasma -> kdeplasmoids rename
-Obsoletes: extragear-plasma < %{version}-%{release}
+Obsoletes: extragear-plasma < 4.1 
 Provides:  extragear-plasma = %{version}-%{release}
-# Oh gawd, another rename 
-Obsoletes: kdeplasmoids < %{version}-%{release}
+# Oh gawd, another rename
+Obsoletes: kdeplasmoids < 4.1 
 Provides: kdeplasmoids = %{version}-%{release}
 
+Obsoletes: kde-plasma-lancelot < 4.0.80
+Provides: kde-plasma-lancelot = %{version}-%{release}
+
 Requires(post): /sbin/ldconfig xdg-utils
 Requires(postun): /sbin/ldconfig xdg-utils
 
@@ -54,11 +61,12 @@
 %install
 rm -rf %{buildroot}
 
-make install DESTDIR=%{buildroot} -C %{_target_platform}
+make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
 # unpackaged files
 # omit -devel type stuff, for now
 rm -f %{buildroot}%{_kde4_libdir}/libplasma*.so
+rm -f %{buildroot}%{_kde4_libdir}/liblancelot*.so
 rm -rf %{buildroot}%{_kde4_includedir}/
 
 
@@ -79,22 +87,56 @@
 %files
 %defattr(-,root,root,-)
 %doc COPYING COPYING.LIB
+%{_kde4_bindir}/lancelot
+%{_kde4_appsdir}/bball/
 %{_kde4_appsdir}/desktoptheme/*
-%{_kde4_appsdir}/plasma-comic/
+%{_kde4_appsdir}/plasma/services/*
+%{_kde4_appsdir}/plasma-bluemarble/
+%{_kde4_appsdir}/rssnow/
+%{_kde4_datadir}/config/*
 %{_kde4_datadir}/kde4/services/*
 %{_kde4_datadir}/kde4/servicetypes/*
+%{_kde4_datadir}/mime/packages/lancelotpart-mime.xml
+%{_kde4_datadir}/dbus-1/services/org.kde.lancelot.service
 %{_kde4_libdir}/kde4/*
+%{_kde4_libdir}/liblancelot.so.*
+%{_kde4_libdir}/libplasmaconverter.so.*
 %{_kde4_libdir}/libplasmacomicprovidercore.so.*
-%{_kde4_libdir}/libplasmaappletdialog.so.*
+# %{_kde4_libdir}/libplasmaappletdialog.so.*
 %{_kde4_iconsdir}/hicolor/*/*/*
+%{_kde4_iconsdir}/oxygen/*/*/*
 
 
 %changelog
-* Fri Jan  9 2009 Luk???? Tinkl <ltinkl at redhat.com> 4.1.4-1
-- KDE 4.1.4
+* Thu Jan 22 2009 Than Ngo <than at redhat.com> - 4.2.0-1
+- 4.2.0
+
+* Wed Jan 07 2009 Than Ngo <than at redhat.com> - 4.1.96-1
+- 4.2rc1
+
+* Tue Dec 16 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.85-2
+- saner versioned Obsoletes
+
+* Fri Dec 12 2008 Than Ngo <than at redhat.com> 4.1.85-1
+- 4.2beta2
+
+* Tue Dec 02 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.80-3
+- BR plasma-devel
+- add Provides: kde-plasma-lancelot
+- fix file list
+- BR libkexiv2-devel >= 0.4.0 on F10+
+
+* Thu Nov 20 2008 Than Ngo <than at redhat.com> 4.1.80-2
+- merged
+- add Obsoletes: kde-plasma-lancelot
+
+* Thu Nov 20 2008 Lorenzo Villani <lvillani at binaryhelix.net> - 4.1.80-1
+- 4.1.80
+- BR cmake >= 2.6.2
+- make install/fast
 
-* Thu Nov  6 2008 Luk???? Tinkl <ltinkl at redhat.com> 4.1.3-1
-- KDE 4.1.3
+* Wed Nov 12 2008 Than Ngo <than at redhat.com> 4.1.3-1
+- 4.1.3
 
 * Mon Sep 29 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-2
 - make VERBOSE=1


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdeplasma-addons/F-9/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	9 Jan 2009 12:20:24 -0000	1.7
+++ sources	28 Jan 2009 15:54:33 -0000	1.8
@@ -1 +1 @@
-4a0df1a79854539a4022df2308629dc9  kdeplasma-addons-4.1.4.tar.bz2
+d98f805f4c9b7af7278067f9e544b2ec  kdeplasma-addons-4.2.0.tar.bz2



From langel at fedoraproject.org  Wed Jan 28 15:55:25 2009
From: langel at fedoraproject.org (Lillian Angel)
Date: Wed, 28 Jan 2009 15:55:25 +0000 (UTC)
Subject: rpms/java-1.6.0-openjdk/F-10 sources,1.53,1.54
Message-ID: <20090128155525.29C6D7010D@cvs1.fedora.phx.redhat.com>

Author: langel

Update of /cvs/pkgs/rpms/java-1.6.0-openjdk/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15691

Modified Files:
	sources 
Log Message:
Updated sources.




Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/F-10/sources,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- sources	26 Jan 2009 14:11:13 -0000	1.53
+++ sources	28 Jan 2009 15:54:54 -0000	1.54
@@ -3,4 +3,4 @@
 a9cdc5f050eb6e97c1b15ddd39978710  mauve-2008-10-22.tar.gz
 79d9511129158fa4fd3798a506757a5d  openjdk-6-src-b14-25_nov_2008-fedora.tar.gz
 c8f78d48ac83987bc2adebeebcd354e9  hotspot.tar.gz
-dc332ed85806b9d8bb271deb0f1ee1fb  icedtea6-1.4.tar.gz
+6428ca1b0c38111cca230f5b69460b03  icedtea6-1.4.tar.gz



From kkofler at fedoraproject.org  Wed Jan 28 15:56:16 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Wed, 28 Jan 2009 15:56:16 +0000 (UTC)
Subject: rpms/kdelibs/F-10 plasma-on-screensaver-security-fix.diff,1.1,NONE
Message-ID: <20090128155616.CF32F7010D@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdelibs/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15936/F-10

Removed Files:
	plasma-on-screensaver-security-fix.diff 
Log Message:
Remove plasma-on-screensaver-security patch, already in respun tarball and thus no longer applied.


--- plasma-on-screensaver-security-fix.diff DELETED ---



From kkofler at fedoraproject.org  Wed Jan 28 15:56:17 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Wed, 28 Jan 2009 15:56:17 +0000 (UTC)
Subject: rpms/kdelibs/F-9 plasma-on-screensaver-security-fix.diff,1.1,NONE
Message-ID: <20090128155617.146A670141@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdelibs/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15936/F-9

Removed Files:
	plasma-on-screensaver-security-fix.diff 
Log Message:
Remove plasma-on-screensaver-security patch, already in respun tarball and thus no longer applied.


--- plasma-on-screensaver-security-fix.diff DELETED ---



From kkofler at fedoraproject.org  Wed Jan 28 15:56:17 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Wed, 28 Jan 2009 15:56:17 +0000 (UTC)
Subject: rpms/kdelibs/devel plasma-on-screensaver-security-fix.diff, 1.1,
	NONE
Message-ID: <20090128155617.6776B7010D@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdelibs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15936/devel

Removed Files:
	plasma-on-screensaver-security-fix.diff 
Log Message:
Remove plasma-on-screensaver-security patch, already in respun tarball and thus no longer applied.


--- plasma-on-screensaver-security-fix.diff DELETED ---



From langel at fedoraproject.org  Wed Jan 28 15:56:46 2009
From: langel at fedoraproject.org (Lillian Angel)
Date: Wed, 28 Jan 2009 15:56:46 +0000 (UTC)
Subject: rpms/java-1.6.0-openjdk/devel sources,1.58,1.59
Message-ID: <20090128155646.258947010D@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-serv16001

Modified Files:
	sources 
Log Message:
 Updated sources.




Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/devel/sources,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- sources	26 Jan 2009 14:13:46 -0000	1.58
+++ sources	28 Jan 2009 15:56:15 -0000	1.59
@@ -3,4 +3,4 @@
 a9cdc5f050eb6e97c1b15ddd39978710  mauve-2008-10-22.tar.gz
 bd07d61915e403a55a6ef42842b0cf8c  openjdk-6-src-b14-25_nov_2008-fedora.tar.gz
 c8f78d48ac83987bc2adebeebcd354e9  hotspot.tar.gz
-dc332ed85806b9d8bb271deb0f1ee1fb  icedtea6-1.4.tar.gz
+6428ca1b0c38111cca230f5b69460b03  icedtea6-1.4.tar.gz



From jreznik at fedoraproject.org  Wed Jan 28 15:58:19 2009
From: jreznik at fedoraproject.org (Jaroslav Reznik)
Date: Wed, 28 Jan 2009 15:58:19 +0000 (UTC)
Subject: rpms/kde-plasma-runcommand/F-10 import.log, 1.1,
	1.2 kde-plasma-runcommand.spec, 1.3, 1.4 sources, 1.4,
	1.5 kde-plasma-runcommand-0.9-plasma-libs.patch, 1.1, NONE
Message-ID: <20090128155819.484BC7010D@cvs1.fedora.phx.redhat.com>

Author: jreznik

Update of /cvs/pkgs/rpms/kde-plasma-runcommand/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16252

Modified Files:
	import.log kde-plasma-runcommand.spec sources 
Removed Files:
	kde-plasma-runcommand-0.9-plasma-libs.patch 
Log Message:
* Tue Jan 27 2009 Jaroslav Reznik <jreznik at redhat.com> 1.0-1
- update to 1.0, cmake related changes



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-runcommand/F-10/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	13 Nov 2008 09:25:52 -0000	1.1
+++ import.log	28 Jan 2009 15:57:48 -0000	1.2
@@ -1 +1 @@
-kde-plasma-runcommand-0_6-1_fc11:F-10:kde-plasma-runcommand-0.6-1.fc11.src.rpm:1226568296
+kde-plasma-runcommand-0_4-1_fc9:HEAD:kde-plasma-runcommand-0.4-1.fc9.src.rpm:1226565914


Index: kde-plasma-runcommand.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-runcommand/F-10/kde-plasma-runcommand.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- kde-plasma-runcommand.spec	2 Jan 2009 12:29:12 -0000	1.3
+++ kde-plasma-runcommand.spec	28 Jan 2009 15:57:48 -0000	1.4
@@ -1,5 +1,5 @@
 Name:           kde-plasma-runcommand
-Version:        0.9
+Version:        1.0
 Release:        1%{?dist}
 Summary:        Simple plasmoid to run commands without using terminal or KRunner
 
@@ -8,11 +8,10 @@
 URL:            http://www.kde-look.org/content/show.php/Run+Command?content=91495
 
 Source0:        http://www.kde-look.org/CONTENT/content-files/91495-runcommand_%{version}.tar.bz2
-Patch0:         kde-plasma-runcommand-0.9-plasma-libs.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  kdebase-workspace-devel >= 4.1.0
+BuildRequires:  kdebase-workspace-devel >= 4.2.0
 
 %description
 Simple plasmoid to run commands without using terminal or KRunner. Inspired by
@@ -21,7 +20,7 @@
 
 %prep
 %setup -qn runcommand_%{version}
-%patch0 -p1 -b .plasma-libs
+
 
 %build
 mkdir -p %{_target_platform}
@@ -29,7 +28,7 @@
 %{cmake_kde4} ../applet
 popd
 
-make %{?_smp_mflags} -C %{_target_platform}
+make VERBOSE=1 %{?_smp_mflags} -C %{_target_platform}
 
 
 %install
@@ -48,9 +47,14 @@
 %{_kde4_datadir}/kde4/services/plasma-applet-runcommand.desktop
 
 %changelog
+* Tue Jan 27 2009 Jaroslav Reznik <jreznik at redhat.com> 1.0-1
+- update to 1.0, cmake related changes
+
 * Fri Jan 02 2009 Jaroslav Reznik <jreznik at redhat.com> 0.9-1
-- update 0.9
-- link target against PLASMA_LIBS
+- update to 0.9
+
+* Tue Dec 02 2008 Jaroslav Reznik <jreznik at redhat.com> 0.7-2
+- make VERBOSE=1
 
 * Wed Nov 19 2008 Jaroslav Reznik <jreznik at redhat.com> 0.7-1
 - update to 0.7


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-runcommand/F-10/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	2 Jan 2009 12:29:12 -0000	1.4
+++ sources	28 Jan 2009 15:57:48 -0000	1.5
@@ -1 +1 @@
-a98d6e3f32b85eae3f299c06cb8432f2  91495-runcommand_0.9.tar.bz2
+2b84999f79af020156ee586cc08310df  91495-runcommand_1.0.tar.bz2


--- kde-plasma-runcommand-0.9-plasma-libs.patch DELETED ---



From msivak at fedoraproject.org  Wed Jan 28 15:58:26 2009
From: msivak at fedoraproject.org (=?utf-8?q?Martin_Siv=C3=A1k?=)
Date: Wed, 28 Jan 2009 15:58:26 +0000 (UTC)
Subject: rpms/rhpl/devel .cvsignore, 1.90, 1.91 rhpl.spec, 1.119,
	1.120 sources, 1.99, 1.100
Message-ID: <20090128155826.1772D7010D@cvs1.fedora.phx.redhat.com>

Author: msivak

Update of /cvs/extras/rpms/rhpl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16302

Modified Files:
	.cvsignore rhpl.spec sources 
Log Message:
New version



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rhpl/devel/.cvsignore,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -r1.90 -r1.91
--- .cvsignore	27 Oct 2008 19:54:54 -0000	1.90
+++ .cvsignore	28 Jan 2009 15:57:55 -0000	1.91
@@ -1 +1 @@
-rhpl-0.218.tar.bz2
+rhpl-0.219.tar.bz2


Index: rhpl.spec
===================================================================
RCS file: /cvs/extras/rpms/rhpl/devel/rhpl.spec,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -r1.119 -r1.120
--- rhpl.spec	29 Nov 2008 05:16:34 -0000	1.119
+++ rhpl.spec	28 Jan 2009 15:57:55 -0000	1.120
@@ -2,8 +2,8 @@
 
 Summary: Library of Python code used by installation and configuration tools
 Name: rhpl
-Version: 0.218
-Release: 2
+Version: 0.219
+Release: 1
 Source0: %{name}-%{version}.tar.bz2
 License: GPLv2+
 Group: System Environment/Libraries
@@ -41,6 +41,9 @@
 %{python_sitearch}/rhpl
 
 %changelog
+* Tue Jan 27 2009 Martin Sivak <msivak at redhat.com> 0.219-1
+- National keyboard layout is prefered over us variant (#473056)
+
 * Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 0.218-2
 - Rebuild for Python 2.6
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rhpl/devel/sources,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -r1.99 -r1.100
--- sources	27 Oct 2008 19:54:54 -0000	1.99
+++ sources	28 Jan 2009 15:57:55 -0000	1.100
@@ -1 +1 @@
-46bb534affa9c0ee5e10565048306269  rhpl-0.218.tar.bz2
+2224daa17342305d65055788dc253324  rhpl-0.219.tar.bz2



From peter at fedoraproject.org  Wed Jan 28 15:59:47 2009
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Wed, 28 Jan 2009 15:59:47 +0000 (UTC)
Subject: rpms/fuse/F-10 fuse.spec, 1.34, 1.35 import.log, 1.2,
	1.3 fuse-chkconfig_support.diff, 1.2, NONE
Message-ID: <20090128155947.7922A7010D@cvs1.fedora.phx.redhat.com>

Author: peter

Update of /cvs/pkgs/rpms/fuse/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16674/F-10

Modified Files:
	fuse.spec import.log 
Removed Files:
	fuse-chkconfig_support.diff 
Log Message:
Fixed BZ#479581


Index: fuse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fuse/F-10/fuse.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- fuse.spec	28 Sep 2008 10:32:57 -0000	1.34
+++ fuse.spec	28 Jan 2009 15:59:17 -0000	1.35
@@ -1,25 +1,24 @@
 Name:           fuse
 Version:        2.7.4
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        File System in Userspace (FUSE) utilities
 
 Group:          System Environment/Base
 License:        GPL+
 URL:            http://fuse.sf.net
 Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
-Source1:	fuse-udev.nodes
-Source2:	fuse-makedev.d-fuse
+Source1:        fuse-udev.nodes
+Source2:        fuse-makedev.d-fuse
 
-Patch0:		fuse-udev_rules.patch
-Patch1:		fuse-openfix.patch
-Patch2:         fuse-chkconfig_support.diff
+Patch0:         fuse-udev_rules.patch
+Patch1:         fuse-openfix.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires:	kernel >= 2.6.14
-Requires:	which
-BuildRequires:	libselinux-devel
+Requires:       kernel >= 2.6.14
+Requires:       which
+BuildRequires:  libselinux-devel
 
 Requires(post): /sbin/chkconfig
-Requires(post):	/sbin/MAKEDEV
+Requires(post): /sbin/MAKEDEV
 Requires(preun): /sbin/chkconfig
 Requires(preun): /sbin/service
 Requires(postun):/sbin/service
@@ -42,8 +41,8 @@
 %package devel
 Summary:        File System in Userspace (FUSE) devel files
 Group:          Development/Libraries
-Requires:	%{name}-libs = %{version}-%{release}
-Requires:	pkgconfig
+Requires:       %{name}-libs = %{version}-%{release}
+Requires:       pkgconfig
 License:        LGPLv2+
 
 %description devel
@@ -58,7 +57,6 @@
 sed -i 's|mknod|echo Disabled: mknod |g' util/Makefile.in
 %patch0 -p0 -b .patch0
 %patch1 -p0 -b .patch1
-%patch2 -p0 -b .patch2
 
 %build
 # Can't pass --disable-static here, or else the utils don't build
@@ -75,8 +73,8 @@
 make install DESTDIR=$RPM_BUILD_ROOT
 find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
 # FIXME change from 60 to 99
-install -D -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT/%{_sysconfdir}/udev/makedev.d/99-fuse.nodes
-install -D -p -m 644 %{SOURCE2} $RPM_BUILD_ROOT/%{_sysconfdir}/makedev.d/z-fuse
+install -D -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/udev/makedev.d/99-fuse.nodes
+install -D -p -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/makedev.d/z-fuse
 # change from 4755 to 0755 to allow stripping -- fixed later in files
 chmod 0755 $RPM_BUILD_ROOT/bin/fusermount
 # Put pc file in correct place
@@ -85,6 +83,7 @@
 
 # Get rid of static libs
 rm -f $RPM_BUILD_ROOT/%{_lib}/*.a
+rm -f $RPM_BUILD_ROOT%{_sysconfdir}/init.d/fuse
 
 # Compatibility symlinks
 mkdir -p $RPM_BUILD_ROOT%{_bindir}
@@ -97,18 +96,13 @@
 
 %post
 /sbin/MAKEDEV fuse
-/sbin/chkconfig --add fuse
 
 %preun
-if [ $1 = 0 ]; then
-        /sbin/service fuse stop >/dev/null 2>&1
-        /sbin/chkconfig --del fuse
+if [ -f /etc/init.d/fuse ] ; then
+    /sbin/service fuse stop >/dev/null 2>&1
+    /sbin/chkconfig --del fuse
 fi
 
-%postun
-if [ "$1" -ge "1" ]; then
-        /sbin/service fuse condrestart >/dev/null 2>&1 || :
-fi
 
 %post libs -p /sbin/ldconfig
 
@@ -120,7 +114,6 @@
 /sbin/mount.fuse
 %attr(4755,root,root) /bin/fusermount
 /bin/ulockmgr_server
-%{_sysconfdir}/init.d/fuse
 %{_sysconfdir}/makedev.d/z-fuse
 # Compat symlinks
 %{_bindir}/fusermount
@@ -144,6 +137,9 @@
 %{_includedir}/fuse
 
 %changelog
+* Wed Jan 28 2009 Peter Lemenkov <lemenkov at gmail.com> 2.7.4-2
+- Fixed BZ#479581
+
 * Sat Aug 23 2008 Peter Lemenkov <lemenkov at gmail.com> 2.7.4-1
 - Ver. 2.7.4
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/fuse/F-10/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	28 Sep 2008 10:32:57 -0000	1.2
+++ import.log	28 Jan 2009 15:59:17 -0000	1.3
@@ -1,2 +1,3 @@
 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
+fuse-2_7_4-2_fc10:F-10:fuse-2.7.4-2.fc10.src.rpm:1233157867


--- fuse-chkconfig_support.diff DELETED ---



From ltinkl at fedoraproject.org  Wed Jan 28 16:00:34 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Wed, 28 Jan 2009 16:00:34 +0000 (UTC)
Subject: rpms/kdesdk/F-9 kdesdk.spec, 1.112, 1.113 sources, 1.49,
	1.50 kdesdk-4.1.1-quit.patch, 1.1, NONE
Message-ID: <20090128160034.6DDCF7010D@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kdesdk/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16826

Modified Files:
	kdesdk.spec sources 
Removed Files:
	kdesdk-4.1.1-quit.patch 
Log Message:
KDE 4.2.0



Index: kdesdk.spec
===================================================================
RCS file: /cvs/extras/rpms/kdesdk/F-9/kdesdk.spec,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -r1.112 -r1.113
--- kdesdk.spec	9 Jan 2009 12:57:28 -0000	1.112
+++ kdesdk.spec	28 Jan 2009 16:00:04 -0000	1.113
@@ -1,6 +1,5 @@
-
 Name:           kdesdk
-Version:        4.1.4
+Version:        4.2.0
 Release:        1%{?dist}
 Summary:        The KDE Software Development Kit (SDK)
 
@@ -9,18 +8,12 @@
 License:        GPLv2
 URL:            http://www.kde.org/
 Source0:        ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
+# upstream patches
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-## upstream patches
-Patch100:       kdesdk-4.1.1-quit.patch
-
-BuildRequires:  kde-filesystem >= 4
-%{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
-BuildRequires:  kdelibs4-devel >= %{version}
 BuildRequires:  kdepimlibs-devel >= %{version}
-BuildRequires:  kdebase-workspace-devel >= %{version}
+BuildRequires:  plasma-devel >= %{version}
 BuildRequires:  strigi-devel
-BuildRequires:  cmake
 BuildRequires:  flex
 BuildRequires:  giflib-devel
 BuildRequires:  apr-devel
@@ -32,18 +25,15 @@
 BuildRequires:  libtool-ltdl-devel
 BuildRequires:  subversion-devel
 BuildRequires:  boost-devel
+BuildRequires:  libical-devel
 # for libiberty (used by kmtrace for cp_demangle)
 # IMPORTANT: check licensing from time to time, currently libiberty is still
 #            GPLv2+/LGPLv2+
 BuildRequires:  binutils-devel
-# for kbugbuster
-BuildRequires:  libical-devel
 
 Requires(post): xdg-utils
 Requires(postun): xdg-utils
-Requires: kdelibs4 >= %{version}
 Requires: kdepimlibs >= %{version}
-Requires: kdebase-workspace >= %{version}
 Requires: %{name}-libs = %{version}-%{release}
 
 # not *strictly* required, helps upgrade case so tools don't disappear
@@ -73,7 +63,7 @@
 Summary:  Developer files for %{name}
 Group:    Development/Libraries
 Requires: %{name}-libs = %{version}-%{release}
-Requires: kdelibs4-devel kdepimlibs-devel
+Requires: kdepimlibs-devel
 %description devel
 Files for developing applications using %{name}.
 
@@ -92,7 +82,6 @@
 %setup -q
 
 # upstream patches
-%patch100 -p1 -b .quit
 
 %build
 mkdir -p %{_target_platform}
@@ -106,10 +95,13 @@
 %install
 rm -rf %{buildroot}
 
-make install DESTDIR=%{buildroot} -C %{_target_platform}
+make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
 # unpackaged files
 rm -f %{buildroot}%{_kde4_libdir}/libantlr.so
+# This one fits better into krazy2 (it requires krazy2), and the version in
+# kdesdk does not understand lib64.
+rm -f %{buildroot}%{_kde4_bindir}/krazy-licensecheck
 
 # move devel symlinks
 mkdir -p %{buildroot}%{_kde4_libdir}/kde4/devel
@@ -157,15 +149,16 @@
 %{_kde4_appsdir}/cervisia/
 %{_kde4_appsdir}/cervisiapart/*
 %{_kde4_appsdir}/kabc/*
-%{_kde4_appsdir}/kapptemplate/
 %{_kde4_appsdir}/katepart/
 %{_kde4_appsdir}/kate/
 %{_kde4_appsdir}/kbugbuster/
 %{_kde4_appsdir}/kcachegrind/*
 %{_kde4_appsdir}/kconf_update/*
+%{_kde4_appsdir}/kio_perldoc/
 %{_kde4_appsdir}/kdevappwizard/
 %{_kde4_appsdir}/kmtrace/
 %{_kde4_appsdir}/kompare/
+%{_kde4_appsdir}/kpartloader/
 %{_kde4_appsdir}/kuiviewer/*
 %{_kde4_appsdir}/kuiviewerpart/*
 %{_kde4_appsdir}/lokalize/
@@ -222,11 +215,45 @@
 
 
 %changelog
-* Fri Jan  9 2009 Luk???? Tinkl <ltinkl at redhat.com> 4.1.4-1
-- KDE 4.1.4
+* Thu Jan 22 2009 Than Ngo <than at redhat.com> - 4.2.0-1
+- 4.2.0
+
+* Mon Jan 19 2009 Than Ngo <than at redhat.com> - 4.1.96-4
+- apply patch to fix  build against Boost 1.37.0 
+
+* Tue Jan 13 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.96-3
+- F11+: add workaround to fix build against Boost 1.37.0
+
+* Fri Jan 09 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.96-2
+- don't ship krazy-licensecheck, should be in krazy2
+
+* Wed Jan 07 2009 Than Ngo <than at redhat.com> - 4.1.96-1
+- 4.2rc1
+
+* Fri Dec 12 2008 Than Ngo <than at redhat.com> 4.1.85-1
+- 4.2beta2
+
+* Mon Dec 01 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.80-3
+- BR plasma-devel instead of kdebase-workspace-devel
+- don't require kdebase-workspace
+- rebase Lokalize quit menu patch
+- BR libical-devel
+
+* Thu Nov 20 2008 Than Ngo <than at redhat.com> 4.1.80-2
+- merged
+
+* Thu Nov 20 2008 Lorenzo Villani <lvillani at binaryhelix.net> 4.1.80-1
+- 4.1.80
+- BR cmake >= 2.6.2
+- make install/fast
+- kdesdk-4.1.2-kdecore.patch upstreamed, dropped
+
+* Wed Nov 12 2008 Than Ngo <than at redhat.com> 4.1.3-1
+- 4.1.3
 
-* Thu Nov  6 2008 Luk???? Tinkl <ltinkl at redhat.com> 4.1.3-1
-- KDE 4.1.3
+* Wed Oct 22 2008 Than Ngo <than at redhat.com> 4.1.2-4
+- check if the document has been saved, if not ask the user
+  to save the change or close without saving
 
 * Wed Oct 22 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-3
 - -utils should not depend on kdelibs etc (#467984)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdesdk/F-9/sources,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- sources	9 Jan 2009 12:38:25 -0000	1.49
+++ sources	28 Jan 2009 16:00:04 -0000	1.50
@@ -1 +1 @@
-1ca874a1d239018472bf27d0f2b98feb  kdesdk-4.1.4.tar.bz2
+79d01b4f10f1ecc283f7860d2c7973e9  kdesdk-4.2.0.tar.bz2


--- kdesdk-4.1.1-quit.patch DELETED ---



From jwrdegoede at fedoraproject.org  Wed Jan 28 16:02:20 2009
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Wed, 28 Jan 2009 16:02:20 +0000 (UTC)
Subject: rpms/iscsi-initiator-utils/devel iscsi-initiator-utils.spec, 1.36, 
	1.37
Message-ID: <20090128160220.203FD7010D@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-serv17235

Modified Files:
	iscsi-initiator-utils.spec 
Log Message:
* Wed Jan 28 2009 Hans de Goede <hdegoede at redhat.com> 6.2.0.870-2
- Add libiscsi iscsi administration library and -devel subpackage



Index: iscsi-initiator-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/iscsi-initiator-utils/devel/iscsi-initiator-utils.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- iscsi-initiator-utils.spec	28 Jan 2009 15:47:47 -0000	1.36
+++ iscsi-initiator-utils.spec	28 Jan 2009 16:01:49 -0000	1.37
@@ -22,7 +22,7 @@
 License: GPLv2+
 URL: http://www.open-iscsi.org
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: openssl-devel flex bison python-devel
+BuildRequires: openssl-devel flex bison python-devel doxygen
 Requires(post): chkconfig
 Requires(preun): chkconfig /sbin/service
 ExcludeArch: s390 s390x
@@ -157,7 +157,7 @@
 
 %changelog
 * Wed Jan 28 2009 Hans de Goede <hdegoede at redhat.com> 6.2.0.870-2
-- Add libiscsi iscsi administartion library and -devel subpackage
+- Add libiscsi iscsi administration library and -devel subpackage
 
 * Tue Nov  25 2008 Mike Christie <mchristie at redhat.com> 6.2.0.870-1.0
 - Rebase to upstream



From mkasik at fedoraproject.org  Wed Jan 28 16:04:14 2009
From: mkasik at fedoraproject.org (=?utf-8?b?TWFyZWsgS2HFocOtaw==?=)
Date: Wed, 28 Jan 2009 16:04:14 +0000 (UTC)
Subject: rpms/gtk2/F-10 print_at_local_time.patch,NONE,1.1
Message-ID: <20090128160414.3FE357010D@cvs1.fedora.phx.redhat.com>

Author: mkasik

Update of /cvs/pkgs/rpms/gtk2/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17816

Added Files:
	print_at_local_time.patch 
Log Message:
Added print_at_local_time.patch.



print_at_local_time.patch:

--- NEW FILE print_at_local_time.patch ---
--- gtk/gtkprintunixdialog.c	2009-01-07 17:32:57.000000000 +0100
+++ gtk/gtkprintunixdialog.c	2009-01-28 16:01:21.000000000 +0100
@@ -2691,6 +2691,8 @@ create_job_page (GtkPrintUnixDialog *dia
   GtkWidget *main_table, *label;
   GtkWidget *frame, *table, *radio;
   GtkWidget *entry, *widget;
+  const gchar *at_tooltip;
+  const gchar *on_hold_tooltip;
 
   main_table = gtk_table_new (2, 2, FALSE);
   gtk_container_set_border_width (GTK_CONTAINER (main_table), 12);
@@ -2760,6 +2762,12 @@ create_job_page (GtkPrintUnixDialog *dia
    */
   radio = gtk_radio_button_new_with_mnemonic (gtk_radio_button_get_group (GTK_RADIO_BUTTON (radio)),
 					      _("A_t:"));
+
+  /* Translators: Ability to parse the am/pm format depends on actual locale.
+   * You can remove the am/pm values below for your locale if they are not supported. 
+   */ 
+  at_tooltip = _("Specify the time of print,\n e.g. 15:30, 2:35 pm, 14:15:20, 11:46:30 am, 4 pm");
+  gtk_widget_set_tooltip_text (radio, at_tooltip);
   priv->print_at_radio = radio;
   gtk_widget_show (radio);
   gtk_table_attach (GTK_TABLE (table), radio,
@@ -2767,6 +2775,7 @@ create_job_page (GtkPrintUnixDialog *dia
 		    0, 0);
 
   entry = gtk_entry_new ();
+  gtk_widget_set_tooltip_text (entry, at_tooltip);
   priv->print_at_entry = entry;
   gtk_widget_show (entry);
   gtk_table_attach (GTK_TABLE (table), entry,
@@ -2779,6 +2788,8 @@ create_job_page (GtkPrintUnixDialog *dia
    */
   radio = gtk_radio_button_new_with_mnemonic (gtk_radio_button_get_group (GTK_RADIO_BUTTON (radio)),
 					      _("On _hold"));
+  on_hold_tooltip = _("Hold the job until it is explicitly released");
+  gtk_widget_set_tooltip_text (radio, on_hold_tooltip);
   priv->print_hold_radio = radio;
   gtk_widget_show (radio);
   gtk_table_attach (GTK_TABLE (table), radio,
--- modules/printbackends/cups/gtkprintbackendcups.c	2009-01-28 15:52:31.000000000 +0100
+++ modules/printbackends/cups/gtkprintbackendcups.c	2009-01-28 15:57:23.000000000 +0100
@@ -19,12 +19,17 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#ifdef __linux__
+#define _GNU_SOURCE
+#endif
+
 #include "config.h"
 #include <ctype.h>
 #include <unistd.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <stdlib.h>
+#include <time.h>
 
 #include <cups/cups.h>
 #include <cups/language.h>
@@ -3437,6 +3442,83 @@ foreach_option_get_settings (GtkPrinterO
     gtk_print_settings_set (settings, option->name, value);
 }
 
+static gboolean
+supports_am_pm (void)
+{
+  struct tm tmp_tm = { 0 };
+  char   time[8];
+  int    length;
+
+  length = strftime (time, sizeof (time), "%p", &tmp_tm);
+
+  return length != 0;
+}
+
+/* Converts local time to UTC time. Local time has to be in HH:MM format or
+ * in HH:MM:SS format or in HH:MM:SS {am, pm} format or in HH:MM {am, pm} format
+ * or in HH {am, pm} format.
+ * Returns a newly allocated string holding UTC time in HH:MM:SS format
+ * or NULL.
+ */
+gchar *
+localtime_to_utctime (const char *local_time)
+{
+  const char *formats_0[] = {" %I : %M : %S %p ", " %H : %M : %S ", " %I : %M %p ", " %H : %M ", " %I %p "};
+  const char *formats_1[] = {" %H : %M : %S ", " %H : %M "};
+  const char *end = NULL;
+  struct tm  *actual_local_time;
+  struct tm  *actual_utc_time;
+  struct tm   local_print_time;
+  struct tm   utc_print_time;
+  struct tm   diff_time;
+  gchar      *utc_time = NULL;
+  int         i, n;
+
+  if (local_time == NULL || local_time[0] == '\0')
+    return NULL;
+
+  n = supports_am_pm () ? G_N_ELEMENTS (formats_0) : G_N_ELEMENTS (formats_1);
+
+  for (i = 0; i < n; i++)
+    {
+      local_print_time.tm_hour = 0;
+      local_print_time.tm_min  = 0;
+      local_print_time.tm_sec  = 0;
+
+      if (supports_am_pm ())
+        end = strptime (local_time, formats_0[i], &local_print_time);
+      else
+        end = strptime (local_time, formats_1[i], &local_print_time);
+
+      if (end != NULL && end[0] == '\0')
+        break;
+    }
+
+  if (end != NULL && end[0] == '\0')
+    {
+      time_t rawtime;
+      time (&rawtime);
+
+      actual_utc_time = g_memdup (gmtime (&rawtime), sizeof (struct tm));
+      actual_local_time = g_memdup (localtime (&rawtime), sizeof (struct tm));
+
+      diff_time.tm_hour = actual_utc_time->tm_hour - actual_local_time->tm_hour;
+      diff_time.tm_min  = actual_utc_time->tm_min  - actual_local_time->tm_min;
+      diff_time.tm_sec  = actual_utc_time->tm_sec  - actual_local_time->tm_sec;
+
+      utc_print_time.tm_hour = ((local_print_time.tm_hour + diff_time.tm_hour) + 24) % 24;
+      utc_print_time.tm_min  = ((local_print_time.tm_min  + diff_time.tm_min)  + 60) % 60;
+      utc_print_time.tm_sec  = ((local_print_time.tm_sec  + diff_time.tm_sec)  + 60) % 60;
+
+      utc_time = g_strdup_printf ("%02d:%02d:%02d",
+                                  utc_print_time.tm_hour,
+                                  utc_print_time.tm_min,
+                                  utc_print_time.tm_sec);
+    }
+
+  return utc_time;
+}
+
 static void
 cups_printer_get_settings_from_options (GtkPrinter          *printer,
 					GtkPrinterOptionSet *options,
@@ -3467,8 +3549,21 @@ cups_printer_get_settings_from_options (
 
       print_at = gtk_print_settings_get (settings, "print-at");
       print_at_time = gtk_print_settings_get (settings, "print-at-time");
+
       if (strcmp (print_at, "at") == 0)
-	gtk_print_settings_set (settings, "cups-job-hold-until", print_at_time);
+        {
+          gchar *utc_time = NULL;
+          
+          utc_time = localtime_to_utctime (print_at_time);
+
+          if (utc_time != NULL)
+            {
+              gtk_print_settings_set (settings, "cups-job-hold-until", utc_time);
+              g_free (utc_time);
+            }
+          else
+            gtk_print_settings_set (settings, "cups-job-hold-until", print_at_time);
+        }
       else if (strcmp (print_at, "on-hold") == 0)
 	gtk_print_settings_set (settings, "cups-job-hold-until", "indefinite");
     }



From mkasik at fedoraproject.org  Wed Jan 28 16:06:56 2009
From: mkasik at fedoraproject.org (=?utf-8?b?TWFyZWsgS2HFocOtaw==?=)
Date: Wed, 28 Jan 2009 16:06:56 +0000 (UTC)
Subject: rpms/gtk2/F-10 gtk2.spec,1.343,1.344
Message-ID: <20090128160657.005B47010D@cvs1.fedora.phx.redhat.com>

Author: mkasik

Update of /cvs/pkgs/rpms/gtk2/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18968

Modified Files:
	gtk2.spec 
Log Message:
* Wed Jan 28 2009 Marek Kasik <mkasik at redhat.com> - 2.14.7-5
- Add print_at_local_time.patch



Index: gtk2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtk2/F-10/gtk2.spec,v
retrieving revision 1.343
retrieving revision 1.344
diff -u -r1.343 -r1.344
--- gtk2.spec	28 Jan 2009 15:52:20 -0000	1.343
+++ gtk2.spec	28 Jan 2009 16:06:26 -0000	1.344
@@ -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
@@ -302,6 +302,9 @@
 %{_datadir}/gtk-2.0
 
 %changelog
+* Wed Jan 28 2009 Marek Kasik <mkasik at redhat.com> - 2.14.7-5
+- Add print_at_local_time.patch
+
 * Wed Jan 28 2009 Marek Kasik <mkasik at redhat.com> - 2.14.7-4
 - Add conversion from local time to utc time for scheduled printing
 



From ltinkl at fedoraproject.org  Wed Jan 28 16:09:22 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Wed, 28 Jan 2009 16:09:22 +0000 (UTC)
Subject: rpms/kdetoys/F-9 kdetoys.spec,1.29,1.30 sources,1.22,1.23
Message-ID: <20090128160922.DF06C7010D@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kdetoys/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19580

Modified Files:
	kdetoys.spec sources 
Log Message:
KDE 4.2.0



Index: kdetoys.spec
===================================================================
RCS file: /cvs/extras/rpms/kdetoys/F-9/kdetoys.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- kdetoys.spec	9 Jan 2009 17:18:24 -0000	1.29
+++ kdetoys.spec	28 Jan 2009 16:08:52 -0000	1.30
@@ -1,8 +1,7 @@
-
 Name:           kdetoys
 Summary:        K Desktop Environment - Toys and Amusements
 Epoch:          7
-Version:        4.1.4
+Version:        4.2.0
 Release:        1%{?dist}
 
 License:        GPLv2
@@ -11,22 +10,8 @@
 Source0:        ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires: cmake
-BuildRequires: kde-filesystem >= 4
-%{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
-BuildRequires: kdelibs4-devel >= %{version}
+# need kdebase-workspace-devel for KTux
 BuildRequires: kdebase-workspace-devel >= %{version}
-BuildRequires: qimageblitz-devel
-BuildRequires: libXcomposite-devel
-BuildRequires: libXdamage-devel
-BuildRequires: libxkbfile-devel
-BuildRequires: libXpm-devel
-BuildRequires: libXv-devel
-BuildRequires: libXxf86misc-devel
-BuildRequires: giflib-devel
-BuildRequires: pcre-devel
-BuildRequires: libXtst-devel
-BuildRequires: libXScrnSaver-devel
 
 Requires: kdelibs4 >= %{version}
 #Requires: kdebase-workspace
@@ -34,14 +19,15 @@
 Requires(postun): /sbin/ldconfig xdg-utils
 
 
-# FIXME: Some of the stuff listed below is not actually being built.
+# FIXME: Don't list / drop kweather? It isn't really working as far as I can
+#        tell, and it is being replaced by the weather and weather_station
+#        plasmoids.
 %description
 %{name} includes:
 * amor: Amusing Misuse Of Resources put's comic figures above your windows
 * kteatime: makes sure your tea does not get too strong
 * ktux: Tux-in-a-Spaceship screen saver
 * kweather: display the current weather outside
-* kworldclock: shows daylight area on the world globe
 
 
 %prep
@@ -60,8 +46,7 @@
 
 %install
 rm -rf %{buildroot}
-
-make install DESTDIR=%{buildroot} -C %{_target_platform}
+make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
 %clean
 rm -rf %{buildroot}
@@ -79,25 +64,43 @@
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING README
 %{_kde4_bindir}/*
-%{_kde4_appsdir}/amor/
-%{_kde4_appsdir}/kteatime/
-%{_kde4_appsdir}/ktux/
-%{_kde4_appsdir}/kweather/
-%{_kde4_appsdir}/kweatherservice/
+%{_kde4_appsdir}/*/
 %{_kde4_datadir}/kde4/services/*
-%{_kde4_docdir}/HTML/en/amor/
-%{_kde4_docdir}/HTML/en/kteatime/
-%{_kde4_docdir}/HTML/en/kweather/
+%{_kde4_docdir}/HTML/*/*/
 %{_kde4_datadir}/applications/kde4/*.desktop
 %{_datadir}/dbus-1/interfaces/*
 %{_kde4_iconsdir}/hicolor/*/*/*
 %{_kde4_libdir}/kde4/*
 %{_kde4_libdir}/libkdeinit4_*.*
+%{_mandir}/man6/amor.6*
 
 
 %changelog
-* Fri Jan 09 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.4-1
-- 4.1.4
+* Thu Jan 22 2009 Than Ngo <than at redhat.com> - 4.2.0-1
+- 4.2.0
+
+* Wed Jan 07 2009 Than Ngo <than at redhat.com> - 4.1.96-1
+- 4.2rc1
+
+* Fri Dec 12 2008 Than Ngo <than at redhat.com> 4.1.85-1
+- 4.2beta2
+
+* Thu Dec 04 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.80-4
+- clean up BRs
+- fix file list
+
+* Tue Nov 25 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.80-3
+- remove kworldclock from description (dropped in 4.2, replaced by a plasmoid
+  using marble, which is part of kdeedu)
+- remove bogus BR qimageblitz-devel (was already unneeded in 4.1)
+
+* Thu Nov 20 2008 Than Ngo <than at redhat.com> 4.1.80-2
+- merged
+
+* Thu Nov 20 2008 Lorenzo Villani <lvillani at binaryhelix.net> - 7:4.1.72-1
+- 4.1.80
+- BR cmake >= 2.6.2
+- make install/fast
 
 * Wed Nov 12 2008 Than Ngo <than at redhat.com> 4.1.3-1
 - 4.1.3
@@ -167,7 +170,7 @@
 
 * Wed Nov 28 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 7:3.96.1-2
 - touchup a bit for cvs import
-- drop libs subpkg (no shlibs present) 
+- drop libs subpkg (no shlibs present)
 
 * Sat Nov 24 2007 Sebastian Vahl <fedora at deadbabylon.de> 7:3.96.1-1
 - kde-3.96.1


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdetoys/F-9/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- sources	9 Jan 2009 17:18:24 -0000	1.22
+++ sources	28 Jan 2009 16:08:52 -0000	1.23
@@ -1 +1 @@
-b32cfc4788e749e6240476783f0eb1a9  kdetoys-4.1.4.tar.bz2
+3adf538297e5dca51f15186b4acd02ce  kdetoys-4.2.0.tar.bz2



From mef at fedoraproject.org  Wed Jan 28 16:11:03 2009
From: mef at fedoraproject.org (Mary Ellen Foster)
Date: Wed, 28 Jan 2009 16:11:03 +0000 (UTC)
Subject: rpms/jgoodies-looks/devel jgoodies-looks-demo-manifest.patch, NONE, 
	1.1 .cvsignore, 1.2, 1.3 jgoodies-looks.spec, 1.2, 1.3 sources,
	1.2, 1.3
Message-ID: <20090128161103.449F97010D@cvs1.fedora.phx.redhat.com>

Author: mef

Update of /cvs/pkgs/rpms/jgoodies-looks/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19932

Modified Files:
	.cvsignore jgoodies-looks.spec sources 
Added Files:
	jgoodies-looks-demo-manifest.patch 
Log Message:
Update to 2.2.1, add demo subpackage

jgoodies-looks-demo-manifest.patch:

--- NEW FILE jgoodies-looks-demo-manifest.patch ---
--- looks-2.2.1/build.xml.orig	2009-01-28 17:04:48.000000000 +0100
+++ looks-2.2.1/build.xml	2009-01-28 17:04:51.000000000 +0100
@@ -286,14 +286,6 @@
                         excludes="Tiny.*, FontTest.*"          />
 			<fileset    dir="${src.demo.dir}" 
 			            includes="com/jgoodies/looks/demo/resources/**/*" />
-			<manifest>
-                <attribute name ="Built-By" 
-                           value="${user.name}"/>
-                <attribute name ="Main-Class" 
-                           value="com.jgoodies.looks.demo.DemoFrame"/>
-                <attribute name ="Class-Path" 
-                           value="../lib/${lib.forms.name} ../${dist.all.name}"/>
-            </manifest>		
         </jar>
 	</target>
 	


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/jgoodies-looks/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	20 Nov 2007 20:07:59 -0000	1.2
+++ .cvsignore	28 Jan 2009 16:10:32 -0000	1.3
@@ -1 +1 @@
-looks-2_1_4.zip
+looks-2_2_1.zip


Index: jgoodies-looks.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jgoodies-looks/devel/jgoodies-looks.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- jgoodies-looks.spec	20 Nov 2007 20:28:31 -0000	1.2
+++ jgoodies-looks.spec	28 Jan 2009 16:10:32 -0000	1.3
@@ -5,8 +5,8 @@
 Summary: Free high-fidelity Windows and multi-platform appearance
 URL: http://www.jgoodies.com/freeware/looks/
 Group: Development/Libraries
-Version: 2.1.4
-Release: 6%{?dist}
+Version: 2.2.1
+Release: 1%{?dist}
 License: BSD
 
 BuildRequires: jpackage-utils >= 0:1.6
@@ -17,11 +17,15 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 
 # Unfortunately, the filename has the version in an annoying way
-Source0: http://www.jgoodies.com/download/libraries/%{shortname}/%{shortname}-2_1_4.zip
-# Source1: %{name}.README
+Source0: http://www.jgoodies.com/download/libraries/%{shortname}/%{shortname}-2_2_1.zip
+# Let the build work without a bootclasspath
 Patch0: %{name}-build.patch
+# Remove some classes that depend on com.sun packages
 Patch1: %{name}-no-com-sun.patch
+# Remove some included JDK source
 Patch2: %{name}-remove-jdk-stuff.patch
+# Don't put a special manifest into the demo jar
+Patch3: %{name}-demo-manifest.patch
 
 %description
 The JGoodies look&feels make your Swing applications and applets look better.
@@ -37,12 +41,22 @@
 %package javadoc
 Summary: Javadoc documentation for JGoodies Looks
 Group: Documentation
+Requires: %{name} = %{version}-%{release}
 %description javadoc
 The JGoodies look&feels make your Swing applications and applets look better.
 They have been optimized for readability, precise micro-design and usability.
 
 This package contains the Javadoc documentation for JGoodies Looks.
 
+
+%package demo
+Summary: Demo applications for the JGoodies look&feels
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
+%description demo
+This package contains demo applications for the JGoodies look&feels,
+including the "uif_lite" classes.
+
 %prep
 %setup -q -n %{shortname}-%{version}
 %patch0 -p1
@@ -71,6 +85,8 @@
 rm src/core/com/jgoodies/looks/common/ExtBasicArrowButtonHandler.java
 %patch2 -p1
 
+%patch3 -p1
+
 %build
 %ant -Ddescriptors.dir=. compile jar javadoc
 
@@ -80,6 +96,8 @@
         $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 cp -p build/%{shortname}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
 ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
+cp -p build/demo.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-demo-%{version}.jar
+ln -s %{name}-demo-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-demo.jar
 cp -pr build/docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 # install -m 644 %SOURCE1 README_RPM.txt
 # Fix the line endings!
@@ -103,7 +121,17 @@
 %{_javadocdir}/%{name}-%{version}
 %{_javadocdir}/%{name}
 
+%files demo
+%defattr(-,root,root,-)
+%{_javadir}/%{name}-demo.jar
+%{_javadir}/%{name}-demo-%{version}.jar
+
 %changelog
+* Wed Jan 28 2009 Mary Ellen Foster <mefoster at gmail.com> - 2.2.1-1
+- Upgrade to upstream 2.2.1
+- Include "demo" subpackage
+- Make subpackages Require the main package
+
 * Tue Nov 20 2007 Mary Ellen Foster <mefoster at gmail.com> - 2.1.4-6
 - Add LICENSE.txt to documentation
 - Correctly add all files to CVS


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/jgoodies-looks/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	20 Nov 2007 20:07:59 -0000	1.2
+++ sources	28 Jan 2009 16:10:32 -0000	1.3
@@ -1 +1 @@
-2e59ea5ec9f5640d5902485a252b3056  looks-2_1_4.zip
+0d191029f45b81a90c835263e0c5af2e  looks-2_2_1.zip



From mef at fedoraproject.org  Wed Jan 28 16:16:33 2009
From: mef at fedoraproject.org (Mary Ellen Foster)
Date: Wed, 28 Jan 2009 16:16:33 +0000 (UTC)
Subject: rpms/jgoodies-looks/devel jgoodies-looks-no-com-sun.patch, 1.1,
	1.2 jgoodies-looks-remove-jdk-stuff.patch, 1.1, 1.2
Message-ID: <20090128161633.5FFF87010D@cvs1.fedora.phx.redhat.com>

Author: mef

Update of /cvs/pkgs/rpms/jgoodies-looks/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21290

Modified Files:
	jgoodies-looks-no-com-sun.patch 
	jgoodies-looks-remove-jdk-stuff.patch 
Log Message:
Adding correct patches

jgoodies-looks-no-com-sun.patch:

Index: jgoodies-looks-no-com-sun.patch
===================================================================
RCS file: /cvs/pkgs/rpms/jgoodies-looks/devel/jgoodies-looks-no-com-sun.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- jgoodies-looks-no-com-sun.patch	20 Nov 2007 20:07:59 -0000	1.1
+++ jgoodies-looks-no-com-sun.patch	28 Jan 2009 16:16:02 -0000	1.2
@@ -1,7 +1,7 @@
-diff -ur --ignore-all-space looks-2.1.3/src.orig/core/com/jgoodies/looks/Options.java looks-2.1.3/src/core/com/jgoodies/looks/Options.java
---- looks-2.1.3/src.orig/core/com/jgoodies/looks/Options.java	2007-02-21 17:55:14.000000000 +0100
-+++ looks-2.1.3/src/core/com/jgoodies/looks/Options.java	2007-04-12 14:31:28.000000000 +0200
-@@ -38,8 +38,6 @@
+diff -ur looks-2.2.1.orig/src/core/com/jgoodies/looks/Options.java looks-2.2.1/src/core/com/jgoodies/looks/Options.java
+--- looks-2.2.1.orig/src/core/com/jgoodies/looks/Options.java	2009-01-28 16:40:46.000000000 +0100
++++ looks-2.2.1/src/core/com/jgoodies/looks/Options.java	2009-01-28 16:41:43.000000000 +0100
+@@ -40,8 +40,6 @@
  
  import com.jgoodies.looks.common.ShadowPopup;
  import com.jgoodies.looks.plastic.PlasticLookAndFeel;
@@ -9,8 +9,8 @@
 -import com.sun.java.swing.plaf.windows.WindowsComboBoxUI;
  
  /**
-  * Provides access to optional features of the JGoodies L&amp;Fs 
-@@ -723,12 +721,6 @@
+  * Provides access to optional features of the JGoodies L&amp;Fs
+@@ -895,12 +893,6 @@
          putLookAndFeelReplacement(
              "javax.swing.plaf.metal.MetalLookAndFeel",
              PLASTIC3D_NAME);
@@ -23,18 +23,18 @@
      }
  
      /**
-Only in looks-2.1.3/src.orig/core/com/jgoodies/looks: windows
-diff -ur --ignore-all-space looks-2.1.3/src.orig/demo/com/jgoodies/looks/demo/DemoFrame.java looks-2.1.3/src/demo/com/jgoodies/looks/demo/DemoFrame.java
---- looks-2.1.3/src.orig/demo/com/jgoodies/looks/demo/DemoFrame.java	2007-02-21 17:55:14.000000000 +0100
-+++ looks-2.1.3/src/demo/com/jgoodies/looks/demo/DemoFrame.java	2007-04-12 14:32:22.000000000 +0200
+Only in looks-2.2.1.orig/src/core/com/jgoodies/looks: windows
+diff -ur looks-2.2.1.orig/src/demo/com/jgoodies/looks/demo/DemoFrame.java looks-2.2.1/src/demo/com/jgoodies/looks/demo/DemoFrame.java
+--- looks-2.2.1.orig/src/demo/com/jgoodies/looks/demo/DemoFrame.java	2009-01-28 16:40:46.000000000 +0100
++++ looks-2.2.1/src/demo/com/jgoodies/looks/demo/DemoFrame.java	2009-01-28 16:42:31.000000000 +0100
 @@ -46,7 +46,6 @@
  import com.jgoodies.looks.LookUtils;
  import com.jgoodies.looks.Options;
  import com.jgoodies.looks.plastic.PlasticLookAndFeel;
 -import com.jgoodies.looks.windows.WindowsLookAndFeel;
  
- /** 
-  * Builds the main frame in the Simple Looks Demo. 
+ /**
+  * Builds the main frame in the Simple Looks Demo.
 @@ -218,9 +217,6 @@
              PlasticLookAndFeel.BORDER_STYLE_KEY,
              settings.getToolBarPlasticBorderStyle());
@@ -45,9 +45,16 @@
              PlasticLookAndFeel.IS_3D_KEY,
              settings.getToolBar3DHint());
  
-diff -ur --ignore-all-space looks-2.1.3/src.orig/demo/com/jgoodies/looks/demo/MenuBarView.java looks-2.1.3/src/demo/com/jgoodies/looks/demo/MenuBarView.java
---- looks-2.1.3/src.orig/demo/com/jgoodies/looks/demo/MenuBarView.java	2007-02-21 17:55:14.000000000 +0100
-+++ looks-2.1.3/src/demo/com/jgoodies/looks/demo/MenuBarView.java	2007-04-12 14:32:28.000000000 +0200
+@@ -384,4 +380,4 @@
+     }
+ 
+ 
+-}
+\ No newline at end of file
++}
+diff -ur looks-2.2.1.orig/src/demo/com/jgoodies/looks/demo/MenuBarView.java looks-2.2.1/src/demo/com/jgoodies/looks/demo/MenuBarView.java
+--- looks-2.2.1.orig/src/demo/com/jgoodies/looks/demo/MenuBarView.java	2009-01-28 16:40:46.000000000 +0100
++++ looks-2.2.1/src/demo/com/jgoodies/looks/demo/MenuBarView.java	2009-01-28 16:42:54.000000000 +0100
 @@ -39,7 +39,6 @@
  
  import com.jgoodies.looks.Options;
@@ -55,19 +62,26 @@
 -import com.jgoodies.looks.windows.WindowsLookAndFeel;
  
  /**
-  * Builds the menu bar and pull-down menus in the Simple Looks Demo. 
+  * Builds the menu bar and pull-down menus in the Simple Looks Demo.
 @@ -74,8 +73,6 @@
  							  settings.getMenuBarHeaderStyle());
- 		bar.putClientProperty(PlasticLookAndFeel.BORDER_STYLE_KEY, 
+ 		bar.putClientProperty(PlasticLookAndFeel.BORDER_STYLE_KEY,
  							  settings.getMenuBarPlasticBorderStyle());
--		bar.putClientProperty(WindowsLookAndFeel.BORDER_STYLE_KEY, 
+-		bar.putClientProperty(WindowsLookAndFeel.BORDER_STYLE_KEY,
 -							  settings.getMenuBarWindowsBorderStyle());
  		bar.putClientProperty(PlasticLookAndFeel.IS_3D_KEY,
  							  settings.getMenuBar3DHint());
  
-diff -ur --ignore-all-space looks-2.1.3/src.orig/demo/FontTest.java looks-2.1.3/src/demo/FontTest.java
---- looks-2.1.3/src.orig/demo/FontTest.java	2007-02-21 17:55:14.000000000 +0100
-+++ looks-2.1.3/src/demo/FontTest.java	2007-04-12 14:32:56.000000000 +0200
+@@ -455,4 +452,4 @@
+     }
+ 
+ 
+-}
+\ No newline at end of file
++}
+diff -ur looks-2.2.1.orig/src/demo/FontTest.java looks-2.2.1/src/demo/FontTest.java
+--- looks-2.2.1.orig/src/demo/FontTest.java	2009-01-28 16:40:46.000000000 +0100
++++ looks-2.2.1/src/demo/FontTest.java	2009-01-28 16:43:31.000000000 +0100
 @@ -11,7 +11,6 @@
  import com.jgoodies.looks.LookUtils;
  import com.jgoodies.looks.plastic.PlasticLookAndFeel;
@@ -76,17 +90,23 @@
  
  
  /**
-@@ -275,13 +274,8 @@
+@@ -275,12 +274,7 @@
+ 
  
-     
      private FontSet getWindowsFontSet() {
 -        try {
 -            UIManager.setLookAndFeel(new WindowsLookAndFeel());
 -            return WindowsLookAndFeel.getFontPolicy().getFontSet("Windows", UIManager.getDefaults());
 -        } catch (UnsupportedLookAndFeelException e) {
              return null;
-         }
--    }
-     
+-        }
+     }
+ 
+ 
+@@ -313,4 +307,4 @@
+     }
+ 
  
-     private FontSet getPlasticFontSet() {
+-}
+\ No newline at end of file
++}

jgoodies-looks-remove-jdk-stuff.patch:

Index: jgoodies-looks-remove-jdk-stuff.patch
===================================================================
RCS file: /cvs/pkgs/rpms/jgoodies-looks/devel/jgoodies-looks-remove-jdk-stuff.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- jgoodies-looks-remove-jdk-stuff.patch	20 Nov 2007 20:07:59 -0000	1.1
+++ jgoodies-looks-remove-jdk-stuff.patch	28 Jan 2009 16:16:02 -0000	1.2
@@ -1,18 +1,7 @@
-diff -ur jgoodies-looks.orig/src/core/com/jgoodies/looks/plastic/PlasticSpinnerUI.java jgoodies-looks/src/core/com/jgoodies/looks/plastic/PlasticSpinnerUI.java
---- jgoodies-looks.orig/src/core/com/jgoodies/looks/plastic/PlasticSpinnerUI.java	2007-04-17 15:08:46.000000000 +0100
-+++ jgoodies-looks/src/core/com/jgoodies/looks/plastic/PlasticSpinnerUI.java	2007-11-16 17:20:10.000000000 +0000
-@@ -34,12 +34,16 @@
- import java.awt.Insets;
- import java.awt.LayoutManager;
- 
--import javax.swing.*;
-+import javax.swing.JComponent;
-+import javax.swing.JPanel;
-+import javax.swing.JSpinner;
-+import javax.swing.JTextField;
-+import javax.swing.SwingConstants;
-+import javax.swing.UIManager;
- import javax.swing.border.EmptyBorder;
+diff -ur looks-2.2.1.orig/src/core/com/jgoodies/looks/plastic/PlasticSpinnerUI.java looks-2.2.1/src/core/com/jgoodies/looks/plastic/PlasticSpinnerUI.java
+--- looks-2.2.1.orig/src/core/com/jgoodies/looks/plastic/PlasticSpinnerUI.java	2009-01-28 16:40:46.000000000 +0100
++++ looks-2.2.1/src/core/com/jgoodies/looks/plastic/PlasticSpinnerUI.java	2009-01-28 16:53:49.000000000 +0100
+@@ -39,7 +39,6 @@
  import javax.swing.plaf.ComponentUI;
  import javax.swing.plaf.basic.BasicSpinnerUI;
  
@@ -20,20 +9,20 @@
  import com.jgoodies.looks.common.ExtBasicSpinnerLayout;
  
  
-@@ -60,56 +64,6 @@
+@@ -60,56 +59,6 @@
  
  
      /**
--     * The mouse/action listeners that are added to the spinner's 
--     * arrow buttons.  These listeners are shared by all 
+-     * The mouse/action listeners that are added to the spinner's
+-     * arrow buttons.  These listeners are shared by all
 -     * spinner arrow buttons.
--     * 
+-     *
 -     * @see #createNextButton
 -     * @see #createPreviousButton
 -     */
--    private static final ExtBasicArrowButtonHandler nextButtonHandler     
+-    private static final ExtBasicArrowButtonHandler nextButtonHandler
 -    							= new ExtBasicArrowButtonHandler("increment", true);
--    private static final ExtBasicArrowButtonHandler previousButtonHandler 
+-    private static final ExtBasicArrowButtonHandler previousButtonHandler
 -    							= new ExtBasicArrowButtonHandler("decrement", false);
 -
 -
@@ -77,7 +66,7 @@
       * Create a <code>LayoutManager</code> that manages the <code>editor</code>,
       * <code>nextButton</code>, and <code>previousButton</code> children
       * of the JSpinner. These three children must be added with a constraint
-@@ -196,31 +150,4 @@
+@@ -196,31 +145,4 @@
          }
      }
  
@@ -97,57 +86,48 @@
 -            int arrowHeight = Math.min((height - 4) / 3, (width - 4) / 3);
 -            return Math.max(arrowHeight, 3);
 -        }
--        
+-
 -        protected int calculateArrowOffset() {
 -            return 1;
 -        }
--        
+-
 -        protected boolean isPaintingNorthBottom() {
 -            return true;
 -        }
--        
+-
 -   }
 -
 -}
 \ No newline at end of file
 +}
-diff -ur jgoodies-looks.orig/src/core/com/jgoodies/looks/plastic/PlasticXPSpinnerUI.java jgoodies-looks/src/core/com/jgoodies/looks/plastic/PlasticXPSpinnerUI.java
---- jgoodies-looks.orig/src/core/com/jgoodies/looks/plastic/PlasticXPSpinnerUI.java	2007-04-17 15:08:46.000000000 +0100
-+++ jgoodies-looks/src/core/com/jgoodies/looks/plastic/PlasticXPSpinnerUI.java	2007-11-16 17:20:33.000000000 +0000
-@@ -30,17 +30,8 @@
- 
- package com.jgoodies.looks.plastic;
- 
--import java.awt.Color;
--import java.awt.Component;
--import java.awt.Graphics;
--
- import javax.swing.JComponent;
--import javax.swing.SwingConstants;
--import javax.swing.UIManager;
+diff -ur looks-2.2.1.orig/src/core/com/jgoodies/looks/plastic/PlasticXPSpinnerUI.java looks-2.2.1/src/core/com/jgoodies/looks/plastic/PlasticXPSpinnerUI.java
+--- looks-2.2.1.orig/src/core/com/jgoodies/looks/plastic/PlasticXPSpinnerUI.java	2009-01-28 16:40:46.000000000 +0100
++++ looks-2.2.1/src/core/com/jgoodies/looks/plastic/PlasticXPSpinnerUI.java	2009-01-28 16:54:46.000000000 +0100
+@@ -40,8 +40,6 @@
  import javax.swing.plaf.ComponentUI;
--import javax.swing.plaf.metal.MetalLookAndFeel;
--
--import com.jgoodies.looks.common.ExtBasicArrowButtonHandler;
+ import javax.swing.plaf.metal.MetalLookAndFeel;
  
+-import com.jgoodies.looks.common.ExtBasicArrowButtonHandler;
+-
  
  /**
-@@ -57,204 +48,4 @@
+  * The JGoodies PlasticXP Look&amp;Feel implementation of <code>SpinnerUI</code>.
+@@ -57,204 +55,4 @@
  		return new PlasticXPSpinnerUI();
  	}
  
 -
 -    /**
--     * The mouse/action listeners that are added to the spinner's 
--     * arrow buttons.  These listeners are shared by all 
+-     * The mouse/action listeners that are added to the spinner's
+-     * arrow buttons.  These listeners are shared by all
 -     * spinner arrow buttons.
--     * 
+-     *
 -     * @see #createNextButton
 -     * @see #createPreviousButton
 -     */
--    private static final ExtBasicArrowButtonHandler NEXT_BUTTON_HANDLER     
+-    private static final ExtBasicArrowButtonHandler NEXT_BUTTON_HANDLER
 -    							= new ExtBasicArrowButtonHandler("increment", true);
--    private static final ExtBasicArrowButtonHandler PREVIOUS_BUTTON_HANDLER 
+-    private static final ExtBasicArrowButtonHandler PREVIOUS_BUTTON_HANDLER
 -    							= new ExtBasicArrowButtonHandler("decrement", false);
 -
 -
@@ -205,17 +185,17 @@
 -            int arrowHeight = Math.min((height - 4) / 3, (width - 4) / 3);
 -            return Math.max(arrowHeight, 3);
 -        }
--                
+-
 -        protected boolean isPaintingNorthBottom() {
 -            return true;
 -        }
--        
+-
 -        protected int calculateArrowOffset() {
 -            return 1;
 -        }
 -
--        protected void paintNorth(Graphics g, boolean leftToRight, boolean isEnabled, 
--                Color arrowColor, boolean isPressed, 
+-        protected void paintNorth(Graphics g, boolean leftToRight, boolean isEnabled,
+-                Color arrowColor, boolean isPressed,
 -                int width, int height, int w, int h, int arrowHeight, int arrowOffset,
 -                boolean paintBottom) {
 -            if (!isFreeStanding) {
@@ -277,9 +257,9 @@
 -
 -
 -        protected void paintSouth(Graphics g, boolean leftToRight, boolean isEnabled,
--                Color arrowColor, boolean isPressed, 
+-                Color arrowColor, boolean isPressed,
 -                int width, int height, int w, int h, int arrowHeight, int arrowOffset) {
--                    
+-
 -            if (!isFreeStanding) {
 -                height += 1;
 -                if (!leftToRight) {



From ltinkl at fedoraproject.org  Wed Jan 28 16:17:20 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Wed, 28 Jan 2009 16:17:20 +0000 (UTC)
Subject: rpms/kdeutils/F-9 kdeutils.spec,1.134,1.135 sources,1.59,1.60
Message-ID: <20090128161720.405887010D@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kdeutils/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21438

Modified Files:
	kdeutils.spec sources 
Log Message:
KDE 4.2.0



Index: kdeutils.spec
===================================================================
RCS file: /cvs/extras/rpms/kdeutils/F-9/kdeutils.spec,v
retrieving revision 1.134
retrieving revision 1.135
diff -u -r1.134 -r1.135
--- kdeutils.spec	9 Jan 2009 04:51:13 -0000	1.134
+++ kdeutils.spec	28 Jan 2009 16:16:49 -0000	1.135
@@ -1,4 +1,3 @@
-
 %if 0%{?fedora} > 9
 # include new PyKDE4 printer applet
 %define printer_applet 1
@@ -11,7 +10,7 @@
 
 Name:           kdeutils
 Epoch:          6
-Version:        4.1.4
+Version:        4.2.0
 Release:        1%{?dist}
 Summary:        K Desktop Environment - Utilities
 
@@ -27,29 +26,22 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # FIXME/TODO: Tpctl is needed for klaptopdaemon
-BuildRequires:  cmake
-BuildRequires:  kde-filesystem >= 4
-%{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
-BuildRequires:  kdelibs4-devel >= %{version}
 BuildRequires:  kdepimlibs-devel >= %{version}
-BuildRequires:  kdebase-workspace-devel >= %{version}
+BuildRequires:  plasma-devel >= %{version}
 BuildRequires:  gmp-devel
 BuildRequires:  libarchive-devel
 BuildRequires:  libzip-devel
-BuildRequires:  openldap-devel
-BuildRequires:  python-devel
 BuildRequires:  qimageblitz-devel
 
 Requires(post): /sbin/ldconfig xdg-utils
 Requires(postun): /sbin/ldconfig xdg-utils
 Requires: kdelibs4 >= %{version}
 %if 0%{?printer_applet}
-# (new) printer applet 
-BuildRequires:  PyKDE4-devel
-BuildRequires:  system-config-printer
-Requires: PyKDE4
+BuildRequires:  PyKDE4-devel >= %{version}
+BuildRequires:  system-config-printer-libs
+Requires: PyKDE4 >= %{version}
 Requires: hal-cups-utils
-Requires: system-config-printer
+Requires: system-config-printer-libs
 %endif
 
 Provides:       okteta = 0.1.0-1
@@ -88,9 +80,9 @@
 
 %package devel
 Group:    Development/Libraries
-Summary:  Development files for %{name} 
+Summary:  Development files for %{name}
 Requires: %{name}-libs = %{epoch}:%{version}-%{release}
-Requires: kdelibs4-devel kdepimlibs4-devel kdebase-workspace-devel
+Requires: kdepimlibs4-devel kdebase-workspace-devel
 %description devel
 %{summary}.
 
@@ -123,7 +115,7 @@
 %install
 rm -rf %{buildroot}
 
-make install DESTDIR=%{buildroot} -C %{_target_platform}
+make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
 # nothing should build against these
 rm -f %{buildroot}%{_kde4_libdir}/liboktetacore.so %{buildroot}%{_kde4_libdir}/liboktetagui.so
@@ -171,17 +163,7 @@
 %{_kde4_datadir}/kde4/services/*
 %{_kde4_datadir}/kde4/servicetypes/*
 %{_kde4_datadir}/applications/kde4/*
-%{_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/
-%{_kde4_docdir}/HTML/en/ktimer/
-%{_kde4_docdir}/HTML/en/kwallet/
-%{_kde4_docdir}/HTML/en/okteta/
-%{_kde4_docdir}/HTML/en/superkaramba/
+%{_kde4_docdir}/HTML/en/*
 %{_kde4_iconsdir}/hicolor/*/apps/*
 %{_kde4_iconsdir}/oxygen/*/*/*
 %{_datadir}/dbus-1/interfaces/*
@@ -194,6 +176,7 @@
 %{_kde4_appsdir}/kjots/
 %{_kde4_docdir}/HTML/en/kjots/
 %endif
+%{_mandir}/man1/*
 
 %if 0
 %files libs
@@ -211,8 +194,34 @@
 
 
 %changelog
-* Fri Jan 09 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.4-1
-- 4.1.4
+* Thu Jan 22 2009 Than Ngo <than at redhat.com> - 4.2.0-1
+- 4.2.0
+
+* Wed Jan 14 2009 Rex Dieter <rdieter at fedoraproject.org> 4.1.96-2
+- (Build)Req: system-config-printer-libs
+
+* Wed Jan 07 2009 Than Ngo <than at redhat.com> - 4.1.96-1
+- 4.2rc1
+
+* Fri Dec 12 2008 Than Ngo <than at redhat.com> 4.1.85-1
+- 4.2beta2
+
+* Mon Dec 08 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.80-5
+- BR: PyKDE4-devel >= %%version (vs previously unversioned BR)
+
+* Mon Dec 01 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.80-4
+- rebuild for Python 2.6
+
+* Mon Dec 01 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.80-3
+- BR plasma-devel instead of kdebase-workspace-devel
+
+* Thu Nov 20 2008 Than Ngo <than at redhat.com> 4.1.80-2
+- merged
+
+* Thu Nov 20 2008 Lorenzo Villani <lvillani at binaryhelix.net> - 6:4.1.80-1
+- 4.1.80
+- BR cmake >= 2.6.2
+- make install/fast
 
 * Wed Nov 12 2008 Than Ngo <than at redhat.com> 4.1.3-1
 - 4.1.3
@@ -258,7 +267,7 @@
 - 4.0.84
 
 * Sat Jun 21 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.0.83-2
-- add explicit dep on rhpl to work around missing dep in 
+- add explicit dep on rhpl to work around missing dep in
   system-config-printer (#452575)
 
 * Thu Jun 19 2008 Than Ngo <than at redhat.com> 4.0.83-1


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdeutils/F-9/sources,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- sources	9 Jan 2009 04:51:13 -0000	1.59
+++ sources	28 Jan 2009 16:16:49 -0000	1.60
@@ -1,2 +1,2 @@
-542663eeae777978dafab2dcf9d422c2  kdeutils-4.1.4.tar.bz2
+f0ca24c7d3e5bb0ab55bf6b26fc6224e  kdeutils-4.2.0.tar.bz2
 297ffe93343bc0dd62c7d90feae0ee6c  kdepim-4.1.4.tar.bz2



From pkgdb at fedoraproject.org  Wed Jan 28 16:17:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Jan 2009 16:17:23 +0000
Subject: [pkgdb] libspiro: nphilipp has requested watchcommits
Message-ID: <20090128161723.A78F4208494@bastion.fedora.phx.redhat.com>

nphilipp has requested the watchcommits acl on libspiro (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libspiro



From pkgdb at fedoraproject.org  Wed Jan 28 16:17:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Jan 2009 16:17:24 +0000
Subject: [pkgdb] libspiro: nphilipp has requested commit
Message-ID: <20090128161724.B1C06208496@bastion.fedora.phx.redhat.com>

nphilipp has requested the commit acl on libspiro (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libspiro



From pkgdb at fedoraproject.org  Wed Jan 28 16:17:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Jan 2009 16:17:39 +0000
Subject: [pkgdb] libspiro: nphilipp has requested watchbugzilla
Message-ID: <20090128161739.8B9F1208493@bastion.fedora.phx.redhat.com>

nphilipp has requested the watchbugzilla acl on libspiro (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libspiro



From notting at fedoraproject.org  Wed Jan 28 16:21:33 2009
From: notting at fedoraproject.org (Bill Nottingham)
Date: Wed, 28 Jan 2009 16:21:33 +0000 (UTC)
Subject: rpms/initscripts/devel .cvsignore, 1.158, 1.159 initscripts.spec,
	1.185, 1.186 sources, 1.176, 1.177
Message-ID: <20090128162133.E6AC67010D@cvs1.fedora.phx.redhat.com>

Author: notting

Update of /cvs/extras/rpms/initscripts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22450

Modified Files:
	.cvsignore initscripts.spec sources 
Log Message:
8.89-1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/initscripts/devel/.cvsignore,v
retrieving revision 1.158
retrieving revision 1.159
diff -u -r1.158 -r1.159
--- .cvsignore	21 Jan 2009 03:37:48 -0000	1.158
+++ .cvsignore	28 Jan 2009 16:21:03 -0000	1.159
@@ -1 +1 @@
-initscripts-8.88.tar.bz2
+initscripts-8.89.tar.bz2


Index: initscripts.spec
===================================================================
RCS file: /cvs/extras/rpms/initscripts/devel/initscripts.spec,v
retrieving revision 1.185
retrieving revision 1.186
diff -u -r1.185 -r1.186
--- initscripts.spec	21 Jan 2009 03:39:05 -0000	1.185
+++ initscripts.spec	28 Jan 2009 16:21:03 -0000	1.186
@@ -2,7 +2,7 @@
 
 Summary: The inittab file and the /etc/init.d scripts
 Name: initscripts
-Version: 8.88
+Version: 8.89
 # ppp-watch is GPLv2+, everything else is GPLv2
 License: GPLv2 and GPLv2+
 Group: System Environment/Base
@@ -250,6 +250,12 @@
 /etc/profile.d/debug*
 
 %changelog
+* Wed Jan 28 2009 Bill Nottingham <notting at redhat.com> - 8.89-1
+- use a leading path when sourcing files (#482826)
+- netfs: don't unmount nfsd filesystem by accident (#481794, <sprabhu at redhat.com>)
+- bring up ipsec interfaces last (#481733)
+- ifdown-eth: fix bridge + vlan (#481557, <danken at redhat.com>)
+
 * Tue Jan 20 2009 Bill Nottingham <notting at redhat.com> - 8.88-1
 - init.d/network: return success/failure correctly (#480677)
 - init.d/halt: fix typo (#480799)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/initscripts/devel/sources,v
retrieving revision 1.176
retrieving revision 1.177
diff -u -r1.176 -r1.177
--- sources	21 Jan 2009 03:37:49 -0000	1.176
+++ sources	28 Jan 2009 16:21:03 -0000	1.177
@@ -1 +1 @@
-06455e42d38d18ebc2904faf3d934621  initscripts-8.88.tar.bz2
+89d41b810122aebbcb96ba0317df7076  initscripts-8.89.tar.bz2



From ltinkl at fedoraproject.org  Wed Jan 28 16:24:19 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Wed, 28 Jan 2009 16:24:19 +0000 (UTC)
Subject: rpms/kipi-plugins/F-9 kipi-plugins.spec, 1.54, 1.55 sources, 1.18, 
	1.19 kipi-plugins-0.1.6-kde#174353.patch, 1.2, NONE
Message-ID: <20090128162419.B7B5C7010D@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kipi-plugins/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22881

Modified Files:
	kipi-plugins.spec sources 
Removed Files:
	kipi-plugins-0.1.6-kde#174353.patch 
Log Message:
kipi-plugins-0.2.0-beta6



Index: kipi-plugins.spec
===================================================================
RCS file: /cvs/extras/rpms/kipi-plugins/F-9/kipi-plugins.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- kipi-plugins.spec	20 Nov 2008 16:48:03 -0000	1.54
+++ kipi-plugins.spec	28 Jan 2009 16:23:49 -0000	1.55
@@ -1,158 +1,87 @@
-
 # Fedora review: http://bugzilla.redhat.com/171504
 
-%if 0%{?fedora} > 6
-%define kdelibs3 kdelibs3
-%define kdepim3 kdepim3
-%else
-%define kdelibs3 kdelibs
-BuildRequires: libutempter-devel
-%endif
+%define beta beta6
 
 Name:    kipi-plugins
 Summary: Plugins to use with Kipi
-Version: 0.1.6
-Release: 2%{?dist}
+Version: 0.2.0
+Release: 0.11.%{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://downloads.sourceforge.net/kipi/kipi-plugins-%{version}%{?beta:-%{beta}}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-## upstream patches
-# http://bugs.kde.org/174353
-Patch100: kipi-plugins-0.1.6-kde#174353.patch 
-
+BuildRequires: exiv2-devel
+## DNG converter
+BuildRequires: expat-devel
 BuildRequires: gettext
-BuildRequires: %{kdelibs3}-devel
-BuildRequires: libkdcraw-devel >= 0.1.5
-BuildRequires: libkexiv2-devel >= 0.1.7
-BuildRequires: libkipi-devel >= 0.1.6
-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
+# Until when/if libksane grows a dep on sane-backends-devel
+BuildRequires: kdegraphics4-devel sane-backends-devel 
+BuildRequires: kdepimlibs-devel
+BuildRequires: libgpod-devel
+BuildRequires: libkipi-devel >= 0.3.0
+BuildRequires: libkdcraw-devel >= 0.4.0-2
+BuildRequires: libkexiv2-devel >= 0.5.0
 ## 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) 
-%{?kdepim3:BuildRequires: %{kdepim3}-devel}
-
-## jpeglossless plugin 
-Requires: ImageMagick 
-
-## optional bits
-# wallpaper plugin
-#Requires(hint): kdebase3
-# cdarchiver plugin
-#Requires(hint): k3b
-%if 0%{?fedora} > 3
-# rawconverter plugin 
-Requires(hint): dcraw
-%endif
-# mjpeg plugin 
-#Requires(hint): mjpegtools >= 1.6.0
+## htmlexport plugin 
+BuildRequires: libxslt-devel
+## DNG converter
+BuildRequires: expat-devel
+# bodus deps 
+BuildRequires: giflib-devel openldap-devel pcre-devel
+
+Requires(post): /sbin/ldconfig xdg-utils
+Requires(postun): /sbin/ldconfig xdg-utils
+
+## jpeglossless plugin
+Requires: ImageMagick
 
 %description
 This package contains plugins to use with Kipi, the KDE Image Plugin
 Interface.  Currently implemented plugins are:
+ * AcquireImages      : Acquire images interface
+ * BatchProcessImages : Batch process images: rename, convert, borders,
+                        filters, colors, effects, resize, recompress
  * 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)
-%if 0%{?kdepim3:1}
- * Calendar           : Create calendars
-%endif
- * 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      : Export images to a remote Gallery server
-                        (http://gallery.sf.net)
+ * FbExport           : Export images to a remote Facebook web service
  * 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
+ * JpegLossLess       : process JPEG images without losing quality
  * MetadataEdit       : Edit EXIF and IPTC pictures metadata
  * PicasaWebExport    : Export pictures to Picasa web service
+ * SendImages         : Send images by email
+ * SimpleViewerExport : Export images to SimpleViewer
+ * SlideShow          : Slideshow with effects
+ * SmugExport         : SmugMug web service 
+ * TimeAdjust         : Adjust image file Time and Date
 
 
 %prep
 %setup -q -n %{name}-%{version}%{?beta:-%{beta}}
 
-%patch100 -p1 -b .kde#174353
-
 
 %build
-unset QTDIR || : ; . /etc/profile.d/qt.sh
-
-%configure \
-  --disable-rpath \
-  --enable-new-ldflags \
-  --disable-debug --disable-warnings \
-  --disable-dependancy-tracking --disable-final \
-  --with-opengl
+mkdir -p %{_target_platform}
+pushd %{_target_platform}
+%{cmake_kde4} ..
+popd
 
-make %{?_smp_mflags}
+make %{?_smp_mflags} -C %{_target_platform} VERBOSE=1
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
+
+make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
-make install DESTDIR=$RPM_BUILD_ROOT
 
 ## File lists
-# 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
-  if [ -d $lang_dir ]; then
-    lang=$(basename $lang_dir)
-    echo "%lang($lang) $HTML_DIR/$lang/*" >> %{name}.lang
-    # replace absolute symlinks with relative ones
-    pushd $lang_dir
-      for i in *; do
-        [ -d $i -a -L $i/common ] && rm -f $i/common && ln -sf ../common $i/common
-      done
-    popd
-  fi
-done
-fi
+touch  %{name}.lang
 # 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}
@@ -161,39 +90,107 @@
 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
 
-%postun -p /sbin/ldconfig
+%post
+/sbin/ldconfig ||:
+xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
+xdg-desktop-menu forceupdate 2> /dev/null || :
+
+%postun
+/sbin/ldconfig ||:
+xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
+xdg-desktop-menu forceupdate 2> /dev/null || :
 
 
 %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_bindir}/dngconverter
+%{_kde4_libdir}/libkipiplugins.so.*
+%{_kde4_libdir}/kde4/kipiplugin_acquireimages.so
+%{_kde4_libdir}/kde4/kipiplugin_calendar.so
+%{_kde4_libdir}/kde4/kipiplugin_dngconverter.so
+%{_kde4_libdir}/kde4/kipiplugin_fbexport.so
+%{_kde4_libdir}/kde4/kipiplugin_flickrexport.so
+%{_kde4_libdir}/kde4/kipiplugin_galleryexport.so
+%{_kde4_libdir}/kde4/kipiplugin_gpssync.so
+%{_kde4_libdir}/kde4/kipiplugin_htmlexport.so
+%{_kde4_libdir}/kde4/kipiplugin_imageviewer.so
+%{_kde4_libdir}/kde4/kipiplugin_ipodexport.so
+%{_kde4_libdir}/kde4/kipiplugin_jpeglossless.so
+%{_kde4_libdir}/kde4/kipiplugin_metadataedit.so
+%{_kde4_libdir}/kde4/kipiplugin_picasawebexport.so
+%{_kde4_libdir}/kde4/kipiplugin_printwizard.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_smugexport.so
+%{_kde4_libdir}/kde4/kipiplugin_timeadjust.so
+%{_kde4_appsdir}/kipiplugin_galleryexport
+%{_kde4_appsdir}/kipiplugin_htmlexport
+%{_kde4_appsdir}/kipiplugin_imageviewer
+%{_kde4_appsdir}/kipiplugin_metadataedit  
+%{_kde4_appsdir}/kipiplugin_simpleviewerexport
+%{_kde4_appsdir}/kipiplugin_slideshow
+%{_kde4_datadir}/applications/kde4/dngconverter.desktop
+%{_kde4_datadir}/kde4/services/*.desktop
+%{_kde4_iconsdir}/hicolor/*/*/*
 
 
 %changelog
-* Thu Nov 20 2008 Rex Dieter <rdieter at fedoraproject.org> 0.1.6-2
-- GPSSync doesn't display maps (rh#471750, kde#174353)
+* Mon Jan 05 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.2.0-0.11.beta6
+- kipi-plugins-0.2.0-beta6
+
+* Mon Dec 22 2008 Rex Dieter <rdieter at fedoraproject.org> - 0.2.0-0.10.beta5
+- tighten BR's (libkipi >= 0.3.0 mostly)
+
+* Thu Dec 18 2008 Rex Dieter <rdieter at fedoraproject.org> - 0.2.0-0.9.beta5 
+- respin (exiv2)
+
+* Mon Dec 15 2008 Rex Dieter <rdieter at fedoraproject.org> 0.2.0-0.8.beta5
+- kipi-plugins-0.2.0-beta5
+- %%description: reorder (alphabetic), simplify
+
+* Thu Dec 04 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 0.2.0-0.7.beta4
+- rebuild for fixed kde-filesystem (macros.kde4) (get rid of rpaths)
+
+* Tue Nov 25 2008 Rex Dieter <rdieter at fedoraproject.org> 0.2.0-0.6.beta4
+- kipi-plugins-0.2.0-beta4
+
+* Tue Nov 25 2008 Luk???? Tinkl <ltinkl at redhat.com> 0.2.0-0.5.beta3
+- #472874 - kipi-plugins package is missing kipiplugin.desktop
+
+* Mon Oct 27 2008 Rex Dieter <rdieter at fedoraproject.org> 0.2.0-0.4.beta3
+- kipi-plugins-0.2.0-beta3
+
+* Mon Oct 06 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 0.2.0-0.3.beta2
+- update to 0.2.0 beta 2
+- build against latest kdegraphics
+- don't require dcraw, libkdcraw includes its own RAW decoding code
+
+* 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
+
+* Wed Jun 25 2008 Rex Dieter <rdieter at fedoraproject.org> 0.1.6-0.2.beta1
+- respin for exiv2
+
+* Mon May 26 2008 Rex Dieter <rdieter at fedoraproject.org> 0.1.6-0.1.beta1
+- kipi-plugins-0.1.6-beta1
 
-* Sun Oct 12 2008 Rex Dieter <rdieter at fedoraproject.org> 0.1.6-1
-- kipi-plugins-0.1.6
+* Tue May 20 2008 Rex Dieter <rdieter at fedoraproject.org> 0.1.5-3
+- don't BR: kdepim3-devel on F-10+
 
-* Thu Jul 17 2008 Rex Dieter <rdieter at fedoraproject.org> 0.1.5-2
+* Thu May 08 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


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kipi-plugins/F-9/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources	11 Nov 2008 15:21:38 -0000	1.18
+++ sources	28 Jan 2009 16:23:49 -0000	1.19
@@ -1 +1 @@
-0d2b7fafcafd93822475a727a23e7d9d  kipi-plugins-0.1.6.tar.bz2
+0442a58f2f9a68163025c205d89269d0  kipi-plugins-0.2.0-beta6.tar.bz2


--- kipi-plugins-0.1.6-kde#174353.patch DELETED ---



From peter at fedoraproject.org  Wed Jan 28 16:24:26 2009
From: peter at fedoraproject.org (Peter Lemenkov)
Date: Wed, 28 Jan 2009 16:24:26 +0000 (UTC)
Subject: rpms/fuse/F-9 fuse.spec, 1.34, 1.35 import.log, 1.2,
	1.3 fuse-chkconfig_support.diff, 1.2, NONE
Message-ID: <20090128162426.D4A147010D@cvs1.fedora.phx.redhat.com>

Author: peter

Update of /cvs/pkgs/rpms/fuse/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23088/F-9

Modified Files:
	fuse.spec import.log 
Removed Files:
	fuse-chkconfig_support.diff 
Log Message:
Fixed BZ#479581


Index: fuse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fuse/F-9/fuse.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- fuse.spec	28 Sep 2008 10:35:30 -0000	1.34
+++ fuse.spec	28 Jan 2009 16:23:56 -0000	1.35
@@ -1,25 +1,24 @@
 Name:           fuse
 Version:        2.7.4
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        File System in Userspace (FUSE) utilities
 
 Group:          System Environment/Base
 License:        GPL+
 URL:            http://fuse.sf.net
 Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
-Source1:	fuse-udev.nodes
-Source2:	fuse-makedev.d-fuse
+Source1:        fuse-udev.nodes
+Source2:        fuse-makedev.d-fuse
 
-Patch0:		fuse-udev_rules.patch
-Patch1:		fuse-openfix.patch
-Patch2:         fuse-chkconfig_support.diff
+Patch0:         fuse-udev_rules.patch
+Patch1:         fuse-openfix.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires:	kernel >= 2.6.14
-Requires:	which
-BuildRequires:	libselinux-devel
+Requires:       kernel >= 2.6.14
+Requires:       which
+BuildRequires:  libselinux-devel
 
 Requires(post): /sbin/chkconfig
-Requires(post):	/sbin/MAKEDEV
+Requires(post): /sbin/MAKEDEV
 Requires(preun): /sbin/chkconfig
 Requires(preun): /sbin/service
 Requires(postun):/sbin/service
@@ -42,8 +41,8 @@
 %package devel
 Summary:        File System in Userspace (FUSE) devel files
 Group:          Development/Libraries
-Requires:	%{name}-libs = %{version}-%{release}
-Requires:	pkgconfig
+Requires:       %{name}-libs = %{version}-%{release}
+Requires:       pkgconfig
 License:        LGPLv2+
 
 %description devel
@@ -58,7 +57,6 @@
 sed -i 's|mknod|echo Disabled: mknod |g' util/Makefile.in
 %patch0 -p0 -b .patch0
 %patch1 -p0 -b .patch1
-%patch2 -p0 -b .patch2
 
 %build
 # Can't pass --disable-static here, or else the utils don't build
@@ -75,8 +73,8 @@
 make install DESTDIR=$RPM_BUILD_ROOT
 find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
 # FIXME change from 60 to 99
-install -D -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT/%{_sysconfdir}/udev/makedev.d/99-fuse.nodes
-install -D -p -m 644 %{SOURCE2} $RPM_BUILD_ROOT/%{_sysconfdir}/makedev.d/z-fuse
+install -D -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/udev/makedev.d/99-fuse.nodes
+install -D -p -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/makedev.d/z-fuse
 # change from 4755 to 0755 to allow stripping -- fixed later in files
 chmod 0755 $RPM_BUILD_ROOT/bin/fusermount
 # Put pc file in correct place
@@ -85,6 +83,7 @@
 
 # Get rid of static libs
 rm -f $RPM_BUILD_ROOT/%{_lib}/*.a
+rm -f $RPM_BUILD_ROOT%{_sysconfdir}/init.d/fuse
 
 # Compatibility symlinks
 mkdir -p $RPM_BUILD_ROOT%{_bindir}
@@ -97,18 +96,13 @@
 
 %post
 /sbin/MAKEDEV fuse
-/sbin/chkconfig --add fuse
 
 %preun
-if [ $1 = 0 ]; then
-        /sbin/service fuse stop >/dev/null 2>&1
-        /sbin/chkconfig --del fuse
+if [ -f /etc/init.d/fuse ] ; then
+    /sbin/service fuse stop >/dev/null 2>&1
+    /sbin/chkconfig --del fuse
 fi
 
-%postun
-if [ "$1" -ge "1" ]; then
-        /sbin/service fuse condrestart >/dev/null 2>&1 || :
-fi
 
 %post libs -p /sbin/ldconfig
 
@@ -120,7 +114,6 @@
 /sbin/mount.fuse
 %attr(4755,root,root) /bin/fusermount
 /bin/ulockmgr_server
-%{_sysconfdir}/init.d/fuse
 %{_sysconfdir}/makedev.d/z-fuse
 # Compat symlinks
 %{_bindir}/fusermount
@@ -144,6 +137,9 @@
 %{_includedir}/fuse
 
 %changelog
+* Wed Jan 28 2009 Peter Lemenkov <lemenkov at gmail.com> 2.7.4-2
+- Fixed BZ#479581
+
 * Sat Aug 23 2008 Peter Lemenkov <lemenkov at gmail.com> 2.7.4-1
 - Ver. 2.7.4
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/fuse/F-9/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	28 Sep 2008 10:35:30 -0000	1.2
+++ import.log	28 Jan 2009 16:23:56 -0000	1.3
@@ -1,2 +1,3 @@
 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
+fuse-2_7_4-2_fc10:F-9:fuse-2.7.4-2.fc10.src.rpm:1233159525


--- fuse-chkconfig_support.diff DELETED ---



From jreznik at fedoraproject.org  Wed Jan 28 16:24:40 2009
From: jreznik at fedoraproject.org (Jaroslav Reznik)
Date: Wed, 28 Jan 2009 16:24:40 +0000 (UTC)
Subject: rpms/kde-plasma-quickaccess/devel kde-plasma-quickaccess.spec, 1.6, 
	1.7
Message-ID: <20090128162440.8487B7010D@cvs1.fedora.phx.redhat.com>

Author: jreznik

Update of /cvs/pkgs/rpms/kde-plasma-quickaccess/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23134

Modified Files:
	kde-plasma-quickaccess.spec 
Log Message:
* Wed Jan 29 2009 Jaroslav Reznik <jreznik at redhat.com> 0.7.1-6
- KDE 4.2.0 rebuild



Index: kde-plasma-quickaccess.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-quickaccess/devel/kde-plasma-quickaccess.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- kde-plasma-quickaccess.spec	14 Dec 2008 05:41:02 -0000	1.6
+++ kde-plasma-quickaccess.spec	28 Jan 2009 16:24:10 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           kde-plasma-quickaccess
 Version:        0.7.1
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Plasma applet for quick access to the most used folders
 
 Group:          User Interface/Desktops
@@ -57,6 +57,9 @@
 %{_kde4_datadir}/kde4/services/plasma-applet-quickaccess.desktop
 
 %changelog
+* Wed Jan 29 2009 Jaroslav Reznik <jreznik at redhat.com> 0.7.1-6
+- KDE 4.2.0 rebuild 
+
 * Sun Dec 14 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 0.7.1-5
 - drop libkonq hack, linker search path fixed in kdelibs now
 



From kaitlin at fedoraproject.org  Wed Jan 28 16:27:40 2009
From: kaitlin at fedoraproject.org (Kaitlin Rupert)
Date: Wed, 28 Jan 2009 16:27:40 +0000 (UTC)
Subject: rpms/libvirt-cim/F-10 emu_1_sdc.patch, NONE, 1.1 host_enum_sys.patch,
	NONE, 1.1 libvirt-cim.spec, 1.22, 1.23 sources, 1.13, 1.14
Message-ID: <20090128162740.27CD67010D@cvs1.fedora.phx.redhat.com>

Author: kaitlin

Update of /cvs/pkgs/rpms/libvirt-cim/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23867

Modified Files:
	libvirt-cim.spec sources 
Added Files:
	emu_1_sdc.patch host_enum_sys.patch 
Log Message:
Add new tarball (for base_schema/Makefile changes), also add patches and updated spec.



emu_1_sdc.patch:

--- NEW FILE emu_1_sdc.patch ---
# HG changeset patch
# User Kaitlin Rupert <karupert at us.ibm.com>
# Date 1232129948 28800
# Node ID c87e67c92f7ceaf556e8be90547de324026f315b
# Parent  13150c7e28270567aad061e9ad521b0e8dd44ef6
Add support for EmulatedType 1 to SDC.

Also fix a bug with the if statement in set_disk_props() and a spacing bug.

Signed-off-by: Kaitlin Rupert <karupert at us.ibm.com>

diff -r 13150c7e2827 -r c87e67c92f7c src/Virt_SettingsDefineCapabilities.c
--- a/src/Virt_SettingsDefineCapabilities.c	Thu Jan 22 11:29:29 2009 -0800
+++ b/src/Virt_SettingsDefineCapabilities.c	Fri Jan 16 10:19:08 2009 -0800
@@ -611,13 +611,13 @@
                                  const CMPIObjectPath *ref,
                                  const char *id,
                                  uint64_t disk_size,
+                                 uint16_t emu_type,
                                  struct inst_list *list)
 {
         const char *addr;
         const char *dev;
         CMPIInstance *inst;
         CMPIStatus s = {CMPI_RC_OK, NULL};
-        uint16_t emu_type = 0;
 
         if (type == DOMAIN_LXC) {
                 addr = "/tmp";
@@ -646,7 +646,7 @@
                         dev = "xvda";
                         CMSetProperty(inst, "Caption",
                                       (CMPIValue *)"PV disk", CMPI_chars);
-                } else if (type, DOMAIN_XENFV) {
+                } else if (type == DOMAIN_XENFV) {
                         CMSetProperty(inst, "Caption",
                                       (CMPIValue *)"FV disk", CMPI_chars);
                 }
@@ -671,6 +671,7 @@
         char *pfx;
         const char *id;
         uint64_t disk_size;
+        uint16_t emu_type = 0;
         CMPIStatus s = {CMPI_RC_OK, NULL};
 
         switch(template_type) {
@@ -702,16 +703,54 @@
         pfx = class_prefix_name(CLASSNAME(ref));
 
         if (STREQ(pfx, "Xen")) {
-                s = set_disk_props(DOMAIN_XENPV, ref, id, disk_size, list); 
-                
+                int xen_type[2] = {DOMAIN_XENFV, DOMAIN_XENPV};
+                int i = 0;
+ 
+                for (; i < 2; i++) {
+                        emu_type = 0;
+                        s = set_disk_props(xen_type[i],
+                                           ref, 
+                                           id, 
+                                           disk_size, 
+                                           emu_type, 
+                                           list); 
+                        if (s.rc != CMPI_RC_OK)
+                                goto out;
+
+                        emu_type = 1;
+                        s = set_disk_props(xen_type[i],
+                                           ref, 
+                                           id, 
+                                           disk_size, 
+                                           emu_type, 
+                                           list); 
+                        if (s.rc != CMPI_RC_OK)
+                                goto out;
+                }
+        } else if (STREQ(pfx, "KVM")) {
+                s = set_disk_props(DOMAIN_KVM,
+                                   ref, 
+                                   id, 
+                                   disk_size, 
+                                   emu_type, 
+                                   list); 
                 if (s.rc != CMPI_RC_OK)
-                       goto out;
+                        goto out;
 
-                s = set_disk_props(DOMAIN_XENFV, ref, id, disk_size, list); 
-        } else if (STREQ(pfx, "KVM")) {
-                s = set_disk_props(DOMAIN_KVM, ref, id, disk_size, list); 
+                emu_type = 1; 
+                s = set_disk_props(DOMAIN_KVM,
+                                   ref, 
+                                   id, 
+                                   disk_size, 
+                                   emu_type, 
+                                   list); 
         } else if (STREQ(pfx, "LXC")) {
-                s = set_disk_props(DOMAIN_LXC, ref, id, disk_size, list); 
+                s = set_disk_props(DOMAIN_LXC,
+                                   ref, 
+                                   id, 
+                                   disk_size, 
+                                   emu_type, 
+                                   list); 
         } else {
                 cu_statusf(_BROKER, &s, 
                             CMPI_RC_ERR_FAILED,

host_enum_sys.patch:

--- NEW FILE host_enum_sys.patch ---
# HG changeset patch
# User Kaitlin Rupert <karupert at us.ibm.com>
# Date 1232562000 28800
# Node ID 189cc68a2f5a3251be1204bdaddfd90bb8740789
# Parent  eb2df7761596b0fdb38c02aa741c00592e8ddf08
Replace CBGetInstance() with CBEnumInstances() in Virt_HostSystem

This is a work around to deal with the way the SBLIM provider determines the
FQDN of a host system.  The value the SBLIM provider returns can depend on
how the /etc/hosts file is formatted, as well as other factors (running
dnsdomainname caused the provider to print two different values on my system).

Signed-off-by: Kaitlin Rupert <karupert at us.ibm.com>

diff -r eb2df7761596 -r 189cc68a2f5a src/Virt_HostSystem.c
--- a/src/Virt_HostSystem.c	Fri Jan 23 11:48:46 2009 -0800
+++ b/src/Virt_HostSystem.c	Wed Jan 21 10:20:00 2009 -0800
@@ -144,16 +144,10 @@
                              CMPIInstance **inst)
 {
         CMPIObjectPath *path;
+        CMPIEnumeration *en  = NULL;
+        CMPIData data;
         CMPIStatus s;
         const char *cn = "Linux_ComputerSystem";
-        char name[256];
-
-        if (get_fqdn(name, sizeof(name)) != 0) {
-                cu_statusf(broker, &s,
-                           CMPI_RC_ERR_FAILED,
-                           "Unable to get hostname: %m");
-                return s;
-        }
 
         path = CMNewObjectPath(broker, "root/cimv2", cn, &s);
         if ((path == NULL) || (s.rc != CMPI_RC_OK)) {
@@ -163,11 +157,33 @@
                 return s;
         }
 
-        CMAddKey(path, "CreationClassName", cn, CMPI_chars);
-        CMAddKey(path, "Name", name, CMPI_chars);
+        /* FIXME:  This approach may return the wrong instance if more than
+           one SBLIM Linux_ComputerSystem instance exists on the system.
+           This isn't likely to happen in most cases, but a better approach 
+           should be used here.
+         */
+        en = CBEnumInstances(broker, context, path, NULL, &s);
+        if (en == NULL) {
+                cu_statusf(broker, &s,
+                           CMPI_RC_ERR_FAILED,
+                           "Upcall EnumInstances of %s class failed",
+                           cn);
+                goto out;
+        }
 
-        *inst = CBGetInstance(broker, context, path, NULL, &s);
+        if (CMHasNext(en, &s)) {
+                data = CMGetNext(en, &s);
+                if (CMIsNullObject(data.value.inst)) {
+                        cu_statusf(broker, &s,
+                                   CMPI_RC_ERR_FAILED,
+                                   "Failed to retrieve enumeration entry");
+                        goto out;
+                }
 
+                *inst = data.value.inst;
+        }
+
+ out:
         if (s.rc != CMPI_RC_OK) {
                 CU_DEBUG("SBLIM: %i %s", s.rc, CMGetCharPtr(s.msg));
         } else {


Index: libvirt-cim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt-cim/F-10/libvirt-cim.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- libvirt-cim.spec	15 Jan 2009 21:48:43 -0000	1.22
+++ libvirt-cim.spec	28 Jan 2009 16:27:09 -0000	1.23
@@ -3,13 +3,14 @@
 Summary: A CIM provider for libvirt
 Name: libvirt-cim
 Version: 0.5.3
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: LGPLv2+
 Group: Development/Libraries
 Source: libvirt-cim-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 URL: http://libvirt.org/CIM/
 Requires: unzip
+Requires: tog-pegasus 
 BuildRequires: libcmpiutil >= 0.4
 BuildRequires: tog-pegasus-devel
 BuildRequires: libvirt-devel >= 0.3.2
@@ -17,6 +18,8 @@
 BuildRequires: libxml2-devel
 BuildRequires: libcmpiutil-devel
 BuildConflicts: sblim-cmpi-devel
+Patch0: emu_1_sdc.patch
+Patch1: host_enum_sys.patch 
 
 %description
 Libvirt-cim is a CMPI CIM provider that implements the DMTF SVPC
@@ -28,6 +31,8 @@
 %setup -q
 chmod -f -x src/* libxkutil/* schema/* README doc/* #base_schema/README*
 chmod +X src/* libxkutil/* schema/*
+%patch0 -p1
+%patch1 -p1
 
 %build
 %configure --disable-werror
@@ -57,7 +62,10 @@
 %define SCHEMA %{_datadir}/%{name}/*.mof
 
 %define INTEROP_REG %{_datadir}/%{name}/{RegisteredProfile,ElementConformsToProfile,ReferencedProfile}.registration
-%define INTEROP_MOF %{_datadir}/%{name}/{ComputerSystem,HostSystem,RegisteredProfile,ElementConformsToProfile,ReferencedProfile}.mof
+%define INTEROP_MOF %{_datadir}/%{name}/{ComputerSystem,HostSystem,RegisteredProfile,DiskPool,MemoryPool,NetPool,ProcessorPool,VSMigrationService,ElementConformsToProfile,ReferencedProfile}.mof
+
+%define CIMV2_REG %{_datadir}/%{name}/{HostedResourcePool,ElementCapabilities,HostedService,HostedDependency,ElementConformsToProfile,HostedAccessPoint}.registration
+%define CIMV2_MOF %{_datadir}/%{name}/{HostedResourcePool,ElementCapabilities,HostedService,HostedDependency,RegisteredProfile,ComputerSystem,ElementConformsToProfile,HostedAccessPoint}.mof
 
 # _If_ there is already a version of this installed, we must deregister
 # the classes we plan to install in post, otherwise we may corrupt
@@ -82,6 +90,9 @@
 %{_datadir}/%{name}/provider-register.sh -t pegasus \
 	-n root/interop \
 	-r %{INTEROP_REG} -m %{INTEROP_MOF} -v >/dev/null 2>&1 || true
+%{_datadir}/%{name}/provider-register.sh -t pegasus \
+	-n root/cimv2\
+	-r %{CIMV2_REG} -m %{CIMV2_MOF} -v >/dev/null 2>&1 || true
 
 %preun
 %{_datadir}/%{name}/provider-register.sh -d -t pegasus \
@@ -103,12 +114,19 @@
 %{_datadir}/libvirt-cim/*.sh
 %{_datadir}/libvirt-cim/*.mof
 %{_datadir}/libvirt-cim/cimv*-interop_mof
+%{_datadir}/libvirt-cim/cimv*-cimv2_mof
 %{_datadir}/libvirt-cim/*.registration
 %{_datadir}/libvirt-cim/fix_schema.patch
 %{_datadir}/libvirt-cim/cimv*-MOFs.zip
 /etc/ld.so.conf.d/libvirt-cim.conf
 
 %changelog
+* Tue Jan 27 2009 Kaitlin Rupert <kaitlin at us.ibm.com> - 0.5.3-2
+- Added Requires tag to ensure tog-pegasus dependency
+- Fixed root/cimv2 ns registration in spec 
+- Added emu_1_sdc.patch to expose template DiskRASDs with EmulatedType = 1
+- Added host_enum_sys.patch to use CBEnumInst() to check for SBLIM inst 
+
 * Thu Jan 15 2009 Kaitlin Rupert <kaitlin at us.ibm.com> - 0.5.3-1
 - Updated to latest upstream source
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt-cim/F-10/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	15 Jan 2009 21:48:43 -0000	1.13
+++ sources	28 Jan 2009 16:27:09 -0000	1.14
@@ -1,2 +1,2 @@
 f0d8962114b77e380c35af0f21a86f3f  libvirt-cim-0.5.2.tar.gz
-a60d1516af3105cf4bb60ee1f7ccc4ad  libvirt-cim-0.5.3.tar.gz
+69ad4eb18622482e6cd99c4c20ed01b0  libvirt-cim-0.5.3.tar.gz



From salimma at fedoraproject.org  Wed Jan 28 16:29:18 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Wed, 28 Jan 2009 16:29:18 +0000 (UTC)
Subject: rpms/qgtkstyle/F-10 .cvsignore, 1.7, 1.8 qgtkstyle.spec, 1.7,
	1.8 sources, 1.7, 1.8
Message-ID: <20090128162918.D49447010D@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/qgtkstyle/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24332/F-10

Modified Files:
	.cvsignore qgtkstyle.spec sources 
Log Message:
* Wed Jan 28 2009 Michel Salim <salimma at fedoraproject.org> - 0.0-0.2.%{svn_date}svn%{svn_revision}%{?dist}
- New upstream snapshot
- Better support Murrine-based engines (e.g. Nodoka)
- Various bug fixes



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qgtkstyle/F-10/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	24 Oct 2008 06:25:37 -0000	1.7
+++ .cvsignore	28 Jan 2009 16:28:48 -0000	1.8
@@ -1 +1 @@
-qgtkstyle-0.0-20081024svn820.tar.bz2
+qgtkstyle-0.0-20090107svn877.tar.bz2


Index: qgtkstyle.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qgtkstyle/F-10/qgtkstyle.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- qgtkstyle.spec	24 Oct 2008 06:25:37 -0000	1.7
+++ qgtkstyle.spec	28 Jan 2009 16:28:48 -0000	1.8
@@ -1,6 +1,6 @@
 %define qgtkstyle_version 0.0
-%define svn_date 20081024
-%define svn_revision 820
+%define svn_date 20090107
+%define svn_revision 877
 %define snapshot %{svn_date}svn%{svn_revision}
 
 # Tarfile created from svn snapshot
@@ -52,6 +52,11 @@
 %{_qt4_plugindir}/styles/libgtkstyle.so
 
 %changelog
+* Wed Jan 28 2009 Michel Salim <salimma at fedoraproject.org> - 0.0-0.2.%{svn_date}svn%{svn_revision}%{?dist}
+- New upstream snapshot
+- Better support Murrine-based engines (e.g. Nodoka)
+- Various bug fixes
+
 * Fri Oct 24 2008 Shawn Starr <spstarr at fedoraproject.org> 0.0-0.2.20081024svn820
 - New upstream snapshot.
 - Various speed improvements and stability.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qgtkstyle/F-10/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	24 Oct 2008 06:25:37 -0000	1.7
+++ sources	28 Jan 2009 16:28:48 -0000	1.8
@@ -1 +1 @@
-32c5d4fcbe25444a0e4385cd3f3d4961  qgtkstyle-0.0-20081024svn820.tar.bz2
+20766bdacc7f5e32697c2542d15fee80  qgtkstyle-0.0-20090107svn877.tar.bz2



From salimma at fedoraproject.org  Wed Jan 28 16:29:19 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Wed, 28 Jan 2009 16:29:19 +0000 (UTC)
Subject: rpms/qgtkstyle/devel .cvsignore, 1.7, 1.8 qgtkstyle.spec, 1.7,
	1.8 sources, 1.7, 1.8
Message-ID: <20090128162919.89DED7010D@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/qgtkstyle/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24332/devel

Modified Files:
	.cvsignore qgtkstyle.spec sources 
Log Message:
* Wed Jan 28 2009 Michel Salim <salimma at fedoraproject.org> - 0.0-0.2.%{svn_date}svn%{svn_revision}%{?dist}
- New upstream snapshot
- Better support Murrine-based engines (e.g. Nodoka)
- Various bug fixes



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qgtkstyle/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	24 Oct 2008 06:25:37 -0000	1.7
+++ .cvsignore	28 Jan 2009 16:28:49 -0000	1.8
@@ -1 +1 @@
-qgtkstyle-0.0-20081024svn820.tar.bz2
+qgtkstyle-0.0-20090107svn877.tar.bz2


Index: qgtkstyle.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qgtkstyle/devel/qgtkstyle.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- qgtkstyle.spec	24 Oct 2008 06:25:37 -0000	1.7
+++ qgtkstyle.spec	28 Jan 2009 16:28:49 -0000	1.8
@@ -1,6 +1,6 @@
 %define qgtkstyle_version 0.0
-%define svn_date 20081024
-%define svn_revision 820
+%define svn_date 20090107
+%define svn_revision 877
 %define snapshot %{svn_date}svn%{svn_revision}
 
 # Tarfile created from svn snapshot
@@ -52,6 +52,11 @@
 %{_qt4_plugindir}/styles/libgtkstyle.so
 
 %changelog
+* Wed Jan 28 2009 Michel Salim <salimma at fedoraproject.org> - 0.0-0.2.%{svn_date}svn%{svn_revision}%{?dist}
+- New upstream snapshot
+- Better support Murrine-based engines (e.g. Nodoka)
+- Various bug fixes
+
 * Fri Oct 24 2008 Shawn Starr <spstarr at fedoraproject.org> 0.0-0.2.20081024svn820
 - New upstream snapshot.
 - Various speed improvements and stability.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qgtkstyle/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	24 Oct 2008 06:25:37 -0000	1.7
+++ sources	28 Jan 2009 16:28:49 -0000	1.8
@@ -1 +1 @@
-32c5d4fcbe25444a0e4385cd3f3d4961  qgtkstyle-0.0-20081024svn820.tar.bz2
+20766bdacc7f5e32697c2542d15fee80  qgtkstyle-0.0-20090107svn877.tar.bz2



From salimma at fedoraproject.org  Wed Jan 28 16:29:19 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Wed, 28 Jan 2009 16:29:19 +0000 (UTC)
Subject: rpms/qgtkstyle/F-9 .cvsignore, 1.3, 1.4 qgtkstyle.spec, 1.5,
	1.6 sources, 1.3, 1.4
Message-ID: <20090128162919.2F9927010D@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/qgtkstyle/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24332/F-9

Modified Files:
	.cvsignore qgtkstyle.spec sources 
Log Message:
* Wed Jan 28 2009 Michel Salim <salimma at fedoraproject.org> - 0.0-0.2.%{svn_date}svn%{svn_revision}%{?dist}
- New upstream snapshot
- Better support Murrine-based engines (e.g. Nodoka)
- Various bug fixes



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qgtkstyle/F-9/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	23 Jul 2008 21:13:18 -0000	1.3
+++ .cvsignore	28 Jan 2009 16:28:48 -0000	1.4
@@ -1 +1 @@
-qgtkstyle-0.0-20080719svn693.tar.bz2
+qgtkstyle-0.0-20090107svn877.tar.bz2


Index: qgtkstyle.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qgtkstyle/F-9/qgtkstyle.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- qgtkstyle.spec	23 Jul 2008 21:35:30 -0000	1.5
+++ qgtkstyle.spec	28 Jan 2009 16:28:48 -0000	1.6
@@ -1,11 +1,11 @@
 %define qgtkstyle_version 0.0
-%define svn_date 20080719
-%define svn_revision 693
+%define svn_date 20090107
+%define svn_revision 877
 %define snapshot %{svn_date}svn%{svn_revision}
 
 # Tarfile created from svn snapshot
 # svn co svn://labs.trolltech.com/svn/styles/gtkstyle qgtkstyle-%{qgtkstyle_version}
-# tar cjf qgtkstyle-%{qgtkstyle_version}-%{snapshot}.tar.bz2 qgtkstyle-%{qgtkstyle_version}/
+# tar cjf qgtkstyle-%{qgtkstyle_version}-%{snapshot}.tar.bz2 --exclude=.svn qgtkstyle-%{qgtkstyle_version}/
 
 %define tarfile %{name}-%{qgtkstyle_version}-%{snapshot}.tar.bz2
 
@@ -52,6 +52,15 @@
 %{_qt4_plugindir}/styles/libgtkstyle.so
 
 %changelog
+* Wed Jan 28 2009 Michel Salim <salimma at fedoraproject.org> - 0.0-0.2.%{svn_date}svn%{svn_revision}%{?dist}
+- New upstream snapshot
+- Better support Murrine-based engines (e.g. Nodoka)
+- Various bug fixes
+
+* Fri Oct 24 2008 Shawn Starr <spstarr at fedoraproject.org> 0.0-0.2.20081024svn820
+- New upstream snapshot.
+- Various speed improvements and stability.
+
 * Wed Jul 23 2008 Shawn Starr <spstarr at fedoraproject.org> 0.0-0.2.20080719svn693
 - New upstream snapshot, fix display widget issues
 - Mimic GTK+ behavior better for some widgets


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qgtkstyle/F-9/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	23 Jul 2008 21:13:18 -0000	1.3
+++ sources	28 Jan 2009 16:28:48 -0000	1.4
@@ -1 +1 @@
-95c736455b641c2eb6f2130911b599f2  qgtkstyle-0.0-20080719svn693.tar.bz2
+20766bdacc7f5e32697c2542d15fee80  qgtkstyle-0.0-20090107svn877.tar.bz2



From kkofler at fedoraproject.org  Wed Jan 28 16:34:12 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Wed, 28 Jan 2009 16:34:12 +0000 (UTC)
Subject: rpms/qgtkstyle/F-10 qgtkstyle.spec,1.8,1.9
Message-ID: <20090128163412.824317010D@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/qgtkstyle/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25392/F-10

Modified Files:
	qgtkstyle.spec 
Log Message:
Expand the values of svn_date and svn_revision in the changelog so it'll still make sense after the next update. Remove %{?dist} from the changelog.


Index: qgtkstyle.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qgtkstyle/F-10/qgtkstyle.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- qgtkstyle.spec	28 Jan 2009 16:28:48 -0000	1.8
+++ qgtkstyle.spec	28 Jan 2009 16:33:42 -0000	1.9
@@ -52,7 +52,7 @@
 %{_qt4_plugindir}/styles/libgtkstyle.so
 
 %changelog
-* Wed Jan 28 2009 Michel Salim <salimma at fedoraproject.org> - 0.0-0.2.%{svn_date}svn%{svn_revision}%{?dist}
+* Wed Jan 28 2009 Michel Salim <salimma at fedoraproject.org> - 0.0-0.2.20090107svn877
 - New upstream snapshot
 - Better support Murrine-based engines (e.g. Nodoka)
 - Various bug fixes



From kkofler at fedoraproject.org  Wed Jan 28 16:34:12 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Wed, 28 Jan 2009 16:34:12 +0000 (UTC)
Subject: rpms/qgtkstyle/F-9 qgtkstyle.spec,1.6,1.7
Message-ID: <20090128163412.A2A0370142@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/qgtkstyle/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25392/F-9

Modified Files:
	qgtkstyle.spec 
Log Message:
Expand the values of svn_date and svn_revision in the changelog so it'll still make sense after the next update. Remove %{?dist} from the changelog.


Index: qgtkstyle.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qgtkstyle/F-9/qgtkstyle.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- qgtkstyle.spec	28 Jan 2009 16:28:48 -0000	1.6
+++ qgtkstyle.spec	28 Jan 2009 16:33:42 -0000	1.7
@@ -52,7 +52,7 @@
 %{_qt4_plugindir}/styles/libgtkstyle.so
 
 %changelog
-* Wed Jan 28 2009 Michel Salim <salimma at fedoraproject.org> - 0.0-0.2.%{svn_date}svn%{svn_revision}%{?dist}
+* Wed Jan 28 2009 Michel Salim <salimma at fedoraproject.org> - 0.0-0.2.20090107svn877
 - New upstream snapshot
 - Better support Murrine-based engines (e.g. Nodoka)
 - Various bug fixes



From kkofler at fedoraproject.org  Wed Jan 28 16:34:12 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Wed, 28 Jan 2009 16:34:12 +0000 (UTC)
Subject: rpms/qgtkstyle/devel qgtkstyle.spec,1.8,1.9
Message-ID: <20090128163412.D7FC17010D@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/qgtkstyle/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25392/devel

Modified Files:
	qgtkstyle.spec 
Log Message:
Expand the values of svn_date and svn_revision in the changelog so it'll still make sense after the next update. Remove %{?dist} from the changelog.


Index: qgtkstyle.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qgtkstyle/devel/qgtkstyle.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- qgtkstyle.spec	28 Jan 2009 16:28:49 -0000	1.8
+++ qgtkstyle.spec	28 Jan 2009 16:33:42 -0000	1.9
@@ -52,7 +52,7 @@
 %{_qt4_plugindir}/styles/libgtkstyle.so
 
 %changelog
-* Wed Jan 28 2009 Michel Salim <salimma at fedoraproject.org> - 0.0-0.2.%{svn_date}svn%{svn_revision}%{?dist}
+* Wed Jan 28 2009 Michel Salim <salimma at fedoraproject.org> - 0.0-0.2.20090107svn877
 - New upstream snapshot
 - Better support Murrine-based engines (e.g. Nodoka)
 - Various bug fixes



From jreznik at fedoraproject.org  Wed Jan 28 16:46:40 2009
From: jreznik at fedoraproject.org (Jaroslav Reznik)
Date: Wed, 28 Jan 2009 16:46:40 +0000 (UTC)
Subject: rpms/kde-plasma-quickaccess/devel
	kde-plasma-quickaccess-0.7.1-kde42-build.patch, 1.2,
	1.3 kde-plasma-quickaccess.spec, 1.7, 1.8
Message-ID: <20090128164640.7B0CA7010D@cvs1.fedora.phx.redhat.com>

Author: jreznik

Update of /cvs/pkgs/rpms/kde-plasma-quickaccess/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28238

Modified Files:
	kde-plasma-quickaccess.spec 
Added Files:
	kde-plasma-quickaccess-0.7.1-kde42-build.patch 
Log Message:
* Wed Jan 29 2009 Jaroslav Reznik <jreznik at redhat.com> 0.7.1-7
- KDE 4.2.0 build patch (Plasma package no more required)


kde-plasma-quickaccess-0.7.1-kde42-build.patch:

Index: kde-plasma-quickaccess-0.7.1-kde42-build.patch
===================================================================
RCS file: kde-plasma-quickaccess-0.7.1-kde42-build.patch
diff -N kde-plasma-quickaccess-0.7.1-kde42-build.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ kde-plasma-quickaccess-0.7.1-kde42-build.patch	28 Jan 2009 16:46:10 -0000	1.3
@@ -0,0 +1,20 @@
+diff -up quickaccess-0.7.1/CMakeLists.txt.kde42-build quickaccess-0.7.1/CMakeLists.txt
+--- quickaccess-0.7.1/CMakeLists.txt.kde42-build	2008-08-03 12:29:26.000000000 +0200
++++ quickaccess-0.7.1/CMakeLists.txt	2009-01-28 17:33:02.000000000 +0100
+@@ -4,7 +4,6 @@ project(quickaccess)
+ # Find the required Libaries
+ find_package(KDE4 REQUIRED)
+ include(KDE4Defaults)
+-find_package(Plasma REQUIRED)
+  
+ add_definitions (${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
+ include_directories(
+@@ -21,7 +20,7 @@ set(quickaccess_SRCS quickaccess.cpp pop
+ kde4_add_ui_files(quickaccess_SRCS quickaccessConfig.ui pluginwidgetbase.ui)
+ kde4_add_plugin(plasma_applet_quickaccess ${quickaccess_SRCS})
+ target_link_libraries(plasma_applet_quickaccess 
+-                      ${PLASMA_LIBS} ${KDE4_KDEUI_LIBS} ${KDE4_KIO_LIBS} kfile konq)
++                      ${KDE4_PLASMA_LIBS} ${KDE4_KDEUI_LIBS} ${KDE4_KIO_LIBS} kfile konq)
+  
+ install(TARGETS plasma_applet_quickaccess
+         DESTINATION ${PLUGIN_INSTALL_DIR})


Index: kde-plasma-quickaccess.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-quickaccess/devel/kde-plasma-quickaccess.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- kde-plasma-quickaccess.spec	28 Jan 2009 16:24:10 -0000	1.7
+++ kde-plasma-quickaccess.spec	28 Jan 2009 16:46:10 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           kde-plasma-quickaccess
 Version:        0.7.1
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Plasma applet for quick access to the most used folders
 
 Group:          User Interface/Desktops
@@ -10,13 +10,14 @@
 Source0:        http://www.kde-look.org/CONTENT/content-files/84128-quickaccess-%{version}.tar.gz
 Patch0:         kde-plasma-quickaccess-0.7.1-default-size.patch
 Patch1:         kde-plasma-quickaccess-0.7.1-kde42-iconwidget.patch
+Patch2:         kde-plasma-quickaccess-0.7.1-kde42-build.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  kdebase-workspace-devel >= 4.1.80
-BuildRequires:  kdelibs-devel >= 4.1.80
-BuildRequires:  kdebase-devel >= 4.1.80
-BuildRequires:  kdebase-libs >= 4.1.80
+BuildRequires:  kdebase-workspace-devel >= 4.2.0
+BuildRequires:  kdelibs-devel >= 4.2.0
+BuildRequires:  kdebase-devel >= 4.2.0
+BuildRequires:  kdebase-libs >= 4.2.0
 
 %description
 QuickAccess is a small applet designed for the panel to have quick access
@@ -27,6 +28,8 @@
 %setup -qn quickaccess-%{version}
 %patch0 -p1 -b .default-size
 %patch1 -p1 -b .kde42-iconwidget
+%patch2 -p1 -b .kde42-build
+
 
 %build
 mkdir -p %{_target_platform}
@@ -57,6 +60,9 @@
 %{_kde4_datadir}/kde4/services/plasma-applet-quickaccess.desktop
 
 %changelog
+* Wed Jan 29 2009 Jaroslav Reznik <jreznik at redhat.com> 0.7.1-7
+- KDE 4.2.0 build patch (Plasma package no more required)
+
 * Wed Jan 29 2009 Jaroslav Reznik <jreznik at redhat.com> 0.7.1-6
 - KDE 4.2.0 rebuild 
 



From kkofler at fedoraproject.org  Wed Jan 28 16:52:43 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Wed, 28 Jan 2009 16:52:43 +0000 (UTC)
Subject: rpms/kdeutils/F-10 kdeutils.spec,1.149,1.150
Message-ID: <20090128165243.58AF97010D@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdeutils/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29390/F-10

Modified Files:
	kdeutils.spec 
Log Message:
Update kjots hack (upload kdepim tarball in F-9, rediff patch).


Index: kdeutils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeutils/F-10/kdeutils.spec,v
retrieving revision 1.149
retrieving revision 1.150
diff -u -r1.149 -r1.150
--- kdeutils.spec	24 Jan 2009 06:20:11 -0000	1.149
+++ kdeutils.spec	28 Jan 2009 16:52:12 -0000	1.150
@@ -21,7 +21,7 @@
 Source0:        ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
 %if 0%{?include_kjots}
 Source1:        ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdepim-%{version}.tar.bz2
-Patch0:         kdeutils-4.0.99-kjots-without-kdepim.patch
+Patch0:         kdeutils-4.2.0-kjots-without-kdepim.patch
 %endif
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 



From kkofler at fedoraproject.org  Wed Jan 28 16:52:43 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Wed, 28 Jan 2009 16:52:43 +0000 (UTC)
Subject: rpms/kdeutils/F-9 kdeutils-4.2.0-kjots-without-kdepim.patch, NONE, 
	1.1 .cvsignore, 1.53, 1.54 kdeutils.spec, 1.135, 1.136 sources,
	1.60, 1.61 kdeutils-4.0.99-kjots-without-kdepim.patch, 1.3, NONE
Message-ID: <20090128165243.98C387010D@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdeutils/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29390/F-9

Modified Files:
	.cvsignore kdeutils.spec sources 
Added Files:
	kdeutils-4.2.0-kjots-without-kdepim.patch 
Removed Files:
	kdeutils-4.0.99-kjots-without-kdepim.patch 
Log Message:
Update kjots hack (upload kdepim tarball in F-9, rediff patch).

kdeutils-4.2.0-kjots-without-kdepim.patch:

--- NEW FILE kdeutils-4.2.0-kjots-without-kdepim.patch ---
diff -ur kjots-4.2.0/CMakeLists.txt kjots-4.2.0-kjots-without-kdepim/CMakeLists.txt
--- kjots-4.2.0/CMakeLists.txt	2008-12-21 21:18:58.000000000 +0100
+++ kjots-4.2.0-kjots-without-kdepim/CMakeLists.txt	2009-01-28 17:41:40.000000000 +0100
@@ -63,5 +63,7 @@
     #endif( BACKGROUND_INTERFACE_FILE_FOUND )
 endif( X11_FOUND AND QIMAGEBLITZ_FOUND)
 
+macro_optional_add_subdirectory(kjots)
+
 # --- show log ---
 macro_display_feature_log()
diff -ur kjots-4.2.0/doc/CMakeLists.txt kjots-4.2.0-kjots-without-kdepim/doc/CMakeLists.txt
--- kjots-4.2.0/doc/CMakeLists.txt	2008-09-13 10:13:57.000000000 +0200
+++ kjots-4.2.0-kjots-without-kdepim/doc/CMakeLists.txt	2009-01-28 17:41:40.000000000 +0100
@@ -12,3 +12,5 @@
    add_subdirectory(kcontrol)
    add_subdirectory(kcharselect)
 endif (UNIX)	
+
+add_subdirectory(kjots)
diff -ur kjots-4.2.0/kjots/aboutdata.cpp kjots-4.2.0-kjots-without-kdepim/kjots/aboutdata.cpp
--- kjots-4.2.0/kjots/aboutdata.cpp	2008-06-10 13:41:22.000000000 +0200
+++ kjots-4.2.0-kjots-without-kdepim/kjots/aboutdata.cpp	2009-01-28 17:41:40.000000000 +0100
@@ -24,7 +24,8 @@
 
 #include "aboutdata.h"
 #include <klocale.h>
-#include <libkdepim/pimapplication.h>
+#include <kaboutdata.h>
+#include <kdeversion.h>
 
 AboutData::AboutData()
   : KAboutData( "kjots", 0, ki18n( "KJots" ), KDE_VERSION_STRING,
diff -ur kjots-4.2.0/kjots/CMakeLists.txt kjots-4.2.0-kjots-without-kdepim/kjots/CMakeLists.txt
--- kjots-4.2.0/kjots/CMakeLists.txt	2008-11-12 17:37:52.000000000 +0100
+++ kjots-4.2.0-kjots-without-kdepim/kjots/CMakeLists.txt	2009-01-28 17:41:40.000000000 +0100
@@ -1,7 +1,6 @@
 project(kjots)
 
 add_subdirectory( icons )
-include_directories( ${CMAKE_BINARY_DIR}/libkdepim ${CMAKE_SOURCE_DIR}/libkdepim )
 
 #########################################################################
 # Main Application SECTION
@@ -36,7 +35,7 @@
 
 kde4_add_executable(kjots ${kjots_SRCS})
 
-target_link_libraries(kjots ${KDE4_KIO_LIBS} kdepim)
+target_link_libraries(kjots ${KDE4_KIO_LIBS})
 
 install(TARGETS kjots  ${INSTALL_TARGETS_DEFAULT_ARGS} )
 
@@ -59,7 +58,7 @@
 
 kde4_add_plugin(kjotspart ${kjotspart_PART_SRCS} ${kjots_SRCS} )
 
-target_link_libraries(kjotspart ${KDE4_KPARTS_LIBS} kdepim)
+target_link_libraries(kjotspart ${KDE4_KPARTS_LIBS})
 
 install( FILES kjotspart.desktop  DESTINATION ${SERVICES_INSTALL_DIR} )
 install( FILES kjotspartui.rc  DESTINATION ${DATA_INSTALL_DIR}/kjots)
diff -ur kjots-4.2.0/kjots/main.cpp kjots-4.2.0-kjots-without-kdepim/kjots/main.cpp
--- kjots-4.2.0/kjots/main.cpp	2008-06-10 13:41:22.000000000 +0200
+++ kjots-4.2.0-kjots-without-kdepim/kjots/main.cpp	2009-01-28 17:41:40.000000000 +0100
@@ -28,7 +28,7 @@
 
 #include <stdlib.h>
 #include <stdio.h>
-#include <libkdepim/pimapplication.h>
+#include <kuniqueapplication.h>
 #include <kcmdlineargs.h>
 #include <kconfig.h>
 #include <klocale.h>
@@ -39,14 +39,14 @@
 {
     AboutData aboutData;
     KCmdLineArgs::init(argc, argv, &aboutData);
-    KPIM::PimApplication::addCmdLineOptions();
+    KUniqueApplication::addCmdLineOptions();
 
-    if (!KPIM::PimApplication::start()) {
+    if (!KUniqueApplication::start()) {
         fprintf(stderr, "kjots is already running!\n");
         exit(0);
     }
 
-    KPIM::PimApplication a;
+    KUniqueApplication a;
 
     // backwards compatibility code to convert "old" user font settings
     // to the new config settings


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdeutils/F-9/.cvsignore,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- .cvsignore	9 Jan 2009 04:51:12 -0000	1.53
+++ .cvsignore	28 Jan 2009 16:52:13 -0000	1.54
@@ -1,2 +1,2 @@
-kdeutils-4.1.4.tar.bz2
-kdepim-4.1.4.tar.bz2
+kdeutils-4.2.0.tar.bz2
+kdepim-4.2.0.tar.bz2


Index: kdeutils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeutils/F-9/kdeutils.spec,v
retrieving revision 1.135
retrieving revision 1.136
diff -u -r1.135 -r1.136
--- kdeutils.spec	28 Jan 2009 16:16:49 -0000	1.135
+++ kdeutils.spec	28 Jan 2009 16:52:13 -0000	1.136
@@ -21,7 +21,7 @@
 Source0:        ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
 %if 0%{?include_kjots}
 Source1:        ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdepim-%{version}.tar.bz2
-Patch0:         kdeutils-4.0.99-kjots-without-kdepim.patch
+Patch0:         kdeutils-4.2.0-kjots-without-kdepim.patch
 %endif
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdeutils/F-9/sources,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- sources	28 Jan 2009 16:16:49 -0000	1.60
+++ sources	28 Jan 2009 16:52:13 -0000	1.61
@@ -1,2 +1,2 @@
 f0ca24c7d3e5bb0ab55bf6b26fc6224e  kdeutils-4.2.0.tar.bz2
-297ffe93343bc0dd62c7d90feae0ee6c  kdepim-4.1.4.tar.bz2
+a80631de21930b2544c86722138aaa6c  kdepim-4.2.0.tar.bz2


--- kdeutils-4.0.99-kjots-without-kdepim.patch DELETED ---



From kkofler at fedoraproject.org  Wed Jan 28 16:52:44 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Wed, 28 Jan 2009 16:52:44 +0000 (UTC)
Subject: rpms/kdeutils/devel kdeutils.spec,1.159,1.160
Message-ID: <20090128165244.032CC7010D@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdeutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29390/devel

Modified Files:
	kdeutils.spec 
Log Message:
Update kjots hack (upload kdepim tarball in F-9, rediff patch).


Index: kdeutils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeutils/devel/kdeutils.spec,v
retrieving revision 1.159
retrieving revision 1.160
diff -u -r1.159 -r1.160
--- kdeutils.spec	22 Jan 2009 13:20:42 -0000	1.159
+++ kdeutils.spec	28 Jan 2009 16:52:13 -0000	1.160
@@ -21,7 +21,7 @@
 Source0:        ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
 %if 0%{?include_kjots}
 Source1:        ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdepim-%{version}.tar.bz2
-Patch0:         kdeutils-4.0.99-kjots-without-kdepim.patch
+Patch0:         kdeutils-4.2.0-kjots-without-kdepim.patch
 %endif
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 



From mtasaka at fedoraproject.org  Wed Jan 28 16:53:24 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Wed, 28 Jan 2009 16:53:24 +0000 (UTC)
Subject: rpms/jd/F-10 .cvsignore, 1.339, 1.340 jd.spec, 1.394, 1.395 sources,
	1.340, 1.341
Message-ID: <20090128165324.AA3187010D@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29641/F-10

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
* Thu Jan 29 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.2.0-0.3.beta090128
- '2.2.0' beta 090128
- Although tarball says version is 2.1.1, the upsteam developer said that
  he/she will retag version number to 2.2.0
- kill oniguruma support on all branches



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/F-10/.cvsignore,v
retrieving revision 1.339
retrieving revision 1.340
diff -u -r1.339 -r1.340
--- .cvsignore	20 Jan 2009 04:07:04 -0000	1.339
+++ .cvsignore	28 Jan 2009 16:52:54 -0000	1.340
@@ -1 +1 @@
-jd-2.2.0-svn2631_trunk.tgz
+jd-2.1.1-beta090128.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/F-10/jd.spec,v
retrieving revision 1.394
retrieving revision 1.395
diff -u -r1.394 -r1.395
--- jd.spec	20 Jan 2009 04:07:04 -0000	1.394
+++ jd.spec	28 Jan 2009 16:52:54 -0000	1.395
@@ -10,8 +10,9 @@
 # Defined by upsteam
 #
 %define         main_ver      2.2.0
-%define         strtag        svn2631_trunk
-%define         repoid        36802
+%define         tarball_ver   2.1.1
+%define         strtag        beta090128
+%define         repoid        37324
 # Define this if this is pre-version
 %define         pre_release   1
 ##########################################
@@ -19,7 +20,7 @@
 ##########################################
 # Defined by vendor
 #
-%define         vendor_rel    1
+%define         vendor_rel    3
 %define         extra_rel     %{nil}
 # Tag name changed from vendor to vendorname so as not to
 # overwrite Vendor entry in Summary
@@ -40,6 +41,7 @@
 %if             0%{?fedora} >= 5
 %define         _with_migemo  1
 %endif
+%define         _with_onig    0 
 %define         migemo_dict   %{_datadir}/cmigemo/utf-8/migemo-dict
 ##########################################
 
@@ -51,7 +53,7 @@
 Group:          Applications/Internet
 License:        GPLv2
 URL:            http://jd4linux.sourceforge.jp/
-Source0:        http://downloads.sourceforge.jp/jd4linux/%{repoid}/%{name}-%{main_ver}-%{strtag}.tgz
+Source0:        http://downloads.sourceforge.jp/jd4linux/%{repoid}/%{name}-%{tarball_ver}-%{strtag}.tgz
 #Source0:	%{name}-%{main_ver}-%{strtag}.tgz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -64,7 +66,7 @@
 BuildRequires:  cmigemo-devel
 %endif
 BuildRequires:  alsa-lib-devel
-%if 0%{?fedora} > 8
+%if 0%{?_with_onig} >= 1
 BuildRequires:  oniguruma-devel
 %endif
 %if %{pre_release}
@@ -77,9 +79,14 @@
 JD is a 2ch browser based on gtkmm2.
 
 %prep
-%setup -q -n %{name}-%{main_ver}-%{strtag}
+%setup -q -n %{name}-%{tarball_ver}-%{strtag}
 #find . -name .svn | sort -r | xargs %{__rm} -rf
 
+%{__sed} -i.retag \
+	-e 's|MINORVERSION 1|MINORVERSION 2|' \
+	-e 's|MICROVERSION 1|MICROVERSION 0|' \
+	src/jdversion.h
+
 sh autogen.sh
 
 %build
@@ -88,7 +95,7 @@
 
 %configure \
    --with-alsa \
-%if 0%{?fedora} > 8
+%if 0%{?_with_onig} > 1
    --with-oniguruma \
 %endif
    --with-xdgopen \
@@ -133,8 +140,15 @@
 %{icondir}/%{name}.png
 
 %changelog
+* Thu Jan 29 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.2.0-0.3.beta090128
+- '2.2.0' beta 090128
+- Although tarball says version is 2.1.1, the upsteam developer said that
+  he/she will retag version number to 2.2.0
+- kill oniguruma support on all branches
+
 * Tue Jan 20 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
-- rev 2631
+- Try to kill oniguruma support on F-11 (seemingly behaving badly
+  with cmigemo)
 
 * Tue Dec 30 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.1.0-2
 - Workaround for the issue on res 868 in JD 6 thread (segv when


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/F-10/sources,v
retrieving revision 1.340
retrieving revision 1.341
diff -u -r1.340 -r1.341
--- sources	20 Jan 2009 04:07:04 -0000	1.340
+++ sources	28 Jan 2009 16:52:54 -0000	1.341
@@ -1 +1 @@
-b4d02a885d675cd4dbfd5455a4e892a1  jd-2.2.0-svn2631_trunk.tgz
+8169a698c333041f1cab91d3dd9807b3  jd-2.1.1-beta090128.tgz



From mtasaka at fedoraproject.org  Wed Jan 28 16:53:25 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Wed, 28 Jan 2009 16:53:25 +0000 (UTC)
Subject: rpms/jd/F-9 .cvsignore, 1.339, 1.340 jd.spec, 1.385, 1.386 sources, 
	1.340, 1.341
Message-ID: <20090128165325.155777010D@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29641/F-9

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
* Thu Jan 29 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.2.0-0.3.beta090128
- '2.2.0' beta 090128
- Although tarball says version is 2.1.1, the upsteam developer said that
  he/she will retag version number to 2.2.0
- kill oniguruma support on all branches



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/F-9/.cvsignore,v
retrieving revision 1.339
retrieving revision 1.340
diff -u -r1.339 -r1.340
--- .cvsignore	20 Jan 2009 04:07:05 -0000	1.339
+++ .cvsignore	28 Jan 2009 16:52:54 -0000	1.340
@@ -1 +1 @@
-jd-2.2.0-svn2631_trunk.tgz
+jd-2.1.1-beta090128.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/F-9/jd.spec,v
retrieving revision 1.385
retrieving revision 1.386
diff -u -r1.385 -r1.386
--- jd.spec	20 Jan 2009 04:07:05 -0000	1.385
+++ jd.spec	28 Jan 2009 16:52:54 -0000	1.386
@@ -10,8 +10,9 @@
 # Defined by upsteam
 #
 %define         main_ver      2.2.0
-%define         strtag        svn2631_trunk
-%define         repoid        36802
+%define         tarball_ver   2.1.1
+%define         strtag        beta090128
+%define         repoid        37324
 # Define this if this is pre-version
 %define         pre_release   1
 ##########################################
@@ -19,7 +20,7 @@
 ##########################################
 # Defined by vendor
 #
-%define         vendor_rel    1
+%define         vendor_rel    3
 %define         extra_rel     %{nil}
 # Tag name changed from vendor to vendorname so as not to
 # overwrite Vendor entry in Summary
@@ -40,6 +41,7 @@
 %if             0%{?fedora} >= 5
 %define         _with_migemo  1
 %endif
+%define         _with_onig    0 
 %define         migemo_dict   %{_datadir}/cmigemo/utf-8/migemo-dict
 ##########################################
 
@@ -51,7 +53,7 @@
 Group:          Applications/Internet
 License:        GPLv2
 URL:            http://jd4linux.sourceforge.jp/
-Source0:        http://downloads.sourceforge.jp/jd4linux/%{repoid}/%{name}-%{main_ver}-%{strtag}.tgz
+Source0:        http://downloads.sourceforge.jp/jd4linux/%{repoid}/%{name}-%{tarball_ver}-%{strtag}.tgz
 #Source0:	%{name}-%{main_ver}-%{strtag}.tgz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -64,7 +66,7 @@
 BuildRequires:  cmigemo-devel
 %endif
 BuildRequires:  alsa-lib-devel
-%if 0%{?fedora} > 8
+%if 0%{?_with_onig} >= 1
 BuildRequires:  oniguruma-devel
 %endif
 %if %{pre_release}
@@ -77,9 +79,14 @@
 JD is a 2ch browser based on gtkmm2.
 
 %prep
-%setup -q -n %{name}-%{main_ver}-%{strtag}
+%setup -q -n %{name}-%{tarball_ver}-%{strtag}
 #find . -name .svn | sort -r | xargs %{__rm} -rf
 
+%{__sed} -i.retag \
+	-e 's|MINORVERSION 1|MINORVERSION 2|' \
+	-e 's|MICROVERSION 1|MICROVERSION 0|' \
+	src/jdversion.h
+
 sh autogen.sh
 
 %build
@@ -88,7 +95,7 @@
 
 %configure \
    --with-alsa \
-%if 0%{?fedora} > 8
+%if 0%{?_with_onig} > 1
    --with-oniguruma \
 %endif
    --with-xdgopen \
@@ -133,8 +140,15 @@
 %{icondir}/%{name}.png
 
 %changelog
+* Thu Jan 29 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.2.0-0.3.beta090128
+- '2.2.0' beta 090128
+- Although tarball says version is 2.1.1, the upsteam developer said that
+  he/she will retag version number to 2.2.0
+- kill oniguruma support on all branches
+
 * Tue Jan 20 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
-- rev 2631
+- Try to kill oniguruma support on F-11 (seemingly behaving badly
+  with cmigemo)
 
 * Tue Dec 30 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.1.0-2
 - Workaround for the issue on res 868 in JD 6 thread (segv when


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/F-9/sources,v
retrieving revision 1.340
retrieving revision 1.341
diff -u -r1.340 -r1.341
--- sources	20 Jan 2009 04:07:05 -0000	1.340
+++ sources	28 Jan 2009 16:52:54 -0000	1.341
@@ -1 +1 @@
-b4d02a885d675cd4dbfd5455a4e892a1  jd-2.2.0-svn2631_trunk.tgz
+8169a698c333041f1cab91d3dd9807b3  jd-2.1.1-beta090128.tgz



From mtasaka at fedoraproject.org  Wed Jan 28 16:53:25 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Wed, 28 Jan 2009 16:53:25 +0000 (UTC)
Subject: rpms/jd/devel .cvsignore, 1.330, 1.331 jd.spec, 1.387, 1.388 sources,
	1.331, 1.332
Message-ID: <20090128165325.766487010D@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29641/devel

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
* Thu Jan 29 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.2.0-0.3.beta090128
- '2.2.0' beta 090128
- Although tarball says version is 2.1.1, the upsteam developer said that
  he/she will retag version number to 2.2.0
- kill oniguruma support on all branches



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/.cvsignore,v
retrieving revision 1.330
retrieving revision 1.331
diff -u -r1.330 -r1.331
--- .cvsignore	20 Jan 2009 04:07:05 -0000	1.330
+++ .cvsignore	28 Jan 2009 16:52:55 -0000	1.331
@@ -1 +1 @@
-jd-2.2.0-svn2631_trunk.tgz
+jd-2.1.1-beta090128.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/jd.spec,v
retrieving revision 1.387
retrieving revision 1.388
diff -u -r1.387 -r1.388
--- jd.spec	20 Jan 2009 05:41:01 -0000	1.387
+++ jd.spec	28 Jan 2009 16:52:55 -0000	1.388
@@ -10,8 +10,9 @@
 # Defined by upsteam
 #
 %define         main_ver      2.2.0
-%define         strtag        svn2631_trunk
-%define         repoid        36802
+%define         tarball_ver   2.1.1
+%define         strtag        beta090128
+%define         repoid        37324
 # Define this if this is pre-version
 %define         pre_release   1
 ##########################################
@@ -19,7 +20,7 @@
 ##########################################
 # Defined by vendor
 #
-%define         vendor_rel    2
+%define         vendor_rel    3
 %define         extra_rel     %{nil}
 # Tag name changed from vendor to vendorname so as not to
 # overwrite Vendor entry in Summary
@@ -40,6 +41,7 @@
 %if             0%{?fedora} >= 5
 %define         _with_migemo  1
 %endif
+%define         _with_onig    0 
 %define         migemo_dict   %{_datadir}/cmigemo/utf-8/migemo-dict
 ##########################################
 
@@ -51,7 +53,7 @@
 Group:          Applications/Internet
 License:        GPLv2
 URL:            http://jd4linux.sourceforge.jp/
-Source0:        http://downloads.sourceforge.jp/jd4linux/%{repoid}/%{name}-%{main_ver}-%{strtag}.tgz
+Source0:        http://downloads.sourceforge.jp/jd4linux/%{repoid}/%{name}-%{tarball_ver}-%{strtag}.tgz
 #Source0:	%{name}-%{main_ver}-%{strtag}.tgz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -64,11 +66,9 @@
 BuildRequires:  cmigemo-devel
 %endif
 BuildRequires:  alsa-lib-devel
-%if 0%{?fedora} > 8
-%if 0%{?fedora} < 11
+%if 0%{?_with_onig} >= 1
 BuildRequires:  oniguruma-devel
 %endif
-%endif
 %if %{pre_release}
 BuildRequires:	subversion
 %endif
@@ -79,9 +79,14 @@
 JD is a 2ch browser based on gtkmm2.
 
 %prep
-%setup -q -n %{name}-%{main_ver}-%{strtag}
+%setup -q -n %{name}-%{tarball_ver}-%{strtag}
 #find . -name .svn | sort -r | xargs %{__rm} -rf
 
+%{__sed} -i.retag \
+	-e 's|MINORVERSION 1|MINORVERSION 2|' \
+	-e 's|MICROVERSION 1|MICROVERSION 0|' \
+	src/jdversion.h
+
 sh autogen.sh
 
 %build
@@ -90,11 +95,9 @@
 
 %configure \
    --with-alsa \
-%if 0%{?fedora} > 8
-%if 0%{?fedora} < 11
+%if 0%{?_with_onig} > 1
    --with-oniguruma \
 %endif
-%endif
    --with-xdgopen \
 %if 0%{?_with_migemo} >= 1
    --with-migemo \
@@ -137,8 +140,11 @@
 %{icondir}/%{name}.png
 
 %changelog
-* Tue Jan 20 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
-- rev 2631
+* Thu Jan 29 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.2.0-0.3.beta090128
+- '2.2.0' beta 090128
+- Although tarball says version is 2.1.1, the upsteam developer said that
+  he/she will retag version number to 2.2.0
+- kill oniguruma support on all branches
 
 * Tue Jan 20 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
 - Try to kill oniguruma support on F-11 (seemingly behaving badly


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/sources,v
retrieving revision 1.331
retrieving revision 1.332
diff -u -r1.331 -r1.332
--- sources	20 Jan 2009 04:07:05 -0000	1.331
+++ sources	28 Jan 2009 16:52:55 -0000	1.332
@@ -1 +1 @@
-b4d02a885d675cd4dbfd5455a4e892a1  jd-2.2.0-svn2631_trunk.tgz
+8169a698c333041f1cab91d3dd9807b3  jd-2.1.1-beta090128.tgz



From jreznik at fedoraproject.org  Wed Jan 28 16:53:40 2009
From: jreznik at fedoraproject.org (Jaroslav Reznik)
Date: Wed, 28 Jan 2009 16:53:40 +0000 (UTC)
Subject: rpms/kde-plasma-quickaccess/F-10
	kde-plasma-quickaccess-0.7.1-kde42-build.patch, NONE,
	1.1 kde-plasma-quickaccess-0.7.1-kde42-iconwidget.patch, NONE,
	1.1 kde-plasma-quickaccess.spec, 1.2, 1.3
Message-ID: <20090128165340.592E37010D@cvs1.fedora.phx.redhat.com>

Author: jreznik

Update of /cvs/pkgs/rpms/kde-plasma-quickaccess/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29777

Modified Files:
	kde-plasma-quickaccess.spec 
Added Files:
	kde-plasma-quickaccess-0.7.1-kde42-build.patch 
	kde-plasma-quickaccess-0.7.1-kde42-iconwidget.patch 
Log Message:
* Wed Jan 29 2009 Jaroslav Reznik <jreznik at redhat.com> 0.7.1-7
- KDE 4.2.0 build patch (Plasma package no more required)

* Wed Jan 29 2009 Jaroslav Reznik <jreznik at redhat.com> 0.7.1-6
- KDE 4.2.0 rebuild


kde-plasma-quickaccess-0.7.1-kde42-build.patch:

--- NEW FILE kde-plasma-quickaccess-0.7.1-kde42-build.patch ---
diff -up quickaccess-0.7.1/CMakeLists.txt.kde42-build quickaccess-0.7.1/CMakeLists.txt
--- quickaccess-0.7.1/CMakeLists.txt.kde42-build	2008-08-03 12:29:26.000000000 +0200
+++ quickaccess-0.7.1/CMakeLists.txt	2009-01-28 17:33:02.000000000 +0100
@@ -4,7 +4,6 @@ project(quickaccess)
 # Find the required Libaries
 find_package(KDE4 REQUIRED)
 include(KDE4Defaults)
-find_package(Plasma REQUIRED)
  
 add_definitions (${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
 include_directories(
@@ -21,7 +20,7 @@ set(quickaccess_SRCS quickaccess.cpp pop
 kde4_add_ui_files(quickaccess_SRCS quickaccessConfig.ui pluginwidgetbase.ui)
 kde4_add_plugin(plasma_applet_quickaccess ${quickaccess_SRCS})
 target_link_libraries(plasma_applet_quickaccess 
-                      ${PLASMA_LIBS} ${KDE4_KDEUI_LIBS} ${KDE4_KIO_LIBS} kfile konq)
+                      ${KDE4_PLASMA_LIBS} ${KDE4_KDEUI_LIBS} ${KDE4_KIO_LIBS} kfile konq)
  
 install(TARGETS plasma_applet_quickaccess
         DESTINATION ${PLUGIN_INSTALL_DIR})

kde-plasma-quickaccess-0.7.1-kde42-iconwidget.patch:

--- NEW FILE kde-plasma-quickaccess-0.7.1-kde42-iconwidget.patch ---
diff -up quickaccess-0.7.1/quickaccess.cpp.kde42-iconwidget quickaccess-0.7.1/quickaccess.cpp
--- quickaccess-0.7.1/quickaccess.cpp.kde42-iconwidget	2008-08-03 12:29:26.000000000 +0200
+++ quickaccess-0.7.1/quickaccess.cpp	2008-11-20 15:28:58.000000000 +0100
@@ -40,7 +40,7 @@
 QuickAccess::QuickAccess(QObject *parent, const QVariantList &args)
   :Plasma::Applet(parent, args)
   ,m_settings(new Settings(this))
-  ,m_icon(new Plasma::Icon(this))
+  ,m_icon(new Plasma::IconWidget(this))
   ,m_dialog(0)
   ,m_dialogSize(QSize())
   ,m_dragOver(false)
diff -up quickaccess-0.7.1/quickaccess.h.kde42-iconwidget quickaccess-0.7.1/quickaccess.h
--- quickaccess-0.7.1/quickaccess.h.kde42-iconwidget	2008-11-20 15:28:31.000000000 +0100
+++ quickaccess-0.7.1/quickaccess.h	2008-11-20 15:28:11.000000000 +0100
@@ -22,7 +22,7 @@
 
 //Plasma includes
 #include <Plasma/Applet>
-#include <plasma/widgets/icon.h>
+#include <plasma/widgets/iconwidget.h>
 
 //locale includes
 #include "popupdialog.h"
@@ -63,7 +63,7 @@ class QuickAccess : public Plasma::Apple
     
   private:
     Settings *m_settings;
-    Plasma::Icon *m_icon;
+    Plasma::IconWidget *m_icon;
     PopupDialog *m_dialog;
     QSize m_dialogSize;
     bool m_dragOver;


Index: kde-plasma-quickaccess.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-quickaccess/F-10/kde-plasma-quickaccess.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- kde-plasma-quickaccess.spec	7 Nov 2008 13:48:38 -0000	1.2
+++ kde-plasma-quickaccess.spec	28 Jan 2009 16:53:10 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           kde-plasma-quickaccess
 Version:        0.7.1
-Release:        2%{?dist}
+Release:        7%{?dist}
 Summary:        Plasma applet for quick access to the most used folders
 
 Group:          User Interface/Desktops
@@ -9,12 +9,15 @@
 
 Source0:        http://www.kde-look.org/CONTENT/content-files/84128-quickaccess-%{version}.tar.gz
 Patch0:         kde-plasma-quickaccess-0.7.1-default-size.patch
+Patch1:         kde-plasma-quickaccess-0.7.1-kde42-iconwidget.patch
+Patch2:         kde-plasma-quickaccess-0.7.1-kde42-build.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  kdebase-workspace-devel >= 4.1.0
-BuildRequires:  kdelibs-devel >= 4.1.0
-BuildRequires:  kdebase-devel >= 4.1.0 
+BuildRequires:  kdebase-workspace-devel >= 4.2.0
+BuildRequires:  kdelibs-devel >= 4.2.0
+BuildRequires:  kdebase-devel >= 4.2.0
+BuildRequires:  kdebase-libs >= 4.2.0
 
 %description
 QuickAccess is a small applet designed for the panel to have quick access
@@ -24,6 +27,8 @@
 %prep
 %setup -qn quickaccess-%{version}
 %patch0 -p1 -b .default-size
+%patch1 -p1 -b .kde42-iconwidget
+%patch2 -p1 -b .kde42-build
 
 
 %build
@@ -32,7 +37,7 @@
 %{cmake_kde4} ..
 popd
 
-make %{?_smp_mflags} -C %{_target_platform}
+make VERBOSE=1 %{?_smp_mflags} -C %{_target_platform}
 
 
 %install
@@ -55,8 +60,26 @@
 %{_kde4_datadir}/kde4/services/plasma-applet-quickaccess.desktop
 
 %changelog
+* Wed Jan 29 2009 Jaroslav Reznik <jreznik at redhat.com> 0.7.1-7
+- KDE 4.2.0 build patch (Plasma package no more required)
+
+* Wed Jan 29 2009 Jaroslav Reznik <jreznik at redhat.com> 0.7.1-6
+- KDE 4.2.0 rebuild 
+
+* Sun Dec 14 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 0.7.1-5
+- drop libkonq hack, linker search path fixed in kdelibs now
+
+* Tue Dec 02 2008 Jaroslav Reznik <jreznik at redhat.com> 0.7.1-4
+- build requires
+- build problem ugly hack (lkonq)
+- make VERBOSE=1
+
+* Tue Dec 02 2008 Jaroslav Reznik <jreznik at redhat.com> 0.7.1-3
+- patched for KDE 4.2 Plasma API
+
 * Thu Nov 06 2008 Jaroslav Reznik <jreznik at redhat.com> 0.7.1-2
 - default size patch
 - fix URL
+
 * Wed Sep 10 2008 Jaroslav Reznik <jreznik at redhat.com> 0.7.1-1
-- Initial package
\ No newline at end of file
+- Initial package



From pkgdb at fedoraproject.org  Wed Jan 28 17:04:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Jan 2009 17:04:28 +0000
Subject: [pkgdb] perl-HTTP-Server-Simple had acl change status
Message-ID: <20090128170428.5D7F5208493@bastion.fedora.phx.redhat.com>

spot has set the watchcommits acl on perl-HTTP-Server-Simple (Fedora devel) to Approved for corsepiu

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-HTTP-Server-Simple



From pkgdb at fedoraproject.org  Wed Jan 28 17:04:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Jan 2009 17:04:28 +0000
Subject: [pkgdb] perl-HTTP-Server-Simple had acl change status
Message-ID: <20090128170428.5D9F8208494@bastion.fedora.phx.redhat.com>

spot has set the watchbugzilla acl on perl-HTTP-Server-Simple (Fedora devel) to Approved for corsepiu

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-HTTP-Server-Simple



From pkgdb at fedoraproject.org  Wed Jan 28 17:04:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Jan 2009 17:04:29 +0000
Subject: [pkgdb] perl-HTTP-Server-Simple had acl change status
Message-ID: <20090128170429.7E9C32084A7@bastion.fedora.phx.redhat.com>

spot has set the commit acl on perl-HTTP-Server-Simple (Fedora devel) to Approved for corsepiu

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-HTTP-Server-Simple



From pkgdb at fedoraproject.org  Wed Jan 28 17:04:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Jan 2009 17:04:30 +0000
Subject: [pkgdb] perl-HTTP-Server-Simple had acl change status
Message-ID: <20090128170430.A72B12084BD@bastion.fedora.phx.redhat.com>

spot has set the approveacls acl on perl-HTTP-Server-Simple (Fedora devel) to Approved for corsepiu

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-HTTP-Server-Simple



From pkgdb at fedoraproject.org  Wed Jan 28 17:04:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Jan 2009 17:04:39 +0000
Subject: [pkgdb] perl-HTTP-Server-Simple had acl change status
Message-ID: <20090128170439.78050208609@bastion.fedora.phx.redhat.com>

spot has set the watchbugzilla acl on perl-HTTP-Server-Simple (Fedora 9) to Approved for corsepiu

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-HTTP-Server-Simple



From pkgdb at fedoraproject.org  Wed Jan 28 17:04:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Jan 2009 17:04:39 +0000
Subject: [pkgdb] perl-HTTP-Server-Simple had acl change status
Message-ID: <20090128170440.278C520860B@bastion.fedora.phx.redhat.com>

spot has set the watchcommits acl on perl-HTTP-Server-Simple (Fedora 9) to Approved for corsepiu

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-HTTP-Server-Simple



From pkgdb at fedoraproject.org  Wed Jan 28 17:04:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Jan 2009 17:04:41 +0000
Subject: [pkgdb] perl-HTTP-Server-Simple had acl change status
Message-ID: <20090128170442.083F920860F@bastion.fedora.phx.redhat.com>

spot has set the commit acl on perl-HTTP-Server-Simple (Fedora 9) to Approved for corsepiu

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-HTTP-Server-Simple



From pkgdb at fedoraproject.org  Wed Jan 28 17:04:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Jan 2009 17:04:43 +0000
Subject: [pkgdb] perl-HTTP-Server-Simple had acl change status
Message-ID: <20090128170443.57F96208678@bastion.fedora.phx.redhat.com>

spot has set the approveacls acl on perl-HTTP-Server-Simple (Fedora 9) to Approved for corsepiu

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-HTTP-Server-Simple



From pkgdb at fedoraproject.org  Wed Jan 28 17:04:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Jan 2009 17:04:46 +0000
Subject: [pkgdb] perl-HTTP-Server-Simple had acl change status
Message-ID: <20090128170446.D139E2086F2@bastion.fedora.phx.redhat.com>

spot has set the watchbugzilla acl on perl-HTTP-Server-Simple (Fedora 10) to Approved for corsepiu

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-HTTP-Server-Simple



From pkgdb at fedoraproject.org  Wed Jan 28 17:04:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Jan 2009 17:04:47 +0000
Subject: [pkgdb] perl-HTTP-Server-Simple had acl change status
Message-ID: <20090128170447.60CAD208701@bastion.fedora.phx.redhat.com>

spot has set the watchcommits acl on perl-HTTP-Server-Simple (Fedora 10) to Approved for corsepiu

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-HTTP-Server-Simple



From pkgdb at fedoraproject.org  Wed Jan 28 17:04:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Jan 2009 17:04:48 +0000
Subject: [pkgdb] perl-HTTP-Server-Simple had acl change status
Message-ID: <20090128170448.3DEA920873F@bastion.fedora.phx.redhat.com>

spot has set the commit acl on perl-HTTP-Server-Simple (Fedora 10) to Approved for corsepiu

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-HTTP-Server-Simple



From pkgdb at fedoraproject.org  Wed Jan 28 17:04:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Jan 2009 17:04:49 +0000
Subject: [pkgdb] perl-HTTP-Server-Simple had acl change status
Message-ID: <20090128170449.D37FB208494@bastion.fedora.phx.redhat.com>

spot has set the approveacls acl on perl-HTTP-Server-Simple (Fedora 10) to Approved for corsepiu

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-HTTP-Server-Simple



From karsten at fedoraproject.org  Wed Jan 28 17:06:18 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Wed, 28 Jan 2009 17:06:18 +0000 (UTC)
Subject: rpms/prctl/devel prctl.spec,1.18,1.19
Message-ID: <20090128170618.62A027010D@cvs1.fedora.phx.redhat.com>

Author: karsten

Update of /cvs/extras/rpms/prctl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32197

Modified Files:
	prctl.spec 
Log Message:
- review fixes


Index: prctl.spec
===================================================================
RCS file: /cvs/extras/rpms/prctl/devel/prctl.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- prctl.spec	28 Jan 2009 11:22:58 -0000	1.18
+++ prctl.spec	28 Jan 2009 17:05:47 -0000	1.19
@@ -1,11 +1,11 @@
 Summary: Utility to perform process operations
 Name: prctl
 Version: 1.5
-Release: 4
+Release: 4%{?dist}
 License: GPLv2
 Group: Applications/System
 URL:	http://sourceforge.net/projects/prctl
-Source: http://prdownloads.sourceforge.net/prctl/prctl-%{version}.tar.gz
+Source: http://prdownloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 Patch0: prctl-1.5-destdir.patch
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # The only parameters of prctl that do anything other than printing help are
@@ -19,7 +19,7 @@
 runtime environment. This utility works on Linux 2.4 and higher kernels only.
 
 %prep
-%setup
+%setup -q
 %patch0 -p1
 
 %build
@@ -37,8 +37,8 @@
 %files
 %defattr(-,root,root,-)
 %doc ChangeLog
-%{_bindir}/prctl
-%{_mandir}/man1/prctl.*
+%{_bindir}/%{name}
+%{_mandir}/man1/%{name}.*
 
 %changelog
 * Wed Jan 28 2009 Karsten Hopp <karsten at redhat.com> 1.5-4



From twaugh at fedoraproject.org  Wed Jan 28 17:17:47 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Wed, 28 Jan 2009 17:17:47 +0000 (UTC)
Subject: rpms/cups/devel cups-str3077.patch, NONE, 1.1 cups-str3078.patch,
	NONE, 1.1 cups-lspp.patch, 1.39, 1.40 cups.spec, 1.455, 1.456
Message-ID: <20090128171747.7EF387010D@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/cups/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2450

Modified Files:
	cups-lspp.patch cups.spec 
Added Files:
	cups-str3077.patch cups-str3078.patch 
Log Message:
* Wed Jan 28 2009 Tim Waugh <twaugh at redhat.com> 1:1.4-0.b2.4
- Fixed quotas (STR #3077, STR #3078).


cups-str3077.patch:

--- NEW FILE cups-str3077.patch ---
diff -up cups-1.4b2/cups/encode.c.str3077 cups-1.4b2/cups/encode.c
--- cups-1.4b2/cups/encode.c.str3077	2008-12-15 17:54:11.000000000 +0000
+++ cups-1.4b2/cups/encode.c	2009-01-28 16:58:01.000000000 +0000
@@ -69,10 +69,10 @@ static const _ipp_option_t ipp_options[]
   { 0, "hue-default",		IPP_TAG_INTEGER,	IPP_TAG_PRINTER },
   { 1, "include-schemes",	IPP_TAG_NAME,		IPP_TAG_OPERATION },
   { 0, "job-impressions",	IPP_TAG_INTEGER,	IPP_TAG_JOB },
-  { 0, "job-k-limit",		IPP_TAG_INTEGER,	IPP_TAG_JOB },
-  { 0, "job-page-limit",	IPP_TAG_INTEGER,	IPP_TAG_JOB },
+  { 0, "job-k-limit",		IPP_TAG_INTEGER,	IPP_TAG_PRINTER },
+  { 0, "job-page-limit",	IPP_TAG_INTEGER,	IPP_TAG_PRINTER },
   { 0, "job-priority",		IPP_TAG_INTEGER,	IPP_TAG_JOB },
-  { 0, "job-quota-period",	IPP_TAG_INTEGER,	IPP_TAG_JOB },
+  { 0, "job-quota-period",	IPP_TAG_INTEGER,	IPP_TAG_PRINTER },
   { 1, "job-sheets",		IPP_TAG_NAME,		IPP_TAG_JOB },
   { 1, "job-sheets-default",	IPP_TAG_NAME,		IPP_TAG_PRINTER },
   { 0, "job-uuid",		IPP_TAG_URI,		IPP_TAG_JOB },

cups-str3078.patch:

--- NEW FILE cups-str3078.patch ---
diff -up cups-1.4b2/scheduler/job.c.str3078 cups-1.4b2/scheduler/job.c
--- cups-1.4b2/scheduler/job.c.str3078	2009-01-28 16:59:45.000000000 +0000
+++ cups-1.4b2/scheduler/job.c	2009-01-28 17:00:04.000000000 +0000
@@ -1049,7 +1049,7 @@ cupsdLoadAllJobs(void)
  * 'cupsdLoadJob()' - Load a single job...
  */
 
-void
+int					/* O - 1 on success, 0 on failure */
 cupsdLoadJob(cupsd_job_t *job)		/* I - Job */
 {
   char			jobfile[1024];	/* Job filename */
@@ -1067,14 +1067,14 @@ cupsdLoadJob(cupsd_job_t *job)		/* I - J
     if (job->state_value > IPP_JOB_STOPPED)
       job->access_time = time(NULL);
 
-    return;
+    return (1);
   }
 
   if ((job->attrs = ippNew()) == NULL)
   {
     cupsdLogMessage(CUPSD_LOG_ERROR,
                     "[Job %d] Ran out of memory for job attributes!", job->id);
-    return;
+    return (0);
   }
 
  /*
@@ -1089,9 +1089,7 @@ cupsdLoadJob(cupsd_job_t *job)		/* I - J
     cupsdLogMessage(CUPSD_LOG_ERROR,
 		    "[Job %d] Unable to open job control file \"%s\" - %s!",
 		    job->id, jobfile, strerror(errno));
-    ippDelete(job->attrs);
-    job->attrs = NULL;
-    return;
+    goto error;
   }
 
   if (ippReadIO(fp, (ipp_iocb_t)cupsFileRead, 1, NULL, job->attrs) != IPP_DATA)
@@ -1100,10 +1098,7 @@ cupsdLoadJob(cupsd_job_t *job)		/* I - J
 		    "[Job %d] Unable to read job control file \"%s\"!", job->id,
 		    jobfile);
     cupsFileClose(fp);
-    ippDelete(job->attrs);
-    job->attrs = NULL;
-    unlink(jobfile);
-    return;
+    goto error;
   }
 
   cupsFileClose(fp);
@@ -1117,10 +1112,7 @@ cupsdLoadJob(cupsd_job_t *job)		/* I - J
     cupsdLogMessage(CUPSD_LOG_ERROR,
 		    "[Job %d] Missing or bad time-at-creation attribute in "
 		    "control file!", job->id);
-    ippDelete(job->attrs);
-    job->attrs = NULL;
-    unlink(jobfile);
-    return;
+    goto error;
   }
 
   if ((job->state = ippFindAttribute(job->attrs, "job-state",
@@ -1129,10 +1121,7 @@ cupsdLoadJob(cupsd_job_t *job)		/* I - J
     cupsdLogMessage(CUPSD_LOG_ERROR,
 		    "[Job %d] Missing or bad job-state attribute in control "
 		    "file!", job->id);
-    ippDelete(job->attrs);
-    job->attrs = NULL;
-    unlink(jobfile);
-    return;
+    goto error;
   }
 
   job->state_value = (ipp_jstate_t)job->state->values[0].integer;
@@ -1145,10 +1134,7 @@ cupsdLoadJob(cupsd_job_t *job)		/* I - J
       cupsdLogMessage(CUPSD_LOG_ERROR,
 		      "[Job %d] No job-printer-uri attribute in control file!",
 		      job->id);
-      ippDelete(job->attrs);
-      job->attrs = NULL;
-      unlink(jobfile);
-      return;
+      goto error;
     }
 
     if ((dest = cupsdValidateDest(attr->values[0].string.text, &(job->dtype),
@@ -1157,10 +1143,7 @@ cupsdLoadJob(cupsd_job_t *job)		/* I - J
       cupsdLogMessage(CUPSD_LOG_ERROR,
 		      "[Job %d] Unable to queue job for destination \"%s\"!",
 		      job->id, attr->values[0].string.text);
-      ippDelete(job->attrs);
-      job->attrs = NULL;
-      unlink(jobfile);
-      return;
+      goto error;
     }
 
     cupsdSetString(&job->dest, dest);
@@ -1170,10 +1153,7 @@ cupsdLoadJob(cupsd_job_t *job)		/* I - J
     cupsdLogMessage(CUPSD_LOG_ERROR,
 		    "[Job %d] Unable to queue job for destination \"%s\"!",
 		    job->id, job->dest);
-    ippDelete(job->attrs);
-    job->attrs = NULL;
-    unlink(jobfile);
-    return;
+    goto error;
   }
 
   job->sheets     = ippFindAttribute(job->attrs, "job-media-sheets-completed",
@@ -1188,10 +1168,7 @@ cupsdLoadJob(cupsd_job_t *job)		/* I - J
       cupsdLogMessage(CUPSD_LOG_ERROR,
 		      "[Job %d] Missing or bad job-priority attribute in "
 		      "control file!", job->id);
-      ippDelete(job->attrs);
-      job->attrs = NULL;
-      unlink(jobfile);
-      return;
+      goto error;
     }
 
     job->priority = attr->values[0].integer;
@@ -1205,10 +1182,7 @@ cupsdLoadJob(cupsd_job_t *job)		/* I - J
       cupsdLogMessage(CUPSD_LOG_ERROR,
 		      "[Job %d] Missing or bad job-originating-user-name "
 		      "attribute in control file!", job->id);
-      ippDelete(job->attrs);
-      job->attrs = NULL;
-      unlink(jobfile);
-      return;
+      goto error;
     }
 
     cupsdSetString(&job->username, attr->values[0].string.text);
@@ -1277,7 +1251,7 @@ cupsdLoadJob(cupsd_job_t *job)		/* I - J
           cupsdLogMessage(CUPSD_LOG_ERROR,
 	                  "[Job %d] Ran out of memory for job file types!",
 			  job->id);
-	  return;
+	  return (1);
 	}
 
         job->compressions = compressions;
@@ -1335,6 +1309,18 @@ cupsdLoadJob(cupsd_job_t *job)		/* I - J
   }
 
   job->access_time = time(NULL);
+  return (1);
+
+ /*
+  * If we get here then something bad happened...
+  */
+
+  error:
+
+  ippDelete(job->attrs);
+  job->attrs = NULL;
+  unlink(jobfile);
+  return (0);
 }
 
 
diff -up cups-1.4b2/scheduler/job.h.str3078 cups-1.4b2/scheduler/job.h
--- cups-1.4b2/scheduler/job.h.str3078	2008-08-28 21:38:13.000000000 +0100
+++ cups-1.4b2/scheduler/job.h	2009-01-28 17:00:04.000000000 +0000
@@ -3,7 +3,7 @@
  *
  *   Print job definitions for the Common UNIX Printing System (CUPS) scheduler.
  *
- *   Copyright 2007-2008 by Apple Inc.
+ *   Copyright 2007-2009 by Apple Inc.
  *   Copyright 1997-2007 by Easy Software Products, all rights reserved.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -117,7 +117,7 @@ extern int		cupsdGetPrinterJobCount(cons
 extern int		cupsdGetUserJobCount(const char *username);
 extern void		cupsdHoldJob(cupsd_job_t *job);
 extern void		cupsdLoadAllJobs(void);
-extern void		cupsdLoadJob(cupsd_job_t *job);
+extern int		cupsdLoadJob(cupsd_job_t *job);
 extern void		cupsdMoveJob(cupsd_job_t *job, cupsd_printer_t *p);
 extern void		cupsdReleaseJob(cupsd_job_t *job);
 extern void		cupsdRestartJob(cupsd_job_t *job);
diff -up cups-1.4b2/scheduler/quotas.c.str3078 cups-1.4b2/scheduler/quotas.c
--- cups-1.4b2/scheduler/quotas.c.str3078	2007-09-12 22:09:49.000000000 +0100
+++ cups-1.4b2/scheduler/quotas.c	2009-01-28 17:00:04.000000000 +0000
@@ -3,7 +3,7 @@
  *
  *   Quota routines for the Common UNIX Printing System (CUPS).
  *
- *   Copyright 2007 by Apple Inc.
+ *   Copyright 2007-2009 by Apple Inc.
  *   Copyright 1997-2007 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -155,10 +155,22 @@ cupsdUpdateQuota(
        job;
        job = (cupsd_job_t *)cupsArrayNext(Jobs))
   {
+   /*
+    * We only care about the current printer/class and user...
+    */
+
     if (strcasecmp(job->dest, p->name) != 0 ||
         strcasecmp(job->username, q->username) != 0)
       continue;
 
+   /*
+    * Make sure attributes are loaded; we always call cupsdLoadJob() to ensure
+    * the access_time member is updated so the job isn't unloaded right away...
+    */
+
+    if (!cupsdLoadJob(job))
+      continue;
+
     if ((attr = ippFindAttribute(job->attrs, "time-at-completion",
                                  IPP_TAG_INTEGER)) == NULL)
       if ((attr = ippFindAttribute(job->attrs, "time-at-processing",
@@ -166,11 +178,22 @@ cupsdUpdateQuota(
         attr = ippFindAttribute(job->attrs, "time-at-creation",
                                 IPP_TAG_INTEGER);
 
-    if (attr == NULL)
-      break;
+    if (!attr)
+    {
+     /*
+      * This should never happen since cupsdLoadJob() checks for
+      * time-at-creation, but if it does just ignore this job...
+      */
+
+      continue;
+    }
 
     if (attr->values[0].integer < curtime)
     {
+     /*
+      * This job is too old to count towards the quota, ignore it...
+      */
+
       if (JobAutoPurge)
         cupsdCancelJob(job, 1, IPP_JOB_CANCELED);
 

cups-lspp.patch:

Index: cups-lspp.patch
===================================================================
RCS file: /cvs/pkgs/rpms/cups/devel/cups-lspp.patch,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- cups-lspp.patch	16 Dec 2008 12:31:52 -0000	1.39
+++ cups-lspp.patch	28 Jan 2009 17:17:46 -0000	1.40
@@ -1,6 +1,6 @@
 diff -up cups-1.4b2/config.h.in.lspp cups-1.4b2/config.h.in
 --- cups-1.4b2/config.h.in.lspp	2008-09-08 23:03:01.000000000 +0100
-+++ cups-1.4b2/config.h.in	2008-12-16 11:50:59.000000000 +0000
++++ cups-1.4b2/config.h.in	2009-01-28 17:09:48.000000000 +0000
 @@ -619,6 +619,13 @@
  #undef HAVE_TCPD_H
  
@@ -16,8 +16,8 @@
  
  /*
 diff -up /dev/null cups-1.4b2/config-scripts/cups-lspp.m4
---- /dev/null	2008-12-16 09:52:24.540063413 +0000
-+++ cups-1.4b2/config-scripts/cups-lspp.m4	2008-12-16 11:50:59.000000000 +0000
+--- /dev/null	2009-01-28 08:58:18.489189414 +0000
++++ cups-1.4b2/config-scripts/cups-lspp.m4	2009-01-28 17:09:48.000000000 +0000
 @@ -0,0 +1,36 @@
 +dnl
 +dnl   LSPP code for the Common UNIX Printing System (CUPS).
@@ -57,7 +57,7 @@
 +fi
 diff -up cups-1.4b2/configure.in.lspp cups-1.4b2/configure.in
 --- cups-1.4b2/configure.in.lspp	2008-11-14 19:32:22.000000000 +0000
-+++ cups-1.4b2/configure.in	2008-12-16 11:50:59.000000000 +0000
++++ cups-1.4b2/configure.in	2009-01-28 17:09:48.000000000 +0000
 @@ -42,6 +42,8 @@ sinclude(config-scripts/cups-pap.m4)
  sinclude(config-scripts/cups-pdf.m4)
  sinclude(config-scripts/cups-scripting.m4)
@@ -68,8 +68,8 @@
  UNINSTALL_LANGUAGES=""
  LANGFILES=""
 diff -up cups-1.4b2/configure.lspp cups-1.4b2/configure
---- cups-1.4b2/configure.lspp	2008-12-16 11:50:59.000000000 +0000
-+++ cups-1.4b2/configure	2008-12-16 11:52:31.000000000 +0000
+--- cups-1.4b2/configure.lspp	2009-01-28 17:09:48.000000000 +0000
++++ cups-1.4b2/configure	2009-01-28 17:09:48.000000000 +0000
 @@ -829,6 +829,8 @@ PHP
  PHPCONFIG
  PHPDIR
@@ -570,7 +570,7 @@
      { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
 diff -up cups-1.4b2/cups/cups.h.lspp cups-1.4b2/cups/cups.h
 --- cups-1.4b2/cups/cups.h.lspp	2008-12-10 05:03:11.000000000 +0000
-+++ cups-1.4b2/cups/cups.h	2008-12-16 11:50:59.000000000 +0000
++++ cups-1.4b2/cups/cups.h	2009-01-28 17:09:48.000000000 +0000
 @@ -15,6 +15,9 @@
   *   This file is subject to the Apple OS-Developed Software exception.
   */
@@ -596,7 +596,7 @@
   */
 diff -up cups-1.4b2/data/Makefile.lspp cups-1.4b2/data/Makefile
 --- cups-1.4b2/data/Makefile.lspp	2008-11-12 19:30:57.000000000 +0000
-+++ cups-1.4b2/data/Makefile	2008-12-16 11:50:59.000000000 +0000
++++ cups-1.4b2/data/Makefile	2009-01-28 17:09:48.000000000 +0000
 @@ -25,7 +25,10 @@ BANNERS	=	\
  		secret \
  		standard \
@@ -610,8 +610,8 @@
  CHARMAPS =	\
  		euc-cn.txt \
 diff -up /dev/null cups-1.4b2/data/mls
---- /dev/null	2008-12-16 09:52:24.540063413 +0000
-+++ cups-1.4b2/data/mls	2008-12-16 11:50:59.000000000 +0000
+--- /dev/null	2009-01-28 08:58:18.489189414 +0000
++++ cups-1.4b2/data/mls	2009-01-28 17:09:48.000000000 +0000
 @@ -0,0 +1,261 @@
 +%!PS-Adobe-3.0
 +%%BoundingBox: 0 0 612 792
@@ -875,8 +875,8 @@
 +%
 +%%EOF
 diff -up /dev/null cups-1.4b2/data/selinux
---- /dev/null	2008-12-16 09:52:24.540063413 +0000
-+++ cups-1.4b2/data/selinux	2008-12-16 11:50:59.000000000 +0000
+--- /dev/null	2009-01-28 08:58:18.489189414 +0000
++++ cups-1.4b2/data/selinux	2009-01-28 17:09:48.000000000 +0000
 @@ -0,0 +1,261 @@
 +%!PS-Adobe-3.0
 +%%BoundingBox: 0 0 612 792
@@ -1140,8 +1140,8 @@
 +%
 +%%EOF
 diff -up /dev/null cups-1.4b2/data/te
---- /dev/null	2008-12-16 09:52:24.540063413 +0000
-+++ cups-1.4b2/data/te	2008-12-16 11:50:59.000000000 +0000
+--- /dev/null	2009-01-28 08:58:18.489189414 +0000
++++ cups-1.4b2/data/te	2009-01-28 17:09:48.000000000 +0000
 @@ -0,0 +1,261 @@
 +%!PS-Adobe-3.0
 +%%BoundingBox: 0 0 612 792
@@ -1406,7 +1406,7 @@
 +%%EOF
 diff -up cups-1.4b2/filter/common.c.lspp cups-1.4b2/filter/common.c
 --- cups-1.4b2/filter/common.c.lspp	2007-07-11 22:46:42.000000000 +0100
-+++ cups-1.4b2/filter/common.c	2008-12-16 11:50:59.000000000 +0000
++++ cups-1.4b2/filter/common.c	2009-01-28 17:09:48.000000000 +0000
 @@ -30,6 +30,12 @@
   * Include necessary headers...
   */
@@ -1576,8 +1576,8 @@
  
  /*
 diff -up cups-1.4b2/filter/pstops.c.lspp cups-1.4b2/filter/pstops.c
---- cups-1.4b2/filter/pstops.c.lspp	2008-12-16 11:50:59.000000000 +0000
-+++ cups-1.4b2/filter/pstops.c	2008-12-16 11:50:59.000000000 +0000
+--- cups-1.4b2/filter/pstops.c.lspp	2009-01-28 17:09:48.000000000 +0000
++++ cups-1.4b2/filter/pstops.c	2009-01-28 17:09:48.000000000 +0000
 @@ -3232,6 +3232,18 @@ write_label_prolog(pstops_doc_t *doc,	/*
  {
    const char	*classification;	/* CLASSIFICATION environment variable */
@@ -1734,8 +1734,8 @@
  
  /*
 diff -up cups-1.4b2/Makedefs.in.lspp cups-1.4b2/Makedefs.in
---- cups-1.4b2/Makedefs.in.lspp	2008-12-16 11:50:59.000000000 +0000
-+++ cups-1.4b2/Makedefs.in	2008-12-16 11:50:59.000000000 +0000
+--- cups-1.4b2/Makedefs.in.lspp	2009-01-28 17:09:48.000000000 +0000
++++ cups-1.4b2/Makedefs.in	2009-01-28 17:09:48.000000000 +0000
 @@ -146,7 +146,7 @@ LIBCUPSORDER	=	@LIBCUPSORDER@
  LIBCUPSIMAGEORDER =	@LIBCUPSIMAGEORDER@
  LINKCUPS	=	@LINKCUPS@ $(SSLLIBS)
@@ -1756,7 +1756,7 @@
  .c.o:
 diff -up cups-1.4b2/scheduler/client.c.lspp cups-1.4b2/scheduler/client.c
 --- cups-1.4b2/scheduler/client.c.lspp	2008-11-17 16:29:05.000000000 +0000
-+++ cups-1.4b2/scheduler/client.c	2008-12-16 11:50:59.000000000 +0000
++++ cups-1.4b2/scheduler/client.c	2009-01-28 17:09:48.000000000 +0000
 @@ -41,6 +41,7 @@
   *   pipe_command()          - Pipe the output of a command to the remote client.
   *   write_file()            - Send a file via HTTP.
@@ -1979,7 +1979,7 @@
   */
 diff -up cups-1.4b2/scheduler/client.h.lspp cups-1.4b2/scheduler/client.h
 --- cups-1.4b2/scheduler/client.h.lspp	2008-09-11 02:54:11.000000000 +0100
-+++ cups-1.4b2/scheduler/client.h	2008-12-16 11:50:59.000000000 +0000
++++ cups-1.4b2/scheduler/client.h	2009-01-28 17:09:48.000000000 +0000
 @@ -18,6 +18,13 @@
  #endif /* HAVE_AUTHORIZATION_H */
  
@@ -2016,8 +2016,8 @@
  
  /*
 diff -up cups-1.4b2/scheduler/conf.c.lspp cups-1.4b2/scheduler/conf.c
---- cups-1.4b2/scheduler/conf.c.lspp	2008-12-16 11:50:59.000000000 +0000
-+++ cups-1.4b2/scheduler/conf.c	2008-12-16 11:50:59.000000000 +0000
+--- cups-1.4b2/scheduler/conf.c.lspp	2009-01-28 17:09:48.000000000 +0000
++++ cups-1.4b2/scheduler/conf.c	2009-01-28 17:09:48.000000000 +0000
 @@ -27,6 +27,7 @@
   *   read_configuration()     - Read a configuration file.
   *   read_location()          - Read a <Location path> definition.
@@ -2128,8 +2128,8 @@
  /*
   * 'read_policy()' - Read a <Policy name> definition.
 diff -up cups-1.4b2/scheduler/conf.h.lspp cups-1.4b2/scheduler/conf.h
---- cups-1.4b2/scheduler/conf.h.lspp	2008-12-16 11:50:59.000000000 +0000
-+++ cups-1.4b2/scheduler/conf.h	2008-12-16 11:50:59.000000000 +0000
+--- cups-1.4b2/scheduler/conf.h.lspp	2009-01-28 17:09:48.000000000 +0000
++++ cups-1.4b2/scheduler/conf.h	2009-01-28 17:09:48.000000000 +0000
 @@ -233,6 +233,12 @@ VAR char		*ServerKey		VALUE(NULL);
  VAR int			SSLOptions		VALUE(CUPSD_SSL_NONE);
  					/* SSL/TLS options */
@@ -2154,8 +2154,8 @@
  /*
   * Prototypes...
 diff -up cups-1.4b2/scheduler/ipp.c.lspp cups-1.4b2/scheduler/ipp.c
---- cups-1.4b2/scheduler/ipp.c.lspp	2008-12-16 11:50:59.000000000 +0000
-+++ cups-1.4b2/scheduler/ipp.c	2008-12-16 11:50:59.000000000 +0000
+--- cups-1.4b2/scheduler/ipp.c.lspp	2009-01-28 17:09:48.000000000 +0000
++++ cups-1.4b2/scheduler/ipp.c	2009-01-28 17:09:48.000000000 +0000
 @@ -41,6 +41,7 @@
   *   cancel_all_jobs()           - Cancel all print jobs.
   *   cancel_job()                - Cancel a print job.
@@ -2748,8 +2748,8 @@
    * Check the username against the owner...
    */
 diff -up cups-1.4b2/scheduler/job.c.lspp cups-1.4b2/scheduler/job.c
---- cups-1.4b2/scheduler/job.c.lspp	2008-12-16 11:50:59.000000000 +0000
-+++ cups-1.4b2/scheduler/job.c	2008-12-16 11:50:59.000000000 +0000
+--- cups-1.4b2/scheduler/job.c.lspp	2009-01-28 17:09:48.000000000 +0000
++++ cups-1.4b2/scheduler/job.c	2009-01-28 17:11:11.000000000 +0000
 @@ -62,6 +62,9 @@
   *   update_job_attrs()         - Update the job-printer-* attributes.
   */
@@ -2775,8 +2775,8 @@
  
  /*
   * Local globals...
-@@ -1176,6 +1187,23 @@ cupsdLoadJob(cupsd_job_t *job)		/* I - J
-     return;
+@@ -1156,6 +1167,20 @@ cupsdLoadJob(cupsd_job_t *job)		/* I - J
+     goto error;
    }
  
 +#ifdef WITH_LSPP
@@ -2789,17 +2789,14 @@
 +    */
 +    cupsdLogMessage(CUPSD_LOG_ERROR, "LoadAllJobs: Missing or bad security-context attribute in control file \"%s\"!",
 +                    jobfile);
-+    ippDelete(job->attrs);
-+    job->attrs = NULL;
-+    unlink(jobfile);
-+    return;
++    goto error;
 +  }
 +#endif /* WITH_LSPP */
 +
    job->sheets     = ippFindAttribute(job->attrs, "job-media-sheets-completed",
                                       IPP_TAG_INTEGER);
    job->job_sheets = ippFindAttribute(job->attrs, "job-sheets", IPP_TAG_NAME);
-@@ -1537,6 +1565,13 @@ cupsdSaveJob(cupsd_job_t *job)		/* I - J
+@@ -1523,6 +1548,13 @@ cupsdSaveJob(cupsd_job_t *job)		/* I - J
  {
    char		filename[1024];		/* Job control filename */
    cups_file_t	*fp;			/* Job file */
@@ -2813,7 +2810,7 @@
  
  
    cupsdLogMessage(CUPSD_LOG_DEBUG2, "cupsdSaveJob(job=%p(%d)): job->attrs=%p",
-@@ -1555,6 +1590,76 @@ cupsdSaveJob(cupsd_job_t *job)		/* I - J
+@@ -1541,6 +1573,76 @@ cupsdSaveJob(cupsd_job_t *job)		/* I - J
    fchmod(cupsFileNumber(fp), 0600);
    fchown(cupsFileNumber(fp), RunUser, Group);
  
@@ -2890,7 +2887,7 @@
    job->attrs->state = IPP_IDLE;
  
    if (ippWriteIO(fp, (ipp_iocb_t)cupsFileWrite, 1, NULL,
-@@ -2545,6 +2650,21 @@ start_job(cupsd_job_t     *job,		/* I - 
+@@ -2531,6 +2633,21 @@ start_job(cupsd_job_t     *job,		/* I - 
  					/* RIP_MAX_CACHE env variable */
    static char		*options = NULL;/* Full list of options */
    static int		optlength = 0;	/* Length of option buffer */
@@ -2912,7 +2909,7 @@
  
  
    cupsdLogJob(job, CUPSD_LOG_DEBUG2, "start_job: file = %d/%d",
-@@ -2817,6 +2937,106 @@ start_job(cupsd_job_t     *job,		/* I - 
+@@ -2803,6 +2920,106 @@ start_job(cupsd_job_t     *job,		/* I - 
            fcntl(job->side_pipes[1], F_GETFL) | O_NONBLOCK);
    }
  
@@ -3019,7 +3016,7 @@
   /*
    * Determine if we are printing a banner page or not...
    */
-@@ -2954,6 +3174,18 @@ start_job(cupsd_job_t     *job,		/* I - 
+@@ -2940,6 +3157,18 @@ start_job(cupsd_job_t     *job,		/* I - 
  	  banner_page)
          continue;
  
@@ -3038,7 +3035,7 @@
       /*
        * Otherwise add them to the list...
        */
-@@ -3203,6 +3435,67 @@ start_job(cupsd_job_t     *job,		/* I - 
+@@ -3189,6 +3418,67 @@ start_job(cupsd_job_t     *job,		/* I - 
      }
    }
  
@@ -3107,8 +3104,8 @@
    {
      if ((attr = ippFindAttribute(job->attrs, "job-sheets",
 diff -up cups-1.4b2/scheduler/job.h.lspp cups-1.4b2/scheduler/job.h
---- cups-1.4b2/scheduler/job.h.lspp	2008-08-28 21:38:13.000000000 +0100
-+++ cups-1.4b2/scheduler/job.h	2008-12-16 11:50:59.000000000 +0000
+--- cups-1.4b2/scheduler/job.h.lspp	2009-01-28 17:09:48.000000000 +0000
++++ cups-1.4b2/scheduler/job.h	2009-01-28 17:09:48.000000000 +0000
 @@ -13,6 +13,13 @@
   *   file is missing or damaged, see the license at "http://www.cups.org/".
   */
@@ -3135,8 +3132,8 @@
  
  
 diff -up cups-1.4b2/scheduler/main.c.lspp cups-1.4b2/scheduler/main.c
---- cups-1.4b2/scheduler/main.c.lspp	2008-12-16 11:50:59.000000000 +0000
-+++ cups-1.4b2/scheduler/main.c	2008-12-16 11:50:59.000000000 +0000
+--- cups-1.4b2/scheduler/main.c.lspp	2009-01-28 17:09:48.000000000 +0000
++++ cups-1.4b2/scheduler/main.c	2009-01-28 17:09:48.000000000 +0000
 @@ -35,6 +35,8 @@
   *   usage()                   - Show scheduler usage.
   */
@@ -3205,8 +3202,8 @@
  }
  
 diff -up cups-1.4b2/scheduler/printers.c.lspp cups-1.4b2/scheduler/printers.c
---- cups-1.4b2/scheduler/printers.c.lspp	2008-12-16 11:50:59.000000000 +0000
-+++ cups-1.4b2/scheduler/printers.c	2008-12-16 11:50:59.000000000 +0000
+--- cups-1.4b2/scheduler/printers.c.lspp	2009-01-28 17:09:48.000000000 +0000
++++ cups-1.4b2/scheduler/printers.c	2009-01-28 17:09:48.000000000 +0000
 @@ -52,6 +52,8 @@
   *   write_xml_string()          - Write a string with XML escaping.
   */


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/devel/cups.spec,v
retrieving revision 1.455
retrieving revision 1.456
diff -u -r1.455 -r1.456
--- cups.spec	27 Jan 2009 14:57:00 -0000	1.455
+++ cups.spec	28 Jan 2009 17:17:46 -0000	1.456
@@ -7,7 +7,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.4
-Release: 0.%{pre}.3%{?dist}
+Release: 0.%{pre}.4%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 Source: ftp://ftp.easysw.com/pub/cups/test//cups-%{version}%{?pre}-source.tar.bz2
@@ -46,6 +46,8 @@
 Patch20: cups-logrotate.patch
 Patch21: cups-usb-paperout.patch
 Patch22: cups-build.patch
+Patch23: cups-str3077.patch
+Patch24: cups-str3078.patch
 Patch100: cups-lspp.patch
 Epoch: 1
 Url: http://www.cups.org/
@@ -188,6 +190,8 @@
 %patch20 -p1 -b .logrotate
 %patch21 -p1 -b .usb-paperout
 %patch22 -p1 -b .build
+%patch23 -p1 -b .str3077
+%patch24 -p1 -b .str3078
 
 %if %lspp
 %patch100 -p1 -b .lspp
@@ -454,6 +458,9 @@
 %{_libdir}/php/modules/*.so
 
 %changelog
+* Wed Jan 28 2009 Tim Waugh <twaugh at redhat.com> 1:1.4-0.b2.4
+- Fixed quotas (STR #3077, STR #3078).
+
 * Tue Jan 27 2009 Tim Waugh <twaugh at redhat.com> 1:1.4-0.b2.3
 - Fixed default BrowseLocalProtocols (bug #481505).
 



From twaugh at fedoraproject.org  Wed Jan 28 17:18:09 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Wed, 28 Jan 2009 17:18:09 +0000 (UTC)
Subject: rpms/cups/F-10 cups-str3077.patch, NONE, 1.1 cups-str3078.patch,
	NONE, 1.1 cups-lspp.patch, 1.37, 1.38 cups.spec, 1.451, 1.452
Message-ID: <20090128171809.DAEB27010D@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/cups/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2560

Modified Files:
	cups-lspp.patch cups.spec 
Added Files:
	cups-str3077.patch cups-str3078.patch 
Log Message:
* Wed Jan 28 2009 Tim Waugh <twaugh at redhat.com> 1:1.3.9-7
- Fixed quotas (STR #3077, STR #3078).


cups-str3077.patch:

--- NEW FILE cups-str3077.patch ---
diff -up cups-1.3.9/cups/encode.c.str3077 cups-1.3.9/cups/encode.c
--- cups-1.3.9/cups/encode.c.str3077	2008-07-11 23:48:49.000000000 +0100
+++ cups-1.3.9/cups/encode.c	2009-01-28 17:02:21.000000000 +0000
@@ -63,10 +63,10 @@ static const _ipp_option_t ipp_options[]
   { 0, "gamma-default",		IPP_TAG_INTEGER,	IPP_TAG_PRINTER },
   { 0, "hue",			IPP_TAG_INTEGER,	IPP_TAG_JOB },
   { 0, "hue-default",		IPP_TAG_INTEGER,	IPP_TAG_PRINTER },
-  { 0, "job-k-limit",		IPP_TAG_INTEGER,	IPP_TAG_JOB },
-  { 0, "job-page-limit",	IPP_TAG_INTEGER,	IPP_TAG_JOB },
+  { 0, "job-k-limit",		IPP_TAG_INTEGER,	IPP_TAG_PRINTER },
+  { 0, "job-page-limit",	IPP_TAG_INTEGER,	IPP_TAG_PRINTER },
   { 0, "job-priority",		IPP_TAG_INTEGER,	IPP_TAG_JOB },
-  { 0, "job-quota-period",	IPP_TAG_INTEGER,	IPP_TAG_JOB },
+  { 0, "job-quota-period",	IPP_TAG_INTEGER,	IPP_TAG_PRINTER },
   { 1, "job-sheets",		IPP_TAG_NAME,		IPP_TAG_JOB },
   { 1, "job-sheets-default",	IPP_TAG_NAME,		IPP_TAG_PRINTER },
   { 0, "job-uuid",		IPP_TAG_URI,		IPP_TAG_JOB },

cups-str3078.patch:

--- NEW FILE cups-str3078.patch ---
diff -up cups-1.3.9/scheduler/job.c.str3078 cups-1.3.9/scheduler/job.c
--- cups-1.3.9/scheduler/job.c.str3078	2009-01-28 17:02:21.000000000 +0000
+++ cups-1.3.9/scheduler/job.c	2009-01-28 17:03:05.000000000 +0000
@@ -3,7 +3,7 @@
  *
  *   Job management routines for the Common UNIX Printing System (CUPS).
  *
- *   Copyright 2007-2008 by Apple Inc.
+ *   Copyright 2007-2009 by Apple Inc.
  *   Copyright 1997-2007 by Easy Software Products, all rights reserved.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -1019,7 +1019,7 @@ cupsdLoadAllJobs(void)
  * 'cupsdLoadJob()' - Load a single job...
  */
 
-void
+int					/* O - 1 on success, 0 on failure */
 cupsdLoadJob(cupsd_job_t *job)		/* I - Job */
 {
   char			jobfile[1024];	/* Job filename */
@@ -1037,14 +1037,14 @@ cupsdLoadJob(cupsd_job_t *job)		/* I - J
     if (job->state_value > IPP_JOB_STOPPED)
       job->access_time = time(NULL);
 
-    return;
+    return (1);
   }
 
   if ((job->attrs = ippNew()) == NULL)
   {
     cupsdLogMessage(CUPSD_LOG_ERROR,
                     "[Job %d] Ran out of memory for job attributes!", job->id);
-    return;
+    return (0);
   }
 
  /*
@@ -1059,9 +1059,7 @@ cupsdLoadJob(cupsd_job_t *job)		/* I - J
     cupsdLogMessage(CUPSD_LOG_ERROR,
 	            "[Job %d] Unable to open job control file \"%s\" - %s!",
 	            job->id, jobfile, strerror(errno));
-    ippDelete(job->attrs);
-    job->attrs = NULL;
-    return;
+    goto error;
   }
 
   if (ippReadIO(fp, (ipp_iocb_t)cupsFileRead, 1, NULL, job->attrs) != IPP_DATA)
@@ -1070,10 +1068,7 @@ cupsdLoadJob(cupsd_job_t *job)		/* I - J
                     "[Job %d] Unable to read job control file \"%s\"!",
 	            job->id, jobfile);
     cupsFileClose(fp);
-    ippDelete(job->attrs);
-    job->attrs = NULL;
-    unlink(jobfile);
-    return;
+    goto error;
   }
 
   cupsFileClose(fp);
@@ -1089,10 +1084,7 @@ cupsdLoadJob(cupsd_job_t *job)		/* I - J
 	            "[Job %d] Missing or bad job-state attribute in "
 		    "control file!",
 	            job->id);
-    ippDelete(job->attrs);
-    job->attrs = NULL;
-    unlink(jobfile);
-    return;
+    goto error;
   }
 
   job->state_value = (ipp_jstate_t)job->state->values[0].integer;
@@ -1105,10 +1097,7 @@ cupsdLoadJob(cupsd_job_t *job)		/* I - J
       cupsdLogMessage(CUPSD_LOG_ERROR,
 	              "[Job %d] No job-printer-uri attribute in control file!",
 	              job->id);
-      ippDelete(job->attrs);
-      job->attrs = NULL;
-      unlink(jobfile);
-      return;
+      goto error;
     }
 
     if ((dest = cupsdValidateDest(attr->values[0].string.text, &(job->dtype),
@@ -1117,10 +1106,7 @@ cupsdLoadJob(cupsd_job_t *job)		/* I - J
       cupsdLogMessage(CUPSD_LOG_ERROR,
 	              "[Job %d] Unable to queue job for destination \"%s\"!",
 	              job->id, attr->values[0].string.text);
-      ippDelete(job->attrs);
-      job->attrs = NULL;
-      unlink(jobfile);
-      return;
+      goto error;
     }
 
     cupsdSetString(&job->dest, dest);
@@ -1130,10 +1116,7 @@ cupsdLoadJob(cupsd_job_t *job)		/* I - J
     cupsdLogMessage(CUPSD_LOG_ERROR,
 		    "[Job %d] Unable to queue job for destination \"%s\"!",
 		    job->id, job->dest);
-    ippDelete(job->attrs);
-    job->attrs = NULL;
-    unlink(jobfile);
-    return;
+    goto error;
   }
 
   job->sheets     = ippFindAttribute(job->attrs, "job-media-sheets-completed",
@@ -1148,10 +1131,7 @@ cupsdLoadJob(cupsd_job_t *job)		/* I - J
       cupsdLogMessage(CUPSD_LOG_ERROR,
 	              "[Job %d] Missing or bad job-priority attribute in "
 		      "control file!", job->id);
-      ippDelete(job->attrs);
-      job->attrs = NULL;
-      unlink(jobfile);
-      return;
+      goto error;
     }
 
     job->priority = attr->values[0].integer;
@@ -1165,10 +1145,7 @@ cupsdLoadJob(cupsd_job_t *job)		/* I - J
       cupsdLogMessage(CUPSD_LOG_ERROR,
 	              "[Job %d] Missing or bad job-originating-user-name "
 		      "attribute in control file!", job->id);
-      ippDelete(job->attrs);
-      job->attrs = NULL;
-      unlink(jobfile);
-      return;
+      goto error;
     }
 
     cupsdSetString(&job->username, attr->values[0].string.text);
@@ -1237,7 +1214,7 @@ cupsdLoadJob(cupsd_job_t *job)		/* I - J
           cupsdLogMessage(CUPSD_LOG_ERROR,
 	                  "[Job %d] Ran out of memory for job file types!",
 			  job->id);
-	  return;
+	  return (1);
 	}
 
         job->compressions = compressions;
@@ -1293,7 +1270,20 @@ cupsdLoadJob(cupsd_job_t *job)		/* I - J
       cupsFileClose(fp);
     }
   }
+
   job->access_time = time(NULL);
+  return (1);
+
+ /*
+  * If we get here then something bad happened...
+  */
+
+  error:
+
+  ippDelete(job->attrs);
+  job->attrs = NULL;
+  unlink(jobfile);
+  return (0);
 }
 
 
diff -up cups-1.3.9/scheduler/job.h.str3078 cups-1.3.9/scheduler/job.h
--- cups-1.3.9/scheduler/job.h.str3078	2008-01-16 22:20:33.000000000 +0000
+++ cups-1.3.9/scheduler/job.h	2009-01-28 17:03:05.000000000 +0000
@@ -3,7 +3,7 @@
  *
  *   Print job definitions for the Common UNIX Printing System (CUPS) scheduler.
  *
- *   Copyright 2007-2008 by Apple Inc.
+ *   Copyright 2007-2009 by Apple Inc.
  *   Copyright 1997-2007 by Easy Software Products, all rights reserved.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -112,7 +112,7 @@ extern int		cupsdGetPrinterJobCount(cons
 extern int		cupsdGetUserJobCount(const char *username);
 extern void		cupsdHoldJob(cupsd_job_t *job);
 extern void		cupsdLoadAllJobs(void);
-extern void		cupsdLoadJob(cupsd_job_t *job);
+extern int		cupsdLoadJob(cupsd_job_t *job);
 extern void		cupsdMoveJob(cupsd_job_t *job, cupsd_printer_t *p);
 extern void		cupsdReleaseJob(cupsd_job_t *job);
 extern void		cupsdRestartJob(cupsd_job_t *job);
diff -up cups-1.3.9/scheduler/quotas.c.str3078 cups-1.3.9/scheduler/quotas.c
--- cups-1.3.9/scheduler/quotas.c.str3078	2007-09-12 22:33:23.000000000 +0100
+++ cups-1.3.9/scheduler/quotas.c	2009-01-28 17:03:05.000000000 +0000
@@ -3,7 +3,7 @@
  *
  *   Quota routines for the Common UNIX Printing System (CUPS).
  *
- *   Copyright 2007 by Apple Inc.
+ *   Copyright 2007-2009 by Apple Inc.
  *   Copyright 1997-2007 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -155,10 +155,22 @@ cupsdUpdateQuota(
        job;
        job = (cupsd_job_t *)cupsArrayNext(Jobs))
   {
+   /*
+    * We only care about the current printer/class and user...
+    */
+
     if (strcasecmp(job->dest, p->name) != 0 ||
         strcasecmp(job->username, q->username) != 0)
       continue;
 
+   /*
+    * Make sure attributes are loaded; we always call cupsdLoadJob() to ensure
+    * the access_time member is updated so the job isn't unloaded right away...
+    */
+
+    if (!cupsdLoadJob(job))
+      continue;
+
     if ((attr = ippFindAttribute(job->attrs, "time-at-completion",
                                  IPP_TAG_INTEGER)) == NULL)
       if ((attr = ippFindAttribute(job->attrs, "time-at-processing",
@@ -166,11 +178,22 @@ cupsdUpdateQuota(
         attr = ippFindAttribute(job->attrs, "time-at-creation",
                                 IPP_TAG_INTEGER);
 
-    if (attr == NULL)
-      break;
+    if (!attr)
+    {
+     /*
+      * This should never happen since cupsdLoadJob() checks for
+      * time-at-creation, but if it does just ignore this job...
+      */
+
+      continue;
+    }
 
     if (attr->values[0].integer < curtime)
     {
+     /*
+      * This job is too old to count towards the quota, ignore it...
+      */
+
       if (JobAutoPurge)
         cupsdCancelJob(job, 1, IPP_JOB_CANCELED);
 

cups-lspp.patch:

Index: cups-lspp.patch
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-10/cups-lspp.patch,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- cups-lspp.patch	30 Oct 2008 14:31:23 -0000	1.37
+++ cups-lspp.patch	28 Jan 2009 17:18:09 -0000	1.38
@@ -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-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 @@
+diff -up cups-1.3.9/config.h.in.lspp cups-1.3.9/config.h.in
+--- cups-1.3.9/config.h.in.lspp	2009-01-28 17:12:34.000000000 +0000
++++ cups-1.3.9/config.h.in	2009-01-28 17:12:34.000000000 +0000
+@@ -551,6 +551,13 @@
  #undef HAVE_REMOVEFILE
  
  
@@ -15,9 +15,9 @@
  #endif /* !_CUPS_CONFIG_H_ */
  
  /*
-diff -up /dev/null cups-1.3.8/config-scripts/cups-lspp.m4
---- /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
+diff -up /dev/null cups-1.3.9/config-scripts/cups-lspp.m4
+--- /dev/null	2009-01-28 08:58:18.489189414 +0000
++++ cups-1.3.9/config-scripts/cups-lspp.m4	2009-01-28 17:12:34.000000000 +0000
 @@ -0,0 +1,36 @@
 +dnl
 +dnl   LSPP code for the Common UNIX Printing System (CUPS).
@@ -55,9 +55,9 @@
 +            ;;
 +    esac
 +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-09-10 16:18:26.000000000 +0100
+diff -up cups-1.3.9/configure.in.lspp cups-1.3.9/configure.in
+--- cups-1.3.9/configure.in.lspp	2007-07-25 00:47:12.000000000 +0100
++++ cups-1.3.9/configure.in	2009-01-28 17:12:34.000000000 +0000
 @@ -42,6 +42,8 @@ sinclude(config-scripts/cups-pap.m4)
  sinclude(config-scripts/cups-pdf.m4)
  sinclude(config-scripts/cups-scripting.m4)
@@ -67,9 +67,9 @@
  INSTALL_LANGUAGES=""
  UNINSTALL_LANGUAGES=""
  LANGFILES=""
-diff -up cups-1.3.8/configure.lspp cups-1.3.8/configure
---- 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
+diff -up cups-1.3.9/configure.lspp cups-1.3.9/configure
+--- cups-1.3.9/configure.lspp	2009-01-28 17:12:34.000000000 +0000
++++ cups-1.3.9/configure	2009-01-28 17:12:34.000000000 +0000
 @@ -807,6 +807,8 @@ PHP
  PHPCONFIG
  PHPDIR
@@ -87,7 +87,7 @@
  
  Optional Packages:
    --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
-@@ -18555,6 +18558,412 @@ fi
+@@ -18862,6 +18865,412 @@ fi
  
  
  
@@ -500,7 +500,7 @@
  INSTALL_LANGUAGES=""
  UNINSTALL_LANGUAGES=""
  LANGFILES=""
-@@ -19449,7 +19858,7 @@ PHP!$PHP$ac_delim
+@@ -19756,7 +20165,7 @@ PHP!$PHP$ac_delim
  PHPCONFIG!$PHPCONFIG$ac_delim
  PHPDIR!$PHPDIR$ac_delim
  PYTHON!$PYTHON$ac_delim
@@ -509,7 +509,7 @@
  _ACEOF
  
    if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
-@@ -19491,12 +19900,14 @@ _ACEOF
+@@ -19798,12 +20207,14 @@ _ACEOF
  ac_delim='%!_!# '
  for ac_last_try in false false false false false :; do
    cat >conf$$subs.sed <<_ACEOF
@@ -525,9 +525,9 @@
      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-09-10 16:18:26.000000000 +0100
-+++ cups-1.3.8/cups/cups.h	2008-09-10 16:18:26.000000000 +0100
+diff -up cups-1.3.9/cups/cups.h.lspp cups-1.3.9/cups/cups.h
+--- cups-1.3.9/cups/cups.h.lspp	2009-01-28 17:12:34.000000000 +0000
++++ cups-1.3.9/cups/cups.h	2009-01-28 17:12:34.000000000 +0000
 @@ -15,6 +15,9 @@
   *   This file is subject to the Apple OS-Developed Software exception.
   */
@@ -551,9 +551,9 @@
  /*
   * Types and structures...
   */
-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-09-10 16:18:26.000000000 +0100
+diff -up cups-1.3.9/data/Makefile.lspp cups-1.3.9/data/Makefile
+--- cups-1.3.9/data/Makefile.lspp	2007-10-10 23:00:43.000000000 +0100
++++ cups-1.3.9/data/Makefile	2009-01-28 17:12:34.000000000 +0000
 @@ -25,7 +25,10 @@ BANNERS	=	\
  		secret \
  		standard \
@@ -566,9 +566,9 @@
  
  CHARMAPS =	\
  		euc-cn.txt \
-diff -up /dev/null cups-1.3.8/data/mls
---- /dev/null	2008-09-10 08:56:32.430063181 +0100
-+++ cups-1.3.8/data/mls	2008-09-10 16:18:26.000000000 +0100
+diff -up /dev/null cups-1.3.9/data/mls
+--- /dev/null	2009-01-28 08:58:18.489189414 +0000
++++ cups-1.3.9/data/mls	2009-01-28 17:12:34.000000000 +0000
 @@ -0,0 +1,261 @@
 +%!PS-Adobe-3.0
 +%%BoundingBox: 0 0 612 792
@@ -831,9 +831,9 @@
 +% End of "$Id$".
 +%
 +%%EOF
-diff -up /dev/null cups-1.3.8/data/selinux
---- /dev/null	2008-09-10 08:56:32.430063181 +0100
-+++ cups-1.3.8/data/selinux	2008-09-10 16:18:26.000000000 +0100
+diff -up /dev/null cups-1.3.9/data/selinux
+--- /dev/null	2009-01-28 08:58:18.489189414 +0000
++++ cups-1.3.9/data/selinux	2009-01-28 17:12:34.000000000 +0000
 @@ -0,0 +1,261 @@
 +%!PS-Adobe-3.0
 +%%BoundingBox: 0 0 612 792
@@ -1096,9 +1096,9 @@
 +% End of "$Id$".
 +%
 +%%EOF
-diff -up /dev/null cups-1.3.8/data/te
---- /dev/null	2008-09-10 08:56:32.430063181 +0100
-+++ cups-1.3.8/data/te	2008-09-10 16:18:26.000000000 +0100
+diff -up /dev/null cups-1.3.9/data/te
+--- /dev/null	2009-01-28 08:58:18.489189414 +0000
++++ cups-1.3.9/data/te	2009-01-28 17:12:34.000000000 +0000
 @@ -0,0 +1,261 @@
 +%!PS-Adobe-3.0
 +%%BoundingBox: 0 0 612 792
@@ -1361,9 +1361,9 @@
 +% End of "$Id$".
 +%
 +%%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-09-10 16:18:26.000000000 +0100
+diff -up cups-1.3.9/filter/common.c.lspp cups-1.3.9/filter/common.c
+--- cups-1.3.9/filter/common.c.lspp	2008-07-11 23:48:49.000000000 +0100
++++ cups-1.3.9/filter/common.c	2009-01-28 17:12:34.000000000 +0000
 @@ -30,6 +30,12 @@
   * Include necessary headers...
   */
@@ -1532,9 +1532,10 @@
  
  
  /*
---- cups-1.3.9/filter/pstops.c.lspp	2008-10-30 13:29:33.000000000 +0000
-+++ cups-1.3.9/filter/pstops.c	2008-10-30 13:31:06.000000000 +0000
-@@ -3233,6 +3233,18 @@ write_label_prolog(pstops_doc_t *doc,	/*
+diff -up cups-1.3.9/filter/pstops.c.lspp cups-1.3.9/filter/pstops.c
+--- cups-1.3.9/filter/pstops.c.lspp	2009-01-28 17:12:34.000000000 +0000
++++ cups-1.3.9/filter/pstops.c	2009-01-28 17:12:34.000000000 +0000
+@@ -3230,6 +3230,18 @@ write_label_prolog(pstops_doc_t *doc,	/*
  {
    const char	*classification;	/* CLASSIFICATION environment variable */
    const char	*ptr;			/* Temporary string pointer */
@@ -1553,7 +1554,7 @@
  
  
   /*
-@@ -3255,6 +3267,124 @@ write_label_prolog(pstops_doc_t *doc,	/*
+@@ -3252,6 +3264,124 @@ write_label_prolog(pstops_doc_t *doc,	/*
      return;
    }
  
@@ -1678,7 +1679,7 @@
   /*
    * Set the classification + page label string...
    */
-@@ -3333,7 +3463,10 @@ write_label_prolog(pstops_doc_t *doc,	/*
+@@ -3330,7 +3460,10 @@ write_label_prolog(pstops_doc_t *doc,	/*
    doc_printf(doc, "  %.0f moveto ESPpl show\n", top - 14.0);
    doc_puts(doc, "pop\n");
    doc_puts(doc, "}bind put\n");
@@ -1689,9 +1690,9 @@
  
  
  /*
-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-09-10 16:18:26.000000000 +0100
+diff -up cups-1.3.9/Makedefs.in.lspp cups-1.3.9/Makedefs.in
+--- cups-1.3.9/Makedefs.in.lspp	2008-01-22 22:37:21.000000000 +0000
++++ cups-1.3.9/Makedefs.in	2009-01-28 17:12:34.000000000 +0000
 @@ -134,7 +134,7 @@ LIBCUPSORDER	=	@LIBCUPSORDER@
  LIBCUPSIMAGEORDER =	@LIBCUPSIMAGEORDER@
  LINKCUPS	=	@LINKCUPS@ $(SSLLIBS)
@@ -1701,9 +1702,9 @@
  OPTIM		=	@OPTIM@
  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-09-10 16:18:26.000000000 +0100
-+++ cups-1.3.8/scheduler/client.c	2008-09-10 16:18:26.000000000 +0100
+diff -up cups-1.3.9/scheduler/client.c.lspp cups-1.3.9/scheduler/client.c
+--- cups-1.3.9/scheduler/client.c.lspp	2009-01-28 17:12:34.000000000 +0000
++++ cups-1.3.9/scheduler/client.c	2009-01-28 17:12:34.000000000 +0000
 @@ -40,12 +40,14 @@
   *   pipe_command()          - Pipe the output of a command to the remote client.
   *   write_file()            - Send a file via HTTP.
@@ -1790,7 +1791,7 @@
  #ifdef AF_INET6
    if (con->http.hostaddr->addr.sa_family == AF_INET6)
      cupsdLogMessage(CUPSD_LOG_DEBUG, "cupsdAcceptClient: %d from %s:%d (IPv6)",
-@@ -733,6 +792,13 @@ cupsdReadClient(cupsd_client_t *con)	/* 
+@@ -741,6 +800,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 */
@@ -1804,7 +1805,7 @@
  
  
    status = HTTP_CONTINUE;
-@@ -2017,6 +2083,67 @@ cupsdReadClient(cupsd_client_t *con)	/* 
+@@ -2034,6 +2100,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);
@@ -1872,7 +1873,7 @@
  	  }
  
  	  if (con->http.state != HTTP_POST_SEND)
-@@ -4288,6 +4415,50 @@ make_certificate(cupsd_client_t *con)	/*
+@@ -4305,6 +4432,50 @@ make_certificate(cupsd_client_t *con)	/*
  #endif /* HAVE_SSL */
  
  
@@ -1923,9 +1924,9 @@
  /*
   * 'pipe_command()' - Pipe the output of a command to the remote client.
   */
-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-09-10 16:18:26.000000000 +0100
+diff -up cups-1.3.9/scheduler/client.h.lspp cups-1.3.9/scheduler/client.h
+--- cups-1.3.9/scheduler/client.h.lspp	2007-10-22 19:52:13.000000000 +0100
++++ cups-1.3.9/scheduler/client.h	2009-01-28 17:12:34.000000000 +0000
 @@ -17,6 +17,13 @@
  #  include <Security/Authorization.h>
  #endif /* HAVE_AUTHORIZATION_H */
@@ -1961,9 +1962,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-09-10 16:18:26.000000000 +0100
-+++ cups-1.3.8/scheduler/conf.c	2008-09-10 16:18:26.000000000 +0100
+diff -up cups-1.3.9/scheduler/conf.c.lspp cups-1.3.9/scheduler/conf.c
+--- cups-1.3.9/scheduler/conf.c.lspp	2009-01-28 17:12:34.000000000 +0000
++++ cups-1.3.9/scheduler/conf.c	2009-01-28 17:12:34.000000000 +0000
 @@ -27,6 +27,7 @@
   *   read_configuration()     - Read a configuration file.
   *   read_location()          - Read a <Location path> definition.
@@ -1993,7 +1994,7 @@
  #endif /* HAVE_SSL */
    { "ServerName",		&ServerName,		CUPSD_VARTYPE_STRING },
    { "ServerRoot",		&ServerRoot,		CUPSD_VARTYPE_PATHNAME },
-@@ -352,6 +360,9 @@ cupsdReadConfiguration(void)
+@@ -370,6 +378,9 @@ cupsdReadConfiguration(void)
  		*old_requestroot;	/* Old RequestRoot */
    const char	*tmpdir;		/* TMPDIR environment variable */
    struct stat	tmpinfo;		/* Temporary directory info */
@@ -2003,7 +2004,7 @@
  
  
   /*
-@@ -614,6 +625,25 @@ cupsdReadConfiguration(void)
+@@ -632,6 +643,25 @@ cupsdReadConfiguration(void)
  
    RunUser = getuid();
  
@@ -2029,7 +2030,7 @@
   /*
    * See if the ServerName is an IP address...
    */
-@@ -896,11 +926,23 @@ cupsdReadConfiguration(void)
+@@ -911,11 +941,23 @@ cupsdReadConfiguration(void)
    if (MaxActiveJobs > (MaxFDs / 3))
      MaxActiveJobs = MaxFDs / 3;
  
@@ -2054,7 +2055,7 @@
  
   /*
    * Update the MaxClientsPerHost value, as needed...
-@@ -3299,6 +3341,18 @@ read_location(cups_file_t *fp,		/* I - C
+@@ -3314,6 +3356,18 @@ read_location(cups_file_t *fp,		/* I - C
    return ((FatalErrors & CUPSD_FATAL_CONFIG) ? 0 : linenum);
  }
  
@@ -2073,9 +2074,9 @@
  
  /*
   * '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-09-10 16:18:26.000000000 +0100
-+++ cups-1.3.8/scheduler/conf.h	2008-09-10 16:18:26.000000000 +0100
+diff -up cups-1.3.9/scheduler/conf.h.lspp cups-1.3.9/scheduler/conf.h
+--- cups-1.3.9/scheduler/conf.h.lspp	2009-01-28 17:12:34.000000000 +0000
++++ cups-1.3.9/scheduler/conf.h	2009-01-28 17:12:34.000000000 +0000
 @@ -208,6 +208,12 @@ VAR char		*ServerKey		VALUE(NULL);
  					/* Server key file */
  #  endif /* HAVE_LIBSSL || HAVE_GNUTLS */
@@ -2099,9 +2100,9 @@
  
  /*
   * 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-09-10 16:18:26.000000000 +0100
-+++ cups-1.3.8/scheduler/ipp.c	2008-09-10 16:18:26.000000000 +0100
+diff -up cups-1.3.9/scheduler/ipp.c.lspp cups-1.3.9/scheduler/ipp.c
+--- cups-1.3.9/scheduler/ipp.c.lspp	2009-01-28 17:12:34.000000000 +0000
++++ cups-1.3.9/scheduler/ipp.c	2009-01-28 17:12:34.000000000 +0000
 @@ -36,6 +36,7 @@
   *   cancel_all_jobs()           - Cancel all print jobs.
   *   cancel_job()                - Cancel a print job.
@@ -2418,7 +2419,7 @@
     /*
      * See if we need to add the starting sheet...
      */
-@@ -3521,6 +3750,103 @@ check_rss_recipient(
+@@ -3522,6 +3751,103 @@ check_rss_recipient(
  }
  
  
@@ -2522,7 +2523,7 @@
  /*
   * 'check_quotas()' - Check quotas for a printer and user.
   */
-@@ -4042,6 +4368,15 @@ copy_banner(cupsd_client_t *con,	/* I - 
+@@ -4043,6 +4369,15 @@ copy_banner(cupsd_client_t *con,	/* I - 
    char		attrname[255],		/* Name of attribute */
  		*s;			/* Pointer into name */
    ipp_attribute_t *attr;		/* Attribute */
@@ -2538,7 +2539,7 @@
  
  
    cupsdLogMessage(CUPSD_LOG_DEBUG2,
-@@ -4077,6 +4412,82 @@ copy_banner(cupsd_client_t *con,	/* I - 
+@@ -4078,6 +4413,82 @@ copy_banner(cupsd_client_t *con,	/* I - 
  
    fchmod(cupsFileNumber(out), 0640);
    fchown(cupsFileNumber(out), RunUser, Group);
@@ -2621,7 +2622,7 @@
  
   /*
    * Try the localized banner file under the subdirectory...
-@@ -4171,6 +4582,24 @@ copy_banner(cupsd_client_t *con,	/* I - 
+@@ -4172,6 +4583,24 @@ copy_banner(cupsd_client_t *con,	/* I - 
        else
          s = attrname;
  
@@ -2646,7 +2647,7 @@
        if (!strcmp(s, "printer-name"))
        {
          cupsFilePuts(out, job->dest);
-@@ -5938,6 +6367,22 @@ get_job_attrs(cupsd_client_t  *con,	/* I
+@@ -5944,6 +6373,22 @@ get_job_attrs(cupsd_client_t  *con,	/* I
      return;
    }
  
@@ -2669,7 +2670,7 @@
   /*
    * Copy attributes...
    */
-@@ -6143,6 +6588,11 @@ get_jobs(cupsd_client_t  *con,		/* I - C
+@@ -6149,6 +6594,11 @@ get_jobs(cupsd_client_t  *con,		/* I - C
      if (count > 0)
        ippAddSeparator(con->response);
  
@@ -2681,7 +2682,7 @@
      count ++;
  
      cupsdLogMessage(CUPSD_LOG_DEBUG2, "get_jobs: count = %d", count);
-@@ -10255,6 +10705,11 @@ validate_user(cupsd_job_t    *job,	/* I 
+@@ -10286,6 +10736,11 @@ validate_user(cupsd_job_t    *job,	/* I 
  
    strlcpy(username, get_username(con), userlen);
  
@@ -2693,9 +2694,9 @@
   /*
    * 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-09-10 16:18:26.000000000 +0100
-+++ cups-1.3.8/scheduler/job.c	2008-09-10 16:18:26.000000000 +0100
+diff -up cups-1.3.9/scheduler/job.c.lspp cups-1.3.9/scheduler/job.c
+--- cups-1.3.9/scheduler/job.c.lspp	2009-01-28 17:12:34.000000000 +0000
++++ cups-1.3.9/scheduler/job.c	2009-01-28 17:12:47.000000000 +0000
 @@ -60,6 +60,9 @@
   *   update_job_attrs()         - Update the job-printer-* attributes.
   */
@@ -2721,8 +2722,8 @@
  
  /*
   * Local globals...
-@@ -1136,6 +1147,23 @@ cupsdLoadJob(cupsd_job_t *job)		/* I - J
-     return;
+@@ -1119,6 +1130,20 @@ cupsdLoadJob(cupsd_job_t *job)		/* I - J
+     goto error;
    }
  
 +#ifdef WITH_LSPP
@@ -2735,17 +2736,14 @@
 +    */
 +    cupsdLogMessage(CUPSD_LOG_ERROR, "LoadAllJobs: Missing or bad security-context attribute in control file \"%s\"!",
 +                    jobfile);
-+    ippDelete(job->attrs);
-+    job->attrs = NULL;
-+    unlink(jobfile);
-+    return;
++    goto error;
 +  }
 +#endif /* WITH_LSPP */
 +
    job->sheets     = ippFindAttribute(job->attrs, "job-media-sheets-completed",
                                       IPP_TAG_INTEGER);
    job->job_sheets = ippFindAttribute(job->attrs, "job-sheets", IPP_TAG_NAME);
-@@ -1493,6 +1521,13 @@ cupsdSaveJob(cupsd_job_t *job)		/* I - J
+@@ -1483,6 +1508,13 @@ cupsdSaveJob(cupsd_job_t *job)		/* I - J
  {
    char		filename[1024];		/* Job control filename */
    cups_file_t	*fp;			/* Job file */
@@ -2759,7 +2757,7 @@
  
  
    cupsdLogMessage(CUPSD_LOG_DEBUG2, "cupsdSaveJob(job=%p(%d)): job->attrs=%p",
-@@ -1511,6 +1546,76 @@ cupsdSaveJob(cupsd_job_t *job)		/* I - J
+@@ -1501,6 +1533,76 @@ cupsdSaveJob(cupsd_job_t *job)		/* I - J
    fchmod(cupsFileNumber(fp), 0600);
    fchown(cupsFileNumber(fp), RunUser, Group);
  
@@ -2836,7 +2834,7 @@
    job->attrs->state = IPP_IDLE;
  
    if (ippWriteIO(fp, (ipp_iocb_t)cupsFileWrite, 1, NULL,
-@@ -2485,6 +2590,21 @@ start_job(cupsd_job_t     *job,		/* I - 
+@@ -2475,6 +2577,21 @@ start_job(cupsd_job_t     *job,		/* I - 
  					/* RIP_MAX_CACHE env variable */
    static char		*options = NULL;/* Full list of options */
    static int		optlength = 0;	/* Length of option buffer */
@@ -2858,7 +2856,7 @@
  
  
    cupsdLogMessage(CUPSD_LOG_DEBUG2, "[Job %d] start_job: file = %d/%d",
-@@ -2756,6 +2876,106 @@ start_job(cupsd_job_t     *job,		/* I - 
+@@ -2746,6 +2863,106 @@ start_job(cupsd_job_t     *job,		/* I - 
            fcntl(job->side_pipes[1], F_GETFL) | O_NONBLOCK);
    }
  
@@ -2965,7 +2963,7 @@
   /*
    * Determine if we are printing a banner page or not...
    */
-@@ -2904,6 +3124,18 @@ start_job(cupsd_job_t     *job,		/* I - 
+@@ -2894,6 +3111,18 @@ start_job(cupsd_job_t     *job,		/* I - 
  	  banner_page)
          continue;
  
@@ -2984,7 +2982,7 @@
       /*
        * Otherwise add them to the list...
        */
-@@ -3146,6 +3378,67 @@ start_job(cupsd_job_t     *job,		/* I - 
+@@ -3136,6 +3365,67 @@ start_job(cupsd_job_t     *job,		/* I - 
      }
    }
  
@@ -3052,9 +3050,9 @@
    if (Classification && !banner_page)
    {
      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-09-10 16:18:26.000000000 +0100
+diff -up cups-1.3.9/scheduler/job.h.lspp cups-1.3.9/scheduler/job.h
+--- cups-1.3.9/scheduler/job.h.lspp	2009-01-28 17:12:34.000000000 +0000
++++ cups-1.3.9/scheduler/job.h	2009-01-28 17:12:34.000000000 +0000
 @@ -13,6 +13,13 @@
   *   file is missing or damaged, see the license at "http://www.cups.org/".
   */
@@ -3080,9 +3078,9 @@
  } cupsd_job_t;
  
  
-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-09-10 16:18:26.000000000 +0100
-+++ cups-1.3.8/scheduler/main.c	2008-09-10 16:18:26.000000000 +0100
+diff -up cups-1.3.9/scheduler/main.c.lspp cups-1.3.9/scheduler/main.c
+--- cups-1.3.9/scheduler/main.c.lspp	2009-01-28 17:12:34.000000000 +0000
++++ cups-1.3.9/scheduler/main.c	2009-01-28 17:12:34.000000000 +0000
 @@ -35,6 +35,8 @@
   *   usage()                   - Show scheduler usage.
   */
@@ -3138,7 +3136,7 @@
   /*
    * Set the timezone info...
    */
-@@ -1160,6 +1187,11 @@ main(int  argc,				/* I - Number of comm
+@@ -1192,6 +1219,11 @@ main(int  argc,				/* I - Number of comm
  
    cupsdStopSelect();
  
@@ -3150,9 +3148,9 @@
    return (!stop_scheduler);
  }
  
-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-09-10 16:18:26.000000000 +0100
-+++ cups-1.3.8/scheduler/printers.c	2008-09-10 16:18:26.000000000 +0100
+diff -up cups-1.3.9/scheduler/printers.c.lspp cups-1.3.9/scheduler/printers.c
+--- cups-1.3.9/scheduler/printers.c.lspp	2009-01-28 17:12:34.000000000 +0000
++++ cups-1.3.9/scheduler/printers.c	2009-01-28 17:12:34.000000000 +0000
 @@ -51,6 +51,8 @@
   *                                 printing desktop tools.
   */
@@ -3187,7 +3185,7 @@
  
  
    DEBUG_printf(("cupsdSetPrinterAttrs: entering name = %s, type = %x\n", p->name,
-@@ -1989,6 +2002,44 @@ cupsdSetPrinterAttrs(cupsd_printer_t *p)
+@@ -1995,6 +2008,44 @@ cupsdSetPrinterAttrs(cupsd_printer_t *p)
        attr->values[1].string.text = _cupsStrAlloc(Classification ?
  	                                   Classification : p->job_sheets[1]);
      }


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-10/cups.spec,v
retrieving revision 1.451
retrieving revision 1.452
diff -u -r1.451 -r1.452
--- cups.spec	9 Dec 2008 12:14:31 -0000	1.451
+++ cups.spec	28 Jan 2009 17:18:09 -0000	1.452
@@ -7,7 +7,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.3.9
-Release: 6%{?svn:.svn%{svn}}%{?dist}
+Release: 7%{?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
@@ -53,6 +53,8 @@
 Patch27: cups-CVE-2008-5183.patch
 Patch28: cups-CVE-2008-5286.patch
 Patch29: cups-str2831.patch
+Patch30: cups-str3077.patch
+Patch31: cups-str3078.patch
 Patch100: cups-lspp.patch
 Epoch: 1
 Url: http://www.cups.org/
@@ -192,6 +194,8 @@
 %patch27 -p1 -b .CVE-2008-5183
 %patch28 -p1 -b .CVE-2008-5286
 %patch29 -p1 -b .str2831
+%patch30 -p1 -b .str3077
+%patch31 -p1 -b .str3078
 
 %if %lspp
 %patch100 -p1 -b .lspp
@@ -480,6 +484,9 @@
 %{_libdir}/php/modules/*.so
 
 %changelog
+* Wed Jan 28 2009 Tim Waugh <twaugh at redhat.com> 1:1.3.9-7
+- Fixed quotas (STR #3077, STR #3078).
+
 * Tue Dec  9 2008 Tim Waugh <twaugh at redhat.com> 1:1.3.9-6
 - Attempt to unbreak the fix for STR #2831 (bug #474742).
 



From dwalsh at fedoraproject.org  Wed Jan 28 17:23:47 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Wed, 28 Jan 2009 17:23:47 +0000 (UTC)
Subject: rpms/selinux-policy/devel policy-20090105.patch, 1.21,
	1.22 selinux-policy.spec, 1.776, 1.777
Message-ID: <20090128172347.996CD7010D@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3524

Modified Files:
	policy-20090105.patch selinux-policy.spec 
Log Message:
* Tue Jan 27 2009 Dan Walsh <dwalsh at redhat.com> 3.6.3-10
- Fixes for wicd daemon


policy-20090105.patch:

Index: policy-20090105.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-20090105.patch,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- policy-20090105.patch	26 Jan 2009 16:21:58 -0000	1.21
+++ policy-20090105.patch	28 Jan 2009 17:23:16 -0000	1.22
@@ -372,7 +372,7 @@
  
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/certwatch.te serefpolicy-3.6.3/policy/modules/admin/certwatch.te
 --- nsaserefpolicy/policy/modules/admin/certwatch.te	2009-01-19 11:07:34.000000000 -0500
-+++ serefpolicy-3.6.3/policy/modules/admin/certwatch.te	2009-01-19 13:10:02.000000000 -0500
++++ serefpolicy-3.6.3/policy/modules/admin/certwatch.te	2009-01-26 12:59:40.000000000 -0500
 @@ -27,6 +27,9 @@
  
  fs_list_inotifyfs(certwatch_t)
@@ -383,6 +383,14 @@
  logging_send_syslog_msg(certwatch_t)
  
  miscfiles_read_certs(certwatch_t)
+@@ -36,6 +39,7 @@
+ 
+ optional_policy(`
+ 	apache_exec_modules(certwatch_t)
++	apache_read_config(certwatch_t)
+ ')
+ 
+ optional_policy(`
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/consoletype.te serefpolicy-3.6.3/policy/modules/admin/consoletype.te
 --- nsaserefpolicy/policy/modules/admin/consoletype.te	2009-01-05 15:39:44.000000000 -0500
 +++ serefpolicy-3.6.3/policy/modules/admin/consoletype.te	2009-01-19 13:10:02.000000000 -0500
@@ -1036,7 +1044,7 @@
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/rpm.te serefpolicy-3.6.3/policy/modules/admin/rpm.te
 --- nsaserefpolicy/policy/modules/admin/rpm.te	2009-01-19 11:07:34.000000000 -0500
-+++ serefpolicy-3.6.3/policy/modules/admin/rpm.te	2009-01-26 09:14:27.000000000 -0500
++++ serefpolicy-3.6.3/policy/modules/admin/rpm.te	2009-01-28 09:38:38.000000000 -0500
 @@ -31,6 +31,9 @@
  files_type(rpm_var_lib_t)
  typealias rpm_var_lib_t alias var_lib_rpm_t;
@@ -1081,16 +1089,24 @@
  
  corecmd_exec_all_executables(rpm_t)
  
-@@ -115,6 +125,8 @@
+@@ -108,13 +118,16 @@
+ dev_list_sysfs(rpm_t)
+ dev_list_usbfs(rpm_t)
+ dev_read_urand(rpm_t)
++dev_read_raw_memory(rpm_t)
+ #devices_manage_all_device_types(rpm_t)
+ 
+ fs_manage_nfs_dirs(rpm_t)
+ fs_manage_nfs_files(rpm_t)
  fs_manage_nfs_symlinks(rpm_t)
  fs_getattr_all_fs(rpm_t)
++fs_getattr_all_dirs(rpm_t)
  fs_search_auto_mountpoints(rpm_t)
 +fs_list_inotifyfs(rpm_t)
-+fs_getattr_all_fs(rpm_t)
  
  mls_file_read_all_levels(rpm_t)
  mls_file_write_all_levels(rpm_t)
-@@ -132,6 +144,8 @@
+@@ -132,6 +145,8 @@
  # for installing kernel packages
  storage_raw_read_fixed_disk(rpm_t)
  
@@ -1099,7 +1115,7 @@
  auth_relabel_all_files_except_shadow(rpm_t)
  auth_manage_all_files_except_shadow(rpm_t)
  auth_dontaudit_read_shadow(rpm_t)
-@@ -155,6 +169,7 @@
+@@ -155,6 +170,7 @@
  files_exec_etc_files(rpm_t)
  
  init_domtrans_script(rpm_t)
@@ -1107,7 +1123,7 @@
  
  libs_exec_ld_so(rpm_t)
  libs_exec_lib_files(rpm_t)
-@@ -174,10 +189,20 @@
+@@ -174,10 +190,20 @@
  ')
  
  optional_policy(`
@@ -1128,7 +1144,7 @@
  	prelink_domtrans(rpm_t)
  ')
  
-@@ -185,6 +210,7 @@
+@@ -185,6 +211,7 @@
  	unconfined_domain(rpm_t)
  	# yum-updatesd requires this
  	unconfined_dbus_chat(rpm_t)
@@ -1136,18 +1152,18 @@
  ')
  
  ifdef(`TODO',`
-@@ -210,8 +236,8 @@
+@@ -210,8 +237,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: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 net_admin };
++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_rawio sys_nice mknod kill net_admin };
 +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;
-@@ -222,12 +248,15 @@
+@@ -222,12 +249,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 };
@@ -1163,16 +1179,17 @@
  files_tmp_filetrans(rpm_script_t, rpm_script_tmp_t, { file dir })
  
  manage_dirs_pattern(rpm_script_t, rpm_script_tmpfs_t, rpm_script_tmpfs_t)
-@@ -239,6 +268,8 @@
+@@ -239,6 +269,9 @@
  
  kernel_read_kernel_sysctls(rpm_script_t)
  kernel_read_system_state(rpm_script_t)
 +kernel_read_network_state(rpm_script_t)
 +kernel_list_all_proc(rpm_script_t)
++kernel_read_software_raid_state(rpm_script_t)
  
  dev_list_sysfs(rpm_script_t)
  
-@@ -255,6 +286,7 @@
+@@ -255,6 +288,7 @@
  fs_mount_xattr_fs(rpm_script_t)
  fs_unmount_xattr_fs(rpm_script_t)
  fs_search_auto_mountpoints(rpm_script_t)
@@ -1180,7 +1197,7 @@
  
  mcs_killall(rpm_script_t)
  mcs_ptrace_all(rpm_script_t)
-@@ -272,14 +304,19 @@
+@@ -272,14 +306,19 @@
  storage_raw_read_fixed_disk(rpm_script_t)
  storage_raw_write_fixed_disk(rpm_script_t)
  
@@ -1200,7 +1217,7 @@
  
  domain_read_all_domains_state(rpm_script_t)
  domain_getattr_all_domains(rpm_script_t)
-@@ -291,6 +328,7 @@
+@@ -291,6 +330,7 @@
  files_exec_etc_files(rpm_script_t)
  files_read_etc_runtime_files(rpm_script_t)
  files_exec_usr_files(rpm_script_t)
@@ -1208,7 +1225,7 @@
  
  init_domtrans_script(rpm_script_t)
  
-@@ -308,8 +346,10 @@
+@@ -308,8 +348,10 @@
  seutil_domtrans_loadpolicy(rpm_script_t)
  seutil_domtrans_setfiles(rpm_script_t)
  seutil_domtrans_semanage(rpm_script_t)
@@ -1219,7 +1236,7 @@
  
  ifdef(`distro_redhat',`
  	optional_policy(`
-@@ -326,6 +366,10 @@
+@@ -326,6 +368,10 @@
  ')
  
  optional_policy(`
@@ -1230,7 +1247,7 @@
  	tzdata_domtrans(rpm_t)
  	tzdata_domtrans(rpm_script_t)
  ')
-@@ -333,6 +377,7 @@
+@@ -333,6 +379,7 @@
  optional_policy(`
  	unconfined_domain(rpm_script_t)
  	unconfined_domtrans(rpm_script_t)
@@ -1655,7 +1672,7 @@
 +#/usr/libexec/gconfd-2 	--	gen_context(system_u:object_r:gconfd_exec_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/gnome.if serefpolicy-3.6.3/policy/modules/apps/gnome.if
 --- nsaserefpolicy/policy/modules/apps/gnome.if	2008-11-11 16:13:41.000000000 -0500
-+++ serefpolicy-3.6.3/policy/modules/apps/gnome.if	2009-01-19 13:10:02.000000000 -0500
++++ serefpolicy-3.6.3/policy/modules/apps/gnome.if	2009-01-28 10:35:22.000000000 -0500
 @@ -89,5 +89,154 @@
  
  	allow $1 gnome_home_t:dir manage_dir_perms;
@@ -2022,8 +2039,16 @@
 +/usr/lib/opera(/.*)?/opera	--	gen_context(system_u:object_r:java_exec_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/java.if serefpolicy-3.6.3/policy/modules/apps/java.if
 --- nsaserefpolicy/policy/modules/apps/java.if	2008-11-11 16:13:42.000000000 -0500
-+++ serefpolicy-3.6.3/policy/modules/apps/java.if	2009-01-19 13:10:02.000000000 -0500
-@@ -68,3 +68,121 @@
++++ serefpolicy-3.6.3/policy/modules/apps/java.if	2009-01-28 09:40:26.000000000 -0500
+@@ -30,6 +30,7 @@
+ 
+ 	allow java_t $2:unix_stream_socket connectto;
+ 	allow java_t $2:unix_stream_socket { read write };
++	allow java_t $2:tcp_socket { read write };
+ ')
+ 
+ ########################################
+@@ -68,3 +69,121 @@
  	domtrans_pattern($1, java_exec_t, unconfined_java_t)
  	corecmd_search_bin($1)
  ')
@@ -2442,7 +2467,7 @@
  
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/mozilla.te serefpolicy-3.6.3/policy/modules/apps/mozilla.te
 --- nsaserefpolicy/policy/modules/apps/mozilla.te	2009-01-19 11:03:28.000000000 -0500
-+++ serefpolicy-3.6.3/policy/modules/apps/mozilla.te	2009-01-19 13:10:02.000000000 -0500
++++ serefpolicy-3.6.3/policy/modules/apps/mozilla.te	2009-01-28 10:40:08.000000000 -0500
 @@ -105,6 +105,7 @@
  # Should not need other ports
  corenet_dontaudit_tcp_sendrecv_generic_port(mozilla_t)
@@ -2459,11 +2484,21 @@
  
  logging_send_syslog_msg(mozilla_t)
  
-@@ -263,5 +265,9 @@
+@@ -243,6 +245,8 @@
+ 
+ optional_policy(`
+ 	gnome_stream_connect_gconf(mozilla_t)
++	gnome_manage_config(mozilla_t)
++	gnome_manage_gconf_home_files(mozilla_t)
+ ')
+ 
+ optional_policy(`
+@@ -263,5 +267,10 @@
  ')
  
  optional_policy(`
 +	nsplugin_manage_rw(mozilla_t)
++	nsplugin_manage_home_files(mozilla_t)
 +')
 +
 +optional_policy(`
@@ -2530,8 +2565,8 @@
 +/usr/lib(64)?/mozilla/plugins-wrapped(/.*)?			gen_context(system_u:object_r:nsplugin_rw_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/nsplugin.if serefpolicy-3.6.3/policy/modules/apps/nsplugin.if
 --- nsaserefpolicy/policy/modules/apps/nsplugin.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.3/policy/modules/apps/nsplugin.if	2009-01-19 13:10:02.000000000 -0500
-@@ -0,0 +1,250 @@
++++ serefpolicy-3.6.3/policy/modules/apps/nsplugin.if	2009-01-28 12:10:35.000000000 -0500
+@@ -0,0 +1,272 @@
 +
 +## <summary>policy for nsplugin</summary>
 +
@@ -2615,6 +2650,8 @@
 +		type nsplugin_config_exec_t;
 +		type nsplugin_t;
 +		type nsplugin_config_t;
++		class x_drawable all_x_drawable_perms;
++		class x_resource all_x_resource_perms;
 +	')
 +
 +	role $1 types nsplugin_t;
@@ -2653,6 +2690,7 @@
 +	userdom_dontaudit_setattr_user_home_content_files(nsplugin_t)
 +	userdom_manage_tmpfs_role($1, nsplugin_t)
 +
++	xserver_communicate(nsplugin_t, $2)
 +')
 +
 +#######################################
@@ -2782,6 +2820,25 @@
 +
 +	can_exec($1, nsplugin_rw_t)
 +')
++
++########################################
++## <summary>
++##	Create, read, write, and delete
++##	nsplugin home files.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`nsplugin_manage_home_files',`
++	gen_require(`
++		type nsplugin_home_t;
++	')
++
++	manage_files_pattern($1, nsplugin_home_t, nsplugin_home_t)
++')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/nsplugin.te serefpolicy-3.6.3/policy/modules/apps/nsplugin.te
 --- nsaserefpolicy/policy/modules/apps/nsplugin.te	1969-12-31 19:00:00.000000000 -0500
 +++ serefpolicy-3.6.3/policy/modules/apps/nsplugin.te	2009-01-19 13:10:02.000000000 -0500
@@ -3072,7 +3129,7 @@
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/openoffice.if serefpolicy-3.6.3/policy/modules/apps/openoffice.if
 --- nsaserefpolicy/policy/modules/apps/openoffice.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.3/policy/modules/apps/openoffice.if	2009-01-19 13:10:02.000000000 -0500
++++ serefpolicy-3.6.3/policy/modules/apps/openoffice.if	2009-01-28 09:49:45.000000000 -0500
 @@ -0,0 +1,92 @@
 +## <summary>Openoffice</summary>
 +
@@ -3905,12 +3962,19 @@
  files_read_etc_runtime_files(webalizer_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/wine.fc serefpolicy-3.6.3/policy/modules/apps/wine.fc
 --- nsaserefpolicy/policy/modules/apps/wine.fc	2008-08-07 11:15:02.000000000 -0400
-+++ serefpolicy-3.6.3/policy/modules/apps/wine.fc	2009-01-19 13:10:02.000000000 -0500
-@@ -2,3 +2,4 @@
- 
- /opt/cxoffice/bin/wine		--	gen_context(system_u:object_r:wine_exec_t,s0)
- /opt/picasa/wine/bin/wine	--	gen_context(system_u:object_r:wine_exec_t,s0)
++++ serefpolicy-3.6.3/policy/modules/apps/wine.fc	2009-01-26 12:05:17.000000000 -0500
+@@ -1,4 +1,8 @@
+-/usr/bin/wine			--	gen_context(system_u:object_r:wine_exec_t,s0)
++/usr/bin/wine.*			--	gen_context(system_u:object_r:wine_exec_t,s0)
++
++/opt/cxoffice/bin/wine.*	--	gen_context(system_u:object_r:wine_exec_t,s0)
++/opt/picasa/wine/bin/wine.*	--	gen_context(system_u:object_r:wine_exec_t,s0)
 +/opt/google/picasa(/.*)?/bin/wine.*	--	gen_context(system_u:object_r:wine_exec_t,s0)
++
++HOME_DIR/cxoffice/bin/wine.+		--	gen_context(system_u:object_r:wine_exec_t,s0)
+ 
+-/opt/cxoffice/bin/wine		--	gen_context(system_u:object_r:wine_exec_t,s0)
+-/opt/picasa/wine/bin/wine	--	gen_context(system_u:object_r:wine_exec_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/wine.if serefpolicy-3.6.3/policy/modules/apps/wine.if
 --- nsaserefpolicy/policy/modules/apps/wine.if	2008-11-11 16:13:41.000000000 -0500
 +++ serefpolicy-3.6.3/policy/modules/apps/wine.if	2009-01-19 13:10:02.000000000 -0500
@@ -4140,7 +4204,7 @@
 +corecmd_executable_file(wm_exec_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corecommands.fc serefpolicy-3.6.3/policy/modules/kernel/corecommands.fc
 --- nsaserefpolicy/policy/modules/kernel/corecommands.fc	2009-01-05 15:39:38.000000000 -0500
-+++ serefpolicy-3.6.3/policy/modules/kernel/corecommands.fc	2009-01-23 15:08:37.000000000 -0500
++++ serefpolicy-3.6.3/policy/modules/kernel/corecommands.fc	2009-01-27 10:39:15.000000000 -0500
 @@ -58,6 +58,8 @@
  
  /etc/init\.d/functions		--	gen_context(system_u:object_r:bin_t,s0)
@@ -4185,7 +4249,7 @@
  /usr/share/fedora-usermgmt/wrapper --	gen_context(system_u:object_r:bin_t,s0)
  /usr/share/hplip/[^/]*		--	gen_context(system_u:object_r:bin_t,s0)
  /usr/share/hwbrowser/hwbrowser --	gen_context(system_u:object_r:bin_t,s0)
-@@ -293,3 +299,10 @@
+@@ -293,3 +299,12 @@
  ifdef(`distro_suse',`
  /var/lib/samba/bin/.+			gen_context(system_u:object_r:bin_t,s0)
  ')
@@ -4196,6 +4260,8 @@
 +/usr/lib/oracle/xe/apps(/.*)?  gen_context(system_u:object_r:bin_t,s0)
 +
 +/usr/lib(64)?/pm-utils/sleep.d(/.*)?  gen_context(system_u:object_r:bin_t,s0)
++
++/usr/lib/wicd/monitor.py 	-- 	gen_context(system_u:object_r:bin_t, s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corecommands.if serefpolicy-3.6.3/policy/modules/kernel/corecommands.if
 --- nsaserefpolicy/policy/modules/kernel/corecommands.if	2009-01-05 15:39:38.000000000 -0500
 +++ serefpolicy-3.6.3/policy/modules/kernel/corecommands.if	2009-01-19 13:10:02.000000000 -0500
@@ -4360,7 +4426,7 @@
  network_port(xfs, tcp,7100,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.fc serefpolicy-3.6.3/policy/modules/kernel/devices.fc
 --- nsaserefpolicy/policy/modules/kernel/devices.fc	2008-10-08 21:42:58.000000000 -0400
-+++ serefpolicy-3.6.3/policy/modules/kernel/devices.fc	2009-01-19 14:33:15.000000000 -0500
++++ serefpolicy-3.6.3/policy/modules/kernel/devices.fc	2009-01-27 10:37:38.000000000 -0500
 @@ -1,7 +1,7 @@
  
  /dev			-d	gen_context(system_u:object_r:device_t,s0)
@@ -4448,7 +4514,7 @@
  /dev/vmmon		-c	gen_context(system_u:object_r:vmware_device_t,s0)
  /dev/vmnet.*		-c	gen_context(system_u:object_r:vmware_device_t,s0)
  /dev/video.*		-c	gen_context(system_u:object_r:v4l_device_t,s0)
-@@ -91,20 +108,32 @@
+@@ -91,20 +108,34 @@
  
  /dev/cmx.*		-c	gen_context(system_u:object_r:smartcard_device_t,s0)
  
@@ -4462,6 +4528,8 @@
  /dev/dvb/.*		-c	gen_context(system_u:object_r:v4l_device_t,s0)
  
 +/dev/inportbm		-c	gen_context(system_u:object_r:mouse_device_t,s0)
++/dev/input/.*		-c	gen_context(system_u:object_r:event_device_t,s0)
++/dev/input/m.*		-c	gen_context(system_u:object_r:mouse_device_t,s0)
  /dev/input/.*mouse.*	-c	gen_context(system_u:object_r:mouse_device_t,s0)
 +/dev/input/keyboard.*	-c	gen_context(system_u:object_r:event_device_t,s0)
  /dev/input/event.*	-c	gen_context(system_u:object_r:event_device_t,s0)
@@ -4484,7 +4552,7 @@
  
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.if serefpolicy-3.6.3/policy/modules/kernel/devices.if
 --- nsaserefpolicy/policy/modules/kernel/devices.if	2009-01-05 15:39:38.000000000 -0500
-+++ serefpolicy-3.6.3/policy/modules/kernel/devices.if	2009-01-20 16:50:48.000000000 -0500
++++ serefpolicy-3.6.3/policy/modules/kernel/devices.if	2009-01-28 11:04:40.000000000 -0500
 @@ -65,7 +65,7 @@
  
  	relabelfrom_dirs_pattern($1, device_t, device_node)
@@ -4562,6 +4630,15 @@
  ##	Read the CPU identity.
  ## </summary>
  ## <param name="domain">
+@@ -1281,7 +1321,7 @@
+ 		type dri_device_t;
+ 	')
+ 
+-	dontaudit $1 dri_device_t:chr_file { getattr read write ioctl };
++	dontaudit $1 dri_device_t:chr_file rw_file_perms;
+ ')
+ 
+ ########################################
 @@ -1957,6 +1997,42 @@
  
  ########################################
@@ -5554,7 +5631,7 @@
 +/dev/shm		-d	gen_context(system_u:object_r:tmpfs_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/filesystem.if serefpolicy-3.6.3/policy/modules/kernel/filesystem.if
 --- nsaserefpolicy/policy/modules/kernel/filesystem.if	2009-01-05 15:39:38.000000000 -0500
-+++ serefpolicy-3.6.3/policy/modules/kernel/filesystem.if	2009-01-26 08:55:48.000000000 -0500
++++ serefpolicy-3.6.3/policy/modules/kernel/filesystem.if	2009-01-28 09:38:28.000000000 -0500
 @@ -534,6 +534,24 @@
  
  ########################################
@@ -5998,7 +6075,7 @@
  #
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/kernel.if serefpolicy-3.6.3/policy/modules/kernel/kernel.if
 --- nsaserefpolicy/policy/modules/kernel/kernel.if	2009-01-05 15:39:38.000000000 -0500
-+++ serefpolicy-3.6.3/policy/modules/kernel/kernel.if	2009-01-26 08:54:44.000000000 -0500
++++ serefpolicy-3.6.3/policy/modules/kernel/kernel.if	2009-01-28 09:33:46.000000000 -0500
 @@ -1197,6 +1197,26 @@
  	')
  
@@ -7996,7 +8073,7 @@
 +permissive afs_t;
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.fc serefpolicy-3.6.3/policy/modules/services/apache.fc
 --- nsaserefpolicy/policy/modules/services/apache.fc	2008-11-11 16:13:46.000000000 -0500
-+++ serefpolicy-3.6.3/policy/modules/services/apache.fc	2009-01-19 13:10:02.000000000 -0500
++++ serefpolicy-3.6.3/policy/modules/services/apache.fc	2009-01-26 14:01:07.000000000 -0500
 @@ -1,12 +1,13 @@
 -HOME_DIR/((www)|(web)|(public_html))(/.+)? gen_context(system_u:object_r:httpd_user_content_t,s0)
 +HOME_DIR/((www)|(web)|(public_html)|(public_git))(/.+)? gen_context(system_u:object_r:httpd_user_content_t,s0)
@@ -8056,7 +8133,7 @@
  /var/log/apache(2)?(/.*)?		gen_context(system_u:object_r:httpd_log_t,s0)
  /var/log/apache-ssl(2)?(/.*)?		gen_context(system_u:object_r:httpd_log_t,s0)
  /var/log/cacti(/.*)?			gen_context(system_u:object_r:httpd_log_t,s0)
-@@ -64,11 +71,22 @@
+@@ -64,11 +71,24 @@
  /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)
@@ -8079,6 +8156,8 @@
 +#viewvc file context
 +/var/spool/viewvc(/.*)?  		gen_context(system_u:object_r:httpd_sys_content_rw_t,s0)
 +/var/www/html/[^/]*/cgi-bin(/.*)?	gen_context(system_u:object_r:httpd_sys_script_exec_t,s0)
++
++/var/www/gallery/albums(/.*)?			gen_context(system_u:object_r:httpd_sys_content_rw_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.if serefpolicy-3.6.3/policy/modules/services/apache.if
 --- nsaserefpolicy/policy/modules/services/apache.if	2009-01-19 11:06:49.000000000 -0500
 +++ serefpolicy-3.6.3/policy/modules/services/apache.if	2009-01-19 13:10:02.000000000 -0500
@@ -8615,7 +8694,7 @@
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.te serefpolicy-3.6.3/policy/modules/services/apache.te
 --- nsaserefpolicy/policy/modules/services/apache.te	2009-01-19 11:06:49.000000000 -0500
-+++ serefpolicy-3.6.3/policy/modules/services/apache.te	2009-01-23 15:14:19.000000000 -0500
++++ serefpolicy-3.6.3/policy/modules/services/apache.te	2009-01-28 09:24:50.000000000 -0500
 @@ -19,6 +19,8 @@
  # Declarations
  #
@@ -9317,9 +9396,21 @@
 +typealias httpd_sys_script_rw_t   alias httpd_fastcgi_script_rw_t;
 +typealias httpd_sys_script_t      alias httpd_fastcgi_script_t;
 +typealias httpd_var_run_t         alias httpd_fastcgi_var_run_t;
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apm.te serefpolicy-3.6.3/policy/modules/services/apm.te
+--- nsaserefpolicy/policy/modules/services/apm.te	2009-01-05 15:39:43.000000000 -0500
++++ serefpolicy-3.6.3/policy/modules/services/apm.te	2009-01-28 09:26:27.000000000 -0500
+@@ -181,7 +181,7 @@
+ ')
+ 
+ optional_policy(`
+-	dbus_stub(apmd_t)
++	dbus_system_bus_client(apmd_t)
+ 
+ 	optional_policy(`
+ 		consolekit_dbus_chat(apmd_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/automount.te serefpolicy-3.6.3/policy/modules/services/automount.te
 --- nsaserefpolicy/policy/modules/services/automount.te	2009-01-19 11:06:49.000000000 -0500
-+++ serefpolicy-3.6.3/policy/modules/services/automount.te	2009-01-19 13:10:02.000000000 -0500
++++ serefpolicy-3.6.3/policy/modules/services/automount.te	2009-01-27 15:10:22.000000000 -0500
 @@ -71,6 +71,7 @@
  files_mounton_all_mountpoints(automount_t)
  files_mount_all_file_type_fs(automount_t)
@@ -9344,7 +9435,15 @@
  
  storage_rw_fuse(automount_t)
  
-@@ -155,7 +158,7 @@
+@@ -142,6 +145,7 @@
+ 
+ # Run mount in the mount_t domain.
+ mount_domtrans(automount_t)
++mount_signal(automount_t)
+ 
+ userdom_dontaudit_use_unpriv_user_fds(automount_t)
+ userdom_dontaudit_search_user_home_dirs(automount_t)
+@@ -155,7 +159,7 @@
  ')
  
  optional_policy(`
@@ -9606,8 +9705,16 @@
  
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bluetooth.te serefpolicy-3.6.3/policy/modules/services/bluetooth.te
 --- nsaserefpolicy/policy/modules/services/bluetooth.te	2009-01-19 11:06:49.000000000 -0500
-+++ serefpolicy-3.6.3/policy/modules/services/bluetooth.te	2009-01-19 13:10:02.000000000 -0500
-@@ -147,10 +147,10 @@
++++ serefpolicy-3.6.3/policy/modules/services/bluetooth.te	2009-01-26 13:54:13.000000000 -0500
+@@ -93,6 +93,7 @@
+ 
+ kernel_read_kernel_sysctls(bluetooth_t)
+ kernel_read_system_state(bluetooth_t)
++kernel_read_network_state(bluetooth_t)
+ 
+ corenet_all_recvfrom_unlabeled(bluetooth_t)
+ corenet_all_recvfrom_netlabel(bluetooth_t)
+@@ -147,10 +148,10 @@
  	optional_policy(`
  		cups_dbus_chat(bluetooth_t)
  	')
@@ -10234,6 +10341,34 @@
 +	fs_dontaudit_rw_cifs_files(consolekit_t)
 +')
 +
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/courier.if serefpolicy-3.6.3/policy/modules/services/courier.if
+--- nsaserefpolicy/policy/modules/services/courier.if	2009-01-19 11:06:49.000000000 -0500
++++ serefpolicy-3.6.3/policy/modules/services/courier.if	2009-01-26 15:06:13.000000000 -0500
+@@ -179,6 +179,24 @@
+ 
+ ########################################
+ ## <summary>
++##	Read courier spool files.
++## </summary>
++## <param name="prefix">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`courier_read_spool',`
++	gen_require(`
++		type courier_spool_t;
++	')
++
++	read_files_pattern($1, courier_spool_t, courier_spool_t)
++')
++
++########################################
++## <summary>
+ ##	Read and write to courier spool pipes.
+ ## </summary>
+ ## <param name="domain">
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/courier.te serefpolicy-3.6.3/policy/modules/services/courier.te
 --- nsaserefpolicy/policy/modules/services/courier.te	2009-01-19 11:06:49.000000000 -0500
 +++ serefpolicy-3.6.3/policy/modules/services/courier.te	2009-01-19 13:10:02.000000000 -0500
@@ -10540,7 +10675,7 @@
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cron.te serefpolicy-3.6.3/policy/modules/services/cron.te
 --- nsaserefpolicy/policy/modules/services/cron.te	2009-01-19 11:06:49.000000000 -0500
-+++ serefpolicy-3.6.3/policy/modules/services/cron.te	2009-01-26 09:29:38.000000000 -0500
++++ serefpolicy-3.6.3/policy/modules/services/cron.te	2009-01-28 09:27:46.000000000 -0500
 @@ -38,6 +38,10 @@
  type cron_var_lib_t;
  files_type(cron_var_lib_t)
@@ -10626,7 +10761,15 @@
  dev_read_sysfs(crond_t)
  selinux_get_fs_mount(crond_t)
  selinux_validate_context(crond_t)
-@@ -183,6 +200,8 @@
+@@ -174,6 +191,7 @@
+ 
+ fs_getattr_all_fs(crond_t)
+ fs_search_auto_mountpoints(crond_t)
++fs_list_inotifyfs(crond_t)
+ 
+ # need auth_chkpwd to check for locked accounts.
+ auth_domtrans_chk_passwd(crond_t)
+@@ -183,6 +201,8 @@
  corecmd_read_bin_symlinks(crond_t)
  
  domain_use_interactive_fds(crond_t)
@@ -10635,7 +10778,7 @@
  
  files_read_etc_files(crond_t)
  files_read_generic_spool(crond_t)
-@@ -192,10 +211,13 @@
+@@ -192,10 +212,13 @@
  files_search_default(crond_t)
  
  init_rw_utmp(crond_t)
@@ -10649,7 +10792,7 @@
  
  seutil_read_config(crond_t)
  seutil_read_default_contexts(crond_t)
-@@ -208,6 +230,7 @@
+@@ -208,6 +231,7 @@
  userdom_list_user_home_dirs(crond_t)
  
  mta_send_mail(crond_t)
@@ -10657,7 +10800,7 @@
  
  ifdef(`distro_debian',`
  	# pam_limits is used
-@@ -227,21 +250,45 @@
+@@ -227,21 +251,45 @@
  	')
  ')
  
@@ -10704,7 +10847,7 @@
  ')
  
  optional_policy(`
-@@ -283,7 +330,14 @@
+@@ -283,7 +331,14 @@
  allow system_cronjob_t cron_var_lib_t:file manage_file_perms;
  files_var_lib_filetrans(system_cronjob_t, cron_var_lib_t, file)
  
@@ -10719,7 +10862,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
-@@ -314,9 +368,13 @@
+@@ -314,9 +369,13 @@
  filetrans_pattern(system_cronjob_t, crond_tmp_t, system_cronjob_tmp_t, { file lnk_file })
  files_tmp_filetrans(system_cronjob_t, system_cronjob_tmp_t, file)
  
@@ -10734,7 +10877,7 @@
  
  kernel_read_kernel_sysctls(system_cronjob_t)
  kernel_read_system_state(system_cronjob_t)
-@@ -370,7 +428,8 @@
+@@ -370,7 +429,8 @@
  init_read_utmp(system_cronjob_t)
  init_dontaudit_rw_utmp(system_cronjob_t)
  # prelink tells init to restart it self, we either need to allow or dontaudit
@@ -10744,7 +10887,7 @@
  
  auth_use_nsswitch(system_cronjob_t)
  
-@@ -378,6 +437,7 @@
+@@ -378,6 +438,7 @@
  libs_exec_ld_so(system_cronjob_t)
  
  logging_read_generic_logs(system_cronjob_t)
@@ -10752,7 +10895,18 @@
  logging_send_syslog_msg(system_cronjob_t)
  
  miscfiles_read_localization(system_cronjob_t)
-@@ -428,11 +488,20 @@
+@@ -418,6 +479,10 @@
+ ')
+ 
+ optional_policy(`
++	dbus_system_bus_client(system_cronjob_t)
++')
++
++optional_policy(`
+ 	ftp_read_log(system_cronjob_t)
+ ')
+ 
+@@ -428,11 +493,20 @@
  ')
  
  optional_policy(`
@@ -10773,7 +10927,7 @@
  ')
  
  optional_policy(`
-@@ -447,6 +516,7 @@
+@@ -447,6 +521,7 @@
  	prelink_read_cache(system_cronjob_t)
  	prelink_manage_log(system_cronjob_t)
  	prelink_delete_cache(system_cronjob_t)
@@ -10781,7 +10935,7 @@
  ')
  
  optional_policy(`
-@@ -460,8 +530,7 @@
+@@ -460,8 +535,7 @@
  ')
  
  optional_policy(`
@@ -10791,7 +10945,7 @@
  ')
  
  optional_policy(`
-@@ -469,24 +538,17 @@
+@@ -469,24 +543,17 @@
  ')
  
  optional_policy(`
@@ -10819,7 +10973,7 @@
  allow cronjob_t self:process { signal_perms setsched };
  allow cronjob_t self:fifo_file rw_fifo_file_perms;
  allow cronjob_t self:unix_stream_socket create_stream_socket_perms;
-@@ -570,6 +632,9 @@
+@@ -570,6 +637,9 @@
  userdom_manage_user_home_content_sockets(cronjob_t)
  #userdom_user_home_dir_filetrans_user_home_content(cronjob_t, notdevfile_class_set)
  
@@ -11034,7 +11188,7 @@
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.te serefpolicy-3.6.3/policy/modules/services/cups.te
 --- nsaserefpolicy/policy/modules/services/cups.te	2009-01-19 11:06:49.000000000 -0500
-+++ serefpolicy-3.6.3/policy/modules/services/cups.te	2009-01-19 13:10:02.000000000 -0500
++++ serefpolicy-3.6.3/policy/modules/services/cups.te	2009-01-28 09:26:44.000000000 -0500
 @@ -20,9 +20,18 @@
  type cupsd_etc_t;
  files_config_file(cupsd_etc_t)
@@ -11651,7 +11805,7 @@
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dbus.te serefpolicy-3.6.3/policy/modules/services/dbus.te
 --- nsaserefpolicy/policy/modules/services/dbus.te	2009-01-19 11:06:49.000000000 -0500
-+++ serefpolicy-3.6.3/policy/modules/services/dbus.te	2009-01-21 14:05:46.000000000 -0500
++++ serefpolicy-3.6.3/policy/modules/services/dbus.te	2009-01-28 09:29:46.000000000 -0500
 @@ -9,14 +9,15 @@
  #
  # Delcarations
@@ -11670,7 +11824,7 @@
  
  type session_dbusd_tmp_t;
  typealias session_dbusd_tmp_t alias { user_dbusd_tmp_t staff_dbusd_tmp_t sysadm_dbusd_tmp_t };
-@@ -31,11 +32,24 @@
+@@ -31,11 +32,25 @@
  files_tmp_file(system_dbusd_tmp_t)
  
  type system_dbusd_var_lib_t;
@@ -11691,21 +11845,22 @@
 +	mls_file_read_all_levels(system_dbusd_t)
 +	mls_socket_write_all_levels(system_dbusd_t)
 +	mls_socket_read_to_clearance(system_dbusd_t)
++	mls_dbus_recv_all_levels(system_dbusd_t)
 +')
 +
  ##############################
  #
  # System bus local policy
-@@ -45,7 +59,7 @@
+@@ -45,7 +60,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;
 -allow system_dbusd_t self:process { getattr signal_perms setcap };
-+allow system_dbusd_t self:process { getattr signal_perms setpgid getcap setcap };
++allow system_dbusd_t self:process { getattr getsched signal_perms setpgid getcap setcap };
  allow system_dbusd_t self:fifo_file rw_fifo_file_perms;
  allow system_dbusd_t self:dbus { send_msg acquire_svc };
  allow system_dbusd_t self:unix_stream_socket { connectto create_stream_socket_perms connectto };
-@@ -53,6 +67,8 @@
+@@ -53,6 +68,8 @@
  # Receive notifications of policy reloads and enforcing status changes.
  allow system_dbusd_t self:netlink_selinux_socket { create bind read };
  
@@ -11714,7 +11869,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)
-@@ -75,6 +91,8 @@
+@@ -75,6 +92,8 @@
  
  fs_getattr_all_fs(system_dbusd_t)
  fs_search_auto_mountpoints(system_dbusd_t)
@@ -11723,7 +11878,7 @@
  
  selinux_get_fs_mount(system_dbusd_t)
  selinux_validate_context(system_dbusd_t)
-@@ -91,9 +109,9 @@
+@@ -91,9 +110,9 @@
  corecmd_list_bin(system_dbusd_t)
  corecmd_read_bin_pipes(system_dbusd_t)
  corecmd_read_bin_sockets(system_dbusd_t)
@@ -11734,7 +11889,7 @@
  
  files_read_etc_files(system_dbusd_t)
  files_list_home(system_dbusd_t)
-@@ -101,6 +119,8 @@
+@@ -101,6 +120,8 @@
  
  init_use_fds(system_dbusd_t)
  init_use_script_ptys(system_dbusd_t)
@@ -11743,7 +11898,7 @@
  
  logging_send_audit_msgs(system_dbusd_t)
  logging_send_syslog_msg(system_dbusd_t)
-@@ -128,9 +148,34 @@
+@@ -128,9 +149,34 @@
  ')
  
  optional_policy(`
@@ -13073,7 +13228,7 @@
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.te serefpolicy-3.6.3/policy/modules/services/hal.te
 --- nsaserefpolicy/policy/modules/services/hal.te	2009-01-19 11:06:49.000000000 -0500
-+++ serefpolicy-3.6.3/policy/modules/services/hal.te	2009-01-20 11:41:48.000000000 -0500
++++ serefpolicy-3.6.3/policy/modules/services/hal.te	2009-01-28 09:55:29.000000000 -0500
 @@ -49,6 +49,15 @@
  type hald_var_lib_t;
  files_type(hald_var_lib_t)
@@ -13663,7 +13818,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.6.3/policy/modules/services/mailman.if
 --- nsaserefpolicy/policy/modules/services/mailman.if	2009-01-19 11:06:49.000000000 -0500
-+++ serefpolicy-3.6.3/policy/modules/services/mailman.if	2009-01-19 13:10:02.000000000 -0500
++++ serefpolicy-3.6.3/policy/modules/services/mailman.if	2009-01-26 13:51:36.000000000 -0500
 @@ -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;
@@ -13677,7 +13832,15 @@
  	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)
-@@ -209,6 +215,7 @@
+@@ -64,6 +70,7 @@
+ 	corenet_sendrecv_smtp_client_packets(mailman_$1_t)
+ 
+ 	fs_getattr_xattr_fs(mailman_$1_t)
++	fs_list_inotifyfs(mailman_$1_t)
+ 
+ 	corecmd_exec_all_executables(mailman_$1_t)
+ 
+@@ -209,6 +216,7 @@
  		type mailman_data_t;
  	')
  
@@ -13685,7 +13848,7 @@
  	manage_files_pattern($1, mailman_data_t, mailman_data_t)
  ')
  
-@@ -250,6 +257,25 @@
+@@ -250,6 +258,25 @@
  
  #######################################
  ## <summary>
@@ -13713,7 +13876,7 @@
  ## <param name="domain">
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mailman.te serefpolicy-3.6.3/policy/modules/services/mailman.te
 --- nsaserefpolicy/policy/modules/services/mailman.te	2009-01-19 11:06:49.000000000 -0500
-+++ serefpolicy-3.6.3/policy/modules/services/mailman.te	2009-01-19 15:30:18.000000000 -0500
++++ serefpolicy-3.6.3/policy/modules/services/mailman.te	2009-01-26 15:06:29.000000000 -0500
 @@ -53,10 +53,8 @@
  	apache_use_fds(mailman_cgi_t)
  	apache_dontaudit_append_log(mailman_cgi_t)
@@ -13727,7 +13890,7 @@
  ')
  
  ########################################
-@@ -65,15 +63,27 @@
+@@ -65,15 +63,31 @@
  #
  
  allow mailman_mail_t self:unix_dgram_socket create_socket_perms;
@@ -13751,15 +13914,19 @@
 -	allow mailman_mail_t qmail_spool_t:file { read ioctl getattr };
 -	# do we really need this?
 -	allow mailman_mail_t qmail_lspawn_t:fifo_file write;
-+	postfix_search_spool(mailman_mail_t)
++	courier_read_spool(mailman_mail_t)
  ')
 +
 +optional_policy(`
++	postfix_search_spool(mailman_mail_t)
++')
++
++optional_policy(`
 +        cron_read_pipes(mailman_mail_t)
  ')
  
  ########################################
-@@ -99,11 +109,15 @@
+@@ -99,11 +113,15 @@
  # for su
  seutil_dontaudit_search_config(mailman_queue_t)
  
@@ -14585,8 +14752,9 @@
  #
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/networkmanager.fc serefpolicy-3.6.3/policy/modules/services/networkmanager.fc
 --- nsaserefpolicy/policy/modules/services/networkmanager.fc	2008-09-24 09:07:28.000000000 -0400
-+++ serefpolicy-3.6.3/policy/modules/services/networkmanager.fc	2009-01-21 12:55:52.000000000 -0500
-@@ -1,8 +1,13 @@
++++ serefpolicy-3.6.3/policy/modules/services/networkmanager.fc	2009-01-27 10:38:58.000000000 -0500
+@@ -1,12 +1,24 @@
++/etc/rc\.d/init\.d/wicd		--	gen_context(system_u:object_r:NetworkManager_initrc_exec_t, s0)
 +/etc/NetworkManager/dispatcher\.d(/.*)	gen_context(system_u:object_r:NetworkManager_initrc_exec_t,s0)
 +/usr/libexec/nm-dispatcher.action --	gen_context(system_u:object_r:NetworkManager_initrc_exec_t,s0)
 +
@@ -14594,17 +14762,22 @@
  /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/sbin/wicd 			-- 	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/lib/wicd(/.*)? 			gen_context(system_u:object_r:NetworkManager_var_lib_t, s0)
  
++/var/log/wicd(/.*)? 			gen_context(system_u:object_r:NetworkManager_log_t,s0)
  /var/log/wpa_supplicant.*	--	gen_context(system_u:object_r:NetworkManager_log_t,s0)
  
-@@ -10,3 +15,4 @@
+ /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)
++
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/networkmanager.if serefpolicy-3.6.3/policy/modules/services/networkmanager.if
 --- nsaserefpolicy/policy/modules/services/networkmanager.if	2008-09-11 11:28:34.000000000 -0400
 +++ serefpolicy-3.6.3/policy/modules/services/networkmanager.if	2009-01-19 13:10:02.000000000 -0500
@@ -14635,8 +14808,18 @@
  ## <param name="domain">
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/networkmanager.te serefpolicy-3.6.3/policy/modules/services/networkmanager.te
 --- nsaserefpolicy/policy/modules/services/networkmanager.te	2009-01-19 11:07:34.000000000 -0500
-+++ serefpolicy-3.6.3/policy/modules/services/networkmanager.te	2009-01-19 14:46:55.000000000 -0500
-@@ -33,9 +33,9 @@
++++ serefpolicy-3.6.3/policy/modules/services/networkmanager.te	2009-01-26 13:38:45.000000000 -0500
+@@ -19,6 +19,9 @@
+ type NetworkManager_tmp_t;
+ files_tmp_file(NetworkManager_tmp_t)
+ 
++type NetworkManager_var_lib_t;
++files_type(NetworkManager_var_lib_t)
++
+ type NetworkManager_var_run_t;
+ files_pid_file(NetworkManager_var_run_t)
+ 
+@@ -33,9 +36,9 @@
  
  # networkmanager will ptrace itself if gdb is installed
  # and it receives a unexpected signal (rh bug #204161) 
@@ -14648,7 +14831,7 @@
  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;
-@@ -51,8 +51,8 @@
+@@ -51,8 +54,10 @@
  manage_files_pattern(NetworkManager_t, NetworkManager_log_t, NetworkManager_log_t)
  logging_log_filetrans(NetworkManager_t, NetworkManager_log_t, file)
  
@@ -14656,10 +14839,12 @@
 -files_search_tmp(NetworkManager_t)
 +manage_sock_files_pattern(NetworkManager_t, NetworkManager_tmp_t, NetworkManager_tmp_t)
 +files_tmp_filetrans(NetworkManager_t, NetworkManager_tmp_t, sock_file)
++
++manage_files_pattern(NetworkManager_t, NetworkManager_var_lib_t, NetworkManager_var_lib_t)
  
  manage_dirs_pattern(NetworkManager_t, NetworkManager_var_run_t, NetworkManager_var_run_t)
  manage_files_pattern(NetworkManager_t, NetworkManager_var_run_t, NetworkManager_var_run_t)
-@@ -63,6 +63,8 @@
+@@ -63,6 +68,8 @@
  kernel_read_network_state(NetworkManager_t)
  kernel_read_kernel_sysctls(NetworkManager_t)
  kernel_load_module(NetworkManager_t)
@@ -14668,7 +14853,7 @@
  
  corenet_all_recvfrom_unlabeled(NetworkManager_t)
  corenet_all_recvfrom_netlabel(NetworkManager_t)
-@@ -81,13 +83,18 @@
+@@ -81,13 +88,18 @@
  corenet_sendrecv_isakmp_server_packets(NetworkManager_t)
  corenet_sendrecv_dhcpc_server_packets(NetworkManager_t)
  corenet_sendrecv_all_client_packets(NetworkManager_t)
@@ -14687,7 +14872,7 @@
  
  mls_file_read_all_levels(NetworkManager_t)
  
-@@ -104,9 +111,14 @@
+@@ -104,9 +116,14 @@
  files_read_etc_runtime_files(NetworkManager_t)
  files_read_usr_files(NetworkManager_t)
  
@@ -14702,7 +14887,7 @@
  logging_send_syslog_msg(NetworkManager_t)
  
  miscfiles_read_localization(NetworkManager_t)
-@@ -116,25 +128,40 @@
+@@ -116,25 +133,40 @@
  
  seutil_read_config(NetworkManager_t)
  
@@ -14750,7 +14935,7 @@
  ')
  
  optional_policy(`
-@@ -146,8 +173,25 @@
+@@ -146,8 +178,25 @@
  ')
  
  optional_policy(`
@@ -14778,7 +14963,7 @@
  ')
  
  optional_policy(`
-@@ -155,23 +199,49 @@
+@@ -155,23 +204,49 @@
  ')
  
  optional_policy(`
@@ -14805,15 +14990,15 @@
 +	openvpn_kill(NetworkManager_t)
  	openvpn_signal(NetworkManager_t)
 +	openvpn_signull(NetworkManager_t)
-+')
-+
-+optional_policy(`
-+	polkit_domtrans_auth(NetworkManager_t)
-+	polkit_read_lib(NetworkManager_t)
-+	polkit_read_reload(NetworkManager_t)
  ')
  
  optional_policy(`
++	polkit_domtrans_auth(NetworkManager_t)
++	polkit_read_lib(NetworkManager_t)
++	polkit_read_reload(NetworkManager_t)
++')
++
++optional_policy(`
 +	ppp_initrc_domtrans(NetworkManager_t)
  	ppp_domtrans(NetworkManager_t)
  	ppp_read_pid_files(NetworkManager_t)
@@ -14830,7 +15015,7 @@
  ')
  
  optional_policy(`
-@@ -184,7 +254,9 @@
+@@ -184,7 +259,9 @@
  
  optional_policy(`
  	vpn_domtrans(NetworkManager_t)
@@ -15351,7 +15536,7 @@
  ## </summary>
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ntp.te serefpolicy-3.6.3/policy/modules/services/ntp.te
 --- nsaserefpolicy/policy/modules/services/ntp.te	2009-01-19 11:06:49.000000000 -0500
-+++ serefpolicy-3.6.3/policy/modules/services/ntp.te	2009-01-19 13:10:02.000000000 -0500
++++ serefpolicy-3.6.3/policy/modules/services/ntp.te	2009-01-26 13:23:48.000000000 -0500
 @@ -38,10 +38,11 @@
  
  # sys_resource and setrlimit is for locking memory
@@ -15373,12 +15558,13 @@
  
  allow ntpd_t ntpd_log_t:dir setattr;
  manage_files_pattern(ntpd_t,ntpd_log_t,ntpd_log_t)
-@@ -90,6 +92,8 @@
+@@ -90,6 +92,9 @@
  
  fs_getattr_all_fs(ntpd_t)
  fs_search_auto_mountpoints(ntpd_t)
 +# Necessary to communicate with gpsd devices
 +fs_rw_tmpfs_files(ntpd_t)
++fs_list_inotifyfs(ntpd_t)
  
  term_use_ptmx(ntpd_t)
  
@@ -21114,7 +21300,7 @@
  ')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/spamassassin.fc serefpolicy-3.6.3/policy/modules/services/spamassassin.fc
 --- nsaserefpolicy/policy/modules/services/spamassassin.fc	2008-11-25 09:01:08.000000000 -0500
-+++ serefpolicy-3.6.3/policy/modules/services/spamassassin.fc	2009-01-19 13:10:02.000000000 -0500
++++ serefpolicy-3.6.3/policy/modules/services/spamassassin.fc	2009-01-26 11:56:43.000000000 -0500
 @@ -1,15 +1,24 @@
 -HOME_DIR/\.spamassassin(/.*)?	gen_context(system_u:object_r:spamassassin_home_t,s0)
 +HOME_DIR/\.spamassassin(/.*)?	gen_context(system_u:object_r:spamc_home_t,s0)
@@ -22338,18 +22524,17 @@
  /var/lib/pam_devperm/:0	--	gen_context(system_u:object_r:xdm_var_lib_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.if serefpolicy-3.6.3/policy/modules/services/xserver.if
 --- nsaserefpolicy/policy/modules/services/xserver.if	2009-01-05 15:39:43.000000000 -0500
-+++ serefpolicy-3.6.3/policy/modules/services/xserver.if	2009-01-21 15:37:51.000000000 -0500
-@@ -90,7 +90,8 @@
++++ serefpolicy-3.6.3/policy/modules/services/xserver.if	2009-01-28 12:11:39.000000000 -0500
+@@ -90,7 +90,7 @@
  	allow $2 xauth_home_t:file manage_file_perms;
  	allow $2 xauth_home_t:file { relabelfrom relabelto };
  
 -	xserver_common_x_domain_template(user, $2)
 +	xserver_common_app($2)
-+	xserver_use_xdm($2)
  
  	##############################
  	#
-@@ -116,6 +117,7 @@
+@@ -116,6 +116,7 @@
  	# setattr: gnome-settings-daemon X11:GrabKey
  	# manage: metacity X11:ChangeWindowAttributes
  	allow $2 rootwindow_t:x_drawable { read write manage setattr };
@@ -22357,7 +22542,7 @@
  
  	# setattr: metacity X11:InstallColormap
  	allow $2 xserver_t:x_screen { saver_getattr saver_setattr setattr };
-@@ -156,7 +158,7 @@
+@@ -156,7 +157,7 @@
  	allow $1 xserver_t:process signal;
  
  	# Read /tmp/.X0-lock
@@ -22366,7 +22551,7 @@
  
  	# Client read xserver shm
  	allow $1 xserver_t:fd use;
-@@ -219,12 +221,12 @@
+@@ -219,12 +220,12 @@
  	allow $1 self:unix_stream_socket { connectto create_stream_socket_perms };
  
  	# Read .Xauthority file
@@ -22382,7 +22567,7 @@
  	allow $1 xdm_tmp_t:dir search;
  	allow $1 xdm_tmp_t:sock_file { read write };
  	dontaudit $1 xdm_t:tcp_socket { read write };
-@@ -278,7 +280,6 @@
+@@ -278,7 +279,6 @@
  		type input_xevent_t, focus_xevent_t, property_xevent_t, manage_xevent_t;
  		type xevent_t, client_xevent_t;
  
@@ -22390,7 +22575,7 @@
  		attribute xproperty_type;
  		attribute xevent_type;
  		attribute input_xevent_type;
-@@ -287,6 +288,8 @@
+@@ -287,6 +287,8 @@
  		class x_property all_x_property_perms;
  		class x_event all_x_event_perms;
  		class x_synthetic_event all_x_synthetic_event_perms;
@@ -22399,7 +22584,7 @@
  	')
  
  	##############################
-@@ -294,20 +297,11 @@
+@@ -294,20 +296,11 @@
  	# Local Policy
  	#
  
@@ -22420,7 +22605,7 @@
  	allow $2 $1_input_xevent_t:{ x_event x_synthetic_event } receive;
  	allow $2 $1_property_xevent_t:{ x_event x_synthetic_event } receive;
  	allow $2 $1_focus_xevent_t:{ x_event x_synthetic_event } receive;
-@@ -320,8 +315,10 @@
+@@ -320,8 +314,10 @@
  	type_transition $2 manage_xevent_t:x_event $1_manage_xevent_t;
  	type_transition $2 client_xevent_t:x_event $1_client_xevent_t;
  	type_transition $2 xevent_t:x_event $1_default_xevent_t;
@@ -22432,7 +22617,7 @@
  ')
  
  #######################################
-@@ -397,11 +394,12 @@
+@@ -397,11 +393,12 @@
  	gen_require(`
  		type xdm_t, xdm_tmp_t;
  		type xauth_home_t, iceauth_home_t, xserver_t, xserver_tmpfs_t;
@@ -22448,7 +22633,7 @@
  
  	# Read .Xauthority file
  	allow $2 xauth_home_t:file read_file_perms;
-@@ -409,7 +407,7 @@
+@@ -409,7 +406,7 @@
  
  	# for when /tmp/.X11-unix is created by the system
  	allow $2 xdm_t:fd use;
@@ -22457,7 +22642,7 @@
  	allow $2 xdm_tmp_t:dir search_dir_perms;
  	allow $2 xdm_tmp_t:sock_file { read write };
  	dontaudit $2 xdm_t:tcp_socket { read write };
-@@ -437,6 +435,10 @@
+@@ -437,6 +434,10 @@
  		allow $2 xserver_t:shm rw_shm_perms;
  		allow $2 xserver_tmpfs_t:file rw_file_perms;
  	')
@@ -22468,7 +22653,7 @@
  ')
  
  ########################################
-@@ -639,7 +641,7 @@
+@@ -639,7 +640,7 @@
  		type xdm_t;
  	')
  
@@ -22477,7 +22662,7 @@
  ')
  
  ########################################
-@@ -738,6 +740,7 @@
+@@ -738,6 +739,7 @@
  	files_search_tmp($1)
  	allow $1 xdm_tmp_t:dir list_dir_perms;
  	create_sock_files_pattern($1, xdm_tmp_t, xdm_tmp_t)
@@ -22485,7 +22670,7 @@
  ')
  
  ########################################
-@@ -756,7 +759,26 @@
+@@ -756,7 +758,26 @@
  	')
  
  	files_search_pids($1)
@@ -22513,7 +22698,7 @@
  ')
  
  ########################################
-@@ -779,6 +801,31 @@
+@@ -779,6 +800,31 @@
  
  ########################################
  ## <summary>
@@ -22545,7 +22730,7 @@
  ##	Make an X session script an entrypoint for the specified domain.
  ## </summary>
  ## <param name="domain">
-@@ -1018,10 +1065,11 @@
+@@ -1018,10 +1064,11 @@
  #
  interface(`xserver_domtrans',`
  	gen_require(`
@@ -22558,7 +22743,7 @@
  	domtrans_pattern($1, xserver_exec_t, xserver_t)
  ')
  
-@@ -1159,6 +1207,275 @@
+@@ -1159,6 +1206,275 @@
  
  ########################################
  ## <summary>
@@ -22834,7 +23019,7 @@
  ##	Interface to provide X object permissions on a given X server to
  ##	an X client domain.  Gives the domain complete control over the
  ##	display.
-@@ -1172,7 +1489,99 @@
+@@ -1172,7 +1488,99 @@
  interface(`xserver_unconfined',`
  	gen_require(`
  		attribute xserver_unconfined_type;
@@ -22863,15 +23048,14 @@
 +#
 +interface(`xserver_communicate',`
 +	gen_require(`
-+		type xdm_t, xdm_tmp_t;
-+		class x_client all_x_client_perms;
 +		class x_drawable all_x_drawable_perms;
-+		class x_property all_x_property_perms;
 +		class x_resource all_x_resource_perms;
  ')
 +
 +	allow $1 $2:x_drawable all_x_drawable_perms;
++	allow $2 $1:x_drawable all_x_drawable_perms;
 +	allow $1 $2:x_resource all_x_resource_perms;
++	allow $2 $1:x_resource all_x_resource_perms;
 +')
 +
 +#######################################
@@ -22900,7 +23084,7 @@
 +	typeattribute $1 x_domain;
 +
 +	allow $1 xselection_t:x_selection setattr;
-+	allow $1 user_xproperty_t:x_property { write read };
++	allow $1 user_xproperty_t:x_property { write read destroy };
 +	allow $1 xproperty_t:x_property all_x_property_perms;
 +
 +	# X Windows
@@ -22911,6 +23095,7 @@
 +	# can receive own events
 +	allow $1 xevent_type:{ x_event x_synthetic_event } { receive send };
 +	xserver_communicate($1, $1)
++	xserver_use_xdm($1)
 +')
 +
 +########################################
@@ -22936,7 +23121,7 @@
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.te serefpolicy-3.6.3/policy/modules/services/xserver.te
 --- nsaserefpolicy/policy/modules/services/xserver.te	2009-01-19 11:06:49.000000000 -0500
-+++ serefpolicy-3.6.3/policy/modules/services/xserver.te	2009-01-26 09:17:40.000000000 -0500
++++ serefpolicy-3.6.3/policy/modules/services/xserver.te	2009-01-28 12:09:22.000000000 -0500
 @@ -34,6 +34,13 @@
  
  ## <desc>
@@ -23366,7 +23551,7 @@
  dontaudit xserver_t self:capability chown;
  allow xserver_t self:process ~{ ptrace setcurrent setexec setfscreate setrlimit execmem execstack execheap };
  allow xserver_t self:memprotect mmap_zero;
-@@ -602,6 +707,7 @@
+@@ -602,9 +707,11 @@
  allow xserver_t self:unix_stream_socket { create_stream_socket_perms connectto };
  allow xserver_t self:tcp_socket create_stream_socket_perms;
  allow xserver_t self:udp_socket create_socket_perms;
@@ -23374,7 +23559,11 @@
  
  # Device rules
  allow x_domain xserver_t:x_device { read getattr use setattr setfocus grab bell };
-@@ -622,7 +728,7 @@
++allow x_domain xserver_t:x_screen getattr;
+ 
+ allow xserver_t { input_xevent_t input_xevent_type }:x_event send;
+ 
+@@ -622,7 +729,7 @@
  manage_sock_files_pattern(xserver_t, xserver_tmp_t, xserver_tmp_t)
  files_tmp_filetrans(xserver_t, xserver_tmp_t, { file dir sock_file })
  
@@ -23383,7 +23572,7 @@
  
  manage_dirs_pattern(xserver_t, xserver_tmpfs_t, xserver_tmpfs_t)
  manage_files_pattern(xserver_t, xserver_tmpfs_t, xserver_tmpfs_t)
-@@ -635,6 +741,15 @@
+@@ -635,6 +742,15 @@
  manage_lnk_files_pattern(xserver_t, xkb_var_lib_t, xkb_var_lib_t)
  files_search_var_lib(xserver_t)
  
@@ -23399,7 +23588,7 @@
  # Create files in /var/log with the xserver_log_t type.
  manage_files_pattern(xserver_t, xserver_log_t, xserver_log_t)
  logging_log_filetrans(xserver_t, xserver_log_t,file)
-@@ -680,9 +795,14 @@
+@@ -680,9 +796,14 @@
  dev_rw_xserver_misc(xserver_t)
  # read events - the synaptics touchpad driver reads raw events
  dev_rw_input_dev(xserver_t)
@@ -23414,7 +23603,7 @@
  
  files_read_etc_files(xserver_t)
  files_read_etc_runtime_files(xserver_t)
-@@ -697,8 +817,13 @@
+@@ -697,8 +818,13 @@
  fs_search_nfs(xserver_t)
  fs_search_auto_mountpoints(xserver_t)
  fs_search_ramfs(xserver_t)
@@ -23428,7 +23617,7 @@
  
  selinux_validate_context(xserver_t)
  selinux_compute_access_vector(xserver_t)
-@@ -720,6 +845,7 @@
+@@ -720,6 +846,7 @@
  
  miscfiles_read_localization(xserver_t)
  miscfiles_read_fonts(xserver_t)
@@ -23436,7 +23625,7 @@
  
  modutils_domtrans_insmod(xserver_t)
  
-@@ -742,7 +868,7 @@
+@@ -742,7 +869,7 @@
  ')
  
  ifdef(`enable_mls',`
@@ -23445,7 +23634,7 @@
  	range_transition xserver_t xserver_t:x_drawable s0 - mls_systemhigh;
  ')
  
-@@ -774,6 +900,10 @@
+@@ -774,6 +901,10 @@
  ')
  
  optional_policy(`
@@ -23456,7 +23645,7 @@
  	rhgb_getpgid(xserver_t)
  	rhgb_signal(xserver_t)
  ')
-@@ -806,7 +936,7 @@
+@@ -806,7 +937,7 @@
  allow xserver_t xdm_var_lib_t:file { getattr read };
  dontaudit xserver_t xdm_var_lib_t:dir search;
  
@@ -23465,7 +23654,7 @@
  
  # Label pid and temporary files with derived types.
  manage_files_pattern(xserver_t, xdm_tmp_t, xdm_tmp_t)
-@@ -827,9 +957,14 @@
+@@ -827,9 +958,14 @@
  # to read ROLE_home_t - examine this in more detail
  # (xauth?)
  userdom_read_user_home_content_files(xserver_t)
@@ -23480,7 +23669,7 @@
  tunable_policy(`use_nfs_home_dirs',`
  	fs_manage_nfs_dirs(xserver_t)
  	fs_manage_nfs_files(xserver_t)
-@@ -844,11 +979,14 @@
+@@ -844,11 +980,14 @@
  
  optional_policy(`
  	dbus_system_bus_client(xserver_t)
@@ -23496,7 +23685,7 @@
  ')
  
  optional_policy(`
-@@ -856,6 +994,11 @@
+@@ -856,6 +995,11 @@
  	rhgb_rw_tmpfs_files(xserver_t)
  ')
  
@@ -23508,7 +23697,25 @@
  ########################################
  #
  # Rules common to all X window domains
-@@ -972,6 +1115,37 @@
+@@ -881,6 +1025,8 @@
+ # X Server
+ # can read server-owned resources
+ allow x_domain xserver_t:x_resource read;
++allow x_domain xserver_t:x_device { manage force_cursor };
++
+ # can mess with own clients
+ allow x_domain self:x_client { manage destroy };
+ 
+@@ -905,6 +1051,8 @@
+ # operations allowed on my windows
+ allow x_domain self:x_drawable { create destroy getattr setattr read write show hide list_child add_child remove_child manage send receive };
+ 
++allow x_domain x_domain:x_drawable { get_property getattr list_child };
++
+ # X Colormaps
+ # can use the default colormap
+ allow x_domain rootwindow_t:x_colormap { read use add_color };
+@@ -972,6 +1120,37 @@
  allow xserver_unconfined_type { x_domain xserver_t }:x_resource *;
  allow xserver_unconfined_type xevent_type:{ x_event x_synthetic_event } *;
  
@@ -23546,7 +23753,7 @@
  ifdef(`TODO',`
  tunable_policy(`allow_polyinstantiation',`
  # xdm needs access for linking .X11-unix to poly /tmp
-@@ -986,3 +1160,13 @@
+@@ -986,3 +1165,12 @@
  #
  allow xdm_t user_home_type:file unlink;
  ') dnl end TODO
@@ -23559,7 +23766,6 @@
 +tunable_policy(`allow_execstack',`
 +	allow xdm_t self:process { execstack execmem };
 +')
-+
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/zosremote.fc serefpolicy-3.6.3/policy/modules/services/zosremote.fc
 --- nsaserefpolicy/policy/modules/services/zosremote.fc	1969-12-31 19:00:00.000000000 -0500
 +++ serefpolicy-3.6.3/policy/modules/services/zosremote.fc	2009-01-19 13:10:02.000000000 -0500
@@ -23700,7 +23906,7 @@
 +/var/cache/coolkey(/.*)?	gen_context(system_u:object_r:auth_cache_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/authlogin.if serefpolicy-3.6.3/policy/modules/system/authlogin.if
 --- nsaserefpolicy/policy/modules/system/authlogin.if	2008-11-11 16:13:48.000000000 -0500
-+++ serefpolicy-3.6.3/policy/modules/system/authlogin.if	2009-01-20 10:57:35.000000000 -0500
++++ serefpolicy-3.6.3/policy/modules/system/authlogin.if	2009-01-28 09:30:42.000000000 -0500
 @@ -43,6 +43,7 @@
  interface(`auth_login_pgm_domain',`
  	gen_require(`
@@ -23865,6 +24071,15 @@
  ')
  
  ########################################
+@@ -650,7 +727,7 @@
+ 
+ ########################################
+ ## <summary>
+-##	Execute pam programs in the pam domain.
++##	Send signal to pam process
+ ## </summary>
+ ## <param name="domain">
+ ##	<summary>
 @@ -1031,6 +1108,32 @@
  
  ########################################
@@ -24377,7 +24592,7 @@
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.te serefpolicy-3.6.3/policy/modules/system/init.te
 --- nsaserefpolicy/policy/modules/system/init.te	2009-01-19 11:07:34.000000000 -0500
-+++ serefpolicy-3.6.3/policy/modules/system/init.te	2009-01-21 17:45:29.000000000 -0500
++++ serefpolicy-3.6.3/policy/modules/system/init.te	2009-01-28 09:55:56.000000000 -0500
 @@ -17,6 +17,20 @@
  ## </desc>
  gen_tunable(init_upstart,false)
@@ -24522,15 +24737,17 @@
  domain_getsession_all_domains(initrc_t)
  domain_use_interactive_fds(initrc_t)
  # for lsof which is used by alsa shutdown:
-@@ -367,6 +400,7 @@
+@@ -366,7 +399,9 @@
+ 
  libs_rw_ld_so_cache(initrc_t)
  libs_exec_lib_files(initrc_t)
++libs_exec_ld_so(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)
-@@ -451,7 +485,7 @@
+@@ -451,7 +486,7 @@
  
  	# Red Hat systems seem to have a stray
  	# fd open from the initrd
@@ -24539,7 +24756,7 @@
  	files_dontaudit_read_root_files(initrc_t)
  
  	selinux_set_enforce_mode(initrc_t)
-@@ -498,6 +532,7 @@
+@@ -498,6 +533,7 @@
  	optional_policy(`
  		#for /etc/rc.d/init.d/nfs to create /etc/exports
  		rpc_write_exports(initrc_t)
@@ -24547,7 +24764,7 @@
  	')
  
  	optional_policy(`
-@@ -516,6 +551,31 @@
+@@ -516,6 +552,31 @@
  	')
  ')
  
@@ -24579,7 +24796,7 @@
  optional_policy(`
  	amavis_search_lib(initrc_t)
  	amavis_setattr_pid_files(initrc_t)
-@@ -570,6 +630,10 @@
+@@ -570,6 +631,10 @@
  	dbus_read_config(initrc_t)
  
  	optional_policy(`
@@ -24590,7 +24807,7 @@
  		networkmanager_dbus_chat(initrc_t)
  	')
  ')
-@@ -655,12 +719,6 @@
+@@ -655,12 +720,6 @@
  	mta_read_config(initrc_t)
  	mta_dontaudit_read_spool_symlinks(initrc_t)
  ')
@@ -24603,7 +24820,7 @@
  
  optional_policy(`
  	ifdef(`distro_redhat',`
-@@ -721,6 +779,9 @@
+@@ -721,6 +780,9 @@
  
  	# why is this needed:
  	rpm_manage_db(initrc_t)
@@ -24613,7 +24830,7 @@
  ')
  
  optional_policy(`
-@@ -733,10 +794,12 @@
+@@ -733,10 +795,12 @@
  	squid_manage_logs(initrc_t)
  ')
  
@@ -24626,7 +24843,7 @@
  
  optional_policy(`
  	ssh_dontaudit_read_server_keys(initrc_t)
-@@ -754,6 +817,11 @@
+@@ -754,6 +818,11 @@
  	uml_setattr_util_sockets(initrc_t)
  ')
  
@@ -24638,7 +24855,7 @@
  optional_policy(`
  	unconfined_domain(initrc_t)
  
-@@ -768,6 +836,10 @@
+@@ -768,6 +837,10 @@
  ')
  
  optional_policy(`
@@ -24649,7 +24866,7 @@
  	vmware_read_system_config(initrc_t)
  	vmware_append_system_config(initrc_t)
  ')
-@@ -790,3 +862,11 @@
+@@ -790,3 +863,11 @@
  optional_policy(`
  	zebra_read_config(initrc_t)
  ')
@@ -24857,7 +25074,7 @@
  allow iscsid_t iscsi_tmp_t:dir manage_dir_perms;
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/libraries.fc serefpolicy-3.6.3/policy/modules/system/libraries.fc
 --- nsaserefpolicy/policy/modules/system/libraries.fc	2009-01-05 15:39:43.000000000 -0500
-+++ serefpolicy-3.6.3/policy/modules/system/libraries.fc	2009-01-19 13:10:02.000000000 -0500
++++ serefpolicy-3.6.3/policy/modules/system/libraries.fc	2009-01-26 13:53:03.000000000 -0500
 @@ -60,12 +60,15 @@
  #
  # /opt
@@ -24938,7 +25155,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 +262,7 @@
+@@ -246,12 +262,13 @@
  
  # Flash plugin, Macromedia
  HOME_DIR/\.mozilla(/.*)?/plugins/libflashplayer\.so.* -- gen_context(system_u:object_r:textrel_shlib_t,s0)
@@ -24946,8 +25163,15 @@
 +HOME_DIR/.*/plugins/nppdf\.so	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
  /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 +283,9 @@
+-HOME_DIR/.*/plugins/nprhapengine\.so.* --	gen_context(system_u:object_r:textrel_shlib_t,s0)
++HOME_DIR/.mozilla/plugins/nprhapengine\.so.* --	gen_context(system_u:object_r:textrel_shlib_t,s0)
+ /usr/lib(64)?/.*/nprhapengine\.so.*	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
+ /usr/local/(.*/)?nprhapengine\.so.*	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
++/usr/lib/allegro/(.*/)?alleg-vga\.so --	gen_context(system_u:object_r:textrel_shlib_t,s0)
+ 
+ # Jai, Sun Microsystems (Jpackage SPRM)
+ /usr/lib(64)?/libmlib_jai\.so		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
+@@ -267,6 +284,9 @@
  /usr/lib(64)?/vmware/lib(/.*)?/HConfig\.so --	gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/lib(64)?/vmware/(.*/)?VmPerl\.so	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
  
@@ -24957,7 +25181,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 +310,8 @@
+@@ -291,6 +311,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)
@@ -24966,7 +25190,16 @@
  ') dnl end distro_redhat
  
  #
-@@ -310,3 +331,19 @@
+@@ -303,6 +325,8 @@
+ 
+ /var/mailman/pythonlib(/.*)?/.+\.so(\..*)? --	gen_context(system_u:object_r:lib_t,s0)
+ 
++/var/lib/spamassassin/compiled/.*\.so.*    --     gen_context(system_u:object_r:lib_t,s0)
++
+ ifdef(`distro_suse',`
+ /var/lib/samba/bin/.+\.so(\.[^/]*)*	-l	gen_context(system_u:object_r:lib_t,s0)
+ ')
+@@ -310,3 +334,20 @@
  /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)
@@ -24986,6 +25219,7 @@
 +/usr/lib(64)?/sse2/.*\.so.*    --     gen_context(system_u:object_r:textrel_shlib_t,s0)
 +/usr/lib(64)?/i686/.*\.so.*    --     gen_context(system_u:object_r:textrel_shlib_t,s0)
 +/opt/google-earth/.*\.so.*    --     gen_context(system_u:object_r:textrel_shlib_t,s0)
++
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/libraries.te serefpolicy-3.6.3/policy/modules/system/libraries.te
 --- nsaserefpolicy/policy/modules/system/libraries.te	2009-01-05 15:39:43.000000000 -0500
 +++ serefpolicy-3.6.3/policy/modules/system/libraries.te	2009-01-19 13:10:02.000000000 -0500
@@ -25273,7 +25507,7 @@
 +/var/run/dmevent.*		gen_context(system_u:object_r:lvm_var_run_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/lvm.te serefpolicy-3.6.3/policy/modules/system/lvm.te
 --- nsaserefpolicy/policy/modules/system/lvm.te	2009-01-19 11:07:34.000000000 -0500
-+++ serefpolicy-3.6.3/policy/modules/system/lvm.te	2009-01-26 11:20:23.000000000 -0500
++++ serefpolicy-3.6.3/policy/modules/system/lvm.te	2009-01-28 09:30:55.000000000 -0500
 @@ -10,6 +10,9 @@
  type clvmd_exec_t;
  init_daemon_domain(clvmd_t,clvmd_exec_t)
@@ -25430,7 +25664,7 @@
  
  fs_getattr_xattr_fs(lvm_t)
  fs_search_auto_mountpoints(lvm_t)
-@@ -239,12 +276,17 @@
+@@ -239,12 +276,18 @@
  storage_dev_filetrans_fixed_disk(lvm_t)
  # Access raw devices and old /dev/lvm (c 109,0).  Is this needed?
  storage_manage_fixed_disk(lvm_t)
@@ -25443,12 +25677,13 @@
  corecmd_exec_shell(lvm_t)
  
  domain_use_interactive_fds(lvm_t)
++domain_read_all_domains_state(lvm_t)
  
 +files_read_usr_files(lvm_t)
  files_read_etc_files(lvm_t)
  files_read_etc_runtime_files(lvm_t)
  # for when /usr is not mounted:
-@@ -253,6 +295,7 @@
+@@ -253,6 +296,7 @@
  init_use_fds(lvm_t)
  init_dontaudit_getattr_initctl(lvm_t)
  init_use_script_ptys(lvm_t)
@@ -25456,7 +25691,7 @@
  
  logging_send_syslog_msg(lvm_t)
  
-@@ -283,5 +326,22 @@
+@@ -283,5 +327,22 @@
  ')
  
  optional_policy(`
@@ -25667,7 +25902,7 @@
  /usr/bin/fusermount		--	gen_context(system_u:object_r:mount_exec_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/mount.if serefpolicy-3.6.3/policy/modules/system/mount.if
 --- nsaserefpolicy/policy/modules/system/mount.if	2008-11-11 16:13:48.000000000 -0500
-+++ serefpolicy-3.6.3/policy/modules/system/mount.if	2009-01-19 13:10:02.000000000 -0500
++++ serefpolicy-3.6.3/policy/modules/system/mount.if	2009-01-27 15:12:00.000000000 -0500
 @@ -43,9 +43,11 @@
  
  	mount_domtrans($1)
@@ -25681,6 +25916,28 @@
  	')
  ')
  
+@@ -159,3 +161,21 @@
+ 	mount_domtrans_unconfined($1)
+ 	role $2 types unconfined_mount_t;
+ ')
++
++########################################
++## <summary>
++##	Send signal to mount process
++## </summary>
++## <param name="domain">
++##	<summary>
++##	The type of the process performing this action.
++##	</summary>
++## </param>
++#
++interface(`mount_signal',`
++	gen_require(`
++		type mount_t;
++	')
++
++	allow $1 mount_t:process signal; 
++')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/mount.te serefpolicy-3.6.3/policy/modules/system/mount.te
 --- nsaserefpolicy/policy/modules/system/mount.te	2009-01-05 15:39:43.000000000 -0500
 +++ serefpolicy-3.6.3/policy/modules/system/mount.te	2009-01-21 17:47:52.000000000 -0500
@@ -26737,16 +26994,21 @@
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/sysnetwork.fc serefpolicy-3.6.3/policy/modules/system/sysnetwork.fc
 --- nsaserefpolicy/policy/modules/system/sysnetwork.fc	2008-08-07 11:15:12.000000000 -0400
-+++ serefpolicy-3.6.3/policy/modules/system/sysnetwork.fc	2009-01-19 13:10:02.000000000 -0500
-@@ -11,6 +11,7 @@
++++ serefpolicy-3.6.3/policy/modules/system/sysnetwork.fc	2009-01-26 13:37:49.000000000 -0500
+@@ -11,8 +11,12 @@
  /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)
- 
-@@ -20,6 +21,7 @@
++/etc/wicd/manager-settings.conf -- gen_context(system_u:object_r:net_conf_t, s0)
++/etc/wicd/wireless-settings.conf -- gen_context(system_u:object_r:net_conf_t, s0)
++/etc/wicd/wired-settings.conf -- gen_context(system_u:object_r:net_conf_t, s0)
+ 
+ /etc/dhcp3(/.*)?		gen_context(system_u:object_r:dhcp_etc_t,s0)
+ /etc/dhcp3?/dhclient.*		gen_context(system_u:object_r:dhcp_etc_t,s0)
+@@ -20,6 +24,7 @@
  ifdef(`distro_redhat',`
  /etc/sysconfig/network-scripts/.*resolv\.conf -- gen_context(system_u:object_r:net_conf_t,s0)
  /etc/sysconfig/networking/profiles/.*/resolv\.conf -- gen_context(system_u:object_r:net_conf_t,s0)
@@ -26754,7 +27016,7 @@
  ')
  
  #
-@@ -57,3 +59,5 @@
+@@ -57,3 +62,5 @@
  ifdef(`distro_gentoo',`
  /var/lib/dhcpc(/.*)?		gen_context(system_u:object_r:dhcpc_state_t,s0)
  ')
@@ -27813,7 +28075,7 @@
 +/dev/shm/mono.*		gen_context(system_u:object_r:user_tmpfs_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-3.6.3/policy/modules/system/userdomain.if
 --- nsaserefpolicy/policy/modules/system/userdomain.if	2009-01-19 11:07:34.000000000 -0500
-+++ serefpolicy-3.6.3/policy/modules/system/userdomain.if	2009-01-26 09:38:49.000000000 -0500
++++ serefpolicy-3.6.3/policy/modules/system/userdomain.if	2009-01-28 10:48:13.000000000 -0500
 @@ -30,8 +30,9 @@
  	')
  
@@ -29279,7 +29541,7 @@
  ##	Send a dbus message to all user domains.
  ## </summary>
  ## <param name="domain">
-@@ -2981,3 +3235,284 @@
+@@ -2981,3 +3235,285 @@
  
  	allow $1 userdomain:dbus send_msg;
  ')
@@ -29394,6 +29656,7 @@
 +
 +  optional_policy(`
 +	setroubleshoot_stream_connect($1_t)
++	setroubleshoot_dbus_chat($1_t)
 +  ')
 +')
 +


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.776
retrieving revision 1.777
diff -u -r1.776 -r1.777
--- selinux-policy.spec	26 Jan 2009 16:21:59 -0000	1.776
+++ selinux-policy.spec	28 Jan 2009 17:23:17 -0000	1.777
@@ -20,7 +20,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.6.3
-Release: 9%{?dist}
+Release: 10%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -444,6 +444,9 @@
 %endif
 
 %changelog
+* Tue Jan 27 2009 Dan Walsh <dwalsh at redhat.com> 3.6.3-10
+- Fixes for wicd daemon
+
 * Mon Jan 26 2009 Dan Walsh <dwalsh at redhat.com> 3.6.3-9
 - More mls/rpm fixes 
 



From pkgdb at fedoraproject.org  Wed Jan 28 17:26:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Jan 2009 17:26:16 +0000
Subject: [pkgdb] valknut: mjakubicek has requested watchbugzilla
Message-ID: <20090128172616.A1AC4208486@bastion.fedora.phx.redhat.com>

mjakubicek has requested the watchbugzilla acl on valknut (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/valknut



From pkgdb at fedoraproject.org  Wed Jan 28 17:26:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Jan 2009 17:26:26 +0000
Subject: [pkgdb] valknut: mjakubicek has requested watchcommits
Message-ID: <20090128172626.C45B82084B6@bastion.fedora.phx.redhat.com>

mjakubicek has requested the watchcommits acl on valknut (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/valknut



From pkgdb at fedoraproject.org  Wed Jan 28 17:26:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Jan 2009 17:26:30 +0000
Subject: [pkgdb] valknut: mjakubicek has requested commit
Message-ID: <20090128172630.7C6D5208493@bastion.fedora.phx.redhat.com>

mjakubicek has requested the commit acl on valknut (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/valknut



From pkgdb at fedoraproject.org  Wed Jan 28 17:26:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Jan 2009 17:26:40 +0000
Subject: [pkgdb] valknut: mjakubicek has requested watchbugzilla
Message-ID: <20090128172640.32FE8208494@bastion.fedora.phx.redhat.com>

mjakubicek has requested the watchbugzilla acl on valknut (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/valknut



From pkgdb at fedoraproject.org  Wed Jan 28 17:26:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Jan 2009 17:26:43 +0000
Subject: [pkgdb] valknut: mjakubicek has requested commit
Message-ID: <20090128172643.8B8F6208497@bastion.fedora.phx.redhat.com>

mjakubicek has requested the commit acl on valknut (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/valknut



From pkgdb at fedoraproject.org  Wed Jan 28 17:26:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Jan 2009 17:26:50 +0000
Subject: [pkgdb] valknut: mjakubicek has requested watchcommits
Message-ID: <20090128172650.18B9C2084B7@bastion.fedora.phx.redhat.com>

mjakubicek has requested the watchcommits acl on valknut (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/valknut



From pkgdb at fedoraproject.org  Wed Jan 28 17:26:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Jan 2009 17:26:58 +0000
Subject: [pkgdb] valknut: mjakubicek has requested watchbugzilla
Message-ID: <20090128172658.E9E532084BD@bastion.fedora.phx.redhat.com>

mjakubicek has requested the watchbugzilla acl on valknut (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/valknut



From pkgdb at fedoraproject.org  Wed Jan 28 17:27:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Jan 2009 17:27:01 +0000
Subject: [pkgdb] valknut: mjakubicek has requested watchcommits
Message-ID: <20090128172701.5BB3620860D@bastion.fedora.phx.redhat.com>

mjakubicek has requested the watchcommits acl on valknut (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/valknut



From pkgdb at fedoraproject.org  Wed Jan 28 17:27:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Jan 2009 17:27:03 +0000
Subject: [pkgdb] valknut: mjakubicek has requested commit
Message-ID: <20090128172703.48CB5208496@bastion.fedora.phx.redhat.com>

mjakubicek has requested the commit acl on valknut (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/valknut



From pkgdb at fedoraproject.org  Wed Jan 28 17:27:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Jan 2009 17:27:07 +0000
Subject: [pkgdb] valknut: mjakubicek has requested watchbugzilla
Message-ID: <20090128172707.279362084A7@bastion.fedora.phx.redhat.com>

mjakubicek has requested the watchbugzilla acl on valknut (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/valknut



From pkgdb at fedoraproject.org  Wed Jan 28 17:27:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Jan 2009 17:27:09 +0000
Subject: [pkgdb] valknut: mjakubicek has requested watchcommits
Message-ID: <20090128172709.7B7E5208610@bastion.fedora.phx.redhat.com>

mjakubicek has requested the watchcommits acl on valknut (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/valknut



From pkgdb at fedoraproject.org  Wed Jan 28 17:27:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Jan 2009 17:27:11 +0000
Subject: [pkgdb] valknut: mjakubicek has requested commit
Message-ID: <20090128172711.4B63B208679@bastion.fedora.phx.redhat.com>

mjakubicek has requested the commit acl on valknut (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/valknut



From pkgdb at fedoraproject.org  Wed Jan 28 17:27:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Jan 2009 17:27:48 +0000
Subject: [pkgdb] dclib: mjakubicek has requested watchbugzilla
Message-ID: <20090128172748.483232084A7@bastion.fedora.phx.redhat.com>

mjakubicek has requested the watchbugzilla acl on dclib (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/dclib



From pkgdb at fedoraproject.org  Wed Jan 28 17:27:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Jan 2009 17:27:50 +0000
Subject: [pkgdb] dclib: mjakubicek has requested watchcommits
Message-ID: <20090128172750.558C1208605@bastion.fedora.phx.redhat.com>

mjakubicek has requested the watchcommits acl on dclib (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/dclib



From pkgdb at fedoraproject.org  Wed Jan 28 17:27:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Jan 2009 17:27:52 +0000
Subject: [pkgdb] dclib: mjakubicek has requested commit
Message-ID: <20090128172752.AF94820860A@bastion.fedora.phx.redhat.com>

mjakubicek has requested the commit acl on dclib (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/dclib



From pkgdb at fedoraproject.org  Wed Jan 28 17:28:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Jan 2009 17:28:02 +0000
Subject: [pkgdb] dclib: mjakubicek has requested watchbugzilla
Message-ID: <20090128172802.9117A20860F@bastion.fedora.phx.redhat.com>

mjakubicek has requested the watchbugzilla acl on dclib (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/dclib



From pkgdb at fedoraproject.org  Wed Jan 28 17:28:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Jan 2009 17:28:04 +0000
Subject: [pkgdb] dclib: mjakubicek has requested watchcommits
Message-ID: <20090128172804.71A3F20866E@bastion.fedora.phx.redhat.com>

mjakubicek has requested the watchcommits acl on dclib (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/dclib



From pkgdb at fedoraproject.org  Wed Jan 28 17:28:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Jan 2009 17:28:06 +0000
Subject: [pkgdb] dclib: mjakubicek has requested commit
Message-ID: <20090128172806.031412086F7@bastion.fedora.phx.redhat.com>

mjakubicek has requested the commit acl on dclib (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/dclib



From pkgdb at fedoraproject.org  Wed Jan 28 17:28:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Jan 2009 17:28:11 +0000
Subject: [pkgdb] dclib: mjakubicek has requested watchbugzilla
Message-ID: <20090128172811.BA6E2208486@bastion.fedora.phx.redhat.com>

mjakubicek has requested the watchbugzilla acl on dclib (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/dclib



From pkgdb at fedoraproject.org  Wed Jan 28 17:28:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Jan 2009 17:28:13 +0000
Subject: [pkgdb] dclib: mjakubicek has requested watchcommits
Message-ID: <20090128172813.A504B208742@bastion.fedora.phx.redhat.com>

mjakubicek has requested the watchcommits acl on dclib (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/dclib



From pkgdb at fedoraproject.org  Wed Jan 28 17:28:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Jan 2009 17:28:15 +0000
Subject: [pkgdb] dclib: mjakubicek has requested commit
Message-ID: <20090128172815.455942084B7@bastion.fedora.phx.redhat.com>

mjakubicek has requested the commit acl on dclib (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/dclib



From pkgdb at fedoraproject.org  Wed Jan 28 17:28:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Jan 2009 17:28:20 +0000
Subject: [pkgdb] dclib: mjakubicek has requested watchbugzilla
Message-ID: <20090128172820.2B9A9208748@bastion.fedora.phx.redhat.com>

mjakubicek has requested the watchbugzilla acl on dclib (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/dclib



From pkgdb at fedoraproject.org  Wed Jan 28 17:28:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Jan 2009 17:28:37 +0000
Subject: [pkgdb] dclib: mjakubicek has requested watchcommits
Message-ID: <20090128172837.B0BFD208609@bastion.fedora.phx.redhat.com>

mjakubicek has requested the watchcommits acl on dclib (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/dclib



From pkgdb at fedoraproject.org  Wed Jan 28 17:28:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Jan 2009 17:28:40 +0000
Subject: [pkgdb] dclib: mjakubicek has requested commit
Message-ID: <20090128172840.BC92720876B@bastion.fedora.phx.redhat.com>

mjakubicek has requested the commit acl on dclib (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/dclib



From kdudka at fedoraproject.org  Wed Jan 28 17:29:42 2009
From: kdudka at fedoraproject.org (Kamil Dudka)
Date: Wed, 28 Jan 2009 17:29:42 +0000 (UTC)
Subject: rpms/coreutils/devel coreutils-7.0-cp-mv-n.patch, NONE,
	1.1 coreutils-7.0-xattr.patch, NONE,
	1.1 coreutils-5.2.1-runuser.patch, 1.22,
	1.23 coreutils-selinux.patch, 1.53, 1.54 coreutils.spec, 1.243, 1.244
Message-ID: <20090128172942.6BEDA7010D@cvs1.fedora.phx.redhat.com>

Author: kdudka

Update of /cvs/extras/rpms/coreutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4882

Modified Files:
	coreutils-5.2.1-runuser.patch coreutils-selinux.patch 
	coreutils.spec 
Added Files:
	coreutils-7.0-cp-mv-n.patch coreutils-7.0-xattr.patch 
Log Message:
cp/mv: --no-clobber option, xattr support (#202823)

coreutils-7.0-cp-mv-n.patch:

--- NEW FILE coreutils-7.0-cp-mv-n.patch ---
diff -ruNp coreutils-7.0.orig/doc/coreutils.texi coreutils-7.0/doc/coreutils.texi
--- coreutils-7.0.orig/doc/coreutils.texi	2009-01-28 15:28:14.724301000 +0100
+++ coreutils-7.0/doc/coreutils.texi	2009-01-28 16:42:36.319138655 +0100
@@ -7295,6 +7295,9 @@ description of @option{--remove-destinat
 This option is independent of the @option{--interactive} or
 @option{-i} option: neither cancels the effect of the other.
 
+This option is redundant if the @option{--no-clobber} or @option{-n} option is
+used.
+
 @item -H
 @opindex -H
 If a command line argument specifies a symbolic link, then copy the
@@ -7307,7 +7310,8 @@ via recursive traversal.
 @opindex -i
 @opindex --interactive
 When copying a file other than a directory, prompt whether to
-overwrite an existing destination file.
+overwrite an existing destination file. The @option{-i} option overrides
+a previous @option{-n} option.
 
 @item -l
 @itemx --link
@@ -7321,6 +7325,14 @@ Make hard links instead of copies of non
 @opindex --dereference
 Follow symbolic links when copying from them.
 
+ at item -n
+ at itemx --no-clobber
+ at opindex -n
+ at opindex --no-clobber
+Do not overwrite an existing file. The @option{-n} option overrides a previous
+ at option{-i} option. This option is mutually exclusive with @option{-b} or
+ at option{--backup} option.
+
 @item -P
 @itemx --no-dereference
 @opindex -P
@@ -8076,6 +8088,11 @@ The program accepts the following option
 @opindex --force
 @cindex prompts, omitting
 Do not prompt the user before removing a destination file.
+ at macro mvOptsIfn
+If you specify more than one of the @option{-i}, @option{-f}, @option{-n}
+options, only the final one takes effect.
+ at end macro
+ at mvOptsIfn
 
 @item -i
 @itemx --interactive
@@ -8085,6 +8102,16 @@ Do not prompt the user before removing a
 Prompt whether to overwrite each existing destination file, regardless
 of its permissions.
 If the response is not affirmative, the file is skipped.
+ at mvOptsIfn
+
+ at item -n
+ at itemx --no-clobber
+ at opindex -n
+ at opindex --no-clobber
+ at cindex prompts, omitting
+Do not overwrite an existing file.
+ at mvOptsIfn
+This option is mutually exclusive with @option{-b} or @option{--backup} option.
 
 @itemx @w{@kbd{--reply}=@var{how}}
 @opindex --reply
diff -ruNp coreutils-7.0.orig/src/cp.c coreutils-7.0/src/cp.c
--- coreutils-7.0.orig/src/cp.c	2008-09-27 19:28:54.000000000 +0200
+++ coreutils-7.0/src/cp.c	2009-01-28 16:43:08.501394935 +0100
@@ -1,5 +1,5 @@
 /* cp.c  -- file copying (main routines)
-   Copyright (C) 89, 90, 91, 1995-2008 Free Software Foundation, Inc.
+   Copyright (C) 89, 90, 91, 1995-2009 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -129,6 +129,7 @@ static struct option const long_opts[] =
   {"force", no_argument, NULL, 'f'},
   {"interactive", no_argument, NULL, 'i'},
   {"link", no_argument, NULL, 'l'},
+  {"no-clobber", no_argument, NULL, 'n'},
   {"no-dereference", no_argument, NULL, 'P'},
   {"no-preserve", required_argument, NULL, NO_PRESERVE_ATTRIBUTES_OPTION},
   {"no-target-directory", no_argument, NULL, 'T'},
@@ -182,8 +183,10 @@ Mandatory arguments to long options are 
 "), stdout);
       fputs (_("\
   -f, --force                  if an existing destination file cannot be\n\
-                                 opened, remove it and try again\n\
-  -i, --interactive            prompt before overwrite\n\
+                                 opened, remove it and try again (redundant if\n\
+                                 the -n option is used)\n\
+  -i, --interactive            prompt before overwrite (overrides a previous -n\n\
+                                  option)\n\
   -H                           follow command-line symbolic links in SOURCE\n\
 "), stdout);
       fputs (_("\
@@ -191,6 +194,8 @@ Mandatory arguments to long options are 
   -L, --dereference            always follow symbolic links in SOURCE\n\
 "), stdout);
       fputs (_("\
+  -n, --no-clobber             do not overwrite an existing file (overrides\n\
+                                 a previous -i option)\n\
   -P, --no-dereference         never follow symbolic links in SOURCE\n\
 "), stdout);
       fputs (_("\
@@ -909,7 +914,7 @@ main (int argc, char **argv)
      we'll actually use backup_suffix_string.  */
   backup_suffix_string = getenv ("SIMPLE_BACKUP_SUFFIX");
 
-  while ((c = getopt_long (argc, argv, "abdfHilLprst:uvxPRS:T",
+  while ((c = getopt_long (argc, argv, "abdfHilLnprst:uvxPRS:T",
 			   long_opts, NULL))
 	 != -1)
     {
@@ -965,6 +970,10 @@ main (int argc, char **argv)
 	  x.dereference = DEREF_ALWAYS;
 	  break;
 
+	case 'n':
+	  x.interactive = I_ALWAYS_NO;
+	  break;
+
 	case 'P':
 	  x.dereference = DEREF_NEVER;
 	  break;
@@ -1072,6 +1081,13 @@ main (int argc, char **argv)
       usage (EXIT_FAILURE);
     }
 
+  if (make_backups && x.interactive == I_ALWAYS_NO)
+    {
+      error (0, 0,
+	     _("options --backup and --no-clobber are mutually exclusive"));
+      usage (EXIT_FAILURE);
+    }
+
   if (backup_suffix_string)
     simple_backup_suffix = xstrdup (backup_suffix_string);
 
diff -ruNp coreutils-7.0.orig/src/mv.c coreutils-7.0/src/mv.c
--- coreutils-7.0.orig/src/mv.c	2008-08-24 22:30:10.000000000 +0200
+++ coreutils-7.0/src/mv.c	2009-01-28 16:42:36.906143329 +0100
@@ -1,5 +1,5 @@
 /* mv -- move or rename files
-   Copyright (C) 86, 89, 90, 91, 1995-2008 Free Software Foundation, Inc.
+   Copyright (C) 86, 89, 90, 91, 1995-2009 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -76,6 +76,7 @@ static struct option const long_options[
   {"backup", optional_argument, NULL, 'b'},
   {"force", no_argument, NULL, 'f'},
   {"interactive", no_argument, NULL, 'i'},
+  {"no-clobber", no_argument, NULL, 'n'},
   {"no-target-directory", no_argument, NULL, 'T'},
   {"reply", required_argument, NULL, REPLY_OPTION}, /* Deprecated 2005-07-03,
 						       remove in 2008. */
@@ -312,6 +313,8 @@ Mandatory arguments to long options are 
   -b                           like --backup but does not accept an argument\n\
   -f, --force                  do not prompt before overwriting\n\
   -i, --interactive            prompt before overwrite\n\
+  -n, --no-clobber             do not overwrite an existing file\n\
+If you specify more than one of -i, -f, -n, only the final one takes effect.\n\
 "), stdout);
       fputs (_("\
       --strip-trailing-slashes  remove any trailing slashes from each SOURCE\n\
@@ -374,7 +377,7 @@ main (int argc, char **argv)
      we'll actually use backup_suffix_string.  */
   backup_suffix_string = getenv ("SIMPLE_BACKUP_SUFFIX");
 
-  while ((c = getopt_long (argc, argv, "bfit:uvS:T", long_options, NULL))
+  while ((c = getopt_long (argc, argv, "bfint:uvS:T", long_options, NULL))
 	 != -1)
     {
       switch (c)
@@ -396,6 +399,9 @@ main (int argc, char **argv)
 	  error (0, 0,
 		 _("the --reply option is deprecated; use -i or -f instead"));
 	  break;
+	case 'n':
+	  x.interactive = I_ALWAYS_NO;
+	  break;
 	case STRIP_TRAILING_SLASHES_OPTION:
 	  remove_trailing_slashes = true;
 	  break;
@@ -468,6 +474,13 @@ main (int argc, char **argv)
 	       quote (file[n_files - 1]));
     }
 
+  if (make_backups && x.interactive == I_ALWAYS_NO)
+    {
+      error (0, 0,
+	     _("options --backup and --no-clobber are mutually exclusive"));
+      usage (EXIT_FAILURE);
+    }
+
   if (backup_suffix_string)
     simple_backup_suffix = xstrdup (backup_suffix_string);
 
diff -ruNp coreutils-7.0.orig/tests/cp/cp-i coreutils-7.0/tests/cp/cp-i
--- coreutils-7.0.orig/tests/cp/cp-i	2008-09-27 19:28:54.000000000 +0200
+++ coreutils-7.0/tests/cp/cp-i	2009-01-28 16:42:37.092144811 +0100
@@ -31,4 +31,40 @@ fail=0
 # coreutils 6.2 cp would neglect to prompt in this case.
 echo n | cp -iR a b 2>/dev/null || fail=1
 
+# test miscellaneous combinations of -f -i -n parameters
+touch c d || framework_failure
+echo "\`c' -> \`d'" > out_copy
+> out_empty
+
+# ask for overwrite, answer no
+echo n | cp -vi  c d 2>/dev/null > out1 || fail=1
+compare out1 out_empty || fail=1
+
+# ask for overwrite, answer yes
+echo y | cp -vi  c d 2>/dev/null > out2 || fail=1
+compare out2 out_copy  || fail=1
+
+# -i wins over -n
+echo y | cp -vni c d 2>/dev/null > out3 || fail=1
+compare out3 out_copy  || fail=1
+
+# -n wins over -i
+echo y | cp -vin c d 2>/dev/null > out4 || fail=1
+compare out4 out_empty || fail=1
+
+# ask for overwrite, answer yes
+echo y | cp -vfi c d 2>/dev/null > out5 || fail=1
+compare out5 out_copy  || fail=1
+
+# do not ask, prevent from overwrite
+echo n | cp -vfn c d 2>/dev/null > out6 || fail=1
+compare out6 out_empty || fail=1
+
+# do not ask, prevent from overwrite
+echo n | cp -vnf c d 2>/dev/null > out7 || fail=1
+compare out7 out_empty || fail=1
+
+# options --backup and --no-clobber are mutually exclusive
+cp -bn c d 2>/dev/null && fail=1
+
 Exit $fail
diff -ruNp coreutils-7.0.orig/tests/Makefile.am coreutils-7.0/tests/Makefile.am
--- coreutils-7.0.orig/tests/Makefile.am	2008-09-27 19:28:54.000000000 +0200
+++ coreutils-7.0/tests/Makefile.am	2009-01-28 16:42:37.596148824 +0100
@@ -374,6 +374,7 @@ TESTS =						\
   mv/into-self-3				\
   mv/into-self-4				\
   mv/leak-fd					\
+  mv/mv-n					\
   mv/mv-special-1				\
   mv/no-target-dir				\
   mv/part-fail					\
diff -ruNp coreutils-7.0.orig/tests/mv/mv-n coreutils-7.0/tests/mv/mv-n
--- coreutils-7.0.orig/tests/mv/mv-n	1970-01-01 01:00:00.000000000 +0100
+++ coreutils-7.0/tests/mv/mv-n	2009-01-28 16:42:37.596148824 +0100
@@ -0,0 +1,62 @@
+#!/bin/sh
+# Test whether mv -n works as documented (not overwrite target).
+
+# Copyright (C) 2006-2008 Free Software Foundation, Inc.
+
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+if test "$VERBOSE" = yes; then
+  set -x
+  mv --version
+fi
+
+. $srcdir/test-lib.sh
+
+fail=0
+
+# test miscellaneous combinations of -f -i -n parameters
+touch a b || framework_failure
+echo "\`a' -> \`b'" > out_move
+> out_empty
+
+# ask for overwrite, answer no
+touch a b || framework_failure
+echo n | mv -vi a b 2>/dev/null > out1 || fail=1
+compare out1 out_empty || fail=1
+
+# ask for overwrite, answer yes
+touch a b || framework_failure
+echo y | mv -vi a b 2>/dev/null > out2 || fail=1
+compare out2 out_move || fail=1
+
+# -n wins (as the last option)
+touch a b || framework_failure
+echo y | mv -vin a b 2>/dev/null > out3 || fail=1
+compare out3 out_empty || fail=1
+
+# -n wins (as the last option)
+touch a b || framework_failure
+echo y | mv -vfn a b 2>/dev/null > out4 || fail=1
+compare out4 out_empty || fail=1
+
+# -n wins (as the last option)
+touch a b || framework_failure
+echo y | mv -vifn a b 2>/dev/null > out5 || fail=1
+compare out5 out_empty || fail=1
+
+# options --backup and --no-clobber are mutually exclusive
+touch a || framework_failure
+mv -bn a b 2>/dev/null && fail=1
+
+Exit $fail

coreutils-7.0-xattr.patch:

--- NEW FILE coreutils-7.0-xattr.patch ---
diff -ruNp coreutils-7.0.orig/doc/coreutils.texi coreutils-7.0/doc/coreutils.texi
--- coreutils-7.0.orig/doc/coreutils.texi	2009-01-28 17:10:24.453415000 +0100
+++ coreutils-7.0/doc/coreutils.texi	2009-01-28 17:12:04.986109287 +0100
@@ -7346,7 +7346,7 @@ symbolic links in the destination are al
 @itemx @w{@kbd{--preserve}[=@var{attribute_list}]}
 @opindex -p
 @opindex --preserve
- at cindex file information, preserving
+ at cindex file information, preserving, extended attributes, xattr
 Preserve the specified attributes of the original files.
 If specified, the @var{attribute_list} must be a comma-separated list
 of one or more of the following strings:
@@ -7373,6 +7373,11 @@ Preserve in the destination files
 any links between corresponding source files.
 @c Give examples illustrating how hard links are preserved.
 @c Also, show how soft links map to hard links with -L and -H.
+ at itemx xattr
+Preserve extended attributes if @command{cp} is built with xattr support,
+and xattrs are supported and enabled on your file system. If SELinux context
+and/or ACLs are implemented using xattrs, they are preserved as well by this
+option.
 @itemx all
 Preserve all file attributes.
 Equivalent to specifying all of the above.
@@ -7912,6 +7917,9 @@ attributes of destination files.  It is 
 copy programs into their destination directories.  It refuses to copy
 files onto themselves.
 
+ at cindex extended attributes, xattr
+ at command{install} never preserves extended attributes (xattr).
+
 The program accepts the following options.  Also see @ref{Common options}.
 
 @table @samp
@@ -8060,6 +8068,9 @@ directory succeeded, but the second didn
 the destination partition and the second and third would be left on the
 original partition.
 
+ at cindex extended attributes, xattr
+ at command{mv} always tries to copy extended attributes (xattr).
+
 @cindex prompting, and @command{mv}
 If a destination file exists but is normally unwritable, standard input
 is a terminal, and the @option{-f} or @option{--force} option is not given,
diff -ruNp coreutils-7.0.orig/m4/prereq.m4 coreutils-7.0/m4/prereq.m4
--- coreutils-7.0.orig/m4/prereq.m4	2008-06-21 19:04:15.000000000 +0200
+++ coreutils-7.0/m4/prereq.m4	2009-01-28 17:12:04.987109294 +0100
@@ -38,6 +38,7 @@ AC_DEFUN([gl_PREREQ],
   # handles that; see ../bootstrap.conf.
   AC_REQUIRE([gl_EUIDACCESS_STAT])
   AC_REQUIRE([gl_FD_REOPEN])
+  AC_REQUIRE([gl_FUNC_XATTR])
   AC_REQUIRE([gl_FUNC_XFTS])
   AC_REQUIRE([gl_MEMXFRM])
   AC_REQUIRE([gl_STRINTCMP])
diff -ruNp coreutils-7.0.orig/m4/xattr.m4 coreutils-7.0/m4/xattr.m4
--- coreutils-7.0.orig/m4/xattr.m4	1970-01-01 01:00:00.000000000 +0100
+++ coreutils-7.0/m4/xattr.m4	2009-01-28 17:12:04.988109301 +0100
@@ -0,0 +1,36 @@
+# xattr.m4 - check for Extended Attributes (Linux)
+
+# Copyright (C) 2003, 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.
+
+# Originally written by Andreas Gruenbacher.
+# http://www.suse.de/~agruen/coreutils/5.91/coreutils-xattr.diff
+
+AC_DEFUN([gl_FUNC_XATTR],
+[
+  AC_ARG_ENABLE([xattr],
+	AC_HELP_STRING([--disable-xattr],
+		       [do not support extended attributes]),
+	[use_xattr=$enableval], [use_xattr=yes])
+
+  if test "$use_xattr" = "yes"; then
+    AC_CHECK_HEADERS([attr/error_context.h attr/libattr.h])
+    if test $ac_cv_header_attr_libattr_h = yes \
+       && test $ac_cv_header_attr_error_context_h = yes; then
+      use_xattr=1
+    else
+      use_xattr=0
+    fi
+    AC_DEFINE_UNQUOTED([USE_XATTR], [$use_xattr],
+		       [Define if you want extended attribute support.])
+    xattr_saved_LIBS=$LIBS
+    AC_SEARCH_LIBS([attr_copy_file], [attr],
+		   [test "$ac_cv_search_attr_copy_file" = "none required" ||
+		      LIB_XATTR=$ac_cv_search_attr_copy_file])
+    AC_CHECK_FUNCS([attr_copy_file])
+    LIBS=$xattr_saved_LIBS
+    AC_SUBST([LIB_XATTR])
+  fi
+])
diff -ruNp coreutils-7.0.orig/src/copy.c coreutils-7.0/src/copy.c
--- coreutils-7.0.orig/src/copy.c	2008-08-24 22:30:10.000000000 +0200
+++ coreutils-7.0/src/copy.c	2009-01-28 17:12:04.990109315 +0100
@@ -55,6 +55,13 @@
 #include "areadlink.h"
 #include "yesno.h"
 
+#if USE_XATTR
+# include <attr/error_context.h>
+# include <attr/libattr.h>
+# include <stdarg.h>
+# include "verror.h"
+#endif
+
 #ifndef HAVE_FCHOWN
 # define HAVE_FCHOWN false
 # define fchown(fd, uid, gid) (-1)
@@ -124,6 +131,70 @@ is_ancestor (const struct stat *sb, cons
   return false;
 }
 
+#if USE_XATTR
+static void
+copy_attr_error (struct error_context *ctx, char const *fmt, ...)
+{
+  int err = errno;
+  va_list ap;
+
+  /* use verror module to print error message */
+  va_start (ap, fmt);
+  verror (0, err, fmt, ap);
+  va_end (ap);
+}
+
+static char const *
+copy_attr_quote (struct error_context *ctx, char const *str)
+{
+  return quote (str);
+}
+
+static void
+copy_attr_free (struct error_context *ctx, char const *str)
+{
+}
+
+static bool
+copy_attr_by_fd (char const *src_path, int src_fd,
+		 char const *dst_path, int dst_fd)
+{
+  struct error_context ctx =
+  {
+    .error = copy_attr_error,
+    .quote = copy_attr_quote,
+    .quote_free = copy_attr_free
+  };
+  return 0 == attr_copy_fd (src_path, src_fd, dst_path, dst_fd, 0, &ctx);
+}
+
+static bool
+copy_attr_by_name (char const *src_path, char const *dst_path)
+{
+  struct error_context ctx =
+  {
+    .error = copy_attr_error,
+    .quote = copy_attr_quote,
+    .quote_free = copy_attr_free
+  };
+  return 0 == attr_copy_file (src_path, dst_path, 0, &ctx);
+}
+#else /* USE_XATTR */
+
+static bool
+copy_attr_by_fd (char const *src_path, int src_fd,
+		 char const *dst_path, int dst_fd)
+{
+  return true;
+}
+
+static bool
+copy_attr_by_name (char const *src_path, char const *dst_path)
+{
+  return true;
+}
+#endif /* USE_XATTR */
+
 /* Read the contents of the directory SRC_NAME_IN, and recursively
    copy the contents to DST_NAME_IN.  NEW_DST is true if
    DST_NAME_IN is a directory that was created previously in the
@@ -682,6 +753,11 @@ copy_reg (char const *src_name, char con
 
   set_author (dst_name, dest_desc, src_sb);
 
+  if (x->preserve_xattr && ! copy_attr_by_fd (src_name, source_desc,
+					      dst_name, dest_desc)
+      && x->require_preserve_xattr)
+    return false;
+
   if (x->preserve_mode || x->move_mode)
     {
       if (copy_acl (src_name, source_desc, dst_name, dest_desc, src_mode) != 0
@@ -1980,6 +2056,10 @@ copy_internal (char const *src_name, cha
 
   set_author (dst_name, -1, &src_sb);
 
+  if (x->preserve_xattr && ! copy_attr_by_name (src_name, dst_name)
+      && x->require_preserve_xattr)
+    return false;
+
   if (x->preserve_mode || x->move_mode)
     {
       if (copy_acl (src_name, -1, dst_name, -1, src_mode) != 0
diff -ruNp coreutils-7.0.orig/src/copy.h coreutils-7.0/src/copy.h
--- coreutils-7.0.orig/src/copy.h	2008-06-21 17:20:29.000000000 +0200
+++ coreutils-7.0/src/copy.h	2009-01-28 17:12:04.991109322 +0100
@@ -174,6 +174,19 @@ struct cp_options
      fail if it is unable to do so.  */
   bool require_preserve_context;
 
+  /* If true, attempt to preserve extended attributes using libattr.
+     Ignored if coreutils are compiled without xattr support. */
+  bool preserve_xattr;
+
+  /* Useful only when preserve_xattr is true.
+     If true, a failed attempt to preserve file's extended attributes
+     propagates failure "out" to the caller.  If false, a failure to
+     preserve file's extended attributes does not change the invoking
+     application's exit status.  Give diagnostics for failed syscalls
+     regardless of this setting.  For example, with "cp --preserve=xattr"
+     this flag is "true", while with "cp --preserve=all", it is false. */
+  bool require_preserve_xattr;
+
   /* If true, copy directories recursively and copy special files
      as themselves rather than copying their contents. */
   bool recursive;
diff -ruNp coreutils-7.0.orig/src/cp.c coreutils-7.0/src/cp.c
--- coreutils-7.0.orig/src/cp.c	2009-01-28 17:10:24.455415000 +0100
+++ coreutils-7.0/src/cp.c	2009-01-28 17:12:04.992109329 +0100
@@ -202,7 +202,8 @@ Mandatory arguments to long options are 
   -p                           same as --preserve=mode,ownership,timestamps\n\
       --preserve[=ATTR_LIST]   preserve the specified attributes (default:\n\
                                  mode,ownership,timestamps), if possible\n\
-                                 additional attributes: context, links, all\n\
+                                 additional attributes: context, links, xattr,\n\
+                                 all\n\
 "), stdout);
       fputs (_("\
       --no-preserve=ATTR_LIST  don't preserve the specified attributes\n\
@@ -779,6 +780,8 @@ cp_option_init (struct cp_options *x)
   x->preserve_timestamps = false;
   x->preserve_security_context = false;
   x->require_preserve_context = false;
+  x->preserve_xattr = false;
+  x->require_preserve_xattr = false;
 
   x->require_preserve = false;
   x->recursive = false;
@@ -815,18 +818,20 @@ decode_preserve_arg (char const *arg, st
       PRESERVE_OWNERSHIP,
       PRESERVE_LINK,
       PRESERVE_CONTEXT,
+      PRESERVE_XATTR,
       PRESERVE_ALL
     };
   static enum File_attribute const preserve_vals[] =
     {
       PRESERVE_MODE, PRESERVE_TIMESTAMPS,
-      PRESERVE_OWNERSHIP, PRESERVE_LINK, PRESERVE_CONTEXT, PRESERVE_ALL
+      PRESERVE_OWNERSHIP, PRESERVE_LINK, PRESERVE_CONTEXT, PRESERVE_XATTR,
+      PRESERVE_ALL
     };
   /* Valid arguments to the `--preserve' option. */
   static char const* const preserve_args[] =
     {
       "mode", "timestamps",
-      "ownership", "links", "context", "all", NULL
+      "ownership", "links", "context", "xattr", "all", NULL
     };
   ARGMATCH_VERIFY (preserve_args, preserve_vals);
 
@@ -867,6 +872,11 @@ decode_preserve_arg (char const *arg, st
 	  x->require_preserve_context = on_off;
 	  break;
 
+	case PRESERVE_XATTR:
+	  x->preserve_xattr = on_off;
+	  x->require_preserve_xattr = on_off;
+	  break;
+
 	case PRESERVE_ALL:
 	  x->preserve_mode = on_off;
 	  x->preserve_timestamps = on_off;
@@ -874,6 +884,7 @@ decode_preserve_arg (char const *arg, st
 	  x->preserve_links = on_off;
 	  if (selinux_enabled)
 	    x->preserve_security_context = on_off;
+	  x->preserve_xattr = on_off;
 	  break;
 
 	default:
@@ -1121,6 +1132,12 @@ main (int argc, char **argv)
 		 "without an SELinux-enabled kernel"));
     }
 
+#if !USE_XATTR
+  if (x.require_preserve_xattr)
+    error (EXIT_FAILURE, 0, _("cannot preserve extended attributes, cp is "
+			      "built without xattr support"));
+#endif
+
   /* Allocate space for remembering copied and created files.  */
 
   hash_init ();
diff -ruNp coreutils-7.0.orig/src/install.c coreutils-7.0/src/install.c
--- coreutils-7.0.orig/src/install.c	2008-09-27 19:28:41.000000000 +0200
+++ coreutils-7.0/src/install.c	2009-01-28 17:12:04.993109336 +0100
@@ -200,6 +200,7 @@ cp_option_init (struct cp_options *x)
   x->open_dangling_dest_symlink = false;
   x->update = false;
   x->preserve_security_context = false;
+  x->preserve_xattr = false;
   x->verbose = false;
   x->dest_info = NULL;
   x->src_info = NULL;
diff -ruNp coreutils-7.0.orig/src/Makefile.am coreutils-7.0/src/Makefile.am
--- coreutils-7.0.orig/src/Makefile.am	2008-09-27 19:28:54.000000000 +0200
+++ coreutils-7.0/src/Makefile.am	2009-01-28 17:15:23.106476067 +0100
@@ -149,9 +149,9 @@ su_LDADD = $(LDADD) $(LIB_CRYPT)
 dir_LDADD += $(LIB_ACL)
 ls_LDADD += $(LIB_ACL)
 vdir_LDADD += $(LIB_ACL)
-cp_LDADD += $(LIB_ACL)
-mv_LDADD += $(LIB_ACL)
-ginstall_LDADD += $(LIB_ACL)
+cp_LDADD += $(LIB_ACL) $(LIB_XATTR)
+mv_LDADD += $(LIB_ACL) $(LIB_XATTR)
+ginstall_LDADD += $(LIB_ACL) $(LIB_XATTR)
 
 stat_LDADD = $(LDADD) $(LIB_SELINUX)
 
@@ -226,7 +226,7 @@ uninstall-local:
 	  fi; \
 	fi
 
-copy_sources = copy.c cp-hash.c
+copy_sources = copy.c cp-hash.c verror.c xvasprintf.c
 
 # Use `ginstall' in the definition of PROGRAMS and in dependencies to avoid
 # confusion with the `install' target.  The install rule transforms `ginstall'
diff -ruNp coreutils-7.0.orig/src/mv.c coreutils-7.0/src/mv.c
--- coreutils-7.0.orig/src/mv.c	2009-01-28 17:10:24.456415000 +0100
+++ coreutils-7.0/src/mv.c	2009-01-28 17:12:04.994109343 +0100
@@ -140,6 +140,7 @@ cp_option_init (struct cp_options *x)
   x->preserve_security_context = selinux_enabled;
   x->require_preserve = false;  /* FIXME: maybe make this an option */
   x->require_preserve_context = false;
+  x->preserve_xattr = true;
   x->recursive = true;
   x->sparse_mode = SPARSE_AUTO;  /* FIXME: maybe make this an option */
   x->symbolic_link = false;
diff -ruNp coreutils-7.0.orig/tests/Makefile.am coreutils-7.0/tests/Makefile.am
--- coreutils-7.0.orig/tests/Makefile.am	2009-01-28 17:10:24.457415000 +0100
+++ coreutils-7.0/tests/Makefile.am	2009-01-28 17:12:04.994109343 +0100
@@ -230,6 +230,7 @@ TESTS =						\
   misc/tty-eof					\
   misc/unexpand					\
   misc/uniq					\
+  misc/xattr					\
   chmod/c-option				\
   chmod/equal-x					\
   chmod/equals					\
diff -ruNp coreutils-7.0.orig/tests/misc/xattr coreutils-7.0/tests/misc/xattr
--- coreutils-7.0.orig/tests/misc/xattr	1970-01-01 01:00:00.000000000 +0100
+++ coreutils-7.0/tests/misc/xattr	2009-01-28 17:12:04.995109350 +0100
@@ -0,0 +1,111 @@
+#!/bin/sh
+# Ensure that cp --preserve=xattr and mv preserve extended attributes and
+# install does not preserve extended attributes.
+
+# Copyright (C) 2009 Free Software Foundation, Inc.
+
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+if test "$VERBOSE" = yes; then
+  set -x
+  cp --version
+  mv --version
+  ginstall --version
+fi
+
+. $srcdir/test-lib.sh
+
+# Skip this test if cp was built without xattr support:
+touch src dest || framework_failure
+cp --preserve=xattr -n src dest 2>/dev/null \
+  || skip_test_ "coreutils built without xattr support"
+
+# this code was taken from test mv/backup-is-src
+cleanup_() { rm -rf "$other_partition_tmpdir"; }
+. "$abs_srcdir/other-fs-tmpdir"
+b_other="$other_partition_tmpdir/b"
+rm -f $b_other || framework_failure
+
+# testing xattr name-value pair
+xattr_name="user.foo"
+xattr_value="bar"
+xattr_pair="$xattr_name=\"$xattr_value\""
+
+# create new file and check its xattrs
+touch a || framework_failure
+getfattr -d a >out_a || skip_test_ "failed to get xattr of file"
+grep -F "$xattr_pair" out_a >/dev/null && framework_failure
+
+# try to set user xattr on file
+setfattr -n "$xattr_name" -v "$xattr_value" a >out_a \
+  || skip_test_ "failed to set xattr of file"
+getfattr -d a >out_a || skip_test_ "failed to get xattr of file"
+grep -F "$xattr_pair" out_a >/dev/null \
+  || skip_test_ "failed to set xattr of file"
+
+fail=0
+
+# cp should not preserve xattr by default
+cp a b || fail=1
+getfattr -d b >out_b || skip_test_ "failed to get xattr of file"
+grep -F "$xattr_pair" out_b >/dev/null && fail=1
+
+# test if --preserve=xattr option works
+cp --preserve=xattr a b || fail=1
+getfattr -d b >out_b || skip_test_ "failed to get xattr of file"
+grep -F "$xattr_pair" out_b >/dev/null || fail=1
+
+rm b || framework_failure
+
+# install should never preserve xattr
+ginstall a b || fail=1
+getfattr -d b >out_b || skip_test_ "failed to get xattr of file"
+grep -F "$xattr_pair" out_b >/dev/null && fail=1
+
+# mv should preserve xattr when renaming within a filesystem.
+# This is implicitly done by rename () and doesn't need explicit
+# xattr support in mv.
+mv a b || fail=1
+getfattr -d b >out_b || skip_test_ "failed to get xattr of file"
+grep -F "$xattr_pair" out_b >/dev/null || cat >&2 <<EOF
+=================================================================
+$0: WARNING!!!
+rename () does not preserve extended attributes
+=================================================================
+EOF
+
+# try to set user xattr on file on other partition
+test_mv=1
+touch $b_other || framework_failure
+setfattr -n "$xattr_name" -v "$xattr_value" $b_other >out_a 2>/dev/null \
+  || test_mv=0
+getfattr -d $b_other >out_b 2>/dev/null || test_mv=0
+grep -F "$xattr_pair" out_b >/dev/null || test_mv=0
+rm -f $b_other || framework_failure
+
+if test $test_mv -eq 1; then
+  # mv should preserve xattr when copying content from one partition to another
+  mv b $b_other || fail=1
+  getfattr -d $b_other >out_b 2>/dev/null || skip_test_ "failed to get xattr of file"
+  grep -F "$xattr_pair" out_b >/dev/null || fail=1
+else
+  cat >&2 <<EOF
+=================================================================
+$0: WARNING!!!
+failed to set xattr of file $b_other
+=================================================================
+EOF
+fi
+
+Exit $fail
diff -ruNp coreutils-7.0.orig/src/verror.c coreutils-7.0/src/verror.c
--- coreutils-7.0.orig/src/verror.c	1970-01-01 01:00:00.000000000 +0100
+++ coreutils-7.0/src/verror.c	2009-01-28 17:14:58.399305619 +0100
@@ -0,0 +1,77 @@
+/* va_list error handler for noninteractive utilities
+   Copyright (C) 2006-2007 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+/* Written by Eric Blake.  */
+
+#include <config.h>
+
+#include "verror.h"
+#include "xvasprintf.h"
+
+#include <errno.h>
+#include <stdarg.h>
+#include <stdlib.h>
+
+#if ENABLE_NLS
+# include "gettext.h"
+# define _(msgid) gettext (msgid)
+#endif
+
+#ifndef _
+# define _(String) String
+#endif
+
+/* Print a message with `vfprintf (stderr, FORMAT, ARGS)';
+   if ERRNUM is nonzero, follow it with ": " and strerror (ERRNUM).
+   If STATUS is nonzero, terminate the program with `exit (STATUS)'.
+   Use the globals error_print_progname and error_message_count similarly
+   to error().  */
+void
+verror (int status, int errnum, const char *format, va_list args)
+{
+  verror_at_line (status, errnum, NULL, 0, format, args);
+}
+
+/* Print a message with `vfprintf (stderr, FORMAT, ARGS)';
+   if ERRNUM is nonzero, follow it with ": " and strerror (ERRNUM).
+   If STATUS is nonzero, terminate the program with `exit (STATUS)'.
+   If FNAME is not NULL, prepend the message with `FNAME:LINENO:'.
+   Use the globals error_print_progname, error_message_count, and
+   error_one_per_line similarly to error_at_line().  */
+void
+verror_at_line (int status, int errnum, const char *file,
+                unsigned int line_number, const char *format, va_list args)
+{
+  char *message = xvasprintf (format, args);
+  if (message)
+    {
+      /* Until http://sourceware.org/bugzilla/show_bug.cgi?id=2997 is fixed,
+	 glibc violates GNU Coding Standards when the file argument to
+	 error_at_line is NULL.  */
+      if (file)
+        error_at_line (status, errnum, file, line_number, "%s", message);
+      else
+        error (status, errnum, "%s", message);
+    }
+  else
+    {
+      /* EOVERFLOW, EINVAL, and EILSEQ from xvasprintf are signs of
+         serious programmer errors.  */
+      error (0, errno, _("unable to display error message"));
+      abort ();
+    }
+  free (message);
+}
diff -ruNp coreutils-7.0.orig/src/verror.h coreutils-7.0/src/verror.h
--- coreutils-7.0.orig/src/verror.h	1970-01-01 01:00:00.000000000 +0100
+++ coreutils-7.0/src/verror.h	2009-01-28 17:14:54.039275540 +0100
@@ -0,0 +1,53 @@
+/* Declaration for va_list error-reporting function
+   Copyright (C) 2006-2007 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#ifndef _VERROR_H
+#define _VERROR_H 1
+
+#include "error.h"
+#include <stdarg.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Print a message with `vfprintf (stderr, FORMAT, ARGS)';
+   if ERRNUM is nonzero, follow it with ": " and strerror (ERRNUM).
+   If STATUS is nonzero, terminate the program with `exit (STATUS)'.
+   Use the globals error_print_progname and error_message_count similarly
+   to error().  */
+
+extern void verror (int __status, int __errnum, const char *__format,
+                    va_list __args)
+     __attribute__ ((__format__ (__printf__, 3, 0)));
+
+/* Print a message with `vfprintf (stderr, FORMAT, ARGS)';
+   if ERRNUM is nonzero, follow it with ": " and strerror (ERRNUM).
+   If STATUS is nonzero, terminate the program with `exit (STATUS)'.
+   If FNAME is not NULL, prepend the message with `FNAME:LINENO:'.
+   Use the globals error_print_progname, error_message_count, and
+   error_one_per_line similarly to error_at_line().  */
+
+extern void verror_at_line (int __status, int __errnum, const char *__fname,
+                            unsigned int __lineno, const char *__format,
+                            va_list __args)
+     __attribute__ ((__format__ (__printf__, 5, 0)));
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* verror.h */
diff -ruNp coreutils-7.0.orig/src/xvasprintf.c coreutils-7.0/src/xvasprintf.c
--- coreutils-7.0.orig/src/xvasprintf.c	1970-01-01 01:00:00.000000000 +0100
+++ coreutils-7.0/src/xvasprintf.c	2009-01-28 17:15:06.809363638 +0100
@@ -0,0 +1,110 @@
+/* vasprintf and asprintf with out-of-memory checking.
+   Copyright (C) 1999, 2002-2004, 2006-2008 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#include <config.h>
+
+/* Specification.  */
+#include "xvasprintf.h"
+
+#include <errno.h>
+#include <limits.h>
+#include <string.h>
+#include <stdio.h>
+
+#include "xalloc.h"
+
+/* Checked size_t computations.  */
+#include "xsize.h"
+
+static inline char *
+xstrcat (size_t argcount, va_list args)
+{
+  char *result;
+  va_list ap;
+  size_t totalsize;
+  size_t i;
+  char *p;
+
+  /* Determine the total size.  */
+  totalsize = 0;
+  va_copy (ap, args);
+  for (i = argcount; i > 0; i--)
+    {
+      const char *next = va_arg (ap, const char *);
+      totalsize = xsum (totalsize, strlen (next));
+    }
+  va_end (ap);
+
+  /* Test for overflow in the summing pass above or in (totalsize + 1) below.
+     Also, don't return a string longer than INT_MAX, for consistency with
+     vasprintf().  */
+  if (totalsize == SIZE_MAX || totalsize > INT_MAX)
+    {
+      errno = EOVERFLOW;
+      return NULL;
+    }
+
+  /* Allocate and fill the result string.  */
+  result = XNMALLOC (totalsize + 1, char);
+  p = result;
+  for (i = argcount; i > 0; i--)
+    {
+      const char *next = va_arg (args, const char *);
+      size_t len = strlen (next);
+      memcpy (p, next, len);
+      p += len;
+    }
+  *p = '\0';
+
+  return result;
+}
+
+char *
+xvasprintf (const char *format, va_list args)
+{
+  char *result;
+
+  /* Recognize the special case format = "%s...%s".  It is a frequently used
+     idiom for string concatenation and needs to be fast.  We don't want to
+     have a separate function xstrcat() for this purpose.  */
+  {
+    size_t argcount = 0;
+    const char *f;
+
+    for (f = format;;)
+      {
+	if (*f == '\0')
+	  /* Recognized the special case of string concatenation.  */
+	  return xstrcat (argcount, args);
+	if (*f != '%')
+	  break;
+	f++;
+	if (*f != 's')
+	  break;
+	f++;
+	argcount++;
+      }
+  }
+
+  if (vasprintf (&result, format, args) < 0)
+    {
+      if (errno == ENOMEM)
+	xalloc_die ();
+      return NULL;
+    }
+
+  return result;
+}
diff -ruNp coreutils-7.0.orig/src/xvasprintf.h coreutils-7.0/src/xvasprintf.h
--- coreutils-7.0.orig/src/xvasprintf.h	1970-01-01 01:00:00.000000000 +0100
+++ coreutils-7.0/src/xvasprintf.h	2009-01-28 17:15:06.809363638 +0100
@@ -0,0 +1,56 @@
+/* vasprintf and asprintf with out-of-memory checking.
+   Copyright (C) 2002-2004, 2006-2008 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#ifndef _XVASPRINTF_H
+#define _XVASPRINTF_H
+
+/* Get va_list.  */
+#include <stdarg.h>
+
+#ifndef __attribute__
+/* This feature is available in gcc versions 2.5 and later.  */
+# if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 5)
+#  define __attribute__(Spec) /* empty */
+# endif
+/* The __-protected variants of `format' and `printf' attributes
+   are accepted by gcc versions 2.6.4 (effectively 2.7) and later.  */
+# if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 7)
+#  define __format__ format
+#  define __printf__ printf
+# endif
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Write formatted output to a string dynamically allocated with malloc(),
+   and return it.  Upon [ENOMEM] memory allocation error, call xalloc_die.
+   On some other error
+     - [EOVERFLOW] resulting string length is > INT_MAX,
+     - [EINVAL] invalid format string,
+     - [EILSEQ] error during conversion between wide and multibyte characters,
+   return NULL.  */
+extern char *xasprintf (const char *format, ...)
+       __attribute__ ((__format__ (__printf__, 1, 2)));
+extern char *xvasprintf (const char *format, va_list args)
+       __attribute__ ((__format__ (__printf__, 1, 0)));
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* _XVASPRINTF_H */

coreutils-5.2.1-runuser.patch:

Index: coreutils-5.2.1-runuser.patch
===================================================================
RCS file: /cvs/extras/rpms/coreutils/devel/coreutils-5.2.1-runuser.patch,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- coreutils-5.2.1-runuser.patch	11 Nov 2008 16:03:47 -0000	1.22
+++ coreutils-5.2.1-runuser.patch	28 Jan 2009 17:29:41 -0000	1.23
@@ -1,6 +1,6 @@
-diff -urNp coreutils-6.12-orig/AUTHORS coreutils-6.12/AUTHORS
---- coreutils-6.12-orig/AUTHORS	2008-10-21 14:58:31.000000000 +0200
-+++ coreutils-6.12/AUTHORS	2008-10-21 15:00:05.000000000 +0200
+diff -urNp coreutils-7.0.orig/AUTHORS coreutils-7.0/AUTHORS
+--- coreutils-7.0.orig/AUTHORS	2008-08-24 22:58:15.000000000 +0200
++++ coreutils-7.0/AUTHORS	2009-01-28 18:11:00.316247411 +0100
 @@ -63,6 +63,7 @@ pwd: Jim Meyering
  readlink: Dmitry V. Levin
  rm: Paul Rubin, David MacKenzie, Richard M. Stallman, Jim Meyering
@@ -9,9 +9,9 @@
  runcon: Russell Coker
  seq: Ulrich Drepper
  sha1sum: Ulrich Drepper, Scott Miller, David Madore
-diff -urNp coreutils-6.12-orig/man/Makefile.am coreutils-6.12/man/Makefile.am
---- coreutils-6.12-orig/man/Makefile.am	2008-05-06 11:28:24.000000000 +0200
-+++ coreutils-6.12/man/Makefile.am	2008-10-21 15:00:13.000000000 +0200
+diff -urNp coreutils-7.0.orig/man/Makefile.am coreutils-7.0/man/Makefile.am
+--- coreutils-7.0.orig/man/Makefile.am	2008-09-27 19:28:54.000000000 +0200
++++ coreutils-7.0/man/Makefile.am	2009-01-28 18:11:00.317247417 +0100
 @@ -93,6 +93,7 @@ readlink.1:	$(common_dep)	$(srcdir)/read
  rm.1:		$(common_dep)	$(srcdir)/rm.x		../src/rm.c
  rmdir.1:	$(common_dep)	$(srcdir)/rmdir.x	../src/rmdir.c
@@ -20,9 +20,25 @@
  seq.1:		$(common_dep)	$(srcdir)/seq.x		../src/seq.c
  sha1sum.1:	$(common_dep)	$(srcdir)/sha1sum.x	../src/md5sum.c
  sha224sum.1:	$(common_dep)	$(srcdir)/sha224sum.x	../src/md5sum.c
-diff -urNp coreutils-6.12-orig/README coreutils-6.12/README
---- coreutils-6.12-orig/README	2008-05-15 20:44:37.000000000 +0200
-+++ coreutils-6.12/README	2008-10-21 14:59:29.000000000 +0200
+diff -urNp coreutils-7.0.orig/man/runuser.x coreutils-7.0/man/runuser.x
+--- coreutils-7.0.orig/man/runuser.x	1970-01-01 01:00:00.000000000 +0100
++++ coreutils-7.0/man/runuser.x	2009-01-28 18:11:00.321247443 +0100
+@@ -0,0 +1,12 @@
++[NAME]
++runuser \- run a shell with substitute user and group IDs
++[DESCRIPTION]
++.\" Add any additional description here
++[SEE ALSO]
++.TP
++More detailed Texinfo documentation could be found by command
++.TP
++\t\fBinfo su invocation\fR\t
++.TP
++since the command \fBrunuser\fR is trimmed down version of command \fBrunuser\fR.
++.br
+diff -urNp coreutils-7.0.orig/README coreutils-7.0/README
+--- coreutils-7.0.orig/README	2008-08-24 22:30:10.000000000 +0200
++++ coreutils-7.0/README	2009-01-28 18:11:00.318247424 +0100
 @@ -12,10 +12,10 @@ The programs that can be built with this
    factor false fmt fold groups head hostid hostname id install join kill
    link ln logname ls md5sum mkdir mkfifo mknod mktemp mv nice nl nohup
@@ -38,9 +54,9 @@
  
  See the file NEWS for a list of major changes in the current release.
  
-diff -urNp coreutils-6.12-orig/src/Makefile.am coreutils-6.12/src/Makefile.am
---- coreutils-6.12-orig/src/Makefile.am	2008-10-21 14:58:31.000000000 +0200
-+++ coreutils-6.12/src/Makefile.am	2008-10-21 14:59:58.000000000 +0200
+diff -urNp coreutils-7.0.orig/src/Makefile.am coreutils-7.0/src/Makefile.am
+--- coreutils-7.0.orig/src/Makefile.am	2009-01-28 18:10:10.756926000 +0100
++++ coreutils-7.0/src/Makefile.am	2009-01-28 18:11:59.658631933 +0100
 @@ -38,7 +38,7 @@ EXTRA_PROGRAMS = \
    shuf sort split sum tac tail tr tsort unexpand uniq wc \
    basename date dirname echo env expr factor false \
@@ -50,9 +66,9 @@
    test timeout true truncate tty whoami yes \
    base64
  
-@@ -142,6 +142,10 @@ cp_LDADD += $(LIB_ACL)
- mv_LDADD += $(LIB_ACL)
- ginstall_LDADD += $(LIB_ACL)
+@@ -154,6 +154,10 @@ cp_LDADD += $(LIB_ACL) $(LIB_XATTR)
+ mv_LDADD += $(LIB_ACL) $(LIB_XATTR)
+ ginstall_LDADD += $(LIB_ACL) $(LIB_XATTR)
  
 +runuser_SOURCES = su.c
 +runuser_CFLAGS = -DRUNUSER -DAUTHORS="\"David MacKenzie, Dan Walsh\""
@@ -61,7 +77,7 @@
  stat_LDADD = $(LDADD) $(LIB_SELINUX)
  
  # Append $(LIBICONV) to each program that uses proper_name_utf8.
-@@ -159,7 +163,7 @@ RELEASE_YEAR = \
+@@ -173,7 +177,7 @@ RELEASE_YEAR = \
    `sed -n '/.*COPYRIGHT_YEAR = \([0-9][0-9][0-9][0-9]\) };/s//\1/p' \
      $(top_srcdir)/lib/version-etc.c`
  
@@ -70,9 +86,9 @@
  
  installed_su = $(DESTDIR)$(bindir)/`echo su|sed '$(transform)'`
  
-diff -urNp coreutils-6.12-orig/src/su.c coreutils-6.12/src/su.c
---- coreutils-6.12-orig/src/su.c	2008-10-21 14:58:31.000000000 +0200
-+++ coreutils-6.12/src/su.c	2008-10-21 15:07:05.000000000 +0200
+diff -urNp coreutils-7.0.orig/src/su.c coreutils-7.0/src/su.c
+--- coreutils-7.0.orig/src/su.c	2009-01-28 18:10:10.801926000 +0100
++++ coreutils-7.0/src/su.c	2009-01-28 18:11:00.320247437 +0100
 @@ -109,9 +109,15 @@
  #include "error.h"
  
@@ -113,7 +129,7 @@
  #ifdef USE_PAM
  	;
  #else
-@@ -186,6 +200,10 @@ static struct option const longopts[] =
+@@ -183,6 +197,10 @@ static struct option const longopts[] =
    {"login", no_argument, NULL, 'l'},
    {"preserve-environment", no_argument, NULL, 'p'},
    {"shell", required_argument, NULL, 's'},
@@ -124,7 +140,7 @@
    {GETOPT_HELP_OPTION_DECL},
    {GETOPT_VERSION_OPTION_DECL},
    {NULL, 0, NULL, 0}
-@@ -287,10 +305,12 @@ correct_password (const struct passwd *p
+@@ -284,10 +302,12 @@ correct_password (const struct passwd *p
    retval = pam_start(PROGRAM_NAME, pw->pw_name, &conv, &pamh);
    PAM_BAIL_P;
  
@@ -137,7 +153,7 @@
  
    caller = getpwuid(getuid());
    if(caller != NULL && caller->pw_name != NULL) {
-@@ -307,6 +327,11 @@ correct_password (const struct passwd *p
+@@ -304,6 +324,11 @@ correct_password (const struct passwd *p
      retval = pam_set_item(pamh, PAM_TTY, tty_name);
      PAM_BAIL_P;
    }
@@ -149,7 +165,7 @@
    retval = pam_authenticate(pamh, 0);
    PAM_BAIL_P;
    retval = pam_acct_mgmt(pamh, 0);
-@@ -316,6 +341,7 @@ correct_password (const struct passwd *p
+@@ -313,6 +338,7 @@ correct_password (const struct passwd *p
      PAM_BAIL_P;
    }
    PAM_BAIL_P;
@@ -157,7 +173,7 @@
    /* must be authenticated if this point was reached */
    return 1;
  #else /* !USE_PAM */
-@@ -397,11 +423,22 @@ modify_environment (const struct passwd 
+@@ -394,11 +420,22 @@ modify_environment (const struct passwd 
  /* Become the user and group(s) specified by PW.  */
  
  static void
@@ -182,7 +198,7 @@
  #ifdef USE_PAM
      pam_close_session(pamh, 0);
      pam_end(pamh, PAM_ABORT);
-@@ -448,7 +485,11 @@ pam_copyenv (pam_handle_t *pamh)
+@@ -445,7 +482,11 @@ pam_copyenv (pam_handle_t *pamh)
  
  static void
  run_shell (char const *shell, char const *command, char **additional_args,
@@ -195,7 +211,7 @@
  {
    size_t n_args = 1 + fast_startup + 2 * !!command + n_additional_args + 1;
    char const **args = xnmalloc (n_args, sizeof *args);
-@@ -479,7 +520,11 @@ run_shell (char const *shell, char const
+@@ -476,7 +517,11 @@ run_shell (char const *shell, char const
  
    child = fork();
    if (child == 0) {  /* child shell */
@@ -208,7 +224,7 @@
    pam_end(pamh, 0);
    if (!same_session)
      setsid ();
-@@ -623,6 +668,26 @@ usage (int status)
+@@ -620,6 +665,26 @@ usage (int status)
    else
      {
        printf (_("Usage: %s [OPTION]... [-] [USER [ARG]...]\n"), program_name);
@@ -235,7 +251,7 @@
        fputs (_("\
  Change the effective user id and group id to that of USER.\n\
  \n\
-@@ -635,6 +700,7 @@ Change the effective user id and group i
+@@ -632,6 +697,7 @@ Change the effective user id and group i
    -p                           same as -m\n\
    -s, --shell=SHELL            run SHELL if /etc/shells allows it\n\
  "), stdout);
@@ -243,7 +259,7 @@
        fputs (HELP_OPTION_DESCRIPTION, stdout);
        fputs (VERSION_OPTION_DESCRIPTION, stdout);
        fputs (_("\
-@@ -656,6 +722,12 @@ main (int argc, char **argv)
+@@ -653,6 +719,12 @@ main (int argc, char **argv)
    char *shell = NULL;
    struct passwd *pw;
    struct passwd pw_copy;
@@ -256,7 +272,7 @@
  
    initialize_main (&argc, &argv);
    set_program_name (argv[0]);
-@@ -670,7 +742,11 @@ main (int argc, char **argv)
+@@ -667,7 +739,11 @@ main (int argc, char **argv)
    simulate_login = false;
    change_environment = true;
  
@@ -269,7 +285,7 @@
      {
        switch (optc)
  	{
-@@ -700,6 +776,28 @@ main (int argc, char **argv)
+@@ -697,6 +773,28 @@ main (int argc, char **argv)
  	  shell = optarg;
  	  break;
  
@@ -298,7 +314,7 @@
  	case_GETOPT_HELP_CHAR;
  
  	case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS);
-@@ -738,7 +836,20 @@ main (int argc, char **argv)
+@@ -735,7 +833,20 @@ main (int argc, char **argv)
  			  : DEFAULT_SHELL);
    endpwent ();
  
@@ -320,7 +336,7 @@
      {
  #ifdef SYSLOG_FAILURE
        log_su (pw, false);
-@@ -770,8 +881,16 @@ main (int argc, char **argv)
+@@ -767,8 +878,16 @@ main (int argc, char **argv)
    modify_environment (pw, shell);
  
  #ifndef USE_PAM
@@ -339,10 +355,10 @@
 +#endif
 +	     );
  }
-diff -urNp coreutils-6.12-orig/tests/misc/help-version coreutils-6.12/tests/misc/help-version
---- coreutils-6.12-orig/tests/misc/help-version	2008-05-27 13:39:18.000000000 +0200
-+++ coreutils-6.12/tests/misc/help-version	2008-10-21 14:59:16.000000000 +0200
-@@ -146,6 +146,7 @@ printf_args=foo
+diff -urNp coreutils-7.0.orig/tests/misc/help-version coreutils-7.0/tests/misc/help-version
+--- coreutils-7.0.orig/tests/misc/help-version	2008-09-27 19:28:54.000000000 +0200
++++ coreutils-7.0/tests/misc/help-version	2009-01-28 18:11:00.321247443 +0100
+@@ -148,6 +148,7 @@ printf_args=foo
  seq_args=10
  sleep_args=0
  su_args=--version
@@ -350,18 +366,3 @@
  timeout_args=--version
  
  # I'd rather not run sync, since it spins up disks that I've
---- /dev/null	2007-01-09 09:38:07.860075128 +0000
-+++ coreutils-6.7/man/runuser.x	2007-01-09 17:27:56.000000000 +0000
-@@ -0,0 +1,12 @@
-+[NAME]
-+runuser \- run a shell with substitute user and group IDs
-+[DESCRIPTION]
-+.\" Add any additional description here
-+[SEE ALSO]
-+.TP
-+More detailed Texinfo documentation could be found by command
-+.TP
-+\t\fBinfo su invocation\fR\t
-+.TP
-+since the command \fBrunuser\fR is trimmed down version of command \fBrunuser\fR.
-+.br

coreutils-selinux.patch:

Index: coreutils-selinux.patch
===================================================================
RCS file: /cvs/extras/rpms/coreutils/devel/coreutils-selinux.patch,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- coreutils-selinux.patch	11 Nov 2008 16:03:49 -0000	1.53
+++ coreutils-selinux.patch	28 Jan 2009 17:29:41 -0000	1.54
@@ -1,6 +1,6 @@
-diff -urp coreutils-6.10-orig/configure.ac coreutils-6.10/configure.ac
---- coreutils-6.10-orig/configure.ac	2008-01-25 12:32:33.000000000 +0100
-+++ coreutils-6.10/configure.ac	2008-01-25 14:10:34.000000000 +0100
+diff -urp coreutils-7.0.orig/configure.ac coreutils-7.0/configure.ac
+--- coreutils-7.0.orig/configure.ac	2009-01-28 17:18:16.790672000 +0100
++++ coreutils-7.0/configure.ac	2009-01-28 17:18:52.757913913 +0100
 @@ -51,6 +51,13 @@ AC_ARG_ENABLE(pam, dnl
  LIB_PAM="-ldl -lpam -lpam_misc"
  AC_SUBST(LIB_PAM)])
@@ -15,18 +15,18 @@
  AC_FUNC_FORK
  
  optional_bin_progs=
-diff -urNp coreutils-6.12-orig/man/chcon.x coreutils-6.12/man/chcon.x
---- coreutils-6.12-orig/man/chcon.x	2008-03-07 17:05:53.000000000 +0100
-+++ coreutils-6.12/man/chcon.x	2008-10-21 15:53:43.000000000 +0200
+diff -urp coreutils-7.0.orig/man/chcon.x coreutils-7.0/man/chcon.x
+--- coreutils-7.0.orig/man/chcon.x	2008-03-07 17:05:53.000000000 +0100
++++ coreutils-7.0/man/chcon.x	2009-01-28 17:18:52.759913926 +0100
 @@ -1,4 +1,4 @@
  [NAME]
 -chcon \- change file security context
 +chcon \- change file SELinux security context
  [DESCRIPTION]
  .\" Add any additional description here
-diff -urNp coreutils-6.12-orig/man/runcon.x coreutils-6.12/man/runcon.x
---- coreutils-6.12-orig/man/runcon.x	2008-03-07 17:05:53.000000000 +0100
-+++ coreutils-6.12/man/runcon.x	2008-10-21 15:54:01.000000000 +0200
+diff -urp coreutils-7.0.orig/man/runcon.x coreutils-7.0/man/runcon.x
+--- coreutils-7.0.orig/man/runcon.x	2008-03-07 17:05:53.000000000 +0100
++++ coreutils-7.0/man/runcon.x	2009-01-28 17:18:52.760913933 +0100
 @@ -1,5 +1,5 @@
  [NAME]
 -runcon \- run command with specified security context
@@ -34,10 +34,10 @@
  [DESCRIPTION]
  Run COMMAND with completely-specified CONTEXT, or with current or
  transitioned security context modified by one or more of LEVEL,
-diff -urNp coreutils-6.12-orig/src/chcon.c coreutils-6.12/src/chcon.c
---- coreutils-6.12-orig/src/chcon.c	2008-05-26 08:40:32.000000000 +0200
-+++ coreutils-6.12/src/chcon.c	2008-06-16 14:43:24.000000000 +0200
-@@ -352,7 +352,7 @@ Usage: %s [OPTION]... CONTEXT FILE...\n\
+diff -urp coreutils-7.0.orig/src/chcon.c coreutils-7.0/src/chcon.c
+--- coreutils-7.0.orig/src/chcon.c	2008-08-24 22:30:10.000000000 +0200
++++ coreutils-7.0/src/chcon.c	2009-01-28 17:18:52.761913940 +0100
+@@ -366,7 +366,7 @@ Usage: %s [OPTION]... CONTEXT FILE...\n\
  "),
  	program_name, program_name, program_name);
        fputs (_("\
@@ -46,10 +46,10 @@
  With --reference, change the security context of each FILE to that of RFILE.\n\
  \n\
    -c, --changes          like verbose but report only when a change is made\n\
-diff -urp coreutils-6.10-orig/src/copy.c coreutils-6.10/src/copy.c
---- coreutils-6.10-orig/src/copy.c	2008-01-05 23:59:11.000000000 +0100
-+++ coreutils-6.10/src/copy.c	2008-01-25 17:23:17.000000000 +0100
-@@ -371,9 +371,10 @@ copy_reg (char const *src_name, char con
+diff -urp coreutils-7.0.orig/src/copy.c coreutils-7.0/src/copy.c
+--- coreutils-7.0.orig/src/copy.c	2009-01-28 17:18:16.748671000 +0100
++++ coreutils-7.0/src/copy.c	2009-01-28 17:18:52.762913947 +0100
+@@ -449,9 +449,10 @@ copy_reg (char const *src_name, char con
  	  security_context_t con = NULL;
  	  if (getfscreatecon (&con) < 0)
  	    {
@@ -61,7 +61,7 @@
  		  return_val = false;
  		  goto close_src_and_dst_desc;
  		}
-@@ -383,11 +384,12 @@ copy_reg (char const *src_name, char con
+@@ -461,11 +462,12 @@ copy_reg (char const *src_name, char con
  	    {
  	      if (fsetfilecon (dest_desc, con) < 0)
  		{
@@ -77,7 +77,7 @@
  		      return_val = false;
  		      freecon (con);
  		      goto close_src_and_dst_desc;
-@@ -1630,11 +1632,12 @@ copy_internal (char const *src_name, cha
+@@ -1714,11 +1716,12 @@ copy_internal (char const *src_name, cha
  	{
  	  if (setfscreatecon (con) < 0)
  	    {
@@ -93,7 +93,7 @@
  		  freecon (con);
  		  return false;
  		}
-@@ -1644,12 +1647,14 @@ copy_internal (char const *src_name, cha
+@@ -1728,12 +1731,14 @@ copy_internal (char const *src_name, cha
        else
  	{
  	  if (errno != ENOTSUP && errno != ENODATA)
@@ -114,7 +114,7 @@
  	    }
  	}
      }
-@@ -1735,6 +1740,8 @@ copy_internal (char const *src_name, cha
+@@ -1819,6 +1824,8 @@ copy_internal (char const *src_name, cha
  	{
  	  /* Here, we are crossing a file system boundary and cp's -x option
  	     is in effect: so don't copy the contents of this directory. */
@@ -123,9 +123,9 @@
  	}
        else
  	{
-diff -urp coreutils-6.10-orig/src/copy.h coreutils-6.10/src/copy.h
---- coreutils-6.10-orig/src/copy.h	2008-01-05 23:58:25.000000000 +0100
-+++ coreutils-6.10/src/copy.h	2008-01-25 16:29:21.000000000 +0100
+diff -urp coreutils-7.0.orig/src/copy.h coreutils-7.0/src/copy.h
+--- coreutils-7.0.orig/src/copy.h	2009-01-28 17:18:16.748671000 +0100
++++ coreutils-7.0/src/copy.h	2009-01-28 17:18:52.763913953 +0100
 @@ -141,6 +141,9 @@ struct cp_options
    bool preserve_mode;
    bool preserve_timestamps;
@@ -136,10 +136,10 @@
    /* Enabled for mv, and for cp by the --preserve=links option.
       If true, attempt to preserve in the destination files any
       logical hard links between the source files.  If used with cp's
-diff -urp coreutils-6.10-orig/src/cp.c coreutils-6.10/src/cp.c
---- coreutils-6.10-orig/src/cp.c	2008-01-11 12:19:53.000000000 +0100
-+++ coreutils-6.10/src/cp.c	2008-01-25 16:26:22.000000000 +0100
-@@ -147,6 +147,7 @@ static struct option const long_opts[] =
+diff -urp coreutils-7.0.orig/src/cp.c coreutils-7.0/src/cp.c
+--- coreutils-7.0.orig/src/cp.c	2009-01-28 17:18:16.750671000 +0100
++++ coreutils-7.0/src/cp.c	2009-01-28 17:20:29.109561384 +0100
+@@ -148,6 +148,7 @@ static struct option const long_opts[] =
    {"target-directory", required_argument, NULL, 't'},
    {"update", no_argument, NULL, 'u'},
    {"verbose", no_argument, NULL, 'v'},
@@ -147,7 +147,7 @@
    {GETOPT_HELP_OPTION_DECL},
    {GETOPT_VERSION_OPTION_DECL},
    {NULL, 0, NULL, 0}
-@@ -175,7 +175,7 @@ Copy SOURCE to DEST, or multiple SOURCE(
+@@ -175,7 +176,7 @@ Copy SOURCE to DEST, or multiple SOURCE(
  Mandatory arguments to long options are mandatory for short options too.\n\
  "), stdout);
        fputs (_("\
@@ -156,8 +156,8 @@
        --backup[=CONTROL]       make a backup of each existing destination file\n\
    -b                           like --backup but does not accept an argument\n\
        --copy-contents          copy contents of special files when recursive\n\
-@@ -200,6 +201,9 @@ Mandatory arguments to long options are 
-                                  additional attributes: context, links, all\n\
+@@ -206,6 +207,9 @@ Mandatory arguments to long options are 
+                                  all\n\
  "), stdout);
        fputs (_("\
 +  -c                           same as --preserve=context\n\
@@ -166,7 +166,7 @@
        --no-preserve=ATTR_LIST  don't preserve the specified attributes\n\
        --parents                use full source file name under DIRECTORY\n\
  "), stdout);
-@@ -225,6 +229,7 @@ Mandatory arguments to long options are 
+@@ -231,6 +235,7 @@ Mandatory arguments to long options are 
                                   destination file is missing\n\
    -v, --verbose                explain what is being done\n\
    -x, --one-file-system        stay on this file system\n\
@@ -174,24 +174,24 @@
  "), stdout);
        fputs (HELP_OPTION_DESCRIPTION, stdout);
        fputs (VERSION_OPTION_DESCRIPTION, stdout);
-@@ -774,6 +779,7 @@ cp_option_init (struct cp_options *x)
+@@ -780,6 +785,7 @@ cp_option_init (struct cp_options *x)
    x->preserve_timestamps = false;
    x->preserve_security_context = false;
    x->require_preserve_context = false;
 +  x->set_security_context = false;
+   x->preserve_xattr = false;
+   x->require_preserve_xattr = false;
  
-   x->require_preserve = false;
-   x->recursive = false;
-@@ -909,7 +917,7 @@ main (int argc, char **argv)
+@@ -925,7 +931,7 @@ main (int argc, char **argv)
       we'll actually use backup_suffix_string.  */
    backup_suffix_string = getenv ("SIMPLE_BACKUP_SUFFIX");
  
--  while ((c = getopt_long (argc, argv, "abdfHilLprst:uvxPRS:T",
-+  while ((c = getopt_long (argc, argv, "abcdfHilLprst:uvxPRS:TZ:",
+-  while ((c = getopt_long (argc, argv, "abdfHilLnprst:uvxPRS:T",
++  while ((c = getopt_long (argc, argv, "abcdfHilLnprst:uvxPRS:TZ:",
  			   long_opts, NULL))
  	 != -1)
      {
-@@ -920,13 +928,15 @@ main (int argc, char **argv)
+@@ -936,13 +942,15 @@ main (int argc, char **argv)
  				     sparse_type_string, sparse_type);
  	  break;
  
@@ -209,7 +209,7 @@
  	  x.recursive = true;
  	  break;
  
-@@ -940,6 +950,16 @@ main (int argc, char **argv)
+@@ -956,6 +964,16 @@ main (int argc, char **argv)
  	  copy_contents = true;
  	  break;
  
@@ -226,7 +226,7 @@
  	case 'd':
  	  x.preserve_links = true;
  	  x.dereference = DEREF_NEVER;
-@@ -1052,6 +1072,27 @@ main (int argc, char **argv)
+@@ -1072,6 +1090,27 @@ main (int argc, char **argv)
  	  x.one_file_system = true;
  	  break;
  
@@ -254,10 +254,10 @@
  	case 'S':
  	  make_backups = true;
  	  backup_suffix_string = optarg;
-diff -urp coreutils-6.10-orig/src/id.c coreutils-6.10/src/id.c
---- coreutils-6.10-orig/src/id.c	2008-01-05 23:59:11.000000000 +0100
-+++ coreutils-6.10/src/id.c	2008-01-25 17:13:53.000000000 +0100
-@@ -110,7 +110,7 @@ int
+diff -urp coreutils-7.0.orig/src/id.c coreutils-7.0/src/id.c
+--- coreutils-7.0.orig/src/id.c	2008-08-24 22:58:15.000000000 +0200
++++ coreutils-7.0/src/id.c	2009-01-28 17:18:52.766913973 +0100
+@@ -106,7 +106,7 @@ int
  main (int argc, char **argv)
  {
    int optc;
@@ -266,11 +266,10 @@
  
    /* If true, output the list of all group IDs. -G */
    bool just_group_list = false;
-diff -urp coreutils-6.10-orig/src/install.c coreutils-6.10/src/install.c
---- coreutils-6.10-orig/src/install.c	2008-01-05 23:59:11.000000000 +0100
-+++ coreutils-6.10/src/install.c	2008-01-25 17:32:42.000000000 +0100
-
-@@ -146,11 +146,11 @@ static struct option const long_options[
+diff -urp coreutils-7.0.orig/src/install.c coreutils-7.0/src/install.c
+--- coreutils-7.0.orig/src/install.c	2009-01-28 17:18:16.751671000 +0100
++++ coreutils-7.0/src/install.c	2009-01-28 17:18:52.767913980 +0100
+@@ -152,11 +152,11 @@ static struct option const long_options[
    {"no-target-directory", no_argument, NULL, 'T'},
    {"owner", required_argument, NULL, 'o'},
    {"preserve-timestamps", no_argument, NULL, 'p'},
@@ -284,7 +283,7 @@
    {"strip", no_argument, NULL, 's'},
    {"strip-program", required_argument, NULL, STRIP_PROGRAM_OPTION},
    {"suffix", required_argument, NULL, 'S'},
-@@ -178,6 +178,7 @@ cp_option_init (struct cp_options *x)
+@@ -185,6 +185,7 @@ cp_option_init (struct cp_options *x)
    x->preserve_timestamps = false;
    x->require_preserve = false;
    x->require_preserve_context = false;
@@ -292,7 +291,7 @@
    x->recursive = false;
    x->sparse_mode = SPARSE_AUTO;
    x->symbolic_link = false;
-@@ -346,7 +338,7 @@ main (int argc, char **argv)
+@@ -361,7 +362,7 @@ main (int argc, char **argv)
       we'll actually use backup_suffix_string.  */
    backup_suffix_string = getenv ("SIMPLE_BACKUP_SUFFIX");
  
@@ -301,7 +300,7 @@
  			      NULL)) != -1)
      {
        switch (optc)
-@@ -408,6 +409,7 @@ main (int argc, char **argv)
+@@ -428,6 +429,7 @@ main (int argc, char **argv)
  	  no_target_directory = true;
  	  break;
  
@@ -309,7 +308,7 @@
  	case PRESERVE_CONTEXT_OPTION:
  	  if ( ! selinux_enabled)
  	    {
-@@ -415,6 +417,10 @@ main (int argc, char **argv)
+@@ -435,6 +437,10 @@ main (int argc, char **argv)
  			     "this kernel is not SELinux-enabled"));
  	      break;
  	    }
@@ -320,7 +319,7 @@
  	  x.preserve_security_context = true;
  	  use_default_selinux_context = false;
  	  break;
-@@ -432,6 +432,7 @@ main (int argc, char **argv)
+@@ -446,6 +452,7 @@ main (int argc, char **argv)
  	      break;
  	    }
  	  scontext = optarg;
@@ -328,7 +327,7 @@
  	  use_default_selinux_context = false;
  	  break;
  	case_GETOPT_HELP_CHAR;
-@@ -825,8 +831,8 @@ Mandatory arguments to long options are 
+@@ -850,8 +857,8 @@ Mandatory arguments to long options are 
    -v, --verbose       print the name of each directory as it is created\n\
  "), stdout);
        fputs (_("\
@@ -339,10 +338,10 @@
  "), stdout);
  
        fputs (HELP_OPTION_DESCRIPTION, stdout);
-diff -urp coreutils-6.10-orig/src/ls.c coreutils-6.10/src/ls.c
---- coreutils-6.10-orig/src/ls.c	2008-01-11 11:34:22.000000000 +0100
-+++ coreutils-6.10/src/ls.c	2008-01-25 15:34:49.000000000 +0100
-@@ -134,7 +134,8 @@ enum filetype
+diff -urp coreutils-7.0.orig/src/ls.c coreutils-7.0/src/ls.c
+--- coreutils-7.0.orig/src/ls.c	2009-01-28 17:18:16.705671000 +0100
++++ coreutils-7.0/src/ls.c	2009-01-28 17:18:52.770914000 +0100
+@@ -139,7 +139,8 @@ enum filetype
      symbolic_link,
      sock,
      whiteout,
@@ -352,7 +351,7 @@
    };
  
  /* Display letters and indicators for each filetype.
-@@ -177,8 +178,9 @@ struct fileinfo
+@@ -182,8 +183,9 @@ struct fileinfo
         exists, otherwise false.  */
      bool linkok;
  
@@ -364,7 +363,7 @@
      bool have_acl;
    };
  
-@@ -241,6 +242,7 @@ static void queue_directory (char const 
+@@ -246,6 +248,7 @@ static void queue_directory (char const 
  static void sort_files (void);
  static void parse_ls_color (void);
  void usage (int status);
@@ -372,7 +371,7 @@
  
  /* Initial size of hash table.
     Most hierarchies are likely to be shallower than this.  */
-@@ -314,7 +316,7 @@ static struct pending *pending_dirs;
+@@ -315,7 +318,7 @@ static struct pending *pending_dirs;
  
  static struct timespec current_time;
  
@@ -381,7 +380,7 @@
  static char UNKNOWN_SECURITY_CONTEXT[] = "?";
  
  /* Whether any of the files has an ACL.  This affects the width of the
-@@ -354,7 +356,9 @@ enum format
+@@ -355,7 +358,9 @@ enum format
      one_per_line,		/* -1 */
      many_per_line,		/* -C */
      horizontal,			/* -x */
@@ -392,7 +391,7 @@
    };
  
  static enum format format;
-@@ -731,6 +735,9 @@ enum
+@@ -744,6 +749,9 @@ enum
    SHOW_CONTROL_CHARS_OPTION,
    SI_OPTION,
    SORT_OPTION,
@@ -402,7 +401,7 @@
    TIME_OPTION,
    TIME_STYLE_OPTION
  };
-@@ -776,7 +783,9 @@ static struct option const long_options[
+@@ -789,7 +797,9 @@ static struct option const long_options[
    {"time-style", required_argument, NULL, TIME_STYLE_OPTION},
    {"color", optional_argument, NULL, COLOR_OPTION},
    {"block-size", required_argument, NULL, BLOCK_SIZE_OPTION},
@@ -413,7 +412,7 @@
    {"author", no_argument, NULL, AUTHOR_OPTION},
    {GETOPT_HELP_OPTION_DECL},
    {GETOPT_VERSION_OPTION_DECL},
-@@ -786,12 +795,12 @@ static struct option const long_options[
+@@ -799,12 +809,12 @@ static struct option const long_options[
  static char const *const format_args[] =
  {
    "verbose", "long", "commas", "horizontal", "across",
@@ -428,7 +427,7 @@
  };
  ARGMATCH_VERIFY (format_args, format_types);
  
-@@ -1236,7 +1245,7 @@ main (int argc, char **argv)
+@@ -1251,7 +1261,7 @@ main (int argc, char **argv)
  
    format_needs_stat = sort_type == sort_time || sort_type == sort_size
      || format == long_format
@@ -437,7 +436,7 @@
      || print_block_size;
    format_needs_type = (! format_needs_stat
  		       && (recursive
-@@ -1267,7 +1276,7 @@ main (int argc, char **argv)
+@@ -1282,7 +1292,7 @@ main (int argc, char **argv)
      }
    else
      do
@@ -446,7 +445,7 @@
      while (i < argc);
  
    if (cwd_n_used)
-@@ -1429,7 +1438,7 @@ decode_switches (int argc, char **argv)
+@@ -1445,7 +1455,7 @@ decode_switches (int argc, char **argv)
    ignore_mode = IGNORE_DEFAULT;
    ignore_patterns = NULL;
    hide_patterns = NULL;
@@ -455,7 +454,7 @@
  
    /* FIXME: put this in a function.  */
    {
-@@ -1811,13 +1820,27 @@ decode_switches (int argc, char **argv)
+@@ -1827,13 +1837,27 @@ decode_switches (int argc, char **argv)
  	  break;
  
  	case 'Z':
@@ -484,7 +483,7 @@
  	default:
  	  usage (LS_FAILURE);
  	}
-@@ -2517,8 +2540,10 @@ clear_files (void)
+@@ -2547,8 +2571,10 @@ clear_files (void)
        struct fileinfo *f = sorted_file[i];
        free (f->name);
        free (f->linkname);
@@ -497,7 +496,7 @@
      }
  
    cwd_n_used = 0;
-@@ -2560,6 +2585,7 @@ gobble_file (char const *name, enum file
+@@ -2590,6 +2616,7 @@ gobble_file (char const *name, enum file
    memset (f, '\0', sizeof *f);
    f->stat.st_ino = inode;
    f->filetype = type;
@@ -505,7 +504,7 @@
  
    if (command_line_arg
        || format_needs_stat
-@@ -2659,7 +2685,7 @@ gobble_file (char const *name, enum file
+@@ -2689,7 +2716,7 @@ gobble_file (char const *name, enum file
  
        f->stat_ok = true;
  
@@ -514,7 +513,7 @@
  	{
  	  bool have_acl = false;
  	  int attr_len = (do_deref
-@@ -2667,9 +2694,7 @@ gobble_file (char const *name, enum file
+@@ -2708,9 +2735,7 @@ gobble_file (char const *name, enum file
  	      f->scontext = xstrdup ("unlabeled");
  	    }
  
@@ -525,7 +524,7 @@
  	    {
  	      f->scontext = UNKNOWN_SECURITY_CONTEXT;
  
-@@ -2681,7 +2706,7 @@ gobble_file (char const *name, enum file
+@@ -2722,7 +2747,7 @@ gobble_file (char const *name, enum file
  		err = 0;
  	    }
  
@@ -534,7 +533,7 @@
  	    {
  	      int n = file_has_acl (absolute_name, &f->stat);
  	      err = (n < 0);
-@@ -3255,6 +3281,13 @@ print_current_files (void)
+@@ -3297,6 +3322,13 @@ print_current_files (void)
  	  print_long_format (sorted_file[i]);
  	  DIRED_PUTCHAR ('\n');
  	}
@@ -548,7 +547,7 @@
        break;
      }
  }
-@@ -3481,7 +3514,7 @@ print_long_format (const struct fileinfo
+@@ -3482,7 +3514,7 @@ print_long_format (const struct fileinfo
  	 The latter is wrong when inode_number_width is zero.  */
        p += strlen (p);
      }
@@ -557,7 +556,7 @@
    if (print_block_size)
      {
        char hbuf[LONGEST_HUMAN_READABLE + 1];
-@@ -3510,9 +3543,15 @@ print_long_format (const struct fileinfo
+@@ -3511,9 +3543,15 @@ print_long_format (const struct fileinfo
       The latter is wrong when nlink_width is zero.  */
    p += strlen (p);
  
@@ -574,7 +573,7 @@
      {
        DIRED_FPUTS (buf, stdout, p - buf);
  
-@@ -3525,9 +3564,6 @@ print_long_format (const struct fileinfo
+@@ -3526,9 +3564,6 @@ print_long_format (const struct fileinfo
        if (print_author)
  	format_user (f->stat.st_author, author_width, f->stat_ok);
  
@@ -584,7 +583,7 @@
        p = buf;
      }
  
-@@ -3864,9 +3900,6 @@ print_file_name_and_frills (const struct
+@@ -3867,9 +3902,6 @@ print_file_name_and_frills (const struct
  	    human_readable (ST_NBLOCKS (f->stat), buf, human_output_opts,
  			    ST_NBLOCKSIZE, output_block_size));
  
@@ -594,7 +593,7 @@
    print_name_with_quoting (f->name, FILE_OR_LINK_MODE (f), f->linkok,
  			   f->stat_ok, f->filetype, NULL);
  
-@@ -4030,9 +4063,6 @@ length_of_file_name_and_frills (const st
+@@ -4077,9 +4109,6 @@ length_of_file_name_and_frills (const st
  					  output_block_size))
  		: block_size_width);
  
@@ -604,7 +603,7 @@
    quote_name (NULL, f->name, filename_quoting_options, &name_width);
    len += name_width;
  
-@@ -4461,9 +4491,16 @@ Mandatory arguments to long options are 
+@@ -4510,9 +4539,16 @@ Mandatory arguments to long options are 
    -w, --width=COLS           assume screen width instead of current value\n\
    -x                         list entries by lines instead of by columns\n\
    -X                         sort alphabetically by entry extension\n\
@@ -622,7 +621,7 @@
        fputs (HELP_OPTION_DESCRIPTION, stdout);
        fputs (VERSION_OPTION_DESCRIPTION, stdout);
        fputs (_("\n\
-@@ -4487,3 +4524,67 @@ Exit status is 0 if OK, 1 if minor probl
+@@ -4541,3 +4577,67 @@ Exit status:\n\
      }
    exit (status);
  }
@@ -690,10 +689,10 @@
 +      print_type_indicator (f->stat_ok, f->stat.st_mode, f->filetype);
 +  }
 +}
-diff -urp coreutils-6.10-orig/src/mkdir.c coreutils-6.10/src/mkdir.c
---- coreutils-6.10-orig/src/mkdir.c	2008-01-05 23:58:25.000000000 +0100
-+++ coreutils-6.10/src/mkdir.c	2008-01-25 16:35:14.000000000 +0100
-@@ -41,6 +41,7 @@ char *program_name;
+diff -urp coreutils-7.0.orig/src/mkdir.c coreutils-7.0/src/mkdir.c
+--- coreutils-7.0.orig/src/mkdir.c	2008-08-24 22:58:15.000000000 +0200
++++ coreutils-7.0/src/mkdir.c	2009-01-28 17:18:52.771914007 +0100
+@@ -39,6 +39,7 @@
  static struct option const longopts[] =
  {
    {GETOPT_SELINUX_CONTEXT_OPTION_DECL},
@@ -701,10 +700,10 @@
    {"mode", required_argument, NULL, 'm'},
    {"parents", no_argument, NULL, 'p'},
    {"verbose", no_argument, NULL, 'v'},
-diff -urp coreutils-6.10-orig/src/mknod.c coreutils-6.10/src/mknod.c
---- coreutils-6.10-orig/src/mknod.c	2008-01-05 23:58:25.000000000 +0100
-+++ coreutils-6.10/src/mknod.c	2008-01-25 17:01:11.000000000 +0100
-@@ -38,7 +38,7 @@ char *program_name;
+diff -urp coreutils-7.0.orig/src/mknod.c coreutils-7.0/src/mknod.c
+--- coreutils-7.0.orig/src/mknod.c	2008-09-27 19:28:54.000000000 +0200
++++ coreutils-7.0/src/mknod.c	2009-01-28 17:18:52.772914014 +0100
+@@ -35,7 +35,7 @@
  
  static struct option const longopts[] =
  {
@@ -713,21 +712,21 @@
    {"mode", required_argument, NULL, 'm'},
    {GETOPT_HELP_OPTION_DECL},
    {GETOPT_VERSION_OPTION_DECL},
-diff -urp coreutils-6.10-orig/src/mv.c coreutils-6.10/src/mv.c
---- coreutils-6.10-orig/src/mv.c	2008-01-05 23:59:11.000000000 +0100
-+++ coreutils-6.10/src/mv.c	2008-01-25 17:11:50.000000000 +0100
-@@ -137,6 +137,7 @@ cp_option_init (struct cp_options *x)
+diff -urp coreutils-7.0.orig/src/mv.c coreutils-7.0/src/mv.c
+--- coreutils-7.0.orig/src/mv.c	2009-01-28 17:18:16.752671000 +0100
++++ coreutils-7.0/src/mv.c	2009-01-28 17:18:52.773914020 +0100
+@@ -138,6 +138,7 @@ cp_option_init (struct cp_options *x)
    x->preserve_mode = true;
    x->preserve_timestamps = true;
    x->preserve_security_context = selinux_enabled;
 +  x->set_security_context = false;
    x->require_preserve = false;  /* FIXME: maybe make this an option */
    x->require_preserve_context = false;
-   x->recursive = true;
-diff -urNp coreutils-6.12-orig/src/runcon.c coreutils-6.12/src/runcon.c
---- coreutils-6.12-orig/src/runcon.c	2008-05-26 12:10:20.000000000 +0200
-+++ coreutils-6.12/src/runcon.c	2008-10-21 15:57:30.000000000 +0200
-@@ -88,7 +88,7 @@ Usage: %s CONTEXT COMMAND [args]\n\
+   x->preserve_xattr = true;
+diff -urp coreutils-7.0.orig/src/runcon.c coreutils-7.0/src/runcon.c
+--- coreutils-7.0.orig/src/runcon.c	2008-08-24 22:30:10.000000000 +0200
++++ coreutils-7.0/src/runcon.c	2009-01-28 17:18:52.774914027 +0100
+@@ -86,7 +86,7 @@ Usage: %s CONTEXT COMMAND [args]\n\
    or:  %s [ -c ] [-u USER] [-r ROLE] [-t TYPE] [-l RANGE] COMMAND [args]\n\
  "), program_name, program_name);
        fputs (_("\
@@ -736,10 +735,10 @@
  With neither CONTEXT nor COMMAND, print the current security context.\n\
  \n\
    CONTEXT            Complete security context\n\
-diff -urp coreutils-6.10-orig/src/stat.c coreutils-6.10/src/stat.c
---- coreutils-6.10-orig/src/stat.c	2008-01-05 23:59:11.000000000 +0100
-+++ coreutils-6.10/src/stat.c	2008-01-25 16:50:24.000000000 +0100
-@@ -831,7 +831,7 @@ print_it (char const *format, char const
+diff -urp coreutils-7.0.orig/src/stat.c coreutils-7.0/src/stat.c
+--- coreutils-7.0.orig/src/stat.c	2008-09-27 19:28:54.000000000 +0200
++++ coreutils-7.0/src/stat.c	2009-01-28 17:18:52.775914034 +0100
+@@ -823,7 +823,7 @@ print_it (char const *format, char const
  
  /* Stat the file system and print what we find.  */
  static bool
@@ -748,7 +747,7 @@
  {
    STRUCT_STATVFS statfsbuf;
  
-@@ -843,15 +843,31 @@ do_statfs (char const *filename, bool te
+@@ -835,15 +835,31 @@ do_statfs (char const *filename, bool te
      }
  
    if (format == NULL)
@@ -787,7 +786,7 @@
  
    print_it (format, filename, print_statfs, &statfsbuf);
    return true;
-@@ -859,7 +875,7 @@ do_statfs (char const *filename, bool te
+@@ -851,7 +867,7 @@ do_statfs (char const *filename, bool te
  
  /* stat the file and print what we find */
  static bool
@@ -796,7 +795,7 @@
  {
    struct stat statbuf;
  
-@@ -872,9 +888,12 @@ do_stat (char const *filename, bool ters
+@@ -864,9 +880,12 @@ do_stat (char const *filename, bool ters
    if (format == NULL)
      {
        if (terse)
@@ -812,7 +811,7 @@
        else
  	{
  	  /* Temporary hack to match original output until conditional
-@@ -891,12 +910,22 @@ do_stat (char const *filename, bool ters
+@@ -883,12 +902,22 @@ do_stat (char const *filename, bool ters
  	    }
  	  else
  	    {
@@ -841,7 +840,7 @@
  	    }
  	}
      }
-@@ -917,6 +946,7 @@ usage (int status)
+@@ -909,6 +938,7 @@ usage (int status)
  Display file or file system status.\n\
  \n\
    -L, --dereference     follow links\n\
@@ -849,7 +848,7 @@
    -f, --file-system     display file system status instead of file status\n\
  "), stdout);
        fputs (_("\
-@@ -1001,6 +1031,7 @@ main (int argc, char *argv[])
+@@ -993,6 +1023,7 @@ main (int argc, char *argv[])
    int i;
    bool fs = false;
    bool terse = false;
@@ -857,7 +856,7 @@
    char *format = NULL;
    bool ok = true;
  
-@@ -1040,13 +1071,13 @@ main (int argc, char *argv[])
+@@ -1032,13 +1063,13 @@ main (int argc, char *argv[])
  	  terse = true;
  	  break;
  
@@ -878,7 +877,7 @@
  	  break;
  
  	case_GETOPT_HELP_CHAR;
-@@ -1062,8 +1097,8 @@ main (int argc, char *argv[])
+@@ -1058,8 +1089,8 @@ main (int argc, char *argv[])
  
    for (i = optind; i < argc; i++)
      ok &= (fs
@@ -889,10 +888,10 @@
  
    exit (ok ? EXIT_SUCCESS : EXIT_FAILURE);
  }
-diff -urp coreutils-6.10-orig/tests/misc/selinux coreutils-6.10/tests/misc/selinux
---- coreutils-6.10-orig/tests/misc/selinux	2008-01-11 11:34:22.000000000 +0100
-+++ coreutils-6.10/tests/misc/selinux	2008-01-25 18:17:59.000000000 +0100
-@@ -32,12 +32,10 @@ chcon $ctx f d p 2>/dev/null || {
+diff -urp coreutils-7.0.orig/tests/misc/selinux coreutils-7.0/tests/misc/selinux
+--- coreutils-7.0.orig/tests/misc/selinux	2008-09-27 19:28:54.000000000 +0200
++++ coreutils-7.0/tests/misc/selinux	2009-01-28 17:18:52.776914041 +0100
+@@ -30,12 +30,10 @@ chcon $ctx f d p ||
  
  # inspect that context with both ls -Z and stat.
  for i in d f p; do
@@ -900,9 +899,9 @@
 +  c=`ls -dogZ $i|cut -d' ' -f5`; test x$c = x$ctx || fail=1
    c=`stat --printf %C $i`; test x$c = x$ctx || fail=1
  done
-
+ 
 -# ensure that ls -l output includes the "+".
 -c=`ls -l f|cut -c11`; test "$c" = + || fail=1
-
+ 
  # Copy each to a new directory and ensure that context is preserved.
  cp -r --preserve=all d f p s1 || fail=1


Index: coreutils.spec
===================================================================
RCS file: /cvs/extras/rpms/coreutils/devel/coreutils.spec,v
retrieving revision 1.243
retrieving revision 1.244
diff -u -r1.243 -r1.244
--- coreutils.spec	3 Dec 2008 23:11:37 -0000	1.243
+++ coreutils.spec	28 Jan 2009 17:29:41 -0000	1.244
@@ -1,7 +1,7 @@
 Summary: A set of basic GNU tools commonly used in shell scripts
 Name:    coreutils
 Version: 7.0
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPLv3+
 Group:   System Environment/Base
 Url:     http://www.gnu.org/software/coreutils/
@@ -21,6 +21,8 @@
 Patch1: coreutils-446294-lsexitstatuses.patch
 Patch2: coreutils-7.0-dftotal.patch
 Patch3: coreutils-7.0-expr-removebignumoptions.patch
+Patch4: coreutils-7.0-cp-mv-n.patch
+Patch5: coreutils-7.0-xattr.patch
 
 # Our patches
 Patch100: coreutils-6.10-configuration.patch
@@ -64,6 +66,7 @@
 BuildRequires: automake >= 1.10.1
 %{?!nopam:BuildRequires: pam-devel}
 BuildRequires: libcap-devel >= 2.0.6
+Requires: libattr-devel
 
 Requires(post): libselinux >= 1.25.6-1
 Requires:       libattr
@@ -106,6 +109,8 @@
 %patch1 -p1 -b .lsexit
 %patch2 -p1 -b .dftotal
 %patch3 -p1 -b .bignum
+%patch4 -p1 -b .cpmvn
+%patch5 -p1 -b .xattr
 
 # Our patches
 %patch100 -p1 -b .configure
@@ -137,6 +142,8 @@
 
 chmod a+x tests/misc/sort-mb-tests
 chmod a+x tests/misc/id-context
+chmod a+x tests/mv/mv-n
+chmod a+x tests/misc/xattr
 
 sed -i 's/1.10a/1.10.1/' configure.ac
 
@@ -320,6 +327,10 @@
 /sbin/runuser
 
 %changelog
+* Wed Jan 28 2009 Kamil Dudka <kdudka at redhat.com> - 7.0-6
+- cp/mv: add --no-clobber (-n) option to not overwrite target
+- cp/mv: add xattr support (#202823)
+
 * Thu Dec 04 2008 Ondrej Vasik <ovasik at redhat.com> - 7.0-5
 - fix info documentation for expr command as well(#474434)
 



From pkgdb at fedoraproject.org  Wed Jan 28 17:30:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Jan 2009 17:30:21 +0000
Subject: [pkgdb] dclib had acl change status
Message-ID: <20090128173021.31F9A2084BD@bastion.fedora.phx.redhat.com>

lmacken has set the watchbugzilla acl on dclib (Fedora devel) to Approved for mjakubicek

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/dclib



From pkgdb at fedoraproject.org  Wed Jan 28 17:30:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Jan 2009 17:30:22 +0000
Subject: [pkgdb] dclib had acl change status
Message-ID: <20090128173022.86257208609@bastion.fedora.phx.redhat.com>

lmacken has set the watchcommits acl on dclib (Fedora devel) to Approved for mjakubicek

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/dclib



From pkgdb at fedoraproject.org  Wed Jan 28 17:30:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Jan 2009 17:30:25 +0000
Subject: [pkgdb] dclib had acl change status
Message-ID: <20090128173025.2794E20860E@bastion.fedora.phx.redhat.com>

lmacken has set the commit acl on dclib (Fedora devel) to Approved for mjakubicek

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/dclib



From pkgdb at fedoraproject.org  Wed Jan 28 17:30:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Jan 2009 17:30:26 +0000
Subject: [pkgdb] dclib had acl change status
Message-ID: <20090128173026.402A720866E@bastion.fedora.phx.redhat.com>

lmacken has set the commit acl on dclib (Fedora EPEL 5) to Approved for mjakubicek

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/dclib



From pkgdb at fedoraproject.org  Wed Jan 28 17:30:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Jan 2009 17:30:27 +0000
Subject: [pkgdb] dclib had acl change status
Message-ID: <20090128173027.DFD17208739@bastion.fedora.phx.redhat.com>

lmacken has set the watchcommits acl on dclib (Fedora EPEL 5) to Approved for mjakubicek

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/dclib



From pkgdb at fedoraproject.org  Wed Jan 28 17:30:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Jan 2009 17:30:29 +0000
Subject: [pkgdb] dclib had acl change status
Message-ID: <20090128173029.DFA9D208679@bastion.fedora.phx.redhat.com>

lmacken has set the watchbugzilla acl on dclib (Fedora EPEL 5) to Approved for mjakubicek

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/dclib



From pkgdb at fedoraproject.org  Wed Jan 28 17:30:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Jan 2009 17:30:37 +0000
Subject: [pkgdb] dclib had acl change status
Message-ID: <20090128173037.9BF0C20873F@bastion.fedora.phx.redhat.com>

lmacken has set the watchbugzilla acl on dclib (Fedora 9) to Approved for mjakubicek

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/dclib



From pkgdb at fedoraproject.org  Wed Jan 28 17:30:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Jan 2009 17:30:39 +0000
Subject: [pkgdb] dclib had acl change status
Message-ID: <20090128173039.420C7208497@bastion.fedora.phx.redhat.com>

lmacken has set the watchcommits acl on dclib (Fedora 9) to Approved for mjakubicek

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/dclib



From pkgdb at fedoraproject.org  Wed Jan 28 17:30:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Jan 2009 17:30:39 +0000
Subject: [pkgdb] dclib had acl change status
Message-ID: <20090128173039.982DE20873D@bastion.fedora.phx.redhat.com>

lmacken has set the commit acl on dclib (Fedora 9) to Approved for mjakubicek

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/dclib



From pkgdb at fedoraproject.org  Wed Jan 28 17:30:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Jan 2009 17:30:42 +0000
Subject: [pkgdb] dclib had acl change status
Message-ID: <20090128173042.3E0BE2084B7@bastion.fedora.phx.redhat.com>

lmacken has set the commit acl on dclib (Fedora 10) to Approved for mjakubicek

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/dclib



From pkgdb at fedoraproject.org  Wed Jan 28 17:30:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Jan 2009 17:30:42 +0000
Subject: [pkgdb] dclib had acl change status
Message-ID: <20090128173042.AC77220874A@bastion.fedora.phx.redhat.com>

lmacken has set the watchcommits acl on dclib (Fedora 10) to Approved for mjakubicek

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/dclib



From pkgdb at fedoraproject.org  Wed Jan 28 17:30:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Jan 2009 17:30:45 +0000
Subject: [pkgdb] dclib had acl change status
Message-ID: <20090128173045.B1CD520876B@bastion.fedora.phx.redhat.com>

lmacken has set the watchbugzilla acl on dclib (Fedora 10) to Approved for mjakubicek

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/dclib



From pkgdb at fedoraproject.org  Wed Jan 28 17:33:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Jan 2009 17:33:58 +0000
Subject: [pkgdb] valknut had acl change status
Message-ID: <20090128173358.4544B208485@bastion.fedora.phx.redhat.com>

lmacken has set the watchbugzilla acl on valknut (Fedora devel) to Approved for mjakubicek

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/valknut



From pkgdb at fedoraproject.org  Wed Jan 28 17:33:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Jan 2009 17:33:59 +0000
Subject: [pkgdb] valknut had acl change status
Message-ID: <20090128173359.AC03F208494@bastion.fedora.phx.redhat.com>

lmacken has set the watchcommits acl on valknut (Fedora devel) to Approved for mjakubicek

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/valknut



From pkgdb at fedoraproject.org  Wed Jan 28 17:34:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Jan 2009 17:34:04 +0000
Subject: [pkgdb] valknut had acl change status
Message-ID: <20090128173404.8759E2084B7@bastion.fedora.phx.redhat.com>

lmacken has set the commit acl on valknut (Fedora devel) to Approved for mjakubicek

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/valknut



From pkgdb at fedoraproject.org  Wed Jan 28 17:34:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Jan 2009 17:34:03 +0000
Subject: [pkgdb] valknut had acl change status
Message-ID: <20090128173404.0452A208497@bastion.fedora.phx.redhat.com>

lmacken has set the watchcommits acl on valknut (Fedora EPEL 5) to Approved for mjakubicek

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/valknut



From pkgdb at fedoraproject.org  Wed Jan 28 17:34:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Jan 2009 17:34:05 +0000
Subject: [pkgdb] valknut had acl change status
Message-ID: <20090128173405.9C212208609@bastion.fedora.phx.redhat.com>

lmacken has set the commit acl on valknut (Fedora EPEL 5) to Approved for mjakubicek

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/valknut



From pkgdb at fedoraproject.org  Wed Jan 28 17:34:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Jan 2009 17:34:06 +0000
Subject: [pkgdb] valknut had acl change status
Message-ID: <20090128173406.28B8520860C@bastion.fedora.phx.redhat.com>

lmacken has set the watchbugzilla acl on valknut (Fedora EPEL 5) to Approved for mjakubicek

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/valknut



From pkgdb at fedoraproject.org  Wed Jan 28 17:34:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Jan 2009 17:34:11 +0000
Subject: [pkgdb] valknut had acl change status
Message-ID: <20090128173411.534D1208485@bastion.fedora.phx.redhat.com>

lmacken has set the watchbugzilla acl on valknut (Fedora 9) to Approved for mjakubicek

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/valknut



From pkgdb at fedoraproject.org  Wed Jan 28 17:34:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Jan 2009 17:34:11 +0000
Subject: [pkgdb] valknut had acl change status
Message-ID: <20090128173411.6FC0C208678@bastion.fedora.phx.redhat.com>

lmacken has set the watchcommits acl on valknut (Fedora 9) to Approved for mjakubicek

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/valknut



From pkgdb at fedoraproject.org  Wed Jan 28 17:34:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Jan 2009 17:34:12 +0000
Subject: [pkgdb] valknut had acl change status
Message-ID: <20090128173412.A4ABD2086F7@bastion.fedora.phx.redhat.com>

lmacken has set the commit acl on valknut (Fedora 9) to Approved for mjakubicek

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/valknut



From pkgdb at fedoraproject.org  Wed Jan 28 17:34:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Jan 2009 17:34:14 +0000
Subject: [pkgdb] valknut had acl change status
Message-ID: <20090128173414.2619F208739@bastion.fedora.phx.redhat.com>

lmacken has set the commit acl on valknut (Fedora 10) to Approved for mjakubicek

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/valknut



From pkgdb at fedoraproject.org  Wed Jan 28 17:34:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Jan 2009 17:34:15 +0000
Subject: [pkgdb] valknut had acl change status
Message-ID: <20090128173415.A7206208744@bastion.fedora.phx.redhat.com>

lmacken has set the watchcommits acl on valknut (Fedora 10) to Approved for mjakubicek

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/valknut



From pkgdb at fedoraproject.org  Wed Jan 28 17:34:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Wed, 28 Jan 2009 17:34:18 +0000
Subject: [pkgdb] valknut had acl change status
Message-ID: <20090128173418.9EC9D20876A@bastion.fedora.phx.redhat.com>

lmacken has set the watchbugzilla acl on valknut (Fedora 10) to Approved for mjakubicek

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/valknut



From tuxbrewr at fedoraproject.org  Wed Jan 28 17:41:17 2009
From: tuxbrewr at fedoraproject.org (Steven M. Parrish)
Date: Wed, 28 Jan 2009 17:41:17 +0000 (UTC)
Subject: rpms/kpackagekit/devel .cvsignore, 1.7, 1.8 kpackagekit.spec, 1.15, 
	1.16 sources, 1.7, 1.8
Message-ID: <20090128174118.04D317010D@cvs1.fedora.phx.redhat.com>

Author: tuxbrewr

Update of /cvs/pkgs/rpms/kpackagekit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7410

Modified Files:
	.cvsignore kpackagekit.spec sources 
Log Message:
SVN release for compatibility with PackageKit 0.4.2


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kpackagekit/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	27 Nov 2008 21:54:08 -0000	1.7
+++ .cvsignore	28 Jan 2009 17:40:47 -0000	1.8
@@ -1 +1 @@
-84745-kpackagekit-0.3.1.tar.bz2
+kpackagekit-01282009svn.tar.gz


Index: kpackagekit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kpackagekit/devel/kpackagekit.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- kpackagekit.spec	27 Nov 2008 21:54:08 -0000	1.15
+++ kpackagekit.spec	28 Jan 2009 17:40:47 -0000	1.16
@@ -1,33 +1,34 @@
 %define betaversion b4
 
 Name:	  	kpackagekit
-Version:	0.3.1
-Release:	6%{?dist}
+Version:	0.4.2
+Release:	svn.1%{?dist}
 Summary:	KDE interface for PackageKit
 
 License:	GPLv2+
 Group:		Applications/System
-Source0: 	http://www.kde-apps.org/CONTENT/content-files/84745-kpackagekit-%{version}.tar.bz2
+#Source0: 	http://www.kde-apps.org/CONTENT/content-files/84745-kpackagekit-%{version}.tar.bz2
+Source0:	kpackagekit-01282009svn.tar.gz
 URL:		http://www.kde-apps.org/content/show.php/KPackageKit?content=84745
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Patch1: kpackagekit-0.3.1-kdeinit.patch
-Patch3: kpackagekit-0.3.1-pk_api.patch
+#Patch1: kpackagekit-0.3.1-kdeinit.patch
+#Patch3: kpackagekit-0.3.1-pk_api.patch
 
 BuildRequires:	cmake
 BuildRequires:  desktop-file-utils
 BuildRequires:	kde-filesystem
 BuildRequires:	kdelibs4-devel
-BuildRequires:	PackageKit-qt-devel >= 0.3.11
+BuildRequires:	PackageKit-qt-devel >= 0.4.2
 
 %description
 KDE interface for PackageKit.
 
 %prep
-%setup -q -n KPackageKit 
+%setup -q -n kpackagekit 
 
-%patch1 -p1 -b .kdeinit
-%patch3 -p1 -b .pk_api
+#%patch1 -p1 -b .kdeinit
+#%patch3 -p1 -b .pk_api
 
 
 %build
@@ -57,17 +58,21 @@
 
 %files
 %defattr(-,root,root,-)
+%{_libdir}/libkpackagekitlib.so
 %{_bindir}/kpackagekit
 %{_bindir}/kpackagekit-smart-icon
 %{_kde4_libdir}/kde4/*.so
 %{_kde4_datadir}/applications/kde4/kpackagekit.desktop
 %{_kde4_datadir}/kde4/services/*.desktop
 %{_kde4_datadir}/kde4/services/kded/*.desktop
-%{_kde4_appsdir}/kpackagekit/
-%{_kde4_appsdir}/KPackageKit/
+%{_kde4_appsdir}/kpackagekit/*
+%{_kde4_appsdir}/kpackagekit-smart-icon/kpackagekit-smart-icon.notifyrc
 
 
 %changelog
+* Wed Jan 28 2009 Steven M. Parrish <smparrish at shallowcreek.net> 0.4.2-svn.1
+- SVN build to solve compatibility issues with packagekit 0.4.2
+
 * Wed Nov 26 2008 Rex Dieter <rdieter at fedoraproject.org> 0.3.1-6
 - respin (PackageKit)
 - spec cleanup


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kpackagekit/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	27 Nov 2008 21:54:08 -0000	1.7
+++ sources	28 Jan 2009 17:40:47 -0000	1.8
@@ -1 +1 @@
-eb4db65cf2b252dc39eb844ccc174a4d  84745-kpackagekit-0.3.1.tar.bz2
+f494195e92d041cf85aa08983bd5f6af  kpackagekit-01282009svn.tar.gz



From twaugh at fedoraproject.org  Wed Jan 28 17:42:46 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Wed, 28 Jan 2009 17:42:46 +0000 (UTC)
Subject: rpms/cups/devel cups-str3059.patch,NONE,1.1 cups.spec,1.456,1.457
Message-ID: <20090128174246.5B3497010D@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/cups/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7810

Modified Files:
	cups.spec 
Added Files:
	cups-str3059.patch 
Log Message:
* Wed Jan 28 2009 Tim Waugh <twaugh at redhat.com>
- Load MIME type rules correctly (bug #426089, STR #3059).


cups-str3059.patch:

--- NEW FILE cups-str3059.patch ---
diff -up cups-1.4b2/CHANGES-1.3.txt.str3059 cups-1.4b2/CHANGES-1.3.txt
diff -up cups-1.4b2/scheduler/type.c.str3059 cups-1.4b2/scheduler/type.c
--- cups-1.4b2/scheduler/type.c.str3059	2008-07-11 23:46:21.000000000 +0100
+++ cups-1.4b2/scheduler/type.c	2009-01-28 17:40:23.000000000 +0000
@@ -188,8 +188,7 @@ mimeAddTypeRule(mime_type_t *mt,	/* I - 
     else if (*rule == '+' && current != NULL)
     {
       if (logic != MIME_MAGIC_AND &&
-          current != NULL && current->prev != NULL &&
-	  current->prev->prev != NULL)
+          current != NULL && current->prev != NULL)
       {
        /*
         * OK, we have more than 1 rule in the current tree level...  Make a


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/devel/cups.spec,v
retrieving revision 1.456
retrieving revision 1.457
diff -u -r1.456 -r1.457
--- cups.spec	28 Jan 2009 17:17:46 -0000	1.456
+++ cups.spec	28 Jan 2009 17:42:16 -0000	1.457
@@ -48,6 +48,7 @@
 Patch22: cups-build.patch
 Patch23: cups-str3077.patch
 Patch24: cups-str3078.patch
+Patch25: cups-str3059.patch
 Patch100: cups-lspp.patch
 Epoch: 1
 Url: http://www.cups.org/
@@ -192,6 +193,7 @@
 %patch22 -p1 -b .build
 %patch23 -p1 -b .str3077
 %patch24 -p1 -b .str3078
+%patch25 -p1 -b .str3059
 
 %if %lspp
 %patch100 -p1 -b .lspp
@@ -458,6 +460,9 @@
 %{_libdir}/php/modules/*.so
 
 %changelog
+* Wed Jan 28 2009 Tim Waugh <twaugh at redhat.com>
+- Load MIME type rules correctly (bug #426089, STR #3059).
+
 * Wed Jan 28 2009 Tim Waugh <twaugh at redhat.com> 1:1.4-0.b2.4
 - Fixed quotas (STR #3077, STR #3078).
 



From salimma at fedoraproject.org  Wed Jan 28 17:48:16 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Wed, 28 Jan 2009 17:48:16 +0000 (UTC)
Subject: rpms/rubberband/F-9 rubberband-1.2-gcc43.patch, NONE,
	1.1 rubberband-1.2-mk.patch, NONE, 1.1 .cvsignore, 1.2,
	1.3 rubberband.spec, 1.2, 1.3 sources, 1.2,
	1.3 rubberband-1.0.1-destdir.patch, 1.1,
	NONE rubberband-1.0.1-gcc43.patch, 1.1, NONE
Message-ID: <20090128174816.6CA257010D@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/rubberband/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8735

Modified Files:
	.cvsignore rubberband.spec sources 
Added Files:
	rubberband-1.2-gcc43.patch rubberband-1.2-mk.patch 
Removed Files:
	rubberband-1.0.1-destdir.patch rubberband-1.0.1-gcc43.patch 
Log Message:
* Thu Jul 17 2008 Michel Salim <salimma at fedoraproject.org> - 1.2-1
- Update to 1.2


rubberband-1.2-gcc43.patch:

--- NEW FILE rubberband-1.2-gcc43.patch ---
--- rubberband-1.2/src/sysutils.cpp.gcc43	2008-07-08 11:43:31.000000000 -0400
+++ rubberband-1.2/src/sysutils.cpp	2008-07-17 18:28:42.000000000 -0400
@@ -25,6 +25,7 @@
 #endif /* !__APPLE__, !_WIN32 */
 #endif /* !_WIN32 */
 
+#include <cstdlib>
 #include <iostream>
 
 

rubberband-1.2-mk.patch:

--- NEW FILE rubberband-1.2-mk.patch ---
--- rubberband-1.2/Makefile.in.mk	2008-07-05 11:22:51.000000000 -0400
+++ rubberband-1.2/Makefile.in	2008-07-17 18:32:21.000000000 -0400
@@ -28,11 +28,11 @@
 
 INSTALL_BINDIR		:= @prefix@/bin
 INSTALL_INCDIR		:= @prefix@/include/rubberband
-INSTALL_LIBDIR		:= @prefix@/lib
-INSTALL_VAMPDIR		:= @prefix@/lib/vamp
-INSTALL_LADSPADIR	:= @prefix@/lib/ladspa
+INSTALL_LIBDIR		:= @libdir@
+INSTALL_VAMPDIR		:= @libdir@/vamp
+INSTALL_LADSPADIR	:= @libdir@/ladspa
 INSTALL_LRDFDIR		:= @prefix@/share/ladspa/rdf
-INSTALL_PKGDIR		:= @prefix@/lib/pkgconfig
+INSTALL_PKGDIR		:= @libdir@/pkgconfig
 
 all:	bin lib $(PROGRAM_TARGET) $(STATIC_TARGET) $(DYNAMIC_TARGET) $(VAMP_TARGET) $(LADSPA_TARGET)
 
@@ -138,17 +138,17 @@
 	$(MKDIR) -p $(DESTDIR)$(INSTALL_LADSPADIR)
 	$(MKDIR) -p $(DESTDIR)$(INSTALL_LRDFDIR)
 	$(MKDIR) -p $(DESTDIR)$(INSTALL_PKGDIR)
-	cp $(PROGRAM_TARGET) $(DESTDIR)$(INSTALL_BINDIR)
-	cp $(PUBLIC_INCLUDES) $(DESTDIR)$(INSTALL_INCDIR)
-	cp $(STATIC_TARGET) $(DESTDIR)$(INSTALL_LIBDIR)
+	cp -p $(PROGRAM_TARGET) $(DESTDIR)$(INSTALL_BINDIR)
+	cp -p $(PUBLIC_INCLUDES) $(DESTDIR)$(INSTALL_INCDIR)
+	cp -p $(STATIC_TARGET) $(DESTDIR)$(INSTALL_LIBDIR)
 	rm -f $(DESTDIR)$(INSTALL_LIBDIR)/$(DYNAMIC_LIBNAME)$(DYNAMIC_ABI_VERSION)
 	rm -f $(DESTDIR)$(INSTALL_LIBDIR)/$(DYNAMIC_LIBNAME)
-	cp $(DYNAMIC_TARGET) $(DESTDIR)$(INSTALL_LIBDIR)/$(DYNAMIC_LIBNAME)$(DYNAMIC_FULL_VERSION)
+	cp -p $(DYNAMIC_TARGET) $(DESTDIR)$(INSTALL_LIBDIR)/$(DYNAMIC_LIBNAME)$(DYNAMIC_FULL_VERSION)
 	test -n "$(DYNAMIC_FULL_VERSION)" && ln -s $(DYNAMIC_LIBNAME)$(DYNAMIC_FULL_VERSION) $(DESTDIR)$(INSTALL_LIBDIR)/$(DYNAMIC_LIBNAME)$(DYNAMIC_ABI_VERSION)
 	test -n "$(DYNAMIC_FULL_VERSION)" && ln -s $(DYNAMIC_LIBNAME)$(DYNAMIC_FULL_VERSION) $(DESTDIR)$(INSTALL_LIBDIR)/$(DYNAMIC_LIBNAME)
-	cp $(VAMP_TARGET) $(DESTDIR)$(INSTALL_VAMPDIR)
+	cp -p $(VAMP_TARGET) $(DESTDIR)$(INSTALL_VAMPDIR)
 	cp src/vamp/vamp-rubberband.cat $(DESTDIR)$(INSTALL_VAMPDIR)
-	cp $(LADSPA_TARGET) $(DESTDIR)$(INSTALL_LADSPADIR)
+	cp -p $(LADSPA_TARGET) $(DESTDIR)$(INSTALL_LADSPADIR)
 	cp src/ladspa/ladspa-rubberband.cat $(DESTDIR)$(INSTALL_LADSPADIR)
 	cp src/ladspa/ladspa-rubberband.rdf $(DESTDIR)$(INSTALL_LRDFDIR)
 	sed "s,%PREFIX%, at prefix@," rubberband.pc.in \


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rubberband/F-9/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	4 Apr 2008 04:10:25 -0000	1.2
+++ .cvsignore	28 Jan 2009 17:47:45 -0000	1.3
@@ -1 +1 @@
-rubberband-1.0.1.tar.bz2
+rubberband-1.2.tar.bz2


Index: rubberband.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rubberband/F-9/rubberband.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- rubberband.spec	15 Dec 2008 02:27:58 -0000	1.2
+++ rubberband.spec	28 Jan 2009 17:47:46 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           rubberband
 Version:        1.2
-Release:        2%{?dist}
+Release:        1%{?dist}
 Summary:        Audio time-stretching and pitch-shifting library
 
 Group:          System Environment/Libraries
@@ -76,10 +76,7 @@
 
 
 %changelog
-* Sun Dec 14 2008 Michel Salim <salimma at fedoraproject.org> - 1.2-2
-- Rebuild for vamp-plugins-sdk-2.0
-
-* Thu Jul 17 2008 Michel Alexandre Salim <salimma at fedoraproject.org> - 1.2-1
+* Thu Jul 17 2008 Michel Salim <salimma at fedoraproject.org> - 1.2-1
 - Update to 1.2
 
 * Sun Mar 30 2008 Michel Salim <michel.sylvan at gmail.com> - 1.0.1-1


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rubberband/F-9/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	4 Apr 2008 04:10:25 -0000	1.2
+++ sources	28 Jan 2009 17:47:46 -0000	1.3
@@ -1 +1 @@
-eb9524064ae48d6a3af0779590ff4ebc  rubberband-1.0.1.tar.bz2
+9092a73906fd56c3e733fd955b802736  rubberband-1.2.tar.bz2


--- rubberband-1.0.1-destdir.patch DELETED ---


--- rubberband-1.0.1-gcc43.patch DELETED ---



From twaugh at fedoraproject.org  Wed Jan 28 17:49:43 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Wed, 28 Jan 2009 17:49:43 +0000 (UTC)
Subject: rpms/cups/F-10 cups-str3059.patch,NONE,1.1 cups.spec,1.452,1.453
Message-ID: <20090128174943.04F977010D@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/cups/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9030

Modified Files:
	cups.spec 
Added Files:
	cups-str3059.patch 
Log Message:
* Wed Jan 28 2009 Tim Waugh <twaugh at redhat.com>
- Load MIME type rules correctly (bug #426089, STR #3059).


cups-str3059.patch:

--- NEW FILE cups-str3059.patch ---
diff -up cups-1.3.9/scheduler/type.c.str3059 cups-1.3.9/scheduler/type.c
--- cups-1.3.9/scheduler/type.c.str3059	2008-07-11 23:48:49.000000000 +0100
+++ cups-1.3.9/scheduler/type.c	2009-01-28 17:42:27.000000000 +0000
@@ -187,8 +187,7 @@ mimeAddTypeRule(mime_type_t *mt,	/* I - 
     else if (*rule == '+' && current != NULL)
     {
       if (logic != MIME_MAGIC_AND &&
-          current != NULL && current->prev != NULL &&
-	  current->prev->prev != NULL)
+          current != NULL && current->prev != NULL)
       {
        /*
         * OK, we have more than 1 rule in the current tree level...  Make a


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-10/cups.spec,v
retrieving revision 1.452
retrieving revision 1.453
diff -u -r1.452 -r1.453
--- cups.spec	28 Jan 2009 17:18:09 -0000	1.452
+++ cups.spec	28 Jan 2009 17:49:12 -0000	1.453
@@ -55,6 +55,7 @@
 Patch29: cups-str2831.patch
 Patch30: cups-str3077.patch
 Patch31: cups-str3078.patch
+Patch32: cups-str3059.patch
 Patch100: cups-lspp.patch
 Epoch: 1
 Url: http://www.cups.org/
@@ -196,6 +197,7 @@
 %patch29 -p1 -b .str2831
 %patch30 -p1 -b .str3077
 %patch31 -p1 -b .str3078
+%patch32 -p1 -b .str3059
 
 %if %lspp
 %patch100 -p1 -b .lspp
@@ -484,6 +486,9 @@
 %{_libdir}/php/modules/*.so
 
 %changelog
+* Wed Jan 28 2009 Tim Waugh <twaugh at redhat.com>
+- Load MIME type rules correctly (bug #426089, STR #3059).
+
 * Wed Jan 28 2009 Tim Waugh <twaugh at redhat.com> 1:1.3.9-7
 - Fixed quotas (STR #3077, STR #3078).
 



From twaugh at fedoraproject.org  Wed Jan 28 17:50:33 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Wed, 28 Jan 2009 17:50:33 +0000 (UTC)
Subject: rpms/cups/F-9 cups-str3077.patch, NONE, 1.1 cups-str3078.patch, NONE,
	1.1 cups-direct-usb.patch, 1.7, 1.8 cups-driverd-timeout.patch,
	1.1, 1.2 cups-eggcups.patch, 1.7, 1.8 cups-lspp.patch, 1.36,
	1.37 cups-serverbin-compat.patch, 1.3,
	1.4 cups-usb-paperout.patch, 1.5, 1.6 cups.spec, 1.433, 1.434
Message-ID: <20090128175033.640847010D@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/cups/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9319

Modified Files:
	cups-direct-usb.patch cups-driverd-timeout.patch 
	cups-eggcups.patch cups-lspp.patch cups-serverbin-compat.patch 
	cups-usb-paperout.patch cups.spec 
Added Files:
	cups-str3077.patch cups-str3078.patch 
Log Message:
* Wed Jan 28 2009 Tim Waugh <twaugh at redhat.com>
- Fixed quotas (STR #3077, STR #3078).
- Removed all patch fuzz.


cups-str3077.patch:

--- NEW FILE cups-str3077.patch ---
diff -up cups-1.3.9/cups/encode.c.str3077 cups-1.3.9/cups/encode.c
--- cups-1.3.9/cups/encode.c.str3077	2008-07-11 23:48:49.000000000 +0100
+++ cups-1.3.9/cups/encode.c	2009-01-28 17:20:12.000000000 +0000
@@ -63,10 +63,10 @@ static const _ipp_option_t ipp_options[]
   { 0, "gamma-default",		IPP_TAG_INTEGER,	IPP_TAG_PRINTER },
   { 0, "hue",			IPP_TAG_INTEGER,	IPP_TAG_JOB },
   { 0, "hue-default",		IPP_TAG_INTEGER,	IPP_TAG_PRINTER },
-  { 0, "job-k-limit",		IPP_TAG_INTEGER,	IPP_TAG_JOB },
-  { 0, "job-page-limit",	IPP_TAG_INTEGER,	IPP_TAG_JOB },
+  { 0, "job-k-limit",		IPP_TAG_INTEGER,	IPP_TAG_PRINTER },
+  { 0, "job-page-limit",	IPP_TAG_INTEGER,	IPP_TAG_PRINTER },
   { 0, "job-priority",		IPP_TAG_INTEGER,	IPP_TAG_JOB },
-  { 0, "job-quota-period",	IPP_TAG_INTEGER,	IPP_TAG_JOB },
+  { 0, "job-quota-period",	IPP_TAG_INTEGER,	IPP_TAG_PRINTER },
   { 1, "job-sheets",		IPP_TAG_NAME,		IPP_TAG_JOB },
   { 1, "job-sheets-default",	IPP_TAG_NAME,		IPP_TAG_PRINTER },
   { 0, "job-uuid",		IPP_TAG_URI,		IPP_TAG_JOB },

cups-str3078.patch:

--- NEW FILE cups-str3078.patch ---
diff -up cups-1.3.9/scheduler/job.c.str3078 cups-1.3.9/scheduler/job.c
--- cups-1.3.9/scheduler/job.c.str3078	2009-01-28 17:19:52.000000000 +0000
+++ cups-1.3.9/scheduler/job.c	2009-01-28 17:20:30.000000000 +0000
@@ -3,7 +3,7 @@
  *
  *   Job management routines for the Common UNIX Printing System (CUPS).
  *
- *   Copyright 2007-2008 by Apple Inc.
+ *   Copyright 2007-2009 by Apple Inc.
  *   Copyright 1997-2007 by Easy Software Products, all rights reserved.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -1019,7 +1019,7 @@ cupsdLoadAllJobs(void)
  * 'cupsdLoadJob()' - Load a single job...
  */
 
-void
+int					/* O - 1 on success, 0 on failure */
 cupsdLoadJob(cupsd_job_t *job)		/* I - Job */
 {
   char			jobfile[1024];	/* Job filename */
@@ -1037,14 +1037,14 @@ cupsdLoadJob(cupsd_job_t *job)		/* I - J
     if (job->state_value > IPP_JOB_STOPPED)
       job->access_time = time(NULL);
 
-    return;
+    return (1);
   }
 
   if ((job->attrs = ippNew()) == NULL)
   {
     cupsdLogMessage(CUPSD_LOG_ERROR,
                     "[Job %d] Ran out of memory for job attributes!", job->id);
-    return;
+    return (0);
   }
 
  /*
@@ -1059,9 +1059,7 @@ cupsdLoadJob(cupsd_job_t *job)		/* I - J
     cupsdLogMessage(CUPSD_LOG_ERROR,
 	            "[Job %d] Unable to open job control file \"%s\" - %s!",
 	            job->id, jobfile, strerror(errno));
-    ippDelete(job->attrs);
-    job->attrs = NULL;
-    return;
+    goto error;
   }
 
   if (ippReadIO(fp, (ipp_iocb_t)cupsFileRead, 1, NULL, job->attrs) != IPP_DATA)
@@ -1070,10 +1068,7 @@ cupsdLoadJob(cupsd_job_t *job)		/* I - J
                     "[Job %d] Unable to read job control file \"%s\"!",
 	            job->id, jobfile);
     cupsFileClose(fp);
-    ippDelete(job->attrs);
-    job->attrs = NULL;
-    unlink(jobfile);
-    return;
+    goto error;
   }
 
   cupsFileClose(fp);
@@ -1089,10 +1084,7 @@ cupsdLoadJob(cupsd_job_t *job)		/* I - J
 	            "[Job %d] Missing or bad job-state attribute in "
 		    "control file!",
 	            job->id);
-    ippDelete(job->attrs);
-    job->attrs = NULL;
-    unlink(jobfile);
-    return;
+    goto error;
   }
 
   job->state_value = (ipp_jstate_t)job->state->values[0].integer;
@@ -1105,10 +1097,7 @@ cupsdLoadJob(cupsd_job_t *job)		/* I - J
       cupsdLogMessage(CUPSD_LOG_ERROR,
 	              "[Job %d] No job-printer-uri attribute in control file!",
 	              job->id);
-      ippDelete(job->attrs);
-      job->attrs = NULL;
-      unlink(jobfile);
-      return;
+      goto error;
     }
 
     if ((dest = cupsdValidateDest(attr->values[0].string.text, &(job->dtype),
@@ -1117,10 +1106,7 @@ cupsdLoadJob(cupsd_job_t *job)		/* I - J
       cupsdLogMessage(CUPSD_LOG_ERROR,
 	              "[Job %d] Unable to queue job for destination \"%s\"!",
 	              job->id, attr->values[0].string.text);
-      ippDelete(job->attrs);
-      job->attrs = NULL;
-      unlink(jobfile);
-      return;
+      goto error;
     }
 
     cupsdSetString(&job->dest, dest);
@@ -1130,10 +1116,7 @@ cupsdLoadJob(cupsd_job_t *job)		/* I - J
     cupsdLogMessage(CUPSD_LOG_ERROR,
 		    "[Job %d] Unable to queue job for destination \"%s\"!",
 		    job->id, job->dest);
-    ippDelete(job->attrs);
-    job->attrs = NULL;
-    unlink(jobfile);
-    return;
+    goto error;
   }
 
   job->sheets     = ippFindAttribute(job->attrs, "job-media-sheets-completed",
@@ -1148,10 +1131,7 @@ cupsdLoadJob(cupsd_job_t *job)		/* I - J
       cupsdLogMessage(CUPSD_LOG_ERROR,
 	              "[Job %d] Missing or bad job-priority attribute in "
 		      "control file!", job->id);
-      ippDelete(job->attrs);
-      job->attrs = NULL;
-      unlink(jobfile);
-      return;
+      goto error;
     }
 
     job->priority = attr->values[0].integer;
@@ -1165,10 +1145,7 @@ cupsdLoadJob(cupsd_job_t *job)		/* I - J
       cupsdLogMessage(CUPSD_LOG_ERROR,
 	              "[Job %d] Missing or bad job-originating-user-name "
 		      "attribute in control file!", job->id);
-      ippDelete(job->attrs);
-      job->attrs = NULL;
-      unlink(jobfile);
-      return;
+      goto error;
     }
 
     cupsdSetString(&job->username, attr->values[0].string.text);
@@ -1237,7 +1214,7 @@ cupsdLoadJob(cupsd_job_t *job)		/* I - J
           cupsdLogMessage(CUPSD_LOG_ERROR,
 	                  "[Job %d] Ran out of memory for job file types!",
 			  job->id);
-	  return;
+	  return (1);
 	}
 
         job->compressions = compressions;
@@ -1293,7 +1270,20 @@ cupsdLoadJob(cupsd_job_t *job)		/* I - J
       cupsFileClose(fp);
     }
   }
+
   job->access_time = time(NULL);
+  return (1);
+
+ /*
+  * If we get here then something bad happened...
+  */
+
+  error:
+
+  ippDelete(job->attrs);
+  job->attrs = NULL;
+  unlink(jobfile);
+  return (0);
 }
 
 
diff -up cups-1.3.9/scheduler/job.h.str3078 cups-1.3.9/scheduler/job.h
--- cups-1.3.9/scheduler/job.h.str3078	2008-01-16 22:20:33.000000000 +0000
+++ cups-1.3.9/scheduler/job.h	2009-01-28 17:20:30.000000000 +0000
@@ -3,7 +3,7 @@
  *
  *   Print job definitions for the Common UNIX Printing System (CUPS) scheduler.
  *
- *   Copyright 2007-2008 by Apple Inc.
+ *   Copyright 2007-2009 by Apple Inc.
  *   Copyright 1997-2007 by Easy Software Products, all rights reserved.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -112,7 +112,7 @@ extern int		cupsdGetPrinterJobCount(cons
 extern int		cupsdGetUserJobCount(const char *username);
 extern void		cupsdHoldJob(cupsd_job_t *job);
 extern void		cupsdLoadAllJobs(void);
-extern void		cupsdLoadJob(cupsd_job_t *job);
+extern int		cupsdLoadJob(cupsd_job_t *job);
 extern void		cupsdMoveJob(cupsd_job_t *job, cupsd_printer_t *p);
 extern void		cupsdReleaseJob(cupsd_job_t *job);
 extern void		cupsdRestartJob(cupsd_job_t *job);
diff -up cups-1.3.9/scheduler/quotas.c.str3078 cups-1.3.9/scheduler/quotas.c
--- cups-1.3.9/scheduler/quotas.c.str3078	2007-09-12 22:33:23.000000000 +0100
+++ cups-1.3.9/scheduler/quotas.c	2009-01-28 17:20:30.000000000 +0000
@@ -3,7 +3,7 @@
  *
  *   Quota routines for the Common UNIX Printing System (CUPS).
  *
- *   Copyright 2007 by Apple Inc.
+ *   Copyright 2007-2009 by Apple Inc.
  *   Copyright 1997-2007 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -155,10 +155,22 @@ cupsdUpdateQuota(
        job;
        job = (cupsd_job_t *)cupsArrayNext(Jobs))
   {
+   /*
+    * We only care about the current printer/class and user...
+    */
+
     if (strcasecmp(job->dest, p->name) != 0 ||
         strcasecmp(job->username, q->username) != 0)
       continue;
 
+   /*
+    * Make sure attributes are loaded; we always call cupsdLoadJob() to ensure
+    * the access_time member is updated so the job isn't unloaded right away...
+    */
+
+    if (!cupsdLoadJob(job))
+      continue;
+
     if ((attr = ippFindAttribute(job->attrs, "time-at-completion",
                                  IPP_TAG_INTEGER)) == NULL)
       if ((attr = ippFindAttribute(job->attrs, "time-at-processing",
@@ -166,11 +178,22 @@ cupsdUpdateQuota(
         attr = ippFindAttribute(job->attrs, "time-at-creation",
                                 IPP_TAG_INTEGER);
 
-    if (attr == NULL)
-      break;
+    if (!attr)
+    {
+     /*
+      * This should never happen since cupsdLoadJob() checks for
+      * time-at-creation, but if it does just ignore this job...
+      */
+
+      continue;
+    }
 
     if (attr->values[0].integer < curtime)
     {
+     /*
+      * This job is too old to count towards the quota, ignore it...
+      */
+
       if (JobAutoPurge)
         cupsdCancelJob(job, 1, IPP_JOB_CANCELED);
 

cups-direct-usb.patch:

Index: cups-direct-usb.patch
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-9/cups-direct-usb.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- cups-direct-usb.patch	13 Jun 2007 16:15:27 -0000	1.7
+++ cups-direct-usb.patch	28 Jan 2009 17:50:02 -0000	1.8
@@ -1,7 +1,8 @@
---- cups-1.2.11/backend/usb-unix.c.direct-usb	2007-05-04 15:03:02.000000000 +0100
-+++ cups-1.2.11/backend/usb-unix.c	2007-06-13 16:46:56.000000000 +0100
-@@ -101,6 +101,9 @@
-              strcasecmp(hostname, "Minolta");
+diff -up cups-1.3.9/backend/usb-unix.c.direct-usb cups-1.3.9/backend/usb-unix.c
+--- cups-1.3.9/backend/usb-unix.c.direct-usb	2008-07-11 23:48:49.000000000 +0100
++++ cups-1.3.9/backend/usb-unix.c	2009-01-28 17:33:29.000000000 +0000
+@@ -94,6 +94,9 @@ print_device(const char *uri,		/* I - De
+              strncasecmp(hostname, "Minolta", 7);
  #endif /* __FreeBSD__ || __NetBSD__ || __OpenBSD__ || __DragonFly__ */
  
 +    if (use_bc && !strncmp(uri, "usb:/dev/", 9))
@@ -10,7 +11,7 @@
      if ((device_fd = open_device(uri, &use_bc)) == -1)
      {
        if (getenv("CLASS") != NULL)
-@@ -317,12 +320,7 @@
+@@ -320,12 +323,7 @@ open_device(const char *uri,		/* I - Dev
    if (!strncmp(uri, "usb:/dev/", 9))
  #ifdef __linux
    {

cups-driverd-timeout.patch:

Index: cups-driverd-timeout.patch
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-9/cups-driverd-timeout.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cups-driverd-timeout.patch	22 Nov 2006 10:48:21 -0000	1.1
+++ cups-driverd-timeout.patch	28 Jan 2009 17:50:02 -0000	1.2
@@ -1,6 +1,7 @@
---- cups-1.2.7/scheduler/ipp.c.driverd-timeout	2006-11-22 10:41:28.000000000 +0000
-+++ cups-1.2.7/scheduler/ipp.c	2006-11-22 10:45:55.000000000 +0000
-@@ -4175,7 +4175,7 @@
+diff -up cups-1.3.9/scheduler/ipp.c.driverd-timeout cups-1.3.9/scheduler/ipp.c
+--- cups-1.3.9/scheduler/ipp.c.driverd-timeout	2009-01-28 17:34:35.000000000 +0000
++++ cups-1.3.9/scheduler/ipp.c	2009-01-28 17:35:17.000000000 +0000
+@@ -4424,7 +4424,7 @@ copy_model(cupsd_client_t *con,		/* I - 
    close(temppipe[1]);
  
   /*
@@ -9,12 +10,12 @@
    */
  
    total = 0;
-@@ -4196,7 +4196,7 @@
-     FD_SET(temppipe[0], input);
-     FD_SET(CGIPipes[0], input);
+@@ -4444,7 +4444,7 @@ copy_model(cupsd_client_t *con,		/* I - 
+     FD_SET(temppipe[0], &input);
+     FD_SET(CGIPipes[0], &input);
  
 -    timeout.tv_sec  = 30;
 +    timeout.tv_sec  = 70;
      timeout.tv_usec = 0;
  
-     if ((i = select(maxfd, input, NULL, NULL, &timeout)) < 0)
+     if ((i = select(maxfd, &input, NULL, NULL, &timeout)) < 0)

cups-eggcups.patch:

Index: cups-eggcups.patch
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-9/cups-eggcups.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- cups-eggcups.patch	18 Jul 2007 11:50:02 -0000	1.7
+++ cups-eggcups.patch	28 Jan 2009 17:50:02 -0000	1.8
@@ -1,6 +1,7 @@
---- cups-1.3b1/backend/ipp.c.eggcups	2007-07-11 22:46:42.000000000 +0100
-+++ cups-1.3b1/backend/ipp.c	2007-07-18 11:34:16.000000000 +0100
-@@ -57,6 +57,70 @@
+diff -up cups-1.3.9/backend/ipp.c.eggcups cups-1.3.9/backend/ipp.c
+--- cups-1.3.9/backend/ipp.c.eggcups	2008-09-26 22:59:39.000000000 +0100
++++ cups-1.3.9/backend/ipp.c	2009-01-28 17:34:27.000000000 +0000
+@@ -59,6 +59,70 @@ static char	pstmpname[1024] = "";	/* Tem
  static char	tmpfilename[1024] = "";	/* Temporary spool file name */
  static int	job_cancelled = 0;	/* Job cancelled? */
  
@@ -71,8 +72,8 @@
  
  /*
   * Local functions...
-@@ -974,6 +1038,15 @@
-       fprintf(stderr, _("NOTICE: Print file accepted - job ID %d.\n"), job_id);
+@@ -1011,6 +1075,15 @@ main(int  argc,				/* I - Number of comm
+                       job_id);
      }
  
 +#if HAVE_DBUS
@@ -87,9 +88,10 @@
      ippDelete(response);
  
      if (job_cancelled)
---- cups-1.3b1/backend/Makefile.eggcups	2007-07-11 22:46:42.000000000 +0100
-+++ cups-1.3b1/backend/Makefile	2007-07-18 11:36:35.000000000 +0100
-@@ -131,7 +131,7 @@
+diff -up cups-1.3.9/backend/Makefile.eggcups cups-1.3.9/backend/Makefile
+--- cups-1.3.9/backend/Makefile.eggcups	2007-08-08 20:27:51.000000000 +0100
++++ cups-1.3.9/backend/Makefile	2009-01-28 17:33:39.000000000 +0000
+@@ -131,7 +131,7 @@ ieee1394-linux.o:	ieee1394.h
  
  ipp:	ipp.o ../cups/$(LIBCUPS)
  	echo Linking $@...
@@ -98,9 +100,10 @@
  	$(RM) http
  	$(LN) ipp http
  
---- cups-1.3b1/scheduler/subscriptions.c.eggcups	2007-07-11 22:46:42.000000000 +0100
-+++ cups-1.3b1/scheduler/subscriptions.c	2007-07-18 11:34:16.000000000 +0100
-@@ -1292,13 +1292,13 @@
+diff -up cups-1.3.9/scheduler/subscriptions.c.eggcups cups-1.3.9/scheduler/subscriptions.c
+--- cups-1.3.9/scheduler/subscriptions.c.eggcups	2008-01-23 22:23:42.000000000 +0000
++++ cups-1.3.9/scheduler/subscriptions.c	2009-01-28 17:33:39.000000000 +0000
+@@ -1295,13 +1295,13 @@ cupsd_send_dbus(cupsd_eventmask_t event,
      what = "PrinterAdded";
    else if (event & CUPSD_EVENT_PRINTER_DELETED)
      what = "PrinterRemoved";
@@ -116,7 +119,7 @@
    else
      return;
  
-@@ -1334,7 +1334,7 @@
+@@ -1337,7 +1337,7 @@ cupsd_send_dbus(cupsd_eventmask_t event,
    dbus_message_append_iter_init(message, &iter);
    if (dest)
      dbus_message_iter_append_string(&iter, dest->name);

cups-lspp.patch:

Index: cups-lspp.patch
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-9/cups-lspp.patch,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- cups-lspp.patch	10 Sep 2008 15:19:33 -0000	1.36
+++ cups-lspp.patch	28 Jan 2009 17:50:02 -0000	1.37
@@ -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-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 @@
+diff -up cups-1.3.9/config.h.in.lspp cups-1.3.9/config.h.in
+--- cups-1.3.9/config.h.in.lspp	2009-01-28 17:37:32.000000000 +0000
++++ cups-1.3.9/config.h.in	2009-01-28 17:37:32.000000000 +0000
+@@ -551,6 +551,13 @@
  #undef HAVE_REMOVEFILE
  
  
@@ -15,9 +15,9 @@
  #endif /* !_CUPS_CONFIG_H_ */
  
  /*
-diff -up /dev/null cups-1.3.8/config-scripts/cups-lspp.m4
---- /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
+diff -up /dev/null cups-1.3.9/config-scripts/cups-lspp.m4
+--- /dev/null	2009-01-28 08:58:18.489189414 +0000
++++ cups-1.3.9/config-scripts/cups-lspp.m4	2009-01-28 17:37:32.000000000 +0000
 @@ -0,0 +1,36 @@
 +dnl
 +dnl   LSPP code for the Common UNIX Printing System (CUPS).
@@ -55,9 +55,9 @@
 +            ;;
 +    esac
 +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-09-10 16:18:26.000000000 +0100
+diff -up cups-1.3.9/configure.in.lspp cups-1.3.9/configure.in
+--- cups-1.3.9/configure.in.lspp	2007-07-25 00:47:12.000000000 +0100
++++ cups-1.3.9/configure.in	2009-01-28 17:37:32.000000000 +0000
 @@ -42,6 +42,8 @@ sinclude(config-scripts/cups-pap.m4)
  sinclude(config-scripts/cups-pdf.m4)
  sinclude(config-scripts/cups-scripting.m4)
@@ -67,9 +67,9 @@
  INSTALL_LANGUAGES=""
  UNINSTALL_LANGUAGES=""
  LANGFILES=""
-diff -up cups-1.3.8/configure.lspp cups-1.3.8/configure
---- 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
+diff -up cups-1.3.9/configure.lspp cups-1.3.9/configure
+--- cups-1.3.9/configure.lspp	2009-01-28 17:37:32.000000000 +0000
++++ cups-1.3.9/configure	2009-01-28 17:37:32.000000000 +0000
 @@ -807,6 +807,8 @@ PHP
  PHPCONFIG
  PHPDIR
@@ -87,7 +87,7 @@
  
  Optional Packages:
    --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
-@@ -18555,6 +18558,412 @@ fi
+@@ -18862,6 +18865,412 @@ fi
  
  
  
@@ -500,7 +500,7 @@
  INSTALL_LANGUAGES=""
  UNINSTALL_LANGUAGES=""
  LANGFILES=""
-@@ -19449,7 +19858,7 @@ PHP!$PHP$ac_delim
+@@ -19756,7 +20165,7 @@ PHP!$PHP$ac_delim
  PHPCONFIG!$PHPCONFIG$ac_delim
  PHPDIR!$PHPDIR$ac_delim
  PYTHON!$PYTHON$ac_delim
@@ -509,7 +509,7 @@
  _ACEOF
  
    if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
-@@ -19491,12 +19900,14 @@ _ACEOF
+@@ -19798,12 +20207,14 @@ _ACEOF
  ac_delim='%!_!# '
  for ac_last_try in false false false false false :; do
    cat >conf$$subs.sed <<_ACEOF
@@ -525,9 +525,9 @@
      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-09-10 16:18:26.000000000 +0100
-+++ cups-1.3.8/cups/cups.h	2008-09-10 16:18:26.000000000 +0100
+diff -up cups-1.3.9/cups/cups.h.lspp cups-1.3.9/cups/cups.h
+--- cups-1.3.9/cups/cups.h.lspp	2009-01-28 17:37:32.000000000 +0000
++++ cups-1.3.9/cups/cups.h	2009-01-28 17:37:32.000000000 +0000
 @@ -15,6 +15,9 @@
   *   This file is subject to the Apple OS-Developed Software exception.
   */
@@ -551,9 +551,9 @@
  /*
   * Types and structures...
   */
-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-09-10 16:18:26.000000000 +0100
+diff -up cups-1.3.9/data/Makefile.lspp cups-1.3.9/data/Makefile
+--- cups-1.3.9/data/Makefile.lspp	2007-10-10 23:00:43.000000000 +0100
++++ cups-1.3.9/data/Makefile	2009-01-28 17:37:32.000000000 +0000
 @@ -25,7 +25,10 @@ BANNERS	=	\
  		secret \
  		standard \
@@ -566,9 +566,9 @@
  
  CHARMAPS =	\
  		euc-cn.txt \
-diff -up /dev/null cups-1.3.8/data/mls
---- /dev/null	2008-09-10 08:56:32.430063181 +0100
-+++ cups-1.3.8/data/mls	2008-09-10 16:18:26.000000000 +0100
+diff -up /dev/null cups-1.3.9/data/mls
+--- /dev/null	2009-01-28 08:58:18.489189414 +0000
++++ cups-1.3.9/data/mls	2009-01-28 17:37:32.000000000 +0000
 @@ -0,0 +1,261 @@
 +%!PS-Adobe-3.0
 +%%BoundingBox: 0 0 612 792
@@ -831,9 +831,9 @@
 +% End of "$Id$".
 +%
 +%%EOF
-diff -up /dev/null cups-1.3.8/data/selinux
---- /dev/null	2008-09-10 08:56:32.430063181 +0100
-+++ cups-1.3.8/data/selinux	2008-09-10 16:18:26.000000000 +0100
+diff -up /dev/null cups-1.3.9/data/selinux
+--- /dev/null	2009-01-28 08:58:18.489189414 +0000
++++ cups-1.3.9/data/selinux	2009-01-28 17:37:32.000000000 +0000
 @@ -0,0 +1,261 @@
 +%!PS-Adobe-3.0
 +%%BoundingBox: 0 0 612 792
@@ -1096,9 +1096,9 @@
 +% End of "$Id$".
 +%
 +%%EOF
-diff -up /dev/null cups-1.3.8/data/te
---- /dev/null	2008-09-10 08:56:32.430063181 +0100
-+++ cups-1.3.8/data/te	2008-09-10 16:18:26.000000000 +0100
+diff -up /dev/null cups-1.3.9/data/te
+--- /dev/null	2009-01-28 08:58:18.489189414 +0000
++++ cups-1.3.9/data/te	2009-01-28 17:37:32.000000000 +0000
 @@ -0,0 +1,261 @@
 +%!PS-Adobe-3.0
 +%%BoundingBox: 0 0 612 792
@@ -1361,9 +1361,9 @@
 +% End of "$Id$".
 +%
 +%%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-09-10 16:18:26.000000000 +0100
+diff -up cups-1.3.9/filter/common.c.lspp cups-1.3.9/filter/common.c
+--- cups-1.3.9/filter/common.c.lspp	2008-07-11 23:48:49.000000000 +0100
++++ cups-1.3.9/filter/common.c	2009-01-28 17:37:32.000000000 +0000
 @@ -30,6 +30,12 @@
   * Include necessary headers...
   */
@@ -1532,9 +1532,9 @@
  
  
  /*
-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-09-10 16:18:26.000000000 +0100
+diff -up cups-1.3.9/Makedefs.in.lspp cups-1.3.9/Makedefs.in
+--- cups-1.3.9/Makedefs.in.lspp	2008-01-22 22:37:21.000000000 +0000
++++ cups-1.3.9/Makedefs.in	2009-01-28 17:37:32.000000000 +0000
 @@ -134,7 +134,7 @@ LIBCUPSORDER	=	@LIBCUPSORDER@
  LIBCUPSIMAGEORDER =	@LIBCUPSIMAGEORDER@
  LINKCUPS	=	@LINKCUPS@ $(SSLLIBS)
@@ -1544,9 +1544,9 @@
  OPTIM		=	@OPTIM@
  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-09-10 16:18:26.000000000 +0100
-+++ cups-1.3.8/scheduler/client.c	2008-09-10 16:18:26.000000000 +0100
+diff -up cups-1.3.9/scheduler/client.c.lspp cups-1.3.9/scheduler/client.c
+--- cups-1.3.9/scheduler/client.c.lspp	2009-01-28 17:37:32.000000000 +0000
++++ cups-1.3.9/scheduler/client.c	2009-01-28 17:37:32.000000000 +0000
 @@ -40,12 +40,14 @@
   *   pipe_command()          - Pipe the output of a command to the remote client.
   *   write_file()            - Send a file via HTTP.
@@ -1633,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)",
-@@ -733,6 +792,13 @@ cupsdReadClient(cupsd_client_t *con)	/* 
+@@ -741,6 +800,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 */
@@ -1647,7 +1647,7 @@
  
  
    status = HTTP_CONTINUE;
-@@ -2017,6 +2083,67 @@ cupsdReadClient(cupsd_client_t *con)	/* 
+@@ -2034,6 +2100,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);
@@ -1715,7 +1715,7 @@
  	  }
  
  	  if (con->http.state != HTTP_POST_SEND)
-@@ -4288,6 +4415,50 @@ make_certificate(cupsd_client_t *con)	/*
+@@ -4305,6 +4432,50 @@ make_certificate(cupsd_client_t *con)	/*
  #endif /* HAVE_SSL */
  
  
@@ -1766,9 +1766,9 @@
  /*
   * 'pipe_command()' - Pipe the output of a command to the remote client.
   */
-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-09-10 16:18:26.000000000 +0100
+diff -up cups-1.3.9/scheduler/client.h.lspp cups-1.3.9/scheduler/client.h
+--- cups-1.3.9/scheduler/client.h.lspp	2007-10-22 19:52:13.000000000 +0100
++++ cups-1.3.9/scheduler/client.h	2009-01-28 17:37:32.000000000 +0000
 @@ -17,6 +17,13 @@
  #  include <Security/Authorization.h>
  #endif /* HAVE_AUTHORIZATION_H */
@@ -1804,9 +1804,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-09-10 16:18:26.000000000 +0100
-+++ cups-1.3.8/scheduler/conf.c	2008-09-10 16:18:26.000000000 +0100
+diff -up cups-1.3.9/scheduler/conf.c.lspp cups-1.3.9/scheduler/conf.c
+--- cups-1.3.9/scheduler/conf.c.lspp	2009-01-28 17:37:32.000000000 +0000
++++ cups-1.3.9/scheduler/conf.c	2009-01-28 17:37:32.000000000 +0000
 @@ -27,6 +27,7 @@
   *   read_configuration()     - Read a configuration file.
   *   read_location()          - Read a <Location path> definition.
@@ -1836,7 +1836,7 @@
  #endif /* HAVE_SSL */
    { "ServerName",		&ServerName,		CUPSD_VARTYPE_STRING },
    { "ServerRoot",		&ServerRoot,		CUPSD_VARTYPE_PATHNAME },
-@@ -352,6 +360,9 @@ cupsdReadConfiguration(void)
+@@ -370,6 +378,9 @@ cupsdReadConfiguration(void)
  		*old_requestroot;	/* Old RequestRoot */
    const char	*tmpdir;		/* TMPDIR environment variable */
    struct stat	tmpinfo;		/* Temporary directory info */
@@ -1846,7 +1846,7 @@
  
  
   /*
-@@ -614,6 +625,25 @@ cupsdReadConfiguration(void)
+@@ -632,6 +643,25 @@ cupsdReadConfiguration(void)
  
    RunUser = getuid();
  
@@ -1872,7 +1872,7 @@
   /*
    * See if the ServerName is an IP address...
    */
-@@ -896,11 +926,23 @@ cupsdReadConfiguration(void)
+@@ -911,11 +941,23 @@ cupsdReadConfiguration(void)
    if (MaxActiveJobs > (MaxFDs / 3))
      MaxActiveJobs = MaxFDs / 3;
  
@@ -1897,7 +1897,7 @@
  
   /*
    * Update the MaxClientsPerHost value, as needed...
-@@ -3299,6 +3341,18 @@ read_location(cups_file_t *fp,		/* I - C
+@@ -3314,6 +3356,18 @@ read_location(cups_file_t *fp,		/* I - C
    return ((FatalErrors & CUPSD_FATAL_CONFIG) ? 0 : linenum);
  }
  
@@ -1916,9 +1916,9 @@
  
  /*
   * '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-09-10 16:18:26.000000000 +0100
-+++ cups-1.3.8/scheduler/conf.h	2008-09-10 16:18:26.000000000 +0100
+diff -up cups-1.3.9/scheduler/conf.h.lspp cups-1.3.9/scheduler/conf.h
+--- cups-1.3.9/scheduler/conf.h.lspp	2009-01-28 17:37:32.000000000 +0000
++++ cups-1.3.9/scheduler/conf.h	2009-01-28 17:37:32.000000000 +0000
 @@ -208,6 +208,12 @@ VAR char		*ServerKey		VALUE(NULL);
  					/* Server key file */
  #  endif /* HAVE_LIBSSL || HAVE_GNUTLS */
@@ -1942,9 +1942,9 @@
  
  /*
   * 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-09-10 16:18:26.000000000 +0100
-+++ cups-1.3.8/scheduler/ipp.c	2008-09-10 16:18:26.000000000 +0100
+diff -up cups-1.3.9/scheduler/ipp.c.lspp cups-1.3.9/scheduler/ipp.c
+--- cups-1.3.9/scheduler/ipp.c.lspp	2009-01-28 17:37:32.000000000 +0000
++++ cups-1.3.9/scheduler/ipp.c	2009-01-28 17:37:32.000000000 +0000
 @@ -36,6 +36,7 @@
   *   cancel_all_jobs()           - Cancel all print jobs.
   *   cancel_job()                - Cancel a print job.
@@ -2261,7 +2261,7 @@
     /*
      * See if we need to add the starting sheet...
      */
-@@ -3521,6 +3750,103 @@ check_rss_recipient(
+@@ -3522,6 +3751,103 @@ check_rss_recipient(
  }
  
  
@@ -2365,7 +2365,7 @@
  /*
   * 'check_quotas()' - Check quotas for a printer and user.
   */
-@@ -4042,6 +4368,15 @@ copy_banner(cupsd_client_t *con,	/* I - 
+@@ -4043,6 +4369,15 @@ copy_banner(cupsd_client_t *con,	/* I - 
    char		attrname[255],		/* Name of attribute */
  		*s;			/* Pointer into name */
    ipp_attribute_t *attr;		/* Attribute */
@@ -2381,7 +2381,7 @@
  
  
    cupsdLogMessage(CUPSD_LOG_DEBUG2,
-@@ -4077,6 +4412,82 @@ copy_banner(cupsd_client_t *con,	/* I - 
+@@ -4078,6 +4413,82 @@ copy_banner(cupsd_client_t *con,	/* I - 
  
    fchmod(cupsFileNumber(out), 0640);
    fchown(cupsFileNumber(out), RunUser, Group);
@@ -2464,7 +2464,7 @@
  
   /*
    * Try the localized banner file under the subdirectory...
-@@ -4171,6 +4582,24 @@ copy_banner(cupsd_client_t *con,	/* I - 
+@@ -4172,6 +4583,24 @@ copy_banner(cupsd_client_t *con,	/* I - 
        else
          s = attrname;
  
@@ -2489,7 +2489,7 @@
        if (!strcmp(s, "printer-name"))
        {
          cupsFilePuts(out, job->dest);
-@@ -5938,6 +6367,22 @@ get_job_attrs(cupsd_client_t  *con,	/* I
+@@ -5944,6 +6373,22 @@ get_job_attrs(cupsd_client_t  *con,	/* I
      return;
    }
  
@@ -2512,7 +2512,7 @@
   /*
    * Copy attributes...
    */
-@@ -6143,6 +6588,11 @@ get_jobs(cupsd_client_t  *con,		/* I - C
+@@ -6149,6 +6594,11 @@ get_jobs(cupsd_client_t  *con,		/* I - C
      if (count > 0)
        ippAddSeparator(con->response);
  
@@ -2524,7 +2524,7 @@
      count ++;
  
      cupsdLogMessage(CUPSD_LOG_DEBUG2, "get_jobs: count = %d", count);
-@@ -10255,6 +10705,11 @@ validate_user(cupsd_job_t    *job,	/* I 
+@@ -10286,6 +10736,11 @@ validate_user(cupsd_job_t    *job,	/* I 
  
    strlcpy(username, get_username(con), userlen);
  
@@ -2536,9 +2536,9 @@
   /*
    * 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-09-10 16:18:26.000000000 +0100
-+++ cups-1.3.8/scheduler/job.c	2008-09-10 16:18:26.000000000 +0100
+diff -up cups-1.3.9/scheduler/job.c.lspp cups-1.3.9/scheduler/job.c
+--- cups-1.3.9/scheduler/job.c.lspp	2009-01-28 17:37:32.000000000 +0000
++++ cups-1.3.9/scheduler/job.c	2009-01-28 17:38:08.000000000 +0000
 @@ -60,6 +60,9 @@
   *   update_job_attrs()         - Update the job-printer-* attributes.
   */
@@ -2564,9 +2564,9 @@
  
  /*
   * Local globals...
-@@ -1136,6 +1147,23 @@ cupsdLoadJob(cupsd_job_t *job)		/* I - J
-     return;
-   }
+@@ -1123,6 +1134,20 @@ cupsdLoadJob(cupsd_job_t *job)		/* I - J
+                                      IPP_TAG_INTEGER);
+   job->job_sheets = ippFindAttribute(job->attrs, "job-sheets", IPP_TAG_NAME);
  
 +#ifdef WITH_LSPP
 +  if ((attr = ippFindAttribute(job->attrs, "security-context", IPP_TAG_NAME)) != NULL)
@@ -2578,17 +2578,14 @@
 +    */
 +    cupsdLogMessage(CUPSD_LOG_ERROR, "LoadAllJobs: Missing or bad security-context attribute in control file \"%s\"!",
 +                    jobfile);
-+    ippDelete(job->attrs);
-+    job->attrs = NULL;
-+    unlink(jobfile);
-+    return;
++    goto error;
 +  }
 +#endif /* WITH_LSPP */
 +
-   job->sheets     = ippFindAttribute(job->attrs, "job-media-sheets-completed",
-                                      IPP_TAG_INTEGER);
-   job->job_sheets = ippFindAttribute(job->attrs, "job-sheets", IPP_TAG_NAME);
-@@ -1493,6 +1521,13 @@ cupsdSaveJob(cupsd_job_t *job)		/* I - J
+   if (!job->priority)
+   {
+     if ((attr = ippFindAttribute(job->attrs, "job-priority",
+@@ -1483,6 +1508,13 @@ cupsdSaveJob(cupsd_job_t *job)		/* I - J
  {
    char		filename[1024];		/* Job control filename */
    cups_file_t	*fp;			/* Job file */
@@ -2602,7 +2599,7 @@
  
  
    cupsdLogMessage(CUPSD_LOG_DEBUG2, "cupsdSaveJob(job=%p(%d)): job->attrs=%p",
-@@ -1511,6 +1546,76 @@ cupsdSaveJob(cupsd_job_t *job)		/* I - J
+@@ -1501,6 +1533,76 @@ cupsdSaveJob(cupsd_job_t *job)		/* I - J
    fchmod(cupsFileNumber(fp), 0600);
    fchown(cupsFileNumber(fp), RunUser, Group);
  
@@ -2679,7 +2676,7 @@
    job->attrs->state = IPP_IDLE;
  
    if (ippWriteIO(fp, (ipp_iocb_t)cupsFileWrite, 1, NULL,
-@@ -2485,6 +2590,21 @@ start_job(cupsd_job_t     *job,		/* I - 
+@@ -2475,6 +2577,21 @@ start_job(cupsd_job_t     *job,		/* I - 
  					/* RIP_MAX_CACHE env variable */
    static char		*options = NULL;/* Full list of options */
    static int		optlength = 0;	/* Length of option buffer */
@@ -2701,7 +2698,7 @@
  
  
    cupsdLogMessage(CUPSD_LOG_DEBUG2, "[Job %d] start_job: file = %d/%d",
-@@ -2756,6 +2876,106 @@ start_job(cupsd_job_t     *job,		/* I - 
+@@ -2746,6 +2863,106 @@ start_job(cupsd_job_t     *job,		/* I - 
            fcntl(job->side_pipes[1], F_GETFL) | O_NONBLOCK);
    }
  
@@ -2808,7 +2805,7 @@
   /*
    * Determine if we are printing a banner page or not...
    */
-@@ -2904,6 +3124,18 @@ start_job(cupsd_job_t     *job,		/* I - 
+@@ -2894,6 +3111,18 @@ start_job(cupsd_job_t     *job,		/* I - 
  	  banner_page)
          continue;
  
@@ -2827,7 +2824,7 @@
       /*
        * Otherwise add them to the list...
        */
-@@ -3146,6 +3378,67 @@ start_job(cupsd_job_t     *job,		/* I - 
+@@ -3136,6 +3365,67 @@ start_job(cupsd_job_t     *job,		/* I - 
      }
    }
  
@@ -2895,9 +2892,9 @@
    if (Classification && !banner_page)
    {
      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-09-10 16:18:26.000000000 +0100
+diff -up cups-1.3.9/scheduler/job.h.lspp cups-1.3.9/scheduler/job.h
+--- cups-1.3.9/scheduler/job.h.lspp	2009-01-28 17:37:32.000000000 +0000
++++ cups-1.3.9/scheduler/job.h	2009-01-28 17:37:32.000000000 +0000
 @@ -13,6 +13,13 @@
   *   file is missing or damaged, see the license at "http://www.cups.org/".
   */
@@ -2923,9 +2920,9 @@
  } cupsd_job_t;
  
  
-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-09-10 16:18:26.000000000 +0100
-+++ cups-1.3.8/scheduler/main.c	2008-09-10 16:18:26.000000000 +0100
+diff -up cups-1.3.9/scheduler/main.c.lspp cups-1.3.9/scheduler/main.c
+--- cups-1.3.9/scheduler/main.c.lspp	2009-01-28 17:37:32.000000000 +0000
++++ cups-1.3.9/scheduler/main.c	2009-01-28 17:37:32.000000000 +0000
 @@ -35,6 +35,8 @@
   *   usage()                   - Show scheduler usage.
   */
@@ -2981,7 +2978,7 @@
   /*
    * Set the timezone info...
    */
-@@ -1160,6 +1187,11 @@ main(int  argc,				/* I - Number of comm
+@@ -1192,6 +1219,11 @@ main(int  argc,				/* I - Number of comm
  
    cupsdStopSelect();
  
@@ -2993,9 +2990,9 @@
    return (!stop_scheduler);
  }
  
-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-09-10 16:18:26.000000000 +0100
-+++ cups-1.3.8/scheduler/printers.c	2008-09-10 16:18:26.000000000 +0100
+diff -up cups-1.3.9/scheduler/printers.c.lspp cups-1.3.9/scheduler/printers.c
+--- cups-1.3.9/scheduler/printers.c.lspp	2009-01-28 17:37:32.000000000 +0000
++++ cups-1.3.9/scheduler/printers.c	2009-01-28 17:37:32.000000000 +0000
 @@ -51,6 +51,8 @@
   *                                 printing desktop tools.
   */
@@ -3030,7 +3027,7 @@
  
  
    DEBUG_printf(("cupsdSetPrinterAttrs: entering name = %s, type = %x\n", p->name,
-@@ -1989,6 +2002,44 @@ cupsdSetPrinterAttrs(cupsd_printer_t *p)
+@@ -1995,6 +2008,44 @@ cupsdSetPrinterAttrs(cupsd_printer_t *p)
        attr->values[1].string.text = _cupsStrAlloc(Classification ?
  	                                   Classification : p->job_sheets[1]);
      }

cups-serverbin-compat.patch:

Index: cups-serverbin-compat.patch
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-9/cups-serverbin-compat.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- cups-serverbin-compat.patch	18 Jul 2007 11:50:02 -0000	1.3
+++ cups-serverbin-compat.patch	28 Jan 2009 17:50:02 -0000	1.4
@@ -1,6 +1,64 @@
---- cups-1.2.1/scheduler/ipp.c.serverbin-compat	2006-06-07 11:47:18.000000000 +0100
-+++ cups-1.2.1/scheduler/ipp.c	2006-06-07 11:50:06.000000000 +0100
-@@ -2209,9 +2209,18 @@
+diff -up cups-1.3.9/scheduler/conf.c.serverbin-compat cups-1.3.9/scheduler/conf.c
+--- cups-1.3.9/scheduler/conf.c.serverbin-compat	2008-09-07 22:58:01.000000000 +0100
++++ cups-1.3.9/scheduler/conf.c	2009-01-28 17:21:14.000000000 +0000
+@@ -420,6 +420,9 @@ cupsdReadConfiguration(void)
+   cupsdSetString(&ServerName, httpGetHostname(NULL, temp, sizeof(temp)));
+   cupsdSetStringf(&ServerAdmin, "root@%s", temp);
+   cupsdSetString(&ServerBin, CUPS_SERVERBIN);
++#ifdef __x86_64__
++  cupsdSetString(&ServerBin_compat, "/usr/lib64/cups");
++#endif /* __x86_64__ */
+   cupsdSetString(&RequestRoot, CUPS_REQUESTS);
+   cupsdSetString(&CacheDir, CUPS_CACHEDIR);
+   cupsdSetString(&DataDir, CUPS_DATADIR);
+@@ -1114,7 +1117,12 @@ cupsdReadConfiguration(void)
+     * Read the MIME type and conversion database...
+     */
+ 
++#ifdef __x86_64__
++    snprintf(temp, sizeof(temp), "%s/filter:%s/filter", ServerBin,
++	     ServerBin_compat);
++#else /* ! defined(__x86_64__) */
+     snprintf(temp, sizeof(temp), "%s/filter", ServerBin);
++#endif
+ 
+     MimeDatabase = mimeLoad(ServerRoot, temp);
+ 
+diff -up cups-1.3.9/scheduler/conf.h.serverbin-compat cups-1.3.9/scheduler/conf.h
+--- cups-1.3.9/scheduler/conf.h.serverbin-compat	2008-02-15 23:26:51.000000000 +0000
++++ cups-1.3.9/scheduler/conf.h	2009-01-28 17:21:14.000000000 +0000
+@@ -59,6 +59,10 @@ VAR char		*ConfigurationFile	VALUE(NULL)
+ 					/* Root directory for scheduler */
+ 			*ServerBin		VALUE(NULL),
+ 					/* Root directory for binaries */
++#ifdef __x86_64__
++			*ServerBin_compat	VALUE(NULL),
++					/* Compat directory for binaries */
++#endif /* __x86_64__ */
+ 			*StateDir		VALUE(NULL),
+ 					/* Root directory for state data */
+ 			*RequestRoot		VALUE(NULL),
+diff -up cups-1.3.9/scheduler/env.c.serverbin-compat cups-1.3.9/scheduler/env.c
+--- cups-1.3.9/scheduler/env.c.serverbin-compat	2007-07-11 22:46:42.000000000 +0100
++++ cups-1.3.9/scheduler/env.c	2009-01-28 17:21:14.000000000 +0000
+@@ -86,8 +86,13 @@ cupsdInitEnv(void)
+   cupsdSetEnv("LD_LIBRARY_PATH", NULL);
+   cupsdSetEnv("LD_PRELOAD", NULL);
+   cupsdSetEnv("NLSPATH", NULL);
++#ifdef __x86_64__
++  cupsdSetEnvf("PATH", "%s/filter:%s/filter:" CUPS_BINDIR ":" CUPS_SBINDIR
++                       ":/bin:/usr/bin", ServerBin, ServerBin_compat);
++#else /* ! defined(__x86_64__) */
+   cupsdSetEnvf("PATH", "%s/filter:" CUPS_BINDIR ":" CUPS_SBINDIR
+                        ":/bin:/usr/bin", ServerBin);
++#endif
+   cupsdSetEnv("SERVER_ADMIN", ServerAdmin);
+   cupsdSetEnv("SHLIB_PATH", NULL);
+   cupsdSetEnv("SOFTWARE", CUPS_MINIMAL);
+diff -up cups-1.3.9/scheduler/ipp.c.serverbin-compat cups-1.3.9/scheduler/ipp.c
+--- cups-1.3.9/scheduler/ipp.c.serverbin-compat	2008-09-16 23:39:44.000000000 +0100
++++ cups-1.3.9/scheduler/ipp.c	2009-01-28 17:21:14.000000000 +0000
+@@ -2472,9 +2472,18 @@ add_printer(cupsd_client_t  *con,	/* I -
          * Could not find device in list!
  	*/
  
@@ -19,67 +77,10 @@
        }
      }
  
---- cups-1.2.1/scheduler/printers.c.serverbin-compat	2006-06-07 12:21:59.000000000 +0100
-+++ cups-1.2.1/scheduler/printers.c	2006-06-07 12:26:44.000000000 +0100
-@@ -902,9 +902,19 @@
- 	    * Backend does not exist, stop printer...
- 	    */
- 
-+#ifdef __x86_64__
-+	    snprintf(line, sizeof(line), "%s/backend/%s", ServerBin_compat,
-+		     p->device_uri);
-+	    if (access(line, F_OK))
-+	      {
-+#endif /* __x86_64__ */
-+
- 	    p->state = IPP_PRINTER_STOPPED;
- 	    snprintf(p->state_message, sizeof(p->state_message),
- 	             "Backend %s does not exist!", line);
-+#ifdef __x86_64__
-+	      }
-+#endif /* __x86_64__ */
- 	  }
-         }
- 
-@@ -2838,6 +2848,12 @@
- 
-     if (access(filename, X_OK))
-     {
-+#ifdef __x86_64__
-+      snprintf(filename, sizeof(filename), "%s/filter/%s", ServerBin_compat,
-+	       program);
-+      if (access(filename, X_OK))
-+	{
-+#endif /* __x86_64__ */
-       snprintf(p->state_message, sizeof(p->state_message),
-                "Filter \"%s\" for printer \"%s\" not available: %s",
- 	       program, p->name, strerror(errno));
-@@ -2846,6 +2862,9 @@
-       cupsdAddPrinterHistory(p);
- 
-       cupsdLogMessage(CUPSD_LOG_ERROR, "%s", p->state_message);
-+#ifdef __x86_64__
-+	}
-+#endif /* __x86_64__ */
-     }
-   }
- 
---- cups-1.2.1/scheduler/conf.h.serverbin-compat	2006-06-07 11:38:05.000000000 +0100
-+++ cups-1.2.1/scheduler/conf.h	2006-06-07 11:39:41.000000000 +0100
-@@ -68,6 +68,10 @@
- 					/* Root directory for scheduler */
- 			*ServerBin		VALUE(NULL),
- 					/* Root directory for binaries */
-+#ifdef __x86_64__
-+			*ServerBin_compat	VALUE(NULL),
-+					/* Compat directory for binaries */
-+#endif /* __x86_64__ */
- 			*StateDir		VALUE(NULL),
- 					/* Root directory for state data */
- 			*RequestRoot		VALUE(NULL),
---- cups-1.2.1/scheduler/job.c.serverbin-compat	2006-06-07 11:50:31.000000000 +0100
-+++ cups-1.2.1/scheduler/job.c	2006-06-07 12:21:48.000000000 +0100
-@@ -3117,8 +3117,32 @@
+diff -up cups-1.3.9/scheduler/job.c.serverbin-compat cups-1.3.9/scheduler/job.c
+--- cups-1.3.9/scheduler/job.c.serverbin-compat	2008-07-21 20:57:20.000000000 +0100
++++ cups-1.3.9/scheduler/job.c	2009-01-28 17:21:14.000000000 +0000
+@@ -3244,8 +3244,32 @@ start_job(cupsd_job_t     *job,		/* I - 
         i ++, filter = (mime_filter_t *)cupsArrayNext(filters))
    {
      if (filter->filter[0] != '/')
@@ -114,7 +115,7 @@
      else
        strlcpy(command, filter->filter, sizeof(command));
  
-@@ -3259,6 +3283,28 @@
+@@ -3396,6 +3420,28 @@ start_job(cupsd_job_t     *job,		/* I - 
      {
        sscanf(printer->device_uri, "%254[^:]", method);
        snprintf(command, sizeof(command), "%s/backend/%s", ServerBin, method);
@@ -143,44 +144,49 @@
  
       /*
        * See if the backend needs to run as root...
---- cups-1.2.1/scheduler/env.c.serverbin-compat	2006-06-07 11:45:26.000000000 +0100
-+++ cups-1.2.1/scheduler/env.c	2006-06-07 11:46:55.000000000 +0100
-@@ -95,8 +95,13 @@
-   cupsdSetEnv("LD_LIBRARY_PATH", NULL);
-   cupsdSetEnv("LD_PRELOAD", NULL);
-   cupsdSetEnv("NLSPATH", NULL);
+diff -up cups-1.3.9/scheduler/printers.c.serverbin-compat cups-1.3.9/scheduler/printers.c
+--- cups-1.3.9/scheduler/printers.c.serverbin-compat	2008-09-03 20:25:11.000000000 +0100
++++ cups-1.3.9/scheduler/printers.c	2009-01-28 17:31:40.000000000 +0000
+@@ -943,9 +943,19 @@ cupsdLoadAllPrinters(void)
+ 	    * Backend does not exist, stop printer...
+ 	    */
+ 
 +#ifdef __x86_64__
-+  cupsdSetEnvf("PATH", "%s/filter:%s/filter:" CUPS_BINDIR ":" CUPS_SBINDIR
-+                       ":/bin:/usr/bin", ServerBin, ServerBin_compat);
-+#else /* ! defined(__x86_64__) */
-   cupsdSetEnvf("PATH", "%s/filter:" CUPS_BINDIR ":" CUPS_SBINDIR
-                        ":/bin:/usr/bin", ServerBin);
-+#endif
-   cupsdSetEnv("SERVER_ADMIN", ServerAdmin);
-   cupsdSetEnv("SHLIB_PATH", NULL);
-   cupsdSetEnv("SOFTWARE", CUPS_MINIMAL);
---- cups-1.2.1/scheduler/conf.c.serverbin-compat	2006-06-07 11:38:24.000000000 +0100
-+++ cups-1.2.1/scheduler/conf.c	2006-06-07 11:42:49.000000000 +0100
-@@ -275,6 +275,9 @@
-   cupsdSetString(&ServerName, httpGetHostname(NULL, temp, sizeof(temp)));
-   cupsdSetStringf(&ServerAdmin, "root@%s", temp);
-   cupsdSetString(&ServerBin, CUPS_SERVERBIN);
++	    snprintf(line, sizeof(line), "%s/backend/%s", ServerBin_compat,
++		     p->device_uri);
++	    if (access(line, F_OK))
++	      {
++#endif /* __x86_64__ */
++
+ 	    p->state = IPP_PRINTER_STOPPED;
+ 	    snprintf(p->state_message, sizeof(p->state_message),
+ 	             "Backend %s does not exist!", line);
 +#ifdef __x86_64__
-+  cupsdSetString(&ServerBin_compat, "/usr/lib64/cups");
++	      }
 +#endif /* __x86_64__ */
-   cupsdSetString(&RequestRoot, CUPS_REQUESTS);
-   cupsdSetString(&CacheDir, CUPS_CACHEDIR);
-   cupsdSetString(&DataDir, CUPS_DATADIR);
-@@ -954,7 +957,12 @@
-     * Read the MIME type and conversion database...
-     */
+ 	  }
+         }
  
+@@ -3423,6 +3433,12 @@ add_printer_filter(
+ 
+     if (access(filename, X_OK))
+     {
 +#ifdef __x86_64__
-+    snprintf(temp, sizeof(temp), "%s/filter:%s/filter", ServerBin,
-+	     ServerBin_compat);
-+#else /* ! defined(__x86_64__) */
-     snprintf(temp, sizeof(temp), "%s/filter", ServerBin);
-+#endif
++      snprintf(filename, sizeof(filename), "%s/filter/%s", ServerBin_compat,
++	       program);
++      if (access(filename, X_OK))
++	{
++#endif /* __x86_64__ */
+       snprintf(p->state_message, sizeof(p->state_message),
+                "Filter \"%s\" for printer \"%s\" not available: %s",
+ 	       program, p->name, strerror(errno));
+@@ -3430,6 +3446,9 @@ add_printer_filter(
+       cupsdSetPrinterState(p, IPP_PRINTER_STOPPED, 0);
  
-     MimeDatabase = mimeLoad(ServerRoot, temp);
+       cupsdLogMessage(CUPSD_LOG_ERROR, "%s", p->state_message);
++#ifdef __x86_64__
++	}
++#endif /* __x86_64__ */
+     }
+   }
  

cups-usb-paperout.patch:

Index: cups-usb-paperout.patch
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-9/cups-usb-paperout.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- cups-usb-paperout.patch	23 Jul 2007 12:19:34 -0000	1.5
+++ cups-usb-paperout.patch	28 Jan 2009 17:50:02 -0000	1.6
@@ -1,6 +1,7 @@
---- cups-1.2.10/backend/usb-unix.c.usb-paperout	2007-06-26 15:11:14.000000000 +0100
-+++ cups-1.2.10/backend/usb-unix.c	2007-06-26 15:16:23.000000000 +0100
-@@ -39,6 +39,11 @@
+diff -up cups-1.3.9/backend/usb-unix.c.usb-paperout cups-1.3.9/backend/usb-unix.c
+--- cups-1.3.9/backend/usb-unix.c.usb-paperout	2009-01-28 17:35:29.000000000 +0000
++++ cups-1.3.9/backend/usb-unix.c	2009-01-28 17:36:29.000000000 +0000
+@@ -31,6 +31,11 @@
  #include "ieee1284.c"
  #include <sys/select.h>
  
@@ -12,7 +13,7 @@
  
  /*
   * Local functions...
-@@ -308,7 +313,19 @@
+@@ -323,7 +328,19 @@ open_device(const char *uri,		/* I - Dev
    if (!strncmp(uri, "usb:/dev/", 9))
  #ifdef __linux
    {
@@ -33,7 +34,7 @@
    }
    else if (!strncmp(uri, "usb://", 6))
    {
-@@ -374,7 +391,14 @@
+@@ -389,7 +406,14 @@ open_device(const char *uri,		/* I - Dev
          if (!strcmp(uri, device_uri))
  	{
  	 /*
@@ -48,4 +49,4 @@
 +	  * Return this file descriptor...
  	  */
  
- 	  fprintf(stderr, "DEBUG: Printer using device file \"%s\"...\n", device);
+ 	  fprintf(stderr, "DEBUG: Printer using device file \"%s\"...\n",


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-9/cups.spec,v
retrieving revision 1.433
retrieving revision 1.434
diff -u -r1.433 -r1.434
--- cups.spec	9 Dec 2008 12:09:22 -0000	1.433
+++ cups.spec	28 Jan 2009 17:50:02 -0000	1.434
@@ -52,6 +52,8 @@
 Patch26: cups-CVE-2008-5183.patch
 Patch27: cups-CVE-2008-5286.patch
 Patch28: cups-str2831.patch
+Patch29: cups-str3077.patch
+Patch30: cups-str3078.patch
 Patch100: cups-lspp.patch
 Epoch: 1
 Url: http://www.cups.org/
@@ -175,6 +177,8 @@
 %patch26 -p1 -b .CVE-2008-5183
 %patch27 -p1 -b .CVE-2008-5286
 %patch28 -p1 -b .str2831
+%patch29 -p1 -b .str3077
+%patch30 -p1 -b .str3078
 
 %if %lspp
 %patch100 -p1 -b .lspp
@@ -454,6 +458,10 @@
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
+* Wed Jan 28 2009 Tim Waugh <twaugh at redhat.com>
+- Fixed quotas (STR #3077, STR #3078).
+- Removed all patch fuzz.
+
 * Tue Dec  9 2008 Tim Waugh <twaugh at redhat.com> 1:1.3.9-3
 - Removed dnssd backend as it was causing problems (bug #475230).
 - Attempt to unbreak the fix for STR #2831 (bug #474742).



From kyle at fedoraproject.org  Wed Jan 28 17:52:22 2009
From: kyle at fedoraproject.org (Kyle McMartin)
Date: Wed, 28 Jan 2009 17:52:22 +0000 (UTC)
Subject: rpms/kernel/devel drm-nouveau.patch, 1.4, 1.5 kernel.spec, 1.1240, 
	1.1241
Message-ID: <20090128175222.D2F2C7010D@cvs1.fedora.phx.redhat.com>

Author: kyle

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9678

Modified Files:
	drm-nouveau.patch kernel.spec 
Log Message:
* Wed Jan 28 2009 Kyle McMartin <kyle at redhat.com>
- s/swab32/fswab32/ in nouveau


drm-nouveau.patch:

Index: drm-nouveau.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/drm-nouveau.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- drm-nouveau.patch	27 Jan 2009 21:30:08 -0000	1.4
+++ drm-nouveau.patch	28 Jan 2009 17:51:51 -0000	1.5
@@ -5950,7 +5950,7 @@
 +}
 diff --git a/drivers/gpu/drm/nouveau/nouveau_state.c b/drivers/gpu/drm/nouveau/nouveau_state.c
 new file mode 100644
-index 0000000..8d0430f
+index 0000000..150438e
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/nouveau_state.c
 @@ -0,0 +1,866 @@
@@ -6440,7 +6440,7 @@
 +	reg1 = readl(regs+NV03_PMC_BOOT_1);
 +#if defined(__powerpc__)
 +	if (reg1)
-+		reg0=___swab32(reg0);
++		reg0=___fswab32(reg0);
 +#endif
 +
 +	/* We're dealing with >=NV10 */


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1240
retrieving revision 1.1241
diff -u -r1.1240 -r1.1241
--- kernel.spec	28 Jan 2009 15:46:39 -0000	1.1240
+++ kernel.spec	28 Jan 2009 17:51:52 -0000	1.1241
@@ -1772,6 +1772,9 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Wed Jan 28 2009 Kyle McMartin <kyle at redhat.com>
+- s/swab32/fswab32/ in nouveau
+
 * Wed Jan 28 2009 Mark McLoughlin <markmc at redhat.com>
 - Enable CONFIG_PCI_STUB for KVM (#482792)
 



From scop at fedoraproject.org  Wed Jan 28 17:55:24 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Wed, 28 Jan 2009 17:55:24 +0000 (UTC)
Subject: rpms/kdebluetooth/F-10 kdebluetooth-1.0_beta8-gcc43.patch, 1.1,
	NONE kdebluetooth-hex.patch, 1.1,
	NONE kdebluetooth-obexpush.patch, 1.1,
	NONE kdebluetooth-services.patch, 1.1, NONE
Message-ID: <20090128175524.19CD47010D@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/kdebluetooth/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10284/F-10

Removed Files:
	kdebluetooth-1.0_beta8-gcc43.patch kdebluetooth-hex.patch 
	kdebluetooth-obexpush.patch kdebluetooth-services.patch 
Log Message:
cvs rm obsolete patches.


--- kdebluetooth-1.0_beta8-gcc43.patch DELETED ---


--- kdebluetooth-hex.patch DELETED ---


--- kdebluetooth-obexpush.patch DELETED ---


--- kdebluetooth-services.patch DELETED ---



From scop at fedoraproject.org  Wed Jan 28 17:55:24 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Wed, 28 Jan 2009 17:55:24 +0000 (UTC)
Subject: rpms/kdebluetooth/F-9 kdebluetooth-1.0_beta8-gcc43.patch, 1.1,
	NONE kdebluetooth-hex.patch, 1.1,
	NONE kdebluetooth-obexpush.patch, 1.1,
	NONE kdebluetooth-services.patch, 1.1, NONE
Message-ID: <20090128175524.4F1567010D@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/kdebluetooth/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10284/F-9

Removed Files:
	kdebluetooth-1.0_beta8-gcc43.patch kdebluetooth-hex.patch 
	kdebluetooth-obexpush.patch kdebluetooth-services.patch 
Log Message:
cvs rm obsolete patches.


--- kdebluetooth-1.0_beta8-gcc43.patch DELETED ---


--- kdebluetooth-hex.patch DELETED ---


--- kdebluetooth-obexpush.patch DELETED ---


--- kdebluetooth-services.patch DELETED ---



From scop at fedoraproject.org  Wed Jan 28 17:55:24 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Wed, 28 Jan 2009 17:55:24 +0000 (UTC)
Subject: rpms/kdebluetooth/devel kdebluetooth-1.0_beta8-gcc43.patch, 1.1,
	NONE kdebluetooth-hex.patch, 1.1,
	NONE kdebluetooth-obexpush.patch, 1.1,
	NONE kdebluetooth-services.patch, 1.1, NONE
Message-ID: <20090128175524.941667010D@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/kdebluetooth/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10284/devel

Removed Files:
	kdebluetooth-1.0_beta8-gcc43.patch kdebluetooth-hex.patch 
	kdebluetooth-obexpush.patch kdebluetooth-services.patch 
Log Message:
cvs rm obsolete patches.


--- kdebluetooth-1.0_beta8-gcc43.patch DELETED ---


--- kdebluetooth-hex.patch DELETED ---


--- kdebluetooth-obexpush.patch DELETED ---


--- kdebluetooth-services.patch DELETED ---



From scop at fedoraproject.org  Wed Jan 28 17:57:55 2009
From: scop at fedoraproject.org (=?utf-8?q?Ville_Skytt=C3=A4?=)
Date: Wed, 28 Jan 2009 17:57:55 +0000 (UTC)
Subject: rpms/kdebluetooth/devel .cvsignore, 1.4, 1.5 kdebluetooth.spec, 1.18,
	1.19 sources, 1.4, 1.5
Message-ID: <20090128175755.CDCCB7010D@cvs1.fedora.phx.redhat.com>

Author: scop

Update of /cvs/pkgs/rpms/kdebluetooth/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10710

Modified Files:
	.cvsignore kdebluetooth.spec sources 
Log Message:
* Wed Jan 28 2009 Ville Skytt?? <ville.skytta at iki.fi> - 1:0.3-1
- 0.3 (#481802).
- http://sourceforge.net/project/shownotes.php?group_id=89888&release_id=654566



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdebluetooth/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	20 Sep 2008 22:03:05 -0000	1.4
+++ .cvsignore	28 Jan 2009 17:57:25 -0000	1.5
@@ -1 +1 @@
-kdebluetooth4-0.2.tar.bz2
+kdebluetooth4-0.3.tar.bz2


Index: kdebluetooth.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebluetooth/devel/kdebluetooth.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- kdebluetooth.spec	20 Sep 2008 22:03:05 -0000	1.18
+++ kdebluetooth.spec	28 Jan 2009 17:57:25 -0000	1.19
@@ -1,7 +1,7 @@
 Summary:		The KDE Bluetooth Framework
 Name:			kdebluetooth
-Version:		0.2
-Release:		3%{?dist}
+Version:		0.3
+Release:		1%{?dist}
 Epoch:			1
 License:		GPLv2+
 Group:			Applications/Communications
@@ -9,7 +9,7 @@
 Source0:		http://downloads.sourceforge.net/kde-bluetooth/%{name}4-%{version}.tar.bz2
 BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:	kdebase-workspace-devel
+BuildRequires:	kdebase-workspace-devel >= 4.2
 BuildRequires:	cmake
 Obsoletes:		%{name}-libs < 1:0.2
 Obsoletes:		%{name}-devel < 1:0.2
@@ -70,6 +70,10 @@
 
 
 %changelog
+* Wed Jan 28 2009 Ville Skytt?? <ville.skytta at iki.fi> - 1:0.3-1
+- 0.3 (#481802).
+- http://sourceforge.net/project/shownotes.php?group_id=89888&release_id=654566
+
 * Mon Sep 15 2008 Gilboa Davara <gilboad [AT] gmail.com> - 0.2-3
 - Use versioned obsoletes.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdebluetooth/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	20 Sep 2008 22:03:05 -0000	1.4
+++ sources	28 Jan 2009 17:57:25 -0000	1.5
@@ -1 +1 @@
-1d66e2c968b4ce1a6201ea294a35de76  kdebluetooth4-0.2.tar.bz2
+e37438e8e597abe9c684acaf3aa1bb39  kdebluetooth4-0.3.tar.bz2



From steved at fedoraproject.org  Wed Jan 28 17:58:38 2009
From: steved at fedoraproject.org (Steve Dickson)
Date: Wed, 28 Jan 2009 17:58:38 +0000 (UTC)
Subject: rpms/libtirpc/devel libtirpc-0.1.10-uuid_t.patch, NONE,
	1.1 libtirpc.spec, 1.41, 1.42
Message-ID: <20090128175838.2A9CF7010D@cvs1.fedora.phx.redhat.com>

Author: steved

Update of /cvs/pkgs/rpms/libtirpc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10928

Modified Files:
	libtirpc.spec 
Added Files:
	libtirpc-0.1.10-uuid_t.patch 
Log Message:
 Converted all uids and uids to type uid_t and gid_t (sf 2446314)


libtirpc-0.1.10-uuid_t.patch:

--- NEW FILE libtirpc-0.1.10-uuid_t.patch ---
commit 951a1b9b0195cbe58e1e62142e84d7ec4658943f
Author: Steve Dickson <steved at redhat.com>
Date:   Wed Jan 28 12:44:46 2009 -0500

    Converted all uid and gid variables of the type uid_t and gid_t.
    
    Signed-off-by: Steve Dickson <steved at redhat.com>

diff --git a/src/auth_unix.c b/src/auth_unix.c
index c2727e0..04ee5dd 100644
--- a/src/auth_unix.c
+++ b/src/auth_unix.c
@@ -84,10 +84,10 @@ struct audata {
 AUTH *
 authunix_create(machname, uid, gid, len, aup_gids)
 	char *machname;
-	int uid;
-	int gid;
+	uid_t uid;
+	gid_t gid;
 	int len;
-	int *aup_gids;
+	gid_t *aup_gids;
 {
 	struct authunix_parms aup;
 	char mymem[MAX_AUTH_BYTES];
@@ -189,8 +189,7 @@ authunix_create_default()
 	if ((len = getgroups(NGRPS, gids)) < 0)
 		abort();
 	/* XXX: interface problem; those should all have been unsigned */
-	return (authunix_create(machname, (int)uid, (int)gid, len,
-	    (int *)gids));
+	return (authunix_create(machname, uid, gid, len, gids));
 }
 
 /*
diff --git a/src/authunix_prot.c b/src/authunix_prot.c
index 01c1711..79f2fb6 100644
--- a/src/authunix_prot.c
+++ b/src/authunix_prot.c
@@ -57,8 +57,8 @@ xdr_authunix_parms(xdrs, p)
 
 	if (xdr_u_long(xdrs, &(p->aup_time))
 	    && xdr_string(xdrs, &(p->aup_machname), MAX_MACHINE_NAME)
-	    && xdr_int(xdrs, &(p->aup_uid))
-	    && xdr_int(xdrs, &(p->aup_gid))
+	    && xdr_u_int(xdrs, &(p->aup_uid))
+	    && xdr_u_int(xdrs, &(p->aup_gid))
 	    && xdr_array(xdrs, (caddr_t *)&(p->aup_gids),
 		    &(p->aup_len), NGRPS, sizeof(int), (xdrproc_t)xdr_int) ) {
 		return (TRUE);
diff --git a/src/svc_auth_unix.c b/src/svc_auth_unix.c
index 77a1272..7a7eeaa 100644
--- a/src/svc_auth_unix.c
+++ b/src/svc_auth_unix.c
@@ -59,7 +59,7 @@ _svcauth_unix(rqst, msg)
 	struct area {
 		struct authunix_parms area_aup;
 		char area_machname[MAX_MACHINE_NAME+1];
-		int area_gids[NGRPS];
+		gid_t area_gids[NGRPS];
 	} *area;
 	u_int auth_len;
 	size_t str_len, gid_len;
diff --git a/tirpc/rpc/auth.h b/tirpc/rpc/auth.h
index c6c418c..532a8cb 100644
--- a/tirpc/rpc/auth.h
+++ b/tirpc/rpc/auth.h
@@ -279,8 +279,7 @@ int authany_wrap(void), authany_unwrap(void);
  *	int *aup_gids;
  */
 __BEGIN_DECLS
-extern AUTH *authunix_create(char *, int, int, int,
-    int *);
+extern AUTH *authunix_create(char *, uid_t, uid_t, int, uid_t *);
 extern AUTH *authunix_create_default(void);	/* takes no parameters */
 extern AUTH *authnone_create(void);		/* takes no parameters */
 __END_DECLS
diff --git a/tirpc/rpc/auth_unix.h b/tirpc/rpc/auth_unix.h
index 41f0f44..0839fb3 100644
--- a/tirpc/rpc/auth_unix.h
+++ b/tirpc/rpc/auth_unix.h
@@ -60,10 +60,10 @@
 struct authunix_parms {
 	u_long	 aup_time;
 	char	*aup_machname;
-	int	 aup_uid;
-	int	 aup_gid;
+	uid_t 	 aup_uid;
+	gid_t  	 aup_gid;
 	u_int	 aup_len;
-	int	*aup_gids;
+	gid_t 	*aup_gids;
 };
 
 #define authsys_parms authunix_parms


Index: libtirpc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libtirpc/devel/libtirpc.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- libtirpc.spec	28 Jan 2009 15:08:18 -0000	1.41
+++ libtirpc.spec	28 Jan 2009 17:58:07 -0000	1.42
@@ -1,6 +1,6 @@
 Name:		   libtirpc
 Version:		0.1.10
-Release:		3%{?dist}
+Release:		4%{?dist}
 Summary:		Transport Independent RPC Library
 Group:		  	System Environment/Libraries
 License:		SISSL
@@ -35,6 +35,7 @@
 Patch03: libtirpc-0.1.10-C++declares.patch
 Patch04: libtirpc-0.1.10-svcreq-compat.patch
 Patch05: libtirpc-0.1.10-warnings.patch
+Patch06: libtirpc-0.1.10-uuid_t.patch
 
 Patch100: libtirpc-0.1.7-compile.patch
 
@@ -50,6 +51,7 @@
 %patch03	-p1
 %patch04	-p1
 %patch05	-p1
+%patch06	-p1
 
 %patch100	-p1
 
@@ -148,6 +150,9 @@
 %{_mandir}/*/*
 
 %changelog
+* Wed Jan 28 2009 Steve Dickson  <steved at redhat.com> 0.1.10-4
+- Converted all uids and uids to type uid_t and gid_t (sf 2446314)
+
 * Wed Jan 28 2009 Steve Dickson  <steved at redhat.com> 0.1.10-3
 - backwards compatibility: fix order of fields in TI-RPC's 
   svc_req (bz 481388)



From kdudka at fedoraproject.org  Wed Jan 28 18:02:07 2009
From: kdudka at fedoraproject.org (Kamil Dudka)
Date: Wed, 28 Jan 2009 18:02:07 +0000 (UTC)
Subject: rpms/coreutils/devel coreutils.spec,1.244,1.245
Message-ID: <20090128180207.D7C8D7010D@cvs1.fedora.phx.redhat.com>

Author: kdudka

Update of /cvs/extras/rpms/coreutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11662

Modified Files:
	coreutils.spec 
Log Message:
added BuildRequires for libattr-devel and attr


Index: coreutils.spec
===================================================================
RCS file: /cvs/extras/rpms/coreutils/devel/coreutils.spec,v
retrieving revision 1.244
retrieving revision 1.245
diff -u -r1.244 -r1.245
--- coreutils.spec	28 Jan 2009 17:29:41 -0000	1.244
+++ coreutils.spec	28 Jan 2009 18:01:37 -0000	1.245
@@ -1,7 +1,7 @@
 Summary: A set of basic GNU tools commonly used in shell scripts
 Name:    coreutils
 Version: 7.0
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: GPLv3+
 Group:   System Environment/Base
 Url:     http://www.gnu.org/software/coreutils/
@@ -66,7 +66,8 @@
 BuildRequires: automake >= 1.10.1
 %{?!nopam:BuildRequires: pam-devel}
 BuildRequires: libcap-devel >= 2.0.6
-Requires: libattr-devel
+BuildRequires: libattr-devel
+BuildRequires: attr
 
 Requires(post): libselinux >= 1.25.6-1
 Requires:       libattr
@@ -327,6 +328,9 @@
 /sbin/runuser
 
 %changelog
+* Wed Jan 28 2009 Kamil Dudka <kdudka at redhat.com> - 7.0-7
+- added BuildRequires for libattr-devel and attr
+
 * Wed Jan 28 2009 Kamil Dudka <kdudka at redhat.com> - 7.0-6
 - cp/mv: add --no-clobber (-n) option to not overwrite target
 - cp/mv: add xattr support (#202823)



From twaugh at fedoraproject.org  Wed Jan 28 18:02:39 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Wed, 28 Jan 2009 18:02:39 +0000 (UTC)
Subject: rpms/cups/F-9 cups-str3055.patch, NONE, 1.1 cups-str3059.patch, NONE,
	1.1 cups.spec, 1.434, 1.435
Message-ID: <20090128180239.1867E7010D@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/cups/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11795

Modified Files:
	cups.spec 
Added Files:
	cups-str3055.patch cups-str3059.patch 
Log Message:
* Wed Jan 28 2009 Tim Waugh <twaugh at redhat.com>
- Always supply document-name when printing a file (STR #3055).
- Load MIME type rules correctly (bug #426089, STR #3059).


cups-str3055.patch:

--- NEW FILE cups-str3055.patch ---
diff -up cups-1.3.9/cups/util.c.str3055 cups-1.3.9/cups/util.c
--- cups-1.3.9/cups/util.c.str3055	2008-07-11 23:48:49.000000000 +0100
+++ cups-1.3.9/cups/util.c	2009-01-28 17:55:52.000000000 +0000
@@ -1253,6 +1253,21 @@ cupsPrintFiles2(http_t        *http,	/* 
     ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_NAME, "job-name", NULL,
                  title);
 
+  if (num_files == 1)
+  {
+   /*
+    * Add the original document filename...
+    */
+
+    if ((base = strrchr(files[0], '/')) != NULL)
+      base ++;
+    else
+      base = files[0];
+
+    ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_NAME, "document-name",
+		 NULL, base);
+  }
+
  /*
   * Then add all options...
   */

cups-str3059.patch:

--- NEW FILE cups-str3059.patch ---
diff -up cups-1.3.9/scheduler/type.c.str3059 cups-1.3.9/scheduler/type.c
--- cups-1.3.9/scheduler/type.c.str3059	2008-07-11 23:48:49.000000000 +0100
+++ cups-1.3.9/scheduler/type.c	2009-01-28 17:56:57.000000000 +0000
@@ -187,8 +187,7 @@ mimeAddTypeRule(mime_type_t *mt,	/* I - 
     else if (*rule == '+' && current != NULL)
     {
       if (logic != MIME_MAGIC_AND &&
-          current != NULL && current->prev != NULL &&
-	  current->prev->prev != NULL)
+          current != NULL && current->prev != NULL)
       {
        /*
         * OK, we have more than 1 rule in the current tree level...  Make a


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-9/cups.spec,v
retrieving revision 1.434
retrieving revision 1.435
diff -u -r1.434 -r1.435
--- cups.spec	28 Jan 2009 17:50:02 -0000	1.434
+++ cups.spec	28 Jan 2009 18:02:08 -0000	1.435
@@ -54,6 +54,8 @@
 Patch28: cups-str2831.patch
 Patch29: cups-str3077.patch
 Patch30: cups-str3078.patch
+Patch31: cups-str3059.patch
+Patch32: cups-str3055.patch
 Patch100: cups-lspp.patch
 Epoch: 1
 Url: http://www.cups.org/
@@ -179,6 +181,8 @@
 %patch28 -p1 -b .str2831
 %patch29 -p1 -b .str3077
 %patch30 -p1 -b .str3078
+%patch31 -p1 -b .str3059
+%patch32 -p1 -b .str3055
 
 %if %lspp
 %patch100 -p1 -b .lspp
@@ -459,6 +463,8 @@
 
 %changelog
 * Wed Jan 28 2009 Tim Waugh <twaugh at redhat.com>
+- Always supply document-name when printing a file (STR #3055).
+- Load MIME type rules correctly (bug #426089, STR #3059).
 - Fixed quotas (STR #3077, STR #3078).
 - Removed all patch fuzz.
 



From twaugh at fedoraproject.org  Wed Jan 28 18:04:13 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Wed, 28 Jan 2009 18:04:13 +0000 (UTC)
Subject: rpms/cups/F-9 cups.spec,1.435,1.436
Message-ID: <20090128180413.11C417010D@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/cups/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12139

Modified Files:
	cups.spec 
Log Message:
Bumped release.


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-9/cups.spec,v
retrieving revision 1.435
retrieving revision 1.436
diff -u -r1.435 -r1.436
--- cups.spec	28 Jan 2009 18:02:08 -0000	1.435
+++ cups.spec	28 Jan 2009 18:03:42 -0000	1.436
@@ -7,7 +7,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.3.9
-Release: 3%{?svn:.svn%{svn}}%{?dist}
+Release: 4%{?svn:.svn%{svn}}%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 Source: ftp://ftp.easysw.com/pub/cups/test//cups-%{version}%{?svn:svn-r%{svn}}-source.tar.bz2
@@ -462,7 +462,7 @@
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
-* Wed Jan 28 2009 Tim Waugh <twaugh at redhat.com>
+* Wed Jan 28 2009 Tim Waugh <twaugh at redhat.com> 1:1.3.9-4
 - Always supply document-name when printing a file (STR #3055).
 - Load MIME type rules correctly (bug #426089, STR #3059).
 - Fixed quotas (STR #3077, STR #3078).



From tuxbrewr at fedoraproject.org  Wed Jan 28 18:04:56 2009
From: tuxbrewr at fedoraproject.org (Steven M. Parrish)
Date: Wed, 28 Jan 2009 18:04:56 +0000 (UTC)
Subject: rpms/kpackagekit/devel kpackagekit.spec,1.16,1.17
Message-ID: <20090128180456.24CE87010D@cvs1.fedora.phx.redhat.com>

Author: tuxbrewr

Update of /cvs/pkgs/rpms/kpackagekit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12359

Modified Files:
	kpackagekit.spec 
Log Message:
Corrected release tag


Index: kpackagekit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kpackagekit/devel/kpackagekit.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- kpackagekit.spec	28 Jan 2009 17:40:47 -0000	1.16
+++ kpackagekit.spec	28 Jan 2009 18:04:25 -0000	1.17
@@ -1,8 +1,8 @@
 %define betaversion b4
 
 Name:	  	kpackagekit
-Version:	0.4.2
-Release:	svn.1%{?dist}
+Version:	0
+Release:	0.1.20090128svn%{?dist}
 Summary:	KDE interface for PackageKit
 
 License:	GPLv2+
@@ -70,6 +70,9 @@
 
 
 %changelog
+* Wed Jan 28 2009 Steven M. Parrish <smparrish at shallowcreek.net> 0-0.1.20090128svn
+- Corrected release tag
+
 * Wed Jan 28 2009 Steven M. Parrish <smparrish at shallowcreek.net> 0.4.2-svn.1
 - SVN build to solve compatibility issues with packagekit 0.4.2
 



From twaugh at fedoraproject.org  Wed Jan 28 18:05:02 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Wed, 28 Jan 2009 18:05:02 +0000 (UTC)
Subject: rpms/cups/F-10 cups-str3055.patch,NONE,1.1 cups.spec,1.453,1.454
Message-ID: <20090128180502.283A07010D@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/cups/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12389

Modified Files:
	cups.spec 
Added Files:
	cups-str3055.patch 
Log Message:
* Wed Jan 28 2009 Tim Waugh <twaugh at redhat.com>
- Always supply document-name when printing a file (STR #3055).


cups-str3055.patch:

--- NEW FILE cups-str3055.patch ---
diff -up cups-1.3.9/cups/util.c.str3055 cups-1.3.9/cups/util.c
--- cups-1.3.9/cups/util.c.str3055	2008-07-11 23:48:49.000000000 +0100
+++ cups-1.3.9/cups/util.c	2009-01-28 17:59:03.000000000 +0000
@@ -1253,6 +1253,21 @@ cupsPrintFiles2(http_t        *http,	/* 
     ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_NAME, "job-name", NULL,
                  title);
 
+  if (num_files == 1)
+  {
+   /*
+    * Add the original document filename...
+    */
+
+    if ((base = strrchr(files[0], '/')) != NULL)
+      base ++;
+    else
+      base = files[0];
+
+    ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_NAME, "document-name",
+		 NULL, base);
+  }
+
  /*
   * Then add all options...
   */


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-10/cups.spec,v
retrieving revision 1.453
retrieving revision 1.454
diff -u -r1.453 -r1.454
--- cups.spec	28 Jan 2009 17:49:12 -0000	1.453
+++ cups.spec	28 Jan 2009 18:04:31 -0000	1.454
@@ -56,6 +56,7 @@
 Patch30: cups-str3077.patch
 Patch31: cups-str3078.patch
 Patch32: cups-str3059.patch
+Patch33: cups-str3055.patch
 Patch100: cups-lspp.patch
 Epoch: 1
 Url: http://www.cups.org/
@@ -198,6 +199,7 @@
 %patch30 -p1 -b .str3077
 %patch31 -p1 -b .str3078
 %patch32 -p1 -b .str3059
+%patch33 -p1 -b .str3055
 
 %if %lspp
 %patch100 -p1 -b .lspp
@@ -487,6 +489,7 @@
 
 %changelog
 * Wed Jan 28 2009 Tim Waugh <twaugh at redhat.com>
+- Always supply document-name when printing a file (STR #3055).
 - Load MIME type rules correctly (bug #426089, STR #3059).
 
 * Wed Jan 28 2009 Tim Waugh <twaugh at redhat.com> 1:1.3.9-7



From twaugh at fedoraproject.org  Wed Jan 28 18:14:36 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Wed, 28 Jan 2009 18:14:36 +0000 (UTC)
Subject: rpms/cups/F-10 cups.spec,1.454,1.455
Message-ID: <20090128181436.4FE517010D@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/cups/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15989

Modified Files:
	cups.spec 
Log Message:
1.3.9-8


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-10/cups.spec,v
retrieving revision 1.454
retrieving revision 1.455
diff -u -r1.454 -r1.455
--- cups.spec	28 Jan 2009 18:04:31 -0000	1.454
+++ cups.spec	28 Jan 2009 18:14:05 -0000	1.455
@@ -7,7 +7,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.3.9
-Release: 7%{?svn:.svn%{svn}}%{?dist}
+Release: 8%{?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
@@ -488,7 +488,7 @@
 %{_libdir}/php/modules/*.so
 
 %changelog
-* Wed Jan 28 2009 Tim Waugh <twaugh at redhat.com>
+* Wed Jan 28 2009 Tim Waugh <twaugh at redhat.com> 1:1.3.9-8
 - Always supply document-name when printing a file (STR #3055).
 - Load MIME type rules correctly (bug #426089, STR #3059).
 



From tuxbrewr at fedoraproject.org  Wed Jan 28 18:18:28 2009
From: tuxbrewr at fedoraproject.org (Steven M. Parrish)
Date: Wed, 28 Jan 2009 18:18:28 +0000 (UTC)
Subject: rpms/kpackagekit/devel kpackagekit.spec,1.17,1.18
Message-ID: <20090128181828.608617010D@cvs1.fedora.phx.redhat.com>

Author: tuxbrewr

Update of /cvs/pkgs/rpms/kpackagekit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16577

Modified Files:
	kpackagekit.spec 
Log Message:
Corrected release tag again


Index: kpackagekit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kpackagekit/devel/kpackagekit.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- kpackagekit.spec	28 Jan 2009 18:04:25 -0000	1.17
+++ kpackagekit.spec	28 Jan 2009 18:17:58 -0000	1.18
@@ -1,7 +1,7 @@
 %define betaversion b4
 
 Name:	  	kpackagekit
-Version:	0
+Version:	0.4.2
 Release:	0.1.20090128svn%{?dist}
 Summary:	KDE interface for PackageKit
 
@@ -70,6 +70,9 @@
 
 
 %changelog
+* Wed Jan 28 2009 Steven M. Parrish <smparrish at shallowcreek.net> 0.4.2-0.1.20090128svn
+- Corrected release tag
+
 * Wed Jan 28 2009 Steven M. Parrish <smparrish at shallowcreek.net> 0-0.1.20090128svn
 - Corrected release tag
 



From caillon at fedoraproject.org  Wed Jan 28 18:25:20 2009
From: caillon at fedoraproject.org (Christopher Aillon)
Date: Wed, 28 Jan 2009 18:25:20 +0000 (UTC)
Subject: rpms/xulrunner/devel xulrunner-redhat-default-prefs.js, 1.3,
	1.4 xulrunner.spec, 1.147, 1.148
Message-ID: <20090128182520.79AB27010D@cvs1.fedora.phx.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/xulrunner/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17678

Modified Files:
	xulrunner-redhat-default-prefs.js xulrunner.spec 
Log Message:
* Wed Jan 28 2009 Christopher Aillon <caillon at redhat.com> 1.9.1-0.7
- Re-enable NM by default



Index: xulrunner-redhat-default-prefs.js
===================================================================
RCS file: /cvs/extras/rpms/xulrunner/devel/xulrunner-redhat-default-prefs.js,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xulrunner-redhat-default-prefs.js	18 Jun 2008 00:49:32 -0000	1.3
+++ xulrunner-redhat-default-prefs.js	28 Jan 2009 18:24:50 -0000	1.4
@@ -6,4 +6,5 @@
 pref("general.useragent.vendor", "Fedora");
 pref("general.useragent.vendorSub", "RPM_VERREL");
 pref("intl.locale.matchOS", true);
+pref("toolkit.networkmanager.disable", false);
 pref("toolkit.storage.synchronous", 0);


Index: xulrunner.spec
===================================================================
RCS file: /cvs/extras/rpms/xulrunner/devel/xulrunner.spec,v
retrieving revision 1.147
retrieving revision 1.148
diff -u -r1.147 -r1.148
--- xulrunner.spec	14 Jan 2009 14:56:28 -0000	1.147
+++ xulrunner.spec	28 Jan 2009 18:24:50 -0000	1.148
@@ -11,7 +11,7 @@
 Summary:        XUL Runtime for Gecko Applications
 Name:           xulrunner
 Version:        1.9.1
-Release:        0.6.beta2%{?dist}
+Release:        0.7.beta2%{?dist}
 URL:            http://developer.mozilla.org/En/XULRunner
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 Group:          Applications/Internet
@@ -451,7 +451,10 @@
 #---------------------------------------------------------------------
 
 %changelog
-* Wed Jan 7 2009 Martin Stransky <stransky at redhat.com> 1.9.1-0.6
+* Wed Jan 28 2009 Christopher Aillon <caillon at redhat.com> 1.9.1-0.7
+- Re-enable NM by default
+
+* Wed Jan  7 2009 Martin Stransky <stransky at redhat.com> 1.9.1-0.6
 - Copied mozilla-config.h to stable include dir (#478445)
 
 * Mon Dec 22 2008 Christopher Aillon <caillon at redhat.com> 1.9.1-0.5



From jnovy at fedoraproject.org  Wed Jan 28 18:25:56 2009
From: jnovy at fedoraproject.org (Jindrich Novy)
Date: Wed, 28 Jan 2009 18:25:56 +0000 (UTC)
Subject: rpms/netpbm/devel netpbm-10.35-ximtoppmsegfault.patch, NONE,
	1.1 netpbm.spec, 1.129, 1.130
Message-ID: <20090128182556.5FF977010D@cvs1.fedora.phx.redhat.com>

Author: jnovy

Update of /cvs/pkgs/rpms/netpbm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17817

Modified Files:
	netpbm.spec 
Added Files:
	netpbm-10.35-ximtoppmsegfault.patch 
Log Message:
* Wed Jan 28 2009 Jindrich Novy <jnovy at redhat.com> 10.35.58-4
- fix segfault in ximtoppm (#482891), the utility lacked the
  command line parsing initialization code


netpbm-10.35-ximtoppmsegfault.patch:

--- NEW FILE netpbm-10.35-ximtoppmsegfault.patch ---
diff -up netpbm-10.35.58/converter/ppm/ximtoppm.c.ximtoppmsegfault netpbm-10.35.58/converter/ppm/ximtoppm.c
--- netpbm-10.35.58/converter/ppm/ximtoppm.c.ximtoppmsegfault	2009-01-28 18:37:05.000000000 +0100
+++ netpbm-10.35.58/converter/ppm/ximtoppm.c	2009-01-28 19:01:14.000000000 +0100
@@ -50,6 +50,10 @@ parseCommandLine(int argc, char ** argv,
     OPTENT3(0,   "alphaout",   OPT_STRING, 
             &cmdlineP->alpha_filename, &alphaoutSpec, 0);
 
+    opt.opt_table = option_def;
+    opt.short_allowed = FALSE;
+    opt.allowNegNum = FALSE;
+
     optParseOptions3(&argc, argv, opt, sizeof(opt), 0);
         /* Uses and sets argc, argv, and all of *cmdlineP. */
 


Index: netpbm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/netpbm/devel/netpbm.spec,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -r1.129 -r1.130
--- netpbm.spec	22 Jan 2009 09:38:13 -0000	1.129
+++ netpbm.spec	28 Jan 2009 18:25:26 -0000	1.130
@@ -1,7 +1,7 @@
 Summary: A library for handling different graphics file formats
 Name: netpbm
 Version: 10.35.58
-Release: 3%{?dist}
+Release: 4%{?dist}
 # See copyright_summary for details
 License: BSD and GPLv2 and IJG and MIT and Public Domain
 Group: System Environment/Libraries
@@ -34,6 +34,7 @@
 Patch22: netpbm-10.35-pnmmontagefix.patch
 Patch23: netpbm-10.35-pnmtofiasco-stdin.patch
 Patch24: netpbm-10.35-64bitfix.patch
+Patch25: netpbm-10.35-ximtoppmsegfault.patch
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: libjpeg-devel, libpng-devel, libtiff-devel, flex
 BuildRequires: libX11-devel, python, jasper-devel
@@ -98,6 +99,7 @@
 %patch22 -p1 -b .pnmmontagefix
 %patch23 -p1 -b .pnmtofiasco-stdin
 %patch24 -p1 -b .64bitfix
+%patch25 -p1 -b .ximtoppmsegfault
 
 ##mv shhopt/shhopt.h shhopt/pbmshhopt.h
 ##perl -pi -e 's|shhopt.h|pbmshhopt.h|g' `find -name "*.c" -o -name "*.h"` ./GNUmakefile
@@ -225,6 +227,10 @@
 %{_datadir}/netpbm/
 
 %changelog
+* Wed Jan 28 2009 Jindrich Novy <jnovy at redhat.com> 10.35.58-4
+- fix segfault in ximtoppm (#482891), the utility lacked the
+  command line parsing initialization code
+
 * Thu Jan 22 2009 Jindrich Novy <jnovy at redhat.com> 10.35.58-3
 - fix cmuwmtopbm and other utilities by making endianess
   functions work correctly on 64bit systems (#476863)



From cebbert at fedoraproject.org  Wed Jan 28 18:27:44 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Wed, 28 Jan 2009 18:27:44 +0000 (UTC)
Subject: rpms/kernel/F-10 kernel.spec, 1.1206.2.6, 1.1206.2.7
	linux-2.6-net-sctp-avoid-memory-overflow-while-FWD-TSN-chunk-is-r.patch,
	1.1.2.2, NONE
Message-ID: <20090128182744.8F00B7010D@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18320

Modified Files:
      Tag: private-fedora-10-2_6_27
	kernel.spec 
Removed Files:
      Tag: private-fedora-10-2_6_27
	linux-2.6-net-sctp-avoid-memory-overflow-while-FWD-TSN-chunk-is-r.patch 
Log Message:
Drop sctp patch marged in 2.6.27.13


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/kernel.spec,v
retrieving revision 1.1206.2.6
retrieving revision 1.1206.2.7
diff -u -r1.1206.2.6 -r1.1206.2.7
--- kernel.spec	26 Jan 2009 21:26:25 -0000	1.1206.2.6
+++ kernel.spec	28 Jan 2009 18:27:13 -0000	1.1206.2.7
@@ -695,9 +695,6 @@
 
 Patch2031: linux-2.6-net-qla-silence-debug-printks.patch
 
-# CVE-2009-0065 SCTP buffer overflow
-Patch2032: linux-2.6-net-sctp-avoid-memory-overflow-while-FWD-TSN-chunk-is-r.patch
-
 # olpc fixes
 Patch2041: linux-2.6-olpc-touchpad.patch
 Patch2042: linux-2.6-quieter-mmc.patch
@@ -1296,8 +1293,6 @@
 
 ApplyPatch linux-2.6-net-qla-silence-debug-printks.patch
 
-ApplyPatch linux-2.6-net-sctp-avoid-memory-overflow-while-FWD-TSN-chunk-is-r.patch
-
 ApplyPatch linux-2.6-olpc-touchpad.patch
 ApplyPatch linux-2.6-quieter-mmc.patch
 
@@ -1916,6 +1911,9 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Wed Jan 28 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.27.13-170.2.7
+- Drop sctp patch marged in 2.6.27.13
+
 * Mon Jan 26 2009 Kyle McMartin <kyle at redhat.com> 2.6.27.13-170.2.6
 - 2.6.27.13 final
 


--- linux-2.6-net-sctp-avoid-memory-overflow-while-FWD-TSN-chunk-is-r.patch DELETED ---



From anyremote at fedoraproject.org  Wed Jan 28 18:45:16 2009
From: anyremote at fedoraproject.org (Mikhail Fedotov)
Date: Wed, 28 Jan 2009 18:45:16 +0000 (UTC)
Subject: rpms/anyremote/F-10 .cvsignore, 1.14, 1.15 anyremote.spec, 1.14,
	1.15 import.log, 1.8, 1.9 sources, 1.14, 1.15
Message-ID: <20090128184517.029767010D@cvs1.fedora.phx.redhat.com>

Author: anyremote

Update of /cvs/pkgs/rpms/anyremote/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21764/F-10

Modified Files:
	.cvsignore anyremote.spec import.log sources 
Log Message:
build


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/anyremote/F-10/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	16 Jan 2009 16:08:30 -0000	1.14
+++ .cvsignore	28 Jan 2009 18:44:46 -0000	1.15
@@ -1 +1 @@
-anyremote-4.15.tar.gz
+anyremote-4.16.tar.gz


Index: anyremote.spec
===================================================================
RCS file: /cvs/pkgs/rpms/anyremote/F-10/anyremote.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- anyremote.spec	16 Jan 2009 16:08:30 -0000	1.14
+++ anyremote.spec	28 Jan 2009 18:44:46 -0000	1.15
@@ -1,12 +1,12 @@
 Summary: Remote control through bluetooth or IR connection
 Name: anyremote
-Version: 4.15
+Version: 4.16
 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.14
+Requires: bc,anyremote-data >= 4.16
 BuildRequires:bluez-libs-devel >= 3.35, libX11-devel, libXtst-devel, xorg-x11-proto-devel
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -60,6 +60,11 @@
 
 %changelog
 
+* Tue Jan 27 2009 Mikhail Fedotov <anyremote at mail.ru> - 4.16-1
+- Add possibility to set SDP service name. Corrections of configuration files.
+  Configuration files for KsCD/KDE4 and Eye-of-Gnome were added.
+  Created icon auto-upload feature.
+
 * Fri Jan 16 2009 Mikhail Fedotov <anyremote at mail.ru> - 4.15-1
 - Fixed crash issue in case of anyremote was runned without X.
   Fix hang in Load() command in case of empty file.


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/anyremote/F-10/import.log,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- import.log	16 Jan 2009 16:08:30 -0000	1.8
+++ import.log	28 Jan 2009 18:44:46 -0000	1.9
@@ -6,3 +6,4 @@
 anyremote-4_13-1_fc10:F-10:anyremote-4.13-1.fc10.src.rpm:1228852860
 anyremote-4_14-1_fc10:F-10:anyremote-4.14-1.fc10.src.rpm:1231699601
 anyremote-4_15-1_fc10:F-10:anyremote-4.15-1.fc10.src.rpm:1232122053
+anyremote-4_16-1_fc10:F-10:anyremote-4.16-1.fc10.src.rpm:1233168231


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/anyremote/F-10/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	16 Jan 2009 16:08:30 -0000	1.14
+++ sources	28 Jan 2009 18:44:46 -0000	1.15
@@ -1 +1 @@
-4bac900dafab2ffba006dcdab63cfc2b  anyremote-4.15.tar.gz
+651eed785430cf85ee5c228d6778d37d  anyremote-4.16.tar.gz



From anyremote at fedoraproject.org  Wed Jan 28 18:46:05 2009
From: anyremote at fedoraproject.org (Mikhail Fedotov)
Date: Wed, 28 Jan 2009 18:46:05 +0000 (UTC)
Subject: rpms/anyremote/F-9 .cvsignore, 1.14, 1.15 anyremote.spec, 1.13,
	1.14 import.log, 1.8, 1.9 sources, 1.14, 1.15
Message-ID: <20090128184605.6AC3C7010D@cvs1.fedora.phx.redhat.com>

Author: anyremote

Update of /cvs/pkgs/rpms/anyremote/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21938/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.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	16 Jan 2009 16:07:41 -0000	1.14
+++ .cvsignore	28 Jan 2009 18:45:35 -0000	1.15
@@ -1 +1 @@
-anyremote-4.15.tar.gz
+anyremote-4.16.tar.gz


Index: anyremote.spec
===================================================================
RCS file: /cvs/pkgs/rpms/anyremote/F-9/anyremote.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- anyremote.spec	16 Jan 2009 16:07:41 -0000	1.13
+++ anyremote.spec	28 Jan 2009 18:45:35 -0000	1.14
@@ -1,12 +1,12 @@
 Summary: Remote control through bluetooth or IR connection
 Name: anyremote
-Version: 4.15
+Version: 4.16
 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.14
+Requires: bc,anyremote-data >= 4.16
 BuildRequires:bluez-libs-devel >= 3.35, libX11-devel, libXtst-devel, xorg-x11-proto-devel
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -60,6 +60,11 @@
 
 %changelog
 
+* Tue Jan 27 2009 Mikhail Fedotov <anyremote at mail.ru> - 4.16-1
+- Add possibility to set SDP service name. Corrections of configuration files.
+  Configuration files for KsCD/KDE4 and Eye-of-Gnome were added.
+  Created icon auto-upload feature.
+
 * Fri Jan 16 2009 Mikhail Fedotov <anyremote at mail.ru> - 4.15-1
 - Fixed crash issue in case of anyremote was runned without X.
   Fix hang in Load() command in case of empty file.


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/anyremote/F-9/import.log,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- import.log	16 Jan 2009 16:07:41 -0000	1.8
+++ import.log	28 Jan 2009 18:45:35 -0000	1.9
@@ -6,3 +6,4 @@
 anyremote-4_13-1_fc10:F-9:anyremote-4.13-1.fc10.src.rpm:1228852843
 anyremote-4_14-1_fc10:F-9:anyremote-4.14-1.fc10.src.rpm:1231699592
 anyremote-4_15-1_fc10:F-9:anyremote-4.15-1.fc10.src.rpm:1232122037
+anyremote-4_16-1_fc10:F-9:anyremote-4.16-1.fc10.src.rpm:1233168249


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/anyremote/F-9/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	16 Jan 2009 16:07:41 -0000	1.14
+++ sources	28 Jan 2009 18:45:35 -0000	1.15
@@ -1 +1 @@
-4bac900dafab2ffba006dcdab63cfc2b  anyremote-4.15.tar.gz
+651eed785430cf85ee5c228d6778d37d  anyremote-4.16.tar.gz



From anyremote at fedoraproject.org  Wed Jan 28 18:46:08 2009
From: anyremote at fedoraproject.org (Mikhail Fedotov)
Date: Wed, 28 Jan 2009 18:46:08 +0000 (UTC)
Subject: rpms/anyremote/devel .cvsignore, 1.14, 1.15 anyremote.spec, 1.14,
	1.15 import.log, 1.8, 1.9 sources, 1.14, 1.15
Message-ID: <20090128184608.53DAB7010D@cvs1.fedora.phx.redhat.com>

Author: anyremote

Update of /cvs/pkgs/rpms/anyremote/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21961/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.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	16 Jan 2009 16:08:32 -0000	1.14
+++ .cvsignore	28 Jan 2009 18:45:38 -0000	1.15
@@ -1 +1 @@
-anyremote-4.15.tar.gz
+anyremote-4.16.tar.gz


Index: anyremote.spec
===================================================================
RCS file: /cvs/pkgs/rpms/anyremote/devel/anyremote.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- anyremote.spec	16 Jan 2009 16:08:32 -0000	1.14
+++ anyremote.spec	28 Jan 2009 18:45:38 -0000	1.15
@@ -1,12 +1,12 @@
 Summary: Remote control through bluetooth or IR connection
 Name: anyremote
-Version: 4.15
+Version: 4.16
 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.14
+Requires: bc,anyremote-data >= 4.16
 BuildRequires:bluez-libs-devel >= 3.35, libX11-devel, libXtst-devel, xorg-x11-proto-devel
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -60,6 +60,11 @@
 
 %changelog
 
+* Tue Jan 27 2009 Mikhail Fedotov <anyremote at mail.ru> - 4.16-1
+- Add possibility to set SDP service name. Corrections of configuration files.
+  Configuration files for KsCD/KDE4 and Eye-of-Gnome were added.
+  Created icon auto-upload feature.
+
 * Fri Jan 16 2009 Mikhail Fedotov <anyremote at mail.ru> - 4.15-1
 - Fixed crash issue in case of anyremote was runned without X.
   Fix hang in Load() command in case of empty file.


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/anyremote/devel/import.log,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- import.log	16 Jan 2009 16:08:32 -0000	1.8
+++ import.log	28 Jan 2009 18:45:38 -0000	1.9
@@ -6,3 +6,4 @@
 anyremote-4_13-1_fc10:HEAD:anyremote-4.13-1.fc10.src.rpm:1228852868
 anyremote-4_14-1_fc10:HEAD:anyremote-4.14-1.fc10.src.rpm:1231699613
 anyremote-4_15-1_fc10:HEAD:anyremote-4.15-1.fc10.src.rpm:1232122047
+anyremote-4_16-1_fc10:HEAD:anyremote-4.16-1.fc10.src.rpm:1233168250


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/anyremote/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	16 Jan 2009 16:08:32 -0000	1.14
+++ sources	28 Jan 2009 18:45:38 -0000	1.15
@@ -1 +1 @@
-4bac900dafab2ffba006dcdab63cfc2b  anyremote-4.15.tar.gz
+651eed785430cf85ee5c228d6778d37d  anyremote-4.16.tar.gz



From salimma at fedoraproject.org  Wed Jan 28 19:08:31 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Wed, 28 Jan 2009 19:08:31 +0000 (UTC)
Subject: rpms/fbreader/EL-5 fbreader.spec,1.11,1.12
Message-ID: <20090128190831.B76D17010D@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/fbreader/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25975

Modified Files:
	fbreader.spec 
Log Message:
EL-5: BR on curl-devel, not libcurl-devel



Index: fbreader.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fbreader/EL-5/fbreader.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- fbreader.spec	28 Jan 2009 15:50:10 -0000	1.11
+++ fbreader.spec	28 Jan 2009 19:08:00 -0000	1.12
@@ -16,7 +16,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  expat-devel bzip2-devel liblinebreak-static
-BuildRequires:  gtk2-devel fribidi-devel libcurl-devel
+BuildRequires:  gtk2-devel fribidi-devel curl-devel
 BuildRequires:  libjpeg-devel desktop-file-utils
 %{?_with_qt4:BuildRequires: qt4-devel}
 #Requires:       



From wart at fedoraproject.org  Wed Jan 28 19:23:02 2009
From: wart at fedoraproject.org (Michael Thomas)
Date: Wed, 28 Jan 2009 19:23:02 +0000 (UTC)
Subject: rpms/tbcload/EL-4 tbcload.spec, 1.6, 1.7 tbcload-1.4-pkgpath.patch, 
	1.1, NONE tbcload-1.4-tcl85.patch, 1.1, NONE
Message-ID: <20090128192302.D0F937010D@cvs1.fedora.phx.redhat.com>

Author: wart

Update of /cvs/pkgs/rpms/tbcload/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29135

Modified Files:
	tbcload.spec 
Removed Files:
	tbcload-1.4-pkgpath.patch tbcload-1.4-tcl85.patch 
Log Message:
Update for EPEL4



Index: tbcload.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tbcload/EL-4/tbcload.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- tbcload.spec	9 Feb 2008 18:43:12 -0000	1.6
+++ tbcload.spec	28 Jan 2009 19:22:32 -0000	1.7
@@ -1,21 +1,17 @@
-%{!?tcl_version: %define tcl_version %(echo 'puts $tcl_version' | tclsh)}
-%{!?tcl_sitearch: %define tcl_sitearch %{_libdir}/tcl%{tcl_version}}
 %define cvsdate 20061030
 
 Summary: Tcl bytecode loader
 Name: tbcload
 Version: 1.4
-Release: 8.%{cvsdate}cvs%{?dist}
+Release: 6.%{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 tbcload-20061030cvs tbcload
 # tar czf tbcload-20061030cvs.tgz ./tbcload-20061030cvs
 Source0: tbcload-%{cvsdate}cvs.tgz
 Patch0:  tbcload-1.4-configure.patch
-Patch1:  tbcload-1.4-pkgpath.patch
-Patch2:  tbcload-1.4-tcl85.patch
 URL: http://tclpro.sourceforge.net/
-Requires: tcl(abi) = 8.5
+Requires: tcl
 BuildRequires: tcl-devel
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -33,8 +29,6 @@
 %prep
 %setup -q -n %{name}-%{cvsdate}cvs
 %patch0 -p0
-%patch1 -p0
-%patch2 -p1
 
 %build
 %configure
@@ -45,29 +39,24 @@
 make install DESTDIR=$RPM_BUILD_ROOT
 
 %check
-make test || :
+make test
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
-%doc ChangeLog license.terms
 %defattr(-,root,root)
-%{tcl_sitearch}/%{name}%{version}
+%doc ChangeLog license.terms
+%{_libdir}/%{name}%{version}
 
 %files devel
 %defattr(-,root,root)
 %{_includedir}/*.h
 
 %changelog
-* Sat Feb 9 2008 Wart <wart at kobold.org> 1.4-8.20061030cvs
-- Rebuild for gcc 4.3
-
-* Sat Jan 5 2008 Wart <wart at kobold.org> 1.4-7.20061030cvs
-- Temporary work around for build issues with Tcl 8.5
-
-* Sat Jan  5 2008 Alex Lancaster <alexlan[AT]fedoraproject org> - 1.4-6.20061030cvs
-- Rebuild for new Tcl 8.5
+* Wed Jan 28 2009 Wart <wart at kobold.org> 1.4-6.20061030cvs
+- Move out of tcl-specific directory due to multi-arch problems
+- Rebuild for EPEL-4
 
 * Mon Aug 20 2007 Wart <wart at kobold.org> 1.4-5.20061030cvs
 - Move to a tcl-specific directory for faster loading


--- tbcload-1.4-pkgpath.patch DELETED ---


--- tbcload-1.4-tcl85.patch DELETED ---



From rvinyard at fedoraproject.org  Wed Jan 28 19:36:56 2009
From: rvinyard at fedoraproject.org (Rick L. Vinyard, Jr.)
Date: Wed, 28 Jan 2009 19:36:56 +0000 (UTC)
Subject: rpms/bitgtkmm/devel dead.package, NONE, 1.1 Makefile, 1.1,
	NONE bitgtkmm.spec, 1.7, NONE sources, 1.3, NONE
Message-ID: <20090128193656.8C9847010D@cvs1.fedora.phx.redhat.com>

Author: rvinyard

Update of /cvs/pkgs/rpms/bitgtkmm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31674

Added Files:
	dead.package 
Removed Files:
	Makefile bitgtkmm.spec sources 
Log Message:
Obsoleted by bit-gtkmm



--- NEW FILE dead.package ---
The bitgtkmm library was merged into bit and is available as
bit-gtkmm.


--- Makefile DELETED ---


--- bitgtkmm.spec DELETED ---


--- sources DELETED ---



From kyle at fedoraproject.org  Wed Jan 28 19:41:12 2009
From: kyle at fedoraproject.org (Kyle McMartin)
Date: Wed, 28 Jan 2009 19:41:12 +0000 (UTC)
Subject: rpms/kernel/devel patch-2.6.29-rc3.bz2.sign, NONE, 1.1 .cvsignore, 
	1.998, 1.999 config-powerpc-generic, 1.32, 1.33 kernel.spec,
	1.1241, 1.1242 sources, 1.960, 1.961 upstream, 1.872,
	1.873 patch-2.6.29-rc2-git3.bz2.sign, 1.1,
	NONE patch-2.6.29-rc2.bz2.sign, 1.1, NONE
Message-ID: <20090128194112.93CB97010D@cvs1.fedora.phx.redhat.com>

Author: kyle

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32593

Modified Files:
	.cvsignore config-powerpc-generic kernel.spec sources upstream 
Added Files:
	patch-2.6.29-rc3.bz2.sign 
Removed Files:
	patch-2.6.29-rc2-git3.bz2.sign patch-2.6.29-rc2.bz2.sign 
Log Message:
* Wed Jan 28 2009 Kyle McMartin <kyle at redhat.com>
- Linux 2.6.29-rc3



--- NEW FILE patch-2.6.29-rc3.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBJgLHQyGugalF9Dw4RAtLhAJ9pr92MP22mBsyYTRSc+HuSA9xvhgCfTz4/
IJ9/jtVbprCGGhCLsj8A7/I=
=n0R6
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.998
retrieving revision 1.999
diff -u -r1.998 -r1.999
--- .cvsignore	27 Jan 2009 17:43:01 -0000	1.998
+++ .cvsignore	28 Jan 2009 19:40:41 -0000	1.999
@@ -4,5 +4,4 @@
 temp-*
 kernel-2.6.28
 linux-2.6.28.tar.bz2
-patch-2.6.29-rc2.bz2
-patch-2.6.29-rc2-git3.bz2
+patch-2.6.29-rc3.bz2


Index: config-powerpc-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-powerpc-generic,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- config-powerpc-generic	9 Jan 2009 05:13:21 -0000	1.32
+++ config-powerpc-generic	28 Jan 2009 19:40:41 -0000	1.33
@@ -296,3 +296,6 @@
 CONFIG_GPIO_PCA953X=m
 CONFIG_GPIO_PCF857X=m
 CONFIG_USB_GPIO_VBUS=m
+
+CONFIG_USB_FHCI_HCD=m
+# CONFIG_FHCI_DEBUG is not set


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1241
retrieving revision 1.1242
diff -u -r1.1241 -r1.1242
--- kernel.spec	28 Jan 2009 17:51:52 -0000	1.1241
+++ kernel.spec	28 Jan 2009 19:40:41 -0000	1.1242
@@ -56,9 +56,9 @@
 # The next upstream release sublevel (base_sublevel+1)
 %define upstream_sublevel %(echo $((%{base_sublevel} + 1)))
 # The rc snapshot level
-%define rcrev 2
+%define rcrev 3
 # The git snapshot level
-%define gitrev 3
+%define gitrev 0
 # Set rpm version accordingly
 %define rpmversion 2.6.%{upstream_sublevel}
 %endif
@@ -1773,6 +1773,9 @@
 
 %changelog
 * Wed Jan 28 2009 Kyle McMartin <kyle at redhat.com>
+- Linux 2.6.29-rc3
+
+* Wed Jan 28 2009 Kyle McMartin <kyle at redhat.com>
 - s/swab32/fswab32/ in nouveau
 
 * Wed Jan 28 2009 Mark McLoughlin <markmc at redhat.com>


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v
retrieving revision 1.960
retrieving revision 1.961
diff -u -r1.960 -r1.961
--- sources	27 Jan 2009 17:43:02 -0000	1.960
+++ sources	28 Jan 2009 19:40:41 -0000	1.961
@@ -1,3 +1,2 @@
 d351e44709c9810b85e29b877f50968a  linux-2.6.28.tar.bz2
-c8b4ae394659c8723aae2f1bafcb55dc  patch-2.6.29-rc2.bz2
-7cd3d5d92a64e265cd3e2131496697f2  patch-2.6.29-rc2-git3.bz2
+d95a5be60287e9632c9d0513b59f6511  patch-2.6.29-rc3.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v
retrieving revision 1.872
retrieving revision 1.873
diff -u -r1.872 -r1.873
--- upstream	27 Jan 2009 17:43:02 -0000	1.872
+++ upstream	28 Jan 2009 19:40:41 -0000	1.873
@@ -1,3 +1,2 @@
 linux-2.6.28.tar.bz2
-patch-2.6.29-rc2.bz2
-patch-2.6.29-rc2-git3.bz2
+patch-2.6.29-rc3.bz2


--- patch-2.6.29-rc2-git3.bz2.sign DELETED ---


--- patch-2.6.29-rc2.bz2.sign DELETED ---



From rvinyard at fedoraproject.org  Wed Jan 28 19:49:17 2009
From: rvinyard at fedoraproject.org (Rick L. Vinyard, Jr.)
Date: Wed, 28 Jan 2009 19:49:17 +0000 (UTC)
Subject: comps comps-f10.xml.in,1.211,1.212 comps-f11.xml.in,1.86,1.87
Message-ID: <20090128194917.CE25E7010D@cvs1.fedora.phx.redhat.com>

Author: rvinyard

Update of /cvs/pkgs/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2354

Modified Files:
	comps-f10.xml.in comps-f11.xml.in 
Log Message:
Fixed comps entries to reflect recent changes in F10 and rawhide



Index: comps-f10.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f10.xml.in,v
retrieving revision 1.211
retrieving revision 1.212
diff -u -r1.211 -r1.212
--- comps-f10.xml.in	28 Jan 2009 07:11:11 -0000	1.211
+++ comps-f10.xml.in	28 Jan 2009 19:48:47 -0000	1.212
@@ -2069,10 +2069,13 @@
       <packagereq type="optional">anjuta-doc</packagereq>
       <packagereq type="optional">bakery-devel</packagereq>
       <packagereq type="optional">bit-devel</packagereq>
-      <packagereq type="optional">bitgtkmm-devel</packagereq>
+      <packagereq type="optional">bit-gtkmm-devel</packagereq>
       <packagereq type="optional">cairomm-devel</packagereq>
       <packagereq type="optional">conexus-devel</packagereq>
-      <packagereq type="optional">conexusmm-devel</packagereq>
+      <packagereq type="optional">conexus-gtkmm-devel</packagereq>
+      <packagereq type="optional">conexus-ssl-devel</packagereq>
+      <packagereq type="optional">conexus-nspr-devel</packagereq>
+      <packagereq type="optional">conexus-nss-devel</packagereq>
       <packagereq type="optional">ddd</packagereq>
       <packagereq type="optional">gazpacho</packagereq>
       <packagereq type="optional">gconfmm26-devel</packagereq>
@@ -2102,6 +2105,8 @@
       <packagereq type="optional">libsigc++20-devel</packagereq>
       <packagereq type="optional">nemiver</packagereq>
       <packagereq type="optional">papyrus-devel</packagereq>
+      <packagereq type="optional">papyrus-gtkmm-devel</packagereq>
+      <packagereq type="optional">papyrus-extras-devel</packagereq>
       <packagereq type="optional">plotmm-devel</packagereq>
       <packagereq type="optional">scim-devel</packagereq>
     </packagelist>


Index: comps-f11.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f11.xml.in,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -r1.86 -r1.87
--- comps-f11.xml.in	28 Jan 2009 06:59:31 -0000	1.86
+++ comps-f11.xml.in	28 Jan 2009 19:48:47 -0000	1.87
@@ -2192,10 +2192,13 @@
       <packagereq type="optional">anjuta-doc</packagereq>
       <packagereq type="optional">bakery-devel</packagereq>
       <packagereq type="optional">bit-devel</packagereq>
-      <packagereq type="optional">bitgtkmm-devel</packagereq>
+      <packagereq type="optional">bit-gtkmm-devel</packagereq>
       <packagereq type="optional">cairomm-devel</packagereq>
       <packagereq type="optional">conexus-devel</packagereq>
-      <packagereq type="optional">conexusmm-devel</packagereq>
+      <packagereq type="optional">conexus-gtkmm-devel</packagereq>
+      <packagereq type="optional">conexus-ssl-devel</packagereq>
+      <packagereq type="optional">conexus-nspr-devel</packagereq>
+      <packagereq type="optional">conexus-nss-devel</packagereq>
       <packagereq type="optional">ddd</packagereq>
       <packagereq type="optional">gazpacho</packagereq>
       <packagereq type="optional">gconfmm26-devel</packagereq>
@@ -2225,6 +2228,8 @@
       <packagereq type="optional">libsigc++20-devel</packagereq>
       <packagereq type="optional">nemiver</packagereq>
       <packagereq type="optional">papyrus-devel</packagereq>
+      <packagereq type="optional">papyrus-gtkmm-devel</packagereq>
+      <packagereq type="optional">papyrus-extras-devel</packagereq>
       <packagereq type="optional">plotmm-devel</packagereq>
       <packagereq type="optional">scim-devel</packagereq>
     </packagelist>



From salimma at fedoraproject.org  Wed Jan 28 19:53:22 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Wed, 28 Jan 2009 19:53:22 +0000 (UTC)
Subject: rpms/sonic-visualiser/F-9 .cvsignore, 1.4, 1.5 sonic-visualiser.spec,
	1.9, 1.10 sources, 1.4, 1.5 sonic-visualiser-1.4-specfix.patch,
	1.1, NONE
Message-ID: <20090128195322.A106F7010D@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/sonic-visualiser/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3121

Modified Files:
	.cvsignore sonic-visualiser.spec sources 
Removed Files:
	sonic-visualiser-1.4-specfix.patch 
Log Message:
Update F-9's sonic-visualiser to F-10's 1.3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sonic-visualiser/F-9/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	15 Dec 2008 02:34:55 -0000	1.4
+++ .cvsignore	28 Jan 2009 19:52:51 -0000	1.5
@@ -1 +1 @@
-sonic-visualiser-1.4.tar.bz2
+sonic-visualiser-1.3.tar.bz2


Index: sonic-visualiser.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sonic-visualiser/F-9/sonic-visualiser.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sonic-visualiser.spec	15 Dec 2008 02:34:55 -0000	1.9
+++ sonic-visualiser.spec	28 Jan 2009 19:52:52 -0000	1.10
@@ -1,7 +1,7 @@
 # rebuild with --with libmad to enable support for MP3 files
 Name:           sonic-visualiser
-Version:        1.4
-Release:        2%{?dist}
+Version:        1.3
+Release:        1%{?dist}
 Summary:        A program for viewing and exploring audio data
 
 Group:          Applications/Multimedia
@@ -9,15 +9,15 @@
 URL:            http://www.sonicvisualiser.org/
 Source0:        http://downloads.sourceforge.net/sv1/sonic-visualiser-%{version}.tar.bz2
 Source1:        %{name}.desktop
-Patch0:         %{name}-1.4-specfix.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  qt4-devel vamp-plugin-sdk-devel
 BuildRequires:  libsndfile-devel libsamplerate-devel fftw-devel bzip2-devel
-BuildRequires:  jack-audio-connection-kit-devel pulseaudio-libs-devel
-BuildRequires:  redland-devel rubberband-devel
+BuildRequires:  jack-audio-connection-kit-devel portaudio-devel
+BuildRequires:  rubberband-devel
 %{?_with_libmad:BuildRequires:  libmad-devel}
-BuildRequires:  liboggz-devel libfishsound-devel liblo-devel
+BuildRequires:  liboggz-devel libfishsound-devel
+BuildRequires:  liblrdf-devel raptor-devel liblo-devel
 BuildRequires:  desktop-file-utils
 Requires:       hicolor-icon-theme
 
@@ -38,15 +38,12 @@
 
 %prep
 %setup -q
-# SF tracker #2430266
-# s|linux-g++|linux-g++*
-%patch0 -p1 -b .specfix
 
 
 %build
 qmake-qt4
 # patch in correct optflags
-sed -i 's|QMAKE_CXXFLAGS_RELEASE += -DNDEBUG -DNO_TIMING .*|QMAKE_CXXFLAGS_RELEASE += -DNDEBUG -DNO_TIMING ${RPM_OPT_FLAGS}|1' sv.prf
+sed -i 's|linux-g++:QMAKE_CXXFLAGS_RELEASE += -DNDEBUG -DNO_TIMING .*|linux-g++:QMAKE_CFXXFLAGS_RELEASE += -DNDEBUG -DNO_TIMING ${RPM_OPT_FLAGS}|1' sv.prf
 # parallel build does not work
 make #%{?_smp_mflags}
 
@@ -56,8 +53,7 @@
 # install does nothing right now
 # make install DESTDIR=$RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT%{_bindir}
-install -m 755 -p sv/sonic-visualiser \
-	$RPM_BUILD_ROOT%{_bindir}/
+install -m 755 -p sv/sonic-visualiser $RPM_BUILD_ROOT%{_bindir}/
 # desktop file and icon
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps
 install -m 644 -p sv/icons/sv-48x48.png \
@@ -93,14 +89,7 @@
 
 
 %changelog
-* Sun Dec 14 2008 Michel Salim <salimma at fedoraproject.org> - 1.4-2
-- Fix qmake profiles to properly detect 64-bit Linux
-
-* Sun Dec 14 2008 Michel Salim <salimma at fedoraproject.org> - 1.4-1
-- Update to 1.4
-- Replace PortAudio dependency with PulseAudio
-
-* Thu Jul 17 2008 Michel Salim <salimma at fedoraproject.org> - 1.3-1
+* Thu Jul 17 2008 Michel Alexandre Salim <salimma at fedoraproject.org> - 1.3-1
 - Update to 1.3
 
 * Sun Mar 30 2008 Michel Salim <michel.sylvan at gmail.com> - 1.2-1


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sonic-visualiser/F-9/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	15 Dec 2008 02:34:55 -0000	1.4
+++ sources	28 Jan 2009 19:52:52 -0000	1.5
@@ -1 +1 @@
-5b420e047895771acfb756c5b7270dce  sonic-visualiser-1.4.tar.bz2
+746185241641ae6fc24fc3dc72e134c5  sonic-visualiser-1.3.tar.bz2


--- sonic-visualiser-1.4-specfix.patch DELETED ---



From salimma at fedoraproject.org  Wed Jan 28 19:58:07 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Wed, 28 Jan 2009 19:58:07 +0000 (UTC)
Subject: rpms/sooperlooper/F-9 .cvsignore, 1.2, 1.3 sooperlooper.spec, 1.1, 
	1.2 sources, 1.2, 1.3 sooperlooper-1.6.2-gcc43.patch, 1.1, NONE
Message-ID: <20090128195807.E74DD7010D@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/sooperlooper/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3972/F-9

Modified Files:
	.cvsignore sooperlooper.spec sources 
Removed Files:
	sooperlooper-1.6.2-gcc43.patch 
Log Message:
Update F-9's sooperlooper to F-10's 1.6.6



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sooperlooper/F-9/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	15 Apr 2008 18:32:03 -0000	1.2
+++ .cvsignore	28 Jan 2009 19:57:37 -0000	1.3
@@ -1 +1 @@
-sooperlooper-1.6.2.tar.gz
+sooperlooper-1.6.6.tar.gz


Index: sooperlooper.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sooperlooper/F-9/sooperlooper.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sooperlooper.spec	15 Apr 2008 18:32:03 -0000	1.1
+++ sooperlooper.spec	28 Jan 2009 19:57:37 -0000	1.2
@@ -1,6 +1,6 @@
 Summary: Realtime software looping sampler
 Name: sooperlooper
-Version: 1.6.2
+Version: 1.6.6
 Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/Multimedia
@@ -8,7 +8,7 @@
 Source0: http://essej.net/sooperlooper/sooperlooper-%{version}.tar.gz
 Source1: sooperlooper.png
 Source2: sooperlooper.desktop
-Patch0: sooperlooper-1.6.2-gcc43.patch
+Patch0: sooperlooper-1.6.2-rubberband-1.2.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: hicolor-icon-theme
 
@@ -84,6 +84,10 @@
 
 
 %changelog
+* Mon Jul 21 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 1.6.6-1
+- New upstream release 1.6.6
+- Rebuild for new rubberband
+
 * Tue Apr 15 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 1.6.2-1
 - New upstream release 1.6.2
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sooperlooper/F-9/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	15 Apr 2008 18:32:03 -0000	1.2
+++ sources	28 Jan 2009 19:57:37 -0000	1.3
@@ -1 +1 @@
-6a0b98242197b030ab7a42a055191f1b  sooperlooper-1.6.2.tar.gz
+8531e8b17197dd57776bbdf4d2a612c4  sooperlooper-1.6.6.tar.gz


--- sooperlooper-1.6.2-gcc43.patch DELETED ---



From rvinyard at fedoraproject.org  Wed Jan 28 19:59:09 2009
From: rvinyard at fedoraproject.org (Rick L. Vinyard, Jr.)
Date: Wed, 28 Jan 2009 19:59:09 +0000 (UTC)
Subject: rpms/conexusmm/devel dead.package, NONE, 1.1 Makefile, 1.1,
	NONE conexusmm.spec, 1.10, NONE sources, 1.4, NONE
Message-ID: <20090128195909.EA0967010D@cvs1.fedora.phx.redhat.com>

Author: rvinyard

Update of /cvs/pkgs/rpms/conexusmm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4294

Added Files:
	dead.package 
Removed Files:
	Makefile conexusmm.spec sources 
Log Message:
conexusmm has been obsoleted by conexus-gtkmm



--- NEW FILE dead.package ---
conexusmm has been obsoleted by conexus-gtkmm


--- Makefile DELETED ---


--- conexusmm.spec DELETED ---


--- sources DELETED ---



From salimma at fedoraproject.org  Wed Jan 28 19:59:41 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Wed, 28 Jan 2009 19:59:41 +0000 (UTC)
Subject: rpms/sooperlooper/F-9 sooperlooper-1.6.2-rubberband-1.2.patch, NONE,
	1.1
Message-ID: <20090128195941.D5C507010D@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/sooperlooper/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4453/F-9

Added Files:
	sooperlooper-1.6.2-rubberband-1.2.patch 
Log Message:
F-9: add patch file


sooperlooper-1.6.2-rubberband-1.2.patch:

--- NEW FILE sooperlooper-1.6.2-rubberband-1.2.patch ---
diff -up sooperlooper-1.6.2/src/looper.cpp~ sooperlooper-1.6.2/src/looper.cpp
--- sooperlooper-1.6.2/src/looper.cpp~	2008-07-18 22:20:11.000000000 +0200
+++ sooperlooper-1.6.2/src/looper.cpp	2008-07-18 22:20:11.000000000 +0200
@@ -167,9 +167,9 @@ Looper::initialize (unsigned int index, 
 	
 	// rubberband stretch stuff
 	_in_stretcher = new RubberBandStretcher(srate, _chan_count, 
-					     RubberBandStretcher::OptionProcessRealTime | RubberBandStretcher::OptionTransientsCrisp | RubberBandStretcher::OptionPhaseAdaptive);
+					     RubberBandStretcher::OptionProcessRealTime | RubberBandStretcher::OptionTransientsCrisp);
 	_out_stretcher = new RubberBandStretcher(srate, _chan_count, 
-					     RubberBandStretcher::OptionProcessRealTime | RubberBandStretcher::OptionTransientsCrisp | RubberBandStretcher::OptionPhaseAdaptive);
+					     RubberBandStretcher::OptionProcessRealTime | RubberBandStretcher::OptionTransientsCrisp);
 
 	
 	set_buffer_size(_driver->get_buffersize());



From kyle at fedoraproject.org  Wed Jan 28 20:06:53 2009
From: kyle at fedoraproject.org (Kyle McMartin)
Date: Wed, 28 Jan 2009 20:06:53 +0000 (UTC)
Subject: rpms/kernel/devel sata_sil-build-break-fix.patch, NONE,
	1.1 kernel.spec, 1.1242, 1.1243
Message-ID: <20090128200653.9B12C7010D@cvs1.fedora.phx.redhat.com>

Author: kyle

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5702

Modified Files:
	kernel.spec 
Added Files:
	sata_sil-build-break-fix.patch 
Log Message:
* Wed Jan 28 2009 Kyle McMartin <kyle at redhat.com>
- sata_sil-build-break-fix.patch: fix use of DMI.


sata_sil-build-break-fix.patch:

--- NEW FILE sata_sil-build-break-fix.patch ---
From:	Kumar Gala <galak at kernel.crashing.org>
Subject: [PATCH] sata_sil: Fix build breakage
Date:	Tue, 27 Jan 2009 23:02:02 -0600

The following commit introduces:

commit e57db7bde7bff95ae812736ca00c73bd5271455b
Author: Rafael J. Wysocki <rjw at sisk.pl>
Date:   Mon Jan 19 20:58:29 2009 +0100

    SATA Sil: Blacklist system that spins off disks during ACPI power off

the following build errors on non-x86 systems:

drivers/ata/sata_sil.c: In function 'sil_broken_system_poweroff':
drivers/ata/sata_sil.c:713: error: implicit declaration of function 'dmi_first_match'
drivers/ata/sata_sil.c:713: warning: initialization makes pointer from integer without a cast

Signed-off-by: Kumar Gala <galak at kernel.crashing.org>
---
 drivers/ata/sata_sil.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/drivers/ata/sata_sil.c b/drivers/ata/sata_sil.c
index bfd55b0..3f0549d 100644
--- a/drivers/ata/sata_sil.c
+++ b/drivers/ata/sata_sil.c
@@ -697,6 +697,7 @@ static void sil_init_controller(struct ata_host *host)
 
 static bool sil_broken_system_poweroff(struct pci_dev *pdev)
 {
+#ifdef CONFIG_DMI
 	static const struct dmi_system_id broken_systems[] = {
 		{
 			.ident = "HP Compaq nx6325",
@@ -717,6 +718,7 @@ static bool sil_broken_system_poweroff(struct pci_dev *pdev)
 		/* apply the quirk only to on-board controllers */
 		return slot == PCI_SLOT(pdev->devfn);
 	}
+#endif
 
 	return false;
 }
-- 
1.5.6.6

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo at vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/



Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1242
retrieving revision 1.1243
diff -u -r1.1242 -r1.1243
--- kernel.spec	28 Jan 2009 19:40:41 -0000	1.1242
+++ kernel.spec	28 Jan 2009 20:06:23 -0000	1.1243
@@ -682,6 +682,9 @@
 # Hook up proper selinux bits for btrfs
 Patch9003: linux-2.6.29-btrfs-selinux.patch
 
+# build horkage fix.
+Patch9100: sata_sil-build-break-fix.patch
+
 %endif
 
 BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -1197,6 +1200,9 @@
 # turn off intel_iommu by default
 #  bugs: #481356, #479996
 ApplyPatch linux-2.6-defaults-intel_iommu-off.patch
+
+ApplyPatch sata_sil-build-break-fix.patch
+
 # END OF PATCH APPLICATIONS
 
 %endif
@@ -1773,6 +1779,9 @@
 
 %changelog
 * Wed Jan 28 2009 Kyle McMartin <kyle at redhat.com>
+- sata_sil-build-break-fix.patch: fix use of DMI.
+
+* Wed Jan 28 2009 Kyle McMartin <kyle at redhat.com>
 - Linux 2.6.29-rc3
 
 * Wed Jan 28 2009 Kyle McMartin <kyle at redhat.com>



From wart at fedoraproject.org  Wed Jan 28 20:11:51 2009
From: wart at fedoraproject.org (Michael Thomas)
Date: Wed, 28 Jan 2009 20:11:51 +0000 (UTC)
Subject: rpms/tclchecker/EL-4 tclchecker.spec, 1.6, 1.7 config.guess, 1.1,
	NONE config.sub, 1.1, NONE
Message-ID: <20090128201151.AB1F87010D@cvs1.fedora.phx.redhat.com>

Author: wart

Update of /cvs/pkgs/rpms/tclchecker/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6605

Modified Files:
	tclchecker.spec 
Removed Files:
	config.guess config.sub 
Log Message:
Rebuild for EPEL4




Index: tclchecker.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tclchecker/EL-4/tclchecker.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- tclchecker.spec	15 Jun 2008 05:28:41 -0000	1.6
+++ tclchecker.spec	28 Jan 2009 20:11:21 -0000	1.7
@@ -5,18 +5,16 @@
 Summary: Tcl syntax checker
 Name: tclchecker
 Version: 1.4
-Release: 6.%{cvsdate}cvs%{?dist}
+Release: 4.%{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 tclchecker-20061030cvs tclchecker
 # tar czf tclchecker-20061030cvs.tgz ./tclchecker-20061030cvs
 Source0: tclchecker-%{cvsdate}cvs.tgz
-Source1: config.sub
-Source2: config.guess
 Patch0:  tclchecker-1.4-tclm4.patch
 Patch1:  tclchecker-1.4-destdir.patch
 URL: http://tclpro.sourceforge.net/
-Requires: tcl(abi) = 8.5 tclparser
+Requires: tcl tbcload tclparser
 BuildRequires: tcl-devel autoconf
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
@@ -29,7 +27,6 @@
 %patch0 -p0
 %patch1 -p0
 autoconf
-cp -a %{SOURCE1} %{SOURCE2} config/
 
 %build
 %configure --libdir=%{tcl_sitelib} --datadir=%{tcl_sitelib}
@@ -49,19 +46,13 @@
 rm -rf $RPM_BUILD_ROOT
 
 %files
-%doc ChangeLog license.terms doc/messageIDs.txt
 %defattr(-,root,root)
+%doc ChangeLog license.terms doc/messageIDs.txt
 %{tcl_sitelib}/%{name}%{version}
 
 %changelog
-* Fri Jun 13 2008 Wart <wart at kobold.org> 1.4-6.20061030cvs
-- Drop tbcload which does not work with Tcl 8.5
-
-* Thu Jun 4 2008 Wart <wart at kobold.org> 1.4-5.20061030cvs
-- Update autoconf support files to known working versions (BZ #449573)
-
-* Thu Jan 3 2008 Wart <wart at kobold.org> 1.4-4.20061030cvs
-- Rebuild for Tcl 8.5
+* Wed Jan 28 2009 Wart <wart at kobold.org> 1.4-4.20061030cvs
+- Rebuild for EPEL4
 
 * Mon Aug 20 2007 Wart <wart at kobold.org> 1.4-3.20061030cvs
 - License tag clarification


--- config.guess DELETED ---


--- config.sub DELETED ---



From chitlesh at fedoraproject.org  Wed Jan 28 21:25:11 2009
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Wed, 28 Jan 2009 21:25:11 +0000 (UTC)
Subject: rpms/perl-Verilog/F-9 .cvsignore, 1.2, 1.3 import.log, 1.1,
	1.2 perl-Verilog.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20090128212511.73BE47010D@cvs1.fedora.phx.redhat.com>

Author: chitlesh

Update of /cvs/pkgs/rpms/perl-Verilog/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19739/F-9

Modified Files:
	.cvsignore import.log perl-Verilog.spec sources 
Log Message:
3.110


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Verilog/F-9/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	7 Jan 2009 18:04:43 -0000	1.2
+++ .cvsignore	28 Jan 2009 21:24:41 -0000	1.3
@@ -1 +1 @@
-Verilog-Perl-3.100.tar.gz
+Verilog-Perl-3.110.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Verilog/F-9/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	7 Jan 2009 18:04:43 -0000	1.1
+++ import.log	28 Jan 2009 21:24:41 -0000	1.2
@@ -1 +1,2 @@
 perl-Verilog-3_100-1_fc10:F-9:perl-Verilog-3.100-1.fc10.src.rpm:1231351418
+perl-Verilog-3_110-1_fc10:F-9:perl-Verilog-3.110-1.fc10.src.rpm:1233177799


Index: perl-Verilog.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Verilog/F-9/perl-Verilog.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Verilog.spec	7 Jan 2009 18:04:43 -0000	1.1
+++ perl-Verilog.spec	28 Jan 2009 21:24:41 -0000	1.2
@@ -1,5 +1,5 @@
 Name:          perl-Verilog
-Version:       3.100
+Version:       3.110
 Release:       1%{?dist}
 Summary:       Verilog parsing routines
 
@@ -65,6 +65,9 @@
 
 
 %changelog
+* Wed Jan 28 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> 3.110-1
+- upstream v3.110
+
 * Sat Jan 03 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> 3.100-1
 - upstream v3.100
 - removed patch for rawhide's bison


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Verilog/F-9/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	7 Jan 2009 18:04:43 -0000	1.2
+++ sources	28 Jan 2009 21:24:41 -0000	1.3
@@ -1 +1 @@
-d4bf1748258c6df43db91c74a1fc9268  Verilog-Perl-3.100.tar.gz
+5f5b339d0c73c4e000cffd50a8fd47a2  Verilog-Perl-3.110.tar.gz



From chitlesh at fedoraproject.org  Wed Jan 28 21:26:33 2009
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Wed, 28 Jan 2009 21:26:33 +0000 (UTC)
Subject: rpms/perl-Verilog/F-10 .cvsignore, 1.2, 1.3 import.log, 1.1,
	1.2 perl-Verilog.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20090128212633.1B6AA7010D@cvs1.fedora.phx.redhat.com>

Author: chitlesh

Update of /cvs/pkgs/rpms/perl-Verilog/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20129/F-10

Modified Files:
	.cvsignore import.log perl-Verilog.spec sources 
Log Message:
3.110


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Verilog/F-10/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	7 Jan 2009 18:06:50 -0000	1.2
+++ .cvsignore	28 Jan 2009 21:26:02 -0000	1.3
@@ -1 +1 @@
-Verilog-Perl-3.100.tar.gz
+Verilog-Perl-3.110.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Verilog/F-10/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	7 Jan 2009 18:06:50 -0000	1.1
+++ import.log	28 Jan 2009 21:26:02 -0000	1.2
@@ -1 +1,2 @@
 perl-Verilog-3_100-1_fc10:F-10:perl-Verilog-3.100-1.fc10.src.rpm:1231351547
+perl-Verilog-3_110-1_fc10:F-10:perl-Verilog-3.110-1.fc10.src.rpm:1233177883


Index: perl-Verilog.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Verilog/F-10/perl-Verilog.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Verilog.spec	7 Jan 2009 18:06:50 -0000	1.1
+++ perl-Verilog.spec	28 Jan 2009 21:26:02 -0000	1.2
@@ -1,5 +1,5 @@
 Name:          perl-Verilog
-Version:       3.100
+Version:       3.110
 Release:       1%{?dist}
 Summary:       Verilog parsing routines
 
@@ -65,6 +65,9 @@
 
 
 %changelog
+* Wed Jan 28 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> 3.110-1
+- upstream v3.110
+
 * Sat Jan 03 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> 3.100-1
 - upstream v3.100
 - removed patch for rawhide's bison


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Verilog/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	7 Jan 2009 18:06:50 -0000	1.2
+++ sources	28 Jan 2009 21:26:02 -0000	1.3
@@ -1 +1 @@
-d4bf1748258c6df43db91c74a1fc9268  Verilog-Perl-3.100.tar.gz
+5f5b339d0c73c4e000cffd50a8fd47a2  Verilog-Perl-3.110.tar.gz



From chitlesh at fedoraproject.org  Wed Jan 28 21:28:40 2009
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Wed, 28 Jan 2009 21:28:40 +0000 (UTC)
Subject: rpms/perl-Verilog/devel .cvsignore, 1.2, 1.3 import.log, 1.1,
	1.2 perl-Verilog.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <20090128212840.5BFA27010D@cvs1.fedora.phx.redhat.com>

Author: chitlesh

Update of /cvs/pkgs/rpms/perl-Verilog/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20561/devel

Modified Files:
	.cvsignore import.log perl-Verilog.spec sources 
Log Message:
3.110


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Verilog/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	7 Jan 2009 18:10:40 -0000	1.2
+++ .cvsignore	28 Jan 2009 21:28:09 -0000	1.3
@@ -1 +1 @@
-Verilog-Perl-3.100.tar.gz
+Verilog-Perl-3.110.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Verilog/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	7 Jan 2009 18:10:40 -0000	1.1
+++ import.log	28 Jan 2009 21:28:10 -0000	1.2
@@ -1 +1,2 @@
 perl-Verilog-3_100-1_fc10:HEAD:perl-Verilog-3.100-1.fc10.src.rpm:1231351758
+perl-Verilog-3_110-1_fc10:HEAD:perl-Verilog-3.110-1.fc10.src.rpm:1233177966


Index: perl-Verilog.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Verilog/devel/perl-Verilog.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Verilog.spec	7 Jan 2009 18:10:40 -0000	1.1
+++ perl-Verilog.spec	28 Jan 2009 21:28:10 -0000	1.2
@@ -1,5 +1,5 @@
 Name:          perl-Verilog
-Version:       3.100
+Version:       3.110
 Release:       1%{?dist}
 Summary:       Verilog parsing routines
 
@@ -65,6 +65,9 @@
 
 
 %changelog
+* Wed Jan 28 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> 3.110-1
+- upstream v3.110
+
 * Sat Jan 03 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> 3.100-1
 - upstream v3.100
 - removed patch for rawhide's bison


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Verilog/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	7 Jan 2009 18:10:40 -0000	1.2
+++ sources	28 Jan 2009 21:28:10 -0000	1.3
@@ -1 +1 @@
-d4bf1748258c6df43db91c74a1fc9268  Verilog-Perl-3.100.tar.gz
+5f5b339d0c73c4e000cffd50a8fd47a2  Verilog-Perl-3.110.tar.gz



From mclasen at fedoraproject.org  Wed Jan 28 21:30:52 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Wed, 28 Jan 2009 21:30:52 +0000 (UTC)
Subject: rpms/pkgconfig/F-10 pkgconfig.spec, 1.47,
	1.48 pkg-config-0.21-requires-private-fix.patch, 1.3, NONE
Message-ID: <20090128213052.D97CF7010D@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/pkgconfig/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21032

Modified Files:
	pkgconfig.spec 
Removed Files:
	pkg-config-0.21-requires-private-fix.patch 
Log Message:
Drop a no longer needed patch



Index: pkgconfig.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pkgconfig/F-10/pkgconfig.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- pkgconfig.spec	6 Jun 2008 19:13:08 -0000	1.47
+++ pkgconfig.spec	28 Jan 2009 21:30:22 -0000	1.48
@@ -1,20 +1,18 @@
 Summary: A tool for determining compilation options
 Name: pkgconfig
 Version: 0.23
-Release: 3%{?dist}
+Release: 6%{?dist}
 Epoch: 1
 License: GPLv2+
 URL: http://pkgconfig.freedesktop.org
 Group: Development/Tools
 Source:  http://www.freedesktop.org/software/pkgconfig/releases/pkg-config-%{version}.tar.gz
-# https://bugs.freedesktop.org/show_bug.cgi?id=2661 
+# https://bugs.freedesktop.org/show_bug.cgi?id=5703
 Patch1:  pkgconfig-0.15.0-reqprov.patch
 # don't call out to glib-config, since our glib-config is a pkg-config wrapper
 Patch2:  pkg-config-0.21-compat-loop.patch
-# https://bugs.freedesktop.org/show_bug.cgi?id=4738
-Patch3:  pkg-config-0.21-requires-private-fix.patch
 # https://bugs.freedesktop.org/show_bug.cgi?id=16095
-Patch4: pkg-config-lib64-excludes.patch
+Patch3: pkg-config-lib64-excludes.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 
@@ -27,8 +25,7 @@
 %setup -n pkg-config-%{version} -q
 %patch1 -p1 -b .reqprov
 %patch2 -p1 -b .compat-loop
-%patch3 -p1 -b .requires-private-fix
-%patch4 -p0 -b .lib64
+%patch3 -p0 -b .lib64
 
 %build
 %configure --disable-shared --with-pc-path=%{_libdir}/pkgconfig:%{_datadir}/pkgconfig
@@ -53,6 +50,11 @@
 %{_datadir}/aclocal/*
 
 %changelog
+* Mon Dec  8 2008 Matthias Clasen  <mclasen at redhat.com> - 1:0.23-6
+- Remove a patch that is no longer necessary and causes more
+  problems than it solves (#224148)
+- Include Requires.private in --print-requires (#426106)
+
 * Fri Jun 06 2008 Colin Walters <walters at redhat.com> - 1:0.23-3
 - Add patch pkg-config-lib64-excludes.patch to make my jhbuild happier
 


--- pkg-config-0.21-requires-private-fix.patch DELETED ---



From kyle at fedoraproject.org  Wed Jan 28 21:33:12 2009
From: kyle at fedoraproject.org (Kyle McMartin)
Date: Wed, 28 Jan 2009 21:33:12 +0000 (UTC)
Subject: rpms/kernel/devel drm-nouveau.patch, 1.5, 1.6 kernel.spec, 1.1243, 
	1.1244
Message-ID: <20090128213312.4B4F67010D@cvs1.fedora.phx.redhat.com>

Author: kyle

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21538

Modified Files:
	drm-nouveau.patch kernel.spec 
Log Message:
* Wed Jan 28 2009 Kyle McMartin <kyle at redhat.com>
- drm-nouveau.patch: /me sighs in the general direction of ppc.


drm-nouveau.patch:

Index: drm-nouveau.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/drm-nouveau.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- drm-nouveau.patch	28 Jan 2009 17:51:51 -0000	1.5
+++ drm-nouveau.patch	28 Jan 2009 21:33:11 -0000	1.6
@@ -5950,10 +5950,10 @@
 +}
 diff --git a/drivers/gpu/drm/nouveau/nouveau_state.c b/drivers/gpu/drm/nouveau/nouveau_state.c
 new file mode 100644
-index 0000000..150438e
+index 0000000..3412e14
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/nouveau_state.c
-@@ -0,0 +1,866 @@
+@@ -0,0 +1,868 @@
 +/*
 + * Copyright 2005 Stephane Marchesin
 + * Copyright 2008 Stuart Bennett
@@ -5979,6 +5979,8 @@
 + * DEALINGS IN THE SOFTWARE.
 + */
 +
++#include <linux/swab.h>
++
 +#include "drmP.h"
 +#include "drm.h"
 +#include "drm_sarea.h"
@@ -6440,7 +6442,7 @@
 +	reg1 = readl(regs+NV03_PMC_BOOT_1);
 +#if defined(__powerpc__)
 +	if (reg1)
-+		reg0=___fswab32(reg0);
++		reg0=swab32(reg0);
 +#endif
 +
 +	/* We're dealing with >=NV10 */


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1243
retrieving revision 1.1244
diff -u -r1.1243 -r1.1244
--- kernel.spec	28 Jan 2009 20:06:23 -0000	1.1243
+++ kernel.spec	28 Jan 2009 21:33:11 -0000	1.1244
@@ -1779,6 +1779,9 @@
 
 %changelog
 * Wed Jan 28 2009 Kyle McMartin <kyle at redhat.com>
+- drm-nouveau.patch: /me sighs in the general direction of ppc.
+
+* Wed Jan 28 2009 Kyle McMartin <kyle at redhat.com>
 - sata_sil-build-break-fix.patch: fix use of DMI.
 
 * Wed Jan 28 2009 Kyle McMartin <kyle at redhat.com>



From rdieter at fedoraproject.org  Wed Jan 28 21:34:34 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed, 28 Jan 2009 21:34:34 +0000 (UTC)
Subject: rpms/kdebase/devel kdebase-4.2.0-konsole_kdeinit.patch, NONE,
	1.1 kdebase.spec, 1.356, 1.357
Message-ID: <20090128213434.2AAFE7010D@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdebase/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21824

Modified Files:
	kdebase.spec 
Added Files:
	kdebase-4.2.0-konsole_kdeinit.patch 
Log Message:
* Wed Jan 28 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.0-2
- KDEInit could not launch '/usr/bin/konsole' (kdebug#162729)


kdebase-4.2.0-konsole_kdeinit.patch:

--- NEW FILE kdebase-4.2.0-konsole_kdeinit.patch ---
diff -up kdebase-4.2.0/apps/konsole/desktop/konsole.desktop.kdeinit kdebase-4.2.0/apps/konsole/desktop/konsole.desktop
--- kdebase-4.2.0/apps/konsole/desktop/konsole.desktop.kdeinit	2009-01-17 04:59:32.000000000 -0600
+++ kdebase-4.2.0/apps/konsole/desktop/konsole.desktop	2009-01-28 15:09:35.000000000 -0600
@@ -92,5 +92,6 @@ GenericName[x-test]=xxTerminalxx
 GenericName[zh_CN]=??????
 GenericName[zh_TW]=?????????
 X-DBUS-StartupType=Unique
+X-DBUS-ServiceName=org.kde.konsole
 X-KDE-AuthorizeAction=shell_access
 Categories=Qt;KDE;System;TerminalEmulator;


Index: kdebase.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase/devel/kdebase.spec,v
retrieving revision 1.356
retrieving revision 1.357
diff -u -r1.356 -r1.357
--- kdebase.spec	22 Jan 2009 10:15:06 -0000	1.356
+++ kdebase.spec	28 Jan 2009 21:34:03 -0000	1.357
@@ -1,6 +1,6 @@
 Summary: K Desktop Environment 4 - Core Files
 Version: 4.2.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdebase
@@ -30,6 +30,8 @@
 Patch1:   kdebase-4.1.70-konsole-session.patch
 
 ## upstream patches
+# bugs.kde.org/162729
+Patch100: kdebase-4.2.0-konsole_kdeinit.patch
 
 %ifnarch s390 s390x
 Requires: eject
@@ -125,9 +127,12 @@
 %patch0 -p1 -b .nsplugins-paths
 %patch1 -p1 -b .konsole-session
 
+%patch100 -p1 -b .konsole_kdeinit
+
 # fix incorrect assumption that we're building in a combined kdebase tree
 sed -i -e 's/EXISTS "${kdebase_SOURCE_DIR}"/0/g' apps/CMakeLists.txt
 
+
 %build
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
@@ -304,6 +309,9 @@
 
 
 %changelog
+* Wed Jan 28 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.0-2
+- KDEInit could not launch '/usr/bin/konsole' (kdebug#162729)
+
 * Thu Jan 22 2009 Than Ngo <than at redhat.com> - 4.2.0-1
 - 4.2.0
 



From rdieter at fedoraproject.org  Wed Jan 28 21:37:18 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed, 28 Jan 2009 21:37:18 +0000 (UTC)
Subject: rpms/kdebase/F-10 kdebase-4.2.0-konsole_kdeinit.patch, NONE,
	1.1 kdebase.spec, 1.351, 1.352
Message-ID: <20090128213718.466697010D@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdebase/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22401

Modified Files:
	kdebase.spec 
Added Files:
	kdebase-4.2.0-konsole_kdeinit.patch 
Log Message:
* Wed Jan 28 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.0-2
- KDEInit could not launch '/usr/bin/konsole' (kdebug#162729)


kdebase-4.2.0-konsole_kdeinit.patch:

--- NEW FILE kdebase-4.2.0-konsole_kdeinit.patch ---
diff -up kdebase-4.2.0/apps/konsole/desktop/konsole.desktop.kdeinit kdebase-4.2.0/apps/konsole/desktop/konsole.desktop
--- kdebase-4.2.0/apps/konsole/desktop/konsole.desktop.kdeinit	2009-01-17 04:59:32.000000000 -0600
+++ kdebase-4.2.0/apps/konsole/desktop/konsole.desktop	2009-01-28 15:09:35.000000000 -0600
@@ -92,5 +92,6 @@ GenericName[x-test]=xxTerminalxx
 GenericName[zh_CN]=??????
 GenericName[zh_TW]=?????????
 X-DBUS-StartupType=Unique
+X-DBUS-ServiceName=org.kde.konsole
 X-KDE-AuthorizeAction=shell_access
 Categories=Qt;KDE;System;TerminalEmulator;


Index: kdebase.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase/F-10/kdebase.spec,v
retrieving revision 1.351
retrieving revision 1.352
diff -u -r1.351 -r1.352
--- kdebase.spec	24 Jan 2009 17:22:31 -0000	1.351
+++ kdebase.spec	28 Jan 2009 21:36:47 -0000	1.352
@@ -1,6 +1,6 @@
 Summary: K Desktop Environment 4 - Core Files
 Version: 4.2.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdebase
@@ -30,6 +30,8 @@
 Patch1:   kdebase-4.1.70-konsole-session.patch
 
 ## upstream patches
+# bugs.kde.org/162729
+Patch100: kdebase-4.2.0-konsole_kdeinit.patch
 
 %ifnarch s390 s390x
 Requires: eject
@@ -125,9 +127,12 @@
 %patch0 -p1 -b .nsplugins-paths
 %patch1 -p1 -b .konsole-session
 
+%patch100 -p1 -b .konsole_kdeinit
+
 # fix incorrect assumption that we're building in a combined kdebase tree
 sed -i -e 's/EXISTS "${kdebase_SOURCE_DIR}"/0/g' apps/CMakeLists.txt
 
+
 %build
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
@@ -304,6 +309,9 @@
 
 
 %changelog
+* Wed Jan 28 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.0-2
+- KDEInit could not launch '/usr/bin/konsole' (kdebug#162729)
+
 * Thu Jan 22 2009 Than Ngo <than at redhat.com> - 4.2.0-1
 - 4.2.0
 



From wart at fedoraproject.org  Wed Jan 28 21:37:40 2009
From: wart at fedoraproject.org (Michael Thomas)
Date: Wed, 28 Jan 2009 21:37:40 +0000 (UTC)
Subject: rpms/tclcompiler/EL-4 tclcompiler.spec, 1.6,
	1.7 tclcompiler-1.5-pkgpath.patch, 1.1,
	NONE tclcompiler-1.5-version.patch, 1.1, NONE
Message-ID: <20090128213740.0F2DB7010D@cvs1.fedora.phx.redhat.com>

Author: wart

Update of /cvs/pkgs/rpms/tclcompiler/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22454

Modified Files:
	tclcompiler.spec 
Removed Files:
	tclcompiler-1.5-pkgpath.patch tclcompiler-1.5-version.patch 
Log Message:
Rebuild for EPEL4



Index: tclcompiler.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tclcompiler/EL-4/tclcompiler.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- tclcompiler.spec	9 Feb 2008 18:53:57 -0000	1.6
+++ tclcompiler.spec	28 Jan 2009 21:37:09 -0000	1.7
@@ -1,21 +1,17 @@
-%{!?tcl_version: %define tcl_version %(echo 'puts $tcl_version' | tclsh)}
-%{!?tcl_sitearch: %define tcl_sitearch %{_libdir}/tcl%{tcl_version}}
 %define cvsdate 20061030
 
 Summary: Tcl bytecode compiler
 Name: tclcompiler
 Version: 1.5
-Release: 7.%{cvsdate}cvs%{?dist}
+Release: 4.%{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 tclcompiler-20061030cvs tclcompiler
 # tar czf tclcompiler-20061030cvs.tgz ./tclcompiler-20061030cvs
 Source0: tclcompiler-%{cvsdate}cvs.tgz
 Patch0:  tclcompiler-1.5-configure.patch
-Patch1:  tclcompiler-1.5-pkgpath.patch
-Patch2:  tclcompiler-1.5-version.patch
 URL: http://tclpro.sourceforge.net/
-Requires: tcl(abi) = 8.5
+Requires: tcl
 BuildRequires: tbcload-devel
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -26,8 +22,6 @@
 %prep
 %setup -q -n %{name}-%{cvsdate}cvs
 %patch0 -p0
-%patch1 -p0
-%patch2 -p1
 
 %build
 %configure
@@ -45,26 +39,13 @@
 rm -rf $RPM_BUILD_ROOT
 
 %files
-%doc ChangeLog license.terms
 %defattr(-,root,root)
-# The version for the tclcompiler package and tbcload must appear
-# the same to tclsh, so we force a downgrade of tclcompiler to match
-# tbcload.
-%{tcl_sitearch}/%{name}1.4
+%doc ChangeLog license.terms
+%{_libdir}/%{name}%{version}
 
 %changelog
-* Sat Feb 9 2008 Wart <wart at kobold.org> 1.5-7.20061030cvs
-- Rebuild for gcc 4.3
-
-* Sat Jan 5 2008 Wart <wart at kobold.org> 1.5-6.20061030cvs
-- Downgrade package version number to match tbcload and prevent
-  errors when running 'package require ...'
-
-* Sat Jan 5 2008 Wart <wart at kobold.org> 1.5-5.20061030cvs
-- Fix package path for Tcl 8.5
-
-* Sat Jan  5 2008 Alex Lancaster <alexlan[AT]fedoraproject org> - 1.5-4.20061030cvs
-- Rebuild for new Tcl 8.5
+* Wed Jan 28 2009 Wart <wart at kobold.org> 1.5-4.20061030cvs
+- Rebuild for EPEL4
 
 * Mon Aug 20 2007 Wart <wart at kobold.org> 1.5-3.20061030cvs
 - License tag clarification


--- tclcompiler-1.5-pkgpath.patch DELETED ---


--- tclcompiler-1.5-version.patch DELETED ---



From rdieter at fedoraproject.org  Wed Jan 28 21:43:31 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Wed, 28 Jan 2009 21:43:31 +0000 (UTC)
Subject: rpms/kdebase/F-9 kdebase-4.2.0-konsole_kdeinit.patch, NONE,
	1.1 kdebase.spec, 1.342, 1.343
Message-ID: <20090128214331.F3CC57010D@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdebase/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23545

Modified Files:
	kdebase.spec 
Added Files:
	kdebase-4.2.0-konsole_kdeinit.patch 
Log Message:
* Wed Jan 28 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.0-2
- KDEInit could not launch '/usr/bin/konsole' (kdebug#162729)


kdebase-4.2.0-konsole_kdeinit.patch:

--- NEW FILE kdebase-4.2.0-konsole_kdeinit.patch ---
diff -up kdebase-4.2.0/apps/konsole/desktop/konsole.desktop.kdeinit kdebase-4.2.0/apps/konsole/desktop/konsole.desktop
--- kdebase-4.2.0/apps/konsole/desktop/konsole.desktop.kdeinit	2009-01-17 04:59:32.000000000 -0600
+++ kdebase-4.2.0/apps/konsole/desktop/konsole.desktop	2009-01-28 15:09:35.000000000 -0600
@@ -92,5 +92,6 @@ GenericName[x-test]=xxTerminalxx
 GenericName[zh_CN]=??????
 GenericName[zh_TW]=?????????
 X-DBUS-StartupType=Unique
+X-DBUS-ServiceName=org.kde.konsole
 X-KDE-AuthorizeAction=shell_access
 Categories=Qt;KDE;System;TerminalEmulator;


Index: kdebase.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase/F-9/kdebase.spec,v
retrieving revision 1.342
retrieving revision 1.343
diff -u -r1.342 -r1.343
--- kdebase.spec	28 Jan 2009 12:58:15 -0000	1.342
+++ kdebase.spec	28 Jan 2009 21:43:00 -0000	1.343
@@ -1,6 +1,6 @@
 Summary: K Desktop Environment 4 - Core Files
 Version: 4.2.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdebase
@@ -30,6 +30,8 @@
 Patch1:   kdebase-4.1.70-konsole-session.patch
 
 ## upstream patches
+# bugs.kde.org/162729
+Patch100: kdebase-4.2.0-konsole_kdeinit.patch
 
 %ifnarch s390 s390x
 Requires: eject
@@ -125,9 +127,12 @@
 %patch0 -p1 -b .nsplugins-paths
 %patch1 -p1 -b .konsole-session
 
+%patch100 -p1 -b .konsole_kdeinit
+
 # fix incorrect assumption that we're building in a combined kdebase tree
 sed -i -e 's/EXISTS "${kdebase_SOURCE_DIR}"/0/g' apps/CMakeLists.txt
 
+
 %build
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
@@ -304,6 +309,9 @@
 
 
 %changelog
+* Wed Jan 28 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.0-2
+- KDEInit could not launch '/usr/bin/konsole' (kdebug#162729)
+
 * Thu Jan 22 2009 Than Ngo <than at redhat.com> - 4.2.0-1
 - 4.2.0
 



From jwrdegoede at fedoraproject.org  Wed Jan 28 21:45:23 2009
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Wed, 28 Jan 2009 21:45:23 +0000 (UTC)
Subject: rpms/iscsi-initiator-utils/devel
	open-iscsi-2.0-870.1-ibft-newer-kernel.patch, NONE,
	1.1 iscsi-initiator-utils.spec, 1.37, 1.38
Message-ID: <20090128214523.CB4DD7010D@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-serv23939

Modified Files:
	iscsi-initiator-utils.spec 
Added Files:
	open-iscsi-2.0-870.1-ibft-newer-kernel.patch 
Log Message:
* Wed Jan 28 2009 Hans de Goede <hdegoede at redhat.com> 6.2.0.870-3
- Fix reading of iBFT firmware with newer kernels


open-iscsi-2.0-870.1-ibft-newer-kernel.patch:

--- NEW FILE open-iscsi-2.0-870.1-ibft-newer-kernel.patch ---
diff -up open-iscsi-2.0-870.1/utils/fwparam_ibft/fwparam_ibft_sysfs.c~ open-iscsi-2.0-870.1/utils/fwparam_ibft/fwparam_ibft_sysfs.c
--- open-iscsi-2.0-870.1/utils/fwparam_ibft/fwparam_ibft_sysfs.c~	2009-01-28 22:09:21.000000000 +0100
+++ open-iscsi-2.0-870.1/utils/fwparam_ibft/fwparam_ibft_sysfs.c	2009-01-28 22:10:29.000000000 +0100
@@ -186,6 +186,40 @@ static int get_iface_from_device(const c
 		break;
 	}
 
+	closedir(dirfd);
+
+	if (rc != ENODEV)
+		return rc;
+
+	/* If not found try again with newer kernel networkdev sysfs layout */
+	strncat(dev_dir, "/net", FILENAMESZ);
+
+	if (!file_exist(dev_dir))
+		return rc;
+
+	dirfd = opendir(dev_dir);
+	if (!dirfd)
+		return errno;
+
+	while ((dent = readdir(dirfd))) {
+		if (!strcmp(dent->d_name, ".") || !strcmp(dent->d_name, ".."))
+			continue;
+
+		/* Take the first "regular" directory entry */
+		if (strlen(dent->d_name) > (sizeof(context->iface) - 1)) {
+			rc = EINVAL;
+			printf("Net device %s too bug for iface buffer.\n",
+			       dent->d_name);
+			break;
+		}
+
+		strcpy(context->iface, dent->d_name);
+		rc = 0;
+		break;
+	}
+
+	closedir(dirfd);
+
 	return rc;
 }
 


Index: iscsi-initiator-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/iscsi-initiator-utils/devel/iscsi-initiator-utils.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- iscsi-initiator-utils.spec	28 Jan 2009 16:01:49 -0000	1.37
+++ iscsi-initiator-utils.spec	28 Jan 2009 21:44:53 -0000	1.38
@@ -3,7 +3,7 @@
 Summary: iSCSI daemon and utility programs
 Name: iscsi-initiator-utils
 Version: 6.2.0.870
-Release: 2%{?dist}
+Release: 3%{?dist}
 Source0: http://www.open-iscsi.org/bits/open-iscsi-2.0-870.1.tar.gz
 Source1: iscsid.init
 Source2: iscsidevs.init
@@ -17,6 +17,7 @@
 Patch6: iscsi-initiator-utils-start-iscsid.patch
 Patch7: open-iscsi-2.0-870.1-add-libiscsi.patch
 Patch8: open-iscsi-2.0-870.1-no-exit.patch
+Patch9: open-iscsi-2.0-870.1-ibft-newer-kernel.patch
 
 Group: System Environment/Daemons
 License: GPLv2+
@@ -53,6 +54,7 @@
 %patch6 -p1 -b .start-iscsid
 %patch7 -p1
 %patch8 -p1
+%patch9 -p1
 
 
 %build
@@ -156,6 +158,9 @@
 %{_includedir}/libiscsi.h
 
 %changelog
+* Wed Jan 28 2009 Hans de Goede <hdegoede at redhat.com> 6.2.0.870-3
+- Fix reading of iBFT firmware with newer kernels
+
 * Wed Jan 28 2009 Hans de Goede <hdegoede at redhat.com> 6.2.0.870-2
 - Add libiscsi iscsi administration library and -devel subpackage
 



From wart at fedoraproject.org  Wed Jan 28 21:46:49 2009
From: wart at fedoraproject.org (Michael Thomas)
Date: Wed, 28 Jan 2009 21:46:49 +0000 (UTC)
Subject: rpms/tcldebugger/EL-4 tcldebugger.spec, 1.8, 1.9 config.guess, 1.1, 
	NONE config.sub, 1.1, NONE
Message-ID: <20090128214649.8EE1970141@cvs1.fedora.phx.redhat.com>

Author: wart

Update of /cvs/pkgs/rpms/tcldebugger/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24225

Modified Files:
	tcldebugger.spec 
Removed Files:
	config.guess config.sub 
Log Message:
Rebuild for EPEL4



Index: tcldebugger.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tcldebugger/EL-4/tcldebugger.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- tcldebugger.spec	15 Jun 2008 05:39:02 -0000	1.8
+++ tcldebugger.spec	28 Jan 2009 21:46:19 -0000	1.9
@@ -5,14 +5,12 @@
 Summary: Tcl debugging library
 Name: tcldebugger
 Version: 1.4
-Release: 8.%{cvsdate}cvs%{?dist}
+Release: 6.%{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 tcldebugger-20061030cvs tcldebugger
 # tar czf tcldebugger-20061030cvs.tgz ./tcldebugger-20061030cvs
 Source0: tcldebugger-%{cvsdate}cvs.tgz
-Source1: config.sub
-Source2: config.guess
 Patch0:  tcldebugger-1.4-tclm4.patch
 Patch1:  tcldebugger-1.4-destdir.patch
 Patch2:  tcldebugger-1.4-tkupdate.patch
@@ -21,7 +19,7 @@
 Patch5:  tcldebugger-1.4-browser.patch
 URL: http://tclpro.sourceforge.net/
 BuildRequires: tcl-devel autoconf
-Requires: tcl(abi) = 8.5 tk tclparser tcllib xdg-utils
+Requires: tcl tk tclparser tcllib tbcload xdg-utils
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 
@@ -37,7 +35,6 @@
 %patch4 -p0
 %patch5 -p1
 autoconf
-cp -a %{SOURCE1} %{SOURCE2} config/
 
 %build
 %configure --libdir=%{tcl_sitelib} --datadir=%{tcl_sitelib}
@@ -59,22 +56,16 @@
 rm -rf $RPM_BUILD_ROOT
 
 %files
-%doc ChangeLog license.terms
 %defattr(-,root,root)
+%doc ChangeLog license.terms
 %{_bindir}/initdebug.tcl
 %{_bindir}/appLaunch.tcl
 %{tcl_sitelib}/%{name}%{version}
 %{_mandir}/mann/*.gz
 
 %changelog
-* Fri Jun 13 2008 Wart <wart at kobold.org> 1.4-8.20061030cvs
-- Drop dependency on tbcload which does not work with Tcl 8.5
-
-* Thu Jun 4 2008 Wart <wart at kobold.org> 1.4-7.20061030cvs
-- Update autoconf support files to known working versions (BZ #449464)
-
-* Thu Jan 3 2008 Wart <wart at kobold.org> 1.4-6.20061030cvs
-- Rebuild for Tcl 8.5
+* Wed Jan 28 2009 Wart <wart at kobold.org> 1.4-6.20061030cvs
+- Rebuild for EPEL4
 
 * Mon Oct 1 2007 Wart <wart at kobold.org> 1.4-5.20061030cvs
 - Switch from htmlview to xdg-utils


--- config.guess DELETED ---


--- config.sub DELETED ---



From mclasen at fedoraproject.org  Wed Jan 28 21:50:21 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Wed, 28 Jan 2009 21:50:21 +0000 (UTC)
Subject: rpms/pkgconfig/F-9 pkgconfig.spec, 1.45,
	1.46 pkg-config-0.21-requires-private-fix.patch, 1.3, NONE
Message-ID: <20090128215021.D4FF17010D@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/pkgconfig/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25519

Modified Files:
	pkgconfig.spec 
Removed Files:
	pkg-config-0.21-requires-private-fix.patch 
Log Message:
drop a no longer needed patch



Index: pkgconfig.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pkgconfig/F-9/pkgconfig.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- pkgconfig.spec	31 Jan 2008 04:05:01 -0000	1.45
+++ pkgconfig.spec	28 Jan 2009 21:49:51 -0000	1.46
@@ -1,18 +1,18 @@
 Summary: A tool for determining compilation options
 Name: pkgconfig
 Version: 0.23
-Release: 2%{?dist}
+Release: 6%{?dist}
 Epoch: 1
 License: GPLv2+
 URL: http://pkgconfig.freedesktop.org
 Group: Development/Tools
 Source:  http://www.freedesktop.org/software/pkgconfig/releases/pkg-config-%{version}.tar.gz
-# https://bugs.freedesktop.org/show_bug.cgi?id=2661 
+# https://bugs.freedesktop.org/show_bug.cgi?id=5703
 Patch1:  pkgconfig-0.15.0-reqprov.patch
 # don't call out to glib-config, since our glib-config is a pkg-config wrapper
 Patch2:  pkg-config-0.21-compat-loop.patch
-# https://bugs.freedesktop.org/show_bug.cgi?id=4738
-Patch3:  pkg-config-0.21-requires-private-fix.patch
+# https://bugs.freedesktop.org/show_bug.cgi?id=16095
+Patch3: pkg-config-lib64-excludes.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 
@@ -25,7 +25,7 @@
 %setup -n pkg-config-%{version} -q
 %patch1 -p1 -b .reqprov
 %patch2 -p1 -b .compat-loop
-%patch3 -p1 -b .requires-private-fix
+%patch3 -p0 -b .lib64
 
 %build
 %configure --disable-shared --with-pc-path=%{_libdir}/pkgconfig:%{_datadir}/pkgconfig
@@ -50,6 +50,14 @@
 %{_datadir}/aclocal/*
 
 %changelog
+* Mon Dec  8 2008 Matthias Clasen  <mclasen at redhat.com> - 1:0.23-6
+- Remove a patch that is no longer necessary and causes more
+  problems than it solves (#224148)
+- Include Requires.private in --print-requires (#426106)
+
+* Fri Jun 06 2008 Colin Walters <walters at redhat.com> - 1:0.23-3
+- Add patch pkg-config-lib64-excludes.patch to make my jhbuild happier
+
 * Wed Jan 30 2008 Matthias Clasen <mclasen at redhat.com> - 1:0.23-2
 - Readd the requires.private fix that was dropped prematurely
 


--- pkg-config-0.21-requires-private-fix.patch DELETED ---



From bjohnson at fedoraproject.org  Wed Jan 28 21:53:10 2009
From: bjohnson at fedoraproject.org (Bernard Johnson)
Date: Wed, 28 Jan 2009 21:53:10 +0000 (UTC)
Subject: rpms/libsieve/EL-4 .cvsignore, 1.4, 1.5 libsieve.spec, 1.4,
	1.5 sources, 1.4, 1.5
Message-ID: <20090128215310.90E1B7010D@cvs1.fedora.phx.redhat.com>

Author: bjohnson

Update of /cvs/pkgs/rpms/libsieve/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26069/EL-4

Modified Files:
	.cvsignore libsieve.spec sources 
Log Message:
- v 2.2.7
- package pkgconfig file



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libsieve/EL-4/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	28 Oct 2007 07:42:26 -0000	1.4
+++ .cvsignore	28 Jan 2009 21:52:40 -0000	1.5
@@ -1 +1 @@
-libsieve-2.2.6.tar.gz
+libsieve-2.2.7.tar.gz


Index: libsieve.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libsieve/EL-4/libsieve.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- libsieve.spec	28 Oct 2007 08:27:02 -0000	1.4
+++ libsieve.spec	28 Jan 2009 21:52:40 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           libsieve
-Version:        2.2.6
-Release:        2%{?dist}
+Version:        2.2.7
+Release:        1%{?dist}
 Summary:        A library for parsing, sorting and filtering your mail
 
 Group:          System Environment/Libraries
@@ -128,9 +128,17 @@
 %files devel
 %defattr(-,root,root,-) 
 %{_libdir}/*.so
+%{_libdir}/pkgconfig/%{name}.pc
 %{_includedir}/*
 
-%changelog 
+%changelog
+* Wed Jan 28 2009 Bernard Johnson <bjohnson at symetrix.com> - 2.2.7-1
+- v 2.2.7
+- package pkgconfig file
+
+* Mon Feb 18 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 2.2.6-3
+- Autorebuild for GCC 4.3
+
 * Sun Oct 26 2007 Bernard Johnson <bjohnson at symetrix.com> - 2.2.6-2
 - add missing BR: flex, bison
 - remove repotag


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libsieve/EL-4/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	28 Oct 2007 07:42:26 -0000	1.4
+++ sources	28 Jan 2009 21:52:40 -0000	1.5
@@ -1 +1 @@
-c97050a3e823de8f6e960ab92cd8bd98  libsieve-2.2.6.tar.gz
+7415e7cfe40cfc6cf43ae26efb5f0fb7  libsieve-2.2.7.tar.gz



From bjohnson at fedoraproject.org  Wed Jan 28 21:53:10 2009
From: bjohnson at fedoraproject.org (Bernard Johnson)
Date: Wed, 28 Jan 2009 21:53:10 +0000 (UTC)
Subject: rpms/libsieve/EL-5 .cvsignore, 1.3, 1.4 libsieve.spec, 1.4,
	1.5 sources, 1.4, 1.5
Message-ID: <20090128215310.A3D3870141@cvs1.fedora.phx.redhat.com>

Author: bjohnson

Update of /cvs/pkgs/rpms/libsieve/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26069/EL-5

Modified Files:
	.cvsignore libsieve.spec sources 
Log Message:
- v 2.2.7
- package pkgconfig file



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libsieve/EL-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	28 Oct 2007 07:42:29 -0000	1.3
+++ .cvsignore	28 Jan 2009 21:52:40 -0000	1.4
@@ -1 +1 @@
-libsieve-2.2.6.tar.gz
+libsieve-2.2.7.tar.gz


Index: libsieve.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libsieve/EL-5/libsieve.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- libsieve.spec	28 Oct 2007 08:27:07 -0000	1.4
+++ libsieve.spec	28 Jan 2009 21:52:40 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           libsieve
-Version:        2.2.6
-Release:        2%{?dist}
+Version:        2.2.7
+Release:        1%{?dist}
 Summary:        A library for parsing, sorting and filtering your mail
 
 Group:          System Environment/Libraries
@@ -128,9 +128,17 @@
 %files devel
 %defattr(-,root,root,-) 
 %{_libdir}/*.so
+%{_libdir}/pkgconfig/%{name}.pc
 %{_includedir}/*
 
-%changelog 
+%changelog
+* Wed Jan 28 2009 Bernard Johnson <bjohnson at symetrix.com> - 2.2.7-1
+- v 2.2.7
+- package pkgconfig file
+
+* Mon Feb 18 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 2.2.6-3
+- Autorebuild for GCC 4.3
+
 * Sun Oct 26 2007 Bernard Johnson <bjohnson at symetrix.com> - 2.2.6-2
 - add missing BR: flex, bison
 - remove repotag


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libsieve/EL-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	28 Oct 2007 07:42:29 -0000	1.4
+++ sources	28 Jan 2009 21:52:40 -0000	1.5
@@ -1 +1 @@
-c97050a3e823de8f6e960ab92cd8bd98  libsieve-2.2.6.tar.gz
+7415e7cfe40cfc6cf43ae26efb5f0fb7  libsieve-2.2.7.tar.gz



From bjohnson at fedoraproject.org  Wed Jan 28 21:53:10 2009
From: bjohnson at fedoraproject.org (Bernard Johnson)
Date: Wed, 28 Jan 2009 21:53:10 +0000 (UTC)
Subject: rpms/libsieve/F-10 .cvsignore, 1.4, 1.5 libsieve.spec, 1.5,
	1.6 sources, 1.4, 1.5
Message-ID: <20090128215310.EF7F47010D@cvs1.fedora.phx.redhat.com>

Author: bjohnson

Update of /cvs/pkgs/rpms/libsieve/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26069/F-10

Modified Files:
	.cvsignore libsieve.spec sources 
Log Message:
- v 2.2.7
- package pkgconfig file



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libsieve/F-10/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	28 Oct 2007 07:42:47 -0000	1.4
+++ .cvsignore	28 Jan 2009 21:52:40 -0000	1.5
@@ -1 +1 @@
-libsieve-2.2.6.tar.gz
+libsieve-2.2.7.tar.gz


Index: libsieve.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libsieve/F-10/libsieve.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- libsieve.spec	18 Feb 2008 21:19:37 -0000	1.5
+++ libsieve.spec	28 Jan 2009 21:52:40 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           libsieve
-Version:        2.2.6
-Release:        3%{?dist}
+Version:        2.2.7
+Release:        1%{?dist}
 Summary:        A library for parsing, sorting and filtering your mail
 
 Group:          System Environment/Libraries
@@ -128,9 +128,14 @@
 %files devel
 %defattr(-,root,root,-) 
 %{_libdir}/*.so
+%{_libdir}/pkgconfig/%{name}.pc
 %{_includedir}/*
 
 %changelog
+* Wed Jan 28 2009 Bernard Johnson <bjohnson at symetrix.com> - 2.2.7-1
+- v 2.2.7
+- package pkgconfig file
+
 * Mon Feb 18 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 2.2.6-3
 - Autorebuild for GCC 4.3
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libsieve/F-10/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	28 Oct 2007 07:42:47 -0000	1.4
+++ sources	28 Jan 2009 21:52:40 -0000	1.5
@@ -1 +1 @@
-c97050a3e823de8f6e960ab92cd8bd98  libsieve-2.2.6.tar.gz
+7415e7cfe40cfc6cf43ae26efb5f0fb7  libsieve-2.2.7.tar.gz



From bjohnson at fedoraproject.org  Wed Jan 28 21:53:11 2009
From: bjohnson at fedoraproject.org (Bernard Johnson)
Date: Wed, 28 Jan 2009 21:53:11 +0000 (UTC)
Subject: rpms/libsieve/devel .cvsignore, 1.4, 1.5 libsieve.spec, 1.5,
	1.6 sources, 1.4, 1.5
Message-ID: <20090128215311.4DF5670141@cvs1.fedora.phx.redhat.com>

Author: bjohnson

Update of /cvs/pkgs/rpms/libsieve/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26069/devel

Modified Files:
	.cvsignore libsieve.spec sources 
Log Message:
- v 2.2.7
- package pkgconfig file



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libsieve/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	28 Oct 2007 07:42:47 -0000	1.4
+++ .cvsignore	28 Jan 2009 21:52:40 -0000	1.5
@@ -1 +1 @@
-libsieve-2.2.6.tar.gz
+libsieve-2.2.7.tar.gz


Index: libsieve.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libsieve/devel/libsieve.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- libsieve.spec	18 Feb 2008 21:19:37 -0000	1.5
+++ libsieve.spec	28 Jan 2009 21:52:40 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           libsieve
-Version:        2.2.6
-Release:        3%{?dist}
+Version:        2.2.7
+Release:        1%{?dist}
 Summary:        A library for parsing, sorting and filtering your mail
 
 Group:          System Environment/Libraries
@@ -128,9 +128,14 @@
 %files devel
 %defattr(-,root,root,-) 
 %{_libdir}/*.so
+%{_libdir}/pkgconfig/%{name}.pc
 %{_includedir}/*
 
 %changelog
+* Wed Jan 28 2009 Bernard Johnson <bjohnson at symetrix.com> - 2.2.7-1
+- v 2.2.7
+- package pkgconfig file
+
 * Mon Feb 18 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 2.2.6-3
 - Autorebuild for GCC 4.3
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libsieve/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	28 Oct 2007 07:42:47 -0000	1.4
+++ sources	28 Jan 2009 21:52:40 -0000	1.5
@@ -1 +1 @@
-c97050a3e823de8f6e960ab92cd8bd98  libsieve-2.2.6.tar.gz
+7415e7cfe40cfc6cf43ae26efb5f0fb7  libsieve-2.2.7.tar.gz



From mclasen at fedoraproject.org  Wed Jan 28 21:55:55 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Wed, 28 Jan 2009 21:55:55 +0000 (UTC)
Subject: rpms/pkgconfig/F-9 pkg-config-lib64-excludes.patch,NONE,1.1
Message-ID: <20090128215555.2D06C7010D@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/pkgconfig/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26772

Added Files:
	pkg-config-lib64-excludes.patch 
Log Message:
add missing patch


pkg-config-lib64-excludes.patch:

--- NEW FILE pkg-config-lib64-excludes.patch ---
=== modified file 'pkg.c'
--- pkg.c	2008-03-23 20:39:07 +0000
+++ pkg.c	2008-06-06 18:49:58 +0000
@@ -936,31 +936,44 @@
   g_slist_foreach (system_directories, (GFunc) g_free, NULL);
   g_slist_free (system_directories);
 
+
+  system_directories = g_slist_prepend (NULL, "/usr/lib");
 #ifdef PREFER_LIB64
-#define SYSTEM_LIBDIR "/usr/lib64"
-#else
-#define SYSTEM_LIBDIR "/usr/lib"
+  system_directories = g_slist_prepend (system_directories, "/usr/lib64");
 #endif
   count = 0;
   iter = pkg->L_libs;
   while (iter != NULL)
     {
-      if (strcmp (iter->data, "-L" SYSTEM_LIBDIR) == 0 ||
-          strcmp (iter->data, "-L " SYSTEM_LIBDIR) == 0)
+      GSList *subiter = system_directories;
+      while (subiter != NULL)
         {
-          debug_spew ("Package %s has -L" SYSTEM_LIBDIR " in Libs\n",
-                      pkg->name);
-          if (g_getenv ("PKG_CONFIG_ALLOW_SYSTEM_LIBS") == NULL)
-            {              
-              iter->data = NULL;
-              ++count;
-              debug_spew ("Removing -L" SYSTEM_LIBDIR " from libs for %s\n", pkg->key);
+          gboolean is_system = FALSE;
+          const char *linker_arg = iter->data;
+          const char *system_libpath = subiter->data;
+          if (strncmp (linker_arg, "-L ", 3) == 0 &&
+              strcmp (linker_arg + 3, system_libpath) == 0)
+            is_system = TRUE;
+          else if (strncmp (linker_arg, "-L", 2) == 0 &&
+              strcmp (linker_arg + 2, system_libpath) == 0)
+            is_system = TRUE;
+          if (is_system)
+            {
+              debug_spew ("Package %s has -L %s in Libs\n",
+                          pkg->name, system_libpath);
+              if (g_getenv ("PKG_CONFIG_ALLOW_SYSTEM_LIBS") == NULL)
+                {              
+                  iter->data = NULL;
+                  ++count;
+                  debug_spew ("Removing -L %s from libs for %s\n", system_libpath, pkg->key);
+                  break;
+                }
             }
+          subiter = subiter->next;
         }
-
       iter = iter->next;
     }
-#undef SYSTEM_LIBDIR
+  g_slist_free (system_directories);
 
   while (count)
     {




From wtogami at fedoraproject.org  Wed Jan 28 21:56:32 2009
From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=)
Date: Wed, 28 Jan 2009 21:56:32 +0000 (UTC)
Subject: rpms/ltsp/F-10 .cvsignore, 1.24, 1.25 ltsp.spec, 1.30, 1.31 sources,
	1.28, 1.29
Message-ID: <20090128215632.594657010D@cvs1.fedora.phx.redhat.com>

Author: wtogami

Update of /cvs/pkgs/rpms/ltsp/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26850

Modified Files:
	.cvsignore ltsp.spec sources 
Log Message:
- Fix ltsp-build-client
- Fix client shutdown with NBD root



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ltsp/F-10/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- .cvsignore	22 Jan 2009 03:56:10 -0000	1.24
+++ .cvsignore	28 Jan 2009 21:56:01 -0000	1.25
@@ -1 +1 @@
-ltsp-5.1.51.tar.bz2
+ltsp-5.1.54.tar.bz2


Index: ltsp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ltsp/F-10/ltsp.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- ltsp.spec	22 Jan 2009 03:56:10 -0000	1.30
+++ ltsp.spec	28 Jan 2009 21:56:01 -0000	1.31
@@ -1,6 +1,6 @@
 Name:           ltsp
-Version:        5.1.51
-%define _datestamp .20090121.17
+Version:        5.1.54
+%define _datestamp .20090128.01
 #Release:        2%{_datestamp}%{?dist}
 Release:        1%{?dist}
 Summary:        Linux Terminal Server Project Server and Client
@@ -407,6 +407,12 @@
 %endif
 
 %changelog
+* Wed Jan 28 2009 Warren Togami <wtogami at redhat.com> - 5.1.54-1
+- Fix ltsp-build-client
+
+* Wed Jan 28 2009 Warren Togami <wtogami at redhat.com> - 5.1.53-1
+- Fix client shutdown with NBD root
+
 * Wed Jan 21 2009 Warren Togami <wtogami at redhat.com> - 5.1.51-1
 - Fedora 11 support and more bug fixes
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ltsp/F-10/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- sources	22 Jan 2009 03:56:10 -0000	1.28
+++ sources	28 Jan 2009 21:56:02 -0000	1.29
@@ -1 +1 @@
-a939ff6e95b9dd20c24515d87672daaa  ltsp-5.1.51.tar.bz2
+46ecfe37e11888bd1cda97b4da825156  ltsp-5.1.54.tar.bz2



From chitlesh at fedoraproject.org  Wed Jan 28 21:56:35 2009
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Wed, 28 Jan 2009 21:56:35 +0000 (UTC)
Subject: rpms/gerbv/F-9 .cvsignore, 1.5, 1.6 gerbv.spec, 1.5, 1.6 import.log,
	1.1, 1.2 sources, 1.5, 1.6
Message-ID: <20090128215635.8D47F7010D@cvs1.fedora.phx.redhat.com>

Author: chitlesh

Update of /cvs/pkgs/rpms/gerbv/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26918/F-9

Modified Files:
	.cvsignore gerbv.spec import.log sources 
Log Message:
2.2.0


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gerbv/F-9/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	13 Nov 2008 20:35:59 -0000	1.5
+++ .cvsignore	28 Jan 2009 21:56:05 -0000	1.6
@@ -1 +1 @@
-gerbv-2.1.0.tar.gz
+gerbv-2.2.0.tar.gz


Index: gerbv.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gerbv/F-9/gerbv.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- gerbv.spec	13 Nov 2008 20:35:59 -0000	1.5
+++ gerbv.spec	28 Jan 2009 21:56:05 -0000	1.6
@@ -1,6 +1,6 @@
 Name:             gerbv
-Version:          2.1.0
-Release:          2%{?dist}
+Version:          2.2.0
+Release:          1%{?dist}
 Summary:          Gerber file viewer from the gEDA toolkit
 
 Group:            Applications/Engineering
@@ -61,18 +61,18 @@
 
 %install
 %{__rm} -rf %{buildroot}
-%{__make} install DESTDIR=%{buildroot}
+%{__make} INSTALL="%{__install} -p" install DESTDIR=%{buildroot}
 
 
 desktop-file-install --vendor fedora           \
     --remove-category Education                \
     --dir %{buildroot}%{_datadir}/applications \
-    desktop/%{name}.desktop
+    --delete-original                          \
+    %{buildroot}%{_datadir}/applications/%{name}.desktop
 
 
 %{__rm} -f %{buildroot}%{_libdir}/libgerbv.la
 
-%{__rm} -f %{buildroot}%{_datadir}/applications/%{name}.desktop
 %{__rm} -f  {doc,example}/Makefile*
 
 pushd example/
@@ -132,12 +132,19 @@
 %files devel
 %defattr(-,root,root,-)
 %doc doc/*
+%dir %{_includedir}/%{name}-%{version}
 %{_includedir}/%{name}-%{version}/%{name}.h
 %{_libdir}/lib%{name}.so
 %{_libdir}/pkgconfig/libgerbv.pc
 
 
 %Changelog
+* Thu Jan 22 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 2.2.0-1
+- new upstream release
+
+* Thu Dec  4 2008 Michael Schwendt <mschwendt at fedoraproject.org> - 2.1.0-3
+- Include unowned headers directory.
+
 * Thu Nov 13 2008 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 2.1.0-2
 - BR ImageMagick-devel added
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/gerbv/F-9/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	13 Nov 2008 20:35:59 -0000	1.1
+++ import.log	28 Jan 2009 21:56:05 -0000	1.2
@@ -1 +1,2 @@
 gerbv-2_1_0-2_fc9:F-9:gerbv-2.1.0-2.fc9.src.rpm:1226608496
+gerbv-2_2_0-1_fc10:F-9:gerbv-2.2.0-1.fc10.src.rpm:1233179668


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gerbv/F-9/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	13 Nov 2008 20:35:59 -0000	1.5
+++ sources	28 Jan 2009 21:56:05 -0000	1.6
@@ -1 +1 @@
-0e697643c2bc303357648d12120373ab  gerbv-2.1.0.tar.gz
+400b3a5dd23c5892fc09715b34fdc94a  gerbv-2.2.0.tar.gz



From wtogami at fedoraproject.org  Wed Jan 28 21:57:55 2009
From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=)
Date: Wed, 28 Jan 2009 21:57:55 +0000 (UTC)
Subject: rpms/ltsp/F-9 .cvsignore, 1.34, 1.35 ltsp.spec, 1.45, 1.46 sources, 
	1.38, 1.39
Message-ID: <20090128215755.B8E1E7010D@cvs1.fedora.phx.redhat.com>

Author: wtogami

Update of /cvs/pkgs/rpms/ltsp/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27244

Modified Files:
	.cvsignore ltsp.spec sources 
Log Message:
- Fix ltsp-build-client
- Fix client shutdown with NBD root



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ltsp/F-9/.cvsignore,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- .cvsignore	22 Jan 2009 04:04:36 -0000	1.34
+++ .cvsignore	28 Jan 2009 21:57:25 -0000	1.35
@@ -1 +1 @@
-ltsp-5.1.51.tar.bz2
+ltsp-5.1.54.tar.bz2


Index: ltsp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ltsp/F-9/ltsp.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- ltsp.spec	22 Jan 2009 04:04:36 -0000	1.45
+++ ltsp.spec	28 Jan 2009 21:57:25 -0000	1.46
@@ -1,6 +1,6 @@
 Name:           ltsp
-Version:        5.1.51
-%define _datestamp .20090121.17
+Version:        5.1.54
+%define _datestamp .20090128.01
 #Release:        2%{_datestamp}%{?dist}
 Release:        1%{?dist}
 Summary:        Linux Terminal Server Project Server and Client
@@ -407,6 +407,12 @@
 %endif
 
 %changelog
+* Wed Jan 28 2009 Warren Togami <wtogami at redhat.com> - 5.1.54-1
+- Fix ltsp-build-client
+
+* Wed Jan 28 2009 Warren Togami <wtogami at redhat.com> - 5.1.53-1
+- Fix client shutdown with NBD root
+
 * Wed Jan 21 2009 Warren Togami <wtogami at redhat.com> - 5.1.51-1
 - Fedora 11 support and more bug fixes
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ltsp/F-9/sources,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- sources	22 Jan 2009 04:04:36 -0000	1.38
+++ sources	28 Jan 2009 21:57:25 -0000	1.39
@@ -1 +1 @@
-a939ff6e95b9dd20c24515d87672daaa  ltsp-5.1.51.tar.bz2
+46ecfe37e11888bd1cda97b4da825156  ltsp-5.1.54.tar.bz2



From chitlesh at fedoraproject.org  Wed Jan 28 21:58:48 2009
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Wed, 28 Jan 2009 21:58:48 +0000 (UTC)
Subject: rpms/gerbv/F-10 .cvsignore, 1.5, 1.6 gerbv.spec, 1.5, 1.6 import.log,
	1.1, 1.2 sources, 1.5, 1.6
Message-ID: <20090128215848.6972B7010D@cvs1.fedora.phx.redhat.com>

Author: chitlesh

Update of /cvs/pkgs/rpms/gerbv/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27490/F-10

Modified Files:
	.cvsignore gerbv.spec import.log sources 
Log Message:
2.2.0


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gerbv/F-10/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	13 Nov 2008 20:38:45 -0000	1.5
+++ .cvsignore	28 Jan 2009 21:58:18 -0000	1.6
@@ -1 +1 @@
-gerbv-2.1.0.tar.gz
+gerbv-2.2.0.tar.gz


Index: gerbv.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gerbv/F-10/gerbv.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- gerbv.spec	13 Nov 2008 20:38:46 -0000	1.5
+++ gerbv.spec	28 Jan 2009 21:58:18 -0000	1.6
@@ -1,6 +1,6 @@
 Name:             gerbv
-Version:          2.1.0
-Release:          2%{?dist}
+Version:          2.2.0
+Release:          1%{?dist}
 Summary:          Gerber file viewer from the gEDA toolkit
 
 Group:            Applications/Engineering
@@ -61,18 +61,18 @@
 
 %install
 %{__rm} -rf %{buildroot}
-%{__make} install DESTDIR=%{buildroot}
+%{__make} INSTALL="%{__install} -p" install DESTDIR=%{buildroot}
 
 
 desktop-file-install --vendor fedora           \
     --remove-category Education                \
     --dir %{buildroot}%{_datadir}/applications \
-    desktop/%{name}.desktop
+    --delete-original                          \
+    %{buildroot}%{_datadir}/applications/%{name}.desktop
 
 
 %{__rm} -f %{buildroot}%{_libdir}/libgerbv.la
 
-%{__rm} -f %{buildroot}%{_datadir}/applications/%{name}.desktop
 %{__rm} -f  {doc,example}/Makefile*
 
 pushd example/
@@ -132,12 +132,19 @@
 %files devel
 %defattr(-,root,root,-)
 %doc doc/*
+%dir %{_includedir}/%{name}-%{version}
 %{_includedir}/%{name}-%{version}/%{name}.h
 %{_libdir}/lib%{name}.so
 %{_libdir}/pkgconfig/libgerbv.pc
 
 
 %Changelog
+* Thu Jan 22 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 2.2.0-1
+- new upstream release
+
+* Thu Dec  4 2008 Michael Schwendt <mschwendt at fedoraproject.org> - 2.1.0-3
+- Include unowned headers directory.
+
 * Thu Nov 13 2008 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 2.1.0-2
 - BR ImageMagick-devel added
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/gerbv/F-10/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	13 Nov 2008 20:38:46 -0000	1.1
+++ import.log	28 Jan 2009 21:58:18 -0000	1.2
@@ -1 +1,2 @@
 gerbv-2_1_0-2_fc9:F-10:gerbv-2.1.0-2.fc9.src.rpm:1226608650
+gerbv-2_2_0-1_fc10:F-10:gerbv-2.2.0-1.fc10.src.rpm:1233179789


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gerbv/F-10/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	13 Nov 2008 20:38:46 -0000	1.5
+++ sources	28 Jan 2009 21:58:18 -0000	1.6
@@ -1 +1 @@
-0e697643c2bc303357648d12120373ab  gerbv-2.1.0.tar.gz
+400b3a5dd23c5892fc09715b34fdc94a  gerbv-2.2.0.tar.gz



From chitlesh at fedoraproject.org  Wed Jan 28 22:01:00 2009
From: chitlesh at fedoraproject.org (Chitlesh GOORAH)
Date: Wed, 28 Jan 2009 22:01:00 +0000 (UTC)
Subject: rpms/gerbv/devel .cvsignore, 1.5, 1.6 gerbv.spec, 1.6,
	1.7 import.log, 1.1, 1.2 sources, 1.5, 1.6
Message-ID: <20090128220100.A46A87010D@cvs1.fedora.phx.redhat.com>

Author: chitlesh

Update of /cvs/pkgs/rpms/gerbv/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28073/devel

Modified Files:
	.cvsignore gerbv.spec import.log sources 
Log Message:
2.2.0


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gerbv/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	13 Nov 2008 20:40:37 -0000	1.5
+++ .cvsignore	28 Jan 2009 22:00:30 -0000	1.6
@@ -1 +1 @@
-gerbv-2.1.0.tar.gz
+gerbv-2.2.0.tar.gz


Index: gerbv.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gerbv/devel/gerbv.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- gerbv.spec	4 Dec 2008 18:56:01 -0000	1.6
+++ gerbv.spec	28 Jan 2009 22:00:30 -0000	1.7
@@ -1,6 +1,6 @@
 Name:             gerbv
-Version:          2.1.0
-Release:          3%{?dist}
+Version:          2.2.0
+Release:          1%{?dist}
 Summary:          Gerber file viewer from the gEDA toolkit
 
 Group:            Applications/Engineering
@@ -61,18 +61,18 @@
 
 %install
 %{__rm} -rf %{buildroot}
-%{__make} install DESTDIR=%{buildroot}
+%{__make} INSTALL="%{__install} -p" install DESTDIR=%{buildroot}
 
 
 desktop-file-install --vendor fedora           \
     --remove-category Education                \
     --dir %{buildroot}%{_datadir}/applications \
-    desktop/%{name}.desktop
+    --delete-original                          \
+    %{buildroot}%{_datadir}/applications/%{name}.desktop
 
 
 %{__rm} -f %{buildroot}%{_libdir}/libgerbv.la
 
-%{__rm} -f %{buildroot}%{_datadir}/applications/%{name}.desktop
 %{__rm} -f  {doc,example}/Makefile*
 
 pushd example/
@@ -139,6 +139,9 @@
 
 
 %Changelog
+* Thu Jan 22 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 2.2.0-1
+- new upstream release
+
 * Thu Dec  4 2008 Michael Schwendt <mschwendt at fedoraproject.org> - 2.1.0-3
 - Include unowned headers directory.
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/gerbv/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	13 Nov 2008 20:40:37 -0000	1.1
+++ import.log	28 Jan 2009 22:00:30 -0000	1.2
@@ -1 +1,2 @@
 gerbv-2_1_0-2_fc9:HEAD:gerbv-2.1.0-2.fc9.src.rpm:1226608797
+gerbv-2_2_0-1_fc10:HEAD:gerbv-2.2.0-1.fc10.src.rpm:1233179942


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gerbv/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	13 Nov 2008 20:40:37 -0000	1.5
+++ sources	28 Jan 2009 22:00:30 -0000	1.6
@@ -1 +1 @@
-0e697643c2bc303357648d12120373ab  gerbv-2.1.0.tar.gz
+400b3a5dd23c5892fc09715b34fdc94a  gerbv-2.2.0.tar.gz



From wart at fedoraproject.org  Wed Jan 28 22:07:00 2009
From: wart at fedoraproject.org (Michael Thomas)
Date: Wed, 28 Jan 2009 22:07:00 +0000 (UTC)
Subject: rpms/tclparser/EL-4 tclparser.spec,1.6,1.7
Message-ID: <20090128220700.C6FE97010D@cvs1.fedora.phx.redhat.com>

Author: wart

Update of /cvs/pkgs/rpms/tclparser/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29078

Modified Files:
	tclparser.spec 
Log Message:
Rebuild for EPEL4




Index: tclparser.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tclparser/EL-4/tclparser.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- tclparser.spec	21 Sep 2008 09:03:39 -0000	1.6
+++ tclparser.spec	28 Jan 2009 22:06:30 -0000	1.7
@@ -1,11 +1,9 @@
-%{!?tcl_version: %define tcl_version %(echo 'puts $tcl_version' | tclsh)}
-%{!?tcl_sitearch: %define tcl_sitearch %{_libdir}/tcl%{tcl_version}}
 %define cvsdate 20061030
 
 Summary: Tcl syntax parser
 Name: tclparser
 Version: 1.4
-Release: 5.%{cvsdate}cvs%{?dist}
+Release: 3.%{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
@@ -13,7 +11,7 @@
 Source0: tclparser-%{cvsdate}cvs.tgz
 Patch0:  tclparser-1.4-configure.patch
 URL: http://tclpro.sourceforge.net/
-Requires: tcl(abi) = 8.5
+Requires: tcl
 BuildRequires: tcl-devel
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -23,10 +21,10 @@
 
 %prep
 %setup -q -n %{name}-%{cvsdate}cvs
-%patch0 -p0
+%patch -p0
 
 %build
-%configure --libdir=%{tcl_sitearch}
+%configure
 make %{?_smp_mflags}
 
 %install
@@ -40,19 +38,13 @@
 rm -rf $RPM_BUILD_ROOT
 
 %files
-%doc ChangeLog license.terms
 %defattr(-,root,root)
-%{tcl_sitearch}/%{name}%{version}
+%doc ChangeLog license.terms
+%{_libdir}/%{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
-
-* Thu Jan 3 2008 Wart <wart at kobold.org> 1.4-3.20061030cvs
-- Rebuild for Tcl 8.5
+* Wed Jan 28 2009 Wart <wart at kobold.org> 1.4-3.20061030cvs
+- Rebuild for EPEL4
 
 * Tue Aug 21 2007 Wart <wart at kobold.org> 1.4-2.20061030cvs
 - License tag clarficiation



From wart at fedoraproject.org  Wed Jan 28 22:10:33 2009
From: wart at fedoraproject.org (Michael Thomas)
Date: Wed, 28 Jan 2009 22:10:33 +0000 (UTC)
Subject: rpms/tclcompiler/EL-5 tclcompiler.spec,1.2,1.3
Message-ID: <20090128221033.C9E1F7010D@cvs1.fedora.phx.redhat.com>

Author: wart

Update of /cvs/pkgs/rpms/tclcompiler/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29822

Modified Files:
	tclcompiler.spec 
Log Message:
Rebuild for EPEL5




Index: tclcompiler.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tclcompiler/EL-5/tclcompiler.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- tclcompiler.spec	21 Aug 2007 14:50:13 -0000	1.2
+++ tclcompiler.spec	28 Jan 2009 22:10:03 -0000	1.3
@@ -3,7 +3,7 @@
 Summary: Tcl bytecode compiler
 Name: tclcompiler
 Version: 1.5
-Release: 3.%{cvsdate}cvs%{?dist}
+Release: 4.%{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 tclcompiler-20061030cvs tclcompiler
@@ -11,7 +11,7 @@
 Source0: tclcompiler-%{cvsdate}cvs.tgz
 Patch0:  tclcompiler-1.5-configure.patch
 URL: http://tclpro.sourceforge.net/
-Requires: tcl(abi) = 8.4
+Requires: tcl
 BuildRequires: tbcload-devel
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -21,7 +21,7 @@
 
 %prep
 %setup -q -n %{name}-%{cvsdate}cvs
-%patch -p0
+%patch0 -p0
 
 %build
 %configure
@@ -39,11 +39,15 @@
 rm -rf $RPM_BUILD_ROOT
 
 %files
-%doc ChangeLog license.terms
 %defattr(-,root,root)
+%doc ChangeLog license.terms
 %{_libdir}/%{name}%{version}
 
 %changelog
+* Wed Jan 28 2009 Wart <wart at kobold.org> 1.5-4.20061030cvs
+- Rebuild for EPEL4
+
+* Mon Aug 20 2007 Wart <wart at kobold.org> 1.5-3.20061030cvs
 - License tag clarification
 
 * Thu Nov 2 2006 Wart <wart at kobold.org> 1.5-2.20061030cvs



From wart at fedoraproject.org  Wed Jan 28 22:12:32 2009
From: wart at fedoraproject.org (Michael Thomas)
Date: Wed, 28 Jan 2009 22:12:32 +0000 (UTC)
Subject: rpms/tclpro/EL-4 tclpro.spec,1.8,1.9
Message-ID: <20090128221232.ED50E7010D@cvs1.fedora.phx.redhat.com>

Author: wart

Update of /cvs/pkgs/rpms/tclpro/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30148

Modified Files:
	tclpro.spec 
Log Message:
Rebuild for EPEL4



Index: tclpro.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tclpro/EL-4/tclpro.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- tclpro.spec	15 Jun 2008 05:34:49 -0000	1.8
+++ tclpro.spec	28 Jan 2009 22:12:02 -0000	1.9
@@ -5,7 +5,7 @@
 Summary: Development and debugging tools for Tcl applications
 Name: tclpro
 Version: 1.5.0
-Release: 12.%{cvsdate}cvs%{?dist}
+Release: 11.%{cvsdate}cvs%{?dist}
 License: TCL
 Group: Development/Tools
 # cvs -d:pserver:anonymous at tclpro.cvs.sourceforge.net:/cvsroot/tclpro export -D 2006-10-30 -d tclpro-20061030cvs tbcload
@@ -22,7 +22,7 @@
 Patch5: tclpro-1.5.0-about.patch
 Patch6: tclpro-1.5.0-helpurl.patch
 URL: http://tclpro.sourceforge.net/
-Requires: tcl(abi) = 8.5 tk >= 0:8.3.2 tcllib tcldebugger tclchecker
+Requires: tcl tk >= 0:8.3.2 tcllib tclcompiler tcldebugger tclchecker
 BuildRequires: tcl-devel autoconf
 BuildRequires: desktop-file-utils
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -64,7 +64,7 @@
 sed -e 's#@imagedir@#%{tcl_sitelib}/tcldebugger1.4#' < modules/debugger/src/startup.tcl > $RPM_BUILD_ROOT/%{_bindir}/prodebug
 chmod 755 $RPM_BUILD_ROOT/%{_bindir}/prodebug
 install -m 755 modules/checker/src/startup.tcl $RPM_BUILD_ROOT/%{_bindir}/procheck
-#install -m 755 modules/compiler/src/startup.tcl $RPM_BUILD_ROOT/%{_bindir}/procompile
+install -m 755 modules/compiler/src/startup.tcl $RPM_BUILD_ROOT/%{_bindir}/procompile
 
 # The Tcl compiler application needs an extra file/package to run.
 mkdir -p $RPM_BUILD_ROOT%{tcl_sitelib}/procomp1.5
@@ -85,23 +85,19 @@
 rm -rf $RPM_BUILD_ROOT
 
 %files
-%doc ChangeLog
 %defattr(-,root,root)
+%doc ChangeLog
 %{_bindir}/procheck
 %{_bindir}/prodebug
-#%{_bindir}/procompile
+%{_bindir}/procompile
 %{tcl_sitelib}/procomp1.5
 %{tcl_sitelib}/projectInfo1.4
 %{_datadir}/applications/fedora-tclpro.desktop
 %{_datadir}/pixmaps/prodebug.png
 
 %changelog
-* Sat Jun 14 2008 Wart <wart at kobold.org> 1.5.0-12.20061030cvs
-- Remove the tclcompiler executable which doesn't work correctly
-  with Tcl 8.5
-
-* Thu Jan 13 2008 Wart <wart at kobold.org> 1.5.0-11.20061030cvs
-- Rebuild for Tcl 8.5
+* Wed Jan 28 2009 Wart <wart at kobold.org> 1.5.0-11.20061030cvs
+- Rebuild for EPEL4
 
 * Sat Dec 15 2007 Wart <wart at kobold.org> 1.5.0-10.20061030cvs
 - Fix startup bug with procompile (BZ #425807)



From icon at fedoraproject.org  Wed Jan 28 22:15:18 2009
From: icon at fedoraproject.org (Konstantin Ryabitsev)
Date: Wed, 28 Jan 2009 22:15:18 +0000 (UTC)
Subject: rpms/python-logilab-common/devel .cvsignore, 1.15,
	1.16 python-logilab-common.spec, 1.19, 1.20 sources, 1.15, 1.16
Message-ID: <20090128221518.0D1C67010D@cvs1.fedora.phx.redhat.com>

Author: icon

Update of /cvs/extras/rpms/python-logilab-common/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30566

Modified Files:
	.cvsignore python-logilab-common.spec sources 
Log Message:
New upstream.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-logilab-common/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	30 Dec 2008 16:55:43 -0000	1.15
+++ .cvsignore	28 Jan 2009 22:14:47 -0000	1.16
@@ -1 +1 @@
-logilab-common-0.37.0.tar.gz
+logilab-common-0.38.0.tar.gz


Index: python-logilab-common.spec
===================================================================
RCS file: /cvs/extras/rpms/python-logilab-common/devel/python-logilab-common.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- python-logilab-common.spec	30 Dec 2008 16:55:43 -0000	1.19
+++ python-logilab-common.spec	28 Jan 2009 22:14:47 -0000	1.20
@@ -1,7 +1,7 @@
 %{!?_python_sitelib: %define _python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           python-logilab-common
-Version:        0.37.0
+Version:        0.38.0
 Release:        1%{?dist}
 Summary:        Common libraries for Logilab projects
 
@@ -47,6 +47,9 @@
 
 
 %changelog
+* Wed Jan 28 2009 Konstantin Ryabitsev <icon at fedoraproject.org> - 0.38.0-1
+- Upstream 0.38.0
+
 * Tue Dec 30 2008 Konstantin Ryabitsev <icon at fedoraproject.org> - 0.37.0-1
 - Upstream 0.37.0
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-logilab-common/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	30 Dec 2008 16:55:43 -0000	1.15
+++ sources	28 Jan 2009 22:14:47 -0000	1.16
@@ -1 +1 @@
-69f66a333bc96337070874cee7167f75  logilab-common-0.37.0.tar.gz
+0e6ad22c5f17312e7f7dc58d287579c5  logilab-common-0.38.0.tar.gz



From wart at fedoraproject.org  Wed Jan 28 22:16:52 2009
From: wart at fedoraproject.org (Michael Thomas)
Date: Wed, 28 Jan 2009 22:16:52 +0000 (UTC)
Subject: rpms/tbcload/EL-5 tbcload.spec,1.2,1.3
Message-ID: <20090128221652.0263B7010D@cvs1.fedora.phx.redhat.com>

Author: wart

Update of /cvs/pkgs/rpms/tbcload/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30874

Modified Files:
	tbcload.spec 
Log Message:
Initial build for EPEL5



Index: tbcload.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tbcload/EL-5/tbcload.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- tbcload.spec	21 Aug 2007 04:15:40 -0000	1.2
+++ tbcload.spec	28 Jan 2009 22:16:21 -0000	1.3
@@ -3,7 +3,7 @@
 Summary: Tcl bytecode loader
 Name: tbcload
 Version: 1.4
-Release: 4.%{cvsdate}cvs%{?dist}
+Release: 6.%{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 tbcload-20061030cvs tbcload
@@ -28,7 +28,7 @@
 
 %prep
 %setup -q -n %{name}-%{cvsdate}cvs
-%patch -p0
+%patch0 -p0
 
 %build
 %configure
@@ -45,8 +45,8 @@
 rm -rf $RPM_BUILD_ROOT
 
 %files
-%doc ChangeLog license.terms
 %defattr(-,root,root)
+%doc ChangeLog license.terms
 %{_libdir}/%{name}%{version}
 
 %files devel
@@ -54,6 +54,14 @@
 %{_includedir}/*.h
 
 %changelog
+* Wed Jan 28 2009 Wart <wart at kobold.org> 1.4-6.20061030cvs
+- Move out of tcl-specific directory due to multi-arch problems
+- Rebuild for EPEL-4
+
+* Mon Aug 20 2007 Wart <wart at kobold.org> 1.4-5.20061030cvs
+- Move to a tcl-specific directory for faster loading
+
+* Mon Aug 20 2007 Wart <wart at kobold.org> 1.4-4.20061030cvs
 - License tag clarification
 
 * Tue Nov 7 2006 Wart <wart at kobold.org> 1.4-3.20061030cvs



From dwalsh at fedoraproject.org  Wed Jan 28 22:23:49 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Wed, 28 Jan 2009 22:23:49 +0000 (UTC)
Subject: rpms/selinux-policy/devel modules-minimum.conf, 1.11,
	1.12 modules-mls.conf, 1.46, 1.47 modules-targeted.conf, 1.113,
	1.114 policy-20090105.patch, 1.22, 1.23 selinux-policy.spec,
	1.777, 1.778
Message-ID: <20090128222349.9FDF57010D@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv409

Modified Files:
	modules-minimum.conf modules-mls.conf modules-targeted.conf 
	policy-20090105.patch selinux-policy.spec 
Log Message:
* Tue Jan 27 2009 Dan Walsh <dwalsh at redhat.com> 3.6.3-10
- Fixes for wicd daemon



Index: modules-minimum.conf
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/modules-minimum.conf,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- modules-minimum.conf	21 Jan 2009 20:39:17 -0000	1.11
+++ modules-minimum.conf	28 Jan 2009 22:23:18 -0000	1.12
@@ -1742,12 +1742,6 @@
 zosremote = module
 
 # Layer: services
-# Module: pki
-#
-# 
-pki = module
-
-# Layer: services
 # Module: pingd
 #
 # 


Index: modules-mls.conf
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/modules-mls.conf,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- modules-mls.conf	21 Jan 2009 20:39:17 -0000	1.46
+++ modules-mls.conf	28 Jan 2009 22:23:18 -0000	1.47
@@ -1750,12 +1750,6 @@
 zosremote = module
 
 # Layer: services
-# Module: pki
-#
-# 
-pki = module
-
-# Layer: services
 # Module: pingd
 #
 # 


Index: modules-targeted.conf
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/modules-targeted.conf,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -r1.113 -r1.114
--- modules-targeted.conf	21 Jan 2009 20:39:17 -0000	1.113
+++ modules-targeted.conf	28 Jan 2009 22:23:18 -0000	1.114
@@ -1742,12 +1742,6 @@
 zosremote = module
 
 # Layer: services
-# Module: pki
-#
-# 
-pki = module
-
-# Layer: services
 # Module: pingd
 #
 # 

policy-20090105.patch:

Index: policy-20090105.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-20090105.patch,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- policy-20090105.patch	28 Jan 2009 17:23:16 -0000	1.22
+++ policy-20090105.patch	28 Jan 2009 22:23:18 -0000	1.23
@@ -23121,7 +23121,7 @@
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.te serefpolicy-3.6.3/policy/modules/services/xserver.te
 --- nsaserefpolicy/policy/modules/services/xserver.te	2009-01-19 11:06:49.000000000 -0500
-+++ serefpolicy-3.6.3/policy/modules/services/xserver.te	2009-01-28 12:09:22.000000000 -0500
++++ serefpolicy-3.6.3/policy/modules/services/xserver.te	2009-01-28 13:23:35.000000000 -0500
 @@ -34,6 +34,13 @@
  
  ## <desc>
@@ -25727,7 +25727,7 @@
  
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/miscfiles.if serefpolicy-3.6.3/policy/modules/system/miscfiles.if
 --- nsaserefpolicy/policy/modules/system/miscfiles.if	2008-08-07 11:15:12.000000000 -0400
-+++ serefpolicy-3.6.3/policy/modules/system/miscfiles.if	2009-01-21 13:05:22.000000000 -0500
++++ serefpolicy-3.6.3/policy/modules/system/miscfiles.if	2009-01-28 13:24:09.000000000 -0500
 @@ -23,6 +23,45 @@
  
  ########################################
@@ -25774,6 +25774,15 @@
  ##	Read fonts.
  ## </summary>
  ## <param name="domain">
+@@ -62,7 +101,7 @@
+ 		type fonts_t;
+ 	')
+ 
+-	dontaudit $1 fonts_t:dir write;
++	dontaudit $1 fonts_t:dir { write setattr };
+ 	dontaudit $1 fonts_t:file write;
+ ')
+ 
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/modutils.te serefpolicy-3.6.3/policy/modules/system/modutils.te
 --- nsaserefpolicy/policy/modules/system/modutils.te	2009-01-05 15:39:43.000000000 -0500
 +++ serefpolicy-3.6.3/policy/modules/system/modutils.te	2009-01-21 10:30:56.000000000 -0500


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.777
retrieving revision 1.778
diff -u -r1.777 -r1.778
--- selinux-policy.spec	28 Jan 2009 17:23:17 -0000	1.777
+++ selinux-policy.spec	28 Jan 2009 22:23:18 -0000	1.778
@@ -203,7 +203,7 @@
 touch %{buildroot}%{_sysconfdir}/sysconfig/selinux
 
 # Always create policy module package directories
-mkdir -p %{buildroot}%{_usr}/share/selinux/{targeted,mls}/
+mkdir -p %{buildroot}%{_usr}/share/selinux/{targeted,mls,minimum,modules}/
 
 # Install devel
 make clean



From wart at fedoraproject.org  Wed Jan 28 22:38:47 2009
From: wart at fedoraproject.org (Michael Thomas)
Date: Wed, 28 Jan 2009 22:38:47 +0000 (UTC)
Subject: rpms/tclchecker/EL-5 tclchecker.spec,1.2,1.3
Message-ID: <20090128223847.8422F7010D@cvs1.fedora.phx.redhat.com>

Author: wart

Update of /cvs/pkgs/rpms/tclchecker/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3068

Modified Files:
	tclchecker.spec 
Log Message:
Initial build for EPEL5



Index: tclchecker.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tclchecker/EL-5/tclchecker.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- tclchecker.spec	21 Aug 2007 06:00:11 -0000	1.2
+++ tclchecker.spec	28 Jan 2009 22:38:16 -0000	1.3
@@ -1,9 +1,11 @@
+%{!?tcl_version: %define tcl_version %(echo 'puts $tcl_version' | tclsh)}
+%{!?tcl_sitelib: %define tcl_sitelib %{_datadir}/tcl%{tcl_version}}
 %define cvsdate 20061030
 
 Summary: Tcl syntax checker
 Name: tclchecker
 Version: 1.4
-Release: 2.%{cvsdate}cvs%{?dist}
+Release: 4.%{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 tclchecker-20061030cvs tclchecker
@@ -27,14 +29,14 @@
 autoconf
 
 %build
-%configure
+%configure --libdir=%{tcl_sitelib} --datadir=%{tcl_sitelib}
 make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
-chmod a-x $RPM_BUILD_ROOT%{_datadir}/%{name}%{version}/*.tcl
-chmod a-x $RPM_BUILD_ROOT%{_datadir}/%{name}%{version}/*.pcx
+chmod a-x $RPM_BUILD_ROOT%{tcl_sitelib}/%{name}%{version}/*.tcl
+chmod a-x $RPM_BUILD_ROOT%{tcl_sitelib}/%{name}%{version}/*.pcx
 
 %check
 # Disabling unit tests as they require tools that haven't been built yet.
@@ -44,12 +46,19 @@
 rm -rf $RPM_BUILD_ROOT
 
 %files
-%doc ChangeLog license.terms doc/messageIDs.txt
 %defattr(-,root,root)
-%{_datadir}/%{name}%{version}
+%doc ChangeLog license.terms doc/messageIDs.txt
+%{tcl_sitelib}/%{name}%{version}
 
 %changelog
+* Wed Jan 28 2009 Wart <wart at kobold.org> 1.4-4.20061030cvs
+- Rebuild for EPEL4
+
+* Mon Aug 20 2007 Wart <wart at kobold.org> 1.4-3.20061030cvs
 - License tag clarification
 
+* Sat Jun 2 2007 Wart <wart at kobold.org> 1.4-2.20061030cvs
+- Move to a tcl-specific directory for faster loading
+
 * Tue Oct 31 2006 Wart <wart at kobold.org> 1.4-1.20061030cvs
 - Initial package for Fedora



From wart at fedoraproject.org  Wed Jan 28 22:42:09 2009
From: wart at fedoraproject.org (Michael Thomas)
Date: Wed, 28 Jan 2009 22:42:09 +0000 (UTC)
Subject: rpms/tcldebugger/EL-5 tcldebugger.spec,1.2,1.3
Message-ID: <20090128224209.78B267010D@cvs1.fedora.phx.redhat.com>

Author: wart

Update of /cvs/pkgs/rpms/tcldebugger/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3787

Modified Files:
	tcldebugger.spec 
Log Message:
Initial build for EPEL5



Index: tcldebugger.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tcldebugger/EL-5/tcldebugger.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- tcldebugger.spec	21 Aug 2007 18:17:28 -0000	1.2
+++ tcldebugger.spec	28 Jan 2009 22:41:39 -0000	1.3
@@ -1,9 +1,11 @@
+%{!?tcl_version: %define tcl_version %(echo 'puts $tcl_version' | tclsh)}
+%{!?tcl_sitelib: %define tcl_sitelib %{_datadir}/tcl%{tcl_version}}
 %define cvsdate 20061030
 
 Summary: Tcl debugging library
 Name: tcldebugger
 Version: 1.4
-Release: 2.%{cvsdate}cvs%{?dist}
+Release: 6.%{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 tcldebugger-20061030cvs tcldebugger
@@ -14,9 +16,10 @@
 Patch2:  tcldebugger-1.4-tkupdate.patch
 Patch3:  tcldebugger-1.4-shortsplash.patch
 Patch4:  tcldebugger-1.4-shebang.patch
+Patch5:  tcldebugger-1.4-browser.patch
 URL: http://tclpro.sourceforge.net/
 BuildRequires: tcl-devel autoconf
-Requires: tk tclparser tcllib tbcload
+Requires: tcl tk tclparser tcllib tbcload xdg-utils
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 
@@ -30,10 +33,11 @@
 %patch2 -p0
 %patch3 -p0
 %patch4 -p0
+%patch5 -p1
 autoconf
 
 %build
-%configure
+%configure --libdir=%{tcl_sitelib} --datadir=%{tcl_sitelib}
 make %{?_smp_mflags}
 
 %install
@@ -41,8 +45,8 @@
 make install DESTDIR=$RPM_BUILD_ROOT
 
 # Fix a few file permissions for rpmlint
-chmod a-x $RPM_BUILD_ROOT%{_datadir}/%{name}%{version}/*.tcl
-chmod a-x $RPM_BUILD_ROOT%{_datadir}/%{name}%{version}/*.pdx
+chmod a-x $RPM_BUILD_ROOT%{tcl_sitelib}/%{name}%{version}/*.tcl
+chmod a-x $RPM_BUILD_ROOT%{tcl_sitelib}/%{name}%{version}/*.pdx
 
 %check
 # Disabling unit tests as they require tools that haven't been built yet.
@@ -52,15 +56,30 @@
 rm -rf $RPM_BUILD_ROOT
 
 %files
-%doc ChangeLog license.terms
 %defattr(-,root,root)
+%doc ChangeLog license.terms
 %{_bindir}/initdebug.tcl
 %{_bindir}/appLaunch.tcl
-%{_datadir}/%{name}%{version}
+%{tcl_sitelib}/%{name}%{version}
 %{_mandir}/mann/*.gz
 
 %changelog
+* Wed Jan 28 2009 Wart <wart at kobold.org> 1.4-6.20061030cvs
+- Rebuild for EPEL4
+
+* Mon Oct 1 2007 Wart <wart at kobold.org> 1.4-5.20061030cvs
+- Switch from htmlview to xdg-utils
+
+* Tue Aug 21 2007 Wart <wart at kobold.org> 1.4-4.20061030cvs
 - License tag clarification
+- Apply forgotten patch
+
+* Sun Jun 3 2007 Wart <wart at kobold.org> 1.4-3.20061030cvs
+- Change Help menu command from 'netscape' to the generic 'htmlview'
+  and add 'Requires: htmlview'
+
+* Sat Jun 2 2007 Wart <wart at kobold.org> 1.4-2.20061030cvs
+- Move to a tcl-specific directory for faster loading
 
 * Tue Oct 31 2006 Wart <wart at kobold.org> 1.4-1.20061030cvs
 - Initial package for Fedora



From wart at fedoraproject.org  Wed Jan 28 22:42:38 2009
From: wart at fedoraproject.org (Michael Thomas)
Date: Wed, 28 Jan 2009 22:42:38 +0000 (UTC)
Subject: rpms/tcldebugger/EL-5 tcldebugger-1.4-browser.patch,NONE,1.1
Message-ID: <20090128224238.111B07010D@cvs1.fedora.phx.redhat.com>

Author: wart

Update of /cvs/pkgs/rpms/tcldebugger/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4012

Added Files:
	tcldebugger-1.4-browser.patch 
Log Message:
Add patch from EL-4



tcldebugger-1.4-browser.patch:

--- NEW FILE tcldebugger-1.4-browser.patch ---
--- tcldebugger-20061030cvs/system.tcl.orig	2007-06-03 17:25:51.000000000 -0700
+++ tcldebugger-20061030cvs/system.tcl	2007-06-03 17:26:20.000000000 -0700
@@ -42,7 +42,7 @@
     variable browser
     set browser(start)     "::start" 
     set browser(iexplorer) "iexplorer -nohome"
-    set browser(netscape)  "netscape -no-about-splash -dont-save-geometry-prefs"
+    set browser(netscape)  "xdg-open"
 }
 
 # system::init --



From wtogami at fedoraproject.org  Wed Jan 28 22:43:41 2009
From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=)
Date: Wed, 28 Jan 2009 22:43:41 +0000 (UTC)
Subject: rpms/ldm/F-10 ldm-2.0.30-nbd-update.patch, NONE, 1.1 ldm.spec, 1.26,
	1.27
Message-ID: <20090128224341.EC3717010D@cvs1.fedora.phx.redhat.com>

Author: wtogami

Update of /cvs/pkgs/rpms/ldm/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4309

Modified Files:
	ldm.spec 
Added Files:
	ldm-2.0.30-nbd-update.patch 
Log Message:
Fix nbd update checker


ldm-2.0.30-nbd-update.patch:

--- NEW FILE ldm-2.0.30-nbd-update.patch ---
diff -urN ldm-2.0.30.orig/rc.d/I00-nbd-checkupdate ldm-2.0.30/rc.d/I00-nbd-checkupdate
--- ldm-2.0.30.orig/rc.d/I00-nbd-checkupdate	2009-01-22 00:12:36.000000000 -0500
+++ ldm-2.0.30/rc.d/I00-nbd-checkupdate	2009-01-28 17:37:25.000000000 -0500
@@ -12,7 +12,7 @@
 
     #Connect and get the squashfs header (contains the creation date)
     nbd-client $nbd_server $nbd_port /dev/nbd9
-    NEW=$(dd if=/dev/nbd9 of=/dev/stdout bs=64 count=1 2> /dev/zero | file -)
+    NEW=$(dd if=/dev/nbd9 of=/dev/stdout bs=64 count=1 2> /dev/zero | sha1sum -)
     nbd-client -d /dev/nbd9
 else
     # It's NFS, so just exit
@@ -20,7 +20,7 @@
 fi
 
 #Get the current squashfs information
-CURRENT=$(dd if=$nbd_device of=/dev/stdout bs=64 count=1 2> /dev/zero | file -)
+CURRENT=$(dd if=$nbd_device of=/dev/stdout bs=64 count=1 2> /dev/zero | sha1sum -)
 
 #Exit if we're already running on the latest squashfs
 [ "$NEW" = "$CURRENT" ] && exit


Index: ldm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ldm/F-10/ldm.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- ldm.spec	22 Jan 2009 05:19:20 -0000	1.26
+++ ldm.spec	28 Jan 2009 22:43:11 -0000	1.27
@@ -1,14 +1,15 @@
 Name:           ldm
 Version:        2.0.30
-%define _datestamp .20081218.19
+%define _datestamp .20090127.13
 #Release:        2%{_datestamp}%{?dist}
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        LTSP Display Manager
 
 Group:          User Interface/X
 License:        GPLv2+
 URL:            https://code.launchpad.net/~ltsp-upstream/ltsp/ldm-trunk
 Source0:        ldm-%{version}.tar.bz2
+Patch0:         ldm-2.0.30-nbd-update.patch
 # Artwork by Maureen Duffy <duffy at redhat.com>
 %define theme_version 1.0.2
 Source1:        k12linux-theme-%{theme_version}.tar.bz2
@@ -34,6 +35,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 
 
 %build
@@ -93,6 +95,9 @@
 %config(noreplace) %{_sysconfdir}/ltsp/ldm-global-dmrc
 
 %changelog
+* Wed Jan 28 2009 Warren Togami <wtogami at redhat.com> - 2.0.30-2
+- Fix nbd update checker
+
 * Wed Jan 22 2009 Warren Togami <wtogami at redhat.com> - 2.0.30-1
 - NBD update checker, reboots client automatically if needed
 



From wart at fedoraproject.org  Wed Jan 28 22:44:14 2009
From: wart at fedoraproject.org (Michael Thomas)
Date: Wed, 28 Jan 2009 22:44:14 +0000 (UTC)
Subject: rpms/tclparser/EL-5 tclparser.spec,1.2,1.3
Message-ID: <20090128224414.7F6EF7010D@cvs1.fedora.phx.redhat.com>

Author: wart

Update of /cvs/pkgs/rpms/tclparser/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4444

Modified Files:
	tclparser.spec 
Log Message:
Initial build for EPEL5



Index: tclparser.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tclparser/EL-5/tclparser.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- tclparser.spec	21 Aug 2007 23:22:26 -0000	1.2
+++ tclparser.spec	28 Jan 2009 22:43:44 -0000	1.3
@@ -3,7 +3,7 @@
 Summary: Tcl syntax parser
 Name: tclparser
 Version: 1.4
-Release: 2.%{cvsdate}cvs%{?dist}
+Release: 3.%{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
@@ -38,11 +38,15 @@
 rm -rf $RPM_BUILD_ROOT
 
 %files
-%doc ChangeLog license.terms
 %defattr(-,root,root)
+%doc ChangeLog license.terms
 %{_libdir}/%{name}%{version}
 
 %changelog
+* Wed Jan 28 2009 Wart <wart at kobold.org> 1.4-3.20061030cvs
+- Rebuild for EPEL4
+
+* Tue Aug 21 2007 Wart <wart at kobold.org> 1.4-2.20061030cvs
 - License tag clarficiation
 
 * Tue Oct 31 2006 Wart <wart at kobold.org> 1.4-1.20061030cvs



From wart at fedoraproject.org  Wed Jan 28 22:46:06 2009
From: wart at fedoraproject.org (Michael Thomas)
Date: Wed, 28 Jan 2009 22:46:06 +0000 (UTC)
Subject: rpms/tclpro/EL-5 tclpro-compiler-startup.patch, 1.1,
	1.2 tclpro.desktop, 1.1, 1.2 tclpro.spec, 1.2, 1.3
Message-ID: <20090128224606.D5A977010D@cvs1.fedora.phx.redhat.com>

Author: wart

Update of /cvs/pkgs/rpms/tclpro/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4939

Modified Files:
	tclpro-compiler-startup.patch tclpro.desktop tclpro.spec 
Log Message:
Initial build for EPEL5; Import files from EL-4


tclpro-compiler-startup.patch:

Index: tclpro-compiler-startup.patch
===================================================================
RCS file: /cvs/pkgs/rpms/tclpro/EL-5/tclpro-compiler-startup.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tclpro-compiler-startup.patch	25 Nov 2006 23:50:24 -0000	1.1
+++ tclpro-compiler-startup.patch	28 Jan 2009 22:45:36 -0000	1.2
@@ -1,10 +1,18 @@
---- modules/compiler/src/startup.tcl.orig	2006-11-01 21:39:11.000000000 -0800
-+++ modules/compiler/src/startup.tcl	2006-11-01 21:39:38.000000000 -0800
+--- tclpro-20061030cvs/modules/compiler/src/startup.tcl.orig	2007-12-15 21:05:59.000000000 -0800
++++ tclpro-20061030cvs/modules/compiler/src/startup.tcl	2007-12-15 21:08:34.000000000 -0800
 @@ -1,3 +1,7 @@
 +#!/bin/sh
 +# \
-+exec wish "$0" ${1+"$@"}
++exec tclsh "$0" ${1+"$@"}
 +
  # startup.tcl --
  #
  #  Startup script for the TclPro bytecode compiler.
+@@ -13,6 +17,7 @@
+ 
+ package require projectInfo
+ package require cmdline
++package require procomp 1.0
+ 
+ # Set up hook to check TclPro license keys.
+ 


Index: tclpro.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/tclpro/EL-5/tclpro.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tclpro.desktop	25 Nov 2006 23:50:24 -0000	1.1
+++ tclpro.desktop	28 Jan 2009 22:45:36 -0000	1.2
@@ -7,5 +7,5 @@
 Icon=prodebug.png
 Terminal=false
 Type=Application
-Categories=Application;Programming;Development;
-Version=1.5.0
+Categories=Application;Development;Debugger;
+Version=1.0


Index: tclpro.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tclpro/EL-5/tclpro.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- tclpro.spec	22 Aug 2007 01:42:59 -0000	1.2
+++ tclpro.spec	28 Jan 2009 22:45:36 -0000	1.3
@@ -1,9 +1,11 @@
+%{!?tcl_version: %define tcl_version %(echo 'puts $tcl_version' | tclsh)}
+%{!?tcl_sitelib: %define tcl_sitelib %{_datadir}/tcl%{tcl_version}}
 %define cvsdate 20061030
 
 Summary: Development and debugging tools for Tcl applications
 Name: tclpro
 Version: 1.5.0
-Release: 7.%{cvsdate}cvs%{?dist}
+Release: 11.%{cvsdate}cvs%{?dist}
 License: TCL
 Group: Development/Tools
 # cvs -d:pserver:anonymous at tclpro.cvs.sourceforge.net:/cvsroot/tclpro export -D 2006-10-30 -d tclpro-20061030cvs tbcload
@@ -20,7 +22,7 @@
 Patch5: tclpro-1.5.0-about.patch
 Patch6: tclpro-1.5.0-helpurl.patch
 URL: http://tclpro.sourceforge.net/
-Requires: tk >= 0:8.3.2 tcllib tclcompiler tcldebugger tclchecker
+Requires: tcl tk >= 0:8.3.2 tcllib tclcompiler tcldebugger tclchecker
 BuildRequires: tcl-devel autoconf
 BuildRequires: desktop-file-utils
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -33,13 +35,13 @@
 
 %prep
 %setup -q -n %{name}-%{cvsdate}cvs
-%patch0
-%patch1
-%patch2
-%patch3
-%patch4
-%patch5
-%patch6
+%patch0 -p0
+%patch1 -p0
+%patch2 -p1
+%patch3 -p0
+%patch4 -p0
+%patch5 -p0
+%patch6 -p0
 
 for i in debugger checker projectInfo compiler ; do 
     pushd modules/$i
@@ -49,7 +51,7 @@
 
 %build
 pushd modules/projectInfo
-%configure
+%configure --libdir=%{tcl_sitelib} --datadir=%{tcl_sitelib}
 make %{?_smp_mflags}
 popd
 
@@ -59,17 +61,18 @@
 make install DESTDIR=$RPM_BUILD_ROOT
 popd
 mkdir -p $RPM_BUILD_ROOT%{_bindir}
-sed -e 's#@imagedir@#%{_datadir}/tcldebugger1.4#' < modules/debugger/src/startup.tcl > $RPM_BUILD_ROOT/%{_bindir}/prodebug
+sed -e 's#@imagedir@#%{tcl_sitelib}/tcldebugger1.4#' < modules/debugger/src/startup.tcl > $RPM_BUILD_ROOT/%{_bindir}/prodebug
 chmod 755 $RPM_BUILD_ROOT/%{_bindir}/prodebug
 install -m 755 modules/checker/src/startup.tcl $RPM_BUILD_ROOT/%{_bindir}/procheck
 install -m 755 modules/compiler/src/startup.tcl $RPM_BUILD_ROOT/%{_bindir}/procompile
 
 # The Tcl compiler application needs an extra file/package to run.
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/procomp1.5
-install -m 644 %{SOURCE3} modules/compiler/src/procomp.tcl $RPM_BUILD_ROOT/%{_datadir}/procomp1.5/
+mkdir -p $RPM_BUILD_ROOT%{tcl_sitelib}/procomp1.5
+install -m 644 modules/compiler/src/procomp.tcl $RPM_BUILD_ROOT/%{tcl_sitelib}/procomp1.5/
+install -m 644 %{SOURCE3} $RPM_BUILD_ROOT/%{tcl_sitelib}/procomp1.5/pkgIndex.tcl
 
 # Fix a few file permissions for rpmlint
-chmod a-x $RPM_BUILD_ROOT%{_datadir}/projectInfo1.4/*.tcl
+chmod a-x $RPM_BUILD_ROOT%{tcl_sitelib}/projectInfo1.4/*.tcl
 
 
 desktop-file-install --vendor fedora                            \
@@ -82,19 +85,33 @@
 rm -rf $RPM_BUILD_ROOT
 
 %files
-%doc ChangeLog
 %defattr(-,root,root)
+%doc ChangeLog
 %{_bindir}/procheck
 %{_bindir}/prodebug
 %{_bindir}/procompile
-%{_datadir}/procomp1.5
-%{_datadir}/projectInfo1.4
+%{tcl_sitelib}/procomp1.5
+%{tcl_sitelib}/projectInfo1.4
 %{_datadir}/applications/fedora-tclpro.desktop
 %{_datadir}/pixmaps/prodebug.png
 
 %changelog
+* Wed Jan 28 2009 Wart <wart at kobold.org> 1.5.0-11.20061030cvs
+- Rebuild for EPEL4
+
+* Sat Dec 15 2007 Wart <wart at kobold.org> 1.5.0-10.20061030cvs
+- Fix startup bug with procompile (BZ #425807)
+
+* Tue Aug 21 2007 Wart <wart at kobold.org> 1.5.0-9.20061030cvs
 - License tag clarification
 
+* Sat Aug 11 2007 Wart <wart at kobold.org> 1.5.0-8.20061030cvs
+- Use correct version in .desktop file
+- Clean up .desktop file categories
+
+* Sat Jun 2 2007 Wart <wart at kobold.org> 1.5.0-7.20061030cvs
+- Move to a tcl-specific directory for faster loading
+
 * Tue Oct 31 2006 Wart <wart at kobold.org> 1.5.0-6.20061030cvs
 - Initial package for Fedora
 



From wtogami at fedoraproject.org  Wed Jan 28 22:49:07 2009
From: wtogami at fedoraproject.org (=?utf-8?b?V2FycmVuIFRvZ2FtaSDnoKXkuIrli4c=?=)
Date: Wed, 28 Jan 2009 22:49:07 +0000 (UTC)
Subject: rpms/ldm/F-9 ldm-2.0.30-nbd-update.patch, NONE, 1.1 ldm.spec, 1.31,
	1.32
Message-ID: <20090128224907.6AEB170142@cvs1.fedora.phx.redhat.com>

Author: wtogami

Update of /cvs/pkgs/rpms/ldm/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5502

Modified Files:
	ldm.spec 
Added Files:
	ldm-2.0.30-nbd-update.patch 
Log Message:
Fix nbd update checker


ldm-2.0.30-nbd-update.patch:

--- NEW FILE ldm-2.0.30-nbd-update.patch ---
diff -urN ldm-2.0.30.orig/rc.d/I00-nbd-checkupdate ldm-2.0.30/rc.d/I00-nbd-checkupdate
--- ldm-2.0.30.orig/rc.d/I00-nbd-checkupdate	2009-01-22 00:12:36.000000000 -0500
+++ ldm-2.0.30/rc.d/I00-nbd-checkupdate	2009-01-28 17:37:25.000000000 -0500
@@ -12,7 +12,7 @@
 
     #Connect and get the squashfs header (contains the creation date)
     nbd-client $nbd_server $nbd_port /dev/nbd9
-    NEW=$(dd if=/dev/nbd9 of=/dev/stdout bs=64 count=1 2> /dev/zero | file -)
+    NEW=$(dd if=/dev/nbd9 of=/dev/stdout bs=64 count=1 2> /dev/zero | sha1sum -)
     nbd-client -d /dev/nbd9
 else
     # It's NFS, so just exit
@@ -20,7 +20,7 @@
 fi
 
 #Get the current squashfs information
-CURRENT=$(dd if=$nbd_device of=/dev/stdout bs=64 count=1 2> /dev/zero | file -)
+CURRENT=$(dd if=$nbd_device of=/dev/stdout bs=64 count=1 2> /dev/zero | sha1sum -)
 
 #Exit if we're already running on the latest squashfs
 [ "$NEW" = "$CURRENT" ] && exit


Index: ldm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ldm/F-9/ldm.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- ldm.spec	22 Jan 2009 05:19:50 -0000	1.31
+++ ldm.spec	28 Jan 2009 22:48:36 -0000	1.32
@@ -1,14 +1,15 @@
 Name:           ldm
 Version:        2.0.30
-%define _datestamp .20081218.19
+%define _datestamp .20090127.13
 #Release:        2%{_datestamp}%{?dist}
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        LTSP Display Manager
 
 Group:          User Interface/X
 License:        GPLv2+
 URL:            https://code.launchpad.net/~ltsp-upstream/ltsp/ldm-trunk
 Source0:        ldm-%{version}.tar.bz2
+Patch0:         ldm-2.0.30-nbd-update.patch
 # Artwork by Maureen Duffy <duffy at redhat.com>
 %define theme_version 1.0.2
 Source1:        k12linux-theme-%{theme_version}.tar.bz2
@@ -34,6 +35,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 
 
 %build
@@ -93,6 +95,9 @@
 %config(noreplace) %{_sysconfdir}/ltsp/ldm-global-dmrc
 
 %changelog
+* Wed Jan 28 2009 Warren Togami <wtogami at redhat.com> - 2.0.30-2
+- Fix nbd update checker
+
 * Wed Jan 22 2009 Warren Togami <wtogami at redhat.com> - 2.0.30-1
 - NBD update checker, reboots client automatically if needed
 



From michich at fedoraproject.org  Wed Jan 28 22:50:37 2009
From: michich at fedoraproject.org (Michal Schmidt)
Date: Wed, 28 Jan 2009 22:50:37 +0000 (UTC)
Subject: rpms/icecream/devel
	icecream-0.9.2-create-env-handle-relative-paths-in-ld.so.conf.patch, 
	NONE, 1.1 icecream-0.9.2-create-env-improve-check-for-specs.patch,
	NONE, 1.1 icecream.spec, 1.11, 1.12
Message-ID: <20090128225037.F13A370141@cvs1.fedora.phx.redhat.com>

Author: michich

Update of /cvs/pkgs/rpms/icecream/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6077

Modified Files:
	icecream.spec 
Added Files:
	icecream-0.9.2-create-env-handle-relative-paths-in-ld.so.conf.patch 
	icecream-0.9.2-create-env-improve-check-for-specs.patch 
Log Message:
* Wed Jan 28 2009 Michal Schmidt <mschmidt at redhat.com> - 0.9.2-2
- Fix the create-env script not to crash on relative paths in ld.so.conf.
- No need to build the native environment as root anymore.
- Disable the SELinux policy for now, it needs more work.


icecream-0.9.2-create-env-handle-relative-paths-in-ld.so.conf.patch:

--- NEW FILE icecream-0.9.2-create-env-handle-relative-paths-in-ld.so.conf.patch ---
>From 126bacee1c6f9b85ffca02fd3473fd1165f1c5c2 Mon Sep 17 00:00:00 2001
From: Michal Schmidt <mschmidt at redhat.com>
Date: Wed, 28 Jan 2009 23:39:51 +0100
Subject: [PATCH] icecc-create-env: handle relative paths in ld.so.conf includes

In Fedora ld.so.conf contains an include directive with a relative path.
ldconfig does not accept relative include paths when using -r.
Rewrite includes in ld.so.conf to absolute paths.
---
 client/icecc-create-env |   13 ++++++++++++-
 1 files changed, 12 insertions(+), 1 deletions(-)

diff --git a/client/icecc-create-env b/client/icecc-create-env
index 860b10c..a605c0e 100755
--- a/client/icecc-create-env
+++ b/client/icecc-create-env
@@ -117,7 +117,17 @@ specfile=`$added_gcc -print-file-name=specs`
 if test -n "$specfile" && test "$specfile" != "specs" && test -e "$specfile"; then
   add_file "$specfile"
 fi
-add_file /etc/ld.so.conf
+
+# for ldconfig -r to work, ld.so.conf must not contain relative paths
+# in include directives. Make them absolute.
+tmp_ld_so_conf=`mktemp /tmp/icecc_ld_so_confXXXXXX`
+while read directive path; do
+  if [ "$directive" = "include" -a "${path:0:1}" != "/" ]; then
+    path="/etc/$path"
+  fi
+  echo "$directive $path"
+done </etc/ld.so.conf >$tmp_ld_so_conf
+add_file $tmp_ld_so_conf /etc/ld.so.conf
 
 tempdir=`mktemp -d /tmp/iceccenvXXXXXX`
 # special case for weird multilib setups
@@ -175,3 +185,4 @@ tar -czhf "$mydir/$md5".tar.gz $target_files || {
 }
 cd ..
 rm -rf $tempdir
+rm -f $tmp_ld_so_conf
-- 
1.6.0.6


icecream-0.9.2-create-env-improve-check-for-specs.patch:

--- NEW FILE icecream-0.9.2-create-env-improve-check-for-specs.patch ---
>From d82c9a328c11799cfa87f53fd008e27f0cc0ae9b Mon Sep 17 00:00:00 2001
From: Michal Schmidt <mschmidt at redhat.com>
Date: Wed, 28 Jan 2009 23:34:22 +0100
Subject: [PATCH] icecc-create-env: improve check for "specs"

The check for "specs" would get confused if there was a file
called "specs" in the current directory.
Notice:
  $ gcc -print-file-name=asdfghjkl
  asdfghjkl
i.e. if it does not find anything, it repeats the input name.
---
 client/icecc-create-env |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/client/icecc-create-env b/client/icecc-create-env
index fb8afeb..860b10c 100755
--- a/client/icecc-create-env
+++ b/client/icecc-create-env
@@ -114,7 +114,7 @@ fi
 add_file `$added_gcc -print-prog-name=cc1` /usr/bin/cc1
 add_file `$added_gxx -print-prog-name=cc1plus` /usr/bin/cc1plus
 specfile=`$added_gcc -print-file-name=specs`
-if test -n "$specfile" && test -e "$specfile"; then
+if test -n "$specfile" && test "$specfile" != "specs" && test -e "$specfile"; then
   add_file "$specfile"
 fi
 add_file /etc/ld.so.conf
-- 
1.6.0.6



Index: icecream.spec
===================================================================
RCS file: /cvs/pkgs/rpms/icecream/devel/icecream.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- icecream.spec	13 Nov 2008 14:58:58 -0000	1.11
+++ icecream.spec	28 Jan 2009 22:50:07 -0000	1.12
@@ -1,6 +1,6 @@
 %if 0%{?fedora}
 %bcond_without  fedora
-%bcond_without	selinux
+%bcond_with	selinux
 %else
 %bcond_with	fedora
 # I'd need to modify the policy a bit to make it work on RHEL,
@@ -11,7 +11,7 @@
 
 Name:		icecream
 Version:	0.9.2
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Distributed compiler
 
 Group:		Development/Tools
@@ -27,9 +27,10 @@
 Source7:	initscript-scheduler
 # manpages from http://ftp5.gwdg.de/pub/opensuse/repositories/home:/coolo/openSUSE_11.0/src/icecream-0.9.2-2.1.src.rpm
 Source8:	%{name}-manpages.tar.bz2
-Patch0:		icecream-rename-scheduler.patch
-Patch1:		icecream-cleanup-conffile.patch
-Patch2:		icecream-build-env-as-root.patch
+Patch0:		%{name}-rename-scheduler.patch
+Patch1:		%{name}-cleanup-conffile.patch
+Patch2:		%{name}-0.9.2-create-env-improve-check-for-specs.patch
+Patch3:		%{name}-0.9.2-create-env-handle-relative-paths-in-ld.so.conf.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -78,6 +79,7 @@
 %patch0 -p0
 %patch1 -p0
 %patch2 -p1
+%patch3 -p1
 sed -e 's|@LIBDIR@|%{_libdir}|g' %{SOURCE1} > icecream.sh
 sed -e 's|@LIBDIR@|%{_libdir}|g' %{SOURCE2} > icecream.csh
 mkdir SELinux
@@ -233,6 +235,11 @@
 %{_libdir}/pkgconfig/icecc.pc
 
 %changelog
+* Wed Jan 28 2009 Michal Schmidt <mschmidt at redhat.com> - 0.9.2-2
+- Fix the create-env script not to crash on relative paths in ld.so.conf.
+- No need to build the native environment as root anymore.
+- Disable the SELinux policy for now, it needs more work.
+
 * Thu Nov 13 2008 Michal Schmidt <mschmidt at redhat.com> - 0.9.2-1
 - Update to upstream release 0.9.2.
 - The license is GPLv2+.



From jwilson at fedoraproject.org  Wed Jan 28 22:53:18 2009
From: jwilson at fedoraproject.org (Jarod Wilson)
Date: Wed, 28 Jan 2009 22:53:18 +0000 (UTC)
Subject: rpms/kernel/devel kernel.spec, 1.1244,
	1.1245 linux-2.6-firewire-git-pending.patch, 1.33, 1.34
Message-ID: <20090128225318.CA9A37010D@cvs1.fedora.phx.redhat.com>

Author: jwilson

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7052

Modified Files:
	kernel.spec linux-2.6-firewire-git-pending.patch 
Log Message:
* Wed Jan 28 2009 Jarod Wilson <jarod at redhat.com>
- make 2nd-gen ipod work via firewire again, but w/o neutering throughput
- add fix for firewire-sbp2 dma mapping leak in failure paths



Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1244
retrieving revision 1.1245
diff -u -r1.1244 -r1.1245
--- kernel.spec	28 Jan 2009 21:33:11 -0000	1.1244
+++ kernel.spec	28 Jan 2009 22:52:48 -0000	1.1245
@@ -1778,6 +1778,10 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Wed Jan 28 2009 Jarod Wilson <jarod at redhat.com>
+- make 2nd-gen ipod work via firewire again, but w/o neutering throughput
+- add fix for firewire-sbp2 dma mapping leak in failure paths
+
 * Wed Jan 28 2009 Kyle McMartin <kyle at redhat.com>
 - drm-nouveau.patch: /me sighs in the general direction of ppc.
 

linux-2.6-firewire-git-pending.patch:

Index: linux-2.6-firewire-git-pending.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-firewire-git-pending.patch,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- linux-2.6-firewire-git-pending.patch	27 Jan 2009 04:47:27 -0000	1.33
+++ linux-2.6-firewire-git-pending.patch	28 Jan 2009 22:52:48 -0000	1.34
@@ -278,7 +278,7 @@
 -	 * these iPods do not feature the read_capacity bug according
 -	 * to one report.  Read_capacity behaviour as well as model_id
 -	 * could change due to Apple-supplied firmware updates though.
-+	 * iPod 2nd generation: needs no-page-tables workaround
++	 * iPod 2nd generation: needs 128k max transfer workaround
 +	 * iPod 3rd generation: needs fix-capacity workaround
  	 */
 -
@@ -286,7 +286,7 @@
 +	{
 +		.firmware_revision	= 0x0a2700,
 +		.model			= 0x000000,
-+		.workarounds		= SBP2_WORKAROUND_NO_PAGE_TABLES |
++		.workarounds		= SBP2_WORKAROUND_128K_MAX_TRANS |
 +					  SBP2_WORKAROUND_FIX_CAPACITY,
 +	},
 +	/* iPod 4th generation */ {
@@ -303,3 +303,92 @@
  	blk_queue_max_segment_size(sdev->request_queue, SBP2_MAX_SEG_SIZE);
  
  	return 0;
+Date: Wed, 28 Jan 2009 01:03:34 +0100 (CET)
+From: Stefan Richter <stefanr at s5r6.in-berlin.de>
+Subject: Re: swiotlb default size (64 MB) too small?
+To: FUJITA Tomonori <fujita.tomonori at lab.ntt.co.jp>
+Cc: linux1394-devel at lists.sourceforge.net,
+ linux-kernel at vger.kernel.org,
+ linux-scsi at vger.kernel.org
+
+> FUJITA Tomonori wrote:
+>> On Tue, 27 Jan 2009 18:03:40 +0100 (CET)
+>> Stefan Richter <stefanr at s5r6.in-berlin.de> wrote:
+>>> +	if (orb->page_table_bus)
+>>> +		dma_unmap_single(card_device, orb->page_table_bus,
+>>> +				 sizeof(orb->page_table), DMA_TO_DEVICE);
+>> 
+>> Well, this does not look correct since zero can be a valid dma
+>> address.
+
+
+From: Stefan Richter <stefanr at s5r6.in-berlin.de>
+Subject: firewire: sbp2: fix DMA mapping leak on the failure path
+
+Reported-by: FUJITA Tomonori <fujita.tomonori at lab.ntt.co.jp>
+who also provided a first version of the fix.
+
+Signed-off-by: Stefan Richter <stefanr at s5r6.in-berlin.de>
+---
+ drivers/firewire/fw-sbp2.c |   27 +++++++++++++++++----------
+ 1 file changed, 17 insertions(+), 10 deletions(-)
+
+Index: linux/drivers/firewire/fw-sbp2.c
+===================================================================
+--- linux.orig/drivers/firewire/fw-sbp2.c
++++ linux/drivers/firewire/fw-sbp2.c
+@@ -1323,6 +1323,19 @@ static unsigned int sbp2_status_to_sense
+ 	}
+ }
+ 
++static void sbp2_unmap_scatterlist(struct device *card_device,
++				   struct sbp2_command_orb *orb)
++{
++	if (scsi_sg_count(orb->cmd))
++		dma_unmap_sg(card_device, scsi_sglist(orb->cmd),
++			     scsi_sg_count(orb->cmd),
++			     orb->cmd->sc_data_direction);
++
++	if (orb->request.misc & cpu_to_be32(COMMAND_ORB_PAGE_TABLE_PRESENT))
++		dma_unmap_single(card_device, orb->page_table_bus,
++				 sizeof(orb->page_table), DMA_TO_DEVICE);
++}
++
+ static void complete_command_orb(struct sbp2_orb *base_orb,
+ 				 struct sbp2_status *status)
+ {
+@@ -1364,15 +1377,7 @@ static void complete_command_orb(struct 
+ 
+ 	dma_unmap_single(device->card->device, orb->base.request_bus,
+ 			 sizeof(orb->request), DMA_TO_DEVICE);
+-
+-	if (scsi_sg_count(orb->cmd) > 0)
+-		dma_unmap_sg(device->card->device, scsi_sglist(orb->cmd),
+-			     scsi_sg_count(orb->cmd),
+-			     orb->cmd->sc_data_direction);
+-
+-	if (orb->page_table_bus != 0)
+-		dma_unmap_single(device->card->device, orb->page_table_bus,
+-				 sizeof(orb->page_table), DMA_TO_DEVICE);
++	sbp2_unmap_scatterlist(device->card->device, orb);
+ 
+ 	orb->cmd->result = result;
+ 	orb->done(orb->cmd);
+@@ -1493,8 +1498,10 @@ static int sbp2_scsi_queuecommand(struct
+ 	orb->base.request_bus =
+ 		dma_map_single(device->card->device, &orb->request,
+ 			       sizeof(orb->request), DMA_TO_DEVICE);
+-	if (dma_mapping_error(device->card->device, orb->base.request_bus))
++	if (dma_mapping_error(device->card->device, orb->base.request_bus)) {
++		sbp2_unmap_scatterlist(device->card->device, orb);
+ 		goto out;
++	}
+ 
+ 	sbp2_send_orb(&orb->base, lu, lu->tgt->node_id, generation,
+ 		      lu->command_block_agent_address + SBP2_ORB_POINTER);
+
+-- 
+Stefan Richter
+-=====-==--= ---= ===--
+http://arcgraph.de/sr/
+



From caolanm at fedoraproject.org  Wed Jan 28 23:29:23 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Wed, 28 Jan 2009 23:29:23 +0000 (UTC)
Subject: rpms/openoffice.org/devel openoffice.org.spec,1.1773,1.1774
Message-ID: <20090128232924.2E19A7010D@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11738

Modified Files:
	openoffice.org.spec 
Log Message:
Resolves: rhbz#477435 more font foo


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1773
retrieving revision 1.1774
diff -u -r1.1773 -r1.1774
--- openoffice.org.spec	27 Jan 2009 09:22:12 -0000	1.1773
+++ openoffice.org.spec	28 Jan 2009 23:28:52 -0000	1.1774
@@ -3243,6 +3243,7 @@
     unopkg list --shared > /dev/null 2>&1 || :
 
 %_font_pkg -n %{fontname} opens___.ttf
+%dir %{_fontdir}
 
 %files calc-core
 %defattr(-,root,root,-)



From pfj at fedoraproject.org  Wed Jan 28 23:43:19 2009
From: pfj at fedoraproject.org (Paul F. Johnson)
Date: Wed, 28 Jan 2009 23:43:19 +0000 (UTC)
Subject: rpms/xsp/F-10 import.log,1.4,1.5 xsp.spec,1.26,1.27
Message-ID: <20090128234319.A1E177010D@cvs1.fedora.phx.redhat.com>

Author: pfj

Update of /cvs/pkgs/rpms/xsp/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14912/F-10

Modified Files:
	import.log xsp.spec 
Log Message:

Remove BR not available in mono-2.2 



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/xsp/F-10/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- import.log	16 Jan 2009 21:28:34 -0000	1.4
+++ import.log	28 Jan 2009 23:42:49 -0000	1.5
@@ -2,3 +2,4 @@
 xsp-2_0-2_fc10:HEAD:xsp-2.0-2.fc10.src.rpm:1221075950
 xsp-2_0-4_fc10:HEAD:xsp-2.0-4.fc10.src.rpm:1222991981
 xsp-2_2-1_fc11:F-10:xsp-2.2-1.fc11.src.rpm:1232141271
+xsp-2_2-2_fc11:F-10:xsp-2.2-2.fc11.src.rpm:1233186125


Index: xsp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xsp/F-10/xsp.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- xsp.spec	16 Jan 2009 21:28:34 -0000	1.26
+++ xsp.spec	28 Jan 2009 23:42:49 -0000	1.27
@@ -1,11 +1,11 @@
 Name:     	xsp
 Version: 	2.2
-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
 Source0:	%{name}-%{version}.tar.bz2
-BuildRequires:	mono-web-devel, mono-data, mono-devel >= 2.0, pkgconfig, autoconf automake mono-data-sqlite mono-nunit-devel
+BuildRequires:	mono-data, mono-devel >= 2.2, pkgconfig, autoconf automake mono-data-sqlite mono-nunit-devel
 BuildRequires:	mono-jscript, mono-data-oracle
 Requires:	mono-core >= 2.0
 Summary:	A small web server that hosts ASP.NET
@@ -96,6 +96,9 @@
 %{_libdir}/xsp/test
 
 %changelog
+* Wed Jan 28 2009 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.2-2
+- removed BR only in 2.4
+
 * Fri Jan 16 2009 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.2-1
 - Update to release version
 



From twaugh at fedoraproject.org  Wed Jan 28 23:44:59 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Wed, 28 Jan 2009 23:44:59 +0000 (UTC)
Subject: rpms/system-config-printer/devel system-config-printer.spec, 1.241, 
	1.242
Message-ID: <20090128234459.8D3417010D@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-serv15289

Modified Files:
	system-config-printer.spec 
Log Message:
* Wed Jan 28 2009 Tim Waugh <twaugh at redhat.com>
- Requires python-sexy.



Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/devel/system-config-printer.spec,v
retrieving revision 1.241
retrieving revision 1.242
diff -u -r1.241 -r1.242
--- system-config-printer.spec	15 Jan 2009 12:56:18 -0000	1.241
+++ system-config-printer.spec	28 Jan 2009 23:44:29 -0000	1.242
@@ -36,6 +36,7 @@
 Requires: notification-daemon
 Requires: notify-python
 Requires: gnome-python2-gnomekeyring
+Requires: python-sexy
 
 Obsoletes: system-config-printer-gui <= 0.6.152
 Provides: system-config-printer-gui = 0.6.152
@@ -161,6 +162,9 @@
 exit 0
 
 %changelog
+* Wed Jan 28 2009 Tim Waugh <twaugh at redhat.com>
+- Requires python-sexy.
+
 * Thu Jan 15 2009 Tim Waugh <twaugh at redhat.com> 1.1.2-1
 - 1.1.2.
 - Requires gnome-python2-gnomekeyring.



From pfj at fedoraproject.org  Wed Jan 28 23:50:24 2009
From: pfj at fedoraproject.org (Paul F. Johnson)
Date: Wed, 28 Jan 2009 23:50:24 +0000 (UTC)
Subject: rpms/mono-debugger/F-10 import.log, 1.4, 1.5 mono-debugger.spec,
	1.17, 1.18
Message-ID: <20090128235024.49C4F7010D@cvs1.fedora.phx.redhat.com>

Author: pfj

Update of /cvs/pkgs/rpms/mono-debugger/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16060/F-10

Modified Files:
	import.log mono-debugger.spec 
Log Message:

Added sed fix for libdir issue with gacutil 



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/mono-debugger/F-10/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- import.log	16 Jan 2009 21:31:25 -0000	1.4
+++ import.log	28 Jan 2009 23:49:53 -0000	1.5
@@ -2,3 +2,4 @@
 mono-debugger-2_0-4_fc10:HEAD:mono-debugger-2.0-4.fc10.src.rpm:1219791256
 mono-debugger-2_0-5_fc10:HEAD:mono-debugger-2.0-5.fc10.src.rpm:1219792595
 mono-debugger-2_2-1_fc11:F-10:mono-debugger-2.2-1.fc11.src.rpm:1232141443
+mono-debugger-2_2-2_fc11:F-10:mono-debugger-2.2-2.fc11.src.rpm:1233186553


Index: mono-debugger.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mono-debugger/F-10/mono-debugger.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- mono-debugger.spec	16 Jan 2009 21:31:25 -0000	1.17
+++ mono-debugger.spec	28 Jan 2009 23:49:53 -0000	1.18
@@ -1,7 +1,7 @@
 Summary: A debugger for Mono
 Name: mono-debugger
 Version: 2.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: MIT
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 URL: http://www.go-mono.com/sources-stable/
@@ -52,6 +52,9 @@
 
 # Copy something that we know got built from source.
 # This doesn't end up in the package, though.
+
+sed -i -e 's!$(prefix)/lib!%{_libdir}!g' configure.in
+
 cp %{_libdir}/mono/gac/Mono.Cecil/*/Mono.Cecil.dll build/
 autoreconf -f -i -s
 
@@ -86,6 +89,9 @@
 %{_libdir}/pkgconfig/mono-debugger.pc
 
 %changelog
+* Wed Jan 28 2009 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.2-2
+- added sed line to fix gacutil libdir issue
+
 * Fri Jan 16 2009 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.2-1
 - bump to 2.2 release
 



From pfj at fedoraproject.org  Wed Jan 28 23:53:51 2009
From: pfj at fedoraproject.org (Paul F. Johnson)
Date: Wed, 28 Jan 2009 23:53:51 +0000 (UTC)
Subject: rpms/mono-cecil-flowanalysis/F-10 import.log, NONE,
	1.1 mono-cecil-flowanalysis.spec, 1.4, 1.5
Message-ID: <20090128235351.F0E5070113@cvs1.fedora.phx.redhat.com>

Author: pfj

Update of /cvs/pkgs/rpms/mono-cecil-flowanalysis/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17367/F-10

Modified Files:
	mono-cecil-flowanalysis.spec 
Added Files:
	import.log 
Log Message:

Rebuild for mono-2.2 



--- NEW FILE import.log ---
mono-cecil-flowanalysis-0_1-0_7_20080409svn100264_fc11:F-10:mono-cecil-flowanalysis-0.1-0.7.20080409svn100264.fc11.src.rpm:1233186758


Index: mono-cecil-flowanalysis.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mono-cecil-flowanalysis/F-10/mono-cecil-flowanalysis.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- mono-cecil-flowanalysis.spec	22 Apr 2008 22:02:08 -0000	1.4
+++ mono-cecil-flowanalysis.spec	28 Jan 2009 23:53:21 -0000	1.5
@@ -2,7 +2,7 @@
 
 Name:	 	mono-cecil-flowanalysis
 Version:	0.1
-Release:	0.5.20080409svn100264%{?dist}
+Release:	0.7.20080409svn100264%{?dist}
 Summary:	Flowanalysis engine for Cecil
 URL:		http://anonsvn.mono-project.com/viewcvs/trunk/cecil/flowanalysis/
 License:	MIT
@@ -59,6 +59,12 @@
 %{_libdir}/pkgconfig/cecil-flowanalysis.pc
 
 %changelog
+* Sun Nov 30 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> 0.1-7.5.20080409svn100264.1
+- rebuild again...
+
+* Tue Nov 25 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> 0.1-0.5.20080409svn100264.1
+- rebuild against mono 2.2
+
 * Tue Apr 22 2008 Tom "spot" Callaway <tcallawa at redhat.com> 0.1-0.5.20080409svn100264
 - fix sed invocation
 



From pkgdb at fedoraproject.org  Thu Jan 29 00:08:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 29 Jan 2009 00:08:08 +0000
Subject: [pkgdb] mingw32-libjpeg was added for rjones
Message-ID: <20090129000809.8AA0820860E@bastion.fedora.phx.redhat.com>

kevin has added Package mingw32-libjpeg with summary MinGW Windows Libjpeg library
kevin has approved Package mingw32-libjpeg
kevin has added a Fedora devel branch for mingw32-libjpeg with an owner of rjones
kevin has approved mingw32-libjpeg in Fedora devel
kevin has approved Package mingw32-libjpeg
kevin has set commit to Approved for provenpackager on mingw32-libjpeg (Fedora devel)
kevin has set build to Approved for provenpackager on mingw32-libjpeg (Fedora devel)
kevin has set checkout to Approved for provenpackager on mingw32-libjpeg (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-libjpeg



From pkgdb at fedoraproject.org  Thu Jan 29 00:08:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 29 Jan 2009 00:08:10 +0000
Subject: [pkgdb] mingw32-libjpeg (Fedora EPEL, 5) updated by kevin
Message-ID: <20090129000811.0098B208486@bastion.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for mingw32-libjpeg
kevin has set commit to Approved for provenpackager on mingw32-libjpeg (Fedora EPEL 5)
kevin has set build to Approved for provenpackager on mingw32-libjpeg (Fedora EPEL 5)
kevin has set checkout to Approved for provenpackager on mingw32-libjpeg (Fedora EPEL 5)
kevin approved watchbugzilla on mingw32-libjpeg (Fedora EPEL 5) for berrange
kevin approved watchcommits on mingw32-libjpeg (Fedora EPEL 5) for berrange
kevin approved commit on mingw32-libjpeg (Fedora EPEL 5) for berrange
kevin approved build on mingw32-libjpeg (Fedora EPEL 5) for berrange
kevin approved approveacls on mingw32-libjpeg (Fedora EPEL 5) for berrange
kevin approved watchbugzilla on mingw32-libjpeg (Fedora EPEL 5) for lfarkas
kevin approved watchcommits on mingw32-libjpeg (Fedora EPEL 5) for lfarkas
kevin approved commit on mingw32-libjpeg (Fedora EPEL 5) for lfarkas
kevin approved build on mingw32-libjpeg (Fedora EPEL 5) for lfarkas
kevin approved approveacls on mingw32-libjpeg (Fedora EPEL 5) for lfarkas

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-libjpeg



From pkgdb at fedoraproject.org  Thu Jan 29 00:08:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 29 Jan 2009 00:08:10 +0000
Subject: [pkgdb] mingw32-libjpeg (Fedora, devel) updated by kevin
Message-ID: <20090129000811.103992084A7@bastion.fedora.phx.redhat.com>

kevin approved watchbugzilla on mingw32-libjpeg (Fedora devel) for berrange
kevin approved watchcommits on mingw32-libjpeg (Fedora devel) for berrange
kevin approved commit on mingw32-libjpeg (Fedora devel) for berrange
kevin approved build on mingw32-libjpeg (Fedora devel) for berrange
kevin approved approveacls on mingw32-libjpeg (Fedora devel) for berrange
kevin approved watchbugzilla on mingw32-libjpeg (Fedora devel) for lfarkas
kevin approved watchcommits on mingw32-libjpeg (Fedora devel) for lfarkas
kevin approved commit on mingw32-libjpeg (Fedora devel) for lfarkas
kevin approved build on mingw32-libjpeg (Fedora devel) for lfarkas
kevin approved approveacls on mingw32-libjpeg (Fedora devel) for lfarkas

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-libjpeg



From pkgdb at fedoraproject.org  Thu Jan 29 00:08:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 29 Jan 2009 00:08:10 +0000
Subject: [pkgdb] mingw32-libjpeg (Fedora, 10) updated by kevin
Message-ID: <20090129000811.2293520860A@bastion.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for mingw32-libjpeg
kevin has set commit to Approved for provenpackager on mingw32-libjpeg (Fedora 10)
kevin has set build to Approved for provenpackager on mingw32-libjpeg (Fedora 10)
kevin has set checkout to Approved for provenpackager on mingw32-libjpeg (Fedora 10)
kevin approved watchbugzilla on mingw32-libjpeg (Fedora 10) for berrange
kevin approved watchcommits on mingw32-libjpeg (Fedora 10) for berrange
kevin approved commit on mingw32-libjpeg (Fedora 10) for berrange
kevin approved build on mingw32-libjpeg (Fedora 10) for berrange
kevin approved approveacls on mingw32-libjpeg (Fedora 10) for berrange
kevin approved watchbugzilla on mingw32-libjpeg (Fedora 10) for lfarkas
kevin approved watchcommits on mingw32-libjpeg (Fedora 10) for lfarkas
kevin approved commit on mingw32-libjpeg (Fedora 10) for lfarkas
kevin approved build on mingw32-libjpeg (Fedora 10) for lfarkas
kevin approved approveacls on mingw32-libjpeg (Fedora 10) for lfarkas

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-libjpeg



From kevin at fedoraproject.org  Thu Jan 29 00:08:50 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 29 Jan 2009 00:08:50 +0000 (UTC)
Subject: rpms/mingw32-libjpeg - New directory
Message-ID: <20090129000850.36B9470116@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/mingw32-libjpeg
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsP19657/rpms/mingw32-libjpeg

Log Message:
Directory /cvs/pkgs/rpms/mingw32-libjpeg added to the repository




From kevin at fedoraproject.org  Thu Jan 29 00:08:50 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 29 Jan 2009 00:08:50 +0000 (UTC)
Subject: rpms/mingw32-libjpeg/devel - New directory
Message-ID: <20090129000850.7081270116@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/mingw32-libjpeg/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsP19657/rpms/mingw32-libjpeg/devel

Log Message:
Directory /cvs/pkgs/rpms/mingw32-libjpeg/devel added to the repository




From kevin at fedoraproject.org  Thu Jan 29 00:09:08 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 29 Jan 2009 00:09:08 +0000 (UTC)
Subject: rpms/mingw32-libjpeg Makefile,NONE,1.1
Message-ID: <20090129000908.528B770116@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/mingw32-libjpeg
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsP19657/rpms/mingw32-libjpeg

Added Files:
	Makefile 
Log Message:
Setup of module mingw32-libjpeg


--- NEW FILE Makefile ---
# Top level Makefile for module mingw32-libjpeg
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Jan 29 00:09:08 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 29 Jan 2009 00:09:08 +0000 (UTC)
Subject: rpms/mingw32-libjpeg/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090129000908.BA26670141@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/mingw32-libjpeg/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsP19657/rpms/mingw32-libjpeg/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module mingw32-libjpeg


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: mingw32-libjpeg
# $Id: Makefile,v 1.1 2009/01/29 00:09:08 kevin Exp $
NAME := mingw32-libjpeg
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Jan 29 00:09:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 29 Jan 2009 00:09:25 +0000
Subject: [pkgdb] qtgpsc was added for fab
Message-ID: <20090129000925.AADA2208493@bastion.fedora.phx.redhat.com>

kevin has added Package qtgpsc with summary A client for the gpsd GPS server
kevin has approved Package qtgpsc
kevin has added a Fedora devel branch for qtgpsc with an owner of fab
kevin has approved qtgpsc in Fedora devel
kevin has approved Package qtgpsc
kevin has set commit to Approved for provenpackager on qtgpsc (Fedora devel)
kevin has set build to Approved for provenpackager on qtgpsc (Fedora devel)
kevin has set checkout to Approved for provenpackager on qtgpsc (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qtgpsc



From pkgdb at fedoraproject.org  Thu Jan 29 00:09:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 29 Jan 2009 00:09:28 +0000
Subject: [pkgdb] qtgpsc (Fedora, 9) updated by kevin
Message-ID: <20090129000928.ED6422084A7@bastion.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for qtgpsc
kevin has set commit to Approved for provenpackager on qtgpsc (Fedora 9)
kevin has set build to Approved for provenpackager on qtgpsc (Fedora 9)
kevin has set checkout to Approved for provenpackager on qtgpsc (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qtgpsc



From pkgdb at fedoraproject.org  Thu Jan 29 00:09:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 29 Jan 2009 00:09:28 +0000
Subject: [pkgdb] qtgpsc (Fedora, 10) updated by kevin
Message-ID: <20090129000934.C1240208497@bastion.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for qtgpsc
kevin has set commit to Approved for provenpackager on qtgpsc (Fedora 10)
kevin has set build to Approved for provenpackager on qtgpsc (Fedora 10)
kevin has set checkout to Approved for provenpackager on qtgpsc (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/qtgpsc



From kevin at fedoraproject.org  Thu Jan 29 00:09:43 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 29 Jan 2009 00:09:43 +0000 (UTC)
Subject: rpms/qtgpsc - New directory
Message-ID: <20090129000943.2927670116@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/qtgpsc
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsF19883/rpms/qtgpsc

Log Message:
Directory /cvs/pkgs/rpms/qtgpsc added to the repository




From kevin at fedoraproject.org  Thu Jan 29 00:09:43 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 29 Jan 2009 00:09:43 +0000 (UTC)
Subject: rpms/qtgpsc/devel - New directory
Message-ID: <20090129000943.6935370116@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/qtgpsc/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsF19883/rpms/qtgpsc/devel

Log Message:
Directory /cvs/pkgs/rpms/qtgpsc/devel added to the repository




From kevin at fedoraproject.org  Thu Jan 29 00:10:01 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 29 Jan 2009 00:10:01 +0000 (UTC)
Subject: rpms/qtgpsc Makefile,NONE,1.1
Message-ID: <20090129001001.4302A70116@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/qtgpsc
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsF19883/rpms/qtgpsc

Added Files:
	Makefile 
Log Message:
Setup of module qtgpsc


--- NEW FILE Makefile ---
# Top level Makefile for module qtgpsc
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Jan 29 00:10:01 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 29 Jan 2009 00:10:01 +0000 (UTC)
Subject: rpms/qtgpsc/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <20090129001001.8ECBF70116@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/qtgpsc/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsF19883/rpms/qtgpsc/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module qtgpsc


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: qtgpsc
# $Id: Makefile,v 1.1 2009/01/29 00:10:01 kevin Exp $
NAME := qtgpsc
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Jan 29 00:12:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 29 Jan 2009 00:12:50 +0000
Subject: [pkgdb] bind-to-tinydns was added for timj
Message-ID: <20090129001250.9E94A208484@bastion.fedora.phx.redhat.com>

kevin has added Package bind-to-tinydns with summary Convert DNS zone files in BIND format to tinydns format
kevin has approved Package bind-to-tinydns
kevin has added a Fedora devel branch for bind-to-tinydns with an owner of timj
kevin has approved bind-to-tinydns in Fedora devel
kevin has approved Package bind-to-tinydns
kevin has set commit to Approved for provenpackager on bind-to-tinydns (Fedora devel)
kevin has set build to Approved for provenpackager on bind-to-tinydns (Fedora devel)
kevin has set checkout to Approved for provenpackager on bind-to-tinydns (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bind-to-tinydns



From pkgdb at fedoraproject.org  Thu Jan 29 00:12:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 29 Jan 2009 00:12:52 +0000
Subject: [pkgdb] bind-to-tinydns (Fedora EPEL, 5) updated by kevin
Message-ID: <20090129001252.B5E84208493@bastion.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for bind-to-tinydns
kevin has set commit to Approved for provenpackager on bind-to-tinydns (Fedora EPEL 5)
kevin has set build to Approved for provenpackager on bind-to-tinydns (Fedora EPEL 5)
kevin has set checkout to Approved for provenpackager on bind-to-tinydns (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/bind-to-tinydns



From kevin at fedoraproject.org  Thu Jan 29 00:13:05 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 29 Jan 2009 00:13:05 +0000 (UTC)
Subject: rpms/bind-to-tinydns - New directory
Message-ID: <20090129001305.284DD70116@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/bind-to-tinydns
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsR20428/rpms/bind-to-tinydns

Log Message:
Directory /cvs/pkgs/rpms/bind-to-tinydns added to the repository




From kevin at fedoraproject.org  Thu Jan 29 00:13:05 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 29 Jan 2009 00:13:05 +0000 (UTC)
Subject: rpms/bind-to-tinydns/devel - New directory
Message-ID: <20090129001305.6650B70116@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/bind-to-tinydns/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsR20428/rpms/bind-to-tinydns/devel

Log Message:
Directory /cvs/pkgs/rpms/bind-to-tinydns/devel added to the repository




From kevin at fedoraproject.org  Thu Jan 29 00:13:24 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 29 Jan 2009 00:13:24 +0000 (UTC)
Subject: rpms/bind-to-tinydns/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090129001324.B1DF170141@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/bind-to-tinydns/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsR20428/rpms/bind-to-tinydns/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module bind-to-tinydns


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: bind-to-tinydns
# $Id: Makefile,v 1.1 2009/01/29 00:13:24 kevin Exp $
NAME := bind-to-tinydns
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out 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 Jan 29 00:13:24 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 29 Jan 2009 00:13:24 +0000 (UTC)
Subject: rpms/bind-to-tinydns Makefile,NONE,1.1
Message-ID: <20090129001324.6FD6370116@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/bind-to-tinydns
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsR20428/rpms/bind-to-tinydns

Added Files:
	Makefile 
Log Message:
Setup of module bind-to-tinydns


--- NEW FILE Makefile ---
# Top level Makefile for module bind-to-tinydns
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout 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 Jan 29 00:13:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 29 Jan 2009 00:13:56 +0000
Subject: [pkgdb] emacs-magit was added for tmoertel
Message-ID: <20090129001356.8D948208485@bastion.fedora.phx.redhat.com>

kevin has added Package emacs-magit with summary Emacs interface to the most common Git operations
kevin has approved Package emacs-magit
kevin has added a Fedora devel branch for emacs-magit with an owner of tmoertel
kevin has approved emacs-magit in Fedora devel
kevin has approved Package emacs-magit
kevin has set commit to Approved for provenpackager on emacs-magit (Fedora devel)
kevin has set build to Approved for provenpackager on emacs-magit (Fedora devel)
kevin has set checkout to Approved for provenpackager on emacs-magit (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/emacs-magit



From pkgdb at fedoraproject.org  Thu Jan 29 00:13:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 29 Jan 2009 00:13:57 +0000
Subject: [pkgdb] emacs-magit (Fedora, 9) updated by kevin
Message-ID: <20090129001357.BEAAB208494@bastion.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for emacs-magit
kevin has set commit to Approved for provenpackager on emacs-magit (Fedora 9)
kevin has set build to Approved for provenpackager on emacs-magit (Fedora 9)
kevin has set checkout to Approved for provenpackager on emacs-magit (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/emacs-magit



From kevin at fedoraproject.org  Thu Jan 29 00:14:16 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 29 Jan 2009 00:14:16 +0000 (UTC)
Subject: rpms/emacs-magit - New directory
Message-ID: <20090129001416.3DB4270116@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/emacs-magit
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsm20620/rpms/emacs-magit

Log Message:
Directory /cvs/pkgs/rpms/emacs-magit added to the repository




From kevin at fedoraproject.org  Thu Jan 29 00:14:16 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 29 Jan 2009 00:14:16 +0000 (UTC)
Subject: rpms/emacs-magit/devel - New directory
Message-ID: <20090129001416.8C7D670116@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/emacs-magit/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsm20620/rpms/emacs-magit/devel

Log Message:
Directory /cvs/pkgs/rpms/emacs-magit/devel added to the repository




From pkgdb at fedoraproject.org  Thu Jan 29 00:13:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 29 Jan 2009 00:13:57 +0000
Subject: [pkgdb] emacs-magit (Fedora, 10) updated by kevin
Message-ID: <20090129001357.C9DE2208497@bastion.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for emacs-magit
kevin has set commit to Approved for provenpackager on emacs-magit (Fedora 10)
kevin has set build to Approved for provenpackager on emacs-magit (Fedora 10)
kevin has set checkout to Approved for provenpackager on emacs-magit (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/emacs-magit



From kevin at fedoraproject.org  Thu Jan 29 00:14:36 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 29 Jan 2009 00:14:36 +0000 (UTC)
Subject: rpms/emacs-magit Makefile,NONE,1.1
Message-ID: <20090129001436.C0C8D70116@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/emacs-magit
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsm20620/rpms/emacs-magit

Added Files:
	Makefile 
Log Message:
Setup of module emacs-magit


--- NEW FILE Makefile ---
# Top level Makefile for module emacs-magit
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Jan 29 00:14:37 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 29 Jan 2009 00:14:37 +0000 (UTC)
Subject: rpms/emacs-magit/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090129001437.22A2370116@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/emacs-magit/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsm20620/rpms/emacs-magit/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module emacs-magit


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: emacs-magit
# $Id: Makefile,v 1.1 2009/01/29 00:14:36 kevin Exp $
NAME := emacs-magit
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Jan 29 00:14:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 29 Jan 2009 00:14:58 +0000
Subject: [pkgdb] python-cryptsetup was added for msivak
Message-ID: <20090129001458.99EED208486@bastion.fedora.phx.redhat.com>

kevin has added Package python-cryptsetup with summary Python libraries to ease LUKS manipulation from python code
kevin has approved Package python-cryptsetup
kevin has added a Fedora devel branch for python-cryptsetup with an owner of msivak
kevin has approved python-cryptsetup in Fedora devel
kevin has approved Package python-cryptsetup
kevin has set commit to Approved for provenpackager on python-cryptsetup (Fedora devel)
kevin has set build to Approved for provenpackager on python-cryptsetup (Fedora devel)
kevin has set checkout to Approved for provenpackager on python-cryptsetup (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-cryptsetup



From kevin at fedoraproject.org  Thu Jan 29 00:15:15 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 29 Jan 2009 00:15:15 +0000 (UTC)
Subject: rpms/python-cryptsetup - New directory
Message-ID: <20090129001515.3070370116@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/python-cryptsetup
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsV20882/rpms/python-cryptsetup

Log Message:
Directory /cvs/pkgs/rpms/python-cryptsetup added to the repository




From kevin at fedoraproject.org  Thu Jan 29 00:15:15 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 29 Jan 2009 00:15:15 +0000 (UTC)
Subject: rpms/python-cryptsetup/devel - New directory
Message-ID: <20090129001515.78C7E70141@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/python-cryptsetup/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsV20882/rpms/python-cryptsetup/devel

Log Message:
Directory /cvs/pkgs/rpms/python-cryptsetup/devel added to the repository




From kevin at fedoraproject.org  Thu Jan 29 00:15:35 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 29 Jan 2009 00:15:35 +0000 (UTC)
Subject: rpms/python-cryptsetup Makefile,NONE,1.1
Message-ID: <20090129001535.3E93970116@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/python-cryptsetup
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsV20882/rpms/python-cryptsetup

Added Files:
	Makefile 
Log Message:
Setup of module python-cryptsetup


--- NEW FILE Makefile ---
# Top level Makefile for module python-cryptsetup
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Jan 29 00:15:35 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 29 Jan 2009 00:15:35 +0000 (UTC)
Subject: rpms/python-cryptsetup/devel .cvsignore, NONE, 1.1 Makefile, NONE, 
	1.1 sources, NONE, 1.1
Message-ID: <20090129001535.8791A70116@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/python-cryptsetup/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsV20882/rpms/python-cryptsetup/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module python-cryptsetup


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: python-cryptsetup
# $Id: Makefile,v 1.1 2009/01/29 00:15:35 kevin Exp $
NAME := python-cryptsetup
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Jan 29 00:18:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 29 Jan 2009 00:18:29 +0000
Subject: [pkgdb] findbugs-bcel was added for jjames
Message-ID: <20090129001829.CB2C4208485@bastion.fedora.phx.redhat.com>

kevin has added Package findbugs-bcel with summary Byte Code Engineering Library with findbugs extensions
kevin has approved Package findbugs-bcel
kevin has added a Fedora devel branch for findbugs-bcel with an owner of jjames
kevin has approved findbugs-bcel in Fedora devel
kevin has approved Package findbugs-bcel
kevin has set commit to Approved for provenpackager on findbugs-bcel (Fedora devel)
kevin has set build to Approved for provenpackager on findbugs-bcel (Fedora devel)
kevin has set checkout to Approved for provenpackager on findbugs-bcel (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/findbugs-bcel



From pkgdb at fedoraproject.org  Thu Jan 29 00:18:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 29 Jan 2009 00:18:30 +0000
Subject: [pkgdb] findbugs-bcel (Fedora, 10) updated by kevin
Message-ID: <20090129001830.C9E53208494@bastion.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for findbugs-bcel
kevin has set commit to Approved for provenpackager on findbugs-bcel (Fedora 10)
kevin has set build to Approved for provenpackager on findbugs-bcel (Fedora 10)
kevin has set checkout to Approved for provenpackager on findbugs-bcel (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/findbugs-bcel



From kevin at fedoraproject.org  Thu Jan 29 00:18:42 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 29 Jan 2009 00:18:42 +0000 (UTC)
Subject: rpms/findbugs-bcel - New directory
Message-ID: <20090129001842.2528170116@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/findbugs-bcel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsS21357/rpms/findbugs-bcel

Log Message:
Directory /cvs/pkgs/rpms/findbugs-bcel added to the repository




From kevin at fedoraproject.org  Thu Jan 29 00:18:42 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 29 Jan 2009 00:18:42 +0000 (UTC)
Subject: rpms/findbugs-bcel/devel - New directory
Message-ID: <20090129001842.5F49F70116@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/findbugs-bcel/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsS21357/rpms/findbugs-bcel/devel

Log Message:
Directory /cvs/pkgs/rpms/findbugs-bcel/devel added to the repository




From kevin at fedoraproject.org  Thu Jan 29 00:18:57 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 29 Jan 2009 00:18:57 +0000 (UTC)
Subject: rpms/findbugs-bcel Makefile,NONE,1.1
Message-ID: <20090129001857.BC7A770116@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/findbugs-bcel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsS21357/rpms/findbugs-bcel

Added Files:
	Makefile 
Log Message:
Setup of module findbugs-bcel


--- NEW FILE Makefile ---
# Top level Makefile for module findbugs-bcel
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Jan 29 00:18:58 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 29 Jan 2009 00:18:58 +0000 (UTC)
Subject: rpms/findbugs-bcel/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090129001858.06AE070116@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/findbugs-bcel/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsS21357/rpms/findbugs-bcel/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module findbugs-bcel


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: findbugs-bcel
# $Id: Makefile,v 1.1 2009/01/29 00:18:57 kevin Exp $
NAME := findbugs-bcel
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Jan 29 00:19:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 29 Jan 2009 00:19:19 +0000
Subject: [pkgdb] pipviewer was added for fab
Message-ID: <20090129001919.8FEAF208495@bastion.fedora.phx.redhat.com>

kevin has added Package pipviewer with summary Visualizer for multiple alignments of genomic sequences
kevin has approved Package pipviewer
kevin has added a Fedora devel branch for pipviewer with an owner of fab
kevin has approved pipviewer in Fedora devel
kevin has approved Package pipviewer
kevin has set commit to Approved for provenpackager on pipviewer (Fedora devel)
kevin has set build to Approved for provenpackager on pipviewer (Fedora devel)
kevin has set checkout to Approved for provenpackager on pipviewer (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pipviewer



From pkgdb at fedoraproject.org  Thu Jan 29 00:19:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 29 Jan 2009 00:19:21 +0000
Subject: [pkgdb] pipviewer (Fedora, 9) updated by kevin
Message-ID: <20090129001921.543242084A7@bastion.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for pipviewer
kevin has set commit to Approved for provenpackager on pipviewer (Fedora 9)
kevin has set build to Approved for provenpackager on pipviewer (Fedora 9)
kevin has set checkout to Approved for provenpackager on pipviewer (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pipviewer



From pkgdb at fedoraproject.org  Thu Jan 29 00:19:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 29 Jan 2009 00:19:21 +0000
Subject: [pkgdb] pipviewer (Fedora, 10) updated by kevin
Message-ID: <20090129001921.635712084BD@bastion.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for pipviewer
kevin has set commit to Approved for provenpackager on pipviewer (Fedora 10)
kevin has set build to Approved for provenpackager on pipviewer (Fedora 10)
kevin has set checkout to Approved for provenpackager on pipviewer (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pipviewer



From kevin at fedoraproject.org  Thu Jan 29 00:19:32 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 29 Jan 2009 00:19:32 +0000 (UTC)
Subject: rpms/pipviewer - New directory
Message-ID: <20090129001932.22DC370116@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/pipviewer
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsW21548/rpms/pipviewer

Log Message:
Directory /cvs/pkgs/rpms/pipviewer added to the repository




From kevin at fedoraproject.org  Thu Jan 29 00:19:32 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 29 Jan 2009 00:19:32 +0000 (UTC)
Subject: rpms/pipviewer/devel - New directory
Message-ID: <20090129001932.53DB870116@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/pipviewer/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsW21548/rpms/pipviewer/devel

Log Message:
Directory /cvs/pkgs/rpms/pipviewer/devel added to the repository




From kevin at fedoraproject.org  Thu Jan 29 00:19:49 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 29 Jan 2009 00:19:49 +0000 (UTC)
Subject: rpms/pipviewer Makefile,NONE,1.1
Message-ID: <20090129001949.29D5A70116@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/pipviewer
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsW21548/rpms/pipviewer

Added Files:
	Makefile 
Log Message:
Setup of module pipviewer


--- NEW FILE Makefile ---
# Top level Makefile for module pipviewer
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Jan 29 00:19:49 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 29 Jan 2009 00:19:49 +0000 (UTC)
Subject: rpms/pipviewer/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090129001949.6C8CE70116@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/pipviewer/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsW21548/rpms/pipviewer/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module pipviewer


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: pipviewer
# $Id: Makefile,v 1.1 2009/01/29 00:19:49 kevin Exp $
NAME := pipviewer
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Jan 29 00:20:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 29 Jan 2009 00:20:03 +0000
Subject: [pkgdb] pysnmp was added for fab
Message-ID: <20090129002003.8440A208201@bastion.fedora.phx.redhat.com>

kevin has added Package pysnmp with summary SNMP engine written in Python
kevin has approved Package pysnmp
kevin has added a Fedora devel branch for pysnmp with an owner of fab
kevin has approved pysnmp in Fedora devel
kevin has approved Package pysnmp
kevin has set commit to Approved for provenpackager on pysnmp (Fedora devel)
kevin has set build to Approved for provenpackager on pysnmp (Fedora devel)
kevin has set checkout to Approved for provenpackager on pysnmp (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pysnmp



From pkgdb at fedoraproject.org  Thu Jan 29 00:20:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 29 Jan 2009 00:20:05 +0000
Subject: [pkgdb] pysnmp (Fedora, 9) updated by kevin
Message-ID: <20090129002006.217092084B6@bastion.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for pysnmp
kevin has set commit to Approved for provenpackager on pysnmp (Fedora 9)
kevin has set build to Approved for provenpackager on pysnmp (Fedora 9)
kevin has set checkout to Approved for provenpackager on pysnmp (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pysnmp



From pkgdb at fedoraproject.org  Thu Jan 29 00:20:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 29 Jan 2009 00:20:05 +0000
Subject: [pkgdb] pysnmp (Fedora, 10) updated by kevin
Message-ID: <20090129002006.B3615208494@bastion.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for pysnmp
kevin has set commit to Approved for provenpackager on pysnmp (Fedora 10)
kevin has set build to Approved for provenpackager on pysnmp (Fedora 10)
kevin has set checkout to Approved for provenpackager on pysnmp (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/pysnmp



From kevin at fedoraproject.org  Thu Jan 29 00:20:18 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 29 Jan 2009 00:20:18 +0000 (UTC)
Subject: rpms/pysnmp - New directory
Message-ID: <20090129002018.2AD9670116@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/pysnmp
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsK21760/rpms/pysnmp

Log Message:
Directory /cvs/pkgs/rpms/pysnmp added to the repository




From kevin at fedoraproject.org  Thu Jan 29 00:20:18 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 29 Jan 2009 00:20:18 +0000 (UTC)
Subject: rpms/pysnmp/devel - New directory
Message-ID: <20090129002018.6A94F70116@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/pysnmp/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsK21760/rpms/pysnmp/devel

Log Message:
Directory /cvs/pkgs/rpms/pysnmp/devel added to the repository




From kevin at fedoraproject.org  Thu Jan 29 00:20:34 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 29 Jan 2009 00:20:34 +0000 (UTC)
Subject: rpms/pysnmp Makefile,NONE,1.1
Message-ID: <20090129002034.7CA1370116@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/pysnmp
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsK21760/rpms/pysnmp

Added Files:
	Makefile 
Log Message:
Setup of module pysnmp


--- NEW FILE Makefile ---
# Top level Makefile for module pysnmp
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Jan 29 00:20:34 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 29 Jan 2009 00:20:34 +0000 (UTC)
Subject: rpms/pysnmp/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <20090129002034.C6CFC70141@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/pysnmp/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsK21760/rpms/pysnmp/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module pysnmp


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: pysnmp
# $Id: Makefile,v 1.1 2009/01/29 00:20:34 kevin Exp $
NAME := pysnmp
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Jan 29 00:21:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 29 Jan 2009 00:21:15 +0000
Subject: [pkgdb] perl-DBIx-Safe was added for itamarjp
Message-ID: <20090129002115.4FE62208484@bastion.fedora.phx.redhat.com>

kevin has added Package perl-DBIx-Safe with summary Safer access to your database through a DBI database handle
kevin has approved Package perl-DBIx-Safe
kevin has added a Fedora devel branch for perl-DBIx-Safe with an owner of itamarjp
kevin has approved perl-DBIx-Safe in Fedora devel
kevin has approved Package perl-DBIx-Safe
kevin has set commit to Approved for provenpackager on perl-DBIx-Safe (Fedora devel)
kevin has set build to Approved for provenpackager on perl-DBIx-Safe (Fedora devel)
kevin has set checkout to Approved for provenpackager on perl-DBIx-Safe (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-DBIx-Safe



From pkgdb at fedoraproject.org  Thu Jan 29 00:21:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 29 Jan 2009 00:21:19 +0000
Subject: [pkgdb] perl-DBIx-Safe (Fedora, 9) updated by kevin
Message-ID: <20090129002119.7063D208493@bastion.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for perl-DBIx-Safe
kevin has set commit to Approved for provenpackager on perl-DBIx-Safe (Fedora 9)
kevin has set build to Approved for provenpackager on perl-DBIx-Safe (Fedora 9)
kevin has set checkout to Approved for provenpackager on perl-DBIx-Safe (Fedora 9)
kevin approved watchbugzilla on perl-DBIx-Safe (Fedora 9) for perl-sig
kevin approved watchcommits on perl-DBIx-Safe (Fedora 9) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-DBIx-Safe



From pkgdb at fedoraproject.org  Thu Jan 29 00:21:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 29 Jan 2009 00:21:19 +0000
Subject: [pkgdb] perl-DBIx-Safe (Fedora, 10) updated by kevin
Message-ID: <20090129002119.875D62084B6@bastion.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for perl-DBIx-Safe
kevin has set commit to Approved for provenpackager on perl-DBIx-Safe (Fedora 10)
kevin has set build to Approved for provenpackager on perl-DBIx-Safe (Fedora 10)
kevin has set checkout to Approved for provenpackager on perl-DBIx-Safe (Fedora 10)
kevin approved watchbugzilla on perl-DBIx-Safe (Fedora 10) for perl-sig
kevin approved watchcommits on perl-DBIx-Safe (Fedora 10) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-DBIx-Safe



From pkgdb at fedoraproject.org  Thu Jan 29 00:21:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 29 Jan 2009 00:21:19 +0000
Subject: [pkgdb] perl-DBIx-Safe (Fedora, devel) updated by kevin
Message-ID: <20090129002119.7A9B0208496@bastion.fedora.phx.redhat.com>

kevin approved watchbugzilla on perl-DBIx-Safe (Fedora devel) for perl-sig
kevin approved watchcommits on perl-DBIx-Safe (Fedora devel) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-DBIx-Safe



From kevin at fedoraproject.org  Thu Jan 29 00:21:33 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 29 Jan 2009 00:21:33 +0000 (UTC)
Subject: rpms/perl-DBIx-Safe/devel - New directory
Message-ID: <20090129002133.75F0770117@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-DBIx-Safe/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsy22057/rpms/perl-DBIx-Safe/devel

Log Message:
Directory /cvs/pkgs/rpms/perl-DBIx-Safe/devel added to the repository




From kevin at fedoraproject.org  Thu Jan 29 00:21:33 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 29 Jan 2009 00:21:33 +0000 (UTC)
Subject: rpms/perl-DBIx-Safe - New directory
Message-ID: <20090129002133.267EA70116@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-DBIx-Safe
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsy22057/rpms/perl-DBIx-Safe

Log Message:
Directory /cvs/pkgs/rpms/perl-DBIx-Safe added to the repository




From kevin at fedoraproject.org  Thu Jan 29 00:21:51 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 29 Jan 2009 00:21:51 +0000 (UTC)
Subject: rpms/perl-DBIx-Safe Makefile,NONE,1.1
Message-ID: <20090129002151.15AA170116@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-DBIx-Safe
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsy22057/rpms/perl-DBIx-Safe

Added Files:
	Makefile 
Log Message:
Setup of module perl-DBIx-Safe


--- NEW FILE Makefile ---
# Top level Makefile for module perl-DBIx-Safe
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Jan 29 00:21:51 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 29 Jan 2009 00:21:51 +0000 (UTC)
Subject: rpms/perl-DBIx-Safe/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090129002151.6721870116@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-DBIx-Safe/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsy22057/rpms/perl-DBIx-Safe/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-DBIx-Safe


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: perl-DBIx-Safe
# $Id: Makefile,v 1.1 2009/01/29 00:21:51 kevin Exp $
NAME := perl-DBIx-Safe
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Jan 29 00:22:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 29 Jan 2009 00:22:04 +0000
Subject: [pkgdb] mingw32-pixman was added for rjones
Message-ID: <20090129002204.C72422084B7@bastion.fedora.phx.redhat.com>

kevin has added Package mingw32-pixman with summary MinGW Windows Pixman library
kevin has approved Package mingw32-pixman
kevin has added a Fedora devel branch for mingw32-pixman with an owner of rjones
kevin has approved mingw32-pixman in Fedora devel
kevin has approved Package mingw32-pixman
kevin has set commit to Approved for provenpackager on mingw32-pixman (Fedora devel)
kevin has set build to Approved for provenpackager on mingw32-pixman (Fedora devel)
kevin has set checkout to Approved for provenpackager on mingw32-pixman (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-pixman



From pkgdb at fedoraproject.org  Thu Jan 29 00:22:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 29 Jan 2009 00:22:07 +0000
Subject: [pkgdb] mingw32-pixman (Fedora EPEL, 5) updated by kevin
Message-ID: <20090129002208.023FC20866E@bastion.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for mingw32-pixman
kevin has set commit to Approved for provenpackager on mingw32-pixman (Fedora EPEL 5)
kevin has set build to Approved for provenpackager on mingw32-pixman (Fedora EPEL 5)
kevin has set checkout to Approved for provenpackager on mingw32-pixman (Fedora EPEL 5)
kevin approved watchbugzilla on mingw32-pixman (Fedora EPEL 5) for berrange
kevin approved watchcommits on mingw32-pixman (Fedora EPEL 5) for berrange
kevin approved commit on mingw32-pixman (Fedora EPEL 5) for berrange
kevin approved build on mingw32-pixman (Fedora EPEL 5) for berrange
kevin approved approveacls on mingw32-pixman (Fedora EPEL 5) for berrange
kevin approved watchbugzilla on mingw32-pixman (Fedora EPEL 5) for lfarkas
kevin approved watchcommits on mingw32-pixman (Fedora EPEL 5) for lfarkas
kevin approved commit on mingw32-pixman (Fedora EPEL 5) for lfarkas
kevin approved build on mingw32-pixman (Fedora EPEL 5) for lfarkas
kevin approved approveacls on mingw32-pixman (Fedora EPEL 5) for lfarkas

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-pixman



From pkgdb at fedoraproject.org  Thu Jan 29 00:22:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 29 Jan 2009 00:22:07 +0000
Subject: [pkgdb] mingw32-pixman (Fedora, devel) updated by kevin
Message-ID: <20090129002208.6C853208700@bastion.fedora.phx.redhat.com>

kevin approved watchbugzilla on mingw32-pixman (Fedora devel) for berrange
kevin approved watchcommits on mingw32-pixman (Fedora devel) for berrange
kevin approved commit on mingw32-pixman (Fedora devel) for berrange
kevin approved build on mingw32-pixman (Fedora devel) for berrange
kevin approved approveacls on mingw32-pixman (Fedora devel) for berrange
kevin approved watchbugzilla on mingw32-pixman (Fedora devel) for lfarkas
kevin approved watchcommits on mingw32-pixman (Fedora devel) for lfarkas
kevin approved commit on mingw32-pixman (Fedora devel) for lfarkas
kevin approved build on mingw32-pixman (Fedora devel) for lfarkas
kevin approved approveacls on mingw32-pixman (Fedora devel) for lfarkas

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-pixman



From pkgdb at fedoraproject.org  Thu Jan 29 00:22:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 29 Jan 2009 00:22:07 +0000
Subject: [pkgdb] mingw32-pixman (Fedora, 10) updated by kevin
Message-ID: <20090129002208.78E7720873F@bastion.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for mingw32-pixman
kevin has set commit to Approved for provenpackager on mingw32-pixman (Fedora 10)
kevin has set build to Approved for provenpackager on mingw32-pixman (Fedora 10)
kevin has set checkout to Approved for provenpackager on mingw32-pixman (Fedora 10)
kevin approved watchbugzilla on mingw32-pixman (Fedora 10) for berrange
kevin approved watchcommits on mingw32-pixman (Fedora 10) for berrange
kevin approved commit on mingw32-pixman (Fedora 10) for berrange
kevin approved build on mingw32-pixman (Fedora 10) for berrange
kevin approved approveacls on mingw32-pixman (Fedora 10) for berrange
kevin approved watchbugzilla on mingw32-pixman (Fedora 10) for lfarkas
kevin approved watchcommits on mingw32-pixman (Fedora 10) for lfarkas
kevin approved commit on mingw32-pixman (Fedora 10) for lfarkas
kevin approved build on mingw32-pixman (Fedora 10) for lfarkas
kevin approved approveacls on mingw32-pixman (Fedora 10) for lfarkas

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-pixman



From kevin at fedoraproject.org  Thu Jan 29 00:22:24 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 29 Jan 2009 00:22:24 +0000 (UTC)
Subject: rpms/mingw32-pixman - New directory
Message-ID: <20090129002224.3218A70116@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/mingw32-pixman
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsz22269/rpms/mingw32-pixman

Log Message:
Directory /cvs/pkgs/rpms/mingw32-pixman added to the repository




From kevin at fedoraproject.org  Thu Jan 29 00:22:24 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 29 Jan 2009 00:22:24 +0000 (UTC)
Subject: rpms/mingw32-pixman/devel - New directory
Message-ID: <20090129002224.6816C70141@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/mingw32-pixman/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsz22269/rpms/mingw32-pixman/devel

Log Message:
Directory /cvs/pkgs/rpms/mingw32-pixman/devel added to the repository




From kevin at fedoraproject.org  Thu Jan 29 00:22:39 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 29 Jan 2009 00:22:39 +0000 (UTC)
Subject: rpms/mingw32-pixman Makefile,NONE,1.1
Message-ID: <20090129002239.C2B4B70116@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/mingw32-pixman
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsz22269/rpms/mingw32-pixman

Added Files:
	Makefile 
Log Message:
Setup of module mingw32-pixman


--- NEW FILE Makefile ---
# Top level Makefile for module mingw32-pixman
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Jan 29 00:22:40 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 29 Jan 2009 00:22:40 +0000 (UTC)
Subject: rpms/mingw32-pixman/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090129002240.04D9770116@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/mingw32-pixman/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsz22269/rpms/mingw32-pixman/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module mingw32-pixman


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: mingw32-pixman
# $Id: Makefile,v 1.1 2009/01/29 00:22:39 kevin Exp $
NAME := mingw32-pixman
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Jan 29 00:26:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 29 Jan 2009 00:26:10 +0000
Subject: [pkgdb] fail2ban (Fedora EPEL, 4) updated by kevin
Message-ID: <20090129002610.981AB208485@bastion.fedora.phx.redhat.com>

kevin changed owner of fail2ban in Fedora EPEL 4 to maxamillion

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fail2ban



From pkgdb at fedoraproject.org  Thu Jan 29 00:26:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 29 Jan 2009 00:26:10 +0000
Subject: [pkgdb] fail2ban (Fedora EPEL, 5) updated by kevin
Message-ID: <20090129002610.A392E208494@bastion.fedora.phx.redhat.com>

kevin changed owner of fail2ban in Fedora EPEL 5 to maxamillion

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fail2ban



From pkgdb at fedoraproject.org  Thu Jan 29 00:27:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 29 Jan 2009 00:27:24 +0000
Subject: [pkgdb] libspiro (Fedora, 9) updated by kevin
Message-ID: <20090129002724.AD0EF208485@bastion.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for libspiro
kevin has set commit to Approved for provenpackager on libspiro (Fedora 9)
kevin has set build to Approved for provenpackager on libspiro (Fedora 9)
kevin has set checkout to Approved for provenpackager on libspiro (Fedora 9)
kevin changed owner of libspiro in Fedora 9 to kevin
kevin approved watchbugzilla on libspiro (Fedora 9) for nphilipp
kevin approved watchcommits on libspiro (Fedora 9) for nphilipp
kevin approved commit on libspiro (Fedora 9) for nphilipp
kevin approved build on libspiro (Fedora 9) for nphilipp
kevin approved approveacls on libspiro (Fedora 9) for nphilipp

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libspiro



From pkgdb at fedoraproject.org  Thu Jan 29 00:27:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 29 Jan 2009 00:27:24 +0000
Subject: [pkgdb] libspiro (Fedora, 10) updated by kevin
Message-ID: <20090129002724.C36F0208494@bastion.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for libspiro
kevin has set commit to Approved for provenpackager on libspiro (Fedora 10)
kevin has set build to Approved for provenpackager on libspiro (Fedora 10)
kevin has set checkout to Approved for provenpackager on libspiro (Fedora 10)
kevin changed owner of libspiro in Fedora 10 to kevin
kevin approved watchbugzilla on libspiro (Fedora 10) for nphilipp
kevin approved watchcommits on libspiro (Fedora 10) for nphilipp
kevin approved commit on libspiro (Fedora 10) for nphilipp
kevin approved build on libspiro (Fedora 10) for nphilipp
kevin approved approveacls on libspiro (Fedora 10) for nphilipp

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libspiro



From pkgdb at fedoraproject.org  Thu Jan 29 00:27:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 29 Jan 2009 00:27:24 +0000
Subject: [pkgdb] libspiro (Fedora, devel) updated by kevin
Message-ID: <20090129002724.CCBB2208497@bastion.fedora.phx.redhat.com>

kevin changed owner of libspiro in Fedora devel to kevin
kevin approved watchbugzilla on libspiro (Fedora devel) for nphilipp
kevin approved watchcommits on libspiro (Fedora devel) for nphilipp
kevin approved commit on libspiro (Fedora devel) for nphilipp
kevin approved build on libspiro (Fedora devel) for nphilipp
kevin approved approveacls on libspiro (Fedora devel) for nphilipp

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libspiro



From pkgdb at fedoraproject.org  Thu Jan 29 00:28:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 29 Jan 2009 00:28:14 +0000
Subject: [pkgdb] perl-Test-Signature (Fedora EPEL, 5) updated by kevin
Message-ID: <20090129002814.9A2B8208485@bastion.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for perl-Test-Signature
kevin has set commit to Approved for provenpackager on perl-Test-Signature (Fedora EPEL 5)
kevin has set build to Approved for provenpackager on perl-Test-Signature (Fedora EPEL 5)
kevin has set checkout to Approved for provenpackager on perl-Test-Signature (Fedora EPEL 5)
kevin changed owner of perl-Test-Signature in Fedora EPEL 5 to iarnell
kevin approved watchbugzilla on perl-Test-Signature (Fedora EPEL 5) for perl-sig
kevin approved watchcommits on perl-Test-Signature (Fedora EPEL 5) for perl-sig
kevin approved watchbugzilla on perl-Test-Signature (Fedora EPEL 5) for iburrell
kevin approved watchcommits on perl-Test-Signature (Fedora EPEL 5) for iburrell
kevin approved commit on perl-Test-Signature (Fedora EPEL 5) for iburrell
kevin approved build on perl-Test-Signature (Fedora EPEL 5) for iburrell
kevin approved approveacls on perl-Test-Signature (Fedora EPEL 5) for iburrell

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Test-Signature



From pkgdb at fedoraproject.org  Thu Jan 29 00:28:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 29 Jan 2009 00:28:29 +0000
Subject: [pkgdb] perl-Test-Signature (Fedora EPEL, 5) updated by kevin
Message-ID: <20090129002829.B4010208605@bastion.fedora.phx.redhat.com>

kevin changed owner of perl-Test-Signature in Fedora EPEL 5 to iarnell
kevin approved watchbugzilla on perl-Test-Signature (Fedora EPEL 5) for perl-sig
kevin approved watchcommits on perl-Test-Signature (Fedora EPEL 5) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Test-Signature



From pkgdb at fedoraproject.org  Thu Jan 29 00:32:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 29 Jan 2009 00:32:34 +0000
Subject: [pkgdb] cf-bonveno-fonts (Fedora, 9) updated by kevin
Message-ID: <20090129003234.5BF0C208494@bastion.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for cf-bonveno-fonts
kevin has set commit to Approved for provenpackager on cf-bonveno-fonts (Fedora 9)
kevin has set build to Approved for provenpackager on cf-bonveno-fonts (Fedora 9)
kevin has set checkout to Approved for provenpackager on cf-bonveno-fonts (Fedora 9)
kevin approved watchbugzilla on cf-bonveno-fonts (Fedora 9) for fonts-sig
kevin approved watchcommits on cf-bonveno-fonts (Fedora 9) for fonts-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cf-bonveno-fonts



From pkgdb at fedoraproject.org  Thu Jan 29 00:32:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 29 Jan 2009 00:32:31 +0000
Subject: [pkgdb] cf-bonveno-fonts was added for ankursinha
Message-ID: <20090129003232.047B6208485@bastion.fedora.phx.redhat.com>

kevin has added Package cf-bonveno-fonts with summary A set of fun fonts from the crud factory, by Barry Schwartz
kevin has approved Package cf-bonveno-fonts
kevin has added a Fedora devel branch for cf-bonveno-fonts with an owner of ankursinha
kevin has approved cf-bonveno-fonts in Fedora devel
kevin has approved Package cf-bonveno-fonts
kevin has set commit to Approved for provenpackager on cf-bonveno-fonts (Fedora devel)
kevin has set build to Approved for provenpackager on cf-bonveno-fonts (Fedora devel)
kevin has set checkout to Approved for provenpackager on cf-bonveno-fonts (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cf-bonveno-fonts



From pkgdb at fedoraproject.org  Thu Jan 29 00:32:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 29 Jan 2009 00:32:34 +0000
Subject: [pkgdb] cf-bonveno-fonts (Fedora, devel) updated by kevin
Message-ID: <20090129003234.707E72084B7@bastion.fedora.phx.redhat.com>

kevin approved watchbugzilla on cf-bonveno-fonts (Fedora devel) for fonts-sig
kevin approved watchcommits on cf-bonveno-fonts (Fedora devel) for fonts-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cf-bonveno-fonts



From pkgdb at fedoraproject.org  Thu Jan 29 00:32:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 29 Jan 2009 00:32:34 +0000
Subject: [pkgdb] cf-bonveno-fonts (Fedora, 10) updated by kevin
Message-ID: <20090129003234.6786D208497@bastion.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for cf-bonveno-fonts
kevin has set commit to Approved for provenpackager on cf-bonveno-fonts (Fedora 10)
kevin has set build to Approved for provenpackager on cf-bonveno-fonts (Fedora 10)
kevin has set checkout to Approved for provenpackager on cf-bonveno-fonts (Fedora 10)
kevin approved watchbugzilla on cf-bonveno-fonts (Fedora 10) for fonts-sig
kevin approved watchcommits on cf-bonveno-fonts (Fedora 10) for fonts-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/cf-bonveno-fonts



From kevin at fedoraproject.org  Thu Jan 29 00:32:47 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 29 Jan 2009 00:32:47 +0000 (UTC)
Subject: rpms/cf-bonveno-fonts - New directory
Message-ID: <20090129003247.33A3F70116@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/cf-bonveno-fonts
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsR24520/rpms/cf-bonveno-fonts

Log Message:
Directory /cvs/pkgs/rpms/cf-bonveno-fonts added to the repository




From kevin at fedoraproject.org  Thu Jan 29 00:32:47 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 29 Jan 2009 00:32:47 +0000 (UTC)
Subject: rpms/cf-bonveno-fonts/devel - New directory
Message-ID: <20090129003247.8A26C70116@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/cf-bonveno-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsR24520/rpms/cf-bonveno-fonts/devel

Log Message:
Directory /cvs/pkgs/rpms/cf-bonveno-fonts/devel added to the repository




From kevin at fedoraproject.org  Thu Jan 29 00:33:07 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 29 Jan 2009 00:33:07 +0000 (UTC)
Subject: rpms/cf-bonveno-fonts Makefile,NONE,1.1
Message-ID: <20090129003307.B652170116@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/cf-bonveno-fonts
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsR24520/rpms/cf-bonveno-fonts

Added Files:
	Makefile 
Log Message:
Setup of module cf-bonveno-fonts


--- NEW FILE Makefile ---
# Top level Makefile for module cf-bonveno-fonts
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Thu Jan 29 00:33:08 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 29 Jan 2009 00:33:08 +0000 (UTC)
Subject: rpms/cf-bonveno-fonts/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090129003308.27B1070141@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/cf-bonveno-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsR24520/rpms/cf-bonveno-fonts/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module cf-bonveno-fonts


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: cf-bonveno-fonts
# $Id: Makefile,v 1.1 2009/01/29 00:33:07 kevin Exp $
NAME := cf-bonveno-fonts
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From itamarjp at fedoraproject.org  Thu Jan 29 00:34:42 2009
From: itamarjp at fedoraproject.org (Itamar Reis Peixoto)
Date: Thu, 29 Jan 2009 00:34:42 +0000 (UTC)
Subject: rpms/perl-DBIx-Safe/devel import.log, NONE, 1.1 perl-DBIx-Safe.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090129003442.3ED9B70116@cvs1.fedora.phx.redhat.com>

Author: itamarjp

Update of /cvs/pkgs/rpms/perl-DBIx-Safe/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24892/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-DBIx-Safe.spec 
Log Message:
Initial RPM release



--- NEW FILE import.log ---
perl-DBIx-Safe-1_2_5-4_fc10:HEAD:perl-DBIx-Safe-1.2.5-4.fc10.src.rpm:1233189187


--- NEW FILE perl-DBIx-Safe.spec ---
%define         realname DBIx-Safe
Name:           perl-DBIx-Safe
Version:        1.2.5
Release:        4%{?dist}
Summary:        Safer access to your database through a DBI database handle
License:        BSD
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/DBIx-Safe/
Source0:        http://search.cpan.org/CPAN/authors/id/T/TU/TURNSTEP/%{realname}-%{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(DBD::Pg)
BuildRequires:  perl(DBI)
BuildRequires:  perl(Test::More)
BuildRequires:  perl(Test::Simple)

%description
The purpose of this module is to give controlled, limited access to an
application, rather than simply passing it a raw database handle through
DBI. DBIx::Safe acts as a wrapper to the database, by only allowing
through the commands you tell it to. It filters all things related to
the database handle - methods and attributes.

%prep
%setup -q -n %{realname}-%{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
# note this test suite is noisy! :-)
make test

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc Changes  INSTALL  LICENSE  README TODO SIGNATURE t/
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Mon Jan 29 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> 1.2.5-4
- include make test in %%check section

* Mon Jan 29 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> 1.2.5-3
- include %%{_fixperms} %%{buildroot}/* after %%install section, replace tab to space in spec.

* Mon Jan 26 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> 1.2.5-2
- fix from BZ #481528  Comment #1
- fix source url
- Fix license tag (BSD)
- Include all BR's needed DBD::Pg, DBI, Test::More , Test::Simple

* Sun Jan 25 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> 1.2.5-1
- Initial RPM release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-DBIx-Safe/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	29 Jan 2009 00:21:51 -0000	1.1
+++ .cvsignore	29 Jan 2009 00:34:12 -0000	1.2
@@ -0,0 +1 @@
+DBIx-Safe-1.2.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-DBIx-Safe/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	29 Jan 2009 00:21:51 -0000	1.1
+++ sources	29 Jan 2009 00:34:12 -0000	1.2
@@ -0,0 +1 @@
+ca5abd5fec19da9d51e6312f6707c534  DBIx-Safe-1.2.5.tar.gz



From pkgdb at fedoraproject.org  Thu Jan 29 00:35:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 29 Jan 2009 00:35:06 +0000
Subject: [pkgdb] oldstandard-sfd-fonts was added for ankursinha
Message-ID: <20090129003506.CD085208486@bastion.fedora.phx.redhat.com>

kevin has added Package oldstandard-sfd-fonts with summary Old Standard True-Type Fonts
kevin has approved Package oldstandard-sfd-fonts
kevin has added a Fedora devel branch for oldstandard-sfd-fonts with an owner of ankursinha
kevin has approved oldstandard-sfd-fonts in Fedora devel
kevin has approved Package oldstandard-sfd-fonts
kevin has set commit to Approved for provenpackager on oldstandard-sfd-fonts (Fedora devel)
kevin has set build to Approved for provenpackager on oldstandard-sfd-fonts (Fedora devel)
kevin has set checkout to Approved for provenpackager on oldstandard-sfd-fonts (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/oldstandard-sfd-fonts



From pkgdb at fedoraproject.org  Thu Jan 29 00:35:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 29 Jan 2009 00:35:09 +0000
Subject: [pkgdb] oldstandard-sfd-fonts (Fedora, 9) updated by kevin
Message-ID: <20090129003509.4A8C8208495@bastion.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for oldstandard-sfd-fonts
kevin has set commit to Approved for provenpackager on oldstandard-sfd-fonts (Fedora 9)
kevin has set build to Approved for provenpackager on oldstandard-sfd-fonts (Fedora 9)
kevin has set checkout to Approved for provenpackager on oldstandard-sfd-fonts (Fedora 9)
kevin approved watchbugzilla on oldstandard-sfd-fonts (Fedora 9) for fonts-sig
kevin approved watchcommits on oldstandard-sfd-fonts (Fedora 9) for fonts-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/oldstandard-sfd-fonts



From pkgdb at fedoraproject.org  Thu Jan 29 00:35:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 29 Jan 2009 00:35:09 +0000
Subject: [pkgdb] oldstandard-sfd-fonts (Fedora, devel) updated by kevin
Message-ID: <20090129003509.567172084A7@bastion.fedora.phx.redhat.com>

kevin approved watchbugzilla on oldstandard-sfd-fonts (Fedora devel) for fonts-sig
kevin approved watchcommits on oldstandard-sfd-fonts (Fedora devel) for fonts-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/oldstandard-sfd-fonts



From kevin at fedoraproject.org  Thu Jan 29 00:35:20 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 29 Jan 2009 00:35:20 +0000 (UTC)
Subject: rpms/oldstandard-sfd-fonts - New directory
Message-ID: <20090129003520.27F2B70116@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/oldstandard-sfd-fonts
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsE25141/rpms/oldstandard-sfd-fonts

Log Message:
Directory /cvs/pkgs/rpms/oldstandard-sfd-fonts added to the repository




From kevin at fedoraproject.org  Thu Jan 29 00:35:20 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 29 Jan 2009 00:35:20 +0000 (UTC)
Subject: rpms/oldstandard-sfd-fonts/devel - New directory
Message-ID: <20090129003520.6F15070116@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/oldstandard-sfd-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsE25141/rpms/oldstandard-sfd-fonts/devel

Log Message:
Directory /cvs/pkgs/rpms/oldstandard-sfd-fonts/devel added to the repository




From pkgdb at fedoraproject.org  Thu Jan 29 00:35:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 29 Jan 2009 00:35:09 +0000
Subject: [pkgdb] oldstandard-sfd-fonts (Fedora, 10) updated by kevin
Message-ID: <20090129003509.842C12084BD@bastion.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for oldstandard-sfd-fonts
kevin has set commit to Approved for provenpackager on oldstandard-sfd-fonts (Fedora 10)
kevin has set build to Approved for provenpackager on oldstandard-sfd-fonts (Fedora 10)
kevin has set checkout to Approved for provenpackager on oldstandard-sfd-fonts (Fedora 10)
kevin approved watchbugzilla on oldstandard-sfd-fonts (Fedora 10) for fonts-sig
kevin approved watchcommits on oldstandard-sfd-fonts (Fedora 10) for fonts-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/oldstandard-sfd-fonts



From kevin at fedoraproject.org  Thu Jan 29 00:35:36 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 29 Jan 2009 00:35:36 +0000 (UTC)
Subject: rpms/oldstandard-sfd-fonts Makefile,NONE,1.1
Message-ID: <20090129003536.9099170116@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/oldstandard-sfd-fonts
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsE25141/rpms/oldstandard-sfd-fonts

Added Files:
	Makefile 
Log Message:
Setup of module oldstandard-sfd-fonts


--- NEW FILE Makefile ---
# Top level Makefile for module oldstandard-sfd-fonts
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Thu Jan 29 00:35:36 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Thu, 29 Jan 2009 00:35:36 +0000 (UTC)
Subject: rpms/oldstandard-sfd-fonts/devel .cvsignore, NONE, 1.1 Makefile,
	NONE, 1.1 sources, NONE, 1.1
Message-ID: <20090129003536.E04E270116@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/oldstandard-sfd-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsE25141/rpms/oldstandard-sfd-fonts/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module oldstandard-sfd-fonts


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: oldstandard-sfd-fonts
# $Id: Makefile,v 1.1 2009/01/29 00:35:36 kevin Exp $
NAME := oldstandard-sfd-fonts
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From itamarjp at fedoraproject.org  Thu Jan 29 00:37:21 2009
From: itamarjp at fedoraproject.org (Itamar Reis Peixoto)
Date: Thu, 29 Jan 2009 00:37:21 +0000 (UTC)
Subject: rpms/perl-DBIx-Safe/F-10 import.log, NONE, 1.1 perl-DBIx-Safe.spec, 
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090129003721.3A96270116@cvs1.fedora.phx.redhat.com>

Author: itamarjp

Update of /cvs/pkgs/rpms/perl-DBIx-Safe/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25531/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-DBIx-Safe.spec 
Log Message:
Initial RPM release



--- NEW FILE import.log ---
perl-DBIx-Safe-1_2_5-4_fc10:F-10:perl-DBIx-Safe-1.2.5-4.fc10.src.rpm:1233189348


--- NEW FILE perl-DBIx-Safe.spec ---
%define         realname DBIx-Safe
Name:           perl-DBIx-Safe
Version:        1.2.5
Release:        4%{?dist}
Summary:        Safer access to your database through a DBI database handle
License:        BSD
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/DBIx-Safe/
Source0:        http://search.cpan.org/CPAN/authors/id/T/TU/TURNSTEP/%{realname}-%{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(DBD::Pg)
BuildRequires:  perl(DBI)
BuildRequires:  perl(Test::More)
BuildRequires:  perl(Test::Simple)

%description
The purpose of this module is to give controlled, limited access to an
application, rather than simply passing it a raw database handle through
DBI. DBIx::Safe acts as a wrapper to the database, by only allowing
through the commands you tell it to. It filters all things related to
the database handle - methods and attributes.

%prep
%setup -q -n %{realname}-%{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
# note this test suite is noisy! :-)
make test

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc Changes  INSTALL  LICENSE  README TODO SIGNATURE t/
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Mon Jan 29 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> 1.2.5-4
- include make test in %%check section

* Mon Jan 29 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> 1.2.5-3
- include %%{_fixperms} %%{buildroot}/* after %%install section, replace tab to space in spec.

* Mon Jan 26 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> 1.2.5-2
- fix from BZ #481528  Comment #1
- fix source url
- Fix license tag (BSD)
- Include all BR's needed DBD::Pg, DBI, Test::More , Test::Simple

* Sun Jan 25 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> 1.2.5-1
- Initial RPM release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-DBIx-Safe/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	29 Jan 2009 00:21:51 -0000	1.1
+++ .cvsignore	29 Jan 2009 00:36:50 -0000	1.2
@@ -0,0 +1 @@
+DBIx-Safe-1.2.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-DBIx-Safe/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	29 Jan 2009 00:21:51 -0000	1.1
+++ sources	29 Jan 2009 00:36:50 -0000	1.2
@@ -0,0 +1 @@
+ca5abd5fec19da9d51e6312f6707c534  DBIx-Safe-1.2.5.tar.gz



From itamarjp at fedoraproject.org  Thu Jan 29 00:40:52 2009
From: itamarjp at fedoraproject.org (Itamar Reis Peixoto)
Date: Thu, 29 Jan 2009 00:40:52 +0000 (UTC)
Subject: rpms/perl-DBIx-Safe/F-9 import.log, NONE, 1.1 perl-DBIx-Safe.spec, 
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090129004052.4E87C70116@cvs1.fedora.phx.redhat.com>

Author: itamarjp

Update of /cvs/pkgs/rpms/perl-DBIx-Safe/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26111/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-DBIx-Safe.spec 
Log Message:
Initial RPM release



--- NEW FILE import.log ---
perl-DBIx-Safe-1_2_5-4_fc10:F-9:perl-DBIx-Safe-1.2.5-4.fc10.src.rpm:1233189560


--- NEW FILE perl-DBIx-Safe.spec ---
%define         realname DBIx-Safe
Name:           perl-DBIx-Safe
Version:        1.2.5
Release:        4%{?dist}
Summary:        Safer access to your database through a DBI database handle
License:        BSD
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/DBIx-Safe/
Source0:        http://search.cpan.org/CPAN/authors/id/T/TU/TURNSTEP/%{realname}-%{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(DBD::Pg)
BuildRequires:  perl(DBI)
BuildRequires:  perl(Test::More)
BuildRequires:  perl(Test::Simple)

%description
The purpose of this module is to give controlled, limited access to an
application, rather than simply passing it a raw database handle through
DBI. DBIx::Safe acts as a wrapper to the database, by only allowing
through the commands you tell it to. It filters all things related to
the database handle - methods and attributes.

%prep
%setup -q -n %{realname}-%{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
# note this test suite is noisy! :-)
make test

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc Changes  INSTALL  LICENSE  README TODO SIGNATURE t/
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Mon Jan 29 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> 1.2.5-4
- include make test in %%check section

* Mon Jan 29 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> 1.2.5-3
- include %%{_fixperms} %%{buildroot}/* after %%install section, replace tab to space in spec.

* Mon Jan 26 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> 1.2.5-2
- fix from BZ #481528  Comment #1
- fix source url
- Fix license tag (BSD)
- Include all BR's needed DBD::Pg, DBI, Test::More , Test::Simple

* Sun Jan 25 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> 1.2.5-1
- Initial RPM release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-DBIx-Safe/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	29 Jan 2009 00:21:51 -0000	1.1
+++ .cvsignore	29 Jan 2009 00:40:21 -0000	1.2
@@ -0,0 +1 @@
+DBIx-Safe-1.2.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-DBIx-Safe/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	29 Jan 2009 00:21:51 -0000	1.1
+++ sources	29 Jan 2009 00:40:21 -0000	1.2
@@ -0,0 +1 @@
+ca5abd5fec19da9d51e6312f6707c534  DBIx-Safe-1.2.5.tar.gz



From nsantos at fedoraproject.org  Thu Jan 29 01:09:48 2009
From: nsantos at fedoraproject.org (Nuno Santos)
Date: Thu, 29 Jan 2009 01:09:48 +0000 (UTC)
Subject: rpms/amqp/F-10 .cvsignore, 1.12, 1.13 amqp.spec, 1.17, 1.18 sources,
	1.15, 1.16
Message-ID: <20090129010948.43CDA70116@cvs1.fedora.phx.redhat.com>

Author: nsantos

Update of /cvs/extras/rpms/amqp/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30362

Modified Files:
	.cvsignore amqp.spec sources 
Log Message:
Rebased to svn rev 738618


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/amqp/F-10/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	14 Jan 2009 20:40:34 -0000	1.12
+++ .cvsignore	29 Jan 2009 01:09:17 -0000	1.13
@@ -1 +1 @@
-amqp-1.0.734452.tar.gz
+amqp-1.0.738618.tar.gz


Index: amqp.spec
===================================================================
RCS file: /cvs/extras/rpms/amqp/F-10/amqp.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- amqp.spec	14 Jan 2009 20:40:34 -0000	1.17
+++ amqp.spec	29 Jan 2009 01:09:17 -0000	1.18
@@ -1,5 +1,5 @@
 Name:           amqp
-Version:        1.0.734452
+Version:        1.0.738618
 Release:        1%{?dist}
 Epoch:          0
 Summary:        The AMQP specification
@@ -39,6 +39,9 @@
 
 
 %changelog
+* Wed Jan 28 2009 Nuno Santos <nsantos at redhat.com> - 0:1.0.738618-1
+- Rebased to svn rev 738618
+
 * Wed Jan 14 2009 Nuno Santos <nsantos at redhat.com> - 0:1.0.734452-1
 - Rebased to svn rev 734452
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/amqp/F-10/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	14 Jan 2009 20:40:34 -0000	1.15
+++ sources	29 Jan 2009 01:09:17 -0000	1.16
@@ -1 +1 @@
-201602662e6a756afe2167b9650d787b  amqp-1.0.734452.tar.gz
+86da15fe433b1460c8394e052c32a709  amqp-1.0.738618.tar.gz



From nsantos at fedoraproject.org  Thu Jan 29 01:17:08 2009
From: nsantos at fedoraproject.org (Nuno Santos)
Date: Thu, 29 Jan 2009 01:17:08 +0000 (UTC)
Subject: rpms/amqp/devel .cvsignore, 1.12, 1.13 amqp.spec, 1.17, 1.18 sources,
	1.15, 1.16
Message-ID: <20090129011708.58D4E70116@cvs1.fedora.phx.redhat.com>

Author: nsantos

Update of /cvs/extras/rpms/amqp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31222

Modified Files:
	.cvsignore amqp.spec sources 
Log Message:
Rebased to svn rev 738618


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/amqp/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	15 Jan 2009 16:14:42 -0000	1.12
+++ .cvsignore	29 Jan 2009 01:16:37 -0000	1.13
@@ -1 +1 @@
-amqp-1.0.734452.tar.gz
+amqp-1.0.738618.tar.gz


Index: amqp.spec
===================================================================
RCS file: /cvs/extras/rpms/amqp/devel/amqp.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- amqp.spec	15 Jan 2009 16:14:42 -0000	1.17
+++ amqp.spec	29 Jan 2009 01:16:37 -0000	1.18
@@ -1,5 +1,5 @@
 Name:           amqp
-Version:        1.0.734452
+Version:        1.0.738618
 Release:        1%{?dist}
 Epoch:          0
 Summary:        The AMQP specification
@@ -39,7 +39,10 @@
 
 
 %changelog
-* Thu Jan 15 2009 Nuno Santos <nsantos at redhat.com> - 0:1.0.734452-1
+* Wed Jan 28 2009 Nuno Santos <nsantos at redhat.com> - 0:1.0.738618-1
+- Rebased to svn rev 738618
+
+* Wed Jan 14 2009 Nuno Santos <nsantos at redhat.com> - 0:1.0.734452-1
 - Rebased to svn rev 734452
 
 * Tue Dec 23 2008 Nuno Santos <nsantos at redhat.com> - 0:1.0.728142-2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/amqp/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	15 Jan 2009 16:14:42 -0000	1.15
+++ sources	29 Jan 2009 01:16:37 -0000	1.16
@@ -1 +1 @@
-201602662e6a756afe2167b9650d787b  amqp-1.0.734452.tar.gz
+86da15fe433b1460c8394e052c32a709  amqp-1.0.738618.tar.gz



From icon at fedoraproject.org  Thu Jan 29 01:29:14 2009
From: icon at fedoraproject.org (Konstantin Ryabitsev)
Date: Thu, 29 Jan 2009 01:29:14 +0000 (UTC)
Subject: rpms/pylint/devel .cvsignore, 1.13, 1.14 pylint.spec, 1.14,
	1.15 sources, 1.13, 1.14
Message-ID: <20090129012914.CACA970116@cvs1.fedora.phx.redhat.com>

Author: icon

Update of /cvs/extras/rpms/pylint/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv922

Modified Files:
	.cvsignore pylint.spec sources 
Log Message:
New upstream.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pylint/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	30 Dec 2008 16:58:11 -0000	1.13
+++ .cvsignore	29 Jan 2009 01:28:44 -0000	1.14
@@ -1 +1 @@
-pylint-0.15.2.tar.gz
+pylint-0.16.0.tar.gz


Index: pylint.spec
===================================================================
RCS file: /cvs/extras/rpms/pylint/devel/pylint.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- pylint.spec	30 Dec 2008 16:58:11 -0000	1.14
+++ pylint.spec	29 Jan 2009 01:28:44 -0000	1.15
@@ -1,7 +1,7 @@
 %{!?_python_sitelib: %define _python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           pylint
-Version:        0.15.2
+Version:        0.16.0
 Release:        1%{?dist}
 Summary:        Analyzes Python code looking for bugs and signs of poor quality
 
@@ -77,6 +77,9 @@
 
 
 %changelog
+* Wed Jan 28 2009 Konstantin Ryabitsev <icon at fedoraproject.org> - 0.16.0-1
+- Upstream 0.16.0
+
 * Tue Dec 30 2008 Konstantin Ryabitsev <icon at fedoraproject.org> - 0.15.2-1
 - Upstream 0.15.2
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pylint/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	30 Dec 2008 16:58:12 -0000	1.13
+++ sources	29 Jan 2009 01:28:44 -0000	1.14
@@ -1 +1 @@
-98f3917fc4d0855c8f0eab9761533835  pylint-0.15.2.tar.gz
+28f894b98ee8ec985cf46075aab2bc9e  pylint-0.16.0.tar.gz



From nsantos at fedoraproject.org  Thu Jan 29 01:37:13 2009
From: nsantos at fedoraproject.org (Nuno Santos)
Date: Thu, 29 Jan 2009 01:37:13 +0000 (UTC)
Subject: rpms/python-qpid/F-10 .cvsignore, 1.11, 1.12 python-qpid.spec, 1.18,
	1.19 sources, 1.15, 1.16
Message-ID: <20090129013713.2638470116@cvs1.fedora.phx.redhat.com>

Author: nsantos

Update of /cvs/extras/rpms/python-qpid/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1911

Modified Files:
	.cvsignore python-qpid.spec sources 
Log Message:
Rebased to svn rev 738618


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-qpid/F-10/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	14 Jan 2009 21:10:59 -0000	1.11
+++ .cvsignore	29 Jan 2009 01:36:42 -0000	1.12
@@ -1 +1 @@
-python-qpid-0.4.734452.tar.gz
+python-qpid-0.4.738618.tar.gz


Index: python-qpid.spec
===================================================================
RCS file: /cvs/extras/rpms/python-qpid/F-10/python-qpid.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- python-qpid.spec	14 Jan 2009 21:10:59 -0000	1.18
+++ python-qpid.spec	29 Jan 2009 01:36:42 -0000	1.19
@@ -1,5 +1,5 @@
 Name:           python-qpid
-Version:        0.4.734452
+Version:        0.4.738618
 Release:        1%{?dist}
 Summary:        Python language client for AMQP
 
@@ -16,7 +16,7 @@
 BuildRequires:  python-devel
 
 Requires:       python
-Requires:       amqp >= 1.0.734452
+Requires:       amqp >= 1.0.738618
 
 %description
 The Apache Qpid project's Python language client for AMQP.
@@ -75,6 +75,9 @@
 
 
 %changelog
+* Wed Jan 28 2009 Nuno Santos <nsantos at redhat.com> - 0.4.738618-1
+- Rebased to svn rev 738618
+
 * Wed Jan 14 2009 Nuno Santos <nsantos at redhat.com> - 0.4.734452-1
 - Rebased to svn rev 734452
 - BZ 478467: include examples


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-qpid/F-10/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	14 Jan 2009 21:10:59 -0000	1.15
+++ sources	29 Jan 2009 01:36:42 -0000	1.16
@@ -1 +1 @@
-cb50d8ba6012bbc674c2d87860d4838d  python-qpid-0.4.734452.tar.gz
+5eb4d4722b50e1b2818d9ff863938bd5  python-qpid-0.4.738618.tar.gz



From nsantos at fedoraproject.org  Thu Jan 29 01:46:12 2009
From: nsantos at fedoraproject.org (Nuno Santos)
Date: Thu, 29 Jan 2009 01:46:12 +0000 (UTC)
Subject: rpms/python-qpid/devel .cvsignore, 1.11, 1.12 python-qpid.spec, 1.20,
	1.21 sources, 1.15, 1.16
Message-ID: <20090129014612.3668F70116@cvs1.fedora.phx.redhat.com>

Author: nsantos

Update of /cvs/extras/rpms/python-qpid/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3233

Modified Files:
	.cvsignore python-qpid.spec sources 
Log Message:
Rebased to svn rev 738618


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-qpid/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	15 Jan 2009 16:20:13 -0000	1.11
+++ .cvsignore	29 Jan 2009 01:45:41 -0000	1.12
@@ -1 +1 @@
-python-qpid-0.4.734452.tar.gz
+python-qpid-0.4.738618.tar.gz


Index: python-qpid.spec
===================================================================
RCS file: /cvs/extras/rpms/python-qpid/devel/python-qpid.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- python-qpid.spec	15 Jan 2009 16:20:14 -0000	1.20
+++ python-qpid.spec	29 Jan 2009 01:45:41 -0000	1.21
@@ -1,5 +1,5 @@
 Name:           python-qpid
-Version:        0.4.734452
+Version:        0.4.738618
 Release:        1%{?dist}
 Summary:        Python language client for AMQP
 
@@ -16,7 +16,7 @@
 BuildRequires:  python-devel
 
 Requires:       python
-Requires:       amqp >= 1.0.734452
+Requires:       amqp >= 1.0.738618
 
 %description
 The Apache Qpid project's Python language client for AMQP.
@@ -75,6 +75,9 @@
 
 
 %changelog
+* Wed Jan 28 2009 Nuno Santos <nsantos at redhat.com> - 0.4.738618-1
+- Rebased to svn rev 738618
+
 * Wed Jan 14 2009 Nuno Santos <nsantos at redhat.com> - 0.4.734452-1
 - Rebased to svn rev 734452
 - BZ 478467: include examples


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-qpid/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	15 Jan 2009 16:20:14 -0000	1.15
+++ sources	29 Jan 2009 01:45:41 -0000	1.16
@@ -1 +1 @@
-cb50d8ba6012bbc674c2d87860d4838d  python-qpid-0.4.734452.tar.gz
+5eb4d4722b50e1b2818d9ff863938bd5  python-qpid-0.4.738618.tar.gz



From pkgdb at fedoraproject.org  Thu Jan 29 01:54:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 29 Jan 2009 01:54:41 +0000
Subject: [pkgdb] squashfs-tools ownership updated
Message-ID: <20090129015441.74A48208493@bastion.fedora.phx.redhat.com>

Package squashfs-tools in Fedora devel is now owned by kyle

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/squashfs-tools



From salimma at fedoraproject.org  Thu Jan 29 03:30:08 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Thu, 29 Jan 2009 03:30:08 +0000 (UTC)
Subject: rpms/gambit-c/EL-5 gambit-c.spec,1.5,1.6
Message-ID: <20090129033008.3506E70116@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/gambit-c/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17497/EL-5

Modified Files:
	gambit-c.spec 
Log Message:
* Wed Jan 28 2009 Michel Salim <salimma at fedoraproject.org> - 4.3.2-2
- If termite packages are disabled, the corresponding gambit-c packages
  Provides: and Obsoletes: them



Index: gambit-c.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gambit-c/EL-5/gambit-c.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- gambit-c.spec	30 Dec 2008 22:45:33 -0000	1.5
+++ gambit-c.spec	29 Jan 2009 03:29:37 -0000	1.6
@@ -17,7 +17,7 @@
 
 Name:           gambit-c
 Version:        4.3.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Gambit-C Scheme programming system
 
 Group:          Development/Languages
@@ -27,6 +27,9 @@
 
 %if %{?_with_termite:1}%{!?_with_termite:0}
 Source1:        http://termite.googlecode.com/files/termite%{termite_rev}.tar.gz
+%else
+Provides:       gambit-c-termite = %{version}-%{release}
+Obsoletes:      gambit-c-termite < %{version}-%{release}
 %endif
 Source2:        gambit-init.el
 Patch0:         gambc-v4_2_8-modtime.patch
@@ -53,6 +56,10 @@
 Requires:       %{name} = %{version}-%{release}
 Requires(post):  info
 Requires(preun): info
+%if %{?_with_termite:0}%{!?_with_termite:1}
+Provides:       gambit-c-termite-doc = %{version}-%{release}
+Obsoletes:      gambit-c-termite-doc < %{version}-%{release}
+%endif
 
 
 %description    doc
@@ -241,6 +248,10 @@
 
 
 %changelog
+* Wed Jan 28 2009 Michel Salim <salimma at fedoraproject.org> - 4.3.2-2
+- If termite packages are disabled, the corresponding gambit-c packages
+  Provides: and Obsoletes: them
+
 * Fri Dec 19 2008 Michel Salim <salimma at fedoraproject.org> - 4.3.2-1
 - Update to 4.3.2
 



From salimma at fedoraproject.org  Thu Jan 29 03:30:08 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Thu, 29 Jan 2009 03:30:08 +0000 (UTC)
Subject: rpms/gambit-c/F-10 gambit-c.spec,1.10,1.11
Message-ID: <20090129033008.5676870116@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/gambit-c/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17497/F-10

Modified Files:
	gambit-c.spec 
Log Message:
* Wed Jan 28 2009 Michel Salim <salimma at fedoraproject.org> - 4.3.2-2
- If termite packages are disabled, the corresponding gambit-c packages
  Provides: and Obsoletes: them



Index: gambit-c.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gambit-c/F-10/gambit-c.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- gambit-c.spec	30 Dec 2008 22:45:34 -0000	1.10
+++ gambit-c.spec	29 Jan 2009 03:29:38 -0000	1.11
@@ -17,7 +17,7 @@
 
 Name:           gambit-c
 Version:        4.3.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Gambit-C Scheme programming system
 
 Group:          Development/Languages
@@ -27,6 +27,9 @@
 
 %if %{?_with_termite:1}%{!?_with_termite:0}
 Source1:        http://termite.googlecode.com/files/termite%{termite_rev}.tar.gz
+%else
+Provides:       gambit-c-termite = %{version}-%{release}
+Obsoletes:      gambit-c-termite < %{version}-%{release}
 %endif
 Source2:        gambit-init.el
 Patch0:         gambc-v4_2_8-modtime.patch
@@ -53,6 +56,10 @@
 Requires:       %{name} = %{version}-%{release}
 Requires(post):  info
 Requires(preun): info
+%if %{?_with_termite:0}%{!?_with_termite:1}
+Provides:       gambit-c-termite-doc = %{version}-%{release}
+Obsoletes:      gambit-c-termite-doc < %{version}-%{release}
+%endif
 
 
 %description    doc
@@ -241,6 +248,10 @@
 
 
 %changelog
+* Wed Jan 28 2009 Michel Salim <salimma at fedoraproject.org> - 4.3.2-2
+- If termite packages are disabled, the corresponding gambit-c packages
+  Provides: and Obsoletes: them
+
 * Fri Dec 19 2008 Michel Salim <salimma at fedoraproject.org> - 4.3.2-1
 - Update to 4.3.2
 



From salimma at fedoraproject.org  Thu Jan 29 03:30:08 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Thu, 29 Jan 2009 03:30:08 +0000 (UTC)
Subject: rpms/gambit-c/F-9 gambit-c.spec,1.4,1.5
Message-ID: <20090129033008.8754A70116@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/gambit-c/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17497/F-9

Modified Files:
	gambit-c.spec 
Log Message:
* Wed Jan 28 2009 Michel Salim <salimma at fedoraproject.org> - 4.3.2-2
- If termite packages are disabled, the corresponding gambit-c packages
  Provides: and Obsoletes: them



Index: gambit-c.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gambit-c/F-9/gambit-c.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gambit-c.spec	30 Dec 2008 22:45:34 -0000	1.4
+++ gambit-c.spec	29 Jan 2009 03:29:38 -0000	1.5
@@ -17,7 +17,7 @@
 
 Name:           gambit-c
 Version:        4.3.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Gambit-C Scheme programming system
 
 Group:          Development/Languages
@@ -27,6 +27,9 @@
 
 %if %{?_with_termite:1}%{!?_with_termite:0}
 Source1:        http://termite.googlecode.com/files/termite%{termite_rev}.tar.gz
+%else
+Provides:       gambit-c-termite = %{version}-%{release}
+Obsoletes:      gambit-c-termite < %{version}-%{release}
 %endif
 Source2:        gambit-init.el
 Patch0:         gambc-v4_2_8-modtime.patch
@@ -53,6 +56,10 @@
 Requires:       %{name} = %{version}-%{release}
 Requires(post):  info
 Requires(preun): info
+%if %{?_with_termite:0}%{!?_with_termite:1}
+Provides:       gambit-c-termite-doc = %{version}-%{release}
+Obsoletes:      gambit-c-termite-doc < %{version}-%{release}
+%endif
 
 
 %description    doc
@@ -241,6 +248,10 @@
 
 
 %changelog
+* Wed Jan 28 2009 Michel Salim <salimma at fedoraproject.org> - 4.3.2-2
+- If termite packages are disabled, the corresponding gambit-c packages
+  Provides: and Obsoletes: them
+
 * Fri Dec 19 2008 Michel Salim <salimma at fedoraproject.org> - 4.3.2-1
 - Update to 4.3.2
 



From salimma at fedoraproject.org  Thu Jan 29 03:30:08 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Thu, 29 Jan 2009 03:30:08 +0000 (UTC)
Subject: rpms/gambit-c/devel gambit-c.spec,1.11,1.12
Message-ID: <20090129033008.D1D6D70116@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/gambit-c/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17497/devel

Modified Files:
	gambit-c.spec 
Log Message:
* Wed Jan 28 2009 Michel Salim <salimma at fedoraproject.org> - 4.3.2-2
- If termite packages are disabled, the corresponding gambit-c packages
  Provides: and Obsoletes: them



Index: gambit-c.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gambit-c/devel/gambit-c.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- gambit-c.spec	30 Dec 2008 22:45:34 -0000	1.11
+++ gambit-c.spec	29 Jan 2009 03:29:38 -0000	1.12
@@ -17,7 +17,7 @@
 
 Name:           gambit-c
 Version:        4.3.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Gambit-C Scheme programming system
 
 Group:          Development/Languages
@@ -27,6 +27,9 @@
 
 %if %{?_with_termite:1}%{!?_with_termite:0}
 Source1:        http://termite.googlecode.com/files/termite%{termite_rev}.tar.gz
+%else
+Provides:       gambit-c-termite = %{version}-%{release}
+Obsoletes:      gambit-c-termite < %{version}-%{release}
 %endif
 Source2:        gambit-init.el
 Patch0:         gambc-v4_2_8-modtime.patch
@@ -53,6 +56,10 @@
 Requires:       %{name} = %{version}-%{release}
 Requires(post):  info
 Requires(preun): info
+%if %{?_with_termite:0}%{!?_with_termite:1}
+Provides:       gambit-c-termite-doc = %{version}-%{release}
+Obsoletes:      gambit-c-termite-doc < %{version}-%{release}
+%endif
 
 
 %description    doc
@@ -241,6 +248,10 @@
 
 
 %changelog
+* Wed Jan 28 2009 Michel Salim <salimma at fedoraproject.org> - 4.3.2-2
+- If termite packages are disabled, the corresponding gambit-c packages
+  Provides: and Obsoletes: them
+
 * Fri Dec 19 2008 Michel Salim <salimma at fedoraproject.org> - 4.3.2-1
 - Update to 4.3.2
 



From rdieter at fedoraproject.org  Thu Jan 29 03:35:08 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu, 29 Jan 2009 03:35:08 +0000 (UTC)
Subject: rpms/eigen2/devel .cvsignore, 1.8, 1.9 eigen2.spec, 1.9,
	1.10 sources, 1.8, 1.9
Message-ID: <20090129033508.359DA70116@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/eigen2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18194

Modified Files:
	.cvsignore eigen2.spec sources 
Log Message:
* Wed Jan 28 2009 Rex Dieter <rdieter at fedoraproject.org> 2.0-0.10.rc1
- eigen-2.0-rc1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/eigen2/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	22 Jan 2009 15:19:12 -0000	1.8
+++ .cvsignore	29 Jan 2009 03:34:37 -0000	1.9
@@ -1 +1 @@
-eigen-2.0-beta6.tar.bz2
+eigen-2.0-rc1.tar.bz2


Index: eigen2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eigen2/devel/eigen2.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- eigen2.spec	22 Jan 2009 15:25:07 -0000	1.9
+++ eigen2.spec	29 Jan 2009 03:34:37 -0000	1.10
@@ -3,14 +3,14 @@
 # http://bugzilla.redhat.com/459705
 
 %define _with_check -DEIGEN_BUILD_TESTS:BOOL=ON
-%define pre beta6
+%define pre rc1
 #define snap 20090109
 
 
 Name:    eigen2
 Summary: A lightweight C++ template library for vector and matrix math
 Version: 2.0 
-Release: 0.9.%{pre}%{?dist} 
+Release: 0.10.%{pre}%{?dist} 
 Group:   System Environment/Libraries
 License: GPLv2+ or LGPLv3+
 URL:     http://eigen.tuxfamily.org/
@@ -95,6 +95,9 @@
 
 
 %changelog
+* Wed Jan 28 2009 Rex Dieter <rdieter at fedoraproject.org> 2.0-0.10.rc1
+- eigen-2.0-rc1
+
 * Thu Jan 22 2009 Rex Dieter <rdieter at fedoraproject.org> 2.0-0.9.beta6
 - eigen-2.0-beta6
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eigen2/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	22 Jan 2009 15:19:12 -0000	1.8
+++ sources	29 Jan 2009 03:34:37 -0000	1.9
@@ -1 +1 @@
-4274864abd64be6be1f91cf5afd905dd  eigen-2.0-beta6.tar.bz2
+4bfeb40641017bc93df024a20c0d0807  eigen-2.0-rc1.tar.bz2



From tmoertel at fedoraproject.org  Thu Jan 29 03:43:10 2009
From: tmoertel at fedoraproject.org (Tom Moertel)
Date: Thu, 29 Jan 2009 03:43:10 +0000 (UTC)
Subject: rpms/emacs-magit/devel emacs-magit-include-fdl.patch, NONE,
	1.1 emacs-magit.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090129034310.B6ED470116@cvs1.fedora.phx.redhat.com>

Author: tmoertel

Update of /cvs/pkgs/rpms/emacs-magit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19384/devel

Modified Files:
	.cvsignore sources 
Added Files:
	emacs-magit-include-fdl.patch emacs-magit.spec import.log 
Log Message:
Initial import of SRPM.


emacs-magit-include-fdl.patch:

--- NEW FILE emacs-magit-include-fdl.patch ---
>From c6834bf3adab60afbe557eb1ba28d90f77a19c6c Mon Sep 17 00:00:00 2001
From: Tom Moertel <tom at moertel.com>
Date: Tue, 27 Jan 2009 23:38:56 -0500
Subject: [PATCH] Included FDL into magit.texi file.

---
 magit.texi |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/magit.texi b/magit.texi
index e1135e4..dad220f 100644
--- a/magit.texi
+++ b/magit.texi
@@ -45,6 +45,7 @@ as an extension to Emacs.
 * Rewriting::                   
 * Pushing and Pulling::         
 * Interfacing with Subversion::  
+* License::
 @end menu
 
 @node Introduction
@@ -490,4 +491,8 @@ Magit shows them in a section called @emph{Unpulled changes}.  Typing
 Typing @kbd{N r} runs @code{git svn rebase} and typing @kbd{N c} runs
 @code{git svn dcommit}.
 
+ at node License
+ at chapter License
+ at include fdl.texi
+
 @bye
-- 
1.6.0.6



--- NEW FILE emacs-magit.spec ---
%define pkg magit
%define pkgname Magit
%define git_pull_date 20090122

%if %($(pkg-config emacs) ; echo $?)
%define emacs_version 22.1
%define emacs_lispdir %{_datadir}/emacs/site-lisp
%define emacs_startdir %{_datadir}/emacs/site-lisp/site-start.d
%else
%define emacs_version %(pkg-config emacs --modversion)
%define emacs_lispdir %(pkg-config emacs --variable sitepkglispdir)
%define emacs_startdir %(pkg-config emacs --variable sitestartdir)
%endif

Name:           emacs-%{pkg}
Version:        0.7
Release:        2.%{git_pull_date}git%{?dist}
Summary:        Emacs interface to the most common Git operations

Group:          Applications/Editors
License:        GPLv3+ and GFDL+
URL:            http://zagadka.vm.bytemark.co.uk/magit/magit.html

# The source for this package was pulled from upstream's vcs.
# Use the following commands to generate the tarball:
#  git clone git://gitorious.org/magit/mainline.git magit-0.7.20090122
#  tar zcf magit-0.7.20090122.tar.gz magit-0.7.20090122
Source0:        magit-%{version}.%{git_pull_date}.tar.gz

# Include FDL into the Texinfo docs (patch submitted upstream)
Patch0:         emacs-magit-include-fdl.patch

BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  automake emacs emacs-el
Requires:       emacs(bin) >= %{emacs_version}

%description
%{pkgname} is an add-on package for GNU Emacs. It is an interface to
the Git source-code management system that aims to make the most
common operations convenient.

%package el
Summary:        Elisp source files for %{pkgname} under GNU Emacs
Group:          Applications/Editors
Requires:       %{name} = %{version}-%{release}

%description el
This package contains the elisp source files for %{pkgname} under GNU Emacs. You
do not need to install this package to run %{pkgname}. Install the %{name}
package to use %{pkgname} with GNU Emacs.

%prep
%setup -q -n magit-%{version}.%{git_pull_date}
%patch0 -p1

%build
./autogen.sh
%configure
make

%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{emacs_startdir}
cp 50magit.el $RPM_BUILD_ROOT%{emacs_startdir}/emacs-magit-mode.el
mkdir -p $RPM_BUILD_ROOT%{emacs_lispdir}/%{pkg}
cp magit.el magit.elc $RPM_BUILD_ROOT%{emacs_lispdir}/%{pkg}
mkdir -p $RPM_BUILD_ROOT%{_infodir}
gzip -9 < magit.info > $RPM_BUILD_ROOT%{_infodir}/magit.info.gz


%clean
rm -rf $RPM_BUILD_ROOT


%post
/sbin/install-info /usr/share/info/magit.info.gz /usr/share/info/dir


%preun
if [ "$1" = 0 ]; then
    /sbin/install-info --delete /usr/share/info/magit.info.gz /usr/share/info/dir
fi


%files
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog NEWS README COPYING
%{emacs_lispdir}/%{pkg}/*.elc
%{emacs_startdir}/*.el
%{_infodir}/magit.info.gz
%dir %{emacs_lispdir}/%{pkg}

%files el
%defattr(-,root,root,-)
%{emacs_lispdir}/%{pkg}/*.el

%changelog
* Tue Jan 27 2009  <tom at moertel.com> - 0.7-2.20090122git
- Made fixes per Fedora packaging review (thanks Jerry James)

* Fri Jan 23 2009  <tom at moertel.com> - 0.7-1.20090122git
- Initial packaging.


--- NEW FILE import.log ---
emacs-magit-0_7-2_20090122git_fc10:HEAD:emacs-magit-0.7-2.20090122git.fc10.src.rpm:1233200490


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/emacs-magit/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	29 Jan 2009 00:14:36 -0000	1.1
+++ .cvsignore	29 Jan 2009 03:42:39 -0000	1.2
@@ -0,0 +1 @@
+magit-0.7.20090122.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/emacs-magit/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	29 Jan 2009 00:14:36 -0000	1.1
+++ sources	29 Jan 2009 03:42:39 -0000	1.2
@@ -0,0 +1 @@
+30b886dd1f999b64959b40e61b494700  magit-0.7.20090122.tar.gz



From tmoertel at fedoraproject.org  Thu Jan 29 03:47:35 2009
From: tmoertel at fedoraproject.org (Tom Moertel)
Date: Thu, 29 Jan 2009 03:47:35 +0000 (UTC)
Subject: rpms/emacs-magit/F-9 emacs-magit-include-fdl.patch, NONE,
	1.1 emacs-magit.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090129034735.2F45570116@cvs1.fedora.phx.redhat.com>

Author: tmoertel

Update of /cvs/pkgs/rpms/emacs-magit/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20245/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	emacs-magit-include-fdl.patch emacs-magit.spec import.log 
Log Message:
Initial import of SRPM.


emacs-magit-include-fdl.patch:

--- NEW FILE emacs-magit-include-fdl.patch ---
>From c6834bf3adab60afbe557eb1ba28d90f77a19c6c Mon Sep 17 00:00:00 2001
From: Tom Moertel <tom at moertel.com>
Date: Tue, 27 Jan 2009 23:38:56 -0500
Subject: [PATCH] Included FDL into magit.texi file.

---
 magit.texi |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/magit.texi b/magit.texi
index e1135e4..dad220f 100644
--- a/magit.texi
+++ b/magit.texi
@@ -45,6 +45,7 @@ as an extension to Emacs.
 * Rewriting::                   
 * Pushing and Pulling::         
 * Interfacing with Subversion::  
+* License::
 @end menu
 
 @node Introduction
@@ -490,4 +491,8 @@ Magit shows them in a section called @emph{Unpulled changes}.  Typing
 Typing @kbd{N r} runs @code{git svn rebase} and typing @kbd{N c} runs
 @code{git svn dcommit}.
 
+ at node License
+ at chapter License
+ at include fdl.texi
+
 @bye
-- 
1.6.0.6



--- NEW FILE emacs-magit.spec ---
%define pkg magit
%define pkgname Magit
%define git_pull_date 20090122

%if %($(pkg-config emacs) ; echo $?)
%define emacs_version 22.1
%define emacs_lispdir %{_datadir}/emacs/site-lisp
%define emacs_startdir %{_datadir}/emacs/site-lisp/site-start.d
%else
%define emacs_version %(pkg-config emacs --modversion)
%define emacs_lispdir %(pkg-config emacs --variable sitepkglispdir)
%define emacs_startdir %(pkg-config emacs --variable sitestartdir)
%endif

Name:           emacs-%{pkg}
Version:        0.7
Release:        2.%{git_pull_date}git%{?dist}
Summary:        Emacs interface to the most common Git operations

Group:          Applications/Editors
License:        GPLv3+ and GFDL+
URL:            http://zagadka.vm.bytemark.co.uk/magit/magit.html

# The source for this package was pulled from upstream's vcs.
# Use the following commands to generate the tarball:
#  git clone git://gitorious.org/magit/mainline.git magit-0.7.20090122
#  tar zcf magit-0.7.20090122.tar.gz magit-0.7.20090122
Source0:        magit-%{version}.%{git_pull_date}.tar.gz

# Include FDL into the Texinfo docs (patch submitted upstream)
Patch0:         emacs-magit-include-fdl.patch

BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  automake emacs emacs-el
Requires:       emacs(bin) >= %{emacs_version}

%description
%{pkgname} is an add-on package for GNU Emacs. It is an interface to
the Git source-code management system that aims to make the most
common operations convenient.

%package el
Summary:        Elisp source files for %{pkgname} under GNU Emacs
Group:          Applications/Editors
Requires:       %{name} = %{version}-%{release}

%description el
This package contains the elisp source files for %{pkgname} under GNU Emacs. You
do not need to install this package to run %{pkgname}. Install the %{name}
package to use %{pkgname} with GNU Emacs.

%prep
%setup -q -n magit-%{version}.%{git_pull_date}
%patch0 -p1

%build
./autogen.sh
%configure
make

%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{emacs_startdir}
cp 50magit.el $RPM_BUILD_ROOT%{emacs_startdir}/emacs-magit-mode.el
mkdir -p $RPM_BUILD_ROOT%{emacs_lispdir}/%{pkg}
cp magit.el magit.elc $RPM_BUILD_ROOT%{emacs_lispdir}/%{pkg}
mkdir -p $RPM_BUILD_ROOT%{_infodir}
gzip -9 < magit.info > $RPM_BUILD_ROOT%{_infodir}/magit.info.gz


%clean
rm -rf $RPM_BUILD_ROOT


%post
/sbin/install-info /usr/share/info/magit.info.gz /usr/share/info/dir


%preun
if [ "$1" = 0 ]; then
    /sbin/install-info --delete /usr/share/info/magit.info.gz /usr/share/info/dir
fi


%files
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog NEWS README COPYING
%{emacs_lispdir}/%{pkg}/*.elc
%{emacs_startdir}/*.el
%{_infodir}/magit.info.gz
%dir %{emacs_lispdir}/%{pkg}

%files el
%defattr(-,root,root,-)
%{emacs_lispdir}/%{pkg}/*.el

%changelog
* Tue Jan 27 2009  <tom at moertel.com> - 0.7-2.20090122git
- Made fixes per Fedora packaging review (thanks Jerry James)

* Fri Jan 23 2009  <tom at moertel.com> - 0.7-1.20090122git
- Initial packaging.


--- NEW FILE import.log ---
emacs-magit-0_7-2_20090122git_fc10:F-9:emacs-magit-0.7-2.20090122git.fc10.src.rpm:1233200785


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/emacs-magit/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	29 Jan 2009 00:14:36 -0000	1.1
+++ .cvsignore	29 Jan 2009 03:47:04 -0000	1.2
@@ -0,0 +1 @@
+magit-0.7.20090122.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/emacs-magit/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	29 Jan 2009 00:14:36 -0000	1.1
+++ sources	29 Jan 2009 03:47:04 -0000	1.2
@@ -0,0 +1 @@
+30b886dd1f999b64959b40e61b494700  magit-0.7.20090122.tar.gz



From tmoertel at fedoraproject.org  Thu Jan 29 03:49:25 2009
From: tmoertel at fedoraproject.org (Tom Moertel)
Date: Thu, 29 Jan 2009 03:49:25 +0000 (UTC)
Subject: rpms/emacs-magit/F-10 emacs-magit-include-fdl.patch, NONE,
	1.1 emacs-magit.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090129034925.7F50C70116@cvs1.fedora.phx.redhat.com>

Author: tmoertel

Update of /cvs/pkgs/rpms/emacs-magit/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20611/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	emacs-magit-include-fdl.patch emacs-magit.spec import.log 
Log Message:
Initial import of SRPM.


emacs-magit-include-fdl.patch:

--- NEW FILE emacs-magit-include-fdl.patch ---
>From c6834bf3adab60afbe557eb1ba28d90f77a19c6c Mon Sep 17 00:00:00 2001
From: Tom Moertel <tom at moertel.com>
Date: Tue, 27 Jan 2009 23:38:56 -0500
Subject: [PATCH] Included FDL into magit.texi file.

---
 magit.texi |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/magit.texi b/magit.texi
index e1135e4..dad220f 100644
--- a/magit.texi
+++ b/magit.texi
@@ -45,6 +45,7 @@ as an extension to Emacs.
 * Rewriting::                   
 * Pushing and Pulling::         
 * Interfacing with Subversion::  
+* License::
 @end menu
 
 @node Introduction
@@ -490,4 +491,8 @@ Magit shows them in a section called @emph{Unpulled changes}.  Typing
 Typing @kbd{N r} runs @code{git svn rebase} and typing @kbd{N c} runs
 @code{git svn dcommit}.
 
+ at node License
+ at chapter License
+ at include fdl.texi
+
 @bye
-- 
1.6.0.6



--- NEW FILE emacs-magit.spec ---
%define pkg magit
%define pkgname Magit
%define git_pull_date 20090122

%if %($(pkg-config emacs) ; echo $?)
%define emacs_version 22.1
%define emacs_lispdir %{_datadir}/emacs/site-lisp
%define emacs_startdir %{_datadir}/emacs/site-lisp/site-start.d
%else
%define emacs_version %(pkg-config emacs --modversion)
%define emacs_lispdir %(pkg-config emacs --variable sitepkglispdir)
%define emacs_startdir %(pkg-config emacs --variable sitestartdir)
%endif

Name:           emacs-%{pkg}
Version:        0.7
Release:        2.%{git_pull_date}git%{?dist}
Summary:        Emacs interface to the most common Git operations

Group:          Applications/Editors
License:        GPLv3+ and GFDL+
URL:            http://zagadka.vm.bytemark.co.uk/magit/magit.html

# The source for this package was pulled from upstream's vcs.
# Use the following commands to generate the tarball:
#  git clone git://gitorious.org/magit/mainline.git magit-0.7.20090122
#  tar zcf magit-0.7.20090122.tar.gz magit-0.7.20090122
Source0:        magit-%{version}.%{git_pull_date}.tar.gz

# Include FDL into the Texinfo docs (patch submitted upstream)
Patch0:         emacs-magit-include-fdl.patch

BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  automake emacs emacs-el
Requires:       emacs(bin) >= %{emacs_version}

%description
%{pkgname} is an add-on package for GNU Emacs. It is an interface to
the Git source-code management system that aims to make the most
common operations convenient.

%package el
Summary:        Elisp source files for %{pkgname} under GNU Emacs
Group:          Applications/Editors
Requires:       %{name} = %{version}-%{release}

%description el
This package contains the elisp source files for %{pkgname} under GNU Emacs. You
do not need to install this package to run %{pkgname}. Install the %{name}
package to use %{pkgname} with GNU Emacs.

%prep
%setup -q -n magit-%{version}.%{git_pull_date}
%patch0 -p1

%build
./autogen.sh
%configure
make

%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{emacs_startdir}
cp 50magit.el $RPM_BUILD_ROOT%{emacs_startdir}/emacs-magit-mode.el
mkdir -p $RPM_BUILD_ROOT%{emacs_lispdir}/%{pkg}
cp magit.el magit.elc $RPM_BUILD_ROOT%{emacs_lispdir}/%{pkg}
mkdir -p $RPM_BUILD_ROOT%{_infodir}
gzip -9 < magit.info > $RPM_BUILD_ROOT%{_infodir}/magit.info.gz


%clean
rm -rf $RPM_BUILD_ROOT


%post
/sbin/install-info /usr/share/info/magit.info.gz /usr/share/info/dir


%preun
if [ "$1" = 0 ]; then
    /sbin/install-info --delete /usr/share/info/magit.info.gz /usr/share/info/dir
fi


%files
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog NEWS README COPYING
%{emacs_lispdir}/%{pkg}/*.elc
%{emacs_startdir}/*.el
%{_infodir}/magit.info.gz
%dir %{emacs_lispdir}/%{pkg}

%files el
%defattr(-,root,root,-)
%{emacs_lispdir}/%{pkg}/*.el

%changelog
* Tue Jan 27 2009  <tom at moertel.com> - 0.7-2.20090122git
- Made fixes per Fedora packaging review (thanks Jerry James)

* Fri Jan 23 2009  <tom at moertel.com> - 0.7-1.20090122git
- Initial packaging.


--- NEW FILE import.log ---
emacs-magit-0_7-2_20090122git_fc10:F-10:emacs-magit-0.7-2.20090122git.fc10.src.rpm:1233200896


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/emacs-magit/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	29 Jan 2009 00:14:36 -0000	1.1
+++ .cvsignore	29 Jan 2009 03:48:54 -0000	1.2
@@ -0,0 +1 @@
+magit-0.7.20090122.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/emacs-magit/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	29 Jan 2009 00:14:36 -0000	1.1
+++ sources	29 Jan 2009 03:48:55 -0000	1.2
@@ -0,0 +1 @@
+30b886dd1f999b64959b40e61b494700  magit-0.7.20090122.tar.gz



From jjames at fedoraproject.org  Thu Jan 29 03:54:53 2009
From: jjames at fedoraproject.org (Jerry James)
Date: Thu, 29 Jan 2009 03:54:53 +0000 (UTC)
Subject: rpms/findbugs-bcel/devel bcel.diff, NONE, 1.1 findbugs-bcel.spec,
	NONE, 
	1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090129035453.74A4470116@cvs1.fedora.phx.redhat.com>

Author: jjames

Update of /cvs/pkgs/rpms/findbugs-bcel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21498/devel

Modified Files:
	.cvsignore sources 
Added Files:
	bcel.diff findbugs-bcel.spec import.log 
Log Message:
* Tue Jan 13 2009 Jerry James <loganjerry at gmail.com> - 5.2-1.3.7.1
- Add '-source 1.5' to the javac and javadoc invocations

* Fri Jan  2 2009 Jerry James <loganjerry at gmail.com> - 5.2-1.3.7
- Update to the findbugs 1.3.7 version of the BCEL patch

* Mon Dec  8 2008 Jerry James <loganjerry at gmail.com> - 5.2-1.3.6
- Update to the findbugs 1.3.6 version of the BCEL patch

* Thu Sep 18 2008 Jerry James <loganjerry at gmail.com> - 5.2-1.3.5
- Initial RPM


bcel.diff:

--- NEW FILE bcel.diff ---

Property changes on: /Users/pugh/Documents/eclipse/workspace/jakarta-bcel-5.2
___________________________________________________________________
Name: svn:ignore
   - bin
velocity.log
*~
   + bin
velocity.log
*~
bcel.jar


Index: /Users/pugh/Documents/eclipse/workspace/jakarta-bcel-5.2/.classpath
===================================================================
--- /Users/pugh/Documents/eclipse/workspace/jakarta-bcel-5.2/.classpath	(revision 510968)
+++ /Users/pugh/Documents/eclipse/workspace/jakarta-bcel-5.2/.classpath	(working copy)
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src/java"/>
-	<classpathentry kind="src" path="examples"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="output" path="eclipse"/>
 </classpath>
Index: /Users/pugh/Documents/eclipse/workspace/jakarta-bcel-5.2/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- /Users/pugh/Documents/eclipse/workspace/jakarta-bcel-5.2/.settings/org.eclipse.jdt.core.prefs	(revision 510968)
+++ /Users/pugh/Documents/eclipse/workspace/jakarta-bcel-5.2/.settings/org.eclipse.jdt.core.prefs	(working copy)
@@ -1,12 +1,12 @@
-#Tue Jan 24 00:19:24 EST 2006
+#Fri Feb 23 10:19:35 EST 2007
 eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.4
+org.eclipse.jdt.core.compiler.compliance=1.5
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
-org.eclipse.jdt.core.compiler.source=1.3
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.5
Index: /Users/pugh/Documents/eclipse/workspace/jakarta-bcel-5.2/build.xml
===================================================================
--- /Users/pugh/Documents/eclipse/workspace/jakarta-bcel-5.2/build.xml	(revision 0)
+++ /Users/pugh/Documents/eclipse/workspace/jakarta-bcel-5.2/build.xml	(revision 0)
@@ -0,0 +1,39 @@
+<project name="bcel" default="jar">
+
+	<property name="src.dir" value="src/java"/>
+	<property name="classes.dir" value="eclipse"/>
+	<property name="jar.dir" value="."/>
+
+	<target name="jar" depends="clean,classes">
+		<!-- Main engine and command line jar file. -->
+		<jar destfile="${jar.dir}/bcel.jar" >
+			<!-- Compiled classes, properties files. -->
+			<fileset dir="${classes.dir}">
+				<include name="**/*.class"/>
+			</fileset>
+		</jar>
+   </target>
+	
+	<!-- Compile Java source files, and copy other files (properties,
+		images, html, XSL stylesheets) that need to be part of the codebase. -->
+	<target name="classes">
+		<mkdir dir="${classes.dir}"/>
+		<!-- Compile Java source files. -->
+		<javac srcdir="${src.dir}"
+						destdir="${classes.dir}"
+						source="1.5"
+						target="jsr14"
+						deprecation="on"
+						debug="on">
+				</javac>
+	</target>
+	<!-- Delete generated files. -->
+	<target name="clean">
+		<delete file="${classes.dir}"/>
+		<mkdir dir="${classes.dir}"/>
+	</target>
+
+	
+</project>
+
+<!-- vim:set ts=4: -->
Index: /Users/pugh/Documents/eclipse/workspace/jakarta-bcel-5.2/src/java/org/apache/bcel/classfile/AbstractLocalVariableTable.java
===================================================================
--- /Users/pugh/Documents/eclipse/workspace/jakarta-bcel-5.2/src/java/org/apache/bcel/classfile/AbstractLocalVariableTable.java	(revision 0)
+++ /Users/pugh/Documents/eclipse/workspace/jakarta-bcel-5.2/src/java/org/apache/bcel/classfile/AbstractLocalVariableTable.java	(revision 0)
@@ -0,0 +1,187 @@
+/*
+ * Copyright  2000-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License"); 
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License. 
+ *
+ */
+package org.apache.bcel.classfile;
+
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
+import java.io.IOException;
+import org.apache.bcel.Constants;
+
+/**
+ * This class represents colection of local variables in a
+ * method. This attribute is contained in the <em>Code</em> attribute.
+ *
+ * @version $Id: bcel.diff,v 1.2 2007/08/14 03:33:02 wpugh Exp $
+ * @author  <A HREF="mailto:m.dahm at gmx.de">M. Dahm</A>
+ * @see     Code
+ * @see LocalVariable
+ */
+abstract public class AbstractLocalVariableTable extends Attribute {
+
+    private int local_variable_table_length; // Table of local
+    private LocalVariable[] local_variable_table; // variables
+
+
+    /**
+     * Initialize from another object. Note that both objects use the same
+     * references (shallow copy). Use copy() for a physical copy.
+     */
+    public AbstractLocalVariableTable(AbstractLocalVariableTable c) {
+        this(c.getNameIndex(), c.getLength(), c.getLocalVariableTable(), c.getConstantPool());
+    }
+
+
+    /**
+     * @param name_index Index in constant pool to `LocalVariableTable'
+     * @param length Content length in bytes
+     * @param local_variable_table Table of local variables
+     * @param constant_pool Array of constants
+     */
+    public AbstractLocalVariableTable(int name_index, int length, LocalVariable[] local_variable_table,
+            ConstantPool constant_pool) {
+        super(Constants.ATTR_LOCAL_VARIABLE_TABLE, name_index, length, constant_pool);
+        setLocalVariableTable(local_variable_table);
+    }
+
+
+    /**
+     * Construct object from file stream.
+     * @param name_index Index in constant pool
+     * @param length Content length in bytes
+     * @param file Input stream
+     * @param constant_pool Array of constants
+     * @throws IOException
+     */
+    AbstractLocalVariableTable(int name_index, int length, DataInputStream file, ConstantPool constant_pool)
+            throws IOException {
+        this(name_index, length, (LocalVariable[]) null, constant_pool);
+        local_variable_table_length = (file.readUnsignedShort());
+        local_variable_table = new LocalVariable[local_variable_table_length];
+        for (int i = 0; i < local_variable_table_length; i++) {
+            local_variable_table[i] = new LocalVariable(file, constant_pool);
+        }
+    }
+
+
+
+
+    /**
+     * Dump local variable table attribute to file stream in binary format.
+     *
+     * @param file Output file stream
+     * @throws IOException
+     */
+    public final void dump( DataOutputStream file ) throws IOException {
+        super.dump(file);
+        file.writeShort(local_variable_table_length);
+        for (int i = 0; i < local_variable_table_length; i++) {
+            local_variable_table[i].dump(file);
+        }
+    }
+
+
+    /**
+     * @return Array of local variables of method.
+     */
+    public final LocalVariable[] getLocalVariableTable() {
+        return local_variable_table;
+    }
+
+
+    /** 
+     * @return first matching variable using index
+     * 
+     * @param index the variable slot
+     * 
+     * @return the first LocalVariable that matches the slot or null if not found
+     * 
+     * @deprecated since 5.2 because multiple variables can share the
+     *             same slot, use getLocalVariable(int index, int pc) instead.
+     */
+    public final LocalVariable getLocalVariable( int index ) {
+        for (int i = 0; i < local_variable_table_length; i++) {
+            if (local_variable_table[i].getIndex() == index) {
+                return local_variable_table[i];
+            }
+        }
+        return null;
+    }
+
+
+    /** 
+     * @return matching variable using index when variable is used at supplied pc
+     * 
+     * @param index the variable slot
+     * @param pc the current pc that this variable is alive
+     * 
+     * @return the LocalVariable that matches or null if not found
+     */
+    public final LocalVariable getLocalVariable( int index, int pc ) {
+        for (int i = 0; i < local_variable_table_length; i++) {
+            if (local_variable_table[i].getIndex() == index) {
+                int start_pc = local_variable_table[i].getStartPC();
+                int end_pc = start_pc + local_variable_table[i].getLength();
+                if ((pc >= start_pc) && (pc < end_pc)) {
+                    return local_variable_table[i];
+                }
+            }
+        }
+        return null;
+    }
+
+
+    public final void setLocalVariableTable( LocalVariable[] local_variable_table ) {
+        this.local_variable_table = local_variable_table;
+        local_variable_table_length = (local_variable_table == null)
+                ? 0
+                : local_variable_table.length;
+    }
+
+
+    /**
+     * @return String representation.
+     */
+    public final String toString() {
+        StringBuffer buf = new StringBuffer("");
+        for (int i = 0; i < local_variable_table_length; i++) {
+            buf.append(local_variable_table[i].toString());
+            if (i < local_variable_table_length - 1) {
+                buf.append('\n');
+            }
+        }
+        return buf.toString();
+    }
+
+
+    /**
+     * @return deep copy of this attribute
+     */
+    public Attribute copy( ConstantPool _constant_pool ) {
+        AbstractLocalVariableTable c = (AbstractLocalVariableTable) clone();
+        c.local_variable_table = new LocalVariable[local_variable_table_length];
+        for (int i = 0; i < local_variable_table_length; i++) {
+            c.local_variable_table[i] = local_variable_table[i].copy();
+        }
+        c.constant_pool = _constant_pool;
+        return c;
+    }
+
+
+    public final int getTableLength() {
+        return local_variable_table_length;
+    }
+}
Index: /Users/pugh/Documents/eclipse/workspace/jakarta-bcel-5.2/src/java/org/apache/bcel/classfile/Attribute.java
===================================================================
--- /Users/pugh/Documents/eclipse/workspace/jakarta-bcel-5.2/src/java/org/apache/bcel/classfile/Attribute.java	(revision 510968)
+++ /Users/pugh/Documents/eclipse/workspace/jakarta-bcel-5.2/src/java/org/apache/bcel/classfile/Attribute.java	(working copy)
@@ -159,7 +159,9 @@
                 return new LineNumberTable(name_index, length, file, constant_pool);
             case Constants.ATTR_LOCAL_VARIABLE_TABLE:
                 return new LocalVariableTable(name_index, length, file, constant_pool);
-            case Constants.ATTR_INNER_CLASSES:
+            case Constants.ATTR_LOCAL_VARIABLE_TYPE_TABLE:
+                return new LocalVariableTypeTable(name_index, length, file, constant_pool);
+           case Constants.ATTR_INNER_CLASSES:
                 return new InnerClasses(name_index, length, file, constant_pool);
             case Constants.ATTR_SYNTHETIC:
                 return new Synthetic(name_index, length, file, constant_pool);
Index: /Users/pugh/Documents/eclipse/workspace/jakarta-bcel-5.2/src/java/org/apache/bcel/classfile/Constant.java
===================================================================
--- /Users/pugh/Documents/eclipse/workspace/jakarta-bcel-5.2/src/java/org/apache/bcel/classfile/Constant.java	(revision 510968)
+++ /Users/pugh/Documents/eclipse/workspace/jakarta-bcel-5.2/src/java/org/apache/bcel/classfile/Constant.java	(working copy)
@@ -141,7 +141,7 @@
             case Constants.CONSTANT_NameAndType:
                 return new ConstantNameAndType(file);
             case Constants.CONSTANT_Utf8:
-                return new ConstantUtf8(file);
+                return ConstantUtf8.getInstance(file);
             default:
                 throw new ClassFormatException("Invalid byte tag in constant pool: " + b);
         }
Index: /Users/pugh/Documents/eclipse/workspace/jakarta-bcel-5.2/src/java/org/apache/bcel/classfile/ConstantUtf8.java
===================================================================
--- /Users/pugh/Documents/eclipse/workspace/jakarta-bcel-5.2/src/java/org/apache/bcel/classfile/ConstantUtf8.java	(revision 510968)
+++ /Users/pugh/Documents/eclipse/workspace/jakarta-bcel-5.2/src/java/org/apache/bcel/classfile/ConstantUtf8.java	(working copy)
@@ -19,7 +19,14 @@
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.Map;
+
 import org.apache.bcel.Constants;
+import org.apache.bcel.generic.ObjectType;
+
+import com.sun.org.apache.xerces.internal.impl.io.UTF8Reader;
 
 /** 
  * This class is derived from the abstract 
@@ -32,9 +39,60 @@
  */
 public final class ConstantUtf8 extends Constant {
 
-    private String bytes;
+     private final String bytes;
+    
+    private static final int MAX_CACHE_ENTRIES = 20000;
+    private static final int INITIAL_CACHE_CAPACITY = (int)(MAX_CACHE_ENTRIES/0.75);
+    private static HashMap<String, ConstantUtf8> cache;
+    private static int considered = 0;
+    private static int hits = 0;
+    private static int skipped = 0;
+    private static int created = 0;
+    final static boolean BCEL_STATISTICS = Boolean.getBoolean("bcel.statistics");
+    final static boolean BCEL_DONT_CACHE = Boolean.getBoolean("bcel.dontCache");
+    
+    static {
+        if (BCEL_STATISTICS)
+        Runtime.getRuntime().addShutdownHook(new Thread() {
+            public void run() {
+                System.err.println("Cache hit " + hits + "/" + considered +", " 
+                        + skipped + " skipped");
+                System.err.println("Total of " + created + " ConstantUtf8 objects created");
+            }
+        });
+    }
+    public  static synchronized ConstantUtf8 getCachedInstance(String s) {
+        if (BCEL_DONT_CACHE || s.length() > 200) {
+            skipped++;
+            return  new ConstantUtf8(s);
+        }
+        considered++;
+        if (cache == null)  {
+                      cache = new LinkedHashMap<String, ConstantUtf8>(INITIAL_CACHE_CAPACITY, 0.75f, true) {
+            
+            protected boolean removeEldestEntry(Map.Entry eldest) {
+               return size() > MAX_CACHE_ENTRIES;
+            }
+            
+        };
+        }
+        ConstantUtf8 result = cache.get(s);
+        if (result != null) {
+            hits++;
+            return result;
+        }
+        result = new ConstantUtf8(s);
+        cache.put(s, result);
+        return result;
+    }
 
+    public static ConstantUtf8 getInstance(String s) {
+        return getCachedInstance(s);
+    }
 
+    public static ConstantUtf8 getInstance (DataInputStream file)  throws IOException {
+        return getInstance(file.readUTF());
+    }
     /**
      * Initialize from another object.
      */
@@ -52,6 +110,7 @@
     ConstantUtf8(DataInputStream file) throws IOException {
         super(Constants.CONSTANT_Utf8);
         bytes = file.readUTF();
+        created++;
     }
 
 
@@ -64,6 +123,7 @@
             throw new IllegalArgumentException("bytes must not be null!");
         }
         this.bytes = bytes;
+        created++;
     }
 
 
@@ -101,9 +161,10 @@
 
     /**
      * @param bytes the raw bytes of this Utf-8
+     * @deprecated
      */
     public final void setBytes( String bytes ) {
-        this.bytes = bytes;
+        throw new UnsupportedOperationException();
     }
 
 
Index: /Users/pugh/Documents/eclipse/workspace/jakarta-bcel-5.2/src/java/org/apache/bcel/classfile/DescendingVisitor.java
===================================================================
--- /Users/pugh/Documents/eclipse/workspace/jakarta-bcel-5.2/src/java/org/apache/bcel/classfile/DescendingVisitor.java	(revision 510968)
+++ /Users/pugh/Documents/eclipse/workspace/jakarta-bcel-5.2/src/java/org/apache/bcel/classfile/DescendingVisitor.java	(working copy)
@@ -185,6 +185,9 @@
         }
         stack.pop();
     }
+    public void visitLocalVariableTypeTable( LocalVariableTypeTable table ) {
+        
+    }
 
 
     public void visitStackMap( StackMap table ) {
Index: /Users/pugh/Documents/eclipse/workspace/jakarta-bcel-5.2/src/java/org/apache/bcel/classfile/EmptyVisitor.java
===================================================================
--- /Users/pugh/Documents/eclipse/workspace/jakarta-bcel-5.2/src/java/org/apache/bcel/classfile/EmptyVisitor.java	(revision 510968)
+++ /Users/pugh/Documents/eclipse/workspace/jakarta-bcel-5.2/src/java/org/apache/bcel/classfile/EmptyVisitor.java	(working copy)
@@ -158,4 +158,10 @@
 
     public void visitStackMapEntry( StackMapEntry obj ) {
     }
+
+
+    public void visitLocalVariableTypeTable(LocalVariableTypeTable obj) {
+        // TODO Auto-generated method stub
+        
+    }
 }
Index: /Users/pugh/Documents/eclipse/workspace/jakarta-bcel-5.2/src/java/org/apache/bcel/classfile/LineNumber.java
===================================================================
--- /Users/pugh/Documents/eclipse/workspace/jakarta-bcel-5.2/src/java/org/apache/bcel/classfile/LineNumber.java	(revision 510968)
+++ /Users/pugh/Documents/eclipse/workspace/jakarta-bcel-5.2/src/java/org/apache/bcel/classfile/LineNumber.java	(working copy)
@@ -32,8 +32,8 @@
  */
 public final class LineNumber implements Cloneable, Node, Serializable {
 
-    private int start_pc; // Program Counter (PC) corresponds to line
-    private int line_number; // number in source file
+    private short start_pc; // Program Counter (PC) corresponds to line
+    private short line_number; // number in source file
 
 
     /**
@@ -59,8 +59,8 @@
      * @param line_number line number in source file
      */
     public LineNumber(int start_pc, int line_number) {
-        this.start_pc = start_pc;
-        this.line_number = line_number;
+        this.start_pc = (short) start_pc;
+        this.line_number = (short)line_number;
     }
 
 
@@ -92,7 +92,7 @@
      * @return Corresponding source line
      */
     public final int getLineNumber() {
-        return line_number;
+        return 0xffff & line_number;
     }
 
 
@@ -100,7 +100,7 @@
      * @return PC in code
      */
     public final int getStartPC() {
-        return start_pc;
+        return  0xffff & start_pc;
     }
 
 
@@ -108,7 +108,7 @@
      * @param line_number the source line number
      */
     public final void setLineNumber( int line_number ) {
-        this.line_number = line_number;
+        this.line_number = (short) line_number;
     }
 
 
@@ -116,7 +116,7 @@
      * @param start_pc the pc for this line number
      */
     public final void setStartPC( int start_pc ) {
-        this.start_pc = start_pc;
+        this.start_pc = (short) start_pc;
     }
 
 
Index: /Users/pugh/Documents/eclipse/workspace/jakarta-bcel-5.2/src/java/org/apache/bcel/classfile/LocalVariableTable.java
===================================================================
--- /Users/pugh/Documents/eclipse/workspace/jakarta-bcel-5.2/src/java/org/apache/bcel/classfile/LocalVariableTable.java	(revision 510968)
+++ /Users/pugh/Documents/eclipse/workspace/jakarta-bcel-5.2/src/java/org/apache/bcel/classfile/LocalVariableTable.java	(working copy)
@@ -30,11 +30,7 @@
  * @see     Code
  * @see LocalVariable
  */
-public class LocalVariableTable extends Attribute {
-
-    private int local_variable_table_length; // Table of local
-    private LocalVariable[] local_variable_table; // variables
-
+public class LocalVariableTable extends AbstractLocalVariableTable {
 
     /**
      * Initialize from another object. Note that both objects use the same
@@ -53,8 +49,7 @@
      */
     public LocalVariableTable(int name_index, int length, LocalVariable[] local_variable_table,
             ConstantPool constant_pool) {
-        super(Constants.ATTR_LOCAL_VARIABLE_TABLE, name_index, length, constant_pool);
-        setLocalVariableTable(local_variable_table);
+        super(name_index,length, local_variable_table, constant_pool);
     }
 
 
@@ -68,12 +63,7 @@
      */
     LocalVariableTable(int name_index, int length, DataInputStream file, ConstantPool constant_pool)
             throws IOException {
-        this(name_index, length, (LocalVariable[]) null, constant_pool);
-        local_variable_table_length = (file.readUnsignedShort());
-        local_variable_table = new LocalVariable[local_variable_table_length];
-        for (int i = 0; i < local_variable_table_length; i++) {
-            local_variable_table[i] = new LocalVariable(file, constant_pool);
-        }
+       super(name_index,length, file, constant_pool);
     }
 
 
@@ -87,111 +77,4 @@
     public void accept( Visitor v ) {
         v.visitLocalVariableTable(this);
     }
-
-
-    /**
-     * Dump local variable table attribute to file stream in binary format.
-     *
-     * @param file Output file stream
-     * @throws IOException
-     */
-    public final void dump( DataOutputStream file ) throws IOException {
-        super.dump(file);
-        file.writeShort(local_variable_table_length);
-        for (int i = 0; i < local_variable_table_length; i++) {
-            local_variable_table[i].dump(file);
-        }
-    }
-
-
-    /**
-     * @return Array of local variables of method.
-     */
-    public final LocalVariable[] getLocalVariableTable() {
-        return local_variable_table;
-    }
-
-
-    /** 
-     * @return first matching variable using index
-     * 
-     * @param index the variable slot
-     * 
-     * @return the first LocalVariable that matches the slot or null if not found
-     * 
-     * @deprecated since 5.2 because multiple variables can share the
-     *             same slot, use getLocalVariable(int index, int pc) instead.
-     */
-    public final LocalVariable getLocalVariable( int index ) {
-        for (int i = 0; i < local_variable_table_length; i++) {
-            if (local_variable_table[i].getIndex() == index) {
-                return local_variable_table[i];
-            }
-        }
-        return null;
-    }
-
-
-    /** 
-     * @return matching variable using index when variable is used at supplied pc
-     * 
-     * @param index the variable slot
-     * @param pc the current pc that this variable is alive
-     * 
-     * @return the LocalVariable that matches or null if not found
-     */
-    public final LocalVariable getLocalVariable( int index, int pc ) {
-        for (int i = 0; i < local_variable_table_length; i++) {
-            if (local_variable_table[i].getIndex() == index) {
-                int start_pc = local_variable_table[i].getStartPC();
-                int end_pc = start_pc + local_variable_table[i].getLength();
-                if ((pc >= start_pc) && (pc < end_pc)) {
-                    return local_variable_table[i];
-                }
-            }
-        }
-        return null;
-    }
-
-
-    public final void setLocalVariableTable( LocalVariable[] local_variable_table ) {
-        this.local_variable_table = local_variable_table;
-        local_variable_table_length = (local_variable_table == null)
-                ? 0
-                : local_variable_table.length;
-    }
-
-
-    /**
-     * @return String representation.
-     */
-    public final String toString() {
-        StringBuffer buf = new StringBuffer("");
-        for (int i = 0; i < local_variable_table_length; i++) {
-            buf.append(local_variable_table[i].toString());
-            if (i < local_variable_table_length - 1) {
-                buf.append('\n');
-            }
-        }
-        return buf.toString();
-    }
-
-
-    /**
-     * @return deep copy of this attribute
-     */
-    public Attribute copy( ConstantPool _constant_pool ) {
-        LocalVariableTable c = (LocalVariableTable) clone();
-        c.local_variable_table = new LocalVariable[local_variable_table_length];
-        for (int i = 0; i < local_variable_table_length; i++) {
-            c.local_variable_table[i] = local_variable_table[i].copy();
-        }
-        c.constant_pool = _constant_pool;
-        return c;
-    }
-
-
-    public final int getTableLength() {
-        return local_variable_table_length;
-    }
 }
Index: /Users/pugh/Documents/eclipse/workspace/jakarta-bcel-5.2/src/java/org/apache/bcel/classfile/LocalVariableTypeTable.java
===================================================================
--- /Users/pugh/Documents/eclipse/workspace/jakarta-bcel-5.2/src/java/org/apache/bcel/classfile/LocalVariableTypeTable.java	(revision 0)
+++ /Users/pugh/Documents/eclipse/workspace/jakarta-bcel-5.2/src/java/org/apache/bcel/classfile/LocalVariableTypeTable.java	(revision 0)
@@ -0,0 +1,22 @@
+package org.apache.bcel.classfile;
+
+import java.io.DataInputStream;
+import java.io.IOException;
+
+public class LocalVariableTypeTable extends AbstractLocalVariableTable {
+
+    public LocalVariableTypeTable(int name_index, int length, DataInputStream file, ConstantPool constant_pool) throws IOException {
+        super(name_index, length, file, constant_pool);
+    }
+    
+    /**
+     * Called by objects that are traversing the nodes of the tree implicitely
+     * defined by the contents of a Java class. I.e., the hierarchy of methods,
+     * fields, attributes, etc. spawns a tree of objects.
+     *
+     * @param v Visitor object
+     */
+    public void accept( Visitor v ) {
+        v.visitLocalVariableTypeTable(this);
+    }
+}
Index: /Users/pugh/Documents/eclipse/workspace/jakarta-bcel-5.2/src/java/org/apache/bcel/classfile/Visitor.java
===================================================================
--- /Users/pugh/Documents/eclipse/workspace/jakarta-bcel-5.2/src/java/org/apache/bcel/classfile/Visitor.java	(revision 510968)
+++ /Users/pugh/Documents/eclipse/workspace/jakarta-bcel-5.2/src/java/org/apache/bcel/classfile/Visitor.java	(working copy)
@@ -103,6 +103,7 @@
 
 
     public void visitLocalVariableTable( LocalVariableTable obj );
+    public void visitLocalVariableTypeTable( LocalVariableTypeTable obj );
 
 
     public void visitMethod( Method obj );
Index: /Users/pugh/Documents/eclipse/workspace/jakarta-bcel-5.2/src/java/org/apache/bcel/Constants.java
===================================================================
--- /Users/pugh/Documents/eclipse/workspace/jakarta-bcel-5.2/src/java/org/apache/bcel/Constants.java	(revision 510968)
+++ /Users/pugh/Documents/eclipse/workspace/jakarta-bcel-5.2/src/java/org/apache/bcel/Constants.java	(working copy)
@@ -729,13 +729,16 @@
   public static final byte ATTR_PMG                           			= 9;
   public static final byte ATTR_SIGNATURE                     			= 10;
   public static final byte ATTR_STACK_MAP                     			= 11;
-  public static final byte ATTR_RUNTIMEVISIBLE_ANNOTATIONS    			= 12;
-  public static final byte ATTR_RUNTIMEINVISIBLE_ANNOTATIONS  			= 13;
-  public static final byte ATTR_RUNTIMEVISIBLE_PARAMETER_ANNOTATIONS 	= 14;
-  public static final byte ATTR_RUNTIMEINVISIBLE_PARAMETER_ANNOTATIONS 	= 15;
-  public static final byte ATTR_ANNOTATION_DEFAULT                      = 16;
+  public static final byte ATTR_LOCAL_VARIABLE_TYPE_TABLE                    = 12;
+  public static final byte ATTR_RUNTIMEVISIBLE_ANNOTATIONS    			= 13;
+  public static final byte ATTR_RUNTIMEINVISIBLE_ANNOTATIONS  			= 14;
+  public static final byte ATTR_RUNTIMEVISIBLE_PARAMETER_ANNOTATIONS 	= 15;
+  public static final byte ATTR_RUNTIMEINVISIBLE_PARAMETER_ANNOTATIONS 	= 16;
+  public static final byte ATTR_ANNOTATION_DEFAULT                      = 17;
+ 
+  
 
-  public static final short KNOWN_ATTRIBUTES = 12;//should be 17
+  public static final short KNOWN_ATTRIBUTES = 13;//should be 17
 
   public static final String[] ATTRIBUTE_NAMES = {
     "SourceFile", "ConstantValue", "Code", "Exceptions",
@@ -741,7 +744,7 @@
     "SourceFile", "ConstantValue", "Code", "Exceptions",
     "LineNumberTable", "LocalVariableTable",
     "InnerClasses", "Synthetic", "Deprecated",
-    "PMGClass", "Signature", "StackMap", 
+    "PMGClass", "Signature", "StackMap", "LocalVariableTypeTable", 
     "RuntimeVisibleAnnotations", "RuntimeInvisibleAnnotations",
     "RuntimeVisibleParameterAnnotations", "RuntimeInvisibleParameterAnnotations",
     "AnnotationDefault"
Index: /Users/pugh/Documents/eclipse/workspace/jakarta-bcel-5.2/src/java/org/apache/bcel/generic/ArrayType.java
===================================================================
--- /Users/pugh/Documents/eclipse/workspace/jakarta-bcel-5.2/src/java/org/apache/bcel/generic/ArrayType.java	(revision 510968)
+++ /Users/pugh/Documents/eclipse/workspace/jakarta-bcel-5.2/src/java/org/apache/bcel/generic/ArrayType.java	(working copy)
@@ -46,7 +46,7 @@
      * @param class_name complete name of class (java.lang.String, e.g.)
      */
     public ArrayType(String class_name, int dimensions) {
-        this(new ObjectType(class_name), dimensions);
+        this(ObjectType.getInstance(class_name), dimensions);
     }
 
 
Index: /Users/pugh/Documents/eclipse/workspace/jakarta-bcel-5.2/src/java/org/apache/bcel/generic/FieldGen.java
===================================================================
--- /Users/pugh/Documents/eclipse/workspace/jakarta-bcel-5.2/src/java/org/apache/bcel/generic/FieldGen.java	(revision 510968)
+++ /Users/pugh/Documents/eclipse/workspace/jakarta-bcel-5.2/src/java/org/apache/bcel/generic/FieldGen.java	(working copy)
@@ -107,7 +107,7 @@
      * by the JVM automatically.
      */
     public void setInitValue( String str ) {
-        checkType(new ObjectType("java.lang.String"));
+        checkType(  ObjectType.getInstance("java.lang.String"));
         if (str != null) {
             value = str;
         }
Index: /Users/pugh/Documents/eclipse/workspace/jakarta-bcel-5.2/src/java/org/apache/bcel/generic/FieldOrMethod.java
===================================================================
--- /Users/pugh/Documents/eclipse/workspace/jakarta-bcel-5.2/src/java/org/apache/bcel/generic/FieldOrMethod.java	(revision 510968)
+++ /Users/pugh/Documents/eclipse/workspace/jakarta-bcel-5.2/src/java/org/apache/bcel/generic/FieldOrMethod.java	(working copy)
@@ -94,7 +94,7 @@
      *    getReferenceType() instead.
      */
     public ObjectType getClassType( ConstantPoolGen cpg ) {
-        return new ObjectType(getClassName(cpg));
+        return ObjectType.getInstance(getClassName(cpg));
     }
 
 
@@ -115,7 +115,7 @@
             return (ArrayType) Type.getType(className);
         } else {
             className = className.replace('/', '.');
-            return new ObjectType(className);
+            return ObjectType.getInstance(className);
         }
     }
 
Index: /Users/pugh/Documents/eclipse/workspace/jakarta-bcel-5.2/src/java/org/apache/bcel/generic/InstructionFactory.java
===================================================================
--- /Users/pugh/Documents/eclipse/workspace/jakarta-bcel-5.2/src/java/org/apache/bcel/generic/InstructionFactory.java	(revision 510968)
+++ /Users/pugh/Documents/eclipse/workspace/jakarta-bcel-5.2/src/java/org/apache/bcel/generic/InstructionFactory.java	(working copy)
@@ -616,7 +616,7 @@
 
 
     public NEW createNew( String s ) {
-        return createNew(new ObjectType(s));
+        return createNew(ObjectType.getInstance(s));
     }
 
 
Index: /Users/pugh/Documents/eclipse/workspace/jakarta-bcel-5.2/src/java/org/apache/bcel/generic/MethodGen.java
===================================================================
--- /Users/pugh/Documents/eclipse/workspace/jakarta-bcel-5.2/src/java/org/apache/bcel/generic/MethodGen.java	(revision 510968)
+++ /Users/pugh/Documents/eclipse/workspace/jakarta-bcel-5.2/src/java/org/apache/bcel/generic/MethodGen.java	(working copy)
@@ -122,7 +122,7 @@
             /* Add local variables, namely the implicit `this' and the arguments
              */
             if (!isStatic() && (class_name != null)) { // Instance method -> `this' is local var 0
-                addLocalVariable("this", new ObjectType(class_name), start, end);
+                addLocalVariable("this",  ObjectType.getInstance(class_name), start, end);
             }
         }
         if (arg_types != null) {
@@ -183,7 +183,7 @@
                         if (type > 0) {
                             String cen = m.getConstantPool().getConstantString(type,
                                     Constants.CONSTANT_Class);
-                            c_type = new ObjectType(cen);
+                            c_type =  ObjectType.getInstance(cen);
                         }
                         int end_pc = ce.getEndPC();
                         int length = m.getCode().getCode().length;
Index: /Users/pugh/Documents/eclipse/workspace/jakarta-bcel-5.2/src/java/org/apache/bcel/generic/ObjectType.java
===================================================================
--- /Users/pugh/Documents/eclipse/workspace/jakarta-bcel-5.2/src/java/org/apache/bcel/generic/ObjectType.java	(revision 510968)
+++ /Users/pugh/Documents/eclipse/workspace/jakarta-bcel-5.2/src/java/org/apache/bcel/generic/ObjectType.java	(working copy)
@@ -16,6 +16,10 @@
  */
 package org.apache.bcel.generic;
 
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.Map;
+
 import org.apache.bcel.Constants;
 import org.apache.bcel.Repository;
 import org.apache.bcel.classfile.JavaClass;
@@ -20,6 +24,7 @@
 import org.apache.bcel.Repository;
 import org.apache.bcel.classfile.JavaClass;
 
+
 /** 
  * Denotes reference such as java.lang.String.
  *
@@ -28,8 +33,27 @@
  */
 public class ObjectType extends ReferenceType {
 
-    private String class_name; // Class name of type
+    private static final int MAX_CACHE_ENTRIES = 200;
+    private static final int INITIAL_CACHE_CAPACITY = (int)(MAX_CACHE_ENTRIES/0.75);
+    private static HashMap<String, ObjectType> cache;
+    public synchronized static ObjectType getInstance(String class_name) {
+        if (cache == null) 
+            cache = new LinkedHashMap<String, ObjectType>(INITIAL_CACHE_CAPACITY, 0.75f, true) {
+            
+
+            protected boolean removeEldestEntry(Map.Entry eldest) {
+               return size() > MAX_CACHE_ENTRIES;
+            }
+        
+        };
+        ObjectType result = cache.get(class_name);
+        if (result != null) return result;
+        result = new ObjectType(class_name);
+        cache.put(class_name, result);
+        return result;
+    }
 
+    final private String class_name; // Class name of type
 
     /**
      * @param class_name fully qualified class name, e.g. java.lang.String
Index: /Users/pugh/Documents/eclipse/workspace/jakarta-bcel-5.2/src/java/org/apache/bcel/generic/ReferenceType.java
===================================================================
--- /Users/pugh/Documents/eclipse/workspace/jakarta-bcel-5.2/src/java/org/apache/bcel/generic/ReferenceType.java	(revision 510968)
+++ /Users/pugh/Documents/eclipse/workspace/jakarta-bcel-5.2/src/java/org/apache/bcel/generic/ReferenceType.java	(working copy)
@@ -162,7 +162,7 @@
             // 'java.io.Serializable'"
             if ((T instanceof ObjectType) && (((ObjectType) T).referencesInterfaceExact())) {
                 for (int ii = 0; ii < Constants.INTERFACES_IMPLEMENTED_BY_ARRAYS.length; ii++) {
-                    if (T.equals(new ObjectType(Constants.INTERFACES_IMPLEMENTED_BY_ARRAYS[ii]))) {
+                    if (T.equals(ObjectType.getInstance(Constants.INTERFACES_IMPLEMENTED_BY_ARRAYS[ii]))) {
                         return true;
                     }
                 }
@@ -248,7 +248,7 @@
         for (int i = 0; i < t_sups.length; i++) {
             for (int j = 0; j < this_sups.length; j++) {
                 if (this_sups[j].equals(t_sups[i])) {
-                    return new ObjectType(this_sups[j].getClassName());
+                    return ObjectType.getInstance(this_sups[j].getClassName());
                 }
             }
         }
@@ -320,7 +320,7 @@
         for (int i = 0; i < t_sups.length; i++) {
             for (int j = 0; j < this_sups.length; j++) {
                 if (this_sups[j].equals(t_sups[i])) {
-                    return new ObjectType(this_sups[j].getClassName());
+                    return ObjectType.getInstance(this_sups[j].getClassName());
                 }
             }
         }
Index: /Users/pugh/Documents/eclipse/workspace/jakarta-bcel-5.2/src/java/org/apache/bcel/generic/Type.java
===================================================================
--- /Users/pugh/Documents/eclipse/workspace/jakarta-bcel-5.2/src/java/org/apache/bcel/generic/Type.java	(revision 510968)
+++ /Users/pugh/Documents/eclipse/workspace/jakarta-bcel-5.2/src/java/org/apache/bcel/generic/Type.java	(working copy)
@@ -31,7 +31,7 @@
  */
 public abstract class Type implements java.io.Serializable {
 
-    protected byte type;
+    final protected byte type;
     protected String signature; // signature for the type
     /** Predefined constants
      */
@@ -44,11 +44,11 @@
     public static final BasicType DOUBLE = new BasicType(Constants.T_DOUBLE);
     public static final BasicType FLOAT = new BasicType(Constants.T_FLOAT);
     public static final BasicType CHAR = new BasicType(Constants.T_CHAR);
-    public static final ObjectType OBJECT = new ObjectType("java.lang.Object");
-    public static final ObjectType CLASS = new ObjectType("java.lang.Class");
-    public static final ObjectType STRING = new ObjectType("java.lang.String");
-    public static final ObjectType STRINGBUFFER = new ObjectType("java.lang.StringBuffer");
-    public static final ObjectType THROWABLE = new ObjectType("java.lang.Throwable");
+    public static final ObjectType OBJECT = ObjectType.getInstance("java.lang.Object");
+    public static final ObjectType CLASS = ObjectType.getInstance("java.lang.Class");
+    public static final ObjectType STRING = ObjectType.getInstance("java.lang.String");
+    public static final ObjectType STRINGBUFFER = ObjectType.getInstance("java.lang.StringBuffer");
+    public static final ObjectType THROWABLE = ObjectType.getInstance("java.lang.Throwable");
     public static final Type[] NO_ARGS = new Type[0];
     public static final ReferenceType NULL = new ReferenceType() {
     };
@@ -190,7 +190,7 @@
             }
             //corrected concurrent private static field acess
             wrap(consumed_chars, index + 1); // "Lblabla;" `L' and `;' are removed
-            return new ObjectType(signature.substring(1, index).replace('/', '.'));
+            return ObjectType.getInstance(signature.substring(1, index).replace('/', '.'));
         }
     }
 
@@ -278,7 +278,7 @@
                 throw new IllegalStateException("Ooops, what primitive type is " + cl);
             }
         } else { // "Real" class
-            return new ObjectType(cl.getName());
+            return ObjectType.getInstance(cl.getName());
         }
     }
 
Index: /Users/pugh/Documents/eclipse/workspace/jakarta-bcel-5.2/src/java/org/apache/bcel/verifier/structurals/InstConstraintVisitor.java
===================================================================
--- /Users/pugh/Documents/eclipse/workspace/jakarta-bcel-5.2/src/java/org/apache/bcel/verifier/structurals/InstConstraintVisitor.java	(revision 510968)
+++ /Users/pugh/Documents/eclipse/workspace/jakarta-bcel-5.2/src/java/org/apache/bcel/verifier/structurals/InstConstraintVisitor.java	(working copy)
@@ -52,7 +52,7 @@
  */
 public class InstConstraintVisitor extends EmptyVisitor implements org.apache.bcel.generic.Visitor{
 
-	private static ObjectType GENERIC_ARRAY = new ObjectType("org.apache.bcel.verifier.structurals.GenericArray");
+	private static ObjectType GENERIC_ARRAY = ObjectType.getInstance("org.apache.bcel.verifier.structurals.GenericArray");
 
 	/**
 	 * The constructor. Constructs a new instance of this class.
@@ -1207,7 +1207,7 @@
 
 		if (f.isProtected()){
 			ObjectType classtype = o.getClassType(cpg);
-			ObjectType curr = new ObjectType(mg.getClassName());
+			ObjectType curr = ObjectType.getInstance(mg.getClassName());
 
 			if (	classtype.equals(curr) ||
 						curr.subclassOf(classtype)	){
@@ -2531,7 +2531,7 @@
 		
 		if (f.isProtected()){
 			ObjectType classtype = o.getClassType(cpg);
-			ObjectType curr = new ObjectType(mg.getClassName());
+			ObjectType curr = ObjectType.getInstance(mg.getClassName());
 
 			if (	classtype.equals(curr) ||
 						curr.subclassOf(classtype)	){
Index: /Users/pugh/Documents/eclipse/workspace/jakarta-bcel-5.2/src/java/org/apache/bcel/verifier/structurals/Pass3bVerifier.java
===================================================================
--- /Users/pugh/Documents/eclipse/workspace/jakarta-bcel-5.2/src/java/org/apache/bcel/verifier/structurals/Pass3bVerifier.java	(revision 510968)
+++ /Users/pugh/Documents/eclipse/workspace/jakarta-bcel-5.2/src/java/org/apache/bcel/verifier/structurals/Pass3bVerifier.java	(working copy)
@@ -301,7 +301,7 @@
 				Frame f = new Frame(mg.getMaxLocals(),mg.getMaxStack());
 				if ( !mg.isStatic() ){
 					if (mg.getName().equals(Constants.CONSTRUCTOR_NAME)){
-						Frame._this = new UninitializedObjectType(new ObjectType(jc.getClassName()));
+						Frame._this = new UninitializedObjectType(ObjectType.getInstance(jc.getClassName()));
 						f.getLocals().set(0, Frame._this);
 					}
 					else{
@@ -306,7 +306,7 @@
 					}
 					else{
 						Frame._this = null;
-						f.getLocals().set(0, new ObjectType(jc.getClassName()));
+						f.getLocals().set(0, ObjectType.getInstance(jc.getClassName()));
 					}
 				}
 				Type[] argtypes = mg.getArgumentTypes();


--- NEW FILE findbugs-bcel.spec ---
# This is a version of BCEL that has been modified by the findbugs team.  They
# added some new functionality and also did some performance optimizations of
# the base code.  I am not producing a new manual, since we already have a
# bcel-manual package and the findbugs team did not patch the manual.  However,
# the javadoc package is necessary to show the changes in the API created by
# the findbug team's work.

%define findbugsver 1.3.7
%define with_gcj %{!?_without_gcj:1}%{?_without_gcj:0}

Name:           findbugs-bcel
Version:        5.2
Release:        %{findbugsver}%{?dist}.1
Summary:        Byte Code Engineering Library with findbugs extensions

Group:          Development/Libraries/Java
License:        ASL 2.0
URL:            http://jakarta.apache.org/bcel/
Source0:        http://www.apache.org/dist/jakarta/bcel/source/bcel-%{version}-src.tar.gz
# This patch is available in the findbugs release, in src/patches/bcel.diff.
Source1:        bcel.diff
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  java-devel, jpackage-utils
Requires:       java, jpackage-utils

%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

%description
This is a version of Apache's Byte Code Engineering Library (BCEL) that has
been modified by the findbugs developers.  The modifications add some new
functionality, and also introduce a number of performance optimizations to
address findbugs performance problems.  Some of the performance optimizations
induce API changes, so this version of BCEL is not compatible with the vanilla
upstream version.

%package javadoc
Summary:        Javadoc for %{name}
Group:          Development/Documentation

%description javadoc
%{summary}.

%prep
%setup -q -n bcel-%{version}

# The -f option is necessary because the findbugs patch applies to two files
# that are present only in the bcel binary distribution, not in the source
# distribution.  The 'true' invocation is to mask the exit value of 1 that
# patch gives when it skips those two files.
%{__patch} -f -p7 -s < %{SOURCE1} || true

# The findbugs patch introduces a gratuitous import of a com.sun package.
%{__sed} -i \
  -e '/import com.sun.org.apache.xerces.internal.impl.io.UTF8Reader/D' \
  src/java/org/apache/bcel/classfile/ConstantUtf8.java

%build
# The ant and maven builds both try to download unneeded jars
mkdir classes
find src/java -type f -name '*.java' | \
xargs javac -g -d classes -source 1.5 -encoding ISO8859-1
cd classes
jar cf findbugs-bcel-%{findbugsver}.jar org
cd ..

mkdir javadoc
find src/java -type f -name '*.java' | xargs javadoc -sourcepath src/java \
  -classpath classes -source 1.5 -encoding ISO8859-1 -d javadoc 

%install
rm -rf $RPM_BUILD_ROOT

mkdir -p $RPM_BUILD_ROOT%{_javadir}
cp -p classes/findbugs-bcel-%{findbugsver}.jar $RPM_BUILD_ROOT%{_javadir}
ln -s findbugs-bcel-%{findbugsver}.jar $RPM_BUILD_ROOT%{_javadir}/findbugs-bcel.jar

mkdir -p $RPM_BUILD_ROOT%{_javadocdir}
cp -a javadoc $RPM_BUILD_ROOT%{_javadocdir}/findbugs-bcel-%{findbugsver}
ln -s findbugs-bcel-%{findbugsver} $RPM_BUILD_ROOT%{_javadocdir}/findbugs-bcel

%if %{with_gcj}
%{_bindir}/aot-compile-rpm
%endif

%clean
rm -rf $RPM_BUILD_ROOT

%post
%if %{with_gcj}
if [ -x %{_bindir}/rebuild-gcj-db ]; then
  %{_bindir}/rebuild-gcj-db
fi
%endif

%postun
%if %{with_gcj}
if [ -x %{_bindir}/rebuild-gcj-db ]; then
  %{_bindir}/rebuild-gcj-db
fi
%endif

%files
%defattr(-,root,root,-)
%doc LICENSE.txt NOTICE.txt README.txt
%{_javadir}/findbugs-bcel*
%if %{with_gcj}
%{_libdir}/gcj/%{name}
%endif

%files javadoc
%defattr(-,root,root,-)
%{_javadocdir}/findbugs-bcel*

%changelog
* Tue Jan 13 2009 Jerry James <loganjerry at gmail.com> - 5.2-1.3.7.1
- Add '-source 1.5' to the javac and javadoc invocations

* Fri Jan  2 2009 Jerry James <loganjerry at gmail.com> - 5.2-1.3.7
- Update to the findbugs 1.3.7 version of the BCEL patch

* Mon Dec  8 2008 Jerry James <loganjerry at gmail.com> - 5.2-1.3.6
- Update to the findbugs 1.3.6 version of the BCEL patch

* Thu Sep 18 2008 Jerry James <loganjerry at gmail.com> - 5.2-1.3.5
- Initial RPM


--- NEW FILE import.log ---
findbugs-bcel-5_2-1_3_7_fc10_1:HEAD:findbugs-bcel-5.2-1.3.7.fc10.1.src.rpm:1233201145


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/findbugs-bcel/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	29 Jan 2009 00:18:57 -0000	1.1
+++ .cvsignore	29 Jan 2009 03:54:23 -0000	1.2
@@ -0,0 +1 @@
+bcel-5.2-src.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/findbugs-bcel/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	29 Jan 2009 00:18:57 -0000	1.1
+++ sources	29 Jan 2009 03:54:23 -0000	1.2
@@ -0,0 +1 @@
+905b7e718e30e7ca726530ecf106e532  bcel-5.2-src.tar.gz



From jjames at fedoraproject.org  Thu Jan 29 03:59:30 2009
From: jjames at fedoraproject.org (Jerry James)
Date: Thu, 29 Jan 2009 03:59:30 +0000 (UTC)
Subject: rpms/findbugs-bcel/F-10 bcel.diff, NONE, 1.1 findbugs-bcel.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090129035930.8747370117@cvs1.fedora.phx.redhat.com>

Author: jjames

Update of /cvs/pkgs/rpms/findbugs-bcel/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22343/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	bcel.diff findbugs-bcel.spec 
Log Message:
* Tue Jan 13 2009 Jerry James <loganjerry at gmail.com> - 5.2-1.3.7.1
- Add '-source 1.5' to the javac and javadoc invocations

* Fri Jan  2 2009 Jerry James <loganjerry at gmail.com> - 5.2-1.3.7
- Update to the findbugs 1.3.7 version of the BCEL patch

* Mon Dec  8 2008 Jerry James <loganjerry at gmail.com> - 5.2-1.3.6
- Update to the findbugs 1.3.6 version of the BCEL patch

* Thu Sep 18 2008 Jerry James <loganjerry at gmail.com> - 5.2-1.3.5
- Initial RPM


bcel.diff:

***** Error reading new file: [Errno 2] No such file or directory: 'bcel.diff'

--- NEW FILE findbugs-bcel.spec ---
# This is a version of BCEL that has been modified by the findbugs team.  They
# added some new functionality and also did some performance optimizations of
# the base code.  I am not producing a new manual, since we already have a
# bcel-manual package and the findbugs team did not patch the manual.  However,
# the javadoc package is necessary to show the changes in the API created by
# the findbug team's work.

%define findbugsver 1.3.7
%define with_gcj %{!?_without_gcj:1}%{?_without_gcj:0}

Name:           findbugs-bcel
Version:        5.2
Release:        %{findbugsver}%{?dist}.1
Summary:        Byte Code Engineering Library with findbugs extensions

Group:          Development/Libraries/Java
License:        ASL 2.0
URL:            http://jakarta.apache.org/bcel/
Source0:        http://www.apache.org/dist/jakarta/bcel/source/bcel-%{version}-src.tar.gz
# This patch is available in the findbugs release, in src/patches/bcel.diff.
Source1:        bcel.diff
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  java-devel, jpackage-utils
Requires:       java, jpackage-utils

%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

%description
This is a version of Apache's Byte Code Engineering Library (BCEL) that has
been modified by the findbugs developers.  The modifications add some new
functionality, and also introduce a number of performance optimizations to
address findbugs performance problems.  Some of the performance optimizations
induce API changes, so this version of BCEL is not compatible with the vanilla
upstream version.

%package javadoc
Summary:        Javadoc for %{name}
Group:          Development/Documentation

%description javadoc
%{summary}.

%prep
%setup -q -n bcel-%{version}

# The -f option is necessary because the findbugs patch applies to two files
# that are present only in the bcel binary distribution, not in the source
# distribution.  The 'true' invocation is to mask the exit value of 1 that
# patch gives when it skips those two files.
%{__patch} -f -p7 -s < %{SOURCE1} || true

# The findbugs patch introduces a gratuitous import of a com.sun package.
%{__sed} -i \
  -e '/import com.sun.org.apache.xerces.internal.impl.io.UTF8Reader/D' \
  src/java/org/apache/bcel/classfile/ConstantUtf8.java

%build
# The ant and maven builds both try to download unneeded jars
mkdir classes
find src/java -type f -name '*.java' | \
xargs javac -g -d classes -source 1.5 -encoding ISO8859-1
cd classes
jar cf findbugs-bcel-%{findbugsver}.jar org
cd ..

mkdir javadoc
find src/java -type f -name '*.java' | xargs javadoc -sourcepath src/java \
  -classpath classes -source 1.5 -encoding ISO8859-1 -d javadoc 

%install
rm -rf $RPM_BUILD_ROOT

mkdir -p $RPM_BUILD_ROOT%{_javadir}
cp -p classes/findbugs-bcel-%{findbugsver}.jar $RPM_BUILD_ROOT%{_javadir}
ln -s findbugs-bcel-%{findbugsver}.jar $RPM_BUILD_ROOT%{_javadir}/findbugs-bcel.jar

mkdir -p $RPM_BUILD_ROOT%{_javadocdir}
cp -a javadoc $RPM_BUILD_ROOT%{_javadocdir}/findbugs-bcel-%{findbugsver}
ln -s findbugs-bcel-%{findbugsver} $RPM_BUILD_ROOT%{_javadocdir}/findbugs-bcel

%if %{with_gcj}
%{_bindir}/aot-compile-rpm
%endif

%clean
rm -rf $RPM_BUILD_ROOT

%post
%if %{with_gcj}
if [ -x %{_bindir}/rebuild-gcj-db ]; then
  %{_bindir}/rebuild-gcj-db
fi
%endif

%postun
%if %{with_gcj}
if [ -x %{_bindir}/rebuild-gcj-db ]; then
  %{_bindir}/rebuild-gcj-db
fi
%endif

%files
%defattr(-,root,root,-)
%doc LICENSE.txt NOTICE.txt README.txt
%{_javadir}/findbugs-bcel*
%if %{with_gcj}
%{_libdir}/gcj/%{name}
%endif

%files javadoc
%defattr(-,root,root,-)
%{_javadocdir}/findbugs-bcel*

%changelog
* Tue Jan 13 2009 Jerry James <loganjerry at gmail.com> - 5.2-1.3.7.1
- Add '-source 1.5' to the javac and javadoc invocations

* Fri Jan  2 2009 Jerry James <loganjerry at gmail.com> - 5.2-1.3.7
- Update to the findbugs 1.3.7 version of the BCEL patch

* Mon Dec  8 2008 Jerry James <loganjerry at gmail.com> - 5.2-1.3.6
- Update to the findbugs 1.3.6 version of the BCEL patch

* Thu Sep 18 2008 Jerry James <loganjerry at gmail.com> - 5.2-1.3.5
- Initial RPM


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/findbugs-bcel/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	29 Jan 2009 00:18:57 -0000	1.1
+++ .cvsignore	29 Jan 2009 03:59:00 -0000	1.2
@@ -0,0 +1 @@
+bcel-5.2-src.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/findbugs-bcel/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	29 Jan 2009 00:18:57 -0000	1.1
+++ sources	29 Jan 2009 03:59:00 -0000	1.2
@@ -0,0 +1 @@
+905b7e718e30e7ca726530ecf106e532  bcel-5.2-src.tar.gz



From ianweller at fedoraproject.org  Thu Jan 29 04:04:23 2009
From: ianweller at fedoraproject.org (Ian Weller)
Date: Thu, 29 Jan 2009 04:04:23 +0000 (UTC)
Subject: rpms/gwibber/devel .cvsignore, 1.7, 1.8 gwibber.spec, 1.13,
	1.14 import.log, 1.8, 1.9 sources, 1.7, 1.8
Message-ID: <20090129040423.E489870116@cvs1.fedora.phx.redhat.com>

Author: ianweller

Update of /cvs/pkgs/rpms/gwibber/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23872/devel

Modified Files:
	.cvsignore gwibber.spec import.log sources 
Log Message:
importing gwibber-0.7.3-3.199bzr in devel


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gwibber/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	28 Jan 2009 04:39:28 -0000	1.7
+++ .cvsignore	29 Jan 2009 04:03:53 -0000	1.8
@@ -1 +1 @@
-gwibber-196bzr.tar.gz
+gwibber-199bzr.tar.gz


Index: gwibber.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gwibber/devel/gwibber.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- gwibber.spec	28 Jan 2009 04:42:54 -0000	1.13
+++ gwibber.spec	29 Jan 2009 04:03:53 -0000	1.14
@@ -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 196
+%define bzr_rev 199
 
 Name:           gwibber
 Version:        0.7.3
-Release:        2.%{bzr_rev}bzr%{?dist}
+Release:        3.%{bzr_rev}bzr%{?dist}
 Summary:        An open source microblogging client for GNOME developed with Python and GTK
 
 Group:          Applications/Internet
@@ -68,6 +68,12 @@
 
 
 %changelog
+* Wed Jan 28 2009 Ian Weller <ianweller at gmail.com> 0.7.3-3.199bzr
+- Update upstream to r199:
+  - more translations
+  - "source" in identica and laconica now identified
+  - account manager bug fix
+
 * Tue Jan 27 2009 Ian Weller <ianweller at gmail.com> 0.7.3-2.196bzr
 - Restore the Requires on python-sexy that I accidentally overwrote
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/gwibber/devel/import.log,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- import.log	28 Jan 2009 04:42:54 -0000	1.8
+++ import.log	29 Jan 2009 04:03:53 -0000	1.9
@@ -6,3 +6,4 @@
 gwibber-0_7_2-3_165bzr_fc9:HEAD:gwibber-0.7.2-3.165bzr.fc9.src.rpm:1229877434
 gwibber-0_7_3-1_196bzr_fc10:HEAD:gwibber-0.7.3-1.196bzr.fc10.src.rpm:1233117544
 gwibber-0_7_3-2_196bzr_fc10:HEAD:gwibber-0.7.3-2.196bzr.fc10.src.rpm:1233117748
+gwibber-0_7_3-3_199bzr_fc10:HEAD:gwibber-0.7.3-3.199bzr.fc10.src.rpm:1233201806


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gwibber/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	28 Jan 2009 04:39:28 -0000	1.7
+++ sources	29 Jan 2009 04:03:53 -0000	1.8
@@ -1 +1 @@
-c5d44825595388560e15d1dd09c5741a  gwibber-196bzr.tar.gz
+b2597345af91666ef77aeb83ed897379  gwibber-199bzr.tar.gz



From ianweller at fedoraproject.org  Thu Jan 29 04:05:24 2009
From: ianweller at fedoraproject.org (Ian Weller)
Date: Thu, 29 Jan 2009 04:05:24 +0000 (UTC)
Subject: rpms/gwibber/F-10 .cvsignore, 1.7, 1.8 gwibber.spec, 1.11,
	1.12 import.log, 1.7, 1.8 sources, 1.7, 1.8
Message-ID: <20090129040524.D6D7270116@cvs1.fedora.phx.redhat.com>

Author: ianweller

Update of /cvs/pkgs/rpms/gwibber/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24157/F-10

Modified Files:
	.cvsignore gwibber.spec import.log sources 
Log Message:
importing gwibber-0.7.3-3.199bzr in F-10


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gwibber/F-10/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	28 Jan 2009 04:44:18 -0000	1.7
+++ .cvsignore	29 Jan 2009 04:04:54 -0000	1.8
@@ -1 +1 @@
-gwibber-196bzr.tar.gz
+gwibber-199bzr.tar.gz


Index: gwibber.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gwibber/F-10/gwibber.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- gwibber.spec	28 Jan 2009 04:44:18 -0000	1.11
+++ gwibber.spec	29 Jan 2009 04:04:54 -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()")}
 
-%define bzr_rev 196
+%define bzr_rev 199
 
 Name:           gwibber
 Version:        0.7.3
-Release:        2.%{bzr_rev}bzr%{?dist}
+Release:        3.%{bzr_rev}bzr%{?dist}
 Summary:        An open source microblogging client for GNOME developed with Python and GTK
 
 Group:          Applications/Internet
@@ -68,6 +68,12 @@
 
 
 %changelog
+* Wed Jan 28 2009 Ian Weller <ianweller at gmail.com> 0.7.3-3.199bzr
+- Update upstream to r199:
+  - more translations
+  - "source" in identica and laconica now identified
+  - account manager bug fix
+
 * Tue Jan 27 2009 Ian Weller <ianweller at gmail.com> 0.7.3-2.196bzr
 - Restore the Requires on python-sexy that I accidentally overwrote
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/gwibber/F-10/import.log,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- import.log	28 Jan 2009 04:44:18 -0000	1.7
+++ import.log	29 Jan 2009 04:04:54 -0000	1.8
@@ -5,3 +5,4 @@
 gwibber-0_7_2-1_156bzr_fc9:F-10:gwibber-0.7.2-1.156bzr.fc9.src.rpm:1229563933
 gwibber-0_7_2-3_165bzr_fc9:F-10:gwibber-0.7.2-3.165bzr.fc9.src.rpm:1229877508
 gwibber-0_7_3-2_196bzr_fc10:F-10:gwibber-0.7.3-2.196bzr.fc10.src.rpm:1233117818
+gwibber-0_7_3-3_199bzr_fc10:F-10:gwibber-0.7.3-3.199bzr.fc10.src.rpm:1233201876


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gwibber/F-10/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	28 Jan 2009 04:44:18 -0000	1.7
+++ sources	29 Jan 2009 04:04:54 -0000	1.8
@@ -1 +1 @@
-c5d44825595388560e15d1dd09c5741a  gwibber-196bzr.tar.gz
+b2597345af91666ef77aeb83ed897379  gwibber-199bzr.tar.gz



From ianweller at fedoraproject.org  Thu Jan 29 04:06:25 2009
From: ianweller at fedoraproject.org (Ian Weller)
Date: Thu, 29 Jan 2009 04:06:25 +0000 (UTC)
Subject: rpms/gwibber/F-9 .cvsignore, 1.7, 1.8 gwibber.spec, 1.10,
	1.11 import.log, 1.7, 1.8 sources, 1.7, 1.8
Message-ID: <20090129040625.EF1F470116@cvs1.fedora.phx.redhat.com>

Author: ianweller

Update of /cvs/pkgs/rpms/gwibber/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24438/F-9

Modified Files:
	.cvsignore gwibber.spec import.log sources 
Log Message:
importing gwibber-0.7.3-3.199bzr in F-9


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gwibber/F-9/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	28 Jan 2009 04:45:35 -0000	1.7
+++ .cvsignore	29 Jan 2009 04:05:55 -0000	1.8
@@ -1 +1 @@
-gwibber-196bzr.tar.gz
+gwibber-199bzr.tar.gz


Index: gwibber.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gwibber/F-9/gwibber.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- gwibber.spec	28 Jan 2009 04:45:35 -0000	1.10
+++ gwibber.spec	29 Jan 2009 04:05:55 -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()")}
 
-%define bzr_rev 196
+%define bzr_rev 199
 
 Name:           gwibber
 Version:        0.7.3
-Release:        2.%{bzr_rev}bzr%{?dist}
+Release:        3.%{bzr_rev}bzr%{?dist}
 Summary:        An open source microblogging client for GNOME developed with Python and GTK
 
 Group:          Applications/Internet
@@ -68,6 +68,12 @@
 
 
 %changelog
+* Wed Jan 28 2009 Ian Weller <ianweller at gmail.com> 0.7.3-3.199bzr
+- Update upstream to r199:
+  - more translations
+  - "source" in identica and laconica now identified
+  - account manager bug fix
+
 * Tue Jan 27 2009 Ian Weller <ianweller at gmail.com> 0.7.3-2.196bzr
 - Restore the Requires on python-sexy that I accidentally overwrote
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/gwibber/F-9/import.log,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- import.log	28 Jan 2009 04:45:35 -0000	1.7
+++ import.log	29 Jan 2009 04:05:55 -0000	1.8
@@ -5,3 +5,4 @@
 gwibber-0_7_2-1_156bzr_fc9:F-9:gwibber-0.7.2-1.156bzr.fc9.src.rpm:1229564004
 gwibber-0_7_2-3_165bzr_fc9:F-9:gwibber-0.7.2-3.165bzr.fc9.src.rpm:1229877822
 gwibber-0_7_3-2_196bzr_fc10:F-9:gwibber-0.7.3-2.196bzr.fc10.src.rpm:1233117901
+gwibber-0_7_3-3_199bzr_fc10:F-9:gwibber-0.7.3-3.199bzr.fc10.src.rpm:1233201937


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gwibber/F-9/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	28 Jan 2009 04:45:35 -0000	1.7
+++ sources	29 Jan 2009 04:05:55 -0000	1.8
@@ -1 +1 @@
-c5d44825595388560e15d1dd09c5741a  gwibber-196bzr.tar.gz
+b2597345af91666ef77aeb83ed897379  gwibber-199bzr.tar.gz



From rdieter at fedoraproject.org  Thu Jan 29 04:15:30 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu, 29 Jan 2009 04:15:30 +0000 (UTC)
Subject: rpms/koffice/devel .cvsignore, 1.25, 1.26 koffice.spec, 1.93,
	1.94 sources, 1.25, 1.26
Message-ID: <20090129041530.6280070116@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/koffice/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25911

Modified Files:
	.cvsignore koffice.spec sources 
Log Message:
* Wed Jan 28 2009 Rex Dieter <rdieter at fedoraproject.org> - 1:1.9.98.6-1
- koffice-1.9.98.6, koffice2 beta 6



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/koffice/devel/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- .cvsignore	9 Jan 2009 19:20:37 -0000	1.25
+++ .cvsignore	29 Jan 2009 04:15:00 -0000	1.26
@@ -1 +1 @@
-koffice-1.9.98.5.tar.bz2
+koffice-1.9.98.6.tar.bz2


Index: koffice.spec
===================================================================
RCS file: /cvs/pkgs/rpms/koffice/devel/koffice.spec,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -r1.93 -r1.94
--- koffice.spec	22 Jan 2009 21:12:12 -0000	1.93
+++ koffice.spec	29 Jan 2009 04:15:00 -0000	1.94
@@ -7,8 +7,8 @@
 
 Name:           koffice
 Epoch:          1
-Version:        1.9.98.5
-Release:        2%{?dist}
+Version:        1.9.98.6
+Release:        1%{?dist}
 Summary:        An integrated office suite
 
 Group:          Applications/Productivity
@@ -34,7 +34,6 @@
 BuildRequires: freeglut-devel
 BuildRequires: freetype-devel
 BuildRequires: gettext-devel
-BuildRequires: giflib-devel
 BuildRequires: glew-devel
 BuildRequires: gmm-devel
 BuildRequires: GraphicsMagick-devel
@@ -52,8 +51,6 @@
 BuildRequires: libxslt-devel
 BuildRequires: mysql-devel
 BuildRequires: OpenEXR-devel
-BuildRequires: openldap-devel
-BuildRequires: pcre-devel
 BuildRequires: perl
 BuildRequires: poppler-qt4-devel
 BuildRequires: python-devel
@@ -712,6 +709,9 @@
 
 
 %changelog
+* Wed Jan 28 2009 Rex Dieter <rdieter at fedoraproject.org> - 1:1.9.98.6-1
+- koffice-1.9.98.6, koffice2 beta 6
+
 * Thu Jan 22 2009 Rex Dieter <rdieter at fedoraproject.org> - 1:1.9.98.5-2 
 - respin (mysql)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/koffice/devel/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- sources	9 Jan 2009 19:20:37 -0000	1.25
+++ sources	29 Jan 2009 04:15:00 -0000	1.26
@@ -1 +1 @@
-1525ca823dc39934a16cf1de0750ec11  koffice-1.9.98.5.tar.bz2
+00a4a0e9e0cfa60bf02a917e2267948c  koffice-1.9.98.6.tar.bz2



From nsantos at fedoraproject.org  Thu Jan 29 04:50:07 2009
From: nsantos at fedoraproject.org (Nuno Santos)
Date: Thu, 29 Jan 2009 04:50:07 +0000 (UTC)
Subject: rpms/qpidc/F-10 .cvsignore, 1.16, 1.17 qpidc.spec, 1.61,
	1.62 sources, 1.32, 1.33
Message-ID: <20090129045007.81AFD70116@cvs1.fedora.phx.redhat.com>

Author: nsantos

Update of /cvs/extras/rpms/qpidc/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31465

Modified Files:
	.cvsignore qpidc.spec sources 
Log Message:
Rebased to svn rev 738618


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/qpidc/F-10/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore	14 Jan 2009 22:50:55 -0000	1.16
+++ .cvsignore	29 Jan 2009 04:49:36 -0000	1.17
@@ -1 +1 @@
-qpidc-0.4.734452.tar.gz
+qpidc-0.4.738618.tar.gz


Index: qpidc.spec
===================================================================
RCS file: /cvs/extras/rpms/qpidc/F-10/qpidc.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- qpidc.spec	22 Jan 2009 00:59:47 -0000	1.61
+++ qpidc.spec	29 Jan 2009 04:49:36 -0000	1.62
@@ -6,8 +6,8 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           qpidc
-Version:        0.4.734452
-Release:        4%{?dist}
+Version:        0.4.738618
+Release:        1%{?dist}
 Summary:        Libraries for Qpid C++ client applications
 Group:          System Environment/Libraries
 License:        ASL 2.0
@@ -372,6 +372,9 @@
 %postun -n qmf -p /sbin/ldconfig
 
 %changelog
+* Wed Jan 28 2009 Nuno Santos <nsantos at redhat.com> - 0.4.738618-1
+- Rebased to svn rev 738618
+
 * Tue Jan 20 2009 Nuno Santos <nsantos at redhat.com> - 0.4.734452-3
 - BZ474614 and BZ474613 - qpidc/rhm unowned directories
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/qpidc/F-10/sources,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- sources	14 Jan 2009 22:50:55 -0000	1.32
+++ sources	29 Jan 2009 04:49:36 -0000	1.33
@@ -1 +1 @@
-2b11da88553b325b1c6cfdb3031f077c  qpidc-0.4.734452.tar.gz
+fb7c84a7a179ee59bea66137061c4701  qpidc-0.4.738618.tar.gz



From pkgdb at fedoraproject.org  Thu Jan 29 05:03:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 29 Jan 2009 05:03:59 +0000
Subject: [pkgdb] perl-Network-IPv4Addr was added for ausil
Message-ID: <20090129050359.A4B58208484@bastion.fedora.phx.redhat.com>

ausil has added Package perl-Network-IPv4Addr with summary Network-IPv4Addr Perl module
ausil has approved Package perl-Network-IPv4Addr
ausil has added a Fedora devel branch for perl-Network-IPv4Addr with an owner of ausil
ausil has approved perl-Network-IPv4Addr in Fedora devel
ausil has approved Package perl-Network-IPv4Addr
ausil has set commit to Approved for provenpackager on perl-Network-IPv4Addr (Fedora devel)
ausil has set build to Approved for provenpackager on perl-Network-IPv4Addr (Fedora devel)
ausil has set checkout to Approved for provenpackager on perl-Network-IPv4Addr (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Network-IPv4Addr



From pkgdb at fedoraproject.org  Thu Jan 29 05:04:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 29 Jan 2009 05:04:01 +0000
Subject: [pkgdb] perl-Network-IPv4Addr (Fedora, 9) updated by ausil
Message-ID: <20090129050401.8F9C8208494@bastion.fedora.phx.redhat.com>

ausil added a Fedora 9 branch for perl-Network-IPv4Addr
ausil has set commit to Approved for provenpackager on perl-Network-IPv4Addr (Fedora 9)
ausil has set build to Approved for provenpackager on perl-Network-IPv4Addr (Fedora 9)
ausil has set checkout to Approved for provenpackager on perl-Network-IPv4Addr (Fedora 9)
ausil approved watchbugzilla on perl-Network-IPv4Addr (Fedora 9) for perl-sig
ausil approved watchcommits on perl-Network-IPv4Addr (Fedora 9) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Network-IPv4Addr



From pkgdb at fedoraproject.org  Thu Jan 29 05:04:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 29 Jan 2009 05:04:01 +0000
Subject: [pkgdb] perl-Network-IPv4Addr (Fedora, 10) updated by ausil
Message-ID: <20090129050401.86CDC208486@bastion.fedora.phx.redhat.com>

ausil added a Fedora 10 branch for perl-Network-IPv4Addr
ausil has set commit to Approved for provenpackager on perl-Network-IPv4Addr (Fedora 10)
ausil has set build to Approved for provenpackager on perl-Network-IPv4Addr (Fedora 10)
ausil has set checkout to Approved for provenpackager on perl-Network-IPv4Addr (Fedora 10)
ausil approved watchbugzilla on perl-Network-IPv4Addr (Fedora 10) for perl-sig
ausil approved watchcommits on perl-Network-IPv4Addr (Fedora 10) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Network-IPv4Addr



From pkgdb at fedoraproject.org  Thu Jan 29 05:04:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 29 Jan 2009 05:04:01 +0000
Subject: [pkgdb] perl-Network-IPv4Addr (Fedora EPEL, 5) updated by ausil
Message-ID: <20090129050401.9559D208496@bastion.fedora.phx.redhat.com>

ausil added a Fedora EPEL 5 branch for perl-Network-IPv4Addr
ausil has set commit to Approved for provenpackager on perl-Network-IPv4Addr (Fedora EPEL 5)
ausil has set build to Approved for provenpackager on perl-Network-IPv4Addr (Fedora EPEL 5)
ausil has set checkout to Approved for provenpackager on perl-Network-IPv4Addr (Fedora EPEL 5)
ausil approved watchbugzilla on perl-Network-IPv4Addr (Fedora EPEL 5) for perl-sig
ausil approved watchcommits on perl-Network-IPv4Addr (Fedora EPEL 5) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Network-IPv4Addr



From pkgdb at fedoraproject.org  Thu Jan 29 05:04:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 29 Jan 2009 05:04:01 +0000
Subject: [pkgdb] perl-Network-IPv4Addr (Fedora, devel) updated by ausil
Message-ID: <20090129050401.9B0012084A7@bastion.fedora.phx.redhat.com>

ausil approved watchbugzilla on perl-Network-IPv4Addr (Fedora devel) for perl-sig
ausil approved watchcommits on perl-Network-IPv4Addr (Fedora devel) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Network-IPv4Addr



From ausil at fedoraproject.org  Thu Jan 29 05:04:15 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Thu, 29 Jan 2009 05:04:15 +0000 (UTC)
Subject: rpms/perl-Network-IPv4Addr - New directory
Message-ID: <20090129050415.2E26B70116@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/perl-Network-IPv4Addr
In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsTY1924/rpms/perl-Network-IPv4Addr

Log Message:
Directory /cvs/pkgs/rpms/perl-Network-IPv4Addr added to the repository




From ausil at fedoraproject.org  Thu Jan 29 05:04:15 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Thu, 29 Jan 2009 05:04:15 +0000 (UTC)
Subject: rpms/perl-Network-IPv4Addr/devel - New directory
Message-ID: <20090129050415.6FFB370116@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/perl-Network-IPv4Addr/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsTY1924/rpms/perl-Network-IPv4Addr/devel

Log Message:
Directory /cvs/pkgs/rpms/perl-Network-IPv4Addr/devel added to the repository




From ausil at fedoraproject.org  Thu Jan 29 05:04:32 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Thu, 29 Jan 2009 05:04:32 +0000 (UTC)
Subject: rpms/perl-Network-IPv4Addr Makefile,NONE,1.1
Message-ID: <20090129050432.E6C0970116@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/perl-Network-IPv4Addr
In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsTY1924/rpms/perl-Network-IPv4Addr

Added Files:
	Makefile 
Log Message:
Setup of module perl-Network-IPv4Addr


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Network-IPv4Addr
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout 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  Thu Jan 29 05:04:33 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Thu, 29 Jan 2009 05:04:33 +0000 (UTC)
Subject: rpms/perl-Network-IPv4Addr/devel .cvsignore, NONE, 1.1 Makefile,
	NONE, 1.1 sources, NONE, 1.1
Message-ID: <20090129050433.5E50570116@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/perl-Network-IPv4Addr/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/ausil/CVSROOT/admin/tmpcvsTY1924/rpms/perl-Network-IPv4Addr/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Network-IPv4Addr


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: perl-Network-IPv4Addr
# $Id: Makefile,v 1.1 2009/01/29 05:04:33 ausil Exp $
NAME := perl-Network-IPv4Addr
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out 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  Thu Jan 29 05:08:09 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Thu, 29 Jan 2009 05:08:09 +0000 (UTC)
Subject: rpms/perl-Network-IPv4Addr/EL-5 import.log, NONE,
	1.1 perl-Network-IPv4Addr.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090129050809.BE83270116@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/perl-Network-IPv4Addr/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2724/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-Network-IPv4Addr.spec 
Log Message:
initial import



--- NEW FILE import.log ---
perl-Network-IPv4Addr-0_05-12_fc10:EL-5:perl-Network-IPv4Addr-0.05-12.fc10.src.rpm:1233205631


--- NEW FILE perl-Network-IPv4Addr.spec ---
Summary: Network-IPv4Addr Perl module
Name: perl-Network-IPv4Addr
Version: 0.05
Release: 12%{?dist}
License: GPL+ or Artistic
Group: Development/Libraries
URL: http://search.cpan.org/dist/Network-IPv4Addr/
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
Source0: Network-IPv4Addr-0.05.tar.gz
Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
BuildRequires: perl(ExtUtils::MakeMaker)

%description
Network::IPv4Addr provides functions for parsing IPv4 addresses both
in traditional address/netmask format and in the new CIDR format.
There are also methods for calculating the network and broadcast
address and also to see check if a given address is in a specific
network.

%prep
%setup -q -n Network-IPv4Addr-%{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 {} ';'
# Remove the next line from noarch packages (unneeded)
find $RPM_BUILD_ROOT -type f -name '*.bs' -a -size 0 -exec rm -f {} ';'
find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null ';'
chmod -R u+w $RPM_BUILD_ROOT/*

%clean
rm -rf $RPM_BUILD_ROOT

%check
make test

%files
%defattr(-,root,root,-)
%doc ChangeLog README
%{_bindir}/ipv4calc
%{perl_vendorlib}/*
%{_mandir}/man1/ipv4calc.1.gz
%{_mandir}/man3/*.3*

%changelog
* Wed Jan 28 2009 Dennis Gilmore <dennis at ausil.us> - 0.05-12
- clean up spec file

* Wed Jun 23 2004 <dparker at redhat.com> - 0.05-8
- Specfile autogenerated.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Network-IPv4Addr/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	29 Jan 2009 05:04:33 -0000	1.1
+++ .cvsignore	29 Jan 2009 05:07:39 -0000	1.2
@@ -0,0 +1 @@
+Network-IPv4Addr-0.05.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Network-IPv4Addr/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	29 Jan 2009 05:04:33 -0000	1.1
+++ sources	29 Jan 2009 05:07:39 -0000	1.2
@@ -0,0 +1 @@
+1c4a9278ada5557a4895ee44b0312888  Network-IPv4Addr-0.05.tar.gz



From ausil at fedoraproject.org  Thu Jan 29 05:12:02 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Thu, 29 Jan 2009 05:12:02 +0000 (UTC)
Subject: rpms/perl-Network-IPv4Addr/F-9 import.log, NONE,
	1.1 perl-Network-IPv4Addr.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090129051202.A8AC370116@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/perl-Network-IPv4Addr/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3560/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-Network-IPv4Addr.spec 
Log Message:
initial import



--- NEW FILE import.log ---
perl-Network-IPv4Addr-0_05-12_fc10:F-9:perl-Network-IPv4Addr-0.05-12.fc10.src.rpm:1233205858


--- NEW FILE perl-Network-IPv4Addr.spec ---
Summary: Network-IPv4Addr Perl module
Name: perl-Network-IPv4Addr
Version: 0.05
Release: 12%{?dist}
License: GPL+ or Artistic
Group: Development/Libraries
URL: http://search.cpan.org/dist/Network-IPv4Addr/
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
Source0: Network-IPv4Addr-0.05.tar.gz
Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
BuildRequires: perl(ExtUtils::MakeMaker)

%description
Network::IPv4Addr provides functions for parsing IPv4 addresses both
in traditional address/netmask format and in the new CIDR format.
There are also methods for calculating the network and broadcast
address and also to see check if a given address is in a specific
network.

%prep
%setup -q -n Network-IPv4Addr-%{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 {} ';'
# Remove the next line from noarch packages (unneeded)
find $RPM_BUILD_ROOT -type f -name '*.bs' -a -size 0 -exec rm -f {} ';'
find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null ';'
chmod -R u+w $RPM_BUILD_ROOT/*

%clean
rm -rf $RPM_BUILD_ROOT

%check
make test

%files
%defattr(-,root,root,-)
%doc ChangeLog README
%{_bindir}/ipv4calc
%{perl_vendorlib}/*
%{_mandir}/man1/ipv4calc.1.gz
%{_mandir}/man3/*.3*

%changelog
* Wed Jan 28 2009 Dennis Gilmore <dennis at ausil.us> - 0.05-12
- clean up spec file

* Wed Jun 23 2004 <dparker at redhat.com> - 0.05-8
- Specfile autogenerated.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Network-IPv4Addr/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	29 Jan 2009 05:04:33 -0000	1.1
+++ .cvsignore	29 Jan 2009 05:11:32 -0000	1.2
@@ -0,0 +1 @@
+Network-IPv4Addr-0.05.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Network-IPv4Addr/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	29 Jan 2009 05:04:33 -0000	1.1
+++ sources	29 Jan 2009 05:11:32 -0000	1.2
@@ -0,0 +1 @@
+1c4a9278ada5557a4895ee44b0312888  Network-IPv4Addr-0.05.tar.gz



From ausil at fedoraproject.org  Thu Jan 29 05:14:40 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Thu, 29 Jan 2009 05:14:40 +0000 (UTC)
Subject: rpms/perl-Network-IPv4Addr/F-10 import.log, NONE,
	1.1 perl-Network-IPv4Addr.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090129051440.2330670116@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/perl-Network-IPv4Addr/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4070/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-Network-IPv4Addr.spec 
Log Message:
initial import



--- NEW FILE import.log ---
perl-Network-IPv4Addr-0_05-12_fc10:F-10:perl-Network-IPv4Addr-0.05-12.fc10.src.rpm:1233205994


--- NEW FILE perl-Network-IPv4Addr.spec ---
Summary: Network-IPv4Addr Perl module
Name: perl-Network-IPv4Addr
Version: 0.05
Release: 12%{?dist}
License: GPL+ or Artistic
Group: Development/Libraries
URL: http://search.cpan.org/dist/Network-IPv4Addr/
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
Source0: Network-IPv4Addr-0.05.tar.gz
Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
BuildRequires: perl(ExtUtils::MakeMaker)

%description
Network::IPv4Addr provides functions for parsing IPv4 addresses both
in traditional address/netmask format and in the new CIDR format.
There are also methods for calculating the network and broadcast
address and also to see check if a given address is in a specific
network.

%prep
%setup -q -n Network-IPv4Addr-%{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 {} ';'
# Remove the next line from noarch packages (unneeded)
find $RPM_BUILD_ROOT -type f -name '*.bs' -a -size 0 -exec rm -f {} ';'
find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null ';'
chmod -R u+w $RPM_BUILD_ROOT/*

%clean
rm -rf $RPM_BUILD_ROOT

%check
make test

%files
%defattr(-,root,root,-)
%doc ChangeLog README
%{_bindir}/ipv4calc
%{perl_vendorlib}/*
%{_mandir}/man1/ipv4calc.1.gz
%{_mandir}/man3/*.3*

%changelog
* Wed Jan 28 2009 Dennis Gilmore <dennis at ausil.us> - 0.05-12
- clean up spec file

* Wed Jun 23 2004 <dparker at redhat.com> - 0.05-8
- Specfile autogenerated.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Network-IPv4Addr/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	29 Jan 2009 05:04:33 -0000	1.1
+++ .cvsignore	29 Jan 2009 05:14:09 -0000	1.2
@@ -0,0 +1 @@
+Network-IPv4Addr-0.05.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Network-IPv4Addr/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	29 Jan 2009 05:04:33 -0000	1.1
+++ sources	29 Jan 2009 05:14:09 -0000	1.2
@@ -0,0 +1 @@
+1c4a9278ada5557a4895ee44b0312888  Network-IPv4Addr-0.05.tar.gz



From ausil at fedoraproject.org  Thu Jan 29 05:16:34 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Thu, 29 Jan 2009 05:16:34 +0000 (UTC)
Subject: rpms/perl-Network-IPv4Addr/devel import.log, NONE,
	1.1 perl-Network-IPv4Addr.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090129051634.AED1570116@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/perl-Network-IPv4Addr/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4595/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-Network-IPv4Addr.spec 
Log Message:
initial import



--- NEW FILE import.log ---
perl-Network-IPv4Addr-0_05-12_fc10:HEAD:perl-Network-IPv4Addr-0.05-12.fc10.src.rpm:1233206127


--- NEW FILE perl-Network-IPv4Addr.spec ---
Summary: Network-IPv4Addr Perl module
Name: perl-Network-IPv4Addr
Version: 0.05
Release: 12%{?dist}
License: GPL+ or Artistic
Group: Development/Libraries
URL: http://search.cpan.org/dist/Network-IPv4Addr/
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
Source0: Network-IPv4Addr-0.05.tar.gz
Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
BuildRequires: perl(ExtUtils::MakeMaker)

%description
Network::IPv4Addr provides functions for parsing IPv4 addresses both
in traditional address/netmask format and in the new CIDR format.
There are also methods for calculating the network and broadcast
address and also to see check if a given address is in a specific
network.

%prep
%setup -q -n Network-IPv4Addr-%{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 {} ';'
# Remove the next line from noarch packages (unneeded)
find $RPM_BUILD_ROOT -type f -name '*.bs' -a -size 0 -exec rm -f {} ';'
find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null ';'
chmod -R u+w $RPM_BUILD_ROOT/*

%clean
rm -rf $RPM_BUILD_ROOT

%check
make test

%files
%defattr(-,root,root,-)
%doc ChangeLog README
%{_bindir}/ipv4calc
%{perl_vendorlib}/*
%{_mandir}/man1/ipv4calc.1.gz
%{_mandir}/man3/*.3*

%changelog
* Wed Jan 28 2009 Dennis Gilmore <dennis at ausil.us> - 0.05-12
- clean up spec file

* Wed Jun 23 2004 <dparker at redhat.com> - 0.05-8
- Specfile autogenerated.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Network-IPv4Addr/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	29 Jan 2009 05:04:33 -0000	1.1
+++ .cvsignore	29 Jan 2009 05:16:04 -0000	1.2
@@ -0,0 +1 @@
+Network-IPv4Addr-0.05.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Network-IPv4Addr/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	29 Jan 2009 05:04:33 -0000	1.1
+++ sources	29 Jan 2009 05:16:04 -0000	1.2
@@ -0,0 +1 @@
+1c4a9278ada5557a4895ee44b0312888  Network-IPv4Addr-0.05.tar.gz



From remi at fedoraproject.org  Thu Jan 29 06:03:36 2009
From: remi at fedoraproject.org (Remi Collet)
Date: Thu, 29 Jan 2009 06:03:36 +0000 (UTC)
Subject: rpms/php-pear-Cache-Lite/EL-5 php-pear-Cache-Lite.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <20090129060336.529B870117@cvs1.fedora.phx.redhat.com>

Author: remi

Update of /cvs/extras/rpms/php-pear-Cache-Lite/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11331

Modified Files:
	php-pear-Cache-Lite.spec sources 
Log Message:
update to 1.7.5 (bugfix)


Index: php-pear-Cache-Lite.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Cache-Lite/EL-5/php-pear-Cache-Lite.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- php-pear-Cache-Lite.spec	9 Jun 2008 15:18:35 -0000	1.1
+++ php-pear-Cache-Lite.spec	29 Jan 2009 06:03:05 -0000	1.2
@@ -4,7 +4,7 @@
 Summary:        Fast and Safe little cache system for PHP
 Summary(fr):    M??thode de cache rapide et s??curis??e pour PHP
 Name:           php-pear-Cache-Lite
-Version:        1.7.4
+Version:        1.7.5
 Release:        1%{?dist}
 License:        PHP
 Group:          Development/Libraries
@@ -97,6 +97,9 @@
 
 
 %changelog
+* Sat Jan 09 2009 Remi Collet <Fedora at FamilleCollet.com> 1.7.5-1
+- update to 1.7.5
+
 * Mon Jun 09 2008 Remi Collet <Fedora at FamilleCollet.com> 1.7.4-1
 - update to 1.7.4
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Cache-Lite/EL-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	9 Jun 2008 15:18:35 -0000	1.2
+++ sources	29 Jan 2009 06:03:05 -0000	1.3
@@ -1 +1 @@
-93a7a2a40d85a16725f02937ee5c9b88  Cache_Lite-1.7.4.tgz
+085d095dc2bd92e546a8d6aa8dd748ba  Cache_Lite-1.7.5.tgz



From remi at fedoraproject.org  Thu Jan 29 06:09:44 2009
From: remi at fedoraproject.org (Remi Collet)
Date: Thu, 29 Jan 2009 06:09:44 +0000 (UTC)
Subject: rpms/php-pear-Cache-Lite/devel .cvsignore, 1.4,
	1.5 php-pear-Cache-Lite.spec, 1.3, 1.4 sources, 1.4, 1.5
Message-ID: <20090129060944.5251970116@cvs1.fedora.phx.redhat.com>

Author: remi

Update of /cvs/extras/rpms/php-pear-Cache-Lite/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12917

Modified Files:
	.cvsignore php-pear-Cache-Lite.spec sources 
Log Message:
update to 1.7.6 (raise PEAR dep)


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Cache-Lite/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	24 Jan 2009 07:11:16 -0000	1.4
+++ .cvsignore	29 Jan 2009 06:09:14 -0000	1.5
@@ -1 +1 @@
-Cache_Lite-1.7.5.tgz
+Cache_Lite-1.7.6.tgz


Index: php-pear-Cache-Lite.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Cache-Lite/devel/php-pear-Cache-Lite.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- php-pear-Cache-Lite.spec	24 Jan 2009 07:11:16 -0000	1.3
+++ php-pear-Cache-Lite.spec	29 Jan 2009 06:09:14 -0000	1.4
@@ -4,7 +4,7 @@
 Summary:        Fast and Safe little cache system for PHP
 Summary(fr):    M??thode de cache rapide et s??curis??e pour PHP
 Name:           php-pear-Cache-Lite
-Version:        1.7.5
+Version:        1.7.6
 Release:        1%{?dist}
 License:        PHP
 Group:          Development/Libraries
@@ -15,8 +15,8 @@
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
-BuildRequires:  php-pear >= 1:1.4.9-1.2
-Requires:       php-pear(PEAR) >= 1.4.9
+BuildRequires:  php-pear(PEAR) >= 1.5.4
+Requires:       php-pear(PEAR) >= 1.5.4
 Requires(post): %{__pear}
 Requires(postun): %{__pear}
 Provides:       php-pear(%{pear_name}) = %{version}
@@ -97,6 +97,9 @@
 
 
 %changelog
+* Thu Jan 29 2009 Remi Collet <Fedora at FamilleCollet.com> 1.7.6-1
+- now Requires php-pear(PEAR) >= 1.5.4
+
 * Sat Jan 09 2009 Remi Collet <Fedora at FamilleCollet.com> 1.7.5-1
 - update to 1.7.5
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Cache-Lite/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	24 Jan 2009 07:11:16 -0000	1.4
+++ sources	29 Jan 2009 06:09:14 -0000	1.5
@@ -1 +1 @@
-085d095dc2bd92e546a8d6aa8dd748ba  Cache_Lite-1.7.5.tgz
+edccd4a674ac08a4a2e500894d58f45e  Cache_Lite-1.7.6.tgz



From jkeating at fedoraproject.org  Thu Jan 29 06:32:39 2009
From: jkeating at fedoraproject.org (Jesse Keating)
Date: Thu, 29 Jan 2009 06:32:39 +0000 (UTC)
Subject: rpms/bash/devel bash.spec,1.169,1.170
Message-ID: <20090129063239.6D45070116@cvs1.fedora.phx.redhat.com>

Author: jkeating

Update of /cvs/pkgs/rpms/bash/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15998

Modified Files:
	bash.spec 
Log Message:
* Wed Jan 28 2009 Jesse Keating <jkeating at redhat.com> - 4.0-0.2.rc1
- Replace post code with lua to be able to not have external deps



Index: bash.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bash/devel/bash.spec,v
retrieving revision 1.169
retrieving revision 1.170
diff -u -r1.169 -r1.170
--- bash.spec	27 Jan 2009 12:02:41 -0000	1.169
+++ bash.spec	29 Jan 2009 06:32:08 -0000	1.170
@@ -3,7 +3,7 @@
 Version: 4.0
 Name: bash
 Summary: The GNU Bourne Again shell version %{version}
-Release: 0.1.%{?beta_tag}%{?dist}
+Release: 0.2.%{?beta_tag}%{?dist}
 Group: System Environment/Shells
 License: GPLv2+
 Url: http://www.gnu.org/software/bash
@@ -179,29 +179,42 @@
 # ***** bash doesn't use install-info. It's always listed in %{_infodir}/dir
 # to prevent prereq loops
 
-%post
-
-HASBASH=""
-HASSH=""
-
-if [ ! -f /etc/shells ]; then
-  > /etc/shells
-fi
-
-(while read line ; do
-  if [ "$line" = "/bin/bash" ]; then
-    HASBASH=1
-  elif [ "$line" = "/bin/sh" ]; then
-    HASSH=1
-  fi
- done
-
- if [ -z "$HASBASH" ]; then
-  echo "/bin/bash" >> /etc/shells
- fi
- if [ -z "$HASSH" ]; then
-  echo "/bin/sh" >> /etc/shells
-fi) < /etc/shells
+# post is in lua so that we can run it without any external deps.  Helps
+# for bootstrapping a new install.
+# Jesse Keating 2009-01-29 (code from Ignacio Vazquez-Abrams)
+%post -p lua
+bashfound = false;
+shfound = false;
+ 
+f = io.open("/etc/shells", "r");
+if f == nil
+then
+  f = io.open("/etc/shells", "w");
+else
+  repeat
+    t = f:read();
+    if t == "/bin/bash"
+    then
+      bashfound = true;
+    end
+    if t == "/bin/sh"
+    then
+      shfound = true;
+    end
+  until t == nil;
+end
+f:close()
+ 
+f = io.open("/etc/shells", "a");
+if not bashfound
+then
+  f:write("/bin/bash\n")
+end
+if not shfound
+then
+  f:write("/bin/sh\n")
+end
+f:close()
 
 %postun
 if [ "$1" = 0 ]; then
@@ -229,6 +242,9 @@
 #%doc doc/*.ps doc/*.0 doc/*.html doc/article.txt
 
 %changelog
+* Wed Jan 28 2009 Jesse Keating <jkeating at redhat.com> - 4.0-0.2.rc1
+- Replace post code with lua to be able to not have external deps
+
 * Mon Jan 26 2009 Roman Rakus <rrakus at redhat.com> - 4.0-0.1.rc1
 - Fixed release tag
 



From jkeating at fedoraproject.org  Thu Jan 29 06:39:05 2009
From: jkeating at fedoraproject.org (Jesse Keating)
Date: Thu, 29 Jan 2009 06:39:05 +0000 (UTC)
Subject: rpms/bash/devel bash.spec,1.170,1.171
Message-ID: <20090129063905.8CE7970116@cvs1.fedora.phx.redhat.com>

Author: jkeating

Update of /cvs/pkgs/rpms/bash/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17481

Modified Files:
	bash.spec 
Log Message:
* Wed Jan 28 2009 Jesse Keating <jkeating at redhat.com> - 4.0-0.2.rc1
- Replace post code with lua to be able to not have external deps



Index: bash.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bash/devel/bash.spec,v
retrieving revision 1.170
retrieving revision 1.171
diff -u -r1.170 -r1.171
--- bash.spec	29 Jan 2009 06:32:08 -0000	1.170
+++ bash.spec	29 Jan 2009 06:38:35 -0000	1.171
@@ -182,7 +182,7 @@
 # post is in lua so that we can run it without any external deps.  Helps
 # for bootstrapping a new install.
 # Jesse Keating 2009-01-29 (code from Ignacio Vazquez-Abrams)
-%post -p lua
+%post -p <lua>
 bashfound = false;
 shfound = false;
  



From jkeating at fedoraproject.org  Thu Jan 29 07:29:00 2009
From: jkeating at fedoraproject.org (Jesse Keating)
Date: Thu, 29 Jan 2009 07:29:00 +0000 (UTC)
Subject: rpms/bash/F-10 bash.spec,1.164,1.165
Message-ID: <20090129072900.15D0D70116@cvs1.fedora.phx.redhat.com>

Author: jkeating

Update of /cvs/pkgs/rpms/bash/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25489

Modified Files:
	bash.spec 
Log Message:
* Wed Jan 28 2009 Jesse Keating <jkeating at redhat.com> - 3.2-31
- Replace post code with lua to be able to not have external deps



Index: bash.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bash/F-10/bash.spec,v
retrieving revision 1.164
retrieving revision 1.165
diff -u -r1.164 -r1.165
--- bash.spec	15 Dec 2008 10:58:33 -0000	1.164
+++ bash.spec	29 Jan 2009 07:28:29 -0000	1.165
@@ -1,7 +1,7 @@
 Version: 3.2
 Name: bash
 Summary: The GNU Bourne Again shell (bash) version %{version}
-Release: 30%{?dist}
+Release: 31%{?dist}
 Group: System Environment/Shells
 License: GPLv2+
 Url: http://www.gnu.org/software/bash
@@ -258,29 +258,42 @@
 # ***** bash doesn't use install-info. It's always listed in %{_infodir}/dir
 # to prevent prereq loops
 
-%post
-
-HASBASH=""
-HASSH=""
-
-if [ ! -f /etc/shells ]; then
-  > /etc/shells
-fi
-
-(while read line ; do
-  if [ "$line" = "/bin/bash" ]; then
-    HASBASH=1
-  elif [ "$line" = "/bin/sh" ]; then
-    HASSH=1
-  fi
- done
-
- if [ -z "$HASBASH" ]; then
-  echo "/bin/bash" >> /etc/shells
- fi
- if [ -z "$HASSH" ]; then
-  echo "/bin/sh" >> /etc/shells
-fi) < /etc/shells
+# post is in lua so that we can run it without any external deps.  Helps
+# for bootstrapping a new install.
+# Jesse Keating 2009-01-29 (code from Ignacio Vazquez-Abrams)
+%post -p <lua>
+bashfound = false;
+shfound = false;
+ 
+f = io.open("/etc/shells", "r");
+if f == nil
+then
+  f = io.open("/etc/shells", "w");
+else
+  repeat
+    t = f:read();
+    if t == "/bin/bash"
+    then
+      bashfound = true;
+    end
+    if t == "/bin/sh"
+    then
+      shfound = true;
+    end
+  until t == nil;
+end
+f:close()
+ 
+f = io.open("/etc/shells", "a");
+if not bashfound
+then
+  f:write("/bin/bash\n")
+end
+if not shfound
+then
+  f:write("/bin/sh\n")
+end
+f:close()
 
 %postun
 if [ "$1" = 0 ]; then
@@ -306,6 +319,9 @@
 %doc doc/*.ps doc/*.0 doc/*.html doc/article.txt
 
 %changelog
+* Wed Jan 28 2009 Jesse Keating <jkeating at redhat.com> - 3.2-31
+- Replace post code with lua to be able to not have external deps
+
 * Mon Dec 15 2008 Roman Rakus <rrakus at redhat.com> - 3.2-30
 - Enabling auditing
   Resolves: #476216



From cweyl at fedoraproject.org  Thu Jan 29 07:40:18 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Thu, 29 Jan 2009 07:40:18 +0000 (UTC)
Subject: rpms/perl-Fedora-Bugzilla/devel import.log, NONE,
	1.1 perl-Fedora-Bugzilla.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090129074018.AE90A70116@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Fedora-Bugzilla/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27903/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-Fedora-Bugzilla.spec 
Log Message:
initial import


--- NEW FILE import.log ---
perl-Fedora-Bugzilla-0_04-1_fc10:HEAD:perl-Fedora-Bugzilla-0.04-1.fc10.src.rpm:1233214773


--- NEW FILE perl-Fedora-Bugzilla.spec ---
Name:           perl-Fedora-Bugzilla
Version:        0.04
Release:        1%{?dist}
Summary:        Access Fedora's Bugzilla

Group:          Development/Libraries
License:        LGPLv2+
URL:            http://camelus.fedorahosted.org
Source0:        http://fedorahosted.org/releases/c/a/camelus/Fedora-Bugzilla-%{version}.tar.gz
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(namespace::clean)
BuildRequires:  perl(Crypt::SSLeay)
BuildRequires:  perl(DateTime::Format::Builder)
BuildRequires:  perl(Email::Address)
BuildRequires:  perl(HTTP::Cookies)
BuildRequires:  perl(MIME::Base64)
BuildRequires:  perl(RPC::XML::Client)
BuildRequires:  perl(Moose)
BuildRequires:  perl(MooseX::AttributeHelpers)
BuildRequires:  perl(MooseX::MultiInitArg)
BuildRequires:  perl(MooseX::StrictConstructor)
BuildRequires:  perl(MooseX::Traits::Attribute::CascadeClear)
BuildRequires:  perl(MooseX::Types)
BuildRequires:  perl(MooseX::Types::DateTime)
BuildRequires:  perl(MooseX::Types::Path::Class)
BuildRequires:  perl(MooseX::Types::URI)
BuildRequires:  perl(Regexp::Common)
BuildRequires:  perl(URI::Fetch)
BuildRequires:  perl(URI::Find)
BuildRequires:  perl(XML::Twig)

# tests
BuildRequires:  perl(Test::More)

# not automagically picked up atm
Requires:       perl(Crypt::SSLeay)
Requires:       perl(MooseX::Traits::Attribute::CascadeClear)

%description
The XML-RPC interface to bugzilla is quite useful, and while Bugzilla 3.x 
is starting to flesh their interface out a bit more (see, e.g.,
L<WWW::Bugzilla3>), Fedora's Bugzilla implementation has a large number of
custom methods.  This module aims to expose them, in a kinder, gentler way.

In addition to the XML-RPC methods Bugzilla makes available, there are also
some things we only seem to be able to access via the web/XML interfaces.
(See, e.g., the flags, attachments and comments functionality.)  This package
works to expose those as well.


%prep
%setup -q -n Fedora-Bugzilla-%{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 README Changes TODO COPYING
%{perl_vendorlib}/*
%{_mandir}/man3/*.3*


%changelog
* Wed Jan 28 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.04-1
- update to 0.04
- update source0 to URL

* Sun Jan 25 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.03-1
- bump release for submission (prereq for reviewtool)

* Sun Jan 25 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.03-0.1
- update to 0.03

* Sun Jan 25 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.02-0.1
- update to 0.02
- add requires on Crypt::SSLeay

* Mon Jan 19 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.01-0.2
- add requires on perl(MooseX::Traits::Attribute::CascadeClear) 

* Sat Jan 17 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.01-0.1
- initial packaging


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Fedora-Bugzilla/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	26 Jan 2009 23:04:53 -0000	1.1
+++ .cvsignore	29 Jan 2009 07:39:48 -0000	1.2
@@ -0,0 +1 @@
+Fedora-Bugzilla-0.04.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Fedora-Bugzilla/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	26 Jan 2009 23:04:53 -0000	1.1
+++ sources	29 Jan 2009 07:39:48 -0000	1.2
@@ -0,0 +1 @@
+37f1c67a303375a6ed3d342fa5244e13  Fedora-Bugzilla-0.04.tar.gz



From cweyl at fedoraproject.org  Thu Jan 29 07:42:10 2009
From: cweyl at fedoraproject.org (Chris Weyl)
Date: Thu, 29 Jan 2009 07:42:10 +0000 (UTC)
Subject: rpms/perl-Fedora-Bugzilla/F-10 import.log, NONE,
	1.1 perl-Fedora-Bugzilla.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090129074210.13BFA70116@cvs1.fedora.phx.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Fedora-Bugzilla/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28588/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-Fedora-Bugzilla.spec 
Log Message:
initial import


--- NEW FILE import.log ---
perl-Fedora-Bugzilla-0_04-1_fc10:F-10:perl-Fedora-Bugzilla-0.04-1.fc10.src.rpm:1233214884


--- NEW FILE perl-Fedora-Bugzilla.spec ---
Name:           perl-Fedora-Bugzilla
Version:        0.04
Release:        1%{?dist}
Summary:        Access Fedora's Bugzilla

Group:          Development/Libraries
License:        LGPLv2+
URL:            http://camelus.fedorahosted.org
Source0:        http://fedorahosted.org/releases/c/a/camelus/Fedora-Bugzilla-%{version}.tar.gz
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(namespace::clean)
BuildRequires:  perl(Crypt::SSLeay)
BuildRequires:  perl(DateTime::Format::Builder)
BuildRequires:  perl(Email::Address)
BuildRequires:  perl(HTTP::Cookies)
BuildRequires:  perl(MIME::Base64)
BuildRequires:  perl(RPC::XML::Client)
BuildRequires:  perl(Moose)
BuildRequires:  perl(MooseX::AttributeHelpers)
BuildRequires:  perl(MooseX::MultiInitArg)
BuildRequires:  perl(MooseX::StrictConstructor)
BuildRequires:  perl(MooseX::Traits::Attribute::CascadeClear)
BuildRequires:  perl(MooseX::Types)
BuildRequires:  perl(MooseX::Types::DateTime)
BuildRequires:  perl(MooseX::Types::Path::Class)
BuildRequires:  perl(MooseX::Types::URI)
BuildRequires:  perl(Regexp::Common)
BuildRequires:  perl(URI::Fetch)
BuildRequires:  perl(URI::Find)
BuildRequires:  perl(XML::Twig)

# tests
BuildRequires:  perl(Test::More)

# not automagically picked up atm
Requires:       perl(Crypt::SSLeay)
Requires:       perl(MooseX::Traits::Attribute::CascadeClear)

%description
The XML-RPC interface to bugzilla is quite useful, and while Bugzilla 3.x 
is starting to flesh their interface out a bit more (see, e.g.,
L<WWW::Bugzilla3>), Fedora's Bugzilla implementation has a large number of
custom methods.  This module aims to expose them, in a kinder, gentler way.

In addition to the XML-RPC methods Bugzilla makes available, there are also
some things we only seem to be able to access via the web/XML interfaces.
(See, e.g., the flags, attachments and comments functionality.)  This package
works to expose those as well.


%prep
%setup -q -n Fedora-Bugzilla-%{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 README Changes TODO COPYING
%{perl_vendorlib}/*
%{_mandir}/man3/*.3*


%changelog
* Wed Jan 28 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.04-1
- update to 0.04
- update source0 to URL

* Sun Jan 25 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.03-1
- bump release for submission (prereq for reviewtool)

* Sun Jan 25 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.03-0.1
- update to 0.03

* Sun Jan 25 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.02-0.1
- update to 0.02
- add requires on Crypt::SSLeay

* Mon Jan 19 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.01-0.2
- add requires on perl(MooseX::Traits::Attribute::CascadeClear) 

* Sat Jan 17 2009 Chris Weyl <cweyl at alumni.drew.edu> 0.01-0.1
- initial packaging


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Fedora-Bugzilla/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	26 Jan 2009 23:04:53 -0000	1.1
+++ .cvsignore	29 Jan 2009 07:41:39 -0000	1.2
@@ -0,0 +1 @@
+Fedora-Bugzilla-0.04.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Fedora-Bugzilla/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	26 Jan 2009 23:04:53 -0000	1.1
+++ sources	29 Jan 2009 07:41:39 -0000	1.2
@@ -0,0 +1 @@
+37f1c67a303375a6ed3d342fa5244e13  Fedora-Bugzilla-0.04.tar.gz



From ankursinha at fedoraproject.org  Thu Jan 29 07:44:01 2009
From: ankursinha at fedoraproject.org (Ankur Sinha)
Date: Thu, 29 Jan 2009 07:44:01 +0000 (UTC)
Subject: rpms/cf-bonveno-fonts/devel cf-bonveno-fonts-fontconfig.conf, NONE, 
	1.1 cf-bonveno-fonts.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090129074401.95FE870116@cvs1.fedora.phx.redhat.com>

Author: ankursinha

Update of /cvs/pkgs/rpms/cf-bonveno-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28314/devel

Modified Files:
	.cvsignore sources 
Added Files:
	cf-bonveno-fonts-fontconfig.conf cf-bonveno-fonts.spec 
	import.log 
Log Message:


* Thu Jan 29 2009 Ankur Sinha <ankursinha at fedoraproject.org>
- 1.1-3
- Added package to CVS



--- NEW FILE cf-bonveno-fonts-fontconfig.conf ---
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
<fontconfig>
  <alias>
    <family>sans-serif</family>
    <prefer>
      <family>BonvenoCF</family>
    </prefer>
  </alias>
  <alias>
    <family>BonvenoCF</family>
    <default>
      <family>sans-serif</family>
    </default>
  </alias>
</fontconfig>


--- NEW FILE cf-bonveno-fonts.spec ---
%define	fontname	cf-bonveno
%define fontconf	60-%{fontname}.conf


Name:		%{fontname}-fonts
Version:	1.1
Release:	3%{?dist}
Summary:	A fun font by Barry Schwartz

Group:		User Interface/X
License:	GPLv2+
URL:		http://home.comcast.net/~crudfactory/cf3/bonveno.xhtml
Source0:	http://home.comcast.net/~crudfactory/cf3/fonts/BonvenoCF-1.1.zip
Source1:	%{name}-fontconfig.conf
BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

BuildArch: 	noarch
BuildRequires:	fontforge, fontpackages-devel
Requires:	fontpackages-filesystem


%description
A set of fun fonts from the crud factory.

%prep
%setup -q -c


for txt in COPYING README ; do
	sed 's/\r//' $txt > $txt.new
	touch -r $txt $txt.new
	mv $txt.new $txt
done

%build
fontforge -script "-" BonvenoCF*.sfd <<EOF
i = 1 
while ( i < \$argc )
	Open (\$argv[i], 1)
	Generate (\$fontname + ".ttf")
	PrintSetup (5) 
	PrintFont (0, 0, "", \$fontname + "-sample.pdf")
	Close()
	i++ 
endloop
EOF

%install
rm -fr %{buildroot}

install -dm 755 %{buildroot}%{_fontdir}
install -pm 644 *.ttf  %{buildroot}%{_fontdir}

install -m 755 -d %{buildroot}%{_fontconfig_templatedir} \
		%{buildroot}%{_fontconfig_confdir}

install -m 644 -p %{SOURCE1} \
		%{buildroot}%{_fontconfig_templatedir}/%{fontconf}

ln -s %{_fontconfig_templatedir}/%{fontconf} \
	%{buildroot}%{_fontconfig_confdir}/%{fontconf}


%clean
rm -rf %{buildroot}

%_font_pkg -f %{fontconf} *.ttf


%doc  COPYING* README*

%dir %{_fontdir}/

%changelog
* Tue Jan 20 2009 Ankur Sinha <ankursinha at fedoraproject.org>
- 1.1-3
- changed font config file according to files provided in the fontpackages-devel package.
* Sun Jan 4 2009 Ankur Sinha <ankursinha at fedoraproject.org>
- 1.1-2
- rebuilt as per new font packaging guidelines
* Mon Dec 15 2008 Ankur Sinha <ankursinha at fedoraproject.org>
- 1.1-1
- rebuilt on fedora 10 (#457955 at bugzilla)



--- NEW FILE import.log ---
cf-bonveno-fonts-1_1-3_fc10:HEAD:cf-bonveno-fonts-1.1-3.fc10.src.rpm:1233214810


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cf-bonveno-fonts/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	29 Jan 2009 00:33:07 -0000	1.1
+++ .cvsignore	29 Jan 2009 07:43:31 -0000	1.2
@@ -0,0 +1 @@
+BonvenoCF-1.1.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cf-bonveno-fonts/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	29 Jan 2009 00:33:08 -0000	1.1
+++ sources	29 Jan 2009 07:43:31 -0000	1.2
@@ -0,0 +1 @@
+373a25b036bcbdee2daecf05e4b9e43d  BonvenoCF-1.1.zip



From cebbert at fedoraproject.org  Thu Jan 29 07:48:31 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Thu, 29 Jan 2009 07:48:31 +0000 (UTC)
Subject: rpms/kernel/F-9 linux-2.6-input-atkbd-broaden-dell-signatures.patch,
	NONE, 1.1.2.1 linux-2.6-input-atkbd-samsung-nc10-key-repeat-fix.patch,
	NONE, 1.1.2.1 kernel.spec, 1.891.2.12, 1.891.2.13
Message-ID: <20090129074831.211BD70116@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29571

Modified Files:
      Tag: private-fedora-9-2_6_27-branch
	kernel.spec 
Added Files:
      Tag: private-fedora-9-2_6_27-branch
	linux-2.6-input-atkbd-broaden-dell-signatures.patch 
	linux-2.6-input-atkbd-samsung-nc10-key-repeat-fix.patch 
Log Message:
Add keyboard quirks for more systems:
  Some Dell machines have a different vendor name in DMI.
  Samsung NC10 doesn't generate keyup for some keys.

linux-2.6-input-atkbd-broaden-dell-signatures.patch:

--- NEW FILE linux-2.6-input-atkbd-broaden-dell-signatures.patch ---
From: Matthew Garrett <mjg59 at srcf.ucam.org>
Date: Tue, 30 Dec 2008 08:43:11 +0000 (-0800)
Subject: Input: atkbd - broaden the Dell DMI signatures
X-Git-Tag: v2.6.29-rc1~221^2~1^2~2
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=2a3ec3265741c3b2a7ebbd1b33f538e5a5583c48

Input: atkbd - broaden the Dell DMI signatures

Some Dells need the dell input quirk applied but have a different vendor
string in their DMI tables. Add an extra entry to cover these machines as
well.

Signed-off-by: Matthew Garrett <mjg at redhat.com>
Signed-off-by: Dmitry Torokhov <dtor at mail.ru>
---

diff --git a/drivers/input/keyboard/atkbd.c b/drivers/input/keyboard/atkbd.c
index 97f709f..f6e9f39 100644
--- a/drivers/input/keyboard/atkbd.c
+++ b/drivers/input/keyboard/atkbd.c
@@ -1509,6 +1509,15 @@ static struct dmi_system_id atkbd_dmi_quirk_table[] __initdata = {
 		.driver_data = atkbd_dell_laptop_keymap_fixup,
 	},
 	{
+		.ident = "Dell Laptop",
+		.matches = {
+			DMI_MATCH(DMI_SYS_VENDOR, "Dell Computer Corporation"),
+			DMI_MATCH(DMI_CHASSIS_TYPE, "8"), /* Portable */
+		},
+		.callback = atkbd_setup_fixup,
+		.driver_data = atkbd_dell_laptop_keymap_fixup,
+	},
+	{
 		.ident = "HP 2133",
 		.matches = {
 			DMI_MATCH(DMI_SYS_VENDOR, "Hewlett-Packard"),

linux-2.6-input-atkbd-samsung-nc10-key-repeat-fix.patch:

--- NEW FILE linux-2.6-input-atkbd-samsung-nc10-key-repeat-fix.patch ---
From: Stuart Hopkins <stuart at dodgy-geeza.com>
Date: Sat, 20 Dec 2008 09:12:33 +0000 (-0500)
Subject: Input: atkbd - Samsung NC10 key repeat fix
X-Git-Tag: v2.6.29-rc1~221^2~1^2~13
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=4200844bd9dc511088258437d564a187f0ffc94e

Input: atkbd - Samsung NC10 key repeat fix

This patch fixes the key repeat issue with the Fn+F? keys on the new
Samsung NC10 Netbook, so that the keys can be defined and used within
ACPID correctly, otherwise the keys repeat indefinately.

This solves part of http://bugzilla.kernel.org/show_bug.cgi?id=12021

Signed-off-by: Stuart Hopkins <stuart at dodgy-geeza.com>
Signed-off-by: Dmitry Torokhov <dtor at mail.ru>
---

diff --git a/drivers/input/keyboard/atkbd.c b/drivers/input/keyboard/atkbd.c
index fa6ed33..97f709f 100644
--- a/drivers/input/keyboard/atkbd.c
+++ b/drivers/input/keyboard/atkbd.c
@@ -901,6 +901,22 @@ static void atkbd_hp_zv6100_keymap_fixup(struct atkbd *atkbd)
 }
 
 /*
+ * Samsung NC10 with Fn+F? key release not working
+ */
+static void atkbd_samsung_keymap_fixup(struct atkbd *atkbd)
+{
+	const unsigned int forced_release_keys[] = {
+		0x82, 0x83, 0x84, 0x86, 0x88, 0x89, 0xb3, 0xf7, 0xf9,
+	};
+	int i;
+
+	if (atkbd->set == 2)
+		for (i = 0; i < ARRAY_SIZE(forced_release_keys); i++)
+			__set_bit(forced_release_keys[i],
+				  atkbd->force_release_mask);
+}
+
+/*
  * atkbd_set_keycode_table() initializes keyboard's keycode table
  * according to the selected scancode set
  */
@@ -1519,6 +1535,15 @@ static struct dmi_system_id atkbd_dmi_quirk_table[] __initdata = {
 		.callback = atkbd_setup_fixup,
 		.driver_data = atkbd_inventec_keymap_fixup,
 	},
+	{
+		.ident = "Samsung NC10",
+		.matches = {
+			DMI_MATCH(DMI_SYS_VENDOR, "SAMSUNG ELECTRONICS CO., LTD."),
+			DMI_MATCH(DMI_PRODUCT_NAME, "NC10"),
+		},
+		.callback = atkbd_setup_fixup,
+		.driver_data = atkbd_samsung_keymap_fixup,
+	},
 	{ }
 };
 


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/kernel.spec,v
retrieving revision 1.891.2.12
retrieving revision 1.891.2.13
diff -u -r1.891.2.12 -r1.891.2.13
--- kernel.spec	26 Jan 2009 21:28:13 -0000	1.891.2.12
+++ kernel.spec	29 Jan 2009 07:47:59 -0000	1.891.2.13
@@ -653,6 +653,8 @@
 Patch452: linux-2.6.27-hwmon-applesmc-2.6.28.patch
 # 448656
 Patch454: linux-2.6-input.git-i8042-add-xps-m1530-to-nomux.patch
+Patch455: linux-2.6-input-atkbd-broaden-dell-signatures.patch
+Patch456: linux-2.6-input-atkbd-samsung-nc10-key-repeat-fix.patch
 
 Patch460: linux-2.6-serial-460800.patch
 Patch510: linux-2.6-silence-noise.patch
@@ -1221,6 +1223,10 @@
 ApplyPatch linux-2.6.27-hwmon-applesmc-2.6.28.patch
 # 448656
 ApplyPatch linux-2.6-input.git-i8042-add-xps-m1530-to-nomux.patch
+# apply dell quirks to additional machines
+ApplyPatch linux-2.6-input-atkbd-broaden-dell-signatures.patch
+# fix key repeats on Samsung NC10
+ApplyPatch linux-2.6-input-atkbd-samsung-nc10-key-repeat-fix.patch
 
 # Allow to use 480600 baud on 16C950 UARTs
 ApplyPatch linux-2.6-serial-460800.patch
@@ -1910,6 +1916,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
+* Thu Jan 29 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.27.13-78.2.13
+- Add keyboard quirks for more systems:
+  Some Dell machines have a different vendor name in DMI.
+  Samsung NC10 doesn't generate keyup for some keys.
+
 * Mon Jan 26 2009 Kyle McMartin <kyle at redhat.com> 2.6.27.13-78.2.12
 - 2.6.27.13 final
 



From petersen at fedoraproject.org  Thu Jan 29 08:37:39 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Thu, 29 Jan 2009 08:37:39 +0000 (UTC)
Subject: rpms/scim-bridge/devel scim-bridge-0.4.15-bz461373.patch, 1.1,
	1.2 scim-bridge-0.4.15-hotkey-help.patch, 1.2,
	1.3 scim-bridge.spec, 1.66, 1.67
Message-ID: <20090129083739.A47A570116@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/scim-bridge/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4633

Modified Files:
	scim-bridge-0.4.15-bz461373.patch 
	scim-bridge-0.4.15-hotkey-help.patch scim-bridge.spec 
Log Message:
- update to 0.4.15.2 release
- update scim-bridge-0.4.15-bz461373.patch and
  scim-bridge-0.4.15-hotkey-help.patch



scim-bridge-0.4.15-bz461373.patch:

Index: scim-bridge-0.4.15-bz461373.patch
===================================================================
RCS file: /cvs/extras/rpms/scim-bridge/devel/scim-bridge-0.4.15-bz461373.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- scim-bridge-0.4.15-bz461373.patch	16 Sep 2008 02:04:01 -0000	1.1
+++ scim-bridge-0.4.15-bz461373.patch	29 Jan 2009 08:37:09 -0000	1.2
@@ -1,6 +1,6 @@
 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
+--- scim-bridge-0.4.15/client-qt/scim-bridge-client-imcontext-qt.cpp.bz461373	2008-09-16 09:54:29.000000000 +0800
++++ scim-bridge-0.4.15/client-qt/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 ()");

scim-bridge-0.4.15-hotkey-help.patch:

Index: scim-bridge-0.4.15-hotkey-help.patch
===================================================================
RCS file: /cvs/extras/rpms/scim-bridge/devel/scim-bridge-0.4.15-hotkey-help.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- scim-bridge-0.4.15-hotkey-help.patch	24 Jun 2008 00:53:27 -0000	1.2
+++ scim-bridge-0.4.15-hotkey-help.patch	29 Jan 2009 08:37:09 -0000	1.3
@@ -10,12 +10,12 @@
 +    // ! 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" }
++        { "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.
@@ -58,12 +58,12 @@
  
  void ScimBridgeAgentIMContextImpl::panel_request_help ()
  {
--    String help =  String (_ ("Smart Common Input Method platform ")) +
+-    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 help =  String (_ ("SCIM Bridge")) + 
+-        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")) +
++        String ("\n(C) 2006-2008 Ryo Dairiki <ryo-dairiki at users.sourceforge.net>\n") +
 +        help_hotkeys +
 +        String ("\n\n");
  


Index: scim-bridge.spec
===================================================================
RCS file: /cvs/extras/rpms/scim-bridge/devel/scim-bridge.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- scim-bridge.spec	10 Nov 2008 18:15:22 -0000	1.66
+++ scim-bridge.spec	29 Jan 2009 08:37:09 -0000	1.67
@@ -5,8 +5,8 @@
 
 Name:           scim-bridge
 
-Version:        0.4.15
-Release:        8%{?dist}
+Version:        0.4.15.2
+Release:        1%{?dist}
 Summary:        SCIM Bridge Gtk IM module
 
 Group:          System Environment/Libraries
@@ -25,7 +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
+Patch2:         scim-bridge-0.4.15-bz461373.patch
 
 
 %description
@@ -75,7 +75,7 @@
 
 
 %prep
-%setup -q %{?snapdate:-n %{name}-%{version}-%{snapdate}}
+%setup -q -n %{name}-0.4.15
 %patch0 -p1 -b .0-fix-gdm
 %patch1 -p1 -b .1-hotkey-help
 %patch2 -p1 -b .2-bz461373
@@ -149,6 +149,11 @@
 
 
 %changelog
+* Thu Jan 29 2009 Jens Petersen <petersen at redhat.com> - 0.4.15.2-1
+- update to 0.4.15.2 release
+- update scim-bridge-0.4.15-bz461373.patch and
+  scim-bridge-0.4.15-hotkey-help.patch
+
 * Sun Sep 28 2008 Huang Peng <phuang at redhat.com> - 0.4.15-8
 - Change release version to 8 for rebuilding rpms.
 



From petersen at fedoraproject.org  Thu Jan 29 08:48:06 2009
From: petersen at fedoraproject.org (Jens Petersen)
Date: Thu, 29 Jan 2009 08:48:06 +0000 (UTC)
Subject: rpms/scim-bridge/devel .cvsignore,1.31,1.32 sources,1.31,1.32
Message-ID: <20090129084806.8C02570116@cvs1.fedora.phx.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/scim-bridge/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7064

Modified Files:
	.cvsignore sources 
Log Message:
update source


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/scim-bridge/devel/.cvsignore,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- .cvsignore	4 Mar 2008 05:06:54 -0000	1.31
+++ .cvsignore	29 Jan 2009 08:47:36 -0000	1.32
@@ -1 +1 @@
-scim-bridge-0.4.15.tar.gz
+scim-bridge-0.4.15.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/scim-bridge/devel/sources,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- sources	4 Mar 2008 05:06:54 -0000	1.31
+++ sources	29 Jan 2009 08:47:36 -0000	1.32
@@ -1 +1 @@
-03015dfdc01f8aa6ad933c695f47077b  scim-bridge-0.4.15.tar.gz
+9b401f68bbb6e4eb70cc043b52a75592  scim-bridge-0.4.15.2.tar.gz



From tagoh at fedoraproject.org  Thu Jan 29 09:04:00 2009
From: tagoh at fedoraproject.org (Akira TAGOH)
Date: Thu, 29 Jan 2009 09:04:00 +0000 (UTC)
Subject: rpms/scim-anthy/devel .cvsignore, 1.12, 1.13 scim-anthy.spec, 1.51, 
	1.52 sources, 1.12, 1.13
Message-ID: <20090129090400.462EF70116@cvs1.fedora.phx.redhat.com>

Author: tagoh

Update of /cvs/pkgs/rpms/scim-anthy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9581

Modified Files:
	.cvsignore scim-anthy.spec sources 
Log Message:
* Thu Jan 29 2009 Akira TAGOH <tagoh at redhat.com> - 1.2.7-1
- New upstream release.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/scim-anthy/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	7 Oct 2008 02:24:22 -0000	1.12
+++ .cvsignore	29 Jan 2009 09:03:29 -0000	1.13
@@ -13,3 +13,4 @@
 scim-anthy-1.2.2.tar.gz
 scim-anthy-1.2.4.tar.gz
 scim-anthy-1.2.6.tar.gz
+scim-anthy-1.2.7.tar.gz


Index: scim-anthy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/scim-anthy/devel/scim-anthy.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- scim-anthy.spec	21 Nov 2008 09:20:38 -0000	1.51
+++ scim-anthy.spec	29 Jan 2009 09:03:29 -0000	1.52
@@ -1,13 +1,13 @@
 Name:           scim-anthy
-Version:        1.2.6
-Release:        2%{?dist}
+Version:        1.2.7
+Release:        1%{?dist}
 
 License:        GPLv2+
 URL:            http://scim-imengine.sourceforge.jp/
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  scim-devel
 BuildRequires:  anthy-devel >= 6700b-1 gettext-devel automake autoconf libtool
-Source0:        http://osdn.dl.sourceforge.jp/scim-imengine/30199/%{name}-%{version}.tar.gz
+Source0:        http://osdn.dl.sourceforge.jp/scim-imengine/37309/%{name}-%{version}.tar.gz
 
 Summary:        SCIM IMEngine for anthy for Japanese input
 Group:          System Environment/Libraries
@@ -55,6 +55,9 @@
 
 
 %changelog
+* Thu Jan 29 2009 Akira TAGOH <tagoh at redhat.com> - 1.2.7-1
+- New upstream release.
+
 * Fri Nov 21 2008 Akira TAGOH <tagoh at redhat.com> - 1.2.6-2
 - Fix a source URL.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/scim-anthy/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	7 Oct 2008 02:24:23 -0000	1.12
+++ sources	29 Jan 2009 09:03:29 -0000	1.13
@@ -1 +1 @@
-d45c4e37e87aed4f1d09bb6e5e7add01  scim-anthy-1.2.6.tar.gz
+8d06bfd46839c771401b9f176be8818f  scim-anthy-1.2.7.tar.gz



From tagoh at fedoraproject.org  Thu Jan 29 09:21:20 2009
From: tagoh at fedoraproject.org (Akira TAGOH)
Date: Thu, 29 Jan 2009 09:21:20 +0000 (UTC)
Subject: rpms/scim-anthy/F-10 .cvsignore, 1.12, 1.13 scim-anthy.spec, 1.50, 
	1.51 sources, 1.12, 1.13
Message-ID: <20090129092120.DA8B070116@cvs1.fedora.phx.redhat.com>

Author: tagoh

Update of /cvs/pkgs/rpms/scim-anthy/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12575

Modified Files:
	.cvsignore scim-anthy.spec sources 
Log Message:
* Thu Jan 29 2009 Akira TAGOH <tagoh at redhat.com> - 1.2.7-1
- New upstream release.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/scim-anthy/F-10/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	7 Oct 2008 02:24:22 -0000	1.12
+++ .cvsignore	29 Jan 2009 09:20:50 -0000	1.13
@@ -13,3 +13,4 @@
 scim-anthy-1.2.2.tar.gz
 scim-anthy-1.2.4.tar.gz
 scim-anthy-1.2.6.tar.gz
+scim-anthy-1.2.7.tar.gz


Index: scim-anthy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/scim-anthy/F-10/scim-anthy.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- scim-anthy.spec	7 Oct 2008 02:24:23 -0000	1.50
+++ scim-anthy.spec	29 Jan 2009 09:20:50 -0000	1.51
@@ -1,5 +1,5 @@
 Name:           scim-anthy
-Version:        1.2.6
+Version:        1.2.7
 Release:        1%{?dist}
 
 License:        GPLv2+
@@ -7,7 +7,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  scim-devel
 BuildRequires:  anthy-devel >= 6700b-1 gettext-devel automake autoconf libtool
-Source0:        http://dl.sourceforge.jp/scim-imengine/30199/%{name}-%{version}.tar.gz
+Source0:        http://osdn.dl.sourceforge.jp/scim-imengine/37309/%{name}-%{version}.tar.gz
 
 Summary:        SCIM IMEngine for anthy for Japanese input
 Group:          System Environment/Libraries
@@ -55,6 +55,12 @@
 
 
 %changelog
+* Thu Jan 29 2009 Akira TAGOH <tagoh at redhat.com> - 1.2.7-1
+- New upstream release.
+
+* Fri Nov 21 2008 Akira TAGOH <tagoh at redhat.com> - 1.2.6-2
+- Fix a source URL.
+
 * Tue Oct  7 2008 Akira TAGOH <tagoh at redhat.com> - 1.2.6-1
 - New upstream release.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/scim-anthy/F-10/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	7 Oct 2008 02:24:23 -0000	1.12
+++ sources	29 Jan 2009 09:20:50 -0000	1.13
@@ -1 +1 @@
-d45c4e37e87aed4f1d09bb6e5e7add01  scim-anthy-1.2.6.tar.gz
+8d06bfd46839c771401b9f176be8818f  scim-anthy-1.2.7.tar.gz



From mkasik at fedoraproject.org  Thu Jan 29 09:22:37 2009
From: mkasik at fedoraproject.org (=?utf-8?b?TWFyZWsgS2HFocOtaw==?=)
Date: Thu, 29 Jan 2009 09:22:37 +0000 (UTC)
Subject: rpms/gtk2/F-10 gtk2.spec,1.344,1.345
Message-ID: <20090129092237.D654B70116@cvs1.fedora.phx.redhat.com>

Author: mkasik

Update of /cvs/pkgs/rpms/gtk2/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12827

Modified Files:
	gtk2.spec 
Log Message:
* Thu Jan 29 2009 Marek Kasik <mkasik at redhat.com> - 2.14.7-6
- Modify spec file to apply print_at_local_time.patch



Index: gtk2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtk2/F-10/gtk2.spec,v
retrieving revision 1.344
retrieving revision 1.345
diff -u -r1.344 -r1.345
--- gtk2.spec	28 Jan 2009 16:06:26 -0000	1.344
+++ gtk2.spec	29 Jan 2009 09:22:07 -0000	1.345
@@ -16,7 +16,7 @@
 Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X
 Name: gtk2
 Version: %{base_version}
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 Source: http://download.gnome.org/sources/gtk+/2.14/gtk+-%{version}.tar.bz2
@@ -120,7 +120,8 @@
 %patch0 -p1 -b .lib64
 %patch1 -p1 -b .set-invisible-char-to-bullet
 %patch2 -p1 -b .workaround
-%patch3 -p0 -b default-printer
+%patch3 -p0 -b .default-printer
+%patch4 -p0 -b .print-at-local-time
 
 for i in config.guess config.sub ; do
   test -f %{_datadir}/libtool/$i && cp %{_datadir}/libtool/$i .
@@ -302,6 +303,9 @@
 %{_datadir}/gtk-2.0
 
 %changelog
+* Thu Jan 29 2009 Marek Kasik <mkasik at redhat.com> - 2.14.7-6
+- Modify spec file to apply print_at_local_time.patch
+
 * Wed Jan 28 2009 Marek Kasik <mkasik at redhat.com> - 2.14.7-5
 - Add print_at_local_time.patch
 



From msivak at fedoraproject.org  Thu Jan 29 09:43:31 2009
From: msivak at fedoraproject.org (=?utf-8?q?Martin_Siv=C3=A1k?=)
Date: Thu, 29 Jan 2009 09:43:31 +0000 (UTC)
Subject: rpms/python-cryptsetup/devel python-cryptsetup.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090129094331.8953670116@cvs1.fedora.phx.redhat.com>

Author: msivak

Update of /cvs/extras/rpms/python-cryptsetup/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16718

Modified Files:
	.cvsignore sources 
Added Files:
	python-cryptsetup.spec 
Log Message:
Inital version



--- NEW FILE python-cryptsetup.spec ---
%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}

Name:           python-cryptsetup
Version:        0.0.1
Release:        1%{?dist}
Summary:        Python bindings for cryptsetup

Group:          Development/Libraries
License:        GPLv2+
Url:            http://msivak.fedorapeople.org/pycryptsetup
Source:         http://msivak.fedorapeople.org/pycryptsetup/%{name}-%{version}.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  cryptsetup-luks-devel
BuildRequires:  python
BuildRequires:  python-setuptools-devel

%description
A python module to ease the manipulation with LUKS devices.

%prep
%setup -q

%build
%{__python} setup.py build

%install
rm -rf $RPM_BUILD_ROOT
%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
# For noarch packages: sitelib
%{python_sitearch}/pycryptsetup
%{python_sitearch}/cryptsetup.so
%{python_sitearch}/*egg-info

%doc COPYING
%doc selftest.py

%changelog
* Thu Jan 22 2009 Martin Sivak <msivak at redhat dot com> - 0.0.1-1
- Inital release



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-cryptsetup/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	29 Jan 2009 00:15:35 -0000	1.1
+++ .cvsignore	29 Jan 2009 09:43:00 -0000	1.2
@@ -0,0 +1 @@
+python-cryptsetup-0.0.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-cryptsetup/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	29 Jan 2009 00:15:35 -0000	1.1
+++ sources	29 Jan 2009 09:43:00 -0000	1.2
@@ -0,0 +1 @@
+769d2c48ba11cd47920f2d15378d359f  python-cryptsetup-0.0.1.tar.bz2



From whot at fedoraproject.org  Thu Jan 29 11:10:44 2009
From: whot at fedoraproject.org (Peter Hutterer)
Date: Thu, 29 Jan 2009 11:10:44 +0000 (UTC)
Subject: rpms/linuxwacom/devel linuxwacom-0.8.2.2-fix-mapping.patch, NONE,
	1.1 .cvsignore, 1.15, 1.16 linuxwacom.spec, 1.68, 1.69 sources,
	1.15, 1.16
Message-ID: <20090129111044.9494770116@cvs1.fedora.phx.redhat.com>

Author: whot

Update of /cvs/pkgs/rpms/linuxwacom/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30696

Modified Files:
	.cvsignore linuxwacom.spec sources 
Added Files:
	linuxwacom-0.8.2.2-fix-mapping.patch 
Log Message:
* Thu Jan 29 2009 Peter Hutterer <peter.hutterer at redhat.com> 0.8.2.2-1
- update to 0.8.2.2
- linuxwacom-0.8.2.2-fix-mapping.patch: fix button mapping, the X server
  starts with 1, not with 0.




linuxwacom-0.8.2.2-fix-mapping.patch:

--- NEW FILE linuxwacom-0.8.2.2-fix-mapping.patch ---
>From e29f4d9cc0667b9c03e6c191e9de76a8d08102ab Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer at who-t.net>
Date: Thu, 29 Jan 2009 11:42:22 +1000
Subject: [PATCH] Fix the button mapping offset.

There's no button 0 in the server, all offsets have to begin at 1.
---
 src/xdrv/wcmCommon.c |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/xdrv/wcmCommon.c b/src/xdrv/wcmCommon.c
index ff834f4..d5e3ed6 100644
--- a/src/xdrv/wcmCommon.c
+++ b/src/xdrv/wcmCommon.c
@@ -527,7 +527,9 @@ static void sendAButton(LocalDevicePtr local, int button, int mask,
 		return; 
 	}
 
-	button_idx = button;
+        /* Fix for current X servers, they start button mappings with 1, not
+         * with 0. */
+	button_idx = button + 1;
 	button = priv->button[button];
 	if (!button)  /* ignore this button event */
 		return;
@@ -748,12 +750,12 @@ static void sendWheelStripEvents(LocalDevicePtr local, const WacomDeviceState* d
 	{
 	    case AC_BUTTON:
 		/* send both button on/off in the same event for pad */
-		local->dev->button->map [0] = fakeButton & AC_CODE;
+		local->dev->button->map [1] = fakeButton & AC_CODE;
 	
-		xf86PostButtonEvent(local->dev, is_absolute, 0,
+		xf86PostButtonEvent(local->dev, is_absolute, 1,
 			1,0,naxes,x,y,z,v3,v4,v5);
 
-		xf86PostButtonEvent(local->dev, is_absolute, 0,
+		xf86PostButtonEvent(local->dev, is_absolute, 1,
 			0,0,naxes,x,y,z,v3,v4,v5);
 	    break;
 
-- 
1.6.0.6



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/linuxwacom/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	15 Jan 2009 21:02:53 -0000	1.15
+++ .cvsignore	29 Jan 2009 11:10:12 -0000	1.16
@@ -1,4 +1 @@
-linuxwacom-0.7.9-8.tar.bz2
-linuxwacom-0.8.1-4.tar.bz2
-linuxwacom-0.8.0-3.tar.bz2
-linuxwacom-0.8.2-1.tar.bz2
+linuxwacom-0.8.2-2.tar.bz2


Index: linuxwacom.spec
===================================================================
RCS file: /cvs/pkgs/rpms/linuxwacom/devel/linuxwacom.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- linuxwacom.spec	15 Jan 2009 21:02:53 -0000	1.68
+++ linuxwacom.spec	29 Jan 2009 11:10:12 -0000	1.69
@@ -1,8 +1,8 @@
-%define tarname		%{name}-0.8.2-1
+%define tarname		%{name}-0.8.2-2
 
 # Upstream's versioning is goofy.  Note the mapping from tarname to version.
 Name:		linuxwacom
-Version:	0.8.2.1
+Version:	0.8.2.2
 Release:	1%{?dist}
 Summary:	Wacom Drivers from Linux Wacom Project
 
@@ -15,6 +15,7 @@
 Patch1:		linuxwacom-0.7.8.3-sdk-me-harder.patch
 Patch2:		linuxwacom-0.7.9.7-fix_build.patch
 Patch3:		linuxwacom-0.8.2.1-fix_build.patch
+Patch4:		linuxwacom-0.8.2.2-fix-mapping.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}
 BuildRequires:	libX11-devel libXi-devel ncurses-devel
@@ -44,6 +45,7 @@
 %patch1 -p1 -b .sdk
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 %build
 
@@ -105,6 +107,11 @@
 %{_libdir}/libwacomcfg*.so
 
 %changelog
+* Thu Jan 29 2009 Peter Hutterer <peter.hutterer at redhat.com> 0.8.2.2-1
+- update to 0.8.2.2
+- linuxwacom-0.8.2.2-fix-mapping.patch: fix button mapping, the X server
+  starts with 1, not with 0.
+
 * Thu Jan 15 2009 Aristeu Rozanski <aris at redhat.com> 0.8.1.2-1
 - new production release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/linuxwacom/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	15 Jan 2009 21:02:53 -0000	1.15
+++ sources	29 Jan 2009 11:10:12 -0000	1.16
@@ -1 +1 @@
-c06a12b029b7ad8c879e08042d5c4a46  linuxwacom-0.8.2-1.tar.bz2
+bdfaf6da49b446e251ac1f98754a89a2  linuxwacom-0.8.2-2.tar.bz2



From ltinkl at fedoraproject.org  Thu Jan 29 11:15:38 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Thu, 29 Jan 2009 11:15:38 +0000 (UTC)
Subject: rpms/kdenetwork/F-9 kdenetwork.spec,1.161,1.162
Message-ID: <20090129111538.5A0D570116@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kdenetwork/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32265

Modified Files:
	kdenetwork.spec 
Log Message:
require the latest libmsn



Index: kdenetwork.spec
===================================================================
RCS file: /cvs/extras/rpms/kdenetwork/F-9/kdenetwork.spec,v
retrieving revision 1.161
retrieving revision 1.162
diff -u -r1.161 -r1.162
--- kdenetwork.spec	28 Jan 2009 15:49:02 -0000	1.161
+++ kdenetwork.spec	29 Jan 2009 11:15:07 -0000	1.162
@@ -25,7 +25,7 @@
 BuildRequires: kdepimlibs-devel >= %{version}
 BuildRequires: libgadu-devel >= 1.8.0
 BuildRequires: libidn-devel
-BuildRequires: libmsn-devel >= 4.0-0.4.beta2
+BuildRequires: libmsn-devel >= 4.0-0.10.beta4
 BuildRequires: libotr-devel
 BuildRequires: libvncserver-devel
 BuildRequires: libxslt-devel libxml2-devel



From tagoh at fedoraproject.org  Thu Jan 29 11:18:05 2009
From: tagoh at fedoraproject.org (Akira TAGOH)
Date: Thu, 29 Jan 2009 11:18:05 +0000 (UTC)
Subject: rpms/scim-anthy/F-9 scim-anthy.spec, 1.49,
	1.50 scim-anthy-1.2.4-gcc43.patch, 1.2, NONE
Message-ID: <20090129111805.EF60A70116@cvs1.fedora.phx.redhat.com>

Author: tagoh

Update of /cvs/pkgs/rpms/scim-anthy/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv319

Modified Files:
	scim-anthy.spec 
Removed Files:
	scim-anthy-1.2.4-gcc43.patch 
Log Message:
* Thu Jan 29 2009 Akira TAGOH <tagoh at redhat.com> - 1.2.7-1
- New upstream release.


Index: scim-anthy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/scim-anthy/F-9/scim-anthy.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- scim-anthy.spec	31 Jan 2008 07:37:49 -0000	1.49
+++ scim-anthy.spec	29 Jan 2009 11:17:35 -0000	1.50
@@ -1,14 +1,13 @@
 Name:           scim-anthy
-Version:        1.2.4
-Release:        4%{?dist}
+Version:        1.2.7
+Release:        1%{?dist}
 
 License:        GPLv2+
 URL:            http://scim-imengine.sourceforge.jp/
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  scim-devel
 BuildRequires:  anthy-devel >= 6700b-1 gettext-devel automake autoconf libtool
-Source0:        http://dl.sourceforge.jp/scim-imengine/25404/%{name}-%{version}.tar.gz
-Patch0:		scim-anthy-1.2.4-gcc43.patch
+Source0:        http://osdn.dl.sourceforge.jp/scim-imengine/37309/%{name}-%{version}.tar.gz
 
 Summary:        SCIM IMEngine for anthy for Japanese input
 Group:          System Environment/Libraries
@@ -25,7 +24,6 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .gcc43
 
 
 %build
@@ -57,6 +55,18 @@
 
 
 %changelog
+* Thu Jan 29 2009 Akira TAGOH <tagoh at redhat.com> - 1.2.7-1
+- New upstream release.
+
+* Fri Nov 21 2008 Akira TAGOH <tagoh at redhat.com> - 1.2.6-2
+- Fix a source URL.
+
+* Tue Oct  7 2008 Akira TAGOH <tagoh at redhat.com> - 1.2.6-1
+- New upstream release.
+
+* Tue Mar  4 2008 Akira TAGOH <tagoh at redhat.com> - 1.2.5-1
+- New upstream release.
+
 * Thu Jan 31 2008 Akira TAGOH <tagoh at redhat.com> - 1.2.4-4
 - scim-anthy-1.2.4-gcc43.patch: Fix a build fail with gcc-4.3.
 


--- scim-anthy-1.2.4-gcc43.patch DELETED ---



From tagoh at fedoraproject.org  Thu Jan 29 11:32:22 2009
From: tagoh at fedoraproject.org (Akira TAGOH)
Date: Thu, 29 Jan 2009 11:32:22 +0000 (UTC)
Subject: rpms/scim-anthy/F-9 .cvsignore,1.11,1.12 sources,1.11,1.12
Message-ID: <20090129113223.21A4870116@cvs1.fedora.phx.redhat.com>

Author: tagoh

Update of /cvs/pkgs/rpms/scim-anthy/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2577

Modified Files:
	.cvsignore sources 
Log Message:
added a tarball


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/scim-anthy/F-9/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	30 May 2007 11:11:02 -0000	1.11
+++ .cvsignore	29 Jan 2009 11:31:51 -0000	1.12
@@ -12,3 +12,4 @@
 scim-anthy-1.2.0.tar.gz
 scim-anthy-1.2.2.tar.gz
 scim-anthy-1.2.4.tar.gz
+scim-anthy-1.2.7.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/scim-anthy/F-9/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	30 May 2007 11:11:02 -0000	1.11
+++ sources	29 Jan 2009 11:31:51 -0000	1.12
@@ -1 +1 @@
-14c4d620bc5d6744a2fe6ef7d2bf2ecf  scim-anthy-1.2.4.tar.gz
+8d06bfd46839c771401b9f176be8818f  scim-anthy-1.2.7.tar.gz



From ltinkl at fedoraproject.org  Thu Jan 29 11:43:57 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Thu, 29 Jan 2009 11:43:57 +0000 (UTC)
Subject: rpms/kde-l10n/F-9 kde-l10n.spec, 1.41, 1.42 sources, 1.16,
	1.17 subdirs-kde-l10n, 1.9, 1.10
Message-ID: <20090129114357.A821B179D1E@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kde-l10n/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4635

Modified Files:
	kde-l10n.spec sources subdirs-kde-l10n 
Log Message:
KDE 4.2.0



Index: kde-l10n.spec
===================================================================
RCS file: /cvs/extras/rpms/kde-l10n/F-9/kde-l10n.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- kde-l10n.spec	9 Jan 2009 23:10:12 -0000	1.41
+++ kde-l10n.spec	29 Jan 2009 11:43:27 -0000	1.42
@@ -1,17 +1,17 @@
 %define buildall 0
 
 Name: kde-l10n
-Version: 4.1.4
-Release: 2%{dist}
+Version: 4.2.0
+Release: 1%{dist}
 Url: http://www.kde.org
 Summary: Internationalization support for KDE
 Group: User Interface/Desktops
 License: LGPLv2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
-#Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-ar-%{version}.tar.bz2
+Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-ar-%{version}.tar.bz2
 #Source1: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-be-%{version}.tar.bz2
-Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-bg-%{version}.tar.bz2
+Source2: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-bg-%{version}.tar.bz2
 Source3: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-ca-%{version}.tar.bz2
 Source4: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-cs-%{version}.tar.bz2
 Source5: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-csb-%{version}.tar.bz2
@@ -19,10 +19,10 @@
 Source7: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-de-%{version}.tar.bz2
 Source8: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-el-%{version}.tar.bz2
 Source9: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-en_GB-%{version}.tar.bz2
-Source10: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-eo-%{version}.tar.bz2
+#Source10: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-eo-%{version}.tar.bz2
 Source11: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-es-%{version}.tar.bz2
 Source12: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-et-%{version}.tar.bz2
-#Source13: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-eu-%{version}.tar.bz2
+Source13: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-eu-%{version}.tar.bz2
 Source14: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-fi-%{version}.tar.bz2
 Source15: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-fr-%{version}.tar.bz2
 Source16: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-ga-%{version}.tar.bz2
@@ -52,7 +52,7 @@
 #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
+#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
@@ -60,7 +60,7 @@
 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
+#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
@@ -758,7 +758,7 @@
 %setup -q -n %{name}-%{version} -c
 
 for i in $(cat %{SOURCE1000}) ; do
-  tar jxf %{_sourcedir}/%{name}-$i-%{version}.tar.bz2
+  bzip2 -dc %{_sourcedir}/%{name}-$i-%{version}.tar.bz2 | tar -xf -
 done
 
 %build
@@ -833,12 +833,10 @@
 %lang(af) %{_datadir}/locale/af/*
 %endif
 
-%if %{buildall}
 %files Arabic 
 %defattr(-,root,root)
 %lang(ar) %{_datadir}/locale/ar/*
 %lang(ar) %{_datadir}/kde4/apps/klettres/ar
-%endif
 
 %if %{buildall}
 %files Azerbaijani
@@ -888,6 +886,7 @@
 %lang(ca) %{_kde4_appsdir}/kvtml/ca
 %lang(ca) %{_kde4_appsdir}/kvtml/latinCatalan*
 %lang(ca) %{_kde4_docdir}/HTML/ca
+%lang(ca) %{_mandir}/ca/*/*
 
 %files Czech
 %defattr(-,root,root)
@@ -911,6 +910,7 @@
 %lang(da) %{_kde4_appsdir}/klettres/da
 %lang(da) %{_kde4_appsdir}/kvtml/da
 %lang(da) %{_kde4_docdir}/HTML/da
+%lang(da) %{_mandir}/da/*/*
 
 %files German
 %defattr(-,root,root)
@@ -919,7 +919,9 @@
 %lang(de) %{_kde4_appsdir}/ktuberling/sounds/de*
 %lang(de) %{_kde4_appsdir}/khangman/de.txt
 %lang(de) %{_kde4_appsdir}/kvtml/de
+%lang(de) %{_kde4_appsdir}/step/objinfo/l10n/de/
 %lang(de) %{_kde4_docdir}/HTML/de
+%lang(de) %{_mandir}/de/*/*
 
 %files Greek
 %defattr(-,root,root)
@@ -933,19 +935,22 @@
 %lang(en_GB) %{_kde4_appsdir}/kvtml/en_GB
 %lang(en_GB) %{_kde4_docdir}/HTML/en_GB
 
+%if %{buildall}
 %files Esperanto
 %defattr(-,root,root)
 %lang(eo) %{_datadir}/locale/eo/*
+%endif
 
 %files Spanish
 %defattr(-,root,root)
 %lang(es) %{_datadir}/locale/es/*
 %lang(es) %{_kde4_appsdir}/ktuberling/sounds/es*
-%lang(es) %{_kde4_appsdir}/khangman/data/es
+#%lang(es) %{_kde4_appsdir}/khangman/data/es
 %lang(es) %{_kde4_appsdir}/khangman/es.txt
 %lang(es) %{_kde4_appsdir}/klettres/es
 %lang(es) %{_kde4_appsdir}/kvtml/es
 %lang(es) %{_kde4_docdir}/HTML/es
+%lang(es) %{_mandir}/es/*/*
 
 %files Estonian
 %defattr(-,root,root)
@@ -953,12 +958,11 @@
 %lang(et) %{_kde4_appsdir}/khangman/et.txt
 %lang(et) %{_kde4_appsdir}/kvtml/et
 %lang(et) %{_kde4_docdir}/HTML/et
+%lang(et) %{_mandir}/et/*/*
 
-%if %{buildall}
 %files Basque
 %defattr(-,root,root)
 %lang(eu) %{_datadir}/locale/eu/*
-%endif
 
 %if %{buildall}
 %files Farsi
@@ -986,10 +990,13 @@
 %lang(fr) %{_kde4_appsdir}/khangman/fr.txt
 %lang(fr) %{_kde4_appsdir}/kvtml/fr
 %lang(fr) %{_kde4_docdir}/HTML/fr
+%lang(fr) %{_mandir}/fr/*/*
 
+%if %{buildall}
 %files Frisian
 %defattr(-,root,root)
 %lang(fy) %{_datadir}/locale/fy/*
+%endif
 
 %files Irish
 %defattr(-,root,root)
@@ -1001,9 +1008,10 @@
 %defattr(-,root,root)
 %lang(gl) %{_datadir}/locale/gl/*
 %lang(gl) %{_kde4_appsdir}/kvtml/gl
-%lang(gl) %{_kde4_appsdir}/ktuberling/sounds/gl.soundtheme         
+%lang(gl) %{_kde4_appsdir}/ktuberling/sounds/gl.soundtheme
 %lang(gl) %{_kde4_appsdir}/ktuberling/sounds/gl/
 %lang(gl) %{_kde4_docdir}/HTML/gl
+%lang(gl) %{_mandir}/gl/*/*
 
 %if %{buildall}
 %files Hebrew
@@ -1049,6 +1057,8 @@
 %lang(it) %{_kde4_appsdir}/klettres/it
 %lang(it) %{_kde4_appsdir}/kvtml/it
 %lang(it) %{_kde4_docdir}/HTML/it
+%lang(it) %{_kde4_appsdir}/step/objinfo/l10n/it/
+%lang(it) %{_mandir}/it/*/*
 
 %files Japanese
 %defattr(-,root,root)
@@ -1095,7 +1105,6 @@
 %lang(nds) %{_kde4_appsdir}/kvtml/nds
 %lang(nds) %{_kde4_appsdir}/ktuberling/sounds/nds*
 %lang(nds) %{_kde4_appsdir}/katepart/syntax/logohighlightstyle.nds.xml
-%lang(nds) %{_kde4_appsdir}/kturtle/data/logokeywords.sr*
 %lang(nds) %{_kde4_appsdir}/kturtle/examples/nds
 
 %files Latvian
@@ -1115,6 +1124,7 @@
 %files Malayalam
 %defattr(-,root,root)
 %lang(ml) %{_datadir}/locale/ml/*
+%lang(ml) %{_kde4_appsdir}/klettres/ml/
 
 %if %{buildall}
 %files Maltese
@@ -1135,6 +1145,7 @@
 %lang(nl) %{_kde4_appsdir}/klettres/nl
 %lang(nl) %{_kde4_appsdir}/kvtml/nl
 %lang(nl) %{_kde4_docdir}/HTML/nl
+%lang(nl) %{_mandir}/nl/*/*
 
 %if %{buildall}
 %files NorthernSami
@@ -1146,16 +1157,18 @@
 %defattr(-,root,root)
 %lang(nb) %{_datadir}/locale/nb/*
 %lang(nb) %{_kde4_appsdir}/khangman/nb.txt
-%lang(nb) %{_kde4_appsdir}/kvtml/nb
-%lang(nb) %{_kde4_docdir}/HTML/nb
+%lang(nb) %{_kde4_appsdir}/kvtml/nb/
+%lang(nb) %{_kde4_docdir}/HTML/nb/
 %lang(nb) %{_kde4_appsdir}/klettres/nb
+%lang(nb) %{_mandir}/nb/*/*
 
 %files Norwegian-Nynorsk
 %defattr(-,root,root)
 %lang(nn) %{_datadir}/locale/nn/*
 %lang(nn) %{_kde4_appsdir}/khangman/nn.txt
-%lang(nn) %{_kde4_appsdir}/kvtml/nn
+%lang(nn) %{_kde4_appsdir}/kvtml/nn/
 %lang(nn) %{_kde4_docdir}/HTML/nn
+%lang(nn) %{_mandir}/nn/*/*
 
 %if %{buildall}
 %files Occitan
@@ -1181,6 +1194,7 @@
 %lang(pt) %{_kde4_appsdir}/ktuberling/sounds/pt*
 %lang(pt) %{_kde4_appsdir}/kvtml/pt
 %lang(pt) %{_kde4_docdir}/HTML/pt
+%lang(pt) %{_mandir}/pt/*/*
 
 %files Brazil
 %defattr(-,root,root)
@@ -1189,6 +1203,7 @@
 %lang(pt_BR) %{_kde4_appsdir}/klettres/pt_BR/*
 %lang(pt_BR) %{_kde4_appsdir}/kvtml/pt_BR
 %lang(pt_BR) %{_kde4_docdir}/HTML/pt_BR
+%lang(pt_BR) %{_mandir}/pt_BR/*/*
 
 %if %{buildall}
 %files Romanian
@@ -1202,6 +1217,7 @@
 %lang(ru) %{_datadir}/locale/ru/*
 %lang(ru) %{_kde4_appsdir}/kvtml/ru
 %lang(ru) %{_kde4_docdir}/HTML/ru
+%lang(ru) %{_mandir}/ru/*/*
 
 %if %{buildall}
 %files Slovak
@@ -1230,12 +1246,7 @@
 %lang(sr) %{_kde4_iconsdir}/*/*/*/*/*/*/sr/*
 %lang(sr) %{_kde4_appsdir}/desktoptheme/*/widgets/l10n/sr
 %lang(sr) %{_kde4_appsdir}/desktoptheme/*/widgets/l10n/sr at latin
-%lang(sr) %{_kde4_appsdir}/katepart/syntax/logohighlightstyle.sr*
 %lang(sr) %{_kde4_appsdir}/khangman/sr at latin.txt
-%lang(sr) %{_kde4_appsdir}/ksplash/Themes/*/*/l10n/sr
-%lang(sr) %{_kde4_appsdir}/ksplash/Themes/*/*/l10n/sr at latin
-%lang(sr) %{_kde4_appsdir}/kturtle/examples/sr
-%lang(sr) %{_kde4_appsdir}/kturtle/examples/sr at latin
 %lang(sr) %{_kde4_appsdir}/kvtml/sr*
 %lang(sr) %{_datadir}/locale/sr at latin/*
 
@@ -1246,10 +1257,13 @@
 %lang(sv) %{_kde4_appsdir}/khangman/sv.txt
 %lang(sv) %{_kde4_appsdir}/kvtml/sv
 %lang(sv) %{_kde4_docdir}/HTML/sv
+%lang(sv) %{_mandir}/sv/*/*
 
+%if %{buildall}
 %files Tamil
 %defattr(-,root,root)
 %lang(ta) %{_datadir}/locale/ta/*
+%endif
 
 %if %{buildall}
 %files Tajik
@@ -1274,6 +1288,7 @@
 %lang(uk) %{_kde4_appsdir}/ktuberling/sounds/uk*
 %lang(uk) %{_kde4_appsdir}/kvtml/uk
 %lang(uk) %{_kde4_docdir}/HTML/uk
+%lang(uk) %{_mandir}/uk/*/*
 
 %if %{buildall}
 %files Venda
@@ -1302,6 +1317,8 @@
 %defattr(-,root,root)
 %lang(zh_CN) %{_datadir}/locale/zh_CN/*
 %lang(zh_CN) %{_kde4_appsdir}/kvtml/zh_CN
+%lang(zh_CN) %{_kde4_appsdir}/step/objinfo/l10n/zh_CN/
+%lang(zh_CN) %{_kde4_docdir}/HTML/zh_CN
 
 %files Chinese-Traditional
 %defattr(-,root,root)
@@ -1309,14 +1326,20 @@
 %lang(zh_TW) %{_kde4_docdir}/HTML/zh_TW
 
 %changelog
-* Sat Jan 10 2009 Than Ngo <than at redhat.com> - 4.1.4-2
-- fix file listfor gl/nb
+* Thu Jan 22 2009 Than Ngo <than at redhat.com> - 4.2.0-1
+- 4.2.0
+
+* Sat Jan 10 2009 Than Ngo <than at redhat.com> - 4.1.96-2
+- remove debug
+
+* Wed Jan 07 2009 Than Ngo <than at redhat.com> - 4.1.96-1
+- 4.2rc1
 
-* Fri Jan 09 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.4-1
-- 4.1.4
+* Fri Dec 12 2008 Than Ngo <than at redhat.com> - 4.1.85-1
+- 4.2beta2
 
-* Wed Nov 12 2008 Than Ngo <than at redhat.com> 4.1.3-1
-- 4.1.3
+* Fri Nov 21 2008 Than Ngo <than at redhat.com> 4.1.80-1
+- 4.2 beta1
 
 * Fri Sep 26 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-1
 - 4.1.2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kde-l10n/F-9/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources	9 Jan 2009 18:57:14 -0000	1.16
+++ sources	29 Jan 2009 11:43:27 -0000	1.17
@@ -1,47 +1,46 @@
-5f5b1effdd9b8f0a6c1a4ab59b739f0e  kde-l10n-bg-4.1.4.tar.bz2
-ebf90b925b2bf1a0b6246e800a3eaf09  kde-l10n-ca-4.1.4.tar.bz2
-12cd58d5728958829d65881fcdb3958f  kde-l10n-cs-4.1.4.tar.bz2
-b3371c5468c27021ee8dc19113ad4be7  kde-l10n-csb-4.1.4.tar.bz2
-b6c145d943292f2ba11753aa044f66f5  kde-l10n-da-4.1.4.tar.bz2
-bf5db9e7c2708e4ecd01345137009cab  kde-l10n-de-4.1.4.tar.bz2
-4b80c39785839da001190a38c8e7266b  kde-l10n-el-4.1.4.tar.bz2
-42f851c5f7e4432894483bf85ecb9076  kde-l10n-en_GB-4.1.4.tar.bz2
-88875e433f2440757b03df87eab9de07  kde-l10n-eo-4.1.4.tar.bz2
-0d2fed450def3f19704f34e8c9927054  kde-l10n-es-4.1.4.tar.bz2
-c1516ef8c2d60e03ca10bb5f9ef731ee  kde-l10n-et-4.1.4.tar.bz2
-eac2a616f172f714abe8f8a9c4403f19  kde-l10n-fi-4.1.4.tar.bz2
-dd6b5b97e47b28ca8c8d72c432a12056  kde-l10n-fr-4.1.4.tar.bz2
-1ca52ac5269d104ae970a06b683a6924  kde-l10n-fy-4.1.4.tar.bz2
-e35d048d6977d62b9f1598ecd6410ae9  kde-l10n-ga-4.1.4.tar.bz2
-7e75474eb5f39f122ae08f4f1abeeeb2  kde-l10n-gl-4.1.4.tar.bz2
-be6dc85d35ccd4431f3ffadef802f1dc  kde-l10n-hi-4.1.4.tar.bz2
-ea3cf065ea2a17e4daf3847194c2bd5f  kde-l10n-hu-4.1.4.tar.bz2
-f57747f19419714cfd72cbbbba3c465a  kde-l10n-it-4.1.4.tar.bz2
-19157c9ca23253d1dc5f872f71d88c9e  kde-l10n-ja-4.1.4.tar.bz2
-9c6ae2d6e70b95d6287a46b1d53502e6  kde-l10n-kk-4.1.4.tar.bz2
-4df0089cebfea89a9f4a3287df90f0a7  kde-l10n-km-4.1.4.tar.bz2
-d1c3c4d106672a83f2fa73b5b49312d9  kde-l10n-ko-4.1.4.tar.bz2
-2dea53e4a1b43644549a8a53b427c167  kde-l10n-ku-4.1.4.tar.bz2
-87b9c0b435bd37a073549427300c713b  kde-l10n-lt-4.1.4.tar.bz2
-e05d96e5fad79570422b33029a6cb65c  kde-l10n-lv-4.1.4.tar.bz2
-aef1f6063ba8701a352132aed655ab05  kde-l10n-mk-4.1.4.tar.bz2
-2491e682dc830fdb0b6738e9ff6e04d0  kde-l10n-ml-4.1.4.tar.bz2
-e21c6f67d95240a1a26512894c18efdf  kde-l10n-nb-4.1.4.tar.bz2
-12b299ec3b9ec3715b78e3afc17f0fb0  kde-l10n-nds-4.1.4.tar.bz2
-50b0dabddf55d79ae55e4313b3dfb0cc  kde-l10n-nl-4.1.4.tar.bz2
-b55ec0958d079004ca0d6d89af1cc0af  kde-l10n-nn-4.1.4.tar.bz2
-c40c3a9d61439b62c0dad8e5f994623b  kde-l10n-pa-4.1.4.tar.bz2
-dbf06430f02b44933fd78f16f445e54f  kde-l10n-pl-4.1.4.tar.bz2
-cf666b9d9e4f5e6089d3dfc04e5291ff  kde-l10n-pt-4.1.4.tar.bz2
-6f08bd872f25ff812b1f449e012b2691  kde-l10n-pt_BR-4.1.4.tar.bz2
-bf8b2f974108d722962e832e26fc00ec  kde-l10n-ru-4.1.4.tar.bz2
-c4a74ef14b66d2cc44518e4dbccf7884  kde-l10n-sl-4.1.4.tar.bz2
-a60f826a7fcb82e23851fabf03f52fa7  kde-l10n-sr-4.1.4.tar.bz2
-35e967ea1a7b93629a7591e7a2736da0  kde-l10n-sv-4.1.4.tar.bz2
-6b1ffdaed790ed733bfc3aac8808cbad  kde-l10n-ta-4.1.4.tar.bz2
-24ffa0fca844ff1756ca7469bd845d98  kde-l10n-th-4.1.4.tar.bz2
-d06edd7000b97585335bcefb4e62ad3a  kde-l10n-tr-4.1.4.tar.bz2
-e0a1b781e02d56caef169fd51ddb7a63  kde-l10n-uk-4.1.4.tar.bz2
-6b01aafb428179c9f4153a958b0d0044  kde-l10n-wa-4.1.4.tar.bz2
-cfe9af2f9f3df568623b0c35cc307403  kde-l10n-zh_CN-4.1.4.tar.bz2
-02f9104908ad1e3e28f78716b0a562cc  kde-l10n-zh_TW-4.1.4.tar.bz2
+fc201d9b7d85b84ed02d049309d50ec7  kde-l10n-bg-4.2.0.tar.bz2
+62b468adf048dde92abcea1cc8378ee0  kde-l10n-ca-4.2.0.tar.bz2
+3fbbda2cb209e8c773c075ed3d28f831  kde-l10n-cs-4.2.0.tar.bz2
+c9e576d85e7c8644a7f363a7dc446a47  kde-l10n-csb-4.2.0.tar.bz2
+9f6a01336b631223e13df6f82f6247ad  kde-l10n-da-4.2.0.tar.bz2
+da8184a7380795790d498c7d5e4a6b62  kde-l10n-de-4.2.0.tar.bz2
+2bbfca0b7a1366aee558804105b176cb  kde-l10n-el-4.2.0.tar.bz2
+12814406b6d35d8098a6cd16f49f827e  kde-l10n-en_GB-4.2.0.tar.bz2
+e3b9bc8ef5573f7574e296385eb130a9  kde-l10n-es-4.2.0.tar.bz2
+dc5bda4589b9a2042ade700caf8de083  kde-l10n-fi-4.2.0.tar.bz2
+ca231f7972a5269a589cad934cd4ab81  kde-l10n-fr-4.2.0.tar.bz2
+d18b399ca99aa54c936bcdb207baac0a  kde-l10n-ga-4.2.0.tar.bz2
+104815bc1b20b100509f66132df52cad  kde-l10n-gl-4.2.0.tar.bz2
+b828a209e2b370e4b3487be01dc0ea8e  kde-l10n-hi-4.2.0.tar.bz2
+b000573be5a3b6cee9ee9aa45b0931bc  kde-l10n-hu-4.2.0.tar.bz2
+42387c0b473767173ebf65622edb4278  kde-l10n-it-4.2.0.tar.bz2
+84c1dc6f18dd405b217d98312ffec6bf  kde-l10n-ja-4.2.0.tar.bz2
+a984ed36132141eb8473ab541187d296  kde-l10n-kk-4.2.0.tar.bz2
+a8aaca814f556e3e8b3cd99f04eddca6  kde-l10n-km-4.2.0.tar.bz2
+bbd68e1c9eee724c7db051657fdfb50c  kde-l10n-ko-4.2.0.tar.bz2
+3ce287f12f044c14608692518018bbef  kde-l10n-ku-4.2.0.tar.bz2
+5ffad305fb06d70f7991745b82a427e3  kde-l10n-lt-4.2.0.tar.bz2
+9d8fe83cefb273eb065337a0ab8790a5  kde-l10n-lv-4.2.0.tar.bz2
+933d60b4c535d9d6d9729bd986906e64  kde-l10n-mk-4.2.0.tar.bz2
+462763d9a71c273b7ae6f3ebd2c798e1  kde-l10n-ml-4.2.0.tar.bz2
+db0d87c5125b05c25788cbf10fd56490  kde-l10n-nb-4.2.0.tar.bz2
+378e068c4c86670788019ae7d0dda136  kde-l10n-nds-4.2.0.tar.bz2
+f9174173973b0e235a3d729b0ef2f1cf  kde-l10n-nl-4.2.0.tar.bz2
+cff7964f1c88a52d7e64df19e53c88ea  kde-l10n-nn-4.2.0.tar.bz2
+a8dded180d298489861d17a761df51f8  kde-l10n-pa-4.2.0.tar.bz2
+b04d741a53b0e1ba58d315cf118985e4  kde-l10n-pl-4.2.0.tar.bz2
+eabe2a528d1e9d5c10ecae15dea68d26  kde-l10n-pt-4.2.0.tar.bz2
+d932254d7168016819aacc45a759592e  kde-l10n-pt_BR-4.2.0.tar.bz2
+9038ce82cdddf3fcf028aff50a55932a  kde-l10n-ru-4.2.0.tar.bz2
+b24648e4fe6552ed7253acee7306f03e  kde-l10n-sl-4.2.0.tar.bz2
+8d58ae783752ba8129df1e3866e8a089  kde-l10n-sr-4.2.0.tar.bz2
+efbdb69f70e723c1ce0783e2a0693aaf  kde-l10n-sv-4.2.0.tar.bz2
+010ba3a0ed85c99cd215623f6d78fcd5  kde-l10n-th-4.2.0.tar.bz2
+850a88f8d82d9d9ab4c5ef2406eba39e  kde-l10n-tr-4.2.0.tar.bz2
+7dba32b49fe5d263103a617a49a1849e  kde-l10n-uk-4.2.0.tar.bz2
+0db1e8dc944786811cc1364df0ee4cf2  kde-l10n-wa-4.2.0.tar.bz2
+c4730babc7bef39cea255c9528607fdc  kde-l10n-zh_CN-4.2.0.tar.bz2
+08af73c8b0f82689f5ab046f0700bf9d  kde-l10n-zh_TW-4.2.0.tar.bz2
+058b0bd3a7b2ca4ef56730488a234afa  kde-l10n-ar-4.2.0.tar.bz2
+5248515b294143a7821055754b9236e4  kde-l10n-eu-4.2.0.tar.bz2
+fb2e1d63d9d926c6639a537b6bf73d03  kde-l10n-et-4.2.0.tar.bz2


Index: subdirs-kde-l10n
===================================================================
RCS file: /cvs/extras/rpms/kde-l10n/F-9/subdirs-kde-l10n,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- subdirs-kde-l10n	10 Nov 2008 13:31:56 -0000	1.9
+++ subdirs-kde-l10n	29 Jan 2009 11:43:27 -0000	1.10
@@ -1,17 +1,17 @@
+ar
 bg
 ca
-csb
 cs
+csb
 da
 de
 el
 en_GB
-eo
 es
 et
+eu
 fi
 fr
-fy
 ga
 gl
 hi
@@ -32,13 +32,12 @@
 nn
 pa
 pl
-pt_BR
 pt
+pt_BR
 ru
 sl
 sr
 sv
-ta
 th
 tr
 uk



From transif at fedoraproject.org  Thu Jan 29 11:45:04 2009
From: transif at fedoraproject.org (Transifex System User)
Date: Thu, 29 Jan 2009 11:45:04 +0000 (UTC)
Subject: comps/po es.po,1.25,1.26
Message-ID: <20090129114504.ECDDE179D1E@cvs1.fedora.phx.redhat.com>

Author: transif

Update of /cvs/pkgs/comps/po
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5001/po

Modified Files:
	es.po 
Log Message:
    2009-01-29  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.25 -r 1.26 es.po
Index: es.po
===================================================================
RCS file: /cvs/pkgs/comps/po/es.po,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- es.po	9 Jan 2009 11:52:36 -0000	1.25
+++ es.po	29 Jan 2009 11:44:34 -0000	1.26
@@ -9,8 +9,8 @@
 msgstr ""
 "Project-Id-Version: comps.HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-22 15:50-0500\n"
-"PO-Revision-Date: 2008-12-11 12:45-0300\n"
+"POT-Creation-Date: 2009-01-29 01:34+0000\n"
+"PO-Revision-Date: 2009-01-29 09:41-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,199 +20,320 @@
 "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-f10.xml.in.h:1 ../comps-f11.xml.in.h:1
+#: ../comps-f7.xml.in.h:1
+#: ../comps-f8.xml.in.h:1
+#: ../comps-f9.xml.in.h:1
+#: ../comps-f10.xml.in.h:1
+#: ../comps-f11.xml.in.h:1
 msgid "A lightweight desktop environment that works well on low end machines."
-msgstr ""
-"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-f11.xml.in.h:2 ../comps-el4.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-f11.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-f10.xml.in.h:3 ../comps-f11.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
+#: ../comps-f11.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-f10.xml.in.h:4 ../comps-f11.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
+#: ../comps-f11.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-f11.xml.in.h:6 ../comps-el4.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-f11.xml.in.h:6
+#: ../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-f10.xml.in.h:6 ../comps-f11.xml.in.h: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
+#: ../comps-f11.xml.in.h:7
 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-f11.xml.in.h:8 ../comps-el4.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-f11.xml.in.h:8
+#: ../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-f11.xml.in.h:9 ../comps-el4.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-f11.xml.in.h:9
+#: ../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-f10.xml.in.h:9 ../comps-f11.xml.in.h:10
+#: ../comps-f7.xml.in.h:9
+#: ../comps-f8.xml.in.h:9
+#: ../comps-f9.xml.in.h:9
+#: ../comps-f10.xml.in.h:9
+#: ../comps-f11.xml.in.h:10
 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-f11.xml.in.h:11 ../comps-el4.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-f11.xml.in.h:11
+#: ../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-f10.xml.in.h:11 ../comps-f11.xml.in.h:12
+#: ../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-f11.xml.in.h:12
 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-f11.xml.in.h:13 ../comps-el4.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-f11.xml.in.h:13
+#: ../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-f10.xml.in.h:13 ../comps-f11.xml.in.h:14
+#: ../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-f11.xml.in.h:14
 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-f10.xml.in.h:14 ../comps-f11.xml.in.h:15
+#: ../comps-f7.xml.in.h:14
+#: ../comps-f8.xml.in.h:14
+#: ../comps-f9.xml.in.h:14
+#: ../comps-f10.xml.in.h:14
+#: ../comps-f11.xml.in.h:15
 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-f10.xml.in.h:15 ../comps-f11.xml.in.h:16
+#: ../comps-f7.xml.in.h:15
+#: ../comps-f8.xml.in.h:15
+#: ../comps-f9.xml.in.h:15
+#: ../comps-f10.xml.in.h:15
+#: ../comps-f11.xml.in.h:16
 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-f10.xml.in.h:16 ../comps-f11.xml.in.h:17
+#: ../comps-f7.xml.in.h:16
+#: ../comps-f8.xml.in.h:16
+#: ../comps-f9.xml.in.h:16
+#: ../comps-f10.xml.in.h:16
+#: ../comps-f11.xml.in.h:17
 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-f10.xml.in.h:17 ../comps-f11.xml.in.h:18
+#: ../comps-f7.xml.in.h:17
[...2329 lines suppressed...]
+msgstr "Soporte para el desarrollo de programas en el lenguaje de programaci??n Haskell."
 
-#: ../comps-f10.xml.in.h:165 ../comps-f11.xml.in.h:172
+#: ../comps-f10.xml.in.h:165
+#: ../comps-f11.xml.in.h:172
 msgid "Tajik Support"
 msgstr "Soporte para Tajik"
 
-#: ../comps-f10.xml.in.h:207 ../comps-f11.xml.in.h:217
+#: ../comps-f10.xml.in.h:207
+#: ../comps-f11.xml.in.h:217
 msgid "Uzbek Support"
 msgstr "Soporte para Uszbek"
 
 #: ../comps-f11.xml.in.h:5
-#, fuzzy
 msgid "Amazigh Support"
-msgstr "Soporte para ??rabe"
+msgstr "Soporte para amazigh"
 
 #: ../comps-f11.xml.in.h:54
 msgid "Font design and packaging"
 msgstr "Dise??o y empaquetamiento de Fuentes"
 
 #: ../comps-f11.xml.in.h:58
-#, fuzzy
 msgid "Frisian Support"
-msgstr "Soporte para persa"
+msgstr "Soporte para frisio"
 
 #: ../comps-f11.xml.in.h:59
-#, fuzzy
 msgid "Friulian Support"
-msgstr "Soporte para filipino"
+msgstr "Soporte para friulio"
 
 #: ../comps-f11.xml.in.h:101
-#, fuzzy
 msgid "Kinyarwanda Support"
-msgstr "Soporte para japon??s (kannada)"
+msgstr "Soporte para kinyarwanda"
 
 #: ../comps-f11.xml.in.h:118
-#, fuzzy
 msgid "Malagasy Support"
-msgstr "Soporte para malayo"
+msgstr "Soporte para malagasio"
 
 #: ../comps-f11.xml.in.h:132
-#, fuzzy
 msgid "Occitan Support"
-msgstr "Soporte para tibet??no"
+msgstr "Soporte para occitanio"
 
 #: ../comps-f11.xml.in.h:201
-msgid ""
-"This group is a collection of tools used in the design, modification, "
-"manipulation, and packaging of fonts."
-msgstr ""
-"Este grupo es un conjunto de herramientas que se usan en el dise??o, "
-"modificaci??n, manipulaci??n y empaquetado de fuentes (tipos de letras)."
+msgid "This group is a collection of tools used in the design, modification, manipulation, and packaging of fonts."
+msgstr "Este grupo es un conjunto de herramientas que se usan en el dise??o, modificaci??n, manipulaci??n y empaquetado de fuentes (tipos de letras)."
 
 #: ../comps-f11.xml.in.h:213
-#, fuzzy
 msgid "Turkmen Support"
-msgstr "Soporte para turco"
+msgstr "Soporte para turkmenio"
 
 #: ../comps-f11.xml.in.h:215
-#, fuzzy
 msgid "Upper Sorbian Support"
-msgstr "Soporte para serbio"
+msgstr "Soporte para serbio arribe??o"
 
-#: ../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 ovasik at fedoraproject.org  Thu Jan 29 11:46:29 2009
From: ovasik at fedoraproject.org (Ondrej Vasik)
Date: Thu, 29 Jan 2009 11:46:29 +0000 (UTC)
Subject: rpms/setup/devel setup-2.7.7-uidgid.patch, NONE, 1.1 setup.spec,
	1.68, 1.69
Message-ID: <20090129114629.6AE5E70116@cvs1.fedora.phx.redhat.com>

Author: ovasik

Update of /cvs/extras/rpms/setup/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5992

Modified Files:
	setup.spec 
Added Files:
	setup-2.7.7-uidgid.patch 
Log Message:
reserve gid 87 for polkituser (just uid was reserved), reserve 18 gid for dialout (to prevent conflicts with polkituser gid)

setup-2.7.7-uidgid.patch:

--- NEW FILE setup-2.7.7-uidgid.patch ---
diff -urNp setup-2.7.7-orig/uidgid setup-2.7.7/uidgid
--- setup-2.7.7-orig/uidgid	2009-01-22 14:00:18.000000000 +0100
+++ setup-2.7.7/uidgid	2009-01-29 12:40:37.000000000 +0100
@@ -23,6 +23,7 @@ gopher	13	30	/usr/lib/gopher-data		/sbin
 ftp	14	50	/var/ftp		/sbin/nologin	setup
 man	-	15	-		-	setup
 pkiuser	17	17	/usr/share/pki		/sbin/nologin	pki-ca,rhpki-ca
+dialout	-	18	-		-	udev,MAKEDEV
 floppy	-	19	-		-	dev,MAKEDEV
 games	-	20	-		-	setup
 slocate	-	21	-		-	slocate
@@ -92,8 +93,7 @@ clamav	83	83	/tmp		/sbin/nologin	clamav
 screen	-	84	-		-	screen
 quaggavt	-	85	-		-	quagga
 sabayon	86	86	-		/sbin/nologin	sabayon
-polkituser	87	-	/		/sbin/nologin	PolicyKit
-dialout	-	87	-		-	udev,MAKEDEV
+polkituser	87	87	/		/sbin/nologin	PolicyKit
 wbpriv	-	88	-		-	samba-common
 postfix	89	89	/var/spool/postfix		/bin/true	postfix
 postdrop	-	90	-		-	postfix


Index: setup.spec
===================================================================
RCS file: /cvs/extras/rpms/setup/devel/setup.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- setup.spec	22 Jan 2009 13:15:23 -0000	1.68
+++ setup.spec	29 Jan 2009 11:45:59 -0000	1.69
@@ -1,11 +1,12 @@
 Summary: A set of system configuration and setup files
 Name: setup
 Version: 2.7.7
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: Public Domain
 Group: System Environment/Base
 URL: https://fedorahosted.org/setup/
 Source: setup-%{version}.tar.bz2
+Patch1: setup-2.7.7-uidgid.patch
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 BuildRequires: bash tcsh perl
@@ -18,6 +19,7 @@
 
 %prep
 %setup -q
+%patch1 -p1
 
 %build
 
@@ -87,6 +89,11 @@
 %ghost %verify(not md5 size mtime) %config(noreplace,missingok) /etc/mtab
 
 %changelog
+* Thu Jan 29 2009 Ondrej Vasik <ovasik at redhat.com> 2.7.7-2
+- reserve 87 gid for polkituser (just uid was reserved),
+  reserve 18 gid for dialout(to prevent conflicts with
+  polkituser gid)
+
 * Thu Jan 22 2009 Ondrej Vasik <ovasik at redhat.com> 2.7.7-1
 - synchronize /etc/services with latest IANA, do not use
   tabs in that file to have consistent output



From tagoh at fedoraproject.org  Thu Jan 29 11:47:44 2009
From: tagoh at fedoraproject.org (Akira TAGOH)
Date: Thu, 29 Jan 2009 11:47:44 +0000 (UTC)
Subject: rpms/kasumi/devel .cvsignore, 1.9, 1.10 kasumi.spec, 1.29,
	1.30 sources, 1.8, 1.9 kasumi-2.3-gcc43.patch, 1.1, NONE
Message-ID: <20090129114744.EAE7C70116@cvs1.fedora.phx.redhat.com>

Author: tagoh

Update of /cvs/pkgs/rpms/kasumi/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6346

Modified Files:
	.cvsignore kasumi.spec sources 
Removed Files:
	kasumi-2.3-gcc43.patch 
Log Message:
* Thu Jan 29 2009 Akira TAGOH <tagoh at redhat.com> - 2.4-1
- New upstream release.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kasumi/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	31 Oct 2007 08:22:38 -0000	1.9
+++ .cvsignore	29 Jan 2009 11:47:14 -0000	1.10
@@ -9,3 +9,4 @@
 kasumi-2.0.1.tar.gz
 kasumi-2.2.tar.gz
 kasumi-2.3.tar.gz
+kasumi-2.4.tar.gz


Index: kasumi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kasumi/devel/kasumi.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- kasumi.spec	8 Apr 2008 02:33:13 -0000	1.29
+++ kasumi.spec	29 Jan 2009 11:47:14 -0000	1.30
@@ -1,13 +1,12 @@
 Name:    kasumi
-Version: 2.3
-Release: 4%{?dist}
+Version: 2.4
+Release: 1%{?dist}
 
 License: GPLv2+
 URL:     http://kasumi.sourceforge.jp/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: desktop-file-utils, gtk2-devel gettext-devel anthy-devel automake autoconf
 Source0: %{name}-%{version}.tar.gz
-Patch0:  kasumi-2.3-gcc43.patch
 
 
 Summary: An anthy dictionary management tool.
@@ -18,7 +17,6 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .gcc43
 
 %build
 %configure
@@ -49,6 +47,9 @@
 
 
 %changelog
+* Thu Jan 29 2009 Akira TAGOH <tagoh at redhat.com> - 2.4-1
+- New upstream release.
+
 * Tue Apr  8 2008 Akira TAGOH <tagoh at redhat.com> - 2.3-4
 - Remove .desktop file since it's accessible from scim-panel and it's not
   necessarily used for every users, particularly on Live. (#439173)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kasumi/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	31 Oct 2007 08:22:38 -0000	1.8
+++ sources	29 Jan 2009 11:47:14 -0000	1.9
@@ -1 +1 @@
-bebc984bbcae8407d85161582e8b02a0  kasumi-2.3.tar.gz
+683f43fbf8ba3c92964a538c0d21afc7  kasumi-2.4.tar.gz


--- kasumi-2.3-gcc43.patch DELETED ---



From harald at fedoraproject.org  Thu Jan 29 11:50:10 2009
From: harald at fedoraproject.org (Harald Hoyer)
Date: Thu, 29 Jan 2009 11:50:10 +0000 (UTC)
Subject: rpms/udev/devel udev-137-vol_id1.patch, NONE,
	1.1 udev-137-vol_id2.patch, NONE, 1.1 udev-137.tar.bz2.sign,
	NONE, 1.1 .cvsignore, 1.56, 1.57 sources, 1.56, 1.57 udev.spec,
	1.260, 1.261 upstream, 1.9, 1.10 udev-135.tar.bz2.sign, 1.1, NONE
Message-ID: <20090129115010.4BBF370116@cvs1.fedora.phx.redhat.com>

Author: harald

Update of /cvs/pkgs/rpms/udev/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6954

Modified Files:
	.cvsignore sources udev.spec upstream 
Added Files:
	udev-137-vol_id1.patch udev-137-vol_id2.patch 
	udev-137.tar.bz2.sign 
Removed Files:
	udev-135.tar.bz2.sign 
Log Message:
* Thu Jan 29 2009 Harald Hoyer <harald at redhat.com> 137-1
- version 137
- add vol_id patches from kzak
- dialout group has gid 18 now


udev-137-vol_id1.patch:

--- NEW FILE udev-137-vol_id1.patch ---
commit 7e5861ff70994fdc2e383e227ff24225ac5f7ce5
Author: Karel Zak <kzak at redhat.com>
Date:   Sat Jan 24 00:37:23 2009 +0100

    vol_id: add missing id->type to swap0
    
    Signed-off-by: Karel Zak <kzak at redhat.com>

diff --git a/extras/volume_id/lib/linux_swap.c b/extras/volume_id/lib/linux_swap.c
index 1698e9d..53649bd 100644
--- a/extras/volume_id/lib/linux_swap.c
+++ b/extras/volume_id/lib/linux_swap.c
@@ -57,6 +57,7 @@ int volume_id_probe_linux_swap(struct volume_id *id, uint64_t off, uint64_t size
 				return -1;
 
 			if (memcmp(buf, "SWAP-SPACE", 10) == 0) {
+				id->type = "swap";
 				strcpy(id->type_version, "1");
 				goto found;
 			}

udev-137-vol_id2.patch:

--- NEW FILE udev-137-vol_id2.patch ---
commit 3e2084614b4d8308d5c0ceb34ec3634eb3353c00
Author: Karel Zak <kzak at redhat.com>
Date:   Sat Jan 24 00:37:22 2009 +0100

    vol_id: fix ddf version string
    
    The version string in DDF suberblock does not include the null terminator
    and the snprintf() function writes at most "size" bytes *including* the
    null byte.
    
    old version:
    	ID_FS_VERSION=02.00.0
    new version:
    	ID_FS_VERSION=02.00.00
    
    Signed-off-by: Karel Zak <kzak at redhat.com>

diff --git a/extras/volume_id/lib/ddf_raid.c b/extras/volume_id/lib/ddf_raid.c
index 58bdae9..32f20ce 100644
--- a/extras/volume_id/lib/ddf_raid.c
+++ b/extras/volume_id/lib/ddf_raid.c
@@ -87,7 +87,7 @@ int volume_id_probe_ddf_raid(struct volume_id *id, uint64_t off, uint64_t size)
 	return -1;
 found:
 	volume_id_set_uuid(id, ddf->guid, DDF_GUID_LENGTH, UUID_STRING);
-	snprintf(id->type_version, DDF_REV_LENGTH, "%s", ddf->ddf_rev);
+	snprintf(id->type_version, DDF_REV_LENGTH + 1, "%s", ddf->ddf_rev);
 	volume_id_set_usage(id, VOLUME_ID_RAID);
 	id->type = "ddf_raid_member";
 	return 0;


--- NEW FILE udev-137.tar.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBJeTdlyGugalF9Dw4RAolBAJ9sKq3V9mpanhvpOMkYXky7DwF7sACgg0N4
SsPqKyBV4nkSMxxLQwxJEdw=
=PEri
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/udev/devel/.cvsignore,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- .cvsignore	20 Jan 2009 11:58:53 -0000	1.56
+++ .cvsignore	29 Jan 2009 11:49:39 -0000	1.57
@@ -1 +1 @@
-udev-136.tar.bz2
+udev-137.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/udev/devel/sources,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- sources	20 Jan 2009 11:58:53 -0000	1.56
+++ sources	29 Jan 2009 11:49:39 -0000	1.57
@@ -1 +1 @@
-9a27ccd96cf8d529c4e424520547b72a  udev-136.tar.bz2
+9d5960024da9c80b54c8273ee05b31e1  udev-137.tar.bz2


Index: udev.spec
===================================================================
RCS file: /cvs/pkgs/rpms/udev/devel/udev.spec,v
retrieving revision 1.260
retrieving revision 1.261
diff -u -r1.260 -r1.261
--- udev.spec	20 Jan 2009 12:17:14 -0000	1.260
+++ udev.spec	29 Jan 2009 11:49:39 -0000	1.261
@@ -5,8 +5,8 @@
 
 Summary: A userspace implementation of devfs
 Name: udev
-Version: 136
-Release: 2%{?dist}
+Version: 137
+Release: 1%{?dist}
 License: GPLv2
 Group: System Environment/Base
 Provides: udev-persistent = %{version}-%{release}
@@ -18,10 +18,8 @@
 Source4: fw_unit_symlinks.sh
 Source5: udev.sysconfig
 
-Patch1: udev-136-tape.patch
-Patch2: udev-136-cdrom.patch
-Patch3: udev-136-video.patch
-
+Patch1: udev-137-vol_id1.patch
+Patch2: udev-137-vol_id2.patch
 Patch102: udev-118-sysconf.patch
 
 ExclusiveOS: Linux
@@ -94,10 +92,9 @@
 
 %prep
 %setup -q  
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
 
+%patch1 -p1 
+%patch2 -p1
 %patch102 -p1 -b .sysconf
 rm rules/redhat/95-pam-console.rules
 
@@ -242,7 +239,7 @@
 # to be kept
 getent group cdrom >/dev/null || /usr/sbin/groupadd -g 11 cdrom || :
 getent group tape >/dev/null || /usr/sbin/groupadd -g 33 tape || :
-getent group dialout >/dev/null || /usr/sbin/groupadd -g 87 dialout || :
+getent group dialout >/dev/null || /usr/sbin/groupadd -g 18 dialout || :
 
 exit 0
 
@@ -386,6 +383,11 @@
 
 
 %changelog
+* Thu Jan 29 2009 Harald Hoyer <harald at redhat.com> 137-1
+- version 137
+- add vol_id patches from kzak
+- dialout group has gid 18 now
+
 * Tue Jan 20 2009 Harald Hoyer <harald at redhat.com> 136-2
 - added some rule fixes, which will be in udev-137
 


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/udev/devel/upstream,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- upstream	2 Dec 2008 10:22:49 -0000	1.9
+++ upstream	29 Jan 2009 11:49:39 -0000	1.10
@@ -1 +1 @@
-udev-135.tar.bz2
+udev-137.tar.bz2


--- udev-135.tar.bz2.sign DELETED ---



From tagoh at fedoraproject.org  Thu Jan 29 11:51:30 2009
From: tagoh at fedoraproject.org (Akira TAGOH)
Date: Thu, 29 Jan 2009 11:51:30 +0000 (UTC)
Subject: rpms/kasumi/F-10 .cvsignore, 1.9, 1.10 kasumi.spec, 1.29,
	1.30 sources, 1.8, 1.9 kasumi-2.3-gcc43.patch, 1.1, NONE
Message-ID: <20090129115130.DCDF470116@cvs1.fedora.phx.redhat.com>

Author: tagoh

Update of /cvs/pkgs/rpms/kasumi/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7426

Modified Files:
	.cvsignore kasumi.spec sources 
Removed Files:
	kasumi-2.3-gcc43.patch 
Log Message:
* Thu Jan 29 2009 Akira TAGOH <tagoh at redhat.com> - 2.4-1
- New upstream release.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kasumi/F-10/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	31 Oct 2007 08:22:38 -0000	1.9
+++ .cvsignore	29 Jan 2009 11:51:00 -0000	1.10
@@ -9,3 +9,4 @@
 kasumi-2.0.1.tar.gz
 kasumi-2.2.tar.gz
 kasumi-2.3.tar.gz
+kasumi-2.4.tar.gz


Index: kasumi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kasumi/F-10/kasumi.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- kasumi.spec	8 Apr 2008 02:33:13 -0000	1.29
+++ kasumi.spec	29 Jan 2009 11:51:00 -0000	1.30
@@ -1,13 +1,12 @@
 Name:    kasumi
-Version: 2.3
-Release: 4%{?dist}
+Version: 2.4
+Release: 1%{?dist}
 
 License: GPLv2+
 URL:     http://kasumi.sourceforge.jp/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: desktop-file-utils, gtk2-devel gettext-devel anthy-devel automake autoconf
 Source0: %{name}-%{version}.tar.gz
-Patch0:  kasumi-2.3-gcc43.patch
 
 
 Summary: An anthy dictionary management tool.
@@ -18,7 +17,6 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .gcc43
 
 %build
 %configure
@@ -49,6 +47,9 @@
 
 
 %changelog
+* Thu Jan 29 2009 Akira TAGOH <tagoh at redhat.com> - 2.4-1
+- New upstream release.
+
 * Tue Apr  8 2008 Akira TAGOH <tagoh at redhat.com> - 2.3-4
 - Remove .desktop file since it's accessible from scim-panel and it's not
   necessarily used for every users, particularly on Live. (#439173)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kasumi/F-10/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	31 Oct 2007 08:22:38 -0000	1.8
+++ sources	29 Jan 2009 11:51:00 -0000	1.9
@@ -1 +1 @@
-bebc984bbcae8407d85161582e8b02a0  kasumi-2.3.tar.gz
+683f43fbf8ba3c92964a538c0d21afc7  kasumi-2.4.tar.gz


--- kasumi-2.3-gcc43.patch DELETED ---



From tagoh at fedoraproject.org  Thu Jan 29 11:55:11 2009
From: tagoh at fedoraproject.org (Akira TAGOH)
Date: Thu, 29 Jan 2009 11:55:11 +0000 (UTC)
Subject: rpms/kasumi/F-9 .cvsignore, 1.9, 1.10 kasumi.spec, 1.29,
	1.30 sources, 1.8, 1.9 kasumi-2.3-gcc43.patch, 1.1, NONE
Message-ID: <20090129115512.00E8970116@cvs1.fedora.phx.redhat.com>

Author: tagoh

Update of /cvs/pkgs/rpms/kasumi/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8229

Modified Files:
	.cvsignore kasumi.spec sources 
Removed Files:
	kasumi-2.3-gcc43.patch 
Log Message:
* Thu Jan 29 2009 Akira TAGOH <tagoh at redhat.com> - 2.4-1
- New upstream release.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kasumi/F-9/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	31 Oct 2007 08:22:38 -0000	1.9
+++ .cvsignore	29 Jan 2009 11:54:41 -0000	1.10
@@ -9,3 +9,4 @@
 kasumi-2.0.1.tar.gz
 kasumi-2.2.tar.gz
 kasumi-2.3.tar.gz
+kasumi-2.4.tar.gz


Index: kasumi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kasumi/F-9/kasumi.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- kasumi.spec	8 Apr 2008 02:33:13 -0000	1.29
+++ kasumi.spec	29 Jan 2009 11:54:41 -0000	1.30
@@ -1,13 +1,12 @@
 Name:    kasumi
-Version: 2.3
-Release: 4%{?dist}
+Version: 2.4
+Release: 1%{?dist}
 
 License: GPLv2+
 URL:     http://kasumi.sourceforge.jp/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: desktop-file-utils, gtk2-devel gettext-devel anthy-devel automake autoconf
 Source0: %{name}-%{version}.tar.gz
-Patch0:  kasumi-2.3-gcc43.patch
 
 
 Summary: An anthy dictionary management tool.
@@ -18,7 +17,6 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .gcc43
 
 %build
 %configure
@@ -49,6 +47,9 @@
 
 
 %changelog
+* Thu Jan 29 2009 Akira TAGOH <tagoh at redhat.com> - 2.4-1
+- New upstream release.
+
 * Tue Apr  8 2008 Akira TAGOH <tagoh at redhat.com> - 2.3-4
 - Remove .desktop file since it's accessible from scim-panel and it's not
   necessarily used for every users, particularly on Live. (#439173)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kasumi/F-9/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	31 Oct 2007 08:22:38 -0000	1.8
+++ sources	29 Jan 2009 11:54:41 -0000	1.9
@@ -1 +1 @@
-bebc984bbcae8407d85161582e8b02a0  kasumi-2.3.tar.gz
+683f43fbf8ba3c92964a538c0d21afc7  kasumi-2.4.tar.gz


--- kasumi-2.3-gcc43.patch DELETED ---



From mjakubicek at fedoraproject.org  Thu Jan 29 12:25:04 2009
From: mjakubicek at fedoraproject.org (=?utf-8?b?TWlsb8WhIEpha3Viw63EjWVr?=)
Date: Thu, 29 Jan 2009 12:25:04 +0000 (UTC)
Subject: rpms/dclib/devel .cvsignore, 1.5, 1.6 dclib.spec, 1.19, 1.20 sources,
	1.5, 1.6
Message-ID: <20090129122504.E0EDF70116@cvs1.fedora.phx.redhat.com>

Author: mjakubicek

Update of /cvs/pkgs/rpms/dclib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13717

Modified Files:
	.cvsignore dclib.spec sources 
Log Message:
- Update to 0.3.22
- Many bugfixes, code cleanup etc.
- Upload slot changes
- Major feature changes (together with valknut) mentioned in NEWS from 0.3.11 to 0.3.21:
  0.3.20: Segment size adjustable, Download folders from search, Warnings about settings,
  0.3.19: More search results returned, Switching active/passive mode, StrongDC compatible encryption,
          Partial list uploads, Search window improvements, User list icon changes
  0.3.14: Nick tab completion improvements, Chat command improvements, Filelist storage changes,
		  Public hubs display improved, /rebuild command fixed and improved, Folder search results




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/dclib/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	15 Oct 2007 01:46:25 -0000	1.5
+++ .cvsignore	29 Jan 2009 12:24:34 -0000	1.6
@@ -1 +1 @@
-dclib-0.3.11.tar.bz2
+dclib-0.3.22.tar.bz2


Index: dclib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dclib/devel/dclib.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- dclib.spec	15 Jan 2009 19:40:20 -0000	1.19
+++ dclib.spec	29 Jan 2009 12:24:34 -0000	1.20
@@ -1,6 +1,6 @@
 Name:           dclib
-Version:        0.3.11
-Release:        5%{?dist}
+Version:        0.3.22
+Release:        1%{?dist}
 Summary:        Direct Connect file sharing library
 
 Group:          Applications/Internet
@@ -34,10 +34,6 @@
 
 
 %build
-aclocal
-automake
-autoconf
-make -f admin/Makefile.common
 %configure --disable-static
 make %{?_smp_mflags}
 
@@ -47,6 +43,9 @@
 make install DESTDIR=$RPM_BUILD_ROOT
 rm $RPM_BUILD_ROOT%{_libdir}/*.la
 
+# remove additional directory level
+mv $RPM_BUILD_ROOT%{_includedir}/dclib-0.3/dclib $RPM_BUILD_ROOT%{_includedir}
+rmdir $RPM_BUILD_ROOT%{_includedir}/dclib-0.3
 
 %post -p /sbin/ldconfig
 
@@ -59,25 +58,37 @@
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING COPYING.OpenSSL README
+%doc AUTHORS COPYING COPYING.OpenSSL README NEWS ChangeLog
 %{_libdir}/*.so.*
 
 %files devel
 %defattr(-,root,root,-)
+%doc HACKING
 %{_libdir}/pkgconfig/dclib.pc
 %{_includedir}/dclib
 %{_libdir}/*.so
 
 
 %changelog
-* Thu Jan 15 2009 Tomas Mraz <tmraz at redhat.com> - 0.3.1-5
+* Wed Jan 28 2009 Milos Jakubicek <xjakub at fi.muni.cz> - 0.3.22-1
+- Update to 0.3.22
+- Many bugfixes, code cleanup etc.
+- Upload slot changes
+- Major feature changes (together with valknut) mentioned in NEWS from 0.3.11 to 0.3.21:
+  0.3.20: Segment size adjustable, Download folders from search, Warnings about settings,
+  0.3.19: More search results returned, Switching active/passive mode, StrongDC compatible encryption,
+  Partial list uploads, Search window improvements, User list icon changes
+  0.3.14: Nick tab completion improvements, Chat command improvements, Filelist storage changes, 
+  Public hubs display improved, /rebuild command fixed and improved, Folder search results
+
+* Thu Jan 15 2009 Tomas Mraz <tmraz at redhat.com> - 0.3.11-5
 - rebuild with new openssl
 
-* Fri Feb  8 2008 Luke Macken <lmacken at redhat.com> - 0.3.1-4
+* Fri Feb  8 2008 Luke Macken <lmacken at redhat.com> - 0.3.11-4
 - Rebuild for gcc 4.3
 
 * Wed Dec 05 2007 Release Engineering <rel-eng at fedoraproject dot org> - 0.3.11-3
- - Rebuild for deps
+- Rebuild for deps
 
 * Wed Dec  5 2007 Luke Macken <lmacken at redhat.com> 0.3.11-2
 - Rebuild


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dclib/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	15 Oct 2007 01:46:25 -0000	1.5
+++ sources	29 Jan 2009 12:24:34 -0000	1.6
@@ -1 +1 @@
-607fe7a1217792a8a023cd86a2847888  dclib-0.3.11.tar.bz2
+5894298ed84e267a531210421eef04ae  dclib-0.3.22.tar.bz2



From mjakubicek at fedoraproject.org  Thu Jan 29 12:30:12 2009
From: mjakubicek at fedoraproject.org (=?utf-8?b?TWlsb8WhIEpha3Viw63EjWVr?=)
Date: Thu, 29 Jan 2009 12:30:12 +0000 (UTC)
Subject: rpms/valknut/devel .cvsignore, 1.6, 1.7 sources, 1.6,
	1.7 valknut.spec, 1.15, 1.16 valknut.png, 1.1, NONE
Message-ID: <20090129123012.7306070116@cvs1.fedora.phx.redhat.com>

Author: mjakubicek

Update of /cvs/pkgs/rpms/valknut/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14670

Modified Files:
	.cvsignore sources valknut.spec 
Removed Files:
	valknut.png 
Log Message:
- Update to 0.4.8
- Switch to QT4
- Removed Source2:valknut.png (part of the source package now)
- Fixed desktop file
- Man pages
- Many bugfixes, code cleanup etc.
- Upload slot changes
- Major feature changes (together with dclib) mentioned in NEWS from 0.4.0 to 0.4.7:
  0.4.6: Segment size adjustable, Download folders from search, Warnings about settings,
  0.4.5: More search results returned, Switching active/passive mode, StrongDC compatible encryption,
         Partial list uploads, Search window improvements, User list icon changes
  0.4.0: Nick tab completion improvements, Chat command improvements, Filelist storage changes,
         Public hubs display improved, /rebuild command fixed and improved, Folder search results




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/valknut/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	15 Oct 2007 02:06:18 -0000	1.6
+++ .cvsignore	29 Jan 2009 12:29:41 -0000	1.7
@@ -1 +1 @@
-valknut-0.3.11.tar.bz2
+valknut-0.4.8.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/valknut/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	15 Oct 2007 02:06:18 -0000	1.6
+++ sources	29 Jan 2009 12:29:41 -0000	1.7
@@ -1 +1 @@
-d485a7ed734d6ceadc0067b7c4254a60  valknut-0.3.11.tar.bz2
+5798716892bd101524579c0eeb7d4b4a  valknut-0.4.8.tar.bz2


Index: valknut.spec
===================================================================
RCS file: /cvs/pkgs/rpms/valknut/devel/valknut.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- valknut.spec	18 Jan 2009 15:04:43 -0000	1.15
+++ valknut.spec	29 Jan 2009 12:29:42 -0000	1.16
@@ -1,6 +1,6 @@
 Name:           valknut
-Version:        0.3.11
-Release:        5%{?dist}
+Version:        0.4.8
+Release:        1%{?dist}
 Summary:        Valknut is a QT Direct Connect client
 
 Group:          Applications/Internet
@@ -8,11 +8,10 @@
 URL:            http://sourceforge.net/projects/wxdcgui/
 Source0:        http://dl.sourceforge.net/wxdcgui/%{name}-%{version}.tar.bz2
 Source1:        valknut.desktop
-Source2:        valknut.png
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  dclib-devel = %{version}
-BuildRequires:  qt3-devel, desktop-file-utils, bzip2-devel
+BuildRequires:  dclib-devel >= 0.3.22
+BuildRequires:  qt-devel, desktop-file-utils, bzip2-devel
 BuildRequires:  openssl-devel
 
 %description
@@ -26,7 +25,6 @@
 
 
 %build
-unset QTDIR && source %{_sysconfdir}/profile.d/qt.sh
 %configure --enable-mt
 make %{?_smp_mflags}
 
@@ -34,9 +32,7 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
-
-%{__install} -p -D -m 644 %{SOURCE2} \
-        $RPM_BUILD_ROOT%{_datadir}/pixmaps/valknut.png
+rm ${RPM_BUILD_ROOT}%{_datadir}/applications/valknut.desktop
 
 desktop-file-install --vendor fedora                            \
         --dir ${RPM_BUILD_ROOT}%{_datadir}/applications         \
@@ -54,9 +50,31 @@
 %{_datadir}/valknut
 %{_datadir}/applications/fedora-valknut.desktop
 %{_datadir}/pixmaps/valknut.png
-
+%{_datadir}/icons/hicolor/128x128/apps/valknut.png
+%{_datadir}/icons/hicolor/16x16/apps/valknut.png
+%{_datadir}/icons/hicolor/22x22/apps/valknut.png
+%{_datadir}/icons/hicolor/24x24/apps/valknut.png
+%{_datadir}/icons/hicolor/32x32/apps/valknut.png
+%{_datadir}/icons/hicolor/48x48/apps/valknut.png
+%{_datadir}/icons/hicolor/64x64/apps/valknut.png
+%{_mandir}/man1/valknut.1.gz
 
 %changelog
+* Wed Jan 28 2009 Milos Jakubicek <xjakub at fi.muni.cz> - 0.4.8-1
+- Update to 0.4.8
+- Switch to QT4
+- Removed Source2:valknut.png (part of the source package now)
+- Fixed desktop file
+- Man pages
+- Many bugfixes, code cleanup etc.
+- Upload slot changes
+- Major feature changes (together with dclib) mentioned in NEWS from 0.4.0 to 0.4.7:
+  0.4.6: Segment size adjustable, Download folders from search, Warnings about settings,
+  0.4.5: More search results returned, Switching active/passive mode, StrongDC compatible encryption,
+  Partial list uploads, Search window improvements, User list icon changes
+  0.4.0: Nick tab completion improvements, Chat command improvements, Filelist storage changes, 
+  Public hubs display improved, /rebuild command fixed and improved, Folder search results
+
 * Sun Jan 18 2009 Tomas Mraz <tmraz at redhat.com> 0.3.11-5
 - rebuild with new openssl
 



From twaugh at fedoraproject.org  Thu Jan 29 12:35:07 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Thu, 29 Jan 2009 12:35:07 +0000 (UTC)
Subject: rpms/gutenprint/devel gutenprint-foomaticppdupdate, 1.3,
	1.4 gutenprint.spec, 1.45, 1.46
Message-ID: <20090129123507.32FA970116@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/gutenprint/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15694

Modified Files:
	gutenprint-foomaticppdupdate gutenprint.spec 
Log Message:
* Thu Jan 29 2009 Tim Waugh <twaugh at redhat.com> 5.2.3-4
- When updating foomatic PPDs, don't give a traceback if some PPD is
  not strictly conformant (bug #481397).



Index: gutenprint-foomaticppdupdate
===================================================================
RCS file: /cvs/pkgs/rpms/gutenprint/devel/gutenprint-foomaticppdupdate,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gutenprint-foomaticppdupdate	10 Jan 2009 13:01:24 -0000	1.3
+++ gutenprint-foomaticppdupdate	29 Jan 2009 12:34:36 -0000	1.4
@@ -55,7 +55,12 @@
     return ppdobj
 
 def update_ppdfile (ppdfile):
-    ppd = cups.PPD (ppdfile)
+    try:
+        ppd = cups.PPD (ppdfile)
+    except RuntimeError:
+        # Invalid PPD in some way.
+        return
+
     attr = ppd.findAttr ("FoomaticIDs")
     if not attr:
         return


Index: gutenprint.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gutenprint/devel/gutenprint.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- gutenprint.spec	10 Jan 2009 13:01:24 -0000	1.45
+++ gutenprint.spec	29 Jan 2009 12:34:36 -0000	1.46
@@ -4,7 +4,7 @@
 Name:           gutenprint
 Summary:        Printer Drivers Package.
 Version:        5.2.3
-Release:        3%{?dist}
+Release:        4%{?dist}
 Group:          System Environment/Base
 URL:            http://gimp-print.sourceforge.net/
 Source0:        http://dl.sf.net/gimp-print/gutenprint-%{version}.tar.bz2
@@ -254,6 +254,10 @@
 /bin/rm -f /var/cache/foomatic/*
 
 %changelog
+* Thu Jan 29 2009 Tim Waugh <twaugh at redhat.com> 5.2.3-4
+- When updating foomatic PPDs, don't give a traceback if some PPD is
+  not strictly conformant (bug #481397).
+
 * Sat Jan 10 2009 Tim Waugh <twaugh at redhat.com> 5.2.3-3
 - Don't use popen2 in the foomatic PPD update script.
 



From twaugh at fedoraproject.org  Thu Jan 29 12:36:54 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Thu, 29 Jan 2009 12:36:54 +0000 (UTC)
Subject: rpms/gutenprint/F-10 gutenprint-foomaticppdupdate, 1.3,
	1.4 gutenprint.spec, 1.44, 1.45
Message-ID: <20090129123654.14CAD179D1E@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/gutenprint/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16089

Modified Files:
	gutenprint-foomaticppdupdate gutenprint.spec 
Log Message:
* Thu Jan 29 2009 Tim Waugh <twaugh at redhat.com> 5.2.3-4
- When updating foomatic PPDs, don't give a traceback if some PPD is
  not strictly conformant (bug #481397).



Index: gutenprint-foomaticppdupdate
===================================================================
RCS file: /cvs/pkgs/rpms/gutenprint/F-10/gutenprint-foomaticppdupdate,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gutenprint-foomaticppdupdate	10 Jan 2009 13:11:30 -0000	1.3
+++ gutenprint-foomaticppdupdate	29 Jan 2009 12:36:23 -0000	1.4
@@ -55,7 +55,12 @@
     return ppdobj
 
 def update_ppdfile (ppdfile):
-    ppd = cups.PPD (ppdfile)
+    try:
+        ppd = cups.PPD (ppdfile)
+    except RuntimeError:
+        # Invalid PPD in some way.
+        return
+
     attr = ppd.findAttr ("FoomaticIDs")
     if not attr:
         return


Index: gutenprint.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gutenprint/F-10/gutenprint.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- gutenprint.spec	10 Jan 2009 13:11:30 -0000	1.44
+++ gutenprint.spec	29 Jan 2009 12:36:23 -0000	1.45
@@ -4,7 +4,7 @@
 Name:           gutenprint
 Summary:        Printer Drivers Package.
 Version:        5.2.3
-Release:        3%{?dist}
+Release:        4%{?dist}
 Group:          System Environment/Base
 URL:            http://gimp-print.sourceforge.net/
 Source0:        http://dl.sf.net/gimp-print/gutenprint-%{version}.tar.bz2
@@ -254,6 +254,10 @@
 /bin/rm -f /var/cache/foomatic/*
 
 %changelog
+* Thu Jan 29 2009 Tim Waugh <twaugh at redhat.com> 5.2.3-4
+- When updating foomatic PPDs, don't give a traceback if some PPD is
+  not strictly conformant (bug #481397).
+
 * Sat Jan 10 2009 Tim Waugh <twaugh at redhat.com> 5.2.3-3
 - Don't use popen2 in the foomatic PPD update script.
 



From mildew at fedoraproject.org  Thu Jan 29 12:48:50 2009
From: mildew at fedoraproject.org (=?utf-8?q?Daniel_Kope=C4=8Dek?=)
Date: Thu, 29 Jan 2009 12:48:50 +0000 (UTC)
Subject: rpms/sudo/F-10 sudo-1.6.9p17-runas.patch, NONE, 1.1 sudo.spec, 1.72,
	1.73
Message-ID: <20090129124850.4BD6E70117@cvs1.fedora.phx.redhat.com>

Author: mildew

Update of /cvs/pkgs/rpms/sudo/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18480

Modified Files:
	sudo.spec 
Added Files:
	sudo-1.6.9p17-runas.patch 
Log Message:
- Fix for incorrect handling of groups in Runas_User


sudo-1.6.9p17-runas.patch:

--- NEW FILE sudo-1.6.9p17-runas.patch ---
Index: parse.c
===================================================================
RCS file: /home/cvs/courtesan/sudo/parse.c,v
retrieving revision 1.160.2.21
diff -u -r1.160.2.21 parse.c
--- parse.c	2 Nov 2008 14:35:53 -0000	1.160.2.21
+++ parse.c	23 Jan 2009 19:16:55 -0000
@@ -651,9 +651,11 @@
     /*
      * If the user has a supplementary group vector, check it first.
      */
-    for (i = 0; i < user_ngroups; i++) {
-	if (grp->gr_gid == user_groups[i])
-	    return(TRUE);
+    if (strcmp(user, user_name) == 0) {
+	for (i = 0; i < user_ngroups; i++) {
+	    if (grp->gr_gid == user_groups[i])
+		return(TRUE);
+	}
     }
     if (grp->gr_mem != NULL) {
 	for (cur = grp->gr_mem; *cur; cur++) {



Index: sudo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sudo/F-10/sudo.spec,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- sudo.spec	13 Jan 2009 16:53:20 -0000	1.72
+++ sudo.spec	29 Jan 2009 12:48:19 -0000	1.73
@@ -1,7 +1,7 @@
 Summary: Allows restricted root access for specified users
 Name: sudo
 Version: 1.6.9p17
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: BSD
 Group: Applications/System
 URL: http://www.courtesan.com/sudo/
@@ -28,6 +28,7 @@
 Patch3: sudo-1.6.9p4-getgrouplist.patch
 Patch4: sudo-1.6.9p12-noPam.patch
 Patch5: sudo-1.6.9p13-audit.patch
+Patch6: sudo-1.6.9p17-runas.patch
 
 %description
 Sudo (superuser do) allows a system administrator to give certain
@@ -47,6 +48,7 @@
 %patch3 -p1 -b .getgrouplist
 %patch4 -p1 -b .noPam
 %patch5 -p1 -b .audit
+%patch6 -p0 -b .runas
 
 %build
 #hande newer autoconf
@@ -133,6 +135,9 @@
 /bin/chmod 0440 /etc/sudoers || :
 
 %changelog
+* Thu Jan 29 2009 Daniel Kopecek <dkopecek at redhat.com> 1.6.9p17-5
+- Fix for incorrect handling of groups in Runas_User
+
 * Tue Jan 13 2009 Daniel Kopecek <dkopecek at redhat.com> 1.6.9p17-4
 - build with sendmail installed
 



From bpepple at fedoraproject.org  Thu Jan 29 13:10:20 2009
From: bpepple at fedoraproject.org (Brian Pepple)
Date: Thu, 29 Jan 2009 13:10:20 +0000 (UTC)
Subject: rpms/telepathy-gabble/devel .cvsignore, 1.37, 1.38 sources, 1.37,
	1.38 telepathy-gabble.spec, 1.46, 1.47
Message-ID: <20090129131020.ADE2B70117@cvs1.fedora.phx.redhat.com>

Author: bpepple

Update of /cvs/pkgs/rpms/telepathy-gabble/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22009

Modified Files:
	.cvsignore sources telepathy-gabble.spec 
Log Message:
* Thu Jan 29 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.7.19-1
- Update to 0.7.19.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-gabble/devel/.cvsignore,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- .cvsignore	7 Jan 2009 00:16:16 -0000	1.37
+++ .cvsignore	29 Jan 2009 13:09:50 -0000	1.38
@@ -1 +1 @@
-telepathy-gabble-0.7.18.tar.gz
+telepathy-gabble-0.7.19.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-gabble/devel/sources,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- sources	7 Jan 2009 00:16:17 -0000	1.37
+++ sources	29 Jan 2009 13:09:50 -0000	1.38
@@ -1 +1 @@
-807260037be70882be3bcdb6b26ff031  telepathy-gabble-0.7.18.tar.gz
+2c29e6d85b090f176b9e70e9b0c714d6  telepathy-gabble-0.7.19.tar.gz


Index: telepathy-gabble.spec
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-gabble/devel/telepathy-gabble.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- telepathy-gabble.spec	7 Jan 2009 00:16:17 -0000	1.46
+++ telepathy-gabble.spec	29 Jan 2009 13:09:50 -0000	1.47
@@ -1,5 +1,5 @@
 Name:           telepathy-gabble
-Version:        0.7.18
+Version:        0.7.19
 Release:        1%{?dist}
 Summary:        A Jabber/XMPP connection manager
 
@@ -57,6 +57,9 @@
 
 
 %changelog
+* Thu Jan 29 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.7.19-1
+- Update to 0.7.19.
+
 * Tue Jan  6 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.7.18-1
 - Update to 0.7.18.
 



From jwboyer at fedoraproject.org  Thu Jan 29 13:11:28 2009
From: jwboyer at fedoraproject.org (Joshua W. Boyer)
Date: Thu, 29 Jan 2009 13:11:28 +0000 (UTC)
Subject: rpms/git/devel .cvsignore, 1.70, 1.71 git.spec, 1.78, 1.79 sources, 
	1.70, 1.71
Message-ID: <20090129131128.6AAE170117@cvs1.fedora.phx.redhat.com>

Author: jwboyer

Update of /cvs/pkgs/rpms/git/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22276

Modified Files:
	.cvsignore git.spec sources 
Log Message:
* Thu Jan 29 2009 Josh Boyer <jwboyer at gmail.com> 1.6.1.2-1
- git-1.6.1.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/git/devel/.cvsignore,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- .cvsignore	27 Jan 2009 01:25:02 -0000	1.70
+++ .cvsignore	29 Jan 2009 13:10:58 -0000	1.71
@@ -1 +1 @@
-git-1.6.1.1.tar.bz2
+git-1.6.1.2.tar.bz2


Index: git.spec
===================================================================
RCS file: /cvs/pkgs/rpms/git/devel/git.spec,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- git.spec	27 Jan 2009 01:25:02 -0000	1.78
+++ git.spec	29 Jan 2009 13:10:58 -0000	1.79
@@ -1,6 +1,6 @@
 # Pass --without docs to rpmbuild if you don't want the documentation
 Name:           git
-Version:        1.6.1.1
+Version:        1.6.1.2
 Release:        1%{?dist}
 Summary:        Core git tools
 License:        GPLv2
@@ -273,6 +273,9 @@
 # No files for you!
 
 %changelog
+* Thu Jan 29 2009 Josh Boyer <jwboyer at gmail.com> 1.6.1.2-1
+- git-1.6.1.2
+
 * Mon Jan 26 2009 Todd Zullinger <tmz at pobox.com> 1.6.1.1-1
 - git-1.6.1.1
 - Make compile more verbose


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/git/devel/sources,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- sources	27 Jan 2009 01:25:02 -0000	1.70
+++ sources	29 Jan 2009 13:10:58 -0000	1.71
@@ -1 +1 @@
-d2b6925cb03e1e33911fdf9392946747  git-1.6.1.1.tar.bz2
+72a9d88932190ff3523678eec88844ae  git-1.6.1.2.tar.bz2



From mjakubicek at fedoraproject.org  Thu Jan 29 13:32:15 2009
From: mjakubicek at fedoraproject.org (=?utf-8?b?TWlsb8WhIEpha3Viw63EjWVr?=)
Date: Thu, 29 Jan 2009 13:32:15 +0000 (UTC)
Subject: rpms/dclib/F-9 .cvsignore, 1.5, 1.6 dclib.spec, 1.18, 1.19 sources, 
	1.5, 1.6
Message-ID: <20090129133215.33BA170116@cvs1.fedora.phx.redhat.com>

Author: mjakubicek

Update of /cvs/pkgs/rpms/dclib/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25982/F-9

Modified Files:
	.cvsignore dclib.spec sources 
Log Message:
- Update to 0.3.22
- Many bugfixes, code cleanup etc.
- Upload slot changes
- Major feature changes (together with valknut) mentioned in NEWS from 0.3.11 to 0.3.21:
  0.3.20: Segment size adjustable, Download folders from search, Warnings about settings,
  0.3.19: More search results returned, Switching active/passive mode, StrongDC compatible encryption,
          Partial list uploads, Search window improvements, User list icon changes
  0.3.14: Nick tab completion improvements, Chat command improvements, Filelist storage changes,
		  Public hubs display improved, /rebuild command fixed and improved, Folder search results




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/dclib/F-9/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	15 Oct 2007 01:46:25 -0000	1.5
+++ .cvsignore	29 Jan 2009 13:31:44 -0000	1.6
@@ -1 +1 @@
-dclib-0.3.11.tar.bz2
+dclib-0.3.22.tar.bz2


Index: dclib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dclib/F-9/dclib.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- dclib.spec	9 Feb 2008 02:16:20 -0000	1.18
+++ dclib.spec	29 Jan 2009 13:31:44 -0000	1.19
@@ -1,6 +1,6 @@
 Name:           dclib
-Version:        0.3.11
-Release:        4%{?dist}
+Version:        0.3.22
+Release:        1%{?dist}
 Summary:        Direct Connect file sharing library
 
 Group:          Applications/Internet
@@ -34,10 +34,6 @@
 
 
 %build
-aclocal
-automake
-autoconf
-make -f admin/Makefile.common
 %configure --disable-static
 make %{?_smp_mflags}
 
@@ -47,6 +43,9 @@
 make install DESTDIR=$RPM_BUILD_ROOT
 rm $RPM_BUILD_ROOT%{_libdir}/*.la
 
+# remove additional directory level
+mv $RPM_BUILD_ROOT%{_includedir}/dclib-0.3/dclib $RPM_BUILD_ROOT%{_includedir}
+rmdir $RPM_BUILD_ROOT%{_includedir}/dclib-0.3
 
 %post -p /sbin/ldconfig
 
@@ -59,22 +58,37 @@
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING COPYING.OpenSSL README
+%doc AUTHORS COPYING COPYING.OpenSSL README NEWS ChangeLog
 %{_libdir}/*.so.*
 
 %files devel
 %defattr(-,root,root,-)
+%doc HACKING
 %{_libdir}/pkgconfig/dclib.pc
 %{_includedir}/dclib
 %{_libdir}/*.so
 
 
 %changelog
-* Fri Feb  8 2008 Luke Macken <lmacken at redhat.com> - 0.3.1-4
+* Wed Jan 28 2009 Milos Jakubicek <xjakub at fi.muni.cz> - 0.3.22-1
+- Update to 0.3.22
+- Many bugfixes, code cleanup etc.
+- Upload slot changes
+- Major feature changes (together with valknut) mentioned in NEWS from 0.3.11 to 0.3.21:
+  0.3.20: Segment size adjustable, Download folders from search, Warnings about settings,
+  0.3.19: More search results returned, Switching active/passive mode, StrongDC compatible encryption,
+  Partial list uploads, Search window improvements, User list icon changes
+  0.3.14: Nick tab completion improvements, Chat command improvements, Filelist storage changes, 
+  Public hubs display improved, /rebuild command fixed and improved, Folder search results
+
+* Thu Jan 15 2009 Tomas Mraz <tmraz at redhat.com> - 0.3.11-5
+- rebuild with new openssl
+
+* Fri Feb  8 2008 Luke Macken <lmacken at redhat.com> - 0.3.11-4
 - Rebuild for gcc 4.3
 
 * Wed Dec 05 2007 Release Engineering <rel-eng at fedoraproject dot org> - 0.3.11-3
- - Rebuild for deps
+- Rebuild for deps
 
 * Wed Dec  5 2007 Luke Macken <lmacken at redhat.com> 0.3.11-2
 - Rebuild


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dclib/F-9/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	15 Oct 2007 01:46:25 -0000	1.5
+++ sources	29 Jan 2009 13:31:44 -0000	1.6
@@ -1 +1 @@
-607fe7a1217792a8a023cd86a2847888  dclib-0.3.11.tar.bz2
+5894298ed84e267a531210421eef04ae  dclib-0.3.22.tar.bz2



From mjakubicek at fedoraproject.org  Thu Jan 29 13:32:14 2009
From: mjakubicek at fedoraproject.org (=?utf-8?b?TWlsb8WhIEpha3Viw63EjWVr?=)
Date: Thu, 29 Jan 2009 13:32:14 +0000 (UTC)
Subject: rpms/dclib/F-10 .cvsignore, 1.5, 1.6 dclib.spec, 1.18, 1.19 sources,
	1.5, 1.6
Message-ID: <20090129133214.E100870116@cvs1.fedora.phx.redhat.com>

Author: mjakubicek

Update of /cvs/pkgs/rpms/dclib/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25982/F-10

Modified Files:
	.cvsignore dclib.spec sources 
Log Message:
- Update to 0.3.22
- Many bugfixes, code cleanup etc.
- Upload slot changes
- Major feature changes (together with valknut) mentioned in NEWS from 0.3.11 to 0.3.21:
  0.3.20: Segment size adjustable, Download folders from search, Warnings about settings,
  0.3.19: More search results returned, Switching active/passive mode, StrongDC compatible encryption,
          Partial list uploads, Search window improvements, User list icon changes
  0.3.14: Nick tab completion improvements, Chat command improvements, Filelist storage changes,
		  Public hubs display improved, /rebuild command fixed and improved, Folder search results




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/dclib/F-10/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	15 Oct 2007 01:46:25 -0000	1.5
+++ .cvsignore	29 Jan 2009 13:31:44 -0000	1.6
@@ -1 +1 @@
-dclib-0.3.11.tar.bz2
+dclib-0.3.22.tar.bz2


Index: dclib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dclib/F-10/dclib.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- dclib.spec	9 Feb 2008 02:16:20 -0000	1.18
+++ dclib.spec	29 Jan 2009 13:31:44 -0000	1.19
@@ -1,6 +1,6 @@
 Name:           dclib
-Version:        0.3.11
-Release:        4%{?dist}
+Version:        0.3.22
+Release:        1%{?dist}
 Summary:        Direct Connect file sharing library
 
 Group:          Applications/Internet
@@ -34,10 +34,6 @@
 
 
 %build
-aclocal
-automake
-autoconf
-make -f admin/Makefile.common
 %configure --disable-static
 make %{?_smp_mflags}
 
@@ -47,6 +43,9 @@
 make install DESTDIR=$RPM_BUILD_ROOT
 rm $RPM_BUILD_ROOT%{_libdir}/*.la
 
+# remove additional directory level
+mv $RPM_BUILD_ROOT%{_includedir}/dclib-0.3/dclib $RPM_BUILD_ROOT%{_includedir}
+rmdir $RPM_BUILD_ROOT%{_includedir}/dclib-0.3
 
 %post -p /sbin/ldconfig
 
@@ -59,22 +58,37 @@
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING COPYING.OpenSSL README
+%doc AUTHORS COPYING COPYING.OpenSSL README NEWS ChangeLog
 %{_libdir}/*.so.*
 
 %files devel
 %defattr(-,root,root,-)
+%doc HACKING
 %{_libdir}/pkgconfig/dclib.pc
 %{_includedir}/dclib
 %{_libdir}/*.so
 
 
 %changelog
-* Fri Feb  8 2008 Luke Macken <lmacken at redhat.com> - 0.3.1-4
+* Wed Jan 28 2009 Milos Jakubicek <xjakub at fi.muni.cz> - 0.3.22-1
+- Update to 0.3.22
+- Many bugfixes, code cleanup etc.
+- Upload slot changes
+- Major feature changes (together with valknut) mentioned in NEWS from 0.3.11 to 0.3.21:
+  0.3.20: Segment size adjustable, Download folders from search, Warnings about settings,
+  0.3.19: More search results returned, Switching active/passive mode, StrongDC compatible encryption,
+  Partial list uploads, Search window improvements, User list icon changes
+  0.3.14: Nick tab completion improvements, Chat command improvements, Filelist storage changes, 
+  Public hubs display improved, /rebuild command fixed and improved, Folder search results
+
+* Thu Jan 15 2009 Tomas Mraz <tmraz at redhat.com> - 0.3.11-5
+- rebuild with new openssl
+
+* Fri Feb  8 2008 Luke Macken <lmacken at redhat.com> - 0.3.11-4
 - Rebuild for gcc 4.3
 
 * Wed Dec 05 2007 Release Engineering <rel-eng at fedoraproject dot org> - 0.3.11-3
- - Rebuild for deps
+- Rebuild for deps
 
 * Wed Dec  5 2007 Luke Macken <lmacken at redhat.com> 0.3.11-2
 - Rebuild


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dclib/F-10/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	15 Oct 2007 01:46:25 -0000	1.5
+++ sources	29 Jan 2009 13:31:44 -0000	1.6
@@ -1 +1 @@
-607fe7a1217792a8a023cd86a2847888  dclib-0.3.11.tar.bz2
+5894298ed84e267a531210421eef04ae  dclib-0.3.22.tar.bz2



From vcrhonek at fedoraproject.org  Thu Jan 29 13:49:52 2009
From: vcrhonek at fedoraproject.org (Vitezslav Crhonek)
Date: Thu, 29 Jan 2009 13:49:52 +0000 (UTC)
Subject: rpms/kbd/devel kbd.spec,1.57,1.58
Message-ID: <20090129134952.D7C3270116@cvs1.fedora.phx.redhat.com>

Author: vcrhonek

Update of /cvs/extras/rpms/kbd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29224

Modified Files:
	kbd.spec 
Log Message:
Rename conflicting keymaps to have unique names


Index: kbd.spec
===================================================================
RCS file: /cvs/extras/rpms/kbd/devel/kbd.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- kbd.spec	12 Jan 2009 11:42:44 -0000	1.57
+++ kbd.spec	29 Jan 2009 13:49:22 -0000	1.58
@@ -1,6 +1,6 @@
 Name:           kbd
 Version:        1.15
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Tools for configuring the console (keyboard, virtual terminals, etc.)
 
 Group:          System Environment/Base
@@ -47,6 +47,13 @@
 cp azerty/fr-latin9.map azerty/fr.map
 
 cp azerty/fr-latin9.map azerty/fr-latin0.map # legacy alias
+
+# Rename conflicting keymaps
+mv dvorak/no.map dvorak/no-dvorak.map
+mv fgGIod/trf.map fgGIod/trf-fgGIod.map
+mv olpc/es.map olpc/es-olpc.map
+mv olpc/pt.map olpc/pt-olpc.map
+mv qwerty/cz.map qwerty/cz-qwerty.map
 popd
 
 %build
@@ -102,6 +109,10 @@
 /lib/kbd
 
 %changelog
+* Thu Jan 29 2009 Vitezslav Crhonek <vcrhonek at redhat.com> - 1.15-3
+- Rename conflicting keymaps to have unique names
+  Resolves: #481674
+
 * Mon Jan 12 2009 Vitezslav Crhonek <vcrhonek at redhat.com> - 1.15-2
 - Move loadkeys to /bin
 



From mjakubicek at fedoraproject.org  Thu Jan 29 14:03:16 2009
From: mjakubicek at fedoraproject.org (=?utf-8?b?TWlsb8WhIEpha3Viw63EjWVr?=)
Date: Thu, 29 Jan 2009 14:03:16 +0000 (UTC)
Subject: rpms/valknut/F-10 .cvsignore, 1.6, 1.7 sources, 1.6,
	1.7 valknut.desktop, 1.2, 1.3 valknut.spec, 1.14,
	1.15 valknut.png, 1.1, NONE
Message-ID: <20090129140316.CE73670116@cvs1.fedora.phx.redhat.com>

Author: mjakubicek

Update of /cvs/pkgs/rpms/valknut/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31325

Modified Files:
	.cvsignore sources valknut.desktop valknut.spec 
Removed Files:
	valknut.png 
Log Message:
- Update to 0.4.8
- Switch to QT4
- Removed Source2:valknut.png (part of the source package now)
- Fixed desktop file
- Man pages
- Many bugfixes, code cleanup etc.
- Upload slot changes
- Major feature changes (together with dclib) mentioned in NEWS from 0.4.0 to 0.4.7:
  0.4.6: Segment size adjustable, Download folders from search, Warnings about settings,
  0.4.5: More search results returned, Switching active/passive mode, StrongDC compatible encryption,
         Partial list uploads, Search window improvements, User list icon changes
  0.4.0: Nick tab completion improvements, Chat command improvements, Filelist storage changes,
         Public hubs display improved, /rebuild command fixed and improved, Folder search results




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/valknut/F-10/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	15 Oct 2007 02:06:18 -0000	1.6
+++ .cvsignore	29 Jan 2009 14:02:46 -0000	1.7
@@ -1 +1 @@
-valknut-0.3.11.tar.bz2
+valknut-0.4.8.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/valknut/F-10/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	15 Oct 2007 02:06:18 -0000	1.6
+++ sources	29 Jan 2009 14:02:46 -0000	1.7
@@ -1 +1 @@
-d485a7ed734d6ceadc0067b7c4254a60  valknut-0.3.11.tar.bz2
+5798716892bd101524579c0eeb7d4b4a  valknut-0.4.8.tar.bz2


Index: valknut.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/valknut/F-10/valknut.desktop,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- valknut.desktop	30 Apr 2006 23:51:49 -0000	1.2
+++ valknut.desktop	29 Jan 2009 14:02:46 -0000	1.3
@@ -2,7 +2,7 @@
 Encoding=UTF-8
 Name=Valknut
 Comment=Direct Connect client
-Icon=valknut.png
+Icon=valknut
 Exec=valknut --disable-tray
 Terminal=false
 Type=Application


Index: valknut.spec
===================================================================
RCS file: /cvs/pkgs/rpms/valknut/F-10/valknut.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- valknut.spec	4 Apr 2008 18:06:12 -0000	1.14
+++ valknut.spec	29 Jan 2009 14:02:46 -0000	1.15
@@ -1,6 +1,6 @@
 Name:           valknut
-Version:        0.3.11
-Release:        4%{?dist}
+Version:        0.4.8
+Release:        1%{?dist}
 Summary:        Valknut is a QT Direct Connect client
 
 Group:          Applications/Internet
@@ -8,11 +8,10 @@
 URL:            http://sourceforge.net/projects/wxdcgui/
 Source0:        http://dl.sourceforge.net/wxdcgui/%{name}-%{version}.tar.bz2
 Source1:        valknut.desktop
-Source2:        valknut.png
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  dclib-devel = %{version}
-BuildRequires:  qt3-devel, desktop-file-utils, bzip2-devel
+BuildRequires:  dclib-devel >= 0.3.22
+BuildRequires:  qt-devel, desktop-file-utils, bzip2-devel
 BuildRequires:  openssl-devel
 
 %description
@@ -26,7 +25,6 @@
 
 
 %build
-unset QTDIR && source %{_sysconfdir}/profile.d/qt.sh
 %configure --enable-mt
 make %{?_smp_mflags}
 
@@ -34,9 +32,7 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
-
-%{__install} -p -D -m 644 %{SOURCE2} \
-        $RPM_BUILD_ROOT%{_datadir}/pixmaps/valknut.png
+rm ${RPM_BUILD_ROOT}%{_datadir}/applications/valknut.desktop
 
 desktop-file-install --vendor fedora                            \
         --dir ${RPM_BUILD_ROOT}%{_datadir}/applications         \
@@ -54,9 +50,34 @@
 %{_datadir}/valknut
 %{_datadir}/applications/fedora-valknut.desktop
 %{_datadir}/pixmaps/valknut.png
-
+%{_datadir}/icons/hicolor/128x128/apps/valknut.png
+%{_datadir}/icons/hicolor/16x16/apps/valknut.png
+%{_datadir}/icons/hicolor/22x22/apps/valknut.png
+%{_datadir}/icons/hicolor/24x24/apps/valknut.png
+%{_datadir}/icons/hicolor/32x32/apps/valknut.png
+%{_datadir}/icons/hicolor/48x48/apps/valknut.png
+%{_datadir}/icons/hicolor/64x64/apps/valknut.png
+%{_mandir}/man1/valknut.1.gz
 
 %changelog
+* Wed Jan 28 2009 Milos Jakubicek <xjakub at fi.muni.cz> - 0.4.8-1
+- Update to 0.4.8
+- Switch to QT4
+- Removed Source2:valknut.png (part of the source package now)
+- Fixed desktop file
+- Man pages
+- Many bugfixes, code cleanup etc.
+- Upload slot changes
+- Major feature changes (together with dclib) mentioned in NEWS from 0.4.0 to 0.4.7:
+  0.4.6: Segment size adjustable, Download folders from search, Warnings about settings,
+  0.4.5: More search results returned, Switching active/passive mode, StrongDC compatible encryption,
+  Partial list uploads, Search window improvements, User list icon changes
+  0.4.0: Nick tab completion improvements, Chat command improvements, Filelist storage changes, 
+  Public hubs display improved, /rebuild command fixed and improved, Folder search results
+
+* Sun Jan 18 2009 Tomas Mraz <tmraz at redhat.com> 0.3.11-5
+- rebuild with new openssl
+
 * Fri Apr 04 2008 Luke Macken <lmacken at redhat.com> 0.3.11-4
 - Add qt3-devel to BuildRequires to fix build issue (#440837)
 



From mjakubicek at fedoraproject.org  Thu Jan 29 14:06:10 2009
From: mjakubicek at fedoraproject.org (=?utf-8?b?TWlsb8WhIEpha3Viw63EjWVr?=)
Date: Thu, 29 Jan 2009 14:06:10 +0000 (UTC)
Subject: rpms/valknut/F-9 .cvsignore, 1.6, 1.7 sources, 1.6,
	1.7 valknut.desktop, 1.2, 1.3 valknut.spec, 1.14,
	1.15 valknut.png, 1.1, NONE
Message-ID: <20090129140610.1425370116@cvs1.fedora.phx.redhat.com>

Author: mjakubicek

Update of /cvs/pkgs/rpms/valknut/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31940

Modified Files:
	.cvsignore sources valknut.desktop valknut.spec 
Removed Files:
	valknut.png 
Log Message:
- Update to 0.4.8
- Switch to QT4
- Removed Source2:valknut.png (part of the source package now)
- Fixed desktop file
- Man pages
- Many bugfixes, code cleanup etc.
- Upload slot changes
- Major feature changes (together with dclib) mentioned in NEWS from 0.4.0 to 0.4.7:
  0.4.6: Segment size adjustable, Download folders from search, Warnings about settings,
  0.4.5: More search results returned, Switching active/passive mode, StrongDC compatible encryption,
         Partial list uploads, Search window improvements, User list icon changes
  0.4.0: Nick tab completion improvements, Chat command improvements, Filelist storage changes,
		 Public hubs display improved, /rebuild command fixed and improved, Folder search results




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/valknut/F-9/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	15 Oct 2007 02:06:18 -0000	1.6
+++ .cvsignore	29 Jan 2009 14:05:39 -0000	1.7
@@ -1 +1 @@
-valknut-0.3.11.tar.bz2
+valknut-0.4.8.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/valknut/F-9/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	15 Oct 2007 02:06:18 -0000	1.6
+++ sources	29 Jan 2009 14:05:39 -0000	1.7
@@ -1 +1 @@
-d485a7ed734d6ceadc0067b7c4254a60  valknut-0.3.11.tar.bz2
+5798716892bd101524579c0eeb7d4b4a  valknut-0.4.8.tar.bz2


Index: valknut.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/valknut/F-9/valknut.desktop,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- valknut.desktop	30 Apr 2006 23:51:49 -0000	1.2
+++ valknut.desktop	29 Jan 2009 14:05:39 -0000	1.3
@@ -2,7 +2,7 @@
 Encoding=UTF-8
 Name=Valknut
 Comment=Direct Connect client
-Icon=valknut.png
+Icon=valknut
 Exec=valknut --disable-tray
 Terminal=false
 Type=Application


Index: valknut.spec
===================================================================
RCS file: /cvs/pkgs/rpms/valknut/F-9/valknut.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- valknut.spec	4 Apr 2008 18:06:12 -0000	1.14
+++ valknut.spec	29 Jan 2009 14:05:39 -0000	1.15
@@ -1,6 +1,6 @@
 Name:           valknut
-Version:        0.3.11
-Release:        4%{?dist}
+Version:        0.4.8
+Release:        1%{?dist}
 Summary:        Valknut is a QT Direct Connect client
 
 Group:          Applications/Internet
@@ -8,11 +8,10 @@
 URL:            http://sourceforge.net/projects/wxdcgui/
 Source0:        http://dl.sourceforge.net/wxdcgui/%{name}-%{version}.tar.bz2
 Source1:        valknut.desktop
-Source2:        valknut.png
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  dclib-devel = %{version}
-BuildRequires:  qt3-devel, desktop-file-utils, bzip2-devel
+BuildRequires:  dclib-devel >= 0.3.22
+BuildRequires:  qt-devel, desktop-file-utils, bzip2-devel
 BuildRequires:  openssl-devel
 
 %description
@@ -26,7 +25,6 @@
 
 
 %build
-unset QTDIR && source %{_sysconfdir}/profile.d/qt.sh
 %configure --enable-mt
 make %{?_smp_mflags}
 
@@ -34,9 +32,7 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
-
-%{__install} -p -D -m 644 %{SOURCE2} \
-        $RPM_BUILD_ROOT%{_datadir}/pixmaps/valknut.png
+rm ${RPM_BUILD_ROOT}%{_datadir}/applications/valknut.desktop
 
 desktop-file-install --vendor fedora                            \
         --dir ${RPM_BUILD_ROOT}%{_datadir}/applications         \
@@ -54,9 +50,34 @@
 %{_datadir}/valknut
 %{_datadir}/applications/fedora-valknut.desktop
 %{_datadir}/pixmaps/valknut.png
-
+%{_datadir}/icons/hicolor/128x128/apps/valknut.png
+%{_datadir}/icons/hicolor/16x16/apps/valknut.png
+%{_datadir}/icons/hicolor/22x22/apps/valknut.png
+%{_datadir}/icons/hicolor/24x24/apps/valknut.png
+%{_datadir}/icons/hicolor/32x32/apps/valknut.png
+%{_datadir}/icons/hicolor/48x48/apps/valknut.png
+%{_datadir}/icons/hicolor/64x64/apps/valknut.png
+%{_mandir}/man1/valknut.1.gz
 
 %changelog
+* Wed Jan 28 2009 Milos Jakubicek <xjakub at fi.muni.cz> - 0.4.8-1
+- Update to 0.4.8
+- Switch to QT4
+- Removed Source2:valknut.png (part of the source package now)
+- Fixed desktop file
+- Man pages
+- Many bugfixes, code cleanup etc.
+- Upload slot changes
+- Major feature changes (together with dclib) mentioned in NEWS from 0.4.0 to 0.4.7:
+  0.4.6: Segment size adjustable, Download folders from search, Warnings about settings,
+  0.4.5: More search results returned, Switching active/passive mode, StrongDC compatible encryption,
+  Partial list uploads, Search window improvements, User list icon changes
+  0.4.0: Nick tab completion improvements, Chat command improvements, Filelist storage changes, 
+  Public hubs display improved, /rebuild command fixed and improved, Folder search results
+
+* Sun Jan 18 2009 Tomas Mraz <tmraz at redhat.com> 0.3.11-5
+- rebuild with new openssl
+
 * Fri Apr 04 2008 Luke Macken <lmacken at redhat.com> 0.3.11-4
 - Add qt3-devel to BuildRequires to fix build issue (#440837)
 



From maxamillion at fedoraproject.org  Thu Jan 29 14:12:58 2009
From: maxamillion at fedoraproject.org (Adam Miller)
Date: Thu, 29 Jan 2009 14:12:58 +0000 (UTC)
Subject: rpms/fail2ban/EL-5 fail2ban.spec,1.1,1.2
Message-ID: <20090129141258.87B5770116@cvs1.fedora.phx.redhat.com>

Author: maxamillion

Update of /cvs/extras/rpms/fail2ban/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv539

Modified Files:
	fail2ban.spec 
Log Message:
Edited changelog for the EL5 branch




Index: fail2ban.spec
===================================================================
RCS file: /cvs/extras/rpms/fail2ban/EL-5/fail2ban.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- fail2ban.spec	30 Dec 2006 19:12:03 -0000	1.1
+++ fail2ban.spec	29 Jan 2009 14:12:28 -0000	1.2
@@ -65,6 +65,9 @@
 %{_mandir}/man5/fail2ban.conf.5*
 
 %changelog
+* Thu Jan 29 2009 Adam Miller <maxamillion [AT] gmail.com - 0.6.2-3
+- Rebuild for EPEL - EL5
+
 * Sat Dec 30 2006 Axel Thimm <Axel.Thimm at ATrpms.net> - 0.6.2-3
 - Remove forgotten condrestart.
 



From maxamillion at fedoraproject.org  Thu Jan 29 14:16:32 2009
From: maxamillion at fedoraproject.org (Adam Miller)
Date: Thu, 29 Jan 2009 14:16:32 +0000 (UTC)
Subject: rpms/fail2ban/EL-4 fail2ban.spec,1.1,1.2
Message-ID: <20090129141632.734BC70116@cvs1.fedora.phx.redhat.com>

Author: maxamillion

Update of /cvs/extras/rpms/fail2ban/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1222

Modified Files:
	fail2ban.spec 
Log Message:
Changelog entry for EPEL rebuild




Index: fail2ban.spec
===================================================================
RCS file: /cvs/extras/rpms/fail2ban/EL-4/fail2ban.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- fail2ban.spec	30 Dec 2006 19:12:03 -0000	1.1
+++ fail2ban.spec	29 Jan 2009 14:16:02 -0000	1.2
@@ -65,6 +65,9 @@
 %{_mandir}/man5/fail2ban.conf.5*
 
 %changelog
+* Thu Jan 29 2009 Adam Miller <maxamillion [AT] gmail.com> - 0.6.2-3
+- Rebuild for EPEL - EL4
+
 * Sat Dec 30 2006 Axel Thimm <Axel.Thimm at ATrpms.net> - 0.6.2-3
 - Remove forgotten condrestart.
 



From jnovy at fedoraproject.org  Thu Jan 29 14:22:00 2009
From: jnovy at fedoraproject.org (Jindrich Novy)
Date: Thu, 29 Jan 2009 14:22:00 +0000 (UTC)
Subject: rpms/netpbm/devel .cvsignore, 1.49, 1.50 netpbm.spec, 1.130,
	1.131 sources, 1.53, 1.54
Message-ID: <20090129142200.0E1C470117@cvs1.fedora.phx.redhat.com>

Author: jnovy

Update of /cvs/pkgs/rpms/netpbm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2832

Modified Files:
	.cvsignore netpbm.spec sources 
Log Message:
* Thu Jan 29 2009 Jindrich Novy <jnovy at redhat.com> 10.35.59-1
- update to 10.35.59
- fixes array bound violation in ilbmtoppm
- fixes garbage output when input in fitstopnm is little endian
  floating point FITS



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/netpbm/devel/.cvsignore,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- .cvsignore	19 Jan 2009 08:54:39 -0000	1.49
+++ .cvsignore	29 Jan 2009 14:21:29 -0000	1.50
@@ -1 +1 @@
-netpbm-10.35.58.tar.bz2
+netpbm-10.35.59.tar.bz2


Index: netpbm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/netpbm/devel/netpbm.spec,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -r1.130 -r1.131
--- netpbm.spec	28 Jan 2009 18:25:26 -0000	1.130
+++ netpbm.spec	29 Jan 2009 14:21:29 -0000	1.131
@@ -1,7 +1,7 @@
 Summary: A library for handling different graphics file formats
 Name: netpbm
-Version: 10.35.58
-Release: 4%{?dist}
+Version: 10.35.59
+Release: 1%{?dist}
 # See copyright_summary for details
 License: BSD and GPLv2 and IJG and MIT and Public Domain
 Group: System Environment/Libraries
@@ -227,6 +227,12 @@
 %{_datadir}/netpbm/
 
 %changelog
+* Thu Jan 29 2009 Jindrich Novy <jnovy at redhat.com> 10.35.59-1
+- update to 10.35.59
+- fixes array bound violation in ilbmtoppm
+- fixes garbage output when input in fitstopnm is little endian
+  floating point FITS
+
 * Wed Jan 28 2009 Jindrich Novy <jnovy at redhat.com> 10.35.58-4
 - fix segfault in ximtoppm (#482891), the utility lacked the
   command line parsing initialization code


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/netpbm/devel/sources,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- sources	19 Jan 2009 08:54:40 -0000	1.53
+++ sources	29 Jan 2009 14:21:29 -0000	1.54
@@ -1 +1 @@
-f4e789971594212d0be2d8fd1e8a00ac  netpbm-10.35.58.tar.bz2
+77aeea6898f28757c5ab0a4ae65f4d5b  netpbm-10.35.59.tar.bz2



From rrakus at fedoraproject.org  Thu Jan 29 14:21:51 2009
From: rrakus at fedoraproject.org (Roman Rakus)
Date: Thu, 29 Jan 2009 14:21:51 +0000 (UTC)
Subject: rpms/bash/devel bash-4.0-no_debug_output.patch, 1.1, 1.2 bash.spec, 
	1.171, 1.172
Message-ID: <20090129142151.74FD970117@cvs1.fedora.phx.redhat.com>

Author: rrakus

Update of /cvs/extras/rpms/bash/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2935

Modified Files:
	bash-4.0-no_debug_output.patch bash.spec 
Log Message:
Resolves: #483002. No more debug output

bash-4.0-no_debug_output.patch:

Index: bash-4.0-no_debug_output.patch
===================================================================
RCS file: /cvs/extras/rpms/bash/devel/bash-4.0-no_debug_output.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- bash-4.0-no_debug_output.patch	26 Jan 2009 11:50:44 -0000	1.1
+++ bash-4.0-no_debug_output.patch	29 Jan 2009 14:21:50 -0000	1.2
@@ -1,12 +1,39 @@
-diff -up bash-4.0/builtins/evalstring.c.rr bash-4.0/builtins/evalstring.c
---- bash-4.0/builtins/evalstring.c.rr	2009-01-26 04:40:10.000000000 -0500
-+++ bash-4.0/builtins/evalstring.c	2009-01-26 04:40:52.000000000 -0500
-@@ -268,7 +268,7 @@ parse_and_execute (string, from_file, fl
+diff -up bash-4.0-rc1/error.h.no_debug_output bash-4.0-rc1/error.h
+--- bash-4.0-rc1/error.h.no_debug_output	2009-01-08 14:32:45.000000000 +0100
++++ bash-4.0-rc1/error.h	2009-01-29 14:39:16.000000000 +0100
+@@ -51,8 +51,10 @@ extern void internal_error __P((const ch
+ extern void internal_warning __P((const char *, ...))  __attribute__((__format__ (printf, 1, 2)));
+ 
+ /* Debugging functions, not enabled in released version. */
++#if defined (DEBUG)
+ extern void itrace __P((const char *, ...)) __attribute__ ((__format__ (printf, 1, 2)));
+ extern void trace __P((const char *, ...)) __attribute__ ((__format__ (printf, 1, 2)));
++#endif
+ 
+ /* Report an error having to do with command parsing or execution. */
+ extern void command_error __P((const char *, int, int, int));
+diff -up bash-4.0-rc1/builtins/evalstring.c.no_debug_output bash-4.0-rc1/builtins/evalstring.c
+--- bash-4.0-rc1/builtins/evalstring.c.no_debug_output	2009-01-04 20:32:22.000000000 +0100
++++ bash-4.0-rc1/builtins/evalstring.c	2009-01-29 14:39:16.000000000 +0100
+@@ -268,7 +268,9 @@ parse_and_execute (string, from_file, fl
  	      if ((subshell_environment & SUBSHELL_COMSUB) && comsub_ignore_return)
  {
  		command->flags |= CMD_IGNORE_RETURN;
--itrace("parse_and_execute: turned on CMD_IGNORE_RETURN from comsub_ignore_return");
-+/* itrace("parse_and_execute: turned on CMD_IGNORE_RETURN from comsub_ignore_return"); */
++#if defined (DEBUG)
+ itrace("parse_and_execute: turned on CMD_IGNORE_RETURN from comsub_ignore_return");
++#endif
  }
  
  #if defined (ONESHOT)
+diff -up bash-4.0-rc1/Makefile.in.no_debug_output bash-4.0-rc1/Makefile.in
+--- bash-4.0-rc1/Makefile.in.no_debug_output	2009-01-29 14:40:11.000000000 +0100
++++ bash-4.0-rc1/Makefile.in	2009-01-29 14:40:54.000000000 +0100
+@@ -112,7 +112,7 @@ VENDOR = @host_vendor@
+ MACHTYPE = @host@
+ 
+ # comment out for release
+-DEBUG = @DEBUG@
++#DEBUG = @DEBUG@
+ MALLOC_DEBUG = @MALLOC_DEBUG@
+ 
+ THIS_SH = $(BUILD_DIR)/$(Program)


Index: bash.spec
===================================================================
RCS file: /cvs/extras/rpms/bash/devel/bash.spec,v
retrieving revision 1.171
retrieving revision 1.172
diff -u -r1.171 -r1.172
--- bash.spec	29 Jan 2009 06:38:35 -0000	1.171
+++ bash.spec	29 Jan 2009 14:21:50 -0000	1.172
@@ -3,7 +3,7 @@
 Version: 4.0
 Name: bash
 Summary: The GNU Bourne Again shell version %{version}
-Release: 0.2.%{?beta_tag}%{?dist}
+Release: 0.3.%{?beta_tag}%{?dist}
 Group: System Environment/Shells
 License: GPLv2+
 Url: http://www.gnu.org/software/bash
@@ -242,6 +242,10 @@
 #%doc doc/*.ps doc/*.0 doc/*.html doc/article.txt
 
 %changelog
+* Thu Jan 29 2009 Roman Rakus <rrakus at redhat.com> - 4.0-0.3.rc1
+- No more debug output
+  Resolves: #483002
+
 * Wed Jan 28 2009 Jesse Keating <jkeating at redhat.com> - 4.0-0.2.rc1
 - Replace post code with lua to be able to not have external deps
 



From rezso at fedoraproject.org  Thu Jan 29 14:22:26 2009
From: rezso at fedoraproject.org (Balint Cristian)
Date: Thu, 29 Jan 2009 14:22:26 +0000 (UTC)
Subject: rpms/gdal/devel .cvsignore, 1.12, 1.13 gdal.spec, 1.56,
	1.57 import.log, 1.8, 1.9 sources, 1.12, 1.13
Message-ID: <20090129142226.E082E70117@cvs1.fedora.phx.redhat.com>

Author: rezso

Update of /cvs/pkgs/rpms/gdal/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2956/devel

Modified Files:
	.cvsignore gdal.spec import.log sources 
Log Message:
- email change
- rebuild without grass



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gdal/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	12 Dec 2008 03:03:53 -0000	1.12
+++ .cvsignore	29 Jan 2009 14:21:56 -0000	1.13
@@ -1,2 +1,2 @@
-gdalautotest-1.6.0.tar.gz
 gdal-1.6.0-fedora.tar.gz
+gdalautotest-1.6.0.tar.gz


Index: gdal.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdal/devel/gdal.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- gdal.spec	12 Dec 2008 03:03:54 -0000	1.56
+++ gdal.spec	29 Jan 2009 14:21:56 -0000	1.57
@@ -1,6 +1,6 @@
 Name:      gdal
 Version:   1.6.0
-Release:   1%{?dist}
+Release:   2%{?dist}
 Summary:   GIS file format library
 Group:     System Environment/Libraries
 License:   MIT
@@ -23,7 +23,7 @@
 %endif
 
 # enable/disable grass support, for bootstrapping
-%define grass_support 1
+%define grass_support 0
 # enable/disable refman generation
 %define build_refman  1
 
@@ -528,6 +528,10 @@
 %endif
 
 %changelog
+* Thu Jan 29 2009 Balint Cristian <crisitan.balint at gmail.com> - 1.6.0-2
+- email change
+- rebuild without grass
+
 * Fri Dec 12 2008 Balint Cristian <rezso at rdsor.ro> - 1.6.0-1
 - final stable release
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/gdal/devel/import.log,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- import.log	12 Dec 2008 03:03:54 -0000	1.8
+++ import.log	29 Jan 2009 14:21:56 -0000	1.9
@@ -4,3 +4,4 @@
 gdal-1_6_0-0_1_rc4_fc11:HEAD:gdal-1.6.0-0.1.rc4.fc11.src.rpm:1228594658
 gdal-1_6_0-0_2_rc4_fc11:HEAD:gdal-1.6.0-0.2.rc4.fc11.src.rpm:1228602531
 gdal-1_6_0-1_fc11:HEAD:gdal-1.6.0-1.fc11.src.rpm:1229050992
+gdal-1_6_0-2_fc11:HEAD:gdal-1.6.0-2.fc11.src.rpm:1233238875


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gdal/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	12 Dec 2008 03:03:54 -0000	1.12
+++ sources	29 Jan 2009 14:21:56 -0000	1.13
@@ -1,2 +1,2 @@
-8ca6f8b83e0afb7a79040ac19c5b0b76  gdalautotest-1.6.0.tar.gz
 0dab181425d963c2cdf541806a37fde9  gdal-1.6.0-fedora.tar.gz
+8ca6f8b83e0afb7a79040ac19c5b0b76  gdalautotest-1.6.0.tar.gz



From notting at fedoraproject.org  Thu Jan 29 14:23:53 2009
From: notting at fedoraproject.org (Bill Nottingham)
Date: Thu, 29 Jan 2009 14:23:53 +0000 (UTC)
Subject: comps comps-f11.xml.in,1.87,1.88
Message-ID: <20090129142353.D15FB70117@cvs1.fedora.phx.redhat.com>

Author: notting

Update of /cvs/extras/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3477

Modified Files:
	comps-f11.xml.in 
Log Message:
Add fedora-release-notes to Base (#483019)


Index: comps-f11.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-f11.xml.in,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -r1.87 -r1.88
--- comps-f11.xml.in	28 Jan 2009 19:48:47 -0000	1.87
+++ comps-f11.xml.in	29 Jan 2009 14:23:23 -0000	1.88
@@ -212,6 +212,7 @@
       <packagereq type="default">dump</packagereq>
       <packagereq type="default">eject</packagereq>
       <packagereq type="default">fbset</packagereq>
+      <packagereq type="default">fedora-release-notes</packagereq>
       <packagereq type="default">finger</packagereq>
       <packagereq type="default">fprintd-pam</packagereq>
       <packagereq type="default">ftp</packagereq>



From rezso at fedoraproject.org  Thu Jan 29 14:28:51 2009
From: rezso at fedoraproject.org (Balint Cristian)
Date: Thu, 29 Jan 2009 14:28:51 +0000 (UTC)
Subject: rpms/grass/devel grass.spec,1.22,1.23 import.log,1.4,1.5
Message-ID: <20090129142851.858ED70117@cvs1.fedora.phx.redhat.com>

Author: rezso

Update of /cvs/pkgs/rpms/grass/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4187/devel

Modified Files:
	grass.spec import.log 
Log Message:
- email change
- rebuild for new mysq



Index: grass.spec
===================================================================
RCS file: /cvs/pkgs/rpms/grass/devel/grass.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- grass.spec	6 Dec 2008 23:13:19 -0000	1.22
+++ grass.spec	29 Jan 2009 14:28:21 -0000	1.23
@@ -1,6 +1,6 @@
 Name:      grass
 Version:   6.3.0
-Release:   9%{?dist}
+Release:   10%{?dist}
 Summary:   GRASS - Geographic Resources Analysis Support System
 Group:     Applications/Engineering
 License:   GPLv2
@@ -329,6 +329,10 @@
 %{_libdir}/libgrass_*.so
 
 %changelog
+* Thu Jan 29 2009 Balint Cristian <crisitan.balint at gmail.com> - 6.3.0-10
+- email change
+- rebuild for new mysql
+
 * Sun Dec 07 2008 Balint Cristian <rezso at rdsor.ro> 6.3.0-9
 - rebuild against newer gdal
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/grass/devel/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- import.log	6 Dec 2008 23:13:19 -0000	1.4
+++ import.log	29 Jan 2009 14:28:21 -0000	1.5
@@ -2,3 +2,4 @@
 grass-6_3_0-6_fc9:HEAD:grass-6.3.0-6.fc9.src.rpm:1219599484
 grass-6_3_0-8_fc11:HEAD:grass-6.3.0-8.fc11.src.rpm:1228601307
 grass-6_3_0-9_fc11:HEAD:grass-6.3.0-9.fc11.src.rpm:1228605160
+grass-6_3_0-10_fc11:HEAD:grass-6.3.0-10.fc11.src.rpm:1233239259



From mjakubicek at fedoraproject.org  Thu Jan 29 14:30:02 2009
From: mjakubicek at fedoraproject.org (=?utf-8?b?TWlsb8WhIEpha3Viw63EjWVr?=)
Date: Thu, 29 Jan 2009 14:30:02 +0000 (UTC)
Subject: rpms/valknut/devel valknut.desktop,1.2,1.3
Message-ID: <20090129143002.0C94B70117@cvs1.fedora.phx.redhat.com>

Author: mjakubicek

Update of /cvs/pkgs/rpms/valknut/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4416

Modified Files:
	valknut.desktop 
Log Message:
-fixed desktop file, this time really.




Index: valknut.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/valknut/devel/valknut.desktop,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- valknut.desktop	30 Apr 2006 23:51:49 -0000	1.2
+++ valknut.desktop	29 Jan 2009 14:29:31 -0000	1.3
@@ -2,7 +2,7 @@
 Encoding=UTF-8
 Name=Valknut
 Comment=Direct Connect client
-Icon=valknut.png
+Icon=valknut
 Exec=valknut --disable-tray
 Terminal=false
 Type=Application



From ovasik at fedoraproject.org  Thu Jan 29 14:32:57 2009
From: ovasik at fedoraproject.org (Ondrej Vasik)
Date: Thu, 29 Jan 2009 14:32:57 +0000 (UTC)
Subject: rpms/docbook-style-xsl/devel docbook-xsl-rtl.patch, NONE,
	1.1 docbook-style-xsl.spec, 1.50, 1.51
Message-ID: <20090129143257.A7A3C70117@cvs1.fedora.phx.redhat.com>

Author: ovasik

Update of /cvs/extras/rpms/docbook-style-xsl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5025

Modified Files:
	docbook-style-xsl.spec 
Added Files:
	docbook-xsl-rtl.patch 
Log Message:
fix xsl stylesheets for rtl languages like Arabic(#475077)

docbook-xsl-rtl.patch:

--- NEW FILE docbook-xsl-rtl.patch ---
diff -urNp docbook-xsl-1.74.0-orig/common/af.xml docbook-xsl-1.74.0/common/af.xml
--- docbook-xsl-1.74.0-orig/common/af.xml	2008-06-02 01:05:17.000000000 +0200
+++ docbook-xsl-1.74.0/common/af.xml	2009-01-28 15:03:48.000000000 +0100
@@ -199,6 +199,7 @@
 <l:gentext key="below" text="onder"/>
 <l:gentext key="sectioncalled" text="die seksie genaamd"/>
 <l:gentext key="index symbols" text="indeks simbole"/>
+<l:gentext key="writing-mode" text="lr-tb"/>
 <l:gentext key="lowercase.alpha" text="abcdefghijklmnopqrstuvwxyz"/>
 <l:gentext key="uppercase.alpha" text="ABCDEFGHIJKLMNOPQRSTUVWXYZ"/>
 <l:gentext key="normalize.sort.input" text="Aa?????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????Bb????????????????????????????Cc????????????????????????????????Dd??????????????????????????????????????????????????????Ee??????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????Ff??????????Gg??????????????????????????????????????Hh???????????????????????????????????????????????Ii??????????????????????????????????????????????????????????????????????????Jj????????Kk??????????????????????????????Ll????????????????????????????????????????????????????????Mm????????????????????Nn??????????????????????????????????????????????????????????Oo??????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????Pp?????????
 ???????Qq??Rr??????????????????????????????????????????????????Ss????????????????????????????????????????????????????Tt???????????????????????????????????????????????????????Uu????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????Vv????????????????Ww?????????????????????????????????????Xx????????????Yy?????????????????????????????????????????????????????Zz?????????????????????????????????????????????" lang="en"/>
diff -urNp docbook-xsl-1.74.0-orig/common/am.xml docbook-xsl-1.74.0/common/am.xml
--- docbook-xsl-1.74.0-orig/common/am.xml	2008-06-02 01:05:18.000000000 +0200
+++ docbook-xsl-1.74.0/common/am.xml	2009-01-28 15:04:32.000000000 +0100
@@ -199,6 +199,7 @@
 <l:gentext key="below" text="?????????"/>
 <l:gentext key="sectioncalled" text="???????????? ????????????"/>
 <l:gentext key="index symbols" text="???????????????"/>
+<l:gentext key="writing-mode" text="lr-tb"/>
 <l:gentext key="lowercase.alpha" text="abcdefghijklmnopqrstuvwxyz"/>
 <l:gentext key="uppercase.alpha" text="ABCDEFGHIJKLMNOPQRSTUVWXYZ"/>
 <l:gentext key="normalize.sort.input" text="Aa?????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????Bb????????????????????????????Cc????????????????????????????????Dd??????????????????????????????????????????????????????Ee??????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????Ff??????????Gg??????????????????????????????????????Hh???????????????????????????????????????????????Ii??????????????????????????????????????????????????????????????????????????Jj????????Kk??????????????????????????????Ll????????????????????????????????????????????????????????Mm????????????????????Nn??????????????????????????????????????????????????????????Oo??????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????Pp?????????
 ???????Qq??Rr??????????????????????????????????????????????????Ss????????????????????????????????????????????????????Tt???????????????????????????????????????????????????????Uu????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????Vv????????????????Ww?????????????????????????????????????Xx????????????Yy?????????????????????????????????????????????????????Zz?????????????????????????????????????????????" lang="en"/>
diff -urNp docbook-xsl-1.74.0-orig/common/ar.xml docbook-xsl-1.74.0/common/ar.xml
--- docbook-xsl-1.74.0-orig/common/ar.xml	2008-06-02 01:05:19.000000000 +0200
+++ docbook-xsl-1.74.0/common/ar.xml	2009-01-28 15:05:05.000000000 +0100
@@ -199,6 +199,7 @@
 <l:gentext key="below" text="???????? ??????"/>
 <l:gentext key="sectioncalled" text="?????????? ????????????"/>
 <l:gentext key="index symbols" text="????????????"/>
+<l:gentext key="writing-mode" text="rl-tb"/>
 <l:gentext key="lowercase.alpha" text="abcdefghijklmnopqrstuvwxyz"/>
 <l:gentext key="uppercase.alpha" text="ABCDEFGHIJKLMNOPQRSTUVWXYZ"/>
 <l:gentext key="normalize.sort.input" text="Aa?????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????Bb????????????????????????????Cc????????????????????????????????Dd??????????????????????????????????????????????????????Ee??????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????Ff??????????Gg??????????????????????????????????????Hh???????????????????????????????????????????????Ii??????????????????????????????????????????????????????????????????????????Jj????????Kk??????????????????????????????Ll????????????????????????????????????????????????????????Mm????????????????????Nn??????????????????????????????????????????????????????????Oo??????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????Pp?????????
 ???????Qq??Rr??????????????????????????????????????????????????Ss????????????????????????????????????????????????????Tt???????????????????????????????????????????????????????Uu????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????Vv????????????????Ww?????????????????????????????????????Xx????????????Yy?????????????????????????????????????????????????????Zz?????????????????????????????????????????????" lang="en"/>
diff -urNp docbook-xsl-1.74.0-orig/common/az.xml docbook-xsl-1.74.0/common/az.xml
--- docbook-xsl-1.74.0-orig/common/az.xml	2008-06-02 01:05:20.000000000 +0200
+++ docbook-xsl-1.74.0/common/az.xml	2009-01-28 15:05:36.000000000 +0100
@@ -199,6 +199,7 @@
 <l:gentext key="below" text="Alt??nda"/>
 <l:gentext key="sectioncalled" text=""/>
 <l:gentext key="index symbols" text="Simvollar"/>
+<l:gentext key="writing-mode" text="lr-tb"/>
 <l:gentext key="lowercase.alpha" text="abc??de??fg??hx??ijkqlmno??prs??tu??vyz"/>
 <l:gentext key="uppercase.alpha" text="ABC??DE??FG??HXI??JKQLMNO??PRS??TU??VYZ"/>
 <l:gentext key="normalize.sort.input" text="Aa?????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????Bb????????????????????????????Cc????????????????????????????????Dd??????????????????????????????????????????????????????Ee??????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????Ff??????????Gg??????????????????????????????????????Hh???????????????????????????????????????????????Ii??????????????????????????????????????????????????????????????????????????Jj????????Kk??????????????????????????????Ll????????????????????????????????????????????????????????Mm????????????????????Nn??????????????????????????????????????????????????????????Oo??????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????Pp?????????
 ???????Qq??Rr??????????????????????????????????????????????????Ss????????????????????????????????????????????????????Tt???????????????????????????????????????????????????????Uu????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????Vv????????????????Ww?????????????????????????????????????Xx????????????Yy?????????????????????????????????????????????????????Zz?????????????????????????????????????????????" lang="en"/>
diff -urNp docbook-xsl-1.74.0-orig/common/bg.xml docbook-xsl-1.74.0/common/bg.xml
--- docbook-xsl-1.74.0-orig/common/bg.xml	2008-06-02 01:05:21.000000000 +0200
+++ docbook-xsl-1.74.0/common/bg.xml	2009-01-28 15:05:59.000000000 +0100
@@ -199,6 +199,7 @@
 <l:gentext key="below" text="????-????????"/>
 <l:gentext key="sectioncalled" text="???????????????? ?????? ????????????????"/>
 <l:gentext key="index symbols" text="??????????????"/>
+<l:gentext key="writing-mode" text="lr-tb"/>
 <l:gentext key="lowercase.alpha" text="????????????????????????????????????????????????????????????????"/>
 <l:gentext key="uppercase.alpha" text="????????????????????????????????????????????????????????????????"/>
 <l:gentext key="normalize.sort.input" text="Aa?????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????Bb????????????????????????????Cc????????????????????????????????Dd??????????????????????????????????????????????????????Ee??????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????Ff??????????Gg??????????????????????????????????????Hh???????????????????????????????????????????????Ii??????????????????????????????????????????????????????????????????????????Jj????????Kk??????????????????????????????Ll????????????????????????????????????????????????????????Mm????????????????????Nn??????????????????????????????????????????????????????????Oo??????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????Pp?????????
 ???????Qq??Rr??????????????????????????????????????????????????Ss????????????????????????????????????????????????????Tt???????????????????????????????????????????????????????Uu????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????Vv????????????????Ww?????????????????????????????????????Xx????????????Yy?????????????????????????????????????????????????????Zz?????????????????????????????????????????????" lang="en"/>
diff -urNp docbook-xsl-1.74.0-orig/common/bn.xml docbook-xsl-1.74.0/common/bn.xml
--- docbook-xsl-1.74.0-orig/common/bn.xml	2008-06-02 01:05:21.000000000 +0200
+++ docbook-xsl-1.74.0/common/bn.xml	2009-01-28 15:06:27.000000000 +0100
@@ -199,6 +199,7 @@
 <l:gentext key="below" text="?????????"/>
 <l:gentext key="sectioncalled" text="????????????????????????"/>
 <l:gentext key="index symbols" text="??????????????????"/>
+<l:gentext key="writing-mode" text="lr-tb"/>
 <l:gentext key="lowercase.alpha" text="???????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????"/>
 <l:gentext key="uppercase.alpha" text="???????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????"/>
 <l:gentext key="normalize.sort.input" text="Aa?????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????Bb????????????????????????????Cc????????????????????????????????Dd??????????????????????????????????????????????????????Ee??????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????Ff??????????Gg??????????????????????????????????????Hh???????????????????????????????????????????????Ii??????????????????????????????????????????????????????????????????????????Jj????????Kk??????????????????????????????Ll????????????????????????????????????????????????????????Mm????????????????????Nn??????????????????????????????????????????????????????????Oo??????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????Pp?????????
 ???????Qq??Rr??????????????????????????????????????????????????Ss????????????????????????????????????????????????????Tt???????????????????????????????????????????????????????Uu????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????Vv????????????????Ww?????????????????????????????????????Xx????????????Yy?????????????????????????????????????????????????????Zz?????????????????????????????????????????????" lang="en"/>
diff -urNp docbook-xsl-1.74.0-orig/common/bs.xml docbook-xsl-1.74.0/common/bs.xml
--- docbook-xsl-1.74.0-orig/common/bs.xml	2008-06-02 01:05:22.000000000 +0200
+++ docbook-xsl-1.74.0/common/bs.xml	2009-01-28 15:06:48.000000000 +0100
@@ -199,6 +199,7 @@
 <l:gentext key="below" text="ispod"/>
 <l:gentext key="sectioncalled" text="odjeljak sa nazivom"/>
 <l:gentext key="index symbols" text="Simboli"/>
+<l:gentext key="writing-mode" text="lr-tb"/>
 <l:gentext key="lowercase.alpha" text="abc????d??efghijklmnoprs??tuvz??"/>
 <l:gentext key="uppercase.alpha" text="ABC????D??EFGHIJKLMNOPRS??TUVZ??"/>
 <l:gentext key="normalize.sort.input" text="Aa?????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????Bb????????????????????????????Cc????????????????????????????????Dd??????????????????????????????????????????????????????Ee??????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????Ff??????????Gg??????????????????????????????????????Hh???????????????????????????????????????????????Ii??????????????????????????????????????????????????????????????????????????Jj????????Kk??????????????????????????????Ll????????????????????????????????????????????????????????Mm????????????????????Nn??????????????????????????????????????????????????????????Oo??????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????Pp?????????
 ???????Qq??Rr??????????????????????????????????????????????????Ss????????????????????????????????????????????????????Tt???????????????????????????????????????????????????????Uu????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????Vv????????????????Ww?????????????????????????????????????Xx????????????Yy?????????????????????????????????????????????????????Zz?????????????????????????????????????????????" lang="en"/>
diff -urNp docbook-xsl-1.74.0-orig/common/ca.xml docbook-xsl-1.74.0/common/ca.xml
--- docbook-xsl-1.74.0-orig/common/ca.xml	2008-06-02 01:05:23.000000000 +0200
+++ docbook-xsl-1.74.0/common/ca.xml	2009-01-28 15:07:07.000000000 +0100
@@ -199,6 +199,7 @@
 <l:gentext key="below" text="baix"/>
 <l:gentext key="sectioncalled" text="secci?? anomenada"/>
 <l:gentext key="index symbols" text="S??mbols"/>
+<l:gentext key="writing-mode" text="lr-tb"/>
 <l:gentext key="lowercase.alpha" text="abcdefghijklmnopqrstuvwxyz??????????????????"/>
 <l:gentext key="uppercase.alpha" text="ABCDEFGHIJKLMNOPQRSTUVWXYZ??????????????????"/>
 <l:gentext key="normalize.sort.input" text="Aa?????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????Bb????????????????????????????Cc????????????????????????????????Dd??????????????????????????????????????????????????????Ee??????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????Ff??????????Gg??????????????????????????????????????Hh???????????????????????????????????????????????Ii??????????????????????????????????????????????????????????????????????????Jj????????Kk??????????????????????????????Ll????????????????????????????????????????????????????????Mm????????????????????Nn??????????????????????????????????????????????????????????Oo??????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????Pp?????????
 ???????Qq??Rr??????????????????????????????????????????????????Ss????????????????????????????????????????????????????Tt???????????????????????????????????????????????????????Uu????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????Vv????????????????Ww?????????????????????????????????????Xx????????????Yy?????????????????????????????????????????????????????Zz?????????????????????????????????????????????" lang="en"/>
diff -urNp docbook-xsl-1.74.0-orig/common/cs.xml docbook-xsl-1.74.0/common/cs.xml
--- docbook-xsl-1.74.0-orig/common/cs.xml	2008-06-02 01:05:24.000000000 +0200
+++ docbook-xsl-1.74.0/common/cs.xml	2009-01-28 15:07:31.000000000 +0100
@@ -199,6 +199,7 @@
 <l:gentext key="below" text="pod"/>
 <l:gentext key="sectioncalled" text="odd??l nazvan??"/>
 <l:gentext key="index symbols" text="Symboly"/>
+<l:gentext key="writing-mode" text="lr-tb"/>
 <l:gentext key="lowercase.alpha" text="a??bc??d??e????fghi??jklmn??o??pqr??s??t??u????vwxy??z??"/>
 <l:gentext key="uppercase.alpha" text="A??BC??D??E????FGHI??JKLMN??O??PQR??S??T??U????VWXY??Z??"/>
 <l:gentext key="normalize.sort.input" text="a??bc??d??e????fghi??jklmn??o??pqr??s??t??u????vwxy??z??"/>
diff -urNp docbook-xsl-1.74.0-orig/common/cy.xml docbook-xsl-1.74.0/common/cy.xml
--- docbook-xsl-1.74.0-orig/common/cy.xml	2008-06-02 01:05:25.000000000 +0200
+++ docbook-xsl-1.74.0/common/cy.xml	2009-01-28 15:07:51.000000000 +0100
@@ -199,6 +199,7 @@
 <l:gentext key="below" text="isod"/>
 <l:gentext key="sectioncalled" text="yr adran o'r enw"/>
 <l:gentext key="index symbols" text="Symbolau"/>
+<l:gentext key="writing-mode" text="lr-tb"/>
 <l:gentext key="lowercase.alpha" text="abcdefghijklmnopqrstuvwxyz"/>
 <l:gentext key="uppercase.alpha" text="ABCDEFGHIJKLMNOPQRSTUVWXYZ"/>
 <l:gentext key="normalize.sort.input" text="Aa?????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????Bb????????????????????????????Cc????????????????????????????????Dd??????????????????????????????????????????????????????Ee??????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????Ff??????????Gg??????????????????????????????????????Hh???????????????????????????????????????????????Ii??????????????????????????????????????????????????????????????????????????Jj????????Kk??????????????????????????????Ll????????????????????????????????????????????????????????Mm????????????????????Nn??????????????????????????????????????????????????????????Oo??????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????Pp?????????
 ???????Qq??Rr??????????????????????????????????????????????????Ss????????????????????????????????????????????????????Tt???????????????????????????????????????????????????????Uu????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????Vv????????????????Ww?????????????????????????????????????Xx????????????Yy?????????????????????????????????????????????????????Zz?????????????????????????????????????????????" lang="en"/>
diff -urNp docbook-xsl-1.74.0-orig/common/da.xml docbook-xsl-1.74.0/common/da.xml
--- docbook-xsl-1.74.0-orig/common/da.xml	2008-06-02 01:05:26.000000000 +0200
+++ docbook-xsl-1.74.0/common/da.xml	2009-01-28 15:08:11.000000000 +0100
@@ -199,6 +199,7 @@
 <l:gentext key="below" text="under"/>
 <l:gentext key="sectioncalled" text="afsnittet der hedder"/>
 <l:gentext key="index symbols" text="symboler"/>
+<l:gentext key="writing-mode" text="lr-tb"/>
 <l:gentext key="lowercase.alpha" text="abcdefghijklmnopqrstuvwxyz??????"/>
 <l:gentext key="uppercase.alpha" text="ABCDEFGHIJKLMNOPQRSTUVWXYZ??????"/>
 <l:gentext key="normalize.sort.input" text="Aa?????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????Bb????????????????????????????Cc????????????????????????????????Dd??????????????????????????????????????????????????????Ee??????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????Ff??????????Gg??????????????????????????????????????Hh???????????????????????????????????????????????Ii??????????????????????????????????????????????????????????????????????????Jj????????Kk??????????????????????????????Ll????????????????????????????????????????????????????????Mm????????????????????Nn??????????????????????????????????????????????????????????Oo??????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????Pp?????????
 ???????Qq??Rr??????????????????????????????????????????????????Ss????????????????????????????????????????????????????Tt???????????????????????????????????????????????????????Uu????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????Vv????????????????Ww?????????????????????????????????????Xx????????????Yy?????????????????????????????????????????????????????Zz?????????????????????????????????????????????" lang="en"/>
diff -urNp docbook-xsl-1.74.0-orig/common/de.xml docbook-xsl-1.74.0/common/de.xml
--- docbook-xsl-1.74.0-orig/common/de.xml	2008-06-02 01:05:27.000000000 +0200
+++ docbook-xsl-1.74.0/common/de.xml	2009-01-28 15:08:35.000000000 +0100
@@ -199,6 +199,7 @@
 <l:gentext key="below" text="unten"/>
 <l:gentext key="sectioncalled" text="der Abschnitt namens"/>
 <l:gentext key="index symbols" text="Symbole"/>
+<l:gentext key="writing-mode" text="lr-tb"/>
 <l:gentext key="lowercase.alpha" text="abcdefghijklmnopqrstuvwxyz????????"/>
 <l:gentext key="uppercase.alpha" text="ABCDEFGHIJKLMNOPQRSTUVWXYZ????????"/>
 <l:gentext key="normalize.sort.input" text="Aa?????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????Bb????????????????????????????Cc????????????????????????????????Dd??????????????????????????????????????????????????????Ee??????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????Ff??????????Gg??????????????????????????????????????Hh???????????????????????????????????????????????Ii??????????????????????????????????????????????????????????????????????????Jj????????Kk??????????????????????????????Ll????????????????????????????????????????????????????????Mm????????????????????Nn??????????????????????????????????????????????????????????Oo??????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????Pp?????????
 ???????Qq??Rr??????????????????????????????????????????????????Ss????????????????????????????????????????????????????Tt???????????????????????????????????????????????????????Uu????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????Vv????????????????Ww?????????????????????????????????????Xx????????????Yy?????????????????????????????????????????????????????Zz?????????????????????????????????????????????" lang="en"/>
diff -urNp docbook-xsl-1.74.0-orig/common/el.xml docbook-xsl-1.74.0/common/el.xml
--- docbook-xsl-1.74.0-orig/common/el.xml	2008-06-02 01:05:28.000000000 +0200
+++ docbook-xsl-1.74.0/common/el.xml	2009-01-28 15:08:54.000000000 +0100
@@ -199,6 +199,7 @@
 <l:gentext key="below" text="below"/>
 <l:gentext key="sectioncalled" text="the section called"/>
 <l:gentext key="index symbols" text="Symbols"/>
+<l:gentext key="writing-mode" text="lr-tb"/>
 <l:gentext key="lowercase.alpha" text="abcdefghijklmnopqrstuvwxyz"/>
 <l:gentext key="uppercase.alpha" text="ABCDEFGHIJKLMNOPQRSTUVWXYZ"/>
 <l:gentext key="normalize.sort.input" text="Aa?????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????Bb????????????????????????????Cc????????????????????????????????Dd??????????????????????????????????????????????????????Ee??????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????Ff??????????Gg??????????????????????????????????????Hh???????????????????????????????????????????????Ii??????????????????????????????????????????????????????????????????????????Jj????????Kk??????????????????????????????Ll????????????????????????????????????????????????????????Mm????????????????????Nn??????????????????????????????????????????????????????????Oo??????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????Pp?????????
 ???????Qq??Rr??????????????????????????????????????????????????Ss????????????????????????????????????????????????????Tt???????????????????????????????????????????????????????Uu????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????Vv????????????????Ww?????????????????????????????????????Xx????????????Yy?????????????????????????????????????????????????????Zz?????????????????????????????????????????????" lang="en"/>
diff -urNp docbook-xsl-1.74.0-orig/common/en.xml docbook-xsl-1.74.0/common/en.xml
--- docbook-xsl-1.74.0-orig/common/en.xml	2008-06-02 01:05:29.000000000 +0200
+++ docbook-xsl-1.74.0/common/en.xml	2009-01-28 15:09:10.000000000 +0100
@@ -199,6 +199,7 @@
 <l:gentext key="below" text="below"/>
 <l:gentext key="sectioncalled" text="the section called"/>
 <l:gentext key="index symbols" text="Symbols"/>
+<l:gentext key="writing-mode" text="lr-tb"/>
 <l:gentext key="lowercase.alpha" text="abcdefghijklmnopqrstuvwxyz"/>
 <l:gentext key="uppercase.alpha" text="ABCDEFGHIJKLMNOPQRSTUVWXYZ"/>
 <l:gentext key="normalize.sort.input" text="Aa?????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????Bb????????????????????????????Cc????????????????????????????????Dd??????????????????????????????????????????????????????Ee??????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????Ff??????????Gg??????????????????????????????????????Hh???????????????????????????????????????????????Ii??????????????????????????????????????????????????????????????????????????Jj????????Kk??????????????????????????????Ll????????????????????????????????????????????????????????Mm????????????????????Nn??????????????????????????????????????????????????????????Oo??????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????Pp?????????
 ???????Qq??Rr??????????????????????????????????????????????????Ss????????????????????????????????????????????????????Tt???????????????????????????????????????????????????????Uu????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????Vv????????????????Ww?????????????????????????????????????Xx????????????Yy?????????????????????????????????????????????????????Zz?????????????????????????????????????????????"/>
diff -urNp docbook-xsl-1.74.0-orig/common/eo.xml docbook-xsl-1.74.0/common/eo.xml
--- docbook-xsl-1.74.0-orig/common/eo.xml	2008-06-02 01:05:30.000000000 +0200
+++ docbook-xsl-1.74.0/common/eo.xml	2009-01-28 15:09:28.000000000 +0100
@@ -199,6 +199,7 @@
 <l:gentext key="below" text="suba"/>
 <l:gentext key="sectioncalled" text="la sekcio nomata"/>
 <l:gentext key="index symbols" text="Simboloj"/>
+<l:gentext key="writing-mode" text="lr-tb"/>
 <l:gentext key="lowercase.alpha" text="abc??defg??h??ij??klmnopqrs??tu??vyz"/>
 <l:gentext key="uppercase.alpha" text="ABC??DEFG??H??IJ??KLMNOPQRS??TU??VYZ"/>
 <l:gentext key="normalize.sort.input" text="Aa?????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????Bb????????????????????????????Cc????????????????????????????????Dd??????????????????????????????????????????????????????Ee??????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????Ff??????????Gg??????????????????????????????????????Hh???????????????????????????????????????????????Ii??????????????????????????????????????????????????????????????????????????Jj????????Kk??????????????????????????????Ll????????????????????????????????????????????????????????Mm????????????????????Nn??????????????????????????????????????????????????????????Oo??????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????Pp?????????
 ???????Qq??Rr??????????????????????????????????????????????????Ss????????????????????????????????????????????????????Tt???????????????????????????????????????????????????????Uu????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????Vv????????????????Ww?????????????????????????????????????Xx????????????Yy?????????????????????????????????????????????????????Zz?????????????????????????????????????????????" lang="en"/>
diff -urNp docbook-xsl-1.74.0-orig/common/es.xml docbook-xsl-1.74.0/common/es.xml
--- docbook-xsl-1.74.0-orig/common/es.xml	2008-06-02 01:05:31.000000000 +0200
+++ docbook-xsl-1.74.0/common/es.xml	2009-01-28 15:10:01.000000000 +0100
@@ -199,6 +199,7 @@
 <l:gentext key="below" text="abajo"/>
 <l:gentext key="sectioncalled" text="secci??n llamada"/>
 <l:gentext key="index symbols" text="S??mbolos"/>
+<l:gentext key="writing-mode" text="lr-tb"/>
 <l:gentext key="lowercase.alpha" text="abcdefghijklmnopqrstuvwxyz????????????"/>
 <l:gentext key="uppercase.alpha" text="ABCDEFGHIJKLMNOPQRSTUVWXYZ????????????"/>
 <l:gentext key="normalize.sort.input" text="Aa?????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????Bb????????????????????????????Cc????????????????????????????????Dd??????????????????????????????????????????????????????Ee??????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????Ff??????????Gg??????????????????????????????????????Hh???????????????????????????????????????????????Ii??????????????????????????????????????????????????????????????????????????Jj????????Kk??????????????????????????????Ll????????????????????????????????????????????????????????Mm????????????????????Nn??????????????????????????????????????????????????????????Oo??????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????Pp?????????
 ???????Qq??Rr??????????????????????????????????????????????????Ss????????????????????????????????????????????????????Tt???????????????????????????????????????????????????????Uu????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????Vv????????????????Ww?????????????????????????????????????Xx????????????Yy?????????????????????????????????????????????????????Zz?????????????????????????????????????????????" lang="en"/>
diff -urNp docbook-xsl-1.74.0-orig/common/et.xml docbook-xsl-1.74.0/common/et.xml
--- docbook-xsl-1.74.0-orig/common/et.xml	2008-06-02 01:05:32.000000000 +0200
+++ docbook-xsl-1.74.0/common/et.xml	2009-01-28 15:10:24.000000000 +0100
@@ -199,6 +199,7 @@
 <l:gentext key="below" text="below"/>
 <l:gentext key="sectioncalled" text="the section called"/>
 <l:gentext key="index symbols" text="Symbols"/>
+<l:gentext key="writing-mode" text="lr-tb"/>
 <l:gentext key="lowercase.alpha" text="abcdefghijklmnopqrstuvwxyz"/>
 <l:gentext key="uppercase.alpha" text="ABCDEFGHIJKLMNOPQRSTUVWXYZ"/>
 <l:gentext key="normalize.sort.input" text="Aa?????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????Bb????????????????????????????Cc????????????????????????????????Dd??????????????????????????????????????????????????????Ee??????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????Ff??????????Gg??????????????????????????????????????Hh???????????????????????????????????????????????Ii??????????????????????????????????????????????????????????????????????????Jj????????Kk??????????????????????????????Ll????????????????????????????????????????????????????????Mm????????????????????Nn??????????????????????????????????????????????????????????Oo??????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????Pp?????????
 ???????Qq??Rr??????????????????????????????????????????????????Ss????????????????????????????????????????????????????Tt???????????????????????????????????????????????????????Uu????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????Vv????????????????Ww?????????????????????????????????????Xx????????????Yy?????????????????????????????????????????????????????Zz?????????????????????????????????????????????" lang="en"/>
diff -urNp docbook-xsl-1.74.0-orig/common/eu.xml docbook-xsl-1.74.0/common/eu.xml
--- docbook-xsl-1.74.0-orig/common/eu.xml	2008-06-02 01:05:33.000000000 +0200
+++ docbook-xsl-1.74.0/common/eu.xml	2009-01-28 15:10:52.000000000 +0100
@@ -199,6 +199,7 @@
 <l:gentext key="below" text="behean"/>
 <l:gentext key="sectioncalled" text="honela deritzon atala"/>
 <l:gentext key="index symbols" text="Ikurrak"/>
+<l:gentext key="writing-mode" text="lr-tb"/>
 <l:gentext key="lowercase.alpha" text="abcdefghijklmnopqrstuvwxyz"/>
 <l:gentext key="uppercase.alpha" text="ABCDEFGHIJKLMNOPQRSTUVWXYZ"/>
 <l:gentext key="normalize.sort.input" text="Aa?????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????Bb????????????????????????????Cc????????????????????????????????Dd??????????????????????????????????????????????????????Ee??????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????Ff??????????Gg??????????????????????????????????????Hh???????????????????????????????????????????????Ii??????????????????????????????????????????????????????????????????????????Jj????????Kk??????????????????????????????Ll????????????????????????????????????????????????????????Mm????????????????????Nn??????????????????????????????????????????????????????????Oo??????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????Pp?????????
 ???????Qq??Rr??????????????????????????????????????????????????Ss????????????????????????????????????????????????????Tt???????????????????????????????????????????????????????Uu????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????Vv????????????????Ww?????????????????????????????????????Xx????????????Yy?????????????????????????????????????????????????????Zz?????????????????????????????????????????????" lang="en"/>
diff -urNp docbook-xsl-1.74.0-orig/common/fa.xml docbook-xsl-1.74.0/common/fa.xml
[...1796 lines suppressed...]
               </th>
-              <td align="right">
+              <td align="{$direction.align.end}">
                 <xsl:text>&#160;</xsl:text>
                 <xsl:if test="count($next)&gt;0">
                   <a accesskey="n">
@@ -1243,7 +1243,7 @@
         <table width="100%" summary="Navigation footer">
           <xsl:if test="$row1">
             <tr>
-              <td align="left">
+              <td align="{$direction.align.start}">
                 <xsl:if test="count($prev)&gt;0">
                   <a accesskey="p">
                     <xsl:attribute name="href">
@@ -1275,7 +1275,7 @@
                   <xsl:otherwise>&#160;</xsl:otherwise>
                 </xsl:choose>
               </td>
-              <td align="right">
+              <td align="{$direction.align.end}">
                 <xsl:text>&#160;</xsl:text>
                 <xsl:if test="count($next)&gt;0">
                   <a accesskey="n">
@@ -1295,7 +1295,7 @@
 
           <xsl:if test="$row2">
             <tr>
-              <td align="left" valign="top">
+              <td align="{$direction.align.start}" valign="top">
                 <xsl:if test="$navig.showtitles != 0">
                   <xsl:apply-templates select="$prev" mode="object.title.markup"/>
                 </xsl:if>
@@ -1336,7 +1336,7 @@
                   </a>
                 </xsl:if>
               </td>
-              <td align="right" valign="top">
+              <td align="{$direction.align.end}" valign="top">
                 <xsl:text>&#160;</xsl:text>
                 <xsl:if test="$navig.showtitles != 0">
                   <xsl:apply-templates select="$next" mode="object.title.markup"/>
diff -urNp docbook-xsl-1.74.0-orig/xhtml-1_1/lists.xsl docbook-xsl-1.74.0/xhtml-1_1/lists.xsl
--- docbook-xsl-1.74.0-orig/xhtml-1_1/lists.xsl	2008-06-02 01:06:40.000000000 +0200
+++ docbook-xsl-1.74.0/xhtml-1_1/lists.xsl	2009-01-28 14:55:52.000000000 +0100
@@ -137,7 +137,7 @@
     <xsl:choose>
       <xsl:when test="@inheritnum='inherit' and ancestor::listitem[parent::orderedlist]">
 	<table border="0">
-	  <col align="left" valign="top"/>
+	  <col align="{$direction.align.start}" valign="top"/>
           <tbody>
 	    <xsl:apply-templates mode="orderedlist-table" select="listitem    |comment()[preceding-sibling::listitem]    |processing-instruction()[preceding-sibling::listitem]"/>
           </tbody>
@@ -263,7 +263,7 @@
               <xsl:value-of select="$table-summary"/>
             </xsl:attribute>
           </xsl:if>
-          <col align="left" valign="top">
+          <col align="{$direction.align.start}" valign="top">
             <xsl:if test="$term-width != ''">
               <xsl:attribute name="width">
                 <xsl:value-of select="$term-width"/>
@@ -907,7 +907,7 @@
           </xsl:with-param>
         </xsl:call-template>
 
-        <td valign="top" align="left">
+        <td valign="top" align="{$direction.align.start}">
           <p>
             <xsl:call-template name="anchor"/>
             <xsl:call-template name="callout.arearefs">
@@ -915,7 +915,7 @@
             </xsl:call-template>
           </p>
         </td>
-        <td valign="top" align="left">
+        <td valign="top" align="{$direction.align.start}">
           <xsl:apply-templates/>
         </td>
       </tr>
diff -urNp docbook-xsl-1.74.0-orig/xhtml-1_1/qandaset.xsl docbook-xsl-1.74.0/xhtml-1_1/qandaset.xsl
--- docbook-xsl-1.74.0-orig/xhtml-1_1/qandaset.xsl	2008-06-02 01:06:41.000000000 +0200
+++ docbook-xsl-1.74.0/xhtml-1_1/qandaset.xsl	2009-01-28 14:55:52.000000000 +0100
@@ -65,7 +65,7 @@
 
   <xsl:if test="blockinfo/title|info/title|title">
     <tr class="qandadiv">
-      <td align="left" valign="top" colspan="2">
+      <td align="{$direction.align.start}" valign="top" colspan="2">
         <xsl:apply-templates select="(blockinfo/title|info/title|title)[1]"/>
       </td>
     </tr>
@@ -83,14 +83,14 @@
 
   <xsl:if test="(contains($toc.params, 'toc') and $toc != '0') or $toc = '1'">
     <tr class="toc">
-      <td align="left" valign="top" colspan="2">
+      <td align="{$direction.align.start}" valign="top" colspan="2">
         <xsl:call-template name="process.qanda.toc"/>
       </td>
     </tr>
   </xsl:if>
   <xsl:if test="$preamble">
     <tr class="toc">
-      <td align="left" valign="top" colspan="2">
+      <td align="{$direction.align.start}" valign="top" colspan="2">
         <xsl:apply-templates select="$preamble"/>
       </td>
     </tr>
@@ -138,7 +138,7 @@
 
   <tr>
     <xsl:apply-templates select="." mode="class.attribute"/>
-    <td align="left" valign="top">
+    <td align="{$direction.align.start}" valign="top">
       <xsl:call-template name="anchor">
         <xsl:with-param name="node" select=".."/>
         <xsl:with-param name="conditional" select="0"/>
@@ -160,7 +160,7 @@
         </b></p>
       </xsl:if>
     </td>
-    <td align="left" valign="top">
+    <td align="{$direction.align.start}" valign="top">
       <xsl:choose>
         <xsl:when test="$deflabel = 'none' and not(label)">
           <b><xsl:apply-templates select="*[local-name(.) != 'label']"/></b>
@@ -186,7 +186,7 @@
   </xsl:variable>
 
   <tr class="{local-name(.)}">
-    <td align="left" valign="top">
+    <td align="{$direction.align.start}" valign="top">
       <xsl:call-template name="anchor"/>
       <xsl:variable name="answer.label">
         <xsl:apply-templates select="." mode="label.markup"/>
@@ -197,7 +197,7 @@
         </b></p>
       </xsl:if>
     </td>
-    <td align="left" valign="top">
+    <td align="{$direction.align.start}" valign="top">
       <xsl:apply-templates select="*[local-name(.) != 'label'         and local-name(.) != 'qandaentry']"/>
       <!-- * handle nested answer/qandaentry instances -->
       <!-- * (bug 1509043 from Daniel Leidert) -->
@@ -344,7 +344,7 @@
       </xsl:attribute>
     </xsl:if>
 
-    <col align="left">
+    <col align="{$direction.align.start}">
       <xsl:attribute name="width">
         <xsl:choose>
           <xsl:when test="$label-width != ''">
diff -urNp docbook-xsl-1.74.0-orig/xhtml-1_1/titlepage.xsl docbook-xsl-1.74.0/xhtml-1_1/titlepage.xsl
--- docbook-xsl-1.74.0-orig/xhtml-1_1/titlepage.xsl	2008-06-02 01:06:42.000000000 +0200
+++ docbook-xsl-1.74.0/xhtml-1_1/titlepage.xsl	2009-01-28 14:55:52.000000000 +0100
@@ -746,7 +746,7 @@
       <xsl:apply-templates select="." mode="class.attribute"/>
       <table border="1" width="100%" summary="Revision history">
         <tr>
-          <th align="left" valign="top" colspan="{$numcols}">
+          <th align="{$direction.align.start}" valign="top" colspan="{$numcols}">
             <b>
               <xsl:call-template name="gentext">
                 <xsl:with-param name="key" select="'RevHistory'"/>
@@ -823,7 +823,7 @@
   <xsl:variable name="revauthor" select="authorinitials|author"/>
   <xsl:variable name="revremark" select="revremark|revdescription"/>
   <tr>
-    <td align="left">
+    <td align="{$direction.align.start}">
       <xsl:if test="$revnumber">
         <xsl:call-template name="gentext">
           <xsl:with-param name="key" select="'Revision'"/>
@@ -832,12 +832,12 @@
         <xsl:apply-templates select="$revnumber[1]" mode="titlepage.mode"/>
       </xsl:if>
     </td>
-    <td align="left">
+    <td align="{$direction.align.start}">
       <xsl:apply-templates select="$revdate[1]" mode="titlepage.mode"/>
     </td>
     <xsl:choose>
       <xsl:when test="$revauthor">
-        <td align="left">
+        <td align="{$direction.align.start}">
           <xsl:for-each select="$revauthor">
             <xsl:apply-templates select="." mode="titlepage.mode"/>
             <xsl:if test="position() != last()">
@@ -854,7 +854,7 @@
   </tr>
   <xsl:if test="$revremark">
     <tr>
-      <td align="left" colspan="{$numcols}">
+      <td align="{$direction.align.start}" colspan="{$numcols}">
         <xsl:apply-templates select="$revremark[1]" mode="titlepage.mode"/>
       </td>
     </tr>


Index: docbook-style-xsl.spec
===================================================================
RCS file: /cvs/extras/rpms/docbook-style-xsl/devel/docbook-style-xsl.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- docbook-style-xsl.spec	12 Dec 2008 10:23:23 -0000	1.50
+++ docbook-style-xsl.spec	29 Jan 2009 14:32:27 -0000	1.51
@@ -1,6 +1,6 @@
 Name: docbook-style-xsl
 Version: 1.74.0
-Release: 4%{?dist}
+Release: 5%{?dist}
 Group: Applications/Text
 
 Summary: Norman Walsh's XSL stylesheets for DocBook XML
@@ -31,6 +31,7 @@
 Patch4: docbook-xsl-non-constant-expressions.patch
 Patch5: docbook-xsl-list-item-body.patch
 Patch6: docbook-xsl-weird-orgname-use.patch
+Patch7: docbook-xsl-rtl.patch
 
 
 %description
@@ -49,10 +50,11 @@
 %patch4 -p1 -b .nonconstant
 %patch5 -p1 -b .listitembody
 %patch6 -p1 -b .orgname
+%patch7 -p1 -b .rtllang
 
 cp -p %{SOURCE1} Makefile
 
-# fix of non UTF-8 files rpmlint warnings 
+# fix of non UTF-8 files rpmlint warnings
 for fhtml in $(find ./doc -name '*.html' -type f)
 do
   iconv -f ISO-8859-1 -t UTF-8 "$fhtml" -o "$fhtml".tmp
@@ -119,8 +121,11 @@
 fi
 
 %changelog
+* Wed Jan 28 2009 Ondrej Vasik <ovasik at redhat.com> 1.74.0-5
+- fix xsl stylesheets for rtl languages(#475077)
+
 * Fri Dec 12 2008 Ondrej Vasik <ovasik at redhat.com> 1.74.0-4
-- Author_Group "<orgname>" merged between "<surname>" 
+- Author_Group "<orgname>" merged between "<surname>"
   and "<surname>" (#473019)
 
 * Wed Aug 06 2008 Kamil Dudka <kdudka at redhat.com> 1.74.0-3



From rezso at fedoraproject.org  Thu Jan 29 14:33:15 2009
From: rezso at fedoraproject.org (Balint Cristian)
Date: Thu, 29 Jan 2009 14:33:15 +0000 (UTC)
Subject: rpms/mapserver/devel import.log,1.6,1.7 mapserver.spec,1.18,1.19
Message-ID: <20090129143315.44A7370117@cvs1.fedora.phx.redhat.com>

Author: rezso

Update of /cvs/pkgs/rpms/mapserver/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5087/devel

Modified Files:
	import.log mapserver.spec 
Log Message:
- email change
- rebuild against new gdal



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/mapserver/devel/import.log,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- import.log	3 Jan 2009 14:12:15 -0000	1.6
+++ import.log	29 Jan 2009 14:32:44 -0000	1.7
@@ -4,3 +4,4 @@
 mapserver-5_2_1-1_fc11:HEAD:mapserver-5.2.1-1.fc11.src.rpm:1228637903
 mapserver-5_2_1-2_fc11:HEAD:mapserver-5.2.1-2.fc11.src.rpm:1228655332
 mapserver-5_2_1-3_fc11:HEAD:mapserver-5.2.1-3.fc11.src.rpm:1230991877
+mapserver-5_2_1-4_fc11:HEAD:mapserver-5.2.1-4.fc11.src.rpm:1233239503


Index: mapserver.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mapserver/devel/mapserver.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- mapserver.spec	17 Jan 2009 14:59:40 -0000	1.18
+++ mapserver.spec	29 Jan 2009 14:32:44 -0000	1.19
@@ -240,8 +240,9 @@
 %{_javadir}/*.jar
 
 %changelog
-* Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> 5.2.1-4
-- rebuild with new openssl
+* Thu Jan 29 2009 Balint Cristian <crisitan.balint at gmail.com> - 5.2.1-4
+- email change
+- rebuild against new gdal
 
 * Sat Jan 03 2009 Balint Cristian <rezso at rdsor.ro> 5.2.1-3
 - require external fonts



From tmoertel at fedoraproject.org  Thu Jan 29 14:45:29 2009
From: tmoertel at fedoraproject.org (Tom Moertel)
Date: Thu, 29 Jan 2009 14:45:29 +0000 (UTC)
Subject: rpms/emacs-magit/devel emacs-magit.spec,1.1,1.2
Message-ID: <20090129144529.11B1F70117@cvs1.fedora.phx.redhat.com>

Author: tmoertel

Update of /cvs/pkgs/rpms/emacs-magit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7126

Modified Files:
	emacs-magit.spec 
Log Message:
Added missing build dep on texinfo



Index: emacs-magit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/emacs-magit/devel/emacs-magit.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- emacs-magit.spec	29 Jan 2009 03:42:39 -0000	1.1
+++ emacs-magit.spec	29 Jan 2009 14:44:58 -0000	1.2
@@ -14,7 +14,7 @@
 
 Name:           emacs-%{pkg}
 Version:        0.7
-Release:        2.%{git_pull_date}git%{?dist}
+Release:        3.%{git_pull_date}git%{?dist}
 Summary:        Emacs interface to the most common Git operations
 
 Group:          Applications/Editors
@@ -33,7 +33,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
-BuildRequires:  automake emacs emacs-el
+BuildRequires:  automake emacs emacs-el texinfo
 Requires:       emacs(bin) >= %{emacs_version}
 
 %description
@@ -97,6 +97,9 @@
 %{emacs_lispdir}/%{pkg}/*.el
 
 %changelog
+* Thu Jan 29 2009  <tom at moertel.com> - 0.7-3.20090122git
+- Added missing build dependency: texinfo
+
 * Tue Jan 27 2009  <tom at moertel.com> - 0.7-2.20090122git
 - Made fixes per Fedora packaging review (thanks Jerry James)
 



From rrakus at fedoraproject.org  Thu Jan 29 14:49:09 2009
From: rrakus at fedoraproject.org (Roman Rakus)
Date: Thu, 29 Jan 2009 14:49:09 +0000 (UTC)
Subject: rpms/yaboot/F-10 yaboot-relocatable-kernel.patch, NONE,
	1.1 yaboot.spec, 1.56, 1.57
Message-ID: <20090129144909.346DB70117@cvs1.fedora.phx.redhat.com>

Author: rrakus

Update of /cvs/extras/rpms/yaboot/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7912

Modified Files:
	yaboot.spec 
Added Files:
	yaboot-relocatable-kernel.patch 
Log Message:
Add patch to handle relocatable kernels. Resolves: #483041

yaboot-relocatable-kernel.patch:

--- NEW FILE yaboot-relocatable-kernel.patch ---
PPC64 relocatable kernels (built with CONFIG_RELOCATABLE=y) have the type of
ET_DYN. But yaboot code won't load the kernel if the ELF type is not
ET_EXEC. Attached patch adds support to yaboot to load relocatable kernels
also (ie load ET_DYN type also)

Signed-off-by: M. Mohan Kumar <mohan at in.ibm.com>
---
 second/yaboot.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- yaboot-1.3.14.orig/second/yaboot.c
+++ yaboot-1.3.14/second/yaboot.c
@@ -1606,7 +1606,7 @@ is_elf64(loadinfo_t *loadinfo)
 	     e->e_ident[EI_MAG3]  == ELFMAG3	    &&
 	     e->e_ident[EI_CLASS] == ELFCLASS64  &&
 	     e->e_ident[EI_DATA]  == ELFDATA2MSB &&
-	     e->e_type            == ET_EXEC	    &&
+	     (e->e_type == ET_EXEC || e->e_type == ET_DYN) &&
 	     e->e_machine         == EM_PPC64);
 }
 


Index: yaboot.spec
===================================================================
RCS file: /cvs/extras/rpms/yaboot/F-10/yaboot.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- yaboot.spec	21 Nov 2008 17:40:13 -0000	1.56
+++ yaboot.spec	29 Jan 2009 14:48:38 -0000	1.57
@@ -1,7 +1,7 @@
 Summary: Linux bootloader for Power Macintosh "New World" computers.
 Name: yaboot
 Version: 1.3.14
-Release: 8%{?dist}
+Release: 9%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: http://yaboot.ozlabs.org/releases/yaboot-%{version}.tar.gz
@@ -24,6 +24,7 @@
 Patch29: yaboot-1.3.14-baseaddr.patch
 Patch30: yaboot-1.3.14-fix-bootonce-nvram.patch 
 Patch31: yaboot-1.3.14-bigger-max-token.patch
+Patch32: yaboot-relocatable-kernel.patch
 
 URL: http://yaboot.ozlabs.org/
 BuildRoot: %{_tmppath}/%{name}-root
@@ -58,6 +59,7 @@
 %patch29 -p1 -b .baseaddr
 %patch30 -p1 -b .bootonce
 %patch31 -p1 -b .maxtoken
+%patch32 -p1 -b .relocatable
 
 %build
 make VERSIONEXTRA='\ (Red Hat %version-%release)'
@@ -93,6 +95,10 @@
 %ghost %config(noreplace) %{_sysconfdir}/yaboot.conf
 
 %changelog
+* Thu Jan 29 2009 Roman Rakus <rrakus at redhat.com> - 1.3.14-9
+- Add patch to handle relocatable kernels
+  Resolves: #483041
+
 * Fri Nov 21 2008 David Woodhouse <David.Woodhouse at intel.com> - 1.3.14-8
 - Fix 'ybin --bootonce' (#471425)
 - Fix maximum token length, to fix preupgrade (#471321)



From tmoertel at fedoraproject.org  Thu Jan 29 14:52:43 2009
From: tmoertel at fedoraproject.org (Tom Moertel)
Date: Thu, 29 Jan 2009 14:52:43 +0000 (UTC)
Subject: rpms/emacs-magit/F-10 emacs-magit.spec,1.1,1.2
Message-ID: <20090129145243.88261179D1E@cvs1.fedora.phx.redhat.com>

Author: tmoertel

Update of /cvs/pkgs/rpms/emacs-magit/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9112

Modified Files:
	emacs-magit.spec 
Log Message:
Added missing build dep on texinfo


Index: emacs-magit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/emacs-magit/F-10/emacs-magit.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- emacs-magit.spec	29 Jan 2009 03:48:55 -0000	1.1
+++ emacs-magit.spec	29 Jan 2009 14:52:13 -0000	1.2
@@ -14,7 +14,7 @@
 
 Name:           emacs-%{pkg}
 Version:        0.7
-Release:        2.%{git_pull_date}git%{?dist}
+Release:        3.%{git_pull_date}git%{?dist}
 Summary:        Emacs interface to the most common Git operations
 
 Group:          Applications/Editors
@@ -33,7 +33,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
-BuildRequires:  automake emacs emacs-el
+BuildRequires:  automake emacs emacs-el texinfo
 Requires:       emacs(bin) >= %{emacs_version}
 
 %description
@@ -97,6 +97,9 @@
 %{emacs_lispdir}/%{pkg}/*.el
 
 %changelog
+* Thu Jan 29 2009  <tom at moertel.com> - 0.7-3.20090122git
+- Added missing build dependency: texinfo
+
 * Tue Jan 27 2009  <tom at moertel.com> - 0.7-2.20090122git
 - Made fixes per Fedora packaging review (thanks Jerry James)
 



From tmoertel at fedoraproject.org  Thu Jan 29 14:53:41 2009
From: tmoertel at fedoraproject.org (Tom Moertel)
Date: Thu, 29 Jan 2009 14:53:41 +0000 (UTC)
Subject: rpms/emacs-magit/F-9 emacs-magit.spec,1.1,1.2
Message-ID: <20090129145341.EEBAA179D1E@cvs1.fedora.phx.redhat.com>

Author: tmoertel

Update of /cvs/pkgs/rpms/emacs-magit/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9274

Modified Files:
	emacs-magit.spec 
Log Message:
Added missing build dep on texinfo


Index: emacs-magit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/emacs-magit/F-9/emacs-magit.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- emacs-magit.spec	29 Jan 2009 03:47:04 -0000	1.1
+++ emacs-magit.spec	29 Jan 2009 14:53:11 -0000	1.2
@@ -14,7 +14,7 @@
 
 Name:           emacs-%{pkg}
 Version:        0.7
-Release:        2.%{git_pull_date}git%{?dist}
+Release:        3.%{git_pull_date}git%{?dist}
 Summary:        Emacs interface to the most common Git operations
 
 Group:          Applications/Editors
@@ -33,7 +33,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
-BuildRequires:  automake emacs emacs-el
+BuildRequires:  automake emacs emacs-el texinfo
 Requires:       emacs(bin) >= %{emacs_version}
 
 %description
@@ -97,6 +97,9 @@
 %{emacs_lispdir}/%{pkg}/*.el
 
 %changelog
+* Thu Jan 29 2009  <tom at moertel.com> - 0.7-3.20090122git
+- Added missing build dependency: texinfo
+
 * Tue Jan 27 2009  <tom at moertel.com> - 0.7-2.20090122git
 - Made fixes per Fedora packaging review (thanks Jerry James)
 



From salimma at fedoraproject.org  Thu Jan 29 14:58:55 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Thu, 29 Jan 2009 14:58:55 +0000 (UTC)
Subject: rpms/gnome-keyring-sharp/devel .cvsignore, 1.2,
	1.3 gnome-keyring-sharp.spec, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <20090129145855.329D8179D1E@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/gnome-keyring-sharp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10389/devel

Modified Files:
	.cvsignore gnome-keyring-sharp.spec sources 
Log Message:
* Thu Jan 29 2009 Michel Salim <salimma at fedoraproject.org> - 1.0.1-0.1.115768svn%{?dist}
- Update to r115768



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-keyring-sharp/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	15 Jul 2008 13:22:14 -0000	1.2
+++ .cvsignore	29 Jan 2009 14:58:24 -0000	1.3
@@ -1 +1 @@
-gnome-keyring-sharp.tar.gz
+gnome-keyring-sharp-1.0.1-r115768.tar.bz2


Index: gnome-keyring-sharp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-keyring-sharp/devel/gnome-keyring-sharp.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gnome-keyring-sharp.spec	15 Jul 2008 13:34:58 -0000	1.2
+++ gnome-keyring-sharp.spec	29 Jan 2009 14:58:24 -0000	1.3
@@ -1,15 +1,21 @@
-%global svn_rev 87622
+%global svn_rev 115768
 %global debug_package %{nil}
 
 Name:           gnome-keyring-sharp
-Version:        1.0.0
-Release:        0.2.%{svn_rev}svn%{?dist}
+Version:        1.0.1
+Release:        0.1.%{svn_rev}svn%{?dist}
 Summary:        Mono implementation of GNOME Keyring
 
 Group:          System Environment/Libraries
 License:        MIT
 URL:            http://www.mono-project.com/Libraries#Gnome-KeyRing-Sharp
-Source0:        http://anonsvn.mono-project.com/viewcvs/trunk/gnome-keyring-sharp.tar.gz
+# Tarfile created from svn snapshot
+# svn co -r %{svn-rev} \
+#   svn://anonsvn.mono-project.com/source/trunk/gnome-keyring-sharp \
+#   gnome-keyring-sharp-%{version}
+# tar cjf gnome-keyring-sharp-%{version}-r%{svn_rev}.tar.bz2 --exclude=.svn \
+#   gnome-keyring-sharp-%{version}
+Source0:        gnome-keyring-sharp-%{version}-r%{svn_rev}.tar.bz2
 Patch0:         gnome-keyring-sharp-libdir.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -49,7 +55,7 @@
 
 
 %prep
-%setup -q -n %{name}
+%setup -q
 %patch0 -p1 -b .libdir
 
 
@@ -90,6 +96,9 @@
 
 
 %changelog
+* Thu Jan 29 2009 Michel Salim <salimma at fedoraproject.org> - 1.0.1-0.1.115768svn%{?dist}
+- Update to r115768
+
 * Mon Jul 14 2008 Michel Alexandre Salim <salimma at fedoraproject.org> - 1.0.0-0.2.87622svn%{?dist}
 - Disable creation of -debuginfo subpackage
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-keyring-sharp/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	15 Jul 2008 13:22:14 -0000	1.2
+++ sources	29 Jan 2009 14:58:24 -0000	1.3
@@ -1 +1 @@
-8e6663eca87f043ed4bd1c873227126c  gnome-keyring-sharp.tar.gz
+fb3365cc466316af2d8cbc4174186fe1  gnome-keyring-sharp-1.0.1-r115768.tar.bz2



From rrakus at fedoraproject.org  Thu Jan 29 14:59:19 2009
From: rrakus at fedoraproject.org (Roman Rakus)
Date: Thu, 29 Jan 2009 14:59:19 +0000 (UTC)
Subject: rpms/yaboot/F-9 yaboot-relocatable-kernel.patch, NONE,
	1.1 yaboot.spec, 1.54, 1.55
Message-ID: <20090129145919.D834F70116@cvs1.fedora.phx.redhat.com>

Author: rrakus

Update of /cvs/extras/rpms/yaboot/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10437

Modified Files:
	yaboot.spec 
Added Files:
	yaboot-relocatable-kernel.patch 
Log Message:
Add patch to handle relocatable kernels. Resolves: #483041

yaboot-relocatable-kernel.patch:

--- NEW FILE yaboot-relocatable-kernel.patch ---
PPC64 relocatable kernels (built with CONFIG_RELOCATABLE=y) have the type of
ET_DYN. But yaboot code won't load the kernel if the ELF type is not
ET_EXEC. Attached patch adds support to yaboot to load relocatable kernels
also (ie load ET_DYN type also)

Signed-off-by: M. Mohan Kumar <mohan at in.ibm.com>
---
 second/yaboot.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- yaboot-1.3.14.orig/second/yaboot.c
+++ yaboot-1.3.14/second/yaboot.c
@@ -1606,7 +1606,7 @@ is_elf64(loadinfo_t *loadinfo)
 	     e->e_ident[EI_MAG3]  == ELFMAG3	    &&
 	     e->e_ident[EI_CLASS] == ELFCLASS64  &&
 	     e->e_ident[EI_DATA]  == ELFDATA2MSB &&
-	     e->e_type            == ET_EXEC	    &&
+	     (e->e_type == ET_EXEC || e->e_type == ET_DYN) &&
 	     e->e_machine         == EM_PPC64);
 }
 


Index: yaboot.spec
===================================================================
RCS file: /cvs/extras/rpms/yaboot/F-9/yaboot.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- yaboot.spec	27 Nov 2008 14:27:03 -0000	1.54
+++ yaboot.spec	29 Jan 2009 14:58:49 -0000	1.55
@@ -1,7 +1,7 @@
 Summary: Linux bootloader for Power Macintosh "New World" computers.
 Name: yaboot
 Version: 1.3.13
-Release: 13%{?dist}
+Release: 14%{?dist}
 License: GPL
 Group: System Environment/Base
 Source: http://yaboot.ozlabs.org/releases/yaboot-%{version}.tar.gz
@@ -40,6 +40,7 @@
 Patch32: yaboot-1.3.13-bplan.patch
 Patch33: yaboot-1.3.13-libext2fs.patch
 Patch34: yaboot-1.3.14-bigger-max-token.patch
+Patch35: yaboot-relocatable-kernel.patch
 
 URL: http://yaboot.ozlabs.org/
 BuildRoot: %{_tmppath}/%{name}-root
@@ -90,6 +91,7 @@
 %patch32 -p1 -b .bplan
 %patch33 -p1 -b .libext2fs
 %patch34 -p1 -b .maxtoken
+%patch35 -p1 -b .relocatable
 
 %build
 make VERSIONEXTRA='\ (Red Hat %version-%release)'
@@ -125,6 +127,10 @@
 %ghost %config(noreplace) %{_sysconfdir}/yaboot.conf
 
 %changelog
+* Thu Jan 29 2009 Roman Rakus <rrakus at redhat.com> - 1.3.13-14
+- Add patch to handle relocatable kernels
+  Resolves: #483041
+
 * Thu Nov 27 2008 Roman Rakus <rrakus at redhat.com> - 1.3.13-13
 - Fix maximum token length, to fix preupgrade (#471321)
 



From rdieter at fedoraproject.org  Thu Jan 29 15:39:34 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu, 29 Jan 2009 15:39:34 +0000 (UTC)
Subject: rpms/phonon/devel .cvsignore, 1.9, 1.10 phonon.spec, 1.24,
	1.25 sources, 1.11, 1.12 gstreamer-logo.svg, 1.1, NONE
Message-ID: <20090129153934.49CB870116@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/phonon/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16813

Modified Files:
	.cvsignore phonon.spec sources 
Removed Files:
	gstreamer-logo.svg 
Log Message:
* Thu Jan 29 2009 Rex Dietger <rdieter at fedoraproject.org> - 4.3.0-4
- Requires: phonon-backend >= %version
- move icons to hicolor theme and into -backend subpkgs
- BR: libxcb-devel
- move phonon-gstreamer.svg to sources



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/phonon/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	22 Jan 2009 12:48:50 -0000	1.9
+++ .cvsignore	29 Jan 2009 15:39:03 -0000	1.10
@@ -1,2 +1,2 @@
-phonon-4.2.96.tar.bz2
+gstreamer-logo.svg
 phonon-4.3.0.tar.bz2


Index: phonon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/phonon/devel/phonon.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- phonon.spec	26 Jan 2009 15:26:16 -0000	1.24
+++ phonon.spec	29 Jan 2009 15:39:03 -0000	1.25
@@ -1,8 +1,7 @@
 Summary: Multimedia framework api
 Name:    phonon
 Version: 4.3.0
-Release: 3%{?dist}
-
+Release: 4%{?dist}
 Group:   System Environment/Libraries
 License: LGPLv2+
 URL:     http://phonon.kde.org/
@@ -25,17 +24,15 @@
 BuildRequires: gstreamer-plugins-base-devel
 BuildRequires: ImageMagick
 BuildRequires: kde-filesystem
+BuildRequires: libxcb-devel
 BuildRequires: libxml2-devel
 BuildRequires: pkgconfig
 BuildRequires: qt4-devel >= 4.4.0
 BuildRequires: xine-lib-devel
 
-Requires: phonon-backend
+Requires: phonon-backend >= %{version}
 ## hard-code phonon-backend-xine, if yum chooses -gstreamer by default
-#Requires(hint): phonon-backend-xine
-
-Requires(post): /sbin/ldconfig xdg-utils
-Requires(postun): /sbin/ldconfig xdg-utils
+#Requires(hint): phonon-backend-xine >= %{version}
 
 %description
 %{summary}.
@@ -44,6 +41,8 @@
 Summary: Gstreamer phonon backend
 Group:   Applications/Multimedia
 Requires: %{name} = %{version}-%{release}
+Requires(post): xdg-utils
+Requires(postun): xdg-utils
 Provides: phonon-backend = %{version}-%{release}
 Obsoletes: %{name}-backend-gst < 4.2.0-4
 Provides:  %{name}-backend-gst = %{version}-%{release}
@@ -54,6 +53,8 @@
 Summary: xine phonon backend
 Group:   Applications/Multimedia
 Requires: %{name} = %{version}-%{release}
+Requires(post): xdg-utils
+Requires(postun): xdg-utils
 Provides: phonon-backend = %{version}-%{release}
 %description backend-xine
 %{summary}.
@@ -88,10 +89,15 @@
 
 make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
-install -D -m 0644 %{SOURCE1} %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/%{name}-gstreamer.svg
+# move the oxygen-only phonon-xine icons to hicolor
+test -d %{buildroot}%{_datadir}/icons/hicolor && exit 0
+mv %{buildroot}%{_datadir}/icons/oxygen \
+   %{buildroot}%{_datadir}/icons/hicolor
+
+install -D -m 0644 %{SOURCE1} %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/phonon-gstreamer.svg
 for i in 16 22 32 48 64 128; do
   mkdir -p %{buildroot}%{_datadir}/icons/hicolor/${i}x${i}/apps
-  convert -background None -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/phonon-gstreamer.png
 done
 
 
@@ -99,23 +105,28 @@
 rm -rf %{buildroot}
 
 
-%post
-/sbin/ldconfig
+%post -p /sbin/ldconfig
+
+%postun -p /sbin/ldconfig
+
+%post backend-xine
 xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
-xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || :
 
-%postun
-/sbin/ldconfig
+%postun backend-xine
 xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
-xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || :
+
+%post backend-gstreamer
+xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
+
+%postun backend-gstreamer
+xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
+
 
 %files
 %defattr(-,root,root,-)
 %doc COPYING.LIB
 %{_libdir}/libphonon*.so.4*
 %{_datadir}/dbus-1/interfaces/org.kde.Phonon.AudioOutput.xml
-%{_datadir}/icons/hicolor/*/*/*
-%{_datadir}/icons/oxygen/*/*/*
 # kde4-specific dirs
 %dir %{_kde4_libdir}/kde4/plugins/phonon_backend/
 %dir %{_kde4_datadir}/kde4/services/phononbackends/
@@ -124,11 +135,13 @@
 %defattr(-,root,root,-)
 %{_kde4_libdir}/kde4/plugins/phonon_backend/phonon_gstreamer.so
 %{_kde4_datadir}/kde4/services/phononbackends/gstreamer.desktop
+%{_datadir}/icons/hicolor/*/apps/phonon-xine.*
 
 %files backend-xine
 %defattr(-,root,root,-)
 %{_kde4_libdir}/kde4/plugins/phonon_backend/phonon_xine.so
 %{_kde4_datadir}/kde4/services/phononbackends/xine.desktop
+%{_datadir}/icons/hicolor/*/apps/phonon-gstreamer.*
 
 %files devel
 %defattr(-,root,root,-)
@@ -140,6 +153,12 @@
 
 
 %changelog
+* Thu Jan 29 2009 Rex Dietger <rdieter at fedoraproject.org> - 4.3.0-4
+- Requires: phonon-backend >= %%version
+- move icons to hicolor theme and into -backend subpkgs
+- BR: libxcb-devel
+- move phonon-gstreamer.svg to sources
+
 * Mon Jan 26 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.0-3
 - BR: automoc4 >= 0.9.86
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/phonon/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	22 Jan 2009 12:48:50 -0000	1.11
+++ sources	29 Jan 2009 15:39:03 -0000	1.12
@@ -1 +1,2 @@
+8e3924f417fea67f72b2105faed2119c  gstreamer-logo.svg
 f851219ec1fb4eadc7904f053b6b498d  phonon-4.3.0.tar.bz2


--- gstreamer-logo.svg DELETED ---



From hadess at fedoraproject.org  Thu Jan 29 15:42:12 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Thu, 29 Jan 2009 15:42:12 +0000 (UTC)
Subject: rpms/gnome-user-share/devel gus-export-txt-record.patch, NONE,
	1.1 gnome-user-share.spec, 1.45, 1.46
Message-ID: <20090129154212.CE41270116@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-serv17186

Modified Files:
	gnome-user-share.spec 
Added Files:
	gus-export-txt-record.patch 
Log Message:
* Thu Jan 29 2009 - Bastien Nocera <bnocera at redhat.com> - 2.25.5-2
- Export the user through the TXT record with the new mod_dnssd


gus-export-txt-record.patch:

--- NEW FILE gus-export-txt-record.patch ---
Index: data/dav_user_2.2.conf.in
===================================================================
--- data/dav_user_2.2.conf.in	(revision 308)
+++ data/dav_user_2.2.conf.in	(working copy)
@@ -47,6 +47,7 @@
 
     DNSSDServiceName "${GUS_SHARE_NAME}"
     DNSSDServiceTypes _webdav._tcp
+    DNSSDServiceTxtRecord u=guest
   </Location>
 </VirtualHost>
 


Index: gnome-user-share.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-user-share/devel/gnome-user-share.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- gnome-user-share.spec	27 Jan 2009 22:04:55 -0000	1.45
+++ gnome-user-share.spec	29 Jan 2009 15:41:42 -0000	1.46
@@ -1,11 +1,12 @@
 Summary: Gnome user file sharing
 Name: gnome-user-share
 Version: 2.25.5
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Group: System Environment/Libraries
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/gnome-user-share/2.25/%{name}-%{version}.tar.bz2
+Patch0: gus-export-txt-record.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 Requires: httpd >= 2.2.0
@@ -13,7 +14,7 @@
 Requires: mod_dnssd
 BuildRequires: GConf2-devel pkgconfig
 BuildRequires: gtk2-devel >= 2.4.0
-BuildRequires: httpd >= 2.2.0 mod_dnssd
+BuildRequires: httpd >= 2.2.0 mod_dnssd >= 0.6
 BuildRequires: desktop-file-utils
 BuildRequires: gnome-doc-utils
 BuildRequires: libselinux-devel
@@ -43,6 +44,7 @@
 
 %prep
 %setup -q
+%patch0 -p0 -b .txt-record
 
 %build
 %configure
@@ -120,6 +122,9 @@
 %{_datadir}/icons/hicolor/*/apps/gnome-obex-server.png
 
 %changelog
+* Thu Jan 29 2009 - Bastien Nocera <bnocera at redhat.com> - 2.25.5-2
+- Export the user through the TXT record with the new mod_dnssd
+
 * Tue Jan 27 2009 - Bastien Nocera <bnocera at redhat.com> - 2.25.5-1
 - Update to 2.25.5
 



From wart at fedoraproject.org  Thu Jan 29 15:44:51 2009
From: wart at fedoraproject.org (Michael Thomas)
Date: Thu, 29 Jan 2009 15:44:51 +0000 (UTC)
Subject: rpms/wormux/devel wormux.spec,1.16,1.17
Message-ID: <20090129154451.7AAB170116@cvs1.fedora.phx.redhat.com>

Author: wart

Update of /cvs/pkgs/rpms/wormux/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17785

Modified Files:
	wormux.spec 
Log Message:
Yet another font package rename.




Index: wormux.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wormux/devel/wormux.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- wormux.spec	2 Jan 2009 00:11:47 -0000	1.16
+++ wormux.spec	29 Jan 2009 15:44:21 -0000	1.17
@@ -1,6 +1,6 @@
 Name:           wormux
 Version:        0.8.2
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        2D convivial mass murder game
 
 Group:          Amusements/Games
@@ -12,7 +12,7 @@
 BuildRequires:  SDL_image-devel SDL_gfx-devel SDL_mixer-devel
 BuildRequires:  SDL_ttf-devel SDL_net-devel curl-devel libpng-devel
 BuildRequires:  gettext libxml++-devel desktop-file-utils
-Requires:       wormux-data dejavu-fonts-sans
+Requires:       wormux-data dejavu-sans-fonts
 Requires(post): coreutils
 Requires(postun): coreutils
 
@@ -89,6 +89,9 @@
 %{_datadir}/%{name}
 
 %changelog
+* Thu Jan 29 2009 Wart <wart at kobold.org> 0.8.2-4
+- Yet another font package rename
+
 * Thu Jan 1 2009 Wart <wart at kobold.org> 0.8.2-3
 - Fix font package name for F11
 



From rdieter at fedoraproject.org  Thu Jan 29 15:47:28 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu, 29 Jan 2009 15:47:28 +0000 (UTC)
Subject: rpms/phonon/F-10 .cvsignore, 1.6, 1.7 phonon.spec, 1.13,
	1.14 sources, 1.6, 1.7 gstreamer-logo.svg, 1.1, NONE
Message-ID: <20090129154728.13C1470116@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/phonon/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18323

Modified Files:
	.cvsignore phonon.spec sources 
Removed Files:
	gstreamer-logo.svg 
Log Message:
* Thu Jan 29 2009 Rex Dietger <rdieter at fedoraproject.org> - 4.3.0-4
- Requires: phonon-backend >= %version
- move icons to hicolor theme and into -backend subpkgs
- BR: libxcb-devel
- move phonon-gstreamer.svg to sources



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/phonon/F-10/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	23 Jan 2009 17:29:21 -0000	1.6
+++ .cvsignore	29 Jan 2009 15:46:57 -0000	1.7
@@ -1,2 +1,2 @@
-phonon-4.2.96.tar.bz2
+gstreamer-logo.svg
 phonon-4.3.0.tar.bz2


Index: phonon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/phonon/F-10/phonon.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- phonon.spec	23 Jan 2009 17:29:21 -0000	1.13
+++ phonon.spec	29 Jan 2009 15:46:57 -0000	1.14
@@ -1,8 +1,7 @@
 Summary: Multimedia framework api
 Name:    phonon
 Version: 4.3.0
-Release: 2%{?dist}
-
+Release: 4%{?dist}
 Group:   System Environment/Libraries
 License: LGPLv2+
 URL:     http://phonon.kde.org/
@@ -18,24 +17,22 @@
 Patch1:  phonon-4.2.96-xine-pulseaudio.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires: automoc4
+BuildRequires: automoc4 >= 0.9.86
 BuildRequires: cmake >= 2.6.0
 BuildRequires: glib2-devel
 BuildRequires: gstreamer-devel
 BuildRequires: gstreamer-plugins-base-devel
 BuildRequires: ImageMagick
 BuildRequires: kde-filesystem
+BuildRequires: libxcb-devel
 BuildRequires: libxml2-devel
 BuildRequires: pkgconfig
 BuildRequires: qt4-devel >= 4.4.0
 BuildRequires: xine-lib-devel
 
-Requires: phonon-backend
+Requires: phonon-backend >= %{version}
 ## hard-code phonon-backend-xine, if yum chooses -gstreamer by default
-#Requires(hint): phonon-backend-xine
-
-Requires(post): /sbin/ldconfig xdg-utils
-Requires(postun): /sbin/ldconfig xdg-utils
+#Requires(hint): phonon-backend-xine >= %{version}
 
 %description
 %{summary}.
@@ -44,6 +41,8 @@
 Summary: Gstreamer phonon backend
 Group:   Applications/Multimedia
 Requires: %{name} = %{version}-%{release}
+Requires(post): xdg-utils
+Requires(postun): xdg-utils
 Provides: phonon-backend = %{version}-%{release}
 Obsoletes: %{name}-backend-gst < 4.2.0-4
 Provides:  %{name}-backend-gst = %{version}-%{release}
@@ -54,6 +53,8 @@
 Summary: xine phonon backend
 Group:   Applications/Multimedia
 Requires: %{name} = %{version}-%{release}
+Requires(post): xdg-utils
+Requires(postun): xdg-utils
 Provides: phonon-backend = %{version}-%{release}
 %description backend-xine
 %{summary}.
@@ -88,10 +89,15 @@
 
 make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
-install -D -m 0644 %{SOURCE1} %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/%{name}-gstreamer.svg
+# move the oxygen-only phonon-xine icons to hicolor
+test -d %{buildroot}%{_datadir}/icons/hicolor && exit 0
+mv %{buildroot}%{_datadir}/icons/oxygen \
+   %{buildroot}%{_datadir}/icons/hicolor
+
+install -D -m 0644 %{SOURCE1} %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/phonon-gstreamer.svg
 for i in 16 22 32 48 64 128; do
   mkdir -p %{buildroot}%{_datadir}/icons/hicolor/${i}x${i}/apps
-  convert -background None -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/phonon-gstreamer.png
 done
 
 
@@ -99,23 +105,28 @@
 rm -rf %{buildroot}
 
 
-%post
-/sbin/ldconfig
+%post -p /sbin/ldconfig
+
+%postun -p /sbin/ldconfig
+
+%post backend-xine
+xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
+
+%postun backend-xine
+xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
+
+%post backend-gstreamer
 xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
-xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || :
 
-%postun
-/sbin/ldconfig
+%postun backend-gstreamer
 xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
-xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || :
+
 
 %files
 %defattr(-,root,root,-)
 %doc COPYING.LIB
 %{_libdir}/libphonon*.so.4*
 %{_datadir}/dbus-1/interfaces/org.kde.Phonon.AudioOutput.xml
-%{_datadir}/icons/hicolor/*/*/*
-%{_datadir}/icons/oxygen/*/*/*
 # kde4-specific dirs
 %dir %{_kde4_libdir}/kde4/plugins/phonon_backend/
 %dir %{_kde4_datadir}/kde4/services/phononbackends/
@@ -124,11 +135,13 @@
 %defattr(-,root,root,-)
 %{_kde4_libdir}/kde4/plugins/phonon_backend/phonon_gstreamer.so
 %{_kde4_datadir}/kde4/services/phononbackends/gstreamer.desktop
+%{_datadir}/icons/hicolor/*/apps/phonon-xine.*
 
 %files backend-xine
 %defattr(-,root,root,-)
 %{_kde4_libdir}/kde4/plugins/phonon_backend/phonon_xine.so
 %{_kde4_datadir}/kde4/services/phononbackends/xine.desktop
+%{_datadir}/icons/hicolor/*/apps/phonon-gstreamer.*
 
 %files devel
 %defattr(-,root,root,-)
@@ -140,6 +153,15 @@
 
 
 %changelog
+* Thu Jan 29 2009 Rex Dietger <rdieter at fedoraproject.org> - 4.3.0-4
+- Requires: phonon-backend >= %%version
+- move icons to hicolor theme and into -backend subpkgs
+- BR: libxcb-devel
+- move phonon-gstreamer.svg to sources
+
+* Mon Jan 26 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.0-3
+- BR: automoc4 >= 0.9.86
+
 * Fri Jan 23 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.0-2
 - fix typo in postun scriptlet (introduced in 4.2.96-3)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/phonon/F-10/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	23 Jan 2009 17:29:21 -0000	1.6
+++ sources	29 Jan 2009 15:46:57 -0000	1.7
@@ -1 +1,2 @@
+8e3924f417fea67f72b2105faed2119c  gstreamer-logo.svg
 f851219ec1fb4eadc7904f053b6b498d  phonon-4.3.0.tar.bz2


--- gstreamer-logo.svg DELETED ---



From ausil at fedoraproject.org  Thu Jan 29 15:48:59 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Thu, 29 Jan 2009 15:48:59 +0000 (UTC)
Subject: rpms/perl-Network-IPv4Addr/F-9 perl-Network-IPv4Addr.spec,1.1,1.2
Message-ID: <20090129154859.D0408179D1E@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/perl-Network-IPv4Addr/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18616

Modified Files:
	perl-Network-IPv4Addr.spec 
Log Message:
* Thu Jan 29 2009 Dennis Gilmore <dennis at ausil.us> - 0.05-13
- remove OPTIMIZE for cleanliness sake
- fix up source0 url



Index: perl-Network-IPv4Addr.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Network-IPv4Addr/F-9/perl-Network-IPv4Addr.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Network-IPv4Addr.spec	29 Jan 2009 05:11:32 -0000	1.1
+++ perl-Network-IPv4Addr.spec	29 Jan 2009 15:48:29 -0000	1.2
@@ -1,13 +1,13 @@
 Summary: Network-IPv4Addr Perl module
 Name: perl-Network-IPv4Addr
 Version: 0.05
-Release: 12%{?dist}
+Release: 13%{?dist}
 License: GPL+ or Artistic
 Group: Development/Libraries
 URL: http://search.cpan.org/dist/Network-IPv4Addr/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
-Source0: Network-IPv4Addr-0.05.tar.gz
+Source0: http://search.cpan.org/CPAN/authors/id/F/FR/FRAJULAC/Network-IPv4Addr-%{version}.tar.gz
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 BuildRequires: perl(ExtUtils::MakeMaker)
 
@@ -22,7 +22,7 @@
 %setup -q -n Network-IPv4Addr-%{version}
 
 %build
-%{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS"
+%{__perl} Makefile.PL INSTALLDIRS=vendor
 make %{?_smp_mflags}
 
 %install
@@ -49,6 +49,10 @@
 %{_mandir}/man3/*.3*
 
 %changelog
+* Thu Jan 29 2009 Dennis Gilmore <dennis at ausil.us> - 0.05-13
+- remove OPTIMIZE for cleanliness sake
+- fix up source0 url
+
 * Wed Jan 28 2009 Dennis Gilmore <dennis at ausil.us> - 0.05-12
 - clean up spec file
 



From rdieter at fedoraproject.org  Thu Jan 29 15:51:33 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu, 29 Jan 2009 15:51:33 +0000 (UTC)
Subject: rpms/phonon/F-9 .cvsignore, 1.3, 1.4 phonon.spec, 1.7, 1.8 sources, 
	1.4, 1.5 gstreamer-logo.svg, 1.1, NONE
Message-ID: <20090129155133.BA719179D1E@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/phonon/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19084

Modified Files:
	.cvsignore phonon.spec sources 
Removed Files:
	gstreamer-logo.svg 
Log Message:
* Thu Jan 29 2009 Rex Dietger <rdieter at fedoraproject.org> - 4.3.0-4
- Requires: phonon-backend >= %version
- move icons to hicolor theme and into -backend subpkgs
- BR: libxcb-devel
- move phonon-gstreamer.svg to sources



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/phonon/F-9/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	23 Jul 2008 13:13:31 -0000	1.3
+++ .cvsignore	29 Jan 2009 15:51:03 -0000	1.4
@@ -1 +1,2 @@
-phonon-4.2.0.tar.bz2
+gstreamer-logo.svg
+phonon-4.3.0.tar.bz2


Index: phonon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/phonon/F-9/phonon.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- phonon.spec	26 Jan 2009 11:10:18 -0000	1.7
+++ phonon.spec	29 Jan 2009 15:51:03 -0000	1.8
@@ -1,8 +1,7 @@
 Summary: Multimedia framework api
 Name:    phonon
 Version: 4.3.0
-Release: 2%{?dist}
-
+Release: 4%{?dist}
 Group:   System Environment/Libraries
 License: LGPLv2+
 URL:     http://phonon.kde.org/
@@ -18,24 +17,22 @@
 Patch1:  phonon-4.2.96-xine-pulseaudio.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires: automoc4
+BuildRequires: automoc4 >= 0.9.86
 BuildRequires: cmake >= 2.6.0
 BuildRequires: glib2-devel
 BuildRequires: gstreamer-devel
 BuildRequires: gstreamer-plugins-base-devel
 BuildRequires: ImageMagick
 BuildRequires: kde-filesystem
+BuildRequires: libxcb-devel
 BuildRequires: libxml2-devel
 BuildRequires: pkgconfig
 BuildRequires: qt4-devel >= 4.4.0
 BuildRequires: xine-lib-devel
 
-Requires: phonon-backend
+Requires: phonon-backend >= %{version}
 ## hard-code phonon-backend-xine, if yum chooses -gstreamer by default
-#Requires(hint): phonon-backend-xine
-
-Requires(post): /sbin/ldconfig xdg-utils
-Requires(postun): /sbin/ldconfig xdg-utils
+#Requires(hint): phonon-backend-xine >= %{version}
 
 %description
 %{summary}.
@@ -44,6 +41,8 @@
 Summary: Gstreamer phonon backend
 Group:   Applications/Multimedia
 Requires: %{name} = %{version}-%{release}
+Requires(post): xdg-utils
+Requires(postun): xdg-utils
 Provides: phonon-backend = %{version}-%{release}
 Obsoletes: %{name}-backend-gst < 4.2.0-4
 Provides:  %{name}-backend-gst = %{version}-%{release}
@@ -54,6 +53,8 @@
 Summary: xine phonon backend
 Group:   Applications/Multimedia
 Requires: %{name} = %{version}-%{release}
+Requires(post): xdg-utils
+Requires(postun): xdg-utils
 Provides: phonon-backend = %{version}-%{release}
 %description backend-xine
 %{summary}.
@@ -88,10 +89,15 @@
 
 make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
-install -D -m 0644 %{SOURCE1} %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/%{name}-gstreamer.svg
+# move the oxygen-only phonon-xine icons to hicolor
+test -d %{buildroot}%{_datadir}/icons/hicolor && exit 0
+mv %{buildroot}%{_datadir}/icons/oxygen \
+   %{buildroot}%{_datadir}/icons/hicolor
+
+install -D -m 0644 %{SOURCE1} %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/phonon-gstreamer.svg
 for i in 16 22 32 48 64 128; do
   mkdir -p %{buildroot}%{_datadir}/icons/hicolor/${i}x${i}/apps
-  convert -background None -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/phonon-gstreamer.png
 done
 
 
@@ -99,23 +105,28 @@
 rm -rf %{buildroot}
 
 
-%post
-/sbin/ldconfig
+%post -p /sbin/ldconfig
+
+%postun -p /sbin/ldconfig
+
+%post backend-xine
+xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
+
+%postun backend-xine
+xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
+
+%post backend-gstreamer
 xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
-xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || :
 
-%postun
-/sbin/ldconfig
+%postun backend-gstreamer
 xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
-xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || :
+
 
 %files
 %defattr(-,root,root,-)
 %doc COPYING.LIB
 %{_libdir}/libphonon*.so.4*
 %{_datadir}/dbus-1/interfaces/org.kde.Phonon.AudioOutput.xml
-%{_datadir}/icons/hicolor/*/*/*
-%{_datadir}/icons/oxygen/*/*/*
 # kde4-specific dirs
 %dir %{_kde4_libdir}/kde4/plugins/phonon_backend/
 %dir %{_kde4_datadir}/kde4/services/phononbackends/
@@ -124,11 +135,13 @@
 %defattr(-,root,root,-)
 %{_kde4_libdir}/kde4/plugins/phonon_backend/phonon_gstreamer.so
 %{_kde4_datadir}/kde4/services/phononbackends/gstreamer.desktop
+%{_datadir}/icons/hicolor/*/apps/phonon-xine.*
 
 %files backend-xine
 %defattr(-,root,root,-)
 %{_kde4_libdir}/kde4/plugins/phonon_backend/phonon_xine.so
 %{_kde4_datadir}/kde4/services/phononbackends/xine.desktop
+%{_datadir}/icons/hicolor/*/apps/phonon-gstreamer.*
 
 %files devel
 %defattr(-,root,root,-)
@@ -140,6 +153,15 @@
 
 
 %changelog
+* Thu Jan 29 2009 Rex Dietger <rdieter at fedoraproject.org> - 4.3.0-4
+- Requires: phonon-backend >= %%version
+- move icons to hicolor theme and into -backend subpkgs
+- BR: libxcb-devel
+- move phonon-gstreamer.svg to sources
+
+* Mon Jan 26 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.0-3
+- BR: automoc4 >= 0.9.86
+
 * Fri Jan 23 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.0-2
 - fix typo in postun scriptlet (introduced in 4.2.96-3)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/phonon/F-9/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	26 Jan 2009 11:10:18 -0000	1.4
+++ sources	29 Jan 2009 15:51:03 -0000	1.5
@@ -1 +1,2 @@
+8e3924f417fea67f72b2105faed2119c  gstreamer-logo.svg
 f851219ec1fb4eadc7904f053b6b498d  phonon-4.3.0.tar.bz2


--- gstreamer-logo.svg DELETED ---



From ausil at fedoraproject.org  Thu Jan 29 15:52:55 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Thu, 29 Jan 2009 15:52:55 +0000 (UTC)
Subject: rpms/perl-Network-IPv4Addr/F-10 perl-Network-IPv4Addr.spec,1.1,1.2
Message-ID: <20090129155255.0D63770117@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/perl-Network-IPv4Addr/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19363

Modified Files:
	perl-Network-IPv4Addr.spec 
Log Message:
* Thu Jan 29 2009 Dennis Gilmore <dennis at ausil.us> - 0.05-13
- remove OPTIMIZE for cleanliness sake
- fix up source0 url



Index: perl-Network-IPv4Addr.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Network-IPv4Addr/F-10/perl-Network-IPv4Addr.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Network-IPv4Addr.spec	29 Jan 2009 05:14:09 -0000	1.1
+++ perl-Network-IPv4Addr.spec	29 Jan 2009 15:52:24 -0000	1.2
@@ -1,13 +1,13 @@
 Summary: Network-IPv4Addr Perl module
 Name: perl-Network-IPv4Addr
 Version: 0.05
-Release: 12%{?dist}
+Release: 13%{?dist}
 License: GPL+ or Artistic
 Group: Development/Libraries
 URL: http://search.cpan.org/dist/Network-IPv4Addr/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
-Source0: Network-IPv4Addr-0.05.tar.gz
+Source0: http://search.cpan.org/CPAN/authors/id/F/FR/FRAJULAC/Network-IPv4Addr-%{version}.tar.gz
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 BuildRequires: perl(ExtUtils::MakeMaker)
 
@@ -22,7 +22,7 @@
 %setup -q -n Network-IPv4Addr-%{version}
 
 %build
-%{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS"
+%{__perl} Makefile.PL INSTALLDIRS=vendor
 make %{?_smp_mflags}
 
 %install
@@ -49,6 +49,10 @@
 %{_mandir}/man3/*.3*
 
 %changelog
+* Thu Jan 29 2009 Dennis Gilmore <dennis at ausil.us> - 0.05-13
+- remove OPTIMIZE for cleanliness sake
+- fix up source0 url
+
 * Wed Jan 28 2009 Dennis Gilmore <dennis at ausil.us> - 0.05-12
 - clean up spec file
 



From pkgdb at fedoraproject.org  Thu Jan 29 16:19:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 29 Jan 2009 16:19:54 +0000
Subject: [pkgdb] ruby-gnome2 had acl change status
Message-ID: <20090129161955.4507A208201@bastion.fedora.phx.redhat.com>

itamarjp has set the watchbugzilla acl on ruby-gnome2 (Fedora devel) to Approved for itamarjp

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ruby-gnome2



From pkgdb at fedoraproject.org  Thu Jan 29 16:19:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 29 Jan 2009 16:19:59 +0000
Subject: [pkgdb] ruby-gnome2 had acl change status
Message-ID: <20090129161959.65A5C208486@bastion.fedora.phx.redhat.com>

itamarjp has set the watchcommits acl on ruby-gnome2 (Fedora devel) to Approved for itamarjp

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ruby-gnome2



From pkgdb at fedoraproject.org  Thu Jan 29 16:20:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 29 Jan 2009 16:20:01 +0000
Subject: [pkgdb] ruby-gnome2 had acl change status
Message-ID: <20090129162001.9DBEB208494@bastion.fedora.phx.redhat.com>

itamarjp has set the commit acl on ruby-gnome2 (Fedora devel) to Approved for itamarjp

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ruby-gnome2



From pkgdb at fedoraproject.org  Thu Jan 29 16:20:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 29 Jan 2009 16:20:04 +0000
Subject: [pkgdb] ruby-gnome2 had acl change status
Message-ID: <20090129162004.0C944208496@bastion.fedora.phx.redhat.com>

itamarjp has set the approveacls acl on ruby-gnome2 (Fedora devel) to Approved for itamarjp

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ruby-gnome2



From pkgdb at fedoraproject.org  Thu Jan 29 16:20:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 29 Jan 2009 16:20:06 +0000
Subject: [pkgdb] ruby-gnome2 had acl change status
Message-ID: <20090129162006.D38D02084B6@bastion.fedora.phx.redhat.com>

itamarjp has set the watchbugzilla acl on ruby-gnome2 (Fedora devel) to Approved for mtasaka

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ruby-gnome2



From pkgdb at fedoraproject.org  Thu Jan 29 16:20:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 29 Jan 2009 16:20:11 +0000
Subject: [pkgdb] ruby-gnome2 had acl change status
Message-ID: <20090129162011.8C8A0208485@bastion.fedora.phx.redhat.com>

itamarjp has set the watchcommits acl on ruby-gnome2 (Fedora devel) to Approved for mtasaka

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ruby-gnome2



From pkgdb at fedoraproject.org  Thu Jan 29 16:20:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 29 Jan 2009 16:20:16 +0000
Subject: [pkgdb] ruby-gnome2 had acl change status
Message-ID: <20090129162016.7F62D20860A@bastion.fedora.phx.redhat.com>

itamarjp has set the commit acl on ruby-gnome2 (Fedora devel) to Approved for mtasaka

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ruby-gnome2



From pkgdb at fedoraproject.org  Thu Jan 29 16:20:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 29 Jan 2009 16:20:21 +0000
Subject: [pkgdb] ruby-gnome2 had acl change status
Message-ID: <20090129162022.48486208493@bastion.fedora.phx.redhat.com>

itamarjp has set the approveacls acl on ruby-gnome2 (Fedora devel) to Approved for mtasaka

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ruby-gnome2



From pkgdb at fedoraproject.org  Thu Jan 29 16:20:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 29 Jan 2009 16:20:35 +0000
Subject: [pkgdb] ruby-gnome2 had acl change status
Message-ID: <20090129162035.5F1EB208201@bastion.fedora.phx.redhat.com>

itamarjp has set the watchbugzilla acl on ruby-gnome2 (Fedora 8) to Approved for itamarjp

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ruby-gnome2



From pkgdb at fedoraproject.org  Thu Jan 29 16:20:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 29 Jan 2009 16:20:38 +0000
Subject: [pkgdb] ruby-gnome2 had acl change status
Message-ID: <20090129162038.1B27E208497@bastion.fedora.phx.redhat.com>

itamarjp has set the approveacls acl on ruby-gnome2 (Fedora 8) to Approved for itamarjp

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ruby-gnome2



From pkgdb at fedoraproject.org  Thu Jan 29 16:20:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 29 Jan 2009 16:20:41 +0000
Subject: [pkgdb] ruby-gnome2 had acl change status
Message-ID: <20090129162042.0B717208485@bastion.fedora.phx.redhat.com>

itamarjp has set the commit acl on ruby-gnome2 (Fedora 8) to Approved for itamarjp

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ruby-gnome2



From pkgdb at fedoraproject.org  Thu Jan 29 16:20:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 29 Jan 2009 16:20:42 +0000
Subject: [pkgdb] ruby-gnome2 had acl change status
Message-ID: <20090129162042.482E72084B7@bastion.fedora.phx.redhat.com>

itamarjp has set the watchcommits acl on ruby-gnome2 (Fedora 8) to Approved for itamarjp

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ruby-gnome2



From pkgdb at fedoraproject.org  Thu Jan 29 16:20:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 29 Jan 2009 16:20:43 +0000
Subject: [pkgdb] ruby-gnome2 had acl change status
Message-ID: <20090129162043.5E0F2208605@bastion.fedora.phx.redhat.com>

itamarjp has set the watchcommits acl on ruby-gnome2 (Fedora 9) to Approved for itamarjp

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ruby-gnome2



From pkgdb at fedoraproject.org  Thu Jan 29 16:20:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 29 Jan 2009 16:20:43 +0000
Subject: [pkgdb] ruby-gnome2 had acl change status
Message-ID: <20090129162043.8EF5620860B@bastion.fedora.phx.redhat.com>

itamarjp has set the watchbugzilla acl on ruby-gnome2 (Fedora 9) to Approved for itamarjp

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ruby-gnome2



From pkgdb at fedoraproject.org  Thu Jan 29 16:20:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 29 Jan 2009 16:20:44 +0000
Subject: [pkgdb] ruby-gnome2 had acl change status
Message-ID: <20090129162044.ABD4420860D@bastion.fedora.phx.redhat.com>

itamarjp has set the commit acl on ruby-gnome2 (Fedora 9) to Approved for itamarjp

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ruby-gnome2



From pkgdb at fedoraproject.org  Thu Jan 29 16:20:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 29 Jan 2009 16:20:47 +0000
Subject: [pkgdb] ruby-gnome2 had acl change status
Message-ID: <20090129162047.85DF420866E@bastion.fedora.phx.redhat.com>

itamarjp has set the approveacls acl on ruby-gnome2 (Fedora 9) to Approved for itamarjp

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ruby-gnome2



From pkgdb at fedoraproject.org  Thu Jan 29 16:20:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 29 Jan 2009 16:20:49 +0000
Subject: [pkgdb] ruby-gnome2 had acl change status
Message-ID: <20090129162049.6A3B22086F2@bastion.fedora.phx.redhat.com>

itamarjp has set the watchbugzilla acl on ruby-gnome2 (Fedora 9) to Approved for mtasaka

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ruby-gnome2



From pkgdb at fedoraproject.org  Thu Jan 29 16:20:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 29 Jan 2009 16:20:50 +0000
Subject: [pkgdb] ruby-gnome2 had acl change status
Message-ID: <20090129162050.93E40208701@bastion.fedora.phx.redhat.com>

itamarjp has set the watchcommits acl on ruby-gnome2 (Fedora 9) to Approved for mtasaka

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ruby-gnome2



From pkgdb at fedoraproject.org  Thu Jan 29 16:20:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 29 Jan 2009 16:20:52 +0000
Subject: [pkgdb] ruby-gnome2 had acl change status
Message-ID: <20090129162053.BF4B9208495@bastion.fedora.phx.redhat.com>

itamarjp has set the commit acl on ruby-gnome2 (Fedora 9) to Approved for mtasaka

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ruby-gnome2



From pkgdb at fedoraproject.org  Thu Jan 29 16:20:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 29 Jan 2009 16:20:53 +0000
Subject: [pkgdb] ruby-gnome2 had acl change status
Message-ID: <20090129162053.E769820873D@bastion.fedora.phx.redhat.com>

itamarjp has set the approveacls acl on ruby-gnome2 (Fedora 9) to Approved for mtasaka

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ruby-gnome2



From pkgdb at fedoraproject.org  Thu Jan 29 16:20:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 29 Jan 2009 16:20:58 +0000
Subject: [pkgdb] ruby-gnome2 had acl change status
Message-ID: <20090129162058.D06DA208201@bastion.fedora.phx.redhat.com>

itamarjp has set the watchbugzilla acl on ruby-gnome2 (Fedora 10) to Approved for itamarjp

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ruby-gnome2



From pkgdb at fedoraproject.org  Thu Jan 29 16:21:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 29 Jan 2009 16:21:00 +0000
Subject: [pkgdb] ruby-gnome2 had acl change status
Message-ID: <20090129162100.542BE208494@bastion.fedora.phx.redhat.com>

itamarjp has set the watchcommits acl on ruby-gnome2 (Fedora 10) to Approved for itamarjp

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ruby-gnome2



From pkgdb at fedoraproject.org  Thu Jan 29 16:21:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 29 Jan 2009 16:21:00 +0000
Subject: [pkgdb] ruby-gnome2 had acl change status
Message-ID: <20090129162101.062CE208745@bastion.fedora.phx.redhat.com>

itamarjp has set the commit acl on ruby-gnome2 (Fedora 10) to Approved for itamarjp

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ruby-gnome2



From pkgdb at fedoraproject.org  Thu Jan 29 16:21:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 29 Jan 2009 16:21:05 +0000
Subject: [pkgdb] ruby-gnome2 had acl change status
Message-ID: <20090129162105.60661208497@bastion.fedora.phx.redhat.com>

itamarjp has set the watchbugzilla acl on ruby-gnome2 (Fedora 10) to Approved for mtasaka

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ruby-gnome2



From pkgdb at fedoraproject.org  Thu Jan 29 16:21:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 29 Jan 2009 16:21:04 +0000
Subject: [pkgdb] ruby-gnome2 had acl change status
Message-ID: <20090129162104.87AD1208485@bastion.fedora.phx.redhat.com>

itamarjp has set the approveacls acl on ruby-gnome2 (Fedora 10) to Approved for itamarjp

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ruby-gnome2



From pkgdb at fedoraproject.org  Thu Jan 29 16:21:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 29 Jan 2009 16:21:05 +0000
Subject: [pkgdb] ruby-gnome2 had acl change status
Message-ID: <20090129162105.A9E5120874B@bastion.fedora.phx.redhat.com>

itamarjp has set the watchcommits acl on ruby-gnome2 (Fedora 10) to Approved for mtasaka

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ruby-gnome2



From pkgdb at fedoraproject.org  Thu Jan 29 16:21:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 29 Jan 2009 16:21:09 +0000
Subject: [pkgdb] ruby-gnome2 had acl change status
Message-ID: <20090129162109.CACCA20896A@bastion.fedora.phx.redhat.com>

itamarjp has set the approveacls acl on ruby-gnome2 (Fedora 10) to Approved for mtasaka

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ruby-gnome2



From pkgdb at fedoraproject.org  Thu Jan 29 16:21:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 29 Jan 2009 16:21:09 +0000
Subject: [pkgdb] ruby-gnome2 had acl change status
Message-ID: <20090129162109.6FBFA20876D@bastion.fedora.phx.redhat.com>

itamarjp has set the commit acl on ruby-gnome2 (Fedora 10) to Approved for mtasaka

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ruby-gnome2



From pkgdb at fedoraproject.org  Thu Jan 29 16:21:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 29 Jan 2009 16:21:23 +0000
Subject: [pkgdb] ruby-gnome2: itamarjp has requested watchbugzilla
Message-ID: <20090129162123.86D552084BD@bastion.fedora.phx.redhat.com>

itamarjp has requested the watchbugzilla acl on ruby-gnome2 (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ruby-gnome2



From pkgdb at fedoraproject.org  Thu Jan 29 16:21:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 29 Jan 2009 16:21:24 +0000
Subject: [pkgdb] ruby-gnome2: itamarjp has requested watchcommits
Message-ID: <20090129162125.04C5220860B@bastion.fedora.phx.redhat.com>

itamarjp has requested the watchcommits acl on ruby-gnome2 (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ruby-gnome2



From nphilipp at fedoraproject.org  Thu Jan 29 16:42:07 2009
From: nphilipp at fedoraproject.org (Nils Philippsen)
Date: Thu, 29 Jan 2009 16:42:07 +0000 (UTC)
Subject: rpms/gegl/devel gegl.spec,1.9,1.10
Message-ID: <20090129164207.5BCD470116@cvs1.fedora.phx.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/gegl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26985

Modified Files:
	gegl.spec 
Log Message:
use the same timestamps for certain documentation files on all architectures to avoid multi-lib conflicts (#481404)
consolidate spec files between OS releases
build with libspiro from F-9 on
reenable building documentation on ppc64
explicitly list more build requirements and/or versions to catch eventual problems during future builds



Index: gegl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gegl/devel/gegl.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- gegl.spec	13 Jan 2009 03:24:26 -0000	1.9
+++ gegl.spec	29 Jan 2009 16:41:36 -0000	1.10
@@ -1,17 +1,34 @@
 Summary:	A graph based image processing framework
 Name:		gegl
 Version:	0.0.22
-Release:	1%{?dist}
+Release:	2%{?dist}
 # The binary is under the GPL, while the libs are under LGPL
 License:	LGPLv3+ and GPLv3+
 Group:		System Environment/Libraries
 URL:		http://www.gegl.org/
 Source0:	ftp://ftp.gtk.org/pub/gegl/0.0/%{name}-%{version}.tar.bz2
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:	babl-devel gtk2-devel ruby
-BuildRequires:	libpng-devel libjpeg-devel librsvg2-devel libopenraw-devel
-BuildRequires:	perl-devel SDL-devel OpenEXR-devel lua-devel libspiro-devel
-BuildRequires:	asciidoc enscript w3m graphviz pkgconfig
+BuildRequires:	asciidoc
+BuildRequires:	babl-devel >= 0.0.22
+BuildRequires:  cairo-devel
+BuildRequires:  enscript
+BuildRequires:  glib2-devel >= 2.16.1
+BuildRequires:  graphviz
+BuildRequires:  gtk2-devel >= 2.8.6
+BuildRequires:  libjpeg-devel
+BuildRequires:  libopenraw-devel >= 0.0.5
+BuildRequires:	libpng-devel
+BuildRequires:  librsvg2-devel >= 2.14.0
+BuildRequires:	libspiro-devel
+BuildRequires:  libv4l-devel
+BuildRequires:  lua-devel >= 5.1.0
+BuildRequires:  OpenEXR-devel
+BuildRequires:  pango-devel
+BuildRequires:	perl-devel
+BuildRequires:  pkgconfig
+BuildRequires:  ruby
+BuildRequires:  SDL-devel
+BuildRequires:  w3m
 
 %description
 GEGL (Generic Graphics Library) is a graph based image processing framework. 
@@ -34,11 +51,21 @@
 chmod -x operations/external/ff-load.c operations/common/perlin/perlin.*
 
 %build
-%ifnarch ppc64
-%configure --disable-static --enable-workshop
-%else
-%configure --disable-static --enable-workshop --disable-docs
-%endif
+%configure \
+    --with-cairo \
+    --with-graphviz \
+    --with-gtk --with-gdk-pixbuf \
+    --with-libjpeg \
+    --with-libopenraw \
+    --with-libpng \
+    --with-librsvg \
+    --with-libspiro \
+    --with-libv4l \
+    --with-lua \
+    --with-openexr \
+    --with-pango --with-pangocairo \
+    --with-sdl
+    --disable-static --enable-workshop
 make %{?_smp_mflags}
 										
 %install
@@ -47,6 +74,11 @@
 
 rm -f %{buildroot}%{_libdir}/*.la
 
+# fix timestamps of generated files
+for f in %{_datadir}/gtk-doc/html/gegl/operations.html; do
+    touch -m -r ChangeLog "%{buildroot}/$f"
+done
+
 %check
 make check
 
@@ -66,14 +98,20 @@
 
 %files devel
 %defattr(-, root, root, -)
+%doc %{_datadir}/gtk-doc/html/gegl/
 %{_includedir}/gegl-0.0/
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/%{name}.pc
-%ifnarch ppc64
-%doc %{_datadir}/gtk-doc/html/gegl/
-%endif
 
 %changelog
+* Thu Jan 29 2009 Nils Philippsen - 0.0.22-2
+- use the same timestamps for certain documentation files on all architectures
+  to avoid multi-lib conflicts (#481404)
+- consolidate spec files between OS releases
+- reenable building documentation on ppc64
+- explicitly list more build requirements and/or versions to catch eventual
+  problems during future builds
+
 * Tue Jan 13 2009 Deji Akingunola <dakingun at gmail.com> - 0.0.22-1
 - Update to version 0.0.22
 



From ausil at fedoraproject.org  Thu Jan 29 16:42:19 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Thu, 29 Jan 2009 16:42:19 +0000 (UTC)
Subject: rpms/perl-Network-IPv4Addr/devel perl-Network-IPv4Addr.spec, 1.1,
	1.2
Message-ID: <20090129164219.81AB270116@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/perl-Network-IPv4Addr/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27017

Modified Files:
	perl-Network-IPv4Addr.spec 
Log Message:
* Thu Jan 29 2009 Dennis Gilmore <dennis at ausil.us> - 0.05-13
- remove OPTIMIZE for cleanliness sake
- fix up source0 url



Index: perl-Network-IPv4Addr.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Network-IPv4Addr/devel/perl-Network-IPv4Addr.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Network-IPv4Addr.spec	29 Jan 2009 05:16:04 -0000	1.1
+++ perl-Network-IPv4Addr.spec	29 Jan 2009 16:41:49 -0000	1.2
@@ -1,13 +1,13 @@
 Summary: Network-IPv4Addr Perl module
 Name: perl-Network-IPv4Addr
 Version: 0.05
-Release: 12%{?dist}
+Release: 13%{?dist}
 License: GPL+ or Artistic
 Group: Development/Libraries
 URL: http://search.cpan.org/dist/Network-IPv4Addr/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
-Source0: Network-IPv4Addr-0.05.tar.gz
+Source0: http://search.cpan.org/CPAN/authors/id/F/FR/FRAJULAC/Network-IPv4Addr-%{version}.tar.gz
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 BuildRequires: perl(ExtUtils::MakeMaker)
 
@@ -22,7 +22,7 @@
 %setup -q -n Network-IPv4Addr-%{version}
 
 %build
-%{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS"
+%{__perl} Makefile.PL INSTALLDIRS=vendor
 make %{?_smp_mflags}
 
 %install
@@ -49,6 +49,10 @@
 %{_mandir}/man3/*.3*
 
 %changelog
+* Thu Jan 29 2009 Dennis Gilmore <dennis at ausil.us> - 0.05-13
+- remove OPTIMIZE for cleanliness sake
+- fix up source0 url
+
 * Wed Jan 28 2009 Dennis Gilmore <dennis at ausil.us> - 0.05-12
 - clean up spec file
 



From nphilipp at fedoraproject.org  Thu Jan 29 16:53:28 2009
From: nphilipp at fedoraproject.org (Nils Philippsen)
Date: Thu, 29 Jan 2009 16:53:28 +0000 (UTC)
Subject: rpms/gegl/devel gegl.spec,1.10,1.11
Message-ID: <20090129165328.4E53070116@cvs1.fedora.phx.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/gegl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28947

Modified Files:
	gegl.spec 
Log Message:
fix typo



Index: gegl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gegl/devel/gegl.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- gegl.spec	29 Jan 2009 16:41:36 -0000	1.10
+++ gegl.spec	29 Jan 2009 16:52:57 -0000	1.11
@@ -64,7 +64,7 @@
     --with-lua \
     --with-openexr \
     --with-pango --with-pangocairo \
-    --with-sdl
+    --with-sdl \
     --disable-static --enable-workshop
 make %{?_smp_mflags}
 										



From salimma at fedoraproject.org  Thu Jan 29 16:54:49 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Thu, 29 Jan 2009 16:54:49 +0000 (UTC)
Subject: rpms/gnome-do/F-10 gnome-do.spec, 1.25,
	1.26 gnome-do-0.5.0.1-keyring.patch, 1.1,
	NONE gnome-do-0.5.0.1-launcher.patch, 1.1, NONE
Message-ID: <20090129165449.9A045179D1E@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/gnome-do/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29312/F-10

Modified Files:
	gnome-do.spec 
Removed Files:
	gnome-do-0.5.0.1-keyring.patch gnome-do-0.5.0.1-launcher.patch 
Log Message:
* Thu Jan 29 2009 Michel Salim <salimma at fedoraproject.org> - 0.6.1.0-3
- Remove Tomboy dependency (bz #481183)
- Updated description, from Do 



Index: gnome-do.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-do/F-10/gnome-do.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- gnome-do.spec	27 Oct 2008 17:32:43 -0000	1.25
+++ gnome-do.spec	29 Jan 2009 16:54:19 -0000	1.26
@@ -1,14 +1,15 @@
 %define			debug_package %{nil}
+%define                 mainver 0.6.1
 
 Name:			gnome-do
-Version:		0.6.1.0
-Release:		2%{?dist}
+Version:		%{mainver}.0
+Release:		3%{?dist}
 Summary:		Quick launch and search
 
 License:		GPLv3+
 Group:			Applications/File	
 URL:			http://do.davebsd.com/
-Source0:		http://launchpad.net/do/0.6/%{version}/+download/%{name}-%{version}.tar.gz
+Source0:		http://launchpad.net/do/0.6/%{mainver}/+download/%{name}-%{version}.tar.gz
 
 BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -31,21 +32,22 @@
 Requires(post): 	GConf2
 Requires(preun): 	GConf2
 
-Requires:		mono-core, mono-addins
-Requires:		tomboy
-Requires:		mono-core
+Requires:		mono-core mono-addins
 Requires:		ndesk-dbus
 Requires:		ndesk-dbus-glib
 Requires:		gnome-keyring-sharp
 Requires:		pkgconfig
 
 %description
-Allows you to quickly search for many objects present in your
-GNOME desktop environment and perform commonly used commands 
-on those objects
+GNOME Do (Do) is an intelligent launcher tool that makes performing
+common tasks on your computer simple and efficient. Do not only allows
+you to search for items in your desktop environment
+(e.g. applications, contacts, bookmarks, files, music), it also allows
+you to specify actions to perform on search results (e.g. run, open,
+email, chat, play).
 
 %package devel
-Summary:		Develpment files for GNOME Do
+Summary:		Development files for GNOME Do
 Group:			Development/Libraries
 Requires:		%{name} = %{version}-%{release}
 Requires:		pkgconfig
@@ -120,6 +122,10 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Thu Jan 29 2009 Michel Salim <salimma at fedoraproject.org> - 0.6.1.0-3
+- Remove Tomboy dependency (bz #481183)
+- Updated description, from Do 
+
 * Mon Oct 27 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.6.1.0-2
 - rebuild against new gnome-sharp
 
@@ -133,7 +139,7 @@
 - New upstream release
 
 * Wed Jun 11 2008 Sindre Pedersen Bj??rdal <sindrepb at fedoraproject.org> - 0.5.0.1-4
-- New upstrean release
+- New upstream release
 - Add gnome-desktop-sharp dependency
 
 * Wed Jun 04 2008 Caol??n McNamara <caolanm at redhat.com> - 0.4.2.0-2


--- gnome-do-0.5.0.1-keyring.patch DELETED ---


--- gnome-do-0.5.0.1-launcher.patch DELETED ---



From salimma at fedoraproject.org  Thu Jan 29 16:54:49 2009
From: salimma at fedoraproject.org (Michel Alexandre Salim)
Date: Thu, 29 Jan 2009 16:54:49 +0000 (UTC)
Subject: rpms/gnome-do/devel gnome-do.spec, 1.25,
	1.26 gnome-do-0.5.0.1-keyring.patch, 1.1,
	NONE gnome-do-0.5.0.1-launcher.patch, 1.1, NONE
Message-ID: <20090129165449.E7B00179D1E@cvs1.fedora.phx.redhat.com>

Author: salimma

Update of /cvs/pkgs/rpms/gnome-do/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29312/devel

Modified Files:
	gnome-do.spec 
Removed Files:
	gnome-do-0.5.0.1-keyring.patch gnome-do-0.5.0.1-launcher.patch 
Log Message:
* Thu Jan 29 2009 Michel Salim <salimma at fedoraproject.org> - 0.6.1.0-3
- Remove Tomboy dependency (bz #481183)
- Updated description, from Do 



Index: gnome-do.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-do/devel/gnome-do.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- gnome-do.spec	27 Oct 2008 17:32:43 -0000	1.25
+++ gnome-do.spec	29 Jan 2009 16:54:19 -0000	1.26
@@ -1,14 +1,15 @@
 %define			debug_package %{nil}
+%define                 mainver 0.6.1
 
 Name:			gnome-do
-Version:		0.6.1.0
-Release:		2%{?dist}
+Version:		%{mainver}.0
+Release:		3%{?dist}
 Summary:		Quick launch and search
 
 License:		GPLv3+
 Group:			Applications/File	
 URL:			http://do.davebsd.com/
-Source0:		http://launchpad.net/do/0.6/%{version}/+download/%{name}-%{version}.tar.gz
+Source0:		http://launchpad.net/do/0.6/%{mainver}/+download/%{name}-%{version}.tar.gz
 
 BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -31,21 +32,22 @@
 Requires(post): 	GConf2
 Requires(preun): 	GConf2
 
-Requires:		mono-core, mono-addins
-Requires:		tomboy
-Requires:		mono-core
+Requires:		mono-core mono-addins
 Requires:		ndesk-dbus
 Requires:		ndesk-dbus-glib
 Requires:		gnome-keyring-sharp
 Requires:		pkgconfig
 
 %description
-Allows you to quickly search for many objects present in your
-GNOME desktop environment and perform commonly used commands 
-on those objects
+GNOME Do (Do) is an intelligent launcher tool that makes performing
+common tasks on your computer simple and efficient. Do not only allows
+you to search for items in your desktop environment
+(e.g. applications, contacts, bookmarks, files, music), it also allows
+you to specify actions to perform on search results (e.g. run, open,
+email, chat, play).
 
 %package devel
-Summary:		Develpment files for GNOME Do
+Summary:		Development files for GNOME Do
 Group:			Development/Libraries
 Requires:		%{name} = %{version}-%{release}
 Requires:		pkgconfig
@@ -120,6 +122,10 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Thu Jan 29 2009 Michel Salim <salimma at fedoraproject.org> - 0.6.1.0-3
+- Remove Tomboy dependency (bz #481183)
+- Updated description, from Do 
+
 * Mon Oct 27 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.6.1.0-2
 - rebuild against new gnome-sharp
 
@@ -133,7 +139,7 @@
 - New upstream release
 
 * Wed Jun 11 2008 Sindre Pedersen Bj??rdal <sindrepb at fedoraproject.org> - 0.5.0.1-4
-- New upstrean release
+- New upstream release
 - Add gnome-desktop-sharp dependency
 
 * Wed Jun 04 2008 Caol??n McNamara <caolanm at redhat.com> - 0.4.2.0-2


--- gnome-do-0.5.0.1-keyring.patch DELETED ---


--- gnome-do-0.5.0.1-launcher.patch DELETED ---



From ltinkl at fedoraproject.org  Thu Jan 29 16:58:28 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Thu, 29 Jan 2009 16:58:28 +0000 (UTC)
Subject: rpms/soprano/F-10 .cvsignore, 1.14, 1.15 soprano.spec, 1.24,
	1.25 sources, 1.14, 1.15
Message-ID: <20090129165828.C504770116@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/soprano/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30510/F-10

Modified Files:
	.cvsignore soprano.spec sources 
Log Message:
Soprano 2.2.1 (to go with KDE 4.2.0)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/soprano/F-10/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	27 Jan 2009 19:42:58 -0000	1.14
+++ .cvsignore	29 Jan 2009 16:57:58 -0000	1.15
@@ -1 +1 @@
-soprano-2.2.tar.bz2
+soprano-2.2.1.tar.bz2


Index: soprano.spec
===================================================================
RCS file: /cvs/extras/rpms/soprano/F-10/soprano.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- soprano.spec	27 Jan 2009 19:42:58 -0000	1.24
+++ soprano.spec	29 Jan 2009 16:57:58 -0000	1.25
@@ -6,13 +6,13 @@
 
 Summary: Qt wrapper API to different RDF storage solutions
 Name:    soprano
-Version: 2.2
+Version: 2.2.1
 Release: 1%{?dist}
 
 Group:   System Environment/Libraries
 License: LGPLv2+
 URL:     http://sourceforge.net/projects/soprano
-Source0: http://downloads.sf.net/soprano/soprano-%{version}%{?beta}.tar.bz2
+Source0: http://downloads.sf.net/soprano/soprano-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: cmake
@@ -51,7 +51,7 @@
 
 
 %prep
-%setup -q -n soprano-%{version}%{?beta}
+%setup -q -n soprano-%{version}
 
 
 %build
@@ -108,6 +108,9 @@
 
 
 %changelog
+* Thu Jan 29 2009 Luk???? Tinkl <ltinkl at redhat.com> 2.2.1-1
+- update to 2.2.1
+
 * Tue Jan 27 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 2.2-1
 - update to 2.2
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/soprano/F-10/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	27 Jan 2009 19:42:58 -0000	1.14
+++ sources	29 Jan 2009 16:57:58 -0000	1.15
@@ -1 +1 @@
-a9642861b3c4f1916a7821847e3d094a  soprano-2.2.tar.bz2
+69688a71273e1e9389fc60e3085c695f  soprano-2.2.1.tar.bz2



From ltinkl at fedoraproject.org  Thu Jan 29 16:58:29 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Thu, 29 Jan 2009 16:58:29 +0000 (UTC)
Subject: rpms/soprano/F-9 .cvsignore, 1.11, 1.12 soprano.spec, 1.21,
	1.22 sources, 1.12, 1.13
Message-ID: <20090129165829.0A26E70116@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/soprano/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30510/F-9

Modified Files:
	.cvsignore soprano.spec sources 
Log Message:
Soprano 2.2.1 (to go with KDE 4.2.0)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/soprano/F-9/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	27 Jan 2009 19:42:58 -0000	1.11
+++ .cvsignore	29 Jan 2009 16:57:58 -0000	1.12
@@ -1 +1 @@
-soprano-2.2.tar.bz2
+soprano-2.2.1.tar.bz2


Index: soprano.spec
===================================================================
RCS file: /cvs/extras/rpms/soprano/F-9/soprano.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- soprano.spec	27 Jan 2009 19:42:58 -0000	1.21
+++ soprano.spec	29 Jan 2009 16:57:58 -0000	1.22
@@ -6,13 +6,13 @@
 
 Summary: Qt wrapper API to different RDF storage solutions
 Name:    soprano
-Version: 2.2
+Version: 2.2.1
 Release: 1%{?dist}
 
 Group:   System Environment/Libraries
 License: LGPLv2+
 URL:     http://sourceforge.net/projects/soprano
-Source0: http://downloads.sf.net/soprano/soprano-%{version}%{?beta}.tar.bz2
+Source0: http://downloads.sf.net/soprano/soprano-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: cmake
@@ -51,7 +51,7 @@
 
 
 %prep
-%setup -q -n soprano-%{version}%{?beta}
+%setup -q -n soprano-%{version}
 
 
 %build
@@ -108,6 +108,9 @@
 
 
 %changelog
+* Thu Jan 29 2009 Luk???? Tinkl <ltinkl at redhat.com> 2.2.1-1
+- update to 2.2.1
+
 * Tue Jan 27 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 2.2-1
 - update to 2.2
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/soprano/F-9/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	27 Jan 2009 19:42:58 -0000	1.12
+++ sources	29 Jan 2009 16:57:58 -0000	1.13
@@ -1 +1 @@
-a9642861b3c4f1916a7821847e3d094a  soprano-2.2.tar.bz2
+69688a71273e1e9389fc60e3085c695f  soprano-2.2.1.tar.bz2



From ltinkl at fedoraproject.org  Thu Jan 29 16:58:29 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Thu, 29 Jan 2009 16:58:29 +0000 (UTC)
Subject: rpms/soprano/devel .cvsignore, 1.16, 1.17 soprano.spec, 1.26,
	1.27 sources, 1.16, 1.17
Message-ID: <20090129165829.5392A70116@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/soprano/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30510/devel

Modified Files:
	.cvsignore soprano.spec sources 
Log Message:
Soprano 2.2.1 (to go with KDE 4.2.0)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/soprano/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore	27 Jan 2009 17:30:42 -0000	1.16
+++ .cvsignore	29 Jan 2009 16:57:59 -0000	1.17
@@ -1 +1 @@
-soprano-2.2.tar.bz2
+soprano-2.2.1.tar.bz2


Index: soprano.spec
===================================================================
RCS file: /cvs/extras/rpms/soprano/devel/soprano.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- soprano.spec	27 Jan 2009 17:30:42 -0000	1.26
+++ soprano.spec	29 Jan 2009 16:57:59 -0000	1.27
@@ -6,13 +6,13 @@
 
 Summary: Qt wrapper API to different RDF storage solutions
 Name:    soprano
-Version: 2.2
+Version: 2.2.1
 Release: 1%{?dist}
 
 Group:   System Environment/Libraries
 License: LGPLv2+
 URL:     http://sourceforge.net/projects/soprano
-Source0: http://downloads.sf.net/soprano/soprano-%{version}%{?beta}.tar.bz2
+Source0: http://downloads.sf.net/soprano/soprano-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: cmake
@@ -51,7 +51,7 @@
 
 
 %prep
-%setup -q -n soprano-%{version}%{?beta}
+%setup -q -n soprano-%{version}
 
 
 %build
@@ -108,6 +108,9 @@
 
 
 %changelog
+* Thu Jan 29 2009 Luk???? Tinkl <ltinkl at redhat.com> 2.2.1-1
+- update to 2.2.1
+
 * Tue Jan 27 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 2.2-1
 - update to 2.2
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/soprano/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources	27 Jan 2009 17:30:42 -0000	1.16
+++ sources	29 Jan 2009 16:57:59 -0000	1.17
@@ -1 +1 @@
-a9642861b3c4f1916a7821847e3d094a  soprano-2.2.tar.bz2
+69688a71273e1e9389fc60e3085c695f  soprano-2.2.1.tar.bz2



From nsantos at fedoraproject.org  Thu Jan 29 17:01:52 2009
From: nsantos at fedoraproject.org (Nuno Santos)
Date: Thu, 29 Jan 2009 17:01:52 +0000 (UTC)
Subject: rpms/qpidc/F-10 qpidc.spec,1.62,1.63
Message-ID: <20090129170152.32A9F70116@cvs1.fedora.phx.redhat.com>

Author: nsantos

Update of /cvs/extras/rpms/qpidc/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31273

Modified Files:
	qpidc.spec 
Log Message:
add missing .so files to specfile


Index: qpidc.spec
===================================================================
RCS file: /cvs/extras/rpms/qpidc/F-10/qpidc.spec,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- qpidc.spec	29 Jan 2009 04:49:36 -0000	1.62
+++ qpidc.spec	29 Jan 2009 17:01:21 -0000	1.63
@@ -172,7 +172,7 @@
 %description perftest
 Tools for performing testing and benchmarking of MRG-Messaging
 
-%pre
+%pre -n qpidd
 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 \
@@ -264,6 +264,8 @@
 %defattr(-,root,root,-)
 %_libdir/libqpidbroker.so.0
 %_libdir/libqpidbroker.so.0.1.0
+%_libdir/qpid/daemon/replicating_listener.so
+%_libdir/qpid/daemon/replication_exchange.so
 %_sbindir/qpidd
 %config(noreplace) %_sysconfdir/qpidd.conf
 %config(noreplace) %_sysconfdir/sasl2/qpidd.conf



From nsantos at fedoraproject.org  Thu Jan 29 17:07:39 2009
From: nsantos at fedoraproject.org (Nuno Santos)
Date: Thu, 29 Jan 2009 17:07:39 +0000 (UTC)
Subject: rpms/qpidc/F-10 qpidc.spec,1.63,1.64
Message-ID: <20090129170739.6D27170116@cvs1.fedora.phx.redhat.com>

Author: nsantos

Update of /cvs/extras/rpms/qpidc/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32315

Modified Files:
	qpidc.spec 
Log Message:
add missing Requires to qmf-devel


Index: qpidc.spec
===================================================================
RCS file: /cvs/extras/rpms/qpidc/F-10/qpidc.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- qpidc.spec	29 Jan 2009 17:01:21 -0000	1.63
+++ qpidc.spec	29 Jan 2009 17:07:09 -0000	1.64
@@ -91,6 +91,7 @@
 Summary: Header files and tools for developing QMF extensions
 Group: Development/System
 Requires: qmf = %version-%release
+Requires: %name-devel = %version-%release
 
 %description -n qmf-devel
 Header files and code-generation tools needed for developers of QMF-managed



From timj at fedoraproject.org  Thu Jan 29 17:13:03 2009
From: timj at fedoraproject.org (Tim Jackson)
Date: Thu, 29 Jan 2009 17:13:03 +0000 (UTC)
Subject: rpms/bind-to-tinydns/EL-5 bind-to-tinydns-0.4.3-cflags.patch, NONE, 
	1.1 bind-to-tinydns.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <20090129171303.D440570116@cvs1.fedora.phx.redhat.com>

Author: timj

Update of /cvs/pkgs/rpms/bind-to-tinydns/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv621

Modified Files:
	.cvsignore sources 
Added Files:
	bind-to-tinydns-0.4.3-cflags.patch bind-to-tinydns.spec 
Log Message:
Initial import of bind-to-tinydns (bug #481564)


bind-to-tinydns-0.4.3-cflags.patch:

--- NEW FILE bind-to-tinydns-0.4.3-cflags.patch ---
Binary files bind-to-tinydns-0.4.3/bind-to-tinydns and bind-to-tinydns-0.4.3.new/bind-to-tinydns differ
diff -ruNp bind-to-tinydns-0.4.3/Makefile bind-to-tinydns-0.4.3.new/Makefile
--- bind-to-tinydns-0.4.3/Makefile	2003-06-01 14:21:34.000000000 -0300
+++ bind-to-tinydns-0.4.3.new/Makefile	2009-01-27 12:20:44.000000000 -0200
@@ -1,7 +1,8 @@
 CC=cc -Wall -g
+CFLAGS=
 
 bind-to-tinydns: bind-to-tinydns.c
-	${CC} -o bind-to-tinydns bind-to-tinydns.c
+	${CC} $(CFLAGS) -o bind-to-tinydns bind-to-tinydns.c
 
 clean:
 	rm -f bind-to-tinydns


--- NEW FILE bind-to-tinydns.spec ---
Name:           bind-to-tinydns
Version:        0.4.3
Release:        4%{?dist}
Summary:        Convert DNS zone files in BIND format to tinydns format

Group:          Applications/System
License:        GPL+
URL:            http://www.erat.org/
Source0:        http://www.erat.org/files/bind-to-tinydns-%{version}.tar.gz
Patch0:         bind-to-tinydns-0.4.3-cflags.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%description
This is a program that parses zone files used by the BIND DNS server and
converts them to the native format of the tinydns component of Dan Bernstein's
djbdns DNS server.

%prep
%setup -q
%patch0 -p1


%build
make %{?_smp_mflags} CFLAGS="%{optflags}"


%install
rm -rf $RPM_BUILD_ROOT
install -Dp -m 755 bind-to-tinydns $RPM_BUILD_ROOT%{_bindir}/bind-to-tinydns

%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc README COPYING
%{_bindir}/bind-to-tinydns


%changelog
* Tue Jan 27 2009 Tim Jackson <rpm at timj.co.uk> 0.4.3-4
- Compile stage now uses standard compiler flags

* Tue Jan 27 2009 Tim Jackson <rpm at timj.co.uk> 0.4.3-3
- Correct License tag to GPL+

* Tue Jan 27 2009 Tim Jackson <rpm at timj.co.uk> 0.4.3-2
- Add missing source URL

* Sat Sep 06 2008 Tim Jackson <rpm at timj.co.uk> 0.4.3-1
- Initial RPM build


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bind-to-tinydns/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	29 Jan 2009 00:13:24 -0000	1.1
+++ .cvsignore	29 Jan 2009 17:12:33 -0000	1.2
@@ -0,0 +1 @@
+bind-to-tinydns-0.4.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bind-to-tinydns/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	29 Jan 2009 00:13:24 -0000	1.1
+++ sources	29 Jan 2009 17:12:33 -0000	1.2
@@ -0,0 +1 @@
+92657532ac03c439c85156554351b154  bind-to-tinydns-0.4.3.tar.gz



From timj at fedoraproject.org  Thu Jan 29 17:26:37 2009
From: timj at fedoraproject.org (Tim Jackson)
Date: Thu, 29 Jan 2009 17:26:37 +0000 (UTC)
Subject: rpms/bind-to-tinydns/devel bind-to-tinydns-0.4.3-cflags.patch, NONE,
	1.1 bind-to-tinydns.spec, NONE, 1.1 sources, 1.1, 1.2
Message-ID: <20090129172637.48BD270116@cvs1.fedora.phx.redhat.com>

Author: timj

Update of /cvs/pkgs/rpms/bind-to-tinydns/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2555

Modified Files:
	sources 
Added Files:
	bind-to-tinydns-0.4.3-cflags.patch bind-to-tinydns.spec 
Log Message:
Initial import of bind-to-tinydns 0.4.3 (bug #481564)


bind-to-tinydns-0.4.3-cflags.patch:

--- NEW FILE bind-to-tinydns-0.4.3-cflags.patch ---
Binary files bind-to-tinydns-0.4.3/bind-to-tinydns and bind-to-tinydns-0.4.3.new/bind-to-tinydns differ
diff -ruNp bind-to-tinydns-0.4.3/Makefile bind-to-tinydns-0.4.3.new/Makefile
--- bind-to-tinydns-0.4.3/Makefile	2003-06-01 14:21:34.000000000 -0300
+++ bind-to-tinydns-0.4.3.new/Makefile	2009-01-27 12:20:44.000000000 -0200
@@ -1,7 +1,8 @@
 CC=cc -Wall -g
+CFLAGS=
 
 bind-to-tinydns: bind-to-tinydns.c
-	${CC} -o bind-to-tinydns bind-to-tinydns.c
+	${CC} $(CFLAGS) -o bind-to-tinydns bind-to-tinydns.c
 
 clean:
 	rm -f bind-to-tinydns


--- NEW FILE bind-to-tinydns.spec ---
Name:           bind-to-tinydns
Version:        0.4.3
Release:        4%{?dist}
Summary:        Convert DNS zone files in BIND format to tinydns format

Group:          Applications/System
License:        GPL+
URL:            http://www.erat.org/
Source0:        http://www.erat.org/files/bind-to-tinydns-%{version}.tar.gz
Patch0:         bind-to-tinydns-0.4.3-cflags.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%description
This is a program that parses zone files used by the BIND DNS server and
converts them to the native format of the tinydns component of Dan Bernstein's
djbdns DNS server.

%prep
%setup -q
%patch0 -p1


%build
make %{?_smp_mflags} CFLAGS="%{optflags}"


%install
rm -rf $RPM_BUILD_ROOT
install -Dp -m 755 bind-to-tinydns $RPM_BUILD_ROOT%{_bindir}/bind-to-tinydns

%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc README COPYING
%{_bindir}/bind-to-tinydns


%changelog
* Tue Jan 27 2009 Tim Jackson <rpm at timj.co.uk> 0.4.3-4
- Compile stage now uses standard compiler flags

* Tue Jan 27 2009 Tim Jackson <rpm at timj.co.uk> 0.4.3-3
- Correct License tag to GPL+

* Tue Jan 27 2009 Tim Jackson <rpm at timj.co.uk> 0.4.3-2
- Add missing source URL

* Sat Sep 06 2008 Tim Jackson <rpm at timj.co.uk> 0.4.3-1
- Initial RPM build


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bind-to-tinydns/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	29 Jan 2009 00:13:24 -0000	1.1
+++ sources	29 Jan 2009 17:26:06 -0000	1.2
@@ -0,0 +1 @@
+92657532ac03c439c85156554351b154  bind-to-tinydns-0.4.3.tar.gz



From bpepple at fedoraproject.org  Thu Jan 29 17:35:45 2009
From: bpepple at fedoraproject.org (Brian Pepple)
Date: Thu, 29 Jan 2009 17:35:45 +0000 (UTC)
Subject: rpms/telepathy-glib/devel .cvsignore, 1.24, 1.25 sources, 1.24,
	1.25 telepathy-glib.spec, 1.31, 1.32
Message-ID: <20090129173545.7597170116@cvs1.fedora.phx.redhat.com>

Author: bpepple

Update of /cvs/pkgs/rpms/telepathy-glib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4343

Modified Files:
	.cvsignore sources telepathy-glib.spec 
Log Message:
* Wed Jan 28 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.7.24-1
- Update to 0.7.24.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-glib/devel/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- .cvsignore	20 Jan 2009 16:33:48 -0000	1.24
+++ .cvsignore	29 Jan 2009 17:35:14 -0000	1.25
@@ -1 +1 @@
-telepathy-glib-0.7.23.tar.gz
+telepathy-glib-0.7.24.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-glib/devel/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- sources	20 Jan 2009 16:33:48 -0000	1.24
+++ sources	29 Jan 2009 17:35:14 -0000	1.25
@@ -1 +1 @@
-d27958be1f0fdcc4801839ed121171e8  telepathy-glib-0.7.23.tar.gz
+f49db7c435ed7494d9129d400839833d  telepathy-glib-0.7.24.tar.gz


Index: telepathy-glib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-glib/devel/telepathy-glib.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- telepathy-glib.spec	20 Jan 2009 16:33:48 -0000	1.31
+++ telepathy-glib.spec	29 Jan 2009 17:35:15 -0000	1.32
@@ -3,7 +3,7 @@
 %define	glib_ver	2.16
 
 Name:           telepathy-glib
-Version:        0.7.23
+Version:        0.7.24
 Release:        1%{?dist}
 Summary:        GLib bindings for Telepathy
 
@@ -89,6 +89,9 @@
 
 
 %changelog
+* Wed Jan 28 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.7.24-1
+- Update to 0.7.24.
+
 * Tue Jan 20 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.7.23-1
 - Update to 0.7.23.
 



From remi at fedoraproject.org  Thu Jan 29 17:47:43 2009
From: remi at fedoraproject.org (Remi Collet)
Date: Thu, 29 Jan 2009 17:47:43 +0000 (UTC)
Subject: rpms/php-pear-Net-Ping/F-10 php-pear-Net-Ping.spec, 1.3, 1.4 sources,
	1.4, 1.5 xml2changelog, 1.2, 1.3
Message-ID: <20090129174743.894F070116@cvs1.fedora.phx.redhat.com>

Author: remi

Update of /cvs/extras/rpms/php-pear-Net-Ping/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5857

Modified Files:
	php-pear-Net-Ping.spec sources xml2changelog 
Log Message:
update to 2.4.4 (bugfix)


Index: php-pear-Net-Ping.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Net-Ping/F-10/php-pear-Net-Ping.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- php-pear-Net-Ping.spec	28 Dec 2007 22:12:03 -0000	1.3
+++ php-pear-Net-Ping.spec	29 Jan 2009 17:47:12 -0000	1.4
@@ -2,7 +2,7 @@
 %define pear_name Net_Ping
 
 Name:           php-pear-Net-Ping
-Version:        2.4.3
+Version:        2.4.4
 Release:        1%{?dist}
 Summary:        Execute ping
 
@@ -26,6 +26,7 @@
 
 %prep
 %setup -q -c
+# package.xml is V2
 %{_bindir}/php -n %{SOURCE2} package.xml >CHANGELOG
 mv package.xml %{pear_name}-%{version}/%{pear_name}.xml
 
@@ -83,6 +84,9 @@
 
 
 %changelog
+* Wed Jan 28 2009 Remi Collet <Fedora at FamilleCollet.com> 2.4.4-1
+- update to 2.4.4 (bugfix)
+
 * Fri Dec 28 2007 Remi Collet <Fedora at FamilleCollet.com> 2.4.3-1
 - update to 2.4.3
 
@@ -100,3 +104,4 @@
 - initial RPM (generated specfile + cleanup)
 - add CHANGELOG and LICENSE
 - convert package.xml to package2.xml
+


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Net-Ping/F-10/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	28 Dec 2007 22:12:03 -0000	1.4
+++ sources	29 Jan 2009 17:47:13 -0000	1.5
@@ -1 +1 @@
-340ca27cfa1c0aab31991928d423cffb  Net_Ping-2.4.3.tgz
+572a4039c475beca53fa59ac4e407da8  Net_Ping-2.4.4.tgz


Index: xml2changelog
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Net-Ping/F-10/xml2changelog,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xml2changelog	10 Jul 2007 19:37:40 -0000	1.2
+++ xml2changelog	29 Jan 2009 17:47:13 -0000	1.3
@@ -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  Thu Jan 29 17:52:07 2009
From: remi at fedoraproject.org (Remi Collet)
Date: Thu, 29 Jan 2009 17:52:07 +0000 (UTC)
Subject: rpms/php-pear-Net-Ping/F-9 php-pear-Net-Ping.spec, 1.3, 1.4 sources,
	1.4, 1.5 xml2changelog, 1.2, 1.3
Message-ID: <20090129175207.9656F70116@cvs1.fedora.phx.redhat.com>

Author: remi

Update of /cvs/extras/rpms/php-pear-Net-Ping/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6518

Modified Files:
	php-pear-Net-Ping.spec sources xml2changelog 
Log Message:
update to 2.4.4 (bugfix)


Index: php-pear-Net-Ping.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Net-Ping/F-9/php-pear-Net-Ping.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- php-pear-Net-Ping.spec	28 Dec 2007 22:12:03 -0000	1.3
+++ php-pear-Net-Ping.spec	29 Jan 2009 17:51:37 -0000	1.4
@@ -2,7 +2,7 @@
 %define pear_name Net_Ping
 
 Name:           php-pear-Net-Ping
-Version:        2.4.3
+Version:        2.4.4
 Release:        1%{?dist}
 Summary:        Execute ping
 
@@ -26,6 +26,7 @@
 
 %prep
 %setup -q -c
+# package.xml is V2
 %{_bindir}/php -n %{SOURCE2} package.xml >CHANGELOG
 mv package.xml %{pear_name}-%{version}/%{pear_name}.xml
 
@@ -83,6 +84,9 @@
 
 
 %changelog
+* Wed Jan 28 2009 Remi Collet <Fedora at FamilleCollet.com> 2.4.4-1
+- update to 2.4.4 (bugfix)
+
 * Fri Dec 28 2007 Remi Collet <Fedora at FamilleCollet.com> 2.4.3-1
 - update to 2.4.3
 
@@ -100,3 +104,4 @@
 - initial RPM (generated specfile + cleanup)
 - add CHANGELOG and LICENSE
 - convert package.xml to package2.xml
+


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Net-Ping/F-9/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	28 Dec 2007 22:12:03 -0000	1.4
+++ sources	29 Jan 2009 17:51:37 -0000	1.5
@@ -1 +1 @@
-340ca27cfa1c0aab31991928d423cffb  Net_Ping-2.4.3.tgz
+572a4039c475beca53fa59ac4e407da8  Net_Ping-2.4.4.tgz


Index: xml2changelog
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Net-Ping/F-9/xml2changelog,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xml2changelog	10 Jul 2007 19:37:40 -0000	1.2
+++ xml2changelog	29 Jan 2009 17:51:37 -0000	1.3
@@ -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 rdieter at fedoraproject.org  Thu Jan 29 17:58:18 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu, 29 Jan 2009 17:58:18 +0000 (UTC)
Subject: rpms/qt/devel .cvsignore, 1.44, 1.45 qt.spec, 1.224, 1.225 sources, 
	1.45, 1.46
Message-ID: <20090129175818.0771A70116@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/qt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8144

Modified Files:
	.cvsignore qt.spec sources 
Log Message:
* Thu Jan 29 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.4.3-14
- qt-copy-patches-20090129



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qt/devel/.cvsignore,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- .cvsignore	12 Jan 2009 12:09:49 -0000	1.44
+++ .cvsignore	29 Jan 2009 17:57:47 -0000	1.45
@@ -1,5 +1,4 @@
 hi128-app-qt4-logo.png
 hi48-app-qt4-logo.png
 qt-x11-opensource-src-4.4.3.tar.bz2
-qt-copy-patches-20081225svn.tar.bz2
-qt-copy-patches-20090112svn.tar.bz2
+qt-copy-patches-20090129svn.tar.bz2


Index: qt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qt/devel/qt.spec,v
retrieving revision 1.224
retrieving revision 1.225
diff -u -r1.224 -r1.225
--- qt.spec	27 Jan 2009 00:15:40 -0000	1.224
+++ qt.spec	29 Jan 2009 17:57:47 -0000	1.225
@@ -9,7 +9,7 @@
 Name:    qt4
 %endif
 Version: 4.4.3
-Release: 13%{?dist}
+Release: 14%{?dist}
 
 # GPLv2 exceptions(see GPL_EXCEPTIONS*.txt)
 License: GPLv3 with exceptions or GPLv2 with exceptions
@@ -40,7 +40,7 @@
 Patch10: qt-x11-opensource-src-4.4.3-im.patch
 
 ## qt-copy patches
-%define qt_copy 20090112
+%define qt_copy 20090129
 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}}
@@ -734,6 +734,9 @@
 
 
 %changelog
+* Thu Jan 29 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.4.3-14
+- qt-copy-patches-20090129
+
 * Mon Jan 26 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.4.3-13
 - Provides: qt4%%{?_isa} = %%version-%%release
 - add %%_qt4 to macros.qt4


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qt/devel/sources,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- sources	12 Jan 2009 12:09:49 -0000	1.45
+++ sources	29 Jan 2009 17:57:47 -0000	1.46
@@ -1,4 +1,4 @@
 d9f511e4b51983b4e10eb58b320416d5  hi128-app-qt4-logo.png
 6dcc0672ff9e60a6b83f95c5f42bec5b  hi48-app-qt4-logo.png
 00e00c6324d342a7b0d8653112b4f08c  qt-x11-opensource-src-4.4.3.tar.bz2
-9c51cc569de37085da1af39750a35ba7  qt-copy-patches-20090112svn.tar.bz2
+9c2c9930560dddd4713aa99af3a5199f  qt-copy-patches-20090129svn.tar.bz2



From rdieter at fedoraproject.org  Thu Jan 29 18:30:51 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu, 29 Jan 2009 18:30:51 +0000 (UTC)
Subject: rpms/kdebase-workspace/devel solid-bluetoothTrunkTo42.diff, NONE,
	1.1 kdebase-workspace.spec, 1.171, 1.172
Message-ID: <20090129183051.DD12E70116@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdebase-workspace/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13896

Modified Files:
	kdebase-workspace.spec 
Added Files:
	solid-bluetoothTrunkTo42.diff 
Log Message:
* Thu Jan 29 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.0-3
- Requires: PyKDE4 (for plasmascript bits)
- solid-bluetoothTrunkTo42.diff (bug #481801), and 
  +Provides: solid-bluetooth(-devel) = 4.3


solid-bluetoothTrunkTo42.diff:

--- NEW FILE solid-bluetoothTrunkTo42.diff ---
Index: solid_bluez.desktop
===================================================================
--- solid_bluez.desktop	(.../branches/KDE/4.2/kdebase/workspace/solid/bluez)	(revision 912529)
+++ solid/bluez/solid_bluez.desktop	(.../trunk/KDE/kdebase/workspace/solid/bluez)	(revision 912529)
@@ -7,7 +7,6 @@
 Name=BlueZ
 Name[hi]=??????????????????
 Name[kn]=?????????????????????
-Name[mai]=???????????????
 Name[ne]=????????????Z
 Name[sr]=????????
 Name[x-test]=xxBlueZxx
Index: bluez-bluetoothinterface.cpp
===================================================================
--- bluez-bluetoothinterface.cpp	(.../branches/KDE/4.2/kdebase/workspace/solid/bluez)	(revision 912529)
+++ solid/bluez/bluez-bluetoothinterface.cpp	(.../trunk/KDE/kdebase/workspace/solid/bluez)	(revision 912529)
@@ -25,6 +25,7 @@
 #include <solid/control/bluetoothinterface.h>
 
 #include "bluez-bluetoothremotedevice.h"
+#include "bluez-bluetoothinputdevice.h"
 #include <KDebug>
 
 
@@ -43,6 +44,7 @@
     QString objectPath;
 
     QMap<QString, BluezBluetoothRemoteDevice *> devices;
+    QMap<QString, BluezBluetoothInputDevice *> inputDevices;
 };
 
 
@@ -56,23 +58,6 @@
                                    objectPath, \
                                    "org.bluez.Adapter", \
                                    signal, this, SLOT(slot));
-/*  
-    connectInterfaceToThis("ModeChanged", slotModeChanged(const QString &));
-    connectInterfaceToThis("DiscoverableTimeoutChanged", slotDiscoverableTimeoutChanged(int));
-    connectInterfaceToThis("MinorClassChanged", slotMinorClassChanged(const QString &));
-    connectInterfaceToThis("NameChanged", slotNameChanged(const QString &));
-    connectInterfaceToThis("DiscoveryStarted", slotDiscoveryStarted());
-    connectInterfaceToThis("DiscoveryCompleted", slotDiscoveryCompleted());
-    connectInterfaceToThis("RemoteDeviceDisappeared", slotRemoteDeviceDisappeared(const QString &));
-    connectInterfaceToThis("RemoteDeviceFound", slotRemoteDeviceFound(const QString &, uint, short));
-    connectInterfaceToThis("RemoteNameUpdated", slotRemoteNameUpdated(const QString &, const QString &));
-    connectInterfaceToThis("RemoteDeviceConnected", slotRemoteDeviceConnected(const QString &));
-    connectInterfaceToThis("RemoteDeviceDisconnected", slotRemoteDeviceDisconnected(const QString &));
-    connectInterfaceToThis("TrustAdded", slotTrustAdded(const QString &));
-    connectInterfaceToThis("TrustRemoved", slotTrustRemoved(const QString &));
-    connectInterfaceToThis("BondingCreated", slotBondingCreated(const QString &));
-    connectInterfaceToThis("BondingRemoved", slotBondingRemoved(const QString &));
-*/
 
     connectInterfaceToThis("PropertyChanged", slotPropertyChanged(const QString &, const QVariant &));
     connectInterfaceToThis("DeviceCreated", slotDeviceCreated(const QDBusObjectPath &));
@@ -98,21 +83,14 @@
     d->iface.call("CancelDeviceCreation",addr);
 }
 
-QString BluezBluetoothInterface::createDevice(const QString &addr) const
+void BluezBluetoothInterface::createDevice(const QString &addr) const
 {
-    QDBusObjectPath path = objectReply("CreateDevice",addr);
-    return path.path();
+    d->iface.call("CreateDevice",addr);
 }
 
-QString BluezBluetoothInterface::createPairedDevice(const QString &addr, const QString &agentUBI, const QString &capab) const
+void BluezBluetoothInterface::createPairedDevice(const QString &addr, const QString &agentUBI, const QString &capab) const
 {
-    QDBusReply< QDBusObjectPath > reply;
-    reply = d->iface.call("CreatePairedDevice",addr,agentUBI,capab);
-
-    if (!reply.isValid()) {
-        return QString();
-    }
-    return reply.value().path();
+    d->iface.call("CreatePairedDevice",addr,qVariantFromValue(QDBusObjectPath(agentUBI)),capab);
 }
 
 QString BluezBluetoothInterface::findDevice(const QString &addr) const
@@ -147,7 +125,7 @@
 
 void BluezBluetoothInterface::registerAgent(const QString &agentUBI, const QString &capab)
 {
-    d->iface.call("RegisterAgent",agentUBI,capab);
+    d->iface.call("RegisterAgent",qVariantFromValue(QDBusObjectPath(agentUBI)),capab);
 }
 
 void BluezBluetoothInterface::releaseSession()
@@ -157,7 +135,7 @@
 
 void BluezBluetoothInterface::removeDevice(const QString &deviceUBI )
 {
-    d->iface.call("RemoveDevice",deviceUBI);
+    d->iface.call("RemoveDevice",qVariantFromValue(QDBusObjectPath(deviceUBI)));
 }
 
 void BluezBluetoothInterface::requestSession()
@@ -183,305 +161,20 @@
 
 void BluezBluetoothInterface::unregisterAgent(const QString &agentUBI)
 {
-    d->iface.call("UnregisterAgent",agentUBI);
+    d->iface.call("UnregisterAgent",qVariantFromValue(QDBusObjectPath(agentUBI)));
 }
 
 
 
-/*
-
-QString BluezBluetoothInterface::address() const
+void BluezBluetoothInterface::slotDeviceCreated(const QDBusObjectPath &path)
 {
-    return stringReply("GetAddress");
-}
+    kDebug() << "device created";
 
-QString BluezBluetoothInterface::version() const
-{
-    return stringReply("GetVersion");
-}
-
-QString BluezBluetoothInterface::revision() const
-{
-    return stringReply("GetRevision");
-}
-
-QString BluezBluetoothInterface::manufacturer() const
-{
-    return stringReply("GetManufacturer");
-}
-
-QString BluezBluetoothInterface::company() const
-{
-    return stringReply("GetCompany");
-}
-
-Solid::Control::BluetoothInterface::Mode BluezBluetoothInterface::mode() const
-{
-    QString theMode = stringReply("GetMode");
-    Solid::Control::BluetoothInterface::Mode modeEnum;
-    if (theMode == "connectable")
-    {
-        modeEnum = Solid::Control::BluetoothInterface::Connectable;
+    if (!d->devices.contains(path.path())) {
+        BluezBluetoothRemoteDevice* bluetoothRemoteDev = new BluezBluetoothRemoteDevice(path.path());
+        d->devices.insert(path.path(), bluetoothRemoteDev);
     }
-    else if (theMode == "discoverable")
-    {
-        modeEnum = Solid::Control::BluetoothInterface::Discoverable;
-    } else {
-        Q_ASSERT(theMode == "off");
-        modeEnum = Solid::Control::BluetoothInterface::Off;
-    }
-    return modeEnum;
-}
 
-int BluezBluetoothInterface::discoverableTimeout() const
-{
-    QDBusReply< uint > timeout = d->iface.call("GetDiscoverableTimeout");
-    if (timeout.isValid()) {
-        return timeout.value();
-    }
-
-    return -1;
-}
-
-bool BluezBluetoothInterface::isDiscoverable() const
-{
-    return boolReply("IsDiscoverable");
-}
-
-QStringList BluezBluetoothInterface::listConnections() const
-{
-    QStringList list = listReply("ListConnections");
-    for (int i = 0; i < list.size(); i++) {
-        list[i] = ubi() + '/' + list[i];
-    }
-    return list;
-}
-
-QString BluezBluetoothInterface::majorClass() const
-{
-    return stringReply("GetMajorClass");
-}
-
-QStringList BluezBluetoothInterface::listAvailableMinorClasses() const
-{
-    return listReply("ListAvailableMinorClasses");
-}
-
-QString BluezBluetoothInterface::minorClass() const
-{
-    return stringReply("GetMinorClass");
-}
-
-QStringList BluezBluetoothInterface::serviceClasses() const
-{
-    return listReply("GetServiceClasses");
-}
-
-QString BluezBluetoothInterface::name() const
-{
-    return stringReply("GetName");
-}
-
-QString BluezBluetoothInterface::getRemoteName(const QString &mac)
-{
-    return stringReply("GetRemoteName",mac);
-}
-
-bool BluezBluetoothInterface::isTrusted(const QString &mac)
-{
-   return boolReply("IsTrusted",mac);
-}
-
-QStringList BluezBluetoothInterface::listBondings() const
-{
-    return listReply("ListBondings");
-}
-
-bool BluezBluetoothInterface::isPeriodicDiscoveryActive() const
-{
-    return boolReply("IsPeriodicDiscovery");
-}
-
-bool BluezBluetoothInterface::isPeriodicDiscoveryNameResolvingActive() const
-{
-    return boolReply("IsPeriodicDiscoveryNameResolving");
-}
-
-QStringList BluezBluetoothInterface::listRemoteDevices() const
-{
-    QStringList list = listReply("ListRemoteDevices");
-    for (int i = 0; i < list.size(); i++) {
-        list[i] = ubi() + '/' + list[i];
-    }
-    return list;
-}
-
-QStringList BluezBluetoothInterface::listRecentRemoteDevices(const QDateTime &) const
-{
-    return listReply("ListRecentRemoteDevices");
-}
-
-void BluezBluetoothInterface::setMode(const Solid::Control::BluetoothInterface::Mode mode)
-{
-    QString modeString;
-    switch(mode)
-    {
-    case Solid::Control::BluetoothInterface::Off:
-        modeString = "off";
-        break;
-    case Solid::Control::BluetoothInterface::Discoverable:
-        modeString = "discoverable";
-        break;
-    case Solid::Control::BluetoothInterface::Connectable:
-        modeString = "connectable";
-        break;
-    }
-    d->iface.call("SetMode", modeString);
-}
-
-void BluezBluetoothInterface::setDiscoverableTimeout(int timeout)
-{
-    d->iface.call("SetDiscoverableTimeout", (uint)timeout);
-}
-
-void BluezBluetoothInterface::setMinorClass(const QString &minorClass)
-{
-    d->iface.call("SetMinorClass", minorClass);
-}
-
-void BluezBluetoothInterface::setName(const QString &name)
-{
-    d->iface.call("SetName", name);
-}
-
-void BluezBluetoothInterface::discoverDevices()
-{
-    d->iface.call("DiscoverDevices");
-}
-
-void BluezBluetoothInterface::discoverDevicesWithoutNameResolving()
-{
-    d->iface.call("DiscoverDevicesWithoutNameResolving");
-}
-
-void BluezBluetoothInterface::cancelDiscovery()
-{
-    d->iface.call("CancelDiscovery");
-}
-
-void BluezBluetoothInterface::startPeriodicDiscovery()
-{
-    d->iface.call("StartPeriodicDiscovery");
-}
-
-void BluezBluetoothInterface::stopPeriodicDiscovery()
-{
-    d->iface.call("StopPeriodicDiscovery");
-}
-
-void BluezBluetoothInterface::setPeriodicDiscoveryNameResolving(bool nameResolving)
-{
-    d->iface.call("SetPeriodicDiscoveryNameResolving", nameResolving);
-}
-
-void BluezBluetoothInterface::setTrusted(const QString& mac)
-{
-    d->iface.call("SetTrusted", mac);
-}
-
-void BluezBluetoothInterface::removeTrust(const QString& mac)
-{
-    d->iface.call("RemoveTrust", mac);
-}
-
-*/
-
-
-
-/*
-
-void BluezBluetoothInterface::slotModeChanged(const Solid::Control::BluetoothInterface::Mode mode)
-{
-    emit modeChanged(mode);
-}
-
-void BluezBluetoothInterface::slotDiscoverableTimeoutChanged(int timeout)
-{
-    emit discoverableTimeoutChanged(timeout);
-}
-
-void BluezBluetoothInterface::slotMinorClassChanged(const QString &minorClass)
-{
-    emit minorClassChanged(minorClass);
-}
-
-void BluezBluetoothInterface::slotNameChanged(const QString &name)
-{
-    emit nameChanged(name);
-}
-
-void BluezBluetoothInterface::slotDiscoveryStarted()
-{
-    emit discoveryStarted();
-}
-
-void BluezBluetoothInterface::slotDiscoveryCompleted()
-{
-    emit discoveryCompleted();
-}
-
-void BluezBluetoothInterface::slotRemoteDeviceFound(const QString &address, uint deviceClass, short rssi)
-{
-    QString remoteubi = QString("%1/%2").arg(ubi()).arg(address);
-    emit remoteDeviceFound(remoteubi, deviceClass, rssi);
-}
-
-void BluezBluetoothInterface::slotRemoteDeviceDisappeared(const QString &address)
-{
-    QString remoteubi = QString("%1/%2").arg(ubi()).arg(address);
-    emit remoteDeviceDisappeared(remoteubi);
-}
-
-void BluezBluetoothInterface::slotRemoteNameUpdated(const QString &address, const QString& name)
-{
-   emit remoteNameUpdated(address,name);
-}
-
-void BluezBluetoothInterface::slotRemoteDeviceConnected(const QString &address)
-{
-   emit remoteDeviceConnected(address);
-}
-
-void BluezBluetoothInterface::slotRemoteDeviceDisconnected(const QString &address)
-{
-   emit remoteDeviceDisconnected(address);
-}
-
-void BluezBluetoothInterface::slotTrustAdded(const QString &address)
-{
-   emit trustAdded(address);
-}
-
-void BluezBluetoothInterface::slotTrustRemoved(const QString &address)
-{
-   emit trustRemoved(address);
-}
-
-void BluezBluetoothInterface::slotBondingCreated(const QString &address)
-{
-   emit bondingCreated(address);
-}
-
-void BluezBluetoothInterface::slotBondingRemoved(const QString &address)
-{
-   emit bondingRemoved(address);
-}
-
-*/
-
-void BluezBluetoothInterface::slotDeviceCreated(const QDBusObjectPath &path)
-{
-    kDebug() << "device created";
     emit deviceCreated(path.path());
 }
 
@@ -523,7 +216,20 @@
     return bluetoothInterface;
 }
 
+QObject *BluezBluetoothInterface::createBluetoothInputDevice(const QString &ubi)
+{
+    BluezBluetoothInputDevice *bluetoothInputDev;
+    if (d->inputDevices.contains(ubi)) {
+        bluetoothInputDev = d->inputDevices[ubi];
+    } else {
+        bluetoothInputDev = new BluezBluetoothInputDevice(ubi);
+        d->inputDevices.insert(ubi, bluetoothInputDev);
+    }
+    return bluetoothInputDev;
+}
 
+
+
 /******************* DBus Calls *******************************/
 
 QStringList BluezBluetoothInterface::listReply(const QString &method) const
@@ -574,10 +280,13 @@
 
     if (param.isEmpty())
 	    reply = d->iface.call(method);
-    else
+    else {
+            qDebug() << "ObjectReply calling: " << method << " " << param;
 	    reply = d->iface.call(method, param);
+    }
 	    	
     if (reply.isValid()) {
+        qDebug() << "ObjectReply Valid? "<<  reply.value().path();
         return reply.value();
     }
 
Index: bluez-bluetoothinterface.h
===================================================================
--- bluez-bluetoothinterface.h	(.../branches/KDE/4.2/kdebase/workspace/solid/bluez)	(revision 912529)
+++ solid/bluez/bluez-bluetoothinterface.h	(.../trunk/KDE/kdebase/workspace/solid/bluez)	(revision 912529)
@@ -27,6 +27,7 @@
 #include <QtDBus>
 #include <QDBusVariant>
 #include <QDBusObjectPath>
+#include <QString>
 
 #include <solid/control/ifaces/bluetoothinterface.h>
 
@@ -42,34 +43,11 @@
     BluezBluetoothInterface(const QString  & objectPath);
     virtual ~BluezBluetoothInterface();
     QString ubi() const;
-/*
-    QString address() const;
-    QString version() const;
-    QString revision() const;
-    QString manufacturer() const;
-    QString company() const;
-    Solid::Control::BluetoothInterface::Mode mode() const;
-    int discoverableTimeout() const;
-    bool isDiscoverable() const;
-    QStringList listConnections() const;
-    QString majorClass() const;
-    QStringList listAvailableMinorClasses() const;
-    QString minorClass() const;
-    QStringList serviceClasses() const;
-    QString name() const;
-    QStringList listBondings() const;
-    bool isPeriodicDiscoveryActive() const;
-    bool isPeriodicDiscoveryNameResolvingActive() const;
-    QStringList listRemoteDevices() const;
-    QStringList listRecentRemoteDevices(const QDateTime &) const;
-    QString getRemoteName(const QString &);
-    bool isTrusted(const QString &);
-
-*/    
+    
     QObject *createBluetoothRemoteDevice(const QString &);
-
-    QString createDevice(const QString &) const;
-    QString createPairedDevice(const QString &,const QString &,const QString &) const;
+    QObject *createBluetoothInputDevice(const QString &);
+    void createDevice(const QString &) const;
+    void createPairedDevice(const QString &,const QString &,const QString &) const;
     QString findDevice(const QString &) const;
     QMap< QString, QVariant > getProperties() const;
     QStringList listDevices() const;
@@ -87,36 +65,6 @@
     void stopDiscovery();
     void unregisterAgent(const QString &);
 
-/*
-    void setMode(const Solid::Control::BluetoothInterface::Mode);
-    void setDiscoverableTimeout(int);
-    void setMinorClass(const QString &);
-    void setName(const QString &);
-    void discoverDevices();
-    void discoverDevicesWithoutNameResolving();
-    void cancelDiscovery();
-    void startPeriodicDiscovery();
-    void stopPeriodicDiscovery();
-    void setPeriodicDiscoveryNameResolving(bool);
-    void setTrusted(const QString &);
-    void removeTrust(const QString &);
-
-    void slotModeChanged(const Solid::Control::BluetoothInterface::Mode mode);
-    void slotDiscoverableTimeoutChanged(int timeout);
-    void slotMinorClassChanged(const QString &minor);
-    void slotNameChanged(const QString &name);
-    void slotDiscoveryStarted();
-    void slotDiscoveryCompleted();
-    void slotRemoteDeviceFound(const QString &ubi, uint deviceClass, short rssi);
-    void slotRemoteDeviceDisappeared(const QString &ubi);
-    void slotRemoteNameUpdated(const QString &, const QString &);
-    void slotRemoteDeviceConnected(const QString&);
-    void slotRemoteDeviceDisconnected(const QString&);
-    void slotTrustAdded(const QString&);
-    void slotTrustRemoved(const QString&);
-    void slotBondingCreated(const QString&);
-    void slotBondingRemoved(const QString&);
-*/    
     void slotDeviceCreated(const QDBusObjectPath &);
     void slotDeviceDisappeared(const QString &);
     void slotDeviceFound(const QString &, const QMap< QString, QVariant > &);
Index: bluez-bluetoothmanager.cpp
===================================================================
--- bluez-bluetoothmanager.cpp	(.../branches/KDE/4.2/kdebase/workspace/solid/bluez)	(revision 912529)
+++ solid/bluez/bluez-bluetoothmanager.cpp	(.../trunk/KDE/kdebase/workspace/solid/bluez)	(revision 912529)
@@ -104,6 +104,7 @@
 
 QString BluezBluetoothManager::defaultInterface() const
 {
+    kDebug() << "Calling Backend Default Interface";
     QDBusReply< QDBusObjectPath > path = d->manager.call("DefaultAdapter");
     if (!path.isValid())
         return QString();
@@ -132,6 +133,16 @@
     return bluetoothInterface;
 }
 
+void BluezBluetoothManager::removeInterface(const QString& ubi)
+{
+
+    if (d->interfaces.contains(ubi)) {
+        kDebug() << "Removing Interface" << ubi;
+        BluezBluetoothInterface * bluetoothInterface = d->interfaces.take(ubi);
+        bluetoothInterface = 0;
+    }
+}
+
 /*
 KJob *BluezBluetoothManager::setupInputDevice(const QString &ubi)
 {
Index: bluez-bluetoothremotedevice.cpp
===================================================================
--- bluez-bluetoothremotedevice.cpp	(.../branches/KDE/4.2/kdebase/workspace/solid/bluez)	(revision 912529)
+++ solid/bluez/bluez-bluetoothremotedevice.cpp	(.../trunk/KDE/kdebase/workspace/solid/bluez)	(revision 912529)
@@ -42,6 +42,7 @@
 	m_adapter = m_objectPath.left(objectPath.size() - 18);
 	m_address = m_objectPath.right(17);
 
+        kdDebug() << "Connecting to ObjectPath: " << objectPath;
 
 	device = new QDBusInterface("org.bluez", objectPath,
 				    "org.bluez.Device", QDBusConnection::systemBus());
@@ -79,7 +80,7 @@
 
 void BluezBluetoothRemoteDevice::setProperty(const QString &name, const QVariant &value)
 {
-    device->call("SetProperty",name,value);
+    device->call("SetProperty",name,qVariantFromValue(QDBusVariant(value)));
 }
 
 void BluezBluetoothRemoteDevice::discoverServices(const QString& pattern) const
Index: bluez-bluetoothmanager.h
===================================================================
--- bluez-bluetoothmanager.h	(.../branches/KDE/4.2/kdebase/workspace/solid/bluez)	(revision 912529)
+++ solid/bluez/bluez-bluetoothmanager.h	(.../trunk/KDE/kdebase/workspace/solid/bluez)	(revision 912529)
@@ -43,6 +43,7 @@
     virtual ~BluezBluetoothManager();
     QStringList bluetoothInterfaces() const;
     QObject * createInterface(const QString &);
+    void removeInterface(const QString& ubi);
 //  QStringList bluetoothInputDevices() const;
     QString defaultInterface() const;
     QString findInterface(const QString &) const;
diff -Nur -x '[^b][^l]*' -x .svn 4_2libsControl/bluetoothinputdevice.cpp kdebase/workspace/libs/solid/control/bluetoothinputdevice.cpp
--- 4_2libsControl/bluetoothinputdevice.cpp	2009-01-17 17:51:33.000000000 +0100
+++ libs/solid/control/bluetoothinputdevice.cpp	2009-01-14 21:06:47.000000000 +0100
@@ -91,8 +91,8 @@
     FrontendObjectPrivate::setBackendObject(object);
 
     if (object) {
-        QObject::connect(object, SIGNAL(propertyChanged(QString,QVariant)),
-                         parent(), SIGNAL(propertyChanged(QString,QVariant)));
+        QObject::connect(object, SIGNAL(propertyChanged(const QString&,const QVariant&)),
+                         parent(), SIGNAL(propertyChanged(const QString,const QVariant&)));
     }
 }
 
diff -Nur -x '[^b][^l]*' -x .svn 4_2libsControl/bluetoothinterface.cpp kdebase/workspace/libs/solid/control/bluetoothinterface.cpp
--- 4_2libsControl/bluetoothinterface.cpp	2009-01-17 17:51:33.000000000 +0100
+++ libs/solid/control/bluetoothinterface.cpp	2009-01-16 12:11:03.000000000 +0100
@@ -25,7 +25,7 @@
 #include <QStringList>
 #include <QVariant>
 
-#include <kdebug.h>
+#include <KDebug>
 
 #include "ifaces/bluetoothinterface.h"
 
@@ -49,9 +49,12 @@
     void setBackendObject(QObject *object);
 
     QPair<BluetoothRemoteDevice *, Ifaces::BluetoothRemoteDevice *> findRegisteredBluetoothRemoteDevice(const QString &ubi) const;
+    QPair<BluetoothInputDevice *, Ifaces::BluetoothInputDevice *> findRegisteredBluetoothInputDevice(const QString &ubi) const;
 
     mutable QMap<QString, QPair<BluetoothRemoteDevice *, Ifaces::BluetoothRemoteDevice *> > remoteDeviceMap;
+    mutable QMap<QString, QPair<BluetoothInputDevice *, Ifaces::BluetoothInputDevice *> > inputDeviceMap;
     mutable BluetoothRemoteDevice invalidDevice;
+    mutable BluetoothInputDevice invalidInputDevice;
 };
 }
 }
@@ -65,30 +68,39 @@
 {
     const BluetoothInterface &device = BluetoothManager::self().findBluetoothInterface(ubi);
     d->setBackendObject(device.d->backendObject());
+    QObject::connect(d->backendObject(), SIGNAL(deviceCreated(const QString &)),this, SLOT(slotDeviceCreated(const QString &)));
 }
 
 Solid::Control::BluetoothInterface::BluetoothInterface(QObject *backendObject)
         : QObject(), d(new BluetoothInterfacePrivate(this))
 {
     d->setBackendObject(backendObject);
+    QObject::connect(d->backendObject(), SIGNAL(deviceCreated(const QString &)),this, SLOT(slotDeviceCreated(const QString &)));
 }
 
 Solid::Control::BluetoothInterface::BluetoothInterface(const BluetoothInterface &device)
         : QObject(), d(new BluetoothInterfacePrivate(this))
 {
     d->setBackendObject(device.d->backendObject());
+    QObject::connect(d->backendObject(), SIGNAL(deviceCreated(const QString &)),this, SLOT(slotDeviceCreated(const QString &)));
 }
 
 Solid::Control::BluetoothInterface::~BluetoothInterface()
 {
     // Delete all the interfaces, they are now outdated
     typedef QPair<BluetoothRemoteDevice *, Ifaces::BluetoothRemoteDevice *> BluetoothRemoteDeviceIfacePair;
+    typedef QPair<BluetoothInputDevice *, Ifaces::BluetoothInputDevice *> BluetoothInputDeviceIfacePair;
 
     // Delete all the devices, they are now outdated
-    foreach (const BluetoothRemoteDeviceIfacePair &pair, d->remoteDeviceMap) {
+    foreach (const BluetoothRemoteDeviceIfacePair &pair, d->remoteDeviceMap.values()) {
         delete pair.first;
         delete pair.second;
     }
+    foreach (const BluetoothInputDeviceIfacePair &pair, d->inputDeviceMap.values()) {
+        delete pair.first;
+        delete pair.second;
+    }
+
 }
 
 Solid::Control::BluetoothInterface &Solid::Control::BluetoothInterface::operator=(const Solid::Control::BluetoothInterface  & dev)
@@ -108,9 +120,12 @@
     SOLID_CALL(Ifaces::BluetoothInterface *, d->backendObject(), cancelDeviceCreation(address));
 }
 
-QString Solid::Control::BluetoothInterface::createPairedDevice(const QString &address,const QString &adapterPath, const QString &capab) const
+void Solid::Control::BluetoothInterface::createPairedDevice(const QString &address,const QString &adapterPath, const QString &capab) const
 {
-    return_SOLID_CALL(Ifaces::BluetoothInterface *, d->backendObject(), QString(), createPairedDevice(address,adapterPath,capab));
+    Ifaces::BluetoothInterface *backend = qobject_cast<Ifaces::BluetoothInterface *>(d->backendObject());
+    if (backend == 0) 
+        return;
+    backend->createPairedDevice(address,adapterPath,capab);
 }
 
 QMap<QString, QVariant> Solid::Control::BluetoothInterface::getProperties() const
@@ -137,7 +152,7 @@
 
     Solid::Control::BluetoothRemoteDeviceList list;
     foreach (const QString& ubi,ubis) {
-        BluetoothRemoteDevice remoteDevice = findBluetoothRemoteDevice(ubi);
+        BluetoothRemoteDevice* remoteDevice = findBluetoothRemoteDeviceUBI(ubi);
         list.append(remoteDevice);
     }
     return list;
@@ -184,13 +199,13 @@
 }
 
 
-Solid::Control::BluetoothRemoteDevice Solid::Control::BluetoothInterface::findBluetoothRemoteDevice(const QString &address) const
+Solid::Control::BluetoothRemoteDevice Solid::Control::BluetoothInterface::findBluetoothRemoteDeviceAddr(const QString &address) const
 {
     Ifaces::BluetoothInterface *backend = qobject_cast<Ifaces::BluetoothInterface *>(d->backendObject());
     if (backend == 0) 
         return d->invalidDevice;
 
-    const QString ubi = backend->findDevice(address);
+    const QString ubi = getBluetoothRemoteDeviceUBI(address);
 
     QPair<BluetoothRemoteDevice *, Ifaces::BluetoothRemoteDevice *> pair = d->findRegisteredBluetoothRemoteDevice(ubi);
 
@@ -201,18 +216,56 @@
     }
 }
 
-Solid::Control::BluetoothRemoteDevice * Solid::Control::BluetoothInterface::createBluetoothRemoteDevice(const QString &address)
+
+const QString Solid::Control::BluetoothInterface::getBluetoothRemoteDeviceUBI(const QString &address) const
 {
     Ifaces::BluetoothInterface *backend = qobject_cast<Ifaces::BluetoothInterface *>(d->backendObject());
     if (backend == 0) 
-        return 0;
+        return "";
+
+    const QString ubi = backend->findDevice(address);
+    return ubi;
+}
 
-    const QString ubi = backend->createDevice(address);
 
+void Solid::Control::BluetoothInterface::createBluetoothRemoteDevice(const QString &address)
+{
+    Ifaces::BluetoothInterface *backend = qobject_cast<Ifaces::BluetoothInterface *>(d->backendObject());
+    if (backend == 0) 
+        return;
+    backend->createDevice(address);
+}
+
+
+Solid::Control::BluetoothRemoteDevice* Solid::Control::BluetoothInterface::findBluetoothRemoteDeviceUBI(const QString &ubi) const
+{
     QPair<BluetoothRemoteDevice *, Ifaces::BluetoothRemoteDevice *> pair = d->findRegisteredBluetoothRemoteDevice(ubi);
     return pair.first;
 }
 
+Solid::Control::BluetoothInputDevice* Solid::Control::BluetoothInterface::findBluetoothInputDeviceUBI(const QString &ubi) const
+{
+    QPair<BluetoothInputDevice *, Ifaces::BluetoothInputDevice *> pair = d->findRegisteredBluetoothInputDevice(ubi);
+    return pair.first;
+}
+
+void Solid::Control::BluetoothInterface::slotDeviceCreated(const QString& ubi)
+{
+
+    Ifaces::BluetoothInterface *backend = qobject_cast<Ifaces::BluetoothInterface *>(d->backendObject());
+    Ifaces::BluetoothRemoteDevice *iface = 0;
+
+    if (backend != 0) {
+        iface = qobject_cast<Ifaces::BluetoothRemoteDevice *>(backend->createBluetoothRemoteDevice(ubi));
+    }
+
+    if (iface != 0) {
+        BluetoothRemoteDevice *device = new BluetoothRemoteDevice(iface);
+
+        QPair<BluetoothRemoteDevice *, Ifaces::BluetoothRemoteDevice *> pair(device, iface);
+        d->remoteDeviceMap[ubi] = pair;
+    }
+}
 
 QString Solid::Control::BluetoothInterface::address() const
 {
@@ -492,8 +545,6 @@
         QObject::connect(object, SIGNAL(propertyChanged(const QString &,const QVariant &)),
                                  parent(), SIGNAL(propertyChanged(const QString &, const QVariant &)));
 
-
-
     }
 }
 
@@ -521,6 +572,32 @@
         }
 
     }
+}
+
+QPair<Solid::Control::BluetoothInputDevice *, Solid::Control::Ifaces::BluetoothInputDevice *> Solid::Control::BluetoothInterfacePrivate::findRegisteredBluetoothInputDevice(const QString &ubi) const
+{
+    if (inputDeviceMap.contains(ubi)) {
+        return inputDeviceMap[ubi];
+    } else {
+        Ifaces::BluetoothInterface *backend = qobject_cast<Ifaces::BluetoothInterface *>(backendObject());
+        Ifaces::BluetoothInputDevice *iface = 0;
+
+        if (backend != 0) {
+            iface = qobject_cast<Ifaces::BluetoothInputDevice *>(backend->createBluetoothInputDevice(ubi));
+        }
+
+        if (iface != 0) {
+            BluetoothInputDevice *device = new BluetoothInputDevice(iface);
+
+            QPair<BluetoothInputDevice *, Ifaces::BluetoothInputDevice *> pair(device, iface);
+            inputDeviceMap[ubi] = pair;
+
+            return pair;
+        } else {
+            return QPair<BluetoothInputDevice *, Ifaces::BluetoothInputDevice *>(0, 0);
+        }
+
+    }
 }
 
 #include "bluetoothinterface.moc"
diff -Nur -x '[^b][^l]*' -x .svn 4_2libsControl/bluetoothinterface.h kdebase/workspace/libs/solid/control/bluetoothinterface.h
--- 4_2libsControl/bluetoothinterface.h	2009-01-17 17:51:33.000000000 +0100
+++ libs/solid/control/bluetoothinterface.h	2009-01-14 14:17:14.000000000 +0100
@@ -28,7 +28,9 @@
 #include <QtCore/QMap>
 
 #include "bluetoothremotedevice.h"
+#include "bluetoothinputdevice.h"
 #include "ifaces/bluetoothremotedevice.h"
+#include "ifaces/bluetoothinputdevice.h"
 
 
 
@@ -37,7 +39,7 @@
 namespace Control
 {
 class BluetoothRemoteDevice;
-typedef QList<BluetoothRemoteDevice> BluetoothRemoteDeviceList;
+typedef QList<BluetoothRemoteDevice*> BluetoothRemoteDeviceList;
 class BluetoothInterfacePrivate;
 
 /**
@@ -115,7 +117,8 @@
      * @param ubi the identifier of the bluetooth device to instantiate
      * @returns a bluetooth object, if a bluetooth device having the given UBI, for this interface exists, 0 otherwise
      */
-    Solid::Control::BluetoothRemoteDevice* createBluetoothRemoteDevice(const QString &address);
+    //Solid::Control::BluetoothRemoteDevice* createBluetoothRemoteDevice(const QString &address);
+    void createBluetoothRemoteDevice(const QString &address);
 
     /**
      * Finds a BluetoothRemoteDevice object given its UBI.
@@ -123,7 +126,13 @@
      * @param ubi the identifier of the bluetooth remote device to find from this bluetooth interface
      * @returns a valid BluetoothRemoteDevice object if a remote device having the given UBI for this interface exists, an invalid BluetoothRemoteDevice object otherwise.
      */
-    Solid::Control::BluetoothRemoteDevice findBluetoothRemoteDevice(const QString &address) const;
+    const QString getBluetoothRemoteDeviceUBI(const QString &address) const;
+
+    Solid::Control::BluetoothRemoteDevice findBluetoothRemoteDeviceAddr(const QString &addr) const;
+
+    Solid::Control::BluetoothRemoteDevice* findBluetoothRemoteDeviceUBI(const QString &ubi) const;
+
+    Solid::Control::BluetoothInputDevice* findBluetoothInputDeviceUBI(const QString &ubi) const;
 
     /**
      * Retrieves the MAC address of the bluetooth interface/adapter.
@@ -296,7 +305,7 @@
 //    bool isTrusted(const QString &);
 
 
-    QString createPairedDevice(const QString &, const QString &, const QString &) const;
+    void createPairedDevice(const QString &, const QString &, const QString &) const;
 
     QMap< QString, QVariant > getProperties() const;
 
@@ -557,6 +566,9 @@
     QVariant getProperty(const QString&) const;
     BluetoothInterfacePrivate * const d;
 
+private slots:
+    void slotDeviceCreated(const QString& ubi);
+
 };
 
 } //Control
diff -Nur -x '[^b][^l]*' -x .svn 4_2libsControl/bluetoothmanager.cpp kdebase/workspace/libs/solid/control/bluetoothmanager.cpp
--- 4_2libsControl/bluetoothmanager.cpp	2009-01-17 17:51:33.000000000 +0100
+++ libs/solid/control/bluetoothmanager.cpp	2009-01-16 13:17:33.000000000 +0100
@@ -58,6 +58,7 @@
 
     void _k_interfaceAdded(const QString &ubi);
     void _k_interfaceRemoved(const QString &ubi);
+    void _k_defaultInterfaceChanged(const QString &ubi);
     void _k_interfaceDestroyed(QObject *object);
 /*
     void _k_inputDeviceCreated(const QString &ubi);
@@ -95,7 +96,7 @@
     typedef QPair<BluetoothInterface *, Ifaces::BluetoothInterface *> BluetoothInterfaceIfacePair;
 
     // Delete all the devices, they are now outdated
-    foreach (const BluetoothInterfaceIfacePair &pair, d->bluetoothInterfaceMap) {
+    foreach (const BluetoothInterfaceIfacePair &pair, d->bluetoothInterfaceMap.values()) {
         delete pair.first;
         delete pair.second;
     }
@@ -110,6 +111,8 @@
 
     if (backend == 0) return list;
 
+    kDebug() << "UBI List " << ubiList;
+
     foreach (const QString &ubi, ubiList) {
         QPair<BluetoothInterface *, Ifaces::BluetoothInterface *> pair = d->findRegisteredBluetoothInterface(ubi);
 
@@ -239,7 +242,9 @@
 */
 void Solid::Control::BluetoothManagerPrivate::_k_interfaceAdded(const QString &ubi)
 {
-    QPair<BluetoothInterface *, Ifaces::BluetoothInterface *> pair = bluetoothInterfaceMap.take(ubi);
+    kDebug() << "Size of InterfaceList " << bluetoothInterfaceMap.size();
+    QPair<BluetoothInterface *, Ifaces::BluetoothInterface *> pair = findRegisteredBluetoothInterface(ubi);
+/*    QPair<BluetoothInterface *, Ifaces::BluetoothInterface *> pair = bluetoothInterfaceMap.take(ubi);
 
     if (pair.first != 0) {
         // Oops, I'm not sure it should happen...
@@ -247,7 +252,7 @@
 
         delete pair.first;
         delete pair.second;
-    }
+    }*/
 
     emit q->interfaceAdded(ubi);
 }
@@ -261,11 +266,19 @@
         delete pair.second;
     }
 
+    Ifaces::BluetoothManager *backend = qobject_cast<Ifaces::BluetoothManager *>(managerBackend());
+    backend->removeInterface(ubi);
     emit q->interfaceRemoved(ubi);
 }
 
+void Solid::Control::BluetoothManagerPrivate::_k_defaultInterfaceChanged(const QString &ubi)
+{
+    emit q->defaultInterfaceChanged(ubi);
+}
+
 void Solid::Control::BluetoothManagerPrivate::_k_interfaceDestroyed(QObject *object)
 {
+    kDebug() << "Interface detroyed";
     Ifaces::BluetoothInterface *device = qobject_cast<Ifaces::BluetoothInterface *>(object);
 
     if (device != 0) {
@@ -323,6 +336,9 @@
                      q, SLOT(_k_interfaceAdded(const QString &)));
     QObject::connect(newBackend, SIGNAL(interfaceRemoved(const QString &)),
                      q, SLOT(_k_interfaceRemoved(const QString &)));
+    QObject::connect(newBackend, SIGNAL(defaultInterfaceChanged(const QString &)),
+                     q, SLOT(_k_defaultInterfaceChanged(const QString &)));
+
 /*
     QObject::connect(newBackend, SIGNAL(inputDeviceCreated(const QString &)),
                      q, SLOT(_k_inputDeviceCreated(const QString &)));
@@ -334,17 +350,22 @@
 
 QPair<Solid::Control::BluetoothInterface *, Solid::Control::Ifaces::BluetoothInterface *> Solid::Control::BluetoothManagerPrivate::findRegisteredBluetoothInterface(const QString &ubi) const
 {
+
+    kDebug() << "findRegisteredBluetoothInterface " << ubi;
     if (bluetoothInterfaceMap.contains(ubi)) {
         return bluetoothInterfaceMap[ubi];
     } else {
+        kDebug() << "Creating New Interface " << ubi;
         Ifaces::BluetoothManager *backend = qobject_cast<Ifaces::BluetoothManager *>(managerBackend());
         Ifaces::BluetoothInterface *iface = 0;
 
         if (backend != 0) {
+            kDebug() << "Calling Backend to Creating New Interface " << ubi;
             iface = qobject_cast<Ifaces::BluetoothInterface *>(backend->createInterface(ubi));
         }
 
         if (iface != 0) {
+            kDebug() << "BackendIface created ";
             BluetoothInterface *device = new BluetoothInterface(iface);
             QPair<BluetoothInterface *, Ifaces::BluetoothInterface *> pair(device, iface);
             QObject::connect(iface, SIGNAL(destroyed(QObject *)),
diff -Nur -x '[^b][^l]*' -x .svn 4_2libsControl/bluetoothmanager.h kdebase/workspace/libs/solid/control/bluetoothmanager.h
--- 4_2libsControl/bluetoothmanager.h	2009-01-17 17:51:33.000000000 +0100
+++ libs/solid/control/bluetoothmanager.h	2009-01-16 13:17:33.000000000 +0100
@@ -188,6 +188,7 @@
 
     Q_PRIVATE_SLOT(d, void _k_interfaceAdded(const QString &))
     Q_PRIVATE_SLOT(d, void _k_interfaceRemoved(const QString &))
+    Q_PRIVATE_SLOT(d, void _k_defaultInterfaceChanged(const QString &))
     Q_PRIVATE_SLOT(d, void _k_interfaceDestroyed(QObject *))
 /*
     Q_PRIVATE_SLOT(d, void _k_inputDeviceCreated(const QString &))
diff -Nur -x '[^b][^l]*' -x .svn 4_2libsControl/bluetoothremotedevice.cpp kdebase/workspace/libs/solid/control/bluetoothremotedevice.cpp
--- 4_2libsControl/bluetoothremotedevice.cpp	2009-01-17 17:51:33.000000000 +0100
+++ libs/solid/control/bluetoothremotedevice.cpp	2009-01-13 14:53:39.000000000 +0100
@@ -88,6 +88,15 @@
     return_SOLID_CALL(Ifaces::BluetoothRemoteDevice *, d->backendObject(), (QMap< QString,QVariant >()), getProperties());
 }
 
+QVariant Solid::Control::BluetoothRemoteDevice::getProperty(const QString &key)
+{
+    QMap<QString, QVariant> props = getProperties();
+    if (props.contains(key))
+        return props[key];
+    else
+        return QVariant();
+}
+
 QStringList Solid::Control::BluetoothRemoteDevice::listNodes()
 {
     Q_D(const BluetoothRemoteDevice);
@@ -113,14 +122,65 @@
 }
 
 
+QString Solid::Control::BluetoothRemoteDevice::address()
+{
+    QVariant var = getProperty("Address");
+
+    if (var.isValid())
+        return var.value<QString>();
+    else
+        return QString();
 
-/*
-QString Solid::Control::BluetoothRemoteDevice::address() const
+//    Q_D(const BluetoothRemoteDevice);
+//    return_SOLID_CALL(Ifaces::BluetoothRemoteDevice *, d->backendObject(), QString(), address());
+}
+
+bool Solid::Control::BluetoothRemoteDevice::isTrusted()
 {
-    Q_D(const BluetoothRemoteDevice);
-    return_SOLID_CALL(Ifaces::BluetoothRemoteDevice *, d->backendObject(), QString(), address());
+     QVariant var = getProperty("Trusted");
+
+    if (var.isValid())
+        return var.value<bool>();
+    else
+        return false;
+}
+
+void Solid::Control::BluetoothRemoteDevice::setTrusted(bool trust)
+{
+    setProperty("Trusted",QVariant(trust));
 }
 
+QString Solid::Control::BluetoothRemoteDevice::icon()
+{
+     QVariant var = getProperty("Icon");
+
+    if (var.isValid())
+        return var.value<QString>();
+    else
+        return "";
+}
+
+QStringList Solid::Control::BluetoothRemoteDevice::uuids()
+{
+     QVariant var = getProperty("UUIDs");
+
+    if (var.isValid())
+        return var.value<QStringList>();
+    else
+        return QStringList();
+}
+
+bool Solid::Control::BluetoothRemoteDevice::isConnected()
+{
+     QVariant var = getProperty("Connected");
+
+    if (var.isValid())
+        return var.value<bool>();
+    else
+        return false;
+}
+
+/*
 bool Solid::Control::BluetoothRemoteDevice::isConnected() const
 {
     Q_D(const BluetoothRemoteDevice);
@@ -168,12 +228,21 @@
     Q_D(const BluetoothRemoteDevice);
     return_SOLID_CALL(Ifaces::BluetoothRemoteDevice *, d->backendObject(), QStringList(), serviceClasses());
 }
-QString Solid::Control::BluetoothRemoteDevice::name() const
+*/
+
+QString Solid::Control::BluetoothRemoteDevice::name()
 {
-    Q_D(const BluetoothRemoteDevice);
-    return_SOLID_CALL(Ifaces::BluetoothRemoteDevice *, d->backendObject(), QString(), name());
+    QVariant var = getProperty("Name");
+
+    if (var.isValid())
+        return var.value<QString>();
+    else
+        return QString();
+
+//    return_SOLID_CALL(Ifaces::BluetoothRemoteDevice *, d->backendObject(), QString(), name());
 }
 
+/*
 QString Solid::Control::BluetoothRemoteDevice::alias() const
 {
     Q_D(const BluetoothRemoteDevice);
diff -Nur -x '[^b][^l]*' -x .svn 4_2libsControl/bluetoothremotedevice.h kdebase/workspace/libs/solid/control/bluetoothremotedevice.h
--- 4_2libsControl/bluetoothremotedevice.h	2009-01-17 17:51:33.000000000 +0100
+++ libs/solid/control/bluetoothremotedevice.h	2009-01-13 14:53:39.000000000 +0100
@@ -82,11 +82,46 @@
     bool operator==(const BluetoothRemoteDevice  & other) const;
 
     /**
-     * The UBI of the remote de device.
+     * The UBI of the remote device.
      */
     QString ubi() const;
 
     /**
+     * The address of the remote device.
+     */
+    QString address();
+
+    /**
+     * The name of the remote device.
+     */
+    QString name();
+
+    /**
+     * The icon of the remote device.
+     */
+    QString icon();
+
+    /**
+     * The Trust state of the remote device.
+     */
+    bool isTrusted();
+
+    /**
+     * Set the Trust state of the remote device.
+     */
+    void setTrusted(bool);
+
+    /**
+     * Returns the service uuids of the remote device.
+     */
+    QStringList uuids();
+
+    /**
+     * The Connection state of the remote device.
+     */
+    bool isConnected();
+
+    /**
      * Retrieve all properties from the remote device.
      *
      * @returns a hash of named properties
@@ -157,6 +192,9 @@
 
 private:
     Q_PRIVATE_SLOT(d_func(), void _k_destroyed(QObject *))
+
+
+    QVariant getProperty(const QString &key);
 };
 
 } //Control
diff -Nur -x '[^b][^l]*' -x .svn 4_2libsControl/ifaces/bluetoothinterface.h kdebase/workspace/libs/solid/control/ifaces/bluetoothinterface.h
--- 4_2libsControl/ifaces/bluetoothinterface.h	2009-01-17 17:51:32.000000000 +0100
+++ libs/solid/control/ifaces/bluetoothinterface.h	2009-01-16 17:16:55.000000000 +0100
@@ -240,7 +240,7 @@
      */
 
 
-    virtual QString createPairedDevice(const QString &, const QString &, const QString &) const = 0;
+    virtual void createPairedDevice(const QString &, const QString &, const QString &) const = 0;
 
     virtual QMap< QString, QVariant > getProperties() const = 0;
 
@@ -248,7 +248,8 @@
 
     virtual QString findDevice(const QString &) const = 0;
 
-    virtual QString createDevice(const QString &) const = 0;
+    //virtual QString createDevice(const QString &) const = 0;
+    virtual void createDevice(const QString &) const = 0;
 
 
 
@@ -320,7 +321,9 @@
      * @param ubi the identifier of the bluetooth remote device instantiated
      * @returns a new BluetoothRemoteDevice object if there's a device having the given UBI, 0 otherwise
      */
-    virtual QObject *createBluetoothRemoteDevice(const QString &address) = 0;
+    virtual QObject *createBluetoothRemoteDevice(const QString &ubi) = 0;
+
+    virtual QObject *createBluetoothInputDevice(const QString &ubi) = 0;
 
     /**
      * Marks the device as trusted.
diff -Nur -x '[^b][^l]*' -x .svn 4_2libsControl/ifaces/bluetoothmanager.h kdebase/workspace/libs/solid/control/ifaces/bluetoothmanager.h
--- 4_2libsControl/ifaces/bluetoothmanager.h	2009-01-17 17:51:32.000000000 +0100
+++ libs/solid/control/ifaces/bluetoothmanager.h	2009-01-16 12:42:32.000000000 +0100
@@ -89,6 +89,13 @@
      virtual QObject *createInterface(const QString &ubi) = 0;
 
     /**
+     * Removes a BluetoothInterface object from this backend given its UBI.
+     *
+     * @param ubi the identifier of the bluetooth interface instantiated
+     */
+     virtual void removeInterface(const QString &ubi) = 0;
+
+    /**
      * Retrieves the list of Universal Bluetooth Identifiers (UBIs) of bluetooth input devices
      * which are configured in the system. Configured means also not connected devices.
      *


Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/devel/kdebase-workspace.spec,v
retrieving revision 1.171
retrieving revision 1.172
diff -u -r1.171 -r1.172
--- kdebase-workspace.spec	28 Jan 2009 12:47:27 -0000	1.171
+++ kdebase-workspace.spec	29 Jan 2009 18:30:21 -0000	1.172
@@ -4,7 +4,7 @@
 Name: kdebase-workspace
 Version: 4.2.0
 
-Release: 2%{?dist}
+Release: 3%{?dist}
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-workspace-%{version}.tar.bz2
 License: GPLv2
 Group: User Interface/Desktops
@@ -29,6 +29,8 @@
 # upstream patches:
 # trunk
 Patch100: kdebase-workspace-4.1.96-AllowExternalPaths.patch
+# solid-bluetooth, https://bugzilla.redhat.com/481801
+Patch101: solid-bluetoothTrunkTo42.diff
 
 # FIXME: "inconsistent naming System Monitor vs KSysGuard" http://bugs.kde.org/162151
 
@@ -43,6 +45,9 @@
 Requires: kdebase4
 %endif
 
+# for plasmascript bits
+Requires: PyKDE4 >= %{version}
+
 # kdmtheme's functionality is now provided by kdebase-workspace itself
 Obsoletes: kdmtheme < 1.3
 
@@ -62,10 +67,10 @@
 BuildRequires: libXres-devel
 BuildRequires: lm_sensors-devel
 BuildRequires: NetworkManager-devel
+BuildRequires: openldap-devel
 BuildRequires: pam-devel
 BuildRequires: qimageblitz-devel
 BuildRequires: soprano-devel
-BuildRequires: openldap-devel
 BuildRequires: python-devel
 BuildRequires: PyKDE4-devel >= %{version}
 BuildRequires: qedje-devel
@@ -120,6 +125,7 @@
 %package devel
 Group:    Development/Libraries
 Summary:  Development files for %{name}
+Provides: solid-bluetooth-devel = 4.3-0.1
 Requires: %{name}-libs = %{version}-%{release}
 Requires: kdelibs4-devel
 %description devel
@@ -128,6 +134,7 @@
 %package libs
 Summary: Runtime libraries for %{name}
 Group:   System Environment/Libraries
+Provides: solid-bluetooth = 4.3-0.1
 Requires: kdelibs4 >= %{version}
 Requires: %{name} = %{version}-%{release}
 %description libs
@@ -177,6 +184,8 @@
 
 # upstream patches
 %patch100 -p1 -b .AllowExternalPaths
+%patch101 -p0 -b .solid-bluetoothTrunkTo42
+
 
 %build
 
@@ -302,6 +311,11 @@
 
 
 %changelog
+* Thu Jan 29 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.0-3
+- Requires: PyKDE4 (for plasmascript bits)
+- solid-bluetoothTrunkTo42.diff (bug #481801), and 
+  +Provides: solid-bluetooth(-devel) = 4.3
+
 * Wed Jan 28 2009 Than Ngo <than at redhat.com> - 4.2.0-2
 - readd the patch that omist battery applet when guidance-power-manager is installed
 



From bpepple at fedoraproject.org  Thu Jan 29 18:41:02 2009
From: bpepple at fedoraproject.org (Brian Pepple)
Date: Thu, 29 Jan 2009 18:41:02 +0000 (UTC)
Subject: rpms/xchat-gnome/devel .cvsignore, 1.19, 1.20 sources, 1.19,
	1.20 xchat-gnome.spec, 1.57, 1.58
Message-ID: <20090129184102.2457170116@cvs1.fedora.phx.redhat.com>

Author: bpepple

Update of /cvs/pkgs/rpms/xchat-gnome/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15604

Modified Files:
	.cvsignore sources xchat-gnome.spec 
Log Message:
* Thu Jan 29 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.24.3.1-1
- Update to 0.24.3.1.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xchat-gnome/devel/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- .cvsignore	15 Nov 2008 02:17:15 -0000	1.19
+++ .cvsignore	29 Jan 2009 18:40:31 -0000	1.20
@@ -1 +1 @@
-xchat-gnome-0.24.1.tar.bz2
+xchat-gnome-0.24.3.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xchat-gnome/devel/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources	15 Nov 2008 02:17:15 -0000	1.19
+++ sources	29 Jan 2009 18:40:31 -0000	1.20
@@ -1 +1 @@
-34738e4bfd0cb4a6627f6b40a99932d2  xchat-gnome-0.24.1.tar.bz2
+1405351c615c93a9fed0535eac6105b4  xchat-gnome-0.24.3.1.tar.bz2


Index: xchat-gnome.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xchat-gnome/devel/xchat-gnome.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- xchat-gnome.spec	18 Jan 2009 17:57:34 -0000	1.57
+++ xchat-gnome.spec	29 Jan 2009 18:40:31 -0000	1.58
@@ -1,6 +1,6 @@
 Name:           xchat-gnome
-Version:        0.24.1
-Release:        3%{?dist}
+Version:        0.24.3.1
+Release:        1%{?dist}
 Summary:        GNOME front-end to xchat
 
 Group:          Applications/Internet
@@ -136,6 +136,9 @@
 
 
 %changelog
+* Thu Jan 29 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.24.3.1-1
+- Update to 0.24.3.1.
+
 * Sun Jan 18 2009 Tomas Mraz <tmraz at redhat.com> - 0.24.1-3
 - rebuild with new openssl
 



From pkgdb at fedoraproject.org  Thu Jan 29 18:41:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 29 Jan 2009 18:41:35 +0000
Subject: [pkgdb] js: iburrell has requested watchbugzilla
Message-ID: <20090129184135.92A082082A7@bastion.fedora.phx.redhat.com>

iburrell has requested the watchbugzilla acl on js (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/js



From pkgdb at fedoraproject.org  Thu Jan 29 18:41:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 29 Jan 2009 18:41:35 +0000
Subject: [pkgdb] js: iburrell has requested commit
Message-ID: <20090129184135.CC20F208493@bastion.fedora.phx.redhat.com>

iburrell has requested the commit acl on js (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/js



From pkgdb at fedoraproject.org  Thu Jan 29 18:41:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 29 Jan 2009 18:41:35 +0000
Subject: [pkgdb] js: iburrell has requested watchcommits
Message-ID: <20090129184135.E4D77208496@bastion.fedora.phx.redhat.com>

iburrell has requested the watchcommits acl on js (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/js



From rdieter at fedoraproject.org  Thu Jan 29 19:00:46 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu, 29 Jan 2009 19:00:46 +0000 (UTC)
Subject: rpms/kdebase-workspace/devel kdebase-workspace.spec, 1.172,
	1.173 kdebase-workspace-4.1.2-ldap.patch, 1.1, NONE
Message-ID: <20090129190046.927FD70116@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdebase-workspace/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19158

Modified Files:
	kdebase-workspace.spec 
Removed Files:
	kdebase-workspace-4.1.2-ldap.patch 
Log Message:
* Thu Jan 29 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.0-4
- omit ldap hack (#457638), kde42's reduced linkage to the rescue



Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/devel/kdebase-workspace.spec,v
retrieving revision 1.172
retrieving revision 1.173
diff -u -r1.172 -r1.173
--- kdebase-workspace.spec	29 Jan 2009 18:30:21 -0000	1.172
+++ kdebase-workspace.spec	29 Jan 2009 19:00:16 -0000	1.173
@@ -4,7 +4,7 @@
 Name: kdebase-workspace
 Version: 4.2.0
 
-Release: 3%{?dist}
+Release: 4%{?dist}
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-workspace-%{version}.tar.bz2
 License: GPLv2
 Group: User Interface/Desktops
@@ -22,7 +22,6 @@
 Patch7: kdebase-workspace-4.0.3-krdb.patch
 Patch8: kdebase-workspace-4.0.72-klipper-url.patch
 Patch9: kdebase-workspace-4.1.80-session-button.patch
-Patch10: kdebase-workspace-4.1.2-ldap.patch
 Patch11: kdebase-workspace-4.1.96-font.patch
 Patch12: kdebase-workspace-4.2.0-default_applets.patch
 
@@ -67,7 +66,6 @@
 BuildRequires: libXres-devel
 BuildRequires: lm_sensors-devel
 BuildRequires: NetworkManager-devel
-BuildRequires: openldap-devel
 BuildRequires: pam-devel
 BuildRequires: qimageblitz-devel
 BuildRequires: soprano-devel
@@ -178,7 +176,6 @@
 %patch7 -p0 -b .krdb
 %patch8 -p1 -b .klipper-url
 %patch9 -p1 -b .session-button
-%patch10 -p1 -b .ldap
 %patch11 -p1 -b .font
 %patch12 -p1 -b .default_applets
 
@@ -311,6 +308,9 @@
 
 
 %changelog
+* Thu Jan 29 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.0-4
+- omit ldap hack (#457638), kde42's reduced linkage to the rescue
+
 * Thu Jan 29 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.0-3
 - Requires: PyKDE4 (for plasmascript bits)
 - solid-bluetoothTrunkTo42.diff (bug #481801), and 


--- kdebase-workspace-4.1.2-ldap.patch DELETED ---



From rdieter at fedoraproject.org  Thu Jan 29 19:03:40 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu, 29 Jan 2009 19:03:40 +0000 (UTC)
Subject: rpms/kdebase-workspace/F-10 solid-bluetoothTrunkTo42.diff, NONE,
	1.1 kdebase-workspace.spec, 1.150,
	1.151 kdebase-workspace-4.1.2-ldap.patch, 1.1, NONE
Message-ID: <20090129190340.2295370116@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdebase-workspace/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19841

Modified Files:
	kdebase-workspace.spec 
Added Files:
	solid-bluetoothTrunkTo42.diff 
Removed Files:
	kdebase-workspace-4.1.2-ldap.patch 
Log Message:
* Thu Jan 29 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.0-4
- omit ldap hack (#457638), kde42's reduced linkage to the rescue

* Thu Jan 29 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.0-3
- Requires: PyKDE4 (for plasmascript bits)
- solid-bluetoothTrunkTo42.diff (bug #481801), and
  +Provides: solid-bluetooth(-devel) = 4.3


solid-bluetoothTrunkTo42.diff:

--- NEW FILE solid-bluetoothTrunkTo42.diff ---
Index: solid_bluez.desktop
===================================================================
--- solid_bluez.desktop	(.../branches/KDE/4.2/kdebase/workspace/solid/bluez)	(revision 912529)
+++ solid/bluez/solid_bluez.desktop	(.../trunk/KDE/kdebase/workspace/solid/bluez)	(revision 912529)
@@ -7,7 +7,6 @@
 Name=BlueZ
 Name[hi]=??????????????????
 Name[kn]=?????????????????????
-Name[mai]=???????????????
 Name[ne]=????????????Z
 Name[sr]=????????
 Name[x-test]=xxBlueZxx
Index: bluez-bluetoothinterface.cpp
===================================================================
--- bluez-bluetoothinterface.cpp	(.../branches/KDE/4.2/kdebase/workspace/solid/bluez)	(revision 912529)
+++ solid/bluez/bluez-bluetoothinterface.cpp	(.../trunk/KDE/kdebase/workspace/solid/bluez)	(revision 912529)
@@ -25,6 +25,7 @@
 #include <solid/control/bluetoothinterface.h>
 
 #include "bluez-bluetoothremotedevice.h"
+#include "bluez-bluetoothinputdevice.h"
 #include <KDebug>
 
 
@@ -43,6 +44,7 @@
     QString objectPath;
 
     QMap<QString, BluezBluetoothRemoteDevice *> devices;
+    QMap<QString, BluezBluetoothInputDevice *> inputDevices;
 };
 
 
@@ -56,23 +58,6 @@
                                    objectPath, \
                                    "org.bluez.Adapter", \
                                    signal, this, SLOT(slot));
-/*  
-    connectInterfaceToThis("ModeChanged", slotModeChanged(const QString &));
-    connectInterfaceToThis("DiscoverableTimeoutChanged", slotDiscoverableTimeoutChanged(int));
-    connectInterfaceToThis("MinorClassChanged", slotMinorClassChanged(const QString &));
-    connectInterfaceToThis("NameChanged", slotNameChanged(const QString &));
-    connectInterfaceToThis("DiscoveryStarted", slotDiscoveryStarted());
-    connectInterfaceToThis("DiscoveryCompleted", slotDiscoveryCompleted());
-    connectInterfaceToThis("RemoteDeviceDisappeared", slotRemoteDeviceDisappeared(const QString &));
-    connectInterfaceToThis("RemoteDeviceFound", slotRemoteDeviceFound(const QString &, uint, short));
-    connectInterfaceToThis("RemoteNameUpdated", slotRemoteNameUpdated(const QString &, const QString &));
-    connectInterfaceToThis("RemoteDeviceConnected", slotRemoteDeviceConnected(const QString &));
-    connectInterfaceToThis("RemoteDeviceDisconnected", slotRemoteDeviceDisconnected(const QString &));
-    connectInterfaceToThis("TrustAdded", slotTrustAdded(const QString &));
-    connectInterfaceToThis("TrustRemoved", slotTrustRemoved(const QString &));
-    connectInterfaceToThis("BondingCreated", slotBondingCreated(const QString &));
-    connectInterfaceToThis("BondingRemoved", slotBondingRemoved(const QString &));
-*/
 
     connectInterfaceToThis("PropertyChanged", slotPropertyChanged(const QString &, const QVariant &));
     connectInterfaceToThis("DeviceCreated", slotDeviceCreated(const QDBusObjectPath &));
@@ -98,21 +83,14 @@
     d->iface.call("CancelDeviceCreation",addr);
 }
 
-QString BluezBluetoothInterface::createDevice(const QString &addr) const
+void BluezBluetoothInterface::createDevice(const QString &addr) const
 {
-    QDBusObjectPath path = objectReply("CreateDevice",addr);
-    return path.path();
+    d->iface.call("CreateDevice",addr);
 }
 
-QString BluezBluetoothInterface::createPairedDevice(const QString &addr, const QString &agentUBI, const QString &capab) const
+void BluezBluetoothInterface::createPairedDevice(const QString &addr, const QString &agentUBI, const QString &capab) const
 {
-    QDBusReply< QDBusObjectPath > reply;
-    reply = d->iface.call("CreatePairedDevice",addr,agentUBI,capab);
-
-    if (!reply.isValid()) {
-        return QString();
-    }
-    return reply.value().path();
+    d->iface.call("CreatePairedDevice",addr,qVariantFromValue(QDBusObjectPath(agentUBI)),capab);
 }
 
 QString BluezBluetoothInterface::findDevice(const QString &addr) const
@@ -147,7 +125,7 @@
 
 void BluezBluetoothInterface::registerAgent(const QString &agentUBI, const QString &capab)
 {
-    d->iface.call("RegisterAgent",agentUBI,capab);
+    d->iface.call("RegisterAgent",qVariantFromValue(QDBusObjectPath(agentUBI)),capab);
 }
 
 void BluezBluetoothInterface::releaseSession()
@@ -157,7 +135,7 @@
 
 void BluezBluetoothInterface::removeDevice(const QString &deviceUBI )
 {
-    d->iface.call("RemoveDevice",deviceUBI);
+    d->iface.call("RemoveDevice",qVariantFromValue(QDBusObjectPath(deviceUBI)));
 }
 
 void BluezBluetoothInterface::requestSession()
@@ -183,305 +161,20 @@
 
 void BluezBluetoothInterface::unregisterAgent(const QString &agentUBI)
 {
-    d->iface.call("UnregisterAgent",agentUBI);
+    d->iface.call("UnregisterAgent",qVariantFromValue(QDBusObjectPath(agentUBI)));
 }
 
 
 
-/*
-
-QString BluezBluetoothInterface::address() const
+void BluezBluetoothInterface::slotDeviceCreated(const QDBusObjectPath &path)
 {
-    return stringReply("GetAddress");
-}
+    kDebug() << "device created";
 
-QString BluezBluetoothInterface::version() const
-{
-    return stringReply("GetVersion");
-}
-
-QString BluezBluetoothInterface::revision() const
-{
-    return stringReply("GetRevision");
-}
-
-QString BluezBluetoothInterface::manufacturer() const
-{
-    return stringReply("GetManufacturer");
-}
-
-QString BluezBluetoothInterface::company() const
-{
-    return stringReply("GetCompany");
-}
-
-Solid::Control::BluetoothInterface::Mode BluezBluetoothInterface::mode() const
-{
-    QString theMode = stringReply("GetMode");
-    Solid::Control::BluetoothInterface::Mode modeEnum;
-    if (theMode == "connectable")
-    {
-        modeEnum = Solid::Control::BluetoothInterface::Connectable;
+    if (!d->devices.contains(path.path())) {
+        BluezBluetoothRemoteDevice* bluetoothRemoteDev = new BluezBluetoothRemoteDevice(path.path());
+        d->devices.insert(path.path(), bluetoothRemoteDev);
     }
-    else if (theMode == "discoverable")
-    {
-        modeEnum = Solid::Control::BluetoothInterface::Discoverable;
-    } else {
-        Q_ASSERT(theMode == "off");
-        modeEnum = Solid::Control::BluetoothInterface::Off;
-    }
-    return modeEnum;
-}
 
-int BluezBluetoothInterface::discoverableTimeout() const
-{
-    QDBusReply< uint > timeout = d->iface.call("GetDiscoverableTimeout");
-    if (timeout.isValid()) {
-        return timeout.value();
-    }
-
-    return -1;
-}
-
-bool BluezBluetoothInterface::isDiscoverable() const
-{
-    return boolReply("IsDiscoverable");
-}
-
-QStringList BluezBluetoothInterface::listConnections() const
-{
-    QStringList list = listReply("ListConnections");
-    for (int i = 0; i < list.size(); i++) {
-        list[i] = ubi() + '/' + list[i];
-    }
-    return list;
-}
-
-QString BluezBluetoothInterface::majorClass() const
-{
-    return stringReply("GetMajorClass");
-}
-
-QStringList BluezBluetoothInterface::listAvailableMinorClasses() const
-{
-    return listReply("ListAvailableMinorClasses");
-}
-
-QString BluezBluetoothInterface::minorClass() const
-{
-    return stringReply("GetMinorClass");
-}
-
-QStringList BluezBluetoothInterface::serviceClasses() const
-{
-    return listReply("GetServiceClasses");
-}
-
-QString BluezBluetoothInterface::name() const
-{
-    return stringReply("GetName");
-}
-
-QString BluezBluetoothInterface::getRemoteName(const QString &mac)
-{
-    return stringReply("GetRemoteName",mac);
-}
-
-bool BluezBluetoothInterface::isTrusted(const QString &mac)
-{
-   return boolReply("IsTrusted",mac);
-}
-
-QStringList BluezBluetoothInterface::listBondings() const
-{
-    return listReply("ListBondings");
-}
-
-bool BluezBluetoothInterface::isPeriodicDiscoveryActive() const
-{
-    return boolReply("IsPeriodicDiscovery");
-}
-
-bool BluezBluetoothInterface::isPeriodicDiscoveryNameResolvingActive() const
-{
-    return boolReply("IsPeriodicDiscoveryNameResolving");
-}
-
-QStringList BluezBluetoothInterface::listRemoteDevices() const
-{
-    QStringList list = listReply("ListRemoteDevices");
-    for (int i = 0; i < list.size(); i++) {
-        list[i] = ubi() + '/' + list[i];
-    }
-    return list;
-}
-
-QStringList BluezBluetoothInterface::listRecentRemoteDevices(const QDateTime &) const
-{
-    return listReply("ListRecentRemoteDevices");
-}
-
-void BluezBluetoothInterface::setMode(const Solid::Control::BluetoothInterface::Mode mode)
-{
-    QString modeString;
-    switch(mode)
-    {
-    case Solid::Control::BluetoothInterface::Off:
-        modeString = "off";
-        break;
-    case Solid::Control::BluetoothInterface::Discoverable:
-        modeString = "discoverable";
-        break;
-    case Solid::Control::BluetoothInterface::Connectable:
-        modeString = "connectable";
-        break;
-    }
-    d->iface.call("SetMode", modeString);
-}
-
-void BluezBluetoothInterface::setDiscoverableTimeout(int timeout)
-{
-    d->iface.call("SetDiscoverableTimeout", (uint)timeout);
-}
-
-void BluezBluetoothInterface::setMinorClass(const QString &minorClass)
-{
-    d->iface.call("SetMinorClass", minorClass);
-}
-
-void BluezBluetoothInterface::setName(const QString &name)
-{
-    d->iface.call("SetName", name);
-}
-
-void BluezBluetoothInterface::discoverDevices()
-{
-    d->iface.call("DiscoverDevices");
-}
-
-void BluezBluetoothInterface::discoverDevicesWithoutNameResolving()
-{
-    d->iface.call("DiscoverDevicesWithoutNameResolving");
-}
-
-void BluezBluetoothInterface::cancelDiscovery()
-{
-    d->iface.call("CancelDiscovery");
-}
-
-void BluezBluetoothInterface::startPeriodicDiscovery()
-{
-    d->iface.call("StartPeriodicDiscovery");
-}
-
-void BluezBluetoothInterface::stopPeriodicDiscovery()
-{
-    d->iface.call("StopPeriodicDiscovery");
-}
-
-void BluezBluetoothInterface::setPeriodicDiscoveryNameResolving(bool nameResolving)
-{
-    d->iface.call("SetPeriodicDiscoveryNameResolving", nameResolving);
-}
-
-void BluezBluetoothInterface::setTrusted(const QString& mac)
-{
-    d->iface.call("SetTrusted", mac);
-}
-
-void BluezBluetoothInterface::removeTrust(const QString& mac)
-{
-    d->iface.call("RemoveTrust", mac);
-}
-
-*/
-
-
-
-/*
-
-void BluezBluetoothInterface::slotModeChanged(const Solid::Control::BluetoothInterface::Mode mode)
-{
-    emit modeChanged(mode);
-}
-
-void BluezBluetoothInterface::slotDiscoverableTimeoutChanged(int timeout)
-{
-    emit discoverableTimeoutChanged(timeout);
-}
-
-void BluezBluetoothInterface::slotMinorClassChanged(const QString &minorClass)
-{
-    emit minorClassChanged(minorClass);
-}
-
-void BluezBluetoothInterface::slotNameChanged(const QString &name)
-{
-    emit nameChanged(name);
-}
-
-void BluezBluetoothInterface::slotDiscoveryStarted()
-{
-    emit discoveryStarted();
-}
-
-void BluezBluetoothInterface::slotDiscoveryCompleted()
-{
-    emit discoveryCompleted();
-}
-
-void BluezBluetoothInterface::slotRemoteDeviceFound(const QString &address, uint deviceClass, short rssi)
-{
-    QString remoteubi = QString("%1/%2").arg(ubi()).arg(address);
-    emit remoteDeviceFound(remoteubi, deviceClass, rssi);
-}
-
-void BluezBluetoothInterface::slotRemoteDeviceDisappeared(const QString &address)
-{
-    QString remoteubi = QString("%1/%2").arg(ubi()).arg(address);
-    emit remoteDeviceDisappeared(remoteubi);
-}
-
-void BluezBluetoothInterface::slotRemoteNameUpdated(const QString &address, const QString& name)
-{
-   emit remoteNameUpdated(address,name);
-}
-
-void BluezBluetoothInterface::slotRemoteDeviceConnected(const QString &address)
-{
-   emit remoteDeviceConnected(address);
-}
-
-void BluezBluetoothInterface::slotRemoteDeviceDisconnected(const QString &address)
-{
-   emit remoteDeviceDisconnected(address);
-}
-
-void BluezBluetoothInterface::slotTrustAdded(const QString &address)
-{
-   emit trustAdded(address);
-}
-
-void BluezBluetoothInterface::slotTrustRemoved(const QString &address)
-{
-   emit trustRemoved(address);
-}
-
-void BluezBluetoothInterface::slotBondingCreated(const QString &address)
-{
-   emit bondingCreated(address);
-}
-
-void BluezBluetoothInterface::slotBondingRemoved(const QString &address)
-{
-   emit bondingRemoved(address);
-}
-
-*/
-
-void BluezBluetoothInterface::slotDeviceCreated(const QDBusObjectPath &path)
-{
-    kDebug() << "device created";
     emit deviceCreated(path.path());
 }
 
@@ -523,7 +216,20 @@
     return bluetoothInterface;
 }
 
+QObject *BluezBluetoothInterface::createBluetoothInputDevice(const QString &ubi)
+{
+    BluezBluetoothInputDevice *bluetoothInputDev;
+    if (d->inputDevices.contains(ubi)) {
+        bluetoothInputDev = d->inputDevices[ubi];
+    } else {
+        bluetoothInputDev = new BluezBluetoothInputDevice(ubi);
+        d->inputDevices.insert(ubi, bluetoothInputDev);
+    }
+    return bluetoothInputDev;
+}
 
+
+
 /******************* DBus Calls *******************************/
 
 QStringList BluezBluetoothInterface::listReply(const QString &method) const
@@ -574,10 +280,13 @@
 
     if (param.isEmpty())
 	    reply = d->iface.call(method);
-    else
+    else {
+            qDebug() << "ObjectReply calling: " << method << " " << param;
 	    reply = d->iface.call(method, param);
+    }
 	    	
     if (reply.isValid()) {
+        qDebug() << "ObjectReply Valid? "<<  reply.value().path();
         return reply.value();
     }
 
Index: bluez-bluetoothinterface.h
===================================================================
--- bluez-bluetoothinterface.h	(.../branches/KDE/4.2/kdebase/workspace/solid/bluez)	(revision 912529)
+++ solid/bluez/bluez-bluetoothinterface.h	(.../trunk/KDE/kdebase/workspace/solid/bluez)	(revision 912529)
@@ -27,6 +27,7 @@
 #include <QtDBus>
 #include <QDBusVariant>
 #include <QDBusObjectPath>
+#include <QString>
 
 #include <solid/control/ifaces/bluetoothinterface.h>
 
@@ -42,34 +43,11 @@
     BluezBluetoothInterface(const QString  & objectPath);
     virtual ~BluezBluetoothInterface();
     QString ubi() const;
-/*
-    QString address() const;
-    QString version() const;
-    QString revision() const;
-    QString manufacturer() const;
-    QString company() const;
-    Solid::Control::BluetoothInterface::Mode mode() const;
-    int discoverableTimeout() const;
-    bool isDiscoverable() const;
-    QStringList listConnections() const;
-    QString majorClass() const;
-    QStringList listAvailableMinorClasses() const;
-    QString minorClass() const;
-    QStringList serviceClasses() const;
-    QString name() const;
-    QStringList listBondings() const;
-    bool isPeriodicDiscoveryActive() const;
-    bool isPeriodicDiscoveryNameResolvingActive() const;
-    QStringList listRemoteDevices() const;
-    QStringList listRecentRemoteDevices(const QDateTime &) const;
-    QString getRemoteName(const QString &);
-    bool isTrusted(const QString &);
-
-*/    
+    
     QObject *createBluetoothRemoteDevice(const QString &);
-
-    QString createDevice(const QString &) const;
-    QString createPairedDevice(const QString &,const QString &,const QString &) const;
+    QObject *createBluetoothInputDevice(const QString &);
+    void createDevice(const QString &) const;
+    void createPairedDevice(const QString &,const QString &,const QString &) const;
     QString findDevice(const QString &) const;
     QMap< QString, QVariant > getProperties() const;
     QStringList listDevices() const;
@@ -87,36 +65,6 @@
     void stopDiscovery();
     void unregisterAgent(const QString &);
 
-/*
-    void setMode(const Solid::Control::BluetoothInterface::Mode);
-    void setDiscoverableTimeout(int);
-    void setMinorClass(const QString &);
-    void setName(const QString &);
-    void discoverDevices();
-    void discoverDevicesWithoutNameResolving();
-    void cancelDiscovery();
-    void startPeriodicDiscovery();
-    void stopPeriodicDiscovery();
-    void setPeriodicDiscoveryNameResolving(bool);
-    void setTrusted(const QString &);
-    void removeTrust(const QString &);
-
-    void slotModeChanged(const Solid::Control::BluetoothInterface::Mode mode);
-    void slotDiscoverableTimeoutChanged(int timeout);
-    void slotMinorClassChanged(const QString &minor);
-    void slotNameChanged(const QString &name);
-    void slotDiscoveryStarted();
-    void slotDiscoveryCompleted();
-    void slotRemoteDeviceFound(const QString &ubi, uint deviceClass, short rssi);
-    void slotRemoteDeviceDisappeared(const QString &ubi);
-    void slotRemoteNameUpdated(const QString &, const QString &);
-    void slotRemoteDeviceConnected(const QString&);
-    void slotRemoteDeviceDisconnected(const QString&);
-    void slotTrustAdded(const QString&);
-    void slotTrustRemoved(const QString&);
-    void slotBondingCreated(const QString&);
-    void slotBondingRemoved(const QString&);
-*/    
     void slotDeviceCreated(const QDBusObjectPath &);
     void slotDeviceDisappeared(const QString &);
     void slotDeviceFound(const QString &, const QMap< QString, QVariant > &);
Index: bluez-bluetoothmanager.cpp
===================================================================
--- bluez-bluetoothmanager.cpp	(.../branches/KDE/4.2/kdebase/workspace/solid/bluez)	(revision 912529)
+++ solid/bluez/bluez-bluetoothmanager.cpp	(.../trunk/KDE/kdebase/workspace/solid/bluez)	(revision 912529)
@@ -104,6 +104,7 @@
 
 QString BluezBluetoothManager::defaultInterface() const
 {
+    kDebug() << "Calling Backend Default Interface";
     QDBusReply< QDBusObjectPath > path = d->manager.call("DefaultAdapter");
     if (!path.isValid())
         return QString();
@@ -132,6 +133,16 @@
     return bluetoothInterface;
 }
 
+void BluezBluetoothManager::removeInterface(const QString& ubi)
+{
+
+    if (d->interfaces.contains(ubi)) {
+        kDebug() << "Removing Interface" << ubi;
+        BluezBluetoothInterface * bluetoothInterface = d->interfaces.take(ubi);
+        bluetoothInterface = 0;
+    }
+}
+
 /*
 KJob *BluezBluetoothManager::setupInputDevice(const QString &ubi)
 {
Index: bluez-bluetoothremotedevice.cpp
===================================================================
--- bluez-bluetoothremotedevice.cpp	(.../branches/KDE/4.2/kdebase/workspace/solid/bluez)	(revision 912529)
+++ solid/bluez/bluez-bluetoothremotedevice.cpp	(.../trunk/KDE/kdebase/workspace/solid/bluez)	(revision 912529)
@@ -42,6 +42,7 @@
 	m_adapter = m_objectPath.left(objectPath.size() - 18);
 	m_address = m_objectPath.right(17);
 
+        kdDebug() << "Connecting to ObjectPath: " << objectPath;
 
 	device = new QDBusInterface("org.bluez", objectPath,
 				    "org.bluez.Device", QDBusConnection::systemBus());
@@ -79,7 +80,7 @@
 
 void BluezBluetoothRemoteDevice::setProperty(const QString &name, const QVariant &value)
 {
-    device->call("SetProperty",name,value);
+    device->call("SetProperty",name,qVariantFromValue(QDBusVariant(value)));
 }
 
 void BluezBluetoothRemoteDevice::discoverServices(const QString& pattern) const
Index: bluez-bluetoothmanager.h
===================================================================
--- bluez-bluetoothmanager.h	(.../branches/KDE/4.2/kdebase/workspace/solid/bluez)	(revision 912529)
+++ solid/bluez/bluez-bluetoothmanager.h	(.../trunk/KDE/kdebase/workspace/solid/bluez)	(revision 912529)
@@ -43,6 +43,7 @@
     virtual ~BluezBluetoothManager();
     QStringList bluetoothInterfaces() const;
     QObject * createInterface(const QString &);
+    void removeInterface(const QString& ubi);
 //  QStringList bluetoothInputDevices() const;
     QString defaultInterface() const;
     QString findInterface(const QString &) const;
diff -Nur -x '[^b][^l]*' -x .svn 4_2libsControl/bluetoothinputdevice.cpp kdebase/workspace/libs/solid/control/bluetoothinputdevice.cpp
--- 4_2libsControl/bluetoothinputdevice.cpp	2009-01-17 17:51:33.000000000 +0100
+++ libs/solid/control/bluetoothinputdevice.cpp	2009-01-14 21:06:47.000000000 +0100
@@ -91,8 +91,8 @@
     FrontendObjectPrivate::setBackendObject(object);
 
     if (object) {
-        QObject::connect(object, SIGNAL(propertyChanged(QString,QVariant)),
-                         parent(), SIGNAL(propertyChanged(QString,QVariant)));
+        QObject::connect(object, SIGNAL(propertyChanged(const QString&,const QVariant&)),
+                         parent(), SIGNAL(propertyChanged(const QString,const QVariant&)));
     }
 }
 
diff -Nur -x '[^b][^l]*' -x .svn 4_2libsControl/bluetoothinterface.cpp kdebase/workspace/libs/solid/control/bluetoothinterface.cpp
--- 4_2libsControl/bluetoothinterface.cpp	2009-01-17 17:51:33.000000000 +0100
+++ libs/solid/control/bluetoothinterface.cpp	2009-01-16 12:11:03.000000000 +0100
@@ -25,7 +25,7 @@
 #include <QStringList>
 #include <QVariant>
 
-#include <kdebug.h>
+#include <KDebug>
 
 #include "ifaces/bluetoothinterface.h"
 
@@ -49,9 +49,12 @@
     void setBackendObject(QObject *object);
 
     QPair<BluetoothRemoteDevice *, Ifaces::BluetoothRemoteDevice *> findRegisteredBluetoothRemoteDevice(const QString &ubi) const;
+    QPair<BluetoothInputDevice *, Ifaces::BluetoothInputDevice *> findRegisteredBluetoothInputDevice(const QString &ubi) const;
 
     mutable QMap<QString, QPair<BluetoothRemoteDevice *, Ifaces::BluetoothRemoteDevice *> > remoteDeviceMap;
+    mutable QMap<QString, QPair<BluetoothInputDevice *, Ifaces::BluetoothInputDevice *> > inputDeviceMap;
     mutable BluetoothRemoteDevice invalidDevice;
+    mutable BluetoothInputDevice invalidInputDevice;
 };
 }
 }
@@ -65,30 +68,39 @@
 {
     const BluetoothInterface &device = BluetoothManager::self().findBluetoothInterface(ubi);
     d->setBackendObject(device.d->backendObject());
+    QObject::connect(d->backendObject(), SIGNAL(deviceCreated(const QString &)),this, SLOT(slotDeviceCreated(const QString &)));
 }
 
 Solid::Control::BluetoothInterface::BluetoothInterface(QObject *backendObject)
         : QObject(), d(new BluetoothInterfacePrivate(this))
 {
     d->setBackendObject(backendObject);
+    QObject::connect(d->backendObject(), SIGNAL(deviceCreated(const QString &)),this, SLOT(slotDeviceCreated(const QString &)));
 }
 
 Solid::Control::BluetoothInterface::BluetoothInterface(const BluetoothInterface &device)
         : QObject(), d(new BluetoothInterfacePrivate(this))
 {
     d->setBackendObject(device.d->backendObject());
+    QObject::connect(d->backendObject(), SIGNAL(deviceCreated(const QString &)),this, SLOT(slotDeviceCreated(const QString &)));
 }
 
 Solid::Control::BluetoothInterface::~BluetoothInterface()
 {
     // Delete all the interfaces, they are now outdated
     typedef QPair<BluetoothRemoteDevice *, Ifaces::BluetoothRemoteDevice *> BluetoothRemoteDeviceIfacePair;
+    typedef QPair<BluetoothInputDevice *, Ifaces::BluetoothInputDevice *> BluetoothInputDeviceIfacePair;
 
     // Delete all the devices, they are now outdated
-    foreach (const BluetoothRemoteDeviceIfacePair &pair, d->remoteDeviceMap) {
+    foreach (const BluetoothRemoteDeviceIfacePair &pair, d->remoteDeviceMap.values()) {
         delete pair.first;
         delete pair.second;
     }
+    foreach (const BluetoothInputDeviceIfacePair &pair, d->inputDeviceMap.values()) {
+        delete pair.first;
+        delete pair.second;
+    }
+
 }
 
 Solid::Control::BluetoothInterface &Solid::Control::BluetoothInterface::operator=(const Solid::Control::BluetoothInterface  & dev)
@@ -108,9 +120,12 @@
     SOLID_CALL(Ifaces::BluetoothInterface *, d->backendObject(), cancelDeviceCreation(address));
 }
 
-QString Solid::Control::BluetoothInterface::createPairedDevice(const QString &address,const QString &adapterPath, const QString &capab) const
+void Solid::Control::BluetoothInterface::createPairedDevice(const QString &address,const QString &adapterPath, const QString &capab) const
 {
-    return_SOLID_CALL(Ifaces::BluetoothInterface *, d->backendObject(), QString(), createPairedDevice(address,adapterPath,capab));
+    Ifaces::BluetoothInterface *backend = qobject_cast<Ifaces::BluetoothInterface *>(d->backendObject());
+    if (backend == 0) 
+        return;
+    backend->createPairedDevice(address,adapterPath,capab);
 }
 
 QMap<QString, QVariant> Solid::Control::BluetoothInterface::getProperties() const
@@ -137,7 +152,7 @@
 
     Solid::Control::BluetoothRemoteDeviceList list;
     foreach (const QString& ubi,ubis) {
-        BluetoothRemoteDevice remoteDevice = findBluetoothRemoteDevice(ubi);
+        BluetoothRemoteDevice* remoteDevice = findBluetoothRemoteDeviceUBI(ubi);
         list.append(remoteDevice);
     }
     return list;
@@ -184,13 +199,13 @@
 }
 
 
-Solid::Control::BluetoothRemoteDevice Solid::Control::BluetoothInterface::findBluetoothRemoteDevice(const QString &address) const
+Solid::Control::BluetoothRemoteDevice Solid::Control::BluetoothInterface::findBluetoothRemoteDeviceAddr(const QString &address) const
 {
     Ifaces::BluetoothInterface *backend = qobject_cast<Ifaces::BluetoothInterface *>(d->backendObject());
     if (backend == 0) 
         return d->invalidDevice;
 
-    const QString ubi = backend->findDevice(address);
+    const QString ubi = getBluetoothRemoteDeviceUBI(address);
 
     QPair<BluetoothRemoteDevice *, Ifaces::BluetoothRemoteDevice *> pair = d->findRegisteredBluetoothRemoteDevice(ubi);
 
@@ -201,18 +216,56 @@
     }
 }
 
-Solid::Control::BluetoothRemoteDevice * Solid::Control::BluetoothInterface::createBluetoothRemoteDevice(const QString &address)
+
+const QString Solid::Control::BluetoothInterface::getBluetoothRemoteDeviceUBI(const QString &address) const
 {
     Ifaces::BluetoothInterface *backend = qobject_cast<Ifaces::BluetoothInterface *>(d->backendObject());
     if (backend == 0) 
-        return 0;
+        return "";
+
+    const QString ubi = backend->findDevice(address);
+    return ubi;
+}
 
-    const QString ubi = backend->createDevice(address);
 
+void Solid::Control::BluetoothInterface::createBluetoothRemoteDevice(const QString &address)
+{
+    Ifaces::BluetoothInterface *backend = qobject_cast<Ifaces::BluetoothInterface *>(d->backendObject());
+    if (backend == 0) 
+        return;
+    backend->createDevice(address);
+}
+
+
+Solid::Control::BluetoothRemoteDevice* Solid::Control::BluetoothInterface::findBluetoothRemoteDeviceUBI(const QString &ubi) const
+{
     QPair<BluetoothRemoteDevice *, Ifaces::BluetoothRemoteDevice *> pair = d->findRegisteredBluetoothRemoteDevice(ubi);
     return pair.first;
 }
 
+Solid::Control::BluetoothInputDevice* Solid::Control::BluetoothInterface::findBluetoothInputDeviceUBI(const QString &ubi) const
+{
+    QPair<BluetoothInputDevice *, Ifaces::BluetoothInputDevice *> pair = d->findRegisteredBluetoothInputDevice(ubi);
+    return pair.first;
+}
+
+void Solid::Control::BluetoothInterface::slotDeviceCreated(const QString& ubi)
+{
+
+    Ifaces::BluetoothInterface *backend = qobject_cast<Ifaces::BluetoothInterface *>(d->backendObject());
+    Ifaces::BluetoothRemoteDevice *iface = 0;
+
+    if (backend != 0) {
+        iface = qobject_cast<Ifaces::BluetoothRemoteDevice *>(backend->createBluetoothRemoteDevice(ubi));
+    }
+
+    if (iface != 0) {
+        BluetoothRemoteDevice *device = new BluetoothRemoteDevice(iface);
+
+        QPair<BluetoothRemoteDevice *, Ifaces::BluetoothRemoteDevice *> pair(device, iface);
+        d->remoteDeviceMap[ubi] = pair;
+    }
+}
 
 QString Solid::Control::BluetoothInterface::address() const
 {
@@ -492,8 +545,6 @@
         QObject::connect(object, SIGNAL(propertyChanged(const QString &,const QVariant &)),
                                  parent(), SIGNAL(propertyChanged(const QString &, const QVariant &)));
 
-
-
     }
 }
 
@@ -521,6 +572,32 @@
         }
 
     }
+}
+
+QPair<Solid::Control::BluetoothInputDevice *, Solid::Control::Ifaces::BluetoothInputDevice *> Solid::Control::BluetoothInterfacePrivate::findRegisteredBluetoothInputDevice(const QString &ubi) const
+{
+    if (inputDeviceMap.contains(ubi)) {
+        return inputDeviceMap[ubi];
+    } else {
+        Ifaces::BluetoothInterface *backend = qobject_cast<Ifaces::BluetoothInterface *>(backendObject());
+        Ifaces::BluetoothInputDevice *iface = 0;
+
+        if (backend != 0) {
+            iface = qobject_cast<Ifaces::BluetoothInputDevice *>(backend->createBluetoothInputDevice(ubi));
+        }
+
+        if (iface != 0) {
+            BluetoothInputDevice *device = new BluetoothInputDevice(iface);
+
+            QPair<BluetoothInputDevice *, Ifaces::BluetoothInputDevice *> pair(device, iface);
+            inputDeviceMap[ubi] = pair;
+
+            return pair;
+        } else {
+            return QPair<BluetoothInputDevice *, Ifaces::BluetoothInputDevice *>(0, 0);
+        }
+
+    }
 }
 
 #include "bluetoothinterface.moc"
diff -Nur -x '[^b][^l]*' -x .svn 4_2libsControl/bluetoothinterface.h kdebase/workspace/libs/solid/control/bluetoothinterface.h
--- 4_2libsControl/bluetoothinterface.h	2009-01-17 17:51:33.000000000 +0100
+++ libs/solid/control/bluetoothinterface.h	2009-01-14 14:17:14.000000000 +0100
@@ -28,7 +28,9 @@
 #include <QtCore/QMap>
 
 #include "bluetoothremotedevice.h"
+#include "bluetoothinputdevice.h"
 #include "ifaces/bluetoothremotedevice.h"
+#include "ifaces/bluetoothinputdevice.h"
 
 
 
@@ -37,7 +39,7 @@
 namespace Control
 {
 class BluetoothRemoteDevice;
-typedef QList<BluetoothRemoteDevice> BluetoothRemoteDeviceList;
+typedef QList<BluetoothRemoteDevice*> BluetoothRemoteDeviceList;
 class BluetoothInterfacePrivate;
 
 /**
@@ -115,7 +117,8 @@
      * @param ubi the identifier of the bluetooth device to instantiate
      * @returns a bluetooth object, if a bluetooth device having the given UBI, for this interface exists, 0 otherwise
      */
-    Solid::Control::BluetoothRemoteDevice* createBluetoothRemoteDevice(const QString &address);
+    //Solid::Control::BluetoothRemoteDevice* createBluetoothRemoteDevice(const QString &address);
+    void createBluetoothRemoteDevice(const QString &address);
 
     /**
      * Finds a BluetoothRemoteDevice object given its UBI.
@@ -123,7 +126,13 @@
      * @param ubi the identifier of the bluetooth remote device to find from this bluetooth interface
      * @returns a valid BluetoothRemoteDevice object if a remote device having the given UBI for this interface exists, an invalid BluetoothRemoteDevice object otherwise.
      */
-    Solid::Control::BluetoothRemoteDevice findBluetoothRemoteDevice(const QString &address) const;
+    const QString getBluetoothRemoteDeviceUBI(const QString &address) const;
+
+    Solid::Control::BluetoothRemoteDevice findBluetoothRemoteDeviceAddr(const QString &addr) const;
+
+    Solid::Control::BluetoothRemoteDevice* findBluetoothRemoteDeviceUBI(const QString &ubi) const;
+
+    Solid::Control::BluetoothInputDevice* findBluetoothInputDeviceUBI(const QString &ubi) const;
 
     /**
      * Retrieves the MAC address of the bluetooth interface/adapter.
@@ -296,7 +305,7 @@
 //    bool isTrusted(const QString &);
 
 
-    QString createPairedDevice(const QString &, const QString &, const QString &) const;
+    void createPairedDevice(const QString &, const QString &, const QString &) const;
 
     QMap< QString, QVariant > getProperties() const;
 
@@ -557,6 +566,9 @@
     QVariant getProperty(const QString&) const;
     BluetoothInterfacePrivate * const d;
 
+private slots:
+    void slotDeviceCreated(const QString& ubi);
+
 };
 
 } //Control
diff -Nur -x '[^b][^l]*' -x .svn 4_2libsControl/bluetoothmanager.cpp kdebase/workspace/libs/solid/control/bluetoothmanager.cpp
--- 4_2libsControl/bluetoothmanager.cpp	2009-01-17 17:51:33.000000000 +0100
+++ libs/solid/control/bluetoothmanager.cpp	2009-01-16 13:17:33.000000000 +0100
@@ -58,6 +58,7 @@
 
     void _k_interfaceAdded(const QString &ubi);
     void _k_interfaceRemoved(const QString &ubi);
+    void _k_defaultInterfaceChanged(const QString &ubi);
     void _k_interfaceDestroyed(QObject *object);
 /*
     void _k_inputDeviceCreated(const QString &ubi);
@@ -95,7 +96,7 @@
     typedef QPair<BluetoothInterface *, Ifaces::BluetoothInterface *> BluetoothInterfaceIfacePair;
 
     // Delete all the devices, they are now outdated
-    foreach (const BluetoothInterfaceIfacePair &pair, d->bluetoothInterfaceMap) {
+    foreach (const BluetoothInterfaceIfacePair &pair, d->bluetoothInterfaceMap.values()) {
         delete pair.first;
         delete pair.second;
     }
@@ -110,6 +111,8 @@
 
     if (backend == 0) return list;
 
+    kDebug() << "UBI List " << ubiList;
+
     foreach (const QString &ubi, ubiList) {
         QPair<BluetoothInterface *, Ifaces::BluetoothInterface *> pair = d->findRegisteredBluetoothInterface(ubi);
 
@@ -239,7 +242,9 @@
 */
 void Solid::Control::BluetoothManagerPrivate::_k_interfaceAdded(const QString &ubi)
 {
-    QPair<BluetoothInterface *, Ifaces::BluetoothInterface *> pair = bluetoothInterfaceMap.take(ubi);
+    kDebug() << "Size of InterfaceList " << bluetoothInterfaceMap.size();
+    QPair<BluetoothInterface *, Ifaces::BluetoothInterface *> pair = findRegisteredBluetoothInterface(ubi);
+/*    QPair<BluetoothInterface *, Ifaces::BluetoothInterface *> pair = bluetoothInterfaceMap.take(ubi);
 
     if (pair.first != 0) {
         // Oops, I'm not sure it should happen...
@@ -247,7 +252,7 @@
 
         delete pair.first;
         delete pair.second;
-    }
+    }*/
 
     emit q->interfaceAdded(ubi);
 }
@@ -261,11 +266,19 @@
         delete pair.second;
     }
 
+    Ifaces::BluetoothManager *backend = qobject_cast<Ifaces::BluetoothManager *>(managerBackend());
+    backend->removeInterface(ubi);
     emit q->interfaceRemoved(ubi);
 }
 
+void Solid::Control::BluetoothManagerPrivate::_k_defaultInterfaceChanged(const QString &ubi)
+{
+    emit q->defaultInterfaceChanged(ubi);
+}
+
 void Solid::Control::BluetoothManagerPrivate::_k_interfaceDestroyed(QObject *object)
 {
+    kDebug() << "Interface detroyed";
     Ifaces::BluetoothInterface *device = qobject_cast<Ifaces::BluetoothInterface *>(object);
 
     if (device != 0) {
@@ -323,6 +336,9 @@
                      q, SLOT(_k_interfaceAdded(const QString &)));
     QObject::connect(newBackend, SIGNAL(interfaceRemoved(const QString &)),
                      q, SLOT(_k_interfaceRemoved(const QString &)));
+    QObject::connect(newBackend, SIGNAL(defaultInterfaceChanged(const QString &)),
+                     q, SLOT(_k_defaultInterfaceChanged(const QString &)));
+
 /*
     QObject::connect(newBackend, SIGNAL(inputDeviceCreated(const QString &)),
                      q, SLOT(_k_inputDeviceCreated(const QString &)));
@@ -334,17 +350,22 @@
 
 QPair<Solid::Control::BluetoothInterface *, Solid::Control::Ifaces::BluetoothInterface *> Solid::Control::BluetoothManagerPrivate::findRegisteredBluetoothInterface(const QString &ubi) const
 {
+
+    kDebug() << "findRegisteredBluetoothInterface " << ubi;
     if (bluetoothInterfaceMap.contains(ubi)) {
         return bluetoothInterfaceMap[ubi];
     } else {
+        kDebug() << "Creating New Interface " << ubi;
         Ifaces::BluetoothManager *backend = qobject_cast<Ifaces::BluetoothManager *>(managerBackend());
         Ifaces::BluetoothInterface *iface = 0;
 
         if (backend != 0) {
+            kDebug() << "Calling Backend to Creating New Interface " << ubi;
             iface = qobject_cast<Ifaces::BluetoothInterface *>(backend->createInterface(ubi));
         }
 
         if (iface != 0) {
+            kDebug() << "BackendIface created ";
             BluetoothInterface *device = new BluetoothInterface(iface);
             QPair<BluetoothInterface *, Ifaces::BluetoothInterface *> pair(device, iface);
             QObject::connect(iface, SIGNAL(destroyed(QObject *)),
diff -Nur -x '[^b][^l]*' -x .svn 4_2libsControl/bluetoothmanager.h kdebase/workspace/libs/solid/control/bluetoothmanager.h
--- 4_2libsControl/bluetoothmanager.h	2009-01-17 17:51:33.000000000 +0100
+++ libs/solid/control/bluetoothmanager.h	2009-01-16 13:17:33.000000000 +0100
@@ -188,6 +188,7 @@
 
     Q_PRIVATE_SLOT(d, void _k_interfaceAdded(const QString &))
     Q_PRIVATE_SLOT(d, void _k_interfaceRemoved(const QString &))
+    Q_PRIVATE_SLOT(d, void _k_defaultInterfaceChanged(const QString &))
     Q_PRIVATE_SLOT(d, void _k_interfaceDestroyed(QObject *))
 /*
     Q_PRIVATE_SLOT(d, void _k_inputDeviceCreated(const QString &))
diff -Nur -x '[^b][^l]*' -x .svn 4_2libsControl/bluetoothremotedevice.cpp kdebase/workspace/libs/solid/control/bluetoothremotedevice.cpp
--- 4_2libsControl/bluetoothremotedevice.cpp	2009-01-17 17:51:33.000000000 +0100
+++ libs/solid/control/bluetoothremotedevice.cpp	2009-01-13 14:53:39.000000000 +0100
@@ -88,6 +88,15 @@
     return_SOLID_CALL(Ifaces::BluetoothRemoteDevice *, d->backendObject(), (QMap< QString,QVariant >()), getProperties());
 }
 
+QVariant Solid::Control::BluetoothRemoteDevice::getProperty(const QString &key)
+{
+    QMap<QString, QVariant> props = getProperties();
+    if (props.contains(key))
+        return props[key];
+    else
+        return QVariant();
+}
+
 QStringList Solid::Control::BluetoothRemoteDevice::listNodes()
 {
     Q_D(const BluetoothRemoteDevice);
@@ -113,14 +122,65 @@
 }
 
 
+QString Solid::Control::BluetoothRemoteDevice::address()
+{
+    QVariant var = getProperty("Address");
+
+    if (var.isValid())
+        return var.value<QString>();
+    else
+        return QString();
 
-/*
-QString Solid::Control::BluetoothRemoteDevice::address() const
+//    Q_D(const BluetoothRemoteDevice);
+//    return_SOLID_CALL(Ifaces::BluetoothRemoteDevice *, d->backendObject(), QString(), address());
+}
+
+bool Solid::Control::BluetoothRemoteDevice::isTrusted()
 {
-    Q_D(const BluetoothRemoteDevice);
-    return_SOLID_CALL(Ifaces::BluetoothRemoteDevice *, d->backendObject(), QString(), address());
+     QVariant var = getProperty("Trusted");
+
+    if (var.isValid())
+        return var.value<bool>();
+    else
+        return false;
+}
+
+void Solid::Control::BluetoothRemoteDevice::setTrusted(bool trust)
+{
+    setProperty("Trusted",QVariant(trust));
 }
 
+QString Solid::Control::BluetoothRemoteDevice::icon()
+{
+     QVariant var = getProperty("Icon");
+
+    if (var.isValid())
+        return var.value<QString>();
+    else
+        return "";
+}
+
+QStringList Solid::Control::BluetoothRemoteDevice::uuids()
+{
+     QVariant var = getProperty("UUIDs");
+
+    if (var.isValid())
+        return var.value<QStringList>();
+    else
+        return QStringList();
+}
+
+bool Solid::Control::BluetoothRemoteDevice::isConnected()
+{
+     QVariant var = getProperty("Connected");
+
+    if (var.isValid())
+        return var.value<bool>();
+    else
+        return false;
+}
+
+/*
 bool Solid::Control::BluetoothRemoteDevice::isConnected() const
 {
     Q_D(const BluetoothRemoteDevice);
@@ -168,12 +228,21 @@
     Q_D(const BluetoothRemoteDevice);
     return_SOLID_CALL(Ifaces::BluetoothRemoteDevice *, d->backendObject(), QStringList(), serviceClasses());
 }
-QString Solid::Control::BluetoothRemoteDevice::name() const
+*/
+
+QString Solid::Control::BluetoothRemoteDevice::name()
 {
-    Q_D(const BluetoothRemoteDevice);
-    return_SOLID_CALL(Ifaces::BluetoothRemoteDevice *, d->backendObject(), QString(), name());
+    QVariant var = getProperty("Name");
+
+    if (var.isValid())
+        return var.value<QString>();
+    else
+        return QString();
+
+//    return_SOLID_CALL(Ifaces::BluetoothRemoteDevice *, d->backendObject(), QString(), name());
 }
 
+/*
 QString Solid::Control::BluetoothRemoteDevice::alias() const
 {
     Q_D(const BluetoothRemoteDevice);
diff -Nur -x '[^b][^l]*' -x .svn 4_2libsControl/bluetoothremotedevice.h kdebase/workspace/libs/solid/control/bluetoothremotedevice.h
--- 4_2libsControl/bluetoothremotedevice.h	2009-01-17 17:51:33.000000000 +0100
+++ libs/solid/control/bluetoothremotedevice.h	2009-01-13 14:53:39.000000000 +0100
@@ -82,11 +82,46 @@
     bool operator==(const BluetoothRemoteDevice  & other) const;
 
     /**
-     * The UBI of the remote de device.
+     * The UBI of the remote device.
      */
     QString ubi() const;
 
     /**
+     * The address of the remote device.
+     */
+    QString address();
+
+    /**
+     * The name of the remote device.
+     */
+    QString name();
+
+    /**
+     * The icon of the remote device.
+     */
+    QString icon();
+
+    /**
+     * The Trust state of the remote device.
+     */
+    bool isTrusted();
+
+    /**
+     * Set the Trust state of the remote device.
+     */
+    void setTrusted(bool);
+
+    /**
+     * Returns the service uuids of the remote device.
+     */
+    QStringList uuids();
+
+    /**
+     * The Connection state of the remote device.
+     */
+    bool isConnected();
+
+    /**
      * Retrieve all properties from the remote device.
      *
      * @returns a hash of named properties
@@ -157,6 +192,9 @@
 
 private:
     Q_PRIVATE_SLOT(d_func(), void _k_destroyed(QObject *))
+
+
+    QVariant getProperty(const QString &key);
 };
 
 } //Control
diff -Nur -x '[^b][^l]*' -x .svn 4_2libsControl/ifaces/bluetoothinterface.h kdebase/workspace/libs/solid/control/ifaces/bluetoothinterface.h
--- 4_2libsControl/ifaces/bluetoothinterface.h	2009-01-17 17:51:32.000000000 +0100
+++ libs/solid/control/ifaces/bluetoothinterface.h	2009-01-16 17:16:55.000000000 +0100
@@ -240,7 +240,7 @@
      */
 
 
-    virtual QString createPairedDevice(const QString &, const QString &, const QString &) const = 0;
+    virtual void createPairedDevice(const QString &, const QString &, const QString &) const = 0;
 
     virtual QMap< QString, QVariant > getProperties() const = 0;
 
@@ -248,7 +248,8 @@
 
     virtual QString findDevice(const QString &) const = 0;
 
-    virtual QString createDevice(const QString &) const = 0;
+    //virtual QString createDevice(const QString &) const = 0;
+    virtual void createDevice(const QString &) const = 0;
 
 
 
@@ -320,7 +321,9 @@
      * @param ubi the identifier of the bluetooth remote device instantiated
      * @returns a new BluetoothRemoteDevice object if there's a device having the given UBI, 0 otherwise
      */
-    virtual QObject *createBluetoothRemoteDevice(const QString &address) = 0;
+    virtual QObject *createBluetoothRemoteDevice(const QString &ubi) = 0;
+
+    virtual QObject *createBluetoothInputDevice(const QString &ubi) = 0;
 
     /**
      * Marks the device as trusted.
diff -Nur -x '[^b][^l]*' -x .svn 4_2libsControl/ifaces/bluetoothmanager.h kdebase/workspace/libs/solid/control/ifaces/bluetoothmanager.h
--- 4_2libsControl/ifaces/bluetoothmanager.h	2009-01-17 17:51:32.000000000 +0100
+++ libs/solid/control/ifaces/bluetoothmanager.h	2009-01-16 12:42:32.000000000 +0100
@@ -89,6 +89,13 @@
      virtual QObject *createInterface(const QString &ubi) = 0;
 
     /**
+     * Removes a BluetoothInterface object from this backend given its UBI.
+     *
+     * @param ubi the identifier of the bluetooth interface instantiated
+     */
+     virtual void removeInterface(const QString &ubi) = 0;
+
+    /**
      * Retrieves the list of Universal Bluetooth Identifiers (UBIs) of bluetooth input devices
      * which are configured in the system. Configured means also not connected devices.
      *


Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/F-10/kdebase-workspace.spec,v
retrieving revision 1.150
retrieving revision 1.151
diff -u -r1.150 -r1.151
--- kdebase-workspace.spec	28 Jan 2009 12:50:30 -0000	1.150
+++ kdebase-workspace.spec	29 Jan 2009 19:03:09 -0000	1.151
@@ -4,7 +4,7 @@
 Name: kdebase-workspace
 Version: 4.2.0
 
-Release: 2%{?dist}
+Release: 4%{?dist}
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-workspace-%{version}.tar.bz2
 License: GPLv2
 Group: User Interface/Desktops
@@ -22,13 +22,14 @@
 Patch7: kdebase-workspace-4.0.3-krdb.patch
 Patch8: kdebase-workspace-4.0.72-klipper-url.patch
 Patch9: kdebase-workspace-4.1.80-session-button.patch
-Patch10: kdebase-workspace-4.1.2-ldap.patch
 Patch11: kdebase-workspace-4.1.96-font.patch
 Patch12: kdebase-workspace-4.2.0-default_applets.patch
 
 # upstream patches:
 # trunk
 Patch100: kdebase-workspace-4.1.96-AllowExternalPaths.patch
+# solid-bluetooth, https://bugzilla.redhat.com/481801
+Patch101: solid-bluetoothTrunkTo42.diff
 
 # FIXME: "inconsistent naming System Monitor vs KSysGuard" http://bugs.kde.org/162151
 
@@ -43,6 +44,9 @@
 Requires: kdebase4
 %endif
 
+# for plasmascript bits
+Requires: PyKDE4 >= %{version}
+
 # kdmtheme's functionality is now provided by kdebase-workspace itself
 Obsoletes: kdmtheme < 1.3
 
@@ -65,7 +69,6 @@
 BuildRequires: pam-devel
 BuildRequires: qimageblitz-devel
 BuildRequires: soprano-devel
-BuildRequires: openldap-devel
 BuildRequires: python-devel
 BuildRequires: PyKDE4-devel >= %{version}
 BuildRequires: qedje-devel
@@ -120,6 +123,7 @@
 %package devel
 Group:    Development/Libraries
 Summary:  Development files for %{name}
+Provides: solid-bluetooth-devel = 4.3-0.1
 Requires: %{name}-libs = %{version}-%{release}
 Requires: kdelibs4-devel
 %description devel
@@ -128,6 +132,7 @@
 %package libs
 Summary: Runtime libraries for %{name}
 Group:   System Environment/Libraries
+Provides: solid-bluetooth = 4.3-0.1
 Requires: kdelibs4 >= %{version}
 Requires: %{name} = %{version}-%{release}
 %description libs
@@ -171,12 +176,13 @@
 %patch7 -p0 -b .krdb
 %patch8 -p1 -b .klipper-url
 %patch9 -p1 -b .session-button
-%patch10 -p1 -b .ldap
 %patch11 -p1 -b .font
 %patch12 -p1 -b .default_applets
 
 # upstream patches
 %patch100 -p1 -b .AllowExternalPaths
+%patch101 -p0 -b .solid-bluetoothTrunkTo42
+
 
 %build
 
@@ -302,6 +308,14 @@
 
 
 %changelog
+* Thu Jan 29 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.0-4
+- omit ldap hack (#457638), kde42's reduced linkage to the rescue
+
+* Thu Jan 29 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.0-3
+- Requires: PyKDE4 (for plasmascript bits)
+- solid-bluetoothTrunkTo42.diff (bug #481801), and 
+  +Provides: solid-bluetooth(-devel) = 4.3
+
 * Wed Jan 28 2009 Than Ngo <than at redhat.com> - 4.2.0-2
 - readd the patch that omist battery applet when guidance-power-manager is installed
 


--- kdebase-workspace-4.1.2-ldap.patch DELETED ---



From ausil at fedoraproject.org  Thu Jan 29 19:33:08 2009
From: ausil at fedoraproject.org (Dennis Gilmore)
Date: Thu, 29 Jan 2009 19:33:08 +0000 (UTC)
Subject: rpms/perl-Network-IPv4Addr/EL-5 perl-Network-IPv4Addr.spec,1.1,1.2
Message-ID: <20090129193308.3D1C070116@cvs1.fedora.phx.redhat.com>

Author: ausil

Update of /cvs/pkgs/rpms/perl-Network-IPv4Addr/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24973

Modified Files:
	perl-Network-IPv4Addr.spec 
Log Message:
* Thu Jan 29 2009 Dennis Gilmore <dennis at ausil.us> - 0.05-13
- remove OPTIMIZE for cleanliness sake
- fix up source0 url




Index: perl-Network-IPv4Addr.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Network-IPv4Addr/EL-5/perl-Network-IPv4Addr.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Network-IPv4Addr.spec	29 Jan 2009 05:07:39 -0000	1.1
+++ perl-Network-IPv4Addr.spec	29 Jan 2009 19:32:37 -0000	1.2
@@ -1,13 +1,13 @@
 Summary: Network-IPv4Addr Perl module
 Name: perl-Network-IPv4Addr
 Version: 0.05
-Release: 12%{?dist}
+Release: 13%{?dist}
 License: GPL+ or Artistic
 Group: Development/Libraries
 URL: http://search.cpan.org/dist/Network-IPv4Addr/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
-Source0: Network-IPv4Addr-0.05.tar.gz
+Source0: http://search.cpan.org/CPAN/authors/id/F/FR/FRAJULAC/Network-IPv4Addr-%{version}.tar.gz
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 BuildRequires: perl(ExtUtils::MakeMaker)
 
@@ -22,7 +22,7 @@
 %setup -q -n Network-IPv4Addr-%{version}
 
 %build
-%{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS"
+%{__perl} Makefile.PL INSTALLDIRS=vendor
 make %{?_smp_mflags}
 
 %install
@@ -49,6 +49,10 @@
 %{_mandir}/man3/*.3*
 
 %changelog
+* Thu Jan 29 2009 Dennis Gilmore <dennis at ausil.us> - 0.05-13
+- remove OPTIMIZE for cleanliness sake
+- fix up source0 url
+
 * Wed Jan 28 2009 Dennis Gilmore <dennis at ausil.us> - 0.05-12
 - clean up spec file
 



From rathann at fedoraproject.org  Thu Jan 29 19:34:21 2009
From: rathann at fedoraproject.org (Dominik Mierzejewski)
Date: Thu, 29 Jan 2009 19:34:21 +0000 (UTC)
Subject: rpms/crm114/EL-5 .cvsignore, 1.3, 1.4 crm114-rpm.patch, 1.2,
	1.3 crm114.spec, 1.3, 1.4 sources, 1.3, 1.4 crm114-64bit.patch,
	1.1, NONE
Message-ID: <20090129193421.F2AB170116@cvs1.fedora.phx.redhat.com>

Author: rathann

Update of /cvs/pkgs/rpms/crm114/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25275

Modified Files:
	.cvsignore crm114-rpm.patch crm114.spec sources 
Removed Files:
	crm114-64bit.patch 
Log Message:
* Thu Jan 29 2009 Dominik Mierzejewski <rpm at greysector.net> 0-0.4.20080703
- updated to 20080703 "BlameVT"
- dropped obsolete patch
- fixed license tag
- corrected Summary:



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/crm114/EL-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	17 Apr 2007 17:32:13 -0000	1.3
+++ .cvsignore	29 Jan 2009 19:33:51 -0000	1.4
@@ -1 +1 @@
-crm114-20070301-BlameBaltar.no-TRE.src.tar.bz2
+crm114-20080703-BlameVT.src.tar.gz

crm114-rpm.patch:

Index: crm114-rpm.patch
===================================================================
RCS file: /cvs/pkgs/rpms/crm114/EL-5/crm114-rpm.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- crm114-rpm.patch	17 Apr 2007 17:32:13 -0000	1.2
+++ crm114-rpm.patch	29 Jan 2009 19:33:51 -0000	1.3
@@ -1,31 +1,25 @@
---- /dev/null	2007-04-15 01:47:43.733920889 +0200
-+++ crm114-20070301-BlameBaltar.no-TRE.src/quine.crm	2007-04-15 21:45:04.000000000 +0200
-@@ -0,0 +1,4 @@
-+{
-+ window
-+ output /:*:_pgm_text:/
-+}
---- crm114-20070301-BlameBaltar.no-TRE.src/Makefile.r	2007-03-02 16:33:55.000000000 +0100
-+++ crm114-20070301-BlameBaltar.no-TRE.src/Makefile	2007-04-15 22:04:51.000000000 +0200
-@@ -52,7 +52,7 @@
- #  Tell the compiler full optimization, allow debugging, and warn on every
- #  possible error
+diff -up crm114-20080703-BlameVT.src/Makefile.r crm114-20080703-BlameVT.src/Makefile
+--- crm114-20080703-BlameVT.src/Makefile.r	2008-07-01 01:28:43.000000000 +0200
++++ crm114-20080703-BlameVT.src/Makefile	2008-07-09 19:57:41.000000000 +0200
+@@ -72,7 +72,7 @@ SYSTEMTYPE = POSIX
+ #  really picayune stuff.
  #  
--CFLAGS += -O3 -g -Wall 
-+#CFLAGS += -O3 -g -Wall 
- #     turn this one on for no optimization debugging.
- #CFLAGS += -O0 -g -Wall 
- #     turn this one on for really picayune debugging.
-@@ -62,7 +62,7 @@
- #   Comment this out if you want dynamic linking
- #
+ #  Our default is with debugging, full optimization, and lots of warnings:
+-CFLAGS += -g -O3 -Wall
++#CFLAGS += -g -O3 -Wall
+ #     turn this one on for no optimization, but debugging and time profiling:
+ #CFLAGS += -g -O0 -Wall -pg
+ #     turn this one on for really picayune debugging:
+@@ -84,7 +84,7 @@ CFLAGS += -g -O3 -Wall
  #    BSD users - do NOT use -static-libgcc!!!
--LDFLAGS += -static -static-libgcc
-+#LDFLAGS += -static -static-libgcc
+ #LDFLAGS += -static -static-libgcc 
+ #    use this one if you want program profiling.
+-LDFLAGS += -static -static-libgcc -pg
++#LDFLAGS += -static -static-libgcc -pg
  #
  #   Any standard install flags?  We nominally use protection 755
  INSTALLFLAGS += -m 755
-@@ -360,13 +360,13 @@
+@@ -454,13 +454,13 @@ osbf-util: osbf-util.c crm_osbf_maintena
  		crm_util_errorhandlers.o \
  		crm_osbf_maintenance.o -lm -ltre -o osbf-util
  
@@ -41,9 +35,9 @@
  	$(CC)  $(CFLAGS) $(LDFLAGS) -D$(SYSTEMTYPE) -DVERSION='"$(VERSION)"' \
  		crm_str_funcs.o \
  		crm_util_errorhandlers.o \
-@@ -400,30 +400,30 @@
- 
- install_utils:
+@@ -493,13 +493,13 @@ install_utils:
+ 	#    Installing Utilities
+ 	#	
  	$(MAKE) cssmerge cssutil cssdiff osbf-util
 -	install $(INSTALLFLAGS) cssdiff $(BINDIR)/cssdiff$(VER_SUFFIX)
 -	install $(INSTALLFLAGS) cssmerge $(BINDIR)/cssmerge$(VER_SUFFIX)
@@ -60,15 +54,13 @@
  
  
  # use different name so we can keep it around along with default one
- # and same VER_SUFFIX postfix 
- install_engine: crm114
+@@ -508,15 +508,15 @@ install_engine: crm114
+ 	#
+ 	#    Installing engine
+ 	#
 -	install $(INSTALLFLAGS) crm114 $(BINDIR)/crm$(VER_SUFFIX)
 +	install $(INSTALLFLAGS) crm114 $(DESTDIR)$(BINDIR)/crm$(VER_SUFFIX)
  
- install_gnu: crm114_gnu
--	install $(INSTALLFLAGS) crm114_gnu $(BINDIR)/crmg$(VER_SUFFIX)
-+	install $(INSTALLFLAGS) crm114_gnu $(DESTDIR)$(BINDIR)/crmg$(VER_SUFFIX)
- 
  install_binary_only: FORCE
 -	install $(INSTALLFLAGS) crm114 $(BINDIR)/crm$(VER_SUFFIX)
 -	install $(INSTALLFLAGS) cssdiff $(BINDIR)/cssdiff$(VER_SUFFIX)


Index: crm114.spec
===================================================================
RCS file: /cvs/pkgs/rpms/crm114/EL-5/crm114.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- crm114.spec	17 Apr 2007 17:32:13 -0000	1.3
+++ crm114.spec	29 Jan 2009 19:33:51 -0000	1.4
@@ -1,17 +1,16 @@
-%define cvsver 20070301
-%define codename BlameBaltar
-%define rel 3
+%define cvsver 20080703
+%define codename BlameVT
+%define rel 4
 
-Summary: CRM114 Bayesian Spam Detector
+Summary: CRM114 content classifier
 Name: crm114
 Version: 0
 Release: 0.%{rel}.%{cvsver}%{?dist}
 URL: http://crm114.sourceforge.net/
-License: GPL
+License: GPLv2
 Group: Applications/Text
-Source0: http://crm114.sourceforge.net/%{name}-%{cvsver}-%{codename}.no-TRE.src.tar.bz2
+Source0: http://crm114.sourceforge.net/%{name}-%{cvsver}-%{codename}.src.tar.gz
 Patch0: %{name}-rpm.patch
-Patch1: %{name}-64bit.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
 BuildRequires: tre-devel
 
@@ -32,10 +31,9 @@
 Major Emacs mode for editing crm114 scripts.
 
 %prep
-%setup -q -n %{name}-%{cvsver}-%{codename}.no-TRE.src
+%setup -q -n %{name}-%{cvsver}-%{codename}.src
 %patch0 -p1 -b .r
-%patch1 -p1 -b .64bit
-chmod 644 README *.cf *.h *.recipe *.txt
+chmod 644 mailfilter.cf
 
 %build
 make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" LDFLAGS="$RPM_OPT_FLAGS"
@@ -46,7 +44,7 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_bindir},%{_datadir}/{%{name},emacs/site-lisp}}
-make DESTDIR=$RPM_BUILD_ROOT install
+make DESTDIR=$RPM_BUILD_ROOT INSTALLFLAGS="-m 755 -p" install
 install -pm 755 mail{filter,reaver,trainer}.crm $RPM_BUILD_ROOT%{_datadir}/%{name}/
 install -pm 644 maillib.crm $RPM_BUILD_ROOT%{_datadir}/%{name}/
 
@@ -64,6 +62,12 @@
 %{_datadir}/emacs/site-lisp/*.el
 
 %changelog
+* Thu Jan 29 2009 Dominik Mierzejewski <rpm at greysector.net> 0-0.4.20080703
+- updated to 20080703 "BlameVT"
+- dropped obsolete patch
+- fixed license tag
+- corrected Summary:
+
 * Tue Apr 17 2007 Dominik Mierzejewski <rpm at greysector.net> 0-0.3.20070301
 - fix testsuite on 64bit, patch by Jaakko Hyv??tti
 - updated to 20070301 "BlameBaltar"


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/crm114/EL-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	17 Apr 2007 17:32:13 -0000	1.3
+++ sources	29 Jan 2009 19:33:51 -0000	1.4
@@ -1 +1 @@
-f9570a0e726914b9abc71da583213d99  crm114-20070301-BlameBaltar.no-TRE.src.tar.bz2
+51ba5490d9787de9461a28a79da59586  crm114-20080703-BlameVT.src.tar.gz


--- crm114-64bit.patch DELETED ---



From markmc at fedoraproject.org  Thu Jan 29 19:35:00 2009
From: markmc at fedoraproject.org (Mark McLoughlin)
Date: Thu, 29 Jan 2009 19:35:00 +0000 (UTC)
Subject: rpms/kernel/devel linux-2.6-kvmclock-unsync-tsc-workaround.patch,
	NONE, 1.1 TODO, 1.53, 1.54 kernel.spec, 1.1245, 1.1246
Message-ID: <20090129193500.656A770116@cvs1.fedora.phx.redhat.com>

Author: markmc

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25424

Modified Files:
	TODO kernel.spec 
Added Files:
	linux-2.6-kvmclock-unsync-tsc-workaround.patch 
Log Message:
* Thu Jan 29 2009 Mark McLoughlin <markmc at redhat.com>
- Temporarily disable kvmclock, fix for upstream in progress (#475598)


linux-2.6-kvmclock-unsync-tsc-workaround.patch:

--- NEW FILE linux-2.6-kvmclock-unsync-tsc-workaround.patch ---
>From 05d073827d82d7fa29aff7a35279650b8feb6f75 Mon Sep 17 00:00:00 2001
From: Glauber Costa <glommer at redhat.com>
Date: Thu, 29 Jan 2009 12:39:22 -0500
Subject: [PATCH] Disable kvmclock for non constant tsc cpus.

Currently, this code path is posing us big troubles,
and we won't have a decent patch in time. So, temporarily
disable it.

See:

  https://bugzilla.redhat.com/475598

There's a module parameter for the adventurous who want to force
it.

Signed-off-by: Glauber Costa <glommer at redhat.com>
Signed-off-by: Marcelo Tosatti <mtosatti at redhat.com>
---
 arch/x86/kvm/x86.c |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index cc17546..2e22ac9 100644
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -957,6 +957,9 @@ out:
 	return r;
 }
 
+static int force_kvmclock = 0;
+module_param(force_kvmclock, bool, 0644);
+
 int kvm_dev_ioctl_check_extension(long ext)
 {
 	int r;
@@ -967,7 +970,6 @@ int kvm_dev_ioctl_check_extension(long ext)
 	case KVM_CAP_MMU_SHADOW_CACHE_CONTROL:
 	case KVM_CAP_SET_TSS_ADDR:
 	case KVM_CAP_EXT_CPUID:
-	case KVM_CAP_CLOCKSOURCE:
 	case KVM_CAP_PIT:
 	case KVM_CAP_NOP_IO_DELAY:
 	case KVM_CAP_MP_STATE:
@@ -992,6 +994,9 @@ int kvm_dev_ioctl_check_extension(long ext)
 	case KVM_CAP_IOMMU:
 		r = iommu_found();
 		break;
+	case KVM_CAP_CLOCKSOURCE:
+		r = force_kvmclock || boot_cpu_has(X86_FEATURE_CONSTANT_TSC);
+		break;
 	default:
 		r = 0;
 		break;
-- 
1.6.1



Index: TODO
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/TODO,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- TODO	12 Jan 2009 14:19:28 -0000	1.53
+++ TODO	29 Jan 2009 19:34:29 -0000	1.54
@@ -100,3 +100,8 @@
 * linux-2.6-x86-mtrr-kill-bogus-warning.patch
 	Silence bogus warning under vmware ; sent upstream.
 
+* linux-2.6-kvmclock-unsync-tsc-workaround.patch
+	https://bugzilla.redhat.com/475598
+        Correct fix for upstream in progress, workaround will be
+        sent upstream if that isn't sorted out within the next
+        week or so (2009-01-29)


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1245
retrieving revision 1.1246
diff -u -r1.1245 -r1.1246
--- kernel.spec	28 Jan 2009 22:52:48 -0000	1.1245
+++ kernel.spec	29 Jan 2009 19:34:29 -0000	1.1246
@@ -665,6 +665,9 @@
 # Fix DEBUG_SHIRQ problem in tulip driver.  (454575)
 Patch2030: linux-2.6-net-tulip-interrupt.patch
 
+# kvmclock is broken with unsync TSC (#475598)
+Patch2040: linux-2.6-kvmclock-unsync-tsc-workaround.patch
+
 # linux1394 git patches
 Patch2200: linux-2.6-firewire-git-update.patch
 Patch2201: linux-2.6-firewire-git-pending.patch
@@ -1174,6 +1177,8 @@
 
 ApplyPatch linux-2.6-net-tulip-interrupt.patch
 
+ApplyPatch linux-2.6-kvmclock-unsync-tsc-workaround.patch
+
 # Nouveau DRM + drm fixes
 #ApplyPatch drm-next.patch
 ApplyPatch drm-modesetting-radeon.patch
@@ -1778,6 +1783,9 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Thu Jan 29 2009 Mark McLoughlin <markmc at redhat.com>
+- Temporarily disable kvmclock, fix for upstream in progress (#475598)
+
 * Wed Jan 28 2009 Jarod Wilson <jarod at redhat.com>
 - make 2nd-gen ipod work via firewire again, but w/o neutering throughput
 - add fix for firewire-sbp2 dma mapping leak in failure paths



From kkofler at fedoraproject.org  Thu Jan 29 19:41:35 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Thu, 29 Jan 2009 19:41:35 +0000 (UTC)
Subject: rpms/kdebase-workspace/F-9
	kdebase-workspace-4.2.0-bluetooth-revert.patch, NONE,
	1.1 solid-bluetoothTrunkTo42.diff, NONE,
	1.1 kdebase-workspace.spec, 1.126,
	1.127 kdebase-workspace-4.1.2-ldap.patch, 1.1, NONE
Message-ID: <20090129194135.4D05370116@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdebase-workspace/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26432/F-9

Modified Files:
	kdebase-workspace.spec 
Added Files:
	kdebase-workspace-4.2.0-bluetooth-revert.patch 
	solid-bluetoothTrunkTo42.diff 
Removed Files:
	kdebase-workspace-4.1.2-ldap.patch 
Log Message:
* Thu Jan 29 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.2.0-4.1
- conditionalize bluetooth backport on F10+
- F9: revert solid-bluetooth to the version from KDE 4.1.4

* Thu Jan 29 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.0-4
- omit ldap hack (#457638), kde42's reduced linkage to the rescue

* Thu Jan 29 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.0-3
- Requires: PyKDE4 (for plasmascript bits)
- solid-bluetoothTrunkTo42.diff (bug #481801), and 
  +Provides: solid-bluetooth(-devel) = 4.3

kdebase-workspace-4.2.0-bluetooth-revert.patch:

--- NEW FILE kdebase-workspace-4.2.0-bluetooth-revert.patch ---
diff -ur kdebase-workspace-4.2.0/libs/solid/control/backends/CMakeLists.txt kdebase-workspace-4.2.0-bluetooth-revert/libs/solid/control/backends/CMakeLists.txt
--- kdebase-workspace-4.2.0/libs/solid/control/backends/CMakeLists.txt	2008-10-17 13:00:21.000000000 +0200
+++ kdebase-workspace-4.2.0-bluetooth-revert/libs/solid/control/backends/CMakeLists.txt	2008-01-05 00:55:29.000000000 +0100
@@ -1,3 +1,3 @@
 add_subdirectory( fakenet )
-#add_subdirectory( fakebluetooth )
+add_subdirectory( fakebluetooth )
 
diff -ur kdebase-workspace-4.2.0/libs/solid/control/backends/fakebluetooth/fakebluetoothinterface.h kdebase-workspace-4.2.0-bluetooth-revert/libs/solid/control/backends/fakebluetooth/fakebluetoothinterface.h
--- kdebase-workspace-4.2.0/libs/solid/control/backends/fakebluetooth/fakebluetoothinterface.h	2008-07-03 07:05:34.000000000 +0200
+++ kdebase-workspace-4.2.0-bluetooth-revert/libs/solid/control/backends/fakebluetooth/fakebluetoothinterface.h	2008-08-28 10:06:55.000000000 +0200
@@ -134,6 +134,7 @@
     }
     bool isTrusted(const QString& mac)
     {
+	Q_UNUSED(mac)
 	return true;
     }
 
diff -ur kdebase-workspace-4.2.0/libs/solid/control/bluetoothinputdevice.cpp kdebase-workspace-4.2.0-bluetooth-revert/libs/solid/control/bluetoothinputdevice.cpp
--- kdebase-workspace-4.2.0/libs/solid/control/bluetoothinputdevice.cpp	2008-10-30 15:13:17.000000000 +0100
+++ kdebase-workspace-4.2.0-bluetooth-revert/libs/solid/control/bluetoothinputdevice.cpp	2008-05-21 10:33:09.000000000 +0200
@@ -19,6 +19,7 @@
 
 */
 
+#include <QMap>
 #include <QStringList>
 
 #include "ifaces/bluetoothinputdevice.h"
@@ -71,19 +72,39 @@
     return_SOLID_CALL(Ifaces::BluetoothInputDevice *, d->backendObject(), QString(), ubi());
 }
 
-QMap<QString,QVariant> Solid::Control::BluetoothInputDevice::getProperties() const
+bool Solid::Control::BluetoothInputDevice::isConnected() const
 {
-    return_SOLID_CALL(Ifaces::BluetoothInputDevice *, d->backendObject(), (QMap< QString,QVariant >()), getProperties());
+    return_SOLID_CALL(Ifaces::BluetoothInputDevice *, d->backendObject(), false, isConnected());
 }
 
-void Solid::Control::BluetoothInputDevice::connect()
+QString Solid::Control::BluetoothInputDevice::name() const
 {
-    SOLID_CALL(Ifaces::BluetoothInputDevice *, d->backendObject(), connect());
+    return_SOLID_CALL(Ifaces::BluetoothInputDevice *, d->backendObject(), QString(), name());
 }
 
-void Solid::Control::BluetoothInputDevice::disconnect()
+QString Solid::Control::BluetoothInputDevice::address() const
 {
-    SOLID_CALL(Ifaces::BluetoothInputDevice *, d->backendObject(), disconnect());
+    return_SOLID_CALL(Ifaces::BluetoothInputDevice *, d->backendObject(), QString(), address());
+}
+
+QString Solid::Control::BluetoothInputDevice::productID() const
+{
+    return_SOLID_CALL(Ifaces::BluetoothInputDevice *, d->backendObject(), QString(), productID());
+}
+
+QString Solid::Control::BluetoothInputDevice::vendorID() const
+{
+    return_SOLID_CALL(Ifaces::BluetoothInputDevice *, d->backendObject(), QString(), vendorID());
+}
+
+void Solid::Control::BluetoothInputDevice::slotConnect()
+{
+    SOLID_CALL(Ifaces::BluetoothInputDevice *, d->backendObject(), slotConnect());
+}
+
+void Solid::Control::BluetoothInputDevice::slotDisconnect()
+{
+    SOLID_CALL(Ifaces::BluetoothInputDevice *, d->backendObject(), slotDisconnect());
 }
 
 void Solid::Control::BluetoothInputDevicePrivate::setBackendObject(QObject *object)
@@ -91,8 +112,10 @@
     FrontendObjectPrivate::setBackendObject(object);
 
     if (object) {
-        QObject::connect(object, SIGNAL(propertyChanged(QString,QVariant)),
-                         parent(), SIGNAL(propertyChanged(QString,QVariant)));
+        QObject::connect(object, SIGNAL(connected()),
+                         parent(), SIGNAL(connected()));
+        QObject::connect(object, SIGNAL(disconnected()),
+                         parent(), SIGNAL(disconnected()));
     }
 }
 
diff -ur kdebase-workspace-4.2.0/libs/solid/control/bluetoothinputdevice.h kdebase-workspace-4.2.0-bluetooth-revert/libs/solid/control/bluetoothinputdevice.h
--- kdebase-workspace-4.2.0/libs/solid/control/bluetoothinputdevice.h	2008-10-30 15:13:17.000000000 +0100
+++ kdebase-workspace-4.2.0-bluetooth-revert/libs/solid/control/bluetoothinputdevice.h	2008-06-10 13:41:04.000000000 +0200
@@ -1,7 +1,6 @@
 /*  This file is part of the KDE project
     Copyright (C) 2007 Will Stephenson <wstephenson at kde.org>
     Copyright (C) 2007 Daniel Gollub <dgollub at suse.de>
-    Copyright (C) 2008 Tom Patzig <tpatzig at suse.de>
 
 
     This library is free software; you can redistribute it and/or
@@ -24,8 +23,6 @@
 #define SOLID_CONTROL_BLUETOOTHINPUTDEVICE_H
 
 #include <QtCore/QObject>
-#include <QtCore/QMap>
-#include <QtCore/QVariant>
 
 #include "solid_control_export.h"
 
@@ -77,36 +74,65 @@
      * @returns the Universal Network Identifier of the current bluetooth remote device
      */
     QString ubi() const;
+
+    /**
+     * Retrieves connection status of bluetooth input device.
+     *
+     * @returns true if bluetooth input device is connected
+     */
+    bool isConnected() const;
+
+    /**
+     * Retrieves MAC address of bluetooth input device.
+     *
+     * @returns MAC address of bluetooth input device
+     */
+    QString address() const;
+
+    /**
+     * Retrievies Name of bluetooth input device.
+     *
+     * @returns Name of bluetooth input device
+     */
+    QString name() const;
+
     /**
-     * Retrieve all properties from the input device.
+     * Retrieves Product ID of bluetooth input device.
      *
-     * @returns a hash of named properties
+     * @returns Product ID of bluetooth input device
      */
-    QMap<QString,QVariant> getProperties() const;
+    QString productID() const;
 
+    /**
+     * Retrieves Vendor ID of bluetooth input device.
+     *
+     * @returns Vendor ID of bluetooth input device
+     */
+    QString vendorID() const;
 
 
 public Q_SLOTS:
     /**
      * Connect bluetooth input device.
      */
-    void connect();
+    void slotConnect();
 
     /**
      * Disconnect bluetooth input device.
      */
-    void disconnect();
+    void slotDisconnect();
 
 
 Q_SIGNALS:
-     /**
-     * A Property for the input device has changed.
-     *
-     * @param name the name of the changed property
-     * @param value the new value
+    /**
+     * This signal is emitted when the bluetooth input device is connected.
      */
-    void propertyChanged(const QString &name, const QVariant &value);
+    void connected();
 
+    /**
+     * This signal is emitted when the bluetooth input device is not available anymore.
+     */
+    void disconnected();
 
 private:
     Q_PRIVATE_SLOT(d, void _k_destroyed(QObject *))
diff -ur kdebase-workspace-4.2.0/libs/solid/control/bluetoothinterface.cpp kdebase-workspace-4.2.0-bluetooth-revert/libs/solid/control/bluetoothinterface.cpp
--- kdebase-workspace-4.2.0/libs/solid/control/bluetoothinterface.cpp	2008-12-04 09:34:54.000000000 +0100
+++ kdebase-workspace-4.2.0-bluetooth-revert/libs/solid/control/bluetoothinterface.cpp	2008-07-03 07:05:34.000000000 +0200
@@ -1,7 +1,6 @@
 /*  This file is part of the KDE project
     Copyright (C) 2006 Will Stephenson <wstephenson at kde.org>
     Copyright (C) 2007 Daniel Gollub <dgollub at suse.de>
-    Copyright (C) 2008 Tom Patzig <tpatzig at suse.de>
 
 
     This library is free software; you can redistribute it and/or
@@ -23,7 +22,6 @@
 #include <QMap>
[...3466 lines suppressed...]
--- kdebase-workspace-4.2.0/solid/bluez/bluez-bluetoothremotedevice.h	2008-10-17 13:00:20.000000000 +0200
+++ kdebase-workspace-4.2.0-bluetooth-revert/solid/bluez/bluez-bluetoothremotedevice.h	2008-01-05 00:55:19.000000000 +0100
@@ -1,7 +1,6 @@
 /*  This file is part of the KDE project
     Copyright (C) 2007 Will Stephenson <wstephenson at kde.org>
     Copyright (C) 2007 Daniel Gollub <dgollub at suse.de>
-    Copyright (C) 2008 Tom Patzig <tpatzig at suse.de>
 
 
     This library is free software; you can redistribute it and/or
@@ -36,35 +35,63 @@
 public:
     BluezBluetoothRemoteDevice(const QString &objectPath);
     virtual ~BluezBluetoothRemoteDevice();
-
     QString ubi() const;
-    QMap<QString,QVariant> getProperties() const;
-    void discoverServices(const QString &pattern) const;
-    QStringList listNodes() const;
+    QString address() const;
+    bool isConnected() const;
+    QString version() const;
+    QString revision() const;
+    QString manufacturer() const;
+    QString company() const;
+    QString majorClass() const;
+    QString minorClass() const;
+    QStringList serviceClasses() const;
+    QString name() const;
+    QString alias() const;
+    QString lastSeen() const;
+    QString lastUsed() const;
+    bool hasBonding() const;
+    int pinCodeLength() const;
+    int encryptionKeySize() const;
 
+    KJob *createBonding();
 private Q_SLOTS:
-
-    void slotPropertyChanged(const QString &, const QDBusVariant &);
-    void slotDisconnectRequested();
-    void slotNodeCreated(const QDBusObjectPath &); 
-    void slotNodeRemoved(const QDBusObjectPath &);
-
-    void slotServiceDiscover(const QMap<uint,QString> &handles);
-    void dbusErrorServiceDiscover(const QDBusError &error);
+    void slotClassChanged(const QString &address, uint newClass);
+    void slotNameUpdated(const QString &address,const QString &newName);
+    void slotNameResolvingFailed(const QString &address);
+    void slotAliasChanged(const QString &address,const QString &newAlias);
+    void slotAliasCleared(const QString &address);
+    void slotConnected(const QString &address);
+    void slotRequestDisconnection(const QString &address);
+    void slotDisconnected(const QString &address);
+    void slotBonded(const QString &address);
+    void slotUnbonded(const QString &address);
+    
+    void slotServiceHandles(const QList<uint> &handles);
+    void dbusErrorHandles(const QDBusError &error);
+    void slotServiceRecordAsXml(const QString &record);
+    void dbusErrorRecordAsXml(const QDBusError &error);
 
 public Q_SLOTS:
-
-    void setProperty(const QString &, const QVariant &);
-    void cancelDiscovery();
+    void setAlias(const QString &alias);
+    void clearAlias();
     void disconnect();
-
+    void cancelBondingProcess();
+    void removeBonding();
+    void serviceHandles(const QString &filter ="") const;
+    void serviceRecordAsXml(uint handle) const;
 Q_SIGNALS:
-
-    void serviceDiscoverAvailable(const QString &state, const QMap<uint,QString> &handles);
-    void propertyChanged(const QString &, const QVariant &);
-    void disconnectRequested();
-    void nodeCreated(const QString &);
-    void nodeRemoved(const QString &);
+    void classChanged(uint deviceClass);
+    void nameChanged(const QString &name);
+    void nameResolvingFailed();
+    void aliasChanged(const QString &alias);
+    void aliasCleared();
+    void connected();
+    void requestDisconnection();
+    void disconnected();
+    void bondingCreated();
+    void bondingRemoved();
+    void serviceRecordXmlAvailable(const QString &ubi, const QString &record);
+    void serviceHandlesAvailable(const QString &ubi, const QList<uint> &handles);
 
 private:
     QString m_objectPath;
diff -ur kdebase-workspace-4.2.0/solid/bluez/solid_bluez.desktop kdebase-workspace-4.2.0-bluetooth-revert/solid/bluez/solid_bluez.desktop
--- kdebase-workspace-4.2.0/solid/bluez/solid_bluez.desktop	2009-01-17 11:59:34.000000000 +0100
+++ kdebase-workspace-4.2.0-bluetooth-revert/solid/bluez/solid_bluez.desktop	2008-08-28 10:06:58.000000000 +0200
@@ -5,22 +5,20 @@
 InitialPreference=100
 Icon=preferences-system-bluetooth
 Name=BlueZ
+Name[ar]=????????????
 Name[hi]=??????????????????
-Name[kn]=?????????????????????
-Name[mai]=???????????????
 Name[ne]=????????????Z
 Name[sr]=????????
 Name[x-test]=xxBlueZxx
 Comment=Bluetooth management using the BlueZ stack
-Comment[ar]=?????????? ???????????? ???????????????? ???????? BlueZ
+Comment[ar]=?????????? ???????????? ???????????????? ???????? ????????????????
 Comment[be]=?????????????????? Bluetooth ?????? ???????????????? ?????????? BlueZ
-Comment[be at latin]=Kirava??nie pry??adami ???Bluetooth??? praz systemu ???BlueZ???.
 Comment[ca]=Gesti?? del Bluetooth usant la pila BlueZ
 Comment[da]=Bluetooth-h??ndtering med brug af BlueZ-stakken
 Comment[de]=Bluetooth-Verwaltung mit Hilfe von Bluez
 Comment[el]=???????????????????? bluetooth ???? ?????????? ?????? ?????????????? BlueZ
 Comment[eo]=Bluetooth-administrado uzante la BlueZ-stakon
-Comment[es]=Gesti??n de Bluetooth mediante la pila BlueZ
+Comment[es]=Administrar Bluetooth mediante la pila BlueZ
 Comment[et]=Bluetoothi haldamine BlueZi pinuga
 Comment[eu]=Bluetooth kudeaketa BlueZ pila erabiliz
 Comment[fa]=???????????? ???????????? ???? ?????????????? ???? ???????? BlueZ
@@ -31,14 +29,12 @@
 Comment[gl]=Xesti??n de Bluetooth usando a pila BlueZ
 Comment[gu]=BlueZ ????????????????????? ??????????????? ??????????????? ??????????????????????????? ??????????????????
 Comment[he]=?????????? Bluetooth ?????????????? ???????????? BlueZ
-Comment[hi]=?????????????????? ??????????????? ?????? ?????????????????? ?????? ????????????????????? ?????????????????????
 Comment[hu]=Bluetooth-kezel?? (a BlueZ keretrendszerre ??p??l)
 Comment[is]=Ums??sla me?? Bl??t??nn um BlueZ kerfi??
 Comment[it]=Gestione Bluetooth che usa lo stack BlueZ
 Comment[ja]=BlueZ ????????????????????? Bluetooth ??????
 Comment[kk]=BlueZ ?????????? ?????????????????? Bluetooth-???? ??????????????
 Comment[km]=?????????????????????????????????????????????????????????????????????????????????????????????????????? BlueZ
-Comment[kn]=????????????????????? ??????????????? (??????????????????) ???????????? ???????????????????????? ?????????????????????????????????
 Comment[ko]=BlueZ ????????? ???????????? ???????????? ??????
 Comment[ku]=Ger??nendetiya Bluetooth?? BlueZ stack bi kar t??ne
 Comment[lv]=Bluetooth p??rvald??ba lietojot BlueZ
@@ -49,7 +45,6 @@
 Comment[ne]=????????????Z ????????? ?????????????????? ?????????????????? ????????????????????? ??????????????????????????????
 Comment[nl]=Bluetooth-beheer via de BlueZ Stack
 Comment[nn]=Bluetooth-handtering med BlueZ
-Comment[or]=BlueZ ????????? ????????????????????? ????????? ????????????????????? ????????????????????????
 Comment[pa]=BlueZ ???????????? ????????? ???????????????????????? ???????????????????????????
 Comment[pl]=Zarz??dzanie interfejsami Bluetooth za pomoc?? stosu BlueZ
 Comment[pt]=Gest??o do Bluetooth com a plataforma BlueZ
@@ -57,12 +52,10 @@
 Comment[ro]=Gestiune bluetooth folosind stiva BlueZ
 Comment[ru]=???????????????????? ?????????????????? Bluetooth ???? ???????????? ?????????? BlueZ
 Comment[se]=Gie??ahala Bluetooth BlueZain
-Comment[sk]=Spr??va bluetooth pomocou aplik??cie BlueZ
 Comment[sl]=Upravljanje z Bluetooth z uporabo sklada BlueZ
 Comment[sr]=?????????????????? ???????????????? ?????????????????????? ?????????????
 Comment[sr at latin]=Upravljanje Bluetoothom mehanizmima BlueZ???a
 Comment[sv]=Bl??tandshantering som anv??nder BlueZ
-Comment[te]=BlueZ ?????????????????? ?????????????????????????????? ???????????????????????? ?????????????????????
 Comment[th]=????????????????????????????????????????????????????????????????????????????????????????????????????????? BlueZ
 Comment[tr]=BlueZ kullanan Bluetooth y??netimi
 Comment[uk]=?????????????????? Bluetooth ?????????? ???????? BlueZ
diff -ur kdebase-workspace-4.2.0/solid/bluez/tests/blueztest.cpp kdebase-workspace-4.2.0-bluetooth-revert/solid/bluez/tests/blueztest.cpp
--- kdebase-workspace-4.2.0/solid/bluez/tests/blueztest.cpp	2008-10-17 13:00:20.000000000 +0200
+++ kdebase-workspace-4.2.0-bluetooth-revert/solid/bluez/tests/blueztest.cpp	2008-01-05 00:55:19.000000000 +0100
@@ -4,7 +4,7 @@
 
 #include "bluez-bluetoothmanager.h"
 #include "bluez-bluetoothinterface.h"
-//#include "bluez-bluetoothremotedevice.h"
+#include "bluez-bluetoothremotedevice.h"
 
 int main(int argc, char **argv)
 {
@@ -14,23 +14,14 @@
 
     kDebug() << "Interfaces: " << mgr.bluetoothInterfaces();
     kDebug() << "Default Interface: " << mgr.defaultInterface();
-    kDebug() << "Finding Interface hci0: " << mgr.findInterface("hci0");
 
-
-//  kDebug() << "Bluetooth Input Devices: " << mgr.bluetoothInputDevices();
+    kDebug() << "Bluetooth Input Devices: " << mgr.bluetoothInputDevices();
 
     BluezBluetoothInterface iface(mgr.defaultInterface());
 
-    iface.setProperty("Name","testNAME");
-
-    QMap<QString, QVariant> props =  iface.getProperties();
-
-    foreach(QString key, props.keys()) {
-        kDebug() << "Interface Property: " << key << " : " << props[key];
-    }
-
+//    iface.discoverDevices();
 
-    iface.startDiscovery();
+    iface.startPeriodicDiscovery();
 
 #if 0
     BluezBluetoothRemoteDevice remote("/org/bluez/hci0/00:16:BC:15:A3:FF");

solid-bluetoothTrunkTo42.diff:

--- NEW FILE solid-bluetoothTrunkTo42.diff ---
Index: solid_bluez.desktop
===================================================================
--- solid_bluez.desktop	(.../branches/KDE/4.2/kdebase/workspace/solid/bluez)	(revision 912529)
+++ solid/bluez/solid_bluez.desktop	(.../trunk/KDE/kdebase/workspace/solid/bluez)	(revision 912529)
@@ -7,7 +7,6 @@
 Name=BlueZ
 Name[hi]=??????????????????
 Name[kn]=?????????????????????
-Name[mai]=???????????????
 Name[ne]=????????????Z
 Name[sr]=????????
 Name[x-test]=xxBlueZxx
Index: bluez-bluetoothinterface.cpp
===================================================================
--- bluez-bluetoothinterface.cpp	(.../branches/KDE/4.2/kdebase/workspace/solid/bluez)	(revision 912529)
+++ solid/bluez/bluez-bluetoothinterface.cpp	(.../trunk/KDE/kdebase/workspace/solid/bluez)	(revision 912529)
@@ -25,6 +25,7 @@
 #include <solid/control/bluetoothinterface.h>
 
 #include "bluez-bluetoothremotedevice.h"
+#include "bluez-bluetoothinputdevice.h"
 #include <KDebug>
 
 
@@ -43,6 +44,7 @@
     QString objectPath;
 
     QMap<QString, BluezBluetoothRemoteDevice *> devices;
+    QMap<QString, BluezBluetoothInputDevice *> inputDevices;
 };
 
 
@@ -56,23 +58,6 @@
                                    objectPath, \
                                    "org.bluez.Adapter", \
                                    signal, this, SLOT(slot));
-/*  
-    connectInterfaceToThis("ModeChanged", slotModeChanged(const QString &));
-    connectInterfaceToThis("DiscoverableTimeoutChanged", slotDiscoverableTimeoutChanged(int));
-    connectInterfaceToThis("MinorClassChanged", slotMinorClassChanged(const QString &));
-    connectInterfaceToThis("NameChanged", slotNameChanged(const QString &));
-    connectInterfaceToThis("DiscoveryStarted", slotDiscoveryStarted());
-    connectInterfaceToThis("DiscoveryCompleted", slotDiscoveryCompleted());
-    connectInterfaceToThis("RemoteDeviceDisappeared", slotRemoteDeviceDisappeared(const QString &));
-    connectInterfaceToThis("RemoteDeviceFound", slotRemoteDeviceFound(const QString &, uint, short));
-    connectInterfaceToThis("RemoteNameUpdated", slotRemoteNameUpdated(const QString &, const QString &));
-    connectInterfaceToThis("RemoteDeviceConnected", slotRemoteDeviceConnected(const QString &));
-    connectInterfaceToThis("RemoteDeviceDisconnected", slotRemoteDeviceDisconnected(const QString &));
-    connectInterfaceToThis("TrustAdded", slotTrustAdded(const QString &));
-    connectInterfaceToThis("TrustRemoved", slotTrustRemoved(const QString &));
-    connectInterfaceToThis("BondingCreated", slotBondingCreated(const QString &));
-    connectInterfaceToThis("BondingRemoved", slotBondingRemoved(const QString &));
-*/
 
     connectInterfaceToThis("PropertyChanged", slotPropertyChanged(const QString &, const QVariant &));
     connectInterfaceToThis("DeviceCreated", slotDeviceCreated(const QDBusObjectPath &));
@@ -98,21 +83,14 @@
     d->iface.call("CancelDeviceCreation",addr);
 }
 
-QString BluezBluetoothInterface::createDevice(const QString &addr) const
+void BluezBluetoothInterface::createDevice(const QString &addr) const
 {
-    QDBusObjectPath path = objectReply("CreateDevice",addr);
-    return path.path();
+    d->iface.call("CreateDevice",addr);
 }
 
-QString BluezBluetoothInterface::createPairedDevice(const QString &addr, const QString &agentUBI, const QString &capab) const
+void BluezBluetoothInterface::createPairedDevice(const QString &addr, const QString &agentUBI, const QString &capab) const
 {
-    QDBusReply< QDBusObjectPath > reply;
-    reply = d->iface.call("CreatePairedDevice",addr,agentUBI,capab);
-
-    if (!reply.isValid()) {
-        return QString();
-    }
-    return reply.value().path();
+    d->iface.call("CreatePairedDevice",addr,qVariantFromValue(QDBusObjectPath(agentUBI)),capab);
 }
 
 QString BluezBluetoothInterface::findDevice(const QString &addr) const
@@ -147,7 +125,7 @@
 
 void BluezBluetoothInterface::registerAgent(const QString &agentUBI, const QString &capab)
 {
-    d->iface.call("RegisterAgent",agentUBI,capab);
+    d->iface.call("RegisterAgent",qVariantFromValue(QDBusObjectPath(agentUBI)),capab);
 }
 
 void BluezBluetoothInterface::releaseSession()
@@ -157,7 +135,7 @@
 
 void BluezBluetoothInterface::removeDevice(const QString &deviceUBI )
 {
-    d->iface.call("RemoveDevice",deviceUBI);
+    d->iface.call("RemoveDevice",qVariantFromValue(QDBusObjectPath(deviceUBI)));
 }
 
 void BluezBluetoothInterface::requestSession()
@@ -183,305 +161,20 @@
 
 void BluezBluetoothInterface::unregisterAgent(const QString &agentUBI)
 {
-    d->iface.call("UnregisterAgent",agentUBI);
+    d->iface.call("UnregisterAgent",qVariantFromValue(QDBusObjectPath(agentUBI)));
 }
 
 
 
-/*
-
-QString BluezBluetoothInterface::address() const
+void BluezBluetoothInterface::slotDeviceCreated(const QDBusObjectPath &path)
 {
-    return stringReply("GetAddress");
-}
+    kDebug() << "device created";
 
-QString BluezBluetoothInterface::version() const
-{
-    return stringReply("GetVersion");
-}
-
-QString BluezBluetoothInterface::revision() const
-{
-    return stringReply("GetRevision");
-}
-
-QString BluezBluetoothInterface::manufacturer() const
-{
-    return stringReply("GetManufacturer");
-}
-
-QString BluezBluetoothInterface::company() const
-{
-    return stringReply("GetCompany");
-}
-
-Solid::Control::BluetoothInterface::Mode BluezBluetoothInterface::mode() const
-{
-    QString theMode = stringReply("GetMode");
-    Solid::Control::BluetoothInterface::Mode modeEnum;
-    if (theMode == "connectable")
-    {
-        modeEnum = Solid::Control::BluetoothInterface::Connectable;
+    if (!d->devices.contains(path.path())) {
+        BluezBluetoothRemoteDevice* bluetoothRemoteDev = new BluezBluetoothRemoteDevice(path.path());
+        d->devices.insert(path.path(), bluetoothRemoteDev);
     }
-    else if (theMode == "discoverable")
-    {
-        modeEnum = Solid::Control::BluetoothInterface::Discoverable;
-    } else {
-        Q_ASSERT(theMode == "off");
-        modeEnum = Solid::Control::BluetoothInterface::Off;
-    }
-    return modeEnum;
-}
 
-int BluezBluetoothInterface::discoverableTimeout() const
-{
-    QDBusReply< uint > timeout = d->iface.call("GetDiscoverableTimeout");
-    if (timeout.isValid()) {
-        return timeout.value();
-    }
-
-    return -1;
-}
-
-bool BluezBluetoothInterface::isDiscoverable() const
-{
-    return boolReply("IsDiscoverable");
-}
-
-QStringList BluezBluetoothInterface::listConnections() const
-{
-    QStringList list = listReply("ListConnections");
-    for (int i = 0; i < list.size(); i++) {
-        list[i] = ubi() + '/' + list[i];
-    }
-    return list;
-}
-
-QString BluezBluetoothInterface::majorClass() const
-{
-    return stringReply("GetMajorClass");
-}
-
-QStringList BluezBluetoothInterface::listAvailableMinorClasses() const
-{
-    return listReply("ListAvailableMinorClasses");
-}
-
-QString BluezBluetoothInterface::minorClass() const
-{
-    return stringReply("GetMinorClass");
-}
-
-QStringList BluezBluetoothInterface::serviceClasses() const
-{
-    return listReply("GetServiceClasses");
-}
-
-QString BluezBluetoothInterface::name() const
-{
-    return stringReply("GetName");
-}
-
-QString BluezBluetoothInterface::getRemoteName(const QString &mac)
-{
-    return stringReply("GetRemoteName",mac);
-}
-
-bool BluezBluetoothInterface::isTrusted(const QString &mac)
-{
-   return boolReply("IsTrusted",mac);
-}
-
-QStringList BluezBluetoothInterface::listBondings() const
-{
-    return listReply("ListBondings");
-}
-
-bool BluezBluetoothInterface::isPeriodicDiscoveryActive() const
-{
-    return boolReply("IsPeriodicDiscovery");
-}
-
-bool BluezBluetoothInterface::isPeriodicDiscoveryNameResolvingActive() const
-{
-    return boolReply("IsPeriodicDiscoveryNameResolving");
-}
-
-QStringList BluezBluetoothInterface::listRemoteDevices() const
-{
-    QStringList list = listReply("ListRemoteDevices");
-    for (int i = 0; i < list.size(); i++) {
-        list[i] = ubi() + '/' + list[i];
-    }
-    return list;
-}
-
-QStringList BluezBluetoothInterface::listRecentRemoteDevices(const QDateTime &) const
-{
-    return listReply("ListRecentRemoteDevices");
-}
-
-void BluezBluetoothInterface::setMode(const Solid::Control::BluetoothInterface::Mode mode)
-{
-    QString modeString;
-    switch(mode)
-    {
-    case Solid::Control::BluetoothInterface::Off:
-        modeString = "off";
-        break;
-    case Solid::Control::BluetoothInterface::Discoverable:
-        modeString = "discoverable";
-        break;
-    case Solid::Control::BluetoothInterface::Connectable:
-        modeString = "connectable";
-        break;
-    }
-    d->iface.call("SetMode", modeString);
-}
-
-void BluezBluetoothInterface::setDiscoverableTimeout(int timeout)
-{
-    d->iface.call("SetDiscoverableTimeout", (uint)timeout);
-}
-
-void BluezBluetoothInterface::setMinorClass(const QString &minorClass)
-{
-    d->iface.call("SetMinorClass", minorClass);
-}
-
-void BluezBluetoothInterface::setName(const QString &name)
-{
-    d->iface.call("SetName", name);
-}
-
-void BluezBluetoothInterface::discoverDevices()
-{
-    d->iface.call("DiscoverDevices");
-}
-
-void BluezBluetoothInterface::discoverDevicesWithoutNameResolving()
-{
-    d->iface.call("DiscoverDevicesWithoutNameResolving");
-}
-
-void BluezBluetoothInterface::cancelDiscovery()
-{
-    d->iface.call("CancelDiscovery");
-}
-
-void BluezBluetoothInterface::startPeriodicDiscovery()
-{
-    d->iface.call("StartPeriodicDiscovery");
-}
-
-void BluezBluetoothInterface::stopPeriodicDiscovery()
-{
-    d->iface.call("StopPeriodicDiscovery");
-}
-
-void BluezBluetoothInterface::setPeriodicDiscoveryNameResolving(bool nameResolving)
-{
-    d->iface.call("SetPeriodicDiscoveryNameResolving", nameResolving);
-}
-
-void BluezBluetoothInterface::setTrusted(const QString& mac)
-{
-    d->iface.call("SetTrusted", mac);
-}
-
-void BluezBluetoothInterface::removeTrust(const QString& mac)
-{
-    d->iface.call("RemoveTrust", mac);
-}
-
-*/
-
-
-
-/*
-
-void BluezBluetoothInterface::slotModeChanged(const Solid::Control::BluetoothInterface::Mode mode)
-{
-    emit modeChanged(mode);
-}
-
-void BluezBluetoothInterface::slotDiscoverableTimeoutChanged(int timeout)
-{
-    emit discoverableTimeoutChanged(timeout);
-}
-
-void BluezBluetoothInterface::slotMinorClassChanged(const QString &minorClass)
-{
-    emit minorClassChanged(minorClass);
-}
-
-void BluezBluetoothInterface::slotNameChanged(const QString &name)
-{
-    emit nameChanged(name);
-}
-
-void BluezBluetoothInterface::slotDiscoveryStarted()
-{
-    emit discoveryStarted();
-}
-
-void BluezBluetoothInterface::slotDiscoveryCompleted()
-{
-    emit discoveryCompleted();
-}
-
-void BluezBluetoothInterface::slotRemoteDeviceFound(const QString &address, uint deviceClass, short rssi)
-{
-    QString remoteubi = QString("%1/%2").arg(ubi()).arg(address);
-    emit remoteDeviceFound(remoteubi, deviceClass, rssi);
-}
-
-void BluezBluetoothInterface::slotRemoteDeviceDisappeared(const QString &address)
-{
-    QString remoteubi = QString("%1/%2").arg(ubi()).arg(address);
-    emit remoteDeviceDisappeared(remoteubi);
-}
-
-void BluezBluetoothInterface::slotRemoteNameUpdated(const QString &address, const QString& name)
-{
-   emit remoteNameUpdated(address,name);
-}
-
-void BluezBluetoothInterface::slotRemoteDeviceConnected(const QString &address)
-{
-   emit remoteDeviceConnected(address);
-}
-
-void BluezBluetoothInterface::slotRemoteDeviceDisconnected(const QString &address)
-{
-   emit remoteDeviceDisconnected(address);
-}
-
-void BluezBluetoothInterface::slotTrustAdded(const QString &address)
-{
-   emit trustAdded(address);
-}
-
-void BluezBluetoothInterface::slotTrustRemoved(const QString &address)
-{
-   emit trustRemoved(address);
-}
-
-void BluezBluetoothInterface::slotBondingCreated(const QString &address)
-{
-   emit bondingCreated(address);
-}
-
-void BluezBluetoothInterface::slotBondingRemoved(const QString &address)
-{
-   emit bondingRemoved(address);
-}
-
-*/
-
-void BluezBluetoothInterface::slotDeviceCreated(const QDBusObjectPath &path)
-{
-    kDebug() << "device created";
     emit deviceCreated(path.path());
 }
 
@@ -523,7 +216,20 @@
     return bluetoothInterface;
 }
 
+QObject *BluezBluetoothInterface::createBluetoothInputDevice(const QString &ubi)
+{
+    BluezBluetoothInputDevice *bluetoothInputDev;
+    if (d->inputDevices.contains(ubi)) {
+        bluetoothInputDev = d->inputDevices[ubi];
+    } else {
+        bluetoothInputDev = new BluezBluetoothInputDevice(ubi);
+        d->inputDevices.insert(ubi, bluetoothInputDev);
+    }
+    return bluetoothInputDev;
+}
 
+
+
 /******************* DBus Calls *******************************/
 
 QStringList BluezBluetoothInterface::listReply(const QString &method) const
@@ -574,10 +280,13 @@
 
     if (param.isEmpty())
 	    reply = d->iface.call(method);
-    else
+    else {
+            qDebug() << "ObjectReply calling: " << method << " " << param;
 	    reply = d->iface.call(method, param);
+    }
 	    	
     if (reply.isValid()) {
+        qDebug() << "ObjectReply Valid? "<<  reply.value().path();
         return reply.value();
     }
 
Index: bluez-bluetoothinterface.h
===================================================================
--- bluez-bluetoothinterface.h	(.../branches/KDE/4.2/kdebase/workspace/solid/bluez)	(revision 912529)
+++ solid/bluez/bluez-bluetoothinterface.h	(.../trunk/KDE/kdebase/workspace/solid/bluez)	(revision 912529)
@@ -27,6 +27,7 @@
 #include <QtDBus>
 #include <QDBusVariant>
 #include <QDBusObjectPath>
+#include <QString>
 
 #include <solid/control/ifaces/bluetoothinterface.h>
 
@@ -42,34 +43,11 @@
     BluezBluetoothInterface(const QString  & objectPath);
     virtual ~BluezBluetoothInterface();
     QString ubi() const;
-/*
-    QString address() const;
-    QString version() const;
-    QString revision() const;
-    QString manufacturer() const;
-    QString company() const;
-    Solid::Control::BluetoothInterface::Mode mode() const;
-    int discoverableTimeout() const;
-    bool isDiscoverable() const;
-    QStringList listConnections() const;
-    QString majorClass() const;
-    QStringList listAvailableMinorClasses() const;
-    QString minorClass() const;
-    QStringList serviceClasses() const;
-    QString name() const;
-    QStringList listBondings() const;
-    bool isPeriodicDiscoveryActive() const;
-    bool isPeriodicDiscoveryNameResolvingActive() const;
-    QStringList listRemoteDevices() const;
-    QStringList listRecentRemoteDevices(const QDateTime &) const;
-    QString getRemoteName(const QString &);
-    bool isTrusted(const QString &);
-
-*/    
+    
     QObject *createBluetoothRemoteDevice(const QString &);
-
-    QString createDevice(const QString &) const;
-    QString createPairedDevice(const QString &,const QString &,const QString &) const;
+    QObject *createBluetoothInputDevice(const QString &);
+    void createDevice(const QString &) const;
+    void createPairedDevice(const QString &,const QString &,const QString &) const;
     QString findDevice(const QString &) const;
     QMap< QString, QVariant > getProperties() const;
     QStringList listDevices() const;
@@ -87,36 +65,6 @@
     void stopDiscovery();
     void unregisterAgent(const QString &);
 
-/*
-    void setMode(const Solid::Control::BluetoothInterface::Mode);
-    void setDiscoverableTimeout(int);
-    void setMinorClass(const QString &);
-    void setName(const QString &);
-    void discoverDevices();
-    void discoverDevicesWithoutNameResolving();
-    void cancelDiscovery();
-    void startPeriodicDiscovery();
-    void stopPeriodicDiscovery();
-    void setPeriodicDiscoveryNameResolving(bool);
-    void setTrusted(const QString &);
-    void removeTrust(const QString &);
-
-    void slotModeChanged(const Solid::Control::BluetoothInterface::Mode mode);
-    void slotDiscoverableTimeoutChanged(int timeout);
-    void slotMinorClassChanged(const QString &minor);
-    void slotNameChanged(const QString &name);
-    void slotDiscoveryStarted();
-    void slotDiscoveryCompleted();
-    void slotRemoteDeviceFound(const QString &ubi, uint deviceClass, short rssi);
-    void slotRemoteDeviceDisappeared(const QString &ubi);
-    void slotRemoteNameUpdated(const QString &, const QString &);
-    void slotRemoteDeviceConnected(const QString&);
-    void slotRemoteDeviceDisconnected(const QString&);
-    void slotTrustAdded(const QString&);
-    void slotTrustRemoved(const QString&);
-    void slotBondingCreated(const QString&);
-    void slotBondingRemoved(const QString&);
-*/    
     void slotDeviceCreated(const QDBusObjectPath &);
     void slotDeviceDisappeared(const QString &);
     void slotDeviceFound(const QString &, const QMap< QString, QVariant > &);
Index: bluez-bluetoothmanager.cpp
===================================================================
--- bluez-bluetoothmanager.cpp	(.../branches/KDE/4.2/kdebase/workspace/solid/bluez)	(revision 912529)
+++ solid/bluez/bluez-bluetoothmanager.cpp	(.../trunk/KDE/kdebase/workspace/solid/bluez)	(revision 912529)
@@ -104,6 +104,7 @@
 
 QString BluezBluetoothManager::defaultInterface() const
 {
+    kDebug() << "Calling Backend Default Interface";
     QDBusReply< QDBusObjectPath > path = d->manager.call("DefaultAdapter");
     if (!path.isValid())
         return QString();
@@ -132,6 +133,16 @@
     return bluetoothInterface;
 }
 
+void BluezBluetoothManager::removeInterface(const QString& ubi)
+{
+
+    if (d->interfaces.contains(ubi)) {
+        kDebug() << "Removing Interface" << ubi;
+        BluezBluetoothInterface * bluetoothInterface = d->interfaces.take(ubi);
+        bluetoothInterface = 0;
+    }
+}
+
 /*
 KJob *BluezBluetoothManager::setupInputDevice(const QString &ubi)
 {
Index: bluez-bluetoothremotedevice.cpp
===================================================================
--- bluez-bluetoothremotedevice.cpp	(.../branches/KDE/4.2/kdebase/workspace/solid/bluez)	(revision 912529)
+++ solid/bluez/bluez-bluetoothremotedevice.cpp	(.../trunk/KDE/kdebase/workspace/solid/bluez)	(revision 912529)
@@ -42,6 +42,7 @@
 	m_adapter = m_objectPath.left(objectPath.size() - 18);
 	m_address = m_objectPath.right(17);
 
+        kdDebug() << "Connecting to ObjectPath: " << objectPath;
 
 	device = new QDBusInterface("org.bluez", objectPath,
 				    "org.bluez.Device", QDBusConnection::systemBus());
@@ -79,7 +80,7 @@
 
 void BluezBluetoothRemoteDevice::setProperty(const QString &name, const QVariant &value)
 {
-    device->call("SetProperty",name,value);
+    device->call("SetProperty",name,qVariantFromValue(QDBusVariant(value)));
 }
 
 void BluezBluetoothRemoteDevice::discoverServices(const QString& pattern) const
Index: bluez-bluetoothmanager.h
===================================================================
--- bluez-bluetoothmanager.h	(.../branches/KDE/4.2/kdebase/workspace/solid/bluez)	(revision 912529)
+++ solid/bluez/bluez-bluetoothmanager.h	(.../trunk/KDE/kdebase/workspace/solid/bluez)	(revision 912529)
@@ -43,6 +43,7 @@
     virtual ~BluezBluetoothManager();
     QStringList bluetoothInterfaces() const;
     QObject * createInterface(const QString &);
+    void removeInterface(const QString& ubi);
 //  QStringList bluetoothInputDevices() const;
     QString defaultInterface() const;
     QString findInterface(const QString &) const;
diff -Nur -x '[^b][^l]*' -x .svn 4_2libsControl/bluetoothinputdevice.cpp kdebase/workspace/libs/solid/control/bluetoothinputdevice.cpp
--- 4_2libsControl/bluetoothinputdevice.cpp	2009-01-17 17:51:33.000000000 +0100
+++ libs/solid/control/bluetoothinputdevice.cpp	2009-01-14 21:06:47.000000000 +0100
@@ -91,8 +91,8 @@
     FrontendObjectPrivate::setBackendObject(object);
 
     if (object) {
-        QObject::connect(object, SIGNAL(propertyChanged(QString,QVariant)),
-                         parent(), SIGNAL(propertyChanged(QString,QVariant)));
+        QObject::connect(object, SIGNAL(propertyChanged(const QString&,const QVariant&)),
+                         parent(), SIGNAL(propertyChanged(const QString,const QVariant&)));
     }
 }
 
diff -Nur -x '[^b][^l]*' -x .svn 4_2libsControl/bluetoothinterface.cpp kdebase/workspace/libs/solid/control/bluetoothinterface.cpp
--- 4_2libsControl/bluetoothinterface.cpp	2009-01-17 17:51:33.000000000 +0100
+++ libs/solid/control/bluetoothinterface.cpp	2009-01-16 12:11:03.000000000 +0100
@@ -25,7 +25,7 @@
 #include <QStringList>
 #include <QVariant>
 
-#include <kdebug.h>
+#include <KDebug>
 
 #include "ifaces/bluetoothinterface.h"
 
@@ -49,9 +49,12 @@
     void setBackendObject(QObject *object);
 
     QPair<BluetoothRemoteDevice *, Ifaces::BluetoothRemoteDevice *> findRegisteredBluetoothRemoteDevice(const QString &ubi) const;
+    QPair<BluetoothInputDevice *, Ifaces::BluetoothInputDevice *> findRegisteredBluetoothInputDevice(const QString &ubi) const;
 
     mutable QMap<QString, QPair<BluetoothRemoteDevice *, Ifaces::BluetoothRemoteDevice *> > remoteDeviceMap;
+    mutable QMap<QString, QPair<BluetoothInputDevice *, Ifaces::BluetoothInputDevice *> > inputDeviceMap;
     mutable BluetoothRemoteDevice invalidDevice;
+    mutable BluetoothInputDevice invalidInputDevice;
 };
 }
 }
@@ -65,30 +68,39 @@
 {
     const BluetoothInterface &device = BluetoothManager::self().findBluetoothInterface(ubi);
     d->setBackendObject(device.d->backendObject());
+    QObject::connect(d->backendObject(), SIGNAL(deviceCreated(const QString &)),this, SLOT(slotDeviceCreated(const QString &)));
 }
 
 Solid::Control::BluetoothInterface::BluetoothInterface(QObject *backendObject)
         : QObject(), d(new BluetoothInterfacePrivate(this))
 {
     d->setBackendObject(backendObject);
+    QObject::connect(d->backendObject(), SIGNAL(deviceCreated(const QString &)),this, SLOT(slotDeviceCreated(const QString &)));
 }
 
 Solid::Control::BluetoothInterface::BluetoothInterface(const BluetoothInterface &device)
         : QObject(), d(new BluetoothInterfacePrivate(this))
 {
     d->setBackendObject(device.d->backendObject());
+    QObject::connect(d->backendObject(), SIGNAL(deviceCreated(const QString &)),this, SLOT(slotDeviceCreated(const QString &)));
 }
 
 Solid::Control::BluetoothInterface::~BluetoothInterface()
 {
     // Delete all the interfaces, they are now outdated
     typedef QPair<BluetoothRemoteDevice *, Ifaces::BluetoothRemoteDevice *> BluetoothRemoteDeviceIfacePair;
+    typedef QPair<BluetoothInputDevice *, Ifaces::BluetoothInputDevice *> BluetoothInputDeviceIfacePair;
 
     // Delete all the devices, they are now outdated
-    foreach (const BluetoothRemoteDeviceIfacePair &pair, d->remoteDeviceMap) {
+    foreach (const BluetoothRemoteDeviceIfacePair &pair, d->remoteDeviceMap.values()) {
         delete pair.first;
         delete pair.second;
     }
+    foreach (const BluetoothInputDeviceIfacePair &pair, d->inputDeviceMap.values()) {
+        delete pair.first;
+        delete pair.second;
+    }
+
 }
 
 Solid::Control::BluetoothInterface &Solid::Control::BluetoothInterface::operator=(const Solid::Control::BluetoothInterface  & dev)
@@ -108,9 +120,12 @@
     SOLID_CALL(Ifaces::BluetoothInterface *, d->backendObject(), cancelDeviceCreation(address));
 }
 
-QString Solid::Control::BluetoothInterface::createPairedDevice(const QString &address,const QString &adapterPath, const QString &capab) const
+void Solid::Control::BluetoothInterface::createPairedDevice(const QString &address,const QString &adapterPath, const QString &capab) const
 {
-    return_SOLID_CALL(Ifaces::BluetoothInterface *, d->backendObject(), QString(), createPairedDevice(address,adapterPath,capab));
+    Ifaces::BluetoothInterface *backend = qobject_cast<Ifaces::BluetoothInterface *>(d->backendObject());
+    if (backend == 0) 
+        return;
+    backend->createPairedDevice(address,adapterPath,capab);
 }
 
 QMap<QString, QVariant> Solid::Control::BluetoothInterface::getProperties() const
@@ -137,7 +152,7 @@
 
     Solid::Control::BluetoothRemoteDeviceList list;
     foreach (const QString& ubi,ubis) {
-        BluetoothRemoteDevice remoteDevice = findBluetoothRemoteDevice(ubi);
+        BluetoothRemoteDevice* remoteDevice = findBluetoothRemoteDeviceUBI(ubi);
         list.append(remoteDevice);
     }
     return list;
@@ -184,13 +199,13 @@
 }
 
 
-Solid::Control::BluetoothRemoteDevice Solid::Control::BluetoothInterface::findBluetoothRemoteDevice(const QString &address) const
+Solid::Control::BluetoothRemoteDevice Solid::Control::BluetoothInterface::findBluetoothRemoteDeviceAddr(const QString &address) const
 {
     Ifaces::BluetoothInterface *backend = qobject_cast<Ifaces::BluetoothInterface *>(d->backendObject());
     if (backend == 0) 
         return d->invalidDevice;
 
-    const QString ubi = backend->findDevice(address);
+    const QString ubi = getBluetoothRemoteDeviceUBI(address);
 
     QPair<BluetoothRemoteDevice *, Ifaces::BluetoothRemoteDevice *> pair = d->findRegisteredBluetoothRemoteDevice(ubi);
 
@@ -201,18 +216,56 @@
     }
 }
 
-Solid::Control::BluetoothRemoteDevice * Solid::Control::BluetoothInterface::createBluetoothRemoteDevice(const QString &address)
+
+const QString Solid::Control::BluetoothInterface::getBluetoothRemoteDeviceUBI(const QString &address) const
 {
     Ifaces::BluetoothInterface *backend = qobject_cast<Ifaces::BluetoothInterface *>(d->backendObject());
     if (backend == 0) 
-        return 0;
+        return "";
+
+    const QString ubi = backend->findDevice(address);
+    return ubi;
+}
 
-    const QString ubi = backend->createDevice(address);
 
+void Solid::Control::BluetoothInterface::createBluetoothRemoteDevice(const QString &address)
+{
+    Ifaces::BluetoothInterface *backend = qobject_cast<Ifaces::BluetoothInterface *>(d->backendObject());
+    if (backend == 0) 
+        return;
+    backend->createDevice(address);
+}
+
+
+Solid::Control::BluetoothRemoteDevice* Solid::Control::BluetoothInterface::findBluetoothRemoteDeviceUBI(const QString &ubi) const
+{
     QPair<BluetoothRemoteDevice *, Ifaces::BluetoothRemoteDevice *> pair = d->findRegisteredBluetoothRemoteDevice(ubi);
     return pair.first;
 }
 
+Solid::Control::BluetoothInputDevice* Solid::Control::BluetoothInterface::findBluetoothInputDeviceUBI(const QString &ubi) const
+{
+    QPair<BluetoothInputDevice *, Ifaces::BluetoothInputDevice *> pair = d->findRegisteredBluetoothInputDevice(ubi);
+    return pair.first;
+}
+
+void Solid::Control::BluetoothInterface::slotDeviceCreated(const QString& ubi)
+{
+
+    Ifaces::BluetoothInterface *backend = qobject_cast<Ifaces::BluetoothInterface *>(d->backendObject());
+    Ifaces::BluetoothRemoteDevice *iface = 0;
+
+    if (backend != 0) {
+        iface = qobject_cast<Ifaces::BluetoothRemoteDevice *>(backend->createBluetoothRemoteDevice(ubi));
+    }
+
+    if (iface != 0) {
+        BluetoothRemoteDevice *device = new BluetoothRemoteDevice(iface);
+
+        QPair<BluetoothRemoteDevice *, Ifaces::BluetoothRemoteDevice *> pair(device, iface);
+        d->remoteDeviceMap[ubi] = pair;
+    }
+}
 
 QString Solid::Control::BluetoothInterface::address() const
 {
@@ -492,8 +545,6 @@
         QObject::connect(object, SIGNAL(propertyChanged(const QString &,const QVariant &)),
                                  parent(), SIGNAL(propertyChanged(const QString &, const QVariant &)));
 
-
-
     }
 }
 
@@ -521,6 +572,32 @@
         }
 
     }
+}
+
+QPair<Solid::Control::BluetoothInputDevice *, Solid::Control::Ifaces::BluetoothInputDevice *> Solid::Control::BluetoothInterfacePrivate::findRegisteredBluetoothInputDevice(const QString &ubi) const
+{
+    if (inputDeviceMap.contains(ubi)) {
+        return inputDeviceMap[ubi];
+    } else {
+        Ifaces::BluetoothInterface *backend = qobject_cast<Ifaces::BluetoothInterface *>(backendObject());
+        Ifaces::BluetoothInputDevice *iface = 0;
+
+        if (backend != 0) {
+            iface = qobject_cast<Ifaces::BluetoothInputDevice *>(backend->createBluetoothInputDevice(ubi));
+        }
+
+        if (iface != 0) {
+            BluetoothInputDevice *device = new BluetoothInputDevice(iface);
+
+            QPair<BluetoothInputDevice *, Ifaces::BluetoothInputDevice *> pair(device, iface);
+            inputDeviceMap[ubi] = pair;
+
+            return pair;
+        } else {
+            return QPair<BluetoothInputDevice *, Ifaces::BluetoothInputDevice *>(0, 0);
+        }
+
+    }
 }
 
 #include "bluetoothinterface.moc"
diff -Nur -x '[^b][^l]*' -x .svn 4_2libsControl/bluetoothinterface.h kdebase/workspace/libs/solid/control/bluetoothinterface.h
--- 4_2libsControl/bluetoothinterface.h	2009-01-17 17:51:33.000000000 +0100
+++ libs/solid/control/bluetoothinterface.h	2009-01-14 14:17:14.000000000 +0100
@@ -28,7 +28,9 @@
 #include <QtCore/QMap>
 
 #include "bluetoothremotedevice.h"
+#include "bluetoothinputdevice.h"
 #include "ifaces/bluetoothremotedevice.h"
+#include "ifaces/bluetoothinputdevice.h"
 
 
 
@@ -37,7 +39,7 @@
 namespace Control
 {
 class BluetoothRemoteDevice;
-typedef QList<BluetoothRemoteDevice> BluetoothRemoteDeviceList;
+typedef QList<BluetoothRemoteDevice*> BluetoothRemoteDeviceList;
 class BluetoothInterfacePrivate;
 
 /**
@@ -115,7 +117,8 @@
      * @param ubi the identifier of the bluetooth device to instantiate
      * @returns a bluetooth object, if a bluetooth device having the given UBI, for this interface exists, 0 otherwise
      */
-    Solid::Control::BluetoothRemoteDevice* createBluetoothRemoteDevice(const QString &address);
+    //Solid::Control::BluetoothRemoteDevice* createBluetoothRemoteDevice(const QString &address);
+    void createBluetoothRemoteDevice(const QString &address);
 
     /**
      * Finds a BluetoothRemoteDevice object given its UBI.
@@ -123,7 +126,13 @@
      * @param ubi the identifier of the bluetooth remote device to find from this bluetooth interface
      * @returns a valid BluetoothRemoteDevice object if a remote device having the given UBI for this interface exists, an invalid BluetoothRemoteDevice object otherwise.
      */
-    Solid::Control::BluetoothRemoteDevice findBluetoothRemoteDevice(const QString &address) const;
+    const QString getBluetoothRemoteDeviceUBI(const QString &address) const;
+
+    Solid::Control::BluetoothRemoteDevice findBluetoothRemoteDeviceAddr(const QString &addr) const;
+
+    Solid::Control::BluetoothRemoteDevice* findBluetoothRemoteDeviceUBI(const QString &ubi) const;
+
+    Solid::Control::BluetoothInputDevice* findBluetoothInputDeviceUBI(const QString &ubi) const;
 
     /**
      * Retrieves the MAC address of the bluetooth interface/adapter.
@@ -296,7 +305,7 @@
 //    bool isTrusted(const QString &);
 
 
-    QString createPairedDevice(const QString &, const QString &, const QString &) const;
+    void createPairedDevice(const QString &, const QString &, const QString &) const;
 
     QMap< QString, QVariant > getProperties() const;
 
@@ -557,6 +566,9 @@
     QVariant getProperty(const QString&) const;
     BluetoothInterfacePrivate * const d;
 
+private slots:
+    void slotDeviceCreated(const QString& ubi);
+
 };
 
 } //Control
diff -Nur -x '[^b][^l]*' -x .svn 4_2libsControl/bluetoothmanager.cpp kdebase/workspace/libs/solid/control/bluetoothmanager.cpp
--- 4_2libsControl/bluetoothmanager.cpp	2009-01-17 17:51:33.000000000 +0100
+++ libs/solid/control/bluetoothmanager.cpp	2009-01-16 13:17:33.000000000 +0100
@@ -58,6 +58,7 @@
 
     void _k_interfaceAdded(const QString &ubi);
     void _k_interfaceRemoved(const QString &ubi);
+    void _k_defaultInterfaceChanged(const QString &ubi);
     void _k_interfaceDestroyed(QObject *object);
 /*
     void _k_inputDeviceCreated(const QString &ubi);
@@ -95,7 +96,7 @@
     typedef QPair<BluetoothInterface *, Ifaces::BluetoothInterface *> BluetoothInterfaceIfacePair;
 
     // Delete all the devices, they are now outdated
-    foreach (const BluetoothInterfaceIfacePair &pair, d->bluetoothInterfaceMap) {
+    foreach (const BluetoothInterfaceIfacePair &pair, d->bluetoothInterfaceMap.values()) {
         delete pair.first;
         delete pair.second;
     }
@@ -110,6 +111,8 @@
 
     if (backend == 0) return list;
 
+    kDebug() << "UBI List " << ubiList;
+
     foreach (const QString &ubi, ubiList) {
         QPair<BluetoothInterface *, Ifaces::BluetoothInterface *> pair = d->findRegisteredBluetoothInterface(ubi);
 
@@ -239,7 +242,9 @@
 */
 void Solid::Control::BluetoothManagerPrivate::_k_interfaceAdded(const QString &ubi)
 {
-    QPair<BluetoothInterface *, Ifaces::BluetoothInterface *> pair = bluetoothInterfaceMap.take(ubi);
+    kDebug() << "Size of InterfaceList " << bluetoothInterfaceMap.size();
+    QPair<BluetoothInterface *, Ifaces::BluetoothInterface *> pair = findRegisteredBluetoothInterface(ubi);
+/*    QPair<BluetoothInterface *, Ifaces::BluetoothInterface *> pair = bluetoothInterfaceMap.take(ubi);
 
     if (pair.first != 0) {
         // Oops, I'm not sure it should happen...
@@ -247,7 +252,7 @@
 
         delete pair.first;
         delete pair.second;
-    }
+    }*/
 
     emit q->interfaceAdded(ubi);
 }
@@ -261,11 +266,19 @@
         delete pair.second;
     }
 
+    Ifaces::BluetoothManager *backend = qobject_cast<Ifaces::BluetoothManager *>(managerBackend());
+    backend->removeInterface(ubi);
     emit q->interfaceRemoved(ubi);
 }
 
+void Solid::Control::BluetoothManagerPrivate::_k_defaultInterfaceChanged(const QString &ubi)
+{
+    emit q->defaultInterfaceChanged(ubi);
+}
+
 void Solid::Control::BluetoothManagerPrivate::_k_interfaceDestroyed(QObject *object)
 {
+    kDebug() << "Interface detroyed";
     Ifaces::BluetoothInterface *device = qobject_cast<Ifaces::BluetoothInterface *>(object);
 
     if (device != 0) {
@@ -323,6 +336,9 @@
                      q, SLOT(_k_interfaceAdded(const QString &)));
     QObject::connect(newBackend, SIGNAL(interfaceRemoved(const QString &)),
                      q, SLOT(_k_interfaceRemoved(const QString &)));
+    QObject::connect(newBackend, SIGNAL(defaultInterfaceChanged(const QString &)),
+                     q, SLOT(_k_defaultInterfaceChanged(const QString &)));
+
 /*
     QObject::connect(newBackend, SIGNAL(inputDeviceCreated(const QString &)),
                      q, SLOT(_k_inputDeviceCreated(const QString &)));
@@ -334,17 +350,22 @@
 
 QPair<Solid::Control::BluetoothInterface *, Solid::Control::Ifaces::BluetoothInterface *> Solid::Control::BluetoothManagerPrivate::findRegisteredBluetoothInterface(const QString &ubi) const
 {
+
+    kDebug() << "findRegisteredBluetoothInterface " << ubi;
     if (bluetoothInterfaceMap.contains(ubi)) {
         return bluetoothInterfaceMap[ubi];
     } else {
+        kDebug() << "Creating New Interface " << ubi;
         Ifaces::BluetoothManager *backend = qobject_cast<Ifaces::BluetoothManager *>(managerBackend());
         Ifaces::BluetoothInterface *iface = 0;
 
         if (backend != 0) {
+            kDebug() << "Calling Backend to Creating New Interface " << ubi;
             iface = qobject_cast<Ifaces::BluetoothInterface *>(backend->createInterface(ubi));
         }
 
         if (iface != 0) {
+            kDebug() << "BackendIface created ";
             BluetoothInterface *device = new BluetoothInterface(iface);
             QPair<BluetoothInterface *, Ifaces::BluetoothInterface *> pair(device, iface);
             QObject::connect(iface, SIGNAL(destroyed(QObject *)),
diff -Nur -x '[^b][^l]*' -x .svn 4_2libsControl/bluetoothmanager.h kdebase/workspace/libs/solid/control/bluetoothmanager.h
--- 4_2libsControl/bluetoothmanager.h	2009-01-17 17:51:33.000000000 +0100
+++ libs/solid/control/bluetoothmanager.h	2009-01-16 13:17:33.000000000 +0100
@@ -188,6 +188,7 @@
 
     Q_PRIVATE_SLOT(d, void _k_interfaceAdded(const QString &))
     Q_PRIVATE_SLOT(d, void _k_interfaceRemoved(const QString &))
+    Q_PRIVATE_SLOT(d, void _k_defaultInterfaceChanged(const QString &))
     Q_PRIVATE_SLOT(d, void _k_interfaceDestroyed(QObject *))
 /*
     Q_PRIVATE_SLOT(d, void _k_inputDeviceCreated(const QString &))
diff -Nur -x '[^b][^l]*' -x .svn 4_2libsControl/bluetoothremotedevice.cpp kdebase/workspace/libs/solid/control/bluetoothremotedevice.cpp
--- 4_2libsControl/bluetoothremotedevice.cpp	2009-01-17 17:51:33.000000000 +0100
+++ libs/solid/control/bluetoothremotedevice.cpp	2009-01-13 14:53:39.000000000 +0100
@@ -88,6 +88,15 @@
     return_SOLID_CALL(Ifaces::BluetoothRemoteDevice *, d->backendObject(), (QMap< QString,QVariant >()), getProperties());
 }
 
+QVariant Solid::Control::BluetoothRemoteDevice::getProperty(const QString &key)
+{
+    QMap<QString, QVariant> props = getProperties();
+    if (props.contains(key))
+        return props[key];
+    else
+        return QVariant();
+}
+
 QStringList Solid::Control::BluetoothRemoteDevice::listNodes()
 {
     Q_D(const BluetoothRemoteDevice);
@@ -113,14 +122,65 @@
 }
 
 
+QString Solid::Control::BluetoothRemoteDevice::address()
+{
+    QVariant var = getProperty("Address");
+
+    if (var.isValid())
+        return var.value<QString>();
+    else
+        return QString();
 
-/*
-QString Solid::Control::BluetoothRemoteDevice::address() const
+//    Q_D(const BluetoothRemoteDevice);
+//    return_SOLID_CALL(Ifaces::BluetoothRemoteDevice *, d->backendObject(), QString(), address());
+}
+
+bool Solid::Control::BluetoothRemoteDevice::isTrusted()
 {
-    Q_D(const BluetoothRemoteDevice);
-    return_SOLID_CALL(Ifaces::BluetoothRemoteDevice *, d->backendObject(), QString(), address());
+     QVariant var = getProperty("Trusted");
+
+    if (var.isValid())
+        return var.value<bool>();
+    else
+        return false;
+}
+
+void Solid::Control::BluetoothRemoteDevice::setTrusted(bool trust)
+{
+    setProperty("Trusted",QVariant(trust));
 }
 
+QString Solid::Control::BluetoothRemoteDevice::icon()
+{
+     QVariant var = getProperty("Icon");
+
+    if (var.isValid())
+        return var.value<QString>();
+    else
+        return "";
+}
+
+QStringList Solid::Control::BluetoothRemoteDevice::uuids()
+{
+     QVariant var = getProperty("UUIDs");
+
+    if (var.isValid())
+        return var.value<QStringList>();
+    else
+        return QStringList();
+}
+
+bool Solid::Control::BluetoothRemoteDevice::isConnected()
+{
+     QVariant var = getProperty("Connected");
+
+    if (var.isValid())
+        return var.value<bool>();
+    else
+        return false;
+}
+
+/*
 bool Solid::Control::BluetoothRemoteDevice::isConnected() const
 {
     Q_D(const BluetoothRemoteDevice);
@@ -168,12 +228,21 @@
     Q_D(const BluetoothRemoteDevice);
     return_SOLID_CALL(Ifaces::BluetoothRemoteDevice *, d->backendObject(), QStringList(), serviceClasses());
 }
-QString Solid::Control::BluetoothRemoteDevice::name() const
+*/
+
+QString Solid::Control::BluetoothRemoteDevice::name()
 {
-    Q_D(const BluetoothRemoteDevice);
-    return_SOLID_CALL(Ifaces::BluetoothRemoteDevice *, d->backendObject(), QString(), name());
+    QVariant var = getProperty("Name");
+
+    if (var.isValid())
+        return var.value<QString>();
+    else
+        return QString();
+
+//    return_SOLID_CALL(Ifaces::BluetoothRemoteDevice *, d->backendObject(), QString(), name());
 }
 
+/*
 QString Solid::Control::BluetoothRemoteDevice::alias() const
 {
     Q_D(const BluetoothRemoteDevice);
diff -Nur -x '[^b][^l]*' -x .svn 4_2libsControl/bluetoothremotedevice.h kdebase/workspace/libs/solid/control/bluetoothremotedevice.h
--- 4_2libsControl/bluetoothremotedevice.h	2009-01-17 17:51:33.000000000 +0100
+++ libs/solid/control/bluetoothremotedevice.h	2009-01-13 14:53:39.000000000 +0100
@@ -82,11 +82,46 @@
     bool operator==(const BluetoothRemoteDevice  & other) const;
 
     /**
-     * The UBI of the remote de device.
+     * The UBI of the remote device.
      */
     QString ubi() const;
 
     /**
+     * The address of the remote device.
+     */
+    QString address();
+
+    /**
+     * The name of the remote device.
+     */
+    QString name();
+
+    /**
+     * The icon of the remote device.
+     */
+    QString icon();
+
+    /**
+     * The Trust state of the remote device.
+     */
+    bool isTrusted();
+
+    /**
+     * Set the Trust state of the remote device.
+     */
+    void setTrusted(bool);
+
+    /**
+     * Returns the service uuids of the remote device.
+     */
+    QStringList uuids();
+
+    /**
+     * The Connection state of the remote device.
+     */
+    bool isConnected();
+
+    /**
      * Retrieve all properties from the remote device.
      *
      * @returns a hash of named properties
@@ -157,6 +192,9 @@
 
 private:
     Q_PRIVATE_SLOT(d_func(), void _k_destroyed(QObject *))
+
+
+    QVariant getProperty(const QString &key);
 };
 
 } //Control
diff -Nur -x '[^b][^l]*' -x .svn 4_2libsControl/ifaces/bluetoothinterface.h kdebase/workspace/libs/solid/control/ifaces/bluetoothinterface.h
--- 4_2libsControl/ifaces/bluetoothinterface.h	2009-01-17 17:51:32.000000000 +0100
+++ libs/solid/control/ifaces/bluetoothinterface.h	2009-01-16 17:16:55.000000000 +0100
@@ -240,7 +240,7 @@
      */
 
 
-    virtual QString createPairedDevice(const QString &, const QString &, const QString &) const = 0;
+    virtual void createPairedDevice(const QString &, const QString &, const QString &) const = 0;
 
     virtual QMap< QString, QVariant > getProperties() const = 0;
 
@@ -248,7 +248,8 @@
 
     virtual QString findDevice(const QString &) const = 0;
 
-    virtual QString createDevice(const QString &) const = 0;
+    //virtual QString createDevice(const QString &) const = 0;
+    virtual void createDevice(const QString &) const = 0;
 
 
 
@@ -320,7 +321,9 @@
      * @param ubi the identifier of the bluetooth remote device instantiated
      * @returns a new BluetoothRemoteDevice object if there's a device having the given UBI, 0 otherwise
      */
-    virtual QObject *createBluetoothRemoteDevice(const QString &address) = 0;
+    virtual QObject *createBluetoothRemoteDevice(const QString &ubi) = 0;
+
+    virtual QObject *createBluetoothInputDevice(const QString &ubi) = 0;
 
     /**
      * Marks the device as trusted.
diff -Nur -x '[^b][^l]*' -x .svn 4_2libsControl/ifaces/bluetoothmanager.h kdebase/workspace/libs/solid/control/ifaces/bluetoothmanager.h
--- 4_2libsControl/ifaces/bluetoothmanager.h	2009-01-17 17:51:32.000000000 +0100
+++ libs/solid/control/ifaces/bluetoothmanager.h	2009-01-16 12:42:32.000000000 +0100
@@ -89,6 +89,13 @@
      virtual QObject *createInterface(const QString &ubi) = 0;
 
     /**
+     * Removes a BluetoothInterface object from this backend given its UBI.
+     *
+     * @param ubi the identifier of the bluetooth interface instantiated
+     */
+     virtual void removeInterface(const QString &ubi) = 0;
+
+    /**
      * Retrieves the list of Universal Bluetooth Identifiers (UBIs) of bluetooth input devices
      * which are configured in the system. Configured means also not connected devices.
      *


Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/F-9/kdebase-workspace.spec,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -r1.126 -r1.127
--- kdebase-workspace.spec	28 Jan 2009 12:54:57 -0000	1.126
+++ kdebase-workspace.spec	29 Jan 2009 19:41:04 -0000	1.127
@@ -1,10 +1,14 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
+%if 0%{?fedora} <= 9
+%define have_bluez3 1
+%endif
+
 Summary: K Desktop Environment - Workspace
 Name: kdebase-workspace
 Version: 4.2.0
 
-Release: 2%{?dist}
+Release: 4%{?dist}.1
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-workspace-%{version}.tar.bz2
 License: GPLv2
 Group: User Interface/Desktops
@@ -22,13 +26,17 @@
 Patch7: kdebase-workspace-4.0.3-krdb.patch
 Patch8: kdebase-workspace-4.0.72-klipper-url.patch
 Patch9: kdebase-workspace-4.1.80-session-button.patch
-Patch10: kdebase-workspace-4.1.2-ldap.patch
 Patch11: kdebase-workspace-4.1.96-font.patch
 Patch12: kdebase-workspace-4.2.0-default_applets.patch
 
 # upstream patches:
 # trunk
 Patch100: kdebase-workspace-4.1.96-AllowExternalPaths.patch
+# solid-bluetooth, https://bugzilla.redhat.com/481801
+Patch101: solid-bluetoothTrunkTo42.diff
+# revert solid-bluetooth to the version from 4.1.4, needed for kdebluetooth 0.2
+# 0.3 requires BlueZ 4 and the patch above
+Patch102: kdebase-workspace-4.2.0-bluetooth-revert.patch
 
 # FIXME: "inconsistent naming System Monitor vs KSysGuard" http://bugs.kde.org/162151
 
@@ -43,6 +51,9 @@
 Requires: kdebase4
 %endif
 
+# for plasmascript bits
+Requires: PyKDE4 >= %{version}
+
 # kdmtheme's functionality is now provided by kdebase-workspace itself
 Obsoletes: kdmtheme < 1.3
 
@@ -65,7 +76,6 @@
 BuildRequires: pam-devel
 BuildRequires: qimageblitz-devel
 BuildRequires: soprano-devel
-BuildRequires: openldap-devel
 BuildRequires: python-devel
 BuildRequires: PyKDE4-devel >= %{version}
 BuildRequires: qedje-devel
@@ -120,6 +130,11 @@
 %package devel
 Group:    Development/Libraries
 Summary:  Development files for %{name}
+%if 0%{?have_bluez3}
+Provides: solid-bluetooth-devel = 4.1.4-1
+%else
+Provides: solid-bluetooth-devel = 4.3-0.1
+%endif
 Requires: %{name}-libs = %{version}-%{release}
 Requires: kdelibs4-devel
 %description devel
@@ -128,6 +143,11 @@
 %package libs
 Summary: Runtime libraries for %{name}
 Group:   System Environment/Libraries
+%if 0%{?have_bluez3}
+Provides: solid-bluetooth = 4.1.4-1
+%else
+Provides: solid-bluetooth = 4.3-0.1
+%endif
 Requires: kdelibs4 >= %{version}
 Requires: %{name} = %{version}-%{release}
 %description libs
@@ -171,12 +191,16 @@
 %patch7 -p0 -b .krdb
 %patch8 -p1 -b .klipper-url
 %patch9 -p1 -b .session-button
-%patch10 -p1 -b .ldap
 %patch11 -p1 -b .font
 %patch12 -p1 -b .default_applets
 
 # upstream patches
 %patch100 -p1 -b .AllowExternalPaths
+%if 0%{?have_bluez3}
+%patch102 -p1 -b .bluetooth-revert
+%else
+%patch101 -p0 -b .solid-bluetoothTrunkTo42
+%endif
 
 %build
 
@@ -302,6 +326,18 @@
 
 
 %changelog
+* Thu Jan 29 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.2.0-4.1
+- conditionalize bluetooth backport on F10+
+- F9: revert solid-bluetooth to the version from KDE 4.1.4
+
+* Thu Jan 29 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.0-4
+- omit ldap hack (#457638), kde42's reduced linkage to the rescue
+
+* Thu Jan 29 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.0-3
+- Requires: PyKDE4 (for plasmascript bits)
+- solid-bluetoothTrunkTo42.diff (bug #481801), and 
+  +Provides: solid-bluetooth(-devel) = 4.3
+
 * Wed Jan 28 2009 Than Ngo <than at redhat.com> - 4.2.0-2
 - readd the patch that omist battery applet when guidance-power-manager is installed
 


--- kdebase-workspace-4.1.2-ldap.patch DELETED ---



From rdieter at fedoraproject.org  Thu Jan 29 19:48:27 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu, 29 Jan 2009 19:48:27 +0000 (UTC)
Subject: rpms/qt/F-10 .cvsignore, 1.44, 1.45 qt.spec, 1.219, 1.220 sources, 
	1.45, 1.46
Message-ID: <20090129194827.DE91D70116@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/qt/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27372

Modified Files:
	.cvsignore qt.spec sources 
Log Message:
* Thu Jan 29 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.4.3-14
- qt-copy-patches-20090129

* Mon Jan 26 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.4.3-13
- Provides: qt4%%{?_isa} = %%version-%%release
- add %%_qt4 to macros.qt4



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qt/F-10/.cvsignore,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- .cvsignore	13 Jan 2009 20:10:20 -0000	1.44
+++ .cvsignore	29 Jan 2009 19:47:56 -0000	1.45
@@ -1,5 +1,4 @@
 hi128-app-qt4-logo.png
 hi48-app-qt4-logo.png
 qt-x11-opensource-src-4.4.3.tar.bz2
-qt-copy-patches-20081225svn.tar.bz2
-qt-copy-patches-20090112svn.tar.bz2
+qt-copy-patches-20090129svn.tar.bz2


Index: qt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qt/F-10/qt.spec,v
retrieving revision 1.219
retrieving revision 1.220
diff -u -r1.219 -r1.220
--- qt.spec	13 Jan 2009 20:10:20 -0000	1.219
+++ qt.spec	29 Jan 2009 19:47:56 -0000	1.220
@@ -9,7 +9,7 @@
 Name:    qt4
 %endif
 Version: 4.4.3
-Release: 10%{?dist}
+Release: 14%{?dist}
 
 # GPLv2 exceptions(see GPL_EXCEPTIONS*.txt)
 License: GPLv3 with exceptions or GPLv2 with exceptions
@@ -21,6 +21,7 @@
 %if "%{name}" != "qt4"
 Obsoletes: qt4 < %{version}-%{release}
 Provides: qt4 = %{version}-%{release}
+%{?_isa:Provides: qt4%{?_isa} = %{version}-%{release}}
 %endif
 
 Source4: Trolltech.conf
@@ -39,7 +40,7 @@
 Patch10: qt-x11-opensource-src-4.4.3-im.patch
 
 ## qt-copy patches
-%define qt_copy 20090112
+%define qt_copy 20090129
 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}}
@@ -78,6 +79,7 @@
 %endif
 
 # See http://bugzilla.redhat.com/196901
+%define _qt4 %{name}
 %define _qt4_prefix %{_libdir}/qt4
 %define _qt4_bindir %{_qt4_prefix}/bin
 # _qt4_datadir is not multilib clean, and hacks to workaround that breaks stuff.
@@ -514,6 +516,7 @@
 # rpm macros
 mkdir -p %{buildroot}%{_sysconfdir}/rpm
 cat >%{buildroot}%{_sysconfdir}/rpm/macros.qt4<<EOF
+%%_qt4 %{name}
 %%_qt4_version %{version}
 %%_qt4_prefix %%{_libdir}/qt4
 %%_qt4_bindir %%{_qt4_prefix}/bin
@@ -731,6 +734,19 @@
 
 
 %changelog
+* Thu Jan 29 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.4.3-14
+- qt-copy-patches-20090129
+
+* Mon Jan 26 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.4.3-13
+- Provides: qt4%%{?_isa} = %%version-%%release
+- add %%_qt4 to macros.qt4
+
+* Thu Jan 22 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.4.3-12 
+- respin (mysql)
+
+* Fri Jan 16 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.4.3-11
+- rebuild for new OpenSSL
+
 * Mon Jan 12 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.4.3-10
 - drop qt-x11-opensource-src-4.3.4-no-hardcoded-font-aliases.patch (#447298),
   in favor of qt-copy's 0263-fix-fontconfig-handling.diff


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qt/F-10/sources,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- sources	13 Jan 2009 20:10:20 -0000	1.45
+++ sources	29 Jan 2009 19:47:56 -0000	1.46
@@ -1,4 +1,4 @@
 d9f511e4b51983b4e10eb58b320416d5  hi128-app-qt4-logo.png
 6dcc0672ff9e60a6b83f95c5f42bec5b  hi48-app-qt4-logo.png
 00e00c6324d342a7b0d8653112b4f08c  qt-x11-opensource-src-4.4.3.tar.bz2
-9c51cc569de37085da1af39750a35ba7  qt-copy-patches-20090112svn.tar.bz2
+9c2c9930560dddd4713aa99af3a5199f  qt-copy-patches-20090129svn.tar.bz2



From rdieter at fedoraproject.org  Thu Jan 29 19:50:09 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu, 29 Jan 2009 19:50:09 +0000 (UTC)
Subject: rpms/qt/F-9 .cvsignore, 1.37, 1.38 qt.spec, 1.191, 1.192 sources,
	1.40, 1.41
Message-ID: <20090129195009.6509670116@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/qt/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27750

Modified Files:
	.cvsignore qt.spec sources 
Log Message:
* Thu Jan 29 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.4.3-14
- qt-copy-patches-20090129

* Mon Jan 26 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.4.3-13
- Provides: qt4%%{?_isa} = %%version-%%release
- add %%_qt4 to macros.qt4



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qt/F-9/.cvsignore,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- .cvsignore	13 Jan 2009 20:10:20 -0000	1.37
+++ .cvsignore	29 Jan 2009 19:49:39 -0000	1.38
@@ -1,5 +1,4 @@
 hi128-app-qt4-logo.png
 hi48-app-qt4-logo.png
 qt-x11-opensource-src-4.4.3.tar.bz2
-qt-copy-patches-20081225svn.tar.bz2
-qt-copy-patches-20090112svn.tar.bz2
+qt-copy-patches-20090129svn.tar.bz2


Index: qt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qt/F-9/qt.spec,v
retrieving revision 1.191
retrieving revision 1.192
diff -u -r1.191 -r1.192
--- qt.spec	13 Jan 2009 20:10:20 -0000	1.191
+++ qt.spec	29 Jan 2009 19:49:39 -0000	1.192
@@ -9,7 +9,7 @@
 Name:    qt4
 %endif
 Version: 4.4.3
-Release: 10%{?dist}
+Release: 14%{?dist}
 
 # GPLv2 exceptions(see GPL_EXCEPTIONS*.txt)
 License: GPLv3 with exceptions or GPLv2 with exceptions
@@ -21,6 +21,7 @@
 %if "%{name}" != "qt4"
 Obsoletes: qt4 < %{version}-%{release}
 Provides: qt4 = %{version}-%{release}
+%{?_isa:Provides: qt4%{?_isa} = %{version}-%{release}}
 %endif
 
 Source4: Trolltech.conf
@@ -39,7 +40,7 @@
 Patch10: qt-x11-opensource-src-4.4.3-im.patch
 
 ## qt-copy patches
-%define qt_copy 20090112
+%define qt_copy 20090129
 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}}
@@ -78,6 +79,7 @@
 %endif
 
 # See http://bugzilla.redhat.com/196901
+%define _qt4 %{name}
 %define _qt4_prefix %{_libdir}/qt4
 %define _qt4_bindir %{_qt4_prefix}/bin
 # _qt4_datadir is not multilib clean, and hacks to workaround that breaks stuff.
@@ -514,6 +516,7 @@
 # rpm macros
 mkdir -p %{buildroot}%{_sysconfdir}/rpm
 cat >%{buildroot}%{_sysconfdir}/rpm/macros.qt4<<EOF
+%%_qt4 %{name}
 %%_qt4_version %{version}
 %%_qt4_prefix %%{_libdir}/qt4
 %%_qt4_bindir %%{_qt4_prefix}/bin
@@ -731,6 +734,19 @@
 
 
 %changelog
+* Thu Jan 29 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.4.3-14
+- qt-copy-patches-20090129
+
+* Mon Jan 26 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.4.3-13
+- Provides: qt4%%{?_isa} = %%version-%%release
+- add %%_qt4 to macros.qt4
+
+* Thu Jan 22 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.4.3-12 
+- respin (mysql)
+
+* Fri Jan 16 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.4.3-11
+- rebuild for new OpenSSL
+
 * Mon Jan 12 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.4.3-10
 - drop qt-x11-opensource-src-4.3.4-no-hardcoded-font-aliases.patch (#447298),
   in favor of qt-copy's 0263-fix-fontconfig-handling.diff


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qt/F-9/sources,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- sources	13 Jan 2009 20:10:20 -0000	1.40
+++ sources	29 Jan 2009 19:49:39 -0000	1.41
@@ -1,4 +1,4 @@
 d9f511e4b51983b4e10eb58b320416d5  hi128-app-qt4-logo.png
 6dcc0672ff9e60a6b83f95c5f42bec5b  hi48-app-qt4-logo.png
 00e00c6324d342a7b0d8653112b4f08c  qt-x11-opensource-src-4.4.3.tar.bz2
-9c51cc569de37085da1af39750a35ba7  qt-copy-patches-20090112svn.tar.bz2
+9c2c9930560dddd4713aa99af3a5199f  qt-copy-patches-20090129svn.tar.bz2



From kkofler at fedoraproject.org  Thu Jan 29 20:10:24 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Thu, 29 Jan 2009 20:10:24 +0000 (UTC)
Subject: rpms/kdebase-workspace/F-9
	kdebase-workspace-4.2.0-bluetooth-revert.patch, 1.1, 1.2
Message-ID: <20090129201024.4E31170116@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdebase-workspace/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31304/F-9

Modified Files:
	kdebase-workspace-4.2.0-bluetooth-revert.patch 
Log Message:
Also revert solid/solidshell/solid-bluetooth.*.

kdebase-workspace-4.2.0-bluetooth-revert.patch:

Index: kdebase-workspace-4.2.0-bluetooth-revert.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/F-9/kdebase-workspace-4.2.0-bluetooth-revert.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kdebase-workspace-4.2.0-bluetooth-revert.patch	29 Jan 2009 19:41:04 -0000	1.1
+++ kdebase-workspace-4.2.0-bluetooth-revert.patch	29 Jan 2009 20:10:23 -0000	1.2
@@ -3863,3 +3863,190 @@
  
  #if 0
      BluezBluetoothRemoteDevice remote("/org/bluez/hci0/00:16:BC:15:A3:FF");
+diff -ur kdebase-workspace-4.2.0/solid/solidshell/solid-bluetooth.cpp kdebase-workspace-4.2.0-bluetooth-revert/solid/solidshell/solid-bluetooth.cpp
+--- kdebase-workspace-4.2.0/solid/solidshell/solid-bluetooth.cpp	2008-12-04 09:34:48.000000000 +0100
++++ kdebase-workspace-4.2.0-bluetooth-revert/solid/solidshell/solid-bluetooth.cpp	2008-04-02 14:18:23.000000000 +0200
+@@ -70,8 +70,8 @@
+ 
+         QStringList list = value.toStringList();
+ 
+-        QStringList::ConstIterator it = list.constBegin();
+-        QStringList::ConstIterator end = list.constEnd();
++        QStringList::ConstIterator it = list.begin();
++        QStringList::ConstIterator end = list.end();
+ 
+         for (; it!=end; ++it)
+         {
+@@ -149,7 +149,7 @@
+ 
+ std::ostream &operator<<(std::ostream &out, const QMap<QString,QVariant> &properties)
+ {
+-    foreach (const QString& key, properties.keys())
++    foreach (QString key, properties.keys())
+     {
+         out << "  " << key << " = " << properties[key] << endl;
+     }
+@@ -205,17 +205,6 @@
+       cout << "  solid-bluetooth defaultadapter" << endl;
+       cout << i18n("             # List bluetooth default adapter/interface\n") << endl;
+ 
+-      cout << "  solid-bluetooth createdevice (interface 'ubi') 'remote-mac'" << endl;
+-      cout << i18n("             # Request to create a remote bluetooth device on the bus\n") << endl;
+-
+-      cout << "  solid-bluetooth removedevice (interface 'ubi') 'remote-mac'" << endl;
+-      cout << i18n("             # Request to remove the remote bluetooth device from the bus\n") << endl;
+-
+-      cout << "  solid-bluetooth getproperties (interface 'ubi') " << endl;
+-      cout << i18n("             # Request the properties from the bluetooth adapter\n") << endl;
+-
+-
+-/*
+       cout << "  solid-bluetooth getremotename (interface 'ubi') 'remote-mac'" << endl;
+       cout << i18n("             # Query the name from the remote device 'remote-mac' with 'ubi'\n") << endl;
+ 
+@@ -242,7 +231,7 @@
+       cout << i18n("             # Create bonding (pairing) with bluetooth remote device.\n"
+                     "             # Remove bonding of bluetooth remote device.\n"
+                     "             # Check for bonding of bluetooth remote device.\n") << endl;
+-*/
++
+       return 0;
+   }
+ 
+@@ -263,35 +252,11 @@
+     if (command == "listadapters")
+     {
+         return shell.bluetoothListAdapters();
+-    } 
++    }
+     else if (command == "defaultadapter")
+     {
+         return shell.bluetoothDefaultAdapter();
+     }
+-    else if (command == "createdevice")
+-    {
+-        checkArgumentCount(3, 3);
+-    	QString adapterUbi(args->arg(1));
+-    	QString mac(args->arg(2));		
+-    	return shell.bluetoothCreateDevice(adapterUbi, mac);
+-    }
+-    else if (command == "removedevice")
+-    {
+-        checkArgumentCount(3, 3);
+-    	QString adapterUbi(args->arg(1));
+-    	QString remoteUbi(args->arg(2));		
+-    	return shell.bluetoothRemoveDevice(adapterUbi, remoteUbi);
+-    }
+-    else if (command == "getproperties")
+-    {
+-        checkArgumentCount(2, 2);
+-        QString ubi (args->arg(1));
+-        return shell.bluetoothGetProperties(ubi);
+-    }
+-
+-
+-
+-#if 0    
+     else if (command == "getremotename")
+     {
+         checkArgumentCount(3, 3);
+@@ -401,7 +366,6 @@
+         }
+ 
+     }
+-#endif    
+     else
+     {
+         cerr << i18n("Syntax Error: Unknown command '%1'" , command) << endl;
+@@ -414,7 +378,9 @@
+ {
+     Solid::Control::BluetoothManager &manager = Solid::Control::BluetoothManager::self();
+ 
+-    foreach (Solid::Control::BluetoothInterface device, manager.bluetoothInterfaces())
++    const Solid::Control::BluetoothInterfaceList all = manager.bluetoothInterfaces();
++
++    foreach (const Solid::Control::BluetoothInterface device, all)
+     {
+         cout << "UBI = '" << device.ubi() << "'" << endl;
+     }
+@@ -430,36 +396,6 @@
+     return true;
+ }
+ 
+-bool SolidBluetooth::bluetoothCreateDevice(const QString &adapterUbi, const QString &/*mac*/)
+-{
+-    Solid::Control::BluetoothManager &manager = Solid::Control::BluetoothManager::self();
+-    Solid::Control::BluetoothInterface adapter = manager.findBluetoothInterface(adapterUbi);
+-//    QString remoteDeviceUBI = adapter.createDevice(mac);
+-//    cout << "Remote Device UBI: " << remoteDeviceUBI << endl;
+-    return true;
+-}
+-
+-bool SolidBluetooth::bluetoothRemoveDevice(const QString &adapterUbi, const QString &/*remoteDeviceUbi*/)
+-{
+-    Solid::Control::BluetoothManager &manager = Solid::Control::BluetoothManager::self();
+-    Solid::Control::BluetoothInterface adapter = manager.findBluetoothInterface(adapterUbi);
+-//    adapter.removeDevice(remoteDeviceUbi);
+-    return true;
+-}
+-
+-bool SolidBluetooth::bluetoothGetProperties(const QString &adapterUbi)
+-{
+-    Solid::Control::BluetoothManager &manager = Solid::Control::BluetoothManager::self();
+-    Solid::Control::BluetoothInterface adapter = manager.findBluetoothInterface(adapterUbi);
+-    QMap<QString,QVariant> props = adapter.getProperties();
+-    foreach (QString valName, props.keys()) {
+-        cout << valName << ": " << props[valName] << endl;
+-    }
+-    return true;
+-}
+-
+-
+-#if 0
+ bool SolidBluetooth::bluetoothGetRemoteName(const QString &adapterUbi, const QString &mac)
+ {
+     Solid::Control::BluetoothManager &manager = Solid::Control::BluetoothManager::self();
+@@ -749,6 +685,5 @@
+     }
+     m_loop.exit();
+ }
+-#endif
+ 
+ #include "solid-bluetooth.moc"
+diff -ur kdebase-workspace-4.2.0/solid/solidshell/solid-bluetooth.h kdebase-workspace-4.2.0-bluetooth-revert/solid/solidshell/solid-bluetooth.h
+--- kdebase-workspace-4.2.0/solid/solidshell/solid-bluetooth.h	2008-10-17 13:00:20.000000000 +0200
++++ kdebase-workspace-4.2.0-bluetooth-revert/solid/solidshell/solid-bluetooth.h	2008-04-02 14:18:23.000000000 +0200
+@@ -44,10 +44,6 @@
+ 
+     bool bluetoothListAdapters();
+     bool bluetoothDefaultAdapter();
+-    bool bluetoothCreateDevice(const QString &adapterUbi, const QString &mac);
+-    bool bluetoothRemoveDevice(const QString &adapterUbi, const QString &mac);
+-    bool bluetoothGetProperties(const QString &adapterUbi);
+-#if 0    
+     bool bluetoothGetRemoteName(const QString &adapterUbi, const QString &mac);
+     bool bluetoothAdapterAddress(const QString &ubi);
+     bool bluetoothAdapterName(const QString &ubi);
+@@ -67,7 +63,6 @@
+     bool bluetoothRemoteCreateBonding(const QString &adapterUbi, const QString &deviceUbi);
+     bool bluetoothRemoteRemoveBonding(const QString &adapterUbi, const QString &deviceUbi);
+     bool bluetoothRemoteHasBonding(const QString &adapterUbi, const QString &deviceUbi);
+-#endif
+ 
+ private:
+     void connectJob(KJob *job);
+@@ -76,14 +71,12 @@
+     int m_error;
+     QString m_errorString;
+ private slots:
+-#if 0
+     void slotStorageResult(Solid::ErrorType error, const QVariant &errorData);
+     void slotResult(KJob *job);
+     void slotPercent(KJob *job, unsigned long percent);
+     void slotInfoMessage(KJob *job, const QString &message);
+     void slotBluetoothDeviceFound(const QString &ubi, int deviceClass, int rssi);
+     void slotBluetoothDiscoveryCompleted();
+-#endif    
+ };
+ 
+ 



From rdieter at fedoraproject.org  Thu Jan 29 20:38:43 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Thu, 29 Jan 2009 20:38:43 +0000 (UTC)
Subject: rpms/kdebluetooth/devel kdebluetooth.spec,1.19,1.20
Message-ID: <20090129203843.E42A670116@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdebluetooth/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4011

Modified Files:
	kdebluetooth.spec 
Log Message:
- (Build)Requires: solid-bluetooth(-devel) >= 4.3
touchup %%files
update some cmake-fu



Index: kdebluetooth.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebluetooth/devel/kdebluetooth.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- kdebluetooth.spec	28 Jan 2009 17:57:25 -0000	1.19
+++ kdebluetooth.spec	29 Jan 2009 20:38:13 -0000	1.20
@@ -14,6 +14,9 @@
 Obsoletes:		%{name}-libs < 1:0.2
 Obsoletes:		%{name}-devel < 1:0.2
 
+# Depend on and track solid-bluetooth backport
+BuildRequires:  solid-bluetooth-devel >= 4.3
+Requires: solid-bluetooth >= 4.3
 
 %description
 The KDE Bluetooth Framework is a set of tools built on top of Linux'
@@ -27,13 +30,13 @@
 
 
 %build
-%cmake_kde4 -DCMAKE_VERBOSE_MAKEFILE=ON
+%cmake_kde4
 make %{?_smp_mflags} 
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
+make install/fast DESTDIR=$RPM_BUILD_ROOT
 
 desktop-file-install						\
 	--mode=644						\
@@ -66,13 +69,14 @@
 %{_bindir}/kbluetooth4-devicemanager
 %{_bindir}/kbluetooth4-inputwizard
 %{_datadir}/applications/kde4/kdebluetooth4.desktop
-%{_datadir}/icons/hicolor/*x*/apps/kbluetooth4.png
+%{_datadir}/icons/hicolor/*/apps/kbluetooth4*.*
 
 
 %changelog
 * Wed Jan 28 2009 Ville Skytt?? <ville.skytta at iki.fi> - 1:0.3-1
 - 0.3 (#481802).
 - http://sourceforge.net/project/shownotes.php?group_id=89888&release_id=654566
+- (Build)Requires: solid-bluetooth(-devel) >= 4.3
 
 * Mon Sep 15 2008 Gilboa Davara <gilboad [AT] gmail.com> - 0.2-3
 - Use versioned obsoletes.



From nsantos at fedoraproject.org  Thu Jan 29 20:59:45 2009
From: nsantos at fedoraproject.org (Nuno Santos)
Date: Thu, 29 Jan 2009 20:59:45 +0000 (UTC)
Subject: rpms/qpidc/devel .cvsignore, 1.15, 1.16 qpidc.spec, 1.65,
	1.66 sources, 1.33, 1.34
Message-ID: <20090129205945.9B99A70116@cvs1.fedora.phx.redhat.com>

Author: nsantos

Update of /cvs/extras/rpms/qpidc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6893

Modified Files:
	.cvsignore qpidc.spec sources 
Log Message:
Rebased to svn rev 738618


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/qpidc/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	15 Jan 2009 16:35:13 -0000	1.15
+++ .cvsignore	29 Jan 2009 20:59:15 -0000	1.16
@@ -1 +1 @@
-qpidc-0.4.734452.tar.gz
+qpidc-0.4.738618.tar.gz


Index: qpidc.spec
===================================================================
RCS file: /cvs/extras/rpms/qpidc/devel/qpidc.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- qpidc.spec	21 Jan 2009 22:05:16 -0000	1.65
+++ qpidc.spec	29 Jan 2009 20:59:15 -0000	1.66
@@ -6,8 +6,8 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           qpidc
-Version:        0.4.734452
-Release:        3%{?dist}
+Version:        0.4.738618
+Release:        1%{?dist}
 Summary:        Libraries for Qpid C++ client applications
 Group:          System Environment/Libraries
 License:        ASL 2.0
@@ -172,7 +172,7 @@
 %description perftest
 Tools for performing testing and benchmarking of MRG-Messaging
 
-%pre
+%pre -n qpidd
 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 \
@@ -266,6 +266,8 @@
 %defattr(-,root,root,-)
 %_libdir/libqpidbroker.so.0
 %_libdir/libqpidbroker.so.0.1.0
+%_libdir/qpid/daemon/replicating_listener.so
+%_libdir/qpid/daemon/replication_exchange.so
 %_sbindir/qpidd
 %config(noreplace) %_sysconfdir/qpidd.conf
 %config(noreplace) %_sysconfdir/sasl2/qpidd.conf
@@ -374,6 +376,9 @@
 %postun -n qmf -p /sbin/ldconfig
 
 %changelog
+* Wed Jan 28 2009 Nuno Santos <nsantos at redhat.com> - 0.4.738618-1
+- Rebased to svn rev 738618
+
 * Tue Jan 20 2009 Nuno Santos <nsantos at redhat.com> - 0.4.734452-3
 - BZ474614 and BZ474613 - qpidc/rhm unowned directories
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/qpidc/devel/sources,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- sources	15 Jan 2009 18:14:40 -0000	1.33
+++ sources	29 Jan 2009 20:59:15 -0000	1.34
@@ -1 +1 @@
-9c53fd669111b86f895c7be870a3486e  qpidc-0.4.734452.tar.gz
+fb7c84a7a179ee59bea66137061c4701  qpidc-0.4.738618.tar.gz



From nsantos at fedoraproject.org  Thu Jan 29 21:02:12 2009
From: nsantos at fedoraproject.org (Nuno Santos)
Date: Thu, 29 Jan 2009 21:02:12 +0000 (UTC)
Subject: rpms/ruby-qpid/F-10 .cvsignore, 1.6, 1.7 ruby-qpid.spec, 1.7,
	1.8 sources, 1.6, 1.7
Message-ID: <20090129210212.B31C970141@cvs1.fedora.phx.redhat.com>

Author: nsantos

Update of /cvs/extras/rpms/ruby-qpid/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7388

Modified Files:
	.cvsignore ruby-qpid.spec sources 
Log Message:
Rebased to svn rev 738618


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ruby-qpid/F-10/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	14 Jan 2009 21:24:44 -0000	1.6
+++ .cvsignore	29 Jan 2009 21:01:42 -0000	1.7
@@ -1 +1 @@
-ruby-qpid-0.4.734452.tar.gz
+ruby-qpid-0.4.738618.tar.gz


Index: ruby-qpid.spec
===================================================================
RCS file: /cvs/extras/rpms/ruby-qpid/F-10/ruby-qpid.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ruby-qpid.spec	14 Jan 2009 21:24:44 -0000	1.7
+++ ruby-qpid.spec	29 Jan 2009 21:01:42 -0000	1.8
@@ -1,5 +1,5 @@
 Name:           ruby-qpid
-Version:	0.4.734452
+Version:	0.4.738618
 Release:        1%{?dist}
 Summary:        Ruby language client for AMQP
 
@@ -18,7 +18,7 @@
 
 Requires:       ruby
 Requires:       ruby(abi) = 1.8
-Requires:       amqp >= 1.0.734452
+Requires:       amqp >= 1.0.738618
 
 Provides:       ruby(qpid) = %{version}
 
@@ -51,6 +51,9 @@
 %doc LICENSE.txt NOTICE.txt
 
 %changelog
+* Thu Jan 29 2009 Nuno Santos <nsantos at redhat.com> - 0.4.738618-1
+- Rebased to svn rev 738618
+
 * Wed Jan 14 2009 Nuno Santos <nsantos at redhat.com> - 0.4.734452-1
 - Rebased to svn rev 734452
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ruby-qpid/F-10/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	14 Jan 2009 21:24:44 -0000	1.6
+++ sources	29 Jan 2009 21:01:42 -0000	1.7
@@ -1 +1 @@
-4a8ef6ba2a2c4b50d100c950ce236e68  ruby-qpid-0.4.734452.tar.gz
+ce944cd296dae0178f442b71087f0a8b  ruby-qpid-0.4.738618.tar.gz



From cebbert at fedoraproject.org  Thu Jan 29 21:14:43 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Thu, 29 Jan 2009 21:14:43 +0000 (UTC)
Subject: rpms/kernel/F-10 patch-2.6.29-rc3.bz2.sign, NONE, 1.1 .cvsignore,
	1.966, 1.967 drm-modesetting-radeon.patch, 1.70,
	1.71 kernel.spec, 1.1231, 1.1232 linux-2.6-debug-taint-vm.patch,
	1.22, 1.23 linux-2.6-debug-vm-would-have-oomkilled.patch, 1.1,
	1.2 linux-2.6-defaults-pci_no_msi.patch, 1.2,
	1.3 linux-2.6-execshield.patch, 1.99,
	1.100 linux-2.6-hdpvr.patch, 1.2,
	1.3 linux-2.6-selinux-mprotect-checks.patch, 1.7,
	1.8 linux-2.6-sparc-selinux-mprotect-checks.patch, 1.1,
	1.2 linux-2.6-utrace.patch, 1.105, 1.106 sources, 1.928,
	1.929 upstream, 1.839, 1.840 disable-p4-cpufreq-ui.patch, 1.3,
	NONE iwlwifi-intel-bug-1822.patch, 1.1,
	NONE linux-2.6-net-silence-noisy-printks.patch, 1.4,
	NONE linux-2.6-olpc-speaker-out.patch, 1.3,
	NONE linux-2.6-piix3-silence-quirk.patch, 1.1,
	NONE linux-2.6-rtl8187b-tx-status-feedback.patch, 1.1,
	NONE linux-2.6-selinux-move-open-perms-check.patch, 1.1,
	NONE linux-2.6-serial.patch, 1.1, NONE linux-2.6-squashfs.patch,
	1.32, NONE linux-2.6.27-pci-hush-allocation-failures.patch, 1.3,
	NONE patch-2.6.28.2.bz2.sign, 1.1,
	NONE skip-sanity-check-of-busy-resources.patch, 1.1, NONE
Message-ID: <20090129211443.AA91970116@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9546

Modified Files:
	.cvsignore drm-modesetting-radeon.patch kernel.spec 
	linux-2.6-debug-taint-vm.patch 
	linux-2.6-debug-vm-would-have-oomkilled.patch 
	linux-2.6-defaults-pci_no_msi.patch linux-2.6-execshield.patch 
	linux-2.6-hdpvr.patch linux-2.6-selinux-mprotect-checks.patch 
	linux-2.6-sparc-selinux-mprotect-checks.patch 
	linux-2.6-utrace.patch sources upstream 
Added Files:
	patch-2.6.29-rc3.bz2.sign 
Removed Files:
	disable-p4-cpufreq-ui.patch iwlwifi-intel-bug-1822.patch 
	linux-2.6-net-silence-noisy-printks.patch 
	linux-2.6-olpc-speaker-out.patch 
	linux-2.6-piix3-silence-quirk.patch 
	linux-2.6-rtl8187b-tx-status-feedback.patch 
	linux-2.6-selinux-move-open-perms-check.patch 
	linux-2.6-serial.patch linux-2.6-squashfs.patch 
	linux-2.6.27-pci-hush-allocation-failures.patch 
	patch-2.6.28.2.bz2.sign 
	skip-sanity-check-of-busy-resources.patch 
Log Message:
Sync with rawhide 2.6.29-rc3 -- still needs config files updating.


--- NEW FILE patch-2.6.29-rc3.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBJgLHQyGugalF9Dw4RAtLhAJ9pr92MP22mBsyYTRSc+HuSA9xvhgCfTz4/
IJ9/jtVbprCGGhCLsj8A7/I=
=n0R6
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/.cvsignore,v
retrieving revision 1.966
retrieving revision 1.967
diff -u -r1.966 -r1.967
--- .cvsignore	26 Jan 2009 21:11:19 -0000	1.966
+++ .cvsignore	29 Jan 2009 21:14:10 -0000	1.967
@@ -4,4 +4,4 @@
 temp-*
 kernel-2.6.28
 linux-2.6.28.tar.bz2
-patch-2.6.28.2.bz2
+patch-2.6.29-rc3.bz2

drm-modesetting-radeon.patch:

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.70 -r 1.71 drm-modesetting-radeon.patch
Index: drm-modesetting-radeon.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/drm-modesetting-radeon.patch,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- drm-modesetting-radeon.patch	20 Jan 2009 05:11:51 -0000	1.70
+++ drm-modesetting-radeon.patch	29 Jan 2009 21:14:11 -0000	1.71
@@ -1,1496 +1,5 @@
-commit ea9f35fbb0ad27833bb78e29d1118516855fb819
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Fri Dec 19 11:01:33 2008 +1000
-
-    drm: fix problem with master enable
-
-commit 6361ff89314f0e48c6a70c71f836bcfe2a1083ee
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Thu Dec 18 23:01:12 2008 +1000
-
-    drm: don't set cached bits on pages from uncached allocator.
-    
-    This should make AGP no corrupt itself to all buggery
-
-commit 353c7a5dbb898188407d8e54fd6983a2006b16ad
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Thu Dec 11 01:35:09 2008 +1000
-
-    radeon: fix agp mode when kms isn't enabled
-
-commit 017e784508024b64217d0d4e31aa580261d83331
-Author: Dave Airlie <airlied at ppcg5.localdomain>
-Date:   Wed Dec 3 17:22:07 2008 +1100
-
-    radeon: add support for accessing disabled ROMs.
-
-commit d3c95991acabea7873a6675a6ff6d386465cf4c3
-Author: Dave Airlie <airlied at ppcg5.localdomain>
-Date:   Wed Dec 3 17:19:02 2008 +1100
-
-    radeon: make cail do pll read/write via actual PLL functions
-
-commit b842e47ab42035dad7a521b2fc8c6105c7208151
-Author: Dave Airlie <airlied at ppcg5.localdomain>
-Date:   Wed Dec 3 16:36:00 2008 +1100
-
-    radeon: atom fixes for endianness
-
-commit d948ab5e334cb9046fade3fefac793efc1290699
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Wed Dec 3 20:28:05 2008 +1000
-
-    radeon: AGP fixes round 2.
-    
-    More I can't believe its not AGP fixes.
-    Limit the AGP aperture to the GART size, and init the registers
-    in the right place
-
-commit 60a11e6a15441b1d67d09965fa389ba0373b7acd
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Tue Dec 2 12:49:17 2008 +1000
-
-    radeon: AGP fixes
-    
-    1. Proper PCIE fallback on PCIE cards.
-    2. Setup agp base + location regs properly
-
-commit 39106b8526ff66acdb2076b4623cd2bea3d28c76
-Author: Michal Schmidt <mschmidt at redhat.com>
-Date:   Tue Dec 2 08:06:59 2008 +1000
-
-    radeon: fix IGP GART calcs
-    
-    fedora bz 473895
-
-commit aaa952a952eb64206b29d61ccc128298a45d9c2b
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Fri Nov 28 09:19:47 2008 +1000
-
-    drm: cleanup exit path mess using a linked list.
-    
-    Just keep a list of devices per driver and cleanup on exit
-
-commit 0dfc2a5fffbd76713ddbbb7c126294d08c1b30e0
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Thu Nov 27 17:14:40 2008 +1000
-
-    radeon: post any GPUs that aren't posted
-
-commit c9f53c74f29866a2fadddf3b707919234fad4b80
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Mon Nov 24 15:18:31 2008 +1000
-
-    radeon: enable larger GART size on PCIE/IGP
-    
-    Allocate a larger GART on PCIE and IGP chipsets controlled by the gart_size
-    command line option.
-    
-    Default to 512MB gart.
-
-commit 7a6f7c80bae14c04a65ed4928f57f7de2b600cf3
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Mon Nov 24 15:17:49 2008 +1000
-
-    radeon: add some missing feature checks for modesetting
-
-commit 5465b46ca8abfeb61f39b8b1ca538f04b8e2fe7b
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Mon Nov 24 11:41:06 2008 +1100
-
-    radeon: make rs480/rs690 gart invalidate work properly.
-    
-    we really need to read back to make sure the invalidate has happened
-    before continuing along happily in life.
-
-commit b45ca3c31577279e17e17ccd1540c90400d175ac
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Sun Nov 23 19:19:02 2008 +1000
-
-    drm: we have discardable now so don't do special cases
-
-commit bdedddaf3f368728f377d32bf937bb03f35c7ba4
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Fri Nov 21 14:52:25 2008 +1000
-
-    atom: fix bug in parser for MC reads
-
-commit a992cf31c94ac486eb8405952161d2502f417a44
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Mon Nov 17 18:14:28 2008 +1000
-
-    radeon: turn of VRAM zeroing by default for now - needs work
-
-commit 81c801b34d01255649ef2bc231f43e7344d6ff90
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Mon Nov 17 16:59:00 2008 +1000
-
-    drm: make 800x600 be standard not 640x480
-
-commit 81e18dc62a8f0469f1ed04f694fc814a65ed72dd
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Mon Nov 17 09:03:36 2008 +1000
-
-    radeon: fix return value for no relocs
-
-commit 6054ddc84d750bb70874f4f1dcd0cd3abd8a3967
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Mon Nov 17 09:03:01 2008 +1000
-
-    ttm: add discard for VRAM buffers
-
-commit 38294b6249209590c1a6ec58918d667059b74fbf
-Author: Dave Airlie <airlied at dhcp-1-203.bne.redhat.com>
-Date:   Fri Nov 14 15:52:32 2008 +1000
-
-    drm: fix the exit path of the bo unlocking
-
-commit 61326321f05996df4a7f5c99448e381ae7f040f0
-Author: Dave Airlie <airlied at dhcp-1-203.bne.redhat.com>
-Date:   Fri Nov 14 15:51:44 2008 +1000
-
-    radeon: fixup relocate to work on locate write buffers in VRAM first.
-    
-    Fixup failure paths and make EAGAIN work
-
-commit d02319fbc7734c82c596528c77df5e4fde8d1903
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Thu Nov 13 17:22:26 2008 +1100
-
-    radeon: fix some issues since last rebase
-
-commit 14b60f40e2f00b4ad8989ad60c415f2c99a56090
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Wed Nov 12 09:01:14 2008 +1000
-
-    radeon: fix more build
-
-commit 1aa88d3221f8aac073206177cbcbca3c14aae38a
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Wed Nov 12 08:59:04 2008 +1000
-
-    radeon: fix compile
-
-commit bcac3a5b6b01a03a479e1792f2527b1043187aea
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Wed Nov 12 08:58:55 2008 +1000
-
-    i915: fix master bits
-
-commit 1bccac92f4e1a1ffdf3f9e8d1360d79265545b49
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Mon Nov 10 15:39:25 2008 +1000
-
-    radeon: fix dumbness in cp ring check
-
-commit cb2732b2fbf0d24c31ab74c7be99aa3afd6cae08
-Author: Dave Airlie <airlied at redhat.com>
-Date:   Mon Nov 10 14:26:11 2008 +1000
-
-    radeon: add gart useable size to report to userspace
-
[...13169 lines suppressed...]
- #if defined(__alpha__)
--#define SAREA_MAX                       0x2000
-+#define SAREA_MAX                       0x2000UL
- #elif defined(__ia64__)
--#define SAREA_MAX                       0x10000	/* 64kB */
-+#define SAREA_MAX                       0x10000UL	/* 64kB */
- #else
- /* Intel 830M driver needs at least 8k SAREA */
--#define SAREA_MAX                       0x2000
-+#define SAREA_MAX                       0x2000UL
- #endif
- 
- /** Maximum number of drawables in the SAREA */
 diff --git a/include/drm/i915_drm.h b/include/drm/i915_drm.h
-index 152b34d..13c91fc 100644
+index b3bcf72..181d9de 100644
 --- a/include/drm/i915_drm.h
 +++ b/include/drm/i915_drm.h
-@@ -63,7 +63,7 @@ typedef struct _drm_i915_init {
- 	unsigned int chipset;
- } drm_i915_init_t;
- 
--typedef struct _drm_i915_sarea {
-+typedef struct drm_i915_sarea {
- 	struct drm_tex_region texList[I915_NR_TEX_REGIONS + 1];
- 	int last_upload;	/* last time texture was uploaded */
- 	int last_enqueue;	/* last time a buffer was enqueued */
-@@ -105,14 +105,26 @@ typedef struct _drm_i915_sarea {
- 	unsigned int rotated_tiled;
- 	unsigned int rotated2_tiled;
- 
--	int pipeA_x;
--	int pipeA_y;
--	int pipeA_w;
--	int pipeA_h;
--	int pipeB_x;
--	int pipeB_y;
--	int pipeB_w;
--	int pipeB_h;
-+	int planeA_x;
-+	int planeA_y;
-+	int planeA_w;
-+	int planeA_h;
-+	int planeB_x;
-+	int planeB_y;
-+	int planeB_w;
-+	int planeB_h;
-+
-+	/* triple buffering - not in kernel */
-+	drm_handle_t third_handle;
-+	int third_offset;
-+	int third_size;
-+	unsigned int third_tiled;
-+
-+	/* buffer object handles for static buffers */
-+	unsigned int front_bo_handle;
-+	unsigned int back_bo_handle;
-+	unsigned int third_bo_handle;
-+	unsigned int depth_bo_handle;
- } drm_i915_sarea_t;
- 
- /* Flags for perf_boxes
-@@ -163,7 +175,7 @@ typedef struct _drm_i915_sarea {
+@@ -187,7 +187,7 @@ typedef struct _drm_i915_sarea {
  
  #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)
@@ -45303,16 +34695,7 @@
  #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)
-@@ -177,6 +189,8 @@ 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)
-+#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)
- #define DRM_IOCTL_I915_GEM_PIN		DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_GEM_PIN, struct drm_i915_gem_pin)
- #define DRM_IOCTL_I915_GEM_UNPIN	DRM_IOW(DRM_COMMAND_BASE + DRM_I915_GEM_UNPIN, struct drm_i915_gem_unpin)
- #define DRM_IOCTL_I915_GEM_BUSY		DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_GEM_BUSY, struct drm_i915_gem_busy)
-@@ -193,10 +207,22 @@ typedef struct _drm_i915_sarea {
+@@ -220,6 +220,18 @@ typedef struct _drm_i915_sarea {
  #define DRM_IOCTL_I915_GEM_GET_TILING	DRM_IOWR (DRM_COMMAND_BASE + DRM_I915_GEM_GET_TILING, struct drm_i915_gem_get_tiling)
  #define DRM_IOCTL_I915_GEM_GET_APERTURE	DRM_IOR  (DRM_COMMAND_BASE + DRM_I915_GEM_GET_APERTURE, struct drm_i915_gem_get_aperture)
  
@@ -45331,13 +34714,8 @@
  /* Allow drivers to submit batchbuffers directly to hardware, relying
   * on the security mechanisms provided by hardware.
   */
--typedef struct _drm_i915_batchbuffer {
-+typedef struct drm_i915_batchbuffer {
- 	int start;		/* agp offset */
- 	int used;		/* nr bytes in use */
- 	int DR1;		/* hw flags for GFX_OP_DRAWRECT_INFO */
 diff --git a/include/drm/radeon_drm.h b/include/drm/radeon_drm.h
-index 73ff51f..770f6f0 100644
+index 73ff51f..1f67a11 100644
 --- a/include/drm/radeon_drm.h
 +++ b/include/drm/radeon_drm.h
 @@ -453,6 +453,15 @@ typedef struct {
@@ -45356,7 +34734,7 @@
  } drm_radeon_sarea_t;
  
  /* WARNING: If you change any of these defines, make sure to change the
-@@ -493,6 +502,19 @@ typedef struct {
+@@ -493,6 +502,18 @@ typedef struct {
  #define DRM_RADEON_SURF_ALLOC 0x1a
  #define DRM_RADEON_SURF_FREE  0x1b
  
@@ -45370,13 +34748,12 @@
 +#define DRM_RADEON_GEM_SET_DOMAIN 0x23
 +#define DRM_RADEON_GEM_WAIT_RENDERING 0x24
 +
-+#define DRM_RADEON_CS           0x25
-+#define DRM_RADEON_CS2       0x26
++#define DRM_RADEON_CS       0x26
 +
  #define DRM_IOCTL_RADEON_CP_INIT    DRM_IOW( DRM_COMMAND_BASE + DRM_RADEON_CP_INIT, drm_radeon_init_t)
  #define DRM_IOCTL_RADEON_CP_START   DRM_IO(  DRM_COMMAND_BASE + DRM_RADEON_CP_START)
  #define DRM_IOCTL_RADEON_CP_STOP    DRM_IOW( DRM_COMMAND_BASE + DRM_RADEON_CP_STOP, drm_radeon_cp_stop_t)
-@@ -521,6 +543,19 @@ typedef struct {
+@@ -521,6 +542,18 @@ typedef struct {
  #define DRM_IOCTL_RADEON_SURF_ALLOC DRM_IOW( DRM_COMMAND_BASE + DRM_RADEON_SURF_ALLOC, drm_radeon_surface_alloc_t)
  #define DRM_IOCTL_RADEON_SURF_FREE  DRM_IOW( DRM_COMMAND_BASE + DRM_RADEON_SURF_FREE, drm_radeon_surface_free_t)
  
@@ -45390,21 +34767,21 @@
 +#define DRM_IOCTL_RADEON_GEM_SET_DOMAIN  DRM_IOWR(DRM_COMMAND_BASE + DRM_RADEON_GEM_SET_DOMAIN, struct drm_radeon_gem_set_domain)
 +#define DRM_IOCTL_RADEON_GEM_WAIT_RENDERING DRM_IOW(DRM_COMMAND_BASE + DRM_RADEON_GEM_WAIT_RENDERING, struct drm_radeon_gem_wait_rendering) 
 +#define DRM_IOCTL_RADEON_CS DRM_IOWR(DRM_COMMAND_BASE + DRM_RADEON_CS, struct drm_radeon_cs)
-+#define DRM_IOCTL_RADEON_CS2 DRM_IOWR(DRM_COMMAND_BASE + DRM_RADEON_CS2, struct drm_radeon_cs2)
 +
 +
  typedef struct drm_radeon_init {
  	enum {
  		RADEON_INIT_CP = 0x01,
-@@ -677,6 +712,7 @@ typedef struct drm_radeon_indirect {
+@@ -677,6 +710,8 @@ typedef struct drm_radeon_indirect {
  #define RADEON_PARAM_VBLANK_CRTC           13   /* VBLANK CRTC */
  #define RADEON_PARAM_FB_LOCATION           14   /* FB location */
  #define RADEON_PARAM_NUM_GB_PIPES          15   /* num GB pipes */
 +#define RADEON_PARAM_KERNEL_MM             16
++#define RADEON_PARAM_DEVICE_ID		   17
  
  typedef struct drm_radeon_getparam {
  	int param;
-@@ -731,6 +767,7 @@ typedef struct drm_radeon_setparam {
+@@ -731,6 +766,7 @@ typedef struct drm_radeon_setparam {
  #define RADEON_SETPARAM_NEW_MEMMAP 4		/* Use new memory map */
  #define RADEON_SETPARAM_PCIGART_TABLE_SIZE 5    /* PCI GART Table Size */
  #define RADEON_SETPARAM_VBLANK_CRTC 6           /* VBLANK CRTC */
@@ -45412,7 +34789,7 @@
  /* 1.14: Clients can allocate/free a surface
   */
  typedef struct drm_radeon_surface_alloc {
-@@ -746,4 +783,114 @@ typedef struct drm_radeon_surface_free {
+@@ -746,4 +782,106 @@ typedef struct drm_radeon_surface_free {
  #define	DRM_RADEON_VBLANK_CRTC1		1
  #define	DRM_RADEON_VBLANK_CRTC2		2
  
@@ -45500,14 +34877,6 @@
 +
 +/* New interface which obsolete all previous interface.
 + */
-+
-+
-+struct drm_radeon_cs {
-+	uint32_t            dwords;
-+	uint32_t            cs_id;
-+	uint64_t            packets;
-+};
-+
 +#define RADEON_CHUNK_ID_RELOCS 0x01
 +#define RADEON_CHUNK_ID_IB     0x02
 +#define RADEON_CHUNK_ID_OLD 0xff
@@ -45518,7 +34887,7 @@
 +	uint64_t chunk_data;
 +};
 +
-+struct drm_radeon_cs2 {
++struct drm_radeon_cs {
 +	uint32_t	num_chunks;
 +	uint32_t        cs_id;
 +	uint64_t	chunks; /* this points to uint64_t * which point to
@@ -45527,16 +34896,3 @@
 +
 +
  #endif
-diff --git a/include/linux/console.h b/include/linux/console.h
-index 248e6e3..a67a90c 100644
---- a/include/linux/console.h
-+++ b/include/linux/console.h
-@@ -153,4 +153,8 @@ void vcs_remove_sysfs(struct tty_struct *tty);
- #define VESA_HSYNC_SUSPEND      2
- #define VESA_POWERDOWN          3
- 
-+#ifdef CONFIG_VGA_CONSOLE
-+extern bool vgacon_text_force(void);
-+#endif
-+
- #endif /* _LINUX_CONSOLE_H */


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/kernel.spec,v
retrieving revision 1.1231
retrieving revision 1.1232
diff -u -r1.1231 -r1.1232
--- kernel.spec	27 Jan 2009 03:54:02 -0000	1.1231
+++ kernel.spec	29 Jan 2009 21:14:11 -0000	1.1232
@@ -3,7 +3,7 @@
 # For a stable, released kernel, released_kernel should be 1. For rawhide
 # and/or a kernel built from an rc or git snapshot, released_kernel should
 # be 0.
-%define released_kernel 1
+%define released_kernel 0
 
 # Versions of various parts
 
@@ -20,7 +20,7 @@
 # kernel spec when the kernel is rebased, so fedora_build automatically
 # works out to the offset from the rebase, so it doesn't get too ginormous.
 #
-%define fedora_cvs_origin   1207
+%define fedora_cvs_origin   1230
 %define fedora_build_string %(R="$Revision$"; R="${R%% \$}"; R="${R#: 1.}"; echo $R)
 %define fedora_build_origin %(R=%{fedora_build_string}; R="${R%%%%.*}"; echo $R)
 %define fedora_build_prefix %(expr %{fedora_build_origin} - %{fedora_cvs_origin})
@@ -55,7 +55,7 @@
 # The next upstream release sublevel (base_sublevel+1)
 %define upstream_sublevel %(expr %{base_sublevel} + 1)
 # The rc snapshot level
-%define rcrev 0
+%define rcrev 3
 # The git snapshot level
 %define gitrev 0
 # Set rpm version accordingly
@@ -614,22 +614,17 @@
 Patch390: linux-2.6-defaults-acpi-video.patch
 Patch391: linux-2.6-acpi-video-dos.patch
 Patch400: linux-2.6-scsi-cpqarray-set-master.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
 Patch460: linux-2.6-serial-460800.patch
 Patch510: linux-2.6-silence-noise.patch
 Patch530: linux-2.6-silence-fbcon-logo.patch
 Patch570: linux-2.6-selinux-mprotect-checks.patch
 Patch580: linux-2.6-sparc-selinux-mprotect-checks.patch
-Patch590: linux-2.6-selinux-move-open-perms-check.patch
 
 Patch600: linux-2.6-defaults-alsa-hda-beep-off.patch
 
 Patch670: linux-2.6-ata-quirk.patch
 
-Patch680: iwlwifi-intel-bug-1822.patch
-Patch681: linux-2.6-rtl8187b-tx-status-feedback.patch
 Patch682: linux-2.6-rt2x00-asus-leds.patch
 
 Patch690: linux-2.6-at76.patch
@@ -659,28 +654,14 @@
 Patch2030: linux-2.6-net-tulip-interrupt.patch
 
 # olpc fixes
-Patch2040: linux-2.6-olpc-speaker-out.patch
-
-# Fix serial header so things can compile (#476327)
-Patch2050: linux-2.6-serial.patch
 
 # linux1394 git patches
 Patch2200: linux-2.6-firewire-git-update.patch
 Patch2201: linux-2.6-firewire-git-pending.patch
 
 # Quiet boot fixes
-# silence piix3 in quiet boot (ie, qemu)
-Patch2800: linux-2.6-piix3-silence-quirk.patch
 # silence the ACPI blacklist code
 Patch2802: linux-2.6-silence-acpi-blacklist.patch
-# hush pci bar allocation failures
-Patch2804: linux-2.6.27-pci-hush-allocation-failures.patch
-
-# Provide P4 clock modulation in-kernel for thermal reasons, but don't expose
-# ui
-Patch3130: disable-p4-cpufreq-ui.patch
-
-Patch9000: skip-sanity-check-of-busy-resources.patch
 
 %endif
 
@@ -1079,9 +1060,6 @@
 # bugfixes to drivers and filesystems
 #
 
-# Squashfs
-ApplyPatch linux-2.6-squashfs.patch
-
 # ext4
 
 # xfs
@@ -1109,9 +1087,9 @@
 # disable message signaled interrupts
 ApplyPatch linux-2.6-defaults-pci_no_msi.patch
 # update the pciehp driver
-ApplyPatch linux-2.6-pciehp-update.patch
+#ApplyPatch linux-2.6-pciehp-update.patch
 # default to enabling passively listening for hotplug events
-ApplyPatch linux-2.6-defaults-pciehp.patch
+#ApplyPatch linux-2.6-defaults-pciehp.patch
 
 #
 # SCSI Bits.
@@ -1122,8 +1100,6 @@
 # ALSA
 
 # Networking
-# Disable easy to trigger printk's.
-ApplyPatch linux-2.6-net-silence-noisy-printks.patch
 
 # Misc fixes
 # The input layer spews crap no-one cares about.
@@ -1141,8 +1117,6 @@
 ApplyPatch linux-2.6-selinux-mprotect-checks.patch
 # Fix SELinux for sparc
 ApplyPatch linux-2.6-sparc-selinux-mprotect-checks.patch
-# SELinux: check open perms in dentry_open not inode_permission
-ApplyPatch linux-2.6-selinux-move-open-perms-check.patch
 
 # Changes to upstream defaults.
 
@@ -1152,12 +1126,6 @@
 # ia64 ata quirk
 ApplyPatch linux-2.6-ata-quirk.patch
 
-# iwlwifi: avoid rs_get_rate warnings
-ApplyPatch iwlwifi-intel-bug-1822.patch
-
-# rtl8187: feedback transmitted packets using tx close descriptor for 8187B
-ApplyPatch linux-2.6-rtl8187b-tx-status-feedback.patch
-
 # rt2x00: back-port activity LED init patches
 ApplyPatch linux-2.6-rt2x00-asus-leds.patch
 
@@ -1165,8 +1133,8 @@
 ApplyPatch linux-2.6-at76.patch
 
 # Webcam patches
-ApplyPatch linux-2.6-gspca-git.patch
-ApplyPatch linux-2.6-gspca-stv06xx-git.patch
+#ApplyPatch linux-2.6-gspca-git.patch
+#ApplyPatch linux-2.6-gspca-stv06xx-git.patch
 
 # http://www.lirc.org/
 ApplyPatch linux-2.6.27-lirc.patch
@@ -1184,10 +1152,6 @@
 
 ApplyPatch linux-2.6-net-tulip-interrupt.patch
 
-ApplyPatch linux-2.6-olpc-speaker-out.patch
-
-ApplyPatch linux-2.6-serial.patch
-
 # Nouveau DRM + drm fixes
 ApplyPatch drm-modesetting-radeon.patch
 ApplyPatch drm-nouveau.patch
@@ -1199,17 +1163,8 @@
 ApplyPatch linux-2.6-firewire-git-pending.patch
 fi
 
-# silence piix3 in quiet boot (ie, qemu)
-ApplyPatch linux-2.6-piix3-silence-quirk.patch
 # silence the ACPI blacklist code
 ApplyPatch linux-2.6-silence-acpi-blacklist.patch
-# hush pci bar allocation failures
-ApplyPatch linux-2.6.27-pci-hush-allocation-failures.patch
-
-ApplyPatch disable-p4-cpufreq-ui.patch
-
-# fix #480700, acpi ec ioremap WARN_ON
-ApplyPatch skip-sanity-check-of-busy-resources.patch
 
 # END OF PATCH APPLICATIONS
 
@@ -1787,6 +1742,9 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Thu Jan 29 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.29-0.2.rc3
+- Sync with rawhide 2.6.29-rc3 -- still needs config files updating.
+
 * Mon Jan 26 2009 Kyle McMartin <kyle at redhat.com> 2.6.28.2-24
 - add skip-sanity-check-of-busy-resources.patch, fixes #480700, ioremap
   sanity check WARN_ON due to acpi ec.

linux-2.6-debug-taint-vm.patch:

Index: linux-2.6-debug-taint-vm.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/linux-2.6-debug-taint-vm.patch,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- linux-2.6-debug-taint-vm.patch	12 Jan 2009 19:51:28 -0000	1.22
+++ linux-2.6-debug-taint-vm.patch	29 Jan 2009 21:14:11 -0000	1.23
@@ -1,8 +1,8 @@
 diff --git a/kernel/panic.c b/kernel/panic.c
-index 4d50883..f4a6faa 100644
+index 2a2ff36..361d852 100644
 --- a/kernel/panic.c
 +++ b/kernel/panic.c
-@@ -193,6 +193,7 @@ const char *print_tainted(void)
+@@ -194,6 +194,7 @@ const char *print_tainted(void)
  		snprintf(buf, sizeof(buf), "Not tainted");
  	return(buf);
  }
@@ -10,7 +10,7 @@
  
  int test_taint(unsigned flag)
  {
-@@ -328,8 +329,8 @@ void warn_on_slowpath(const char *file, int line)
+@@ -334,8 +335,8 @@ void warn_slowpath(const char *file, int line, const char *fmt, ...)
  	sprint_symbol(function, caller);
  
  	printk(KERN_WARNING "------------[ cut here ]------------\n");
@@ -18,28 +18,28 @@
 -		line, function);
 +	printk(KERN_WARNING "WARNING: at %s:%d %s() (%s)\n", file,
 +		line, function, print_tainted());
- 	print_modules();
- 	dump_stack();
- 	print_oops_end_marker();
+ 	board = dmi_get_system_info(DMI_PRODUCT_NAME);
+ 	if (board)
+ 		printk(KERN_WARNING "Hardware name: %s\n", board);
 diff --git a/mm/page_alloc.c b/mm/page_alloc.c
-index d8ac014..1d035f0 100644
+index 5675b30..ae3e7ff 100644
 --- a/mm/page_alloc.c
 +++ b/mm/page_alloc.c
-@@ -224,10 +224,10 @@ static inline int bad_range(struct zone *zone, struct page *page)
- static void bad_page(struct page *page)
- {
- 	printk(KERN_EMERG "Bad page state in process '%s'\n" KERN_EMERG
--		"page:%p flags:0x%0*lx mapping:%p mapcount:%d count:%d\n",
-+		"page:%p flags:0x%0*lx mapping:%p mapcount:%d count:%d (%s)\n",
- 		current->comm, page, (int)(2*sizeof(unsigned long)),
- 		(unsigned long)page->flags, page->mapping,
--		page_mapcount(page), page_count(page));
-+		page_mapcount(page), page_count(page), print_tainted());
+@@ -250,9 +250,10 @@ static void bad_page(struct page *page)
+ 	printk(KERN_ALERT "BUG: Bad page state in process %s  pfn:%05lx\n",
+ 		current->comm, page_to_pfn(page));
+ 	printk(KERN_ALERT
+-		"page:%p flags:%p count:%d mapcount:%d mapping:%p index:%lx\n",
++		"page:%p flags:%p count:%d mapcount:%d mapping:%p ",
+ 		page, (void *)page->flags, page_count(page),
+-		page_mapcount(page), page->mapping, page->index);
++		page_mapcount(page), page->mapping);
++	printk(KERN_CONT "index:%lx (%s)\n", page->index, print_tainted());
  
- 	printk(KERN_EMERG "Trying to fix it up, but a reboot is needed\n"
- 		KERN_EMERG "Backtrace:\n");
+ 	dump_stack();
+ out:
 diff --git a/mm/slab.c b/mm/slab.c
-index 0918751..0977a03 100644
+index ddc41f3..bf54397 100644
 --- a/mm/slab.c
 +++ b/mm/slab.c
 @@ -1858,8 +1858,8 @@ static void check_poison_obj(struct kmem_cache *cachep, void *objp)
@@ -53,7 +53,7 @@
  				print_objinfo(cachep, objp, 0);
  			}
  			/* Hexdump the affected line */
-@@ -2928,8 +2928,8 @@ static void check_slabp(struct kmem_cache *cachep, struct slab *slabp)
+@@ -2930,8 +2930,8 @@ static void check_slabp(struct kmem_cache *cachep, struct slab *slabp)
  	if (entries != cachep->num - slabp->inuse) {
  bad:
  		printk(KERN_ERR "slab: Internal list corruption detected in "
@@ -65,10 +65,10 @@
  		     i < sizeof(*slabp) + cachep->num * sizeof(kmem_bufctl_t);
  		     i++) {
 diff --git a/mm/slub.c b/mm/slub.c
-index 749588a..0ef64f1 100644
+index 6392ae5..4f6acce 100644
 --- a/mm/slub.c
 +++ b/mm/slub.c
-@@ -430,7 +430,7 @@ static void slab_bug(struct kmem_cache *s, char *fmt, ...)
+@@ -435,7 +435,7 @@ static void slab_bug(struct kmem_cache *s, char *fmt, ...)
  	va_end(args);
  	printk(KERN_ERR "========================================"
  			"=====================================\n");

linux-2.6-debug-vm-would-have-oomkilled.patch:

Index: linux-2.6-debug-vm-would-have-oomkilled.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/linux-2.6-debug-vm-would-have-oomkilled.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-debug-vm-would-have-oomkilled.patch	29 Mar 2008 19:03:01 -0000	1.1
+++ linux-2.6-debug-vm-would-have-oomkilled.patch	29 Jan 2009 21:14:11 -0000	1.2
@@ -29,12 +29,12 @@
 index f255eda..3335a94 100644
 --- a/mm/oom_kill.c
 +++ b/mm/oom_kill.c
-@@ -30,6 +30,7 @@
+@@ -31,6 +31,7 @@
  int sysctl_panic_on_oom;
  int sysctl_oom_kill_allocating_task;
  int sysctl_oom_dump_tasks;
 +int sysctl_would_have_oomkilled;
- static DEFINE_SPINLOCK(zone_scan_mutex);
+ static DEFINE_SPINLOCK(zone_scan_lock);
  /* #define DEBUG */
  
 @@ -321,6 +322,12 @@ static void __oom_kill_task(struct task_struct *p, int verbose)

linux-2.6-defaults-pci_no_msi.patch:

Index: linux-2.6-defaults-pci_no_msi.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/linux-2.6-defaults-pci_no_msi.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- linux-2.6-defaults-pci_no_msi.patch	12 Jan 2009 19:51:29 -0000	1.2
+++ linux-2.6-defaults-pci_no_msi.patch	29 Jan 2009 21:14:11 -0000	1.3
@@ -25,9 +25,9 @@
  
  /* Arch hooks */
  
-@@ -755,6 +755,11 @@ void pci_no_msi(void)
- 	pci_msi_enable = 0;
+@@ -788,6 +788,11 @@ int pci_msi_enabled(void)
  }
+ EXPORT_SYMBOL(pci_msi_enabled);
  
 +void pci_yes_msi(void)
 +{
@@ -50,20 +50,17 @@
  			} else if (!strcmp(str, "noaer")) {
  				pci_no_aer();
  			} else if (!strcmp(str, "nodomains")) {
-diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h
-index 9de87e9..c0327e7 100644
---- a/drivers/pci/pci.h
-+++ b/drivers/pci/pci.h
-@@ -97,10 +97,12 @@ extern unsigned int pci_pm_d3_delay;
+--- linux-2.6.28.noarch/drivers/pci/pci.h~	2009-01-08 09:45:35.000000000 -0500
++++ linux-2.6.28.noarch/drivers/pci/pci.h	2009-01-08 09:45:49.000000000 -0500
+@@ -105,9 +105,11 @@ extern unsigned int pci_pm_d3_delay;
  
  #ifdef CONFIG_PCI_MSI
  void pci_no_msi(void);
 +void pci_yes_msi(void);
  extern void pci_msi_init_pci_dev(struct pci_dev *dev);
- extern void __devinit msi_init(void);
  #else
  static inline void pci_no_msi(void) { }
 +static inline void pci_yes_msi(void) { }
  static inline void pci_msi_init_pci_dev(struct pci_dev *dev) { }
- static inline void msi_init(void) { }
  #endif
+ 

linux-2.6-execshield.patch:

Index: linux-2.6-execshield.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/linux-2.6-execshield.patch,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -r1.99 -r1.100
--- linux-2.6-execshield.patch	19 Jan 2009 06:21:32 -0000	1.99
+++ linux-2.6-execshield.patch	29 Jan 2009 21:14:11 -0000	1.100
@@ -1,5 +1,5 @@
 diff --git a/arch/x86/include/asm/desc.h b/arch/x86/include/asm/desc.h
-index e6b82b1..aea00b6 100644
+index dc27705..34ed3a2 100644
 --- a/arch/x86/include/asm/desc.h
 +++ b/arch/x86/include/asm/desc.h
 @@ -6,6 +6,7 @@
@@ -20,7 +20,7 @@
  
  #define write_ldt_entry(dt, entry, desc)	\
  	native_write_ldt_entry(dt, entry, desc)
-@@ -381,6 +385,27 @@ static inline void set_system_intr_gate_ist(int n, void *addr, unsigned ist)
+@@ -379,6 +383,27 @@ static inline void set_system_intr_gate_ist(int n, void *addr, unsigned ist)
  	_set_gate(n, GATE_INTERRUPT, addr, 0x3, ist, __KERNEL_CS);
  }
  
@@ -37,11 +37,11 @@
 +	get_cpu_gdt_table(cpu)[GDT_ENTRY_DEFAULT_USER_CS] = (mm)->context.user_cs;
 +}
 +
-+#define arch_add_exec_range	arch_add_exec_range
++#define arch_add_exec_range arch_add_exec_range
++#define arch_remove_exec_range arch_remove_exec_range
++#define arch_flush_exec_range arch_flush_exec_range
 +extern void arch_add_exec_range(struct mm_struct *mm, unsigned long limit);
-+#define arch_remove_exec_range	arch_remove_exec_range
 +extern void arch_remove_exec_range(struct mm_struct *mm, unsigned long limit);
-+#define arch_flush_exec_range	arch_flush_exec_range
 +extern void arch_flush_exec_range(struct mm_struct *mm);
 +#endif /* CONFIG_X86_32 */
 +
@@ -100,10 +100,10 @@
  {
  	PVOP_VCALL1(pv_cpu_ops.store_gdt, dtr);
 diff --git a/arch/x86/include/asm/processor.h b/arch/x86/include/asm/processor.h
-index 5ca01e3..4f319b1 100644
+index 091cd88..b1a6f6d 100644
 --- a/arch/x86/include/asm/processor.h
 +++ b/arch/x86/include/asm/processor.h
-@@ -154,6 +154,9 @@ static inline int hlt_works(int cpu)
+@@ -158,6 +158,9 @@ static inline int hlt_works(int cpu)
  
  #define cache_line_size()	(boot_cpu_data.x86_cache_alignment)
  
@@ -114,10 +114,10 @@
  
  extern struct pt_regs *idle_regs(struct pt_regs *);
 diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c
-index b9c9ea0..666dd0e 100644
+index 83492b1..a84c787 100644
 --- a/arch/x86/kernel/cpu/common.c
 +++ b/arch/x86/kernel/cpu/common.c
-@@ -687,6 +687,21 @@ static void __cpuinit identify_cpu(struct cpuinfo_x86 *c)
+@@ -708,6 +708,21 @@ static void __cpuinit identify_cpu(struct cpuinfo_x86 *c)
  	 * we do "generic changes."
  	 */
  
@@ -154,19 +154,19 @@
  	.load_idt = native_load_idt,
  	.store_gdt = native_store_gdt,
 diff --git a/arch/x86/kernel/process_32.c b/arch/x86/kernel/process_32.c
-index 0a1302f..7d5927e 100644
+index a546f55..f180caf 100644
 --- a/arch/x86/kernel/process_32.c
 +++ b/arch/x86/kernel/process_32.c
-@@ -345,6 +345,8 @@ int copy_thread(int nr, unsigned long clone_flags, unsigned long sp,
+@@ -346,6 +346,8 @@ int copy_thread(int nr, unsigned long clone_flags, unsigned long sp,
  void
  start_thread(struct pt_regs *regs, unsigned long new_ip, unsigned long new_sp)
  {
 +	int cpu;
 +
- 	__asm__("movl %0, %%gs" :: "r"(0));
+ 	__asm__("movl %0, %%gs" : : "r"(0));
  	regs->fs		= 0;
  	set_fs(USER_DS);
-@@ -354,6 +356,11 @@ start_thread(struct pt_regs *regs, unsigned long new_ip, unsigned long new_sp)
+@@ -355,6 +357,11 @@ start_thread(struct pt_regs *regs, unsigned long new_ip, unsigned long new_sp)
  	regs->cs		= __USER_CS;
  	regs->ip		= new_ip;
  	regs->sp		= new_sp;
@@ -178,7 +178,7 @@
  	/*
  	 * Free the old FP and other extended state
  	 */
-@@ -558,7 +565,8 @@ struct task_struct * __switch_to(struct task_struct *prev_p, struct task_struct
+@@ -522,7 +529,8 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
  	/* never put a printk in __switch_to... printk() calls wake_up*() indirectly */
  
  	__unlazy_fpu(prev_p);
@@ -188,7 +188,7 @@
  
  	/* we're going to use this soon, after a few expensive things */
  	if (next_p->fpu_counter > 5)
-@@ -731,3 +739,39 @@ unsigned long arch_randomize_brk(struct mm_struct *mm)
+@@ -695,3 +703,41 @@ unsigned long arch_randomize_brk(struct mm_struct *mm)
  	unsigned long range_end = mm->brk + 0x02000000;
  	return randomize_range(mm->brk, range_end, 0) ? : mm->brk;
  }
@@ -198,7 +198,9 @@
 +	mm->context.exec_limit = limit;
 +	set_user_cs(&mm->context.user_cs, limit);
 +	if (mm == current->mm) {
-+		int cpu = get_cpu();
++		int cpu;
++
++		cpu = get_cpu();
 +		load_user_cs_desc(cpu, mm);
 +		put_cpu();
 +	}
@@ -229,7 +231,7 @@
 +	set_user_cs(&mm->context.user_cs, 0);
 +}
 diff --git a/arch/x86/kernel/tlb_32.c b/arch/x86/kernel/tlb_32.c
-index f4049f3..e7a1b7c 100644
+index ce50546..bd6593a 100644
 --- a/arch/x86/kernel/tlb_32.c
 +++ b/arch/x86/kernel/tlb_32.c
 @@ -2,6 +2,7 @@
@@ -240,7 +242,7 @@
  #include <asm/tlbflush.h>
  
  DEFINE_PER_CPU(struct tlb_state, cpu_tlbstate)
-@@ -92,6 +93,8 @@ void smp_invalidate_interrupt(struct pt_regs *regs)
+@@ -91,6 +92,8 @@ void smp_invalidate_interrupt(struct pt_regs *regs)
  	unsigned long cpu;
  
  	cpu = get_cpu();
@@ -250,17 +252,17 @@
  	if (!cpu_isset(cpu, flush_cpumask))
  		goto out;
 diff --git a/arch/x86/kernel/traps.c b/arch/x86/kernel/traps.c
-index 04d242a..e478f3b 100644
+index 98c2d05..db483ea 100644
 --- a/arch/x86/kernel/traps.c
 +++ b/arch/x86/kernel/traps.c
-@@ -159,6 +159,74 @@ static int lazy_iobitmap_copy(void)
+@@ -154,6 +154,76 @@ static int lazy_iobitmap_copy(void)
  
  	return 0;
  }
 +
 +static inline int
-+__compare_user_cs_desc(const struct desc_struct * const desc1,
-+	const struct desc_struct * const desc2)
++__compare_user_cs_desc(const struct desc_struct *desc1,
++	const struct desc_struct *desc2)
 +{
 +	return ((desc1->limit0 != desc2->limit0) ||
 +		(desc1->limit != desc2->limit) ||
@@ -313,11 +315,13 @@
 +		 */
 +		if (print_fatal_signals >= 2) {
 +			printk(KERN_ERR "#GPF fixup (%ld[seg:%lx]) at %08lx, CPU#%d.\n",
-+				error_code, error_code/8, regs->ip, cpu);
++				error_code, error_code/8, regs->ip,
++				smp_processor_id());
 +			printk(KERN_ERR "exec_limit: %08lx, user_cs: %08x/%08x, CPU_cs: %08x/%08x.\n",
 +				current->mm->context.exec_limit,
 +				desc1->a, desc1->b, desc2->a, desc2->b);
 +		}
++
 +		load_user_cs_desc(cpu, current->mm);
 +
 +		return 1;
@@ -328,7 +332,7 @@
  #endif
  
  static void __kprobes
-@@ -320,6 +388,29 @@ do_general_protection(struct pt_regs *regs, long error_code)
+@@ -317,6 +387,29 @@ do_general_protection(struct pt_regs *regs, long error_code)
  	if (!user_mode(regs))
  		goto gp_in_kernel;
  
@@ -346,7 +350,7 @@
 +
 +	if (print_fatal_signals) {
 +		printk(KERN_ERR "#GPF(%ld[seg:%lx]) at %08lx, CPU#%d.\n",
-+			error_code, error_code/8, regs->ip, cpu);
++			error_code, error_code/8, regs->ip, smp_processor_id());
 +		printk(KERN_ERR "exec_limit: %08lx, user_cs: %08x/%08x.\n",
 +			current->mm->context.exec_limit,
 +			current->mm->context.user_cs.a,
@@ -358,7 +362,7 @@
  	tsk->thread.error_code = error_code;
  	tsk->thread.trap_no = 13;
  
-@@ -931,19 +1022,37 @@ do_device_not_available(struct pt_regs *regs, long error)
+@@ -923,19 +1016,37 @@ do_device_not_available(struct pt_regs *regs, long error)
  }
  
  #ifdef CONFIG_X86_32
@@ -406,10 +410,10 @@
  #endif
  
 diff --git a/arch/x86/mm/init_32.c b/arch/x86/mm/init_32.c
-index c483f42..8c3bbd9 100644
+index 88f1b10..1e31b5e 100644
 --- a/arch/x86/mm/init_32.c
 +++ b/arch/x86/mm/init_32.c
-@@ -570,7 +570,7 @@ static int disable_nx __initdata;
+@@ -575,7 +575,7 @@ static int disable_nx __initdata;
   * Control non executable mappings.
   *
   * on      Enable
@@ -418,7 +422,7 @@
   */
  static int __init noexec_setup(char *str)
  {
-@@ -579,14 +579,12 @@ static int __init noexec_setup(char *str)
+@@ -584,14 +584,12 @@ static int __init noexec_setup(char *str)
  			__supported_pte_mask |= _PAGE_NX;
  			disable_nx = 0;
  		}
@@ -439,7 +443,7 @@
  
  	return 0;
  }
-@@ -845,7 +843,11 @@ unsigned long __init_refok init_memory_mapping(unsigned long start,
+@@ -850,7 +848,11 @@ unsigned long __init_refok init_memory_mapping(unsigned long start,
  	set_nx();
  	if (nx_enabled)
  		printk(KERN_INFO "NX (Execute Disable) protection: active\n");
@@ -473,10 +477,10 @@
  	}
  }
 diff --git a/arch/x86/vdso/vdso32-setup.c b/arch/x86/vdso/vdso32-setup.c
-index 513f330..2fb420a 100644
+index 1241f11..3f2c44c 100644
 --- a/arch/x86/vdso/vdso32-setup.c
 +++ b/arch/x86/vdso/vdso32-setup.c
-@@ -331,7 +331,7 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int exstack)
+@@ -331,7 +331,7 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
  	if (compat)
  		addr = VDSO_HIGH_BASE;
  	else {
@@ -486,10 +490,10 @@
  			ret = addr;
  			goto up_fail;
 diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c
-index 5e4686d..b41f314 100644
+index bea2152..d750141 100644
 --- a/arch/x86/xen/enlighten.c
 +++ b/arch/x86/xen/enlighten.c
-@@ -315,6 +315,24 @@ static void xen_set_ldt(const void *addr, unsigned entries)
+@@ -316,6 +316,24 @@ static void xen_set_ldt(const void *addr, unsigned entries)
  	xen_mc_issue(PARAVIRT_LAZY_CPU);
  }
  
@@ -514,7 +518,7 @@
  static void xen_load_gdt(const struct desc_ptr *dtr)
  {
  	unsigned long *frames;
-@@ -1231,6 +1249,9 @@ static const struct pv_cpu_ops xen_cpu_ops __initdata = {
+@@ -1232,6 +1250,9 @@ static const struct pv_cpu_ops xen_cpu_ops __initdata = {
  
  	.load_tr_desc = paravirt_nop,
  	.set_ldt = xen_set_ldt,
@@ -525,7 +529,7 @@
  	.load_idt = xen_load_idt,
  	.load_tls = xen_load_tls,
 diff --git a/fs/binfmt_elf.c b/fs/binfmt_elf.c
-index 8fcfa39..5e1e2d8 100644
+index e3ff2b9..d46dcf2 100644
 --- a/fs/binfmt_elf.c
 +++ b/fs/binfmt_elf.c
 @@ -80,7 +80,7 @@ static struct linux_binfmt elf_format = {
@@ -537,7 +541,7 @@
  
  static int set_brk(unsigned long start, unsigned long end)
  {
-@@ -723,6 +723,11 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs)
+@@ -735,6 +735,11 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs)
  			break;
  		}
  
@@ -549,7 +553,7 @@
  	/* Some simple consistency checks for the interpreter */
  	if (elf_interpreter) {
  		retval = -ELIBBAD;
-@@ -742,6 +747,15 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs)
+@@ -754,6 +759,15 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs)
  	if (retval)
  		goto out_free_dentry;
  
@@ -565,7 +569,7 @@
  	/* OK, This is the point of no return */
  	current->flags &= ~PF_FORKNOEXEC;
  	current->mm->def_flags = def_flags;
-@@ -749,7 +763,8 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs)
+@@ -761,7 +775,8 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs)
  	/* Do this immediately, since STACK_TOP as used in setup_arg_pages
  	   may depend on the personality.  */
  	SET_PERSONALITY(loc->elf_ex);
@@ -575,7 +579,7 @@
  		current->personality |= READ_IMPLIES_EXEC;
  
  	if (!(current->personality & ADDR_NO_RANDOMIZE) && randomize_va_space)
-@@ -914,7 +929,7 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs)
+@@ -926,7 +941,7 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs)
  					    interpreter,
  					    &interp_map_addr,
  					    load_bias);
@@ -585,18 +589,21 @@
  			 * load_elf_interp() returns relocation
  			 * adjustment
 diff --git a/fs/proc/array.c b/fs/proc/array.c
-index 6af7fba..bb98552 100644
+index 7e4877d..0c368c1 100644
 --- a/fs/proc/array.c
 +++ b/fs/proc/array.c
-@@ -412,8 +412,13 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
+@@ -424,8 +424,16 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
  		unlock_task_sighand(task, &flags);
  	}
  
 -	if (!whole || num_threads < 2)
 -		wchan = get_wchan(task);
 +	if (!whole || num_threads < 2) {
++		const struct cred *cred;
++
 +		wchan = 0;
-+		if (current->uid == task->uid || current->euid == task->uid ||
++		cred = __task_cred(task);
++		if (current_uid() == cred->uid || current_euid() == cred->uid ||
 +			capable(CAP_SYS_NICE))
 +				wchan = get_wchan(task);
 +	}
@@ -605,10 +612,10 @@
  		min_flt = task->min_flt;
  		maj_flt = task->maj_flt;
 diff --git a/include/linux/mm.h b/include/linux/mm.h
-index ffee2f7..c14817b 100644
+index e8ddc98..bf87f4a 100644
 --- a/include/linux/mm.h
 +++ b/include/linux/mm.h
-@@ -1105,7 +1105,13 @@ extern int install_special_mapping(struct mm_struct *mm,
+@@ -1122,7 +1122,13 @@ extern int install_special_mapping(struct mm_struct *mm,
  				   unsigned long addr, unsigned long len,
  				   unsigned long flags, struct page **pages);
  
@@ -624,10 +631,10 @@
  extern unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
  	unsigned long len, unsigned long prot,
 diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h
-index fe82547..8007dbf 100644
+index 92915e8..4bfd050 100644
 --- a/include/linux/mm_types.h
 +++ b/include/linux/mm_types.h
-@@ -177,6 +177,9 @@ struct mm_struct {
+@@ -194,6 +194,9 @@ struct mm_struct {
  	unsigned long (*get_unmapped_area) (struct file *filp,
  				unsigned long addr, unsigned long len,
  				unsigned long pgoff, unsigned long flags);
@@ -655,12 +662,12 @@
  /*
   * GPG2 wants 64kB of mlocked memory, to make sure pass phrases
 diff --git a/include/linux/sched.h b/include/linux/sched.h
-index 55e30d1..d400ab0 100644
+index 4cae9b8..71fe593 100644
 --- a/include/linux/sched.h
 +++ b/include/linux/sched.h
-@@ -97,6 +97,9 @@ struct futex_pi_state;
- struct robust_list_head;
+@@ -98,6 +98,9 @@ struct robust_list_head;
  struct bio;
+ struct bts_tracer;
  
 +extern int exec_shield;
 +extern int print_fatal_signals;
@@ -668,7 +675,7 @@
  /*
   * List of flags we want to share for kernel threads,
   * if only because they are not used by them anyway.
-@@ -345,6 +348,10 @@ extern int sysctl_max_map_count;
+@@ -343,6 +346,10 @@ extern int sysctl_max_map_count;
  extern unsigned long
  arch_get_unmapped_area(struct file *, unsigned long, unsigned long,
  		       unsigned long, unsigned long);
@@ -680,13 +687,13 @@
  arch_get_unmapped_area_topdown(struct file *filp, unsigned long addr,
  			  unsigned long len, unsigned long pgoff,
 diff --git a/kernel/sysctl.c b/kernel/sysctl.c
-index 3d56fe7..b512845 100644
+index 368d163..2e4ab66 100644
 --- a/kernel/sysctl.c
 +++ b/kernel/sysctl.c
-@@ -82,6 +82,26 @@ extern int percpu_pagelist_fraction;
- extern int compat_log;
- extern int latencytop_enabled;
- extern int sysctl_nr_open_min, sysctl_nr_open_max;
+@@ -85,6 +85,26 @@ extern int sysctl_nr_open_min, sysctl_nr_open_max;
+ #ifndef CONFIG_MMU
+ extern int sysctl_nr_trim_pages;
+ #endif
 +
 +int exec_shield = (1<<0);
 +/* exec_shield is a bitmask:
@@ -710,7 +717,7 @@
  #ifdef CONFIG_RCU_TORTURE_TEST
  extern int rcutorture_runnable;
  #endif /* #ifdef CONFIG_RCU_TORTURE_TEST */
-@@ -373,6 +393,14 @@ static struct ctl_table kern_table[] = {
+@@ -378,6 +398,14 @@ static struct ctl_table kern_table[] = {
  		.proc_handler	= &proc_dointvec,
  	},
  	{
@@ -726,7 +733,7 @@
  		.procname	= "core_uses_pid",
  		.data		= &core_uses_pid,
 diff --git a/mm/mmap.c b/mm/mmap.c
-index d4855a6..ac07ab7 100644
+index 8d95902..c84ff1f 100644
 --- a/mm/mmap.c
 +++ b/mm/mmap.c
 @@ -27,6 +27,7 @@
@@ -765,7 +772,7 @@
  	if (prev) {
  		vma->vm_next = prev->vm_next;
  		prev->vm_next = vma;
-@@ -494,6 +509,8 @@ __vma_unlink(struct mm_struct *mm, struct vm_area_struct *vma,
+@@ -493,6 +508,8 @@ __vma_unlink(struct mm_struct *mm, struct vm_area_struct *vma,
  	rb_erase(&vma->vm_rb, &mm->mm_rb);
  	if (mm->mmap_cache == vma)
  		mm->mmap_cache = prev;
@@ -774,7 +781,7 @@
  }
  
  /*
-@@ -800,6 +817,8 @@ struct vm_area_struct *vma_merge(struct mm_struct *mm,
+@@ -799,6 +816,8 @@ struct vm_area_struct *vma_merge(struct mm_struct *mm,
  		} else					/* cases 2, 5, 7 */
  			vma_adjust(prev, prev->vm_start,
  				end, prev->vm_pgoff, NULL);
@@ -783,7 +790,7 @@
  		return prev;
  	}
  
-@@ -955,7 +974,8 @@ unsigned long do_mmap_pgoff(struct file * file, unsigned long addr,
+@@ -954,7 +973,8 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
  	/* Obtain the address to map to. we verify (or select) it and ensure
  	 * that it represents a valid section of the address space.
  	 */
@@ -793,7 +800,7 @@
  	if (addr & ~PAGE_MASK)
  		return addr;
  
-@@ -1440,13 +1460,17 @@ void arch_unmap_area_topdown(struct mm_struct *mm, unsigned long addr)
+@@ -1439,13 +1459,17 @@ void arch_unmap_area_topdown(struct mm_struct *mm, unsigned long addr)
  }
  
  unsigned long
@@ -814,7 +821,7 @@
  	if (file && file->f_op && file->f_op->get_unmapped_area)
  		get_area = file->f_op->get_unmapped_area;
  	addr = get_area(file, addr, len, pgoff, flags);
-@@ -1460,8 +1484,76 @@ get_unmapped_area(struct file *file, unsigned long addr, unsigned long len,
+@@ -1459,8 +1483,76 @@ get_unmapped_area(struct file *file, unsigned long addr, unsigned long len,
  
  	return arch_rebalance_pgtables(addr, len);
  }
@@ -891,8 +898,8 @@
 -EXPORT_SYMBOL(get_unmapped_area);
  
  /* Look up the first VMA which satisfies  addr < vm_end,  NULL if none. */
- struct vm_area_struct * find_vma(struct mm_struct * mm, unsigned long addr)
-@@ -1536,6 +1628,14 @@ out:
+ struct vm_area_struct *find_vma(struct mm_struct *mm, unsigned long addr)
+@@ -1535,6 +1627,14 @@ out:
  	return prev ? prev->vm_next : vma;
  }
  
@@ -907,7 +914,7 @@
  /*
   * Verify that the stack growth is acceptable and
   * update accounting. This is shared with both the
-@@ -1552,7 +1652,7 @@ static int acct_stack_growth(struct vm_area_struct * vma, unsigned long size, un
+@@ -1551,7 +1651,7 @@ static int acct_stack_growth(struct vm_area_struct *vma, unsigned long size, uns
  		return -ENOMEM;
  
  	/* Stack limit test */
@@ -916,7 +923,7 @@
  		return -ENOMEM;
  
  	/* mlock limit tests */
-@@ -1862,10 +1962,14 @@ int split_vma(struct mm_struct * mm, struct vm_area_struct * vma,
+@@ -1861,10 +1961,14 @@ int split_vma(struct mm_struct * mm, struct vm_area_struct * vma,
  	if (new->vm_ops && new->vm_ops->open)
  		new->vm_ops->open(new);
  
@@ -933,7 +940,7 @@
  		vma_adjust(vma, vma->vm_start, addr, vma->vm_pgoff, new);
  
  	return 0;
-@@ -2109,6 +2213,7 @@ void exit_mmap(struct mm_struct *mm)
+@@ -2111,6 +2215,7 @@ void exit_mmap(struct mm_struct *mm)
  	vm_unacct_memory(nr_accounted);
  	free_pgtables(tlb, vma, FIRST_USER_ADDRESS, 0);
  	tlb_finish_mmu(tlb, 0, end);
@@ -942,11 +949,11 @@
  	/*
  	 * Walk the list again, actually closing and freeing it,
 diff --git a/mm/mprotect.c b/mm/mprotect.c
-index fded06f..a2cf942 100644
+index abe2694..eb16148 100644
 --- a/mm/mprotect.c
 +++ b/mm/mprotect.c
-@@ -24,9 +24,14 @@
- #include <linux/mmu_notifier.h>
+@@ -25,9 +25,14 @@
+ #include <linux/migrate.h>
  #include <asm/uaccess.h>
  #include <asm/pgtable.h>
 +#include <asm/pgalloc.h>
@@ -960,7 +967,7 @@
  #ifndef pgprot_modify
  static inline pgprot_t pgprot_modify(pgprot_t oldprot, pgprot_t newprot)
  {
-@@ -140,7 +145,7 @@ mprotect_fixup(struct vm_area_struct *vma, struct vm_area_struct **pprev,
+@@ -138,7 +143,7 @@ mprotect_fixup(struct vm_area_struct *vma, struct vm_area_struct **pprev,
  	struct mm_struct *mm = vma->vm_mm;
  	unsigned long oldflags = vma->vm_flags;
  	long nrpages = (end - start) >> PAGE_SHIFT;
@@ -969,7 +976,7 @@
  	pgoff_t pgoff;
  	int error;
  	int dirty_accountable = 0;
-@@ -204,6 +209,9 @@ success:
+@@ -202,6 +207,9 @@ success:
  		dirty_accountable = 1;
  	}
  
@@ -980,7 +987,7 @@
  	if (is_vm_hugetlb_page(vma))
  		hugetlb_change_protection(vma, start, end, vma->vm_page_prot);
 diff --git a/mm/mremap.c b/mm/mremap.c
-index 58a2908..5bb50e6 100644
+index a39b7b9..6bebfde 100644
 --- a/mm/mremap.c
 +++ b/mm/mremap.c
 @@ -400,8 +400,8 @@ unsigned long do_mremap(unsigned long addr,

linux-2.6-hdpvr.patch:

Index: linux-2.6-hdpvr.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/linux-2.6-hdpvr.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- linux-2.6-hdpvr.patch	12 Jan 2009 19:51:29 -0000	1.2
+++ linux-2.6-hdpvr.patch	29 Jan 2009 21:14:11 -0000	1.3
@@ -1,8 +1,8 @@
 diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig
-index 47102c2..0e279dd 100644
+index 19cf3b8..4f29e1a 100644
 --- a/drivers/media/video/Kconfig
 +++ b/drivers/media/video/Kconfig
-@@ -781,6 +781,8 @@ source "drivers/media/video/gspca/Kconfig"
+@@ -817,6 +817,8 @@ source "drivers/media/video/gspca/Kconfig"
  
  source "drivers/media/video/pvrusb2/Kconfig"
  
@@ -12,10 +12,10 @@
  
  source "drivers/media/video/usbvision/Kconfig"
 diff --git a/drivers/media/video/Makefile b/drivers/media/video/Makefile
-index 16962f3..4331a50 100644
+index 72f6d03..35ff442 100644
 --- a/drivers/media/video/Makefile
 +++ b/drivers/media/video/Makefile
-@@ -115,6 +115,8 @@ obj-$(CONFIG_USB_PWC)           += pwc/
+@@ -122,6 +122,8 @@ obj-$(CONFIG_USB_PWC)           += pwc/
  obj-$(CONFIG_USB_ZC0301)        += zc0301/
  obj-$(CONFIG_USB_GSPCA)         += gspca/
  
@@ -885,7 +885,7 @@
 +}
 diff --git a/drivers/media/video/hdpvr/hdpvr-video.c b/drivers/media/video/hdpvr/hdpvr-video.c
 new file mode 100644
-index 0000000..2378099
+index 0000000..0297f91
 --- /dev/null
 +++ b/drivers/media/video/hdpvr/hdpvr-video.c
 @@ -0,0 +1,1258 @@
@@ -1214,7 +1214,7 @@
 + * video 4 linux 2 file operations
 + */
 +
-+static int hdpvr_open(struct inode *inode, struct file *file)
++static int hdpvr_open(struct file *file)
 +{
 +	struct hdpvr_device *dev;
 +	struct hdpvr_fh *fh;
@@ -1253,7 +1253,7 @@
 +	return retval;
 +}
 +
-+
++#if 0
 +static void hdpvr_draw_down(struct hdpvr_device *dev)
 +{
 +	hdpvr_trace("status = %d", dev->status);
@@ -1279,8 +1279,9 @@
 +
 +	return 0;
 +}
++#endif
 +
-+static int hdpvr_release(struct inode *inode, struct file *file)
++static int hdpvr_release(struct file *file)
 +{
 +	struct hdpvr_fh		*fh  = (struct hdpvr_fh *)file->private_data;
 +	struct hdpvr_device	*dev = fh->dev;
@@ -1455,7 +1456,7 @@
 +}
 +
 +
-+static int hdpvr_ioctl(struct inode *inode, struct file *filp, unsigned int cmd,
++static long hdpvr_ioctl(struct file *filp, unsigned int cmd,
 +		unsigned long arg)
 +{
 +	struct hdpvr_fh *fh = (struct hdpvr_fh *)filp->private_data;
@@ -1490,21 +1491,20 @@
 +		break;
 +	}
 +	default:
-+		res = video_ioctl2(inode, filp, cmd, arg);
++		res = video_ioctl2(filp, cmd, arg);
 +	}
 +	mutex_unlock(&dev->io_mutex);
 +	return res;
 +}
 +
-+static const struct file_operations hdpvr_fops = {
++static const struct v4l2_file_operations hdpvr_fops = {
 +	.owner		= THIS_MODULE,
 +	.open		= hdpvr_open,
 +	.release	= hdpvr_release,
-+	.flush		= hdpvr_flush,
++/*	.flush		= hdpvr_flush,	*/
 +	.read		= hdpvr_read,
 +	.poll		= hdpvr_poll,
 +	.ioctl		= hdpvr_ioctl,
-+	.compat_ioctl	= v4l_compat_ioctl32,
 +};
 +
 +/*=======================================================================*/
@@ -2478,18 +2478,10 @@
 +void print_bytes(char *string, unsigned char *buf, size_t len);
 +#endif
 diff --git a/drivers/media/video/v4l2-common.c b/drivers/media/video/v4l2-common.c
-index 846763d..34eca15 100644
+index b8f2be8..0e8bd98 100644
 --- a/drivers/media/video/v4l2-common.c
 +++ b/drivers/media/video/v4l2-common.c
-@@ -374,6 +374,7 @@ const char *v4l2_ctrl_get_name(u32 id)
- 	case V4L2_CID_CONTRAST: 	return "Contrast";
- 	case V4L2_CID_SATURATION: 	return "Saturation";
- 	case V4L2_CID_HUE: 		return "Hue";
-+	case V4L2_CID_SHARPNESS: 	return "Sharpness";
- 
- 	/* MPEG controls */
- 	case V4L2_CID_MPEG_CLASS: 		return "MPEG Encoder Controls";
-@@ -480,6 +481,7 @@ int v4l2_ctrl_query_fill(struct v4l2_queryctrl *qctrl, s32 min, s32 max, s32 ste
+@@ -547,6 +547,7 @@ int v4l2_ctrl_query_fill(struct v4l2_queryctrl *qctrl, s32 min, s32 max, s32 ste
  	case V4L2_CID_CONTRAST:
  	case V4L2_CID_SATURATION:
  	case V4L2_CID_HUE:
@@ -2497,7 +2489,7 @@
  		qctrl->flags |= V4L2_CTRL_FLAG_SLIDER;
  		break;
  	}
-@@ -518,6 +520,8 @@ int v4l2_ctrl_query_fill_std(struct v4l2_queryctrl *qctrl)
+@@ -585,6 +586,8 @@ int v4l2_ctrl_query_fill_std(struct v4l2_queryctrl *qctrl)
  		return v4l2_ctrl_query_fill(qctrl, 0, 127, 1, 64);
  	case V4L2_CID_HUE:
  		return v4l2_ctrl_query_fill(qctrl, -128, 127, 1, 0);
@@ -2507,14 +2499,14 @@
  	/* MPEG controls */
  	case V4L2_CID_MPEG_AUDIO_SAMPLING_FREQ:
 diff --git a/include/linux/i2c-id.h b/include/linux/i2c-id.h
-index 01d67ba..1a08b81 100644
+index 1ffc23b..e77f81b 100644
 --- a/include/linux/i2c-id.h
 +++ b/include/linux/i2c-id.h
-@@ -110,6 +110,7 @@
- #define I2C_HW_B_INTELFB	0x010021 /* intel framebuffer driver */
+@@ -87,6 +87,7 @@
+ #define I2C_HW_B_CX2341X	0x010020 /* Conexant CX2341X MPEG encoder cards */
  #define I2C_HW_B_CX23885	0x010022 /* conexant 23885 based tv cards (bus1) */
  #define I2C_HW_B_AU0828		0x010023 /* auvitek au0828 usb bridge */
 +#define I2C_HW_B_HDPVR		0x010024 /* Hauppauge HD PVR */
  
- /* --- PCF 8584 based algorithms					*/
- #define I2C_HW_P_ELEK		0x020002 /* Elektor ISA Bus inteface card */
+ /* --- SGI adapters							*/
+ #define I2C_HW_SGI_VINO		0x160000

linux-2.6-selinux-mprotect-checks.patch:

Index: linux-2.6-selinux-mprotect-checks.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/linux-2.6-selinux-mprotect-checks.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- linux-2.6-selinux-mprotect-checks.patch	25 Sep 2008 18:17:39 -0000	1.7
+++ linux-2.6-selinux-mprotect-checks.patch	29 Jan 2009 21:14:11 -0000	1.8
@@ -7,17 +7,17 @@
 
 --- 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
+@@ -3018,7 +3018,6 @@ static int file_map_prot_check(struct fi
+ 	const struct cred *cred = current_cred();
+ 	int rc = 0;
  
- static int file_map_prot_check(struct file *file, unsigned long prot, int shared)
- {
 -#ifndef CONFIG_PPC32
  	if ((prot & PROT_EXEC) && (!file || (!shared && (prot & PROT_WRITE)))) {
  		/*
  		 * We are making executable an anonymous mapping or a
-@@ -2973,7 +2972,6 @@ static int file_map_prot_check(struct fi
+@@ -3029,7 +3028,6 @@ static int file_map_prot_check(struct fi
  		if (rc)
- 			return rc;
+ 			goto error;
  	}
 -#endif
  

linux-2.6-sparc-selinux-mprotect-checks.patch:

Index: linux-2.6-sparc-selinux-mprotect-checks.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/linux-2.6-sparc-selinux-mprotect-checks.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-sparc-selinux-mprotect-checks.patch	23 Mar 2008 21:30:40 -0000	1.1
+++ linux-2.6-sparc-selinux-mprotect-checks.patch	29 Jan 2009 21:14:11 -0000	1.2
@@ -1,23 +1,23 @@
 diff -up linux-2.6.24.sparc64/security/selinux/hooks.c.BAD linux-2.6.24.sparc64/security/selinux/hooks.c
 --- linux-2.6.24.sparc64/security/selinux/hooks.c.BAD	2008-03-21 14:28:06.000000000 -0400
 +++ linux-2.6.24.sparc64/security/selinux/hooks.c	2008-03-21 14:29:10.000000000 -0400
-@@ -2825,6 +2825,7 @@ static int selinux_file_ioctl(struct fil
+@@ -3018,6 +3018,7 @@ static int file_map_prot_check(struct fi
+ 	const struct cred *cred = current_cred();
+ 	int rc = 0;
  
- static int file_map_prot_check(struct file *file, unsigned long prot, int shared)
- {
 +#ifndef CONFIG_SPARC
  	if ((prot & PROT_EXEC) && (!file || (!shared && (prot & PROT_WRITE)))) {
  		/*
  		 * We are making executable an anonymous mapping or a
-@@ -2835,6 +2836,7 @@ static int file_map_prot_check(struct fi
+@@ -3028,6 +3029,7 @@ static int file_map_prot_check(struct fi
  		if (rc)
- 			return rc;
+ 			goto error;
  	}
 +#endif
  
  	if (file) {
  		/* read access is always possible with a mapping */
-@@ -2885,6 +2887,7 @@ static int selinux_file_mprotect(struct 
+@@ -3081,6 +3081,7 @@ static int selinux_file_mprotect(struct 
  	if (selinux_checkreqprot)
  		prot = reqprot;
  
@@ -25,7 +25,7 @@
  	if ((prot & PROT_EXEC) && !(vma->vm_flags & VM_EXEC)) {
  		rc = 0;
  		if (vma->vm_start >= vma->vm_mm->start_brk &&
-@@ -2909,6 +2912,7 @@ static int selinux_file_mprotect(struct 
+@@ -3103,6 +3103,7 @@ static int selinux_file_mprotect(struct 
  		if (rc)
  			return rc;
  	}

linux-2.6-utrace.patch:

Index: linux-2.6-utrace.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/linux-2.6-utrace.patch,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -r1.105 -r1.106
--- linux-2.6-utrace.patch	12 Jan 2009 20:11:43 -0000	1.105
+++ linux-2.6-utrace.patch	29 Jan 2009 21:14:11 -0000	1.106
@@ -7,17 +7,17 @@
  include/linux/utrace.h            |  707 ++++++++++
  init/Kconfig                      |   26 +
  kernel/Makefile                   |    1 +
- kernel/ptrace.c                   |  793 +++++++++++-
+ kernel/ptrace.c                   |  791 +++++++++++-
  kernel/signal.c                   |   14 +-
  kernel/utrace.c                   | 2590 +++++++++++++++++++++++++++++++++++++
- 12 files changed, 4790 insertions(+), 12 deletions(-)
+ 12 files changed, 4789 insertions(+), 11 deletions(-)
 
 diff --git a/Documentation/DocBook/Makefile b/Documentation/DocBook/Makefile
-index 9b1f6ca..1fd3feb 100644  
+index 0a08126..7570189 100644  
 --- a/Documentation/DocBook/Makefile
 +++ b/Documentation/DocBook/Makefile
 @@ -9,7 +9,7 @@
- DOCBOOKS := wanbook.xml z8530book.xml mcabook.xml \
+ DOCBOOKS := z8530book.xml mcabook.xml \
  	    kernel-hacking.xml kernel-locking.xml deviceiobook.xml \
  	    procfs-guide.xml writing_usb_driver.xml networking.xml \
 -	    kernel-api.xml filesystems.xml lsm.xml usb.xml kgdb.xml \
@@ -603,7 +603,7 @@
 +
 +</book>
 diff --git a/fs/proc/array.c b/fs/proc/array.c
-index 6af7fba..9b6902a 100644  
+index 7e4877d..0c683ed 100644  
 --- a/fs/proc/array.c
 +++ b/fs/proc/array.c
 @@ -81,6 +81,7 @@
@@ -614,9 +614,9 @@
  
  #include <asm/pgtable.h>
  #include <asm/processor.h>
-@@ -185,6 +186,8 @@ static inline void task_state(struct seq
- 		p->uid, p->euid, p->suid, p->fsuid,
- 		p->gid, p->egid, p->sgid, p->fsgid);
+@@ -187,6 +188,8 @@ static inline void task_state(struct seq
+ 		cred->uid, cred->euid, cred->suid, cred->fsuid,
+ 		cred->gid, cred->egid, cred->sgid, cred->fsgid);
  
 +	task_utrace_proc_status(m, p);
 +
@@ -624,10 +624,10 @@
  	if (p->files)
  		fdt = files_fdtable(p->files);
 diff --git a/include/linux/ptrace.h b/include/linux/ptrace.h
-index 22641d5..91b3412 100644  
+index 98b93ca..9b0d5be 100644  
 --- a/include/linux/ptrace.h
 +++ b/include/linux/ptrace.h
-@@ -120,6 +120,7 @@ static inline void ptrace_unlink(struct 
+@@ -121,6 +121,7 @@ static inline void ptrace_unlink(struct 
  int generic_ptrace_peekdata(struct task_struct *tsk, long addr, long data);
  int generic_ptrace_pokedata(struct task_struct *tsk, long addr, long data);
  
@@ -635,7 +635,7 @@
  /**
   * task_ptrace - return %PT_* flags that apply to a task
   * @task:	pointer to &task_struct in question
-@@ -153,6 +154,26 @@ static inline int ptrace_event(int mask,
+@@ -154,6 +155,26 @@ static inline int ptrace_event(int mask,
  	return 1;
  }
  
@@ -663,10 +663,10 @@
   * 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 55e30d1..b82b5f4 100644  
+index 4cae9b8..ca0861e 100644  
 --- a/include/linux/sched.h
 +++ b/include/linux/sched.h
-@@ -1243,6 +1243,11 @@ struct task_struct {
+@@ -1266,6 +1266,11 @@ struct task_struct {
  #endif
  	seccomp_t seccomp;
  
@@ -678,7 +678,7 @@
  /* Thread group tracking */
     	u32 parent_exec_id;
     	u32 self_exec_id;
-@@ -1829,6 +1834,7 @@ extern int kill_pgrp(struct pid *pid, in
+@@ -1865,6 +1870,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);
@@ -1633,10 +1633,10 @@
 +
 +#endif	/* linux/utrace.h */
 diff --git a/init/Kconfig b/init/Kconfig
-index f763762..df75f9c 100644  
+index e7893b1..6a5bcbc 100644  
 --- a/init/Kconfig
 +++ b/init/Kconfig
-@@ -923,6 +923,32 @@ config STOP_MACHINE
+@@ -940,6 +940,32 @@ config STOP_MACHINE
  	help
  	  Need stop_machine() primitive.
  
@@ -1670,7 +1670,7 @@
  
  config PREEMPT_NOTIFIERS
 diff --git a/kernel/Makefile b/kernel/Makefile
-index 19fad00..16a30b0 100644  
+index 2921d90..16df880 100644  
 --- a/kernel/Makefile
 +++ b/kernel/Makefile
 @@ -64,6 +64,7 @@ obj-$(CONFIG_IKCONFIG) += configs.o
@@ -1682,7 +1682,7 @@
  obj-$(CONFIG_AUDITSYSCALL) += auditsc.o
  obj-$(CONFIG_AUDIT_TREE) += audit_tree.o
 diff --git a/kernel/ptrace.c b/kernel/ptrace.c
-index 4c8bcd7..8d19d04 100644  
+index 29dc700..70e94e2 100644  
 --- a/kernel/ptrace.c
 +++ b/kernel/ptrace.c
 @@ -16,6 +16,7 @@
@@ -1693,7 +1693,7 @@
  #include <linux/security.h>
  #include <linux/signal.h>
  #include <linux/audit.h>
-@@ -38,6 +39,7 @@ void __ptrace_link(struct task_struct *c
+@@ -49,6 +50,7 @@ void __ptrace_link(struct task_struct *c
  	child->parent = new_parent;
  }
   
@@ -1701,7 +1701,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,72 @@ static void ptrace_untrace(struct task_s
+@@ -69,6 +71,72 @@ static void ptrace_untrace(struct task_s
  	spin_unlock(&child->sighand->siglock);
  }
  
@@ -1774,10 +1774,10 @@
  /*
   * unptrace a task: move it back to its original parent and
   * remove it from the ptrace list.
-@@ -72,10 +140,11 @@ void __ptrace_unlink(struct task_struct 
- 	child->parent = child->real_parent;
+@@ -84,10 +152,11 @@ void __ptrace_unlink(struct task_struct 
  	list_del_init(&child->ptrace_entry);
  
+ 	arch_ptrace_untrace(child);
 -	if (task_is_traced(child))
 -		ptrace_untrace(child);
 +	ptrace_finish(child);
@@ -1788,7 +1788,7 @@
  /*
   * Check that we have indeed attached to the thing..
   */
-@@ -113,6 +182,536 @@ int ptrace_check_attach(struct task_stru
+@@ -125,6 +194,536 @@ int ptrace_check_attach(struct task_stru
  	return ret;
  }
  
@@ -2143,7 +2143,7 @@
 +		info->si_errno = 0;
 +		info->si_code = SI_USER;
 +		info->si_pid = task_pid_vnr(task->parent);
-+		info->si_uid = task->parent->uid;
++		info->si_uid = __task_cred(task->parent)->uid;
 +	}
 +
 +	task->exit_code = 0;
@@ -2179,7 +2179,7 @@
 +			info->si_signo = SIGTRAP;
 +			info->si_code = SIGTRAP;
 +			info->si_pid = task_pid_vnr(task);
-+			info->si_uid = task->uid;
++			info->si_uid = __task_cred(task->parent)->uid;
 +			break;
 +		}
 +		/* Fall through.  */
@@ -2324,8 +2324,8 @@
 +
  int __ptrace_may_access(struct task_struct *task, unsigned int mode)
  {
- 	/* May we inspect the given task?
-@@ -156,12 +755,17 @@ int ptrace_attach(struct task_struct *ta
+ 	const struct cred *cred = current_cred(), *tcred;
+@@ -176,12 +775,17 @@ int ptrace_attach(struct task_struct *ta
  {
  	int retval;
  	unsigned long flags;
@@ -2342,20 +2342,18 @@
 +	if (unlikely(IS_ERR(engine)))
 +		return PTR_ERR(engine);
  
- repeat:
- 	/*
-@@ -202,8 +806,8 @@ repeat:
- bad:
- 	write_unlock_irqrestore(&tasklist_lock, flags);
+ 	/* Protect exec's credential calculations against our interference;
+ 	 * SUID, SGID and LSM creds get determined differently under ptrace.
+@@ -232,7 +836,7 @@ bad:
  	task_unlock(task);
--out:
+ 	mutex_unlock(&current->cred_exec_mutex);
+ out:
 -	return retval;
-+
 +	return finish_ptrace_attach(task, engine, retval);
  }
  
  static inline void __ptrace_detach(struct task_struct *child, unsigned int data)
-@@ -221,9 +825,7 @@ int ptrace_detach(struct task_struct *ch
+@@ -250,9 +854,7 @@ int ptrace_detach(struct task_struct *ch
  	if (!valid_signal(data))
  		return -EIO;
  
@@ -2366,7 +2364,7 @@
  
  	write_lock_irq(&tasklist_lock);
  	/* protect against de_thread()->release_task() */
-@@ -309,6 +911,8 @@ static int ptrace_setoptions(struct task
+@@ -338,6 +940,8 @@ static int ptrace_setoptions(struct task
  	if (data & PTRACE_O_TRACEEXIT)
  		child->ptrace |= PT_TRACE_EXIT;
  
@@ -2375,7 +2373,7 @@
  	return (data & ~PTRACE_O_MASK) ? -EINVAL : 0;
  }
  
-@@ -367,6 +971,7 @@ static int ptrace_setsiginfo(struct task
+@@ -396,6 +1000,7 @@ static int ptrace_setsiginfo(struct task
  #define is_sysemu_singlestep(request)	0
  #endif
  
@@ -2383,7 +2381,7 @@
  static int ptrace_resume(struct task_struct *child, long request, long data)
  {
  	if (!valid_signal(data))
-@@ -401,6 +1006,170 @@ static int ptrace_resume(struct task_str
+@@ -430,6 +1035,170 @@ static int ptrace_resume(struct task_str
  
  	return 0;
  }
@@ -2554,7 +2552,7 @@
  
  int ptrace_request(struct task_struct *child, long request,
  		   long addr, long data)
-@@ -480,6 +1249,11 @@ int ptrace_request(struct task_struct *c
+@@ -509,6 +1278,11 @@ int ptrace_request(struct task_struct *c
  int ptrace_traceme(void)
  {
  	int ret = -EPERM;
@@ -2566,7 +2564,7 @@
  
  	/*
  	 * Are we already being traced?
-@@ -513,7 +1287,8 @@ repeat:
+@@ -542,7 +1316,8 @@ repeat:
  		write_unlock_irqrestore(&tasklist_lock, flags);
  	}
  	task_unlock(current);
@@ -2577,10 +2575,10 @@
  
  /**
 diff --git a/kernel/signal.c b/kernel/signal.c
-index 4530fc6..0e85826 100644  
+index 3152ac3..f431662 100644  
 --- a/kernel/signal.c
 +++ b/kernel/signal.c
-@@ -1419,7 +1419,7 @@ int do_notify_parent(struct task_struct 
+@@ -1441,7 +1441,7 @@ int do_notify_parent(struct task_struct 
  	return ret;
  }
  
@@ -2589,7 +2587,7 @@
  {
  	struct siginfo info;
  	unsigned long flags;
-@@ -1474,6 +1474,8 @@ static void do_notify_parent_cldstop(str
+@@ -1495,6 +1495,8 @@ static void do_notify_parent_cldstop(str
  	spin_unlock_irqrestore(&sighand->siglock, flags);
  }
  
@@ -2598,7 +2596,7 @@
  static inline int may_ptrace_stop(void)
  {
  	if (!likely(current->ptrace & PT_PTRACED))
-@@ -1606,6 +1608,8 @@ void ptrace_notify(int exit_code)
+@@ -1627,6 +1629,8 @@ void ptrace_notify(int exit_code)
  	spin_unlock_irq(&current->sighand->siglock);
  }
  
@@ -2607,7 +2605,7 @@
  static void
  finish_stop(int stop_count)
  {
-@@ -1683,6 +1687,7 @@ static int do_signal_stop(int signr)
+@@ -1704,6 +1708,7 @@ static int do_signal_stop(int signr)
  	return 1;
  }
  
@@ -2615,7 +2613,7 @@
  static int ptrace_signal(int signr, siginfo_t *info,
  			 struct pt_regs *regs, void *cookie)
  {
-@@ -1721,6 +1726,13 @@ static int ptrace_signal(int signr, sigi
+@@ -1742,6 +1747,13 @@ static int ptrace_signal(int signr, sigi
  
  	return signr;
  }


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/sources,v
retrieving revision 1.928
retrieving revision 1.929
diff -u -r1.928 -r1.929
--- sources	26 Jan 2009 21:11:19 -0000	1.928
+++ sources	29 Jan 2009 21:14:12 -0000	1.929
@@ -1,2 +1,2 @@
 d351e44709c9810b85e29b877f50968a  linux-2.6.28.tar.bz2
-3a04439a0507847b45809b267c4db81b  patch-2.6.28.2.bz2
+d95a5be60287e9632c9d0513b59f6511  patch-2.6.29-rc3.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/upstream,v
retrieving revision 1.839
retrieving revision 1.840
diff -u -r1.839 -r1.840
--- upstream	26 Jan 2009 21:11:20 -0000	1.839
+++ upstream	29 Jan 2009 21:14:12 -0000	1.840
@@ -1,2 +1,2 @@
 linux-2.6.28.tar.bz2
-patch-2.6.28.2.bz2
+patch-2.6.29-rc3.bz2


--- disable-p4-cpufreq-ui.patch DELETED ---


--- iwlwifi-intel-bug-1822.patch DELETED ---


--- linux-2.6-net-silence-noisy-printks.patch DELETED ---


--- linux-2.6-olpc-speaker-out.patch DELETED ---


--- linux-2.6-piix3-silence-quirk.patch DELETED ---


--- linux-2.6-rtl8187b-tx-status-feedback.patch DELETED ---


--- linux-2.6-selinux-move-open-perms-check.patch DELETED ---


--- linux-2.6-serial.patch DELETED ---


--- linux-2.6-squashfs.patch DELETED ---


--- linux-2.6.27-pci-hush-allocation-failures.patch DELETED ---


--- patch-2.6.28.2.bz2.sign DELETED ---


--- skip-sanity-check-of-busy-resources.patch DELETED ---



From kkofler at fedoraproject.org  Thu Jan 29 21:34:16 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Thu, 29 Jan 2009 21:34:16 +0000 (UTC)
Subject: rpms/kdebase-workspace/F-10
	kdebase-workspace-4.2.0-bluetooth-revert.patch, NONE,
	1.1 kdebase-workspace.spec, 1.151, 1.152
Message-ID: <20090129213416.89E6B70141@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdebase-workspace/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12041/F-10

Modified Files:
	kdebase-workspace.spec 
Added Files:
	kdebase-workspace-4.2.0-bluetooth-revert.patch 
Log Message:
Sync the F9 conditionals up to facilitate future merges.

kdebase-workspace-4.2.0-bluetooth-revert.patch:

--- NEW FILE kdebase-workspace-4.2.0-bluetooth-revert.patch ---
diff -ur kdebase-workspace-4.2.0/libs/solid/control/backends/CMakeLists.txt kdebase-workspace-4.2.0-bluetooth-revert/libs/solid/control/backends/CMakeLists.txt
--- kdebase-workspace-4.2.0/libs/solid/control/backends/CMakeLists.txt	2008-10-17 13:00:21.000000000 +0200
+++ kdebase-workspace-4.2.0-bluetooth-revert/libs/solid/control/backends/CMakeLists.txt	2008-01-05 00:55:29.000000000 +0100
@@ -1,3 +1,3 @@
 add_subdirectory( fakenet )
-#add_subdirectory( fakebluetooth )
+add_subdirectory( fakebluetooth )
 
diff -ur kdebase-workspace-4.2.0/libs/solid/control/backends/fakebluetooth/fakebluetoothinterface.h kdebase-workspace-4.2.0-bluetooth-revert/libs/solid/control/backends/fakebluetooth/fakebluetoothinterface.h
--- kdebase-workspace-4.2.0/libs/solid/control/backends/fakebluetooth/fakebluetoothinterface.h	2008-07-03 07:05:34.000000000 +0200
+++ kdebase-workspace-4.2.0-bluetooth-revert/libs/solid/control/backends/fakebluetooth/fakebluetoothinterface.h	2008-08-28 10:06:55.000000000 +0200
@@ -134,6 +134,7 @@
     }
     bool isTrusted(const QString& mac)
     {
+	Q_UNUSED(mac)
 	return true;
     }
 
diff -ur kdebase-workspace-4.2.0/libs/solid/control/bluetoothinputdevice.cpp kdebase-workspace-4.2.0-bluetooth-revert/libs/solid/control/bluetoothinputdevice.cpp
--- kdebase-workspace-4.2.0/libs/solid/control/bluetoothinputdevice.cpp	2008-10-30 15:13:17.000000000 +0100
+++ kdebase-workspace-4.2.0-bluetooth-revert/libs/solid/control/bluetoothinputdevice.cpp	2008-05-21 10:33:09.000000000 +0200
@@ -19,6 +19,7 @@
 
 */
 
+#include <QMap>
 #include <QStringList>
 
 #include "ifaces/bluetoothinputdevice.h"
@@ -71,19 +72,39 @@
     return_SOLID_CALL(Ifaces::BluetoothInputDevice *, d->backendObject(), QString(), ubi());
 }
 
-QMap<QString,QVariant> Solid::Control::BluetoothInputDevice::getProperties() const
+bool Solid::Control::BluetoothInputDevice::isConnected() const
 {
-    return_SOLID_CALL(Ifaces::BluetoothInputDevice *, d->backendObject(), (QMap< QString,QVariant >()), getProperties());
+    return_SOLID_CALL(Ifaces::BluetoothInputDevice *, d->backendObject(), false, isConnected());
 }
 
-void Solid::Control::BluetoothInputDevice::connect()
+QString Solid::Control::BluetoothInputDevice::name() const
 {
-    SOLID_CALL(Ifaces::BluetoothInputDevice *, d->backendObject(), connect());
+    return_SOLID_CALL(Ifaces::BluetoothInputDevice *, d->backendObject(), QString(), name());
 }
 
-void Solid::Control::BluetoothInputDevice::disconnect()
+QString Solid::Control::BluetoothInputDevice::address() const
 {
-    SOLID_CALL(Ifaces::BluetoothInputDevice *, d->backendObject(), disconnect());
+    return_SOLID_CALL(Ifaces::BluetoothInputDevice *, d->backendObject(), QString(), address());
+}
+
+QString Solid::Control::BluetoothInputDevice::productID() const
+{
+    return_SOLID_CALL(Ifaces::BluetoothInputDevice *, d->backendObject(), QString(), productID());
+}
+
+QString Solid::Control::BluetoothInputDevice::vendorID() const
+{
+    return_SOLID_CALL(Ifaces::BluetoothInputDevice *, d->backendObject(), QString(), vendorID());
+}
+
+void Solid::Control::BluetoothInputDevice::slotConnect()
+{
+    SOLID_CALL(Ifaces::BluetoothInputDevice *, d->backendObject(), slotConnect());
+}
+
+void Solid::Control::BluetoothInputDevice::slotDisconnect()
+{
+    SOLID_CALL(Ifaces::BluetoothInputDevice *, d->backendObject(), slotDisconnect());
 }
 
 void Solid::Control::BluetoothInputDevicePrivate::setBackendObject(QObject *object)
@@ -91,8 +112,10 @@
     FrontendObjectPrivate::setBackendObject(object);
 
     if (object) {
-        QObject::connect(object, SIGNAL(propertyChanged(QString,QVariant)),
-                         parent(), SIGNAL(propertyChanged(QString,QVariant)));
+        QObject::connect(object, SIGNAL(connected()),
+                         parent(), SIGNAL(connected()));
+        QObject::connect(object, SIGNAL(disconnected()),
+                         parent(), SIGNAL(disconnected()));
     }
 }
 
diff -ur kdebase-workspace-4.2.0/libs/solid/control/bluetoothinputdevice.h kdebase-workspace-4.2.0-bluetooth-revert/libs/solid/control/bluetoothinputdevice.h
--- kdebase-workspace-4.2.0/libs/solid/control/bluetoothinputdevice.h	2008-10-30 15:13:17.000000000 +0100
+++ kdebase-workspace-4.2.0-bluetooth-revert/libs/solid/control/bluetoothinputdevice.h	2008-06-10 13:41:04.000000000 +0200
@@ -1,7 +1,6 @@
 /*  This file is part of the KDE project
     Copyright (C) 2007 Will Stephenson <wstephenson at kde.org>
     Copyright (C) 2007 Daniel Gollub <dgollub at suse.de>
-    Copyright (C) 2008 Tom Patzig <tpatzig at suse.de>
 
 
     This library is free software; you can redistribute it and/or
@@ -24,8 +23,6 @@
 #define SOLID_CONTROL_BLUETOOTHINPUTDEVICE_H
 
 #include <QtCore/QObject>
-#include <QtCore/QMap>
-#include <QtCore/QVariant>
 
 #include "solid_control_export.h"
 
@@ -77,36 +74,65 @@
      * @returns the Universal Network Identifier of the current bluetooth remote device
      */
     QString ubi() const;
+
+    /**
+     * Retrieves connection status of bluetooth input device.
+     *
+     * @returns true if bluetooth input device is connected
+     */
+    bool isConnected() const;
+
+    /**
+     * Retrieves MAC address of bluetooth input device.
+     *
+     * @returns MAC address of bluetooth input device
+     */
+    QString address() const;
+
+    /**
+     * Retrievies Name of bluetooth input device.
+     *
+     * @returns Name of bluetooth input device
+     */
+    QString name() const;
+
     /**
-     * Retrieve all properties from the input device.
+     * Retrieves Product ID of bluetooth input device.
      *
-     * @returns a hash of named properties
+     * @returns Product ID of bluetooth input device
      */
-    QMap<QString,QVariant> getProperties() const;
+    QString productID() const;
 
+    /**
+     * Retrieves Vendor ID of bluetooth input device.
+     *
+     * @returns Vendor ID of bluetooth input device
+     */
+    QString vendorID() const;
 
 
 public Q_SLOTS:
     /**
      * Connect bluetooth input device.
      */
-    void connect();
+    void slotConnect();
 
     /**
      * Disconnect bluetooth input device.
      */
-    void disconnect();
+    void slotDisconnect();
 
 
 Q_SIGNALS:
-     /**
-     * A Property for the input device has changed.
-     *
-     * @param name the name of the changed property
-     * @param value the new value
+    /**
+     * This signal is emitted when the bluetooth input device is connected.
      */
-    void propertyChanged(const QString &name, const QVariant &value);
+    void connected();
 
+    /**
+     * This signal is emitted when the bluetooth input device is not available anymore.
+     */
+    void disconnected();
 
 private:
     Q_PRIVATE_SLOT(d, void _k_destroyed(QObject *))
diff -ur kdebase-workspace-4.2.0/libs/solid/control/bluetoothinterface.cpp kdebase-workspace-4.2.0-bluetooth-revert/libs/solid/control/bluetoothinterface.cpp
--- kdebase-workspace-4.2.0/libs/solid/control/bluetoothinterface.cpp	2008-12-04 09:34:54.000000000 +0100
+++ kdebase-workspace-4.2.0-bluetooth-revert/libs/solid/control/bluetoothinterface.cpp	2008-07-03 07:05:34.000000000 +0200
@@ -1,7 +1,6 @@
 /*  This file is part of the KDE project
     Copyright (C) 2006 Will Stephenson <wstephenson at kde.org>
     Copyright (C) 2007 Daniel Gollub <dgollub at suse.de>
-    Copyright (C) 2008 Tom Patzig <tpatzig at suse.de>
 
 
     This library is free software; you can redistribute it and/or
@@ -23,7 +22,6 @@
 #include <QMap>
[...3653 lines suppressed...]
-    QMap<QString, QVariant> props =  iface.getProperties();
-
-    foreach(QString key, props.keys()) {
-        kDebug() << "Interface Property: " << key << " : " << props[key];
-    }
-
+//    iface.discoverDevices();
 
-    iface.startDiscovery();
+    iface.startPeriodicDiscovery();
 
 #if 0
     BluezBluetoothRemoteDevice remote("/org/bluez/hci0/00:16:BC:15:A3:FF");
diff -ur kdebase-workspace-4.2.0/solid/solidshell/solid-bluetooth.cpp kdebase-workspace-4.2.0-bluetooth-revert/solid/solidshell/solid-bluetooth.cpp
--- kdebase-workspace-4.2.0/solid/solidshell/solid-bluetooth.cpp	2008-12-04 09:34:48.000000000 +0100
+++ kdebase-workspace-4.2.0-bluetooth-revert/solid/solidshell/solid-bluetooth.cpp	2008-04-02 14:18:23.000000000 +0200
@@ -70,8 +70,8 @@
 
         QStringList list = value.toStringList();
 
-        QStringList::ConstIterator it = list.constBegin();
-        QStringList::ConstIterator end = list.constEnd();
+        QStringList::ConstIterator it = list.begin();
+        QStringList::ConstIterator end = list.end();
 
         for (; it!=end; ++it)
         {
@@ -149,7 +149,7 @@
 
 std::ostream &operator<<(std::ostream &out, const QMap<QString,QVariant> &properties)
 {
-    foreach (const QString& key, properties.keys())
+    foreach (QString key, properties.keys())
     {
         out << "  " << key << " = " << properties[key] << endl;
     }
@@ -205,17 +205,6 @@
       cout << "  solid-bluetooth defaultadapter" << endl;
       cout << i18n("             # List bluetooth default adapter/interface\n") << endl;
 
-      cout << "  solid-bluetooth createdevice (interface 'ubi') 'remote-mac'" << endl;
-      cout << i18n("             # Request to create a remote bluetooth device on the bus\n") << endl;
-
-      cout << "  solid-bluetooth removedevice (interface 'ubi') 'remote-mac'" << endl;
-      cout << i18n("             # Request to remove the remote bluetooth device from the bus\n") << endl;
-
-      cout << "  solid-bluetooth getproperties (interface 'ubi') " << endl;
-      cout << i18n("             # Request the properties from the bluetooth adapter\n") << endl;
-
-
-/*
       cout << "  solid-bluetooth getremotename (interface 'ubi') 'remote-mac'" << endl;
       cout << i18n("             # Query the name from the remote device 'remote-mac' with 'ubi'\n") << endl;
 
@@ -242,7 +231,7 @@
       cout << i18n("             # Create bonding (pairing) with bluetooth remote device.\n"
                     "             # Remove bonding of bluetooth remote device.\n"
                     "             # Check for bonding of bluetooth remote device.\n") << endl;
-*/
+
       return 0;
   }
 
@@ -263,35 +252,11 @@
     if (command == "listadapters")
     {
         return shell.bluetoothListAdapters();
-    } 
+    }
     else if (command == "defaultadapter")
     {
         return shell.bluetoothDefaultAdapter();
     }
-    else if (command == "createdevice")
-    {
-        checkArgumentCount(3, 3);
-    	QString adapterUbi(args->arg(1));
-    	QString mac(args->arg(2));		
-    	return shell.bluetoothCreateDevice(adapterUbi, mac);
-    }
-    else if (command == "removedevice")
-    {
-        checkArgumentCount(3, 3);
-    	QString adapterUbi(args->arg(1));
-    	QString remoteUbi(args->arg(2));		
-    	return shell.bluetoothRemoveDevice(adapterUbi, remoteUbi);
-    }
-    else if (command == "getproperties")
-    {
-        checkArgumentCount(2, 2);
-        QString ubi (args->arg(1));
-        return shell.bluetoothGetProperties(ubi);
-    }
-
-
-
-#if 0    
     else if (command == "getremotename")
     {
         checkArgumentCount(3, 3);
@@ -401,7 +366,6 @@
         }
 
     }
-#endif    
     else
     {
         cerr << i18n("Syntax Error: Unknown command '%1'" , command) << endl;
@@ -414,7 +378,9 @@
 {
     Solid::Control::BluetoothManager &manager = Solid::Control::BluetoothManager::self();
 
-    foreach (Solid::Control::BluetoothInterface device, manager.bluetoothInterfaces())
+    const Solid::Control::BluetoothInterfaceList all = manager.bluetoothInterfaces();
+
+    foreach (const Solid::Control::BluetoothInterface device, all)
     {
         cout << "UBI = '" << device.ubi() << "'" << endl;
     }
@@ -430,36 +396,6 @@
     return true;
 }
 
-bool SolidBluetooth::bluetoothCreateDevice(const QString &adapterUbi, const QString &/*mac*/)
-{
-    Solid::Control::BluetoothManager &manager = Solid::Control::BluetoothManager::self();
-    Solid::Control::BluetoothInterface adapter = manager.findBluetoothInterface(adapterUbi);
-//    QString remoteDeviceUBI = adapter.createDevice(mac);
-//    cout << "Remote Device UBI: " << remoteDeviceUBI << endl;
-    return true;
-}
-
-bool SolidBluetooth::bluetoothRemoveDevice(const QString &adapterUbi, const QString &/*remoteDeviceUbi*/)
-{
-    Solid::Control::BluetoothManager &manager = Solid::Control::BluetoothManager::self();
-    Solid::Control::BluetoothInterface adapter = manager.findBluetoothInterface(adapterUbi);
-//    adapter.removeDevice(remoteDeviceUbi);
-    return true;
-}
-
-bool SolidBluetooth::bluetoothGetProperties(const QString &adapterUbi)
-{
-    Solid::Control::BluetoothManager &manager = Solid::Control::BluetoothManager::self();
-    Solid::Control::BluetoothInterface adapter = manager.findBluetoothInterface(adapterUbi);
-    QMap<QString,QVariant> props = adapter.getProperties();
-    foreach (QString valName, props.keys()) {
-        cout << valName << ": " << props[valName] << endl;
-    }
-    return true;
-}
-
-
-#if 0
 bool SolidBluetooth::bluetoothGetRemoteName(const QString &adapterUbi, const QString &mac)
 {
     Solid::Control::BluetoothManager &manager = Solid::Control::BluetoothManager::self();
@@ -749,6 +685,5 @@
     }
     m_loop.exit();
 }
-#endif
 
 #include "solid-bluetooth.moc"
diff -ur kdebase-workspace-4.2.0/solid/solidshell/solid-bluetooth.h kdebase-workspace-4.2.0-bluetooth-revert/solid/solidshell/solid-bluetooth.h
--- kdebase-workspace-4.2.0/solid/solidshell/solid-bluetooth.h	2008-10-17 13:00:20.000000000 +0200
+++ kdebase-workspace-4.2.0-bluetooth-revert/solid/solidshell/solid-bluetooth.h	2008-04-02 14:18:23.000000000 +0200
@@ -44,10 +44,6 @@
 
     bool bluetoothListAdapters();
     bool bluetoothDefaultAdapter();
-    bool bluetoothCreateDevice(const QString &adapterUbi, const QString &mac);
-    bool bluetoothRemoveDevice(const QString &adapterUbi, const QString &mac);
-    bool bluetoothGetProperties(const QString &adapterUbi);
-#if 0    
     bool bluetoothGetRemoteName(const QString &adapterUbi, const QString &mac);
     bool bluetoothAdapterAddress(const QString &ubi);
     bool bluetoothAdapterName(const QString &ubi);
@@ -67,7 +63,6 @@
     bool bluetoothRemoteCreateBonding(const QString &adapterUbi, const QString &deviceUbi);
     bool bluetoothRemoteRemoveBonding(const QString &adapterUbi, const QString &deviceUbi);
     bool bluetoothRemoteHasBonding(const QString &adapterUbi, const QString &deviceUbi);
-#endif
 
 private:
     void connectJob(KJob *job);
@@ -76,14 +71,12 @@
     int m_error;
     QString m_errorString;
 private slots:
-#if 0
     void slotStorageResult(Solid::ErrorType error, const QVariant &errorData);
     void slotResult(KJob *job);
     void slotPercent(KJob *job, unsigned long percent);
     void slotInfoMessage(KJob *job, const QString &message);
     void slotBluetoothDeviceFound(const QString &ubi, int deviceClass, int rssi);
     void slotBluetoothDiscoveryCompleted();
-#endif    
 };
 
 


Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/F-10/kdebase-workspace.spec,v
retrieving revision 1.151
retrieving revision 1.152
diff -u -r1.151 -r1.152
--- kdebase-workspace.spec	29 Jan 2009 19:03:09 -0000	1.151
+++ kdebase-workspace.spec	29 Jan 2009 21:33:45 -0000	1.152
@@ -1,10 +1,14 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
+%if 0%{?fedora} <= 9
+%define have_bluez3 1
+%endif
+
 Summary: K Desktop Environment - Workspace
 Name: kdebase-workspace
 Version: 4.2.0
 
-Release: 4%{?dist}
+Release: 4%{?dist}.1
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-workspace-%{version}.tar.bz2
 License: GPLv2
 Group: User Interface/Desktops
@@ -30,6 +34,9 @@
 Patch100: kdebase-workspace-4.1.96-AllowExternalPaths.patch
 # solid-bluetooth, https://bugzilla.redhat.com/481801
 Patch101: solid-bluetoothTrunkTo42.diff
+# revert solid-bluetooth to the version from 4.1.4, needed for kdebluetooth 0.2
+# 0.3 requires BlueZ 4 and the patch above
+Patch102: kdebase-workspace-4.2.0-bluetooth-revert.patch
 
 # FIXME: "inconsistent naming System Monitor vs KSysGuard" http://bugs.kde.org/162151
 
@@ -123,7 +130,11 @@
 %package devel
 Group:    Development/Libraries
 Summary:  Development files for %{name}
+%if 0%{?have_bluez3}
+Provides: solid-bluetooth-devel = 4.1.4-1
+%else
 Provides: solid-bluetooth-devel = 4.3-0.1
+%endif
 Requires: %{name}-libs = %{version}-%{release}
 Requires: kdelibs4-devel
 %description devel
@@ -132,7 +143,11 @@
 %package libs
 Summary: Runtime libraries for %{name}
 Group:   System Environment/Libraries
+%if 0%{?have_bluez3}
+Provides: solid-bluetooth = 4.1.4-1
+%else
 Provides: solid-bluetooth = 4.3-0.1
+%endif
 Requires: kdelibs4 >= %{version}
 Requires: %{name} = %{version}-%{release}
 %description libs
@@ -181,8 +196,11 @@
 
 # upstream patches
 %patch100 -p1 -b .AllowExternalPaths
+%if 0%{?have_bluez3}
+%patch102 -p1 -b .bluetooth-revert
+%else
 %patch101 -p0 -b .solid-bluetoothTrunkTo42
-
+%endif
 
 %build
 
@@ -308,6 +326,10 @@
 
 
 %changelog
+* Thu Jan 29 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.2.0-4.1
+- conditionalize bluetooth backport on F10+
+- F9: revert solid-bluetooth to the version from KDE 4.1.4
+
 * Thu Jan 29 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.0-4
 - omit ldap hack (#457638), kde42's reduced linkage to the rescue
 



From kkofler at fedoraproject.org  Thu Jan 29 21:34:17 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Thu, 29 Jan 2009 21:34:17 +0000 (UTC)
Subject: rpms/kdebase-workspace/devel
	kdebase-workspace-4.2.0-bluetooth-revert.patch, NONE,
	1.1 kdebase-workspace.spec, 1.173, 1.174
Message-ID: <20090129213417.40AED70141@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdebase-workspace/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12041/devel

Modified Files:
	kdebase-workspace.spec 
Added Files:
	kdebase-workspace-4.2.0-bluetooth-revert.patch 
Log Message:
Sync the F9 conditionals up to facilitate future merges.

kdebase-workspace-4.2.0-bluetooth-revert.patch:

--- NEW FILE kdebase-workspace-4.2.0-bluetooth-revert.patch ---
diff -ur kdebase-workspace-4.2.0/libs/solid/control/backends/CMakeLists.txt kdebase-workspace-4.2.0-bluetooth-revert/libs/solid/control/backends/CMakeLists.txt
--- kdebase-workspace-4.2.0/libs/solid/control/backends/CMakeLists.txt	2008-10-17 13:00:21.000000000 +0200
+++ kdebase-workspace-4.2.0-bluetooth-revert/libs/solid/control/backends/CMakeLists.txt	2008-01-05 00:55:29.000000000 +0100
@@ -1,3 +1,3 @@
 add_subdirectory( fakenet )
-#add_subdirectory( fakebluetooth )
+add_subdirectory( fakebluetooth )
 
diff -ur kdebase-workspace-4.2.0/libs/solid/control/backends/fakebluetooth/fakebluetoothinterface.h kdebase-workspace-4.2.0-bluetooth-revert/libs/solid/control/backends/fakebluetooth/fakebluetoothinterface.h
--- kdebase-workspace-4.2.0/libs/solid/control/backends/fakebluetooth/fakebluetoothinterface.h	2008-07-03 07:05:34.000000000 +0200
+++ kdebase-workspace-4.2.0-bluetooth-revert/libs/solid/control/backends/fakebluetooth/fakebluetoothinterface.h	2008-08-28 10:06:55.000000000 +0200
@@ -134,6 +134,7 @@
     }
     bool isTrusted(const QString& mac)
     {
+	Q_UNUSED(mac)
 	return true;
     }
 
diff -ur kdebase-workspace-4.2.0/libs/solid/control/bluetoothinputdevice.cpp kdebase-workspace-4.2.0-bluetooth-revert/libs/solid/control/bluetoothinputdevice.cpp
--- kdebase-workspace-4.2.0/libs/solid/control/bluetoothinputdevice.cpp	2008-10-30 15:13:17.000000000 +0100
+++ kdebase-workspace-4.2.0-bluetooth-revert/libs/solid/control/bluetoothinputdevice.cpp	2008-05-21 10:33:09.000000000 +0200
@@ -19,6 +19,7 @@
 
 */
 
+#include <QMap>
 #include <QStringList>
 
 #include "ifaces/bluetoothinputdevice.h"
@@ -71,19 +72,39 @@
     return_SOLID_CALL(Ifaces::BluetoothInputDevice *, d->backendObject(), QString(), ubi());
 }
 
-QMap<QString,QVariant> Solid::Control::BluetoothInputDevice::getProperties() const
+bool Solid::Control::BluetoothInputDevice::isConnected() const
 {
-    return_SOLID_CALL(Ifaces::BluetoothInputDevice *, d->backendObject(), (QMap< QString,QVariant >()), getProperties());
+    return_SOLID_CALL(Ifaces::BluetoothInputDevice *, d->backendObject(), false, isConnected());
 }
 
-void Solid::Control::BluetoothInputDevice::connect()
+QString Solid::Control::BluetoothInputDevice::name() const
 {
-    SOLID_CALL(Ifaces::BluetoothInputDevice *, d->backendObject(), connect());
+    return_SOLID_CALL(Ifaces::BluetoothInputDevice *, d->backendObject(), QString(), name());
 }
 
-void Solid::Control::BluetoothInputDevice::disconnect()
+QString Solid::Control::BluetoothInputDevice::address() const
 {
-    SOLID_CALL(Ifaces::BluetoothInputDevice *, d->backendObject(), disconnect());
+    return_SOLID_CALL(Ifaces::BluetoothInputDevice *, d->backendObject(), QString(), address());
+}
+
+QString Solid::Control::BluetoothInputDevice::productID() const
+{
+    return_SOLID_CALL(Ifaces::BluetoothInputDevice *, d->backendObject(), QString(), productID());
+}
+
+QString Solid::Control::BluetoothInputDevice::vendorID() const
+{
+    return_SOLID_CALL(Ifaces::BluetoothInputDevice *, d->backendObject(), QString(), vendorID());
+}
+
+void Solid::Control::BluetoothInputDevice::slotConnect()
+{
+    SOLID_CALL(Ifaces::BluetoothInputDevice *, d->backendObject(), slotConnect());
+}
+
+void Solid::Control::BluetoothInputDevice::slotDisconnect()
+{
+    SOLID_CALL(Ifaces::BluetoothInputDevice *, d->backendObject(), slotDisconnect());
 }
 
 void Solid::Control::BluetoothInputDevicePrivate::setBackendObject(QObject *object)
@@ -91,8 +112,10 @@
     FrontendObjectPrivate::setBackendObject(object);
 
     if (object) {
-        QObject::connect(object, SIGNAL(propertyChanged(QString,QVariant)),
-                         parent(), SIGNAL(propertyChanged(QString,QVariant)));
+        QObject::connect(object, SIGNAL(connected()),
+                         parent(), SIGNAL(connected()));
+        QObject::connect(object, SIGNAL(disconnected()),
+                         parent(), SIGNAL(disconnected()));
     }
 }
 
diff -ur kdebase-workspace-4.2.0/libs/solid/control/bluetoothinputdevice.h kdebase-workspace-4.2.0-bluetooth-revert/libs/solid/control/bluetoothinputdevice.h
--- kdebase-workspace-4.2.0/libs/solid/control/bluetoothinputdevice.h	2008-10-30 15:13:17.000000000 +0100
+++ kdebase-workspace-4.2.0-bluetooth-revert/libs/solid/control/bluetoothinputdevice.h	2008-06-10 13:41:04.000000000 +0200
@@ -1,7 +1,6 @@
 /*  This file is part of the KDE project
     Copyright (C) 2007 Will Stephenson <wstephenson at kde.org>
     Copyright (C) 2007 Daniel Gollub <dgollub at suse.de>
-    Copyright (C) 2008 Tom Patzig <tpatzig at suse.de>
 
 
     This library is free software; you can redistribute it and/or
@@ -24,8 +23,6 @@
 #define SOLID_CONTROL_BLUETOOTHINPUTDEVICE_H
 
 #include <QtCore/QObject>
-#include <QtCore/QMap>
-#include <QtCore/QVariant>
 
 #include "solid_control_export.h"
 
@@ -77,36 +74,65 @@
      * @returns the Universal Network Identifier of the current bluetooth remote device
      */
     QString ubi() const;
+
+    /**
+     * Retrieves connection status of bluetooth input device.
+     *
+     * @returns true if bluetooth input device is connected
+     */
+    bool isConnected() const;
+
+    /**
+     * Retrieves MAC address of bluetooth input device.
+     *
+     * @returns MAC address of bluetooth input device
+     */
+    QString address() const;
+
+    /**
+     * Retrievies Name of bluetooth input device.
+     *
+     * @returns Name of bluetooth input device
+     */
+    QString name() const;
+
     /**
-     * Retrieve all properties from the input device.
+     * Retrieves Product ID of bluetooth input device.
      *
-     * @returns a hash of named properties
+     * @returns Product ID of bluetooth input device
      */
-    QMap<QString,QVariant> getProperties() const;
+    QString productID() const;
 
+    /**
+     * Retrieves Vendor ID of bluetooth input device.
+     *
+     * @returns Vendor ID of bluetooth input device
+     */
+    QString vendorID() const;
 
 
 public Q_SLOTS:
     /**
      * Connect bluetooth input device.
      */
-    void connect();
+    void slotConnect();
 
     /**
      * Disconnect bluetooth input device.
      */
-    void disconnect();
+    void slotDisconnect();
 
 
 Q_SIGNALS:
-     /**
-     * A Property for the input device has changed.
-     *
-     * @param name the name of the changed property
-     * @param value the new value
+    /**
+     * This signal is emitted when the bluetooth input device is connected.
      */
-    void propertyChanged(const QString &name, const QVariant &value);
+    void connected();
 
+    /**
+     * This signal is emitted when the bluetooth input device is not available anymore.
+     */
+    void disconnected();
 
 private:
     Q_PRIVATE_SLOT(d, void _k_destroyed(QObject *))
diff -ur kdebase-workspace-4.2.0/libs/solid/control/bluetoothinterface.cpp kdebase-workspace-4.2.0-bluetooth-revert/libs/solid/control/bluetoothinterface.cpp
--- kdebase-workspace-4.2.0/libs/solid/control/bluetoothinterface.cpp	2008-12-04 09:34:54.000000000 +0100
+++ kdebase-workspace-4.2.0-bluetooth-revert/libs/solid/control/bluetoothinterface.cpp	2008-07-03 07:05:34.000000000 +0200
@@ -1,7 +1,6 @@
 /*  This file is part of the KDE project
     Copyright (C) 2006 Will Stephenson <wstephenson at kde.org>
     Copyright (C) 2007 Daniel Gollub <dgollub at suse.de>
-    Copyright (C) 2008 Tom Patzig <tpatzig at suse.de>
 
 
     This library is free software; you can redistribute it and/or
@@ -23,7 +22,6 @@
 #include <QMap>
[...3653 lines suppressed...]
-    QMap<QString, QVariant> props =  iface.getProperties();
-
-    foreach(QString key, props.keys()) {
-        kDebug() << "Interface Property: " << key << " : " << props[key];
-    }
-
+//    iface.discoverDevices();
 
-    iface.startDiscovery();
+    iface.startPeriodicDiscovery();
 
 #if 0
     BluezBluetoothRemoteDevice remote("/org/bluez/hci0/00:16:BC:15:A3:FF");
diff -ur kdebase-workspace-4.2.0/solid/solidshell/solid-bluetooth.cpp kdebase-workspace-4.2.0-bluetooth-revert/solid/solidshell/solid-bluetooth.cpp
--- kdebase-workspace-4.2.0/solid/solidshell/solid-bluetooth.cpp	2008-12-04 09:34:48.000000000 +0100
+++ kdebase-workspace-4.2.0-bluetooth-revert/solid/solidshell/solid-bluetooth.cpp	2008-04-02 14:18:23.000000000 +0200
@@ -70,8 +70,8 @@
 
         QStringList list = value.toStringList();
 
-        QStringList::ConstIterator it = list.constBegin();
-        QStringList::ConstIterator end = list.constEnd();
+        QStringList::ConstIterator it = list.begin();
+        QStringList::ConstIterator end = list.end();
 
         for (; it!=end; ++it)
         {
@@ -149,7 +149,7 @@
 
 std::ostream &operator<<(std::ostream &out, const QMap<QString,QVariant> &properties)
 {
-    foreach (const QString& key, properties.keys())
+    foreach (QString key, properties.keys())
     {
         out << "  " << key << " = " << properties[key] << endl;
     }
@@ -205,17 +205,6 @@
       cout << "  solid-bluetooth defaultadapter" << endl;
       cout << i18n("             # List bluetooth default adapter/interface\n") << endl;
 
-      cout << "  solid-bluetooth createdevice (interface 'ubi') 'remote-mac'" << endl;
-      cout << i18n("             # Request to create a remote bluetooth device on the bus\n") << endl;
-
-      cout << "  solid-bluetooth removedevice (interface 'ubi') 'remote-mac'" << endl;
-      cout << i18n("             # Request to remove the remote bluetooth device from the bus\n") << endl;
-
-      cout << "  solid-bluetooth getproperties (interface 'ubi') " << endl;
-      cout << i18n("             # Request the properties from the bluetooth adapter\n") << endl;
-
-
-/*
       cout << "  solid-bluetooth getremotename (interface 'ubi') 'remote-mac'" << endl;
       cout << i18n("             # Query the name from the remote device 'remote-mac' with 'ubi'\n") << endl;
 
@@ -242,7 +231,7 @@
       cout << i18n("             # Create bonding (pairing) with bluetooth remote device.\n"
                     "             # Remove bonding of bluetooth remote device.\n"
                     "             # Check for bonding of bluetooth remote device.\n") << endl;
-*/
+
       return 0;
   }
 
@@ -263,35 +252,11 @@
     if (command == "listadapters")
     {
         return shell.bluetoothListAdapters();
-    } 
+    }
     else if (command == "defaultadapter")
     {
         return shell.bluetoothDefaultAdapter();
     }
-    else if (command == "createdevice")
-    {
-        checkArgumentCount(3, 3);
-    	QString adapterUbi(args->arg(1));
-    	QString mac(args->arg(2));		
-    	return shell.bluetoothCreateDevice(adapterUbi, mac);
-    }
-    else if (command == "removedevice")
-    {
-        checkArgumentCount(3, 3);
-    	QString adapterUbi(args->arg(1));
-    	QString remoteUbi(args->arg(2));		
-    	return shell.bluetoothRemoveDevice(adapterUbi, remoteUbi);
-    }
-    else if (command == "getproperties")
-    {
-        checkArgumentCount(2, 2);
-        QString ubi (args->arg(1));
-        return shell.bluetoothGetProperties(ubi);
-    }
-
-
-
-#if 0    
     else if (command == "getremotename")
     {
         checkArgumentCount(3, 3);
@@ -401,7 +366,6 @@
         }
 
     }
-#endif    
     else
     {
         cerr << i18n("Syntax Error: Unknown command '%1'" , command) << endl;
@@ -414,7 +378,9 @@
 {
     Solid::Control::BluetoothManager &manager = Solid::Control::BluetoothManager::self();
 
-    foreach (Solid::Control::BluetoothInterface device, manager.bluetoothInterfaces())
+    const Solid::Control::BluetoothInterfaceList all = manager.bluetoothInterfaces();
+
+    foreach (const Solid::Control::BluetoothInterface device, all)
     {
         cout << "UBI = '" << device.ubi() << "'" << endl;
     }
@@ -430,36 +396,6 @@
     return true;
 }
 
-bool SolidBluetooth::bluetoothCreateDevice(const QString &adapterUbi, const QString &/*mac*/)
-{
-    Solid::Control::BluetoothManager &manager = Solid::Control::BluetoothManager::self();
-    Solid::Control::BluetoothInterface adapter = manager.findBluetoothInterface(adapterUbi);
-//    QString remoteDeviceUBI = adapter.createDevice(mac);
-//    cout << "Remote Device UBI: " << remoteDeviceUBI << endl;
-    return true;
-}
-
-bool SolidBluetooth::bluetoothRemoveDevice(const QString &adapterUbi, const QString &/*remoteDeviceUbi*/)
-{
-    Solid::Control::BluetoothManager &manager = Solid::Control::BluetoothManager::self();
-    Solid::Control::BluetoothInterface adapter = manager.findBluetoothInterface(adapterUbi);
-//    adapter.removeDevice(remoteDeviceUbi);
-    return true;
-}
-
-bool SolidBluetooth::bluetoothGetProperties(const QString &adapterUbi)
-{
-    Solid::Control::BluetoothManager &manager = Solid::Control::BluetoothManager::self();
-    Solid::Control::BluetoothInterface adapter = manager.findBluetoothInterface(adapterUbi);
-    QMap<QString,QVariant> props = adapter.getProperties();
-    foreach (QString valName, props.keys()) {
-        cout << valName << ": " << props[valName] << endl;
-    }
-    return true;
-}
-
-
-#if 0
 bool SolidBluetooth::bluetoothGetRemoteName(const QString &adapterUbi, const QString &mac)
 {
     Solid::Control::BluetoothManager &manager = Solid::Control::BluetoothManager::self();
@@ -749,6 +685,5 @@
     }
     m_loop.exit();
 }
-#endif
 
 #include "solid-bluetooth.moc"
diff -ur kdebase-workspace-4.2.0/solid/solidshell/solid-bluetooth.h kdebase-workspace-4.2.0-bluetooth-revert/solid/solidshell/solid-bluetooth.h
--- kdebase-workspace-4.2.0/solid/solidshell/solid-bluetooth.h	2008-10-17 13:00:20.000000000 +0200
+++ kdebase-workspace-4.2.0-bluetooth-revert/solid/solidshell/solid-bluetooth.h	2008-04-02 14:18:23.000000000 +0200
@@ -44,10 +44,6 @@
 
     bool bluetoothListAdapters();
     bool bluetoothDefaultAdapter();
-    bool bluetoothCreateDevice(const QString &adapterUbi, const QString &mac);
-    bool bluetoothRemoveDevice(const QString &adapterUbi, const QString &mac);
-    bool bluetoothGetProperties(const QString &adapterUbi);
-#if 0    
     bool bluetoothGetRemoteName(const QString &adapterUbi, const QString &mac);
     bool bluetoothAdapterAddress(const QString &ubi);
     bool bluetoothAdapterName(const QString &ubi);
@@ -67,7 +63,6 @@
     bool bluetoothRemoteCreateBonding(const QString &adapterUbi, const QString &deviceUbi);
     bool bluetoothRemoteRemoveBonding(const QString &adapterUbi, const QString &deviceUbi);
     bool bluetoothRemoteHasBonding(const QString &adapterUbi, const QString &deviceUbi);
-#endif
 
 private:
     void connectJob(KJob *job);
@@ -76,14 +71,12 @@
     int m_error;
     QString m_errorString;
 private slots:
-#if 0
     void slotStorageResult(Solid::ErrorType error, const QVariant &errorData);
     void slotResult(KJob *job);
     void slotPercent(KJob *job, unsigned long percent);
     void slotInfoMessage(KJob *job, const QString &message);
     void slotBluetoothDeviceFound(const QString &ubi, int deviceClass, int rssi);
     void slotBluetoothDiscoveryCompleted();
-#endif    
 };
 
 


Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/devel/kdebase-workspace.spec,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -r1.173 -r1.174
--- kdebase-workspace.spec	29 Jan 2009 19:00:16 -0000	1.173
+++ kdebase-workspace.spec	29 Jan 2009 21:33:46 -0000	1.174
@@ -1,10 +1,14 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
+%if 0%{?fedora} <= 9
+%define have_bluez3 1
+%endif
+
 Summary: K Desktop Environment - Workspace
 Name: kdebase-workspace
 Version: 4.2.0
 
-Release: 4%{?dist}
+Release: 4%{?dist}.1
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-workspace-%{version}.tar.bz2
 License: GPLv2
 Group: User Interface/Desktops
@@ -30,6 +34,9 @@
 Patch100: kdebase-workspace-4.1.96-AllowExternalPaths.patch
 # solid-bluetooth, https://bugzilla.redhat.com/481801
 Patch101: solid-bluetoothTrunkTo42.diff
+# revert solid-bluetooth to the version from 4.1.4, needed for kdebluetooth 0.2
+# 0.3 requires BlueZ 4 and the patch above
+Patch102: kdebase-workspace-4.2.0-bluetooth-revert.patch
 
 # FIXME: "inconsistent naming System Monitor vs KSysGuard" http://bugs.kde.org/162151
 
@@ -123,7 +130,11 @@
 %package devel
 Group:    Development/Libraries
 Summary:  Development files for %{name}
+%if 0%{?have_bluez3}
+Provides: solid-bluetooth-devel = 4.1.4-1
+%else
 Provides: solid-bluetooth-devel = 4.3-0.1
+%endif
 Requires: %{name}-libs = %{version}-%{release}
 Requires: kdelibs4-devel
 %description devel
@@ -132,7 +143,11 @@
 %package libs
 Summary: Runtime libraries for %{name}
 Group:   System Environment/Libraries
+%if 0%{?have_bluez3}
+Provides: solid-bluetooth = 4.1.4-1
+%else
 Provides: solid-bluetooth = 4.3-0.1
+%endif
 Requires: kdelibs4 >= %{version}
 Requires: %{name} = %{version}-%{release}
 %description libs
@@ -181,8 +196,11 @@
 
 # upstream patches
 %patch100 -p1 -b .AllowExternalPaths
+%if 0%{?have_bluez3}
+%patch102 -p1 -b .bluetooth-revert
+%else
 %patch101 -p0 -b .solid-bluetoothTrunkTo42
-
+%endif
 
 %build
 
@@ -308,6 +326,10 @@
 
 
 %changelog
+* Thu Jan 29 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.2.0-4.1
+- conditionalize bluetooth backport on F10+
+- F9: revert solid-bluetooth to the version from KDE 4.1.4
+
 * Thu Jan 29 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.0-4
 - omit ldap hack (#457638), kde42's reduced linkage to the rescue
 



From ianweller at fedoraproject.org  Thu Jan 29 21:34:27 2009
From: ianweller at fedoraproject.org (Ian Weller)
Date: Thu, 29 Jan 2009 21:34:27 +0000 (UTC)
Subject: rpms/gwibber/devel gwibber.spec,1.14,1.15
Message-ID: <20090129213427.E43A070116@cvs1.fedora.phx.redhat.com>

Author: ianweller

Update of /cvs/pkgs/rpms/gwibber/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12226

Modified Files:
	gwibber.spec 
Log Message:
bump specfile by .1 for a rebuild


Index: gwibber.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gwibber/devel/gwibber.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- gwibber.spec	29 Jan 2009 04:03:53 -0000	1.14
+++ gwibber.spec	29 Jan 2009 21:33:57 -0000	1.15
@@ -4,7 +4,7 @@
 
 Name:           gwibber
 Version:        0.7.3
-Release:        3.%{bzr_rev}bzr%{?dist}
+Release:        3.%{bzr_rev}bzr.1%{?dist}
 Summary:        An open source microblogging client for GNOME developed with Python and GTK
 
 Group:          Applications/Internet
@@ -68,6 +68,9 @@
 
 
 %changelog
+* Thu Jan 29 2009 Ian Weller <ianweller at gmail.com> 0.7.3-3.199bzr.1
+- Rawhide bump, failed build
+
 * Wed Jan 28 2009 Ian Weller <ianweller at gmail.com> 0.7.3-3.199bzr
 - Update upstream to r199:
   - more translations



From cebbert at fedoraproject.org  Thu Jan 29 22:00:42 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Thu, 29 Jan 2009 22:00:42 +0000 (UTC)
Subject: rpms/kernel/devel config-generic, 1.230, 1.231 config-x86-generic, 
	1.61, 1.62 config-x86_64-generic, 1.64, 1.65 kernel.spec, 1.1246,
	1.1247
Message-ID: <20090129220042.724C370116@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16079

Modified Files:
	config-generic config-x86-generic config-x86_64-generic 
	kernel.spec 
Log Message:
Clean up config files a bit.


Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-generic,v
retrieving revision 1.230
retrieving revision 1.231
diff -u -r1.230 -r1.231
--- config-generic	28 Jan 2009 07:50:25 -0000	1.230
+++ config-generic	29 Jan 2009 22:00:11 -0000	1.231
@@ -1963,6 +1963,7 @@
 CONFIG_SENSORS_ADM1031=m
 CONFIG_SENSORS_ADM9240=m
 CONFIG_SENSORS_ADS7828=m
+CONFIG_SENSORS_ADT7462=m
 CONFIG_SENSORS_ADT7470=m
 CONFIG_SENSORS_ADT7473=m
 CONFIG_SENSORS_ADT7475=m
@@ -1991,6 +1992,7 @@
 CONFIG_SENSORS_IBMPEX=m
 CONFIG_SENSORS_IT87=m
 CONFIG_SENSORS_K8TEMP=m
+CONFIG_SENSORS_LIS3LV02D=m
 CONFIG_SENSORS_LM63=m
 CONFIG_SENSORS_LM75=m
 CONFIG_SENSORS_LM77=m
@@ -2523,7 +2525,6 @@
 CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
 # CONFIG_FONTS is not set
 
-
 #
 # Logo configuration
 #
@@ -2817,6 +2818,10 @@
 CONFIG_SOC_CAMERA_MT9M001=m
 CONFIG_SOC_CAMERA_MT9V022=m
 CONFIG_SOC_CAMERA_PLATFORM=m
+CONFIG_SOC_CAMERA_MT9M111=m
+CONFIG_SOC_CAMERA_MT9T031=m
+CONFIG_SOC_CAMERA_TW9910=m
+CONFIG_SOC_CAMERA_OV772X=m
 
 #
 # USB Network adaptors
@@ -2925,7 +2930,6 @@
 # CONFIG_USB_CYPRESS_CY7C63 is not set
 CONFIG_USB_G_SERIAL=m
 
-
 #
 # USB Miscellaneous drivers
 #
@@ -3188,6 +3192,8 @@
 # CONFIG_OCFS2_COMPAT_JBD is not set
 CONFIG_OCFS2_FS_POSIX_ACL=y
 
+CONFIG_BTRFS_FS=m
+
 CONFIG_CONFIGFS_FS=m
 
 CONFIG_DLM=m
@@ -3765,14 +3771,11 @@
 CONFIG_RESOURCE_COUNTERS=y
 # CONFIG_COMPAT_BRK is not set
 
-# FIXME: Move to arch
-CONFIG_ACPI_WMI=m
 CONFIG_ACPI_CUSTOM_DSDT_INITRD=y
 
 #FIXME: x86 generic?
 CONFIG_LEDS_CLEVO_MAIL=m
 CONFIG_I8K=m
-CONFIG_ACER_WMI=m
 CONFIG_EDAC_I3000=m
 CONFIG_EDAC_X38=m
 CONFIG_INPUT_APANEL=m
@@ -3782,7 +3785,6 @@
 CONFIG_IPWIRELESS=m
 CONFIG_RTC_DRV_DS1511=m
 CONFIG_CGROUP_MEM_CONT=y
-CONFIG_TC1100_WMI=m
 
 # CONFIG_BLK_DEV_XIP is not set
 CONFIG_MEMSTICK=m
@@ -3808,8 +3810,6 @@
 
 # CONFIG_GPIOLIB is not set
 
-CONFIG_HP_WMI=m
-
 CONFIG_UNEVICTABLE_LRU=y
 
 CONFIG_NETFILTER_TPROXY=m
@@ -3834,8 +3834,6 @@
 # CONFIG_C2PORT is not set
 CONFIG_W1_SLAVE_BQ27000=m
 
-CONFIG_SENSORS_ADT7462=m
-CONFIG_SENSORS_LIS3LV02D=m
 
 CONFIG_IT87_WDT=m
 CONFIG_W83697UG_WDT=m
@@ -3852,8 +3850,6 @@
 
 # CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
 
-CONFIG_SOC_CAMERA_MT9M111=m
-
 CONFIG_USB_WUSB=m
 CONFIG_USB_WUSB_CBAF=m
 # CONFIG_USB_WUSB_CBAF_DEBUG is not set
@@ -3885,14 +3881,7 @@
 CONFIG_FCOE=m
 # CONFIG_SCSI_LPFC_DEBUG_FS is not set
 CONFIG_VIDEO_TVP514X=m
-CONFIG_SOC_CAMERA_MT9T031=m
-CONFIG_SOC_CAMERA_TW9910=m
-CONFIG_SOC_CAMERA_OV772X=m
 
 CONFIG_DVB_DYNAMIC_MINORS=y
 CONFIG_DVB_LGDT3304=m
 CONFIG_DVB_S921=m
-
-CONFIG_BTRFS_FS=m
-
-CONFIG_X86_PLATFORM_DEVICES=y


Index: config-x86-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-x86-generic,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- config-x86-generic	16 Jan 2009 21:34:24 -0000	1.61
+++ config-x86-generic	29 Jan 2009 22:00:11 -0000	1.62
@@ -310,6 +310,7 @@
 
 # CONFIG_SGI_IOC4 is not set
 
+CONFIG_X86_PLATFORM_DEVICES=y
 CONFIG_ASUS_LAPTOP=m
 CONFIG_COMPAL_LAPTOP=m
 CONFIG_EEEPC_LAPTOP=m
@@ -318,6 +319,10 @@
 CONFIG_MSI_LAPTOP=m
 CONFIG_SONY_LAPTOP=m
 CONFIG_DELL_LAPTOP=m
+CONFIG_ACPI_WMI=m
+CONFIG_ACER_WMI=m
+CONFIG_TC1100_WMI=m
+CONFIG_HP_WMI=m
 
 # CONFIG_SMSC37B787_WDT is not set
 CONFIG_W83697HF_WDT=m


Index: config-x86_64-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-x86_64-generic,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- config-x86_64-generic	16 Jan 2009 21:34:24 -0000	1.64
+++ config-x86_64-generic	29 Jan 2009 22:00:11 -0000	1.65
@@ -97,6 +97,7 @@
 # Disable in F9.
 CONFIG_ACPI_PROC_EVENT=y
 
+CONFIG_X86_PLATFORM_DEVICES=y
 CONFIG_ASUS_LAPTOP=m
 CONFIG_COMPAL_LAPTOP=m
 CONFIG_FUJITSU_LAPTOP=m
@@ -106,6 +107,10 @@
 CONFIG_SONYPI_COMPAT=y
 # CONFIG_EEEPC_LAPTOP is not set
 CONFIG_DELL_LAPTOP=m
+CONFIG_ACPI_WMI=m
+CONFIG_ACER_WMI=m
+CONFIG_HP_WMI=m
+
 
 
 CONFIG_THINKPAD_ACPI=m


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1246
retrieving revision 1.1247
diff -u -r1.1246 -r1.1247
--- kernel.spec	29 Jan 2009 19:34:29 -0000	1.1246
+++ kernel.spec	29 Jan 2009 22:00:11 -0000	1.1247
@@ -1783,6 +1783,9 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Thu Jan 29 2009 Chuck Ebbert <cebbert at redhat.com>
+- Clean up config files a bit.
+
 * Thu Jan 29 2009 Mark McLoughlin <markmc at redhat.com>
 - Temporarily disable kvmclock, fix for upstream in progress (#475598)
 



From wart at fedoraproject.org  Thu Jan 29 22:10:36 2009
From: wart at fedoraproject.org (Michael Thomas)
Date: Thu, 29 Jan 2009 22:10:36 +0000 (UTC)
Subject: rpms/neverball/devel neverball.spec,1.19,1.20
Message-ID: <20090129221036.3072170116@cvs1.fedora.phx.redhat.com>

Author: wart

Update of /cvs/pkgs/rpms/neverball/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18148

Modified Files:
	neverball.spec 
Log Message:
Change from bitstream-vera font to equivalent dejavu font.




Index: neverball.spec
===================================================================
RCS file: /cvs/pkgs/rpms/neverball/devel/neverball.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- neverball.spec	17 Jan 2009 02:40:42 -0000	1.19
+++ neverball.spec	29 Jan 2009 22:10:05 -0000	1.20
@@ -1,6 +1,6 @@
 Name:           neverball
 Version:        1.4.0
-Release:        14%{?dist}
+Release:        15%{?dist}
 
 Summary:        Roll a ball through an obstacle course
 
@@ -15,7 +15,7 @@
 BuildRequires:  SDL_image-devel, SDL_ttf-devel, SDL_mixer-devel
 BuildRequires:  freetype-devel, desktop-file-utils, zlib-devel
 BuildRequires:  libGL-devel
-Requires: opengl-games-utils bitstream-vera-sans-fonts
+Requires: opengl-games-utils dejavu-sans-fonts
 
 %description
 Tilt the floor to roll a ball through an obstacle course within the
@@ -45,7 +45,7 @@
 
 # Use system fonts instead of bundling our own
 rm $RPM_BUILD_ROOT%{_datadir}/%{name}/ttf/VeraBd.ttf
-ln -s %{_datadir}/fonts/bitstream-vera/VeraBd.ttf $RPM_BUILD_ROOT%{_datadir}/%{name}/ttf/VeraBd.ttf
+ln -s %{_datadir}/fonts/dejavu/DejaVuSans-Bold.ttf $RPM_BUILD_ROOT%{_datadir}/%{name}/ttf/VeraBd.ttf
 
 ln -s opengl-game-wrapper.sh $RPM_BUILD_ROOT%{_bindir}/neverball-wrapper
 ln -s opengl-game-wrapper.sh $RPM_BUILD_ROOT%{_bindir}/neverputt-wrapper
@@ -70,6 +70,9 @@
 %{_datadir}/applications/*
 
 %changelog
+* Thu Jan 29 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 1.4.0-15
+- Change from bitstream-vera font to equivalent dejavu font.
+
 * Fri Jan 16 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 1.4.0-14
 - Fix font Requires bitstream-vera-fonts-sans ->
   bitstream-vera-sans-fonts (another font naming convention change).



From emaldonado at fedoraproject.org  Thu Jan 29 22:16:03 2009
From: emaldonado at fedoraproject.org (Elio Maldonado)
Date: Thu, 29 Jan 2009 22:16:03 +0000 (UTC)
Subject: rpms/crypto-utils/devel certwatch.c,1.19,1.20
Message-ID: <20090129221603.D6D7970116@cvs1.fedora.phx.redhat.com>

Author: emaldonado

Update of /cvs/extras/rpms/crypto-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19161

Modified Files:
	certwatch.c 
Log Message:
Fix certwatch time calculations for expiring certificates (#473860)


Index: certwatch.c
===================================================================
RCS file: /cvs/extras/rpms/crypto-utils/devel/certwatch.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- certwatch.c	22 Jan 2009 23:18:37 -0000	1.19
+++ certwatch.c	29 Jan 2009 22:15:33 -0000	1.20
@@ -152,6 +152,7 @@
 /* Computes the day difference among two PRTime's */
 static int diff_time_days(PRTime aT, PRTime bT)
 {
+    /* Dividing before substracting to support the desired granularity */
     PRInt64 secs = (aT/PR_USEC_PER_SEC - bT/PR_USEC_PER_SEC);
     return secs / 86400L;
 }



From wart at fedoraproject.org  Thu Jan 29 22:19:28 2009
From: wart at fedoraproject.org (Michael Thomas)
Date: Thu, 29 Jan 2009 22:19:28 +0000 (UTC)
Subject: rpms/neverball/devel neverball.spec,1.20,1.21
Message-ID: <20090129221928.17C6F70116@cvs1.fedora.phx.redhat.com>

Author: wart

Update of /cvs/pkgs/rpms/neverball/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19682

Modified Files:
	neverball.spec 
Log Message:
Fix misattributed ChangeLog entry



Index: neverball.spec
===================================================================
RCS file: /cvs/pkgs/rpms/neverball/devel/neverball.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- neverball.spec	29 Jan 2009 22:10:05 -0000	1.20
+++ neverball.spec	29 Jan 2009 22:18:57 -0000	1.21
@@ -70,7 +70,7 @@
 %{_datadir}/applications/*
 
 %changelog
-* Thu Jan 29 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 1.4.0-15
+* Thu Jan 29 2009 Wart <wart at kobold.org> - 1.4.0-15
 - Change from bitstream-vera font to equivalent dejavu font.
 
 * Fri Jan 16 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 1.4.0-14



From emaldonado at fedoraproject.org  Thu Jan 29 22:19:53 2009
From: emaldonado at fedoraproject.org (Elio Maldonado)
Date: Thu, 29 Jan 2009 22:19:53 +0000 (UTC)
Subject: rpms/crypto-utils/devel genkey.pl,1.26,1.27
Message-ID: <20090129221953.1586A70116@cvs1.fedora.phx.redhat.com>

Author: emaldonado

Update of /cvs/extras/rpms/crypto-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19810

Modified Files:
	genkey.pl 
Log Message:
Fix ca keyfile name extension


Index: genkey.pl
===================================================================
RCS file: /cvs/extras/rpms/crypto-utils/devel/genkey.pl,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- genkey.pl	5 Jan 2009 16:35:34 -0000	1.26
+++ genkey.pl	29 Jan 2009 22:19:22 -0000	1.27
@@ -154,7 +154,7 @@
 $tmpPasswordFile = ''; # none has been created yet
 $keyfile = $ssltop."/private/".$servername.".key";
 if ($ca_mode) {
-    $keyfile = $cadir."/private/".$servername."."key";
+    $keyfile = $cadir."/private/".$servername.".key";
 }
 
 ### State variables



From sandeen at fedoraproject.org  Thu Jan 29 22:21:07 2009
From: sandeen at fedoraproject.org (Eric Sandeen)
Date: Thu, 29 Jan 2009 22:21:07 +0000 (UTC)
Subject: rpms/e2fsprogs/devel .cvsignore, 1.28, 1.29 e2fsprogs.spec, 1.126, 
	1.127 sources, 1.28, 1.29 e2fsprogs-1.41.3-blkid-btrfs.patch,
	1.1, NONE e2fsprogs-1.41.3-resize2fs-fixes.patch, 1.1, NONE
Message-ID: <20090129222107.6457470116@cvs1.fedora.phx.redhat.com>

Author: sandeen

Update of /cvs/pkgs/rpms/e2fsprogs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20090

Modified Files:
	.cvsignore e2fsprogs.spec sources 
Removed Files:
	e2fsprogs-1.41.3-blkid-btrfs.patch 
	e2fsprogs-1.41.3-resize2fs-fixes.patch 
Log Message:
* Thu Jan 29 2009 Eric Sandeen <sandeen at redhat.com> 1.41.4-1
- New upstream release
- Dropped btrfs & resize fixes, upstream now



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/e2fsprogs/devel/.cvsignore,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- .cvsignore	13 Oct 2008 20:10:15 -0000	1.28
+++ .cvsignore	29 Jan 2009 22:20:37 -0000	1.29
@@ -1 +1 @@
-e2fsprogs-1.41.3.tar.gz
+e2fsprogs-1.41.4.tar.gz


Index: e2fsprogs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/e2fsprogs/devel/e2fsprogs.spec,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -r1.126 -r1.127
--- e2fsprogs.spec	20 Jan 2009 21:52:45 -0000	1.126
+++ e2fsprogs.spec	29 Jan 2009 22:20:37 -0000	1.127
@@ -3,8 +3,8 @@
 
 Summary: Utilities for managing the second and third extended (ext2/ext3) filesystems
 Name: e2fsprogs
-Version: 1.41.3
-Release: 4%{?dist}
+Version: 1.41.4
+Release: 1%{?dist}
 # License based on upstream-modified COPYING file,
 # which clearly states "V2" intent.
 License: GPLv2
@@ -15,8 +15,6 @@
 Source3: uuidd.init
 Patch1: e2fsprogs-1.38-etcblkid.patch
 Patch2: e2fsprogs-1.40.4-sb_feature_check_ignore.patch
-Patch3: e2fsprogs-1.41.3-blkid-btrfs.patch
-Patch4: e2fsprogs-1.41.3-resize2fs-fixes.patch
 
 Url: http://e2fsprogs.sourceforge.net/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -93,10 +91,6 @@
 # mildly unsafe but 'til I get something better, avoid full fsck
 # after an selinux install...
 %patch2 -p1 -b .featurecheck
-# Only change the journal placement for ext4, for now.
-%patch3 -p1 -b .journalmove
-# Fix some resize2fs issues
-%patch4 -p1 -b .resize2fs
 
 %build
 %configure --enable-elf-shlibs --enable-nls --disable-e2initrd-helper  --enable-blkid-devmapper --enable-blkid-selinux
@@ -295,6 +289,10 @@
 %dir %attr(2775, uuidd, uuidd) /var/lib/libuuid
 
 %changelog
+* Thu Jan 29 2009 Eric Sandeen <sandeen at redhat.com> 1.41.4-1
+- New upstream release
+- Dropped btrfs & resize fixes, upstream now
+
 * Tue Jan 20 2009 Eric Sandeen <sandeen at redhat.com> 1.41.3-4
 - resize2fs fixes, esp. for ext4
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/e2fsprogs/devel/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- sources	13 Oct 2008 20:10:15 -0000	1.28
+++ sources	29 Jan 2009 22:20:37 -0000	1.29
@@ -1 +1 @@
-b21d26fc46c584021dc9c444933ee1c2  e2fsprogs-1.41.3.tar.gz
+59033388df36987d2b9c9bbf7e19bd57  e2fsprogs-1.41.4.tar.gz


--- e2fsprogs-1.41.3-blkid-btrfs.patch DELETED ---


--- e2fsprogs-1.41.3-resize2fs-fixes.patch DELETED ---



From emaldonado at fedoraproject.org  Thu Jan 29 22:22:48 2009
From: emaldonado at fedoraproject.org (Elio Maldonado)
Date: Thu, 29 Jan 2009 22:22:48 +0000 (UTC)
Subject: rpms/crypto-utils/devel keyutil.c,1.12,1.13
Message-ID: <20090129222248.57AB470116@cvs1.fedora.phx.redhat.com>

Author: emaldonado

Update of /cvs/extras/rpms/crypto-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20491

Modified Files:
	keyutil.c 
Log Message:
Fix segfault when creating a certificate (#479886)


Index: keyutil.c
===================================================================
RCS file: /cvs/extras/rpms/crypto-utils/devel/keyutil.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- keyutil.c	4 Nov 2008 04:28:22 -0000	1.12
+++ keyutil.c	29 Jan 2009 22:22:17 -0000	1.13
@@ -204,6 +204,8 @@
     { NULL }
 };
 
+static certutilExtnList keyutil_extns;
+
 static void 
 Usage(char *progName)
 {
@@ -1388,8 +1390,6 @@
         const char       *certfile,
         const char       *keyoutfile)
 {
-    static certutilExtnList nullextnlist = {PR_FALSE};
-    
     CERTCertificate *cert       = NULL;
     PRFileDesc *outFile         = NULL;
     PRFileDesc *keyOutFile      = NULL;
@@ -1479,6 +1479,12 @@
             rv = 255;
             goto shutdown;
         }
+
+        if (!subjectstr) {
+            SECU_PrintError(progName, "subject string was NULL\n");
+            rv = 255;
+            goto shutdown;
+        }
         subject = CERT_AsciiToName((char *)subjectstr);
         if (!subject) {
             SECU_PrintError(progName,
@@ -1501,7 +1507,22 @@
     /*
      *  Certificate request
      */
-    
+
+    /* Extensions not supported yet */
+    keyutil_extns[ext_keyUsage] = PR_FALSE;
+    keyutil_extns[ext_basicConstraint] = PR_FALSE;
+    keyutil_extns[ext_authorityKeyID] = PR_FALSE;
+    keyutil_extns[ext_subjectKeyID] = PR_FALSE;
+    keyutil_extns[ext_CRLDistPts] = PR_FALSE;
+    keyutil_extns[ext_NSCertType] = PR_FALSE;
+    keyutil_extns[ext_extKeyUsage] = PR_FALSE;
+    keyutil_extns[ext_authInfoAcc] = PR_FALSE;
+    keyutil_extns[ext_subjInfoAcc] = PR_FALSE;
+    keyutil_extns[ext_certPolicies] = PR_FALSE;
+    keyutil_extns[ext_policyMappings] = PR_FALSE;
+    keyutil_extns[ext_policyConstr] = PR_FALSE;
+    keyutil_extns[ext_inhibitAnyPolicy] = PR_FALSE;
+
     hashAlgTag = SEC_OID_MD5;
     
     /*  Make a cert request */
@@ -1510,7 +1531,7 @@
                  ascii,        /* ASCIIForIO */
                  NULL,         /* ExtendedEmailAddrs */
                  NULL,         /* ExtendedDNSNames */
-                 nullextnlist, /* certutil_extns */
+                 keyutil_extns, /* keyutil_extns */
                  outFile);
     
     PR_Close(outFile);
@@ -1562,7 +1583,7 @@
             "tempnickname", inFile, outFile,
             privkey, &pwdata, hashAlgTag,
             serialNumber, warpmonths, validityMonths,
-            NULL, NULL, ascii, PR_TRUE, NULL,
+            NULL, NULL, ascii, PR_TRUE, keyutil_extns,
             &cert);
          /*
           ExtendedEmailAddrs,ExtendedDNSNames,



From nsantos at fedoraproject.org  Thu Jan 29 22:25:28 2009
From: nsantos at fedoraproject.org (Nuno Santos)
Date: Thu, 29 Jan 2009 22:25:28 +0000 (UTC)
Subject: rpms/ruby-qpid/F-10 ruby-qpid.spec,1.8,1.9 sources,1.7,1.8
Message-ID: <20090129222528.3C06070116@cvs1.fedora.phx.redhat.com>

Author: nsantos

Update of /cvs/extras/rpms/ruby-qpid/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20934

Modified Files:
	ruby-qpid.spec sources 
Log Message:
changed specfile to use rake build


Index: ruby-qpid.spec
===================================================================
RCS file: /cvs/extras/rpms/ruby-qpid/F-10/ruby-qpid.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ruby-qpid.spec	29 Jan 2009 21:01:42 -0000	1.8
+++ ruby-qpid.spec	29 Jan 2009 22:24:57 -0000	1.9
@@ -1,5 +1,5 @@
 Name:           ruby-qpid
-Version:	0.4.738618
+Version: 	0.4.738618
 Release:        1%{?dist}
 Summary:        Ruby language client for AMQP
 
@@ -7,23 +7,24 @@
 License:        ASL 2.0
 URL:            http://qpid.apache.org/
 Source0:        %{name}-%{version}.tar.gz
-# svn export http://svn.apache.org/repos/asf/qpid/trunk/qpid/ruby ruby-qpid
+# svn export http://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid/ruby \
+#  ruby-qpid
 # tar czf ruby-qpid.tar.gz ruby-qpid
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+%{!?ruby_sitelib: %define ruby_sitelib %(ruby -rrbconfig  -e 'puts Config::CONFIG["sitelibdir"]')}
 BuildArch:      noarch
 
 BuildRequires:  ruby
-BuildRequires:	amqp
+BuildRequires:  ruby-devel
+BuildRequires:  amqp >= 1.0.%{version}
 
 Requires:       ruby
 Requires:       ruby(abi) = 1.8
-Requires:       amqp >= 1.0.738618
+Requires:       amqp >= 1.0.%{version}
 
 Provides:       ruby(qpid) = %{version}
 
-%{!?ruby_sitelib: %define ruby_sitelib %(ruby -rrbconfig  -e 'puts Config::CONFIG["sitelibdir"]')}
-
 %description
 The Apache Qpid project's Ruby language client for AMQP.
 
@@ -31,15 +32,21 @@
 %setup -q -n %{name}-%{version}
 
 %build
-ruby -I lib -r qpid -e 'Qpid::Spec010::load()'
+pushd ruby
+rake build
+popd
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -dm 755 $RPM_BUILD_ROOT%{ruby_sitelib}/qpid
-install -pm 644 lib/qpid/*.rb $RPM_BUILD_ROOT%{ruby_sitelib}/qpid
+install -pm 644 ruby/lib/qpid/*.rb $RPM_BUILD_ROOT%{ruby_sitelib}/qpid
 install -dm 755 $RPM_BUILD_ROOT%{ruby_sitelib}/qpid/spec_cache
-install -pm 644 lib/qpid/spec_cache/*.rb_marshal $RPM_BUILD_ROOT%{ruby_sitelib}/qpid/spec_cache
-install -pm 644 lib/qpid.rb $RPM_BUILD_ROOT%{ruby_sitelib}
+install -pm 644 ruby/lib/qpid/spec_cache/*.rb_marshal \ 
+  $RPM_BUILD_ROOT%{ruby_sitelib}/qpid/spec_cache
+install -pm 644 ruby/lib/qpid.rb $RPM_BUILD_ROOT%{ruby_sitelib}
+# to quiet rpmlint warning
+chmod -x ruby/LICENSE.txt
+rm -fr specs
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -48,23 +55,18 @@
 %defattr(-,root,root,-)
 %{ruby_sitelib}/qpid
 %{ruby_sitelib}/qpid.rb
-%doc LICENSE.txt NOTICE.txt
+%doc ruby/LICENSE.txt ruby/NOTICE.txt ruby/RELEASE_NOTES
 
 %changelog
 * Thu Jan 29 2009 Nuno Santos <nsantos at redhat.com> - 0.4.738618-1
 - Rebased to svn rev 738618
 
-* Wed Jan 14 2009 Nuno Santos <nsantos at redhat.com> - 0.4.734452-1
-- Rebased to svn rev 734452
-
-* Tue Dec 23 2008 Nuno Santos <nsantos at redhat.com> - 0.4.728142-1
-- Rebased to svn rev 728142
-
-* Tue Dec  2 2008 Nuno Santos <nsantos at redhat.com> - 0.3.722557-1
-- Rebased to svn rev 722557
+* Wed Dec 10 2008 Andrew Stitcher <astitcher at redhat.com> - 0.3.725356-1
+- Updated spec file to work with RHEL 4 and earlier Fedora versions
 
-* Tue Nov 25 2008 Nuno Santos <nsantos at redhat.com> - 0.3.720585-1
-- Rebased to svn rev 720585
+* Mon Dec  1 2008 Andrew Stitcher <astitcher at redhat.com> - 0.3.722126-1
+- Changed version numbering to fit other qpid packages
+- Added release notes to doc directory
 
 * Fri Nov 14 2008 Rafael Schloming <rafaels at redhat.com> - 0.2-1
 - Updated to work with qpid M4.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ruby-qpid/F-10/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	29 Jan 2009 21:01:42 -0000	1.7
+++ sources	29 Jan 2009 22:24:57 -0000	1.8
@@ -1 +1 @@
-ce944cd296dae0178f442b71087f0a8b  ruby-qpid-0.4.738618.tar.gz
+01fcbfd9e95cc24ffa1923bd497093c1  ruby-qpid-0.4.738618.tar.gz



From nsantos at fedoraproject.org  Thu Jan 29 22:30:51 2009
From: nsantos at fedoraproject.org (Nuno Santos)
Date: Thu, 29 Jan 2009 22:30:51 +0000 (UTC)
Subject: rpms/ruby-qpid/F-10 ruby-qpid.spec,1.9,1.10
Message-ID: <20090129223051.D55F470116@cvs1.fedora.phx.redhat.com>

Author: nsantos

Update of /cvs/extras/rpms/ruby-qpid/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21930

Modified Files:
	ruby-qpid.spec 
Log Message:
add missing BuildRequires for rake


Index: ruby-qpid.spec
===================================================================
RCS file: /cvs/extras/rpms/ruby-qpid/F-10/ruby-qpid.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ruby-qpid.spec	29 Jan 2009 22:24:57 -0000	1.9
+++ ruby-qpid.spec	29 Jan 2009 22:30:21 -0000	1.10
@@ -17,6 +17,7 @@
 
 BuildRequires:  ruby
 BuildRequires:  ruby-devel
+BuildRequires:	rubygem-rake
 BuildRequires:  amqp >= 1.0.%{version}
 
 Requires:       ruby



From emaldonado at fedoraproject.org  Thu Jan 29 22:33:18 2009
From: emaldonado at fedoraproject.org (Elio Maldonado)
Date: Thu, 29 Jan 2009 22:33:18 +0000 (UTC)
Subject: rpms/crypto-utils/devel crypto-utils.spec,1.52,1.53
Message-ID: <20090129223318.CDA9170116@cvs1.fedora.phx.redhat.com>

Author: emaldonado

Update of /cvs/extras/rpms/crypto-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22427

Modified Files:
	crypto-utils.spec 
Log Message:
Fixed cert exipiry warning and a segfault on cert generationo (#473860, #479886)


Index: crypto-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/crypto-utils/devel/crypto-utils.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- crypto-utils.spec	22 Jan 2009 23:37:42 -0000	1.52
+++ crypto-utils.spec	29 Jan 2009 22:32:48 -0000	1.53
@@ -4,7 +4,7 @@
 Summary: SSL certificate and key management utilities
 Name: crypto-utils
 Version: 2.4.1
-Release: 8
+Release: 9
 Source: crypto-rand-%{crver}.tar.gz
 Source1: genkey.pl
 Source2: certwatch.c
@@ -131,6 +131,11 @@
 %{perl_vendorarch}/auto/Crypt
 
 %changelog
+* Thu Jan 29 2009 Elio Maldonado <emaldona at redhat.com> - 2.4.1-9
+- certwatch: Fixed cert expiry time calculations (#473860)
+- keyutil: Fixed segfault on certificate generation (#473860)
+- genkey: Fixed key file name extension
+
 * Wed Jan 21 2009 Elio Maldonado <emaldona at redhat.com> - 2.4.1-8
 - certwatch: Fixed cert expiry time warnings off by one error (#473860)
 



From pkgdb at fedoraproject.org  Thu Jan 29 22:37:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 29 Jan 2009 22:37:25 +0000
Subject: [pkgdb] kernel: josef has requested commit
Message-ID: <20090129223725.C538D208493@bastion.fedora.phx.redhat.com>

josef has requested the commit acl on kernel (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kernel



From hno at fedoraproject.org  Thu Jan 29 22:37:38 2009
From: hno at fedoraproject.org (=?utf-8?q?Henrik_Nordstr=C3=B6m?=)
Date: Thu, 29 Jan 2009 22:37:38 +0000 (UTC)
Subject: rpms/squid/F-10 .cvsignore, 1.36, 1.37 sources, 1.39,
	1.40 squid.spec, 1.112, 1.113
Message-ID: <20090129223738.D9AD670116@cvs1.fedora.phx.redhat.com>

Author: hno

Update of /cvs/pkgs/rpms/squid/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24078

Modified Files:
	.cvsignore sources squid.spec 
Log Message:
Squid-3.0.STABLE12


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/squid/F-10/.cvsignore,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- .cvsignore	24 Oct 2008 19:40:20 -0000	1.36
+++ .cvsignore	29 Jan 2009 22:37:08 -0000	1.37
@@ -1 +1 @@
-squid-3.0.STABLE10.tar.bz2
+squid-3.0.STABLE12.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/squid/F-10/sources,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- sources	24 Oct 2008 19:40:20 -0000	1.39
+++ sources	29 Jan 2009 22:37:08 -0000	1.40
@@ -1 +1 @@
-cfd37717230220a9f47177594e235f18  squid-3.0.STABLE10.tar.bz2
+50f10f79b78c322c9dc21b0ecdbcbefc  squid-3.0.STABLE12.tar.bz2


Index: squid.spec
===================================================================
RCS file: /cvs/pkgs/rpms/squid/F-10/squid.spec,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -r1.112 -r1.113
--- squid.spec	19 Dec 2008 07:32:11 -0000	1.112
+++ squid.spec	29 Jan 2009 22:37:08 -0000	1.113
@@ -3,8 +3,8 @@
 ## % define __find_requires %{SOURCE99}
 
 Name:     squid
-Version:  3.0.STABLE10
-Release:  3%{?dist}
+Version:  3.0.STABLE12
+Release:  1%{?dist}
 Summary:  The Squid proxy caching server
 Epoch:    7
 License:  GPLv2+
@@ -20,8 +20,7 @@
 ## Source99: filter-requires-squid.sh
 
 # Upstream patches
-Patch001: http://www.squid-cache.org/Versions/v3/3.0/changesets/b8920.patch
-Patch002: http://www.squid-cache.org/Versions/v3/3.0/changesets/b8930.patch
+#Patch001: http://www.squid-cache.org/Versions/v3/3.0/changesets/bXXXX.patch
 
 # External patches
 
@@ -60,8 +59,6 @@
 %prep
 %setup -q
 
-%patch001 -p0 -b .b8920
-%patch002 -p0 -b .b8930
 %patch201 -p1 -b .config
 %patch202 -p1 -b .location
 %patch203 -p1 -b .build
@@ -341,6 +338,9 @@
     chgrp squid /var/cache/samba/winbindd_privileged >/dev/null 2>&1 || :
 
 %changelog
+* Tue Jan 29 2009 Henrik Nordstrom <henrik at henriknordstrom.net> - 7:3.0.STABLE12-1
+- upgrade to latest upstream
+
 * Fri Dec 19 2008 Henrik Nordstrom <henrik at henriknordstrom.net> - 7:3.0.STABLE10-3
 - actually include the upstream bugfixes in the build
 



From hno at fedoraproject.org  Thu Jan 29 22:39:06 2009
From: hno at fedoraproject.org (=?utf-8?q?Henrik_Nordstr=C3=B6m?=)
Date: Thu, 29 Jan 2009 22:39:06 +0000 (UTC)
Subject: rpms/squid/F-9 .cvsignore, 1.34, 1.35 sources, 1.36, 1.37 squid.spec,
	1.102, 1.103
Message-ID: <20090129223906.53A0670116@cvs1.fedora.phx.redhat.com>

Author: hno

Update of /cvs/pkgs/rpms/squid/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24352

Modified Files:
	.cvsignore sources squid.spec 
Log Message:
Squid-3.0.STABLE12


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/squid/F-9/.cvsignore,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- .cvsignore	24 Oct 2008 20:32:51 -0000	1.34
+++ .cvsignore	29 Jan 2009 22:38:35 -0000	1.35
@@ -1 +1 @@
-squid-3.0.STABLE10.tar.bz2
+squid-3.0.STABLE12.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/squid/F-9/sources,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- sources	24 Oct 2008 20:32:51 -0000	1.36
+++ sources	29 Jan 2009 22:38:36 -0000	1.37
@@ -1 +1 @@
-cfd37717230220a9f47177594e235f18  squid-3.0.STABLE10.tar.bz2
+50f10f79b78c322c9dc21b0ecdbcbefc  squid-3.0.STABLE12.tar.bz2


Index: squid.spec
===================================================================
RCS file: /cvs/pkgs/rpms/squid/F-9/squid.spec,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -r1.102 -r1.103
--- squid.spec	19 Dec 2008 07:37:06 -0000	1.102
+++ squid.spec	29 Jan 2009 22:38:36 -0000	1.103
@@ -3,8 +3,8 @@
 ## % define __find_requires %{SOURCE99}
 
 Name:     squid
-Version:  3.0.STABLE10
-Release:  3%{?dist}
+Version:  3.0.STABLE12
+Release:  1%{?dist}
 Summary:  The Squid proxy caching server
 Epoch:    7
 License:  GPLv2+
@@ -20,8 +20,7 @@
 ## Source99: filter-requires-squid.sh
 
 # Upstream patches
-Patch001: http://www.squid-cache.org/Versions/v3/3.0/changesets/b8920.patch
-Patch002: http://www.squid-cache.org/Versions/v3/3.0/changesets/b8930.patch
+#Patch001: http://www.squid-cache.org/Versions/v3/3.0/changesets/bXXXX.patch
 
 # External patches
 
@@ -33,6 +32,8 @@
 Patch203: squid-3.0.STABLE1-build.patch
 Patch204: squid-3.0.STABLE1-perlpath.patch
 Patch205: squid-3.0.STABLE1-smb-path.patch
+#Patch207: squid-3.0.STABLE5-configure_netfilter.patch
+Patch208: squid-3.0.STABLE7-from_manpg.patch
 
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: bash >= 2.0
@@ -58,13 +59,13 @@
 %prep
 %setup -q
 
-%patch001 -p0 -b .b8920
-%patch002 -p0 -b .b8930
 %patch201 -p1 -b .config
 %patch202 -p1 -b .location
 %patch203 -p1 -b .build
 %patch204 -p1 -b .perlpath
 %patch205 -p1 -b .smb-path
+#%patch207 -p1 -b .configure_netfilter
+%patch208 -p1 -b .from_manpg
 
 %build
 export CXXFLAGS="-fPIE %{optflags}" ; export CFLAGS="-fPIE -Os -g -pipe -fsigned-char %{optflags}" ; export LDFLAGS="-pie" ;
@@ -77,8 +78,9 @@
    --sysconfdir=/etc/squid \
    --disable-dependency-tracking \
    --enable-arp-acl \
-   --enable-auth="basic,digest,ntlm" \
+   --enable-auth="basic,digest,ntlm,negotiate" \
    --enable-basic-auth-helpers="LDAP,MSNT,NCSA,PAM,SMB,YP,getpwnam,multi-domain-NTLM,SASL" \
+   --enable-negotiate-auth-helpers="squid_kerb_auth" \
    --enable-cache-digests \
    --enable-cachemgr-hostname=localhost \
    --enable-delay-pools \
@@ -336,6 +338,9 @@
     chgrp squid /var/cache/samba/winbindd_privileged >/dev/null 2>&1 || :
 
 %changelog
+* Tue Jan 29 2009 Henrik Nordstrom <henrik at henriknordstrom.net> - 7:3.0.STABLE12-1
+- upgrade to latest upstream
+
 * Fri Dec 19 2008 Henrik Nordstrom <henrik at henriknordstrom.net> - 7:3.0.STABLE10-3
 - actually include the upstream bugfixes in the build
 
@@ -344,24 +349,46 @@
 
 * Fri Oct 24 2008 Henrik Nordstrom <henrik at henriknordstrom.net> - 7:3.0.STABLE10-1
 - upgrade to latest upstream
-- change logrotate to move instead of copytruncate
+
+* Sun Oct 19 2008 Henrik Nordstrom <henrik at henriknordstrom.net> - 7:3.0.STABLE9-2
 - disable coss support, not officially supported in 3.0
 
-* Fri Oct 03 2008 Jiri Skala <jskala at redhat.com> - 7:3.0.STABLE7-2
-- Resolves: #463129 - optional config file
-- Resolves: #458593 - noisy init script
-- Resolves: #450352 - build.patch patches only generated files
+* Sun Oct 19 2008 Henrik Nordstrom <henrik at henriknordstrom.net> - 7:3.0.STABLE9-1
+- update to latest upstream
+
+* Thu Oct 09 2008 Henrik Nordstrom <henrik at henriknordstrom.net> - 7:3.0.STABLE7-4
+- change logrotate to move instead of copytruncate
 
-* Mon Jun 30 2008 Jiri Skala <jskala at redhat.com> - 7:3.0.STABLE7-1
+* Wed Oct 08 2008 Jiri Skala <jskala at redhat.com> - 7:3.0.STABLE7-3
+- fix #465052 -  FTBFS squid-3.0.STABLE7-1.fc10
+
+* Thu Aug 14 2008 Jiri Skala <jskala at redhat.com> - 7:3.0.STABLE7-2
+- used ncsa_auth.8 from man-pages. there will be this file removed due to conflict
+- fix #458593 noisy initscript
+- fix #463129 init script tests wrong conf file
+- fix #450352 - build.patch patches only generated files
+
+* Wed Jul 02 2008 Jiri Skala <jskala at redhat.com> - 7:3.0.STABLE7-1
+- update to latest upstream
+- fix #453214
+
+* Mon May 26 2008 Martin Nagy <mnagy at redhat.com> - 7:3.0.STABLE6-2
+- fix bad allocation
+
+* Wed May 21 2008 Martin Nagy <mnagy at redhat.com> - 7:3.0.STABLE6-1
 - upgrade to latest upstream
-- fix CVE-2004-0918  Squid SNMP DoS [Fedora 9] (#453214)
+- fix bad allocation
 
-* Mon May 26 2008 Martin Nagy <mnagy at redhat.com> - 7:3.0.STABLE6-1
+* Fri May 09 2008 Martin Nagy <mnagy at redhat.com> - 7:3.0.STABLE5-2
+- fix configure detection of netfilter kernel headers (#435499),
+  patch by aoliva at redhat.com
+- add support for negotiate authentication (#445337)
+
+* Fri May 02 2008 Martin Nagy <mnagy at redhat.com> - 7:3.0.STABLE5-1
 - upgrade to latest upstream
-- fix bad allocation (#447045)
 
-* Fri May 09 2008 Alexandre Oliva <aoliva at redhat.com> - 7:3.0.STABLE2-3
-- fix configure detection of netfilter kernel headers (#435499)
+* Tue Apr 08 2008 Martin Nagy <mnagy at redhat.com> - 7:3.0.STABLE4-1
+- upgrade to latest upstream
 
 * Thu Apr 03 2008 Martin Nagy <mnagy at redhat.com> - 7:3.0.STABLE2-2
 - add %%{optflags} to make



From nsantos at fedoraproject.org  Thu Jan 29 22:43:18 2009
From: nsantos at fedoraproject.org (Nuno Santos)
Date: Thu, 29 Jan 2009 22:43:18 +0000 (UTC)
Subject: rpms/ruby-qpid/F-10 ruby-qpid.spec,1.10,1.11
Message-ID: <20090129224319.0122D70116@cvs1.fedora.phx.redhat.com>

Author: nsantos

Update of /cvs/extras/rpms/ruby-qpid/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25177

Modified Files:
	ruby-qpid.spec 
Log Message:
add missing BuildRequires for sasl


Index: ruby-qpid.spec
===================================================================
RCS file: /cvs/extras/rpms/ruby-qpid/F-10/ruby-qpid.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ruby-qpid.spec	29 Jan 2009 22:30:21 -0000	1.10
+++ ruby-qpid.spec	29 Jan 2009 22:42:48 -0000	1.11
@@ -19,10 +19,12 @@
 BuildRequires:  ruby-devel
 BuildRequires:	rubygem-rake
 BuildRequires:  amqp >= 1.0.%{version}
+BuildRequires:	cyrus-sasl-devel
 
 Requires:       ruby
 Requires:       ruby(abi) = 1.8
 Requires:       amqp >= 1.0.%{version}
+Requires:	cyrus-sasl
 
 Provides:       ruby(qpid) = %{version}
 



From clumens at fedoraproject.org  Thu Jan 29 22:43:21 2009
From: clumens at fedoraproject.org (Christopher Edward Lumens)
Date: Thu, 29 Jan 2009 22:43:21 +0000 (UTC)
Subject: rpms/pykickstart/devel .cvsignore, 1.104, 1.105 pykickstart.spec,
	1.113, 1.114 sources, 1.113, 1.114
Message-ID: <20090129224321.5629E70116@cvs1.fedora.phx.redhat.com>

Author: clumens

Update of /cvs/pkgs/rpms/pykickstart/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25149

Modified Files:
	.cvsignore pykickstart.spec sources 
Log Message:
New version.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pykickstart/devel/.cvsignore,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -r1.104 -r1.105
--- .cvsignore	10 Jan 2009 22:03:04 -0000	1.104
+++ .cvsignore	29 Jan 2009 22:42:50 -0000	1.105
@@ -38,3 +38,4 @@
 pykickstart-1.48.tar.gz
 pykickstart-1.49.tar.gz
 pykickstart-1.50.tar.gz
+pykickstart-1.51.tar.gz


Index: pykickstart.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pykickstart/devel/pykickstart.spec,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -r1.113 -r1.114
--- pykickstart.spec	10 Jan 2009 22:03:04 -0000	1.113
+++ pykickstart.spec	29 Jan 2009 22:42:50 -0000	1.114
@@ -3,7 +3,7 @@
 Summary:  A python library for manipulating kickstart files
 Name: pykickstart
 Url: http://fedoraproject.org/wiki/pykickstart
-Version: 1.50
+Version: 1.51
 Release: 1%{?dist}
 # This is a Red Hat maintained package which is specific to
 # our distribution.  Thus the source is only available from
@@ -45,6 +45,21 @@
 %{_bindir}/ksverdiff
 
 %changelog
+* Thu Jan 29 2009 Chris Lumens <clumens at redhat.com> - 1.51-1
+- Make a couple changes to how the logging command is handled.
+- Add a lot of test cases (clumens, alindebe, jlaska, fcami, adamwill, pfrields).
+- Fix output formatting for the rootpw command.
+- For commands that take exactly one argument, check and error correctly.
+- Surround module options in quotes on the output side (jlaska).
+- Set module opts in the FC3 handler correctly.
+- Fix newlines on the device command output (jlaska).
+- If --autoscreenshot is not specified, still output "autostep".
+- Move the currentCmd and currentLine into getParser(). (jlaska)
+- Write out an selinux line if set to disabled, but not if None.
+- F9_LogVolData should inherit from FC4_LogVolData, not FC3_LogVolData (jlaska).
+- Add unittest framework along with logvol and vnc unittests. (jlaska)
+- Don't set the KSOption.required attribute in the constructor (jlaska).
+
 * Sat Jan 10 2009 Chris Lumens <clumens at redhat.com> - 1.50-1
 - Add a script to diff two versions of kickstart syntax.
 - Add an option to ksvalidator to list all available syntax versions.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pykickstart/devel/sources,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -r1.113 -r1.114
--- sources	10 Jan 2009 22:03:04 -0000	1.113
+++ sources	29 Jan 2009 22:42:50 -0000	1.114
@@ -1 +1 @@
-ea3615434fe52dbdde4916c068570ad6  pykickstart-1.50.tar.gz
+13df4ad1e1daac39764a91d87e4b6328  pykickstart-1.51.tar.gz



From sandeen at fedoraproject.org  Thu Jan 29 22:44:18 2009
From: sandeen at fedoraproject.org (Eric Sandeen)
Date: Thu, 29 Jan 2009 22:44:18 +0000 (UTC)
Subject: rpms/e2fsprogs/devel e2fsprogs-1.41.4-debugfs-stat-segfault.patch, 
	NONE, 1.1 e2fsprogs-1.41.4-libext2fs-info.patch, NONE,
	1.1 e2fsprogs.spec, 1.127, 1.128
Message-ID: <20090129224418.22A0170116@cvs1.fedora.phx.redhat.com>

Author: sandeen

Update of /cvs/pkgs/rpms/e2fsprogs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25604

Modified Files:
	e2fsprogs.spec 
Added Files:
	e2fsprogs-1.41.4-debugfs-stat-segfault.patch 
	e2fsprogs-1.41.4-libext2fs-info.patch 
Log Message:
* Thu Jan 29 2009 Eric Sandeen <sandeen at redhat.com> 1.41.4-2
- Fix debugfs "stat" segfault if no open fs (#482894)
- Fix name of libext2fs info page (#481620)


e2fsprogs-1.41.4-debugfs-stat-segfault.patch:

--- NEW FILE e2fsprogs-1.41.4-debugfs-stat-segfault.patch ---
Index: e2fsprogs/debugfs/debugfs.c
===================================================================
--- e2fsprogs.orig/debugfs/debugfs.c	2008-09-12 10:37:52.000000000 -0500
+++ e2fsprogs/debugfs/debugfs.c	2009-01-29 16:36:04.748574864 -0600
@@ -291,9 +291,6 @@ void do_show_super_stats(int argc, char 
 	int	c, header_only = 0;
 	int	numdirs = 0, first, gdt_csum;
 
-	gdt_csum = EXT2_HAS_RO_COMPAT_FEATURE(current_fs->super,
-					      EXT4_FEATURE_RO_COMPAT_GDT_CSUM);
-
 	reset_getopt();
 	while ((c = getopt (argc, argv, "h")) != EOF) {
 		switch (c) {
@@ -321,6 +318,8 @@ void do_show_super_stats(int argc, char 
 		return;
 	}
 
+	gdt_csum = EXT2_HAS_RO_COMPAT_FEATURE(current_fs->super,
+					      EXT4_FEATURE_RO_COMPAT_GDT_CSUM);
 	gdp = &current_fs->group_desc[0];
 	for (i = 0; i < current_fs->group_desc_count; i++, gdp++) {
 		fprintf(out, " Group %2d: block bitmap at %u, "

e2fsprogs-1.41.4-libext2fs-info.patch:

--- NEW FILE e2fsprogs-1.41.4-libext2fs-info.patch ---
Index: e2fsprogs/doc/libext2fs.texinfo
===================================================================
--- e2fsprogs.orig/doc/libext2fs.texinfo	2009-01-28 20:56:26.000000000 -0600
+++ e2fsprogs/doc/libext2fs.texinfo	2009-01-29 16:36:53.148590911 -0600
@@ -8,7 +8,7 @@
 @ifinfo
 @dircategory Development
 @direntry
-* libext2fs: (libext2fs.info).                  The EXT2FS library.
+* libext2fs: (libext2fs).                  The EXT2FS library.
 @end direntry
 @end ifinfo
 


Index: e2fsprogs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/e2fsprogs/devel/e2fsprogs.spec,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -r1.127 -r1.128
--- e2fsprogs.spec	29 Jan 2009 22:20:37 -0000	1.127
+++ e2fsprogs.spec	29 Jan 2009 22:43:47 -0000	1.128
@@ -4,7 +4,7 @@
 Summary: Utilities for managing the second and third extended (ext2/ext3) filesystems
 Name: e2fsprogs
 Version: 1.41.4
-Release: 1%{?dist}
+Release: 2%{?dist}
 # License based on upstream-modified COPYING file,
 # which clearly states "V2" intent.
 License: GPLv2
@@ -15,6 +15,8 @@
 Source3: uuidd.init
 Patch1: e2fsprogs-1.38-etcblkid.patch
 Patch2: e2fsprogs-1.40.4-sb_feature_check_ignore.patch
+Patch3: e2fsprogs-1.41.4-debugfs-stat-segfault.patch
+Patch4: e2fsprogs-1.41.4-libext2fs-info.patch
 
 Url: http://e2fsprogs.sourceforge.net/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -91,6 +93,10 @@
 # mildly unsafe but 'til I get something better, avoid full fsck
 # after an selinux install...
 %patch2 -p1 -b .featurecheck
+# Fix segfault in debugfs "stat" if fs not open
+%patch3 -p1 -b .statfs
+# Fix up name of info file
+%patch4 -p1 -b .info
 
 %build
 %configure --enable-elf-shlibs --enable-nls --disable-e2initrd-helper  --enable-blkid-devmapper --enable-blkid-selinux
@@ -289,6 +295,10 @@
 %dir %attr(2775, uuidd, uuidd) /var/lib/libuuid
 
 %changelog
+* Thu Jan 29 2009 Eric Sandeen <sandeen at redhat.com> 1.41.4-2
+- Fix debugfs "stat" segfault if no open fs (#482894)
+- Fix name of libext2fs info page (#481620)
+
 * Thu Jan 29 2009 Eric Sandeen <sandeen at redhat.com> 1.41.4-1
 - New upstream release
 - Dropped btrfs & resize fixes, upstream now



From hno at fedoraproject.org  Thu Jan 29 22:45:06 2009
From: hno at fedoraproject.org (=?utf-8?q?Henrik_Nordstr=C3=B6m?=)
Date: Thu, 29 Jan 2009 22:45:06 +0000 (UTC)
Subject: rpms/squid/F-9 squid.spec,1.103,1.104
Message-ID: <20090129224506.1E57A70116@cvs1.fedora.phx.redhat.com>

Author: hno

Update of /cvs/pkgs/rpms/squid/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25732

Modified Files:
	squid.spec 
Log Message:
Correct F-9 spec file. Should not copy from F-10..



Index: squid.spec
===================================================================
RCS file: /cvs/pkgs/rpms/squid/F-9/squid.spec,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -r1.103 -r1.104
--- squid.spec	29 Jan 2009 22:38:36 -0000	1.103
+++ squid.spec	29 Jan 2009 22:44:35 -0000	1.104
@@ -32,8 +32,6 @@
 Patch203: squid-3.0.STABLE1-build.patch
 Patch204: squid-3.0.STABLE1-perlpath.patch
 Patch205: squid-3.0.STABLE1-smb-path.patch
-#Patch207: squid-3.0.STABLE5-configure_netfilter.patch
-Patch208: squid-3.0.STABLE7-from_manpg.patch
 
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: bash >= 2.0
@@ -64,8 +62,6 @@
 %patch203 -p1 -b .build
 %patch204 -p1 -b .perlpath
 %patch205 -p1 -b .smb-path
-#%patch207 -p1 -b .configure_netfilter
-%patch208 -p1 -b .from_manpg
 
 %build
 export CXXFLAGS="-fPIE %{optflags}" ; export CFLAGS="-fPIE -Os -g -pipe -fsigned-char %{optflags}" ; export LDFLAGS="-pie" ;
@@ -78,9 +74,8 @@
    --sysconfdir=/etc/squid \
    --disable-dependency-tracking \
    --enable-arp-acl \
-   --enable-auth="basic,digest,ntlm,negotiate" \
+   --enable-auth="basic,digest,ntlm" \
    --enable-basic-auth-helpers="LDAP,MSNT,NCSA,PAM,SMB,YP,getpwnam,multi-domain-NTLM,SASL" \
-   --enable-negotiate-auth-helpers="squid_kerb_auth" \
    --enable-cache-digests \
    --enable-cachemgr-hostname=localhost \
    --enable-delay-pools \
@@ -349,46 +344,24 @@
 
 * Fri Oct 24 2008 Henrik Nordstrom <henrik at henriknordstrom.net> - 7:3.0.STABLE10-1
 - upgrade to latest upstream
-
-* Sun Oct 19 2008 Henrik Nordstrom <henrik at henriknordstrom.net> - 7:3.0.STABLE9-2
-- disable coss support, not officially supported in 3.0
-
-* Sun Oct 19 2008 Henrik Nordstrom <henrik at henriknordstrom.net> - 7:3.0.STABLE9-1
-- update to latest upstream
-
-* Thu Oct 09 2008 Henrik Nordstrom <henrik at henriknordstrom.net> - 7:3.0.STABLE7-4
 - change logrotate to move instead of copytruncate
+- disable coss support, not officially supported in 3.0
 
-* Wed Oct 08 2008 Jiri Skala <jskala at redhat.com> - 7:3.0.STABLE7-3
-- fix #465052 -  FTBFS squid-3.0.STABLE7-1.fc10
-
-* Thu Aug 14 2008 Jiri Skala <jskala at redhat.com> - 7:3.0.STABLE7-2
-- used ncsa_auth.8 from man-pages. there will be this file removed due to conflict
-- fix #458593 noisy initscript
-- fix #463129 init script tests wrong conf file
-- fix #450352 - build.patch patches only generated files
-
-* Wed Jul 02 2008 Jiri Skala <jskala at redhat.com> - 7:3.0.STABLE7-1
-- update to latest upstream
-- fix #453214
-
-* Mon May 26 2008 Martin Nagy <mnagy at redhat.com> - 7:3.0.STABLE6-2
-- fix bad allocation
+* Fri Oct 03 2008 Jiri Skala <jskala at redhat.com> - 7:3.0.STABLE7-2
+- Resolves: #463129 - optional config file
+- Resolves: #458593 - noisy init script
+- Resolves: #450352 - build.patch patches only generated files
 
-* Wed May 21 2008 Martin Nagy <mnagy at redhat.com> - 7:3.0.STABLE6-1
+* Mon Jun 30 2008 Jiri Skala <jskala at redhat.com> - 7:3.0.STABLE7-1
 - upgrade to latest upstream
-- fix bad allocation
+- fix CVE-2004-0918  Squid SNMP DoS [Fedora 9] (#453214)
 
-* Fri May 09 2008 Martin Nagy <mnagy at redhat.com> - 7:3.0.STABLE5-2
-- fix configure detection of netfilter kernel headers (#435499),
-  patch by aoliva at redhat.com
-- add support for negotiate authentication (#445337)
-
-* Fri May 02 2008 Martin Nagy <mnagy at redhat.com> - 7:3.0.STABLE5-1
+* Mon May 26 2008 Martin Nagy <mnagy at redhat.com> - 7:3.0.STABLE6-1
 - upgrade to latest upstream
+- fix bad allocation (#447045)
 
-* Tue Apr 08 2008 Martin Nagy <mnagy at redhat.com> - 7:3.0.STABLE4-1
-- upgrade to latest upstream
+* Fri May 09 2008 Alexandre Oliva <aoliva at redhat.com> - 7:3.0.STABLE2-3
+- fix configure detection of netfilter kernel headers (#435499)
 
 * Thu Apr 03 2008 Martin Nagy <mnagy at redhat.com> - 7:3.0.STABLE2-2
 - add %%{optflags} to make



From pkgdb at fedoraproject.org  Thu Jan 29 22:47:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 29 Jan 2009 22:47:07 +0000
Subject: [pkgdb] kernel had acl change status
Message-ID: <20090129224707.B6A8B208486@bastion.fedora.phx.redhat.com>

kyle has set the commit acl on kernel (Fedora devel) to Approved for josef

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kernel



From pkgdb at fedoraproject.org  Thu Jan 29 22:47:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Thu, 29 Jan 2009 22:47:08 +0000
Subject: [pkgdb] kernel had acl change status
Message-ID: <20090129224708.A4AD0208497@bastion.fedora.phx.redhat.com>

kyle has set the watchcommits acl on kernel (Fedora devel) to Approved for josef

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/kernel



From nsantos at fedoraproject.org  Thu Jan 29 22:48:24 2009
From: nsantos at fedoraproject.org (Nuno Santos)
Date: Thu, 29 Jan 2009 22:48:24 +0000 (UTC)
Subject: rpms/ruby-qpid/F-10 ruby-qpid.spec,1.11,1.12
Message-ID: <20090129224824.C622270116@cvs1.fedora.phx.redhat.com>

Author: nsantos

Update of /cvs/extras/rpms/ruby-qpid/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26500

Modified Files:
	ruby-qpid.spec 
Log Message:
typo


Index: ruby-qpid.spec
===================================================================
RCS file: /cvs/extras/rpms/ruby-qpid/F-10/ruby-qpid.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ruby-qpid.spec	29 Jan 2009 22:42:48 -0000	1.11
+++ ruby-qpid.spec	29 Jan 2009 22:47:54 -0000	1.12
@@ -44,8 +44,7 @@
 install -dm 755 $RPM_BUILD_ROOT%{ruby_sitelib}/qpid
 install -pm 644 ruby/lib/qpid/*.rb $RPM_BUILD_ROOT%{ruby_sitelib}/qpid
 install -dm 755 $RPM_BUILD_ROOT%{ruby_sitelib}/qpid/spec_cache
-install -pm 644 ruby/lib/qpid/spec_cache/*.rb_marshal \ 
-  $RPM_BUILD_ROOT%{ruby_sitelib}/qpid/spec_cache
+install -pm 644 ruby/lib/qpid/spec_cache/*.rb_marshal $RPM_BUILD_ROOT%{ruby_sitelib}/qpid/spec_cache
 install -pm 644 ruby/lib/qpid.rb $RPM_BUILD_ROOT%{ruby_sitelib}
 # to quiet rpmlint warning
 chmod -x ruby/LICENSE.txt



From nsantos at fedoraproject.org  Thu Jan 29 22:52:22 2009
From: nsantos at fedoraproject.org (Nuno Santos)
Date: Thu, 29 Jan 2009 22:52:22 +0000 (UTC)
Subject: rpms/ruby-qpid/devel .cvsignore, 1.6, 1.7 ruby-qpid.spec, 1.7,
	1.8 sources, 1.6, 1.7
Message-ID: <20090129225222.629D170116@cvs1.fedora.phx.redhat.com>

Author: nsantos

Update of /cvs/extras/rpms/ruby-qpid/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27142

Modified Files:
	.cvsignore ruby-qpid.spec sources 
Log Message:
Rebased to svn rev 738618


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ruby-qpid/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	15 Jan 2009 16:26:15 -0000	1.6
+++ .cvsignore	29 Jan 2009 22:51:51 -0000	1.7
@@ -1 +1 @@
-ruby-qpid-0.4.734452.tar.gz
+ruby-qpid-0.4.738618.tar.gz


Index: ruby-qpid.spec
===================================================================
RCS file: /cvs/extras/rpms/ruby-qpid/devel/ruby-qpid.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ruby-qpid.spec	15 Jan 2009 16:26:15 -0000	1.7
+++ ruby-qpid.spec	29 Jan 2009 22:51:52 -0000	1.8
@@ -1,5 +1,5 @@
 Name:           ruby-qpid
-Version:	0.4.734452
+Version: 	0.4.738618
 Release:        1%{?dist}
 Summary:        Ruby language client for AMQP
 
@@ -7,23 +7,27 @@
 License:        ASL 2.0
 URL:            http://qpid.apache.org/
 Source0:        %{name}-%{version}.tar.gz
-# svn export http://svn.apache.org/repos/asf/qpid/trunk/qpid/ruby ruby-qpid
+# svn export http://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid/ruby \
+#  ruby-qpid
 # tar czf ruby-qpid.tar.gz ruby-qpid
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+%{!?ruby_sitelib: %define ruby_sitelib %(ruby -rrbconfig  -e 'puts Config::CONFIG["sitelibdir"]')}
 BuildArch:      noarch
 
 BuildRequires:  ruby
-BuildRequires:	amqp
+BuildRequires:  ruby-devel
+BuildRequires:	rubygem-rake
+BuildRequires:  amqp >= 1.0.%{version}
+BuildRequires:	cyrus-sasl-devel
 
 Requires:       ruby
 Requires:       ruby(abi) = 1.8
-Requires:       amqp >= 1.0.734452
+Requires:       amqp >= 1.0.%{version}
+Requires:	cyrus-sasl
 
 Provides:       ruby(qpid) = %{version}
 
-%{!?ruby_sitelib: %define ruby_sitelib %(ruby -rrbconfig  -e 'puts Config::CONFIG["sitelibdir"]')}
-
 %description
 The Apache Qpid project's Ruby language client for AMQP.
 
@@ -31,15 +35,20 @@
 %setup -q -n %{name}-%{version}
 
 %build
-ruby -I lib -r qpid -e 'Qpid::Spec010::load()'
+pushd ruby
+rake build
+popd
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -dm 755 $RPM_BUILD_ROOT%{ruby_sitelib}/qpid
-install -pm 644 lib/qpid/*.rb $RPM_BUILD_ROOT%{ruby_sitelib}/qpid
+install -pm 644 ruby/lib/qpid/*.rb $RPM_BUILD_ROOT%{ruby_sitelib}/qpid
 install -dm 755 $RPM_BUILD_ROOT%{ruby_sitelib}/qpid/spec_cache
-install -pm 644 lib/qpid/spec_cache/*.rb_marshal $RPM_BUILD_ROOT%{ruby_sitelib}/qpid/spec_cache
-install -pm 644 lib/qpid.rb $RPM_BUILD_ROOT%{ruby_sitelib}
+install -pm 644 ruby/lib/qpid/spec_cache/*.rb_marshal $RPM_BUILD_ROOT%{ruby_sitelib}/qpid/spec_cache
+install -pm 644 ruby/lib/qpid.rb $RPM_BUILD_ROOT%{ruby_sitelib}
+# to quiet rpmlint warning
+chmod -x ruby/LICENSE.txt
+rm -fr specs
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -48,20 +57,18 @@
 %defattr(-,root,root,-)
 %{ruby_sitelib}/qpid
 %{ruby_sitelib}/qpid.rb
-%doc LICENSE.txt NOTICE.txt
+%doc ruby/LICENSE.txt ruby/NOTICE.txt ruby/RELEASE_NOTES
 
 %changelog
-* Wed Jan 14 2009 Nuno Santos <nsantos at redhat.com> - 0.4.734452-1
-- Rebased to svn rev 734452
-
-* Tue Dec 23 2008 Nuno Santos <nsantos at redhat.com> - 0.4.728142-1
-- Rebased to svn rev 728142
+* Thu Jan 29 2009 Nuno Santos <nsantos at redhat.com> - 0.4.738618-1
+- Rebased to svn rev 738618
 
-* Tue Dec  2 2008 Nuno Santos <nsantos at redhat.com> - 0.3.722557-1
-- Rebased to svn rev 722557
+* Wed Dec 10 2008 Andrew Stitcher <astitcher at redhat.com> - 0.3.725356-1
+- Updated spec file to work with RHEL 4 and earlier Fedora versions
 
-* Tue Nov 25 2008 Nuno Santos <nsantos at redhat.com> - 0.3.720585-1
-- Rebased to svn rev 720585
+* Mon Dec  1 2008 Andrew Stitcher <astitcher at redhat.com> - 0.3.722126-1
+- Changed version numbering to fit other qpid packages
+- Added release notes to doc directory
 
 * Fri Nov 14 2008 Rafael Schloming <rafaels at redhat.com> - 0.2-1
 - Updated to work with qpid M4.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ruby-qpid/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	15 Jan 2009 16:26:15 -0000	1.6
+++ sources	29 Jan 2009 22:51:52 -0000	1.7
@@ -1 +1 @@
-4a8ef6ba2a2c4b50d100c950ce236e68  ruby-qpid-0.4.734452.tar.gz
+01fcbfd9e95cc24ffa1923bd497093c1  ruby-qpid-0.4.738618.tar.gz



From emaldonado at fedoraproject.org  Thu Jan 29 22:53:56 2009
From: emaldonado at fedoraproject.org (Elio Maldonado)
Date: Thu, 29 Jan 2009 22:53:56 +0000 (UTC)
Subject: rpms/crypto-utils/F-10 certwatch.c,1.14,1.15
Message-ID: <20090129225356.3562270116@cvs1.fedora.phx.redhat.com>

Author: emaldonado

Update of /cvs/extras/rpms/crypto-utils/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27478

Modified Files:
	certwatch.c 
Log Message:
Fixed cert expiry time calculations (#473860)


Index: certwatch.c
===================================================================
RCS file: /cvs/extras/rpms/crypto-utils/F-10/certwatch.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- certwatch.c	19 Oct 2008 05:04:22 -0000	1.14
+++ certwatch.c	29 Jan 2009 22:53:25 -0000	1.15
@@ -5,16 +5,16 @@
    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.
-   
+
    In addition, as a special exception, Red Hat, Inc. gives permission
    to link the code of this program with the OpenSSL library (or with
    modified versions of OpenSSL that use the same license as OpenSSL),
@@ -84,6 +84,7 @@
 #include <secmod.h>
 #include <base64.h>
 #include <seccomon.h>
+#include <certt.h>
 
 #include <stdio.h>
 #include <string.h>
@@ -93,11 +94,11 @@
 
 #define TIME_BUF_SIZE 100
 
-/* Return a certificate structure from a pem-encoded cert in a file; 
+/* Return a certificate structure from a pem-encoded cert in a file;
  * or NULL on failure. Semantics similar to the OpenSSL call
  * PEM_read_X509(fp, NULL, NULL, NULL);
  */
-extern CERTCertificate * 
+extern CERTCertificate *
 PEMUTIL_PEM_read_X509(const char *filename);
 
 /* size big enough for formatting time buffer */
@@ -106,27 +107,11 @@
 static int warn_period = 30;
 static char *warn_address = "root";
 
-/* Format a PRTime value into a buffer with format "%a %b %d %H:%M:%S %Y"
- * and return the buffer. The buffer returned must the freed with PORT_Free.
- * Semantics are similar to asctime. 
- */
-char * AsciiTime(PRTime time)
-{   
-    PRExplodedTime printable;
-    char *timebuf;
-    
-    PR_ExplodeTime(time, PR_GMTParameters, &printable);
-    timebuf = PORT_Alloc(TIME_BUF_SIZE);
-    (void) PR_FormatTime(timebuf, TIME_BUF_SIZE, "%a %b %d %H:%M:%S %Y", &printable);
-    if (strlen(timebuf) < TIME_BUF_SIZE) timebuf[strlen(timebuf)] = '\0';
-    return (timebuf);
-}
-
-/* Uses the password passed in the -f(pwfile) argument of the command line.  
+/* Uses the password passed in the -f(pwfile) argument of the command line.
  * After use once, null it out otherwise PKCS11 calls us forever.?
- * 
+ *
  * Code based on SECU_GetModulePassword from the Mozilla NSS secutils
- * imternal librart. 
+ * internal library.
  */
 static char *GetModulePassword(PK11SlotInfo *slot, PRBool retry, void *arg)
 {
@@ -137,12 +122,12 @@
     char *pwFile = arg;
 
     if (!pwFile) return 0;
-    if (retry) return 0; /* no good retrying - file contents will be the same */ 
+    if (retry) return 0; /* no good retrying - file contents will be the same */
     if (!(fd = PR_Open(pwFile, PR_RDONLY, 0))) return 0;
 
     nb = PR_Read(fd, phrase, sizeof(phrase));
     PR_Close(fd);
-    
+
     /* handle the Windows EOL case */
     i = 0;
     while (phrase[i] != '\r' && phrase[i] != '\n' && i < nb) i++;
@@ -164,30 +149,50 @@
     return buf;
 }
 
+/* Computes the day difference among two PRTime's */
+static int diff_time_days(PRTime aT, PRTime bT)
+{
+    /* Dividing before substracting to support the desired granularity */
+    PRInt64 secs = (aT/PR_USEC_PER_SEC - bT/PR_USEC_PER_SEC);
+    return secs / 86400L;
+}
+
 /* Print a warning message that the certificate in 'filename', issued
  * to hostname 'hostname', will expire (or has expired). */
 static int warning(FILE *out, const char *filename, const char *hostname,
-                   SECCertTimeValidity validity, 
+                   SECCertTimeValidity validity,
                    PRTime start, PRTime end, PRTime now, int quiet)
 {
     /* Note that filename can be the cert nickname. */
-    int renew = 1;
+    int renew = 1, days;         /* days till expiry */
     char subj[50];
-    PRTime prtimeDiff;
-    
-    LL_SUB(prtimeDiff, end, start);
-    
-    if ( LL_CMP(start, >, now) ) {   
+
+    switch (validity) {
+    case secCertTimeNotValidYet:
         strcpy(subj, "is not yet valid");
         renew = 0;
-    } else if (LL_EQ(now, end)) {
-        strcpy(subj, "will expire today");
-    } else if (LL_EQ(prtimeDiff, 1)) {
-        sprintf(subj, "will expire tomorrow");
-    } else if (LL_CMP(prtimeDiff, <, warn_period)) {
-        sprintf(subj, "will expire on %s", AsciiTime(end));
-    } else {
-        return 0; /* nothing to warn about. */
+        break;
+    case secCertTimeExpired:
+        sprintf(subj, "has expired");
+        break;
+    case secCertTimeValid:
+        days = diff_time_days(end, now);
+        if (days == 0) {
+            strcpy(subj, "will expire today");
+        } else if (days == 1) {
+            sprintf(subj, "will expire tomorrow");
+        } else if (days < warn_period) {
+            sprintf(subj, "will expire in %d days", days);
+        } else {
+            return 0; /* nothing to warn about. */
+        }
+        break;
+    case secCertTimeUndetermined:
+    default:
+        /* it will never get here if caller checks validity */
+        strcpy(subj, "validity could not be decoded from the cert");
+        renew = 0;
+        break;
     }
 
     if (quiet) return 1;
@@ -195,11 +200,11 @@
     fprintf(out, "To: %s\n", warn_address);
     fprintf(out, "Subject: The certificate for %s %s\n", hostname, subj);
     fputs("\n", out);
-    
-    fprintf(out, 
+
+    fprintf(out,
             " ################# SSL Certificate Warning ################\n\n");
 
-    fprintf(out, 
+    fprintf(out,
             "  Certificate for hostname '%s', in file (or by nickname):\n"
             "     %s\n\n",
             hostname, filename);
@@ -215,10 +220,10 @@
         char *result = pr_ctime(start, until, TIME_SIZE);
         assert(result == until);
         if (strlen(until) < sizeof(until)) until[strlen(until)] = '\0';
-        fprintf(out, 
+        fprintf(out,
                 "  The certificate is not valid until %s.\n\n"
                 "  Browsers will not be able to correctly connect to this\n"
-                "  web site using SSL until the certificate becomes valid.\n", 
+                "  web site using SSL until the certificate becomes valid.\n",
                 until);
     }
 
@@ -252,30 +257,30 @@
  * issue a warning message if 'quiet' is zero.  If quiet is non-zero,
  * returns one to indicate that a warning would have been issued, zero
  * to indicate no warning would be issued, or -1 if an error
- * occurred. 
+ * occurred.
  *
  * When byNickname is 1 then 'name' is a nickname to search
  * for in the database otherwise it's the certificate file.
  */
-static int check_cert(const char *name, int byNickname, int quiet) 
+static int check_cert(const char *name, int byNickname, int quiet)
 {
     CERTCertificate *cert;
     SECCertTimeValidity validity;
     PRTime notBefore, notAfter;
     char cname[128];
-    
+
     int doWarning = 0;
 
     /* parse the cert */
-    cert = byNickname 
+    cert = byNickname
         ? CERT_FindCertByNickname(CERT_GetDefaultCertDB(), (char *)name)
         : PEMUTIL_PEM_read_X509(name);
     if (cert == NULL) return -1;
-    
+
     /* determine the validity period of the cert. */
     validity = CERT_CheckCertValidTimes(cert, PR_Now(), PR_FALSE);
     if (validity == secCertTimeUndetermined) goto cleanup;
-    
+
     /* get times out of the cert */
     if (CERT_GetCertTimes(cert, &notBefore, &notAfter)
         != SECSuccess) goto cleanup;
@@ -295,14 +300,15 @@
     if (cert) CERT_DestroyCertificate(cert);
     if (!doWarning) return -1;
 
-    return warning(stdout, name, cname, validity, 
+    return warning(stdout, name, cname, validity,
                    notBefore, notAfter, PR_Now(), quiet);
 }
 
 int main(int argc, char **argv)
 {
     int optc, quiet = 0;
-    static const struct option options[] = {
+    const char *shortopts = "qp:a:d:w:c:k:";
+    static const struct option longopts[] = {
         { "quiet", no_argument, NULL, 'q' },
         { "period", required_argument, NULL, 'p' },
         { "address", required_argument, NULL, 'a' },
@@ -312,10 +318,8 @@
         { "keydbprexix", required_argument, NULL, 'k' },
         { NULL }
     };
-
-    char *certDBPrefix = ""; 
+    char *certDBPrefix = "";
     char *keyDBPrefix = "";
-
     char *configdir = NULL;    /* contains the cert database */
     char *passwordfile = NULL; /* module password file */
     int byNickname = 0;        /* whether to search by nickname */
@@ -323,8 +327,8 @@
     /* The 'timezone' global is needed to adjust local times from
      * mktime() back to UTC: */
     tzset();
-    
-    while ((optc = getopt_long(argc, argv, "qp:a:d:w:c:k:", options, NULL)) != -1) {
+
+    while ((optc = getopt_long(argc, argv, shortopts, longopts, NULL)) != -1) {
         switch (optc) {
         case 'q':
             quiet = 1;
@@ -353,18 +357,18 @@
             break;
         }
     }
-    
+
     /* NSS initialization */
 
     if (byNickname) {
         /* cert in database */
-        if (NSS_Initialize(configdir, certDBPrefix, keyDBPrefix, 
+        if (NSS_Initialize(configdir, certDBPrefix, keyDBPrefix,
                    SECMOD_DB, NSS_INIT_READONLY) != SECSuccess) {
             return EXIT_FAILURE;
         }
         /* in case module requires a password */
         if (passwordfile) {
-            PK11_SetPasswordFunc(GetModulePassword);  
+            PK11_SetPasswordFunc(GetModulePassword);
         }
     } else {
         /* cert in a pem file */
@@ -372,13 +376,14 @@
         if (!certDir) {
             certDir = "/etc/pki/nssdb";
         }
-        if (NSS_Initialize(certDir, certDBPrefix, keyDBPrefix, 
+        if (NSS_Initialize(certDir, certDBPrefix, keyDBPrefix,
                    SECMOD_DB, NSS_INIT_READONLY) != SECSuccess) {
             printf("NSS_Init(\"%s\") failed\n", certDir);
             return EXIT_FAILURE;
         }
     }
 
-    /* When byNickname is 1 argv[optind] is a nickname otherwise a filename. */ 
-    return check_cert(argv[optind], byNickname, quiet) == 1 ? EXIT_SUCCESS : EXIT_FAILURE;
+    /* When byNickname is 1 argv[optind] is a nickname otherwise a filename. */
+    return check_cert(argv[optind], byNickname, quiet) == 1
+                      ? EXIT_SUCCESS : EXIT_FAILURE;
 }



From emaldonado at fedoraproject.org  Thu Jan 29 22:55:08 2009
From: emaldonado at fedoraproject.org (Elio Maldonado)
Date: Thu, 29 Jan 2009 22:55:08 +0000 (UTC)
Subject: rpms/crypto-utils/F-10 keyutil.c,1.12,1.13
Message-ID: <20090129225508.CFF8670116@cvs1.fedora.phx.redhat.com>

Author: emaldonado

Update of /cvs/extras/rpms/crypto-utils/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27667

Modified Files:
	keyutil.c 
Log Message:
Fixed segfault on certificate generation (#473860)


Index: keyutil.c
===================================================================
RCS file: /cvs/extras/rpms/crypto-utils/F-10/keyutil.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- keyutil.c	4 Nov 2008 04:28:22 -0000	1.12
+++ keyutil.c	29 Jan 2009 22:54:38 -0000	1.13
@@ -204,6 +204,8 @@
     { NULL }
 };
 
+static certutilExtnList keyutil_extns;
+
 static void 
 Usage(char *progName)
 {
@@ -1388,8 +1390,6 @@
         const char       *certfile,
         const char       *keyoutfile)
 {
-    static certutilExtnList nullextnlist = {PR_FALSE};
-    
     CERTCertificate *cert       = NULL;
     PRFileDesc *outFile         = NULL;
     PRFileDesc *keyOutFile      = NULL;
@@ -1479,6 +1479,12 @@
             rv = 255;
             goto shutdown;
         }
+
+        if (!subjectstr) {
+            SECU_PrintError(progName, "subject string was NULL\n");
+            rv = 255;
+            goto shutdown;
+        }
         subject = CERT_AsciiToName((char *)subjectstr);
         if (!subject) {
             SECU_PrintError(progName,
@@ -1501,7 +1507,22 @@
     /*
      *  Certificate request
      */
-    
+
+    /* Extensions not supported yet */
+    keyutil_extns[ext_keyUsage] = PR_FALSE;
+    keyutil_extns[ext_basicConstraint] = PR_FALSE;
+    keyutil_extns[ext_authorityKeyID] = PR_FALSE;
+    keyutil_extns[ext_subjectKeyID] = PR_FALSE;
+    keyutil_extns[ext_CRLDistPts] = PR_FALSE;
+    keyutil_extns[ext_NSCertType] = PR_FALSE;
+    keyutil_extns[ext_extKeyUsage] = PR_FALSE;
+    keyutil_extns[ext_authInfoAcc] = PR_FALSE;
+    keyutil_extns[ext_subjInfoAcc] = PR_FALSE;
+    keyutil_extns[ext_certPolicies] = PR_FALSE;
+    keyutil_extns[ext_policyMappings] = PR_FALSE;
+    keyutil_extns[ext_policyConstr] = PR_FALSE;
+    keyutil_extns[ext_inhibitAnyPolicy] = PR_FALSE;
+
     hashAlgTag = SEC_OID_MD5;
     
     /*  Make a cert request */
@@ -1510,7 +1531,7 @@
                  ascii,        /* ASCIIForIO */
                  NULL,         /* ExtendedEmailAddrs */
                  NULL,         /* ExtendedDNSNames */
-                 nullextnlist, /* certutil_extns */
+                 keyutil_extns, /* keyutil_extns */
                  outFile);
     
     PR_Close(outFile);
@@ -1562,7 +1583,7 @@
             "tempnickname", inFile, outFile,
             privkey, &pwdata, hashAlgTag,
             serialNumber, warpmonths, validityMonths,
-            NULL, NULL, ascii, PR_TRUE, NULL,
+            NULL, NULL, ascii, PR_TRUE, keyutil_extns,
             &cert);
          /*
           ExtendedEmailAddrs,ExtendedDNSNames,



From emaldonado at fedoraproject.org  Thu Jan 29 22:56:14 2009
From: emaldonado at fedoraproject.org (Elio Maldonado)
Date: Thu, 29 Jan 2009 22:56:14 +0000 (UTC)
Subject: rpms/crypto-utils/F-10 genkey.pl,1.24,1.25
Message-ID: <20090129225614.7DDAF70116@cvs1.fedora.phx.redhat.com>

Author: emaldonado

Update of /cvs/extras/rpms/crypto-utils/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27873

Modified Files:
	genkey.pl 
Log Message:
Fixed cert and key file name extensions


Index: genkey.pl
===================================================================
RCS file: /cvs/extras/rpms/crypto-utils/F-10/genkey.pl,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- genkey.pl	4 Nov 2008 05:47:23 -0000	1.24
+++ genkey.pl	29 Jan 2009 22:55:44 -0000	1.25
@@ -614,7 +614,7 @@
     my $where_key = $nss
         ? $modNssDbDir."/$nssDBPrefix"."key3.db" : "$ssltop/private/$name.key";
     my $where_cert = $nss
-        ? $modNssDbDir."/$nssDBPrefix"."cert8.db" : "$ssltop/certs/$name.cert";
+        ? $modNssDbDir."/$nssDBPrefix"."cert8.db" : "$ssltop/certs/$name.crt";
     my $what = $nss ? "directory" : "file";
     my $message = <<EOT;
 You are now generating a new keypair which will be used to encrypt all



From kkofler at fedoraproject.org  Thu Jan 29 22:59:01 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Thu, 29 Jan 2009 22:59:01 +0000 (UTC)
Subject: rpms/kdebluetooth/F-10 .cvsignore, 1.4, 1.5 kdebluetooth.spec, 1.18,
	1.19 sources, 1.4, 1.5
Message-ID: <20090129225901.C76D570116@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdebluetooth/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28303/F-10

Modified Files:
	.cvsignore kdebluetooth.spec sources 
Log Message:
Sync from devel, for inclusion in the KDE 4.2 grouped update:

* Wed Jan 28 2009 Ville Skytt?? <ville.skytta at iki.fi> - 1:0.3-1
- 0.3 (#481802).
- http://sourceforge.net/project/shownotes.php?group_id=89888&release_id=654566
- (Build)Requires: solid-bluetooth(-devel) >= 4.3


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdebluetooth/F-10/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	20 Sep 2008 22:03:05 -0000	1.4
+++ .cvsignore	29 Jan 2009 22:58:31 -0000	1.5
@@ -1 +1 @@
-kdebluetooth4-0.2.tar.bz2
+kdebluetooth4-0.3.tar.bz2


Index: kdebluetooth.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebluetooth/F-10/kdebluetooth.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- kdebluetooth.spec	20 Sep 2008 22:03:05 -0000	1.18
+++ kdebluetooth.spec	29 Jan 2009 22:58:31 -0000	1.19
@@ -1,7 +1,7 @@
 Summary:		The KDE Bluetooth Framework
 Name:			kdebluetooth
-Version:		0.2
-Release:		3%{?dist}
+Version:		0.3
+Release:		1%{?dist}
 Epoch:			1
 License:		GPLv2+
 Group:			Applications/Communications
@@ -9,11 +9,14 @@
 Source0:		http://downloads.sourceforge.net/kde-bluetooth/%{name}4-%{version}.tar.bz2
 BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:	kdebase-workspace-devel
+BuildRequires:	kdebase-workspace-devel >= 4.2
 BuildRequires:	cmake
 Obsoletes:		%{name}-libs < 1:0.2
 Obsoletes:		%{name}-devel < 1:0.2
 
+# Depend on and track solid-bluetooth backport
+BuildRequires:  solid-bluetooth-devel >= 4.3
+Requires: solid-bluetooth >= 4.3
 
 %description
 The KDE Bluetooth Framework is a set of tools built on top of Linux'
@@ -27,13 +30,13 @@
 
 
 %build
-%cmake_kde4 -DCMAKE_VERBOSE_MAKEFILE=ON
+%cmake_kde4
 make %{?_smp_mflags} 
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
+make install/fast DESTDIR=$RPM_BUILD_ROOT
 
 desktop-file-install						\
 	--mode=644						\
@@ -66,10 +69,15 @@
 %{_bindir}/kbluetooth4-devicemanager
 %{_bindir}/kbluetooth4-inputwizard
 %{_datadir}/applications/kde4/kdebluetooth4.desktop
-%{_datadir}/icons/hicolor/*x*/apps/kbluetooth4.png
+%{_datadir}/icons/hicolor/*/apps/kbluetooth4*.*
 
 
 %changelog
+* Wed Jan 28 2009 Ville Skytt?? <ville.skytta at iki.fi> - 1:0.3-1
+- 0.3 (#481802).
+- http://sourceforge.net/project/shownotes.php?group_id=89888&release_id=654566
+- (Build)Requires: solid-bluetooth(-devel) >= 4.3
+
 * Mon Sep 15 2008 Gilboa Davara <gilboad [AT] gmail.com> - 0.2-3
 - Use versioned obsoletes.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdebluetooth/F-10/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	20 Sep 2008 22:03:05 -0000	1.4
+++ sources	29 Jan 2009 22:58:31 -0000	1.5
@@ -1 +1 @@
-1d66e2c968b4ce1a6201ea294a35de76  kdebluetooth4-0.2.tar.bz2
+e37438e8e597abe9c684acaf3aa1bb39  kdebluetooth4-0.3.tar.bz2



From krh at fedoraproject.org  Thu Jan 29 23:00:14 2009
From: krh at fedoraproject.org (=?utf-8?q?Kristian_H=C3=B8gsberg?=)
Date: Thu, 29 Jan 2009 23:00:14 +0000 (UTC)
Subject: rpms/xorg-x11-drv-i810/devel intel-2.6.0-to-66bc44.patch, NONE,
	1.1 tiled-aux-bufs.patch, NONE, 1.1 xorg-x11-drv-i810.spec,
	1.121, 1.122
Message-ID: <20090129230014.8D76870116@cvs1.fedora.phx.redhat.com>

Author: krh

Update of /cvs/pkgs/rpms/xorg-x11-drv-i810/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28670

Modified Files:
	xorg-x11-drv-i810.spec 
Added Files:
	intel-2.6.0-to-66bc44.patch tiled-aux-bufs.patch 
Log Message:
* Thu Jan 29 2009 Kristian H??gsberg <krh at hinata> - 2.6.0-2
- Update to 66bc44 from git master.


intel-2.6.0-to-66bc44.patch:

--- NEW FILE intel-2.6.0-to-66bc44.patch ---
diff --git a/configure.ac b/configure.ac
index bb69f72..38d373e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
 
 AC_PREREQ(2.57)
 AC_INIT([xf86-video-intel],
-        2.6.0,
+        2.6.99.1,
         [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
         xf86-video-intel)
 
@@ -105,8 +105,6 @@ if test x$DRI != xno; then
                       [have_sarea_h="yes"], [have_sarea_h="no"])
         AC_CHECK_FILE([${sdkdir}/dristruct.h],
                       [have_dristruct_h="yes"], [have_dristruct_h="no"])
-	AC_CHECK_FILE([${sdkdir}/damage.h],
-                      [have_damage_h="yes"], [have_damage_h="no"])
 fi
 AC_MSG_CHECKING([whether to include DRI support])
 if test x$DRI = xauto; then
@@ -215,9 +213,6 @@ if test "$DRI" = yes; then
         PKG_CHECK_MODULES(DRI, [xf86driproto glproto])
         AC_DEFINE(XF86DRI,1,[Enable DRI driver support])
         AC_DEFINE(XF86DRI_DEVEL,1,[Enable developmental DRI driver support])
-	if test "$have_damage_h" = yes; then
-		AC_DEFINE(DAMAGE,1,[Use Damage extension])
-	fi
 fi
 
 dnl exaGetPixmapDriverPrivate required for DRM_MODE.
diff --git a/man/intel.man b/man/intel.man
index 00aa1be..65d1114 100644
--- a/man/intel.man
+++ b/man/intel.man
@@ -150,26 +150,6 @@ pool.  On systems with a working GEM environment, this can be disabled to
 increase the memory pool available to other graphics tasks.
 Default for i830 and newer: Enabled.
 Default for i810: this option is not used.
-.BI "Option \*qPageFlip\*q \*q" boolean \*q
-Enable support for page flipping. This should improve 3D performance at the
-potential cost of worse performance with mixed 2D/3D. Also note that this gives
-no benefit without corresponding support in the Mesa 3D driver and may not give
-the full benefit without triple buffering (see
-.B "Option \*qTripleBuffer\*q"
-).
-Default for i810: The option is not used.
-Default for i830 and above: Disabled (This option is currently unstable).
-.TP
-.BI "Option \*qTripleBuffer\*q \*q" boolean \*q
-Enable support for triple buffering. This should improve 3D performance at the
-potential cost of worse performance with mixed 2D/3D. Also note that this gives
-no benefit without corresponding support in the Mesa 3D driver and may not give
-any benefit without page flipping either (see
-.B "Option \*qPageFlip\*q"
-).
-Default for i810: The option is not used.
-Default for i830 and above: Disabled.
-.TP
 .BI "Option \*qAccelMethod\*q \*q" string \*q
 Choose acceleration architecture, either "XAA" or "EXA".  XAA is the old
 XFree86 based acceleration architecture.  EXA is a newer and simpler
diff --git a/src/bios_reader/bios_reader.c b/src/bios_reader/bios_reader.c
index 717f5bf..4b20e0d 100644
--- a/src/bios_reader/bios_reader.c
+++ b/src/bios_reader/bios_reader.c
@@ -299,6 +299,9 @@ static void dump_lvds_data(void)
     struct bdb_lvds_lfp_data *lvds_data;
     int num_entries;
     int i;
+    int hdisplay, hsyncstart, hsyncend, htotal;
+    int vdisplay, vsyncstart, vsyncend, vtotal;
+    float clock;
 
     block = find_section(BDB_LVDS_LFP_DATA);
     if (!block) {
@@ -322,6 +325,17 @@ static void dump_lvds_data(void)
 	else
 	    marker = ' ';
 
+	hdisplay   = _H_ACTIVE(timing_data);
+	hsyncstart = hdisplay + _H_SYNC_OFF(timing_data);
+	hsyncend   = hsyncstart + _H_SYNC_WIDTH(timing_data);
+	htotal     = hdisplay + _H_BLANK(timing_data);
+
+	vdisplay   = _V_ACTIVE(timing_data);
+	vsyncstart = vdisplay + _V_SYNC_OFF(timing_data);
+	vsyncend   = vsyncstart + _V_SYNC_WIDTH(timing_data);
+	vtotal     = vdisplay + _V_BLANK(timing_data);
+	clock      = _PIXEL_CLOCK(timing_data) / 1000;
+
 	printf("%c\tpanel type %02i: %dx%d clock %d\n", marker,
 	       i, lfp_data->fp_timing.x_res, lfp_data->fp_timing.y_res,
 	       _PIXEL_CLOCK(timing_data));
@@ -336,15 +350,11 @@ static void dump_lvds_data(void)
 	       (unsigned long)lfp_data->fp_timing.pp_cycle_reg_val);
 	printf("\t\t  PFIT: 0x%08lx\n",
 	       (unsigned long)lfp_data->fp_timing.pfit_reg_val);
-	printf("\t\ttimings: %d %d %d %d %d %d %d %d\n",
-	       _H_ACTIVE(timing_data),
-	       _H_BLANK(timing_data),
-	       _H_SYNC_OFF(timing_data),
-	       _H_SYNC_WIDTH(timing_data),
-	       _V_ACTIVE(timing_data),
-	       _V_BLANK(timing_data),
-	       _V_SYNC_OFF(timing_data),
-	       _V_SYNC_WIDTH(timing_data));
+	printf("\t\ttimings: %d %d %d %d %d %d %d %d %.2f (%s)\n",
+	       hdisplay, hsyncstart, hsyncend, htotal,
+	       vdisplay, vsyncstart, vsyncend, vtotal, clock,
+	       (hsyncend > htotal || vsyncend > vtotal) ?
+	       "BAD!" : "good");
     }
     free(block);
 }
diff --git a/src/common.h b/src/common.h
index 4a87acb..be222df 100644
--- a/src/common.h
+++ b/src/common.h
@@ -367,6 +367,8 @@ extern int I810_DEBUG;
 #define SUPPORTS_INTEGRATED_HDMI(pI810) (IS_G4X(pI810))
 /* dsparb controlled by hw only */
 #define DSPARB_HWCONTROL(pI810) (IS_G4X(pI810))
+/* supports Y tiled surfaces (pre-965 Mesa isn't ready yet) */
+#define SUPPORTS_YTILING(pI810) (IS_I965G(pI830))
 
 #define GTT_PAGE_SIZE			KB(4)
 #define ROUND_TO(x, y)			(((x) + (y) - 1) / (y) * (y))
diff --git a/src/i830.h b/src/i830.h
index dd5555d..d9adfbf 100644
--- a/src/i830.h
+++ b/src/i830.h
@@ -72,9 +72,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "dri.h"
 #include "GL/glxint.h"
 #include "i830_dri.h"
-#ifdef DAMAGE
-#include "damage.h"
-#endif
 #include "drmmode_display.h"
 #endif
 #include "intel_bufmgr.h"
@@ -95,6 +92,7 @@ void i830_uxa_block_handler (ScreenPtr pScreen);
 
 #if defined(I830_USE_UXA) || defined(I830_USE_EXA)
 dri_bo *i830_get_pixmap_bo (PixmapPtr pixmap);
+void i830_set_pixmap_bo(PixmapPtr pixmap, dri_bo *bo);
 #endif
 
 #ifdef I830_USE_XAA
@@ -141,6 +139,8 @@ enum tile_format {
     TILE_YMAJOR
 };
 
+#define PITCH_NONE 0
+
 /** Record of a linear allocation in the aperture. */
 typedef struct _i830_memory i830_memory;
 struct _i830_memory {
@@ -265,6 +265,8 @@ typedef struct _I830CrtcPrivateRec {
     
     int			    dpms_mode;
     
+    int			    x, y;
+
     /* Lookup table values to be set when the CRTC is enabled */
     uint8_t lut_r[256], lut_g[256], lut_b[256];
 
@@ -413,7 +415,6 @@ typedef struct _I830Rec {
    i830_memory *xaa_scratch_2;
 #ifdef I830_USE_EXA
    i830_memory *exa_offscreen;
-   i830_memory *gen4_render_state_mem;
 #endif
    i830_memory *fake_bufmgr_mem;
 
@@ -437,6 +438,10 @@ typedef struct _I830Rec {
    /** Number of bytes to be emitted in the current BEGIN_BATCH. */
    uint32_t batch_emitting;
    dri_bo *batch_bo;
+   /** Whether we're in a section of code that can't tolerate flushing */
+   Bool in_batch_atomic;
+   /** Ending batch_used that was verified by i830_start_batch_atomic() */
+   int batch_atomic_limit;
 
 #ifdef I830_XV
    /* For Xvideo */
@@ -452,13 +457,10 @@ typedef struct _I830Rec {
    void (*PointerMoved)(int, int, int);
    CreateScreenResourcesProcPtr    CreateScreenResources;
 
-   i830_memory *logical_context;
-
    i830_memory *power_context;
 
 #ifdef XF86DRI
    i830_memory *back_buffer;
-   i830_memory *third_buffer;
[...4497 lines suppressed...]
-	OUT_BATCH(0 | BASE_ADDRESS_MODIFY);  /* media base addr, don't care */
-	/* general state max addr, disabled */
-	OUT_BATCH(0x10000000 | BASE_ADDRESS_MODIFY);
-	/* media object state max addr, disabled */
-	OUT_BATCH(0x10000000 | BASE_ADDRESS_MODIFY);
-
-	/* Set system instruction pointer */
-	OUT_BATCH(BRW_STATE_SIP | 0);
-	/* system instruction pointer */
-	OUT_RELOC(pI830->video.gen4_sip_kernel_bo,
-		  I915_GEM_DOMAIN_INSTRUCTION, 0, 0);
-
-	OUT_BATCH(MI_NOOP);
-	ADVANCE_BATCH();
-    }
-
-    /* brw_debug (pScrn, "after base address modify"); */
-
-    {
-       BEGIN_BATCH(38);
-       /* Enable VF statistics */
-       OUT_BATCH(BRW_3DSTATE_VF_STATISTICS | 1);
-
-       /* Pipe control */
-       OUT_BATCH(BRW_PIPE_CONTROL |
-		 BRW_PIPE_CONTROL_NOWRITE |
-		 BRW_PIPE_CONTROL_IS_FLUSH |
-		 2);
-       OUT_BATCH(0);			/* Destination address */
-       OUT_BATCH(0);			/* Immediate data low DW */
-       OUT_BATCH(0);			/* Immediate data high DW */
-
-       /* Binding table pointers */
-       OUT_BATCH(BRW_3DSTATE_BINDING_TABLE_POINTERS | 4);
-       OUT_BATCH(0); /* vs */
-       OUT_BATCH(0); /* gs */
-       OUT_BATCH(0); /* clip */
-       OUT_BATCH(0); /* sf */
-       /* Only the PS uses the binding table */
-       OUT_RELOC(bind_bo, I915_GEM_DOMAIN_INSTRUCTION, 0, 0);
-       drm_intel_bo_unreference(bind_bo);
-
-       /* Blend constant color (magenta is fun) */
-       OUT_BATCH(BRW_3DSTATE_CONSTANT_COLOR | 3);
-       OUT_BATCH(float_to_uint (1.0));
-       OUT_BATCH(float_to_uint (0.0));
-       OUT_BATCH(float_to_uint (1.0));
-       OUT_BATCH(float_to_uint (1.0));
-
-       /* The drawing rectangle clipping is always on.  Set it to values that
-	* shouldn't do any clipping.
-	*/
-       OUT_BATCH(BRW_3DSTATE_DRAWING_RECTANGLE | 2); /* XXX 3 for BLC or CTG */
-       OUT_BATCH(0x00000000);			/* ymin, xmin */
-       OUT_BATCH((pScrn->virtualX - 1) |
-		 (pScrn->virtualY - 1) << 16);	/* ymax, xmax */
-       OUT_BATCH(0x00000000);			/* yorigin, xorigin */
-
-       /* skip the depth buffer */
-       /* skip the polygon stipple */
-       /* skip the polygon stipple offset */
-       /* skip the line stipple */
-
-       /* Set the pointers to the 3d pipeline state */
-       OUT_BATCH(BRW_3DSTATE_PIPELINED_POINTERS | 5);
-       OUT_RELOC(pI830->video.gen4_vs_bo, I915_GEM_DOMAIN_INSTRUCTION, 0, 0);
-       /* disable GS, resulting in passthrough */
-       OUT_BATCH(BRW_GS_DISABLE);
-       /* disable CLIP, resulting in passthrough */
-       OUT_BATCH(BRW_CLIP_DISABLE);
-       OUT_RELOC(pI830->video.gen4_sf_bo, I915_GEM_DOMAIN_INSTRUCTION, 0, 0);
-       if (n_src_surf == 1)
-	   OUT_RELOC(pI830->video.gen4_wm_packed_bo,
-		     I915_GEM_DOMAIN_INSTRUCTION, 0, 0);
-       else
-	   OUT_RELOC(pI830->video.gen4_wm_planar_bo,
-		     I915_GEM_DOMAIN_INSTRUCTION, 0, 0);
-       OUT_RELOC(pI830->video.gen4_cc_bo, I915_GEM_DOMAIN_INSTRUCTION, 0, 0);
-
-       /* URB fence */
-       OUT_BATCH(BRW_URB_FENCE |
-		 UF0_CS_REALLOC |
-		 UF0_SF_REALLOC |
-		 UF0_CLIP_REALLOC |
-		 UF0_GS_REALLOC |
-		 UF0_VS_REALLOC |
-		 1);
-       OUT_BATCH(((urb_clip_start + urb_clip_size) << UF1_CLIP_FENCE_SHIFT) |
-		 ((urb_gs_start + urb_gs_size) << UF1_GS_FENCE_SHIFT) |
-		 ((urb_vs_start + urb_vs_size) << UF1_VS_FENCE_SHIFT));
-       OUT_BATCH(((urb_cs_start + urb_cs_size) << UF2_CS_FENCE_SHIFT) |
-		 ((urb_sf_start + urb_sf_size) << UF2_SF_FENCE_SHIFT));
-
-       /* Constant buffer state */
-       OUT_BATCH(BRW_CS_URB_STATE | 0);
-       OUT_BATCH(((URB_CS_ENTRY_SIZE - 1) << 4) |
-		 (URB_CS_ENTRIES << 0));
-
-       /* Set up our vertex elements, sourced from the single vertex buffer. */
-       OUT_BATCH(BRW_3DSTATE_VERTEX_ELEMENTS | 3);
-       /* offset 0: X,Y -> {X, Y, 1.0, 1.0} */
-       OUT_BATCH((0 << VE0_VERTEX_BUFFER_INDEX_SHIFT) |
-		 VE0_VALID |
-		 (BRW_SURFACEFORMAT_R32G32_FLOAT << VE0_FORMAT_SHIFT) |
-		 (0 << VE0_OFFSET_SHIFT));
-       OUT_BATCH((BRW_VFCOMPONENT_STORE_SRC << VE1_VFCOMPONENT_0_SHIFT) |
-		 (BRW_VFCOMPONENT_STORE_SRC << VE1_VFCOMPONENT_1_SHIFT) |
-		 (BRW_VFCOMPONENT_STORE_1_FLT << VE1_VFCOMPONENT_2_SHIFT) |
-		 (BRW_VFCOMPONENT_STORE_1_FLT << VE1_VFCOMPONENT_3_SHIFT) |
-		 (0 << VE1_DESTINATION_ELEMENT_OFFSET_SHIFT));
-       /* offset 8: S0, T0 -> {S0, T0, 1.0, 1.0} */
-       OUT_BATCH((0 << VE0_VERTEX_BUFFER_INDEX_SHIFT) |
-		 VE0_VALID |
-		 (BRW_SURFACEFORMAT_R32G32_FLOAT << VE0_FORMAT_SHIFT) |
-		 (8 << VE0_OFFSET_SHIFT));
-       OUT_BATCH((BRW_VFCOMPONENT_STORE_SRC << VE1_VFCOMPONENT_0_SHIFT) |
-		 (BRW_VFCOMPONENT_STORE_SRC << VE1_VFCOMPONENT_1_SHIFT) |
-		 (BRW_VFCOMPONENT_STORE_1_FLT << VE1_VFCOMPONENT_2_SHIFT) |
-		 (BRW_VFCOMPONENT_STORE_1_FLT << VE1_VFCOMPONENT_3_SHIFT) |
-		 (4 << VE1_DESTINATION_ELEMENT_OFFSET_SHIFT));
-
-       OUT_BATCH(MI_NOOP);			/* pad to quadword */
-       ADVANCE_BATCH();
-    }
-
    /* Set up the offset for translating from the given region (in screen
     * coordinates) to the backing pixmap.
     */
@@ -1085,12 +1068,25 @@ I965DisplayVideoTextured(ScrnInfoPtr pScrn, I830PortPrivPtr pPriv, int id,
 	int i;
 	drm_intel_bo *vb_bo;
 	float *vb;
+	drm_intel_bo *bo_table[] = {
+	    NULL, /* vb_bo */
+	    pI830->batch_bo,
+	    bind_bo,
+	    pI830->video.gen4_sampler_bo,
+	    pI830->video.gen4_sip_kernel_bo,
+	    pI830->video.gen4_vs_bo,
+	    pI830->video.gen4_sf_bo,
+	    pI830->video.gen4_wm_packed_bo,
+	    pI830->video.gen4_wm_planar_bo,
+	    pI830->video.gen4_cc_bo,
+	};
 
 	pbox++;
 
 	if (intel_alloc_and_map(pI830, "textured video vb", 4096,
 				&vb_bo, &vb) != 0)
 	    break;
+	bo_table[0] = vb_bo;
 
 	i = 0;
 	vb[i++] = (box_x2 - dxo) * src_scale_x;
@@ -1112,6 +1108,18 @@ I965DisplayVideoTextured(ScrnInfoPtr pScrn, I830PortPrivPtr pPriv, int id,
 
 	i965_pre_draw_debug(pScrn);
 
+	/* If this command won't fit in the current batch, flush.
+	 * Assume that it does after being flushed.
+	 */
+	if (drm_intel_bufmgr_check_aperture_space(bo_table,
+						  ARRAY_SIZE(bo_table)) < 0) {
+	    intel_batch_flush(pScrn, FALSE);
+	}
+
+	intel_batch_start_atomic(pScrn, 100);
+
+	i965_emit_video_setup(pScrn, bind_bo, n_src_surf);
+
 	BEGIN_BATCH(10);
 	/* Set up the pointer to our vertex buffer */
 	OUT_BATCH(BRW_3DSTATE_VERTEX_BUFFERS | 2);
@@ -1134,6 +1142,8 @@ I965DisplayVideoTextured(ScrnInfoPtr pScrn, I830PortPrivPtr pPriv, int id,
 	OUT_BATCH(0); /* index buffer offset, ignored */
 	ADVANCE_BATCH();
 
+	intel_batch_end_atomic(pScrn);
+
 	drm_intel_bo_unreference(vb_bo);
 
 	i965_post_draw_debug(pScrn);
diff --git a/src/xvmc/intel_xvmc.c b/src/xvmc/intel_xvmc.c
index dbde22f..4b73caa 100644
--- a/src/xvmc/intel_xvmc.c
+++ b/src/xvmc/intel_xvmc.c
@@ -757,13 +757,6 @@ _X_EXPORT Status XvMCPutSurface(Display *display,XvMCSurface *surface,
     }
     intel_surf->last_draw = draw;
     /* fill intel_surf->data */
-    if (0)
-    {
-	drmVBlank vbl;
-	vbl.request.type = DRM_VBLANK_RELATIVE;
-	vbl.request.sequence = 1;
-	drmWaitVBlank(xvmc_driver->fd, &vbl);
-    }
     ret = (xvmc_driver->put_surface)(display, surface, draw, srcx, srcy,
 	    srcw, srch, destx, desty, destw, desth, flags, &intel_surf->data);
     if (ret) {

tiled-aux-bufs.patch:

--- NEW FILE tiled-aux-bufs.patch ---
commit 8d4bc36fae50b09a73ba2cfab920adb32141a358
Author: Jesse Barnes <jbarnes at virtuousgeek.org>
Date:   Mon Jan 26 17:14:06 2009 -0800

    Support tiled back/depth on 915-class hardware with DRI2.
    
    Set alignments, tile settings and flags correctly in the 2D driver to support
    tiled rendering.  UXA's create pixmap function currently assumes the worst
    about the alignment constraints; that should probably be fixed.  Some of the
    1M alignment fixes could probably be done more cleanly as well.

diff --git a/src/common.h b/src/common.h
index 4a87acb..be222df 100644
--- a/src/common.h
+++ b/src/common.h
@@ -367,6 +367,8 @@ extern int I810_DEBUG;
 #define SUPPORTS_INTEGRATED_HDMI(pI810) (IS_G4X(pI810))
 /* dsparb controlled by hw only */
 #define DSPARB_HWCONTROL(pI810) (IS_G4X(pI810))
+/* supports Y tiled surfaces (pre-965 Mesa isn't ready yet) */
+#define SUPPORTS_YTILING(pI810) (IS_I965G(pI830))
 
 #define GTT_PAGE_SIZE			KB(4)
 #define ROUND_TO(x, y)			(((x) + (y) - 1) / (y) * (y))
diff --git a/src/i830.h b/src/i830.h
index 4794169..d9adfbf 100644
--- a/src/i830.h
+++ b/src/i830.h
@@ -724,6 +724,7 @@ typedef struct _I830Rec {
    enum last_3d *last_3d;
 
    Bool use_drm_mode;
+   Bool kernel_exec_fencing;
 #ifdef XF86DRM_MODE
    drmmode_rec drmmode;
    int drm_mm_init;
@@ -910,6 +911,9 @@ extern void i830WaitSync(ScrnInfoPtr pScrn);
 /* i830_memory.c */
 Bool i830_bind_all_memory(ScrnInfoPtr pScrn);
 Bool i830_unbind_all_memory(ScrnInfoPtr pScrn);
+unsigned long i830_get_fence_size(I830Ptr pI830, unsigned long size);
+unsigned long i830_get_fence_pitch(I830Ptr pI830, unsigned long pitch, int format);
+unsigned long i830_get_fence_alignment(I830Ptr pI830, unsigned long size);
 
 Bool I830BindAGPMemory(ScrnInfoPtr pScrn);
 Bool I830UnbindAGPMemory(ScrnInfoPtr pScrn);
diff --git a/src/i830_dri.c b/src/i830_dri.c
index d6698da..7a95d02 100644
--- a/src/i830_dri.c
+++ b/src/i830_dri.c
@@ -1570,7 +1570,7 @@ I830DRI2CreateBuffers(DrawablePtr pDraw, unsigned int *attachments, int count)
 					       pDraw->depth, 0);
 	    switch (attachments[i]) {
 	    case DRI2BufferDepth:
-		if (IS_I965G(pI830))
+		if (SUPPORTS_YTILING(pI830))
 		    tiling = I915_TILING_Y;
 		else
 		    tiling = I915_TILING_X;
@@ -1583,19 +1583,14 @@ I830DRI2CreateBuffers(DrawablePtr pDraw, unsigned int *attachments, int count)
 		break;
 	    }
 
-	    /* Disable tiling on 915-class 3D for now.  Because the 2D blitter
-	     * requires fence regs to operate, and they're not being managed
-	     * by the kernel yet, we don't want to expose tiled buffers to the
-	     * 3D client as it'll just render incorrectly if it pays attention
-	     * to our tiling bits at all.
-	     */
-	    if (!IS_I965G(pI830))
+	    if (!pI830->tiling ||
+		(!IS_I965G(pI830) && !pI830->kernel_exec_fencing))
 		tiling = I915_TILING_NONE;
 
 	    if (tiling != I915_TILING_NONE) {
 		bo = i830_get_pixmap_bo(pPixmap);
 		drm_intel_bo_set_tiling(bo, &tiling,
-					pDraw->width * pDraw->bitsPerPixel / 8);
+					intel_get_pixmap_pitch(pPixmap));
 	    }
 	}
 
diff --git a/src/i830_driver.c b/src/i830_driver.c
index bf5ecc4..2c4ea07 100644
--- a/src/i830_driver.c
+++ b/src/i830_driver.c
@@ -1822,6 +1822,7 @@ I830PreInit(ScrnInfoPtr pScrn, int flags)
    pI830->SaveGeneration = -1;
    pI830->pEnt = pEnt;
    pI830->use_drm_mode = drm_mode_setting;
+   pI830->kernel_exec_fencing = pI830->use_drm_mode;
 
    if (!I830LoadSyms(pScrn))
        return FALSE;
diff --git a/src/i830_exa.c b/src/i830_exa.c
index 9249074..28be786 100644
--- a/src/i830_exa.c
+++ b/src/i830_exa.c
@@ -882,11 +882,25 @@ i830_uxa_create_pixmap (ScreenPtr screen, int w, int h, int depth, unsigned usag
     
     if (w && h)
     {
+	unsigned int size;
+
 	stride = ROUND_TO((w * pixmap->drawable.bitsPerPixel + 7) / 8,
 			  i830->accel_pixmap_pitch_alignment);
-    
-	bo = dri_bo_alloc (i830->bufmgr, "pixmap", stride * h, 
-			   i830->accel_pixmap_offset_alignment);
+
+	/* Use the I915_FENCE_TILING_X even if it may end up being TILING_Y,
+	 * as it just results in larger alignment.  Really, we need to use the
+	 * usage hint to tell what the pixmap's going to be.
+	 */
+	stride = i830_get_fence_pitch(i830, stride, I915_TILING_X);
+	/* Round the object up to the size of the fence it will live in
+	 * if necessary.  We could potentially make the kernel allocate
+	 * a larger aperture space and just bind the subset of pages in,
+	 * but this is easier and also keeps us out of trouble (as much)
+	 * with drm_intel_bufmgr_check_aperture().
+	 */
+	size = i830_get_fence_size(i830, stride * h);
+
+	bo = dri_bo_alloc (i830->bufmgr, "pixmap", size, 0);
 	if (!bo) {
 	    fbDestroyPixmap (pixmap);
 	    return NullPixmap;
diff --git a/src/i830_memory.c b/src/i830_memory.c
index 9bfee81..f3c55a3 100644
--- a/src/i830_memory.c
+++ b/src/i830_memory.c
@@ -132,10 +132,9 @@ static void i830_clear_tiling(ScrnInfoPtr pScrn, unsigned int fence_nr);
 /**
  * Returns the fence size for a tiled area of the given size.
  */
-static unsigned long
-i830_get_fence_size(ScrnInfoPtr pScrn, unsigned long size)
+unsigned long
+i830_get_fence_size(I830Ptr pI830, unsigned long size)
 {
-    I830Ptr pI830 = I830PTR(pScrn);
     unsigned long i;
     unsigned long start;
 
@@ -158,6 +157,43 @@ i830_get_fence_size(ScrnInfoPtr pScrn, unsigned long size)
     }
 }
 
+/**
+ * On some chips, pitch width has to be a power of two tile width, so
+ * calculate that here.
+ */
+unsigned long
+i830_get_fence_pitch(I830Ptr pI830, unsigned long pitch, int format)
+{
+    unsigned long i;
+    unsigned long tile_width = (format == I915_TILING_Y) ? 128 : 512;
+
+    if (format == TILE_NONE)
+	return pitch;
+
+    /* 965 is flexible */
+    if (IS_I965G(pI830))
+	return ROUND_TO(pitch, tile_width);
+
+    /* Pre-965 needs power of two tile width */
+    for (i = tile_width; i < pitch; i <<= 1)
+	;
+
+    return i;
+}
+
+/**
+ * On some chips, pitch width has to be a power of two tile width, so
+ * calculate that here.
+ */
+unsigned long
+i830_get_fence_alignment(I830Ptr pI830, unsigned long size)
+{
+    if (IS_I965G(pI830))
+	return 4096;
+    else
+	return i830_get_fence_size(pI830, size);
+}
+
 static Bool
 i830_check_display_stride(ScrnInfoPtr pScrn, int stride, Bool tiling)
 {
@@ -388,6 +424,7 @@ i830_allocator_init(ScrnInfoPtr pScrn, unsigned long offset, unsigned long size)
 #ifdef XF86DRI
     int dri_major, dri_minor, dri_patch;
     struct drm_i915_getparam gp;
+    struct drm_i915_setparam sp;
     int has_gem;
     int has_dri;
 #endif
@@ -499,6 +536,18 @@ i830_allocator_init(ScrnInfoPtr pScrn, unsigned long offset, unsigned long size)
 		struct drm_i915_gem_init init;
 		int ret;
 
+		sp.param = I915_SETPARAM_NUM_USED_FENCES;
+		if (pI830->use_drm_mode)
+		    sp.value = 0; /* kernel gets them all */
+		else if (pI830->directRenderingType == DRI_XF86DRI)
+		    sp.value = 3; /* front/back/depth */
+		else
+		    sp.value = 2; /* just front for DRI2 (both old & new though) */
+		ret = drmCommandWrite(pI830->drmSubFD, DRM_I915_SETPARAM, &sp,
+				      sizeof(sp));
+		if (ret == 0)
+		    pI830->kernel_exec_fencing = TRUE;
+
 		init.gtt_start = pI830->memory_manager->offset;
 		init.gtt_end = pI830->memory_manager->offset +
 		    pI830->memory_manager->size;
@@ -769,7 +818,7 @@ i830_allocate_memory_bo(ScrnInfoPtr pScrn, const char *name,
 
     /* Only allocate page-sized increments. */
     size = ALIGN(size, GTT_PAGE_SIZE);
-    align = ROUND_TO(align, GTT_PAGE_SIZE);
+    align = i830_get_fence_alignment(pI830, size);
 
     mem = xcalloc(1, sizeof(*mem));
     if (mem == NULL)
@@ -814,7 +863,7 @@ i830_allocate_memory_bo(ScrnInfoPtr pScrn, const char *name,
 	break;
     }
 
-    ret = dri_bo_set_tiling(mem->bo, &bo_tiling_mode);
+    ret = drm_intel_bo_set_tiling(mem->bo, &bo_tiling_mode, pitch);
     if (ret != 0 || (bo_tiling_mode == I915_TILING_NONE && tile_format != TILE_NONE)) {
 	xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
 		   "Failed to set tiling on %s: %s\n",
@@ -887,16 +936,8 @@ i830_allocate_memory(ScrnInfoPtr pScrn, const char *name,
 	}
 
 	/* round to size necessary for the fence register to work */
-	size = i830_get_fence_size(pScrn, size);
-	if (IS_I965G(pI830)) {
-	    if (alignment < GTT_PAGE_SIZE)
-		alignment = GTT_PAGE_SIZE;
-	} else {
-	    /* The offset has to be aligned to at least the size of the fence
-	     * region.
-	     */
-	    alignment = size;
-	}
+	size = i830_get_fence_size(pI830, size);
+	alignment = i830_get_fence_alignment(pI830, size);
     }
 #ifdef XF86DRI
     if (pI830->use_drm_mode || (pI830->memory_manager &&


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.121
retrieving revision 1.122
diff -u -r1.121 -r1.122
--- xorg-x11-drv-i810.spec	20 Jan 2009 21:43:57 -0000	1.121
+++ xorg-x11-drv-i810.spec	29 Jan 2009 22:59:44 -0000	1.122
@@ -19,10 +19,11 @@
 #Source1:   xf86-video-intel-%{batchbuffer_version}.tar.bz2 
 Source2:   i810.xinf
 
-Patch1: intel-2.6.0-to-7db3201.patch
+Patch1: intel-2.6.0-to-66bc44.patch
 Patch3: intel-2.1.1-fix-xv-reset.patch
 Patch5: intel-2.5.0-no-legacy-3d.patch
 Patch6: intel-2.5.0-no-gem-legacy-3d.patch
+Patch7: tiled-aux-bufs.patch
 
 ExclusiveArch: %{ix86} x86_64 ia64
 
@@ -57,6 +58,9 @@
 %patch5 -p1 -b .nolegacy3d
 %patch6 -p1 -b .nogem3d
 
+# Back this out for now, needs kernel support
+%patch7 -R -p1 -b .tiled-aux
+
 %build
 
 autoreconf -vi
@@ -98,6 +102,9 @@
 %{_libdir}/libIntelXvMC.so
 
 %changelog
+* Thu Jan 29 2009 Kristian H??gsberg <krh at hinata> - 2.6.0-2
+- Update to 66bc44 from git master.
+
 * Tue Jan 20 2009 Kristian H??gsberg <krh at kabuto.bos.redhat.com> 2.6.0-1
 - Update to 2.6.0.
 



From kkofler at fedoraproject.org  Thu Jan 29 23:05:57 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Thu, 29 Jan 2009 23:05:57 +0000 (UTC)
Subject: rpms/kde-plasma-quickaccess/F-9
	kde-plasma-quickaccess-0.7.1-kde42-build.patch, NONE,
	1.1 kde-plasma-quickaccess-0.7.1-kde42-iconwidget.patch, NONE,
	1.1 kde-plasma-quickaccess.spec, 1.2, 1.3
Message-ID: <20090129230557.4804270116@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kde-plasma-quickaccess/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29681/F-9

Modified Files:
	kde-plasma-quickaccess.spec 
Added Files:
	kde-plasma-quickaccess-0.7.1-kde42-build.patch 
	kde-plasma-quickaccess-0.7.1-kde42-iconwidget.patch 
Log Message:
Sync from F-10:

* Wed Jan 29 2009 Jaroslav Reznik <jreznik at redhat.com> 0.7.1-7
- KDE 4.2.0 build patch (Plasma package no more required)

* Wed Jan 29 2009 Jaroslav Reznik <jreznik at redhat.com> 0.7.1-6
- KDE 4.2.0 rebuild 

* Sun Dec 14 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 0.7.1-5
- drop libkonq hack, linker search path fixed in kdelibs now

* Tue Dec 02 2008 Jaroslav Reznik <jreznik at redhat.com> 0.7.1-4
- build requires
- build problem ugly hack (lkonq)
- make VERBOSE=1

* Tue Dec 02 2008 Jaroslav Reznik <jreznik at redhat.com> 0.7.1-3
- patched for KDE 4.2 Plasma API

kde-plasma-quickaccess-0.7.1-kde42-build.patch:

--- NEW FILE kde-plasma-quickaccess-0.7.1-kde42-build.patch ---
diff -up quickaccess-0.7.1/CMakeLists.txt.kde42-build quickaccess-0.7.1/CMakeLists.txt
--- quickaccess-0.7.1/CMakeLists.txt.kde42-build	2008-08-03 12:29:26.000000000 +0200
+++ quickaccess-0.7.1/CMakeLists.txt	2009-01-28 17:33:02.000000000 +0100
@@ -4,7 +4,6 @@ project(quickaccess)
 # Find the required Libaries
 find_package(KDE4 REQUIRED)
 include(KDE4Defaults)
-find_package(Plasma REQUIRED)
  
 add_definitions (${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
 include_directories(
@@ -21,7 +20,7 @@ set(quickaccess_SRCS quickaccess.cpp pop
 kde4_add_ui_files(quickaccess_SRCS quickaccessConfig.ui pluginwidgetbase.ui)
 kde4_add_plugin(plasma_applet_quickaccess ${quickaccess_SRCS})
 target_link_libraries(plasma_applet_quickaccess 
-                      ${PLASMA_LIBS} ${KDE4_KDEUI_LIBS} ${KDE4_KIO_LIBS} kfile konq)
+                      ${KDE4_PLASMA_LIBS} ${KDE4_KDEUI_LIBS} ${KDE4_KIO_LIBS} kfile konq)
  
 install(TARGETS plasma_applet_quickaccess
         DESTINATION ${PLUGIN_INSTALL_DIR})

kde-plasma-quickaccess-0.7.1-kde42-iconwidget.patch:

--- NEW FILE kde-plasma-quickaccess-0.7.1-kde42-iconwidget.patch ---
diff -up quickaccess-0.7.1/quickaccess.cpp.kde42-iconwidget quickaccess-0.7.1/quickaccess.cpp
--- quickaccess-0.7.1/quickaccess.cpp.kde42-iconwidget	2008-08-03 12:29:26.000000000 +0200
+++ quickaccess-0.7.1/quickaccess.cpp	2008-11-20 15:28:58.000000000 +0100
@@ -40,7 +40,7 @@
 QuickAccess::QuickAccess(QObject *parent, const QVariantList &args)
   :Plasma::Applet(parent, args)
   ,m_settings(new Settings(this))
-  ,m_icon(new Plasma::Icon(this))
+  ,m_icon(new Plasma::IconWidget(this))
   ,m_dialog(0)
   ,m_dialogSize(QSize())
   ,m_dragOver(false)
diff -up quickaccess-0.7.1/quickaccess.h.kde42-iconwidget quickaccess-0.7.1/quickaccess.h
--- quickaccess-0.7.1/quickaccess.h.kde42-iconwidget	2008-11-20 15:28:31.000000000 +0100
+++ quickaccess-0.7.1/quickaccess.h	2008-11-20 15:28:11.000000000 +0100
@@ -22,7 +22,7 @@
 
 //Plasma includes
 #include <Plasma/Applet>
-#include <plasma/widgets/icon.h>
+#include <plasma/widgets/iconwidget.h>
 
 //locale includes
 #include "popupdialog.h"
@@ -63,7 +63,7 @@ class QuickAccess : public Plasma::Apple
     
   private:
     Settings *m_settings;
-    Plasma::Icon *m_icon;
+    Plasma::IconWidget *m_icon;
     PopupDialog *m_dialog;
     QSize m_dialogSize;
     bool m_dragOver;


Index: kde-plasma-quickaccess.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-quickaccess/F-9/kde-plasma-quickaccess.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- kde-plasma-quickaccess.spec	6 Nov 2008 15:34:00 -0000	1.2
+++ kde-plasma-quickaccess.spec	29 Jan 2009 23:05:26 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           kde-plasma-quickaccess
 Version:        0.7.1
-Release:        2%{?dist}
+Release:        7%{?dist}
 Summary:        Plasma applet for quick access to the most used folders
 
 Group:          User Interface/Desktops
@@ -9,12 +9,15 @@
 
 Source0:        http://www.kde-look.org/CONTENT/content-files/84128-quickaccess-%{version}.tar.gz
 Patch0:         kde-plasma-quickaccess-0.7.1-default-size.patch
+Patch1:         kde-plasma-quickaccess-0.7.1-kde42-iconwidget.patch
+Patch2:         kde-plasma-quickaccess-0.7.1-kde42-build.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  kdebase-workspace-devel >= 4.1.0
-BuildRequires:  kdelibs-devel >= 4.1.0
-BuildRequires:  kdebase-devel >= 4.1.0 
+BuildRequires:  kdebase-workspace-devel >= 4.2.0
+BuildRequires:  kdelibs-devel >= 4.2.0
+BuildRequires:  kdebase-devel >= 4.2.0
+BuildRequires:  kdebase-libs >= 4.2.0
 
 %description
 QuickAccess is a small applet designed for the panel to have quick access
@@ -24,6 +27,8 @@
 %prep
 %setup -qn quickaccess-%{version}
 %patch0 -p1 -b .default-size
+%patch1 -p1 -b .kde42-iconwidget
+%patch2 -p1 -b .kde42-build
 
 
 %build
@@ -32,7 +37,7 @@
 %{cmake_kde4} ..
 popd
 
-make %{?_smp_mflags} -C %{_target_platform}
+make VERBOSE=1 %{?_smp_mflags} -C %{_target_platform}
 
 
 %install
@@ -55,8 +60,26 @@
 %{_kde4_datadir}/kde4/services/plasma-applet-quickaccess.desktop
 
 %changelog
+* Wed Jan 29 2009 Jaroslav Reznik <jreznik at redhat.com> 0.7.1-7
+- KDE 4.2.0 build patch (Plasma package no more required)
+
+* Wed Jan 29 2009 Jaroslav Reznik <jreznik at redhat.com> 0.7.1-6
+- KDE 4.2.0 rebuild 
+
+* Sun Dec 14 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 0.7.1-5
+- drop libkonq hack, linker search path fixed in kdelibs now
+
+* Tue Dec 02 2008 Jaroslav Reznik <jreznik at redhat.com> 0.7.1-4
+- build requires
+- build problem ugly hack (lkonq)
+- make VERBOSE=1
+
+* Tue Dec 02 2008 Jaroslav Reznik <jreznik at redhat.com> 0.7.1-3
+- patched for KDE 4.2 Plasma API
+
 * Thu Nov 06 2008 Jaroslav Reznik <jreznik at redhat.com> 0.7.1-2
 - default size patch
 - fix URL
+
 * Wed Sep 10 2008 Jaroslav Reznik <jreznik at redhat.com> 0.7.1-1
-- Initial package
\ No newline at end of file
+- Initial package



From kkofler at fedoraproject.org  Thu Jan 29 23:07:47 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Thu, 29 Jan 2009 23:07:47 +0000 (UTC)
Subject: rpms/kde-plasma-runcommand/F-9 kde-plasma-runcommand.spec, 1.4,
	1.5 sources, 1.4,
	1.5 kde-plasma-runcommand-0.9-plasma-libs.patch, 1.1, NONE
Message-ID: <20090129230747.401A270117@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kde-plasma-runcommand/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30153/F-9

Modified Files:
	kde-plasma-runcommand.spec sources 
Removed Files:
	kde-plasma-runcommand-0.9-plasma-libs.patch 
Log Message:
Sync from F-10:

* Tue Jan 27 2009 Jaroslav Reznik <jreznik at redhat.com> 1.0-1
- update to 1.0, cmake related changes


Index: kde-plasma-runcommand.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-runcommand/F-9/kde-plasma-runcommand.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- kde-plasma-runcommand.spec	2 Jan 2009 12:11:09 -0000	1.4
+++ kde-plasma-runcommand.spec	29 Jan 2009 23:07:16 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           kde-plasma-runcommand
-Version:        0.9
-Release:        2%{?dist}
+Version:        1.0
+Release:        1%{?dist}
 Summary:        Simple plasmoid to run commands without using terminal or KRunner
 
 Group:          User Interface/Desktops
@@ -8,11 +8,10 @@
 URL:            http://www.kde-look.org/content/show.php/Run+Command?content=91495
 
 Source0:        http://www.kde-look.org/CONTENT/content-files/91495-runcommand_%{version}.tar.bz2
-Patch0:         kde-plasma-runcommand-0.9-plasma-libs.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  kdebase-workspace-devel >= 4.1.0
+BuildRequires:  kdebase-workspace-devel >= 4.2.0
 
 %description
 Simple plasmoid to run commands without using terminal or KRunner. Inspired by
@@ -21,7 +20,7 @@
 
 %prep
 %setup -qn runcommand_%{version}
-%patch0 -p1 -b .plasma-libs
+
 
 %build
 mkdir -p %{_target_platform}
@@ -29,7 +28,7 @@
 %{cmake_kde4} ../applet
 popd
 
-make %{?_smp_mflags} -C %{_target_platform}
+make VERBOSE=1 %{?_smp_mflags} -C %{_target_platform}
 
 
 %install
@@ -48,12 +47,15 @@
 %{_kde4_datadir}/kde4/services/plasma-applet-runcommand.desktop
 
 %changelog
-* Fri Jan 02 2009 Jaroslav Reznik <jreznik at redhat.com> 0.9-2
-- link target against PLASMA_LIBS
+* Tue Jan 27 2009 Jaroslav Reznik <jreznik at redhat.com> 1.0-1
+- update to 1.0, cmake related changes
 
 * Fri Jan 02 2009 Jaroslav Reznik <jreznik at redhat.com> 0.9-1
 - update to 0.9
 
+* Tue Dec 02 2008 Jaroslav Reznik <jreznik at redhat.com> 0.7-2
+- make VERBOSE=1
+
 * Wed Nov 19 2008 Jaroslav Reznik <jreznik at redhat.com> 0.7-1
 - update to 0.7
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-runcommand/F-9/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	2 Jan 2009 11:41:00 -0000	1.4
+++ sources	29 Jan 2009 23:07:16 -0000	1.5
@@ -1 +1 @@
-a98d6e3f32b85eae3f299c06cb8432f2  91495-runcommand_0.9.tar.bz2
+2b84999f79af020156ee586cc08310df  91495-runcommand_1.0.tar.bz2


--- kde-plasma-runcommand-0.9-plasma-libs.patch DELETED ---



From airlied at fedoraproject.org  Thu Jan 29 23:12:02 2009
From: airlied at fedoraproject.org (Dave Airlie)
Date: Thu, 29 Jan 2009 23:12:02 +0000 (UTC)
Subject: rpms/xorg-x11-drv-ati/F-10 radeon-fix-rs780-mm.patch, NONE,
	1.1 xorg-x11-drv-ati.spec, 1.166, 1.167
Message-ID: <20090129231202.09EA170116@cvs1.fedora.phx.redhat.com>

Author: airlied

Update of /cvs/pkgs/rpms/xorg-x11-drv-ati/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31467

Modified Files:
	xorg-x11-drv-ati.spec 
Added Files:
	radeon-fix-rs780-mm.patch 
Log Message:
* Fri Jan 30 2009 Dave Airlie <airlied at redhat.com> 6.10.0-2
- Fix a possible memory corruption issue on RS780 (#474078)
- also fixes zaphod on rs780


radeon-fix-rs780-mm.patch:

--- NEW FILE radeon-fix-rs780-mm.patch ---
>From 3a6e958c59b4b44fe620c8abe760ed1abf0007b1 Mon Sep 17 00:00:00 2001
From: airlied <airlied at roo.(none)>
Date: Fri, 30 Jan 2009 07:56:14 +1000
Subject: [PATCH] rs780: include RS780 in the InitMemory to leave alone

This stops the MC_FB_LOCATION getting reassigned to 0, which
is really bad thing to happen.

I've had reported memory corruption on these cards so hopefully this
fixes it.
---
 src/radeon_driver.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/src/radeon_driver.c b/src/radeon_driver.c
index 22b2e4c..eda7b77 100644
--- a/src/radeon_driver.c
+++ b/src/radeon_driver.c
@@ -1293,7 +1293,8 @@ static void RADEONInitMemoryMap(ScrnInfoPtr pScrn)
 
     if ((info->ChipFamily != CHIP_FAMILY_RS600) &&
 	(info->ChipFamily != CHIP_FAMILY_RS690) &&
-	(info->ChipFamily != CHIP_FAMILY_RS740)) {
+	(info->ChipFamily != CHIP_FAMILY_RS740) &&
+	(info->ChipFamily != CHIP_FAMILY_RS780)) {
 	if (info->IsIGP)
 	    info->mc_fb_location = INREG(RADEON_NB_TOM);
 	else
-- 
1.6.0.4



Index: xorg-x11-drv-ati.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ati/F-10/xorg-x11-drv-ati.spec,v
retrieving revision 1.166
retrieving revision 1.167
diff -u -r1.166 -r1.167
--- xorg-x11-drv-ati.spec	25 Jan 2009 07:08:46 -0000	1.166
+++ xorg-x11-drv-ati.spec	29 Jan 2009 23:11:31 -0000	1.167
@@ -5,7 +5,7 @@
 Summary:   Xorg X11 ati video driver
 Name:      xorg-x11-drv-ati
 Version:   6.10.0
-Release:   1%{?dist}
+Release:   2%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -20,6 +20,7 @@
 Patch6:     radeon-6.9.0-bgnr-enable.patch
 Patch7:	    radeon-6.10.0-fixes.patch
 Patch12:    radeon-modeset-fix-legacy-vt.patch
+Patch13:    radeon-fix-rs780-mm.patch
 
 ExcludeArch: s390 s390x
 
@@ -47,6 +48,7 @@
 %patch6 -p1 -b .bgnr
 %patch7 -p1 -b .upstream
 %patch12 -p1 -b .vtswitch
+%patch13 -p1 -b .rs780fix
 
 %build
 autoreconf -iv
@@ -78,6 +80,10 @@
 %{_mandir}/man4/radeon.4*
 
 %changelog
+* Fri Jan 30 2009 Dave Airlie <airlied at redhat.com> 6.10.0-2
+- Fix a possible memory corruption issue on RS780 (#474078)
+- also fixes zaphod on rs780
+
 * Sun Jan 25 2009 Dave Airlie <airlied at redhat.com> 6.10.0-1
 - rebase to latest upstream release
 



From airlied at fedoraproject.org  Thu Jan 29 23:14:08 2009
From: airlied at fedoraproject.org (Dave Airlie)
Date: Thu, 29 Jan 2009 23:14:08 +0000 (UTC)
Subject: rpms/xorg-x11-drv-ati/devel radeon-fix-rs780-mm.patch, NONE,
	1.1 xorg-x11-drv-ati.spec, 1.146, 1.147
Message-ID: <20090129231408.A6D8A70116@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-serv31950

Modified Files:
	xorg-x11-drv-ati.spec 
Added Files:
	radeon-fix-rs780-mm.patch 
Log Message:
* Fri Jan 30 2009 Dave Airlie <airlied at redhat.com> 6.10.0-2
- Fix corruption on rs780 hopefully


radeon-fix-rs780-mm.patch:

--- NEW FILE radeon-fix-rs780-mm.patch ---
>From 3a6e958c59b4b44fe620c8abe760ed1abf0007b1 Mon Sep 17 00:00:00 2001
From: airlied <airlied at roo.(none)>
Date: Fri, 30 Jan 2009 07:56:14 +1000
Subject: [PATCH] rs780: include RS780 in the InitMemory to leave alone

This stops the MC_FB_LOCATION getting reassigned to 0, which
is really bad thing to happen.

I've had reported memory corruption on these cards so hopefully this
fixes it.
---
 src/radeon_driver.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/src/radeon_driver.c b/src/radeon_driver.c
index 22b2e4c..eda7b77 100644
--- a/src/radeon_driver.c
+++ b/src/radeon_driver.c
@@ -1293,7 +1293,8 @@ static void RADEONInitMemoryMap(ScrnInfoPtr pScrn)
 
     if ((info->ChipFamily != CHIP_FAMILY_RS600) &&
 	(info->ChipFamily != CHIP_FAMILY_RS690) &&
-	(info->ChipFamily != CHIP_FAMILY_RS740)) {
+	(info->ChipFamily != CHIP_FAMILY_RS740) &&
+	(info->ChipFamily != CHIP_FAMILY_RS780)) {
 	if (info->IsIGP)
 	    info->mc_fb_location = INREG(RADEON_NB_TOM);
 	else
-- 
1.6.0.4



Index: xorg-x11-drv-ati.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ati/devel/xorg-x11-drv-ati.spec,v
retrieving revision 1.146
retrieving revision 1.147
diff -u -r1.146 -r1.147
--- xorg-x11-drv-ati.spec	7 Jan 2009 03:18:45 -0000	1.146
+++ xorg-x11-drv-ati.spec	29 Jan 2009 23:13:38 -0000	1.147
@@ -5,7 +5,7 @@
 Summary:   Xorg X11 ati video driver
 Name:      xorg-x11-drv-ati
 Version:   6.10.0
-Release:   1%{?dist}
+Release:   2%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -19,6 +19,7 @@
 Patch5:	    radeon-6.9.0-panel-size-sanity.patch
 Patch6:     radeon-6.9.0-bgnr-enable.patch
 Patch7:     radeon-mode-fix-rotate.patch
+Patch8:	    radeon-fix-rs780-mm.patch
 
 ExcludeArch: s390 s390x
 
@@ -45,7 +46,7 @@
 %patch5 -p1 -b .panel-size
 %patch6 -p1 -b .bgnr
 %patch7 -p1 -b .fix-rotate
-
+%patch8 -p1 -b .rs780-fix
 
 %build
 autoreconf -iv
@@ -77,6 +78,9 @@
 %{_mandir}/man4/radeon.4*
 
 %changelog
+* Fri Jan 30 2009 Dave Airlie <airlied at redhat.com> 6.10.0-2
+- Fix corruption on rs780 hopefully
+
 * Wed Jan 07 2009 Dave Airlie <airlied at redhat.com> 6.10.0-1
 - rebase to latest upstream release
 



From kkofler at fedoraproject.org  Thu Jan 29 23:14:46 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Thu, 29 Jan 2009 23:14:46 +0000 (UTC)
Subject: rpms/compiz/F-9 compiz-0.7.6-kde42.patch, NONE,
	1.1 compiz-0.7.8-kde42-crash.patch, NONE,
	1.1 compiz-0.7.8-kde42-krunner.patch, NONE, 1.1 compiz.spec,
	1.123, 1.124 compiz-0.7.6-kde4-plasma-revert.patch, 1.1, NONE
Message-ID: <20090129231446.E227670116@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/compiz/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32055/F-9

Modified Files:
	compiz.spec 
Added Files:
	compiz-0.7.6-kde42.patch compiz-0.7.8-kde42-crash.patch 
	compiz-0.7.8-kde42-krunner.patch 
Removed Files:
	compiz-0.7.6-kde4-plasma-revert.patch 
Log Message:
* Thu Jan 29 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> - 0.7.6-4
- patch and rebuild for KDE 4.2

compiz-0.7.6-kde42.patch:

--- NEW FILE compiz-0.7.6-kde42.patch ---
diff -ur compiz-0.7.6/kde/window-decorator-kde4/switcher.cpp compiz-0.7.6-kde42/kde/window-decorator-kde4/switcher.cpp
--- compiz-0.7.6/kde/window-decorator-kde4/switcher.cpp	2008-05-29 13:58:33.000000000 +0200
+++ compiz-0.7.6-kde42/kde/window-decorator-kde4/switcher.cpp	2008-12-10 03:24:48.000000000 +0100
@@ -30,7 +30,7 @@
 
 #include <fixx11h.h>
 
-#include <KDE/Plasma/PanelSvg>
+#include <KDE/Plasma/FrameSvg>
 #include <KDE/Plasma/Theme>
 
 #include <kwindowsystem.h>
@@ -46,9 +46,9 @@
     QColor   color;
     color = Plasma::Theme::defaultTheme ()->color (Plasma::Theme::TextColor);
 
-    mBackground = new Plasma::PanelSvg();
+    mBackground = new Plasma::FrameSvg();
     mBackground->setImagePath ("dialogs/background");
-    mBackground->setEnabledBorders(Plasma::PanelSvg::AllBorders);
+    mBackground->setEnabledBorders(Plasma::FrameSvg::AllBorders);
 
     mBorder.left   = mBackground->marginSize(Plasma::LeftMargin);
     mBorder.right  = mBackground->marginSize(Plasma::RightMargin);
@@ -131,8 +131,8 @@
     p.setCompositionMode (QPainter::CompositionMode_Source);
     p.setRenderHint (QPainter::SmoothPixmapTransform);
 
-    mBackground->resizePanel (QSizeF (contentWidth, contentHeight));
-    mBackground->paintPanel (&p, QRect (0, 0, contentWidth,
+    mBackground->resizeFrame (QSizeF (contentWidth, contentHeight));
+    mBackground->paintFrame (&p, QRect (0, 0, contentWidth,
 			contentHeight));
 
     mBackgroundPixmap = mPixmap.copy (mBorder.left, mBorder.top,
diff -ur compiz-0.7.6/kde/window-decorator-kde4/switcher.h compiz-0.7.6-kde42/kde/window-decorator-kde4/switcher.h
--- compiz-0.7.6/kde/window-decorator-kde4/switcher.h	2008-05-29 13:58:33.000000000 +0200
+++ compiz-0.7.6-kde42/kde/window-decorator-kde4/switcher.h	2008-12-10 03:24:48.000000000 +0100
@@ -30,7 +30,7 @@
 
 namespace Plasma
 {
-class PanelSvg;
+class FrameSvg;
 }
 
 class QSpacerItem;
@@ -70,7 +70,7 @@
 
 	QRect mGeometry;
 
-	Plasma::PanelSvg *mBackground;
+	Plasma::FrameSvg *mBackground;
 	QPixmap mPixmap;
 	QPixmap mBackgroundPixmap;
 

compiz-0.7.8-kde42-crash.patch:

--- NEW FILE compiz-0.7.8-kde42-crash.patch ---
Implement KDecorationBridge unstable API, needed for KDE 4.2.
---

diff --git a/kde/window-decorator-kde4/window.cpp b/kde/window-decorator-kde4/window.cpp
index d2d362b..68c856b 100644
--- a/kde/window-decorator-kde4/window.cpp
+++ b/kde/window-decorator-kde4/window.cpp
@@ -764,6 +764,31 @@ KWD::Window::grabXServer (bool)
 }
 
 void
+KWD::Window::repaintShadow (void)
+{
+}
+
+bool
+KWD::Window::compositingActive (void) const
+{
+    return true;
+}
+
+bool
+KWD::Window::shadowsActive (void) const
+{
+    /* we are drawing the shadows ourselves, no need for the
+       decoration engine to do so */
+    return false;
+}
+
+double
+KWD::Window::opacity (void) const
+{
+    return 1.0;
+}
+
+void
 KWD::Window::createDecoration (void)
 {
     KDecoration *decor;
diff --git a/kde/window-decorator-kde4/window.h b/kde/window-decorator-kde4/window.h
index bdf2c47..034e6fe 100644
--- a/kde/window-decorator-kde4/window.h
+++ b/kde/window-decorator-kde4/window.h
@@ -45,7 +45,7 @@ class QMenu;
 
 namespace KWD
 {
-class Window:public QWidget, public KDecorationBridge {
+class Window:public QWidget, public KDecorationBridgeUnstable {
     Q_OBJECT public:
 
 	enum Type
@@ -104,6 +104,12 @@ class Window:public QWidget, public KDecorationBridge {
 	virtual Qt::WFlags initialWFlags (void) const;
 	virtual void grabXServer (bool grab);
 
+	/* unstable API */
+	virtual void repaintShadow ();
+	virtual bool compositingActive () const;
+	virtual bool shadowsActive () const;
+	virtual double opacity () const;
+
 	void handleActiveChange (void);
 	void updateFrame (WId frame);
 	void updateWindowGeometry (void);


compiz-0.7.8-kde42-krunner.patch:

--- NEW FILE compiz-0.7.8-kde42-krunner.patch ---
diff --git a/kde/window-decorator-kde4/decorator.cpp b/kde/window-decorator-kde4/decorator.cpp
index 96b818d..0bf4718 100644
--- a/kde/window-decorator-kde4/decorator.cpp
+++ b/kde/window-decorator-kde4/decorator.cpp
@@ -649,9 +649,10 @@ KWD::Decorator::x11EventFilter (XEvent *xevent)
 	    }
 	    else if (action == Atoms::toolkitActionRunDialogAtom)
 	    {
-		QDBusInterface krunner ("org.kde.krunner", "/Interface",
-					"org.kde.krunner.Interface");
-		krunner.call ("display", "");
+		QDBusInterface krunner ("org.kde.krunner", "/App",
+					"org.kde.krunner.App");
+		if (krunner.isValid ())
+		    krunner.call ("display");
 	    }
 	    else if (action == Atoms::toolkitActionForceQuitDialogAtom)
 	    {



Index: compiz.spec
===================================================================
RCS file: /cvs/pkgs/rpms/compiz/F-9/compiz.spec,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -r1.123 -r1.124
--- compiz.spec	24 Jul 2008 15:11:23 -0000	1.123
+++ compiz.spec	29 Jan 2009 23:14:16 -0000	1.124
@@ -14,7 +14,7 @@
 License:        X11/MIT/GPL
 Group:          User Interface/Desktops
 Version:        0.7.6
-Release:        3%{?dist}.1
+Release:        4%{?dist}
 
 Summary:        OpenGL window and compositing manager
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -39,7 +39,7 @@
 BuildRequires:  librsvg2-devel
 BuildRequires:  metacity-devel >= 2.18
 BuildRequires:  mesa-libGLU-devel
-BuildRequires:  kdebase-workspace-devel >= 4.0.80
+BuildRequires:  kdebase-workspace-devel >= 4.2
 BuildRequires:  dbus-qt-devel
 BuildRequires:  fuse-devel
 
@@ -60,8 +60,13 @@
 #Patch110: scale-key.patch
 # upstream commit 45caca2220f75bfd20074c217ebee10825413547
 Patch111: compiz-0.7.6-decoration-size.patch
-# revert kde4 plasma changes to build agains kde4 < 4.0.80
-Patch112: compiz-0.7.6-kde4-plasma-revert.patch
+# make kde4-window-decorator build against KDE 4.2's libplasma
+Patch120: compiz-0.7.6-kde42.patch
+# KDE-4.2 fixes from upstream:
+# 814809ffffe47f829b784f7bd246026bfcdecf0f
+Patch126: compiz-0.7.8-kde42-crash.patch
+# 4cc1d813a9748c3740662233a2add3fe65a4c533
+Patch127: compiz-0.7.8-kde42-krunner.patch
 
 %description
 Compiz is one of the first OpenGL-accelerated compositing window
@@ -136,7 +141,11 @@
 %endif
 #%patch110 -p1 -b .scale-key
 %patch111 -p1 -b .decoration-size
-#patch112 -p1 -b .plasma
+%patch120 -p1 -b .kde42
+sleep 1
+touch configure
+%patch126 -p1 -b .kde-crash
+%patch127 -p1 -b .krunner
 %build
 rm -rf $RPM_BUILD_ROOT
 
@@ -338,6 +347,9 @@
 
 
 %changelog
+* Thu Jan 29 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> - 0.7.6-4
+- patch and rebuild for KDE 4.2
+
 * Thu Jul 24 2008 Rex Dieter <rdieter at fedoraproject.org> - 0.7.6-3.1
 - (re)build for kde-4.1
 


--- compiz-0.7.6-kde4-plasma-revert.patch DELETED ---



From nsantos at fedoraproject.org  Thu Jan 29 23:15:29 2009
From: nsantos at fedoraproject.org (Nuno Santos)
Date: Thu, 29 Jan 2009 23:15:29 +0000 (UTC)
Subject: rpms/qpidc/F-10 qpidc.spec,1.64,1.65
Message-ID: <20090129231529.12A1070116@cvs1.fedora.phx.redhat.com>

Author: nsantos

Update of /cvs/extras/rpms/qpidc/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32317

Modified Files:
	qpidc.spec 
Log Message:
BZ474614 - qpidc unowned directories


Index: qpidc.spec
===================================================================
RCS file: /cvs/extras/rpms/qpidc/F-10/qpidc.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- qpidc.spec	29 Jan 2009 17:07:09 -0000	1.64
+++ qpidc.spec	29 Jan 2009 23:14:58 -0000	1.65
@@ -7,7 +7,7 @@
 
 Name:           qpidc
 Version:        0.4.738618
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Libraries for Qpid C++ client applications
 Group:          System Environment/Libraries
 License:        ASL 2.0
@@ -245,6 +245,7 @@
 
 %files devel
 %defattr(-,root,root,-)
+%dir %_includedir/qpid
 %_includedir/qpid/*.h
 %_includedir/qpid/amqp_0_10
 %_includedir/qpid/client
@@ -254,7 +255,6 @@
 %_includedir/qpid/log
 %_includedir/qpid/management
 %_includedir/qpid/agent
-%_includedir/qpid
 %_includedir/qmf
 %_libdir/libqpidcommon.so
 %_libdir/libqpidclient.so
@@ -273,7 +273,7 @@
 %{_initrddir}/qpidd
 %dir %_libdir/qpid/daemon
 %attr(755, qpidd, qpidd) %_localstatedir/lib/qpidd
-%attr(755, qpidd, qpidd) %_libdir/qpidd
+#%attr(755, qpidd, qpidd) %_libdir/qpidd
 %attr(755, qpidd, qpidd) /var/run/qpidd
 %attr(600, qpidd, qpidd) %config(noreplace) %_localstatedir/lib/qpidd/qpidd.sasldb
 %doc %_mandir/man1/qpidd.*
@@ -375,8 +375,9 @@
 %postun -n qmf -p /sbin/ldconfig
 
 %changelog
-* Wed Jan 28 2009 Nuno Santos <nsantos at redhat.com> - 0.4.738618-1
+* Wed Jan 28 2009 Nuno Santos <nsantos at redhat.com> - 0.4.738618-2
 - Rebased to svn rev 738618
+- BZ474614 - qpidc unowned directories
 
 * Tue Jan 20 2009 Nuno Santos <nsantos at redhat.com> - 0.4.734452-3
 - BZ474614 and BZ474613 - qpidc/rhm unowned directories



From kkofler at fedoraproject.org  Thu Jan 29 23:15:55 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Thu, 29 Jan 2009 23:15:55 +0000 (UTC)
Subject: rpms/compiz/F-9 compiz.spec,1.124,1.125
Message-ID: <20090129231555.3166E70116@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/compiz/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32398/F-9

Modified Files:
	compiz.spec 
Log Message:
Oops, fix changelog date (2009).


Index: compiz.spec
===================================================================
RCS file: /cvs/pkgs/rpms/compiz/F-9/compiz.spec,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -r1.124 -r1.125
--- compiz.spec	29 Jan 2009 23:14:16 -0000	1.124
+++ compiz.spec	29 Jan 2009 23:15:24 -0000	1.125
@@ -347,7 +347,7 @@
 
 
 %changelog
-* Thu Jan 29 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> - 0.7.6-4
+* Thu Jan 29 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 0.7.6-4
 - patch and rebuild for KDE 4.2
 
 * Thu Jul 24 2008 Rex Dieter <rdieter at fedoraproject.org> - 0.7.6-3.1



From mathstuf at fedoraproject.org  Thu Jan 29 23:41:51 2009
From: mathstuf at fedoraproject.org (Ben Boeckel)
Date: Thu, 29 Jan 2009 23:41:51 +0000 (UTC)
Subject: rpms/krazy2/devel krazy2.spec,1.9,1.10 sources,1.6,1.7
Message-ID: <20090129234151.5B20270116@cvs1.fedora.phx.redhat.com>

Author: mathstuf

Update of /cvs/pkgs/rpms/krazy2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4150

Modified Files:
	krazy2.spec sources 
Log Message:
Cleaned up spec file for KDE 4.2.0 update


Index: krazy2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/krazy2/devel/krazy2.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- krazy2.spec	24 Jan 2009 18:36:18 -0000	1.9
+++ krazy2.spec	29 Jan 2009 23:41:21 -0000	1.10
@@ -3,7 +3,7 @@
 
 Name:           krazy2
 Version:        2.8
-Release:        6.20090113svn916151%{?dist}
+Release:        7.20090127svn%{?dist}
 Summary:        Krazy is a tool for checking code against the KDE coding guidelines
 
 Group:          Development/Libraries
@@ -11,15 +11,15 @@
 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 916151 svn://anonsvn.kde.org/home/kde/trunk/quality/krazy2 krazy2-2.8
+#  svn export -r 917270 svn://anonsvn.kde.org/home/kde/trunk/quality/krazy2 krazy2-2.8
 #  tar -c krazy2-2.8 | bzip2 --best -c > krazy2-2.8.tar.bz2
 Source0:        krazy2-%{version}.tar.bz2
-# TODO: Remove if/when 4.2 hits F9 and F10
-%if 0%{?fedora} > 10
 Source1:        krazy-licensecheck
-%endif
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+# krazy-licensecheck moved from kdesdk to here in 4.2.0
+Conflicts:      kdesdk < 4.2.0
+
 BuildRequires:  groff
 BuildRequires:  perl(ExtUtils::MakeMaker)
 BuildRequires:  perl(HTML::Parser)
@@ -150,6 +150,9 @@
 
 
 %changelog
+* Thu Jan 29 2009 Ben Boeckel <MathStuf at gmail.com> 2.8-6.20090127svn
+- Updated SVN
+
 * Sat Jan 24 2009 Ben Boeckel <MathStuf at gmail.com> 2.8-6.20090113svn916151
 - Added flag for building with kdevplatform
 - Removed patches applied upstream


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/krazy2/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	24 Jan 2009 18:36:18 -0000	1.6
+++ sources	29 Jan 2009 23:41:21 -0000	1.7
@@ -1 +1 @@
-242362beb2dc5c636d9810c592d115d1  krazy2-2.8.tar.bz2
+7dfdeb7b17b3995e0fe7a6f9e0c902e2  krazy2-2.8.tar.bz2



From mathstuf at fedoraproject.org  Thu Jan 29 23:45:29 2009
From: mathstuf at fedoraproject.org (Ben Boeckel)
Date: Thu, 29 Jan 2009 23:45:29 +0000 (UTC)
Subject: rpms/krazy2/devel krazy2.spec,1.10,1.11
Message-ID: <20090129234529.38E5A70116@cvs1.fedora.phx.redhat.com>

Author: mathstuf

Update of /cvs/pkgs/rpms/krazy2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4780

Modified Files:
	krazy2.spec 
Log Message:
Removed conditionals for F11+


Index: krazy2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/krazy2/devel/krazy2.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- krazy2.spec	29 Jan 2009 23:41:21 -0000	1.10
+++ krazy2.spec	29 Jan 2009 23:44:58 -0000	1.11
@@ -100,9 +100,7 @@
 pushd doc
 make DESTDIR=%{buildroot}%{_mandir} install
 popd
-%if 0%{?fedora} > 10
 install -m 644 %{SOURCE1} %{buildroot}%{_bindir}/krazy-licensecheck
-%endif
 %if 0%{?kdp}
 pushd cppchecks
 make DESTDIR=%{buildroot} PREFIX=%{_prefix} install
@@ -132,9 +130,7 @@
 %{_mandir}/man1/krazy2all.1.gz
 %{_mandir}/man1/krazy2ebn.1.gz
 %{_mandir}/man5/krazyrc.5.gz
-%if 0%{fedora} > 10
 %{_bindir}/krazy-licensecheck
-%endif
 %{_bindir}/krazy2
 %{_bindir}/krazy2all
 %{_bindir}/krazy2ebn



From transif at fedoraproject.org  Thu Jan 29 23:47:43 2009
From: transif at fedoraproject.org (Transifex System User)
Date: Thu, 29 Jan 2009 23:47:43 +0000 (UTC)
Subject: comps/po it.po,1.25,1.26
Message-ID: <20090129234743.0811470116@cvs1.fedora.phx.redhat.com>

Author: transif

Update of /cvs/pkgs/comps/po
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5121/po

Modified Files:
	it.po 
Log Message:
    2009-01-29  Daniele Monti <monska13 at gmail.com> (via
monska at fedoraproject.org)
    
      * po/it.po: New translation.
    



Index: it.po
===================================================================
RCS file: /cvs/pkgs/comps/po/it.po,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- it.po	9 Jan 2009 11:52:38 -0000	1.25
+++ it.po	29 Jan 2009 23:47:12 -0000	1.26
@@ -1,1439 +1,409 @@
-# 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.
+# translation of PACKAGE.
+# Copyright (C) 2009 THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# <>, 2009.
+# , fuzzy
+# <>, 2009.
+# 
+# 
 msgid ""
 msgstr ""
-"Project-Id-Version: comps.HEAD.it\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-22 15:50-0500\n"
-"PO-Revision-Date: 2008-12-07 12:35+0100\n"
-"Last-Translator: Francesco Tombolini <tombo at adamantio.net>\n"
+"Project-Id-Version: PACKAGE 1.0\n"
+"Report-Msgid-Bugs-To: tim at cyberelk.net\n"
+"POT-Creation-Date: 2009-01-29 13:24+0000\n"
+"PO-Revision-Date: 2009-01-30 00:45+0100\n"
+"Last-Translator: Daniele Monti <monska13 at gmail.com>\n"
 "Language-Team: Italian <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"
-"Plural-Forms:  nplurals=2; plural=(n != 1);\n"
-
-#: ../comps-f7.xml.in.h:1 ../comps-f8.xml.in.h:1 ../comps-f9.xml.in.h:1
-#: ../comps-f10.xml.in.h:1 ../comps-f11.xml.in.h:1
-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."
+"Content-Type: text/plain; charset=iso-8859-15\n"
+"Content-Transfer-Encoding: 8bit"
 
-#: ../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-f11.xml.in.h:2 ../comps-el4.xml.in.h:1
-#: ../comps-el5.xml.in.h:1
-msgid "Administration Tools"
-msgstr "Strumenti amministrativi"
-
-#: ../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-f11.xml.in.h:3
-msgid "Afrikaans Support"
-msgstr "Supporto Afrikaans"
-
-#: ../comps-f7.xml.in.h:4 ../comps-f8.xml.in.h:4 ../comps-f9.xml.in.h:4
-#: ../comps-f10.xml.in.h:4 ../comps-f11.xml.in.h:4
-msgid "Albanian Support"
-msgstr "Supporto per l'albanese"
-
-#: ../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-f11.xml.in.h:6 ../comps-el4.xml.in.h:2
-#: ../comps-el5.xml.in.h:2
-msgid "Applications"
-msgstr "Applicazioni"
-
-#: ../comps-f7.xml.in.h:6 ../comps-f8.xml.in.h:6 ../comps-f9.xml.in.h:6
-#: ../comps-f10.xml.in.h:6 ../comps-f11.xml.in.h:7
-msgid "Applications to perform a variety of tasks"
-msgstr "Applicazioni per eseguire diversi compiti"
-
-#: ../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-f11.xml.in.h:8 ../comps-el4.xml.in.h:4
-#: ../comps-el5.xml.in.h:4
-msgid "Arabic Support"
-msgstr "Supporto per l'arabo"
-
-#: ../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-f11.xml.in.h:9 ../comps-el4.xml.in.h:5
-#: ../comps-el5.xml.in.h:5
-msgid "Armenian Support"
-msgstr "Supporto per l'armeno"
-
-#: ../comps-f7.xml.in.h:9 ../comps-f8.xml.in.h:9 ../comps-f9.xml.in.h:9
-#: ../comps-f10.xml.in.h:9 ../comps-f11.xml.in.h:10
-msgid "Assamese Support"
-msgstr "Supporto per l'assamese"
-
-#: ../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-f11.xml.in.h:11 ../comps-el4.xml.in.h:6
-#: ../comps-el5.xml.in.h:6
-msgid "Authoring and Publishing"
-msgstr "Authoring e publishing"
-
-#: ../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-f11.xml.in.h:12
-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-f11.xml.in.h:13 ../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-f10.xml.in.h:13 ../comps-f11.xml.in.h:14
-msgid "Basic support for the Ruby programming language."
-msgstr "Supporto di base per il linguaggio di programmazione 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 ../comps-f11.xml.in.h:15
-msgid "Basque Support"
-msgstr "Supporto per il basco"
-
-#: ../comps-f7.xml.in.h:15 ../comps-f8.xml.in.h:15 ../comps-f9.xml.in.h:15
-#: ../comps-f10.xml.in.h:15 ../comps-f11.xml.in.h:16
-msgid "Belarusian Support"
-msgstr "Supporto per il bielorusso"
-
-#: ../comps-f7.xml.in.h:16 ../comps-f8.xml.in.h:16 ../comps-f9.xml.in.h:16
-#: ../comps-f10.xml.in.h:16 ../comps-f11.xml.in.h:17
-msgid "Bengali Support"
-msgstr "Supporto per il bengalese"
-
-#: ../comps-f7.xml.in.h:17 ../comps-f8.xml.in.h:17 ../comps-f9.xml.in.h:17
-#: ../comps-f10.xml.in.h:17 ../comps-f11.xml.in.h:18
-msgid "Bhutanese Support"
-msgstr "Supporto per il buthanese"
-
-#: ../comps-f7.xml.in.h:18 ../comps-f8.xml.in.h:18 ../comps-f9.xml.in.h:18
-#: ../comps-f10.xml.in.h:18 ../comps-f11.xml.in.h:19
-msgid "Bosnian Support"
-msgstr "Supporto per il bosniaco"
-
-#: ../comps-f7.xml.in.h:19 ../comps-f8.xml.in.h:19 ../comps-f9.xml.in.h:19
-#: ../comps-f10.xml.in.h:19 ../comps-f11.xml.in.h:20
-msgid "Brazilian Portuguese Support"
-msgstr "Supporto per il portoghese brasiliano"
-
-#: ../comps-f7.xml.in.h:20 ../comps-f8.xml.in.h:20 ../comps-f9.xml.in.h:20
-#: ../comps-f10.xml.in.h:20 ../comps-f11.xml.in.h:21
-msgid "Breton Support"
-msgstr "Supporto per il bretone"
-
-#: ../comps-f7.xml.in.h:21 ../comps-f8.xml.in.h:22 ../comps-f9.xml.in.h:22
-#: ../comps-f10.xml.in.h:22 ../comps-f11.xml.in.h:23
-msgid "Bulgarian Support"
-msgstr "Supporto per il bulgaro"
-
-#: ../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-f11.xml.in.h:24
-msgid "Catalan Support"
-msgstr "Supporto per il catalano"
-
-#: ../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-f11.xml.in.h:25
-msgid "Chinese Support"
-msgstr "Supporto per il cinese"
-
-#: ../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-f11.xml.in.h:26
-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:26 ../comps-f11.xml.in.h:27
-msgid "Clustering Support"
-msgstr "Supporto clustering "
-
-#: ../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-f11.xml.in.h:28
-msgid "Core"
-msgstr "Principale"
-
-#: ../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-f11.xml.in.h:29
-msgid "Croatian Support"
-msgstr "Supporto per il croato"
-
-#: ../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-f11.xml.in.h:30 ../comps-el5.xml.in.h:8
-msgid "Czech Support"
-msgstr "Supporto per il ceco"
-
-#: ../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-f11.xml.in.h:31
-msgid "DNS Name Server"
-msgstr "Server dei nomi 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-f11.xml.in.h:32
-msgid "Danish Support"
-msgstr "Supporto per il danese"
-
-#: ../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-f11.xml.in.h:33 ../comps-el4.xml.in.h:8
-#: ../comps-el5.xml.in.h:9
-msgid "Desktop Environments"
-msgstr "Ambienti desktop"
-
-#: ../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-f11.xml.in.h:34 ../comps-el4.xml.in.h:9
-#: ../comps-el5.xml.in.h:10
-msgid "Desktop environments"
-msgstr "Ambienti desktop"
-
-#: ../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-f11.xml.in.h:35 ../comps-el4.xml.in.h:10
-#: ../comps-el5.xml.in.h:11
-msgid "Development"
-msgstr "Sviluppo"
-
-#: ../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-f11.xml.in.h:36
-msgid "Development Libraries"
-msgstr "Librerie di sviluppo"
-
-#: ../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-f11.xml.in.h:37 ../comps-el4.xml.in.h:11
-#: ../comps-el5.xml.in.h:12
-msgid "Development Tools"
-msgstr "Strumenti di sviluppo"
-
-#: ../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-f11.xml.in.h:38
-msgid "Dial-up Networking Support"
-msgstr "Supporto del networking dial-up"
-
-#: ../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-f11.xml.in.h:39
-msgid "Dutch Support"
-msgstr "Supporto per l'olandese"
-
-#: ../comps-f7.xml.in.h:38
-msgid "Eclipse"
-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-f11.xml.in.h:40 ../comps-el4.xml.in.h:13
-#: ../comps-el5.xml.in.h:14
-msgid "Editors"
-msgstr "Editor"
-
-#: ../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-f11.xml.in.h:41 ../comps-el4.xml.in.h:14
-#: ../comps-el5.xml.in.h:15
-msgid "Educational Software"
-msgstr "Software educativo"
-
-#: ../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-f11.xml.in.h:42 ../comps-el4.xml.in.h:15
-#: ../comps-el5.xml.in.h:16
-msgid "Educational software for learning"
-msgstr "Software educativo per l'apprendimento"
-
-#: ../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-f11.xml.in.h:43 ../comps-el4.xml.in.h:16
-#: ../comps-el5.xml.in.h:17
-msgid "Engineering and Scientific"
-msgstr "Settori engineering e scientifico"
-
-#: ../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-f11.xml.in.h:44
-msgid "English (UK) Support"
-msgstr "Supporto per l'Inglese (UK)"
-
-#: ../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-f11.xml.in.h:46
-msgid "Estonian Support"
-msgstr "Supporto per l'estone"
-
-#: ../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-f11.xml.in.h:47
-msgid "Ethiopic Support"
-msgstr "Supporto per l'etiope"
-
-#: ../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-f11.xml.in.h:48 ../comps-el4.xml.in.h:17
-#: ../comps-el5.xml.in.h:18
-msgid "FTP Server"
-msgstr "Server 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-f11.xml.in.h:49
-msgid "Faeroese Support"
-msgstr "Supporto per il Faeroese"
-
-#: ../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-f11.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-f11.xml.in.h:52
-msgid "Filipino Support"
-msgstr "Supporto per il filippino"
-
-#: ../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-f11.xml.in.h:53
-msgid "Finnish Support"
-msgstr "Supporto per il finlandese"
-
-#: ../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-f11.xml.in.h:57
-msgid "French Support"
-msgstr "Supporto per il francese"
-
-#: ../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-f11.xml.in.h:60 ../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."
-msgstr ""
-"Con un'ampia gamma di funzionalit?? che vanno dalla registrazione di CD alla "
-"riproduzione di CD audio e dei files multimedia, questo gruppo di pacchetti "
-"consente di utilizzare al meglio le funzioni audio e video del sistema."
-
-#: ../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-f11.xml.in.h:61 ../comps-el4.xml.in.h:20
-#: ../comps-el5.xml.in.h:21
-msgid "GNOME Desktop Environment"
-msgstr "Ambiente desktop di 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-f11.xml.in.h:62 ../comps-el4.xml.in.h:21
-#: ../comps-el5.xml.in.h:22
-msgid "GNOME Software Development"
-msgstr "Sviluppo del software di GNOME"
+#: ../expendable.desktop.in.h:1
+msgid "Expendable"
+msgstr "Spendibili"
 
-#: ../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-f11.xml.in.h:63
-msgid ""
-"GNOME is a powerful graphical user interface which includes a panel, "
-"desktop, system icons, and a graphical file manager."
-msgstr ""
-"GNOME ?? una potente interfaccia utente grafica che include un pannello, un "
-"desktop, icone del sistema e un file manager grafico."
+#: ../expendable.desktop.in.h:2
+msgid "Home Finances Modeling"
+msgstr "Modello di finanza casalingo"
 
-#: ../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-f11.xml.in.h:64
-msgid "Gaelic Support"
-msgstr "Supporto per il gaelico "
-
-#: ../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-f11.xml.in.h:65
-msgid "Galician Support"
-msgstr "Supporto per il Galiziano"
-
-#: ../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-f11.xml.in.h:66 ../comps-el5.xml.in.h:24
-msgid "Games and Entertainment"
-msgstr "Giochi e divertimento"
-
-#: ../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-f11.xml.in.h:67
-msgid "Georgian Support"
-msgstr "Supporto per il 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 ../comps-f11.xml.in.h:68
-msgid "German Support"
-msgstr "Supporto per il tedesco"
-
-#: ../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-f11.xml.in.h:69 ../comps-el4.xml.in.h:23
-#: ../comps-el5.xml.in.h:25
-msgid "Graphical Internet"
-msgstr "Internet grafico"
-
-#: ../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-f11.xml.in.h:70 ../comps-el4.xml.in.h:24
-#: ../comps-el5.xml.in.h:26
-msgid "Graphics"
-msgstr "Grafica"
-
-#: ../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-f11.xml.in.h:71
-msgid "Greek Support"
-msgstr "Supporto per il greco"
-
-#: ../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-f11.xml.in.h:72
-msgid "Gujarati Support"
-msgstr "Supporto per il Gujarati"
-
-#: ../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-f11.xml.in.h:73 ../comps-el4.xml.in.h:25
-#: ../comps-el5.xml.in.h:27
-msgid "Hardware Support"
-msgstr "Supporto Hardware"
-
-#: ../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-f11.xml.in.h:75 ../comps-el4.xml.in.h:26
-#: ../comps-el5.xml.in.h:28
-msgid "Hebrew Support"
-msgstr "Supporto per l'ebraico"
-
-#: ../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-f11.xml.in.h:76
-msgid "Hindi Support"
-msgstr "Supporto per 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:73 ../comps-f11.xml.in.h:77
-msgid "Hungarian Support"
-msgstr "Supporto per l'ungherese"
-
-#: ../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-f11.xml.in.h:78
-msgid "Icelandic Support"
-msgstr "Supporto per l'islandese"
-
-#: ../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-f11.xml.in.h:79
-msgid "Indonesian Support"
-msgstr "Supporto per l'indonesiano"
-
-#: ../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-f11.xml.in.h:82 ../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 ""
-"Installare questi pacchetti per sviluppare le applicazioni grafiche GTK+ e "
-"GNOME."
+#: ../main.py:78
+msgid "Name"
+msgstr "Nome"
 
-#: ../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-f11.xml.in.h:83
-msgid ""
-"Install these packages in order to develop GTK+ and XFCE graphical "
-"applications."
-msgstr ""
-"Installare questi pacchetti per sviluppare le applicazioni grafiche GTK+ ed "
-"XFCE."
+#: ../main.py:83
+msgid "Type"
+msgstr "Tipo"
 
-#: ../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-f11.xml.in.h:84 ../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."
+#: ../main.py:133
+msgid "Account Type"
+msgstr "Tipo di conto"
 
-#: ../comps-f7.xml.in.h:74 ../comps-f8.xml.in.h:77 ../comps-f9.xml.in.h:78
-#: ../comps-f10.xml.in.h:81 ../comps-f11.xml.in.h:85
-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."
+#: ../main.py:188 ../main.py:928
+msgid "Untitled"
+msgstr "Senza titolo"
 
-#: ../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-f11.xml.in.h:86 ../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 ""
-"Installare questo gruppo di pacchetti per usare l'interfaccia utente grafica "
-"(X) di base."
+#: ../main.py:190
+#, python-format
+msgid "%s%s - expendable"
+msgstr "%s%s - spendibili"
 
-#: ../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-f11.xml.in.h:88
-msgid "Inuktitut Support"
-msgstr "Supporto per lo inuit"
-
-#: ../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-f11.xml.in.h:89
-msgid "Irish Support"
-msgstr "Supporto per l'irlandese"
-
-#: ../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-f11.xml.in.h:90
-msgid "Italian Support"
-msgstr "Supporto per l'italiano"
-
-#: ../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-f11.xml.in.h:91 ../comps-el4.xml.in.h:30
-#: ../comps-el5.xml.in.h:32
-msgid "Japanese Support"
-msgstr "Supporto per il giapponese"
-
-#: ../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-f11.xml.in.h:92 ../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-f11.xml.in.h:93 ../comps-el4.xml.in.h:32
-msgid "Java Development"
-msgstr "Sviluppo 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-f11.xml.in.h:94 ../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:91 ../comps-f11.xml.in.h:95 ../comps-el4.xml.in.h:34
-#: ../comps-el5.xml.in.h:34
-msgid "KDE Software Development"
-msgstr "Sviluppo software KDE"
+#: ../main.py:192
+msgid "(read-only)"
+msgstr "(sola-lettura)"
 
-#: ../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-f11.xml.in.h:96
-msgid ""
-"KDE is a powerful graphical user interface which includes a panel, desktop, "
-"system icons, and a graphical file manager."
-msgstr ""
-"KDE ?? una potente interfaccia utente grafica che include un pannello, un "
-"desktop, icone del sistema e un file manager grafico."
+#: ../main.py:268
+msgid "Choose File"
+msgstr "Scegli un file"
 
-#: ../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-f11.xml.in.h:97
-msgid "Kannada Support"
-msgstr "Supporto per il canadese"
-
-#: ../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-f11.xml.in.h:100
-msgid "Khmer Support"
-msgstr "Supporto per il kmero"
-
-#: ../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-f11.xml.in.h:103
-msgid "Korean Support"
-msgstr "Supporto per il coreano"
-
-#: ../comps-f7.xml.in.h:88 ../comps-f8.xml.in.h:92 ../comps-f9.xml.in.h:95
-#: ../comps-f10.xml.in.h:101 ../comps-f11.xml.in.h:106
-msgid "Languages"
-msgstr "Linguaggi"
-
-#: ../comps-f7.xml.in.h:89 ../comps-f8.xml.in.h:93 ../comps-f9.xml.in.h:96
-#: ../comps-f10.xml.in.h:102 ../comps-f11.xml.in.h:107
-msgid "Lao Support"
-msgstr "Supporto per il lao"
-
-#: ../comps-f7.xml.in.h:90 ../comps-f8.xml.in.h:94 ../comps-f9.xml.in.h:97
-#: ../comps-f10.xml.in.h:103 ../comps-f11.xml.in.h:108
-msgid "Latvian Support"
-msgstr "Supporto per il lettone"
-
-#: ../comps-f7.xml.in.h:91 ../comps-f8.xml.in.h:96 ../comps-f9.xml.in.h:99
-#: ../comps-f10.xml.in.h:105 ../comps-f11.xml.in.h:110
-msgid "Legacy Network Server"
-msgstr "Server di rete antiquati"
-
-#: ../comps-f7.xml.in.h:92 ../comps-f8.xml.in.h:97 ../comps-f9.xml.in.h:100
-#: ../comps-f10.xml.in.h:106 ../comps-f11.xml.in.h:111
-msgid "Legacy Software Development"
-msgstr "Sviluppo del software antiquato"
-
-#: ../comps-f7.xml.in.h:93 ../comps-f8.xml.in.h:98 ../comps-f9.xml.in.h:101
-#: ../comps-f10.xml.in.h:107 ../comps-f11.xml.in.h:112
-msgid "Legacy Software Support"
-msgstr "Sviluppo del software antiquato"
-
-#: ../comps-f7.xml.in.h:94 ../comps-f8.xml.in.h:99 ../comps-f9.xml.in.h:102
-#: ../comps-f10.xml.in.h:108 ../comps-f11.xml.in.h:113
-msgid "Lithuanian Support"
-msgstr "Supporto per il lituano"
-
-#: ../comps-f7.xml.in.h:95 ../comps-f8.xml.in.h:101 ../comps-f9.xml.in.h:105
-#: ../comps-f10.xml.in.h:111 ../comps-f11.xml.in.h:116
-#: ../comps-el4.xml.in.h:36 ../comps-el5.xml.in.h:36
-msgid "Mail Server"
-msgstr "Server Mail"
-
-#: ../comps-f7.xml.in.h:96 ../comps-f8.xml.in.h:102 ../comps-f9.xml.in.h:106
-#: ../comps-f10.xml.in.h:113 ../comps-f11.xml.in.h:119
-msgid "Malay Support"
-msgstr "Supporto per il malese"
-
-#: ../comps-f7.xml.in.h:97 ../comps-f8.xml.in.h:103 ../comps-f9.xml.in.h:107
-#: ../comps-f10.xml.in.h:114 ../comps-f11.xml.in.h:120
-msgid "Malayalam Support"
-msgstr "Supporto per il malayalam"
-
-#: ../comps-f7.xml.in.h:98 ../comps-f8.xml.in.h:104 ../comps-f9.xml.in.h:108
-#: ../comps-f10.xml.in.h:115 ../comps-f11.xml.in.h:121
-msgid "Maori Support"
-msgstr "Supporto per il maori"
-
-#: ../comps-f7.xml.in.h:99 ../comps-f8.xml.in.h:105 ../comps-f9.xml.in.h:109
-#: ../comps-f10.xml.in.h:116 ../comps-f11.xml.in.h:122
-msgid "Marathi Support"
-msgstr "Supporto per il marathi"
-
-#: ../comps-f7.xml.in.h:100 ../comps-f8.xml.in.h:107 ../comps-f9.xml.in.h:111
-#: ../comps-f10.xml.in.h:118 ../comps-f11.xml.in.h:124
-msgid "MySQL Database"
-msgstr "Database MySQL"
-
-#: ../comps-f7.xml.in.h:101 ../comps-f8.xml.in.h:109 ../comps-f9.xml.in.h:113
-#: ../comps-f10.xml.in.h:121 ../comps-f11.xml.in.h:127
-#: ../comps-el4.xml.in.h:37 ../comps-el5.xml.in.h:37
-msgid "Network Servers"
-msgstr "Server di rete"
-
-#: ../comps-f7.xml.in.h:102 ../comps-f8.xml.in.h:110 ../comps-f9.xml.in.h:114
-#: ../comps-f10.xml.in.h:122 ../comps-f11.xml.in.h:128
-#: ../comps-el4.xml.in.h:38 ../comps-el5.xml.in.h:38
-msgid "News Server"
-msgstr "Server news"
-
-#: ../comps-f7.xml.in.h:103 ../comps-f8.xml.in.h:111 ../comps-f9.xml.in.h:116
-#: ../comps-f10.xml.in.h:124 ../comps-f11.xml.in.h:130
-msgid "Northern Sotho Support"
-msgstr "Supporto per il sotho del nord"
-
-#: ../comps-f7.xml.in.h:104 ../comps-f8.xml.in.h:112 ../comps-f9.xml.in.h:117
-#: ../comps-f10.xml.in.h:125 ../comps-f11.xml.in.h:131
-msgid "Norwegian Support"
-msgstr "Supporto per il norvegese"
-
-#: ../comps-f7.xml.in.h:105 ../comps-f8.xml.in.h:113 ../comps-f9.xml.in.h:118
-#: ../comps-f10.xml.in.h:126 ../comps-f11.xml.in.h:133
-#: ../comps-el4.xml.in.h:39 ../comps-el5.xml.in.h:39
-msgid "Office/Productivity"
-msgstr "Ufficio/Produttivit??"
-
-#: ../comps-f7.xml.in.h:106 ../comps-f8.xml.in.h:115 ../comps-f9.xml.in.h:120
-#: ../comps-f10.xml.in.h:128 ../comps-f11.xml.in.h:135
-msgid "Oriya Support"
-msgstr "Supporto per l'oriya"
-
-#: ../comps-f7.xml.in.h:107 ../comps-f8.xml.in.h:116 ../comps-f9.xml.in.h:121
-#: ../comps-f10.xml.in.h:129 ../comps-f11.xml.in.h:136
-#: ../comps-el4.xml.in.h:40 ../comps-el5.xml.in.h:40
-msgid ""
-"Packages which provide functionality for developing and building "
-"applications."
-msgstr ""
-"Pacchetti che forniscono funzionalit?? per sviluppare e compilare "
-"applicazioni."
+#: ../main.py:310
+msgid "Save Failed"
+msgstr "Salvataggio fallito"
 
-#: ../comps-f7.xml.in.h:108 ../comps-f8.xml.in.h:117 ../comps-f9.xml.in.h:122
-#: ../comps-f10.xml.in.h:130 ../comps-f11.xml.in.h:137
-msgid "Persian Support"
-msgstr "Supporto per il persiano"
-
-#: ../comps-f7.xml.in.h:109 ../comps-f8.xml.in.h:118 ../comps-f9.xml.in.h:123
-#: ../comps-f10.xml.in.h:131 ../comps-f11.xml.in.h:138
-msgid "Polish Support"
-msgstr "Supporto per il polacco"
-
-#: ../comps-f7.xml.in.h:110 ../comps-f8.xml.in.h:119 ../comps-f9.xml.in.h:124
-#: ../comps-f10.xml.in.h:132 ../comps-f11.xml.in.h:139
-msgid "Portuguese Support"
-msgstr "Supporto per il portoghese"
-
-#: ../comps-f7.xml.in.h:111 ../comps-f8.xml.in.h:120 ../comps-f9.xml.in.h:125
-#: ../comps-f10.xml.in.h:133 ../comps-f11.xml.in.h:140
-msgid "PostgreSQL Database"
-msgstr "Database PostgreSQL"
-
-#: ../comps-f7.xml.in.h:112 ../comps-f8.xml.in.h:121 ../comps-f9.xml.in.h:126
-#: ../comps-f10.xml.in.h:134 ../comps-f11.xml.in.h:141
-msgid "Printing Support"
-msgstr "Supporto per la stampa"
-
-#: ../comps-f7.xml.in.h:113 ../comps-f8.xml.in.h:122 ../comps-f9.xml.in.h:127
-#: ../comps-f10.xml.in.h:135 ../comps-f11.xml.in.h:142
-msgid "Punjabi Support"
-msgstr "Supporto per il punjabi"
-
-#: ../comps-f7.xml.in.h:114 ../comps-f8.xml.in.h:123 ../comps-f9.xml.in.h:128
-#: ../comps-f10.xml.in.h:136 ../comps-f11.xml.in.h:143
-msgid "Romanian Support"
-msgstr "Supporto per il rumeno"
-
-#: ../comps-f7.xml.in.h:115 ../comps-f8.xml.in.h:124 ../comps-f9.xml.in.h:129
-#: ../comps-f10.xml.in.h:137 ../comps-f11.xml.in.h:144
-msgid "Ruby"
-msgstr "Ruby"
-
-#: ../comps-f7.xml.in.h:116 ../comps-f8.xml.in.h:125 ../comps-f9.xml.in.h:130
-#: ../comps-f10.xml.in.h:138 ../comps-f11.xml.in.h:145
-msgid "Russian Support"
-msgstr "Supporto per il russo"
-
-#: ../comps-f7.xml.in.h:117 ../comps-f8.xml.in.h:126 ../comps-f9.xml.in.h:133
-#: ../comps-f10.xml.in.h:141 ../comps-f11.xml.in.h:148
-msgid "Samoan Support"
-msgstr "Supporto per il samoa"
-
-#: ../comps-f7.xml.in.h:118 ../comps-f8.xml.in.h:127 ../comps-f9.xml.in.h:134
-#: ../comps-f10.xml.in.h:142 ../comps-f11.xml.in.h:149
-msgid "Serbian Support"
-msgstr "Supporto per il serbo"
-
-#: ../comps-f7.xml.in.h:119 ../comps-f8.xml.in.h:128 ../comps-f9.xml.in.h:135
-#: ../comps-f10.xml.in.h:143 ../comps-f11.xml.in.h:150
-msgid "Server Configuration Tools"
-msgstr "Strumenti di configurazione del server"
-
-#: ../comps-f7.xml.in.h:120 ../comps-f8.xml.in.h:129 ../comps-f9.xml.in.h:136
-#: ../comps-f10.xml.in.h:144 ../comps-f11.xml.in.h:151
-#: ../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:137
-#: ../comps-f10.xml.in.h:145 ../comps-f11.xml.in.h:152
-#: ../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."
+#: ../main.py:311
+msgid "Failed to save file."
+msgstr "Fallito il salvataggio del file"
 
-#: ../comps-f7.xml.in.h:122 ../comps-f8.xml.in.h:131 ../comps-f9.xml.in.h:138
-#: ../comps-f10.xml.in.h:147 ../comps-f11.xml.in.h:154
-msgid "Sinhala Support"
-msgstr "Supporto per lo sinhala"
-
-#: ../comps-f7.xml.in.h:123 ../comps-f8.xml.in.h:132 ../comps-f9.xml.in.h:139
-#: ../comps-f10.xml.in.h:148 ../comps-f11.xml.in.h:155
-msgid "Slovak Support"
-msgstr "Supporto per lo slovacco"
-
-#: ../comps-f7.xml.in.h:124 ../comps-f8.xml.in.h:133 ../comps-f9.xml.in.h:140
-#: ../comps-f10.xml.in.h:149 ../comps-f11.xml.in.h:156
-msgid "Slovenian Support"
-msgstr "Supporto per lo sloveno"
-
-#: ../comps-f7.xml.in.h:125 ../comps-f8.xml.in.h:134 ../comps-f9.xml.in.h:141
-#: ../comps-f10.xml.in.h:150 ../comps-f11.xml.in.h:157
-msgid "Smallest possible installation"
-msgstr "Installazione minima"
-
-#: ../comps-f7.xml.in.h:126 ../comps-f8.xml.in.h:135 ../comps-f9.xml.in.h:142
-#: ../comps-f10.xml.in.h:151 ../comps-f11.xml.in.h:158
-#: ../comps-el4.xml.in.h:43 ../comps-el5.xml.in.h:43
-msgid "Software used for running network servers"
-msgstr "Software usato per eseguire server di rete"
-
-#: ../comps-f7.xml.in.h:127 ../comps-f8.xml.in.h:136 ../comps-f9.xml.in.h:143
-#: ../comps-f10.xml.in.h:152 ../comps-f11.xml.in.h:159
-msgid "Somali Support"
-msgstr "Supporto per lo somalo"
+#: ../main.py:312 ../main.py:445 ../main.py:447
+msgid "The error was:"
+msgstr "Errori riscontrati"
 
-#: ../comps-f7.xml.in.h:128 ../comps-f8.xml.in.h:137 ../comps-f9.xml.in.h:144
-#: ../comps-f10.xml.in.h:153 ../comps-f11.xml.in.h:160
-msgid ""
-"Sometimes called text editors, these are programs that allow you to create "
-"and edit text files. This includes Emacs and Vi."
-msgstr ""
-"Talvolta definiti editor di testo, questi sono programmi che consentono di "
-"creare e modificare file di testo. Sono inclusi Emacs e Vi."
+#: ../main.py:318
+msgid "Choose Filename"
+msgstr "Scegli il nome del file"
 
-#: ../comps-f7.xml.in.h:129 ../comps-f8.xml.in.h:138 ../comps-f9.xml.in.h:145
-#: ../comps-f10.xml.in.h:154 ../comps-f11.xml.in.h:161
-#: ../comps-el4.xml.in.h:45 ../comps-el5.xml.in.h:45
-msgid "Sound and Video"
-msgstr "Audio e video"
-
-#: ../comps-f7.xml.in.h:130 ../comps-f8.xml.in.h:139 ../comps-f9.xml.in.h:146
-#: ../comps-f10.xml.in.h:155 ../comps-f11.xml.in.h:162
-msgid "Southern Ndebele Support"
-msgstr "Supporto per il Ndebele del sud"
-
-#: ../comps-f7.xml.in.h:131 ../comps-f8.xml.in.h:140 ../comps-f9.xml.in.h:147
-#: ../comps-f10.xml.in.h:156 ../comps-f11.xml.in.h:163
-msgid "Southern Sotho Support"
-msgstr "Supporto per il sotho del sud"
-
-#: ../comps-f7.xml.in.h:132 ../comps-f8.xml.in.h:141 ../comps-f9.xml.in.h:148
-#: ../comps-f10.xml.in.h:157 ../comps-f11.xml.in.h:164
-msgid "Spanish Support"
-msgstr "Supporto per lo spagnolo"
-
-#: ../comps-f7.xml.in.h:133 ../comps-f8.xml.in.h:142 ../comps-f9.xml.in.h:149
-#: ../comps-f10.xml.in.h:159 ../comps-f11.xml.in.h:166
-#: ../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."
+#: ../main.py:401
+msgid "New Account"
+msgstr "Nuovo Conto"
 
-#: ../comps-f7.xml.in.h:134 ../comps-f8.xml.in.h:143 ../comps-f9.xml.in.h:150
-#: ../comps-f10.xml.in.h:160 ../comps-f11.xml.in.h:167
-#: ../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."
+#: ../main.py:443
+msgid "The file is locked by another application."
+msgstr "Il file ? gi? in uso da un'altra applicazione."
 
-#: ../comps-f7.xml.in.h:135 ../comps-f8.xml.in.h:144 ../comps-f9.xml.in.h:151
-#: ../comps-f10.xml.in.h:161 ../comps-f11.xml.in.h:168
-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:152
-#: ../comps-f10.xml.in.h:162 ../comps-f11.xml.in.h:169
-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:153
-#: ../comps-f10.xml.in.h:163 ../comps-f11.xml.in.h:170
-#: ../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:154
-#: ../comps-f10.xml.in.h:164 ../comps-f11.xml.in.h:171
-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:155
-#: ../comps-f10.xml.in.h:166 ../comps-f11.xml.in.h:173
-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:156
-#: ../comps-f10.xml.in.h:167 ../comps-f11.xml.in.h:174
-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:157
-#: ../comps-f10.xml.in.h:168 ../comps-f11.xml.in.h:175
-#: ../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:158
-#: ../comps-f10.xml.in.h:169 ../comps-f11.xml.in.h:176
-msgid "Thai Support"
-msgstr "Supporto per il thai"
-
-#: ../comps-f7.xml.in.h:143
-msgid "The Eclipse Integrated Development Environment."
-msgstr "L'ambiente di sviluppo integrato Eclipse"
-
-#: ../comps-f7.xml.in.h:144 ../comps-f8.xml.in.h:152 ../comps-f9.xml.in.h:159
-#: ../comps-f10.xml.in.h:170 ../comps-f11.xml.in.h:177
-#: ../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."
+#: ../main.py:455
+msgid "Open Failed"
+msgstr "Apertura fallita"
 
-#: ../comps-f7.xml.in.h:145 ../comps-f8.xml.in.h:153 ../comps-f9.xml.in.h:160
-#: ../comps-f10.xml.in.h:171 ../comps-f11.xml.in.h:178
-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."
+#: ../main.py:456
+#, python-format
+msgid "Failed to open file '%s'."
+msgstr "Fallita l'apertura del file '%s'."
 
-#: ../comps-f7.xml.in.h:146 ../comps-f8.xml.in.h:154 ../comps-f9.xml.in.h:161
-#: ../comps-f10.xml.in.h:172 ../comps-f11.xml.in.h:179
-#: ../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."
+#: ../main.py:550
+msgid "Plot"
+msgstr "Grafico"
 
-#: ../comps-f7.xml.in.h:147 ../comps-f8.xml.in.h:155 ../comps-f9.xml.in.h:162
-#: ../comps-f10.xml.in.h:173 ../comps-f11.xml.in.h:180
-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."
+#: ../main.py:558
+msgid "Account name:"
+msgstr "Nome conto:"
 
-#: ../comps-f7.xml.in.h:148 ../comps-f8.xml.in.h:156 ../comps-f9.xml.in.h:163
-#: ../comps-f10.xml.in.h:174 ../comps-f11.xml.in.h:181
-#: ../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."
+#: ../main.py:582
+msgid "Linked account:"
+msgstr "Conti collegati:"
 
-#: ../comps-f7.xml.in.h:149 ../comps-f8.xml.in.h:157 ../comps-f9.xml.in.h:164
-#: ../comps-f10.xml.in.h:175 ../comps-f11.xml.in.h:182
-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."
+#: ../main.py:605
+msgid "Start:"
+msgstr "Avvio:"
 
-#: ../comps-f7.xml.in.h:150 ../comps-f8.xml.in.h:158 ../comps-f9.xml.in.h:165
-#: ../comps-f10.xml.in.h:176 ../comps-f11.xml.in.h:183
-msgid ""
-"These packages include servers for old network protocols such as rsh and "
-"telnet."
-msgstr ""
-"Questi pacchetti includono server per vecchi protocolli di rete tipo rsh e "
-"telnet."
+#: ../main.py:621 ../window.glade.h:11 ../accounts/ftd.glade.h:9
+#: ../accounts/gain.glade.h:4 ../accounts/mortgage.glade.h:12
+#: ../accounts/payment.glade.h:3 ../accounts/regsave.glade.h:12
+#: ../accounts/spend.glade.h:4 ../accounts/stooze.glade.h:12
+msgid "mths"
+msgstr "mesi"
 
-#: ../comps-f7.xml.in.h:151 ../comps-f8.xml.in.h:159 ../comps-f9.xml.in.h:166
-#: ../comps-f10.xml.in.h:177 ../comps-f11.xml.in.h:184
-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:167
-#: ../comps-f10.xml.in.h:178 ../comps-f11.xml.in.h:185
-msgid "These packages provide compatibility with previous releases."
-msgstr ""
-"Questi pacchetti forniscono la compatibilit?? con le versioni precedenti."
+#: ../main.py:626
+msgid "early"
+msgstr "presto"
 
-#: ../comps-f7.xml.in.h:153 ../comps-f8.xml.in.h:161 ../comps-f9.xml.in.h:168
-#: ../comps-f10.xml.in.h:179 ../comps-f11.xml.in.h:186
-msgid ""
-"These packages provide support for various locales including fonts and input "
-"methods."
-msgstr ""
-"Questi pacchetti forniscono supporto per le varie localizzazioni inclusi i "
-"caratteri ed i metodi di input."
+#: ../main.py:627
+msgid "late"
+msgstr "tardi"
 
-#: ../comps-f7.xml.in.h:154 ../comps-f8.xml.in.h:162 ../comps-f9.xml.in.h:169
-#: ../comps-f10.xml.in.h:180 ../comps-f11.xml.in.h:187
-msgid ""
-"These tools allow you to create documents in the DocBook format and convert "
-"them into HTML, PDF, Postscript, and text."
-msgstr ""
-"Questi tool vi consentono di creare documenti in formato DocBook e di "
-"convertirli in HTML, PDF, Postscript e testo."
+#: ../main.py:922
+msgid "Discard changes"
+msgstr "Perdi i cambiamenti"
 
-#: ../comps-f7.xml.in.h:155 ../comps-f8.xml.in.h:163 ../comps-f9.xml.in.h:170
-#: ../comps-f10.xml.in.h:181 ../comps-f11.xml.in.h:188
-#: ../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:171
-#: ../comps-f10.xml.in.h:182 ../comps-f11.xml.in.h:189
-#: ../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:172
-#: ../comps-f10.xml.in.h:183 ../comps-f11.xml.in.h:190
-#: ../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 ""
-"Questi strumenti includono i principali strumenti di sviluppo come automake, "
-"gcc, perl, python, ed i debugger."
+#: ../main.py:930
+#, python-format
+msgid "Save changes to %s?"
+msgstr "Salvare i cambiamenti a '%s'?"
 
-#: ../comps-f7.xml.in.h:158 ../comps-f8.xml.in.h:166 ../comps-f9.xml.in.h:173
-#: ../comps-f10.xml.in.h:184 ../comps-f11.xml.in.h:191
-#: ../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:174
-#: ../comps-f10.xml.in.h:185 ../comps-f11.xml.in.h:192
-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."
+#: ../window.glade.h:1
+msgid "Limit:"
+msgstr "Limite:"
 
-#: ../comps-f7.xml.in.h:160 ../comps-f8.xml.in.h:168 ../comps-f9.xml.in.h:175
-#: ../comps-f10.xml.in.h:186 ../comps-f11.xml.in.h:193
-msgid ""
-"This group includes a minimal set of packages. Useful for creating small "
-"router/firewall boxes, for example."
-msgstr ""
-"Questo gruppo include un insieme minimo di pacchetti, utili per la creazione "
-"di piccoli router/firewall, per esempio."
+#: ../window.glade.h:2
+msgid "Net effect of interest:"
+msgstr "Effetto netto di interesse:"
 
-#: ../comps-f7.xml.in.h:161 ../comps-f8.xml.in.h:169 ../comps-f9.xml.in.h:176
-#: ../comps-f10.xml.in.h:187 ../comps-f11.xml.in.h:194
-#: ../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:177
-#: ../comps-f10.xml.in.h:188 ../comps-f11.xml.in.h:195
-#: ../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 ""
-"Questo gruppo include i pacchetti per l'esecuzione e il plotting di funzioni "
-"matematiche e scientifiche, nonch?? la conversione di unit??."
+#: ../window.glade.h:3
+msgid "Overview"
+msgstr "Panoramica"
 
-#: ../comps-f7.xml.in.h:163 ../comps-f8.xml.in.h:171 ../comps-f9.xml.in.h:178
-#: ../comps-f10.xml.in.h:189 ../comps-f11.xml.in.h:196
-#: ../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."
+#: ../window.glade.h:4
+msgid "Run model"
+msgstr "Avvia modello"
 
-#: ../comps-f7.xml.in.h:164 ../comps-f8.xml.in.h:172 ../comps-f9.xml.in.h:179
-#: ../comps-f10.xml.in.h:190 ../comps-f11.xml.in.h:197
-#: ../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 ""
-"Questo gruppo include client basati su testo e-mail, Web e chat. Tali "
-"applicazioni non richiedono il sistema X Window."
+#: ../window.glade.h:5
+msgid "Total interest earned:"
+msgstr "Totale interesse guadagnato:"
 
-#: ../comps-f7.xml.in.h:165 ../comps-f8.xml.in.h:173 ../comps-f9.xml.in.h:180
-#: ../comps-f10.xml.in.h:191 ../comps-f11.xml.in.h:198
-#: ../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 ""
-"Questo gruppo ?? una raccolta di strumenti grafici di amministrazione del "
-"sistema, che consente di gestire gli account utente e di configurare "
-"l'hardware di sistema."
-
-#: ../comps-f7.xml.in.h:166 ../comps-f8.xml.in.h:174 ../comps-f9.xml.in.h:181
-#: ../comps-f10.xml.in.h:192 ../comps-f11.xml.in.h:199
-#: ../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."
+#: ../window.glade.h:6
+msgid "Total interest paid:"
+msgstr "Totale interessi pagati:"
 
-#: ../comps-f7.xml.in.h:167 ../comps-f8.xml.in.h:175 ../comps-f9.xml.in.h:182
-#: ../comps-f10.xml.in.h:193 ../comps-f11.xml.in.h:200
-#: ../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."
+#: ../window.glade.h:7
+msgid "_Add Account"
+msgstr "_Aggiungi Conto"
 
-#: ../comps-f7.xml.in.h:168 ../comps-f8.xml.in.h:176 ../comps-f9.xml.in.h:183
-#: ../comps-f10.xml.in.h:194 ../comps-f11.xml.in.h:202
-#: ../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 ""
-"Questo gruppo ?? una raccolta di vari strumenti per il sistema, che comprende "
-"il client per la connessione alle condivisioni SMB e gli strumenti per "
-"monitorare il traffico di rete."
+#: ../window.glade.h:8
+msgid "_Delete Account"
+msgstr "_Cancella Conto"
 
-#: ../comps-f7.xml.in.h:169 ../comps-f8.xml.in.h:177 ../comps-f9.xml.in.h:184
-#: ../comps-f10.xml.in.h:195 ../comps-f11.xml.in.h:203
-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."
+#: ../window.glade.h:9
+msgid "_Edit"
+msgstr "_Modifica"
 
-#: ../comps-f7.xml.in.h:170 ../comps-f8.xml.in.h:178 ../comps-f9.xml.in.h:185
-#: ../comps-f10.xml.in.h:196 ../comps-f11.xml.in.h:204
-msgid ""
-"This package group allows you to share files between Linux and MS Windows"
-"(tm) systems."
-msgstr ""
-"Questo gruppo di pacchetti consente di condividere i file tra sistemi Linux "
-"e MS Windows(tm)."
+#: ../window.glade.h:10
+msgid "_File"
+msgstr "_File"
 
-#: ../comps-f7.xml.in.h:171 ../comps-f8.xml.in.h:179 ../comps-f9.xml.in.h:186
-#: ../comps-f10.xml.in.h:197 ../comps-f11.xml.in.h:205
-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:187
-#: ../comps-f10.xml.in.h:198 ../comps-f11.xml.in.h:206
-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:188
-#: ../comps-f10.xml.in.h:199 ../comps-f11.xml.in.h:207
-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:189
-#: ../comps-f10.xml.in.h:200 ../comps-f11.xml.in.h:208
-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:190
-#: ../comps-f10.xml.in.h:201 ../comps-f11.xml.in.h:209
-#: ../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:191
-#: ../comps-f10.xml.in.h:202 ../comps-f11.xml.in.h:210
-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:192
-#: ../comps-f10.xml.in.h:203 ../comps-f11.xml.in.h:211
-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:193
-#: ../comps-f10.xml.in.h:204 ../comps-f11.xml.in.h:212
-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:194
-#: ../comps-f10.xml.in.h:205 ../comps-f11.xml.in.h:214
-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:195
-#: ../comps-f10.xml.in.h:206 ../comps-f11.xml.in.h:216
-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:196
-#: ../comps-f10.xml.in.h:208 ../comps-f11.xml.in.h:218
-#: ../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:197
-#: ../comps-f10.xml.in.h:209 ../comps-f11.xml.in.h:219
-#: ../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:198
-#: ../comps-f10.xml.in.h:210 ../comps-f11.xml.in.h:220
-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:199
-#: ../comps-f10.xml.in.h:211 ../comps-f11.xml.in.h:221
-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:200
-#: ../comps-f10.xml.in.h:212 ../comps-f11.xml.in.h:222
-msgid "Virtualization"
-msgstr "Virtualizzazione"
-
-#: ../comps-f7.xml.in.h:186 ../comps-f8.xml.in.h:194 ../comps-f9.xml.in.h:202
-#: ../comps-f10.xml.in.h:214 ../comps-f11.xml.in.h:224
-#: ../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:203
-#: ../comps-f10.xml.in.h:215 ../comps-f11.xml.in.h:225
-#: ../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:204
-#: ../comps-f10.xml.in.h:216 ../comps-f11.xml.in.h:226
-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:205
-#: ../comps-f10.xml.in.h:217 ../comps-f11.xml.in.h:227
-#: ../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:206
-#: ../comps-f10.xml.in.h:218 ../comps-f11.xml.in.h:228
-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:207
-#: ../comps-f10.xml.in.h:219 ../comps-f11.xml.in.h:229
-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:208
-#: ../comps-f10.xml.in.h:220 ../comps-f11.xml.in.h:230
-#: ../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:209
-#: ../comps-f10.xml.in.h:221 ../comps-f11.xml.in.h:231
-msgid "XFCE"
-msgstr "XFCE"
-
-#: ../comps-f7.xml.in.h:194 ../comps-f8.xml.in.h:202 ../comps-f9.xml.in.h:210
-#: ../comps-f10.xml.in.h:222 ../comps-f11.xml.in.h:232
-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:211
-#: ../comps-f10.xml.in.h:223 ../comps-f11.xml.in.h:233
-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:212
-#: ../comps-f10.xml.in.h:224 ../comps-f11.xml.in.h:234
-msgid "Zulu Support"
-msgstr "Supporto per lo Zulu"
-
-#: ../comps-f8.xml.in.h:21 ../comps-f9.xml.in.h:21 ../comps-f10.xml.in.h:21
-#: ../comps-f11.xml.in.h:22
-msgid "Buildsystem building group"
-msgstr "Gruppo vuilding buildsystem"
-
-#: ../comps-f8.xml.in.h:48 ../comps-f9.xml.in.h:49 ../comps-f10.xml.in.h:49
-#: ../comps-f11.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-f11.xml.in.h:55
-msgid "Fonts"
-msgstr "Fonts"
-
-#: ../comps-f8.xml.in.h:53 ../comps-f9.xml.in.h:54 ../comps-f10.xml.in.h:54
-#: ../comps-f11.xml.in.h:56
-msgid "Fonts packages for rendering text on the desktop."
-msgstr "Pacchetti fonts per il rendering del testo sul desktop."
-
-#: ../comps-f8.xml.in.h:79 ../comps-f9.xml.in.h:80 ../comps-f10.xml.in.h:83
-#: ../comps-f11.xml.in.h:87
-msgid "Integrated Development Environments based on Eclipse."
-msgstr "Ambiente integrato di sviluppo basato su Eclipse."
-
-#: ../comps-f8.xml.in.h:95 ../comps-f9.xml.in.h:98 ../comps-f10.xml.in.h:104
-#: ../comps-f11.xml.in.h:109
-msgid "Legacy Fonts"
-msgstr "Fonts obsolete"
-
-#: ../comps-f8.xml.in.h:100 ../comps-f9.xml.in.h:103 ../comps-f10.xml.in.h:109
-#: ../comps-f11.xml.in.h:114
-msgid "Low Saxon Support"
-msgstr "Supporto per il basso sassone"
-
-#: ../comps-f8.xml.in.h:106 ../comps-f9.xml.in.h:110 ../comps-f10.xml.in.h:117
-#: ../comps-f11.xml.in.h:123
-msgid "Mongolian Support"
-msgstr "Supporto per il mongolo"
-
-#: ../comps-f8.xml.in.h:108 ../comps-f9.xml.in.h:112 ../comps-f10.xml.in.h:120
-#: ../comps-f11.xml.in.h:126
-msgid "Nepali Support"
-msgstr "Supporto per il nepalese"
-
-#: ../comps-f8.xml.in.h:114 ../comps-f9.xml.in.h:119 ../comps-f10.xml.in.h:127
-#: ../comps-f11.xml.in.h:134
-msgid "Older bitmap and vector fonts packages"
-msgstr "Vecchi pacchetti di fonti bitmap e vettoriali"
-
-#: ../comps-f9.xml.in.h:44 ../comps-f10.xml.in.h:44 ../comps-f11.xml.in.h:45
-msgid "Esperanto Support"
-msgstr "Supporto per l'esperanto"
-
-#: ../comps-f9.xml.in.h:91 ../comps-f10.xml.in.h:95 ../comps-f11.xml.in.h:99
-msgid "Kashubian Support"
-msgstr "Supporto per il Kashubian"
-
-#: ../comps-f9.xml.in.h:94 ../comps-f10.xml.in.h:99 ../comps-f11.xml.in.h:104
-msgid "Kurdish Support"
-msgstr "Supporto per il curdo"
-
-#: ../comps-f9.xml.in.h:104 ../comps-f10.xml.in.h:110
-#: ../comps-f11.xml.in.h:115
-msgid "Macedonian Support"
-msgstr "Supporto per il macedone"
-
-#: ../comps-f9.xml.in.h:115 ../comps-f10.xml.in.h:123
-#: ../comps-f11.xml.in.h:129
-msgid "Northern Sami Support"
-msgstr "Supporto per il sami del nord"
-
-#: ../comps-f9.xml.in.h:131 ../comps-f10.xml.in.h:139
-#: ../comps-f11.xml.in.h:146
-msgid "SUGAR Desktop Environment"
-msgstr "Ambiente Desktop SUGAR"
-
-#: ../comps-f9.xml.in.h:132 ../comps-f10.xml.in.h:140
-#: ../comps-f11.xml.in.h:147
-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:201 ../comps-f10.xml.in.h:213
-#: ../comps-f11.xml.in.h:223
-msgid "Walloon Support"
-msgstr "Supporto per il walloon"
-
-#: ../comps-f10.xml.in.h:70 ../comps-f11.xml.in.h:74
-msgid "Haskell Development"
-msgstr "Sviluppo Haskell"
-
-#: ../comps-f10.xml.in.h:76 ../comps-f11.xml.in.h:80
-msgid "Input Methods"
-msgstr "Metodi di input"
-
-#: ../comps-f10.xml.in.h:77 ../comps-f11.xml.in.h:81
-msgid "Input method packages for the input of international text."
-msgstr "Pacchetti dei metodi di input per l'input di testo internazionale."
-
-#: ../comps-f10.xml.in.h:94 ../comps-f11.xml.in.h:98
-msgid "Kashmiri Support"
-msgstr "Supporto per il Kashmiri"
-
-#: ../comps-f10.xml.in.h:97 ../comps-f11.xml.in.h:102
-msgid "Konkani Support"
-msgstr "Supporto per il Konkani"
-
-#: ../comps-f10.xml.in.h:100 ../comps-f11.xml.in.h:105
-msgid "LXDE"
-msgstr "LXDE"
-
-#: ../comps-f10.xml.in.h:112 ../comps-f11.xml.in.h:117
-msgid "Maithili Support"
-msgstr "Supporto maithili"
-
-#: ../comps-f10.xml.in.h:119 ../comps-f11.xml.in.h:125
-msgid "Myanmar (Burmese) Support"
-msgstr "Supporto myanmar (Burmese)"
-
-#: ../comps-f10.xml.in.h:146 ../comps-f11.xml.in.h:153
-msgid "Sindhi Support"
-msgstr "Supporto per il Sindhi"
+#: ../window.glade.h:12 ../accounts/mortgage.glade.h:13
+msgid "yrs"
+msgstr "anni"
 
-#: ../comps-f10.xml.in.h:158 ../comps-f11.xml.in.h:165
-msgid "Support for developing programs in the Haskell programming language."
-msgstr ""
-"Supporto per sviluppare programmi nel linguaggio di programmazione Haskell."
+#: ../add-account.glade.h:1
+msgid "<b>Description</b>"
+msgstr "<b>Descrizione</b>"
 
-#: ../comps-f10.xml.in.h:165 ../comps-f11.xml.in.h:172
-msgid "Tajik Support"
-msgstr "Supporto per il Tajik"
-
-#: ../comps-f10.xml.in.h:207 ../comps-f11.xml.in.h:217
-msgid "Uzbek Support"
-msgstr "Supporto per lo uzbek"
-
-#: ../comps-f11.xml.in.h:5
-#, fuzzy
-msgid "Amazigh Support"
-msgstr "Supporto per l'arabo"
-
-#: ../comps-f11.xml.in.h:54
-msgid "Font design and packaging"
-msgstr "Disegno e packaging dei caratteri"
-
-#: ../comps-f11.xml.in.h:58
-#, fuzzy
-msgid "Frisian Support"
-msgstr "Supporto per il persiano"
-
-#: ../comps-f11.xml.in.h:59
-#, fuzzy
-msgid "Friulian Support"
-msgstr "Supporto per il filippino"
-
-#: ../comps-f11.xml.in.h:101
-#, fuzzy
-msgid "Kinyarwanda Support"
-msgstr "Supporto per il canadese"
-
-#: ../comps-f11.xml.in.h:118
-#, fuzzy
-msgid "Malagasy Support"
-msgstr "Supporto per il malese"
-
-#: ../comps-f11.xml.in.h:132
-#, fuzzy
-msgid "Occitan Support"
-msgstr "Supporto per il tibetano"
+#: ../add-account.glade.h:2
+msgid "<span weight=\"bold\" size=\"larger\">Choose account type</span>"
+msgstr "<span weight=\"bold\" size=\"larger\">Scegli un tipo di conto</span>"
 
-#: ../comps-f11.xml.in.h:201
-msgid ""
-"This group is a collection of tools used in the design, modification, "
-"manipulation, and packaging of fonts."
-msgstr ""
-"Questo gruppo ?? una collezione di strumenti usati nel disegno, modifica, "
-"manipolazione e packaging dei caratteri."
+#: ../add-account.glade.h:3
+msgid "Add Account"
+msgstr "Aggiungi un Conto"
 
-#: ../comps-f11.xml.in.h:213
-#, fuzzy
-msgid "Turkmen Support"
-msgstr "Supporto per il turco"
-
-#: ../comps-f11.xml.in.h:215
-#, fuzzy
-msgid "Upper Sorbian Support"
-msgstr "Supporto per il serbo"
-
-#: ../comps-el4.xml.in.h:3 ../comps-el5.xml.in.h:3
-msgid "Applications for a variety of tasks"
-msgstr "Applicazioni per vari compiti"
-
-#: ../comps-el4.xml.in.h:12 ../comps-el5.xml.in.h:13
-msgid "Dialup Networking Support"
-msgstr "Supporto di networking dialup"
+#: ../accounts/ftd.py:31
+msgid "Fixed Term Deposit"
+msgstr "Deposito a tempo determinato"
 
-#: ../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 ?? una potente interfaccia grafica utente che include un pannello, un "
-"desktop, icone di sistema e un file manager grafico."
+#: ../accounts/ftd.py:32
+msgid "Fixed term deposit with taxable interest paid on maturity."
+msgstr "Deposito a tempo determinato con imponibili gli interessi pagati alla scadenza."
 
-#: ../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."
+#. pprint (s.get_model_data ())
+#: ../accounts/ftd.glade.h:2 ../accounts/regsave.glade.h:2
+#: ../accounts/savings.glade.h:2 ../accounts/stooze.glade.h:2
+#, no-c-format
+msgid "%"
+msgstr "%"
+
+#: ../accounts/ftd.glade.h:3 ../accounts/gain.glade.h:1
+#: ../accounts/payment.glade.h:1 ../accounts/spend.glade.h:1
+msgid "Amount:"
+msgstr "Quantit?"
+
+#: ../accounts/ftd.glade.h:4 ../accounts/regsave.glade.h:5
+#: ../accounts/savings.glade.h:6
+msgid "Final balance:"
+msgstr "Bilancio finale:"
+
+#: ../accounts/ftd.glade.h:5
+msgid "Gross rate:"
+msgstr "Tasso lordo"
+
+#: ../accounts/ftd.glade.h:6 ../accounts/regsave.glade.h:6
+#: ../accounts/savings.glade.h:7
+msgid "Interest earned:"
+msgstr "Interessi maturati:"
+
+#: ../accounts/ftd.glade.h:7 ../accounts/regsave.glade.h:10
+#: ../accounts/savings.glade.h:9
+msgid "Tax rate:"
+msgstr "Aliquota d'imposta"
+
+#: ../accounts/ftd.glade.h:8 ../accounts/regsave.glade.h:11
+msgid "Term:"
+msgstr "Termine"
+
+#: ../accounts/gain.py:30
+msgid "Extra income"
+msgstr "Reddito extra"
+
+#: ../accounts/gain.py:31
+msgid "Additional regular income."
+msgstr "Ulteriore reddito"
+
+#: ../accounts/gain.glade.h:2 ../accounts/spend.glade.h:2
+msgid "Every"
+msgstr "Ogni"
+
+#: ../accounts/gain.glade.h:3 ../accounts/spend.glade.h:3
+msgid "Frequency:"
+msgstr "Frequenza:"
+
+#: ../accounts/mortgage.py:32
+msgid "Mortgage"
+msgstr "Ipoteca"
+
+#: ../accounts/mortgage.py:33
+msgid "Repayment mortgage with optional offset facility."
 msgstr ""
-"KDE ?? una potente interfaccia grafica utente che include un pannello, un "
-"desktop, icone di sistema e un file manager grafico."
 
-#: ../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."
+#: ../accounts/mortgage.py:174
+#, python-format
+msgid "%s (offset)"
 msgstr ""
-"Talvolta definiti editor di testo, questi programmi consentono di creare e "
-"modificare i file. Sono inclusi Emacs e Vi."
 
-#: ../comps-el4.xml.in.h:50 ../comps-el5.xml.in.h:48
-msgid "The XEmacs text editor."
-msgstr "Editor di testo XEmacs."
+#: ../accounts/mortgage.py:176
+#, python-format
+msgid "%s (interest)"
+msgstr "%s (interesse)"
 
-#: ../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 ""
-"Questi strumenti consentono di creare documenti in formato DocBook e di "
-"convertirli in HTML, PDF, Postscript e testo."
+#. pprint (m.get_model_data ())
+#: ../accounts/mortgage.glade.h:2 ../accounts/stooze.glade.h:4
+#, no-c-format
+msgid "% APR"
+msgstr "% TAEG"
 
-#: ../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 "Questo gruppo ?? una collezione di servers di rete per scopi specifici"
+#: ../accounts/mortgage.glade.h:3
+msgid "Interest saved:"
+msgstr "Interesse salvato:"
 
-#: ../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."
+#: ../accounts/mortgage.glade.h:4
+msgid "Loan amount:"
+msgstr "Importo prestito:"
+
+#: ../accounts/mortgage.glade.h:5
+msgid "Loan term:"
+msgstr "Termine prestito"
+
+#: ../accounts/mortgage.glade.h:6
+msgid "Monthly payment:"
+msgstr "Pagamento mensile:"
+
+#: ../accounts/mortgage.glade.h:7
+msgid "Offset amount:"
 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."
+#: ../accounts/mortgage.glade.h:8 ../accounts/regsave.glade.h:9
+#: ../accounts/savings.glade.h:8
+msgid "Rate:"
+msgstr "Tariffa:"
+
+#: ../accounts/mortgage.glade.h:9
+msgid "Time saved:"
+msgstr "Tempo guadagnato:"
+
+#: ../accounts/mortgage.glade.h:10
+msgid "Total interest:"
+msgstr "Interesse totale:"
+
+#: ../accounts/mortgage.glade.h:11
+msgid "Total repayments:"
+msgstr "Totale rimborsi:"
+
+#: ../accounts/payment.py:30
+msgid "Payment in installments"
+msgstr "Pagamento rateale"
+
+#: ../accounts/payment.py:31
+msgid "A one-off withdrawal, or a series of withdrawals."
+msgstr "Una tantum di ritiro, o una serie di ritiri."
+
+#: ../accounts/payment.glade.h:2
+msgid "For:"
+msgstr "Per:"
+
+#: ../accounts/regsave.py:31
+msgid "Regular Saver"
 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
+#: ../accounts/regsave.py:32
 msgid ""
-"This group is a collection of tools and resources of Japanese environments."
+"Fixed term savings account with required monthly contributions and taxable "
+"interest."
+msgstr "Tempo determinato conto di risparmio con i necessari contributi mensili imponibili e interesse."
+
+#: ../accounts/regsave.glade.h:4 ../accounts/savings.glade.h:4
+#, no-c-format
+msgid "% AER"
+msgstr "% ARE"
+
+#: ../accounts/regsave.glade.h:7
+msgid "Minimum amount:"
+msgstr "Importo minimo:"
+
+#: ../accounts/regsave.glade.h:8
+msgid "Monthly amount:"
+msgstr "Ammontare mensile:"
+
+#: ../accounts/savings.py:31
+msgid "Savings account"
+msgstr "Conti salvati"
+
+#: ../accounts/savings.py:32
+msgid "Instant-access savings account with taxable interest."
+msgstr "Accesso istantaneo conto di risparmio con interesse imponibile."
+
+#: ../accounts/savings.glade.h:5
+msgid "Balance:"
+msgstr "Bilancio:"
+
+#: ../accounts/spend.py:30
+msgid "Spending"
+msgstr "Spesa"
+
+#: ../accounts/spend.py:31
+msgid "A regular withdrawal (for example, a shortfall due to spending)."
+msgstr "Ritiro periodico (per esempio, a causa di un deficit di spesa)."
+
+#: ../accounts/stooze.py:31
+msgid "Credit Card (Promotional Rate)"
+msgstr "Carta di credito (tasso promozionale)"
+
+#: ../accounts/stooze.py:32
+msgid "Credit card with a time-limited promotional rate for purchases."
+msgstr "Carta di credito a tasso promozionale per l'acquisto per un periodo di tempo limitato."
+
+#: ../accounts/stooze.glade.h:5
+msgid "Credit limit:"
+msgstr "Limite di credito:"
+
+#: ../accounts/stooze.glade.h:6
+msgid "Interest paid:"
+msgstr "Interessi passivi:"
+
+#: ../accounts/stooze.glade.h:7
+msgid "Minimum payment:"
+msgstr "Pagamento minimo:"
+
+#: ../accounts/stooze.glade.h:8
+msgid "Or, if greater:"
+msgstr "Oppure, se maggiore:"
+
+#: ../accounts/stooze.glade.h:9
+msgid "Present balance:"
 msgstr ""
-"Questo gruppo ?? una collezione di strumenti e risorse per gli ambienti "
-"giapponesi."
 
-#: ../comps-el4.xml.in.h:77 ../comps-el5.xml.in.h:77
-msgid "XEmacs"
-msgstr "XEmacs"
+#: ../accounts/stooze.glade.h:10
+msgid "Promotion period:"
+msgstr "Periodo promozionale:"
 
-#: ../comps-el5.xml.in.h:65
-msgid ""
-"This group is a collection of tools and resources of Czech environments."
+#: ../accounts/stooze.glade.h:11
+msgid "Promotional rate:"
+msgstr "Tasso promozionale:"
+
+#: ../accounts/windfall.py:30
+msgid "Windfall"
 msgstr ""
-"Questo gruppo ?? una collezione di strumenti e risorse per gli ambienti cechi."
+
+#: ../accounts/windfall.py:31
+msgid "A one-off money gain."
+msgstr "Guadagno una tantum"
+
+#: ../accounts/windfall.glade.h:1
+msgid "Amount received:"
+msgstr "Importo ricevuto:"
+



From mathstuf at fedoraproject.org  Thu Jan 29 23:48:40 2009
From: mathstuf at fedoraproject.org (Ben Boeckel)
Date: Thu, 29 Jan 2009 23:48:40 +0000 (UTC)
Subject: rpms/krazy2/F-10 krazy-licensecheck, NONE, 1.1 krazy2.spec, 1.3,
	1.4 sources, 1.4, 1.5
Message-ID: <20090129234840.B423C70116@cvs1.fedora.phx.redhat.com>

Author: mathstuf

Update of /cvs/pkgs/rpms/krazy2/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5259

Modified Files:
	krazy2.spec sources 
Added Files:
	krazy-licensecheck 
Log Message:
Fix up for KDE 4.2.0 update (krazy-licensecheck, version 2.8)


--- NEW FILE krazy-licensecheck ---
#!/bin/sh

krazy2 --verbose --check license $@


Index: krazy2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/krazy2/F-10/krazy2.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- krazy2.spec	8 Oct 2008 17:06:25 -0000	1.3
+++ krazy2.spec	29 Jan 2009 23:48:10 -0000	1.4
@@ -1,6 +1,9 @@
+# Set to 1 if kdevplatform is available
+%define kdp 0
+
 Name:           krazy2
-Version:        2.6
-Release:        6.20081008svn869261%{?dist}
+Version:        2.8
+Release:        7.20090127svn%{?dist}
 Summary:        Krazy is a tool for checking code against the KDE coding guidelines
 
 Group:          Development/Libraries
@@ -8,17 +11,26 @@
 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 869261 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
+#  svn export -r 917270 svn://anonsvn.kde.org/home/kde/trunk/quality/krazy2 krazy2-2.8
+#  tar -c krazy2-2.8 | bzip2 --best -c > krazy2-2.8.tar.bz2
 Source0:        krazy2-%{version}.tar.bz2
+Source1:        krazy-licensecheck
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+# krazy-licensecheck moved from kdesdk to here in 4.2.0
+Conflicts:      kdesdk < 4.2.0
+
 BuildRequires:  groff
 BuildRequires:  perl(ExtUtils::MakeMaker)
 BuildRequires:  perl(HTML::Parser)
 BuildRequires:  perl(Tie::IxHash)
 BuildRequires:  perl(XML::LibXML)
 BuildRequires:  qt4-devel
+%if 0%{?kdp}
+BuildRequires:  cmake
+BuildRequires:  kdelibs4-devel
+BuildRequires:  kdevplatform-devel
+%endif
 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
@@ -40,10 +52,16 @@
 %{_qt4_qmake}
 make %{?_smp_mflags}
 popd
+%if 0%{?kdp}
+pushd cppchecks
+%{cmake}
+make VERBOSE=1 %{?_smp_mflags}
+popd
+%endif
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 make DESTDIR=%{buildroot} PREFIX=%{_prefix} install
 chmod 0755 %{buildroot}%{_bindir}/krazy2{,all,ebn}
 pushd helpers
@@ -82,9 +100,18 @@
 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 ';'
+install -m 644 %{SOURCE1} %{buildroot}%{_bindir}/krazy-licensecheck
+%if 0%{?kdp}
+pushd cppchecks
+make DESTDIR=%{buildroot} PREFIX=%{_prefix} install
+# No headers installed
+rm -rf %{buildroot}%{_libdir}/libc++parser.so
+rm -rf %{buildroot}%{_libdir}/libcheckutil.so
+popd
+%endif
+find %{buildroot} -type f -name .packlist -exec rm -f {} ';'
+find %{buildroot} -type f -name perllocal.pod -exec rm -f {} ';'
+find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null ';'
 # chmod -R ug+w %{buildroot}%{_bindir}
 # chmod -R ug+w %{buildroot}%{_libdir}
 
@@ -93,7 +120,7 @@
 
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 
 %files
@@ -103,15 +130,45 @@
 %{_mandir}/man1/krazy2all.1.gz
 %{_mandir}/man1/krazy2ebn.1.gz
 %{_mandir}/man5/krazyrc.5.gz
+%{_bindir}/krazy-licensecheck
 %{_bindir}/krazy2
 %{_bindir}/krazy2all
 %{_bindir}/krazy2ebn
-%{_libdir}/krazy2
-%{_datadir}/dtd
-%{perl_vendorlib}/Krazy
+%if 0%{?kdp}
+%{_libdir}/libc++parser.so.1
+%{_libdir}/libc++parser.so.1.0
+%{_libdir}/libcheckutil.so.1
+%{_libdir}/libcheckutil.so.1.0
+%endif
+%{_libdir}/krazy2/
+%{_datadir}/dtd/
+%{perl_vendorlib}/Krazy/
 
 
 %changelog
+* Thu Jan 29 2009 Ben Boeckel <MathStuf at gmail.com> 2.8-6.20090127svn
+- Updated SVN
+
+* Sat Jan 24 2009 Ben Boeckel <MathStuf at gmail.com> 2.8-6.20090113svn916151
+- Added flag for building with kdevplatform
+- Removed patches applied upstream
+
+* Tue Jan 13 2009 Ben Boeckel <MathStuf at gmail.com> 2.8-5.20090111svn909634
+- Typo with sources
+
+* Tue Jan 13 2009 Ben Boeckel <MathStuf at gmail.com> 2.8-4.20090111svn909634
+- Forgot to commit krazy-licensecheck
+
+* Tue Jan 13 2009 Ben Boeckel <MathStuf at gmail.com> 2.8-3.20090111svn909634
+- Missed the patch
+
+* Tue Jan 13 2009 Ben Boeckel <MathStuf at gmail.com> 2.8-2.20090111svn909634
+- Moved krazy-licensecheck from kdesdk to here
+
+* Tue Jan 6 2009 Ben Boeckel <MathStuf at gmail.com> 2.8-1.20090105svn906738
+- New plugins and extra checks
+- Updated plugins
+
 * Wed Oct 8 2008 Ben Boeckel <MathStuf at gmail.com> 2.6-6.20081008svn869261
 - Updated SVN
 - Patch applied upstream


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/krazy2/F-10/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	8 Oct 2008 17:06:25 -0000	1.4
+++ sources	29 Jan 2009 23:48:10 -0000	1.5
@@ -1 +1 @@
-adfb89dcec51e6a0f2d12147caa441fc  krazy2-2.6.tar.bz2
+7dfdeb7b17b3995e0fe7a6f9e0c902e2  krazy2-2.8.tar.bz2



From mathstuf at fedoraproject.org  Thu Jan 29 23:50:12 2009
From: mathstuf at fedoraproject.org (Ben Boeckel)
Date: Thu, 29 Jan 2009 23:50:12 +0000 (UTC)
Subject: rpms/krazy2/F-9 krazy-licensecheck, NONE, 1.1 krazy2.spec, 1.3,
	1.4 sources, 1.4, 1.5
Message-ID: <20090129235012.CF5D270116@cvs1.fedora.phx.redhat.com>

Author: mathstuf

Update of /cvs/pkgs/rpms/krazy2/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5519

Modified Files:
	krazy2.spec sources 
Added Files:
	krazy-licensecheck 
Log Message:
Fix up for KDE 4.2.0 update (krazy-licensecheck, version 2.8)


--- NEW FILE krazy-licensecheck ---
#!/bin/sh

krazy2 --verbose --check license $@


Index: krazy2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/krazy2/F-9/krazy2.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- krazy2.spec	8 Oct 2008 17:06:25 -0000	1.3
+++ krazy2.spec	29 Jan 2009 23:49:42 -0000	1.4
@@ -1,6 +1,9 @@
+# Set to 1 if kdevplatform is available
+%define kdp 0
+
 Name:           krazy2
-Version:        2.6
-Release:        6.20081008svn869261%{?dist}
+Version:        2.8
+Release:        7.20090127svn%{?dist}
 Summary:        Krazy is a tool for checking code against the KDE coding guidelines
 
 Group:          Development/Libraries
@@ -8,17 +11,26 @@
 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 869261 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
+#  svn export -r 917270 svn://anonsvn.kde.org/home/kde/trunk/quality/krazy2 krazy2-2.8
+#  tar -c krazy2-2.8 | bzip2 --best -c > krazy2-2.8.tar.bz2
 Source0:        krazy2-%{version}.tar.bz2
+Source1:        krazy-licensecheck
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+# krazy-licensecheck moved from kdesdk to here in 4.2.0
+Conflicts:      kdesdk < 4.2.0
+
 BuildRequires:  groff
 BuildRequires:  perl(ExtUtils::MakeMaker)
 BuildRequires:  perl(HTML::Parser)
 BuildRequires:  perl(Tie::IxHash)
 BuildRequires:  perl(XML::LibXML)
 BuildRequires:  qt4-devel
+%if 0%{?kdp}
+BuildRequires:  cmake
+BuildRequires:  kdelibs4-devel
+BuildRequires:  kdevplatform-devel
+%endif
 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
@@ -40,10 +52,16 @@
 %{_qt4_qmake}
 make %{?_smp_mflags}
 popd
+%if 0%{?kdp}
+pushd cppchecks
+%{cmake}
+make VERBOSE=1 %{?_smp_mflags}
+popd
+%endif
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 make DESTDIR=%{buildroot} PREFIX=%{_prefix} install
 chmod 0755 %{buildroot}%{_bindir}/krazy2{,all,ebn}
 pushd helpers
@@ -82,9 +100,18 @@
 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 ';'
+install -m 644 %{SOURCE1} %{buildroot}%{_bindir}/krazy-licensecheck
+%if 0%{?kdp}
+pushd cppchecks
+make DESTDIR=%{buildroot} PREFIX=%{_prefix} install
+# No headers installed
+rm -rf %{buildroot}%{_libdir}/libc++parser.so
+rm -rf %{buildroot}%{_libdir}/libcheckutil.so
+popd
+%endif
+find %{buildroot} -type f -name .packlist -exec rm -f {} ';'
+find %{buildroot} -type f -name perllocal.pod -exec rm -f {} ';'
+find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null ';'
 # chmod -R ug+w %{buildroot}%{_bindir}
 # chmod -R ug+w %{buildroot}%{_libdir}
 
@@ -93,7 +120,7 @@
 
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 
 %files
@@ -103,15 +130,45 @@
 %{_mandir}/man1/krazy2all.1.gz
 %{_mandir}/man1/krazy2ebn.1.gz
 %{_mandir}/man5/krazyrc.5.gz
+%{_bindir}/krazy-licensecheck
 %{_bindir}/krazy2
 %{_bindir}/krazy2all
 %{_bindir}/krazy2ebn
-%{_libdir}/krazy2
-%{_datadir}/dtd
-%{perl_vendorlib}/Krazy
+%if 0%{?kdp}
+%{_libdir}/libc++parser.so.1
+%{_libdir}/libc++parser.so.1.0
+%{_libdir}/libcheckutil.so.1
+%{_libdir}/libcheckutil.so.1.0
+%endif
+%{_libdir}/krazy2/
+%{_datadir}/dtd/
+%{perl_vendorlib}/Krazy/
 
 
 %changelog
+* Thu Jan 29 2009 Ben Boeckel <MathStuf at gmail.com> 2.8-6.20090127svn
+- Updated SVN
+
+* Sat Jan 24 2009 Ben Boeckel <MathStuf at gmail.com> 2.8-6.20090113svn916151
+- Added flag for building with kdevplatform
+- Removed patches applied upstream
+
+* Tue Jan 13 2009 Ben Boeckel <MathStuf at gmail.com> 2.8-5.20090111svn909634
+- Typo with sources
+
+* Tue Jan 13 2009 Ben Boeckel <MathStuf at gmail.com> 2.8-4.20090111svn909634
+- Forgot to commit krazy-licensecheck
+
+* Tue Jan 13 2009 Ben Boeckel <MathStuf at gmail.com> 2.8-3.20090111svn909634
+- Missed the patch
+
+* Tue Jan 13 2009 Ben Boeckel <MathStuf at gmail.com> 2.8-2.20090111svn909634
+- Moved krazy-licensecheck from kdesdk to here
+
+* Tue Jan 6 2009 Ben Boeckel <MathStuf at gmail.com> 2.8-1.20090105svn906738
+- New plugins and extra checks
+- Updated plugins
+
 * Wed Oct 8 2008 Ben Boeckel <MathStuf at gmail.com> 2.6-6.20081008svn869261
 - Updated SVN
 - Patch applied upstream


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/krazy2/F-9/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	8 Oct 2008 17:06:25 -0000	1.4
+++ sources	29 Jan 2009 23:49:42 -0000	1.5
@@ -1 +1 @@
-adfb89dcec51e6a0f2d12147caa441fc  krazy2-2.6.tar.bz2
+7dfdeb7b17b3995e0fe7a6f9e0c902e2  krazy2-2.8.tar.bz2



From cebbert at fedoraproject.org  Thu Jan 29 23:52:53 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Thu, 29 Jan 2009 23:52:53 +0000 (UTC)
Subject: rpms/kernel/F-10 config-debug, 1.21, 1.22 config-generic, 1.208,
	1.209 config-nodebug, 1.24, 1.25 config-powerpc-generic, 1.28,
	1.29 config-powerpc32-generic, 1.26, 1.27 config-powerpc64, 1.26,
	1.27 config-s390x, 1.10, 1.11 config-x86-generic, 1.56,
	1.57 config-x86_64-generic, 1.57, 1.58 kernel.spec, 1.1232, 1.1233
Message-ID: <20090129235253.40C5270116@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6011

Modified Files:
	config-debug config-generic config-nodebug 
	config-powerpc-generic config-powerpc32-generic 
	config-powerpc64 config-s390x config-x86-generic 
	config-x86_64-generic kernel.spec 
Log Message:
Update configs for 2.6.29-rc3


Index: config-debug
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/config-debug,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- config-debug	12 Jan 2009 19:51:27 -0000	1.21
+++ config-debug	29 Jan 2009 23:52:22 -0000	1.22
@@ -33,8 +33,10 @@
 CONFIG_DEBUG_WRITECOUNT=y
 CONFIG_DEBUG_OBJECTS=y
 # CONFIG_DEBUG_OBJECTS_SELFTEST is not set
+CONFIG_DEBUG_OBJECTS_ENABLE_DEFAULT=1
 CONFIG_DEBUG_OBJECTS_FREE=y
 CONFIG_DEBUG_OBJECTS_TIMERS=y
+CONFIG_DEBUG_NOTIFIERS=y
 
 CONFIG_X86_PTDUMP=y
 


Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/config-generic,v
retrieving revision 1.208
retrieving revision 1.209
diff -u -r1.208 -r1.209
--- config-generic	20 Jan 2009 16:34:06 -0000	1.208
+++ config-generic	29 Jan 2009 23:52:22 -0000	1.209
@@ -47,6 +47,7 @@
 CONFIG_PID_NS=y
 CONFIG_UTS_NS=y
 CONFIG_IPC_NS=y
+CONFIG_NET_NS=y
 
 CONFIG_POSIX_MQUEUE=y
 # CONFIG_PREEMPT_NONE is not set
@@ -75,6 +76,7 @@
 #
 CONFIG_PCI=y
 # CONFIG_PCI_DEBUG is not set
+CONFIG_PCI_STUB=y
 CONFIG_HT_IRQ=y
 CONFIG_PCI_MSI=y
 CONFIG_PCIEPORTBUS=y
@@ -273,6 +275,10 @@
 # CONFIG_MTD_NAND_DISKONCHIP_BBTWRITE is not set
 # CONFIG_MTD_PLATRAM is not set
 
+# CONFIG_MTD_TESTS is not set
+CONFIG_MTD_LPDDR=m
+CONFIG_MTD_QINFO_PROBE=m
+
 #
 # Parallel port support
 #
@@ -987,7 +993,7 @@
 CONFIG_IP_DCCP=m
 CONFIG_IP_DCCP_CCID2=m
 # CONFIG_IP_DCCP_CCID2_DEBUG is not set
-CONFIG_IP_DCCP_CCID3=m
+CONFIG_IP_DCCP_CCID3=y
 # CONFIG_IP_DCCP_CCID3_DEBUG is not set
 CONFIG_IP_DCCP_CCID3_RTO=100
 # CONFIG_IP_DCCP_DEBUG is not set
@@ -1008,6 +1014,7 @@
 CONFIG_NET_SCHED=y
 CONFIG_NET_SCH_CBQ=m
 CONFIG_NET_SCH_DSMARK=m
+CONFIG_NET_SCH_DRR=m
 CONFIG_NET_SCH_GRED=m
 CONFIG_NET_SCH_HFSC=m
 CONFIG_NET_SCH_HTB=m
@@ -1022,6 +1029,7 @@
 CONFIG_NET_CLS=y
 CONFIG_NET_CLS_ACT=y
 CONFIG_NET_CLS_BASIC=m
+CONFIG_NET_CLS_CGROUP=y
 CONFIG_NET_CLS_FLOW=m
 CONFIG_NET_CLS_FW=m
 CONFIG_NET_CLS_IND=y
@@ -1051,6 +1059,7 @@
 CONFIG_NET_ACT_POLICE=m
 CONFIG_NET_ACT_SIMP=m
 
+CONFIG_DCB=y
 
 #
 # Network testing
@@ -1113,11 +1122,11 @@
 # CONFIG_ATM_NICSTAR_USE_SUNI is not set
 # CONFIG_ATM_NICSTAR_USE_IDT77105 is not set
 # CONFIG_ATM_IA_DEBUG is not set
+# CONFIG_ATM_SOLOS is not set
 
 CONFIG_RFKILL=m
 CONFIG_RFKILL_INPUT=m
 
-
 #
 # Ethernet (10 or 100Mbit)
 #
@@ -1134,12 +1143,15 @@
 CONFIG_FIXED_MII_1000_FDX=y
 CONFIG_FIXED_MII_AMNT=1
 CONFIG_MDIO_BITBANG=m
+CONFIG_NATIONAL_PHY=m
 CONFIG_ICPLUS_PHY=m
+CONFIG_LSI_ET1011C_PHY=m
 CONFIG_LXT_PHY=m
 CONFIG_MARVELL_PHY=m
 CONFIG_QSEMI_PHY=m
 CONFIG_REALTEK_PHY=m
 CONFIG_SMSC_PHY=m
+CONFIG_STE10XP=m
 CONFIG_VITESSE_PHY=m
 
 CONFIG_MII=m
@@ -1200,6 +1212,7 @@
 CONFIG_SIS190=m
 CONFIG_EPIC100=m
 CONFIG_SC92031=m
+CONFIG_SMSC9420=m
 CONFIG_SUNDANCE=m
 # CONFIG_SUNDANCE_MMIO is not set
 CONFIG_TLAN=m
@@ -1254,6 +1267,7 @@
 CONFIG_IXGB_NAPI=y
 CONFIG_IXGBE=m
 CONFIG_IXGBE_DCA=y
+CONFIG_IXGBE_DCB=y
 CONFIG_MYRI10GE=m
 CONFIG_MYRI10GE_DCA=y
 CONFIG_NETXEN_NIC=m
@@ -1319,16 +1333,25 @@
 CONFIG_IEEE80211_CRYPT_CCMP=m
 CONFIG_IEEE80211_CRYPT_TKIP=m
 CONFIG_CFG80211=m
+# CONFIG_CFG80211_REG_DEBUG is not set
 CONFIG_NL80211=y
+CONFIG_LIB80211=m
 CONFIG_WIRELESS=y
 CONFIG_WIRELESS_OLD_REGULATORY=y
 CONFIG_WIRELESS_EXT=y
 CONFIG_WIRELESS_EXT_SYSFS=y
 
+CONFIG_WIMAX=y
+CONFIG_WIMAX_DEBUG_LEVEL=8
+CONFIG_WIMAX_I2400M_USB=m
+CONFIG_WIMAX_I2400M_SDIO=m
+CONFIG_WIMAX_I2400M_DEBUG_LEVEL=8
+
 CONFIG_ADM8211=m
 CONFIG_ATH5K=m
 CONFIG_ATH5K_DEBUG=y
 CONFIG_ATH9K=m
+# CONFIG_ATH9K_DEBUG is not set
 CONFIG_AIRO=m
 CONFIG_AIRO_CS=m
 CONFIG_ATMEL=m
@@ -1345,6 +1368,7 @@
 # CONFIG_B43LEGACY_DMA_MODE is not set
 # CONFIG_B43LEGACY_PIO_MODE is not set
 CONFIG_HERMES=m
+CONFIG_HERMES_CACHE_FW_ON_INIT=y
 CONFIG_HOSTAP=m
 CONFIG_HOSTAP_PCI=m
 CONFIG_HOSTAP_PLX=m
@@ -1355,6 +1379,7 @@
 # CONFIG_IPW2200 is not set
 # CONFIG_IPW2100_DEBUG is not set
 # CONFIG_IPW2200_DEBUG is not set
+# CONFIG_LIBIPW_DEBUG is not set
 CONFIG_LIBERTAS=m
 CONFIG_LIBERTAS_USB=m
 CONFIG_LIBERTAS_CS=m
@@ -1574,6 +1599,8 @@
 CONFIG_ISDN_DRV_AVMB1_T1PCI=m
 CONFIG_ISDN_DRV_AVMB1_C4=m
 
+CONFIG_MISDN_HFCUSB=m
+
 CONFIG_ISDN_PPP=y
 CONFIG_ISDN_PPP_VJ=y
 CONFIG_ISDN_MPP=y
@@ -1762,6 +1789,7 @@
 CONFIG_JOYSTICK_TURBOGRAFX=m
 CONFIG_JOYSTICK_JOYDUMP=m
 CONFIG_JOYSTICK_TWIDJOY=m
+CONFIG_JOYSTICK_WALKERA0701=m
 CONFIG_JOYSTICK_XPAD=m
 CONFIG_JOYSTICK_XPAD_FF=y
 CONFIG_JOYSTICK_XPAD_LEDS=y
@@ -1775,10 +1803,12 @@
 CONFIG_TOUCHSCREEN_MTOUCH=m
 CONFIG_TOUCHSCREEN_MK712=m
 CONFIG_TOUCHSCREEN_PENMOUNT=m
+CONFIG_TOUCHSCREEN_TSC2007=m
 CONFIG_TOUCHSCREEN_TOUCHIT213=m
 CONFIG_TOUCHSCREEN_TOUCHRIGHT=m
 CONFIG_TOUCHSCREEN_TOUCHWIN=m
 CONFIG_TOUCHSCREEN_UCB1400=m
+CONFIG_TOUCHSCREEN_WACOM_W8001=m
 CONFIG_TOUCHSCREEN_USB_COMPOSITE=m
 # CONFIG_TOUCHSCREEN_WM97XX is not set
 CONFIG_INPUT_MISC=y
@@ -1853,6 +1883,7 @@
 CONFIG_SERIAL_CORE=y
 CONFIG_SERIAL_CORE_CONSOLE=y
 CONFIG_UNIX98_PTYS=y
+CONFIG_DEVPTS_MULTIPLE_INSTANCES=y
 # CONFIG_LEGACY_PTYS is not set
 CONFIG_PRINTER=m
 CONFIG_LP_CONSOLE=y
@@ -1929,8 +1960,10 @@
 CONFIG_SENSORS_ADM1031=m
 CONFIG_SENSORS_ADM9240=m
 CONFIG_SENSORS_ADS7828=m
+CONFIG_SENSORS_ADT7462=m
 CONFIG_SENSORS_ADT7470=m
 CONFIG_SENSORS_ADT7473=m
+CONFIG_SENSORS_ADT7475=m
 CONFIG_SENSORS_APPLESMC=m
 CONFIG_SENSORS_ASB100=m
 CONFIG_SENSORS_ATXP1=m
@@ -1956,6 +1989,7 @@
 CONFIG_SENSORS_IBMPEX=m
 CONFIG_SENSORS_IT87=m
 CONFIG_SENSORS_K8TEMP=m
+CONFIG_SENSORS_LIS3LV02D=m
 CONFIG_SENSORS_LM63=m
 CONFIG_SENSORS_LM75=m
 CONFIG_SENSORS_LM77=m
@@ -1967,6 +2001,7 @@
 CONFIG_SENSORS_LM90=m
 CONFIG_SENSORS_LM92=m
 CONFIG_SENSORS_LM93=m
+CONFIG_SENSORS_LTC4245=m
 CONFIG_SENSORS_MAX1619=m
 CONFIG_SENSORS_MAX6650=m
 CONFIG_SENSORS_MAX6875=m
@@ -2054,10 +2089,12 @@
 CONFIG_IT8712F_WDT=m
 # CONFIG_SBC8360_WDT is not set
 # CONFIG_SBC7240_WDT is not set
+CONFIG_SMSC_SCH311X_WDT=m
 CONFIG_W83977F_WDT=m
 CONFIG_PCIPCWATCHDOG=m
 CONFIG_USBPCWATCHDOG=m
 # CONFIG_SBC_EPX_C3_WATCHDOG is not set
+CONFIG_WM8350_WATCHDOG=m
 
 CONFIG_HW_RANDOM=y
 # CONFIG_NVRAM is not set
@@ -2468,6 +2505,7 @@
 CONFIG_FB_MB862XX_PCI_GDC=y
 CONFIG_FB_MB862XX_LIME=y
 # CONFIG_FB_PRE_INIT_FB is not set
+# CONFIG_FB_TMIO is not set
 
 # CONFIG_FIRMWARE_EDID is not set
 
@@ -2505,6 +2543,8 @@
 # CONFIG_SND_DEBUG_VERBOSE is not set
 CONFIG_SND_VERBOSE_PROCFS=y
 CONFIG_SND_SEQUENCER=y
+CONFIG_SND_HRTIMER=y
+CONFIG_SND_SEQ_HRTIMER_DEFAULT=y
 CONFIG_SND_SEQ_DUMMY=m
 CONFIG_SND_SEQUENCER_OSS=y
 CONFIG_SND_SEQ_RTCTIMER_DEFAULT=y
@@ -2579,11 +2619,13 @@
 CONFIG_SND_HDA_CODEC_ATIHDMI=y
 CONFIG_SND_HDA_CODEC_CONEXANT=y
 CONFIG_SND_HDA_CODEC_CMEDIA=y
+CONFIG_SND_HDA_CODEC_INTELHDMI=y
 CONFIG_SND_HDA_CODEC_SI3054=y
 CONFIG_SND_HDA_CODEC_NVHDMI=y
 CONFIG_SND_HDA_GENERIC=y
 CONFIG_SND_HDA_POWER_SAVE=y
 CONFIG_SND_HDA_POWER_SAVE_DEFAULT=0
+CONFIG_SND_HDA_RECONFIG=y
 CONFIG_SND_HDSPM=m
 CONFIG_SND_HIFIER=m
 CONFIG_SND_ICE1712=m
@@ -2713,6 +2755,7 @@
 CONFIG_HID_PID=y
 # CONFIG_HID_COMPAT is not set
 CONFIG_LOGITECH_FF=y
+CONFIG_GREENASIA_FF=m
 CONFIG_LOGIRUMBLEPAD2_FF=y
 CONFIG_PANTHERLORD_FF=y
 CONFIG_THRUSTMASTER_FF=y
@@ -2773,6 +2816,10 @@
 CONFIG_SOC_CAMERA_MT9M001=m
 CONFIG_SOC_CAMERA_MT9V022=m
 CONFIG_SOC_CAMERA_PLATFORM=m
+CONFIG_SOC_CAMERA_MT9M111=m
+CONFIG_SOC_CAMERA_MT9T031=m
+CONFIG_SOC_CAMERA_TW9910=m
+CONFIG_SOC_CAMERA_OV772X=m
 
 #
 # USB Network adaptors
@@ -2861,11 +2908,13 @@
 CONFIG_USB_SERIAL_NAVMAN=m
 CONFIG_USB_SERIAL_OPTION=y
 CONFIG_USB_SERIAL_OTI6858=m
+CONFIG_USB_SERIAL_OPTICON=m
 CONFIG_USB_SERIAL_OMNINET=m
 CONFIG_USB_SERIAL_PL2303=m
 CONFIG_USB_SERIAL_SAFE=m
 CONFIG_USB_SERIAL_SAFE_PADDED=y
 CONFIG_USB_SERIAL_SIERRAWIRELESS=y
+CONFIG_USB_SERIAL_SIEMENS_MPI=m
 CONFIG_USB_SERIAL_SPCP8X5=m
 CONFIG_USB_SERIAL_TI=m
 CONFIG_USB_SERIAL_VISOR=m
@@ -2879,7 +2928,6 @@
 # CONFIG_USB_CYPRESS_CY7C63 is not set
 CONFIG_USB_G_SERIAL=m
 
-
 #
 # USB Miscellaneous drivers
 #
@@ -2906,6 +2954,7 @@
 # CONFIG_USB_HIDINPUT_POWERBOOK is not set
 # CONFIG_USB_ISP116X_HCD is not set
 # CONFIG_USB_ISP1760_HCD is not set
+# CONFIG_USB_OXU210HP_HCD is not set
 CONFIG_USB_IOWARRIOR=m
 CONFIG_USB_ISIGHTFW=m
 CONFIG_USB_VST=m
@@ -2950,6 +2999,7 @@
 CONFIG_SSB_DRIVER_PCICORE=y
 
 # Multifunction USB devices
+# CONFIG_MFD_PCF50633 is not set
 CONFIG_MFD_SM501=m
 CONFIG_MFD_SM501_GPIO=y
 # CONFIG_MFD_TC6393XB is not set
@@ -2957,6 +3007,8 @@
 #
 # File systems
 #
+CONFIG_MISC_FILESYSTEMS=y
+
 CONFIG_EXT2_FS=m
 CONFIG_EXT2_FS_XATTR=y
 CONFIG_EXT2_FS_POSIX_ACL=y
@@ -3126,6 +3178,10 @@
 CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m
 # CONFIG_OCFS2_FS_STATS is not set
 # CONFIG_OCFS2_COMPAT_JBD is not set
+CONFIG_OCFS2_FS_POSIX_ACL=y
+
+CONFIG_BTRFS_FS=m
+
 CONFIG_CONFIGFS_FS=m
 
 CONFIG_DLM=m
@@ -3258,6 +3314,7 @@
 CONFIG_SECURITY=y
 CONFIG_SECURITY_NETWORK=y
 CONFIG_SECURITY_NETWORK_XFRM=y
+# CONFIG_SECURITY_PATH is not set
 CONFIG_SECURITY_CAPABILITIES=y
 CONFIG_SECURITY_FILE_CAPABILITIES=y
 # CONFIG_SECURITY_ROOTPLUG is not set
@@ -3361,7 +3418,7 @@
 CONFIG_ATA_OVER_ETH=m
 CONFIG_BACKLIGHT_LCD_SUPPORT=y
 CONFIG_BACKLIGHT_CLASS_DEVICE=m
-# CONFIG_BACKLIGHT_CORGI is not set
+# CONFIG_BACKLIGHT_GENERIC is not set
 CONFIG_BACKLIGHT_PROGEAR=m
 CONFIG_FB_NVIDIA_BACKLIGHT=y
 CONFIG_FB_RIVA_BACKLIGHT=y
@@ -3376,11 +3433,12 @@
 CONFIG_SCHEDSTATS=y
 CONFIG_SCHED_DEBUG=y
 CONFIG_FAIR_GROUP_SCHED=y
-CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
+CONFIG_SCHED_OMIT_FRAME_POINTER=y
 CONFIG_GROUP_SCHED=y
 CONFIG_RT_GROUP_SCHED=y
 CONFIG_CGROUP_SCHED=y
 CONFIG_CGROUP_MEM_RES_CTLR=y
+CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y
 
 CONFIG_CPUSETS=y
 CONFIG_CGROUPS=y
@@ -3525,6 +3583,7 @@
 # CONFIG_RADIO_SF16FMR2 is not set
 # CONFIG_RADIO_TERRATEC is not set
 # CONFIG_RADIO_TRUST is not set
+# CONFIG_RADIO_TEA5764 is not set
 # CONFIG_RADIO_TYPHOON is not set
 # CONFIG_RADIO_ZOLTRIX is not set
 
@@ -3599,6 +3658,8 @@
 CONFIG_LEDS_TRIGGER_HEARTBEAT=m
 CONFIG_LEDS_TRIGGER_BACKLIGHT=m
 CONFIG_LEDS_TRIGGER_DEFAULT_ON=m
+CONFIG_LEDS_ALIX2=m
+CONFIG_LEDS_WM8350=m
 
 CONFIG_DMADEVICES=y
 CONFIG_DMA_ENGINE=y
@@ -3616,6 +3677,7 @@
 CONFIG_CONTEXT_SWITCH_TRACER=y
 # CONFIG_DYNAMIC_FTRACE is not set
 # CONFIG_FTRACE_STARTUP_TEST is not set
+# CONFIG_TRACE_BRANCH_PROFILING is not set
 
 CONFIG_KPROBES=y
 
@@ -3633,6 +3695,9 @@
 CONFIG_CFAG12864B_RATE=20
 
 # CONFIG_PHANTOM is not set
+
+CONFIG_EEPROM_AT24=m
+CONFIG_EEPROM_LEGACY=m
 CONFIG_EEPROM_93CX6=m
 
 CONFIG_POWER_SUPPLY=m
@@ -3696,14 +3761,12 @@
 # CONFIG_COMPAT_BRK is not set
 
 # FIXME: Move to arch
-CONFIG_ACPI_WMI=m
 CONFIG_ACPI_CUSTOM_DSDT_INITRD=y
 
 #FIXME: x86 generic?
 CONFIG_THINKPAD_ACPI_HOTKEY_POLL=y
 CONFIG_LEDS_CLEVO_MAIL=m
 CONFIG_I8K=m
-CONFIG_ACER_WMI=m
 CONFIG_EDAC_I3000=m
 CONFIG_EDAC_X38=m
 CONFIG_INPUT_APANEL=m
@@ -3713,7 +3776,6 @@
 CONFIG_IPWIRELESS=m
 CONFIG_RTC_DRV_DS1511=m
 CONFIG_CGROUP_MEM_CONT=y
-CONFIG_TC1100_WMI=m
 
 # CONFIG_BLK_DEV_XIP is not set
 CONFIG_MEMSTICK=m
@@ -3739,8 +3801,6 @@
 
 # CONFIG_GPIOLIB is not set
 
-CONFIG_HP_WMI=m
-
 CONFIG_UNEVICTABLE_LRU=y
 
 CONFIG_NETFILTER_TPROXY=m
@@ -3765,8 +3825,6 @@
 # CONFIG_C2PORT is not set
 CONFIG_W1_SLAVE_BQ27000=m
 
-CONFIG_SENSORS_ADT7462=m
-CONFIG_SENSORS_LIS3LV02D=m
 
 CONFIG_IT87_WDT=m
 CONFIG_W83697UG_WDT=m
@@ -3784,7 +3842,7 @@
 
 # CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
 
-CONFIG_SOC_CAMERA_MT9M111=m
+CONFIG_WM8350_POWER=m
 
 CONFIG_USB_WUSB=m
 CONFIG_USB_WUSB_CBAF=m
@@ -3811,3 +3869,13 @@
 CONFIG_EARLY_PRINTK_DBGP=y
 
 CONFIG_SECURITYFS=y
+
+CONFIG_SCSI_CXGB3_ISCSI=m
+CONFIG_LIBFC=m
+CONFIG_FCOE=m
+# CONFIG_SCSI_LPFC_DEBUG_FS is not set
+CONFIG_VIDEO_TVP514X=m
+
+CONFIG_DVB_DYNAMIC_MINORS=y
+CONFIG_DVB_LGDT3304=m
+CONFIG_DVB_S921=m


Index: config-nodebug
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/config-nodebug,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- config-nodebug	13 Jan 2009 15:30:14 -0000	1.24
+++ config-nodebug	29 Jan 2009 23:52:22 -0000	1.25
@@ -34,6 +34,7 @@
 # CONFIG_DEBUG_OBJECTS_SELFTEST is not set
 # CONFIG_DEBUG_OBJECTS_FREE is not set
 # CONFIG_DEBUG_OBJECTS_TIMERS is not set
+# CONFIG_DEBUG_NOTIFIERS is not set
 
 # CONFIG_X86_PTDUMP is not set
 


Index: config-powerpc-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/config-powerpc-generic,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- config-powerpc-generic	22 Jan 2009 17:51:08 -0000	1.28
+++ config-powerpc-generic	29 Jan 2009 23:52:22 -0000	1.29
@@ -278,3 +278,24 @@
 
 # CONFIG_RELOCATABLE is not set
 
+# CONFIG_HVC_UDBG is not set
+CONFIG_PRINT_STACK_DEPTH=64
+
+CONFIG_BATTERY_DA9030=m
+# CONFIG_TWL4030_CORE is not set
+
+CONFIG_BLK_DEV_IT8172=m
+CONFIG_TOUCHSCREEN_DA9034=m
+
+CONFIG_SIMPLE_GPIO=y
+
+CONFIG_MTD_PS3VRAM=m
+CONFIG_MDIO_GPIO=m
+CONFIG_SERIAL_OF_PLATFORM_NWPSERIAL=m
+# CONFIG_DEBUG_GPIO is not set
+CONFIG_GPIO_PCA953X=m
+CONFIG_GPIO_PCF857X=m
+CONFIG_USB_GPIO_VBUS=m
+
+CONFIG_USB_FHCI_HCD=m
+# CONFIG_FHCI_DEBUG is not set


Index: config-powerpc32-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/config-powerpc32-generic,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- config-powerpc32-generic	8 Oct 2008 22:32:46 -0000	1.26
+++ config-powerpc32-generic	29 Jan 2009 23:52:22 -0000	1.27
@@ -169,6 +169,7 @@
 
 CONFIG_83xx_WDT=m
 CONFIG_8xxx_WDT=m
+CONFIG_GEF_WDT=m
 
 # CONFIG_USB_MUSB_HDRC is not set
 


Index: config-powerpc64
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/config-powerpc64,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- config-powerpc64	14 Nov 2008 01:12:05 -0000	1.26
+++ config-powerpc64	29 Jan 2009 23:52:22 -0000	1.27
@@ -15,6 +15,7 @@
 # CONFIG_PPC_PASEMI_IOMMU_DMA_FORCE is not set
 CONFIG_PPC_PS3=y
 CONFIG_PPC_CELLEB=y
+CONFIG_PPC_CELL_QPACE=y
 CONFIG_PS3_HTAB_SIZE=20
 # CONFIG_PS3_DYNAMIC_DMA is not set
 # CONFIG_PS3_USE_LPAR_ADDR is not set


Index: config-s390x
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/config-s390x,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- config-s390x	12 Jan 2009 19:51:27 -0000	1.10
+++ config-s390x	29 Jan 2009 23:52:22 -0000	1.11
@@ -218,3 +218,4 @@
 
 # CONFIG_CRASH is not set
 
+CONFIG_HVC_IUCV=y


Index: config-x86-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/config-x86-generic,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- config-x86-generic	12 Jan 2009 19:51:27 -0000	1.56
+++ config-x86-generic	29 Jan 2009 23:52:22 -0000	1.57
@@ -290,6 +290,7 @@
 CONFIG_EDAC_I3000=m
 CONFIG_EDAC_I5000=m
 CONFIG_EDAC_I5100=m
+CONFIG_EDAC_I5400=m
 CONFIG_EDAC_R82600=m
 
 CONFIG_SCHED_MC=y
@@ -310,13 +311,19 @@
 
 # CONFIG_SGI_IOC4 is not set
 
+CONFIG_X86_PLATFORM_DEVICES=y
 CONFIG_ASUS_LAPTOP=m
 CONFIG_COMPAL_LAPTOP=m
+CONFIG_DELL_LAPTOP=m
 CONFIG_EEEPC_LAPTOP=m
 CONFIG_FUJITSU_LAPTOP=m
 # CONFIG_FUJITSU_LAPTOP_DEBUG is not set
 CONFIG_MSI_LAPTOP=m
 CONFIG_SONY_LAPTOP=m
+CONFIG_ACPI_WMI=m
+CONFIG_ACER_WMI=m
+CONFIG_TC1100_WMI=m
+CONFIG_HP_WMI=m
 
 # CONFIG_SMSC37B787_WDT is not set
 CONFIG_W83697HF_WDT=m
@@ -357,6 +364,8 @@
 CONFIG_XEN_KBDDEV_FRONTEND=y
 CONFIG_XEN_BLKDEV_FRONTEND=m
 CONFIG_XEN_NETDEV_FRONTEND=m
+CONFIG_XENFS=m
+CONFIG_XEN_COMPAT_XENFS=y
 
 CONFIG_MTD_ESB2ROM=m
 CONFIG_MTD_CK804XROM=m
@@ -371,6 +380,7 @@
 
 CONFIG_THINKPAD_ACPI=m
 # CONFIG_THINKPAD_ACPI_DEBUG is not set
+# CONFIG_THINKPAD_ACPI_DEBUGFACILITIES is not set
 CONFIG_THINKPAD_ACPI_BAY=y
 CONFIG_THINKPAD_ACPI_VIDEO=y
 
@@ -425,3 +435,10 @@
 
 CONFIG_XEN_DEBUG_FS=y
 CONFIG_X86_PTRACE_BTS=y
+
+CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y
+
+CONFIG_POWER_TRACER=y
+CONFIG_HW_BRANCH_TRACER=y
+
+# CONFIG_SPARSE_IRQ is not set
\ No newline at end of file


Index: config-x86_64-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/config-x86_64-generic,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- config-x86_64-generic	20 Jan 2009 16:34:06 -0000	1.57
+++ config-x86_64-generic	29 Jan 2009 23:52:22 -0000	1.58
@@ -97,18 +97,23 @@
 # Disable in F9.
 CONFIG_ACPI_PROC_EVENT=y
 
+CONFIG_X86_PLATFORM_DEVICES=y
 CONFIG_ASUS_LAPTOP=m
 CONFIG_COMPAL_LAPTOP=m
+CONFIG_DELL_LAPTOP=m
 CONFIG_FUJITSU_LAPTOP=m
 # CONFIG_FUJITSU_LAPTOP_DEBUG is not set
 CONFIG_MSI_LAPTOP=m
 CONFIG_SONY_LAPTOP=m
 CONFIG_SONYPI_COMPAT=y
 # CONFIG_EEEPC_LAPTOP is not set
-
+CONFIG_ACPI_WMI=m
+CONFIG_ACER_WMI=m
+CONFIG_HP_WMI=m
 
 CONFIG_THINKPAD_ACPI=m
 # CONFIG_THINKPAD_ACPI_DEBUG is not set
+# CONFIG_THINKPAD_ACPI_DEBUGFACILITIES is not set
 CONFIG_THINKPAD_ACPI_BAY=y
 CONFIG_THINKPAD_ACPI_VIDEO=y
 
@@ -181,6 +186,7 @@
 CONFIG_EDAC_E752X=m
 CONFIG_EDAC_I5000=m
 CONFIG_EDAC_I5100=m
+CONFIG_EDAC_I5400=m
 CONFIG_EDAC_I82875P=m
 CONFIG_EDAC_I82860=m
 CONFIG_EDAC_I82975X=m
@@ -273,6 +279,8 @@
 CONFIG_XEN_KBDDEV_FRONTEND=y
 CONFIG_XEN_BLKDEV_FRONTEND=m
 CONFIG_XEN_NETDEV_FRONTEND=m
+CONFIG_XENFS=m
+CONFIG_XEN_COMPAT_XENFS=y
 
 CONFIG_DMADEVICES=y
 CONFIG_INTEL_IOATDMA=m
@@ -300,6 +308,7 @@
 
 # CONFIG_MEMTEST is not set
 CONFIG_AMD_IOMMU=y
+CONFIG_AMD_IOMMU_STATS=y
 # CONFIG_MAXSMP is not set
 CONFIG_MTRR_SANITIZER=y
 CONFIG_MTRR_SANITIZER_ENABLE_DEFAULT=0
@@ -328,3 +337,11 @@
 
 CONFIG_I7300_IDLE=m
 CONFIG_INTR_REMAP=y
+
+CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y
+
+CONFIG_POWER_TRACER=y
+CONFIG_HW_BRANCH_TRACER=y
+
+CONFIG_SPARSE_IRQ=y
+CONFIG_NUMA_MIGRATE_IRQ_DESC=y


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/kernel.spec,v
retrieving revision 1.1232
retrieving revision 1.1233
diff -u -r1.1232 -r1.1233
--- kernel.spec	29 Jan 2009 21:14:11 -0000	1.1232
+++ kernel.spec	29 Jan 2009 23:52:22 -0000	1.1233
@@ -1742,6 +1742,9 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Thu Jan 29 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.29-0.3.rc3
+- Update configs for 2.6.29-rc3
+
 * Thu Jan 29 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.29-0.2.rc3
 - Sync with rawhide 2.6.29-rc3 -- still needs config files updating.
 



From cebbert at fedoraproject.org  Fri Jan 30 00:08:31 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Fri, 30 Jan 2009 00:08:31 +0000 (UTC)
Subject: rpms/kernel/devel Makefile, 1.94, 1.95 config-generic, 1.231,
	1.232 config-x86-generic, 1.62, 1.63 config-x86_64-generic, 1.65,
	1.66 kernel.spec, 1.1247, 1.1248
Message-ID: <20090130000831.AC89670141@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8274

Modified Files:
	Makefile config-generic config-x86-generic 
	config-x86_64-generic kernel.spec 
Log Message:
Clean up EEPROM config.
Disable CONFIG_DEBUG_NOTIFIERS release kernel.


Index: Makefile
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/Makefile,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -r1.94 -r1.95
--- Makefile	29 Dec 2008 02:48:00 -0000	1.94
+++ Makefile	30 Jan 2009 00:08:01 -0000	1.95
@@ -63,6 +63,7 @@
 	@perl -pi -e 's/# CONFIG_CAN_DEBUG_DEVICES is not set/CONFIG_CAN_DEBUG_DEVICES=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
+	@perl -pi -e 's/# CONFIG_DEBUG_NOTIFIERS is not set/CONFIG_DEBUG_NOTIFIERS=y/' config-nodebug
 	@perl -pi -e 's/# CONFIG_PM_TEST_SUSPEND is not set/CONFIG_PM_TEST_SUSPEND=y/' config-generic
 	@perl -pi -e 's/# CONFIG_BOOT_TRACER is not set/CONFIG_BOOT_TRACER=y/' config-generic
 
@@ -102,6 +103,7 @@
 	@perl -pi -e 's/CONFIG_CAN_DEBUG_DEVICES=y/# CONFIG_CAN_DEBUG_DEVICES 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
+	@perl -pi -e 's/CONFIG_DEBUG_NOTIFIERS=y/# CONFIG_DEBUG_NOTIFIERS is not set/' config-nodebug
 	@perl -pi -e 's/CONFIG_PM_TEST_SUSPEND=y/#\ CONFIG_PM_TEST_SUSPEND\ is\ not\ set/' config-generic
 	@perl -pi -e 's/CONFIG_BOOT_TRACER=y/#\ CONFIG_BOOT_TRACER\ is\ not\ set/' config-generic
 


Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-generic,v
retrieving revision 1.231
retrieving revision 1.232
diff -u -r1.231 -r1.232
--- config-generic	29 Jan 2009 22:00:11 -0000	1.231
+++ config-generic	30 Jan 2009 00:08:01 -0000	1.232
@@ -1128,7 +1128,6 @@
 CONFIG_RFKILL=m
 CONFIG_RFKILL_INPUT=m
 
-
 #
 # Ethernet (10 or 100Mbit)
 #
@@ -1924,7 +1923,10 @@
 # CONFIG_I2C_I810 is not set
 # CONFIG_I2C_ISCH is not set
 # CONFIG_I2C_NFORCE2_S4985 is not set
+
 CONFIG_EEPROM_AT24=m
+CONFIG_EEPROM_LEGACY=m
+CONFIG_EEPROM_93CX6=m
 
 CONFIG_I2C_NFORCE2=m
 # CONFIG_I2C_OCORES is not set
@@ -1976,7 +1978,6 @@
 CONFIG_SENSORS_DS1337=m
 CONFIG_SENSORS_DS1374=m
 # CONFIG_DS1682 is not set
-CONFIG_EEPROM_LEGACY=m
 CONFIG_SENSORS_FSCHER=m
 CONFIG_SENSORS_FSCPOS=m
 CONFIG_SENSORS_F71805F=m
@@ -3430,7 +3431,7 @@
 CONFIG_ATA_OVER_ETH=m
 CONFIG_BACKLIGHT_LCD_SUPPORT=y
 CONFIG_BACKLIGHT_CLASS_DEVICE=m
-# CONFIG_BACKLIGHT_CORGI is not set
+# CONFIG_BACKLIGHT_GENERIC is not set
 CONFIG_BACKLIGHT_PROGEAR=m
 CONFIG_FB_NVIDIA_BACKLIGHT=y
 CONFIG_FB_RIVA_BACKLIGHT=y
@@ -3438,7 +3439,6 @@
 CONFIG_FB_ATY128_BACKLIGHT=y
 CONFIG_FB_ATY_BACKLIGHT=y
 # CONFIG_BACKLIGHT_SAHARA is not set
-# CONFIG_BACKLIGHT_GENERIC is not set
 
 CONFIG_LCD_CLASS_DEVICE=m
 CONFIG_LCD_PLATFORM=m
@@ -3708,7 +3708,6 @@
 CONFIG_CFAG12864B_RATE=20
 
 # CONFIG_PHANTOM is not set
-CONFIG_EEPROM_93CX6=m
 
 CONFIG_POWER_SUPPLY=m
 # CONFIG_POWER_SUPPLY_DEBUG is not set


Index: config-x86-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-x86-generic,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- config-x86-generic	29 Jan 2009 22:00:11 -0000	1.62
+++ config-x86-generic	30 Jan 2009 00:08:01 -0000	1.63
@@ -376,7 +376,6 @@
 # CONFIG_CPU_IDLE_GOV_LADDER is not set
 CONFIG_CPU_IDLE_GOV_MENU=y
 
-
 CONFIG_THINKPAD_ACPI=m
 # CONFIG_THINKPAD_ACPI_DEBUG is not set
 # CONFIG_THINKPAD_ACPI_DEBUGFACILITIES is not set


Index: config-x86_64-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-x86_64-generic,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- config-x86_64-generic	29 Jan 2009 22:00:11 -0000	1.65
+++ config-x86_64-generic	30 Jan 2009 00:08:01 -0000	1.66
@@ -111,8 +111,6 @@
 CONFIG_ACER_WMI=m
 CONFIG_HP_WMI=m
 
-
-
 CONFIG_THINKPAD_ACPI=m
 # CONFIG_THINKPAD_ACPI_DEBUG is not set
 # CONFIG_THINKPAD_ACPI_DEBUGFACILITIES is not set


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1247
retrieving revision 1.1248
diff -u -r1.1247 -r1.1248
--- kernel.spec	29 Jan 2009 22:00:11 -0000	1.1247
+++ kernel.spec	30 Jan 2009 00:08:01 -0000	1.1248
@@ -1784,6 +1784,10 @@
 
 %changelog
 * Thu Jan 29 2009 Chuck Ebbert <cebbert at redhat.com>
+- Clean up EEPROM config.
+- Disable CONFIG_DEBUG_NOTIFIERS release kernel.
+
+* Thu Jan 29 2009 Chuck Ebbert <cebbert at redhat.com>
 - Clean up config files a bit.
 
 * Thu Jan 29 2009 Mark McLoughlin <markmc at redhat.com>



From mclasen at fedoraproject.org  Fri Jan 30 00:23:28 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Fri, 30 Jan 2009 00:23:28 +0000 (UTC)
Subject: rpms/gtk2/devel gtk2.spec,1.352,1.353
Message-ID: <20090130002328.0631170117@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gtk2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10780

Modified Files:
	gtk2.spec 
Log Message:
Split of immodules subpackage



Index: gtk2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtk2/devel/gtk2.spec,v
retrieving revision 1.352
retrieving revision 1.353
diff -u -r1.352 -r1.353
--- gtk2.spec	28 Jan 2009 14:46:27 -0000	1.352
+++ gtk2.spec	30 Jan 2009 00:22:57 -0000	1.353
@@ -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.15/gtk+-%{version}.tar.bz2
@@ -87,6 +87,16 @@
 projects ranging from small one-off tools to complete application
 suites.
 
+%package immodules
+Summary: Input methods for GTK+ 
+Group: System Environment/Libraries
+Requires: gtk2 = %{version}-%{release}
+
+%description immodules
+The gtk2-immodules package contains input methods that are shipped as part 
+of GTK+. 
+
+
 %package devel
 Summary: Development files for GTK+
 Group: Development/Libraries
@@ -254,6 +264,10 @@
 
 %postun -p /sbin/ldconfig
 
+%post immodules
+/usr/bin/update-gtk-immodules %{_host}
+
+
 %files -f gtk20.lang
 %defattr(-, root, root)
 
@@ -269,15 +283,25 @@
 %{_libdir}/libgdk_pixbuf_xlib-2.0.so.*
 %{_libdir}/libgailutil.so.*
 %dir %{_libdir}/gtk-2.0
-%{_libdir}/gtk-2.0/%{bin_version}
-%{_libdir}/gtk-2.0/immodules
+%dir %{_libdir}/gtk-2.0/%{bin_version}
+%{_libdir}/gtk-2.0/%{bin_version}/engines
+%{_libdir}/gtk-2.0/%{bin_version}/filesystems
+%dir %{_libdir}/gtk-2.0/%{bin_version}/immodules
+%{_libdir}/gtk-2.0/%{bin_version}/loaders
+%{_libdir}/gtk-2.0/%{bin_version}/printbackends
 %{_libdir}/gtk-2.0/modules
+%{_libdir}/gtk-2.0/immodules
 %{_datadir}/themes/Default
 %{_datadir}/themes/Emacs
 %{_datadir}/themes/Raleigh
 %dir %{_sysconfdir}/gtk-2.0
+
+%files immodules
+%defattr(-, root, root)
+%{_libdir}/gtk-2.0/%{bin_version}/immodules/*.so
 %config(noreplace) %{_sysconfdir}/gtk-2.0/im-multipress.conf
 
+
 %files devel -f gtk20-properties.lang
 %defattr(-, root, root)
 
@@ -297,6 +321,9 @@
 %{_datadir}/gtk-2.0
 
 %changelog
+* Thu Jan 29 2009 Matthias Clasen <mclasen at redhat.com> - 2.15.2-4
+- Split of an immodules subpackage (#444814)
+
 * Wed Jan 28 2009 Marek Kasik <mkasik at redhat.com> - 2.15.2-3
 - modify default_printer.patch to show a network default printer
   in the case of no local default printer



From cebbert at fedoraproject.org  Fri Jan 30 00:25:18 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Fri, 30 Jan 2009 00:25:18 +0000 (UTC)
Subject: rpms/kernel/F-10 linux-2.6-kvmclock-unsync-tsc-workaround.patch,
	NONE, 1.1 config-generic, 1.209, 1.210 kernel.spec, 1.1233,
	1.1234 linux-2.6-at76.patch, 1.12,
	1.13 linux-2.6-compile-fixes.patch, 1.179,
	1.180 linux-2.6-firewire-git-pending.patch, 1.34,
	1.35 linux-2.6-firewire-git-update.patch, 1.18,
	1.19 linux-2.6.27-ext-dir-corruption-fix.patch, 1.3,
	NONE linux-2.6.27-ext4-2.6.28-backport-fixups.patch, 1.3,
	NONE linux-2.6.27-ext4-2.6.28-rc3-git6.patch, 1.3, NONE
Message-ID: <20090130002518.3BB2870117@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11167

Modified Files:
	config-generic kernel.spec linux-2.6-at76.patch 
	linux-2.6-compile-fixes.patch 
	linux-2.6-firewire-git-pending.patch 
	linux-2.6-firewire-git-update.patch 
Added Files:
	linux-2.6-kvmclock-unsync-tsc-workaround.patch 
Removed Files:
	linux-2.6.27-ext-dir-corruption-fix.patch 
	linux-2.6.27-ext4-2.6.28-backport-fixups.patch 
	linux-2.6.27-ext4-2.6.28-rc3-git6.patch 
Log Message:
Copy firewire updates, at76 driver, a compile fix and a KVM clock fix from rawhide.
Temporarily disable CONFIG_DRM_RADEON_KMS

linux-2.6-kvmclock-unsync-tsc-workaround.patch:

--- NEW FILE linux-2.6-kvmclock-unsync-tsc-workaround.patch ---
>From 05d073827d82d7fa29aff7a35279650b8feb6f75 Mon Sep 17 00:00:00 2001
From: Glauber Costa <glommer at redhat.com>
Date: Thu, 29 Jan 2009 12:39:22 -0500
Subject: [PATCH] Disable kvmclock for non constant tsc cpus.

Currently, this code path is posing us big troubles,
and we won't have a decent patch in time. So, temporarily
disable it.

See:

  https://bugzilla.redhat.com/475598

There's a module parameter for the adventurous who want to force
it.

Signed-off-by: Glauber Costa <glommer at redhat.com>
Signed-off-by: Marcelo Tosatti <mtosatti at redhat.com>
---
 arch/x86/kvm/x86.c |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index cc17546..2e22ac9 100644
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -957,6 +957,9 @@ out:
 	return r;
 }
 
+static int force_kvmclock = 0;
+module_param(force_kvmclock, bool, 0644);
+
 int kvm_dev_ioctl_check_extension(long ext)
 {
 	int r;
@@ -967,7 +970,6 @@ int kvm_dev_ioctl_check_extension(long ext)
 	case KVM_CAP_MMU_SHADOW_CACHE_CONTROL:
 	case KVM_CAP_SET_TSS_ADDR:
 	case KVM_CAP_EXT_CPUID:
-	case KVM_CAP_CLOCKSOURCE:
 	case KVM_CAP_PIT:
 	case KVM_CAP_NOP_IO_DELAY:
 	case KVM_CAP_MP_STATE:
@@ -992,6 +994,9 @@ int kvm_dev_ioctl_check_extension(long ext)
 	case KVM_CAP_IOMMU:
 		r = iommu_found();
 		break;
+	case KVM_CAP_CLOCKSOURCE:
+		r = force_kvmclock || boot_cpu_has(X86_FEATURE_CONSTANT_TSC);
+		break;
 	default:
 		r = 0;
 		break;
-- 
1.6.1



Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/config-generic,v
retrieving revision 1.209
retrieving revision 1.210
diff -u -r1.209 -r1.210
--- config-generic	29 Jan 2009 23:52:22 -0000	1.209
+++ config-generic	30 Jan 2009 00:24:47 -0000	1.210
@@ -2159,7 +2159,7 @@
 CONFIG_DRM_TDFX=m
 CONFIG_DRM_R128=m
 CONFIG_DRM_RADEON=m
-CONFIG_DRM_RADEON_KMS=y
+# CONFIG_DRM_RADEON_KMS is not set
 CONFIG_DRM_I810=m
 CONFIG_DRM_I830=m
 CONFIG_DRM_MGA=m


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/kernel.spec,v
retrieving revision 1.1233
retrieving revision 1.1234
diff -u -r1.1233 -r1.1234
--- kernel.spec	29 Jan 2009 23:52:22 -0000	1.1233
+++ kernel.spec	30 Jan 2009 00:24:47 -0000	1.1234
@@ -653,6 +653,9 @@
 # Fix DEBUG_SHIRQ problem in tulip driver.  (454575)
 Patch2030: linux-2.6-net-tulip-interrupt.patch
 
+# kvmclock is broken with unsync TSC (#475598)
+Patch2040: linux-2.6-kvmclock-unsync-tsc-workaround.patch
+
 # olpc fixes
 
 # linux1394 git patches
@@ -1152,12 +1155,14 @@
 
 ApplyPatch linux-2.6-net-tulip-interrupt.patch
 
+ApplyPatch linux-2.6-kvmclock-unsync-tsc-workaround.patch
+
 # Nouveau DRM + drm fixes
 ApplyPatch drm-modesetting-radeon.patch
 ApplyPatch drm-nouveau.patch
 
 # linux1394 git patches
-#ApplyPatch linux-2.6-firewire-git-update.patch
+ApplyPatch linux-2.6-firewire-git-update.patch
 C=$(wc -l $RPM_SOURCE_DIR/linux-2.6-firewire-git-pending.patch | awk '{print $1}')
 if [ "$C" -gt 10 ]; then
 ApplyPatch linux-2.6-firewire-git-pending.patch
@@ -1742,6 +1747,10 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Thu Jan 29 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.29-0.4.rc3
+- Copy firewire updates, at76 driver, a compile fix and a KVM clock fix from rawhide.
+- Temporarily disable CONFIG_DRM_RADEON_KMS
+
 * Thu Jan 29 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.29-0.3.rc3
 - Update configs for 2.6.29-rc3
 

linux-2.6-at76.patch:

Index: linux-2.6-at76.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/linux-2.6-at76.patch,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- linux-2.6-at76.patch	1 Aug 2008 15:43:56 -0000	1.12
+++ linux-2.6-at76.patch	30 Jan 2009 00:24:47 -0000	1.13
@@ -3951,7 +3951,7 @@
 +
 +	if (!priv)
 +		return;
-+	warn("%s: tx timeout.", netdev->name);
++	printk(KERN_WARNING "%s: tx timeout.\n", netdev->name);
 +
 +	usb_unlink_urb(priv->tx_urb);
 +	priv->stats.tx_errors++;

linux-2.6-compile-fixes.patch:

Index: linux-2.6-compile-fixes.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/linux-2.6-compile-fixes.patch,v
retrieving revision 1.179
retrieving revision 1.180
diff -u -r1.179 -r1.180
--- linux-2.6-compile-fixes.patch	12 Jan 2009 19:51:28 -0000	1.179
+++ linux-2.6-compile-fixes.patch	30 Jan 2009 00:24:47 -0000	1.180
@@ -23,3 +23,55 @@
  static struct fsl_lbc_regs __iomem *fsl_lbc_regs;
  
  static char __initdata *compat_lbc[] = {
+From:	Kumar Gala <galak at kernel.crashing.org>
+Subject: [PATCH] sata_sil: Fix build breakage
+Date:	Tue, 27 Jan 2009 23:02:02 -0600
+
+The following commit introduces:
+
+commit e57db7bde7bff95ae812736ca00c73bd5271455b
+Author: Rafael J. Wysocki <rjw at sisk.pl>
+Date:   Mon Jan 19 20:58:29 2009 +0100
+
+    SATA Sil: Blacklist system that spins off disks during ACPI power off
+
+the following build errors on non-x86 systems:
+
+drivers/ata/sata_sil.c: In function 'sil_broken_system_poweroff':
+drivers/ata/sata_sil.c:713: error: implicit declaration of function 'dmi_first_match'
+drivers/ata/sata_sil.c:713: warning: initialization makes pointer from integer without a cast
+
+Signed-off-by: Kumar Gala <galak at kernel.crashing.org>
+---
+ drivers/ata/sata_sil.c |    2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+diff --git a/drivers/ata/sata_sil.c b/drivers/ata/sata_sil.c
+index bfd55b0..3f0549d 100644
+--- a/drivers/ata/sata_sil.c
++++ b/drivers/ata/sata_sil.c
+@@ -697,6 +697,7 @@ static void sil_init_controller(struct ata_host *host)
+ 
+ static bool sil_broken_system_poweroff(struct pci_dev *pdev)
+ {
++#ifdef CONFIG_DMI
+ 	static const struct dmi_system_id broken_systems[] = {
+ 		{
+ 			.ident = "HP Compaq nx6325",
+@@ -717,6 +718,7 @@ static bool sil_broken_system_poweroff(struct pci_dev *pdev)
+ 		/* apply the quirk only to on-board controllers */
+ 		return slot == PCI_SLOT(pdev->devfn);
+ 	}
++#endif
+ 
+ 	return false;
+ }
+-- 
+1.5.6.6
+
+--
+To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
+the body of a message to majordomo at vger.kernel.org
+More majordomo info at  http://vger.kernel.org/majordomo-info.html
+Please read the FAQ at  http://www.tux.org/lkml/
+

linux-2.6-firewire-git-pending.patch:

Index: linux-2.6-firewire-git-pending.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/linux-2.6-firewire-git-pending.patch,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- linux-2.6-firewire-git-pending.patch	12 Jan 2009 19:51:29 -0000	1.34
+++ linux-2.6-firewire-git-pending.patch	30 Jan 2009 00:24:47 -0000	1.35
@@ -3,3 +3,392 @@
 # tree (and/or in by the time your read this), which we want...
 #
 
+Date: Sat, 24 Jan 2009 19:42:21 +0100 (CET)
+From: Stefan Richter <stefanr at s5r6.in-berlin.de>
+Subject: [PATCH 1/7] firewire: sbp2: fix payload limit at S1600 and S3200
+To: linux1394-devel at lists.sourceforge.net
+Cc: linux-kernel at vger.kernel.org
+
+1394-2008 clause 16.3.4.1 (1394b-2002 clause 16.3.1.1) defines tighter
+limits than 1394-2008 clause 6.2.2.3 (1394a-2000 clause 6.2.2.3).
+
+Our previously too large limit doesn't matter though if the controller
+reports its max_receive correctly.
+
+Signed-off-by: Stefan Richter <stefanr at s5r6.in-berlin.de>
+---
+ drivers/firewire/fw-sbp2.c |   23 ++++++++++++-----------
+ 1 file changed, 12 insertions(+), 11 deletions(-)
+
+Index: linux/drivers/firewire/fw-sbp2.c
+===================================================================
+--- linux.orig/drivers/firewire/fw-sbp2.c
++++ linux/drivers/firewire/fw-sbp2.c
+@@ -168,6 +168,7 @@ struct sbp2_target {
+ 	int address_high;
+ 	unsigned int workarounds;
+ 	unsigned int mgt_orb_timeout;
++	unsigned int max_payload;
+ 
+ 	int dont_block;	/* counter for each logical unit */
+ 	int blocked;	/* ditto */
+@@ -1150,6 +1151,15 @@ static int sbp2_probe(struct device *dev
+ 
+ 	sbp2_init_workarounds(tgt, model, firmware_revision);
+ 
++	/*
++	 * At S100 we can do 512 bytes per packet, at S200 1024 bytes,
++	 * and so on up to 4096 bytes.  The SBP-2 max_payload field
++	 * specifies the max payload size as 2 ^ (max_payload + 2), so
++	 * if we set this to max_speed + 7, we get the right value.
++	 */
++	tgt->max_payload = min(device->max_speed + 7, 10U);
++	tgt->max_payload = min(tgt->max_payload, device->card->max_receive - 1);
++
+ 	/* Do the login in a workqueue so we can easily reschedule retries. */
+ 	list_for_each_entry(lu, &tgt->lu_list, link)
+ 		sbp2_queue_work(lu, DIV_ROUND_UP(HZ, 5));
+@@ -1426,7 +1436,6 @@ static int sbp2_scsi_queuecommand(struct
+ 	struct sbp2_logical_unit *lu = cmd->device->hostdata;
+ 	struct fw_device *device = fw_device(lu->tgt->unit->device.parent);
+ 	struct sbp2_command_orb *orb;
+-	unsigned int max_payload;
+ 	int generation, retval = SCSI_MLQUEUE_HOST_BUSY;
+ 
+ 	/*
+@@ -1454,17 +1463,9 @@ static int sbp2_scsi_queuecommand(struct
+ 	orb->done = done;
+ 	orb->cmd  = cmd;
+ 
+-	orb->request.next.high   = cpu_to_be32(SBP2_ORB_NULL);
+-	/*
+-	 * At speed 100 we can do 512 bytes per packet, at speed 200,
+-	 * 1024 bytes per packet etc.  The SBP-2 max_payload field
+-	 * specifies the max payload size as 2 ^ (max_payload + 2), so
+-	 * if we set this to max_speed + 7, we get the right value.
+-	 */
+-	max_payload = min(device->max_speed + 7,
+-			  device->card->max_receive - 1);
++	orb->request.next.high = cpu_to_be32(SBP2_ORB_NULL);
+ 	orb->request.misc = cpu_to_be32(
+-		COMMAND_ORB_MAX_PAYLOAD(max_payload) |
++		COMMAND_ORB_MAX_PAYLOAD(lu->tgt->max_payload) |
+ 		COMMAND_ORB_SPEED(device->max_speed) |
+ 		COMMAND_ORB_NOTIFY);
+ 
+
+-- 
+Stefan Richter
+-=====-==--= ---= ==---
+http://arcgraph.de/sr/
+
+
+
+Date: Sat, 24 Jan 2009 19:42:47 +0100 (CET)
+From: Stefan Richter <stefanr at s5r6.in-berlin.de>
+Subject: [PATCH 2/7] firewire: sbp2: define some magic numbers as macros
+To: linux1394-devel at lists.sourceforge.net
+Cc: linux-kernel at vger.kernel.org
+
+Signed-off-by: Stefan Richter <stefanr at s5r6.in-berlin.de>
+---
+ drivers/firewire/fw-sbp2.c |   23 ++++++++++++-----------
+ 1 file changed, 12 insertions(+), 11 deletions(-)
+
+Index: linux/drivers/firewire/fw-sbp2.c
+===================================================================
+--- linux.orig/drivers/firewire/fw-sbp2.c
++++ linux/drivers/firewire/fw-sbp2.c
+@@ -311,14 +311,16 @@ struct sbp2_command_orb {
+ 	dma_addr_t page_table_bus;
+ };
+ 
++#define SBP2_ROM_VALUE_WILDCARD ~0         /* match all */
++#define SBP2_ROM_VALUE_MISSING  0xff000000 /* not present in the unit dir. */
++
+ /*
+  * List of devices with known bugs.
+  *
+  * The firmware_revision field, masked with 0xffff00, is the best
+  * indicator for the type of bridge chip of a device.  It yields a few
+  * false positives but this did not break correctly behaving devices
+- * so far.  We use ~0 as a wildcard, since the 24 bit values we get
+- * from the config rom can never match that.
++ * so far.
+  */
+ static const struct {
+ 	u32 firmware_revision;
+@@ -340,22 +342,22 @@ static const struct {
+ 	},
+ 	/* Initio bridges, actually only needed for some older ones */ {
+ 		.firmware_revision	= 0x000200,
+-		.model			= ~0,
++		.model			= SBP2_ROM_VALUE_WILDCARD,
+ 		.workarounds		= SBP2_WORKAROUND_INQUIRY_36,
+ 	},
+ 	/* PL-3507 bridge with Prolific firmware */ {
+ 		.firmware_revision	= 0x012800,
+-		.model			= ~0,
++		.model			= SBP2_ROM_VALUE_WILDCARD,
+ 		.workarounds		= SBP2_WORKAROUND_POWER_CONDITION,
+ 	},
+ 	/* Symbios bridge */ {
+ 		.firmware_revision	= 0xa0b800,
+-		.model			= ~0,
++		.model			= SBP2_ROM_VALUE_WILDCARD,
+ 		.workarounds		= SBP2_WORKAROUND_128K_MAX_TRANS,
+ 	},
+ 	/* Datafab MD2-FW2 with Symbios/LSILogic SYM13FW500 bridge */ {
+ 		.firmware_revision	= 0x002600,
+-		.model			= ~0,
++		.model			= SBP2_ROM_VALUE_WILDCARD,
+ 		.workarounds		= SBP2_WORKAROUND_128K_MAX_TRANS,
+ 	},
+ 
+@@ -1087,7 +1089,7 @@ static void sbp2_init_workarounds(struct
+ 			continue;
+ 
+ 		if (sbp2_workarounds_table[i].model != model &&
+-		    sbp2_workarounds_table[i].model != ~0)
++		    sbp2_workarounds_table[i].model != SBP2_ROM_VALUE_WILDCARD)
+ 			continue;
+ 
+ 		w |= sbp2_workarounds_table[i].workarounds;
+@@ -1137,14 +1139,13 @@ static int sbp2_probe(struct device *dev
+ 	fw_device_get(device);
+ 	fw_unit_get(unit);
+ 
+-	/* Initialize to values that won't match anything in our table. */
+-	firmware_revision = 0xff000000;
+-	model = 0xff000000;
+-
+ 	/* implicit directory ID */
+ 	tgt->directory_id = ((unit->directory - device->config_rom) * 4
+ 			     + CSR_CONFIG_ROM) & 0xffffff;
+ 
++	firmware_revision = SBP2_ROM_VALUE_MISSING;
++	model		  = SBP2_ROM_VALUE_MISSING;
++
+ 	if (sbp2_scan_unit_dir(tgt, unit->directory, &model,
+ 			       &firmware_revision) < 0)
+ 		goto fail_tgt_put;
+
+-- 
+Stefan Richter
+-=====-==--= ---= ==---
+http://arcgraph.de/sr/
+
+
+
+Date: Sat, 24 Jan 2009 19:41:46 +0100 (CET)
+From: Stefan Richter <stefanr at s5r6.in-berlin.de>
+Subject: firewire: sbp2: add workarounds for 2nd and 3rd generation iPods
+
+According to https://bugs.launchpad.net/bugs/294391
+  - 3rd generation iPods need the "fix capacity" workaround after all
+    (apparently they crash after the last sector was accessed),
+  - 2nd generation iPods need the "128 kB maximum request size"
+    workaround.
+
+Furthermore, Kristian H??gsberg mentioned that 2nd generation iPods
+treat page tables (scatter-gather lists) as data buffers, i.e. ignore
+the page_table_present bit of command block ORBs.  If this is true, then
+the 128 kB limit is not a sufficient workaround; instead we have to
+guarantee that all requests have only a single s/g element.  This could
+be up to 64 kByte - 4 Bytes in size.  But I expect the block layer to
+typically emit much smaller elements than that, alas.
+
+Alas both iPod generations feature the same model ID in the config ROM,
+hence we can only define a shared quirks list entry for them.  This is
+bad since
+  - the "fix capacity" workaround prevents access to the very last
+    sector if a device does not actually have this bug,
+  - the "no page tables" workaround dramatically reduces throughput,
+    e.g. from 25 to 9 MB/s without gap count optimization, and from 36
+    11 MB/s with gap count optimization (as per hdparm with a regular
+    3.5" S400 disk on an i686 PC without IOMMU).  Whether this matters
+    with the already slow iPod disk is not yet known.
+
+This patch needs testing by somebody who has the hardware:
+  - Do 2nd and 3rd gen. iPods actually have a model_id == 0, or do they
+    have in fact no model_id at all?
+  - Does the "fix capacity" workaround harm usage of 2nd gen. iPods?
+  - Is the "no page tables" workaround really necessary for 2nd gen.
+    iPods, or is the 128k limit sufficient as reported for the Ubuntu
+    8.10 kernel?
+  - How badly does the "no page tables" workaround affect throughput of
+    3rd gen. iPods which don't need it?
+
+A side note:  Apple computers in target mode (or at least an x86 Mac
+mini) don't have firmware_version and model_id, hence none of the iPod
+quirks list entries is active for them.
+
+Signed-off-by: Stefan Richter <stefanr at s5r6.in-berlin.de>
+---
+ drivers/firewire/fw-sbp2.c |   27 +++++++++++++++++++--------
+ 1 file changed, 19 insertions(+), 8 deletions(-)
+
+Index: linux/drivers/firewire/fw-sbp2.c
+===================================================================
+--- linux.orig/drivers/firewire/fw-sbp2.c
++++ linux/drivers/firewire/fw-sbp2.c
+@@ -92,6 +92,10 @@ MODULE_PARM_DESC(exclusive_login, "Exclu
+  *   sd_mod on suspend, resume, and shutdown (if manage_start_stop is on).
+  *   Some disks need this to spin down or to resume properly.
+  *
++ * - no page tables
++ *   Limit data buffers to a single scatter/ gather element for buggy devices
++ *   which ignore the page_table_present bit in command block ORBs.
++ *
+  * - override internal blacklist
+  *   Instead of adding to the built-in blacklist, use only the workarounds
+  *   specified in the module load parameter.
+@@ -104,6 +108,7 @@ MODULE_PARM_DESC(exclusive_login, "Exclu
+ #define SBP2_WORKAROUND_DELAY_INQUIRY	0x10
+ #define SBP2_INQUIRY_DELAY		12
+ #define SBP2_WORKAROUND_POWER_CONDITION	0x20
++#define SBP2_WORKAROUND_NO_PAGE_TABLES	0x40
+ #define SBP2_WORKAROUND_OVERRIDE	0x100
+ 
+ static int sbp2_param_workarounds;
+@@ -116,6 +121,7 @@ MODULE_PARM_DESC(workarounds, "Work arou
+ 	", delay inquiry = "      __stringify(SBP2_WORKAROUND_DELAY_INQUIRY)
+ 	", set power condition in start stop unit = "
+ 				  __stringify(SBP2_WORKAROUND_POWER_CONDITION)
++	", no page tables = "     __stringify(SBP2_WORKAROUND_NO_PAGE_TABLES)
+ 	", override internal blacklist = " __stringify(SBP2_WORKAROUND_OVERRIDE)
+ 	", or a combination)");
+ 
+@@ -325,7 +331,7 @@ struct sbp2_command_orb {
+ static const struct {
+ 	u32 firmware_revision;
+ 	u32 model;
+-	unsigned int workarounds;
++	unsigned workarounds;
+ } sbp2_workarounds_table[] = {
+ 	/* DViCO Momobay CX-1 with TSB42AA9 bridge */ {
+ 		.firmware_revision	= 0x002800,
+@@ -360,15 +366,17 @@ static const struct {
+ 		.model			= SBP2_ROM_VALUE_WILDCARD,
+ 		.workarounds		= SBP2_WORKAROUND_128K_MAX_TRANS,
+ 	},
+-
+ 	/*
+-	 * There are iPods (2nd gen, 3rd gen) with model_id == 0, but
+-	 * these iPods do not feature the read_capacity bug according
+-	 * to one report.  Read_capacity behaviour as well as model_id
+-	 * could change due to Apple-supplied firmware updates though.
++	 * iPod 2nd generation: needs 128k max transfer workaround
++	 * iPod 3rd generation: needs fix-capacity workaround
+ 	 */
+-
+-	/* iPod 4th generation. */ {
++	{
++		.firmware_revision	= 0x0a2700,
++		.model			= 0x000000,
++		.workarounds		= SBP2_WORKAROUND_128K_MAX_TRANS |
++					  SBP2_WORKAROUND_FIX_CAPACITY,
++	},
++	/* iPod 4th generation */ {
+ 		.firmware_revision	= 0x0a2700,
+ 		.model			= 0x000021,
+ 		.workarounds		= SBP2_WORKAROUND_FIX_CAPACITY,
+@@ -1540,6 +1548,9 @@ static int sbp2_scsi_slave_configure(str
+ 	if (lu->tgt->workarounds & SBP2_WORKAROUND_128K_MAX_TRANS)
+ 		blk_queue_max_sectors(sdev->request_queue, 128 * 1024 / 512);
+ 
++	if (lu->tgt->workarounds & SBP2_WORKAROUND_NO_PAGE_TABLES)
++		blk_queue_max_hw_segments(sdev->request_queue, 1);
++
+ 	blk_queue_max_segment_size(sdev->request_queue, SBP2_MAX_SEG_SIZE);
+ 
+ 	return 0;
+Date: Wed, 28 Jan 2009 01:03:34 +0100 (CET)
+From: Stefan Richter <stefanr at s5r6.in-berlin.de>
+Subject: Re: swiotlb default size (64 MB) too small?
+To: FUJITA Tomonori <fujita.tomonori at lab.ntt.co.jp>
+Cc: linux1394-devel at lists.sourceforge.net,
+ linux-kernel at vger.kernel.org,
+ linux-scsi at vger.kernel.org
+
+> FUJITA Tomonori wrote:
+>> On Tue, 27 Jan 2009 18:03:40 +0100 (CET)
+>> Stefan Richter <stefanr at s5r6.in-berlin.de> wrote:
+>>> +	if (orb->page_table_bus)
+>>> +		dma_unmap_single(card_device, orb->page_table_bus,
+>>> +				 sizeof(orb->page_table), DMA_TO_DEVICE);
+>> 
+>> Well, this does not look correct since zero can be a valid dma
+>> address.
+
+
+From: Stefan Richter <stefanr at s5r6.in-berlin.de>
+Subject: firewire: sbp2: fix DMA mapping leak on the failure path
+
+Reported-by: FUJITA Tomonori <fujita.tomonori at lab.ntt.co.jp>
+who also provided a first version of the fix.
+
+Signed-off-by: Stefan Richter <stefanr at s5r6.in-berlin.de>
+---
+ drivers/firewire/fw-sbp2.c |   27 +++++++++++++++++----------
+ 1 file changed, 17 insertions(+), 10 deletions(-)
+
+Index: linux/drivers/firewire/fw-sbp2.c
+===================================================================
+--- linux.orig/drivers/firewire/fw-sbp2.c
++++ linux/drivers/firewire/fw-sbp2.c
+@@ -1323,6 +1323,19 @@ static unsigned int sbp2_status_to_sense
+ 	}
+ }
+ 
++static void sbp2_unmap_scatterlist(struct device *card_device,
++				   struct sbp2_command_orb *orb)
++{
++	if (scsi_sg_count(orb->cmd))
++		dma_unmap_sg(card_device, scsi_sglist(orb->cmd),
++			     scsi_sg_count(orb->cmd),
++			     orb->cmd->sc_data_direction);
++
++	if (orb->request.misc & cpu_to_be32(COMMAND_ORB_PAGE_TABLE_PRESENT))
++		dma_unmap_single(card_device, orb->page_table_bus,
++				 sizeof(orb->page_table), DMA_TO_DEVICE);
++}
++
+ static void complete_command_orb(struct sbp2_orb *base_orb,
+ 				 struct sbp2_status *status)
+ {
+@@ -1364,15 +1377,7 @@ static void complete_command_orb(struct 
+ 
+ 	dma_unmap_single(device->card->device, orb->base.request_bus,
+ 			 sizeof(orb->request), DMA_TO_DEVICE);
+-
+-	if (scsi_sg_count(orb->cmd) > 0)
+-		dma_unmap_sg(device->card->device, scsi_sglist(orb->cmd),
+-			     scsi_sg_count(orb->cmd),
+-			     orb->cmd->sc_data_direction);
+-
+-	if (orb->page_table_bus != 0)
+-		dma_unmap_single(device->card->device, orb->page_table_bus,
+-				 sizeof(orb->page_table), DMA_TO_DEVICE);
++	sbp2_unmap_scatterlist(device->card->device, orb);
+ 
+ 	orb->cmd->result = result;
+ 	orb->done(orb->cmd);
+@@ -1493,8 +1498,10 @@ static int sbp2_scsi_queuecommand(struct
+ 	orb->base.request_bus =
+ 		dma_map_single(device->card->device, &orb->request,
+ 			       sizeof(orb->request), DMA_TO_DEVICE);
+-	if (dma_mapping_error(device->card->device, orb->base.request_bus))
++	if (dma_mapping_error(device->card->device, orb->base.request_bus)) {
++		sbp2_unmap_scatterlist(device->card->device, orb);
+ 		goto out;
++	}
+ 
+ 	sbp2_send_orb(&orb->base, lu, lu->tgt->node_id, generation,
+ 		      lu->command_block_agent_address + SBP2_ORB_POINTER);
+
+-- 
+Stefan Richter
+-=====-==--= ---= ===--
+http://arcgraph.de/sr/
+

linux-2.6-firewire-git-update.patch:

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.18 -r 1.19 linux-2.6-firewire-git-update.patch
Index: linux-2.6-firewire-git-update.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/linux-2.6-firewire-git-update.patch,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- linux-2.6-firewire-git-update.patch	29 Oct 2008 15:32:05 -0000	1.18
+++ linux-2.6-firewire-git-update.patch	30 Jan 2009 00:24:47 -0000	1.19
@@ -1,77 +1,86 @@
-Git diff in linux1394-2.6-git at commit 3346610742cdef8b1670d090008aca0911e95880
-vs. tag v2.6.27, on 2008-10-29.
+git diff -p --stat v2.6.29-rc2 -- drivers/firewire/ include/linux/ in
+linux1394-2.6.git, done on 20090126 by Jarod.
 
 ---
-
- drivers/firewire/fw-card.c         |   58 ++------
- drivers/firewire/fw-cdev.c         |   42 +++---
- drivers/firewire/fw-device.c       |   40 ++----
- drivers/firewire/fw-device.h       |    4 +
- drivers/firewire/fw-ohci.c         |  123 ++++++++++------
- drivers/firewire/fw-sbp2.c         |  154 +++++++++-----------
- drivers/firewire/fw-topology.c     |   18 ++-
- drivers/firewire/fw-transaction.c  |   48 ++++++-
- drivers/firewire/fw-transaction.h  |   20 ++-
- drivers/ieee1394/csr1212.c         |    2 +-
- drivers/ieee1394/dv1394.c          |    2 +-
- drivers/ieee1394/eth1394.c         |    2 +-
- drivers/ieee1394/nodemgr.c         |  279 ++++++++++++++----------------------
- drivers/ieee1394/nodemgr.h         |    2 +-
- drivers/ieee1394/raw1394-private.h |    1 +
- drivers/ieee1394/raw1394.c         |  230 ++++++++++++++++-------------
- drivers/ieee1394/sbp2.c            |  218 ++++++++++++----------------
- drivers/ieee1394/sbp2.h            |   33 ++---
- drivers/ieee1394/video1394.c       |    8 +-
- include/linux/firewire-cdev.h      |    9 +-
- 20 files changed, 622 insertions(+), 671 deletions(-)
+ drivers/firewire/fw-card.c        |   70 +--
+ drivers/firewire/fw-cdev.c        | 1006 +++++++++++++++++++++++++------------
+ drivers/firewire/fw-device.c      |  164 +++++--
+ drivers/firewire/fw-device.h      |    8 +-
+ drivers/firewire/fw-iso.c         |  225 +++++++--
+ drivers/firewire/fw-ohci.c        |  242 +++++-----
+ drivers/firewire/fw-sbp2.c        |   57 +--
+ drivers/firewire/fw-topology.c    |   40 +-
+ drivers/firewire/fw-topology.h    |   19 +-
+ drivers/firewire/fw-transaction.c |  151 +++----
+ drivers/firewire/fw-transaction.h |  136 ++----
+ include/linux/firewire-cdev.h     |  170 ++++++-
+ 12 files changed, 1481 insertions(+), 807 deletions(-)
 
 diff --git a/drivers/firewire/fw-card.c b/drivers/firewire/fw-card.c
-index bbd73a4..94cf070 100644
+index 6bd91a1..bed7994 100644
 --- a/drivers/firewire/fw-card.c
 +++ b/drivers/firewire/fw-card.c
-@@ -189,39 +189,16 @@ static const char gap_count_table[] = {
+@@ -63,8 +63,7 @@ static int descriptor_count;
+ #define BIB_CMC			((1) << 30)
+ #define BIB_IMC			((1) << 31)
+ 
+-static u32 *
+-generate_config_rom(struct fw_card *card, size_t *config_rom_length)
++static u32 *generate_config_rom(struct fw_card *card, size_t *config_rom_length)
+ {
+ 	struct fw_descriptor *desc;
+ 	static u32 config_rom[256];
+@@ -128,8 +127,7 @@ generate_config_rom(struct fw_card *card, size_t *config_rom_length)
+ 	return config_rom;
+ }
+ 
+-static void
+-update_config_roms(void)
++static void update_config_roms(void)
+ {
+ 	struct fw_card *card;
+ 	u32 *config_rom;
+@@ -141,8 +139,7 @@ update_config_roms(void)
+ 	}
+ }
+ 
+-int
+-fw_core_add_descriptor(struct fw_descriptor *desc)
++int fw_core_add_descriptor(struct fw_descriptor *desc)
+ {
+ 	size_t i;
+ 
+@@ -171,8 +168,7 @@ fw_core_add_descriptor(struct fw_descriptor *desc)
+ 	return 0;
+ }
+ 
+-void
+-fw_core_remove_descriptor(struct fw_descriptor *desc)
++void fw_core_remove_descriptor(struct fw_descriptor *desc)
+ {
+ 	mutex_lock(&card_mutex);
+ 
+@@ -189,8 +185,7 @@ static const char gap_count_table[] = {
  	63, 5, 7, 8, 10, 13, 16, 18, 21, 24, 26, 29, 32, 35, 37, 40
  };
  
--struct bm_data {
--	struct fw_transaction t;
--	struct {
--		__be32 arg;
--		__be32 data;
--	} lock;
--	u32 old;
--	int rcode;
--	struct completion done;
--};
--
+-void
+-fw_schedule_bm_work(struct fw_card *card, unsigned long delay)
++void fw_schedule_bm_work(struct fw_card *card, unsigned long delay)
+ {
+ 	int scheduled;
+ 
+@@ -200,8 +195,7 @@ fw_schedule_bm_work(struct fw_card *card, unsigned long delay)
+ 		fw_card_put(card);
+ }
+ 
 -static void
--complete_bm_lock(struct fw_card *card, int rcode,
--		 void *payload, size_t length, void *data)
--{
--	struct bm_data *bmd = data;
--
--	if (rcode == RCODE_COMPLETE)
--		bmd->old = be32_to_cpu(*(__be32 *) payload);
--	bmd->rcode = rcode;
--	complete(&bmd->done);
--}
--
- static void
- fw_card_bm_work(struct work_struct *work)
+-fw_card_bm_work(struct work_struct *work)
++static void fw_card_bm_work(struct work_struct *work)
  {
  	struct fw_card *card = container_of(work, struct fw_card, work.work);
  	struct fw_device *root_device;
- 	struct fw_node *root_node, *local_node;
--	struct bm_data bmd;
- 	unsigned long flags;
--	int root_id, new_root_id, irm_id, gap_count, generation, grace;
-+	int root_id, new_root_id, irm_id, gap_count, generation, grace, rcode;
- 	bool do_reset = false;
-+	__be32 lock_data[2];
- 
- 	spin_lock_irqsave(&card->lock, flags);
- 	local_node = card->local_node;
-@@ -241,7 +218,7 @@ fw_card_bm_work(struct work_struct *work)
+@@ -232,7 +226,7 @@ fw_card_bm_work(struct work_struct *work)
  	root_id = root_node->node_id;
  	grace = time_after(jiffies, card->reset_jiffies + DIV_ROUND_UP(HZ, 10));
  
@@ -80,69 +89,342 @@
  	    (card->bm_generation != generation && grace)) {
  		/*
  		 * This first step is to figure out who is IRM and
-@@ -263,33 +240,28 @@ fw_card_bm_work(struct work_struct *work)
- 			goto pick_me;
- 		}
+@@ -371,17 +365,16 @@ fw_card_bm_work(struct work_struct *work)
+ 	fw_card_put(card);
+ }
  
--		bmd.lock.arg = cpu_to_be32(0x3f);
--		bmd.lock.data = cpu_to_be32(local_node->node_id);
-+		lock_data[0] = cpu_to_be32(0x3f);
-+		lock_data[1] = cpu_to_be32(local_node->node_id);
- 
- 		spin_unlock_irqrestore(&card->lock, flags);
- 
--		init_completion(&bmd.done);
--		fw_send_request(card, &bmd.t, TCODE_LOCK_COMPARE_SWAP,
--				irm_id, generation,
--				SCODE_100, CSR_REGISTER_BASE + CSR_BUS_MANAGER_ID,
--				&bmd.lock, sizeof(bmd.lock),
--				complete_bm_lock, &bmd);
--		wait_for_completion(&bmd.done);
-+		rcode = fw_run_transaction(card, TCODE_LOCK_COMPARE_SWAP,
-+				irm_id, generation, SCODE_100,
-+				CSR_REGISTER_BASE + CSR_BUS_MANAGER_ID,
-+				lock_data, sizeof(lock_data));
+-static void
+-flush_timer_callback(unsigned long data)
++static void flush_timer_callback(unsigned long data)
+ {
+ 	struct fw_card *card = (struct fw_card *)data;
  
--		if (bmd.rcode == RCODE_GENERATION) {
--			/*
--			 * Another bus reset happened. Just return,
--			 * the BM work has been rescheduled.
--			 */
-+		if (rcode == RCODE_GENERATION)
-+			/* Another bus reset, BM work has been rescheduled. */
- 			goto out;
--		}
[...5696 lines suppressed...]
++	__u32 type;
++	__u32 handle;
++	__s32 channel;
++	__s32 bandwidth;
++};
++
++/**
+  * union fw_cdev_event - Convenience union of fw_cdev_event_ types
+  * @common:        Valid for all types
+  * @bus_reset:     Valid if @common.type == %FW_CDEV_EVENT_BUS_RESET
+  * @response:      Valid if @common.type == %FW_CDEV_EVENT_RESPONSE
   * @request:       Valid if @common.type == %FW_CDEV_EVENT_REQUEST
   * @iso_interrupt: Valid if @common.type == %FW_CDEV_EVENT_ISO_INTERRUPT
++ * @iso_resource:  Valid if @common.type ==
++ *				%FW_CDEV_EVENT_ISO_RESOURCE_ALLOCATED or
++ *				%FW_CDEV_EVENT_ISO_RESOURCE_DEALLOCATED
   *
-- * Convenience union for userspace use.  Events could be read(2) into a char
-- * buffer and then cast to this union for further processing.
-+ * Convenience union for userspace use.  Events could be read(2) into an
-+ * appropriately aligned char buffer and then cast to this union for further
-+ * processing.  Note that for a request, response or iso_interrupt event,
-+ * the data[] or header[] may make the size of the full event larger than
-+ * sizeof(union fw_cdev_event).  Also note that if you attempt to read(2)
-+ * an event into a buffer that is not large enough for it, the data that does
-+ * not fit will be discarded so that the next read(2) will return a new event.
+  * Convenience union for userspace use.  Events could be read(2) into an
+  * appropriately aligned char buffer and then cast to this union for further
+@@ -163,13 +214,15 @@ struct fw_cdev_event_iso_interrupt {
+  * not fit will be discarded so that the next read(2) will return a new event.
   */
  union fw_cdev_event {
- 	struct fw_cdev_event_common common;
+-	struct fw_cdev_event_common common;
+-	struct fw_cdev_event_bus_reset bus_reset;
+-	struct fw_cdev_event_response response;
+-	struct fw_cdev_event_request request;
+-	struct fw_cdev_event_iso_interrupt iso_interrupt;
++	struct fw_cdev_event_common		common;
++	struct fw_cdev_event_bus_reset		bus_reset;
++	struct fw_cdev_event_response		response;
++	struct fw_cdev_event_request		request;
++	struct fw_cdev_event_iso_interrupt	iso_interrupt;
++	struct fw_cdev_event_iso_resource	iso_resource;
+ };
+ 
++/* available since kernel version 2.6.22 */
+ #define FW_CDEV_IOC_GET_INFO		_IOWR('#', 0x00, struct fw_cdev_get_info)
+ #define FW_CDEV_IOC_SEND_REQUEST	_IOW('#', 0x01, struct fw_cdev_send_request)
+ #define FW_CDEV_IOC_ALLOCATE		_IOWR('#', 0x02, struct fw_cdev_allocate)
+@@ -178,18 +231,29 @@ union fw_cdev_event {
+ #define FW_CDEV_IOC_INITIATE_BUS_RESET	_IOW('#', 0x05, struct fw_cdev_initiate_bus_reset)
+ #define FW_CDEV_IOC_ADD_DESCRIPTOR	_IOWR('#', 0x06, struct fw_cdev_add_descriptor)
+ #define FW_CDEV_IOC_REMOVE_DESCRIPTOR	_IOW('#', 0x07, struct fw_cdev_remove_descriptor)
+-
+ #define FW_CDEV_IOC_CREATE_ISO_CONTEXT	_IOWR('#', 0x08, struct fw_cdev_create_iso_context)
+ #define FW_CDEV_IOC_QUEUE_ISO		_IOWR('#', 0x09, struct fw_cdev_queue_iso)
+ #define FW_CDEV_IOC_START_ISO		_IOW('#', 0x0a, struct fw_cdev_start_iso)
+ #define FW_CDEV_IOC_STOP_ISO		_IOW('#', 0x0b, struct fw_cdev_stop_iso)
++
++/* available since kernel version 2.6.24 */
+ #define FW_CDEV_IOC_GET_CYCLE_TIMER	_IOR('#', 0x0c, struct fw_cdev_get_cycle_timer)
+ 
+-/* FW_CDEV_VERSION History
+- *
+- * 1	Feb 18, 2007:  Initial version.
++/* available since kernel version 2.6.30 */
++#define FW_CDEV_IOC_ALLOCATE_ISO_RESOURCE       _IOWR('#', 0x0d, struct fw_cdev_allocate_iso_resource)
++#define FW_CDEV_IOC_DEALLOCATE_ISO_RESOURCE      _IOW('#', 0x0e, struct fw_cdev_deallocate)
++#define FW_CDEV_IOC_ALLOCATE_ISO_RESOURCE_ONCE   _IOW('#', 0x0f, struct fw_cdev_allocate_iso_resource)
++#define FW_CDEV_IOC_DEALLOCATE_ISO_RESOURCE_ONCE _IOW('#', 0x10, struct fw_cdev_allocate_iso_resource)
++#define FW_CDEV_IOC_GET_SPEED                    _IOR('#', 0x11, struct fw_cdev_get_speed)
++#define FW_CDEV_IOC_SEND_BROADCAST_REQUEST       _IOW('#', 0x12, struct fw_cdev_send_request)
++
++/*
++ * FW_CDEV_VERSION History
++ *  1  (2.6.22)  - initial version
++ *  2  (2.6.30)  - changed &fw_cdev_event_iso_interrupt.header if
++ *                 &fw_cdev_create_iso_context.header_size is 8 or more
+  */
+-#define FW_CDEV_VERSION		1
++#define FW_CDEV_VERSION 2
+ 
+ /**
+  * struct fw_cdev_get_info - General purpose information ioctl
+@@ -201,7 +265,7 @@ union fw_cdev_event {
+  *		case, @rom_length is updated with the actual length of the
+  *		configuration ROM.
+  * @rom:	If non-zero, address of a buffer to be filled by a copy of the
+- *		local node's configuration ROM
++ *		device's configuration ROM
+  * @bus_reset:	If non-zero, address of a buffer to be filled by a
+  *		&struct fw_cdev_event_bus_reset with the current state
+  *		of the bus.  This does not cause a bus reset to happen.
+@@ -229,7 +293,7 @@ struct fw_cdev_get_info {
+  * Send a request to the device.  This ioctl implements all outgoing requests.
+  * Both quadlet and block request specify the payload as a pointer to the data
+  * in the @data field.  Once the transaction completes, the kernel writes an
+- * &fw_cdev_event_request event back.  The @closure field is passed back to
++ * &fw_cdev_event_response event back.  The @closure field is passed back to
+  * user space in the response event.
+  */
+ struct fw_cdev_send_request {
+@@ -284,9 +348,9 @@ struct fw_cdev_allocate {
+ };
+ 
+ /**
+- * struct fw_cdev_deallocate - Free an address range allocation
+- * @handle:	Handle to the address range, as returned by the kernel when the
+- *		range was allocated
++ * struct fw_cdev_deallocate - Free a CSR address range or isochronous resource
++ * @handle:	Handle to the address range or iso resource, as returned by the
++ *		kernel when the range or resource was allocated
+  */
+ struct fw_cdev_deallocate {
+ 	__u32 handle;
+@@ -370,6 +434,9 @@ struct fw_cdev_remove_descriptor {
+  *
+  * If a context was successfully created, the kernel writes back a handle to the
+  * context, which must be passed in for subsequent operations on that context.
++ *
++ * Note that the effect of a @header_size > 4 depends on
++ * &fw_cdev_get_info.version, as documented at &fw_cdev_event_iso_interrupt.
+  */
+ struct fw_cdev_create_iso_context {
+ 	__u32 type;
+@@ -473,10 +540,73 @@ struct fw_cdev_stop_iso {
+  * The %FW_CDEV_IOC_GET_CYCLE_TIMER ioctl reads the isochronous cycle timer
+  * and also the system clock.  This allows to express the receive time of an
+  * isochronous packet as a system time with microsecond accuracy.
++ *
++ * @cycle_timer consists of 7 bits cycleSeconds, 13 bits cycleCount, and
++ * 12 bits cycleOffset, in host byte order.
+  */
+ struct fw_cdev_get_cycle_timer {
+ 	__u64 local_time;
+ 	__u32 cycle_timer;
+ };
+ 
++/**
++ * struct fw_cdev_allocate_iso_resource - (De)allocate a channel or bandwidth
++ * @closure:	Passed back to userspace in correponding iso resource events
++ * @channels:	Isochronous channels of which one is to be (de)allocated
++ * @bandwidth:	Isochronous bandwidth units to be (de)allocated
++ * @handle:	Handle to the allocation, written by the kernel (only valid in
++ *		case of %FW_CDEV_IOC_ALLOCATE_ISO_RESOURCE ioctls)
++ *
++ * The %FW_CDEV_IOC_ALLOCATE_ISO_RESOURCE ioctl initiates allocation of an
++ * isochronous channel and/or of isochronous bandwidth at the isochronous
++ * resource manager (IRM).  Only one of the channels specified in @channels is
++ * allocated.  An %FW_CDEV_EVENT_ISO_RESOURCE_ALLOCATED is sent after
++ * communication with the IRM, indicating success or failure in the event data.
++ * The kernel will automatically reallocate the resources after bus resets.
++ * Should a reallocation fail, an %FW_CDEV_EVENT_ISO_RESOURCE_DEALLOCATED event
++ * will be sent.  The kernel will also automatically deallocate the resources
++ * when the file descriptor is closed.
++ *
++ * The %FW_CDEV_IOC_DEALLOCATE_ISO_RESOURCE ioctl can be used to initiate
++ * deallocation of resources which were allocated as described above.
++ * An %FW_CDEV_EVENT_ISO_RESOURCE_DEALLOCATED event concludes this operation.
++ *
++ * The %FW_CDEV_IOC_ALLOCATE_ISO_RESOURCE_ONCE ioctl is a variant of allocation
++ * without automatic re- or deallocation.
++ * An %FW_CDEV_EVENT_ISO_RESOURCE_ALLOCATED event concludes this operation,
++ * indicating success or failure in its data.
++ *
++ * The %FW_CDEV_IOC_DEALLOCATE_ISO_RESOURCE_ONCE ioctl works like
++ * %FW_CDEV_IOC_ALLOCATE_ISO_RESOURCE_ONCE except that resources are freed
++ * instead of allocated.
++ * An %FW_CDEV_EVENT_ISO_RESOURCE_DEALLOCATED event concludes this operation.
++ *
++ * To summarize, %FW_CDEV_IOC_DEALLOCATE_ISO_RESOURCE allocates iso resources
++ * for the lifetime of the fd or handle.
++ * In contrast, %FW_CDEV_IOC_ALLOCATE_ISO_RESOURCE_ONCE allocates iso resources
++ * for the duration of a bus generation.
++ *
++ * @channels is a host-endian bitfield with the least significant bit
++ * representing channel 0 and the most significant bit representing channel 63:
++ * 1ULL << c for each channel c that is a candidate for (de)allocation.
++ *
++ * @bandwidth is expressed in bandwidth allocation units, i.e. the time to send
++ * one quadlet of data (payload or header data) at speed S1600.
++ */
++struct fw_cdev_allocate_iso_resource {
++	__u64 closure;
++	__u64 channels;
++	__u32 bandwidth;
++	__u32 handle;
++};
++
++/**
++ * struct fw_cdev_get_speed - Query maximum speed to or from this device
++ * @max_speed:	Speed code; minimum of the device's link speed, the local node's
++ *		link speed, and all PHY port speeds between the two links
++ */
++struct fw_cdev_get_speed {
++	__u32 max_speed;
++};
++
+ #endif /* _LINUX_FIREWIRE_CDEV_H */


--- linux-2.6.27-ext-dir-corruption-fix.patch DELETED ---


--- linux-2.6.27-ext4-2.6.28-backport-fixups.patch DELETED ---


--- linux-2.6.27-ext4-2.6.28-rc3-git6.patch DELETED ---



From cebbert at fedoraproject.org  Fri Jan 30 00:35:45 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Fri, 30 Jan 2009 00:35:45 +0000 (UTC)
Subject: rpms/kernel/F-10 linux-2.6-compile-fixes.patch,1.180,1.181
Message-ID: <20090130003545.A117370117@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12501

Modified Files:
	linux-2.6-compile-fixes.patch 
Log Message:
another build fix from rawhide

linux-2.6-compile-fixes.patch:

Index: linux-2.6-compile-fixes.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/linux-2.6-compile-fixes.patch,v
retrieving revision 1.180
retrieving revision 1.181
diff -u -r1.180 -r1.181
--- linux-2.6-compile-fixes.patch	30 Jan 2009 00:24:47 -0000	1.180
+++ linux-2.6-compile-fixes.patch	30 Jan 2009 00:35:45 -0000	1.181
@@ -75,3 +75,647 @@
 More majordomo info at  http://vger.kernel.org/majordomo-info.html
 Please read the FAQ at  http://www.tux.org/lkml/
 
+From e2efba5a3a087933a6e372fef4934c71f9b1365f Mon Sep 17 00:00:00 2001
+From: Kyle McMartin <kyle at minerva.i.cabal.ca>
+Date: Fri, 9 Jan 2009 11:54:51 -0500
+Subject: Revert "fix modules_install via NFS"
+
+This reverts commit 8b249b6856f16f09b0e5b79ce5f4d435e439b9d6.
+---
+ firmware/.gitignore |    1 +
+ firmware/Makefile   |   10 +-
+ firmware/ihex2fw.c  |  268 +++++++++++++++++++++++++++++++++++++++++++++++++++
+ scripts/.gitignore  |    1 -
+ scripts/Makefile    |    3 +-
+ scripts/ihex2fw.c   |  268 ---------------------------------------------------
+ 6 files changed, 276 insertions(+), 275 deletions(-)
+ create mode 100644 firmware/ihex2fw.c
+ delete mode 100644 scripts/ihex2fw.c
+
+diff --git a/firmware/.gitignore b/firmware/.gitignore
+index f89a21f..d9c6901 100644
+--- a/firmware/.gitignore
++++ b/firmware/.gitignore
+@@ -3,3 +3,4 @@
+ *.bin
+ *.csp
+ *.dsp
++ihex2fw
+diff --git a/firmware/Makefile b/firmware/Makefile
+index ea1d28f..aae5129 100644
+--- a/firmware/Makefile
++++ b/firmware/Makefile
+@@ -101,10 +101,10 @@ quiet_cmd_ihex  = IHEX    $@
+       cmd_ihex  = $(OBJCOPY) -Iihex -Obinary $< $@
+ 
+ quiet_cmd_ihex2fw  = IHEX2FW $@
+-      cmd_ihex2fw  = $(objtree)/scripts/ihex2fw $< $@
++      cmd_ihex2fw  = $(objtree)/$(obj)/ihex2fw $< $@
+ 
+ quiet_cmd_h16tofw  = H16TOFW $@
+-      cmd_h16tofw  = $(objtree)/scripts/ihex2fw -w $< $@
++      cmd_h16tofw  = $(objtree)/$(obj)/ihex2fw -w $< $@
+ 
+ quiet_cmd_fwbin = MK_FW   $@
+       cmd_fwbin = FWNAME="$(patsubst firmware/%.gen.S,%,$@)";		     \
+@@ -167,11 +167,11 @@ $(obj)/%: $(obj)/%.ihex | $(objtree)/$(obj)/$$(dir %)
+ # is actually meaningful, because the firmware has to be loaded in a certain
+ # order rather than as a single binary blob. Thus, we convert them into our
+ # more compact binary representation of ihex records (<linux/ihex.h>)
+-$(obj)/%.fw: $(obj)/%.HEX  | $(objtree)/$(obj)/$$(dir %)
++$(obj)/%.fw: $(obj)/%.HEX $(obj)/ihex2fw | $(objtree)/$(obj)/$$(dir %)
+ 	$(call cmd,ihex2fw)
+ 
+ # .H16 is our own modified form of Intel HEX, with 16-bit length for records.
+-$(obj)/%.fw: $(obj)/%.H16 | $(objtree)/$(obj)/$$(dir %)
++$(obj)/%.fw: $(obj)/%.H16 $(obj)/ihex2fw | $(objtree)/$(obj)/$$(dir %)
+ 	$(call cmd,h16tofw)
+ 
+ $(firmware-dirs):
+@@ -188,3 +188,5 @@ targets := $(fw-shipped-) $(patsubst $(obj)/%,%, \
+ # Without this, built-in.o won't be created when it's empty, and the
+ # final vmlinux link will fail.
+ obj-n := dummy
++
++hostprogs-y := ihex2fw
+diff --git a/firmware/ihex2fw.c b/firmware/ihex2fw.c
+new file mode 100644
+index 0000000..8f7fdaa
+--- /dev/null
++++ b/firmware/ihex2fw.c
+@@ -0,0 +1,268 @@
++/*
++ * Parser/loader for IHEX formatted data.
++ *
++ * Copyright ?? 2008 David Woodhouse <dwmw2 at infradead.org>
++ * Copyright ?? 2005 Jan Harkes <jaharkes at cs.cmu.edu>
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License version 2 as
++ * published by the Free Software Foundation.
++ */
++
++#include <stdint.h>
++#include <arpa/inet.h>
++#include <stdio.h>
++#include <errno.h>
++#include <sys/types.h>
++#include <sys/stat.h>
++#include <sys/mman.h>
++#include <fcntl.h>
++#include <string.h>
++#include <unistd.h>
++#include <stdlib.h>
++#define _GNU_SOURCE
++#include <getopt.h>
++
++
++struct ihex_binrec {
++	struct ihex_binrec *next; /* not part of the real data structure */
++        uint32_t addr;
++        uint16_t len;
++        uint8_t data[];
++};
++
++/**
++ * nybble/hex are little helpers to parse hexadecimal numbers to a byte value
++ **/
++static uint8_t nybble(const uint8_t n)
++{
++       if      (n >= '0' && n <= '9') return n - '0';
++       else if (n >= 'A' && n <= 'F') return n - ('A' - 10);
++       else if (n >= 'a' && n <= 'f') return n - ('a' - 10);
++       return 0;
++}
++
++static uint8_t hex(const uint8_t *data, uint8_t *crc)
++{
++       uint8_t val = (nybble(data[0]) << 4) | nybble(data[1]);
++       *crc += val;
++       return val;
++}
++
++static int process_ihex(uint8_t *data, ssize_t size);
++static void file_record(struct ihex_binrec *record);
++static int output_records(int outfd);
++
++static int sort_records = 0;
++static int wide_records = 0;
++
++int usage(void)
++{
++	fprintf(stderr, "ihex2fw: Convert ihex files into binary "
++		"representation for use by Linux kernel\n");
++	fprintf(stderr, "usage: ihex2fw [<options>] <src.HEX> <dst.fw>\n");
++	fprintf(stderr, "       -w: wide records (16-bit length)\n");
++	fprintf(stderr, "       -s: sort records by address\n");
++	return 1;
++}
++
++int main(int argc, char **argv)
++{
++	int infd, outfd;
++	struct stat st;
++	uint8_t *data;
++	int opt;
++
++	while ((opt = getopt(argc, argv, "ws")) != -1) {
++		switch (opt) {
++		case 'w':
++			wide_records = 1;
++			break;
++		case 's':
++			sort_records = 1;
++			break;
++		default:
++			return usage();
++		}
++	}
++
++	if (optind + 2 != argc)
++		return usage();
++
++	if (!strcmp(argv[optind], "-"))
++	    infd = 0;
++	else
++		infd = open(argv[optind], O_RDONLY);
++	if (infd == -1) {
++		fprintf(stderr, "Failed to open source file: %s",
++			strerror(errno));
++		return usage();
++	}
++	if (fstat(infd, &st)) {
++		perror("stat");
++		return 1;
++	}
++	data = mmap(NULL, st.st_size, PROT_READ, MAP_SHARED, infd, 0);
++	if (data == MAP_FAILED) {
++		perror("mmap");
++		return 1;
++	}
++
++	if (!strcmp(argv[optind+1], "-"))
++	    outfd = 1;
++	else
++		outfd = open(argv[optind+1], O_TRUNC|O_CREAT|O_WRONLY, 0644);
++	if (outfd == -1) {
++		fprintf(stderr, "Failed to open destination file: %s",
++			strerror(errno));
++		return usage();
++	}
++	if (process_ihex(data, st.st_size))
++		return 1;
++
++	output_records(outfd);
++	return 0;
++}
++
++static int process_ihex(uint8_t *data, ssize_t size)
++{
++	struct ihex_binrec *record;
++	uint32_t offset = 0;
++	uint8_t type, crc = 0, crcbyte = 0;
++	int i, j;
++	int line = 1;
++	int len;
++
++	i = 0;
++next_record:
++	/* search for the start of record character */
++	while (i < size) {
++		if (data[i] == '\n') line++;
++		if (data[i++] == ':') break;
++	}
++
++	/* Minimum record length would be about 10 characters */
++	if (i + 10 > size) {
++		fprintf(stderr, "Can't find valid record at line %d\n", line);
++		return -EINVAL;
++	}
++
++	len = hex(data + i, &crc); i += 2;
++	if (wide_records) {
++		len <<= 8;
++		len += hex(data + i, &crc); i += 2;
++	}
++	record = malloc((sizeof (*record) + len + 3) & ~3);
++	if (!record) {
++		fprintf(stderr, "out of memory for records\n");
++		return -ENOMEM;
++	}
++	memset(record, 0, (sizeof(*record) + len + 3) & ~3);
++	record->len = len;
++
++	/* now check if we have enough data to read everything */
++	if (i + 8 + (record->len * 2) > size) {
++		fprintf(stderr, "Not enough data to read complete record at line %d\n",
++			line);
++		return -EINVAL;
++	}
++
++	record->addr  = hex(data + i, &crc) << 8; i += 2;
++	record->addr |= hex(data + i, &crc); i += 2;
++	type = hex(data + i, &crc); i += 2;
++
++	for (j = 0; j < record->len; j++, i += 2)
++		record->data[j] = hex(data + i, &crc);
++
++	/* check CRC */
++	crcbyte = hex(data + i, &crc); i += 2;
++	if (crc != 0) {
++		fprintf(stderr, "CRC failure at line %d: got 0x%X, expected 0x%X\n",
++			line, crcbyte, (unsigned char)(crcbyte-crc));
++		return -EINVAL;
++	}
++
++	/* Done reading the record */
++	switch (type) {
++	case 0:
++		/* old style EOF record? */
++		if (!record->len)
++			break;
++
++		record->addr += offset;
++		file_record(record);
++		goto next_record;
++
++	case 1: /* End-Of-File Record */
++		if (record->addr || record->len) {
++			fprintf(stderr, "Bad EOF record (type 01) format at line %d",
++				line);
++			return -EINVAL;
++		}
++		break;
++
++	case 2: /* Extended Segment Address Record (HEX86) */
++	case 4: /* Extended Linear Address Record (HEX386) */
++		if (record->addr || record->len != 2) {
++			fprintf(stderr, "Bad HEX86/HEX386 record (type %02X) at line %d\n",
++				type, line);
++			return -EINVAL;
++		}
++
++		/* We shouldn't really be using the offset for HEX86 because
++		 * the wraparound case is specified quite differently. */
++		offset = record->data[0] << 8 | record->data[1];
++		offset <<= (type == 2 ? 4 : 16);
++		goto next_record;
++
++	case 3: /* Start Segment Address Record */
++	case 5: /* Start Linear Address Record */
++		if (record->addr || record->len != 4) {
++			fprintf(stderr, "Bad Start Address record (type %02X) at line %d\n",
++				type, line);
++			return -EINVAL;
++		}
++
++		/* These records contain the CS/IP or EIP where execution
++		 * starts. Don't really know what to do with them. */
++		goto next_record;
++
++	default:
++		fprintf(stderr, "Unknown record (type %02X)\n", type);
++		return -EINVAL;
++	}
++
++	return 0;
++}
++
++static struct ihex_binrec *records;
++
++static void file_record(struct ihex_binrec *record)
++{
++	struct ihex_binrec **p = &records;
++
++	while ((*p) && (!sort_records || (*p)->addr < record->addr))
++		p = &((*p)->next);
++
++	record->next = *p;
++	*p = record;
++}
++
++static int output_records(int outfd)
++{
++	unsigned char zeroes[6] = {0, 0, 0, 0, 0, 0};
++	struct ihex_binrec *p = records;
++
++	while (p) {
++		uint16_t writelen = (p->len + 9) & ~3;
++
++		p->addr = htonl(p->addr);
++		p->len = htons(p->len);
++		write(outfd, &p->addr, writelen);
++		p = p->next;
++	}
++	/* EOF record is zero length, since we don't bother to represent
++	   the type field in the binary version */
++	write(outfd, zeroes, 6);
++	return 0;
++}
+diff --git a/scripts/.gitignore b/scripts/.gitignore
+index 09e2406..b939fbd 100644
+--- a/scripts/.gitignore
++++ b/scripts/.gitignore
+@@ -1,7 +1,6 @@
+ #
+ # Generated files
+ #
+-ihex2fw
+ conmakehash
+ kallsyms
+ pnmtologo
+diff --git a/scripts/Makefile b/scripts/Makefile
+index 035182e..aafdf06 100644
+--- a/scripts/Makefile
++++ b/scripts/Makefile
+@@ -2,12 +2,11 @@
+ # scripts contains sources for various helper programs used throughout
+ # the kernel for the build process.
+ # ---------------------------------------------------------------------------
+-# ihex2fw:       Parser/loader for IHEX formatted data
+ # kallsyms:      Find all symbols in vmlinux
+ # pnmttologo:    Convert pnm files to logo files
++# conmakehash:   Create chartable
+ # conmakehash:	 Create arrays for initializing the kernel console tables
+ 
+-hostprogs-y                      := ihex2fw
+ hostprogs-$(CONFIG_KALLSYMS)     += kallsyms
+ hostprogs-$(CONFIG_LOGO)         += pnmtologo
+ hostprogs-$(CONFIG_VT)           += conmakehash
+diff --git a/scripts/ihex2fw.c b/scripts/ihex2fw.c
+deleted file mode 100644
+index 8f7fdaa..0000000
+--- a/scripts/ihex2fw.c
++++ /dev/null
+@@ -1,268 +0,0 @@
+-/*
+- * Parser/loader for IHEX formatted data.
+- *
+- * Copyright ?? 2008 David Woodhouse <dwmw2 at infradead.org>
+- * Copyright ?? 2005 Jan Harkes <jaharkes at cs.cmu.edu>
+- *
+- * This program is free software; you can redistribute it and/or modify
+- * it under the terms of the GNU General Public License version 2 as
+- * published by the Free Software Foundation.
+- */
+-
+-#include <stdint.h>
+-#include <arpa/inet.h>
+-#include <stdio.h>
+-#include <errno.h>
+-#include <sys/types.h>
+-#include <sys/stat.h>
+-#include <sys/mman.h>
+-#include <fcntl.h>
+-#include <string.h>
+-#include <unistd.h>
+-#include <stdlib.h>
+-#define _GNU_SOURCE
+-#include <getopt.h>
+-
+-
+-struct ihex_binrec {
+-	struct ihex_binrec *next; /* not part of the real data structure */
+-        uint32_t addr;
+-        uint16_t len;
+-        uint8_t data[];
+-};
+-
+-/**
+- * nybble/hex are little helpers to parse hexadecimal numbers to a byte value
+- **/
+-static uint8_t nybble(const uint8_t n)
+-{
+-       if      (n >= '0' && n <= '9') return n - '0';
+-       else if (n >= 'A' && n <= 'F') return n - ('A' - 10);
+-       else if (n >= 'a' && n <= 'f') return n - ('a' - 10);
+-       return 0;
+-}
+-
+-static uint8_t hex(const uint8_t *data, uint8_t *crc)
+-{
+-       uint8_t val = (nybble(data[0]) << 4) | nybble(data[1]);
+-       *crc += val;
+-       return val;
+-}
+-
+-static int process_ihex(uint8_t *data, ssize_t size);
+-static void file_record(struct ihex_binrec *record);
+-static int output_records(int outfd);
+-
+-static int sort_records = 0;
+-static int wide_records = 0;
+-
+-int usage(void)
+-{
+-	fprintf(stderr, "ihex2fw: Convert ihex files into binary "
+-		"representation for use by Linux kernel\n");
+-	fprintf(stderr, "usage: ihex2fw [<options>] <src.HEX> <dst.fw>\n");
+-	fprintf(stderr, "       -w: wide records (16-bit length)\n");
+-	fprintf(stderr, "       -s: sort records by address\n");
+-	return 1;
+-}
+-
+-int main(int argc, char **argv)
+-{
+-	int infd, outfd;
+-	struct stat st;
+-	uint8_t *data;
+-	int opt;
+-
+-	while ((opt = getopt(argc, argv, "ws")) != -1) {
+-		switch (opt) {
+-		case 'w':
+-			wide_records = 1;
+-			break;
+-		case 's':
+-			sort_records = 1;
+-			break;
+-		default:
+-			return usage();
+-		}
+-	}
+-
+-	if (optind + 2 != argc)
+-		return usage();
+-
+-	if (!strcmp(argv[optind], "-"))
+-	    infd = 0;
+-	else
+-		infd = open(argv[optind], O_RDONLY);
+-	if (infd == -1) {
+-		fprintf(stderr, "Failed to open source file: %s",
+-			strerror(errno));
+-		return usage();
+-	}
+-	if (fstat(infd, &st)) {
+-		perror("stat");
+-		return 1;
+-	}
+-	data = mmap(NULL, st.st_size, PROT_READ, MAP_SHARED, infd, 0);
+-	if (data == MAP_FAILED) {
+-		perror("mmap");
+-		return 1;
+-	}
+-
+-	if (!strcmp(argv[optind+1], "-"))
+-	    outfd = 1;
+-	else
+-		outfd = open(argv[optind+1], O_TRUNC|O_CREAT|O_WRONLY, 0644);
+-	if (outfd == -1) {
+-		fprintf(stderr, "Failed to open destination file: %s",
+-			strerror(errno));
+-		return usage();
+-	}
+-	if (process_ihex(data, st.st_size))
+-		return 1;
+-
+-	output_records(outfd);
+-	return 0;
+-}
+-
+-static int process_ihex(uint8_t *data, ssize_t size)
+-{
+-	struct ihex_binrec *record;
+-	uint32_t offset = 0;
+-	uint8_t type, crc = 0, crcbyte = 0;
+-	int i, j;
+-	int line = 1;
+-	int len;
+-
+-	i = 0;
+-next_record:
+-	/* search for the start of record character */
+-	while (i < size) {
+-		if (data[i] == '\n') line++;
+-		if (data[i++] == ':') break;
+-	}
+-
+-	/* Minimum record length would be about 10 characters */
+-	if (i + 10 > size) {
+-		fprintf(stderr, "Can't find valid record at line %d\n", line);
+-		return -EINVAL;
+-	}
+-
+-	len = hex(data + i, &crc); i += 2;
+-	if (wide_records) {
+-		len <<= 8;
+-		len += hex(data + i, &crc); i += 2;
+-	}
+-	record = malloc((sizeof (*record) + len + 3) & ~3);
+-	if (!record) {
+-		fprintf(stderr, "out of memory for records\n");
+-		return -ENOMEM;
+-	}
+-	memset(record, 0, (sizeof(*record) + len + 3) & ~3);
+-	record->len = len;
+-
+-	/* now check if we have enough data to read everything */
+-	if (i + 8 + (record->len * 2) > size) {
+-		fprintf(stderr, "Not enough data to read complete record at line %d\n",
+-			line);
+-		return -EINVAL;
+-	}
+-
+-	record->addr  = hex(data + i, &crc) << 8; i += 2;
+-	record->addr |= hex(data + i, &crc); i += 2;
+-	type = hex(data + i, &crc); i += 2;
+-
+-	for (j = 0; j < record->len; j++, i += 2)
+-		record->data[j] = hex(data + i, &crc);
+-
+-	/* check CRC */
+-	crcbyte = hex(data + i, &crc); i += 2;
+-	if (crc != 0) {
+-		fprintf(stderr, "CRC failure at line %d: got 0x%X, expected 0x%X\n",
+-			line, crcbyte, (unsigned char)(crcbyte-crc));
+-		return -EINVAL;
+-	}
+-
+-	/* Done reading the record */
+-	switch (type) {
+-	case 0:
+-		/* old style EOF record? */
+-		if (!record->len)
+-			break;
+-
+-		record->addr += offset;
+-		file_record(record);
+-		goto next_record;
+-
+-	case 1: /* End-Of-File Record */
+-		if (record->addr || record->len) {
+-			fprintf(stderr, "Bad EOF record (type 01) format at line %d",
+-				line);
+-			return -EINVAL;
+-		}
+-		break;
+-
+-	case 2: /* Extended Segment Address Record (HEX86) */
+-	case 4: /* Extended Linear Address Record (HEX386) */
+-		if (record->addr || record->len != 2) {
+-			fprintf(stderr, "Bad HEX86/HEX386 record (type %02X) at line %d\n",
+-				type, line);
+-			return -EINVAL;
+-		}
+-
+-		/* We shouldn't really be using the offset for HEX86 because
+-		 * the wraparound case is specified quite differently. */
+-		offset = record->data[0] << 8 | record->data[1];
+-		offset <<= (type == 2 ? 4 : 16);
+-		goto next_record;
+-
+-	case 3: /* Start Segment Address Record */
+-	case 5: /* Start Linear Address Record */
+-		if (record->addr || record->len != 4) {
+-			fprintf(stderr, "Bad Start Address record (type %02X) at line %d\n",
+-				type, line);
+-			return -EINVAL;
+-		}
+-
+-		/* These records contain the CS/IP or EIP where execution
+-		 * starts. Don't really know what to do with them. */
+-		goto next_record;
+-
+-	default:
+-		fprintf(stderr, "Unknown record (type %02X)\n", type);
+-		return -EINVAL;
+-	}
+-
+-	return 0;
+-}
+-
+-static struct ihex_binrec *records;
+-
+-static void file_record(struct ihex_binrec *record)
+-{
+-	struct ihex_binrec **p = &records;
+-
+-	while ((*p) && (!sort_records || (*p)->addr < record->addr))
+-		p = &((*p)->next);
+-
+-	record->next = *p;
+-	*p = record;
+-}
+-
+-static int output_records(int outfd)
+-{
+-	unsigned char zeroes[6] = {0, 0, 0, 0, 0, 0};
+-	struct ihex_binrec *p = records;
+-
+-	while (p) {
+-		uint16_t writelen = (p->len + 9) & ~3;
+-
+-		p->addr = htonl(p->addr);
+-		p->len = htons(p->len);
+-		write(outfd, &p->addr, writelen);
+-		p = p->next;
+-	}
+-	/* EOF record is zero length, since we don't bother to represent
+-	   the type field in the binary version */
+-	write(outfd, zeroes, 6);
+-	return 0;
+-}
+-- 
+1.6.0.6
+



From nsantos at fedoraproject.org  Fri Jan 30 00:46:04 2009
From: nsantos at fedoraproject.org (Nuno Santos)
Date: Fri, 30 Jan 2009 00:46:04 +0000 (UTC)
Subject: rpms/qpidc/F-10 qpidc.spec,1.65,1.66
Message-ID: <20090130004604.EC43B70117@cvs1.fedora.phx.redhat.com>

Author: nsantos

Update of /cvs/extras/rpms/qpidc/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14294

Modified Files:
	qpidc.spec 
Log Message:
BZ474614 - qpidc unowned directories


Index: qpidc.spec
===================================================================
RCS file: /cvs/extras/rpms/qpidc/F-10/qpidc.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- qpidc.spec	29 Jan 2009 23:14:58 -0000	1.65
+++ qpidc.spec	30 Jan 2009 00:45:34 -0000	1.66
@@ -7,7 +7,7 @@
 
 Name:           qpidc
 Version:        0.4.738618
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Libraries for Qpid C++ client applications
 Group:          System Environment/Libraries
 License:        ASL 2.0
@@ -239,6 +239,7 @@
 %_libdir/libqpidcommon.so.0.1.0
 %_libdir/libqpidclient.so.0
 %_libdir/libqpidclient.so.0.1.0
+%dir %_libdir/qpid
 %dir %_libdir/qpid/client
 %dir %_sysconfdir/qpid
 %config(noreplace) %_sysconfdir/qpid/qpidc.conf
@@ -375,7 +376,7 @@
 %postun -n qmf -p /sbin/ldconfig
 
 %changelog
-* Wed Jan 28 2009 Nuno Santos <nsantos at redhat.com> - 0.4.738618-2
+* Wed Jan 28 2009 Nuno Santos <nsantos at redhat.com> - 0.4.738618-3
 - Rebased to svn rev 738618
 - BZ474614 - qpidc unowned directories
 



From mclasen at fedoraproject.org  Fri Jan 30 01:00:12 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Fri, 30 Jan 2009 01:00:12 +0000 (UTC)
Subject: rpms/gtk2/devel gtk2.spec,1.353,1.354
Message-ID: <20090130010012.4AB9870117@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gtk2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16089

Modified Files:
	gtk2.spec 
Log Message:
- Split of an immodules subpackage (#444814)
- Disable ia64 hack thats not needed in Fedora
- Remove some .la files that crept in



Index: gtk2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtk2/devel/gtk2.spec,v
retrieving revision 1.353
retrieving revision 1.354
diff -u -r1.353 -r1.354
--- gtk2.spec	30 Jan 2009 00:22:57 -0000	1.353
+++ gtk2.spec	30 Jan 2009 00:59:41 -0000	1.354
@@ -157,8 +157,10 @@
 # create a dummy binary for /usr/lib/gtk-2.0/immodules to work around
 # problems in our ia64 multilib infrastructure
 # See https://bugzilla.redhat.com/show_bug.cgi?id=253726 for more details
+%if 0
 echo 'int main (void) { return 0; }' > relocation-tag.c
 gcc -Os relocation-tag.c -o relocation-tag
+%endif
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -231,6 +233,7 @@
 
 # Remove unpackaged files
 rm $RPM_BUILD_ROOT%{_libdir}/*.la
+rm $RPM_BUILD_ROOT%{_libdir}/gtk-2.0/*/*.la
 rm $RPM_BUILD_ROOT%{_libdir}/gtk-2.0/%{bin_version}/*/*.la
 
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/gtk-2.0/$host
@@ -323,6 +326,8 @@
 %changelog
 * Thu Jan 29 2009 Matthias Clasen <mclasen at redhat.com> - 2.15.2-4
 - Split of an immodules subpackage (#444814)
+- Disable ia64 hack thats not needed in Fedora
+- Remove some .la files that crept in
 
 * Wed Jan 28 2009 Marek Kasik <mkasik at redhat.com> - 2.15.2-3
 - modify default_printer.patch to show a network default printer



From roozbeh at fedoraproject.org  Fri Jan 30 01:38:02 2009
From: roozbeh at fedoraproject.org (Roozbeh Pournader)
Date: Fri, 30 Jan 2009 01:38:02 +0000 (UTC)
Subject: rpms/gentium-fonts/devel dead.package, NONE, 1.1 Makefile, 1.1,
	NONE gentium-fonts.spec, 1.5, NONE sources, 1.2, NONE
Message-ID: <20090130013802.4D69970117@cvs1.fedora.phx.redhat.com>

Author: roozbeh

Update of /cvs/pkgs/rpms/gentium-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22232

Added Files:
	dead.package 
Removed Files:
	Makefile gentium-fonts.spec sources 
Log Message:
Package being renamed to sil-gentium-fonts.



--- NEW FILE dead.package ---
Renamed to sil-gentium-fonts


--- Makefile DELETED ---


--- gentium-fonts.spec DELETED ---


--- sources DELETED ---



From roozbeh at fedoraproject.org  Fri Jan 30 01:39:55 2009
From: roozbeh at fedoraproject.org (Roozbeh Pournader)
Date: Fri, 30 Jan 2009 01:39:55 +0000 (UTC)
Subject: rpms/gentium-fonts/devel .cvsignore,1.2,NONE
Message-ID: <20090130013955.E7D4B70117@cvs1.fedora.phx.redhat.com>

Author: roozbeh

Update of /cvs/pkgs/rpms/gentium-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22634

Removed Files:
	.cvsignore 
Log Message:
Package being renamed to sil-gentium-fonts.



--- .cvsignore DELETED ---



From roozbeh at fedoraproject.org  Fri Jan 30 01:41:16 2009
From: roozbeh at fedoraproject.org (Roozbeh Pournader)
Date: Fri, 30 Jan 2009 01:41:16 +0000 (UTC)
Subject: comps comps-f11.xml.in,1.88,1.89
Message-ID: <20090130014116.5090E70117@cvs1.fedora.phx.redhat.com>

Author: roozbeh

Update of /cvs/pkgs/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22762

Modified Files:
	comps-f11.xml.in 
Log Message:
gentium-fonts is getting renamed to sil-gentium-fonts



Index: comps-f11.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f11.xml.in,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -r1.88 -r1.89
--- comps-f11.xml.in	29 Jan 2009 14:23:23 -0000	1.88
+++ comps-f11.xml.in	30 Jan 2009 01:40:46 -0000	1.89
@@ -1532,7 +1532,6 @@
       <packagereq type="optional">fonts-truetype-apl</packagereq>
       <packagereq type="optional">freecol-shadowedblack-fonts</packagereq>
       <packagereq type="optional">freefont</packagereq>
-      <packagereq type="optional">gentium-fonts</packagereq>
       <packagereq type="optional">gfs-ambrosia-fonts</packagereq>
       <packagereq type="optional">gfs-artemisia-fonts</packagereq>
       <packagereq type="optional">gfs-baskerville-fonts</packagereq>



From ryan52 at fedoraproject.org  Fri Jan 30 01:47:11 2009
From: ryan52 at fedoraproject.org (Ryan Niebur)
Date: Fri, 30 Jan 2009 01:47:11 +0000 (UTC)
Subject: rpms/mkdst/devel .cvsignore, 1.8, 1.9 mkdst.spec, 1.9, 1.10 sources,
	1.8, 1.9
Message-ID: <20090130014711.E94D170117@cvs1.fedora.phx.redhat.com>

Author: ryan52

Update of /cvs/pkgs/rpms/mkdst/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24392

Modified Files:
	.cvsignore mkdst.spec sources 
Log Message:
version 0.11


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mkdst/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	19 May 2008 16:25:57 -0000	1.8
+++ .cvsignore	30 Jan 2009 01:46:41 -0000	1.9
@@ -1 +1 @@
-mkdst-0.9.tar.bz2
+mkdst-0.11.tar.bz2


Index: mkdst.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mkdst/devel/mkdst.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- mkdst.spec	28 Aug 2008 18:01:14 -0000	1.9
+++ mkdst.spec	30 Jan 2009 01:46:41 -0000	1.10
@@ -1,5 +1,5 @@
 Name:           mkdst
-Version:        0.9
+Version:        0.11
 Release:        2%{?dist}
 Summary:        Source repository to tarball release tool
 
@@ -38,6 +38,9 @@
 %{_datadir}/mkdst/
 
 %changelog
+* Thu Jan 29 2009 Ryan Niebur <ryanryan52 at gmail.com> - 0.11-1
+- 0.11
+
 * Thu Aug 28 2008 Michael Schwendt <mschwendt at fedoraproject.org> - 0.9-2
 - include /usr/share/mkdst directory
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mkdst/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	19 May 2008 16:25:57 -0000	1.8
+++ sources	30 Jan 2009 01:46:41 -0000	1.9
@@ -1 +1 @@
-a17660305fefd677096fee7d7a58d980  mkdst-0.9.tar.bz2
+710d7a79c27c837a8dcde6138274169e  mkdst-0.11.tar.bz2



From emaldonado at fedoraproject.org  Fri Jan 30 01:47:59 2009
From: emaldonado at fedoraproject.org (Elio Maldonado)
Date: Fri, 30 Jan 2009 01:47:59 +0000 (UTC)
Subject: rpms/crypto-utils/F-10 genkey.pl,1.25,1.26
Message-ID: <20090130014759.A179370117@cvs1.fedora.phx.redhat.com>

Author: emaldonado

Update of /cvs/extras/rpms/crypto-utils/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24549

Modified Files:
	genkey.pl 
Log Message:
Fix the ca key file extension


Index: genkey.pl
===================================================================
RCS file: /cvs/extras/rpms/crypto-utils/F-10/genkey.pl,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- genkey.pl	29 Jan 2009 22:55:44 -0000	1.25
+++ genkey.pl	30 Jan 2009 01:47:29 -0000	1.26
@@ -154,7 +154,7 @@
 $tmpPasswordFile = ''; # none has been created yet
 $keyfile = $ssltop."/private/".$servername.".key";
 if ($ca_mode) {
-    $keyfile = $cadir."/private/".$servername;
+    $keyfile = $cadir."/private/".$servername.".key";
 }
 
 ### State variables



From ryan52 at fedoraproject.org  Fri Jan 30 01:50:53 2009
From: ryan52 at fedoraproject.org (Ryan Niebur)
Date: Fri, 30 Jan 2009 01:50:53 +0000 (UTC)
Subject: rpms/mkdst/devel mkdst.spec,1.10,1.11
Message-ID: <20090130015053.D2C9870117@cvs1.fedora.phx.redhat.com>

Author: ryan52

Update of /cvs/pkgs/rpms/mkdst/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25108

Modified Files:
	mkdst.spec 
Log Message:
release number 1, not 2


Index: mkdst.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mkdst/devel/mkdst.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- mkdst.spec	30 Jan 2009 01:46:41 -0000	1.10
+++ mkdst.spec	30 Jan 2009 01:50:23 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           mkdst
 Version:        0.11
-Release:        2%{?dist}
+Release:        1%{?dist}
 Summary:        Source repository to tarball release tool
 
 Group:          Development/Tools



From emaldonado at fedoraproject.org  Fri Jan 30 01:54:25 2009
From: emaldonado at fedoraproject.org (Elio Maldonado)
Date: Fri, 30 Jan 2009 01:54:25 +0000 (UTC)
Subject: rpms/crypto-utils/F-10 crypto-utils.spec,1.46,1.47
Message-ID: <20090130015425.37DE170117@cvs1.fedora.phx.redhat.com>

Author: emaldonado

Update of /cvs/extras/rpms/crypto-utils/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25680

Modified Files:
	crypto-utils.spec 
Log Message:
Fixes #473860 and #479886


Index: crypto-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/crypto-utils/F-10/crypto-utils.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- crypto-utils.spec	4 Nov 2008 04:49:16 -0000	1.46
+++ crypto-utils.spec	30 Jan 2009 01:53:54 -0000	1.47
@@ -4,7 +4,7 @@
 Summary: SSL certificate and key management utilities
 Name: crypto-utils
 Version: 2.4.1
-Release: 3
+Release: 4
 Source: crypto-rand-%{crver}.tar.gz
 Source1: genkey.pl
 Source2: certwatch.c
@@ -131,6 +131,11 @@
 %{perl_vendorarch}/auto/Crypt
 
 %changelog
+* Thu Jan 29 2009 Elio Maldonado <emaldona at redhat.com> - 2.4.1-9
+- certwatch: Fixed cert expiry time calculations (#473860)
+- keyutil: Fixed segfault on certificate generation (#479886)
+- genkey: Fixed cert and key file name extensions
+
 * Mon Nov 03 2008 Elio Maldonado <emaldona at redhat.com> - 2.4.1-3
 - preauthenticate to modules using specially formatted password file
 



From dcantrel at fedoraproject.org  Fri Jan 30 01:57:36 2009
From: dcantrel at fedoraproject.org (David Cantrell)
Date: Fri, 30 Jan 2009 01:57:36 +0000 (UTC)
Subject: rpms/anaconda/devel .cvsignore, 1.601, 1.602 anaconda.spec, 1.745, 
	1.746 sources, 1.736, 1.737
Message-ID: <20090130015736.BD0E970117@cvs1.fedora.phx.redhat.com>

Author: dcantrel

Update of /cvs/pkgs/rpms/anaconda/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26334

Modified Files:
	.cvsignore anaconda.spec sources 
Log Message:
* Thu Jan 29 2009 David Cantrell <dcantrell at redhat.com> - 11.5.0.12-1
- If ks=nfs:... is given, don't try to find the file via boot options
  (#480210). (clumens)
- Fix cdrom install on machines with no network devices (wwoods)
- updated fuzzy strings (jsingh)
- Use modinfo to find out what firmware we need in initrd (wwoods)
- Use the preconf object for yum configuration now (jantill). (clumens)
- Updated Dutch translation adn only 1 -fuzzy- string left (zuma)
- Add a boot target for the xdriver=vesa parameter and document it. (clumens)
- repo.proxy is now a property, so check before setting it (#481342).
  (clumens)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/devel/.cvsignore,v
retrieving revision 1.601
retrieving revision 1.602
diff -u -r1.601 -r1.602
--- .cvsignore	22 Jan 2009 00:32:07 -0000	1.601
+++ .cvsignore	30 Jan 2009 01:57:06 -0000	1.602
@@ -1 +1 @@
-anaconda-11.5.0.11.tar.bz2
+anaconda-11.5.0.12.tar.bz2


Index: anaconda.spec
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/devel/anaconda.spec,v
retrieving revision 1.745
retrieving revision 1.746
diff -u -r1.745 -r1.746
--- anaconda.spec	22 Jan 2009 00:32:07 -0000	1.745
+++ anaconda.spec	30 Jan 2009 01:57:06 -0000	1.746
@@ -2,7 +2,7 @@
 
 Summary: Graphical system installer
 Name:    anaconda
-Version: 11.5.0.11
+Version: 11.5.0.12
 Release: 1
 License: GPLv2+
 Group:   Applications/System
@@ -204,6 +204,18 @@
 %endif
 
 %changelog
+* Thu Jan 29 2009 David Cantrell <dcantrell at redhat.com> - 11.5.0.12-1
+- If ks=nfs:... is given, don't try to find the file via boot options
+  (#480210). (clumens)
+- Fix cdrom install on machines with no network devices (wwoods)
+- updated fuzzy strings (jsingh)
+- Use modinfo to find out what firmware we need in initrd (wwoods)
+- Use the preconf object for yum configuration now (jantill). (clumens)
+- Updated Dutch translation adn only 1 -fuzzy- string left (zuma)
+- Add a boot target for the xdriver=vesa parameter and document it. (clumens)
+- repo.proxy is now a property, so check before setting it (#481342).
+  (clumens)
+
 * Wed Jan 21 2009 David Cantrell <dcantrell at redhat.com> - 11.5.0.11-1
 - Fix a logic problem with network file write outs. (480769) (jkeating)
 - Only run selectBestKernel, selectBootloader, etc. for new installs.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/devel/sources,v
retrieving revision 1.736
retrieving revision 1.737
diff -u -r1.736 -r1.737
--- sources	22 Jan 2009 00:32:07 -0000	1.736
+++ sources	30 Jan 2009 01:57:06 -0000	1.737
@@ -1 +1 @@
-41cd7433c70bf80a85d6fc17a227d2c1  anaconda-11.5.0.11.tar.bz2
+e3c16e3aab67eaf4e18934a31f68915c  anaconda-11.5.0.12.tar.bz2



From emaldonado at fedoraproject.org  Fri Jan 30 01:58:40 2009
From: emaldonado at fedoraproject.org (Elio Maldonado)
Date: Fri, 30 Jan 2009 01:58:40 +0000 (UTC)
Subject: rpms/crypto-utils/F-10 crypto-utils.spec,1.47,1.48
Message-ID: <20090130015841.0030D70117@cvs1.fedora.phx.redhat.com>

Author: emaldonado

Update of /cvs/extras/rpms/crypto-utils/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26565

Modified Files:
	crypto-utils.spec 
Log Message:
Release tag 2_4_1-9


Index: crypto-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/crypto-utils/F-10/crypto-utils.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- crypto-utils.spec	30 Jan 2009 01:53:54 -0000	1.47
+++ crypto-utils.spec	30 Jan 2009 01:58:10 -0000	1.48
@@ -4,7 +4,7 @@
 Summary: SSL certificate and key management utilities
 Name: crypto-utils
 Version: 2.4.1
-Release: 4
+Release: 9
 Source: crypto-rand-%{crver}.tar.gz
 Source1: genkey.pl
 Source2: certwatch.c



From kkofler at fedoraproject.org  Fri Jan 30 02:05:59 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Fri, 30 Jan 2009 02:05:59 +0000 (UTC)
Subject: rpms/kdelibs/F-10 kdelibs.spec,1.399,1.400
Message-ID: <20090130020559.402E270117@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdelibs/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27725/F-10

Modified Files:
	kdelibs.spec 
Log Message:
* Fri Jan 30 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.2.0-5
- reenable PolicyKit and NTFS workarounds

WHY was this commented out??? It applies without the slightest offset or fuzz. Please don't comment out patches!


Index: kdelibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/F-10/kdelibs.spec,v
retrieving revision 1.399
retrieving revision 1.400
diff -u -r1.399 -r1.400
--- kdelibs.spec	27 Jan 2009 00:23:50 -0000	1.399
+++ kdelibs.spec	30 Jan 2009 02:05:28 -0000	1.400
@@ -1,6 +1,6 @@
 Summary: K Desktop Environment 4 - Libraries
 Version: 4.2.0
-Release: 4%{?dist}
+Release: 5%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs
@@ -202,7 +202,7 @@
 %patch9 -p1 -b .branding
 sed -i -e "s|@@VERSION_RELEASE@@|%{version}-%{release}|" kio/kio/kprotocolmanager.cpp
 %patch10 -p1 -b .no-cache-kdeglobals-paths
-#%patch11 -p1 -b .policykit
+%patch11 -p1 -b .policykit
 %patch12 -p1 -b .Administration-menu
 %patch14 -p1 -b .libexecdir
 %patch18 -p1 -b .kstandarddirs
@@ -373,6 +373,9 @@
 
 
 %changelog
+* Fri Jan 30 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.2.0-5
+- reenable PolicyKit and NTFS workarounds
+
 * Mon Jan 26 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.0-4
 - revert Requires: qt4%%{_isa}
 



From kkofler at fedoraproject.org  Fri Jan 30 02:05:59 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Fri, 30 Jan 2009 02:05:59 +0000 (UTC)
Subject: rpms/kdelibs/F-9 kdelibs.spec,1.375,1.376
Message-ID: <20090130020559.A65D170117@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdelibs/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27725/F-9

Modified Files:
	kdelibs.spec 
Log Message:
* Fri Jan 30 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.2.0-5
- reenable PolicyKit and NTFS workarounds

WHY was this commented out??? It applies without the slightest offset or fuzz. Please don't comment out patches!


Index: kdelibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/F-9/kdelibs.spec,v
retrieving revision 1.375
retrieving revision 1.376
diff -u -r1.375 -r1.376
--- kdelibs.spec	27 Jan 2009 10:40:00 -0000	1.375
+++ kdelibs.spec	30 Jan 2009 02:05:29 -0000	1.376
@@ -1,6 +1,6 @@
 Summary: K Desktop Environment 4 - Libraries
 Version: 4.2.0
-Release: 4%{?dist}
+Release: 5%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs
@@ -202,7 +202,7 @@
 %patch9 -p1 -b .branding
 sed -i -e "s|@@VERSION_RELEASE@@|%{version}-%{release}|" kio/kio/kprotocolmanager.cpp
 %patch10 -p1 -b .no-cache-kdeglobals-paths
-#%patch11 -p1 -b .policykit
+%patch11 -p1 -b .policykit
 %patch12 -p1 -b .Administration-menu
 %patch14 -p1 -b .libexecdir
 %patch18 -p1 -b .kstandarddirs
@@ -373,6 +373,9 @@
 
 
 %changelog
+* Fri Jan 30 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.2.0-5
+- reenable PolicyKit and NTFS workarounds
+
 * Mon Jan 26 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.0-4
 - revert Requires: qt4%%{_isa}
 



From kkofler at fedoraproject.org  Fri Jan 30 02:06:00 2009
From: kkofler at fedoraproject.org (Kevin Kofler)
Date: Fri, 30 Jan 2009 02:06:00 +0000 (UTC)
Subject: rpms/kdelibs/devel kdelibs.spec,1.423,1.424
Message-ID: <20090130020600.16FFC70117@cvs1.fedora.phx.redhat.com>

Author: kkofler

Update of /cvs/pkgs/rpms/kdelibs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27725/devel

Modified Files:
	kdelibs.spec 
Log Message:
* Fri Jan 30 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.2.0-5
- reenable PolicyKit and NTFS workarounds

WHY was this commented out??? It applies without the slightest offset or fuzz. Please don't comment out patches!


Index: kdelibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.423
retrieving revision 1.424
diff -u -r1.423 -r1.424
--- kdelibs.spec	27 Jan 2009 00:22:51 -0000	1.423
+++ kdelibs.spec	30 Jan 2009 02:05:29 -0000	1.424
@@ -1,6 +1,6 @@
 Summary: K Desktop Environment 4 - Libraries
 Version: 4.2.0
-Release: 4%{?dist}
+Release: 5%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs
@@ -202,7 +202,7 @@
 %patch9 -p1 -b .branding
 sed -i -e "s|@@VERSION_RELEASE@@|%{version}-%{release}|" kio/kio/kprotocolmanager.cpp
 %patch10 -p1 -b .no-cache-kdeglobals-paths
-#%patch11 -p1 -b .policykit
+%patch11 -p1 -b .policykit
 %patch12 -p1 -b .Administration-menu
 %patch14 -p1 -b .libexecdir
 %patch18 -p1 -b .kstandarddirs
@@ -373,6 +373,9 @@
 
 
 %changelog
+* Fri Jan 30 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.2.0-5
+- reenable PolicyKit and NTFS workarounds
+
 * Mon Jan 26 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.0-4
 - revert Requires: qt4%%{_isa}
 



From ryan52 at fedoraproject.org  Fri Jan 30 02:09:22 2009
From: ryan52 at fedoraproject.org (Ryan Niebur)
Date: Fri, 30 Jan 2009 02:09:22 +0000 (UTC)
Subject: rpms/mkdst/F-10 .cvsignore, 1.9, 1.10 mkdst.spec, 1.10, 1.11 sources,
	1.9, 1.10
Message-ID: <20090130020922.A5D0870117@cvs1.fedora.phx.redhat.com>

Author: ryan52

Update of /cvs/pkgs/rpms/mkdst/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28556

Modified Files:
	.cvsignore mkdst.spec sources 
Log Message:
version 11


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mkdst/F-10/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	11 Dec 2008 06:58:27 -0000	1.9
+++ .cvsignore	30 Jan 2009 02:08:52 -0000	1.10
@@ -1 +1 @@
-mkdst-0.10.tar.bz2
+mkdst-0.11.tar.bz2


Index: mkdst.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mkdst/F-10/mkdst.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- mkdst.spec	11 Dec 2008 06:58:27 -0000	1.10
+++ mkdst.spec	30 Jan 2009 02:08:52 -0000	1.11
@@ -1,7 +1,7 @@
 Name:           mkdst
-Version:        0.10
+Version:        0.11
 %define _datestamp .20081208.19
-#Release:        2%{_datestamp}%{?dist}
+#Release:        1%{_datestamp}%{?dist}
 Release:        1%{?dist}
 Summary:        Source repository to tarball release tool
 
@@ -40,6 +40,9 @@
 %{_datadir}/mkdst/
 
 %changelog
+* Thu Jan 29 2009 Ryan Niebur <ryanryan52 at gmail.com> - 0.11-1
+- 0.11
+
 * Thu Dec 11 2008 Warren Togami <wtogami at redhat.com> - 0.10-1
 - 0.10
   clean only cleans mkdst output, not other stuff


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mkdst/F-10/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	11 Dec 2008 06:58:27 -0000	1.9
+++ sources	30 Jan 2009 02:08:52 -0000	1.10
@@ -1 +1 @@
-d643dc5bb0365249551ed14c97950b4d  mkdst-0.10.tar.bz2
+710d7a79c27c837a8dcde6138274169e  mkdst-0.11.tar.bz2



From roozbeh at fedoraproject.org  Fri Jan 30 02:11:20 2009
From: roozbeh at fedoraproject.org (Roozbeh Pournader)
Date: Fri, 30 Jan 2009 02:11:20 +0000 (UTC)
Subject: rpms/doulos-fonts/devel dead.package, 1.2, 1.3 .cvsignore, 1.7,
	NONE Makefile, 1.3, NONE doulos-fonts.spec, 1.7, NONE sources,
	1.7, NONE
Message-ID: <20090130021120.EE15170117@cvs1.fedora.phx.redhat.com>

Author: roozbeh

Update of /cvs/pkgs/rpms/doulos-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28865

Added Files:
	dead.package 
Removed Files:
	.cvsignore Makefile doulos-fonts.spec sources 
Log Message:
doulos-fonts is getting renamed to sil-doulos-fonts



Index: dead.package
===================================================================
RCS file: dead.package
diff -N dead.package
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ dead.package	30 Jan 2009 02:10:50 -0000	1.3
@@ -0,0 +1 @@
+Renamed to sil-doulos-fonts


--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- doulos-fonts.spec DELETED ---


--- sources DELETED ---



From davej at fedoraproject.org  Fri Jan 30 02:12:05 2009
From: davej at fedoraproject.org (Dave Jones)
Date: Fri, 30 Jan 2009 02:12:05 +0000 (UTC)
Subject: rpms/midisport-firmware/F-10 midisport-firmware.spec,1.5,1.6
Message-ID: <20090130021205.187A670117@cvs1.fedora.phx.redhat.com>

Author: davej

Update of /cvs/pkgs/rpms/midisport-firmware/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29056

Modified Files:
	midisport-firmware.spec 
Log Message:
Fix up path for firmware files in udev rules. (#478911)
  (diff from Patrik Elmberg)


Index: midisport-firmware.spec
===================================================================
RCS file: /cvs/pkgs/rpms/midisport-firmware/F-10/midisport-firmware.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- midisport-firmware.spec	22 Aug 2008 17:19:18 -0000	1.5
+++ midisport-firmware.spec	30 Jan 2009 02:11:34 -0000	1.6
@@ -17,7 +17,7 @@
 %setup -q
 
 %build
-# Nothing to build
+sed -i -e 's|@fxload@|/sbin/fxload|g' -e 's|@firmwaredir@|/lib/firmware|g' 42-midisport-firmware.rules.in
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -43,6 +43,10 @@
 %config %{_sysconfdir}/udev/rules.d/42-midisport-firmware.rules
 
 %changelog
+* Thu Jan 29 2009 Dave Jones <davej at redhat.com>
+- Fix up path for firmware files in udev rules. (#478911)
+  (diff from Patrik Elmberg)
+
 * Thu Aug 14 2008 Dave Jones <davej at redhat.com>
 - Use udev rules from upstream package instead of our own.
 



From davej at fedoraproject.org  Fri Jan 30 02:13:47 2009
From: davej at fedoraproject.org (Dave Jones)
Date: Fri, 30 Jan 2009 02:13:47 +0000 (UTC)
Subject: rpms/midisport-firmware/F-10 midisport-firmware.spec,1.6,1.7
Message-ID: <20090130021347.7E7CA70117@cvs1.fedora.phx.redhat.com>

Author: davej

Update of /cvs/pkgs/rpms/midisport-firmware/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29858

Modified Files:
	midisport-firmware.spec 
Log Message:
bump version


Index: midisport-firmware.spec
===================================================================
RCS file: /cvs/pkgs/rpms/midisport-firmware/F-10/midisport-firmware.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- midisport-firmware.spec	30 Jan 2009 02:11:34 -0000	1.6
+++ midisport-firmware.spec	30 Jan 2009 02:13:17 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           midisport-firmware
 Version:        1.2
-Release:        2
+Release:        3
 Summary:        Firmware for the M-Audio/Midiman USB MIDI and Audio devices
 Group:          System Environment/Kernel
 License:        (MIT or GPLv2+) and Redistributable, no modification permitted
@@ -43,7 +43,7 @@
 %config %{_sysconfdir}/udev/rules.d/42-midisport-firmware.rules
 
 %changelog
-* Thu Jan 29 2009 Dave Jones <davej at redhat.com>
+* Thu Jan 29 2009 Dave Jones <davej at redhat.com> [1.2-2]
 - Fix up path for firmware files in udev rules. (#478911)
   (diff from Patrik Elmberg)
 



From roozbeh at fedoraproject.org  Fri Jan 30 02:13:58 2009
From: roozbeh at fedoraproject.org (Roozbeh Pournader)
Date: Fri, 30 Jan 2009 02:13:58 +0000 (UTC)
Subject: comps comps-f11.xml.in,1.89,1.90
Message-ID: <20090130021358.F2FC170117@cvs1.fedora.phx.redhat.com>

Author: roozbeh

Update of /cvs/pkgs/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29909

Modified Files:
	comps-f11.xml.in 
Log Message:
doulos-fonts is being renamed to sil-doulos-fonts



Index: comps-f11.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f11.xml.in,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -r1.89 -r1.90
--- comps-f11.xml.in	30 Jan 2009 01:40:46 -0000	1.89
+++ comps-f11.xml.in	30 Jan 2009 02:13:28 -0000	1.90
@@ -1525,7 +1525,6 @@
       <packagereq type="optional">dejavu-lgc-sans-mono-fonts</packagereq>
       <packagereq type="optional">dejavu-lgc-serif-fonts</packagereq>
       <packagereq type="optional">denenmo-music-fonts</packagereq>
-      <packagereq type="optional">doulos-fonts</packagereq>
       <packagereq type="optional">dustin-dustismo-fonts</packagereq>
       <packagereq type="optional">ecolier-court-fonts</packagereq>
       <packagereq type="optional">ecolier-court-lignes-fonts</packagereq>



From davej at fedoraproject.org  Fri Jan 30 02:18:36 2009
From: davej at fedoraproject.org (Dave Jones)
Date: Fri, 30 Jan 2009 02:18:36 +0000 (UTC)
Subject: rpms/midisport-firmware/F-10 midisport-firmware.spec,1.7,1.8
Message-ID: <20090130021836.4674670117@cvs1.fedora.phx.redhat.com>

Author: davej

Update of /cvs/pkgs/rpms/midisport-firmware/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30878

Modified Files:
	midisport-firmware.spec 
Log Message:
add dist tag


Index: midisport-firmware.spec
===================================================================
RCS file: /cvs/pkgs/rpms/midisport-firmware/F-10/midisport-firmware.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- midisport-firmware.spec	30 Jan 2009 02:13:17 -0000	1.7
+++ midisport-firmware.spec	30 Jan 2009 02:18:05 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           midisport-firmware
 Version:        1.2
-Release:        3
+Release:        3%{dist}
 Summary:        Firmware for the M-Audio/Midiman USB MIDI and Audio devices
 Group:          System Environment/Kernel
 License:        (MIT or GPLv2+) and Redistributable, no modification permitted



From pgordon at fedoraproject.org  Fri Jan 30 02:18:36 2009
From: pgordon at fedoraproject.org (Peter Gordon)
Date: Fri, 30 Jan 2009 02:18:36 +0000 (UTC)
Subject: rpms/WebKit/devel .cvsignore, 1.11, 1.12 WebKit.spec, 1.22,
	1.23 sources, 1.11, 1.12 WebKit-bison24.patch, 1.1, NONE
Message-ID: <20090130021836.A1E3470117@cvs1.fedora.phx.redhat.com>

Author: pgordon

Update of /cvs/pkgs/rpms/WebKit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30902

Modified Files:
	.cvsignore WebKit.spec sources 
Removed Files:
	WebKit-bison24.patch 
Log Message:
Update to SVN 40351


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/WebKit/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	19 Dec 2008 07:51:59 -0000	1.11
+++ .cvsignore	30 Jan 2009 02:18:06 -0000	1.12
@@ -1 +1 @@
-WebKit-r39370.tar.bz2
+WebKit-r40351.tar.bz2


Index: WebKit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/WebKit/devel/WebKit.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- WebKit.spec	19 Dec 2008 07:51:59 -0000	1.22
+++ WebKit.spec	30 Jan 2009 02:18:06 -0000	1.23
@@ -3,7 +3,7 @@
 	cp -p %1  %{buildroot}%{_docdir}/%{name}-%{version}/$(echo '%1' | sed -e 's!/!.!g') \
 	echo %%{_docdir}/%{name}-%{version}/$(echo '%1' | sed -e 's!/!.!g') >> docfiles.list
 
-%define		svn_revision	39370
+%define		svn_revision	40351
 
 ## Optional build modifications...
 ## --with debug: Enable more verbose debugging. Makes runtime a bit slower.
@@ -49,10 +49,6 @@
 
 Source0:	http://nightly.webkit.org/files/trunk/src/WebKit-r%{svn_revision}.tar.bz2
 
-## Fix compilation issues with Bison 2.4
-## https://bugs.webkit.org/show_bug.cgi?id=22205
-Patch0: 	%{name}-bison24.patch
-
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	bison
@@ -126,7 +122,6 @@
 
 %prep
 %setup -qn "%{name}-r%{svn_revision}"
-%patch0 -p0 -b .bison24
 
 
 %build
@@ -189,7 +184,6 @@
 %doc
 %{_bindir}/jsc
 %{_libdir}/libwebkit-1.0.so.*
-%{_libdir}/libtestnetscapeplugin.so.*
 %{_libexecdir}/WebKit/
 
 %files	gtk-devel
@@ -198,7 +192,6 @@
 %{_datadir}/webkit-1.0
 %{_includedir}/webkit-1.0
 %{_libdir}/libwebkit-1.0.so
-%{_libdir}/libtestnetscapeplugin.so
 %{_libdir}/pkgconfig/webkit-1.0.pc
 
 
@@ -208,6 +201,12 @@
 
 
 %changelog
+* Thu Jan 29 2009 Peter Gordon <peter at thecodergeek.com> 1.0.0-0.17.svn40351
+- Update to new upstream snapshot (SVN 40351): adds the WebPolicyDelegate
+  implementaton and related API (#482739).
+- Drop Bison 2.4 patch (fixed upstream):
+  - bison24.patch
+
 * Sat Nov 29 2008 Peter Gordon <peter at thecodergeek.com> 1.0.0-0.16.svn39370
 - Update to new upstream snapshot (SVN 39370)
 - Fix ownership of %%_docdir in the doc subpackage. 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/WebKit/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	19 Dec 2008 07:51:59 -0000	1.11
+++ sources	30 Jan 2009 02:18:06 -0000	1.12
@@ -1 +1 @@
-0f5b867df3b660511f01c2c456904da3  WebKit-r39370.tar.bz2
+663a8a9a4cd334ccab4a325ba65c6a3c  WebKit-r40351.tar.bz2


--- WebKit-bison24.patch DELETED ---



From davej at fedoraproject.org  Fri Jan 30 02:20:57 2009
From: davej at fedoraproject.org (Dave Jones)
Date: Fri, 30 Jan 2009 02:20:57 +0000 (UTC)
Subject: rpms/midisport-firmware/F-10 midisport-firmware.spec,1.8,1.9
Message-ID: <20090130022057.5407470117@cvs1.fedora.phx.redhat.com>

Author: davej

Update of /cvs/pkgs/rpms/midisport-firmware/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31489

Modified Files:
	midisport-firmware.spec 
Log Message:
correct version


Index: midisport-firmware.spec
===================================================================
RCS file: /cvs/pkgs/rpms/midisport-firmware/F-10/midisport-firmware.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- midisport-firmware.spec	30 Jan 2009 02:18:05 -0000	1.8
+++ midisport-firmware.spec	30 Jan 2009 02:20:27 -0000	1.9
@@ -43,7 +43,7 @@
 %config %{_sysconfdir}/udev/rules.d/42-midisport-firmware.rules
 
 %changelog
-* Thu Jan 29 2009 Dave Jones <davej at redhat.com> [1.2-2]
+* Thu Jan 29 2009 Dave Jones <davej at redhat.com> [1.2-3.fc10]
 - Fix up path for firmware files in udev rules. (#478911)
   (diff from Patrik Elmberg)
 



From davej at fedoraproject.org  Fri Jan 30 02:24:19 2009
From: davej at fedoraproject.org (Dave Jones)
Date: Fri, 30 Jan 2009 02:24:19 +0000 (UTC)
Subject: rpms/midisport-firmware/F-10 midisport-firmware.spec,1.9,1.10
Message-ID: <20090130022419.B2B3D70117@cvs1.fedora.phx.redhat.com>

Author: davej

Update of /cvs/pkgs/rpms/midisport-firmware/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32136

Modified Files:
	midisport-firmware.spec 
Log Message:
I totally noviced the versioning on this


Index: midisport-firmware.spec
===================================================================
RCS file: /cvs/pkgs/rpms/midisport-firmware/F-10/midisport-firmware.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- midisport-firmware.spec	30 Jan 2009 02:20:27 -0000	1.9
+++ midisport-firmware.spec	30 Jan 2009 02:23:49 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           midisport-firmware
 Version:        1.2
-Release:        3%{dist}
+Release:        4%{dist}
 Summary:        Firmware for the M-Audio/Midiman USB MIDI and Audio devices
 Group:          System Environment/Kernel
 License:        (MIT or GPLv2+) and Redistributable, no modification permitted
@@ -43,7 +43,7 @@
 %config %{_sysconfdir}/udev/rules.d/42-midisport-firmware.rules
 
 %changelog
-* Thu Jan 29 2009 Dave Jones <davej at redhat.com> [1.2-3.fc10]
+* Thu Jan 29 2009 Dave Jones <davej at redhat.com> [1.2-4.fc10]
 - Fix up path for firmware files in udev rules. (#478911)
   (diff from Patrik Elmberg)
 



From cebbert at fedoraproject.org  Fri Jan 30 02:54:37 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Fri, 30 Jan 2009 02:54:37 +0000 (UTC)
Subject: rpms/kernel/F-10 linux-2.6.29-lirc.patch, NONE, 1.1 config-generic, 
	1.210, 1.211 kernel.spec, 1.1234, 1.1235 linux-2.6.27-lirc.patch,
	1.2, NONE
Message-ID: <20090130025437.8AB2F70117@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4585

Modified Files:
	config-generic kernel.spec 
Added Files:
	linux-2.6.29-lirc.patch 
Removed Files:
	linux-2.6.27-lirc.patch 
Log Message:
Copy lirc from rawhide.

linux-2.6.29-lirc.patch:

--- NEW FILE linux-2.6.29-lirc.patch ---
 drivers/hid/hid-core.c                |    2 +
 drivers/hid/hid-ids.h                 |    2 +
 drivers/input/Kconfig                 |    2 +
 drivers/input/Makefile                |    2 +
 drivers/input/lirc/Kconfig            |  118 +++
 drivers/input/lirc/Makefile           |   21 +
 drivers/input/lirc/lirc.h             |  100 +++
 drivers/input/lirc/lirc_bt829.c       |  381 +++++++++
 drivers/input/lirc/lirc_dev.c         |  754 ++++++++++++++++++
 drivers/input/lirc/lirc_dev.h         |  178 +++++
 drivers/input/lirc/lirc_i2c.c         |  649 ++++++++++++++++
 drivers/input/lirc/lirc_igorplugusb.c |  554 +++++++++++++
 drivers/input/lirc/lirc_imon.c        | 1369 ++++++++++++++++++++++++++++++++
 drivers/input/lirc/lirc_it87.c        |  984 +++++++++++++++++++++++
 drivers/input/lirc/lirc_it87.h        |  116 +++
 drivers/input/lirc/lirc_ite8709.c     |  539 +++++++++++++
 drivers/input/lirc/lirc_mceusb.c      |  784 +++++++++++++++++++
 drivers/input/lirc/lirc_mceusb2.c     | 1119 ++++++++++++++++++++++++++
 drivers/input/lirc/lirc_parallel.c    |  709 +++++++++++++++++
 drivers/input/lirc/lirc_parallel.h    |   26 +
 drivers/input/lirc/lirc_sasem.c       |  933 ++++++++++++++++++++++
 drivers/input/lirc/lirc_serial.c      | 1321 +++++++++++++++++++++++++++++++
 drivers/input/lirc/lirc_sir.c         | 1294 ++++++++++++++++++++++++++++++
 drivers/input/lirc/lirc_streamzap.c   |  772 ++++++++++++++++++
 drivers/input/lirc/lirc_ttusbir.c     |  396 ++++++++++
 drivers/input/lirc/lirc_zilog.c       | 1382 +++++++++++++++++++++++++++++++++

 26 files changed, 14507 insertions(+), 0 deletions(-)

diff --git a/drivers/input/Kconfig b/drivers/input/Kconfig
index 5f9d860..2ba0904 100644
--- a/drivers/input/Kconfig
+++ b/drivers/input/Kconfig
@@ -170,6 +170,8 @@ source "drivers/input/tablet/Kconfig"
 
 source "drivers/input/touchscreen/Kconfig"
 
+source "drivers/input/lirc/Kconfig"
+
 source "drivers/input/misc/Kconfig"
 
 endif
diff --git a/drivers/input/Makefile b/drivers/input/Makefile
index 98c4f9a..6a1049b 100644
--- a/drivers/input/Makefile
+++ b/drivers/input/Makefile
@@ -25,3 +25,5 @@ obj-$(CONFIG_INPUT_MISC)	+= misc/
 obj-$(CONFIG_INPUT_APMPOWER)	+= apm-power.o
 
 obj-$(CONFIG_XEN_KBDDEV_FRONTEND)	+= xen-kbdfront.o
+
+obj-$(CONFIG_INPUT_LIRC)       += lirc/
diff --git a/drivers/input/lirc/Kconfig b/drivers/input/lirc/Kconfig
new file mode 100644
index 0000000..0482bb9
--- /dev/null
+++ b/drivers/input/lirc/Kconfig
@@ -0,0 +1,118 @@
+#
+# LIRC driver(s) configuration
+#
+menuconfig INPUT_LIRC
+	bool "Linux Infrared Remote Control IR receiver/transmitter drivers"
+	help
+	  Say Y here, and all supported Linux Infrared Remote Control IR and
+	  RF receiver and transmitter drivers will be displayed. When paired
+	  with a remote control and the lirc daemon, the receiver drivers
+	  allow control of your Linux system via remote control.
+
+if INPUT_LIRC
+
+config LIRC_DEV
+	tristate "LIRC device loadable module support"
+	help
+	  LIRC device loadable module support, required for most LIRC drivers
+
+config LIRC_BT829
+        tristate "BT829 based hardware"
+	depends on LIRC_DEV
+	help
+	  Driver for the IR interface on BT829-based hardware
+
+config LIRC_I2C
+	tristate "I2C Based IR Receivers"
+	depends on LIRC_DEV
+	help
+	  Driver for I2C-based IR receivers, such as those commonly
+	  found onboard Hauppauge PVR-150/250/350 video capture cards
+
+config LIRC_IGORPLUGUSB
+	tristate "Igor Cesko's USB IR Receiver"
+	depends on LIRC_DEV && USB
+	help
+	  Driver for Igor Cesko's USB IR Receiver
+
+config LIRC_IMON
+	tristate "Soundgraph IMON Receiver"
+	depends on LIRC_DEV
+	help
+	  Driver for the Soundgraph IMON IR Receiver
+
+config LIRC_IT87
+	tristate "ITE IT87XX CIR Port Receiver"
+	depends on LIRC_DEV
+	help
+	  Driver for the ITE IT87xx IR Receiver
+
+config LIRC_ITE8709
+	tristate "ITE8709 CIR Port Receiver"
+	depends on LIRC_DEV && PNP
+	help
+	  Driver for the ITE8709 IR Receiver
+
+config LIRC_MCEUSB
+	tristate "Microsoft Media Center Ed. Receiver, v1"
+	depends on LIRC_DEV && USB
+	help
+	  Driver for the Microsoft Media Center Ed. Receiver, v1
+
+config LIRC_MCEUSB2
+	tristate "Microsoft Media Center Ed. Receiver, v2"
+	depends on LIRC_DEV && USB
+	help
+	  Driver for the Microsoft Media Center Ed. Receiver, v2
+
+config LIRC_PARALLEL
+	tristate "Homebrew Parallel Port Receiver"
+	depends on LIRC_DEV && !SMP
+	help
+	  Driver for Homebrew Parallel Port Receivers
+
+config LIRC_SASEM
+	tristate "Sasem USB IR Remote"
+	depends on LIRC_DEV
+	help
+	  Driver for the Sasem OnAir Remocon-V or Dign HV5 HTPC IR/VFD Module
+
+config LIRC_SERIAL
+	tristate "Homebrew Serial Port Receiver"
+	depends on LIRC_DEV
+	help
+	  Driver for Homebrew Serial Port Receivers
+
+config LIRC_SERIAL_TRANSMITTER
+	bool "Serial Port Transmitter"
+	default y
+	depends on LIRC_SERIAL
+	help
+	  Serial Port Transmitter support
+
+config LIRC_SIR
+	tristate "Built-in SIR IrDA port"
+	depends on LIRC_DEV
+	help
+	  Driver for the SIR IrDA port
+
+config LIRC_STREAMZAP
+	tristate "Streamzap PC Receiver"
+	depends on LIRC_DEV
+	help
+	  Driver for the Streamzap PC Receiver
+
+config LIRC_TTUSBIR
+	tristate "Technotrend USB IR Receiver"
+	depends on LIRC_DEV && USB
+	help
+	  Driver for the Technotrend USB IR Receiver
+
+config LIRC_ZILOG
+	tristate "Zilog/Hauppauge IR Transmitter"
+	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..a22df78
--- /dev/null
+++ b/drivers/input/lirc/Makefile
@@ -0,0 +1,21 @@
+# Makefile for the lirc drivers.
+#
+
+# Each configuration option enables a list of files.
+
+obj-$(CONFIG_LIRC_DEV)		+= lirc_dev.o
+obj-$(CONFIG_LIRC_BT829)	+= lirc_bt829.o
+obj-$(CONFIG_LIRC_I2C)		+= lirc_i2c.o
+obj-$(CONFIG_LIRC_IGORPLUGUSB)	+= lirc_igorplugusb.o
+obj-$(CONFIG_LIRC_IMON)		+= lirc_imon.o
+obj-$(CONFIG_LIRC_IT87)		+= lirc_it87.o
+obj-$(CONFIG_LIRC_ITE8709)	+= lirc_ite8709.o
+obj-$(CONFIG_LIRC_MCEUSB)	+= lirc_mceusb.o
+obj-$(CONFIG_LIRC_MCEUSB2)	+= lirc_mceusb2.o
+obj-$(CONFIG_LIRC_PARALLEL)	+= lirc_parallel.o
+obj-$(CONFIG_LIRC_SASEM)	+= lirc_sasem.o
+obj-$(CONFIG_LIRC_SERIAL)	+= lirc_serial.o
[...14310 lines suppressed...]
+	/* register with lirc */
+	ir->l.minor = lirc_register_driver(&ir->l);
+	if (ir->l.minor < 0 || ir->l.minor >= MAX_IRCTL_DEVICES) {
+		zilog_error("ir_attach: \"minor\" must be between 0 and %d "
+			    "(%d)!\n", MAX_IRCTL_DEVICES-1, ir->l.minor);
+		ret = -EBADRQC;
+		goto err;
+	}
+
+	/* store this for getting back in open() later on */
+	ir_devices[ir->l.minor] = ir;
+
+	/*
+	 * if we have the tx device, load the 'firmware'.  We do this
+	 * after registering with lirc as otherwise hotplug seems to take
+	 * 10s to create the lirc device.
+	 */
+	if (have_tx) {
+		/* Special TX init */
+		ret = tx_init(ir);
+		if (ret != 0)
+			goto err;
+	}
+	return 0;
+
+err:
+	/* undo everything, hopefully... */
+	if (ir->c_rx.addr)
+		ir_detach(&ir->c_rx);
+	if (ir->c_tx.addr)
+		ir_detach(&ir->c_tx);
+	return ret;
+}
+
+static int ir_detach(struct i2c_client *client)
+{
+	struct IR *ir = i2c_get_clientdata(client);
+	mutex_lock(&ir->lock);
+
+	if (client == &ir->c_rx) {
+		DECLARE_COMPLETION(tn);
+		DECLARE_COMPLETION(tn2);
+
+		/* end up polling thread */
+		if (ir->task && !IS_ERR(ir->task)) {
+			ir->t_notify = &tn;
+			ir->t_notify2 = &tn2;
+			ir->shutdown = 1;
+			wake_up_process(ir->task);
+			complete(&tn2);
+			wait_for_completion(&tn);
+			ir->t_notify = NULL;
+			ir->t_notify2 = NULL;
+		}
+
+		/* unregister device */
+		i2c_detach_client(&ir->c_rx);
+	} else if (client == &ir->c_tx) {
+		i2c_detach_client(&ir->c_tx);
+	} else {
+		mutex_unlock(&ir->lock);
+		zilog_error("ir_detach: detached from something we didn't "
+			    "attach to\n");
+		return -ENODEV;
+	}
+
+	--ir->devs;
+	if (ir->devs < 0) {
+		mutex_unlock(&ir->lock);
+		zilog_error("ir_detach: invalid device count\n");
+		return -ENODEV;
+	} else if (ir->devs == 0) {
+		/* unregister lirc driver */
+		if (ir->l.minor >= 0 && ir->l.minor < MAX_IRCTL_DEVICES) {
+			lirc_unregister_driver(ir->l.minor);
+			ir_devices[ir->l.minor] = NULL;
+		}
+
+		/* free memory */
+		lirc_buffer_free(&ir->buf);
+		mutex_unlock(&ir->lock);
+		kfree(ir);
+		return 0;
+	}
+	mutex_unlock(&ir->lock);
+	return 0;
+}
+
+static int ir_probe(struct i2c_adapter *adap)
+{
+	struct i2c_client c;
+	char buf;
+	memset(&c, 0, sizeof(c));
+
+	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 i2c address 0x71.
+		 * The IR transmitter is at 0x70.
+		 */
+		c.adapter = adap;
+		c.addr = 0x70;
+
+		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);
+	}
+
+	return 0;
+}
+
+static int ir_command(struct i2c_client *client, unsigned int cmd, void *arg)
+{
+	/* nothing */
+	return 0;
+}
+
+static int __init zilog_init(void)
+{
+	mutex_init(&tx_data_lock);
+	request_module("ivtv");
+	request_module("firmware_class");
+	i2c_add_driver(&driver);
+	return 0;
+}
+
+static void __exit zilog_exit(void)
+{
+	i2c_del_driver(&driver);
+	/* if loaded */
+	fw_unload();
+}
+
+module_init(zilog_init);
+module_exit(zilog_exit);
+
+MODULE_DESCRIPTION("Zilog/Hauppauge infrared transmitter driver (i2c stack)");
+MODULE_AUTHOR("Gerd Knorr, Michal Kochanowicz, Christoph Bartelmus, "
+	      "Ulrich Mueller, Stefan Jahn, Jerome Brock, Mark Weaver");
+MODULE_LICENSE("GPL");
+/* for compat with old name, which isn't all that accurate anymore */
+MODULE_ALIAS("lirc_pvr150");
+
+module_param(minor, int, 0444);
+MODULE_PARM_DESC(minor, "Preferred minor device number");
+
+module_param(debug, bool, 0644);
+MODULE_PARM_DESC(debug, "Enable debugging messages");
+
+module_param(disable_rx, bool, 0644);
+MODULE_PARM_DESC(disable_rx, "Disable the IR receiver device");
+
+module_param(disable_tx, bool, 0644);
+MODULE_PARM_DESC(disable_tx, "Disable the IR transmitter device");
diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
index 5d7640e..7001c31 100644
--- a/drivers/hid/hid-core.c
+++ b/drivers/hid/hid-core.c
@@ -1606,6 +1606,8 @@ static const struct hid_device_id hid_ignore_list[] = {
 	{ HID_USB_DEVICE(USB_VENDOR_ID_SOUNDGRAPH, USB_DEVICE_ID_SOUNDGRAPH_IMON_LCD) },
 	{ HID_USB_DEVICE(USB_VENDOR_ID_SOUNDGRAPH, USB_DEVICE_ID_SOUNDGRAPH_IMON_LCD2) },
 	{ HID_USB_DEVICE(USB_VENDOR_ID_SOUNDGRAPH, USB_DEVICE_ID_SOUNDGRAPH_IMON_LCD3) },
+	{ HID_USB_DEVICE(USB_VENDOR_ID_SOUNDGRAPH, USB_DEVICE_ID_SOUNDGRAPH_IMON_LCD4) },
+	{ HID_USB_DEVICE(USB_VENDOR_ID_SOUNDGRAPH, USB_DEVICE_ID_SOUNDGRAPH_IMON_LCD5) },
 	{ HID_USB_DEVICE(USB_VENDOR_ID_TENX, USB_DEVICE_ID_TENX_IBUDDY1) },
 	{ HID_USB_DEVICE(USB_VENDOR_ID_TENX, USB_DEVICE_ID_TENX_IBUDDY2) },
 	{ HID_USB_DEVICE(USB_VENDOR_ID_THRUSTMASTER, 0xb300) },
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
index acc1abc..e899f51 100644
--- a/drivers/hid/hid-ids.h
+++ b/drivers/hid/hid-ids.h
@@ -362,6 +362,8 @@
 #define USB_DEVICE_ID_SOUNDGRAPH_IMON_LCD	0x0038
 #define USB_DEVICE_ID_SOUNDGRAPH_IMON_LCD2	0x0036
 #define USB_DEVICE_ID_SOUNDGRAPH_IMON_LCD3	0x0034
+#define USB_DEVICE_ID_SOUNDGRAPH_IMON_LCD4	0x0044
+#define USB_DEVICE_ID_SOUNDGRAPH_IMON_LCD5	0x0045
 
 #define USB_VENDOR_ID_SUN		0x0430
 #define USB_DEVICE_ID_RARITAN_KVM_DONGLE	0xcdab


Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/config-generic,v
retrieving revision 1.210
retrieving revision 1.211
diff -u -r1.210 -r1.211
--- config-generic	30 Jan 2009 00:24:47 -0000	1.210
+++ config-generic	30 Jan 2009 02:54:07 -0000	1.211
@@ -3737,6 +3737,7 @@
 CONFIG_LIRC_ZILOG=m
 CONFIG_LIRC_PARALLEL=m
 CONFIG_LIRC_SERIAL=m
+CONFIG_LIRC_SERIAL_TRANSMITTER=y
 CONFIG_LIRC_SASEM=m
 CONFIG_LIRC_SIR=m
 CONFIG_LIRC_STREAMZAP=m


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/kernel.spec,v
retrieving revision 1.1234
retrieving revision 1.1235
diff -u -r1.1234 -r1.1235
--- kernel.spec	30 Jan 2009 00:24:47 -0000	1.1234
+++ kernel.spec	30 Jan 2009 02:54:07 -0000	1.1235
@@ -633,7 +633,7 @@
 Patch900: linux-2.6-gspca-git.patch
 Patch901: linux-2.6-gspca-stv06xx-git.patch
 
-Patch1515: linux-2.6.27-lirc.patch
+Patch1515: linux-2.6.29-lirc.patch
 Patch1520: linux-2.6-hdpvr.patch
 
 # Fix the return code CD accesses when the CDROM drive door is closed
@@ -1140,7 +1140,7 @@
 #ApplyPatch linux-2.6-gspca-stv06xx-git.patch
 
 # http://www.lirc.org/
-ApplyPatch linux-2.6.27-lirc.patch
+ApplyPatch linux-2.6.29-lirc.patch
 # http://hg.jannau.net/hdpvr/
 ApplyPatch linux-2.6-hdpvr.patch
 
@@ -1747,6 +1747,9 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Thu Jan 29 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.29-0.5.rc3
+- Copy lirc from rawhide.
+
 * Thu Jan 29 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.29-0.4.rc3
 - Copy firewire updates, at76 driver, a compile fix and a KVM clock fix from rawhide.
 - Temporarily disable CONFIG_DRM_RADEON_KMS


--- linux-2.6.27-lirc.patch DELETED ---



From dcbw at fedoraproject.org  Fri Jan 30 03:21:44 2009
From: dcbw at fedoraproject.org (Daniel Williams)
Date: Fri, 30 Jan 2009 03:21:44 +0000 (UTC)
Subject: rpms/udev-extras/devel .cvsignore, 1.2, 1.3 sources, 1.2,
	1.3 udev-extras.spec, 1.1, 1.2
Message-ID: <20090130032144.EECB470117@cvs1.fedora.phx.redhat.com>

Author: dcbw

Update of /cvs/pkgs/rpms/udev-extras/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8439

Modified Files:
	.cvsignore sources udev-extras.spec 
Log Message:
* Thu Jan 29 2009 Dan Williams <dcbw at redhat.com> 20090125-0.1.20090129git
- Compatibilty updates and fixes for modem prober




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/udev-extras/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	21 Jan 2009 11:47:02 -0000	1.2
+++ .cvsignore	30 Jan 2009 03:21:14 -0000	1.3
@@ -1 +1,2 @@
 udev-extras-20081230-git20090120.tar.bz2
+udev-extras-20090125-git20090129.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/udev-extras/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	21 Jan 2009 11:47:02 -0000	1.2
+++ sources	30 Jan 2009 03:21:14 -0000	1.3
@@ -1 +1 @@
-98f3772f3d5a01d99dd30bbe45156f1a  udev-extras-20081230-git20090120.tar.bz2
+31943131f53dc0e6a6f8698f47f0da3f  udev-extras-20090125-git20090129.tar.bz2


Index: udev-extras.spec
===================================================================
RCS file: /cvs/pkgs/rpms/udev-extras/devel/udev-extras.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- udev-extras.spec	21 Jan 2009 11:47:02 -0000	1.1
+++ udev-extras.spec	30 Jan 2009 03:21:14 -0000	1.2
@@ -2,10 +2,10 @@
 
 Summary: Extra rules and tools for udev
 Name: udev-extras
-Version: 20081230
-Release: 0.2.20090120git%{?dist}
+Version: 20090125
+Release: 0.1.20090129git%{?dist}
 # Source from http://git.kernel.org/?p=linux/hotplug/udev-extras.git
-Source: udev-extras-20081230-git20090120.tar.bz2
+Source: udev-extras-20090125-git20090129.tar.bz2
 License: GPLv2 and GPLv2+
 Group: System Environment/Base
 
@@ -41,13 +41,16 @@
 %doc COPYING TODO 
 #%doc README ChangeLog
 %attr(0755,root,root) %{udev_scriptdir}/modem-modeswitch
-%attr(0755,root,root) %{udev_scriptdir}/probe-modem
+%attr(0755,root,root) %{udev_scriptdir}/modem-probe
 %attr(0755,root,root) %{udev_scriptdir}/usbdev_id
 %attr(0644,root,root) %{udev_scriptdir}/rules.d/*.rules
 %attr(0644,root,root) %{_mandir}/man8/modem-modeswitch*.8*
-%attr(0644,root,root) %{_mandir}/man8/probe-modem*.8*
+%attr(0644,root,root) %{_mandir}/man8/modem-probe*.8*
 
 %changelog
+* Thu Jan 29 2009 Dan Williams <dcbw at redhat.com> 20090125-0.1.20090129git
+- Compatibilty updates and fixes for modem prober
+
 * Tue Jan 20 2009 Harald Hoyer <harald at redhat.com> 20081230-0.2.20090120git
 - added BuildRequires
 - README and ChangeLog left out for now (zero size)



From cebbert at fedoraproject.org  Fri Jan 30 03:22:12 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Fri, 30 Jan 2009 03:22:12 +0000 (UTC)
Subject: rpms/kernel/F-10 drm-nouveau.patch, 1.5, 1.6 kernel.spec, 1.1235,
	1.1236
Message-ID: <20090130032212.CEB2870117@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8614

Modified Files:
	drm-nouveau.patch kernel.spec 
Log Message:
Copy lirc and nouveau from rawhide.

drm-nouveau.patch:

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.5 -r 1.6 drm-nouveau.patch
Index: drm-nouveau.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/drm-nouveau.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- drm-nouveau.patch	15 Jan 2009 22:22:41 -0000	1.5
+++ drm-nouveau.patch	30 Jan 2009 03:22:12 -0000	1.6
@@ -1,120 +1,29 @@
-From a1d9ea66c8a7234e1d04c703e37323e2a625a7df Mon Sep 17 00:00:00 2001
-From: Ben Skeggs <skeggsb at gmail.com>
-Date: Tue, 13 Jan 2009 14:24:46 +1000
-Subject: [PATCH] drm: import nouveau driver
-
----
- drivers/gpu/drm/Kconfig                    |    6 +
- drivers/gpu/drm/Makefile                   |    1 +
- drivers/gpu/drm/drm_bufs.c                 |    5 +-
- drivers/gpu/drm/nouveau/Makefile           |   20 +
- drivers/gpu/drm/nouveau/nouveau_bo.c       |  296 +
- drivers/gpu/drm/nouveau/nouveau_dma.c      |  172 +
- drivers/gpu/drm/nouveau/nouveau_dma.h      |   96 +
- drivers/gpu/drm/nouveau/nouveau_drm.h      |  184 +
- drivers/gpu/drm/nouveau/nouveau_drv.c      |  112 +
- drivers/gpu/drm/nouveau/nouveau_drv.h      |  621 ++
- drivers/gpu/drm/nouveau/nouveau_fence.c    |  119 +
- drivers/gpu/drm/nouveau/nouveau_fifo.c     |  601 ++
- drivers/gpu/drm/nouveau/nouveau_ioc32.c    |   72 +
- drivers/gpu/drm/nouveau/nouveau_irq.c      |  588 ++
- drivers/gpu/drm/nouveau/nouveau_mem.c      |  867 +++
- drivers/gpu/drm/nouveau/nouveau_notifier.c |  165 +
- drivers/gpu/drm/nouveau/nouveau_object.c   | 1174 +++
- drivers/gpu/drm/nouveau/nouveau_reg.h      |  593 ++
- drivers/gpu/drm/nouveau/nouveau_sgdma.c    |  342 +
- drivers/gpu/drm/nouveau/nouveau_state.c    |  867 +++
- drivers/gpu/drm/nouveau/nouveau_swmthd.c   |  191 +
- drivers/gpu/drm/nouveau/nouveau_swmthd.h   |   33 +
- drivers/gpu/drm/nouveau/nv04_fb.c          |   23 +
- drivers/gpu/drm/nouveau/nv04_fifo.c        |  138 +
- drivers/gpu/drm/nouveau/nv04_graph.c       |  516 ++
- drivers/gpu/drm/nouveau/nv04_instmem.c     |  159 +
- drivers/gpu/drm/nouveau/nv04_mc.c          |   22 +
- drivers/gpu/drm/nouveau/nv04_timer.c       |   53 +
- drivers/gpu/drm/nouveau/nv10_fb.c          |   25 +
- drivers/gpu/drm/nouveau/nv10_fifo.c        |  169 +
- drivers/gpu/drm/nouveau/nv10_graph.c       |  914 +++
- drivers/gpu/drm/nouveau/nv20_graph.c       |  913 +++
- drivers/gpu/drm/nouveau/nv40_fb.c          |   62 +
- drivers/gpu/drm/nouveau/nv40_fifo.c        |  209 +
- drivers/gpu/drm/nouveau/nv40_graph.c       | 2193 ++++++
- drivers/gpu/drm/nouveau/nv40_mc.c          |   38 +
- drivers/gpu/drm/nouveau/nv50_fifo.c        |  343 +
- drivers/gpu/drm/nouveau/nv50_graph.c       |  321 +
- drivers/gpu/drm/nouveau/nv50_grctx.h       |11512 ++++++++++++++++++++++++++++
- drivers/gpu/drm/nouveau/nv50_instmem.c     |  324 +
- drivers/gpu/drm/nouveau/nv50_mc.c          |   43 +
- include/drm/Kbuild                         |    2 +
- include/drm/drmP.h                         |    2 +
- include/drm/nouveau_drm.h                  |  184 +
- 44 files changed, 25288 insertions(+), 2 deletions(-)
- create mode 100644 drivers/gpu/drm/nouveau/Makefile
- create mode 100644 drivers/gpu/drm/nouveau/nouveau_bo.c
- create mode 100644 drivers/gpu/drm/nouveau/nouveau_dma.c
- create mode 100644 drivers/gpu/drm/nouveau/nouveau_dma.h
- create mode 100644 drivers/gpu/drm/nouveau/nouveau_drm.h
- create mode 100644 drivers/gpu/drm/nouveau/nouveau_drv.c
- create mode 100644 drivers/gpu/drm/nouveau/nouveau_drv.h
- create mode 100644 drivers/gpu/drm/nouveau/nouveau_fence.c
- create mode 100644 drivers/gpu/drm/nouveau/nouveau_fifo.c
- create mode 100644 drivers/gpu/drm/nouveau/nouveau_ioc32.c
- create mode 100644 drivers/gpu/drm/nouveau/nouveau_irq.c
- create mode 100644 drivers/gpu/drm/nouveau/nouveau_mem.c
- create mode 100644 drivers/gpu/drm/nouveau/nouveau_notifier.c
- create mode 100644 drivers/gpu/drm/nouveau/nouveau_object.c
- create mode 100644 drivers/gpu/drm/nouveau/nouveau_reg.h
- create mode 100644 drivers/gpu/drm/nouveau/nouveau_sgdma.c
- create mode 100644 drivers/gpu/drm/nouveau/nouveau_state.c
- create mode 100644 drivers/gpu/drm/nouveau/nouveau_swmthd.c
- create mode 100644 drivers/gpu/drm/nouveau/nouveau_swmthd.h
- create mode 100644 drivers/gpu/drm/nouveau/nv04_fb.c
- create mode 100644 drivers/gpu/drm/nouveau/nv04_fifo.c
- create mode 100644 drivers/gpu/drm/nouveau/nv04_graph.c
- create mode 100644 drivers/gpu/drm/nouveau/nv04_instmem.c
- create mode 100644 drivers/gpu/drm/nouveau/nv04_mc.c
- create mode 100644 drivers/gpu/drm/nouveau/nv04_timer.c
- create mode 100644 drivers/gpu/drm/nouveau/nv10_fb.c
- create mode 100644 drivers/gpu/drm/nouveau/nv10_fifo.c
- create mode 100644 drivers/gpu/drm/nouveau/nv10_graph.c
- create mode 100644 drivers/gpu/drm/nouveau/nv20_graph.c
- create mode 100644 drivers/gpu/drm/nouveau/nv40_fb.c
- create mode 100644 drivers/gpu/drm/nouveau/nv40_fifo.c
- create mode 100644 drivers/gpu/drm/nouveau/nv40_graph.c
- create mode 100644 drivers/gpu/drm/nouveau/nv40_mc.c
- create mode 100644 drivers/gpu/drm/nouveau/nv50_fifo.c
- create mode 100644 drivers/gpu/drm/nouveau/nv50_graph.c
- create mode 100644 drivers/gpu/drm/nouveau/nv50_grctx.h
- create mode 100644 drivers/gpu/drm/nouveau/nv50_instmem.c
- create mode 100644 drivers/gpu/drm/nouveau/nv50_mc.c
- create mode 100644 include/drm/nouveau_drm.h
-
 diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig
-index af32c34..1766c5a 100644
+index 5130b72..f29b63b 100644
 --- a/drivers/gpu/drm/Kconfig
 +++ b/drivers/gpu/drm/Kconfig
-@@ -114,3 +114,9 @@ config DRM_SAVAGE
+@@ -123,3 +123,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"
++	tristate "Nouveau (nvidia) cards"
 +	depends on DRM
 +	help
-+	  Choose this option for open-source nVidia support.
++	  Choose for nvidia support
 diff --git a/drivers/gpu/drm/Makefile b/drivers/gpu/drm/Makefile
-index cf6af69..dc12f9a 100644
+index 30022c4..1cccfaf 100644
 --- a/drivers/gpu/drm/Makefile
 +++ b/drivers/gpu/drm/Makefile
-@@ -26,4 +26,5 @@ obj-$(CONFIG_DRM_I915)  += i915/
+@@ -25,4 +25,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 9ed8259..ed46425 100644
+index 72c667f..414b52b 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
@@ -124,7 +33,7 @@
 -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)
++ 					   drm_local_map_t *map)
  {
  	struct drm_map_list *entry;
  	list_for_each_entry(entry, &dev->maplist, head) {
@@ -138,19 +47,18 @@
  			  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..557f04e
+index 0000000..f01f82a
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/Makefile
-@@ -0,0 +1,20 @@
+@@ -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 \
++             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 \
@@ -744,196 +652,6 @@
 +} while(0)
 +
 +#endif
-diff --git a/drivers/gpu/drm/nouveau/nouveau_drm.h b/drivers/gpu/drm/nouveau/nouveau_drm.h
-new file mode 100644
-index 0000000..a99c615
---- /dev/null
-+++ b/drivers/gpu/drm/nouveau/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
[...13943 lines suppressed...]
-+	0x0007, 0x00000000,
-+	0x0001, 0x3f800000,
-+	0x0007, 0x00000000,
-+	0x0001, 0x3f800000,
-+	0x0007, 0x00000000,
-+	0x0001, 0x3f800000,
-+	0x0007, 0x00000000,
-+	0x0001, 0x3f800000,
-+	0x0007, 0x00000000,
-+	0x0001, 0x3f800000,
-+	0x0007, 0x00000000,
-+	0x0001, 0x3f800000,
-+	0x0007, 0x00000000,
-+	0x0001, 0x00000010,
-+	0x0017, 0x00000000,
-+	0x0001, 0x00000003,
-+	0x0047, 0x00000000,
-+	0x0001, 0x08100c12,
-+	0x0008, 0x00000000,
-+	0x0003, 0x00000080,
-+	0x0004, 0x00000000,
-+	0x0001, 0x00000080,
-+	0x0003, 0x80007004,
-+	0x0004, 0x00000000,
-+	0x0001, 0x80007004,
-+	0x0003, 0x04000400,
-+	0x0004, 0x00000000,
-+	0x0001, 0x04000400,
-+	0x0003, 0x00001000,
-+	0x0004, 0x00000000,
-+	0x0001, 0x00001000,
-+	0x0010, 0x00000000,
-+	0x0003, 0x00000001,
-+	0x0004, 0x00000000,
-+	0x0001, 0x00000001,
-+	0x0010, 0x00000000,
-+	0x0003, 0x00000001,
-+	0x0004, 0x00000000,
-+	0x0001, 0x00000001,
-+	0x0008, 0x00000000,
-+	0x0003, 0x00000004,
-+	0x0004, 0x00000000,
-+	0x0001, 0x00000004,
-+	0x0003, 0x00000002,
-+	0x0004, 0x00000000,
-+	0x0001, 0x00000002,
-+	0x0058, 0x00000000,
-+	0x0003, 0x00000080,
-+	0x0004, 0x00000000,
-+	0x0001, 0x00000080,
-+	0x0003, 0x80007004,
-+	0x0004, 0x00000000,
-+	0x0001, 0x80007004,
-+	0x0003, 0x04000400,
-+	0x0004, 0x00000000,
-+	0x0001, 0x04000400,
-+	0x0003, 0x00001000,
-+	0x0004, 0x00000000,
-+	0x0001, 0x00001000,
-+	0x0010, 0x00000000,
-+	0x0003, 0x00000001,
-+	0x0004, 0x00000000,
-+	0x0001, 0x00000001,
-+	0x0010, 0x00000000,
-+	0x0003, 0x00000001,
-+	0x0004, 0x00000000,
-+	0x0001, 0x00000001,
-+	0x0008, 0x00000000,
-+	0x0003, 0x00000004,
-+	0x0004, 0x00000000,
-+	0x0001, 0x00000004,
-+	0x0003, 0x00000002,
-+	0x0004, 0x00000000,
-+	0x0001, 0x00000002,
-+	0x0050, 0x00000000,
-+	0x0003, 0x08100c12,
-+	0x0004, 0x00000000,
-+	0x0001, 0x08100c12,
-+	0x0030, 0x00000000,
-+	0x0003, 0x0000ffff,
-+	0x0004, 0x00000000,
-+	0x0004, 0x0000ffff,
-+	0x0004, 0x00000000,
-+	0x0004, 0x0000ffff,
-+	0x0004, 0x00000000,
-+	0x0004, 0x0000ffff,
-+	0x0004, 0x00000000,
-+	0x0001, 0x0000ffff,
-+	0x0003, 0x00000001,
-+	0x0004, 0x00000000,
-+	0x0001, 0x00000001,
-+	0x0003, 0x00010001,
-+	0x0004, 0x00000000,
-+	0x0004, 0x00010001,
-+	0x0004, 0x00000000,
-+	0x0001, 0x00010001,
-+	0x0003, 0x00000001,
-+	0x0004, 0x00000000,
-+	0x0001, 0x00000001,
-+	0x0008, 0x00000000,
-+	0x0003, 0x0001fe21,
-+	0x0004, 0x00000000,
-+	0x0001, 0x0001fe21,
-+	0x0028, 0x00000000,
-+	0x0003, 0x08100c12,
-+	0x0004, 0x00000000,
-+	0x0001, 0x08100c12,
-+	0x0003, 0x00000004,
-+	0x0004, 0x00000000,
-+	0x0001, 0x00000004,
-+	0x0008, 0x00000000,
-+	0x0003, 0x00000002,
-+	0x0004, 0x00000000,
-+	0x0001, 0x00000002,
-+	0x0003, 0x00000011,
-+	0x0004, 0x00000000,
-+	0x0001, 0x00000011,
-+	0x0040, 0x00000000,
-+	0x0003, 0x0fac6881,
-+	0x0004, 0x00000000,
-+	0x0001, 0x0fac6881,
-+	0x0020, 0x00000000,
-+	0x0003, 0x00000004,
-+	0x0004, 0x00000000,
-+	0x0001, 0x00000004,
-+	0x0048, 0x00000000,
-+	0x0003, 0x00000002,
-+	0x0004, 0x00000000,
-+	0x0001, 0x00000002,
-+	0x0003, 0x00000001,
-+	0x0004, 0x00000000,
-+	0x0004, 0x00000001,
-+	0x0004, 0x00000000,
-+	0x0001, 0x00000001,
-+	0x0003, 0x00000002,
-+	0x0004, 0x00000000,
-+	0x0001, 0x00000002,
-+	0x0003, 0x00000001,
-+	0x0004, 0x00000000,
-+	0x0004, 0x00000001,
-+	0x0004, 0x00000000,
-+	0x0004, 0x00000001,
-+	0x0004, 0x00000000,
-+	0x0001, 0x00000001,
-+	0x0008, 0x00000000,
-+	0x0003, 0x00000004,
-+	0x0004, 0x00000000,
-+	0x0001, 0x00000004,
-+	0x1d18, 0x00000000,
-+	0x0003, 0x00000011,
-+	0x0004, 0x00000000,
-+	0x0001, 0x00000011,
-+	0x0008, 0x00000000,
-+	0x0003, 0x00000001,
-+	0x0004, 0x00000000,
-+	0x0001, 0x00000001,
-+	0x0000
-+};
-+#endif
 diff --git a/drivers/gpu/drm/nouveau/nv50_instmem.c b/drivers/gpu/drm/nouveau/nv50_instmem.c
 new file mode 100644
 index 0000000..b7a51f0
@@ -25455,25 +15430,24 @@
 +{
 +}
 diff --git a/include/drm/Kbuild b/include/drm/Kbuild
-index b940fdf..a9de055 100644
+index b940fdf..cfa6af4 100644
 --- a/include/drm/Kbuild
 +++ b/include/drm/Kbuild
-@@ -8,3 +8,5 @@ unifdef-y += radeon_drm.h
+@@ -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 18cae19..df715fe 100644
+index afb7858..d8dae5f 100644
 --- a/include/drm/drmP.h
 +++ b/include/drm/drmP.h
-@@ -1202,6 +1202,8 @@ extern void drm_idlelock_release(struct drm_lock_data *lock_data);
+@@ -1160,6 +1160,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);
++ 					   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,
@@ -25667,6 +15641,3 @@
 +#define DRM_NOUVEAU_RESUME             0x0c
 +
 +#endif /* __NOUVEAU_DRM_H__ */
--- 
-1.6.0.6
-


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/kernel.spec,v
retrieving revision 1.1235
retrieving revision 1.1236
diff -u -r1.1235 -r1.1236
--- kernel.spec	30 Jan 2009 02:54:07 -0000	1.1235
+++ kernel.spec	30 Jan 2009 03:22:12 -0000	1.1236
@@ -1747,8 +1747,8 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
-* Thu Jan 29 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.29-0.5.rc3
-- Copy lirc from rawhide.
+* Thu Jan 29 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.29-0.6.rc3
+- Copy lirc and nouveau from rawhide.
 
 * Thu Jan 29 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.29-0.4.rc3
 - Copy firewire updates, at76 driver, a compile fix and a KVM clock fix from rawhide.



From mclasen at fedoraproject.org  Fri Jan 30 03:31:47 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Fri, 30 Jan 2009 03:31:47 +0000 (UTC)
Subject: rpms/gtk2/devel gtk2.spec,1.354,1.355
Message-ID: <20090130033147.9712D70117@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gtk2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9848

Modified Files:
	gtk2.spec 
Log Message:
cleanups



Index: gtk2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtk2/devel/gtk2.spec,v
retrieving revision 1.354
retrieving revision 1.355
diff -u -r1.354 -r1.355
--- gtk2.spec	30 Jan 2009 00:59:41 -0000	1.354
+++ gtk2.spec	30 Jan 2009 03:31:17 -0000	1.355
@@ -77,9 +77,6 @@
 # and these for gdk-pixbuf-query-loaders
 Requires(post): libtiff >= 3.6.1
 
-%define _unpackaged_files_terminate_build      1
-%define _missing_doc_files_terminate_build     1
-
 
 %description
 GTK+ is a multi-platform toolkit for creating graphical user
@@ -244,10 +241,12 @@
 mkdir -p $RPM_BUILD_ROOT%{_libdir}/gtk-2.0/immodules
 mkdir -p $RPM_BUILD_ROOT%{_libdir}/gtk-2.0/%{bin_version}/filesystems
 
+%if 0
 # we need to install a binary in the immodules directory to make sure
 # that it gets properly relocated to /emul for ia64 emulation of x86
 # See https://bugzilla.redhat.com/show_bug.cgi?id=253726
 install -m 0755 relocation-tag $RPM_BUILD_ROOT%{_libdir}/gtk-2.0/immodules
+%endif
 
 #
 # We need the substitution of $host so we use an external



From ryan52 at fedoraproject.org  Fri Jan 30 03:54:28 2009
From: ryan52 at fedoraproject.org (Ryan Niebur)
Date: Fri, 30 Jan 2009 03:54:28 +0000 (UTC)
Subject: rpms/ltsp/F-9 .cvsignore, 1.35, 1.36 ltsp.spec, 1.46, 1.47 sources, 
	1.39, 1.40
Message-ID: <20090130035428.BFD0D70117@cvs1.fedora.phx.redhat.com>

Author: ryan52

Update of /cvs/pkgs/rpms/ltsp/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13347

Modified Files:
	.cvsignore ltsp.spec sources 
Log Message:
version 5.1.55


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ltsp/F-9/.cvsignore,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- .cvsignore	28 Jan 2009 21:57:25 -0000	1.35
+++ .cvsignore	30 Jan 2009 03:53:56 -0000	1.36
@@ -1 +1,2 @@
 ltsp-5.1.54.tar.bz2
+ltsp-5.1.55.tar.bz2


Index: ltsp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ltsp/F-9/ltsp.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- ltsp.spec	28 Jan 2009 21:57:25 -0000	1.46
+++ ltsp.spec	30 Jan 2009 03:53:56 -0000	1.47
@@ -1,5 +1,5 @@
 Name:           ltsp
-Version:        5.1.54
+Version:        5.1.55
 %define _datestamp .20090128.01
 #Release:        2%{_datestamp}%{?dist}
 Release:        1%{?dist}
@@ -407,6 +407,11 @@
 %endif
 
 %changelog
+* Thu Jan 29 2009 Ryan Niebur <ryanryan52 at gmail.com> - 5.1.55-1
+- Fix default setting of ALSA hardware volume. WARNING: This triples
+  the default software volume and will be a big surprise if your
+  speakers are maxed out.
+
 * Wed Jan 28 2009 Warren Togami <wtogami at redhat.com> - 5.1.54-1
 - Fix ltsp-build-client
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ltsp/F-9/sources,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- sources	28 Jan 2009 21:57:25 -0000	1.39
+++ sources	30 Jan 2009 03:53:56 -0000	1.40
@@ -1 +1,2 @@
 46ecfe37e11888bd1cda97b4da825156  ltsp-5.1.54.tar.bz2
+2cec513136aa0baee1d315ea63da8c7e  ltsp-5.1.55.tar.bz2



From ryan52 at fedoraproject.org  Fri Jan 30 03:55:54 2009
From: ryan52 at fedoraproject.org (Ryan Niebur)
Date: Fri, 30 Jan 2009 03:55:54 +0000 (UTC)
Subject: rpms/ltsp/F-9 .cvsignore,1.36,1.37 sources,1.40,1.41
Message-ID: <20090130035554.7689A70117@cvs1.fedora.phx.redhat.com>

Author: ryan52

Update of /cvs/pkgs/rpms/ltsp/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13494

Modified Files:
	.cvsignore sources 
Log Message:
remove the old tarballs from sources and .cvsignore


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ltsp/F-9/.cvsignore,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- .cvsignore	30 Jan 2009 03:53:56 -0000	1.36
+++ .cvsignore	30 Jan 2009 03:55:24 -0000	1.37
@@ -1,2 +1 @@
-ltsp-5.1.54.tar.bz2
 ltsp-5.1.55.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ltsp/F-9/sources,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- sources	30 Jan 2009 03:53:56 -0000	1.40
+++ sources	30 Jan 2009 03:55:24 -0000	1.41
@@ -1,2 +1 @@
-46ecfe37e11888bd1cda97b4da825156  ltsp-5.1.54.tar.bz2
 2cec513136aa0baee1d315ea63da8c7e  ltsp-5.1.55.tar.bz2



From ryan52 at fedoraproject.org  Fri Jan 30 03:57:48 2009
From: ryan52 at fedoraproject.org (Ryan Niebur)
Date: Fri, 30 Jan 2009 03:57:48 +0000 (UTC)
Subject: rpms/ltsp/F-10 .cvsignore, 1.25, 1.26 ltsp.spec, 1.31, 1.32 sources,
	1.29, 1.30
Message-ID: <20090130035748.5CB7170117@cvs1.fedora.phx.redhat.com>

Author: ryan52

Update of /cvs/pkgs/rpms/ltsp/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13774

Modified Files:
	.cvsignore ltsp.spec sources 
Log Message:
version 5.1.55


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ltsp/F-10/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- .cvsignore	28 Jan 2009 21:56:01 -0000	1.25
+++ .cvsignore	30 Jan 2009 03:57:17 -0000	1.26
@@ -1 +1 @@
-ltsp-5.1.54.tar.bz2
+ltsp-5.1.55.tar.bz2


Index: ltsp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ltsp/F-10/ltsp.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- ltsp.spec	28 Jan 2009 21:56:01 -0000	1.31
+++ ltsp.spec	30 Jan 2009 03:57:17 -0000	1.32
@@ -1,5 +1,5 @@
 Name:           ltsp
-Version:        5.1.54
+Version:        5.1.55
 %define _datestamp .20090128.01
 #Release:        2%{_datestamp}%{?dist}
 Release:        1%{?dist}
@@ -407,6 +407,11 @@
 %endif
 
 %changelog
+* Thu Jan 29 2009 Ryan Niebur <ryanryan52 at gmail.com> - 5.1.55-1
+- Fix default setting of ALSA hardware volume. WARNING: This triples
+  the default software volume and will be a big surprise if your
+  speakers are maxed out.
+
 * Wed Jan 28 2009 Warren Togami <wtogami at redhat.com> - 5.1.54-1
 - Fix ltsp-build-client
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ltsp/F-10/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- sources	28 Jan 2009 21:56:02 -0000	1.29
+++ sources	30 Jan 2009 03:57:17 -0000	1.30
@@ -1 +1 @@
-46ecfe37e11888bd1cda97b4da825156  ltsp-5.1.54.tar.bz2
+2cec513136aa0baee1d315ea63da8c7e  ltsp-5.1.55.tar.bz2



From ryan52 at fedoraproject.org  Fri Jan 30 04:22:23 2009
From: ryan52 at fedoraproject.org (Ryan Niebur)
Date: Fri, 30 Jan 2009 04:22:23 +0000 (UTC)
Subject: rpms/ltsp/devel .cvsignore, 1.14, 1.15 ltsp.spec, 1.19, 1.20 sources,
	1.18, 1.19
Message-ID: <20090130042223.A0E1C70117@cvs1.fedora.phx.redhat.com>

Author: ryan52

Update of /cvs/pkgs/rpms/ltsp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17648

Modified Files:
	.cvsignore ltsp.spec sources 
Log Message:
merge changes from F-10 into devel. new version 5.1.55.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ltsp/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	1 Nov 2008 10:15:59 -0000	1.14
+++ .cvsignore	30 Jan 2009 04:21:53 -0000	1.15
@@ -1 +1 @@
-ltsp-5.1.32.tar.bz2
+ltsp-5.1.55.tar.bz2


Index: ltsp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ltsp/devel/ltsp.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- ltsp.spec	1 Nov 2008 10:15:59 -0000	1.19
+++ ltsp.spec	30 Jan 2009 04:21:53 -0000	1.20
@@ -1,7 +1,7 @@
 Name:           ltsp
-Version:        5.1.32
-%define _datestamp .20081031.14
-#Release:        0%{_datestamp}%{?dist}
+Version:        5.1.55
+%define _datestamp .20090128.01
+#Release:        2%{_datestamp}%{?dist}
 Release:        1%{?dist}
 Summary:        Linux Terminal Server Project Server and Client
 Group:          User Interface/Desktops
@@ -38,25 +38,26 @@
 %description
 LTSP client and server
 
-%if 0%{?fedora}
 %package client
 Summary:        LTSP client
 Group:          User Interface/Desktops
 Requires:       chkconfig
 Requires:       ltspfsd
 Requires:       nbd
+# Jetpipe needs pyserial
+Requires:       pyserial
 Requires(post): initscripts
 BuildRequires:  glib2-devel
 
 %description client
 LTSP client package
 This package contains the scripts necessary to boot as a LTSP5 thin client.
-%endif
 
 %package server
 Summary:        LTSP server
 Group:          User Interface/Desktops
 %if 0%{?fedora}
+# XXX: Fix this after RHEL5 livecd-tools backports is complete.
 # needed to install client chroots
 Requires:       livecd-tools >= 015
 %endif
@@ -107,7 +108,6 @@
 %install
 ##### make directories
 rm -rf $RPM_BUILD_ROOT
-%if 0%{?fedora}
 # client
 mkdir -p $RPM_BUILD_ROOT%{_bindir}
 mkdir -p $RPM_BUILD_ROOT%{_sbindir}
@@ -116,11 +116,11 @@
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/X11/
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/ltsp/
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/ltsp/chroot-setup.d/
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/ltsp/template/
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/ldm/rc.d/
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/kernel/postinst.d/
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/kernel/prerm.d/
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/
-%endif
 
 # server
 mkdir -p $RPM_BUILD_ROOT%{_mandir}/man8
@@ -148,14 +148,12 @@
 mkdir -p $RPM_BUILD_ROOT%{_tftpdir}/ltsp/ppc/
 mkdir -p $RPM_BUILD_ROOT%{_tftpdir}/ltsp/ppc64/
 
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/ltsp/live-config/
-
-%if 0%{?fedora}
 ###### client install
 pushd localapps
     make install DESTDIR=$RPM_BUILD_ROOT
 popd
 install -m 0755 localapps/ltsp-localappsd $RPM_BUILD_ROOT/%{_bindir}/
+install -m 0755 localapps/ltsp-genmenu $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/
@@ -167,6 +165,7 @@
 install -m 0755 client/initscripts/RPM/ltsp-client-launch $RPM_BUILD_ROOT%{_sbindir}
 install -m 0644 client/rwtab.d/k12linux.rwtab $RPM_BUILD_ROOT%{_sysconfdir}/rwtab.d
 install -m 0644 client/screen-x-common $RPM_BUILD_ROOT/%{_datadir}/ltsp/
+install -m 0755 client/xinitrc $RPM_BUILD_ROOT/%{_datadir}/ltsp/
 install -m 0755 client/jetpipe/jetpipe $RPM_BUILD_ROOT/%{_sbindir}
 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}
@@ -174,6 +173,9 @@
 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/
+cp -av client/screen-session.d $RPM_BUILD_ROOT/%{_datadir}/ltsp/
+cp -av client/xinitrc.d $RPM_BUILD_ROOT/%{_datadir}/ltsp/
+cp -av client/template/k12linux/* $RPM_BUILD_ROOT%{_datadir}/ltsp/template/
 touch $RPM_BUILD_ROOT%{_sysconfdir}/lts.conf
 touch $RPM_BUILD_ROOT%{_localstatedir}/lib/random-seed
 # We need these files in both in client and server, but it ends up in the same place.
@@ -183,17 +185,14 @@
 install -m 0644 server/configs/k12linux/mkinitrd/sysconfig-mkinitrd $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/mkinitrd.ltsp-template
 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 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/ltsp-update-sshkeys $RPM_BUILD_ROOT%{_sbindir}
-%if 0%{?fedora}
 install -m 0755 server/ltsp-build-client $RPM_BUILD_ROOT%{_sbindir}
 cp -pr server/plugins/* $RPM_BUILD_ROOT%{_datadir}/ltsp/plugins/
-%endif
 install -m 0755 server/ltsp-update-kernels $RPM_BUILD_ROOT%{_sbindir}
 install -m 0755 server/scripts/k12linux/ltsp-update-image $RPM_BUILD_ROOT%{_sbindir}
 install -m 0755 server/scripts/k12linux/chroot-creator $RPM_BUILD_ROOT%{_sbindir}
@@ -214,7 +213,6 @@
 install -m 0755 server/scripts/k12linux/dhcpd-update $RPM_BUILD_ROOT/%{_datadir}/ltsp/scripts/
 cp -p server/scripts/k12linux/scripts.d/*   $RPM_BUILD_ROOT%{_datadir}/ltsp/scripts.d/
 cp -p server/scripts/k12linux/chkconfig.d/* $RPM_BUILD_ROOT%{_datadir}/ltsp/chkconfig.d/
-cp -a server/configs/k12linux/live-config/* $RPM_BUILD_ROOT%{_sysconfdir}/ltsp/live-config/
 install -m 0644 server/scripts/k12linux/mksquashfs-exclude $RPM_BUILD_ROOT/%{_datadir}/ltsp/
 
 # Remove irrelevant plugins from package
@@ -237,14 +235,18 @@
 
 install -m 0644 server/configs/k12linux/ltspdist.template $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/ltspdist
 
-%ifarch %{ix86} x86_64
 # PXE
 install -m 0644 server/configs/pxe-default.conf $RPM_BUILD_ROOT%{_tftpdir}/ltsp/i386/pxelinux.cfg/default
 install -m 0644 server/configs/pxe-default.conf $RPM_BUILD_ROOT%{_tftpdir}/ltsp/x86_64/pxelinux.cfg/default
+%ifarch %{ix86} x86_64
 install -m 0644 /usr/lib/syslinux/pxelinux.0 $RPM_BUILD_ROOT%{_tftpdir}/ltsp/i386
 install -m 0644 /usr/lib/syslinux/pxelinux.0 $RPM_BUILD_ROOT%{_tftpdir}/ltsp/x86_64
 %endif
 
+# PPC
+install -m 0644 server/configs/k12linux/yaboot-default.conf $RPM_BUILD_ROOT%{_tftpdir}/ltsp/ppc/yaboot.conf
+install -m 0644 server/configs/k12linux/yaboot-default.conf $RPM_BUILD_ROOT%{_tftpdir}/ltsp/ppc64/yaboot.conf
+
 %if 0%{?fedora}
 %ifarch %{ix86} x86_64
 # vmclient
@@ -257,10 +259,8 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%if 0%{?fedora}
 %post client
 /usr/share/ltsp/ltsp-chroot-setup
-%endif
 
 %post server
 /sbin/chkconfig --add ltsp-dhcpd
@@ -300,7 +300,6 @@
     /sbin/service ltsp-dhcpd condrestart >/dev/null 2>&1
 fi
 
-%if 0%{?fedora}
 %files client
 %defattr(-,root,root,-)
 %{_mandir}/man1/getltscfg.1.gz
@@ -315,6 +314,10 @@
 %{_datadir}/ltsp/screen_session
 %{_datadir}/ltsp/screen-x-common
 %{_datadir}/ltsp/screen.d/
+%{_datadir}/ltsp/screen-session.d/
+%{_datadir}/ltsp/xinitrc
+%{_datadir}/ltsp/xinitrc.d/
+%{_datadir}/ltsp/template/
 %{_datadir}/ldm/rc.d/
 %{_sbindir}/jetpipe
 %{_sbindir}/ltsp-rewrap-latest-kernel
@@ -322,6 +325,7 @@
 %{_datadir}/ltsp/ltsp-chroot-setup
 %{_datadir}/ltsp/chroot-setup.d/
 %{_bindir}/ltsp-localappsd
+%{_bindir}/ltsp-genmenu
 %{_sysconfdir}/sysconfig/mkinitrd.ltsp-template
 %{_sysconfdir}/kernel/postinst.d/ltsp
 %{_sysconfdir}/kernel/prerm.d/ltsp
@@ -330,7 +334,6 @@
 %{_sysconfdir}/rwtab.d/*
 %{_localstatedir}/lib/random-seed
 %config(noreplace) %{_sysconfdir}/lts.conf
-%endif
 
 %files server
 %defattr(-,root,root,-)
@@ -348,19 +351,18 @@
 %ifarch %{ix86} x86_64
 %{_tftpdir}/ltsp/i386/pxelinux.0
 %{_tftpdir}/ltsp/x86_64/pxelinux.0
+%endif
 %config(noreplace) %{_tftpdir}/ltsp/i386/pxelinux.cfg/default
 %config(noreplace) %{_tftpdir}/ltsp/x86_64/pxelinux.cfg/default
-%endif
+%config(noreplace) %{_tftpdir}/ltsp/ppc/yaboot.conf
+%config(noreplace) %{_tftpdir}/ltsp/ppc64/yaboot.conf
 %{_bindir}/ltsp-localapps
-%{_sysconfdir}/ltsp/live-config/
 
 %dir /opt/ltsp
 %dir /opt/ltsp/images
 
-%if 0%{?fedora}
 %{_sbindir}/ltsp-build-client
 %{_datadir}/ltsp/plugins/
-%endif
 %{_sbindir}/ltsp-prepare-kernel
 %{_sbindir}/ltsp-server-initialize
 %{_sbindir}/ltsp-update-kernels
@@ -369,6 +371,7 @@
 %{_datadir}/ltsp/scripts.d/
 %{_datadir}/ltsp/chkconfig.d/
 %{_datadir}/ltsp/mksquashfs-exclude
+%{_datadir}/ltsp/ltsp-common-functions
 %{_sbindir}/ltsp-update-sshkeys
 %{_sbindir}/nbdrootd
 %{_sbindir}/nbdswapd
@@ -388,15 +391,7 @@
 %config(noreplace) %{_sysconfdir}/ltsp/ltsp-server.conf
 %config(noreplace) %{_sysconfdir}/ltsp/dhcpd.conf
 %config(noreplace) %{_sysconfdir}/ltsp/ltsp-update-kernels.conf
-%dir %{_sysconfdir}/ltsp/kickstart/
-%dir %{_sysconfdir}/ltsp/kickstart/Fedora/
-%{_sysconfdir}/ltsp/kickstart/Fedora/common.ks
-%{_sysconfdir}/ltsp/kickstart/Fedora/common-i386.ks
-%{_sysconfdir}/ltsp/kickstart/Fedora/common-i686.ks
-%{_sysconfdir}/ltsp/kickstart/Fedora/common-x86_64.ks
-%dir %{_sysconfdir}/ltsp/kickstart/Fedora/8/
-%dir %{_sysconfdir}/ltsp/kickstart/Fedora/9/
-%{_sysconfdir}/ltsp/kickstart/*/*/*.ks
+%{_sysconfdir}/ltsp/kickstart/
 %dir %{_sysconfdir}/ltsp/mkinitrd/
 %{_sysconfdir}/ltsp/mkinitrd/*
 %config(noreplace) %{_tftpdir}/ltsp/*/lts.conf
@@ -412,6 +407,63 @@
 %endif
 
 %changelog
+* Thu Jan 29 2009 Ryan Niebur <ryanryan52 at gmail.com> - 5.1.55-1
+- Fix default setting of ALSA hardware volume. WARNING: This triples
+  the default software volume and will be a big surprise if your
+  speakers are maxed out.
+
+* Wed Jan 28 2009 Warren Togami <wtogami at redhat.com> - 5.1.54-1
+- Fix ltsp-build-client
+
+* Wed Jan 28 2009 Warren Togami <wtogami at redhat.com> - 5.1.53-1
+- Fix client shutdown with NBD root
+
+* Wed Jan 21 2009 Warren Togami <wtogami at redhat.com> - 5.1.51-1
+- Fedora 11 support and more bug fixes
+
+* Wed Jan 21 2009 Warren Togami <wtogami at redhat.com> - 5.1.49-1
+- ltsp-genmenu replaces menu entries in the XDG menu with localapps transparently
+
+* Thu Jan 15 2009 Warren Togami <wtogami at redhat.com> - 5.1.48-1
+- More bug fixes
+
+* Mon Dec 29 2008 Warren Togami <wtogami at redhat.com> - 5.1.44-1
+- More bug fixes
+
+* Wed Dec 24 2008 Warren Togami <wtogami at redhat.com> - 5.1.42-1
+- More bug fixes
+
+* Fri Dec 19 2008 Warren Togami <wtogami at redhat.com> - 5.1.41-1
+- PPC chroot creation and automatic netboot, needs testing
+- More bug fixes
+
+* Tue Dec 16 2008 Warren Togami <wtogami at redhat.com> - 5.1.39-1
+- More bug fixes
+
+* Thu Dec 12 2008 Warren Togami <wtogami at redhat.com> - 5.1.38-1
+- Fix a few bugs in X_* option handling
+- Added LOCAL_APPS_WHITELIST, disabled by default
+  If set, only defined commands are allowed to be run as local apps.
+
+* Thu Dec 11 2008 Warren Togami <wtogami at redhat.com> - 5.1.37-1
+- Now possible to set default session that is not GNOME
+  See /etc/ltsp/ldm-global-dmrc
+- X_* lts.conf options are now supported
+- AMD Geode GX2 should automatically be forced to the geode driver now
+
+* Mon Dec 08 2008 Warren Togami <wtogami at redhat.com> - 5.1.36-1
+- jetpipe in ltsp-client requires pyserial
+- /etc/cups/client.conf writable for local apps printing to to local
+  printers directly (not common, requires cups installed in chroot)
+
+* Thu Nov 13 2008 Warren Togami <wtogami at redhat.com> - 5.1.34-2
+- Enable plymouth support if supported hardware is detected
+- jetpipe supports serial printers
+- TIMEZONE and TIMESERVER options for thin clients
+- Move LDM to VT1 by default
+- Prevent error during client chroot config
+- Many other little bug fixes
+
 * Sat Nov 01 2008 Warren Togami <wtogami at redhat.com> - 5.1.32-1
 - Exclude wireless drivers because they cannot netboot, and they can often
   cause boot problems because of missing firmware


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ltsp/devel/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources	1 Nov 2008 10:15:59 -0000	1.18
+++ sources	30 Jan 2009 04:21:53 -0000	1.19
@@ -1 +1 @@
-a317c6e06a393bb7769d375d9cb42226  ltsp-5.1.32.tar.bz2
+2cec513136aa0baee1d315ea63da8c7e  ltsp-5.1.55.tar.bz2



From ryan52 at fedoraproject.org  Fri Jan 30 04:28:01 2009
From: ryan52 at fedoraproject.org (Ryan Niebur)
Date: Fri, 30 Jan 2009 04:28:01 +0000 (UTC)
Subject: rpms/ltspfs/devel .cvsignore, 1.5, 1.6 ltspfs.spec, 1.4, 1.5 sources,
	1.5, 1.6
Message-ID: <20090130042802.027F170117@cvs1.fedora.phx.redhat.com>

Author: ryan52

Update of /cvs/pkgs/rpms/ltspfs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18386

Modified Files:
	.cvsignore ltspfs.spec sources 
Log Message:
merge F-10 (version 0.5.8) changes into devel


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ltspfs/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	12 Oct 2008 06:42:10 -0000	1.5
+++ .cvsignore	30 Jan 2009 04:27:31 -0000	1.6
@@ -1 +1 @@
-ltspfs-0.5.5.tar.bz2
+ltspfs-0.5.8.tar.bz2


Index: ltspfs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ltspfs/devel/ltspfs.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ltspfs.spec	12 Oct 2008 06:42:10 -0000	1.4
+++ ltspfs.spec	30 Jan 2009 04:27:31 -0000	1.5
@@ -1,5 +1,7 @@
 Name:           ltspfs
-Version:        0.5.5
+Version:        0.5.8
+%define _datestamp .20081211.20
+#Release:        2%{_datestamp}%{?dist}
 Release:        1%{?dist}
 Summary:        LTSP file system, daemon that runs on thin clients
 
@@ -80,6 +82,9 @@
 %dir %{_localstatedir}/run/devices/
 
 %changelog
+* Thu Dec 11 2008 Warren Togami <wtogami at redhat.com> - 0.5.8-1
+- LOCALDEV_DENY stuff
+
 * Sun Oct 12 2008 Warren Togami <wtogami at redhat.com> - 0.5.5-1
 - 0.5.5 fixes a cdpinger segfault
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ltspfs/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	12 Oct 2008 06:42:10 -0000	1.5
+++ sources	30 Jan 2009 04:27:31 -0000	1.6
@@ -1 +1 @@
-35ffe3d472f19cb011cbd7dc7132b883  ltspfs-0.5.5.tar.bz2
+484f5cf26db069c012a1b97480405626  ltspfs-0.5.8.tar.bz2



From ryan52 at fedoraproject.org  Fri Jan 30 04:31:31 2009
From: ryan52 at fedoraproject.org (Ryan Niebur)
Date: Fri, 30 Jan 2009 04:31:31 +0000 (UTC)
Subject: rpms/mkdst/devel mkdst.spec,1.11,1.12
Message-ID: <20090130043131.B0CCD70117@cvs1.fedora.phx.redhat.com>

Author: ryan52

Update of /cvs/pkgs/rpms/mkdst/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18944

Modified Files:
	mkdst.spec 
Log Message:
merge changes from F-10


Index: mkdst.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mkdst/devel/mkdst.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- mkdst.spec	30 Jan 2009 01:50:23 -0000	1.11
+++ mkdst.spec	30 Jan 2009 04:31:01 -0000	1.12
@@ -1,5 +1,7 @@
 Name:           mkdst
 Version:        0.11
+%define _datestamp .20081208.19
+#Release:        1%{_datestamp}%{?dist}
 Release:        1%{?dist}
 Summary:        Source repository to tarball release tool
 
@@ -41,6 +43,12 @@
 * Thu Jan 29 2009 Ryan Niebur <ryanryan52 at gmail.com> - 0.11-1
 - 0.11
 
+* Thu Dec 11 2008 Warren Togami <wtogami at redhat.com> - 0.10-1
+- 0.10
+  clean only cleans mkdst output, not other stuff
+  tarballs are stripped of anything listed in .bzrignore
+  RPM SOURCEDIR is working dir, so patches are available
+
 * Thu Aug 28 2008 Michael Schwendt <mschwendt at fedoraproject.org> - 0.9-2
 - include /usr/share/mkdst directory
 



From pkgdb at fedoraproject.org  Fri Jan 30 04:38:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 04:38:58 +0000
Subject: [pkgdb] system-config-netboot: viru has requested watchcommits
Message-ID: <20090130043858.8AB7C208484@bastion.fedora.phx.redhat.com>

viru has requested the watchcommits acl on system-config-netboot (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/system-config-netboot



From mtasaka at fedoraproject.org  Fri Jan 30 04:39:18 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Fri, 30 Jan 2009 04:39:18 +0000 (UTC)
Subject: rpms/kazehakase/devel .cvsignore, 1.22, 1.23 kazehakase.spec, 1.68, 
	1.69 sources, 1.22, 1.23
Message-ID: <20090130043918.81BB870117@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/kazehakase/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19754

Modified Files:
	.cvsignore kazehakase.spec sources 
Log Message:
* Fri Jan 30 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
- Try rev 3598
- Now WebKit >= rev 39421 is needed



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kazehakase/devel/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- .cvsignore	30 Oct 2008 16:17:58 -0000	1.22
+++ .cvsignore	30 Jan 2009 04:38:48 -0000	1.23
@@ -1 +1 @@
-kazehakase-0.5.6.tar.gz
+kazehakase-0.5.6-svn3598_trunk.tar.gz


Index: kazehakase.spec
===================================================================
RCS file: /cvs/extras/rpms/kazehakase/devel/kazehakase.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- kazehakase.spec	22 Dec 2008 15:39:02 -0000	1.68
+++ kazehakase.spec	30 Jan 2009 04:38:48 -0000	1.69
@@ -9,15 +9,16 @@
 %define		rubyabi		1.8
 %define		support_webkit	1
 
-%undefine		usesvn		
+%define		usesvn		1
 %define		need_autogen	0
 
+%if 0%{?fedora} == 11
+%define		min_webkit_EVR	1.0.0-0.16.svn39421
+%endif
+
 %if 0%{?fedora} >= 9
 %define		Geckover	1.9
 %endif
-%if 0%{?fedora} == 8
-%define		Geckover	1.8.1.17
-%endif
 
 %if 0%{?usesvn} > 0
 %define		need_autogen	1
@@ -26,10 +27,10 @@
 %define		obsolete_plugin_ver	0.4.5-1
 
 %define		repoid		33533
-%define		svnver		3509_trunk
+%define		svnver		3598_trunk
 
 
-%define		fedorarel	2
+%define		fedorarel	3
 %define		_release	%{fedorarel}%{?usesvn:.svn%svnver}
 
 %if 0%{?fedora} < 1
@@ -70,7 +71,7 @@
 BuildRequires:	ruby
 %endif
 %if %{support_webkit}
-BuildRequires:	WebKit-gtk-devel
+BuildRequires:	WebKit-gtk-devel %{?min_webkit_EVR:>= %{min_webkit_EVR}}
 %endif 	
 
 BuildRequires:	desktop-file-utils
@@ -164,6 +165,7 @@
 Summary:	Kazehakase browser using WebKit rendering engine
 Group:		Application/Internet
 Requires:	%{name}-base = %{version}-%{release}
+Requires:	WebKit-gtk %{?min_webkit_EVR:>= %{min_webkit_EVR}}
 
 %description	webkit
 Kazehakase is a Web browser which aims to provide 
@@ -293,8 +295,12 @@
 %endif
 
 %changelog
+* Fri Jan 30 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- Try rev 3598
+- Now WebKit >= rev 39421 is needed
+
 * Tue Dec 23 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
-- Rebuild against xulrunner 1.9.1
+- F-11: Rebuild against xulrunner 1.9.1
 
 * Fri Oct 31 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.5.6-1
 - 0.5.6


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kazehakase/devel/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- sources	30 Oct 2008 16:17:58 -0000	1.22
+++ sources	30 Jan 2009 04:38:48 -0000	1.23
@@ -1 +1 @@
-b88257aa10dd53fd5d39c627f8f95890  kazehakase-0.5.6.tar.gz
+7123bece50f35b61fe099b3d128ea0bf  kazehakase-0.5.6-svn3598_trunk.tar.gz



From mtasaka at fedoraproject.org  Fri Jan 30 05:16:48 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Fri, 30 Jan 2009 05:16:48 +0000 (UTC)
Subject: rpms/jd/F-9 .cvsignore, 1.340, 1.341 jd.spec, 1.386, 1.387 sources, 
	1.341, 1.342
Message-ID: <20090130051648.653A970117@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24386/F-9

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
* Fri Jan 30 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
- rev 2643



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/F-9/.cvsignore,v
retrieving revision 1.340
retrieving revision 1.341
diff -u -r1.340 -r1.341
--- .cvsignore	28 Jan 2009 16:52:54 -0000	1.340
+++ .cvsignore	30 Jan 2009 05:16:18 -0000	1.341
@@ -1 +1 @@
-jd-2.1.1-beta090128.tgz
+jd-2.2.0-svn2643_trunk.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/F-9/jd.spec,v
retrieving revision 1.386
retrieving revision 1.387
diff -u -r1.386 -r1.387
--- jd.spec	28 Jan 2009 16:52:54 -0000	1.386
+++ jd.spec	30 Jan 2009 05:16:18 -0000	1.387
@@ -10,8 +10,7 @@
 # Defined by upsteam
 #
 %define         main_ver      2.2.0
-%define         tarball_ver   2.1.1
-%define         strtag        beta090128
+%define         strtag        svn2643_trunk
 %define         repoid        37324
 # Define this if this is pre-version
 %define         pre_release   1
@@ -53,7 +52,7 @@
 Group:          Applications/Internet
 License:        GPLv2
 URL:            http://jd4linux.sourceforge.jp/
-Source0:        http://downloads.sourceforge.jp/jd4linux/%{repoid}/%{name}-%{tarball_ver}-%{strtag}.tgz
+Source0:        http://downloads.sourceforge.jp/jd4linux/%{repoid}/%{name}-%{main_ver}-%{strtag}.tgz
 #Source0:	%{name}-%{main_ver}-%{strtag}.tgz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -79,7 +78,7 @@
 JD is a 2ch browser based on gtkmm2.
 
 %prep
-%setup -q -n %{name}-%{tarball_ver}-%{strtag}
+%setup -q -n %{name}-%{main_ver}-%{strtag}
 #find . -name .svn | sort -r | xargs %{__rm} -rf
 
 %{__sed} -i.retag \
@@ -140,6 +139,9 @@
 %{icondir}/%{name}.png
 
 %changelog
+* Fri Jan 30 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- rev 2643
+
 * Thu Jan 29 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.2.0-0.3.beta090128
 - '2.2.0' beta 090128
 - Although tarball says version is 2.1.1, the upsteam developer said that


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/F-9/sources,v
retrieving revision 1.341
retrieving revision 1.342
diff -u -r1.341 -r1.342
--- sources	28 Jan 2009 16:52:54 -0000	1.341
+++ sources	30 Jan 2009 05:16:18 -0000	1.342
@@ -1 +1 @@
-8169a698c333041f1cab91d3dd9807b3  jd-2.1.1-beta090128.tgz
+581c6a9c3226c6b13a4db2e940558c4d  jd-2.2.0-svn2643_trunk.tgz



From mtasaka at fedoraproject.org  Fri Jan 30 05:16:48 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Fri, 30 Jan 2009 05:16:48 +0000 (UTC)
Subject: rpms/jd/F-10 .cvsignore, 1.340, 1.341 jd.spec, 1.395, 1.396 sources,
	1.341, 1.342
Message-ID: <20090130051648.3430170117@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24386/F-10

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
* Fri Jan 30 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
- rev 2643



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/F-10/.cvsignore,v
retrieving revision 1.340
retrieving revision 1.341
diff -u -r1.340 -r1.341
--- .cvsignore	28 Jan 2009 16:52:54 -0000	1.340
+++ .cvsignore	30 Jan 2009 05:16:17 -0000	1.341
@@ -1 +1 @@
-jd-2.1.1-beta090128.tgz
+jd-2.2.0-svn2643_trunk.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/F-10/jd.spec,v
retrieving revision 1.395
retrieving revision 1.396
diff -u -r1.395 -r1.396
--- jd.spec	28 Jan 2009 16:52:54 -0000	1.395
+++ jd.spec	30 Jan 2009 05:16:17 -0000	1.396
@@ -10,8 +10,7 @@
 # Defined by upsteam
 #
 %define         main_ver      2.2.0
-%define         tarball_ver   2.1.1
-%define         strtag        beta090128
+%define         strtag        svn2643_trunk
 %define         repoid        37324
 # Define this if this is pre-version
 %define         pre_release   1
@@ -53,7 +52,7 @@
 Group:          Applications/Internet
 License:        GPLv2
 URL:            http://jd4linux.sourceforge.jp/
-Source0:        http://downloads.sourceforge.jp/jd4linux/%{repoid}/%{name}-%{tarball_ver}-%{strtag}.tgz
+Source0:        http://downloads.sourceforge.jp/jd4linux/%{repoid}/%{name}-%{main_ver}-%{strtag}.tgz
 #Source0:	%{name}-%{main_ver}-%{strtag}.tgz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -79,7 +78,7 @@
 JD is a 2ch browser based on gtkmm2.
 
 %prep
-%setup -q -n %{name}-%{tarball_ver}-%{strtag}
+%setup -q -n %{name}-%{main_ver}-%{strtag}
 #find . -name .svn | sort -r | xargs %{__rm} -rf
 
 %{__sed} -i.retag \
@@ -140,6 +139,9 @@
 %{icondir}/%{name}.png
 
 %changelog
+* Fri Jan 30 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- rev 2643
+
 * Thu Jan 29 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.2.0-0.3.beta090128
 - '2.2.0' beta 090128
 - Although tarball says version is 2.1.1, the upsteam developer said that


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/F-10/sources,v
retrieving revision 1.341
retrieving revision 1.342
diff -u -r1.341 -r1.342
--- sources	28 Jan 2009 16:52:54 -0000	1.341
+++ sources	30 Jan 2009 05:16:17 -0000	1.342
@@ -1 +1 @@
-8169a698c333041f1cab91d3dd9807b3  jd-2.1.1-beta090128.tgz
+581c6a9c3226c6b13a4db2e940558c4d  jd-2.2.0-svn2643_trunk.tgz



From mtasaka at fedoraproject.org  Fri Jan 30 05:16:48 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Fri, 30 Jan 2009 05:16:48 +0000 (UTC)
Subject: rpms/jd/devel .cvsignore, 1.331, 1.332 jd.spec, 1.388, 1.389 sources,
	1.332, 1.333
Message-ID: <20090130051648.BCE9270117@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24386/devel

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
* Fri Jan 30 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
- rev 2643



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/.cvsignore,v
retrieving revision 1.331
retrieving revision 1.332
diff -u -r1.331 -r1.332
--- .cvsignore	28 Jan 2009 16:52:55 -0000	1.331
+++ .cvsignore	30 Jan 2009 05:16:18 -0000	1.332
@@ -1 +1 @@
-jd-2.1.1-beta090128.tgz
+jd-2.2.0-svn2643_trunk.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/jd.spec,v
retrieving revision 1.388
retrieving revision 1.389
diff -u -r1.388 -r1.389
--- jd.spec	28 Jan 2009 16:52:55 -0000	1.388
+++ jd.spec	30 Jan 2009 05:16:18 -0000	1.389
@@ -10,8 +10,7 @@
 # Defined by upsteam
 #
 %define         main_ver      2.2.0
-%define         tarball_ver   2.1.1
-%define         strtag        beta090128
+%define         strtag        svn2643_trunk
 %define         repoid        37324
 # Define this if this is pre-version
 %define         pre_release   1
@@ -53,7 +52,7 @@
 Group:          Applications/Internet
 License:        GPLv2
 URL:            http://jd4linux.sourceforge.jp/
-Source0:        http://downloads.sourceforge.jp/jd4linux/%{repoid}/%{name}-%{tarball_ver}-%{strtag}.tgz
+Source0:        http://downloads.sourceforge.jp/jd4linux/%{repoid}/%{name}-%{main_ver}-%{strtag}.tgz
 #Source0:	%{name}-%{main_ver}-%{strtag}.tgz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -79,7 +78,7 @@
 JD is a 2ch browser based on gtkmm2.
 
 %prep
-%setup -q -n %{name}-%{tarball_ver}-%{strtag}
+%setup -q -n %{name}-%{main_ver}-%{strtag}
 #find . -name .svn | sort -r | xargs %{__rm} -rf
 
 %{__sed} -i.retag \
@@ -140,6 +139,9 @@
 %{icondir}/%{name}.png
 
 %changelog
+* Fri Jan 30 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- rev 2643
+
 * Thu Jan 29 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.2.0-0.3.beta090128
 - '2.2.0' beta 090128
 - Although tarball says version is 2.1.1, the upsteam developer said that


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/sources,v
retrieving revision 1.332
retrieving revision 1.333
diff -u -r1.332 -r1.333
--- sources	28 Jan 2009 16:52:55 -0000	1.332
+++ sources	30 Jan 2009 05:16:18 -0000	1.333
@@ -1 +1 @@
-8169a698c333041f1cab91d3dd9807b3  jd-2.1.1-beta090128.tgz
+581c6a9c3226c6b13a4db2e940558c4d  jd-2.2.0-svn2643_trunk.tgz



From rishi at fedoraproject.org  Fri Jan 30 05:19:00 2009
From: rishi at fedoraproject.org (Debarshi Ray)
Date: Fri, 30 Jan 2009 05:19:00 +0000 (UTC)
Subject: rpms/gok/devel gok.spec,1.68,1.69
Message-ID: <20090130051900.973BC70117@cvs1.fedora.phx.redhat.com>

Author: rishi

Update of /cvs/pkgs/rpms/gok/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25061

Modified Files:
	gok.spec 
Log Message:
* Fri Jan 30 2009 Debarshi Ray <rishi at fedoraproject.org> - 2.25.3-4
- Removed mixed use of tabs and spaces.
- Use parallel make.



Index: gok.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gok/devel/gok.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- gok.spec	24 Jan 2009 05:44:56 -0000	1.68
+++ gok.spec	30 Jan 2009 05:18:30 -0000	1.69
@@ -3,7 +3,7 @@
 Summary: GNOME Onscreen Keyboard
 Name: gok
 Version: 2.25.3
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: LGPLv2+
 Group: User Interface/Desktops
 URL: http://www.gok.ca/
@@ -11,17 +11,17 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 Patch0: gok-0.10.2-launcher.patch
 
-Requires(pre):   GConf2
+Requires(pre):    GConf2
 Requires(post):   GConf2
 Requires(post):   scrollkeeper >= 0.1.4
 Requires(preun):   GConf2
 Requires(postun): scrollkeeper >= 0.1.4
 
-Requires:	at-spi
-Requires:	htmlview
+Requires:       at-spi
+Requires:       htmlview
 
-BuildRequires:	at-spi-devel
-BuildRequires:	gail-devel
+BuildRequires:  at-spi-devel
+BuildRequires:  gail-devel
 BuildRequires:  intltool
 BuildRequires:  scrollkeeper
 BuildRequires:  libgnomeui-devel
@@ -69,7 +69,7 @@
 
 %build
 %configure
-make
+make %{?_smp_mflags}
 
 iconv -f latin1 -t utf-8 NEWS > NEWSx && mv NEWSx NEWS
 
@@ -139,6 +139,10 @@
 %{_datadir}/gtk-doc/html/gok
 
 %changelog
+* Fri Jan 30 2009 Debarshi Ray <rishi at fedoraproject.org> - 2.25.3-4
+- Removed mixed use of tabs and spaces.
+- Use parallel make.
+
 * Sat Jan 24 2009 Matthias Clasen <mclasen at redhat.com> - 2.25.3-3
 - Merge review feedback (#225852)
 



From pkgdb at fedoraproject.org  Fri Jan 30 06:16:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 06:16:05 +0000
Subject: [pkgdb] nullmodem was added for fab
Message-ID: <20090130061605.76477208485@bastion.fedora.phx.redhat.com>

kevin has added Package nullmodem with summary A utility to loopback pseudo-terminals
kevin has approved Package nullmodem
kevin has added a Fedora devel branch for nullmodem with an owner of fab
kevin has approved nullmodem in Fedora devel
kevin has approved Package nullmodem
kevin has set commit to Approved for provenpackager on nullmodem (Fedora devel)
kevin has set build to Approved for provenpackager on nullmodem (Fedora devel)
kevin has set checkout to Approved for provenpackager on nullmodem (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/nullmodem



From pkgdb at fedoraproject.org  Fri Jan 30 06:16:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 06:16:07 +0000
Subject: [pkgdb] nullmodem (Fedora, 9) updated by kevin
Message-ID: <20090130061607.91CBA208494@bastion.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for nullmodem
kevin has set commit to Approved for provenpackager on nullmodem (Fedora 9)
kevin has set build to Approved for provenpackager on nullmodem (Fedora 9)
kevin has set checkout to Approved for provenpackager on nullmodem (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/nullmodem



From kevin at fedoraproject.org  Fri Jan 30 06:16:25 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 30 Jan 2009 06:16:25 +0000 (UTC)
Subject: rpms/nullmodem - New directory
Message-ID: <20090130061625.4991A70117@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/nullmodem
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsQui407/rpms/nullmodem

Log Message:
Directory /cvs/pkgs/rpms/nullmodem added to the repository




From kevin at fedoraproject.org  Fri Jan 30 06:16:25 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 30 Jan 2009 06:16:25 +0000 (UTC)
Subject: rpms/nullmodem/devel - New directory
Message-ID: <20090130061625.821D370144@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/nullmodem/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsQui407/rpms/nullmodem/devel

Log Message:
Directory /cvs/pkgs/rpms/nullmodem/devel added to the repository




From pkgdb at fedoraproject.org  Fri Jan 30 06:16:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 06:16:07 +0000
Subject: [pkgdb] nullmodem (Fedora, 10) updated by kevin
Message-ID: <20090130061607.9D33C208497@bastion.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for nullmodem
kevin has set commit to Approved for provenpackager on nullmodem (Fedora 10)
kevin has set build to Approved for provenpackager on nullmodem (Fedora 10)
kevin has set checkout to Approved for provenpackager on nullmodem (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/nullmodem



From kevin at fedoraproject.org  Fri Jan 30 06:16:40 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 30 Jan 2009 06:16:40 +0000 (UTC)
Subject: rpms/nullmodem Makefile,NONE,1.1
Message-ID: <20090130061640.2FC0270117@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/nullmodem
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsQui407/rpms/nullmodem

Added Files:
	Makefile 
Log Message:
Setup of module nullmodem


--- NEW FILE Makefile ---
# Top level Makefile for module nullmodem
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Jan 30 06:16:40 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 30 Jan 2009 06:16:40 +0000 (UTC)
Subject: rpms/nullmodem/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090130061640.7652070117@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/nullmodem/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsQui407/rpms/nullmodem/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module nullmodem


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: nullmodem
# $Id: Makefile,v 1.1 2009/01/30 06:16:40 kevin Exp $
NAME := nullmodem
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Jan 30 06:17:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 06:17:27 +0000
Subject: [pkgdb] libchamplain was added for rishi
Message-ID: <20090130061727.C1ABF2082A7@bastion.fedora.phx.redhat.com>

kevin has added Package libchamplain with summary Map view for Clutter
kevin has approved Package libchamplain
kevin has added a Fedora devel branch for libchamplain with an owner of rishi
kevin has approved libchamplain in Fedora devel
kevin has approved Package libchamplain
kevin has set commit to Approved for provenpackager on libchamplain (Fedora devel)
kevin has set build to Approved for provenpackager on libchamplain (Fedora devel)
kevin has set checkout to Approved for provenpackager on libchamplain (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libchamplain



From kevin at fedoraproject.org  Fri Jan 30 06:17:44 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 30 Jan 2009 06:17:44 +0000 (UTC)
Subject: rpms/libchamplain - New directory
Message-ID: <20090130061744.214B270117@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/libchamplain
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvstFn677/rpms/libchamplain

Log Message:
Directory /cvs/pkgs/rpms/libchamplain added to the repository




From pkgdb at fedoraproject.org  Fri Jan 30 06:17:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 06:17:31 +0000
Subject: [pkgdb] libchamplain (Fedora, 10) updated by kevin
Message-ID: <20090130061731.CF03C208493@bastion.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for libchamplain
kevin has set commit to Approved for provenpackager on libchamplain (Fedora 10)
kevin has set build to Approved for provenpackager on libchamplain (Fedora 10)
kevin has set checkout to Approved for provenpackager on libchamplain (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/libchamplain



From kevin at fedoraproject.org  Fri Jan 30 06:17:44 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 30 Jan 2009 06:17:44 +0000 (UTC)
Subject: rpms/libchamplain/devel - New directory
Message-ID: <20090130061744.526B970117@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/libchamplain/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvstFn677/rpms/libchamplain/devel

Log Message:
Directory /cvs/pkgs/rpms/libchamplain/devel added to the repository




From kevin at fedoraproject.org  Fri Jan 30 06:17:59 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 30 Jan 2009 06:17:59 +0000 (UTC)
Subject: rpms/libchamplain Makefile,NONE,1.1
Message-ID: <20090130061759.04BE470117@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/libchamplain
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvstFn677/rpms/libchamplain

Added Files:
	Makefile 
Log Message:
Setup of module libchamplain


--- NEW FILE Makefile ---
# Top level Makefile for module libchamplain
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Jan 30 06:17:59 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 30 Jan 2009 06:17:59 +0000 (UTC)
Subject: rpms/libchamplain/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090130061759.42AC070117@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/libchamplain/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvstFn677/rpms/libchamplain/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module libchamplain


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: libchamplain
# $Id: Makefile,v 1.1 2009/01/30 06:17:59 kevin Exp $
NAME := libchamplain
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Jan 30 06:18:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 06:18:47 +0000
Subject: [pkgdb] python-pygooglechart was added for stahnma
Message-ID: <20090130061847.D9F98208485@bastion.fedora.phx.redhat.com>

kevin has added Package python-pygooglechart with summary A complete Python wrapper for the Google Chart API
kevin has approved Package python-pygooglechart
kevin has added a Fedora devel branch for python-pygooglechart with an owner of stahnma
kevin has approved python-pygooglechart in Fedora devel
kevin has approved Package python-pygooglechart
kevin has set commit to Approved for provenpackager on python-pygooglechart (Fedora devel)
kevin has set build to Approved for provenpackager on python-pygooglechart (Fedora devel)
kevin has set checkout to Approved for provenpackager on python-pygooglechart (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-pygooglechart



From pkgdb at fedoraproject.org  Fri Jan 30 06:18:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 06:18:49 +0000
Subject: [pkgdb] python-pygooglechart (Fedora EPEL, 5) updated by kevin
Message-ID: <20090130061850.68414208494@bastion.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for python-pygooglechart
kevin has set commit to Approved for provenpackager on python-pygooglechart (Fedora EPEL 5)
kevin has set build to Approved for provenpackager on python-pygooglechart (Fedora EPEL 5)
kevin has set checkout to Approved for provenpackager on python-pygooglechart (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-pygooglechart



From pkgdb at fedoraproject.org  Fri Jan 30 06:18:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 06:18:49 +0000
Subject: [pkgdb] python-pygooglechart (Fedora EPEL, 4) updated by kevin
Message-ID: <20090130061850.A95A0208497@bastion.fedora.phx.redhat.com>

kevin added a Fedora EPEL 4 branch for python-pygooglechart
kevin has set commit to Approved for provenpackager on python-pygooglechart (Fedora EPEL 4)
kevin has set build to Approved for provenpackager on python-pygooglechart (Fedora EPEL 4)
kevin has set checkout to Approved for provenpackager on python-pygooglechart (Fedora EPEL 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-pygooglechart



From pkgdb at fedoraproject.org  Fri Jan 30 06:18:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 06:18:49 +0000
Subject: [pkgdb] python-pygooglechart (Fedora, 10) updated by kevin
Message-ID: <20090130061850.C1F8E2084A7@bastion.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for python-pygooglechart
kevin has set commit to Approved for provenpackager on python-pygooglechart (Fedora 10)
kevin has set build to Approved for provenpackager on python-pygooglechart (Fedora 10)
kevin has set checkout to Approved for provenpackager on python-pygooglechart (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-pygooglechart



From kevin at fedoraproject.org  Fri Jan 30 06:19:02 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 30 Jan 2009 06:19:02 +0000 (UTC)
Subject: rpms/python-pygooglechart - New directory
Message-ID: <20090130061902.2127170117@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/python-pygooglechart
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsTGx855/rpms/python-pygooglechart

Log Message:
Directory /cvs/pkgs/rpms/python-pygooglechart added to the repository




From kevin at fedoraproject.org  Fri Jan 30 06:19:02 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 30 Jan 2009 06:19:02 +0000 (UTC)
Subject: rpms/python-pygooglechart/devel - New directory
Message-ID: <20090130061902.5399470117@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/python-pygooglechart/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsTGx855/rpms/python-pygooglechart/devel

Log Message:
Directory /cvs/pkgs/rpms/python-pygooglechart/devel added to the repository




From kevin at fedoraproject.org  Fri Jan 30 06:19:17 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 30 Jan 2009 06:19:17 +0000 (UTC)
Subject: rpms/python-pygooglechart Makefile,NONE,1.1
Message-ID: <20090130061917.6E24770117@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/python-pygooglechart
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsTGx855/rpms/python-pygooglechart

Added Files:
	Makefile 
Log Message:
Setup of module python-pygooglechart


--- NEW FILE Makefile ---
# Top level Makefile for module python-pygooglechart
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Jan 30 06:19:17 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 30 Jan 2009 06:19:17 +0000 (UTC)
Subject: rpms/python-pygooglechart/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090130061917.B15BB70117@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/python-pygooglechart/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsTGx855/rpms/python-pygooglechart/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module python-pygooglechart


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: python-pygooglechart
# $Id: Makefile,v 1.1 2009/01/30 06:19:17 kevin Exp $
NAME := python-pygooglechart
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Jan 30 06:20:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 06:20:44 +0000
Subject: [pkgdb] python-pygooglechart (Fedora, 9) updated by kevin
Message-ID: <20090130062044.72D6C208485@bastion.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for python-pygooglechart
kevin has set commit to Approved for provenpackager on python-pygooglechart (Fedora 9)
kevin has set build to Approved for provenpackager on python-pygooglechart (Fedora 9)
kevin has set checkout to Approved for provenpackager on python-pygooglechart (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-pygooglechart



From pkgdb at fedoraproject.org  Fri Jan 30 06:21:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 06:21:17 +0000
Subject: [pkgdb] banshee-mirage was added for dnielsen
Message-ID: <20090130062118.0000B2082A7@bastion.fedora.phx.redhat.com>

kevin has added Package banshee-mirage with summary An Automatic Playlist Generation Extension for Banshee
kevin has approved Package banshee-mirage
kevin has added a Fedora devel branch for banshee-mirage with an owner of dnielsen
kevin has approved banshee-mirage in Fedora devel
kevin has approved Package banshee-mirage
kevin has set commit to Approved for provenpackager on banshee-mirage (Fedora devel)
kevin has set build to Approved for provenpackager on banshee-mirage (Fedora devel)
kevin has set checkout to Approved for provenpackager on banshee-mirage (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/banshee-mirage



From pkgdb at fedoraproject.org  Fri Jan 30 06:21:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 06:21:19 +0000
Subject: [pkgdb] banshee-mirage (Fedora, 9) updated by kevin
Message-ID: <20090130062119.2A672208493@bastion.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for banshee-mirage
kevin has set commit to Approved for provenpackager on banshee-mirage (Fedora 9)
kevin has set build to Approved for provenpackager on banshee-mirage (Fedora 9)
kevin has set checkout to Approved for provenpackager on banshee-mirage (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/banshee-mirage



From kevin at fedoraproject.org  Fri Jan 30 06:21:33 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 30 Jan 2009 06:21:33 +0000 (UTC)
Subject: rpms/banshee-mirage/devel - New directory
Message-ID: <20090130062133.689AC70143@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/banshee-mirage/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsbj2077/rpms/banshee-mirage/devel

Log Message:
Directory /cvs/pkgs/rpms/banshee-mirage/devel added to the repository




From kevin at fedoraproject.org  Fri Jan 30 06:21:33 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 30 Jan 2009 06:21:33 +0000 (UTC)
Subject: rpms/banshee-mirage - New directory
Message-ID: <20090130062133.2C47470117@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/banshee-mirage
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsbj2077/rpms/banshee-mirage

Log Message:
Directory /cvs/pkgs/rpms/banshee-mirage added to the repository




From pkgdb at fedoraproject.org  Fri Jan 30 06:21:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 06:21:19 +0000
Subject: [pkgdb] banshee-mirage (Fedora, 10) updated by kevin
Message-ID: <20090130062119.3EE4F208496@bastion.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for banshee-mirage
kevin has set commit to Approved for provenpackager on banshee-mirage (Fedora 10)
kevin has set build to Approved for provenpackager on banshee-mirage (Fedora 10)
kevin has set checkout to Approved for provenpackager on banshee-mirage (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/banshee-mirage



From kevin at fedoraproject.org  Fri Jan 30 06:21:49 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 30 Jan 2009 06:21:49 +0000 (UTC)
Subject: rpms/banshee-mirage Makefile,NONE,1.1
Message-ID: <20090130062149.0701270117@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/banshee-mirage
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsbj2077/rpms/banshee-mirage

Added Files:
	Makefile 
Log Message:
Setup of module banshee-mirage


--- NEW FILE Makefile ---
# Top level Makefile for module banshee-mirage
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Jan 30 06:21:49 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 30 Jan 2009 06:21:49 +0000 (UTC)
Subject: rpms/banshee-mirage/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090130062149.4957F70117@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/banshee-mirage/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsbj2077/rpms/banshee-mirage/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module banshee-mirage


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: banshee-mirage
# $Id: Makefile,v 1.1 2009/01/30 06:21:49 kevin Exp $
NAME := banshee-mirage
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Jan 30 06:26:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 06:26:12 +0000
Subject: [pkgdb] gsh was added for maxamillion
Message-ID: <20090130062612.518EF208485@bastion.fedora.phx.redhat.com>

kevin has added Package gsh with summary aggregate several remote shells into one
kevin has approved Package gsh
kevin has added a Fedora devel branch for gsh with an owner of maxamillion
kevin has approved gsh in Fedora devel
kevin has approved Package gsh
kevin has set commit to Approved for provenpackager on gsh (Fedora devel)
kevin has set build to Approved for provenpackager on gsh (Fedora devel)
kevin has set checkout to Approved for provenpackager on gsh (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gsh



From pkgdb at fedoraproject.org  Fri Jan 30 06:26:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 06:26:18 +0000
Subject: [pkgdb] gsh (Fedora, 9) updated by kevin
Message-ID: <20090130062618.E4597208494@bastion.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for gsh
kevin has set commit to Approved for provenpackager on gsh (Fedora 9)
kevin has set build to Approved for provenpackager on gsh (Fedora 9)
kevin has set checkout to Approved for provenpackager on gsh (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gsh



From pkgdb at fedoraproject.org  Fri Jan 30 06:26:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 06:26:18 +0000
Subject: [pkgdb] gsh (Fedora, 10) updated by kevin
Message-ID: <20090130062618.F3292208497@bastion.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for gsh
kevin has set commit to Approved for provenpackager on gsh (Fedora 10)
kevin has set build to Approved for provenpackager on gsh (Fedora 10)
kevin has set checkout to Approved for provenpackager on gsh (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gsh



From kevin at fedoraproject.org  Fri Jan 30 06:26:36 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 30 Jan 2009 06:26:36 +0000 (UTC)
Subject: rpms/gsh - New directory
Message-ID: <20090130062636.34E7670117@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/gsh
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvssY2781/rpms/gsh

Log Message:
Directory /cvs/pkgs/rpms/gsh added to the repository




From kevin at fedoraproject.org  Fri Jan 30 06:26:36 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 30 Jan 2009 06:26:36 +0000 (UTC)
Subject: rpms/gsh/devel - New directory
Message-ID: <20090130062636.9092A70117@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/gsh/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvssY2781/rpms/gsh/devel

Log Message:
Directory /cvs/pkgs/rpms/gsh/devel added to the repository




From pkgdb at fedoraproject.org  Fri Jan 30 06:26:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 06:26:18 +0000
Subject: [pkgdb] gsh (Fedora EPEL, 5) updated by kevin
Message-ID: <20090130062619.14DAA2084B7@bastion.fedora.phx.redhat.com>

kevin added a Fedora EPEL 5 branch for gsh
kevin has set commit to Approved for provenpackager on gsh (Fedora EPEL 5)
kevin has set build to Approved for provenpackager on gsh (Fedora EPEL 5)
kevin has set checkout to Approved for provenpackager on gsh (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gsh



From kevin at fedoraproject.org  Fri Jan 30 06:27:06 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 30 Jan 2009 06:27:06 +0000 (UTC)
Subject: rpms/gsh Makefile,NONE,1.1
Message-ID: <20090130062706.A12E770117@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/gsh
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvssY2781/rpms/gsh

Added Files:
	Makefile 
Log Message:
Setup of module gsh


--- NEW FILE Makefile ---
# Top level Makefile for module gsh
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Jan 30 06:27:07 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 30 Jan 2009 06:27:07 +0000 (UTC)
Subject: rpms/gsh/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <20090130062707.717B870117@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/gsh/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvssY2781/rpms/gsh/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module gsh


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: gsh
# $Id: Makefile,v 1.1 2009/01/30 06:27:06 kevin Exp $
NAME := gsh
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Jan 30 06:27:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 06:27:40 +0000
Subject: [pkgdb] timespan was added for fab
Message-ID: <20090130062740.5E9EB208485@bastion.fedora.phx.redhat.com>

kevin has added Package timespan with summary A tool that performs date-based time calculations
kevin has approved Package timespan
kevin has added a Fedora devel branch for timespan with an owner of fab
kevin has approved timespan in Fedora devel
kevin has approved Package timespan
kevin has set commit to Approved for provenpackager on timespan (Fedora devel)
kevin has set build to Approved for provenpackager on timespan (Fedora devel)
kevin has set checkout to Approved for provenpackager on timespan (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/timespan



From pkgdb at fedoraproject.org  Fri Jan 30 06:27:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 06:27:42 +0000
Subject: [pkgdb] timespan (Fedora, 9) updated by kevin
Message-ID: <20090130062742.AB26C208494@bastion.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for timespan
kevin has set commit to Approved for provenpackager on timespan (Fedora 9)
kevin has set build to Approved for provenpackager on timespan (Fedora 9)
kevin has set checkout to Approved for provenpackager on timespan (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/timespan



From kevin at fedoraproject.org  Fri Jan 30 06:28:03 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 30 Jan 2009 06:28:03 +0000 (UTC)
Subject: rpms/timespan - New directory
Message-ID: <20090130062803.5230C70117@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/timespan
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsoe3129/rpms/timespan

Log Message:
Directory /cvs/pkgs/rpms/timespan added to the repository




From kevin at fedoraproject.org  Fri Jan 30 06:28:03 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 30 Jan 2009 06:28:03 +0000 (UTC)
Subject: rpms/timespan/devel - New directory
Message-ID: <20090130062803.E515270117@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/timespan/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsoe3129/rpms/timespan/devel

Log Message:
Directory /cvs/pkgs/rpms/timespan/devel added to the repository




From pkgdb at fedoraproject.org  Fri Jan 30 06:27:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 06:27:42 +0000
Subject: [pkgdb] timespan (Fedora, 10) updated by kevin
Message-ID: <20090130062742.B66A5208497@bastion.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for timespan
kevin has set commit to Approved for provenpackager on timespan (Fedora 10)
kevin has set build to Approved for provenpackager on timespan (Fedora 10)
kevin has set checkout to Approved for provenpackager on timespan (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/timespan



From kevin at fedoraproject.org  Fri Jan 30 06:28:45 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 30 Jan 2009 06:28:45 +0000 (UTC)
Subject: rpms/timespan Makefile,NONE,1.1
Message-ID: <20090130062845.34D4170117@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/timespan
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsoe3129/rpms/timespan

Added Files:
	Makefile 
Log Message:
Setup of module timespan


--- NEW FILE Makefile ---
# Top level Makefile for module timespan
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Jan 30 06:28:46 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 30 Jan 2009 06:28:46 +0000 (UTC)
Subject: rpms/timespan/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090130062846.1526E70117@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/timespan/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsoe3129/rpms/timespan/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module timespan


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: timespan
# $Id: Makefile,v 1.1 2009/01/30 06:28:45 kevin Exp $
NAME := timespan
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Jan 30 06:29:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 06:29:03 +0000
Subject: [pkgdb] jcodings was added for konradm
Message-ID: <20090130062903.D8749208485@bastion.fedora.phx.redhat.com>

kevin has added Package jcodings with summary Java Libraries for Ruby String Encodings
kevin has approved Package jcodings
kevin has added a Fedora devel branch for jcodings with an owner of konradm
kevin has approved jcodings in Fedora devel
kevin has approved Package jcodings
kevin has set commit to Approved for provenpackager on jcodings (Fedora devel)
kevin has set build to Approved for provenpackager on jcodings (Fedora devel)
kevin has set checkout to Approved for provenpackager on jcodings (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/jcodings



From pkgdb at fedoraproject.org  Fri Jan 30 06:29:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 06:29:06 +0000
Subject: [pkgdb] jcodings (Fedora, 10) updated by kevin
Message-ID: <20090130062906.4A94D208494@bastion.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for jcodings
kevin has set commit to Approved for provenpackager on jcodings (Fedora 10)
kevin has set build to Approved for provenpackager on jcodings (Fedora 10)
kevin has set checkout to Approved for provenpackager on jcodings (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/jcodings



From kevin at fedoraproject.org  Fri Jan 30 06:30:10 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 30 Jan 2009 06:30:10 +0000 (UTC)
Subject: rpms/jcodings - New directory
Message-ID: <20090130063010.4629170117@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/jcodings
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsnL3488/rpms/jcodings

Log Message:
Directory /cvs/pkgs/rpms/jcodings added to the repository




From kevin at fedoraproject.org  Fri Jan 30 06:30:10 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 30 Jan 2009 06:30:10 +0000 (UTC)
Subject: rpms/jcodings/devel - New directory
Message-ID: <20090130063010.B787F70117@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/jcodings/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsnL3488/rpms/jcodings/devel

Log Message:
Directory /cvs/pkgs/rpms/jcodings/devel added to the repository




From kevin at fedoraproject.org  Fri Jan 30 06:30:42 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 30 Jan 2009 06:30:42 +0000 (UTC)
Subject: rpms/jcodings Makefile,NONE,1.1
Message-ID: <20090130063042.DF91670117@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/jcodings
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsnL3488/rpms/jcodings

Added Files:
	Makefile 
Log Message:
Setup of module jcodings


--- NEW FILE Makefile ---
# Top level Makefile for module jcodings
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Jan 30 06:30:43 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 30 Jan 2009 06:30:43 +0000 (UTC)
Subject: rpms/jcodings/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090130063043.8B45970117@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/jcodings/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsnL3488/rpms/jcodings/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module jcodings


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: jcodings
# $Id: Makefile,v 1.1 2009/01/30 06:30:43 kevin Exp $
NAME := jcodings
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Jan 30 06:31:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 06:31:01 +0000
Subject: [pkgdb] perl-Test-Email was added for corsepiu
Message-ID: <20090130063101.B7346208486@bastion.fedora.phx.redhat.com>

kevin has added Package perl-Test-Email with summary Test email contents
kevin has approved Package perl-Test-Email
kevin has added a Fedora devel branch for perl-Test-Email with an owner of corsepiu
kevin has approved perl-Test-Email in Fedora devel
kevin has approved Package perl-Test-Email
kevin has set commit to Approved for provenpackager on perl-Test-Email (Fedora devel)
kevin has set build to Approved for provenpackager on perl-Test-Email (Fedora devel)
kevin has set checkout to Approved for provenpackager on perl-Test-Email (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Test-Email



From pkgdb at fedoraproject.org  Fri Jan 30 06:31:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 06:31:03 +0000
Subject: [pkgdb] perl-Test-Email (Fedora, devel) updated by kevin
Message-ID: <20090130063103.E86B0208496@bastion.fedora.phx.redhat.com>

kevin approved watchbugzilla on perl-Test-Email (Fedora devel) for perl-sig
kevin approved watchcommits on perl-Test-Email (Fedora devel) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Test-Email



From pkgdb at fedoraproject.org  Fri Jan 30 06:31:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 06:31:03 +0000
Subject: [pkgdb] perl-Test-Email (Fedora, 9) updated by kevin
Message-ID: <20090130063104.0509A2084A7@bastion.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for perl-Test-Email
kevin has set commit to Approved for provenpackager on perl-Test-Email (Fedora 9)
kevin has set build to Approved for provenpackager on perl-Test-Email (Fedora 9)
kevin has set checkout to Approved for provenpackager on perl-Test-Email (Fedora 9)
kevin approved watchbugzilla on perl-Test-Email (Fedora 9) for perl-sig
kevin approved watchcommits on perl-Test-Email (Fedora 9) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Test-Email



From pkgdb at fedoraproject.org  Fri Jan 30 06:31:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 06:31:03 +0000
Subject: [pkgdb] perl-Test-Email (Fedora, 10) updated by kevin
Message-ID: <20090130063104.8D7CA20860A@bastion.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for perl-Test-Email
kevin has set commit to Approved for provenpackager on perl-Test-Email (Fedora 10)
kevin has set build to Approved for provenpackager on perl-Test-Email (Fedora 10)
kevin has set checkout to Approved for provenpackager on perl-Test-Email (Fedora 10)
kevin approved watchbugzilla on perl-Test-Email (Fedora 10) for perl-sig
kevin approved watchcommits on perl-Test-Email (Fedora 10) for perl-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/perl-Test-Email



From kevin at fedoraproject.org  Fri Jan 30 06:31:21 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 30 Jan 2009 06:31:21 +0000 (UTC)
Subject: rpms/perl-Test-Email/devel - New directory
Message-ID: <20090130063121.7229470117@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Test-Email/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvssR3738/rpms/perl-Test-Email/devel

Log Message:
Directory /cvs/pkgs/rpms/perl-Test-Email/devel added to the repository




From kevin at fedoraproject.org  Fri Jan 30 06:31:21 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 30 Jan 2009 06:31:21 +0000 (UTC)
Subject: rpms/perl-Test-Email - New directory
Message-ID: <20090130063121.2DCD370117@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Test-Email
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvssR3738/rpms/perl-Test-Email

Log Message:
Directory /cvs/pkgs/rpms/perl-Test-Email added to the repository




From kevin at fedoraproject.org  Fri Jan 30 06:31:42 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 30 Jan 2009 06:31:42 +0000 (UTC)
Subject: rpms/perl-Test-Email Makefile,NONE,1.1
Message-ID: <20090130063142.3FE1D70117@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Test-Email
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvssR3738/rpms/perl-Test-Email

Added Files:
	Makefile 
Log Message:
Setup of module perl-Test-Email


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Test-Email
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Jan 30 06:31:42 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 30 Jan 2009 06:31:42 +0000 (UTC)
Subject: rpms/perl-Test-Email/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090130063142.95CFF70117@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/perl-Test-Email/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvssR3738/rpms/perl-Test-Email/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Test-Email


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: perl-Test-Email
# $Id: Makefile,v 1.1 2009/01/30 06:31:42 kevin Exp $
NAME := perl-Test-Email
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Jan 30 06:33:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 06:33:57 +0000
Subject: [pkgdb] torch was added for mjakubicek
Message-ID: <20090130063357.4F388208485@bastion.fedora.phx.redhat.com>

kevin has added Package torch with summary Torch is a simple machine-learning library
kevin has approved Package torch
kevin has added a Fedora devel branch for torch with an owner of mjakubicek
kevin has approved torch in Fedora devel
kevin has approved Package torch
kevin has set commit to Approved for provenpackager on torch (Fedora devel)
kevin has set build to Approved for provenpackager on torch (Fedora devel)
kevin has set checkout to Approved for provenpackager on torch (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/torch



From pkgdb at fedoraproject.org  Fri Jan 30 06:33:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 06:33:59 +0000
Subject: [pkgdb] torch (Fedora, 9) updated by kevin
Message-ID: <20090130063359.D35F0208494@bastion.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for torch
kevin has set commit to Approved for provenpackager on torch (Fedora 9)
kevin has set build to Approved for provenpackager on torch (Fedora 9)
kevin has set checkout to Approved for provenpackager on torch (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/torch



From kevin at fedoraproject.org  Fri Jan 30 06:34:15 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 30 Jan 2009 06:34:15 +0000 (UTC)
Subject: rpms/torch - New directory
Message-ID: <20090130063415.2797570117@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/torch
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsWn4278/rpms/torch

Log Message:
Directory /cvs/pkgs/rpms/torch added to the repository




From pkgdb at fedoraproject.org  Fri Jan 30 06:33:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 06:33:59 +0000
Subject: [pkgdb] torch (Fedora, 10) updated by kevin
Message-ID: <20090130063403.B3E3F208496@bastion.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for torch
kevin has set commit to Approved for provenpackager on torch (Fedora 10)
kevin has set build to Approved for provenpackager on torch (Fedora 10)
kevin has set checkout to Approved for provenpackager on torch (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/torch



From kevin at fedoraproject.org  Fri Jan 30 06:34:15 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 30 Jan 2009 06:34:15 +0000 (UTC)
Subject: rpms/torch/devel - New directory
Message-ID: <20090130063415.65CF470117@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/torch/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsWn4278/rpms/torch/devel

Log Message:
Directory /cvs/pkgs/rpms/torch/devel added to the repository




From kevin at fedoraproject.org  Fri Jan 30 06:34:32 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 30 Jan 2009 06:34:32 +0000 (UTC)
Subject: rpms/torch Makefile,NONE,1.1
Message-ID: <20090130063432.1F85370117@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/torch
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsWn4278/rpms/torch

Added Files:
	Makefile 
Log Message:
Setup of module torch


--- NEW FILE Makefile ---
# Top level Makefile for module torch
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Jan 30 06:34:32 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 30 Jan 2009 06:34:32 +0000 (UTC)
Subject: rpms/torch/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <20090130063432.5E1ED70117@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/torch/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsWn4278/rpms/torch/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module torch


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: torch
# $Id: Makefile,v 1.1 2009/01/30 06:34:32 kevin Exp $
NAME := torch
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Jan 30 06:35:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 06:35:33 +0000
Subject: [pkgdb] python-setupdocs was added for rakesh
Message-ID: <20090130063533.C7EDC208485@bastion.fedora.phx.redhat.com>

kevin has added Package python-setupdocs with summary Setuptools plugin
kevin has approved Package python-setupdocs
kevin has added a Fedora devel branch for python-setupdocs with an owner of rakesh
kevin has approved python-setupdocs in Fedora devel
kevin has approved Package python-setupdocs
kevin has set commit to Approved for provenpackager on python-setupdocs (Fedora devel)
kevin has set build to Approved for provenpackager on python-setupdocs (Fedora devel)
kevin has set checkout to Approved for provenpackager on python-setupdocs (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-setupdocs



From pkgdb at fedoraproject.org  Fri Jan 30 06:35:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 06:35:39 +0000
Subject: [pkgdb] python-setupdocs (Fedora, 9) updated by kevin
Message-ID: <20090130063540.50232208494@bastion.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for python-setupdocs
kevin has set commit to Approved for provenpackager on python-setupdocs (Fedora 9)
kevin has set build to Approved for provenpackager on python-setupdocs (Fedora 9)
kevin has set checkout to Approved for provenpackager on python-setupdocs (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-setupdocs



From kevin at fedoraproject.org  Fri Jan 30 06:35:53 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 30 Jan 2009 06:35:53 +0000 (UTC)
Subject: rpms/python-setupdocs - New directory
Message-ID: <20090130063553.268BF70117@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/python-setupdocs
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsDT4571/rpms/python-setupdocs

Log Message:
Directory /cvs/pkgs/rpms/python-setupdocs added to the repository




From kevin at fedoraproject.org  Fri Jan 30 06:35:53 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 30 Jan 2009 06:35:53 +0000 (UTC)
Subject: rpms/python-setupdocs/devel - New directory
Message-ID: <20090130063553.604FF70117@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/python-setupdocs/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsDT4571/rpms/python-setupdocs/devel

Log Message:
Directory /cvs/pkgs/rpms/python-setupdocs/devel added to the repository




From pkgdb at fedoraproject.org  Fri Jan 30 06:35:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 06:35:39 +0000
Subject: [pkgdb] python-setupdocs (Fedora, 10) updated by kevin
Message-ID: <20090130063540.7C00E208497@bastion.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for python-setupdocs
kevin has set commit to Approved for provenpackager on python-setupdocs (Fedora 10)
kevin has set build to Approved for provenpackager on python-setupdocs (Fedora 10)
kevin has set checkout to Approved for provenpackager on python-setupdocs (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/python-setupdocs



From kevin at fedoraproject.org  Fri Jan 30 06:36:08 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 30 Jan 2009 06:36:08 +0000 (UTC)
Subject: rpms/python-setupdocs Makefile,NONE,1.1
Message-ID: <20090130063608.DD54670117@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/python-setupdocs
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsDT4571/rpms/python-setupdocs

Added Files:
	Makefile 
Log Message:
Setup of module python-setupdocs


--- NEW FILE Makefile ---
# Top level Makefile for module python-setupdocs
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Jan 30 06:36:09 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 30 Jan 2009 06:36:09 +0000 (UTC)
Subject: rpms/python-setupdocs/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090130063609.2BE1570117@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/python-setupdocs/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsDT4571/rpms/python-setupdocs/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module python-setupdocs


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: python-setupdocs
# $Id: Makefile,v 1.1 2009/01/30 06:36:09 kevin Exp $
NAME := python-setupdocs
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Jan 30 06:36:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 06:36:46 +0000
Subject: [pkgdb] log4c was added for alexh
Message-ID: <20090130063646.F2F35208494@bastion.fedora.phx.redhat.com>

kevin has added Package log4c with summary flexible application message logging library
kevin has approved Package log4c
kevin has added a Fedora devel branch for log4c with an owner of alexh
kevin has approved log4c in Fedora devel
kevin has approved Package log4c
kevin has set commit to Approved for provenpackager on log4c (Fedora devel)
kevin has set build to Approved for provenpackager on log4c (Fedora devel)
kevin has set checkout to Approved for provenpackager on log4c (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/log4c



From pkgdb at fedoraproject.org  Fri Jan 30 06:36:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 06:36:52 +0000
Subject: [pkgdb] log4c (Fedora, 9) updated by kevin
Message-ID: <20090130063652.239A5208486@bastion.fedora.phx.redhat.com>

kevin added a Fedora 9 branch for log4c
kevin has set commit to Approved for provenpackager on log4c (Fedora 9)
kevin has set build to Approved for provenpackager on log4c (Fedora 9)
kevin has set checkout to Approved for provenpackager on log4c (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/log4c



From pkgdb at fedoraproject.org  Fri Jan 30 06:36:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 06:36:52 +0000
Subject: [pkgdb] log4c (Fedora, 10) updated by kevin
Message-ID: <20090130063652.4C8FE208496@bastion.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for log4c
kevin has set commit to Approved for provenpackager on log4c (Fedora 10)
kevin has set build to Approved for provenpackager on log4c (Fedora 10)
kevin has set checkout to Approved for provenpackager on log4c (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/log4c



From kevin at fedoraproject.org  Fri Jan 30 06:37:06 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 30 Jan 2009 06:37:06 +0000 (UTC)
Subject: rpms/log4c - New directory
Message-ID: <20090130063706.2A6E070117@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/log4c
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsgX4836/rpms/log4c

Log Message:
Directory /cvs/pkgs/rpms/log4c added to the repository




From kevin at fedoraproject.org  Fri Jan 30 06:37:06 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 30 Jan 2009 06:37:06 +0000 (UTC)
Subject: rpms/log4c/devel - New directory
Message-ID: <20090130063706.5F19870117@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/log4c/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsgX4836/rpms/log4c/devel

Log Message:
Directory /cvs/pkgs/rpms/log4c/devel added to the repository




From kevin at fedoraproject.org  Fri Jan 30 06:37:22 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 30 Jan 2009 06:37:22 +0000 (UTC)
Subject: rpms/log4c Makefile,NONE,1.1
Message-ID: <20090130063722.1BCFC70117@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/log4c
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsgX4836/rpms/log4c

Added Files:
	Makefile 
Log Message:
Setup of module log4c


--- NEW FILE Makefile ---
# Top level Makefile for module log4c
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Jan 30 06:37:22 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 30 Jan 2009 06:37:22 +0000 (UTC)
Subject: rpms/log4c/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <20090130063722.773D870117@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/log4c/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsgX4836/rpms/log4c/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module log4c


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: log4c
# $Id: Makefile,v 1.1 2009/01/30 06:37:22 kevin Exp $
NAME := log4c
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Jan 30 06:39:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 06:39:15 +0000
Subject: [pkgdb] gimp-fourier-plugin was added for fabiand
Message-ID: <20090130063916.0E351208484@bastion.fedora.phx.redhat.com>

kevin has added Package gimp-fourier-plugin with summary A simple plug-in to do fourier transform on your image
kevin has approved Package gimp-fourier-plugin
kevin has added a Fedora devel branch for gimp-fourier-plugin with an owner of fabiand
kevin has approved gimp-fourier-plugin in Fedora devel
kevin has approved Package gimp-fourier-plugin
kevin has set commit to Approved for provenpackager on gimp-fourier-plugin (Fedora devel)
kevin has set build to Approved for provenpackager on gimp-fourier-plugin (Fedora devel)
kevin has set checkout to Approved for provenpackager on gimp-fourier-plugin (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gimp-fourier-plugin



From pkgdb at fedoraproject.org  Fri Jan 30 06:39:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 06:39:17 +0000
Subject: [pkgdb] gimp-fourier-plugin (Fedora, devel) updated by kevin
Message-ID: <20090130063917.A329E208493@bastion.fedora.phx.redhat.com>

kevin approved watchbugzilla on gimp-fourier-plugin (Fedora devel) for mtasaka
kevin approved watchcommits on gimp-fourier-plugin (Fedora devel) for mtasaka

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gimp-fourier-plugin



From kevin at fedoraproject.org  Fri Jan 30 06:39:32 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 30 Jan 2009 06:39:32 +0000 (UTC)
Subject: rpms/gimp-fourier-plugin - New directory
Message-ID: <20090130063932.2A1C070117@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/gimp-fourier-plugin
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsMI5208/rpms/gimp-fourier-plugin

Log Message:
Directory /cvs/pkgs/rpms/gimp-fourier-plugin added to the repository




From kevin at fedoraproject.org  Fri Jan 30 06:39:32 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 30 Jan 2009 06:39:32 +0000 (UTC)
Subject: rpms/gimp-fourier-plugin/devel - New directory
Message-ID: <20090130063932.682B670117@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/gimp-fourier-plugin/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsMI5208/rpms/gimp-fourier-plugin/devel

Log Message:
Directory /cvs/pkgs/rpms/gimp-fourier-plugin/devel added to the repository




From pkgdb at fedoraproject.org  Fri Jan 30 06:39:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 06:39:17 +0000
Subject: [pkgdb] gimp-fourier-plugin (Fedora, 10) updated by kevin
Message-ID: <20090130063917.B3FF4208496@bastion.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for gimp-fourier-plugin
kevin has set commit to Approved for provenpackager on gimp-fourier-plugin (Fedora 10)
kevin has set build to Approved for provenpackager on gimp-fourier-plugin (Fedora 10)
kevin has set checkout to Approved for provenpackager on gimp-fourier-plugin (Fedora 10)
kevin approved watchbugzilla on gimp-fourier-plugin (Fedora 10) for mtasaka
kevin approved watchcommits on gimp-fourier-plugin (Fedora 10) for mtasaka

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/gimp-fourier-plugin



From kevin at fedoraproject.org  Fri Jan 30 06:39:48 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 30 Jan 2009 06:39:48 +0000 (UTC)
Subject: rpms/gimp-fourier-plugin Makefile,NONE,1.1
Message-ID: <20090130063948.D028770117@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/gimp-fourier-plugin
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsMI5208/rpms/gimp-fourier-plugin

Added Files:
	Makefile 
Log Message:
Setup of module gimp-fourier-plugin


--- NEW FILE Makefile ---
# Top level Makefile for module gimp-fourier-plugin
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Fri Jan 30 06:39:49 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 30 Jan 2009 06:39:49 +0000 (UTC)
Subject: rpms/gimp-fourier-plugin/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090130063949.1F86570117@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/gimp-fourier-plugin/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsMI5208/rpms/gimp-fourier-plugin/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module gimp-fourier-plugin


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: gimp-fourier-plugin
# $Id: Makefile,v 1.1 2009/01/30 06:39:48 kevin Exp $
NAME := gimp-fourier-plugin
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Fri Jan 30 06:40:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 06:40:35 +0000
Subject: [pkgdb] xmlenc was added for fabiand
Message-ID: <20090130064035.D9621208484@bastion.fedora.phx.redhat.com>

kevin has added Package xmlenc with summary Light-weight XML output library for Java
kevin has approved Package xmlenc
kevin has added a Fedora devel branch for xmlenc with an owner of fabiand
kevin has approved xmlenc in Fedora devel
kevin has approved Package xmlenc
kevin has set commit to Approved for provenpackager on xmlenc (Fedora devel)
kevin has set build to Approved for provenpackager on xmlenc (Fedora devel)
kevin has set checkout to Approved for provenpackager on xmlenc (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/xmlenc



From pkgdb at fedoraproject.org  Fri Jan 30 06:40:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 06:40:42 +0000
Subject: [pkgdb] xmlenc (Fedora, devel) updated by kevin
Message-ID: <20090130064042.579E4208493@bastion.fedora.phx.redhat.com>

kevin approved watchbugzilla on xmlenc (Fedora devel) for mtasaka
kevin approved watchcommits on xmlenc (Fedora devel) for mtasaka

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/xmlenc



From pkgdb at fedoraproject.org  Fri Jan 30 06:40:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 06:40:42 +0000
Subject: [pkgdb] xmlenc (Fedora, 10) updated by kevin
Message-ID: <20090130064042.A5B85208496@bastion.fedora.phx.redhat.com>

kevin added a Fedora 10 branch for xmlenc
kevin has set commit to Approved for provenpackager on xmlenc (Fedora 10)
kevin has set build to Approved for provenpackager on xmlenc (Fedora 10)
kevin has set checkout to Approved for provenpackager on xmlenc (Fedora 10)
kevin approved watchbugzilla on xmlenc (Fedora 10) for mtasaka
kevin approved watchcommits on xmlenc (Fedora 10) for mtasaka

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/xmlenc



From kevin at fedoraproject.org  Fri Jan 30 06:40:59 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 30 Jan 2009 06:40:59 +0000 (UTC)
Subject: rpms/xmlenc - New directory
Message-ID: <20090130064059.2C43C70117@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/xmlenc
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsnX5461/rpms/xmlenc

Log Message:
Directory /cvs/pkgs/rpms/xmlenc added to the repository




From kevin at fedoraproject.org  Fri Jan 30 06:40:59 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 30 Jan 2009 06:40:59 +0000 (UTC)
Subject: rpms/xmlenc/devel - New directory
Message-ID: <20090130064059.6076470143@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/xmlenc/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsnX5461/rpms/xmlenc/devel

Log Message:
Directory /cvs/pkgs/rpms/xmlenc/devel added to the repository




From kevin at fedoraproject.org  Fri Jan 30 06:41:17 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 30 Jan 2009 06:41:17 +0000 (UTC)
Subject: rpms/xmlenc Makefile,NONE,1.1
Message-ID: <20090130064117.9E3D570117@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/xmlenc
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsnX5461/rpms/xmlenc

Added Files:
	Makefile 
Log Message:
Setup of module xmlenc


--- NEW FILE Makefile ---
# Top level Makefile for module xmlenc
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "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 Jan 30 06:41:17 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 30 Jan 2009 06:41:17 +0000 (UTC)
Subject: rpms/xmlenc/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <20090130064117.E9C6270117@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/xmlenc/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsnX5461/rpms/xmlenc/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module xmlenc


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: xmlenc
# $Id: Makefile,v 1.1 2009/01/30 06:41:17 kevin Exp $
NAME := xmlenc
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the '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 Jan 30 06:42:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 06:42:18 +0000
Subject: [pkgdb] fonts-sig was added for roozbeh
Message-ID: <20090130064218.3A498208484@bastion.fedora.phx.redhat.com>

kevin has added Package fonts-sig with summary SIL Gentium fonts
kevin has approved Package fonts-sig
kevin has added a Fedora devel branch for fonts-sig with an owner of roozbeh
kevin has approved fonts-sig in Fedora devel
kevin has approved Package fonts-sig
kevin has set commit to Approved for provenpackager on fonts-sig (Fedora devel)
kevin has set build to Approved for provenpackager on fonts-sig (Fedora devel)
kevin has set checkout to Approved for provenpackager on fonts-sig (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fonts-sig



From pkgdb at fedoraproject.org  Fri Jan 30 06:42:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 06:42:20 +0000
Subject: [pkgdb] fonts-sig (Fedora, devel) updated by kevin
Message-ID: <20090130064220.DB091208493@bastion.fedora.phx.redhat.com>

kevin approved watchbugzilla on fonts-sig (Fedora devel) for kevin
kevin approved watchcommits on fonts-sig (Fedora devel) for kevin

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fonts-sig



From pkgdb at fedoraproject.org  Fri Jan 30 06:42:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 06:42:29 +0000
Subject: [pkgdb] sil-gentium-fonts was added for roozbeh
Message-ID: <20090130064229.5071A2084A7@bastion.fedora.phx.redhat.com>

kevin has added Package sil-gentium-fonts with summary SIL Gentium fonts
kevin has approved Package sil-gentium-fonts
kevin has added a Fedora devel branch for sil-gentium-fonts with an owner of roozbeh
kevin has approved sil-gentium-fonts in Fedora devel
kevin has approved Package sil-gentium-fonts
kevin has set commit to Approved for provenpackager on sil-gentium-fonts (Fedora devel)
kevin has set build to Approved for provenpackager on sil-gentium-fonts (Fedora devel)
kevin has set checkout to Approved for provenpackager on sil-gentium-fonts (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sil-gentium-fonts



From kevin at fedoraproject.org  Fri Jan 30 06:42:46 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 30 Jan 2009 06:42:46 +0000 (UTC)
Subject: rpms/sil-gentium-fonts - New directory
Message-ID: <20090130064246.2456870117@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/sil-gentium-fonts
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsWL5792/rpms/sil-gentium-fonts

Log Message:
Directory /cvs/pkgs/rpms/sil-gentium-fonts added to the repository




From kevin at fedoraproject.org  Fri Jan 30 06:42:46 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 30 Jan 2009 06:42:46 +0000 (UTC)
Subject: rpms/sil-gentium-fonts/devel - New directory
Message-ID: <20090130064246.5BA2370117@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/sil-gentium-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsWL5792/rpms/sil-gentium-fonts/devel

Log Message:
Directory /cvs/pkgs/rpms/sil-gentium-fonts/devel added to the repository




From pkgdb at fedoraproject.org  Fri Jan 30 06:42:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 06:42:30 +0000
Subject: [pkgdb] sil-gentium-fonts (Fedora, devel) updated by kevin
Message-ID: <20090130064230.96936208484@bastion.fedora.phx.redhat.com>

kevin approved watchbugzilla on sil-gentium-fonts (Fedora devel) for kevin
kevin approved watchcommits on sil-gentium-fonts (Fedora devel) for kevin

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sil-gentium-fonts



From kevin at fedoraproject.org  Fri Jan 30 06:43:01 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 30 Jan 2009 06:43:01 +0000 (UTC)
Subject: rpms/sil-gentium-fonts Makefile,NONE,1.1
Message-ID: <20090130064301.94C0C70117@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/sil-gentium-fonts
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsWL5792/rpms/sil-gentium-fonts

Added Files:
	Makefile 
Log Message:
Setup of module sil-gentium-fonts


--- NEW FILE Makefile ---
# Top level Makefile for module sil-gentium-fonts
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Fri Jan 30 06:43:02 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 30 Jan 2009 06:43:02 +0000 (UTC)
Subject: rpms/sil-gentium-fonts/devel .cvsignore, NONE, 1.1 Makefile, NONE, 
	1.1 sources, NONE, 1.1
Message-ID: <20090130064302.01C6570117@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/sil-gentium-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsWL5792/rpms/sil-gentium-fonts/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module sil-gentium-fonts


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: sil-gentium-fonts
# $Id: Makefile,v 1.1 2009/01/30 06:43:01 kevin Exp $
NAME := sil-gentium-fonts
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Fri Jan 30 06:43:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 06:43:31 +0000
Subject: [pkgdb] sil-doulos-fonts was added for roozbeh
Message-ID: <20090130064331.160A9208484@bastion.fedora.phx.redhat.com>

kevin has added Package sil-doulos-fonts with summary Doulos SIL fonts
kevin has approved Package sil-doulos-fonts
kevin has added a Fedora devel branch for sil-doulos-fonts with an owner of roozbeh
kevin has approved sil-doulos-fonts in Fedora devel
kevin has approved Package sil-doulos-fonts
kevin has set commit to Approved for provenpackager on sil-doulos-fonts (Fedora devel)
kevin has set build to Approved for provenpackager on sil-doulos-fonts (Fedora devel)
kevin has set checkout to Approved for provenpackager on sil-doulos-fonts (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sil-doulos-fonts



From pkgdb at fedoraproject.org  Fri Jan 30 06:43:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 06:43:34 +0000
Subject: [pkgdb] sil-doulos-fonts (Fedora, devel) updated by kevin
Message-ID: <20090130064334.D6971208494@bastion.fedora.phx.redhat.com>

kevin approved watchbugzilla on sil-doulos-fonts (Fedora devel) for fonts-sig
kevin approved watchcommits on sil-doulos-fonts (Fedora devel) for fonts-sig

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sil-doulos-fonts



From kevin at fedoraproject.org  Fri Jan 30 06:43:54 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 30 Jan 2009 06:43:54 +0000 (UTC)
Subject: rpms/sil-doulos-fonts - New directory
Message-ID: <20090130064354.2A7BD70117@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/sil-doulos-fonts
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsgG5927/rpms/sil-doulos-fonts

Log Message:
Directory /cvs/pkgs/rpms/sil-doulos-fonts added to the repository




From kevin at fedoraproject.org  Fri Jan 30 06:43:54 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 30 Jan 2009 06:43:54 +0000 (UTC)
Subject: rpms/sil-doulos-fonts/devel - New directory
Message-ID: <20090130064354.624BF70141@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/sil-doulos-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsgG5927/rpms/sil-doulos-fonts/devel

Log Message:
Directory /cvs/pkgs/rpms/sil-doulos-fonts/devel added to the repository




From kevin at fedoraproject.org  Fri Jan 30 06:44:11 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 30 Jan 2009 06:44:11 +0000 (UTC)
Subject: rpms/sil-doulos-fonts Makefile,NONE,1.1
Message-ID: <20090130064411.E450270117@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/sil-doulos-fonts
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsgG5927/rpms/sil-doulos-fonts

Added Files:
	Makefile 
Log Message:
Setup of module sil-doulos-fonts


--- NEW FILE Makefile ---
# Top level Makefile for module sil-doulos-fonts
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From kevin at fedoraproject.org  Fri Jan 30 06:44:12 2009
From: kevin at fedoraproject.org (Kevin Fenzi)
Date: Fri, 30 Jan 2009 06:44:12 +0000 (UTC)
Subject: rpms/sil-doulos-fonts/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090130064412.4033C70143@cvs1.fedora.phx.redhat.com>

Author: kevin

Update of /cvs/pkgs/rpms/sil-doulos-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/kevin/CVSROOT/admin/tmpcvsgG5927/rpms/sil-doulos-fonts/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module sil-doulos-fonts


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: sil-doulos-fonts
# $Id: Makefile,v 1.1 2009/01/30 06:44:12 kevin Exp $
NAME := sil-doulos-fonts
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From mclasen at fedoraproject.org  Fri Jan 30 06:44:32 2009
From: mclasen at fedoraproject.org (Matthias Clasen)
Date: Fri, 30 Jan 2009 06:44:32 +0000 (UTC)
Subject: rpms/gtksourceview2/devel gtksourceview2-else.patch, NONE,
	1.1 gtksourceview2.spec, 1.24, 1.25
Message-ID: <20090130064432.05D4070117@cvs1.fedora.phx.redhat.com>

Author: mclasen

Update of /cvs/pkgs/rpms/gtksourceview2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5939

Modified Files:
	gtksourceview2.spec 
Added Files:
	gtksourceview2-else.patch 
Log Message:
Recognize %else in spec files


gtksourceview2-else.patch:

--- NEW FILE gtksourceview2-else.patch ---
diff -up gtksourceview-2.5.3/gtksourceview/language-specs/rpmspec.lang.else gtksourceview-2.5.3/gtksourceview/language-specs/rpmspec.lang
--- gtksourceview-2.5.3/gtksourceview/language-specs/rpmspec.lang.else	2009-01-30 01:39:46.000000000 -0500
+++ gtksourceview-2.5.3/gtksourceview/language-specs/rpmspec.lang	2009-01-30 01:40:12.000000000 -0500
@@ -144,6 +144,7 @@
       <prefix>%</prefix>
       <keyword>ifarch</keyword>
       <keyword>if</keyword>
+      <keyword>else</keyword>
       <keyword>elif</keyword>
       <keyword>endif</keyword>
     </context>


Index: gtksourceview2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtksourceview2/devel/gtksourceview2.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- gtksourceview2.spec	20 Jan 2009 18:20:05 -0000	1.24
+++ gtksourceview2.spec	30 Jan 2009 06:44:01 -0000	1.25
@@ -6,7 +6,7 @@
 Summary: A library for viewing source files
 Name: gtksourceview2
 Version: 2.5.3
-Release: 1%{?dist} 
+Release: 2%{?dist} 
 License: LGPLv2+ and GPLv2+
 # the library itself is LGPL, some .lang files are GPL
 Group: System Environment/Libraries
@@ -20,6 +20,9 @@
 BuildRequires: intltool >= 0.35
 BuildRequires: gettext 
 
+# http://bugzilla.gnome.org/show_bug.cgi?id=569771
+Patch0: gtksourceview2-else.patch
+
 %description
 GtkSourceView is a text widget that extends the standard GTK+
 GtkTextView widget. It improves GtkTextView by implementing 
@@ -42,6 +45,7 @@
 
 %prep
 %setup -q -n gtksourceview-%{version}
+%patch0 -p1 -b .else
 
 %build
 
@@ -81,6 +85,9 @@
 %{_libdir}/*.so
 
 %changelog
+* Fri Jan 30 2009 Matthias Clasen <mclasen at redhat.com> - 2.5.3-2
+- Recognize %else in spec files (#480587)
+
 * Tue Jan 20 2009 Matthias Clasen <mclasen at redhat.com> - 2.5.3-1
 - Update to 2.5.3
 



From pkgdb at fedoraproject.org  Fri Jan 30 07:04:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 07:04:36 +0000
Subject: [pkgdb] ruby: kanarip has requested commit
Message-ID: <20090130070436.EEE0F208486@bastion.fedora.phx.redhat.com>

kanarip has requested the commit acl on ruby (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ruby



From pkgdb at fedoraproject.org  Fri Jan 30 07:04:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 07:04:39 +0000
Subject: [pkgdb] ruby: kanarip has requested watchcommits
Message-ID: <20090130070439.F0C89208496@bastion.fedora.phx.redhat.com>

kanarip has requested the watchcommits acl on ruby (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ruby



From pkgdb at fedoraproject.org  Fri Jan 30 07:04:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 07:04:39 +0000
Subject: [pkgdb] ruby: kanarip has requested approveacls
Message-ID: <20090130070440.8E1A82084A7@bastion.fedora.phx.redhat.com>

kanarip has requested the approveacls acl on ruby (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ruby



From pkgdb at fedoraproject.org  Fri Jan 30 07:04:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 07:04:41 +0000
Subject: [pkgdb] ruby: kanarip has requested watchbugzilla
Message-ID: <20090130070441.9817520860A@bastion.fedora.phx.redhat.com>

kanarip has requested the watchbugzilla acl on ruby (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ruby



From pkgdb at fedoraproject.org  Fri Jan 30 07:04:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 07:04:50 +0000
Subject: [pkgdb] ruby: kanarip has requested approveacls
Message-ID: <20090130070450.EE0C820860C@bastion.fedora.phx.redhat.com>

kanarip has requested the approveacls acl on ruby (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ruby



From pkgdb at fedoraproject.org  Fri Jan 30 07:04:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 07:04:52 +0000
Subject: [pkgdb] ruby: kanarip has requested commit
Message-ID: <20090130070452.76B3E20860F@bastion.fedora.phx.redhat.com>

kanarip has requested the commit acl on ruby (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ruby



From pkgdb at fedoraproject.org  Fri Jan 30 07:04:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 07:04:53 +0000
Subject: [pkgdb] ruby: kanarip has requested watchcommits
Message-ID: <20090130070453.D2C61208678@bastion.fedora.phx.redhat.com>

kanarip has requested the watchcommits acl on ruby (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ruby



From pkgdb at fedoraproject.org  Fri Jan 30 07:04:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 07:04:54 +0000
Subject: [pkgdb] ruby: kanarip has requested watchbugzilla
Message-ID: <20090130070455.0B1942086F2@bastion.fedora.phx.redhat.com>

kanarip has requested the watchbugzilla acl on ruby (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ruby



From pkgdb at fedoraproject.org  Fri Jan 30 07:04:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 07:04:57 +0000
Subject: [pkgdb] ruby: kanarip has requested approveacls
Message-ID: <20090130070457.2B2D1208701@bastion.fedora.phx.redhat.com>

kanarip has requested the approveacls acl on ruby (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ruby



From pkgdb at fedoraproject.org  Fri Jan 30 07:04:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 07:04:58 +0000
Subject: [pkgdb] ruby: kanarip has requested watchcommits
Message-ID: <20090130070459.122D520873F@bastion.fedora.phx.redhat.com>

kanarip has requested the watchcommits acl on ruby (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ruby



From pkgdb at fedoraproject.org  Fri Jan 30 07:04:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 07:04:58 +0000
Subject: [pkgdb] ruby: kanarip has requested commit
Message-ID: <20090130070459.09B4720873D@bastion.fedora.phx.redhat.com>

kanarip has requested the commit acl on ruby (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ruby



From pkgdb at fedoraproject.org  Fri Jan 30 07:05:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 07:05:03 +0000
Subject: [pkgdb] ruby: kanarip has requested watchbugzilla
Message-ID: <20090130070503.BD3DA208742@bastion.fedora.phx.redhat.com>

kanarip has requested the watchbugzilla acl on ruby (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ruby



From corsepiu at fedoraproject.org  Fri Jan 30 07:32:38 2009
From: corsepiu at fedoraproject.org (=?utf-8?q?Ralf_Cors=C3=A9pius?=)
Date: Fri, 30 Jan 2009 07:32:38 +0000 (UTC)
Subject: rpms/perl-Test-Email/devel import.log, NONE,
	1.1 perl-Test-Email.spec, 
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090130073238.1E68970117@cvs1.fedora.phx.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-Test-Email/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14056/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log perl-Test-Email.spec 
Log Message:



--- NEW FILE import.log ---
perl-Test-Email-0_04-1_fc10:HEAD:perl-Test-Email-0.04-1.fc10.src.rpm:1233300693


--- NEW FILE perl-Test-Email.spec ---
Name:           perl-Test-Email
Version:        0.04
Release:        1%{?dist}
Summary:        Test Email Contents
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Test-Email/
Source0:        http://www.cpan.org/authors/id/J/JA/JAMES/Test-Email-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(ExtUtils::MakeMaker)
BuildRequires:  perl(Mail::POP3Client)
BuildRequires:  perl(Mail::Sendmail)
BuildRequires:  perl(MIME::Entity)
BuildRequires:  perl(MIME::Parser)
BuildRequires:  perl(Test::Builder)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
Test::Email is a subclass of MIME::Entity, with the above methods.
If you want the messages fetched from a POP3 account, use Test::POP3.

%prep
%setup -q -n Test-Email-%{version}

# Fix permissions
find -type f -exec chmod -x {} \;

%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
* Fri Jan 23 2009 Ralf Cors??pius <corsepiu at fedoraproject.org> 0.04-1
- Specfile autogenerated by cpanspec 1.77.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-Email/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	30 Jan 2009 06:31:42 -0000	1.1
+++ .cvsignore	30 Jan 2009 07:32:07 -0000	1.2
@@ -0,0 +1 @@
+Test-Email-0.04.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-Email/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	30 Jan 2009 06:31:42 -0000	1.1
+++ sources	30 Jan 2009 07:32:07 -0000	1.2
@@ -0,0 +1 @@
+bb409977cffb292cd85d80d10506f59e  Test-Email-0.04.tar.gz



From corsepiu at fedoraproject.org  Fri Jan 30 07:34:05 2009
From: corsepiu at fedoraproject.org (=?utf-8?q?Ralf_Cors=C3=A9pius?=)
Date: Fri, 30 Jan 2009 07:34:05 +0000 (UTC)
Subject: rpms/perl-Test-Email/devel import.log,1.1,NONE
Message-ID: <20090130073405.28A1970117@cvs1.fedora.phx.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-Test-Email/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14343

Removed Files:
	import.log 
Log Message:
Remove.


--- import.log DELETED ---



From corsepiu at fedoraproject.org  Fri Jan 30 07:37:06 2009
From: corsepiu at fedoraproject.org (=?utf-8?q?Ralf_Cors=C3=A9pius?=)
Date: Fri, 30 Jan 2009 07:37:06 +0000 (UTC)
Subject: rpms/perl-Test-Email/F-10 perl-Test-Email.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090130073706.ECFFC70117@cvs1.fedora.phx.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-Test-Email/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14610/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Test-Email.spec 
Log Message:
Import.


--- NEW FILE perl-Test-Email.spec ---
Name:           perl-Test-Email
Version:        0.04
Release:        1%{?dist}
Summary:        Test Email Contents
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Test-Email/
Source0:        http://www.cpan.org/authors/id/J/JA/JAMES/Test-Email-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(ExtUtils::MakeMaker)
BuildRequires:  perl(Mail::POP3Client)
BuildRequires:  perl(Mail::Sendmail)
BuildRequires:  perl(MIME::Entity)
BuildRequires:  perl(MIME::Parser)
BuildRequires:  perl(Test::Builder)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
Test::Email is a subclass of MIME::Entity, with the above methods.
If you want the messages fetched from a POP3 account, use Test::POP3.

%prep
%setup -q -n Test-Email-%{version}

# Fix permissions
find -type f -exec chmod -x {} \;

%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
* Fri Jan 23 2009 Ralf Cors??pius <corsepiu at fedoraproject.org> 0.04-1
- Specfile autogenerated by cpanspec 1.77.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-Email/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	30 Jan 2009 06:31:42 -0000	1.1
+++ .cvsignore	30 Jan 2009 07:36:36 -0000	1.2
@@ -0,0 +1 @@
+Test-Email-0.04.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-Email/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	30 Jan 2009 06:31:42 -0000	1.1
+++ sources	30 Jan 2009 07:36:36 -0000	1.2
@@ -0,0 +1 @@
+bb409977cffb292cd85d80d10506f59e  Test-Email-0.04.tar.gz



From corsepiu at fedoraproject.org  Fri Jan 30 07:37:07 2009
From: corsepiu at fedoraproject.org (=?utf-8?q?Ralf_Cors=C3=A9pius?=)
Date: Fri, 30 Jan 2009 07:37:07 +0000 (UTC)
Subject: rpms/perl-Test-Email/F-9 perl-Test-Email.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090130073707.18F9A70117@cvs1.fedora.phx.redhat.com>

Author: corsepiu

Update of /cvs/pkgs/rpms/perl-Test-Email/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14610/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Test-Email.spec 
Log Message:
Import.


--- NEW FILE perl-Test-Email.spec ---
Name:           perl-Test-Email
Version:        0.04
Release:        1%{?dist}
Summary:        Test Email Contents
License:        GPL+ or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Test-Email/
Source0:        http://www.cpan.org/authors/id/J/JA/JAMES/Test-Email-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(ExtUtils::MakeMaker)
BuildRequires:  perl(Mail::POP3Client)
BuildRequires:  perl(Mail::Sendmail)
BuildRequires:  perl(MIME::Entity)
BuildRequires:  perl(MIME::Parser)
BuildRequires:  perl(Test::Builder)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
Test::Email is a subclass of MIME::Entity, with the above methods.
If you want the messages fetched from a POP3 account, use Test::POP3.

%prep
%setup -q -n Test-Email-%{version}

# Fix permissions
find -type f -exec chmod -x {} \;

%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
* Fri Jan 23 2009 Ralf Cors??pius <corsepiu at fedoraproject.org> 0.04-1
- Specfile autogenerated by cpanspec 1.77.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-Email/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	30 Jan 2009 06:31:42 -0000	1.1
+++ .cvsignore	30 Jan 2009 07:36:36 -0000	1.2
@@ -0,0 +1 @@
+Test-Email-0.04.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-Email/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	30 Jan 2009 06:31:42 -0000	1.1
+++ sources	30 Jan 2009 07:36:36 -0000	1.2
@@ -0,0 +1 @@
+bb409977cffb292cd85d80d10506f59e  Test-Email-0.04.tar.gz



From pkgdb at fedoraproject.org  Fri Jan 30 08:20:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 08:20:58 +0000
Subject: [pkgdb] system-config-netboot had acl change status
Message-ID: <20090130082058.190C8208485@bastion.fedora.phx.redhat.com>

jreznik has set the watchbugzilla acl on system-config-netboot (Fedora devel) to Approved for rvokal

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/system-config-netboot



From pkgdb at fedoraproject.org  Fri Jan 30 08:20:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 08:20:57 +0000
Subject: [pkgdb] system-config-netboot had acl change status
Message-ID: <20090130082058.352F9208495@bastion.fedora.phx.redhat.com>

jreznik has set the watchcommits acl on system-config-netboot (Fedora devel) to Approved for rvokal

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/system-config-netboot



From pkgdb at fedoraproject.org  Fri Jan 30 08:21:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 08:21:01 +0000
Subject: [pkgdb] system-config-netboot had acl change status
Message-ID: <20090130082101.E1DD92084A7@bastion.fedora.phx.redhat.com>

jreznik has set the commit acl on system-config-netboot (Fedora devel) to Approved for rvokal

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/system-config-netboot



From pkgdb at fedoraproject.org  Fri Jan 30 08:21:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 08:21:03 +0000
Subject: [pkgdb] system-config-netboot had acl change status
Message-ID: <20090130082103.C1BC42084BD@bastion.fedora.phx.redhat.com>

jreznik has set the approveacls acl on system-config-netboot (Fedora devel) to Approved for rvokal

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/system-config-netboot



From pkgdb at fedoraproject.org  Fri Jan 30 08:21:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 08:21:14 +0000
Subject: [pkgdb] system-config-netboot had acl change status
Message-ID: <20090130082114.79DB020860D@bastion.fedora.phx.redhat.com>

jreznik has set the watchbugzilla acl on system-config-netboot (Fedora 10) to Approved for rvokal

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/system-config-netboot



From pkgdb at fedoraproject.org  Fri Jan 30 08:21:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 08:21:12 +0000
Subject: [pkgdb] system-config-netboot had acl change status
Message-ID: <20090130082112.D838E208605@bastion.fedora.phx.redhat.com>

jreznik has set the watchcommits acl on system-config-netboot (Fedora 10) to Approved for rvokal

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/system-config-netboot



From pkgdb at fedoraproject.org  Fri Jan 30 08:21:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 08:21:14 +0000
Subject: [pkgdb] system-config-netboot had acl change status
Message-ID: <20090130082114.AB5D7208610@bastion.fedora.phx.redhat.com>

jreznik has set the commit acl on system-config-netboot (Fedora 10) to Obsolete for rvokal

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/system-config-netboot



From pkgdb at fedoraproject.org  Fri Jan 30 08:21:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 08:21:21 +0000
Subject: [pkgdb] system-config-netboot had acl change status
Message-ID: <20090130082121.E6BF42086F2@bastion.fedora.phx.redhat.com>

jreznik has set the approveacls acl on system-config-netboot (Fedora 10) to Approved for rvokal

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/system-config-netboot



From pkgdb at fedoraproject.org  Fri Jan 30 08:21:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 08:21:17 +0000
Subject: [pkgdb] system-config-netboot had acl change status
Message-ID: <20090130082117.3822E208679@bastion.fedora.phx.redhat.com>

jreznik has set the commit acl on system-config-netboot (Fedora 10) to Approved for rvokal

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/system-config-netboot



From pkgdb at fedoraproject.org  Fri Jan 30 08:21:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 08:21:23 +0000
Subject: [pkgdb] system-config-netboot had acl change status
Message-ID: <20090130082123.5D31D208495@bastion.fedora.phx.redhat.com>

jreznik has set the watchcommits acl on system-config-netboot (Fedora 10) to Approved for viru

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/system-config-netboot



From jwrdegoede at fedoraproject.org  Fri Jan 30 08:25:02 2009
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Fri, 30 Jan 2009 08:25:02 +0000 (UTC)
Subject: rpms/ImageMagick/devel ImageMagick.spec,1.85,1.86
Message-ID: <20090130082502.9814870141@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/ImageMagick/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20955

Modified Files:
	ImageMagick.spec 
Log Message:
* Fri Jan 30 2009 Hans de Goede <hdegoede at redhat.com> 6.4.5.5-8
- Remove (TM) from description as per new guidelines



Index: ImageMagick.spec
===================================================================
RCS file: /cvs/extras/rpms/ImageMagick/devel/ImageMagick.spec,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -r1.85 -r1.86
--- ImageMagick.spec	17 Jan 2009 09:33:31 -0000	1.85
+++ ImageMagick.spec	30 Jan 2009 08:24:30 -0000	1.86
@@ -3,7 +3,7 @@
 
 Name:           ImageMagick
 Version:        %{VER}.%{Patchlevel}
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        An X application for displaying and manipulating images
 Group:          Applications/Multimedia
 License:        ImageMagick
@@ -25,7 +25,7 @@
 BuildRequires:  lcms-devel, libxml2-devel, librsvg2-devel
 
 %description
-ImageMagick(TM) is an image display and manipulation tool for the X
+ImageMagick is an image display and manipulation tool for the X
 Window System. ImageMagick can read and write JPEG, TIFF, PNM, GIF,
 and Photo CD image formats. It can resize, rotate, sharpen, color
 reduce, or add special effects to an image, and when finished you can
@@ -307,6 +307,9 @@
 
 
 %changelog
+* Fri Jan 30 2009 Hans de Goede <hdegoede at redhat.com> 6.4.5.5-8
+- Remove (TM) from description as per new guidelines
+
 * Sat Jan 17 2009 Rakesh Pandit <rakesh at fedoraproject.org> 6.4.5.5-7
 - Corrected the wrong release and bumped
 



From roozbeh at fedoraproject.org  Fri Jan 30 08:25:07 2009
From: roozbeh at fedoraproject.org (Roozbeh Pournader)
Date: Fri, 30 Jan 2009 08:25:07 +0000 (UTC)
Subject: rpms/sil-gentium-fonts/devel import.log, NONE,
	1.1 sil-gentium-fonts.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090130082507.58B8470141@cvs1.fedora.phx.redhat.com>

Author: roozbeh

Update of /cvs/pkgs/rpms/sil-gentium-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20742/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log sil-gentium-fonts.spec 
Log Message:
* Thu Jan 29 2009 Roozbeh Pournader <roozbeh at gmail.com> 1.02-8
- Better description for GentiumAlt subpackage, remove
  Provides (Nicolas Mailhot)

* Tue Jan 27 2009 Roozbeh Pournader <roozbeh at gmail.com> 1.02-7
- Update to new F11 fonts policy, including renaming and splitting


--- NEW FILE import.log ---
sil-gentium-fonts-1_02-8_fc11:HEAD:sil-gentium-fonts-1.02-8.fc11.src.rpm:1233303778


--- NEW FILE sil-gentium-fonts.spec ---
%define fontname sil-gentium
%define archivename ttf-sil-gentium
%define common_desc \
SIL Gentium ("belonging to the nations" in Latin) is a Unicode typeface family\
designed to enable the many diverse ethnic groups around the world who use\
the Latin script to produce readable, high-quality publications. It supports\
a wide range of Latin-based alphabets.


Name:           %{fontname}-fonts
Version:        1.02
Release:        8%{?dist}
Summary:        SIL Gentium fonts

Group:          User Interface/X
License:        OFL
URL:            http://scripts.sil.org/Gentium_linux
# Source0 can be downloaded from the above URL, search for "tar.gz"
Source0:        %{archivename}_1.0.2.tar.gz
BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

BuildArch:      noarch
BuildRequires:  fontpackages-devel

Requires:       %{name}-common = %{version}-%{release}

# Obsoleting and providing the old RPM name
Obsoletes:      gentium-fonts < 1.02-7

%description
%common_desc

This package consists of the main SIL Gentium family.


%_font_pkg Gen[RI]*.ttf


%package common
Summary:        Common files of SIL Gentium fonts
Group:          User Interface/X
Requires:       fontpackages-filesystem

%description common
%common_desc

This package consists of files used by other %{name} packages.


%package -n %{fontname}-alt-fonts
Summary:        SIL GentiumAlt fonts
Group:          User Interface/X
Requires:       %{name}-common = %{version}-%{release}

%description -n %{fontname}-alt-fonts
%common_desc

This package consists of the SIL GentiumAlt family. GentiumAlt is a
alternative version of Gentium with flatter diacratics, to make it more
suitable for languages that use stacking diacratics, like Vietnamese. There
is no problem with having both Gentium and GentiumAlt installed at the same
time.


%_font_pkg -n alt GenA*.ttf


%prep
%setup -q -n %{archivename}-%{version}

# Convert GENTIUM-FAQ from MacRoman
iconv --from=MACINTOSH --to=UTF-8 GENTIUM-FAQ > GENTIUM-FAQ.new
touch -c -r GENTIUM-FAQ GENTIUM-FAQ.new
mv GENTIUM-FAQ.new GENTIUM-FAQ


%build


%install
rm -fr %{buildroot}

install -m 0755 -d %{buildroot}%{_fontdir}
install -m 0644 -p *.ttf %{buildroot}%{_fontdir}

install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} \
                   %{buildroot}%{_fontconfig_confdir}


%clean
rm -fr %{buildroot}


%files common
%defattr(0644,root,root,0755)
%doc FONTLOG GENTIUM-FAQ OFL OFL-FAQ QUOTES README

%dir %{_fontdir}


%changelog
* Thu Jan 29 2009 Roozbeh Pournader <roozbeh at gmail.com> 1.02-8
- Better description for GentiumAlt subpackage, remove
  Provides (Nicolas Mailhot)

* Tue Jan 27 2009 Roozbeh Pournader <roozbeh at gmail.com> 1.02-7
- Update to new F11 fonts policy, including renaming and splitting

* Mon Jul 21 2008 Tom "spot" Callaway <tcallawa at redhat.com> 1.02-6
- fix license tag

* Thu Nov 09 2006 Roozbeh Pournader <roozbeh at farsiweb.info> 1.02-5
- Remove ghost-ed fontconfig caches (fontconfig mechanism is changed)

* Tue Sep 19 2006 Kevin Fenzi <kevin at tummy.com> 1.02-4
- Rebuild for Fedora Extras 6
- Add dist tag

* Mon Feb 13 2006 Roozbeh Pournader <roozbeh at farsiweb.info> 1.02-3
- Rebuild for Fedora Extras 5

* Wed Dec 21 2005 Roozbeh Porunader <roozbeh at farsiweb.info> 1.02-2
- Added comment to Source0 about where to get the file
- Added Provides and Obsoletes for upsteam RPM name

* Mon Dec 19 2005 Roozbeh Pournader <roozbeh at farsiweb.info> 1.02-1
- Initial packaging, borrowing many things from dejavu-fonts


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sil-gentium-fonts/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	30 Jan 2009 06:43:01 -0000	1.1
+++ .cvsignore	30 Jan 2009 08:24:36 -0000	1.2
@@ -0,0 +1 @@
+ttf-sil-gentium_1.0.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sil-gentium-fonts/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	30 Jan 2009 06:43:01 -0000	1.1
+++ sources	30 Jan 2009 08:24:37 -0000	1.2
@@ -0,0 +1 @@
+4c3e6ae586be277537ebb68f2a45b883  ttf-sil-gentium_1.0.2.tar.gz



From jwrdegoede at fedoraproject.org  Fri Jan 30 08:27:00 2009
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Fri, 30 Jan 2009 08:27:00 +0000 (UTC)
Subject: rpms/ants/devel ants.spec,1.4,1.5
Message-ID: <20090130082700.1CA0770117@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/ants/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22075

Modified Files:
	ants.spec 
Log Message:
* Fri Jan 30 2009 Hans de Goede <hdegoede at redhat.com> 1.4-5
- Update description for new trademark guidelines



Index: ants.spec
===================================================================
RCS file: /cvs/extras/rpms/ants/devel/ants.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ants.spec	19 Feb 2008 07:53:16 -0000	1.4
+++ ants.spec	30 Jan 2009 08:26:29 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           ants
 Version:        1.4
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Guide your ants safely home before they drop of the cliff
 Group:          Amusements/Games
 License:        Public Domain
@@ -16,12 +16,12 @@
 Requires:       hicolor-icon-theme
 
 %description
-A game inspired by the game Lemmings. You take command in the game of a bunch
-of small ants and have to guide them around in levels. Since the ants walk on
-their own, the player can only influence them by giving them commands, like
-build a bridge, dig a hole or redirect all penguins in the other direction.
-The goal of each level is to reach the exit, for which multiple combination of
-commands are necessary. The game is presented in a 2D site view.
+You take command in the game of a bunch of small ants and have to guide them
+around in levels. Since the ants walk on their own, the player can only
+influence them by giving them commands, like build a bridge, dig a hole or
+redirect all ants in the other direction. The goal of each level is to
+reach the exit, for which multiple combination of commands are necessary.
+The game is presented in a 2D side view.
 
 
 %package        level-editor
@@ -100,6 +100,9 @@
 
 
 %changelog
+* Fri Jan 30 2009 Hans de Goede <hdegoede at redhat.com> 1.4-5
+- Update description for new trademark guidelines
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1.4-4
 - Autorebuild for GCC 4.3
 



From roozbeh at fedoraproject.org  Fri Jan 30 08:27:47 2009
From: roozbeh at fedoraproject.org (Roozbeh Pournader)
Date: Fri, 30 Jan 2009 08:27:47 +0000 (UTC)
Subject: rpms/sil-doulos-fonts/devel import.log, NONE,
	1.1 sil-doulos-fonts.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090130082747.2F84D70117@cvs1.fedora.phx.redhat.com>

Author: roozbeh

Update of /cvs/pkgs/rpms/sil-doulos-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22263/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log sil-doulos-fonts.spec 
Log Message:
* Thu Jan 29 2009 Roozbeh Pournader <roozbeh at gmail.com> - 4.104-3
- Cleanup, remove Provides (Nicholas Mailhot)

* Thu Jan 29 2009 Roozbeh Pournader <roozbeh at gmail.com> - 4.104-2
- Update to new F11 fonts policy, renaming from doulos-fonts


--- NEW FILE import.log ---
sil-doulos-fonts-4_104-3_fc11:HEAD:sil-doulos-fonts-4.104-3.fc11.src.rpm:1233303985


--- NEW FILE sil-doulos-fonts.spec ---
%define fontname sil-doulos
%define archivename DoulosSIL
%define docversion 4.100

Name:           %{fontname}-fonts
Version:        4.104
Release:        3%{?dist}
Summary:        Doulos SIL fonts

Group:          User Interface/X
License:        OFL
URL:            http://scripts.sil.org/DoulosSILFont
Source0:        %{archivename}%{version}.zip
BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

BuildArch:      noarch
BuildRequires:  fontpackages-devel
Requires:       fontpackages-filesystem

# Obsoleting and providing the old RPM name
Obsoletes:      doulos-fonts < 4.104-2

%description
Doulos SIL provides glyphs for a wide range of Latin and Cyrillic
characters. Doulos's design is similar to the design of the Times-like
fonts, but only has a single regular face. It is intended for use alongside
other Times-like fonts where a range of styles (italic, bold) are not
needed.


%prep
%setup -q -n %{archivename}
sed -i 's/\r$//' *.txt


%build


%install
rm -fr %{buildroot}

install -m 0755 -d %{buildroot}%{_fontdir}
install -m 0644 -p *.ttf %{buildroot}%{_fontdir}


%clean
rm -fr %{buildroot}


%_font_pkg *.ttf

%doc FONTLOG.txt OFL.txt OFL-FAQ.txt README.txt
%doc DoulosSIL%{docversion}FontDocumentation.pdf

%dir %{_fontdir}


%changelog
* Thu Jan 29 2009 Roozbeh Pournader <roozbeh at gmail.com> - 4.104-3
- Cleanup, remove Provides (Nicholas Mailhot)

* Thu Jan 29 2009 Roozbeh Pournader <roozbeh at gmail.com> - 4.104-2
- Update to new F11 fonts policy, renaming from doulos-fonts

* Tue Jan 13 2009 Roozbeh Pournader <roozbeh at gmail.com> - 4.104-1
- Update main font to 4.104 (with Unicode 5.1 support)
- Remove Doulos Literacy (not maintained anymore)
- Last update before conversion to new fonts policy

* Tue Dec 11 2007 Roozbeh Pournader <roozbeh at farsiweb.info> - 4.100-1
- Update main font to 4.100, keep old Doulos Literacy which is latest
- Change license tag to OFL

* Thu Nov 09 2006 Roozbeh Pournader <roozbeh at farsiweb.info> - 4.0.14-4
- Include Doulos Literacy
- Don't include font cache files (fontconfig mechanism is changed)

* Wed Nov 08 2006 Roozbeh Pournader <roozbeh at farsiweb.info> - 4.0.14-3
- Add dist tag

* Wed Nov 08 2006 Roozbeh Pournader <roozbeh at farsiweb.info> - 4.0.14-2
- Rebuild to make package available in Rawhide again

* Sat Feb 18 2006 Roozbeh Pournader <roozbeh at farsiweb.info> - 4.0.14-1
- Initial packaging, based on gentium-fonts


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sil-doulos-fonts/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	30 Jan 2009 06:44:12 -0000	1.1
+++ .cvsignore	30 Jan 2009 08:27:16 -0000	1.2
@@ -0,0 +1 @@
+DoulosSIL4.104.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sil-doulos-fonts/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	30 Jan 2009 06:44:12 -0000	1.1
+++ sources	30 Jan 2009 08:27:16 -0000	1.2
@@ -0,0 +1 @@
+b11373034e7e417b6e00b394c8da7f67  DoulosSIL4.104.zip



From jwrdegoede at fedoraproject.org  Fri Jan 30 08:30:12 2009
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Fri, 30 Jan 2009 08:30:12 +0000 (UTC)
Subject: rpms/clanbomber/devel clanbomber.spec,1.8,1.9
Message-ID: <20090130083012.BB71E70117@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/clanbomber/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22865

Modified Files:
	clanbomber.spec 
Log Message:
* Fri Jan 30 2009 Hans de Goede <hdegoede at redhat.com> 1.05-9
- Update description for new trademark guidelines



Index: clanbomber.spec
===================================================================
RCS file: /cvs/extras/rpms/clanbomber/devel/clanbomber.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- clanbomber.spec	19 Feb 2008 08:11:28 -0000	1.8
+++ clanbomber.spec	30 Jan 2009 08:29:42 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           clanbomber
 Version:        1.05
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        Bomberman-like multiplayer game that uses ClanLib
 Group:          Amusements/Games
 License:        GPLv2+
@@ -15,8 +15,8 @@
 Requires:       hicolor-icon-theme
 
 %description
-ClanBomber is a free (GPL) Bomberman-like multiplayer game that uses ClanLib,
-a free multi platform C++ game SDK. First "ClanBomber" was only a working title
+ClanBomber is a free multiplayer game that uses ClanLib, a free multi platform
+C++ game SDK. First "ClanBomber" was only a working title
 for a small game started in September 1998, that has only been started to learn
 how to use ClanLib. But the ClanBomber project has grown into a real game. It
 is fully playable and features Computer controlled bombers, however, it is
@@ -75,6 +75,9 @@
 
 
 %changelog
+* Fri Jan 30 2009 Hans de Goede <hdegoede at redhat.com> 1.05-9
+- Update description for new trademark guidelines
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1.05-8
 - Autorebuild for GCC 4.3
 



From mjakubicek at fedoraproject.org  Fri Jan 30 08:33:07 2009
From: mjakubicek at fedoraproject.org (=?utf-8?b?TWlsb8WhIEpha3Viw63EjWVr?=)
Date: Fri, 30 Jan 2009 08:33:07 +0000 (UTC)
Subject: rpms/torch/devel import.log, NONE, 1.1 torch.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090130083307.7CD9E70117@cvs1.fedora.phx.redhat.com>

Author: mjakubicek

Update of /cvs/pkgs/rpms/torch/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23629/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log torch.spec 
Log Message:
-Initial commit.



--- NEW FILE import.log ---
torch-3_1-1_fc10:HEAD:torch-3.1-1.fc10.src.rpm:1233304244


--- NEW FILE torch.spec ---
Name:			torch
Version:		3.1
Release:		1%{?dist}
Summary:		Torch is a simple machine-learning library	

Group:			Applications/Engineering	
License:		BSD
URL:			http://www.torch.ch/
Source0:		http://www.torch.ch/archives/Torch3src.tgz
Source1:		http://www.torch.ch/archives/Torch3doc.tgz
BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%description
Torch is a simple machine-learning library, among its features you can find:

* A lot of things in gradient machines, that is, machines which could be
  learned with a gradient descent. This includes multi-layered perceptrons,
  radial bas is functions, mixtures of experts, convolutional networks and
  even time-delay neural networks. In fact a lot of "modules" are available
  that you can plug as you want to get what you need.
* Support vector machines, in classification and regression. As fast as the
  old stand-alone program SVMTorch II, but with the powerful environment of
  the library.
* Ensemble models such as bagging or adaboost.
* Non-parametric models such as K-nearest-neighbors, Parzen regression and
  Parzen density estimator.
* Distributions stuff, like Kmeans, Gaussian mixture models, hidden Markov
  models, input-output hidden Markov models, and Bayes classifier.
* Speech recognition tools (Embedded training and large vocabulary decoding).

%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 Torch3


%build
ln -s config/Makefile_options_Linux .
# use default gcc flags
sed -i -e "s/CFLAGS_OPT_DOUBLE = -Wall -O2 -ffast-math -mcpu=i686 -march=i686 -malign-double -DUSE_DOUBLE/CFLAGS_OPT_DOUBLE = -DUSE_DOUBLE %{optflags} -fPIC -DPIC/" \
-e "s/CFLAGS_OPT_FLOAT = -Wall -O2 -ffast-math -mcpu=i686 -march=i686 -malign-double/CFLAGS_OPT_FLOAT = %{optflags} -fPIC -DPIC/" Makefile_options_Linux
# add all packages to be built
sed -i "s/PACKAGES =/PACKAGES = convolutions datasets decoder distributions gradients kernels matrix nonparametrics speech/" Makefile_options_Linux
# we DO want to see what's going on during the build
find . -name Makefile -exec sed -i 's/@$(CC) $(CFLAGS_$(MODE)) $(INCS) -o $@ -c $</$(CC) $(CFLAGS_$(MODE)) $(INCS) -o $@ -c $</' {} \;
# remove any exit() calls from library's code
sed -i '/exit(-1);/d' core/{CmdLine.cc,general.cc}
sed -i 's/exit (-1);/return NULL;/' datasets/IOHTK.cc
# do not build a static library...
sed -i "s/AR = ar -rus/AR = :/" Makefile_options_Linux

make depend
make %{?_smp_mflags}

# ...but make a shared one
g++ %{optflags} -shared -Wl,-soname,libtorch.so.1 -o libtorch.so.1.0.0 `find . -name "*.o"`

%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_libdir}
mkdir -p $RPM_BUILD_ROOT%{_includedir}/torch

# install the library
install -p -m 755 libtorch.so.1.0.0 $RPM_BUILD_ROOT%{_libdir}
pushd $RPM_BUILD_ROOT%{_libdir}
	ln -sf libtorch.so.1.0.0 libtorch.so.1
	ln -sf libtorch.so.1.0.0 libtorch.so
popd

# install the headers
find . -name "*.h" -exec install -p -m 644 {} $RPM_BUILD_ROOT%{_includedir}/torch \;

# fix utf8
iconv -f ISO-8859-2 -t UTF-8 LICENSE > LICENSE.utf8
mv LICENSE.utf8 LICENSE
rm examples/LICENSE

# extract the docs
tar xzvf %{SOURCE1}

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%clean
rm -rf $RPM_BUILD_ROOT


%files devel
%defattr(-,root,root,-)
%{_includedir}/torch
%{_libdir}/libtorch.so
%doc examples docs

%files
%defattr(-,root,root,-)
%doc LICENSE ChangeLog
%{_libdir}/libtorch.so.1.0.0
%{_libdir}/libtorch.so.1


%changelog
* Wed Jan 28 2009 Milos Jakubicek <xjakub at fi.muni.cz> - 3.1-1
- Initial release.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/torch/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	30 Jan 2009 06:34:32 -0000	1.1
+++ .cvsignore	30 Jan 2009 08:32:37 -0000	1.2
@@ -0,0 +1,2 @@
+Torch3doc.tgz
+Torch3src.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/torch/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	30 Jan 2009 06:34:32 -0000	1.1
+++ sources	30 Jan 2009 08:32:37 -0000	1.2
@@ -0,0 +1,2 @@
+d37949e6e73666ce3399e23dfbc4a7d2  Torch3doc.tgz
+c0de6c538d815a0578efadb0f924c92a  Torch3src.tgz



From huzaifas at fedoraproject.org  Fri Jan 30 08:33:06 2009
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Fri, 30 Jan 2009 08:33:06 +0000 (UTC)
Subject: rpms/gnumeric/F-10 gnumeric-1.8.2-python.patch, NONE,
	1.1 gnumeric.spec, 1.42, 1.43
Message-ID: <20090130083306.CBC5370117@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/pkgs/rpms/gnumeric/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23706

Modified Files:
	gnumeric.spec 
Added Files:
	gnumeric-1.8.2-python.patch 
Log Message:
Resolve CVE-2008-5983

gnumeric-1.8.2-python.patch:

--- NEW FILE gnumeric-1.8.2-python.patch ---
--- gnumeric-1.8.2/plugins/python-loader/gnm-py-interpreter.c	2008-01-18 21:28:20.000000000 +0100
+++ gnumeric-1.8.2/plugins/python-loader/gnm-py-interpreter.c.new	2009-01-28 22:58:40.000000000 +0100
@@ -101,6 +101,7 @@
 	interpreter->plugin = plugin;
 
 	PySys_SetArgv (G_N_ELEMENTS (plugin_argv) - 1, plugin_argv);
+	PyRun_SimpleString("import sys; sys.path = filter(None, sys.path)");
 	py_initgnumeric (interpreter);
 
 	return interpreter;


Index: gnumeric.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnumeric/F-10/gnumeric.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- gnumeric.spec	17 Nov 2008 09:20:29 -0000	1.42
+++ gnumeric.spec	30 Jan 2009 08:32:36 -0000	1.43
@@ -1,7 +1,7 @@
 Name:             gnumeric
 Epoch:            1
 Version:          1.8.2
-Release:          4%{?dist}
+Release:          6%{?dist}
 Summary:          Spreadsheet program for GNOME
 Group:            Applications/Productivity
 # bug filed upstream about this being GPL v2 only:
@@ -11,6 +11,7 @@
 Source:           ftp://ftp.gnome.org/pub/GNOME/sources/%{name}/1.8/%{name}-%{version}.tar.bz2
 Patch0:           gnumeric-1.8.2-desktop.patch
 Patch1:           gnumeric-1.8.1-gnomedb-vercheck.patch
+Patch2:		  gnumeric-1.8.2-python.patch	
 BuildRoot:        %{_tmppath}/%{name}-%{version}-root
 BuildRequires:    libgnomeui-devel >= 2.4.0
 BuildRequires:    libgnomeprintui22-devel >= 2.8.2
@@ -61,6 +62,7 @@
 %setup -q
 %patch0 -p1 -b .desktop
 %patch1 -p1
+%patch2 -p1 -b .new
 chmod -x plugins/excel/rc4.?
 
 
@@ -188,6 +190,10 @@
 
 
 %changelog
+* Fri Jan 30 2008 Huzaifa Sidhpurwala <huzaifas at redhat.com> 1:1.8.2-6
+- Resolves CVE-2008-5983
+- Version bump to match the rawhide version
+
 * Mon Nov 17 2008 Huzaifa Sidhpurwala <huzaifas at redhat.com> 1:1.8.2-4
 - Version bump
 



From jwrdegoede at fedoraproject.org  Fri Jan 30 08:33:29 2009
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Fri, 30 Jan 2009 08:33:29 +0000 (UTC)
Subject: rpms/dia/devel dia.spec,1.32,1.33
Message-ID: <20090130083329.E4C5D70117@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/dia/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23786

Modified Files:
	dia.spec 
Log Message:
* Fri Jan 30 2009 Hans de Goede <hdegoede at redhat.com> 1:0.96.1-12
- Update description for new trademark guidelines



Index: dia.spec
===================================================================
RCS file: /cvs/extras/rpms/dia/devel/dia.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- dia.spec	26 Jan 2009 11:16:08 -0000	1.32
+++ dia.spec	30 Jan 2009 08:32:59 -0000	1.33
@@ -1,6 +1,6 @@
 Name:           dia
 Version:        0.96.1
-Release:        11%{?dist}
+Release:        12%{?dist}
 Epoch:          1
 Summary:        Diagram drawing program
 Group:          Applications/Multimedia
@@ -23,8 +23,7 @@
 Requires:       hicolor-icon-theme
 
 %description
-The Dia drawing program is designed to be like the Windows(TM) Visio
-program.  Dia can be used to draw different types of diagrams, and
+The Dia drawing program can be used to draw different types of diagrams, and
 includes support for UML static structure diagrams (class diagrams),
 entity relationship modeling, and network diagrams.  Dia can load and
 save diagrams to a custom file format, can load and save in .xml format,
@@ -115,6 +114,9 @@
 
 
 %changelog
+* Fri Jan 30 2009 Hans de Goede <hdegoede at redhat.com> 1:0.96.1-12
+- Update description for new trademark guidelines
+
 * Mon Jan 26 2009 Caol??n McNamara <caolanm at redhat.com> 1:0.96.1-11
 - Resolves: rhbz#481551 python modules search path
 



From huzaifas at fedoraproject.org  Fri Jan 30 08:34:53 2009
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Fri, 30 Jan 2009 08:34:53 +0000 (UTC)
Subject: rpms/gnumeric/F-10 gnumeric.spec,1.43,1.44
Message-ID: <20090130083453.6690070117@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/pkgs/rpms/gnumeric/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24198

Modified Files:
	gnumeric.spec 
Log Message:
Correct the changelog order


Index: gnumeric.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnumeric/F-10/gnumeric.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- gnumeric.spec	30 Jan 2009 08:32:36 -0000	1.43
+++ gnumeric.spec	30 Jan 2009 08:34:23 -0000	1.44
@@ -190,7 +190,7 @@
 
 
 %changelog
-* Fri Jan 30 2008 Huzaifa Sidhpurwala <huzaifas at redhat.com> 1:1.8.2-6
+* Fri Jan 30 2009 Huzaifa Sidhpurwala <huzaifas at redhat.com> 1:1.8.2-6
 - Resolves CVE-2008-5983
 - Version bump to match the rawhide version
 



From jwrdegoede at fedoraproject.org  Fri Jan 30 08:36:02 2009
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Fri, 30 Jan 2009 08:36:02 +0000 (UTC)
Subject: rpms/freecol/devel freecol.spec,1.10,1.11
Message-ID: <20090130083602.2105970117@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/freecol/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24400

Modified Files:
	freecol.spec 
Log Message:
* Thu Jan 15 2009 Hans de Goede <hdegoede at redhat.com> 0.8.0-2
- Update description for new trademark guidelines



Index: freecol.spec
===================================================================
RCS file: /cvs/extras/rpms/freecol/devel/freecol.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- freecol.spec	20 Jan 2009 10:16:17 -0000	1.10
+++ freecol.spec	30 Jan 2009 08:35:31 -0000	1.11
@@ -9,7 +9,7 @@
 
 Name:           freecol
 Version:        0.8.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Turn-based multi-player strategy game
 Group:          Amusements/Games
 License:        GPL+
@@ -30,8 +30,7 @@
 
 %description
 FreeCol is a turn-based, multi-player, X based strategy game. FreeCol
-is generally comparable to, and has compatible rules with, the
-Colonization(R) game by Microprose(R).
+has compatible rules with the Colonization game.
 
 
 %package manual
@@ -145,6 +144,9 @@
 
 
 %changelog
+* Thu Jan 15 2009 Hans de Goede <hdegoede at redhat.com> 0.8.0-2
+- Update description for new trademark guidelines
+
 * Thu Jan 15 2009 Hans de Goede <hdegoede at redhat.com> 0.8.0-1
 - New upstream release 0.8.0
 



From roozbeh at fedoraproject.org  Fri Jan 30 08:38:37 2009
From: roozbeh at fedoraproject.org (Roozbeh Pournader)
Date: Fri, 30 Jan 2009 08:38:37 +0000 (UTC)
Subject: comps comps-f11.xml.in,1.90,1.91
Message-ID: <20090130083837.21C5870117@cvs1.fedora.phx.redhat.com>

Author: roozbeh

Update of /cvs/pkgs/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24717

Modified Files:
	comps-f11.xml.in 
Log Message:
Added sil-doulos-fonts, sil-gentium-fonts, and sil-gentium-alt-fonts



Index: comps-f11.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f11.xml.in,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -r1.90 -r1.91
--- comps-f11.xml.in	30 Jan 2009 02:13:28 -0000	1.90
+++ comps-f11.xml.in	30 Jan 2009 08:38:06 -0000	1.91
@@ -1594,6 +1594,9 @@
       <packagereq type="optional">serafettin-cartoon-fonts</packagereq>
       <packagereq type="optional">sil-andika-fonts</packagereq>
       <packagereq type="optional">sil-charis-fonts</packagereq>
+      <packagereq type="optional">sil-doulos-fonts</packagereq>
+      <packagereq type="optional">sil-gentium-alt-fonts</packagereq>
+      <packagereq type="optional">sil-gentium-fonts</packagereq>
       <packagereq type="optional">silkscreen-fonts</packagereq>
       <packagereq type="optional">smc-fonts-anjalioldlipi</packagereq>
       <packagereq type="optional">smc-fonts-dyuthi</packagereq>



From jwrdegoede at fedoraproject.org  Fri Jan 30 08:38:49 2009
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Fri, 30 Jan 2009 08:38:49 +0000 (UTC)
Subject: rpms/lesstif/devel lesstif.spec,1.24,1.25
Message-ID: <20090130083849.2825D70117@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/lesstif/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24811

Modified Files:
	lesstif.spec 
Log Message:
* Fri Jan 30 2009 Hans de Goede <hdegoede at redhat.com> 0.95.0-27
- Update description for new trademark guidelines



Index: lesstif.spec
===================================================================
RCS file: /cvs/extras/rpms/lesstif/devel/lesstif.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- lesstif.spec	7 Jul 2008 21:29:17 -0000	1.24
+++ lesstif.spec	30 Jan 2009 08:38:18 -0000	1.25
@@ -1,7 +1,7 @@
-Summary: OSF/Motif(R) library clone
+Summary: OSF/Motif library clone
 Name: lesstif
 Version: 0.95.0
-Release: 26%{?dist}
+Release: 27%{?dist}
 License: LGPLv2+
 # in Xm-2.1/
 # some files are MIT
@@ -90,10 +90,9 @@
 
 
 %description
-LessTif is a free replacement for OSF/Motif(R), which provides a full
+LessTif is a free replacement for OSF/Motif, which provides a full
 set of widgets for application development (menus, text entry areas,
-scrolling windows, etc.). LessTif is source compatible with
-OSF/Motif(R).
+scrolling windows, etc.). LessTif is source compatible with OSF/Motif.
 
 This package provides the lesstif runtime libraries.
 
@@ -319,6 +318,9 @@
 
 
 %changelog
+* Fri Jan 30 2009 Hans de Goede <hdegoede at redhat.com> 0.95.0-27
+- Update description for new trademark guidelines
+
 * Mon Jul  7 2008 Patrice Dumas <pertusus at free.fr> 0.95.0-26
 - debian lesstif2_0.95.0-2.1
 



From airlied at fedoraproject.org  Fri Jan 30 08:40:00 2009
From: airlied at fedoraproject.org (Dave Airlie)
Date: Fri, 30 Jan 2009 08:40:00 +0000 (UTC)
Subject: rpms/libdrm/devel libdrm-radeon-update.patch, NONE, 1.1 .cvsignore, 
	1.17, 1.18 libdrm.spec, 1.55, 1.56 sources, 1.17,
	1.18 i915modeset, 1.1, NONE
Message-ID: <20090130084000.80F9E70117@cvs1.fedora.phx.redhat.com>

Author: airlied

Update of /cvs/pkgs/rpms/libdrm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25115

Modified Files:
	.cvsignore libdrm.spec sources 
Added Files:
	libdrm-radeon-update.patch 
Removed Files:
	i915modeset 
Log Message:
* Fri Jan 30 2009 Dave Airlie <airlied at redhat.com> 2.4.4-1
- rebase to 2.4.4


libdrm-radeon-update.patch:

--- NEW FILE libdrm-radeon-update.patch ---
diff --git a/libdrm/radeon/radeon_bo.h b/libdrm/radeon/radeon_bo.h
index 44dc090..3cabdfc 100644
--- a/libdrm/radeon/radeon_bo.h
+++ b/libdrm/radeon/radeon_bo.h
@@ -52,6 +52,7 @@ struct radeon_bo {
 #endif
     void                        *ptr;
     struct radeon_bo_manager    *bom;
+    uint32_t                    space_accounted;
 };
 
 /* bo functions */
@@ -66,6 +67,7 @@ struct radeon_bo_funcs {
     struct radeon_bo *(*bo_unref)(struct radeon_bo *bo);
     int (*bo_map)(struct radeon_bo *bo, int write);
     int (*bo_unmap)(struct radeon_bo *bo);
+    int (*bo_wait)(struct radeon_bo *bo);
 };
 
 struct radeon_bo_manager {
@@ -151,6 +153,14 @@ static inline int _radeon_bo_unmap(struct radeon_bo *bo,
     return bo->bom->funcs->bo_unmap(bo);
 }
 
+static inline int _radeon_bo_wait(struct radeon_bo *bo,
+                                  const char *file,
+                                  const char *func,
+                                  int line)
+{
+    return bo->bom->funcs->bo_wait(bo);
+}
+
 #define radeon_bo_open(bom, h, s, a, d, f)\
     _radeon_bo_open(bom, h, s, a, d, f, __FILE__, __FUNCTION__, __LINE__)
 #define radeon_bo_ref(bo)\
@@ -163,5 +173,7 @@ static inline int _radeon_bo_unmap(struct radeon_bo *bo,
     _radeon_bo_unmap(bo, __FILE__, __FUNCTION__, __LINE__)
 #define radeon_bo_debug(bo, opcode)\
     _radeon_bo_debug(bo, opcode, __FILE__, __FUNCTION__, __LINE__)
+#define radeon_bo_wait(bo) \
+    _radeon_bo_wait(bo, __FILE__, __func__, __LINE__)
 
 #endif
diff --git a/libdrm/radeon/radeon_bo_gem.c b/libdrm/radeon/radeon_bo_gem.c
index fdf852a..932afeb 100644
--- a/libdrm/radeon/radeon_bo_gem.c
+++ b/libdrm/radeon/radeon_bo_gem.c
@@ -35,6 +35,7 @@
 #include <string.h>
 #include <sys/mman.h>
 #include <sys/ioctl.h>
+#include <errno.h>
 #include "xf86drm.h"
 #include "drm.h"
 #include "radeon_drm.h"
@@ -176,12 +177,26 @@ static int bo_unmap(struct radeon_bo *bo)
     return 0;
 }
 
+static int bo_wait(struct radeon_bo *bo)
+{
+    struct drm_radeon_gem_wait_rendering args;
+    int ret;
+
+    args.handle = bo->handle;
+    do {
+        ret = drmCommandWriteRead(bo->bom->fd, DRM_RADEON_GEM_WAIT_RENDERING,
+                                  &args, sizeof(args));
+    } while (ret == -EAGAIN);
+    return ret;
+}
+
 static struct radeon_bo_funcs bo_gem_funcs = {
     bo_open,
     bo_ref,
     bo_unref,
     bo_map,
-    bo_unmap
+    bo_unmap,
+    bo_wait
 };
 
 struct radeon_bo_manager *radeon_bo_manager_gem_ctor(int fd)
diff --git a/libdrm/radeon/radeon_cs.h b/libdrm/radeon/radeon_cs.h
index 8b1a999..8b5a2a9 100644
--- a/libdrm/radeon/radeon_cs.h
+++ b/libdrm/radeon/radeon_cs.h
@@ -33,6 +33,8 @@
 #define RADEON_CS_H
 
 #include <stdint.h>
+#include "drm.h"
+#include "radeon_drm.h"
 #include "radeon_bo.h"
 
 struct radeon_cs_reloc {
@@ -42,6 +44,18 @@ struct radeon_cs_reloc {
     uint32_t            flags;
 };
 
+
+#define RADEON_CS_SPACE_OK 0
+#define RADEON_CS_SPACE_OP_TO_BIG 1
+#define RADEON_CS_SPACE_FLUSH 2
+
+struct radeon_cs_space_check {
+    struct radeon_bo *bo;
+    uint32_t read_domains;
+    uint32_t write_domain;
+    uint32_t new_accounted;
+};
+
 struct radeon_cs_manager;
 
 struct radeon_cs {
@@ -58,6 +72,7 @@ struct radeon_cs {
     const char                  *section_file;
     const char                  *section_func;
     int                         section_line;
+
 };
 
 /* cs functions */
@@ -84,11 +99,16 @@ struct radeon_cs_funcs {
     int (*cs_erase)(struct radeon_cs *cs);
     int (*cs_need_flush)(struct radeon_cs *cs);
     void (*cs_print)(struct radeon_cs *cs, FILE *file);
+    int (*cs_space_check)(struct radeon_cs *cs, struct radeon_cs_space_check *bos,
+			  int num_bo);
 };
 
 struct radeon_cs_manager {
     struct radeon_cs_funcs  *funcs;
     int                     fd;
+    uint32_t vram_limit, gart_limit;
+    uint32_t vram_write_used, gart_write_used;
+    uint32_t read_used;
 };
 
 static inline struct radeon_cs *radeon_cs_create(struct radeon_cs_manager *csm,
@@ -157,4 +177,19 @@ static inline void radeon_cs_print(struct radeon_cs *cs, FILE *file)
     cs->csm->funcs->cs_print(cs, file);
 }
 
+static inline int radeon_cs_space_check(struct radeon_cs *cs,
+					    struct radeon_cs_space_check *bos,
+					    int num_bo)
+{
+    return cs->csm->funcs->cs_space_check(cs, bos, num_bo);
+}
+
+static inline void radeon_cs_set_limit(struct radeon_cs *cs, uint32_t domain, uint32_t limit)
+{
+    
+    if (domain == RADEON_GEM_DOMAIN_VRAM)
+	cs->csm->vram_limit = limit;
+    else
+	cs->csm->gart_limit = limit;
+}
 #endif
diff --git a/libdrm/radeon/radeon_cs_gem.c b/libdrm/radeon/radeon_cs_gem.c
index bfc5aca..c9cf345 100644
--- a/libdrm/radeon/radeon_cs_gem.c
+++ b/libdrm/radeon/radeon_cs_gem.c
@@ -229,6 +229,16 @@ static int cs_gem_end(struct radeon_cs *cs,
     return 0;
 }
 
+
+static void dump_cmdbuf(struct radeon_cs *cs)
+{
+  int i;
+  for (i = 0; i < cs->cdw; i++){
+    fprintf(stderr,"%x: %08x\n", i, cs->packets[i]);
+  }
+
+}
+
 static int cs_gem_emit(struct radeon_cs *cs)
 {
     struct cs_gem *csg = (struct cs_gem*)cs;
@@ -236,6 +246,7 @@ static int cs_gem_emit(struct radeon_cs *cs)
     unsigned i;
     int r;
 
+    dump_cmdbuf(cs);
     csg->chunks[0].length_dw = cs->cdw;
 
     chunk_array[0] = (uint64_t)(intptr_t)&csg->chunks[0];
@@ -387,6 +398,97 @@ static void cs_gem_print(struct radeon_cs *cs, FILE *file)
     }
 }
 
+static int cs_gem_check_space(struct radeon_cs *cs, struct radeon_cs_space_check *bos, int num_bo)
+{
+    struct radeon_cs_manager *csm = cs->csm;
+    int this_op_read = 0, this_op_gart_write = 0, this_op_vram_write = 0;
+    uint32_t read_domains, write_domain;
+    int i;
+    struct radeon_bo *bo;
+
+    /* check the totals for this operation */
+
+    if (num_bo == 0)
+        return 0;
+
+    /* prepare */
+    for (i = 0; i < num_bo; i++) {
+      bo = bos[i].bo;
+
+      bos[i].new_accounted = 0;
+      read_domains = bos[i].read_domains;
+      write_domain = bos[i].write_domain;
+		
+      /* already accounted this bo */
+      if (write_domain && (write_domain == bo->space_accounted))
+	  continue;
+
+      if (read_domains && ((read_domains << 16) == bo->space_accounted))
+	  continue;
+      
+      if (bo->space_accounted == 0) {
+	  if (write_domain == RADEON_GEM_DOMAIN_VRAM)
+	      this_op_vram_write += bo->size;
+	  else if (write_domain == RADEON_GEM_DOMAIN_GTT)
+	      this_op_gart_write += bo->size;
+	  else
+	      this_op_read += bo->size;
+	  bos[i].new_accounted = (read_domains << 16) | write_domain;
+      } else {
+	  uint16_t old_read, old_write;
+	  
+	  old_read = bo->space_accounted >> 16;
+	  old_write = bo->space_accounted & 0xffff;
+
+	  if (write_domain && (old_read & write_domain)) {
+	      bos[i].new_accounted = write_domain;
+	      /* moving from read to a write domain */
+	      if (write_domain == RADEON_GEM_DOMAIN_VRAM) {
+		  this_op_read -= bo->size;
+		  this_op_vram_write += bo->size;
+	      } else if (write_domain == RADEON_GEM_DOMAIN_VRAM) {
+		  this_op_read -= bo->size;
+		  this_op_gart_write += bo->size;
+	      }
+	  } else if (read_domains & old_write) {
+	      bos[i].new_accounted = bo->space_accounted & 0xffff;
+	  } else {
+	      /* rewrite the domains */
+	      if (write_domain != old_write)
+		  fprintf(stderr,"WRITE DOMAIN RELOC FAILURE 0x%x %d %d\n", bo->handle, write_domain, old_write);
+	      if (read_domains != old_read)
+		  fprintf(stderr,"READ DOMAIN RELOC FAILURE 0x%x %d %d\n", bo->handle, read_domains, old_read);
+	      return RADEON_CS_SPACE_FLUSH;
+	  }
+      }
+	}
+	
+	if (this_op_read < 0)
+		this_op_read = 0;
+
+	/* check sizes - operation first */
+	if ((this_op_read + this_op_gart_write > csm->gart_limit) ||
+	    (this_op_vram_write > csm->vram_limit)) {
+	    return RADEON_CS_SPACE_OP_TO_BIG;
+	}
+
+	if (((csm->vram_write_used + this_op_vram_write) > csm->vram_limit) ||
+	    ((csm->read_used + csm->gart_write_used + this_op_gart_write + this_op_read) > csm->gart_limit)) {
+		return RADEON_CS_SPACE_FLUSH;
+	}
+
+	csm->gart_write_used += this_op_gart_write;
+	csm->vram_write_used += this_op_vram_write;
+	csm->read_used += this_op_read;
+	/* commit */
+	for (i = 0; i < num_bo; i++) {
+		bo = bos[i].bo;
+		bo->space_accounted = bos[i].new_accounted;
+	}
+
+	return RADEON_CS_SPACE_OK;
+}
+
 static struct radeon_cs_funcs radeon_cs_gem_funcs = {
     cs_gem_create,
     cs_gem_write_dword,
@@ -397,7 +499,8 @@ static struct radeon_cs_funcs radeon_cs_gem_funcs = {
     cs_gem_destroy,
     cs_gem_erase,
     cs_gem_need_flush,
-    cs_gem_print
+    cs_gem_print,
+    cs_gem_check_space,
 };
 
 struct radeon_cs_manager *radeon_cs_manager_gem_ctor(int fd)
diff --git a/shared-core/radeon_drm.h b/shared-core/radeon_drm.h
index fd26eee..b989649 100644
--- a/shared-core/radeon_drm.h
+++ b/shared-core/radeon_drm.h
@@ -711,6 +711,7 @@ typedef struct drm_radeon_indirect {
 #define RADEON_PARAM_FB_LOCATION           14   /* FB location */
 #define RADEON_PARAM_NUM_GB_PIPES          15   /* num GB pipes */
 #define RADEON_PARAM_KERNEL_MM             16
+#define RADEON_PARAM_DEVICE_ID            17
 
 typedef struct drm_radeon_getparam {
 	int param;


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libdrm/devel/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- .cvsignore	19 Dec 2008 06:52:51 -0000	1.17
+++ .cvsignore	30 Jan 2009 08:39:30 -0000	1.18
@@ -1 +1 @@
-libdrm-2.4.3.tar.bz2
+libdrm-2.4.4.tar.bz2


Index: libdrm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libdrm/devel/libdrm.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- libdrm.spec	22 Dec 2008 02:28:48 -0000	1.55
+++ libdrm.spec	30 Jan 2009 08:39:30 -0000	1.56
@@ -2,8 +2,8 @@
 
 Summary: Direct Rendering Manager runtime library
 Name: libdrm
-Version: 2.4.3
-Release: 0.3%{?dist}
+Version: 2.4.4
+Release: 1%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://dri.sourceforge.net
@@ -19,7 +19,6 @@
 BuildRequires: libxcb-devel
 
 Source2: 91-drm-modeset.rules
-Source3: i915modeset
 
 #Patch1: libdrm-modesetting.patch
 Patch2: libdrm-2.4.0-no-freaking-mknod.patch
@@ -28,6 +27,7 @@
 Patch3: libdrm-make-dri-perms-okay.patch
 Patch4: libdrm-2.4.0-no-bc.patch
 Patch8: libdrm-radeon.patch
+Patch9: libdrm-radeon-update.patch
 
 %description
 Direct Rendering Manager runtime library
@@ -47,6 +47,7 @@
 %patch3 -p1 -b .forceperms
 %patch4 -p1 -b .no-bc
 %patch8 -p1 -b .radeon
+%patch9 -p1 -b .radeon2
 
 %build
 autoreconf -v --install || exit 1
@@ -59,8 +60,6 @@
 # SUBDIRS=libdrm
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/
 install -m 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/modprobe.d/
-install -m 0644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/modprobe.d/
 
 # NOTE: We intentionally don't ship *.la files
 find $RPM_BUILD_ROOT -type f -name '*.la' | xargs rm -f -- || :
@@ -86,7 +85,6 @@
 %{_libdir}/libdrm_radeon.so.1
 %{_libdir}/libdrm_radeon.so.1.0.0
 %{_sysconfdir}/udev/rules.d/91-drm-modeset.rules
-%{_sysconfdir}/modprobe.d/i915modeset
 
 %files devel
 %defattr(-,root,root,-)
@@ -101,6 +99,9 @@
 %{_libdir}/pkgconfig/libdrm.pc
 
 %changelog
+* Fri Jan 30 2009 Dave Airlie <airlied at redhat.com> 2.4.4-1
+- rebase to 2.4.4
+
 * Mon Dec 22 2008 Dave Airlie <airlied at redhat.com> 2.4.3-0.3
 - radeon: make library name correct
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libdrm/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources	19 Dec 2008 06:52:51 -0000	1.17
+++ sources	30 Jan 2009 08:39:30 -0000	1.18
@@ -1 +1 @@
-e6c89878001cb2c25b2dce411b40eb3a  libdrm-2.4.3.tar.bz2
+c183ee614b25f61ea325d57882a2fab2  libdrm-2.4.4.tar.bz2


--- i915modeset DELETED ---



From mjakubicek at fedoraproject.org  Fri Jan 30 08:41:06 2009
From: mjakubicek at fedoraproject.org (=?utf-8?b?TWlsb8WhIEpha3Viw63EjWVr?=)
Date: Fri, 30 Jan 2009 08:41:06 +0000 (UTC)
Subject: rpms/torch/F-10 torch.spec,NONE,1.1 sources,1.1,1.2
Message-ID: <20090130084106.BB1D270117@cvs1.fedora.phx.redhat.com>

Author: mjakubicek

Update of /cvs/pkgs/rpms/torch/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25328/F-10

Modified Files:
	sources 
Added Files:
	torch.spec 
Log Message:
-Initial commit to F-10 and F-9 branch



--- NEW FILE torch.spec ---
Name:			torch
Version:		3.1
Release:		1%{?dist}
Summary:		Torch is a simple machine-learning library	

Group:			Applications/Engineering	
License:		BSD
URL:			http://www.torch.ch/
Source0:		http://www.torch.ch/archives/Torch3src.tgz
Source1:		http://www.torch.ch/archives/Torch3doc.tgz
BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%description
Torch is a simple machine-learning library, among its features you can find:

* A lot of things in gradient machines, that is, machines which could be
  learned with a gradient descent. This includes multi-layered perceptrons,
  radial bas is functions, mixtures of experts, convolutional networks and
  even time-delay neural networks. In fact a lot of "modules" are available
  that you can plug as you want to get what you need.
* Support vector machines, in classification and regression. As fast as the
  old stand-alone program SVMTorch II, but with the powerful environment of
  the library.
* Ensemble models such as bagging or adaboost.
* Non-parametric models such as K-nearest-neighbors, Parzen regression and
  Parzen density estimator.
* Distributions stuff, like Kmeans, Gaussian mixture models, hidden Markov
  models, input-output hidden Markov models, and Bayes classifier.
* Speech recognition tools (Embedded training and large vocabulary decoding).

%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 Torch3


%build
ln -s config/Makefile_options_Linux .
# use default gcc flags
sed -i -e "s/CFLAGS_OPT_DOUBLE = -Wall -O2 -ffast-math -mcpu=i686 -march=i686 -malign-double -DUSE_DOUBLE/CFLAGS_OPT_DOUBLE = -DUSE_DOUBLE %{optflags} -fPIC -DPIC/" \
-e "s/CFLAGS_OPT_FLOAT = -Wall -O2 -ffast-math -mcpu=i686 -march=i686 -malign-double/CFLAGS_OPT_FLOAT = %{optflags} -fPIC -DPIC/" Makefile_options_Linux
# add all packages to be built
sed -i "s/PACKAGES =/PACKAGES = convolutions datasets decoder distributions gradients kernels matrix nonparametrics speech/" Makefile_options_Linux
# we DO want to see what's going on during the build
find . -name Makefile -exec sed -i 's/@$(CC) $(CFLAGS_$(MODE)) $(INCS) -o $@ -c $</$(CC) $(CFLAGS_$(MODE)) $(INCS) -o $@ -c $</' {} \;
# remove any exit() calls from library's code
sed -i '/exit(-1);/d' core/{CmdLine.cc,general.cc}
sed -i 's/exit (-1);/return NULL;/' datasets/IOHTK.cc
# do not build a static library...
sed -i "s/AR = ar -rus/AR = :/" Makefile_options_Linux

make depend
make %{?_smp_mflags}

# ...but make a shared one
g++ %{optflags} -shared -Wl,-soname,libtorch.so.1 -o libtorch.so.1.0.0 `find . -name "*.o"`

%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_libdir}
mkdir -p $RPM_BUILD_ROOT%{_includedir}/torch

# install the library
install -p -m 755 libtorch.so.1.0.0 $RPM_BUILD_ROOT%{_libdir}
pushd $RPM_BUILD_ROOT%{_libdir}
	ln -sf libtorch.so.1.0.0 libtorch.so.1
	ln -sf libtorch.so.1.0.0 libtorch.so
popd

# install the headers
find . -name "*.h" -exec install -p -m 644 {} $RPM_BUILD_ROOT%{_includedir}/torch \;

# fix utf8
iconv -f ISO-8859-2 -t UTF-8 LICENSE > LICENSE.utf8
mv LICENSE.utf8 LICENSE
rm examples/LICENSE

# extract the docs
tar xzvf %{SOURCE1}

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%clean
rm -rf $RPM_BUILD_ROOT


%files devel
%defattr(-,root,root,-)
%{_includedir}/torch
%{_libdir}/libtorch.so
%doc examples docs

%files
%defattr(-,root,root,-)
%doc LICENSE ChangeLog
%{_libdir}/libtorch.so.1.0.0
%{_libdir}/libtorch.so.1


%changelog
* Wed Jan 28 2009 Milos Jakubicek <xjakub at fi.muni.cz> - 3.1-1
- Initial release.



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/torch/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	30 Jan 2009 06:34:32 -0000	1.1
+++ sources	30 Jan 2009 08:40:36 -0000	1.2
@@ -0,0 +1,2 @@
+d37949e6e73666ce3399e23dfbc4a7d2  Torch3doc.tgz
+c0de6c538d815a0578efadb0f924c92a  Torch3src.tgz



From mjakubicek at fedoraproject.org  Fri Jan 30 08:41:07 2009
From: mjakubicek at fedoraproject.org (=?utf-8?b?TWlsb8WhIEpha3Viw63EjWVr?=)
Date: Fri, 30 Jan 2009 08:41:07 +0000 (UTC)
Subject: rpms/torch/F-9 torch.spec,NONE,1.1 sources,1.1,1.2
Message-ID: <20090130084107.2144470117@cvs1.fedora.phx.redhat.com>

Author: mjakubicek

Update of /cvs/pkgs/rpms/torch/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25328/F-9

Modified Files:
	sources 
Added Files:
	torch.spec 
Log Message:
-Initial commit to F-10 and F-9 branch



--- NEW FILE torch.spec ---
Name:			torch
Version:		3.1
Release:		1%{?dist}
Summary:		Torch is a simple machine-learning library	

Group:			Applications/Engineering	
License:		BSD
URL:			http://www.torch.ch/
Source0:		http://www.torch.ch/archives/Torch3src.tgz
Source1:		http://www.torch.ch/archives/Torch3doc.tgz
BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%description
Torch is a simple machine-learning library, among its features you can find:

* A lot of things in gradient machines, that is, machines which could be
  learned with a gradient descent. This includes multi-layered perceptrons,
  radial bas is functions, mixtures of experts, convolutional networks and
  even time-delay neural networks. In fact a lot of "modules" are available
  that you can plug as you want to get what you need.
* Support vector machines, in classification and regression. As fast as the
  old stand-alone program SVMTorch II, but with the powerful environment of
  the library.
* Ensemble models such as bagging or adaboost.
* Non-parametric models such as K-nearest-neighbors, Parzen regression and
  Parzen density estimator.
* Distributions stuff, like Kmeans, Gaussian mixture models, hidden Markov
  models, input-output hidden Markov models, and Bayes classifier.
* Speech recognition tools (Embedded training and large vocabulary decoding).

%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 Torch3


%build
ln -s config/Makefile_options_Linux .
# use default gcc flags
sed -i -e "s/CFLAGS_OPT_DOUBLE = -Wall -O2 -ffast-math -mcpu=i686 -march=i686 -malign-double -DUSE_DOUBLE/CFLAGS_OPT_DOUBLE = -DUSE_DOUBLE %{optflags} -fPIC -DPIC/" \
-e "s/CFLAGS_OPT_FLOAT = -Wall -O2 -ffast-math -mcpu=i686 -march=i686 -malign-double/CFLAGS_OPT_FLOAT = %{optflags} -fPIC -DPIC/" Makefile_options_Linux
# add all packages to be built
sed -i "s/PACKAGES =/PACKAGES = convolutions datasets decoder distributions gradients kernels matrix nonparametrics speech/" Makefile_options_Linux
# we DO want to see what's going on during the build
find . -name Makefile -exec sed -i 's/@$(CC) $(CFLAGS_$(MODE)) $(INCS) -o $@ -c $</$(CC) $(CFLAGS_$(MODE)) $(INCS) -o $@ -c $</' {} \;
# remove any exit() calls from library's code
sed -i '/exit(-1);/d' core/{CmdLine.cc,general.cc}
sed -i 's/exit (-1);/return NULL;/' datasets/IOHTK.cc
# do not build a static library...
sed -i "s/AR = ar -rus/AR = :/" Makefile_options_Linux

make depend
make %{?_smp_mflags}

# ...but make a shared one
g++ %{optflags} -shared -Wl,-soname,libtorch.so.1 -o libtorch.so.1.0.0 `find . -name "*.o"`

%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_libdir}
mkdir -p $RPM_BUILD_ROOT%{_includedir}/torch

# install the library
install -p -m 755 libtorch.so.1.0.0 $RPM_BUILD_ROOT%{_libdir}
pushd $RPM_BUILD_ROOT%{_libdir}
	ln -sf libtorch.so.1.0.0 libtorch.so.1
	ln -sf libtorch.so.1.0.0 libtorch.so
popd

# install the headers
find . -name "*.h" -exec install -p -m 644 {} $RPM_BUILD_ROOT%{_includedir}/torch \;

# fix utf8
iconv -f ISO-8859-2 -t UTF-8 LICENSE > LICENSE.utf8
mv LICENSE.utf8 LICENSE
rm examples/LICENSE

# extract the docs
tar xzvf %{SOURCE1}

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%clean
rm -rf $RPM_BUILD_ROOT


%files devel
%defattr(-,root,root,-)
%{_includedir}/torch
%{_libdir}/libtorch.so
%doc examples docs

%files
%defattr(-,root,root,-)
%doc LICENSE ChangeLog
%{_libdir}/libtorch.so.1.0.0
%{_libdir}/libtorch.so.1


%changelog
* Wed Jan 28 2009 Milos Jakubicek <xjakub at fi.muni.cz> - 3.1-1
- Initial release.



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/torch/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	30 Jan 2009 06:34:32 -0000	1.1
+++ sources	30 Jan 2009 08:40:36 -0000	1.2
@@ -0,0 +1,2 @@
+d37949e6e73666ce3399e23dfbc4a7d2  Torch3doc.tgz
+c0de6c538d815a0578efadb0f924c92a  Torch3src.tgz



From jwrdegoede at fedoraproject.org  Fri Jan 30 08:43:16 2009
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Fri, 30 Jan 2009 08:43:16 +0000 (UTC)
Subject: rpms/methane/devel methane.spec,1.4,1.5
Message-ID: <20090130084316.7AF9370117@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/methane/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25767

Modified Files:
	methane.spec 
Log Message:
* Fri Jan 30 2009 Hans de Goede <hdegoede at redhat.com> 1.4.7-5
- Update description for new trademark guidelines



Index: methane.spec
===================================================================
RCS file: /cvs/extras/rpms/methane/devel/methane.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- methane.spec	18 Feb 2008 15:56:01 -0000	1.4
+++ methane.spec	30 Jan 2009 08:42:45 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           methane
 Version:        1.4.7
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Super Methane Brothers
 Group:          Amusements/Games
 License:        GPLv2+
@@ -20,8 +20,7 @@
 
 %description
 Super Methane Brothers is a platform game converted from the Amiga by
-its original author. It is very similar to the Taito game "Bubble
-Bobble".
+its original author.
 
 
 %prep
@@ -93,6 +92,9 @@
 
 
 %changelog
+* Fri Jan 30 2009 Hans de Goede <hdegoede at redhat.com> 1.4.7-5
+- Update description for new trademark guidelines
+
 * Sun Feb 17 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 1.4.7-4
 - Rebuild for new libmikmod
 - Rebuild with gcc 4.3



From jwrdegoede at fedoraproject.org  Fri Jan 30 08:47:25 2009
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Fri, 30 Jan 2009 08:47:25 +0000 (UTC)
Subject: rpms/monkey-bubble/devel monkey-bubble.spec,1.17,1.18
Message-ID: <20090130084725.BECDF70117@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/monkey-bubble/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26387

Modified Files:
	monkey-bubble.spec 
Log Message:
* Fri Jan 30 2009 Hans de Goede <hdegoede at redhat.com> 0.4.0-11
- Update description for new trademark guidelines



Index: monkey-bubble.spec
===================================================================
RCS file: /cvs/extras/rpms/monkey-bubble/devel/monkey-bubble.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- monkey-bubble.spec	20 Dec 2008 08:34:29 -0000	1.17
+++ monkey-bubble.spec	30 Jan 2009 08:46:55 -0000	1.18
@@ -1,6 +1,6 @@
 Name:             monkey-bubble
 Version:          0.4.0
-Release:          10%{?dist}
+Release:          11%{?dist}
 Summary:          Game in the spirit of Frozen Bubble
 Group:            Amusements/Games
 License:          GPLv2+
@@ -19,7 +19,7 @@
 Requires(postun): scrollkeeper
 
 %description
-Monkey Bubble is a bust'a'move clone built using Gnome technologies. It
+Monkey Bubble is a frozen bubble like game using Gnome technologies. It
 currently supports 1 and 2 player games, is levelcompatible with frozen bubble,
 and features svg vector graphics for resolution independent display.
 
@@ -109,6 +109,9 @@
 
 
 %changelog
+* Fri Jan 30 2009 Hans de Goede <hdegoede at redhat.com> 0.4.0-11
+- Update description for new trademark guidelines
+
 * Sat Dec 20 2008 Hans de Goede <hdegoede at redhat.com> 0.4.0-10
 - Fix building on rawhide (explicitly BR esound-devel)
 



From pkgdb at fedoraproject.org  Fri Jan 30 08:48:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 08:48:19 +0000
Subject: [pkgdb] sugar-terminal: fab has requested watchbugzilla
Message-ID: <20090130084819.E306E2082A7@bastion.fedora.phx.redhat.com>

fab has requested the watchbugzilla acl on sugar-terminal (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-terminal



From pkgdb at fedoraproject.org  Fri Jan 30 08:48:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 08:48:19 +0000
Subject: [pkgdb] sugar-terminal: fab has requested watchbugzilla
Message-ID: <20090130084820.D3D76208497@bastion.fedora.phx.redhat.com>

fab has requested the watchbugzilla acl on sugar-terminal (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-terminal



From pkgdb at fedoraproject.org  Fri Jan 30 08:48:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 08:48:23 +0000
Subject: [pkgdb] sugar-terminal: fab has requested commit
Message-ID: <20090130084823.D2CFA2084A7@bastion.fedora.phx.redhat.com>

fab has requested the commit acl on sugar-terminal (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-terminal



From pkgdb at fedoraproject.org  Fri Jan 30 08:48:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 08:48:29 +0000
Subject: [pkgdb] sugar-terminal: fab has requested watchcommits
Message-ID: <20090130084829.818682084BD@bastion.fedora.phx.redhat.com>

fab has requested the watchcommits acl on sugar-terminal (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-terminal



From pkgdb at fedoraproject.org  Fri Jan 30 08:48:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 08:48:34 +0000
Subject: [pkgdb] sugar-terminal: fab has requested commit
Message-ID: <20090130084834.35A6C208485@bastion.fedora.phx.redhat.com>

fab has requested the commit acl on sugar-terminal (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-terminal



From pkgdb at fedoraproject.org  Fri Jan 30 08:48:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 08:48:41 +0000
Subject: [pkgdb] sugar-terminal: fab has requested watchcommits
Message-ID: <20090130084841.A327A20860C@bastion.fedora.phx.redhat.com>

fab has requested the watchcommits acl on sugar-terminal (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-terminal



From alexh at fedoraproject.org  Fri Jan 30 08:49:22 2009
From: alexh at fedoraproject.org (Alex Hudson)
Date: Fri, 30 Jan 2009 08:49:22 +0000 (UTC)
Subject: rpms/log4c/devel import.log, NONE, 1.1 log4c.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090130084922.4B5BE70117@cvs1.fedora.phx.redhat.com>

Author: alexh

Update of /cvs/pkgs/rpms/log4c/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26809/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log log4c.spec 
Log Message:
Initial import of log4c package



--- NEW FILE import.log ---
log4c-1_2_1-3_fc10:HEAD:log4c-1.2.1-3.fc10.src.rpm:1233305274


--- NEW FILE log4c.spec ---
Name:		log4c
Version:	1.2.1
Release:	3%{?dist}
Summary:	Library for logging application messages

Group:		System Environment/Libraries
License:	LGPLv2+
URL:		http://log4c.sourceforge.net/
Source0:	http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildRequires:	expat-devel

%description
Log4c is a C language library for flexible logging to files, syslog and other 
destinations. It is modeled after the Log for Java library (log4j), 
staying as close to their API as is reasonable.

%package devel
Summary:	Header files, libraries and development documentation for %{name}
Group:		Development/Libraries
Requires:	%{name} = %{version}-%{release}
Requires:	automake

%description devel
This package contains the header files, static libraries and development
documentation for %{name}. If you like to develop programs using %{name},
you will need to install %{name}-devel.

%prep
%setup -q 

%build
%configure --disable-static
make %{?_smp_mflags}

%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot}
# example config file below shouldn't live in /etc/
mkdir -p %{buildroot}/usr/share/doc/%{name}-%{version}
mv %{buildroot}/etc/log4crc.sample %{buildroot}/usr/share/doc/%{name}-%{version}/
rm %{buildroot}%{_libdir}/*.la

%clean
rm -rf %{buildroot}

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files
%defattr(-,root,root,-)
%doc README log4crc.sample
%{_libdir}/liblog4c.so.*

%files devel
%defattr(-,root,root,-)
%{_libdir}/liblog4c.so
%{_bindir}/*
%{_includedir}/*
%{_datadir}/aclocal/log4c.m4

%changelog
* Fri Jan 30 2009 Alex Hudson <fedora at alexhudson.com> - 1.2.1-3
- depend on automake for the m4 macro
- import into Fedora

* Mon Jan 26 2009 Alex Hudson <fedora at alexhudson.com> - 1.2.1-2
- new build-dep on expat for better config file parsing
- tidy source0 and use of macros
- .la files are removed after the build

* Tue Jan 13 2009 Alex Hudson <fedora at alexhudson.com> - 1.2.1-1
- Initial packaging attempt


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/log4c/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	30 Jan 2009 06:37:22 -0000	1.1
+++ .cvsignore	30 Jan 2009 08:48:51 -0000	1.2
@@ -0,0 +1 @@
+log4c-1.2.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/log4c/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	30 Jan 2009 06:37:22 -0000	1.1
+++ sources	30 Jan 2009 08:48:51 -0000	1.2
@@ -0,0 +1 @@
+ca5412b7515d8901714ab7892323adb6  log4c-1.2.1.tar.gz



From jwrdegoede at fedoraproject.org  Fri Jan 30 08:52:07 2009
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Fri, 30 Jan 2009 08:52:07 +0000 (UTC)
Subject: rpms/lacewing/devel lacewing.spec,1.9,1.10
Message-ID: <20090130085207.921BA70117@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/lacewing/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27460

Modified Files:
	lacewing.spec 
Log Message:
* Fri Jan 30 2009 Hans de Goede <hdegoede at redhat.com> 1.10-11
- Update description for new trademark guidelines



Index: lacewing.spec
===================================================================
RCS file: /cvs/extras/rpms/lacewing/devel/lacewing.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- lacewing.spec	19 Feb 2008 08:42:58 -0000	1.9
+++ lacewing.spec	30 Jan 2009 08:51:37 -0000	1.10
@@ -1,7 +1,7 @@
 Name:           lacewing
 Version:        1.10
-Release:        10%{?dist}
-Summary:        Asteroid like game with many different ships
+Release:        11%{?dist}
+Summary:        Arcade-style shoot-em-up
 Group:          Amusements/Games
 License:        GPLv2+
 URL:            http://users.olis.net.au/zel/
@@ -18,8 +18,8 @@
 Requires:       hicolor-icon-theme
 
 %description
-Asteroid like game where you can choose a type of ship and depending on the
-type of ship can pickup a number of upgrades during the game.
+Arcade-style shoot-em-up where you can choose a type of ship and depending on
+the type of ship can pickup a number of upgrades during the game.
 
 Lacewing is an arcade-style shoot-em-up which plays a little bit like a cross
 between Spacewar and Centipede. It has a decidedly retro style to it. It has
@@ -83,6 +83,9 @@
 %{_datadir}/icons/hicolor/48x48/apps/lacewing.png
 
 %changelog
+* Fri Jan 30 2009 Hans de Goede <hdegoede at redhat.com> 1.10-11
+- Update description for new trademark guidelines
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1.10-10
 - Autorebuild for GCC 4.3
 



From jwrdegoede at fedoraproject.org  Fri Jan 30 08:53:42 2009
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Fri, 30 Jan 2009 08:53:42 +0000 (UTC)
Subject: rpms/overgod/devel overgod.spec,1.6,1.7
Message-ID: <20090130085342.BF07470117@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/overgod/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27787

Modified Files:
	overgod.spec 
Log Message:
* Fri Jan 30 2009 Hans de Goede <hdegoede at redhat.com> 1.0-8
- Update description for new trademark guidelines



Index: overgod.spec
===================================================================
RCS file: /cvs/extras/rpms/overgod/devel/overgod.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- overgod.spec	19 Feb 2008 09:24:59 -0000	1.6
+++ overgod.spec	30 Jan 2009 08:53:12 -0000	1.7
@@ -1,7 +1,7 @@
 Name:           overgod
 Version:        1.0
-Release:        7%{?dist}
-Summary:        Another Asteroid like game
+Release:        8%{?dist}
+Summary:        Another arcade-style shoot-em-up
 Group:          Amusements/Games
 License:        GPLv2+
 URL:            http://www.allegro.cc/depot/Overgod
@@ -75,6 +75,9 @@
 
 
 %changelog
+* Fri Jan 30 2009 Hans de Goede <hdegoede at redhat.com> 1.0-8
+- Update description for new trademark guidelines
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1.0-7
 - Autorebuild for GCC 4.3
 



From jwrdegoede at fedoraproject.org  Fri Jan 30 08:55:13 2009
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Fri, 30 Jan 2009 08:55:13 +0000 (UTC)
Subject: rpms/pachi/devel pachi.spec,1.6,1.7
Message-ID: <20090130085513.AE3A670117@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/pachi/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28192

Modified Files:
	pachi.spec 
Log Message:
* Fri Jan 30 2009 Hans de Goede <hdegoede at redhat.com> 1.0-7
- Update description for new trademark guidelines



Index: pachi.spec
===================================================================
RCS file: /cvs/extras/rpms/pachi/devel/pachi.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- pachi.spec	11 Jan 2009 20:22:34 -0000	1.6
+++ pachi.spec	30 Jan 2009 08:54:43 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           pachi
 Version:        1.0
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Pachi El Marciano - Platform Game
 Group:          Amusements/Games
 License:        GPLv2+
@@ -16,8 +16,7 @@
 Requires:       hicolor-icon-theme
 
 %description
-Pachi El Marciano is a cool 2D platform game inspired by the likes of
-Manic Miner, Jet Set Willy, and more from the '80s.
+Pachi El Marciano is a cool 2D platform game.
 
 
 %prep
@@ -82,6 +81,9 @@
 
 
 %changelog
+* Fri Jan 30 2009 Hans de Goede <hdegoede at redhat.com> 1.0-7
+- Update description for new trademark guidelines
+
 * Sun Jan 11 2009 Hans de Goede <hdegoede at redhat.com> 1.0-6
 - Add 2 patches with small fixes from altlinux
 



From jwrdegoede at fedoraproject.org  Fri Jan 30 09:02:50 2009
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Fri, 30 Jan 2009 09:02:50 +0000 (UTC)
Subject: rpms/raidem/devel raidem.spec,1.13,1.14
Message-ID: <20090130090250.7825D70117@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/raidem/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29964

Modified Files:
	raidem.spec 
Log Message:
* Fri Jan 30 2009 Hans de Goede <hdegoede at redhat.com> 0.3.1-9
- Update description for new trademark guidelines



Index: raidem.spec
===================================================================
RCS file: /cvs/extras/rpms/raidem/devel/raidem.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- raidem.spec	1 Feb 2008 14:19:03 -0000	1.13
+++ raidem.spec	30 Jan 2009 09:02:20 -0000	1.14
@@ -1,6 +1,6 @@
 Name:           raidem
 Version:        0.3.1
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        2d top-down shoot'em up
 Group:          Amusements/Games
 License:        zlib
@@ -19,8 +19,8 @@
 
 %description
 Raid'em is a 2d top-down shoot'em up. It began as a remake of Raid II
-(abandoned long ago), which was inspired by Raptor, but has turned out very
-differently. Features: Neat looking graphics, LOTS of explosions and scrap
+(abandoned long ago), but has turned out very differently.
+Features: Neat looking graphics, LOTS of explosions and scrap
 metal, Eye candy a-plenty, Many different powerups, A desert. And a space
 platform. And some snow, 2 player mode, Demo recording and playback, Loads of
 fun.
@@ -89,6 +89,9 @@
 
 
 %changelog
+* Fri Jan 30 2009 Hans de Goede <hdegoede at redhat.com> 0.3.1-9
+- Update description for new trademark guidelines
+
 * Fri Feb  1 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 0.3.1-8
 - Rebuild for new gcc-4.3 (libobjc soname change)
 



From jwrdegoede at fedoraproject.org  Fri Jan 30 09:18:58 2009
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Fri, 30 Jan 2009 09:18:58 +0000 (UTC)
Subject: rpms/supertux/devel supertux.spec,1.21,1.22
Message-ID: <20090130091858.1FCE670117@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/supertux/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31967

Modified Files:
	supertux.spec 
Log Message:
* Fri Jan 30 2009 Hans de Goede <hdegoede at redhat.com> 0.3.1-5
- Update description for new trademark guidelines



Index: supertux.spec
===================================================================
RCS file: /cvs/extras/rpms/supertux/devel/supertux.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- supertux.spec	18 Jan 2009 19:46:31 -0000	1.21
+++ supertux.spec	30 Jan 2009 09:18:27 -0000	1.22
@@ -6,8 +6,8 @@
 
 Name:           supertux
 Version:        0.3.1
-Release:        4%{?dist}
-Summary:        Jump'n run like game similar to Mario Bros
+Release:        5%{?dist}
+Summary:        Jump'n run like game
 Group:          Amusements/Games
 License:        GPLv2+
 URL:            http://supertux.lethargik.org/
@@ -36,12 +36,9 @@
 %endif
 
 %description
-SuperTux is a jump'n run like game, with strong inspiration from the
-Super Mario Bros games for Nintendo.
-
-Run and jump through multiple worlds, fighting off enemies by jumping
-on them or bumping them from below.  Grabbing power-ups and other stuff
-on the way.
+SuperTux is a jump'n run like game, Run and jump through multiple worlds,
+fighting off enemies by jumping on them or bumping them from below.
+Grabbing power-ups and other stuff on the way.
 
 %prep
 %setup -q
@@ -92,6 +89,9 @@
 %{_datadir}/pixmaps/*
 
 %changelog
+* Fri Jan 30 2009 Hans de Goede <hdegoede at redhat.com> 0.3.1-5
+- Update description for new trademark guidelines
+
 * Sun Jan 18 2009 Lubomir Rintel <lkundrak at v3.sk> 0.3.1-4
 - Fix parsing of translations (#477497)
 - Disable debugging console



From jwrdegoede at fedoraproject.org  Fri Jan 30 09:23:01 2009
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Fri, 30 Jan 2009 09:23:01 +0000 (UTC)
Subject: rpms/clanbomber/devel clanbomber.spec,1.9,1.10
Message-ID: <20090130092301.9639970117@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/clanbomber/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32521

Modified Files:
	clanbomber.spec 
Log Message:
* Fri Jan 30 2009 Hans de Goede <hdegoede at redhat.com> 1.05-10
- Improve description



Index: clanbomber.spec
===================================================================
RCS file: /cvs/extras/rpms/clanbomber/devel/clanbomber.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- clanbomber.spec	30 Jan 2009 08:29:42 -0000	1.9
+++ clanbomber.spec	30 Jan 2009 09:22:31 -0000	1.10
@@ -1,7 +1,7 @@
 Name:           clanbomber
 Version:        1.05
-Release:        9%{?dist}
-Summary:        Bomberman-like multiplayer game that uses ClanLib
+Release:        10%{?dist}
+Summary:        Lay bombs and Blast the other players of the field game using ClanLib
 Group:          Amusements/Games
 License:        GPLv2+
 URL:            http://clanbomber.sourceforge.net/
@@ -15,10 +15,9 @@
 Requires:       hicolor-icon-theme
 
 %description
-ClanBomber is a free multiplayer game that uses ClanLib, a free multi platform
-C++ game SDK. First "ClanBomber" was only a working title
-for a small game started in September 1998, that has only been started to learn
-how to use ClanLib. But the ClanBomber project has grown into a real game. It
+ClanBomber is a free multiplayer game, using ClanLib, where the "purpose"
+is to Blast the other players of the gamefield by laying bombs close to them.
+While at the same time you must avoid being blown up yourself. It
 is fully playable and features Computer controlled bombers, however, it is
 recommended to play ClanBomber with friends (3-8 players are really fun).
 
@@ -75,6 +74,9 @@
 
 
 %changelog
+* Fri Jan 30 2009 Hans de Goede <hdegoede at redhat.com> 1.05-10
+- Improve description
+
 * Fri Jan 30 2009 Hans de Goede <hdegoede at redhat.com> 1.05-9
 - Update description for new trademark guidelines
 



From jwrdegoede at fedoraproject.org  Fri Jan 30 09:24:57 2009
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Fri, 30 Jan 2009 09:24:57 +0000 (UTC)
Subject: rpms/xgalaxy/devel xgalaxy.spec,1.9,1.10
Message-ID: <20090130092457.5CD9F70117@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/xgalaxy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv395

Modified Files:
	xgalaxy.spec 
Log Message:
* Fri Jan 30 2009 Hans de Goede <hdegoede at redhat.com> 2.0.34-10
- Update description for new trademark guidelines



Index: xgalaxy.spec
===================================================================
RCS file: /cvs/extras/rpms/xgalaxy/devel/xgalaxy.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- xgalaxy.spec	8 Sep 2008 10:17:02 -0000	1.9
+++ xgalaxy.spec	30 Jan 2009 09:24:27 -0000	1.10
@@ -1,7 +1,7 @@
 Name:           xgalaxy
 Version:        2.0.34
-Release:        9%{?dist}
-Summary:        Galaxian / Galaga like game with powerups
+Release:        10%{?dist}
+Summary:        Arcade game: shoot down the space ships attacking the planet
 Group:          Amusements/Games
 License:        GPL+
 URL:            http://sourceforge.net/projects/xgalaga/
@@ -20,9 +20,8 @@
 Provides:       xgalaga = %{version}-%{release}
 
 %description
-Arcade game for the X Window System inspired by the classic game Galaga.
-Xgalaxy is a Galaxian like game with additional features to produce a more
-interesting game.
+Arcade game for the X Window System where you have to shoot down the space
+ships attacking the planet.
  
 
 %prep
@@ -111,6 +110,9 @@
 
 
 %changelog
+* Fri Jan 30 2009 Hans de Goede <hdegoede at redhat.com> 2.0.34-10
+- Update description for new trademark guidelines
+
 * Sun Sep  7 2008 Hans de Goede <hdegoede at redhat.com> 2.0.34-9
 - Fix patch fuzz build failure
 



From harald at fedoraproject.org  Fri Jan 30 09:27:19 2009
From: harald at fedoraproject.org (Harald Hoyer)
Date: Fri, 30 Jan 2009 09:27:19 +0000 (UTC)
Subject: rpms/udev/devel udev.spec,1.261,1.262
Message-ID: <20090130092719.3E4FF70141@cvs1.fedora.phx.redhat.com>

Author: harald

Update of /cvs/pkgs/rpms/udev/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv730

Modified Files:
	udev.spec 
Log Message:
* Fri Jan 30 2009 Harald Hoyer <harald at redhat.com> 137-2
- moved groupadd to pre section (bug #483089)



Index: udev.spec
===================================================================
RCS file: /cvs/pkgs/rpms/udev/devel/udev.spec,v
retrieving revision 1.261
retrieving revision 1.262
diff -u -r1.261 -r1.262
--- udev.spec	29 Jan 2009 11:49:39 -0000	1.261
+++ udev.spec	30 Jan 2009 09:26:48 -0000	1.262
@@ -6,7 +6,7 @@
 Summary: A userspace implementation of devfs
 Name: udev
 Version: 137
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2
 Group: System Environment/Base
 Provides: udev-persistent = %{version}-%{release}
@@ -222,6 +222,15 @@
 fi
 exit 0
 
+%pre
+# to be removed after F10 EOL (and for RHEL-6)
+getent group video >/dev/null || /usr/sbin/groupadd -g 39 video || :
+getent group audio >/dev/null || /usr/sbin/groupadd -g 63 audio || :
+# to be kept
+getent group cdrom >/dev/null || /usr/sbin/groupadd -g 11 cdrom || :
+getent group tape >/dev/null || /usr/sbin/groupadd -g 33 tape || :
+getent group dialout >/dev/null || /usr/sbin/groupadd -g 18 dialout || :
+
 %post
 if [ "$1" -gt 1 -a -x /sbin/pidof ]; then
 	pid=$(/sbin/pidof -c udevd)
@@ -232,15 +241,6 @@
 fi
 
 /sbin/chkconfig --add udev-post
-
-# to be removed after F10 EOL (and for RHEL-6)
-getent group video >/dev/null || /usr/sbin/groupadd -g 39 video || :
-getent group audio >/dev/null || /usr/sbin/groupadd -g 63 audio || :
-# to be kept
-getent group cdrom >/dev/null || /usr/sbin/groupadd -g 11 cdrom || :
-getent group tape >/dev/null || /usr/sbin/groupadd -g 33 tape || :
-getent group dialout >/dev/null || /usr/sbin/groupadd -g 18 dialout || :
-
 exit 0
 
 %triggerpostun -- dev <= 0:3.12-1
@@ -383,6 +383,9 @@
 
 
 %changelog
+* Fri Jan 30 2009 Harald Hoyer <harald at redhat.com> 137-2
+- moved groupadd to pre section (bug #483089)
+
 * Thu Jan 29 2009 Harald Hoyer <harald at redhat.com> 137-1
 - version 137
 - add vol_id patches from kzak



From nphilipp at fedoraproject.org  Fri Jan 30 09:29:12 2009
From: nphilipp at fedoraproject.org (Nils Philippsen)
Date: Fri, 30 Jan 2009 09:29:12 +0000 (UTC)
Subject: rpms/gegl/devel gegl-missing_header.patch,1.1,NONE
Message-ID: <20090130092912.9B47270117@cvs1.fedora.phx.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/gegl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1819/devel

Removed Files:
	gegl-missing_header.patch 
Log Message:
remove obsolete gegl-missing_header patch



--- gegl-missing_header.patch DELETED ---



From nphilipp at fedoraproject.org  Fri Jan 30 09:29:12 2009
From: nphilipp at fedoraproject.org (Nils Philippsen)
Date: Fri, 30 Jan 2009 09:29:12 +0000 (UTC)
Subject: rpms/gegl/F-9 gegl-missing_header.patch,1.1,NONE
Message-ID: <20090130092912.DC7D270117@cvs1.fedora.phx.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/gegl/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1819/F-9

Removed Files:
	gegl-missing_header.patch 
Log Message:
remove obsolete gegl-missing_header patch



--- gegl-missing_header.patch DELETED ---



From nphilipp at fedoraproject.org  Fri Jan 30 09:35:12 2009
From: nphilipp at fedoraproject.org (Nils Philippsen)
Date: Fri, 30 Jan 2009 09:35:12 +0000 (UTC)
Subject: rpms/gegl/F-10 gegl.spec,1.10,1.11
Message-ID: <20090130093513.0B9F270117@cvs1.fedora.phx.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/gegl/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2644

Modified Files:
	gegl.spec 
Log Message:
use the same timestamps for certain documentation files on all architectures to avoid multi-lib conflicts (#481404)
consolidate spec files between OS releases
reenable building documentation on ppc64
explicitly list more build requirements and/or versions to catch eventual problems during future builds



Index: gegl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gegl/F-10/gegl.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- gegl.spec	16 Jan 2009 05:28:54 -0000	1.10
+++ gegl.spec	30 Jan 2009 09:34:42 -0000	1.11
@@ -1,17 +1,34 @@
 Summary:	A graph based image processing framework
 Name:		gegl
 Version:	0.0.22
-Release:	1%{?dist}
+Release:	2%{?dist}
 # The binary is under the GPL, while the libs are under LGPL
 License:	LGPLv3+ and GPLv3+
 Group:		System Environment/Libraries
 URL:		http://www.gegl.org/
 Source0:	ftp://ftp.gtk.org/pub/gegl/0.0/%{name}-%{version}.tar.bz2
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:	babl-devel gtk2-devel ruby
-BuildRequires:	libpng-devel libjpeg-devel librsvg2-devel libopenraw-devel
-BuildRequires:	perl-devel SDL-devel OpenEXR-devel lua-devel
-BuildRequires:	asciidoc enscript w3m graphviz pkgconfig
+BuildRequires:	asciidoc
+BuildRequires:	babl-devel >= 0.0.22
+BuildRequires:  cairo-devel
+BuildRequires:  enscript
+BuildRequires:  glib2-devel >= 2.16.1
+BuildRequires:  graphviz
+BuildRequires:  gtk2-devel >= 2.8.6
+BuildRequires:  libjpeg-devel
+BuildRequires:  libopenraw-devel >= 0.0.5
+BuildRequires:	libpng-devel
+BuildRequires:  librsvg2-devel >= 2.14.0
+BuildRequires:	libspiro-devel
+BuildRequires:  libv4l-devel
+BuildRequires:  lua-devel >= 5.1.0
+BuildRequires:  OpenEXR-devel
+BuildRequires:  pango-devel
+BuildRequires:	perl-devel
+BuildRequires:  pkgconfig
+BuildRequires:  ruby
+BuildRequires:  SDL-devel
+BuildRequires:  w3m
 
 %description
 GEGL (Generic Graphics Library) is a graph based image processing framework. 
@@ -34,11 +51,21 @@
 chmod -x operations/external/ff-load.c operations/common/perlin/perlin.*
 
 %build
-%ifnarch ppc64
-%configure --disable-static --enable-workshop
-%else
-%configure --disable-static --enable-workshop --disable-docs
-%endif
+%configure \
+    --with-cairo \
+    --with-graphviz \
+    --with-gtk --with-gdk-pixbuf \
+    --with-libjpeg \
+    --with-libopenraw \
+    --with-libpng \
+    --with-librsvg \
+    --with-libspiro \
+    --with-libv4l \
+    --with-lua \
+    --with-openexr \
+    --with-pango --with-pangocairo \
+    --with-sdl \
+    --disable-static --enable-workshop
 make %{?_smp_mflags}
 										
 %install
@@ -47,6 +74,11 @@
 
 rm -f %{buildroot}%{_libdir}/*.la
 
+# fix timestamps of generated files
+for f in %{_datadir}/gtk-doc/html/gegl/operations.html; do
+    touch -m -r ChangeLog "%{buildroot}/$f"
+done
+
 %check
 make check
 
@@ -66,15 +98,21 @@
 
 %files devel
 %defattr(-, root, root, -)
+%doc %{_datadir}/gtk-doc/html/gegl/
 %{_includedir}/gegl-0.0/
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/%{name}.pc
-%ifnarch ppc64
-%doc %{_datadir}/gtk-doc/html/gegl/
-%endif
 
 %changelog
-* Fri Jan 16 2009 Deji Akingunola <dakingun at gmail.com> - 0.0.22-1
+* Thu Jan 29 2009 Nils Philippsen - 0.0.22-2
+- use the same timestamps for certain documentation files on all architectures
+  to avoid multi-lib conflicts (#481404)
+- consolidate spec files between OS releases
+- reenable building documentation on ppc64
+- explicitly list more build requirements and/or versions to catch eventual
+  problems during future builds
+
+* Tue Jan 13 2009 Deji Akingunola <dakingun at gmail.com> - 0.0.22-1
 - Update to version 0.0.22
 
 * Tue Oct 07 2008 Deji Akingunola <dakingun at gmail.com> - 0.0.20-1



From nphilipp at fedoraproject.org  Fri Jan 30 09:35:46 2009
From: nphilipp at fedoraproject.org (Nils Philippsen)
Date: Fri, 30 Jan 2009 09:35:46 +0000 (UTC)
Subject: rpms/gegl/F-9 .cvsignore,1.6,1.7 gegl.spec,1.7,1.8 sources,1.6,1.7
Message-ID: <20090130093546.4A4B170117@cvs1.fedora.phx.redhat.com>

Author: nphilipp

Update of /cvs/pkgs/rpms/gegl/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2760

Modified Files:
	.cvsignore gegl.spec sources 
Log Message:
Update to version 0.0.22
use the same timestamps for certain documentation files on all architectures to avoid multi-lib conflicts (#481404)
consolidate spec files between OS releases
reenable building documentation on ppc64
explicitly list more build requirements and/or versions to catch eventual problems during future builds



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gegl/F-9/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	7 Oct 2008 14:49:00 -0000	1.6
+++ .cvsignore	30 Jan 2009 09:35:16 -0000	1.7
@@ -1 +1 @@
-gegl-0.0.20.tar.bz2
+gegl-0.0.22.tar.bz2


Index: gegl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gegl/F-9/gegl.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- gegl.spec	7 Oct 2008 14:49:00 -0000	1.7
+++ gegl.spec	30 Jan 2009 09:35:16 -0000	1.8
@@ -1,18 +1,34 @@
 Summary:	A graph based image processing framework
 Name:		gegl
-Version:	0.0.20
-Release:	1%{?dist}
+Version:	0.0.22
+Release:	2%{?dist}
 # The binary is under the GPL, while the libs are under LGPL
 License:	LGPLv3+ and GPLv3+
 Group:		System Environment/Libraries
 URL:		http://www.gegl.org/
 Source0:	ftp://ftp.gtk.org/pub/gegl/0.0/%{name}-%{version}.tar.bz2
-Patch0:		gegl-missing_header.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:	babl-devel gtk2-devel ruby
-BuildRequires:	libpng-devel libjpeg-devel librsvg2-devel libopenraw-devel
-BuildRequires:	perl-devel SDL-devel OpenEXR-devel lua-devel
-BuildRequires:	asciidoc enscript w3m graphviz pkgconfig
+BuildRequires:	asciidoc
+BuildRequires:	babl-devel >= 0.0.22
+BuildRequires:  cairo-devel
+BuildRequires:  enscript
+BuildRequires:  glib2-devel >= 2.16.1
+BuildRequires:  graphviz
+BuildRequires:  gtk2-devel >= 2.8.6
+BuildRequires:  libjpeg-devel
+BuildRequires:  libopenraw-devel >= 0.0.5
+BuildRequires:	libpng-devel
+BuildRequires:  librsvg2-devel >= 2.14.0
+BuildRequires:	libspiro-devel
+BuildRequires:  libv4l-devel
+BuildRequires:  lua-devel >= 5.1.0
+BuildRequires:  OpenEXR-devel
+BuildRequires:  pango-devel
+BuildRequires:	perl-devel
+BuildRequires:  pkgconfig
+BuildRequires:  ruby
+BuildRequires:  SDL-devel
+BuildRequires:  w3m
 
 %description
 GEGL (Generic Graphics Library) is a graph based image processing framework. 
@@ -32,15 +48,24 @@
 
 %prep
 %setup -q
-%patch0 -p0
 chmod -x operations/external/ff-load.c operations/common/perlin/perlin.*
 
 %build
-%ifnarch ppc64
-%configure --disable-static --enable-workshop
-%else
-%configure --disable-static --enable-workshop --disable-docs
-%endif
+%configure \
+    --with-cairo \
+    --with-graphviz \
+    --with-gtk --with-gdk-pixbuf \
+    --with-libjpeg \
+    --with-libopenraw \
+    --with-libpng \
+    --with-librsvg \
+    --with-libspiro \
+    --with-libv4l \
+    --with-lua \
+    --with-openexr \
+    --with-pango --with-pangocairo \
+    --with-sdl \
+    --disable-static --enable-workshop
 make %{?_smp_mflags}
 										
 %install
@@ -49,6 +74,11 @@
 
 rm -f %{buildroot}%{_libdir}/*.la
 
+# fix timestamps of generated files
+for f in %{_datadir}/gtk-doc/html/gegl/operations.html; do
+    touch -m -r ChangeLog "%{buildroot}/$f"
+done
+
 %check
 make check
 
@@ -68,17 +98,29 @@
 
 %files devel
 %defattr(-, root, root, -)
+%doc %{_datadir}/gtk-doc/html/gegl/
 %{_includedir}/gegl-0.0/
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/%{name}.pc
-%ifnarch ppc64
-%doc %{_datadir}/gtk-doc/html/gegl/
-%endif
 
 %changelog
+* Thu Jan 29 2009 Nils Philippsen - 0.0.22-2
+- use the same timestamps for certain documentation files on all architectures
+  to avoid multi-lib conflicts (#481404)
+- consolidate spec files between OS releases
+- reenable building documentation on ppc64
+- explicitly list more build requirements and/or versions to catch eventual
+  problems during future builds
+
+* Tue Jan 13 2009 Deji Akingunola <dakingun at gmail.com> - 0.0.22-1
+- Update to version 0.0.22
+
 * Tue Oct 07 2008 Deji Akingunola <dakingun at gmail.com> - 0.0.20-1
 - Update to latest release
 
+* Thu Jul 10 2008 Deji Akingunola <dakingun at gmail.com> - 0.0.18-1
+- Update to latest release
+
 * Thu Feb 28 2008 Deji Akingunola <dakingun at gmail.com> - 0.0.16-1
 - New release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gegl/F-9/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	7 Oct 2008 14:49:00 -0000	1.6
+++ sources	30 Jan 2009 09:35:16 -0000	1.7
@@ -1 +1 @@
-2e1f97ec8abd9a4a21f458b43799bff2  gegl-0.0.20.tar.bz2
+e2196c2016d16a4479e157f8fdee4162  gegl-0.0.22.tar.bz2



From rjones at fedoraproject.org  Fri Jan 30 09:38:35 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Fri, 30 Jan 2009 09:38:35 +0000 (UTC)
Subject: rpms/mingw32-filesystem/devel mingw32-filesystem.spec, 1.12,
	1.13 mingw32-macros.mingw32, 1.7, 1.8
Message-ID: <20090130093835.CBB3F70117@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/mingw32-filesystem/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3422

Modified Files:
	mingw32-filesystem.spec mingw32-macros.mingw32 
Log Message:
- Use PKG_CONFIG_LIBDIR instead of PKG_CONFIG_PATH so that native pkgconfig
  is never searched.



Index: mingw32-filesystem.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-filesystem/devel/mingw32-filesystem.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- mingw32-filesystem.spec	26 Jan 2009 17:21:27 -0000	1.12
+++ mingw32-filesystem.spec	30 Jan 2009 09:38:05 -0000	1.13
@@ -1,7 +1,7 @@
 %define debug_package %{nil}
 
 Name:           mingw32-filesystem
-Version:        44
+Version:        45
 Release:        1%{?dist}
 Summary:        MinGW base filesystem and environment
 
@@ -153,6 +153,10 @@
 
 
 %changelog
+* Wed Jan 28 2009 Richard W.M. Jones <rjones at redhat.com> - 45-1
+- Use PKG_CONFIG_LIBDIR instead of PKG_CONFIG_PATH so that native pkgconfig
+  is never searched.
+
 * Mon Jan 26 2009 Richard W.M. Jones <rjones at redhat.com> - 44-1
 - Install rpmlint overrides file to suppress some rpmlint warnings.
 


Index: mingw32-macros.mingw32
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-filesystem/devel/mingw32-macros.mingw32,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- mingw32-macros.mingw32	24 Jan 2009 18:11:43 -0000	1.7
+++ mingw32-macros.mingw32	30 Jan 2009 09:38:05 -0000	1.8
@@ -54,7 +54,7 @@
 %_mingw32_findrequires    /usr/lib/rpm/mingw32-find-requires.sh
 
 %_mingw32_env HOST_CC=gcc; export HOST_CC; \
-  PKG_CONFIG_PATH="%{_mingw32_libdir}/pkgconfig"; export PKG_CONFIG_PATH; \
+  PKG_CONFIG_LIBDIR="%{_mingw32_libdir}/pkgconfig"; export PKG_CONFIG_LIBDIR; \
   _PREFIX="%{_bindir}/%{_mingw32_target}-"; \
   for i in `ls -1 ${_PREFIX}* | grep -v 'gcc-'`; do \
     x=`echo $i|sed "s,${_PREFIX},,"|tr "a-z+-" "A-ZX_"`; \



From kasal at fedoraproject.org  Fri Jan 30 09:44:58 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri, 30 Jan 2009 09:44:58 +0000 (UTC)
Subject: rpms/dosfstools/devel dosfstools.spec,1.34,1.35
Message-ID: <20090130094458.2CB1D70117@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/extras/rpms/dosfstools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4299

Modified Files:
	dosfstools.spec 
Log Message:
install all the documentation to the usual docdir (#225707)


Index: dosfstools.spec
===================================================================
RCS file: /cvs/extras/rpms/dosfstools/devel/dosfstools.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- dosfstools.spec	19 Jan 2009 10:37:23 -0000	1.34
+++ dosfstools.spec	30 Jan 2009 09:44:27 -0000	1.35
@@ -1,7 +1,7 @@
 Name: dosfstools
 Summary: Utilities for making and checking MS-DOS FAT filesystems on Linux
 Version: 3.0.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv3+
 Group: Applications/System
 Source0: http://www.daniel-baumann.ch/software/dosfstools/%{name}-%{version}.tar.gz
@@ -17,6 +17,7 @@
 
 %prep
 %setup -q
+sed -i 's,\$(DOCDIR)/%{name}$,&-%{version},' Makefile
 
 %build
 make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
@@ -30,12 +31,14 @@
 
 %files
 %defattr(-,root,root,-)
-%doc %{_datadir}/doc/%{name}/ 
 %doc ChangeLog COPYING
 /sbin/*
 %{_mandir}/man8/*
 
 %changelog
+* Fri Jan 30 2009 Stepan Kasal <skasal at redhat.com> - 3.0.1-2
+- install all the documentation to the usual docdir (#225707)
+
 * Mon Jan 19 2009 Peter Vrabec <pvrabec at redhat.com> - 3.0.1-1
 - upgrade
 - include ChangeLog and COPYING (#225707)



From pkgdb at fedoraproject.org  Fri Jan 30 09:49:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 09:49:12 +0000
Subject: [pkgdb] rdesktop: fab has requested watchbugzilla
Message-ID: <20090130094912.5E866208484@bastion.fedora.phx.redhat.com>

fab has requested the watchbugzilla acl on rdesktop (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rdesktop



From pkgdb at fedoraproject.org  Fri Jan 30 09:49:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 09:49:15 +0000
Subject: [pkgdb] rdesktop: fab has requested watchcommits
Message-ID: <20090130094915.6D072208493@bastion.fedora.phx.redhat.com>

fab has requested the watchcommits acl on rdesktop (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rdesktop



From pkgdb at fedoraproject.org  Fri Jan 30 09:49:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 09:49:26 +0000
Subject: [pkgdb] rdesktop: fab has requested commit
Message-ID: <20090130094926.B6FE5208484@bastion.fedora.phx.redhat.com>

fab has requested the commit acl on rdesktop (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rdesktop



From pkgdb at fedoraproject.org  Fri Jan 30 09:49:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 09:49:36 +0000
Subject: [pkgdb] rdesktop: fab has requested watchcommits
Message-ID: <20090130094937.3AB17208494@bastion.fedora.phx.redhat.com>

fab has requested the watchcommits acl on rdesktop (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rdesktop



From pkgdb at fedoraproject.org  Fri Jan 30 09:49:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 09:49:37 +0000
Subject: [pkgdb] rdesktop: fab has requested commit
Message-ID: <20090130094937.EE09F208493@bastion.fedora.phx.redhat.com>

fab has requested the commit acl on rdesktop (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rdesktop



From pkgdb at fedoraproject.org  Fri Jan 30 09:49:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 09:49:42 +0000
Subject: [pkgdb] rdesktop: fab has requested watchbugzilla
Message-ID: <20090130094942.51CD02084A7@bastion.fedora.phx.redhat.com>

fab has requested the watchbugzilla acl on rdesktop (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rdesktop



From pkgdb at fedoraproject.org  Fri Jan 30 09:49:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 09:49:55 +0000
Subject: [pkgdb] rdesktop: fab has requested watchbugzilla
Message-ID: <20090130094955.7AD2D208485@bastion.fedora.phx.redhat.com>

fab has requested the watchbugzilla acl on rdesktop (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rdesktop



From pkgdb at fedoraproject.org  Fri Jan 30 09:49:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 09:49:59 +0000
Subject: [pkgdb] rdesktop: fab has requested watchcommits
Message-ID: <20090130094959.18C6C208486@bastion.fedora.phx.redhat.com>

fab has requested the watchcommits acl on rdesktop (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rdesktop



From pkgdb at fedoraproject.org  Fri Jan 30 09:50:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 09:50:02 +0000
Subject: [pkgdb] rdesktop: fab has requested commit
Message-ID: <20090130095002.8DC3D208496@bastion.fedora.phx.redhat.com>

fab has requested the commit acl on rdesktop (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/rdesktop



From twaugh at fedoraproject.org  Fri Jan 30 09:57:33 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Fri, 30 Jan 2009 09:57:33 +0000 (UTC)
Subject: rpms/ghostscript/devel ghostscript.spec,1.178,1.179
Message-ID: <20090130095733.B5F0A70117@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/ghostscript/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5680

Modified Files:
	ghostscript.spec 
Log Message:
* Fri Jan 30 2009 Tim Waugh <twaugh at redhat.com>
- Removed trade marks to avoid any potential confusion.



Index: ghostscript.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ghostscript/devel/ghostscript.spec,v
retrieving revision 1.178
retrieving revision 1.179
diff -u -r1.178 -r1.179
--- ghostscript.spec	17 Oct 2008 15:47:32 -0000	1.178
+++ ghostscript.spec	30 Jan 2009 09:57:03 -0000	1.179
@@ -1,7 +1,7 @@
 %define gs_ver 8.63
 %define gs_dot_ver 8.63
 %{expand: %%define build_with_freetype %{?_with_freetype:1}%{!?_with_freetype:0}}
-Summary: A PostScript(TM) interpreter and renderer.
+Summary: A PostScript interpreter and renderer.
 Name: ghostscript
 Version: %{gs_ver}
 
@@ -42,7 +42,7 @@
 Conflicts: ttfonts-zh_TW < 2.11-20
 
 %description
-Ghostscript is a set of software that provides a PostScript(TM)
+Ghostscript is a set of software that provides a PostScript
 interpreter, a set of C procedures (the Ghostscript library, which
 implements the graphics capabilities in the PostScript language) and
 an interpreter for Portable Document Format (PDF) files. Ghostscript
@@ -73,7 +73,7 @@
 The documentation files that come with ghostscript.
 
 %package gtk
-Summary: A GTK-enabled PostScript(TM) interpreter and renderer.
+Summary: A GTK-enabled PostScript interpreter and renderer.
 Requires: %{name} = %{version}-%{release}
 Group: Applications/Publishing
 
@@ -288,6 +288,9 @@
 %{_libdir}/libgs.so
 
 %changelog
+* Fri Jan 30 2009 Tim Waugh <twaugh at redhat.com>
+- Removed trade marks to avoid any potential confusion.
+
 * Fri Oct 17 2008 Tim Waugh <twaugh at redhat.com>
 - Removed last patch (unsuccessful).
 



From ovasik at fedoraproject.org  Fri Jan 30 09:58:55 2009
From: ovasik at fedoraproject.org (Ondrej Vasik)
Date: Fri, 30 Jan 2009 09:58:55 +0000 (UTC)
Subject: rpms/setup/devel setup-2.7.7-rxvt.patch, NONE, 1.1 setup.spec, 1.69,
	1.70
Message-ID: <20090130095855.881CE70117@cvs1.fedora.phx.redhat.com>

Author: ovasik

Update of /cvs/extras/rpms/setup/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6123

Modified Files:
	setup.spec 
Added Files:
	setup-2.7.7-rxvt.patch 
Log Message:
 add support for ctrl+arrow keys in rxvt(#474110)

setup-2.7.7-rxvt.patch:

--- NEW FILE setup-2.7.7-rxvt.patch ---
diff -urNp setup-2.7.7-orig/inputrc setup-2.7.7/inputrc
--- setup-2.7.7-orig/inputrc	2009-01-22 14:00:18.000000000 +0100
+++ setup-2.7.7/inputrc	2009-01-30 10:49:40.000000000 +0100
@@ -26,6 +26,8 @@ $if mode=emacs
 
 # for rxvt
 "\e[8~": end-of-line
+"\eOc": forward-word
+"\eOd": backward-word
 
 # for non RH/Debian xterm, can't hurt for RH/DEbian xterm
 "\eOH": beginning-of-line


Index: setup.spec
===================================================================
RCS file: /cvs/extras/rpms/setup/devel/setup.spec,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- setup.spec	29 Jan 2009 11:45:59 -0000	1.69
+++ setup.spec	30 Jan 2009 09:58:25 -0000	1.70
@@ -1,12 +1,13 @@
 Summary: A set of system configuration and setup files
 Name: setup
 Version: 2.7.7
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: Public Domain
 Group: System Environment/Base
 URL: https://fedorahosted.org/setup/
 Source: setup-%{version}.tar.bz2
 Patch1: setup-2.7.7-uidgid.patch
+Patch2: setup-2.7.7-rxvt.patch
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 BuildRequires: bash tcsh perl
@@ -20,6 +21,7 @@
 %prep
 %setup -q
 %patch1 -p1
+%patch2 -p1
 
 %build
 
@@ -89,6 +91,9 @@
 %ghost %verify(not md5 size mtime) %config(noreplace,missingok) /etc/mtab
 
 %changelog
+* Fri Jan 30 2009 Ondrej Vasik <ovasik at redhat.com> 2.7.7-3
+- add support for ctrl+arrow keys in rxvt(#474110)
+
 * Thu Jan 29 2009 Ondrej Vasik <ovasik at redhat.com> 2.7.7-2
 - reserve 87 gid for polkituser (just uid was reserved),
   reserve 18 gid for dialout(to prevent conflicts with



From huzaifas at fedoraproject.org  Fri Jan 30 10:14:27 2009
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Fri, 30 Jan 2009 10:14:27 +0000 (UTC)
Subject: rpms/gnumeric/F-9 gnumeric-1.8.2-desktop.patch, NONE,
	1.1 gnumeric-1.8.2-python.patch, NONE, 1.1 gnumeric.spec, 1.39, 1.40
Message-ID: <20090130101427.5AF5370117@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/pkgs/rpms/gnumeric/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8442

Modified Files:
	gnumeric.spec 
Added Files:
	gnumeric-1.8.2-desktop.patch gnumeric-1.8.2-python.patch 
Log Message:
Fix Bugzilla 481572


gnumeric-1.8.2-desktop.patch:

--- NEW FILE gnumeric-1.8.2-desktop.patch ---
--- gnumeric-1.8.2/gnumeric.desktop.in.desktop	2008-01-15 05:25:35.000000000 +0530
+++ gnumeric-1.8.2/gnumeric.desktop.in	2008-11-17 09:23:01.000000000 +0530
@@ -4,7 +4,7 @@
 _GenericName=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;Science;Math;GNOME;GTK;

gnumeric-1.8.2-python.patch:

--- NEW FILE gnumeric-1.8.2-python.patch ---
diff -Naur gnumeric-1.8.2/plugins/python-loader/gnm-py-interpreter.c gnumeric-1.8.2.python/plugins/python-loader/gnm-py-interpreter.c
--- gnumeric-1.8.2/plugins/python-loader/gnm-py-interpreter.c	2008-01-14 18:55:07.000000000 -0500
+++ gnumeric-1.8.2.python/plugins/python-loader/gnm-py-interpreter.c	2009-01-29 01:19:22.000000000 -0500
@@ -101,6 +101,7 @@
 	interpreter->plugin = plugin;
 
 	PySys_SetArgv (G_N_ELEMENTS (plugin_argv) - 1, plugin_argv);
+	PyRun_SimpleString("import sys; sys.path = filter(None, sys.path)");
 	py_initgnumeric (interpreter);
 
 	return interpreter;


Index: gnumeric.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnumeric/F-9/gnumeric.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- gnumeric.spec	18 Mar 2008 17:36:52 -0000	1.39
+++ gnumeric.spec	30 Jan 2009 10:13:57 -0000	1.40
@@ -1,7 +1,7 @@
 Name:             gnumeric
 Epoch:            1
 Version:          1.8.2
-Release:          2%{?dist}
+Release:          3%{?dist}
 Summary:          Spreadsheet program for GNOME
 Group:            Applications/Productivity
 # bug filed upstream about this being GPL v2 only:
@@ -9,8 +9,9 @@
 License:          GPLv2
 URL:              http://www.gnome.org/gnumeric/
 Source:           ftp://ftp.gnome.org/pub/GNOME/sources/%{name}/1.8/%{name}-%{version}.tar.bz2
-Patch0:           gnumeric-1.6.1-desktop.patch
+Patch0:           gnumeric-1.8.2-desktop.patch
 Patch1:           gnumeric-1.8.1-gnomedb-vercheck.patch
+Patch2:		  gnumeric-1.8.2-python.patch
 BuildRoot:        %{_tmppath}/%{name}-%{version}-root
 BuildRequires:    libgnomeui-devel >= 2.4.0
 BuildRequires:    libgnomeprintui22-devel >= 2.8.2
@@ -61,6 +62,7 @@
 %setup -q
 %patch0 -p1 -b .desktop
 %patch1 -p1
+%patch2 -p1 -b .new
 chmod -x plugins/excel/rc4.?
 
 
@@ -188,6 +190,8 @@
 
 
 %changelog
+* Fri Jan 30 2009 Huzaifa Sidhpurwala <huzaifas at redhat.com> 1:1.8.2-3
+
 * Tue Mar 18 2008 Tom "spot" Callaway <tcallawa at redhat.com> 1:1.8.2-2
 - add Requires for versioned perl (libperl.so)
 



From twaugh at fedoraproject.org  Fri Jan 30 10:15:15 2009
From: twaugh at fedoraproject.org (Tim Waugh)
Date: Fri, 30 Jan 2009 10:15:15 +0000 (UTC)
Subject: rpms/a2ps/devel a2ps.spec,1.89,1.90
Message-ID: <20090130101515.D271870117@cvs1.fedora.phx.redhat.com>

Author: twaugh

Update of /cvs/pkgs/rpms/a2ps/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8628

Modified Files:
	a2ps.spec 
Log Message:
* Fri Jan 30 2009 Tim Waugh <twaugh at redhat.com> 4.14-7
- Removed trade marks to avoid potential confusion.



Index: a2ps.spec
===================================================================
RCS file: /cvs/pkgs/rpms/a2ps/devel/a2ps.spec,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -r1.89 -r1.90
--- a2ps.spec	24 Sep 2008 14:46:30 -0000	1.89
+++ a2ps.spec	30 Jan 2009 10:14:45 -0000	1.90
@@ -10,10 +10,10 @@
 %endif
 
 
-Summary: Converts text and other types of files to PostScript(TM)
+Summary: Converts text and other types of files to PostScript
 Name: a2ps
 Version: 4.14
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: GPLv3+
 Group: Applications/Publishing
 Source0: http://ftp.gnu.org/gnu/a2ps/%{name}-%{version}.tar.gz
@@ -78,7 +78,7 @@
 
 
 %description
-The a2ps filter converts text and other types of files to PostScript(TM).
+The a2ps filter converts text and other types of files to PostScript.
 A2ps has pretty-printing capabilities and includes support for a wide
 number of programming languages, encodings (ISO Latins, Cyrillic, etc.),
 and medias.
@@ -288,6 +288,9 @@
 %{emacs_lispdir}/*.el
 
 %changelog
+* Fri Jan 30 2009 Tim Waugh <twaugh at redhat.com> 4.14-7
+- Removed trade marks to avoid potential confusion.
+
 * Wed Sep 24 2008 Tim Waugh <twaugh at redhat.com> 4.14-6
 - Removed patch fuzz.
 



From erikos at fedoraproject.org  Fri Jan 30 10:18:29 2009
From: erikos at fedoraproject.org (Simon Schampijer)
Date: Fri, 30 Jan 2009 10:18:29 +0000 (UTC)
Subject: rpms/sugar-browse/devel sugar-browse.spec,1.5,1.6
Message-ID: <20090130101829.2075470117@cvs1.fedora.phx.redhat.com>

Author: erikos

Update of /cvs/pkgs/rpms/sugar-browse/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9087

Modified Files:
	sugar-browse.spec 
Log Message:
* Fri Jan 30 2009 Simon Schampijer <simon at schampijer.de> - 103-3
- rebuild




Index: sugar-browse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-browse/devel/sugar-browse.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sugar-browse.spec	20 Jan 2009 17:01:43 -0000	1.5
+++ sugar-browse.spec	30 Jan 2009 10:17:58 -0000	1.6
@@ -1,6 +1,6 @@
 Name: sugar-browse
 Version: 103
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: Browse activity for Sugar
 Group: Sugar/Activities
 License: GPLv2+
@@ -40,6 +40,9 @@
 
 
 %changelog
+* Fri Jan 30 2009 Simon Schampijer <simon at schampijer.de> - 103-3
+- rebuild
+
 * Tue Jan 20 2009 Marco Pesenti Gritti <mpg at redhat.com> - 103-2
 - use cjson instead of json (nirbheek)
 - new translations 



From huzaifas at fedoraproject.org  Fri Jan 30 10:24:37 2009
From: huzaifas at fedoraproject.org (Huzaifa Sidhpurwala)
Date: Fri, 30 Jan 2009 10:24:37 +0000 (UTC)
Subject: rpms/gnumeric/F-9 gnumeric.spec,1.40,1.41
Message-ID: <20090130102437.2753170117@cvs1.fedora.phx.redhat.com>

Author: huzaifas

Update of /cvs/pkgs/rpms/gnumeric/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9823

Modified Files:
	gnumeric.spec 
Log Message:
Corrected changelog


Index: gnumeric.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnumeric/F-9/gnumeric.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- gnumeric.spec	30 Jan 2009 10:13:57 -0000	1.40
+++ gnumeric.spec	30 Jan 2009 10:24:06 -0000	1.41
@@ -1,7 +1,7 @@
 Name:             gnumeric
 Epoch:            1
 Version:          1.8.2
-Release:          3%{?dist}
+Release:          4%{?dist}
 Summary:          Spreadsheet program for GNOME
 Group:            Applications/Productivity
 # bug filed upstream about this being GPL v2 only:
@@ -190,7 +190,9 @@
 
 
 %changelog
-* Fri Jan 30 2009 Huzaifa Sidhpurwala <huzaifas at redhat.com> 1:1.8.2-3
+* Fri Jan 30 2009 Huzaifa Sidhpurwala <huzaifas at redhat.com> 1:1.8.2-4
+- Resolves CVE-2009-5983
+- Version Bump
 
 * Tue Mar 18 2008 Tom "spot" Callaway <tcallawa at redhat.com> 1:1.8.2-2
 - add Requires for versioned perl (libperl.so)



From erikos at fedoraproject.org  Fri Jan 30 10:32:49 2009
From: erikos at fedoraproject.org (Simon Schampijer)
Date: Fri, 30 Jan 2009 10:32:49 +0000 (UTC)
Subject: rpms/sugar-browse/devel sugar-browse.spec,1.6,1.7
Message-ID: <20090130103249.9166970117@cvs1.fedora.phx.redhat.com>

Author: erikos

Update of /cvs/pkgs/rpms/sugar-browse/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11578

Modified Files:
	sugar-browse.spec 
Log Message:
* Fri Jan 30 2009 Simon Schampijer <simon at schampijer.de> - 103-4
- cope for removed NEWS file from sources




Index: sugar-browse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-browse/devel/sugar-browse.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sugar-browse.spec	30 Jan 2009 10:17:58 -0000	1.6
+++ sugar-browse.spec	30 Jan 2009 10:32:19 -0000	1.7
@@ -1,6 +1,6 @@
 Name: sugar-browse
 Version: 103
-Release: 3%{?dist}
+Release: 4%{?dist}
 Summary: Browse activity for Sugar
 Group: Sugar/Activities
 License: GPLv2+
@@ -35,11 +35,14 @@
 
 %files -f org.laptop.WebActivity.lang
 %defattr(-,root,root,-)
-%doc NEWS COPYING AUTHORS
+%doc COPYING AUTHORS
 %{sugaractivitydir}/Browse.activity/
 
 
 %changelog
+* Fri Jan 30 2009 Simon Schampijer <simon at schampijer.de> - 103-4
+- cope for removed NEWS file from sources
+
 * Fri Jan 30 2009 Simon Schampijer <simon at schampijer.de> - 103-3
 - rebuild
 



From mschwendt at fedoraproject.org  Fri Jan 30 10:40:35 2009
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Fri, 30 Jan 2009 10:40:35 +0000 (UTC)
Subject: rpms/libsidplay/devel libsidplay.spec,1.22,1.23
Message-ID: <20090130104035.0A73170117@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/libsidplay/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12739

Modified Files:
	libsidplay.spec 
Log Message:
* Fri Jan 30 2009 Michael Schwendt <mschwendt at fedoraproject.org> 1.36.57-18
- only a few spec file adjustments (including new summaries and
  descriptions)



Index: libsidplay.spec
===================================================================
RCS file: /cvs/extras/rpms/libsidplay/devel/libsidplay.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- libsidplay.spec	8 Feb 2008 21:47:53 -0000	1.22
+++ libsidplay.spec	30 Jan 2009 10:40:04 -0000	1.23
@@ -1,7 +1,7 @@
 Name: libsidplay
-Summary: Commodore 64 music player and SID chip emulator library
+Summary: SID chip music module playing library
 Version: 1.36.57
-Release: 17
+Release: 18
 Source: http://home.arcor.de/ms2002sep/bak/%{name}-%{version}.tgz
 Patch: libsidplay-post57fixes.patch
 Patch2: libsidplay-1.36.57-opts.patch
@@ -9,22 +9,29 @@
 Group: System Environment/Libraries
 URL: http://home.arcor.de/ms2002sep/bak/
 License: GPLv2+
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n)
+# Package is relocatable.
 Prefix: %{_prefix}
 
 %description
-This library provides the Sound Interface Device (SID) chip emulator
-engine that is used by music player programs like SIDPLAY. With it
-you can play musics from Commodore 64 (or compatible) programs.
+This library provides support for playing SID music modules originally
+created on Commodore 64 and compatibles. It contains a processing engine
+for MOS 6510 machine code and MOS 6581 Sound Interface Device (SID)
+chip output. It is used by music player programs like SIDPLAY and
+several plug-ins for versatile audio players.
+
+Developers should consider switching to libsidplay version 2 or newer.
+
 
 %package devel
-Summary: Header files for compiling apps that use libsidplay
+Summary: Files needed for compiling programs that use libsidplay
 Group: System Environment/Libraries
 Requires: %{name} = %{version}-%{release}
 
 %description devel
-This package contains the header files for compiling applications
-that use libsidplay.
+These are the files needed for compiling programs that use libsidplay.
+Developers should consider switching to libsidplay version 2 or newer.
+
 
 %prep
 %setup -q
@@ -40,7 +47,7 @@
 %install
 rm -rf %{buildroot}
 mkdir -p %{buildroot}
-make DESTDIR=%{buildroot} install
+make DESTDIR=%{buildroot} INSTALL="install -p" install
 
 %clean
 rm -rf %{buildroot}
@@ -51,18 +58,21 @@
 
 %files
 %defattr(-,root,root)
-%doc AUTHORS COPYING DEVELOPER
-%doc src/fastforward.txt src/format.txt src/mixing.txt src/mpu.txt src/panning.txt
 %{_libdir}/libsidplay.so.*
 %exclude %{_libdir}/*.la
 
 %files devel
 %defattr(-,root,root)
+%doc AUTHORS COPYING DEVELOPER src/*.txt
 %{_libdir}/libsidplay.so
 #%{_libdir}/libsidplay.a
 %{_includedir}/sidplay
 
 %changelog
+* Fri Jan 30 2009 Michael Schwendt <mschwendt at fedoraproject.org> 1.36.57-18
+- only a few spec file adjustments (including new summaries and
+  descriptions)
+
 * Fri Feb 08 2008 Michael Schwendt <mschwendt at fedoraproject.org>
 - rebuilt for GCC 4.3 as requested by Fedora Release Engineering
 



From mschwendt at fedoraproject.org  Fri Jan 30 10:44:13 2009
From: mschwendt at fedoraproject.org (Michael Schwendt)
Date: Fri, 30 Jan 2009 10:44:13 +0000 (UTC)
Subject: rpms/libsidplay/devel libsidplay.spec,1.23,1.24
Message-ID: <20090130104413.CA9C970117@cvs1.fedora.phx.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/libsidplay/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13289

Modified Files:
	libsidplay.spec 
Log Message:
LicensingGuidelines want the License Text in %doc


Index: libsidplay.spec
===================================================================
RCS file: /cvs/extras/rpms/libsidplay/devel/libsidplay.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- libsidplay.spec	30 Jan 2009 10:40:04 -0000	1.23
+++ libsidplay.spec	30 Jan 2009 10:43:43 -0000	1.24
@@ -58,12 +58,13 @@
 
 %files
 %defattr(-,root,root)
+%doc COPYING
 %{_libdir}/libsidplay.so.*
 %exclude %{_libdir}/*.la
 
 %files devel
 %defattr(-,root,root)
-%doc AUTHORS COPYING DEVELOPER src/*.txt
+%doc AUTHORS DEVELOPER src/*.txt
 %{_libdir}/libsidplay.so
 #%{_libdir}/libsidplay.a
 %{_includedir}/sidplay



From tmraz at fedoraproject.org  Fri Jan 30 10:44:54 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 30 Jan 2009 10:44:54 +0000 (UTC)
Subject: rpms/libgcrypt/devel .cvsignore, 1.12, 1.13 libgcrypt.spec, 1.32,
	1.33 sources, 1.12, 1.13 libgcrypt-1.2.2-lib64.patch, 1.1, NONE
Message-ID: <20090130104454.7612670117@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/libgcrypt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13396

Modified Files:
	.cvsignore libgcrypt.spec sources 
Removed Files:
	libgcrypt-1.2.2-lib64.patch 
Log Message:
* Fri Jan 30 2009 Tomas Mraz <tmraz at redhat.com> 1.4.4-1
- update to 1.4.4
- do not abort when the fips mode kernel flag is inaccessible
  due to permissions (#470219)
- hobble the library to drop the ECC support



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libgcrypt/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	18 Sep 2008 15:50:08 -0000	1.12
+++ .cvsignore	30 Jan 2009 10:44:24 -0000	1.13
@@ -1,17 +1 @@
-libgcrypt-1.2.0.tar.gz
-libgcrypt-1.2.1.tar.bz2
-libgcrypt-1.2.1.tar.bz2.sig
-libgcrypt-1.2.2.tar.bz2
-libgcrypt-1.2.2.tar.bz2.sig
-libgcrypt-1.2.3.tar.bz2
-libgcrypt-1.2.3.tar.bz2.sig
-libgcrypt-1.2.4.tar.bz2
-libgcrypt-1.2.4.tar.bz2.sig
-libgcrypt-1.4.0.tar.bz2
-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
-libgcrypt-1.4.3.tar.bz2
-libgcrypt-1.4.3.tar.bz2.sig
+libgcrypt-1.4.4-hobbled.tar.bz2


Index: libgcrypt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libgcrypt/devel/libgcrypt.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- libgcrypt.spec	21 Oct 2008 04:51:58 -0000	1.32
+++ libgcrypt.spec	30 Jan 2009 10:44:24 -0000	1.33
@@ -1,9 +1,16 @@
 Name: libgcrypt
-Version: 1.4.3
-Release: 2%{?dist}
-Source0: ftp://ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-%{version}.tar.bz2
-Source1: ftp://ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-%{version}.tar.bz2.sig
+Version: 1.4.4
+Release: 1%{?dist}
+Source0: libgcrypt-%{version}-hobbled.tar.bz2
+# The original libgcrypt sources now contain potentially patented ECC
+# cipher support. We have to remove it in the tarball we ship with
+# the hobble-libgcrypt script.
+#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
+Source3: hobble-libgcrypt
+Patch1: libgcrypt-1.4.4-fips-no-access.patch
+
 # Technically LGPLv2.1+, but Fedora's table doesn't draw a distinction.
 License: LGPLv2+
 Summary: A general-purpose cryptography library
@@ -29,13 +36,16 @@
 
 %prep
 %setup -q
+%{SOURCE3}
+%patch1 -p1 -b .no-access
 
 %build
 %configure --disable-static \
 %ifarch sparc64
      --disable-asm \
 %endif
-     --enable-noexecstack
+     --enable-noexecstack \
+     --enable-pubkey-ciphers='dsa elgamal rsa'
 make %{?_smp_mflags}
 
 %check
@@ -123,6 +133,12 @@
 %{_infodir}/gcrypt.info*
 
 %changelog
+* Fri Jan 30 2009 Tomas Mraz <tmraz at redhat.com> 1.4.4-1
+- update to 1.4.4
+- do not abort when the fips mode kernel flag is inaccessible
+  due to permissions (#470219)
+- hobble the library to drop the ECC support
+
 * Mon Oct 20 2008 Dennis Gilmore <dennis at ausil.us> 1.4.3-2
 - disable asm on sparc64
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libgcrypt/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	18 Sep 2008 15:50:08 -0000	1.12
+++ sources	30 Jan 2009 10:44:24 -0000	1.13
@@ -1,2 +1 @@
-46e50e811ed51f1e0e8dd677dded967d  libgcrypt-1.4.3.tar.bz2
-b6c8495eaeb912aa612196a849039e74  libgcrypt-1.4.3.tar.bz2.sig
+12d3fec91c663b541d63e34eabddacc5  libgcrypt-1.4.4-hobbled.tar.bz2


--- libgcrypt-1.2.2-lib64.patch DELETED ---



From tmraz at fedoraproject.org  Fri Jan 30 10:46:27 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 30 Jan 2009 10:46:27 +0000 (UTC)
Subject: rpms/libgcrypt/devel libgcrypt-1.4.4-fips-no-access.patch,NONE,1.1
Message-ID: <20090130104627.F250470117@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/libgcrypt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13987

Added Files:
	libgcrypt-1.4.4-fips-no-access.patch 
Log Message:
* Fri Jan 30 2009 Tomas Mraz <tmraz at redhat.com> 1.4.4-1
- update to 1.4.4
- do not abort when the fips mode kernel flag is inaccessible
  due to permissions (#470219)
- hobble the library to drop the ECC support


libgcrypt-1.4.4-fips-no-access.patch:

--- NEW FILE libgcrypt-1.4.4-fips-no-access.patch ---
Do not abort when the fips mode flag is simply inaccessible because of
insufficient permissions.
diff -up libgcrypt-1.4.4/src/fips.c.no-access libgcrypt-1.4.4/src/fips.c
--- libgcrypt-1.4.4/src/fips.c.no-access	2009-01-29 17:37:12.000000000 +0100
+++ libgcrypt-1.4.4/src/fips.c	2009-01-29 17:37:15.000000000 +0100
@@ -155,6 +155,7 @@ _gcry_initialize_fips_mode (int force)
         fclose (fp);
       }
     else if ((saved_errno = errno) != ENOENT
+             && saved_errno != EACCES
              && !access ("/proc/version", F_OK) )
       {
         /* Problem reading the fips file despite that we have the proc



From pkgdb at fedoraproject.org  Fri Jan 30 10:52:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 10:52:20 +0000
Subject: [pkgdb] sugar-write: erikos has requested commit
Message-ID: <20090130105220.1925B208484@bastion.fedora.phx.redhat.com>

erikos has requested the commit acl 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  Fri Jan 30 10:52:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 10:52:28 +0000
Subject: [pkgdb] sugar-write: erikos has requested approveacls
Message-ID: <20090130105228.89F3A208494@bastion.fedora.phx.redhat.com>

erikos has requested the approveacls acl 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  Fri Jan 30 10:52:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 10:52:33 +0000
Subject: [pkgdb] sugar-write: erikos has requested watchcommits
Message-ID: <20090130105233.6D215208496@bastion.fedora.phx.redhat.com>

erikos has requested the watchcommits acl 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  Fri Jan 30 10:52:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 10:52:48 +0000
Subject: [pkgdb] sugar-write: erikos has requested approveacls
Message-ID: <20090130105248.2977E2082A7@bastion.fedora.phx.redhat.com>

erikos has requested the approveacls acl on sugar-write (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-write



From pkgdb at fedoraproject.org  Fri Jan 30 10:52:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 10:52:50 +0000
Subject: [pkgdb] sugar-write: erikos has requested commit
Message-ID: <20090130105250.27CBD208493@bastion.fedora.phx.redhat.com>

erikos has requested the commit acl on sugar-write (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-write



From pkgdb at fedoraproject.org  Fri Jan 30 10:52:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 10:52:52 +0000
Subject: [pkgdb] sugar-write: erikos has requested watchcommits
Message-ID: <20090130105252.4B2B5208496@bastion.fedora.phx.redhat.com>

erikos has requested the watchcommits acl on sugar-write (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-write



From tmraz at fedoraproject.org  Fri Jan 30 10:53:38 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 30 Jan 2009 10:53:38 +0000 (UTC)
Subject: rpms/libgcrypt/devel hobble-libgcrypt,NONE,1.1
Message-ID: <20090130105338.C33E570117@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/libgcrypt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15092

Added Files:
	hobble-libgcrypt 
Log Message:
* Fri Jan 30 2009 Tomas Mraz <tmraz at redhat.com> 1.4.4-1
- update to 1.4.4
- do not abort when the fips mode kernel flag is inaccessible
  due to permissions (#470219)
- hobble the library to drop the ECC support



--- NEW FILE hobble-libgcrypt ---
#!/bin/sh

# Quit out if anything fails.
set -e -x

# Clean out patent-or-otherwise-encumbered code.
# EC:    ????????? ??/??/2015

rm -f cipher/ecc.c



From pkgdb at fedoraproject.org  Fri Jan 30 10:53:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 10:53:47 +0000
Subject: [pkgdb] sugar-chat: erikos has requested approveacls
Message-ID: <20090130105348.027612082A7@bastion.fedora.phx.redhat.com>

erikos has requested the approveacls acl 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  Fri Jan 30 10:53:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 10:53:48 +0000
Subject: [pkgdb] sugar-chat: erikos has requested commit
Message-ID: <20090130105348.3F9E3208494@bastion.fedora.phx.redhat.com>

erikos has requested the commit acl 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  Fri Jan 30 10:53:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 10:53:49 +0000
Subject: [pkgdb] sugar-chat: erikos has requested watchcommits
Message-ID: <20090130105349.9A64A208496@bastion.fedora.phx.redhat.com>

erikos has requested the watchcommits acl 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  Fri Jan 30 10:53:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 10:53:56 +0000
Subject: [pkgdb] sugar-chat: erikos has requested approveacls
Message-ID: <20090130105356.4F71E2084BD@bastion.fedora.phx.redhat.com>

erikos has requested the approveacls acl on sugar-chat (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-chat



From pkgdb at fedoraproject.org  Fri Jan 30 10:53:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 10:53:57 +0000
Subject: [pkgdb] sugar-chat: erikos has requested commit
Message-ID: <20090130105357.B5BD420860C@bastion.fedora.phx.redhat.com>

erikos has requested the commit acl on sugar-chat (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-chat



From pkgdb at fedoraproject.org  Fri Jan 30 10:53:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 10:53:58 +0000
Subject: [pkgdb] sugar-chat: erikos has requested watchcommits
Message-ID: <20090130105358.2414720860F@bastion.fedora.phx.redhat.com>

erikos has requested the watchcommits acl on sugar-chat (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-chat



From pkgdb at fedoraproject.org  Fri Jan 30 10:54:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 10:54:44 +0000
Subject: [pkgdb] sugar-terminal: erikos has requested approveacls
Message-ID: <20090130105444.965382082A7@bastion.fedora.phx.redhat.com>

erikos has requested the approveacls acl on sugar-terminal (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-terminal



From pkgdb at fedoraproject.org  Fri Jan 30 10:54:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 10:54:46 +0000
Subject: [pkgdb] sugar-terminal: erikos has requested watchcommits
Message-ID: <20090130105446.8B6E4208493@bastion.fedora.phx.redhat.com>

erikos has requested the watchcommits acl on sugar-terminal (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-terminal



From pkgdb at fedoraproject.org  Fri Jan 30 10:54:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 10:54:46 +0000
Subject: [pkgdb] sugar-terminal: erikos has requested commit
Message-ID: <20090130105447.02969208496@bastion.fedora.phx.redhat.com>

erikos has requested the commit acl on sugar-terminal (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-terminal



From pkgdb at fedoraproject.org  Fri Jan 30 10:54:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 10:54:53 +0000
Subject: [pkgdb] sugar-terminal: erikos has requested commit
Message-ID: <20090130105453.F18A4208605@bastion.fedora.phx.redhat.com>

erikos has requested the commit acl on sugar-terminal (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-terminal



From pkgdb at fedoraproject.org  Fri Jan 30 10:54:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 10:54:55 +0000
Subject: [pkgdb] sugar-terminal: erikos has requested watchcommits
Message-ID: <20090130105455.194C220860E@bastion.fedora.phx.redhat.com>

erikos has requested the watchcommits acl on sugar-terminal (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-terminal



From pkgdb at fedoraproject.org  Fri Jan 30 10:54:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 10:54:56 +0000
Subject: [pkgdb] sugar-terminal: erikos has requested approveacls
Message-ID: <20090130105456.DFFA82082A7@bastion.fedora.phx.redhat.com>

erikos has requested the approveacls acl on sugar-terminal (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-terminal



From pkgdb at fedoraproject.org  Fri Jan 30 10:55:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 10:55:27 +0000
Subject: [pkgdb] ruby had acl change status
Message-ID: <20090130105527.ACF5F2084A7@bastion.fedora.phx.redhat.com>

tagoh has set the watchbugzilla acl on ruby (Fedora devel) to Approved for kanarip

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ruby



From pkgdb at fedoraproject.org  Fri Jan 30 10:55:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 10:55:32 +0000
Subject: [pkgdb] ruby had acl change status
Message-ID: <20090130105532.16AC020860A@bastion.fedora.phx.redhat.com>

tagoh has set the watchcommits acl on ruby (Fedora devel) to Approved for kanarip

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ruby



From pkgdb at fedoraproject.org  Fri Jan 30 10:55:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 10:55:35 +0000
Subject: [pkgdb] ruby had acl change status
Message-ID: <20090130105535.31B2E208679@bastion.fedora.phx.redhat.com>

tagoh has set the approveacls acl on ruby (Fedora devel) to Approved for kanarip

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ruby



From pkgdb at fedoraproject.org  Fri Jan 30 10:55:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 10:55:35 +0000
Subject: [pkgdb] ruby had acl change status
Message-ID: <20090130105535.D57CB208700@bastion.fedora.phx.redhat.com>

tagoh has set the commit acl on ruby (Fedora devel) to Approved for kanarip

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ruby



From pkgdb at fedoraproject.org  Fri Jan 30 10:55:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 10:55:37 +0000
Subject: [pkgdb] sugar-imageviewer: erikos has requested approveacls
Message-ID: <20090130105537.992A820873D@bastion.fedora.phx.redhat.com>

erikos has requested the approveacls acl on sugar-imageviewer (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-imageviewer



From pkgdb at fedoraproject.org  Fri Jan 30 10:55:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 10:55:38 +0000
Subject: [pkgdb] sugar-imageviewer: erikos has requested commit
Message-ID: <20090130105538.4717A208744@bastion.fedora.phx.redhat.com>

erikos has requested the commit acl on sugar-imageviewer (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-imageviewer



From pkgdb at fedoraproject.org  Fri Jan 30 10:55:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 10:55:39 +0000
Subject: [pkgdb] sugar-imageviewer: erikos has requested watchcommits
Message-ID: <20090130105539.7730020874A@bastion.fedora.phx.redhat.com>

erikos has requested the watchcommits acl on sugar-imageviewer (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-imageviewer



From pkgdb at fedoraproject.org  Fri Jan 30 10:55:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 10:55:41 +0000
Subject: [pkgdb] ruby had acl change status
Message-ID: <20090130105541.7727E20860F@bastion.fedora.phx.redhat.com>

tagoh has set the watchbugzilla acl on ruby (Fedora 9) to Approved for kanarip

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ruby



From pkgdb at fedoraproject.org  Fri Jan 30 10:55:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 10:55:43 +0000
Subject: [pkgdb] ruby had acl change status
Message-ID: <20090130105543.3820520876B@bastion.fedora.phx.redhat.com>

tagoh has set the watchcommits acl on ruby (Fedora 9) to Approved for kanarip

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ruby



From pkgdb at fedoraproject.org  Fri Jan 30 10:55:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 10:55:43 +0000
Subject: [pkgdb] sugar-imageviewer: erikos has requested commit
Message-ID: <20090130105544.03D69208771@bastion.fedora.phx.redhat.com>

erikos has requested the commit acl on sugar-imageviewer (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-imageviewer



From pkgdb at fedoraproject.org  Fri Jan 30 10:55:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 10:55:45 +0000
Subject: [pkgdb] sugar-imageviewer: erikos has requested watchcommits
Message-ID: <20090130105544.F41B320896F@bastion.fedora.phx.redhat.com>

erikos has requested the watchcommits acl on sugar-imageviewer (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-imageviewer



From pkgdb at fedoraproject.org  Fri Jan 30 10:55:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 10:55:44 +0000
Subject: [pkgdb] sugar-imageviewer: erikos has requested approveacls
Message-ID: <20090130105544.5B1DB20896A@bastion.fedora.phx.redhat.com>

erikos has requested the approveacls acl on sugar-imageviewer (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-imageviewer



From pkgdb at fedoraproject.org  Fri Jan 30 10:55:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 10:55:47 +0000
Subject: [pkgdb] ruby had acl change status
Message-ID: <20090130105547.C369E20897B@bastion.fedora.phx.redhat.com>

tagoh has set the approveacls acl on ruby (Fedora 9) to Approved for kanarip

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ruby



From pkgdb at fedoraproject.org  Fri Jan 30 10:55:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 10:55:49 +0000
Subject: [pkgdb] ruby had acl change status
Message-ID: <20090130105550.0D969208A5F@bastion.fedora.phx.redhat.com>

tagoh has set the commit acl on ruby (Fedora 9) to Approved for kanarip

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ruby



From pkgdb at fedoraproject.org  Fri Jan 30 10:55:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 10:55:52 +0000
Subject: [pkgdb] ruby had acl change status
Message-ID: <20090130105552.7AD40208D6E@bastion.fedora.phx.redhat.com>

tagoh has set the watchbugzilla acl on ruby (Fedora 10) to Approved for kanarip

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ruby



From pkgdb at fedoraproject.org  Fri Jan 30 10:55:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 10:55:52 +0000
Subject: [pkgdb] ruby had acl change status
Message-ID: <20090130105552.D13AF208494@bastion.fedora.phx.redhat.com>

tagoh has set the watchcommits acl on ruby (Fedora 10) to Approved for kanarip

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ruby



From pkgdb at fedoraproject.org  Fri Jan 30 10:55:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 10:55:58 +0000
Subject: [pkgdb] ruby had acl change status
Message-ID: <20090130105558.0CC13208DA8@bastion.fedora.phx.redhat.com>

tagoh has set the approveacls acl on ruby (Fedora 10) to Approved for kanarip

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ruby



From pkgdb at fedoraproject.org  Fri Jan 30 10:55:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 10:55:58 +0000
Subject: [pkgdb] ruby had acl change status
Message-ID: <20090130105558.60E98208DDF@bastion.fedora.phx.redhat.com>

tagoh has set the commit acl on ruby (Fedora 10) to Approved for kanarip

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ruby



From pkgdb at fedoraproject.org  Fri Jan 30 10:56:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 10:56:20 +0000
Subject: [pkgdb] sugar-jukebox: erikos has requested approveacls
Message-ID: <20090130105620.C0817208497@bastion.fedora.phx.redhat.com>

erikos has requested the approveacls acl on sugar-jukebox (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-jukebox



From pkgdb at fedoraproject.org  Fri Jan 30 10:56:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 10:56:21 +0000
Subject: [pkgdb] sugar-jukebox: erikos has requested commit
Message-ID: <20090130105623.C4B642084B7@bastion.fedora.phx.redhat.com>

erikos has requested the commit acl on sugar-jukebox (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-jukebox



From pkgdb at fedoraproject.org  Fri Jan 30 10:56:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 10:56:25 +0000
Subject: [pkgdb] sugar-jukebox: erikos has requested watchcommits
Message-ID: <20090130105626.23C7E20860A@bastion.fedora.phx.redhat.com>

erikos has requested the watchcommits acl on sugar-jukebox (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-jukebox



From pkgdb at fedoraproject.org  Fri Jan 30 10:56:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 10:56:26 +0000
Subject: [pkgdb] sugar-jukebox: erikos has requested approveacls
Message-ID: <20090130105626.6058520860D@bastion.fedora.phx.redhat.com>

erikos has requested the approveacls acl on sugar-jukebox (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-jukebox



From pkgdb at fedoraproject.org  Fri Jan 30 10:56:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 10:56:27 +0000
Subject: [pkgdb] sugar-jukebox: erikos has requested commit
Message-ID: <20090130105627.3C0912086F2@bastion.fedora.phx.redhat.com>

erikos has requested the commit acl on sugar-jukebox (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-jukebox



From pkgdb at fedoraproject.org  Fri Jan 30 10:56:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 10:56:28 +0000
Subject: [pkgdb] sugar-jukebox: erikos has requested watchcommits
Message-ID: <20090130105628.76ED8208DE3@bastion.fedora.phx.redhat.com>

erikos has requested the watchcommits acl on sugar-jukebox (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-jukebox



From pkgdb at fedoraproject.org  Fri Jan 30 10:57:13 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 10:57:13 +0000
Subject: [pkgdb] sugar-calculator: erikos has requested commit
Message-ID: <20090130105713.35A4320860F@bastion.fedora.phx.redhat.com>

erikos has requested the commit acl 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  Fri Jan 30 10:57:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 10:57:14 +0000
Subject: [pkgdb] sugar-calculator: erikos has requested watchcommits
Message-ID: <20090130105714.479EC208745@bastion.fedora.phx.redhat.com>

erikos has requested the watchcommits acl 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  Fri Jan 30 10:57:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 10:57:14 +0000
Subject: [pkgdb] sugar-calculator: erikos has requested approveacls
Message-ID: <20090130105715.878BE20874B@bastion.fedora.phx.redhat.com>

erikos has requested the approveacls acl 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  Fri Jan 30 10:57:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 10:57:24 +0000
Subject: [pkgdb] sugar-calculator: erikos has requested watchcommits
Message-ID: <20090130105724.02ACD208DE8@bastion.fedora.phx.redhat.com>

erikos has requested the watchcommits acl on sugar-calculator (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-calculator



From pkgdb at fedoraproject.org  Fri Jan 30 10:57:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 10:57:25 +0000
Subject: [pkgdb] sugar-calculator: erikos has requested commit
Message-ID: <20090130105725.8EE94208DEC@bastion.fedora.phx.redhat.com>

erikos has requested the commit acl on sugar-calculator (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-calculator



From pkgdb at fedoraproject.org  Fri Jan 30 10:57:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 10:57:25 +0000
Subject: [pkgdb] sugar-calculator: erikos has requested approveacls
Message-ID: <20090130105725.251FE208DE9@bastion.fedora.phx.redhat.com>

erikos has requested the approveacls acl on sugar-calculator (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-calculator



From pkgdb at fedoraproject.org  Fri Jan 30 10:58:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 10:58:06 +0000
Subject: [pkgdb] ruby ownership updated
Message-ID: <20090130105807.D24C4208A5F@bastion.fedora.phx.redhat.com>

Package ruby in Fedora devel was orphaned by tagoh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ruby



From pkgdb at fedoraproject.org  Fri Jan 30 10:58:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 10:58:11 +0000
Subject: [pkgdb] ruby ownership updated
Message-ID: <20090130105811.6FEFC20897A@bastion.fedora.phx.redhat.com>

Package ruby in Fedora 9 was orphaned by tagoh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ruby



From pkgdb at fedoraproject.org  Fri Jan 30 10:58:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 10:58:12 +0000
Subject: [pkgdb] ruby ownership updated
Message-ID: <20090130105812.4D55620897D@bastion.fedora.phx.redhat.com>

Package ruby in Fedora 10 was orphaned by tagoh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ruby



From pkgdb at fedoraproject.org  Fri Jan 30 11:01:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 11:01:45 +0000
Subject: [pkgdb] sugar-imageviewer had acl change status
Message-ID: <20090130110145.CBEAD208485@bastion.fedora.phx.redhat.com>

fab has set the watchcommits acl on sugar-imageviewer (Fedora devel) to Approved for erikos

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-imageviewer



From pkgdb at fedoraproject.org  Fri Jan 30 11:01:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 11:01:46 +0000
Subject: [pkgdb] sugar-imageviewer had acl change status
Message-ID: <20090130110146.A23DF208495@bastion.fedora.phx.redhat.com>

fab has set the commit acl on sugar-imageviewer (Fedora devel) to Approved for erikos

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-imageviewer



From pkgdb at fedoraproject.org  Fri Jan 30 11:01:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 11:01:50 +0000
Subject: [pkgdb] sugar-imageviewer had acl change status
Message-ID: <20090130110150.DFCD9208497@bastion.fedora.phx.redhat.com>

fab has set the approveacls acl on sugar-imageviewer (Fedora devel) to Approved for erikos

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-imageviewer



From pkgdb at fedoraproject.org  Fri Jan 30 11:01:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 11:01:52 +0000
Subject: [pkgdb] sugar-imageviewer had acl change status
Message-ID: <20090130110152.95BD7208605@bastion.fedora.phx.redhat.com>

fab has set the approveacls acl on sugar-imageviewer (Fedora 10) to Approved for erikos

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-imageviewer



From pkgdb at fedoraproject.org  Fri Jan 30 11:01:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 11:01:52 +0000
Subject: [pkgdb] sugar-imageviewer had acl change status
Message-ID: <20090130110152.95A982084BD@bastion.fedora.phx.redhat.com>

fab has set the commit acl on sugar-imageviewer (Fedora 10) to Approved for erikos

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-imageviewer



From pkgdb at fedoraproject.org  Fri Jan 30 11:01:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 11:01:52 +0000
Subject: [pkgdb] sugar-imageviewer had acl change status
Message-ID: <20090130110152.A33EA20860D@bastion.fedora.phx.redhat.com>

fab has set the watchcommits acl on sugar-imageviewer (Fedora 10) to Approved for erikos

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-imageviewer



From pkgdb at fedoraproject.org  Fri Jan 30 11:02:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 11:02:56 +0000
Subject: [pkgdb] sugar-terminal: fab has requested approveacls
Message-ID: <20090130110257.15515208484@bastion.fedora.phx.redhat.com>

fab has requested the approveacls acl on sugar-terminal (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-terminal



From pkgdb at fedoraproject.org  Fri Jan 30 11:02:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 11:02:57 +0000
Subject: [pkgdb] sugar-terminal: fab has requested approveacls
Message-ID: <20090130110257.F3322208493@bastion.fedora.phx.redhat.com>

fab has requested the approveacls acl on sugar-terminal (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-terminal



From pkgdb at fedoraproject.org  Fri Jan 30 11:04:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 11:04:08 +0000
Subject: [pkgdb] sugar-write: fab has requested watchbugzilla
Message-ID: <20090130110409.00B89208485@bastion.fedora.phx.redhat.com>

fab has requested the watchbugzilla acl 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  Fri Jan 30 11:04:15 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 11:04:15 +0000
Subject: [pkgdb] sugar-write: fab has requested watchcommits
Message-ID: <20090130110415.39E1E208493@bastion.fedora.phx.redhat.com>

fab has requested the watchcommits acl 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  Fri Jan 30 11:04:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 11:04:17 +0000
Subject: [pkgdb] sugar-write: fab has requested watchbugzilla
Message-ID: <20090130110417.90A49208496@bastion.fedora.phx.redhat.com>

fab has requested the watchbugzilla acl on sugar-write (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-write



From pkgdb at fedoraproject.org  Fri Jan 30 11:04:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 11:04:24 +0000
Subject: [pkgdb] sugar-write: fab has requested watchcommits
Message-ID: <20090130110424.2D7BE2084A7@bastion.fedora.phx.redhat.com>

fab has requested the watchcommits acl on sugar-write (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-write



From pkgdb at fedoraproject.org  Fri Jan 30 11:10:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 11:10:08 +0000
Subject: [pkgdb] WebKit: mso has requested watchcommits
Message-ID: <20090130111008.4D0EC208486@bastion.fedora.phx.redhat.com>

mso has requested the watchcommits acl on WebKit (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/WebKit



From pkgdb at fedoraproject.org  Fri Jan 30 11:10:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 11:10:21 +0000
Subject: [pkgdb] WebKit: mso has requested watchbugzilla
Message-ID: <20090130111021.C2AD42082A7@bastion.fedora.phx.redhat.com>

mso has requested the watchbugzilla acl on WebKit (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/WebKit



From pkgdb at fedoraproject.org  Fri Jan 30 11:10:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 11:10:10 +0000
Subject: [pkgdb] WebKit: mso has requested watchbugzilla
Message-ID: <20090130111010.F2A81208495@bastion.fedora.phx.redhat.com>

mso has requested the watchbugzilla acl on WebKit (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/WebKit



From pkgdb at fedoraproject.org  Fri Jan 30 11:10:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 11:10:30 +0000
Subject: [pkgdb] WebKit: mso has requested watchcommits
Message-ID: <20090130111030.F192E208486@bastion.fedora.phx.redhat.com>

mso has requested the watchcommits acl on WebKit (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/WebKit



From rjones at fedoraproject.org  Fri Jan 30 11:17:19 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Fri, 30 Jan 2009 11:17:19 +0000 (UTC)
Subject: rpms/mingw32-glib2/devel mingw32-glib2.spec,1.1,1.2
Message-ID: <20090130111719.A383070117@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/mingw32-glib2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19876

Modified Files:
	mingw32-glib2.spec 
Log Message:
Requires pkgconfig.


Index: mingw32-glib2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-glib2/devel/mingw32-glib2.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mingw32-glib2.spec	28 Jan 2009 11:49:11 -0000	1.1
+++ mingw32-glib2.spec	30 Jan 2009 11:16:49 -0000	1.2
@@ -6,7 +6,7 @@
 
 Name:           mingw32-glib2
 Version:        2.19.5
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        MinGW Windows GLib2 library
 
 License:        LGPLv2+
@@ -35,6 +35,9 @@
 # These are required for the glib-i386-atomic patch.
 BuildRequires:  autoconf, automake, libtool, gettext-devel, gtk-doc
 
+Requires:       pkgconfig
+
+
 %description
 MinGW Windows Glib2 library.
 
@@ -117,6 +120,9 @@
 
 
 %changelog
+* Fri Jan 30 2009 Richard W.M. Jones <rjones at redhat.com> - 2.19.5-3
+- Requires pkgconfig.
+
 * Fri Jan 23 2009 Richard W.M. Jones <rjones at redhat.com> - 2.19.5-2
 - Rebase to native Fedora version 2.19.5.
 - Use _smp_mflags.



From denis at fedoraproject.org  Fri Jan 30 11:17:14 2009
From: denis at fedoraproject.org (Denis Leroy)
Date: Fri, 30 Jan 2009 11:17:14 +0000 (UTC)
Subject: rpms/gstreamer-python/devel .cvsignore, 1.14,
	1.15 gstreamer-python.spec, 1.27, 1.28 sources, 1.14, 1.15
Message-ID: <20090130111714.A23F270117@cvs1.fedora.phx.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/gstreamer-python/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19826

Modified Files:
	.cvsignore gstreamer-python.spec sources 
Log Message:
Update to upstream 0.10.14, with various bug fixes. Removed problematic devel Provide


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamer-python/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	10 Jan 2009 10:47:50 -0000	1.14
+++ .cvsignore	30 Jan 2009 11:16:43 -0000	1.15
@@ -1 +1 @@
-gst-python-0.10.13.tar.bz2
+gst-python-0.10.14.tar.bz2


Index: gstreamer-python.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamer-python/devel/gstreamer-python.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- gstreamer-python.spec	10 Jan 2009 10:47:50 -0000	1.27
+++ gstreamer-python.spec	30 Jan 2009 11:16:43 -0000	1.28
@@ -1,7 +1,7 @@
 %define         majorminor      0.10
 
 Name:           gstreamer-python
-Version:        0.10.13
+Version:        0.10.14
 Release:        1%{?dist}
 Summary:        Python bindings for GStreamer
 
@@ -22,12 +22,9 @@
 # xwindowlistener needs X11 headers
 BuildRequires:  libX11-devel
 BuildRequires:  gstreamer-devel >= 0.10.12
-BuildRequires:  gstreamer-plugins-base-devel >= 0.10.12
+BuildRequires:  gstreamer-plugins-base-devel >= 0.10.22
 BuildRequires:  pygobject2-devel >= 2.11.2
 
-# no sense in splitting off a devel package just yet
-Provides:       gstreamer-python-devel = %{version}-%{release}
-
 
 %description
 This module contains a wrapper that allows GStreamer applications
@@ -92,6 +89,10 @@
 
 
 %changelog
+* Fri Jan 30 2009 Denis Leroy <denis at poolshark.org> - 0.10.14-1
+- Update to upstream 0.10.14, with various bug fixes
+- Removed problematic devel Provide
+
 * Sat Jan 10 2009 Denis Leroy <denis at poolshark.org> - 0.10.13-1
 - Update to upstraem 0.10.13
 - Forked devel package with pkgconfig file (#477310)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamer-python/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	10 Jan 2009 10:47:51 -0000	1.14
+++ sources	30 Jan 2009 11:16:43 -0000	1.15
@@ -1 +1 @@
-579f2026b128cbaec88b4e5209511070  gst-python-0.10.13.tar.bz2
+a2df4bc00c718ab9d1edda4429a58b9d  gst-python-0.10.14.tar.bz2



From lkundrak at fedoraproject.org  Fri Jan 30 11:28:07 2009
From: lkundrak at fedoraproject.org (Lubomir Rintel)
Date: Fri, 30 Jan 2009 11:28:07 +0000 (UTC)
Subject: rpms/gnumeric/EL-5 gnumeric-1.6.3-pypath.patch, NONE,
	1.1 gnumeric.spec, 1.25, 1.26
Message-ID: <20090130112807.ADA1370117@cvs1.fedora.phx.redhat.com>

Author: lkundrak

Update of /cvs/pkgs/rpms/gnumeric/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21995

Modified Files:
	gnumeric.spec 
Added Files:
	gnumeric-1.6.3-pypath.patch 
Log Message:
* Fri Jan 10 2009 Lubomir Rintel <lkundrak at v3.sk> 1:1.6.3-15.2
- Fix CVE-2009-0318 untrusted search path vulnerability


gnumeric-1.6.3-pypath.patch:

--- NEW FILE gnumeric-1.6.3-pypath.patch ---
Fix CVE-2009-0318 untrusted search path.

--- gnumeric-1.6.3/plugins/python-loader/gnm-py-interpreter.c.pypath	2009-01-30 10:28:27.000000000 +0100
+++ gnumeric-1.6.3/plugins/python-loader/gnm-py-interpreter.c	2009-01-30 10:28:49.000000000 +0100
@@ -101,6 +101,7 @@
 	interpreter->plugin = plugin;
 
 	PySys_SetArgv (G_N_ELEMENTS (plugin_argv) - 1, plugin_argv);
+	PyRun_SimpleString("import sys; sys.path = filter(None, sys.path)");
 	py_initgnumeric (interpreter); 
 
 	return interpreter;


Index: gnumeric.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnumeric/EL-5/gnumeric.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- gnumeric.spec	23 Sep 2008 08:23:04 -0000	1.25
+++ gnumeric.spec	30 Jan 2009 11:27:36 -0000	1.26
@@ -1,7 +1,7 @@
 Name:             gnumeric
 Epoch:            1
 Version:          1.6.3
-Release:          15%{?dist}.1
+Release:          15%{?dist}.2
 Summary:          Spreadsheet program for GNOME
 Group:            Applications/Productivity
 # bug filed upstream about this being GPL v2 only:
@@ -16,6 +16,7 @@
 Patch4:           gnumeric-1.6.3-gpl-md5.patch
 Patch5:           gnumeric-1.6.3-stf-parse.patch
 Patch6:           gnumeric-1.6.3-excel-overflow.patch
+Patch7:           gnumeric-1.6.3-pypath.patch
 BuildRoot:        %{_tmppath}/%{name}-%{version}-root
 BuildRequires:    libgnomeui-devel >= 2.4.0
 BuildRequires:    libgnomeprintui22-devel >= 2.8.2
@@ -56,6 +57,7 @@
 %patch4 -p1 -b .gpl-md5
 %patch5 -p1 -b .csv
 %patch6 -p1 -b .excel
+%patch7 -p1 -b .pypath
 chmod -x plugins/excel/rc4.?
 
 
@@ -174,6 +176,9 @@
 
 
 %changelog
+* Fri Jan 10 2009 Lubomir Rintel <lkundrak at v3.sk> 1:1.6.3-15.2
+- Fix CVE-2009-0318 untrusted search path vulnerability
+
 * 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



From pmatilai at fedoraproject.org  Fri Jan 30 11:29:05 2009
From: pmatilai at fedoraproject.org (Panu Matilainen)
Date: Fri, 30 Jan 2009 11:29:05 +0000 (UTC)
Subject: rpms/rpm/devel .cvsignore, 1.31, 1.32 rpm.spec, 1.317, 1.318 sources,
	1.137, 1.138
Message-ID: <20090130112905.DBA3070117@cvs1.fedora.phx.redhat.com>

Author: pmatilai

Update of /cvs/pkgs/rpms/rpm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22179

Modified Files:
	.cvsignore rpm.spec sources 
Log Message:
- update to 4.6.0-rc4
- fixes #475582, #478907, #476737, #479869, #476201



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rpm/devel/.cvsignore,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- .cvsignore	9 Dec 2008 13:28:07 -0000	1.31
+++ .cvsignore	30 Jan 2009 11:28:35 -0000	1.32
@@ -1 +1 @@
-rpm-4.6.0-rc3.tar.bz2
+rpm-4.6.0-rc4.tar.bz2


Index: rpm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rpm/devel/rpm.spec,v
retrieving revision 1.317
retrieving revision 1.318
diff -u -r1.317 -r1.318
--- rpm.spec	12 Dec 2008 18:54:23 -0000	1.317
+++ rpm.spec	30 Jan 2009 11:28:35 -0000	1.318
@@ -10,7 +10,7 @@
 %define rpmhome /usr/lib/rpm
 
 %define rpmver 4.6.0
-%define snapver rc3
+%define snapver rc4
 %define srcver %{rpmver}-%{snapver}
 
 %define bdbver 4.5.20
@@ -18,7 +18,7 @@
 Summary: The RPM package management system
 Name: rpm
 Version: %{rpmver}
-Release: 0.%{snapver}.2%{?dist}
+Release: 0.%{snapver}.1%{?dist}
 Group: System Environment/Base
 Url: http://www.rpm.org/
 Source0: http://rpm.org/releases/testing/%{name}-%{srcver}.tar.bz2
@@ -357,6 +357,10 @@
 %doc doc/librpm/html/*
 
 %changelog
+* Fri Jan 30 2009 Panu Matilainen <pmatilai at redhat.com> - 4.6.0-0.rc4.1
+- update to 4.6.0-rc4
+- fixes #475582, #478907, #476737, #479869, #476201
+
 * Fri Dec 12 2008 Panu Matilainen <pmatilai at redhat.com> - 4.6.0-0.rc3.2
 - add back defaultdocdir patch which hadn't been applied on 4.6.x branch yet
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rpm/devel/sources,v
retrieving revision 1.137
retrieving revision 1.138
diff -u -r1.137 -r1.138
--- sources	9 Dec 2008 13:28:08 -0000	1.137
+++ sources	30 Jan 2009 11:28:35 -0000	1.138
@@ -1 +1 @@
-8f4f5f8a05fa4f4dfe34119d1059d3ce  rpm-4.6.0-rc3.tar.bz2
+ad3d374efb26e4d22ff1d27dc3d399ab  rpm-4.6.0-rc4.tar.bz2



From pkgdb at fedoraproject.org  Fri Jan 30 11:33:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 11:33:52 +0000
Subject: [pkgdb] ruby: tagoh has requested watchcommits
Message-ID: <20090130113352.B7160208484@bastion.fedora.phx.redhat.com>

tagoh has requested the watchcommits acl on ruby (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ruby



From pkgdb at fedoraproject.org  Fri Jan 30 11:33:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 11:33:53 +0000
Subject: [pkgdb] ruby: tagoh has requested commit
Message-ID: <20090130113355.BA5D2208494@bastion.fedora.phx.redhat.com>

tagoh has requested the commit acl on ruby (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ruby



From pkgdb at fedoraproject.org  Fri Jan 30 11:33:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 11:33:55 +0000
Subject: [pkgdb] ruby: tagoh has requested watchbugzilla
Message-ID: <20090130113356.9F8D72084B6@bastion.fedora.phx.redhat.com>

tagoh has requested the watchbugzilla acl on ruby (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ruby



From pkgdb at fedoraproject.org  Fri Jan 30 11:33:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 11:33:55 +0000
Subject: [pkgdb] ruby: tagoh has requested approveacls
Message-ID: <20090130113356.A43EA2084B7@bastion.fedora.phx.redhat.com>

tagoh has requested the approveacls acl on ruby (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ruby



From dnielsen at fedoraproject.org  Fri Jan 30 11:33:58 2009
From: dnielsen at fedoraproject.org (David Nielsen)
Date: Fri, 30 Jan 2009 11:33:58 +0000 (UTC)
Subject: rpms/banshee-mirage/F-10 banshee-mirage.spec, NONE, 1.1 import.log, 
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090130113358.4F93B70117@cvs1.fedora.phx.redhat.com>

Author: dnielsen

Update of /cvs/pkgs/rpms/banshee-mirage/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23695/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	banshee-mirage.spec import.log 
Log Message:
Import 0.4.0



--- NEW FILE banshee-mirage.spec ---
%define         debug_package %{nil}

Name:		banshee-mirage
Version:	0.4.0
Release:	4%{?dist}
Summary:	An Automatic Playlist Generation Extension for Banshee
Group:		Applications/Multimedia
License:	GPLv2+
URL:		http://hop.at/mirage/
Source0:	http://hop.at/mirage/download/mirage-%{version}.tar.gz
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:	gettext-devel, glib2-devel, mono-devel, banshee-devel, banshee-musicbrainz-devel, fftw-devel, libsamplerate-devel, intltool, taglib-sharp-devel, mono-addins-devel, sqlite-devel, gstreamer-devel, gstreamer-plugins-base-devel, make, ndesk-dbus-glib-devel, ndesk-dbus-devel, gtk-sharp2-devel

# Bug 241850 - no Mono on pp64
ExclusiveArch: %ix86 x86_64 ppc ia64 armv4l sparc alpha

%description
An Automatic Playlist Generation Extension for Banshee

%prep
%setup -q -n mirage-%{version}

%build
%configure
make %{?_smp_mflags}

%install
%{__rm} -rf %{buildroot}
make DESTDIR=%{buildroot} install

# clean up
find %{buildroot} -name '*.la' -exec rm -f {} ';'
find %{buildroot} -name '*.a' -exec rm -f {} ';'

strip --strip-unneeded %{buildroot}/%{_libdir}/libmirageaudio.so

%find_lang Mirage

%clean
%{__rm} -rf %{buildroot}

%files -f Mirage.lang
%defattr(-,root,root,-)
%doc COPYING README
%{_libdir}/banshee-1/Extensions/Banshee.Mirage.*
%{_libdir}/banshee-1/Extensions/Mirage.*
%{_libdir}/libmirageaudio.so

%changelog
* Wed Jan 28 2009 David Nielsen <gnomeuser at gmail.com> 0.4.0-4
- strip unneeded symbols from libmirageaudio.so

* Wed Jan 28 2009 David Nielsen <gnomeuser at gmail.com> 0.4.0-3
- rename package to banshee-mirage

* Wed Jan 28 2009 David Nielsen <gnomeuser at gmail.com> 0.4.0-2
- Review cleanups

* Wed Jan 28 2009 David Nielsen <gnomeuser at gmail.com> 0.4.0-1
- Initial package


--- NEW FILE import.log ---
banshee-mirage-0_4_0-4_fc10:F-10:banshee-mirage-0.4.0-4.fc10.src.rpm:1233314753


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/banshee-mirage/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	30 Jan 2009 06:21:49 -0000	1.1
+++ .cvsignore	30 Jan 2009 11:33:27 -0000	1.2
@@ -0,0 +1 @@
+mirage-0.4.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/banshee-mirage/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	30 Jan 2009 06:21:49 -0000	1.1
+++ sources	30 Jan 2009 11:33:27 -0000	1.2
@@ -0,0 +1 @@
+7ebb939d44b64667eaa90ab1ef9a2220  mirage-0.4.0.tar.gz



From pkgdb at fedoraproject.org  Fri Jan 30 11:34:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 11:34:01 +0000
Subject: [pkgdb] ruby: tagoh has requested watchbugzilla
Message-ID: <20090130113402.0945220860C@bastion.fedora.phx.redhat.com>

tagoh has requested the watchbugzilla acl on ruby (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ruby



From pkgdb at fedoraproject.org  Fri Jan 30 11:34:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 11:34:04 +0000
Subject: [pkgdb] ruby: tagoh has requested commit
Message-ID: <20090130113404.A334D208610@bastion.fedora.phx.redhat.com>

tagoh has requested the commit acl on ruby (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ruby



From pkgdb at fedoraproject.org  Fri Jan 30 11:34:02 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 11:34:02 +0000
Subject: [pkgdb] ruby: tagoh has requested watchcommits
Message-ID: <20090130113402.69F2A20860F@bastion.fedora.phx.redhat.com>

tagoh has requested the watchcommits acl on ruby (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ruby



From pkgdb at fedoraproject.org  Fri Jan 30 11:34:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 11:34:06 +0000
Subject: [pkgdb] ruby: tagoh has requested approveacls
Message-ID: <20090130113406.CC73A208679@bastion.fedora.phx.redhat.com>

tagoh has requested the approveacls acl on ruby (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ruby



From pkgdb at fedoraproject.org  Fri Jan 30 11:34:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 11:34:11 +0000
Subject: [pkgdb] ruby: tagoh has requested watchbugzilla
Message-ID: <20090130113411.97FE32086F7@bastion.fedora.phx.redhat.com>

tagoh has requested the watchbugzilla acl on ruby (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ruby



From pkgdb at fedoraproject.org  Fri Jan 30 11:34:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 11:34:12 +0000
Subject: [pkgdb] ruby: tagoh has requested watchcommits
Message-ID: <20090130113412.6E7C5208739@bastion.fedora.phx.redhat.com>

tagoh has requested the watchcommits acl on ruby (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ruby



From pkgdb at fedoraproject.org  Fri Jan 30 11:34:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 11:34:14 +0000
Subject: [pkgdb] ruby: tagoh has requested commit
Message-ID: <20090130113414.98F15208742@bastion.fedora.phx.redhat.com>

tagoh has requested the commit acl on ruby (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ruby



From pkgdb at fedoraproject.org  Fri Jan 30 11:34:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 11:34:19 +0000
Subject: [pkgdb] ruby: tagoh has requested approveacls
Message-ID: <20090130113420.6E38C208748@bastion.fedora.phx.redhat.com>

tagoh has requested the approveacls acl on ruby (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ruby



From pkgdb at fedoraproject.org  Fri Jan 30 11:38:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 11:38:32 +0000
Subject: [pkgdb] mew ownership updated
Message-ID: <20090130113832.B2B3B208484@bastion.fedora.phx.redhat.com>

Package mew in Fedora devel was orphaned by tagoh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mew



From pkgdb at fedoraproject.org  Fri Jan 30 11:38:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 11:38:37 +0000
Subject: [pkgdb] mew ownership updated
Message-ID: <20090130113837.9E0BD208486@bastion.fedora.phx.redhat.com>

Package mew in Fedora 9 was orphaned by tagoh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mew



From pkgdb at fedoraproject.org  Fri Jan 30 11:38:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 11:38:38 +0000
Subject: [pkgdb] mew ownership updated
Message-ID: <20090130113838.4190E208494@bastion.fedora.phx.redhat.com>

Package mew in Fedora 10 was orphaned by tagoh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mew



From pkgdb at fedoraproject.org  Fri Jan 30 11:39:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 11:39:06 +0000
Subject: [pkgdb] mew ownership updated
Message-ID: <20090130113906.49505208486@bastion.fedora.phx.redhat.com>

Package mew in Fedora 7 was orphaned by tagoh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mew



From pkgdb at fedoraproject.org  Fri Jan 30 11:39:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 11:39:07 +0000
Subject: [pkgdb] mew ownership updated
Message-ID: <20090130113907.728DD208494@bastion.fedora.phx.redhat.com>

Package mew in Fedora 6 was orphaned by tagoh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mew



From pkgdb at fedoraproject.org  Fri Jan 30 11:39:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 11:39:09 +0000
Subject: [pkgdb] mew ownership updated
Message-ID: <20090130113910.200EF208496@bastion.fedora.phx.redhat.com>

Package mew in Fedora 5 was orphaned by tagoh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mew



From pkgdb at fedoraproject.org  Fri Jan 30 11:39:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 11:39:11 +0000
Subject: [pkgdb] mew ownership updated
Message-ID: <20090130113912.282282084A7@bastion.fedora.phx.redhat.com>

Package mew in Fedora 8 was orphaned by tagoh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mew



From pkgdb at fedoraproject.org  Fri Jan 30 11:39:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 11:39:11 +0000
Subject: [pkgdb] mew ownership updated
Message-ID: <20090130113912.71DFF2084B7@bastion.fedora.phx.redhat.com>

Package mew in Fedora 4 was orphaned by tagoh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mew



From rjones at fedoraproject.org  Fri Jan 30 11:48:41 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Fri, 30 Jan 2009 11:48:41 +0000 (UTC)
Subject: rpms/mingw32-pixman/devel import.log, NONE,
	1.1 make-pixman-snapshot.sh, NONE, 1.1 mingw32-pixman.spec, NONE,
	1.1 pixman-0.13.2-license.patch, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090130114841.1CF0770117@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/mingw32-pixman/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27038/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log make-pixman-snapshot.sh mingw32-pixman.spec 
	pixman-0.13.2-license.patch 
Log Message:
Initial import.



--- NEW FILE import.log ---
mingw32-pixman-0_13_2-2_fc11:HEAD:mingw32-pixman-0.13.2-2.fc11.src.rpm:1233315903


--- NEW FILE make-pixman-snapshot.sh ---
#!/bin/sh

DIRNAME=pixman-$( date +%Y%m%d )

rm -rf $DIRNAME
git clone git://git.freedesktop.org/git/pixman $DIRNAME
cd $DIRNAME
if [ -z "$1" ]; then
    git log | head -1
else
    git checkout $1
fi
rm -rf .git
cd ..
tar jcf $DIRNAME.tar.bz2 $DIRNAME
rm -rf $DIRNAME


--- NEW FILE mingw32-pixman.spec ---
%define __strip %{_mingw32_strip}
%define __objdump %{_mingw32_objdump}
%define _use_internal_dependency_generator 0
%define __find_requires %{_mingw32_findrequires}
%define __find_provides %{_mingw32_findprovides}

Name:           mingw32-pixman
Version:        0.13.2
Release:        2%{?dist}
Summary:        MinGW Windows Pixman library

License:        MIT
URL:            http://xorg.freedesktop.org/
Group:          Development/Libraries

Source0:        http://xorg.freedesktop.org/archive/individual/lib/pixman-%{version}.tar.gz
Source1:        make-pixman-snapshot.sh

Patch0:         pixman-0.13.2-license.patch

BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch

BuildRequires:  mingw32-filesystem >= 23
BuildRequires:  mingw32-gcc
BuildRequires:  mingw32-binutils
BuildRequires:  mingw32-dlfcn

Requires:       pkgconfig

%description
MinGW Windows Pixman library.


%prep
%setup -q -n pixman-%{version}
%patch0 -p1


%build
# Uses GTK for its testsuite, so disable this otherwise
# we have a chicken & egg problem on mingw
%{_mingw32_configure} --disable-gtk --disable-static
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT

make DESTDIR=$RPM_BUILD_ROOT install


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root)
%doc LICENSE
%{_mingw32_bindir}/libpixman-1-0.dll
%{_mingw32_includedir}/pixman-1
%{_mingw32_libdir}/libpixman-1.dll.a
%{_mingw32_libdir}/libpixman-1.la
%{_mingw32_libdir}/pkgconfig/pixman-1.pc


%changelog
* Thu Jan 15 2009 Richard W.M. Jones <rjones at redhat.com> - 0.13.2-2
- Include LICENSE file (freedesktop bug 19582).

* Tue Jan 13 2009 Richard W.M. Jones <rjones at redhat.com> - 0.13.2-1
- Resynch with Fedora package (0.13.2).
- Disable static library for speed.
- Use _smp_mflags.
- Requires pkgconfig.
- Depends on dlfcn.

* Wed Sep 24 2008 Richard W.M. Jones <rjones at redhat.com> - 0.12.0-2
- Rename mingw -> mingw32.

* Mon Sep 22 2008 Daniel P. Berrange <berrange at redhat.com> - 0.12.0-1
- Update to 0.12.0 release

* Wed Sep 10 2008 Richard W.M. Jones <rjones at redhat.com> - 0.11.10-2
- Remove static library.

* Tue Sep  9 2008 Daniel P. Berrange <berrange at redhat.com> - 0.11.10-1
- Initial RPM release

pixman-0.13.2-license.patch:

--- NEW FILE pixman-0.13.2-license.patch ---
diff -urN pixman-0.13.2.orig/LICENSE pixman-0.13.2/LICENSE
--- pixman-0.13.2.orig/LICENSE	1970-01-01 01:00:00.000000000 +0100
+++ pixman-0.13.2/LICENSE	2009-01-15 13:14:47.000000000 +0000
@@ -0,0 +1,23 @@
+ Copyright ?? 2000 Keith Packard, member of The XFree86 Project, Inc.
+             2005 Lars Knoll & Zack Rusin, Trolltech
+             2008 Aaron Plattner, NVIDIA Corporation
+
+ 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 Keith Packard not be used in
+ advertising or publicity pertaining to distribution of the software without
+ specific, written prior permission.  Keith Packard makes 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.
+


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-pixman/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	29 Jan 2009 00:22:39 -0000	1.1
+++ .cvsignore	30 Jan 2009 11:48:10 -0000	1.2
@@ -0,0 +1 @@
+pixman-0.13.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-pixman/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	29 Jan 2009 00:22:39 -0000	1.1
+++ sources	30 Jan 2009 11:48:10 -0000	1.2
@@ -0,0 +1 @@
+837df4a02c61a60a880644393b57faed  pixman-0.13.2.tar.gz



From rjones at fedoraproject.org  Fri Jan 30 11:48:56 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Fri, 30 Jan 2009 11:48:56 +0000 (UTC)
Subject: rpms/mingw32-libjpeg/devel configure.in, NONE, 1.1 import.log, NONE,
	1.1 jpeg-c++.patch, NONE, 1.1 jpeg-mingw32.patch, NONE,
	1.1 libjpeg-autoconf.patch, NONE, 1.1 libjpeg-buf-oflo.patch,
	NONE, 1.1 libjpeg-cflags.patch, NONE, 1.1 mingw32-libjpeg.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090130114856.DA2B770117@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/mingw32-libjpeg/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27363/devel

Modified Files:
	.cvsignore sources 
Added Files:
	configure.in import.log jpeg-c++.patch jpeg-mingw32.patch 
	libjpeg-autoconf.patch libjpeg-buf-oflo.patch 
	libjpeg-cflags.patch mingw32-libjpeg.spec 
Log Message:
Initial import.



--- NEW FILE configure.in ---
dnl IJG auto-configuration source file.
dnl Process this file with autoconf to produce a configure script.
AC_INIT(jcmaster.c)
AC_CONFIG_HEADER(jconfig.h:jconfig.cfg)
dnl
dnl do these first since other macros rely on them
AC_PROG_CC
AC_PROG_CPP
dnl
dnl See if compiler supports prototypes.
AC_MSG_CHECKING(for function prototypes)
AC_CACHE_VAL(ijg_cv_have_prototypes,
[AC_TRY_COMPILE([
int testfunction (int arg1, int * arg2); /* check prototypes */
struct methods_struct {		/* check method-pointer declarations */
  int (*error_exit) (char *msgtext);
  int (*trace_message) (char *msgtext);
  int (*another_method) (void);
};
int testfunction (int arg1, int * arg2) /* check definitions */
{ return arg2[arg1]; }
int test2function (void)	/* check void arg list */
{ return 0; }
], [ ], ijg_cv_have_prototypes=yes, ijg_cv_have_prototypes=no)])
AC_MSG_RESULT($ijg_cv_have_prototypes)
if test $ijg_cv_have_prototypes = yes; then
  AC_DEFINE(HAVE_PROTOTYPES,1)
else
  echo Your compiler does not seem to know about function prototypes.
  echo Perhaps it needs a special switch to enable ANSI C mode.
  echo If so, we recommend running configure like this:
  echo "   ./configure  CC='cc -switch'"
  echo where -switch is the proper switch.
fi
dnl
dnl check header files
AC_CHECK_HEADER(stddef.h, AC_DEFINE(HAVE_STDDEF_H,1))
AC_CHECK_HEADER(stdlib.h, AC_DEFINE(HAVE_STDLIB_H,1))
AC_CHECK_HEADER(string.h,, AC_DEFINE(NEED_BSD_STRINGS,1))
dnl See whether type size_t is defined in any ANSI-standard places;
dnl if not, perhaps it is defined in <sys/types.h>.
AC_MSG_CHECKING(for size_t)
AC_TRY_COMPILE([
#ifdef HAVE_STDDEF_H
#include <stddef.h>
#endif
#ifdef HAVE_STDLIB_H
#include <stdlib.h>
#endif
#include <stdio.h>
#ifdef NEED_BSD_STRINGS
#include <strings.h>
#else
#include <string.h>
#endif
typedef size_t my_size_t;
], [ my_size_t foovar; ], ijg_size_t_ok=yes,
[ijg_size_t_ok="not ANSI, perhaps it is in sys/types.h"])
AC_MSG_RESULT($ijg_size_t_ok)
if test "$ijg_size_t_ok" != yes; then
AC_CHECK_HEADER(sys/types.h, [AC_DEFINE(NEED_SYS_TYPES_H,1)
AC_EGREP_CPP(size_t, [#include <sys/types.h>],
[ijg_size_t_ok="size_t is in sys/types.h"], ijg_size_t_ok=no)],
ijg_size_t_ok=no)
AC_MSG_RESULT($ijg_size_t_ok)
if test "$ijg_size_t_ok" = no; then
  echo Type size_t is not defined in any of the usual places.
  echo Try putting '"typedef unsigned int size_t;"' in jconfig.h.
fi
fi
dnl
dnl check compiler characteristics
AC_MSG_CHECKING(for type unsigned char)
AC_TRY_COMPILE(, [ unsigned char un_char; ],
[AC_MSG_RESULT(yes)
AC_DEFINE(HAVE_UNSIGNED_CHAR,1)], AC_MSG_RESULT(no))
AC_MSG_CHECKING(for type unsigned short)
AC_TRY_COMPILE(, [ unsigned short un_short; ],
[AC_MSG_RESULT(yes)
AC_DEFINE(HAVE_UNSIGNED_SHORT,1)], AC_MSG_RESULT(no))
AC_MSG_CHECKING(for type void)
AC_TRY_COMPILE([
/* Caution: a C++ compiler will insist on valid prototypes */
typedef void * void_ptr;	/* check void * */
#ifdef HAVE_PROTOTYPES		/* check ptr to function returning void */
typedef void (*void_func) (int a, int b);
#else
typedef void (*void_func) ();
#endif

#ifdef HAVE_PROTOTYPES		/* check void function result */
void test3function (void_ptr arg1, void_func arg2)
#else
void test3function (arg1, arg2)
     void_ptr arg1;
     void_func arg2;
#endif
{
  char * locptr = (char *) arg1; /* check casting to and from void * */
  arg1 = (void *) locptr;
  (*arg2) (1, 2);		/* check call of fcn returning void */
}
], [ ], AC_MSG_RESULT(yes), [AC_MSG_RESULT(no)
AC_DEFINE(void,char)])

AC_C_CONST
dnl check for non-broken inline under various spellings
AC_MSG_CHECKING(for inline)
ijg_cv_inline=""
AC_TRY_COMPILE(, [} __inline__ int foo() { return 0; }
int bar() { return foo();], ijg_cv_inline="__inline__",
AC_TRY_COMPILE(, [} __inline int foo() { return 0; }
int bar() { return foo();], ijg_cv_inline="__inline",
AC_TRY_COMPILE(, [} inline int foo() { return 0; }
int bar() { return foo();], ijg_cv_inline="inline")))
AC_MSG_RESULT($ijg_cv_inline)
AC_DEFINE_UNQUOTED(INLINE,$ijg_cv_inline)
dnl we cannot check for bogus warnings, but at least we can check for errors
AC_MSG_CHECKING(for broken incomplete types)
AC_TRY_COMPILE([ typedef struct undefined_structure * undef_struct_ptr; ], ,
AC_MSG_RESULT(ok),
[AC_MSG_RESULT(broken)
AC_DEFINE(INCOMPLETE_TYPES_BROKEN,1)])
dnl test whether global names are unique to at least 15 chars
AC_MSG_CHECKING(for short external names)
AC_TRY_LINK([
int possibly_duplicate_function () { return 0; }
int possibly_dupli_function () { return 1; }
], [ ], AC_MSG_RESULT(ok), [AC_MSG_RESULT(short)
AC_DEFINE(NEED_SHORT_EXTERNAL_NAMES,1)])
dnl
dnl run-time checks
AC_MSG_CHECKING(to see if char is signed)
AC_TRY_RUN([
#ifdef HAVE_PROTOTYPES
int is_char_signed (int arg)
#else
int is_char_signed (arg)
     int arg;
#endif
{
  if (arg == 189) {		/* expected result for unsigned char */
    return 0;			/* type char is unsigned */
  }
  else if (arg != -67) {	/* expected result for signed char */
    printf("Hmm, it seems 'char' is not eight bits wide on your machine.\n");
    printf("I fear the JPEG software will not work at all.\n\n");
  }
  return 1;			/* assume char is signed otherwise */
}
char signed_char_check = (char) (-67);
int main() {
  exit(is_char_signed((int) signed_char_check));
}], [AC_MSG_RESULT(no)
AC_DEFINE(CHAR_IS_UNSIGNED,1)], AC_MSG_RESULT(yes),
[echo Assuming that char is signed on target machine.
echo If it is unsigned, this will be a little bit inefficient.
])
dnl
AC_MSG_CHECKING(to see if right shift is signed)
AC_TRY_RUN([
#ifdef HAVE_PROTOTYPES
int is_shifting_signed (long arg)
#else
int is_shifting_signed (arg)
     long arg;
#endif
/* See whether right-shift on a long is signed or not. */
{
  long res = arg >> 4;

  if (res == -0x7F7E80CL) {	/* expected result for signed shift */
    return 1;			/* right shift is signed */
  }
  /* see if unsigned-shift hack will fix it. */
  /* we can't just test exact value since it depends on width of long... */
  res |= (~0L) << (32-4);
  if (res == -0x7F7E80CL) {	/* expected result now? */
    return 0;			/* right shift is unsigned */
  }
  printf("Right shift isn't acting as I expect it to.\n");
  printf("I fear the JPEG software will not work at all.\n\n");
  return 0;			/* try it with unsigned anyway */
}
int main() {
  exit(is_shifting_signed(-0x7F7E80B1L));
}], [AC_MSG_RESULT(no)
AC_DEFINE(RIGHT_SHIFT_IS_UNSIGNED,1)], AC_MSG_RESULT(yes),
AC_MSG_RESULT(Assuming that right shift is signed on target machine.))
dnl
AC_MSG_CHECKING(to see if fopen accepts b spec)
AC_TRY_RUN([
#include <stdio.h>
int main() {
  if (fopen("conftestdata", "wb") != NULL)
    exit(0);
  exit(1);
}], AC_MSG_RESULT(yes), [AC_MSG_RESULT(no)
AC_DEFINE(DONT_USE_B_MODE,1)],
AC_MSG_RESULT(Assuming that it does.))
dnl
dnl system services
AC_PROG_INSTALL
AC_PROG_RANLIB

# Decide whether to use libtool,
# and if so whether to build shared, static, or both flavors of library.
AC_DISABLE_SHARED
AC_DISABLE_STATIC
if test "x$enable_shared" != xno  -o  "x$enable_static" != xno; then
  USELIBTOOL="yes"

  # Configure libtool.
  AC_PROG_LIBTOOL

  LIBTOOL="./libtool"
  O="lo"
  A="la"
  LN='$(LIBTOOL) --mode=link $(CC)'
  INSTALL_LIB='$(LIBTOOL) --mode=install ${INSTALL}'
  INSTALL_PROGRAM="\$(LIBTOOL) --mode=install $INSTALL_PROGRAM"
else
  USELIBTOOL="no"
  LIBTOOL=""
  O="o"
  A="a"
  LN='$(CC)'
  INSTALL_LIB="$INSTALL_DATA"
fi
AC_SUBST(LIBTOOL)
AC_SUBST(O)
AC_SUBST(A)
AC_SUBST(LN)
AC_SUBST(INSTALL_LIB)

# Select memory manager depending on user input.
# If no "-enable-maxmem", use jmemnobs
MEMORYMGR='jmemnobs.$(O)'
MAXMEM="no"
AC_ARG_ENABLE(maxmem,
[  --enable-maxmem[=N]     enable use of temp files, set max mem usage to N MB],
MAXMEM="$enableval")
dnl [# support --with-maxmem for backwards compatibility with IJG V5.]
dnl AC_ARG_WITH(maxmem, , MAXMEM="$withval")
if test "x$MAXMEM" = xyes; then
  MAXMEM=1
fi
if test "x$MAXMEM" != xno; then
changequote(, )dnl
  if test -n "`echo $MAXMEM | sed 's/[0-9]//g'`"; then
changequote([, ])dnl
    AC_MSG_ERROR(non-numeric argument to --enable-maxmem)
  fi
  DEFAULTMAXMEM=`expr $MAXMEM \* 1048576`
AC_DEFINE_UNQUOTED(DEFAULT_MAX_MEM, ${DEFAULTMAXMEM})
AC_MSG_CHECKING([for 'tmpfile()'])
AC_TRY_LINK([#include <stdio.h>], [ FILE * tfile = tmpfile(); ],
[AC_MSG_RESULT(yes)
MEMORYMGR='jmemansi.$(O)'],
[AC_MSG_RESULT(no)
dnl if tmpfile is not present, must use jmemname.
MEMORYMGR='jmemname.$(O)'
AC_DEFINE(NEED_SIGNAL_CATCHER,1)
AC_MSG_CHECKING([for 'mktemp()'])
AC_TRY_LINK(, [ char fname[80]; mktemp(fname); ], AC_MSG_RESULT(yes),
[AC_MSG_RESULT(no)
AC_DEFINE(NO_MKTEMP,1)])])
fi
AC_SUBST(MEMORYMGR)

# Include PNG support in cjpeg/djpeg if appropriate.
AC_ARG_WITH(png,
[  --with-png              enable PNG support in cjpeg/djpeg],
[#], [with_png="maybe"])

# try to detect whether libpng is present
if test "x$with_png" = xmaybe ; then
  AC_CHECK_HEADER(png.h, [: ok so far], [with_png="no"])
fi
if test "x$with_png" = xmaybe ; then
  AC_CHECK_HEADER(zlib.h, [: ok so far], [with_png="no"])
fi
if test "x$with_png" = xmaybe ; then
  AC_CHECK_LIB(z, deflate, [: ok so far], [with_png="no"])
fi
if test "x$with_png" = xmaybe ; then
  AC_CHECK_LIB(png, png_create_info_struct,
	[with_png="yes"], [with_png="no"], [-lz -lm])
fi

if test "x$with_png" = xyes ; then
  AC_DEFINE(PNG_SUPPORTED,1)
  LIBS="-lpng -lz -lm $LIBS"
fi

# Extract the library version ID from jpeglib.h.
AC_MSG_CHECKING([libjpeg version number])
[JPEG_LIB_VERSION=`sed -e '/^#define JPEG_LIB_VERSION/!d' -e 's/^[^0-9]*\([0-9][0-9]*\).*$/\1/' $srcdir/jpeglib.h`]
AC_MSG_RESULT($JPEG_LIB_VERSION)
AC_SUBST(JPEG_LIB_VERSION)

# Prepare to massage makefile.cfg correctly.
if test $ijg_cv_have_prototypes = yes; then
  A2K_DEPS=""
  COM_A2K="# "
else
  A2K_DEPS="ansi2knr"
  COM_A2K=""
fi
AC_SUBST(A2K_DEPS)
AC_SUBST(COM_A2K)
# ansi2knr needs -DBSD if string.h is missing
if test $ac_cv_header_string_h = no; then
  ANSI2KNRFLAGS="-DBSD"
else
  ANSI2KNRFLAGS=""
fi
AC_SUBST(ANSI2KNRFLAGS)
dnl
# Substitutions to enable or disable libtool-related stuff
if test $USELIBTOOL = yes -a $ijg_cv_have_prototypes = yes; then
  COM_LT=""
else
  COM_LT="# "
fi
AC_SUBST(COM_LT)
if test "x$enable_shared" != xno; then
  FORCE_INSTALL_LIB="install-lib"
else
  FORCE_INSTALL_LIB=""
fi
AC_SUBST(FORCE_INSTALL_LIB)
dnl
# Set up -I directives
if test "x$srcdir" = x.; then
  INCLUDEFLAGS='-I$(srcdir)'
else
  if test "x$GCC" = xyes; then
    INCLUDEFLAGS='-I- -I. -I$(srcdir)'
  else
    INCLUDEFLAGS='-I. -I$(srcdir)'
  fi
fi
AC_SUBST(INCLUDEFLAGS)
dnl
AC_OUTPUT(Makefile:makefile.cfg)


--- NEW FILE import.log ---
mingw32-libjpeg-6b-8_fc11:HEAD:mingw32-libjpeg-6b-8.fc11.src.rpm:1233315908

jpeg-c++.patch:

--- NEW FILE jpeg-c++.patch ---
--- jpeg-6b/jpeglib.h.c++	Sat Jun 17 21:58:15 2000
+++ jpeg-6b/jpeglib.h	Sat Jun 17 21:58:53 2000
@@ -13,6 +13,10 @@
 #ifndef JPEGLIB_H
 #define JPEGLIB_H
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /*
  * First we include the configuration files that record how this
  * installation of the JPEG library is set up.  jconfig.h can be
@@ -1091,6 +1095,10 @@
 #ifdef JPEG_INTERNALS
 #include "jpegint.h"		/* fetch private declarations */
 #include "jerror.h"		/* fetch error codes too */
+#endif
+
+#ifdef __cplusplus
+}
 #endif
 
 #endif /* JPEGLIB_H */

jpeg-mingw32.patch:

--- NEW FILE jpeg-mingw32.patch ---
diff -rup jpeg-6b/makefile.cfg jpeg-6b.new/makefile.cfg
--- jpeg-6b/makefile.cfg	2008-09-09 09:54:38.000000000 -0400
+++ jpeg-6b.new/makefile.cfg	2008-09-09 09:55:03.000000000 -0400
@@ -169,7 +169,7 @@ libjpeg.a: @A2K_DEPS@ $(LIBOBJECTS)
 # with libtool:
 libjpeg.la: @A2K_DEPS@ $(LIBOBJECTS)
 	$(LIBTOOL) --mode=link $(CC) $(CFLAGS) -o libjpeg.la $(LIBOBJECTS) \
-		-rpath $(libdir) -version-info $(JPEG_LIB_VERSION)
+		-no-undefined -rpath $(libdir) -version-info $(JPEG_LIB_VERSION)
 
 # sample programs:
 

libjpeg-autoconf.patch:

--- NEW FILE libjpeg-autoconf.patch ---
Work around bogosity in autoconf-2.62: it breaks #undef's that have a
comment after them, a construct that has worked fine in every previous
autoconf release.  See bz #449471 and bz #449245.


diff -Naur jpeg-6b.orig/jconfig.cfg jpeg-6b/jconfig.cfg
--- jpeg-6b.orig/jconfig.cfg	1994-12-06 11:43:15.000000000 -0500
+++ jpeg-6b/jconfig.cfg	2008-05-31 16:59:32.000000000 -0400
@@ -28,11 +28,16 @@
 
 #ifdef JPEG_CJPEG_DJPEG
 
-#define BMP_SUPPORTED		/* BMP image file format */
-#define GIF_SUPPORTED		/* GIF image file format */
-#define PPM_SUPPORTED		/* PBMPLUS PPM/PGM image file format */
-#undef RLE_SUPPORTED		/* Utah RLE image file format */
-#define TARGA_SUPPORTED		/* Targa image file format */
+/* BMP image file format */
+#define BMP_SUPPORTED
+/* GIF image file format */
+#define GIF_SUPPORTED
+/* PBMPLUS PPM/PGM image file format */
+#define PPM_SUPPORTED
+/* Utah RLE image file format */
+#undef RLE_SUPPORTED
+/* Targa image file format */
+#define TARGA_SUPPORTED
 
 #undef TWO_FILE_COMMANDLINE
 #undef NEED_SIGNAL_CATCHER

libjpeg-buf-oflo.patch:

--- NEW FILE libjpeg-buf-oflo.patch ---
Dike out a section of code that has no usefulness on Unix-like systems,
and will crash if fed a comment string exceeding 64K.  Per report from
Lubomir Kundrak, RH bug #226965


diff -Naur jpeg-6b.orig/wrjpgcom.c jpeg-6b/wrjpgcom.c
--- jpeg-6b.orig/wrjpgcom.c	1997-10-23 00:47:03.000000000 -0400
+++ jpeg-6b/wrjpgcom.c	2007-06-25 22:26:42.000000000 -0400
@@ -446,6 +446,8 @@
     } else if (keymatch(arg, "comment", 1)) {
       if (++argn >= argc) usage();
       comment_arg = argv[argn];
+#if 0
+#error "There is a buffer overflow in the code below"
       /* If the comment text starts with '"', then we are probably running
        * under MS-DOG and must parse out the quoted string ourselves.  Sigh.
        */
@@ -466,6 +468,7 @@
 	  strcat(comment_arg, argv[argn]);
 	}
       }
+#endif
       comment_length = (unsigned int) strlen(comment_arg);
     } else
       usage();

libjpeg-cflags.patch:

--- NEW FILE libjpeg-cflags.patch ---
--- jpeg-6b/makefile.cfg.useCFLAGS	1998-03-21 14:08:57.000000000 -0500
+++ jpeg-6b/makefile.cfg	2006-07-10 17:21:14.000000000 -0400
@@ -54,7 +54,7 @@
 # miscellaneous OS-dependent stuff
 SHELL= /bin/sh
 # linker
-LN= @LN@
+LN= @LN@ $(CFLAGS) 
 # file deletion command
 RM= rm -f
 # directory creation command
@@ -168,7 +168,7 @@
 
 # with libtool:
 libjpeg.la: @A2K_DEPS@ $(LIBOBJECTS)
-	$(LIBTOOL) --mode=link $(CC) -o libjpeg.la $(LIBOBJECTS) \
+	$(LIBTOOL) --mode=link $(CC) $(CFLAGS) -o libjpeg.la $(LIBOBJECTS) \
 		-rpath $(libdir) -version-info $(JPEG_LIB_VERSION)
 
 # sample programs:


--- NEW FILE mingw32-libjpeg.spec ---
%define __strip %{_mingw32_strip}
%define __objdump %{_mingw32_objdump}
%define _use_internal_dependency_generator 0
%define __find_requires %{_mingw32_findrequires}
%define __find_provides %{_mingw32_findprovides}

# Build the programs like cjpeg, etc.
# https://bugzilla.redhat.com/show_bug.cgi?id=467401c7
%define build_programs 0

Name:           mingw32-libjpeg
Version:        6b
Release:        8%{?dist}
Summary:        MinGW Windows Libjpeg library

License:        IJG
URL:            http://www.ijg.org/
Group:          Development/Libraries
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0:        ftp://ftp.uu.net/graphics/jpeg/jpegsrc.v%{version}.tar.gz
Source1:        configure.in

Patch1:         jpeg-c++.patch
Patch4:         libjpeg-cflags.patch
Patch5:         libjpeg-buf-oflo.patch
Patch6:         libjpeg-autoconf.patch

Patch100:       jpeg-mingw32.patch

BuildArch:      noarch

BuildRequires:  mingw32-filesystem >= 23
BuildRequires:  mingw32-dlfcn
BuildRequires:  mingw32-gcc
BuildRequires:  mingw32-binutils
BuildRequires:  mingw32-libpng
BuildRequires:  mingw32-zlib
BuildRequires:  autoconf, libtool


%description
MinGW Windows Libjpeg library.


%prep
%setup -q -n jpeg-6b

%patch1 -p1 -b .c++
%patch4 -p1 -b .cflags
%patch5 -p1 -b .oflo
%patch6 -p1

%patch100 -p1

# For long-obsolete reasons, libjpeg 6b doesn't ship with a configure.in.
# We need to re-autoconf though, in order to update libtool support,
# so supply configure.in.
cp %{SOURCE1} configure.in

# libjpeg 6b includes a horribly obsolete version of libtool.
# Blow it away and replace with build system's version.
rm -f config.guess config.sub ltmain.sh ltconfig aclocal.m4

cat /usr/share/aclocal/libtool.m4 > aclocal.m4
# If this is the new libtool 2.x, we need to append some additional
# files.  Rather than hard-coding a version of libtool, just test
# if the files exist and append them:
for f in \
  /usr/share/aclocal/ltoptions.m4 \
  /usr/share/aclocal/ltversion.m4 \
  /usr/share/aclocal/ltsugar.m4 \
  /usr/share/aclocal/lt~obsolete.m4; do
  if [ -f $f ]; then cat $f >> aclocal.m4; fi
done

# Now we can run libtool.
libtoolize

# Automake can fail - we only need this to get config.sub and config.guess.
automake -a ||:

# Finally because we replaced configure.in:
autoconf


%build
%{_mingw32_configure} --enable-shared --disable-static
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT

mkdir -p $RPM_BUILD_ROOT%{_mingw32_bindir}
mkdir -p $RPM_BUILD_ROOT%{_mingw32_includedir}
mkdir -p $RPM_BUILD_ROOT%{_mingw32_libdir}
mkdir -p $RPM_BUILD_ROOT%{_mingw32_mandir}/man1

%{_mingw32_makeinstall}

# Remove manual pages which duplicate Fedora native.
rm -rf $RPM_BUILD_ROOT%{_mingw32_mandir}

pushd $RPM_BUILD_ROOT%{_mingw32_bindir}
# Rename or remove win32 native binaries
for i in cjpeg djpeg jpegtran rdjpgcom wrjpgcom ; do
%if %build_programs
   mv $i $i.exe
%else
   rm $i
%endif
done
popd


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root)
%doc README
%if %build_programs
%{_mingw32_bindir}/cjpeg.exe
%{_mingw32_bindir}/djpeg.exe
%{_mingw32_bindir}/jpegtran.exe
%{_mingw32_bindir}/rdjpgcom.exe
%{_mingw32_bindir}/wrjpgcom.exe
%endif
%{_mingw32_bindir}/libjpeg-62.dll
%{_mingw32_includedir}/jconfig.h
%{_mingw32_includedir}/jerror.h
%{_mingw32_includedir}/jmorecfg.h
%{_mingw32_includedir}/jpeglib.h
%{_mingw32_libdir}/libjpeg.dll.a
%{_mingw32_libdir}/libjpeg.la


%changelog
* Wed Jan 28 2009 Richard W.M. Jones <rjones at redhat.com> - 6b-8
- Exclude the binaries.
- Rename the binaries to *.exe (Levente Farkas).

* Fri Jan 23 2009 Richard W.M. Jones <rjones at redhat.com> - 6b-7
- Disable static libraries.
- Use _smp_mflags.
- Update for new libtool 2.
- +BR mingw32-dlfcn.
- Added documentation (README includes the license).

* Thu Nov 20 2008 Richard W.M. Jones <rjones at redhat.com> - 6b-6
- Don't set libdir in the make step.
- Fix path to mandir.

* Wed Sep 24 2008 Richard W.M. Jones <rjones at redhat.com> - 6b-5
- Rename mingw -> mingw32.

* Mon Sep 22 2008 Daniel P. Berrange <berrange at redhat.com> - 6b-4
- Switch to tar.bz2 source, and rename configure.in

* Sun Sep 21 2008 Daniel P. Berrange <berrange at redhat.com> - 6b-3
- Fix URL.
- Remove manpages which duplicate Fedora native.

* Wed Sep 10 2008 Daniel P. Berrange <berrange at redhat.com> - 6b-2
- Rename configure.in with a prefix.
- Remove static library.

* Tue Sep  9 2008 Daniel P. Berrange <berrange at redhat.com> - 6b-1
- Initial RPM release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-libjpeg/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	29 Jan 2009 00:09:08 -0000	1.1
+++ .cvsignore	30 Jan 2009 11:48:26 -0000	1.2
@@ -0,0 +1 @@
+jpegsrc.v6b.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-libjpeg/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	29 Jan 2009 00:09:08 -0000	1.1
+++ sources	30 Jan 2009 11:48:26 -0000	1.2
@@ -0,0 +1 @@
+dbd5f3b47ed13132f04c685d608a7547  jpegsrc.v6b.tar.gz



From rjones at fedoraproject.org  Fri Jan 30 11:49:10 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Fri, 30 Jan 2009 11:49:10 +0000 (UTC)
Subject: rpms/mingw32-pixman/F-10 import.log, NONE,
	1.1 make-pixman-snapshot.sh, NONE, 1.1 mingw32-pixman.spec, NONE,
	1.1 pixman-0.13.2-license.patch, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090130114910.B40A470117@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/mingw32-pixman/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27687/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	import.log make-pixman-snapshot.sh mingw32-pixman.spec 
	pixman-0.13.2-license.patch 
Log Message:
Initial import.



--- NEW FILE import.log ---
mingw32-pixman-0_13_2-2_fc11:F-10:mingw32-pixman-0.13.2-2.fc11.src.rpm:1233315938


--- NEW FILE make-pixman-snapshot.sh ---
#!/bin/sh

DIRNAME=pixman-$( date +%Y%m%d )

rm -rf $DIRNAME
git clone git://git.freedesktop.org/git/pixman $DIRNAME
cd $DIRNAME
if [ -z "$1" ]; then
    git log | head -1
else
    git checkout $1
fi
rm -rf .git
cd ..
tar jcf $DIRNAME.tar.bz2 $DIRNAME
rm -rf $DIRNAME


--- NEW FILE mingw32-pixman.spec ---
%define __strip %{_mingw32_strip}
%define __objdump %{_mingw32_objdump}
%define _use_internal_dependency_generator 0
%define __find_requires %{_mingw32_findrequires}
%define __find_provides %{_mingw32_findprovides}

Name:           mingw32-pixman
Version:        0.13.2
Release:        2%{?dist}
Summary:        MinGW Windows Pixman library

License:        MIT
URL:            http://xorg.freedesktop.org/
Group:          Development/Libraries

Source0:        http://xorg.freedesktop.org/archive/individual/lib/pixman-%{version}.tar.gz
Source1:        make-pixman-snapshot.sh

Patch0:         pixman-0.13.2-license.patch

BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch

BuildRequires:  mingw32-filesystem >= 23
BuildRequires:  mingw32-gcc
BuildRequires:  mingw32-binutils
BuildRequires:  mingw32-dlfcn

Requires:       pkgconfig

%description
MinGW Windows Pixman library.


%prep
%setup -q -n pixman-%{version}
%patch0 -p1


%build
# Uses GTK for its testsuite, so disable this otherwise
# we have a chicken & egg problem on mingw
%{_mingw32_configure} --disable-gtk --disable-static
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT

make DESTDIR=$RPM_BUILD_ROOT install


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root)
%doc LICENSE
%{_mingw32_bindir}/libpixman-1-0.dll
%{_mingw32_includedir}/pixman-1
%{_mingw32_libdir}/libpixman-1.dll.a
%{_mingw32_libdir}/libpixman-1.la
%{_mingw32_libdir}/pkgconfig/pixman-1.pc


%changelog
* Thu Jan 15 2009 Richard W.M. Jones <rjones at redhat.com> - 0.13.2-2
- Include LICENSE file (freedesktop bug 19582).

* Tue Jan 13 2009 Richard W.M. Jones <rjones at redhat.com> - 0.13.2-1
- Resynch with Fedora package (0.13.2).
- Disable static library for speed.
- Use _smp_mflags.
- Requires pkgconfig.
- Depends on dlfcn.

* Wed Sep 24 2008 Richard W.M. Jones <rjones at redhat.com> - 0.12.0-2
- Rename mingw -> mingw32.

* Mon Sep 22 2008 Daniel P. Berrange <berrange at redhat.com> - 0.12.0-1
- Update to 0.12.0 release

* Wed Sep 10 2008 Richard W.M. Jones <rjones at redhat.com> - 0.11.10-2
- Remove static library.

* Tue Sep  9 2008 Daniel P. Berrange <berrange at redhat.com> - 0.11.10-1
- Initial RPM release

pixman-0.13.2-license.patch:

--- NEW FILE pixman-0.13.2-license.patch ---
diff -urN pixman-0.13.2.orig/LICENSE pixman-0.13.2/LICENSE
--- pixman-0.13.2.orig/LICENSE	1970-01-01 01:00:00.000000000 +0100
+++ pixman-0.13.2/LICENSE	2009-01-15 13:14:47.000000000 +0000
@@ -0,0 +1,23 @@
+ Copyright ?? 2000 Keith Packard, member of The XFree86 Project, Inc.
+             2005 Lars Knoll & Zack Rusin, Trolltech
+             2008 Aaron Plattner, NVIDIA Corporation
+
+ 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 Keith Packard not be used in
+ advertising or publicity pertaining to distribution of the software without
+ specific, written prior permission.  Keith Packard makes 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.
+


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-pixman/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	29 Jan 2009 00:22:39 -0000	1.1
+++ .cvsignore	30 Jan 2009 11:48:40 -0000	1.2
@@ -0,0 +1 @@
+pixman-0.13.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-pixman/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	29 Jan 2009 00:22:39 -0000	1.1
+++ sources	30 Jan 2009 11:48:40 -0000	1.2
@@ -0,0 +1 @@
+837df4a02c61a60a880644393b57faed  pixman-0.13.2.tar.gz



From rjones at fedoraproject.org  Fri Jan 30 11:49:39 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Fri, 30 Jan 2009 11:49:39 +0000 (UTC)
Subject: rpms/mingw32-libjpeg/F-10 configure.in, NONE, 1.1 import.log, NONE, 
	1.1 jpeg-c++.patch, NONE, 1.1 jpeg-mingw32.patch, NONE,
	1.1 libjpeg-autoconf.patch, NONE, 1.1 libjpeg-buf-oflo.patch,
	NONE, 1.1 libjpeg-cflags.patch, NONE, 1.1 mingw32-libjpeg.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090130114939.9769070117@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/mingw32-libjpeg/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28081/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	configure.in import.log jpeg-c++.patch jpeg-mingw32.patch 
	libjpeg-autoconf.patch libjpeg-buf-oflo.patch 
	libjpeg-cflags.patch mingw32-libjpeg.spec 
Log Message:
Initial import.



--- NEW FILE configure.in ---
dnl IJG auto-configuration source file.
dnl Process this file with autoconf to produce a configure script.
AC_INIT(jcmaster.c)
AC_CONFIG_HEADER(jconfig.h:jconfig.cfg)
dnl
dnl do these first since other macros rely on them
AC_PROG_CC
AC_PROG_CPP
dnl
dnl See if compiler supports prototypes.
AC_MSG_CHECKING(for function prototypes)
AC_CACHE_VAL(ijg_cv_have_prototypes,
[AC_TRY_COMPILE([
int testfunction (int arg1, int * arg2); /* check prototypes */
struct methods_struct {		/* check method-pointer declarations */
  int (*error_exit) (char *msgtext);
  int (*trace_message) (char *msgtext);
  int (*another_method) (void);
};
int testfunction (int arg1, int * arg2) /* check definitions */
{ return arg2[arg1]; }
int test2function (void)	/* check void arg list */
{ return 0; }
], [ ], ijg_cv_have_prototypes=yes, ijg_cv_have_prototypes=no)])
AC_MSG_RESULT($ijg_cv_have_prototypes)
if test $ijg_cv_have_prototypes = yes; then
  AC_DEFINE(HAVE_PROTOTYPES,1)
else
  echo Your compiler does not seem to know about function prototypes.
  echo Perhaps it needs a special switch to enable ANSI C mode.
  echo If so, we recommend running configure like this:
  echo "   ./configure  CC='cc -switch'"
  echo where -switch is the proper switch.
fi
dnl
dnl check header files
AC_CHECK_HEADER(stddef.h, AC_DEFINE(HAVE_STDDEF_H,1))
AC_CHECK_HEADER(stdlib.h, AC_DEFINE(HAVE_STDLIB_H,1))
AC_CHECK_HEADER(string.h,, AC_DEFINE(NEED_BSD_STRINGS,1))
dnl See whether type size_t is defined in any ANSI-standard places;
dnl if not, perhaps it is defined in <sys/types.h>.
AC_MSG_CHECKING(for size_t)
AC_TRY_COMPILE([
#ifdef HAVE_STDDEF_H
#include <stddef.h>
#endif
#ifdef HAVE_STDLIB_H
#include <stdlib.h>
#endif
#include <stdio.h>
#ifdef NEED_BSD_STRINGS
#include <strings.h>
#else
#include <string.h>
#endif
typedef size_t my_size_t;
], [ my_size_t foovar; ], ijg_size_t_ok=yes,
[ijg_size_t_ok="not ANSI, perhaps it is in sys/types.h"])
AC_MSG_RESULT($ijg_size_t_ok)
if test "$ijg_size_t_ok" != yes; then
AC_CHECK_HEADER(sys/types.h, [AC_DEFINE(NEED_SYS_TYPES_H,1)
AC_EGREP_CPP(size_t, [#include <sys/types.h>],
[ijg_size_t_ok="size_t is in sys/types.h"], ijg_size_t_ok=no)],
ijg_size_t_ok=no)
AC_MSG_RESULT($ijg_size_t_ok)
if test "$ijg_size_t_ok" = no; then
  echo Type size_t is not defined in any of the usual places.
  echo Try putting '"typedef unsigned int size_t;"' in jconfig.h.
fi
fi
dnl
dnl check compiler characteristics
AC_MSG_CHECKING(for type unsigned char)
AC_TRY_COMPILE(, [ unsigned char un_char; ],
[AC_MSG_RESULT(yes)
AC_DEFINE(HAVE_UNSIGNED_CHAR,1)], AC_MSG_RESULT(no))
AC_MSG_CHECKING(for type unsigned short)
AC_TRY_COMPILE(, [ unsigned short un_short; ],
[AC_MSG_RESULT(yes)
AC_DEFINE(HAVE_UNSIGNED_SHORT,1)], AC_MSG_RESULT(no))
AC_MSG_CHECKING(for type void)
AC_TRY_COMPILE([
/* Caution: a C++ compiler will insist on valid prototypes */
typedef void * void_ptr;	/* check void * */
#ifdef HAVE_PROTOTYPES		/* check ptr to function returning void */
typedef void (*void_func) (int a, int b);
#else
typedef void (*void_func) ();
#endif

#ifdef HAVE_PROTOTYPES		/* check void function result */
void test3function (void_ptr arg1, void_func arg2)
#else
void test3function (arg1, arg2)
     void_ptr arg1;
     void_func arg2;
#endif
{
  char * locptr = (char *) arg1; /* check casting to and from void * */
  arg1 = (void *) locptr;
  (*arg2) (1, 2);		/* check call of fcn returning void */
}
], [ ], AC_MSG_RESULT(yes), [AC_MSG_RESULT(no)
AC_DEFINE(void,char)])

AC_C_CONST
dnl check for non-broken inline under various spellings
AC_MSG_CHECKING(for inline)
ijg_cv_inline=""
AC_TRY_COMPILE(, [} __inline__ int foo() { return 0; }
int bar() { return foo();], ijg_cv_inline="__inline__",
AC_TRY_COMPILE(, [} __inline int foo() { return 0; }
int bar() { return foo();], ijg_cv_inline="__inline",
AC_TRY_COMPILE(, [} inline int foo() { return 0; }
int bar() { return foo();], ijg_cv_inline="inline")))
AC_MSG_RESULT($ijg_cv_inline)
AC_DEFINE_UNQUOTED(INLINE,$ijg_cv_inline)
dnl we cannot check for bogus warnings, but at least we can check for errors
AC_MSG_CHECKING(for broken incomplete types)
AC_TRY_COMPILE([ typedef struct undefined_structure * undef_struct_ptr; ], ,
AC_MSG_RESULT(ok),
[AC_MSG_RESULT(broken)
AC_DEFINE(INCOMPLETE_TYPES_BROKEN,1)])
dnl test whether global names are unique to at least 15 chars
AC_MSG_CHECKING(for short external names)
AC_TRY_LINK([
int possibly_duplicate_function () { return 0; }
int possibly_dupli_function () { return 1; }
], [ ], AC_MSG_RESULT(ok), [AC_MSG_RESULT(short)
AC_DEFINE(NEED_SHORT_EXTERNAL_NAMES,1)])
dnl
dnl run-time checks
AC_MSG_CHECKING(to see if char is signed)
AC_TRY_RUN([
#ifdef HAVE_PROTOTYPES
int is_char_signed (int arg)
#else
int is_char_signed (arg)
     int arg;
#endif
{
  if (arg == 189) {		/* expected result for unsigned char */
    return 0;			/* type char is unsigned */
  }
  else if (arg != -67) {	/* expected result for signed char */
    printf("Hmm, it seems 'char' is not eight bits wide on your machine.\n");
    printf("I fear the JPEG software will not work at all.\n\n");
  }
  return 1;			/* assume char is signed otherwise */
}
char signed_char_check = (char) (-67);
int main() {
  exit(is_char_signed((int) signed_char_check));
}], [AC_MSG_RESULT(no)
AC_DEFINE(CHAR_IS_UNSIGNED,1)], AC_MSG_RESULT(yes),
[echo Assuming that char is signed on target machine.
echo If it is unsigned, this will be a little bit inefficient.
])
dnl
AC_MSG_CHECKING(to see if right shift is signed)
AC_TRY_RUN([
#ifdef HAVE_PROTOTYPES
int is_shifting_signed (long arg)
#else
int is_shifting_signed (arg)
     long arg;
#endif
/* See whether right-shift on a long is signed or not. */
{
  long res = arg >> 4;

  if (res == -0x7F7E80CL) {	/* expected result for signed shift */
    return 1;			/* right shift is signed */
  }
  /* see if unsigned-shift hack will fix it. */
  /* we can't just test exact value since it depends on width of long... */
  res |= (~0L) << (32-4);
  if (res == -0x7F7E80CL) {	/* expected result now? */
    return 0;			/* right shift is unsigned */
  }
  printf("Right shift isn't acting as I expect it to.\n");
  printf("I fear the JPEG software will not work at all.\n\n");
  return 0;			/* try it with unsigned anyway */
}
int main() {
  exit(is_shifting_signed(-0x7F7E80B1L));
}], [AC_MSG_RESULT(no)
AC_DEFINE(RIGHT_SHIFT_IS_UNSIGNED,1)], AC_MSG_RESULT(yes),
AC_MSG_RESULT(Assuming that right shift is signed on target machine.))
dnl
AC_MSG_CHECKING(to see if fopen accepts b spec)
AC_TRY_RUN([
#include <stdio.h>
int main() {
  if (fopen("conftestdata", "wb") != NULL)
    exit(0);
  exit(1);
}], AC_MSG_RESULT(yes), [AC_MSG_RESULT(no)
AC_DEFINE(DONT_USE_B_MODE,1)],
AC_MSG_RESULT(Assuming that it does.))
dnl
dnl system services
AC_PROG_INSTALL
AC_PROG_RANLIB

# Decide whether to use libtool,
# and if so whether to build shared, static, or both flavors of library.
AC_DISABLE_SHARED
AC_DISABLE_STATIC
if test "x$enable_shared" != xno  -o  "x$enable_static" != xno; then
  USELIBTOOL="yes"

  # Configure libtool.
  AC_PROG_LIBTOOL

  LIBTOOL="./libtool"
  O="lo"
  A="la"
  LN='$(LIBTOOL) --mode=link $(CC)'
  INSTALL_LIB='$(LIBTOOL) --mode=install ${INSTALL}'
  INSTALL_PROGRAM="\$(LIBTOOL) --mode=install $INSTALL_PROGRAM"
else
  USELIBTOOL="no"
  LIBTOOL=""
  O="o"
  A="a"
  LN='$(CC)'
  INSTALL_LIB="$INSTALL_DATA"
fi
AC_SUBST(LIBTOOL)
AC_SUBST(O)
AC_SUBST(A)
AC_SUBST(LN)
AC_SUBST(INSTALL_LIB)

# Select memory manager depending on user input.
# If no "-enable-maxmem", use jmemnobs
MEMORYMGR='jmemnobs.$(O)'
MAXMEM="no"
AC_ARG_ENABLE(maxmem,
[  --enable-maxmem[=N]     enable use of temp files, set max mem usage to N MB],
MAXMEM="$enableval")
dnl [# support --with-maxmem for backwards compatibility with IJG V5.]
dnl AC_ARG_WITH(maxmem, , MAXMEM="$withval")
if test "x$MAXMEM" = xyes; then
  MAXMEM=1
fi
if test "x$MAXMEM" != xno; then
changequote(, )dnl
  if test -n "`echo $MAXMEM | sed 's/[0-9]//g'`"; then
changequote([, ])dnl
    AC_MSG_ERROR(non-numeric argument to --enable-maxmem)
  fi
  DEFAULTMAXMEM=`expr $MAXMEM \* 1048576`
AC_DEFINE_UNQUOTED(DEFAULT_MAX_MEM, ${DEFAULTMAXMEM})
AC_MSG_CHECKING([for 'tmpfile()'])
AC_TRY_LINK([#include <stdio.h>], [ FILE * tfile = tmpfile(); ],
[AC_MSG_RESULT(yes)
MEMORYMGR='jmemansi.$(O)'],
[AC_MSG_RESULT(no)
dnl if tmpfile is not present, must use jmemname.
MEMORYMGR='jmemname.$(O)'
AC_DEFINE(NEED_SIGNAL_CATCHER,1)
AC_MSG_CHECKING([for 'mktemp()'])
AC_TRY_LINK(, [ char fname[80]; mktemp(fname); ], AC_MSG_RESULT(yes),
[AC_MSG_RESULT(no)
AC_DEFINE(NO_MKTEMP,1)])])
fi
AC_SUBST(MEMORYMGR)

# Include PNG support in cjpeg/djpeg if appropriate.
AC_ARG_WITH(png,
[  --with-png              enable PNG support in cjpeg/djpeg],
[#], [with_png="maybe"])

# try to detect whether libpng is present
if test "x$with_png" = xmaybe ; then
  AC_CHECK_HEADER(png.h, [: ok so far], [with_png="no"])
fi
if test "x$with_png" = xmaybe ; then
  AC_CHECK_HEADER(zlib.h, [: ok so far], [with_png="no"])
fi
if test "x$with_png" = xmaybe ; then
  AC_CHECK_LIB(z, deflate, [: ok so far], [with_png="no"])
fi
if test "x$with_png" = xmaybe ; then
  AC_CHECK_LIB(png, png_create_info_struct,
	[with_png="yes"], [with_png="no"], [-lz -lm])
fi

if test "x$with_png" = xyes ; then
  AC_DEFINE(PNG_SUPPORTED,1)
  LIBS="-lpng -lz -lm $LIBS"
fi

# Extract the library version ID from jpeglib.h.
AC_MSG_CHECKING([libjpeg version number])
[JPEG_LIB_VERSION=`sed -e '/^#define JPEG_LIB_VERSION/!d' -e 's/^[^0-9]*\([0-9][0-9]*\).*$/\1/' $srcdir/jpeglib.h`]
AC_MSG_RESULT($JPEG_LIB_VERSION)
AC_SUBST(JPEG_LIB_VERSION)

# Prepare to massage makefile.cfg correctly.
if test $ijg_cv_have_prototypes = yes; then
  A2K_DEPS=""
  COM_A2K="# "
else
  A2K_DEPS="ansi2knr"
  COM_A2K=""
fi
AC_SUBST(A2K_DEPS)
AC_SUBST(COM_A2K)
# ansi2knr needs -DBSD if string.h is missing
if test $ac_cv_header_string_h = no; then
  ANSI2KNRFLAGS="-DBSD"
else
  ANSI2KNRFLAGS=""
fi
AC_SUBST(ANSI2KNRFLAGS)
dnl
# Substitutions to enable or disable libtool-related stuff
if test $USELIBTOOL = yes -a $ijg_cv_have_prototypes = yes; then
  COM_LT=""
else
  COM_LT="# "
fi
AC_SUBST(COM_LT)
if test "x$enable_shared" != xno; then
  FORCE_INSTALL_LIB="install-lib"
else
  FORCE_INSTALL_LIB=""
fi
AC_SUBST(FORCE_INSTALL_LIB)
dnl
# Set up -I directives
if test "x$srcdir" = x.; then
  INCLUDEFLAGS='-I$(srcdir)'
else
  if test "x$GCC" = xyes; then
    INCLUDEFLAGS='-I- -I. -I$(srcdir)'
  else
    INCLUDEFLAGS='-I. -I$(srcdir)'
  fi
fi
AC_SUBST(INCLUDEFLAGS)
dnl
AC_OUTPUT(Makefile:makefile.cfg)


--- NEW FILE import.log ---
mingw32-libjpeg-6b-8_fc11:F-10:mingw32-libjpeg-6b-8.fc11.src.rpm:1233315961

jpeg-c++.patch:

--- NEW FILE jpeg-c++.patch ---
--- jpeg-6b/jpeglib.h.c++	Sat Jun 17 21:58:15 2000
+++ jpeg-6b/jpeglib.h	Sat Jun 17 21:58:53 2000
@@ -13,6 +13,10 @@
 #ifndef JPEGLIB_H
 #define JPEGLIB_H
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /*
  * First we include the configuration files that record how this
  * installation of the JPEG library is set up.  jconfig.h can be
@@ -1091,6 +1095,10 @@
 #ifdef JPEG_INTERNALS
 #include "jpegint.h"		/* fetch private declarations */
 #include "jerror.h"		/* fetch error codes too */
+#endif
+
+#ifdef __cplusplus
+}
 #endif
 
 #endif /* JPEGLIB_H */

jpeg-mingw32.patch:

--- NEW FILE jpeg-mingw32.patch ---
diff -rup jpeg-6b/makefile.cfg jpeg-6b.new/makefile.cfg
--- jpeg-6b/makefile.cfg	2008-09-09 09:54:38.000000000 -0400
+++ jpeg-6b.new/makefile.cfg	2008-09-09 09:55:03.000000000 -0400
@@ -169,7 +169,7 @@ libjpeg.a: @A2K_DEPS@ $(LIBOBJECTS)
 # with libtool:
 libjpeg.la: @A2K_DEPS@ $(LIBOBJECTS)
 	$(LIBTOOL) --mode=link $(CC) $(CFLAGS) -o libjpeg.la $(LIBOBJECTS) \
-		-rpath $(libdir) -version-info $(JPEG_LIB_VERSION)
+		-no-undefined -rpath $(libdir) -version-info $(JPEG_LIB_VERSION)
 
 # sample programs:
 

libjpeg-autoconf.patch:

--- NEW FILE libjpeg-autoconf.patch ---
Work around bogosity in autoconf-2.62: it breaks #undef's that have a
comment after them, a construct that has worked fine in every previous
autoconf release.  See bz #449471 and bz #449245.


diff -Naur jpeg-6b.orig/jconfig.cfg jpeg-6b/jconfig.cfg
--- jpeg-6b.orig/jconfig.cfg	1994-12-06 11:43:15.000000000 -0500
+++ jpeg-6b/jconfig.cfg	2008-05-31 16:59:32.000000000 -0400
@@ -28,11 +28,16 @@
 
 #ifdef JPEG_CJPEG_DJPEG
 
-#define BMP_SUPPORTED		/* BMP image file format */
-#define GIF_SUPPORTED		/* GIF image file format */
-#define PPM_SUPPORTED		/* PBMPLUS PPM/PGM image file format */
-#undef RLE_SUPPORTED		/* Utah RLE image file format */
-#define TARGA_SUPPORTED		/* Targa image file format */
+/* BMP image file format */
+#define BMP_SUPPORTED
+/* GIF image file format */
+#define GIF_SUPPORTED
+/* PBMPLUS PPM/PGM image file format */
+#define PPM_SUPPORTED
+/* Utah RLE image file format */
+#undef RLE_SUPPORTED
+/* Targa image file format */
+#define TARGA_SUPPORTED
 
 #undef TWO_FILE_COMMANDLINE
 #undef NEED_SIGNAL_CATCHER

libjpeg-buf-oflo.patch:

--- NEW FILE libjpeg-buf-oflo.patch ---
Dike out a section of code that has no usefulness on Unix-like systems,
and will crash if fed a comment string exceeding 64K.  Per report from
Lubomir Kundrak, RH bug #226965


diff -Naur jpeg-6b.orig/wrjpgcom.c jpeg-6b/wrjpgcom.c
--- jpeg-6b.orig/wrjpgcom.c	1997-10-23 00:47:03.000000000 -0400
+++ jpeg-6b/wrjpgcom.c	2007-06-25 22:26:42.000000000 -0400
@@ -446,6 +446,8 @@
     } else if (keymatch(arg, "comment", 1)) {
       if (++argn >= argc) usage();
       comment_arg = argv[argn];
+#if 0
+#error "There is a buffer overflow in the code below"
       /* If the comment text starts with '"', then we are probably running
        * under MS-DOG and must parse out the quoted string ourselves.  Sigh.
        */
@@ -466,6 +468,7 @@
 	  strcat(comment_arg, argv[argn]);
 	}
       }
+#endif
       comment_length = (unsigned int) strlen(comment_arg);
     } else
       usage();

libjpeg-cflags.patch:

--- NEW FILE libjpeg-cflags.patch ---
--- jpeg-6b/makefile.cfg.useCFLAGS	1998-03-21 14:08:57.000000000 -0500
+++ jpeg-6b/makefile.cfg	2006-07-10 17:21:14.000000000 -0400
@@ -54,7 +54,7 @@
 # miscellaneous OS-dependent stuff
 SHELL= /bin/sh
 # linker
-LN= @LN@
+LN= @LN@ $(CFLAGS) 
 # file deletion command
 RM= rm -f
 # directory creation command
@@ -168,7 +168,7 @@
 
 # with libtool:
 libjpeg.la: @A2K_DEPS@ $(LIBOBJECTS)
-	$(LIBTOOL) --mode=link $(CC) -o libjpeg.la $(LIBOBJECTS) \
+	$(LIBTOOL) --mode=link $(CC) $(CFLAGS) -o libjpeg.la $(LIBOBJECTS) \
 		-rpath $(libdir) -version-info $(JPEG_LIB_VERSION)
 
 # sample programs:


--- NEW FILE mingw32-libjpeg.spec ---
%define __strip %{_mingw32_strip}
%define __objdump %{_mingw32_objdump}
%define _use_internal_dependency_generator 0
%define __find_requires %{_mingw32_findrequires}
%define __find_provides %{_mingw32_findprovides}

# Build the programs like cjpeg, etc.
# https://bugzilla.redhat.com/show_bug.cgi?id=467401c7
%define build_programs 0

Name:           mingw32-libjpeg
Version:        6b
Release:        8%{?dist}
Summary:        MinGW Windows Libjpeg library

License:        IJG
URL:            http://www.ijg.org/
Group:          Development/Libraries
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0:        ftp://ftp.uu.net/graphics/jpeg/jpegsrc.v%{version}.tar.gz
Source1:        configure.in

Patch1:         jpeg-c++.patch
Patch4:         libjpeg-cflags.patch
Patch5:         libjpeg-buf-oflo.patch
Patch6:         libjpeg-autoconf.patch

Patch100:       jpeg-mingw32.patch

BuildArch:      noarch

BuildRequires:  mingw32-filesystem >= 23
BuildRequires:  mingw32-dlfcn
BuildRequires:  mingw32-gcc
BuildRequires:  mingw32-binutils
BuildRequires:  mingw32-libpng
BuildRequires:  mingw32-zlib
BuildRequires:  autoconf, libtool


%description
MinGW Windows Libjpeg library.


%prep
%setup -q -n jpeg-6b

%patch1 -p1 -b .c++
%patch4 -p1 -b .cflags
%patch5 -p1 -b .oflo
%patch6 -p1

%patch100 -p1

# For long-obsolete reasons, libjpeg 6b doesn't ship with a configure.in.
# We need to re-autoconf though, in order to update libtool support,
# so supply configure.in.
cp %{SOURCE1} configure.in

# libjpeg 6b includes a horribly obsolete version of libtool.
# Blow it away and replace with build system's version.
rm -f config.guess config.sub ltmain.sh ltconfig aclocal.m4

cat /usr/share/aclocal/libtool.m4 > aclocal.m4
# If this is the new libtool 2.x, we need to append some additional
# files.  Rather than hard-coding a version of libtool, just test
# if the files exist and append them:
for f in \
  /usr/share/aclocal/ltoptions.m4 \
  /usr/share/aclocal/ltversion.m4 \
  /usr/share/aclocal/ltsugar.m4 \
  /usr/share/aclocal/lt~obsolete.m4; do
  if [ -f $f ]; then cat $f >> aclocal.m4; fi
done

# Now we can run libtool.
libtoolize

# Automake can fail - we only need this to get config.sub and config.guess.
automake -a ||:

# Finally because we replaced configure.in:
autoconf


%build
%{_mingw32_configure} --enable-shared --disable-static
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT

mkdir -p $RPM_BUILD_ROOT%{_mingw32_bindir}
mkdir -p $RPM_BUILD_ROOT%{_mingw32_includedir}
mkdir -p $RPM_BUILD_ROOT%{_mingw32_libdir}
mkdir -p $RPM_BUILD_ROOT%{_mingw32_mandir}/man1

%{_mingw32_makeinstall}

# Remove manual pages which duplicate Fedora native.
rm -rf $RPM_BUILD_ROOT%{_mingw32_mandir}

pushd $RPM_BUILD_ROOT%{_mingw32_bindir}
# Rename or remove win32 native binaries
for i in cjpeg djpeg jpegtran rdjpgcom wrjpgcom ; do
%if %build_programs
   mv $i $i.exe
%else
   rm $i
%endif
done
popd


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root)
%doc README
%if %build_programs
%{_mingw32_bindir}/cjpeg.exe
%{_mingw32_bindir}/djpeg.exe
%{_mingw32_bindir}/jpegtran.exe
%{_mingw32_bindir}/rdjpgcom.exe
%{_mingw32_bindir}/wrjpgcom.exe
%endif
%{_mingw32_bindir}/libjpeg-62.dll
%{_mingw32_includedir}/jconfig.h
%{_mingw32_includedir}/jerror.h
%{_mingw32_includedir}/jmorecfg.h
%{_mingw32_includedir}/jpeglib.h
%{_mingw32_libdir}/libjpeg.dll.a
%{_mingw32_libdir}/libjpeg.la


%changelog
* Wed Jan 28 2009 Richard W.M. Jones <rjones at redhat.com> - 6b-8
- Exclude the binaries.
- Rename the binaries to *.exe (Levente Farkas).

* Fri Jan 23 2009 Richard W.M. Jones <rjones at redhat.com> - 6b-7
- Disable static libraries.
- Use _smp_mflags.
- Update for new libtool 2.
- +BR mingw32-dlfcn.
- Added documentation (README includes the license).

* Thu Nov 20 2008 Richard W.M. Jones <rjones at redhat.com> - 6b-6
- Don't set libdir in the make step.
- Fix path to mandir.

* Wed Sep 24 2008 Richard W.M. Jones <rjones at redhat.com> - 6b-5
- Rename mingw -> mingw32.

* Mon Sep 22 2008 Daniel P. Berrange <berrange at redhat.com> - 6b-4
- Switch to tar.bz2 source, and rename configure.in

* Sun Sep 21 2008 Daniel P. Berrange <berrange at redhat.com> - 6b-3
- Fix URL.
- Remove manpages which duplicate Fedora native.

* Wed Sep 10 2008 Daniel P. Berrange <berrange at redhat.com> - 6b-2
- Rename configure.in with a prefix.
- Remove static library.

* Tue Sep  9 2008 Daniel P. Berrange <berrange at redhat.com> - 6b-1
- Initial RPM release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-libjpeg/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	29 Jan 2009 00:09:08 -0000	1.1
+++ .cvsignore	30 Jan 2009 11:49:08 -0000	1.2
@@ -0,0 +1 @@
+jpegsrc.v6b.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-libjpeg/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	29 Jan 2009 00:09:08 -0000	1.1
+++ sources	30 Jan 2009 11:49:09 -0000	1.2
@@ -0,0 +1 @@
+dbd5f3b47ed13132f04c685d608a7547  jpegsrc.v6b.tar.gz



From rjones at fedoraproject.org  Fri Jan 30 11:49:51 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Fri, 30 Jan 2009 11:49:51 +0000 (UTC)
Subject: rpms/mingw32-pixman/EL-5 import.log, NONE,
	1.1 make-pixman-snapshot.sh, NONE, 1.1 mingw32-pixman.spec, NONE,
	1.1 pixman-0.13.2-license.patch, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <20090130114951.621FF70117@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/mingw32-pixman/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28206/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	import.log make-pixman-snapshot.sh mingw32-pixman.spec 
	pixman-0.13.2-license.patch 
Log Message:
Initial import.



--- NEW FILE import.log ---
mingw32-pixman-0_13_2-2_fc11:EL-5:mingw32-pixman-0.13.2-2.fc11.src.rpm:1233315938


--- NEW FILE make-pixman-snapshot.sh ---
#!/bin/sh

DIRNAME=pixman-$( date +%Y%m%d )

rm -rf $DIRNAME
git clone git://git.freedesktop.org/git/pixman $DIRNAME
cd $DIRNAME
if [ -z "$1" ]; then
    git log | head -1
else
    git checkout $1
fi
rm -rf .git
cd ..
tar jcf $DIRNAME.tar.bz2 $DIRNAME
rm -rf $DIRNAME


--- NEW FILE mingw32-pixman.spec ---
%define __strip %{_mingw32_strip}
%define __objdump %{_mingw32_objdump}
%define _use_internal_dependency_generator 0
%define __find_requires %{_mingw32_findrequires}
%define __find_provides %{_mingw32_findprovides}

Name:           mingw32-pixman
Version:        0.13.2
Release:        2%{?dist}
Summary:        MinGW Windows Pixman library

License:        MIT
URL:            http://xorg.freedesktop.org/
Group:          Development/Libraries

Source0:        http://xorg.freedesktop.org/archive/individual/lib/pixman-%{version}.tar.gz
Source1:        make-pixman-snapshot.sh

Patch0:         pixman-0.13.2-license.patch

BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch

BuildRequires:  mingw32-filesystem >= 23
BuildRequires:  mingw32-gcc
BuildRequires:  mingw32-binutils
BuildRequires:  mingw32-dlfcn

Requires:       pkgconfig

%description
MinGW Windows Pixman library.


%prep
%setup -q -n pixman-%{version}
%patch0 -p1


%build
# Uses GTK for its testsuite, so disable this otherwise
# we have a chicken & egg problem on mingw
%{_mingw32_configure} --disable-gtk --disable-static
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT

make DESTDIR=$RPM_BUILD_ROOT install


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root)
%doc LICENSE
%{_mingw32_bindir}/libpixman-1-0.dll
%{_mingw32_includedir}/pixman-1
%{_mingw32_libdir}/libpixman-1.dll.a
%{_mingw32_libdir}/libpixman-1.la
%{_mingw32_libdir}/pkgconfig/pixman-1.pc


%changelog
* Thu Jan 15 2009 Richard W.M. Jones <rjones at redhat.com> - 0.13.2-2
- Include LICENSE file (freedesktop bug 19582).

* Tue Jan 13 2009 Richard W.M. Jones <rjones at redhat.com> - 0.13.2-1
- Resynch with Fedora package (0.13.2).
- Disable static library for speed.
- Use _smp_mflags.
- Requires pkgconfig.
- Depends on dlfcn.

* Wed Sep 24 2008 Richard W.M. Jones <rjones at redhat.com> - 0.12.0-2
- Rename mingw -> mingw32.

* Mon Sep 22 2008 Daniel P. Berrange <berrange at redhat.com> - 0.12.0-1
- Update to 0.12.0 release

* Wed Sep 10 2008 Richard W.M. Jones <rjones at redhat.com> - 0.11.10-2
- Remove static library.

* Tue Sep  9 2008 Daniel P. Berrange <berrange at redhat.com> - 0.11.10-1
- Initial RPM release

pixman-0.13.2-license.patch:

--- NEW FILE pixman-0.13.2-license.patch ---
diff -urN pixman-0.13.2.orig/LICENSE pixman-0.13.2/LICENSE
--- pixman-0.13.2.orig/LICENSE	1970-01-01 01:00:00.000000000 +0100
+++ pixman-0.13.2/LICENSE	2009-01-15 13:14:47.000000000 +0000
@@ -0,0 +1,23 @@
+ Copyright ?? 2000 Keith Packard, member of The XFree86 Project, Inc.
+             2005 Lars Knoll & Zack Rusin, Trolltech
+             2008 Aaron Plattner, NVIDIA Corporation
+
+ 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 Keith Packard not be used in
+ advertising or publicity pertaining to distribution of the software without
+ specific, written prior permission.  Keith Packard makes 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.
+


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-pixman/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	29 Jan 2009 00:22:39 -0000	1.1
+++ .cvsignore	30 Jan 2009 11:49:21 -0000	1.2
@@ -0,0 +1 @@
+pixman-0.13.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-pixman/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	29 Jan 2009 00:22:39 -0000	1.1
+++ sources	30 Jan 2009 11:49:21 -0000	1.2
@@ -0,0 +1 @@
+837df4a02c61a60a880644393b57faed  pixman-0.13.2.tar.gz



From rjones at fedoraproject.org  Fri Jan 30 11:49:48 2009
From: rjones at fedoraproject.org (Richard W.M. Jones)
Date: Fri, 30 Jan 2009 11:49:48 +0000 (UTC)
Subject: rpms/mingw32-libjpeg/EL-5 configure.in, NONE, 1.1 import.log, NONE, 
	1.1 jpeg-c++.patch, NONE, 1.1 jpeg-mingw32.patch, NONE,
	1.1 libjpeg-autoconf.patch, NONE, 1.1 libjpeg-buf-oflo.patch,
	NONE, 1.1 libjpeg-cflags.patch, NONE, 1.1 mingw32-libjpeg.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090130114948.ACAE570117@cvs1.fedora.phx.redhat.com>

Author: rjones

Update of /cvs/pkgs/rpms/mingw32-libjpeg/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28109/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	configure.in import.log jpeg-c++.patch jpeg-mingw32.patch 
	libjpeg-autoconf.patch libjpeg-buf-oflo.patch 
	libjpeg-cflags.patch mingw32-libjpeg.spec 
Log Message:
Initial import.



--- NEW FILE configure.in ---
dnl IJG auto-configuration source file.
dnl Process this file with autoconf to produce a configure script.
AC_INIT(jcmaster.c)
AC_CONFIG_HEADER(jconfig.h:jconfig.cfg)
dnl
dnl do these first since other macros rely on them
AC_PROG_CC
AC_PROG_CPP
dnl
dnl See if compiler supports prototypes.
AC_MSG_CHECKING(for function prototypes)
AC_CACHE_VAL(ijg_cv_have_prototypes,
[AC_TRY_COMPILE([
int testfunction (int arg1, int * arg2); /* check prototypes */
struct methods_struct {		/* check method-pointer declarations */
  int (*error_exit) (char *msgtext);
  int (*trace_message) (char *msgtext);
  int (*another_method) (void);
};
int testfunction (int arg1, int * arg2) /* check definitions */
{ return arg2[arg1]; }
int test2function (void)	/* check void arg list */
{ return 0; }
], [ ], ijg_cv_have_prototypes=yes, ijg_cv_have_prototypes=no)])
AC_MSG_RESULT($ijg_cv_have_prototypes)
if test $ijg_cv_have_prototypes = yes; then
  AC_DEFINE(HAVE_PROTOTYPES,1)
else
  echo Your compiler does not seem to know about function prototypes.
  echo Perhaps it needs a special switch to enable ANSI C mode.
  echo If so, we recommend running configure like this:
  echo "   ./configure  CC='cc -switch'"
  echo where -switch is the proper switch.
fi
dnl
dnl check header files
AC_CHECK_HEADER(stddef.h, AC_DEFINE(HAVE_STDDEF_H,1))
AC_CHECK_HEADER(stdlib.h, AC_DEFINE(HAVE_STDLIB_H,1))
AC_CHECK_HEADER(string.h,, AC_DEFINE(NEED_BSD_STRINGS,1))
dnl See whether type size_t is defined in any ANSI-standard places;
dnl if not, perhaps it is defined in <sys/types.h>.
AC_MSG_CHECKING(for size_t)
AC_TRY_COMPILE([
#ifdef HAVE_STDDEF_H
#include <stddef.h>
#endif
#ifdef HAVE_STDLIB_H
#include <stdlib.h>
#endif
#include <stdio.h>
#ifdef NEED_BSD_STRINGS
#include <strings.h>
#else
#include <string.h>
#endif
typedef size_t my_size_t;
], [ my_size_t foovar; ], ijg_size_t_ok=yes,
[ijg_size_t_ok="not ANSI, perhaps it is in sys/types.h"])
AC_MSG_RESULT($ijg_size_t_ok)
if test "$ijg_size_t_ok" != yes; then
AC_CHECK_HEADER(sys/types.h, [AC_DEFINE(NEED_SYS_TYPES_H,1)
AC_EGREP_CPP(size_t, [#include <sys/types.h>],
[ijg_size_t_ok="size_t is in sys/types.h"], ijg_size_t_ok=no)],
ijg_size_t_ok=no)
AC_MSG_RESULT($ijg_size_t_ok)
if test "$ijg_size_t_ok" = no; then
  echo Type size_t is not defined in any of the usual places.
  echo Try putting '"typedef unsigned int size_t;"' in jconfig.h.
fi
fi
dnl
dnl check compiler characteristics
AC_MSG_CHECKING(for type unsigned char)
AC_TRY_COMPILE(, [ unsigned char un_char; ],
[AC_MSG_RESULT(yes)
AC_DEFINE(HAVE_UNSIGNED_CHAR,1)], AC_MSG_RESULT(no))
AC_MSG_CHECKING(for type unsigned short)
AC_TRY_COMPILE(, [ unsigned short un_short; ],
[AC_MSG_RESULT(yes)
AC_DEFINE(HAVE_UNSIGNED_SHORT,1)], AC_MSG_RESULT(no))
AC_MSG_CHECKING(for type void)
AC_TRY_COMPILE([
/* Caution: a C++ compiler will insist on valid prototypes */
typedef void * void_ptr;	/* check void * */
#ifdef HAVE_PROTOTYPES		/* check ptr to function returning void */
typedef void (*void_func) (int a, int b);
#else
typedef void (*void_func) ();
#endif

#ifdef HAVE_PROTOTYPES		/* check void function result */
void test3function (void_ptr arg1, void_func arg2)
#else
void test3function (arg1, arg2)
     void_ptr arg1;
     void_func arg2;
#endif
{
  char * locptr = (char *) arg1; /* check casting to and from void * */
  arg1 = (void *) locptr;
  (*arg2) (1, 2);		/* check call of fcn returning void */
}
], [ ], AC_MSG_RESULT(yes), [AC_MSG_RESULT(no)
AC_DEFINE(void,char)])

AC_C_CONST
dnl check for non-broken inline under various spellings
AC_MSG_CHECKING(for inline)
ijg_cv_inline=""
AC_TRY_COMPILE(, [} __inline__ int foo() { return 0; }
int bar() { return foo();], ijg_cv_inline="__inline__",
AC_TRY_COMPILE(, [} __inline int foo() { return 0; }
int bar() { return foo();], ijg_cv_inline="__inline",
AC_TRY_COMPILE(, [} inline int foo() { return 0; }
int bar() { return foo();], ijg_cv_inline="inline")))
AC_MSG_RESULT($ijg_cv_inline)
AC_DEFINE_UNQUOTED(INLINE,$ijg_cv_inline)
dnl we cannot check for bogus warnings, but at least we can check for errors
AC_MSG_CHECKING(for broken incomplete types)
AC_TRY_COMPILE([ typedef struct undefined_structure * undef_struct_ptr; ], ,
AC_MSG_RESULT(ok),
[AC_MSG_RESULT(broken)
AC_DEFINE(INCOMPLETE_TYPES_BROKEN,1)])
dnl test whether global names are unique to at least 15 chars
AC_MSG_CHECKING(for short external names)
AC_TRY_LINK([
int possibly_duplicate_function () { return 0; }
int possibly_dupli_function () { return 1; }
], [ ], AC_MSG_RESULT(ok), [AC_MSG_RESULT(short)
AC_DEFINE(NEED_SHORT_EXTERNAL_NAMES,1)])
dnl
dnl run-time checks
AC_MSG_CHECKING(to see if char is signed)
AC_TRY_RUN([
#ifdef HAVE_PROTOTYPES
int is_char_signed (int arg)
#else
int is_char_signed (arg)
     int arg;
#endif
{
  if (arg == 189) {		/* expected result for unsigned char */
    return 0;			/* type char is unsigned */
  }
  else if (arg != -67) {	/* expected result for signed char */
    printf("Hmm, it seems 'char' is not eight bits wide on your machine.\n");
    printf("I fear the JPEG software will not work at all.\n\n");
  }
  return 1;			/* assume char is signed otherwise */
}
char signed_char_check = (char) (-67);
int main() {
  exit(is_char_signed((int) signed_char_check));
}], [AC_MSG_RESULT(no)
AC_DEFINE(CHAR_IS_UNSIGNED,1)], AC_MSG_RESULT(yes),
[echo Assuming that char is signed on target machine.
echo If it is unsigned, this will be a little bit inefficient.
])
dnl
AC_MSG_CHECKING(to see if right shift is signed)
AC_TRY_RUN([
#ifdef HAVE_PROTOTYPES
int is_shifting_signed (long arg)
#else
int is_shifting_signed (arg)
     long arg;
#endif
/* See whether right-shift on a long is signed or not. */
{
  long res = arg >> 4;

  if (res == -0x7F7E80CL) {	/* expected result for signed shift */
    return 1;			/* right shift is signed */
  }
  /* see if unsigned-shift hack will fix it. */
  /* we can't just test exact value since it depends on width of long... */
  res |= (~0L) << (32-4);
  if (res == -0x7F7E80CL) {	/* expected result now? */
    return 0;			/* right shift is unsigned */
  }
  printf("Right shift isn't acting as I expect it to.\n");
  printf("I fear the JPEG software will not work at all.\n\n");
  return 0;			/* try it with unsigned anyway */
}
int main() {
  exit(is_shifting_signed(-0x7F7E80B1L));
}], [AC_MSG_RESULT(no)
AC_DEFINE(RIGHT_SHIFT_IS_UNSIGNED,1)], AC_MSG_RESULT(yes),
AC_MSG_RESULT(Assuming that right shift is signed on target machine.))
dnl
AC_MSG_CHECKING(to see if fopen accepts b spec)
AC_TRY_RUN([
#include <stdio.h>
int main() {
  if (fopen("conftestdata", "wb") != NULL)
    exit(0);
  exit(1);
}], AC_MSG_RESULT(yes), [AC_MSG_RESULT(no)
AC_DEFINE(DONT_USE_B_MODE,1)],
AC_MSG_RESULT(Assuming that it does.))
dnl
dnl system services
AC_PROG_INSTALL
AC_PROG_RANLIB

# Decide whether to use libtool,
# and if so whether to build shared, static, or both flavors of library.
AC_DISABLE_SHARED
AC_DISABLE_STATIC
if test "x$enable_shared" != xno  -o  "x$enable_static" != xno; then
  USELIBTOOL="yes"

  # Configure libtool.
  AC_PROG_LIBTOOL

  LIBTOOL="./libtool"
  O="lo"
  A="la"
  LN='$(LIBTOOL) --mode=link $(CC)'
  INSTALL_LIB='$(LIBTOOL) --mode=install ${INSTALL}'
  INSTALL_PROGRAM="\$(LIBTOOL) --mode=install $INSTALL_PROGRAM"
else
  USELIBTOOL="no"
  LIBTOOL=""
  O="o"
  A="a"
  LN='$(CC)'
  INSTALL_LIB="$INSTALL_DATA"
fi
AC_SUBST(LIBTOOL)
AC_SUBST(O)
AC_SUBST(A)
AC_SUBST(LN)
AC_SUBST(INSTALL_LIB)

# Select memory manager depending on user input.
# If no "-enable-maxmem", use jmemnobs
MEMORYMGR='jmemnobs.$(O)'
MAXMEM="no"
AC_ARG_ENABLE(maxmem,
[  --enable-maxmem[=N]     enable use of temp files, set max mem usage to N MB],
MAXMEM="$enableval")
dnl [# support --with-maxmem for backwards compatibility with IJG V5.]
dnl AC_ARG_WITH(maxmem, , MAXMEM="$withval")
if test "x$MAXMEM" = xyes; then
  MAXMEM=1
fi
if test "x$MAXMEM" != xno; then
changequote(, )dnl
  if test -n "`echo $MAXMEM | sed 's/[0-9]//g'`"; then
changequote([, ])dnl
    AC_MSG_ERROR(non-numeric argument to --enable-maxmem)
  fi
  DEFAULTMAXMEM=`expr $MAXMEM \* 1048576`
AC_DEFINE_UNQUOTED(DEFAULT_MAX_MEM, ${DEFAULTMAXMEM})
AC_MSG_CHECKING([for 'tmpfile()'])
AC_TRY_LINK([#include <stdio.h>], [ FILE * tfile = tmpfile(); ],
[AC_MSG_RESULT(yes)
MEMORYMGR='jmemansi.$(O)'],
[AC_MSG_RESULT(no)
dnl if tmpfile is not present, must use jmemname.
MEMORYMGR='jmemname.$(O)'
AC_DEFINE(NEED_SIGNAL_CATCHER,1)
AC_MSG_CHECKING([for 'mktemp()'])
AC_TRY_LINK(, [ char fname[80]; mktemp(fname); ], AC_MSG_RESULT(yes),
[AC_MSG_RESULT(no)
AC_DEFINE(NO_MKTEMP,1)])])
fi
AC_SUBST(MEMORYMGR)

# Include PNG support in cjpeg/djpeg if appropriate.
AC_ARG_WITH(png,
[  --with-png              enable PNG support in cjpeg/djpeg],
[#], [with_png="maybe"])

# try to detect whether libpng is present
if test "x$with_png" = xmaybe ; then
  AC_CHECK_HEADER(png.h, [: ok so far], [with_png="no"])
fi
if test "x$with_png" = xmaybe ; then
  AC_CHECK_HEADER(zlib.h, [: ok so far], [with_png="no"])
fi
if test "x$with_png" = xmaybe ; then
  AC_CHECK_LIB(z, deflate, [: ok so far], [with_png="no"])
fi
if test "x$with_png" = xmaybe ; then
  AC_CHECK_LIB(png, png_create_info_struct,
	[with_png="yes"], [with_png="no"], [-lz -lm])
fi

if test "x$with_png" = xyes ; then
  AC_DEFINE(PNG_SUPPORTED,1)
  LIBS="-lpng -lz -lm $LIBS"
fi

# Extract the library version ID from jpeglib.h.
AC_MSG_CHECKING([libjpeg version number])
[JPEG_LIB_VERSION=`sed -e '/^#define JPEG_LIB_VERSION/!d' -e 's/^[^0-9]*\([0-9][0-9]*\).*$/\1/' $srcdir/jpeglib.h`]
AC_MSG_RESULT($JPEG_LIB_VERSION)
AC_SUBST(JPEG_LIB_VERSION)

# Prepare to massage makefile.cfg correctly.
if test $ijg_cv_have_prototypes = yes; then
  A2K_DEPS=""
  COM_A2K="# "
else
  A2K_DEPS="ansi2knr"
  COM_A2K=""
fi
AC_SUBST(A2K_DEPS)
AC_SUBST(COM_A2K)
# ansi2knr needs -DBSD if string.h is missing
if test $ac_cv_header_string_h = no; then
  ANSI2KNRFLAGS="-DBSD"
else
  ANSI2KNRFLAGS=""
fi
AC_SUBST(ANSI2KNRFLAGS)
dnl
# Substitutions to enable or disable libtool-related stuff
if test $USELIBTOOL = yes -a $ijg_cv_have_prototypes = yes; then
  COM_LT=""
else
  COM_LT="# "
fi
AC_SUBST(COM_LT)
if test "x$enable_shared" != xno; then
  FORCE_INSTALL_LIB="install-lib"
else
  FORCE_INSTALL_LIB=""
fi
AC_SUBST(FORCE_INSTALL_LIB)
dnl
# Set up -I directives
if test "x$srcdir" = x.; then
  INCLUDEFLAGS='-I$(srcdir)'
else
  if test "x$GCC" = xyes; then
    INCLUDEFLAGS='-I- -I. -I$(srcdir)'
  else
    INCLUDEFLAGS='-I. -I$(srcdir)'
  fi
fi
AC_SUBST(INCLUDEFLAGS)
dnl
AC_OUTPUT(Makefile:makefile.cfg)


--- NEW FILE import.log ---
mingw32-libjpeg-6b-8_fc11:EL-5:mingw32-libjpeg-6b-8.fc11.src.rpm:1233315962

jpeg-c++.patch:

--- NEW FILE jpeg-c++.patch ---
--- jpeg-6b/jpeglib.h.c++	Sat Jun 17 21:58:15 2000
+++ jpeg-6b/jpeglib.h	Sat Jun 17 21:58:53 2000
@@ -13,6 +13,10 @@
 #ifndef JPEGLIB_H
 #define JPEGLIB_H
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /*
  * First we include the configuration files that record how this
  * installation of the JPEG library is set up.  jconfig.h can be
@@ -1091,6 +1095,10 @@
 #ifdef JPEG_INTERNALS
 #include "jpegint.h"		/* fetch private declarations */
 #include "jerror.h"		/* fetch error codes too */
+#endif
+
+#ifdef __cplusplus
+}
 #endif
 
 #endif /* JPEGLIB_H */

jpeg-mingw32.patch:

--- NEW FILE jpeg-mingw32.patch ---
diff -rup jpeg-6b/makefile.cfg jpeg-6b.new/makefile.cfg
--- jpeg-6b/makefile.cfg	2008-09-09 09:54:38.000000000 -0400
+++ jpeg-6b.new/makefile.cfg	2008-09-09 09:55:03.000000000 -0400
@@ -169,7 +169,7 @@ libjpeg.a: @A2K_DEPS@ $(LIBOBJECTS)
 # with libtool:
 libjpeg.la: @A2K_DEPS@ $(LIBOBJECTS)
 	$(LIBTOOL) --mode=link $(CC) $(CFLAGS) -o libjpeg.la $(LIBOBJECTS) \
-		-rpath $(libdir) -version-info $(JPEG_LIB_VERSION)
+		-no-undefined -rpath $(libdir) -version-info $(JPEG_LIB_VERSION)
 
 # sample programs:
 

libjpeg-autoconf.patch:

--- NEW FILE libjpeg-autoconf.patch ---
Work around bogosity in autoconf-2.62: it breaks #undef's that have a
comment after them, a construct that has worked fine in every previous
autoconf release.  See bz #449471 and bz #449245.


diff -Naur jpeg-6b.orig/jconfig.cfg jpeg-6b/jconfig.cfg
--- jpeg-6b.orig/jconfig.cfg	1994-12-06 11:43:15.000000000 -0500
+++ jpeg-6b/jconfig.cfg	2008-05-31 16:59:32.000000000 -0400
@@ -28,11 +28,16 @@
 
 #ifdef JPEG_CJPEG_DJPEG
 
-#define BMP_SUPPORTED		/* BMP image file format */
-#define GIF_SUPPORTED		/* GIF image file format */
-#define PPM_SUPPORTED		/* PBMPLUS PPM/PGM image file format */
-#undef RLE_SUPPORTED		/* Utah RLE image file format */
-#define TARGA_SUPPORTED		/* Targa image file format */
+/* BMP image file format */
+#define BMP_SUPPORTED
+/* GIF image file format */
+#define GIF_SUPPORTED
+/* PBMPLUS PPM/PGM image file format */
+#define PPM_SUPPORTED
+/* Utah RLE image file format */
+#undef RLE_SUPPORTED
+/* Targa image file format */
+#define TARGA_SUPPORTED
 
 #undef TWO_FILE_COMMANDLINE
 #undef NEED_SIGNAL_CATCHER

libjpeg-buf-oflo.patch:

--- NEW FILE libjpeg-buf-oflo.patch ---
Dike out a section of code that has no usefulness on Unix-like systems,
and will crash if fed a comment string exceeding 64K.  Per report from
Lubomir Kundrak, RH bug #226965


diff -Naur jpeg-6b.orig/wrjpgcom.c jpeg-6b/wrjpgcom.c
--- jpeg-6b.orig/wrjpgcom.c	1997-10-23 00:47:03.000000000 -0400
+++ jpeg-6b/wrjpgcom.c	2007-06-25 22:26:42.000000000 -0400
@@ -446,6 +446,8 @@
     } else if (keymatch(arg, "comment", 1)) {
       if (++argn >= argc) usage();
       comment_arg = argv[argn];
+#if 0
+#error "There is a buffer overflow in the code below"
       /* If the comment text starts with '"', then we are probably running
        * under MS-DOG and must parse out the quoted string ourselves.  Sigh.
        */
@@ -466,6 +468,7 @@
 	  strcat(comment_arg, argv[argn]);
 	}
       }
+#endif
       comment_length = (unsigned int) strlen(comment_arg);
     } else
       usage();

libjpeg-cflags.patch:

--- NEW FILE libjpeg-cflags.patch ---
--- jpeg-6b/makefile.cfg.useCFLAGS	1998-03-21 14:08:57.000000000 -0500
+++ jpeg-6b/makefile.cfg	2006-07-10 17:21:14.000000000 -0400
@@ -54,7 +54,7 @@
 # miscellaneous OS-dependent stuff
 SHELL= /bin/sh
 # linker
-LN= @LN@
+LN= @LN@ $(CFLAGS) 
 # file deletion command
 RM= rm -f
 # directory creation command
@@ -168,7 +168,7 @@
 
 # with libtool:
 libjpeg.la: @A2K_DEPS@ $(LIBOBJECTS)
-	$(LIBTOOL) --mode=link $(CC) -o libjpeg.la $(LIBOBJECTS) \
+	$(LIBTOOL) --mode=link $(CC) $(CFLAGS) -o libjpeg.la $(LIBOBJECTS) \
 		-rpath $(libdir) -version-info $(JPEG_LIB_VERSION)
 
 # sample programs:


--- NEW FILE mingw32-libjpeg.spec ---
%define __strip %{_mingw32_strip}
%define __objdump %{_mingw32_objdump}
%define _use_internal_dependency_generator 0
%define __find_requires %{_mingw32_findrequires}
%define __find_provides %{_mingw32_findprovides}

# Build the programs like cjpeg, etc.
# https://bugzilla.redhat.com/show_bug.cgi?id=467401c7
%define build_programs 0

Name:           mingw32-libjpeg
Version:        6b
Release:        8%{?dist}
Summary:        MinGW Windows Libjpeg library

License:        IJG
URL:            http://www.ijg.org/
Group:          Development/Libraries
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0:        ftp://ftp.uu.net/graphics/jpeg/jpegsrc.v%{version}.tar.gz
Source1:        configure.in

Patch1:         jpeg-c++.patch
Patch4:         libjpeg-cflags.patch
Patch5:         libjpeg-buf-oflo.patch
Patch6:         libjpeg-autoconf.patch

Patch100:       jpeg-mingw32.patch

BuildArch:      noarch

BuildRequires:  mingw32-filesystem >= 23
BuildRequires:  mingw32-dlfcn
BuildRequires:  mingw32-gcc
BuildRequires:  mingw32-binutils
BuildRequires:  mingw32-libpng
BuildRequires:  mingw32-zlib
BuildRequires:  autoconf, libtool


%description
MinGW Windows Libjpeg library.


%prep
%setup -q -n jpeg-6b

%patch1 -p1 -b .c++
%patch4 -p1 -b .cflags
%patch5 -p1 -b .oflo
%patch6 -p1

%patch100 -p1

# For long-obsolete reasons, libjpeg 6b doesn't ship with a configure.in.
# We need to re-autoconf though, in order to update libtool support,
# so supply configure.in.
cp %{SOURCE1} configure.in

# libjpeg 6b includes a horribly obsolete version of libtool.
# Blow it away and replace with build system's version.
rm -f config.guess config.sub ltmain.sh ltconfig aclocal.m4

cat /usr/share/aclocal/libtool.m4 > aclocal.m4
# If this is the new libtool 2.x, we need to append some additional
# files.  Rather than hard-coding a version of libtool, just test
# if the files exist and append them:
for f in \
  /usr/share/aclocal/ltoptions.m4 \
  /usr/share/aclocal/ltversion.m4 \
  /usr/share/aclocal/ltsugar.m4 \
  /usr/share/aclocal/lt~obsolete.m4; do
  if [ -f $f ]; then cat $f >> aclocal.m4; fi
done

# Now we can run libtool.
libtoolize

# Automake can fail - we only need this to get config.sub and config.guess.
automake -a ||:

# Finally because we replaced configure.in:
autoconf


%build
%{_mingw32_configure} --enable-shared --disable-static
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT

mkdir -p $RPM_BUILD_ROOT%{_mingw32_bindir}
mkdir -p $RPM_BUILD_ROOT%{_mingw32_includedir}
mkdir -p $RPM_BUILD_ROOT%{_mingw32_libdir}
mkdir -p $RPM_BUILD_ROOT%{_mingw32_mandir}/man1

%{_mingw32_makeinstall}

# Remove manual pages which duplicate Fedora native.
rm -rf $RPM_BUILD_ROOT%{_mingw32_mandir}

pushd $RPM_BUILD_ROOT%{_mingw32_bindir}
# Rename or remove win32 native binaries
for i in cjpeg djpeg jpegtran rdjpgcom wrjpgcom ; do
%if %build_programs
   mv $i $i.exe
%else
   rm $i
%endif
done
popd


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root)
%doc README
%if %build_programs
%{_mingw32_bindir}/cjpeg.exe
%{_mingw32_bindir}/djpeg.exe
%{_mingw32_bindir}/jpegtran.exe
%{_mingw32_bindir}/rdjpgcom.exe
%{_mingw32_bindir}/wrjpgcom.exe
%endif
%{_mingw32_bindir}/libjpeg-62.dll
%{_mingw32_includedir}/jconfig.h
%{_mingw32_includedir}/jerror.h
%{_mingw32_includedir}/jmorecfg.h
%{_mingw32_includedir}/jpeglib.h
%{_mingw32_libdir}/libjpeg.dll.a
%{_mingw32_libdir}/libjpeg.la


%changelog
* Wed Jan 28 2009 Richard W.M. Jones <rjones at redhat.com> - 6b-8
- Exclude the binaries.
- Rename the binaries to *.exe (Levente Farkas).

* Fri Jan 23 2009 Richard W.M. Jones <rjones at redhat.com> - 6b-7
- Disable static libraries.
- Use _smp_mflags.
- Update for new libtool 2.
- +BR mingw32-dlfcn.
- Added documentation (README includes the license).

* Thu Nov 20 2008 Richard W.M. Jones <rjones at redhat.com> - 6b-6
- Don't set libdir in the make step.
- Fix path to mandir.

* Wed Sep 24 2008 Richard W.M. Jones <rjones at redhat.com> - 6b-5
- Rename mingw -> mingw32.

* Mon Sep 22 2008 Daniel P. Berrange <berrange at redhat.com> - 6b-4
- Switch to tar.bz2 source, and rename configure.in

* Sun Sep 21 2008 Daniel P. Berrange <berrange at redhat.com> - 6b-3
- Fix URL.
- Remove manpages which duplicate Fedora native.

* Wed Sep 10 2008 Daniel P. Berrange <berrange at redhat.com> - 6b-2
- Rename configure.in with a prefix.
- Remove static library.

* Tue Sep  9 2008 Daniel P. Berrange <berrange at redhat.com> - 6b-1
- Initial RPM release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-libjpeg/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	29 Jan 2009 00:09:08 -0000	1.1
+++ .cvsignore	30 Jan 2009 11:49:18 -0000	1.2
@@ -0,0 +1 @@
+jpegsrc.v6b.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-libjpeg/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	29 Jan 2009 00:09:08 -0000	1.1
+++ sources	30 Jan 2009 11:49:18 -0000	1.2
@@ -0,0 +1 @@
+dbd5f3b47ed13132f04c685d608a7547  jpegsrc.v6b.tar.gz



From kwizart at fedoraproject.org  Fri Jan 30 11:54:07 2009
From: kwizart at fedoraproject.org (Chauvet Nicolas)
Date: Fri, 30 Jan 2009 11:54:07 +0000 (UTC)
Subject: rpms/dirac/EL-5 sources,1.3,1.4 dirac.spec,1.3,1.4
Message-ID: <20090130115407.9425370117@cvs1.fedora.phx.redhat.com>

Author: kwizart

Update of /cvs/pkgs/rpms/dirac/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29556

Modified Files:
	sources dirac.spec 
Log Message:
Update to 1.0.0



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dirac/EL-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	10 Jun 2007 14:35:40 -0000	1.3
+++ sources	30 Jan 2009 11:53:37 -0000	1.4
@@ -1 +1 @@
-cacc7a7c322ec50f7d4475466563a187  dirac-0.7.0.tar.gz
+017b8d7d54caf9400ef72dcaee34a9d6  dirac-1.0.0.tar.gz


Index: dirac.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dirac/EL-5/dirac.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- dirac.spec	10 Jun 2007 15:00:09 -0000	1.3
+++ dirac.spec	30 Jan 2009 11:53:37 -0000	1.4
@@ -1,29 +1,20 @@
-#define cvs 20070325
-
 Name:           dirac
-Version:        0.7.0
-Release:        1%{?dist}
+Version:        1.0.0
+Release:        2%{?dist}
 Summary:        Dirac is an open source video codec 
 
 Group:          System Environment/Libraries
-License:        MPL
+License:        MPLv1.1
 URL:            http://dirac.sourceforge.net/
-#cvs -z3 -d:pserver:anonymous at dirac.cvs.sourceforge.net:/cvsroot/dirac co -P compress
-#find . -type d -name CVS -print0 | xargs -0r rm -rf
-#autoreconf -fi && ./configure && make dist
 Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
-#Source1:        %{name}-%{version}-%{cvs}.tar.gz
-Source10:        %{name}-snapshot.sh
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  cppunit-devel
 BuildRequires:  doxygen
-BuildRequires:  graphviz
-BuildRequires:  libtool
+BuildRequires:  graphviz-devel
 BuildRequires:  tetex-latex
+BuildRequires:  tetex
 
-Requires(post): /sbin/ldconfig
-Requires(postun): /sbin/ldconfig
 
 %description
 Dirac is an open source video codec. It uses a traditional hybrid video codec
@@ -56,38 +47,26 @@
 
 
 %prep
-%setup -q 
-install -m 644 README README.Dirac
-install -m 644 util/instrumentation/README README.instrumentation
+%setup -q
+install -pm 644 README README.Dirac
+install -pm 644 util/instrumentation/README README.instrumentation
 # fix permission mode for sources.
-find doc unit_tests util libdirac_encoder -type f -name \* -exec chmod 644 {} \;
-# fix wrong end of line encoding
-sed -i 's/\r//' libdirac_encoder/rate_control.cpp
-sed -i 's/\r//' libdirac_encoder/rate_control.h
-
-
-# Only update the doxygen file before generated with make
-pushd doc/documentation/code/api/
-%{_bindir}/doxygen -u dirac_api.doxygen
-popd
-
+find doc unit_tests util libdirac_encoder libdirac_byteio -type f -name \* -exec chmod 644 {} \;
 
 
 %build
-%configure  CXXFLAGS="${RPM_OPT_FLAGS}"  CFLAGS="${RPM_OPT_FLAGS}" \
-	--program-prefix=dirac_ \
-	--program-transform-name=s,dirac_dirac_,dirac_, \
-	--libdir=%{_libdir} \
-	--enable-overlay \
-	--enable-debug=no \
-	--disable-static \
+%configure \
+  --program-prefix=dirac_ \
+  --program-transform-name=s,dirac_dirac_,dirac_, \
+  --enable-overlay \
+  --disable-static \
 %ifarch x86_64 \
-	--enable-mmx=yes \
+  --enable-mmx=yes \
 %else \
-	--enable-mmx=no \
+  --enable-mmx=no \
 %endif
 
-sed -i -e 's|CXXFLAGS =  -g -pedantic -Wall -Werror|CXXFLAGS =  -g -pedantic -Wall|' decoder/Makefile
+sed -i -e 's|-Werror||' decoder/Makefile
 
 # remove rpath from libtool (may be unneeded)
 sed -i.rpath 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
@@ -98,17 +77,12 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT __doc
-make install DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
 find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 
 # Move doc in docdir macro
 mv $RPM_BUILD_ROOT%{_datadir}/doc/dirac __doc
 
-# Clean produced doc...
-find __doc -name '*.html' -exec sed -i 's/\r//' {} \; 
-find __doc -name '*.htm' -exec sed -i 's/\r//' {} \; 
-find __doc -name '*.css' -exec sed -i 's/\r//' {} \; 
-
 # Transform-name fix
 mv $RPM_BUILD_ROOT%{_bindir}/dirac_create_dirac_testfile.pl \
 	$RPM_BUILD_ROOT%{_bindir}/create_dirac_testfile.pl
@@ -131,7 +105,7 @@
 
 %files devel
 %defattr(-,root,root,-)
-%{_includedir}/dirac
+%{_includedir}/dirac/
 %{_libdir}/pkgconfig/dirac.pc
 %{_libdir}/libdirac_*.so
 
@@ -146,6 +120,10 @@
 
 
 %changelog
+* Fri Jan 30 2008 kwizart < kwizart at gmail.com > - 1.0.0-2
+- Adapt for EPEL-5
+- Update to 1.0.0
+
 * Tue Jun 15 2007 kwizart < kwizart at gmail.com > - 0.7.0-1
 - Update to 0.7.0
 



From denis at fedoraproject.org  Fri Jan 30 11:54:55 2009
From: denis at fedoraproject.org (Denis Leroy)
Date: Fri, 30 Jan 2009 11:54:55 +0000 (UTC)
Subject: rpms/libgnomedb/devel libgnomedb.spec,1.33,1.34
Message-ID: <20090130115455.4F17A70117@cvs1.fedora.phx.redhat.com>

Author: denis

Update of /cvs/pkgs/rpms/libgnomedb/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29752

Modified Files:
	libgnomedb.spec 
Log Message:
Fix pre scriptlet to check for upgrade from 3.0 case (#481438)


Index: libgnomedb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libgnomedb/devel/libgnomedb.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- libgnomedb.spec	23 Jan 2009 12:40:36 -0000	1.33
+++ libgnomedb.spec	30 Jan 2009 11:54:24 -0000	1.34
@@ -1,7 +1,7 @@
 Name:            libgnomedb
 Epoch:           1
 Version:         3.99.7
-Release:         1%{?dist}
+Release:         2%{?dist}
 Summary:         Library for writing gnome database programs
 Group:           System Environment/Libraries
 License:         LGPLv2+
@@ -89,8 +89,13 @@
 %pre
 if [ "$1" -gt 1 ]; then
     export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+    if [ -r %{_sysconfdir}/gconf/schemas/libgnomedb-3.0.schemas ]; then
+    gconftool-2 --makefile-uninstall-rule \
+      %{_sysconfdir}/gconf/schemas/libgnomedb-3.0.schemas >/dev/null || : ;
+    else
     gconftool-2 --makefile-uninstall-rule \
       %{_sysconfdir}/gconf/schemas/libgnomedb-4.0.schemas >/dev/null || :
+    fi
 fi
 
 
@@ -158,6 +163,9 @@
 
 
 %changelog
+* Fri Jan 30 2009 Denis Leroy <denis at poolshark.org> - 1:3.99.7-2
+- Fix pre scriptlet to check for upgrade from 3.0 case (#481438)
+
 * Wed Jan 21 2009 Denis Leroy <denis at poolshark.org> - 1:3.99.7-1
 - Update to upstream 3.99.7 (4.0 API)
 - Updated list of BRs



From caolanm at fedoraproject.org  Fri Jan 30 11:55:04 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Fri, 30 Jan 2009 11:55:04 +0000 (UTC)
Subject: rpms/libgsf/devel libgsf-1.14.11.gcc39015.patch, NONE,
	1.1 libgsf.spec, 1.63, 1.64
Message-ID: <20090130115504.2BCAA70117@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/libgsf/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29830

Modified Files:
	libgsf.spec 
Added Files:
	libgsf-1.14.11.gcc39015.patch 
Log Message:
fix g_enum_register_static use

libgsf-1.14.11.gcc39015.patch:

--- NEW FILE libgsf-1.14.11.gcc39015.patch ---
diff -ru libgsf-1.14.11.orig/gsf/gsf-output-csv.c libgsf-1.14.11/gsf/gsf-output-csv.c
--- libgsf-1.14.11.orig/gsf/gsf-output-csv.c	2009-01-30 11:51:12.000000000 +0000
+++ libgsf-1.14.11/gsf/gsf-output-csv.c	2009-01-30 11:51:33.000000000 +0000
@@ -182,7 +182,7 @@
 	static GType gsf_output_csv_quoting_mode_type = 0;
 
 	if (gsf_output_csv_quoting_mode_type == 0) {
-		GEnumValue const values[] = {
+		static GEnumValue const values[] = {
 		{ GSF_OUTPUT_CSV_QUOTING_MODE_NEVER,  (char *)"GSF_OUTPUT_CSV_QUOTING_MODE_NEVER",  (char *)"never" },
 		{ GSF_OUTPUT_CSV_QUOTING_MODE_AUTO,   (char *)"GSF_OUTPUT_CSV_QUOTING_MODE_AUTO",   (char *)"auto" },
 		{ GSF_OUTPUT_CSV_QUOTING_MODE_ALWAYS, (char *)"GSF_OUTPUT_CSV_QUOTING_MODE_ALWAYS", (char *)"always" },


Index: libgsf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libgsf/devel/libgsf.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- libgsf.spec	7 Jan 2009 09:12:41 -0000	1.63
+++ libgsf.spec	30 Jan 2009 11:54:33 -0000	1.64
@@ -4,7 +4,7 @@
 Summary: GNOME Structured File library
 Name: libgsf
 Version: 1.14.11
-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
@@ -17,6 +17,8 @@
 Requires(post): GConf2
 Requires(preun): GConf2
 
+Patch0: libgsf-1.14.11.gcc39015.patch
+
 %description
 A library for reading and writing structured files (eg MS OLE and Zip)
 
@@ -57,6 +59,7 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b.gcc39015
 
 %build
 %configure --disable-gtk-doc --disable-static
@@ -132,6 +135,9 @@
 rm -r $RPM_BUILD_ROOT
 
 %changelog
+* Fri Jan 30 2009 Caol??n McNamara <caolanm at redhat.com> 1.14.11-2
+- fix g_enum_register_static use
+
 * Wed Jan 07 2009 Caol??n McNamara <caolanm at redhat.com> 1.14.11-1
 - latest version
 



From kzak at fedoraproject.org  Fri Jan 30 11:59:18 2009
From: kzak at fedoraproject.org (Karel Zak)
Date: Fri, 30 Jan 2009 11:59:18 +0000 (UTC)
Subject: rpms/lsof/devel lsof_4.81-man.patch,NONE,1.1 lsof.spec,1.43,1.44
Message-ID: <20090130115918.C5A4570117@cvs1.fedora.phx.redhat.com>

Author: kzak

Update of /cvs/pkgs/rpms/lsof/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30900

Modified Files:
	lsof.spec 
Added Files:
	lsof_4.81-man.patch 
Log Message:
* Fri Jan 30 2009 Karel Zak <kzak at redhat.com> 4.81-2
- fix #480694 - lsof manpage mismarked and formats badly


lsof_4.81-man.patch:

--- NEW FILE lsof_4.81-man.patch ---
diff -up lsof_4.81-rh/lsof.8.kzak lsof_4.81-rh/lsof.8
--- lsof_4.81-rh/lsof.8.kzak	2009-01-30 12:19:34.000000000 +0100
+++ lsof_4.81-rh/lsof.8	2009-01-30 12:54:00.000000000 +0100
@@ -127,27 +127,27 @@ listing of all network files OR files be
 by user ``foo''.
 The exceptions are:
 .IP
-.TP \w'1) 'u
+.TP \w'1)'u+1
 1)
 the `^' (negated) login name or user ID (UID), specified with the
 .B \-u
 option;
-.TP \w'1) 'u
+.TP \w'1)'u+1
 2)
 the `^' (negated) process ID (PID), specified with the
 .B \-p
 option;
-.TP \w'1) 'u
+.TP \w'1)'u+1
 3)
 the `^' (negated) process group ID (PGID), specified with the
 .B \-g
 option;
-.TP \w'1) 'u
+.TP \w'1)'u+1
 4)
 the `^' (negated) command, specified with the
 .B \-c
 option;
-.TP \w'1) 'u
+.TP \w'1)'u+1
 5)
 the ('^') negated TCP or UDP protocol state names, specified with the
 .BI \-s " [p:s]"


Index: lsof.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lsof/devel/lsof.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- lsof.spec	2 Dec 2008 12:16:44 -0000	1.43
+++ lsof.spec	30 Jan 2009 11:58:48 -0000	1.44
@@ -1,7 +1,7 @@
 Summary: A utility which lists open files on a Linux/UNIX system
 Name: lsof
 Version: 4.81
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: zlib
 Group: Development/Debuggers
 
@@ -21,6 +21,8 @@
 
 # 184338 - allow lsof access nptl threads
 Patch1: lsof_4.81-threads.patch
+# 480694 - lsof manpage mismarked and formats badly
+Patch2: lsof_4.81-man.patch
 
 %description
 Lsof stands for LiSt Open Files, and it does just that: it lists
@@ -30,6 +32,7 @@
 %prep
 %setup -q -n %{lsofrh}
 %patch1 -p1
+%patch2 -p1
 
 %build
 LSOF_VSTR=2.6.16 LINUX_BASE=/proc ./Configure -n linux
@@ -53,6 +56,9 @@
 %{_mandir}/man*/*
 
 %changelog
+* Fri Jan 30 2009 Karel Zak <kzak at redhat.com> 4.81-2
+- fix #480694 - lsof manpage mismarked and formats badly
+
 * Tue Dec  2 2008 Karel Zak <kzak at redhat.com> 4.81-1
 - upgrade to 4.81
   - lsof_4.80-threads.patch - rebased



From sindrepb at fedoraproject.org  Fri Jan 30 11:59:25 2009
From: sindrepb at fedoraproject.org (=?utf-8?q?Sindre_Pedersen_Bj=C3=B8rdal?=)
Date: Fri, 30 Jan 2009 11:59:25 +0000 (UTC)
Subject: rpms/gnome-do/devel .cvsignore, 1.9, 1.10 gnome-do.spec, 1.26,
	1.27 sources, 1.9, 1.10
Message-ID: <20090130115925.1829270117@cvs1.fedora.phx.redhat.com>

Author: sindrepb

Update of /cvs/pkgs/rpms/gnome-do/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30931

Modified Files:
	.cvsignore gnome-do.spec sources 
Log Message:
new upstream release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-do/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	11 Oct 2008 07:38:33 -0000	1.9
+++ .cvsignore	30 Jan 2009 11:58:54 -0000	1.10
@@ -1 +1 @@
-gnome-do-0.6.1.0.tar.gz
+gnome-do-0.8.0.tar.gz


Index: gnome-do.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-do/devel/gnome-do.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- gnome-do.spec	29 Jan 2009 16:54:19 -0000	1.26
+++ gnome-do.spec	30 Jan 2009 11:58:54 -0000	1.27
@@ -1,15 +1,15 @@
 %define			debug_package %{nil}
-%define                 mainver 0.6.1
+%define                 mainver 0.8.0
 
 Name:			gnome-do
-Version:		%{mainver}.0
-Release:		3%{?dist}
+Version:		%{mainver}
+Release:		1%{?dist}
 Summary:		Quick launch and search
 
 License:		GPLv3+
 Group:			Applications/File	
 URL:			http://do.davebsd.com/
-Source0:		http://launchpad.net/do/0.6/%{mainver}/+download/%{name}-%{version}.tar.gz
+Source0:		http://launchpad.net/do/trunk/%{mainver}/+download/gnome-do-0.8.0.tar.gz
 
 BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -122,6 +122,9 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Fri Jan 30 2009 Sindre Pedersen Bj??rdal <sindrepb at fedoraproject.org> - 0.8.0-1
+- New upstream release
+
 * Thu Jan 29 2009 Michel Salim <salimma at fedoraproject.org> - 0.6.1.0-3
 - Remove Tomboy dependency (bz #481183)
 - Updated description, from Do 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-do/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	11 Oct 2008 07:38:33 -0000	1.9
+++ sources	30 Jan 2009 11:58:54 -0000	1.10
@@ -1 +1 @@
-1b5df15e89f720b43c15e7bc8c205265  gnome-do-0.6.1.0.tar.gz
+29e8d088bf31d6e02b436f74e21c52be  gnome-do-0.8.0.tar.gz



From dnielsen at fedoraproject.org  Fri Jan 30 12:06:11 2009
From: dnielsen at fedoraproject.org (David Nielsen)
Date: Fri, 30 Jan 2009 12:06:11 +0000 (UTC)
Subject: rpms/banshee-mirage/devel banshee-mirage.spec, NONE, 1.1 import.log,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090130120611.4771470117@cvs1.fedora.phx.redhat.com>

Author: dnielsen

Update of /cvs/pkgs/rpms/banshee-mirage/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv589/devel

Modified Files:
	.cvsignore sources 
Added Files:
	banshee-mirage.spec import.log 
Log Message:
0.4.0



--- NEW FILE banshee-mirage.spec ---
%define         debug_package %{nil}

Name:		banshee-mirage
Version:	0.4.0
Release:	4%{?dist}
Summary:	An Automatic Playlist Generation Extension for Banshee
Group:		Applications/Multimedia
License:	GPLv2+
URL:		http://hop.at/mirage/
Source0:	http://hop.at/mirage/download/mirage-%{version}.tar.gz
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:	gettext-devel, glib2-devel, mono-devel, banshee-devel, banshee-musicbrainz-devel, fftw-devel, libsamplerate-devel, intltool, taglib-sharp-devel, mono-addins-devel, sqlite-devel, gstreamer-devel, gstreamer-plugins-base-devel, make, ndesk-dbus-glib-devel, ndesk-dbus-devel, gtk-sharp2-devel

# Bug 241850 - no Mono on pp64
ExclusiveArch: %ix86 x86_64 ppc ia64 armv4l sparc alpha

%description
An Automatic Playlist Generation Extension for Banshee

%prep
%setup -q -n mirage-%{version}

%build
%configure
make %{?_smp_mflags}

%install
%{__rm} -rf %{buildroot}
make DESTDIR=%{buildroot} install

# clean up
find %{buildroot} -name '*.la' -exec rm -f {} ';'
find %{buildroot} -name '*.a' -exec rm -f {} ';'

strip --strip-unneeded %{buildroot}/%{_libdir}/libmirageaudio.so

%find_lang Mirage

%clean
%{__rm} -rf %{buildroot}

%files -f Mirage.lang
%defattr(-,root,root,-)
%doc COPYING README
%{_libdir}/banshee-1/Extensions/Banshee.Mirage.*
%{_libdir}/banshee-1/Extensions/Mirage.*
%{_libdir}/libmirageaudio.so

%changelog
* Wed Jan 28 2009 David Nielsen <gnomeuser at gmail.com> 0.4.0-4
- strip unneeded symbols from libmirageaudio.so

* Wed Jan 28 2009 David Nielsen <gnomeuser at gmail.com> 0.4.0-3
- rename package to banshee-mirage

* Wed Jan 28 2009 David Nielsen <gnomeuser at gmail.com> 0.4.0-2
- Review cleanups

* Wed Jan 28 2009 David Nielsen <gnomeuser at gmail.com> 0.4.0-1
- Initial package


--- NEW FILE import.log ---
banshee-mirage-0_4_0-4_fc11:HEAD:banshee-mirage-0.4.0-4.fc11.src.rpm:1233317087


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/banshee-mirage/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	30 Jan 2009 06:21:49 -0000	1.1
+++ .cvsignore	30 Jan 2009 12:05:40 -0000	1.2
@@ -0,0 +1 @@
+mirage-0.4.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/banshee-mirage/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	30 Jan 2009 06:21:49 -0000	1.1
+++ sources	30 Jan 2009 12:05:40 -0000	1.2
@@ -0,0 +1 @@
+7ebb939d44b64667eaa90ab1ef9a2220  mirage-0.4.0.tar.gz



From caolanm at fedoraproject.org  Fri Jan 30 12:06:24 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Fri, 30 Jan 2009 12:06:24 +0000 (UTC)
Subject: rpms/libgsf/devel libgsf.spec,1.64,1.65
Message-ID: <20090130120624.834C670117@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/libgsf/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv670

Modified Files:
	libgsf.spec 
Log Message:
bah


Index: libgsf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libgsf/devel/libgsf.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- libgsf.spec	30 Jan 2009 11:54:33 -0000	1.64
+++ libgsf.spec	30 Jan 2009 12:05:53 -0000	1.65
@@ -59,7 +59,7 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b.gcc39015
+%patch0 -p1 -b .gcc39015
 
 %build
 %configure --disable-gtk-doc --disable-static



From pkgdb at fedoraproject.org  Fri Jan 30 12:06:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 12:06:37 +0000
Subject: [pkgdb] mingw32-cairo: mingwmaint has requested watchbugzilla
Message-ID: <20090130120644.D68A820860C@bastion.fedora.phx.redhat.com>

mingwmaint has requested the watchbugzilla acl on mingw32-cairo (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-cairo



From pkgdb at fedoraproject.org  Fri Jan 30 12:06:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 12:06:44 +0000
Subject: [pkgdb] mingw32-cairo: mingwmaint has requested watchcommits
Message-ID: <20090130120649.F1F3F20860F@bastion.fedora.phx.redhat.com>

mingwmaint has requested the watchcommits acl on mingw32-cairo (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-cairo



From pkgdb at fedoraproject.org  Fri Jan 30 12:06:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 12:06:34 +0000
Subject: [pkgdb] mingw32-cairo: mingwmaint has requested watchbugzilla
Message-ID: <20090130120649.F3D2F208678@bastion.fedora.phx.redhat.com>

mingwmaint has requested the watchbugzilla acl on mingw32-cairo (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-cairo



From pkgdb at fedoraproject.org  Fri Jan 30 12:06:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 12:06:49 +0000
Subject: [pkgdb] mingw32-libxml2: mingwmaint has requested watchbugzilla
Message-ID: <20090130120650.C141220873D@bastion.fedora.phx.redhat.com>

mingwmaint has requested the watchbugzilla acl on mingw32-libxml2 (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-libxml2



From pkgdb at fedoraproject.org  Fri Jan 30 12:06:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 12:06:38 +0000
Subject: [pkgdb] mingw32-cairo: mingwmaint has requested watchcommits
Message-ID: <20090130120650.9F7272086F7@bastion.fedora.phx.redhat.com>

mingwmaint has requested the watchcommits acl on mingw32-cairo (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-cairo



From pkgdb at fedoraproject.org  Fri Jan 30 12:06:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 12:06:46 +0000
Subject: [pkgdb] mingw32-cairo: mingwmaint has requested watchbugzilla
Message-ID: <20090130120654.6E74420874A@bastion.fedora.phx.redhat.com>

mingwmaint has requested the watchbugzilla acl on mingw32-cairo (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-cairo



From pkgdb at fedoraproject.org  Fri Jan 30 12:06:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 12:06:37 +0000
Subject: [pkgdb] mingw32-cairo: mingwmaint has requested watchcommits
Message-ID: <20090130120655.90513208967@bastion.fedora.phx.redhat.com>

mingwmaint has requested the watchcommits acl on mingw32-cairo (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-cairo



From pkgdb at fedoraproject.org  Fri Jan 30 12:06:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 12:06:54 +0000
Subject: [pkgdb] mingw32-libxml2: mingwmaint has requested watchcommits
Message-ID: <20090130120654.8892D208771@bastion.fedora.phx.redhat.com>

mingwmaint has requested the watchcommits acl on mingw32-libxml2 (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-libxml2



From pkgdb at fedoraproject.org  Fri Jan 30 12:06:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 12:06:55 +0000
Subject: [pkgdb] mingw32-libxml2: mingwmaint has requested watchbugzilla
Message-ID: <20090130120658.CDE6020897A@bastion.fedora.phx.redhat.com>

mingwmaint has requested the watchbugzilla acl on mingw32-libxml2 (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-libxml2



From pkgdb at fedoraproject.org  Fri Jan 30 12:06:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 12:06:58 +0000
Subject: [pkgdb] mingw32-libxml2: mingwmaint has requested watchcommits
Message-ID: <20090130120659.6A5A4208A5F@bastion.fedora.phx.redhat.com>

mingwmaint has requested the watchcommits acl on mingw32-libxml2 (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-libxml2



From pkgdb at fedoraproject.org  Fri Jan 30 12:06:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 12:06:55 +0000
Subject: [pkgdb] mingw32-libxml2: mingwmaint has requested watchcommits
Message-ID: <20090130120659.AB8A7208484@bastion.fedora.phx.redhat.com>

mingwmaint has requested the watchcommits acl on mingw32-libxml2 (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-libxml2



From pkgdb at fedoraproject.org  Fri Jan 30 12:07:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 12:07:01 +0000
Subject: [pkgdb] mingw32-libxml2: mingwmaint has requested watchbugzilla
Message-ID: <20090130120702.EE440208D5E@bastion.fedora.phx.redhat.com>

mingwmaint has requested the watchbugzilla acl on mingw32-libxml2 (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-libxml2



From pkgdb at fedoraproject.org  Fri Jan 30 12:07:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 12:07:05 +0000
Subject: [pkgdb] mingw32-libjpeg: mingwmaint has requested watchcommits
Message-ID: <20090130120705.C8B5D208DDC@bastion.fedora.phx.redhat.com>

mingwmaint has requested the watchcommits acl on mingw32-libjpeg (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-libjpeg



From pkgdb at fedoraproject.org  Fri Jan 30 12:07:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 12:07:06 +0000
Subject: [pkgdb] mingw32-libjpeg: mingwmaint has requested watchbugzilla
Message-ID: <20090130120708.94BDA208DE1@bastion.fedora.phx.redhat.com>

mingwmaint has requested the watchbugzilla acl on mingw32-libjpeg (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-libjpeg



From pkgdb at fedoraproject.org  Fri Jan 30 12:07:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 12:07:09 +0000
Subject: [pkgdb] mingw32-libjpeg: mingwmaint has requested watchbugzilla
Message-ID: <20090130120709.529F6208DE7@bastion.fedora.phx.redhat.com>

mingwmaint has requested the watchbugzilla acl on mingw32-libjpeg (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-libjpeg



From pkgdb at fedoraproject.org  Fri Jan 30 12:07:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 12:07:08 +0000
Subject: [pkgdb] mingw32-libjpeg: mingwmaint has requested watchbugzilla
Message-ID: <20090130120712.397F8208DEA@bastion.fedora.phx.redhat.com>

mingwmaint has requested the watchbugzilla acl on mingw32-libjpeg (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-libjpeg



From pkgdb at fedoraproject.org  Fri Jan 30 12:07:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 12:07:12 +0000
Subject: [pkgdb] mingw32-libjpeg: mingwmaint has requested watchcommits
Message-ID: <20090130120712.C3246208DF0@bastion.fedora.phx.redhat.com>

mingwmaint has requested the watchcommits acl on mingw32-libjpeg (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-libjpeg



From pkgdb at fedoraproject.org  Fri Jan 30 12:07:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 12:07:12 +0000
Subject: [pkgdb] mingw32-libjpeg: mingwmaint has requested watchcommits
Message-ID: <20090130120712.F3464208DF5@bastion.fedora.phx.redhat.com>

mingwmaint has requested the watchcommits acl on mingw32-libjpeg (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-libjpeg



From pkgdb at fedoraproject.org  Fri Jan 30 12:07:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 12:07:18 +0000
Subject: [pkgdb] mingw32-pixman: mingwmaint has requested watchcommits
Message-ID: <20090130120720.0D6EB2084B7@bastion.fedora.phx.redhat.com>

mingwmaint has requested the watchcommits acl on mingw32-pixman (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-pixman



From pkgdb at fedoraproject.org  Fri Jan 30 12:07:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 12:07:22 +0000
Subject: [pkgdb] mingw32-pixman: mingwmaint has requested watchbugzilla
Message-ID: <20090130120723.E190F208DFF@bastion.fedora.phx.redhat.com>

mingwmaint has requested the watchbugzilla acl on mingw32-pixman (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-pixman



From pkgdb at fedoraproject.org  Fri Jan 30 12:07:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 12:07:22 +0000
Subject: [pkgdb] mingw32-pixman: mingwmaint has requested watchcommits
Message-ID: <20090130120723.7D591208DFD@bastion.fedora.phx.redhat.com>

mingwmaint has requested the watchcommits acl on mingw32-pixman (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-pixman



From pkgdb at fedoraproject.org  Fri Jan 30 12:07:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 12:07:24 +0000
Subject: [pkgdb] mingw32-pixman: mingwmaint has requested watchcommits
Message-ID: <20090130120724.EAB4F208E07@bastion.fedora.phx.redhat.com>

mingwmaint has requested the watchcommits acl on mingw32-pixman (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-pixman



From pkgdb at fedoraproject.org  Fri Jan 30 12:07:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 12:07:24 +0000
Subject: [pkgdb] mingw32-pixman: mingwmaint has requested watchbugzilla
Message-ID: <20090130120726.827F9208E0F@bastion.fedora.phx.redhat.com>

mingwmaint has requested the watchbugzilla acl on mingw32-pixman (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-pixman



From pkgdb at fedoraproject.org  Fri Jan 30 12:07:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 12:07:22 +0000
Subject: [pkgdb] mingw32-pixman: mingwmaint has requested watchbugzilla
Message-ID: <20090130120726.DE937208E11@bastion.fedora.phx.redhat.com>

mingwmaint has requested the watchbugzilla acl on mingw32-pixman (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-pixman



From pkgdb at fedoraproject.org  Fri Jan 30 12:07:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 12:07:27 +0000
Subject: [pkgdb] mingw32-glib2: mingwmaint has requested watchbugzilla
Message-ID: <20090130120729.A8A1D208E15@bastion.fedora.phx.redhat.com>

mingwmaint has requested the watchbugzilla acl on mingw32-glib2 (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-glib2



From pkgdb at fedoraproject.org  Fri Jan 30 12:07:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 12:07:29 +0000
Subject: [pkgdb] mingw32-glib2: mingwmaint has requested watchbugzilla
Message-ID: <20090130120729.EE91C208E1A@bastion.fedora.phx.redhat.com>

mingwmaint has requested the watchbugzilla acl on mingw32-glib2 (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-glib2



From pkgdb at fedoraproject.org  Fri Jan 30 12:07:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 12:07:30 +0000
Subject: [pkgdb] mingw32-glib2: mingwmaint has requested watchcommits
Message-ID: <20090130120731.7D09A208E21@bastion.fedora.phx.redhat.com>

mingwmaint has requested the watchcommits acl on mingw32-glib2 (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-glib2



From pkgdb at fedoraproject.org  Fri Jan 30 12:07:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 12:07:31 +0000
Subject: [pkgdb] mingw32-glib2: mingwmaint has requested watchcommits
Message-ID: <20090130120733.746C520860F@bastion.fedora.phx.redhat.com>

mingwmaint has requested the watchcommits acl on mingw32-glib2 (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-glib2



From pkgdb at fedoraproject.org  Fri Jan 30 12:07:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 12:07:31 +0000
Subject: [pkgdb] mingw32-glib2: mingwmaint has requested watchbugzilla
Message-ID: <20090130120733.B2732208E2B@bastion.fedora.phx.redhat.com>

mingwmaint has requested the watchbugzilla acl on mingw32-glib2 (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-glib2



From pkgdb at fedoraproject.org  Fri Jan 30 12:07:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 12:07:33 +0000
Subject: [pkgdb] mingw32-glib2: mingwmaint has requested watchcommits
Message-ID: <20090130120733.C0C06208E2D@bastion.fedora.phx.redhat.com>

mingwmaint has requested the watchcommits acl on mingw32-glib2 (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-glib2



From pkgdb at fedoraproject.org  Fri Jan 30 12:08:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 12:08:35 +0000
Subject: [pkgdb] mingw32-cairo had acl change status
Message-ID: <20090130120836.4D46C208745@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on mingw32-cairo (Fedora devel) to Approved for mingwmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-cairo



From pkgdb at fedoraproject.org  Fri Jan 30 12:08:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 12:08:37 +0000
Subject: [pkgdb] mingw32-cairo had acl change status
Message-ID: <20090130120837.E114320876B@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on mingw32-cairo (Fedora devel) to Approved for mingwmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-cairo



From pkgdb at fedoraproject.org  Fri Jan 30 12:08:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 12:08:37 +0000
Subject: [pkgdb] mingw32-cairo had acl change status
Message-ID: <20090130120838.6DE2B208E27@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on mingw32-cairo (Fedora EPEL 5) to Approved for mingwmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-cairo



From pkgdb at fedoraproject.org  Fri Jan 30 12:08:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 12:08:39 +0000
Subject: [pkgdb] mingw32-cairo had acl change status
Message-ID: <20090130120842.9D75C208974@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on mingw32-cairo (Fedora 10) to Approved for mingwmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-cairo



From pkgdb at fedoraproject.org  Fri Jan 30 12:08:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 12:08:39 +0000
Subject: [pkgdb] mingw32-cairo had acl change status
Message-ID: <20090130120842.75405208E38@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on mingw32-cairo (Fedora 10) to Approved for mingwmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-cairo



From pkgdb at fedoraproject.org  Fri Jan 30 12:08:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 12:08:42 +0000
Subject: [pkgdb] mingw32-glib2 had acl change status
Message-ID: <20090130120844.7111D208E37@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on mingw32-glib2 (Fedora devel) to Approved for mingwmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-glib2



From pkgdb at fedoraproject.org  Fri Jan 30 12:08:45 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 12:08:45 +0000
Subject: [pkgdb] mingw32-glib2 had acl change status
Message-ID: <20090130120845.B8A50208E41@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on mingw32-glib2 (Fedora 10) to Approved for mingwmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-glib2



From pkgdb at fedoraproject.org  Fri Jan 30 12:08:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 12:08:40 +0000
Subject: [pkgdb] mingw32-cairo had acl change status
Message-ID: <20090130120846.2759C208E44@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on mingw32-cairo (Fedora EPEL 5) to Approved for mingwmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-cairo



From pkgdb at fedoraproject.org  Fri Jan 30 12:08:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 12:08:42 +0000
Subject: [pkgdb] mingw32-glib2 had acl change status
Message-ID: <20090130120846.37F42208E49@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on mingw32-glib2 (Fedora devel) to Approved for mingwmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-glib2



From pkgdb at fedoraproject.org  Fri Jan 30 12:08:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 12:08:48 +0000
Subject: [pkgdb] mingw32-glib2 had acl change status
Message-ID: <20090130120848.9E4BC208E4E@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on mingw32-glib2 (Fedora EPEL 5) to Approved for mingwmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-glib2



From pkgdb at fedoraproject.org  Fri Jan 30 12:08:46 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 12:08:46 +0000
Subject: [pkgdb] mingw32-glib2 had acl change status
Message-ID: <20090130120849.18E4E208E53@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on mingw32-glib2 (Fedora 10) to Approved for mingwmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-glib2



From pkgdb at fedoraproject.org  Fri Jan 30 12:08:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 12:08:51 +0000
Subject: [pkgdb] mingw32-glib2 had acl change status
Message-ID: <20090130120851.D70D9208E57@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on mingw32-glib2 (Fedora EPEL 5) to Approved for mingwmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-glib2



From pkgdb at fedoraproject.org  Fri Jan 30 12:08:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 12:08:52 +0000
Subject: [pkgdb] mingw32-libxml2 had acl change status
Message-ID: <20090130120852.BADA7208E5C@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on mingw32-libxml2 (Fedora devel) to Approved for mingwmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-libxml2



From pkgdb at fedoraproject.org  Fri Jan 30 12:08:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 12:08:55 +0000
Subject: [pkgdb] mingw32-libxml2 had acl change status
Message-ID: <20090130120858.C85842089F1@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on mingw32-libxml2 (Fedora 10) to Approved for mingwmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-libxml2



From pkgdb at fedoraproject.org  Fri Jan 30 12:08:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 12:08:56 +0000
Subject: [pkgdb] mingw32-libxml2 had acl change status
Message-ID: <20090130120858.EFF19208E68@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on mingw32-libxml2 (Fedora devel) to Approved for mingwmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-libxml2



From pkgdb at fedoraproject.org  Fri Jan 30 12:09:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 12:09:00 +0000
Subject: [pkgdb] mingw32-libxml2 had acl change status
Message-ID: <20090130120903.88732208A5F@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on mingw32-libxml2 (Fedora EPEL 5) to Approved for mingwmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-libxml2



From pkgdb at fedoraproject.org  Fri Jan 30 12:08:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 12:08:55 +0000
Subject: [pkgdb] mingw32-libxml2 had acl change status
Message-ID: <20090130120903.D6094208E73@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on mingw32-libxml2 (Fedora 10) to Approved for mingwmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-libxml2



From pkgdb at fedoraproject.org  Fri Jan 30 12:09:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 12:09:04 +0000
Subject: [pkgdb] mingw32-libxml2 had acl change status
Message-ID: <20090130120904.3EB3E208E78@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on mingw32-libxml2 (Fedora EPEL 5) to Approved for mingwmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-libxml2



From pkgdb at fedoraproject.org  Fri Jan 30 12:09:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 12:09:05 +0000
Subject: [pkgdb] mingw32-libjpeg had acl change status
Message-ID: <20090130120906.07816208E7E@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on mingw32-libjpeg (Fedora 10) to Approved for mingwmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-libjpeg



From pkgdb at fedoraproject.org  Fri Jan 30 12:09:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 12:09:06 +0000
Subject: [pkgdb] mingw32-libjpeg had acl change status
Message-ID: <20090130120906.DAC06208E85@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on mingw32-libjpeg (Fedora devel) to Approved for mingwmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-libjpeg



From pkgdb at fedoraproject.org  Fri Jan 30 12:09:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 12:09:07 +0000
Subject: [pkgdb] mingw32-libjpeg had acl change status
Message-ID: <20090130120907.8D07A208E8A@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on mingw32-libjpeg (Fedora 10) to Approved for mingwmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-libjpeg



From pkgdb at fedoraproject.org  Fri Jan 30 12:09:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 12:09:05 +0000
Subject: [pkgdb] mingw32-libjpeg had acl change status
Message-ID: <20090130120909.3C7BB208E8D@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on mingw32-libjpeg (Fedora devel) to Approved for mingwmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-libjpeg



From pkgdb at fedoraproject.org  Fri Jan 30 12:09:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 12:09:09 +0000
Subject: [pkgdb] mingw32-libjpeg had acl change status
Message-ID: <20090130120910.63F63208E90@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on mingw32-libjpeg (Fedora EPEL 5) to Approved for mingwmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-libjpeg



From pkgdb at fedoraproject.org  Fri Jan 30 12:09:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 12:09:14 +0000
Subject: [pkgdb] mingw32-pixman had acl change status
Message-ID: <20090130120920.77EB2208D0C@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on mingw32-pixman (Fedora devel) to Approved for mingwmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-pixman



From pkgdb at fedoraproject.org  Fri Jan 30 12:09:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 12:09:20 +0000
Subject: [pkgdb] mingw32-pixman had acl change status
Message-ID: <20090130120920.DB543208EA2@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on mingw32-pixman (Fedora 10) to Approved for mingwmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-pixman



From pkgdb at fedoraproject.org  Fri Jan 30 12:09:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 12:09:21 +0000
Subject: [pkgdb] mingw32-pixman had acl change status
Message-ID: <20090130120922.03E78208EA1@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on mingw32-pixman (Fedora EPEL 5) to Approved for mingwmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-pixman



From pkgdb at fedoraproject.org  Fri Jan 30 12:09:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 12:09:11 +0000
Subject: [pkgdb] mingw32-libjpeg had acl change status
Message-ID: <20090130120924.CB7A7208D1F@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on mingw32-libjpeg (Fedora EPEL 5) to Approved for mingwmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-libjpeg



From pkgdb at fedoraproject.org  Fri Jan 30 12:09:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 12:09:21 +0000
Subject: [pkgdb] mingw32-pixman had acl change status
Message-ID: <20090130120924.603C8208EA8@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on mingw32-pixman (Fedora 10) to Approved for mingwmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-pixman



From pkgdb at fedoraproject.org  Fri Jan 30 12:09:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 12:09:27 +0000
Subject: [pkgdb] mingw32-pixman had acl change status
Message-ID: <20090130120927.448AC208EAC@bastion.fedora.phx.redhat.com>

rjones has set the watchbugzilla acl on mingw32-pixman (Fedora EPEL 5) to Approved for mingwmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-pixman



From pkgdb at fedoraproject.org  Fri Jan 30 12:09:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 12:09:24 +0000
Subject: [pkgdb] mingw32-pixman had acl change status
Message-ID: <20090130120930.C501F208EB0@bastion.fedora.phx.redhat.com>

rjones has set the watchcommits acl on mingw32-pixman (Fedora devel) to Approved for mingwmaint

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mingw32-pixman



From pkgdb at fedoraproject.org  Fri Jan 30 12:23:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 12:23:14 +0000
Subject: [pkgdb] sugar-jukebox had acl change status
Message-ID: <20090130122314.2958220860E@bastion.fedora.phx.redhat.com>

sdz has set the watchcommits acl on sugar-jukebox (Fedora devel) to Approved for erikos

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-jukebox



From pkgdb at fedoraproject.org  Fri Jan 30 12:23:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 12:23:16 +0000
Subject: [pkgdb] sugar-jukebox had acl change status
Message-ID: <20090130122316.BC57520866E@bastion.fedora.phx.redhat.com>

sdz has set the commit acl on sugar-jukebox (Fedora devel) to Approved for erikos

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-jukebox



From pkgdb at fedoraproject.org  Fri Jan 30 12:23:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 12:23:19 +0000
Subject: [pkgdb] sugar-jukebox had acl change status
Message-ID: <20090130122319.D1CE4208679@bastion.fedora.phx.redhat.com>

sdz has set the approveacls acl on sugar-jukebox (Fedora devel) to Approved for erikos

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-jukebox



From pkgdb at fedoraproject.org  Fri Jan 30 12:23:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 12:23:24 +0000
Subject: [pkgdb] sugar-jukebox had acl change status
Message-ID: <20090130122324.804362086F7@bastion.fedora.phx.redhat.com>

sdz has set the watchcommits acl on sugar-jukebox (Fedora 9) to Approved for erikos

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-jukebox



From pkgdb at fedoraproject.org  Fri Jan 30 12:23:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 12:23:26 +0000
Subject: [pkgdb] sugar-jukebox had acl change status
Message-ID: <20090130122326.CD1CC208744@bastion.fedora.phx.redhat.com>

sdz has set the commit acl on sugar-jukebox (Fedora 9) to Approved for erikos

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-jukebox



From pkgdb at fedoraproject.org  Fri Jan 30 12:23:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 12:23:29 +0000
Subject: [pkgdb] sugar-jukebox had acl change status
Message-ID: <20090130122329.C8937208745@bastion.fedora.phx.redhat.com>

sdz has set the approveacls acl on sugar-jukebox (Fedora 9) to Approved for erikos

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-jukebox



From erikos at fedoraproject.org  Fri Jan 30 12:26:54 2009
From: erikos at fedoraproject.org (Simon Schampijer)
Date: Fri, 30 Jan 2009 12:26:54 +0000 (UTC)
Subject: rpms/sugar/devel .cvsignore, 1.24, 1.25 sources, 1.26,
	1.27 sugar.spec, 1.44, 1.45
Message-ID: <20090130122654.8A98470117@cvs1.fedora.phx.redhat.com>

Author: erikos

Update of /cvs/pkgs/rpms/sugar/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5001

Modified Files:
	.cvsignore sources sugar.spec 
Log Message:
* Fri Jan 30 2009 Simon Schampijer <simon at schampijer.de> - 0.83.5-3.20090130gitf7807dddc0
- Add 'View Details' option to object palette in journal
- Translation updates
- Hide OLPC-specific fields on non-xo machines #133
- Add a 'Clear search' button to 'No matching entries' message #266
- Correctly detect when a query in the journal is empty #255
- Avoid launching two instances of the same activity instance #238
- Add start-with option to objectpalette in the journal
- Fix dnd of icons in the favorite view #213
- Right click on AP should reveal palette not connect to AP #10
- Display space used and left in the volume palette in the journal #33
- Don't update the zoom level when a dialog window pops up
- Fix filtering the objectchooser with data types #219




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sugar/devel/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- .cvsignore	20 Jan 2009 15:35:42 -0000	1.24
+++ .cvsignore	30 Jan 2009 12:26:23 -0000	1.25
@@ -1 +1 @@
-sugar-0.83.5.tar.bz2
+sugar-0.83.5-gitf7807dddc0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sugar/devel/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- sources	20 Jan 2009 15:35:42 -0000	1.26
+++ sources	30 Jan 2009 12:26:23 -0000	1.27
@@ -1 +1 @@
-8d90769ce80efdb95f635b17943ac985  sugar-0.83.5.tar.bz2
+f4cc6798f7e192737b46982e457dad7b  sugar-0.83.5-gitf7807dddc0.tar.bz2


Index: sugar.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar/devel/sugar.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- sugar.spec	27 Jan 2009 05:59:56 -0000	1.44
+++ sugar.spec	30 Jan 2009 12:26:23 -0000	1.45
@@ -1,14 +1,19 @@
 %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")
 
-%define commitid 454def195d
-%define alphatag 20080822git%{commitid}
+%define commitid f7807dddc0
+%define alphatag 20090130git%{commitid}
 
 Summary: Constructionist learning platform
 Name: sugar
 Version: 0.83.5
-Release: 2%{?dist}
+#Release: 2%{?dist}
+Release: 3.%{alphatag}%{?dist}
 URL: http://sugarlabs.org/
-Source0: http://download.sugarlabs.org/sources/sucrose/glucose/%{name}/%{name}-%{version}.tar.bz2
+# git clone git://dev.laptop.org/sugar
+# cd sugar
+# git-checkout %{commitid}
+Source0: %{name}-%{version}-git%{commitid}.tar.bz2
+#Source0: http://download.sugarlabs.org/sources/sucrose/glucose/%{name}/%{name}-%{version}.tar.bz2
 License: GPLv2+
 Group: User Interface/Desktops
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -133,6 +138,20 @@
 %{_bindir}/sugar-emulator
 
 %changelog
+* Fri Jan 30 2009 Simon Schampijer <simon at schampijer.de> - 0.83.5-3.20090130gitf7807dddc0
+- Add 'View Details' option to object palette in journal
+- Translation updates
+- Hide OLPC-specific fields on non-xo machines #133
+- Add a 'Clear search' button to 'No matching entries' message #266
+- Correctly detect when a query in the journal is empty #255
+- Avoid launching two instances of the same activity instance #238
+- Add start-with option to objectpalette in the journal
+- Fix dnd of icons in the favorite view #213
+- Right click on AP should reveal palette not connect to AP #10
+- Display space used and left in the volume palette in the journal #33
+- Don't update the zoom level when a dialog window pops up
+- Fix filtering the objectchooser with data types #219
+
 * Tue Jan 27 2009 Bernie Innocenti <bernie at codewiz.org> - 0.83.5-2
 - Obsolete sugar-journal
 



From hadess at fedoraproject.org  Fri Jan 30 12:40:00 2009
From: hadess at fedoraproject.org (Bastien Nocera)
Date: Fri, 30 Jan 2009 12:40:00 +0000 (UTC)
Subject: rpms/control-center/F-10 control-center.spec, 1.409,
	1.410 gcc-set-https-handler.patch, 1.1, 1.2
Message-ID: <20090130124000.951F370117@cvs1.fedora.phx.redhat.com>

Author: hadess

Update of /cvs/pkgs/rpms/control-center/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8279

Modified Files:
	control-center.spec gcc-set-https-handler.patch 
Log Message:
* Fri Jan 30 2009 - Bastien Nocera <bnocera at redhat.com> - 2.24.0.1-13
- Fix crasher when the browser selected in GConf doesn't exist
  on the system (#483225)



Index: control-center.spec
===================================================================
RCS file: /cvs/pkgs/rpms/control-center/F-10/control-center.spec,v
retrieving revision 1.409
retrieving revision 1.410
diff -u -r1.409 -r1.410
--- control-center.spec	20 Jan 2009 11:13:40 -0000	1.409
+++ control-center.spec	30 Jan 2009 12:39:30 -0000	1.410
@@ -22,7 +22,7 @@
 Summary: GNOME Control Center
 Name: control-center
 Version: 2.24.0.1
-Release: 12%{?dist}
+Release: 13%{?dist}
 Epoch: 1
 License: GPLv2+ and GFDL
 Group: User Interface/Desktops
@@ -370,6 +370,10 @@
 %dir %{_datadir}/gnome-control-center/keybindings
 
 %changelog
+* Fri Jan 30 2009 - Bastien Nocera <bnocera at redhat.com> - 2.24.0.1-13
+- Fix crasher when the browser selected in GConf doesn't exist
+  on the system (#483225)
+
 * Tue Jan 20 2009 - Bastien Nocera <bnocera at redhat.com> - 2.24.0.1-12
 - Set HTTPS handler correctly when changing default browser (#480707)
 

gcc-set-https-handler.patch:

Index: gcc-set-https-handler.patch
===================================================================
RCS file: /cvs/pkgs/rpms/control-center/F-10/gcc-set-https-handler.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gcc-set-https-handler.patch	20 Jan 2009 11:13:40 -0000	1.1
+++ gcc-set-https-handler.patch	30 Jan 2009 12:39:30 -0000	1.2
@@ -28,3 +28,16 @@
      return ret;
  }
  
+Index: capplets/default-applications/gnome-da-capplet.c
+===================================================================
+--- capplets/default-applications/gnome-da-capplet.c	(revision 9218)
++++ capplets/default-applications/gnome-da-capplet.c	(working copy)
+@@ -77,6 +77,8 @@
+ 	return;
+ 
+     item = (GnomeDAWebItem *) g_list_nth_data (capplet->web_browsers, index);
++    if (item == NULL)
++        return;
+ 
+     if (togglebutton == capplet->new_win_radiobutton) {
+ 	command = item->win_command;



From jorton at fedoraproject.org  Fri Jan 30 12:40:00 2009
From: jorton at fedoraproject.org (Joe Orton)
Date: Fri, 30 Jan 2009 12:40:00 +0000 (UTC)
Subject: rpms/subversion/F-10 sources, 1.34, 1.35 subversion.spec, 1.127,
	1.128 upstream, 1.20, 1.21 upstream-key.gpg, 1.9, 1.10
Message-ID: <20090130124000.CA92370117@cvs1.fedora.phx.redhat.com>

Author: jorton

Update of /cvs/extras/rpms/subversion/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8346

Modified Files:
	sources subversion.spec upstream upstream-key.gpg 
Log Message:
* Fri Jan 30 2009 Joe Orton <jorton at redhat.com> 1.5.5-4.fc10
- rebuild



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/subversion/F-10/sources,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- sources	27 Oct 2008 09:15:01 -0000	1.34
+++ sources	30 Jan 2009 12:39:30 -0000	1.35
@@ -1 +1 @@
-8ec0a6e756c35dc3ce20abb580040924  subversion-1.5.4.tar.gz
+532c7d49b3cd33d712289a5ef03b7749  subversion-1.5.5.tar.gz


Index: subversion.spec
===================================================================
RCS file: /cvs/extras/rpms/subversion/F-10/subversion.spec,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -r1.127 -r1.128
--- subversion.spec	27 Oct 2008 09:36:44 -0000	1.127
+++ subversion.spec	30 Jan 2009 12:39:30 -0000	1.128
@@ -14,8 +14,8 @@
 
 Summary: Modern Version Control System designed to replace CVS
 Name: subversion
-Version: 1.5.4
-Release: 3
+Version: 1.5.5
+Release: 3%{?dist}
 License: ASL 1.1
 Group: Development/Tools
 URL: http://subversion.tigris.org/
@@ -29,7 +29,7 @@
 Patch7: subversion-1.1.3-java.patch
 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: apr-devel >= 1.3.0, apr-util-devel >= 1.3.0
 BuildRequires: neon-devel >= 0:0.24.7-1, cyrus-sasl-devel
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Provides: svn = %{version}-%{release}
@@ -275,6 +275,9 @@
 %endif
 
 %changelog
+* Fri Jan 30 2009 Joe Orton <jorton at redhat.com> 1.5.5-4.fc10
+- rebuild
+
 * Mon Oct 27 2008 Joe Orton <jorton at redhat.com> 1.5.4-3
 - update to 1.5.4
 


Index: upstream
===================================================================
RCS file: /cvs/extras/rpms/subversion/F-10/upstream,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- upstream	27 Oct 2008 09:15:01 -0000	1.20
+++ upstream	30 Jan 2009 12:39:30 -0000	1.21
@@ -1 +1 @@
-subversion-1.5.4.tar.gz
+subversion-1.5.5.tar.gz


Index: upstream-key.gpg
===================================================================
RCS file: /cvs/extras/rpms/subversion/F-10/upstream-key.gpg,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- upstream-key.gpg	12 Sep 2008 16:10:42 -0000	1.9
+++ upstream-key.gpg	30 Jan 2009 12:39:30 -0000	1.10
@@ -408,3 +408,835 @@
 Gxwlp5wUvMFncAQf/hsZag==
 =DqKd
 -----END PGP PUBLIC KEY BLOCK-----
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1.4.9 (GNU/Linux)
+
+mQGiBEKE95oRBACPaJTtIZYzmpILZamUuBkNGOp1sZkcNaWIf1wokFXw54rcxWXf
+/rUYx1/vGYWT2XGrnuI3/JlQD0RA7G+xwBaJ0fGfQiKQjmVVV72Qf7g1PB3Cp+6w
+pQqDEzIpbLqUxEZoTbEHK/WXMcIyLST1ml2b/Q00cji1++zx8XiAbvz2XwCg+qVx
+dluaJ1GmOUTGDmWrvg4xA1cEAIyfgEDAPPGLKFt/kTV6a4qmPRAQRUs+kjzQF09O
+SJZYsbJoChqj1Bs4OhO1ukbsCdB/xzWEgYNs9Uygi0QPp+XnkFTdXpzjJrRWW/Hu
++G1LsieKkh41+0A1bGUJiD0f9mY0fpcpGlbUgFkLkj40rQSYJaH4r2xGu1xDoMD5
+mzTgA/43SoSwoWWHoUKhN0QCRaH0KvSJaj7wdllbXGKcEmDo25ahvpTvNpichjO7
+PygjW3JG5/19SYZxslrqcTyB2zk7UiCPNFANlldUCfc3nUfjeZGgoReTAcD5VAb2
+p+FRQe9U2gjMEKzXid7rJXIxCMvzfQalFDDys/fftttBLGgDzrQySHlydW0gSy4g
+V3JpZ2h0IChQZXJzb25hbCkgPGh5cnVtQGh5cnVtd3JpZ2h0Lm9yZz6IRgQQEQIA
+BgUCQofvogAKCRCrTWCYiCZoaNUCAJ4x2s7w2Bf2xVKgZTE6Whg7u7hGHgCgpmfc
+yP6zwAfPttywn5KoVeePGoCIRgQQEQIABgUCQrBMhgAKCRA7c462Ekj3798VAJ9l
+LttD79hG0bDJFE0wlpc+6A3NOwCgwiQHygt6FZGhBE5UHao7PS6WM3KIRgQQEQIA
+BgUCQ9Vd9gAKCRAvw76Z0SNmdG7SAJ9FA77PWXyPrMUsLMud2r3PGgY9MQCffQUf
+y0VlbZtKQm8A3+dZONJeuK2IRgQQEQIABgUCQ9Vd+QAKCRAvw76Z0SNmdK2SAJ44
+75jT/6hsDoRgijZ3/nl7eIkw0QCeL3fAqKC8vtZEf+f6GKmK7ByRnZqIRgQTEQIA
+BgUCQ5BetAAKCRAF36g9FylU90GpAJ4qvb/jxoxGjD8rJx4aMtkmqNCHcQCgszOK
+pNKbM0CA+029M5juV+y74j2IXgQTEQIAHgUCQoT6NQIbAwYLCQgHAwIDFQIDAxYC
+AQIeAQIXgAAKCRALA65uTiRRfKOTAKCICISQTl4ZcyUNf7EPg02ShwML5gCgpiFq
+Cv8RpPger2CB2+jiclQMHaeJARwEEAECAAYFAkKE/TYACgkQm+oImRMZEIDNiAf9
+GNzGESz/rhqITH5jcV1p9w6jSHOW3rWO21Fbe0dR0az6u9QaBkqhcTGsv217Xtrv
+IlqeTdA7a6HrQN3kdY3qErV7b1wtLfMrIKpky0tWTWXaYy+QN0+gHoa0LTeY6BBH
+CmC/pTDS+w3AWwcC+mkW77DGQEAB06Gs+UvFeSRr8R/X9ar9+OkodJkbltlwzf4G
+Odo4ntg5LcBjmmly6G3k3TsyDBkq4Oi93Hq0F7AeiCYQVVq+Urx9n+iBaLUSe6yW
+Jbu7Dq9Hg1fbV+rP5mvUTFrkRV7UEUJhQ7DWjmHG4BdnmxHuYtNWd7K7bdnx4Gst
+Ny+0fLqh6tmJxac3r9ed+IhGBBARAgAGBQJIENctAAoJEH7xsSaa71JnjGIAn313
+OQzviX7o04cvjWa7rIiECztIAJ9rdlo54L8iQoBJT3/nXYEx95pIC4hGBBARAgAG
+BQJIRaiUAAoJEGfZsklnTwXg354AnRPnrntXOOyGgfINYpr5yB+UpYbOAJ9KgXew
+AWU5LdwItbr8ZnJ3o1Zk0YhhBBMRAgAhAhsDBgsJCAcDAgMVAgMDFgIBAh4BAheA
+BQJFAM1VAhkBAAoJEAsDrm5OJFF836kAnjqPMwYUSNXBjG2Ub0hTBKA7s4N4AJ9V
+tLIPZ8u7m3YEkZsyTV/mqUKvNokBHAQQAQIABgUCSEzZtwAKCRADUw2qoCXHAnoz
+B/wPpjT4mbRY82DAXWxuQqKUQosJmTqhGFMRTggz/ayNmq9W/rQwps/WEiuauL68
+YYjpWmhveH1/yFvV0jc63YA+SBv55orLRYpREZHQW63R1EAItw5s3/HtCDNilcA6
+/o/ziRA0Gg2RwZBWwKBXA+0w0yHBmrYJXkk4bD0O77FpOj6l2EIWY8Bowdo8ZT4O
+s4XYWh1GYqz/PTpWaywtLtMR2eUVCY9jtHOmW94tFGE3fXA5wyqCV/mjuRGXR8s6
++Qc+RbiKeX4aXYWOCvJv/a0mGKwYIzcDlppwn83GvdsTZLtaU+OZ9HBT2oPJqNhV
+FgmxhixnOx8StEgdJhyr6KGuiQEcBBMBAgAGBQJIMnOmAAoJEAQBqiBG05f/cOEI
+ANdo0WETxBXKeGAaOgOX5DGkzPr63MRxAoh/AUuLBR6QhbeAzcxDTD++1pJ2+Xtv
+BwnDpMP0yo8Byy4THB+Xm6Ibhaxo6Rwo+N6NPUU0T/Z/HkS5TTuWdnJzYZx78/tl
+YZGS6824aCXF542VzJ4El/wti1OlXHeuFVCy3MMwL2NOhTyXYFjKB8nxl4rMQOPR
+yDUDy8p39/V1DTZIRr+MUhGtpC9718ysK7b1Jxpom0oJTOOm8YZpwg6tCDwKEx1r
+FWEqga/Pqqo4WBqwrZL6ADuXbUSmr2nyKO4Pjlikh3sc+KLCWFPLgks+/4CefG0K
+FUpiJ7QoCD8/xXscoW1SX+eIRgQQEQIABgUCSJERYQAKCRCL2C5vMLlLXItgAJ44
+WxHWG68/FUbDDnt9gFei4jQydQCcDqBb4Xy4QHudHO5B/AKc09vYYKWJAhwEEAEC
+AAYFAkiXiXcACgkQo4guv3hEbyYDyxAA9dLVDtUzgmr1QG9eTaAE0BXksXitTiab
+q56gqGBvzbLnQccdI1xTdMKp3wgrKZ2OcR65LQVwSq6DvZI2jHPhOM+rUz+L9qZn
+P4Tqi+1D1BPjcsRk4FaZRAppgC+fCvI4ojDPkTuPIgyYMX0Ek+GX/04qzmVN2SJj
+nHUsfL4sjmGu0zwb56OfgU5OpKsFJZBPKzvZvG4aqrozSq6o9ZS8HcMBiiUAhrUp
+5P2FDegeaJXi5kH7b/zV6b4DBZjx2zuRJG8OSn7PN3ho6BpVuW9CTjXSkn/yKJRy
+XR3gcfknNQjs36DCCCdY/1v5uUoQr345IBAF6cqRu9TikKqxkXXJNjqkM3sU2Jji
+WQqfG028neigWUT2vYNtgnycA4yl2+bLEn4NyKFljEjf4dIzXKdSD+ZBgPlcEsJW
+DwCcO/phCcdHW+gK55kDkLXu2zPPpn5C7lMLDtRLO8jVeAYnHXhDv51xDXkxkQ+y
+FmdbFkSxavgoGLpUFSskNeT5a37EQBAR/H1/va27mQGfl8oOIQfKSuP1ybDqJipP
+dntMudvsFhjJBQQ4kZviyRursvaqI4mIM6gyEPj+QZH25KNTh/twgt5Ua/k2dZXF
+4aabGY7owEDBMaYk6fQ0tPkOGqjhYmpB2pqZP7CcqT5kDSeLLSm/T7saj/5M6iVt
+MOPig7B5CyuIRgQQEQIABgUCSPYGnQAKCRD8/WMFmCH3ssOcAJ9ILMeyrriZqzy0
+TR6jZ6zUUCGcCwCeNfCEYgFn8Ri67yvvkTB/nyrspXWIRgQQEQIABgUCSPYG2AAK
+CRDdYe/I7RhMLMy9AKC24ipYUKQ6W7RTuwmJ2mkF1TEduwCeIRO14uNRpmT6SSQH
+qzHokju15diIRgQQEQIABgUCSPYKOQAKCRDl0wJz9Z0l8KcaAJ96z634W4mIwqkF
+Pa/L/XECf7+kPwCg5Ta1rlxIEnqnY9Wf/CZcLIjKNnKIRgQQEQIABgUCSPYLdQAK
+CRAJdFSRWGLqkEAZAKCvlJxnRzuCuzKGu3XXuTCfeoJeiACg08/DLfszZvUoO5Xh
+fDjKRYP0RJK0M0h5cnVtIEsuIFdyaWdodCAoVW5pdmVyc2l0eSkgPGh5cnVtX3dy
+aWdodEBieXUuZWR1PohGBBARAgAGBQJCh++fAAoJEKtNYJiIJmhoOb8AmgIQY0I7
+yK8znzPOHlu46Rw/ZT50AJ4uO/viM5D+3o8Q/JeNGBZJiiDXJIhGBBARAgAGBQJC
+sEyGAAoJEDtzjrYSSPfvZwAAn0PB2gUXd9R7H+/Mhkc/HNq8LDtiAJ43Awbw02WT
+ytIV96v9iuGlM15z1ohGBBARAgAGBQJD1V32AAoJEC/DvpnRI2Z0btIAn0UDvs9Z
+fI+sxSwsy53avc8aBj0xAJ99BR/LRWVtm0pCbwDf51k40l64rYhGBBMRAgAGBQJD
+kF60AAoJEAXfqD0XKVT3OP8An0Oc5TI051MuQgsfVKr6B5Yq9t3cAKCOqpb37ybR
+aIgoOJl3BYyUAym0uIheBBMRAgAeBgsJCAcDAgMVAgMDFgIBAh4BAheABQJChPpG
+AhkBAAoJEAsDrm5OJFF82vsAnjbrxbL9NDfKbh+5xwqGyFG16LF4AJ982RBhAItt
+o9v25Qz0S+VqpvQry4kBHAQQAQIABgUCQoT9MgAKCRCb6giZExkQgBwgB/9QhaKk
+FVgpmJ5kz5K3LWi7mqt1kHSyXlbm2Mw4LLl2j0m1iU2aWu/xz1N2VGH24Vlg2IDa
+KJ6FHV0L4CIdNHNmQoiemOPzUnlK1R3LPubO+NNGRSFz363fgQly9J90W5hzuOFL
+02CQo2/Ac+Xa3AWmHii0pB0+yHuF/dryZPCkpvD5i1zaRcje4s3rdZ3gU1VXjuPe
+/KXJDXM1zKXLchhrdOz1BNSuVzQJFdh3B6CVbNsIgLYjD3OXHvcJsQAJi+SyWSWC
+hORwaYanPanwmCI4KDu2OZNOotHuYvF1ILBBEiPMT6dByRFLMEeIvlryB0H6w0is
+HOp5lNDaso48ExvmiFsEExECABsGCwkIBwMCAxUCAwMWAgECHgECF4AFAkUAzVUA
+CgkQCwOubk4kUXydXwCgvRzZqwkt+Y3Mi6KUIH15tb4MaHYAoJxeJpRuXWpBr8q5
+uXnbaegSH6pciGsEMBECACsFAkZgRnUkHSBFbWFpbCBhZGRyZXNzIG5vIGxvbmdl
+ciBmdW5jdGlvbnMuAAoJEAsDrm5OJFF8hTYAoKd0Mk/XdrZD/WlmfDQjBqgt4s5P
+AKDr50HKT7CasxJ8tyPlBNmwtWuW6tHSSdJHARAAAQEAAAAAAAAAAAAAAAD/2P/g
+ABBKRklGAAEBAQCWAJYAAP/hABZFeGlmAABNTQAqAAAACAAAAAAAAP/+AB5MRUFE
+IFRlY2hub2xvZ2llcyBJbmMuIFYxLjAx/9sAQwAFAwQEBAMFBAQEBQUFBgcMCAcH
+BwcPCwsJDBEPEhIRDxERExYcFxMUGhURERghGBodHR8fHxMXIiQiHiQcHh8e/9sA
+QwEFBQUHBgcOCAgOHhQRFB4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4e
+Hh4eHh4eHh4eHh4eHh4eHh4e/8AAEQgAoACgAwEiAAIRAQMRAf/EAB0AAAEEAwEB
+AAAAAAAAAAAAAAIBAwQFBgcIAAn/xAA/EAABAwMCAgcFBQYFBQAAAAABAgMEAAUR
+EiEGMQcTIkFRYXEUMoGRsQgVI0KhUmJywdHwFiQzwvElU3OS4f/EABkBAAMBAQEA
+AAAAAAAAAAAAAAABAgQDBf/EACERAAICAgIDAAMAAAAAAAAAAAABAhEDIRIxQVFx
+IjJh/9oADAMBAAIRAxEAPwDqJKeVOBOdqQDHdRpGe6qNQoT5UQTSpFFigdiAUWBg
+0oFKBzoH9EArxFKcVXXS5xYTRW9Ibax3rOKTGkTxjlivdnbeuf8ApK6dhapzltsj
+Dbz6MpW4V5Qk5PLxrVc/pU4xuLhcN8faPcGlaQBXJ5Eh8TtUYO9LgVyDw30y8Y2p
+QS9cBOaTglD43x61tvhTp84duKmo91jvQH1YCl7KbB9e6mppj46Nx4r2PSmocqPL
+jpkRX23mljKVoVkEU/VkDZFexRkUmKCbGyKQpFOEUihQSxopB9KEp7qcIoSKAAT5
+04mm0nflTiaooMcqUUgohyoKFFLSCiG9FoDEek/i2Lwnw4/Ne7TuMNtg4KjXGvHv
+GfEF6lOy5U11KSTpQlRASPDFZ59pfi5258bm0BwmPB7IAO2rvrTtxdW7pYbTqzua
+zTk7LXRBjLPVGbJWrtKwkc81PTIbW2pyPhW2CO+nW7PIlxEocSpOT2cCpEnhGdb2
+EymlL0KGrOMcqh0NJkNt8qUMFI3z41MceC2UhQA7txUZxSGWta2wp0jlyBNVEm5P
+FIQE6cHbFJKwbOhPs59JL1luKOG7llcCQsBpwndpfh6GuqmlhaAtPI8q+bltuLyF
+odCikgg89xiu6ugriVXFPAESc64Fvt/hOHzFd8cvDJ7M73769S91J3iuhDENCaIm
+kVRYgDyoDRk0J2oFQ0mnBTY3o0mqGn7HBjxpRSDbnSjagoIUXIZoRSnJQQPCkxnA
+nSa+ZPH9zccyCZbmrPrVtwNwyxOSZ8oFQVsgDbArGekVDjHHV2ac3IlrGfVVbO6N
+FdZZm0AdlOwrDks7YlbMxs9mgJQltMZKinkSKvpdijzoCoqmUgaSBtypi0fhHfvr
+JIbgIx3Vmcmb1BUahvXRxIEgPRNITjS62obKHkaxu89FMVSitMtxtRGSlQBwfWug
+Zy0qR2RyrGLogLJyNqcZs5zwxo5m4m4Yk2CW2h5QW0sHSrGK6l+x0lCeAJeD2vat
+x8K010xx9UVghPu5xW2/sbOJPCN1bByUSUn5prZjdnnyXFm+fKkHKiHpQmtBHYh7
+6GlNISfhQIE0JFEqgVTJY2PCjSdqaSfGnEmqLQ4DSjuNADRikMIUWMg0ANDIWWo7
+jiRqKEFQHjgUmOrOEemO3Ka6U7jEOdTj+R8aznhqRbeHre2zMloaATntHc/CqDpD
+dkXPiWNeH4qlznXAh3JxoVkEEAbKGM08xbn323JhhtSJYISEubpQeVY5bOsU8bNm
+8N8RW27upZtZclvE4Dbae0fQVe2niC2SXnYyVHrWTpWkjSUq7wQa1x0cyeJLDxO5
+PfZjdS02sMqDIACiBggc8jeps1Mmfxb7SmUqO+6C48sN51nUNvLOT8qU8UVG7NGL
+PJva0bCul+tMFgB9RSpWwB3JPgAOdYPxJxla4bg6xmVqXuE9Uc4qJxEmYxxQyr2n
+rASS1lvHVK2xuOYO/wAqhcescSX+6RJyZoaDbaW3i2kIKsHyG+229KGOLQZczWki
+o4gvFr4iiORG9aXdBUkKGDmtn/Y6bLVivIUpPbfSQM77CtXyrRIbbKpLoW6FYacI
+wfLNZn9mNmS1xG0gDqWmw6FgD3yfHy2rrDTM0ouR0xmhJpfpSHxruckIaE0pNCTv
+TEIragUd6InvoFUyBlOaNJHjTSTijQR3GqKHgcUQNNpI5UQIBqWUOZGKamqKYbyk
+8wg/Sj1CvbEYO4NKrBs5aujtumQypSCJDcgn0IOKl263uKfEuC+ht0jtocRqQ569
+49aPpNajcM8W3C2u6G48wF5lZHeeY+f1pjhieBhBGSRtWPJFpmzHNTdsyNBumkBc
+C3t7brDylfIYFUIUU3gkudY4CCs8v07qylEpCGlatyE/KsFcXcmpTy4zTBcLhUes
+B7Yz3EcvlXJNyNMoqNFpftTk9t5xSm0kY1J5jzq0bF6Uynq3bfISR2VuNKBx54OD
++lY7dZ94nKbWthqOlIAI05Kv5fGrfh+W61BS2tQKhnYHlvRtITUWyPOt7gc9qmyQ
++6n3QlGlCfQf1rMOhwh/iNnQ0EJZZUVED3smsN4imaY6j3q5Vm32bSJzE64hJDaA
+llBPee813xLdmTPJLSNz5pM0h869netRlsQ0B5ZoiQRihJoE2CTQqO1KSKAnPfTJ
+I4pxO1MA04kmmxjyTRJNNA0ud6Q7HqXNNajRaj3GgdmqftFcBy+KbUzPtTYcmRAc
+ozjUmtRWkLabCXAUPNbEeBHMV1hJGuO4j9pJFcgcQzlWri66RJIKWxJOlfcM74Nc
+csbKxupGVXeTNYt/tbDK30pGVJRzIqjt/GER5xDKIroeWcAOdn61cWCcJENxrOoA
+ciabagNNP5MdLgySARkGssaWmehF2tMj3ziVcaMhx6PFCVghKQ+FLJB8BTXC0ydd
+5rrvsXssdsYyVZKz5DwqfLEV9elm1oaOe0QgbVJirFsiOOFITtmnJKqQSdfsyuvw
+VImtw0K7S1BPzroXow4Xj8KcKx7cy4XVEa3FkYyTXMVkmP3Tji2xGgVF18LWR4A8
+q6/jJLcdtH7KQP0rvijSPPyPlKx8+dCaEqpCrbauxASjQk0mfnQk7U0hM8qgUdqU
+k4psq50yXojpNGFCmAR40YIpsqyQlVeCsU0DRaqBjoVRBVNA7V7Vy2ooQxfbmxab
+PKuUgEtRmlOKA5nA5VyYviBXGHElxuT9vbjxpKsNt4zlI23PfW9+nm5mNwiITUlD
+bsp3SoA9rSATy9cVztw+0Yl3ZYVJD+qMhzb3U6t8D51yy9F49ySJS+v4UuKXk6lw
+F8+/QKzW1XeHKS2tKgUkZyk1VXsocabZdQlSFDcEVVROCWpSS/Z7vJtazuUABxsn
+0PKstJmuKcejOpE2GoZSQnHPNYhfLl97ThaYasn3nlD8iar5/CHEiMIl8VtlvwZi
+6VfMmrThi1xbTEdbYJWtW63FbqWfOikgnJy1RmPQbYra7xe5IWQHYjP4SCOYJOTX
+QIV6VyVwxxE9w90gIuLallphlIcbHJYK8H9M107YL/ab7GD9qnsyU/mSlXaT6jmK
+1Y1+Jjl2y3Kt6QnegJB3zXtVXVEthFW21CVUGd6Qq8TRZNhlVNqUBypCod9Ao+FM
+ERUmjCqjhVElWBnNUV0SQcCvKcShJUtQSkcyTgVhPE/H1ttaHG4RRNkozkBYCEke
+J7/QVqbiDjK88RyHWnrl7C2yQShGCPln60noDbnFHSVYrM4Y7KxMkeCVYT/7d/wr
+AuIOk+8XkriW2G/B0jZSF4KvjitcuOxnbWZrs9RkkqShedxjSfPxNemtgiEwxdlF
+145JWc4FLkTY7dLjc5P4t3f62Q2dTmTnGDgjz7qgxGXEcRIk9UEMvo1NDPnuPnT1
+4eEnr0tradU3h5RQMYRyI+Wk01DlezvMylnrRDUHWAr3XEfmSfhiolG0OE+MrMru
+sZS4jbo5ooba65G0vIBI7wK2XC4Yg8Q8Ps3bh95JjSm9Yac5p8s+XKscf4RvVvWU
+rt76k52KU5H6Vn4uPZtjlXaZjj7rstSnHAUj8oNecaEaFrJ7SqyKPw9dJCwkQZBH
+/jNYr0hLdt09qyqSpuW6nOk/kT4nwoptieRLdmMOuannScJS86lLa/HB/nv8qmQr
+ncI0xucI72GWx1bzLpCqp2fxOsaKv8vDGWj+2ru/vzq8aUoPsxBEeT1zWMJVzcGP
+lzxWmKowuTcrNi8HdLs9lP8A1dKZETudX2HE+RrY9g6QeF7y6lmPcUtPLHZQ92dX
+oeRrnBmRJctWqXHRpa1IdOkZIBSBt4b0LLttfkeyQnvZEoH4uobehSdviDTbHy9n
+XWrbbFCTWg+EekO42B1u3u6rjFBwEqc5D9xR+hrb/DvE9qvrWqG/pdHvMObLT8KK
+F8LzJxuaBRoCvNApW/OmIhPyGozK333EttoGVKUcACtM9JHSFLnF6Ja1BmA2dC16
+sKcUc7emx2qk4+43e4ikKQy6tiChehlr/uKz7x8cVidyYjRLX7U4pxTjLgWlKjnW
+BsTj1I+dNv0U2H1sJ69PBxLjqWWFBPcCfH9aRqRCN1uakRV/6ulO38X9KO03BxN2
+k9TEK2nI4KN8bak16FdJYud0T7Hj8Yq947bqqRWV6ZsJXDkfVFKAlxzUrH8NSX5s
+RVxjlqOCQytIGM57OP5VEYuEj/DylORSUhe41E8yn+lWSbktHEFvKISsLJGnPmR4
+UWO/Y7EEafep73sy2mUqKVKSMDq8HI+VRQkuhdsj4V7AsqQv9tP/ABT1jnS23ZbY
+jIVqQ2soUTvkDz8qbkO6LlHmMgtRHBoUDzI/vahCdGddBvHZ4c4gVYrhg2aarU2s
+nHUqO2r+E8jXTSUMKAUlexG2K4kcb9lvTS/YRMaK1NhJV7yQM/zPxrdvQT0lxXE/
+4V4ieVFlIAVBXIVnrGzyRnxFdYNPTCkzYXShxTG4R4belIdbcnOJIjNKPM+J8hXJ
+k12bdFrfddU7dZjmt1auY/v++VXvSXxA7xLxZIml91TOdTAWOyjB/wBPHhyz61WR
+Fty3X7s1lhcdOgtnYgjn8aiVeBPWkOuLZfbYiM6GzAHWv5HMjkPiam3dExtcSS3L
+ypaj3cspSaqY7MWRaXZUpSmXXDrdBOMnPZT8Bv8AGpt0jsLZt6GpBCgrOygeSE1A
+ByPbC5d0uPBG2oYGxOof0rzrshy5tlLTUdp9rc89R50NxhoafuglSlKHVZGdsHV8
+aQxGJNrYdZmqKmmlEDOdIA/+im9gxm1yJ/3dLeeaQ40pZUEgY058P1+VToby4LbF
+wdfebOxbdJ7TZ7grHMbc6i+y3BrhkdVJGlasbpPdg/7jUq9x7izaYcZKkO6nG0aM
+bq7A2/WhE+TZ3CPSi9gRr5EVoSB+O2ckDxI7x5itj2i7267Ry/b5Tb6O/Sdx6iuX
+mXpHtyrQpfUqaGWnT3eXmKuOHOJFcPTEzYoIWheh9oHl6/unn5U+RXIxp+WpMxpa
+GELLTyEIxt609IlA3p77zSNEhvITz09kJJ/XPwqCIjzNrct8dfXSEK1daPFIz9M/
+KnlJSxCjXqQevcZUEut9xSdjjx/4oBOgrDIuBwymPpcj5aJV39obfp9aOAu5m5XR
+YZQT1hGNQ8TRabk7eUSI40IWUoUTuSrIIJ9RTVsbvBkXJSVpz1iiez5+nnS7GqZC
+iuXL7nba6lClLdHZyPE+dXbrlxXfrSEw0haVZ+BOfHzrHW/vJES3rK0ZU8Ry/e9P
+Ort165NXxlSpDbZRHONhzCKVUD/ocBq5/ejg7DRMVB3UO5INMx3rsnh2fbloYWwt
+zAWd9Ku8fECpSEz/AL+kJTObGlkIyCByTUaDGmyLdcWzNUrD5Iwe/SvzoWwDli5R
+o9rko6ohCgAkEY25/UUzcl3GFd48lQQ2nRpOTnJSSB9BTchNwc4XSRPz1atQCj6D
+/aaehu3O4XZUg6XmmG9SAU7BShv+tUmJPQFqednXZcf2MvxmVa0K6spyo+v97Uca
+IZF3dektPsRg6kSAgcx3/SpfD0qepE95LLQBc05AzsAf6io7E6aLXKKmWzrUteEn
+c4AHd/FQxWidfJVsmW7W0ghpx86SR7w7O5oLxHtq7jGQHCnCnO/4UxJurBscJp6O
+pJCsnIB8PH0qXeHrU7dY50BACnM9kjv8qOh/AJ7UBt27hay4lQUAc55b1XxzAes7
+iUOaNMdfzykVZSn7Y394oDesFxwA6c/l86qEPWv7peKkJT+CUjskblY8PSihJewp
+UVKLHFQmUrC1Hv8AHT/Sp90W8xd4yGZOsoU4tIO4BACR9Krbw3bWrZb1h3IGFKAc
+8z5eVVxSp5L11jPYDmUICjtvU3QN0WbU/rIcqTLZ6srcCWlA+H/IqQhUVCnZDUhb
+MoN+8OTlV14dkQrRHYkMYcbUnSCNlK95X+2pLqXJSGLukJT1Q1pax+X8w+H0oIs/
+/9mIRgQQEQIABgUCQrBMhgAKCRA7c462Ekj376HEAKCUodFCAuEGsbT6FuY7Ngtq
+6ZjkRwCgz9EqdZp4yVTIsbyNi6gy+/xmXiOIRgQTEQIABgUCQ5BetAAKCRAF36g9
+FylU9+kcAKC29LbrKQNqdfpAH3ubwmMFUqr+LwCg1e+wJRMiAxmS961/vBcXuaQX
+WgGIXgQTEQIAHgUCQoUBQQIbAwYLCQgHAwIDFQIDAxYCAQIeAQIXgAAKCRALA65u
+TiRRfCvDAJ9UGG/WjOKh2b7Wqmej89+Y9qzwaQCeP4yVeiSLNTJoeyOi00D5SpK9
+UYeIRgQQEQIABgUCSBDXLQAKCRB+8bEmmu9SZyOKAJ0cKiAHYc4N0piJDwT4rLrK
+9lWYbwCaA5qRGLQY2v7WYm3kQKCI312Z1BGJARwEEwECAAYFAkgyc6YACgkQBAGq
+IEbTl//dkgf9E0fm93fa0gJ1f5qsD8seVY9PFS1OguBpvUlsffjpWcfpOkZHQuGl
+2y8e5EdZc+pueYVtr+IjQULHgPkL0lvNFBCETubtjZ7PbUJYJ4k4j9yVFlXpLkW4
+485aJEu8N0lDM55DmeNY5AKBPsOkPDwUOEzpTO5A7oKi1S1MWzTM+F31egoEHcY1
+wzWyrIii2qNA+YVf5xscrfCJnzL0yDn5lcq4xuQXJoVtwjmjacBGs9T7Fixv59yp
+E/EvGS160jt3zMafAuBbN0a5gBwpiEmFedh520hqWVUv42+1houYqY0TpX/fBGTn
+iSMv9FdHg1A/tY1mWi3GCeyRxcP9clIHgohGBBARAgAGBQJIkRFhAAoJEIvYLm8w
+uUtcRt0An3mUdWiOxbi4NY3Zk5gF6OWc0HYCAJ0XkDho4+iEvW65Dvnhuk3GkwHw
+wokCHAQQAQIABgUCSJeJdwAKCRCjiC6/eERvJv00D/49axX1zo7nn2xcc9V9e5A+
+IOIC8Sb9f2r0eAjHA70Z2emz/Rrkfwo3BLbNjlDq26FuCwIFK0J2TLJkUwa7wufY
+H49hLthYbfeZ+/rnEtZd0eWl8tIwux9WZ13ilKP4RZ9bsVO+87wriNH39dk9mGGW
+EqXSbUv2PLwbl/6IUpQp1+lEHiRA/jyvMQjKPZ+iXjDS6Jzt2eiRNnDHKT5aJQ/c
+o0RwnLUcOCh+YG35J5hF1K1n3LuwvTwxL1FYzWB3UG12aObA1VrCugeua6q46O3q
+YhKB36yL0MvQ48k80/AxIgAdGOPY7KgBQDLG5CRnW2WuIt7ZL+R43FmKAOXZXQnS
+rR5/4Xalrr3/u8E0ueXh1xTg1nSg174mNOX5rGkyN/fh8Pq0HJQE59+/af1cu/BC
+zxB5FrNZrWLyOTPYBxKUyYxhVTq54METGpJujmtVupdgRy9YeOdjQhlYjJfIP/Lc
+Cp91FY913BhrmITZWB3QsZVZL2NAGd5DU4whpI9XPFcJLYEe6zA/rdW9qqX6IPeU
+ipku1M2jOakMsQH/AMB2okOFUMZmoh/fZgaAyCC+LXZXvChLVpYOY65qurEwuctf
+aJNUN3b4KLmZu++U/NcTRDXgQSd/Va2xWcjumtJBbvNBD+XxBT3Pme6lteKWEM+C
+pLRKBzIIRZqILSkWUQV6F4hGBBARAgAGBQJI9gadAAoJEPz9YwWYIfey4rkAoI1c
+mi+cSHJHKMPDox8J71N4D5KwAKC8lc/GjKH4KCYPgmJ/cJ6P3TM/T4hGBBARAgAG
+BQJI9gbdAAoJEN1h78jtGEwskOQAoKR3+1NdMrmKZuvnlN6kL2SmXJB3AJ9CR9hw
+nz3qV8i3UBV3YYaxx0+0l4hGBBARAgAGBQJI9go5AAoJEOXTAnP1nSXwetEAoPSs
+OG5R5a0toSXOJ/gJKHut5VXMAJ0cLgkCRc4ImmJNUo4h/jYua/20WohGBBARAgAG
+BQJI9gt6AAoJEAl0VJFYYuqQVp4AoM4Q1tmOI2SYjUUShQOci6kUtmedAJ9XOByc
+i8vy/7GbplvDgso+rsxON7QzSHlydW0gSy4gV3JpZ2h0IChVVCkgPGh5cnVtX3dy
+aWdodEBtYWlsLnV0ZXhhcy5lZHU+iEYEEBECAAYFAkgQ1y0ACgkQfvGxJprvUmce
+mQCfcibucIkJ3zVafgxUiZcFJiI8Q5EAn1TGQdRl0x60Zm/wcxxm5fLj6VFKiEYE
+EBECAAYFAkhFqJgACgkQZ9mySWdPBeDXUwCgsVxdfx/bYO3GCBcYSTJ/3bwcuFcA
+oKrZLpvcIC87G5vP1zz+Q/w7w2wqiGAEExECACAFAkUAzYMCGwMGCwkIBwMCBBUC
+CAMEFgIDAQIeAQIXgAAKCRALA65uTiRRfAiwAKCz59t5GMcxUaXi7xnao1SED6O3
+4QCg16qoo+RD9hjHa/dlRleXaK6ZBjaJARwEEAECAAYFAkhM2cIACgkQA1MNqqAl
+xwJbDAf/VL0svDU2IIInIJueAhKWJsOh8JoIMLwNTYZZeKm3qvLAA8IOVice2PR7
+Y7sJ1E0dqmycN59M255yGFrAREWkpzimrm9SH1sHDkwKE3YCrjxTfZgUNrIlNC0h
+VIE4+yfPRo02f/sDbTIJISV3jWgJ+v6n8Pf60LwCDJUJtO9ZDUzOIfwmEIdiJuGE
+wkn3jmEcvhmsIl9+o8DaotBWSUF262YltdP4OpV78BAoD8xhRKsTZE8BKI5+/wTn
+kSOv3okKbySFQUDziNU+VWphhE6x9nACr1jKqYR1pvjDs6GBoX7AkTY1isOxNEML
+eACmdbpm2v73iE+tZTCfaBqjW1MFQYkBHAQTAQIABgUCSDJzpgAKCRAEAaogRtOX
+/5CFB/4oKJBtWrosbwz0GNoa8X95bQY6bprV9V/Ozy1DR7ehpZevvUaMaG6+oVpq
+pgxuQeGm4RiUWSqR6rtvLyTK9W13di+XrnNsW+685jX5PN4byxa/Bg/Vmuxr3xBo
+yWmCMCBSQMl4ViPqkgVwiOYVOAAKatWXRxo0FcrsFN/ZCR2dHp4RIF+S8/E0BVtT
+TAu7fZoiA0FAm/FIYcyHygM08Z1E0vx96qKwjBIwKKnceZ8ziYUgpfqzLpZ8lFXE
+0Mopizc1B2Gsw84C28sJMJlt5w7Ip6eGyNipPc7qg3DgsLWOV0eXZZ+pduPqFwIF
+TpAupQdkoXJBCdpRA7p1msOdHtueiEYEEBECAAYFAkiREWEACgkQi9gubzC5S1yM
+pQCfcmU/WEY1Qy05hy5TeMiWAgupK2kAmwTTLaCtGHV67JleDsGtyEsB2/ohiQIc
+BBABAgAGBQJIl4l3AAoJEKOILr94RG8mdwMP/3zr/whCiS5Tyig9hpVsp+gqn+h5
+RXaUx8dnVOcWgSVucaug8tY11LrvD4UfCUxW9eVpuEsB+bmEedKupR8SWPlN/+eL
+hTFaSolWqARog6Zl1pBnSphJUlM93C9VnVY1ePGF6ZWkeXJiu11+53GU9HqBqBT6
+9liBPBskXPhSmhaY8Br3RQkBpGSqUdnhdyPrB2w3k929jsx8plh3aEAhStGq4ght
+6EpM3+8f2Q2AEtpWA0Kc+wafJcT84Pr+JxRzwNAuRW3WaKZ0PlmFEuBprdwO/AOi
+qVIVi4GZjOwz3MBEalOgLWgvr9ipapShjk9qzvjLV2/I6J1cdxYu+DZDIa/3urVo
+ZZ1U83GrEBTB96MTwcX+bysrzW0+mEngCvXUEKGgdkQq4dNJXp5ro9Ns4/PK+Ay1
+81C4+L7z47MQht/q9rCNXkye5u58vqrnP6grFsme27SBZvXvAfGhSEJOmTsOn5qN
+0kBvv06kFUY1gqN+R7H5NprGx0zXgVipXGDZSE2cWmMNjHaHat8/BXaCcSbmBRo9
+YiFYKpyb4ddPTLE9fZF4PPKzS4l06uJ6DFNXfs+AM6tz+4bvKHFVPwR3cxOrEPf6
+jgD7M3CIwCPlHxxwGyGOvEJ5Zt1NImb8PDTxWvo0EifQybAYo+yHGSPzkdQ4N2lm
+nSPqtBGNKzh3yiNSiEYEEBECAAYFAkj2Bp0ACgkQ/P1jBZgh97IyvQCgyGGc+WE5
+kRAxMU51eSVkCOWBpt4AnAgGhxfQvqMdEnkprjOEztYh63spiEYEEBECAAYFAkj2
+Bt0ACgkQ3WHvyO0YTCzs4ACdFDAAUaZZVuMsUzYn4xmjcnMbbBwAoJ6dQNWndZNy
+OHZdpTUgYWqDRwCtiEYEEBECAAYFAkj2CjkACgkQ5dMCc/WdJfB5cQCfVYKCfavs
+852lL/bEJImSJkZgNzQAoPWd3/d44TUQNLBpBNJ9lmU1JTnMiEYEEBECAAYFAkj2
+C3oACgkQCXRUkVhi6pDiGACeMIvSlZ+6V3k/bPd4PiOxVHvCtowAoNRLO94W5SdM
+AHZT8uSJomLJoAhCuQQNBEKE+fkQEACBIJYHTcX2bSB2vLzMdGDxMf8gxXBwn7j1
+NoQWIMGUDg+IAqGFQ9EImW6dDMuLXTGO/f5CWD+ZssGvlObG51AHaoHMeSnwAEJn
+ORIITTwiXCzdo2DY45lxC0rb+SOhnZO8zSqQKgkV7yZaE5whw7AhrmQ69kb0GkWI
+U6XoBYWpyLoqnuJ/GfYxjZDlYvU2S0icWWORFoSMD2hyHfeXm9dXFM9S9GwG1yZW
+nI78QZXdOsIS45HkEggCNS0q3jNvVmdK9VBvH9lXn1l62jKpRqivNU8VLeACi2jX
+GGQX7edFBKXqg5qp9vr026RGUUvmjBbqKlt1CzatsRAsI9Wbeyx81YoLpd9J/0oo
+8vKBQCZnOzj1fg57iWwHeAuxFUIgkefeAbvkjpozQUIGdc5CT/+V1J72mehsEdoS
+nLZOB+sF8rgl515z8Aht4wKu942Iw8EBBACutykvOpIIj/qiybxshJLlHr1jNfXt
+ujc9ECivFCMuFgT2AChbQ6dlSnLPbiAvIYDtEHeFyPOaTu0ZaxiMx4j7t3Xovmc+
+n2L8I01A2TR/FZ+GQUjI567lZ/2B+rcaso+cv0504MKbTfhXW66zh+ed4WeuKwHn
+2fjjbHh73hXqxNk4vdRKUhnjRlkoxQQXnTqcoyp2YxWzEx5EFXDL0+JGj6o34JPV
+UqANbIRs+wADBg/9FtEDhwoO2zyPqjXQn9V8+Tk7KIHq1eKB+5R7y4vn+CzjvjHE
+fdOy1v72uWfLdJ/fWuZ9Crvf5CJ9SYahWLkwFG60VcVhOMB+bnhE2R0/eg+85Dso
+ujQtuzh+PQKH+5zO4MG8eBP/F2/P8pxBD7SCIzlLokGvy5iQmarTPCTAIGP+X/VZ
+t+Qs+ZV3YCN3nV+RdyM1pQuQ7Tx6o02QG4CnNFZLGuRNMPVM6rquw78bb4rQQ0Q1
+XtOmj+wBSbLRpuNGUYvO870KnHd337mty9YYOjo3oaFGaCjW+MhfEHxJUfPzKWzt
+3rMA0Tvgt+MZaX1LAPLQ9QpLJtOsfnvYZS8F+ugH7o04HsVws8lzQFmdw54JQokU
+oH6tJIM1E7UQ7Fmq9sINQV5udoeVe564tjrRbti3Z5lSVNN2ovCCWtUUsKABm2Nr
+9eOpkBbYgwq4czSBlR8kLZLlS+HEJzKiYYVJ2DmPB2SWWRIwRPpOLdREnQmrcaes
+50qx4YrvwL/G+xCngNWKv0WlO/u/EKGAEfKo9lHOfoLXGVGeQFMmE+LBxWVHPD2Z
+PX4vvWC7Ol5WcYydErvzvvbapE5ZshnKzoGnO8GjP41f+2DTeLoTeQW3v0T132VJ
+M0NKhYVZzMpA+uOxFIE+0V/gwGAZLuqjPhWZCFF9GzrtqpNsoxQ1s3YkYE2IRgQY
+EQIABgUCQoT5+QAKCRALA65uTiRRfKBBAKC0hKGj9VX8lpLmSN+0yT51GdPNfACg
+we0Xm/e9gMLK7f+f/6bpnFV5gFGZAaIESO9D6REEAK56BTm7OVmdo3Z57zn3sZ/F
++lCHB++FJdnerF1AXNEvQlz1v8oBj9fx5PyNqy5zCdstj5bekuyExbAZHaxyjukj
+PCzWz/2+ae27vNOdXYgJPIr6MaqO1k3uG0BvDPO+Cho74zy+kHtdfwVNN9B9qWHz
+mn6gPWy/TW1MlsaADLAHAKDMxamkZxd8MJYmSKK3qb32CfJEnQQAh98Kj6f3Qh4q
+4nrIgQxk7mOfTtLf6Tk3ouiOkm7ydFpEyWnCh9SQjt/hIjXWvyANFTMwvKlJ/+Ss
+610tatpA8pbItlW0kvJlutRUswLy8s2eoJL1BdwPutNwZmIpL2Mst9/nhQLNwNXa
+Zvs/xQalB/M1STNYwcL+0n480xXkKEsD/2nQ6oIIednXzA0j1K1SPnZEO1N542u2
+zne0Y8CzLXyndTf8eAbemC3TK0Pu4CgQxf26+4fL742S6w+aQbzY8RISEbLgS5iy
+4w77jdLzURk+iNvB9TjlF/v9rXasxGtDKe7SBxHt/TgNUJE4GBfAdKfop8VBnEaQ
+u0aKWUWq+XA+tBxCZXJ0IEh1aWpiZW4gPGJlcnRAdm1vby5jb20+iGYEExECACYC
+GwMFCQ8JnAACHgECF4AFAkjvYQkGCwkIBwMCBBUCCAMEFgIDAQAKCRD8/WMFmCH3
+sibeAJ9Tmg/9RzTY8Z2EdXjAGd8JfTDm1gCgw9l4hdmWU+/o1O6L1c84t5L+yzaI
+RgQQEQIABgUCSPYGVQAKCRALA65uTiRRfK3rAJ4uXm/VIgI5ROaALn2Ia06MKTdk
+sACgglqgS9pT/CFiSvVFaOW+OCmX9We0PkJlcnQgSHVpamJlbiAoVGhlIENvbXBl
+dGVuY2UgR3JvdXApIDxiLmh1aWpiZW5AY29tcGV0ZW5jZS5iaXo+iGYEExECACYC
+GwMFCQ8JnAACHgECF4AFAkjvYQwGCwkIBwMCBBUCCAMEFgIDAQAKCRD8/WMFmCH3
+sqLvAKCxdwy9dJduZWz+ubyp8BnLFLzr9gCgldeVFEdhZf2QmEGDnS78nejV+0eI
+RgQQEQIABgUCSPYGVQAKCRALA65uTiRRfPJMAKCh3nWmCHTdMH/QTPokpkoIg8Rw
+MgCfd9UAO576TzqwNBevLYN91lJyAkS5BA0ESO9D6RAQAMlHB90DxfKUx11V6zc9
+2VA9QFcEv5xogTJMAQ4bRv2IJCfW3ZJSEHRbg/VJlm/dPIsQBz6/nILAxd7Gxx7J
+tz/wW5wP103dehOB5+ub4v7ZlZMSU00egKyzSxcDU/CRohlFCgreK2C++j/gUrco
+QfePd6FaN/a7iQeTr/wSGzF/1QlLFsC63zKG8iCBhktV4Qi4Gv5sv+OF+EEIbQlZ
+NkO77Rifs5986JDSr1PO8ejrGR87Q/eMWkygUmEvensuWkJjjXZwbS/dAVTP+oSF
+0F6WNAwrQPnr7VhueLuC2qp8/cxjb3qhlfiaCfkxo7XsVd3lrSkXuyBSiCTjpsqT
+fIL94nV/R23fN42d/4JgGS/xb9v9Hz8R/tJ3v9jv5HJMH7fyj6vPepRUSiW/ONNK
+RdIvGWly0dO9gS+t7YVPdd6RBknhhRHPWMI2C829Geglb6OgSyZJeYZC4TRZp0D2
+JYJNooZbLWqlslmRzZNX/b7ANun0Mt54RFkH7XjXaU93+bnjCiIjzzAJCNocqyS4
+MQI6CwKZF4ZePqqwBGUN1hj4Ot3kqtTqrtcLV+HtiS6ECSCqcS4ZP4lh6C8KRr+3
+0HK9+FuJO9C58Clb9ABHDSX2UbewzqqKUkt7+peEyidPA+LuTuvD+y+LgHqhNdC5
+Vji+HViqUf5y5AY9EgYVGy1fAAMFD/9WxYAK5LG8hHlZhx0l5NZINz/Q7mkmObu5
+WFHurMye7mSw4yaHjT3+w9jVtFJ9Uuh5DSAeuKlHWI2I/VHDDMF8TCxtdiprAb8P
+7RwxBStX4wLeaUvNA/JmjqU3tgaB8GkvQNf3FoZGVtxbgRKo2p7T/1qUwnapgLem
+qeV/FzJAMtuRoRrAqec7Lohv4l6ZwJa3gTgpgE74G5jc6fRtkqNQzVhWyhmepTk2
+IemyCdbwnNq6gC484DQQA5ttqi8U9bi40qKiSB/H7czqdmQXpwXZpJgi4DGIlZmx
+BpavdXdmsT6BqOGwChqvdCm5fq+3B+GFVP0el4DeolaozRc8DiRhJOMqfGObBTWT
+dGDAHlx0+/StmWKy71qKc5etaWKRMjHHWFIqRJwTsKscN6yYr4Deff3Ouzi56EXk
+ZnvtyCjPM4AM4ZRMDjAGMEhpbkaCtLE4NVXsuNTB5ij6RK/sF8TtImJkFgAob6++
+55nMPMHb2FqO/3iGZ4Kd/SwddmKD9BVuKlUHZZZfnaYNAIBgNQ/DVAa685UQR/nM
+RonOWRXuIJOBIk2d5csjyZ2RaiOw9RovcZFmi1XUbV6BYQxt/t5rF17f4w9EFv4o
+5Lbzp4lLT1PR+Yx8ex6ErnKjNRBSlclK/+DadYXBMuNYdHZqj1heQkaZI2WcnwV5
+0z9WapPpd4hPBBgRAgAPBQJI70PpAhsMBQkPCZwAAAoJEPz9YwWYIfeyi4MAoL+h
+kpgzI1+eEH8SC/DuvTvK1I5rAJ9EmAHZ7P/QSuljTG0OI5kGxMoNWJkBogRCBMA0
+EQQA3MniaTY+TLfhW7ItDSuqHxaT7UifgZ4GCi8g4Ib7OF1UQ/fYncr+DAeTwgRF
+X7oRhaFbEwAzWPJt9A7lzvL3Q85PU+mjZiCjcIylMdql/yoEC8yQuGGRdS8kfo00
+ORA0nZc4NH5mRbaLxU3exuKV/7P9i8lK4Wh9370jDkjycpcAoPv6rYBt9cxt0FBD
+WhvdLYF3hNCtBACVI16RiDYyC7vtjU/ASItmSbY9fIchO5A//kNyAGrCh3C5+924
+ra4Wsbdjj0KLXF3TDfIM7uz8GcQr+RlvuqQjmTYxOkOprMNISyTAHIhPq2GTG6dO
+0VMVWWh44Nda0el44mEsbbm4Os/qdywM0X61EmZpcKWRldLs7lC3DSjOLwP9Fmqd
+Q5bTTz5Ictu7dF5ZoOJfQK/dGuHsWGgDvhZfTtcaKriLllhzbFJXLwXUTG5n+ayK
+geXLeJaHk6g07mRbM9D/O0QYMkofe5Mb5MPyqbMlGzyyPmrkXPx+jjPIj73Alsvy
+1xRZeb/KDMHPVLsb4w88TR1UU57+PV2AxYcvYdK0IFN0ZWZhbiBTcGVybGluZyA8
+c3RzcEBzcGxpbmUuZGU+iEYEEBECAAYFAkWvaVoACgkQ/chXwiGox/418QCfWhAj
+aOwXlAR3uC3iM5K18TPipW4An1LHWepK7vIsWc/4YjBk5y58PY96iEYEEBECAAYF
+AkW3jGQACgkQv9G0cvMd43ef2ACfetjIo1TMyyghQmfD9Ug6vlPov5cAn3+TQPu8
++Hew/D9iskRFz4rwd2BtiEYEEBECAAYFAkW5sdIACgkQ/R0+cAphf/k03ACgqEV0
+481PBrWqJLk75g1fHhw6fFkAoIF+2gG0B1INOqMKFfkyyF5aRubkiEYEEBECAAYF
+AkW58ckACgkQ/R0+cAphf/k7qwCfdqt0emB35y2RpODGYK8SfWwnQ+sAn1Q0vYMM
+Us5wfUjhakvsFCM6VA9LiEYEEBECAAYFAkW58c0ACgkQ/R0+cAphf/mEzgCg39bP
+lFsb0bKdGHpN/oQFPgVNImsAn1NoDmxYYBH6RD0Q29Kz/5YjdhXIiEYEEBECAAYF
+AkfdgREACgkQn5C1IutVnNni9wCfYwRx5fO2pr0vyhq6YPUoLjTHv2UAmwTk3v6y
+ZJrPcl8+C0Rw8HBUcJ+ZiEYEEBECAAYFAkhqoVwACgkQGIPRDsWq365CPgCcC3hw
+4zAkmOChJXpLlwU7dNQrZf0AoJvIlA5F7nLY4SIFBeQguhNsZ9JXiEYEEBECAAYF
+Akj2C+UACgkQ3WHvyO0YTCx1DACfS63xp+zmvAJijVluywlM3cFMP8wAn1u0AsKq
+kCWjERySZ+ekn36lxEoFiEYEEBECAAYFAkj3KlMACgkQCwOubk4kUXy5LACghpgB
+FqBW5aLI1KyyfvRnFlFOgVUAoJaH5uVm4uOocLmd1TS7WPnp1mXNiEYEExECAAYF
+AkgMq3EACgkQokEGqRcG/W7gogCfW1H7qKe0VPf/5RsEAzpGqtqDUJYAoJU0T4T5
+FaFsd8oLDPktzi9+iO6HiGAEExECACAFAkWqd30CGwMGCwkIBwMCBBUCCAMEFgID
+AQIeAQIXgAAKCRDl0wJz9Z0l8K3DAKCZabSaY/HYjKVjPw6mF8XgfDPXgACfefMW
+8K4U6mgS3mH21LQpb20QkceJARwEEAECAAYFAkW3f/0ACgkQC3gy83PWLUFEbAf/
+cdHp7vfn0Pw5lCmKYckBILtq3A3M0MJfNaZ8p9QYe8dvkHZHC+vX413vn5HCY/PM
+MGtvJL+LA5M9/iOvnjeK6QK2BiOWVzUgj0tgBQfslRuPYwwlLD5QHIb/5dEKE7LC
+5fUfy/5SEW7Rp5vO4a+myEVst/2pNJzSXHkAX9hK0IdnY2klNKVT4C8/Q/dmpCdQ
+rJXyReT4KYwSH2Gz9ZigI28dL/omYVAWdKreWbJ201TaN541H5LTegePvQcGwwDs
+xk4Sc25ssHWtxaU+9p3IyMxbyh4qNJLtxtXStZtCDL4NpiY4If1pGdzQmwjRjK5U
+ryVPZfmGiC4DVh1ViqAMyYkCHAQTAQIABgUCRbZ4DAAKCRCRXFcJaQXEjTIND/4o
+UBZL9Qz6j5rIJlgezluMPa5Bn5d8z8u3MM45zGLwW1FyueiB/yttkAHHFWf3AgpM
+r4RU5HreX5dF8VwDvgRBcZF1sNKszk4HqN97wPnD52JyNGef/H+6YqtkVW5HCxLU
+EMPpF5CnU1wkAN2ocS/LndgqrBwpC0Ye2QwSrtTkV0WDt3mU0Yi1QnqHfQR4aI5a
+Ska4+43FWbuoju/Lx53/Dq111+gzxm4tkL9jt8fRrbVd3IP47MdzVrFjohsAYksa
+HKDUGwuCveTKBtM66pYW4jd5s5OgszgXJWOmZDQd1BCXiAWsjjGv2nigytwmhLly
+06nzOGTetb1HSubNsUbiPswRIpMN7o/K4SpDorLDj+DPjNnmtI+nEmbhee4h7/0f
+UvEtNvtCIAk1eX2UIfGzZavUCSYb4xhsPbUIUidTBCgkdt6m/LVCCRKWL4yzMHN4
+/9BA8opMKNj727WbxDwKmWzGLIVItFcP633fK8HyPL08tN/ef97tnaW9p0/a/P5O
+yd2CV9GgrnO0quUysl5cQ2OYA4GkVQxJ0AO7Az+Y1TGdJRB5GNOIG2VE/AXt6Qs6
+mBO/vbUlUKeN/UMlu00NoMoQCx8D8p4qyk4I80gO1MLc7JaUwXJyQoSE1S8tsbkf
+YtqBWH59Wl35zqc3eS7ke93zsNYwnVDxejVV2BnHa7QgU3RlZmFuIFNwZXJsaW5n
+IDxzdHNwQHN0c3AubmFtZT6IRgQQEQIABgUCR92BEQAKCRCfkLUi61Wc2QeTAJ9n
+Zx2hcgj0Y5Ls6LT23ewZM1gJJACfaOVcKUUIwYgOYkqu1O1VQw+ahxKIRgQQEQIA
+BgUCSC34NwAKCRAJdFSRWGLqkCRjAJ4iDgn1arvcMWGKouRe1nST8cz/hACgnC0E
+mpQsa9nnMH8KAsv3KSh5jJ6IRgQQEQIABgUCSGqhXAAKCRAYg9EOxarfrmz7AJ47
+vA8/ToQ1Fw/CIASrTRQh21YhRQCeJl8cssqjNWPc6BgomA6XgaSGxlCIRgQQEQIA
+BgUCSPYL4gAKCRDdYe/I7RhMLK1oAKCQg8qbnLPxThWbR/X/Oaf1UCSCnQCfWZX8
+9aFFyDX47U201HiPWiCxV3WIRgQQEQIABgUCSPcqUwAKCRALA65uTiRRfHeYAJ4q
+46Yr2VDP1jd7Gwrj15w6cngflgCg4Ln7hFNZd7o0wFqxzsshyDqAifeIRgQTEQIA
+BgUCSAyrcQAKCRCiQQapFwb9bv37AJ9wXn8E1grIv23aXvLMVs0e9DIkMgCgmcyv
+aFm8FYlswgGcjFYz0t+57nmIYwQTEQIAIwIbAwYLCQgHAwIEFQIIAwQWAgMBAh4B
+AheABQJGGOxJAhkBAAoJEOXTAnP1nSXwGGgAoKmSY0t9cYq+KhtTZiSK/iG1hTzM
+AJ0ZC5l7Pa2RdyAV5o4m9i9K8tB1DLQlU3RlZmFuIFNwZXJsaW5nIDxzdGVmYW5A
+YmluYXJjaHkubmV0PohGBBARAgAGBQJCzC44AAoJEGvjt5lnke+3frsAn1D3O8C0
+mh6a6Z7HnvLvgbWfW9rlAKCLOZ151iwyGrw6b9KDpgYbNj+Dn4hGBBARAgAGBQJD
+361JAAoJEMzC1w0/D63AJaAAoKc+KCTzUpHRljeYix9psQBHriXOAKCDQpWdZFgy
++l2/k9X976hOyH0eW4hGBBARAgAGBQJD372FAAoJEExTNhHB+oLyK+YAoJeGWWKP
+d01rdpwEl56CNNNkmz5/AKCW9g2tl/2eGjxtrTIJY5cRccFC9IhGBBARAgAGBQJD
+39CNAAoJEJo+uj/2H3P4+SUAnjFwLBH33QzFbSXtj/0f1eCFKG5OAJ9x8NpFd1AL
+gXGxtg26alAdVRHkoYhGBBARAgAGBQJD3/mzAAoJEC5zDPX/Ggl5W6YAoJJidf8S
+OvPzr5TQwp5US0bvY+oDAKCcAp2rQeJMjXQ+asE6ilYELJuyIohGBBARAgAGBQJD
+4JfrAAoJEOJrapNFh7adolAAn05StSX+s76R8Z0Pll4gSRRnWtIIAJkBv92jfUJJ
+B7xTY8Q8Hqcx+4FXh4hGBBARAgAGBQJD5/wZAAoJEDbDJvA0eAUn+3oAn1o3sXCH
+4hgE0X9wQ4kLq/EpLSYmAJ9W/gYrRpp1eY1fiySq9BjGgc1il4hGBBARAgAGBQJE
+qU81AAoJEO+hQDuxkd9u3pYAn0qAXtbgjGlz+051yUekoWqLna5QAJsGZMvOHDuk
+xLeV7oglQSfhW+PoHIhGBBARAgAGBQJEqYUzAAoJENCVgMeKvK719Z8AnAkrC5UP
+88VrDB8f5HqAiGUEvaGzAKCXX4s11uqb8QEVFgdmFMa+t2qJl4hJBDARAgAJBQJF
+rQAKAh0AAAoJEOXTAnP1nSXwvPoAoLeAETzYE/brWKWGyYlg06t5yQd+AKDPkA1H
+IptW5/FeAKfkM4NSW6SSv4hMBBARAgAMBQJDJHm8BYMCoq14AAoJEDVQqhFngivE
+ZtYAn0c8b5X/yUd7yW0R0utIpaaU+KpgAJ0ehs2TCf4wLwwSAM364Mk+t5lmDohM
+BBARAgAMBQJD36x5BYMB53q7AAoJEBDOBVoE/zdHLwcAn2Fp9oI/y/z+k0KtCO6/
+vk8sboAcAJ94uC/SgaxcjB25iz/BUadGQznLcohMBBARAgAMBQJD38KhBYMB52ST
+AAoJED2v6WSH30Wy5+QAn3Rgnlx8d/q4AQjVBp+h/JNFwTDqAJ9lKnpjns7/SUig
+MH1zU1ftvhYySohMBBARAgAMBQJD38OtBYMB52OHAAoJEI6NV9jQzC3pUMAAoMia
+6HbeYkJjgP/PLi39sadjOv8QAKCmlnHBRsmWNckBNk/JzltfwqxMPohMBBARAgAM
+BQJD4PXKBYMB5jFqAAoJEHZ2+BYFNrht4kcAn3RFYCmKxiZkMjsUqaMdaVtl0oJ2
+AKCU4h0vgJYAlFMCaJaUyGo07gDJJYhMBBARAgAMBQJD4ol9BYMB5J23AAoJEKXK
+dLumJo3tOgEAn3W33xSo27d4VwJsieIU6j/ZtcODAJ4xsl25qs2qRUJJSzNFzd4z
+zYBKEYhMBBARAgAMBQJEqjr1BYMBHOw/AAoJEN9NR8Y0ZFLYOFkAoMH4GmoWapJt
+A4XFPSOzvZ/SK+5IAJ9ay/gke8dB70q98bo984hW5vY6iIhMBBMRAgAMBQJD3+ow
+BYMB5z0EAAoJEF50kmwQUKKcZQwAnjrBhisdAxxzubwwOVRPzKffcZgNAJ9gVGYF
+I/7uekLYNU20Au7mkZ8zg4hMBBMRAgAMBQJD3+6gBYMB5ziUAAoJENpy2KYrGSx1
+bTMAn2+xr1eEWG5d0fkfYfWiZnUy0NiZAJ98ICQCpbMxjrKUoqnbBO2wKPRPL4he
+BBMRAgAeAhsDBgsJCAcDAgMVAgMDFgIBAh4BAheABQJFopScAAoJEOXTAnP1nSXw
+/4YAoJGGaVKC0b1+ntg0dGX9ojnDAHeTAJsH8B4npYPHL09/0YQASPHm5Ll1SYhk
+BBMRAgAkBQJCBMA0AhsDBQkDwmcABgsJCAcDAgMVAgMDFgIBAh4BAheAAAoJEOXT
+AnP1nSXwsWAAoLzdWONqqy0jKM6TRK046S/46B/DAJ41wjTuyq49jI/H2mTFWn8H
+m5lZmIkBIgQTAQIADAUCQ9/rnwWDAec7lQAKCRCOPhl4KtwwtTYFCACWh4sQOShL
+f1PmfNGA8VS8txOJQ6FF/DE4j5LMN0JNkEcvofrcLP6zEiXAtOZOZn/m/IbWRkMo
+kJiCQfYWU2U8CVAx/b/wX+tOHzGNsIk+nSz98anY7PwrOpHBcy9f/+xvuQpeqY2x
+PlVRn0anrvlLT8AiN+ZHXzyHXZl4LmsH6anRVh5Zp34ys7g4+OsErL/Clvm1qNcP
+htaY9KHz/BCR+cLy7HQo1bW5vF4YY8Jo4lHdsIyJsaXNcM+gkgb9ZOGCN1Yc+F2U
++ZNpuofiFgKUhCrr0toxrtlYFjeiGFfyNSAIuwV1r6fFxzDZbVr1FNQ58sP4f4dd
+DR6EIdBrJ+qEiQIcBBABAgAGBQJD37RmAAoJELlJ+x8U70tEbxsQAIS4PlSrrImM
+0wg4p3woNsDBVfViF2bzBq2oIKcav8RfSI4blwqAFbRjV2tqZ4ponTx0kuBn2bh3
+WPid7Ak7pxHL2rnj41a5zFN6PaU/YuQGhqfI25xfqMZNbWZFbyOlomq48MrOjxkX
+i+6JMJ4Qg03I0YWhAVDCAAeCK0VByt06TiP3dhzFekS1WPpRcioRqeSM7TwG7men
+VIsl3sFHzJFpq7OoZ5xiPH8uPvvZnG8/Ye6cXKJD5o1bV8alHHhOQgsK+ZCe1hyx
+/LvtLWt7OUJNtMyPlkrX1d+Vy2mikF2z0Vo93aUAA2YzxrDK/SZHTdPxOZ6wgEKg
+AHD8EIk5XHF6dco6TvpXN0bir1slgJ7vTKhqY7JxeoBbxys/tuCffDiwwT3SxCnS
+IRyw4dYNFuTGXh4PZwj93HSwcpFucFIOkMy5ifFAvMS3x1VsUFmEXIrpuKdZiz/Q
+vjlr8AkDn2R83x8I5y6AsjVWeByPOb6HMhpgVpMT71j06Ood4qjjhsy+m1A71lBl
+LmGj/nfYHh5pXCmUybJasEVQ+0L+lCYGHMGHPKCHOX1PBNnwNfty6StQ4otYAbkw
+fcGOw60UIdQ53Lq3ZLnt0MpGRHdid7/fBnPh3NWJwiGo8brbpzj8XwAo1gnVpjJQ
+cZtBWWCgOB8yqAUAYQnAUBthcsZmuEBLiQIcBBMBAgAGBQJEqZoZAAoJEJFcVwlp
+BcSNKZQP/A3Wi28sNA4LTW1zqIlgvJK+D0qf+YVfD1I0uZ5evdIjPJkuQMPduZyw
+xMuQ5w5o0K8cb8w08vSeubg5fgP9D683c9WGDAT/yL/q0J/ngCRVw7WARxs7C4B5
+tIY/NwKdvA+Ijht6LNu0KUsNk7EiOwtU9vWLbpbMA9GrS1rr3k3ySpOY2yH4YeZ+
+3WIHUpEdu6/OTf2hqg2iQFmGgMZrTnT8j2gwXw/RasYO43Bf+WmjNkKGF/ePneF3
+Y8dslb5QV8XjtnyrQ37bRCnHCXjkJ9Ko/iGidU6O4PQZTYwZKneYGrOePZoawsmd
+OrndmNjMbBwgcae5SbsIhGavNnxDs2sVuBJvcvb1E1kN901s4mPV5t4l6vx6W+F8
+vARF4RWu6NAuhAl02zAD34ljZzbd1RbJtkB1AnD4vD9vRyROnfxceufEOxxUorY5
+rJBQDyFaR/T5B1poXh6z2c3+M0C5mXZ8jM+JMe4vTyK5U+NTPy4CXA+gof8c+ugu
+vowof6pdy8sv66oFkXeptfpSgkNaf7vOsNU9PK/QLad0ye439655cixAfNn18RNM
+u9x0iiRbb5SJhPG/A1vqozcE+iM2fOKq/dJrxknDzYzncqZ1PvV+19oIaFmIcrGr
+ANmUCMkcLgtPGG4HZHH2cQ6SR7uZRNgM65K+5h/4o1QL5QEFYHoQiQIcBBMBAgAG
+BQJEqZoZAAoJEJFcVwlpBcSNwM4QAI3mRFKkt7fk9N9+chOqN5OolikS31utAEn0
+TVhPXGImpfSAYItyuFsKB7fwHZDKdaBL1YJ+sVsuIfx240MCEDRLfOljc60rAi/X
+Vcnn2Mcsw5dY/DcLIBfogGIQMW9RJ2n0rRpwnvNyH+DyXBUWxKlA4IaqmmwCviZF
+SzavDMFEo2emQZRU070empggnBz7ic9UZECPASjOj4tw7VztrnU1MCvL6C+o7vij
+VG9crt+4EutcYLpWE32EzpCZ8MItzExhNh0kQTP9IoLVxQoDOpX7ilxQZ+506V3I
+BeEy3JWxoFlI54itp6ePaYC2YKNvQq4mUqEcCvkvqP0Vh8q+HI8qfzN285/WJBJw
++sARl/vNV10K51mZzdyTZEoRdZs8DY58kN0WxboLlcxs3QoNDS95ZlgDEwPLXUu8
+R5VSP5LpBB2bN0CPAFZsfnKdchBXVL0NE+PesUs0CDDhZmYxzTDn6+oJG7Z1YdZ/
+lRfMgrNVb/UQ3Og6yyyrJm4lvk9094QGoF8OPmgIu3SmRwdqQxAbBkHYfEr+Bjoo
+3uunrVkBaRz68EmfMS4tWcmQWUFLTV0QDP6bk67+N+s2G4h01rn6jRg3PDY0Y0cH
+/265yQJb2tYtQA6Va5gdlTadhmkItqtNE2EkC8R/CvdkbP/BBvhxf8L9UqlHavXO
+30NXujmLiQIcBBMBAgAGBQJFAXb1AAoJENzr9V20Ipc8K34QAIMfCx00DY6zxrn+
+s1+pUTl0lmYQSp7eWdPEwPExFTtXFmClMfmXtwOXy0DL+h8LwIntMmoZ4MGVGZ3z
+ZBddkjr31rHd0/BAnmN8r71vk+S0qD07fGkm2NfKRilTa9RTN7UC93LlGh2V/sD4
+Lm4zV2Ykx0Owh42Td5VOfF3SxX3EiIT+ohjzA/n2R+05NZbR8z3kTVUHbdZ/XikH
+V8HkaLDrJxqEKSWpOuClJa22gD+CdTA+4ZwDRKGgV6oEZ6COnj4Re4uQbBiLVs/D
+RoBY0xoZBPKBnuOo50ZEQIC5bHxaHRIA0X/3eWjuW/CwVqClj0y7taWk/C0FwfpZ
+Q5QIcmWTLJMjhDC9DxWyMana4+Vx5Kqto7PD0VsWWYxNYpIyb08Kq6Il8FYvSix9
++fzwKqmIaORRPw3PCTx30yGoa+Vx/JAyI51q2oN1iLMdlBFGmyqwkESyHAu5GEhF
+2H6kHyPdhTqB05nmHGJqGOKyHikKY7OnjPJiYOf9aAeSS1EhlGa7iEeYLNH3lTUg
+DJcQ7ehW8Oa/ZZDfZdMmpQjYXucJnrlnjVRrw5sybv59AiR1xo7sjZnXpxBGTA5l
+P2vbuMoXRSeV2LOKsROpfmg07M9Z2BQNUl4BD4YGT10PtV2+vD4jqvW4M41UWY7g
+fGWSgyO7l8KRCWb6RIMSn8FGPSO8tChTdGVmYW4gU3BlcmxpbmcgPHN0c3BAc3Rz
+cC5pbi1iZXJsaW4uZGU+iEYEEBECAAYFAkLMLjgACgkQa+O3mWeR77fgKACbBAXb
+Tc9GYnWNe3rJ5Jvcuq/mxJcAnA9F10dyyIHzIzfhCsf+2g9iRpydiEYEEBECAAYF
+AkPfrUIACgkQzMLXDT8PrcAr0wCeOI+Ug5KMIs1+jRVDefe+kEviH0sAoOKlooob
+hZT9/GK7bteHSv9L0arHiEYEEBECAAYFAkPfvX8ACgkQTFM2EcH6gvJt8ACghkvz
+245kobEoOE0ZxLZY9911ETsAn1YW78Y2U5eLDttB+v+Y1rEP8RrJiEYEEBECAAYF
+AkPf0IoACgkQmj66P/Yfc/jxgQCggmhhjqIsiFUko2eaf+r9CIZwFXQAoJvcnjVE
+MCWBUokxr2AcLaMUfZ7ciEYEEBECAAYFAkPf+a8ACgkQLnMM9f8aCXntDACfRCOF
+qB8RAfnL0N12QPx2N3RstC8AnRsGqFf3U6OJxqfyGZhCvSTe5UvRiEYEEBECAAYF
+AkPgl+QACgkQ4mtqk0WHtp2/0wCgxJqTJiYIVgF60P/w+G7KXU57IbUAoMHf4Oxt
+2fp2dv0QMq1CX2w+DpP0iEYEEBECAAYFAkPn/BkACgkQNsMm8DR4BSeS6gCgjZXU
+xCU24X7VHmjfPq3NCT/uTSMAn2jvf+TN+klEx6w9G/veEP15Utv3iEYEEBECAAYF
+AkSpTywACgkQ76FAO7GR326vXQCfdwqDA24fkbhE332edPOYcIgwuFQAnjD7dIwu
+UEjr8nLcOeu45hQVvUVTiEYEEBECAAYFAkSphTMACgkQ0JWAx4q8rvXs/wCfYf3w
+4iuydj4iGQEcc+aQc8EUxSYAnAlhBxnsYLUiECVGESzJ0aQNWrsgiEYEEBECAAYF
+AkWvaVAACgkQ/chXwiGox/5ydwCeLeaGdvB39O91vL1aEV7yRkrF7UgAnjPoI2zB
+lPvrwbEndZuFp9nimzk3iEYEEBECAAYFAkW3jFgACgkQv9G0cvMd43dH0gCeL8Fg
+kzYYtA3JTH8olUsdaT+vztYAnAnM0NW5BrOGCHnb0ciqhG3JYShfiEYEEBECAAYF
+AkW5scsACgkQ/R0+cAphf/muJQCfV04t84qc58/SL5hjd3/IdsCnQskAoJIha/iE
+1eKLONLbkwKWi4v46uWMiEYEEBECAAYFAkW58ckACgkQ/R0+cAphf/k7qwCfdqt0
+emB35y2RpODGYK8SfWwnQ+sAn1Q0vYMMUs5wfUjhakvsFCM6VA9LiEYEEBECAAYF
+AkfdgREACgkQn5C1IutVnNmK+ACgmgKfSROkngMGDbP8GZjQBYM3P6kAniocQyGr
+qDjAfEnhxCeSexBNhLLuiEYEEBECAAYFAkhqoVwACgkQGIPRDsWq367ciACgmd2C
+WZw5KxvYPfKdcNyT83i+tQUAoJs7rZCiTFfrKT5ioPC8aswlenmMiEYEEBECAAYF
+Akj2C+UACgkQ3WHvyO0YTCx+8gCeL3pa+537ZUsJdK5cz5lQTYpuuhsAn3aqBMTl
+McBGmMP7L1O5kvlDhqxgiEYEEBECAAYFAkj3KlMACgkQCwOubk4kUXzJfACg3fE4
+r5M8A7kKb7yatjMrjtJwDM0AoLdG1kl8JBU061wE6QqN37XePxN8iEYEExECAAYF
+AkgMq3EACgkQokEGqRcG/W4T0wCfbiHiL5vSkUjSCF9pYZn6o7ymikYAn0gTYvvP
+KN0Wrv68UX8sTbxlvUFaiEwEEBECAAwFAkMkebwFgwKirXgACgkQNVCqEWeCK8Tc
+/gCfR1KCST/ptLmxjXMF1rx+HcGLhwcAoIzPS5Q8PK690TOUfUFcl9JrTjQfiEwE
+EBECAAwFAkPfrHkFgwHnersACgkQEM4FWgT/N0f9cgCgl2BUHJ2ym0wLoX2GhFWM
+Iafp3BcAn1QwTOpnrjD3ab4LnHS3uxTrR31miEwEEBECAAwFAkPfwqEFgwHnZJMA
+CgkQPa/pZIffRbLCvgCgsQSYonGTdKM7sBo7jKfZH8+ieocAnjltNZss8+kEqTK+
+LiQYERfITorfiEwEEBECAAwFAkPfw60FgwHnY4cACgkQjo1X2NDMLemdMQCdHFPC
+GtaiJJ6Ff4fNYKrRfS9H/YsAn2FoLV8zDZqCp4MJnRsQ72IjEycCiEwEEBECAAwF
+AkPg9coFgwHmMWoACgkQdnb4FgU2uG1/iACfToiQFs71TjHPN1zmp6rKhLCTpuAA
+oJgP/qO2Gh6sUupiTQHscuowtMOhiEwEEBECAAwFAkPiiX0FgwHknbcACgkQpcp0
+u6Ymje1G6ACghNb5LjFP8Br2H8a4zmmyJx0RHtkAn1Tv7CyUHJE7+58BSXEgNwlU
+PYyuiEwEEBECAAwFAkSqOvUFgwEc7D8ACgkQ301HxjRkUtjfLACfQ1nqD7pYI1lJ
+CgE2tctvMpP+IHoAniy81P7sZjPBRGQ+h2L42rTeTD/ZiEwEExECAAwFAkPf6jAF
+gwHnPQQACgkQXnSSbBBQopwK0QCgqu7x34GJ0hL4cfjdezRMN4/GWTAAoJK3Ou8L
+aLPOpcmieoF9SsniW7zTiEwEExECAAwFAkPf7qAFgwHnOJQACgkQ2nLYpisZLHU9
+uQCdEUW3hwVms49UcjHRMZ8Zlg2jr2cAn0cWoZPGAV8ZLSK40h0Dhe0aF0JIiF4E
+ExECAB4CGwMGCwkIBwMCAxUCAwMWAgECHgECF4AFAkYY7EQACgkQ5dMCc/WdJfBR
+FACg3UMFem1Te0HPblkp0AYXuThjVaIAoJwcybUL25RpmAsTjvKjSDHyVQMOiGEE
+ExECACECGwMGCwkIBwMCAxUCAwMWAgECHgECF4ACGQEFAkWilJgACgkQ5dMCc/Wd
+JfCTwwCdHbWGtiBK3iYKBTpi5R9LEIRoYWkAnRfRrHZNyCdM7HfrQMcKikvXOoN1
+iGQEExECACQFAkLJBUICGwMFCQPCZwAGCwkIBwMCAxUCAwMWAgECHgECF4AACgkQ
+5dMCc/WdJfAmOACeP2hJ4mY1vrjBtJnbb3bjIHcqOgoAoJw/MSTi0UsR6t3avXbe
+vTipWHZviGcEExECACcCGwMFCQPCZwAGCwkIBwMCAxUCAwMWAgECHgECF4AFAkN1
+GzgCGQEACgkQ5dMCc/WdJfBanQCgiQL1tIgF4zKJimoOYwW7JC9H/X8An2Ya2Ajo
+L/NmKhaPP9euXtzdMni9iQEcBBABAgAGBQJFt3/1AAoJEAt4MvNz1i1BWlEIAKAY
+PdevPw3sbLN0GAKN38jFmFKuoDNk9PCi6oIcsuj5tIwe2/RONhAEasE03uBq9GTO
+pOmQMn4ZJXssn/mqCkTIXl2wQRh92zlD813EqM7jD/r2XxB+aLj1SAiBPTqhZiYe
+kw8rOVY8wVSkIecBqacioY1K30+uczcc5d+c0m2c2Xey0cHfoGixGSs10Ie3LUvh
+k/2HOHhuJAl2hnKbEncHNWfJYqU3p/DlrRMhpgFYPIyniGSs4ZrV+frWEcXk9vz2
+dPr7JgBgPbcS3bHM9YeVynWzIK7LirHrlXpCdcVVwyF/iGKNm0JW9dU+D48dLvpG
+KnAk+4JUZe+LhQGx4gmJASIEEwECAAwFAkPf658FgwHnO5UACgkQjj4ZeCrcMLUW
+Ggf/Zd3Ex71Zc0OQV96Wz4jPY/YwjHn7ct9gIW1EMK/7+K6ghrymg4/vIYr4Wgql
+uSuFRzFPIRa5Yky5YibPVjsz4++ZECth6gK8+tv3r5YhuBFZo8Dv7p5gDFkBcera
+VUw1mZtutg06OYtCnTA0t46bju4CPHCLGus6rp45KqYXdPuLgAgg3yykahymvYVM
+EnQz4qlGIp9kFEThIQCkO0wdKDuVBY6lxPY9VHz1r6SNfSsi06xfXKXfCmOlUD54
+Ig5SnKEgnfo9Z3iTqQ6SoQD13BT5qADpWg/uYmWDnwMwMQuT/e1BbNUR25stysBF
+sVVThos/onB5NVLXyIYYtXTXDokCHAQQAQIABgUCQ9+0YAAKCRC5SfsfFO9LRDxP
+EACz01qAhzk39eqwM1pZcLxZcQduhIV4zkZ/AHAA1t/joMDHwViNyL8NjFqXH5lz
+m7pbPxqx6gg9ERWfFUE7ru+s+revP/KMHYPmLIpR9dYq0xE0MU0QwD10/HTWw9Oe
+ZZziLgYQaCmz4rwqCAQi4JgdkfCKL3nwZV4xZftKIuSk8t88c1Ou7UybWZMgAjoS
+e/8+vLI/8OIdJy+P/lq3aKum0ohX7orQkDynzkPbo/yYJarLERxR/gOLqmOQpD3p
+bSTWLbvDT2KbQZqKZe+S2zOw0Db0yyQawObakVT/jTsZ1dKR8WcfYJBI/DmFlQmW
+hduaY5vQXXKng+Y/laeqnCM86A3RUtG8rmE/uGz3UCaO5gS6k+wkTlQHVszVQB4L
+fjDhbx0tXgjUmPU4kI3c+0MxbAxP4+XFAEqXbvqmElgGLt9Zu9HG/swcmhb/dcZI
+4qXcrLSAqZ4+EfeOUSyScvSC2+w7bduAS+QXkuJrCQ2A6lEszJQjslQ1HK60y/2n
+32Niwlq5v/gwwTtQw8yXtsFuScmIQWXfuBs12QmTTYHEWEryDqZoOrIRh1vtW5oJ
+QX1llfoHr20DH4aPaVvxNiIiuahTZ5Mk9IakxeUqjjY99PdkGhMhnZ0TQI3vtcrn
+O5iHidZzTFxcWsESDjKsOLEQU3z9Ge6sy1lieNUg/2MgMIkCHAQTAQIABgUCRKma
+GQAKCRCRXFcJaQXEjcDOEACN5kRSpLe35PTffnITqjeTqJYpEt9brQBJ9E1YT1xi
+JqX0gGCLcrhbCge38B2QynWgS9WCfrFbLiH8duNDAhA0S3zpY3OtKwIv11XJ59jH
+LMOXWPw3CyAX6IBiEDFvUSdp9K0acJ7zch/g8lwVFsSpQOCGqppsAr4mRUs2rwzB
+RKNnpkGUVNO9HpqYIJwc+4nPVGRAjwEozo+LcO1c7a51NTAry+gvqO74o1RvXK7f
+uBLrXGC6VhN9hM6QmfDCLcxMYTYdJEEz/SKC1cUKAzqV+4pcUGfudOldyAXhMtyV
+saBZSOeIraenj2mAtmCjb0KuJlKhHAr5L6j9FYfKvhyPKn8zdvOf1iQScPrAEZf7
+zVddCudZmc3ck2RKEXWbPA2OfJDdFsW6C5XMbN0KDQ0veWZYAxMDy11LvEeVUj+S
+6QQdmzdAjwBWbH5ynXIQV1S9DRPj3rFLNAgw4WZmMc0w5+vqCRu2dWHWf5UXzIKz
+VW/1ENzoOsssqyZuJb5PdPeEBqBfDj5oCLt0pkcHakMQGwZB2HxK/gY6KN7rp61Z
+AWkc+vBJnzEuLVnJkFlBS01dEAz+m5Ou/jfrNhuIdNa5+o0YNzw2NGNHB/9uuckC
+W9rWLUAOlWuYHZU2nYZpCLarTRNhJAvEfwr3ZGz/wQb4cX/C/VKpR2r1zt9DV7o5
+i4kCHAQTAQIABgUCRQF29AAKCRDc6/VdtCKXPFyID/9GXAFlIoAg6nrJmqf2of5t
+AleZZzGkJO+E5RjRHlhxNMn2Dcl9uBpCT2HqlKMA4kFkGkaa70wJOuws5n+kD8gJ
+bqnyI6CFDabiJjuEueo7VA51stChgp3x/0v4ZJZ9BtSuKvePTxNoon5F7UtLnkPI
+TQ4pOd7KlazSZP05oKDuWb5AfK6EEByDwJQysNB7pZAHc5xCn2T0ePUb2xIuSqw2
+YexsuFICJl5cbIAqel/bIryxSMUECTKNixx3lJAkGxBnucN+jAWYoHxt56wx/sUT
+xtUT7lkfuBY9oySXpUq/PMhoCpMGlXBamUbJYLGJEKNjrpCIj+Qh5i9kGJoLVBJJ
+lHfWY/pnoGoC9k1ron63rgxKhTDomfUB6NdbubyRbX9ZfTwF/ufn/4GiqwUWPgRP
+XfSeKAEUS714coyKG4GzboW2fuFonIUKJPNNyh6JRZrAHkCPfEo3ZBFMgLENt69W
+R7L15oST8oSiwQwFGoayVxkfhKzpilCzDqBgp2GeimwZRTqhkYOkOqPeGFyC5a53
+O/c2DsAg1vL4wwk10+YWjcKVMzc3wU89oEVKNhirRkHmB1kUscAtiTHyx4gsW7wM
+r7EDiT4//2NC0za5kr7we8GZjEUNOzkkCZEtdcJdLky/gOn5O+P6JFDg0gLD/eqZ
+BDBGMXe4ZjE1ZFBiL9dyMbQrU3RlZmFuIFNwZXJsaW5nIDxzcGVybGluZ0BpbmYu
+ZnUtYmVybGluLmRlPohFBBARAgAGBQJFr2laAAoJEP3IV8IhqMf+VJkAmOtsdlh7
+dJzfZcOq8SAR3ae7X5gAnjaH60kjZQRyOa+pHavm1CRvYEpbiEYEEBECAAYFAkLM
+LikACgkQa+O3mWeR77cafwCeJBVF/RB/0T+o6MXUPuNLBfZngAwAn17KsLJtl6F1
+V4cKvcgtyHzvIsfsiEYEEBECAAYFAkPfrUkACgkQzMLXDT8PrcAINgCgi780o9u3
+WJafjRjqcYig9X/mTmIAoLG9+EkWL7etQR1Du1DQ5YnHQWVsiEYEEBECAAYFAkPf
+vYUACgkQTFM2EcH6gvKZRACfZW0aFHw5qyvQZRlCXc2as7BFq7IAniwVt9OEQVSN
+UtHzMs4bCy5cBN7wiEYEEBECAAYFAkPf0I0ACgkQmj66P/Yfc/i8fgCdGlJndZSh
+MNoJRsMnRkgwe7bLPQwAniNfmJSAXQN0ileZ07ao3iLLo78ZiEYEEBECAAYFAkPf
++bMACgkQLnMM9f8aCXmiigCffIjutzO+B9gKaKXO36kJzVoPC1AAn06h7h92C5wR
+s93Fu26xCG0f8fEQiEYEEBECAAYFAkPgl+sACgkQ4mtqk0WHtp3G3ACdFinkH3Cx
+llt0Z0DO3718BwDk4kYAoI3PqWViCyKKAaJRF/A+V2dABWssiEYEEBECAAYFAkPn
+/BkACgkQNsMm8DR4BSeXwwCeKTiYh3qtebX8CgmolF4RTeqD4uMAmwb/xwbos0s3
+MW86X8ijUAgBhR0ziEYEEBECAAYFAkSpTzUACgkQ76FAO7GR32509QCdF/TlSY7c
+V7lLBN8RYHZfQ3bVvSwAn24V1u7wzC3BYnJE9o9VVeaonUZPiEYEEBECAAYFAkSp
+hTMACgkQ0JWAx4q8rvVdvwCePn3FVJtS1oUKM9QnFu7PILhWsmoAn0rR4r4BJUQI
+Ug0fD1aFfJvq4Q5ViEYEEBECAAYFAkW3jGQACgkQv9G0cvMd43dGGwCfd+fWkVWy
+wcEZPsDOSPiP8jF1DPwAnRqvHN126RIgEAqYAdrutNmo1EyaiEYEEBECAAYFAkW5
+8c0ACgkQ/R0+cAphf/kZnwCfQ4EFq9NnC8/XRKv64gxicn2KTsIAn30cMHQMx4kJ
+q2XIRwASXC344NHHiEYEEBECAAYFAkfdgREACgkQn5C1IutVnNlFIACfZCwA/+W0
+OVgFf6eMa6lHaCx6hQMAn3df7qj4AGKmgWSDffAcCcv3cG8QiEYEEBECAAYFAkhq
+oVwACgkQGIPRDsWq364qvACcDQptxdMdmf3d1K655Gq1JZD1XAMAn0x4cLVid6bE
+RUu8wQGgyQqI8GDUiEYEEBECAAYFAkj2C+UACgkQ3WHvyO0YTCy6OQCePjlQmAt9
+eJZ5RdAZtOiAjLE38UwAnjr6Rn6rQyyDLnTTnH2BkLoaVO5niEYEEBECAAYFAkj3
+KlMACgkQCwOubk4kUXzEjwCg+EgM0v8MVrqGsUNLc7iOf1d1ACsAoMuwGx90I82F
+hvfunQm/Q1KO1r2viEYEExECAAYFAkgMq3EACgkQokEGqRcG/W7CNQCgkaQ6ZR+T
+Cb6gw5S8wHd/WxwSTI0AoLRDIdombu/necEYtGYw+YhCQEPjiEwEEBECAAwFAkMk
+ebwFgwKirXgACgkQNVCqEWeCK8Te8QCguvJdxTkg9ZvkRSYDQtTnnvgIIqYAoLJT
+nM4EcqL4/ZzfjDlho8S6sedZiEwEEBECAAwFAkPfrHkFgwHnersACgkQEM4FWgT/
+N0ephACeO5EzHvZ9j14J2fDnYzS+kvTrd/EAnREh6HwbtN1OAvCFcvsqSY4mjz8z
+iEwEEBECAAwFAkPfwqEFgwHnZJMACgkQPa/pZIffRbJ3jQCffjdTVFJMcWJ0zXYp
+k7/tLzavm9QAn1Gd6eC3Cdh/spCiw74i3CEmgknqiEwEEBECAAwFAkPfw60FgwHn
+Y4cACgkQjo1X2NDMLekgPACgswVTlvwrkLDFTy6JVn0YQ7+pIs0AoMTTynAGa4O6
+pdbbhFcyo1YiTd+FiEwEEBECAAwFAkPg9coFgwHmMWoACgkQdnb4FgU2uG0WoQCg
+lnNrzSlPpG8Jx3wTfp6PfpI+d30AnRmRLWfnHxgTKBik1K2+kU+VeRTviEwEEBEC
+AAwFAkPiiX0FgwHknbcACgkQpcp0u6Ymje00xwCeNNcwFih7WCNrGY97AHsdFOEl
+erMAn30QfB6yDcZzk+ENXMojooErImSyiEwEEBECAAwFAkSqOvUFgwEc7D8ACgkQ
+301HxjRkUtgiCACgz0Iwdigo1tqD/91F97fUaBlAkeQAoKGRyUEpLJqnk8/1X5tO
+fQwMuO7IiEwEExECAAwFAkPf6jAFgwHnPQQACgkQXnSSbBBQopwUBgCghxgdf5AL
+ZHYSS6ftdXYZ7k1p2M0An1YIp+GoqkuDNrmSCIkgX8MxT/H/iEwEExECAAwFAkPf
+7qAFgwHnOJQACgkQ2nLYpisZLHX9egCdE3QgysM3lGSPQOr48rL1v6KLl9EAn15i
+IseXxGBXMXdWP436bIjlLjEAiF4EExECAB4CGwMGCwkIBwMCAxUCAwMWAgECHgEC
+F4AFAkWilJwACgkQ5dMCc/WdJfDMhwCfWjS7atSRsG4hdufx6sRlmXeuwXMAn3uQ
+h8GQ07TkccoSPPPxBsU88n3eiGQEExECACQFAkLJBV4CGwMFCQPCZwAGCwkIBwMC
+AxUCAwMWAgECHgECF4AACgkQ5dMCc/WdJfDk7ACeOEkHGB1TJ5P1ji3IUFbPLGEr
+YbEAnRvMA1ttLP3y3kGntTPnHv0EW9IFiQEcBBABAgAGBQJFt3/8AAoJEAt4MvNz
+1i1BtzAH/2B8e0cHsCVjIb/aeW0Ya1r6QhfYZegmGnzNZb3b/Cle9JMLJLGpY9iF
+EEvYiOsXbh40KU3hzu6VspDks3qHw8ckOxQH3guPBgWEnlX5AGz8BZWAdgvDGXlo
+ULzViytbCMHi0uFgJO+Odz7G/5lctWXpMyuX6WW9490/HgC4tBjxOMIcWgw8C2io
+eN8rmnC/CiLiYtD9pwM+GpBWG9O5LSVLVxq+cXgnKMFhdmdnUTd/gPrnrD+0djx+
+Lxb4oUaAu7ygPRV4nFGyykkacSLuDZhCa8o5KYg88k3QRrK9S0JaDqK1M6lw1B5d
+lOVgzxD+evuSrjn6KadAaeTIGCsuupSJASIEEwECAAwFAkPf658FgwHnO5UACgkQ
+jj4ZeCrcMLWHtwf7B26y66vpeE6IwjzJIkgdDkwnkh8SAIk5e0Qi4RI0B2GkmCbz
+PC8L85OmWhXdqTGMpZEmfHcBnBgMB3NIh6et3H0yOyYnBkwHsBLddJMgG69+YUev
+pyHe90E6Q+WmtyH5KYhKCRnjU/1KrD2C9qkYG94Es/qVnACxjOTntHmOoweWapLp
+hwo/p3Dsyy/poFyOhWVpBsIV699l4OfqSGlBhW7BD3VyrUc7DaDMlBcdLRvktptv
+LNasUHJOriscWPKEGUH4xkN9tdNG9H7r6TeQCjhnce2DTQ0CKOOeonumx6/l8YSQ
+jeeR4MzeGtNsfcnOqEVmkMKmYS/t8/I4NWzknIkCHAQQAQIABgUCQ9+0ZQAKCRC5
+SfsfFO9LRDOrD/sGNSOT4ITGx6n3DLz7HFPxmctFS2jpTA958zvUIcGD4s/NXweB
+G+8gak1rw3wYfBas8t3NDptTOv7FSQA1RF3SowwCrw10aDZ9vVBHncwxcBd5kExO
+Zo8AZEt+nbOw1W/h8aFC9z8HV2ik+teJUU3gAoaOxYQZHke1l/JQ+yenVaGjyyhw
+82q2S3EkQC3Gi7Htc93l2Dsg52zM+vWbAcBDfm5M6sl21S3+vwoRt1SR2865P8nQ
+wEHwQVsRgGZ/zXocXiNPucVfjPk+HCtK0a72a47mb6qXT+dK0Lcp4esTkfGUDveb
+wJiMMPQOLOvhGwryi2KJqKHLDy5JpKZ+tGc2FisR4hLwZmTQTybFXsxzZSW+ql6n
+sn/f5LeD8Jfhwa5cu2b0XC+WBz9PsGW1Q0ZARzx4zq0UL7x5h9UOyEL2eKQvXPWI
+KpKtIwPYdFh0MwIh10rrhZcJ3RlbEG955uAH0WC3CnOa9Gq/sAffGRRD8YNdh5Er
+5EBMNVjbSpUKid3/BwHAx5/oyiFUwZs9bpwKr1KgZ4LRxzowx8w3cOXBduwGEaXb
+QJGz3pcs+Bt7GmL3lZtMUNVfRf6JPcLxaRjoM0xdRBJuqkt0nu0ZZ8Wklr2hLvMb
+pxn2JoMm3SKBp7f2fAz3SA9I1/68/xjWxaO0DTGxaTLV0LgNexpwe0MH3okCHAQT
+AQIABgUCRKmaGQAKCRCRXFcJaQXEjZd5EAClGsiadE7UTNm9gEtRV43TOq5ytni2
+WRCXNva0yZJeH4TS8wIskvU4I22RywJranXbL1+w6GifNvqO8IkYNb+ghYp2COSu
+BAwtklq/O7ITtEiy/AHGsqOVqqiuZFfGkiVIPC2fE82h4jIAICK+sLIhGvCuA+UV
+q/LFSOfG5WZpzj4iJYf6sGY//G1EcgiTIbDXIPygkBksMWzmX4WTVDB/pQQC9JZ3
+Fw27w7R6qI+bZ1JxD7UmT9ya/XCGwJugOSKhyfwQpt2x/CJlZbdNFVyInuxThmVJ
+CEWaKdqvZwVZqKNcdiHI7NplPZWF6BRi+w7PKXfnM7ZoIiK+e8/Eq66FDBef8SsW
+MU0nsapl1oBBQY7PRv/p20TT8wjfB87hu2PEWB2U9RcK3GiTOSOLis8tZSZMtA4q
+ZW/w2PP3ap29oawnTKXhHh8pQxUVOi1Ypu7t6rW57v2/t0cECtApcYBpghrjlr60
+GQAYBi2f3ZsNXbctXDiPz/DGAEzYTliCos7q9jTbHGstIi7Qwg7E76SyeMfQhl3M
+zc27q4iTwRvhcPOctZT6noQIT7meWBvNwSKLKKnnWtAuLaPovYnVK7/Pc2B9n2/I
+3uaf/7SUc+yHOCBn4VOLBbU68MUFcTMOnm6BbtqhZoTSXwCiWeBrmTeDZpwYypx+
+AMtM7psknA1F/okCHAQTAQIABgUCRQF29AAKCRDc6/VdtCKXPGDhEAC/H3zBJZAp
+Q7d6ofTXi2ZTkfcl5WcSMkx9HRqVxaZkhgKcO24nm//nQKYGfOJHqfyL1giPrBp/
+GAAJSuJ3kjcs3B2QoGr35ZiaZV1MdXyTTmig0ohZmW7KgrxsSRtCMV6qYLCs1nkf
+lc71t9vpeaNkjAf0aEiuH/ISk21AkEtTT0AwdbIvowaSwxt+w4+oxh7h4Z8OnNJO
+Y0MtNUsvaQ2U5NMCYvkYbPpYE2lTMOtjQP369kw8XOX8l/Y5yDoQs9/YTvFVfuZX
+3TjqyAbDsh6c36NWR1FOk1nzkZ46xZ3QXRhqADkvpK0jmLL8+7fP2r6Ihz0KAGzD
+t4NOXJe6QalLJ0yvDbEKC0OJrNdI+wgzV+1InKI9c6GUZ8Xtw0E2V9gzrQup4Vnv
+2YGRxp8a069mo5rOwFDyo+RQoiS0WqMzGOgCM4v5VedvsuhfJY0MMzRzZqb77Pxw
+jAlVreaESH9tDkihEA6DPfgSaY+yUXEcz4mwR1ABR2EJzmgnXpbJOi4YUwybtMuL
+bw/rNqvvU/rs4ON0FmBc3KYf2sjCFqP2G+cN/HzFX/nP2gAOci4Fl4fjLIYvKhTM
+J0T8aIofHwiSF91MGU1GQ5cMJnlPYfgj/MFzdvSl3Oe3J0imTPiul1OzIq9qP2K1
+mhxeiprgmJfYsoVXYXCZI5/f+AHQRGss0rQ/U3RlZmFuIFNwZXJsaW5nIChFbGVn
+byBTb2Z0d2FyZSBTb2x1dGlvbnMgR21iSCkgPHN0c3BAZWxlZ28uZGU+iEYEEBEC
+AAYFAkPfrUkACgkQzMLXDT8PrcBgOwCfTz6TifZxyfAB0QqGKvXm/x94H4EAn2+l
+sdxc228hcKuSmimFt+HoIhCiiEYEEBECAAYFAkPfvYUACgkQTFM2EcH6gvINPwCg
+u9lz/U+wViBepYx9DikKpxtHXycAnR6gKC87WbzXltStg2/99n+ixkuNiEYEEBEC
+AAYFAkPf0I0ACgkQmj66P/Yfc/gfdwCeIHpHixNTHlZHr/maQfvpazKMO+8Ani2/
+5Ks51pfUkANyYNGauwQAv0F8iEYEEBECAAYFAkPf+bMACgkQLnMM9f8aCXlQGACf
+aV/CQj9av0SALk7QiqnSzGfwH1QAn1Qd/iSyaZmnO9XLfeJHVgtuQwy2iEYEEBEC
+AAYFAkPgl+sACgkQ4mtqk0WHtp1cGQCeLZTqzprOC1m9Vdm3PQ2vS22ri8YAnjoT
+RCdhdK65pW88z6vuTK1c4ZpGiEYEEBECAAYFAkPn/BkACgkQNsMm8DR4BScI9wCg
+pm/Mj6dOdQtJwzRnarvLEIzgABkAnRBP+0GOXjNaK3c8IO5Cp3HieF22iEYEEBEC
+AAYFAkSpTzUACgkQ76FAO7GR3241agCffBE1UMbYPqkhUXRg2M8iETlZM+UAoNAE
+jt/HvE9oNh2BQkcwJ871L9ayiEYEEBECAAYFAkSphTMACgkQ0JWAx4q8rvW5VQCZ
+AayCz0NWuckoMuRpJtxpHPGE3VgAoJKelEP2zw3LCZYk06xWV8li9Io8iEYEEBEC
+AAYFAkWvaVoACgkQ/chXwiGox/4eXQCgg2+AZWjRt3bOm79dMwqloWlsm9sAn32e
+lA3P5Arws8PBOy40UnkWJTPGiEYEEBECAAYFAkW3jGQACgkQv9G0cvMd43fxaACf
+QNdmnNhsknAeBp/ilviWwNX/NC4An3SSfjTPppUaNgi3osEfB0ll7t/8iEYEEBEC
+AAYFAkW58c0ACgkQ/R0+cAphf/n5IgCglh4oT53bzZViDJm+nBq0f06MutAAn1LN
+MUR4qzozQwKuDkF0fqdTLxOTiEYEEBECAAYFAkfdgREACgkQn5C1IutVnNn+ewCe
+Oayp/xYkQdauTx9vgvbzctatPK8AnR6mOT6caqFzIbdsCKKcezdqR/RMiEYEEBEC
+AAYFAkgQrg8ACgkQNR8z5DU+Jby4PACdF5T+EY5+amYvLzw3s8ul+VM0+RAAniO7
+7EoD/E66w43cHWEu2B9FMqD5iEYEEBECAAYFAkhqoVwACgkQGIPRDsWq365Q2gCf
+XI7fwR+fAX4S/D4TuSqfmElL9hMAoKFlLOYJsypi/HGvJbzZ581CmETuiEYEEBEC
+AAYFAkj2C+UACgkQ3WHvyO0YTCwnLwCfZOqnRQA1maH/F62xCE/8N9QXBG8An3iQ
+Lsz8Cja8s3j2La8PN2PLamZciEYEEBECAAYFAkj3KlMACgkQCwOubk4kUXyK8QCf
+dFaHZSpo1nLD0Oq4TjwdZnE94CoAn1F8mA5xXBG6RHlCAZp6ir/brfKAiEYEExEC
+AAYFAkgMq3EACgkQokEGqRcG/W4y/wCfcRpg7LiMrZaPn5nMPwxYxWKgr2IAnjBc
+hYWv6x0lDFbWPnjXpFL0ZATviEwEEBECAAwFAkMkebwFgwKirXgACgkQNVCqEWeC
+K8RC+wCbBtEs1cdyvn6aRR+pn1AHv5FrrfcAoJzwhQIbeFWDLgspLfOIhiC0ENwi
+iEwEEBECAAwFAkPfrHkFgwHnersACgkQEM4FWgT/N0fsJwCguHOu/4YxC6EIHv7C
+YI9dMy9rHPUAoLtJldMrcZohPyG+wTCJpr4ciZB4iEwEEBECAAwFAkPfwqEFgwHn
+ZJMACgkQPa/pZIffRbKscgCeKz0LjyCaOPsQTaubNggIpkNoDRMAnjw/AtQ2aKML
+ymYOn8VBRgUCwsUwiEwEEBECAAwFAkPfw60FgwHnY4cACgkQjo1X2NDMLek63wCd
+H4T/eR+u4qUyd2a78CAiZspAza4AoIXQnRzaoAa6Z98IrhKvY6XjjTgtiEwEEBEC
+AAwFAkPg9coFgwHmMWoACgkQdnb4FgU2uG2xtgCgl4XGTZDT1RgsAn7oTDNZACv0
+Q+YAnRElplYKNGmw7irKQ1xn6B60E0SoiEwEEBECAAwFAkPiiX0FgwHknbcACgkQ
+pcp0u6Ymje1GPACeM6R9NQQFOZT/Lj8savLyfDffzhEAn1SHsMU5ercERISqu7Qi
+puEvZQrhiEwEEBECAAwFAkSqOvUFgwEc7D8ACgkQ301HxjRkUtgQ9gCgkGsKhdeG
+ydUR/mLuXmyHm8+Qx8MAoLUjYfdRNG9qC0otLonq+uBbkM4GiEwEExECAAwFAkPf
+6jAFgwHnPQQACgkQXnSSbBBQopzUeQCdF+nq9bHOZf8cBpvIePdkwnCuq6IAnAoM
+CksTPYy5XVt0wQEasiePCR4xiEwEExECAAwFAkPf7qAFgwHnOJQACgkQ2nLYpisZ
+LHUEDACfWZp7LVsFCwz/ekYTCb+P9PfhJcoAn3KONH045VV5LIbCMsovgItgPSbJ
+iF4EExECAB4CGwMGCwkIBwMCAxUCAwMWAgECHgECF4AFAkWilJwACgkQ5dMCc/Wd
+JfAWgACcCdyVpara7T6MaHgMvO2dtJ4oBeQAnjyOcJxCe8Sqb+1BL7YmiaBsAuey
+iGQEExECACQFAkLkqsACGwMFCQPCZwAGCwkIBwMCAxUCAwMWAgECHgECF4AACgkQ
+5dMCc/WdJfA1ZwCfYyFrJlg4eomxjUy5R6239tqLf6MAn3PTgXWwJHGSNOj4hlwy
+S0c2TkBBiQEcBBABAgAGBQJFt3/9AAoJEAt4MvNz1i1BDWUH/1gZ0yzTn0BNrAi+
+zUcLYhmBMk/444sSDCcOCV7EpGT2HM+gc32qq5Mv42PMCmr5us35MR4dhZf4AV1w
+u4VOwXfCqZoerSnyj25lnrr6BkjeN6n3hhMDPkTkUe9UHvmqZbRdq33gAo1jeYlu
++a9lmlhWIvk7MsBA6hRzkjtYal1NzGugto30XRg+ImJFiVCvi6URJ0smnR6xSFZt
+Bysh+w5hR1z9jHALaQuuwS9rbleHVZ5JSWCiBezzllndSF5Mu/YwN9Z6WCcDm3bG
+U4TwxmzOYxZ85ynKlOP7nWQy8Kua7TsDGRBX0R0LNAfAtebP1KPrKHd6vAxrujFb
+FdOt6G+JASIEEwECAAwFAkPf658FgwHnO5UACgkQjj4ZeCrcMLVKSwf7BEaJXl6w
+Zxt/v9m8Zhjn+SPH34d5W+h5IflOqqs/MbTlhsrmYEtglfZ4sLm1wdKlcsfpVeg7
+0/9niISDGxn62KluZJjfMzjGQpBMoPYyB8ms7r/hGg4U5F/7alsJ89gv6bT9d5WM
+XUn7ZKPgRorv7kfYYHEACGf5TnuEqjVYKMDC6p78LiS2cFpsAS/YxQ6jOzqFKYf1
+rxeMEx0FzRreWB9kQBJxGM7DtqBWDjLW3UNHSWIvHg4JHMpB4mKnp0Q+B79yUAdt
+6l6F7op4W9W+g4/vc0ngCcyDT2xAJ1emkGY2vNvWCipTesFZO/JFVcmUh2fXEIrw
+5XTyIwB2+cb5K4kCHAQQAQIABgUCQ9+0ZwAKCRC5SfsfFO9LRCenEACP8kIqNUNA
+xnocs+OsnXpkLdV9u5OKjhwDRtuGT8mpzxvjFK+/zhNFsYgKEvOUQiMqYR74nqgP
+fFbHuAzLMdOkPq9Zz3coO8vQr25vHMDgSf6pxvQQsPN47HQLF8ekFEC9NrNAvw4E
+DlcYoOgBQUYxnVe8MhYQDqsYl6UZnSexTC6hXsYuV+ccU/Y0RfLRF6r+QGZ3CxEz
+00cFLxNEO1ipYd0og1Z3OLWfsjNiejZEjODghLX4ooeudITltlqYWqfK+KcjWaPS
+dH3HJm4RjejJOZ/Oye/ej0sTA6Xkk9r2694q6ZxcNQh+MWFPnqbalhWQib2Hz9l0
+nOVAPi5eBvNN0eJRS4jj2ofv4bZhTvXwJxhPx2DHZEVH/vkGq2c0ZOaX7F1bXZb5
+lSFwnfQvi0kGcpPyuHkxx6WZzcjqtlCs2xR0+5XUp32bdBPDI6VH54mWjTVahC6M
+aEmk961hh0jLqVjtjX/3vQ4OWnZdtkD3E6GjV8bkPb+yYjoIjQxKh9/BJvEPrjbb
+iirGxGd60FtKFmHvxKivPDnLACmRDzZN2SaEu2nb4nA9KlFaM0/aqfpz+CDKT+yj
+OoA1b06wNnbHlFQ9uYl1eKExjVVkcZTu6glgt0KnkaBisAW1N4JlVVSh8e64UJQb
+b7kMg7KmjnhZLuvM0vPNaKC3511jzVBEqokCHAQTAQIABgUCRKmaGQAKCRCRXFcJ
+aQXEjf8AD/9p4UUHSZbGOLsKpxR6o3iTll8jymWrv1CjJRrf9qRFviNUyMkYHsY8
+S1ZHpIJMzGPncR1//MAUM1AfUDYtsMcjyD5Ey4asUNuRJmO/JwHvFGanvKimvKMf
+DarvKakkdCV/ZkPmViSMXkdIZPMJh3klexcAxQ5ZWHVmIQ9N25f7lIOv+QVWXqri
+a6AjMlv/jGklp8cQu+Akq3lDgMS8FaofN7AEqqpq2+BiMehAxVuhgKz1vVkjJDWP
+MC9YJtNmFm7NmeiBghh7lDASEtu/MfDQamCuxXCgnwY2v0XSnicj8PKt5F5CGPZH
+tHunkwZGs0EGfStQjkU8ETLg6WNErDqouQrMDA+fsxJQreneEoppfrmj5z0119ko
+QEwwNvOnDWZc2Rg+PkXy/mDOkGIQR2H0wfuDtEhs82svtRUe9cZ5AV1YiK+bfjUh
+/nX4I+eYuPZpBQP6VaXIdo6abTX4539lRVTiegmKaYTO/oJ0cqIxQ4xz55BY/+t7
+WsmR8nUW58txML5+WROt0gpVd3ioxZRgC8E7jd9uy6OSMrm2gGechjZPcaLd5pPI
+z2ts1tkmhl7KFXqG113xIWiDF7LraqhC9sSSWhcugio01vEwZaK0KhsBHHfpRFDQ
+uE3KCbafZnsLKczYNn4Br1GBnrL2Vhl7WUwgGa/VtV5cd7KhV1Uy2IkCHAQTAQIA
+BgUCRQF29QAKCRDc6/VdtCKXPE3HD/95Y+d9tYr7af2AOBbJ2938/K8XN6WF4SPO
+N4EgErogzie2/67p5t3hwiEOKYI/if1GhHASZAuBC3xA7INmB2D0Bzf/fRFdr4Gf
+DSxWcXqV6RQ6ZjwiBY5Ii6cwL7Kd4CyuAB3M3eU9nB2sNy7fBwFcVno1Pj/wFWys
+T1P4rp2US7Xv6y5eJtafqbt2ANu3Xn6iEeQPPYcFCeLLcRs9K5OFLv/yo950dd4o
+OsbRuY7RjktakGLHgbw5mD7eSP1yJstVYxQaQeakTI9Ub7QN4AeKq6XY5JHTopmo
+sIR/EqVfcoKDj4TlZtpdHGCpCSoTFbcfZmVTilPYFDW4PBpEGHfE/rWLI7ubIudo
+c0XsUzQlhHVDr0yetev3R5+8IS8MDvae52mz9Subw409BazTs/QD2rzq5QYEjnaU
+QS1cQjgneCFnGAC5ekMtTtOzev+FlcHg/jVcYRKSTSC6h6YYcJ7NLxmFV+SKae8w
+8TdHKAZthkPqkIPCOk7pFVTi5k60DfyqfzuKdQtegR/fJxkYApUR++CP2vR7lL3i
+6NDITogls7nLsDmjDrT3X62AAgWEzynHNGx+Q0YJwMt4VvMQyjO3SUf9NKHpcXWt
+sjpZkPcE7YivTkuoPfLjYGne2BwoF/Afai5jbMULLpt6mUcvXggP/E23CPGFxZVK
++q5v9kky/rREU3RlZmFuIFNwZXJsaW5nIChFbGVnbyBTb2Z0d2FyZSBTb2x1dGlv
+bnMgR21iSCkgPHN0c3BAZWxlZ29zb2Z0LmNvbT6IRgQQEQIABgUCQ9+tSQAKCRDM
+wtcNPw+twBUjAJ91uI+jSSD8xyDOnk5vjf+N6BnHdQCeJkIhr/G/vxVajxRnn2N2
+6lkCCeaIRgQQEQIABgUCQ9+9hQAKCRBMUzYRwfqC8jkwAJ47ZL/Xrz1wBD2tgeR2
+F4mW1hJuIgCfdYJlo8KOBXVqGo3wcsP1/5BlYU2IRgQQEQIABgUCQ9/QjQAKCRCa
+Pro/9h9z+G7qAJ4+MHC2laYw+UN3fCi3Ccxw4pWtQgCfebGDAfQagRS4w+FOqeal
+ykLKoxuIRgQQEQIABgUCQ9/5swAKCRAucwz1/xoJeRvPAJ9I6n8ELGbfF1F5nqwy
+1n3pCCVwtwCdESW0kmQRCqhZ0oUPshBeEXfzE5uIRgQQEQIABgUCQ+CX6wAKCRDi
+a2qTRYe2nWb/AJ0VTFSFxvsLg/SoG3hd0rpMJx31fACeNWjRLvxYtq6O/tP6UUaj
+Y6sU2iiIRgQQEQIABgUCQ+f8GQAKCRA2wybwNHgFJ66aAKCmGkkr+cFocuozdkwx
+mBTTbYmmPwCdEo5bCD+xOKa9dHpYYWf7Q3bd3S2IRgQQEQIABgUCRKlPNQAKCRDv
+oUA7sZHfbmdgAKCFkjnOM4Q18D77Twu7+5Lw4D6EkQCfRPGrkIEBx5hf6o+ILcgr
+2T7CiiWIRgQQEQIABgUCRKmFMwAKCRDQlYDHiryu9RKJAJ9gmNPxaM2pbmzkog4I
+reegX8ldlwCeJM+gK6yGpBctoYBURA5YnQmh7vuIRgQQEQIABgUCRa9pWgAKCRD9
+yFfCIajH/nTZAJ9bpwSCG+h0Ev8tbu2ltPDOfoCTWACcCsgM+til3R06HIbOkd55
+AuDY9CmIRgQQEQIABgUCRbeMZAAKCRC/0bRy8x3jdwmAAJ99ic72hie8e9jXwgmg
+0jLtxk3cbwCfXcDWm/FmM9iVydZkw4ncJ9HYxtGIRgQQEQIABgUCRbnxzQAKCRD9
+HT5wCmF/+dvpAKCaqz/Ml7iHCFJJwVatfK02qMOD0ACfVFNMgHxBHfOmd0SkgYij
+Ia8SLXWISQQwEQIACQUCRhS9xwIdAAAKCRDl0wJz9Z0l8PP3AJwNNnjEK5PsyCos
+oG+0jRt1TMjBAwCdGR0FXfl8rKhTK5cPA1IG7ft9jwmITAQQEQIADAUCQ9+seQWD
+Aed6uwAKCRAQzgVaBP83RxLkAJ93d5W5M736S+OxgKU+ECPaTbwMwQCghEKKoB83
+TEsgIjRH2YTrC26uWZGITAQQEQIADAUCQ9/CoQWDAedkkwAKCRA9r+lkh99Fssck
+AKDVcgKLwMr47aTZwXtqA3KqMxcEIgCeM/EyJeuwi2TaNOiX0LcK3LiHTH2ITAQQ
+EQIADAUCQ9/DrQWDAedjhwAKCRCOjVfY0Mwt6TIUAKDemP5yZu9p8isT6zlDPFjT
+b3SjNQCgp4oVd5x9Fyn0MfhN71Edg94Jv/mITAQQEQIADAUCQ+D1ygWDAeYxagAK
+CRB2dvgWBTa4bT4TAJ418Zgd1HdjUciN+Yocm92O4uxDLACgjruZ+hpvILjbahIn
+UXFDvMs/zP2ITAQQEQIADAUCQ+KJfQWDAeSdtwAKCRClynS7piaN7Qv0AJ9Kl7WL
+6U40Hp4jKeB8lhjuL+TelgCeM91zIfR09WjR70N2IpdPEsoV7dqITAQQEQIADAUC
+RKo69QWDARzsPwAKCRDfTUfGNGRS2JkgAJ0aoHDrPu1aLXfV5EXH2UVvIkHOLQCe
+OSj/x5FEl71tqEqMQo1AyOetOKOITAQTEQIADAUCQ9/qMAWDAec9BAAKCRBedJJs
+EFCinBQtAJ4xeIly6Rgpxua3P5T7TUiKTSyJtQCgg+ghiIfqroo3wW7mwTmcwSTU
+caCITAQTEQIADAUCQ9/uoAWDAec4lAAKCRDactimKxksdQYSAJ9xAavh1kufVEgt
+1HCnnSpgjxoFVACfeERqA9I6RnCmHUT6oIMPTPiEaEOIXgQTEQIAHgIbAwYLCQgH
+AwIDFQIDAxYCAQIeAQIXgAUCRaKUnAAKCRDl0wJz9Z0l8OtvAJ9n8wh0vzpy2Fe7
+2s52rKQalcY2JwCcD0YW4n1XOmkmNCmTLOz9jbV25aWIZAQTEQIAJAUCQuSq/QIb
+AwUJA8JnAAYLCQgHAwIDFQIDAxYCAQIeAQIXgAAKCRDl0wJz9Z0l8ExaAKDOaj/X
+mzGqPbf0QH5BSwq+dOlSngCgxkFUvYG1uc058dHagXGT5fnGIWGJARwEEAECAAYF
+AkW3f/0ACgkQC3gy83PWLUHD6gf9GG5WbBi2wmJiHtKAIuwj8Ko9QfTEllRXgxL6
+j1uRmwdfiUx+WPQLRBmTQIq2djc/zZtX3Khl+elj1UEBiEW3dDUESKqhQtGGAZ4+
+OixZ2PhltlPxnORH5NyLOluubF7rI/Qd/8oPGzFxChUUzrxhPjTA+HUuORc2CfQ3
+EcPDTV5VlzWnfqCTS1rpES23QAjLcbQPUcNbNAmg+Hsq3JLRitLIBF+M0+n7v+Ks
+7NKNqR42ycgVnvv4YTlsV/itQdWSo2fkSmeVVPopFa0aAJtEjIBBdviXPEZYi+2Y
+0RrVKRBakNCOxJ86Jpx9a8FYvtJj+L9jAhAHOovFoFKiMrartYkBIgQTAQIADAUC
+Q9/rnwWDAec7lQAKCRCOPhl4KtwwtWAHB/oCrRlnnC/CB3jCSd5E6fbpTYmHd1C1
+7eGrojPA/Q8UNsTG2S9xwpPagxj/YkXheK00JdG6j6zHYbhvlkFHnGXKWmEJOgHT
+t3QpZeOkuS6jncuK93sc0ON9kwRMztGAzqdGMz3HdnqKri+UjUawqxQgOzmNvG6T
+hSUYEHEInQqf35qGKtW4Cuqg4UOom2OG1RAdNavcrFszILlMr+qqFjqc+iB2t510
+sNEHVVIuZL4Et+5gwwznTJ4z9hEyU9Ha4+DXuTd5E4119nCDayLhE1l2uAUtFYCZ
+hqVNbgTtM2c/cdWYfSc1QiszC+g/Z9skFf+70SG1Jd32e4oYsWAOz96ZiQIcBBAB
+AgAGBQJD37RoAAoJELlJ+x8U70tECtUP/iDXZRHfYECyoUitwlZ5swkbrA+1KkGY
+litdRr8WjZbXQ0R8q8sOwjjmu+qoddzELXdMQjvYEYvmpkNq/2FeEsTwgAZW0jdN
+Fb35eCoeAXv/boY56onZKRb4ks/7KeF0oQtJgSxLT8DqNwCatHvEUq3uTrgxBo7q
+BZIre9p5nx+zF5mN5ma7X+b7ydd9I3r4kcSucHqSLEUpZlBt5z29j6NaGRDoCGH6
+S1lJhqO1gBNYvm9fM4j8TbwKTGVzIcmNA4DSSII9U1KI83Sz3DNvaXKlncNHWw5y
+L+uvaf/qiuwp5t7IluZzOdMrVlOsJJDSHS2PWy7ScnzsQBETR9Tds9YtNbkFtXZO
+k5vQuXv59GBFsgHns7OK1M7TQ9senAZaDbVP3opI2BmASf1PmWkcCcBFlc+PH2vV
+cIBth9+8m+wEZipIKDXWfnTGfV3rP7xMp4Gqs2v873ml5ZtlAxgq/4U8TAuVGHmE
+IQIBq4lyoFbzBiQWFTW5oR6PQIYTXspGp2fNy48NkezS1wKogf2/iNvHb6v+NNoo
+WA75zllvry/RPePSijnuV/qbu/1XOiEUbH8k1OJs4epT6VhCJVH2HAIVx7jBln2Q
+FFgy4bjA2QDRx9TMR+9zcn2I2DqyV3bg4E7k+m+EfWiBgEfC29HWlmWwPMe05RmP
+IlnwK8TKzZMdiQIcBBMBAgAGBQJEqZoZAAoJEJFcVwlpBcSNCbsP/2uCoT1gF9j3
+Zgz7zICuXy0EcX0VW3U0b4McOGMRzxHJHZYxYZOQpH31ASdEgDtivaMFZHSXWYLN
+awwEKS+huxgNaEoYcxMoc24ttvmn+V/KnHit3pKbMIXdtPJoh2OHkrA0qCJYqWgR
+knNAK9KBUsa41SvFE4e/uKNOH47FCweFzJqEPLoMpkMaNbWC2ruIoB6eiwKqTouo
+qIqx6gLYm7gQFisWJqs0Hm+MDIh9vO8tjgixpmOm15kb18rs8yHZ9wgcuRVj+tI+
+avyNfY+36ZlFCT8Mr6p7LUmJxLOIt+ze49ZVzUOFgSVB1jhhiVc+TtyIuXsO7V0t
+wRI0ULdVnhQidbKYMQYRzMib5Dszr9yVA5AGCJev7w9IjSqrWT3g2TB3ioBtVsDK
+fsPdMPkynZREqTDg6veKBuXlizWvsrVIS0O2SIREEnfcDVfSVXUu4+YC6pdtLd3p
+YKxrJOGrdDI7PcFCaYKwdgpk5z9Zy83nttJUCpyxvIEAoTwjiOu1e69zN2pS7dHO
+AuVesXy5S3MUZWbEksLVMxvXRxj+w4uUbjk4DsIO18yPrwoAZWOKu1/BQ9JrjAHM
+/qmF2Z34uN78dMhUbslj+WTIzHRon+fCYZ+Jl0ZPFcarHF0QRtYRBzW1aYBrJjRq
+yD+g2hAUo+5KNx8cQ04kX9DGHzdF3kGEiQIcBBMBAgAGBQJFAXb2AAoJENzr9V20
+Ipc86oQP/1yB4w653EyDLchyrdRS9ZVDuhW2dZ1e4vWcQNHMO+w/An8SbfDgl9mf
+Jg7+NiHjt3HXMR0n14fOwlEFsC4fQ6tYOcvvPZIg1Xk5GEZCgCZQ2G4xFGMy4xhh
+RZgjIJ4B3dujk9XjMQK+vPn1WFFUu21y80hJPyJKdSRzsUHy3abT7jg36RL6rnES
+zjCW159C0sa6cJ5zXq3FdLYftBO0fL/yle/p0uQHOH3BFklEEcbiBEt4Y68PiCh7
+5jYAa9nEA6Cd20qrv0Fljcy2h+Q9uRst2g8wbnEw9RQvd94xeE0mhTDKuhLYOzDM
+6WmGYsVKLhSPTkjumrcPHYgnWnjgLwsW2SfdZUcVEMfEWpJTGHNPm8W9MMVucSna
+aanph4nc83k1fBKONuKgvu7v3Vgr0RD2YVxPXJiwEIwM65UkU8hPxr0MUOt47h2q
+s9kEcOBL4zeBI/HfZ+eigx0jV1OwhTYqMOf8s+F2xcCRZcqUElKkKC8IgR4BOD0a
+/FfaDpqQd/0xWKcr6eQjKyGapdctr+TVaQ6x3T69eM489to8d5BHgYXalxC7ciev
+hlxsg+ftXDkh7Kd3NHWbeUqFI/uo22iLi0DHn6xuaa4ofLRzRtgrthrxHdWGex7x
+sjrSfqEOT1npqLduL7NJmvaLy85KSQCfTpMh1nMvQPtTNFuvTXrmuQENBEIEwDQQ
+BACXm0m0J9+VWqt2ClmDBq2FT4WR0CaQPZdSfI9kSFdCtfiNziyNzKX9Kn2XGrGu
+ehgZ8Ifs4W266rBzgMHabLMj+4kxLVqpIa5u7w7vwTzckyvpuC4sBCt2tRsWxiFR
+tnv9TgZxKyB9eglo4VoPH4aAMGZiUimnVk9R7CmUAAmwiwADBQP+MYv6akqIsrf3
+7+z9nXp4/IGHq/RL9oKcM56QLOhQR+9dZ7Rdjpx94WEgdY1acxSCZDm7Go1qjfQi
+OnOq6zlZwmPN+H4IukZjW+ngTK3RRhljzgFHApDlUsQuXFGn3LOELGq2f2bScijO
+UUIBVBWOXBYFO1dGfTgGRo3OWjonOEKISQQYEQIACQIbDAUCRaz/YQAKCRDl0wJz
+9Z0l8CwvAJwNo2BQeDxU1rB8NTskmr5c+ho3uACdFLmvizMb+rhjJkam9F4RJQG4
+bfI=
+=w743
+-----END PGP PUBLIC KEY BLOCK-----



From erikos at fedoraproject.org  Fri Jan 30 12:41:24 2009
From: erikos at fedoraproject.org (Simon Schampijer)
Date: Fri, 30 Jan 2009 12:41:24 +0000 (UTC)
Subject: rpms/sugar-toolkit/devel .cvsignore, 1.21, 1.22 sources, 1.25,
	1.26 sugar-toolkit.spec, 1.34, 1.35
Message-ID: <20090130124124.4DED870117@cvs1.fedora.phx.redhat.com>

Author: erikos

Update of /cvs/pkgs/rpms/sugar-toolkit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8852

Modified Files:
	.cvsignore sources sugar-toolkit.spec 
Log Message:
* Fri Jan 30 2009 Simon Schampijer <simon at schampijer.de> - 0.83.4-2.20090130git073336585d
- Translation updates
- Naming alert prevents activity close on keep error #224




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-toolkit/devel/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- .cvsignore	20 Jan 2009 15:29:19 -0000	1.21
+++ .cvsignore	30 Jan 2009 12:40:53 -0000	1.22
@@ -1 +1 @@
-sugar-toolkit-0.83.4.tar.bz2
+sugar-toolkit-0.83.4-git073336585d.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-toolkit/devel/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- sources	20 Jan 2009 15:29:20 -0000	1.25
+++ sources	30 Jan 2009 12:40:53 -0000	1.26
@@ -1 +1 @@
-f7390f7e0acac6b645ceab523565ec95  sugar-toolkit-0.83.4.tar.bz2
+63564c5d7d5588bfe5ec4b78fe8ade0b  sugar-toolkit-0.83.4-git073336585d.tar.bz2


Index: sugar-toolkit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-toolkit/devel/sugar-toolkit.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- sugar-toolkit.spec	20 Jan 2009 15:29:20 -0000	1.34
+++ sugar-toolkit.spec	30 Jan 2009 12:40:54 -0000	1.35
@@ -1,11 +1,19 @@
 %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")
 
+%define commitid 073336585d
+%define alphatag 20090130git%{commitid}
+
 Summary: Sugar toolkit
 Name: sugar-toolkit
 Version: 0.83.4
-Release: 1%{?dist}
-URL: http://sugarlabs.org
-Source0: http://download.sugarlabs.org/sources/sucrose/glucose/%{name}/%{name}-%{version}.tar.bz2
+#Release: 1%{?dist}
+Release: 2.%{alphatag}%{?dist}
+URL: http://wiki.laptop.org/go/Sugar
+# git clone git://dev.laptop.org/sugar
+# cd sugar
+# git-checkout %{commitid}
+Source0: %{name}-%{version}-git%{commitid}.tar.bz2
+#Source0: http://download.sugarlabs.org/sources/sucrose/glucose/%{name}/%{name}-%{version}.tar.bz2
 Source1: macros.sugar
 License: LGPLv2
 Group: System Environment/Libraries
@@ -61,6 +69,10 @@
 %{_sysconfdir}/rpm/macros.sugar
 
 %changelog
+* Fri Jan 30 2009 Simon Schampijer <simon at schampijer.de> - 0.83.4-2.20090130git073336585d
+- Translation updates
+- Naming alert prevents activity close on keep error #224
+
 * Tue Jan 20 2009 Marco Pesenti Gritti <mpg at redhat.com> - 0.83.4-1
 - separate debug settings from xsession #163
 - show an alert on activity close for suggesting the user to set properties of the entry #215



From jwrdegoede at fedoraproject.org  Fri Jan 30 12:43:42 2009
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Fri, 30 Jan 2009 12:43:42 +0000 (UTC)
Subject: rpms/libsamplerate/devel .cvsignore, 1.5, 1.6 libsamplerate.spec,
	1.17, 1.18 sources, 1.5, 1.6
Message-ID: <20090130124342.BDF6770117@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/libsamplerate/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9534

Modified Files:
	.cvsignore libsamplerate.spec sources 
Log Message:
* Tue Jan 27 2009 Hans de Goede <hdegoede at redhat.com> 0.1.6-1
- New upstream release 0.1.6



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libsamplerate/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	15 Jul 2008 21:28:10 -0000	1.5
+++ .cvsignore	30 Jan 2009 12:43:12 -0000	1.6
@@ -1 +1 @@
-libsamplerate-0.1.4.tar.gz
+libsamplerate-0.1.6.tar.gz


Index: libsamplerate.spec
===================================================================
RCS file: /cvs/extras/rpms/libsamplerate/devel/libsamplerate.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- libsamplerate.spec	15 Jul 2008 21:28:10 -0000	1.17
+++ libsamplerate.spec	30 Jan 2009 12:43:12 -0000	1.18
@@ -1,6 +1,6 @@
 Summary:	Sample rate conversion library for audio data
 Name:		libsamplerate
-Version:	0.1.4
+Version:	0.1.6
 Release:	1%{?dist}
 License:	GPLv2+
 Group:		System Environment/Libraries
@@ -68,7 +68,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING ChangeLog NEWS README _doc/*
+%doc AUTHORS COPYING README _doc/*
 %{_bindir}/sndfile-resample
 %{_libdir}/%{name}.so.*
 
@@ -80,6 +80,9 @@
 
 
 %changelog
+* Tue Jan 27 2009 Hans de Goede <hdegoede at redhat.com> 0.1.6-1
+- New upstream release 0.1.6
+
 * Tue Jul 15 2008 Lubomir Rintel <lkundrak at v3.sk> 0.1.4-1
 - New upstream release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libsamplerate/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	15 Jul 2008 21:28:10 -0000	1.5
+++ sources	30 Jan 2009 12:43:12 -0000	1.6
@@ -1 +1 @@
-f6fafd5d4971a2442352c72bc3598cbd  libsamplerate-0.1.4.tar.gz
+4ccc22b21f469aac672dda8eb1320ea4  libsamplerate-0.1.6.tar.gz



From pkgdb at fedoraproject.org  Fri Jan 30 12:44:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 12:44:54 +0000
Subject: [pkgdb] ruby ownership updated
Message-ID: <20090130124455.0DBE8208493@bastion.fedora.phx.redhat.com>

Package ruby in Fedora devel is now owned by kanarip

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ruby



From pkgdb at fedoraproject.org  Fri Jan 30 12:45:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 12:45:01 +0000
Subject: [pkgdb] ruby had acl change status
Message-ID: <20090130124501.9290A208496@bastion.fedora.phx.redhat.com>

kanarip has set the watchbugzilla acl on ruby (Fedora devel) to Approved for tagoh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ruby



From pkgdb at fedoraproject.org  Fri Jan 30 12:45:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 12:45:05 +0000
Subject: [pkgdb] ruby had acl change status
Message-ID: <20090130124505.A6709208497@bastion.fedora.phx.redhat.com>

kanarip has set the watchcommits acl on ruby (Fedora devel) to Approved for tagoh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ruby



From pkgdb at fedoraproject.org  Fri Jan 30 12:45:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 12:45:07 +0000
Subject: [pkgdb] ruby had acl change status
Message-ID: <20090130124507.C4BA72084B7@bastion.fedora.phx.redhat.com>

kanarip has set the commit acl on ruby (Fedora devel) to Approved for tagoh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ruby



From pkgdb at fedoraproject.org  Fri Jan 30 12:45:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 12:45:19 +0000
Subject: [pkgdb] ruby ownership updated
Message-ID: <20090130124519.54FDC208486@bastion.fedora.phx.redhat.com>

Package ruby in Fedora 10 is now owned by kanarip

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ruby



From pkgdb at fedoraproject.org  Fri Jan 30 12:45:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 12:45:21 +0000
Subject: [pkgdb] ruby ownership updated
Message-ID: <20090130124521.A54C4208494@bastion.fedora.phx.redhat.com>

Package ruby in Fedora 9 is now owned by kanarip

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ruby



From pkgdb at fedoraproject.org  Fri Jan 30 12:45:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 12:45:22 +0000
Subject: [pkgdb] ruby had acl change status
Message-ID: <20090130124522.D451720860A@bastion.fedora.phx.redhat.com>

kanarip has set the approveacls acl on ruby (Fedora devel) to Approved for tagoh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ruby



From pkgdb at fedoraproject.org  Fri Jan 30 12:45:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 12:45:26 +0000
Subject: [pkgdb] ruby had acl change status
Message-ID: <20090130124527.6E058208496@bastion.fedora.phx.redhat.com>

kanarip has set the commit acl on ruby (Fedora 10) to Approved for tagoh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ruby



From pkgdb at fedoraproject.org  Fri Jan 30 12:45:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 12:45:27 +0000
Subject: [pkgdb] ruby had acl change status
Message-ID: <20090130124527.AF1B620860C@bastion.fedora.phx.redhat.com>

kanarip has set the watchbugzilla acl on ruby (Fedora 10) to Approved for tagoh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ruby



From pkgdb at fedoraproject.org  Fri Jan 30 12:45:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 12:45:30 +0000
Subject: [pkgdb] ruby had acl change status
Message-ID: <20090130124530.AE03320860F@bastion.fedora.phx.redhat.com>

kanarip has set the approveacls acl on ruby (Fedora 10) to Approved for tagoh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ruby



From pkgdb at fedoraproject.org  Fri Jan 30 12:45:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 12:45:34 +0000
Subject: [pkgdb] ruby had acl change status
Message-ID: <20090130124534.5FDDC208678@bastion.fedora.phx.redhat.com>

kanarip has set the commit acl on ruby (Fedora 9) to Approved for tagoh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ruby



From pkgdb at fedoraproject.org  Fri Jan 30 12:45:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 12:45:34 +0000
Subject: [pkgdb] ruby had acl change status
Message-ID: <20090130124534.AE87C2086F7@bastion.fedora.phx.redhat.com>

kanarip has set the watchbugzilla acl on ruby (Fedora 9) to Approved for tagoh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ruby



From pkgdb at fedoraproject.org  Fri Jan 30 12:45:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 12:45:37 +0000
Subject: [pkgdb] ruby had acl change status
Message-ID: <20090130124537.A88D1208484@bastion.fedora.phx.redhat.com>

kanarip has set the approveacls acl on ruby (Fedora 9) to Approved for tagoh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ruby



From jorton at fedoraproject.org  Fri Jan 30 12:45:41 2009
From: jorton at fedoraproject.org (Joe Orton)
Date: Fri, 30 Jan 2009 12:45:41 +0000 (UTC)
Subject: rpms/subversion/devel .cvsignore, 1.27, 1.28 sources, 1.34,
	1.35 subversion.spec, 1.128, 1.129 upstream, 1.20,
	1.21 upstream-key.gpg, 1.9, 1.10
Message-ID: <20090130124541.A084C70117@cvs1.fedora.phx.redhat.com>

Author: jorton

Update of /cvs/extras/rpms/subversion/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10005

Modified Files:
	.cvsignore sources subversion.spec upstream upstream-key.gpg 
Log Message:
* Fri Jan 30 2009 Joe Orton <jorton at redhat.com> 1.5.5-5
- update to 1.5.5



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/subversion/devel/.cvsignore,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- .cvsignore	27 Oct 2008 09:15:01 -0000	1.27
+++ .cvsignore	30 Jan 2009 12:45:10 -0000	1.28
@@ -1 +1,2 @@
 subversion-1.5.4.tar.gz
+subversion-1.5.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/subversion/devel/sources,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- sources	27 Oct 2008 09:15:01 -0000	1.34
+++ sources	30 Jan 2009 12:45:11 -0000	1.35
@@ -1 +1,2 @@
 8ec0a6e756c35dc3ce20abb580040924  subversion-1.5.4.tar.gz
+532c7d49b3cd33d712289a5ef03b7749  subversion-1.5.5.tar.gz


Index: subversion.spec
===================================================================
RCS file: /cvs/extras/rpms/subversion/devel/subversion.spec,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -r1.128 -r1.129
--- subversion.spec	29 Nov 2008 17:21:14 -0000	1.128
+++ subversion.spec	30 Jan 2009 12:45:11 -0000	1.129
@@ -14,8 +14,8 @@
 
 Summary: Modern Version Control System designed to replace CVS
 Name: subversion
-Version: 1.5.4
-Release: 4
+Version: 1.5.5
+Release: 5
 License: ASL 1.1
 Group: Development/Tools
 URL: http://subversion.tigris.org/
@@ -29,7 +29,7 @@
 Patch7: subversion-1.1.3-java.patch
 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: apr-devel >= 1.3.0, apr-util-devel >= 1.3.0
 BuildRequires: neon-devel >= 0:0.24.7-1, cyrus-sasl-devel
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Provides: svn = %{version}-%{release}
@@ -275,6 +275,9 @@
 %endif
 
 %changelog
+* Fri Jan 30 2009 Joe Orton <jorton at redhat.com> 1.5.5-5
+- update to 1.5.5
+
 * Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 1.5.4-4
 - Rebuild for Python 2.6
 


Index: upstream
===================================================================
RCS file: /cvs/extras/rpms/subversion/devel/upstream,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- upstream	27 Oct 2008 09:15:01 -0000	1.20
+++ upstream	30 Jan 2009 12:45:11 -0000	1.21
@@ -1 +1 @@
-subversion-1.5.4.tar.gz
+subversion-1.5.5.tar.gz


Index: upstream-key.gpg
===================================================================
RCS file: /cvs/extras/rpms/subversion/devel/upstream-key.gpg,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- upstream-key.gpg	12 Sep 2008 16:10:42 -0000	1.9
+++ upstream-key.gpg	30 Jan 2009 12:45:11 -0000	1.10
@@ -1,410 +1,927 @@
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.4.5 (GNU/Linux)
-
-mQGiBEODitcRBADw8W4HxnoOLyNsHslxl/frkiXGEPSBFtuH8mtBCc66m5rvwhIC
-DtxI++5SCg+Sr9e5yICCwa1nUhgKNdwrrJLJzFxvAHwpYH0JyiWkKFvFntrFS8oe
-WO82hSDrdEHd4e/yk13vwO9nINFBuOBgI/kzGcE6dMJMBv8Uf+Dh4RzvswCg9id9
-znomgOg/P7EogP6LQLTGOwsD/AlA8gST9YBXOeP4MpZYgk9g0Y81yXO73RiGY+5+
-IzRGFXhqEmGcyI8DHhNumq9VLfeyGrcRruPfvpzRDmQi3jZ8JXN5wsx5h6ikAn+I
-3THZOjnuC2l1PGl7iQC/tx05tD0hD9rx+09mE0rskvGrn0rEkQTCECt7mL10YYLq
-hEMxA/4pRUch5krXuAe6+o1q/sNwhG+0D+SZj9w9Ymg9b46m1rX7Vg3QgRMtuXeI
-9bzBr1AjNRT2D8AETCFgnPuGa90Vl8iUJsjBtxyEuEoeg+dCucWTqM/RZZ8Fw4u9
-hSfOlZCtec0QLjhcCv4jRF4RtZEPnNdv73UFZzLqlHhfeV05hbQtR2FycmV0dCBS
-b29uZXkgPHJvb25lZ0BlbGVjdHJpY2plbGx5ZmlzaC5uZXQ+iGAEExECACAFAkOD
-itcCGwMGCwkIBwMCBBUCCAMEFgIDAQIeAQIXgAAKCRDJHbjam8/OL90AAKDwB4xb
-2oRPvhJ1fyYw0n/kMz+v3ACfS80jjppirxYx+AwnJ/SJG2tIOUaIRgQQEQIABgUC
-Q5R5FAAKCRBn2bJJZ08F4CMVAJ4ysr5Ne2MnyWmHtzlwg8It5blBxgCfWTnxQRd2
-028TQg69YdQi5C5bhoCIRgQQEQIABgUCQ9mo1gAKCRD3iHX2QnIfADWXAJ9lUJrH
-U6FIMhEx80bKru1gXd4h9gCcCEaE74nKxhyp1Cp5hS67VvzfnLGIYwQTEQIAIwIb
-AwYLCQgHAwIEFQIIAwQWAgMBAh4BAheABQJD2auAAhkBAAoJEMkduNqbz84vlDoA
-oJCgwCm8CfFC+C+0WNi4LEc83zkzAKCRIQK2TX2bXedu5vP3MsOXYKzx9ohGBBAR
-AgAGBQJFLzPzAAoJEFuWgBDgT5qJppcAoIuscWgQtyPK2amMSiSIMEFLAzibAKCJ
-Co2C1za3Ja95QLw25zc7EBCjJ4hGBBARAgAGBQJFNCAaAAoJEF5FJs6Zkq386kEA
-ni5h83vLigsIMZLXBn6T3OSDa0E5AKDGNAsGUIAJ/3JCvj1SBjZfd+pw/YhGBBAR
-AgAGBQJFNDBiAAoJEJksQ/1feJipHTMAn0JXJ2HuqHej5tOA9lgXEIQ2pThwAJ92
-M2gEFPz4PiaCqrp4exPnK9ufo4hGBBARAgAGBQJFNeHFAAoJEKJBBqkXBv1uvS8A
-oKbkWTWRK28/JRo9E189SYF7nQ6uAKCmmqLq+j/8SU0HNQzNs8PiCHcZm4hGBBAR
-AgAGBQJFNkLUAAoJEFHxPu07guhwp4kAnRsi9Bih5lxxuy4JIhnVEceJYb3HAJ9D
-OHsdeI+KOck4XzTM0tncbzqLpohGBBMRAgAGBQJFNBFoAAoJEHi+hdlmnEq1kC4A
-oIwGwdZnWEkzIJCD3PNL26ouwcfvAJ0SpQVlI9CeUjBgOlVjuwK9GXPRL7QiR2Fy
-cmV0dCBSb29uZXkgPHJvb25lZ0BhcGFjaGUub3JnPoheBBMRAgAeBQJDj7jGAhsD
-BgsJCAcDAgMVAgMDFgIBAh4BAheAAAoJEMkduNqbz84vroMAn00APQI35sDGLsKT
-btfEEl268mFDAJ9xuuDlitAZXFkTTKltWcvQ6Do9GYhGBBARAgAGBQJDlHkTAAoJ
-EGfZsklnTwXgyHkAn3QXKw7GtwHzZLfihJW5fNWwISCXAKCcNb7jP6GLUqBs7VV5
-wPTLn6aAgIhGBBARAgAGBQJD2ajUAAoJEPeIdfZCch8Ah8UAnRkEdrxw+jW4EqVN
-J0vMthxDTjIeAKC9gDj0HPVKWIJ7x7/UoKSNhApv74hGBBARAgAGBQJFLzP4AAoJ
-EFuWgBDgT5qJ1ToAn21U9UFihIQ+q+u0+iItQ0hCdPyBAJ90cqD7XJygoaHGXPrf
-WSs5C39YCohGBBARAgAGBQJFNCAaAAoJEF5FJs6Zkq38fsIAnj12TcjkliTjtHW1
-H7odnVTUGOYOAKCFITIjg9K4pACkGUbIahfbtq7OqohGBBARAgAGBQJFNDBiAAoJ
-EJksQ/1feJip0soAnRBOFrb9ifEO0uF/MY/m9L+SQUioAJsGusGf8jj4jxaWlwfe
-uYtUIXyIEIhGBBARAgAGBQJFNeHHAAoJEKJBBqkXBv1uVRkAoJP+5LIl6hSlEkX5
-F5WJVuAZwKJtAKCej/aMSulD4hnWkkaXlg8O1xqUtYhGBBARAgAGBQJFNkLaAAoJ
-EFHxPu07guhw+JUAoPrT6XLbeb/pB3TAo56O72IiLlTkAKCoI+se7ZjivY1NE5KR
-xaJvO7PjQ4hGBBMRAgAGBQJFNBFoAAoJEHi+hdlmnEq1uxAAnjNLv+eYeWSU35aM
-+ROe4KYZ1nkEAJ0caoX0fvE+jz2YuhehiZvblYmyDrkCDQRDg4riEAgA+bDfW6jL
-TUiDSgSdUo1QcslFFngqy7gcLApfAJNkWLwOHvjxZJqBnJWvf9w0XZTM/LvLZlln
-FNSez6j9tYUWtIW+5lU9jEyyIx5gYbvIAEUMhfvqzJ2MXrvuQ2WtRr5rh5ENPSlg
-8JQ/DhBlPUcGV1B8pitrZfrQUOltcJsTHryBdlKtKyRswBqj7A516W2ZQEFcTL3c
-oNb31THGs7TbJj9/DElSAMSyS6bd2PDw7kpHB90mgqMQalqfHqIASVDK3wynyjiQ
-lvWkG34eS+/O4rAq/14uGEGJdQiR0v+wFap0sG13gVJ9gjQXDUXYfHtgGV1B1QKg
-80C6aV1s2PLT+wADBQgA8fyLjwRZ64SV+fTIRzViNbMo0rH1/5fUsP85iW9cxKKK
-rbSAvnSyZYhmhiHE8YlCyYwQv4X/A/O7+u8He+QcxsLc6QNj2X+gb12qPZym/R6o
-wRzzraVb6P+hw0aigpT5b2bP/4xz6hcZzsuB2QvXbMnXvIkHUpbFW3WoQt+/bnqS
-Ry4rNpLp8DNbvsrk4G69U6EDMjOWUnvHrQpEO1DIwB+rr2gZyB59CPczbORuHayd
-YRnHvC+gB3vkiIabIWBryIDndtWnfuk60QIC+JOq3M7BqiccWadwGnt/OTzFTyKp
-xdoIEjCPQxG+SDuXO9hQPyRaMtyS0EvPfVTkUQ2bhohJBBgRAgAJBQJDg4riAhsM
-AAoJEMkduNqbz84vHC4AnidfURCcVuIHVmnzRzaBW7TH4nNnAJ4mTOphUrkj5AXK
-YyjlFOT96ovp/JkBogQ0hHtTEQQA2X/Q3xMhUsL1FFopgBRTqgIYVmlv5CRMCZ6H
-Ms+b1geDVk/RvEtUh7WNbS958XRl9iRPCw72H6jCtNmJ5htuGlZOSFF1bn1BVFhA
-zubj/+UzndmjalITAygFvprtCOxOAqN5pxMj6mpyA9zwXa9w5BkZoEjlyBWgjps+
-M6i5pykAoP9V1p1ElcGU34Q91TjscWYKt1ZxBADIolKVHxoSclHNoNxgQSoVLj/e
-jOektqqcgL0S3ktAJui8kmDhke/mvylwdqbSsxtHdgytinsvjLc78VQl249jzhfD
-qnjEZHZGddaYrvCWOsZWanGylK0jLqbifreRXEdcVxXmg0lBO/2pkNueN8frsZu3
-A9/bKrgQGZJ6874pgwP+KRfTyJNNmOZlSkpQRo18O/ix6X4sS92PPTeAor7Z1Jgh
-L9VtgQRxdHHTk5gF7vTGZl3u2vEyBQN3fQW3j4wfYHyhGaSeLEyDIR8m9Kv4QRMr
-UJLKiqWKYUHad+d7nViPqJxtVAf4e0llP/KFOaRO+EhELQPnNX2uEy6dk8bS3O+0
-JU1hbGNvbG0gUm93ZSA8bWFsY29sbUBmYXJzaWRlLm9yZy51az6IRgQQEQIABgUC
-RTXhlwAKCRCiQQapFwb9bsrLAKDAysH1BX0tUVXQZTPG6H9F/CaqqgCgnz3wIb7G
-WL+R7bm2lbvRO/RlVI6IRgQQEQIABgUCRTZDAQAKCRBR8T7tO4LocLVQAKCB0JGq
-OCdGSmGeUWjug2KcuI4HKgCgoS/JiPVsNxWcVveZSRT8SxPUtgCIRgQTEQIABgUC
-RSOUwQAKCRBLdjqWJi212Z46AJ9sEQxyFaaa0zIN29lwB+rpOH56cwCfau3idRZI
-syJZT9sQ+58HStfFSbCITgQQEQIADgUCP8jcdAQLAwECAhkBAAoJEKH84lEz04AI
-zuEAoNvLO7JBY6KmI24gCxv8Hc9FBi3sAJ9eoaVT4bct3PDFQCfhikfU+E9tfYhg
-BBARAgAgAhkBAh4BAheABQJEqEFqBgsJCAcDAgQVAggDBBYCAwEACgkQofziUTPT
-gAgocwCeNML2Qy2jP1RP+uGO1SvDe2c6f2oAn3ZXrxIvTuQYvjEdCn/4ODiH42qw
-tCpNYWxjb2xtIFJvd2UgPG1hbGNvbG1AZmFyc2lkZS5kZW1vbi5jby51az6IRgQQ
-EQIABgUCNVGIXgAKCRDukGijSGzsPd9CAJ4zPEk4Qa6BUumWJDwgVPY9PuFn0ACb
-BZ7CpHe1Uk5JCIJHrUmdqcvDlmCIRgQQEQIABgUCQnfIswAKCRCO1APjsTkepVA3
-AKC611sl3+jxuhB4rY3Il/tUOZqc6wCfWHXs+Ev4BGm3lP7Xo+hYMCkhlKyISQQw
-EQIACQUCRKhBMwIdIAAKCRCh/OJRM9OACP6WAJ9OWDu+unh3RxiRE3o4Pkblf4JM
-zgCg0EIb1DFMXtd29xbZmjl9DGWtO8mISwQQEQIACwUCNIR7UwQLAwECAAoJEKH8
-4lEz04AI7mYAn1TBvKYQHxLHdhvk5VOyDPqCkpgKAKCZnsW8p+k0WLogVetB2LEl
-ZoqukYhdBBARAgAdBQJEqEDPBgsJCAcDAgQVAggDBBYCAwECHgECF4AACgkQofzi
-UTPTgAgSPQCggv5Tr3Hf6MaJwwlOFZ6y7bQ24f8AoMT1RcL+qv9wiDt2nsUIp5hn
-SqfitC1NYWxjb2xtIFJvd2UgPG1hbGNvbG0tc3ZuLWRldkBmYXJzaWRlLm9yZy51
-az6IRgQQEQIABgUCRTZDBgAKCRBR8T7tO4LocAkVAKDgrmFOLRH1sGPAK39H3lih
-SNZPnQCcDJkNw3cNlvbA8TCRL8+YlAvr226IRgQQEQIABgUCRTZ6HgAKCRCiQQap
-Fwb9bkMwAKC546YJOwwpmu6LWeb5BaU1TBkb0QCgjJzsiPsnVeBlY1+NbfXXCAbI
-eXWIRgQTEQIABgUCRSOUwQAKCRBLdjqWJi212aPkAJ405ldQVXBAWPoT6NBVl7M/
-GfbnHACghsNY/1u12ksB/zZxtlKCDb95nQ6IYAQTEQIAIAUCRNZU7AIbIwYLCQgH
-AwIEFQIIAwQWAgMBAh4BAheAAAoJEKH84lEz04AILOcAoJs/4c/2QkMhRPY4qdlT
-AFtLmvAhAJoD6IbGSIPo7ZzIJtP1UHvMaL9p9bkCDQQ0hHtTEAgA9kJXtwh/CBdy
-orrWqULzBej5UxE5T7bxbrlLOCDaAadWoxTpj0BV89AHxstDqZSt90xkhkn4DIO9
-ZekX1KHTUPj1WV/cdlJPPT2N286Z4VeSWc39uK50T8X8dryDxUcwYc58yWb/Ffm7
-/ZFexwGq01uejaClcjrUGvC/RgBYK+X0iP1YTknbzSC0neSRBzZrM2w4DUUdD3yI
-sxx8Wy2O9vPJI8BD8KVbGI2Ou1WMuF040zT9fBdXQ6MdGGzeMyEstSr/POGxKUAY
-EY18hKcKctaGxAMZyAcpesqVDNmWn6vQClCbAkbTCD1mpF1Bn5x8vYlLIhkmuqui
-XsNV6TILOwACAggAgO3XW5uMUH2+8qC1vKiANXFBXrSbK0BPJqe2ftthNKncKSND
-KZ5V92AHWH7/4RGIi15FjAba/sH5XGgKyq5RrJ0Q7AwZakeXQ098Fe8hXF/B06HY
-ip5dwv9OMl7rcNs9VBxsZDJEY0g3F3IzpJ+pnUlNo3s/zTAPOTMMw+dbIP32Urt7
-LmcLq0CFEuG79iosi0W+1tuNXfToKbgP2zx7f41oPpCx2IfZuGhjGpfU33wNht9H
-VbCCP0wegWw/wjN0LP2izAfVwr8seVzlimbaPEL94D1cBHanLe+eOaN7AjWRqCFn
-1LRWuOMRz02lGnuij12CINbsZZioji8sEB3P2og/AwUYNIR7U6H84lEz04AIEQK0
-YwCfWsMZFlg4rt72q5oyWxPU2594jqAAnRIN1L9u7sQfCsHEFezBwfCFE53pmQGi
-BEIEyD4RBACb+Fl9PmkfIbribsJhuvvQVzfGN3bhOns+UtSszc/0ZA8BkJo4OxOQ
-nXM9mZiQ/7EXdwNAmjSV2hpuzVJrQ5BcGF2KRQFZlwbJ/ebG13HunWcttNvMRiMy
-s41mJxtNU6bkE/jL+rZ5MUmizFV1MnqAPYSunDrH9iKmq2dPh9wDPwCg4sx5f+6P
-9riZgEuEcbFqgL2QrP0EAJTbv/4FdQcmuovLp6CWsQgqx4926tkqcdelYF/VE4Uz
-ysx8HeJ7lc9f1GOqGG8x+n1KcFgZd0lp22abZ6gq/h/VbvgbPnGLLqEzH3kiHe40
-ocr0Lk3m6vO1gsPCEQ/E/wQ9xYb60hOydC+O9cRfE4T7BMwDy+ZgMBEAxdlhtZ3y
-A/9SdKEG0yb70txYk2fUitTegjHU/u2QmakwKh5pyfcjxMnnyXtR6qYAsyozu48h
-csAccSqQgrfwOyPo8o/2zkSyOdHGCs42oOmTt+QOtnS5E69i8n7IE6xTE2rZe2BL
-jFliUrwW2ukMkVFe+sZlyPY/UQC+ikpR9o7xkOTkX1+CzLQaTWF4IEJvd3NoZXIg
-PG1heGJAZjJzLmNvbT6IRgQQEQIABgUCRTV5ZgAKCRC8Uwa6ehPlsF5MAKCBXraW
-MOiS2Yh3t/kNJlwXUP7a+wCg2xwxauRnS2QJROwwy/CliqOHt3CIRgQQEQIABgUC
-RTZDJgAKCRBR8T7tO4LocDnsAJ9eXuDFEyeRMP42fVcAi69mRGPJQwCglzExk7Ms
-KbDcN2Z9awo6tP9KsF6IRgQQEQIABgUCRTasugAKCRDFciMm2lYdkTMCAKCHg/ol
-Z8esU4r/8Ud5qr6+PYckAQCeOUVdV3ddYE4ahD0TqtlRiIzaoFOIXgQTEQIAHgUC
-Q2usZQIbAwYLCQgHAwIDFQIDAxYCAQIeAQIXgAAKCRB8U1KZwPLFgEndAKCI6POO
-3Whe/hl15PwGTh5uB38jTACbB39X0/acg0wnn0IOmFc1r6mvrra0Gk1heCBCb3dz
-aGVyIDxtYXhiQHVrZi5uZXQ+iEkEMBECAAkFAkTUlgUCHSAACgkQfFNSmcDyxYAz
-qwCgsukN9w5NT3H2pAyOqiNAIulAINMAnixhAamB+Ew/Nyxez1+9xp14mE14iF4E
-ExECAB4FAkIFHskCGwMGCwkIBwMCAxUCAwMWAgECHgECF4AACgkQfFNSmcDyxYBe
-IQCgxupahEl9TcYpUbM/xn0ggPDQcaQAnRwM3VVddbm9+qOm4Uuoxz7+JOc7tBtN
-YXggQm93c2hlciA8bWF4YjFAdWtmLm5ldD6IRgQQEQIABgUCRTV5ZgAKCRC8Uwa6
-ehPlsPpBAKDqaCzxkFID6jyXTXw1wvYB+HhazACdEyP+uuxE01f6dLYQl5LTdJFW
-wq+IRgQQEQIABgUCRTZDJgAKCRBR8T7tO4LocL+8AJ90rYcy4bEw8+03m6B3jG1U
-3dbLXgCdFiDv134wAI1ktnce73MHxySUicKIRgQQEQIABgUCRTasugAKCRDFciMm
-2lYdkXK7AKCRqxDjFXjMhL6zMnH4tLCFp3OUwwCdFhpoXod1gPDwYOWSJk51M8kz
-446IXgQTEQIAHgUCQ3X3TgIbAwYLCQgHAwIDFQIDAxYCAQIeAQIXgAAKCRB8U1KZ
-wPLFgOEmAJ0fQMMNb9ZK3Yuyht4BseJQcesYswCfcAoh26AB5elFWVC2uNcTzXgp
-IF+0HU1heCBCb3dzaGVyIDxtYXhiQGFwYWNoZS5vcmc+iEYEEBECAAYFAkU1eWYA
-CgkQvFMGunoT5bDC6gCg5xPCC6Rt/L3CHUSHCdt0/q+GQlYAoOJW9QB8GVy4jmOG
-DV0Pgy1ByvtKiEYEEBECAAYFAkU2QyYACgkQUfE+7TuC6HC64wCcDUWWC3gmTt5h
-tVn4CgaJiy7wKu8AnjyUI0QDmAHbuOKUgMmBKCel5ROziEYEEBECAAYFAkU2rLoA
-CgkQxXIjJtpWHZEKIACfTDdAQzKSG6Nbu72qNrfSXQP/0g4An21cyrAVNKgKWCet
-inu2jf5exR7xiF4EExECAB4FAkP9sU4CGwMGCwkIBwMCAxUCAwMWAgECHgECF4AA
-CgkQfFNSmcDyxYBc9ACggD0wxSXdrMxE+13zyEFEPp94vd0AnAuj5TTd2YRBXS6r
-LT3eYTw51ZKDtB1NYXggQm93c2hlciA8bW9iMjJAY2FtLmFjLnVrPohGBBARAgAG
-BQJFNXlmAAoJELxTBrp6E+Wwv9MAni5UQHb2br7zyVKRVTEegyHfWUooAJ9CgCXQ
-dNMpwX9TTqxBAvF+CQU/uohGBBARAgAGBQJFNkMmAAoJEFHxPu07guhwhpcAnj6v
-fdyS60ll4SF6nnulC6GLDW0aAJ9VDXRscV8vPHD40K9HdTfnrxt+Y4heBBMRAgAe
-BQJCBMg+AhsDBgsJCAcDAgMVAgMDFgIBAh4BAheAAAoJEHxTUpnA8sWAz38AoN95
-Y1Shazw2X24t2/1Co3sdSK2fAJ0W/VeJtoIo5OolHaCqOBFdnYhqmLQfTWF4IEJv
-d3NoZXIgPG1heGJAcmVkLWJlYW4uY29tPohGBBARAgAGBQJFNXliAAoJELxTBrp6
-E+Ww6qgAoMoRdK4RqIyuN7FwBET8lWiEFnYIAKCOCrmKULu1iIIV6dUDXTywrRGB
-u4hGBBARAgAGBQJFNeFjAAoJEKJBBqkXBv1uAL4An0aqvps7+yefkouj/MeaueUs
-wXc0AKCzZb4K59HjIfYZksNsjSmAM7lntIhGBBARAgAGBQJFNkMgAAoJEFHxPu07
-guhwP/cAoM3Bo8lBos5YgfaY41vG9EpCTqnOAJsGwGqwzo2u7DPgqv0rRfhZBRzu
-eIhGBBARAgAGBQJFNqypAAoJEMVyIybaVh2RKd8An2FWNnv6qb0IJAg9uoyrclHM
-iPddAJ9L8AB8F2SvfO/4fQFAZoHYDcjBCYhgBBMRAgAgBQJEXov7AhsDBgsJCAcD
-AgQVAggDBBYCAwECHgECF4AACgkQfFNSmcDyxYCO2gCg1q0E/08yI/2TI1sYad3E
-Cn3/9tQAnA6C/hUOUvnAMxDJvLlgMPyiXtZnuQINBEIEyEwQCADQ/tULwhu1QfIO
-Zom2IdfBWkJlGR3WD/JfroD/1kZQEBszN99EbVyK8Nu4vUJKFaBBOgBQTKHsuCsy
-wbD+SyaxsWHifYMYTlgN3mPLwApXRclQprvcql6Pu+603UWyvPccqSfoTCdUvp+T
-qctoGFWsU1F9T8a4cs9wfqO3Z5/4NshuYI9EQ+j1bTIQiPoLb/wq2aHIHkhqd5ZX
-KHX82xOAD7PF4vIuQB/pWpPGnI/0hNjqsdqhOYwR36YSJWFULsduaKTjiXeS1RDV
-XBBUfuef4fORrq3pJ9h4W152ZalgrzWWh9xnJo/R1AKGrqGWo1xceckCoKXzcXvl
-ZV/0y8o/AAMHCACaCemfMvzKNqbwbysefhB3v585OpttgDMh+ly5McfMWfz2hhPJ
-C9SvsWRwnZ0XzBuga4Y3fxkxQoYUIAPvmYN3KZqGaXH9GWbpOPBV59TMFXrvOzFA
-hQR/ibYy8egtvqzZG2cabPvRcedBWmTwEIFyqKTvLSXw6A4SXqxsFRp/9JLuz6Dq
-NiMuDxSeZuIgkzw7Nezn8/75UO7X27gWsRbqTjLFwepzcUtXsiQmDTT2kt8VrpAq
-djSyKKSzwCNFniH96XbFUNK0aKuxbTrwINKNK16vmJCTBw+3ZmYPcKCpOEivrs+Q
-BCLtEuVedILvHpN5it5qsFdBaOi2W7OtFxiLiEkEGBECAAkFAkIEyEwCGwwACgkQ
-fFNSmcDyxYBoOwCfdgP0PqjsdnctcCIo85eW3d0pHvQAoMKZlxSWlpk1BMBGVDo8
-QbpSbC5Z
-=H/rv
------END PGP PUBLIC KEY BLOCK-----
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.4.6 (GNU/Linux)
-
-mQGiBEIEyD4RBACb+Fl9PmkfIbribsJhuvvQVzfGN3bhOns+UtSszc/0ZA8BkJo4
-OxOQnXM9mZiQ/7EXdwNAmjSV2hpuzVJrQ5BcGF2KRQFZlwbJ/ebG13HunWcttNvM
-RiMys41mJxtNU6bkE/jL+rZ5MUmizFV1MnqAPYSunDrH9iKmq2dPh9wDPwCg4sx5
-f+6P9riZgEuEcbFqgL2QrP0EAJTbv/4FdQcmuovLp6CWsQgqx4926tkqcdelYF/V
-E4Uzysx8HeJ7lc9f1GOqGG8x+n1KcFgZd0lp22abZ6gq/h/VbvgbPnGLLqEzH3ki
-He40ocr0Lk3m6vO1gsPCEQ/E/wQ9xYb60hOydC+O9cRfE4T7BMwDy+ZgMBEAxdlh
-tZ3yA/9SdKEG0yb70txYk2fUitTegjHU/u2QmakwKh5pyfcjxMnnyXtR6qYAsyoz
-u48hcsAccSqQgrfwOyPo8o/2zkSyOdHGCs42oOmTt+QOtnS5E69i8n7IE6xTE2rZ
-e2BLjFliUrwW2ukMkVFe+sZlyPY/UQC+ikpR9o7xkOTkX1+CzLQaTWF4IEJvd3No
-ZXIgPG1heGJAZjJzLmNvbT6IRgQQEQIABgUCRTV5ZgAKCRC8Uwa6ehPlsF5MAKCB
-XraWMOiS2Yh3t/kNJlwXUP7a+wCg2xwxauRnS2QJROwwy/CliqOHt3CIRgQQEQIA
-BgUCRTZDJgAKCRBR8T7tO4LocDnsAJ9eXuDFEyeRMP42fVcAi69mRGPJQwCglzEx
-k7MsKbDcN2Z9awo6tP9KsF6IRgQQEQIABgUCRTasugAKCRDFciMm2lYdkTMCAKCH
-g/olZ8esU4r/8Ud5qr6+PYckAQCeOUVdV3ddYE4ahD0TqtlRiIzaoFOIXgQTEQIA
-HgUCQ2usZQIbAwYLCQgHAwIDFQIDAxYCAQIeAQIXgAAKCRB8U1KZwPLFgEndAKCI
-6POO3Whe/hl15PwGTh5uB38jTACbB39X0/acg0wnn0IOmFc1r6mvrraIRgQQEQIA
-BgUCRTbl+gAKCRBeFwE9jNTY3juFAJ0SiVKpfwG9OYYC/2OeHoVjhoXzCwCdFx4B
-bFEha3Ps7o+6bR8EPHFG6CaIRgQQEQIABgUCRTztygAKCRDZFokwU/zcVRreAJ0R
-q+JOtdFy3q+/6v9ehKgjr9K2TQCfYnEOjD557Al7ib1S3hGfHNjrlcWIRgQQEQIA
-BgUCRT5LdAAKCRDJHbjam8/OL7Z4AKCeQUN+EIhzXZPws7SgYRqPUlNiYACg81iW
-iIxvZOJ9poK97TKuKB4PZiSIRgQQEQIABgUCRT5LfAAKCRDJHbjam8/OL6OlAJ9D
-NsoSQPK0yZ75Mts3k08uO7y4cgCgn40w3BclIt4WMHSKuwCR3T1GPCuIRgQQEQIA
-BgUCRULcGAAKCRAJvDXj7lBkYY8rAKCV+oX2bAEEs9qLIv1Hv9zj0e80vQCffUJG
-7jNGNe8xC/TbK6q0K7Enh3SIRgQQEQIABgUCRV33pwAKCRBn2bJJZ08F4FOEAJ43
-ENageTOTfEGYEKibxAsHWwqaugCgmGLGAJtcKiOjSQEcEVePsWYV5BmIRgQQEQIA
-BgUCRV4IjwAKCRCiQQapFwb9bqauAJ9wmYrfnzaS7A3dgWcO5cSU8gA3HQCfdQJE
-oX+aavK76L1hRqOVs0aiBn+IRgQSEQIABgUCRTi1WwAKCRCh/OJRM9OACGVRAKDX
-/vLKBcbHWSrvYWH+KDzn8RlpJACgxjHdmk7b7lMyb+0ivpdfye9CJAaIRgQTEQIA
-BgUCRTVUlgAKCRDCD2atHB+YCRF2AJwJT1e9riMV0wW7V4ImeKaCNYFnJwCdGKrF
-vArocUREQhvrY1hL0DgVsJOIRgQTEQIABgUCRV36UAAKCRC8nbsT2wCiSHUgAJ9g
-9A8msPl91BwH0fjb0jiS5AbMHwCgvYZ5H9k1yjtz2m8FV52LcmppP+KInAQQAQIA
-BgUCRUk6PAAKCRD2XGWm5n31fWkABACEpjWesZpTBM7MItUb627tIEh+EazwCrVV
-23hiQmYlONLU9ZonHhGBMov/9JRuc/NLHK12xyTl/3QP/oUKFA44hobu3wJKf14f
-0d6d6b5Pcpj6pJ6ja2K3TDGg0Rg8zPeOtcNS3t2Ue9IIyN8vDXQgaUyjG2QfZvO3
-sTJ9S0Kuj4icBBABAgAGBQJFSTpEAAoJEEFi9tIMpcmZye4D/j3a5iul4hZ5Fta+
-ahDFk65WqTkVT9aPE3UhCHr6fyzRubGbbQ3+6JbTQEKi2cmwvsZXjI5sd2Qx+b7V
-eCw3r5rzlU8T7iOGgqIJODjaK2t9qxrOP5S1ZyOW2XmH+TB3BX1o8rCfZQ6aIU0y
-AcRnDnnAoVoHGk57a/HHq4RTkN8jtBpNYXggQm93c2hlciA8bWF4YkB1a2YubmV0
-PohJBDARAgAJBQJE1JYFAh0gAAoJEHxTUpnA8sWAM6sAoLLpDfcOTU9x9qQMjqoj
-QCLpQCDTAJ4sYQGpgfhMPzcsXs9fvcadeJhNeIheBBMRAgAeBQJCBR7JAhsDBgsJ
-CAcDAgMVAgMDFgIBAh4BAheAAAoJEHxTUpnA8sWAXiEAoMbqWoRJfU3GKVGzP8Z9
-IIDw0HGkAJ0cDN1VXXW5vfqjpuFLqMc+/iTnO7QbTWF4IEJvd3NoZXIgPG1heGIx
-QHVrZi5uZXQ+iEYEEBECAAYFAkU1eWYACgkQvFMGunoT5bD6QQCg6mgs8ZBSA+o8
-l018NcL2Afh4WswAnRMj/rrsRNNX+nS2EJeS03SRVsKviEYEEBECAAYFAkU2QyYA
-CgkQUfE+7TuC6HC/vACfdK2HMuGxMPPtN5ugd4xtVN3Wy14AnRYg79d+MACNZLZ3
-Hu9zB8cklInCiEYEEBECAAYFAkU2rLoACgkQxXIjJtpWHZFyuwCgkasQ4xV4zIS+
-szJx+LSwhadzlMMAnRYaaF6HdYDw8GDlkiZOdTPJM+OOiF4EExECAB4FAkN1904C
-GwMGCwkIBwMCAxUCAwMWAgECHgECF4AACgkQfFNSmcDyxYDhJgCdH0DDDW/WSt2L
-sobeAbHiUHHrGLMAn3AKIdugAeXpRVlQtrjXE814KSBfiEYEEBECAAYFAkU25foA
-CgkQXhcBPYzU2N5FkwCdE3Mm/vm6Ad+aNrkgmtlAzDP6CT8An3O97E1p5xAWVXho
-W5+x9M+HOkGEiEYEEBECAAYFAkU87coACgkQ2RaJMFP83FVuyQCeImUOE6ky5lbs
-lQAE+UJymByP7K4AnjXttxVOgCeh0bx0AUkl4Qyrb7nRiEYEEBECAAYFAkU+S3wA
-CgkQyR242pvPzi+t/wCeJubTnsiVvDe+Dc8ZlCYG0GWFPOoAnRhxIwrG47ZabcqZ
-1ZqkL6FEQnaPiEYEEBECAAYFAkVC3BgACgkQCbw14+5QZGHengCgjCSeZPkhcUwB
-0WnCBMu1UvEACXUAn1AJ86gzTJnLIgeDG0thdP3kzwzOiEYEEBECAAYFAkVd96gA
-CgkQZ9mySWdPBeABzwCffg0YEnf80CzbayN8Rmudp0KYh14AoM/5CVmXcQ7A/J/q
-g5YsjWAwvh8IiEYEEBECAAYFAkVeCJcACgkQokEGqRcG/W7/cwCgiMldH/TlboEB
-nxTMq1C/GHS0MEsAnjQE4UI66s1b52NJcp43m5XkdLGJiEYEExECAAYFAkU1VJYA
-CgkQwg9mrRwfmAlhUQCeM0ZSzEmcJXsps2ohw94e7hxVW0kAoJiVXKwAQX99P4F/
-tkx5BsemvEMiiEYEExECAAYFAkU4tUAACgkQofziUTPTgAiD5gCg4JO0bmgcMszj
-OdbSF5tSRYpR5wAAnjKYWJl7+jiLR79tUoCDpT8bCbgqiEYEExECAAYFAkVd+lAA
-CgkQvJ27E9sAoki2UQCgjyh83TjTHXGDyZOp1zwA4DBqDJgAoLFTZ8EAkLSMFlIm
-YqOtFD/ij2OeiJwEEAECAAYFAkVJOjwACgkQ9lxlpuZ99X3sLAP/Qtev2M6cOEAA
-tzTixvJY2XN7gTMPFPP/4xuKH+QsvPLU0Lr0cTb/0gw9iVZ/aq7cP2JreoMDis63
-IjeCgIIwWwItecfAqI1CD1klpsEg/sMbvABA+9VxCoIULfXkWfRV28bpGy297cED
-gmZp3AmExE3hWnGByEONnlyoF1Rkf3+InAQQAQIABgUCRUk6RAAKCRBBYvbSDKXJ
-ma/zA/9xftaUxVYpRAz2+TrU3165bNy5roqjMjbTnYmVXbG7e6dvfn43nrx3P8/V
-2FRgFY2aMsl4GBxaLSkWoIv2/58np3bBTnhYRuzD0XeM5mLoBwr2GxILY8tHAwzJ
-74r7Hfan8GVhMvDQqCQ12gDs+Ts9rgWxtEIP2JQZ49jkiUqXSLQdTWF4IEJvd3No
-ZXIgPG1heGJAYXBhY2hlLm9yZz6IRgQQEQIABgUCRTV5ZgAKCRC8Uwa6ehPlsMLq
-AKDnE8ILpG38vcIdRIcJ23T+r4ZCVgCg4lb1AHwZXLiOY4YNXQ+DLUHK+0qIRgQQ
-EQIABgUCRTZDJgAKCRBR8T7tO4LocLrjAJwNRZYLeCZO3mG1WfgKBomLLvAq7wCe
-PJQjRAOYAdu44pSAyYEoJ6XlE7OIRgQQEQIABgUCRTasugAKCRDFciMm2lYdkQog
-AJ9MN0BDMpIbo1u7vao2t9JdA//SDgCfbVzKsBU0qApYJ62Ke7aN/l7FHvGIXgQT
-EQIAHgUCQ/2xTgIbAwYLCQgHAwIDFQIDAxYCAQIeAQIXgAAKCRB8U1KZwPLFgFz0
-AKCAPTDFJd2szET7XfPIQUQ+n3i93QCcC6PlNN3ZhEFdLqstPd5hPDnVkoOIRgQQ
-EQIABgUCRTbl+gAKCRBeFwE9jNTY3haLAJ9QvytLYtIbZiJFW5odfqwTYMqbgACg
-s9VuunTkdtk4WqtwZvsBpyE1j/uIRgQQEQIABgUCRTztygAKCRDZFokwU/zcVdmn
-AJ9/ya8Q4F/hz1Zrt2bL76ERXLKkEwCeKDq0hO/xfyNOHjtcl0QCp1PFWmyIRgQQ
-EQIABgUCRT5LfAAKCRDJHbjam8/OL05fAJ9bssWU0HtTZlU9Jt98Xi3yGRDJTACg
-k2SyaiNRIaBXaWtAxup+QjZhIBaIRgQQEQIABgUCRULcGAAKCRAJvDXj7lBkYfk0
-AKCfO4MyNFc2SoGVeou+qDJvxm78dwCdEjdVevLcDEh9UsS3KhwYSUgHigeIRgQQ
-EQIABgUCRV33pwAKCRBn2bJJZ08F4EhoAJ9Eiatic/5qwhCcZdl72nq/j6PbbgCZ
-ASbVD4hgh4pohPlcOH+T2gQovHGIRgQQEQIABgUCRV4IlwAKCRCiQQapFwb9bjzH
-AJ9xEm1pJnxtcbQrSwhlVLdykI+q4wCgpJ/LjoUFmHQTu0mZNApxxk8qNyGIRgQT
-EQIABgUCRTVUlgAKCRDCD2atHB+YCaa5AKDELbNpcn4/Lfgq9NuTwnU2BurHkgCg
-l8c5IFwnGi2m06LngnmTmE6NzFSIRgQTEQIABgUCRTi1QAAKCRCh/OJRM9OACObT
-AJ45kJq1cR2STPOsC/nM8fVyfPBnogCfUBXJEKh7Zx1c/3Nyiz5B5BCO0R+IRgQT
-EQIABgUCRV36UAAKCRC8nbsT2wCiSIA7AKDdTyLDN/cDs/TiLfO/qtluqi7JzgCf
-WAJGZmNosgBjcvwDrCjdNKcTZXSInAQQAQIABgUCRUk6PAAKCRD2XGWm5n31fQsI
-BACbt92tD7Bx5G9u6uFOL4pN5lbuwUyNI0mNzRYVdFNdzpJ/VaEkJUbZcwW3kViQ
-jS53LqeRHOblgoHWv/GHyh6KI8gCCfmAcJUKjlboxt1Veb4Pd2zrg/Jaz6dE3e4l
-Ltn1ITjca6ZBD3pkDFGygS9QQjK2LZ4Io9lVD29RgGHeg4icBBABAgAGBQJFSTpE
-AAoJEEFi9tIMpcmZh9gD+wV9PFVkKtjaTBdfXxzoCBdpX3MvXDQRPD43dsnk8tMC
-m1h84loG086PSwHeeQDs9nwBjt0c4z4y8J+p00zWaLbJOD9HzvDDcKr+pDTPz5aB
-Ki1tMy+7jXFnV60js/NWDmfppLLqVv4ZGYmS7/rwGSS5x2K/12BNEvuQjhaN5Z8D
-tB1NYXggQm93c2hlciA8bW9iMjJAY2FtLmFjLnVrPohGBBARAgAGBQJFNXlmAAoJ
-ELxTBrp6E+Wwv9MAni5UQHb2br7zyVKRVTEegyHfWUooAJ9CgCXQdNMpwX9TTqxB
-AvF+CQU/uohGBBARAgAGBQJFNkMmAAoJEFHxPu07guhwhpcAnj6vfdyS60ll4SF6
-nnulC6GLDW0aAJ9VDXRscV8vPHD40K9HdTfnrxt+Y4heBBMRAgAeBQJCBMg+AhsD
-BgsJCAcDAgMVAgMDFgIBAh4BAheAAAoJEHxTUpnA8sWAz38AoN95Y1Shazw2X24t
-2/1Co3sdSK2fAJ0W/VeJtoIo5OolHaCqOBFdnYhqmIhGBBARAgAGBQJFNuX6AAoJ
-EF4XAT2M1NjeioMAoInC/TADj7oPI/XuNrttUTcc6HAvAJ43VHX9954I+CpLy6pD
-2Ux9zJ1QPYhGBBARAgAGBQJFPO3KAAoJENkWiTBT/NxVYoEAnj7n7V2g3iERODrE
-UUHdJI9GkN00AJ9AdzCsIATvpuevwYgGADqQ8CQ9H4hGBBARAgAGBQJFPkt8AAoJ
-EMkduNqbz84vHgMAoJRDEUXyMMJWA28jjIfRXBjesghTAJ9ad2eH6KG63Pol7cC1
-HKL34JZ2hohGBBARAgAGBQJFQtwYAAoJEAm8NePuUGRhfSkAoOPBmz+SvH6Jgy8y
-wt0/veIRZd79AKC6yPzIzxHcLtIwAd0IJSmOLutH3IhGBBARAgAGBQJFXfenAAoJ
-EGfZsklnTwXg5isAn1SUYHzxM2w0IOVommwBRRcDUG2HAJ94yuiZlJM6utEeywCN
-j12fXGSEiIhGBBARAgAGBQJFXgiXAAoJEKJBBqkXBv1uYjsAn12yq0FzCtlN9QTF
-/XoV2DFqxcGNAJoChR8njZtOEyXD/1MqhwA1ml0ZcohGBBIRAgAGBQJFOLVdAAoJ
-EKH84lEz04AIowsAoNvz26Afn8q3CbLWOht19QYGueFWAJ44s+TWGVCCbeiJ9GeQ
-uraJLPwmr4hGBBMRAgAGBQJFNVSWAAoJEMIPZq0cH5gJ9gUAoIgkaTgQLjiDzIy3
-vC+EraL+9kvdAJ0b9QGzwolY9P8v0s4Ic3T8rQUKxIhGBBMRAgAGBQJFXfpQAAoJ
-ELyduxPbAKJI4+oAoIcPqP0oDFVE3xJKoXh0HqUdhotxAJwPd6Vcl5tR7X2v/F9d
-lfS14ZAbEoicBBABAgAGBQJFSTo8AAoJEPZcZabmffV9VVMD+waiI3J0qWrCyToQ
-ba+Ys3nfm0/U2gJLNlWmJ3uSXqUpaRnH+IzJ1U9niQvSxx+Iz9Gb8J2p92F9WSqk
-n+i6AVgyO/gWkwfQ6f7t1J1QnyR2Lff5xgGi0/8EAKok4fqZedxXhuYNRCr/XA3V
-6x7RgGum2MR9p4MRNKwtQ6v/fbDOiJwEEAECAAYFAkVJOkQACgkQQWL20gylyZks
-6wP8Dk5aqgrVSkq5HNn2usNL6fDK5P+QrnF5Q3VycODONFGFfadMr9fO1tsbrrz+
-aHnYzfFCeFJM+f5rKtW5m+MhFoIBO/4qGFnZp+26/xIAgbkFAW2g1+bj74B9oppF
-QscQeCK5AlDJ7HYVfaH4kbCWikm/IvZ2jdFuCIG3RBUwJiy0H01heCBCb3dzaGVy
-IDxtYXhiQHJlZC1iZWFuLmNvbT6IRgQQEQIABgUCRTV5YgAKCRC8Uwa6ehPlsOqo
-AKDKEXSuEaiMrjexcARE/JVohBZ2CACgjgq5ilC7tYiCFenVA108sK0RgbuIRgQQ
-EQIABgUCRTXhYwAKCRCiQQapFwb9bgC+AJ9Gqr6bO/snn5KLo/zHmrnlLMF3NACg
-s2W+CufR4yH2GZLDbI0pgDO5Z7SIRgQQEQIABgUCRTZDIAAKCRBR8T7tO4LocD/3
-AKDNwaPJQaLOWIH2mONbxvRKQk6pzgCbBsBqsM6Nruwz4Kr9K0X4WQUc7niIRgQQ
-EQIABgUCRTasqQAKCRDFciMm2lYdkSnfAJ9hVjZ7+qm9CCQIPbqMq3JRzIj3XQCf
-S/AAfBdkr3zv+H0BQGaB2A3IwQmIYAQTEQIAIAUCRF6L+wIbAwYLCQgHAwIEFQII
-AwQWAgMBAh4BAheAAAoJEHxTUpnA8sWAjtoAoNatBP9PMiP9kyNbGGndxAp9//bU
-AJwOgv4VDlL5wDMQyby5YDD8ol7WZ4hGBBARAgAGBQJFNuX2AAoJEF4XAT2M1Nje
-Mx0AoKOiSy27wqKMqM5+3ZWBH7nMMxghAKCe4lORwlNkokyUJd/sWeqIKVB/54hG
-BBARAgAGBQJFPO3GAAoJENkWiTBT/NxVSo0AoIByVbkPMJALmT7G0+v8nMfr+0Ms
-AJ9XGXlfgF4E4J6E18VQOLqFvmBwEIhGBBARAgAGBQJFPkt0AAoJEMkduNqbz84v
-tngAoJ5BQ34QiHNdk/CztKBhGo9SU2JgAKDzWJaIjG9k4n2mgr3tMq4oHg9mJIhG
-BBARAgAGBQJFQtwYAAoJEAm8NePuUGRhB0MAn2Jm5QZI9ZM1qZX8/Yw9H82voFZk
-AJ9zqWwLDxx5Ej1LhpuJu8XQXPOSDohGBBARAgAGBQJFRSrVAAoJEOjoIGD5/+ko
-zecAniQo3nG3/pIrf7Z63TGTWT3KnuwTAKCjkUfvhAS1l8swwR1br/lpNIVV6ohG
-BBARAgAGBQJFXfemAAoJEGfZsklnTwXgNZAAoL5bwH3yC0yiW71pFj+Up8R6enry
-AJ9seGBU74bZas0WTzmzi47ArbXCk4hGBBMRAgAGBQJFNVSWAAoJEMIPZq0cH5gJ
-3wwAn1kKfW+telnvpQ1VrJBxYyovN5RjAJ0fQQpeTPWYm1li78RleBWMSC4YXohG
-BBMRAgAGBQJFOLU+AAoJEKH84lEz04AIYbwAoIx2uwvT4zj8fxoNNJ5cJT2SPJ07
-AKCGQs3Z8FTppYgAuJHoAc+S/JV5y4hGBBMRAgAGBQJFXfpLAAoJELyduxPbAKJI
-m6cAn1MOqNtV16iZohh7OTV06mQ22Y4qAJ9bS9U9tXqbkI3dlXheowRx6toeiYic
-BBABAgAGBQJFSTo3AAoJEPZcZabmffV94QMEAIhTYO0YpWdjKehLfcPuvm46F1nA
-6uKQ2FTY/tLJNWRM3xzVU2S0OD9cBSW30IhTFnrYTSqKKWuyvzUhN2QBJvp8QGh9
-6sI57hcsZ5VJHagztG+RbrOJAP/tMltlOTe04rjuBBcNBxNbO+TUPzJOTbYsP+Ir
-2DG+yC0X2BlllK7ciJwEEAECAAYFAkVJOj8ACgkQQWL20gylyZn42AP/UgYL8dMw
-8U7mlBCcJOrs0PBVQ2unxlQeA5j7MOPaxjLLIWJcpRiPMNWTKLylsK8I96+IR+8P
-wh6y3z1vHBt70EtTt2lq1j5ZvNE4T6xvVXW8X8/Npj04TUm4b87wNKKfSGHYJJjK
-aZmBsVDF7Ms1WTt0I4u9SR+qzDw3+IXMIQe5Ag0EQgTITBAIAND+1QvCG7VB8g5m
-ibYh18FaQmUZHdYP8l+ugP/WRlAQGzM330RtXIrw27i9QkoVoEE6AFBMoey4KzLB
-sP5LJrGxYeJ9gxhOWA3eY8vACldFyVCmu9yqXo+77rTdRbK89xypJ+hMJ1S+n5Op
-y2gYVaxTUX1Pxrhyz3B+o7dnn/g2yG5gj0RD6PVtMhCI+gtv/CrZocgeSGp3llco
-dfzbE4APs8Xi8i5AH+lak8acj/SE2Oqx2qE5jBHfphIlYVQux25opOOJd5LVENVc
-EFR+55/h85Gurekn2HhbXnZlqWCvNZaH3Gcmj9HUAoauoZajXFx5yQKgpfNxe+Vl
-X/TLyj8AAwcIAJoJ6Z8y/Mo2pvBvKx5+EHe/nzk6m22AMyH6XLkxx8xZ/PaGE8kL
-1K+xZHCdnRfMG6Brhjd/GTFChhQgA++Zg3cpmoZpcf0ZZuk48FXn1MwVeu87MUCF
-BH+JtjLx6C2+rNkbZxps+9Fx50FaZPAQgXKopO8tJfDoDhJerGwVGn/0ku7PoOo2
-Iy4PFJ5m4iCTPDs17Ofz/vlQ7tfbuBaxFupOMsXB6nNxS1eyJCYNNPaS3xWukCp2
-NLIopLPAI0WeIf3pdsVQ0rRoq7FtOvAg0o0rXq+YkJMHD7dmZg9woKk4SK+uz5AE
-Iu0S5V50gu8ek3mK3mqwV0Fo6LZbs60XGIuISQQYEQIACQUCQgTITAIbDAAKCRB8
-U1KZwPLFgGg7AJ92A/Q+qOx2dy1wIijzl5bd3Ske9ACgwpmXFJaWmTUEwEZUOjxB
-ulJsLlk=
-=gZPn
------END PGP PUBLIC KEY BLOCK-----
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.4.9 (GNU/Linux)
-
-mQGiBEf/izgRBACjZnN9hjWbaOcMD1OPoE8+Wf0sDBmpmOU77DlyDTkqrGFrvZIh
-+kphQoBP4FXMojN4wxnaTB1aabOcmFp2Ig4ZTCPvXHGYHWBuWU4wnqkLAOsgjbwr
-yOKwhD7J0NPgQOlRvUxZbWyXVIxjDELRuw1LpG+jj+8URreN0dZJ4ORgIwCgxJbS
-MuMQsc+nkJkHof5HtJG8Sv8D/3hz4oXKofMnHo1RStRf67J8LsqifyO1uqWo0qtn
-nGL2GN3UyMeZdKTpEDDkpogdsqQYrRqLaPp5egatm8BHujoxFDlEqpEI6BHz/7wz
-sx+gmh2w7fwdN/gf0g9BQ/jpZtSoHJC6qi8ib/RKXvE9c9Xp8IChbcPUGawTkJjA
-UGL9A/9TSTQBf2SQawN5Pxx3goVzbT3zcWIhFRkvWiKjHBhMgBJAN19JIGsDYfwD
-zTHCUiEUMoN4xyVqWGK7MrGpCkvT5HYFd0ZIIn3Tb9iHy9+iykZbTQwgZScn7J49
-ibp/yk2KU4rXLgkDMDf+2XV/xz786HkltRtrXhvKswZOgTiOI7Q8QXJmcmV2ZXIg
-RnJlaHRlcyBUYWlmZXJzYXIgQXJhaGVzaXMgPEFyZnJldmVyLkZUQUBHTWFpbC5D
-b20+iGYEExECACYFAkf/izgCGwMFCQDtTgAGCwkIBwMCBBUCCAMEFgIDAQIeAQIX
-gAAKCRD5mJ5xPrycA/rqAJ9SBm7wC1v6Qb5tvvmM+Ed9SOIq/wCfSfw0DxdIe4Px
-k2hokkxaxu6/+Dm5BA0ER/+LOBAQAKUsBCUBHzh+LtjMVffMwiuWkTOs699lmBRc
-9Ii3tOaadF1xBw+gisa8zbmJxwxE/fTF257XagDgl2frSLDpKnD5ZO3494maFWMv
-eQtKsYeGaFFqoLHax29SEHgxQ8GYwNTmjy05wKfFyfqbtq6xckARF8LFQNIryx/O
-SmYiktD3F/rckL0caE63aBIl4/HGEFiTDvn44aClFk74NJwN+3Cb2DgLQ3zQrCI7
-4Yq5KqUsNKKbj5O/0UMlZSlpYAyEyfp0F8HordMS6Z8p7phqAcOfXT/j987C3UY8
-8rvtNwMJvFwkuSLbMHhonDaDoLYHdGqVcC81dnGC5MjvpFE8hySz4JlO7Zfzlnm8
-pGF0E7lFyB2hcc6/xxpsUEHc/3HwtqVcJzSpblck93dThPJBSdBBrqvQnhm5L617
-lP4x/OOPKE4GGQ+CCNqNx9c0A876drsAmx2LYhXfdHHU5iYX8NTq0TVTVmPphY6k
-Y8tyO84HOyzrIU0ofpY1ODvR6UY5MxfMeZoT+bps5aVEYnrcy+HU9JL6bsmQiSV/
-8z+CPUk6bWEp48W8TYLadYQPQuW5mE5t+65D5oqDkAj4bWTAjeTWtA2aRLtfTH3w
-bL/r8cswEWilKEaIbHptJbN1Ys9ZEKMcY3MBtj54lwIkakqYd4jqQjpcBkGkmiJe
-I4pyzIIvAAQND/4qkKmLI6/p2ud/ufcsS9uKEmuFf2Lhv2NIoIWYPY+V/bKYsJFA
-jr40U9SMCHcPZACwNVo6tn2gWD0uKSLUnBQvSxuPHvnlCoEgcJEQ6rdM6lf55RsG
-KC2fFH9vCWzTrJiLWtNrdHcfruntggcJgPtLC2IVTgc9B/9C1c4sL/0u/1pUUMFw
-JKF9dxemkShb+MNP1zjmE7fUjhDaXsJulHfuXvO+/Xgom7TlY5XYcPlbcM1MIHIw
-8/I7i65G1GG1Rzn08zNVIwd3JHGG30q8DTItSZ5y2CKWefD3XJN0Cqk0xs9x4G/B
-H64CYPHtWZniqo50/gKwbH9BYzYKMb0V0T1cIyyd++5hXMgb6/asJmIFt3kpsx41
-lI5JCfK011gZ6u3YEMuDmUR6VU11DhR2eJ4Mg8BcVyZ/+aHByNN9AfeY5PKxKxx0
-1R6Vy7kX9s2uEblXx4Dh/Bl4aAOdfXCU/lqLTJIFxc4KyRKlIPOQWEKeMerk9bs7
-prO22RJvU0fKjgj4b2X+mKipvCQzPzZ8sK36wLZcuRlbtNunBT+acdTuC7iehDz1
-gfzsixdrzn82QkfHaFvHyqjajFa0RDj3E1/gh0Ds/Az3GD7WCjVT9ESnlix9hm6J
-UdELXifiU3RSG7LihrEFFsNIKoGbl77Iwhlbv4Ne+5idjcNvu6zxHBOzHohPBBgR
-AgAPBQJH/4s4AhsMBQkA7U4AAAoJEPmYnnE+vJwDYKsAoJnpVKEKQkAmV+eKkteD
-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
+mQGiBEKE95oRBACPaJTtIZYzmpILZamUuBkNGOp1sZkcNaWIf1wokFXw54rcxWXf
+/rUYx1/vGYWT2XGrnuI3/JlQD0RA7G+xwBaJ0fGfQiKQjmVVV72Qf7g1PB3Cp+6w
+pQqDEzIpbLqUxEZoTbEHK/WXMcIyLST1ml2b/Q00cji1++zx8XiAbvz2XwCg+qVx
+dluaJ1GmOUTGDmWrvg4xA1cEAIyfgEDAPPGLKFt/kTV6a4qmPRAQRUs+kjzQF09O
+SJZYsbJoChqj1Bs4OhO1ukbsCdB/xzWEgYNs9Uygi0QPp+XnkFTdXpzjJrRWW/Hu
++G1LsieKkh41+0A1bGUJiD0f9mY0fpcpGlbUgFkLkj40rQSYJaH4r2xGu1xDoMD5
+mzTgA/43SoSwoWWHoUKhN0QCRaH0KvSJaj7wdllbXGKcEmDo25ahvpTvNpichjO7
+PygjW3JG5/19SYZxslrqcTyB2zk7UiCPNFANlldUCfc3nUfjeZGgoReTAcD5VAb2
+p+FRQe9U2gjMEKzXid7rJXIxCMvzfQalFDDys/fftttBLGgDzrQySHlydW0gSy4g
+V3JpZ2h0IChQZXJzb25hbCkgPGh5cnVtQGh5cnVtd3JpZ2h0Lm9yZz6IRgQQEQIA
+BgUCQofvogAKCRCrTWCYiCZoaNUCAJ4x2s7w2Bf2xVKgZTE6Whg7u7hGHgCgpmfc
+yP6zwAfPttywn5KoVeePGoCIRgQQEQIABgUCQrBMhgAKCRA7c462Ekj3798VAJ9l
+LttD79hG0bDJFE0wlpc+6A3NOwCgwiQHygt6FZGhBE5UHao7PS6WM3KIRgQQEQIA
+BgUCQ9Vd9gAKCRAvw76Z0SNmdG7SAJ9FA77PWXyPrMUsLMud2r3PGgY9MQCffQUf
+y0VlbZtKQm8A3+dZONJeuK2IRgQQEQIABgUCQ9Vd+QAKCRAvw76Z0SNmdK2SAJ44
+75jT/6hsDoRgijZ3/nl7eIkw0QCeL3fAqKC8vtZEf+f6GKmK7ByRnZqIRgQTEQIA
+BgUCQ5BetAAKCRAF36g9FylU90GpAJ4qvb/jxoxGjD8rJx4aMtkmqNCHcQCgszOK
+pNKbM0CA+029M5juV+y74j2IXgQTEQIAHgUCQoT6NQIbAwYLCQgHAwIDFQIDAxYC
+AQIeAQIXgAAKCRALA65uTiRRfKOTAKCICISQTl4ZcyUNf7EPg02ShwML5gCgpiFq
+Cv8RpPger2CB2+jiclQMHaeJARwEEAECAAYFAkKE/TYACgkQm+oImRMZEIDNiAf9
+GNzGESz/rhqITH5jcV1p9w6jSHOW3rWO21Fbe0dR0az6u9QaBkqhcTGsv217Xtrv
+IlqeTdA7a6HrQN3kdY3qErV7b1wtLfMrIKpky0tWTWXaYy+QN0+gHoa0LTeY6BBH
+CmC/pTDS+w3AWwcC+mkW77DGQEAB06Gs+UvFeSRr8R/X9ar9+OkodJkbltlwzf4G
+Odo4ntg5LcBjmmly6G3k3TsyDBkq4Oi93Hq0F7AeiCYQVVq+Urx9n+iBaLUSe6yW
+Jbu7Dq9Hg1fbV+rP5mvUTFrkRV7UEUJhQ7DWjmHG4BdnmxHuYtNWd7K7bdnx4Gst
+Ny+0fLqh6tmJxac3r9ed+IhGBBARAgAGBQJIENctAAoJEH7xsSaa71JnjGIAn313
+OQzviX7o04cvjWa7rIiECztIAJ9rdlo54L8iQoBJT3/nXYEx95pIC4hGBBARAgAG
+BQJIRaiUAAoJEGfZsklnTwXg354AnRPnrntXOOyGgfINYpr5yB+UpYbOAJ9KgXew
+AWU5LdwItbr8ZnJ3o1Zk0YhhBBMRAgAhAhsDBgsJCAcDAgMVAgMDFgIBAh4BAheA
+BQJFAM1VAhkBAAoJEAsDrm5OJFF836kAnjqPMwYUSNXBjG2Ub0hTBKA7s4N4AJ9V
+tLIPZ8u7m3YEkZsyTV/mqUKvNokBHAQQAQIABgUCSEzZtwAKCRADUw2qoCXHAnoz
+B/wPpjT4mbRY82DAXWxuQqKUQosJmTqhGFMRTggz/ayNmq9W/rQwps/WEiuauL68
+YYjpWmhveH1/yFvV0jc63YA+SBv55orLRYpREZHQW63R1EAItw5s3/HtCDNilcA6
+/o/ziRA0Gg2RwZBWwKBXA+0w0yHBmrYJXkk4bD0O77FpOj6l2EIWY8Bowdo8ZT4O
+s4XYWh1GYqz/PTpWaywtLtMR2eUVCY9jtHOmW94tFGE3fXA5wyqCV/mjuRGXR8s6
++Qc+RbiKeX4aXYWOCvJv/a0mGKwYIzcDlppwn83GvdsTZLtaU+OZ9HBT2oPJqNhV
+FgmxhixnOx8StEgdJhyr6KGuiQEcBBMBAgAGBQJIMnOmAAoJEAQBqiBG05f/cOEI
+ANdo0WETxBXKeGAaOgOX5DGkzPr63MRxAoh/AUuLBR6QhbeAzcxDTD++1pJ2+Xtv
+BwnDpMP0yo8Byy4THB+Xm6Ibhaxo6Rwo+N6NPUU0T/Z/HkS5TTuWdnJzYZx78/tl
+YZGS6824aCXF542VzJ4El/wti1OlXHeuFVCy3MMwL2NOhTyXYFjKB8nxl4rMQOPR
+yDUDy8p39/V1DTZIRr+MUhGtpC9718ysK7b1Jxpom0oJTOOm8YZpwg6tCDwKEx1r
+FWEqga/Pqqo4WBqwrZL6ADuXbUSmr2nyKO4Pjlikh3sc+KLCWFPLgks+/4CefG0K
+FUpiJ7QoCD8/xXscoW1SX+eIRgQQEQIABgUCSJERYQAKCRCL2C5vMLlLXItgAJ44
+WxHWG68/FUbDDnt9gFei4jQydQCcDqBb4Xy4QHudHO5B/AKc09vYYKWJAhwEEAEC
+AAYFAkiXiXcACgkQo4guv3hEbyYDyxAA9dLVDtUzgmr1QG9eTaAE0BXksXitTiab
+q56gqGBvzbLnQccdI1xTdMKp3wgrKZ2OcR65LQVwSq6DvZI2jHPhOM+rUz+L9qZn
+P4Tqi+1D1BPjcsRk4FaZRAppgC+fCvI4ojDPkTuPIgyYMX0Ek+GX/04qzmVN2SJj
+nHUsfL4sjmGu0zwb56OfgU5OpKsFJZBPKzvZvG4aqrozSq6o9ZS8HcMBiiUAhrUp
+5P2FDegeaJXi5kH7b/zV6b4DBZjx2zuRJG8OSn7PN3ho6BpVuW9CTjXSkn/yKJRy
+XR3gcfknNQjs36DCCCdY/1v5uUoQr345IBAF6cqRu9TikKqxkXXJNjqkM3sU2Jji
+WQqfG028neigWUT2vYNtgnycA4yl2+bLEn4NyKFljEjf4dIzXKdSD+ZBgPlcEsJW
+DwCcO/phCcdHW+gK55kDkLXu2zPPpn5C7lMLDtRLO8jVeAYnHXhDv51xDXkxkQ+y
+FmdbFkSxavgoGLpUFSskNeT5a37EQBAR/H1/va27mQGfl8oOIQfKSuP1ybDqJipP
+dntMudvsFhjJBQQ4kZviyRursvaqI4mIM6gyEPj+QZH25KNTh/twgt5Ua/k2dZXF
+4aabGY7owEDBMaYk6fQ0tPkOGqjhYmpB2pqZP7CcqT5kDSeLLSm/T7saj/5M6iVt
+MOPig7B5CyuIRgQQEQIABgUCSPYGnQAKCRD8/WMFmCH3ssOcAJ9ILMeyrriZqzy0
+TR6jZ6zUUCGcCwCeNfCEYgFn8Ri67yvvkTB/nyrspXWIRgQQEQIABgUCSPYG2AAK
+CRDdYe/I7RhMLMy9AKC24ipYUKQ6W7RTuwmJ2mkF1TEduwCeIRO14uNRpmT6SSQH
+qzHokju15diIRgQQEQIABgUCSPYKOQAKCRDl0wJz9Z0l8KcaAJ96z634W4mIwqkF
+Pa/L/XECf7+kPwCg5Ta1rlxIEnqnY9Wf/CZcLIjKNnKIRgQQEQIABgUCSPYLdQAK
+CRAJdFSRWGLqkEAZAKCvlJxnRzuCuzKGu3XXuTCfeoJeiACg08/DLfszZvUoO5Xh
+fDjKRYP0RJK0M0h5cnVtIEsuIFdyaWdodCAoVW5pdmVyc2l0eSkgPGh5cnVtX3dy
+aWdodEBieXUuZWR1PohGBBARAgAGBQJCh++fAAoJEKtNYJiIJmhoOb8AmgIQY0I7
+yK8znzPOHlu46Rw/ZT50AJ4uO/viM5D+3o8Q/JeNGBZJiiDXJIhGBBARAgAGBQJC
+sEyGAAoJEDtzjrYSSPfvZwAAn0PB2gUXd9R7H+/Mhkc/HNq8LDtiAJ43Awbw02WT
+ytIV96v9iuGlM15z1ohGBBARAgAGBQJD1V32AAoJEC/DvpnRI2Z0btIAn0UDvs9Z
+fI+sxSwsy53avc8aBj0xAJ99BR/LRWVtm0pCbwDf51k40l64rYhGBBMRAgAGBQJD
+kF60AAoJEAXfqD0XKVT3OP8An0Oc5TI051MuQgsfVKr6B5Yq9t3cAKCOqpb37ybR
+aIgoOJl3BYyUAym0uIheBBMRAgAeBgsJCAcDAgMVAgMDFgIBAh4BAheABQJChPpG
+AhkBAAoJEAsDrm5OJFF82vsAnjbrxbL9NDfKbh+5xwqGyFG16LF4AJ982RBhAItt
+o9v25Qz0S+VqpvQry4kBHAQQAQIABgUCQoT9MgAKCRCb6giZExkQgBwgB/9QhaKk
+FVgpmJ5kz5K3LWi7mqt1kHSyXlbm2Mw4LLl2j0m1iU2aWu/xz1N2VGH24Vlg2IDa
+KJ6FHV0L4CIdNHNmQoiemOPzUnlK1R3LPubO+NNGRSFz363fgQly9J90W5hzuOFL
+02CQo2/Ac+Xa3AWmHii0pB0+yHuF/dryZPCkpvD5i1zaRcje4s3rdZ3gU1VXjuPe
+/KXJDXM1zKXLchhrdOz1BNSuVzQJFdh3B6CVbNsIgLYjD3OXHvcJsQAJi+SyWSWC
+hORwaYanPanwmCI4KDu2OZNOotHuYvF1ILBBEiPMT6dByRFLMEeIvlryB0H6w0is
+HOp5lNDaso48ExvmiFsEExECABsGCwkIBwMCAxUCAwMWAgECHgECF4AFAkUAzVUA
+CgkQCwOubk4kUXydXwCgvRzZqwkt+Y3Mi6KUIH15tb4MaHYAoJxeJpRuXWpBr8q5
+uXnbaegSH6pciGsEMBECACsFAkZgRnUkHSBFbWFpbCBhZGRyZXNzIG5vIGxvbmdl
+ciBmdW5jdGlvbnMuAAoJEAsDrm5OJFF8hTYAoKd0Mk/XdrZD/WlmfDQjBqgt4s5P
+AKDr50HKT7CasxJ8tyPlBNmwtWuW6tHSSdJHARAAAQEAAAAAAAAAAAAAAAD/2P/g
+ABBKRklGAAEBAQCWAJYAAP/hABZFeGlmAABNTQAqAAAACAAAAAAAAP/+AB5MRUFE
+IFRlY2hub2xvZ2llcyBJbmMuIFYxLjAx/9sAQwAFAwQEBAMFBAQEBQUFBgcMCAcH
+BwcPCwsJDBEPEhIRDxERExYcFxMUGhURERghGBodHR8fHxMXIiQiHiQcHh8e/9sA
+QwEFBQUHBgcOCAgOHhQRFB4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4e
+Hh4eHh4eHh4eHh4eHh4eHh4e/8AAEQgAoACgAwEiAAIRAQMRAf/EAB0AAAEEAwEB
+AAAAAAAAAAAAAAIBAwQFBgcIAAn/xAA/EAABAwMCAgcFBQYFBQAAAAABAgMEAAUR
+EiEGMQcTIkFRYXEUMoGRsQgVI0KhUmJywdHwFiQzwvElU3OS4f/EABkBAAMBAQEA
+AAAAAAAAAAAAAAABAgQDBf/EACERAAICAgIDAAMAAAAAAAAAAAABAhEDIRIxQVFx
+IjJh/9oADAMBAAIRAxEAPwDqJKeVOBOdqQDHdRpGe6qNQoT5UQTSpFFigdiAUWBg
+0oFKBzoH9EArxFKcVXXS5xYTRW9Ibax3rOKTGkTxjlivdnbeuf8ApK6dhapzltsj
+Dbz6MpW4V5Qk5PLxrVc/pU4xuLhcN8faPcGlaQBXJ5Eh8TtUYO9LgVyDw30y8Y2p
+QS9cBOaTglD43x61tvhTp84duKmo91jvQH1YCl7KbB9e6mppj46Nx4r2PSmocqPL
+jpkRX23mljKVoVkEU/VkDZFexRkUmKCbGyKQpFOEUihQSxopB9KEp7qcIoSKAAT5
+04mm0nflTiaooMcqUUgohyoKFFLSCiG9FoDEek/i2Lwnw4/Ne7TuMNtg4KjXGvHv
+GfEF6lOy5U11KSTpQlRASPDFZ59pfi5258bm0BwmPB7IAO2rvrTtxdW7pYbTqzua
+zTk7LXRBjLPVGbJWrtKwkc81PTIbW2pyPhW2CO+nW7PIlxEocSpOT2cCpEnhGdb2
+EymlL0KGrOMcqh0NJkNt8qUMFI3z41MceC2UhQA7txUZxSGWta2wp0jlyBNVEm5P
+FIQE6cHbFJKwbOhPs59JL1luKOG7llcCQsBpwndpfh6GuqmlhaAtPI8q+bltuLyF
+odCikgg89xiu6ugriVXFPAESc64Fvt/hOHzFd8cvDJ7M73769S91J3iuhDENCaIm
+kVRYgDyoDRk0J2oFQ0mnBTY3o0mqGn7HBjxpRSDbnSjagoIUXIZoRSnJQQPCkxnA
+nSa+ZPH9zccyCZbmrPrVtwNwyxOSZ8oFQVsgDbArGekVDjHHV2ac3IlrGfVVbO6N
+FdZZm0AdlOwrDks7YlbMxs9mgJQltMZKinkSKvpdijzoCoqmUgaSBtypi0fhHfvr
+JIbgIx3Vmcmb1BUahvXRxIEgPRNITjS62obKHkaxu89FMVSitMtxtRGSlQBwfWug
+Zy0qR2RyrGLogLJyNqcZs5zwxo5m4m4Yk2CW2h5QW0sHSrGK6l+x0lCeAJeD2vat
+x8K010xx9UVghPu5xW2/sbOJPCN1bByUSUn5prZjdnnyXFm+fKkHKiHpQmtBHYh7
+6GlNISfhQIE0JFEqgVTJY2PCjSdqaSfGnEmqLQ4DSjuNADRikMIUWMg0ANDIWWo7
+jiRqKEFQHjgUmOrOEemO3Ka6U7jEOdTj+R8aznhqRbeHre2zMloaATntHc/CqDpD
+dkXPiWNeH4qlznXAh3JxoVkEEAbKGM08xbn323JhhtSJYISEubpQeVY5bOsU8bNm
+8N8RW27upZtZclvE4Dbae0fQVe2niC2SXnYyVHrWTpWkjSUq7wQa1x0cyeJLDxO5
+PfZjdS02sMqDIACiBggc8jeps1Mmfxb7SmUqO+6C48sN51nUNvLOT8qU8UVG7NGL
+PJva0bCul+tMFgB9RSpWwB3JPgAOdYPxJxla4bg6xmVqXuE9Uc4qJxEmYxxQyr2n
+rASS1lvHVK2xuOYO/wAqhcescSX+6RJyZoaDbaW3i2kIKsHyG+229KGOLQZczWki
+o4gvFr4iiORG9aXdBUkKGDmtn/Y6bLVivIUpPbfSQM77CtXyrRIbbKpLoW6FYacI
+wfLNZn9mNmS1xG0gDqWmw6FgD3yfHy2rrDTM0ouR0xmhJpfpSHxruckIaE0pNCTv
+TEIragUd6InvoFUyBlOaNJHjTSTijQR3GqKHgcUQNNpI5UQIBqWUOZGKamqKYbyk
+8wg/Sj1CvbEYO4NKrBs5aujtumQypSCJDcgn0IOKl263uKfEuC+ht0jtocRqQ569
+49aPpNajcM8W3C2u6G48wF5lZHeeY+f1pjhieBhBGSRtWPJFpmzHNTdsyNBumkBc
+C3t7brDylfIYFUIUU3gkudY4CCs8v07qylEpCGlatyE/KsFcXcmpTy4zTBcLhUes
+B7Yz3EcvlXJNyNMoqNFpftTk9t5xSm0kY1J5jzq0bF6Uynq3bfISR2VuNKBx54OD
++lY7dZ94nKbWthqOlIAI05Kv5fGrfh+W61BS2tQKhnYHlvRtITUWyPOt7gc9qmyQ
++6n3QlGlCfQf1rMOhwh/iNnQ0EJZZUVED3smsN4imaY6j3q5Vm32bSJzE64hJDaA
+llBPee813xLdmTPJLSNz5pM0h869netRlsQ0B5ZoiQRihJoE2CTQqO1KSKAnPfTJ
+I4pxO1MA04kmmxjyTRJNNA0ud6Q7HqXNNajRaj3GgdmqftFcBy+KbUzPtTYcmRAc
+ozjUmtRWkLabCXAUPNbEeBHMV1hJGuO4j9pJFcgcQzlWri66RJIKWxJOlfcM74Nc
+csbKxupGVXeTNYt/tbDK30pGVJRzIqjt/GER5xDKIroeWcAOdn61cWCcJENxrOoA
+ciabagNNP5MdLgySARkGssaWmehF2tMj3ziVcaMhx6PFCVghKQ+FLJB8BTXC0ydd
+5rrvsXssdsYyVZKz5DwqfLEV9elm1oaOe0QgbVJirFsiOOFITtmnJKqQSdfsyuvw
+VImtw0K7S1BPzroXow4Xj8KcKx7cy4XVEa3FkYyTXMVkmP3Tji2xGgVF18LWR4A8
+q6/jJLcdtH7KQP0rvijSPPyPlKx8+dCaEqpCrbauxASjQk0mfnQk7U0hM8qgUdqU
+k4psq50yXojpNGFCmAR40YIpsqyQlVeCsU0DRaqBjoVRBVNA7V7Vy2ooQxfbmxab
+PKuUgEtRmlOKA5nA5VyYviBXGHElxuT9vbjxpKsNt4zlI23PfW9+nm5mNwiITUlD
+bsp3SoA9rSATy9cVztw+0Yl3ZYVJD+qMhzb3U6t8D51yy9F49ySJS+v4UuKXk6lw
+F8+/QKzW1XeHKS2tKgUkZyk1VXsocabZdQlSFDcEVVROCWpSS/Z7vJtazuUABxsn
+0PKstJmuKcejOpE2GoZSQnHPNYhfLl97ThaYasn3nlD8iar5/CHEiMIl8VtlvwZi
+6VfMmrThi1xbTEdbYJWtW63FbqWfOikgnJy1RmPQbYra7xe5IWQHYjP4SCOYJOTX
+QIV6VyVwxxE9w90gIuLallphlIcbHJYK8H9M107YL/ab7GD9qnsyU/mSlXaT6jmK
+1Y1+Jjl2y3Kt6QnegJB3zXtVXVEthFW21CVUGd6Qq8TRZNhlVNqUBypCod9Ao+FM
+ERUmjCqjhVElWBnNUV0SQcCvKcShJUtQSkcyTgVhPE/H1ttaHG4RRNkozkBYCEke
+J7/QVqbiDjK88RyHWnrl7C2yQShGCPln60noDbnFHSVYrM4Y7KxMkeCVYT/7d/wr
+AuIOk+8XkriW2G/B0jZSF4KvjitcuOxnbWZrs9RkkqShedxjSfPxNemtgiEwxdlF
+145JWc4FLkTY7dLjc5P4t3f62Q2dTmTnGDgjz7qgxGXEcRIk9UEMvo1NDPnuPnT1
+4eEnr0tradU3h5RQMYRyI+Wk01DlezvMylnrRDUHWAr3XEfmSfhiolG0OE+MrMru
+sZS4jbo5ooba65G0vIBI7wK2XC4Yg8Q8Ps3bh95JjSm9Yac5p8s+XKscf4RvVvWU
+rt76k52KU5H6Vn4uPZtjlXaZjj7rstSnHAUj8oNecaEaFrJ7SqyKPw9dJCwkQZBH
+/jNYr0hLdt09qyqSpuW6nOk/kT4nwoptieRLdmMOuannScJS86lLa/HB/nv8qmQr
+ncI0xucI72GWx1bzLpCqp2fxOsaKv8vDGWj+2ru/vzq8aUoPsxBEeT1zWMJVzcGP
+lzxWmKowuTcrNi8HdLs9lP8A1dKZETudX2HE+RrY9g6QeF7y6lmPcUtPLHZQ92dX
+oeRrnBmRJctWqXHRpa1IdOkZIBSBt4b0LLttfkeyQnvZEoH4uobehSdviDTbHy9n
+XWrbbFCTWg+EekO42B1u3u6rjFBwEqc5D9xR+hrb/DvE9qvrWqG/pdHvMObLT8KK
+F8LzJxuaBRoCvNApW/OmIhPyGozK333EttoGVKUcACtM9JHSFLnF6Ja1BmA2dC16
+sKcUc7emx2qk4+43e4ikKQy6tiChehlr/uKz7x8cVidyYjRLX7U4pxTjLgWlKjnW
+BsTj1I+dNv0U2H1sJ69PBxLjqWWFBPcCfH9aRqRCN1uakRV/6ulO38X9KO03BxN2
+k9TEK2nI4KN8bak16FdJYud0T7Hj8Yq947bqqRWV6ZsJXDkfVFKAlxzUrH8NSX5s
+RVxjlqOCQytIGM57OP5VEYuEj/DylORSUhe41E8yn+lWSbktHEFvKISsLJGnPmR4
+UWO/Y7EEafep73sy2mUqKVKSMDq8HI+VRQkuhdsj4V7AsqQv9tP/ABT1jnS23ZbY
+jIVqQ2soUTvkDz8qbkO6LlHmMgtRHBoUDzI/vahCdGddBvHZ4c4gVYrhg2aarU2s
+nHUqO2r+E8jXTSUMKAUlexG2K4kcb9lvTS/YRMaK1NhJV7yQM/zPxrdvQT0lxXE/
+4V4ieVFlIAVBXIVnrGzyRnxFdYNPTCkzYXShxTG4R4belIdbcnOJIjNKPM+J8hXJ
+k12bdFrfddU7dZjmt1auY/v++VXvSXxA7xLxZIml91TOdTAWOyjB/wBPHhyz61WR
+Fty3X7s1lhcdOgtnYgjn8aiVeBPWkOuLZfbYiM6GzAHWv5HMjkPiam3dExtcSS3L
+ypaj3cspSaqY7MWRaXZUpSmXXDrdBOMnPZT8Bv8AGpt0jsLZt6GpBCgrOygeSE1A
+ByPbC5d0uPBG2oYGxOof0rzrshy5tlLTUdp9rc89R50NxhoafuglSlKHVZGdsHV8
+aQxGJNrYdZmqKmmlEDOdIA/+im9gxm1yJ/3dLeeaQ40pZUEgY058P1+VToby4LbF
+wdfebOxbdJ7TZ7grHMbc6i+y3BrhkdVJGlasbpPdg/7jUq9x7izaYcZKkO6nG0aM
+bq7A2/WhE+TZ3CPSi9gRr5EVoSB+O2ckDxI7x5itj2i7267Ry/b5Tb6O/Sdx6iuX
+mXpHtyrQpfUqaGWnT3eXmKuOHOJFcPTEzYoIWheh9oHl6/unn5U+RXIxp+WpMxpa
+GELLTyEIxt609IlA3p77zSNEhvITz09kJJ/XPwqCIjzNrct8dfXSEK1daPFIz9M/
+KnlJSxCjXqQevcZUEut9xSdjjx/4oBOgrDIuBwymPpcj5aJV39obfp9aOAu5m5XR
+YZQT1hGNQ8TRabk7eUSI40IWUoUTuSrIIJ9RTVsbvBkXJSVpz1iiez5+nnS7GqZC
+iuXL7nba6lClLdHZyPE+dXbrlxXfrSEw0haVZ+BOfHzrHW/vJES3rK0ZU8Ry/e9P
+Ort165NXxlSpDbZRHONhzCKVUD/ocBq5/ejg7DRMVB3UO5INMx3rsnh2fbloYWwt
+zAWd9Ku8fECpSEz/AL+kJTObGlkIyCByTUaDGmyLdcWzNUrD5Iwe/SvzoWwDli5R
+o9rko6ohCgAkEY25/UUzcl3GFd48lQQ2nRpOTnJSSB9BTchNwc4XSRPz1atQCj6D
+/aaehu3O4XZUg6XmmG9SAU7BShv+tUmJPQFqednXZcf2MvxmVa0K6spyo+v97Uca
+IZF3dektPsRg6kSAgcx3/SpfD0qepE95LLQBc05AzsAf6io7E6aLXKKmWzrUteEn
+c4AHd/FQxWidfJVsmW7W0ghpx86SR7w7O5oLxHtq7jGQHCnCnO/4UxJurBscJp6O
+pJCsnIB8PH0qXeHrU7dY50BACnM9kjv8qOh/AJ7UBt27hay4lQUAc55b1XxzAes7
+iUOaNMdfzykVZSn7Y394oDesFxwA6c/l86qEPWv7peKkJT+CUjskblY8PSihJewp
+UVKLHFQmUrC1Hv8AHT/Sp90W8xd4yGZOsoU4tIO4BACR9Krbw3bWrZb1h3IGFKAc
+8z5eVVxSp5L11jPYDmUICjtvU3QN0WbU/rIcqTLZ6srcCWlA+H/IqQhUVCnZDUhb
+MoN+8OTlV14dkQrRHYkMYcbUnSCNlK95X+2pLqXJSGLukJT1Q1pax+X8w+H0oIs/
+/9mIRgQQEQIABgUCQrBMhgAKCRA7c462Ekj376HEAKCUodFCAuEGsbT6FuY7Ngtq
+6ZjkRwCgz9EqdZp4yVTIsbyNi6gy+/xmXiOIRgQTEQIABgUCQ5BetAAKCRAF36g9
+FylU9+kcAKC29LbrKQNqdfpAH3ubwmMFUqr+LwCg1e+wJRMiAxmS961/vBcXuaQX
+WgGIXgQTEQIAHgUCQoUBQQIbAwYLCQgHAwIDFQIDAxYCAQIeAQIXgAAKCRALA65u
+TiRRfCvDAJ9UGG/WjOKh2b7Wqmej89+Y9qzwaQCeP4yVeiSLNTJoeyOi00D5SpK9
+UYeIRgQQEQIABgUCSBDXLQAKCRB+8bEmmu9SZyOKAJ0cKiAHYc4N0piJDwT4rLrK
+9lWYbwCaA5qRGLQY2v7WYm3kQKCI312Z1BGJARwEEwECAAYFAkgyc6YACgkQBAGq
+IEbTl//dkgf9E0fm93fa0gJ1f5qsD8seVY9PFS1OguBpvUlsffjpWcfpOkZHQuGl
+2y8e5EdZc+pueYVtr+IjQULHgPkL0lvNFBCETubtjZ7PbUJYJ4k4j9yVFlXpLkW4
+485aJEu8N0lDM55DmeNY5AKBPsOkPDwUOEzpTO5A7oKi1S1MWzTM+F31egoEHcY1
+wzWyrIii2qNA+YVf5xscrfCJnzL0yDn5lcq4xuQXJoVtwjmjacBGs9T7Fixv59yp
+E/EvGS160jt3zMafAuBbN0a5gBwpiEmFedh520hqWVUv42+1houYqY0TpX/fBGTn
+iSMv9FdHg1A/tY1mWi3GCeyRxcP9clIHgohGBBARAgAGBQJIkRFhAAoJEIvYLm8w
+uUtcRt0An3mUdWiOxbi4NY3Zk5gF6OWc0HYCAJ0XkDho4+iEvW65Dvnhuk3GkwHw
+wokCHAQQAQIABgUCSJeJdwAKCRCjiC6/eERvJv00D/49axX1zo7nn2xcc9V9e5A+
+IOIC8Sb9f2r0eAjHA70Z2emz/Rrkfwo3BLbNjlDq26FuCwIFK0J2TLJkUwa7wufY
+H49hLthYbfeZ+/rnEtZd0eWl8tIwux9WZ13ilKP4RZ9bsVO+87wriNH39dk9mGGW
+EqXSbUv2PLwbl/6IUpQp1+lEHiRA/jyvMQjKPZ+iXjDS6Jzt2eiRNnDHKT5aJQ/c
+o0RwnLUcOCh+YG35J5hF1K1n3LuwvTwxL1FYzWB3UG12aObA1VrCugeua6q46O3q
+YhKB36yL0MvQ48k80/AxIgAdGOPY7KgBQDLG5CRnW2WuIt7ZL+R43FmKAOXZXQnS
+rR5/4Xalrr3/u8E0ueXh1xTg1nSg174mNOX5rGkyN/fh8Pq0HJQE59+/af1cu/BC
+zxB5FrNZrWLyOTPYBxKUyYxhVTq54METGpJujmtVupdgRy9YeOdjQhlYjJfIP/Lc
+Cp91FY913BhrmITZWB3QsZVZL2NAGd5DU4whpI9XPFcJLYEe6zA/rdW9qqX6IPeU
+ipku1M2jOakMsQH/AMB2okOFUMZmoh/fZgaAyCC+LXZXvChLVpYOY65qurEwuctf
+aJNUN3b4KLmZu++U/NcTRDXgQSd/Va2xWcjumtJBbvNBD+XxBT3Pme6lteKWEM+C
+pLRKBzIIRZqILSkWUQV6F4hGBBARAgAGBQJI9gadAAoJEPz9YwWYIfey4rkAoI1c
+mi+cSHJHKMPDox8J71N4D5KwAKC8lc/GjKH4KCYPgmJ/cJ6P3TM/T4hGBBARAgAG
+BQJI9gbdAAoJEN1h78jtGEwskOQAoKR3+1NdMrmKZuvnlN6kL2SmXJB3AJ9CR9hw
+nz3qV8i3UBV3YYaxx0+0l4hGBBARAgAGBQJI9go5AAoJEOXTAnP1nSXwetEAoPSs
+OG5R5a0toSXOJ/gJKHut5VXMAJ0cLgkCRc4ImmJNUo4h/jYua/20WohGBBARAgAG
+BQJI9gt6AAoJEAl0VJFYYuqQVp4AoM4Q1tmOI2SYjUUShQOci6kUtmedAJ9XOByc
+i8vy/7GbplvDgso+rsxON7QzSHlydW0gSy4gV3JpZ2h0IChVVCkgPGh5cnVtX3dy
+aWdodEBtYWlsLnV0ZXhhcy5lZHU+iEYEEBECAAYFAkgQ1y0ACgkQfvGxJprvUmce
+mQCfcibucIkJ3zVafgxUiZcFJiI8Q5EAn1TGQdRl0x60Zm/wcxxm5fLj6VFKiEYE
+EBECAAYFAkhFqJgACgkQZ9mySWdPBeDXUwCgsVxdfx/bYO3GCBcYSTJ/3bwcuFcA
+oKrZLpvcIC87G5vP1zz+Q/w7w2wqiGAEExECACAFAkUAzYMCGwMGCwkIBwMCBBUC
+CAMEFgIDAQIeAQIXgAAKCRALA65uTiRRfAiwAKCz59t5GMcxUaXi7xnao1SED6O3
+4QCg16qoo+RD9hjHa/dlRleXaK6ZBjaJARwEEAECAAYFAkhM2cIACgkQA1MNqqAl
+xwJbDAf/VL0svDU2IIInIJueAhKWJsOh8JoIMLwNTYZZeKm3qvLAA8IOVice2PR7
+Y7sJ1E0dqmycN59M255yGFrAREWkpzimrm9SH1sHDkwKE3YCrjxTfZgUNrIlNC0h
+VIE4+yfPRo02f/sDbTIJISV3jWgJ+v6n8Pf60LwCDJUJtO9ZDUzOIfwmEIdiJuGE
+wkn3jmEcvhmsIl9+o8DaotBWSUF262YltdP4OpV78BAoD8xhRKsTZE8BKI5+/wTn
+kSOv3okKbySFQUDziNU+VWphhE6x9nACr1jKqYR1pvjDs6GBoX7AkTY1isOxNEML
+eACmdbpm2v73iE+tZTCfaBqjW1MFQYkBHAQTAQIABgUCSDJzpgAKCRAEAaogRtOX
+/5CFB/4oKJBtWrosbwz0GNoa8X95bQY6bprV9V/Ozy1DR7ehpZevvUaMaG6+oVpq
+pgxuQeGm4RiUWSqR6rtvLyTK9W13di+XrnNsW+685jX5PN4byxa/Bg/Vmuxr3xBo
+yWmCMCBSQMl4ViPqkgVwiOYVOAAKatWXRxo0FcrsFN/ZCR2dHp4RIF+S8/E0BVtT
+TAu7fZoiA0FAm/FIYcyHygM08Z1E0vx96qKwjBIwKKnceZ8ziYUgpfqzLpZ8lFXE
+0Mopizc1B2Gsw84C28sJMJlt5w7Ip6eGyNipPc7qg3DgsLWOV0eXZZ+pduPqFwIF
+TpAupQdkoXJBCdpRA7p1msOdHtueiEYEEBECAAYFAkiREWEACgkQi9gubzC5S1yM
+pQCfcmU/WEY1Qy05hy5TeMiWAgupK2kAmwTTLaCtGHV67JleDsGtyEsB2/ohiQIc
+BBABAgAGBQJIl4l3AAoJEKOILr94RG8mdwMP/3zr/whCiS5Tyig9hpVsp+gqn+h5
+RXaUx8dnVOcWgSVucaug8tY11LrvD4UfCUxW9eVpuEsB+bmEedKupR8SWPlN/+eL
+hTFaSolWqARog6Zl1pBnSphJUlM93C9VnVY1ePGF6ZWkeXJiu11+53GU9HqBqBT6
+9liBPBskXPhSmhaY8Br3RQkBpGSqUdnhdyPrB2w3k929jsx8plh3aEAhStGq4ght
+6EpM3+8f2Q2AEtpWA0Kc+wafJcT84Pr+JxRzwNAuRW3WaKZ0PlmFEuBprdwO/AOi
+qVIVi4GZjOwz3MBEalOgLWgvr9ipapShjk9qzvjLV2/I6J1cdxYu+DZDIa/3urVo
+ZZ1U83GrEBTB96MTwcX+bysrzW0+mEngCvXUEKGgdkQq4dNJXp5ro9Ns4/PK+Ay1
+81C4+L7z47MQht/q9rCNXkye5u58vqrnP6grFsme27SBZvXvAfGhSEJOmTsOn5qN
+0kBvv06kFUY1gqN+R7H5NprGx0zXgVipXGDZSE2cWmMNjHaHat8/BXaCcSbmBRo9
+YiFYKpyb4ddPTLE9fZF4PPKzS4l06uJ6DFNXfs+AM6tz+4bvKHFVPwR3cxOrEPf6
+jgD7M3CIwCPlHxxwGyGOvEJ5Zt1NImb8PDTxWvo0EifQybAYo+yHGSPzkdQ4N2lm
+nSPqtBGNKzh3yiNSiEYEEBECAAYFAkj2Bp0ACgkQ/P1jBZgh97IyvQCgyGGc+WE5
+kRAxMU51eSVkCOWBpt4AnAgGhxfQvqMdEnkprjOEztYh63spiEYEEBECAAYFAkj2
+Bt0ACgkQ3WHvyO0YTCzs4ACdFDAAUaZZVuMsUzYn4xmjcnMbbBwAoJ6dQNWndZNy
+OHZdpTUgYWqDRwCtiEYEEBECAAYFAkj2CjkACgkQ5dMCc/WdJfB5cQCfVYKCfavs
+852lL/bEJImSJkZgNzQAoPWd3/d44TUQNLBpBNJ9lmU1JTnMiEYEEBECAAYFAkj2
+C3oACgkQCXRUkVhi6pDiGACeMIvSlZ+6V3k/bPd4PiOxVHvCtowAoNRLO94W5SdM
+AHZT8uSJomLJoAhCuQQNBEKE+fkQEACBIJYHTcX2bSB2vLzMdGDxMf8gxXBwn7j1
+NoQWIMGUDg+IAqGFQ9EImW6dDMuLXTGO/f5CWD+ZssGvlObG51AHaoHMeSnwAEJn
+ORIITTwiXCzdo2DY45lxC0rb+SOhnZO8zSqQKgkV7yZaE5whw7AhrmQ69kb0GkWI
+U6XoBYWpyLoqnuJ/GfYxjZDlYvU2S0icWWORFoSMD2hyHfeXm9dXFM9S9GwG1yZW
+nI78QZXdOsIS45HkEggCNS0q3jNvVmdK9VBvH9lXn1l62jKpRqivNU8VLeACi2jX
+GGQX7edFBKXqg5qp9vr026RGUUvmjBbqKlt1CzatsRAsI9Wbeyx81YoLpd9J/0oo
+8vKBQCZnOzj1fg57iWwHeAuxFUIgkefeAbvkjpozQUIGdc5CT/+V1J72mehsEdoS
+nLZOB+sF8rgl515z8Aht4wKu942Iw8EBBACutykvOpIIj/qiybxshJLlHr1jNfXt
+ujc9ECivFCMuFgT2AChbQ6dlSnLPbiAvIYDtEHeFyPOaTu0ZaxiMx4j7t3Xovmc+
+n2L8I01A2TR/FZ+GQUjI567lZ/2B+rcaso+cv0504MKbTfhXW66zh+ed4WeuKwHn
+2fjjbHh73hXqxNk4vdRKUhnjRlkoxQQXnTqcoyp2YxWzEx5EFXDL0+JGj6o34JPV
+UqANbIRs+wADBg/9FtEDhwoO2zyPqjXQn9V8+Tk7KIHq1eKB+5R7y4vn+CzjvjHE
+fdOy1v72uWfLdJ/fWuZ9Crvf5CJ9SYahWLkwFG60VcVhOMB+bnhE2R0/eg+85Dso
+ujQtuzh+PQKH+5zO4MG8eBP/F2/P8pxBD7SCIzlLokGvy5iQmarTPCTAIGP+X/VZ
+t+Qs+ZV3YCN3nV+RdyM1pQuQ7Tx6o02QG4CnNFZLGuRNMPVM6rquw78bb4rQQ0Q1
+XtOmj+wBSbLRpuNGUYvO870KnHd337mty9YYOjo3oaFGaCjW+MhfEHxJUfPzKWzt
+3rMA0Tvgt+MZaX1LAPLQ9QpLJtOsfnvYZS8F+ugH7o04HsVws8lzQFmdw54JQokU
+oH6tJIM1E7UQ7Fmq9sINQV5udoeVe564tjrRbti3Z5lSVNN2ovCCWtUUsKABm2Nr
+9eOpkBbYgwq4czSBlR8kLZLlS+HEJzKiYYVJ2DmPB2SWWRIwRPpOLdREnQmrcaes
+50qx4YrvwL/G+xCngNWKv0WlO/u/EKGAEfKo9lHOfoLXGVGeQFMmE+LBxWVHPD2Z
+PX4vvWC7Ol5WcYydErvzvvbapE5ZshnKzoGnO8GjP41f+2DTeLoTeQW3v0T132VJ
+M0NKhYVZzMpA+uOxFIE+0V/gwGAZLuqjPhWZCFF9GzrtqpNsoxQ1s3YkYE2IRgQY
+EQIABgUCQoT5+QAKCRALA65uTiRRfKBBAKC0hKGj9VX8lpLmSN+0yT51GdPNfACg
+we0Xm/e9gMLK7f+f/6bpnFV5gFGZAaIESAyprREEAKzc16KgAgsVWKkA4vjVQg8U
+hLCPKoY/JHBingv07AV2v+Qa/3jX89+2WXC70gfjWI+rgA48/2ASiqTDTL5mKkkS
+OH3Qs6Cdyixeo7PskMh+77p6qpZVL+sO7ebxGWMd5HkmmGAYYAfla4pASMlm6jBF
+NX0IMsdd4BvOgRAP5GjrAKCad7kD0zCRWfA9aOqO47emhiPAqwP+LaDq7j/gV4aK
+1OpX1w4Tt1ZeJv0zikVzG772c3fSQIXiHsddnwT+U4IdyFCaEom4Va0Mo5efP9vf
+tErtWFbFcqzjXuUnC9XTzAmnBcq5EIMfYZWwfuerh1EG9JBohAtOKQZX9aoQkXEI
+wCQM+7hq+ep70FcUoPXPurtSe79DC6ID/iyyVpgXgiok45xJ+r2Ev+eD4H10PPgf
+kcQPLRy2d6X53BfHnRz2b5n9igLT9+00J3SLeJRMSNjJkTx4hV57sBDYiCZX/h85
+y4enxfTVhDjccLOyIEpddIHqLFt4DYc3iEKRRjp69XgMUHqP5uBfbOdSYKB6jWWo
+bwwODijv+UmptChKdWxpYW4gRm9hZCA8anVsaWFuZm9hZEBidG9wZW53b3JsZC5j
+b20+iEYEEBECAAYFAkgQ7U8ACgkQ5dMCc/WdJfApgQCgs8nTivagpoo0KxnG5ILh
+wjkR+ooAmgLHIrr1yH0OvNIrgWs0TTo/hF//iEYEEhECAAYFAkgRwAcACgkQokEG
+qRcG/W5W/QCgnV4qfirh7DcD34uvEduNTDBtRUwAmwR0BHmSk8fZbbcXGGKHu+EC
+WuDniGAEExECACAFAkgMqa0CGwMGCwkIBwMCBBUCCAMEFgIDAQIeAQIXgAAKCRA1
+HzPkNT4lvH/IAJ9RrZ248gVd0p0TTnxcovH77gHdPQCaA9IU8PYLY9n9ICzDntWO
+hmlT+GmIRgQQEQIABgUCSGGHMQAKCRALA65uTiRRfOBCAKDGkTqj5luV/EMVZQcF
+RQMUFOQMeQCfXrxOLD/nVx2Ivh8YqllJSO5IniuIRgQQEQIABgUCSJESmAAKCRCL
+2C5vMLlLXFWkAJ9hxW3fbyiUYimuO/O3EEmK+m9lIACcCCbN3d3pYtxZWLTvMHyT
+muJ0S+W5Ag0ESAyqTRAIAInxnyc9MMenvr2QlJIoBmotgfAfWAZKX2P2Pw6Plbbs
+fJwxYmEj6z2cu6+HAh6+ROR2U0xAJJ2+M6L/TzRDy/vkNGBnV5oCb43Q2MLfTWQR
+rjCj7kFcwqwpxSjd0AZID60TPKlBukBaTDgPho9CShX0vGAmI31+I0dXh+Mr+g7E
+ElWSbGmr4zyCyMUONYsxAG6JLYPBVe9JkMh91MORNk4hsqJQ9XHEqyYXDsRYeGa0
+Slzwxw7zbxDqyCEFw9s1lsTwfvWoBct/j0TM2a3z9oSXAGkM5EoU2HraV/Fwe7TF
+T/KwJzCE4NOo7ESsKg5bCiJLRgR7Yg+eN5EC2qffAIcAAwUH/1BptDs6D0QLZpXT
+macr9VO4wtZcdUl+9ZmtfkPg0VfFZY2Jxjvl+jnDclGAcxn2PyYHksdp2zY6xY/v
+LGY2HvbYMcoZZvrBd5ujUD2PaZcL0L+2N82zO5R7P0gLD+gaeHPNPAM4HUwf5C5W
+DdVbuut0vsIB6ngHOLOXrDJT2GjYeeuJTjIZRsv+A++I1MktlL2faLlwtUfXcnBC
+ZN3S3LUThalxHfHyiks4AWyR/rdSlaAYCjSBKJqdpZvKqITq9K4yl5cA1l1ee/AC
+hKkCk+Hpqrnd7vjkBkUrmZJiJQZmF8avYTPU0kPABem0B7pHg/KaC3uXEeTvGS2K
+OLu4ldOISQQYEQIACQUCSAyqTQIbDAAKCRA1HzPkNT4lvP94AJ4zQm/EnUjsyrp2
+FXE58WTUbxUQLgCeNJQTTBWAYIIkvdjItdSqbsYLwoqZAaIESGtr9BEEAIkK03JX
+KLz6IfjnOYeXDu+dTyKmhhBEIimMq7x0MOefYnYCCJBt1FjezqMaaXB2TEPnUvmp
+6OI5adEwltzqf3QPTPVTt7S/0FvQXQBo+PFL1plfGn7Xf7aALdtYuEMBTnozFaSR
+fGq6Umxo0A+4w6fAZLzzmHP1U2eoTeX6hRI3AKDFlgzR28dDPCnxLImuyEhkq6te
+fQP/Rd7DFhk8To+WzhKzoewkKPi/fsQhUM6Xvw8JIwz/ySGlwGrN0Ozl1sw35cGX
++2aezQAhcm2laNIprfDw0ChapuxPGYmUYJLo2I/+VTa7W17jtesjSlUhoD7VRXXk
+8eptYiGG5ZT+B7XBYdEUIF2ANw2Btsy1Ah9XMlz/sacfX6cD+gLr6lI0+NEo02YY
+zNFUqu2BLhgbQw9RgCtoj4N63wK+S8/lXcgmwLvjzzXROhlRfuQ7UnGBR92g84jl
+wMnB7ESXJ4vVxbbO41c2cELwJfCeDzuZgMQBBms4Za/fDtFUOEj+/NJw2ssFEX6/
+KIhTS7Sv0Mb8Hz3HeteZvn1ajBuxtCZTZW50aGlsIEt1bWFyYW4gUyA8c3R5bGVz
+ZW5AZ21haWwuY29tPohgBBMRAgAgBQJIa2v0AhsDBgsJCAcDAgQVAggDBBYCAwEC
+HgECF4AACgkQ9o1G+2zNQDisNwCfX6ccRBhO/mRdtB+S1oKz3DIytIcAnjhwYaP1
+XU9JltPBKJ1itfF5eYs4tDJTZW50aGlsIEt1bWFyYW4gUyAoQ29sbGFiTmV0KSA8
+c2VudGhpbEBjb2xsYWIubmV0PohgBBMRAgAgBQJIa4RdAhsDBgsJCAcDAgQVAggD
+BBYCAwECHgECF4AACgkQ9o1G+2zNQDjd9QCcCqLj0WcQcWkU1XnfDruYUohhX3UA
+oIu+X7I5qV4dxmwIuLTfsJM1Tu02uQINBEhrbAYQCAD/2ULddAoEH6nNk7/Ja0mn
+nhzhCyo87gWVtk+UotTlRcb/fANU8i3oKGCUpxggHKQkar+gP3dRQdZI3297b2b4
+prS6EavasbCZI8QAkkFpkbaHBsJRhyypxjldO1VqkBt+UBAvPQhuBhVPeLmzOJwh
+ZR1oClBTpPDKLK0tKLOd7JjOrrFfGayytjlUteqaqPd9rYTXODAvu4TPIdYVJNaF
+OE9eLqdxvzOsJlki4VBXan6d9aTm2FiqKiYgqzeTEI0q5h9ijbmNtmL8fRlDRNzu
+PZamHpV5FGcSly8a8t5p6OFgIwfPOuz2K4jsCoC610lV3w3dG2Szu9//A1I2mNz7
+AAMFB/0SvfEogH7hfB8oGWmpy/98i6ple5sv8qN3uL7NOBy45NkDlnIp+d32SkE7
+zNbWeSdlCjWEpBfumDQ4PgJCTn1ydh2l1rLeS8Sh+x2J2TM9qlIoMfFXjjwntGxJ
+zpBxrUooi5b71u4JBGKsfGuHcDJRxsM9BxvVcBL19kXL38aYbEKojSPkuKiR+iTu
+mz4bQBRQ3dLiLkEWlkwX2BJ/sUwtmT/mB3qP5KsuY1CWRpZR4siS7L2WaHN0tDPK
+8tfnm6OQqVSOC0/CDDTh0W3LPz6BOaIwQH3Lc0zi1KSXgTQDQYFq1O6EXu2Ipdhv
+ygHd+VKr7F1gfTaJXiTn3Jy8uwcjiEkEGBECAAkFAkhrbAYCGwwACgkQ9o1G+2zN
+QDgTmACfX1hI3gEyT3L6Suj7SjBvJ5x5C40An0qmhjIbHCWnnBS8wWdwBB/+Gxlq
+mQGiBEjvQ+kRBACuegU5uzlZnaN2ee8597GfxfpQhwfvhSXZ3qxdQFzRL0Jc9b/K
+AY/X8eT8jasucwnbLY+W3pLshMWwGR2sco7pIzws1s/9vmntu7zTnV2ICTyK+jGq
+jtZN7htAbwzzvgoaO+M8vpB7XX8FTTfQfalh85p+oD1sv01tTJbGgAywBwCgzMWp
+pGcXfDCWJkiit6m99gnyRJ0EAIffCo+n90IeKuJ6yIEMZO5jn07S3+k5N6LojpJu
+8nRaRMlpwofUkI7f4SI11r8gDRUzMLypSf/krOtdLWraQPKWyLZVtJLyZbrUVLMC
+8vLNnqCS9QXcD7rTcGZiKS9jLLff54UCzcDV2mb7P8UGpQfzNUkzWMHC/tJ+PNMV
+5ChLA/9p0OqCCHnZ18wNI9StUj52RDtTeeNrts53tGPAsy18p3U3/HgG3pgt0ytD
+7uAoEMX9uvuHy++NkusPmkG82PESEhGy4EuYsuMO+43S81EZPojbwfU45Rf7/a12
+rMRrQynu0gcR7f04DVCROBgXwHSn6KfFQZxGkLtGillFqvlwPrQcQmVydCBIdWlq
+YmVuIDxiZXJ0QHZtb28uY29tPohmBBMRAgAmAhsDBQkPCZwAAh4BAheABQJI72EJ
+BgsJCAcDAgQVAggDBBYCAwEACgkQ/P1jBZgh97Im3gCfU5oP/Uc02PGdhHV4wBnf
+CX0w5tYAoMPZeIXZllPv6NTui9XPOLeS/ss2iEYEEBECAAYFAkj2BlUACgkQCwOu
+bk4kUXyt6wCeLl5v1SICOUTmgC59iGtOjCk3ZLAAoIJaoEvaU/whYkr1RWjlvjgp
+l/VntD5CZXJ0IEh1aWpiZW4gKFRoZSBDb21wZXRlbmNlIEdyb3VwKSA8Yi5odWlq
+YmVuQGNvbXBldGVuY2UuYml6PohmBBMRAgAmAhsDBQkPCZwAAh4BAheABQJI72EM
+BgsJCAcDAgQVAggDBBYCAwEACgkQ/P1jBZgh97Ki7wCgsXcMvXSXbmVs/rm8qfAZ
+yxS86/YAoJXXlRRHYWX9kJhBg50u/J3o1ftHiEYEEBECAAYFAkj2BlUACgkQCwOu
+bk4kUXzyTACgod51pgh03TB/0Ez6JKZKCIPEcDIAn3fVADue+k86sDQXry2DfdZS
+cgJEuQQNBEjvQ+kQEADJRwfdA8XylMddVes3PdlQPUBXBL+caIEyTAEOG0b9iCQn
+1t2SUhB0W4P1SZZv3TyLEAc+v5yCwMXexsceybc/8FucD9dN3XoTgefrm+L+2ZWT
+ElNNHoCss0sXA1PwkaIZRQoK3itgvvo/4FK3KEH3j3ehWjf2u4kHk6/8Ehsxf9UJ
+SxbAut8yhvIggYZLVeEIuBr+bL/jhfhBCG0JWTZDu+0Yn7OffOiQ0q9TzvHo6xkf
+O0P3jFpMoFJhL3p7LlpCY412cG0v3QFUz/qEhdBeljQMK0D56+1Ybni7gtqqfP3M
+Y296oZX4mgn5MaO17FXd5a0pF7sgUogk46bKk3yC/eJ1f0dt3zeNnf+CYBkv8W/b
+/R8/Ef7Sd7/Y7+RyTB+38o+rz3qUVEolvzjTSkXSLxlpctHTvYEvre2FT3XekQZJ
+4YURz1jCNgvNvRnoJW+joEsmSXmGQuE0WadA9iWCTaKGWy1qpbJZkc2TV/2+wDbp
+9DLeeERZB+1412lPd/m54woiI88wCQjaHKskuDECOgsCmReGXj6qsARlDdYY+Drd
+5KrU6q7XC1fh7YkuhAkgqnEuGT+JYegvCka/t9ByvfhbiTvQufApW/QARw0l9lG3
+sM6qilJLe/qXhMonTwPi7k7rw/svi4B6oTXQuVY4vh1YqlH+cuQGPRIGFRstXwAD
+BQ//VsWACuSxvIR5WYcdJeTWSDc/0O5pJjm7uVhR7qzMnu5ksOMmh409/sPY1bRS
+fVLoeQ0gHripR1iNiP1RwwzBfEwsbXYqawG/D+0cMQUrV+MC3mlLzQPyZo6lN7YG
+gfBpL0DX9xaGRlbcW4ESqNqe0/9alMJ2qYC3pqnlfxcyQDLbkaEawKnnOy6Ib+Je
+mcCWt4E4KYBO+BuY3On0bZKjUM1YVsoZnqU5NiHpsgnW8JzauoAuPOA0EAObbaov
+FPW4uNKiokgfx+3M6nZkF6cF2aSYIuAxiJWZsQaWr3V3ZrE+gajhsAoar3QpuX6v
+twfhhVT9HpeA3qJWqM0XPA4kYSTjKnxjmwU1k3RgwB5cdPv0rZlisu9ainOXrWli
+kTIxx1hSKkScE7CrHDesmK+A3n39zrs4uehF5GZ77cgozzOADOGUTA4wBjBIaW5G
+grSxODVV7LjUweYo+kSv7BfE7SJiZBYAKG+vvueZzDzB29hajv94hmeCnf0sHXZi
+g/QVbipVB2WWX52mDQCAYDUPw1QGuvOVEEf5zEaJzlkV7iCTgSJNneXLI8mdkWoj
+sPUaL3GRZotV1G1egWEMbf7eaxde3+MPRBb+KOS286eJS09T0fmMfHsehK5yozUQ
+UpXJSv/g2nWFwTLjWHR2ao9YXkJGmSNlnJ8FedM/VmqT6XeITwQYEQIADwUCSO9D
+6QIbDAUJDwmcAAAKCRD8/WMFmCH3souDAKC/oZKYMyNfnhB/Egvw7r07ytSOawCf
+RJgB2ez/0ErpY0xtDiOZBsTKDViZAaIEQgTANBEEANzJ4mk2Pky34VuyLQ0rqh8W
+k+1In4GeBgovIOCG+zhdVEP32J3K/gwHk8IERV+6EYWhWxMAM1jybfQO5c7y90PO
+T1Ppo2Ygo3CMpTHapf8qBAvMkLhhkXUvJH6NNDkQNJ2XODR+ZkW2i8VN3sbilf+z
+/YvJSuFofd+9Iw5I8nKXAKD7+q2AbfXMbdBQQ1ob3S2Bd4TQrQQAlSNekYg2Mgu7
+7Y1PwEiLZkm2PXyHITuQP/5DcgBqwodwufvduK2uFrG3Y49Ci1xd0w3yDO7s/BnE
+K/kZb7qkI5k2MTpDqazDSEskwByIT6thkxunTtFTFVloeODXWtHpeOJhLG25uDrP
+6ncsDNF+tRJmaXClkZXS7O5Qtw0ozi8D/RZqnUOW008+SHLbu3ReWaDiX0Cv3Rrh
+7FhoA74WX07XGiq4i5ZYc2xSVy8F1ExuZ/msioHly3iWh5OoNO5kWzPQ/ztEGDJK
+H3uTG+TD8qmzJRs8sj5q5Fz8fo4zyI+9wJbL8tcUWXm/ygzBz1S7G+MPPE0dVFOe
+/j1dgMWHL2HStCBTdGVmYW4gU3BlcmxpbmcgPHN0c3BAc3BsaW5lLmRlPohGBBAR
+AgAGBQJFr2laAAoJEP3IV8IhqMf+NfEAn1oQI2jsF5QEd7gt4jOStfEz4qVuAJ9S
+x1nqSu7yLFnP+GIwZOcufD2PeohGBBARAgAGBQJFt4xkAAoJEL/RtHLzHeN3n9gA
+n3rYyKNUzMsoIUJnw/VIOr5T6L+XAJ9/k0D7vPh3sPw/YrJERc+K8HdgbYhGBBAR
+AgAGBQJFubHSAAoJEP0dPnAKYX/5NNwAoKhFdOPNTwa1qiS5O+YNXx4cOnxZAKCB
+ftoBtAdSDTqjChX5MsheWkbm5IhGBBARAgAGBQJFufHJAAoJEP0dPnAKYX/5O6sA
+n3ardHpgd+ctkaTgxmCvEn1sJ0PrAJ9UNL2DDFLOcH1I4WpL7BQjOlQPS4hGBBAR
+AgAGBQJFufHNAAoJEP0dPnAKYX/5hM4AoN/Wz5RbG9GynRh6Tf6EBT4FTSJrAJ9T
+aA5sWGAR+kQ9ENvSs/+WI3YVyIhGBBARAgAGBQJH3YERAAoJEJ+QtSLrVZzZ4vcA
+n2MEceXztqa9L8oaumD1KC40x79lAJsE5N7+smSaz3JfPgtEcPBwVHCfmYhGBBAR
+AgAGBQJIaqFcAAoJEBiD0Q7Fqt+uQj4AnAt4cOMwJJjgoSV6S5cFO3TUK2X9AKCb
+yJQORe5y2OEiBQXkILoTbGfSV4hGBBARAgAGBQJI9gvlAAoJEN1h78jtGEwsdQwA
+n0ut8afs5rwCYo1ZbssJTN3BTD/MAJ9btALCqpAloxEckmfnpJ9+pcRKBYhGBBAR
+AgAGBQJI9ypTAAoJEAsDrm5OJFF8uSwAoIaYARagVuWiyNSssn70ZxZRToFVAKCW
+h+blZuLjqHC5ndU0u1j56dZlzYhGBBMRAgAGBQJIDKtxAAoJEKJBBqkXBv1u4KIA
+n1tR+6intFT3/+UbBAM6Rqrag1CWAKCVNE+E+RWhbHfKCwz5Lc4vfojuh4hgBBMR
+AgAgBQJFqnd9AhsDBgsJCAcDAgQVAggDBBYCAwECHgECF4AACgkQ5dMCc/WdJfCt
+wwCgmWm0mmPx2IylYz8OphfF4Hwz14AAn3nzFvCuFOpoEt5h9tS0KW9tEJHHiQEc
+BBABAgAGBQJFt3/9AAoJEAt4MvNz1i1BRGwH/3HR6e7359D8OZQpimHJASC7atwN
+zNDCXzWmfKfUGHvHb5B2Rwvr1+Nd75+RwmPzzDBrbyS/iwOTPf4jr543iukCtgYj
+llc1II9LYAUH7JUbj2MMJSw+UByG/+XRChOywuX1H8v+UhFu0aebzuGvpshFbLf9
+qTSc0lx5AF/YStCHZ2NpJTSlU+AvP0P3ZqQnUKyV8kXk+CmMEh9hs/WYoCNvHS/6
+JmFQFnSq3lmydtNU2jeeNR+S03oHj70HBsMA7MZOEnNubLB1rcWlPvadyMjMW8oe
+KjSS7cbV0rWbQgy+DaYmOCH9aRnc0JsI0YyuVK8lT2X5hoguA1YdVYqgDMmJAhwE
+EwECAAYFAkW2eAwACgkQkVxXCWkFxI0yDQ/+KFAWS/UM+o+ayCZYHs5bjD2uQZ+X
+fM/LtzDOOcxi8FtRcrnogf8rbZABxxVn9wIKTK+EVOR63l+XRfFcA74EQXGRdbDS
+rM5OB6jfe8D5w+dicjRnn/x/umKrZFVuRwsS1BDD6ReQp1NcJADdqHEvy53YKqwc
+KQtGHtkMEq7U5FdFg7d5lNGItUJ6h30EeGiOWkpGuPuNxVm7qI7vy8ed/w6tddfo
+M8ZuLZC/Y7fH0a21XdyD+OzHc1axY6IbAGJLGhyg1BsLgr3kygbTOuqWFuI3ebOT
+oLM4FyVjpmQ0HdQQl4gFrI4xr9p4oMrcJoS5ctOp8zhk3rW9R0rmzbFG4j7MESKT
+De6PyuEqQ6Kyw4/gz4zZ5rSPpxJm4XnuIe/9H1LxLTb7QiAJNXl9lCHxs2Wr1Akm
+G+MYbD21CFInUwQoJHbepvy1QgkSli+MszBzeP/QQPKKTCjY+9u1m8Q8CplsxiyF
+SLRXD+t93yvB8jy9PLTf3n/e7Z2lvadP2vz+TsndglfRoK5ztKrlMrJeXENjmAOB
+pFUMSdADuwM/mNUxnSUQeRjTiBtlRPwF7ekLOpgTv721JVCnjf1DJbtNDaDKEAsf
+A/KeKspOCPNIDtTC3OyWlMFyckKEhNUvLbG5H2LagVh+fVpd+c6nN3ku5Hvd87DW
+MJ1Q8Xo1VdgZx2u0IFN0ZWZhbiBTcGVybGluZyA8c3RzcEBzdHNwLm5hbWU+iEYE
+EBECAAYFAkfdgREACgkQn5C1IutVnNkHkwCfZ2cdoXII9GOS7Oi09t3sGTNYCSQA
+n2jlXClFCMGIDmJKrtTtVUMPmocSiEYEEBECAAYFAkgt+DcACgkQCXRUkVhi6pAk
+YwCeIg4J9Wq73DFhiqLkXtZ0k/HM/4QAoJwtBJqULGvZ5zB/CgLL9ykoeYyeiEYE
+EBECAAYFAkhqoVwACgkQGIPRDsWq365s+wCeO7wPP06ENRcPwiAEq00UIdtWIUUA
+niZfHLLKozVj3OgYKJgOl4GkhsZQiEYEEBECAAYFAkj2C+IACgkQ3WHvyO0YTCyt
+aACgkIPKm5yz8U4Vm0f1/zmn9VAkgp0An1mV/PWhRcg1+O1NtNR4j1ogsVd1iEYE
+EBECAAYFAkj3KlMACgkQCwOubk4kUXx3mACeKuOmK9lQz9Y3exsK49ecOnJ4H5YA
+oOC5+4RTWXe6NMBasc7LIcg6gIn3iEYEExECAAYFAkgMq3EACgkQokEGqRcG/W79
++wCfcF5/BNYKyL9t2l7yzFbNHvQyJDIAoJnMr2hZvBWJbMIBnIxWM9Lfue55iGME
+ExECACMCGwMGCwkIBwMCBBUCCAMEFgIDAQIeAQIXgAUCRhjsSQIZAQAKCRDl0wJz
+9Z0l8BhoAKCpkmNLfXGKviobU2Ykiv4htYU8zACdGQuZez2tkXcgFeaOJvYvSvLQ
+dQy0JVN0ZWZhbiBTcGVybGluZyA8c3RlZmFuQGJpbmFyY2h5Lm5ldD6IRgQQEQIA
+BgUCQswuOAAKCRBr47eZZ5Hvt367AJ9Q9zvAtJoemumex57y74G1n1va5QCgizmd
+edYsMhq8Om/Sg6YGGzY/g5+IRgQQEQIABgUCQ9+tSQAKCRDMwtcNPw+twCWgAKCn
+Pigk81KR0ZY3mIsfabEAR64lzgCgg0KVnWRYMvpdv5PV/e+oTsh9HluIRgQQEQIA
+BgUCQ9+9hQAKCRBMUzYRwfqC8ivmAKCXhllij3dNa3acBJeegjTTZJs+fwCglvYN
+rZf9nho8ba0yCWOXEXHBQvSIRgQQEQIABgUCQ9/QjQAKCRCaPro/9h9z+PklAJ4x
+cCwR990MxW0l7Y/9H9XghShuTgCfcfDaRXdQC4FxsbYNumpQHVUR5KGIRgQQEQIA
+BgUCQ9/5swAKCRAucwz1/xoJeVumAKCSYnX/Ejrz86+U0MKeVEtG72PqAwCgnAKd
+q0HiTI10PmrBOopWBCybsiKIRgQQEQIABgUCQ+CX6wAKCRDia2qTRYe2naJQAJ9O
+UrUl/rO+kfGdD5ZeIEkUZ1rSCACZAb/do31CSQe8U2PEPB6nMfuBV4eIRgQQEQIA
+BgUCQ+f8GQAKCRA2wybwNHgFJ/t6AJ9aN7Fwh+IYBNF/cEOJC6vxKS0mJgCfVv4G
+K0aadXmNX4skqvQYxoHNYpeIRgQQEQIABgUCRKlPNQAKCRDvoUA7sZHfbt6WAJ9K
+gF7W4Ixpc/tOdclHpKFqi52uUACbBmTLzhw7pMS3le6IJUEn4Vvj6ByIRgQQEQIA
+BgUCRKmFMwAKCRDQlYDHiryu9fWfAJwJKwuVD/PFawwfH+R6gIhlBL2hswCgl1+L
+Ndbqm/EBFRYHZhTGvrdqiZeISQQwEQIACQUCRa0ACgIdAAAKCRDl0wJz9Z0l8Lz6
+AKC3gBE82BP261ilhsmJYNOreckHfgCgz5ANRyKbVufxXgCn5DODUlukkr+ITAQQ
+EQIADAUCQyR5vAWDAqKteAAKCRA1UKoRZ4IrxGbWAJ9HPG+V/8lHe8ltEdLrSKWm
+lPiqYACdHobNkwn+MC8MEgDN+uDJPreZZg6ITAQQEQIADAUCQ9+seQWDAed6uwAK
+CRAQzgVaBP83Ry8HAJ9hafaCP8v8/pNCrQjuv75PLG6AHACfeLgv0oGsXIwduYs/
+wVGnRkM5y3KITAQQEQIADAUCQ9/CoQWDAedkkwAKCRA9r+lkh99FsufkAJ90YJ5c
+fHf6uAEI1QafofyTRcEw6gCfZSp6Y57O/0lIoDB9c1NX7b4WMkqITAQQEQIADAUC
+Q9/DrQWDAedjhwAKCRCOjVfY0Mwt6VDAAKDImuh23mJCY4D/zy4t/bGnYzr/EACg
+ppZxwUbJljXJATZPyc5bX8KsTD6ITAQQEQIADAUCQ+D1ygWDAeYxagAKCRB2dvgW
+BTa4beJHAJ90RWApisYmZDI7FKmjHWlbZdKCdgCglOIdL4CWAJRTAmiWlMhqNO4A
+ySWITAQQEQIADAUCQ+KJfQWDAeSdtwAKCRClynS7piaN7ToBAJ91t98UqNu3eFcC
+bIniFOo/2bXDgwCeMbJduarNqkVCSUszRc3eM82AShGITAQQEQIADAUCRKo69QWD
+ARzsPwAKCRDfTUfGNGRS2DhZAKDB+BpqFmqSbQOFxT0js72f0ivuSACfWsv4JHvH
+Qe9KvfG6PfOIVub2OoiITAQTEQIADAUCQ9/qMAWDAec9BAAKCRBedJJsEFCinGUM
+AJ46wYYrHQMcc7m8MDlUT8yn33GYDQCfYFRmBSP+7npC2DVNtALu5pGfM4OITAQT
+EQIADAUCQ9/uoAWDAec4lAAKCRDactimKxksdW0zAJ9vsa9XhFhuXdH5H2H1omZ1
+MtDYmQCffCAkAqWzMY6ylKKp2wTtsCj0Ty+IXgQTEQIAHgIbAwYLCQgHAwIDFQID
+AxYCAQIeAQIXgAUCRaKUnAAKCRDl0wJz9Z0l8P+GAKCRhmlSgtG9fp7YNHRl/aI5
+wwB3kwCbB/AeJ6WDxy9Pf9GEAEjx5uS5dUmIZAQTEQIAJAUCQgTANAIbAwUJA8Jn
+AAYLCQgHAwIDFQIDAxYCAQIeAQIXgAAKCRDl0wJz9Z0l8LFgAKC83VjjaqstIyjO
+k0StOOkv+OgfwwCeNcI07squPYyPx9pkxVp/B5uZWZiJASIEEwECAAwFAkPf658F
+gwHnO5UACgkQjj4ZeCrcMLU2BQgAloeLEDkoS39T5nzRgPFUvLcTiUOhRfwxOI+S
+zDdCTZBHL6H63Cz+sxIlwLTmTmZ/5vyG1kZDKJCYgkH2FlNlPAlQMf2/8F/rTh8x
+jbCJPp0s/fGp2Oz8KzqRwXMvX//sb7kKXqmNsT5VUZ9Gp675S0/AIjfmR188h12Z
+eC5rB+mp0VYeWad+MrO4OPjrBKy/wpb5tajXD4bWmPSh8/wQkfnC8ux0KNW1ubxe
+GGPCaOJR3bCMibGlzXDPoJIG/WThgjdWHPhdlPmTabqH4hYClIQq69LaMa7ZWBY3
+ohhX8jUgCLsFda+nxccw2W1a9RTUOfLD+H+HXQ0ehCHQayfqhIkCHAQQAQIABgUC
+Q9+0ZgAKCRC5SfsfFO9LRG8bEACEuD5Uq6yJjNMIOKd8KDbAwVX1Yhdm8watqCCn
+Gr/EX0iOG5cKgBW0Y1drameKaJ08dJLgZ9m4d1j4newJO6cRy9q54+NWucxTej2l
+P2LkBoanyNucX6jGTW1mRW8jpaJquPDKzo8ZF4vuiTCeEINNyNGFoQFQwgAHgitF
+QcrdOk4j93YcxXpEtVj6UXIqEankjO08Bu5np1SLJd7BR8yRaauzqGecYjx/Lj77
+2ZxvP2HunFyiQ+aNW1fGpRx4TkILCvmQntYcsfy77S1rezlCTbTMj5ZK19Xflctp
+opBds9FaPd2lAANmM8awyv0mR03T8TmesIBCoABw/BCJOVxxenXKOk76VzdG4q9b
+JYCe70yoamOycXqAW8crP7bgn3w4sME90sQp0iEcsOHWDRbkxl4eD2cI/dx0sHKR
+bnBSDpDMuYnxQLzEt8dVbFBZhFyK6binWYs/0L45a/AJA59kfN8fCOcugLI1Vngc
+jzm+hzIaYFaTE+9Y9OjqHeKo44bMvptQO9ZQZS5ho/532B4eaVwplMmyWrBFUPtC
+/pQmBhzBhzyghzl9TwTZ8DX7cukrUOKLWAG5MH3BjsOtFCHUOdy6t2S57dDKRkR3
+Yne/3wZz4dzVicIhqPG626c4/F8AKNYJ1aYyUHGbQVlgoDgfMqgFAGEJwFAbYXLG
+ZrhAS4kCHAQTAQIABgUCRKmaGQAKCRCRXFcJaQXEjSmUD/wN1otvLDQOC01tc6iJ
+YLySvg9Kn/mFXw9SNLmeXr3SIzyZLkDD3bmcsMTLkOcOaNCvHG/MNPL0nrm4OX4D
+/Q+vN3PVhgwE/8i/6tCf54AkVcO1gEcbOwuAebSGPzcCnbwPiI4beizbtClLDZOx
+IjsLVPb1i26WzAPRq0ta695N8kqTmNsh+GHmft1iB1KRHbuvzk39oaoNokBZhoDG
+a050/I9oMF8P0WrGDuNwX/lpozZChhf3j53hd2PHbJW+UFfF47Z8q0N+20Qpxwl4
+5CfSqP4honVOjuD0GU2MGSp3mBqznj2aGsLJnTq53ZjYzGwcIHGnuUm7CIRmrzZ8
+Q7NrFbgSb3L29RNZDfdNbOJj1ebeJer8elvhfLwEReEVrujQLoQJdNswA9+JY2c2
+3dUWybZAdQJw+Lw/b0ckTp38XHrnxDscVKK2OayQUA8hWkf0+QdaaF4es9nN/jNA
+uZl2fIzPiTHuL08iuVPjUz8uAlwPoKH/HProLr6MKH+qXcvLL+uqBZF3qbX6UoJD
+Wn+7zrDVPTyv0C2ndMnuN/eueXIsQHzZ9fETTLvcdIokW2+UiYTxvwNb6qM3BPoj
+Nnziqv3Sa8ZJw82M53KmdT71ftfaCGhZiHKxqwDZlAjJHC4LTxhuB2Rx9nEOkke7
+mUTYDOuSvuYf+KNUC+UBBWB6EIkCHAQTAQIABgUCRKmaGQAKCRCRXFcJaQXEjcDO
+EACN5kRSpLe35PTffnITqjeTqJYpEt9brQBJ9E1YT1xiJqX0gGCLcrhbCge38B2Q
+ynWgS9WCfrFbLiH8duNDAhA0S3zpY3OtKwIv11XJ59jHLMOXWPw3CyAX6IBiEDFv
+USdp9K0acJ7zch/g8lwVFsSpQOCGqppsAr4mRUs2rwzBRKNnpkGUVNO9HpqYIJwc
++4nPVGRAjwEozo+LcO1c7a51NTAry+gvqO74o1RvXK7fuBLrXGC6VhN9hM6QmfDC
+LcxMYTYdJEEz/SKC1cUKAzqV+4pcUGfudOldyAXhMtyVsaBZSOeIraenj2mAtmCj
+b0KuJlKhHAr5L6j9FYfKvhyPKn8zdvOf1iQScPrAEZf7zVddCudZmc3ck2RKEXWb
+PA2OfJDdFsW6C5XMbN0KDQ0veWZYAxMDy11LvEeVUj+S6QQdmzdAjwBWbH5ynXIQ
+V1S9DRPj3rFLNAgw4WZmMc0w5+vqCRu2dWHWf5UXzIKzVW/1ENzoOsssqyZuJb5P
+dPeEBqBfDj5oCLt0pkcHakMQGwZB2HxK/gY6KN7rp61ZAWkc+vBJnzEuLVnJkFlB
+S01dEAz+m5Ou/jfrNhuIdNa5+o0YNzw2NGNHB/9uuckCW9rWLUAOlWuYHZU2nYZp
+CLarTRNhJAvEfwr3ZGz/wQb4cX/C/VKpR2r1zt9DV7o5i4kCHAQTAQIABgUCRQF2
+9QAKCRDc6/VdtCKXPCt+EACDHwsdNA2Os8a5/rNfqVE5dJZmEEqe3lnTxMDxMRU7
+VxZgpTH5l7cDl8tAy/ofC8CJ7TJqGeDBlRmd82QXXZI699ax3dPwQJ5jfK+9b5Pk
+tKg9O3xpJtjXykYpU2vUUze1Avdy5Rodlf7A+C5uM1dmJMdDsIeNk3eVTnxd0sV9
+xIiE/qIY8wP59kftOTWW0fM95E1VB23Wf14pB1fB5Giw6ycahCklqTrgpSWttoA/
+gnUwPuGcA0ShoFeqBGegjp4+EXuLkGwYi1bPw0aAWNMaGQTygZ7jqOdGRECAuWx8
+Wh0SANF/93lo7lvwsFagpY9Mu7WlpPwtBcH6WUOUCHJlkyyTI4QwvQ8VsjGp2uPl
+ceSqraOzw9FbFlmMTWKSMm9PCquiJfBWL0osffn88CqpiGjkUT8Nzwk8d9MhqGvl
+cfyQMiOdatqDdYizHZQRRpsqsJBEshwLuRhIRdh+pB8j3YU6gdOZ5hxiahjish4p
+CmOzp4zyYmDn/WgHkktRIZRmu4hHmCzR95U1IAyXEO3oVvDmv2WQ32XTJqUI2F7n
+CZ65Z41Ua8ObMm7+fQIkdcaO7I2Z16cQRkwOZT9r27jKF0UnldizirETqX5oNOzP
+WdgUDVJeAQ+GBk9dD7Vdvrw+I6r1uDONVFmO4HxlkoMju5fCkQlm+kSDEp/BRj0j
+vLQoU3RlZmFuIFNwZXJsaW5nIDxzdHNwQHN0c3AuaW4tYmVybGluLmRlPohGBBAR
+AgAGBQJCzC44AAoJEGvjt5lnke+34CgAmwQF203PRmJ1jXt6yeSb3Lqv5sSXAJwP
+RddHcsiB8yM34QrH/toPYkacnYhGBBARAgAGBQJD361CAAoJEMzC1w0/D63AK9MA
+njiPlIOSjCLNfo0VQ3n3vpBL4h9LAKDipaKKG4WU/fxiu27Xh0r/S9Gqx4hGBBAR
+AgAGBQJD371/AAoJEExTNhHB+oLybfAAoIZL89uOZKGxKDhNGcS2WPfddRE7AJ9W
+Fu/GNlOXiw7bQfr/mNaxD/EayYhGBBARAgAGBQJD39CKAAoJEJo+uj/2H3P48YEA
+oIJoYY6iLIhVJKNnmn/q/QiGcBV0AKCb3J41RDAlgVKJMa9gHC2jFH2e3IhGBBAR
+AgAGBQJD3/mvAAoJEC5zDPX/Ggl57QwAn0QjhagfEQH5y9DddkD8djd0bLQvAJ0b
+BqhX91Ojican8hmYQr0k3uVL0YhGBBARAgAGBQJD4JfkAAoJEOJrapNFh7adv9MA
+oMSakyYmCFYBetD/8Phuyl1OeyG1AKDB3+Dsbdn6dnb9EDKtQl9sPg6T9IhGBBAR
+AgAGBQJD5/wZAAoJEDbDJvA0eAUnkuoAoI2V1MQlNuF+1R5o3z6tzQk/7k0jAJ9o
+73/kzfpJRMesPRv73hD9eVLb94hGBBARAgAGBQJEqU8sAAoJEO+hQDuxkd9ur10A
+n3cKgwNuH5G4RN99nnTzmHCIMLhUAJ4w+3SMLlBI6/Jy3DnruOYUFb1FU4hGBBAR
+AgAGBQJEqYUzAAoJENCVgMeKvK717P8An2H98OIrsnY+IhkBHHPmkHPBFMUmAJwJ
+YQcZ7GC1IhAlRhEsydGkDVq7IIhGBBARAgAGBQJFr2lQAAoJEP3IV8IhqMf+cncA
+ni3mhnbwd/Tvdby9WhFe8kZKxe1IAJ4z6CNswZT768GxJ3WbhafZ4ps5N4hGBBAR
+AgAGBQJFt4xYAAoJEL/RtHLzHeN3R9IAni/BYJM2GLQNyUx/KJVLHWk/r87WAJwJ
+zNDVuQazhgh529HIqoRtyWEoX4hGBBARAgAGBQJFubHLAAoJEP0dPnAKYX/5riUA
+n1dOLfOKnOfP0i+YY3d/yHbAp0LJAKCSIWv4hNXiizjS25MClouL+OrljIhGBBAR
+AgAGBQJFufHJAAoJEP0dPnAKYX/5O6sAn3ardHpgd+ctkaTgxmCvEn1sJ0PrAJ9U
+NL2DDFLOcH1I4WpL7BQjOlQPS4hGBBARAgAGBQJH3YERAAoJEJ+QtSLrVZzZivgA
+oJoCn0kTpJ4DBg2z/BmY0AWDNz+pAJ4qHEMhq6g4wHxJ4cQnknsQTYSy7ohGBBAR
+AgAGBQJIaqFcAAoJEBiD0Q7Fqt+u3IgAoJndglmcOSsb2D3ynXDck/N4vrUFAKCb
+O62QokxX6yk+YqDwvGrMJXp5jIhGBBARAgAGBQJI9gvlAAoJEN1h78jtGEwsfvIA
+ni96Wvud+2VLCXSuXM+ZUE2KbrobAJ92qgTE5THARpjD+y9TuZL5Q4asYIhGBBAR
+AgAGBQJI9ypTAAoJEAsDrm5OJFF8yXwAoN3xOK+TPAO5Cm+8mrYzK47ScAzNAKC3
+RtZJfCQVNOtcBOkKjd+13j8TfIhGBBMRAgAGBQJIDKtxAAoJEKJBBqkXBv1uE9MA
+n24h4i+b0pFI0ghfaWGZ+qO8popGAJ9IE2L7zyjdFq7+vFF/LE28Zb1BWohMBBAR
+AgAMBQJDJHm8BYMCoq14AAoJEDVQqhFngivE3P4An0dSgkk/6bS5sY1zBda8fh3B
+i4cHAKCMz0uUPDyuvdEzlH1BXJfSa040H4hMBBARAgAMBQJD36x5BYMB53q7AAoJ
+EBDOBVoE/zdH/XIAoJdgVBydsptMC6F9hoRVjCGn6dwXAJ9UMEzqZ64w92m+C5x0
+t7sU60d9ZohMBBARAgAMBQJD38KhBYMB52STAAoJED2v6WSH30Wywr4AoLEEmKJx
+k3SjO7AaO4yn2R/PonqHAJ45bTWbLPPpBKkyvi4kGBEXyE6K34hMBBARAgAMBQJD
+38OtBYMB52OHAAoJEI6NV9jQzC3pnTEAnRxTwhrWoiSehX+HzWCq0X0vR/2LAJ9h
+aC1fMw2agqeDCZ0bEO9iIxMnAohMBBARAgAMBQJD4PXKBYMB5jFqAAoJEHZ2+BYF
+Nrhtf4gAn06IkBbO9U4xzzdc5qeqyoSwk6bgAKCYD/6jthoerFLqYk0B7HLqMLTD
+oYhMBBARAgAMBQJD4ol9BYMB5J23AAoJEKXKdLumJo3tRugAoITW+S4xT/Aa9h/G
+uM5psicdER7ZAJ9U7+wslByRO/ufAUlxIDcJVD2MrohMBBARAgAMBQJEqjr1BYMB
+HOw/AAoJEN9NR8Y0ZFLY3ywAn0NZ6g+6WCNZSQoBNrXLbzKT/iB6AJ4svNT+7GYz
+wURkPodi+Nq03kw/2YhMBBMRAgAMBQJD3+owBYMB5z0EAAoJEF50kmwQUKKcCtEA
+oKru8d+BidIS+HH43Xs0TDePxlkwAKCStzrvC2izzqXJonqBfUrJ4lu804hMBBMR
+AgAMBQJD3+6gBYMB5ziUAAoJENpy2KYrGSx1PbkAnRFFt4cFZrOPVHIx0TGfGZYN
+o69nAJ9HFqGTxgFfGS0iuNIdA4XtGhdCSIheBBMRAgAeAhsDBgsJCAcDAgMVAgMD
+FgIBAh4BAheABQJGGOxEAAoJEOXTAnP1nSXwURQAoN1DBXptU3tBz25ZKdAGF7k4
+Y1WiAKCcHMm1C9uUaZgLE47yo0gx8lUDDohhBBMRAgAhAhsDBgsJCAcDAgMVAgMD
+FgIBAh4BAheAAhkBBQJFopSYAAoJEOXTAnP1nSXwk8MAnR21hrYgSt4mCgU6YuUf
+SxCEaGFpAJ0X0ax2TcgnTOx360DHCopL1zqDdYhkBBMRAgAkBQJCyQVCAhsDBQkD
+wmcABgsJCAcDAgMVAgMDFgIBAh4BAheAAAoJEOXTAnP1nSXwJjgAnj9oSeJmNb64
+wbSZ22924yB3KjoKAKCcPzEk4tFLEerd2r123r04qVh2b4hnBBMRAgAnAhsDBQkD
+wmcABgsJCAcDAgMVAgMDFgIBAh4BAheABQJDdRs4AhkBAAoJEOXTAnP1nSXwWp0A
+oIkC9bSIBeMyiYpqDmMFuyQvR/1/AJ9mGtgI6C/zZioWjz/Xrl7c3TJ4vYkBHAQQ
+AQIABgUCRbd/9QAKCRALeDLzc9YtQVpRCACgGD3Xrz8N7GyzdBgCjd/IxZhSrqAz
+ZPTwouqCHLLo+bSMHtv0TjYQBGrBNN7gavRkzqTpkDJ+GSV7LJ/5qgpEyF5dsEEY
+fds5Q/NdxKjO4w/69l8Qfmi49UgIgT06oWYmHpMPKzlWPMFUpCHnAamnIqGNSt9P
+rnM3HOXfnNJtnNl3stHB36BosRkrNdCHty1L4ZP9hzh4biQJdoZymxJ3BzVnyWKl
+N6fw5a0TIaYBWDyMp4hkrOGa1fn61hHF5Pb89nT6+yYAYD23Et2xzPWHlcp1syCu
+y4qx65V6QnXFVcMhf4hijZtCVvXVPg+PHS76RipwJPuCVGXvi4UBseIJiQEiBBMB
+AgAMBQJD3+ufBYMB5zuVAAoJEI4+GXgq3DC1FhoH/2XdxMe9WXNDkFfels+Iz2P2
+MIx5+3LfYCFtRDCv+/iuoIa8poOP7yGK+FoKpbkrhUcxTyEWuWJMuWImz1Y7M+Pv
+mRArYeoCvPrb96+WIbgRWaPA7+6eYAxZAXHq2lVMNZmbbrYNOjmLQp0wNLeOm47u
+AjxwixrrOq6eOSqmF3T7i4AIIN8spGocpr2FTBJ0M+KpRiKfZBRE4SEApDtMHSg7
+lQWOpcT2PVR89a+kjX0rItOsX1yl3wpjpVA+eCIOUpyhIJ36PWd4k6kOkqEA9dwU
++agA6VoP7mJlg58DMDELk/3tQWzVEdubLcrARbFVU4aLP6JweTVS18iGGLV01w6J
+AhwEEAECAAYFAkPftGAACgkQuUn7HxTvS0Q8TxAAs9NagIc5N/XqsDNaWXC8WXEH
+boSFeM5GfwBwANbf46DAx8FYjci/DYxalx+Zc5u6Wz8aseoIPREVnxVBO67vrPq3
+rz/yjB2D5iyKUfXWKtMRNDFNEMA9dPx01sPTnmWc4i4GEGgps+K8KggEIuCYHZHw
+ii958GVeMWX7SiLkpPLfPHNTru1Mm1mTIAI6Env/PryyP/DiHScvj/5at2irptKI
+V+6K0JA8p85D26P8mCWqyxEcUf4Di6pjkKQ96W0k1i27w09im0GaimXvktszsNA2
+9MskGsDm2pFU/407GdXSkfFnH2CQSPw5hZUJloXbmmOb0F1yp4PmP5WnqpwjPOgN
+0VLRvK5hP7hs91AmjuYEupPsJE5UB1bM1UAeC34w4W8dLV4I1Jj1OJCN3PtDMWwM
+T+PlxQBKl276phJYBi7fWbvRxv7MHJoW/3XGSOKl3Ky0gKmePhH3jlEsknL0gtvs
+O23bgEvkF5LiawkNgOpRLMyUI7JUNRyutMv9p99jYsJaub/4MME7UMPMl7bBbknJ
+iEFl37gbNdkJk02BxFhK8g6maDqyEYdb7VuaCUF9ZZX6B69tAx+Gj2lb8TYiIrmo
+U2eTJPSGpMXlKo42PfT3ZBoTIZ2dE0CN77XK5zuYh4nWc0xcXFrBEg4yrDixEFN8
+/RnurMtZYnjVIP9jIDCJAhwEEwECAAYFAkSpmhkACgkQkVxXCWkFxI3AzhAAjeZE
+UqS3t+T0335yE6o3k6iWKRLfW60ASfRNWE9cYial9IBgi3K4WwoHt/AdkMp1oEvV
+gn6xWy4h/HbjQwIQNEt86WNzrSsCL9dVyefYxyzDl1j8NwsgF+iAYhAxb1EnafSt
+GnCe83If4PJcFRbEqUDghqqabAK+JkVLNq8MwUSjZ6ZBlFTTvR6amCCcHPuJz1Rk
+QI8BKM6Pi3DtXO2udTUwK8voL6ju+KNUb1yu37gS61xgulYTfYTOkJnwwi3MTGE2
+HSRBM/0igtXFCgM6lfuKXFBn7nTpXcgF4TLclbGgWUjniK2np49pgLZgo29CriZS
+oRwK+S+o/RWHyr4cjyp/M3bzn9YkEnD6wBGX+81XXQrnWZnN3JNkShF1mzwNjnyQ
+3RbFuguVzGzdCg0NL3lmWAMTA8tdS7xHlVI/kukEHZs3QI8AVmx+cp1yEFdUvQ0T
+496xSzQIMOFmZjHNMOfr6gkbtnVh1n+VF8yCs1Vv9RDc6DrLLKsmbiW+T3T3hAag
+Xw4+aAi7dKZHB2pDEBsGQdh8Sv4GOije66etWQFpHPrwSZ8xLi1ZyZBZQUtNXRAM
+/puTrv436zYbiHTWufqNGDc8NjRjRwf/brnJAlva1i1ADpVrmB2VNp2GaQi2q00T
+YSQLxH8K92Rs/8EG+HF/wv1SqUdq9c7fQ1e6OYuJAhwEEwECAAYFAkUBdvQACgkQ
+3Ov1XbQilzxciA//RlwBZSKAIOp6yZqn9qH+bQJXmWcxpCTvhOUY0R5YcTTJ9g3J
+fbgaQk9h6pSjAOJBZBpGmu9MCTrsLOZ/pA/ICW6p8iOghQ2m4iY7hLnqO1QOdbLQ
+oYKd8f9L+GSWfQbUrir3j08TaKJ+Re1LS55DyE0OKTneypWs0mT9OaCg7lm+QHyu
+hBAcg8CUMrDQe6WQB3OcQp9k9Hj1G9sSLkqsNmHsbLhSAiZeXGyAKnpf2yK8sUjF
+BAkyjYscd5SQJBsQZ7nDfowFmKB8beesMf7FE8bVE+5ZH7gWPaMkl6VKvzzIaAqT
+BpVwWplGyWCxiRCjY66QiI/kIeYvZBiaC1QSSZR31mP6Z6BqAvZNa6J+t64MSoUw
+6Jn1AejXW7m8kW1/WX08Bf7n5/+BoqsFFj4ET130nigBFEu9eHKMihuBs26Ftn7h
+aJyFCiTzTcoeiUWawB5Aj3xKN2QRTICxDbevVkey9eaEk/KEosEMBRqGslcZH4Ss
+6YpQsw6gYKdhnopsGUU6oZGDpDqj3hhcguWudzv3Ng7AINby+MMJNdPmFo3ClTM3
+N8FPPaBFSjYYq0ZB5gdZFLHALYkx8seILFu8DK+xA4k+P/9jQtM2uZK+8HvBmYxF
+DTs5JAmRLXXCXS5Mv4Dp+Tvj+iRQ4NICw/3qmQQwRjF3uGYxNWRQYi/XcjG0K1N0
+ZWZhbiBTcGVybGluZyA8c3BlcmxpbmdAaW5mLmZ1LWJlcmxpbi5kZT6IRQQQEQIA
+BgUCRa9pWgAKCRD9yFfCIajH/lSZAJjrbHZYe3Sc32XDqvEgEd2nu1+YAJ42h+tJ
+I2UEcjmvqR2r5tQkb2BKW4hGBBARAgAGBQJCzC4pAAoJEGvjt5lnke+3Gn8AniQV
+Rf0Qf9E/qOjF1D7jSwX2Z4AMAJ9eyrCybZehdVeHCr3ILch87yLH7IhGBBARAgAG
+BQJD361JAAoJEMzC1w0/D63ACDYAoIu/NKPbt1iWn40Y6nGIoPV/5k5iAKCxvfhJ
+Fi+3rUEdQ7tQ0OWJx0FlbIhGBBARAgAGBQJD372FAAoJEExTNhHB+oLymUQAn2Vt
+GhR8Oasr0GUZQl3NmrOwRauyAJ4sFbfThEFUjVLR8zLOGwsuXATe8IhGBBARAgAG
+BQJD39CNAAoJEJo+uj/2H3P4vH4AnRpSZ3WUoTDaCUbDJ0ZIMHu2yz0MAJ4jX5iU
+gF0DdIpXmdO2qN4iy6O/GYhGBBARAgAGBQJD3/mzAAoJEC5zDPX/Ggl5oooAn3yI
+7rczvgfYCmilzt+pCc1aDwtQAJ9Ooe4fdgucEbPdxbtusQhtH/HxEIhGBBARAgAG
+BQJD4JfrAAoJEOJrapNFh7adxtwAnRYp5B9wsZZbdGdAzt+9fAcA5OJGAKCNz6ll
+YgsiigGiURfwPldnQAVrLIhGBBARAgAGBQJD5/wZAAoJEDbDJvA0eAUnl8MAnik4
+mId6rXm1/AoJqJReEU3qg+LjAJsG/8cG6LNLNzFvOl/Io1AIAYUdM4hGBBARAgAG
+BQJEqU81AAoJEO+hQDuxkd9udPUAnRf05UmO3Fe5SwTfEWB2X0N21b0sAJ9uFdbu
+8MwtwWJyRPaPVVXmqJ1GT4hGBBARAgAGBQJEqYUzAAoJENCVgMeKvK71Xb8Anj59
+xVSbUtaFCjPUJxbuzyC4VrJqAJ9K0eK+ASVECFINHw9WhXyb6uEOVYhGBBARAgAG
+BQJFt4xkAAoJEL/RtHLzHeN3RhsAn3fn1pFVssHBGT7Azkj4j/IxdQz8AJ0arxzd
+dukSIBAKmAHa7rTZqNRMmohGBBARAgAGBQJFufHNAAoJEP0dPnAKYX/5GZ8An0OB
+BavTZwvP10Sr+uIMYnJ9ik7CAJ99HDB0DMeJCatlyEcAElwt+ODRx4hGBBARAgAG
+BQJH3YERAAoJEJ+QtSLrVZzZRSAAn2QsAP/ltDlYBX+njGupR2gseoUDAJ93X+6o
++ABipoFkg33wHAnL93BvEIhGBBARAgAGBQJIaqFcAAoJEBiD0Q7Fqt+uKrwAnA0K
+bcXTHZn93dSuueRqtSWQ9VwDAJ9MeHC1YnemxEVLvMEBoMkKiPBg1IhGBBARAgAG
+BQJI9gvlAAoJEN1h78jtGEwsujkAnj45UJgLfXiWeUXQGbTogIyxN/FMAJ46+kZ+
+q0Msgy5005x9gZC6GlTuZ4hGBBARAgAGBQJI9ypTAAoJEAsDrm5OJFF8xI8AoPhI
+DNL/DFa6hrFDS3O4jn9XdQArAKDLsBsfdCPNhYb37p0Jv0NSjta9r4hGBBMRAgAG
+BQJIDKtxAAoJEKJBBqkXBv1uwjUAoJGkOmUfkwm+oMOUvMB3f1scEkyNAKC0QyHa
+Jm7v53nBGLRmMPmIQkBD44hMBBARAgAMBQJDJHm8BYMCoq14AAoJEDVQqhFngivE
+3vEAoLryXcU5IPWb5EUmA0LU5574CCKmAKCyU5zOBHKi+P2c34w5YaPEurHnWYhM
+BBARAgAMBQJD36x5BYMB53q7AAoJEBDOBVoE/zdHqYQAnjuRMx72fY9eCdnw52M0
+vpL063fxAJ0RIeh8G7TdTgLwhXL7KkmOJo8/M4hMBBARAgAMBQJD38KhBYMB52ST
+AAoJED2v6WSH30Wyd40An343U1RSTHFidM12KZO/7S82r5vUAJ9RnengtwnYf7KQ
+osO+ItwhJoJJ6ohMBBARAgAMBQJD38OtBYMB52OHAAoJEI6NV9jQzC3pIDwAoLMF
+U5b8K5CwxU8uiVZ9GEO/qSLNAKDE08pwBmuDuqXW24RXMqNWIk3fhYhMBBARAgAM
+BQJD4PXKBYMB5jFqAAoJEHZ2+BYFNrhtFqEAoJZza80pT6RvCcd8E36ej36SPnd9
+AJ0ZkS1n5x8YEygYpNStvpFPlXkU74hMBBARAgAMBQJD4ol9BYMB5J23AAoJEKXK
+dLumJo3tNMcAnjTXMBYoe1gjaxmPewB7HRThJXqzAJ99EHwesg3Gc5PhDVzKI6KB
+KyJksohMBBARAgAMBQJEqjr1BYMBHOw/AAoJEN9NR8Y0ZFLYIggAoM9CMHYoKNba
+g//dRfe31GgZQJHkAKChkclBKSyap5PP9V+bTn0MDLjuyIhMBBMRAgAMBQJD3+ow
+BYMB5z0EAAoJEF50kmwQUKKcFAYAoIcYHX+QC2R2Ekun7XV2Ge5NadjNAJ9WCKfh
+qKpLgza5kgiJIF/DMU/x/4hMBBMRAgAMBQJD3+6gBYMB5ziUAAoJENpy2KYrGSx1
+/XoAnRN0IMrDN5Rkj0Dq+PKy9b+ii5fRAJ9eYiLHl8RgVzF3Vj+N+myI5S4xAIhe
+BBMRAgAeAhsDBgsJCAcDAgMVAgMDFgIBAh4BAheABQJFopScAAoJEOXTAnP1nSXw
+zIcAn1o0u2rUkbBuIXbn8erEZZl3rsFzAJ97kIfBkNO05HHKEjzz8QbFPPJ93ohk
+BBMRAgAkBQJCyQVeAhsDBQkDwmcABgsJCAcDAgMVAgMDFgIBAh4BAheAAAoJEOXT
+AnP1nSXw5OwAnjhJBxgdUyeT9Y4tyFBWzyxhK2GxAJ0bzANbbSz98t5Bp7Uz5x79
+BFvSBYkBHAQQAQIABgUCRbd//AAKCRALeDLzc9YtQbcwB/9gfHtHB7AlYyG/2nlt
+GGta+kIX2GXoJhp8zWW92/wpXvSTCySxqWPYhRBL2IjrF24eNClN4c7ulbKQ5LN6
+h8PHJDsUB94LjwYFhJ5V+QBs/AWVgHYLwxl5aFC81YsrWwjB4tLhYCTvjnc+xv+Z
+XLVl6TMrl+llvePdPx4AuLQY8TjCHFoMPAtoqHjfK5pwvwoi4mLQ/acDPhqQVhvT
+uS0lS1cavnF4JyjBYXZnZ1E3f4D656w/tHY8fi8W+KFGgLu8oD0VeJxRsspJGnEi
+7g2YQmvKOSmIPPJN0EayvUtCWg6itTOpcNQeXZTlYM8Q/nr7kq45+imnQGnkyBgr
+LrqUiQEiBBMBAgAMBQJD3+ufBYMB5zuVAAoJEI4+GXgq3DC1h7cH+wdusuur6XhO
+iMI8ySJIHQ5MJ5IfEgCJOXtEIuESNAdhpJgm8zwvC/OTploV3akxjKWRJnx3AZwY
+DAdzSIenrdx9MjsmJwZMB7AS3XSTIBuvfmFHr6ch3vdBOkPlprch+SmISgkZ41P9
+Sqw9gvapGBveBLP6lZwAsYzk57R5jqMHlmqS6YcKP6dw7Msv6aBcjoVlaQbCFevf
+ZeDn6khpQYVuwQ91cq1HOw2gzJQXHS0b5LabbyzWrFByTq4rHFjyhBlB+MZDfbXT
+RvR+6+k3kAo4Z3Htg00NAijjnqJ7psev5fGEkI3nkeDM3hrTbH3JzqhFZpDCpmEv
+7fPyODVs5JyJAhwEEAECAAYFAkPftGUACgkQuUn7HxTvS0Qzqw/7BjUjk+CExsep
+9wy8+xxT8ZnLRUto6UwPefM71CHBg+LPzV8HgRvvIGpNa8N8GHwWrPLdzQ6bUzr+
+xUkANURd0qMMAq8NdGg2fb1QR53MMXAXeZBMTmaPAGRLfp2zsNVv4fGhQvc/B1do
+pPrXiVFN4AKGjsWEGR5HtZfyUPsnp1Who8socPNqtktxJEAtxoux7XPd5dg7IOds
+zPr1mwHAQ35uTOrJdtUt/r8KEbdUkdvOuT/J0MBB8EFbEYBmf816HF4jT7nFX4z5
+PhwrStGu9muO5m+ql0/nStC3KeHrE5HxlA73m8CYjDD0Dizr4RsK8otiiaihyw8u
+SaSmfrRnNhYrEeIS8GZk0E8mxV7Mc2Ulvqpep7J/3+S3g/CX4cGuXLtm9Fwvlgc/
+T7BltUNGQEc8eM6tFC+8eYfVDshC9nikL1z1iCqSrSMD2HRYdDMCIddK64WXCd0Z
+WxBveebgB9FgtwpzmvRqv7AH3xkUQ/GDXYeRK+RATDVY20qVCond/wcBwMef6Moh
+VMGbPW6cCq9SoGeC0cc6MMfMN3DlwXbsBhGl20CRs96XLPgbexpi95WbTFDVX0X+
+iT3C8WkY6DNMXUQSbqpLdJ7tGWfFpJa9oS7zG6cZ9iaDJt0igae39nwM90gPSNf+
+vP8Y1sWjtA0xsWky1dC4DXsacHtDB96JAhwEEwECAAYFAkSpmhkACgkQkVxXCWkF
+xI2XeRAApRrImnRO1EzZvYBLUVeN0zqucrZ4tlkQlzb2tMmSXh+E0vMCLJL1OCNt
+kcsCa2p12y9fsOhonzb6jvCJGDW/oIWKdgjkrgQMLZJavzuyE7RIsvwBxrKjlaqo
+rmRXxpIlSDwtnxPNoeIyACAivrCyIRrwrgPlFavyxUjnxuVmac4+IiWH+rBmP/xt
+RHIIkyGw1yD8oJAZLDFs5l+Fk1Qwf6UEAvSWdxcNu8O0eqiPm2dScQ+1Jk/cmv1w
+hsCboDkiocn8EKbdsfwiZWW3TRVciJ7sU4ZlSQhFminar2cFWaijXHYhyOzaZT2V
+hegUYvsOzyl35zO2aCIivnvPxKuuhQwXn/ErFjFNJ7GqZdaAQUGOz0b/6dtE0/MI
+3wfO4btjxFgdlPUXCtxokzkji4rPLWUmTLQOKmVv8Njz92qdvaGsJ0yl4R4fKUMV
+FTotWKbu7eq1ue79v7dHBArQKXGAaYIa45a+tBkAGAYtn92bDV23LVw4j8/wxgBM
+2E5YgqLO6vY02xxrLSIu0MIOxO+ksnjH0IZdzM3Nu6uIk8Eb4XDznLWU+p6ECE+5
+nlgbzcEiiyip51rQLi2j6L2J1Su/z3NgfZ9vyN7mn/+0lHPshzggZ+FTiwW1OvDF
+BXEzDp5ugW7aoWaE0l8Aolnga5k3g2acGMqcfgDLTO6bJJwNRf6JAhwEEwECAAYF
+AkUBdvQACgkQ3Ov1XbQilzxg4RAAvx98wSWQKUO3eqH014tmU5H3JeVnEjJMfR0a
+lcWmZIYCnDtuJ5v/50CmBnziR6n8i9YIj6wafxgACUrid5I3LNwdkKBq9+WYmmVd
+THV8k05ooNKIWZluyoK8bEkbQjFeqmCwrNZ5H5XO9bfb6XmjZIwH9GhIrh/yEpNt
+QJBLU09AMHWyL6MGksMbfsOPqMYe4eGfDpzSTmNDLTVLL2kNlOTTAmL5GGz6WBNp
+UzDrY0D9+vZMPFzl/Jf2Ocg6ELPf2E7xVX7mV9046sgGw7IenN+jVkdRTpNZ85Ge
+OsWd0F0YagA5L6StI5iy/Pu3z9q+iIc9CgBsw7eDTlyXukGpSydMrw2xCgtDiazX
+SPsIM1ftSJyiPXOhlGfF7cNBNlfYM60LqeFZ79mBkcafGtOvZqOazsBQ8qPkUKIk
+tFqjMxjoAjOL+VXnb7LoXyWNDDM0c2am++z8cIwJVa3mhEh/bQ5IoRAOgz34EmmP
+slFxHM+JsEdQAUdhCc5oJ16WyTouGFMMm7TLi28P6zar71P67ODjdBZgXNymH9rI
+whaj9hvnDfx8xV/5z9oADnIuBZeH4yyGLyoUzCdE/GiKHx8IkhfdTBlNRkOXDCZ5
+T2H4I/zBc3b0pdzntydIpkz4rpdTsyKvaj9itZocXoqa4JiX2LKFV2FwmSOf3/gB
+0ERrLNK0P1N0ZWZhbiBTcGVybGluZyAoRWxlZ28gU29mdHdhcmUgU29sdXRpb25z
+IEdtYkgpIDxzdHNwQGVsZWdvLmRlPohGBBARAgAGBQJD361JAAoJEMzC1w0/D63A
+YDsAn08+k4n2ccnwAdEKhir15v8feB+BAJ9vpbHcXNtvIXCrkpophbfh6CIQoohG
+BBARAgAGBQJD372FAAoJEExTNhHB+oLyDT8AoLvZc/1PsFYgXqWMfQ4pCqcbR18n
+AJ0eoCgvO1m815bUrYNv/fZ/osZLjYhGBBARAgAGBQJD39CNAAoJEJo+uj/2H3P4
+H3cAniB6R4sTUx5WR6/5mkH76WsyjDvvAJ4tv+SrOdaX1JADcmDRmrsEAL9BfIhG
+BBARAgAGBQJD3/mzAAoJEC5zDPX/Ggl5UBgAn2lfwkI/Wr9EgC5O0Iqp0sxn8B9U
+AJ9UHf4ksmmZpzvVy33iR1YLbkMMtohGBBARAgAGBQJD4JfrAAoJEOJrapNFh7ad
+XBkAni2U6s6azgtZvVXZtz0Nr0ttq4vGAJ46E0QnYXSuuaVvPM+r7kytXOGaRohG
+BBARAgAGBQJD5/wZAAoJEDbDJvA0eAUnCPcAoKZvzI+nTnULScM0Z2q7yxCM4AAZ
+AJ0QT/tBjl4zWit3PCDuQqdx4nhdtohGBBARAgAGBQJEqU81AAoJEO+hQDuxkd9u
+NWoAn3wRNVDG2D6pIVF0YNjPIhE5WTPlAKDQBI7fx7xPaDYdgUJHMCfO9S/WsohG
+BBARAgAGBQJEqYUzAAoJENCVgMeKvK71uVUAmQGsgs9DVrnJKDLkaSbcaRzxhN1Y
+AKCSnpRD9s8NywmWJNOsVlfJYvSKPIhGBBARAgAGBQJFr2laAAoJEP3IV8IhqMf+
+Hl0AoINvgGVo0bd2zpu/XTMKpaFpbJvbAJ99npQNz+QK8LPDwTsuNFJ5FiUzxohG
+BBARAgAGBQJFt4xkAAoJEL/RtHLzHeN38WgAn0DXZpzYbJJwHgaf4pb4lsDV/zQu
+AJ90kn40z6aVGjYIt6LBHwdJZe7f/IhGBBARAgAGBQJFufHNAAoJEP0dPnAKYX/5
++SIAoJYeKE+d282VYgyZvpwatH9OjLrQAJ9SzTFEeKs6M0MCrg5BdH6nUy8Tk4hG
+BBARAgAGBQJH3YERAAoJEJ+QtSLrVZzZ/nsAnjmsqf8WJEHWrk8fb4L283LWrTyv
+AJ0epjk+nGqhcyG3bAiinHs3akf0TIhGBBARAgAGBQJIEK4PAAoJEDUfM+Q1PiW8
+uDwAnReU/hGOfmpmLy88N7PLpflTNPkQAJ4ju+xKA/xOusON3B1hLtgfRTKg+YhG
+BBARAgAGBQJIaqFcAAoJEBiD0Q7Fqt+uUNoAn1yO38EfnwF+Evw+E7kqn5hJS/YT
+AKChZSzmCbMqYvxxryW82efNQphE7ohGBBARAgAGBQJI9gvlAAoJEN1h78jtGEws
+Jy8An2Tqp0UANZmh/xetsQhP/DfUFwRvAJ94kC7M/Ao2vLN49i2vDzdjy2pmXIhG
+BBARAgAGBQJI9ypTAAoJEAsDrm5OJFF8ivEAn3RWh2UqaNZyw9DquE48HWZxPeAq
+AJ9RfJgOcVwRukR5QgGaeoq/263ygIhGBBMRAgAGBQJIDKtxAAoJEKJBBqkXBv1u
+Mv8An3EaYOy4jK2Wj5+ZzD8MWMVioK9iAJ4wXIWFr+sdJQxW1j5416RS9GQE74hM
+BBARAgAMBQJDJHm8BYMCoq14AAoJEDVQqhFngivEQvsAmwbRLNXHcr5+mkUfqZ9Q
+B7+Ra633AKCc8IUCG3hVgy4LKS3ziIYgtBDcIohMBBARAgAMBQJD36x5BYMB53q7
+AAoJEBDOBVoE/zdH7CcAoLhzrv+GMQuhCB7+wmCPXTMvaxz1AKC7SZXTK3GaIT8h
+vsEwiaa+HImQeIhMBBARAgAMBQJD38KhBYMB52STAAoJED2v6WSH30WyrHIAnis9
+C48gmjj7EE2rmzYICKZDaA0TAJ48PwLUNmijC8pmDp/FQUYFAsLFMIhMBBARAgAM
+BQJD38OtBYMB52OHAAoJEI6NV9jQzC3pOt8AnR+E/3kfruKlMndmu/AgImbKQM2u
+AKCF0J0c2qAGumffCK4Sr2Ol4404LYhMBBARAgAMBQJD4PXKBYMB5jFqAAoJEHZ2
++BYFNrhtsbYAoJeFxk2Q09UYLAJ+6EwzWQAr9EPmAJ0RJaZWCjRpsO4qykNcZ+ge
+tBNEqIhMBBARAgAMBQJD4ol9BYMB5J23AAoJEKXKdLumJo3tRjwAnjOkfTUEBTmU
+/y4/LGry8nw3384RAJ9Uh7DFOXq3BESEqru0IqbhL2UK4YhMBBARAgAMBQJEqjr1
+BYMBHOw/AAoJEN9NR8Y0ZFLYEPYAoJBrCoXXhsnVEf5i7l5sh5vPkMfDAKC1I2H3
+UTRvagtKLS6J6vrgW5DOBohMBBMRAgAMBQJD3+owBYMB5z0EAAoJEF50kmwQUKKc
+1HkAnRfp6vWxzmX/HAabyHj3ZMJwrquiAJwKDApLEz2MuV1bdMEBGrInjwkeMYhM
+BBMRAgAMBQJD3+6gBYMB5ziUAAoJENpy2KYrGSx1BAwAn1maey1bBQsM/3pGEwm/
+j/T34SXKAJ9yjjR9OOVVeSyGwjLKL4CLYD0myYheBBMRAgAeAhsDBgsJCAcDAgMV
+AgMDFgIBAh4BAheABQJFopScAAoJEOXTAnP1nSXwFoAAnAnclaWq2u0+jGh4DLzt
+nbSeKAXkAJ48jnCcQnvEqm/tQS+2JomgbALnsohkBBMRAgAkBQJC5KrAAhsDBQkD
+wmcABgsJCAcDAgMVAgMDFgIBAh4BAheAAAoJEOXTAnP1nSXwNWcAn2MhayZYOHqJ
+sY1MuUett/bai3+jAJ9z04F1sCRxkjTo+IZcMktHNk5AQYkBHAQQAQIABgUCRbd/
+/QAKCRALeDLzc9YtQQ1lB/9YGdMs059ATawIvs1HC2IZgTJP+OOLEgwnDglexKRk
+9hzPoHN9qquTL+NjzApq+brN+TEeHYWX+AFdcLuFTsF3wqmaHq0p8o9uZZ66+gZI
+3jep94YTAz5E5FHvVB75qmW0Xat94AKNY3mJbvmvZZpYViL5OzLAQOoUc5I7WGpd
+TcxroLaN9F0YPiJiRYlQr4ulESdLJp0esUhWbQcrIfsOYUdc/YxwC2kLrsEva25X
+h1WeSUlgogXs85ZZ3UheTLv2MDfWelgnA5t2xlOE8MZszmMWfOcpypTj+51kMvCr
+mu07AxkQV9EdCzQHwLXmz9Sj6yh3erwMa7oxWxXTrehviQEiBBMBAgAMBQJD3+uf
+BYMB5zuVAAoJEI4+GXgq3DC1SksH+wRGiV5esGcbf7/ZvGYY5/kjx9+HeVvoeSH5
+TqqrPzG05YbK5mBLYJX2eLC5tcHSpXLH6VXoO9P/Z4iEgxsZ+tipbmSY3zM4xkKQ
+TKD2MgfJrO6/4RoOFORf+2pbCfPYL+m0/XeVjF1J+2Sj4EaK7+5H2GBxAAhn+U57
+hKo1WCjAwuqe/C4ktnBabAEv2MUOozs6hSmH9a8XjBMdBc0a3lgfZEAScRjOw7ag
+Vg4y1t1DR0liLx4OCRzKQeJip6dEPge/clAHbepehe6KeFvVvoOP73NJ4AnMg09s
+QCdXppBmNrzb1goqU3rBWTvyRVXJlIdn1xCK8OV08iMAdvnG+SuJAhwEEAECAAYF
+AkPftGcACgkQuUn7HxTvS0QnpxAAj/JCKjVDQMZ6HLPjrJ16ZC3VfbuTio4cA0bb
+hk/Jqc8b4xSvv84TRbGIChLzlEIjKmEe+J6oD3xWx7gMyzHTpD6vWc93KDvL0K9u
+bxzA4En+qcb0ELDzeOx0CxfHpBRAvTazQL8OBA5XGKDoAUFGMZ1XvDIWEA6rGJel
+GZ0nsUwuoV7GLlfnHFP2NEXy0Req/kBmdwsRM9NHBS8TRDtYqWHdKINWdzi1n7Iz
+Yno2RIzg4IS1+KKHrnSE5bZamFqnyvinI1mj0nR9xyZuEY3oyTmfzsnv3o9LEwOl
+5JPa9uveKumcXDUIfjFhT56m2pYVkIm9h8/ZdJzlQD4uXgbzTdHiUUuI49qH7+G2
+YU718CcYT8dgx2RFR/75BqtnNGTml+xdW12W+ZUhcJ30L4tJBnKT8rh5Mcelmc3I
+6rZQrNsUdPuV1Kd9m3QTwyOlR+eJlo01WoQujGhJpPetYYdIy6lY7Y1/970ODlp2
+XbZA9xOho1fG5D2/smI6CI0MSoffwSbxD64224oqxsRnetBbShZh78Sorzw5ywAp
+kQ82TdkmhLtp2+JwPSpRWjNP2qn6c/ggyk/sozqANW9OsDZ2x5RUPbmJdXihMY1V
+ZHGU7uoJYLdCp5GgYrAFtTeCZVVUofHuuFCUG2+5DIOypo54WS7rzNLzzWigt+dd
+Y81QRKqJAhwEEwECAAYFAkSpmhkACgkQkVxXCWkFxI3/AA//aeFFB0mWxji7CqcU
+eqN4k5ZfI8plq79QoyUa3/akRb4jVMjJGB7GPEtWR6SCTMxj53Edf/zAFDNQH1A2
+LbDHI8g+RMuGrFDbkSZjvycB7xRmp7yopryjHw2q7ympJHQlf2ZD5lYkjF5HSGTz
+CYd5JXsXAMUOWVh1ZiEPTduX+5SDr/kFVl6q4mugIzJb/4xpJafHELvgJKt5Q4DE
+vBWqHzewBKqqatvgYjHoQMVboYCs9b1ZIyQ1jzAvWCbTZhZuzZnogYIYe5QwEhLb
+vzHw0GpgrsVwoJ8GNr9F0p4nI/DyreReQhj2R7R7p5MGRrNBBn0rUI5FPBEy4Olj
+RKw6qLkKzAwPn7MSUK3p3hKKaX65o+c9NdfZKEBMMDbzpw1mXNkYPj5F8v5gzpBi
+EEdh9MH7g7RIbPNrL7UVHvXGeQFdWIivm341If51+CPnmLj2aQUD+lWlyHaOmm01
++Od/ZUVU4noJimmEzv6CdHKiMUOMc+eQWP/re1rJkfJ1FufLcTC+flkTrdIKVXd4
+qMWUYAvBO43fbsujkjK5toBnnIY2T3Gi3eaTyM9rbNbZJoZeyhV6htdd8SFogxey
+62qoQvbEkloXLoIqNNbxMGWitCobARx36URQ0LhNygm2n2Z7CynM2DZ+Aa9RgZ6y
+9lYZe1lMIBmv1bVeXHeyoVdVMtiJAhwEEwECAAYFAkUBdvUACgkQ3Ov1XbQilzxN
+xw//eWPnfbWK+2n9gDgWydvd/PyvFzelheEjzjeBIBK6IM4ntv+u6ebd4cIhDimC
+P4n9RoRwEmQLgQt8QOyDZgdg9Ac3/30RXa+Bnw0sVnF6lekUOmY8IgWOSIunMC+y
+neAsrgAdzN3lPZwdrDcu3wcBXFZ6NT4/8BVsrE9T+K6dlEu17+suXibWn6m7dgDb
+t15+ohHkDz2HBQniy3EbPSuThS7/8qPedHXeKDrG0bmO0Y5LWpBix4G8OZg+3kj9
+cibLVWMUGkHmpEyPVG+0DeAHiqul2OSR06KZqLCEfxKlX3KCg4+E5WbaXRxgqQkq
+ExW3H2ZlU4pT2BQ1uDwaRBh3xP61iyO7myLnaHNF7FM0JYR1Q69MnrXr90efvCEv
+DA72nudps/Urm8ONPQWs07P0A9q86uUGBI52lEEtXEI4J3ghZxgAuXpDLU7Ts3r/
+hZXB4P41XGESkk0guoemGHCezS8ZhVfkimnvMPE3RygGbYZD6pCDwjpO6RVU4uZO
+tA38qn87inULXoEf3ycZGAKVEfvgj9r0e5S94ujQyE6IJbO5y7A5ow6091+tgAIF
+hM8pxzRsfkNGCcDLeFbzEMozt0lH/TSh6XF1rbI6WZD3BO2Ir05LqD3y42Bp3tgc
+KBfwH2ouY2zFCy6beplHL14ID/xNtwjxhcWVSvqub/ZJMv60RFN0ZWZhbiBTcGVy
+bGluZyAoRWxlZ28gU29mdHdhcmUgU29sdXRpb25zIEdtYkgpIDxzdHNwQGVsZWdv
+c29mdC5jb20+iEYEEBECAAYFAkPfrUkACgkQzMLXDT8PrcAVIwCfdbiPo0kg/Mcg
+zp5Ob43/jegZx3UAniZCIa/xv78VWo8UZ59jdupZAgnmiEYEEBECAAYFAkPfvYUA
+CgkQTFM2EcH6gvI5MACeO2S/1689cAQ9rYHkdheJltYSbiIAn3WCZaPCjgV1ahqN
+8HLD9f+QZWFNiEYEEBECAAYFAkPf0I0ACgkQmj66P/Yfc/hu6gCePjBwtpWmMPlD
+d3wotwnMcOKVrUIAn3mxgwH0GoEUuMPhTqnmpcpCyqMbiEYEEBECAAYFAkPf+bMA
+CgkQLnMM9f8aCXkbzwCfSOp/BCxm3xdReZ6sMtZ96QglcLcAnREltJJkEQqoWdKF
+D7IQXhF38xObiEYEEBECAAYFAkPgl+sACgkQ4mtqk0WHtp1m/wCdFUxUhcb7C4P0
+qBt4XdK6TCcd9XwAnjVo0S78WLaujv7T+lFGo2OrFNooiEYEEBECAAYFAkPn/BkA
+CgkQNsMm8DR4BSeumgCgphpJK/nBaHLqM3ZMMZgU022Jpj8AnRKOWwg/sTimvXR6
+WGFn+0N23d0tiEYEEBECAAYFAkSpTzUACgkQ76FAO7GR325nYACghZI5zjOENfA+
++08Lu/uS8OA+hJEAn0Txq5CBAceYX+qPiC3IK9k+wooliEYEEBECAAYFAkSphTMA
+CgkQ0JWAx4q8rvUSiQCfYJjT8WjNqW5s5KIOCK3noF/JXZcAniTPoCushqQXLaGA
+VEQOWJ0Joe77iEYEEBECAAYFAkWvaVoACgkQ/chXwiGox/502QCfW6cEghvodBL/
+LW7tpbTwzn6Ak1gAnArIDPrYpd0dOhyGzpHeeQLg2PQpiEYEEBECAAYFAkW3jGQA
+CgkQv9G0cvMd43cJgACffYnO9oYnvHvY18IJoNIy7cZN3G8An13A1pvxZjPYlcnW
+ZMOJ3CfR2MbRiEYEEBECAAYFAkW58c0ACgkQ/R0+cAphf/nb6QCgmqs/zJe4hwhS
+ScFWrXytNqjDg9AAn1RTTIB8QR3zpndEpIGIoyGvEi11iEkEMBECAAkFAkYUvccC
+HQAACgkQ5dMCc/WdJfDz9wCcDTZ4xCuT7MgqLKBvtI0bdUzIwQMAnRkdBV35fKyo
+UyuXDwNSBu37fY8JiEwEEBECAAwFAkPfrHkFgwHnersACgkQEM4FWgT/N0cS5ACf
+d3eVuTO9+kvjsYClPhAj2k28DMEAoIRCiqAfN0xLICI0R9mE6wturlmRiEwEEBEC
+AAwFAkPfwqEFgwHnZJMACgkQPa/pZIffRbLHJACg1XICi8DK+O2k2cF7agNyqjMX
+BCIAnjPxMiXrsItk2jTol9C3Cty4h0x9iEwEEBECAAwFAkPfw60FgwHnY4cACgkQ
+jo1X2NDMLekyFACg3pj+cmbvafIrE+s5QzxY0290ozUAoKeKFXecfRcp9DH4Te9R
+HYPeCb/5iEwEEBECAAwFAkPg9coFgwHmMWoACgkQdnb4FgU2uG0+EwCeNfGYHdR3
+Y1HIjfmKHJvdjuLsQywAoI67mfoabyC422oSJ1FxQ7zLP8z9iEwEEBECAAwFAkPi
+iX0FgwHknbcACgkQpcp0u6Ymje0L9ACfSpe1i+lONB6eIyngfJYY7i/k3pYAnjPd
+cyH0dPVo0e9DdiKXTxLKFe3aiEwEEBECAAwFAkSqOvUFgwEc7D8ACgkQ301HxjRk
+UtiZIACdGqBw6z7tWi131eRFx9lFbyJBzi0Anjko/8eRRJe9bahKjEKNQMjnrTij
+iEwEExECAAwFAkPf6jAFgwHnPQQACgkQXnSSbBBQopwULQCeMXiJcukYKcbmtz+U
++01Iik0sibUAoIPoIYiH6q6KN8Fu5sE5nMEk1HGgiEwEExECAAwFAkPf7qAFgwHn
+OJQACgkQ2nLYpisZLHUGEgCfcQGr4dZLn1RILdRwp50qYI8aBVQAn3hEagPSOkZw
+ph1E+qCDD0z4hGhDiF4EExECAB4CGwMGCwkIBwMCAxUCAwMWAgECHgECF4AFAkWi
+lJwACgkQ5dMCc/WdJfDrbwCfZ/MIdL86cthXu9rOdqykGpXGNicAnA9GFuJ9Vzpp
+JjQpkyzs/Y21duWliGQEExECACQFAkLkqv0CGwMFCQPCZwAGCwkIBwMCAxUCAwMW
+AgECHgECF4AACgkQ5dMCc/WdJfBMWgCgzmo/15sxqj239EB+QUsKvnTpUp4AoMZB
+VL2BtbnNOfHR2oFxk+X5xiFhiQEcBBABAgAGBQJFt3/9AAoJEAt4MvNz1i1Bw+oH
+/RhuVmwYtsJiYh7SgCLsI/CqPUH0xJZUV4MS+o9bkZsHX4lMflj0C0QZk0CKtnY3
+P82bV9yoZfnpY9VBAYhFt3Q1BEiqoULRhgGePjosWdj4ZbZT8ZzkR+Tcizpbrmxe
+6yP0Hf/KDxsxcQoVFM68YT40wPh1LjkXNgn0NxHDw01eVZc1p36gk0ta6REtt0AI
+y3G0D1HDWzQJoPh7KtyS0YrSyARfjNPp+7/irOzSjakeNsnIFZ77+GE5bFf4rUHV
+kqNn5EpnlVT6KRWtGgCbRIyAQXb4lzxGWIvtmNEa1SkQWpDQjsSfOiacfWvBWL7S
+Y/i/YwIQBzqLxaBSojK2q7WJASIEEwECAAwFAkPf658FgwHnO5UACgkQjj4ZeCrc
+MLVgBwf6Aq0ZZ5wvwgd4wkneROn26U2Jh3dQte3hq6IzwP0PFDbExtkvccKT2oMY
+/2JF4XitNCXRuo+sx2G4b5ZBR5xlylphCToB07d0KWXjpLkuo53Livd7HNDjfZME
+TM7RgM6nRjM9x3Z6iq4vlI1GsKsUIDs5jbxuk4UlGBBxCJ0Kn9+ahirVuArqoOFD
+qJtjhtUQHTWr3KxbMyC5TK/qqhY6nPogdreddLDRB1VSLmS+BLfuYMMM50yeM/YR
+MlPR2uPg17k3eRONdfZwg2si4RNZdrgFLRWAmYalTW4E7TNnP3HVmH0nNUIrMwvo
+P2fbJBX/u9EhtSXd9nuKGLFgDs/emYkCHAQQAQIABgUCQ9+0aAAKCRC5SfsfFO9L
+RArVD/4g12UR32BAsqFIrcJWebMJG6wPtSpBmJYrXUa/Fo2W10NEfKvLDsI45rvq
+qHXcxC13TEI72BGL5qZDav9hXhLE8IAGVtI3TRW9+XgqHgF7/26GOeqJ2SkW+JLP
++ynhdKELSYEsS0/A6jcAmrR7xFKt7k64MQaO6gWSK3vaeZ8fsxeZjeZmu1/m+8nX
+fSN6+JHErnB6kixFKWZQbec9vY+jWhkQ6Ahh+ktZSYajtYATWL5vXzOI/E28Ckxl
+cyHJjQOA0kiCPVNSiPN0s9wzb2lypZ3DR1sOci/rr2n/6orsKebeyJbmcznTK1ZT
+rCSQ0h0tj1su0nJ87EARE0fU3bPWLTW5BbV2TpOb0Ll7+fRgRbIB57OzitTO00Pb
+HpwGWg21T96KSNgZgEn9T5lpHAnARZXPjx9r1XCAbYffvJvsBGYqSCg11n50xn1d
+6z+8TKeBqrNr/O95peWbZQMYKv+FPEwLlRh5hCECAauJcqBW8wYkFhU1uaEej0CG
+E17KRqdnzcuPDZHs0tcCqIH9v4jbx2+r/jTaKFgO+c5Zb68v0T3j0oo57lf6m7v9
+VzohFGx/JNTibOHqU+lYQiVR9hwCFce4wZZ9kBRYMuG4wNkA0cfUzEfvc3J9iNg6
+sld24OBO5PpvhH1ogYBHwtvR1pZlsDzHtOUZjyJZ8CvEys2THYkCHAQTAQIABgUC
+RKmaGQAKCRCRXFcJaQXEjQm7D/9rgqE9YBfY92YM+8yArl8tBHF9FVt1NG+DHDhj
+Ec8RyR2WMWGTkKR99QEnRIA7Yr2jBWR0l1mCzWsMBCkvobsYDWhKGHMTKHNuLbb5
+p/lfypx4rd6SmzCF3bTyaIdjh5KwNKgiWKloEZJzQCvSgVLGuNUrxROHv7ijTh+O
+xQsHhcyahDy6DKZDGjW1gtq7iKAenosCqk6LqKiKseoC2Ju4EBYrFiarNB5vjAyI
+fbzvLY4IsaZjpteZG9fK7PMh2fcIHLkVY/rSPmr8jX2Pt+mZRQk/DK+qey1JicSz
+iLfs3uPWVc1DhYElQdY4YYlXPk7ciLl7Du1dLcESNFC3VZ4UInWymDEGEczIm+Q7
+M6/clQOQBgiXr+8PSI0qq1k94Nkwd4qAbVbAyn7D3TD5Mp2URKkw4Or3igbl5Ys1
+r7K1SEtDtkiERBJ33A1X0lV1LuPmAuqXbS3d6WCsayThq3QyOz3BQmmCsHYKZOc/
+WcvN57bSVAqcsbyBAKE8I4jrtXuvczdqUu3RzgLlXrF8uUtzFGVmxJLC1TMb10cY
+/sOLlG45OA7CDtfMj68KAGVjirtfwUPSa4wBzP6phdmd+Lje/HTIVG7JY/lkyMx0
+aJ/nwmGfiZdGTxXGqxxdEEbWEQc1tWmAayY0asg/oNoQFKPuSjcfHENOJF/Qxh83
+Rd5BhIkCHAQTAQIABgUCRQF29gAKCRDc6/VdtCKXPOqED/9cgeMOudxMgy3Icq3U
+UvWVQ7oVtnWdXuL1nEDRzDvsPwJ/Em3w4JfZnyYO/jYh47dx1zEdJ9eHzsJRBbAu
+H0OrWDnL7z2SINV5ORhGQoAmUNhuMRRjMuMYYUWYIyCeAd3bo5PV4zECvrz59VhR
+VLttcvNIST8iSnUkc7FB8t2m0+44N+kS+q5xEs4wltefQtLGunCec16txXS2H7QT
+tHy/8pXv6dLkBzh9wRZJRBHG4gRLeGOvD4goe+Y2AGvZxAOgndtKq79BZY3Mtofk
+PbkbLdoPMG5xMPUUL3feMXhNJoUwyroS2DswzOlphmLFSi4Uj05I7pq3Dx2IJ1p4
+4C8LFtkn3WVHFRDHxFqSUxhzT5vFvTDFbnEp2mmp6YeJ3PN5NXwSjjbioL7u791Y
+K9EQ9mFcT1yYsBCMDOuVJFPIT8a9DFDreO4dqrPZBHDgS+M3gSPx32fnooMdI1dT
+sIU2KjDn/LPhdsXAkWXKlBJSpCgvCIEeATg9GvxX2g6akHf9MVinK+nkIyshmqXX
+La/k1WkOsd0+vXjOPPbaPHeQR4GF2pcQu3Inr4ZcbIPn7Vw5IeyndzR1m3lKhSP7
+qNtoi4tAx5+sbmmuKHy0c0bYK7Ya8R3Vhnse8bI60n6hDk9Z6ai3bi+zSZr2i8vO
+SkkAn06TIdZzL0D7UzRbr0165rQiU3RlZmFuIFNwZXJsaW5nIDxzdHNwQG9wZW5i
+c2Qub3JnPohgBBMRAgAgBQJJX5/eAhsDBgsJCAcDAgQVAggDBBYCAwECHgECF4AA
+CgkQ5dMCc/WdJfB39QCgm3DX0mV+UvTylxMqJV2Ac8C8rr0An1YDBaocUNAHzeNk
+P043XLRkUTfcuQENBEIEwDQQBACXm0m0J9+VWqt2ClmDBq2FT4WR0CaQPZdSfI9k
+SFdCtfiNziyNzKX9Kn2XGrGuehgZ8Ifs4W266rBzgMHabLMj+4kxLVqpIa5u7w7v
+wTzckyvpuC4sBCt2tRsWxiFRtnv9TgZxKyB9eglo4VoPH4aAMGZiUimnVk9R7CmU
+AAmwiwADBQP+MYv6akqIsrf37+z9nXp4/IGHq/RL9oKcM56QLOhQR+9dZ7Rdjpx9
+4WEgdY1acxSCZDm7Go1qjfQiOnOq6zlZwmPN+H4IukZjW+ngTK3RRhljzgFHApDl
+UsQuXFGn3LOELGq2f2bScijOUUIBVBWOXBYFO1dGfTgGRo3OWjonOEKISQQYEQIA
+CQIbDAUCRaz/YQAKCRDl0wJz9Z0l8CwvAJwNo2BQeDxU1rB8NTskmr5c+ho3uACd
+FLmvizMb+rhjJkam9F4RJQG4bfKZAaIESPIj7REEALYm2voE3Kn65GBQe8BFtKCC
+NHVcABcq13h/1FAhA/7yC6rSwml7oGqQefclmLGaIRXvBMeCTJ2C6aVAGTF2ZcX2
+YERdDjP2LlSW95kwqp4wQyucGYxizqGPSFL8vA0/UsdW3IBLwlyy/xRhRbivazXW
+PNMPmifiI4RHVvzv2EEDAKDYANU/ObLAmxRdtsxLs0aLaZa6RQP+Kl6RIevHtwPt
+JGOsj3fiseQsHpKcEVMaEvcug/HRK0aPxAH2/0YJrBssnLchsWIyeN74/ty0ZYGw
+/PZY1MCHjEdAypgSEA3PNDFrlYpkWUidHg2EGZAlXvcW2qppKnBSIUEA26FGsJFV
+nSKZxIEKpf/nmf5lpMUD61kBYFbord4EAJ6dEoLtemuuadzA3LNer0oW3Sw6c+x3
+rX4eYwbzSSJaE+rRw8WIjSHkB46dwGJfQSaVi/5cUHLxggW/Hqg5YEzmMFAY1Vs6
+hdL7SVipu+U134Fgb/XLivwVjfZd2sAOM09q00z9FlMYG9mbzEffiR25B7mkS3DV
+2vvNufEqhKsZtDxBcmZyZXZlciBGcmVodGVzIFRhaWZlcnNhciBBcmFoZXNpcyA8
+QXJmcmV2ZXIuRlRBQEdNYWlsLkNvbT6IZgQTEQIAJgUCSPIj7QIbAwUJAO1OAAYL
+CQgHAwIEFQIIAwQWAgMBAh4BAheAAAoJEGDPaoEP8zljwxwAn1gn3WVmDrM9BFP6
+5E5aVOWptow9AJ92XgWv7dPdQHgIF13qvEjEM4H8H7kEDQRI8iPtEBAA3H5liPjR
+uwQ/yWjH0ihPvAw3iWfpuhGyNYFP1PZyDkGcl6L+S+W1t/Xj0Ug+0pZyF0tTzYiz
+Ws4dNUWppVofOq1UmugJUlbFCnIYFX/PbE/xn7aT3pEdhPH1cUgKt2WUwwdwJ+6x
+s1dh79abY8v+Y4wyEeG/Zkl9Vd118cke8KHWBvvFwz01cpUWHk9djIW3l6D9C0rW
+to1tNab7lPDjC3/fdeJxt5eV6BDPDdRx2spTCbYIP+8G4SmAM9y0/6i4ZAjNArW/
+Hz25a0LzU8mSCUjG979daJvA45dBEjYPow9YSkLlvtsJkyDHqmA6UGtcbQ2MBkr/
+R/tIMcN5lilEb3w+nhekJzOkRborhzlUBI2fpbmaNalMPkFXwIPWKHSx5fK7cFFN
+K3ev44MyE12aP3UlAjpHqw8IEzJB/0Tb6pyUDid8Prx+EVaje53vvOk+gmZ3wQJ0
+Ttic9NwuUGYPTpV/RaGY2Eqmj5M5ILQVOvy64INqlAepvmRrEfkXAq8RB31Ua/oQ
+oz9XoUtAu3XTViRsXWmGyAw9cIbmgBDq0QCE68qwagGsypR7BTr0KLUfadAPizvN
+I2ar2Rqn3vDam+UtHZD5Z0m8i09wz0MKnHKF8waD/MfHHgpmVH9WuzBgtE1+lgKK
+E+nLwog5C+Jb/loZ/qSXGyLYmVYwTZTe5MMAAwYP/1NzFQelGczrdsIPRtaEksN3
+Y+lPTAp1+V42+s7T6ymbs/9v21U0e4XL4A0Zp/HbsLJLNl+4lWHLVO3Jcc8gAKdQ
+23hk8haDDVr7zjFfUfmv76E8/5ds48moRCKIuykBp3NDNT5Le4nK57JBH6HAkhEj
+Z/uIgnNNtjbzuKliIT+rFgk2zZ7oGQO9q2BD/21VYzZUUQZ5jyFpbUVjS3FRPjMg
+rUY8MSCy4c2YNy5OwC/7nj10vlOwaC3PUWZ2PQbbXY9DEPFkHzFoXMEZMPWDE7q0
+/XCuGHEJjKxzNel8AQrF5MgnbtDdKAwUZ3iT2+CrlFCu4+mc9mR8JAIon2/9Q2cL
+uaONb+xJwmZV0CTp7S/PMd8LkoaKC6xX5c7qFuJua505GNDeBDLb/xsPbh6XZ75v
+w+smJFXuWJ/qiCRDspPtXpBAT3ZR+0fy6gwa/1MjR74nPRBozwFdCEB5S/+qMR3R
+81MVugiBNDeGaQI9TBctDlGDYCJGK8clL6WRgebW8pEc7xo+Y47OkWmjUu9tqb1d
+M56kBgdi9NR7QSPsX/TUlT40dQ7jVJviXQG1Y1XtEcjOnfImfapngRSAr0/CYKum
+vJcf38RgsA9BmucvDDbuAYpFCVzL5ZqwNs+cl6pjCaB5anU+rCXwDaQHHEz6f/ee
+gA+okSUJUtzmF1CzHokwiE8EGBECAA8FAkjyI+0CGwwFCQDtTgAACgkQYM9qgQ/z
+OWNEYQCfQ6sOh1iYLuGs1acdB4FXhUMRfokAn1Cu6cYxiAwPXttMliqLESh6XvOj
+=sNYb
 -----END PGP PUBLIC KEY BLOCK-----



From pkgdb at fedoraproject.org  Fri Jan 30 12:45:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 12:45:37 +0000
Subject: [pkgdb] ruby had acl change status
Message-ID: <20090130124541.929A12084B7@bastion.fedora.phx.redhat.com>

kanarip has set the watchcommits acl on ruby (Fedora 10) to Approved for tagoh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ruby



From pkgdb at fedoraproject.org  Fri Jan 30 12:45:47 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 12:45:47 +0000
Subject: [pkgdb] ruby had acl change status
Message-ID: <20090130124552.C6389208493@bastion.fedora.phx.redhat.com>

kanarip has set the watchcommits acl on ruby (Fedora 9) to Approved for tagoh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/ruby



From caolanm at fedoraproject.org  Fri Jan 30 12:48:41 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Fri, 30 Jan 2009 12:48:41 +0000 (UTC)
Subject: rpms/openoffice.org/F-10
	openoffice.org-3.0.1.ooo98649.svtools.missingUI.patch, NONE,
	1.1 openoffice.org.spec, 1.1713, 1.1714
Message-ID: <20090130124841.90DCB70117@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10626/F-10

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-3.0.1.ooo98649.svtools.missingUI.patch 
Log Message:
Resolves: rhbz#483223 openoffice.org-3.0.1.ooo98649.svtools.missingUI.patch

openoffice.org-3.0.1.ooo98649.svtools.missingUI.patch:

--- NEW FILE openoffice.org-3.0.1.ooo98649.svtools.missingUI.patch ---
Index: source/misc/acceleratorexecute.cxx
===================================================================
RCS file: /cvs/util/svtools/source/misc/acceleratorexecute.cxx,v
retrieving revision 1.14
diff -u -r1.14 acceleratorexecute.cxx
--- openoffice.org.orig/svtools/source/misc/acceleratorexecute.cxx	30 May 2008 07:33:46 -0000	1.14
+++ openoffice.org/svtools/source/misc/acceleratorexecute.cxx	30 Jan 2009 12:25:52 -0000
@@ -450,8 +451,14 @@
         xSMGR->createInstance(::rtl::OUString::createFromAscii("com.sun.star.ui.ModuleUIConfigurationManagerSupplier")),
         css::uno::UNO_QUERY_THROW);
 
-    css::uno::Reference< css::ui::XUIConfigurationManager >   xUIManager = xUISupplier->getUIConfigurationManager(sModule);
-    css::uno::Reference< css::ui::XAcceleratorConfiguration > xAccCfg    (xUIManager->getShortCutManager(), css::uno::UNO_QUERY_THROW);
+    css::uno::Reference< css::ui::XAcceleratorConfiguration > xAccCfg;
+	try
+	{
+    	css::uno::Reference< css::ui::XUIConfigurationManager >   xUIManager = xUISupplier->getUIConfigurationManager(sModule);
+	    xAccCfg = css::uno::Reference< css::ui::XAcceleratorConfiguration >(xUIManager->getShortCutManager(), css::uno::UNO_QUERY_THROW);
+	}
+    catch(const css::container::NoSuchElementException&)
+        {}
     return xAccCfg;
 }
 


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-10/openoffice.org.spec,v
retrieving revision 1.1713
retrieving revision 1.1714
diff -u -r1.1713 -r1.1714
--- openoffice.org.spec	20 Jan 2009 16:28:00 -0000	1.1713
+++ openoffice.org.spec	30 Jan 2009 12:48:10 -0000	1.1714
@@ -1,6 +1,6 @@
 %define oootag OOO300
 %define ooomilestone 15
-%define rh_rpm_release 2
+%define rh_rpm_release 3
 
 # rhbz#465664 jar-repacking breaks help by reordering META-INF/MANIFEST.MF
 %define __jar_repack %{nil}
@@ -136,6 +136,7 @@
 Patch63: openoffice.org-3.1.0.ooo98137.filter.redeclared-variables.patch
 Patch64: openoffice.org-3.0.1.ooo98240.sc.basicworkaround.patch
 Patch65: openoffice.org-3.0.1.ooo98288.ucb.neonchange.patch
+Patch66: openoffice.org-3.0.1.ooo98649.svtools.missingUI.patch
 
 %define instdir %{_libdir}
 %define baseinstdir %{instdir}/openoffice.org
@@ -1396,6 +1397,7 @@
 %patch63 -p1 -b .ooo98137.filter.redeclared-variables.patch
 %patch64 -p1 -b .ooo98240.sc.basicworkaround.patch
 %patch65 -p1 -b .ooo98288.ucb.neonchange.patch
+%patch66 -p1 -b .ooo98649.svtools.missingUI.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -3762,6 +3764,9 @@
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
+* Fri Jan 30 2009 Caol??n McNamara <caolanm at redhat.com> - 1:3.0.1-15.3
+- Resolves: rhbz#483223 openoffice.org-3.0.1.ooo98649.svtools.missingUI.patch
+
 * Tue Jan 20 2009 Caol??n McNamara <caolanm at redhat.com> - 1:3.0.1-15.2
 - Resolves: rhbz#479624 add
   openoffice.org-3.0.1.ooo98024.vcl.emboldenoverlap.patch



From caolanm at fedoraproject.org  Fri Jan 30 12:48:41 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Fri, 30 Jan 2009 12:48:41 +0000 (UTC)
Subject: rpms/openoffice.org/devel
	openoffice.org-3.0.1.ooo98649.svtools.missingUI.patch, NONE,
	1.1 openoffice.org.spec, 1.1774, 1.1775
Message-ID: <20090130124841.D45BB70117@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10626/devel

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-3.0.1.ooo98649.svtools.missingUI.patch 
Log Message:
Resolves: rhbz#483223 openoffice.org-3.0.1.ooo98649.svtools.missingUI.patch

openoffice.org-3.0.1.ooo98649.svtools.missingUI.patch:

--- NEW FILE openoffice.org-3.0.1.ooo98649.svtools.missingUI.patch ---
Index: source/misc/acceleratorexecute.cxx
===================================================================
RCS file: /cvs/util/svtools/source/misc/acceleratorexecute.cxx,v
retrieving revision 1.14
diff -u -r1.14 acceleratorexecute.cxx
--- openoffice.org.orig/svtools/source/misc/acceleratorexecute.cxx	30 May 2008 07:33:46 -0000	1.14
+++ openoffice.org/svtools/source/misc/acceleratorexecute.cxx	30 Jan 2009 12:25:52 -0000
@@ -450,8 +451,14 @@
         xSMGR->createInstance(::rtl::OUString::createFromAscii("com.sun.star.ui.ModuleUIConfigurationManagerSupplier")),
         css::uno::UNO_QUERY_THROW);
 
-    css::uno::Reference< css::ui::XUIConfigurationManager >   xUIManager = xUISupplier->getUIConfigurationManager(sModule);
-    css::uno::Reference< css::ui::XAcceleratorConfiguration > xAccCfg    (xUIManager->getShortCutManager(), css::uno::UNO_QUERY_THROW);
+    css::uno::Reference< css::ui::XAcceleratorConfiguration > xAccCfg;
+	try
+	{
+    	css::uno::Reference< css::ui::XUIConfigurationManager >   xUIManager = xUISupplier->getUIConfigurationManager(sModule);
+	    xAccCfg = css::uno::Reference< css::ui::XAcceleratorConfiguration >(xUIManager->getShortCutManager(), css::uno::UNO_QUERY_THROW);
+	}
+    catch(const css::container::NoSuchElementException&)
+        {}
     return xAccCfg;
 }
 


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1774
retrieving revision 1.1775
diff -u -r1.1774 -r1.1775
--- openoffice.org.spec	28 Jan 2009 23:28:52 -0000	1.1774
+++ openoffice.org.spec	30 Jan 2009 12:48:11 -0000	1.1775
@@ -1,6 +1,6 @@
 %define oootag OOO300
 %define ooomilestone 15
-%define rh_rpm_release 5
+%define rh_rpm_release 6
 
 # rhbz#465664 jar-repacking breaks help by reordering META-INF/MANIFEST.MF
 %define __jar_repack %{nil}
@@ -135,6 +135,7 @@
 Patch64: openoffice.org-3.0.1.ooo98240.sc.basicworkaround.patch
 Patch65: workspace.cmcfixes54.patch
 Patch66: openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch
+Patch67: openoffice.org-3.0.1.ooo98649.svtools.missingUI.patch
 
 %define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
 %define instdir %{_libdir}
@@ -1422,6 +1423,7 @@
 %patch64 -p1 -b .ooo98240.sc.basicworkaround.patch
 %patch65 -p1 -b .workspace.cmcfixes54.patch
 %patch66 -p1 -b .gccXXXXX.solenv.javaregistration.patch
+%patch67 -p1 -b .ooo98649.svtools.missingUI.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -3833,6 +3835,9 @@
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
+* Fri Jan 30 2009 Caol??n McNamara <caolanm at redhat.com> - 1:3.0.1-15.6
+- Resolves: rhbz#483223 openoffice.org-3.0.1.ooo98649.svtools.missingUI.patch
+
 * Sat Jan 24 2009 Caol??n McNamara <caolanm at redhat.com> - 1:3.0.1-15.5
 - cjkunifonts-uming -> cjkuni-uming-fonts
 



From jskala at fedoraproject.org  Fri Jan 30 12:51:08 2009
From: jskala at fedoraproject.org (Jiri Skala)
Date: Fri, 30 Jan 2009 12:51:08 +0000 (UTC)
Subject: rpms/mgetty/F-9 mgetty-1.1.36-caller_name.patch, NONE,
	1.1 .cvsignore, 1.10, 1.11 mgetty-1.1.25-voiceconfig.patch, 1.1,
	1.2 mgetty-1.1.26-issue.patch, 1.3,
	1.4 mgetty-1.1.26-policy.patch, 1.2,
	1.3 mgetty-1.1.29-config.patch, 1.1,
	1.2 mgetty-1.1.29-helper.patch, 1.1,
	1.2 mgetty-1.1.30-mktemp.patch, 1.1,
	1.2 mgetty-1.1.30-unioninit.patch, 1.1,
	1.2 mgetty-1.1.31-162174_tcflush.patch, 1.2,
	1.3 mgetty-1.1.31-helper2.patch, 1.1,
	1.2 mgetty-1.1.31-issue-doc.patch, 1.1,
	1.2 mgetty-1.1.31-lfs.patch, 1.1,
	1.2 mgetty-1.1.31-no-acroread.patch, 1.1,
	1.2 mgetty-1.1.31-sendmail_path.patch, 1.2,
	1.3 mgetty-1.1.33-167830.patch, 1.1,
	1.2 mgetty-1.1.33-167830_tty_access.patch, 1.1,
	1.2 mgetty-1.1.33-bug_63843.patch, 1.1, 1.2 mgetty.spec, 1.48,
	1.49 sources, 1.9, 1.10 mgetty-1.1.21-giftopnm.patch, 1.2,
	NONE mgetty-1.1.25-faxprint.patch, 1.1,
	NONE mgetty-1.1.30-path.patch, 1.1,
	NONE mgetty-1.1.31-W-format.patch, 1.1,
	NONE mgetty-1.1.33-sprintf_chk.patch, 1.1, NONE
Message-ID: <20090130125108.96C4670117@cvs1.fedora.phx.redhat.com>

Author: jskala

Update of /cvs/extras/rpms/mgetty/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11186

Modified Files:
	.cvsignore mgetty-1.1.25-voiceconfig.patch 
	mgetty-1.1.26-issue.patch mgetty-1.1.26-policy.patch 
	mgetty-1.1.29-config.patch mgetty-1.1.29-helper.patch 
	mgetty-1.1.30-mktemp.patch mgetty-1.1.30-unioninit.patch 
	mgetty-1.1.31-162174_tcflush.patch mgetty-1.1.31-helper2.patch 
	mgetty-1.1.31-issue-doc.patch mgetty-1.1.31-lfs.patch 
	mgetty-1.1.31-no-acroread.patch 
	mgetty-1.1.31-sendmail_path.patch mgetty-1.1.33-167830.patch 
	mgetty-1.1.33-167830_tty_access.patch 
	mgetty-1.1.33-bug_63843.patch mgetty.spec sources 
Added Files:
	mgetty-1.1.36-caller_name.patch 
Removed Files:
	mgetty-1.1.21-giftopnm.patch mgetty-1.1.25-faxprint.patch 
	mgetty-1.1.30-path.patch mgetty-1.1.31-W-format.patch 
	mgetty-1.1.33-sprintf_chk.patch 
Log Message:
* Fri Jan 30 2009 Jiri Skala <jskala at redhat.com> - 1.1.36-1
- re-base to latest upstream
- Resolves: #232522 - mgetty does not collect caller name from modem properly


mgetty-1.1.36-caller_name.patch:

--- NEW FILE mgetty-1.1.36-caller_name.patch ---
diff -up mgetty-1.1.36/callback/callback.c.caller_name mgetty-1.1.36/callback/callback.c
--- mgetty-1.1.36/callback/callback.c.caller_name	2009-01-30 08:47:53.000000000 +0100
+++ mgetty-1.1.36/callback/callback.c	2009-01-30 08:49:15.000000000 +0100
@@ -396,7 +396,7 @@ char * r;
 /* provide some "dummy" things for do_chat(), otherwise callback won't link */
 /*!!! FIXME - we don't really want this */
 int virtual_ring = FALSE;
-void cndfind _P1( (p), char * p ) { /* DUMMY */ }
+int cndfind _P1( (p), char * p ) { /* DUMMY */ }
 
 int main _P2((argc, argv), int argc, char ** argv)
 {
diff -up mgetty-1.1.36/cnd.c.caller_name mgetty-1.1.36/cnd.c
--- mgetty-1.1.36/cnd.c.caller_name	2009-01-30 08:48:07.000000000 +0100
+++ mgetty-1.1.36/cnd.c	2009-01-30 09:09:36.000000000 +0100
@@ -104,7 +104,7 @@ struct cndtable cndtable[] =
 };
     
 
-void
+int
 cndfind _P1((str), char *str)
 {
     struct cndtable *cp;
@@ -124,56 +124,82 @@ cndfind _P1((str), char *str)
        asked for it with AT\O. The CID will simply get sent on a single
        line consisting only of digits. So, if we get a line starting
        with a digit, let's assume that it's the CID...
+       The USRobotics can send unformatted caller id data. Allow for that as well.
      */
     if ( isdigit(*str) )
     {
-	CallerId = p = strdup(str);
-	while( isdigit(*p) ) p++;
-	*p = 0;
-	lprintf( L_NOISE, "CND: ELink caller ID: '%s'", CallerId );
-	return;
+			int CheckSum=0; // to validate possible unformatted display
+ 			int digit;
+			CallerId = p = strdup(str);
+			while( isxdigit(*p) ) p++;
+			*p = 0;
+ 			// Check for an unformatted display of caller id. Calculate FSK checksum...
+			p = CallerId;
+	 		while (*p)
+			{
+	 			if (isdigit(*p))
+					digit = (*p - '0');
+ 				else digit = 10 + (tolower(*p) - 'a');
+ 				CheckSum += (digit << 4);
+		 		p++;
+ 				if (!*p)
+					break; // odd number of characters, not proper hex, cannot be FSK
+	 			if (isdigit(*p))
+					digit = (*p - '0');
+	 			else digit = 10 + (tolower(*p) - 'a');
+ 				CheckSum += digit;
+				CheckSum &= 255;
+ 				p++;
+		 	}
+			if (CheckSum == 0)
+			{
+				lprintf( L_NOISE, "CND: ELink caller ID: '%s'", CallerId );
+				return 4;
+			}
+			return 1;
     }
 
     for (cp = cndtable; cp->string; cp++)
     {
-	len = strlen(cp->string);
-	if (strncmp(cp->string, str, len) == 0)
-	{
-	    if (!cp->variable)
-		return;
-
-	    /* special case: Rockwell sends *two* MESG=... lines */
-	    if (cp->variable == &CallMsg1 && CallMsg1[0] != 0)
-		continue;
-
-	    /* special case for CONNECT on Rockwell-Based modems */
-	    if ( ( cnd_carrier[0] != 0 || cnd_protocol[0] != 0 ) &&
-		 strncmp( str, "CONNECT ", 8 ) == 0 )
-	    {
-		*(cp->variable) = malloc( strlen(str) - len +
-		                  strlen( cnd_carrier ) +
-				  strlen( cnd_protocol ) + 5 );
-		sprintf( *(cp->variable), "%s/%s %s",
-			 str+len, cnd_carrier, cnd_protocol );
-	    }
-	    else	/* normal case */
-	    {
-		*(cp->variable) = p = malloc(strlen(str) - len + 1);
-		(void) strcpy(*(cp->variable), str+len);
-
-		/* nuke quotes and non-printable characters (some of this 
-		 * stuff is passed to shell commands and environment vars)
-		 */
-		while( *p != '\0' )
-		{ 
-		    if ( *p == '\'' || *p == '\"' || !isprint(*p) ) *p = ' ';
-		    p++;
-		}
-	    }
-	    lprintf(L_JUNK, "CND: found: %s", *(cp->variable));
-	    return;
-	}
+			len = strlen(cp->string);
+			if (strncmp(cp->string, str, len) == 0)
+			{
+	  	  if (!cp->variable)
+					return 0;
+
+	    	/* special case: Rockwell sends *two* MESG=... lines */
+		    if (cp->variable == &CallMsg1 && CallMsg1[0] != 0)
+					continue;
+
+		    /* special case for CONNECT on Rockwell-Based modems */
+		    if ( ( cnd_carrier[0] != 0 || cnd_protocol[0] != 0 ) &&
+						 strncmp( str, "CONNECT ", 8 ) == 0 )
+		    {
+					*(cp->variable) = malloc( strlen(str) - len +
+		      	strlen( cnd_carrier ) +
+					  strlen( cnd_protocol ) + 5 );
+					sprintf( *(cp->variable), "%s/%s %s",
+						str+len, cnd_carrier, cnd_protocol );
+		    }
+		    else	/* normal case */
+	  	  {
+					*(cp->variable) = p = malloc(strlen(str) - len + 1);
+					(void) strcpy(*(cp->variable), str+len);
+
+					/* nuke quotes and non-printable characters (some of this 
+					 * stuff is passed to shell commands and environment vars)
+					 */
+					while( *p != '\0' )
+					{ 
+				    if ( *p == '\'' || *p == '\"' || !isprint(*p) ) *p = ' ';
+				    p++;
+					}
+		    }
+		    lprintf(L_JUNK, "CND: found: %s", *(cp->variable));
+	  	  return 1;
+			}
     }
+	return 0;
 }
 
 /* process Rockwell-style caller ID. Weird */
diff -up mgetty-1.1.36/mgetty.h.caller_name mgetty-1.1.36/mgetty.h
--- mgetty-1.1.36/mgetty.h.caller_name	2009-01-30 08:48:28.000000000 +0100
+++ mgetty-1.1.36/mgetty.h	2009-01-30 09:39:28.000000000 +0100
@@ -300,7 +300,7 @@ extern char *CallTime;
 extern char *CallName;
 extern char *CalledNr;
 
-void cndfind _PROTO((char *str));
+int cndfind _PROTO((char *str));
 int cndlookup _PROTO((void));
 int cnd_call _PROTO((char *name, char *tty, int dist_ring ));
 
diff -up mgetty-1.1.36/ring.c.caller_name mgetty-1.1.36/ring.c
--- mgetty-1.1.36/ring.c.caller_name	2009-01-30 08:48:17.000000000 +0100
+++ mgetty-1.1.36/ring.c	2009-01-30 09:47:03.000000000 +0100
@@ -219,6 +219,7 @@ int wait_for_ring _P6((fd, msn_list, tim
 char	buf[BUFSIZE], ch, *p;
 int	i, w, r;
 int	rc = SUCCESS;
+int need_cnd_items = 4;
 boolean	got_dle;		/* for <DLE><char> events (voice mode) */
 
     lprintf( L_MESG, "wfr: waiting for ``RING''" );
@@ -311,7 +312,7 @@ boolean	got_dle;		/* for <DLE><char> eve
 	/* got a full line */
 	if ( w == 0 ) { continue; }		/* ignore empty lines */
 	buf[w] = '\0';
-	cndfind( buf );				/* grab caller ID */
+  need_cnd_items -= cndfind( buf );	/* grab caller ID, adjust count of needed data items for cnd-program */
 
 	/* ZyXEL CallerID/MSN display? */
 	if ( strncmp( buf, "FM:", 3 ) == 0 ||
@@ -323,7 +324,8 @@ boolean	got_dle;		/* for <DLE><char> eve
 	 * instead of waiting for the next "real" RING
 	 * (but don't do this for V253 DRON/DROF modems!)
 	 */
-	if ( strncmp( buf, "NMBR", 4 ) == 0 && drox_count == 0 ) { break; }
+	//if ( strncmp( buf, "NMBR", 4 ) == 0 && drox_count == 0 ) { break; }
+  if ( (need_cnd_items <= 0) && (drox_count == 0) ) { break; }
 
 	/* V.253 ring cadences */
 	if ( strncmp( buf, "DRON", 4 ) == 0 ||


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mgetty/F-9/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	5 Mar 2008 17:28:42 -0000	1.10
+++ .cvsignore	30 Jan 2009 12:50:36 -0000	1.11
@@ -1,3 +1 @@
-faxq-helper.8
-mgetty1.1.33-Apr10.tar.gz
-mgetty1.1.33-Apr10.tar.gz.asc
+mgetty1.1.36-Jun15.tar.gz

mgetty-1.1.25-voiceconfig.patch:

Index: mgetty-1.1.25-voiceconfig.patch
===================================================================
RCS file: /cvs/extras/rpms/mgetty/F-9/mgetty-1.1.25-voiceconfig.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mgetty-1.1.25-voiceconfig.patch	9 Sep 2004 08:27:55 -0000	1.1
+++ mgetty-1.1.25-voiceconfig.patch	30 Jan 2009 12:50:36 -0000	1.2
@@ -1,8 +1,7 @@
-Eek!  We don't create a phone group by default.  Use the uucp group, which
-owns the serial ports.
---- mgetty-1.1.25/voice/voice.conf-dist.voiceconfig	Tue Mar 20 18:24:12 2001
-+++ mgetty-1.1.25/voice/voice.conf-dist	Tue Mar 20 18:24:20 2001
-@@ -51,7 +51,7 @@
+diff -up mgetty-1.1.36/voice/voice.conf-dist.voiceconfig mgetty-1.1.36/voice/voice.conf-dist
+--- mgetty-1.1.36/voice/voice.conf-dist.voiceconfig	2008-10-09 22:56:11.000000000 +0200
++++ mgetty-1.1.36/voice/voice.conf-dist	2008-10-09 22:56:11.000000000 +0200
+@@ -51,7 +51,7 @@ voice_dir /var/spool/voice
  #
  
  phone_owner root

mgetty-1.1.26-issue.patch:

Index: mgetty-1.1.26-issue.patch
===================================================================
RCS file: /cvs/extras/rpms/mgetty/F-9/mgetty-1.1.26-issue.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- mgetty-1.1.26-issue.patch	18 Feb 2008 15:23:21 -0000	1.3
+++ mgetty-1.1.26-issue.patch	30 Jan 2009 12:50:36 -0000	1.4
@@ -1,41 +1,7 @@
-This patch allows mgetty to interpret escape sequences in issue files
-in the same fashion as agetty, which apparently is the model that
-mingetty follows as well.  The specifics, excerpted from the agetty
-man page:
-
-ISSUE ESCAPES
-       The issue-file (/etc/issue or the file set with the -f option) may contain certain escape codes  to  display
-       the  system name, date and time etc. All escape codes consist of a backslash (\) immediately followed by one
-       of the letters explained below.
-
-       b      Insert the baudrate of the current line.	[mgetty sends a backspace]
-
-       d      Insert the current date.	[mgetty ignores this -- it expects upper case]
-
-       s      Insert the system name, the name of the operating system.
-
-       l      Insert the name of the current tty line.	[mgetty ignores this]
-
-       m      Insert the architecture identifier of the machine, eg. i486
-
-       n      Insert the nodename of the machine, also known as the hostname.
-
-       o      Insert the domainname of the machine.
-
-       r      Insert the release number of the OS, eg. 1.1.9.	[mgetty sends a carriage return]
-
-       t      Insert the current time.	[mgetty sends a horizontal tab for this]
-
-       u      Insert the number of current users logged in.
-
-       U      Insert the string "1 user" or "<n> users" where <n> is the number of current users logged in.
-
-       v      Insert the version of the OS, eg. the build-date etc.	[mgetty sends a vertical tab (?)]
-
-
---- mgetty-1.1.26/logname.c	Tue Sep  1 05:56:19 1998
-+++ mgetty-1.1.26/logname.c	Tue Jul 24 18:11:31 2001
-@@ -87,12 +87,14 @@
+diff -up mgetty-1.1.36/logname.c.issue mgetty-1.1.36/logname.c
+--- mgetty-1.1.36/logname.c.issue	2008-10-09 22:56:17.000000000 +0200
++++ mgetty-1.1.36/logname.c	2008-10-09 22:56:17.000000000 +0200
+@@ -97,12 +97,14 @@ char * ln_escape_prompt _P1( (ep), char 
  	    switch ( *ep )
  	    {
  	      case 'n': p[i++] = '\n'; break;
@@ -52,7 +18,7 @@
  	      case 's':					/* Operating System */
  		    if ( i + strlen(un.sysname) +1 > MAX_PROMPT_LENGTH ) break;
  		    i += strappnd( &p[i], un.sysname );
-@@ -101,10 +103,16 @@
+@@ -111,10 +113,16 @@ char * ln_escape_prompt _P1( (ep), char 
  		    if ( i + strlen(un.machine) +1 > MAX_PROMPT_LENGTH ) break;
  		    i += strappnd( &p[i], un.machine );
  		    break;
@@ -69,7 +35,7 @@
  	      case 'V':					/* OS version */
  		    if ( i + strlen(un.version) +1 > MAX_PROMPT_LENGTH ) break;
  		    i += strappnd( &p[i], un.version );
-@@ -116,6 +124,12 @@
+@@ -126,6 +134,12 @@ char * ln_escape_prompt _P1( (ep), char 
  		    i += strappnd( &p[i], CallerId );
  		    break;
  		}
@@ -82,7 +48,7 @@
  	      case 'P':					/* port name */
  	      case 'L':					/* tty line */
  		{
-@@ -137,13 +151,16 @@
+@@ -147,13 +161,16 @@ char * ln_escape_prompt _P1( (ep), char 
  		    i += strappnd( &p[i], Connect);
  		    break;
  		}
@@ -100,7 +66,7 @@
  	      case 'S':					/* port speed */
  		{					/* ugly, I know. */
  		    TIO temp_t;
-@@ -152,6 +169,10 @@
+@@ -162,6 +179,10 @@ char * ln_escape_prompt _P1( (ep), char 
  		    i = strlen(p);
  		}
  		break;
@@ -111,7 +77,7 @@
  	      case 'D':			/* fallthrough */
  	      case 'T':
  		if ( i + 30 > MAX_PROMPT_LENGTH )
-@@ -165,7 +186,7 @@
+@@ -175,7 +196,7 @@ char * ln_escape_prompt _P1( (ep), char 
  
  		    if ( tm == NULL ) break;
  
@@ -120,9 +86,10 @@
  		        sprintf( &p[i], "%d/%d/%d", tm->tm_mon+1,
  				 tm->tm_mday, tm->tm_year + 1900 );
  		    else
---- mgetty-1.1.26/policy.h	Tue Jul 24 18:09:27 2001
-+++ mgetty-1.1.26/policy.h	Tue Jul 24 18:09:27 2001
-@@ -221,6 +221,14 @@
+diff -up mgetty-1.1.36/policy.h.issue mgetty-1.1.36/policy.h
+--- mgetty-1.1.36/policy.h.issue	2008-10-09 22:56:17.000000000 +0200
++++ mgetty-1.1.36/policy.h	2008-10-09 22:56:17.000000000 +0200
+@@ -228,6 +228,14 @@
   */
  #define NOLOGIN_FILE "/etc/nologin.%s"
  

mgetty-1.1.26-policy.patch:

Index: mgetty-1.1.26-policy.patch
===================================================================
RCS file: /cvs/extras/rpms/mgetty/F-9/mgetty-1.1.26-policy.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mgetty-1.1.26-policy.patch	18 Feb 2008 15:23:21 -0000	1.2
+++ mgetty-1.1.26-policy.patch	30 Jan 2009 12:50:36 -0000	1.3
@@ -1,21 +1,7 @@
---- mgetty-1.1.26/voice/include/paths.h.policy	Mon Apr 16 10:53:07 2001
-+++ mgetty-1.1.26/voice/include/paths.h	Mon Apr 16 10:53:34 2001
-@@ -16,10 +16,10 @@
- 
- /*
-  * Filename of the logfile for vgetty. The "%s" will be replaced by
-- * the device name.
-+ * the device name.  We match the pattern used by mgetty for the name.
-  */
- 
--#define VGETTY_LOG_PATH "/var/log/vgetty.%s"
-+#define VGETTY_LOG_PATH "/var/log/vgetty.log.%s"
- 
- /*
-  * Filename of the logfile for vm.
---- mgetty-1.1.26/policy.h.policy	Thu Nov  2 15:26:59 2000
-+++ mgetty-1.1.26/policy.h	Mon Apr 16 10:50:12 2001
-@@ -67,7 +67,7 @@
+diff -up mgetty-1.1.36/policy.h.policy mgetty-1.1.36/policy.h
+--- mgetty-1.1.36/policy.h.policy	2008-10-09 22:56:03.000000000 +0200
++++ mgetty-1.1.36/policy.h	2008-10-09 22:56:02.000000000 +0200
+@@ -85,7 +85,7 @@
   * ZyXELs use S40.2=1.
   * If the path doesn't start with "/", it's relative to CONFDIR.
   */
@@ -24,7 +10,7 @@
  
  
  /* If you want to use /etc/gettydefs to set tty flags, define this
-@@ -96,7 +96,7 @@
+@@ -114,7 +114,7 @@
  /* group id that the device is chown()ed to. If not defined, the
   * primary group of "DEVICE_OWNER" is used.
   */
@@ -33,7 +19,7 @@
  
  /* access mode for the line while getty has it - it should be accessible
   * by uucp / uucp, but not by others (imagine someone dialing into your
-@@ -129,7 +129,7 @@
+@@ -147,7 +147,7 @@
   *
   * if the directory does not exist, the log file goes to CONSOLE (!)
   */
@@ -42,7 +28,7 @@
  
  /* Default log error level threshold. Possible error levels are
   * L_FATAL, L_ERROR, L_AUDIT, L_WARN, L_MESG, L_NOISE, L_JUNK (see mgetty.h)
-@@ -154,15 +154,20 @@
+@@ -172,15 +172,20 @@
   * mgetty will use the facility "LOG_AUTH", and the priorities
   * LOG_NOTICE, LOG_ERR and LOG_ALERT, respectively.
   */
@@ -64,7 +50,7 @@
  
  /* login stuff */
  
-@@ -175,8 +180,9 @@
+@@ -193,8 +198,9 @@
   * The "@", "\\D" and "\\T" escapes will be replaced by SYSTEM, the
   * current date and time, respectively.
   * override with "-p <prompt>" switch
@@ -73,9 +59,9 @@
 -#define LOGIN_PROMPT	"@!login: "
 +#define LOGIN_PROMPT	"@ login: "
  
- /* On SVR4, maybe on other systems too, you can cause the 'login' program
-  * to prompt with the same string as mgetty did, instead of the standard
-@@ -246,7 +252,7 @@
+ /* The old '#define ENV_TTYPROMPT' option has been superseded by setting 
+  * "login-env-ttyprompt-hack yes" in mgetty.config.  See mgetty.texi for
+@@ -256,7 +262,7 @@
  
  /* if your system isn't listed above, change that line here */
  #ifndef LOCK
@@ -84,7 +70,7 @@
  #endif
    
  /* Set this to "1" if your system uses binary lock files (i.e., the pid
-@@ -525,8 +531,9 @@
+@@ -527,8 +533,9 @@
   * (with or without leading /dev/)
   * If you don't adapt this for your needs, sendfax won't run (you can
   * set it from the sendfax.config file, though)!
@@ -95,7 +81,7 @@
  
  /* Xon or not?
   *
-@@ -584,7 +591,7 @@
+@@ -586,7 +593,7 @@
   * If you don't want this type of service, do not define it at all
   * Absolute path name has to be used here!
   */
@@ -104,3 +90,19 @@
  
  /* default minimum space required on spooling partition for receiving a FAX
   * (in KILObytes)
+diff -up mgetty-1.1.36/voice/include/paths.h.policy mgetty-1.1.36/voice/include/paths.h
+--- mgetty-1.1.36/voice/include/paths.h.policy	2008-10-09 22:56:03.000000000 +0200
++++ mgetty-1.1.36/voice/include/paths.h	2008-10-09 22:56:02.000000000 +0200
+@@ -16,10 +16,10 @@
+ 
+ /*
+  * Filename of the logfile for vgetty. The "%s" will be replaced by
+- * the device name.
++ * the device name.  We match the pattern used by mgetty for the name.
+  */
+ 
+-#define VGETTY_LOG_PATH "/var/log/vgetty.%s"
++#define VGETTY_LOG_PATH "/var/log/vgetty.log.%s"
+ 
+ /*
+  * Filename of the logfile for vm.

mgetty-1.1.29-config.patch:

Index: mgetty-1.1.29-config.patch
===================================================================
RCS file: /cvs/extras/rpms/mgetty/F-9/mgetty-1.1.29-config.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mgetty-1.1.29-config.patch	9 Sep 2004 08:31:02 -0000	1.1
+++ mgetty-1.1.29-config.patch	30 Jan 2009 12:50:36 -0000	1.2
@@ -1,8 +1,6 @@
-We install into a buildroot while unprivileged, so we can't set file ownerships.
-
---- mgetty-1.1.29/Makefile	2002-11-23 15:31:27.000000000 -0500
-+++ mgetty-1.1.29/Makefile	2002-11-25 17:26:34.000000000 -0500
-@@ -169,7 +169,8 @@
+--- mgetty-1.1.36/Makefile.config	2008-10-09 22:55:57.000000000 +0200
++++ mgetty-1.1.36/Makefile	2008-10-09 22:55:57.000000000 +0200
+@@ -164,7 +164,8 @@ LIBS=
  #
  # if your systems doesn't have one, use the shell script that I provide
  # in "inst.sh" (taken from X11R5). Needed on IRIX5.2
@@ -12,9 +10,9 @@
  #INSTALL=install -c -o root -g wheel		# NeXT/BSD
  #INSTALL=/usr/ucb/install -c -o bin -g bin	# AIX, Solaris 2.x
  #INSTALL=installbsd -c -o bin -g bin		# OSF/1, AIX 4.1, 4.2
-@@ -604,15 +605,15 @@
+@@ -596,15 +597,15 @@ install.bin: mgetty sendfax newslock \
  	test -d $(CONFDIR) || \
- 		( ./mkidirs $(CONFDIR); chmod 755 $(CONFDIR))
+ 		( ./mkidirs $(CONFDIR) && chmod 755 $(CONFDIR))
  	test -f $(CONFDIR)/login.config || \
 -		$(INSTALL) -o root -m 600 login.config $(CONFDIR)/
 +		$(INSTALL) -m 600 login.config $(CONFDIR)/

mgetty-1.1.29-helper.patch:

Index: mgetty-1.1.29-helper.patch
===================================================================
RCS file: /cvs/extras/rpms/mgetty/F-9/mgetty-1.1.29-helper.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mgetty-1.1.29-helper.patch	9 Sep 2004 08:31:02 -0000	1.1
+++ mgetty-1.1.29-helper.patch	30 Jan 2009 12:50:36 -0000	1.2
@@ -1,8 +1,7 @@
-We build without special privileges, so chown won't work here.
-
---- mgetty-1.1.29/fax/Makefile	2002-11-25 17:39:48.000000000 -0500
-+++ mgetty-1.1.29/fax/Makefile	2002-11-25 17:39:44.000000000 -0500
-@@ -61,7 +61,7 @@
+diff -up mgetty-1.1.36/fax/Makefile.helper mgetty-1.1.36/fax/Makefile
+--- mgetty-1.1.36/fax/Makefile.helper	2008-10-09 22:56:28.000000000 +0200
++++ mgetty-1.1.36/fax/Makefile	2008-10-09 22:56:28.000000000 +0200
+@@ -58,7 +58,7 @@ install: all
  	done
  	$(INSTALL) -m 755 faxrunqd $(SBINDIR)
  	$(INSTALL) faxq-helper $(LIBDIR)

mgetty-1.1.30-mktemp.patch:

Index: mgetty-1.1.30-mktemp.patch
===================================================================
RCS file: /cvs/extras/rpms/mgetty/F-9/mgetty-1.1.30-mktemp.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mgetty-1.1.30-mktemp.patch	9 Sep 2004 08:31:02 -0000	1.1
+++ mgetty-1.1.30-mktemp.patch	30 Jan 2009 12:50:36 -0000	1.2
@@ -1,9 +1,7 @@
-Use mktemp to create the stdin temporary file.  Not portable to systems
-without mktemp, unfortunately.
-
---- mgetty-1.1.30/fax/faxspool.in	2002-12-18 16:59:16.000000000 -0500
-+++ mgetty-1.1.30/fax/faxspool.in	2002-12-18 17:06:43.000000000 -0500
-@@ -637,10 +637,14 @@
+diff -up mgetty-1.1.36/fax/faxspool.in.mktemp mgetty-1.1.36/fax/faxspool.in
+--- mgetty-1.1.36/fax/faxspool.in.mktemp	2008-10-09 22:56:34.000000000 +0200
++++ mgetty-1.1.36/fax/faxspool.in	2008-10-09 22:56:34.000000000 +0200
+@@ -674,10 +674,14 @@ do
  #
      if [ x$file = x- ]
      then

mgetty-1.1.30-unioninit.patch:

Index: mgetty-1.1.30-unioninit.patch
===================================================================
RCS file: /cvs/extras/rpms/mgetty/F-9/mgetty-1.1.30-unioninit.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mgetty-1.1.30-unioninit.patch	9 Sep 2004 08:32:21 -0000	1.1
+++ mgetty-1.1.30-unioninit.patch	30 Jan 2009 12:50:36 -0000	1.2
@@ -1,6 +1,7 @@
---- mgetty-1.1.30/callback/conf_cb.c.sopwith	2003-05-01 12:08:29.000000000 -0400
-+++ mgetty-1.1.30/callback/conf_cb.c	2003-05-01 12:08:51.000000000 -0400
-@@ -30,7 +30,7 @@
+diff -up mgetty-1.1.36/callback/conf_cb.c.unioninit mgetty-1.1.36/callback/conf_cb.c
+--- mgetty-1.1.36/callback/conf_cb.c.unioninit	2008-10-09 22:56:40.000000000 +0200
++++ mgetty-1.1.36/callback/conf_cb.c	2008-10-09 22:56:40.000000000 +0200
+@@ -30,7 +30,7 @@ static char * def_init_chat_seq[] = { ""
   */
  
  struct conf_data_mgetty c = {
@@ -9,7 +10,7 @@
  	{ "dialout-devices", {0}, CT_STRING, C_IGNORE },
  	{ "delay", {20}, CT_INT, C_PRESET },
  	{ "delay-randomize", {10}, CT_INT, C_PRESET },
-@@ -39,7 +39,7 @@
+@@ -39,7 +39,7 @@ struct conf_data_mgetty c = {
  
  	{ "modem-init", {0}, CT_CHAT, C_PRESET },
  	{ "speed", {DEFAULT_PORTSPEED}, CT_INT, C_PRESET },
@@ -18,29 +19,10 @@
  	{ "autobauding", {FALSE}, CT_BOOL, C_PRESET },
  	{ "prompt-waittime", {300}, CT_INT, C_PRESET },
  
---- mgetty-1.1.30/voice/include/config.h.sopwith	1998-09-09 17:06:32.000000000 -0400
-+++ mgetty-1.1.30/voice/include/config.h	2003-05-01 12:08:12.000000000 -0400
-@@ -30,7 +30,7 @@
-            
- #else
- 
--#define STRING (p_int)
-+#define STRING p:
- #define KEYWORD(name) \
-  struct conf_data name;
- #define CONF(field_name, default_value, value_type) \
-@@ -55,7 +55,7 @@
- 
- #ifdef CONFIG_C
- 
--     {NULL, {(p_int) ""}, CT_STRING, C_EMPTY}
-+     {NULL, {p: ""}, CT_STRING, C_EMPTY}
-      };
- 
- #else
---- mgetty-1.1.30/conf_mg.c.sopwith	2001-01-28 08:29:43.000000000 -0500
-+++ mgetty-1.1.30/conf_mg.c	2003-05-01 12:08:12.000000000 -0400
-@@ -62,9 +62,9 @@
+diff -up mgetty-1.1.36/conf_mg.c.unioninit mgetty-1.1.36/conf_mg.c
+--- mgetty-1.1.36/conf_mg.c.unioninit	2008-10-09 22:56:40.000000000 +0200
++++ mgetty-1.1.36/conf_mg.c	2008-10-09 22:56:40.000000000 +0200
+@@ -58,9 +58,9 @@ struct conf_data_mgetty c = {
  	{ "direct", {FALSE}, CT_BOOL, C_PRESET },
  	{ "blocking", {FALSE}, CT_BOOL, C_PRESET },
  
@@ -52,7 +34,7 @@
  #else
  	{ "port-group", {0}, CT_STRING, C_EMPTY },
  #endif
-@@ -75,7 +75,7 @@
+@@ -71,7 +71,7 @@ struct conf_data_mgetty c = {
  	{ "need-dsr", {FALSE}, CT_BOOL, C_PRESET },
  	{ "data-only", {FALSE}, CT_BOOL, C_PRESET },
  	{ "fax-only", {FALSE}, CT_BOOL, C_PRESET },
@@ -61,7 +43,7 @@
  	{ "modem-quirks", {0}, CT_INT, C_EMPTY },
  	{ "init-chat", {0}, CT_CHAT, C_EMPTY },
  	{ "force-init-chat", {0}, CT_CHAT, C_EMPTY },
-@@ -86,9 +86,9 @@
+@@ -82,9 +82,9 @@ struct conf_data_mgetty c = {
  
  	{ "modem-check-time", {MODEM_CHECK_TIME}, CT_INT, C_PRESET },
  	{ "rings", {1}, CT_INT, C_PRESET },
@@ -73,7 +55,7 @@
  	{ "answer-chat", {0}, CT_CHAT, C_EMPTY },
  	{ "answer-chat-timeout", {80}, CT_INT, C_PRESET },
  	{ "autobauding", {FALSE}, CT_BOOL, C_PRESET },
-@@ -97,9 +97,9 @@
+@@ -93,9 +93,9 @@ struct conf_data_mgetty c = {
  	{ "ringback-time", {30}, CT_INT, C_PRESET },
  
  	{ "ignore-carrier", {FALSE}, CT_BOOL, C_PRESET },
@@ -85,8 +67,8 @@
  #ifdef MAX_LOGIN_TIME
  	{ "login-time", {MAX_LOGIN_TIME}, CT_INT, C_PRESET },
  #else
-@@ -108,39 +108,39 @@
- 	{ "fido-send-emsi", {TRUE}, CT_BOOL, C_PRESET },
+@@ -105,39 +105,39 @@ struct conf_data_mgetty c = {
+ 	{ "login-env-ttyprompt-hack", {FALSE}, CT_BOOL, C_PRESET },
  
  #ifdef LOGIN_CFG_FILE
 -	{ "login-conf-file", {(p_int) LOGIN_CFG_FILE}, CT_STRING, C_PRESET },
@@ -105,7 +87,7 @@
 -	{ "notify", {(p_int)MAIL_TO}, CT_STRING, C_PRESET },
 +	{ "notify", {p:MAIL_TO}, CT_STRING, C_PRESET },
  #else
- 	{ "notify", {0, CT_STRING}, C_EMPTY },
+ 	{ "notify", {0}, CT_STRING, C_EMPTY },
  #endif
 -	{ "fax-owner", {(p_int)FAX_IN_OWNER}, CT_STRING, C_PRESET },
 +	{ "fax-owner", {p:FAX_IN_OWNER}, CT_STRING, C_PRESET },
@@ -133,9 +115,10 @@
  	{ "term", {0}, CT_STRING, C_EMPTY },
  
  	{ NULL, {0}, CT_STRING, C_EMPTY }};
---- mgetty-1.1.30/conf_sf.c.sopwith	1999-02-28 14:17:55.000000000 -0500
-+++ mgetty-1.1.30/conf_sf.c	2003-05-01 12:08:12.000000000 -0400
-@@ -31,11 +31,11 @@
+diff -up mgetty-1.1.36/conf_sf.c.unioninit mgetty-1.1.36/conf_sf.c
+--- mgetty-1.1.36/conf_sf.c.unioninit	2008-10-09 22:56:40.000000000 +0200
++++ mgetty-1.1.36/conf_sf.c	2008-10-09 22:56:40.000000000 +0200
+@@ -31,11 +31,11 @@ struct conf_data_sendfax c = {
  	{ "fax-devices", {0}, CT_STRING, C_IGNORE },
  	{ "modem-init", {0}, CT_STRING, C_EMPTY },
  #ifdef FAX_MODEM_HANDSHAKE
@@ -149,7 +132,7 @@
  	{ "modem-quirks", {0}, CT_INT, C_EMPTY },
  	{ "fax-send-flow", {FAXSEND_FLOW}, CT_FLOWL, C_PRESET },
  	{ "fax-rec-flow", {FAXREC_FLOW}, CT_FLOWL, C_PRESET },
-@@ -45,9 +45,9 @@
+@@ -45,9 +45,9 @@ struct conf_data_sendfax c = {
  	{ "switchbd", {FAX_SEND_SWITCHBD}, CT_INT, C_PRESET },
  	{ "open-delay",	{0}, CT_INT, C_EMPTY },
  	{ "ignore-carrier", {TRUE }, CT_BOOL, C_PRESET },
@@ -162,7 +145,7 @@
  	{ "normal-res", {0}, CT_BOOL, C_PRESET },
  	{ "fax-min-speed", {0}, CT_INT, C_PRESET },
  	{ "fax-max-speed", {14400}, CT_INT, C_PRESET },
-@@ -57,7 +57,7 @@
+@@ -57,7 +57,7 @@ struct conf_data_sendfax c = {
  	{ "page-header", {0}, CT_STRING, C_EMPTY },
  	{ "" /* stdin */, {FALSE}, CT_BOOL, C_PRESET },
  	{ "" /* rename */, {FALSE}, CT_BOOL, C_PRESET },
@@ -171,3 +154,24 @@
  	{ NULL, {0}, CT_STRING, C_EMPTY }};
  
  int sendfax_parse_args _P2( (argc,argv), int argc, char ** argv )
+diff -up mgetty-1.1.36/voice/include/config.h.unioninit mgetty-1.1.36/voice/include/config.h
+--- mgetty-1.1.36/voice/include/config.h.unioninit	2008-10-09 22:56:40.000000000 +0200
++++ mgetty-1.1.36/voice/include/config.h	2008-10-09 22:56:40.000000000 +0200
+@@ -30,7 +30,7 @@ struct conf_voice_data cvd =
+            
+ #else
+ 
+-#define STRING (p_int)
++#define STRING p:
+ #define KEYWORD(name) \
+  struct conf_data name;
+ #define CONF(field_name, default_value, value_type) \
+@@ -55,7 +55,7 @@ extern struct conf_voice_data
+ 
+ #ifdef CONFIG_C
+ 
+-     {NULL, {(p_int) ""}, CT_STRING, C_EMPTY}
++     {NULL, {p: ""}, CT_STRING, C_EMPTY}
+      };
+ 
+ #else

mgetty-1.1.31-162174_tcflush.patch:

Index: mgetty-1.1.31-162174_tcflush.patch
===================================================================
RCS file: /cvs/extras/rpms/mgetty/F-9/mgetty-1.1.31-162174_tcflush.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mgetty-1.1.31-162174_tcflush.patch	27 Jul 2005 15:43:05 -0000	1.2
+++ mgetty-1.1.31-162174_tcflush.patch	30 Jan 2009 12:50:36 -0000	1.3
@@ -1,31 +1,6 @@
---- mgetty-1.1.31/logname.c.161174_tcflush	2005-07-27 10:41:10.076619000 -0400
-+++ mgetty-1.1.31/logname.c	2005-07-27 10:44:39.675810000 -0400
-@@ -368,10 +368,12 @@
- 	    {
- 		printf( "\r\n\07\r\nYour login time (%d minutes) ran out. Goodbye.\r\n",
- 		       (max_login_time / 60)+1 );
--		
-+		signal(SIGALRM,SIG_DFL);/* turn off alarm */
-+		alarm(0);               
- 		sleep(3);		/* give message time to xmit */
- 		lprintf( L_AUDIT, "failed dev=%s, pid=%d, login time out",
- 			 Device, getpid() );
-+		tcflush(1,TCOFLUSH);    /* allow us to exit without hanging (bug 164002) */
- 		exit(0);		/* bye bye... */
- 	    }
- 	    ch = CKILL;			/* timeout #1 -> clear input */
---- mgetty-1.1.31/mgetty.c.161174_tcflush	2003-11-17 14:09:41.000000000 -0500
-+++ mgetty-1.1.31/mgetty.c	2005-07-27 10:41:43.155507000 -0400
-@@ -94,6 +94,7 @@
-     lprintf( L_AUDIT, "failed dev=%s, pid=%d, got signal %d, exiting",
- 	              Device, getpid(), signo );
-     rmlocks();
-+    tcflush(1,TCOFLUSH);
-     exit(10);
- }
- 
---- mgetty-1.1.31/logfile.c.161174_tcflush	2003-01-14 16:30:20.000000000 -0500
-+++ mgetty-1.1.31/logfile.c	2005-07-27 10:43:49.279257000 -0400
+diff -up mgetty-1.1.36/logfile.c.162174_tcflush mgetty-1.1.36/logfile.c
+--- mgetty-1.1.36/logfile.c.162174_tcflush	2008-10-09 22:57:07.000000000 +0200
++++ mgetty-1.1.36/logfile.c	2008-10-09 22:57:07.000000000 +0200
 @@ -22,6 +22,7 @@
  #endif
  
@@ -34,7 +9,7 @@
  #include <syslog.h>
  
  #if !defined(linux) && !defined(BSD) && !defined(_SCO_DS) && \
-@@ -212,6 +213,7 @@
+@@ -212,6 +213,7 @@ va_list pvar;
  int     errnr;
  char * p;
  static int first_open = TRUE;
@@ -42,7 +17,7 @@
  
      if ( level > log_level )	/* log level high enough? */
      {
-@@ -315,7 +317,24 @@
+@@ -315,7 +317,24 @@ static int first_open = TRUE;
  		             tm->tm_mon+1,  tm->tm_mday,
  			     tm->tm_hour, tm->tm_min, tm->tm_sec, ws );
  #ifdef SYSLOG
@@ -67,7 +42,7 @@
  #endif
      }
      else if ( level != L_ERROR && level != L_FATAL )
-@@ -334,7 +353,21 @@
+@@ -334,7 +353,21 @@ static int first_open = TRUE;
  			     ( errnr <= sys_nerr ) ? sys_errlist[errnr]:
  			     "<error not in list>" );
  #ifdef SYSLOG
@@ -89,3 +64,31 @@
  #endif
  
  #ifndef SYSLOG
+diff -up mgetty-1.1.36/logname.c.162174_tcflush mgetty-1.1.36/logname.c
+--- mgetty-1.1.36/logname.c.162174_tcflush	2008-10-09 22:57:07.000000000 +0200
++++ mgetty-1.1.36/logname.c	2008-10-09 22:57:07.000000000 +0200
+@@ -381,10 +381,12 @@ int getlogname _P7( (prompt, tio, buf, m
+ 	    {
+ 		printf( "\r\n\07\r\nYour login time (%d minutes) ran out. Goodbye.\r\n",
+ 		       (max_login_time / 60)+1 );
+-		
++		signal(SIGALRM,SIG_DFL);/* turn off alarm */
++		alarm(0);               
+ 		sleep(3);		/* give message time to xmit */
+ 		lprintf( L_AUDIT, "failed dev=%s, pid=%d, login time out",
+ 			 Device, getpid() );
++		tcflush(1,TCOFLUSH);    /* allow us to exit without hanging (bug 164002) */
+ 		exit(0);		/* bye bye... */
+ 	    }
+ 	    ch = CKILL;			/* timeout #1 -> clear input */
+diff -up mgetty-1.1.36/mgetty.c.162174_tcflush mgetty-1.1.36/mgetty.c
+--- mgetty-1.1.36/mgetty.c.162174_tcflush	2008-10-09 22:57:07.000000000 +0200
++++ mgetty-1.1.36/mgetty.c	2008-10-09 22:57:07.000000000 +0200
+@@ -103,6 +103,7 @@ static RETSIGTYPE sig_goodbye _P1 ( (sig
+     lprintf( L_AUDIT, "failed dev=%s, pid=%d, got signal %d, exiting",
+ 	              Device, getpid(), signo );
+     rmlocks();
++    tcflush(1,TCOFLUSH);
+     exit(10);
+ }
+ 

mgetty-1.1.31-helper2.patch:

Index: mgetty-1.1.31-helper2.patch
===================================================================
RCS file: /cvs/extras/rpms/mgetty/F-9/mgetty-1.1.31-helper2.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mgetty-1.1.31-helper2.patch	9 Sep 2004 08:34:23 -0000	1.1
+++ mgetty-1.1.31-helper2.patch	30 Jan 2009 12:50:36 -0000	1.2
@@ -1,6 +1,7 @@
---- mgetty-1.1.31/Makefile.helper2	2004-08-17 18:34:44.175470000 -0400
-+++ mgetty-1.1.31/Makefile	2004-08-17 18:48:06.907935000 -0400
-@@ -627,13 +627,13 @@
+diff -up mgetty-1.1.36/Makefile.helper2 mgetty-1.1.36/Makefile
+--- mgetty-1.1.36/Makefile.helper2	2008-10-09 22:56:45.000000000 +0200
++++ mgetty-1.1.36/Makefile	2008-10-09 22:56:45.000000000 +0200
+@@ -623,13 +623,13 @@ install.bin: mgetty sendfax newslock \
  		( mkdir $(spool) && chmod 755 $(spool) )
  	test -d $(FAX_SPOOL) || \
  		( mkdir $(FAX_SPOOL) && \

mgetty-1.1.31-issue-doc.patch:

Index: mgetty-1.1.31-issue-doc.patch
===================================================================
RCS file: /cvs/extras/rpms/mgetty/F-9/mgetty-1.1.31-issue-doc.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mgetty-1.1.31-issue-doc.patch	9 Sep 2004 08:34:23 -0000	1.1
+++ mgetty-1.1.31-issue-doc.patch	30 Jan 2009 12:50:36 -0000	1.2
@@ -1,6 +1,7 @@
---- mgetty-1.1.31/doc/mgetty.8in.issue	2003-04-06 10:08:23.000000000 -0400
-+++ mgetty-1.1.31/doc/mgetty.8in	2004-08-17 18:18:28.096524000 -0400
-@@ -42,16 +42,16 @@
+diff -up mgetty-1.1.36/doc/mgetty.8in.issue-doc mgetty-1.1.36/doc/mgetty.8in
+--- mgetty-1.1.36/doc/mgetty.8in.issue-doc	2008-10-09 22:56:23.000000000 +0200
++++ mgetty-1.1.36/doc/mgetty.8in	2008-10-09 22:56:23.000000000 +0200
+@@ -42,16 +42,16 @@ initialization whatsoever.
  .B -p <login prompt>
  Use the given string to prompt users for their login names. Various
  tokens are allowed in this string. These tokens are: @ for the system

mgetty-1.1.31-lfs.patch:

Index: mgetty-1.1.31-lfs.patch
===================================================================
RCS file: /cvs/extras/rpms/mgetty/F-9/mgetty-1.1.31-lfs.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mgetty-1.1.31-lfs.patch	21 Apr 2005 08:43:46 -0000	1.1
+++ mgetty-1.1.31-lfs.patch	30 Jan 2009 12:50:36 -0000	1.2
@@ -1,6 +1,7 @@
---- mgetty-1.1.31/getdisk.c.lfs	2005-04-21 10:16:18.794879186 +0200
-+++ mgetty-1.1.31/getdisk.c	2005-04-21 10:30:41.013861698 +0200
-@@ -192,11 +192,11 @@
+diff -up mgetty-1.1.36/getdisk.c.lfs mgetty-1.1.36/getdisk.c
+--- mgetty-1.1.36/getdisk.c.lfs	2008-10-09 22:57:02.000000000 +0200
++++ mgetty-1.1.36/getdisk.c	2008-10-09 22:57:02.000000000 +0200
+@@ -198,11 +198,11 @@ long minfreespace = MINFREESPACE;
   */
  
  #ifndef TESTDISK
@@ -14,7 +15,7 @@
  
      if (getdiskstats(path, &mi))
  	return(1);
-@@ -207,7 +207,7 @@
+@@ -213,7 +213,7 @@ int checkspace _P1 ((path), char *path)
       */
      kbytes = (mi.mi_bavail>>2) * (mi.mi_bsize>>8);
  
@@ -23,7 +24,7 @@
      return( kbytes / minfreespace);
  #else
      return(1);
-@@ -333,12 +333,12 @@
+@@ -339,12 +339,12 @@ int main(argc, argv) int argc; char **ar
  	    fprintf(stderr, "statfs on %s failed\n", *argv);
  	} else {
  	    printf( "STATFS report on %s:\n", *argv );
@@ -42,9 +43,10 @@
  	}
  	argv++;
      }
---- mgetty-1.1.31/mgetty.h.lfs	2005-04-21 09:59:13.861615345 +0200
-+++ mgetty-1.1.31/mgetty.h	2005-04-21 10:30:42.558639097 +0200
-@@ -293,19 +293,28 @@
+diff -up mgetty-1.1.36/mgetty.h.lfs mgetty-1.1.36/mgetty.h
+--- mgetty-1.1.36/mgetty.h.lfs	2008-10-09 22:57:02.000000000 +0200
++++ mgetty-1.1.36/mgetty.h	2008-10-09 22:57:02.000000000 +0200
+@@ -307,19 +307,28 @@ int cnd_call _PROTO((char *name, char *t
  /* disk statistics retrieval in getdisk.c */
  
  struct mountinfo {

mgetty-1.1.31-no-acroread.patch:

Index: mgetty-1.1.31-no-acroread.patch
===================================================================
RCS file: /cvs/extras/rpms/mgetty/F-9/mgetty-1.1.31-no-acroread.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mgetty-1.1.31-no-acroread.patch	9 Sep 2004 08:34:34 -0000	1.1
+++ mgetty-1.1.31-no-acroread.patch	30 Jan 2009 12:50:36 -0000	1.2
@@ -1,6 +1,7 @@
---- mgetty-1.1.31/fax/faxspool.in.no-acroread	2004-08-17 19:10:45.000000000 -0400
-+++ mgetty-1.1.31/fax/faxspool.in	2004-08-20 14:20:18.703022000 -0400
-@@ -370,10 +370,23 @@
+diff -up mgetty-1.1.36/fax/faxspool.in.no-acroread mgetty-1.1.36/fax/faxspool.in
+--- mgetty-1.1.36/fax/faxspool.in.no-acroread	2008-10-09 22:56:51.000000000 +0200
++++ mgetty-1.1.36/fax/faxspool.in	2008-10-09 22:56:51.000000000 +0200
+@@ -389,10 +389,23 @@ fs_cvt_pdf()
  {
      driver="$GS_DRIVER_HI"
      test X$3 = X-n && driver="$GS_DRIVER_LO"

mgetty-1.1.31-sendmail_path.patch:

Index: mgetty-1.1.31-sendmail_path.patch
===================================================================
RCS file: /cvs/extras/rpms/mgetty/F-9/mgetty-1.1.31-sendmail_path.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mgetty-1.1.31-sendmail_path.patch	9 Jan 2008 15:49:05 -0000	1.2
+++ mgetty-1.1.31-sendmail_path.patch	30 Jan 2009 12:50:36 -0000	1.3
@@ -1,7 +1,7 @@
-diff -up mgetty-1.1.33/policy.h.sendmail_patch mgetty-1.1.33/policy.h
---- mgetty-1.1.33/policy.h.sendmail_patch	2008-01-08 07:03:50.000000000 +0100
-+++ mgetty-1.1.33/policy.h	2008-01-08 07:04:33.000000000 +0100
-@@ -605,8 +605,12 @@
+diff -up mgetty-1.1.36/policy.h.sendmail_path mgetty-1.1.36/policy.h
+--- mgetty-1.1.36/policy.h.sendmail_path	2008-10-09 22:56:56.000000000 +0200
++++ mgetty-1.1.36/policy.h	2008-10-09 22:56:56.000000000 +0200
+@@ -578,8 +578,12 @@
  # endif
  #endif
  

mgetty-1.1.33-167830.patch:

Index: mgetty-1.1.33-167830.patch
===================================================================
RCS file: /cvs/extras/rpms/mgetty/F-9/mgetty-1.1.33-167830.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mgetty-1.1.33-167830.patch	15 Nov 2005 16:05:53 -0000	1.1
+++ mgetty-1.1.33-167830.patch	30 Jan 2009 12:50:36 -0000	1.2
@@ -1,6 +1,28 @@
---- mgetty-1.1.33/mgetty.c.167830	2005-09-16 18:02:19.929881000 -0400
-+++ mgetty-1.1.33/mgetty.c	2005-09-16 18:02:19.988822000 -0400
-@@ -1011,7 +1011,15 @@
+diff -up mgetty-1.1.36/login.c.167830 mgetty-1.1.36/login.c
+--- mgetty-1.1.36/login.c.167830	2008-10-09 22:57:23.000000000 +0200
++++ mgetty-1.1.36/login.c	2008-10-09 22:57:23.000000000 +0200
+@@ -18,7 +18,7 @@
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <fcntl.h>
+-
++#include <sys/ioctl.h>
+ /* NeXTStep/86 has some byte order problems (Christian Starkjohann) */
+ #if defined(NeXT) && defined(__LITTLE_ENDIAN__) && !defined(NEXTSGTTY)
+ # define pw_uid pw_short_pad1
+@@ -372,6 +372,8 @@ fallthrough:
+     if ( fcntl(0, F_GETFD, 0 ) & 1 ) 
+ 	lprintf( L_WARN, "WARNING: close-on-exec bit set on FD 0 - OS BUG?" );
+ 
++    ioctl(0, TIOCSCTTY, (void*)1);
++
+     /* execute login */
+     execv( cmd, argv );
+ 
+diff -up mgetty-1.1.36/mgetty.c.167830 mgetty-1.1.36/mgetty.c
+--- mgetty-1.1.36/mgetty.c.167830	2008-10-09 22:57:23.000000000 +0200
++++ mgetty-1.1.36/mgetty.c	2008-10-09 22:57:23.000000000 +0200
+@@ -1034,7 +1034,15 @@ Ring_got_action:
  	}
  
  	/* set permissions to "rw-------" for login */
@@ -17,7 +39,7 @@
  
  	/* set ttystate for login ("after"),
  	 *  cr-nl mapping flags are set by getlogname()!
-@@ -1058,7 +1066,15 @@
+@@ -1079,7 +1087,15 @@ Ring_got_action:
  	{
  	    lprintf( L_WARN, "WARNING: starting login while DCD is low!" );
  	}
@@ -34,23 +56,3 @@
  	/* hand off to login dispatcher (which will call /bin/login) */
  	login_dispatch( buf, mgetty_state == St_callback_login? TRUE: FALSE,
  			c_string(login_config) );
---- mgetty-1.1.33/login.c.167830	2005-09-16 18:02:19.971839000 -0400
-+++ mgetty-1.1.33/login.c	2005-09-16 18:02:19.999811000 -0400
-@@ -18,7 +18,7 @@
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <fcntl.h>
--
-+#include <sys/ioctl.h>
- /* NeXTStep/86 has some byte order problems (Christian Starkjohann) */
- #if defined(NeXT) && defined(__LITTLE_ENDIAN__) && !defined(NEXTSGTTY)
- # define pw_uid pw_short_pad1
-@@ -371,6 +371,8 @@
-     if ( fcntl(0, F_GETFD, 0 ) & 1 ) 
- 	lprintf( L_WARN, "WARNING: close-on-exec bit set on FD 0 - OS BUG?" );
- 
-+    ioctl(0, TIOCSCTTY, (void*)1);
-+
-     /* execute login */
-     execv( cmd, argv );
- 

mgetty-1.1.33-167830_tty_access.patch:

Index: mgetty-1.1.33-167830_tty_access.patch
===================================================================
RCS file: /cvs/extras/rpms/mgetty/F-9/mgetty-1.1.33-167830_tty_access.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mgetty-1.1.33-167830_tty_access.patch	15 Nov 2005 16:05:53 -0000	1.1
+++ mgetty-1.1.33-167830_tty_access.patch	30 Jan 2009 12:50:36 -0000	1.2
@@ -1,6 +1,7 @@
---- mgetty-1.1.33/login.c.167830_tty_access	2003-12-05 17:28:58.000000000 -0500
-+++ mgetty-1.1.33/login.c	2005-11-15 11:03:04.000000000 -0500
-@@ -256,6 +256,12 @@
+diff -up mgetty-1.1.36/login.c.167830_tty_access mgetty-1.1.36/login.c
+--- mgetty-1.1.36/login.c.167830_tty_access	2008-10-09 22:57:18.000000000 +0200
++++ mgetty-1.1.36/login.c	2008-10-09 22:57:18.000000000 +0200
+@@ -256,6 +256,12 @@ void login_dispatch _P3( (user, is_callb
  		{
  		    lprintf( L_NOISE, "login: user id: %s (uid %d, gid %d)",
  				      user_id, pw->pw_uid, pw->pw_gid );
@@ -13,7 +14,7 @@
  #if SECUREWARE
  		    if ( setluid( pw->pw_uid ) == -1 )
  		    {
-@@ -266,9 +272,15 @@
+@@ -266,9 +272,15 @@ void login_dispatch _P3( (user, is_callb
  		    {
  			lprintf( L_ERROR, "cannot set gid %d", pw->pw_gid );
  		    }

mgetty-1.1.33-bug_63843.patch:

Index: mgetty-1.1.33-bug_63843.patch
===================================================================
RCS file: /cvs/extras/rpms/mgetty/F-9/mgetty-1.1.33-bug_63843.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mgetty-1.1.33-bug_63843.patch	1 Aug 2005 22:32:34 -0000	1.1
+++ mgetty-1.1.33-bug_63843.patch	30 Jan 2009 12:50:36 -0000	1.2
@@ -1,5 +1,6 @@
---- mgetty-1.1.33/samples/new_fax.tiff.bug_63843	1998-04-05 06:03:26.000000000 -0400
-+++ mgetty-1.1.33/samples/new_fax.tiff	2005-08-01 18:26:45.286734000 -0400
+diff -up mgetty-1.1.36/samples/new_fax.tiff.bug_63843 mgetty-1.1.36/samples/new_fax.tiff
+--- mgetty-1.1.36/samples/new_fax.tiff.bug_63843	2008-10-09 22:57:12.000000000 +0200
++++ mgetty-1.1.36/samples/new_fax.tiff	2008-10-09 22:57:12.000000000 +0200
 @@ -24,7 +24,7 @@
  #
  #!/bin/sh
@@ -9,7 +10,7 @@
  SENDER="$2"
  
  case $4 in
-@@ -32,11 +32,11 @@
+@@ -32,11 +32,11 @@ case $4 in
    *) STRETCH=
  esac
  


Index: mgetty.spec
===================================================================
RCS file: /cvs/extras/rpms/mgetty/F-9/mgetty.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- mgetty.spec	3 Apr 2008 12:29:02 -0000	1.48
+++ mgetty.spec	30 Jan 2009 12:50:36 -0000	1.49
@@ -1,9 +1,11 @@
+%define date Jun15
+
 Summary: A getty replacement for use with data and fax modems
 Name: mgetty
-Version: 1.1.33
-Release: 17%{?dist}
-Source: ftp://alpha.greenie.net/pub/mgetty/source/1.1/mgetty%{version}-Apr10.tar.gz
-Source1: ftp://alpha.greenie.net/pub/mgetty/source/1.1/mgetty%{version}-Apr10.tar.gz.asc
+Version: 1.1.36
+Release: 1%{?dist}
+Source: ftp://alpha.greenie.net/pub/mgetty/source/1.1/mgetty%{version}-%{date}.tar.gz
+Source1: ftp://alpha.greenie.net/pub/mgetty/source/1.1/mgetty%{version}-%{date}.tar.gz.asc
 Source2: logrotate.mgetty
 Source3: logrotate.sendfax
 Source4: logrotate.vgetty
@@ -11,26 +13,22 @@
 Source6: faxq-helper.8
 Patch0: mgetty-1.1.29-config.patch
 Patch1: mgetty-1.1.26-policy.patch
-#Patch2: mgetty-1.1.25-faxprint.patch
-Patch3: mgetty-1.1.21-giftopnm.patch
 Patch4: mgetty-1.1.25-voiceconfig.patch
 Patch5: mgetty-1.1.26-issue.patch
 Patch6: mgetty-1.1.31-issue-doc.patch
 Patch7: mgetty-1.1.29-helper.patch
 Patch8: mgetty-1.1.30-mktemp.patch
 Patch9: mgetty-1.1.30-unioninit.patch
-#Patch10: mgetty-1.1.30-path.patch
 Patch11: mgetty-1.1.31-helper2.patch
 Patch12: mgetty-1.1.31-no-acroread.patch
-Patch13: mgetty-1.1.31-W-format.patch
 Patch14: mgetty-1.1.31-sendmail_path.patch
 Patch15: mgetty-1.1.31-lfs.patch
 Patch16: mgetty-1.1.31-162174_tcflush.patch
-Patch17: mgetty-1.1.33-sprintf_chk.patch
 Patch18: mgetty-1.1.33-bug_63843.patch
 Patch19: mgetty-1.1.33-167830_tty_access.patch
 Patch20: mgetty-1.1.33-167830.patch
 Patch21: mgetty-1.1.33-turn.patch
+Patch22: mgetty-1.1.36-caller_name.patch
 
 License: GPLv2+
 Group: Applications/Communications
@@ -102,8 +100,6 @@
 mv policy.h-dist policy.h
 %patch0 -p1 -b .config
 %patch1 -p1 -b .policy
-#%patch2 -p1 -b .faxprint
-%patch3 -p1 -b .giftopnm
 %patch4 -p1 -b .voiceconfig
 %patch5 -p1 -b .issue
 %patch6 -p1 -b .issue-doc
@@ -112,15 +108,14 @@
 %patch9 -p1 -b .unioninit
 %patch11 -p1 -b .helper2
 %patch12 -p1 -b .no-acroread
-%patch13 -p1 -b .-W-format
 %patch14 -p1 -b .sendmail_path
 %patch15 -p1 -b .lfs
 %patch16 -p1 -b .162174_tcflush
-%patch17 -p1 -b .sprintf_chk
 %patch18 -p1 -b .bug_63843
 %patch19 -p1 -b .167830_tty_access
 %patch20 -p1 -b .167830
 %patch21 -p1 -b .turn
+%patch22 -p1 -b .caller_name
 
 %build
 %define makeflags CFLAGS="$RPM_OPT_FLAGS -Wall -DAUTO_PPP -D_FILE_OFFSET_BITS=64" prefix=%{_prefix} spool=%{_var}/spool BINDIR=%{_bindir} SBINDIR=%{_sbindir} LIBDIR=%{_libdir}/mgetty+sendfax HELPDIR=%{_libdir}/mgetty+sendfax CONFDIR=%{_sysconfdir}/mgetty+sendfax MANDIR=%{_mandir} MAN1DIR=%{_mandir}/man1 MAN4DIR=%{_mandir}/man4 MAN5DIR=%{_mandir}/man5 MAN8DIR=%{_mandir}/man8 INFODIR=%{_infodir} ECHO='"echo -e"' INSTALL=%{__install}
@@ -326,6 +321,10 @@
 %{_mandir}/man1/viewfax.1*
 
 %changelog
+* Fri Jan 30 2009 Jiri Skala <jskala at redhat.com> - 1.1.36-1
+- re-base to latest upstream
+- Resolves: #232522 - mgetty does not collect caller name from modem properly
+
 * Thu Apr 03 2008 Martin Nagy <mnagy at redhat.com> - 1.1.33-17
 - make sure we compile everything with FORTIFY_SOURCE
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mgetty/F-9/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	5 Mar 2008 17:28:42 -0000	1.9
+++ sources	30 Jan 2009 12:50:36 -0000	1.10
@@ -1,3 +1 @@
-3765cb20a2a17d388096b232c1e29046  faxq-helper.8
-d61a2bd343111be35250496710393bd5  mgetty1.1.33-Apr10.tar.gz
-06d71de7d8c95a521f8e7e5fa872998c  mgetty1.1.33-Apr10.tar.gz.asc
+0320e98c6b86bcca48fc5f355b94ead4  mgetty1.1.36-Jun15.tar.gz


--- mgetty-1.1.21-giftopnm.patch DELETED ---


--- mgetty-1.1.25-faxprint.patch DELETED ---


--- mgetty-1.1.30-path.patch DELETED ---


--- mgetty-1.1.31-W-format.patch DELETED ---


--- mgetty-1.1.33-sprintf_chk.patch DELETED ---



From erikos at fedoraproject.org  Fri Jan 30 12:52:22 2009
From: erikos at fedoraproject.org (Simon Schampijer)
Date: Fri, 30 Jan 2009 12:52:22 +0000 (UTC)
Subject: rpms/sugar-datastore/devel .cvsignore, 1.9, 1.10 sources, 1.9,
	1.10 sugar-datastore.spec, 1.11, 1.12
Message-ID: <20090130125222.C856970117@cvs1.fedora.phx.redhat.com>

Author: erikos

Update of /cvs/pkgs/rpms/sugar-datastore/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11662

Modified Files:
	.cvsignore sources sugar-datastore.spec 
Log Message:
* Fri Jan 30 2009 Simon Schampijer <simon at schampijer.de> - 0.83.2-2.20090130gite999c1c1e1
- Only try to remove the checksum dir if it already exists




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-datastore/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	20 Jan 2009 16:32:13 -0000	1.9
+++ .cvsignore	30 Jan 2009 12:51:52 -0000	1.10
@@ -1 +1 @@
-sugar-datastore-0.83.2.tar.bz2
+sugar-datastore-0.83.2-gite999c1c1e1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-datastore/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	20 Jan 2009 16:32:13 -0000	1.9
+++ sources	30 Jan 2009 12:51:52 -0000	1.10
@@ -1 +1 @@
-814f81e10266e85c89ae3e5550d7fa69  sugar-datastore-0.83.2.tar.bz2
+88a4dcc5bef106e7e23a4b6a2fd72f51  sugar-datastore-0.83.2-gite999c1c1e1.tar.bz2


Index: sugar-datastore.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-datastore/devel/sugar-datastore.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sugar-datastore.spec	20 Jan 2009 16:32:13 -0000	1.11
+++ sugar-datastore.spec	30 Jan 2009 12:51:52 -0000	1.12
@@ -1,14 +1,23 @@
 %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")
 
+%define commitid e999c1c1e1
+%define alphatag 20090130git%{commitid}
+
 Name: sugar-datastore
 Version: 0.83.2
-Release: 1%{?dist}
+#Release: 1%{?dist}
+Release: 2.%{alphatag}%{?dist}
+
 Summary: Sugar Datastore
 
 Group: Development/Libraries
 License: GPLv2+
 URL: http://sugarlabs.org/
-Source0: http://download.sugarlabs.org/sources/sucrose/glucose/%{name}/%{name}-%{version}.tar.bz2
+# git clone git://dev.laptop.org/sugar
+# cd sugar
+# git-checkout %{commitid}
+Source0: %{name}-%{version}-git%{commitid}.tar.bz2
+#Source0: http://download.sugarlabs.org/sources/sucrose/glucose/%{name}/%{name}-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: python-devel
@@ -46,6 +55,9 @@
 %{_datadir}/dbus-1/services/*.service
 
 %changelog
+* Fri Jan 30 2009 Simon Schampijer <simon at schampijer.de> - 0.83.2-2.20090130gite999c1c1e1
+- Only try to remove the checksum dir if it already exists
+
 * Tue Jan 20 2009 Marco Pesenti Gritti <mpg at redhat.com> - 0.83.2-1
 - #181 Replace deprecated os.popen by subprocess
 - #140 Crash when joining a shared Read 



From jskala at fedoraproject.org  Fri Jan 30 13:09:01 2009
From: jskala at fedoraproject.org (Jiri Skala)
Date: Fri, 30 Jan 2009 13:09:01 +0000 (UTC)
Subject: rpms/mgetty/F-9 sources,1.10,1.11
Message-ID: <20090130130901.6E69270117@cvs1.fedora.phx.redhat.com>

Author: jskala

Update of /cvs/extras/rpms/mgetty/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15635

Modified Files:
	sources 
Log Message:
* Fri Jan 30 2009 Jiri Skala <jskala at redhat.com> - 1.1.36-1
- re-base to latest upstream
- Resolves: #232522 - mgetty does not collect caller name from modem properly



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mgetty/F-9/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	30 Jan 2009 12:50:36 -0000	1.10
+++ sources	30 Jan 2009 13:08:31 -0000	1.11
@@ -1 +1,3 @@
+3765cb20a2a17d388096b232c1e29046  faxq-helper.8
 0320e98c6b86bcca48fc5f355b94ead4  mgetty1.1.36-Jun15.tar.gz
+c81cb55741e867cc02f00da4135aad64  mgetty1.1.36-Jun15.tar.gz.asc



From dwalsh at fedoraproject.org  Fri Jan 30 13:14:56 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Fri, 30 Jan 2009 13:14:56 +0000 (UTC)
Subject: rpms/xguest/devel .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 xguest.spec,
	1.8, 1.9
Message-ID: <20090130131456.D8AFF70117@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/xguest/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16793

Modified Files:
	.cvsignore sources xguest.spec 
Log Message:
* Fri Jan 30 2009 Dan Walsh <dwalsh at redhat.com> - 1.0.7-1
- Change xguest init script to have proper summary



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xguest/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	21 Dec 2007 17:25:35 -0000	1.2
+++ .cvsignore	30 Jan 2009 13:14:26 -0000	1.3
@@ -1 +1,2 @@
 xguest-1.0.6.tar.bz2
+xguest-1.0.7.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xguest/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	21 Dec 2007 17:25:35 -0000	1.2
+++ sources	30 Jan 2009 13:14:26 -0000	1.3
@@ -1 +1 @@
-b69683dc4e29e451921bf6a57174516d  xguest-1.0.6.tar.bz2
+ca45a0fb6b230bd8bfa162abbbc8784b  xguest-1.0.7.tar.bz2


Index: xguest.spec
===================================================================
RCS file: /cvs/extras/rpms/xguest/devel/xguest.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- xguest.spec	22 Jan 2009 16:22:59 -0000	1.8
+++ xguest.spec	30 Jan 2009 13:14:26 -0000	1.9
@@ -1,7 +1,7 @@
 Summary: Creates xguest user as a locked down user 
 Name: xguest
-Version: 1.0.6
-Release: 8%{?dist}
+Version: 1.0.7
+Release: 1%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 BuildArch: noarch
@@ -101,6 +101,9 @@
 fi
 
 %changelog
+* Fri Jan 30 2009 Dan Walsh <dwalsh at redhat.com> - 1.0.7-1
+- Change xguest init script to have proper summary
+
 * Thu Jan 22 2009 Dan Walsh <dwalsh at redhat.com> - 1.0.6-8
 - Modify xguest to be able to be installed in a livecd
 



From rdieter at fedoraproject.org  Fri Jan 30 13:28:24 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 30 Jan 2009 13:28:24 +0000 (UTC)
Subject: rpms/aasaver/F-9 dead.package, NONE, 1.1 .cvsignore, 1.2,
	NONE aasaver.spec, 1.3, NONE sources, 1.2, NONE
Message-ID: <20090130132824.BF6AE70117@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/aasaver/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19699/F-9

Added Files:
	dead.package 
Removed Files:
	.cvsignore aasaver.spec sources 
Log Message:
Being a KDE3 screensaver, doesn't make sense on F9 and newer



--- NEW FILE dead.package ---
Being a KDE3 screensaver, doesn't make sense on F9 and newer


--- .cvsignore DELETED ---


--- aasaver.spec DELETED ---


--- sources DELETED ---



From rdieter at fedoraproject.org  Fri Jan 30 13:28:25 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 30 Jan 2009 13:28:25 +0000 (UTC)
Subject: rpms/aasaver/devel dead.package, NONE, 1.1 .cvsignore, 1.2,
	NONE aasaver.spec, 1.3, NONE sources, 1.2, NONE
Message-ID: <20090130132825.0E61570117@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/aasaver/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19699/devel

Added Files:
	dead.package 
Removed Files:
	.cvsignore aasaver.spec sources 
Log Message:
Being a KDE3 screensaver, doesn't make sense on F9 and newer



--- NEW FILE dead.package ---
Being a KDE3 screensaver, doesn't make sense on F9 and newer


--- .cvsignore DELETED ---


--- aasaver.spec DELETED ---


--- sources DELETED ---



From gd at fedoraproject.org  Fri Jan 30 13:36:28 2009
From: gd at fedoraproject.org (Guenther Deschner)
Date: Fri, 30 Jan 2009 13:36:28 +0000 (UTC)
Subject: rpms/samba/devel .cvsignore, 1.56, 1.57 samba.spec, 1.167,
	1.168 sources, 1.60, 1.61
Message-ID: <20090130133628.EA37970141@cvs1.fedora.phx.redhat.com>

Author: gd

Update of /cvs/pkgs/rpms/samba/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21271

Modified Files:
	.cvsignore samba.spec sources 
Log Message:
Update to 3.3.0 final.

Guenther



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/samba/devel/.cvsignore,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- .cvsignore	28 Nov 2008 09:31:00 -0000	1.56
+++ .cvsignore	30 Jan 2009 13:35:58 -0000	1.57
@@ -1 +1 @@
-samba-3.3.0rc1.tar.gz
+samba-3.3.0.tar.gz


Index: samba.spec
===================================================================
RCS file: /cvs/pkgs/rpms/samba/devel/samba.spec,v
retrieving revision 1.167
retrieving revision 1.168
diff -u -r1.167 -r1.168
--- samba.spec	5 Dec 2008 13:59:53 -0000	1.167
+++ samba.spec	30 Jan 2009 13:35:58 -0000	1.168
@@ -1,8 +1,8 @@
-%define main_release 24
+%define main_release 25
 %define samba_version 3.3.0
 %define tdb_version 1.1.1
 %define talloc_version 1.2.0
-%define pre_release rc1
+%define pre_release %nil
 
 %define samba_release 0%{pre_release}.%{main_release}%{?dist}
 
@@ -826,6 +826,9 @@
 %{_datadir}/pixmaps/samba/logo-small.png
 
 %changelog
+* Fri Jan 30 2009 Guenther Deschner <gdeschner at redhat.com> - 3.3.0-0.25
+- Update to 3.3.0 final
+
 * Fri Nov 28 2008 Guenther Deschner <gdeschner at redhat.com> - 3.3.0-0rc1.24
 - Update to 3.3.0rc1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/samba/devel/sources,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- sources	28 Nov 2008 09:31:00 -0000	1.60
+++ sources	30 Jan 2009 13:35:58 -0000	1.61
@@ -1 +1 @@
-294825dfb71b2cacb5628557ddf71a5b  samba-3.3.0rc1.tar.gz
+adb048dc3988055533e1ea5d91d81f99  samba-3.3.0.tar.gz



From rdieter at fedoraproject.org  Fri Jan 30 13:40:43 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 30 Jan 2009 13:40:43 +0000 (UTC)
Subject: rpms/koffice/devel exiv2-0.18-attempt1.diff, NONE, 1.1 koffice.spec,
	1.94, 1.95
Message-ID: <20090130134043.371DF70117@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/koffice/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22747

Modified Files:
	koffice.spec 
Added Files:
	exiv2-0.18-attempt1.diff 
Log Message:
exiv2-0.18 patch


exiv2-0.18-attempt1.diff:

--- NEW FILE exiv2-0.18-attempt1.diff ---
Index: kis_exif_io.cpp
===================================================================
--- kis_exif_io.cpp	(revision 917290)
+++ kis_exif_io.cpp	(working copy)
@@ -457,12 +457,14 @@
     ioDevice->open(QIODevice::ReadOnly);
     QByteArray arr = ioDevice->readAll();
     Exiv2::ExifData exifData;
+    Exiv2::ByteOrder byteOrder;
 #if EXIV2_MAJOR_VERSION == 0 && EXIV2_MINOR_VERSION <= 17
     exifData.load((const Exiv2::byte*)arr.data(), arr.size());
+    byteOrder = exifData.byteOrder();
 #else
-    Exiv2::ExifParser::decode( exifData, (const Exiv2::byte*)arr.data(), arr.size());
+    byteOrder = Exiv2::ExifParser::decode( exifData, (const Exiv2::byte*)arr.data(), arr.size());
 #endif
-    dbgFile << "Byte order = " << exifData.byteOrder() << ppVar(Exiv2::bigEndian) << ppVar(Exiv2::littleEndian);
+    dbgFile << "Byte order = " << byteOrder << ppVar(Exiv2::bigEndian) << ppVar(Exiv2::littleEndian);
     dbgFile << "There are" << exifData.count() << " entries in the exif section";
     const KisMetaData::Schema* tiffSchema = KisMetaData::SchemaRegistry::instance()->schemaFromUri(KisMetaData::Schema::TIFFSchemaUri);
     const KisMetaData::Schema* exifSchema = KisMetaData::SchemaRegistry::instance()->schemaFromUri(KisMetaData::Schema::EXIFSchemaUri);
@@ -508,13 +510,13 @@
             } else if (it->key() == "Exif.Photo.ComponentsConfiguration") {
                 v = exifArrayToKMDIntOrderedArray(it->getValue());
             } else if (it->key() == "Exif.Photo.OECF") {
-                v = exifOECFToKMDOECFStructure(it->getValue(), exifData.byteOrder());
+                v = exifOECFToKMDOECFStructure(it->getValue(), byteOrder);
             } else if (it->key() == "Exif.Photo.DateTimeDigitized" || it->key() == "Exif.Photo.DateTimeOriginal") {
                 v = KisMetaData::Value(exivValueToDateTime(it->getValue()));
             } else if (it->key() == "Exif.Photo.DeviceSettingDescription") {
                 v = deviceSettingDescriptionExifToKMD(it->getValue());
             } else if (it->key() == "Exif.Photo.CFAPattern") {
-                v = cfaPatternExifToKMD(it->getValue(), exifData.byteOrder());
+                v = cfaPatternExifToKMD(it->getValue(), byteOrder);
             } else if (it->key() == "Exif.Photo.Flash") {
                 v = flashExifToKMD(it->getValue());
             } else if (it->key() == "Exif.Photo.UserComment") {


Index: koffice.spec
===================================================================
RCS file: /cvs/pkgs/rpms/koffice/devel/koffice.spec,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -r1.94 -r1.95
--- koffice.spec	29 Jan 2009 04:15:00 -0000	1.94
+++ koffice.spec	30 Jan 2009 13:40:12 -0000	1.95
@@ -18,6 +18,8 @@
 Source0:        http://download.kde.org/unstable/koffice-%{version}/src/koffice-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Patch1: exiv2-0.18-attempt1.diff
+
 #-- 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 or higher: OpenCTL is needed for some color spaces (High Dynamic Range Color Spaces, YCbCr and LMS) <http://www.openctl.org>
@@ -261,6 +263,10 @@
 %prep
 %setup -q
 
+pushd krita/ui/kisexiv2
+%patch1 -p0 -b .exiv2-0.18
+popd
+
 
 %build
 
@@ -272,7 +278,7 @@
   ..
 popd
 
-make %{?_smp_mflags} -C %{_target_platform} VERBOSE=1
+make %{?_smp_mflags} -C %{_target_platform}
 
 
 %install
@@ -282,41 +288,41 @@
 
 # unpackaged files
 # conflicts with oxygen-icon-theme  
-rm -f %{buildroot}%{_kde4_iconsdir}/oxygen/16x16/actions/format-justify-{center,fill,left,right}.png
-rm -f %{buildroot}%{_kde4_iconsdir}/oxygen/16x16/actions/format-text-{bold,italic,underline}.png
-rm -f %{buildroot}%{_kde4_iconsdir}/oxygen/16x16/actions/object-{group,ungroup}.png
-rm -f %{buildroot}%{_kde4_iconsdir}/oxygen/16x16/actions/object-order-{back,front,lower,raise}.png
+rm -fv %{buildroot}%{_kde4_iconsdir}/oxygen/16x16/actions/format-justify-{center,fill,left,right}.png
+rm -fv %{buildroot}%{_kde4_iconsdir}/oxygen/16x16/actions/format-text-{bold,italic,underline}.png
+rm -fv %{buildroot}%{_kde4_iconsdir}/oxygen/16x16/actions/object-{group,ungroup}.png
+rm -fv %{buildroot}%{_kde4_iconsdir}/oxygen/16x16/actions/object-order-{back,front,lower,raise}.png
 # extraneous stuff we don't want in -devel
-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
+rm -fv %{buildroot}%{_kde4_libdir}/lib*common.so
+rm -fv %{buildroot}%{_kde4_libdir}/lib*filters.so
+rm -fv %{buildroot}%{_kde4_libdir}/lib*private.so
+rm -fv %{buildroot}%{_kde4_libdir}/libkarbon*.so
+rm -fv %{buildroot}%{_kde4_libdir}/libkexi*.so
+rm -fv %{buildroot}%{_kde4_libdir}/libkisexiv2.so
+rm -fv %{buildroot}%{_kde4_libdir}/libkformdesigner.so
+rm -fv %{buildroot}%{_kde4_libdir}/libkplato*.so
+rm -fv %{buildroot}%{_kde4_libdir}/libkword*.so
+rm -fv %{buildroot}%{_kde4_libdir}/libkrita*.so
+rm -fv %{buildroot}%{_kde4_libdir}/libkross*.so
 %if ! 0%{?kchart}
-rm -f %{buildroot}%{_kde4_libdir}/libkchartcommon.so.*
-rm -f %{buildroot}%{_kde4_libdir}/kde4/*kchart*.*
-rm -rf %{buildroot}%{_kde4_appsdir}/kchart/
-rm -rf %{buildroot}%{_kde4_docdir}/HTML/en/kchart/
-rm -f %{buildroot}%{_kde4_datadir}/kde4/services/kchart*.desktop
-rm -f %{buildroot}%{_kde4_datadir}/kde4/services/ServiceMenus/kchart_konqi.desktop
+rm -fv %{buildroot}%{_kde4_libdir}/libkchartcommon.so.*
+rm -fv %{buildroot}%{_kde4_libdir}/kde4/*kchart*.*
+rm -rfv %{buildroot}%{_kde4_appsdir}/kchart/
+rm -rfv %{buildroot}%{_kde4_docdir}/HTML/en/kchart/
+rm -fv %{buildroot}%{_kde4_datadir}/kde4/services/kchart*.desktop
+rm -fv %{buildroot}%{_kde4_datadir}/kde4/services/ServiceMenus/kchart_konqi.desktop
 %endif
 %if ! 0%{?kexi}
-rm -rf %{buildroot}%{_kde4_docdir}/HTML/en/kexi/
-rm -f %{buildroot}%{_kde4_datadir}/kde4/services/ServiceMenus/kexi_konqi.desktop
+rm -rfv %{buildroot}%{_kde4_docdir}/HTML/en/kexi/
+rm -fv %{buildroot}%{_kde4_datadir}/kde4/services/ServiceMenus/kexi_konqi.desktop
 %endif
 %if ! 0%{?kformula}
-rm -rf %{buildroot}%{_kde4_docdir}/HTML/en/kformula/
-rm -f %{buildroot}%{_kde4_datadir}/kde4/services/ServiceMenus/kformula_konqi.desktop
+rm -rfv %{buildroot}%{_kde4_docdir}/HTML/en/kformula/
+rm -fv %{buildroot}%{_kde4_datadir}/kde4/services/ServiceMenus/kformula_konqi.desktop
 %endif
 %if ! 0%{?kivio}
-rm -rf %{buildroot}%{_kde4_docdir}/HTML/en/kivio/
-rm -f %{buildroot}%{_kde4_datadir}/kde4/services/ServiceMenus/kivio_konqi.desktop
+rm -rfv %{buildroot}%{_kde4_docdir}/HTML/en/kivio/
+rm -fv %{buildroot}%{_kde4_datadir}/kde4/services/ServiceMenus/kivio_konqi.desktop
 %endif
 
 



From limb at fedoraproject.org  Fri Jan 30 13:47:02 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Fri, 30 Jan 2009 13:47:02 +0000 (UTC)
Subject: rpms/agistudio/devel agistudio.spec,1.10,1.11
Message-ID: <20090130134702.C8D0770117@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/agistudio/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24019

Modified Files:
	agistudio.spec 
Log Message:
Description fix.



Index: agistudio.spec
===================================================================
RCS file: /cvs/pkgs/rpms/agistudio/devel/agistudio.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- agistudio.spec	24 Mar 2008 17:15:52 -0000	1.10
+++ agistudio.spec	30 Jan 2009 13:46:32 -0000	1.11
@@ -1,6 +1,6 @@
 Name: agistudio
 Version: 1.2.3
-Release: 7%{?dist}
+Release: 8%{?dist}
 Summary: AGI integrated development environment
 License: GPLv2+
 Group: Amusements/Games
@@ -19,7 +19,7 @@
 
 %description
 AGI (Adventure Game Interpreter) is the adventure game engine used by
-Sierra On-Line(tm) to create some of their early games. QT AGI Studio
+Sierra On-Line to create some of their early games. QT AGI Studio
 is a program which allows you to view, create and edit AGI games.
 
 %prep
@@ -76,6 +76,9 @@
 %{_datadir}/icons/hicolor/32x32/apps/agistudio.xpm
 
 %changelog
+* Fri Jan 30 2009 Jon Ciesla <limb at jcomserv.net> - 1.2.3-8
+- Description fix.
+
 * Mon Mar 24 2008 Jon Ciesla <limb at jcomserv.net> - 1.2.3-7
 - qt3 BR rename fix.
 



From lmacken at fedoraproject.org  Fri Jan 30 13:49:50 2009
From: lmacken at fedoraproject.org (Luke Macken)
Date: Fri, 30 Jan 2009 13:49:50 +0000 (UTC)
Subject: rpms/python-weberror/F-9 .cvsignore,1.1,1.2 sources,1.1,1.2
Message-ID: <20090130134950.0DA9070117@cvs1.fedora.phx.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/python-weberror/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24739

Modified Files:
	.cvsignore sources 
Log Message:
Initial import of WebError into the F-9 branch


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-weberror/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	7 Jan 2009 01:24:06 -0000	1.1
+++ .cvsignore	30 Jan 2009 13:49:19 -0000	1.2
@@ -0,0 +1 @@
+WebError-0.10.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-weberror/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	7 Jan 2009 01:24:06 -0000	1.1
+++ sources	30 Jan 2009 13:49:19 -0000	1.2
@@ -0,0 +1 @@
+51e69120f19624430853cf493d59e68d  WebError-0.10.1.tar.gz



From lmacken at fedoraproject.org  Fri Jan 30 13:50:43 2009
From: lmacken at fedoraproject.org (Luke Macken)
Date: Fri, 30 Jan 2009 13:50:43 +0000 (UTC)
Subject: rpms/python-weberror/F-10 .cvsignore,1.1,1.2 sources,1.1,1.2
Message-ID: <20090130135043.83F2D70117@cvs1.fedora.phx.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/python-weberror/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25145

Modified Files:
	.cvsignore sources 
Log Message:
Initial import of WebError into the F-10 branch


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-weberror/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	7 Jan 2009 01:24:06 -0000	1.1
+++ .cvsignore	30 Jan 2009 13:50:13 -0000	1.2
@@ -0,0 +1 @@
+WebError-0.10.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-weberror/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	7 Jan 2009 01:24:06 -0000	1.1
+++ sources	30 Jan 2009 13:50:13 -0000	1.2
@@ -0,0 +1 @@
+51e69120f19624430853cf493d59e68d  WebError-0.10.1.tar.gz



From kasal at fedoraproject.org  Fri Jan 30 13:51:07 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri, 30 Jan 2009 13:51:07 +0000 (UTC)
Subject: rpms/dosfstools/devel dosfstools-exit.patch, NONE,
	1.1 dosfstools-install-p.patch, NONE, 1.1 dosfstools.spec, 1.35, 1.36
Message-ID: <20090130135107.CE01170117@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/extras/rpms/dosfstools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25287

Modified Files:
	dosfstools.spec 
Added Files:
	dosfstools-exit.patch dosfstools-install-p.patch 
Log Message:
- fix the previous commit
- omit the most obsolete documents
- after writing the label, exit with exit code 0 (#468050)

dosfstools-exit.patch:

--- NEW FILE dosfstools-exit.patch ---
2009-01-30  Stepan Kasal  <skasal at redhat.com>

	* src/dosfslabel.c (main): After writing the label, exit code
	should be 0.

diff -up dosfstools-3.0.1/src/dosfslabel.c.exit dosfstools-3.0.1/src/dosfslabel.c
--- dosfstools-3.0.1/src/dosfslabel.c.exit	2008-09-28 12:06:37.000000000 +0200
+++ dosfstools-3.0.1/src/dosfslabel.c	2009-01-30 14:28:47.000000000 +0100
@@ -122,5 +122,6 @@ int main(int argc, char *argv[])
     }
 
     write_label(&fs, label);
-    return fs_close(rw) ? 1 : 0;
+    fs_close(rw);
+    return 0;
 }

dosfstools-install-p.patch:

--- NEW FILE dosfstools-install-p.patch ---
2009-01-30  Stepan Kasal  <skasal at redhat.com>

	* Makefile: Do not clobber time stamps of doc files.

--- dosfstools-3.0.1/Makefile.p	2008-09-28 12:06:37.000000000 +0200
+++ dosfstools-3.0.1/Makefile	2009-01-30 12:25:59.000000000 +0100
@@ -58,11 +58,11 @@
 
 install-doc:
 	install -d -m 0755 $(DESTDIR)/$(DOCDIR)/dosfstools
-	install -m 0644 doc/* $(DESTDIR)/$(DOCDIR)/dosfstools
+	install -p -m 0644 doc/* $(DESTDIR)/$(DOCDIR)/dosfstools
 
 install-man:
 	install -d -m 0755 $(DESTDIR)/$(MANDIR)/man8
-	install -m 0644 man/*.8 $(DESTDIR)/$(MANDIR)/man8
+	install -p -m 0644 man/*.8 $(DESTDIR)/$(MANDIR)/man8
 
 	ln -sf dosfsck.8 $(DESTDIR)/$(MANDIR)/man8/fsck.msdos.8
 	ln -sf dosfsck.8 $(DESTDIR)/$(MANDIR)/man8/fsck.vfat.8


Index: dosfstools.spec
===================================================================
RCS file: /cvs/extras/rpms/dosfstools/devel/dosfstools.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- dosfstools.spec	30 Jan 2009 09:44:27 -0000	1.35
+++ dosfstools.spec	30 Jan 2009 13:50:37 -0000	1.36
@@ -1,7 +1,7 @@
 Name: dosfstools
 Summary: Utilities for making and checking MS-DOS FAT filesystems on Linux
 Version: 3.0.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv3+
 Group: Applications/System
 Source0: http://www.daniel-baumann.ch/software/dosfstools/%{name}-%{version}.tar.gz
@@ -10,6 +10,11 @@
 Obsoletes: mkdosfs-ygg
 Provides: mkdosfs-ygg = %{version}
 
+# Mailed to Daniel Baumann
+Patch0: dosfstools-install-p.patch
+# Mailed to Daniel Baumann
+Patch1: dosfstools-exit.patch
+
 %description
 The dosfstools package includes the mkdosfs and dosfsck utilities,
 which respectively make and check MS-DOS FAT filesystems on hard
@@ -17,25 +22,31 @@
 
 %prep
 %setup -q
-sed -i 's,\$(DOCDIR)/%{name}$,&-%{version},' Makefile
+%patch0 -p1
+%patch1 -p1
 
 %build
 make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
 
 %install
 rm -rf %{buildroot}
-make DESTDIR=%{buildroot} install PREFIX=%{_prefix} SBINDIR=/sbin
+make DESTDIR=%{buildroot} install-bin install-man PREFIX=%{_prefix} SBINDIR=/sbin
 
 %clean
 rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
-%doc ChangeLog COPYING
+%doc ChangeLog COPYING doc/*-2.x
 /sbin/*
 %{_mandir}/man8/*
 
 %changelog
+* Fri Jan 30 2009 Stepan Kasal <skasal at redhat.com> - 3.0.1-3
+- fix the previous commit
+- omit the most obsolete documents
+- after writing the label, exit with exit code 0 (#468050)
+
 * Fri Jan 30 2009 Stepan Kasal <skasal at redhat.com> - 3.0.1-2
 - install all the documentation to the usual docdir (#225707)
 



From silfreed at fedoraproject.org  Fri Jan 30 13:54:25 2009
From: silfreed at fedoraproject.org (Douglas E. Warner)
Date: Fri, 30 Jan 2009 13:54:25 +0000 (UTC)
Subject: rpms/libconcord/F-9 libconcord.spec,1.1,1.2
Message-ID: <20090130135425.E468970141@cvs1.fedora.phx.redhat.com>

Author: silfreed

Update of /cvs/pkgs/rpms/libconcord/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26051/F-9

Modified Files:
	libconcord.spec 
Log Message:
removing registered marks


Index: libconcord.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libconcord/F-9/libconcord.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libconcord.spec	12 May 2008 14:23:16 -0000	1.1
+++ libconcord.spec	30 Jan 2009 13:53:55 -0000	1.2
@@ -3,8 +3,8 @@
 
 Name: libconcord
 Version: 0.20
-Release: 5%{?dist}
-Summary: Library to talk to Logitech?? Harmony?? universal remote controls
+Release: 6%{?dist}
+Summary: Library to talk to Logitech Harmony universal remote controls
 
 Group: Development/Libraries
 License: GPLv3+
@@ -21,7 +21,7 @@
 Requires(postun): /sbin/ldconfig
 
 %description
-Library to talk to Logitech?? Harmony?? universal remote controls
+Library to talk to Logitech Harmony universal remote controls
 
 
 %package devel
@@ -150,6 +150,9 @@
 
 
 %changelog
+* Fri Jan 30 2009 Douglas E. Warner <silfreed at silfreed.net> 0.20-6
+- removing registered marks
+
 * Sat May 03 2008 Douglas E. Warner <silfreed at silfreed.net> 0.20-5
 - fixing TODO file included twice
 - adding bindings docs



From silfreed at fedoraproject.org  Fri Jan 30 13:54:25 2009
From: silfreed at fedoraproject.org (Douglas E. Warner)
Date: Fri, 30 Jan 2009 13:54:25 +0000 (UTC)
Subject: rpms/libconcord/F-10 libconcord.spec,1.1,1.2
Message-ID: <20090130135425.C375770117@cvs1.fedora.phx.redhat.com>

Author: silfreed

Update of /cvs/pkgs/rpms/libconcord/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26051/F-10

Modified Files:
	libconcord.spec 
Log Message:
removing registered marks


Index: libconcord.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libconcord/F-10/libconcord.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libconcord.spec	12 May 2008 14:23:28 -0000	1.1
+++ libconcord.spec	30 Jan 2009 13:53:55 -0000	1.2
@@ -3,8 +3,8 @@
 
 Name: libconcord
 Version: 0.20
-Release: 5%{?dist}
-Summary: Library to talk to Logitech?? Harmony?? universal remote controls
+Release: 6%{?dist}
+Summary: Library to talk to Logitech Harmony universal remote controls
 
 Group: Development/Libraries
 License: GPLv3+
@@ -21,7 +21,7 @@
 Requires(postun): /sbin/ldconfig
 
 %description
-Library to talk to Logitech?? Harmony?? universal remote controls
+Library to talk to Logitech Harmony universal remote controls
 
 
 %package devel
@@ -150,6 +150,9 @@
 
 
 %changelog
+* Fri Jan 30 2009 Douglas E. Warner <silfreed at silfreed.net> 0.20-6
+- removing registered marks
+
 * Sat May 03 2008 Douglas E. Warner <silfreed at silfreed.net> 0.20-5
 - fixing TODO file included twice
 - adding bindings docs



From silfreed at fedoraproject.org  Fri Jan 30 13:54:26 2009
From: silfreed at fedoraproject.org (Douglas E. Warner)
Date: Fri, 30 Jan 2009 13:54:26 +0000 (UTC)
Subject: rpms/libconcord/devel .cvsignore,1.1,1.2 libconcord.spec,1.2,1.3
Message-ID: <20090130135426.3C21C70143@cvs1.fedora.phx.redhat.com>

Author: silfreed

Update of /cvs/pkgs/rpms/libconcord/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26051/devel

Modified Files:
	.cvsignore libconcord.spec 
Log Message:
removing registered marks


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libconcord/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	10 May 2008 04:14:37 -0000	1.1
+++ .cvsignore	30 Jan 2009 13:53:55 -0000	1.2
@@ -0,0 +1 @@
+concordance-0.20.tar.bz2


Index: libconcord.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libconcord/devel/libconcord.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- libconcord.spec	29 Nov 2008 16:48:01 -0000	1.2
+++ libconcord.spec	30 Jan 2009 13:53:55 -0000	1.3
@@ -3,8 +3,8 @@
 
 Name: libconcord
 Version: 0.20
-Release: 6%{?dist}
-Summary: Library to talk to Logitech?? Harmony?? universal remote controls
+Release: 7%{?dist}
+Summary: Library to talk to Logitech Harmony universal remote controls
 
 Group: Development/Libraries
 License: GPLv3+
@@ -21,7 +21,7 @@
 Requires(postun): /sbin/ldconfig
 
 %description
-Library to talk to Logitech?? Harmony?? universal remote controls
+Library to talk to Logitech Harmony universal remote controls
 
 
 %package devel
@@ -150,6 +150,9 @@
 
 
 %changelog
+* Fri Jan 30 2009 Douglas E. Warner <silfreed at silfreed.net> 0.20-7
+- removing registered marks
+
 * Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 0.20-6
 - Rebuild for Python 2.6
 



From silfreed at fedoraproject.org  Fri Jan 30 14:00:23 2009
From: silfreed at fedoraproject.org (Douglas E. Warner)
Date: Fri, 30 Jan 2009 14:00:23 +0000 (UTC)
Subject: rpms/concordance/F-10 concordance.spec,1.1,1.2
Message-ID: <20090130140023.B2A1670117@cvs1.fedora.phx.redhat.com>

Author: silfreed

Update of /cvs/pkgs/rpms/concordance/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27180/F-10

Modified Files:
	concordance.spec 
Log Message:
removing registered marks


Index: concordance.spec
===================================================================
RCS file: /cvs/pkgs/rpms/concordance/F-10/concordance.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- concordance.spec	12 May 2008 14:23:23 -0000	1.1
+++ concordance.spec	30 Jan 2009 13:59:53 -0000	1.2
@@ -1,7 +1,7 @@
 Name: concordance
 Version: 0.20
-Release: 4%{?dist}
-Summary: Software to program the Logitech?? Harmony?? remote control
+Release: 5%{?dist}
+Summary: Software to program the Logitech Harmony remote control
 %define policykit_rules 10-%{name}.fdi
 
 Group: Applications/Communications
@@ -19,7 +19,7 @@
 BuildRequires: libxml2
 
 %description
-This software will allow you to program your Logitech?? Harmony?? universal
+This software will allow you to program your Logitech Harmony universal
 remote control.
 
 
@@ -68,6 +68,9 @@
 
 
 %changelog
+* Fri Jan 30 2009 Douglas E. Warner <silfreed at silfreed.net> 0.20-5
+- removing registered marks
+
 * Sat May 03 2008 Douglas E. Warner <silfreed at silfreed.net> 0.20-4
 - adding additional docs
 - removed harmony provides/obsoletes



From silfreed at fedoraproject.org  Fri Jan 30 14:00:23 2009
From: silfreed at fedoraproject.org (Douglas E. Warner)
Date: Fri, 30 Jan 2009 14:00:23 +0000 (UTC)
Subject: rpms/concordance/F-9 concordance.spec,1.1,1.2
Message-ID: <20090130140023.D6E0770117@cvs1.fedora.phx.redhat.com>

Author: silfreed

Update of /cvs/pkgs/rpms/concordance/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27180/F-9

Modified Files:
	concordance.spec 
Log Message:
removing registered marks


Index: concordance.spec
===================================================================
RCS file: /cvs/pkgs/rpms/concordance/F-9/concordance.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- concordance.spec	12 May 2008 14:23:17 -0000	1.1
+++ concordance.spec	30 Jan 2009 13:59:53 -0000	1.2
@@ -1,7 +1,7 @@
 Name: concordance
 Version: 0.20
-Release: 4%{?dist}
-Summary: Software to program the Logitech?? Harmony?? remote control
+Release: 5%{?dist}
+Summary: Software to program the Logitech Harmony remote control
 %define policykit_rules 10-%{name}.fdi
 
 Group: Applications/Communications
@@ -19,7 +19,7 @@
 BuildRequires: libxml2
 
 %description
-This software will allow you to program your Logitech?? Harmony?? universal
+This software will allow you to program your Logitech Harmony universal
 remote control.
 
 
@@ -68,6 +68,9 @@
 
 
 %changelog
+* Fri Jan 30 2009 Douglas E. Warner <silfreed at silfreed.net> 0.20-5
+- removing registered marks
+
 * Sat May 03 2008 Douglas E. Warner <silfreed at silfreed.net> 0.20-4
 - adding additional docs
 - removed harmony provides/obsoletes



From silfreed at fedoraproject.org  Fri Jan 30 14:00:24 2009
From: silfreed at fedoraproject.org (Douglas E. Warner)
Date: Fri, 30 Jan 2009 14:00:24 +0000 (UTC)
Subject: rpms/concordance/devel concordance.spec,1.1,1.2
Message-ID: <20090130140024.2825E70117@cvs1.fedora.phx.redhat.com>

Author: silfreed

Update of /cvs/pkgs/rpms/concordance/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27180/devel

Modified Files:
	concordance.spec 
Log Message:
removing registered marks


Index: concordance.spec
===================================================================
RCS file: /cvs/pkgs/rpms/concordance/devel/concordance.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- concordance.spec	12 May 2008 14:23:23 -0000	1.1
+++ concordance.spec	30 Jan 2009 13:59:53 -0000	1.2
@@ -1,7 +1,7 @@
 Name: concordance
 Version: 0.20
-Release: 4%{?dist}
-Summary: Software to program the Logitech?? Harmony?? remote control
+Release: 5%{?dist}
+Summary: Software to program the Logitech Harmony remote control
 %define policykit_rules 10-%{name}.fdi
 
 Group: Applications/Communications
@@ -19,7 +19,7 @@
 BuildRequires: libxml2
 
 %description
-This software will allow you to program your Logitech?? Harmony?? universal
+This software will allow you to program your Logitech Harmony universal
 remote control.
 
 
@@ -68,6 +68,9 @@
 
 
 %changelog
+* Fri Jan 30 2009 Douglas E. Warner <silfreed at silfreed.net> 0.20-5
+- removing registered marks
+
 * Sat May 03 2008 Douglas E. Warner <silfreed at silfreed.net> 0.20-4
 - adding additional docs
 - removed harmony provides/obsoletes



From lmacken at fedoraproject.org  Fri Jan 30 14:00:25 2009
From: lmacken at fedoraproject.org (Luke Macken)
Date: Fri, 30 Jan 2009 14:00:25 +0000 (UTC)
Subject: rpms/python-weberror/F-9 python-weberror.spec,NONE,1.1
Message-ID: <20090130140025.04ECE70117@cvs1.fedora.phx.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/python-weberror/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27409

Added Files:
	python-weberror.spec 
Log Message:
Initial import of WebError to the F-9 branch


--- NEW FILE python-weberror.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

Name:           python-weberror
Version:        0.10.1
Release:        1%{?dist}
Summary:        Web Error handling and exception catching middleware

Group:          Development/Languages
License:        MIT
URL:            http://pypi.python.org/pypi/WebError
Source0:        http://pypi.python.org/packages/source/W/WebError/WebError-%{version}.tar.gz
BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildArch:      noarch

BuildRequires:  python-devel
BuildRequires:  python-setuptools-devel
BuildRequires:  python-nose
BuildRequires:  python-webob
BuildRequires:  python-webtest
BuildRequires:  python-paste
BuildRequires:  python-pygments
BuildRequires:  python-tempita
BuildRequires:  python-simplejson

Requires:       python-webob
Requires:       python-tempita
Requires:       python-pygments
Requires:       python-simplejson

%description
WebError is WSGI middleware that performs error handling and exception
catching.

%prep
%setup -q -n WebError-%{version}
find . -type f -name ._\* -exec rm -f {} \;
%{__chmod} 0644 WebError.egg-info/*


%build
%{__python} setup.py build


%check
PYTHONPATH=$(pwd) nosetests


%install
%{__rm} -rf %{buildroot}
%{__python} setup.py install --skip-build --root %{buildroot}

 
%clean
%{__rm} -rf %{buildroot}


%files
%defattr(-,root,root,-)
%doc CHANGELOG LICENSE
%{python_sitelib}/weberror
%{python_sitelib}/*.egg-info


%changelog
* Tue Jan 06 2009 Luke Macken <lmacken at redhat.com> - 0.10.1-1
- Update to 0.10.1
- Remove the wsgiref patch

* Wed Oct 22 2008 Luke Macken <lmacken at redhat.com> - 0.9-3
- Add python-{paste,pygments,tempita,simplejson} to the BuildRequires
- Add python-{tempita,pygments,simplejson} to the Requires

* Tue Oct 21 2008 Luke Macken <lmacken at redhat.com> - 0.9-2
- Add a patch to remove the wsgiref requirement, as it is now in Python2.5

* Tue Oct 21 2008 Luke Macken <lmacken at redhat.com> - 0.9-1
- Update to 0.9
- Add python-tempita to the BuildRequires

* Thu Jul 17 2008 Ricky Zhou <ricky at fedoraproject.org> - 0.8-3
- Update Requires for python-webob rename.
- Add BuildRequires on python-webob and python-webtest.

* Mon Jul 07 2008 Ricky Zhou <ricky at fedoraproject.org> - 0.8-2
- Add %%check section.

* Sat Jun 14 2008 Ricky Zhou <ricky at fedoraproject.org> - 0.8-1
- Initial RPM Package.



From lmacken at fedoraproject.org  Fri Jan 30 14:00:54 2009
From: lmacken at fedoraproject.org (Luke Macken)
Date: Fri, 30 Jan 2009 14:00:54 +0000 (UTC)
Subject: rpms/python-weberror/F-10 python-weberror.spec,NONE,1.1
Message-ID: <20090130140054.673D470117@cvs1.fedora.phx.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/python-weberror/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27622

Added Files:
	python-weberror.spec 
Log Message:
Initial import of WebError to the F-10 branch


--- NEW FILE python-weberror.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

Name:           python-weberror
Version:        0.10.1
Release:        1%{?dist}
Summary:        Web Error handling and exception catching middleware

Group:          Development/Languages
License:        MIT
URL:            http://pypi.python.org/pypi/WebError
Source0:        http://pypi.python.org/packages/source/W/WebError/WebError-%{version}.tar.gz
BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildArch:      noarch

BuildRequires:  python-devel
BuildRequires:  python-setuptools-devel
BuildRequires:  python-nose
BuildRequires:  python-webob
BuildRequires:  python-webtest
BuildRequires:  python-paste
BuildRequires:  python-pygments
BuildRequires:  python-tempita
BuildRequires:  python-simplejson

Requires:       python-webob
Requires:       python-tempita
Requires:       python-pygments
Requires:       python-simplejson

%description
WebError is WSGI middleware that performs error handling and exception
catching.

%prep
%setup -q -n WebError-%{version}
find . -type f -name ._\* -exec rm -f {} \;
%{__chmod} 0644 WebError.egg-info/*


%build
%{__python} setup.py build


%check
PYTHONPATH=$(pwd) nosetests


%install
%{__rm} -rf %{buildroot}
%{__python} setup.py install --skip-build --root %{buildroot}

 
%clean
%{__rm} -rf %{buildroot}


%files
%defattr(-,root,root,-)
%doc CHANGELOG LICENSE
%{python_sitelib}/weberror
%{python_sitelib}/*.egg-info


%changelog
* Tue Jan 06 2009 Luke Macken <lmacken at redhat.com> - 0.10.1-1
- Update to 0.10.1
- Remove the wsgiref patch

* Wed Oct 22 2008 Luke Macken <lmacken at redhat.com> - 0.9-3
- Add python-{paste,pygments,tempita,simplejson} to the BuildRequires
- Add python-{tempita,pygments,simplejson} to the Requires

* Tue Oct 21 2008 Luke Macken <lmacken at redhat.com> - 0.9-2
- Add a patch to remove the wsgiref requirement, as it is now in Python2.5

* Tue Oct 21 2008 Luke Macken <lmacken at redhat.com> - 0.9-1
- Update to 0.9
- Add python-tempita to the BuildRequires

* Thu Jul 17 2008 Ricky Zhou <ricky at fedoraproject.org> - 0.8-3
- Update Requires for python-webob rename.
- Add BuildRequires on python-webob and python-webtest.

* Mon Jul 07 2008 Ricky Zhou <ricky at fedoraproject.org> - 0.8-2
- Add %%check section.

* Sat Jun 14 2008 Ricky Zhou <ricky at fedoraproject.org> - 0.8-1
- Initial RPM Package.



From lmacken at fedoraproject.org  Fri Jan 30 14:02:04 2009
From: lmacken at fedoraproject.org (Luke Macken)
Date: Fri, 30 Jan 2009 14:02:04 +0000 (UTC)
Subject: rpms/python-weberror/EL-5 python-weberror.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090130140204.9E92A70117@cvs1.fedora.phx.redhat.com>

Author: lmacken

Update of /cvs/pkgs/rpms/python-weberror/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27905

Modified Files:
	.cvsignore sources 
Added Files:
	python-weberror.spec 
Log Message:
Initial import of WebError to the EL-5 branch


--- NEW FILE python-weberror.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

Name:           python-weberror
Version:        0.10.1
Release:        1%{?dist}
Summary:        Web Error handling and exception catching middleware

Group:          Development/Languages
License:        MIT
URL:            http://pypi.python.org/pypi/WebError
Source0:        http://pypi.python.org/packages/source/W/WebError/WebError-%{version}.tar.gz
BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildArch:      noarch

BuildRequires:  python-devel
BuildRequires:  python-setuptools-devel
BuildRequires:  python-nose
BuildRequires:  python-webob
BuildRequires:  python-webtest
BuildRequires:  python-paste
BuildRequires:  python-pygments
BuildRequires:  python-tempita
BuildRequires:  python-simplejson

Requires:       python-webob
Requires:       python-tempita
Requires:       python-pygments
Requires:       python-simplejson

%description
WebError is WSGI middleware that performs error handling and exception
catching.

%prep
%setup -q -n WebError-%{version}
find . -type f -name ._\* -exec rm -f {} \;
%{__chmod} 0644 WebError.egg-info/*


%build
%{__python} setup.py build


%check
PYTHONPATH=$(pwd) nosetests


%install
%{__rm} -rf %{buildroot}
%{__python} setup.py install --skip-build --root %{buildroot}

 
%clean
%{__rm} -rf %{buildroot}


%files
%defattr(-,root,root,-)
%doc CHANGELOG LICENSE
%{python_sitelib}/weberror
%{python_sitelib}/*.egg-info


%changelog
* Tue Jan 06 2009 Luke Macken <lmacken at redhat.com> - 0.10.1-1
- Update to 0.10.1
- Remove the wsgiref patch

* Wed Oct 22 2008 Luke Macken <lmacken at redhat.com> - 0.9-3
- Add python-{paste,pygments,tempita,simplejson} to the BuildRequires
- Add python-{tempita,pygments,simplejson} to the Requires

* Tue Oct 21 2008 Luke Macken <lmacken at redhat.com> - 0.9-2
- Add a patch to remove the wsgiref requirement, as it is now in Python2.5

* Tue Oct 21 2008 Luke Macken <lmacken at redhat.com> - 0.9-1
- Update to 0.9
- Add python-tempita to the BuildRequires

* Thu Jul 17 2008 Ricky Zhou <ricky at fedoraproject.org> - 0.8-3
- Update Requires for python-webob rename.
- Add BuildRequires on python-webob and python-webtest.

* Mon Jul 07 2008 Ricky Zhou <ricky at fedoraproject.org> - 0.8-2
- Add %%check section.

* Sat Jun 14 2008 Ricky Zhou <ricky at fedoraproject.org> - 0.8-1
- Initial RPM Package.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-weberror/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	7 Jan 2009 01:24:06 -0000	1.1
+++ .cvsignore	30 Jan 2009 14:01:34 -0000	1.2
@@ -0,0 +1 @@
+WebError-0.10.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-weberror/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	7 Jan 2009 01:24:06 -0000	1.1
+++ sources	30 Jan 2009 14:01:34 -0000	1.2
@@ -0,0 +1 @@
+51e69120f19624430853cf493d59e68d  WebError-0.10.1.tar.gz



From karsten at fedoraproject.org  Fri Jan 30 14:03:37 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Fri, 30 Jan 2009 14:03:37 +0000 (UTC)
Subject: rpms/net-snmp/devel net-snmp.spec,1.175,1.176
Message-ID: <20090130140337.8F6DF70117@cvs1.fedora.phx.redhat.com>

Author: karsten

Update of /cvs/extras/rpms/net-snmp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28232

Modified Files:
	net-snmp.spec 
Log Message:
- fix build on s390x which has no libsensors


Index: net-snmp.spec
===================================================================
RCS file: /cvs/extras/rpms/net-snmp/devel/net-snmp.spec,v
retrieving revision 1.175
retrieving revision 1.176
diff -u -r1.175 -r1.176
--- net-snmp.spec	17 Jan 2009 15:31:23 -0000	1.175
+++ net-snmp.spec	30 Jan 2009 14:03:07 -0000	1.176
@@ -192,7 +192,11 @@
 %configure \
     --enable-static --enable-shared			\
     --with-cflags="$RPM_OPT_FLAGS -D_RPM_4_4_COMPAT"	\
-    --with-ldflags="$LDFLAGS -lcrypto -lsensors"			\
+%ifnarch s390 s390x
+    --with-ldflags="$LDFLAGS -lcrypto -lsensors"	\
+%else
+    --with-ldflags="$LDFLAGS -lcrypto"		\
+%endif
     --with-sys-location="Unknown"			\
     --with-logfile="/var/log/snmpd.log"			\
     --with-persistent-directory="/var/net-snmp"		\
@@ -415,6 +419,9 @@
 %{_datadir}/snmp/mibs
 
 %changelog
+* Fri Jan 30 2009 Karsten Hopp <karsten at redhat.com> 5.4.2.1-7
+- fix build on s390x which has no libsensors
+
 * Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> 5.4.2.1-7
 - rebuild with new openssl
 



From pkgdb at fedoraproject.org  Fri Jan 30 14:19:22 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 14:19:22 +0000
Subject: [pkgdb] anjuta: rakesh has requested watchbugzilla
Message-ID: <20090130141922.D8BFA208485@bastion.fedora.phx.redhat.com>

rakesh has requested the watchbugzilla acl on anjuta (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/anjuta



From pkgdb at fedoraproject.org  Fri Jan 30 14:19:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 14:19:23 +0000
Subject: [pkgdb] anjuta: rakesh has requested watchcommits
Message-ID: <20090130141923.A9377208495@bastion.fedora.phx.redhat.com>

rakesh has requested the watchcommits acl on anjuta (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/anjuta



From pkgdb at fedoraproject.org  Fri Jan 30 14:19:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 14:19:26 +0000
Subject: [pkgdb] anjuta: rakesh has requested commit
Message-ID: <20090130141927.16DEC208497@bastion.fedora.phx.redhat.com>

rakesh has requested the commit acl on anjuta (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/anjuta



From pkgdb at fedoraproject.org  Fri Jan 30 14:19:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 14:19:59 +0000
Subject: [pkgdb] glade3: rakesh has requested watchbugzilla
Message-ID: <20090130141959.D7BAD208484@bastion.fedora.phx.redhat.com>

rakesh has requested the watchbugzilla acl on glade3 (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/glade3



From pkgdb at fedoraproject.org  Fri Jan 30 14:20:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 14:20:00 +0000
Subject: [pkgdb] glade3: rakesh has requested commit
Message-ID: <20090130142000.D280E208493@bastion.fedora.phx.redhat.com>

rakesh has requested the commit acl on glade3 (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/glade3



From pkgdb at fedoraproject.org  Fri Jan 30 14:20:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 14:20:10 +0000
Subject: [pkgdb] glade3: rakesh has requested approveacls
Message-ID: <20090130142010.C720B2084B6@bastion.fedora.phx.redhat.com>

rakesh has requested the approveacls acl on glade3 (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/glade3



From dwalsh at fedoraproject.org  Fri Jan 30 14:20:52 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Fri, 30 Jan 2009 14:20:52 +0000 (UTC)
Subject: rpms/selinux-policy/devel policy-20090105.patch, 1.23,
	1.24 selinux-policy.spec, 1.778, 1.779
Message-ID: <20090130142052.A29C270117@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31966

Modified Files:
	policy-20090105.patch selinux-policy.spec 
Log Message:
* Fri Jan 30 2009 Dan Walsh <dwalsh at redhat.com> 3.6.3-11
- Add virt_content_ro_t and labeling for isos directory


policy-20090105.patch:

Index: policy-20090105.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-20090105.patch,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- policy-20090105.patch	28 Jan 2009 22:23:18 -0000	1.23
+++ policy-20090105.patch	30 Jan 2009 14:20:51 -0000	1.24
@@ -3287,8 +3287,8 @@
 +
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/podsleuth.te serefpolicy-3.6.3/policy/modules/apps/podsleuth.te
 --- nsaserefpolicy/policy/modules/apps/podsleuth.te	2009-01-05 15:39:38.000000000 -0500
-+++ serefpolicy-3.6.3/policy/modules/apps/podsleuth.te	2009-01-19 13:10:02.000000000 -0500
-@@ -11,21 +11,58 @@
++++ serefpolicy-3.6.3/policy/modules/apps/podsleuth.te	2009-01-30 08:03:36.000000000 -0500
+@@ -11,21 +11,59 @@
  application_domain(podsleuth_t, podsleuth_exec_t)
  role system_r types podsleuth_t;
  
@@ -3326,7 +3326,8 @@
 +fs_getattr_dos_fs(podsleuth_t)
 +fs_read_dos_files(podsleuth_t)
 +fs_search_dos(podsleuth_t)
-+
++fs_getattr_tmpfs(podsleuth_t)
++fs_list_tmpfs(podsleuth_t)
 +fs_mount_nfs(podsleuth_t)
 +fs_unmount_nfs(podsleuth_t)
 +fs_getattr_nfs(podsleuth_t)
@@ -3685,7 +3686,7 @@
  ')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/qemu.te serefpolicy-3.6.3/policy/modules/apps/qemu.te
 --- nsaserefpolicy/policy/modules/apps/qemu.te	2009-01-19 11:03:28.000000000 -0500
-+++ serefpolicy-3.6.3/policy/modules/apps/qemu.te	2009-01-19 13:10:02.000000000 -0500
++++ serefpolicy-3.6.3/policy/modules/apps/qemu.te	2009-01-30 09:14:38.000000000 -0500
 @@ -6,6 +6,8 @@
  # Declarations
  #
@@ -3695,7 +3696,7 @@
  ## <desc>
  ## <p>
  ## Allow qemu to connect fully to the network
-@@ -13,28 +15,151 @@
+@@ -13,28 +15,153 @@
  ## </desc>
  gen_tunable(qemu_full_network, false)
  
@@ -3800,6 +3801,8 @@
 +storage_raw_write_removable_device(qemu_t)
 +storage_raw_read_removable_device(qemu_t)
 +
++userdom_search_user_home_content(qemu_t)
++
  tunable_policy(`qemu_full_network',`
  	allow qemu_t self:udp_socket create_socket_perms;
  
@@ -5158,7 +5161,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.6.3/policy/modules/kernel/domain.te
 --- nsaserefpolicy/policy/modules/kernel/domain.te	2009-01-05 15:39:38.000000000 -0500
-+++ serefpolicy-3.6.3/policy/modules/kernel/domain.te	2009-01-19 13:10:02.000000000 -0500
++++ serefpolicy-3.6.3/policy/modules/kernel/domain.te	2009-01-30 07:56:48.000000000 -0500
 @@ -5,6 +5,13 @@
  #
  # Declarations
@@ -5220,7 +5223,7 @@
  allow unconfined_domain_type domain:lnk_file { read_lnk_file_perms ioctl lock };
  
  # act on all domains keys
-@@ -153,3 +170,39 @@
+@@ -153,3 +170,34 @@
  
  # receive from all domains over labeled networking
  domain_all_recvfrom_all_domains(unconfined_domain_type)
@@ -5234,15 +5237,10 @@
 +	cron_dontaudit_write_system_job_tmp_files(domain)
 +	cron_rw_pipes(domain)
 +ifdef(`hide_broken_symptoms',`
-+	cron_dontaudit_rw_tcp_sockets(domain)
 +	allow domain domain:key { link search };
 +')
 +')
 +
-+ifdef(`hide_broken_symptoms',`
-+        dbus_dontaudit_system_bus_rw_tcp_sockets(domain)
-+')
-+
 +optional_policy(`
 +	rpm_rw_pipes(domain)
 +	rpm_dontaudit_use_script_fds(domain)
@@ -17626,7 +17624,7 @@
  /usr/sbin/postkick	--	gen_context(system_u:object_r:postfix_master_exec_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postfix.if serefpolicy-3.6.3/policy/modules/services/postfix.if
 --- nsaserefpolicy/policy/modules/services/postfix.if	2009-01-19 11:06:49.000000000 -0500
-+++ serefpolicy-3.6.3/policy/modules/services/postfix.if	2009-01-19 13:10:02.000000000 -0500
++++ serefpolicy-3.6.3/policy/modules/services/postfix.if	2009-01-30 08:30:01.000000000 -0500
 @@ -46,6 +46,7 @@
  
  	allow postfix_$1_t postfix_etc_t:dir list_dir_perms;
@@ -17647,7 +17645,33 @@
  	files_search_etc($1)
  ')
  
-@@ -378,7 +378,7 @@
+@@ -232,6 +232,25 @@
+ 
+ ########################################
+ ## <summary>
++##	Allow read/write postfix local pipes
++##	TCP sockets.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain to not audit.
++##	</summary>
++## </param>
++#
++interface(`postfix_rw_local_pipes',`
++	gen_require(`
++		type postfix_local_t;
++	')
++
++	allow $1 postfix_local_t:fifo rw_fifo_file_perms;
++')
++
++########################################
++## <summary>
+ ##	Allow domain to read postfix local process state
+ ## </summary>
+ ## <param name="domain">
+@@ -378,7 +397,7 @@
  ##	</summary>
  ## </param>
  #
@@ -17656,7 +17680,7 @@
  	gen_require(`
  		type postfix_private_t;
  	')
-@@ -389,6 +389,25 @@
+@@ -389,6 +408,25 @@
  
  ########################################
  ## <summary>
@@ -17682,7 +17706,7 @@
  ##	Execute the master postfix program in the
  ##	postfix_master domain.
  ## </summary>
-@@ -418,10 +437,10 @@
+@@ -418,10 +456,10 @@
  #
  interface(`postfix_search_spool',`
  	gen_require(`
@@ -17695,7 +17719,7 @@
  	files_search_spool($1)
  ')
  
-@@ -437,11 +456,30 @@
+@@ -437,11 +475,30 @@
  #
  interface(`postfix_list_spool',`
  	gen_require(`
@@ -17728,7 +17752,7 @@
  ')
  
  ########################################
-@@ -456,16 +494,16 @@
+@@ -456,16 +513,16 @@
  #
  interface(`postfix_read_spool_files',`
  	gen_require(`
@@ -17748,7 +17772,7 @@
  ## </summary>
  ## <param name="domain">
  ##	<summary>
-@@ -475,11 +513,11 @@
+@@ -475,11 +532,11 @@
  #
  interface(`postfix_manage_spool_files',`
  	gen_require(`
@@ -17762,7 +17786,7 @@
  ')
  
  ########################################
-@@ -500,3 +538,23 @@
+@@ -500,3 +557,23 @@
  
  	typeattribute $1 postfix_user_domtrans;
  ')
@@ -21420,7 +21444,7 @@
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/spamassassin.te serefpolicy-3.6.3/policy/modules/services/spamassassin.te
 --- nsaserefpolicy/policy/modules/services/spamassassin.te	2009-01-19 11:06:49.000000000 -0500
-+++ serefpolicy-3.6.3/policy/modules/services/spamassassin.te	2009-01-19 13:10:02.000000000 -0500
++++ serefpolicy-3.6.3/policy/modules/services/spamassassin.te	2009-01-30 08:30:30.000000000 -0500
 @@ -20,6 +20,35 @@
  ## </desc>
  gen_tunable(spamd_enable_home_dirs, true)
@@ -21532,7 +21556,7 @@
  miscfiles_read_localization(spamc_t)
  
  # cjp: this should probably be removed:
-@@ -265,31 +323,34 @@
+@@ -265,31 +323,35 @@
  
  sysnet_read_config(spamc_t)
  
@@ -21568,6 +21592,7 @@
 -	nscd_socket_use(spamc_t)
 +	postfix_domtrans_postdrop(spamc_t)
 +	postfix_search_spool(spamc_t)
++	postfix_rw_local_pipes(spamc_t)
  ')
  
  optional_policy(`
@@ -21579,7 +21604,7 @@
  ')
  
  ########################################
-@@ -301,7 +362,7 @@
+@@ -301,7 +363,7 @@
  # setuids to the user running spamc.  Comment this if you are not
  # using this ability.
  
@@ -21588,7 +21613,7 @@
  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;
-@@ -317,10 +378,13 @@
+@@ -317,10 +379,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;
@@ -21603,7 +21628,7 @@
  files_spool_filetrans(spamd_t, spamd_spool_t, { file dir })
  
  manage_dirs_pattern(spamd_t, spamd_tmp_t, spamd_tmp_t)
-@@ -329,10 +393,11 @@
+@@ -329,10 +394,11 @@
  
  # var/lib files for spamd
  allow spamd_t spamd_var_lib_t:dir list_dir_perms;
@@ -21616,7 +21641,7 @@
  files_pid_filetrans(spamd_t, spamd_var_run_t, { dir file })
  
  kernel_read_all_sysctls(spamd_t)
-@@ -382,22 +447,27 @@
+@@ -382,22 +448,27 @@
  
  init_dontaudit_rw_utmp(spamd_t)
  
@@ -21648,7 +21673,7 @@
  	fs_manage_cifs_files(spamd_t)
  ')
  
-@@ -415,6 +485,7 @@
+@@ -415,6 +486,7 @@
  
  optional_policy(`
  	dcc_domtrans_client(spamd_t)
@@ -21656,7 +21681,7 @@
  	dcc_stream_connect_dccifd(spamd_t)
  ')
  
-@@ -424,10 +495,6 @@
+@@ -424,10 +496,6 @@
  ')
  
  optional_policy(`
@@ -21667,7 +21692,7 @@
  	postfix_read_config(spamd_t)
  ')
  
-@@ -442,6 +509,10 @@
+@@ -442,6 +510,10 @@
  
  optional_policy(`
  	razor_domtrans(spamd_t)
@@ -22363,10 +22388,80 @@
  ')
  
  optional_policy(`
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/virt.fc serefpolicy-3.6.3/policy/modules/services/virt.fc
+--- nsaserefpolicy/policy/modules/services/virt.fc	2009-01-05 15:39:43.000000000 -0500
++++ serefpolicy-3.6.3/policy/modules/services/virt.fc	2009-01-30 09:09:00.000000000 -0500
+@@ -8,5 +8,10 @@
+ 
+ /var/lib/libvirt(/.*)?		gen_context(system_u:object_r:virt_var_lib_t,s0)
+ /var/lib/libvirt/images(/.*)? 	gen_context(system_u:object_r:virt_image_t,s0)
++/var/lib/libvirt/isos(/.*)? 	gen_context(system_u:object_r:virt_image_ro_t,s0)
++
+ /var/log/libvirt(/.*)?		gen_context(system_u:object_r:virt_log_t,s0)
+ /var/run/libvirt(/.*)?		gen_context(system_u:object_r:virt_var_run_t,s0)
++
++HOME_DIR/VirtualMachines(/.*)? 	gen_context(system_u:object_r:virt_image_t,s0)
++HOME_DIR/VirtualMachines/isos(/.*)? 	gen_context(system_u:object_r:virt_image_ro_t,s0)
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/virt.if serefpolicy-3.6.3/policy/modules/services/virt.if
+--- nsaserefpolicy/policy/modules/services/virt.if	2009-01-05 15:39:43.000000000 -0500
++++ serefpolicy-3.6.3/policy/modules/services/virt.if	2009-01-30 09:13:05.000000000 -0500
+@@ -293,6 +293,41 @@
+ 
+ ########################################
+ ## <summary>
++##	Allow domain to manage virt image files
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain to not audit.
++##	</summary>
++## </param>
++#
++interface(`virt_read_ro_t',`
++	gen_require(`
++		type virt_image_ro_t;
++	')
++
++	virt_search_lib($1)
++	allow $1 virt_image_ro_t:dir list_dir_perms;
++	read_dirs_pattern($1, virt_image_ro_t, virt_image_ro_t)
++	read_files_pattern($1, virt_image_ro_t, virt_image_ro_t)
++	read_lnk_files_pattern($1, virt_image_ro_t, virt_image_ro_t)
++	rw_blk_files_pattern($1, virt_image_ro_t, virt_image_ro_t)
++
++	tunable_policy(`virt_use_nfs',`
++		fs_read_nfs_dirs($1)
++		fs_read_nfs_files($1)
++		fs_read_nfs_symlinks($1)
++	')
++
++	tunable_policy(`virt_use_samba',`
++		fs_read_nfs_files($1)
++		fs_read_cifs_files($1)
++		fs_read_cifs_symlinks($1)
++	')
++')
++
++########################################
++## <summary>
+ ##	All of the rules required to administrate 
+ ##	an virt environment
+ ## </summary>
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/virt.te serefpolicy-3.6.3/policy/modules/services/virt.te
 --- nsaserefpolicy/policy/modules/services/virt.te	2009-01-19 11:06:49.000000000 -0500
-+++ serefpolicy-3.6.3/policy/modules/services/virt.te	2009-01-21 16:53:49.000000000 -0500
-@@ -53,7 +53,7 @@
++++ serefpolicy-3.6.3/policy/modules/services/virt.te	2009-01-30 09:10:13.000000000 -0500
+@@ -32,6 +32,10 @@
+ type virt_image_t, virt_image_type; # customizable
+ virt_image(virt_image_t)
+ 
++# virt Image files
++type virt_image_ro_t;
++virt_image(virt_image_ro_t)
++
+ type virt_log_t;
+ logging_log_file(virt_log_t)
+ 
+@@ -53,7 +57,7 @@
  # virtd local policy
  #
  
@@ -22375,7 +22470,7 @@
  allow virtd_t self:process { getsched sigkill signal execmem };
  allow virtd_t self:fifo_file rw_file_perms;
  allow virtd_t self:unix_stream_socket create_stream_socket_perms;
-@@ -96,7 +96,7 @@
+@@ -96,7 +100,7 @@
  corenet_tcp_sendrecv_generic_node(virtd_t)
  corenet_tcp_sendrecv_all_ports(virtd_t)
  corenet_tcp_bind_generic_node(virtd_t)
@@ -22384,7 +22479,7 @@
  corenet_tcp_bind_vnc_port(virtd_t)
  corenet_tcp_connect_vnc_port(virtd_t)
  corenet_tcp_connect_soundd_port(virtd_t)
-@@ -110,11 +110,13 @@
+@@ -110,11 +114,13 @@
  
  files_read_usr_files(virtd_t)
  files_read_etc_files(virtd_t)
@@ -22398,7 +22493,7 @@
  
  storage_raw_write_removable_device(virtd_t)
  storage_raw_read_removable_device(virtd_t)
-@@ -129,7 +131,10 @@
+@@ -129,7 +135,10 @@
  
  logging_send_syslog_msg(virtd_t)
  
@@ -22409,7 +22504,7 @@
  
  tunable_policy(`virt_use_nfs',`
  	fs_manage_nfs_dirs(virtd_t)
-@@ -173,16 +178,17 @@
+@@ -173,16 +182,17 @@
  	iptables_domtrans(virtd_t)
  ')
  
@@ -28084,7 +28179,7 @@
 +/dev/shm/mono.*		gen_context(system_u:object_r:user_tmpfs_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-3.6.3/policy/modules/system/userdomain.if
 --- nsaserefpolicy/policy/modules/system/userdomain.if	2009-01-19 11:07:34.000000000 -0500
-+++ serefpolicy-3.6.3/policy/modules/system/userdomain.if	2009-01-28 10:48:13.000000000 -0500
++++ serefpolicy-3.6.3/policy/modules/system/userdomain.if	2009-01-30 09:14:16.000000000 -0500
 @@ -30,8 +30,9 @@
  	')
  


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.778
retrieving revision 1.779
diff -u -r1.778 -r1.779
--- selinux-policy.spec	28 Jan 2009 22:23:18 -0000	1.778
+++ selinux-policy.spec	30 Jan 2009 14:20:51 -0000	1.779
@@ -20,7 +20,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.6.3
-Release: 10%{?dist}
+Release: 11%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -444,6 +444,9 @@
 %endif
 
 %changelog
+* Fri Jan 30 2009 Dan Walsh <dwalsh at redhat.com> 3.6.3-11
+- Add virt_content_ro_t and labeling for isos directory
+
 * Tue Jan 27 2009 Dan Walsh <dwalsh at redhat.com> 3.6.3-10
 - Fixes for wicd daemon
 



From pkgdb at fedoraproject.org  Fri Jan 30 14:24:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 14:24:25 +0000
Subject: [pkgdb] anjuta had acl change status
Message-ID: <20090130142425.A5434208485@bastion.fedora.phx.redhat.com>

rishi has set the watchcommits acl on anjuta (Fedora devel) to Approved for rakesh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/anjuta



From pkgdb at fedoraproject.org  Fri Jan 30 14:24:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 14:24:24 +0000
Subject: [pkgdb] anjuta had acl change status
Message-ID: <20090130142426.025E4208493@bastion.fedora.phx.redhat.com>

rishi has set the watchbugzilla acl on anjuta (Fedora devel) to Approved for rakesh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/anjuta



From dwalsh at fedoraproject.org  Fri Jan 30 14:24:45 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Fri, 30 Jan 2009 14:24:45 +0000 (UTC)
Subject: rpms/selinux-policy/devel policy-20090105.patch,1.24,1.25
Message-ID: <20090130142445.D1B3A70117@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv336

Modified Files:
	policy-20090105.patch 
Log Message:
* Fri Jan 30 2009 Dan Walsh <dwalsh at redhat.com> 3.6.3-11
- Add virt_content_ro_t and labeling for isos directory


policy-20090105.patch:

Index: policy-20090105.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-20090105.patch,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- policy-20090105.patch	30 Jan 2009 14:20:51 -0000	1.24
+++ policy-20090105.patch	30 Jan 2009 14:24:45 -0000	1.25
@@ -3686,7 +3686,7 @@
  ')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/qemu.te serefpolicy-3.6.3/policy/modules/apps/qemu.te
 --- nsaserefpolicy/policy/modules/apps/qemu.te	2009-01-19 11:03:28.000000000 -0500
-+++ serefpolicy-3.6.3/policy/modules/apps/qemu.te	2009-01-30 09:14:38.000000000 -0500
++++ serefpolicy-3.6.3/policy/modules/apps/qemu.te	2009-01-30 09:22:46.000000000 -0500
 @@ -6,6 +6,8 @@
  # Declarations
  #
@@ -3696,7 +3696,7 @@
  ## <desc>
  ## <p>
  ## Allow qemu to connect fully to the network
-@@ -13,28 +15,153 @@
+@@ -13,28 +15,154 @@
  ## </desc>
  gen_tunable(qemu_full_network, false)
  
@@ -3784,6 +3784,7 @@
 +optional_policy(`
 +	virt_read_config(qemutype)
 +	virt_read_lib_files(qemutype)
++	virt_read_content(qemu_type)
 +')
 +
 +optional_policy(`
@@ -22390,21 +22391,21 @@
  optional_policy(`
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/virt.fc serefpolicy-3.6.3/policy/modules/services/virt.fc
 --- nsaserefpolicy/policy/modules/services/virt.fc	2009-01-05 15:39:43.000000000 -0500
-+++ serefpolicy-3.6.3/policy/modules/services/virt.fc	2009-01-30 09:09:00.000000000 -0500
++++ serefpolicy-3.6.3/policy/modules/services/virt.fc	2009-01-30 09:23:34.000000000 -0500
 @@ -8,5 +8,10 @@
  
  /var/lib/libvirt(/.*)?		gen_context(system_u:object_r:virt_var_lib_t,s0)
  /var/lib/libvirt/images(/.*)? 	gen_context(system_u:object_r:virt_image_t,s0)
-+/var/lib/libvirt/isos(/.*)? 	gen_context(system_u:object_r:virt_image_ro_t,s0)
++/var/lib/libvirt/isos(/.*)? 	gen_context(system_u:object_r:virt_content_t,s0)
 +
  /var/log/libvirt(/.*)?		gen_context(system_u:object_r:virt_log_t,s0)
  /var/run/libvirt(/.*)?		gen_context(system_u:object_r:virt_var_run_t,s0)
 +
 +HOME_DIR/VirtualMachines(/.*)? 	gen_context(system_u:object_r:virt_image_t,s0)
-+HOME_DIR/VirtualMachines/isos(/.*)? 	gen_context(system_u:object_r:virt_image_ro_t,s0)
++HOME_DIR/VirtualMachines/isos(/.*)? 	gen_context(system_u:object_r:virt_content_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/virt.if serefpolicy-3.6.3/policy/modules/services/virt.if
 --- nsaserefpolicy/policy/modules/services/virt.if	2009-01-05 15:39:43.000000000 -0500
-+++ serefpolicy-3.6.3/policy/modules/services/virt.if	2009-01-30 09:13:05.000000000 -0500
++++ serefpolicy-3.6.3/policy/modules/services/virt.if	2009-01-30 09:23:23.000000000 -0500
 @@ -293,6 +293,41 @@
  
  ########################################
@@ -22417,17 +22418,17 @@
 +##	</summary>
 +## </param>
 +#
-+interface(`virt_read_ro_t',`
++interface(`virt_read_content',`
 +	gen_require(`
-+		type virt_image_ro_t;
++		type virt_content_t;
 +	')
 +
 +	virt_search_lib($1)
-+	allow $1 virt_image_ro_t:dir list_dir_perms;
-+	read_dirs_pattern($1, virt_image_ro_t, virt_image_ro_t)
-+	read_files_pattern($1, virt_image_ro_t, virt_image_ro_t)
-+	read_lnk_files_pattern($1, virt_image_ro_t, virt_image_ro_t)
-+	rw_blk_files_pattern($1, virt_image_ro_t, virt_image_ro_t)
++	allow $1 virt_content_t:dir list_dir_perms;
++	read_dirs_pattern($1, virt_content_t, virt_content_t)
++	read_files_pattern($1, virt_content_t, virt_content_t)
++	read_lnk_files_pattern($1, virt_content_t, virt_content_t)
++	rw_blk_files_pattern($1, virt_content_t, virt_content_t)
 +
 +	tunable_policy(`virt_use_nfs',`
 +		fs_read_nfs_dirs($1)
@@ -22449,14 +22450,14 @@
  ## </summary>
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/virt.te serefpolicy-3.6.3/policy/modules/services/virt.te
 --- nsaserefpolicy/policy/modules/services/virt.te	2009-01-19 11:06:49.000000000 -0500
-+++ serefpolicy-3.6.3/policy/modules/services/virt.te	2009-01-30 09:10:13.000000000 -0500
++++ serefpolicy-3.6.3/policy/modules/services/virt.te	2009-01-30 09:24:00.000000000 -0500
 @@ -32,6 +32,10 @@
  type virt_image_t, virt_image_type; # customizable
  virt_image(virt_image_t)
  
 +# virt Image files
-+type virt_image_ro_t;
-+virt_image(virt_image_ro_t)
++type virt_content_t;
++virt_image(virt_content_t)
 +
  type virt_log_t;
  logging_log_file(virt_log_t)
@@ -22470,7 +22471,17 @@
  allow virtd_t self:process { getsched sigkill signal execmem };
  allow virtd_t self:fifo_file rw_file_perms;
  allow virtd_t self:unix_stream_socket create_stream_socket_perms;
-@@ -96,7 +100,7 @@
+@@ -69,6 +73,9 @@
+ 
+ manage_files_pattern(virtd_t, virt_image_type, virt_image_type)
+ 
++manage_dirs_pattern(virtd_t, virt_content_t, virt_content_t)
++manage_files_pattern(virtd_t, virt_content_t virt_content_t)
++
+ manage_dirs_pattern(virtd_t, virt_log_t, virt_log_t)
+ manage_files_pattern(virtd_t, virt_log_t, virt_log_t)
+ logging_log_filetrans(virtd_t, virt_log_t, { file dir })
+@@ -96,7 +103,7 @@
  corenet_tcp_sendrecv_generic_node(virtd_t)
  corenet_tcp_sendrecv_all_ports(virtd_t)
  corenet_tcp_bind_generic_node(virtd_t)
@@ -22479,7 +22490,7 @@
  corenet_tcp_bind_vnc_port(virtd_t)
  corenet_tcp_connect_vnc_port(virtd_t)
  corenet_tcp_connect_soundd_port(virtd_t)
-@@ -110,11 +114,13 @@
+@@ -110,11 +117,13 @@
  
  files_read_usr_files(virtd_t)
  files_read_etc_files(virtd_t)
@@ -22493,7 +22504,7 @@
  
  storage_raw_write_removable_device(virtd_t)
  storage_raw_read_removable_device(virtd_t)
-@@ -129,7 +135,10 @@
+@@ -129,7 +138,11 @@
  
  logging_send_syslog_msg(virtd_t)
  
@@ -22501,10 +22512,11 @@
 +
  userdom_read_all_users_state(virtd_t)
 +userdom_dontaudit_list_admin_dir(virtd_t)
++userdom_search_user_home_content(virtd_t)
  
  tunable_policy(`virt_use_nfs',`
  	fs_manage_nfs_dirs(virtd_t)
-@@ -173,16 +182,17 @@
+@@ -173,16 +186,17 @@
  	iptables_domtrans(virtd_t)
  ')
  



From pkgdb at fedoraproject.org  Fri Jan 30 14:24:31 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 14:24:31 +0000
Subject: [pkgdb] anjuta had acl change status
Message-ID: <20090130142431.CA4662084A7@bastion.fedora.phx.redhat.com>

rishi has set the approveacls acl on anjuta (Fedora devel) to Approved for rakesh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/anjuta



From pkgdb at fedoraproject.org  Fri Jan 30 14:24:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 14:24:33 +0000
Subject: [pkgdb] anjuta had acl change status
Message-ID: <20090130142433.434F82084BD@bastion.fedora.phx.redhat.com>

rishi has set the commit acl on anjuta (Fedora devel) to Approved for rakesh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/anjuta



From tuxbrewr at fedoraproject.org  Fri Jan 30 14:32:11 2009
From: tuxbrewr at fedoraproject.org (Steven M. Parrish)
Date: Fri, 30 Jan 2009 14:32:11 +0000 (UTC)
Subject: rpms/liferea/devel liferea-1.4.23-webkit-fix.patch, NONE,
	1.1 liferea.spec, 1.127, 1.128 liferea-1.4.20-configure.patch,
	1.1, NONE
Message-ID: <20090130143211.64AA670117@cvs1.fedora.phx.redhat.com>

Author: tuxbrewr

Update of /cvs/pkgs/rpms/liferea/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1805

Modified Files:
	liferea.spec 
Added Files:
	liferea-1.4.23-webkit-fix.patch 
Removed Files:
	liferea-1.4.20-configure.patch 
Log Message:
Fix for WebKit in F11

liferea-1.4.23-webkit-fix.patch:

--- NEW FILE liferea-1.4.23-webkit-fix.patch ---
diff -ur liferea-1.4.23/src/webkit/webkit.c liferea-1.4.23.webkit/src/webkit/webkit.c
--- liferea-1.4.23/src/webkit/webkit.c	2008-03-18 22:58:00.000000000 +0200
+++ liferea-1.4.23.webkit/src/webkit/webkit.c	2009-01-30 09:34:06.000000000 +0200
@@ -67,7 +67,7 @@
 		g_ascii_strcasecmp (content_type, "application/xhtml+xml") == 0
 		? "application/xhtml"
 		: content_type;
-	webkit_web_view_load_string (WEBKIT_WEB_VIEW (htmlwidget), string, content_type, "UTF-8", base);
+	webkit_web_view_load_html_string (WEBKIT_WEB_VIEW (htmlwidget), string, "file://");
 }
 
 static void


Index: liferea.spec
===================================================================
RCS file: /cvs/pkgs/rpms/liferea/devel/liferea.spec,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -r1.127 -r1.128
--- liferea.spec	11 Jan 2009 18:39:46 -0000	1.127
+++ liferea.spec	30 Jan 2009 14:31:41 -0000	1.128
@@ -2,7 +2,7 @@
 
 Name:           liferea
 Version:        1.4.23
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:        An RSS/RDF feed reader
 
 Group:          Applications/Internet
@@ -10,6 +10,7 @@
 URL:            http://liferea.sourceforge.net/
 Source0:        http://download.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 Patch0:		%{name}-fedorafeed.patch
+Patch1:		liferea-1.4.23-webkit-fix.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  GConf2-devel
@@ -52,6 +53,7 @@
 %prep
 %setup -q -n %{name}-%{version}
 %patch0 -p1 -b .fedorafeed
+%patch1 -b .webkit-fix
 
 %build
 %configure --disable-schemas-install --disable-gtkhtml2 --disable-lua --with-gecko=libxul --enable-webkit
@@ -128,6 +130,9 @@
 %{_libdir}/%{name}/liblihtmlw.so
 
 %changelog
+* Fri Jan 30 2009 Steven M. Parrish <tuxbrewr at fedoraproject.org> 1.4.23-2
+- Patch to fix WebKit issue in F11
+
 * Sun Jan 11 2009 Steven M. Parrish <tuxbrewr at fedoraproject.org> 1.4.23
 - New upstream release
 


--- liferea-1.4.20-configure.patch DELETED ---



From pkgdb at fedoraproject.org  Fri Jan 30 14:32:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 14:32:57 +0000
Subject: [pkgdb] glade3 had acl change status
Message-ID: <20090130143257.9B27F208493@bastion.fedora.phx.redhat.com>

rishi has set the watchcommits acl on glade3 (Fedora devel) to Approved for rakesh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/glade3



From pkgdb at fedoraproject.org  Fri Jan 30 14:32:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 14:32:57 +0000
Subject: [pkgdb] glade3 had acl change status
Message-ID: <20090130143257.A0DFA208495@bastion.fedora.phx.redhat.com>

rishi has set the watchbugzilla acl on glade3 (Fedora devel) to Approved for rakesh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/glade3



From pkgdb at fedoraproject.org  Fri Jan 30 14:32:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 14:32:58 +0000
Subject: [pkgdb] glade3 had acl change status
Message-ID: <20090130143258.BD870208497@bastion.fedora.phx.redhat.com>

rishi has set the commit acl on glade3 (Fedora devel) to Approved for rakesh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/glade3



From pkgdb at fedoraproject.org  Fri Jan 30 14:33:01 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 14:33:01 +0000
Subject: [pkgdb] glade3 had acl change status
Message-ID: <20090130143302.285532084B7@bastion.fedora.phx.redhat.com>

rishi has set the approveacls acl on glade3 (Fedora devel) to Approved for rakesh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/glade3



From jwrdegoede at fedoraproject.org  Fri Jan 30 14:33:40 2009
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Fri, 30 Jan 2009 14:33:40 +0000 (UTC)
Subject: rpms/kernel/devel
	linux-2.6-hwmon-superio-fix-acpi-resource-check-error-handling.patch, 
	NONE, 1.1 kernel.spec, 1.1248,
	1.1249 linux-2.6-hwmon-atk0110.patch, 1.1,
	1.2 linux-2.6-gspca-git.patch, 1.2,
	NONE linux-2.6-gspca-stv06xx-git.patch, 1.1,
	NONE linux-2.6-hwmon-atk0110-fix-numbering.patch, 1.1, NONE
Message-ID: <20090130143340.C84FA70117@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2283

Modified Files:
	kernel.spec linux-2.6-hwmon-atk0110.patch 
Added Files:
	linux-2.6-hwmon-superio-fix-acpi-resource-check-error-handling.patch 
Removed Files:
	linux-2.6-gspca-git.patch linux-2.6-gspca-stv06xx-git.patch 
	linux-2.6-hwmon-atk0110-fix-numbering.patch 
Log Message:
* Fri Jan 30 2009 Hans de Goede <hdegoede at redhat.com>
- Completely drop gspca patches (all upstream now)
- Rebase atk0110 driver to latest from upstream
- Fix some broken error paths in superio hwmon drivers triggered by the
  new acpi_enforce_resources strict default (#483208)


linux-2.6-hwmon-superio-fix-acpi-resource-check-error-handling.patch:

--- NEW FILE linux-2.6-hwmon-superio-fix-acpi-resource-check-error-handling.patch ---
This patch fixes a number of cases where things were not properly cleaned up
when acpi_check_resource_conflict() returned an error, causing oopses such as
the one reported here:
https://bugzilla.redhat.com/show_bug.cgi?id=483208

Signed-off-by: Hans de Goede <hdegoede at redhat.com>
diff -up linux-2.6.28.x86_64/drivers/hwmon/f71882fg.c~ linux-2.6.28.x86_64/drivers/hwmon/f71882fg.c
--- linux-2.6.28.x86_64/drivers/hwmon/f71882fg.c~	2009-01-30 11:18:04.000000000 +0100
+++ linux-2.6.28.x86_64/drivers/hwmon/f71882fg.c	2009-01-30 11:18:04.000000000 +0100
@@ -1932,7 +1932,7 @@ static int __init f71882fg_device_add(un
 	res.name = f71882fg_pdev->name;
 	err = acpi_check_resource_conflict(&res);
 	if (err)
-		return err;
+		goto exit_device_put;
 
 	err = platform_device_add_resources(f71882fg_pdev, &res, 1);
 	if (err) {
diff -up linux-2.6.28.x86_64/drivers/hwmon/vt1211.c~ linux-2.6.28.x86_64/drivers/hwmon/vt1211.c
--- linux-2.6.28.x86_64/drivers/hwmon/vt1211.c~	2009-01-30 11:21:32.000000000 +0100
+++ linux-2.6.28.x86_64/drivers/hwmon/vt1211.c	2009-01-30 11:21:32.000000000 +0100
@@ -1262,7 +1262,7 @@ static int __init vt1211_device_add(unsi
 	res.name = pdev->name;
 	err = acpi_check_resource_conflict(&res);
 	if (err)
-		goto EXIT;
+		goto EXIT_DEV_PUT;
 
 	err = platform_device_add_resources(pdev, &res, 1);
 	if (err) {
diff -up linux-2.6.28.x86_64/drivers/hwmon/w83627ehf.c~ linux-2.6.28.x86_64/drivers/hwmon/w83627ehf.c
--- linux-2.6.28.x86_64/drivers/hwmon/w83627ehf.c~	2009-01-30 11:22:26.000000000 +0100
+++ linux-2.6.28.x86_64/drivers/hwmon/w83627ehf.c	2009-01-30 11:22:26.000000000 +0100
@@ -1548,7 +1548,7 @@ static int __init sensors_w83627ehf_init
 
 	err = acpi_check_resource_conflict(&res);
 	if (err)
-		goto exit;
+		goto exit_device_put;
 
 	err = platform_device_add_resources(pdev, &res, 1);
 	if (err) {


Index: kernel.spec
===================================================================
RCS file: /cvs/extras/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1248
retrieving revision 1.1249
diff -u -r1.1248 -r1.1249
--- kernel.spec	30 Jan 2009 00:08:01 -0000	1.1248
+++ kernel.spec	30 Jan 2009 14:33:10 -0000	1.1249
@@ -623,7 +623,7 @@
 Patch391: linux-2.6-acpi-video-dos.patch
 Patch392: linux-2.6-acpi-strict-resources.patch
 Patch393: linux-2.6-hwmon-atk0110.patch
-Patch394: linux-2.6-hwmon-atk0110-fix-numbering.patch
+Patch394: linux-2.6-hwmon-superio-fix-acpi-resource-check-error-handling.patch
 Patch400: linux-2.6-scsi-cpqarray-set-master.patch
 Patch450: linux-2.6-input-kill-stupid-messages.patch
 Patch460: linux-2.6-serial-460800.patch
@@ -640,10 +640,6 @@
 
 Patch690: linux-2.6-at76.patch
 
-# webcam fixes
-Patch900: linux-2.6-gspca-git.patch
-Patch901: linux-2.6-gspca-stv06xx-git.patch
-
 Patch1515: linux-2.6.29-lirc.patch
 Patch1520: linux-2.6-hdpvr.patch
 
@@ -1093,7 +1089,7 @@
 ApplyPatch linux-2.6-acpi-video-dos.patch
 ApplyPatch linux-2.6-acpi-strict-resources.patch
 ApplyPatch linux-2.6-hwmon-atk0110.patch
-ApplyPatch linux-2.6-hwmon-atk0110-fix-numbering.patch
+ApplyPatch linux-2.6-hwmon-superio-fix-acpi-resource-check-error-handling.patch
 
 # Various low-impact patches to aid debugging.
 ApplyPatch linux-2.6-debug-sizeof-structs.patch
@@ -1157,10 +1153,6 @@
 # Add misc wireless bits from upstream wireless tree
 ApplyPatch linux-2.6-at76.patch
 
-# Webcam patches
-#ApplyPatch linux-2.6-gspca-git.patch
-#ApplyPatch linux-2.6-gspca-stv06xx-git.patch
-
 # http://www.lirc.org/
 ApplyPatch linux-2.6.29-lirc.patch
 # http://hg.jannau.net/hdpvr/
@@ -1783,6 +1775,12 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Fri Jan 30 2009 Hans de Goede <hdegoede at redhat.com>
+- Completely drop gspca patches (all upstream now)
+- Rebase atk0110 driver to latest from upstream
+- Fix some broken error paths in superio hwmon drivers triggered by the
+  new acpi_enforce_resources strict default (#483208)
+
 * Thu Jan 29 2009 Chuck Ebbert <cebbert at redhat.com>
 - Clean up EEPROM config.
 - Disable CONFIG_DEBUG_NOTIFIERS release kernel.

linux-2.6-hwmon-atk0110.patch:

Index: linux-2.6-hwmon-atk0110.patch
===================================================================
RCS file: /cvs/extras/rpms/kernel/devel/linux-2.6-hwmon-atk0110.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-hwmon-atk0110.patch	23 Jan 2009 22:40:25 -0000	1.1
+++ linux-2.6-hwmon-atk0110.patch	30 Jan 2009 14:33:10 -0000	1.2
@@ -1,34 +1,31 @@
---- linux-2.6.git.orig/drivers/acpi/acpica/nsutils.c	2008-12-26 18:59:30.000000000 +0100
-+++ linux-2.6.git/drivers/acpi/acpica/nsutils.c	2008-12-26 18:59:38.000000000 +0100
-@@ -700,6 +700,7 @@
- 
- 	return (ACPI_CAST_PTR(struct acpi_namespace_node, handle));
- }
-+EXPORT_SYMBOL(acpi_ns_map_handle_to_node);
- 
- /*******************************************************************************
-  *
-@@ -736,6 +737,7 @@
- 	return ((acpi_handle) Node);
- ------------------------------------------------------*/
- }
-+EXPORT_SYMBOL(acpi_ns_convert_entry_to_handle);
- 
- /*******************************************************************************
-  *
-@@ -875,6 +877,7 @@
- 	ACPI_FREE(internal_path);
- 	return_ACPI_STATUS(status);
- }
-+EXPORT_SYMBOL(acpi_ns_get_node);
- 
- /*******************************************************************************
-  *
-Index: linux-2.6.git/drivers/acpi/namespace/nsxfeval.c
+Asus boards have an ACPI interface for interacting with the hwmon (fan,
+temperatures, voltages) subsystem; this driver exposes the relevant
+information via the standard sysfs interface.
+
+There are two different ACPI interfaces:
+- an old one (based on RVLT/RFAN/RTMP)
+- a new one (GGRP/GITM)
+Both may be present but there a few cases (my board, sigh) where the
+new interface is just an empty stub; the driver defaults to the old one
+when both are present.
+The old interface has received a considerable testing, but I'm still
+awaiting confirmation from my tester that the new one is working as
+expected (hence the debug code is still enabled).
+
+Currently all the attributes are read-only, though a (partial) control
+should be possible with a bit more work.
+
+Signed-off-by: Luca Tettamanti <kronos.it at gmail.com>
+---
+ drivers/acpi/acpica/nsxfeval.c |    3  drivers/hwmon/Kconfig          |   12  drivers/hwmon/Makefile         |    1  drivers/hwmon/asus_atk0110.c   | 1015 +++++++++++++++++++++++++++++++++++++++++
+ include/acpi/acpixf.h          |    2  5 files changed, 1029 insertions(+), 4 deletions(-)
+
+Index: b/include/acpi/acpixf.h
 ===================================================================
---- linux-2.6.git.orig/drivers/acpi/acpica/nsxfeval.c	2008-12-26 18:59:30.000000000 +0100
-+++ linux-2.6.git/drivers/acpi/acpica/nsxfeval.c	2008-12-26 18:59:38.000000000 +0100
-@@ -52,7 +52,6 @@
+diff -up vanilla-2.6.29-rc2-git1/drivers/acpi/acpica/nsxfeval.c.atk0110 vanilla-2.6.29-rc2-git1/drivers/acpi/acpica/nsxfeval.c
+--- vanilla-2.6.29-rc2-git1/drivers/acpi/acpica/nsxfeval.c.atk0110	2009-01-30 11:42:39.000000000 +0100
++++ vanilla-2.6.29-rc2-git1/drivers/acpi/acpica/nsxfeval.c	2009-01-30 11:42:54.000000000 +0100
+@@ -53,7 +53,6 @@ ACPI_MODULE_NAME("nsxfeval")
  /* Local prototypes */
  static void acpi_ns_resolve_references(struct acpi_evaluate_info *info);
  
@@ -36,7 +33,7 @@
  /*******************************************************************************
   *
   * FUNCTION:    acpi_evaluate_object_typed
-@@ -146,7 +145,7 @@
+@@ -147,7 +146,7 @@ acpi_evaluate_object_typed(acpi_handle h
  }
  
  ACPI_EXPORT_SYMBOL(acpi_evaluate_object_typed)
@@ -45,32 +42,45 @@
  /*******************************************************************************
   *
   * FUNCTION:    acpi_evaluate_object
-Index: linux-2.6.git/include/acpi/acpixf.h
-===================================================================
---- linux-2.6.git.orig/include/acpi/acpixf.h	2008-12-26 18:59:30.000000000 +0100
-+++ linux-2.6.git/include/acpi/acpixf.h	2008-12-26 18:59:38.000000000 +0100
-@@ -169,14 +169,12 @@
- 		     struct acpi_object_list *parameter_objects,
- 		     struct acpi_buffer *return_object_buffer);
+diff -up vanilla-2.6.29-rc2-git1/drivers/hwmon/Kconfig.atk0110 vanilla-2.6.29-rc2-git1/drivers/hwmon/Kconfig
+--- vanilla-2.6.29-rc2-git1/drivers/hwmon/Kconfig.atk0110	2009-01-30 11:42:39.000000000 +0100
++++ vanilla-2.6.29-rc2-git1/drivers/hwmon/Kconfig	2009-01-30 11:42:54.000000000 +0100
+@@ -248,6 +248,18 @@ config SENSORS_ASB100
+ 	  This driver can also be built as a module.  If so, the module
+ 	  will be called asb100.
  
--#ifdef ACPI_FUTURE_USAGE
- acpi_status
- acpi_evaluate_object_typed(acpi_handle object,
- 			   acpi_string pathname,
- 			   struct acpi_object_list *external_params,
- 			   struct acpi_buffer *return_buffer,
- 			   acpi_object_type return_type);
--#endif
++config SENSORS_ATK0110
++	tristate "ASUS ATK0110 ACPI hwmon"
++	depends on X86 && ACPI && EXPERIMENTAL
++	help
++	  If you say yes here you get support for the ACPI hardware
++	  monitoring interface found in many ASUS motherboards. This
++	  driver will provide readings of fans, voltages and temperatures
++	  through the system firmware.
++
++	  This driver can also be built as a module. If so, the module
++	  will be called asus_atk0110.
++
+ config SENSORS_ATXP1
+ 	tristate "Attansic ATXP1 VID controller"
+ 	depends on I2C && EXPERIMENTAL
+diff -up vanilla-2.6.29-rc2-git1/drivers/hwmon/Makefile.atk0110 vanilla-2.6.29-rc2-git1/drivers/hwmon/Makefile
+--- vanilla-2.6.29-rc2-git1/drivers/hwmon/Makefile.atk0110	2009-01-30 11:42:39.000000000 +0100
++++ vanilla-2.6.29-rc2-git1/drivers/hwmon/Makefile	2009-01-30 11:42:54.000000000 +0100
+@@ -32,6 +32,7 @@ obj-$(CONFIG_SENSORS_ADT7475)	+= adt7475
  
- acpi_status
- acpi_get_object_info(acpi_handle handle, struct acpi_buffer *return_buffer);
-Index: linux-2.6.git/drivers/hwmon/asus_atk0110.c
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.git/drivers/hwmon/asus_atk0110.c	2009-01-05 20:58:46.176128447 +0100
-@@ -0,0 +1,1019 @@
+ obj-$(CONFIG_SENSORS_APPLESMC)	+= applesmc.o
+ obj-$(CONFIG_SENSORS_AMS)	+= ams/
++obj-$(CONFIG_SENSORS_ATK0110)	+= asus_atk0110.o
+ obj-$(CONFIG_SENSORS_ATXP1)	+= atxp1.o
+ obj-$(CONFIG_SENSORS_CORETEMP)	+= coretemp.o
+ obj-$(CONFIG_SENSORS_DME1737)	+= dme1737.o
+diff -up /dev/null vanilla-2.6.29-rc2-git1/drivers/hwmon/asus_atk0110.c
+--- /dev/null	2009-01-30 08:26:34.337006080 +0100
++++ vanilla-2.6.29-rc2-git1/drivers/hwmon/asus_atk0110.c	2009-01-30 11:42:54.000000000 +0100
+@@ -0,0 +1,1015 @@
 +/*
-+ * Copyright (C) 2007-2009 Luca Tettamanti <kronos.it at gmail.com <http://lists.lm-sensors.org/mailman/listinfo/lm-sensors>>
++ * Copyright (C) 2007-2009 Luca Tettamanti <kronos.it at gmail.com>
 + *
 + * This file is released under the GPLv2
 + * See COPYING in the top level directory of the kernel tree.
@@ -84,16 +94,17 @@
 +#include <linux/module.h>
 +
 +#include <acpi/acpi.h>
++#include <acpi/acpixf.h>
 +#include <acpi/acpi_drivers.h>
 +#include <acpi/acpi_bus.h>
-+#include "../acpi/acpica/accommon.h"
-+#include "../acpi/acpica/acnamesp.h"
 +
 +
 +#define ATK_HID "ATK0110"
 +#define ATK_DRV "atk-hwmon"
-+#define ASOC "_SB.PCI0.SBRG.ASOC"
 +
++/* Minimum time between readings, enforced in order to avoid
++ * hogging the CPU.
++ */
 +#define CACHE_TIME		HZ
 +
 +#define BOARD_ID		"MBIF"
@@ -119,7 +130,7 @@
 +#define HWMON_TYPE_TEMP		0x00030000ULL
 +#define HWMON_TYPE_FAN		0x00040000ULL
 +
-+#define HWMON_SENSORS_ID_MASK	0x0000ffffULL
++#define HWMON_SENSOR_ID_MASK	0x0000ffffULL
 +
 +enum atk_pack_member {
 +	HWMON_PACK_FLAGS,
@@ -235,7 +246,6 @@
 +#define limit2_to_atk_sensor(attr) \
 +	container_of(attr, struct atk_sensor_data, limit2_attr)
 +
-+
 +static ssize_t atk_input_show(struct device *dev,
 +		struct device_attribute *attr, char *buf)
 +{
@@ -569,7 +579,7 @@
 +	int err;
 +
 +	if (!sensor->is_valid ||
-+	    time_after(jiffies, sensor->last_updated + CACHE_TIME)) {
++		time_after(jiffies, sensor->last_updated + CACHE_TIME)) {
 +		if (sensor->data->old_interface)
 +			err = atk_read_value_old(sensor, value);
 +		else
@@ -601,6 +611,7 @@
 +	u64 type;
 +	int err;
 +	int *num;
++	int start;
 +
 +	if (obj->type != ACPI_TYPE_PACKAGE) {
 +		/* wft is this? */
@@ -622,18 +633,21 @@
 +		limit1_name = "min";
 +		limit2_name = "max";
 +		num = &data->voltage_count;
++		start = 0;
 +		break;
 +	case HWMON_TYPE_TEMP:
 +		base_name = "temp";
 +		limit1_name = "max";
 +		limit2_name = "crit";
 +		num = &data->temperature_count;
++		start = 1;
 +		break;
 +	case HWMON_TYPE_FAN:
 +		base_name = "fan";
 +		limit1_name = "min";
 +		limit2_name = "max";
 +		num = &data->fan_count;
++		start = 1;
 +		break;
 +	default:
 +		dev_warn(dev, "Unknown sensor type: %#llx\n", type);
@@ -668,25 +682,25 @@
 +	sensor->limit2 = limit2->integer.value;
 +
 +	snprintf(sensor->input_attr_name, ATTR_NAME_SIZE,
-+			"%s%d_input", base_name, *num);
++			"%s%d_input", base_name, start + *num);
 +	atk_init_attribute(&sensor->input_attr,
 +			sensor->input_attr_name,
 +			atk_input_show);
 +
 +	snprintf(sensor->label_attr_name, ATTR_NAME_SIZE,
-+			"%s%d_label", base_name, *num);
++			"%s%d_label", base_name, start + *num);
 +	atk_init_attribute(&sensor->label_attr,
 +			sensor->label_attr_name,
 +			atk_label_show);
 +
 +	snprintf(sensor->limit1_attr_name, ATTR_NAME_SIZE,
-+			"%s%d_%s", base_name, *num, limit1_name);
++			"%s%d_%s", base_name, start + *num, limit1_name);
 +	atk_init_attribute(&sensor->limit1_attr,
 +			sensor->limit1_attr_name,
 +			atk_limit1_show);
 +
 +	snprintf(sensor->limit2_attr_name, ATTR_NAME_SIZE,
-+			"%s%d_%s", base_name, *num, limit2_name);
++			"%s%d_%s", base_name, start + *num, limit2_name);
 +	atk_init_attribute(&sensor->limit2_attr,
 +			sensor->limit2_attr_name,
 +			atk_limit2_show);
@@ -903,65 +917,65 @@
 +	return err;
 +}
 +
-+static int atk_check_old_if(struct atk_data *data, struct acpi_namespace_node *ns)
++static int atk_check_old_if(struct atk_data *data)
 +{
 +	struct device *dev = &data->acpi_dev->dev;
-+	struct acpi_namespace_node *ret;
++	acpi_handle ret;
 +	acpi_status status;
 +
 +	/* RTMP: read temperature */
-+	status = acpi_ns_get_node(ns, METHOD_OLD_READ_TMP, ACPI_NS_NO_UPSEARCH, &ret);
++	status = acpi_get_handle(data->atk_handle, METHOD_OLD_READ_TMP, &ret);
 +	if (status != AE_OK) {
 +		dev_dbg(dev, "method " METHOD_OLD_READ_TMP " not found: %s\n",
 +				acpi_format_exception(status));
 +		return -ENODEV;
 +	}
-+	data->rtmp_handle = acpi_ns_convert_entry_to_handle(ret);
++	data->rtmp_handle = ret;
 +
 +	/* RVLT: read voltage */
-+	status = acpi_ns_get_node(ns, METHOD_OLD_READ_VLT, ACPI_NS_NO_UPSEARCH, &ret);
++	status = acpi_get_handle(data->atk_handle, METHOD_OLD_READ_VLT, &ret);
 +	if (status != AE_OK) {
 +		dev_dbg(dev, "method " METHOD_OLD_READ_VLT " not found: %s\n",
 +				acpi_format_exception(status));
 +		return -ENODEV;
 +	}
-+	data->rvlt_handle = acpi_ns_convert_entry_to_handle(ret);
++	data->rvlt_handle = ret;
 +
 +	/* RFAN: read fan status */
-+	status = acpi_ns_get_node(ns, METHOD_OLD_READ_FAN, ACPI_NS_NO_UPSEARCH, &ret);
++	status = acpi_get_handle(data->atk_handle, METHOD_OLD_READ_FAN, &ret);
 +	if (status != AE_OK) {
 +		dev_dbg(dev, "method " METHOD_OLD_READ_FAN " not found: %s\n",
 +				acpi_format_exception(status));
 +		return -ENODEV;
 +	}
-+	data->rfan_handle = acpi_ns_convert_entry_to_handle(ret);
++	data->rfan_handle = ret;
 +
 +	return 0;
 +}
 +
-+static int atk_check_new_if(struct atk_data *data, struct acpi_namespace_node *ns)
++static int atk_check_new_if(struct atk_data *data)
 +{
 +	struct device *dev = &data->acpi_dev->dev;
-+	struct acpi_namespace_node *ret;
++	acpi_handle ret;
 +	acpi_status status;
 +
 +	/* Enumeration */
-+	status = acpi_ns_get_node(ns, METHOD_ENUMERATE, ACPI_NS_NO_UPSEARCH, &ret);
++	status = acpi_get_handle(data->atk_handle, METHOD_ENUMERATE, &ret);
 +	if (status != AE_OK) {
 +		dev_dbg(dev, "method " METHOD_ENUMERATE " not found: %s\n",
 +				acpi_format_exception(status));
 +		return -ENODEV;
 +	}
-+	data->enumerate_handle = acpi_ns_convert_entry_to_handle(ret);
++	data->enumerate_handle = ret;
 +
 +	/* De-multiplexer (read) */
-+	status = acpi_ns_get_node(ns, METHOD_READ, ACPI_NS_NO_UPSEARCH, &ret);
++	status = acpi_get_handle(data->atk_handle, METHOD_READ, &ret);
 +	if (status != AE_OK) {
 +		dev_dbg(dev, "method " METHOD_READ " not found: %s\n",
 +				acpi_format_exception(status));
 +		return -ENODEV;
 +	}
-+	data->read_handle = acpi_ns_convert_entry_to_handle(ret);
++	data->read_handle = ret;
 +
 +	return 0;
 +}
@@ -972,7 +986,6 @@
 +	int err;
 +	struct acpi_buffer buf;
 +	union acpi_object *obj;
-+	struct acpi_namespace_node *search_ns;
 +	struct atk_data *data;
 +
 +	dev_dbg(&device->dev, "adding...\n");
@@ -1002,24 +1015,17 @@
 +	}
 +	ACPI_FREE(buf.pointer);
 +
-+	/* Check for hwmon methods */
-+	search_ns = acpi_ns_map_handle_to_node(device->handle);
-+	if (!search_ns) {
-+		err = -ENODEV;
-+		goto out;
-+	}
-+
-+	/* First check "old" style methods; note that both may be present: in
-+	 * this case we stick to the old interface; analysis of multiple DSDTs
-+	 * indicates that when both interfaces are present the new one
-+	 * (GGRP/GITM) is not functional.
++	/* Check for hwmon methods: first check "old" style methods; note that
++	 * both may be present: in this case we stick to the old interface;
++	 * analysis of multiple DSDTs indicates that when both interfaces
++	 * are present the new one (GGRP/GITM) is not functional.
 +	 */
-+	err = atk_check_old_if(data, search_ns);
++	err = atk_check_old_if(data);
 +	if (!err) {
 +		dev_dbg(&device->dev, "Using old hwmon interface\n");
 +		data->old_interface = true;
 +	} else {
-+		err = atk_check_new_if(data, search_ns);
++		err = atk_check_new_if(data);
 +		if (err)
 +			goto out;
 +
@@ -1088,38 +1094,21 @@
 +module_exit(atk0110_exit);
 +
 +MODULE_LICENSE("GPL");
-Index: linux-2.6.git/drivers/hwmon/Kconfig
-===================================================================
---- linux-2.6.git.orig/drivers/hwmon/Kconfig	2008-12-26 18:59:30.000000000 +0100
-+++ linux-2.6.git/drivers/hwmon/Kconfig	2008-12-26 18:59:38.000000000 +0100
-@@ -238,6 +238,18 @@
- 	  This driver can also be built as a module.  If so, the module
- 	  will be called asb100.
+diff -up vanilla-2.6.29-rc2-git1/include/acpi/acpixf.h.atk0110 vanilla-2.6.29-rc2-git1/include/acpi/acpixf.h
+--- vanilla-2.6.29-rc2-git1/include/acpi/acpixf.h.atk0110	2009-01-30 11:42:39.000000000 +0100
++++ vanilla-2.6.29-rc2-git1/include/acpi/acpixf.h	2009-01-30 11:42:54.000000000 +0100
+@@ -187,14 +187,12 @@ acpi_evaluate_object(acpi_handle object,
+ 		     struct acpi_object_list *parameter_objects,
+ 		     struct acpi_buffer *return_object_buffer);
  
-+config SENSORS_ATK0110
-+	tristate "ASUS ATK0110 ACPI hwmon"
-+	depends on X86 && ACPI && EXPERIMENTAL
-+	help
-+	  If you say yes here you get support for the ACPI hardware
-+	  monitoring interface found in many ASUS motherboards. This
-+	  driver will provide readings of fans, voltages and temperatures
-+	  through the system firmware.
-+
-+	  This driver can also be built as a module. If so, the module
-+	  will be called asus_atk0110.
-+
- config SENSORS_ATXP1
- 	tristate "Attansic ATXP1 VID controller"
- 	depends on I2C && EXPERIMENTAL
-Index: linux-2.6.git/drivers/hwmon/Makefile
-===================================================================
---- linux-2.6.git.orig/drivers/hwmon/Makefile	2008-12-26 18:59:30.000000000 +0100
-+++ linux-2.6.git/drivers/hwmon/Makefile	2008-12-26 18:59:38.000000000 +0100
-@@ -30,6 +30,7 @@
- obj-$(CONFIG_SENSORS_ADT7473)	+= adt7473.o
- obj-$(CONFIG_SENSORS_APPLESMC)	+= applesmc.o
- obj-$(CONFIG_SENSORS_AMS)	+= ams/
-+obj-$(CONFIG_SENSORS_ATK0110)	+= asus_atk0110.o
- obj-$(CONFIG_SENSORS_ATXP1)	+= atxp1.o
- obj-$(CONFIG_SENSORS_CORETEMP)	+= coretemp.o
- obj-$(CONFIG_SENSORS_DME1737)	+= dme1737.o
+-#ifdef ACPI_FUTURE_USAGE
+ acpi_status
+ acpi_evaluate_object_typed(acpi_handle object,
+ 			   acpi_string pathname,
+ 			   struct acpi_object_list *external_params,
+ 			   struct acpi_buffer *return_buffer,
+ 			   acpi_object_type return_type);
+-#endif
+ 
+ acpi_status
+ acpi_get_object_info(acpi_handle handle, struct acpi_buffer *return_buffer);


--- linux-2.6-gspca-git.patch DELETED ---


--- linux-2.6-gspca-stv06xx-git.patch DELETED ---


--- linux-2.6-hwmon-atk0110-fix-numbering.patch DELETED ---



From dwalsh at fedoraproject.org  Fri Jan 30 14:43:35 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Fri, 30 Jan 2009 14:43:35 +0000 (UTC)
Subject: rpms/selinux-policy/devel policy-20090105.patch,1.25,1.26
Message-ID: <20090130144335.7D4F670117@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5191

Modified Files:
	policy-20090105.patch 
Log Message:
* Fri Jan 30 2009 Dan Walsh <dwalsh at redhat.com> 3.6.3-11
- Add virt_content_ro_t and labeling for isos directory


policy-20090105.patch:

Index: policy-20090105.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-20090105.patch,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- policy-20090105.patch	30 Jan 2009 14:24:45 -0000	1.25
+++ policy-20090105.patch	30 Jan 2009 14:43:04 -0000	1.26
@@ -22405,7 +22405,7 @@
 +HOME_DIR/VirtualMachines/isos(/.*)? 	gen_context(system_u:object_r:virt_content_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/virt.if serefpolicy-3.6.3/policy/modules/services/virt.if
 --- nsaserefpolicy/policy/modules/services/virt.if	2009-01-05 15:39:43.000000000 -0500
-+++ serefpolicy-3.6.3/policy/modules/services/virt.if	2009-01-30 09:23:23.000000000 -0500
++++ serefpolicy-3.6.3/policy/modules/services/virt.if	2009-01-30 09:30:42.000000000 -0500
 @@ -293,6 +293,41 @@
  
  ########################################
@@ -22425,19 +22425,19 @@
 +
 +	virt_search_lib($1)
 +	allow $1 virt_content_t:dir list_dir_perms;
-+	read_dirs_pattern($1, virt_content_t, virt_content_t)
++	list_dirs_pattern($1, virt_content_t, virt_content_t)
 +	read_files_pattern($1, virt_content_t, virt_content_t)
 +	read_lnk_files_pattern($1, virt_content_t, virt_content_t)
 +	rw_blk_files_pattern($1, virt_content_t, virt_content_t)
 +
 +	tunable_policy(`virt_use_nfs',`
-+		fs_read_nfs_dirs($1)
++		fs_list_nfs($1)
 +		fs_read_nfs_files($1)
 +		fs_read_nfs_symlinks($1)
 +	')
 +
 +	tunable_policy(`virt_use_samba',`
-+		fs_read_nfs_files($1)
++		fs_list_cifs($1)
 +		fs_read_cifs_files($1)
 +		fs_read_cifs_symlinks($1)
 +	')



From karsten at fedoraproject.org  Fri Jan 30 14:44:07 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Fri, 30 Jan 2009 14:44:07 +0000 (UTC)
Subject: rpms/freetds/devel freetds.spec,1.21,1.22
Message-ID: <20090130144407.12A6F70117@cvs1.fedora.phx.redhat.com>

Author: karsten

Update of /cvs/extras/rpms/freetds/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5383

Modified Files:
	freetds.spec 
Log Message:
- add s390x to 64 bit archs


Index: freetds.spec
===================================================================
RCS file: /cvs/extras/rpms/freetds/devel/freetds.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- freetds.spec	13 Jan 2009 13:00:38 -0000	1.21
+++ freetds.spec	30 Jan 2009 14:43:36 -0000	1.22
@@ -1,4 +1,4 @@
-%ifarch alpha ia64 x86_64 ppc64 sparc64
+%ifarch alpha ia64 x86_64 ppc64 sparc64 s390x
 %define bits	64
 %else
 %define bits	32
@@ -128,6 +128,9 @@
  
 
 %changelog
+* Fri Jan 30 2009 Karsten Hopp <karsten at redhat.com> 0.82-3
+- add s390x to 64 bit archs
+
 * Sun Jan 11 2009 Dmitry Butskoy <Dmitry at Butskoy.name> - 0.82-3
 - Use gnutls for SSL (#479148)
 



From pkgdb at fedoraproject.org  Fri Jan 30 14:47:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 14:47:04 +0000
Subject: [pkgdb] sugar-terminal had acl change status
Message-ID: <20090130144704.120BD208493@bastion.fedora.phx.redhat.com>

katzj has set the watchcommits acl on sugar-terminal (Fedora devel) to Approved for erikos

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-terminal



From pkgdb at fedoraproject.org  Fri Jan 30 14:47:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 14:47:07 +0000
Subject: [pkgdb] sugar-terminal had acl change status
Message-ID: <20090130144708.17CBA208494@bastion.fedora.phx.redhat.com>

katzj has set the approveacls acl on sugar-terminal (Fedora devel) to Approved for erikos

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-terminal



From pkgdb at fedoraproject.org  Fri Jan 30 14:47:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 14:47:09 +0000
Subject: [pkgdb] sugar-terminal had acl change status
Message-ID: <20090130144709.C3E2C2084A7@bastion.fedora.phx.redhat.com>

katzj has set the commit acl on sugar-terminal (Fedora devel) to Approved for erikos

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-terminal



From pkgdb at fedoraproject.org  Fri Jan 30 14:47:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 14:47:09 +0000
Subject: [pkgdb] sugar-terminal had acl change status
Message-ID: <20090130144709.D49232084BD@bastion.fedora.phx.redhat.com>

katzj has set the approveacls acl on sugar-terminal (Fedora devel) to Approved for fab

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-terminal



From pkgdb at fedoraproject.org  Fri Jan 30 14:47:12 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 14:47:12 +0000
Subject: [pkgdb] sugar-terminal had acl change status
Message-ID: <20090130144712.B276820860D@bastion.fedora.phx.redhat.com>

katzj has set the commit acl on sugar-terminal (Fedora devel) to Approved for fab

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-terminal



From pkgdb at fedoraproject.org  Fri Jan 30 14:47:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 14:47:14 +0000
Subject: [pkgdb] sugar-terminal had acl change status
Message-ID: <20090130144714.427C720866E@bastion.fedora.phx.redhat.com>

katzj has set the watchcommits acl on sugar-terminal (Fedora devel) to Approved for fab

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-terminal



From pkgdb at fedoraproject.org  Fri Jan 30 14:47:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 14:47:17 +0000
Subject: [pkgdb] sugar-terminal had acl change status
Message-ID: <20090130144717.B12D22086F7@bastion.fedora.phx.redhat.com>

katzj has set the watchbugzilla acl on sugar-terminal (Fedora devel) to Approved for fab

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-terminal



From pkgdb at fedoraproject.org  Fri Jan 30 14:47:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 14:47:20 +0000
Subject: [pkgdb] sugar-terminal had acl change status
Message-ID: <20090130144720.D6122208485@bastion.fedora.phx.redhat.com>

katzj has set the watchcommits acl on sugar-terminal (Fedora 10) to Approved for erikos

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-terminal



From pkgdb at fedoraproject.org  Fri Jan 30 14:47:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 14:47:23 +0000
Subject: [pkgdb] sugar-terminal had acl change status
Message-ID: <20090130144723.9C7F7208700@bastion.fedora.phx.redhat.com>

katzj has set the commit acl on sugar-terminal (Fedora 10) to Approved for erikos

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-terminal



From pkgdb at fedoraproject.org  Fri Jan 30 14:47:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 14:47:25 +0000
Subject: [pkgdb] sugar-terminal had acl change status
Message-ID: <20090130144725.934E720873D@bastion.fedora.phx.redhat.com>

katzj has set the approveacls acl on sugar-terminal (Fedora 10) to Approved for erikos

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-terminal



From pkgdb at fedoraproject.org  Fri Jan 30 14:47:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 14:47:26 +0000
Subject: [pkgdb] sugar-terminal had acl change status
Message-ID: <20090130144727.1BC09208745@bastion.fedora.phx.redhat.com>

katzj has set the approveacls acl on sugar-terminal (Fedora 10) to Approved for fab

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-terminal



From pkgdb at fedoraproject.org  Fri Jan 30 14:47:28 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 14:47:28 +0000
Subject: [pkgdb] sugar-terminal had acl change status
Message-ID: <20090130144732.EB9C4208494@bastion.fedora.phx.redhat.com>

katzj has set the commit acl on sugar-terminal (Fedora 10) to Approved for fab

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-terminal



From pkgdb at fedoraproject.org  Fri Jan 30 14:47:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 14:47:35 +0000
Subject: [pkgdb] sugar-terminal had acl change status
Message-ID: <20090130144735.B65F12084A7@bastion.fedora.phx.redhat.com>

katzj has set the watchcommits acl on sugar-terminal (Fedora 10) to Approved for fab

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-terminal



From pkgdb at fedoraproject.org  Fri Jan 30 14:47:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 14:47:36 +0000
Subject: [pkgdb] sugar-terminal had acl change status
Message-ID: <20090130144737.EF21520876D@bastion.fedora.phx.redhat.com>

katzj has set the watchbugzilla acl on sugar-terminal (Fedora 10) to Approved for fab

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-terminal



From pkgdb at fedoraproject.org  Fri Jan 30 14:47:38 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 14:47:38 +0000
Subject: [pkgdb] sugar-write had acl change status
Message-ID: <20090130144738.A44BE20896A@bastion.fedora.phx.redhat.com>

katzj has set the watchcommits acl on sugar-write (Fedora devel) to Approved for erikos

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-write



From pkgdb at fedoraproject.org  Fri Jan 30 14:47:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 14:47:39 +0000
Subject: [pkgdb] sugar-write had acl change status
Message-ID: <20090130144739.AEF64208974@bastion.fedora.phx.redhat.com>

katzj has set the commit acl on sugar-write (Fedora devel) to Approved for erikos

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-write



From pkgdb at fedoraproject.org  Fri Jan 30 14:47:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 14:47:41 +0000
Subject: [pkgdb] sugar-write had acl change status
Message-ID: <20090130144742.3FC22208977@bastion.fedora.phx.redhat.com>

katzj has set the approveacls acl on sugar-write (Fedora devel) to Approved for erikos

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-write



From pkgdb at fedoraproject.org  Fri Jan 30 14:47:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 14:47:51 +0000
Subject: [pkgdb] sugar-write had acl change status
Message-ID: <20090130144751.EEC5620897B@bastion.fedora.phx.redhat.com>

katzj has set the watchbugzilla acl on sugar-write (Fedora devel) to Approved for fab

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-write



From pkgdb at fedoraproject.org  Fri Jan 30 14:47:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 14:47:55 +0000
Subject: [pkgdb] sugar-write had acl change status
Message-ID: <20090130144756.08046208610@bastion.fedora.phx.redhat.com>

katzj has set the watchcommits acl on sugar-write (Fedora devel) to Approved for fab

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-write



From pkgdb at fedoraproject.org  Fri Jan 30 14:47:57 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 14:47:57 +0000
Subject: [pkgdb] sugar-write had acl change status
Message-ID: <20090130144758.007972089F1@bastion.fedora.phx.redhat.com>

katzj has set the watchbugzilla acl on sugar-write (Fedora 10) to Approved for fab

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-write



From pkgdb at fedoraproject.org  Fri Jan 30 14:47:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 14:47:59 +0000
Subject: [pkgdb] sugar-write had acl change status
Message-ID: <20090130144759.CC13E208D0C@bastion.fedora.phx.redhat.com>

katzj has set the watchcommits acl on sugar-write (Fedora 10) to Approved for fab

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-write



From pkgdb at fedoraproject.org  Fri Jan 30 14:48:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 14:48:00 +0000
Subject: [pkgdb] sugar-write had acl change status
Message-ID: <20090130144800.9B9F0208D5E@bastion.fedora.phx.redhat.com>

katzj has set the watchcommits acl on sugar-write (Fedora 10) to Approved for erikos

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-write



From pkgdb at fedoraproject.org  Fri Jan 30 14:48:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 14:48:04 +0000
Subject: [pkgdb] sugar-write had acl change status
Message-ID: <20090130144804.C1B6B20866E@bastion.fedora.phx.redhat.com>

katzj has set the commit acl on sugar-write (Fedora 10) to Approved for erikos

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-write



From pkgdb at fedoraproject.org  Fri Jan 30 14:48:05 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 14:48:05 +0000
Subject: [pkgdb] sugar-write had acl change status
Message-ID: <20090130144806.31A45208679@bastion.fedora.phx.redhat.com>

katzj has set the approveacls acl on sugar-write (Fedora 10) to Approved for erikos

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-write



From pkgdb at fedoraproject.org  Fri Jan 30 14:48:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 14:48:07 +0000
Subject: [pkgdb] sugar-write had acl change status
Message-ID: <20090130144807.E1A64208DDD@bastion.fedora.phx.redhat.com>

katzj has set the commit acl on sugar-write (Fedora 10) to Approved for fab

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-write



From pkgdb at fedoraproject.org  Fri Jan 30 14:48:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 14:48:07 +0000
Subject: [pkgdb] sugar-write had acl change status
Message-ID: <20090130144808.5E720208DE0@bastion.fedora.phx.redhat.com>

katzj has set the approveacls acl on sugar-write (Fedora 10) to Approved for fab

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-write



From pkgdb at fedoraproject.org  Fri Jan 30 14:48:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 14:48:23 +0000
Subject: [pkgdb] sugar-write had acl change status
Message-ID: <20090130144823.C471C208DE1@bastion.fedora.phx.redhat.com>

katzj has set the commit acl on sugar-write (Fedora 10) to Approved for mpg

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-write



From pkgdb at fedoraproject.org  Fri Jan 30 14:48:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 14:48:27 +0000
Subject: [pkgdb] sugar-write had acl change status
Message-ID: <20090130144827.C8262208701@bastion.fedora.phx.redhat.com>

katzj has set the commit acl on sugar-write (Fedora 9) to Approved for mpg

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-write



From pkgdb at fedoraproject.org  Fri Jan 30 14:48:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 14:48:36 +0000
Subject: [pkgdb] sugar-write had acl change status
Message-ID: <20090130144836.8FD4D208DED@bastion.fedora.phx.redhat.com>

katzj has set the approveacls acl on sugar-write (Fedora 9) to Approved for mpg

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-write



From pkgdb at fedoraproject.org  Fri Jan 30 14:48:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 14:48:34 +0000
Subject: [pkgdb] sugar-write had acl change status
Message-ID: <20090130144835.3D65D208DEA@bastion.fedora.phx.redhat.com>

katzj has set the commit acl on sugar-write (Fedora devel) to Approved for fab

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-write



From pkgdb at fedoraproject.org  Fri Jan 30 14:48:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 14:48:24 +0000
Subject: [pkgdb] sugar-write had acl change status
Message-ID: <20090130144825.C06C2208DE6@bastion.fedora.phx.redhat.com>

katzj has set the approveacls acl on sugar-write (Fedora 10) to Approved for mpg

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-write



From pkgdb at fedoraproject.org  Fri Jan 30 14:48:39 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 14:48:39 +0000
Subject: [pkgdb] sugar-write had acl change status
Message-ID: <20090130144839.F248C208DEE@bastion.fedora.phx.redhat.com>

katzj has set the approveacls acl on sugar-write (Fedora devel) to Approved for fab

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-write



From pkgdb at fedoraproject.org  Fri Jan 30 14:48:41 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 14:48:41 +0000
Subject: [pkgdb] sugar-write had acl change status
Message-ID: <20090130144841.7D65A208DF0@bastion.fedora.phx.redhat.com>

katzj has set the approveacls acl on sugar-write (Fedora devel) to Approved for mpg

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-write



From pkgdb at fedoraproject.org  Fri Jan 30 14:48:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 14:48:43 +0000
Subject: [pkgdb] sugar-write had acl change status
Message-ID: <20090130144843.C5903208DF5@bastion.fedora.phx.redhat.com>

katzj has set the commit acl on sugar-write (Fedora devel) to Approved for mpg

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-write



From pkgdb at fedoraproject.org  Fri Jan 30 14:48:44 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 14:48:44 +0000
Subject: [pkgdb] sugar-chat had acl change status
Message-ID: <20090130144844.A37DF208DF9@bastion.fedora.phx.redhat.com>

katzj has set the watchcommits acl on sugar-chat (Fedora devel) to Approved for erikos

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-chat



From pkgdb at fedoraproject.org  Fri Jan 30 14:48:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 14:48:49 +0000
Subject: [pkgdb] sugar-chat had acl change status
Message-ID: <20090130144849.C2E70208DFB@bastion.fedora.phx.redhat.com>

katzj has set the approveacls acl on sugar-chat (Fedora devel) to Approved for erikos

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-chat



From pkgdb at fedoraproject.org  Fri Jan 30 14:48:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 14:48:52 +0000
Subject: [pkgdb] sugar-chat had acl change status
Message-ID: <20090130144852.C07CA208DFD@bastion.fedora.phx.redhat.com>

katzj has set the approveacls acl on sugar-chat (Fedora devel) to Approved for mpg

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-chat



From pkgdb at fedoraproject.org  Fri Jan 30 14:48:52 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 14:48:52 +0000
Subject: [pkgdb] sugar-chat had acl change status
Message-ID: <20090130144852.C0FA6208DFE@bastion.fedora.phx.redhat.com>

katzj has set the commit acl on sugar-chat (Fedora devel) to Approved for erikos

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-chat



From pkgdb at fedoraproject.org  Fri Jan 30 14:48:54 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 14:48:54 +0000
Subject: [pkgdb] sugar-chat had acl change status
Message-ID: <20090130144855.2DAC0208E03@bastion.fedora.phx.redhat.com>

katzj has set the commit acl on sugar-chat (Fedora devel) to Approved for mpg

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-chat



From pkgdb at fedoraproject.org  Fri Jan 30 14:48:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 14:48:59 +0000
Subject: [pkgdb] sugar-chat had acl change status
Message-ID: <20090130144859.550D2208E08@bastion.fedora.phx.redhat.com>

katzj has set the approveacls acl on sugar-chat (Fedora 9) to Approved for mpg

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-chat



From pkgdb at fedoraproject.org  Fri Jan 30 14:49:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 14:49:00 +0000
Subject: [pkgdb] sugar-chat had acl change status
Message-ID: <20090130144900.8EC732084A7@bastion.fedora.phx.redhat.com>

katzj has set the commit acl on sugar-chat (Fedora 9) to Approved for mpg

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-chat



From pkgdb at fedoraproject.org  Fri Jan 30 14:49:00 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 14:49:00 +0000
Subject: [pkgdb] sugar-chat had acl change status
Message-ID: <20090130144901.4AB6A20876B@bastion.fedora.phx.redhat.com>

katzj has set the watchcommits acl on sugar-chat (Fedora 10) to Approved for erikos

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-chat



From pkgdb at fedoraproject.org  Fri Jan 30 14:49:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 14:49:04 +0000
Subject: [pkgdb] sugar-chat had acl change status
Message-ID: <20090130144905.61EE7208E0C@bastion.fedora.phx.redhat.com>

katzj has set the approveacls acl on sugar-chat (Fedora 10) to Approved for erikos

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-chat



From pkgdb at fedoraproject.org  Fri Jan 30 14:49:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 14:49:09 +0000
Subject: [pkgdb] sugar-chat had acl change status
Message-ID: <20090130144909.A4484208E17@bastion.fedora.phx.redhat.com>

katzj has set the approveacls acl on sugar-chat (Fedora 10) to Approved for mpg

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-chat



From pkgdb at fedoraproject.org  Fri Jan 30 14:49:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 14:49:04 +0000
Subject: [pkgdb] sugar-chat had acl change status
Message-ID: <20090130144906.141E4208E10@bastion.fedora.phx.redhat.com>

katzj has set the commit acl on sugar-chat (Fedora 10) to Approved for erikos

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-chat



From pkgdb at fedoraproject.org  Fri Jan 30 14:49:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 14:49:07 +0000
Subject: [pkgdb] sugar-chat had acl change status
Message-ID: <20090130144907.8D0C2208E13@bastion.fedora.phx.redhat.com>

katzj has set the commit acl on sugar-chat (Fedora 10) to Approved for mpg

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-chat



From pkgdb at fedoraproject.org  Fri Jan 30 14:49:17 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 14:49:17 +0000
Subject: [pkgdb] sugar-calculator had acl change status
Message-ID: <20090130144918.1A27D20896E@bastion.fedora.phx.redhat.com>

katzj has set the watchcommits acl on sugar-calculator (Fedora devel) to Approved for erikos

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-calculator



From pkgdb at fedoraproject.org  Fri Jan 30 14:49:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 14:49:19 +0000
Subject: [pkgdb] sugar-calculator had acl change status
Message-ID: <20090130144919.EC256208E1A@bastion.fedora.phx.redhat.com>

katzj has set the commit acl on sugar-calculator (Fedora devel) to Approved for erikos

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-calculator



From pkgdb at fedoraproject.org  Fri Jan 30 14:49:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 14:49:24 +0000
Subject: [pkgdb] sugar-calculator had acl change status
Message-ID: <20090130144924.2A9652084B7@bastion.fedora.phx.redhat.com>

katzj has set the commit acl on sugar-calculator (Fedora devel) to Approved for mpg

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-calculator



From pkgdb at fedoraproject.org  Fri Jan 30 14:49:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 14:49:25 +0000
Subject: [pkgdb] sugar-calculator had acl change status
Message-ID: <20090130144925.A8DF2208E1B@bastion.fedora.phx.redhat.com>

katzj has set the approveacls acl on sugar-calculator (Fedora devel) to Approved for mpg

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-calculator



From pkgdb at fedoraproject.org  Fri Jan 30 14:49:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 14:49:25 +0000
Subject: [pkgdb] sugar-calculator had acl change status
Message-ID: <20090130144926.0EF29208E1C@bastion.fedora.phx.redhat.com>

katzj has set the approveacls acl on sugar-calculator (Fedora devel) to Approved for erikos

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-calculator



From pkgdb at fedoraproject.org  Fri Jan 30 14:49:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 14:49:29 +0000
Subject: [pkgdb] sugar-calculator had acl change status
Message-ID: <20090130144930.43CF0208E20@bastion.fedora.phx.redhat.com>

katzj has set the approveacls acl on sugar-calculator (Fedora 9) to Approved for mpg

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-calculator



From pkgdb at fedoraproject.org  Fri Jan 30 14:49:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 14:49:32 +0000
Subject: [pkgdb] sugar-calculator had acl change status
Message-ID: <20090130144932.B4A57208E27@bastion.fedora.phx.redhat.com>

katzj has set the watchcommits acl on sugar-calculator (Fedora 10) to Approved for erikos

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-calculator



From pkgdb at fedoraproject.org  Fri Jan 30 14:49:32 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 14:49:32 +0000
Subject: [pkgdb] sugar-calculator had acl change status
Message-ID: <20090130144933.0D022208E28@bastion.fedora.phx.redhat.com>

katzj has set the commit acl on sugar-calculator (Fedora 9) to Approved for mpg

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-calculator



From pkgdb at fedoraproject.org  Fri Jan 30 14:49:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 14:49:34 +0000
Subject: [pkgdb] sugar-calculator had acl change status
Message-ID: <20090130144935.9FF6520897A@bastion.fedora.phx.redhat.com>

katzj has set the commit acl on sugar-calculator (Fedora 10) to Approved for erikos

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-calculator



From pkgdb at fedoraproject.org  Fri Jan 30 14:49:36 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 14:49:36 +0000
Subject: [pkgdb] sugar-calculator had acl change status
Message-ID: <20090130144936.5EA6720897B@bastion.fedora.phx.redhat.com>

katzj has set the approveacls acl on sugar-calculator (Fedora 10) to Approved for erikos

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-calculator



From pkgdb at fedoraproject.org  Fri Jan 30 14:49:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 14:49:37 +0000
Subject: [pkgdb] sugar-calculator had acl change status
Message-ID: <20090130144937.DB6BB208E2E@bastion.fedora.phx.redhat.com>

katzj has set the commit acl on sugar-calculator (Fedora 10) to Approved for mpg

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-calculator



From tadej at fedoraproject.org  Fri Jan 30 14:49:52 2009
From: tadej at fedoraproject.org (=?utf-8?q?Tadej_Jane=C5=BE?=)
Date: Fri, 30 Jan 2009 14:49:52 +0000 (UTC)
Subject: rpms/PyQwt/devel PyQwt.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090130144952.A68A170117@cvs1.fedora.phx.redhat.com>

Author: tadej

Update of /cvs/pkgs/rpms/PyQwt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5210/devel

Modified Files:
	.cvsignore sources 
Added Files:
	PyQwt.spec import.log 
Log Message:
Initial import.



--- NEW FILE PyQwt.spec ---
%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}

Name:           PyQwt
Version:        5.1.0
Release:        3%{?dist}
Summary:        Python bindings for Qwt

Group:          Development/Languages
# GPLv2+ exceptions (see COPYING.PyQwt)
License:        GPLv2+ with exceptions
URL:            http://pyqwt.sourceforge.net/
Source0:        http://downloads.sourceforge.net/pyqwt/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  python-devel
BuildRequires:  sip-devel
BuildRequires:  PyQt4-devel
BuildRequires:  numpy
BuildRequires:  qwt-devel

Requires:       PyQt4
Requires:       numpy

%description
PyQwt is a set of Python bindings for the Qwt C++ class library which extends
the Qt framework with widgets for scientific and engineering applications. It
provides a widget to plot 2-dimensional data and various widgets to display and
control bounded or unbounded floating point values.

%package devel
Summary: Files needed to build other bindings on PyQwt
Group:   Development/Languages
Requires: %{name} = %{version}-%{release}
Requires: PyQt4-devel
Requires: qwt-devel
%description devel
Files needed to build other bindings for Qwt C++ classes that inherit from
any of the PyQwt classes.

%prep
%setup -q

# mark examples non-executable
find qt4examples/ -name "*.py" | xargs chmod a-x

%build
QWTDIR=%{_includedir}/qwt
cd configure
%{__python} configure.py -I$QWTDIR -lqwt --disable-numarray --disable-numeric
make %{?_smp_mflags}

%install
rm -rf %{buildroot}
cd configure
make DESTDIR=%{buildroot} install

# non-executable script
chmod 755 %{buildroot}/%{python_sitearch}/PyQt4/Qwt5/grace.py
 
%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%doc ANNOUNCEMENT-%{version} README
%doc COPYING*
%{python_sitearch}/PyQt4/Qwt5/

%files devel
%defattr(-,root,root,-)
%doc Doc/*
%doc qt4examples/ 
%{_datadir}/sip/PyQt4/Qwt5/

%changelog
* Sat Jan 24 2009 Tadej Jane?? <tadej.janez at tadej.hicsalta.si> 5.1.0-3
- made grace.py executable again

* Fri Jan 09 2009 Tadej Jane?? <tadej.janez at tadej.hicsalta.si> 5.1.0-2
- disabled support for Numeric and Numarray
- incorporated fixes from package review in BZ472229

* Tue Nov 18 2008 Tadej Jane?? <tadej.janez at tadej.hicsalta.si> 5.1.0-1
- initial package


--- NEW FILE import.log ---
PyQwt-5_1_0-3_fc10:HEAD:PyQwt-5.1.0-3.fc10.src.rpm:1233326430


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/PyQwt/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	28 Jan 2009 05:37:50 -0000	1.1
+++ .cvsignore	30 Jan 2009 14:49:22 -0000	1.2
@@ -0,0 +1 @@
+PyQwt-5.1.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/PyQwt/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	28 Jan 2009 05:37:50 -0000	1.1
+++ sources	30 Jan 2009 14:49:22 -0000	1.2
@@ -0,0 +1 @@
+c9d662a0d4fc95cec75d3c526e4e748a  PyQwt-5.1.0.tar.gz



From pkgdb at fedoraproject.org  Fri Jan 30 14:49:42 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 14:49:42 +0000
Subject: [pkgdb] sugar-calculator had acl change status
Message-ID: <20090130144942.57C2F208E33@bastion.fedora.phx.redhat.com>

katzj has set the approveacls acl on sugar-calculator (Fedora 10) to Approved for mpg

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-calculator



From ovasik at fedoraproject.org  Fri Jan 30 14:49:54 2009
From: ovasik at fedoraproject.org (Ondrej Vasik)
Date: Fri, 30 Jan 2009 14:49:54 +0000 (UTC)
Subject: rpms/setup/F-10 setup-2.7.4-protocolsservices.patch, NONE,
	1.1 setup-2.7.4-rxvt.patch, NONE, 1.1 setup-2.7.4-uidgid.patch,
	NONE, 1.1 setup-2.7.4.patch, 1.1, 1.2 setup.spec, 1.61, 1.62
Message-ID: <20090130144954.ABF1570117@cvs1.fedora.phx.redhat.com>

Author: ovasik

Update of /cvs/extras/rpms/setup/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6554

Modified Files:
	setup-2.7.4.patch setup.spec 
Added Files:
	setup-2.7.4-protocolsservices.patch setup-2.7.4-rxvt.patch 
	setup-2.7.4-uidgid.patch 
Log Message:
add some uid/gid reservations from rawhide, better parseable uidgid file, do not export INPUTRC(to respect just created ~/.inputrc), update services and protocols to later IANA list, add URL, fix few rpmlint warnings, /etc/services and /etc/inputrc now config(noreplace), add support for ctrl+arrow keys in rxvt(#474110)

setup-2.7.4-protocolsservices.patch:

--- NEW FILE setup-2.7.4-protocolsservices.patch ---
diff -urNp setup-2.7.4-orig/protocols setup-2.7.4/protocols
--- setup-2.7.4-orig/protocols	2008-10-10 18:29:39.000000000 +0200
+++ setup-2.7.4/protocols	2008-11-27 13:03:16.000000000 +0100
@@ -1,11 +1,12 @@
 # /etc/protocols:
-# $Id: protocols,v 1.6 2007/05/23 15:55:03 pknirsch Exp $
+# $Id: protocols,v 1.7 2008/11/19 12:27:31 ovasik Exp $
 #
 # Internet (IP) protocols
 #
 #	from: @(#)protocols	5.1 (Berkeley) 4/17/89
 #
 # Updated for NetBSD based on RFC 1340, Assigned Numbers (July 1992).
+# Last IANA update included dated 2008-04-18
 #
 # See also http://www.iana.org/assignments/protocol-numbers
 
@@ -43,7 +44,7 @@ iso-tp4	29	ISO-TP4		# ISO Transport Prot
 netblt	30	NETBLT		# Bulk Data Transfer Protocol
 mfe-nsp	31	MFE-NSP		# MFE Network Services Protocol
 merit-inp	32	MERIT-INP	# MERIT Internodal Protocol
-dccp	33	DCCP		# Datagram Congestion Control Protocol  
+dccp	33	DCCP		# Datagram Congestion Control Protocol
 3pc	34	3PC		# Third Party Connect Protocol
 idpr	35	IDPR		# Inter-Domain Policy Routing Protocol
 xtp	36	XTP		# Xpress Tranfer Protocol
@@ -53,7 +54,7 @@ tp++	39	TP++		# TP++ Transport Protocol
 il	40	IL		# IL Transport Protocol
 ipv6	41	IPv6		# IPv6
 sdrp	42	SDRP		# Source Demand Routing Protocol
-ipv6-route	43	IPv6-Route 	# Routing Header for IPv6
+ipv6-route	43	IPv6-Route	# Routing Header for IPv6
 ipv6-frag	44	IPv6-Frag	# Fragment Header for IPv6
 idrp	45	IDRP		# Inter-Domain Routing Protocol
 rsvp	46	RSVP		# Resource ReSerVation Protocol
@@ -61,9 +62,9 @@ gre	47	GRE		# Generic Routing Encapsulat
 dsr	48	DSR		# Dynamic Source Routing Protocol
 bna	49	BNA		# BNA
 esp	50	ESP		# Encap Security Payload
-ipv6-crypt	50	IPv6-Crypt	# Encryption Header for IPv6
+ipv6-crypt	50	IPv6-Crypt	# Encryption Header for IPv6 (not in official list)
 ah	51	AH		# Authentication Header
-ipv6-auth	51	IPv6-Auth	# Authentication Header for IPv6
+ipv6-auth	51	IPv6-Auth	# Authentication Header for IPv6 (not in official list)
 i-nlsp	52	I-NLSP		# Integrated Net Layer Security TUBA
 swipe	53	SWIPE		# IP with Encryption
 narp	54	NARP		# NBMA Address Resolution Protocol
@@ -150,7 +151,9 @@ rsvp-e2e-ignore	134	RSVP-E2E-IGNORE
 #	135			# Mobility Header
 udplite	136	UDPLite
 mpls-in-ip	137	MPLS-in-IP
-#   138-252 Unassigned                                       [IANA]
+manet	138	manet		# MANET Protocols
+hip	139	HIP		# Host Identity Protocol
+#   140-252 Unassigned                                       [IANA]
 #   253     Use for experimentation and testing           [RFC3692]
 #   254     Use for experimentation and testing           [RFC3692]
 #   255                 Reserved                             [IANA]
diff -urNp setup-2.7.4-orig/services setup-2.7.4/services
--- setup-2.7.4-orig/services	2009-01-30 14:55:16.000000000 +0100
+++ setup-2.7.4/services	2008-11-27 13:03:16.000000000 +0100
@@ -1,5 +1,5 @@
 # /etc/services:
-# $Id: services,v 1.44 2008/04/07 21:30:33 pknirsch Exp $
+# $Id: services,v 1.45 2008/11/19 14:56:28 ovasik Exp $
 #
 # Network services, Internet style
 #
@@ -87,6 +87,7 @@ finger		79/tcp
 finger		79/udp
 http		80/tcp		www www-http	# WorldWideWeb HTTP
 http		80/udp		www www-http	# HyperText Transfer Protocol
+http		80/sctp				# HyperText Transfer Protocol
 kerberos	88/tcp		kerberos5 krb5	# Kerberos v5
 kerberos	88/udp		kerberos5 krb5	# Kerberos v5
 supdup		95/tcp
@@ -144,6 +145,7 @@ nextstep	178/tcp		NeXTStep NextStep	# Ne
 nextstep	178/udp		NeXTStep NextStep	# server
 bgp		179/tcp				# Border Gateway Proto.
 bgp		179/udp
+bgp		179/sctp
 prospero	191/tcp				# Cliff Neuman's Prospero
 prospero	191/udp
 irc		194/tcp				# Internet Relay Chat
@@ -182,14 +184,17 @@ ulistproc	372/tcp		ulistserv	# UNIX List
 ulistproc	372/udp		ulistserv
 ldap		389/tcp
 ldap		389/udp
+osb-sd		400/tcp		# Oracle Secure Backup
+osb-sd		400/udp		# Oracle Secure Backup
 svrloc          427/tcp				# Server Location Protocl
 svrloc          427/udp				# Server Location Protocl
 mobileip-agent	434/tcp
 mobileip-agent	434/udp
 mobilip-mn	435/tcp
 mobilip-mn	435/udp
-https		443/tcp				# MCom
-https		443/udp				# MCom
+https		443/tcp				# http protocol over TLS/SSL
+https		443/udp				# http protocol over TLS/SSL
+https		443/sctp			# http protocol over TLS/SSL
 snpp		444/tcp				# Simple Network Paging Protocol
 snpp		444/udp				# Simple Network Paging Protocol
 microsoft-ds	445/tcp
@@ -769,7 +774,6 @@ vmnet		175/tcp			# VMNET
 vmnet		175/udp			# VMNET
 genrad-mux	176/tcp			# GENRAD-MUX
 genrad-mux	176/udp			# GENRAD-MUX
-bgp		179/sctp		# BGP
 ris		180/tcp			# Intergraph
 ris		180/udp			# Intergraph
 unify		181/tcp			# Unify
@@ -1018,8 +1022,6 @@ kryptolan	398/tcp			# Kryptolan
 kryptolan	398/udp			# Kryptolan
 iso-tsap-c2	399/tcp			# ISO Transport Class 2 Non-Control over TCP
 iso-tsap-c2	399/udp			# ISO Transport Class 2 Non-Control over UDP
-work-sol	400/tcp			# Workstation Solutions
-work-sol	400/udp			# Workstation Solutions
 ups		401/tcp			# Uninterruptible Power Supply
 ups		401/udp			# Uninterruptible Power Supply
 genie		402/tcp			# Genie Protocol
@@ -1098,7 +1100,6 @@ decvms-sysmgt	441/tcp			# decvms-sysmgt
 decvms-sysmgt	441/udp			# decvms-sysmgt
 cvc_hostd	442/tcp			# cvc_hostd
 cvc_hostd	442/udp			# cvc_hostd
-https		443/sctp		# HTTPS
 ddm-rdb		446/tcp			# DDM-Remote Relational Database Access
 ddm-rdb		446/udp			# DDM-Remote Relational Database Access
 ddm-dfm		447/tcp			# DDM-Distributed File Management
@@ -1638,6 +1639,8 @@ iscsi		860/tcp			# iSCSI
 iscsi		860/udp			# iSCSI
 owamp-control	861/tcp			# OWAMP-Control
 owamp-control	861/udp			# OWAMP-Control
+twamp-control	862/tcp			# Two-way Active Measurement Protocol (TWAMP) Control
+twamp-control	862/udp			# Two-way Active Measurement Protocol (TWAMP) Control
 iclcnet-locate	886/tcp			# ICL coNETion locate server
 iclcnet-locate	886/udp			# ICL coNETion locate server
 iclcnet_svinfo	887/tcp			# ICL coNETion server info
@@ -1710,8 +1713,8 @@ mtqp		1038/tcp		# Message Tracking Query
 mtqp		1038/udp		# Message Tracking Query Protocol
 sbl		1039/tcp		# Streamlined Blackhole
 sbl		1039/udp		# Streamlined Blackhole
-netarx		1040/tcp		# Netarx
-netarx		1040/udp		# Netarx
+netarx		1040/tcp		# Netarx Netcare
+netarx		1040/udp		# Netarx Netcare
 danf-ak2	1041/tcp		# AK2 Product
 danf-ak2	1041/udp		# AK2 Product
 afrog		1042/tcp		# Subnet Roaming
@@ -1852,8 +1855,8 @@ lmsocialserver	1111/tcp		# LM Social Ser
 lmsocialserver	1111/udp		# LM Social Server
 icp		1112/tcp		# Intelligent Communication Protocol
 icp		1112/udp		# Intelligent Communication Protocol
-ltp-deepspace	1113/tcp		# Licklider Transmission Pr
-ltp-deepspace	1113/udp		# Licklider Transmission Pr
+ltp-deepspace	1113/tcp		# Licklider Transmission Protocol
+ltp-deepspace	1113/udp		# Licklider Transmission Protocol
 mini-sql	1114/tcp		# Mini SQL
 mini-sql	1114/udp		# Mini SQL
 ardus-trns	1115/tcp		# ARDUS Transfer
@@ -2071,8 +2074,8 @@ sweetware-apps	1221/tcp		# SweetWARE App
 sweetware-apps	1221/udp		# SweetWARE Apps
 nerv		1222/tcp		# SNI R&D network
 nerv		1222/udp		# SNI R&D network
-tgp		1223/tcp		# TGP
-tgp		1223/udp		# TGP
+tgp		1223/tcp		# TrulyGlobal Protocol
+tgp		1223/udp		# TrulyGlobal Protocol
 vpnz		1224/tcp		# VPNz
 vpnz		1224/udp		# VPNz
 slinkysearch	1225/tcp		# SLINKYSEARCH
@@ -3627,8 +3630,8 @@ imsldoc		2035/tcp		#
 imsldoc		2035/udp		#
 e-dpnet		2036/tcp		# Ethernet WS DP network
 e-dpnet		2036/udp		# Ethernet WS DP network
-p2plus		2037/tcp		# P2plus Application Server
-p2plus		2037/udp		# P2plus Application Server
+applus		2037/tcp		# APplus Application Server
+applus		2037/udp		# APplus Application Server
 objectmanager	2038/tcp		#
 objectmanager	2038/udp		#
 prizma		2039/tcp		# Prizma Monitoring Service
@@ -4177,8 +4180,8 @@ ofsd		2322/udp		# ofsd
 3d-nfsd		2323/udp		# 3d-nfsd
 cosmocall	2324/tcp		# Cosmocall
 cosmocall	2324/udp		# Cosmocall
-designspace-lm	2325/tcp		# Design Space License Management
-designspace-lm	2325/udp		# Design Space License Management
+ansysli	2325/tcp		# ANSYS Licensing Interconnect
+ansysli	2325/udp		# ANSYS Licensing Interconnect
 idcp		2326/tcp		# IDCP
 idcp		2326/udp		# IDCP
 xingcsm		2327/tcp		# xingcsm
@@ -5640,8 +5643,6 @@ stss		3090/tcp		# Senforce Session Servi
 stss		3090/udp		# Senforce Session Services
 1ci-smcs	3091/tcp		# 1Ci Server Management
 1ci-smcs	3091/udp		# 1Ci Server Management
-njfss		3092/tcp		# Netware sync services
-njfss		3092/udp		# Netware sync services
 rapidmq-center	3093/tcp		# Jiiva RapidMQ Center
 rapidmq-center	3093/udp		# Jiiva RapidMQ Center
 rapidmq-reg	3094/tcp		# Jiiva RapidMQ Registry
@@ -5780,8 +5781,8 @@ imprs		3164/tcp		# IMPRS
 imprs		3164/udp		# IMPRS
 newgenpay	3165/tcp		# Newgenpay Engine Service
 newgenpay	3165/udp		# Newgenpay Engine Service
-qrepos		3166/tcp		# Quest Repository
-qrepos		3166/udp		# Quest Repository
+sossecollector		3166/tcp		# Quest Spotlight Out-Of-Process Collector
+sossecollector		3166/udp		# Quest Spotlight Out-Of-Process Collector
 nowcontact	3167/tcp		# Now Contact Public Server
 nowcontact	3167/udp		# Now Contact Public Server
 poweronnud	3168/tcp		# Now Up-to-Date Public Server
@@ -6365,8 +6366,8 @@ nppmp		3476/tcp		# NVIDIA Mgmt Protocol
 nppmp		3476/udp		# NVIDIA Mgmt Protocol
 ecomm		3477/tcp		# eComm link port
 ecomm		3477/udp		# eComm link port
-nat-stun-port	3478/tcp		# Simple Traversal of UDP Through NAT (STUN) port
-nat-stun-port	3478/udp		# Simple Traversal of UDP Through NAT (STUN) port
+stun	3478/tcp		# Session Traversal Utilities for NAT (STUN) port
+stun	3478/udp		# Session Traversal Utilities for NAT (STUN) port
 twrpc		3479/tcp		# 2Wire RPC
 twrpc		3479/udp		# 2Wire RPC
 plethora	3480/tcp		# Secure Virtual Workspace
@@ -7271,8 +7272,8 @@ sdp-portmapper	3935/tcp		# SDP Port Mapp
 sdp-portmapper	3935/udp		# SDP Port Mapper Protocol
 mailprox	3936/tcp		# Mailprox
 mailprox	3936/udp		# Mailprox
-dvbservdscport	3937/tcp		# DVB Service Disc Port
-dvbservdscport	3937/udp		# DVB Service Disc Port
+dvbservdsc	3937/tcp		# DVB Service Discovery
+dvbservdsc	3937/udp		# DVB Service Discovery
 dbcontrol_agent 3938/tcp		# Oracle dbControl Agent po
 dbcontrol_agent 3938/udp		# Oracel dbControl Agent po
 aamp		3939/tcp		# Anti-virus Application Management Port
@@ -7385,12 +7386,10 @@ bv-ds		3992/tcp		# BindView-DirectorySer
 bv-ds		3992/udp		# BindView-DirectoryServer
 bv-agent	3993/tcp		# BindView-Agent
 bv-agent	3993/udp		# BindView-Agent
-objserver	3994/tcp		# Objectika Administrator Server
-objserver	3994/udp		# Objectika Administrator Server
 iss-mgmt-ssl	3995/tcp		# ISS Management Svcs SSL
 iss-mgmt-ssl	3995/udp		# ISS Management Svcs SSL
 abcsoftware	3996/tcp		# abcsoftware-01
-abscoftware	3996/udp		# abcsoftware-01
+abcsoftware	3996/udp		# abcsoftware-01
 agentsease-db	3997/tcp		# aes_db
 agentsease-db	3997/udp		# aes_db
 dnx		3998/tcp		# Distributed Nagios Executor Service
@@ -7490,8 +7489,6 @@ acp-proto	4046/tcp		# Accounting Protoco
 acp-proto	4046/udp		# Accounting Protocol
 ctp-state	4047/tcp		# Context Transfer Protocol
 ctp-state	4047/udp		# Context Transfer Protocol
-objadmin	4048/tcp		# Objectika Administrator Agent
-objadmin	4048/udp		# Objectika Administrator Agent
 wafs		4049/tcp		# Wide Area File Services
 wafs		4049/udp		# Wide Area File Services
 cisco-wafs	4050/tcp		# Wide Area File Services
@@ -7548,6 +7545,8 @@ perimlan	4075/tcp		# ISC Alarm Message S
 perimlan	4075/udp		# ISC Alarm Message Service
 seraph		4076/tcp		# Seraph DCS
 seraph		4076/udp		# Seraph DCS
+ascomalarm	4077/udp		# Ascom IP Alarming
+cssp			4078/tcp		# Coordinated Security Service Protocol
 lorica-in	4080/tcp		# Lorica inside facing
 lorica-in	4080/udp		# Lorica inside facing
 lorica-in-sec	4081/tcp		# Lorica inside facing (SSL)
@@ -7556,6 +7555,11 @@ lorica-out	4082/tcp		# Lorica outside fa
 lorica-out	4082/udp		# Lorica outside facing
 lorica-out-sec	4083/tcp		# Lorica outside facing (SSL)
 lorica-out-sec	4083/udp		# Lorica outside facing (SSL)
+fortisphere-vm	4084/udp		# Fortisphere VM Service
+ezmessagesrv	4085/tcp		# EZNews Newsroom Message Service
+ftsync			4086/udp		# Firewall/NAT state table synchronization
+applusservice	4087/tcp		# APplus Service
+npsp			4088/tcp		# Noah Printing Service Protocol
 opencore	4089/tcp		# OpenCORE Remote Control Service
 opencore	4089/udp		# OpenCORE Remote Control Service
 omasgport	4090/tcp		# OMA BCAST Service Guide
@@ -7612,8 +7616,8 @@ cds		4115/tcp		# CDS Transfer Agent
 cds		4115/udp		# CDS Transfer Agent
 smartcard-tls	4116/tcp		# smartcard-TLS
 smartcard-tls	4116/udp		# smartcard-TLS
-xmlivestream	4117/tcp		# xmLive Streaming Service
-xmlivestream	4117/udp		# xmLive Streaming Service
+hillrserv	4117/tcp		# Hillr Connection Manager
+hillrserv	4117/udp		# Hillr Connection Manager
 netscript	4118/tcp		# Netadmin Systems NETscript service
 netscript	4118/udp		# Netadmin Systems NETscript service
 assuria-slm	4119/tcp		# Assuria Log Manager
@@ -7714,6 +7718,7 @@ pslicser	4168/tcp		# PrintSoft License S
 pslicser	4168/udp		# PrintSoft License Server
 iadt		4169/tcp		# Automation Drive Interface Transport
 iadt		4169/udp		# Automation Drive Interface Transport
+d-cinema-csp	4170/tcp		# SMPTE Content Synchonization Protocol
 wello		4177/tcp		# Wello P2P pubsub service
 wello		4177/udp		# Wello P2P pubsub service
 storman		4178/tcp		# StorMan
@@ -7730,6 +7735,12 @@ gmmp		4183/tcp		# General Metaverse Mess
 gmmp		4183/udp		# General Metaverse Messaging Protocol
 universe_suite	4184/tcp		# UNIVERSE SUITE MESSAGE SERVICE
 universe_suite	4184/udp		# UNIVERSE SUITE MESSAGE SERVICE
+wcpp			4185/tcp		# Woven Control Plane Protocol
+wcpp			4185/udp		# Woven Control Plane Protocol
+boxbackupstore	4186/tcp		# Box Backup Store Service
+csc_proxy		4187/tcp		# Cascade Proxy
+vatata			4188/tcp		# Vatata Peer to Peer Protocol
+vatata			4188/udp		# Vatata Peer to Peer Protocol
 eims-admin	4199/tcp		# EIMS ADMIN
 eims-admin	4199/udp		# EIMS ADMIN
 corelccam	4300/tcp		# Corel CCam
@@ -7814,8 +7825,15 @@ wxbrief		4368/tcp		# WeatherBrief Direct
 wxbrief		4368/udp		# WeatherBrief Direct
 epmd		4369/tcp		# Erlang Port Mapper Daemon
 epmd		4369/udp		# Erlang Port Mapper Daemon
+elpro_tunnel	4370/tcp		# ELPRO V2 Protocol Tunnel
+elpro_tunnel	4370/udp		# ELPRO V2 Protocol Tunnel
+l2c-connect		4371/tcp		# LAN 2 CAN connection service
+l2c-info			4372/tcp		# LAN 2 CAN information service
 remctl		4373/tcp		# Remote Authenticated Command Service
 remctl		4373/udp		# Remote Authenticated Command Service
+psi-ptt			4374/tcp		# PSI Push-to-Talk Protocol
+tolteces		4375/tcp		# Toltec EasyShare
+tolteces		4375/udp		# Toltec EasyShare
 bip		4376/tcp		# BioAPI Interworking
 bip		4376/udp		# BioAPI Interworking
 cp-spxsvr	4377/tcp		# Cambridge Pixel SPx Server
@@ -7826,6 +7844,8 @@ ctdb		4379/tcp		# CTDB
 ctdb		4379/udp		# CTDB
 xandros-cms	4389/tcp		# Xandros Community Management Service
 xandros-cms	4389/udp		# Xandros Community Management Service
+wiegand		4390/tcp		# Physical Access Control
+wiegand		4390/udp		# Physical Access Control
 ds-srv		4400/tcp		# ASIGRA Services
 ds-srv		4400/udp		# ASIGRA Services
 ds-srvr		4401/tcp		# ASIGRA Televaulting DS-System Service
@@ -7840,8 +7860,13 @@ ds-mail		4405/tcp		# ASIGRA Televaulting
 ds-mail		4405/udp		# ASIGRA Televaulting Message Level Restore service
 ds-slp		4406/tcp		# ASIGRA Televaulting DS-Sleeper Service
 ds-slp		4406/udp		# ASIGRA Televaulting DS-Sleeper Service
+nacagent	4407/tcp		# Network Access Control Agent
 beacon-port-2	4426/tcp		# SMARTS Beacon Port
 beacon-port-2	4426/udp		# SMARTS Beacon Port
+drizzle			4427/tcp		# Drizzle database server
+sqlserver		4430/tcp		# REAL SQL Server
+rsqlserver	4430/udp		# REAL SQL Server
+netblox			4441/udp		# Netblox Protocol
 saris		4442/tcp		# Saris
 saris		4442/udp		# Saris
 pharos		4443/tcp		# Pharos
@@ -7876,6 +7901,7 @@ mcp		4458/tcp		# Matrix Configuration Pr
 mcp		4458/udp		# Matrix Configuration Protocol
 hpssmgmt	4484/tcp		# hpssmgmt service
 hpssmgmt	4484/udp		# hpssmgmt service
+assyst-dr		4485/tcp		# Assyst Data Repository Service
 ipsec-nat-t	4500/tcp		# IPsec NAT-Traversal
 ipsec-nat-t	4500/udp		# IPsec NAT-Traversal
 ehs		4535/tcp		# Event Heap Server
@@ -7913,6 +7939,7 @@ bmc-reporting	4568/tcp		# BMC Reporting
 bmc-reporting	4568/udp		# BMC Reporting
 iax		4569/tcp		# Inter-Asterisk eXchange
 iax		4569/udp		# Inter-Asterisk eXchange
+hrpd-ith-at-an	4592/udp		# HRPD-ITH (AT-AN)
 ipt-anri-anri	4593/tcp		# IPT (ANRI-ANRI)
 ipt-anri-anri	4593/udp		# IPT (ANRI-ANRI)
 ias-session	4594/tcp		# IAS-Session (ANRI-ANRI)
@@ -7931,6 +7958,7 @@ piranha1	4600/tcp		# Piranha1
 piranha1	4600/udp		# Piranha1
 piranha2	4601/tcp		# Piranha2
 piranha2	4601/udp		# Piranha2
+mtsserver	4602/tcp		# EAX MTS Server
 playsta2-app	4658/tcp		# PlayStation2 App Port
 playsta2-app	4658/udp		# PlayStation2 App Port
 playsta2-lob	4659/tcp		# PlayStation2 Lobby Port
@@ -8087,6 +8115,8 @@ cc-tracking	4870/tcp		# Citcom Tracking 
 cc-tracking	4870/udp		# Citcom Tracking Service
 wired		4871/tcp		# Wired
 wired		4871/udp		# Wired
+hivestor	4884/tcp		# HiveStor Distributed File System
+hivestor	4884/udp		# HiveStor Distributed File System
 abbs		4885/tcp		# ABBS
 abbs		4885/udp		# ABBS
 lyskom		4894/tcp		# LysKOM Protocol A
@@ -8096,6 +8126,9 @@ radmin-port	4899/udp		# RAdmin Port
 hfcs		4900/tcp		# Hyper File Client/Server Database Engine
 hfcs		4900/udp		# Hyper File Client/Server Database Engine
 lutcp		4913/tcp		# LUTher Control Protocol
+bones		4914/tcp		# Bones Remote Control
+bones		4914/udp		# Bones Remote Control
+atsc-mh-ssc			4937/udp		# ATSC-M/H Service Signaling Channel
 eq-office-4940	4940/tcp		# Equitrac Office
 eq-office-4940	4940/udp		# Equitrac Office
 eq-office-4941	4941/tcp		# Equitrac Office
@@ -8186,6 +8219,8 @@ ita-agent	5051/tcp		# ITA Agent
 ita-agent	5051/udp		# ITA Agent
 ita-manager	5052/tcp		# ITA Manager
 ita-manager	5052/udp		# ITA Manager
+rlm			5053/tcp		# RLM License Server
+rlm-admin	5054/tcp		# RLM administrative interface
 unot		5055/tcp		# UNOT
 unot		5055/udp		# UNOT
 intecom-ps1	5056/tcp		# Intecom Pointspan 1
@@ -8206,6 +8241,7 @@ stanag-5066	5066/tcp		# STANAG-5066-SUBN
 stanag-5066	5066/udp		# STANAG-5066-SUBNET-INTF
 authentx	5067/tcp		# Authentx Service
 authentx	5067/udp		# Authentx Service
+bitforestsrv		5068/tcp		# Bitforest Data Service
 i-net-2000-npr	5069/tcp		# I/Net 2000-NPR
 i-net-2000-npr	5069/udp		# I/Net 2000-NPR
 vtsas		5070/tcp		# VersaTrans Server Agent Service
@@ -8218,6 +8254,7 @@ tag-pm		5073/tcp		# Advantage Group Port
 tag-pm		5073/udp		# Advantage Group Port Mgr
 alesquery	5074/tcp		# ALES Query
 alesquery	5074/udp		# ALES Query
+cp-spxrpts	5079/udp		# Cambridge Pixel SPx Reports
 onscreen	5080/tcp		# OnScreen Data Collection Service
 onscreen	5080/udp		# OnScreen Data Collection Service
 sdl-ets		5081/tcp		# SDL - Ent Trans Server
@@ -8232,6 +8269,7 @@ encrypted-llrp	5085/tcp		# EPCglobal Enc
 encrypted-llrp	5085/udp		# EPCglobal Encrypted LLRP
 car		5090/sctp		# Candidate AR
 cxtp		5091/sctp		# Context Transfer Protocol
+magpie	5092/udp		# Magpie Binary
 sentinel-lm	5093/tcp		# Sentinel LM
 sentinel-lm	5093/udp		# Sentinel LM
 sentlm-srv2srv	5099/tcp		# SentLM Srv2Srv
@@ -8242,8 +8280,12 @@ talarian-tcp	5101/tcp		# Talarian_TCP
 talarian-udp	5101/udp		# Talarian_UDP
 oms-nonsecure	5102/tcp		# Oracle OMS non-secure
 oms-nonsecure	5102/udp		# Oracle OMS non-secure
+taep-as-svc		5111/tcp		# TAEP AS service
+taep-as-svc		5111/udp		# TAEP AS service
 pm-cmdsvr	5112/tcp		# PeerMe Msg Cmd Service
 pm-cmdsvr	5112/udp		# PeerMe Msg Cmd Service
+autobuild			5115/tcp		# Symantec Autobuild Service
+emb-proj-cmd	5116/udp		# EPSON Projecter Image Transfer
 nbt-pc		5133/tcp		# Policy Commander
 nbt-pc		5133/udp		# Policy Commander
 ctsd		5137/tcp		# MyCTS server port
@@ -8304,6 +8346,8 @@ padl2sim	5236/tcp		#
 padl2sim	5236/udp		#
 mnet-discovery	5237/tcp		# m-net discovery
 mnet-discovery	5237/udp		# m-net discovery
+capwap-control	5246/udp		# CAPWAP Control Protocol
+capwap-data			5247/udp		# CAPWAP Data Protocol
 caacws		5248/tcp		# CA Access Control Web Service
 caacws		5248/udp		# CA Access Control Web Service
 caaclang2	5249/tcp		# CA AC Lang Service
@@ -8320,6 +8364,8 @@ movaz-ssc	5252/udp		# Movaz SSC
 3com-njack-2	5265/udp		# 3Com Network Jack Port 2
 xmpp-server	5269/tcp		# XMPP Server Connection
 xmpp-server	5269/udp		# XMPP Server Connection
+xmp		5270/tcp		# Cartographer XMP
+xmp		5270/udp		# Cartographer XMP
 pk		5272/tcp		# PK
 pk		5272/udp		# PK
 transmit-port	5282/tcp		# Marimba Transmitter Port
@@ -8358,10 +8404,14 @@ hacl-poll	5315/tcp		# HA Cluster UDP Pol
 hacl-poll	5315/udp		# HA Cluster UDP Polling
 hpdevms		5316/tcp		# HP Device Monitor Service
 hpdevms		5316/udp		# HP Device Monitor Service
+bsfserver-zn	5320/tcp		# Webservices-based Zn interface of BSF
+bsfsvr-zn-ssl	5321/tcp		# Webservices-based Zn interface of BSF over SSL
 kfserver	5343/tcp		# Sculptor Database Server
 kfserver	5343/udp		# Sculptor Database Server
 xkotodrcp	5344/tcp		# xkoto DRCP
 xkotodrcp	5344/udp		# xkoto DRCP
+stuns			5349/tcp		# STUN over TLS
+stuns			5349/udp		# Reserved for a future enhancement of STUN
 nat-pmp-status	5350/tcp		# NAT-PMP Status Announcements
 nat-pmp-status	5350/udp		# NAT-PMP Status Announcements
 nat-pmp		5351/tcp		# NAT Port Mapping Protocol
@@ -8500,14 +8550,13 @@ personal-agent	5555/tcp		# Personal Agen
 personal-agent	5555/udp		# Personal Agent
 freeciv		5556/tcp		# Freeciv gameplay
 freeciv		5556/udp		# Freeciv gameplay
-udpplus		5566/tcp		# UDPPlus
-udpplus		5566/udp		# UDPPlus
 m-oap		5567/tcp		# Multicast Object Access Protocol
 m-oap		5567/udp		# Multicast Object Access Protocol
 sdt		5568/tcp		# Session Data Transport Multicast
 sdt		5568/udp		# Session Data Transport Multicast
 sdmmp		5573/tcp		# SAS Domain Management Messaging Protocol
 sdmmp		5573/udp		# SAS Domain Management Messaging Protocol
+fdtracks	5579/tcp		# FleetDisplay Tracking Service
 tmosms0		5580/tcp		# T-Mobile SMS Protocol Message 0
 tmosms0		5580/udp		# T-Mobile SMS Protocol Message 0
 tmosms1		5581/tcp		# T-Mobile SMS Protocol Message 1
@@ -8540,6 +8589,8 @@ a4-sdunode	5605/tcp		# A4-SDUNode
 a4-sdunode	5605/udp		# A4-SDUNode
 ninaf		5627/tcp		# Node Initiated Network Association Forma
 ninaf		5627/udp		# Node Initiated Network Association Forma
+htrust	5628/tcp		# HTrust API
+htrust	5628/udp		# HTrust API
 symantec-sfdb	5629/tcp		# Symantec Storage Foundation for Database
 symantec-sfdb	5629/udp		# Symantec Storage Foundation for Database
 precise-comm	5630/tcp		# PreciseCommunication
@@ -8552,6 +8603,8 @@ beorl		5633/tcp		# BE Operations Request
 beorl		5633/udp		# BE Operations Request Listener
 xprtld		5634/tcp		# SF Message Service
 xprtld		5634/udp		# SF Message Service
+sfmsso		5635/tcp		# SFM Authentication Subsystem
+sfm-db-server	5636/tcp		# SFMdb - SFM DB server
 amqps		5671/tcp		# amqp protocol over TLS/SSL
 amqps		5671/udp		# amqp protocol over TLS/SSL
 amqp		5672/tcp		# AMQP
@@ -8603,6 +8656,8 @@ omhs		5723/tcp		# Operations Manager - H
 omhs		5723/udp		# Operations Manager - Health Service
 omsdk		5724/tcp		# Operations Manager - SDK Service
 omsdk		5724/udp		# Operations Manager - SDK Service
+ms-ilm		5725/tcp		# Microsoft Identity Lifecycle Manager
+ms-ilm-sts	5726/tcp		# Microsoft Lifecycle Manager Secure Token Service
 openmail	5729/tcp		# Openmail User Agent Layer
 openmail	5729/udp		# Openmail User Agent Layer
 unieng		5730/tcp		# Steltor's calendar access
@@ -8649,6 +8704,8 @@ dali-port	5777/udp		# DALI Port
 3par-mgmt	5782/udp		# 3PAR Management Service
 3par-mgmt-ssl	5783/tcp		# 3PAR Management Service with SSL
 3par-mgmt-ssl	5783/udp		# 3PAR Management Service with SSL
+3par-rcopy		5785/tcp		# 3PAR Inform Remote Copy
+3par-rcopy		5785/udp		# 3PAR Inform Remote Copy
 xtreamx		5793/tcp		# XtreamX Supervised Peer message
 xtreamx		5793/udp		# XtreamX Supervised Peer message
 icmpd		5813/tcp		# ICMPD
@@ -8661,6 +8718,14 @@ ppsuitemsg	5863/tcp		# PlanetPress Suite
 ppsuitemsg	5863/udp		# PlanetPress Suite Messeng
 vnc-server	5900/tcp		# VNC Server
 vnc-server	5900/udp		# VNC Server
+cm			5910/tcp		# Context Management
+cm			5910/udp		# Context Management
+cpdlc		5911/tcp		# Controller Pilot Data Link Communication
+cpdlc		5911/udp		# Controller Pilot Data Link Communication
+fis			5912/tcp		# Flight Information Services
+fis			5912/udp		# Flight Information Services
+ads-c		5913/tcp		# Automatic Dependent Surveillance
+ads-c		5913/udp		# Automatic Dependent Surveillance
 indy		5963/tcp		# Indy Application Server
 indy		5963/udp		# Indy Application Server
 mppolicy-v5	5968/tcp		# mppolicy-v5
@@ -8741,6 +8806,8 @@ bex-webadmin	6122/tcp		# Backup Express 
 bex-webadmin	6122/udp		# Backup Express Web Server
 backup-express	6123/tcp		# Backup Express
 backup-express	6123/udp		# Backup Express
+pnbs			6124/tcp		# Phlexible Network Backup Service
+pnbs			6124/udp		# Phlexible Network Backup Service
 nbt-wol		6133/tcp		# New Boundary Tech WOL
 nbt-wol		6133/udp		# New Boundary Tech WOL
 pulsonixnls	6140/tcp		# Pulsonix Network License Service
@@ -8771,6 +8838,14 @@ lm-x		6200/tcp		# LM-X License Manager b
 lm-x		6200/udp		# LM-X License Manager by X-Formation
 radmind		6222/tcp		# Radmind Access Protocol
 radmind		6222/udp		# Radmind Access Protocol
+jeol-nsdtp-1	6241/tcp		# JEOL Network Services Data Transport Protocol 1
+jeol-nsddp-1	6241/udp		# JEOL Network Services Dynamic Discovery Protocol 1
+jeol-nsdtp-2	6242/tcp		# JEOL Network Services Data Transport Protocol 2
+jeol-nsddp-2	6242/udp		# JEOL Network Services Dynamic Discovery Protocol 2
+jeol-nsdtp-3	6243/tcp		# JEOL Network Services Data Transport Protocol 3
+jeol-nsddp-3	6243/udp		# JEOL Network Services Dynamic Discovery Protocol 3
+jeol-nsdtp-4	6244/tcp		# JEOL Network Services Data Transport Protocol 4
+jeol-nsddp-4	6244/udp		# JEOL Network Services Dynamic Discovery Protocol 4
 tl1-raw-ssl	6251/tcp		# TL1 Raw Over SSL/TLS
 tl1-raw-ssl	6251/udp		# TL1 Raw Over SSL/TLS
 tl1-ssh		6252/tcp		# TL1 over SSH
@@ -8785,6 +8860,8 @@ bmc-grx		6300/tcp		# BMC GRX
 bmc-grx		6300/udp		# BMC GRX
 bmc_ctd_ldap	6301/tcp		# BMC CONTROL-D LDAP SERVER
 bmc_ctd_ldap	6301/udp		# BMC CONTROL-D LDAP SERVER
+abb-escp			6316/tcp		# Ethernet Sensor Communications Protocol
+abb-escp			6316/udp		# Ethernet Sensor Communications Protocol
 repsvc		6320/tcp		# Double-Take Replication Service
 repsvc		6320/udp		# Double-Take Replication Service
 emp-server1	6321/tcp		# Empress Software Connectivity Server 1
@@ -8809,6 +8886,28 @@ clariion-evr01	6389/tcp		# clariion-evr0
 clariion-evr01	6389/udp		# clariion-evr01
 metaedit-ws	6390/tcp		# MetaEdit+ WebService API
 metaedit-ws	6390/udp		# MetaEdit+ WebService API
+boe-cms         6400/tcp		# Business Objects CMS contact port
+boe-cms         6400/udp		# Business Objects CMS contact port
+boe-was         6401/tcp		# boe-was
+boe-was         6401/udp		# boe-was
+boe-eventsrv    6402/tcp		# boe-eventsrv
+boe-eventsrv    6402/udp		# boe-eventsrv
+boe-cachesvr    6403/tcp		# boe-cachesvr
+boe-cachesvr    6403/udp		# boe-cachesvr
+boe-filesvr     6404/tcp		# Business Objects Enterprise internal server
+boe-filesvr     6404/udp		# Business Objects Enterprise internal server
+boe-pagesvr     6405/tcp		# Business Objects Enterprise internal server
+boe-pagesvr     6405/udp		# Business Objects Enterprise internal server
+boe-processsvr  6406/tcp		# Business Objects Enterprise internal server
+boe-processsvr  6406/udp		# Business Objects Enterprise internal server
+boe-resssvr1    6407/tcp		# Business Objects Enterprise internal server
+boe-resssvr1    6407/udp		# Business Objects Enterprise internal server
+boe-resssvr2    6408/tcp		# Business Objects Enterprise internal server
+boe-resssvr2    6408/udp		# Business Objects Enterprise internal server
+boe-resssvr3    6409/tcp		# Business Objects Enterprise internal server
+boe-resssvr3    6409/udp		# Business Objects Enterprise internal server
+boe-resssvr4    6410/tcp		# Business Objects Enterprise internal server
+boe-resssvr4    6410/udp		# Business Objects Enterprise internal server
 faxcomservice	6417/tcp		# Faxcom Message Service
 faxcomservice	6417/udp		# Faxcom Message Service
 nim-vdrshell	6420/tcp		# NIM_VDRShell
@@ -8865,6 +8964,7 @@ mgcs-mfp-port	6509/tcp		# MGCS-MFP Port
 mgcs-mfp-port	6509/udp		# MGCS-MFP Port
 mcer-port	6510/tcp		# MCER Port
 mcer-port	6510/udp		# MCER Port
+syslog-tls	6514/tcp  # Syslog over TLS
 elipse-rec	6515/tcp		# Elipse RPC Protocol
 elipse-rec	6515/udp		# Elipse RPC Protocol
 lds-distrib	6543/tcp		# lds_distrib
@@ -8915,6 +9015,8 @@ afesc-mc	6628/tcp		# AFE Stock Channel M
 afesc-mc	6628/udp		# AFE Stock Channel M/C
 vocaltec-gold	6670/tcp		# Vocaltec Global Online Directory
 vocaltec-gold	6670/udp		# Vocaltec Global Online Directory
+p4p-portal		6671/tcp		# P4P Portal Service
+p4p-portal		6671/udp		# P4P Portal Service
 vision_server	6672/tcp		# vision_server
 vision_server	6672/udp		# vision_server
 vision_elmd	6673/tcp		# vision_elmd
@@ -9176,6 +9278,7 @@ collaber	7689/tcp		# Collaber Network Se
 collaber	7689/udp		# Collaber Network Service
 klio		7697/tcp		# KLIO communications
 klio		7697/udp		# KLIO communications
+em7-secom	7700/tcp		# EM7 Secure Communications
 sync-em7	7707/tcp		# EM7 Dynamic Updates
 sync-em7	7707/udp		# EM7 Dynamic Updates
 scinet		7708/tcp		# scientia.net
@@ -9194,6 +9297,7 @@ smip		7734/tcp		# Smith Protocol over IP
 smip		7734/udp		# Smith Protocol over IP
 aiagent		7738/tcp		# HP Enterprise Discovery Agent
 aiagent		7738/udp		# HP Enterprise Discovery Agent
+msss			7742/tcp		# Mugginsoft Script Server Service
 sstp-1		7743/tcp		# Sakura Script Transfer Protocol
 sstp-1		7743/udp		# Sakura Script Transfer Protocol
 raqmon-pdu	7744/tcp		# RAQMON PDU
@@ -9232,6 +9336,7 @@ apc-7845	7845/tcp		# APC 7845
 apc-7845	7845/udp		# APC 7845
 apc-7846	7846/tcp		# APC 7846
 apc-7846	7846/udp		# APC 7846
+rbt-smc		7870/tcp		# Riverbed Steelhead Mobile Service
 pss		7880/tcp		# Pearson
 pss		7880/udp		# Pearson
 ubroker		7887/tcp		# Universal Broker
@@ -9286,6 +9391,9 @@ mindprint	8033/tcp		# MindPrint
 mindprint	8033/udp		# MindPrint
 vantronix-mgmt	8034/tcp		# .vantronix Management
 vantronix-mgmt	8034/udp		# .vantronix Management
+fs-agent	8042/tcp		# FireScope Agent
+fs-server	8043/tcp		# FireScope Server
+fs-mgmt		8044/tcp		# FireScope Management Interface
 senomix01	8052/tcp		# Senomix Timesheets Server
 senomix01	8052/udp		# Senomix Timesheets Server
 senomix02	8053/tcp		# Senomix Timesheets Client [1 year assignment]
@@ -9310,6 +9418,8 @@ us-srv		8083/tcp		# Utilistor (Server)
 us-srv		8083/udp		# Utilistor (Server)
 d-s-n		8086/tcp		# Distributed SCADA Networking Rendezvous Port
 d-s-n		8086/udp		# Distributed SCADA Networking Rendezvous Port
+simplifymedia	8087/tcp		# Simplify Media SPP Protocol
+simplifymedia	8087/udp		# Simplify Media SPP Protocol
 radan-http	8088/tcp		# Radan HTTP
 radan-http	8088/udp		# Radan HTTP
 sac		8097/tcp		# SAC Port Id
@@ -9366,8 +9476,12 @@ lm-webwatcher	8208/tcp		# LM Webwatcher
 lm-webwatcher	8208/udp		# LM Webwatcher
 rexecj		8230/tcp		# RexecJ Server
 rexecj		8230/udp		# RexecJ Server
+synapse-nhttps	8243/tcp		# Synapse Non Blocking HTTPS
+synapse-nhttps	8243/udp		# Synapse Non Blocking HTTPS
 pando-sec	8276/tcp		# Pando Media Controlled Distribution
 pando-sec	8276/udp		# Pando Media Controlled Distribution
+synapse-nhttp		8280/tcp		# Synapse Non Blocking HTTP
+synapse-nhttp		8280/udp		# Synapse Non Blocking HTTP
 blp3		8292/tcp		# Bloomberg professional
 blp3		8292/udp		# Bloomberg professional
 blp4		8294/tcp		# Bloomberg intelligent client
@@ -9412,6 +9526,8 @@ pcsync-http	8444/tcp		# PCsync HTTP
 pcsync-http	8444/udp		# PCsync HTTP
 npmp		8450/tcp		# npmp
 npmp		8450/udp		# npmp
+pim-port		8471/tcp		# PIM over Reliable Transport
+pim-port		8471/sctp		# PIM over Reliable Transport
 otv		8472/tcp		# Overlay Transport Virtualization (OTV)
 otv		8472/udp		# Overlay Transport Virtualization (OTV)
 vp2p		8473/tcp		# Virtual Point to Point
@@ -9508,8 +9624,11 @@ etlservicemgr	9001/tcp		# ETL Service Ma
 etlservicemgr	9001/udp		# ETL Service Manager
 dynamid		9002/tcp		# DynamID authentication
 dynamid		9002/udp		# DynamID authentication
+ogs-client	9007/udp		# Open Grid Services Client
+ogs-server	9008/tcp		# Open Grid Services Server
 pichat		9009/tcp		# Pichat Server
 pichat		9009/udp		# Pichat Server
+sdr			9010/tcp		# Secure Data Replicator Protocol
 tambora		9020/tcp		# TAMBORA
 tambora		9020/udp		# TAMBORA
 panagolin-ident 9021/tcp		# Pangolin Identification
@@ -9526,6 +9645,11 @@ swa-4		9026/tcp		# Secure Web Access - 4
 swa-4		9026/udp		# Secure Web Access - 4
 glrpc		9080/tcp		# Groove GLRPC
 glrpc		9080/udp		# Groove GLRPC
+aurora			9084/tcp		# IBM AURORA Performance Visualizer
+aurora			9084/udp		# IBM AURORA Performance Visualizer
+aurora			9084/sctp		# IBM AURORA Performance Visualizer
+ibm-rsyscon	9085/tcp		# IBM Remote System Console
+ibm-rsyscon	9085/udp		# IBM Remote System Console
 net2display	9086/tcp		# Vesa Net2Display
 net2display	9086/udp		# Vesa Net2Display
 classic		9087/tcp		# Classic Data Server
@@ -9603,6 +9727,8 @@ fsc-port	9217/tcp		# FSC Communication P
 fsc-port	9217/udp		# FSC Communication Port
 teamcoherence	9222/tcp		# QSC Team Coherence
 teamcoherence	9222/udp		# QSC Team Coherence
+Mon			9255/tcp		# Manager On Network
+Mon			9255/udp		# Manager On Network
 pgps		9280/tcp		# Predicted GPS
 pgps		9280/udp		# Predicted GPS
 swtp-port1	9281/tcp		# SofaWare transport port 1
@@ -9649,10 +9775,16 @@ sec-t4net-srv	9400/tcp		# Samsung Twain 
 sec-t4net-srv	9400/udp		# Samsung Twain for Network Server
 sec-t4net-clt	9401/tcp		# Samsung Twain for Network Client
 sec-t4net-clt	9401/udp		# Samsung Twain for Network Client
+sec-pc2fax-srv	9402/tcp		# Samsung PC2FAX for Network Server
+sec-pc2fax-srv	9402/udp		# Samsung PC2FAX for Network Server
 git		9418/tcp		# git pack transfer service
 git		9418/udp		# git pack transfer service
 tungsten-https	9443/tcp		# WSO2 Tungsten HTTPS
 tungsten-https	9443/udp		# WSO2 Tungsten HTTPS
+wso2esb-console	9444/tcp		# WSO2 ESB Administration Console HTTPS
+wso2esb-console	9444/udp		# WSO2 ESB Administration Console HTTPS
+sntlkeyssrvr		9450/tcp		# Sentinel Keys Server
+sntlkeyssrvr		9450/udp		# Sentinel Keys Server
 ismserver	9500/tcp		# ismserver
 ismserver	9500/udp		# ismserver
 mngsuite	9535/tcp		# Management Suite Remote Control
@@ -9681,6 +9813,8 @@ micromuse-ncpw	9600/tcp		# MICROMUSE-NCP
 micromuse-ncpw	9600/udp		# MICROMUSE-NCPW
 streamcomm-ds	9612/tcp		# StreamComm User Directory
 streamcomm-ds	9612/udp		# StreamComm User Directory
+condor			9618/tcp		# Condor Collector Service
+condor			9618/udp		# Condor Collector Service
 odbcpathway	9628/tcp		# ODBC Pathway Service
 odbcpathway	9628/udp		# ODBC Pathway Service
 uniport		9629/tcp		# UniPort SSO Controller
@@ -9759,6 +9893,8 @@ documentum	10002/tcp		# EMC-Documentum C
 documentum	10002/udp		# EMC-Documentum Content Server Product
 documentum_s	10003/tcp		# EMC-Documentum Content Server Product
 documentum_s	10003/udp		# EMC-Documentum Content Server Product
+emcrmirccd		10004/tcp		# EMC Replication Manager Client
+emcrmird			10005/tcp		# EMC Replication Manager Server
 mvs-capacity	10007/tcp		# MVS Capacity
 mvs-capacity	10007/udp		# MVS Capacity
 octopus		10008/tcp		# Octopus Multiplexer
@@ -9916,6 +10052,7 @@ dsmcc-download	13821/tcp		# DSMCC Downlo
 dsmcc-download	13821/udp		# DSMCC Download Protocol
 dsmcc-ccp	13822/tcp		# DSMCC Channel Change Protocol
 dsmcc-ccp	13822/udp		# DSMCC Channel Change Protocol
+medevolve	13930/tcp		# MedEvolve Port Requester
 scotty-ft	14000/tcp		# SCOTTY High-Speed Filetransfer
 scotty-ft	14000/udp		# SCOTTY High-Speed Filetransfer
 sua		14001/tcp		# SUA
@@ -9933,8 +10070,11 @@ gcm-app		14145/tcp		# GCM Application
 gcm-app		14145/udp		# GCM Application
 vrts-tdd	14149/tcp		# Veritas Traffic Director
 vrts-tdd	14149/udp		# Veritas Traffic Director
+vcscmd		14150/tcp		# Veritas Cluster Server Command Server
 vad		14154/tcp		# Veritas Application Director
 vad		14154/udp		# Veritas Application Director
+cps				14250/tcp		# Fencing Server
+cps				14250/udp		# Fencing Server
 ca-web-update	14414/tcp		# CA eTrust Web Update Service
 ca-web-update	14414/udp		# CA eTrust Web Update Service
 hde-lcesrvr-1	14936/tcp		# hde-lcesrvr-1
@@ -9971,6 +10111,7 @@ netserialext4	16368/tcp		# Network Seria
 netserialext4	16368/udp		# Network Serial Extension Ports Four
 connected	16384/tcp		# Connected Corp
 connected	16384/udp		# Connected Corp
+xoms			16619/tcp		# X509 Objects Management Service
 sgcip		16950/tcp		# Simple Generic Client Interface Protocol
 sgcip		16950/udp		# Simple Generic Client Interface Protocol
 intel-rci-mp	16991/tcp		# INTEL-RCI-MP
@@ -9999,6 +10140,7 @@ zigbee-ip	17755/tcp		# ZigBee IP Transpo
 zigbee-ip	17755/udp		# ZigBee IP Transport Service
 zigbee-ips	17756/tcp		# ZigBee IP Transport Secure Service
 zigbee-ips	17756/udp		# ZigBee IP Transport Secure Service
+sw-orion	17777/tcp		# SolarWinds Orion
 biimenu		18000/tcp		# Beckman Instruments, Inc.
 biimenu		18000/udp		# Beckman Instruments, Inc.
 opsec-cvp	18181/tcp		# OPSEC CVP
@@ -10051,6 +10193,8 @@ sxuptp		19540/tcp		# SXUPTP
 sxuptp		19540/udp		# SXUPTP
 jcp		19541/tcp		# JCP Client
 jcp		19541/udp		# JCP Client
+dnp-sec		19999/tcp		# Distributed Network Protocol - Secure
+dnp-sec		19999/udp		# Distributed Network Protocol - Secure
 dnp		20000/tcp		# DNP
 dnp		20000/udp		# DNP
 microsan	20001/tcp		# MicroSAN
@@ -10059,10 +10203,15 @@ commtact-http	20002/tcp		# Commtact HTTP
 commtact-http	20002/udp		# Commtact HTTP
 commtact-https	20003/tcp		# Commtact HTTPS
 commtact-https	20003/udp		# Commtact HTTPS
+openwebnet			20005/tcp		# OpenWebNet protocol for electric network
+openwebnet			20005/udp		# OpenWebNet protocol for electric network
 opendeploy	20014/tcp		# OpenDeploy Listener
 opendeploy	20014/udp		# OpenDeploy Listener
 nburn_id	20034/tcp		# NetBurner ID Port
 nburn_id	20034/udp		# NetBurner ID Port
+nfsrdma		20049/tcp		# Network File System (NFS) over RDMA
+nfsrdma		20049/udp		# Network File System (NFS) over RDMA
+nfsrdma		20049/sctp	# Network File System (NFS) over RDMA
 tolfab		20167/tcp		# TOLfab Data Change
 tolfab		20167/udp		# TOLfab Data Change
 ipdtp-port	20202/tcp		# IPD Tunneling Port
@@ -10162,6 +10311,8 @@ ild		24321/tcp		# Isolv Local Directory
 ild		24321/udp		# Isolv Local Directory
 intel_rci	24386/tcp		# Intel RCI
 intel_rci	24386/udp		# Intel RCI
+tonidods		24465/tcp		# Tonido Domain Server
+tonidods		24465/udp		# Tonido Domain Server
 flashfiler	24677/tcp		# FlashFiler
 flashfiler	24677/udp		# FlashFiler
 proactivate	24678/tcp		# Turbopower Proactivate
@@ -10244,6 +10395,7 @@ tetrinet	31457/tcp		# TetriNET Protocol
 tetrinet	31457/udp		# TetriNET Protocol
 lm-mon		31620/tcp		# lm mon
 lm-mon		31620/udp		# lm mon
+dsx_monitor			31685/tcp		# DS Expert Monitor
 gamesmith-port	31765/tcp		# GameSmith Port
 gamesmith-port	31765/udp		# GameSmith Port
 iceedcp_tx	31948/tcp		# Embedded Device Configuration Protocol TX

setup-2.7.4-rxvt.patch:

--- NEW FILE setup-2.7.4-rxvt.patch ---
diff -urNp setup-2.7.4-orig/inputrc setup-2.7.7/inputrc
--- setup-2.7.4-orig/inputrc	2008-10-10 18:29:39.000000000 +0100
+++ setup-2.7.4/inputrc	2009-01-30 10:49:40.000000000 +0100
@@ -26,6 +26,8 @@ $if mode=emacs
 
 # for rxvt
 "\e[8~": end-of-line
+"\eOc": forward-word
+"\eOd": backward-word
 
 # for non RH/Debian xterm, can't hurt for RH/DEbian xterm
 "\eOH": beginning-of-line

setup-2.7.4-uidgid.patch:

--- NEW FILE setup-2.7.4-uidgid.patch ---
diff -urNp setup-2.7.4-orig/uidgid setup-2.7.4/uidgid
--- setup-2.7.4-orig/uidgid	2008-10-10 18:29:39.000000000 +0200
+++ setup-2.7.4/uidgid	2009-01-29 12:43:55.000000000 +0100
@@ -1,105 +1,114 @@
-NAME		UID	GID	HOME			SHELL		PACKAGES
-root		0	0	/root			/bin/bash	setup
-bin		1	1	/bin			/sbin/nologin	setup
-daemon		2	2	/sbin			/sbin/nologin	setup
-sys		-	3	-			-		setup
-adm		3	4	/var/adm		/bin/bash	setup
-tty		-	5	-			-		setup
-disk		-	6	-			-		setup
-lp		4	7	/var/spool/lpd		/sbin/nologin	setup
-mem		-	8	-			-		setup
-kmem		-	9	-			-		setup
-wheel		-	10	-			-		setup
-sync		5	(0)	/sbin			/bin/sync	setup
-shutdown	6	(0)	/sbin			/sbin/shutdown	setup
-halt		7	(0)	/sbin			/sbin/halt	setup
-mail		8	12	/var/spool/mail		/sbin/nologin	setup
-news		9	13	/var/spool/news		/sbin/nologin	setup
-uucp		10	14	/var/spool/uucp		/sbin/nologin	setup
-operator	11	(0)	/root			/sbin/nologin	setup
-games		12	(100)	/usr/games		/sbin/nologin	setup
-gopher		13	30	/usr/lib/gopher-data	/sbin/nologin	setup
-ftp		14	50	/var/ftp		/sbin/nologin	setup
-man		-	15	-			-		setup
-floppy		-	19	-			-		dev,MAKEDEV
-games		-	20	-			-		setup
-slocate		-	21	-			-		slocate
-utmp		-	22	-			-		initscripts,libutempter
-squid		23	23	/var/spool/squid	/dev/null	squid
-pvm		24	24	/usr/share/pvm3		/bin/bash	pvm
-named		25	25	/var/named		/bin/false	bind
+NAME	UID	GID	HOME		SHELL	PACKAGES
+root	0	0	/root		/bin/bash	setup
+bin	1	1	/bin		/sbin/nologin	setup
+daemon	2	2	/sbin		/sbin/nologin	setup
+sys	-	3	-		-	setup
+adm	3	4	/var/adm		/bin/bash	setup
+tty	-	5	-		-	setup
+disk	-	6	-		-	setup
+lp	4	7	/var/spool/lpd		/sbin/nologin	setup
+mem	-	8	-		-	setup
+kmem	-	9	-		-	setup
+wheel	-	10	-		-	setup
+cdrom	-	11	-		-	udev,MAKEDEV
+sync	5	(0)	/sbin		/bin/sync	setup
+shutdown	6	(0)	/sbin		/sbin/shutdown	setup
+halt	7	(0)	/sbin		/sbin/halt	setup
+mail	8	12	/var/spool/mail		/sbin/nologin	setup
+news	9	13	/var/spool/news		/sbin/nologin	setup
+uucp	10	14	/var/spool/uucp		/sbin/nologin	setup
+operator	11	(0)	/root		/sbin/nologin	setup
+games	12	(100)	/usr/games		/sbin/nologin	setup
+gopher	13	30	/usr/lib/gopher-data		/sbin/nologin	setup
+ftp	14	50	/var/ftp		/sbin/nologin	setup
+man	-	15	-		-	setup
+pkiuser	17	17	/usr/share/pki		/sbin/nologin	pki-ca,rhpki-ca
+dialout	-	18	-		-	udev,MAKEDEV
+floppy	-	19	-		-	dev,MAKEDEV
+games	-	20	-		-	setup
+slocate	-	21	-		-	slocate
+utmp	-	22	-		-	initscripts,libutempter
+squid	23	23	/var/spool/squid		/dev/null	squid
+pvm	24	24	/usr/share/pvm3		/bin/bash	pvm
+named	25	25	/var/named		/bin/false	bind
 postgres	26	26	/var/lib/pgsql		/bin/bash	postgresql-server
-mysql		27	27	/var/lib/mysql		/bin/bash	mysql
-nscd		28	28	/			/bin/false	nscd
-rpcuser		29	29	/var/lib/nfs		/bin/false	nfs-utils
-console		-	31	-			-		dev
-rpc		32	32	/			/bin/false	portmap
-amanda		33	(6)	/var/lib/amanda		/bin/false	amanda
-netdump		34	34	/var/crash		/bin/bash	netdump-client, netdump-server
-utempter	-	35	-			-		libutempter
-rpm		37	37	/var/lib/rpm		/bin/bash	rpm
-ntp		38	38	/etc/ntp		/sbin/nologin	ntp
-dip		-	40      -			-		setup
-mailman		41	41	/var/mailman		/bin/false	mailman
-gdm		42	42	/var/gdm		/bin/bash	gdm
-xfs		43	43	/etc/X11/fs		/bin/false	XFree86-xfs
-pppusers	-	44	-			-		linuxconf
-popusers	-	45	-			-		linuxconf
-slipusers	-	46	-			-		linuxconf
-mailnull	47	47	/var/spool/mqueue	/dev/null	sendmail
-apache		48	48	/var/www		/bin/false	apache
-wnn		49	49	/home/wnn		/bin/bash	FreeWnn
-smmsp		51	51	/var/spool/mqueue	/dev/null	sendmail
-tomcat	        53	53	/var/lib/tomcat		/sbin/nologin	tomcat
-lock		-	54	-			-		lockdev
-ldap		55	55	/var/lib/ldap		/bin/false	openldap-servers
+mysql	27	27	/var/lib/mysql		/bin/bash	mysql
+nscd	28	28	/		/bin/false	nscd
+rpcuser	29	29	/var/lib/nfs		/bin/false	nfs-utils
+console	-	31	-		-	dev
+rpc	32	32	/		/bin/false	portmap
+amanda	33	(6)	/var/lib/amanda		/bin/false	amanda
+tape	-	33	-		-	udev,MAKEDEV
+netdump	34	34	/var/crash		/bin/bash	netdump-client, netdump-server
+utempter	-	35	-		-	libutempter
+vdsm	36	-	/		/bin/bash	kvm, vdsm
+kvm	-	36	-		-	kvm, vdsm
+rpm	37	37	/var/lib/rpm		/bin/bash	rpm
+ntp	38	38	/etc/ntp		/sbin/nologin	ntp
+video	-	39	-		-	setup
+dip	-	40	-		-	setup
+mailman	41	41	/var/mailman		/bin/false	mailman
+gdm	42	42	/var/gdm		/bin/bash	gdm
+xfs	43	43	/etc/X11/fs		/bin/false	XFree86-xfs
+pppusers	-	44	-		-	linuxconf
+popusers	-	45	-		-	linuxconf
+slipusers	-	46	-		-	linuxconf
+mailnull	47	47	/var/spool/mqueue		/dev/null	sendmail
+apache	48	48	/var/www		/bin/false	apache
+wnn	49	49	/home/wnn		/bin/bash	FreeWnn
+smmsp	51	51	/var/spool/mqueue		/dev/null	sendmail
+puppet	52	52	/var/lib/puppet		/sbin/nologin	puppet
+tomcat	53	53	/var/lib/tomcat		/sbin/nologin	tomcat
+lock	-	54	-		-	lockdev
+ldap	55	55	/var/lib/ldap		/bin/false	openldap-servers
 frontpage	56	56	/var/www		/bin/false	mod_frontpage
-nut		57	57	/var/lib/ups		/bin/false	nut
-beagleindex	58	58	/var/cache/beagle	/bin/false	beagle
-tss		59	59	-			/sbin/nologin	trousers
-piranha		60	60	/etc/sysconfig/ha	/dev/null	piranha
-prelude-manager	61	61	-			/sbin/nologin	prelude-manager
-snortd		62	62	-			/sbin/nologin	snortd
-condor		64	64	/var/lib/condor		/sbin/nologin	condord
-wine		-	66	-			-		wine
-pegasus		66	65	/var/lib/Pegasus	/sbin/nologin	tog-pegasus
-webalizer	67	67	/var/www/html/usage	/sbin/nologin	webalizer
-haldaemon	68	68	/			/sbin/nologin	hal
-vcsa		69	69	-			/sbin/nologin	dev,MAKEDEV
-avahi		70	70	/			/sbin/nologin	avahi
-realtime	-	71	-			-
-tcpdump		72	72	/			/sbin/nologin	tcpdump
-privoxy		73	73	/etc/privoxy		/bin/bash	privoxy
-sshd		74	74	/var/empty/sshd		/sbin/nologin	openssh-server
-radvd		75	75	/			/bin/false	radvd
-cyrus		76	(12)	/var/imap		/bin/bash	cyrus-imapd
-shadow		-	76	-			-		cyrus-imapd
-arpwatch	77	77	/var/lib/arpwatch	/sbin/nologin	arpwatch
-fax		78	78	/var/spool/fax		/sbin/nologin	mgetty
-nocpulse	79	79	/etc/sysconfig/nocpulse	/bin/bash	nocpulse
-desktop		80	80	-			/sbin/nologin	desktop-file-utils
-dbus		81	81	/			/sbin/nologin	dbus
-jonas		82	82	/var/lib/jonas		/sbin/nologin	jonas
-clamav		83	83	/tmp			/sbin/nologin	clamav
-screen		-	84	-			-		screen
-quaggavt	-	85	-			-		quagga
-sabayon 	86	86	-			/sbin/nologin	sabayon
-polkituser	87	-	/			/sbin/nologin	PolicyKit
-wbpriv		-	88	-			-		samba-common
-postfix		89	89	/var/spool/postfix	/bin/true	postfix
-postdrop	-	90	-			-		postfix
-majordomo	91	91	/usr/lib/majordomo	/bin/bash	majordomo
-quagga		92	92	/			/sbin/nologin	quagga
-exim		93	93	/var/spool/exim		/sbin/nologin	exim
-distcache	94	94	/			/sbin/nologin	distcache
-radiusd		95	95	/			/bin/false	freeradius
-hsqldb		96	96	/var/lib/hsqldb		/sbin/nologin   hsqldb
-dovecot		97	97	/usr/libexec/dovecot	/sbin/nologin	dovecot
-ident		98	98	/			/sbin/nologin	ident
-nobody		99	99	/			/sbin/nologin	setup
-users		-	100	-			-		setup
-gnats		?	?	?			?		gnats, gnats-db
-listar		?	?	?			?		listar
+nut	57	57	/var/lib/ups		/bin/false	nut
+beagleindex	58	58	/var/cache/beagle		/bin/false	beagle
+tss	59	59	-		/sbin/nologin	trousers
+piranha	60	60	/etc/sysconfig/ha		/dev/null	piranha
+prelude-manager	61	61	-		/sbin/nologin	prelude-manager
+snortd	62	62	-		/sbin/nologin	snortd
+audio	-	63	-		-	setup
+condor	64	64	/var/lib/condor		/sbin/nologin	condord
+wine	-	66	-		-	wine
+pegasus	66	65	/var/lib/Pegasus		/sbin/nologin	tog-pegasus
+webalizer	67	67	/var/www/html/usage		/sbin/nologin	webalizer
+haldaemon	68	68	/		/sbin/nologin	hal
+vcsa	69	69	-		/sbin/nologin	dev,MAKEDEV
+avahi	70	70	/		/sbin/nologin	avahi
+realtime	-	71	-		-	-
+tcpdump	72	72	/		/sbin/nologin	tcpdump
+privoxy	73	73	/etc/privoxy		/bin/bash	privoxy
+sshd	74	74	/var/empty/sshd		/sbin/nologin	openssh-server
+radvd	75	75	/		/bin/false	radvd
+cyrus	76	(12)	/var/imap		/bin/bash	cyrus-imapd
+shadow	-	76	-		-	cyrus-imapd
+arpwatch	77	77	/var/lib/arpwatch		/sbin/nologin	arpwatch
+fax	78	78	/var/spool/fax		/sbin/nologin	mgetty
+nocpulse	79	79	/etc/sysconfig/nocpulse		/bin/bash	nocpulse
+desktop	80	80	-		/sbin/nologin	desktop-file-utils
+dbus	81	81	/		/sbin/nologin	dbus
+jonas	82	82	/var/lib/jonas		/sbin/nologin	jonas
+clamav	83	83	/tmp		/sbin/nologin	clamav
+screen	-	84	-		-	screen
+quaggavt	-	85	-		-	quagga
+sabayon	86	86	-		/sbin/nologin	sabayon
+polkituser	87	87	/		/sbin/nologin	PolicyKit
+wbpriv	-	88	-		-	samba-common
+postfix	89	89	/var/spool/postfix		/bin/true	postfix
+postdrop	-	90	-		-	postfix
+majordomo	91	91	/usr/lib/majordomo		/bin/bash	majordomo
+quagga	92	92	/		/sbin/nologin	quagga
+exim	93	93	/var/spool/exim		/sbin/nologin	exim
+distcache	94	94	/		/sbin/nologin	distcache
+radiusd	95	95	/		/bin/false	freeradius
+hsqldb	96	96	/var/lib/hsqldb		/sbin/nologin	hsqldb
+dovecot	97	97	/usr/libexec/dovecot		/sbin/nologin	dovecot
+ident	98	98	/		/sbin/nologin	ident
+nobody	99	99	/		/sbin/nologin	setup
+users	-	100	-		-	setup
+gnats	?	?	?		?	gnats, gnats-db
+listar	?	?	?		?	listar
 nfsnobody	65534	65534	/var/lib/nfs		/sbin/nologin	nfs-utils
 
 # Note: nfsnobdy is 4294967294 on 64-bit platforms (-2)

setup-2.7.4.patch:

Index: setup-2.7.4.patch
===================================================================
RCS file: /cvs/extras/rpms/setup/F-10/setup-2.7.4.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- setup-2.7.4.patch	18 Nov 2008 14:04:32 -0000	1.1
+++ setup-2.7.4.patch	30 Jan 2009 14:49:54 -0000	1.2
@@ -1,6 +1,23 @@
 diff -urNp setup-2.7.4-orig/bashrc setup-2.7.4/bashrc
 --- setup-2.7.4-orig/bashrc	2008-10-10 18:29:39.000000000 +0200
 +++ setup-2.7.4/bashrc	2008-11-14 09:37:24.000000000 +0100
+@@ -18,14 +18,14 @@ if [ "$PS1" ]; then
+ 		if [ -e /etc/sysconfig/bash-prompt-xterm ]; then
+ 			PROMPT_COMMAND=/etc/sysconfig/bash-prompt-xterm
+ 		else
+-	    	PROMPT_COMMAND='echo -ne "\033]0;${USER}@${HOSTNAME%%.*}:${PWD/#$HOME/~}"; echo -ne "\007"'
++			PROMPT_COMMAND='echo -ne "\033]0;${USER}@${HOSTNAME%%.*}:${PWD/#$HOME/~}"; echo -ne "\007"'
+ 		fi
+ 		;;
+ 	screen)
+ 		if [ -e /etc/sysconfig/bash-prompt-screen ]; then
+ 			PROMPT_COMMAND=/etc/sysconfig/bash-prompt-screen
+ 		else
+-		PROMPT_COMMAND='echo -ne "\033_${USER}@${HOSTNAME%%.*}:${PWD/#$HOME/~}"; echo -ne "\033\\"'
++			PROMPT_COMMAND='echo -ne "\033_${USER}@${HOSTNAME%%.*}:${PWD/#$HOME/~}"; echo -ne "\033\\"'
+ 		fi
+ 		;;
+ 	*)
 @@ -49,14 +49,18 @@ if ! shopt -q login_shell ; then # We're
  		fi
  	}
@@ -70,10 +87,14 @@
 diff -urNp setup-2.7.4-orig/csh.login setup-2.7.4/csh.login
 --- setup-2.7.4-orig/csh.login	2008-10-10 18:29:39.000000000 +0200
 +++ setup-2.7.4/csh.login	2008-11-14 09:49:42.000000000 +0100
-@@ -21,14 +21,16 @@ if ( ! -f $HOME/.inputrc ) then
- 	setenv INPUTRC /etc/inputrc
- endif
- 
+@@ -17,18 +17,16 @@ if ( ! -f $HOME/.inputrc ) then
+ setenv HOSTNAME `/bin/hostname`
+ set history=1000
+ 
+-if ( ! -f $HOME/.inputrc ) then
+-	setenv INPUTRC /etc/inputrc
+-endif
+-
 -if ($?prompt) then
 -	if ( -d /etc/profile.d ) then
 -	        set nonomatch
@@ -100,7 +121,7 @@
 diff -urNp setup-2.7.4-orig/profile setup-2.7.4/profile
 --- setup-2.7.4-orig/profile	2008-10-10 18:29:39.000000000 +0200
 +++ setup-2.7.4/profile	2008-11-14 12:07:36.000000000 +0100
-@@ -39,7 +39,7 @@ if [ -x /usr/bin/id ]; then
+@@ -39,20 +39,22 @@ if [ -x /usr/bin/id ]; then
  	MAIL="/var/spool/mail/$USER"
  fi
  
@@ -108,8 +129,12 @@
 +HOSTNAME=`/bin/hostname 2>/dev/null`
  HISTSIZE=1000
  
- if [ -z "$INPUTRC" -a ! -f "$HOME/.inputrc" ]; then
-@@ -50,9 +50,15 @@ export PATH USER LOGNAME MAIL HOSTNAME H
+-if [ -z "$INPUTRC" -a ! -f "$HOME/.inputrc" ]; then
+-    INPUTRC=/etc/inputrc
+-fi
+-
+-export PATH USER LOGNAME MAIL HOSTNAME HISTSIZE INPUTRC
++export PATH USER LOGNAME MAIL HOSTNAME HISTSIZE
  
  for i in /etc/profile.d/*.sh ; do
      if [ -r "$i" ]; then
@@ -138,39 +163,3 @@
  telnets		992/tcp
  telnets		992/udp
  imaps	 	993/tcp				# IMAP over SSL
-diff -urNp setup-2.7.4-orig/uidgid setup-2.7.4/uidgid
---- setup-2.7.4-orig/uidgid	2008-10-10 18:29:39.000000000 +0200
-+++ setup-2.7.4/uidgid	2008-11-18 10:58:44.000000000 +0100
-@@ -39,6 +39,7 @@ netdump		34	34	/var/crash		/bin/bash	net
- utempter	-	35	-			-		libutempter
- rpm		37	37	/var/lib/rpm		/bin/bash	rpm
- ntp		38	38	/etc/ntp		/sbin/nologin	ntp
-+video		-	39	-			-
- dip		-	40      -			-		setup
- mailman		41	41	/var/mailman		/bin/false	mailman
- gdm		42	42	/var/gdm		/bin/bash	gdm
-@@ -50,6 +51,7 @@ mailnull	47	47	/var/spool/mqueue	/dev/nu
- apache		48	48	/var/www		/bin/false	apache
- wnn		49	49	/home/wnn		/bin/bash	FreeWnn
- smmsp		51	51	/var/spool/mqueue	/dev/null	sendmail
-+puppet		52	52	/var/lib/puppet		/sbin/nologin	puppet
- tomcat	        53	53	/var/lib/tomcat		/sbin/nologin	tomcat
- lock		-	54	-			-		lockdev
- ldap		55	55	/var/lib/ldap		/bin/false	openldap-servers
-@@ -60,6 +62,7 @@ tss		59	59	-			/sbin/nologin	trousers
- piranha		60	60	/etc/sysconfig/ha	/dev/null	piranha
- prelude-manager	61	61	-			/sbin/nologin	prelude-manager
- snortd		62	62	-			/sbin/nologin	snortd
-+audio		-	63	-			-
- condor		64	64	/var/lib/condor		/sbin/nologin	condord
- wine		-	66	-			-		wine
- pegasus		66	65	/var/lib/Pegasus	/sbin/nologin	tog-pegasus
-@@ -83,7 +86,7 @@ jonas		82	82	/var/lib/jonas		/sbin/nolog
- clamav		83	83	/tmp			/sbin/nologin	clamav
- screen		-	84	-			-		screen
- quaggavt	-	85	-			-		quagga
--sabayon 	86	86	-			/sbin/nologin	sabayon
-+sabayon		86	86	-			/sbin/nologin	sabayon
- polkituser	87	-	/			/sbin/nologin	PolicyKit
- wbpriv		-	88	-			-		samba-common
- postfix		89	89	/var/spool/postfix	/bin/true	postfix


Index: setup.spec
===================================================================
RCS file: /cvs/extras/rpms/setup/F-10/setup.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- setup.spec	18 Nov 2008 14:04:32 -0000	1.61
+++ setup.spec	30 Jan 2009 14:49:54 -0000	1.62
@@ -1,15 +1,19 @@
 Summary: A set of system configuration and setup files
 Name: setup
 Version: 2.7.4
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: Public Domain
 Group: System Environment/Base
 Source: setup-%{version}.tar.bz2
+URL: https://fedorahosted.org/setup/
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 BuildRequires: bash tcsh perl
 Conflicts: initscripts < 4.26, bash <= 2.0.4-21
 Patch1: setup-2.7.4.patch
+Patch2: setup-2.7.4-uidgid.patch
+Patch3: setup-2.7.4-protocolsservices.patch
+Patch4: setup-2.7.4-rxvt.patch
 
 %description
 The setup package contains a set of important system configuration and
@@ -18,6 +22,9 @@
 %prep
 %setup -q
 %patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
 
 %build
 # Run any sanity checks.
@@ -48,7 +55,7 @@
 rm -rf %{buildroot}
 
 %files
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc uidgid
 %verify(not md5 size mtime) %config(noreplace) /etc/passwd
 %verify(not md5 size mtime) %config(noreplace) /etc/group
@@ -64,10 +71,10 @@
 %verify(not md5 size mtime) %config(noreplace) /etc/hosts.deny
 %verify(not md5 size mtime) %config(noreplace) /etc/motd
 %config(noreplace) /etc/printcap
-%config /etc/inputrc
+%config(noreplace) /etc/inputrc
 %config(noreplace) /etc/bashrc
 %config(noreplace) /etc/profile
-%config /etc/protocols
+%config(noreplace) /etc/protocols
 %attr(0600,root,root) %config(noreplace,missingok) /etc/securetty
 %config(noreplace) /etc/csh.login
 %config(noreplace) /etc/csh.cshrc
@@ -78,6 +85,18 @@
 %ghost %verify(not md5 size mtime) %config(noreplace,missingok) /etc/mtab
 
 %changelog
+* Fri Jan 30 2009 Ondrej Vasik <ovasik at redhat.com> 2.7.4-3
+- add gid 87 reservation for polkituser, add gid reservation
+  for group cdrom(:11), dialout(:18), tape(:33) , kvm (:36) ,
+  uidgid pair for pkiuser(17:17), uid for vdsm user (36:),
+  make uidgid file better parseable
+- do not export INPUTRC(to respect just created ~/.inputrc)
+- update procols to later IANA list(2008-04-18)
+- update services to later IANA list(2008-11-17)
+- add URL, few spec files fixes, mark /etc/protocols and
+  /etc/inputrc %%config(noreplace)
+- add support for ctrl+arrow keys in rxvt(#474110)
+
 * Tue Nov 18 2008 Ondrej Vasik <ovasik at redhat.com> 2.7.4-2
 - again process profile.d scripts in noninteractive shells,
   but do not display stderr/stdout messages(#457243)
@@ -206,7 +225,7 @@
 
 * Mon Jun 20 2005 Bill Nottingham <notting at redhat.com> 2.5.46-1
 - add buildrequires on bash, tcsh (#161016)
-- move core dump size setting from csh.login to csh.cshrc (#156914) 
+- move core dump size setting from csh.login to csh.cshrc (#156914)
 
 * Fri Jun 17 2005 Bill Nottingham <notting at redhat.com> 2.5.45-1
 - ksh doesn't implement EUID/UID. Work around that. (#160731)
@@ -287,7 +306,7 @@
 - allocate uid/gid for mgetty
 
 * Thu Jan  9 2003 Dan Walsh <dwalsh at redhat.com> 2.5.23-1
-- added PXE to /etc/services 
+- added PXE to /etc/services
 
 * Wed Jan  1 2003 Bill Nottingham <notting at redhat.com> 2.5.22-1
 - remove bogus entries from inputrc (#80652)
@@ -438,7 +457,7 @@
 - fix inputrc, Yet Again. (#28617)
 
 * Thu Feb 15 2001 Bill Nottingham <notting at redhat.com>
-- add in uidgid file, put it in %doc
+- add in uidgid file, put it in %%doc
 
 * Wed Feb  7 2001 Adrian Havill <havill at redhat.com>
 - bindkey for delete in the case of tcsh
@@ -468,8 +487,8 @@
   support (postfix >= 20001030-2)
 
 * Sun Aug  6 2000 Bill Nottingham <notting at redhat.com>
-- /var/log/lastlog is %config(noreplace) (#15412)
-- some of the various %verify changes (#14819)
+- /var/log/lastlog is %%config(noreplace) (#15412)
+- some of the various %%verify changes (#14819)
 
 * Thu Aug  3 2000 Nalin Dahyabhai <nalin at redhat.com>
 - linuxconf should be 98, not 99
@@ -570,10 +589,10 @@
 - added alias pointing to imap from imap2
 
 * Tue Mar 23 1999 Preston Brown <pbrown at redhat.com>
-- updated protocols/services from debian to comply with more modern 
+- updated protocols/services from debian to comply with more modern
 - IETF/RFC standards
 
-* Sun Mar 21 1999 Cristian Gafton <gafton at redhat.com> 
+* Sun Mar 21 1999 Cristian Gafton <gafton at redhat.com>
 - auto rebuild in the new build environment (release 4)
 
 * Thu Feb 18 1999 Jeff Johnson <jbj at redhat.com>
@@ -592,7 +611,7 @@
 - /etc/profile uses $i, which needs to be unset
 
 * Mon Nov 03 1997 Donnie Barnes <djb at redhat.com>
-- made /etc/passwd and /etc/group %config(noreplace)
+- made /etc/passwd and /etc/group %%config(noreplace)
 
 * Mon Oct 20 1997 Erik Troan <ewt at redhat.com>
 - removed /etc/inetd.conf, /etc/rpc



From maxamillion at fedoraproject.org  Fri Jan 30 14:51:25 2009
From: maxamillion at fedoraproject.org (Adam Miller)
Date: Fri, 30 Jan 2009 14:51:25 +0000 (UTC)
Subject: rpms/gsh/EL-5 gsh.spec, NONE, 1.1 import.log, NONE,
	1.1 pity.py.patch, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090130145125.EB4FD70117@cvs1.fedora.phx.redhat.com>

Author: maxamillion

Update of /cvs/extras/rpms/gsh/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6913/EL-5

Modified Files:
	.cvsignore sources 
Added Files:
	gsh.spec import.log pity.py.patch 
Log Message:
cvs-import of gsh 0.3-5 to EL-5





--- NEW FILE gsh.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

Name:           gsh
Version:        0.3
Release:        5%{?dist}
Summary:        Group Shell - aggregate several remote shells into one
URL:            http://guichaz.free.fr/gsh/
Source0:        http://guichaz.free.fr/gsh/files/%{name}-%{version}.tar.gz
License:        GPLv2+
Group:          Applications/Internet
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot
BuildArch:      noarch

BuildRequires:  python >= 2.4
BuildRequires:  python-devel >= 2.4
BuildRequires:  python-setuptools
Requires:       python >= 2.4

Patch0:         pity.py.patch

%description
gsh is used to launch several remote shells on many machines at the same
time and control them from a single command prompt.

%prep
%setup -q -n %{name}-%{version}
#need to get rid of the egg
rm -rf gsh.egg-info/

#apply patch to get rid of shebang from pity.py
cd gsh
%patch0 

%build
%{__python} setup.py build

%install
rm -rf $RPM_BUILD_ROOT

#! /bin/sh
#
# Copied from: http://trac.edgewall.org/ticket/1141
#
# this file is *inserted* into the install section of the generated
# spec file
#

# this is, what dist.py normally does
%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT

%clean
rm -rf $RPM_BUILD_ROOT

%files 
%defattr(-,root,root)
%{_bindir}/gsh
%{python_sitelib}/gsh/
%{python_sitelib}/gsh-*.egg-info/
%{_mandir}/man1/gsh.1.gz
%doc COPYING NEWS README

%changelog
* Thu Jan 29 2009 Adam Miller <maxamillion [AT] gmail.com> - 0.3-5
- Added a patch to remove the shebang from pity.py that rpmlint didn't like

* Thu Jan 29 2009 Adam Miller <maxamillion [AT] gmail.com> - 0.3-4
- removed unneeded second -n listing in setup macro listing

* Thu Jan 29 2009 Jochen Schmitt <Jochen herr-schmitt de> - 0.3-3
- Several fixes to get package ready to fit with python packaging guideline

* Wed Jan 28 2009 Adam Miller <maxamillion [AT] gmail.com> - 0.3-2
- Fixed rpmlint complaint, removed egg in setup, redownloaded source

* Wed Jan 28 2009 Adam Miller <maxamillion [AT] gmail.com> - 0.3-1
- First build of gsh for fedora



--- NEW FILE import.log ---
gsh-0_3-5:EL-5:gsh-0.3-5.src.rpm:1233327012

pity.py.patch:

--- NEW FILE pity.py.patch ---
--- pity.py.orig	2009-01-29 12:51:18.000000000 -0600
+++ pity.py	2009-01-29 12:51:23.000000000 -0600
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # 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


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gsh/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	30 Jan 2009 06:27:06 -0000	1.1
+++ .cvsignore	30 Jan 2009 14:50:55 -0000	1.2
@@ -0,0 +1 @@
+gsh-0.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gsh/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	30 Jan 2009 06:27:07 -0000	1.1
+++ sources	30 Jan 2009 14:50:55 -0000	1.2
@@ -0,0 +1 @@
+6b925fe21bb84606b47a9a29d1eb88fb  gsh-0.3.tar.gz



From maxamillion at fedoraproject.org  Fri Jan 30 14:53:11 2009
From: maxamillion at fedoraproject.org (Adam Miller)
Date: Fri, 30 Jan 2009 14:53:11 +0000 (UTC)
Subject: rpms/gsh/F-9 gsh.spec, NONE, 1.1 import.log, NONE, 1.1 pity.py.patch,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090130145311.1BD4070117@cvs1.fedora.phx.redhat.com>

Author: maxamillion

Update of /cvs/extras/rpms/gsh/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7835/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	gsh.spec import.log pity.py.patch 
Log Message:
cvs-upload of gsh 0.3-5 for F-9




--- NEW FILE gsh.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

Name:           gsh
Version:        0.3
Release:        5%{?dist}
Summary:        Group Shell - aggregate several remote shells into one
URL:            http://guichaz.free.fr/gsh/
Source0:        http://guichaz.free.fr/gsh/files/%{name}-%{version}.tar.gz
License:        GPLv2+
Group:          Applications/Internet
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot
BuildArch:      noarch

BuildRequires:  python >= 2.4
BuildRequires:  python-devel >= 2.4
BuildRequires:  python-setuptools
Requires:       python >= 2.4

Patch0:         pity.py.patch

%description
gsh is used to launch several remote shells on many machines at the same
time and control them from a single command prompt.

%prep
%setup -q -n %{name}-%{version}
#need to get rid of the egg
rm -rf gsh.egg-info/

#apply patch to get rid of shebang from pity.py
cd gsh
%patch0 

%build
%{__python} setup.py build

%install
rm -rf $RPM_BUILD_ROOT

#! /bin/sh
#
# Copied from: http://trac.edgewall.org/ticket/1141
#
# this file is *inserted* into the install section of the generated
# spec file
#

# this is, what dist.py normally does
%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT

%clean
rm -rf $RPM_BUILD_ROOT

%files 
%defattr(-,root,root)
%{_bindir}/gsh
%{python_sitelib}/gsh/
%{python_sitelib}/gsh-*.egg-info/
%{_mandir}/man1/gsh.1.gz
%doc COPYING NEWS README

%changelog
* Thu Jan 29 2009 Adam Miller <maxamillion [AT] gmail.com> - 0.3-5
- Added a patch to remove the shebang from pity.py that rpmlint didn't like

* Thu Jan 29 2009 Adam Miller <maxamillion [AT] gmail.com> - 0.3-4
- removed unneeded second -n listing in setup macro listing

* Thu Jan 29 2009 Jochen Schmitt <Jochen herr-schmitt de> - 0.3-3
- Several fixes to get package ready to fit with python packaging guideline

* Wed Jan 28 2009 Adam Miller <maxamillion [AT] gmail.com> - 0.3-2
- Fixed rpmlint complaint, removed egg in setup, redownloaded source

* Wed Jan 28 2009 Adam Miller <maxamillion [AT] gmail.com> - 0.3-1
- First build of gsh for fedora



--- NEW FILE import.log ---
gsh-0_3-5:F-9:gsh-0.3-5.src.rpm:1233327131

pity.py.patch:

--- NEW FILE pity.py.patch ---
--- pity.py.orig	2009-01-29 12:51:18.000000000 -0600
+++ pity.py	2009-01-29 12:51:23.000000000 -0600
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # 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


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gsh/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	30 Jan 2009 06:27:06 -0000	1.1
+++ .cvsignore	30 Jan 2009 14:52:40 -0000	1.2
@@ -0,0 +1 @@
+gsh-0.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gsh/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	30 Jan 2009 06:27:07 -0000	1.1
+++ sources	30 Jan 2009 14:52:40 -0000	1.2
@@ -0,0 +1 @@
+6b925fe21bb84606b47a9a29d1eb88fb  gsh-0.3.tar.gz



From spot at fedoraproject.org  Fri Jan 30 14:58:05 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Fri, 30 Jan 2009 14:58:05 +0000 (UTC)
Subject: rpms/generic-release/devel generic-release.spec,1.4,1.5
Message-ID: <20090130145805.6057470117@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/generic-release/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9022

Modified Files:
	generic-release.spec 
Log Message:
drop requires on system-release-notes


Index: generic-release.spec
===================================================================
RCS file: /cvs/pkgs/rpms/generic-release/devel/generic-release.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- generic-release.spec	20 Nov 2008 20:19:49 -0000	1.4
+++ generic-release.spec	30 Jan 2009 14:57:35 -0000	1.5
@@ -4,17 +4,13 @@
 Summary:	Generic release files
 Name:		generic-release
 Version:	10.90
-Release:	1
+Release:	2
 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
 Conflicts:	fedora-release
@@ -117,6 +113,9 @@
 %doc README.Generic-Release-Notes
 
 %changelog
+* Fri Jan 30 2009 Tom "spot" Callaway <tcallawa at redhat.com> 10.90-2
+- drop Requires: system-release-notes
+
 * Thu Nov 20 2008 Tom "spot" Callaway <tcallawa at redhat.com> 10.90-1
 - 10.90
 



From maxamillion at fedoraproject.org  Fri Jan 30 14:58:05 2009
From: maxamillion at fedoraproject.org (Adam Miller)
Date: Fri, 30 Jan 2009 14:58:05 +0000 (UTC)
Subject: rpms/gsh/F-10 gsh.spec, NONE, 1.1 import.log, NONE,
	1.1 pity.py.patch, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090130145805.2EFD970117@cvs1.fedora.phx.redhat.com>

Author: maxamillion

Update of /cvs/extras/rpms/gsh/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8349/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	gsh.spec import.log pity.py.patch 
Log Message:
cvs import of gsh 0.3-5 to F-10




--- NEW FILE gsh.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

Name:           gsh
Version:        0.3
Release:        5%{?dist}
Summary:        Group Shell - aggregate several remote shells into one
URL:            http://guichaz.free.fr/gsh/
Source0:        http://guichaz.free.fr/gsh/files/%{name}-%{version}.tar.gz
License:        GPLv2+
Group:          Applications/Internet
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot
BuildArch:      noarch

BuildRequires:  python >= 2.4
BuildRequires:  python-devel >= 2.4
BuildRequires:  python-setuptools
Requires:       python >= 2.4

Patch0:         pity.py.patch

%description
gsh is used to launch several remote shells on many machines at the same
time and control them from a single command prompt.

%prep
%setup -q -n %{name}-%{version}
#need to get rid of the egg
rm -rf gsh.egg-info/

#apply patch to get rid of shebang from pity.py
cd gsh
%patch0 

%build
%{__python} setup.py build

%install
rm -rf $RPM_BUILD_ROOT

#! /bin/sh
#
# Copied from: http://trac.edgewall.org/ticket/1141
#
# this file is *inserted* into the install section of the generated
# spec file
#

# this is, what dist.py normally does
%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT

%clean
rm -rf $RPM_BUILD_ROOT

%files 
%defattr(-,root,root)
%{_bindir}/gsh
%{python_sitelib}/gsh/
%{python_sitelib}/gsh-*.egg-info/
%{_mandir}/man1/gsh.1.gz
%doc COPYING NEWS README

%changelog
* Thu Jan 29 2009 Adam Miller <maxamillion [AT] gmail.com> - 0.3-5
- Added a patch to remove the shebang from pity.py that rpmlint didn't like

* Thu Jan 29 2009 Adam Miller <maxamillion [AT] gmail.com> - 0.3-4
- removed unneeded second -n listing in setup macro listing

* Thu Jan 29 2009 Jochen Schmitt <Jochen herr-schmitt de> - 0.3-3
- Several fixes to get package ready to fit with python packaging guideline

* Wed Jan 28 2009 Adam Miller <maxamillion [AT] gmail.com> - 0.3-2
- Fixed rpmlint complaint, removed egg in setup, redownloaded source

* Wed Jan 28 2009 Adam Miller <maxamillion [AT] gmail.com> - 0.3-1
- First build of gsh for fedora



--- NEW FILE import.log ---
gsh-0_3-5:F-10:gsh-0.3-5.src.rpm:1233327236

pity.py.patch:

--- NEW FILE pity.py.patch ---
--- pity.py.orig	2009-01-29 12:51:18.000000000 -0600
+++ pity.py	2009-01-29 12:51:23.000000000 -0600
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # 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


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gsh/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	30 Jan 2009 06:27:06 -0000	1.1
+++ .cvsignore	30 Jan 2009 14:57:34 -0000	1.2
@@ -0,0 +1 @@
+gsh-0.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gsh/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	30 Jan 2009 06:27:07 -0000	1.1
+++ sources	30 Jan 2009 14:57:34 -0000	1.2
@@ -0,0 +1 @@
+6b925fe21bb84606b47a9a29d1eb88fb  gsh-0.3.tar.gz



From than at fedoraproject.org  Fri Jan 30 15:03:34 2009
From: than at fedoraproject.org (Than Ngo)
Date: Fri, 30 Jan 2009 15:03:34 +0000 (UTC)
Subject: rpms/kde-l10n/devel .cvsignore, 1.18, 1.19 kde-l10n.spec, 1.70,
	1.71 sources, 1.21, 1.22 subdirs-kde-l10n, 1.13, 1.14
Message-ID: <20090130150334.CB91270117@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kde-l10n/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10306

Modified Files:
	.cvsignore kde-l10n.spec sources subdirs-kde-l10n 
Log Message:
enable he



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kde-l10n/devel/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- .cvsignore	22 Jan 2009 14:06:57 -0000	1.18
+++ .cvsignore	30 Jan 2009 15:03:04 -0000	1.19
@@ -232,3 +232,4 @@
 kde-l10n-zh_TW-4.2.0.tar.bz2
 kde-l10n-ar-4.2.0.tar.bz2
 kde-l10n-eu-4.2.0.tar.bz2
+kde-l10n-he-4.2.0.tar.bz2


Index: kde-l10n.spec
===================================================================
RCS file: /cvs/extras/rpms/kde-l10n/devel/kde-l10n.spec,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- kde-l10n.spec	26 Jan 2009 02:36:32 -0000	1.70
+++ kde-l10n.spec	30 Jan 2009 15:03:04 -0000	1.71
@@ -2,7 +2,7 @@
 
 Name: kde-l10n
 Version: 4.2.0
-Release: 1%{dist}
+Release: 2%{dist}
 Url: http://www.kde.org
 Summary: Internationalization support for KDE
 Group: User Interface/Desktops
@@ -62,6 +62,7 @@
 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
+SOurce53: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kde-l10n-he-4.2.0.tar.bz2
 
 Source1000: subdirs-kde-l10n
 
@@ -1013,12 +1014,10 @@
 %lang(gl) %{_kde4_docdir}/HTML/gl
 %lang(gl) %{_mandir}/gl/*/*
 
-%if %{buildall}
 %files Hebrew
 %defattr(-,root,root)
 %lang(he) %{_datadir}/locale/he/*
 %lang(he) %{_kde4_appsdir}/klettres/he
-%endif
 
 %files Hindi
 %defattr(-,root,root)
@@ -1326,6 +1325,9 @@
 %lang(zh_TW) %{_kde4_docdir}/HTML/zh_TW
 
 %changelog
+* Fri Jan 30 2009 Than Ngo <than at redhat.com> - 4.2.0-2
+- enable he
+
 * Thu Jan 22 2009 Than Ngo <than at redhat.com> - 4.2.0-1
 - 4.2.0
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kde-l10n/devel/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sources	24 Jan 2009 10:18:33 -0000	1.21
+++ sources	30 Jan 2009 15:03:04 -0000	1.22
@@ -44,3 +44,4 @@
 058b0bd3a7b2ca4ef56730488a234afa  kde-l10n-ar-4.2.0.tar.bz2
 5248515b294143a7821055754b9236e4  kde-l10n-eu-4.2.0.tar.bz2
 fb2e1d63d9d926c6639a537b6bf73d03  kde-l10n-et-4.2.0.tar.bz2
+e45690f965c153b2f25ebba5358d1912  kde-l10n-he-4.2.0.tar.bz2


Index: subdirs-kde-l10n
===================================================================
RCS file: /cvs/extras/rpms/kde-l10n/devel/subdirs-kde-l10n,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- subdirs-kde-l10n	24 Jan 2009 10:36:03 -0000	1.13
+++ subdirs-kde-l10n	30 Jan 2009 15:03:04 -0000	1.14
@@ -14,6 +14,7 @@
 fr
 ga
 gl
+he
 hi
 hu
 it



From dwalsh at fedoraproject.org  Fri Jan 30 15:07:15 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Fri, 30 Jan 2009 15:07:15 +0000 (UTC)
Subject: rpms/selinux-policy/devel policy-20090105.patch,1.26,1.27
Message-ID: <20090130150715.1B1B770117@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11194

Modified Files:
	policy-20090105.patch 
Log Message:
* Fri Jan 30 2009 Dan Walsh <dwalsh at redhat.com> 3.6.3-11
- Add virt_content_ro_t and labeling for isos directory


policy-20090105.patch:

Index: policy-20090105.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-20090105.patch,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- policy-20090105.patch	30 Jan 2009 14:43:04 -0000	1.26
+++ policy-20090105.patch	30 Jan 2009 15:06:44 -0000	1.27
@@ -3686,7 +3686,7 @@
  ')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/qemu.te serefpolicy-3.6.3/policy/modules/apps/qemu.te
 --- nsaserefpolicy/policy/modules/apps/qemu.te	2009-01-19 11:03:28.000000000 -0500
-+++ serefpolicy-3.6.3/policy/modules/apps/qemu.te	2009-01-30 09:22:46.000000000 -0500
++++ serefpolicy-3.6.3/policy/modules/apps/qemu.te	2009-01-30 09:57:15.000000000 -0500
 @@ -6,6 +6,8 @@
  # Declarations
  #
@@ -3784,7 +3784,7 @@
 +optional_policy(`
 +	virt_read_config(qemutype)
 +	virt_read_lib_files(qemutype)
-+	virt_read_content(qemu_type)
++	virt_read_content(qemutype)
 +')
 +
 +optional_policy(`
@@ -17625,7 +17625,7 @@
  /usr/sbin/postkick	--	gen_context(system_u:object_r:postfix_master_exec_t,s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postfix.if serefpolicy-3.6.3/policy/modules/services/postfix.if
 --- nsaserefpolicy/policy/modules/services/postfix.if	2009-01-19 11:06:49.000000000 -0500
-+++ serefpolicy-3.6.3/policy/modules/services/postfix.if	2009-01-30 08:30:01.000000000 -0500
++++ serefpolicy-3.6.3/policy/modules/services/postfix.if	2009-01-30 09:59:52.000000000 -0500
 @@ -46,6 +46,7 @@
  
  	allow postfix_$1_t postfix_etc_t:dir list_dir_perms;
@@ -17664,7 +17664,7 @@
 +		type postfix_local_t;
 +	')
 +
-+	allow $1 postfix_local_t:fifo rw_fifo_file_perms;
++	allow $1 postfix_local_t:fifo_file rw_fifo_file_perms;
 +')
 +
 +########################################
@@ -22450,7 +22450,7 @@
  ## </summary>
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/virt.te serefpolicy-3.6.3/policy/modules/services/virt.te
 --- nsaserefpolicy/policy/modules/services/virt.te	2009-01-19 11:06:49.000000000 -0500
-+++ serefpolicy-3.6.3/policy/modules/services/virt.te	2009-01-30 09:24:00.000000000 -0500
++++ serefpolicy-3.6.3/policy/modules/services/virt.te	2009-01-30 10:02:15.000000000 -0500
 @@ -32,6 +32,10 @@
  type virt_image_t, virt_image_type; # customizable
  virt_image(virt_image_t)
@@ -22476,7 +22476,7 @@
  manage_files_pattern(virtd_t, virt_image_type, virt_image_type)
  
 +manage_dirs_pattern(virtd_t, virt_content_t, virt_content_t)
-+manage_files_pattern(virtd_t, virt_content_t virt_content_t)
++manage_files_pattern(virtd_t, virt_content_t, virt_content_t)
 +
  manage_dirs_pattern(virtd_t, virt_log_t, virt_log_t)
  manage_files_pattern(virtd_t, virt_log_t, virt_log_t)



From maxamillion at fedoraproject.org  Fri Jan 30 15:08:04 2009
From: maxamillion at fedoraproject.org (Adam Miller)
Date: Fri, 30 Jan 2009 15:08:04 +0000 (UTC)
Subject: rpms/gsh/devel gsh.spec, NONE, 1.1 import.log, NONE,
	1.1 pity.py.patch, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090130150804.D925570117@cvs1.fedora.phx.redhat.com>

Author: maxamillion

Update of /cvs/extras/rpms/gsh/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11466/devel

Modified Files:
	.cvsignore sources 
Added Files:
	gsh.spec import.log pity.py.patch 
Log Message:
cvs import of gsh 0.3-5 for rawhide




--- NEW FILE gsh.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

Name:           gsh
Version:        0.3
Release:        5%{?dist}
Summary:        Group Shell - aggregate several remote shells into one
URL:            http://guichaz.free.fr/gsh/
Source0:        http://guichaz.free.fr/gsh/files/%{name}-%{version}.tar.gz
License:        GPLv2+
Group:          Applications/Internet
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot
BuildArch:      noarch

BuildRequires:  python >= 2.4
BuildRequires:  python-devel >= 2.4
BuildRequires:  python-setuptools
Requires:       python >= 2.4

Patch0:         pity.py.patch

%description
gsh is used to launch several remote shells on many machines at the same
time and control them from a single command prompt.

%prep
%setup -q -n %{name}-%{version}
#need to get rid of the egg
rm -rf gsh.egg-info/

#apply patch to get rid of shebang from pity.py
cd gsh
%patch0 

%build
%{__python} setup.py build

%install
rm -rf $RPM_BUILD_ROOT

#! /bin/sh
#
# Copied from: http://trac.edgewall.org/ticket/1141
#
# this file is *inserted* into the install section of the generated
# spec file
#

# this is, what dist.py normally does
%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT

%clean
rm -rf $RPM_BUILD_ROOT

%files 
%defattr(-,root,root)
%{_bindir}/gsh
%{python_sitelib}/gsh/
%{python_sitelib}/gsh-*.egg-info/
%{_mandir}/man1/gsh.1.gz
%doc COPYING NEWS README

%changelog
* Thu Jan 29 2009 Adam Miller <maxamillion [AT] gmail.com> - 0.3-5
- Added a patch to remove the shebang from pity.py that rpmlint didn't like

* Thu Jan 29 2009 Adam Miller <maxamillion [AT] gmail.com> - 0.3-4
- removed unneeded second -n listing in setup macro listing

* Thu Jan 29 2009 Jochen Schmitt <Jochen herr-schmitt de> - 0.3-3
- Several fixes to get package ready to fit with python packaging guideline

* Wed Jan 28 2009 Adam Miller <maxamillion [AT] gmail.com> - 0.3-2
- Fixed rpmlint complaint, removed egg in setup, redownloaded source

* Wed Jan 28 2009 Adam Miller <maxamillion [AT] gmail.com> - 0.3-1
- First build of gsh for fedora



--- NEW FILE import.log ---
gsh-0_3-5:HEAD:gsh-0.3-5.src.rpm:1233328021

pity.py.patch:

--- NEW FILE pity.py.patch ---
--- pity.py.orig	2009-01-29 12:51:18.000000000 -0600
+++ pity.py	2009-01-29 12:51:23.000000000 -0600
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # 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


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gsh/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	30 Jan 2009 06:27:06 -0000	1.1
+++ .cvsignore	30 Jan 2009 15:07:34 -0000	1.2
@@ -0,0 +1 @@
+gsh-0.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gsh/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	30 Jan 2009 06:27:07 -0000	1.1
+++ sources	30 Jan 2009 15:07:34 -0000	1.2
@@ -0,0 +1 @@
+6b925fe21bb84606b47a9a29d1eb88fb  gsh-0.3.tar.gz



From mgrepl at fedoraproject.org  Fri Jan 30 15:14:54 2009
From: mgrepl at fedoraproject.org (Miroslav Grepl)
Date: Fri, 30 Jan 2009 15:14:54 +0000 (UTC)
Subject: rpms/selinux-policy/F-9 policy-20071130.patch, 1.249,
	1.250 selinux-policy.spec, 1.734, 1.735
Message-ID: <20090130151454.1F89170117@cvs1.fedora.phx.redhat.com>

Author: mgrepl

Update of /cvs/extras/rpms/selinux-policy/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13520

Modified Files:
	policy-20071130.patch selinux-policy.spec 
Log Message:
- Fixes in libraries.fc



policy-20071130.patch:

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.249 -r 1.250 policy-20071130.patch
Index: policy-20071130.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-9/policy-20071130.patch,v
retrieving revision 1.249
retrieving revision 1.250
diff -u -r1.249 -r1.250
--- policy-20071130.patch	21 Jan 2009 11:59:11 -0000	1.249
+++ policy-20071130.patch	30 Jan 2009 15:14:48 -0000	1.250
@@ -1,12 +1,12 @@
 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-02-26 14:23:12.000000000 +0100
-+++ serefpolicy-3.3.1/config/appconfig-mcs/failsafe_context	2009-01-21 00:13:29.000000000 +0100
++++ serefpolicy-3.3.1/config/appconfig-mcs/failsafe_context	2009-01-30 11:10:04.000000000 +0100
 @@ -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	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.3.1/config/appconfig-mcs/guest_u_default_contexts	2009-01-21 00:13:29.000000000 +0100
++++ serefpolicy-3.3.1/config/appconfig-mcs/guest_u_default_contexts	2009-01-30 11:10:04.000000000 +0100
 @@ -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
@@ -16,7 +16,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-02-26 14:23:12.000000000 +0100
-+++ serefpolicy-3.3.1/config/appconfig-mcs/root_default_contexts	2009-01-21 00:13:29.000000000 +0100
++++ serefpolicy-3.3.1/config/appconfig-mcs/root_default_contexts	2009-01-30 11:10:04.000000000 +0100
 @@ -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
@@ -32,7 +32,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-02-26 14:23:12.000000000 +0100
-+++ serefpolicy-3.3.1/config/appconfig-mcs/staff_u_default_contexts	2009-01-21 00:13:29.000000000 +0100
++++ serefpolicy-3.3.1/config/appconfig-mcs/staff_u_default_contexts	2009-01-30 11:10:04.000000000 +0100
 @@ -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
@@ -44,7 +44,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	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.3.1/config/appconfig-mcs/unconfined_u_default_contexts	2009-01-21 00:13:29.000000000 +0100
++++ serefpolicy-3.3.1/config/appconfig-mcs/unconfined_u_default_contexts	2009-01-30 11:10:04.000000000 +0100
 @@ -0,0 +1,11 @@
 +system_r:crond_t:s0		unconfined_r:unconfined_t:s0
 +system_r:initrc_t:s0		unconfined_r:unconfined_t:s0
@@ -59,13 +59,13 @@
 +system_r:xdm_t:s0		unconfined_r:unconfined_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-02-26 14:23:12.000000000 +0100
-+++ serefpolicy-3.3.1/config/appconfig-mcs/userhelper_context	2009-01-21 00:13:29.000000000 +0100
++++ serefpolicy-3.3.1/config/appconfig-mcs/userhelper_context	2009-01-30 11:10:04.000000000 +0100
 @@ -1 +1 @@
 -system_u:sysadm_r:sysadm_t:s0
 +system_u:system_r:unconfined_t:s0	
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/user_u_default_contexts serefpolicy-3.3.1/config/appconfig-mcs/user_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/user_u_default_contexts	2008-02-26 14:23:12.000000000 +0100
-+++ serefpolicy-3.3.1/config/appconfig-mcs/user_u_default_contexts	2009-01-21 00:13:29.000000000 +0100
++++ serefpolicy-3.3.1/config/appconfig-mcs/user_u_default_contexts	2009-01-30 11:10:04.000000000 +0100
 @@ -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
@@ -75,7 +75,7 @@
 +user_r:user_t:s0		user_r:user_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	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.3.1/config/appconfig-mcs/x_contexts	2009-01-21 00:13:29.000000000 +0100
++++ serefpolicy-3.3.1/config/appconfig-mcs/x_contexts	2009-01-30 11:10:04.000000000 +0100
 @@ -0,0 +1,188 @@
 +#
 +# Config file for XSELinux extension
@@ -267,7 +267,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	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.3.1/config/appconfig-mcs/xguest_u_default_contexts	2009-01-21 00:13:29.000000000 +0100
++++ serefpolicy-3.3.1/config/appconfig-mcs/xguest_u_default_contexts	2009-01-30 11:10:04.000000000 +0100
 @@ -0,0 +1,7 @@
 +system_r:local_login_t	xguest_r:xguest_t:s0
 +system_r:remote_login_t	xguest_r:xguest_t:s0
@@ -278,7 +278,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	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.3.1/config/appconfig-mls/guest_u_default_contexts	2009-01-21 00:13:29.000000000 +0100
++++ serefpolicy-3.3.1/config/appconfig-mls/guest_u_default_contexts	2009-01-30 11:10:04.000000000 +0100
 @@ -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
@@ -286,7 +286,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	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.3.1/config/appconfig-mls/x_contexts	2009-01-21 00:13:29.000000000 +0100
++++ serefpolicy-3.3.1/config/appconfig-mls/x_contexts	2009-01-30 11:10:04.000000000 +0100
 @@ -0,0 +1,188 @@
 +#
 +# Config file for XSELinux extension
@@ -478,7 +478,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	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.3.1/config/appconfig-standard/guest_u_default_contexts	2009-01-21 00:13:29.000000000 +0100
++++ serefpolicy-3.3.1/config/appconfig-standard/guest_u_default_contexts	2009-01-30 11:10:04.000000000 +0100
 @@ -0,0 +1,4 @@
 +system_r:local_login_t	guest_r:guest_t
 +system_r:remote_login_t	guest_r:guest_t
@@ -486,7 +486,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-02-26 14:23:12.000000000 +0100
-+++ serefpolicy-3.3.1/config/appconfig-standard/root_default_contexts	2009-01-21 00:13:29.000000000 +0100
++++ serefpolicy-3.3.1/config/appconfig-standard/root_default_contexts	2009-01-30 11:10:04.000000000 +0100
 @@ -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
@@ -502,7 +502,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	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.3.1/config/appconfig-standard/x_contexts	2009-01-21 00:13:29.000000000 +0100
++++ serefpolicy-3.3.1/config/appconfig-standard/x_contexts	2009-01-30 11:10:04.000000000 +0100
 @@ -0,0 +1,188 @@
 +#
 +# Config file for XSELinux extension
@@ -694,7 +694,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	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.3.1/config/appconfig-standard/xguest_u_default_contexts	2009-01-21 00:13:29.000000000 +0100
++++ serefpolicy-3.3.1/config/appconfig-standard/xguest_u_default_contexts	2009-01-30 11:10:04.000000000 +0100
 @@ -0,0 +1,5 @@
 +system_r:local_login_t	xguest_r:xguest_t
 +system_r:remote_login_t	xguest_r:xguest_t
@@ -703,7 +703,7 @@
 +system_r:xdm_t		xguest_r:xguest_t
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/doc/global_booleans.xml serefpolicy-3.3.1/doc/global_booleans.xml
 --- nsaserefpolicy/doc/global_booleans.xml	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.3.1/doc/global_booleans.xml	2009-01-21 00:13:29.000000000 +0100
++++ serefpolicy-3.3.1/doc/global_booleans.xml	2009-01-30 11:10:04.000000000 +0100
 @@ -0,0 +1,25 @@
 +<bool name="secure_mode" dftval="false">
 +<desc>
@@ -732,7 +732,7 @@
 +</bool>
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/doc/global_tunables.xml serefpolicy-3.3.1/doc/global_tunables.xml
 --- nsaserefpolicy/doc/global_tunables.xml	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.3.1/doc/global_tunables.xml	2009-01-21 00:13:29.000000000 +0100
++++ serefpolicy-3.3.1/doc/global_tunables.xml	2009-01-30 11:10:04.000000000 +0100
 @@ -0,0 +1,124 @@
 +<tunable name="allow_execheap" dftval="false">
 +<desc>
@@ -860,7 +860,7 @@
 +</tunable>
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/doc/html/admin_acct.html serefpolicy-3.3.1/doc/html/admin_acct.html
 --- nsaserefpolicy/doc/html/admin_acct.html	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.3.1/doc/html/admin_acct.html	2009-01-21 00:13:29.000000000 +0100
++++ serefpolicy-3.3.1/doc/html/admin_acct.html	2009-01-30 11:10:04.000000000 +0100
 @@ -0,0 +1,376 @@
 +<html>
 +<head>
@@ -1240,7 +1240,7 @@
 +</html>
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/doc/html/admin_alsa.html serefpolicy-3.3.1/doc/html/admin_alsa.html
 --- nsaserefpolicy/doc/html/admin_alsa.html	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.3.1/doc/html/admin_alsa.html	2009-01-21 00:13:29.000000000 +0100
++++ serefpolicy-3.3.1/doc/html/admin_alsa.html	2009-01-30 11:10:04.000000000 +0100
 @@ -0,0 +1,418 @@
 +<html>
 +<head>
@@ -1662,7 +1662,7 @@
 +</html>
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/doc/html/admin_amanda.html serefpolicy-3.3.1/doc/html/admin_amanda.html
 --- nsaserefpolicy/doc/html/admin_amanda.html	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.3.1/doc/html/admin_amanda.html	2009-01-21 00:13:29.000000000 +0100
++++ serefpolicy-3.3.1/doc/html/admin_amanda.html	2009-01-30 11:10:04.000000000 +0100
 @@ -0,0 +1,581 @@
 +<html>
 +<head>
@@ -2247,7 +2247,7 @@
 +</html>
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/doc/html/admin_amtu.html serefpolicy-3.3.1/doc/html/admin_amtu.html
 --- nsaserefpolicy/doc/html/admin_amtu.html	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.3.1/doc/html/admin_amtu.html	2009-01-21 00:13:29.000000000 +0100
++++ serefpolicy-3.3.1/doc/html/admin_amtu.html	2009-01-30 11:10:04.000000000 +0100
 @@ -0,0 +1,329 @@
 +<html>
 +<head>
@@ -2580,7 +2580,7 @@
 +</html>
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/doc/html/admin_anaconda.html serefpolicy-3.3.1/doc/html/admin_anaconda.html
 --- nsaserefpolicy/doc/html/admin_anaconda.html	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.3.1/doc/html/admin_anaconda.html	2009-01-21 00:13:29.000000000 +0100
++++ serefpolicy-3.3.1/doc/html/admin_anaconda.html	2009-01-30 11:10:04.000000000 +0100
 @@ -0,0 +1,202 @@
 +<html>
[...7087 lines suppressed...]
 +policy_module(auditadm,1.0.1)
 +gen_require(`
@@ -677747,17 +677792,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	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.3.1/policy/modules/users/guest.fc	2009-01-21 00:13:29.000000000 +0100
++++ serefpolicy-3.3.1/policy/modules/users/guest.fc	2009-01-30 11:10:05.000000000 +0100
 @@ -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	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.3.1/policy/modules/users/guest.if	2009-01-21 00:13:29.000000000 +0100
++++ serefpolicy-3.3.1/policy/modules/users/guest.if	2009-01-30 11:10:05.000000000 +0100
 @@ -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	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.3.1/policy/modules/users/guest.te	2009-01-21 00:13:29.000000000 +0100
++++ serefpolicy-3.3.1/policy/modules/users/guest.te	2009-01-30 11:10:05.000000000 +0100
 @@ -0,0 +1,33 @@
 +policy_module(guest,1.0.1)
 +userdom_restricted_user_template(guest)
@@ -677794,17 +677839,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	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.3.1/policy/modules/users/logadm.fc	2009-01-21 00:13:29.000000000 +0100
++++ serefpolicy-3.3.1/policy/modules/users/logadm.fc	2009-01-30 11:10:05.000000000 +0100
 @@ -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	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.3.1/policy/modules/users/logadm.if	2009-01-21 00:13:29.000000000 +0100
++++ serefpolicy-3.3.1/policy/modules/users/logadm.if	2009-01-30 11:10:05.000000000 +0100
 @@ -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	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.3.1/policy/modules/users/logadm.te	2009-01-21 00:13:29.000000000 +0100
++++ serefpolicy-3.3.1/policy/modules/users/logadm.te	2009-01-30 11:10:05.000000000 +0100
 @@ -0,0 +1,11 @@
 +policy_module(logadm,1.0.0)
 +
@@ -677819,22 +677864,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	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.3.1/policy/modules/users/metadata.xml	2009-01-21 00:13:29.000000000 +0100
++++ serefpolicy-3.3.1/policy/modules/users/metadata.xml	2009-01-30 11:10:05.000000000 +0100
 @@ -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	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.3.1/policy/modules/users/secadm.fc	2009-01-21 00:13:29.000000000 +0100
++++ serefpolicy-3.3.1/policy/modules/users/secadm.fc	2009-01-30 11:10:05.000000000 +0100
 @@ -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	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.3.1/policy/modules/users/secadm.if	2009-01-21 00:13:29.000000000 +0100
++++ serefpolicy-3.3.1/policy/modules/users/secadm.if	2009-01-30 11:10:05.000000000 +0100
 @@ -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	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.3.1/policy/modules/users/secadm.te	2009-01-21 00:13:29.000000000 +0100
++++ serefpolicy-3.3.1/policy/modules/users/secadm.te	2009-01-30 11:10:05.000000000 +0100
 @@ -0,0 +1,39 @@
 +policy_module(secadm,1.0.1)
 +gen_require(`
@@ -677877,17 +677922,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	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.3.1/policy/modules/users/staff.fc	2009-01-21 00:13:29.000000000 +0100
++++ serefpolicy-3.3.1/policy/modules/users/staff.fc	2009-01-30 11:10:05.000000000 +0100
 @@ -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	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.3.1/policy/modules/users/staff.if	2009-01-21 00:13:29.000000000 +0100
++++ serefpolicy-3.3.1/policy/modules/users/staff.if	2009-01-30 11:10:05.000000000 +0100
 @@ -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	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.3.1/policy/modules/users/staff.te	2009-01-21 00:13:29.000000000 +0100
++++ serefpolicy-3.3.1/policy/modules/users/staff.te	2009-01-30 11:10:05.000000000 +0100
 @@ -0,0 +1,30 @@
 +policy_module(staff,1.0.1)
 +userdom_admin_login_user_template(staff)
@@ -677921,17 +677966,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	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.3.1/policy/modules/users/user.fc	2009-01-21 00:13:29.000000000 +0100
++++ serefpolicy-3.3.1/policy/modules/users/user.fc	2009-01-30 11:10:05.000000000 +0100
 @@ -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	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.3.1/policy/modules/users/user.if	2009-01-21 00:13:29.000000000 +0100
++++ serefpolicy-3.3.1/policy/modules/users/user.if	2009-01-30 11:10:05.000000000 +0100
 @@ -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	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.3.1/policy/modules/users/user.te	2009-01-21 00:13:29.000000000 +0100
++++ serefpolicy-3.3.1/policy/modules/users/user.te	2009-01-30 11:10:05.000000000 +0100
 @@ -0,0 +1,18 @@
 +policy_module(user,1.0.1)
 +userdom_unpriv_user_template(user)
@@ -677953,17 +677998,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	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.3.1/policy/modules/users/webadm.fc	2009-01-21 00:13:29.000000000 +0100
++++ serefpolicy-3.3.1/policy/modules/users/webadm.fc	2009-01-30 11:10:05.000000000 +0100
 @@ -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	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.3.1/policy/modules/users/webadm.if	2009-01-21 00:13:29.000000000 +0100
++++ serefpolicy-3.3.1/policy/modules/users/webadm.if	2009-01-30 11:10:05.000000000 +0100
 @@ -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	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.3.1/policy/modules/users/webadm.te	2009-01-21 00:13:29.000000000 +0100
++++ serefpolicy-3.3.1/policy/modules/users/webadm.te	2009-01-30 11:10:05.000000000 +0100
 @@ -0,0 +1,41 @@
 +policy_module(webadm,1.0.0)
 +
@@ -678008,17 +678053,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	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.3.1/policy/modules/users/xguest.fc	2009-01-21 00:13:29.000000000 +0100
++++ serefpolicy-3.3.1/policy/modules/users/xguest.fc	2009-01-30 11:10:05.000000000 +0100
 @@ -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	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.3.1/policy/modules/users/xguest.if	2009-01-21 00:13:29.000000000 +0100
++++ serefpolicy-3.3.1/policy/modules/users/xguest.if	2009-01-30 11:10:05.000000000 +0100
 @@ -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	1970-01-01 01:00:00.000000000 +0100
-+++ serefpolicy-3.3.1/policy/modules/users/xguest.te	2009-01-21 00:13:29.000000000 +0100
++++ serefpolicy-3.3.1/policy/modules/users/xguest.te	2009-01-30 11:10:05.000000000 +0100
 @@ -0,0 +1,69 @@
 +policy_module(xguest,1.0.1)
 +
@@ -678091,7 +678136,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-02-26 14:23:09.000000000 +0100
-+++ serefpolicy-3.3.1/policy/support/file_patterns.spt	2009-01-21 00:13:29.000000000 +0100
++++ serefpolicy-3.3.1/policy/support/file_patterns.spt	2009-01-30 11:10:05.000000000 +0100
 @@ -537,3 +537,23 @@
  	allow $1 $2:dir rw_dir_perms;
  	type_transition $1 $2:$4 $3;
@@ -678118,7 +678163,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-02-26 14:23:09.000000000 +0100
-+++ serefpolicy-3.3.1/policy/support/obj_perm_sets.spt	2009-01-21 00:13:29.000000000 +0100
++++ serefpolicy-3.3.1/policy/support/obj_perm_sets.spt	2009-01-30 11:10:05.000000000 +0100
 @@ -193,7 +193,7 @@
  define(`create_dir_perms',`{ getattr create }')
  define(`rename_dir_perms',`{ getattr rename }')
@@ -678198,7 +678243,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-02-26 14:23:12.000000000 +0100
-+++ serefpolicy-3.3.1/policy/users	2009-01-21 00:13:29.000000000 +0100
++++ serefpolicy-3.3.1/policy/users	2009-01-30 11:10:05.000000000 +0100
 @@ -16,7 +16,7 @@
  # and a user process should never be assigned the system user
  # identity.
@@ -678234,7 +678279,7 @@
 +gen_user(root, user, unconfined_r sysadm_r staff_r ifdef(`enable_mls',`secadm_r auditadm_r') system_r, s0, s0 - mls_systemhigh, mcs_allcats)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/Rules.modular serefpolicy-3.3.1/Rules.modular
 --- nsaserefpolicy/Rules.modular	2008-02-26 14:23:12.000000000 +0100
-+++ serefpolicy-3.3.1/Rules.modular	2009-01-21 00:13:29.000000000 +0100
++++ serefpolicy-3.3.1/Rules.modular	2009-01-30 11:10:05.000000000 +0100
 @@ -73,8 +73,8 @@
  $(tmpdir)/%.mod: $(m4support) $(tmpdir)/generated_definitions.conf $(tmpdir)/all_interfaces.conf %.te
  	@echo "Compliling $(NAME) $(@F) module"
@@ -678266,7 +678311,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-02-26 14:23:13.000000000 +0100
-+++ serefpolicy-3.3.1/Rules.monolithic	2009-01-21 00:13:29.000000000 +0100
++++ serefpolicy-3.3.1/Rules.monolithic	2009-01-30 11:10:05.000000000 +0100
 @@ -96,7 +96,7 @@
  #
  # Load the binary policy


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-9/selinux-policy.spec,v
retrieving revision 1.734
retrieving revision 1.735
diff -u -r1.734 -r1.735
--- selinux-policy.spec	21 Jan 2009 11:59:13 -0000	1.734
+++ selinux-policy.spec	30 Jan 2009 15:14:50 -0000	1.735
@@ -20,7 +20,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.3.1
-Release: 119%{?dist}
+Release: 120%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -56,6 +56,7 @@
 %files 
 %{_mandir}/*
 %dir %{_usr}/share/selinux
+%dir %{_usr}/share/selinux/modules
 %dir %{_sysconfdir}/selinux
 %ghost %config(noreplace) %{_sysconfdir}/selinux/config
 %ghost %{_sysconfdir}/sysconfig/selinux
@@ -207,7 +208,7 @@
 touch %{buildroot}%{_sysconfdir}/sysconfig/selinux
 
 # Always create policy module package directories
-mkdir -p %{buildroot}%{_usr}/share/selinux/{targeted,mls}/
+mkdir -p %{buildroot}%{_usr}/share/selinux/{targeted,mls,modules}/
 
 # Install devel
 make clean
@@ -443,6 +444,9 @@
 %endif
 
 %changelog
+* Fri Jan 30 2009 Miroslav Grepl <mgrepl at redhat.com> 3.3.1-120
+- Fixes in libraries.fc
+
 * Wed Jan 21 2009 Miroslav Grepl <mgrepl at redhat.com> 3.3.1-119
 - Add execstack for Podsleuth policy
 - Allow ssh read generic symbolic links in /var/lib



From rdieter at fedoraproject.org  Fri Jan 30 15:18:49 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 30 Jan 2009 15:18:49 +0000 (UTC)
Subject: rpms/koffice/devel koffice.spec,1.95,1.96
Message-ID: <20090130151850.00BC670117@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/koffice/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14465

Modified Files:
	koffice.spec 
Log Message:
%fix files
mark kexi-only Builddeps



Index: koffice.spec
===================================================================
RCS file: /cvs/pkgs/rpms/koffice/devel/koffice.spec,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -r1.95 -r1.96
--- koffice.spec	30 Jan 2009 13:40:12 -0000	1.95
+++ koffice.spec	30 Jan 2009 15:18:19 -0000	1.96
@@ -47,11 +47,13 @@
 BuildRequires: libjpeg-devel
 BuildRequires: libkdcraw-devel >= 0.2.0
 BuildRequires: libpng-devel
-BuildRequires: libpqxx-devel
 BuildRequires: libtiff-devel
 BuildRequires: libwpd-devel
 BuildRequires: libxslt-devel
+%if 0%{?kexi}
 BuildRequires: mysql-devel
+BuildRequires: libpqxx-devel
+%endif
 BuildRequires: OpenEXR-devel
 BuildRequires: perl
 BuildRequires: poppler-qt4-devel
@@ -483,7 +485,6 @@
 %{_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/



From ltinkl at fedoraproject.org  Fri Jan 30 15:21:52 2009
From: ltinkl at fedoraproject.org (Lukas Tinkl)
Date: Fri, 30 Jan 2009 15:21:52 +0000 (UTC)
Subject: rpms/kdelibs/devel kdelibs-4.2.1-kde#917170.patch, NONE,
	1.1 kdelibs-4.2.1-kde#918403.patch, NONE,
	1.1 kdelibs-4.2.1-kde#918654.patch, NONE, 1.1 kdelibs.spec,
	1.424, 1.425
Message-ID: <20090130152152.4897C70117@cvs1.fedora.phx.redhat.com>

Author: ltinkl

Update of /cvs/extras/rpms/kdelibs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15113

Modified Files:
	kdelibs.spec 
Added Files:
	kdelibs-4.2.1-kde#917170.patch kdelibs-4.2.1-kde#918403.patch 
	kdelibs-4.2.1-kde#918654.patch 
Log Message:
recent dfaure's fixes sent to @kde-packager


kdelibs-4.2.1-kde#917170.patch:

--- NEW FILE kdelibs-4.2.1-kde#917170.patch ---
Index: kio/kio/copyjob.h
===================================================================
--- kio/kio/copyjob.h	(revision 917169)
+++ kio/kio/copyjob.h	(revision 917170)
@@ -245,6 +245,7 @@
 
     protected:
         CopyJob(CopyJobPrivate &dd);
+        void emitResult();
 
     private:
         Q_PRIVATE_SLOT(d_func(), void slotStart())
Index: kio/kio/copyjob.cpp
===================================================================
--- kio/kio/copyjob.cpp	(revision 917169)
+++ kio/kio/copyjob.cpp	(revision 917170)
@@ -153,7 +153,7 @@
     QList<CopyInfo> dirs;
     KUrl::List dirsToRemove;
     KUrl::List m_srcList;
-    KUrl::List m_skippedSourceUrls;
+    KUrl::List m_successSrcList;
     KUrl::List::const_iterator m_currentStatSrc;
     bool m_bCurrentSrcIsDir;
     bool m_bCurrentOperationIsLink;
@@ -770,10 +770,6 @@
 
 void CopyJobPrivate::skip( const KUrl & sourceUrl )
 {
-    // If this is one if toplevel sources,
-    // remove it from d->m_srcList, for a correct FilesRemoved() signal
-    // But don't do it right away, we have iterators into that list (#157601)
-    m_skippedSourceUrls.append( sourceUrl );
     dirsToRemove.removeAll( sourceUrl );
 }
 
@@ -857,6 +853,7 @@
     {
         //this is required for the undo feature
         emit q->copyingDone( q, (*it).uSource, (*it).uDest, (*it).mtime, true, false );
+        m_successSrcList.append((*it).uSource);
         m_directoriesCopied.append( *it );
         dirs.erase( it );
     }
@@ -1118,6 +1115,7 @@
             emit q->copyingDone( q, (*it).uSource, (*it).uDest, (*it).mtime, false, false );
             if (m_mode == CopyJob::Move)
                 org::kde::KDirNotify::emitFileMoved( (*it).uSource.url(), (*it).uDest.url() );
+            m_successSrcList.append((*it).uSource);
         }
         // remove from list, to move on to next file
         files.erase( it );
@@ -1372,7 +1370,7 @@
         KIO::Job * newjob = 0;
         if ( m_mode == CopyJob::Link ) {
             // User requested that a symlink be made
-          JobFlags flags = bOverwrite ? Overwrite : DefaultFlags;
+            const JobFlags flags = bOverwrite ? Overwrite : DefaultFlags;
             newjob = linkNextFile(uSource, uDest, flags);
             if (!newjob)
                 return;
@@ -1384,7 +1382,7 @@
                   (uSource.pass() == uDest.pass()))
             // Copying a symlink - only on the same protocol/host/etc. (#5601, downloading an FTP file through its link),
         {
-            JobFlags flags = bOverwrite ? Overwrite : DefaultFlags;
+            const JobFlags flags = bOverwrite ? Overwrite : DefaultFlags;
             KIO::SimpleJob *newJob = KIO::symlink( (*it).linkDest, uDest, flags | HideProgressInfo /*no GUI*/ );
             Scheduler::scheduleJob(newJob);
             newjob = newJob;
@@ -1509,23 +1507,6 @@
         // but then we need to jump to the else part below. Maybe with a recursive call?
 #endif
     } else {
-        // Finished - tell the world
-        if ( !m_bOnlyRenames )
-        {
-            KUrl url( m_globalDest );
-            if ( m_globalDestinationState != DEST_IS_DIR || m_asMethod )
-                url.setPath( url.directory() );
-            //kDebug(7007) << "KDirNotify'ing FilesAdded " << url;
-            org::kde::KDirNotify::emitFilesAdded( url.url() );
-
-            Q_FOREACH(const KUrl& url, m_skippedSourceUrls)
-                m_srcList.removeAll(url);
-
-            if ( m_mode == CopyJob::Move && !m_srcList.isEmpty() ) {
-                //kDebug(7007) << "KDirNotify'ing FilesRemoved " << m_srcList.toStringList();
-                org::kde::KDirNotify::emitFilesRemoved( m_srcList.toStringList() );
-            }
-        }
         if (m_reportTimer)
             m_reportTimer->stop();
         --m_processedFiles; // undo the "start at 1" hack
@@ -1535,6 +1516,27 @@
     }
 }
 
+void CopyJob::emitResult()
+{
+    Q_D(CopyJob);
+    // Before we go, tell the world about the changes that were made.
+    // Even if some error made us abort midway, we might still have done
+    // part of the job so we better update the views! (#118583)
+    if (!d->m_bOnlyRenames) {
+        KUrl url(d->m_globalDest);
+        if (d->m_globalDestinationState != DEST_IS_DIR || d->m_asMethod)
+            url.setPath(url.directory());
+        //kDebug(7007) << "KDirNotify'ing FilesAdded " << url;
+        org::kde::KDirNotify::emitFilesAdded( url.url() );
+
+        if (d->m_mode == CopyJob::Move && !d->m_successSrcList.isEmpty()) {
+            kDebug(7007) << "KDirNotify'ing FilesRemoved" << d->m_successSrcList.toStringList();
+            org::kde::KDirNotify::emitFilesRemoved(d->m_successSrcList.toStringList());
+        }
+    }
+    Job::emitResult();
+}
+
 void CopyJobPrivate::slotProcessedSize( KJob*, qulonglong data_size )
 {
   Q_Q(CopyJob);
@@ -1801,6 +1803,7 @@
         kDebug(7007) << "Renaming succeeded, move on";
         ++m_processedFiles;
         emit q->copyingDone( q, *m_currentStatSrc, dest, -1 /*mtime unknown, and not needed*/, true, true );
+        m_successSrcList.append(*m_currentStatSrc);
         statNextSrc();
     }
 }

kdelibs-4.2.1-kde#918403.patch:

--- NEW FILE kdelibs-4.2.1-kde#918403.patch ---
Index: kinit/klauncher.cpp
===================================================================
--- kinit/klauncher.cpp	(revision 918402)
+++ kinit/klauncher.cpp	(revision 918403)
@@ -167,7 +167,7 @@
 
 KLauncher::KLauncher(int _kdeinitSocket)
   : QObject(0),
-    kdeinitSocket(_kdeinitSocket), dontBlockReading(false)
+    kdeinitSocket(_kdeinitSocket)
 {
 #ifdef Q_WS_X11
    mCached_dpy = NULL;
@@ -276,8 +276,24 @@
 {
   ssize_t result;
   int bytes_left = len;
-  while ( bytes_left > 0)
-  {
+    while (bytes_left > 0) {
+        // in case we get a request to start an application and data arrive
+        // to kdeinitSocket at the same time, requestStart() will already
+        // call slotKDEInitData(), so we must check there's still something
+        // to read, otherwise this would block
+
+        // Same thing if kdeinit dies without warning.
+
+        fd_set in;
+        timeval tm = { 30, 0 }; // 30 seconds timeout, so we're not stuck in case kdeinit dies on us
+        FD_ZERO ( &in );
+        FD_SET( sock, &in );
+        select( sock + 1, &in, 0, 0, &tm );
+        if( !FD_ISSET( sock, &in )) {
+            kDebug(7016) << "read_socket" << sock << "nothing to read, kdeinit4 must be dead";
+            return -1;
+        }
+
      result = read(sock, buffer, bytes_left);
      if (result > 0)
      {
@@ -298,21 +314,7 @@
 {
    klauncher_header request_header;
    QByteArray requestData;
-   if( dontBlockReading )
-   {
-   // in case we get a request to start an application and data arrive
-   // to kdeinitSocket at the same time, requestStart() will already
-   // call slotKDEInitData(), so we must check there's still something
-   // to read, otherwise this would block
-      fd_set in;
-      timeval tm = { 0, 0 };
-      FD_ZERO ( &in );
-      FD_SET( kdeinitSocket, &in );
-      select( kdeinitSocket + 1, &in, 0, 0, &tm );
-      if( !FD_ISSET( kdeinitSocket, &in ))
-         return;
-   }
-   dontBlockReading = false;
+
    int result = read_socket(kdeinitSocket, (char *) &request_header,
                             sizeof( request_header));
    if (result == -1)
@@ -647,17 +649,21 @@
    request_header.cmd = LAUNCHER_EXEC_NEW;
 #endif
    request_header.arg_length = requestData.length();
+
+#ifdef KLAUNCHER_VERBOSE_OUTPUT
+   kDebug(7016) << "Asking kdeinit to start" << request->name << request->arg_list
+                << "cmd=" << commandToString(request_header.cmd);
+#endif
+
    write(kdeinitSocket, &request_header, sizeof(request_header));
    write(kdeinitSocket, requestData.data(), requestData.length());
 
    // Wait for pid to return.
    lastRequest = request;
-   dontBlockReading = false;
    do {
       slotKDEInitData( kdeinitSocket );
    }
    while (lastRequest != 0);
-   dontBlockReading = true;
 #endif
 }
 

kdelibs-4.2.1-kde#918654.patch:

--- NEW FILE kdelibs-4.2.1-kde#918654.patch ---
Index: kinit/klauncher.cpp
===================================================================
--- kinit/klauncher.cpp	(revision 918653)
+++ kinit/klauncher.cpp	(revision 918654)
@@ -58,6 +58,9 @@
 
 // #define KLAUNCHER_VERBOSE_OUTPUT
 
+static const char* const s_DBusStartupTypeToString[] =
+    { "DBusNone", "DBusUnique", "DBusMulti", "DBusWait", "ERROR" };
+
 using namespace KIO;
 
 IdleSlave::IdleSlave(QObject *parent)
@@ -393,15 +396,19 @@
       if (request->pid == pid)
       {
          if (request->dbus_startup_type == KService::DBusWait)
-            request->status = KLaunchRequest::Done;
+             request->status = KLaunchRequest::Done;
          else if ((request->dbus_startup_type == KService::DBusUnique)
-                  && QDBusConnection::sessionBus().interface()->isServiceRegistered(request->dbus_name))
-            request->status = KLaunchRequest::Running;
-         else
-            request->status = KLaunchRequest::Error;
+                  && QDBusConnection::sessionBus().interface()->isServiceRegistered(request->dbus_name)) {
+             request->status = KLaunchRequest::Running;
 #ifdef KLAUNCHER_VERBOSE_OUTPUT
-         kDebug(7016) << pid << "died, requestDone. status=" << request->status;
+             kDebug(7016) << pid << "running as a unique app";
 #endif
+         } else {
+             request->status = KLaunchRequest::Error;
+#ifdef KLAUNCHER_VERBOSE_OUTPUT
+             kDebug(7016) << pid << "died, requestDone. status=" << request->status;
+#endif
+         }
          requestDone(request);
          return;
       }
@@ -446,19 +453,29 @@
       if (request->status != KLaunchRequest::Launching)
          continue;
 
+#ifdef KLAUNCHER_VERBOSE_OUTPUT
+      kDebug(7016) << "had pending request" << request->name << s_DBusStartupTypeToString[request->dbus_startup_type] << "dbus_name" << request->dbus_name << request->tolerant_dbus_name;
+#endif
       // For unique services check the requested service name first
-      if ((request->dbus_startup_type == KService::DBusUnique) &&
-          ((appId == request->dbus_name) ||
-           QDBusConnection::sessionBus().interface()->isServiceRegistered(request->dbus_name)))
-      {
-         request->status = KLaunchRequest::Running;
-         requestDone(request);
-         continue;
+      if (request->dbus_startup_type == KService::DBusUnique) {
+          if ((appId == request->dbus_name) || // just started
+              QDBusConnection::sessionBus().interface()->isServiceRegistered(request->dbus_name)) { // was already running
+              request->status = KLaunchRequest::Running;
+#ifdef KLAUNCHER_VERBOSE_OUTPUT
+              kDebug(7016) << "OK, unique app" << request->dbus_name << "is running";
+#endif
+              requestDone(request);
+              continue;
+          } else {
+#ifdef KLAUNCHER_VERBOSE_OUTPUT
+              kDebug(7016) << "unique app" << request->dbus_name << "not running yet";
+#endif
+          }
       }
 
-      const QString rAppId = request->dbus_name;
+      const QString rAppId = !request->tolerant_dbus_name.isEmpty() ? request->tolerant_dbus_name : request->dbus_name;
 #ifdef KLAUNCHER_VERBOSE_OUTPUT
-      kDebug(7016) << "had pending request" << rAppId;
+      //kDebug(7016) << "using" << rAppId << "for matching";
 #endif
       if (rAppId.isEmpty())
           continue;
@@ -818,11 +835,18 @@
                request->dbus_name = v.toString().toUtf8();
            }
            if (request->dbus_name.isEmpty()) {
-               request->dbus_name = "*." + QFile::encodeName(KRun::binaryName(service->exec(), true));
+               const QString binName = KRun::binaryName(service->exec(), true);
+               request->dbus_name = "org.kde." + binName;
+               request->tolerant_dbus_name = "*." + binName;
            }
        }
    }
 
+#ifdef KLAUNCHER_VERBOSE_OUTPUT
+   kDebug(7016) << "name=" << request->name << "dbus_name=" << request->dbus_name
+                << "startup type=" << s_DBusStartupTypeToString[request->dbus_startup_type];
+#endif
+
    request->pid = 0;
    request->envs = envs;
    send_service_startup_info( request, service, startup_id, envs );
@@ -938,7 +962,7 @@
        request->arg_list.append(arg.toLocal8Bit());
    }
 
-   request->name = app.toLocal8Bit();
+   request->name = app;
 
    if (wait)
       request->dbus_startup_type = KService::DBusWait;
@@ -1113,7 +1137,7 @@
     }
     if (mSlaveValgrind == arg1)
     {
-       arg_list.prepend(QFile::encodeName(KLibLoader::findLibrary(name.toLocal8Bit())));
+       arg_list.prepend(QFile::encodeName(KLibLoader::findLibrary(name)));
        arg_list.prepend(QFile::encodeName(KStandardDirs::locate("exe", "kioslave")));
        name = "valgrind";
        if (!mSlaveValgrindSkin.isEmpty()) {
Index: kinit/klauncher.h
===================================================================
--- kinit/klauncher.h	(revision 918653)
+++ kinit/klauncher.h	(revision 918654)
@@ -87,6 +87,7 @@
    QString name;
    QStringList arg_list;
    QString dbus_name;
+   QString tolerant_dbus_name;
    enum status_t { Init = 0, Launching, Running, Error, Done };
    pid_t pid;
    status_t status;


Index: kdelibs.spec
===================================================================
RCS file: /cvs/extras/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.424
retrieving revision 1.425
diff -u -r1.424 -r1.425
--- kdelibs.spec	30 Jan 2009 02:05:29 -0000	1.424
+++ kdelibs.spec	30 Jan 2009 15:21:21 -0000	1.425
@@ -1,6 +1,6 @@
 Summary: K Desktop Environment 4 - Libraries
 Version: 4.2.0
-Release: 5%{?dist}
+Release: 6%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs
@@ -82,6 +82,10 @@
 # upstream
 # 4.3 branch
 Patch101: kdelibs-4.1.96-AllowExternalPaths.patch
+# 4.2 branch
+Patch110: kdelibs-4.2.1-kde#917170.patch
+Patch111: kdelibs-4.2.1-kde#918403.patch
+Patch112: kdelibs-4.2.1-kde#918654.patch
 
 BuildRequires: qt4-devel >= 4.4.0
 # qt4%{_?_isa} isn't provided yet -- Rex
@@ -211,6 +215,9 @@
 
 # upstream patches
 %patch101 -p1 -b .AllowExternalPaths
+%patch110 -p1 -b .kde#917170
+%patch111 -p1 -b .kde#918403
+%patch112 -p1 -b .kde#918654
 
 
 %build
@@ -373,6 +380,15 @@
 
 
 %changelog
+* Fri Jan 30 2009 Luk???? Tinkl <ltinkl at redhat.com> 4.2.0-6
+- Emit the correct FilesRemoved signal if the job was aborted in the middle of its operation, 
+  otherwise it can result in confusion and data loss (overwriting files with files
+  that don't exist). kdebug:118593
+- Fix "klauncher hangs when kdeinit4 dies" -- this happened because
+  klauncher was doing a blocking read forever.
+- Repair klauncher support for unique-applications like konsole.
+  kdebug:162729, kdebug:75492
+
 * Fri Jan 30 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.2.0-5
 - reenable PolicyKit and NTFS workarounds
 



From erikos at fedoraproject.org  Fri Jan 30 15:26:00 2009
From: erikos at fedoraproject.org (Simon Schampijer)
Date: Fri, 30 Jan 2009 15:26:00 +0000 (UTC)
Subject: rpms/sugar-write/devel .cvsignore, 1.2, 1.3 sources, 1.2,
	1.3 sugar-write.spec, 1.2, 1.3
Message-ID: <20090130152600.E14FC70117@cvs1.fedora.phx.redhat.com>

Author: erikos

Update of /cvs/pkgs/rpms/sugar-write/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16113

Modified Files:
	.cvsignore sources sugar-write.spec 
Log Message:
* Fri Jan 30 2009 Simon Schampijer <simon at schampijer.de> - 61-1
- Make use of the ColorToolButton that benzea landed in sugar-toolkit
- Filter object chooser so it shows only images #3060
- Save to OpenDocument if we cannot export in the original format #8972
- new download url




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-write/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	18 Sep 2008 17:51:52 -0000	1.2
+++ .cvsignore	30 Jan 2009 15:25:30 -0000	1.3
@@ -1 +1 @@
-Write-59.tar.bz2
+Write-61.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-write/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	18 Sep 2008 17:51:52 -0000	1.2
+++ sources	30 Jan 2009 15:25:30 -0000	1.3
@@ -1 +1 @@
-d38e93c126f6f5ac0694fc5d727b1bdc  Write-59.tar.bz2
+c1864e24f24c5659367b561a62601eb1  Write-61.tar.bz2


Index: sugar-write.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-write/devel/sugar-write.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sugar-write.spec	1 Dec 2008 15:00:46 -0000	1.2
+++ sugar-write.spec	30 Jan 2009 15:25:30 -0000	1.3
@@ -1,11 +1,11 @@
 Name: sugar-write
-Version: 59
-Release: 2%{?dist}
+Version: 61
+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
+Source0: http://download.sugarlabs.org/sources/sucrose/fructose/Write/Write-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  python sugar-toolkit
 Requires: sugar python-telepathy
@@ -39,6 +39,12 @@
 
 
 %changelog
+* Fri Jan 30 2009 Simon Schampijer <simon at schampijer.de> - 61-1
+- Make use of the ColorToolButton that benzea landed in sugar-toolkit
+- Filter object chooser so it shows only images #3060
+- Save to OpenDocument if we cannot export in the original format #8972
+- new download url
+
 * Mon Dec 01 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 59-2
 - Rebuild for Python 2.6
 



From davej at fedoraproject.org  Fri Jan 30 15:33:23 2009
From: davej at fedoraproject.org (Dave Jones)
Date: Fri, 30 Jan 2009 15:33:23 +0000 (UTC)
Subject: rpms/midisport-firmware/devel midisport-firmware.spec,1.5,1.6
Message-ID: <20090130153323.918CB70117@cvs1.fedora.phx.redhat.com>

Author: davej

Update of /cvs/pkgs/rpms/midisport-firmware/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17607

Modified Files:
	midisport-firmware.spec 
Log Message:
Fix up path for firmware files in udev rules. (#478911)
  (diff from Patrik Elmberg)


Index: midisport-firmware.spec
===================================================================
RCS file: /cvs/pkgs/rpms/midisport-firmware/devel/midisport-firmware.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- midisport-firmware.spec	22 Aug 2008 17:19:18 -0000	1.5
+++ midisport-firmware.spec	30 Jan 2009 15:32:53 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           midisport-firmware
 Version:        1.2
-Release:        2
+Release:        4%{dist}
 Summary:        Firmware for the M-Audio/Midiman USB MIDI and Audio devices
 Group:          System Environment/Kernel
 License:        (MIT or GPLv2+) and Redistributable, no modification permitted
@@ -17,7 +17,7 @@
 %setup -q
 
 %build
-# Nothing to build
+sed -i -e 's|@fxload@|/sbin/fxload|g' -e 's|@firmwaredir@|/lib/firmware|g' 42-midisport-firmware.rules.in
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -43,6 +43,10 @@
 %config %{_sysconfdir}/udev/rules.d/42-midisport-firmware.rules
 
 %changelog
+* Thu Jan 29 2009 Dave Jones <davej at redhat.com> [1.2-4.fc11]
+- Fix up path for firmware files in udev rules. (#478911)
+  (diff from Patrik Elmberg)
+
 * Thu Aug 14 2008 Dave Jones <davej at redhat.com>
 - Use udev rules from upstream package instead of our own.
 



From erikos at fedoraproject.org  Fri Jan 30 15:34:34 2009
From: erikos at fedoraproject.org (Simon Schampijer)
Date: Fri, 30 Jan 2009 15:34:34 +0000 (UTC)
Subject: rpms/sugar-browse/devel sugar-browse.spec,1.7,1.8
Message-ID: <20090130153434.2BD0D70117@cvs1.fedora.phx.redhat.com>

Author: erikos

Update of /cvs/pkgs/rpms/sugar-browse/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17840

Modified Files:
	sugar-browse.spec 
Log Message:
* Fri Jan 30 2009 Simon Schampijer <simon at schampijer.de> - 103-5
- new download url




Index: sugar-browse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-browse/devel/sugar-browse.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sugar-browse.spec	30 Jan 2009 10:32:19 -0000	1.7
+++ sugar-browse.spec	30 Jan 2009 15:34:03 -0000	1.8
@@ -1,11 +1,11 @@
 Name: sugar-browse
 Version: 103
-Release: 4%{?dist}
+Release: 5%{?dist}
 Summary: Browse activity for Sugar
 Group: Sugar/Activities
 License: GPLv2+
 URL: http://wiki.laptop.org/go/Browse
-Source0: http://dev.laptop.org/pub/sugar/sources/web-activity/Browse-%{version}.tar.bz2
+Source0: http://download.sugarlabs.org/sources/sucrose/fructose/Browse-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: python sugar-toolkit
@@ -40,6 +40,9 @@
 
 
 %changelog
+* Fri Jan 30 2009 Simon Schampijer <simon at schampijer.de> - 103-5
+- new download url
+
 * Fri Jan 30 2009 Simon Schampijer <simon at schampijer.de> - 103-4
 - cope for removed NEWS file from sources
 



From caolanm at fedoraproject.org  Fri Jan 30 15:35:30 2009
From: caolanm at fedoraproject.org (Caolan McNamara)
Date: Fri, 30 Jan 2009 15:35:30 +0000 (UTC)
Subject: rpms/hunspell-af/devel .cvsignore, 1.3, 1.4 hunspell-af.spec, 1.7, 
	1.8 sources, 1.4, 1.5
Message-ID: <20090130153530.89D7D70117@cvs1.fedora.phx.redhat.com>

Author: caolanm

Update of /cvs/pkgs/rpms/hunspell-af/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18098

Modified Files:
	.cvsignore hunspell-af.spec sources 
Log Message:
latest version


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-af/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	9 Jul 2007 10:37:58 -0000	1.3
+++ .cvsignore	30 Jan 2009 15:35:00 -0000	1.4
@@ -1 +1 @@
-myspell-af_ZA-20060117.zip
+myspell-af_ZA-0.20080825.zip


Index: hunspell-af.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-af/devel/hunspell-af.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- hunspell-af.spec	20 Nov 2008 08:45:44 -0000	1.7
+++ hunspell-af.spec	30 Jan 2009 15:35:00 -0000	1.8
@@ -1,9 +1,9 @@
 Name: hunspell-af
 Summary: Afrikaans hunspell dictionary
-%define upstreamid 20060117
+%define upstreamid 20080825
 Version: 0.%{upstreamid}
-Release: 3%{?dist}
-Source: http://downloads.translate.org.za/spellchecker/afrikaans/myspell-af_ZA-%{upstreamid}.zip
+Release: 1%{?dist}
+Source: http://downloads.translate.org.za/spellchecker/afrikaans/myspell-af_ZA-0.%{upstreamid}.zip
 Group: Applications/Text
 URL: http://www.translate.org.za/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -42,6 +42,9 @@
 %{_datadir}/myspell/*
 
 %changelog
+* Fri Jan 30 2009 Caolan McNamara <caolanm at redhat.com> - 0.20080825-1
+- latest version
+
 * Thu Nov 20 2008 Caolan McNamara <caolanm at redhat.com> - 0.20060117-3
 - mysteriously upstream tarball of same version has extra words in it
   than our cached one


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hunspell-af/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	20 Nov 2008 08:45:44 -0000	1.4
+++ sources	30 Jan 2009 15:35:00 -0000	1.5
@@ -1 +1 @@
-6c12cd93012a04a727413d4975801604  myspell-af_ZA-20060117.zip
+3ac7922e5ca17c2fe2b8173af9547325  myspell-af_ZA-0.20080825.zip



From pkgdb at fedoraproject.org  Fri Jan 30 15:42:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 15:42:08 +0000
Subject: [pkgdb] allgeyer-fonts was added for spot
Message-ID: <20090130154209.66B25208485@bastion.fedora.phx.redhat.com>

spot has added Package allgeyer-fonts with summary Musical Notation True Type Fonts
spot has approved Package allgeyer-fonts
spot has added a Fedora devel branch for allgeyer-fonts with an owner of spot
spot has approved allgeyer-fonts in Fedora devel
spot has approved Package allgeyer-fonts
spot has set commit to Approved for provenpackager on allgeyer-fonts (Fedora devel)
spot has set build to Approved for provenpackager on allgeyer-fonts (Fedora devel)
spot has set checkout to Approved for provenpackager on allgeyer-fonts (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/allgeyer-fonts



From pkgdb at fedoraproject.org  Fri Jan 30 15:42:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 15:42:09 +0000
Subject: [pkgdb] allgeyer-fonts (Fedora, 10) updated by spot
Message-ID: <20090130154209.E20E6208493@bastion.fedora.phx.redhat.com>

spot added a Fedora 10 branch for allgeyer-fonts
spot has set commit to Approved for provenpackager on allgeyer-fonts (Fedora 10)
spot has set build to Approved for provenpackager on allgeyer-fonts (Fedora 10)
spot has set checkout to Approved for provenpackager on allgeyer-fonts (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/allgeyer-fonts



From pkgdb at fedoraproject.org  Fri Jan 30 15:42:09 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 15:42:09 +0000
Subject: [pkgdb] allgeyer-fonts (Fedora, 9) updated by spot
Message-ID: <20090130154209.EAC60208495@bastion.fedora.phx.redhat.com>

spot added a Fedora 9 branch for allgeyer-fonts
spot has set commit to Approved for provenpackager on allgeyer-fonts (Fedora 9)
spot has set build to Approved for provenpackager on allgeyer-fonts (Fedora 9)
spot has set checkout to Approved for provenpackager on allgeyer-fonts (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/allgeyer-fonts



From spot at fedoraproject.org  Fri Jan 30 15:42:28 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Fri, 30 Jan 2009 15:42:28 +0000 (UTC)
Subject: rpms/allgeyer-fonts - New directory
Message-ID: <20090130154228.66AA370117@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/allgeyer-fonts
In directory cvs1.fedora.phx.redhat.com:/home/fedora/spot/cvs/CVSROOT/admin/tmpcvsD20188/rpms/allgeyer-fonts

Log Message:
Directory /cvs/pkgs/rpms/allgeyer-fonts added to the repository




From spot at fedoraproject.org  Fri Jan 30 15:42:29 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Fri, 30 Jan 2009 15:42:29 +0000 (UTC)
Subject: rpms/allgeyer-fonts/devel - New directory
Message-ID: <20090130154229.03DC770117@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/allgeyer-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/spot/cvs/CVSROOT/admin/tmpcvsD20188/rpms/allgeyer-fonts/devel

Log Message:
Directory /cvs/pkgs/rpms/allgeyer-fonts/devel added to the repository




From spot at fedoraproject.org  Fri Jan 30 15:42:50 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Fri, 30 Jan 2009 15:42:50 +0000 (UTC)
Subject: rpms/allgeyer-fonts Makefile,NONE,1.1
Message-ID: <20090130154250.260ED70117@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/allgeyer-fonts
In directory cvs1.fedora.phx.redhat.com:/home/fedora/spot/cvs/CVSROOT/admin/tmpcvsD20188/rpms/allgeyer-fonts

Added Files:
	Makefile 
Log Message:
Setup of module allgeyer-fonts


--- NEW FILE Makefile ---
# Top level Makefile for module allgeyer-fonts
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;



From spot at fedoraproject.org  Fri Jan 30 15:42:50 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Fri, 30 Jan 2009 15:42:50 +0000 (UTC)
Subject: rpms/allgeyer-fonts/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <20090130154250.6D3FE70117@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/allgeyer-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/spot/cvs/CVSROOT/admin/tmpcvsD20188/rpms/allgeyer-fonts/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module allgeyer-fonts


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: allgeyer-fonts
# $Id: Makefile,v 1.1 2009/01/30 15:42:50 spot Exp $
NAME := allgeyer-fonts
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From pkgdb at fedoraproject.org  Fri Jan 30 15:44:48 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 15:44:48 +0000
Subject: [pkgdb] beesu was added for spot
Message-ID: <20090130154448.9BE02208484@bastion.fedora.phx.redhat.com>

spot has added Package beesu with summary Beesu is a wrapper around su
spot has approved Package beesu
spot has added a Fedora devel branch for beesu with an owner of spot
spot has approved beesu in Fedora devel
spot has approved Package beesu
spot has set commit to Approved for provenpackager on beesu (Fedora devel)
spot has set build to Approved for provenpackager on beesu (Fedora devel)
spot has set checkout to Approved for provenpackager on beesu (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/beesu



From pkgdb at fedoraproject.org  Fri Jan 30 15:44:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 15:44:50 +0000
Subject: [pkgdb] beesu (Fedora, 10) updated by spot
Message-ID: <20090130154450.148B5208486@bastion.fedora.phx.redhat.com>

spot added a Fedora 10 branch for beesu
spot has set commit to Approved for provenpackager on beesu (Fedora 10)
spot has set build to Approved for provenpackager on beesu (Fedora 10)
spot has set checkout to Approved for provenpackager on beesu (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/beesu



From pkgdb at fedoraproject.org  Fri Jan 30 15:44:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 15:44:50 +0000
Subject: [pkgdb] beesu (Fedora, 9) updated by spot
Message-ID: <20090130154450.1CC16208494@bastion.fedora.phx.redhat.com>

spot added a Fedora 9 branch for beesu
spot has set commit to Approved for provenpackager on beesu (Fedora 9)
spot has set build to Approved for provenpackager on beesu (Fedora 9)
spot has set checkout to Approved for provenpackager on beesu (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/beesu



From spot at fedoraproject.org  Fri Jan 30 15:45:03 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Fri, 30 Jan 2009 15:45:03 +0000 (UTC)
Subject: rpms/beesu - New directory
Message-ID: <20090130154503.2C6F270117@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/beesu
In directory cvs1.fedora.phx.redhat.com:/home/fedora/spot/cvs/CVSROOT/admin/tmpcvsG20910/rpms/beesu

Log Message:
Directory /cvs/pkgs/rpms/beesu added to the repository




From spot at fedoraproject.org  Fri Jan 30 15:45:03 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Fri, 30 Jan 2009 15:45:03 +0000 (UTC)
Subject: rpms/beesu/devel - New directory
Message-ID: <20090130154503.7A26470117@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/beesu/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/spot/cvs/CVSROOT/admin/tmpcvsG20910/rpms/beesu/devel

Log Message:
Directory /cvs/pkgs/rpms/beesu/devel added to the repository




From pkgdb at fedoraproject.org  Fri Jan 30 15:44:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 15:44:50 +0000
Subject: [pkgdb] beesu (Fedora EPEL, 5) updated by spot
Message-ID: <20090130154450.2FB642084A7@bastion.fedora.phx.redhat.com>

spot added a Fedora EPEL 5 branch for beesu
spot has set commit to Approved for provenpackager on beesu (Fedora EPEL 5)
spot has set build to Approved for provenpackager on beesu (Fedora EPEL 5)
spot has set checkout to Approved for provenpackager on beesu (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/beesu



From pkgdb at fedoraproject.org  Fri Jan 30 15:44:50 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 15:44:50 +0000
Subject: [pkgdb] beesu (Fedora EPEL, 4) updated by spot
Message-ID: <20090130154450.27DEC208496@bastion.fedora.phx.redhat.com>

spot added a Fedora EPEL 4 branch for beesu
spot has set commit to Approved for provenpackager on beesu (Fedora EPEL 4)
spot has set build to Approved for provenpackager on beesu (Fedora EPEL 4)
spot has set checkout to Approved for provenpackager on beesu (Fedora EPEL 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/beesu



From spot at fedoraproject.org  Fri Jan 30 15:45:21 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Fri, 30 Jan 2009 15:45:21 +0000 (UTC)
Subject: rpms/beesu Makefile,NONE,1.1
Message-ID: <20090130154521.B5C1370117@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/beesu
In directory cvs1.fedora.phx.redhat.com:/home/fedora/spot/cvs/CVSROOT/admin/tmpcvsG20910/rpms/beesu

Added Files:
	Makefile 
Log Message:
Setup of module beesu


--- NEW FILE Makefile ---
# Top level Makefile for module beesu
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout 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 Jan 30 15:45:22 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Fri, 30 Jan 2009 15:45:22 +0000 (UTC)
Subject: rpms/beesu/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <20090130154522.0DECF70117@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/beesu/devel
In directory cvs1.fedora.phx.redhat.com:/home/fedora/spot/cvs/CVSROOT/admin/tmpcvsG20910/rpms/beesu/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module beesu


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: beesu
# $Id: Makefile,v 1.1 2009/01/30 15:45:21 spot Exp $
NAME := beesu
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From tmraz at fedoraproject.org  Fri Jan 30 15:45:12 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 30 Jan 2009 15:45:12 +0000 (UTC)
Subject: rpms/openssh/devel openssh.spec,1.134,1.135
Message-ID: <20090130154512.063C870117@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/openssh/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20767

Modified Files:
	openssh.spec 
Log Message:
* Fri Jan 30 2009 Tomas Mraz <tmraz at redhat.com> - 5.1p1-6
- enable use of ssl engines (#481100)



Index: openssh.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openssh/devel/openssh.spec,v
retrieving revision 1.134
retrieving revision 1.135
diff -u -r1.134 -r1.135
--- openssh.spec	15 Jan 2009 10:52:07 -0000	1.134
+++ openssh.spec	30 Jan 2009 15:44:41 -0000	1.135
@@ -63,7 +63,7 @@
 Summary: An open source implementation of SSH protocol versions 1 and 2
 Name: openssh
 Version: 5.1p1
-Release: 5%{?dist}%{?rescue_rel}
+Release: 6%{?dist}%{?rescue_rel}
 URL: http://www.openssh.com/portable.html
 #Source0: ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-%{version}.tar.gz
 #Source1: ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-%{version}.tar.gz.asc
@@ -270,6 +270,7 @@
 	--enable-vendor-patchlevel="FC-%{version}-%{release}" \
 	--disable-strip \
 	--without-zlib-version-check \
+	--with-ssl-engine \
 %if %{nss}
 	--with-nss \
 %endif
@@ -478,6 +479,9 @@
 %endif
 
 %changelog
+* Fri Jan 30 2009 Tomas Mraz <tmraz at redhat.com> - 5.1p1-6
+- enable use of ssl engines (#481100)
+
 * Thu Jan 15 2009 Tomas Mraz <tmraz at redhat.com> - 5.1p1-5
 - remove obsolete --with-rsh (#478298)
 - add pam_sepermit to allow blocking confined users in permissive mode



From spot at fedoraproject.org  Fri Jan 30 15:48:13 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Fri, 30 Jan 2009 15:48:13 +0000 (UTC)
Subject: rpms/allgeyer-fonts/devel allgeyer-fonts.spec, NONE, 1.1 import.log,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090130154813.7201370117@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/allgeyer-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21787/devel

Modified Files:
	.cvsignore sources 
Added Files:
	allgeyer-fonts.spec import.log 
Log Message:

initial commit



--- NEW FILE allgeyer-fonts.spec ---
%define fontname allgeyer

%define common_desc \
Robert Allgeyer's MusiQwik and MusiSync are a set of original True Type fonts \
that depict musical notation. Each music font may be used within a word \
processing document without the need for special music publishing software, or\
embedded in PDF files.

Name:		%{fontname}-fonts
Summary: 	Musical Notation True Type Fonts
Version:	5.002
Release:	1%{?dist}
License:	OFL
Group:		User Interface/X
Source0:	http://www.icogitate.com/~ergosum/fonts/musiqwik_musisync_y6.zip
URL:		http://www.icogitate.com/~ergosum/fonts/musicfonts.htm
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:	noarch
BuildRequires:	fontpackages-devel
Requires:	%{name}-common = %{version}-%{release}

%description
%common_desc

%package common
Summary:	Common files for MusiSync and MusiQwik fonts (documentation...)
Group:		User Interface/X
Requires:	fontpackages-filesystem

%description common
%common_desc

This package consists of files used by other Allgeyer font packages.

%package -n %{fontname}-musisync-fonts
Summary:	A musical notation font family that provides general musical decorations
Group:		User Interface/X
Requires:	%{name}-common = %{version}-%{release}

%description -n %{fontname}-musisync-fonts
%common_desc

This font family provides a collection of general musical decorations.

%_font_pkg -n musisync MusiSync*.ttf

%package -n %{fontname}-musiqwik-fonts
Summary:	A musical notation font family intended for writing lines of actual music
Group:		User Interface/X
Requires:	%{name}-common = %{version}-%{release}

%description -n %{fontname}-musiqwik-fonts
%common_desc

This font family is intended for writing lines of actual music.

%_font_pkg -n musiqwik MusiQwik*.ttf

%prep
%setup -q -c -n %{name}

# correct end-of-line encoding
for i in OFL-FAQ.txt FONTLOG.txt SOURCE.txt README_MusiQwik_MusiSync.txt LICENSE_OFL.txt; do
	sed -i 's/\r//' $i
done

# Convert to UTF-8
iconv -f iso-8859-1 -t utf-8 -o README_MusiQwik_MusiSync.txt{.utf8,}
mv README_MusiQwik_MusiSync.txt{.utf8,}

%build

%install
rm -rf %{buildroot}
install -m 0755 -d %{buildroot}%{_fontdir}
install -m 0644 -p *.ttf %{buildroot}%{_fontdir}

%clean
rm -rf %{buildroot}

%files common
%defattr(0644,root,root,0755)
%doc FONTLOG.txt LICENSE_OFL.txt MusiQwik_character_map.htm musiqwik_demo.png 
%doc MusiSync_character_map.htm musisync_demo.png MusiSync-README.htm OFL-FAQ.txt 
%doc README_MusiQwik_MusiSync.txt SOURCE.txt
%dir %{_fontdir}

%changelog
* Thu Jan 29 2009 Tom "spot" Callaway <tcallawa at redhat.com> 5.002-1
- initial package for Fedora


--- NEW FILE import.log ---
allgeyer-fonts-5_002-1_fc11:HEAD:allgeyer-fonts-5.002-1.fc11.src.rpm:1233330319


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/allgeyer-fonts/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	30 Jan 2009 15:42:50 -0000	1.1
+++ .cvsignore	30 Jan 2009 15:47:42 -0000	1.2
@@ -0,0 +1 @@
+musiqwik_musisync_y6.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/allgeyer-fonts/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	30 Jan 2009 15:42:50 -0000	1.1
+++ sources	30 Jan 2009 15:47:43 -0000	1.2
@@ -0,0 +1 @@
+25106eaf88416df3006925b8383b7f69  musiqwik_musisync_y6.zip



From tmraz at fedoraproject.org  Fri Jan 30 15:50:50 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 30 Jan 2009 15:50:50 +0000 (UTC)
Subject: rpms/libgcrypt/F-10 hobble-libgcrypt, NONE,
	1.1 libgcrypt-1.4.4-fips-no-access.patch, NONE, 1.1 .cvsignore,
	1.12, 1.13 libgcrypt.spec, 1.32, 1.33 sources, 1.12,
	1.13 libgcrypt-1.2.2-lib64.patch, 1.1, NONE
Message-ID: <20090130155050.410CE70117@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/libgcrypt/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22344

Modified Files:
	.cvsignore libgcrypt.spec sources 
Added Files:
	hobble-libgcrypt libgcrypt-1.4.4-fips-no-access.patch 
Removed Files:
	libgcrypt-1.2.2-lib64.patch 
Log Message:
* Fri Jan 30 2009 Tomas Mraz <tmraz at redhat.com> 1.4.4-1
- update to 1.4.4
- do not abort when the fips mode kernel flag is inaccessible
  due to permissions (#470219)
- hobble the library to drop the ECC support



--- NEW FILE hobble-libgcrypt ---
#!/bin/sh

# Quit out if anything fails.
set -e -x

# Clean out patent-or-otherwise-encumbered code.
# EC:    ????????? ??/??/2015

rm -f cipher/ecc.c

libgcrypt-1.4.4-fips-no-access.patch:

--- NEW FILE libgcrypt-1.4.4-fips-no-access.patch ---
Do not abort when the fips mode flag is simply inaccessible because of
insufficient permissions.
diff -up libgcrypt-1.4.4/src/fips.c.no-access libgcrypt-1.4.4/src/fips.c
--- libgcrypt-1.4.4/src/fips.c.no-access	2009-01-29 17:37:12.000000000 +0100
+++ libgcrypt-1.4.4/src/fips.c	2009-01-29 17:37:15.000000000 +0100
@@ -155,6 +155,7 @@ _gcry_initialize_fips_mode (int force)
         fclose (fp);
       }
     else if ((saved_errno = errno) != ENOENT
+             && saved_errno != EACCES
              && !access ("/proc/version", F_OK) )
       {
         /* Problem reading the fips file despite that we have the proc


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libgcrypt/F-10/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	18 Sep 2008 15:50:08 -0000	1.12
+++ .cvsignore	30 Jan 2009 15:50:19 -0000	1.13
@@ -1,17 +1 @@
-libgcrypt-1.2.0.tar.gz
-libgcrypt-1.2.1.tar.bz2
-libgcrypt-1.2.1.tar.bz2.sig
-libgcrypt-1.2.2.tar.bz2
-libgcrypt-1.2.2.tar.bz2.sig
-libgcrypt-1.2.3.tar.bz2
-libgcrypt-1.2.3.tar.bz2.sig
-libgcrypt-1.2.4.tar.bz2
-libgcrypt-1.2.4.tar.bz2.sig
-libgcrypt-1.4.0.tar.bz2
-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
-libgcrypt-1.4.3.tar.bz2
-libgcrypt-1.4.3.tar.bz2.sig
+libgcrypt-1.4.4-hobbled.tar.bz2


Index: libgcrypt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libgcrypt/F-10/libgcrypt.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- libgcrypt.spec	21 Oct 2008 04:51:58 -0000	1.32
+++ libgcrypt.spec	30 Jan 2009 15:50:19 -0000	1.33
@@ -1,9 +1,16 @@
 Name: libgcrypt
-Version: 1.4.3
-Release: 2%{?dist}
-Source0: ftp://ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-%{version}.tar.bz2
-Source1: ftp://ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-%{version}.tar.bz2.sig
+Version: 1.4.4
+Release: 1%{?dist}
+Source0: libgcrypt-%{version}-hobbled.tar.bz2
+# The original libgcrypt sources now contain potentially patented ECC
+# cipher support. We have to remove it in the tarball we ship with
+# the hobble-libgcrypt script.
+#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
+Source3: hobble-libgcrypt
+Patch1: libgcrypt-1.4.4-fips-no-access.patch
+
 # Technically LGPLv2.1+, but Fedora's table doesn't draw a distinction.
 License: LGPLv2+
 Summary: A general-purpose cryptography library
@@ -29,13 +36,16 @@
 
 %prep
 %setup -q
+%{SOURCE3}
+%patch1 -p1 -b .no-access
 
 %build
 %configure --disable-static \
 %ifarch sparc64
      --disable-asm \
 %endif
-     --enable-noexecstack
+     --enable-noexecstack \
+     --enable-pubkey-ciphers='dsa elgamal rsa'
 make %{?_smp_mflags}
 
 %check
@@ -123,6 +133,12 @@
 %{_infodir}/gcrypt.info*
 
 %changelog
+* Fri Jan 30 2009 Tomas Mraz <tmraz at redhat.com> 1.4.4-1
+- update to 1.4.4
+- do not abort when the fips mode kernel flag is inaccessible
+  due to permissions (#470219)
+- hobble the library to drop the ECC support
+
 * Mon Oct 20 2008 Dennis Gilmore <dennis at ausil.us> 1.4.3-2
 - disable asm on sparc64
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libgcrypt/F-10/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	18 Sep 2008 15:50:08 -0000	1.12
+++ sources	30 Jan 2009 15:50:19 -0000	1.13
@@ -1,2 +1 @@
-46e50e811ed51f1e0e8dd677dded967d  libgcrypt-1.4.3.tar.bz2
-b6c8495eaeb912aa612196a849039e74  libgcrypt-1.4.3.tar.bz2.sig
+12d3fec91c663b541d63e34eabddacc5  libgcrypt-1.4.4-hobbled.tar.bz2


--- libgcrypt-1.2.2-lib64.patch DELETED ---



From erikos at fedoraproject.org  Fri Jan 30 15:53:44 2009
From: erikos at fedoraproject.org (Simon Schampijer)
Date: Fri, 30 Jan 2009 15:53:44 +0000 (UTC)
Subject: rpms/sugar-chat/devel .cvsignore, 1.2, 1.3 sources, 1.2,
	1.3 sugar-chat.spec, 1.2, 1.3
Message-ID: <20090130155344.3846470117@cvs1.fedora.phx.redhat.com>

Author: erikos

Update of /cvs/pkgs/rpms/sugar-chat/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23150

Modified Files:
	.cvsignore sources sugar-chat.spec 
Log Message:
* Fri Jan 30 2009 Simon Schampijer <simon at schampijer.de> - 62-1
- Use cjson instead of simple-json (nirbheek)
- Updated translations: he, en_US, sv
- New download url




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-chat/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	18 Sep 2008 17:50:45 -0000	1.2
+++ .cvsignore	30 Jan 2009 15:53:13 -0000	1.3
@@ -1 +1 @@
-Chat-47.tar.bz2
+Chat-62.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-chat/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	18 Sep 2008 17:50:45 -0000	1.2
+++ sources	30 Jan 2009 15:53:13 -0000	1.3
@@ -1 +1 @@
-5809289fd87fd27287467728866d3781  Chat-47.tar.bz2
+b7593ec62a8c86727e177aeb00cff708  Chat-62.tar.bz2


Index: sugar-chat.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-chat/devel/sugar-chat.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sugar-chat.spec	1 Dec 2008 15:00:44 -0000	1.2
+++ sugar-chat.spec	30 Jan 2009 15:53:13 -0000	1.3
@@ -1,11 +1,11 @@
 Name: sugar-chat
-Version: 47
-Release: 2%{?dist}
+Version: 62
+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
+Source0: http://download.sugarlabs.org/sources/sucrose/fructose/Chat/Chat-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  python sugar-toolkit
 Requires: sugar python-telepathy
@@ -38,6 +38,11 @@
 
 
 %changelog
+* Fri Jan 30 2009 Simon Schampijer <simon at schampijer.de> - 62-1
+- Use cjson instead of simple-json (nirbheek)
+- Updated translations: he, en_US, sv
+- New download url
+
 * Mon Dec 01 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 47-2
 - Rebuild for Python 2.6
 



From spot at fedoraproject.org  Fri Jan 30 15:56:34 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Fri, 30 Jan 2009 15:56:34 +0000 (UTC)
Subject: rpms/allgeyer-fonts/F-10 allgeyer-fonts.spec, NONE, 1.1 sources, 1.1,
	1.2
Message-ID: <20090130155635.0FBCC70117@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/allgeyer-fonts/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23857/F-10

Modified Files:
	sources 
Added Files:
	allgeyer-fonts.spec 
Log Message:
initial branching


--- NEW FILE allgeyer-fonts.spec ---
%define fontname allgeyer

%define common_desc \
Robert Allgeyer's MusiQwik and MusiSync are a set of original True Type fonts \
that depict musical notation. Each music font may be used within a word \
processing document without the need for special music publishing software, or\
embedded in PDF files.

Name:		%{fontname}-fonts
Summary: 	Musical Notation True Type Fonts
Version:	5.002
Release:	1%{?dist}
License:	OFL
Group:		User Interface/X
Source0:	http://www.icogitate.com/~ergosum/fonts/musiqwik_musisync_y6.zip
URL:		http://www.icogitate.com/~ergosum/fonts/musicfonts.htm
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:	noarch
BuildRequires:	fontpackages-devel
Requires:	%{name}-common = %{version}-%{release}

%description
%common_desc

%package common
Summary:	Common files for MusiSync and MusiQwik fonts (documentation...)
Group:		User Interface/X
Requires:	fontpackages-filesystem

%description common
%common_desc

This package consists of files used by other Allgeyer font packages.

%package -n %{fontname}-musisync-fonts
Summary:	A musical notation font family that provides general musical decorations
Group:		User Interface/X
Requires:	%{name}-common = %{version}-%{release}

%description -n %{fontname}-musisync-fonts
%common_desc

This font family provides a collection of general musical decorations.

%_font_pkg -n musisync MusiSync*.ttf

%package -n %{fontname}-musiqwik-fonts
Summary:	A musical notation font family intended for writing lines of actual music
Group:		User Interface/X
Requires:	%{name}-common = %{version}-%{release}

%description -n %{fontname}-musiqwik-fonts
%common_desc

This font family is intended for writing lines of actual music.

%_font_pkg -n musiqwik MusiQwik*.ttf

%prep
%setup -q -c -n %{name}

# correct end-of-line encoding
for i in OFL-FAQ.txt FONTLOG.txt SOURCE.txt README_MusiQwik_MusiSync.txt LICENSE_OFL.txt; do
	sed -i 's/\r//' $i
done

# Convert to UTF-8
iconv -f iso-8859-1 -t utf-8 -o README_MusiQwik_MusiSync.txt{.utf8,}
mv README_MusiQwik_MusiSync.txt{.utf8,}

%build

%install
rm -rf %{buildroot}
install -m 0755 -d %{buildroot}%{_fontdir}
install -m 0644 -p *.ttf %{buildroot}%{_fontdir}

%clean
rm -rf %{buildroot}

%files common
%defattr(0644,root,root,0755)
%doc FONTLOG.txt LICENSE_OFL.txt MusiQwik_character_map.htm musiqwik_demo.png 
%doc MusiSync_character_map.htm musisync_demo.png MusiSync-README.htm OFL-FAQ.txt 
%doc README_MusiQwik_MusiSync.txt SOURCE.txt
%dir %{_fontdir}

%changelog
* Thu Jan 29 2009 Tom "spot" Callaway <tcallawa at redhat.com> 5.002-1
- initial package for Fedora


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/allgeyer-fonts/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	30 Jan 2009 15:42:50 -0000	1.1
+++ sources	30 Jan 2009 15:56:04 -0000	1.2
@@ -0,0 +1 @@
+25106eaf88416df3006925b8383b7f69  musiqwik_musisync_y6.zip



From spot at fedoraproject.org  Fri Jan 30 15:56:35 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Fri, 30 Jan 2009 15:56:35 +0000 (UTC)
Subject: rpms/allgeyer-fonts/F-9 allgeyer-fonts.spec, NONE, 1.1 sources, 1.1,
	1.2
Message-ID: <20090130155635.38C2C70141@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/allgeyer-fonts/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23857/F-9

Modified Files:
	sources 
Added Files:
	allgeyer-fonts.spec 
Log Message:
initial branching


--- NEW FILE allgeyer-fonts.spec ---
%define fontname allgeyer

%define common_desc \
Robert Allgeyer's MusiQwik and MusiSync are a set of original True Type fonts \
that depict musical notation. Each music font may be used within a word \
processing document without the need for special music publishing software, or\
embedded in PDF files.

Name:		%{fontname}-fonts
Summary: 	Musical Notation True Type Fonts
Version:	5.002
Release:	1%{?dist}
License:	OFL
Group:		User Interface/X
Source0:	http://www.icogitate.com/~ergosum/fonts/musiqwik_musisync_y6.zip
URL:		http://www.icogitate.com/~ergosum/fonts/musicfonts.htm
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:	noarch
BuildRequires:	fontpackages-devel
Requires:	%{name}-common = %{version}-%{release}

%description
%common_desc

%package common
Summary:	Common files for MusiSync and MusiQwik fonts (documentation...)
Group:		User Interface/X
Requires:	fontpackages-filesystem

%description common
%common_desc

This package consists of files used by other Allgeyer font packages.

%package -n %{fontname}-musisync-fonts
Summary:	A musical notation font family that provides general musical decorations
Group:		User Interface/X
Requires:	%{name}-common = %{version}-%{release}

%description -n %{fontname}-musisync-fonts
%common_desc

This font family provides a collection of general musical decorations.

%_font_pkg -n musisync MusiSync*.ttf

%package -n %{fontname}-musiqwik-fonts
Summary:	A musical notation font family intended for writing lines of actual music
Group:		User Interface/X
Requires:	%{name}-common = %{version}-%{release}

%description -n %{fontname}-musiqwik-fonts
%common_desc

This font family is intended for writing lines of actual music.

%_font_pkg -n musiqwik MusiQwik*.ttf

%prep
%setup -q -c -n %{name}

# correct end-of-line encoding
for i in OFL-FAQ.txt FONTLOG.txt SOURCE.txt README_MusiQwik_MusiSync.txt LICENSE_OFL.txt; do
	sed -i 's/\r//' $i
done

# Convert to UTF-8
iconv -f iso-8859-1 -t utf-8 -o README_MusiQwik_MusiSync.txt{.utf8,}
mv README_MusiQwik_MusiSync.txt{.utf8,}

%build

%install
rm -rf %{buildroot}
install -m 0755 -d %{buildroot}%{_fontdir}
install -m 0644 -p *.ttf %{buildroot}%{_fontdir}

%clean
rm -rf %{buildroot}

%files common
%defattr(0644,root,root,0755)
%doc FONTLOG.txt LICENSE_OFL.txt MusiQwik_character_map.htm musiqwik_demo.png 
%doc MusiSync_character_map.htm musisync_demo.png MusiSync-README.htm OFL-FAQ.txt 
%doc README_MusiQwik_MusiSync.txt SOURCE.txt
%dir %{_fontdir}

%changelog
* Thu Jan 29 2009 Tom "spot" Callaway <tcallawa at redhat.com> 5.002-1
- initial package for Fedora


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/allgeyer-fonts/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	30 Jan 2009 15:42:50 -0000	1.1
+++ sources	30 Jan 2009 15:56:04 -0000	1.2
@@ -0,0 +1 @@
+25106eaf88416df3006925b8383b7f69  musiqwik_musisync_y6.zip



From akurtakov at fedoraproject.org  Fri Jan 30 15:56:52 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Fri, 30 Jan 2009 15:56:52 +0000 (UTC)
Subject: rpms/wsdl4j/devel wsdl4j-MANIFEST.MF, NONE, 1.1 wsdl4j.spec, 1.18,
	1.19
Message-ID: <20090130155652.A3EE770117@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/wsdl4j/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23984/devel

Modified Files:
	wsdl4j.spec 
Added Files:
	wsdl4j-MANIFEST.MF 
Log Message:
Add osgi manifest for eclipse-dtp.


--- NEW FILE wsdl4j-MANIFEST.MF ---
Manifest-Version: 1.0
Bundle-SymbolicName: javax.wsdl
Specification-Version: 1.2
Bundle-ManifestVersion: 2
Specification-Title: JWSDL
Bundle-Version: 1.4.9.v200806030405
Bundle-Vendor: %Bundle-Vendor.0
Implementation-Vendor: IBM
Ant-Version: Apache Ant 1.6.5
Bundle-RequiredExecutionEnvironment: J2SE-1.2
Created-By: 1.4.1 (IBM Corporation)
Bundle-Localization: plugin
Bundle-Name: %Bundle-Name.0
Specification-Vendor: IBM (Java Community Process)
Implementation-Version: 1.6
Bundle-ClassPath: .
Implementation-Title: WSDL4J
Export-Package: com.ibm.wsdl,com.ibm.wsdl.extensions,com.ibm.wsdl.exte
 nsions.http,com.ibm.wsdl.extensions.mime,com.ibm.wsdl.extensions.sche
 ma,com.ibm.wsdl.extensions.soap,com.ibm.wsdl.extensions.soap12,com.ib
 m.wsdl.factory,com.ibm.wsdl.util,com.ibm.wsdl.util.xml,com.ibm.wsdl.x
 ml,javax.wsdl,javax.wsdl.extensions,javax.wsdl.extensions.http,javax.
 wsdl.extensions.mime,javax.wsdl.extensions.schema,javax.wsdl.extensio
 ns.soap,javax.wsdl.extensions.soap12,javax.wsdl.factory,javax.wsdl.xm
 l


Index: wsdl4j.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wsdl4j/devel/wsdl4j.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- wsdl4j.spec	10 Jul 2008 19:52:58 -0000	1.18
+++ wsdl4j.spec	30 Jan 2009 15:56:22 -0000	1.19
@@ -39,7 +39,7 @@
 Summary:        Web Services Description Language Toolkit for Java
 Name:           wsdl4j
 Version:        1.5.2
-Release:        5.4%{?dist}
+Release:        5.5%{?dist}
 Epoch:          0
 Group:          Text Processing/Markup/XML
 License:        CPL
@@ -50,6 +50,7 @@
 Source0:        wsdl4j-%{version}-src-RHCLEAN.tar.gz
 ##cvs -d:pserver:anonymous at cvs.sourceforge.net:/cvsroot/wsdl4j login
 ##cvs -z3 -d:pserver:anonymous at cvs.sourceforge.net:/cvsroot/wsdl4j export -r wsdl4j-1_5_2 wsdl4j
+Source1:        %{name}-MANIFEST.MF
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires:       jaxp_parser_impl, java
 BuildRequires:  ant, ant-junit, java-devel
@@ -90,6 +91,12 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 
+# inject OSGi manifests
+mkdir -p META-INF
+cp -p %{SOURCE1} META-INF/MANIFEST.MF
+touch META-INF/MANIFEST.MF
+zip -u build/lib/%{name}.jar META-INF/MANIFEST.MF
+
 # jars
 install -d -m 0755 $RPM_BUILD_ROOT%{_javadir}
 
@@ -153,6 +160,9 @@
 %ghost %{_javadocdir}/%{name}
 
 %changelog
+* Fri Jan 30 2009 Alexander Kurtakov <akurtako at redhat.com> 0:1.5.2-5.5
+- Add osgi manifest for eclipse-dtp.
+
 * Thu Jul 10 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0:1.5.2-5.4
 - drop repotag
 
@@ -200,5 +210,5 @@
 - 1.4
 - update for JPackage 1.5
 
-* Sat Sep  7 2002 Ville Skytt? <ville.skytta at iki.fi> 1.1-1jpp
+* Sat Sep  7 2002 Ville Skytt??? <ville.skytta at iki.fi> 1.1-1jpp
 - First JPackage release.



From tmraz at fedoraproject.org  Fri Jan 30 15:58:08 2009
From: tmraz at fedoraproject.org (=?utf-8?b?VG9tw6HFoSBNcsOheg==?=)
Date: Fri, 30 Jan 2009 15:58:08 +0000 (UTC)
Subject: rpms/libgcrypt/F-9 hobble-libgcrypt, NONE,
	1.1 libgcrypt-1.4.4-fips-no-access.patch, NONE, 1.1 .cvsignore,
	1.9, 1.10 libgcrypt.spec, 1.28, 1.29 sources, 1.9,
	1.10 libgcrypt-1.2.2-lib64.patch, 1.1,
	NONE libgcrypt-1.4.0-randinit.patch, 1.1, NONE
Message-ID: <20090130155808.A6F2470117@cvs1.fedora.phx.redhat.com>

Author: tmraz

Update of /cvs/pkgs/rpms/libgcrypt/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24419

Modified Files:
	.cvsignore libgcrypt.spec sources 
Added Files:
	hobble-libgcrypt libgcrypt-1.4.4-fips-no-access.patch 
Removed Files:
	libgcrypt-1.2.2-lib64.patch libgcrypt-1.4.0-randinit.patch 
Log Message:
* Fri Jan 30 2009 Tomas Mraz <tmraz at redhat.com> 1.4.4-1
- update to 1.4.4
- do not abort when the fips mode kernel flag is inaccessible
  due to permissions (#470219)
- hobble the library to drop the ECC support



--- NEW FILE hobble-libgcrypt ---
#!/bin/sh

# Quit out if anything fails.
set -e -x

# Clean out patent-or-otherwise-encumbered code.
# EC:    ????????? ??/??/2015

rm -f cipher/ecc.c

libgcrypt-1.4.4-fips-no-access.patch:

--- NEW FILE libgcrypt-1.4.4-fips-no-access.patch ---
Do not abort when the fips mode flag is simply inaccessible because of
insufficient permissions.
diff -up libgcrypt-1.4.4/src/fips.c.no-access libgcrypt-1.4.4/src/fips.c
--- libgcrypt-1.4.4/src/fips.c.no-access	2009-01-29 17:37:12.000000000 +0100
+++ libgcrypt-1.4.4/src/fips.c	2009-01-29 17:37:15.000000000 +0100
@@ -155,6 +155,7 @@ _gcry_initialize_fips_mode (int force)
         fclose (fp);
       }
     else if ((saved_errno = errno) != ENOENT
+             && saved_errno != EACCES
              && !access ("/proc/version", F_OK) )
       {
         /* Problem reading the fips file despite that we have the proc


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libgcrypt/F-9/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	10 Dec 2007 21:10:52 -0000	1.9
+++ .cvsignore	30 Jan 2009 15:57:37 -0000	1.10
@@ -1,11 +1 @@
-libgcrypt-1.2.0.tar.gz
-libgcrypt-1.2.1.tar.bz2
-libgcrypt-1.2.1.tar.bz2.sig
-libgcrypt-1.2.2.tar.bz2
-libgcrypt-1.2.2.tar.bz2.sig
-libgcrypt-1.2.3.tar.bz2
-libgcrypt-1.2.3.tar.bz2.sig
-libgcrypt-1.2.4.tar.bz2
-libgcrypt-1.2.4.tar.bz2.sig
-libgcrypt-1.4.0.tar.bz2
-libgcrypt-1.4.0.tar.bz2.sig
+libgcrypt-1.4.4-hobbled.tar.bz2


Index: libgcrypt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libgcrypt/F-9/libgcrypt.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- libgcrypt.spec	21 Oct 2008 04:48:26 -0000	1.28
+++ libgcrypt.spec	30 Jan 2009 15:57:37 -0000	1.29
@@ -1,14 +1,21 @@
 Name: libgcrypt
-Version: 1.4.0
-Release: 4
-Source0: ftp://ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-%{version}.tar.bz2
-Source1: ftp://ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-%{version}.tar.bz2.sig
+Version: 1.4.4
+Release: 1%{?dist}
+Source0: libgcrypt-%{version}-hobbled.tar.bz2
+# The original libgcrypt sources now contain potentially patented ECC
+# cipher support. We have to remove it in the tarball we ship with
+# the hobble-libgcrypt script.
+#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
-Patch0: libgcrypt-1.4.0-randinit.patch
+Source3: hobble-libgcrypt
+Patch1: libgcrypt-1.4.4-fips-no-access.patch
+
+# 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 pkgconfig
+BuildRequires: gawk, libgpg-error-devel >= 1.4, pkgconfig
 Group: System Environment/Libraries
 
 %package devel
@@ -29,15 +36,17 @@
 
 %prep
 %setup -q
-%patch0 -p0 -b .randinit
+%{SOURCE3}
+%patch1 -p1 -b .no-access
 
 %build
 %configure --disable-static \
 %ifarch sparc64
      --disable-asm \
 %endif
-     --enable-noexecstack
-make
+     --enable-noexecstack \
+     --enable-pubkey-ciphers='dsa elgamal rsa'
+make %{?_smp_mflags}
 
 %check
 make check
@@ -84,6 +93,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
 
@@ -103,6 +116,7 @@
 
 %files
 %defattr(-,root,root)
+%dir /etc/gcrypt
 /%{_lib}/*.so.*
 #%{_libdir}/%{name}
 
@@ -110,6 +124,7 @@
 %defattr(-,root,root)
 %{_bindir}/%{name}-config
 %{_bindir}/dumpsexp
+%{_bindir}/hmac256
 %{_includedir}/*
 %{_libdir}/*.so
 %{_datadir}/aclocal/*
@@ -118,9 +133,31 @@
 %{_infodir}/gcrypt.info*
 
 %changelog
-* Tue Oct 14 2008 Dennis Gilmore <dennis at ausil.us> 1.4.0-4
+* Fri Jan 30 2009 Tomas Mraz <tmraz at redhat.com> 1.4.4-1
+- update to 1.4.4
+- do not abort when the fips mode kernel flag is inaccessible
+  due to permissions (#470219)
+- hobble the library to drop the ECC support
+
+* Mon Oct 20 2008 Dennis Gilmore <dennis at ausil.us> 1.4.3-2
 - disable asm on sparc64
 
+* 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)
+
+* 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
+  by the configure script
+
 * Thu Apr  3 2008 Joe Orton <jorton at redhat.com> 1.4.0-3
 - add patch from upstream to fix severe performance regression
   in entropy gathering


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libgcrypt/F-9/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	10 Dec 2007 21:10:52 -0000	1.9
+++ sources	30 Jan 2009 15:57:38 -0000	1.10
@@ -1,2 +1 @@
-b013f798a1088afb07336bce5a9c24c5  libgcrypt-1.4.0.tar.bz2
-43e1b54d34732709bbec024512224450  libgcrypt-1.4.0.tar.bz2.sig
+12d3fec91c663b541d63e34eabddacc5  libgcrypt-1.4.4-hobbled.tar.bz2


--- libgcrypt-1.2.2-lib64.patch DELETED ---


--- libgcrypt-1.4.0-randinit.patch DELETED ---



From erikos at fedoraproject.org  Fri Jan 30 15:58:37 2009
From: erikos at fedoraproject.org (Simon Schampijer)
Date: Fri, 30 Jan 2009 15:58:37 +0000 (UTC)
Subject: rpms/sugar-calculator/devel .cvsignore, 1.2, 1.3 sources, 1.2,
	1.3 sugar-calculator.spec, 1.2, 1.3
Message-ID: <20090130155837.9BD1B70117@cvs1.fedora.phx.redhat.com>

Author: erikos

Update of /cvs/pkgs/rpms/sugar-calculator/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24598

Modified Files:
	.cvsignore sources sugar-calculator.spec 
Log Message:
* Fri Jan 30 2009 Simon Schampijer <simon at schampijer.de> - 28-1
- Support 'real' scientific notation (#4250)
- Add switching between exponential/scientific notation
- Allow changing of number of displayed digits
- Change cursor on equations to Hand (#6612)
- Fix fall-through of unhandled CTRL keys (eg CTRL+Q)
- Add recursion detection
- Fixed error-handling bug
- New download url




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-calculator/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	18 Sep 2008 17:50:54 -0000	1.2
+++ .cvsignore	30 Jan 2009 15:58:07 -0000	1.3
@@ -1 +1 @@
-Calculate-23.tar.bz2
+Calculate-28.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-calculator/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	18 Sep 2008 17:50:54 -0000	1.2
+++ sources	30 Jan 2009 15:58:07 -0000	1.3
@@ -1 +1 @@
-e708a969301ed8d800e2f7945930f522  Calculate-23.tar.bz2
+efabe58639b9a0273bf2c9ee88499bdb  Calculate-28.tar.bz2


Index: sugar-calculator.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-calculator/devel/sugar-calculator.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sugar-calculator.spec	1 Dec 2008 15:00:43 -0000	1.2
+++ sugar-calculator.spec	30 Jan 2009 15:58:07 -0000	1.3
@@ -1,11 +1,11 @@
 Name: sugar-calculator
-Version: 23
-Release: 2%{?dist}
+Version: 28
+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
+Source0: http://download.sugarlabs.org/sources/sucrose/fructose/Calculate/Calculate-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  python sugar-toolkit
 Requires: sugar
@@ -41,6 +41,16 @@
 
 
 %changelog
+* Fri Jan 30 2009 Simon Schampijer <simon at schampijer.de> - 28-1
+- Support 'real' scientific notation (#4250)
+- Add switching between exponential/scientific notation
+- Allow changing of number of displayed digits
+- Change cursor on equations to Hand (#6612)
+- Fix fall-through of unhandled CTRL keys (eg CTRL+Q)
+- Add recursion detection
+- Fixed error-handling bug
+- New download url
+
 * Mon Dec 01 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 23-2
 - Rebuild for Python 2.6
 



From notting at fedoraproject.org  Fri Jan 30 16:10:51 2009
From: notting at fedoraproject.org (Bill Nottingham)
Date: Fri, 30 Jan 2009 16:10:51 +0000 (UTC)
Subject: comps comps-f11.xml.in,1.91,1.92
Message-ID: <20090130161051.48FDE70141@cvs1.fedora.phx.redhat.com>

Author: notting

Update of /cvs/extras/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27168

Modified Files:
	comps-f11.xml.in 
Log Message:
Use system-release-notes, not fedora-release-notes. (#483019)




Index: comps-f11.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-f11.xml.in,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -r1.91 -r1.92
--- comps-f11.xml.in	30 Jan 2009 08:38:06 -0000	1.91
+++ comps-f11.xml.in	30 Jan 2009 16:10:19 -0000	1.92
@@ -212,7 +212,6 @@
       <packagereq type="default">dump</packagereq>
       <packagereq type="default">eject</packagereq>
       <packagereq type="default">fbset</packagereq>
-      <packagereq type="default">fedora-release-notes</packagereq>
       <packagereq type="default">finger</packagereq>
       <packagereq type="default">fprintd-pam</packagereq>
       <packagereq type="default">ftp</packagereq>
@@ -267,6 +266,7 @@
       <packagereq type="default">sysreport</packagereq>
       <packagereq type="default">system-config-firewall-tui</packagereq>
       <packagereq type="default">system-config-network-tui</packagereq>
+      <packagereq type="default">system-release-notes</packagereq>
       <packagereq type="default">talk</packagereq>
       <packagereq type="default">tcpdump</packagereq>
       <packagereq type="default">tcp_wrappers</packagereq>



From spot at fedoraproject.org  Fri Jan 30 16:14:34 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Fri, 30 Jan 2009 16:14:34 +0000 (UTC)
Subject: rpms/beesu/devel beesu.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090130161434.BE08370117@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/beesu/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28772/devel

Modified Files:
	.cvsignore sources 
Added Files:
	beesu.spec import.log 
Log Message:

Initial import



--- NEW FILE beesu.spec ---
Name: beesu
Version: 2.1
Release: 1%{?dist}
Summary: Bee's installer script for beesu
URL: http://forums.fedoraforum.org/showthread.php?t=201579
Group: Applications/System
License: GPLv2+
Source0: http://spot.fedorapeople.org/%{name}/%{name}-%{version}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
Requires: pam, usermode

%description
Beesu is a wrapper around su and works with consolehelper under
Fedora to let you have a graphic interface like gksu.

%prep
%setup -q
# Should be fixed in next release
sed -i 's|LDFLAGS = -s|LDFLAGS =|g' Makefile

%build
make CFLAGS="%{optflags}"

%install
rm -rf %{buildroot}
mkdir -p %{buildroot}%{_datadir}/%{name}

make DESTDIR=%{buildroot} install

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc COPYING README
%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/%{name}.conf
%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/pam.d/%{name}
%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/security/console.apps/%{name}
%{_sbindir}/%{name}
%{_bindir}/%{name}
%{_mandir}/man1/%{name}.1.gz

%changelog
* Thu Jan 29 2009 Tom "spot" Callaway <tcallawa at redhat.com> 2.1-1
- slight package cleanup from Bee

* Fri Nov 28 2008 Bee <http://forums.fedoraforum.org/member.php?u=119750> 2.0-1
- new RPMs for Fedora 10 and some source clean up.

* Mon Oct 27 2008 Bee <http://forums.fedoraforum.org/member.php?u=119750> 1.0-3
- new RPMs

* Wed Oct 15 2008 Bee <http://forums.fedoraforum.org/member.php?u=119750> 1.0-2
- package needs to be arch specific , patch so rpm builds in mock or as non-root & clean up

* Mon Oct 13 2008 Bee <http://forums.fedoraforum.org/member.php?u=119750> 1.0-1
- initial release


--- NEW FILE import.log ---
beesu-2_1-1_fc11:HEAD:beesu-2.1-1.fc11.src.rpm:1233331914


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/beesu/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	30 Jan 2009 15:45:21 -0000	1.1
+++ .cvsignore	30 Jan 2009 16:14:04 -0000	1.2
@@ -0,0 +1 @@
+beesu-2.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/beesu/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	30 Jan 2009 15:45:21 -0000	1.1
+++ sources	30 Jan 2009 16:14:04 -0000	1.2
@@ -0,0 +1 @@
+b7dc880e5eb8d04c8199f8a29bd618d7  beesu-2.1.tar.bz2



From spot at fedoraproject.org  Fri Jan 30 16:18:55 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Fri, 30 Jan 2009 16:18:55 +0000 (UTC)
Subject: rpms/beesu/EL-4 beesu.spec,NONE,1.1 sources,1.1,1.2
Message-ID: <20090130161855.E572570117@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/beesu/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29665/EL-4

Modified Files:
	sources 
Added Files:
	beesu.spec 
Log Message:
initial branching


--- NEW FILE beesu.spec ---
Name: beesu
Version: 2.1
Release: 1%{?dist}
Summary: Bee's installer script for beesu
URL: http://forums.fedoraforum.org/showthread.php?t=201579
Group: Applications/System
License: GPLv2+
Source0: http://spot.fedorapeople.org/%{name}/%{name}-%{version}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
Requires: pam, usermode

%description
Beesu is a wrapper around su and works with consolehelper under
Fedora to let you have a graphic interface like gksu.

%prep
%setup -q
# Should be fixed in next release
sed -i 's|LDFLAGS = -s|LDFLAGS =|g' Makefile

%build
make CFLAGS="%{optflags}"

%install
rm -rf %{buildroot}
mkdir -p %{buildroot}%{_datadir}/%{name}

make DESTDIR=%{buildroot} install

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc COPYING README
%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/%{name}.conf
%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/pam.d/%{name}
%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/security/console.apps/%{name}
%{_sbindir}/%{name}
%{_bindir}/%{name}
%{_mandir}/man1/%{name}.1.gz

%changelog
* Thu Jan 29 2009 Tom "spot" Callaway <tcallawa at redhat.com> 2.1-1
- slight package cleanup from Bee

* Fri Nov 28 2008 Bee <http://forums.fedoraforum.org/member.php?u=119750> 2.0-1
- new RPMs for Fedora 10 and some source clean up.

* Mon Oct 27 2008 Bee <http://forums.fedoraforum.org/member.php?u=119750> 1.0-3
- new RPMs

* Wed Oct 15 2008 Bee <http://forums.fedoraforum.org/member.php?u=119750> 1.0-2
- package needs to be arch specific , patch so rpm builds in mock or as non-root & clean up

* Mon Oct 13 2008 Bee <http://forums.fedoraforum.org/member.php?u=119750> 1.0-1
- initial release


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/beesu/EL-4/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	30 Jan 2009 15:45:21 -0000	1.1
+++ sources	30 Jan 2009 16:18:25 -0000	1.2
@@ -0,0 +1 @@
+b7dc880e5eb8d04c8199f8a29bd618d7  beesu-2.1.tar.bz2



From spot at fedoraproject.org  Fri Jan 30 16:18:56 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Fri, 30 Jan 2009 16:18:56 +0000 (UTC)
Subject: rpms/beesu/EL-5 beesu.spec,NONE,1.1 sources,1.1,1.2
Message-ID: <20090130161856.2277A70142@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/beesu/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29665/EL-5

Modified Files:
	sources 
Added Files:
	beesu.spec 
Log Message:
initial branching


--- NEW FILE beesu.spec ---
Name: beesu
Version: 2.1
Release: 1%{?dist}
Summary: Bee's installer script for beesu
URL: http://forums.fedoraforum.org/showthread.php?t=201579
Group: Applications/System
License: GPLv2+
Source0: http://spot.fedorapeople.org/%{name}/%{name}-%{version}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
Requires: pam, usermode

%description
Beesu is a wrapper around su and works with consolehelper under
Fedora to let you have a graphic interface like gksu.

%prep
%setup -q
# Should be fixed in next release
sed -i 's|LDFLAGS = -s|LDFLAGS =|g' Makefile

%build
make CFLAGS="%{optflags}"

%install
rm -rf %{buildroot}
mkdir -p %{buildroot}%{_datadir}/%{name}

make DESTDIR=%{buildroot} install

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc COPYING README
%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/%{name}.conf
%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/pam.d/%{name}
%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/security/console.apps/%{name}
%{_sbindir}/%{name}
%{_bindir}/%{name}
%{_mandir}/man1/%{name}.1.gz

%changelog
* Thu Jan 29 2009 Tom "spot" Callaway <tcallawa at redhat.com> 2.1-1
- slight package cleanup from Bee

* Fri Nov 28 2008 Bee <http://forums.fedoraforum.org/member.php?u=119750> 2.0-1
- new RPMs for Fedora 10 and some source clean up.

* Mon Oct 27 2008 Bee <http://forums.fedoraforum.org/member.php?u=119750> 1.0-3
- new RPMs

* Wed Oct 15 2008 Bee <http://forums.fedoraforum.org/member.php?u=119750> 1.0-2
- package needs to be arch specific , patch so rpm builds in mock or as non-root & clean up

* Mon Oct 13 2008 Bee <http://forums.fedoraforum.org/member.php?u=119750> 1.0-1
- initial release


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/beesu/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	30 Jan 2009 15:45:21 -0000	1.1
+++ sources	30 Jan 2009 16:18:25 -0000	1.2
@@ -0,0 +1 @@
+b7dc880e5eb8d04c8199f8a29bd618d7  beesu-2.1.tar.bz2



From spot at fedoraproject.org  Fri Jan 30 16:18:56 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Fri, 30 Jan 2009 16:18:56 +0000 (UTC)
Subject: rpms/beesu/F-10 beesu.spec,NONE,1.1 sources,1.1,1.2
Message-ID: <20090130161856.937B970117@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/beesu/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29665/F-10

Modified Files:
	sources 
Added Files:
	beesu.spec 
Log Message:
initial branching


--- NEW FILE beesu.spec ---
Name: beesu
Version: 2.1
Release: 1%{?dist}
Summary: Bee's installer script for beesu
URL: http://forums.fedoraforum.org/showthread.php?t=201579
Group: Applications/System
License: GPLv2+
Source0: http://spot.fedorapeople.org/%{name}/%{name}-%{version}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
Requires: pam, usermode

%description
Beesu is a wrapper around su and works with consolehelper under
Fedora to let you have a graphic interface like gksu.

%prep
%setup -q
# Should be fixed in next release
sed -i 's|LDFLAGS = -s|LDFLAGS =|g' Makefile

%build
make CFLAGS="%{optflags}"

%install
rm -rf %{buildroot}
mkdir -p %{buildroot}%{_datadir}/%{name}

make DESTDIR=%{buildroot} install

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc COPYING README
%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/%{name}.conf
%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/pam.d/%{name}
%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/security/console.apps/%{name}
%{_sbindir}/%{name}
%{_bindir}/%{name}
%{_mandir}/man1/%{name}.1.gz

%changelog
* Thu Jan 29 2009 Tom "spot" Callaway <tcallawa at redhat.com> 2.1-1
- slight package cleanup from Bee

* Fri Nov 28 2008 Bee <http://forums.fedoraforum.org/member.php?u=119750> 2.0-1
- new RPMs for Fedora 10 and some source clean up.

* Mon Oct 27 2008 Bee <http://forums.fedoraforum.org/member.php?u=119750> 1.0-3
- new RPMs

* Wed Oct 15 2008 Bee <http://forums.fedoraforum.org/member.php?u=119750> 1.0-2
- package needs to be arch specific , patch so rpm builds in mock or as non-root & clean up

* Mon Oct 13 2008 Bee <http://forums.fedoraforum.org/member.php?u=119750> 1.0-1
- initial release


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/beesu/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	30 Jan 2009 15:45:21 -0000	1.1
+++ sources	30 Jan 2009 16:18:26 -0000	1.2
@@ -0,0 +1 @@
+b7dc880e5eb8d04c8199f8a29bd618d7  beesu-2.1.tar.bz2



From spot at fedoraproject.org  Fri Jan 30 16:18:56 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Fri, 30 Jan 2009 16:18:56 +0000 (UTC)
Subject: rpms/beesu/F-9 beesu.spec,NONE,1.1 sources,1.1,1.2
Message-ID: <20090130161856.E258870117@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/beesu/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29665/F-9

Modified Files:
	sources 
Added Files:
	beesu.spec 
Log Message:
initial branching


--- NEW FILE beesu.spec ---
Name: beesu
Version: 2.1
Release: 1%{?dist}
Summary: Bee's installer script for beesu
URL: http://forums.fedoraforum.org/showthread.php?t=201579
Group: Applications/System
License: GPLv2+
Source0: http://spot.fedorapeople.org/%{name}/%{name}-%{version}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
Requires: pam, usermode

%description
Beesu is a wrapper around su and works with consolehelper under
Fedora to let you have a graphic interface like gksu.

%prep
%setup -q
# Should be fixed in next release
sed -i 's|LDFLAGS = -s|LDFLAGS =|g' Makefile

%build
make CFLAGS="%{optflags}"

%install
rm -rf %{buildroot}
mkdir -p %{buildroot}%{_datadir}/%{name}

make DESTDIR=%{buildroot} install

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc COPYING README
%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/%{name}.conf
%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/pam.d/%{name}
%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/security/console.apps/%{name}
%{_sbindir}/%{name}
%{_bindir}/%{name}
%{_mandir}/man1/%{name}.1.gz

%changelog
* Thu Jan 29 2009 Tom "spot" Callaway <tcallawa at redhat.com> 2.1-1
- slight package cleanup from Bee

* Fri Nov 28 2008 Bee <http://forums.fedoraforum.org/member.php?u=119750> 2.0-1
- new RPMs for Fedora 10 and some source clean up.

* Mon Oct 27 2008 Bee <http://forums.fedoraforum.org/member.php?u=119750> 1.0-3
- new RPMs

* Wed Oct 15 2008 Bee <http://forums.fedoraforum.org/member.php?u=119750> 1.0-2
- package needs to be arch specific , patch so rpm builds in mock or as non-root & clean up

* Mon Oct 13 2008 Bee <http://forums.fedoraforum.org/member.php?u=119750> 1.0-1
- initial release


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/beesu/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	30 Jan 2009 15:45:21 -0000	1.1
+++ sources	30 Jan 2009 16:18:26 -0000	1.2
@@ -0,0 +1 @@
+b7dc880e5eb8d04c8199f8a29bd618d7  beesu-2.1.tar.bz2



From kasal at fedoraproject.org  Fri Jan 30 16:29:25 2009
From: kasal at fedoraproject.org (=?utf-8?b?xaB0xJtww6FuIEthc2Fs?=)
Date: Fri, 30 Jan 2009 16:29:25 +0000 (UTC)
Subject: rpms/gawk/devel gawk-stable-tree.patch, 1.1, 1.2 gawk.spec, 1.56,
	1.57 gawk-3.1.5-test-lc_num1.patch, 1.3, NONE
Message-ID: <20090130162925.3DA1970117@cvs1.fedora.phx.redhat.com>

Author: kasal

Update of /cvs/extras/rpms/gawk/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32073

Modified Files:
	gawk-stable-tree.patch gawk.spec 
Removed Files:
	gawk-3.1.5-test-lc_num1.patch 
Log Message:
- remove the versioned binaries even if the version is modified by the
  snapshot patch, modify the file list to check this (#476166)
- update the snapshot patch, dropping the upstreamed
  gawk-3.1.5-test-lc_num1.patch

gawk-stable-tree.patch:

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.1 -r 1.2 gawk-stable-tree.patch
Index: gawk-stable-tree.patch
===================================================================
RCS file: /cvs/extras/rpms/gawk/devel/gawk-stable-tree.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gawk-stable-tree.patch	11 Dec 2008 11:25:53 -0000	1.1
+++ gawk-stable-tree.patch	30 Jan 2009 16:29:24 -0000	1.2
@@ -1,16 +1,86 @@
 2008-12-11  Stepan Kasal  <skasal at redhat.com>
 Patch generated from gawk stable tree on savannah on
-Thu Dec 11 11:52:53 CET 2008
+Fri Jan 30 17:02:40 CET 2009
 
-Index: ChangeLog
-===================================================================
-RCS file: /cvsroot/gawk/gawk-stable/ChangeLog,v
-retrieving revision 1.55
-retrieving revision 1.83
-diff -u -r1.55 -r1.83
---- ChangeLog	22 Oct 2007 06:55:44 -0000	1.55
-+++ ChangeLog	5 Dec 2008 09:14:48 -0000	1.83
-@@ -1,3 +1,185 @@
+diff -urN gawk-3.1.6.orig/ChangeLog gawk-3.1.6/ChangeLog
+--- gawk-3.1.6.orig/ChangeLog	2007-10-22 08:50:42.000000000 +0200
++++ gawk-3.1.6/ChangeLog	2009-01-30 16:59:01.000000000 +0100
+@@ -1,3 +1,260 @@
++Tue Jan 27 21:42:47 2009  Arnold D. Robbins  <arnold at skeeve.com>
++
++	Changes suggested by Toni Schilling <Schilling at equicon.de>,
++	as modified by feedback from Pat Rankin, and some help
++	from me.
++
++	* awk.h [WEXITSTATUS]: Improve definition for MSC and VMS.
++	[EXIT_SUCCESS, EXIT_FAILURE]: Define if they aren't.
++	* io.c, main.c, profile.c: Switch to using EXIT_xxx instead of
++	0 and 1.
++	(main): Use constants instead of 0/1 for exit_val variable.
++	* eval.c (interpret): Map exit value from `exit' statement into
++	success / fail constants for VMS for exit_val variable.
++
++Tue Jan 20 07:35:34 2009  Arnold D. Robbins  <arnold at skeeve.com>
++
++	* regex.h: Define __USE_GNU if not _LIBC; needed for non-GLIBC
++	systems such as, oh say, Mac OS X.
++
++Tue Jan 13 09:23:40 2009  Arnold D. Robbins  <arnold at skeeve.com>
++
++	* regex.c, regex_internal.h: Remove some changes that are no
++	longer needed after sync with GLIBC.
++
++Mon Jan 12 22:27:10 2009  Arnold D. Robbins  <arnold at skeeve.com>
++
++	Bi-annual sync with GLIBC.
++
++	* regexec.c, regex.h, regex_internal.c, regcomp.c, regex_internal.h,
++	regex.c: Reapply any portability patches specific to gawk.
++	* getopt.c: Sync with GLIBC.
++
++	Base versions:
++		getopt.c		1.57	Thu Jan  8 20:02:05 2009		
++		getopt.h		1.21	Fri Mar 19 00:19:32 2004		
++		getopt1.c		1.10	Tue Mar  9 10:35:37 2004		
++		getopt_int.h		1.1	Tue Mar  9 10:31:19 2004		
++		regex.c			1.129	Tue Sep  6 20:49:44 2005		
++		regexec.c		1.99	Thu Jan  8 20:02:06 2009		
++		regexec.c		1.99	Thu Jan  8 20:02:06 2009		
++		regex.h			1.43	Wed Jan 16 10:09:47 2008		
++		regex_internal.c	1.69	Thu Jan  8 20:02:06 2009		
++		regex_internal.h	1.76	Thu Jan  8 20:02:06 2009		
++		regcomp.c		1.120	Thu Jan  8 20:02:06 2009		
++
++Mon Jan  5 23:07:58 2009  Arnold D. Robbins  <arnold at skeeve.com>
++
++	* io.c (devopen): Add a retry to calls to socketopen. Tunable
++	via undocumented GAWK_SOCK_RETRIES environment variable. Based
++	on code from Juergen Kahrs <Juergen.Kahrs at vr-web.de> after a
++	suggestion from Hermann Peifer <peifer at gmx.eu>.
++
++Mon Jan  5 22:48:39 2009  Arnold D. Robbins  <arnold at skeeve.com>
++
++	* io.c (redirect): A getline from a directory is no longer
++	fatal; instead it returns -1. Thanks to Paolo <oopla at users.sf.net>
++	for the report.
++
++Mon Dec 29 22:04:57 2008  Arnold D. Robbins  <arnold at skeeve.com>
++
++	* builtin.c (format_tree): Case for 's', improve logic for setting
++	the number of characters to copy, also at pr_tail. Based on
++	bug report by Hermann Peifer <peifer at gmx.net>.
++
++Thu Dec 11 21:23:50 2008  Arnold D. Robbins  <arnold at skeeve.com>
++
++	* builtin.c (do_length): If the wide string has zero length
++	but the bytes are more than zero, use the number of bytes.
++	(do_index): Similar also: fall back to byte count if the
++	bytes don't make a wide-character string.
++	Bug reported by "Carlos G." <charlie.brown.uy at gmail.com>
++
++	(do_substr): If defaulting to length of rest of the string,
++	do it based on the wide char string if it's valid.
++
 +Fri Dec  5 11:12:11 2008  Arnold D. Robbins  <arnold at skeeve.com>
 +
 +	* io.c (free_rp): New function.
@@ -196,7 +266,16 @@
  Mon Oct 22 08:49:05 2007  Arnold D. Robbins  <arnold at skeeve.com>
  
  	* Release 3.1.6: Release tar file made.
-@@ -568,7 +750,7 @@
+@@ -494,7 +751,7 @@
+ 	From Matthew Woehlke <mwoehlke at tibco.com> for Tandem:
+ 
+ 	* awk.h (_TANDEM_SOURCE): Also define _XOPEN_SOURCE_EXTENDED.
+-	* io.c: (_TANDEM_SOURCE): Include more headers.
++	* io.c (_TANDEM_SOURCE): Include more headers.
+ 
+ Sat Jan 13 21:53:48 2007  Ralf Wildenhues  <Ralf.Wildenhues at gmx.de>
+ 
+@@ -568,7 +825,7 @@
  
  	* node.c (free_wstr): Zero wstptr and wstlen only if WSTRCUR
  	flag is set.
@@ -205,7 +284,7 @@
  
  Thu Jan  4 16:49:21 2007  Arnold D. Robbins  <arnold at skeeve.com>
  
-@@ -618,14 +800,14 @@
+@@ -618,14 +875,14 @@
  Tue Jul  4 22:43:05 2006  Arnold D. Robbins  <arnold at skeeve.com>
  
  	* eval.c (interpret): Node_assign_concat case: Turn off NUMBER and
@@ -224,7 +303,7 @@
  
  Mon Jul  3 00:27:59 2006  Arnold D. Robbins  <arnold at skeeve.com>
  
-@@ -637,7 +819,7 @@
+@@ -637,7 +894,7 @@
  Fri Jun 23 15:48:34 2006  Arnold D. Robbins  <arnold at skeeve.com>
  
  	* awkgram.y (subn): At end for `do_sprintf' check, verify
@@ -233,7 +312,7 @@
  
  Sun Jun 18 22:27:25 2006  Arnold D. Robbins  <arnold at skeeve.com>
  
-@@ -828,7 +1010,7 @@
+@@ -828,7 +1085,7 @@
  	Unrelated changes:
  
  	* builtin.c (do_length): Allow array argument to length().
@@ -242,7 +321,7 @@
  
  	* awkgram.y (yylex): Ignore carriage returns in source code. Sigh.
  
-@@ -923,12 +1105,12 @@
+@@ -923,12 +1180,12 @@
  
  	* configure.ac: Add type check for `socklen_t', fixes compile
  	warning on AMD/64 Linux.
@@ -257,7 +336,7 @@
  	`register_open_hooks' open its own fd in case gawk does not know
  	how to open it.
  	(iop_open): Call `os_close_on_exec' after `iop_alloc'.
-@@ -966,7 +1148,7 @@
+@@ -966,7 +1223,7 @@
  	(custom.h): Don't cat custom.h at the end of config.h; instead, use
  	AH_BOTTOM([#include "custom.h"])
  	* awklib/Makefile.am (AM_CPPFLAGS): Add $(top_srcdir) so that
@@ -266,7 +345,7 @@
  
  Thu Apr 28 23:21:22 2005  Jim Meyering  <jim at meyering.net>
  
-@@ -977,16 +1159,16 @@
+@@ -977,16 +1234,16 @@
  Thu Apr 28 23:05:33 2005  Stepan Kasal  <kasal at ucw.cz>
  
  	* dfa.c (parse_bracket_exp_mb): Shorten one part of the code, to get
@@ -289,14 +368,9 @@
  
  Thu Apr 28 19:12:03 2005  Arnold D. Robbins    <arnold at skeeve.com>
  
-Index: Makefile.am
-===================================================================
-RCS file: /cvsroot/gawk/gawk-stable/Makefile.am,v
-retrieving revision 1.12
-retrieving revision 1.14
-diff -u -r1.12 -r1.14
---- Makefile.am	14 Oct 2007 21:22:48 -0000	1.12
-+++ Makefile.am	11 Mar 2008 20:37:01 -0000	1.14
+diff -urN gawk-3.1.6.orig/Makefile.am gawk-3.1.6/Makefile.am
+--- gawk-3.1.6.orig/Makefile.am	2007-10-14 23:19:49.000000000 +0200
++++ gawk-3.1.6/Makefile.am	2009-01-30 16:56:45.000000000 +0100
 @@ -68,6 +68,7 @@
  # Build explicitly in "." in order to build gawk first, so
  # that `make check' without a prior `make' works.
@@ -332,14 +406,9 @@
  	if test -f y.tab.h; then \
  	if cmp -s y.tab.h $*.h; then rm -f y.tab.h; else mv y.tab.h $*.h; fi; \
  	else :; fi
-Index: NEWS
[...42394 lines suppressed...]
---- /dev/null	2008-12-08 00:24:16.653006400 +0100
-+++ test/match3.awk	2008-07-31 20:46:47.000000000 +0200
+diff -urN gawk-3.1.6.orig/test/lc_num1.awk gawk-3.1.6/test/lc_num1.awk
+--- gawk-3.1.6.orig/test/lc_num1.awk	1970-01-01 01:00:00.000000000 +0100
++++ gawk-3.1.6/test/lc_num1.awk	2009-01-30 16:59:01.000000000 +0100
+@@ -0,0 +1,4 @@
++# Bug reported by Ulrich Drepper.
++BEGIN {
++  printf("%'d %d\n", 1000000, 1000000)
++}
+diff -urN gawk-3.1.6.orig/test/lc_num1.ok gawk-3.1.6/test/lc_num1.ok
+--- gawk-3.1.6.orig/test/lc_num1.ok	1970-01-01 01:00:00.000000000 +0100
++++ gawk-3.1.6/test/lc_num1.ok	2009-01-30 16:59:01.000000000 +0100
+@@ -0,0 +1 @@
++1,000,000 1000000
+diff -urN gawk-3.1.6.orig/test/match3.awk gawk-3.1.6/test/match3.awk
+--- gawk-3.1.6.orig/test/match3.awk	1970-01-01 01:00:00.000000000 +0100
++++ gawk-3.1.6/test/match3.awk	2009-01-30 16:56:45.000000000 +0100
 @@ -0,0 +1,46 @@
 +# Date: Mon, 28 Jul 2008 17:25:32 +0200
 +# From: Dirk Zimoch <dirk.zimoch at psi.ch>
@@ -35382,22 +37131,25 @@
 +	match($0,/.*/,a)
 +	print a[0] == a[0]+0 ? "OK" : "FAULT"
 +}
---- /dev/null	2008-12-08 00:24:16.653006400 +0100
-+++ test/match3.in	2008-07-31 20:46:47.000000000 +0200
+diff -urN gawk-3.1.6.orig/test/match3.in gawk-3.1.6/test/match3.in
+--- gawk-3.1.6.orig/test/match3.in	1970-01-01 01:00:00.000000000 +0100
++++ gawk-3.1.6/test/match3.in	2009-01-30 16:56:45.000000000 +0100
 @@ -0,0 +1,4 @@
 +5
 +5.0
 +0.5
 +.5
---- /dev/null	2008-12-08 00:24:16.653006400 +0100
-+++ test/match3.ok	2008-07-31 20:46:47.000000000 +0200
+diff -urN gawk-3.1.6.orig/test/match3.ok gawk-3.1.6/test/match3.ok
+--- gawk-3.1.6.orig/test/match3.ok	1970-01-01 01:00:00.000000000 +0100
++++ gawk-3.1.6/test/match3.ok	2009-01-30 16:56:45.000000000 +0100
 @@ -0,0 +1,4 @@
 +OK
 +OK
 +OK
 +OK
---- /dev/null	2008-12-08 00:24:16.653006400 +0100
-+++ test/mbfw1.awk	2008-04-23 21:36:13.000000000 +0200
+diff -urN gawk-3.1.6.orig/test/mbfw1.awk gawk-3.1.6/test/mbfw1.awk
+--- gawk-3.1.6.orig/test/mbfw1.awk	1970-01-01 01:00:00.000000000 +0100
++++ gawk-3.1.6/test/mbfw1.awk	2009-01-30 16:56:45.000000000 +0100
 @@ -0,0 +1,40 @@
 +# Date: Sun, 16 Mar 2008 18:51:14 +0100
 +# From: Hermann Peifer <peifer at gmx.eu>
@@ -35439,43 +37191,132 @@
 +# Hermann
 +BEGIN { FIELDWIDTHS = "2 20 20 20" }
 +{ print $4 }
---- /dev/null	2008-12-08 00:24:16.653006400 +0100
-+++ test/mbfw1.in	2008-04-23 21:36:13.000000000 +0200
+diff -urN gawk-3.1.6.orig/test/mbfw1.in gawk-3.1.6/test/mbfw1.in
+--- gawk-3.1.6.orig/test/mbfw1.in	1970-01-01 01:00:00.000000000 +0100
++++ gawk-3.1.6/test/mbfw1.in	2009-01-30 16:56:45.000000000 +0100
 @@ -0,0 +1,4 @@
 +CDRegion              Commune             Site
 +SEV??stsverige         Hallands l??n        Kungsbacka
 +SESm??land med ??arna   V??stra G??talands l??nG??teborg
 +SEKronoberg           Alvesta             Stenungsund
---- /dev/null	2008-12-08 00:24:16.653006400 +0100
-+++ test/mbfw1.ok	2008-04-23 21:36:13.000000000 +0200
+diff -urN gawk-3.1.6.orig/test/mbfw1.ok gawk-3.1.6/test/mbfw1.ok
+--- gawk-3.1.6.orig/test/mbfw1.ok	1970-01-01 01:00:00.000000000 +0100
++++ gawk-3.1.6/test/mbfw1.ok	2009-01-30 16:56:45.000000000 +0100
 @@ -0,0 +1,4 @@
 +Site
 +Kungsbacka
 +G??teborg
 +Stenungsund
---- /dev/null	2008-12-08 00:24:16.653006400 +0100
-+++ test/mbprintf1.awk	2008-04-23 21:36:13.000000000 +0200
+diff -urN gawk-3.1.6.orig/test/mbprintf1.awk gawk-3.1.6/test/mbprintf1.awk
+--- gawk-3.1.6.orig/test/mbprintf1.awk	1970-01-01 01:00:00.000000000 +0100
++++ gawk-3.1.6/test/mbprintf1.awk	2009-01-30 16:56:45.000000000 +0100
 @@ -0,0 +1 @@
 +{ printf "%-7s|\n", $0 }
---- /dev/null	2008-12-08 00:24:16.653006400 +0100
-+++ test/mbprintf1.in	2008-04-23 21:36:13.000000000 +0200
+diff -urN gawk-3.1.6.orig/test/mbprintf1.in gawk-3.1.6/test/mbprintf1.in
+--- gawk-3.1.6.orig/test/mbprintf1.in	1970-01-01 01:00:00.000000000 +0100
++++ gawk-3.1.6/test/mbprintf1.in	2009-01-30 16:56:45.000000000 +0100
 @@ -0,0 +1,2 @@
 +AAA
 +??????
---- /dev/null	2008-12-08 00:24:16.653006400 +0100
-+++ test/mbprintf1.ok	2008-04-23 21:36:13.000000000 +0200
+diff -urN gawk-3.1.6.orig/test/mbprintf1.ok gawk-3.1.6/test/mbprintf1.ok
+--- gawk-3.1.6.orig/test/mbprintf1.ok	1970-01-01 01:00:00.000000000 +0100
++++ gawk-3.1.6/test/mbprintf1.ok	2009-01-30 16:56:45.000000000 +0100
 @@ -0,0 +1,2 @@
 +AAA    |
 +??????    |
---- /dev/null	2008-12-08 00:24:16.653006400 +0100
-+++ test/mbprintf2.awk	2008-04-23 21:36:13.000000000 +0200
+diff -urN gawk-3.1.6.orig/test/mbprintf2.awk gawk-3.1.6/test/mbprintf2.awk
+--- gawk-3.1.6.orig/test/mbprintf2.awk	1970-01-01 01:00:00.000000000 +0100
++++ gawk-3.1.6/test/mbprintf2.awk	2009-01-30 16:56:45.000000000 +0100
 @@ -0,0 +1,4 @@
 +BEGIN {
 +	printf "%c\n",  65
 +	printf "%c\n", "AA"
 +}
---- /dev/null	2008-12-08 00:24:16.653006400 +0100
-+++ test/mbprintf2.ok	2008-04-23 21:36:13.000000000 +0200
+diff -urN gawk-3.1.6.orig/test/mbprintf2.ok gawk-3.1.6/test/mbprintf2.ok
+--- gawk-3.1.6.orig/test/mbprintf2.ok	1970-01-01 01:00:00.000000000 +0100
++++ gawk-3.1.6/test/mbprintf2.ok	2009-01-30 16:56:45.000000000 +0100
 @@ -0,0 +1,2 @@
 +A
 +A
+diff -urN gawk-3.1.6.orig/test/mbprintf3.awk gawk-3.1.6/test/mbprintf3.awk
+--- gawk-3.1.6.orig/test/mbprintf3.awk	1970-01-01 01:00:00.000000000 +0100
++++ gawk-3.1.6/test/mbprintf3.awk	2009-01-30 16:59:01.000000000 +0100
+@@ -0,0 +1 @@
++FNR == 1 { print $0; printf "%s\n", $0 }
+diff -urN gawk-3.1.6.orig/test/mbprintf3.in gawk-3.1.6/test/mbprintf3.in
+--- gawk-3.1.6.orig/test/mbprintf3.in	1970-01-01 01:00:00.000000000 +0100
++++ gawk-3.1.6/test/mbprintf3.in	2009-01-30 16:59:01.000000000 +0100
+@@ -0,0 +1 @@
++COMPONENT suspended particulates <10 ?m (air), day
+diff -urN gawk-3.1.6.orig/test/mbprintf3.ok gawk-3.1.6/test/mbprintf3.ok
+--- gawk-3.1.6.orig/test/mbprintf3.ok	1970-01-01 01:00:00.000000000 +0100
++++ gawk-3.1.6/test/mbprintf3.ok	2009-01-30 16:59:01.000000000 +0100
+@@ -0,0 +1,2 @@
++COMPONENT suspended particulates <10 ?m (air), day
++COMPONENT suspended particulates <10 ?m (air), day
+diff -urN gawk-3.1.6.orig/test/mbstr1.awk gawk-3.1.6/test/mbstr1.awk
+--- gawk-3.1.6.orig/test/mbstr1.awk	1970-01-01 01:00:00.000000000 +0100
++++ gawk-3.1.6/test/mbstr1.awk	2009-01-30 16:59:01.000000000 +0100
+@@ -0,0 +1,4 @@
++BEGIN {
++	print length("\x81\x82\x83\x84")
++	print index("\x81\x82\x83\x84", "\x81\x82")
++}
+diff -urN gawk-3.1.6.orig/test/mbstr1.ok gawk-3.1.6/test/mbstr1.ok
+--- gawk-3.1.6.orig/test/mbstr1.ok	1970-01-01 01:00:00.000000000 +0100
++++ gawk-3.1.6/test/mbstr1.ok	2009-01-30 16:59:01.000000000 +0100
+@@ -0,0 +1,2 @@
++4
++1
+diff -urN gawk-3.1.6.orig/vms/ChangeLog gawk-3.1.6/vms/ChangeLog
+--- gawk-3.1.6.orig/vms/ChangeLog	2007-10-22 08:50:50.000000000 +0200
++++ gawk-3.1.6/vms/ChangeLog	2009-01-30 16:59:01.000000000 +0100
+@@ -1,3 +1,12 @@
++Tue Jan 27 21:49:53 2009  Arnold D. Robbins  <arnold at skeeve.com>
++
++	Per Pat Rankin based on changes to awk.h and change in main code
++	to use EXIT_SUCCESS / EXIT_FAILURE from Toni Schilling
++	<Schilling at equicon.de>.
++
++	* redirect.h (exit): Remove definition.
++	* vms_misc.c (vms_exit): Remove code.
++
+ Mon Oct 22 08:49:05 2007  Arnold D. Robbins  <arnold at skeeve.com>
+ 
+ 	* Release 3.1.6: Release tar file made.
+diff -urN gawk-3.1.6.orig/vms/redirect.h gawk-3.1.6/vms/redirect.h
+--- gawk-3.1.6.orig/vms/redirect.h	2007-08-11 21:40:06.000000000 +0200
++++ gawk-3.1.6/vms/redirect.h	2009-01-30 16:59:01.000000000 +0100
+@@ -79,7 +79,6 @@
+ #ifndef bcopy
+ #define bcopy		vms_bcopy
+ #endif
+-#define exit		vms_exit
+ #define open		vms_open
+ #define popen		vms_popen
+ #define pclose		vms_pclose
+diff -urN gawk-3.1.6.orig/vms/vms_misc.c gawk-3.1.6/vms/vms_misc.c
+--- gawk-3.1.6.orig/vms/vms_misc.c	2006-08-11 14:05:48.000000000 +0200
++++ gawk-3.1.6/vms/vms_misc.c	2009-01-30 16:59:01.000000000 +0100
+@@ -29,21 +29,6 @@
+ #include <stsdef.h>
+ 
+     /*
+-     * VMS uses a completely different status scheme (odd => success,
+-     * even => failure), so we'll trap calls to exit() and alter the
+-     * exit status code.  [VAXC can't handle this as a macro.]
+-     */
+-#ifdef exit
+-# undef exit
+-#endif
+-void
+-vms_exit( int final_status )
+-{
+-    exit(final_status == 0 ? SS$_NORMAL : (SS$_ABORT | STS$M_INHIB_MSG));
+-}
+-#define exit(v) vms_exit(v)
+-
+-    /*
+      * In VMS's VAXCRTL, strerror() takes an optional second argument.
+      *  #define strerror(errnum) strerror(errnum,vaxc$errno)
+      * is all that's needed, but VAXC can't handle that (gcc can).


Index: gawk.spec
===================================================================
RCS file: /cvs/extras/rpms/gawk/devel/gawk.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- gawk.spec	11 Dec 2008 11:25:53 -0000	1.56
+++ gawk.spec	30 Jan 2009 16:29:24 -0000	1.57
@@ -1,7 +1,7 @@
 Summary: The GNU version of the awk text processing utility
 Name: gawk
 Version: 3.1.6
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv3+
 Group: Applications/Text
 URL: http://www.gnu.org/software/gawk/gawk.html
@@ -17,10 +17,6 @@
 # patching the sources for these tools
 BuildRequires: autoconf automake gettext-devel texinfo bison
 
-# test for #299551, submitted:
-# http://lists.gnu.org/archive/html/bug-gnu-utils/2008-11/msg00044.html
-Patch14: gawk-3.1.5-test-lc_num1.patch
-
 %description
 The gawk package contains the GNU version of awk, a text processing
 utility. Awk interprets a special-purpose programming language to do
@@ -34,10 +30,9 @@
 mv libsigsegv-2.6 libsigsegv
 # do not install with gawk
 echo 'install:'  >>libsigsegv/Makefile.am
-%patch0
+%patch0 -p1
 # we have patched the sources for these:
 rm awkgram.c doc/*.info
-%patch14 -b .ulitest
 
 %build
 autoreconf
@@ -56,7 +51,8 @@
 ln -sf ../../bin/gawk $RPM_BUILD_ROOT%{_bindir}/awk
 ln -sf ../../bin/gawk $RPM_BUILD_ROOT%{_bindir}/gawk
 mv $RPM_BUILD_ROOT/bin/{p,i}gawk $RPM_BUILD_ROOT%{_bindir}
-rm -f $RPM_BUILD_ROOT/bin/{,p}gawk-%{version} $RPM_BUILD_ROOT%{_infodir}/dir
+# remove %{version}* , when we are building a snapshot...
+rm -f $RPM_BUILD_ROOT/bin/{,p}gawk-%{version}* $RPM_BUILD_ROOT%{_infodir}/dir
 
 %find_lang %name
 
@@ -77,8 +73,8 @@
 %defattr(-,root,root,-)
 %doc README COPYING FUTURES LIMITATIONS NEWS
 %doc README_d/README.multibyte README_d/README.tests POSIX.STD
-/bin/*
-%{_bindir}/*
+/bin/*awk
+%{_bindir}/*awk
 %{_mandir}/man1/*
 %{_infodir}/gawk.info*
 %{_infodir}/gawkinet.info*
@@ -86,6 +82,12 @@
 %{_datadir}/awk
 
 %changelog
+* Fri Jan 30 2009 Stepan Kasal <skasal at redhat.com> - 3.1.6-4
+- remove the versioned binaries even if the version is modified by the
+  snapshot patch, modify the file list to check this (#476166)
+- update the snapshot patch, dropping the upstreamed
+  gawk-3.1.5-test-lc_num1.patch
+
 * Thu Dec 11 2008 Stepan Kasal <skasal at redhat.com> - 3.1.6-3
 - grab the current stable tree from savannah
 


--- gawk-3.1.5-test-lc_num1.patch DELETED ---



From dwalsh at fedoraproject.org  Fri Jan 30 16:35:14 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Fri, 30 Jan 2009 16:35:14 +0000 (UTC)
Subject: rpms/policycoreutils/devel policycoreutils-rhat.patch, 1.407,
	1.408 policycoreutils.spec, 1.589, 1.590
Message-ID: <20090130163514.9042A70117@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/policycoreutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv933

Modified Files:
	policycoreutils-rhat.patch policycoreutils.spec 
Log Message:
* Fri Jan 30 2009 Dan Walsh <dwalsh at redhat.com> 2.0.61-7
- Dont report errors on glob match and multiple links


policycoreutils-rhat.patch:

Index: policycoreutils-rhat.patch
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils-rhat.patch,v
retrieving revision 1.407
retrieving revision 1.408
diff -u -r1.407 -r1.408
--- policycoreutils-rhat.patch	13 Jan 2009 14:01:10 -0000	1.407
+++ policycoreutils-rhat.patch	30 Jan 2009 16:35:12 -0000	1.408
@@ -1,6 +1,6 @@
-diff --exclude-from=exclude --exclude=sepolgen-1.0.14 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/audit2allow/audit2allow.1 policycoreutils-2.0.60/audit2allow/audit2allow.1
+diff --exclude-from=exclude --exclude=sepolgen-1.0.14 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/audit2allow/audit2allow.1 policycoreutils-2.0.61/audit2allow/audit2allow.1
 --- nsapolicycoreutils/audit2allow/audit2allow.1	2009-01-13 08:45:35.000000000 -0500
-+++ policycoreutils-2.0.60/audit2allow/audit2allow.1	2008-12-15 15:35:46.000000000 -0500
++++ policycoreutils-2.0.61/audit2allow/audit2allow.1	2009-01-20 09:49:03.000000000 -0500
 @@ -75,9 +75,6 @@
  Generate reference policy using installed macros.
  This attempts to match denials against interfaces and may be inaccurate.
@@ -11,19 +11,89 @@
  .B "\-w" | "\-\-why"
  Translates SELinux audit messages into a description of why the access was denied
  
-diff --exclude-from=exclude --exclude=sepolgen-1.0.14 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/Makefile policycoreutils-2.0.60/Makefile
+diff --exclude-from=exclude --exclude=sepolgen-1.0.14 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/Makefile policycoreutils-2.0.61/Makefile
 --- nsapolicycoreutils/Makefile	2008-08-28 09:34:24.000000000 -0400
-+++ policycoreutils-2.0.60/Makefile	2008-12-15 15:34:54.000000000 -0500
++++ policycoreutils-2.0.61/Makefile	2009-01-20 09:49:03.000000000 -0500
 @@ -1,4 +1,4 @@
 -SUBDIRS = setfiles semanage load_policy newrole run_init secon audit2allow audit2why scripts sestatus semodule_package semodule semodule_link semodule_expand semodule_deps setsebool po
 +SUBDIRS = setfiles semanage load_policy newrole run_init 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.14 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.c policycoreutils-2.0.60/restorecond/restorecond.c
+diff --exclude-from=exclude --exclude=sepolgen-1.0.14 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/Makefile policycoreutils-2.0.61/restorecond/Makefile
+--- nsapolicycoreutils/restorecond/Makefile	2008-08-28 09:34:24.000000000 -0400
++++ policycoreutils-2.0.61/restorecond/Makefile	2009-01-30 11:22:46.000000000 -0500
+@@ -20,7 +20,7 @@
+ 	install -m 755 restorecond $(SBINDIR)
+ 	install -m 644 restorecond.8 $(MANDIR)/man8
+ 	-mkdir -p $(INITDIR)
+-	install -m 644 restorecond.init $(INITDIR)/restorecond
++	install -m 755 restorecond.init $(INITDIR)/restorecond
+ 	-mkdir -p $(SELINUXDIR)
+ 	install -m 600 restorecond.conf $(SELINUXDIR)/restorecond.conf
+ 
+diff --exclude-from=exclude --exclude=sepolgen-1.0.14 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.c policycoreutils-2.0.61/restorecond/restorecond.c
 --- nsapolicycoreutils/restorecond/restorecond.c	2008-08-28 09:34:24.000000000 -0400
-+++ policycoreutils-2.0.60/restorecond/restorecond.c	2008-12-15 15:34:54.000000000 -0500
-@@ -283,6 +283,8 @@
++++ policycoreutils-2.0.61/restorecond/restorecond.c	2009-01-30 11:21:09.000000000 -0500
+@@ -1,7 +1,7 @@
+ /*
+  * restorecond
+  *
+- * Copyright (C) 2006 Red Hat 
++ * Copyright (C) 2006-2009 Red Hat 
+  * see file 'COPYING' for use and warranty information
+  *
+  * This program is free software; you can redistribute it and/or
+@@ -75,7 +75,7 @@
+ static int debug_mode = 0;
+ static int verbose_mode = 0;
+ 
+-static void restore(const char *filename);
++static void restore(const char *filename, int exact);
+ 
+ struct watchList {
+ 	struct watchList *next;
+@@ -113,12 +113,13 @@
+ 		printf("%d: File=%s\n", wd, file);
+ 	while (ptr != NULL) {
+ 		if (ptr->wd == wd) {
+-			if (strings_list_find(ptr->files, file) == 0) {
++			int exact=0;
++			if (strings_list_find(ptr->files, file, &exact) == 0) {
+ 				char *path = NULL;
+ 				if (asprintf(&path, "%s/%s", ptr->dir, file) <
+ 				    0)
+ 					exitApp("Error allocating memory.");
+-				restore(path);
++				restore(path, exact);
+ 				free(path);
+ 				return 0;
+ 			}
+@@ -155,7 +156,7 @@
+    Set the file context to the default file context for this system.
+    Same as restorecon.
+ */
+-static void restore(const char *filename)
++static void restore(const char *filename, int exact)
+ {
+ 	int retcontext = 0;
+ 	security_context_t scontext = NULL;
+@@ -181,9 +182,11 @@
+ 	}
+ 
+ 	if (!(st.st_mode & S_IFDIR) && st.st_nlink > 1) {
+-		syslog(LOG_ERR,
+-		       "Will not restore a file with more than one hard link (%s) %s\n",
+-		       filename, strerror(errno));
++		if (exact) { 
++			syslog(LOG_ERR,
++			       "Will not restore a file with more than one hard link (%s) %s\n",
++			       filename, strerror(errno));
++		}
+ 		close(fd);
+ 		return;
+ 	}
+@@ -283,6 +286,8 @@
  	inotify_rm_watch(fd, master_wd);
  	master_wd =
  	    inotify_add_watch(fd, watch_file_path, IN_MOVED_FROM | IN_MODIFY);
@@ -32,7 +102,16 @@
  }
  
  /* 
-@@ -411,7 +413,14 @@
+@@ -396,7 +401,7 @@
+ 	char *file = basename(path);
+ 	ptr = firstDir;
+ 
+-	restore(path);
++	restore(path, 1);
+ 
+ 	while (ptr != NULL) {
+ 		if (strcmp(dir, ptr->dir) == 0) {
+@@ -411,7 +416,14 @@
  
  	if (!ptr)
  		exitApp("Out of Memory");
@@ -47,9 +126,44 @@
  
  	ptr->dir = strdup(dir);
  	if (!ptr->dir)
-diff --exclude-from=exclude --exclude=sepolgen-1.0.14 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/utmpwatcher.c policycoreutils-2.0.60/restorecond/utmpwatcher.c
+diff --exclude-from=exclude --exclude=sepolgen-1.0.14 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.conf policycoreutils-2.0.61/restorecond/restorecond.conf
+--- nsapolicycoreutils/restorecond/restorecond.conf	2008-09-12 11:48:15.000000000 -0400
++++ policycoreutils-2.0.61/restorecond/restorecond.conf	2009-01-30 11:10:14.000000000 -0500
+@@ -5,4 +5,3 @@
+ /var/run/utmp
+ /var/log/wtmp
+ ~/*
+-~/.mozilla/plugins/libflashplayer.so
+diff --exclude-from=exclude --exclude=sepolgen-1.0.14 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/stringslist.c policycoreutils-2.0.61/restorecond/stringslist.c
+--- nsapolicycoreutils/restorecond/stringslist.c	2008-09-12 11:48:15.000000000 -0400
++++ policycoreutils-2.0.61/restorecond/stringslist.c	2009-01-30 11:20:48.000000000 -0500
+@@ -55,9 +55,10 @@
+ 		*list = newptr;
+ }
+ 
+-int strings_list_find(struct stringsList *ptr, const char *string)
++int strings_list_find(struct stringsList *ptr, const char *string, int *exact)
+ {
+ 	while (ptr) {
++		*exact = strcmp(ptr->string, string) == 0;
+ 		int cmp = fnmatch(ptr->string, string, 0);
+ 		if (cmp == 0) 
+ 			return 0;	/* Match found */
+diff --exclude-from=exclude --exclude=sepolgen-1.0.14 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/stringslist.h policycoreutils-2.0.61/restorecond/stringslist.h
+--- nsapolicycoreutils/restorecond/stringslist.h	2008-08-28 09:34:24.000000000 -0400
++++ policycoreutils-2.0.61/restorecond/stringslist.h	2009-01-30 11:27:00.000000000 -0500
+@@ -31,7 +31,7 @@
+ void strings_list_free(struct stringsList *list);
+ void strings_list_add(struct stringsList **list, const char *string);
+ void strings_list_print(struct stringsList *list);
+-int strings_list_find(struct stringsList *list, const char *string);
++int strings_list_find(struct stringsList *list, const char *string, int *exact);
+ int strings_list_diff(struct stringsList *from, struct stringsList *to);
+ 
+ #endif
+diff --exclude-from=exclude --exclude=sepolgen-1.0.14 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/utmpwatcher.c policycoreutils-2.0.61/restorecond/utmpwatcher.c
 --- nsapolicycoreutils/restorecond/utmpwatcher.c	2008-08-28 09:34:24.000000000 -0400
-+++ policycoreutils-2.0.60/restorecond/utmpwatcher.c	2008-12-15 15:34:54.000000000 -0500
++++ policycoreutils-2.0.61/restorecond/utmpwatcher.c	2009-01-20 09:49:03.000000000 -0500
 @@ -57,7 +57,7 @@
  	utmp_ptr = NULL;
  	FILE *cfg = fopen(utmp_path, "r");
@@ -69,9 +183,9 @@
  	if (prev_utmp_ptr) {
  		changed = strings_list_diff(prev_utmp_ptr, utmp_ptr);
  		strings_list_free(prev_utmp_ptr);
-diff --exclude-from=exclude --exclude=sepolgen-1.0.14 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/semanage policycoreutils-2.0.60/semanage/semanage
+diff --exclude-from=exclude --exclude=sepolgen-1.0.14 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/semanage policycoreutils-2.0.61/semanage/semanage
 --- nsapolicycoreutils/semanage/semanage	2008-11-14 17:10:15.000000000 -0500
-+++ policycoreutils-2.0.60/semanage/semanage	2009-01-13 08:55:07.000000000 -0500
++++ policycoreutils-2.0.61/semanage/semanage	2009-01-20 09:49:03.000000000 -0500
 @@ -219,6 +219,7 @@
  					     'seuser=',
  					     'store=',
@@ -80,10 +194,10 @@
  					     'level=',
  					     'roles=',
  					     'type=',
-diff --exclude-from=exclude --exclude=sepolgen-1.0.14 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semodule/semodule.c policycoreutils-2.0.60/semodule/semodule.c
+diff --exclude-from=exclude --exclude=sepolgen-1.0.14 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semodule/semodule.c policycoreutils-2.0.61/semodule/semodule.c
 --- nsapolicycoreutils/semodule/semodule.c	2009-01-13 08:45:35.000000000 -0500
-+++ policycoreutils-2.0.60/semodule/semodule.c	2009-01-06 08:56:37.000000000 -0500
-@@ -359,6 +359,9 @@
++++ policycoreutils-2.0.61/semodule/semodule.c	2009-01-28 16:52:58.000000000 -0500
+@@ -359,6 +363,9 @@
  					     mode_arg);
  				}
  				result = semanage_module_remove(sh, mode_arg);


Index: policycoreutils.spec
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils.spec,v
retrieving revision 1.589
retrieving revision 1.590
diff -u -r1.589 -r1.590
--- policycoreutils.spec	22 Jan 2009 20:25:45 -0000	1.589
+++ policycoreutils.spec	30 Jan 2009 16:35:13 -0000	1.590
@@ -6,7 +6,7 @@
 Summary: SELinux policy core utilities
 Name:	 policycoreutils
 Version: 2.0.61
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: GPLv2+
 Group:	 System Environment/Base
 Source:	 http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@@ -219,6 +219,9 @@
 fi
 
 %changelog
+* Fri Jan 30 2009 Dan Walsh <dwalsh at redhat.com> 2.0.61-7
+- Dont report errors on glob match and multiple links
+
 * Thu Jan 22 2009 Dan Walsh <dwalsh at redhat.com> 2.0.61-6
 - Move sepolgen-ifgen to post python
 



From akurtakov at fedoraproject.org  Fri Jan 30 16:38:35 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Fri, 30 Jan 2009 16:38:35 +0000 (UTC)
Subject: rpms/xml-commons-resolver/devel xml-commons-resolver-MANIFEST.MF,
	NONE, 1.1 xml-commons-resolver.spec, 1.18, 1.19
Message-ID: <20090130163836.05B3770117@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/xml-commons-resolver/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1588/devel

Modified Files:
	xml-commons-resolver.spec 
Added Files:
	xml-commons-resolver-MANIFEST.MF 
Log Message:
Install osgi manifest for eclipse-dtp



--- NEW FILE xml-commons-resolver-MANIFEST.MF ---
Manifest-Version: 1.0
Bundle-RequiredExecutionEnvironment: J2SE-1.2
Main-Class: org.apache.xml.resolver.apps.resolver
Bundle-SymbolicName: org.apache.xml.resolver
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name.0
Bundle-Localization: plugin
Bundle-Version: 1.2.0.v200806030312
Bundle-Vendor: %Bundle-Vendor.0
Require-Bundle: system.bundle
Export-Package: org.apache.env,org.apache.xml.resolver,org.apache.xml.
 resolver.apps,org.apache.xml.resolver.etc,org.apache.xml.resolver.hel
 pers,org.apache.xml.resolver.readers,org.apache.xml.resolver.tools


Index: xml-commons-resolver.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xml-commons-resolver/devel/xml-commons-resolver.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- xml-commons-resolver.spec	5 Sep 2008 20:09:32 -0000	1.18
+++ xml-commons-resolver.spec	30 Jan 2009 16:38:05 -0000	1.19
@@ -7,7 +7,7 @@
 
 Name:           xml-commons-resolver
 Version:        1.1
-Release: 	2.14%{?dist}
+Release: 	2.15%{?dist}
 Epoch:          0
 Summary:        Resolver subproject of xml-commons.
 License:        ASL 1.1
@@ -16,6 +16,7 @@
 Source1:        xml-commons-resolver-resolver.sh
 Source2:        xml-commons-resolver-xread.sh
 Source3:        xml-commons-resolver-xparse.sh
+Source4:        %{name}-MANIFEST.MF
 
 Patch0:			%{name}-src-version.patch
 
@@ -78,6 +79,12 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 
+# inject OSGi manifests
+mkdir -p META-INF
+cp -p %{SOURCE4} META-INF/MANIFEST.MF
+touch META-INF/MANIFEST.MF
+zip -u build/resolver.jar META-INF/MANIFEST.MF
+
 # Jars
 mkdir -p $RPM_BUILD_ROOT%{_javadir}
 cp build/resolver.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
@@ -142,6 +149,9 @@
 %{_javadocdir}/%{name}-%{version}
 
 %changelog
+* Fri Jan 30 2009 Alexander Kurtakov <akurtako at redhat.com> 0:1.1-2.15
+- Install osgi manifest for eclipse-dtp
+
 * Fri Sep 05 2008 Deepak Bhole <dbhole at redhat.com> 1.1-2.14
 - Build with IcedTea to escape sinjdoc issues
 
@@ -196,6 +206,5 @@
 * Tue May 06 2003 David Walluck <david at anti-microsoft.org> 0:1.0-2jpp
 - update for JPackage 1.5
 
-* Wed Nov 13 2002 Ville Skytt? <ville.skytta at iki.fi> - 1.0-1jpp
+* Wed Nov 13 2002 Ville Skytt??? <ville.skytta at iki.fi> - 1.0-1jpp
 - Follow upstream changes, split out of xml-commons.
-



From emaldonado at fedoraproject.org  Fri Jan 30 16:42:15 2009
From: emaldonado at fedoraproject.org (Elio Maldonado)
Date: Fri, 30 Jan 2009 16:42:15 +0000 (UTC)
Subject: rpms/crypto-utils/devel crypto-utils.spec,1.53,1.54
Message-ID: <20090130164215.EDEE370117@cvs1.fedora.phx.redhat.com>

Author: emaldonado

Update of /cvs/extras/rpms/crypto-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2328

Modified Files:
	crypto-utils.spec 
Log Message:
Fix bug number refrence


Index: crypto-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/crypto-utils/devel/crypto-utils.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- crypto-utils.spec	29 Jan 2009 22:32:48 -0000	1.53
+++ crypto-utils.spec	30 Jan 2009 16:41:45 -0000	1.54
@@ -133,7 +133,7 @@
 %changelog
 * Thu Jan 29 2009 Elio Maldonado <emaldona at redhat.com> - 2.4.1-9
 - certwatch: Fixed cert expiry time calculations (#473860)
-- keyutil: Fixed segfault on certificate generation (#473860)
+- keyutil: Fixed segfault on certificate generation (#479886)
 - genkey: Fixed key file name extension
 
 * Wed Jan 21 2009 Elio Maldonado <emaldona at redhat.com> - 2.4.1-8



From dwalsh at fedoraproject.org  Fri Jan 30 16:45:46 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Fri, 30 Jan 2009 16:45:46 +0000 (UTC)
Subject: rpms/xguest/devel xguest.spec,1.9,1.10
Message-ID: <20090130164546.9A3DC70117@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/xguest/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3679

Modified Files:
	xguest.spec 
Log Message:
* Fri Jan 30 2009 Dan Walsh <dwalsh at redhat.com> - 1.0.7-1
- Change xguest init script to have proper summary



Index: xguest.spec
===================================================================
RCS file: /cvs/extras/rpms/xguest/devel/xguest.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- xguest.spec	30 Jan 2009 13:14:26 -0000	1.9
+++ xguest.spec	30 Jan 2009 16:45:16 -0000	1.10
@@ -1,7 +1,7 @@
 Summary: Creates xguest user as a locked down user 
 Name: xguest
 Version: 1.0.7
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 BuildArch: noarch
@@ -9,7 +9,7 @@
 URL: http://people.fedoraproject.org/~dwalsh/xguest/
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires(pre): pam >= 0.99.8.1-17 selinux-policy > 3.3.1-26.fc9.noarch selinux-policy-base
+Requires(pre): pam >= 0.99.8.1-17 selinux-policy > 3.6.3-12 selinux-policy-base
 Requires(pre): policycoreutils
 Requires(post): sabayon-apply
 Requires: gdm >= 1:2.20.0-15.fc8
@@ -55,8 +55,6 @@
 
 semanage  boolean -m -S targeted -F /dev/stdin  << _EOF
 allow_polyinstantiation=1
-browser_confine_xguest=1
-browser_write_xguest_data=1
 xguest_connect_network=1
 xguest_mount_media=1
 xguest_use_bluetooth=1



From akurtakov at fedoraproject.org  Fri Jan 30 16:48:25 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Fri, 30 Jan 2009 16:48:25 +0000 (UTC)
Subject: rpms/xml-commons-apis/devel xml-commons-apis-MANIFEST.MF, NONE,
	1.1 xml-commons-apis.spec, 1.5, 1.6
Message-ID: <20090130164825.CF4CC70117@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/xml-commons-apis/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4265/devel

Modified Files:
	xml-commons-apis.spec 
Added Files:
	xml-commons-apis-MANIFEST.MF 
Log Message:
Add osgi metadata.


--- NEW FILE xml-commons-apis-MANIFEST.MF ---
Manifest-Version: 1.0
Bundle-RequiredExecutionEnvironment: J2SE-1.2
Bundle-SymbolicName: javax.xml
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name.0
Bundle-Localization: plugin
Bundle-Version: 1.3.4.v200806030440
Bundle-Vendor: %Bundle-Vendor.0
Require-Bundle: system.bundle
Export-Package: javax.xml;version="1.3",javax.xml.datatype;version="1.
 3",javax.xml.namespace;version="1.3",javax.xml.parsers;version="1.3",
 javax.xml.transform;version="1.3",javax.xml.transform.dom;version="1.
 3",javax.xml.transform.sax;version="1.3",javax.xml.transform.stream;v
 ersion="1.3",javax.xml.validation;version="1.3",javax.xml.xpath;versi
 on="1.3",org.apache.xmlcommons;version="1.3.4",org.w3c.dom;version="3
 .0",org.w3c.dom.bootstrap;version="3.0",org.w3c.dom.css;version="3.0"
 ,org.w3c.dom.events;version="3.0",org.w3c.dom.html;version="3.0",org.
 w3c.dom.ls;version="3.0",org.w3c.dom.ranges;version="3.0",org.w3c.dom
 .stylesheets;version="3.0",org.w3c.dom.traversal;version="3.0",org.w3
 c.dom.views;version="3.0",org.w3c.dom.xpath;version="3.0",org.xml.sax
 ;version="2.0.2",org.xml.sax.ext;version="2.0.2",org.xml.sax.helpers;
 version="2.0.2"


Index: xml-commons-apis.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xml-commons-apis/devel/xml-commons-apis.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- xml-commons-apis.spec	19 Sep 2008 19:34:36 -0000	1.5
+++ xml-commons-apis.spec	30 Jan 2009 16:47:55 -0000	1.6
@@ -35,13 +35,14 @@
 Name:           xml-commons-apis
 Summary:        APIs for DOM, SAX, and JAXP
 Version:        1.3.04
-Release:        1.3%{?dist}
+Release:        1.4%{?dist}
 Epoch:          0
 License:        ASL 2.0 and W3C and Public Domain
 URL:            http://xml.apache.org/commons/
 Source0:        xml-commons-external-1.3.04-src.tar.gz
 # svn export http://svn.apache.org/repos/asf/xml/commons/tags/xml-commons-external-1_3_04/java/external/
 # tar czf xml-commons-external-1.3.04-src.tar.gz external
+Source1:        %{name}-MANIFEST.MF
 Requires:       jpackage-utils >= 0:1.5
 BuildRequires:  jpackage-utils >= 0:1.5
 BuildRequires:  ant
@@ -105,6 +106,12 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 
+# inject OSGi manifests
+mkdir -p META-INF
+cp -p %{SOURCE1} META-INF/MANIFEST.MF
+touch META-INF/MANIFEST.MF
+zip -u build/xml-apis.jar META-INF/MANIFEST.MF
+
 # Jars
 mkdir -p $RPM_BUILD_ROOT%{_javadir}
 cp -p build/xml-apis.jar \
@@ -182,6 +189,9 @@
 # -----------------------------------------------------------------------------
 
 %changelog
+* Fri Jan 30 2009 Alexander Kurtakov <akurtako at redhat.com> 0:1.3.04-1.4
+- Add osgi metadata.
+
 * 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)
 



From dwalsh at fedoraproject.org  Fri Jan 30 16:49:42 2009
From: dwalsh at fedoraproject.org (Daniel J Walsh)
Date: Fri, 30 Jan 2009 16:49:42 +0000 (UTC)
Subject: rpms/selinux-policy/devel policy-20090105.patch, 1.27,
	1.28 selinux-policy.spec, 1.779, 1.780
Message-ID: <20090130164942.2A8EA70117@cvs1.fedora.phx.redhat.com>

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4628

Modified Files:
	policy-20090105.patch selinux-policy.spec 
Log Message:
* Fri Jan 30 2009 Dan Walsh <dwalsh at redhat.com> 3.6.3-12
- Add back transition from xguest to mozilla


policy-20090105.patch:

Index: policy-20090105.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-20090105.patch,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- policy-20090105.patch	30 Jan 2009 15:06:44 -0000	1.27
+++ policy-20090105.patch	30 Jan 2009 16:49:11 -0000	1.28
@@ -57,13 +57,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/seusers serefpolicy-3.6.3/config/appconfig-mcs/seusers
 --- nsaserefpolicy/config/appconfig-mcs/seusers	2008-08-07 11:15:14.000000000 -0400
-+++ serefpolicy-3.6.3/config/appconfig-mcs/seusers	2009-01-19 13:10:02.000000000 -0500
++++ serefpolicy-3.6.3/config/appconfig-mcs/seusers	2009-01-30 10:44:12.000000000 -0500
 @@ -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
++__default__:unconfined_u:s0-mcs_systemhigh
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/staff_u_default_contexts serefpolicy-3.6.3/config/appconfig-mcs/staff_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/staff_u_default_contexts	2008-11-11 16:13:50.000000000 -0500
 +++ serefpolicy-3.6.3/config/appconfig-mcs/staff_u_default_contexts	2009-01-19 13:10:02.000000000 -0500
@@ -359,6 +359,40 @@
 +gen_tunable(allow_console_login,false)
 +
 +
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/mcs serefpolicy-3.6.3/policy/mcs
+--- nsaserefpolicy/policy/mcs	2008-08-07 11:15:13.000000000 -0400
++++ serefpolicy-3.6.3/policy/mcs	2009-01-30 10:40:41.000000000 -0500
+@@ -67,7 +67,7 @@
+ # Note that getattr on files is always permitted.
+ #
+ mlsconstrain file { write setattr append unlink link rename ioctl lock execute relabelfrom }
+-	( h1 dom h2 );
++	(( h1 dom h2 ) or ( t1 == mlsfilewrite ));
+ 
+ mlsconstrain dir { create getattr setattr read write link unlink rename search add_name remove_name reparent rmdir lock ioctl }
+ 	(( h1 dom h2 ) or ( t2 == domain ) or ( t1 == mlsfileread ));
+@@ -75,7 +75,7 @@
+ # New filesystem object labels must be dominated by the relabeling subject
+ # clearance, also the objects are single-level.
+ mlsconstrain file { create relabelto }
+-	(( h1 dom h2 ) and ( l2 eq h2 ));
++	     ((( h1 dom h2 ) and ( l2 eq h2 )) or ( t1 == mlsfilewrite ));
+ 
+ # At this time we do not restrict "ps" type operations via MCS.  This
+ # will probably change in future.
+@@ -84,10 +84,10 @@
+ 
+ # new file labels must be dominated by the relabeling subject clearance
+ mlsconstrain { dir lnk_file chr_file blk_file sock_file fifo_file } { relabelfrom }
+-	( h1 dom h2 );
++	(( h1 dom h2 ) or ( t1 == mlsfilewrite ));
+ 
+ mlsconstrain { dir lnk_file chr_file blk_file sock_file fifo_file } { create relabelto }
+-	(( h1 dom h2 ) and ( l2 eq h2 ));
++	((( h1 dom h2 ) and ( l2 eq h2 ))  or ( t1 == mlsfilewrite ));
+ 
+ mlsconstrain process { transition dyntransition }
+ 	(( h1 dom h2 ) or ( t1 == mcssetcats ));
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/anaconda.te serefpolicy-3.6.3/policy/modules/admin/anaconda.te
 --- nsaserefpolicy/policy/modules/admin/anaconda.te	2009-01-05 15:39:44.000000000 -0500
 +++ serefpolicy-3.6.3/policy/modules/admin/anaconda.te	2009-01-19 13:10:02.000000000 -0500
@@ -6646,8 +6680,8 @@
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/roles/guest.te serefpolicy-3.6.3/policy/modules/roles/guest.te
 --- nsaserefpolicy/policy/modules/roles/guest.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.3/policy/modules/roles/guest.te	2009-01-19 13:10:02.000000000 -0500
-@@ -0,0 +1,36 @@
++++ serefpolicy-3.6.3/policy/modules/roles/guest.te	2009-01-30 11:41:43.000000000 -0500
+@@ -0,0 +1,26 @@
 +
 +policy_module(guest, 1.0.0)
 +
@@ -6673,16 +6707,6 @@
 +	mono_role_template(guest, guest_r, guest_t)
 +')
 +
-+
-+optional_policy(`
-+	gen_require(`
-+		type xguest_t;
-+		role xguest_r;
-+	')
-+
-+	mozilla_role(xguest, xguest_t, xguest_r)
-+')
-+
 +gen_user(guest_u, user, guest_r, s0, s0)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/roles/logadm.fc serefpolicy-3.6.3/policy/modules/roles/logadm.fc
 --- nsaserefpolicy/policy/modules/roles/logadm.fc	1969-12-31 19:00:00.000000000 -0500
@@ -7776,7 +7800,7 @@
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/roles/xguest.te serefpolicy-3.6.3/policy/modules/roles/xguest.te
 --- nsaserefpolicy/policy/modules/roles/xguest.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.6.3/policy/modules/roles/xguest.te	2009-01-19 13:10:02.000000000 -0500
++++ serefpolicy-3.6.3/policy/modules/roles/xguest.te	2009-01-30 10:50:34.000000000 -0500
 @@ -0,0 +1,87 @@
 +
 +policy_module(xguest, 1.0.0)
@@ -7816,9 +7840,9 @@
 +# Local policy
 +#
 +
-+#optional_policy(`
-+#	mozilla_role(xguest_r, xguest_t)
-+#')
++optional_policy(`
++	mozilla_role(xguest_r, xguest_t)
++')
 +
 +optional_policy(`
 +	java_role_template(xguest, xguest_r, xguest_t)
@@ -27846,8 +27870,8 @@
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.te serefpolicy-3.6.3/policy/modules/system/unconfined.te
 --- nsaserefpolicy/policy/modules/system/unconfined.te	2008-11-11 16:13:48.000000000 -0500
-+++ serefpolicy-3.6.3/policy/modules/system/unconfined.te	2009-01-19 13:10:02.000000000 -0500
-@@ -6,35 +6,76 @@
++++ serefpolicy-3.6.3/policy/modules/system/unconfined.te	2009-01-30 10:55:24.000000000 -0500
+@@ -6,35 +6,77 @@
  # Declarations
  #
  
@@ -27925,13 +27949,14 @@
  
  mcs_killall(unconfined_t)
  mcs_ptrace_all(unconfined_t)
++mls_file_write_all_levels(unconfined_t)
  
  init_run_daemon(unconfined_t, unconfined_r)
 +init_domtrans_script(unconfined_t)
  
  libs_run_ldconfig(unconfined_t, unconfined_r)
  
-@@ -42,26 +83,39 @@
+@@ -42,26 +84,39 @@
  logging_run_auditctl(unconfined_t, unconfined_r)
  
  mount_run_unconfined(unconfined_t, unconfined_r)
@@ -27973,7 +27998,7 @@
  ')
  
  optional_policy(`
-@@ -102,12 +156,24 @@
+@@ -102,12 +157,24 @@
  	')
  
  	optional_policy(`
@@ -27998,7 +28023,7 @@
  ')
  
  optional_policy(`
-@@ -119,31 +185,33 @@
+@@ -119,31 +186,33 @@
  ')
  
  optional_policy(`
@@ -28039,7 +28064,7 @@
  ')
  
  optional_policy(`
-@@ -155,36 +223,38 @@
+@@ -155,36 +224,38 @@
  ')
  
  optional_policy(`
@@ -28090,7 +28115,7 @@
  ')
  
  optional_policy(`
-@@ -192,7 +262,7 @@
+@@ -192,7 +263,7 @@
  ')
  
  optional_policy(`
@@ -28099,7 +28124,7 @@
  ')
  
  optional_policy(`
-@@ -204,11 +274,12 @@
+@@ -204,11 +275,12 @@
  ')
  
  optional_policy(`
@@ -28114,7 +28139,7 @@
  ')
  
  ########################################
-@@ -218,14 +289,60 @@
+@@ -218,14 +290,60 @@
  
  allow unconfined_execmem_t self:process { execstack execmem };
  unconfined_domain_noaudit(unconfined_execmem_t)


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.779
retrieving revision 1.780
diff -u -r1.779 -r1.780
--- selinux-policy.spec	30 Jan 2009 14:20:51 -0000	1.779
+++ selinux-policy.spec	30 Jan 2009 16:49:11 -0000	1.780
@@ -20,7 +20,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.6.3
-Release: 11%{?dist}
+Release: 12%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -444,6 +444,9 @@
 %endif
 
 %changelog
+* Fri Jan 30 2009 Dan Walsh <dwalsh at redhat.com> 3.6.3-12
+- Add back transition from xguest to mozilla
+
 * Fri Jan 30 2009 Dan Walsh <dwalsh at redhat.com> 3.6.3-11
 - Add virt_content_ro_t and labeling for isos directory
 



From orion at fedoraproject.org  Fri Jan 30 16:50:36 2009
From: orion at fedoraproject.org (Orion Poplawski)
Date: Fri, 30 Jan 2009 16:50:36 +0000 (UTC)
Subject: rpms/plplot/devel plplot-5.9.1-multiarch.patch, NONE,
	1.1 plplot-5.9.1-octave.patch, NONE, 1.1 plplot-5.9.2-info.patch,
	NONE, 1.1 .cvsignore, 1.14, 1.15 plplot.spec, 1.66, 1.67 sources,
	1.14, 1.15 plplot-5.7.4-info.patch, 1.1,
	NONE plplot-5.8.0-multiarch.patch, 1.1,
	NONE plplot-5.9.0-svn8985.patch, 1.1, NONE
Message-ID: <20090130165036.8CEAD70117@cvs1.fedora.phx.redhat.com>

Author: orion

Update of /cvs/pkgs/rpms/plplot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4922

Modified Files:
	.cvsignore plplot.spec sources 
Added Files:
	plplot-5.9.1-multiarch.patch plplot-5.9.1-octave.patch 
	plplot-5.9.2-info.patch 
Removed Files:
	plplot-5.7.4-info.patch plplot-5.8.0-multiarch.patch 
	plplot-5.9.0-svn8985.patch 
Log Message:
* Mon Jan 26 2009 - Orion Poplawski <orion at cora.nwra.com> - 5.9.2-1
- Update to 5.9.2
- Need rpaths during build
- Explicitly enable tk, itcl, itk, and pygcw
- Update info and multiarch patches
- Re-enable perl tests
- Add proper ocaml provides/requires
- Add patch to handle newer octave


plplot-5.9.1-multiarch.patch:

--- NEW FILE plplot-5.9.1-multiarch.patch ---
--- plplot-5.8.0/examples/f95/Makefile.examples.in.multiarch	2007-11-18 13:04:09.000000000 -0700
+++ plplot-5.8.0/examples/f95/Makefile.examples.in	2007-12-05 17:00:50.000000000 -0700
@@ -25,8 +25,6 @@
 EXEEXT = @EXEEXT@
 
 @pkg_config_true at LIB_TAG = @LIB_TAG@
- at pkg_config_true@PKG_CONFIG_ENV = @PKG_CONFIG_ENV@
- at pkg_config_true@RPATHCMD = @RPATHCMD@
 
 EXECUTABLES_list = \
 		 x01f$(EXEEXT) \
@@ -59,7 +57,7 @@
 	rm -f $(EXECUTABLES_list)
 
 .f90$(EXEEXT):
- at pkg_config_true@	$(F95) @MODULESINCCMD@ $< -o $@ $(RPATHCMD) `$(PKG_CONFIG_ENV) pkg-config --cflags --libs plplot$(LIB_TAG)-f95`
+ at pkg_config_true@	$(F95) @MODULESINCCMD@ $< -o $@ `pkg-config --cflags --libs plplot$(LIB_TAG)-f95`
 @pkg_config_false@	$(F95) @MODULESINCCMD@ $< -o $@ `plplot-config --cflags --libs --with-f95`
 
 .SUFFIXES: .f90 $(EXEEXT)
--- plplot-5.8.0/examples/tk/Makefile.examples.in.multiarch	2007-11-18 13:04:09.000000000 -0700
+++ plplot-5.8.0/examples/tk/Makefile.examples.in	2007-11-19 16:51:13.000000000 -0700
@@ -24,8 +24,6 @@
 EXEEXT = @EXEEXT@
 
 @pkg_config_true at LIB_TAG = @LIB_TAG@
- at pkg_config_true@PKG_CONFIG_ENV = @PKG_CONFIG_ENV@
- at pkg_config_true@RPATHCMD = @RPATHCMD@
 
 EXECUTABLES_list = \
 		 xtk01$(EXEEXT) \
@@ -38,7 +36,7 @@
 	rm -f $(EXECUTABLES_list)
 
 .c$(EXEEXT):
- at pkg_config_true@	$(CC) $< -o $@ $(RPATHCMD) `$(PKG_CONFIG_ENV) pkg-config --cflags --libs plplot$(LIB_TAG)-tcl`
+ at pkg_config_true@	$(CC) $< -o $@ `pkg-config --cflags --libs plplot$(LIB_TAG)-tcl`
 @pkg_config_false@	$(CC) $< -o $@ `plplot-config --cflags --libs --with-tcl`
 
 .SUFFIXES: .c $(EXEEXT)
--- plplot-5.8.0/examples/f77/Makefile.examples.in.multiarch	2007-11-18 13:04:09.000000000 -0700
+++ plplot-5.8.0/examples/f77/Makefile.examples.in	2007-12-05 17:01:06.000000000 -0700
@@ -25,8 +25,6 @@
 EXEEXT = @EXEEXT@
 
 @pkg_config_true at LIB_TAG = @LIB_TAG@
- at pkg_config_true@PKG_CONFIG_ENV = @PKG_CONFIG_ENV@
- at pkg_config_true@RPATHCMD = @RPATHCMD@
 
 EXECUTABLES_list = \
 		 x01f$(EXEEXT) \
@@ -59,7 +57,7 @@
 	rm -f $(EXECUTABLES_list)
 
 .f$(EXEEXT):
- at pkg_config_true@	$(F77) $< -o $@ $(RPATHCMD) `$(PKG_CONFIG_ENV) pkg-config --cflags --libs plplot$(LIB_TAG)-f77`
+ at pkg_config_true@	$(F77) $< -o $@ `pkg-config --cflags --libs plplot$(LIB_TAG)-f77`
 @pkg_config_false@	$(F77) $< -o $@ `plplot-config --cflags --libs --with-f77`
 
 .SUFFIXES: .f $(EXEEXT)
--- plplot-5.8.0/examples/c/Makefile.examples.in.multiarch	2007-11-18 13:04:08.000000000 -0700
+++ plplot-5.8.0/examples/c/Makefile.examples.in	2007-12-05 17:01:44.000000000 -0700
@@ -25,8 +25,6 @@
 EXEEXT = @EXEEXT@
 
 @pkg_config_true at LIB_TAG = @LIB_TAG@
- at pkg_config_true@PKG_CONFIG_ENV = @PKG_CONFIG_ENV@
- at pkg_config_true@RPATHCMD = @RPATHCMD@
 
 @gcw_true at PLPLOTCANVAS_EXECUTABLES_list = \
 @gcw_true@		 plplotcanvas_demo$(EXEEXT) \
@@ -69,21 +67,21 @@
 	rm -f $(EXECUTABLES_list)
 
 @gcw_true at plplotcanvas_demo$(EXEEXT): plplotcanvas_demo.c
- at gcw_true@@pkg_config_true@	$(CC) $< -o $@ $(RPATHCMD) \
- at gcw_true@@pkg_config_true@			`$(PKG_CONFIG_ENV) pkg-config --cflags --libs plplot$(LIB_TAG)-gnome2`
+ at gcw_true@@pkg_config_true@	$(CC) $< -o $@ \
+ at gcw_true@@pkg_config_true@			`pkg-config --cflags --libs plplot$(LIB_TAG)-gnome2`
 @gcw_true@@pkg_config_false@	$(CC) $< -o $@ \
 @gcw_true@@pkg_config_false@			`plplot-config --cflags --libs --with-gcw`
 
 @gcw_true at plplotcanvas_animation$(EXEEXT): plplotcanvas_animation.c
- at gcw_true@@pkg_config_true@	$(CC) $< -o $@ $(RPATHCMD) \
- at gcw_true@@pkg_config_true@			`$(PKG_CONFIG_ENV) pkg-config --cflags --libs plplot$(LIB_TAG)-gnome2` \
+ at gcw_true@@pkg_config_true@	$(CC) $< -o $@ \
+ at gcw_true@@pkg_config_true@			`pkg-config --cflags --libs plplot$(LIB_TAG)-gnome2` \
 @gcw_true@@pkg_config_true@			`pkg-config --cflags --libs gthread-2.0`			
 @gcw_true@@pkg_config_false@	$(CC) $< -o \
 @gcw_true@@pkg_config_false@			$@ `plplot-config --cflags --libs --with-gcw` \
 @gcw_true@@pkg_config_false@			@GCWTHREAD_CFLAGS@ @GCWTHREAD_LIBS@
 
 .c$(EXEEXT):
- at pkg_config_true@	$(CC) $< -o $@ $(RPATHCMD) `$(PKG_CONFIG_ENV) pkg-config --cflags --libs plplot$(LIB_TAG)`
+ at pkg_config_true@	$(CC) $< -o $@ `pkg-config --cflags --libs plplot$(LIB_TAG)`
 @pkg_config_false@	$(CC) $< -o $@ `plplot-config --cflags --libs`
 
 .SUFFIXES: .c $(EXEEXT)
--- plplot-5.9.1/examples/c++/Makefile.examples.in.multiarch	2008-12-14 17:29:09.000000000 -0700
+++ plplot-5.9.1/examples/c++/Makefile.examples.in	2008-12-17 11:06:31.000000000 -0700
@@ -25,8 +25,6 @@
 EXEEXT = @EXEEXT@
 
 @pkg_config_true at LIB_TAG = @LIB_TAG@
- at pkg_config_true@PKG_CONFIG_ENV = @PKG_CONFIG_ENV@
- at pkg_config_true@RPATHCMD = @RPATHCMD@
 
 @wxwidgets_true@@pkg_config_true at PLPLOTWXWIDGETS_EXECUTABLES_list = \
 @wxwidgets_true@@pkg_config_true@	wxPLplotDemo$(EXEEXT)
@@ -71,10 +69,10 @@
 	rm -f $(EXECUTABLES_list)
 
 @wxwidgets_true@@pkg_config_true at wxPLplotDemo$(EXEEXT): wxPLplotDemo.cpp
- at wxwidgets_true@@pkg_config_true@	$(CXX) $< -o $@ $(RPATHCMD) `$(PKG_CONFIG_ENV) pkg-config --cflags --libs plplot$(LIB_TAG)-wxwidgets`
+ at wxwidgets_true@@pkg_config_true@	$(CXX) $< -o $@ `pkg-config --cflags --libs plplot$(LIB_TAG)-wxwidgets`
 
 .cc$(EXEEXT):
- at pkg_config_true@	$(CXX) $< -o $@ $(RPATHCMD) `$(PKG_CONFIG_ENV) pkg-config --cflags --libs plplot$(LIB_TAG)-c++`
+ at pkg_config_true@	$(CXX) $< -o $@ `pkg-config --cflags --libs plplot$(LIB_TAG)-c++`
 @pkg_config_false@	$(CXX) $< -o $@ `plplot-config --cflags --libs --with-c++`
 
 .SUFFIXES: .cc $(EXEEXT)

plplot-5.9.1-octave.patch:

--- NEW FILE plplot-5.9.1-octave.patch ---
--- plplot-5.9.1/plplot_test/test_octave.sh.in.octave	2009-01-13 20:49:22.000000000 -0700
+++ plplot-5.9.1/plplot_test/test_octave.sh.in	2009-01-13 21:21:38.000000000 -0700
@@ -82,7 +82,8 @@
 		if (verbose_test)
 		    printf("%s\n",cmd);
 		    endif
-		    t = split("$options", "-"); t(1,:)="";
+		    t = split("$options", "-");
+                    if (t); t(1,:)=""; endif;
 		    for j=1:rows(t)
 		    tt = deblank (t(j,:)); len = length(tt);
 		    ix = index(tt," ");

plplot-5.9.2-info.patch:

--- NEW FILE plplot-5.9.2-info.patch ---
--- plplot-5.9.2/doc/docbook/src/plplotdoc.info.orig	2009-01-18 13:24:12.000000000 -0700
+++ plplot-5.9.2/doc/docbook/src/plplotdoc.info	2009-01-26 09:32:53.000000000 -0700
@@ -5,7 +5,7 @@
 
 INFO-DIR-SECTION Scientific Visualization
 START-INFO-DIR-ENTRY
-* The PLplot Plotting Library: (plplotdoc).   The PLplot Plotting Library
+* PLplot: (plplotdoc).               The PLplot Plotting Library.
 END-INFO-DIR-ENTRY
 
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/plplot/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	13 Nov 2008 22:44:52 -0000	1.14
+++ .cvsignore	30 Jan 2009 16:50:01 -0000	1.15
@@ -1,3 +1 @@
-plplot-5.9.0.tar.gz
-plplot-5.9.0-svn8752.patch
-plplot-5.9.0-svn8985.patch
+plplot-5.9.2.tar.gz


Index: plplot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/plplot/devel/plplot.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- plplot.spec	5 Dec 2008 12:04:34 -0000	1.66
+++ plplot.spec	30 Jan 2009 16:50:06 -0000	1.67
@@ -6,20 +6,19 @@
 %bcond_without octave
 # Set to bcond_with or use --without pdl to disable pdl tests - needed to 
 # bootstrap or for soname bumps in a plplot dependency
-%bcond_with pdl
+%bcond_without pdl
 
 Name:           plplot
-Version:        5.9.0
-Release:        4.svn8985%{?dist}
+Version:        5.9.2
+Release:        1%{?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-svn8985.patch
-Patch1:         plplot-5.8.0-multiarch.patch
-Patch2:         plplot-5.7.4-info.patch
+Patch1:         plplot-5.9.1-multiarch.patch
+Patch2:         plplot-5.9.2-info.patch
 Patch6:         plplot-5.7.3-jni.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -29,6 +28,8 @@
 %ifnarch ppc64
 BuildRequires:  gcc-gnat
 %define build_ada -DENABLE_ada:BOOL=ON
+#Cannot use -DHAVE_ADA_2007:BOOL=ON
+#see https://bugzilla.redhat.com/show_bug.cgi?id=473811
 %else
 %define build_ada %{nil}
 %endif
@@ -177,6 +178,9 @@
 Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
 Provides:       ocaml-plplot = %{version}-%{release}
+%define _use_internal_dependency_generator 0
+%define __find_requires /usr/lib/rpm/ocaml-find-requires.sh
+%define __find_provides /usr/lib/rpm/ocaml-find-provides.sh
 
 %description    ocaml
 %{summary}.
@@ -257,9 +261,6 @@
 
 %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
@@ -274,12 +275,18 @@
 #Needed for octave output to not have control characters
 unset TERM
 %cmake .. \
+	-DCMAKE_SKIP_RPATH:BOOL=OFF \
+	-DCMAKE_INSTALL_RPATH:PATH="" \
 	%{build_ada} \
 	-DENABLE_d:BOOL=ON \
+	-DENABLE_itcl:BOOL=ON \
+	-DENABLE_itk:BOOL=ON \
 	-DENABLE_ocaml:BOOL=ON \
 	-DOCAML_INSTALL_DIR:PATH=`ocamlc -where` \
 	%{build_octave} \
 	-DENABLE_pdl:BOOL=ON \
+	-DENABLE_pygcw:BOOL=ON \
+	-DENABLE_tk:BOOL=ON \
 	-DHAVE_PTHREAD:BOOL=ON \
 	-DPL_FREETYPE_FONT_PATH:PATH="/usr/share/fonts/freefont" \
 	-DPLD_aqt:BOOL=ON \
@@ -334,9 +341,9 @@
 export ITCL_LIBRARY=%{_libdir}/tcl8.5/itcl3.4
 # Exclude perl and compare tests for now, and ocaml from ppc/ppc64
 %ifarch ppc ppc64
-ctest -V -E 'compare|ocaml|perl'
+ctest -V -E 'compare|ocaml'
 %else
-ctest -V -E 'compare|perl'
+ctest -V -E 'compare'
 %endif
 
 
@@ -401,6 +408,7 @@
 %{_datadir}/plplot%{version}/examples/test_python.sh
 %{_datadir}/plplot%{version}/examples/test_tcl.sh
 %{_datadir}/plplot%{version}/examples/plplot-test.sh
+%{_datadir}/plplot%{version}/examples/plplot-test-interactive.sh
 
 %files libs
 %defattr(-,root,root,-)
@@ -595,6 +603,15 @@
 
 
 %changelog
+* Mon Jan 26 2009 - Orion Poplawski <orion at cora.nwra.com> - 5.9.2-1
+- Update to 5.9.2
+- Need rpaths during build
+- Explicitly enable tk, itcl, itk, and pygcw
+- Update info and multiarch patches
+- Re-enable perl tests
+- Add proper ocaml provides/requires
+- Add patch to handle newer octave
+
 * Thu Dec  4 2008 Richard W.M. Jones <rjones at redhat.com> - 5.9.0-4.svn8985
 - Rebuild for OCaml 3.11.0.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/plplot/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	13 Nov 2008 22:44:52 -0000	1.14
+++ sources	30 Jan 2009 16:50:06 -0000	1.15
@@ -1,2 +1 @@
-bfaeba7a5f1ef83edc3787af04694539  plplot-5.9.0.tar.gz
-f33bfd50fd463aa5dcc593ca9a006c35  plplot-5.9.0-svn8985.patch
+2a14753112083badab87f1806cc12a46  plplot-5.9.2.tar.gz


--- plplot-5.7.4-info.patch DELETED ---


--- plplot-5.8.0-multiarch.patch DELETED ---


--- plplot-5.9.0-svn8985.patch DELETED ---



From limb at fedoraproject.org  Fri Jan 30 16:57:36 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Fri, 30 Jan 2009 16:57:36 +0000 (UTC)
Subject: rpms/xmoto/F-10 xmoto-0.4.2-opengldepth.patch, NONE, 1.1 xmoto.spec,
	1.43, 1.44
Message-ID: <20090130165736.CC77B70117@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/xmoto/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6479

Modified Files:
	xmoto.spec 
Added Files:
	xmoto-0.4.2-opengldepth.patch 
Log Message:
Fix for ati crash.


xmoto-0.4.2-opengldepth.patch:

--- NEW FILE xmoto-0.4.2-opengldepth.patch ---
--- src/drawlib/DrawLibOpenGL.cpp	2008-03-18 19:33:33.000000000 +0200
+++ src/drawlib/DrawLibOpenGL.cpp~	2009-01-25 17:06:46.000000000 +0200
@@ -267,19 +267,10 @@
                     
   m_nDispBPP=pVidInfo->vfmt->BitsPerPixel;
 
-  /* Did we get a z-buffer? */        
-  int nDepthBits;
-  SDL_GL_GetAttribute(SDL_GL_DEPTH_SIZE,&nDepthBits);
-  if(nDepthBits == 0)
-    throw Exception("no depth buffer");  
-  
   m_menuCamera = new Camera(Vector2i(0,0),
 			    Vector2i(m_nDispWidth,m_nDispHeight));
   m_menuCamera->setCamera2d();
     
-  glClearDepth(1);
-  glDepthFunc(GL_LEQUAL);
-     
   /* Output some general info */
   Logger:: Log("GL: %s (%s)",glGetString(GL_RENDERER),glGetString(GL_VENDOR));
   if(glGetString(GL_RENDERER) == NULL || 


Index: xmoto.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xmoto/F-10/xmoto.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- xmoto.spec	15 Oct 2008 14:44:47 -0000	1.43
+++ xmoto.spec	30 Jan 2009 16:57:06 -0000	1.44
@@ -1,7 +1,6 @@
-%define _default_patch_fuzz 2
 Name:		xmoto
 Version:	0.4.2
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	Challenging 2D Motocross Platform Game
 
 Group:		Amusements/Games
@@ -16,6 +15,7 @@
 Patch3:		xmoto-0.4.0-Environment-string.patch
 Patch4:		xmoto-0.4.0-DrawLib-hashmap.patch
 Patch5:		xmoto-0.4.2-initode.patch
+Patch6:		xmoto-0.4.2-opengldepth.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	desktop-file-utils
@@ -44,10 +44,11 @@
 %setup -q
 #%patch
 %patch1 -p0
-%patch2 -p0
+%patch2 -p0 -F2
 %patch3 -p0
 %patch4 -p0
-%patch5 -p1
+%patch5 -p0
+%patch6 -p0 -F2
 
 #fix encoding
 sed -i 's/\r//' src/xmscene/Camera.cpp
@@ -100,6 +101,10 @@
 %{_mandir}/man6/xmoto.6.gz
 
 %changelog
+* Mon Jan 26 2009 Jon Ciesla <limb at jcomserv.net> 0.4.2-5
+- Fix for ati crash, BZ 481485.
+- De-fuzz patches.
+
 * Wed Oct 15 2008 Hans de Goede <hdegoede at redhat.com> 0.4.2-4
 - Fix crash caused by using new ode (bz 466738)
 



From than at fedoraproject.org  Fri Jan 30 17:02:10 2009
From: than at fedoraproject.org (Than Ngo)
Date: Fri, 30 Jan 2009 17:02:10 +0000 (UTC)
Subject: rpms/kde-l10n/F-10 kde-l10n.spec, 1.55, 1.56 sources, 1.18,
	1.19 subdirs-kde-l10n, 1.14, 1.15
Message-ID: <20090130170210.3AEB970117@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kde-l10n/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7329

Modified Files:
	kde-l10n.spec sources subdirs-kde-l10n 
Log Message:
enable he




Index: kde-l10n.spec
===================================================================
RCS file: /cvs/extras/rpms/kde-l10n/F-10/kde-l10n.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- kde-l10n.spec	26 Jan 2009 08:02:10 -0000	1.55
+++ kde-l10n.spec	30 Jan 2009 17:01:39 -0000	1.56
@@ -2,7 +2,7 @@
 
 Name: kde-l10n
 Version: 4.2.0
-Release: 1%{dist}
+Release: 2%{dist}
 Url: http://www.kde.org
 Summary: Internationalization support for KDE
 Group: User Interface/Desktops
@@ -62,6 +62,7 @@
 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
+SOurce53: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kde-l10n-he-4.2.0.tar.bz2
 
 Source1000: subdirs-kde-l10n
 
@@ -1013,12 +1014,10 @@
 %lang(gl) %{_kde4_docdir}/HTML/gl
 %lang(gl) %{_mandir}/gl/*/*
 
-%if %{buildall}
 %files Hebrew
 %defattr(-,root,root)
 %lang(he) %{_datadir}/locale/he/*
 %lang(he) %{_kde4_appsdir}/klettres/he
-%endif
 
 %files Hindi
 %defattr(-,root,root)
@@ -1326,6 +1325,9 @@
 %lang(zh_TW) %{_kde4_docdir}/HTML/zh_TW
 
 %changelog
+* Fri Jan 30 2009 Than Ngo <than at redhat.com> - 4.2.0-2
+- enable he
+
 * Thu Jan 22 2009 Than Ngo <than at redhat.com> - 4.2.0-1
 - 4.2.0
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kde-l10n/F-10/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources	24 Jan 2009 10:23:12 -0000	1.18
+++ sources	30 Jan 2009 17:01:39 -0000	1.19
@@ -44,3 +44,4 @@
 058b0bd3a7b2ca4ef56730488a234afa  kde-l10n-ar-4.2.0.tar.bz2
 5248515b294143a7821055754b9236e4  kde-l10n-eu-4.2.0.tar.bz2
 fb2e1d63d9d926c6639a537b6bf73d03  kde-l10n-et-4.2.0.tar.bz2
+e45690f965c153b2f25ebba5358d1912  kde-l10n-he-4.2.0.tar.bz2


Index: subdirs-kde-l10n
===================================================================
RCS file: /cvs/extras/rpms/kde-l10n/F-10/subdirs-kde-l10n,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- subdirs-kde-l10n	24 Jan 2009 10:37:53 -0000	1.14
+++ subdirs-kde-l10n	30 Jan 2009 17:01:39 -0000	1.15
@@ -14,6 +14,7 @@
 fr
 ga
 gl
+he
 hi
 hu
 it



From akurtakov at fedoraproject.org  Fri Jan 30 17:05:33 2009
From: akurtakov at fedoraproject.org (Alexander Kurtakov)
Date: Fri, 30 Jan 2009 17:05:33 +0000 (UTC)
Subject: rpms/xerces-j2/devel xerces-j2-MANIFEST.MF, NONE, 1.1 xerces-j2.spec,
	1.50, 1.51
Message-ID: <20090130170533.4FBCC70117@cvs1.fedora.phx.redhat.com>

Author: akurtakov

Update of /cvs/pkgs/rpms/xerces-j2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8078/devel

Modified Files:
	xerces-j2.spec 
Added Files:
	xerces-j2-MANIFEST.MF 
Log Message:
Add osgi manifest.


--- NEW FILE xerces-j2-MANIFEST.MF ---
Manifest-Version: 1.0
Bundle-RequiredExecutionEnvironment: J2SE-1.2
Bundle-SymbolicName: org.apache.xerces
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name.0
Bundle-Localization: plugin
Bundle-Version: 2.9.0.v200909240008
Bundle-Vendor: %Bundle-Vendor.0
Require-Bundle: system.bundle,javax.xml;bundle-version="[1.3.4,2.0.0)"
 ;visibility:=reexport,org.apache.xml.resolver;bundle-version="[1.2.0,
 2.0.0)";visibility:=reexport,org.apache.xml.serializer;bundle-version
 ="[2.7.1,3.0.0)"
Export-Package: META-INF.services;version="2.9.0",org.apache.html.dom;
 version="2.9.0",org.apache.wml;version="2.9.0",org.apache.wml.dom;ver
 sion="2.9.0",org.apache.xerces.dom;version="2.9.0",org.apache.xerces.
 dom.events;version="2.9.0",org.apache.xerces.dom3.as;version="2.9.0",
 org.apache.xerces.impl;version="2.9.0",org.apache.xerces.impl.dtd;ver
 sion="2.9.0",org.apache.xerces.impl.dtd.models;version="2.9.0",org.ap
 ache.xerces.impl.dv;version="2.9.0",org.apache.xerces.impl.dv.dtd;ver
 sion="2.9.0",org.apache.xerces.impl.dv.util;version="2.9.0",org.apach
 e.xerces.impl.dv.xs;version="2.9.0",org.apache.xerces.impl.io;version
 ="2.9.0",org.apache.xerces.impl.msg;version="2.9.0",org.apache.xerces
 .impl.validation;version="2.9.0",org.apache.xerces.impl.xpath;version
 ="2.9.0",org.apache.xerces.impl.xpath.regex;version="2.9.0",org.apach
 e.xerces.impl.xs;version="2.9.0",org.apache.xerces.impl.xs.identity;v
 ersion="2.9.0",org.apache.xerces.impl.xs.models;version="2.9.0",org.a
 pache.xerces.impl.xs.opti;version="2.9.0",org.apache.xerces.impl.xs.t
 raversers;version="2.9.0",org.apache.xerces.impl.xs.util;version="2.9
 .0",org.apache.xerces.jaxp;version="2.9.0",org.apache.xerces.jaxp.dat
 atype;version="2.9.0",org.apache.xerces.jaxp.validation;version="2.9.
 0",org.apache.xerces.parsers;version="2.9.0",org.apache.xerces.util;v
 ersion="2.9.0",org.apache.xerces.xinclude;version="2.9.0",org.apache.
 xerces.xni;version="2.9.0",org.apache.xerces.xni.grammars;version="2.
 9.0",org.apache.xerces.xni.parser;version="2.9.0",org.apache.xerces.x
 pointer;version="2.9.0",org.apache.xerces.xs;version="2.9.0",org.apac
 he.xerces.xs.datatypes;version="2.9.0",org.apache.xml.serialize;versi
 on="2.9.0",org.w3c.dom.html;version="2.9.0"


Index: xerces-j2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xerces-j2/devel/xerces-j2.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- xerces-j2.spec	10 Jul 2008 20:36:58 -0000	1.50
+++ xerces-j2.spec	30 Jan 2009 17:05:02 -0000	1.51
@@ -37,7 +37,7 @@
 
 Name:           xerces-j2
 Version:        2.7.1
-Release:        10.2%{?dist}
+Release:        10.3%{?dist}
 Epoch:          0
 Summary:        Java XML parser
 License:        ASL 2.0
@@ -47,6 +47,7 @@
 Source1:        %{name}-version.sh
 Source2:        %{name}-constants.sh
 Source3:        XJavac.java
+Source4:        %{name}-MANIFEST.MF
 Patch0:         %{name}-build.patch
 Patch1:         %{name}-libgcj.patch
 Obsoletes:      xerces-j2-dom3 < %{epoch}:%{version}-%{release}
@@ -211,6 +212,12 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 
+# inject OSGi manifests
+mkdir -p META-INF
+cp -p %{SOURCE4} META-INF/MANIFEST.MF
+touch META-INF/MANIFEST.MF
+zip -u build/xercesImpl.jar META-INF/MANIFEST.MF
+
 # jars
 mkdir -p $RPM_BUILD_ROOT%{_javadir}
 cp -p build/xercesImpl.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
@@ -367,6 +374,9 @@
 
 
 %changelog
+* Fri Jan 30 2009 Alexander Kurtakov <akurtako at redhat.com> 0:2.7.1-10.3
+- Add osgi manifest.
+
 * Thu Jul 10 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0:2.7.1-10.2
 - drop repotag
 - fix license tag



From than at fedoraproject.org  Fri Jan 30 17:11:49 2009
From: than at fedoraproject.org (Than Ngo)
Date: Fri, 30 Jan 2009 17:11:49 +0000 (UTC)
Subject: rpms/kdelibs/devel kdelibs.spec,1.425,1.426
Message-ID: <20090130171149.8B93C70117@cvs1.fedora.phx.redhat.com>

Author: than

Update of /cvs/extras/rpms/kdelibs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9064

Modified Files:
	kdelibs.spec 
Log Message:
-p0 instead -p1



Index: kdelibs.spec
===================================================================
RCS file: /cvs/extras/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.425
retrieving revision 1.426
diff -u -r1.425 -r1.426
--- kdelibs.spec	30 Jan 2009 15:21:21 -0000	1.425
+++ kdelibs.spec	30 Jan 2009 17:11:19 -0000	1.426
@@ -215,9 +215,9 @@
 
 # upstream patches
 %patch101 -p1 -b .AllowExternalPaths
-%patch110 -p1 -b .kde#917170
-%patch111 -p1 -b .kde#918403
-%patch112 -p1 -b .kde#918654
+%patch110 -p0 -b .kde#917170
+%patch111 -p0 -b .kde#918403
+%patch112 -p0 -b .kde#918654
 
 
 %build



From rdieter at fedoraproject.org  Fri Jan 30 17:19:13 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 30 Jan 2009 17:19:13 +0000 (UTC)
Subject: rpms/kdelibs/F-10 kdelibs-4.2.1-kde#917170.patch, NONE,
	1.1 kdelibs-4.2.1-kde#918403.patch, NONE,
	1.1 kdelibs-4.2.1-kde#918654.patch, NONE, 1.1 kdelibs.spec,
	1.400, 1.401
Message-ID: <20090130171913.440CE70117@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdelibs/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11182

Modified Files:
	kdelibs.spec 
Added Files:
	kdelibs-4.2.1-kde#917170.patch kdelibs-4.2.1-kde#918403.patch 
	kdelibs-4.2.1-kde#918654.patch 
Log Message:
* Fri Jan 30 2009 Luk???? Tinkl <ltinkl at redhat.com> 4.2.0-6
- Emit the correct FilesRemoved signal if the job was aborted in the middle of its operation, 
  otherwise it can result in confusion and data loss (overwriting files with files
  that don't exist). kdebug:118593
- Fix "klauncher hangs when kdeinit4 dies" -- this happened because
  klauncher was doing a blocking read forever.
- Repair klauncher support for unique-applications like konsole.
  kdebug:162729, kdebug:75492


kdelibs-4.2.1-kde#917170.patch:

--- NEW FILE kdelibs-4.2.1-kde#917170.patch ---
Index: kio/kio/copyjob.h
===================================================================
--- kio/kio/copyjob.h	(revision 917169)
+++ kio/kio/copyjob.h	(revision 917170)
@@ -245,6 +245,7 @@
 
     protected:
         CopyJob(CopyJobPrivate &dd);
+        void emitResult();
 
     private:
         Q_PRIVATE_SLOT(d_func(), void slotStart())
Index: kio/kio/copyjob.cpp
===================================================================
--- kio/kio/copyjob.cpp	(revision 917169)
+++ kio/kio/copyjob.cpp	(revision 917170)
@@ -153,7 +153,7 @@
     QList<CopyInfo> dirs;
     KUrl::List dirsToRemove;
     KUrl::List m_srcList;
-    KUrl::List m_skippedSourceUrls;
+    KUrl::List m_successSrcList;
     KUrl::List::const_iterator m_currentStatSrc;
     bool m_bCurrentSrcIsDir;
     bool m_bCurrentOperationIsLink;
@@ -770,10 +770,6 @@
 
 void CopyJobPrivate::skip( const KUrl & sourceUrl )
 {
-    // If this is one if toplevel sources,
-    // remove it from d->m_srcList, for a correct FilesRemoved() signal
-    // But don't do it right away, we have iterators into that list (#157601)
-    m_skippedSourceUrls.append( sourceUrl );
     dirsToRemove.removeAll( sourceUrl );
 }
 
@@ -857,6 +853,7 @@
     {
         //this is required for the undo feature
         emit q->copyingDone( q, (*it).uSource, (*it).uDest, (*it).mtime, true, false );
+        m_successSrcList.append((*it).uSource);
         m_directoriesCopied.append( *it );
         dirs.erase( it );
     }
@@ -1118,6 +1115,7 @@
             emit q->copyingDone( q, (*it).uSource, (*it).uDest, (*it).mtime, false, false );
             if (m_mode == CopyJob::Move)
                 org::kde::KDirNotify::emitFileMoved( (*it).uSource.url(), (*it).uDest.url() );
+            m_successSrcList.append((*it).uSource);
         }
         // remove from list, to move on to next file
         files.erase( it );
@@ -1372,7 +1370,7 @@
         KIO::Job * newjob = 0;
         if ( m_mode == CopyJob::Link ) {
             // User requested that a symlink be made
-          JobFlags flags = bOverwrite ? Overwrite : DefaultFlags;
+            const JobFlags flags = bOverwrite ? Overwrite : DefaultFlags;
             newjob = linkNextFile(uSource, uDest, flags);
             if (!newjob)
                 return;
@@ -1384,7 +1382,7 @@
                   (uSource.pass() == uDest.pass()))
             // Copying a symlink - only on the same protocol/host/etc. (#5601, downloading an FTP file through its link),
         {
-            JobFlags flags = bOverwrite ? Overwrite : DefaultFlags;
+            const JobFlags flags = bOverwrite ? Overwrite : DefaultFlags;
             KIO::SimpleJob *newJob = KIO::symlink( (*it).linkDest, uDest, flags | HideProgressInfo /*no GUI*/ );
             Scheduler::scheduleJob(newJob);
             newjob = newJob;
@@ -1509,23 +1507,6 @@
         // but then we need to jump to the else part below. Maybe with a recursive call?
 #endif
     } else {
-        // Finished - tell the world
-        if ( !m_bOnlyRenames )
-        {
-            KUrl url( m_globalDest );
-            if ( m_globalDestinationState != DEST_IS_DIR || m_asMethod )
-                url.setPath( url.directory() );
-            //kDebug(7007) << "KDirNotify'ing FilesAdded " << url;
-            org::kde::KDirNotify::emitFilesAdded( url.url() );
-
-            Q_FOREACH(const KUrl& url, m_skippedSourceUrls)
-                m_srcList.removeAll(url);
-
-            if ( m_mode == CopyJob::Move && !m_srcList.isEmpty() ) {
-                //kDebug(7007) << "KDirNotify'ing FilesRemoved " << m_srcList.toStringList();
-                org::kde::KDirNotify::emitFilesRemoved( m_srcList.toStringList() );
-            }
-        }
         if (m_reportTimer)
             m_reportTimer->stop();
         --m_processedFiles; // undo the "start at 1" hack
@@ -1535,6 +1516,27 @@
     }
 }
 
+void CopyJob::emitResult()
+{
+    Q_D(CopyJob);
+    // Before we go, tell the world about the changes that were made.
+    // Even if some error made us abort midway, we might still have done
+    // part of the job so we better update the views! (#118583)
+    if (!d->m_bOnlyRenames) {
+        KUrl url(d->m_globalDest);
+        if (d->m_globalDestinationState != DEST_IS_DIR || d->m_asMethod)
+            url.setPath(url.directory());
+        //kDebug(7007) << "KDirNotify'ing FilesAdded " << url;
+        org::kde::KDirNotify::emitFilesAdded( url.url() );
+
+        if (d->m_mode == CopyJob::Move && !d->m_successSrcList.isEmpty()) {
+            kDebug(7007) << "KDirNotify'ing FilesRemoved" << d->m_successSrcList.toStringList();
+            org::kde::KDirNotify::emitFilesRemoved(d->m_successSrcList.toStringList());
+        }
+    }
+    Job::emitResult();
+}
+
 void CopyJobPrivate::slotProcessedSize( KJob*, qulonglong data_size )
 {
   Q_Q(CopyJob);
@@ -1801,6 +1803,7 @@
         kDebug(7007) << "Renaming succeeded, move on";
         ++m_processedFiles;
         emit q->copyingDone( q, *m_currentStatSrc, dest, -1 /*mtime unknown, and not needed*/, true, true );
+        m_successSrcList.append(*m_currentStatSrc);
         statNextSrc();
     }
 }

kdelibs-4.2.1-kde#918403.patch:

--- NEW FILE kdelibs-4.2.1-kde#918403.patch ---
Index: kinit/klauncher.cpp
===================================================================
--- kinit/klauncher.cpp	(revision 918402)
+++ kinit/klauncher.cpp	(revision 918403)
@@ -167,7 +167,7 @@
 
 KLauncher::KLauncher(int _kdeinitSocket)
   : QObject(0),
-    kdeinitSocket(_kdeinitSocket), dontBlockReading(false)
+    kdeinitSocket(_kdeinitSocket)
 {
 #ifdef Q_WS_X11
    mCached_dpy = NULL;
@@ -276,8 +276,24 @@
 {
   ssize_t result;
   int bytes_left = len;
-  while ( bytes_left > 0)
-  {
+    while (bytes_left > 0) {
+        // in case we get a request to start an application and data arrive
+        // to kdeinitSocket at the same time, requestStart() will already
+        // call slotKDEInitData(), so we must check there's still something
+        // to read, otherwise this would block
+
+        // Same thing if kdeinit dies without warning.
+
+        fd_set in;
+        timeval tm = { 30, 0 }; // 30 seconds timeout, so we're not stuck in case kdeinit dies on us
+        FD_ZERO ( &in );
+        FD_SET( sock, &in );
+        select( sock + 1, &in, 0, 0, &tm );
+        if( !FD_ISSET( sock, &in )) {
+            kDebug(7016) << "read_socket" << sock << "nothing to read, kdeinit4 must be dead";
+            return -1;
+        }
+
      result = read(sock, buffer, bytes_left);
      if (result > 0)
      {
@@ -298,21 +314,7 @@
 {
    klauncher_header request_header;
    QByteArray requestData;
-   if( dontBlockReading )
-   {
-   // in case we get a request to start an application and data arrive
-   // to kdeinitSocket at the same time, requestStart() will already
-   // call slotKDEInitData(), so we must check there's still something
-   // to read, otherwise this would block
-      fd_set in;
-      timeval tm = { 0, 0 };
-      FD_ZERO ( &in );
-      FD_SET( kdeinitSocket, &in );
-      select( kdeinitSocket + 1, &in, 0, 0, &tm );
-      if( !FD_ISSET( kdeinitSocket, &in ))
-         return;
-   }
-   dontBlockReading = false;
+
    int result = read_socket(kdeinitSocket, (char *) &request_header,
                             sizeof( request_header));
    if (result == -1)
@@ -647,17 +649,21 @@
    request_header.cmd = LAUNCHER_EXEC_NEW;
 #endif
    request_header.arg_length = requestData.length();
+
+#ifdef KLAUNCHER_VERBOSE_OUTPUT
+   kDebug(7016) << "Asking kdeinit to start" << request->name << request->arg_list
+                << "cmd=" << commandToString(request_header.cmd);
+#endif
+
    write(kdeinitSocket, &request_header, sizeof(request_header));
    write(kdeinitSocket, requestData.data(), requestData.length());
 
    // Wait for pid to return.
    lastRequest = request;
-   dontBlockReading = false;
    do {
       slotKDEInitData( kdeinitSocket );
    }
    while (lastRequest != 0);
-   dontBlockReading = true;
 #endif
 }
 

kdelibs-4.2.1-kde#918654.patch:

--- NEW FILE kdelibs-4.2.1-kde#918654.patch ---
Index: kinit/klauncher.cpp
===================================================================
--- kinit/klauncher.cpp	(revision 918653)
+++ kinit/klauncher.cpp	(revision 918654)
@@ -58,6 +58,9 @@
 
 // #define KLAUNCHER_VERBOSE_OUTPUT
 
+static const char* const s_DBusStartupTypeToString[] =
+    { "DBusNone", "DBusUnique", "DBusMulti", "DBusWait", "ERROR" };
+
 using namespace KIO;
 
 IdleSlave::IdleSlave(QObject *parent)
@@ -393,15 +396,19 @@
       if (request->pid == pid)
       {
          if (request->dbus_startup_type == KService::DBusWait)
-            request->status = KLaunchRequest::Done;
+             request->status = KLaunchRequest::Done;
          else if ((request->dbus_startup_type == KService::DBusUnique)
-                  && QDBusConnection::sessionBus().interface()->isServiceRegistered(request->dbus_name))
-            request->status = KLaunchRequest::Running;
-         else
-            request->status = KLaunchRequest::Error;
+                  && QDBusConnection::sessionBus().interface()->isServiceRegistered(request->dbus_name)) {
+             request->status = KLaunchRequest::Running;
 #ifdef KLAUNCHER_VERBOSE_OUTPUT
-         kDebug(7016) << pid << "died, requestDone. status=" << request->status;
+             kDebug(7016) << pid << "running as a unique app";
 #endif
+         } else {
+             request->status = KLaunchRequest::Error;
+#ifdef KLAUNCHER_VERBOSE_OUTPUT
+             kDebug(7016) << pid << "died, requestDone. status=" << request->status;
+#endif
+         }
          requestDone(request);
          return;
       }
@@ -446,19 +453,29 @@
       if (request->status != KLaunchRequest::Launching)
          continue;
 
+#ifdef KLAUNCHER_VERBOSE_OUTPUT
+      kDebug(7016) << "had pending request" << request->name << s_DBusStartupTypeToString[request->dbus_startup_type] << "dbus_name" << request->dbus_name << request->tolerant_dbus_name;
+#endif
       // For unique services check the requested service name first
-      if ((request->dbus_startup_type == KService::DBusUnique) &&
-          ((appId == request->dbus_name) ||
-           QDBusConnection::sessionBus().interface()->isServiceRegistered(request->dbus_name)))
-      {
-         request->status = KLaunchRequest::Running;
-         requestDone(request);
-         continue;
+      if (request->dbus_startup_type == KService::DBusUnique) {
+          if ((appId == request->dbus_name) || // just started
+              QDBusConnection::sessionBus().interface()->isServiceRegistered(request->dbus_name)) { // was already running
+              request->status = KLaunchRequest::Running;
+#ifdef KLAUNCHER_VERBOSE_OUTPUT
+              kDebug(7016) << "OK, unique app" << request->dbus_name << "is running";
+#endif
+              requestDone(request);
+              continue;
+          } else {
+#ifdef KLAUNCHER_VERBOSE_OUTPUT
+              kDebug(7016) << "unique app" << request->dbus_name << "not running yet";
+#endif
+          }
       }
 
-      const QString rAppId = request->dbus_name;
+      const QString rAppId = !request->tolerant_dbus_name.isEmpty() ? request->tolerant_dbus_name : request->dbus_name;
 #ifdef KLAUNCHER_VERBOSE_OUTPUT
-      kDebug(7016) << "had pending request" << rAppId;
+      //kDebug(7016) << "using" << rAppId << "for matching";
 #endif
       if (rAppId.isEmpty())
           continue;
@@ -818,11 +835,18 @@
                request->dbus_name = v.toString().toUtf8();
            }
            if (request->dbus_name.isEmpty()) {
-               request->dbus_name = "*." + QFile::encodeName(KRun::binaryName(service->exec(), true));
+               const QString binName = KRun::binaryName(service->exec(), true);
+               request->dbus_name = "org.kde." + binName;
+               request->tolerant_dbus_name = "*." + binName;
            }
        }
    }
 
+#ifdef KLAUNCHER_VERBOSE_OUTPUT
+   kDebug(7016) << "name=" << request->name << "dbus_name=" << request->dbus_name
+                << "startup type=" << s_DBusStartupTypeToString[request->dbus_startup_type];
+#endif
+
    request->pid = 0;
    request->envs = envs;
    send_service_startup_info( request, service, startup_id, envs );
@@ -938,7 +962,7 @@
        request->arg_list.append(arg.toLocal8Bit());
    }
 
-   request->name = app.toLocal8Bit();
+   request->name = app;
 
    if (wait)
       request->dbus_startup_type = KService::DBusWait;
@@ -1113,7 +1137,7 @@
     }
     if (mSlaveValgrind == arg1)
     {
-       arg_list.prepend(QFile::encodeName(KLibLoader::findLibrary(name.toLocal8Bit())));
+       arg_list.prepend(QFile::encodeName(KLibLoader::findLibrary(name)));
        arg_list.prepend(QFile::encodeName(KStandardDirs::locate("exe", "kioslave")));
        name = "valgrind";
        if (!mSlaveValgrindSkin.isEmpty()) {
Index: kinit/klauncher.h
===================================================================
--- kinit/klauncher.h	(revision 918653)
+++ kinit/klauncher.h	(revision 918654)
@@ -87,6 +87,7 @@
    QString name;
    QStringList arg_list;
    QString dbus_name;
+   QString tolerant_dbus_name;
    enum status_t { Init = 0, Launching, Running, Error, Done };
    pid_t pid;
    status_t status;


Index: kdelibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/F-10/kdelibs.spec,v
retrieving revision 1.400
retrieving revision 1.401
diff -u -r1.400 -r1.401
--- kdelibs.spec	30 Jan 2009 02:05:28 -0000	1.400
+++ kdelibs.spec	30 Jan 2009 17:18:42 -0000	1.401
@@ -1,6 +1,6 @@
 Summary: K Desktop Environment 4 - Libraries
 Version: 4.2.0
-Release: 5%{?dist}
+Release: 6%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs
@@ -82,6 +82,10 @@
 # upstream
 # 4.3 branch
 Patch101: kdelibs-4.1.96-AllowExternalPaths.patch
+# 4.2 branch
+Patch110: kdelibs-4.2.1-kde#917170.patch
+Patch111: kdelibs-4.2.1-kde#918403.patch
+Patch112: kdelibs-4.2.1-kde#918654.patch
 
 BuildRequires: qt4-devel >= 4.4.0
 # qt4%{_?_isa} isn't provided yet -- Rex
@@ -211,6 +215,9 @@
 
 # upstream patches
 %patch101 -p1 -b .AllowExternalPaths
+%patch110 -p0 -b .kde#917170
+%patch111 -p0 -b .kde#918403
+%patch112 -p0 -b .kde#918654
 
 
 %build
@@ -373,6 +380,15 @@
 
 
 %changelog
+* Fri Jan 30 2009 Luk???? Tinkl <ltinkl at redhat.com> 4.2.0-6
+- Emit the correct FilesRemoved signal if the job was aborted in the middle of its operation, 
+  otherwise it can result in confusion and data loss (overwriting files with files
+  that don't exist). kdebug:118593
+- Fix "klauncher hangs when kdeinit4 dies" -- this happened because
+  klauncher was doing a blocking read forever.
+- Repair klauncher support for unique-applications like konsole.
+  kdebug:162729, kdebug:75492
+
 * Fri Jan 30 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.2.0-5
 - reenable PolicyKit and NTFS workarounds
 



From tuxbrewr at fedoraproject.org  Fri Jan 30 17:21:57 2009
From: tuxbrewr at fedoraproject.org (Steven M. Parrish)
Date: Fri, 30 Jan 2009 17:21:57 +0000 (UTC)
Subject: rpms/liferea/devel liferea-1.4.23-webkit-fix.patch, 1.1,
	1.2 liferea.spec, 1.128, 1.129
Message-ID: <20090130172157.2DEF370117@cvs1.fedora.phx.redhat.com>

Author: tuxbrewr

Update of /cvs/pkgs/rpms/liferea/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11842

Modified Files:
	liferea-1.4.23-webkit-fix.patch liferea.spec 
Log Message:
fixed broken patch

liferea-1.4.23-webkit-fix.patch:

Index: liferea-1.4.23-webkit-fix.patch
===================================================================
RCS file: /cvs/pkgs/rpms/liferea/devel/liferea-1.4.23-webkit-fix.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- liferea-1.4.23-webkit-fix.patch	30 Jan 2009 14:31:41 -0000	1.1
+++ liferea-1.4.23-webkit-fix.patch	30 Jan 2009 17:21:26 -0000	1.2
@@ -1,12 +1,20 @@
-diff -ur liferea-1.4.23/src/webkit/webkit.c liferea-1.4.23.webkit/src/webkit/webkit.c
---- liferea-1.4.23/src/webkit/webkit.c	2008-03-18 22:58:00.000000000 +0200
-+++ liferea-1.4.23.webkit/src/webkit/webkit.c	2009-01-30 09:34:06.000000000 +0200
-@@ -67,7 +67,7 @@
- 		g_ascii_strcasecmp (content_type, "application/xhtml+xml") == 0
- 		? "application/xhtml"
- 		: content_type;
--	webkit_web_view_load_string (WEBKIT_WEB_VIEW (htmlwidget), string, content_type, "UTF-8", base);
-+	webkit_web_view_load_html_string (WEBKIT_WEB_VIEW (htmlwidget), string, "file://");
- }
- 
- static void
+diff -crB liferea-1.4.23/src/webkit/webkit.c liferea-1.4.23-fedora/src/webkit/webkit.c
+*** liferea-1.4.23/src/webkit/webkit.c	2008-03-18 20:58:00.000000000 +0000
+--- liferea-1.4.23-fedora/src/webkit/webkit.c	2009-01-30 17:12:54.000000000 +0000
+***************
+*** 67,73 ****
+  		g_ascii_strcasecmp (content_type, "application/xhtml+xml") == 0
+  		? "application/xhtml"
+  		: content_type;
+! 	webkit_web_view_load_string (WEBKIT_WEB_VIEW (htmlwidget), string, content_type, "UTF-8", base);
+  }
+  
+  static void
+--- 67,73 ----
+  		g_ascii_strcasecmp (content_type, "application/xhtml+xml") == 0
+  		? "application/xhtml"
+  		: content_type;
+! 	webkit_web_view_load_html_string (WEBKIT_WEB_VIEW (htmlwidget), string, "file://");
+  }
+  
+  static void


Index: liferea.spec
===================================================================
RCS file: /cvs/pkgs/rpms/liferea/devel/liferea.spec,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -r1.128 -r1.129
--- liferea.spec	30 Jan 2009 14:31:41 -0000	1.128
+++ liferea.spec	30 Jan 2009 17:21:26 -0000	1.129
@@ -2,7 +2,7 @@
 
 Name:           liferea
 Version:        1.4.23
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:        An RSS/RDF feed reader
 
 Group:          Applications/Internet
@@ -53,7 +53,7 @@
 %prep
 %setup -q -n %{name}-%{version}
 %patch0 -p1 -b .fedorafeed
-%patch1 -b .webkit-fix
+%patch1 -p1 -b .webkitfix
 
 %build
 %configure --disable-schemas-install --disable-gtkhtml2 --disable-lua --with-gecko=libxul --enable-webkit
@@ -130,6 +130,9 @@
 %{_libdir}/%{name}/liblihtmlw.so
 
 %changelog
+* Fri Jan 30 2009 Steven M. Parrish <tuxbrewr at fedoraproject.org> 1.4.23-3
+- Fix missing -p1 on patch
+
 * Fri Jan 30 2009 Steven M. Parrish <tuxbrewr at fedoraproject.org> 1.4.23-2
 - Patch to fix WebKit issue in F11
 



From rdieter at fedoraproject.org  Fri Jan 30 17:26:26 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 30 Jan 2009 17:26:26 +0000 (UTC)
Subject: rpms/kdelibs/F-9 kdelibs-4.2.1-kde#917170.patch, NONE,
	1.1 kdelibs-4.2.1-kde#918403.patch, NONE,
	1.1 kdelibs-4.2.1-kde#918654.patch, NONE, 1.1 .cvsignore, 1.56, 1.57
Message-ID: <20090130172626.BEE5A70117@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdelibs/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12724

Modified Files:
	.cvsignore 
Added Files:
	kdelibs-4.2.1-kde#917170.patch kdelibs-4.2.1-kde#918403.patch 
	kdelibs-4.2.1-kde#918654.patch 
Log Message:
* Fri Jan 30 2009 Luk???? Tinkl <ltinkl at redhat.com> 4.2.0-6
- Emit the correct FilesRemoved signal if the job was aborted in the middle of its operation, 
  otherwise it can result in confusion and data loss (overwriting files with files
  that don't exist). kdebug:118593
- Fix "klauncher hangs when kdeinit4 dies" -- this happened because
  klauncher was doing a blocking read forever.
- Repair klauncher support for unique-applications like konsole.
  kdebug:162729, kdebug:75492


kdelibs-4.2.1-kde#917170.patch:

--- NEW FILE kdelibs-4.2.1-kde#917170.patch ---
Index: kio/kio/copyjob.h
===================================================================
--- kio/kio/copyjob.h	(revision 917169)
+++ kio/kio/copyjob.h	(revision 917170)
@@ -245,6 +245,7 @@
 
     protected:
         CopyJob(CopyJobPrivate &dd);
+        void emitResult();
 
     private:
         Q_PRIVATE_SLOT(d_func(), void slotStart())
Index: kio/kio/copyjob.cpp
===================================================================
--- kio/kio/copyjob.cpp	(revision 917169)
+++ kio/kio/copyjob.cpp	(revision 917170)
@@ -153,7 +153,7 @@
     QList<CopyInfo> dirs;
     KUrl::List dirsToRemove;
     KUrl::List m_srcList;
-    KUrl::List m_skippedSourceUrls;
+    KUrl::List m_successSrcList;
     KUrl::List::const_iterator m_currentStatSrc;
     bool m_bCurrentSrcIsDir;
     bool m_bCurrentOperationIsLink;
@@ -770,10 +770,6 @@
 
 void CopyJobPrivate::skip( const KUrl & sourceUrl )
 {
-    // If this is one if toplevel sources,
-    // remove it from d->m_srcList, for a correct FilesRemoved() signal
-    // But don't do it right away, we have iterators into that list (#157601)
-    m_skippedSourceUrls.append( sourceUrl );
     dirsToRemove.removeAll( sourceUrl );
 }
 
@@ -857,6 +853,7 @@
     {
         //this is required for the undo feature
         emit q->copyingDone( q, (*it).uSource, (*it).uDest, (*it).mtime, true, false );
+        m_successSrcList.append((*it).uSource);
         m_directoriesCopied.append( *it );
         dirs.erase( it );
     }
@@ -1118,6 +1115,7 @@
             emit q->copyingDone( q, (*it).uSource, (*it).uDest, (*it).mtime, false, false );
             if (m_mode == CopyJob::Move)
                 org::kde::KDirNotify::emitFileMoved( (*it).uSource.url(), (*it).uDest.url() );
+            m_successSrcList.append((*it).uSource);
         }
         // remove from list, to move on to next file
         files.erase( it );
@@ -1372,7 +1370,7 @@
         KIO::Job * newjob = 0;
         if ( m_mode == CopyJob::Link ) {
             // User requested that a symlink be made
-          JobFlags flags = bOverwrite ? Overwrite : DefaultFlags;
+            const JobFlags flags = bOverwrite ? Overwrite : DefaultFlags;
             newjob = linkNextFile(uSource, uDest, flags);
             if (!newjob)
                 return;
@@ -1384,7 +1382,7 @@
                   (uSource.pass() == uDest.pass()))
             // Copying a symlink - only on the same protocol/host/etc. (#5601, downloading an FTP file through its link),
         {
-            JobFlags flags = bOverwrite ? Overwrite : DefaultFlags;
+            const JobFlags flags = bOverwrite ? Overwrite : DefaultFlags;
             KIO::SimpleJob *newJob = KIO::symlink( (*it).linkDest, uDest, flags | HideProgressInfo /*no GUI*/ );
             Scheduler::scheduleJob(newJob);
             newjob = newJob;
@@ -1509,23 +1507,6 @@
         // but then we need to jump to the else part below. Maybe with a recursive call?
 #endif
     } else {
-        // Finished - tell the world
-        if ( !m_bOnlyRenames )
-        {
-            KUrl url( m_globalDest );
-            if ( m_globalDestinationState != DEST_IS_DIR || m_asMethod )
-                url.setPath( url.directory() );
-            //kDebug(7007) << "KDirNotify'ing FilesAdded " << url;
-            org::kde::KDirNotify::emitFilesAdded( url.url() );
-
-            Q_FOREACH(const KUrl& url, m_skippedSourceUrls)
-                m_srcList.removeAll(url);
-
-            if ( m_mode == CopyJob::Move && !m_srcList.isEmpty() ) {
-                //kDebug(7007) << "KDirNotify'ing FilesRemoved " << m_srcList.toStringList();
-                org::kde::KDirNotify::emitFilesRemoved( m_srcList.toStringList() );
-            }
-        }
         if (m_reportTimer)
             m_reportTimer->stop();
         --m_processedFiles; // undo the "start at 1" hack
@@ -1535,6 +1516,27 @@
     }
 }
 
+void CopyJob::emitResult()
+{
+    Q_D(CopyJob);
+    // Before we go, tell the world about the changes that were made.
+    // Even if some error made us abort midway, we might still have done
+    // part of the job so we better update the views! (#118583)
+    if (!d->m_bOnlyRenames) {
+        KUrl url(d->m_globalDest);
+        if (d->m_globalDestinationState != DEST_IS_DIR || d->m_asMethod)
+            url.setPath(url.directory());
+        //kDebug(7007) << "KDirNotify'ing FilesAdded " << url;
+        org::kde::KDirNotify::emitFilesAdded( url.url() );
+
+        if (d->m_mode == CopyJob::Move && !d->m_successSrcList.isEmpty()) {
+            kDebug(7007) << "KDirNotify'ing FilesRemoved" << d->m_successSrcList.toStringList();
+            org::kde::KDirNotify::emitFilesRemoved(d->m_successSrcList.toStringList());
+        }
+    }
+    Job::emitResult();
+}
+
 void CopyJobPrivate::slotProcessedSize( KJob*, qulonglong data_size )
 {
   Q_Q(CopyJob);
@@ -1801,6 +1803,7 @@
         kDebug(7007) << "Renaming succeeded, move on";
         ++m_processedFiles;
         emit q->copyingDone( q, *m_currentStatSrc, dest, -1 /*mtime unknown, and not needed*/, true, true );
+        m_successSrcList.append(*m_currentStatSrc);
         statNextSrc();
     }
 }

kdelibs-4.2.1-kde#918403.patch:

--- NEW FILE kdelibs-4.2.1-kde#918403.patch ---
Index: kinit/klauncher.cpp
===================================================================
--- kinit/klauncher.cpp	(revision 918402)
+++ kinit/klauncher.cpp	(revision 918403)
@@ -167,7 +167,7 @@
 
 KLauncher::KLauncher(int _kdeinitSocket)
   : QObject(0),
-    kdeinitSocket(_kdeinitSocket), dontBlockReading(false)
+    kdeinitSocket(_kdeinitSocket)
 {
 #ifdef Q_WS_X11
    mCached_dpy = NULL;
@@ -276,8 +276,24 @@
 {
   ssize_t result;
   int bytes_left = len;
-  while ( bytes_left > 0)
-  {
+    while (bytes_left > 0) {
+        // in case we get a request to start an application and data arrive
+        // to kdeinitSocket at the same time, requestStart() will already
+        // call slotKDEInitData(), so we must check there's still something
+        // to read, otherwise this would block
+
+        // Same thing if kdeinit dies without warning.
+
+        fd_set in;
+        timeval tm = { 30, 0 }; // 30 seconds timeout, so we're not stuck in case kdeinit dies on us
+        FD_ZERO ( &in );
+        FD_SET( sock, &in );
+        select( sock + 1, &in, 0, 0, &tm );
+        if( !FD_ISSET( sock, &in )) {
+            kDebug(7016) << "read_socket" << sock << "nothing to read, kdeinit4 must be dead";
+            return -1;
+        }
+
      result = read(sock, buffer, bytes_left);
      if (result > 0)
      {
@@ -298,21 +314,7 @@
 {
    klauncher_header request_header;
    QByteArray requestData;
-   if( dontBlockReading )
-   {
-   // in case we get a request to start an application and data arrive
-   // to kdeinitSocket at the same time, requestStart() will already
-   // call slotKDEInitData(), so we must check there's still something
-   // to read, otherwise this would block
-      fd_set in;
-      timeval tm = { 0, 0 };
-      FD_ZERO ( &in );
-      FD_SET( kdeinitSocket, &in );
-      select( kdeinitSocket + 1, &in, 0, 0, &tm );
-      if( !FD_ISSET( kdeinitSocket, &in ))
-         return;
-   }
-   dontBlockReading = false;
+
    int result = read_socket(kdeinitSocket, (char *) &request_header,
                             sizeof( request_header));
    if (result == -1)
@@ -647,17 +649,21 @@
    request_header.cmd = LAUNCHER_EXEC_NEW;
 #endif
    request_header.arg_length = requestData.length();
+
+#ifdef KLAUNCHER_VERBOSE_OUTPUT
+   kDebug(7016) << "Asking kdeinit to start" << request->name << request->arg_list
+                << "cmd=" << commandToString(request_header.cmd);
+#endif
+
    write(kdeinitSocket, &request_header, sizeof(request_header));
    write(kdeinitSocket, requestData.data(), requestData.length());
 
    // Wait for pid to return.
    lastRequest = request;
-   dontBlockReading = false;
    do {
       slotKDEInitData( kdeinitSocket );
    }
    while (lastRequest != 0);
-   dontBlockReading = true;
 #endif
 }
 

kdelibs-4.2.1-kde#918654.patch:

--- NEW FILE kdelibs-4.2.1-kde#918654.patch ---
Index: kinit/klauncher.cpp
===================================================================
--- kinit/klauncher.cpp	(revision 918653)
+++ kinit/klauncher.cpp	(revision 918654)
@@ -58,6 +58,9 @@
 
 // #define KLAUNCHER_VERBOSE_OUTPUT
 
+static const char* const s_DBusStartupTypeToString[] =
+    { "DBusNone", "DBusUnique", "DBusMulti", "DBusWait", "ERROR" };
+
 using namespace KIO;
 
 IdleSlave::IdleSlave(QObject *parent)
@@ -393,15 +396,19 @@
       if (request->pid == pid)
       {
          if (request->dbus_startup_type == KService::DBusWait)
-            request->status = KLaunchRequest::Done;
+             request->status = KLaunchRequest::Done;
          else if ((request->dbus_startup_type == KService::DBusUnique)
-                  && QDBusConnection::sessionBus().interface()->isServiceRegistered(request->dbus_name))
-            request->status = KLaunchRequest::Running;
-         else
-            request->status = KLaunchRequest::Error;
+                  && QDBusConnection::sessionBus().interface()->isServiceRegistered(request->dbus_name)) {
+             request->status = KLaunchRequest::Running;
 #ifdef KLAUNCHER_VERBOSE_OUTPUT
-         kDebug(7016) << pid << "died, requestDone. status=" << request->status;
+             kDebug(7016) << pid << "running as a unique app";
 #endif
+         } else {
+             request->status = KLaunchRequest::Error;
+#ifdef KLAUNCHER_VERBOSE_OUTPUT
+             kDebug(7016) << pid << "died, requestDone. status=" << request->status;
+#endif
+         }
          requestDone(request);
          return;
       }
@@ -446,19 +453,29 @@
       if (request->status != KLaunchRequest::Launching)
          continue;
 
+#ifdef KLAUNCHER_VERBOSE_OUTPUT
+      kDebug(7016) << "had pending request" << request->name << s_DBusStartupTypeToString[request->dbus_startup_type] << "dbus_name" << request->dbus_name << request->tolerant_dbus_name;
+#endif
       // For unique services check the requested service name first
-      if ((request->dbus_startup_type == KService::DBusUnique) &&
-          ((appId == request->dbus_name) ||
-           QDBusConnection::sessionBus().interface()->isServiceRegistered(request->dbus_name)))
-      {
-         request->status = KLaunchRequest::Running;
-         requestDone(request);
-         continue;
+      if (request->dbus_startup_type == KService::DBusUnique) {
+          if ((appId == request->dbus_name) || // just started
+              QDBusConnection::sessionBus().interface()->isServiceRegistered(request->dbus_name)) { // was already running
+              request->status = KLaunchRequest::Running;
+#ifdef KLAUNCHER_VERBOSE_OUTPUT
+              kDebug(7016) << "OK, unique app" << request->dbus_name << "is running";
+#endif
+              requestDone(request);
+              continue;
+          } else {
+#ifdef KLAUNCHER_VERBOSE_OUTPUT
+              kDebug(7016) << "unique app" << request->dbus_name << "not running yet";
+#endif
+          }
       }
 
-      const QString rAppId = request->dbus_name;
+      const QString rAppId = !request->tolerant_dbus_name.isEmpty() ? request->tolerant_dbus_name : request->dbus_name;
 #ifdef KLAUNCHER_VERBOSE_OUTPUT
-      kDebug(7016) << "had pending request" << rAppId;
+      //kDebug(7016) << "using" << rAppId << "for matching";
 #endif
       if (rAppId.isEmpty())
           continue;
@@ -818,11 +835,18 @@
                request->dbus_name = v.toString().toUtf8();
            }
            if (request->dbus_name.isEmpty()) {
-               request->dbus_name = "*." + QFile::encodeName(KRun::binaryName(service->exec(), true));
+               const QString binName = KRun::binaryName(service->exec(), true);
+               request->dbus_name = "org.kde." + binName;
+               request->tolerant_dbus_name = "*." + binName;
            }
        }
    }
 
+#ifdef KLAUNCHER_VERBOSE_OUTPUT
+   kDebug(7016) << "name=" << request->name << "dbus_name=" << request->dbus_name
+                << "startup type=" << s_DBusStartupTypeToString[request->dbus_startup_type];
+#endif
+
    request->pid = 0;
    request->envs = envs;
    send_service_startup_info( request, service, startup_id, envs );
@@ -938,7 +962,7 @@
        request->arg_list.append(arg.toLocal8Bit());
    }
 
-   request->name = app.toLocal8Bit();
+   request->name = app;
 
    if (wait)
       request->dbus_startup_type = KService::DBusWait;
@@ -1113,7 +1137,7 @@
     }
     if (mSlaveValgrind == arg1)
     {
-       arg_list.prepend(QFile::encodeName(KLibLoader::findLibrary(name.toLocal8Bit())));
+       arg_list.prepend(QFile::encodeName(KLibLoader::findLibrary(name)));
        arg_list.prepend(QFile::encodeName(KStandardDirs::locate("exe", "kioslave")));
        name = "valgrind";
        if (!mSlaveValgrindSkin.isEmpty()) {
Index: kinit/klauncher.h
===================================================================
--- kinit/klauncher.h	(revision 918653)
+++ kinit/klauncher.h	(revision 918654)
@@ -87,6 +87,7 @@
    QString name;
    QStringList arg_list;
    QString dbus_name;
+   QString tolerant_dbus_name;
    enum status_t { Init = 0, Launching, Running, Error, Done };
    pid_t pid;
    status_t status;


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/F-9/.cvsignore,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- .cvsignore	26 Jan 2009 10:39:58 -0000	1.56
+++ .cvsignore	30 Jan 2009 17:25:55 -0000	1.57
@@ -0,0 +1 @@
+kdelibs-4.2.0.tar.bz2



From gd at fedoraproject.org  Fri Jan 30 17:31:46 2009
From: gd at fedoraproject.org (Guenther Deschner)
Date: Fri, 30 Jan 2009 17:31:46 +0000 (UTC)
Subject: rpms/samba/devel samba-3.2.0pre1-grouppwd.patch, 1.1, 1.2 samba.spec,
	1.168, 1.169
Message-ID: <20090130173146.6FB2470117@cvs1.fedora.phx.redhat.com>

Author: gd

Update of /cvs/pkgs/rpms/samba/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13866

Modified Files:
	samba-3.2.0pre1-grouppwd.patch samba.spec 
Log Message:
Setting tdb version to 1.1.2 and fix a fuzz in a patch.

Guenther


samba-3.2.0pre1-grouppwd.patch:

Index: samba-3.2.0pre1-grouppwd.patch
===================================================================
RCS file: /cvs/pkgs/rpms/samba/devel/samba-3.2.0pre1-grouppwd.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- samba-3.2.0pre1-grouppwd.patch	8 Oct 2007 21:13:15 -0000	1.1
+++ samba-3.2.0pre1-grouppwd.patch	30 Jan 2009 17:31:45 -0000	1.2
@@ -1,8 +1,8 @@
 --- samba-3.2.0pre1/source/winbindd/winbindd_group.c.star	2007-10-03 17:40:31.000000000 -0400
 +++ samba-3.2.0pre1/source/winbindd/winbindd_group.c	2007-10-03 17:40:46.000000000 -0400
-@@ -189,7 +189,7 @@
+@@ -215,7 +215,7 @@
  	/* Group name and password */
-     
+ 
  	safe_strcpy(gr->gr_name, full_group_name, sizeof(gr->gr_name) - 1);
 -	safe_strcpy(gr->gr_passwd, "x", sizeof(gr->gr_passwd) - 1);
 +	safe_strcpy(gr->gr_passwd, "*", sizeof(gr->gr_passwd) - 1);


Index: samba.spec
===================================================================
RCS file: /cvs/pkgs/rpms/samba/devel/samba.spec,v
retrieving revision 1.168
retrieving revision 1.169
diff -u -r1.168 -r1.169
--- samba.spec	30 Jan 2009 13:35:58 -0000	1.168
+++ samba.spec	30 Jan 2009 17:31:45 -0000	1.169
@@ -1,6 +1,6 @@
 %define main_release 25
 %define samba_version 3.3.0
-%define tdb_version 1.1.1
+%define tdb_version 1.1.2
 %define talloc_version 1.2.0
 %define pre_release %nil
 



From dcbw at fedoraproject.org  Fri Jan 30 17:46:17 2009
From: dcbw at fedoraproject.org (Daniel Williams)
Date: Fri, 30 Jan 2009 17:46:17 +0000 (UTC)
Subject: rpms/wpa_supplicant/devel
	wpa_supplicant-0.6.7-quiet-scan-results-message.patch, NONE,
	1.1 .cvsignore, 1.9, 1.10 sources, 1.9, 1.10 wpa_supplicant.spec,
	1.50, 1.51 wpa_supplicant-0.6.4-handle-invalid-ies.patch, 1.1,
	NONE wpa_supplicant-0.6.4-scan-fixes-1.patch, 1.1,
	NONE wpa_supplicant-0.6.4-scan-fixes-2.patch, 1.1,
	NONE wpa_supplicant-0.6.4-set-mode-handler.patch, 1.1,
	NONE wpa_supplicant-0.6.4-validate-wext-event.patch, 1.1, NONE
Message-ID: <20090130174617.DBC5470117@cvs1.fedora.phx.redhat.com>

Author: dcbw

Update of /cvs/extras/rpms/wpa_supplicant/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16838

Modified Files:
	.cvsignore sources wpa_supplicant.spec 
Added Files:
	wpa_supplicant-0.6.7-quiet-scan-results-message.patch 
Removed Files:
	wpa_supplicant-0.6.4-handle-invalid-ies.patch 
	wpa_supplicant-0.6.4-scan-fixes-1.patch 
	wpa_supplicant-0.6.4-scan-fixes-2.patch 
	wpa_supplicant-0.6.4-set-mode-handler.patch 
	wpa_supplicant-0.6.4-validate-wext-event.patch 
Log Message:
* Fri Jan 30 2009 Dan Williams <dcbw at redhat.com> - 1:0.6.7-1
- Fix PEAP connections to Windows Server 2008 authenticators (rh #465022)
- Stop supplicant on uninstall (rh #447843)
- Suppress scan results message in logs (rh #466601)



wpa_supplicant-0.6.7-quiet-scan-results-message.patch:

--- NEW FILE wpa_supplicant-0.6.7-quiet-scan-results-message.patch ---
diff -up wpa_supplicant-0.6.7/wpa_supplicant/events.c.scan-results-msg wpa_supplicant-0.6.7/wpa_supplicant/events.c
--- wpa_supplicant-0.6.7/wpa_supplicant/events.c.scan-results-msg	2009-01-30 12:08:34.000000000 -0500
+++ wpa_supplicant-0.6.7/wpa_supplicant/events.c	2009-01-30 12:08:37.000000000 -0500
@@ -624,7 +624,7 @@ static void wpa_supplicant_event_scan_re
 		wpa_msg(wpa_s, MSG_DEBUG, "Cached scan results are "
 			"empty - not posting");
 	} else {
-		wpa_msg(wpa_s, MSG_INFO, WPA_EVENT_SCAN_RESULTS);
+		wpa_msg(wpa_s, MSG_DEBUG, WPA_EVENT_SCAN_RESULTS);
 		wpa_supplicant_dbus_notify_scan_results(wpa_s);
 		wpas_wps_notify_scan_results(wpa_s);
 	}


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/wpa_supplicant/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	27 Aug 2008 21:14:46 -0000	1.9
+++ .cvsignore	30 Jan 2009 17:45:46 -0000	1.10
@@ -7,3 +7,4 @@
 wpa_supplicant-0.5.7.tar.gz
 wpa_supplicant-0.6.3.tar.gz
 wpa_supplicant-0.6.4.tar.gz
+wpa_supplicant-0.6.7.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wpa_supplicant/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	27 Aug 2008 21:14:46 -0000	1.9
+++ sources	30 Jan 2009 17:45:46 -0000	1.10
@@ -1 +1 @@
-eb06a9a05d3916addf9451297a558aa2  wpa_supplicant-0.6.4.tar.gz
+b61f6e94b63f92173f4286b5e6a84140  wpa_supplicant-0.6.7.tar.gz


Index: wpa_supplicant.spec
===================================================================
RCS file: /cvs/extras/rpms/wpa_supplicant/devel/wpa_supplicant.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- wpa_supplicant.spec	18 Jan 2009 15:31:52 -0000	1.50
+++ wpa_supplicant.spec	30 Jan 2009 17:45:46 -0000	1.51
@@ -1,8 +1,8 @@
 Summary: WPA/WPA2/IEEE 802.1X Supplicant
 Name: wpa_supplicant
 Epoch: 1
-Version: 0.6.4
-Release: 3%{?dist}
+Version: 0.6.7
+Release: 1%{?dist}
 License: BSD
 Group: System Environment/Base
 Source0: http://hostap.epitest.fi/releases/%{name}-%{version}.tar.gz
@@ -17,11 +17,7 @@
 Patch2: wpa_supplicant-0.5.7-flush-debug-output.patch
 Patch3: wpa_supplicant-0.5.7-use-IW_ENCODE_TEMP.patch
 Patch4: wpa_supplicant-0.5.10-dbus-service-file.patch
-Patch5: wpa_supplicant-0.6.4-handle-invalid-ies.patch
-Patch6: wpa_supplicant-0.6.4-scan-fixes-1.patch
-Patch7: wpa_supplicant-0.6.4-scan-fixes-2.patch
-Patch8: wpa_supplicant-0.6.4-validate-wext-event.patch
-Patch9: wpa_supplicant-0.6.4-set-mode-handler.patch
+Patch5: wpa_supplicant-0.6.7-quiet-scan-results-message.patch
 
 URL: http://w1.fi/wpa_supplicant/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -54,11 +50,7 @@
 %patch2 -p1 -b .flush-debug-output
 %patch3 -p1 -b .use-IW_ENCODE_TEMP
 %patch4 -p1 -b .dbus-service-file
-%patch5 -p1 -b .handle-invalid-ies
-%patch6 -p1 -b .scan-fixes-1
-%patch7 -p1 -b .scan-fixes-2
-%patch8 -p1 -b .validate-wext-event
-%patch9 -p1 -b .set-mode-handler
+%patch5 -p1 -b .quiet-scan-results-msg
 
 %build
 pushd wpa_supplicant
@@ -122,6 +114,7 @@
 %preun
 if [ $1 = 0 ]; then
 	service %{name} stop > /dev/null 2>&1
+	killall -TERM wpa_supplicant >/dev/null 2>&1
 	/sbin/chkconfig --del %{name}
 fi
 
@@ -148,6 +141,11 @@
 %{_bindir}/wpa_gui
 
 %changelog
+* Fri Jan 30 2009 Dan Williams <dcbw at redhat.com> - 1:0.6.7-1
+- Fix PEAP connections to Windows Server 2008 authenticators (rh #465022)
+- Stop supplicant on uninstall (rh #447843)
+- Suppress scan results message in logs (rh #466601)
+
 * Sun Jan 18 2009 Tomas Mraz <tmraz at redhat.com> - 1:0.6.4-3
 - rebuild with new openssl
 


--- wpa_supplicant-0.6.4-handle-invalid-ies.patch DELETED ---


--- wpa_supplicant-0.6.4-scan-fixes-1.patch DELETED ---


--- wpa_supplicant-0.6.4-scan-fixes-2.patch DELETED ---


--- wpa_supplicant-0.6.4-set-mode-handler.patch DELETED ---


--- wpa_supplicant-0.6.4-validate-wext-event.patch DELETED ---



From josef at fedoraproject.org  Fri Jan 30 17:52:55 2009
From: josef at fedoraproject.org (Josef Bacik)
Date: Fri, 30 Jan 2009 17:52:55 +0000 (UTC)
Subject: rpms/kernel/devel linux-2.6.29-btrfs-readdir-fix.patch, NONE,
	1.1 linux-2.6.29-btrfs-setxattr-fix.patch, NONE, 1.1 kernel.spec,
	1.1249, 1.1250
Message-ID: <20090130175255.89FA870117@cvs1.fedora.phx.redhat.com>

Author: josef

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18354

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6.29-btrfs-readdir-fix.patch 
	linux-2.6.29-btrfs-setxattr-fix.patch 
Log Message:
adding some critical bugfixes for btrfs.


linux-2.6.29-btrfs-readdir-fix.patch:

--- NEW FILE linux-2.6.29-btrfs-readdir-fix.patch ---
Josef,

This fixes btrfs readdir on 32 bit boxes.  It keeps us from giving glibc
an offset too big to handle.

diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index 5771ec2..ebd7d6c 100644
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -3277,7 +3277,7 @@ skip:
 
 	/* Reached end of directory/root. Bump pos past the last item. */
 	if (key_type == BTRFS_DIR_INDEX_KEY)
-		filp->f_pos = INT_LIMIT(typeof(filp->f_pos));
+		filp->f_pos = INT_LIMIT(off_t);
 	else
 		filp->f_pos++;
 nopos:



linux-2.6.29-btrfs-setxattr-fix.patch:

--- NEW FILE linux-2.6.29-btrfs-setxattr-fix.patch ---
With selinux on we end up calling __btrfs_setxattr when we create an inode,
which calls btrfs_start_transaction().  The problem is we've already called that
in btrfs_new_inode, and in btrfs_start_transaction we end up doing a
wait_current_trans().  If btrfs-transaction has started committing it will wait
for all handles to finish, while the other process is waiting for the
transaction to commit.  This is fixed by using btrfs_join_transaction, which
won't wait for the transaction to commit.  Thanks,

Signed-off-by: Josef Bacik <jbacik at redhat.com>
---
 fs/btrfs/xattr.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/fs/btrfs/xattr.c b/fs/btrfs/xattr.c
index 312b943..a9d3bf4 100644
--- a/fs/btrfs/xattr.c
+++ b/fs/btrfs/xattr.c
@@ -98,7 +98,7 @@ int __btrfs_setxattr(struct inode *inode, const char *name,
 	if (!path)
 		return -ENOMEM;
 
-	trans = btrfs_start_transaction(root, 1);
+	trans = btrfs_join_transaction(root, 1);
 	btrfs_set_trans_block_group(trans, inode);
 
 	/* first lets see if we already have this xattr */
-- 
1.5.4.3



Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1249
retrieving revision 1.1250
diff -u -r1.1249 -r1.1250
--- kernel.spec	30 Jan 2009 14:33:10 -0000	1.1249
+++ kernel.spec	30 Jan 2009 17:52:24 -0000	1.1250
@@ -681,6 +681,12 @@
 # Hook up proper selinux bits for btrfs
 Patch9003: linux-2.6.29-btrfs-selinux.patch
 
+# Fix setxattr bug in btrfs
+Patch9004: linux-2.6.29-btrfs-setxattr-fix.patch
+
+# Fix readdir for 32bit boxes in btrfs
+Patch9005: linux-2.6.29-btrfs-readdir-fix.patch
+
 # build horkage fix.
 Patch9100: sata_sil-build-break-fix.patch
 
@@ -1081,6 +1087,8 @@
 
 # btrfs
 ApplyPatch linux-2.6.29-btrfs-selinux.patch
+ApplyPatch linux-2.6.29-btrfs-setxattr-fix.patch
+ApplyPatch linux-2.6.29-btrfs-readdir-fix.patch
 
 # USB
 
@@ -1775,6 +1783,10 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Fri Jan 30 2009 Josef Bacik <josef at toxicpanda.com>
+- add patch to keep btrfs from locking up when creating a new inode
+- add patch to let readdir not screw up on 32bit boxes
+
 * Fri Jan 30 2009 Hans de Goede <hdegoede at redhat.com>
 - Completely drop gspca patches (all upstream now)
 - Rebase atk0110 driver to latest from upstream



From emaldonado at fedoraproject.org  Fri Jan 30 17:56:49 2009
From: emaldonado at fedoraproject.org (Elio Maldonado)
Date: Fri, 30 Jan 2009 17:56:49 +0000 (UTC)
Subject: rpms/crypto-utils/F-10 crypto-utils.spec,1.48,1.49
Message-ID: <20090130175649.BAA4670117@cvs1.fedora.phx.redhat.com>

Author: emaldonado

Update of /cvs/extras/rpms/crypto-utils/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19003

Modified Files:
	crypto-utils.spec 
Log Message:
retagging


Index: crypto-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/crypto-utils/F-10/crypto-utils.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- crypto-utils.spec	30 Jan 2009 01:58:10 -0000	1.48
+++ crypto-utils.spec	30 Jan 2009 17:56:19 -0000	1.49
@@ -4,7 +4,7 @@
 Summary: SSL certificate and key management utilities
 Name: crypto-utils
 Version: 2.4.1
-Release: 9
+Release: 10
 Source: crypto-rand-%{crver}.tar.gz
 Source1: genkey.pl
 Source2: certwatch.c
@@ -131,6 +131,11 @@
 %{perl_vendorarch}/auto/Crypt
 
 %changelog
+* Thu Jan 30 2009 Elio Maldonado <emaldona at redhat.com> - 2.4.1-10
+- certwatch: Fixed cert expiry time calculations (#473860)
+- keyutil: Fixed segfault on certificate generation (#479886)
+- genkey: Fixed cert and key file name extensions
+
 * Thu Jan 29 2009 Elio Maldonado <emaldona at redhat.com> - 2.4.1-9
 - certwatch: Fixed cert expiry time calculations (#473860)
 - keyutil: Fixed segfault on certificate generation (#479886)



From pkgdb at fedoraproject.org  Fri Jan 30 17:58:14 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 17:58:14 +0000
Subject: [pkgdb] beesu: honeybee has requested watchbugzilla
Message-ID: <20090130175816.C94B02084BD@bastion.fedora.phx.redhat.com>

honeybee has requested the watchbugzilla acl on beesu (Fedora devel)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/beesu



From pkgdb at fedoraproject.org  Fri Jan 30 17:58:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 17:58:24 +0000
Subject: [pkgdb] beesu: honeybee has requested watchbugzilla
Message-ID: <20090130175825.01C5D20860E@bastion.fedora.phx.redhat.com>

honeybee has requested the watchbugzilla acl on beesu (Fedora 9)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/beesu



From pkgdb at fedoraproject.org  Fri Jan 30 17:58:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 17:58:35 +0000
Subject: [pkgdb] beesu: honeybee has requested watchbugzilla
Message-ID: <20090130175835.81994208605@bastion.fedora.phx.redhat.com>

honeybee has requested the watchbugzilla acl on beesu (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/beesu



From pkgdb at fedoraproject.org  Fri Jan 30 17:58:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 17:58:49 +0000
Subject: [pkgdb] beesu: honeybee has requested watchbugzilla
Message-ID: <20090130175849.E162E2084BD@bastion.fedora.phx.redhat.com>

honeybee has requested the watchbugzilla acl on beesu (Fedora EPEL 4)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/beesu



From pkgdb at fedoraproject.org  Fri Jan 30 17:58:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 17:58:53 +0000
Subject: [pkgdb] beesu: honeybee has requested watchbugzilla
Message-ID: <20090130175853.A541820860C@bastion.fedora.phx.redhat.com>

honeybee has requested the watchbugzilla acl on beesu (Fedora EPEL 5)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/beesu



From dcbw at fedoraproject.org  Fri Jan 30 17:59:42 2009
From: dcbw at fedoraproject.org (Daniel Williams)
Date: Fri, 30 Jan 2009 17:59:42 +0000 (UTC)
Subject: rpms/wpa_supplicant/F-10
	wpa_supplicant-0.6.4-fix-peap-with-windows-server-2008.patch,
	NONE, 1.1 wpa_supplicant-0.6.7-quiet-scan-results-message.patch,
	NONE, 1.1 wpa_supplicant.spec, 1.49, 1.50
Message-ID: <20090130175942.B59DD70117@cvs1.fedora.phx.redhat.com>

Author: dcbw

Update of /cvs/extras/rpms/wpa_supplicant/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19605

Modified Files:
	wpa_supplicant.spec 
Added Files:
	wpa_supplicant-0.6.4-fix-peap-with-windows-server-2008.patch 
	wpa_supplicant-0.6.7-quiet-scan-results-message.patch 
Log Message:
* Fri Jan 30 2009 Dan Williams <dcbw at redhat.com> - 1:0.6.4-3
- Fix PEAP connections to Windows Server 2008 authenticators (rh #465022)
- Stop supplicant on uninstall (rh #447843)
- Suppress scan results message in logs (rh #466601)



wpa_supplicant-0.6.4-fix-peap-with-windows-server-2008.patch:

--- NEW FILE wpa_supplicant-0.6.4-fix-peap-with-windows-server-2008.patch ---
From: Jouni Malinen <j at w1.fi>
Date: Sun, 14 Dec 2008 22:15:54 +0000 (+0200)
Subject: Fixed interoperability issue with PEAPv0 cryptobinding and NPS
X-Git-Tag: hostap_0_6_7~111
X-Git-Url: http://w1.fi/gitweb/gitweb.cgi?p=hostap.git;a=commitdiff_plain;h=f4f2774a96d91753811e921380856bc859888153

Fixed interoperability issue with PEAPv0 cryptobinding and NPS

Windows Server 2008 NPS gets very confused if the TLS Message Length is
not included in the Phase 1 messages even if fragmentation is not used.
If the TLS Message Length field is not included in ClientHello message,
NPS seems to decide to use the ClientHello data (excluding first six
octets, i.e., EAP header, type, Flags) as the OuterTLVs data in
Cryptobinding Compound_MAC calculation (per PEAPv2; not MS-PEAP)..

Lets add the TLS Message Length to PEAPv0 Phase 1 messages to get rid of
this issue. This seems to fix Cryptobinding issues with NPS and PEAPv0
is now using optional Cryptobinding by default (again) since there are
no known interop issues with it anymore.
---

diff --git a/src/eap_peer/eap_tls_common.c b/src/eap_peer/eap_tls_common.c
index 9ff4eed..5db8bf6 100644
--- a/src/eap_peer/eap_tls_common.c
+++ b/src/eap_peer/eap_tls_common.c
@@ -501,6 +501,17 @@ static int eap_tls_process_output(struct eap_ssl_data *data, EapType eap_type,
 	length_included = data->tls_out_pos == 0 &&
 		(data->tls_out_len > data->tls_out_limit ||
 		 data->include_tls_length);
+	if (!length_included &&
+	    eap_type == EAP_TYPE_PEAP && peap_version == 0 &&
+	    !tls_connection_established(data->eap->ssl_ctx, data->conn)) {
+		/*
+		 * Windows Server 2008 NPS really wants to have the TLS Message
+		 * length included in phase 0 even for unfragmented frames or
+		 * it will get very confused with Compound MAC calculation and
+		 * Outer TLVs.
+		 */
+		length_included = 1;
+	}
 
 	*out_data = eap_msg_alloc(EAP_VENDOR_IETF, eap_type,
 				  1 + length_included * 4 + len,


wpa_supplicant-0.6.7-quiet-scan-results-message.patch:

--- NEW FILE wpa_supplicant-0.6.7-quiet-scan-results-message.patch ---
diff -up wpa_supplicant-0.6.7/wpa_supplicant/events.c.scan-results-msg wpa_supplicant-0.6.7/wpa_supplicant/events.c
--- wpa_supplicant-0.6.7/wpa_supplicant/events.c.scan-results-msg	2009-01-30 12:08:34.000000000 -0500
+++ wpa_supplicant-0.6.7/wpa_supplicant/events.c	2009-01-30 12:08:37.000000000 -0500
@@ -624,7 +624,7 @@ static void wpa_supplicant_event_scan_re
 		wpa_msg(wpa_s, MSG_DEBUG, "Cached scan results are "
 			"empty - not posting");
 	} else {
-		wpa_msg(wpa_s, MSG_INFO, WPA_EVENT_SCAN_RESULTS);
+		wpa_msg(wpa_s, MSG_DEBUG, WPA_EVENT_SCAN_RESULTS);
 		wpa_supplicant_dbus_notify_scan_results(wpa_s);
 		wpas_wps_notify_scan_results(wpa_s);
 	}


Index: wpa_supplicant.spec
===================================================================
RCS file: /cvs/extras/rpms/wpa_supplicant/F-10/wpa_supplicant.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- wpa_supplicant.spec	13 Oct 2008 15:06:57 -0000	1.49
+++ wpa_supplicant.spec	30 Jan 2009 17:59:12 -0000	1.50
@@ -2,7 +2,7 @@
 Name: wpa_supplicant
 Epoch: 1
 Version: 0.6.4
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: BSD
 Group: System Environment/Base
 Source0: http://hostap.epitest.fi/releases/%{name}-%{version}.tar.gz
@@ -22,6 +22,8 @@
 Patch7: wpa_supplicant-0.6.4-scan-fixes-2.patch
 Patch8: wpa_supplicant-0.6.4-validate-wext-event.patch
 Patch9: wpa_supplicant-0.6.4-set-mode-handler.patch
+Patch10: wpa_supplicant-0.6.4-fix-peap-with-windows-server-2008.patch
+Patch11: wpa_supplicant-0.6.7-quiet-scan-results-message.patch
 
 URL: http://w1.fi/wpa_supplicant/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -59,6 +61,8 @@
 %patch7 -p1 -b .scan-fixes-2
 %patch8 -p1 -b .validate-wext-event
 %patch9 -p1 -b .set-mode-handler
+%patch10 -p1 -b .fix-peap-windows-server-2008
+%patch11 -p1 -b .quiet-scan-results-msg
 
 %build
 pushd wpa_supplicant
@@ -122,6 +126,7 @@
 %preun
 if [ $1 = 0 ]; then
 	service %{name} stop > /dev/null 2>&1
+	killall -TERM wpa_supplicant >/dev/null 2>&1
 	/sbin/chkconfig --del %{name}
 fi
 
@@ -148,6 +153,11 @@
 %{_bindir}/wpa_gui
 
 %changelog
+* Fri Jan 30 2009 Dan Williams <dcbw at redhat.com> - 1:0.6.4-3
+- Fix PEAP connections to Windows Server 2008 authenticators (rh #465022)
+- Stop supplicant on uninstall (rh #447843)
+- Suppress scan results message in logs (rh #466601)
+
 * Mon Oct 15 2008 Dan Williams <dcbw at redhat.com> - 1:0.6.4-2
 - Handle encryption keys correctly when switching 802.11 modes (rh #459399)
 - Better scanning behavior on resume from suspend/hibernate



From limb at fedoraproject.org  Fri Jan 30 18:00:57 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Fri, 30 Jan 2009 18:00:57 +0000 (UTC)
Subject: rpms/xmoto/F-10 xmoto.spec,1.44,1.45
Message-ID: <20090130180057.BB5BB70117@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/xmoto/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19921

Modified Files:
	xmoto.spec 
Log Message:
Hmm.



Index: xmoto.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xmoto/F-10/xmoto.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- xmoto.spec	30 Jan 2009 16:57:06 -0000	1.44
+++ xmoto.spec	30 Jan 2009 18:00:27 -0000	1.45
@@ -44,11 +44,11 @@
 %setup -q
 #%patch
 %patch1 -p0
-%patch2 -p0 -F2
+%patch2 -F2 -p0
 %patch3 -p0
 %patch4 -p0
 %patch5 -p0
-%patch6 -p0 -F2
+%patch6 -F2 -p0
 
 #fix encoding
 sed -i 's/\r//' src/xmscene/Camera.cpp



From limb at fedoraproject.org  Fri Jan 30 18:07:11 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Fri, 30 Jan 2009 18:07:11 +0000 (UTC)
Subject: rpms/xmoto/F-10 xmoto-0.4.2-initode.patch, 1.2, 1.3 xmoto.spec, 1.45,
	1.46
Message-ID: <20090130180711.6932670117@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/xmoto/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21258

Modified Files:
	xmoto-0.4.2-initode.patch xmoto.spec 
Log Message:
Patch fix.


xmoto-0.4.2-initode.patch:

Index: xmoto-0.4.2-initode.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xmoto/F-10/xmoto-0.4.2-initode.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xmoto-0.4.2-initode.patch	15 Oct 2008 14:44:47 -0000	1.2
+++ xmoto-0.4.2-initode.patch	30 Jan 2009 18:06:40 -0000	1.3
@@ -1,11 +1,11 @@
-diff -up xmoto-0.4.2/src/xmscene/BikePlayer.cpp~ xmoto-0.4.2/src/xmscene/BikePlayer.cpp
---- xmoto-0.4.2/src/xmscene/BikePlayer.cpp~	2008-10-15 14:13:13.000000000 +0200
-+++ xmoto-0.4.2/src/xmscene/BikePlayer.cpp	2008-10-15 14:35:10.000000000 +0200
-@@ -146,6 +146,7 @@ void PlayerBiker::initPhysics(Vector2f i
-   m_bFirstPhysicsUpdate = true;
- 
-   /* Setup ODE */
+--- 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();
-   m_WorldID = dWorldCreate();
-   dWorldSetERP(m_WorldID,PHYS_WORLD_ERP);
-   dWorldSetCFM(m_WorldID,PHYS_WORLD_CFM);
+   /* Start application */
+   try {     
+     /* Setup basic info */


Index: xmoto.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xmoto/F-10/xmoto.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- xmoto.spec	30 Jan 2009 18:00:27 -0000	1.45
+++ xmoto.spec	30 Jan 2009 18:06:40 -0000	1.46
@@ -44,11 +44,11 @@
 %setup -q
 #%patch
 %patch1 -p0
-%patch2 -F2 -p0
+%patch2 -p0 -F2
 %patch3 -p0
 %patch4 -p0
 %patch5 -p0
-%patch6 -F2 -p0
+%patch6 -p0 -F2
 
 #fix encoding
 sed -i 's/\r//' src/xmscene/Camera.cpp



From pkgdb at fedoraproject.org  Fri Jan 30 18:07:56 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 18:07:56 +0000
Subject: [pkgdb] beesu had acl change status
Message-ID: <20090130180757.04EA6208605@bastion.fedora.phx.redhat.com>

spot has set the watchbugzilla acl on beesu (Fedora devel) to Approved for honeybee

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/beesu



From pkgdb at fedoraproject.org  Fri Jan 30 18:07:59 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 18:07:59 +0000
Subject: [pkgdb] beesu had acl change status
Message-ID: <20090130180759.F117D20860D@bastion.fedora.phx.redhat.com>

spot has set the watchbugzilla acl on beesu (Fedora 9) to Approved for honeybee

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/beesu



From pkgdb at fedoraproject.org  Fri Jan 30 18:08:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 18:08:03 +0000
Subject: [pkgdb] beesu had acl change status
Message-ID: <20090130180803.ED2F6208610@bastion.fedora.phx.redhat.com>

spot has set the watchbugzilla acl on beesu (Fedora 10) to Approved for honeybee

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/beesu



From dcbw at fedoraproject.org  Fri Jan 30 18:08:05 2009
From: dcbw at fedoraproject.org (Daniel Williams)
Date: Fri, 30 Jan 2009 18:08:05 +0000 (UTC)
Subject: rpms/wpa_supplicant/F-10
	wpa_supplicant-0.6.7-quiet-scan-results-message.patch, 1.1, 1.2
Message-ID: <20090130180805.E441270117@cvs1.fedora.phx.redhat.com>

Author: dcbw

Update of /cvs/extras/rpms/wpa_supplicant/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21623

Modified Files:
	wpa_supplicant-0.6.7-quiet-scan-results-message.patch 
Log Message:
Fix fuzz in patch

wpa_supplicant-0.6.7-quiet-scan-results-message.patch:

Index: wpa_supplicant-0.6.7-quiet-scan-results-message.patch
===================================================================
RCS file: /cvs/extras/rpms/wpa_supplicant/F-10/wpa_supplicant-0.6.7-quiet-scan-results-message.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- wpa_supplicant-0.6.7-quiet-scan-results-message.patch	30 Jan 2009 17:59:12 -0000	1.1
+++ wpa_supplicant-0.6.7-quiet-scan-results-message.patch	30 Jan 2009 18:07:35 -0000	1.2
@@ -1,12 +1,12 @@
-diff -up wpa_supplicant-0.6.7/wpa_supplicant/events.c.scan-results-msg wpa_supplicant-0.6.7/wpa_supplicant/events.c
---- wpa_supplicant-0.6.7/wpa_supplicant/events.c.scan-results-msg	2009-01-30 12:08:34.000000000 -0500
-+++ wpa_supplicant-0.6.7/wpa_supplicant/events.c	2009-01-30 12:08:37.000000000 -0500
-@@ -624,7 +624,7 @@ static void wpa_supplicant_event_scan_re
+diff -up wpa_supplicant-0.6.4/wpa_supplicant/events.c.quiet-scan-results-msg wpa_supplicant-0.6.4/wpa_supplicant/events.c
+--- wpa_supplicant-0.6.4/wpa_supplicant/events.c.quiet-scan-results-msg	2009-01-30 12:56:10.000000000 -0500
++++ wpa_supplicant-0.6.4/wpa_supplicant/events.c	2009-01-30 12:56:10.000000000 -0500
+@@ -557,7 +557,7 @@ static void wpa_supplicant_event_scan_re
  		wpa_msg(wpa_s, MSG_DEBUG, "Cached scan results are "
  			"empty - not posting");
  	} else {
 -		wpa_msg(wpa_s, MSG_INFO, WPA_EVENT_SCAN_RESULTS);
 +		wpa_msg(wpa_s, MSG_DEBUG, WPA_EVENT_SCAN_RESULTS);
  		wpa_supplicant_dbus_notify_scan_results(wpa_s);
- 		wpas_wps_notify_scan_results(wpa_s);
  	}
+ 



From pkgdb at fedoraproject.org  Fri Jan 30 18:08:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 18:08:04 +0000
Subject: [pkgdb] beesu had acl change status
Message-ID: <20090130180804.F2144208679@bastion.fedora.phx.redhat.com>

spot has set the watchbugzilla acl on beesu (Fedora EPEL 4) to Approved for honeybee

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/beesu



From pkgdb at fedoraproject.org  Fri Jan 30 18:08:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 18:08:06 +0000
Subject: [pkgdb] beesu had acl change status
Message-ID: <20090130180806.D8FD7208700@bastion.fedora.phx.redhat.com>

spot has set the watchbugzilla acl on beesu (Fedora EPEL 5) to Approved for honeybee

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/beesu



From davej at fedoraproject.org  Fri Jan 30 18:08:35 2009
From: davej at fedoraproject.org (Dave Jones)
Date: Fri, 30 Jan 2009 18:08:35 +0000 (UTC)
Subject: rpms/kernel/devel patch-2.6.29-rc3-git1.bz2.sign, NONE,
	1.1 .cvsignore, 
	1.999, 1.1000 kernel.spec, 1.1250, 1.1251 sources, 1.961,
	1.962 upstream, 1.873, 1.874
Message-ID: <20090130180835.434D970117@cvs1.fedora.phx.redhat.com>

Author: davej

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21767

Modified Files:
	.cvsignore kernel.spec sources upstream 
Added Files:
	patch-2.6.29-rc3-git1.bz2.sign 
Log Message:
2.6.29-rc3-git1


--- NEW FILE patch-2.6.29-rc3-git1.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBJguwAyGugalF9Dw4RAhQUAJ0eeGfFKWnr3R/eqRA3JktfT/pz6ACfXMZr
SaiMPoOJt6Di4ZgqPjadpuU=
=piNt
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.999
retrieving revision 1.1000
diff -u -r1.999 -r1.1000
--- .cvsignore	28 Jan 2009 19:40:41 -0000	1.999
+++ .cvsignore	30 Jan 2009 18:08:04 -0000	1.1000
@@ -5,3 +5,4 @@
 kernel-2.6.28
 linux-2.6.28.tar.bz2
 patch-2.6.29-rc3.bz2
+patch-2.6.29-rc3-git1.bz2


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1250
retrieving revision 1.1251
diff -u -r1.1250 -r1.1251
--- kernel.spec	30 Jan 2009 17:52:24 -0000	1.1250
+++ kernel.spec	30 Jan 2009 18:08:04 -0000	1.1251
@@ -58,7 +58,7 @@
 # The rc snapshot level
 %define rcrev 3
 # The git snapshot level
-%define gitrev 0
+%define gitrev 1
 # Set rpm version accordingly
 %define rpmversion 2.6.%{upstream_sublevel}
 %endif
@@ -1162,7 +1162,7 @@
 ApplyPatch linux-2.6-at76.patch
 
 # http://www.lirc.org/
-ApplyPatch linux-2.6.29-lirc.patch
+#ApplyPatch linux-2.6.29-lirc.patch
 # http://hg.jannau.net/hdpvr/
 ApplyPatch linux-2.6-hdpvr.patch
 
@@ -1185,11 +1185,11 @@
 ApplyPatch drm-nouveau.patch
 
 # linux1394 git patches
-ApplyPatch linux-2.6-firewire-git-update.patch
+#ApplyPatch linux-2.6-firewire-git-update.patch
 C=$(wc -l $RPM_SOURCE_DIR/linux-2.6-firewire-git-pending.patch | awk '{print $1}')
-if [ "$C" -gt 10 ]; then
-ApplyPatch linux-2.6-firewire-git-pending.patch
-fi
+#if [ "$C" -gt 10 ]; then
+#ApplyPatch linux-2.6-firewire-git-pending.patch
+#fi
 
 # Fix NFS
 ApplyPatch linux-2.6.28-sunrpc-ipv6-rpcbind.patch
@@ -1783,6 +1783,9 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Fri Jan 30 2009 Dave Jones <davej at redhat.com>
+- 2.6.29-rc3-git1
+
 * Fri Jan 30 2009 Josef Bacik <josef at toxicpanda.com>
 - add patch to keep btrfs from locking up when creating a new inode
 - add patch to let readdir not screw up on 32bit boxes


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v
retrieving revision 1.961
retrieving revision 1.962
diff -u -r1.961 -r1.962
--- sources	28 Jan 2009 19:40:41 -0000	1.961
+++ sources	30 Jan 2009 18:08:04 -0000	1.962
@@ -1,2 +1,3 @@
 d351e44709c9810b85e29b877f50968a  linux-2.6.28.tar.bz2
 d95a5be60287e9632c9d0513b59f6511  patch-2.6.29-rc3.bz2
+8adc233b361618457c3f44c25be1455b  patch-2.6.29-rc3-git1.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v
retrieving revision 1.873
retrieving revision 1.874
diff -u -r1.873 -r1.874
--- upstream	28 Jan 2009 19:40:41 -0000	1.873
+++ upstream	30 Jan 2009 18:08:04 -0000	1.874
@@ -1,2 +1,3 @@
 linux-2.6.28.tar.bz2
 patch-2.6.29-rc3.bz2
+patch-2.6.29-rc3-git1.bz2



From dcbw at fedoraproject.org  Fri Jan 30 18:09:56 2009
From: dcbw at fedoraproject.org (Daniel Williams)
Date: Fri, 30 Jan 2009 18:09:56 +0000 (UTC)
Subject: rpms/wpa_supplicant/F-9
	wpa_supplicant-0.6.4-fix-peap-with-windows-server-2008.patch,
	NONE, 1.1 wpa_supplicant-0.6.7-quiet-scan-results-message.patch,
	NONE, 1.1 wpa_supplicant.spec, 1.48, 1.49
Message-ID: <20090130180956.4959970117@cvs1.fedora.phx.redhat.com>

Author: dcbw

Update of /cvs/extras/rpms/wpa_supplicant/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22115

Modified Files:
	wpa_supplicant.spec 
Added Files:
	wpa_supplicant-0.6.4-fix-peap-with-windows-server-2008.patch 
	wpa_supplicant-0.6.7-quiet-scan-results-message.patch 
Log Message:
* Fri Jan 30 2009 Dan Williams <dcbw at redhat.com> - 1:0.6.4-3
- Fix PEAP connections to Windows Server 2008 authenticators (rh #465022)
- Stop supplicant on uninstall (rh #447843)
- Suppress scan results message in logs (rh #466601)



wpa_supplicant-0.6.4-fix-peap-with-windows-server-2008.patch:

--- NEW FILE wpa_supplicant-0.6.4-fix-peap-with-windows-server-2008.patch ---
From: Jouni Malinen <j at w1.fi>
Date: Sun, 14 Dec 2008 22:15:54 +0000 (+0200)
Subject: Fixed interoperability issue with PEAPv0 cryptobinding and NPS
X-Git-Tag: hostap_0_6_7~111
X-Git-Url: http://w1.fi/gitweb/gitweb.cgi?p=hostap.git;a=commitdiff_plain;h=f4f2774a96d91753811e921380856bc859888153

Fixed interoperability issue with PEAPv0 cryptobinding and NPS

Windows Server 2008 NPS gets very confused if the TLS Message Length is
not included in the Phase 1 messages even if fragmentation is not used.
If the TLS Message Length field is not included in ClientHello message,
NPS seems to decide to use the ClientHello data (excluding first six
octets, i.e., EAP header, type, Flags) as the OuterTLVs data in
Cryptobinding Compound_MAC calculation (per PEAPv2; not MS-PEAP)..

Lets add the TLS Message Length to PEAPv0 Phase 1 messages to get rid of
this issue. This seems to fix Cryptobinding issues with NPS and PEAPv0
is now using optional Cryptobinding by default (again) since there are
no known interop issues with it anymore.
---

diff --git a/src/eap_peer/eap_tls_common.c b/src/eap_peer/eap_tls_common.c
index 9ff4eed..5db8bf6 100644
--- a/src/eap_peer/eap_tls_common.c
+++ b/src/eap_peer/eap_tls_common.c
@@ -501,6 +501,17 @@ static int eap_tls_process_output(struct eap_ssl_data *data, EapType eap_type,
 	length_included = data->tls_out_pos == 0 &&
 		(data->tls_out_len > data->tls_out_limit ||
 		 data->include_tls_length);
+	if (!length_included &&
+	    eap_type == EAP_TYPE_PEAP && peap_version == 0 &&
+	    !tls_connection_established(data->eap->ssl_ctx, data->conn)) {
+		/*
+		 * Windows Server 2008 NPS really wants to have the TLS Message
+		 * length included in phase 0 even for unfragmented frames or
+		 * it will get very confused with Compound MAC calculation and
+		 * Outer TLVs.
+		 */
+		length_included = 1;
+	}
 
 	*out_data = eap_msg_alloc(EAP_VENDOR_IETF, eap_type,
 				  1 + length_included * 4 + len,


wpa_supplicant-0.6.7-quiet-scan-results-message.patch:

--- NEW FILE wpa_supplicant-0.6.7-quiet-scan-results-message.patch ---
diff -up wpa_supplicant-0.6.4/wpa_supplicant/events.c.quiet-scan-results-msg wpa_supplicant-0.6.4/wpa_supplicant/events.c
--- wpa_supplicant-0.6.4/wpa_supplicant/events.c.quiet-scan-results-msg	2009-01-30 12:56:10.000000000 -0500
+++ wpa_supplicant-0.6.4/wpa_supplicant/events.c	2009-01-30 12:56:10.000000000 -0500
@@ -557,7 +557,7 @@ static void wpa_supplicant_event_scan_re
 		wpa_msg(wpa_s, MSG_DEBUG, "Cached scan results are "
 			"empty - not posting");
 	} else {
-		wpa_msg(wpa_s, MSG_INFO, WPA_EVENT_SCAN_RESULTS);
+		wpa_msg(wpa_s, MSG_DEBUG, WPA_EVENT_SCAN_RESULTS);
 		wpa_supplicant_dbus_notify_scan_results(wpa_s);
 	}
 


Index: wpa_supplicant.spec
===================================================================
RCS file: /cvs/extras/rpms/wpa_supplicant/F-9/wpa_supplicant.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- wpa_supplicant.spec	13 Oct 2008 16:08:42 -0000	1.48
+++ wpa_supplicant.spec	30 Jan 2009 18:09:26 -0000	1.49
@@ -2,7 +2,7 @@
 Name: wpa_supplicant
 Epoch: 1
 Version: 0.6.4
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: BSD
 Group: System Environment/Base
 Source0: http://hostap.epitest.fi/releases/%{name}-%{version}.tar.gz
@@ -23,6 +23,8 @@
 Patch7: wpa_supplicant-0.6.4-scan-fixes-2.patch
 Patch8: wpa_supplicant-0.6.4-validate-wext-event.patch
 Patch9: wpa_supplicant-0.6.4-set-mode-handler.patch
+Patch10: wpa_supplicant-0.6.4-fix-peap-with-windows-server-2008.patch
+Patch11: wpa_supplicant-0.6.7-quiet-scan-results-message.patch
 
 URL: http://w1.fi/wpa_supplicant/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -60,6 +62,8 @@
 %patch7 -p1 -b .scan-fixes-2
 %patch8 -p1 -b .validate-wext-event
 %patch9 -p1 -b .set-mode-handler
+%patch10 -p1 -b .fix-peap-windows-server-2008
+%patch11 -p1 -b .quiet-scan-results-msg
 
 %build
 pushd src
@@ -127,6 +131,7 @@
 %preun
 if [ $1 = 0 ]; then
 	service %{name} stop > /dev/null 2>&1
+	killall -TERM wpa_supplicant >/dev/null 2>&1
 	/sbin/chkconfig --del %{name}
 fi
 
@@ -153,6 +158,11 @@
 %{_bindir}/wpa_gui
 
 %changelog
+* Fri Jan 30 2009 Dan Williams <dcbw at redhat.com> - 1:0.6.4-3
+- Fix PEAP connections to Windows Server 2008 authenticators (rh #465022)
+- Stop supplicant on uninstall (rh #447843)
+- Suppress scan results message in logs (rh #466601)
+
 * Mon Oct 15 2008 Dan Williams <dcbw at redhat.com> - 1:0.6.4-2
 - Handle encryption keys correctly when switching 802.11 modes (rh #459399)
 - Better scanning behavior on resume from suspend/hibernate



From tuxbrewr at fedoraproject.org  Fri Jan 30 18:30:28 2009
From: tuxbrewr at fedoraproject.org (Steven M. Parrish)
Date: Fri, 30 Jan 2009 18:30:28 +0000 (UTC)
Subject: rpms/sugar-terminal/devel .cvsignore, 1.2, 1.3 sources, 1.2,
	1.3 sugar-terminal.spec, 1.3, 1.4
Message-ID: <20090130183029.0306670117@cvs1.fedora.phx.redhat.com>

Author: tuxbrewr

Update of /cvs/pkgs/rpms/sugar-terminal/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26036

Modified Files:
	.cvsignore sources sugar-terminal.spec 
Log Message:
New upstream release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-terminal/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	3 Sep 2008 20:41:39 -0000	1.2
+++ .cvsignore	30 Jan 2009 18:29:57 -0000	1.3
@@ -1 +1 @@
-Terminal-16.tar.bz2
+Terminal-21.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-terminal/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	3 Sep 2008 20:41:39 -0000	1.2
+++ sources	30 Jan 2009 18:29:57 -0000	1.3
@@ -1 +1 @@
-64185b62752e41cf764dce08d7be1d11  Terminal-16.tar.bz2
+9afb07bba8e9d8630b2831f5200f5ee6  Terminal-21.tar.bz2


Index: sugar-terminal.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar-terminal/devel/sugar-terminal.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sugar-terminal.spec	1 Dec 2008 15:00:46 -0000	1.3
+++ sugar-terminal.spec	30 Jan 2009 18:29:57 -0000	1.4
@@ -1,6 +1,6 @@
 Name: sugar-terminal
-Version: 16
-Release: 3%{?dist}
+Version: 21
+Release: 1%{?dist}
 Summary: Terminal for Sugar
 Group: Sugar/Activities
 License: GPLv2+
@@ -42,6 +42,9 @@
 
 
 %changelog
+* Fri Jan 30 2009 Steven M. Parrish <tuxbrewr at fedoraproject.org>
+- New release
+
 * Mon Dec 01 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 16-3
 - Rebuild for Python 2.6
 



From tadej at fedoraproject.org  Fri Jan 30 18:43:32 2009
From: tadej at fedoraproject.org (=?utf-8?q?Tadej_Jane=C5=BE?=)
Date: Fri, 30 Jan 2009 18:43:32 +0000 (UTC)
Subject: rpms/PyQwt/F-10 PyQwt.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090130184332.A24B670117@cvs1.fedora.phx.redhat.com>

Author: tadej

Update of /cvs/pkgs/rpms/PyQwt/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28467/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	PyQwt.spec import.log 
Log Message:
Initial import.



--- NEW FILE PyQwt.spec ---
%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}

Name:           PyQwt
Version:        5.1.0
Release:        3%{?dist}
Summary:        Python bindings for Qwt

Group:          Development/Languages
# GPLv2+ exceptions (see COPYING.PyQwt)
License:        GPLv2+ with exceptions
URL:            http://pyqwt.sourceforge.net/
Source0:        http://downloads.sourceforge.net/pyqwt/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  python-devel
BuildRequires:  sip-devel
BuildRequires:  PyQt4-devel
BuildRequires:  numpy
BuildRequires:  qwt-devel

Requires:       PyQt4
Requires:       numpy

%description
PyQwt is a set of Python bindings for the Qwt C++ class library which extends
the Qt framework with widgets for scientific and engineering applications. It
provides a widget to plot 2-dimensional data and various widgets to display and
control bounded or unbounded floating point values.

%package devel
Summary: Files needed to build other bindings on PyQwt
Group:   Development/Languages
Requires: %{name} = %{version}-%{release}
Requires: PyQt4-devel
Requires: qwt-devel
%description devel
Files needed to build other bindings for Qwt C++ classes that inherit from
any of the PyQwt classes.

%prep
%setup -q

# mark examples non-executable
find qt4examples/ -name "*.py" | xargs chmod a-x

%build
QWTDIR=%{_includedir}/qwt
cd configure
%{__python} configure.py -I$QWTDIR -lqwt --disable-numarray --disable-numeric
make %{?_smp_mflags}

%install
rm -rf %{buildroot}
cd configure
make DESTDIR=%{buildroot} install

# non-executable script
chmod 755 %{buildroot}/%{python_sitearch}/PyQt4/Qwt5/grace.py
 
%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%doc ANNOUNCEMENT-%{version} README
%doc COPYING*
%{python_sitearch}/PyQt4/Qwt5/

%files devel
%defattr(-,root,root,-)
%doc Doc/*
%doc qt4examples/ 
%{_datadir}/sip/PyQt4/Qwt5/

%changelog
* Sat Jan 24 2009 Tadej Jane?? <tadej.janez at tadej.hicsalta.si> 5.1.0-3
- made grace.py executable again

* Fri Jan 09 2009 Tadej Jane?? <tadej.janez at tadej.hicsalta.si> 5.1.0-2
- disabled support for Numeric and Numarray
- incorporated fixes from package review in BZ472229

* Tue Nov 18 2008 Tadej Jane?? <tadej.janez at tadej.hicsalta.si> 5.1.0-1
- initial package


--- NEW FILE import.log ---
PyQwt-5_1_0-3_fc10:F-10:PyQwt-5.1.0-3.fc10.src.rpm:1233340919


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/PyQwt/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	28 Jan 2009 05:37:50 -0000	1.1
+++ .cvsignore	30 Jan 2009 18:43:02 -0000	1.2
@@ -0,0 +1 @@
+PyQwt-5.1.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/PyQwt/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	28 Jan 2009 05:37:50 -0000	1.1
+++ sources	30 Jan 2009 18:43:02 -0000	1.2
@@ -0,0 +1 @@
+c9d662a0d4fc95cec75d3c526e4e748a  PyQwt-5.1.0.tar.gz



From rdieter at fedoraproject.org  Fri Jan 30 18:45:24 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 30 Jan 2009 18:45:24 +0000 (UTC)
Subject: rpms/kdebase-workspace/F-9
	kdebase-workspace-4.2.0-default_applets.patch, 1.1,
	1.2 kdebase-workspace.spec, 1.127, 1.128
Message-ID: <20090130184525.033ED70117@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-serv29160

Modified Files:
	kdebase-workspace-4.2.0-default_applets.patch 
	kdebase-workspace.spec 
Log Message:
* Fri Jan 30 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.0-4.2
- respin default_applets patch for kpowersave too (F-9, #483163)


kdebase-workspace-4.2.0-default_applets.patch:

Index: kdebase-workspace-4.2.0-default_applets.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/F-9/kdebase-workspace-4.2.0-default_applets.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kdebase-workspace-4.2.0-default_applets.patch	28 Jan 2009 12:54:57 -0000	1.1
+++ kdebase-workspace-4.2.0-default_applets.patch	30 Jan 2009 18:45:24 -0000	1.2
@@ -1,7 +1,8 @@
 diff -up kdebase-workspace-4.2.0/plasma/shells/desktop/desktopcorona.cpp.orig kdebase-workspace-4.2.0/plasma/shells/desktop/desktopcorona.cpp
---- kdebase-workspace-4.2.0/plasma/shells/desktop/desktopcorona.cpp.orig	2009-01-28 13:33:19.000000000 +0100
-+++ kdebase-workspace-4.2.0/plasma/shells/desktop/desktopcorona.cpp	2009-01-28 13:39:47.000000000 +0100
-@@ -200,15 +200,17 @@ void DesktopCorona::loadDefaultLayout()
+diff -up kdebase-workspace-4.2.0/plasma/shells/desktop/desktopcorona.cpp.default_applets kdebase-workspace-4.2.0/plasma/shells/desktop/desktopcorona.cpp
+--- kdebase-workspace-4.2.0/plasma/shells/desktop/desktopcorona.cpp.default_applets	2009-01-06 11:22:28.000000000 -0600
++++ kdebase-workspace-4.2.0/plasma/shells/desktop/desktopcorona.cpp	2009-01-30 12:40:53.000000000 -0600
+@@ -200,15 +200,18 @@ void DesktopCorona::loadDefaultLayout()
      loadDefaultApplet("tasks", panel);
      loadDefaultApplet("systemtray", panel);
  
@@ -12,7 +13,8 @@
 -        if (!batteries.isEmpty()) {
 -            loadDefaultApplet("battery", panel);
 -        }
-+    if (!QFile::exists("/usr/share/autostart/guidance-power-manager.desktop")) {
++    if ( (!QFile::exists("/usr/share/autostart/guidance-power-manager.desktop")) && 
++         (!QFile::exists("/usr/share/autostart/kpowersave-autostart.desktop")) ) {
 +       Plasma::DataEngineManager *engines = Plasma::DataEngineManager::self();
 +       Plasma::DataEngine *power = engines->loadEngine("powermanagement");
 +       if (power) {


Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/F-9/kdebase-workspace.spec,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -r1.127 -r1.128
--- kdebase-workspace.spec	29 Jan 2009 19:41:04 -0000	1.127
+++ kdebase-workspace.spec	30 Jan 2009 18:45:24 -0000	1.128
@@ -8,7 +8,7 @@
 Name: kdebase-workspace
 Version: 4.2.0
 
-Release: 4%{?dist}.1
+Release: 4%{?dist}.2
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-workspace-%{version}.tar.bz2
 License: GPLv2
 Group: User Interface/Desktops
@@ -326,6 +326,9 @@
 
 
 %changelog
+* Fri Jan 30 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.0-4.2
+- respin default_applets patch for kpowersave too (F-9, #483163)
+
 * Thu Jan 29 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.2.0-4.1
 - conditionalize bluetooth backport on F10+
 - F9: revert solid-bluetooth to the version from KDE 4.1.4



From rdieter at fedoraproject.org  Fri Jan 30 18:47:38 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 30 Jan 2009 18:47:38 +0000 (UTC)
Subject: rpms/kdebase-workspace/devel
	kdebase-workspace-4.2.0-default_applets.patch, 1.1,
	1.2 kdebase-workspace.spec, 1.174, 1.175
Message-ID: <20090130184738.07DBA70141@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdebase-workspace/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29793

Modified Files:
	kdebase-workspace-4.2.0-default_applets.patch 
	kdebase-workspace.spec 
Log Message:
* Fri Jan 30 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.0-4.2
- respin default_applets patch for kpowersave too (F-9, #483163)


kdebase-workspace-4.2.0-default_applets.patch:

Index: kdebase-workspace-4.2.0-default_applets.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/devel/kdebase-workspace-4.2.0-default_applets.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kdebase-workspace-4.2.0-default_applets.patch	28 Jan 2009 12:47:27 -0000	1.1
+++ kdebase-workspace-4.2.0-default_applets.patch	30 Jan 2009 18:47:37 -0000	1.2
@@ -1,7 +1,8 @@
 diff -up kdebase-workspace-4.2.0/plasma/shells/desktop/desktopcorona.cpp.orig kdebase-workspace-4.2.0/plasma/shells/desktop/desktopcorona.cpp
---- kdebase-workspace-4.2.0/plasma/shells/desktop/desktopcorona.cpp.orig	2009-01-28 13:33:19.000000000 +0100
-+++ kdebase-workspace-4.2.0/plasma/shells/desktop/desktopcorona.cpp	2009-01-28 13:39:47.000000000 +0100
-@@ -200,15 +200,17 @@ void DesktopCorona::loadDefaultLayout()
+diff -up kdebase-workspace-4.2.0/plasma/shells/desktop/desktopcorona.cpp.default_applets kdebase-workspace-4.2.0/plasma/shells/desktop/desktopcorona.cpp
+--- kdebase-workspace-4.2.0/plasma/shells/desktop/desktopcorona.cpp.default_applets	2009-01-06 11:22:28.000000000 -0600
++++ kdebase-workspace-4.2.0/plasma/shells/desktop/desktopcorona.cpp	2009-01-30 12:40:53.000000000 -0600
+@@ -200,15 +200,18 @@ void DesktopCorona::loadDefaultLayout()
      loadDefaultApplet("tasks", panel);
      loadDefaultApplet("systemtray", panel);
  
@@ -12,7 +13,8 @@
 -        if (!batteries.isEmpty()) {
 -            loadDefaultApplet("battery", panel);
 -        }
-+    if (!QFile::exists("/usr/share/autostart/guidance-power-manager.desktop")) {
++    if ( (!QFile::exists("/usr/share/autostart/guidance-power-manager.desktop")) && 
++         (!QFile::exists("/usr/share/autostart/kpowersave-autostart.desktop")) ) {
 +       Plasma::DataEngineManager *engines = Plasma::DataEngineManager::self();
 +       Plasma::DataEngine *power = engines->loadEngine("powermanagement");
 +       if (power) {


Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/devel/kdebase-workspace.spec,v
retrieving revision 1.174
retrieving revision 1.175
diff -u -r1.174 -r1.175
--- kdebase-workspace.spec	29 Jan 2009 21:33:46 -0000	1.174
+++ kdebase-workspace.spec	30 Jan 2009 18:47:37 -0000	1.175
@@ -8,7 +8,7 @@
 Name: kdebase-workspace
 Version: 4.2.0
 
-Release: 4%{?dist}.1
+Release: 4%{?dist}.2
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-workspace-%{version}.tar.bz2
 License: GPLv2
 Group: User Interface/Desktops
@@ -326,6 +326,9 @@
 
 
 %changelog
+* Fri Jan 30 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.0-4.2
+- respin default_applets patch for kpowersave too (F-9, #483163)
+
 * Thu Jan 29 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.2.0-4.1
 - conditionalize bluetooth backport on F10+
 - F9: revert solid-bluetooth to the version from KDE 4.1.4



From pkgdb at fedoraproject.org  Fri Jan 30 18:54:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 18:54:27 +0000
Subject: [pkgdb] sugar-chat ownership updated
Message-ID: <20090130185427.C5AA220820B@bastion.fedora.phx.redhat.com>

Package sugar-chat in Fedora devel was orphaned by katzj

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-chat



From pkgdb at fedoraproject.org  Fri Jan 30 18:54:35 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 18:54:35 +0000
Subject: [pkgdb] sugar-terminal ownership updated
Message-ID: <20090130185435.A6A0E208496@bastion.fedora.phx.redhat.com>

Package sugar-terminal in Fedora devel was orphaned by katzj

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-terminal



From pkgdb at fedoraproject.org  Fri Jan 30 18:54:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 18:54:40 +0000
Subject: [pkgdb] sugar-terminal ownership updated
Message-ID: <20090130185440.5D8852084A7@bastion.fedora.phx.redhat.com>

Package sugar-terminal in Fedora devel is now owned by katzj

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-terminal



From pkgdb at fedoraproject.org  Fri Jan 30 18:54:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 18:54:43 +0000
Subject: [pkgdb] sugar-terminal ownership updated
Message-ID: <20090130185443.E961A20860E@bastion.fedora.phx.redhat.com>

Package sugar-terminal in Fedora devel was orphaned by katzj

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-terminal



From pkgdb at fedoraproject.org  Fri Jan 30 18:54:43 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 18:54:43 +0000
Subject: [pkgdb] sugar-terminal ownership updated
Message-ID: <20090130185445.4F91620860F@bastion.fedora.phx.redhat.com>

Package sugar-terminal in Fedora 10 was orphaned by katzj

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-terminal



From pkgdb at fedoraproject.org  Fri Jan 30 18:54:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 18:54:51 +0000
Subject: [pkgdb] sugar-calculator ownership updated
Message-ID: <20090130185451.E1AD1208493@bastion.fedora.phx.redhat.com>

Package sugar-calculator in Fedora devel was orphaned by katzj

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-calculator



From pkgdb at fedoraproject.org  Fri Jan 30 18:54:53 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 18:54:53 +0000
Subject: [pkgdb] sugar-calculator ownership updated
Message-ID: <20090130185453.915A5208679@bastion.fedora.phx.redhat.com>

Package sugar-calculator in Fedora 9 was orphaned by katzj

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-calculator



From pkgdb at fedoraproject.org  Fri Jan 30 18:54:55 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 18:54:55 +0000
Subject: [pkgdb] sugar-calculator ownership updated
Message-ID: <20090130185455.27F72208700@bastion.fedora.phx.redhat.com>

Package sugar-calculator in Fedora 10 was orphaned by katzj

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-calculator



From pkgdb at fedoraproject.org  Fri Jan 30 18:55:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 18:55:06 +0000
Subject: [pkgdb] sugar-chat ownership updated
Message-ID: <20090130185506.17680208494@bastion.fedora.phx.redhat.com>

Package sugar-chat in Fedora 10 was orphaned by katzj

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-chat



From pkgdb at fedoraproject.org  Fri Jan 30 18:55:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 18:55:08 +0000
Subject: [pkgdb] sugar-chat ownership updated
Message-ID: <20090130185508.AD36A2084B6@bastion.fedora.phx.redhat.com>

Package sugar-chat in Fedora 9 was orphaned by katzj

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-chat



From pkgdb at fedoraproject.org  Fri Jan 30 18:55:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 18:55:21 +0000
Subject: [pkgdb] sugar-write ownership updated
Message-ID: <20090130185521.54CE62084BD@bastion.fedora.phx.redhat.com>

Package sugar-write in Fedora devel was orphaned by katzj

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-write



From pkgdb at fedoraproject.org  Fri Jan 30 18:55:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 18:55:23 +0000
Subject: [pkgdb] sugar-write ownership updated
Message-ID: <20090130185523.1C486208745@bastion.fedora.phx.redhat.com>

Package sugar-write in Fedora 9 was orphaned by katzj

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-write



From pkgdb at fedoraproject.org  Fri Jan 30 18:55:24 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 18:55:24 +0000
Subject: [pkgdb] sugar-write ownership updated
Message-ID: <20090130185525.4D6ED20860C@bastion.fedora.phx.redhat.com>

Package sugar-write in Fedora 10 was orphaned by katzj

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-write



From pkgdb at fedoraproject.org  Fri Jan 30 18:55:27 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 18:55:27 +0000
Subject: [pkgdb] sugar-write ownership updated
Message-ID: <20090130185527.DD33A208966@bastion.fedora.phx.redhat.com>

Package sugar-write in Fedora 10 is now owned by katzj

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-write



From pkgdb at fedoraproject.org  Fri Jan 30 18:55:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 18:55:29 +0000
Subject: [pkgdb] sugar-write ownership updated
Message-ID: <20090130185529.E846020896F@bastion.fedora.phx.redhat.com>

Package sugar-write in Fedora 10 was orphaned by katzj

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-write



From pmatilai at fedoraproject.org  Fri Jan 30 18:57:16 2009
From: pmatilai at fedoraproject.org (Panu Matilainen)
Date: Fri, 30 Jan 2009 18:57:16 +0000 (UTC)
Subject: rpms/sqlite/F-10 sqlite-3.5.9-tclver.patch, NONE, 1.1 sqlite.spec, 
	1.42, 1.43
Message-ID: <20090130185716.C634870117@cvs1.fedora.phx.redhat.com>

Author: pmatilai

Update of /cvs/pkgs/rpms/sqlite/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31372

Modified Files:
	sqlite.spec 
Added Files:
	sqlite-3.5.9-tclver.patch 
Log Message:
- fix tcl module version so it gets loaded properly (#469129)
- pull bunch of other tcl-module related fixes from devel:
  - require tcl(abi) in sqlite-tcl subpackage (#474034)
  - move tcl extensions to arch-specific location
  - enable dependency extraction on the tcl dso
- require pkgconfig in sqlite-devel


sqlite-3.5.9-tclver.patch:

--- NEW FILE sqlite-3.5.9-tclver.patch ---
--- sqlite-3.5.9/Makefile.in	2008-05-12 10:10:26.000000000 -0700
+++ sqlite-3.5.9/Makefile.in.new	2008-12-12 23:45:15.000000000 -0800
@@ -703,7 +703,7 @@
 	$(INSTALL) -m 0644 sqlite3.pc $(DESTDIR)$(libdir)/pkgconfig; 
 
 tcl_install:	libtclsqlite3.la
-	$(TCLSH_CMD) $(TOP)/tclinstaller.tcl $(VERSION)
+	$(TCLSH_CMD) $(TOP)/tclinstaller.tcl $(RELEASE)
 
 clean:	
 	rm -f *.lo *.la *.o sqlite3$(TEXE) libsqlite3.la


Index: sqlite.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sqlite/F-10/sqlite.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- sqlite.spec	17 Jan 2009 17:05:41 -0000	1.42
+++ sqlite.spec	30 Jan 2009 18:56:46 -0000	1.43
@@ -6,7 +6,7 @@
 Summary: Library that implements an embeddable SQL database engine
 Name: sqlite
 Version: 3.5.9
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: Public Domain
 Group: 	Applications/Databases
 URL: http://www.sqlite.org/
@@ -18,11 +18,15 @@
 Patch3: sqlite-3.5.9-remove-temporary.patch
 # Upstream fix http://www.sqlite.org/cvstrac/chngview?cn=5396
 Patch4: sqlite-3.5.9-nan-ix86-fix.patch
+# Fixed upstream somewhere between 3.5.9 and 3.6.6.2
+Patch5: sqlite-3.5.9-tclver.patch
 Obsoletes: sqlite3 sqlite3-devel
 BuildRequires: ncurses-devel%{?_isa} readline-devel glibc-devel%{?_isa}
 BuildRequires: /usr/bin/tclsh
 %if %{with tcl}
 BuildRequires: tcl-devel%{_isa}
+%{!?tcl_version: %global tcl_version 8.5}
+%{!?tcl_sitearch: %global tcl_sitearch %{_libdir}/tcl%{tcl_version}}
 %endif
 BuildRoot: %{_tmppath}/%{name}-root
 
@@ -39,6 +43,7 @@
 Summary: Development tools for the sqlite3 embeddable SQL database engine.
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
+Requires: pkgconfig
 
 %description devel
 This package contains the header files and development documentation 
@@ -50,6 +55,7 @@
 Summary: Tcl module for the sqlite3 embeddable SQL database engine.
 Group: Development/Languages
 Requires: %{name} = %{version}-%{release}
+Requires: tcl(abi) = %{tcl_version}
 
 %description tcl
 This package contains the tcl modules for %{name}.
@@ -61,6 +67,7 @@
 %patch2 -p1 -b .libdl
 %patch3 -p1 -b .remove-temp
 %patch4 -p1 -b .nan-ix86-fix
+%patch5 -p1 -b .tclver
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS -DSQLITE_ENABLE_COLUMN_METADATA=1 -DSQLITE_DISABLE_DIRSYNC=1 -Wall"
@@ -75,7 +82,7 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 
-make DESTDIR=${RPM_BUILD_ROOT} install
+make DESTDIR=${RPM_BUILD_ROOT} %{?with_tcl:TCLLIBDIR=%{tcl_sitearch}} install
 
 %{__install} -D -m0644 sqlite3.1 %{buildroot}%{_mandir}/man1/sqlite3.1
 
@@ -83,6 +90,11 @@
 rm -f $RPM_BUILD_ROOT/%{_libdir}/*.{la,a}
 %endif
 
+%if %{with tcl}
+# fix up permissions to enable dep extraction
+chmod 0755 ${RPM_BUILD_ROOT}/%{tcl_sitearch}/sqlite3/*.so
+%endif
+
 %if %{with check}
 %check
 make test
@@ -112,13 +124,21 @@
 %{_libdir}/*.a
 %exclude %{_libdir}/*.la
 %endif
+
 %if %{with tcl}
 %files tcl
 %defattr(-, root, root)
-%{_datadir}/tcl*/sqlite3
+%{tcl_sitearch}/sqlite3
 %endif
 
 %changelog
+* Fri Jan 30 2009 Panu Matilainen <pmatilai at redhat.com> - 3.5.9-4
+- fix tcl module version so it gets loaded properly (#469129)
+- require tcl(abi) in sqlite-tcl subpackage (#474034)
+- move tcl extensions to arch-specific location
+- enable dependency extraction on the tcl dso
+- require pkgconfig in sqlite-devel
+
 * Sat Jan 17 2009 Panu Matilainen <pmatilai at redhat.com> - 3.5.9-3
 - Floating point handling fix on x86 (#474260)
 



From rdieter at fedoraproject.org  Fri Jan 30 18:59:31 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 30 Jan 2009 18:59:31 +0000 (UTC)
Subject: rpms/kde-l10n/F-10 .cvsignore,1.15,1.16
Message-ID: <20090130185931.2CD6B70117@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kde-l10n/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32444

Modified Files:
	.cvsignore 
Log Message:
sync/update .cvsignore



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kde-l10n/F-10/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	9 Jan 2009 17:47:00 -0000	1.15
+++ .cvsignore	30 Jan 2009 18:59:00 -0000	1.16
@@ -1,47 +1,235 @@
-kde-l10n-bg-4.1.4.tar.bz2
-kde-l10n-ca-4.1.4.tar.bz2
-kde-l10n-cs-4.1.4.tar.bz2
-kde-l10n-csb-4.1.4.tar.bz2
-kde-l10n-da-4.1.4.tar.bz2
-kde-l10n-de-4.1.4.tar.bz2
-kde-l10n-el-4.1.4.tar.bz2
-kde-l10n-en_GB-4.1.4.tar.bz2
-kde-l10n-eo-4.1.4.tar.bz2
-kde-l10n-es-4.1.4.tar.bz2
-kde-l10n-et-4.1.4.tar.bz2
-kde-l10n-fi-4.1.4.tar.bz2
-kde-l10n-fr-4.1.4.tar.bz2
-kde-l10n-fy-4.1.4.tar.bz2
-kde-l10n-ga-4.1.4.tar.bz2
-kde-l10n-gl-4.1.4.tar.bz2
-kde-l10n-hi-4.1.4.tar.bz2
-kde-l10n-hu-4.1.4.tar.bz2
-kde-l10n-it-4.1.4.tar.bz2
-kde-l10n-ja-4.1.4.tar.bz2
-kde-l10n-kk-4.1.4.tar.bz2
-kde-l10n-km-4.1.4.tar.bz2
-kde-l10n-ko-4.1.4.tar.bz2
-kde-l10n-ku-4.1.4.tar.bz2
-kde-l10n-lt-4.1.4.tar.bz2
-kde-l10n-lv-4.1.4.tar.bz2
-kde-l10n-mk-4.1.4.tar.bz2
-kde-l10n-ml-4.1.4.tar.bz2
-kde-l10n-nb-4.1.4.tar.bz2
-kde-l10n-nds-4.1.4.tar.bz2
-kde-l10n-nl-4.1.4.tar.bz2
-kde-l10n-nn-4.1.4.tar.bz2
-kde-l10n-pa-4.1.4.tar.bz2
-kde-l10n-pl-4.1.4.tar.bz2
-kde-l10n-pt-4.1.4.tar.bz2
-kde-l10n-pt_BR-4.1.4.tar.bz2
-kde-l10n-ru-4.1.4.tar.bz2
-kde-l10n-sl-4.1.4.tar.bz2
-kde-l10n-sr-4.1.4.tar.bz2
-kde-l10n-sv-4.1.4.tar.bz2
-kde-l10n-ta-4.1.4.tar.bz2
-kde-l10n-th-4.1.4.tar.bz2
-kde-l10n-tr-4.1.4.tar.bz2
-kde-l10n-uk-4.1.4.tar.bz2
-kde-l10n-wa-4.1.4.tar.bz2
-kde-l10n-zh_CN-4.1.4.tar.bz2
-kde-l10n-zh_TW-4.1.4.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
+kde-l10n-bg-4.1.80.tar.bz2
+kde-l10n-ca-4.1.80.tar.bz2
+kde-l10n-cs-4.1.80.tar.bz2
+kde-l10n-csb-4.1.80.tar.bz2
+kde-l10n-da-4.1.80.tar.bz2
+kde-l10n-de-4.1.80.tar.bz2
+kde-l10n-el-4.1.80.tar.bz2
+kde-l10n-en_GB-4.1.80.tar.bz2
+kde-l10n-eo-4.1.80.tar.bz2
+kde-l10n-es-4.1.80.tar.bz2
+kde-l10n-et-4.1.80.tar.bz2
+kde-l10n-fi-4.1.80.tar.bz2
+kde-l10n-fr-4.1.80.tar.bz2
+kde-l10n-fy-4.1.80.tar.bz2
+kde-l10n-ga-4.1.80.tar.bz2
+kde-l10n-gl-4.1.80.tar.bz2
+kde-l10n-hi-4.1.80.tar.bz2
+kde-l10n-hu-4.1.80.tar.bz2
+kde-l10n-it-4.1.80.tar.bz2
+kde-l10n-ja-4.1.80.tar.bz2
+kde-l10n-kk-4.1.80.tar.bz2
+kde-l10n-km-4.1.80.tar.bz2
+kde-l10n-ko-4.1.80.tar.bz2
+kde-l10n-ku-4.1.80.tar.bz2
+kde-l10n-lt-4.1.80.tar.bz2
+kde-l10n-lv-4.1.80.tar.bz2
+kde-l10n-mk-4.1.80.tar.bz2
+kde-l10n-ml-4.1.80.tar.bz2
+kde-l10n-nb-4.1.80.tar.bz2
+kde-l10n-nds-4.1.80.tar.bz2
+kde-l10n-nl-4.1.80.tar.bz2
+kde-l10n-nn-4.1.80.tar.bz2
+kde-l10n-pa-4.1.80.tar.bz2
+kde-l10n-pl-4.1.80.tar.bz2
+kde-l10n-pt-4.1.80.tar.bz2
+kde-l10n-pt_BR-4.1.80.tar.bz2
+kde-l10n-ru-4.1.80.tar.bz2
+kde-l10n-sl-4.1.80.tar.bz2
+kde-l10n-sr-4.1.80.tar.bz2
+kde-l10n-sv-4.1.80.tar.bz2
+kde-l10n-ta-4.1.80.tar.bz2
+kde-l10n-th-4.1.80.tar.bz2
+kde-l10n-tr-4.1.80.tar.bz2
+kde-l10n-uk-4.1.80.tar.bz2
+kde-l10n-wa-4.1.80.tar.bz2
+kde-l10n-zh_CN-4.1.80.tar.bz2
+kde-l10n-zh_TW-4.1.80.tar.bz2
+kde-l10n-bg-4.1.85.tar.bz2
+kde-l10n-ca-4.1.85.tar.bz2
+kde-l10n-cs-4.1.85.tar.bz2
+kde-l10n-csb-4.1.85.tar.bz2
+kde-l10n-da-4.1.85.tar.bz2
+kde-l10n-de-4.1.85.tar.bz2
+kde-l10n-el-4.1.85.tar.bz2
+kde-l10n-en_GB-4.1.85.tar.bz2
+kde-l10n-eo-4.1.85.tar.bz2
+kde-l10n-es-4.1.85.tar.bz2
+kde-l10n-et-4.1.85.tar.bz2
+kde-l10n-fi-4.1.85.tar.bz2
+kde-l10n-fr-4.1.85.tar.bz2
+kde-l10n-fy-4.1.85.tar.bz2
+kde-l10n-ga-4.1.85.tar.bz2
+kde-l10n-gl-4.1.85.tar.bz2
+kde-l10n-hi-4.1.85.tar.bz2
+kde-l10n-hu-4.1.85.tar.bz2
+kde-l10n-it-4.1.85.tar.bz2
+kde-l10n-ja-4.1.85.tar.bz2
+kde-l10n-kk-4.1.85.tar.bz2
+kde-l10n-km-4.1.85.tar.bz2
+kde-l10n-ko-4.1.85.tar.bz2
+kde-l10n-ku-4.1.85.tar.bz2
+kde-l10n-lt-4.1.85.tar.bz2
+kde-l10n-lv-4.1.85.tar.bz2
+kde-l10n-mk-4.1.85.tar.bz2
+kde-l10n-ml-4.1.85.tar.bz2
+kde-l10n-nb-4.1.85.tar.bz2
+kde-l10n-nds-4.1.85.tar.bz2
+kde-l10n-nl-4.1.85.tar.bz2
+kde-l10n-nn-4.1.85.tar.bz2
+kde-l10n-pa-4.1.85.tar.bz2
+kde-l10n-pl-4.1.85.tar.bz2
+kde-l10n-pt-4.1.85.tar.bz2
+kde-l10n-pt_BR-4.1.85.tar.bz2
+kde-l10n-ru-4.1.85.tar.bz2
+kde-l10n-sl-4.1.85.tar.bz2
+kde-l10n-sr-4.1.85.tar.bz2
+kde-l10n-sv-4.1.85.tar.bz2
+kde-l10n-ta-4.1.85.tar.bz2
+kde-l10n-th-4.1.85.tar.bz2
+kde-l10n-tr-4.1.85.tar.bz2
+kde-l10n-uk-4.1.85.tar.bz2
+kde-l10n-wa-4.1.85.tar.bz2
+kde-l10n-zh_CN-4.1.85.tar.bz2
+kde-l10n-zh_TW-4.1.85.tar.bz2
+kde-l10n-bg-4.1.96.tar.bz2
+kde-l10n-ca-4.1.96.tar.bz2
+kde-l10n-cs-4.1.96.tar.bz2
+kde-l10n-csb-4.1.96.tar.bz2
+kde-l10n-da-4.1.96.tar.bz2
+kde-l10n-de-4.1.96.tar.bz2
+kde-l10n-el-4.1.96.tar.bz2
+kde-l10n-en_GB-4.1.96.tar.bz2
+kde-l10n-eo-4.1.96.tar.bz2
+kde-l10n-es-4.1.96.tar.bz2
+kde-l10n-et-4.1.96.tar.bz2
+kde-l10n-fi-4.1.96.tar.bz2
+kde-l10n-fr-4.1.96.tar.bz2
+kde-l10n-fy-4.1.96.tar.bz2
+kde-l10n-ga-4.1.96.tar.bz2
+kde-l10n-gl-4.1.96.tar.bz2
+kde-l10n-hi-4.1.96.tar.bz2
+kde-l10n-hu-4.1.96.tar.bz2
+kde-l10n-it-4.1.96.tar.bz2
+kde-l10n-ja-4.1.96.tar.bz2
+kde-l10n-kk-4.1.96.tar.bz2
+kde-l10n-km-4.1.96.tar.bz2
+kde-l10n-ko-4.1.96.tar.bz2
+kde-l10n-ku-4.1.96.tar.bz2
+kde-l10n-lt-4.1.96.tar.bz2
+kde-l10n-lv-4.1.96.tar.bz2
+kde-l10n-mk-4.1.96.tar.bz2
+kde-l10n-ml-4.1.96.tar.bz2
+kde-l10n-nb-4.1.96.tar.bz2
+kde-l10n-nds-4.1.96.tar.bz2
+kde-l10n-nl-4.1.96.tar.bz2
+kde-l10n-nn-4.1.96.tar.bz2
+kde-l10n-pa-4.1.96.tar.bz2
+kde-l10n-pl-4.1.96.tar.bz2
+kde-l10n-pt-4.1.96.tar.bz2
+kde-l10n-pt_BR-4.1.96.tar.bz2
+kde-l10n-ru-4.1.96.tar.bz2
+kde-l10n-sl-4.1.96.tar.bz2
+kde-l10n-sr-4.1.96.tar.bz2
+kde-l10n-sv-4.1.96.tar.bz2
+kde-l10n-ta-4.1.96.tar.bz2
+kde-l10n-th-4.1.96.tar.bz2
+kde-l10n-tr-4.1.96.tar.bz2
+kde-l10n-uk-4.1.96.tar.bz2
+kde-l10n-wa-4.1.96.tar.bz2
+kde-l10n-zh_CN-4.1.96.tar.bz2
+kde-l10n-zh_TW-4.1.96.tar.bz2
+kde-l10n-bg-4.2.0.tar.bz2
+kde-l10n-ca-4.2.0.tar.bz2
+kde-l10n-cs-4.2.0.tar.bz2
+kde-l10n-csb-4.2.0.tar.bz2
+kde-l10n-da-4.2.0.tar.bz2
+kde-l10n-de-4.2.0.tar.bz2
+kde-l10n-el-4.2.0.tar.bz2
+kde-l10n-en_GB-4.2.0.tar.bz2
+kde-l10n-es-4.2.0.tar.bz2
+kde-l10n-et-4.2.0.tar.bz2
+kde-l10n-fi-4.2.0.tar.bz2
+kde-l10n-fr-4.2.0.tar.bz2
+kde-l10n-ga-4.2.0.tar.bz2
+kde-l10n-gl-4.2.0.tar.bz2
+kde-l10n-hi-4.2.0.tar.bz2
+kde-l10n-hu-4.2.0.tar.bz2
+kde-l10n-it-4.2.0.tar.bz2
+kde-l10n-ja-4.2.0.tar.bz2
+kde-l10n-kk-4.2.0.tar.bz2
+kde-l10n-km-4.2.0.tar.bz2
+kde-l10n-ko-4.2.0.tar.bz2
+kde-l10n-ku-4.2.0.tar.bz2
+kde-l10n-lt-4.2.0.tar.bz2
+kde-l10n-lv-4.2.0.tar.bz2
+kde-l10n-mk-4.2.0.tar.bz2
+kde-l10n-ml-4.2.0.tar.bz2
+kde-l10n-nb-4.2.0.tar.bz2
+kde-l10n-nds-4.2.0.tar.bz2
+kde-l10n-nl-4.2.0.tar.bz2
+kde-l10n-nn-4.2.0.tar.bz2
+kde-l10n-pa-4.2.0.tar.bz2
+kde-l10n-pl-4.2.0.tar.bz2
+kde-l10n-pt-4.2.0.tar.bz2
+kde-l10n-pt_BR-4.2.0.tar.bz2
+kde-l10n-ru-4.2.0.tar.bz2
+kde-l10n-sl-4.2.0.tar.bz2
+kde-l10n-sr-4.2.0.tar.bz2
+kde-l10n-sv-4.2.0.tar.bz2
+kde-l10n-th-4.2.0.tar.bz2
+kde-l10n-tr-4.2.0.tar.bz2
+kde-l10n-uk-4.2.0.tar.bz2
+kde-l10n-wa-4.2.0.tar.bz2
+kde-l10n-zh_CN-4.2.0.tar.bz2
+kde-l10n-zh_TW-4.2.0.tar.bz2
+kde-l10n-ar-4.2.0.tar.bz2
+kde-l10n-eu-4.2.0.tar.bz2
+kde-l10n-he-4.2.0.tar.bz2



From limb at fedoraproject.org  Fri Jan 30 18:59:44 2009
From: limb at fedoraproject.org (Jon Ciesla)
Date: Fri, 30 Jan 2009 18:59:44 +0000 (UTC)
Subject: rpms/xmoto/F-10 xmoto.spec,1.46,1.47
Message-ID: <20090130185944.03EDC70117@cvs1.fedora.phx.redhat.com>

Author: limb

Update of /cvs/pkgs/rpms/xmoto/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32362

Modified Files:
	xmoto.spec 
Log Message:
Hmm.



Index: xmoto.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xmoto/F-10/xmoto.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- xmoto.spec	30 Jan 2009 18:06:40 -0000	1.46
+++ xmoto.spec	30 Jan 2009 18:59:13 -0000	1.47
@@ -1,3 +1,4 @@
+%define _default_patch_fuzz 2
 Name:		xmoto
 Version:	0.4.2
 Release:	5%{?dist}
@@ -44,11 +45,11 @@
 %setup -q
 #%patch
 %patch1 -p0
-%patch2 -p0 -F2
+%patch2 -p0
 %patch3 -p0
 %patch4 -p0
 %patch5 -p0
-%patch6 -p0 -F2
+%patch6 -p0
 
 #fix encoding
 sed -i 's/\r//' src/xmscene/Camera.cpp



From tadej at fedoraproject.org  Fri Jan 30 19:00:47 2009
From: tadej at fedoraproject.org (=?utf-8?q?Tadej_Jane=C5=BE?=)
Date: Fri, 30 Jan 2009 19:00:47 +0000 (UTC)
Subject: rpms/PyQwt/F-9 PyQwt.spec, NONE, 1.1 import.log, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <20090130190047.1884870117@cvs1.fedora.phx.redhat.com>

Author: tadej

Update of /cvs/pkgs/rpms/PyQwt/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32742/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	PyQwt.spec import.log 
Log Message:
Initial import.



--- NEW FILE PyQwt.spec ---
%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}

Name:           PyQwt
Version:        5.1.0
Release:        3%{?dist}
Summary:        Python bindings for Qwt

Group:          Development/Languages
# GPLv2+ exceptions (see COPYING.PyQwt)
License:        GPLv2+ with exceptions
URL:            http://pyqwt.sourceforge.net/
Source0:        http://downloads.sourceforge.net/pyqwt/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  python-devel
BuildRequires:  sip-devel
BuildRequires:  PyQt4-devel
BuildRequires:  numpy
BuildRequires:  qwt-devel

Requires:       PyQt4
Requires:       numpy

%description
PyQwt is a set of Python bindings for the Qwt C++ class library which extends
the Qt framework with widgets for scientific and engineering applications. It
provides a widget to plot 2-dimensional data and various widgets to display and
control bounded or unbounded floating point values.

%package devel
Summary: Files needed to build other bindings on PyQwt
Group:   Development/Languages
Requires: %{name} = %{version}-%{release}
Requires: PyQt4-devel
Requires: qwt-devel
%description devel
Files needed to build other bindings for Qwt C++ classes that inherit from
any of the PyQwt classes.

%prep
%setup -q

# mark examples non-executable
find qt4examples/ -name "*.py" | xargs chmod a-x

%build
QWTDIR=%{_includedir}/qwt
cd configure
%{__python} configure.py -I$QWTDIR -lqwt --disable-numarray --disable-numeric
make %{?_smp_mflags}

%install
rm -rf %{buildroot}
cd configure
make DESTDIR=%{buildroot} install

# non-executable script
chmod 755 %{buildroot}/%{python_sitearch}/PyQt4/Qwt5/grace.py
 
%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%doc ANNOUNCEMENT-%{version} README
%doc COPYING*
%{python_sitearch}/PyQt4/Qwt5/

%files devel
%defattr(-,root,root,-)
%doc Doc/*
%doc qt4examples/ 
%{_datadir}/sip/PyQt4/Qwt5/

%changelog
* Sat Jan 24 2009 Tadej Jane?? <tadej.janez at tadej.hicsalta.si> 5.1.0-3
- made grace.py executable again

* Fri Jan 09 2009 Tadej Jane?? <tadej.janez at tadej.hicsalta.si> 5.1.0-2
- disabled support for Numeric and Numarray
- incorporated fixes from package review in BZ472229

* Tue Nov 18 2008 Tadej Jane?? <tadej.janez at tadej.hicsalta.si> 5.1.0-1
- initial package


--- NEW FILE import.log ---
PyQwt-5_1_0-3_fc10:F-9:PyQwt-5.1.0-3.fc10.src.rpm:1233341936


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/PyQwt/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	28 Jan 2009 05:37:50 -0000	1.1
+++ .cvsignore	30 Jan 2009 19:00:16 -0000	1.2
@@ -0,0 +1 @@
+PyQwt-5.1.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/PyQwt/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	28 Jan 2009 05:37:50 -0000	1.1
+++ sources	30 Jan 2009 19:00:16 -0000	1.2
@@ -0,0 +1 @@
+c9d662a0d4fc95cec75d3c526e4e748a  PyQwt-5.1.0.tar.gz



From rdieter at fedoraproject.org  Fri Jan 30 19:00:46 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 30 Jan 2009 19:00:46 +0000 (UTC)
Subject: rpms/kde-l10n/F-9 .cvsignore, 1.14, 1.15 kde-l10n.spec, 1.42,
	1.43 sources, 1.17, 1.18 subdirs-kde-l10n, 1.10, 1.11
Message-ID: <20090130190046.855B970117@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-serv413

Modified Files:
	.cvsignore kde-l10n.spec sources subdirs-kde-l10n 
Log Message:
* Fri Jan 30 2009 Than Ngo <than at redhat.com> - 4.2.0-2
- enable he



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kde-l10n/F-9/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	9 Jan 2009 18:57:14 -0000	1.14
+++ .cvsignore	30 Jan 2009 19:00:16 -0000	1.15
@@ -1,47 +1,235 @@
-kde-l10n-bg-4.1.4.tar.bz2
-kde-l10n-ca-4.1.4.tar.bz2
-kde-l10n-cs-4.1.4.tar.bz2
-kde-l10n-csb-4.1.4.tar.bz2
-kde-l10n-da-4.1.4.tar.bz2
-kde-l10n-de-4.1.4.tar.bz2
-kde-l10n-el-4.1.4.tar.bz2
-kde-l10n-en_GB-4.1.4.tar.bz2
-kde-l10n-eo-4.1.4.tar.bz2
-kde-l10n-es-4.1.4.tar.bz2
-kde-l10n-et-4.1.4.tar.bz2
-kde-l10n-fi-4.1.4.tar.bz2
-kde-l10n-fr-4.1.4.tar.bz2
-kde-l10n-fy-4.1.4.tar.bz2
-kde-l10n-ga-4.1.4.tar.bz2
-kde-l10n-gl-4.1.4.tar.bz2
-kde-l10n-hi-4.1.4.tar.bz2
-kde-l10n-hu-4.1.4.tar.bz2
-kde-l10n-it-4.1.4.tar.bz2
-kde-l10n-ja-4.1.4.tar.bz2
-kde-l10n-kk-4.1.4.tar.bz2
-kde-l10n-km-4.1.4.tar.bz2
-kde-l10n-ko-4.1.4.tar.bz2
-kde-l10n-ku-4.1.4.tar.bz2
-kde-l10n-lt-4.1.4.tar.bz2
-kde-l10n-lv-4.1.4.tar.bz2
-kde-l10n-mk-4.1.4.tar.bz2
-kde-l10n-ml-4.1.4.tar.bz2
-kde-l10n-nb-4.1.4.tar.bz2
-kde-l10n-nds-4.1.4.tar.bz2
-kde-l10n-nl-4.1.4.tar.bz2
-kde-l10n-nn-4.1.4.tar.bz2
-kde-l10n-pa-4.1.4.tar.bz2
-kde-l10n-pl-4.1.4.tar.bz2
-kde-l10n-pt-4.1.4.tar.bz2
-kde-l10n-pt_BR-4.1.4.tar.bz2
-kde-l10n-ru-4.1.4.tar.bz2
-kde-l10n-sl-4.1.4.tar.bz2
-kde-l10n-sr-4.1.4.tar.bz2
-kde-l10n-sv-4.1.4.tar.bz2
-kde-l10n-ta-4.1.4.tar.bz2
-kde-l10n-th-4.1.4.tar.bz2
-kde-l10n-tr-4.1.4.tar.bz2
-kde-l10n-uk-4.1.4.tar.bz2
-kde-l10n-wa-4.1.4.tar.bz2
-kde-l10n-zh_CN-4.1.4.tar.bz2
-kde-l10n-zh_TW-4.1.4.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
+kde-l10n-bg-4.1.80.tar.bz2
+kde-l10n-ca-4.1.80.tar.bz2
+kde-l10n-cs-4.1.80.tar.bz2
+kde-l10n-csb-4.1.80.tar.bz2
+kde-l10n-da-4.1.80.tar.bz2
+kde-l10n-de-4.1.80.tar.bz2
+kde-l10n-el-4.1.80.tar.bz2
+kde-l10n-en_GB-4.1.80.tar.bz2
+kde-l10n-eo-4.1.80.tar.bz2
+kde-l10n-es-4.1.80.tar.bz2
+kde-l10n-et-4.1.80.tar.bz2
+kde-l10n-fi-4.1.80.tar.bz2
+kde-l10n-fr-4.1.80.tar.bz2
+kde-l10n-fy-4.1.80.tar.bz2
+kde-l10n-ga-4.1.80.tar.bz2
+kde-l10n-gl-4.1.80.tar.bz2
+kde-l10n-hi-4.1.80.tar.bz2
+kde-l10n-hu-4.1.80.tar.bz2
+kde-l10n-it-4.1.80.tar.bz2
+kde-l10n-ja-4.1.80.tar.bz2
+kde-l10n-kk-4.1.80.tar.bz2
+kde-l10n-km-4.1.80.tar.bz2
+kde-l10n-ko-4.1.80.tar.bz2
+kde-l10n-ku-4.1.80.tar.bz2
+kde-l10n-lt-4.1.80.tar.bz2
+kde-l10n-lv-4.1.80.tar.bz2
+kde-l10n-mk-4.1.80.tar.bz2
+kde-l10n-ml-4.1.80.tar.bz2
+kde-l10n-nb-4.1.80.tar.bz2
+kde-l10n-nds-4.1.80.tar.bz2
+kde-l10n-nl-4.1.80.tar.bz2
+kde-l10n-nn-4.1.80.tar.bz2
+kde-l10n-pa-4.1.80.tar.bz2
+kde-l10n-pl-4.1.80.tar.bz2
+kde-l10n-pt-4.1.80.tar.bz2
+kde-l10n-pt_BR-4.1.80.tar.bz2
+kde-l10n-ru-4.1.80.tar.bz2
+kde-l10n-sl-4.1.80.tar.bz2
+kde-l10n-sr-4.1.80.tar.bz2
+kde-l10n-sv-4.1.80.tar.bz2
+kde-l10n-ta-4.1.80.tar.bz2
+kde-l10n-th-4.1.80.tar.bz2
+kde-l10n-tr-4.1.80.tar.bz2
+kde-l10n-uk-4.1.80.tar.bz2
+kde-l10n-wa-4.1.80.tar.bz2
+kde-l10n-zh_CN-4.1.80.tar.bz2
+kde-l10n-zh_TW-4.1.80.tar.bz2
+kde-l10n-bg-4.1.85.tar.bz2
+kde-l10n-ca-4.1.85.tar.bz2
+kde-l10n-cs-4.1.85.tar.bz2
+kde-l10n-csb-4.1.85.tar.bz2
+kde-l10n-da-4.1.85.tar.bz2
+kde-l10n-de-4.1.85.tar.bz2
+kde-l10n-el-4.1.85.tar.bz2
+kde-l10n-en_GB-4.1.85.tar.bz2
+kde-l10n-eo-4.1.85.tar.bz2
+kde-l10n-es-4.1.85.tar.bz2
+kde-l10n-et-4.1.85.tar.bz2
+kde-l10n-fi-4.1.85.tar.bz2
+kde-l10n-fr-4.1.85.tar.bz2
+kde-l10n-fy-4.1.85.tar.bz2
+kde-l10n-ga-4.1.85.tar.bz2
+kde-l10n-gl-4.1.85.tar.bz2
+kde-l10n-hi-4.1.85.tar.bz2
+kde-l10n-hu-4.1.85.tar.bz2
+kde-l10n-it-4.1.85.tar.bz2
+kde-l10n-ja-4.1.85.tar.bz2
+kde-l10n-kk-4.1.85.tar.bz2
+kde-l10n-km-4.1.85.tar.bz2
+kde-l10n-ko-4.1.85.tar.bz2
+kde-l10n-ku-4.1.85.tar.bz2
+kde-l10n-lt-4.1.85.tar.bz2
+kde-l10n-lv-4.1.85.tar.bz2
+kde-l10n-mk-4.1.85.tar.bz2
+kde-l10n-ml-4.1.85.tar.bz2
+kde-l10n-nb-4.1.85.tar.bz2
+kde-l10n-nds-4.1.85.tar.bz2
+kde-l10n-nl-4.1.85.tar.bz2
+kde-l10n-nn-4.1.85.tar.bz2
+kde-l10n-pa-4.1.85.tar.bz2
+kde-l10n-pl-4.1.85.tar.bz2
+kde-l10n-pt-4.1.85.tar.bz2
+kde-l10n-pt_BR-4.1.85.tar.bz2
+kde-l10n-ru-4.1.85.tar.bz2
+kde-l10n-sl-4.1.85.tar.bz2
+kde-l10n-sr-4.1.85.tar.bz2
+kde-l10n-sv-4.1.85.tar.bz2
+kde-l10n-ta-4.1.85.tar.bz2
+kde-l10n-th-4.1.85.tar.bz2
+kde-l10n-tr-4.1.85.tar.bz2
+kde-l10n-uk-4.1.85.tar.bz2
+kde-l10n-wa-4.1.85.tar.bz2
+kde-l10n-zh_CN-4.1.85.tar.bz2
+kde-l10n-zh_TW-4.1.85.tar.bz2
+kde-l10n-bg-4.1.96.tar.bz2
+kde-l10n-ca-4.1.96.tar.bz2
+kde-l10n-cs-4.1.96.tar.bz2
+kde-l10n-csb-4.1.96.tar.bz2
+kde-l10n-da-4.1.96.tar.bz2
+kde-l10n-de-4.1.96.tar.bz2
+kde-l10n-el-4.1.96.tar.bz2
+kde-l10n-en_GB-4.1.96.tar.bz2
+kde-l10n-eo-4.1.96.tar.bz2
+kde-l10n-es-4.1.96.tar.bz2
+kde-l10n-et-4.1.96.tar.bz2
+kde-l10n-fi-4.1.96.tar.bz2
+kde-l10n-fr-4.1.96.tar.bz2
+kde-l10n-fy-4.1.96.tar.bz2
+kde-l10n-ga-4.1.96.tar.bz2
+kde-l10n-gl-4.1.96.tar.bz2
+kde-l10n-hi-4.1.96.tar.bz2
+kde-l10n-hu-4.1.96.tar.bz2
+kde-l10n-it-4.1.96.tar.bz2
+kde-l10n-ja-4.1.96.tar.bz2
+kde-l10n-kk-4.1.96.tar.bz2
+kde-l10n-km-4.1.96.tar.bz2
+kde-l10n-ko-4.1.96.tar.bz2
+kde-l10n-ku-4.1.96.tar.bz2
+kde-l10n-lt-4.1.96.tar.bz2
+kde-l10n-lv-4.1.96.tar.bz2
+kde-l10n-mk-4.1.96.tar.bz2
+kde-l10n-ml-4.1.96.tar.bz2
+kde-l10n-nb-4.1.96.tar.bz2
+kde-l10n-nds-4.1.96.tar.bz2
+kde-l10n-nl-4.1.96.tar.bz2
+kde-l10n-nn-4.1.96.tar.bz2
+kde-l10n-pa-4.1.96.tar.bz2
+kde-l10n-pl-4.1.96.tar.bz2
+kde-l10n-pt-4.1.96.tar.bz2
+kde-l10n-pt_BR-4.1.96.tar.bz2
+kde-l10n-ru-4.1.96.tar.bz2
+kde-l10n-sl-4.1.96.tar.bz2
+kde-l10n-sr-4.1.96.tar.bz2
+kde-l10n-sv-4.1.96.tar.bz2
+kde-l10n-ta-4.1.96.tar.bz2
+kde-l10n-th-4.1.96.tar.bz2
+kde-l10n-tr-4.1.96.tar.bz2
+kde-l10n-uk-4.1.96.tar.bz2
+kde-l10n-wa-4.1.96.tar.bz2
+kde-l10n-zh_CN-4.1.96.tar.bz2
+kde-l10n-zh_TW-4.1.96.tar.bz2
+kde-l10n-bg-4.2.0.tar.bz2
+kde-l10n-ca-4.2.0.tar.bz2
+kde-l10n-cs-4.2.0.tar.bz2
+kde-l10n-csb-4.2.0.tar.bz2
+kde-l10n-da-4.2.0.tar.bz2
+kde-l10n-de-4.2.0.tar.bz2
+kde-l10n-el-4.2.0.tar.bz2
+kde-l10n-en_GB-4.2.0.tar.bz2
+kde-l10n-es-4.2.0.tar.bz2
+kde-l10n-et-4.2.0.tar.bz2
+kde-l10n-fi-4.2.0.tar.bz2
+kde-l10n-fr-4.2.0.tar.bz2
+kde-l10n-ga-4.2.0.tar.bz2
+kde-l10n-gl-4.2.0.tar.bz2
+kde-l10n-hi-4.2.0.tar.bz2
+kde-l10n-hu-4.2.0.tar.bz2
+kde-l10n-it-4.2.0.tar.bz2
+kde-l10n-ja-4.2.0.tar.bz2
+kde-l10n-kk-4.2.0.tar.bz2
+kde-l10n-km-4.2.0.tar.bz2
+kde-l10n-ko-4.2.0.tar.bz2
+kde-l10n-ku-4.2.0.tar.bz2
+kde-l10n-lt-4.2.0.tar.bz2
+kde-l10n-lv-4.2.0.tar.bz2
+kde-l10n-mk-4.2.0.tar.bz2
+kde-l10n-ml-4.2.0.tar.bz2
+kde-l10n-nb-4.2.0.tar.bz2
+kde-l10n-nds-4.2.0.tar.bz2
+kde-l10n-nl-4.2.0.tar.bz2
+kde-l10n-nn-4.2.0.tar.bz2
+kde-l10n-pa-4.2.0.tar.bz2
+kde-l10n-pl-4.2.0.tar.bz2
+kde-l10n-pt-4.2.0.tar.bz2
+kde-l10n-pt_BR-4.2.0.tar.bz2
+kde-l10n-ru-4.2.0.tar.bz2
+kde-l10n-sl-4.2.0.tar.bz2
+kde-l10n-sr-4.2.0.tar.bz2
+kde-l10n-sv-4.2.0.tar.bz2
+kde-l10n-th-4.2.0.tar.bz2
+kde-l10n-tr-4.2.0.tar.bz2
+kde-l10n-uk-4.2.0.tar.bz2
+kde-l10n-wa-4.2.0.tar.bz2
+kde-l10n-zh_CN-4.2.0.tar.bz2
+kde-l10n-zh_TW-4.2.0.tar.bz2
+kde-l10n-ar-4.2.0.tar.bz2
+kde-l10n-eu-4.2.0.tar.bz2
+kde-l10n-he-4.2.0.tar.bz2


Index: kde-l10n.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kde-l10n/F-9/kde-l10n.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- kde-l10n.spec	29 Jan 2009 11:43:27 -0000	1.42
+++ kde-l10n.spec	30 Jan 2009 19:00:16 -0000	1.43
@@ -2,7 +2,7 @@
 
 Name: kde-l10n
 Version: 4.2.0
-Release: 1%{dist}
+Release: 2%{dist}
 Url: http://www.kde.org
 Summary: Internationalization support for KDE
 Group: User Interface/Desktops
@@ -62,6 +62,7 @@
 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
+SOurce53: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kde-l10n-he-4.2.0.tar.bz2
 
 Source1000: subdirs-kde-l10n
 
@@ -1013,12 +1014,10 @@
 %lang(gl) %{_kde4_docdir}/HTML/gl
 %lang(gl) %{_mandir}/gl/*/*
 
-%if %{buildall}
 %files Hebrew
 %defattr(-,root,root)
 %lang(he) %{_datadir}/locale/he/*
 %lang(he) %{_kde4_appsdir}/klettres/he
-%endif
 
 %files Hindi
 %defattr(-,root,root)
@@ -1326,6 +1325,9 @@
 %lang(zh_TW) %{_kde4_docdir}/HTML/zh_TW
 
 %changelog
+* Fri Jan 30 2009 Than Ngo <than at redhat.com> - 4.2.0-2
+- enable he
+
 * Thu Jan 22 2009 Than Ngo <than at redhat.com> - 4.2.0-1
 - 4.2.0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kde-l10n/F-9/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources	29 Jan 2009 11:43:27 -0000	1.17
+++ sources	30 Jan 2009 19:00:16 -0000	1.18
@@ -44,3 +44,4 @@
 058b0bd3a7b2ca4ef56730488a234afa  kde-l10n-ar-4.2.0.tar.bz2
 5248515b294143a7821055754b9236e4  kde-l10n-eu-4.2.0.tar.bz2
 fb2e1d63d9d926c6639a537b6bf73d03  kde-l10n-et-4.2.0.tar.bz2
+e45690f965c153b2f25ebba5358d1912  kde-l10n-he-4.2.0.tar.bz2


Index: subdirs-kde-l10n
===================================================================
RCS file: /cvs/pkgs/rpms/kde-l10n/F-9/subdirs-kde-l10n,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- subdirs-kde-l10n	29 Jan 2009 11:43:27 -0000	1.10
+++ subdirs-kde-l10n	30 Jan 2009 19:00:16 -0000	1.11
@@ -14,6 +14,7 @@
 fr
 ga
 gl
+he
 hi
 hu
 it



From pkgdb at fedoraproject.org  Fri Jan 30 19:01:25 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 19:01:25 +0000
Subject: [pkgdb] sugar-terminal ownership updated
Message-ID: <20090130190125.7BF18208486@bastion.fedora.phx.redhat.com>

Package sugar-terminal in Fedora devel is now owned by tuxbrewr

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-terminal



From pkgdb at fedoraproject.org  Fri Jan 30 19:01:37 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 19:01:37 +0000
Subject: [pkgdb] sugar-terminal ownership updated
Message-ID: <20090130190137.E9EEC208496@bastion.fedora.phx.redhat.com>

Package sugar-terminal in Fedora 10 is now owned by tuxbrewr

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-terminal



From pkgdb at fedoraproject.org  Fri Jan 30 19:01:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 19:01:58 +0000
Subject: [pkgdb] sugar-chat ownership updated
Message-ID: <20090130190159.2D8FA208486@bastion.fedora.phx.redhat.com>

Package sugar-chat in Fedora devel is now owned by tuxbrewr

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-chat



From pkgdb at fedoraproject.org  Fri Jan 30 19:02:04 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 19:02:04 +0000
Subject: [pkgdb] sugar-chat ownership updated
Message-ID: <20090130190204.9E1B2208497@bastion.fedora.phx.redhat.com>

Package sugar-chat in Fedora 9 is now owned by tuxbrewr

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-chat



From pkgdb at fedoraproject.org  Fri Jan 30 19:02:07 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 19:02:07 +0000
Subject: [pkgdb] sugar-chat ownership updated
Message-ID: <20090130190207.494E120860E@bastion.fedora.phx.redhat.com>

Package sugar-chat in Fedora 10 is now owned by tuxbrewr

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-chat



From rdieter at fedoraproject.org  Fri Jan 30 19:02:46 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 30 Jan 2009 19:02:46 +0000 (UTC)
Subject: rpms/kdebase-workspace/F-10
	kdebase-workspace-4.2.0-default_applets.patch, 1.1,
	1.2 kdebase-workspace.spec, 1.152, 1.153
Message-ID: <20090130190246.0098970117@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdebase-workspace/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1140

Modified Files:
	kdebase-workspace-4.2.0-default_applets.patch 
	kdebase-workspace.spec 
Log Message:
* Fri Jan 30 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.0-4.2
- respin default_applets patch for kpowersave too (#483163)


kdebase-workspace-4.2.0-default_applets.patch:

Index: kdebase-workspace-4.2.0-default_applets.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/F-10/kdebase-workspace-4.2.0-default_applets.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kdebase-workspace-4.2.0-default_applets.patch	28 Jan 2009 12:50:30 -0000	1.1
+++ kdebase-workspace-4.2.0-default_applets.patch	30 Jan 2009 19:02:45 -0000	1.2
@@ -1,7 +1,8 @@
 diff -up kdebase-workspace-4.2.0/plasma/shells/desktop/desktopcorona.cpp.orig kdebase-workspace-4.2.0/plasma/shells/desktop/desktopcorona.cpp
---- kdebase-workspace-4.2.0/plasma/shells/desktop/desktopcorona.cpp.orig	2009-01-28 13:33:19.000000000 +0100
-+++ kdebase-workspace-4.2.0/plasma/shells/desktop/desktopcorona.cpp	2009-01-28 13:39:47.000000000 +0100
-@@ -200,15 +200,17 @@ void DesktopCorona::loadDefaultLayout()
+diff -up kdebase-workspace-4.2.0/plasma/shells/desktop/desktopcorona.cpp.default_applets kdebase-workspace-4.2.0/plasma/shells/desktop/desktopcorona.cpp
+--- kdebase-workspace-4.2.0/plasma/shells/desktop/desktopcorona.cpp.default_applets	2009-01-06 11:22:28.000000000 -0600
++++ kdebase-workspace-4.2.0/plasma/shells/desktop/desktopcorona.cpp	2009-01-30 12:40:53.000000000 -0600
+@@ -200,15 +200,18 @@ void DesktopCorona::loadDefaultLayout()
      loadDefaultApplet("tasks", panel);
      loadDefaultApplet("systemtray", panel);
  
@@ -12,7 +13,8 @@
 -        if (!batteries.isEmpty()) {
 -            loadDefaultApplet("battery", panel);
 -        }
-+    if (!QFile::exists("/usr/share/autostart/guidance-power-manager.desktop")) {
++    if ( (!QFile::exists("/usr/share/autostart/guidance-power-manager.desktop")) && 
++         (!QFile::exists("/usr/share/autostart/kpowersave-autostart.desktop")) ) {
 +       Plasma::DataEngineManager *engines = Plasma::DataEngineManager::self();
 +       Plasma::DataEngine *power = engines->loadEngine("powermanagement");
 +       if (power) {


Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/F-10/kdebase-workspace.spec,v
retrieving revision 1.152
retrieving revision 1.153
diff -u -r1.152 -r1.153
--- kdebase-workspace.spec	29 Jan 2009 21:33:45 -0000	1.152
+++ kdebase-workspace.spec	30 Jan 2009 19:02:45 -0000	1.153
@@ -8,7 +8,7 @@
 Name: kdebase-workspace
 Version: 4.2.0
 
-Release: 4%{?dist}.1
+Release: 4%{?dist}.2
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-workspace-%{version}.tar.bz2
 License: GPLv2
 Group: User Interface/Desktops
@@ -326,6 +326,9 @@
 
 
 %changelog
+* Fri Jan 30 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.0-4.2
+- respin default_applets patch for kpowersave too (#483163)
+
 * Thu Jan 29 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.2.0-4.1
 - conditionalize bluetooth backport on F10+
 - F9: revert solid-bluetooth to the version from KDE 4.1.4



From rdieter at fedoraproject.org  Fri Jan 30 19:06:58 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 30 Jan 2009 19:06:58 +0000 (UTC)
Subject: rpms/kdebase-workspace/devel kdebase-workspace.spec,1.175,1.176
Message-ID: <20090130190658.5BD8770117@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdebase-workspace/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1794

Modified Files:
	kdebase-workspace.spec 
Log Message:
sync w/branch changes



Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/devel/kdebase-workspace.spec,v
retrieving revision 1.175
retrieving revision 1.176
diff -u -r1.175 -r1.176
--- kdebase-workspace.spec	30 Jan 2009 18:47:37 -0000	1.175
+++ kdebase-workspace.spec	30 Jan 2009 19:06:27 -0000	1.176
@@ -327,7 +327,7 @@
 
 %changelog
 * Fri Jan 30 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.0-4.2
-- respin default_applets patch for kpowersave too (F-9, #483163)
+- respin default_applets patch for kpowersave too (#483163)
 
 * Thu Jan 29 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.2.0-4.1
 - conditionalize bluetooth backport on F10+



From jwilson at fedoraproject.org  Fri Jan 30 19:16:29 2009
From: jwilson at fedoraproject.org (Jarod Wilson)
Date: Fri, 30 Jan 2009 19:16:29 +0000 (UTC)
Subject: rpms/kernel/devel kernel.spec, 1.1251,
	1.1252 linux-2.6-firewire-git-pending.patch, 1.34,
	1.35 linux-2.6-firewire-git-update.patch, 1.19,
	1.20 linux-2.6.29-lirc.patch, 1.2, 1.3
Message-ID: <20090130191629.1E35970117@cvs1.fedora.phx.redhat.com>

Author: jwilson

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3471

Modified Files:
	kernel.spec linux-2.6-firewire-git-pending.patch 
	linux-2.6-firewire-git-update.patch linux-2.6.29-lirc.patch 
Log Message:
Fix up lirc and firewire patches for 2.6.29-rc3-git1


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1251
retrieving revision 1.1252
diff -u -r1.1251 -r1.1252
--- kernel.spec	30 Jan 2009 18:08:04 -0000	1.1251
+++ kernel.spec	30 Jan 2009 19:15:57 -0000	1.1252
@@ -1162,7 +1162,7 @@
 ApplyPatch linux-2.6-at76.patch
 
 # http://www.lirc.org/
-#ApplyPatch linux-2.6.29-lirc.patch
+ApplyPatch linux-2.6.29-lirc.patch
 # http://hg.jannau.net/hdpvr/
 ApplyPatch linux-2.6-hdpvr.patch
 
@@ -1185,7 +1185,7 @@
 ApplyPatch drm-nouveau.patch
 
 # linux1394 git patches
-#ApplyPatch linux-2.6-firewire-git-update.patch
+ApplyPatch linux-2.6-firewire-git-update.patch
 C=$(wc -l $RPM_SOURCE_DIR/linux-2.6-firewire-git-pending.patch | awk '{print $1}')
 #if [ "$C" -gt 10 ]; then
 #ApplyPatch linux-2.6-firewire-git-pending.patch

linux-2.6-firewire-git-pending.patch:

Index: linux-2.6-firewire-git-pending.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-firewire-git-pending.patch,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- linux-2.6-firewire-git-pending.patch	28 Jan 2009 22:52:48 -0000	1.34
+++ linux-2.6-firewire-git-pending.patch	30 Jan 2009 19:15:58 -0000	1.35
@@ -2,393 +2,3 @@
 # Patches under review and/or pending inclusion in the linux1394-git
 # tree (and/or in by the time your read this), which we want...
 #
-
-Date: Sat, 24 Jan 2009 19:42:21 +0100 (CET)
-From: Stefan Richter <stefanr at s5r6.in-berlin.de>
-Subject: [PATCH 1/7] firewire: sbp2: fix payload limit at S1600 and S3200
-To: linux1394-devel at lists.sourceforge.net
-Cc: linux-kernel at vger.kernel.org
-
-1394-2008 clause 16.3.4.1 (1394b-2002 clause 16.3.1.1) defines tighter
-limits than 1394-2008 clause 6.2.2.3 (1394a-2000 clause 6.2.2.3).
-
-Our previously too large limit doesn't matter though if the controller
-reports its max_receive correctly.
-
-Signed-off-by: Stefan Richter <stefanr at s5r6.in-berlin.de>
----
- drivers/firewire/fw-sbp2.c |   23 ++++++++++++-----------
- 1 file changed, 12 insertions(+), 11 deletions(-)
-
-Index: linux/drivers/firewire/fw-sbp2.c
-===================================================================
---- linux.orig/drivers/firewire/fw-sbp2.c
-+++ linux/drivers/firewire/fw-sbp2.c
-@@ -168,6 +168,7 @@ struct sbp2_target {
- 	int address_high;
- 	unsigned int workarounds;
- 	unsigned int mgt_orb_timeout;
-+	unsigned int max_payload;
- 
- 	int dont_block;	/* counter for each logical unit */
- 	int blocked;	/* ditto */
-@@ -1150,6 +1151,15 @@ static int sbp2_probe(struct device *dev
- 
- 	sbp2_init_workarounds(tgt, model, firmware_revision);
- 
-+	/*
-+	 * At S100 we can do 512 bytes per packet, at S200 1024 bytes,
-+	 * and so on up to 4096 bytes.  The SBP-2 max_payload field
-+	 * specifies the max payload size as 2 ^ (max_payload + 2), so
-+	 * if we set this to max_speed + 7, we get the right value.
-+	 */
-+	tgt->max_payload = min(device->max_speed + 7, 10U);
-+	tgt->max_payload = min(tgt->max_payload, device->card->max_receive - 1);
-+
- 	/* Do the login in a workqueue so we can easily reschedule retries. */
- 	list_for_each_entry(lu, &tgt->lu_list, link)
- 		sbp2_queue_work(lu, DIV_ROUND_UP(HZ, 5));
-@@ -1426,7 +1436,6 @@ static int sbp2_scsi_queuecommand(struct
- 	struct sbp2_logical_unit *lu = cmd->device->hostdata;
- 	struct fw_device *device = fw_device(lu->tgt->unit->device.parent);
- 	struct sbp2_command_orb *orb;
--	unsigned int max_payload;
- 	int generation, retval = SCSI_MLQUEUE_HOST_BUSY;
- 
- 	/*
-@@ -1454,17 +1463,9 @@ static int sbp2_scsi_queuecommand(struct
- 	orb->done = done;
- 	orb->cmd  = cmd;
- 
--	orb->request.next.high   = cpu_to_be32(SBP2_ORB_NULL);
--	/*
--	 * At speed 100 we can do 512 bytes per packet, at speed 200,
--	 * 1024 bytes per packet etc.  The SBP-2 max_payload field
--	 * specifies the max payload size as 2 ^ (max_payload + 2), so
--	 * if we set this to max_speed + 7, we get the right value.
--	 */
--	max_payload = min(device->max_speed + 7,
--			  device->card->max_receive - 1);
-+	orb->request.next.high = cpu_to_be32(SBP2_ORB_NULL);
- 	orb->request.misc = cpu_to_be32(
--		COMMAND_ORB_MAX_PAYLOAD(max_payload) |
-+		COMMAND_ORB_MAX_PAYLOAD(lu->tgt->max_payload) |
- 		COMMAND_ORB_SPEED(device->max_speed) |
- 		COMMAND_ORB_NOTIFY);
- 
-
--- 
-Stefan Richter
--=====-==--= ---= ==---
-http://arcgraph.de/sr/
-
-
-
-Date: Sat, 24 Jan 2009 19:42:47 +0100 (CET)
-From: Stefan Richter <stefanr at s5r6.in-berlin.de>
-Subject: [PATCH 2/7] firewire: sbp2: define some magic numbers as macros
-To: linux1394-devel at lists.sourceforge.net
-Cc: linux-kernel at vger.kernel.org
-
-Signed-off-by: Stefan Richter <stefanr at s5r6.in-berlin.de>
----
- drivers/firewire/fw-sbp2.c |   23 ++++++++++++-----------
- 1 file changed, 12 insertions(+), 11 deletions(-)
-
-Index: linux/drivers/firewire/fw-sbp2.c
-===================================================================
---- linux.orig/drivers/firewire/fw-sbp2.c
-+++ linux/drivers/firewire/fw-sbp2.c
-@@ -311,14 +311,16 @@ struct sbp2_command_orb {
- 	dma_addr_t page_table_bus;
- };
- 
-+#define SBP2_ROM_VALUE_WILDCARD ~0         /* match all */
-+#define SBP2_ROM_VALUE_MISSING  0xff000000 /* not present in the unit dir. */
-+
- /*
-  * List of devices with known bugs.
-  *
-  * The firmware_revision field, masked with 0xffff00, is the best
-  * indicator for the type of bridge chip of a device.  It yields a few
-  * false positives but this did not break correctly behaving devices
-- * so far.  We use ~0 as a wildcard, since the 24 bit values we get
-- * from the config rom can never match that.
-+ * so far.
-  */
- static const struct {
- 	u32 firmware_revision;
-@@ -340,22 +342,22 @@ static const struct {
- 	},
- 	/* Initio bridges, actually only needed for some older ones */ {
- 		.firmware_revision	= 0x000200,
--		.model			= ~0,
-+		.model			= SBP2_ROM_VALUE_WILDCARD,
- 		.workarounds		= SBP2_WORKAROUND_INQUIRY_36,
- 	},
- 	/* PL-3507 bridge with Prolific firmware */ {
- 		.firmware_revision	= 0x012800,
--		.model			= ~0,
-+		.model			= SBP2_ROM_VALUE_WILDCARD,
- 		.workarounds		= SBP2_WORKAROUND_POWER_CONDITION,
- 	},
- 	/* Symbios bridge */ {
- 		.firmware_revision	= 0xa0b800,
--		.model			= ~0,
-+		.model			= SBP2_ROM_VALUE_WILDCARD,
- 		.workarounds		= SBP2_WORKAROUND_128K_MAX_TRANS,
- 	},
- 	/* Datafab MD2-FW2 with Symbios/LSILogic SYM13FW500 bridge */ {
- 		.firmware_revision	= 0x002600,
--		.model			= ~0,
-+		.model			= SBP2_ROM_VALUE_WILDCARD,
- 		.workarounds		= SBP2_WORKAROUND_128K_MAX_TRANS,
- 	},
- 
-@@ -1087,7 +1089,7 @@ static void sbp2_init_workarounds(struct
- 			continue;
- 
- 		if (sbp2_workarounds_table[i].model != model &&
--		    sbp2_workarounds_table[i].model != ~0)
-+		    sbp2_workarounds_table[i].model != SBP2_ROM_VALUE_WILDCARD)
- 			continue;
- 
- 		w |= sbp2_workarounds_table[i].workarounds;
-@@ -1137,14 +1139,13 @@ static int sbp2_probe(struct device *dev
- 	fw_device_get(device);
- 	fw_unit_get(unit);
- 
--	/* Initialize to values that won't match anything in our table. */
--	firmware_revision = 0xff000000;
--	model = 0xff000000;
--
- 	/* implicit directory ID */
- 	tgt->directory_id = ((unit->directory - device->config_rom) * 4
- 			     + CSR_CONFIG_ROM) & 0xffffff;
- 
-+	firmware_revision = SBP2_ROM_VALUE_MISSING;
-+	model		  = SBP2_ROM_VALUE_MISSING;
-+
- 	if (sbp2_scan_unit_dir(tgt, unit->directory, &model,
- 			       &firmware_revision) < 0)
- 		goto fail_tgt_put;
-
--- 
-Stefan Richter
--=====-==--= ---= ==---
-http://arcgraph.de/sr/
-
-
-
-Date: Sat, 24 Jan 2009 19:41:46 +0100 (CET)
-From: Stefan Richter <stefanr at s5r6.in-berlin.de>
-Subject: firewire: sbp2: add workarounds for 2nd and 3rd generation iPods
-
-According to https://bugs.launchpad.net/bugs/294391
-  - 3rd generation iPods need the "fix capacity" workaround after all
-    (apparently they crash after the last sector was accessed),
-  - 2nd generation iPods need the "128 kB maximum request size"
-    workaround.
-
-Furthermore, Kristian H??gsberg mentioned that 2nd generation iPods
-treat page tables (scatter-gather lists) as data buffers, i.e. ignore
-the page_table_present bit of command block ORBs.  If this is true, then
-the 128 kB limit is not a sufficient workaround; instead we have to
-guarantee that all requests have only a single s/g element.  This could
-be up to 64 kByte - 4 Bytes in size.  But I expect the block layer to
-typically emit much smaller elements than that, alas.
-
-Alas both iPod generations feature the same model ID in the config ROM,
-hence we can only define a shared quirks list entry for them.  This is
-bad since
-  - the "fix capacity" workaround prevents access to the very last
-    sector if a device does not actually have this bug,
-  - the "no page tables" workaround dramatically reduces throughput,
-    e.g. from 25 to 9 MB/s without gap count optimization, and from 36
-    11 MB/s with gap count optimization (as per hdparm with a regular
-    3.5" S400 disk on an i686 PC without IOMMU).  Whether this matters
-    with the already slow iPod disk is not yet known.
-
-This patch needs testing by somebody who has the hardware:
-  - Do 2nd and 3rd gen. iPods actually have a model_id == 0, or do they
-    have in fact no model_id at all?
-  - Does the "fix capacity" workaround harm usage of 2nd gen. iPods?
-  - Is the "no page tables" workaround really necessary for 2nd gen.
-    iPods, or is the 128k limit sufficient as reported for the Ubuntu
-    8.10 kernel?
-  - How badly does the "no page tables" workaround affect throughput of
-    3rd gen. iPods which don't need it?
-
-A side note:  Apple computers in target mode (or at least an x86 Mac
-mini) don't have firmware_version and model_id, hence none of the iPod
-quirks list entries is active for them.
-
-Signed-off-by: Stefan Richter <stefanr at s5r6.in-berlin.de>
----
- drivers/firewire/fw-sbp2.c |   27 +++++++++++++++++++--------
- 1 file changed, 19 insertions(+), 8 deletions(-)
-
-Index: linux/drivers/firewire/fw-sbp2.c
-===================================================================
---- linux.orig/drivers/firewire/fw-sbp2.c
-+++ linux/drivers/firewire/fw-sbp2.c
-@@ -92,6 +92,10 @@ MODULE_PARM_DESC(exclusive_login, "Exclu
-  *   sd_mod on suspend, resume, and shutdown (if manage_start_stop is on).
-  *   Some disks need this to spin down or to resume properly.
-  *
-+ * - no page tables
-+ *   Limit data buffers to a single scatter/ gather element for buggy devices
-+ *   which ignore the page_table_present bit in command block ORBs.
-+ *
-  * - override internal blacklist
-  *   Instead of adding to the built-in blacklist, use only the workarounds
-  *   specified in the module load parameter.
-@@ -104,6 +108,7 @@ MODULE_PARM_DESC(exclusive_login, "Exclu
- #define SBP2_WORKAROUND_DELAY_INQUIRY	0x10
- #define SBP2_INQUIRY_DELAY		12
- #define SBP2_WORKAROUND_POWER_CONDITION	0x20
-+#define SBP2_WORKAROUND_NO_PAGE_TABLES	0x40
- #define SBP2_WORKAROUND_OVERRIDE	0x100
- 
- static int sbp2_param_workarounds;
-@@ -116,6 +121,7 @@ MODULE_PARM_DESC(workarounds, "Work arou
- 	", delay inquiry = "      __stringify(SBP2_WORKAROUND_DELAY_INQUIRY)
- 	", set power condition in start stop unit = "
- 				  __stringify(SBP2_WORKAROUND_POWER_CONDITION)
-+	", no page tables = "     __stringify(SBP2_WORKAROUND_NO_PAGE_TABLES)
- 	", override internal blacklist = " __stringify(SBP2_WORKAROUND_OVERRIDE)
- 	", or a combination)");
- 
-@@ -325,7 +331,7 @@ struct sbp2_command_orb {
- static const struct {
- 	u32 firmware_revision;
- 	u32 model;
--	unsigned int workarounds;
-+	unsigned workarounds;
- } sbp2_workarounds_table[] = {
- 	/* DViCO Momobay CX-1 with TSB42AA9 bridge */ {
- 		.firmware_revision	= 0x002800,
-@@ -360,15 +366,17 @@ static const struct {
- 		.model			= SBP2_ROM_VALUE_WILDCARD,
- 		.workarounds		= SBP2_WORKAROUND_128K_MAX_TRANS,
- 	},
--
- 	/*
--	 * There are iPods (2nd gen, 3rd gen) with model_id == 0, but
--	 * these iPods do not feature the read_capacity bug according
--	 * to one report.  Read_capacity behaviour as well as model_id
--	 * could change due to Apple-supplied firmware updates though.
-+	 * iPod 2nd generation: needs 128k max transfer workaround
-+	 * iPod 3rd generation: needs fix-capacity workaround
- 	 */
--
--	/* iPod 4th generation. */ {
-+	{
-+		.firmware_revision	= 0x0a2700,
-+		.model			= 0x000000,
-+		.workarounds		= SBP2_WORKAROUND_128K_MAX_TRANS |
-+					  SBP2_WORKAROUND_FIX_CAPACITY,
-+	},
-+	/* iPod 4th generation */ {
- 		.firmware_revision	= 0x0a2700,
- 		.model			= 0x000021,
- 		.workarounds		= SBP2_WORKAROUND_FIX_CAPACITY,
-@@ -1540,6 +1548,9 @@ static int sbp2_scsi_slave_configure(str
- 	if (lu->tgt->workarounds & SBP2_WORKAROUND_128K_MAX_TRANS)
- 		blk_queue_max_sectors(sdev->request_queue, 128 * 1024 / 512);
- 
-+	if (lu->tgt->workarounds & SBP2_WORKAROUND_NO_PAGE_TABLES)
-+		blk_queue_max_hw_segments(sdev->request_queue, 1);
-+
- 	blk_queue_max_segment_size(sdev->request_queue, SBP2_MAX_SEG_SIZE);
- 
- 	return 0;
-Date: Wed, 28 Jan 2009 01:03:34 +0100 (CET)
-From: Stefan Richter <stefanr at s5r6.in-berlin.de>
-Subject: Re: swiotlb default size (64 MB) too small?
-To: FUJITA Tomonori <fujita.tomonori at lab.ntt.co.jp>
-Cc: linux1394-devel at lists.sourceforge.net,
- linux-kernel at vger.kernel.org,
- linux-scsi at vger.kernel.org
-
-> FUJITA Tomonori wrote:
->> On Tue, 27 Jan 2009 18:03:40 +0100 (CET)
->> Stefan Richter <stefanr at s5r6.in-berlin.de> wrote:
->>> +	if (orb->page_table_bus)
->>> +		dma_unmap_single(card_device, orb->page_table_bus,
->>> +				 sizeof(orb->page_table), DMA_TO_DEVICE);
->> 
->> Well, this does not look correct since zero can be a valid dma
->> address.
-
-
-From: Stefan Richter <stefanr at s5r6.in-berlin.de>
-Subject: firewire: sbp2: fix DMA mapping leak on the failure path
-
-Reported-by: FUJITA Tomonori <fujita.tomonori at lab.ntt.co.jp>
-who also provided a first version of the fix.
-
-Signed-off-by: Stefan Richter <stefanr at s5r6.in-berlin.de>
----
- drivers/firewire/fw-sbp2.c |   27 +++++++++++++++++----------
- 1 file changed, 17 insertions(+), 10 deletions(-)
-
-Index: linux/drivers/firewire/fw-sbp2.c
-===================================================================
---- linux.orig/drivers/firewire/fw-sbp2.c
-+++ linux/drivers/firewire/fw-sbp2.c
-@@ -1323,6 +1323,19 @@ static unsigned int sbp2_status_to_sense
- 	}
- }
- 
-+static void sbp2_unmap_scatterlist(struct device *card_device,
-+				   struct sbp2_command_orb *orb)
-+{
-+	if (scsi_sg_count(orb->cmd))
-+		dma_unmap_sg(card_device, scsi_sglist(orb->cmd),
-+			     scsi_sg_count(orb->cmd),
-+			     orb->cmd->sc_data_direction);
-+
-+	if (orb->request.misc & cpu_to_be32(COMMAND_ORB_PAGE_TABLE_PRESENT))
-+		dma_unmap_single(card_device, orb->page_table_bus,
-+				 sizeof(orb->page_table), DMA_TO_DEVICE);
-+}
-+
- static void complete_command_orb(struct sbp2_orb *base_orb,
- 				 struct sbp2_status *status)
- {
-@@ -1364,15 +1377,7 @@ static void complete_command_orb(struct 
- 
- 	dma_unmap_single(device->card->device, orb->base.request_bus,
- 			 sizeof(orb->request), DMA_TO_DEVICE);
--
--	if (scsi_sg_count(orb->cmd) > 0)
--		dma_unmap_sg(device->card->device, scsi_sglist(orb->cmd),
--			     scsi_sg_count(orb->cmd),
--			     orb->cmd->sc_data_direction);
--
--	if (orb->page_table_bus != 0)
--		dma_unmap_single(device->card->device, orb->page_table_bus,
--				 sizeof(orb->page_table), DMA_TO_DEVICE);
-+	sbp2_unmap_scatterlist(device->card->device, orb);
- 
- 	orb->cmd->result = result;
- 	orb->done(orb->cmd);
-@@ -1493,8 +1498,10 @@ static int sbp2_scsi_queuecommand(struct
- 	orb->base.request_bus =
- 		dma_map_single(device->card->device, &orb->request,
- 			       sizeof(orb->request), DMA_TO_DEVICE);
--	if (dma_mapping_error(device->card->device, orb->base.request_bus))
-+	if (dma_mapping_error(device->card->device, orb->base.request_bus)) {
-+		sbp2_unmap_scatterlist(device->card->device, orb);
- 		goto out;
-+	}
- 
- 	sbp2_send_orb(&orb->base, lu, lu->tgt->node_id, generation,
- 		      lu->command_block_agent_address + SBP2_ORB_POINTER);
-
--- 
-Stefan Richter
--=====-==--= ---= ===--
-http://arcgraph.de/sr/
-

linux-2.6-firewire-git-update.patch:

Index: linux-2.6-firewire-git-update.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-firewire-git-update.patch,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- linux-2.6-firewire-git-update.patch	27 Jan 2009 04:47:27 -0000	1.19
+++ linux-2.6-firewire-git-update.patch	30 Jan 2009 19:15:58 -0000	1.20
@@ -1,25 +1,23 @@
-git diff -p --stat v2.6.29-rc2 -- drivers/firewire/ include/linux/ in
-linux1394-2.6.git, done on 20090126 by Jarod.
+linux1394-2.6.git tree vs. linus v2.6.29-rc3-git1 on 20090130 by jarod
 
 ---
- drivers/firewire/fw-card.c        |   70 +--
- drivers/firewire/fw-cdev.c        | 1006 +++++++++++++++++++++++++------------
- drivers/firewire/fw-device.c      |  164 +++++--
- drivers/firewire/fw-device.h      |    8 +-
- drivers/firewire/fw-iso.c         |  225 +++++++--
- drivers/firewire/fw-ohci.c        |  242 +++++-----
- drivers/firewire/fw-sbp2.c        |   57 +--
- drivers/firewire/fw-topology.c    |   40 +-
- drivers/firewire/fw-topology.h    |   19 +-
- drivers/firewire/fw-transaction.c |  151 +++----
- drivers/firewire/fw-transaction.h |  136 ++----
- include/linux/firewire-cdev.h     |  170 ++++++-
- 12 files changed, 1481 insertions(+), 807 deletions(-)
+ firewire-git/drivers/firewire/fw-card.c        |   68 -
+ firewire-git/drivers/firewire/fw-cdev.c        | 1014 +++++++++++++++++--------
+ firewire-git/drivers/firewire/fw-device.c      |   43 -
+ firewire-git/drivers/firewire/fw-device.h      |    7 
+ firewire-git/drivers/firewire/fw-iso.c         |  225 ++++-
+ firewire-git/drivers/firewire/fw-ohci.c        |  236 ++---
+ firewire-git/drivers/firewire/fw-sbp2.c        |   57 -
+ firewire-git/drivers/firewire/fw-topology.c    |   28 
+ firewire-git/drivers/firewire/fw-topology.h    |   19 
+ firewire-git/drivers/firewire/fw-transaction.c |  151 +--
+ firewire-git/drivers/firewire/fw-transaction.h |  125 ---
+ include/linux/firewire-cdev.h                  |  170 +++-
+ 12 files changed, 1359 insertions(+), 784 deletions(-)
 
-diff --git a/drivers/firewire/fw-card.c b/drivers/firewire/fw-card.c
-index 6bd91a1..bed7994 100644
---- a/drivers/firewire/fw-card.c
-+++ b/drivers/firewire/fw-card.c
+diff -Naurp linux-2.6-git/drivers/firewire/fw-card.c firewire-git/drivers/firewire/fw-card.c
+--- linux-2.6-git/drivers/firewire/fw-card.c	2009-01-30 13:39:02.989651512 -0500
++++ firewire-git/drivers/firewire/fw-card.c	2009-01-30 13:35:51.859771884 -0500
 @@ -63,8 +63,7 @@ static int descriptor_count;
  #define BIB_CMC			((1) << 30)
  #define BIB_IMC			((1) << 31)
@@ -30,7 +28,7 @@
  {
  	struct fw_descriptor *desc;
  	static u32 config_rom[256];
-@@ -128,8 +127,7 @@ generate_config_rom(struct fw_card *card, size_t *config_rom_length)
+@@ -128,8 +127,7 @@ generate_config_rom(struct fw_card *card
  	return config_rom;
  }
  
@@ -50,7 +48,7 @@
  {
  	size_t i;
  
-@@ -171,8 +168,7 @@ fw_core_add_descriptor(struct fw_descriptor *desc)
+@@ -171,8 +168,7 @@ fw_core_add_descriptor(struct fw_descrip
  	return 0;
  }
  
@@ -70,7 +68,7 @@
  {
  	int scheduled;
  
-@@ -200,8 +195,7 @@ fw_schedule_bm_work(struct fw_card *card, unsigned long delay)
+@@ -200,8 +195,7 @@ fw_schedule_bm_work(struct fw_card *card
  		fw_card_put(card);
  }
  
@@ -80,16 +78,7 @@
  {
  	struct fw_card *card = container_of(work, struct fw_card, work.work);
  	struct fw_device *root_device;
-@@ -232,7 +226,7 @@ fw_card_bm_work(struct work_struct *work)
- 	root_id = root_node->node_id;
- 	grace = time_after(jiffies, card->reset_jiffies + DIV_ROUND_UP(HZ, 10));
- 
--	if (card->bm_generation + 1 == generation ||
-+	if (is_next_generation(generation, card->bm_generation) ||
- 	    (card->bm_generation != generation && grace)) {
- 		/*
- 		 * This first step is to figure out who is IRM and
-@@ -371,17 +365,16 @@ fw_card_bm_work(struct work_struct *work)
+@@ -371,17 +365,16 @@ fw_card_bm_work(struct work_struct *work
  	fw_card_put(card);
  }
  
@@ -111,7 +100,7 @@
  {
  	static atomic_t index = ATOMIC_INIT(-1);
  
-@@ -406,9 +399,8 @@ fw_card_initialize(struct fw_card *card, const struct fw_card_driver *driver,
+@@ -406,9 +399,8 @@ fw_card_initialize(struct fw_card *card,
  }
  EXPORT_SYMBOL(fw_card_initialize);
  
@@ -152,7 +141,7 @@
  {
  	/*
  	 * We take the card out of card_list before setting the dummy
-@@ -461,27 +450,23 @@ dummy_set_config_rom(struct fw_card *card,
+@@ -461,27 +450,23 @@ dummy_set_config_rom(struct fw_card *car
  	return -1;
  }
  
@@ -185,7 +174,7 @@
  {
  	return -ENODEV;
  }
-@@ -496,16 +481,14 @@ static struct fw_card_driver dummy_driver = {
+@@ -496,16 +481,14 @@ static struct fw_card_driver dummy_drive
  	.enable_phys_dma = dummy_enable_phys_dma,
  };
  
@@ -204,7 +193,7 @@
  {
  	card->driver->update_phy_reg(card, 4,
  				     PHY_LINK_ACTIVE | PHY_CONTENDER, 0);
-@@ -529,8 +512,7 @@ fw_core_remove_card(struct fw_card *card)
+@@ -529,8 +512,7 @@ fw_core_remove_card(struct fw_card *card
  }
  EXPORT_SYMBOL(fw_core_remove_card);
  
@@ -214,10 +203,9 @@
  {
  	int reg = short_reset ? 5 : 1;
  	int bit = short_reset ? PHY_BUS_SHORT_RESET : PHY_BUS_RESET;
-diff --git a/drivers/firewire/fw-cdev.c b/drivers/firewire/fw-cdev.c
-index ed03234..86ec4da 100644
---- a/drivers/firewire/fw-cdev.c
-+++ b/drivers/firewire/fw-cdev.c
+diff -Naurp linux-2.6-git/drivers/firewire/fw-cdev.c firewire-git/drivers/firewire/fw-cdev.c
+--- linux-2.6-git/drivers/firewire/fw-cdev.c	2008-11-04 11:19:19.000000000 -0500
++++ firewire-git/drivers/firewire/fw-cdev.c	2009-01-30 13:35:51.860646788 -0500
 @@ -18,87 +18,162 @@
   * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
   */
@@ -424,7 +412,7 @@
  {
  	return (__u64)(unsigned long)ptr;
  }
-@@ -107,7 +182,6 @@ static int fw_device_op_open(struct inode *inode, struct file *file)
+@@ -107,7 +182,6 @@ static int fw_device_op_open(struct inod
  {
  	struct fw_device *device;
  	struct client *client;
@@ -432,7 +420,7 @@
  
  	device = fw_device_get_by_devt(inode->i_rdev);
  	if (device == NULL)
-@@ -125,16 +199,17 @@ static int fw_device_op_open(struct inode *inode, struct file *file)
+@@ -125,16 +199,17 @@ static int fw_device_op_open(struct inod
  	}
  
  	client->device = device;
@@ -454,7 +442,7 @@
  
  	return 0;
  }
-@@ -150,68 +225,69 @@ static void queue_event(struct client *client, struct event *event,
+@@ -150,68 +225,69 @@ static void queue_event(struct client *c
  	event->v[1].size = size1;
  
  	spin_lock_irqsave(&client->lock, flags);
@@ -547,7 +535,7 @@
  	event->closure	     = client->bus_reset_closure;
  	event->type          = FW_CDEV_EVENT_BUS_RESET;
  	event->generation    = client->device->generation;
-@@ -220,39 +296,49 @@ fill_bus_reset_event(struct fw_cdev_event_bus_reset *event,
+@@ -220,39 +296,49 @@ fill_bus_reset_event(struct fw_cdev_even
  	event->bm_node_id    = 0; /* FIXME: We don't track the BM. */
  	event->irm_node_id   = card->irm_node->node_id;
  	event->root_node_id  = card->root_node->node_id;
@@ -613,7 +601,7 @@
  }
  
  void fw_device_cdev_update(struct fw_device *device)
-@@ -274,11 +360,11 @@ static int ioctl_get_info(struct client *client, void *buffer)
+@@ -274,11 +360,11 @@ static int ioctl_get_info(struct client 
  {
  	struct fw_cdev_get_info *get_info = buffer;
  	struct fw_cdev_event_bus_reset bus_reset;
@@ -626,7 +614,7 @@
  
  	down_read(&fw_device_rwsem);
  
-@@ -300,49 +386,61 @@ static int ioctl_get_info(struct client *client, void *buffer)
+@@ -300,49 +386,61 @@ static int ioctl_get_info(struct client 
  	client->bus_reset_closure = get_info->bus_reset_closure;
  	if (get_info->bus_reset != 0) {
  		void __user *uptr = u64_to_uptr(get_info->bus_reset);
@@ -711,7 +699,7 @@
  		return -EINVAL;
  
  	if (resource)
-@@ -350,203 +448,242 @@ release_client_resource(struct client *client, u32 handle,
+@@ -350,203 +448,242 @@ release_client_resource(struct client *c
  	else
  		r->release(client, r);
  
@@ -846,14 +834,7 @@
  
 -	response->resource.release = release_transaction;
 -	add_client_resource(client, &response->resource);
-+	e->r.resource.release = release_transaction;
-+	ret = add_client_resource(client, &e->r.resource, GFP_KERNEL);
-+	if (ret < 0)
-+		goto failed;
-+
-+	/* Get a reference for the transaction callback */
-+	client_get(client);
- 
+-
 -	fw_send_request(device->card, &response->transaction,
 -			request->tcode & 0x1f,
 -			device->node->node_id,
@@ -862,6 +843,14 @@
 -			request->offset,
 -			response->response.data, request->length,
 -			complete_transaction, response);
++	e->r.resource.release = release_transaction;
++	ret = add_client_resource(client, &e->r.resource, GFP_KERNEL);
++	if (ret < 0)
++		goto failed;
++
++	/* Get a reference for the transaction callback */
++	client_get(client);
++
 +	fw_send_request(client->device->card, &e->r.transaction,
 +			request->tcode & 0x1f, destination_id,
 +			request->generation, speed, request->offset,
@@ -942,16 +931,17 @@
 -	       int generation, int speed,
 -	       unsigned long long offset,
 -	       void *payload, size_t length, void *callback_data)
+-{
+-	struct address_handler *handler = callback_data;
+-	struct request *request;
+-	struct request_event *e;
+-	struct client *client = handler->client;
 +static void handle_request(struct fw_card *card, struct fw_request *request,
 +			   int tcode, int destination, int source,
 +			   int generation, int speed,
 +			   unsigned long long offset,
 +			   void *payload, size_t length, void *callback_data)
- {
--	struct address_handler *handler = callback_data;
--	struct request *request;
--	struct request_event *e;
--	struct client *client = handler->client;
++{
 +	struct address_handler_resource *handler = callback_data;
 +	struct inbound_transaction_resource *r;
 +	struct inbound_transaction_event *e;
@@ -966,18 +956,19 @@
 -		fw_send_response(card, r, RCODE_CONFLICT_ERROR);
 -		return;
 -	}
-+	if (r == NULL || e == NULL)
-+		goto failed;
- 
+-
 -	request->request = r;
 -	request->data    = payload;
 -	request->length  = length;
-+	r->request = request;
-+	r->data    = payload;
-+	r->length  = length;
++	if (r == NULL || e == NULL)
++		goto failed;
  
 -	request->resource.release = release_request;
 -	add_client_resource(client, &request->resource);
++	r->request = request;
++	r->data    = payload;
++	r->length  = length;
++
 +	r->resource.release = release_request;
 +	ret = add_client_resource(handler->client, &r->resource, GFP_ATOMIC);
 +	if (ret < 0)
@@ -1069,7 +1060,7 @@
  
  	return 0;
  }
-@@ -555,18 +692,22 @@ static int ioctl_deallocate(struct client *client, void *buffer)
+@@ -555,18 +692,22 @@ static int ioctl_deallocate(struct clien
  {
  	struct fw_cdev_deallocate *request = buffer;
  
@@ -1096,7 +1087,7 @@
  	if (request->length < r->length)
  		r->length = request->length;
  	if (copy_from_user(r->data, u64_to_uptr(request->data), r->length))
-@@ -588,85 +729,84 @@ static int ioctl_initiate_bus_reset(struct client *client, void *buffer)
+@@ -588,85 +729,84 @@ static int ioctl_initiate_bus_reset(stru
  	return fw_core_initiate_bus_reset(client->device->card, short_reset);
  }
  
@@ -1151,29 +1142,30 @@
 -	descriptor->d.immediate = request->immediate;
 -	descriptor->d.key = request->key;
 -	descriptor->d.data = descriptor->data;
-+	r->descriptor.length    = request->length;
-+	r->descriptor.immediate = request->immediate;
-+	r->descriptor.key       = request->key;
-+	r->descriptor.data      = r->data;
- 
+-
 -	retval = fw_core_add_descriptor(&descriptor->d);
 -	if (retval < 0) {
 -		kfree(descriptor);
 -		return retval;
--	}
++	r->descriptor.length    = request->length;
++	r->descriptor.immediate = request->immediate;
++	r->descriptor.key       = request->key;
++	r->descriptor.data      = r->data;
++
 +	ret = fw_core_add_descriptor(&r->descriptor);
 +	if (ret < 0)
 +		goto failed;
- 
--	descriptor->resource.release = release_descriptor;
--	add_client_resource(client, &descriptor->resource);
--	request->handle = descriptor->resource.handle;
++
 +	r->resource.release = release_descriptor;
 +	ret = add_client_resource(client, &r->resource, GFP_KERNEL);
 +	if (ret < 0) {
 +		fw_core_remove_descriptor(&r->descriptor);
 +		goto failed;
-+	}
+ 	}
+-
+-	descriptor->resource.release = release_descriptor;
+-	add_client_resource(client, &descriptor->resource);
+-	request->handle = descriptor->resource.handle;
 +	request->handle = r->resource.handle;
  
  	return 0;
@@ -1225,7 +1217,7 @@
  }
  
  static int ioctl_create_iso_context(struct client *client, void *buffer)
-@@ -871,6 +1011,237 @@ static int ioctl_get_cycle_timer(struct client *client, void *buffer)
+@@ -871,6 +1011,237 @@ static int ioctl_get_cycle_timer(struct 
  	return 0;
  }
  
@@ -1463,7 +1455,7 @@
  static int (* const ioctl_handlers[])(struct client *client, void *buffer) = {
  	ioctl_get_info,
  	ioctl_send_request,
-@@ -885,13 +1256,19 @@ static int (* const ioctl_handlers[])(struct client *client, void *buffer) = {
+@@ -885,13 +1256,19 @@ static int (* const ioctl_handlers[])(st
  	ioctl_start_iso,
  	ioctl_stop_iso,
  	ioctl_get_cycle_timer,
@@ -1486,7 +1478,7 @@
  
  	if (_IOC_TYPE(cmd) != '#' ||
  	    _IOC_NR(cmd) >= ARRAY_SIZE(ioctl_handlers))
-@@ -903,9 +1280,9 @@ dispatch_ioctl(struct client *client, unsigned int cmd, void __user *arg)
+@@ -903,9 +1280,9 @@ dispatch_ioctl(struct client *client, un
  			return -EFAULT;
  	}
  
@@ -1499,7 +1491,7 @@
  
  	if (_IOC_DIR(cmd) & _IOC_READ) {
  		if (_IOC_SIZE(cmd) > sizeof(buffer) ||
-@@ -913,12 +1290,11 @@ dispatch_ioctl(struct client *client, unsigned int cmd, void __user *arg)
+@@ -913,12 +1290,11 @@ dispatch_ioctl(struct client *client, un
  			return -EFAULT;
  	}
  
@@ -1527,7 +1519,7 @@
  {
  	struct client *client = file->private_data;
  
-@@ -947,7 +1322,7 @@ static int fw_device_op_mmap(struct file *file, struct vm_area_struct *vma)
+@@ -947,7 +1322,7 @@ static int fw_device_op_mmap(struct file
  	struct client *client = file->private_data;
  	enum dma_data_direction direction;
  	unsigned long size;
@@ -1536,7 +1528,7 @@
  
  	if (fw_device_is_shutdown(client->device))
  		return -ENODEV;
-@@ -973,48 +1348,57 @@ static int fw_device_op_mmap(struct file *file, struct vm_area_struct *vma)
+@@ -973,48 +1348,57 @@ static int fw_device_op_mmap(struct file
  	else
  		direction = DMA_FROM_DEVICE;
  
@@ -1617,15 +1609,12 @@
  
  	return 0;
  }
-diff --git a/drivers/firewire/fw-device.c b/drivers/firewire/fw-device.c
-index 2af5a8d..e4efdd3 100644
---- a/drivers/firewire/fw-device.c
-+++ b/drivers/firewire/fw-device.c
-@@ -25,9 +25,12 @@
- #include <linux/device.h>
- #include <linux/delay.h>
+diff -Naurp linux-2.6-git/drivers/firewire/fw-device.c firewire-git/drivers/firewire/fw-device.c
+--- linux-2.6-git/drivers/firewire/fw-device.c	2009-01-30 13:39:02.989651512 -0500
++++ firewire-git/drivers/firewire/fw-device.c	2009-01-30 13:35:51.860646788 -0500
+@@ -27,8 +27,10 @@
  #include <linux/idr.h>
-+#include <linux/jiffies.h>
+ #include <linux/jiffies.h>
  #include <linux/string.h>
 +#include <linux/mutex.h>
  #include <linux/rwsem.h>
@@ -1634,7 +1623,7 @@
  #include <asm/system.h>
  #include <linux/ctype.h>
  #include "fw-transaction.h"
-@@ -131,8 +134,7 @@ static int get_modalias(struct fw_unit *unit, char *buffer, size_t buffer_size)
+@@ -132,8 +134,7 @@ static int get_modalias(struct fw_unit *
  			vendor, model, specifier_id, version);
  }
  
@@ -1644,7 +1633,7 @@
  {
  	struct fw_unit *unit = fw_unit(dev);
  	char modalias[64];
-@@ -190,8 +192,8 @@ struct config_rom_attribute {
+@@ -191,8 +192,8 @@ struct config_rom_attribute {
  	u32 key;
  };
  
@@ -1655,7 +1644,7 @@
  {
  	struct config_rom_attribute *attr =
  		container_of(dattr, struct config_rom_attribute, attr);
-@@ -222,8 +224,8 @@ show_immediate(struct device *dev, struct device_attribute *dattr, char *buf)
+@@ -223,8 +224,8 @@ show_immediate(struct device *dev, struc
  #define IMMEDIATE_ATTR(name, key)				\
  	{ __ATTR(name, S_IRUGO, show_immediate, NULL), key }
  
@@ -1666,7 +1655,7 @@
  {
  	struct config_rom_attribute *attr =
  		container_of(dattr, struct config_rom_attribute, attr);
-@@ -292,10 +294,9 @@ static struct config_rom_attribute config_rom_attributes[] = {
+@@ -293,10 +294,9 @@ static struct config_rom_attribute confi
  	TEXT_LEAF_ATTR(hardware_version_name, CSR_HARDWARE_VERSION),
  };
  
@@ -1680,7 +1669,7 @@
  {
  	struct device_attribute *attr;
  	int i, j;
-@@ -318,9 +319,8 @@ init_fw_attribute_group(struct device *dev,
+@@ -319,9 +319,8 @@ init_fw_attribute_group(struct device *d
  	dev->groups = group->groups;
  }
  
@@ -1692,7 +1681,7 @@
  {
  	struct fw_unit *unit = fw_unit(dev);
  	int length;
-@@ -331,9 +331,8 @@ modalias_show(struct device *dev,
+@@ -332,9 +331,8 @@ modalias_show(struct device *dev,
  	return length + 1;
  }
  
@@ -1704,7 +1693,7 @@
  {
  	struct fw_device *device = fw_device(dev->parent);
  	struct fw_unit *unit = fw_unit(dev);
-@@ -348,8 +347,8 @@ static struct device_attribute fw_unit_attributes[] = {
+@@ -349,8 +347,8 @@ static struct device_attribute fw_unit_a
  	__ATTR_NULL,
  };
  
@@ -1715,7 +1704,7 @@
  {
  	struct fw_device *device = fw_device(dev);
  	size_t length;
-@@ -362,8 +361,8 @@ config_rom_show(struct device *dev, struct device_attribute *attr, char *buf)
+@@ -363,8 +361,8 @@ config_rom_show(struct device *dev, stru
  	return length;
  }
  
@@ -1726,7 +1715,7 @@
  {
  	struct fw_device *device = fw_device(dev);
  	int ret;
-@@ -382,8 +381,8 @@ static struct device_attribute fw_device_attributes[] = {
+@@ -383,8 +381,8 @@ static struct device_attribute fw_device
  	__ATTR_NULL,
  };
  
@@ -1737,193 +1726,7 @@
  {
  	int rcode;
  
-@@ -634,12 +633,38 @@ struct fw_device *fw_device_get_by_devt(dev_t devt)
- 	return device;
- }
- 
-+/*
-+ * These defines control the retry behavior for reading the config
-+ * rom.  It shouldn't be necessary to tweak these; if the device
-+ * doesn't respond to a config rom read within 10 seconds, it's not
-+ * going to respond at all.  As for the initial delay, a lot of
-+ * devices will be able to respond within half a second after bus
-+ * reset.  On the other hand, it's not really worth being more
-+ * aggressive than that, since it scales pretty well; if 10 devices
-+ * are plugged in, they're all getting read within one second.
-+ */
-+
-+#define MAX_RETRIES	10
-+#define RETRY_DELAY	(3 * HZ)
-+#define INITIAL_DELAY	(HZ / 2)
-+#define SHUTDOWN_DELAY	(2 * HZ)
-+
- static void fw_device_shutdown(struct work_struct *work)
- {
- 	struct fw_device *device =
- 		container_of(work, struct fw_device, work.work);
- 	int minor = MINOR(device->device.devt);
- 
-+	if (time_is_after_jiffies(device->card->reset_jiffies + SHUTDOWN_DELAY)) {
-+		schedule_delayed_work(&device->work, SHUTDOWN_DELAY);
-+		return;
-+	}
-+
-+	if (atomic_cmpxchg(&device->state,
-+			   FW_DEVICE_GONE,
-+			   FW_DEVICE_SHUTDOWN) != FW_DEVICE_GONE)
-+		return;
-+
- 	fw_device_cdev_remove(device);
- 	device_for_each_child(&device->device, NULL, shutdown_unit);
- 	device_unregister(&device->device);
-@@ -647,6 +672,7 @@ static void fw_device_shutdown(struct work_struct *work)
- 	down_write(&fw_device_rwsem);
- 	idr_remove(&fw_device_idr, minor);
- 	up_write(&fw_device_rwsem);
-+
- 	fw_device_put(device);
- }
- 
-@@ -654,25 +680,63 @@ static struct device_type fw_device_type = {
- 	.release	= fw_device_release,
- };
- 
-+static void fw_device_update(struct work_struct *work);
-+
- /*
-- * These defines control the retry behavior for reading the config
-- * rom.  It shouldn't be necessary to tweak these; if the device
-- * doesn't respond to a config rom read within 10 seconds, it's not
-- * going to respond at all.  As for the initial delay, a lot of
-- * devices will be able to respond within half a second after bus
-- * reset.  On the other hand, it's not really worth being more
-- * aggressive than that, since it scales pretty well; if 10 devices
-- * are plugged in, they're all getting read within one second.
-+ * If a device was pending for deletion because its node went away but its
-+ * bus info block and root directory header matches that of a newly discovered
-+ * device, revive the existing fw_device.
-+ * The newly allocated fw_device becomes obsolete instead.
-  */
-+static int lookup_existing_device(struct device *dev, void *data)
-+{
-+	struct fw_device *old = fw_device(dev);
-+	struct fw_device *new = data;
-+	struct fw_card *card = new->card;
-+	int match = 0;
-+
-+	down_read(&fw_device_rwsem); /* serialize config_rom access */
-+	spin_lock_irq(&card->lock);  /* serialize node access */
-+
-+	if (memcmp(old->config_rom, new->config_rom, 6 * 4) == 0 &&
-+	    atomic_cmpxchg(&old->state,
-+			   FW_DEVICE_GONE,
-+			   FW_DEVICE_RUNNING) == FW_DEVICE_GONE) {
-+		struct fw_node *current_node = new->node;
-+		struct fw_node *obsolete_node = old->node;
-+
-+		new->node = obsolete_node;
-+		new->node->data = new;
-+		old->node = current_node;
-+		old->node->data = old;
-+
-+		old->max_speed = new->max_speed;
-+		old->node_id = current_node->node_id;
-+		smp_wmb();  /* update node_id before generation */
-+		old->generation = card->generation;
-+		old->config_rom_retries = 0;
-+		fw_notify("rediscovered device %s\n", dev_name(dev));
- 
--#define MAX_RETRIES	10
--#define RETRY_DELAY	(3 * HZ)
--#define INITIAL_DELAY	(HZ / 2)
-+		PREPARE_DELAYED_WORK(&old->work, fw_device_update);
-+		schedule_delayed_work(&old->work, 0);
-+
-+		if (current_node == card->root_node)
-+			fw_schedule_bm_work(card, 0);
-+
-+		match = 1;
-+	}
-+
-+	spin_unlock_irq(&card->lock);
-+	up_read(&fw_device_rwsem);
-+
-+	return match;
-+}
- 
- static void fw_device_init(struct work_struct *work)
- {
- 	struct fw_device *device =
- 		container_of(work, struct fw_device, work.work);
-+	struct device *revived_dev;
- 	int minor, err;
- 
- 	/*
-@@ -696,6 +760,15 @@ static void fw_device_init(struct work_struct *work)
- 		return;
- 	}
- 
-+	revived_dev = device_find_child(device->card->device,
-+					device, lookup_existing_device);
-+	if (revived_dev) {
-+		put_device(revived_dev);
-+		fw_device_release(&device->device);
-+
-+		return;
-+	}
-+
- 	device_initialize(&device->device);
- 
- 	fw_device_get(device);
-@@ -734,9 +807,10 @@ static void fw_device_init(struct work_struct *work)
- 	 * fw_node_event().
- 	 */
- 	if (atomic_cmpxchg(&device->state,
--		    FW_DEVICE_INITIALIZING,
--		    FW_DEVICE_RUNNING) == FW_DEVICE_SHUTDOWN) {
--		fw_device_shutdown(work);
-+			   FW_DEVICE_INITIALIZING,
-+			   FW_DEVICE_RUNNING) == FW_DEVICE_GONE) {
-+		PREPARE_DELAYED_WORK(&device->work, fw_device_shutdown);
-+		schedule_delayed_work(&device->work, SHUTDOWN_DELAY);
- 	} else {
- 		if (device->config_rom_retries)
- 			fw_notify("created device %s: GUID %08x%08x, S%d00, "
-@@ -847,8 +921,8 @@ static void fw_device_refresh(struct work_struct *work)
- 
- 	case REREAD_BIB_UNCHANGED:
- 		if (atomic_cmpxchg(&device->state,
--			    FW_DEVICE_INITIALIZING,
--			    FW_DEVICE_RUNNING) == FW_DEVICE_SHUTDOWN)
-+				   FW_DEVICE_INITIALIZING,
-+				   FW_DEVICE_RUNNING) == FW_DEVICE_GONE)
- 			goto gone;
- 
- 		fw_device_update(work);
-@@ -879,8 +953,8 @@ static void fw_device_refresh(struct work_struct *work)
- 	create_units(device);
- 
- 	if (atomic_cmpxchg(&device->state,
--		    FW_DEVICE_INITIALIZING,
--		    FW_DEVICE_RUNNING) == FW_DEVICE_SHUTDOWN)
-+			   FW_DEVICE_INITIALIZING,
-+			   FW_DEVICE_RUNNING) == FW_DEVICE_GONE)
- 		goto gone;
- 
- 	fw_notify("refreshed device %s\n", dev_name(&device->device));
-@@ -890,8 +964,9 @@ static void fw_device_refresh(struct work_struct *work)
-  give_up:
- 	fw_notify("giving up on refresh of device %s\n", dev_name(&device->device));
-  gone:
--	atomic_set(&device->state, FW_DEVICE_SHUTDOWN);
--	fw_device_shutdown(work);
-+	atomic_set(&device->state, FW_DEVICE_GONE);
-+	PREPARE_DELAYED_WORK(&device->work, fw_device_shutdown);
-+	schedule_delayed_work(&device->work, SHUTDOWN_DELAY);
-  out:
- 	if (node_id == card->root_node->node_id)
- 		fw_schedule_bm_work(card, 0);
-@@ -926,6 +1001,7 @@ void fw_node_event(struct fw_card *card, struct fw_node *node, int event)
+@@ -1004,6 +1002,7 @@ void fw_node_event(struct fw_card *card,
  		device->node = fw_node_get(node);
  		device->node_id = node->node_id;
  		device->generation = card->generation;
@@ -1931,23 +1734,10 @@
  		INIT_LIST_HEAD(&device->client_list);
  
  		/*
-@@ -995,9 +1071,9 @@ void fw_node_event(struct fw_card *card, struct fw_node *node, int event)
- 		 */
- 		device = node->data;
- 		if (atomic_xchg(&device->state,
--				FW_DEVICE_SHUTDOWN) == FW_DEVICE_RUNNING) {
-+				FW_DEVICE_GONE) == FW_DEVICE_RUNNING) {
- 			PREPARE_DELAYED_WORK(&device->work, fw_device_shutdown);
--			schedule_delayed_work(&device->work, 0);
-+			schedule_delayed_work(&device->work, SHUTDOWN_DELAY);
- 		}
- 		break;
- 	}
-diff --git a/drivers/firewire/fw-device.h b/drivers/firewire/fw-device.h
-index df51732..41483f1 100644
---- a/drivers/firewire/fw-device.h
-+++ b/drivers/firewire/fw-device.h
-@@ -23,11 +23,13 @@
+diff -Naurp linux-2.6-git/drivers/firewire/fw-device.h firewire-git/drivers/firewire/fw-device.h
+--- linux-2.6-git/drivers/firewire/fw-device.h	2009-01-30 13:39:02.989651512 -0500
++++ firewire-git/drivers/firewire/fw-device.h	2009-01-30 13:35:51.860646788 -0500
+@@ -23,6 +23,7 @@
  #include <linux/cdev.h>
  #include <linux/idr.h>
  #include <linux/rwsem.h>
@@ -1955,13 +1745,7 @@
  #include <asm/atomic.h>
  
  enum fw_device_state {
- 	FW_DEVICE_INITIALIZING,
- 	FW_DEVICE_RUNNING,
-+	FW_DEVICE_GONE,
- 	FW_DEVICE_SHUTDOWN,
- };
- 
-@@ -63,7 +65,10 @@ struct fw_device {
+@@ -64,7 +65,10 @@ struct fw_device {
  	bool cmc;
  	struct fw_card *card;
  	struct device device;
@@ -1972,7 +1756,7 @@
  	u32 *config_rom;
  	size_t config_rom_length;
  	int config_rom_retries;
-@@ -175,8 +180,7 @@ struct fw_driver {
+@@ -176,8 +180,7 @@ struct fw_driver {
  	const struct fw_device_id *id_table;
  };
  
@@ -1982,10 +1766,9 @@
  {
  	return container_of(drv, struct fw_driver, driver);
  }
-diff --git a/drivers/firewire/fw-iso.c b/drivers/firewire/fw-iso.c
-index e14c03d..f511d16 100644
---- a/drivers/firewire/fw-iso.c
-+++ b/drivers/firewire/fw-iso.c
+diff -Naurp linux-2.6-git/drivers/firewire/fw-iso.c firewire-git/drivers/firewire/fw-iso.c
+--- linux-2.6-git/drivers/firewire/fw-iso.c	2008-11-04 11:18:33.000000000 -0500
++++ firewire-git/drivers/firewire/fw-iso.c	2009-01-30 13:35:51.860646788 -0500
 @@ -1,5 +1,7 @@
  /*
 - * Isochronous IO functionality
@@ -2030,7 +1813,7 @@
  	dma_addr_t address;
  
  	buffer->page_count = page_count;
-@@ -69,19 +75,19 @@ fw_iso_buffer_init(struct fw_iso_buffer *buffer, struct fw_card *card,
+@@ -69,19 +75,19 @@ fw_iso_buffer_init(struct fw_iso_buffer 
  	kfree(buffer->pages);
   out:
  	buffer->pages = NULL;
@@ -2055,7 +1838,7 @@
  		uaddr += PAGE_SIZE;
  	}
  
-@@ -105,14 +111,14 @@ void fw_iso_buffer_destroy(struct fw_iso_buffer *buffer,
+@@ -105,14 +111,14 @@ void fw_iso_buffer_destroy(struct fw_iso
  	buffer->pages = NULL;
  }
  
@@ -2075,7 +1858,7 @@
  	if (IS_ERR(ctx))
  		return ctx;
  
-@@ -134,25 +140,186 @@ void fw_iso_context_destroy(struct fw_iso_context *ctx)
+@@ -134,25 +140,186 @@ void fw_iso_context_destroy(struct fw_is
  	card->driver->free_iso_context(ctx);
  }
  
@@ -2271,10 +2054,9 @@
 +		*channel = ret;
 +	}
 +}
-diff --git a/drivers/firewire/fw-ohci.c b/drivers/firewire/fw-ohci.c
-index ab9c01e..859af71 100644
---- a/drivers/firewire/fw-ohci.c
-+++ b/drivers/firewire/fw-ohci.c
+diff -Naurp linux-2.6-git/drivers/firewire/fw-ohci.c firewire-git/drivers/firewire/fw-ohci.c
+--- linux-2.6-git/drivers/firewire/fw-ohci.c	2009-01-30 13:39:02.990772025 -0500
++++ firewire-git/drivers/firewire/fw-ohci.c	2009-01-30 13:35:51.861646907 -0500
 @@ -205,6 +205,7 @@ struct fw_ohci {
  
  	u32 it_context_mask;
@@ -2283,16 +2065,7 @@
  	u32 ir_context_mask;
  	struct iso_context *ir_context_list;
  };
-@@ -226,7 +227,7 @@ static inline struct fw_ohci *fw_ohci(struct fw_card *card)
- #define CONTEXT_DEAD	0x0800
- #define CONTEXT_ACTIVE	0x0400
- 
--#define OHCI1394_MAX_AT_REQ_RETRIES	0x2
-+#define OHCI1394_MAX_AT_REQ_RETRIES	0xf
- #define OHCI1394_MAX_AT_RESP_RETRIES	0x2
- #define OHCI1394_MAX_PHYS_RESP_RETRIES	0x8
- 
-@@ -441,9 +442,8 @@ static inline void flush_writes(const struct fw_ohci *ohci)
+@@ -441,9 +442,8 @@ static inline void flush_writes(const st
  	reg_read(ohci, OHCI1394_Version);
  }
  
@@ -2304,7 +2077,7 @@
  {
  	struct fw_ohci *ohci = fw_ohci(card);
  	u32 val, old;
-@@ -658,8 +658,8 @@ static void ar_context_tasklet(unsigned long data)
+@@ -658,8 +658,8 @@ static void ar_context_tasklet(unsigned 
  	}
  }
  
@@ -2315,7 +2088,7 @@
  {
  	struct ar_buffer ab;
  
-@@ -690,8 +690,7 @@ static void ar_context_run(struct ar_context *ctx)
+@@ -690,8 +690,7 @@ static void ar_context_run(struct ar_con
  	flush_writes(ctx->ohci);
  }
  
@@ -2325,7 +2098,7 @@
  {
  	int b, key;
  
-@@ -751,8 +750,7 @@ static void context_tasklet(unsigned long data)
+@@ -751,8 +750,7 @@ static void context_tasklet(unsigned lon
   * Allocate a new buffer and add it to the list of free buffers for this
   * context.  Must be called with ohci->lock held.
   */
@@ -2347,7 +2120,7 @@
  {
  	ctx->ohci = ohci;
  	ctx->regs = regs;
-@@ -814,8 +811,7 @@ context_init(struct context *ctx, struct fw_ohci *ohci,
+@@ -814,8 +811,7 @@ context_init(struct context *ctx, struct
  	return 0;
  }
  
@@ -2368,20 +2141,6 @@
  {
  	struct descriptor *d = NULL;
  	struct descriptor_buffer *desc = ctx->buffer_tail;
-@@ -896,11 +892,11 @@ static void context_stop(struct context *ctx)
- 	for (i = 0; i < 10; i++) {
- 		reg = reg_read(ctx->ohci, CONTROL_SET(ctx->regs));
- 		if ((reg & CONTEXT_ACTIVE) == 0)
--			break;
-+			return;
- 
--		fw_notify("context_stop: still active (0x%08x)\n", reg);
- 		mdelay(1);
- 	}
-+	fw_error("Error: DMA context still active (0x%08x)\n", reg);
- }
- 
- struct driver_data {
 @@ -912,8 +908,8 @@ struct driver_data {
   * Must always be called with the ochi->lock held to ensure proper
   * generation handling and locking around packet queue manipulation.
@@ -2393,7 +2152,7 @@
  {
  	struct fw_ohci *ohci = ctx->ohci;
  	dma_addr_t d_bus, uninitialized_var(payload_bus);
-@@ -1095,8 +1091,8 @@ static int handle_at_packet(struct context *context,
+@@ -1095,8 +1091,8 @@ static int handle_at_packet(struct conte
  #define HEADER_GET_DATA_LENGTH(q)	(((q) >> 16) & 0xffff)
  #define HEADER_GET_EXTENDED_TCODE(q)	(((q) >> 0) & 0xffff)
  
@@ -2404,7 +2163,7 @@
  {
  	struct fw_packet response;
  	int tcode, length, i;
-@@ -1122,8 +1118,8 @@ handle_local_rom(struct fw_ohci *ohci, struct fw_packet *packet, u32 csr)
+@@ -1122,8 +1118,8 @@ handle_local_rom(struct fw_ohci *ohci, s
  	fw_core_handle_response(&ohci->card, &response);
  }
  
@@ -2415,7 +2174,7 @@
  {
  	struct fw_packet response;
  	int tcode, length, ext_tcode, sel;
-@@ -1164,8 +1160,7 @@ handle_local_lock(struct fw_ohci *ohci, struct fw_packet *packet, u32 csr)
+@@ -1164,8 +1160,7 @@ handle_local_lock(struct fw_ohci *ohci, 
  	fw_core_handle_response(&ohci->card, &response);
  }
  
@@ -2425,7 +2184,7 @@
  {
  	u64 offset;
  	u32 csr;
-@@ -1205,11 +1200,10 @@ handle_local_request(struct context *ctx, struct fw_packet *packet)
+@@ -1205,11 +1200,10 @@ handle_local_request(struct context *ctx
  	}
  }
  
@@ -2439,7 +2198,7 @@
  
  	spin_lock_irqsave(&ctx->ohci->lock, flags);
  
-@@ -1220,10 +1214,10 @@ at_context_transmit(struct context *ctx, struct fw_packet *packet)
+@@ -1220,10 +1214,10 @@ at_context_transmit(struct context *ctx,
  		return;
  	}
  
@@ -2452,7 +2211,7 @@
  		packet->callback(packet, &ctx->ohci->card, packet->ack);
  
  }
-@@ -1590,12 +1584,12 @@ static int ohci_enable(struct fw_card *card, u32 *config_rom, size_t length)
+@@ -1590,12 +1584,12 @@ static int ohci_enable(struct fw_card *c
  	return 0;
  }
  
@@ -2468,7 +2227,7 @@
  	__be32 *next_config_rom;
  	dma_addr_t uninitialized_var(next_config_rom_bus);
  
-@@ -1649,7 +1643,7 @@ ohci_set_config_rom(struct fw_card *card, u32 *config_rom, size_t length)
+@@ -1649,7 +1643,7 @@ ohci_set_config_rom(struct fw_card *card
  
  		reg_write(ohci, OHCI1394_ConfigROMmap,
  			  ohci->next_config_rom_bus);
@@ -2477,7 +2236,7 @@
  	}
  
  	spin_unlock_irqrestore(&ohci->lock, flags);
-@@ -1661,13 +1655,13 @@ ohci_set_config_rom(struct fw_card *card, u32 *config_rom, size_t length)
+@@ -1661,13 +1655,13 @@ ohci_set_config_rom(struct fw_card *card
  	 * controller could need to access it before the bus reset
  	 * takes effect.
  	 */
@@ -2493,7 +2252,7 @@
  }
  
  static void ohci_send_request(struct fw_card *card, struct fw_packet *packet)
-@@ -1689,7 +1683,7 @@ static int ohci_cancel_packet(struct fw_card *card, struct fw_packet *packet)
+@@ -1689,7 +1683,7 @@ static int ohci_cancel_packet(struct fw_
  	struct fw_ohci *ohci = fw_ohci(card);
  	struct context *ctx = &ohci->at_request_ctx;
  	struct driver_data *driver_data = packet->driver_data;
@@ -2502,7 +2261,7 @@
  
  	tasklet_disable(&ctx->tasklet);
  
-@@ -1704,23 +1698,22 @@ static int ohci_cancel_packet(struct fw_card *card, struct fw_packet *packet)
+@@ -1704,23 +1698,22 @@ static int ohci_cancel_packet(struct fw_
  	driver_data->packet = NULL;
  	packet->ack = RCODE_CANCELLED;
  	packet->callback(packet, &ohci->card, packet->ack);
@@ -2531,7 +2290,7 @@
  
  	/*
  	 * FIXME:  Make sure this bitmask is cleared when we clear the busReset
-@@ -1730,7 +1723,7 @@ ohci_enable_phys_dma(struct fw_card *card, int node_id, int generation)
+@@ -1730,7 +1723,7 @@ ohci_enable_phys_dma(struct fw_card *car
  	spin_lock_irqsave(&ohci->lock, flags);
  
  	if (ohci->generation != generation) {
@@ -2540,7 +2299,7 @@
  		goto out;
  	}
  
-@@ -1748,12 +1741,12 @@ ohci_enable_phys_dma(struct fw_card *card, int node_id, int generation)
+@@ -1748,12 +1741,12 @@ ohci_enable_phys_dma(struct fw_card *car
  	flush_writes(ohci);
   out:
  	spin_unlock_irqrestore(&ohci->lock, flags);
@@ -2585,7 +2344,7 @@
  static int handle_ir_dualbuffer_packet(struct context *context,
  				       struct descriptor *d,
  				       struct descriptor *last)
-@@ -1775,7 +1790,6 @@ static int handle_ir_dualbuffer_packet(struct context *context,
+@@ -1775,7 +1790,6 @@ static int handle_ir_dualbuffer_packet(s
  	__le32 *ir_header;
  	size_t header_length;
  	void *p, *end;
@@ -2593,7 +2352,7 @@
  
  	if (db->first_res_count != 0 && db->second_res_count != 0) {
  		if (ctx->excess_bytes <= le16_to_cpu(db->second_req_count)) {
-@@ -1788,25 +1802,14 @@ static int handle_ir_dualbuffer_packet(struct context *context,
+@@ -1788,25 +1802,14 @@ static int handle_ir_dualbuffer_packet(s
  	header_length = le16_to_cpu(db->first_req_count) -
  		le16_to_cpu(db->first_res_count);
  
@@ -2622,7 +2381,7 @@
  
  	ctx->excess_bytes -= le16_to_cpu(db->second_req_count) -
  		le16_to_cpu(db->second_res_count);
-@@ -1832,7 +1835,6 @@ static int handle_ir_packet_per_buffer(struct context *context,
+@@ -1832,7 +1835,6 @@ static int handle_ir_packet_per_buffer(s
  	struct descriptor *pd;
  	__le32 *ir_header;
  	void *p;
@@ -2630,7 +2389,7 @@
  
  	for (pd = d; pd <= last; pd++) {
  		if (pd->transfer_status)
-@@ -1842,21 +1844,8 @@ static int handle_ir_packet_per_buffer(struct context *context,
+@@ -1842,21 +1844,8 @@ static int handle_ir_packet_per_buffer(s
  		/* Descriptor(s) not done yet, stop iteration */
  		return 0;
  
@@ -2654,7 +2413,7 @@
  
  	if (le16_to_cpu(last->control) & DESCRIPTOR_IRQ_ALWAYS) {
  		ir_header = (__le32 *) p;
-@@ -1888,21 +1877,24 @@ static int handle_it_packet(struct context *context,
+@@ -1888,21 +1877,24 @@ static int handle_it_packet(struct conte
  	return 1;
  }
  
@@ -2682,7 +2441,7 @@
  		mask = &ohci->ir_context_mask;
  		list = ohci->ir_context_list;
  		if (ohci->use_dualbuffer)
-@@ -1912,9 +1904,11 @@ ohci_allocate_iso_context(struct fw_card *card, int type, size_t header_size)
+@@ -1912,9 +1904,11 @@ ohci_allocate_iso_context(struct fw_card
  	}
  
  	spin_lock_irqsave(&ohci->lock, flags);
@@ -2696,7 +2455,7 @@
  	spin_unlock_irqrestore(&ohci->lock, flags);
  
  	if (index < 0)
-@@ -1932,8 +1926,8 @@ ohci_allocate_iso_context(struct fw_card *card, int type, size_t header_size)
+@@ -1932,8 +1926,8 @@ ohci_allocate_iso_context(struct fw_card
  	if (ctx->header == NULL)
  		goto out;
  
@@ -2707,7 +2466,7 @@
  		goto out_with_header;
  
  	return &ctx->base;
-@@ -1945,7 +1939,7 @@ ohci_allocate_iso_context(struct fw_card *card, int type, size_t header_size)
+@@ -1945,7 +1939,7 @@ ohci_allocate_iso_context(struct fw_card
  	*mask |= 1 << index;
  	spin_unlock_irqrestore(&ohci->lock, flags);
  
@@ -2716,7 +2475,7 @@
  }
  
  static int ohci_start_iso(struct fw_iso_context *base,
-@@ -2024,16 +2018,16 @@ static void ohci_free_iso_context(struct fw_iso_context *base)
+@@ -2024,16 +2018,16 @@ static void ohci_free_iso_context(struct
  	} else {
  		index = ctx - ohci->ir_context_list;
  		ohci->ir_context_mask |= 1 << index;
@@ -2738,7 +2497,7 @@
  {
  	struct iso_context *ctx = container_of(base, struct iso_context, base);
  	struct descriptor *d, *last, *pd;
-@@ -2128,11 +2122,10 @@ ohci_queue_iso_transmit(struct fw_iso_context *base,
+@@ -2128,11 +2122,10 @@ ohci_queue_iso_transmit(struct fw_iso_co
  	return 0;
  }
  
@@ -2754,7 +2513,7 @@
  {
  	struct iso_context *ctx = container_of(base, struct iso_context, base);
  	struct db_descriptor *db = NULL;
-@@ -2151,11 +2144,11 @@ ohci_queue_iso_receive_dualbuffer(struct fw_iso_context *base,
+@@ -2151,11 +2144,11 @@ ohci_queue_iso_receive_dualbuffer(struct
  	z = 2;
  
  	/*
@@ -2769,7 +2528,7 @@
  
  	/* Get header size in number of descriptors. */
  	header_z = DIV_ROUND_UP(header_size, sizeof(*d));
-@@ -2173,7 +2166,8 @@ ohci_queue_iso_receive_dualbuffer(struct fw_iso_context *base,
+@@ -2173,7 +2166,8 @@ ohci_queue_iso_receive_dualbuffer(struct
  		db = (struct db_descriptor *) d;
  		db->control = cpu_to_le16(DESCRIPTOR_STATUS |
  					  DESCRIPTOR_BRANCH_ALWAYS);
@@ -2779,7 +2538,7 @@
  		if (p->skip && rest == p->payload_length) {
  			db->control |= cpu_to_le16(DESCRIPTOR_WAIT);
  			db->first_req_count = db->first_size;
-@@ -2208,11 +2202,10 @@ ohci_queue_iso_receive_dualbuffer(struct fw_iso_context *base,
+@@ -2208,11 +2202,10 @@ ohci_queue_iso_receive_dualbuffer(struct
  	return 0;
  }
  
@@ -2795,7 +2554,7 @@
  {
  	struct iso_context *ctx = container_of(base, struct iso_context, base);
  	struct descriptor *d = NULL, *pd = NULL;
-@@ -2223,11 +2216,11 @@ ohci_queue_iso_receive_packet_per_buffer(struct fw_iso_context *base,
+@@ -2223,11 +2216,11 @@ ohci_queue_iso_receive_packet_per_buffer
  	int page, offset, packet_count, header_size, payload_per_buffer;
  
  	/*
@@ -2810,7 +2569,7 @@
  
  	/* Get header size in number of descriptors. */
  	header_z = DIV_ROUND_UP(header_size, sizeof(*d));
-@@ -2286,29 +2279,27 @@ ohci_queue_iso_receive_packet_per_buffer(struct fw_iso_context *base,
+@@ -2286,29 +2279,27 @@ ohci_queue_iso_receive_packet_per_buffer
  	return 0;
  }
  
@@ -2851,7 +2610,7 @@
  }
  
  static const struct fw_card_driver ohci_driver = {
-@@ -2357,8 +2348,8 @@ static void ohci_pmac_off(struct pci_dev *dev)
+@@ -2357,8 +2348,8 @@ static void ohci_pmac_off(struct pci_dev
  #define ohci_pmac_off(dev)
  #endif /* CONFIG_PPC_PMAC */
  
@@ -2862,7 +2621,7 @@
  {
  	struct fw_ohci *ohci;
  	u32 bus_options, max_receive, link_speed, version;
-@@ -2440,6 +2431,7 @@ pci_probe(struct pci_dev *dev, const struct pci_device_id *ent)
+@@ -2440,6 +2431,7 @@ pci_probe(struct pci_dev *dev, const str
  	ohci->it_context_list = kzalloc(size, GFP_KERNEL);
  
  	reg_write(ohci, OHCI1394_IsoXmitIntMaskSet, ~0);
@@ -2870,11 +2629,10 @@
  	ohci->ir_context_mask = reg_read(ohci, OHCI1394_IsoXmitIntMaskSet);
  	reg_write(ohci, OHCI1394_IsoXmitIntMaskClear, ~0);
  	size = sizeof(struct iso_context) * hweight32(ohci->ir_context_mask);
-diff --git a/drivers/firewire/fw-sbp2.c b/drivers/firewire/fw-sbp2.c
-index e88d506..090e72e 100644
---- a/drivers/firewire/fw-sbp2.c
-+++ b/drivers/firewire/fw-sbp2.c
-@@ -387,20 +387,18 @@ static const struct {
+diff -Naurp linux-2.6-git/drivers/firewire/fw-sbp2.c firewire-git/drivers/firewire/fw-sbp2.c
+--- linux-2.6-git/drivers/firewire/fw-sbp2.c	2009-01-30 13:39:02.991771976 -0500
++++ firewire-git/drivers/firewire/fw-sbp2.c	2009-01-30 13:35:51.861646907 -0500
+@@ -392,20 +392,18 @@ static const struct {
  	}
  };
  
@@ -2901,7 +2659,7 @@
  {
  	struct sbp2_logical_unit *lu = callback_data;
  	struct sbp2_orb *orb;
-@@ -446,9 +444,8 @@ sbp2_status_write(struct fw_card *card, struct fw_request *request,
+@@ -451,9 +449,8 @@ sbp2_status_write(struct fw_card *card, 
  	fw_send_response(card, request, RCODE_COMPLETE);
  }
  
@@ -2913,7 +2671,7 @@
  {
  	struct sbp2_orb *orb = data;
  	unsigned long flags;
-@@ -477,9 +474,8 @@ complete_transaction(struct fw_card *card, int rcode,
+@@ -482,9 +479,8 @@ complete_transaction(struct fw_card *car
  	kref_put(&orb->kref, free_orb);
  }
  
@@ -2925,7 +2683,7 @@
  {
  	struct fw_device *device = fw_device(lu->tgt->unit->device.parent);
  	unsigned long flags;
-@@ -526,8 +522,8 @@ static int sbp2_cancel_orbs(struct sbp2_logical_unit *lu)
+@@ -531,8 +527,8 @@ static int sbp2_cancel_orbs(struct sbp2_
  	return retval;
  }
  
@@ -2936,7 +2694,7 @@
  {
  	struct sbp2_management_orb *orb =
  		container_of(base_orb, struct sbp2_management_orb, base);
-@@ -537,10 +533,9 @@ complete_management_orb(struct sbp2_orb *base_orb, struct sbp2_status *status)
+@@ -542,10 +538,9 @@ complete_management_orb(struct sbp2_orb 
  	complete(&orb->done);
  }
  
@@ -2950,7 +2708,7 @@
  {
  	struct fw_device *device = fw_device(lu->tgt->unit->device.parent);
  	struct sbp2_management_orb *orb;
-@@ -647,9 +642,8 @@ static void sbp2_agent_reset(struct sbp2_logical_unit *lu)
+@@ -652,9 +647,8 @@ static void sbp2_agent_reset(struct sbp2
  			   &d, sizeof(d));
  }
  
@@ -2962,9 +2720,9 @@
  {
  	kfree(data);
  }
-@@ -1273,8 +1267,7 @@ static struct fw_driver sbp2_driver = {
- 	.id_table = sbp2_id_table,
- };
+@@ -1299,8 +1293,7 @@ static void sbp2_unmap_scatterlist(struc
+ 				 sizeof(orb->page_table), DMA_TO_DEVICE);
+ }
  
 -static unsigned int
 -sbp2_status_to_sense_data(u8 *sbp2_status, u8 *sense_data)
@@ -2972,7 +2730,7 @@
  {
  	int sam_status;
  
-@@ -1311,8 +1304,8 @@ sbp2_status_to_sense_data(u8 *sbp2_status, u8 *sense_data)
+@@ -1337,8 +1330,8 @@ sbp2_status_to_sense_data(u8 *sbp2_statu
  	}
  }
  
@@ -2983,7 +2741,7 @@
  {
  	struct sbp2_command_orb *orb =
  		container_of(base_orb, struct sbp2_command_orb, base);
-@@ -1366,9 +1359,8 @@ complete_command_orb(struct sbp2_orb *base_orb, struct sbp2_status *status)
+@@ -1384,9 +1377,8 @@ complete_command_orb(struct sbp2_orb *ba
  	orb->done(orb->cmd);
  }
  
@@ -2995,7 +2753,7 @@
  {
  	struct scatterlist *sg = scsi_sglist(orb->cmd);
  	int i, n;
-@@ -1573,9 +1565,8 @@ static int sbp2_scsi_abort(struct scsi_cmnd *cmd)
+@@ -1584,9 +1576,8 @@ static int sbp2_scsi_abort(struct scsi_c
   * This is the concatenation of target port identifier and logical unit
   * identifier as per SAM-2...SAM-4 annex A.
   */
@@ -3007,11 +2765,10 @@
  {
  	struct scsi_device *sdev = to_scsi_device(dev);
  	struct sbp2_logical_unit *lu;
-diff --git a/drivers/firewire/fw-topology.c b/drivers/firewire/fw-topology.c
-index c9be6e6..b44131c 100644
---- a/drivers/firewire/fw-topology.c
-+++ b/drivers/firewire/fw-topology.c
-@@ -314,9 +314,8 @@ typedef void (*fw_node_callback_t)(struct fw_card * card,
+diff -Naurp linux-2.6-git/drivers/firewire/fw-topology.c firewire-git/drivers/firewire/fw-topology.c
+--- linux-2.6-git/drivers/firewire/fw-topology.c	2009-01-30 13:39:02.991771976 -0500
++++ firewire-git/drivers/firewire/fw-topology.c	2009-01-30 13:35:51.862647087 -0500
+@@ -314,9 +314,8 @@ typedef void (*fw_node_callback_t)(struc
  				   struct fw_node * node,
  				   struct fw_node * parent);
  
@@ -3023,7 +2780,7 @@
  {
  	struct list_head list;
  	struct fw_node *node, *next, *child, *parent;
-@@ -349,9 +348,8 @@ for_each_fw_node(struct fw_card *card, struct fw_node *root,
+@@ -349,9 +348,8 @@ for_each_fw_node(struct fw_card *card, s
  		fw_node_put(node);
  }
  
@@ -3047,7 +2804,7 @@
  {
  	int b_path = (node->phy_speed == SCODE_BETA);
  
-@@ -415,8 +412,7 @@ static void move_tree(struct fw_node *node0, struct fw_node *node1, int port)
+@@ -415,8 +412,7 @@ static void move_tree(struct fw_node *no
   * found, lost or updated.  Update the nodes in the card topology tree
   * as we go.
   */
@@ -3057,7 +2814,7 @@
  {
  	struct list_head list0, list1;
  	struct fw_node *node0, *node1, *next1;
-@@ -497,8 +493,8 @@ update_tree(struct fw_card *card, struct fw_node *root)
+@@ -497,8 +493,8 @@ update_tree(struct fw_card *card, struct
  	}
  }
  
@@ -3068,7 +2825,7 @@
  {
  	int node_count;
  
-@@ -510,14 +506,24 @@ update_topology_map(struct fw_card *card, u32 *self_ids, int self_id_count)
+@@ -510,10 +506,8 @@ update_topology_map(struct fw_card *card
  	fw_compute_block_crc(card->topology_map);
  }
  
@@ -3081,26 +2838,9 @@
  {
  	struct fw_node *local_node;
  	unsigned long flags;
- 
-+	/*
-+	 * If the selfID buffer is not the immediate successor of the
-+	 * previously processed one, we cannot reliably compare the
-+	 * old and new topologies.
-+	 */
-+	if (!is_next_generation(generation, card->generation) &&
-+	    card->local_node != NULL) {
-+		fw_notify("skipped bus generations, destroying all nodes\n");
-+		fw_destroy_nodes(card);
-+		card->bm_retries = 0;
-+	}
-+
- 	spin_lock_irqsave(&card->lock, flags);
- 
- 	card->node_id = node_id;
-diff --git a/drivers/firewire/fw-topology.h b/drivers/firewire/fw-topology.h
-index addb9f8..3c497bb 100644
---- a/drivers/firewire/fw-topology.h
-+++ b/drivers/firewire/fw-topology.h
+diff -Naurp linux-2.6-git/drivers/firewire/fw-topology.h firewire-git/drivers/firewire/fw-topology.h
+--- linux-2.6-git/drivers/firewire/fw-topology.h	2008-11-04 11:18:33.000000000 -0500
++++ firewire-git/drivers/firewire/fw-topology.h	2009-01-30 13:35:51.862647087 -0500
 @@ -19,6 +19,11 @@
  #ifndef __fw_topology_h
  #define __fw_topology_h
@@ -3145,10 +2885,9 @@
 +int fw_compute_block_crc(u32 *block);
  
  #endif /* __fw_topology_h */
-diff --git a/drivers/firewire/fw-transaction.c b/drivers/firewire/fw-transaction.c
-index 699ac04..1537737 100644
---- a/drivers/firewire/fw-transaction.c
-+++ b/drivers/firewire/fw-transaction.c
+diff -Naurp linux-2.6-git/drivers/firewire/fw-transaction.c firewire-git/drivers/firewire/fw-transaction.c
+--- linux-2.6-git/drivers/firewire/fw-transaction.c	2009-01-30 13:39:02.991771976 -0500
++++ firewire-git/drivers/firewire/fw-transaction.c	2009-01-30 13:35:51.862647087 -0500
 @@ -64,10 +64,9 @@
  #define PHY_CONFIG_ROOT_ID(node_id)	((((node_id) & 0x3f) << 24) | (1 << 23))
  #define PHY_IDENTIFIER(id)		((id) << 30)
@@ -3163,7 +2902,7 @@
  {
  	struct fw_transaction *t;
  	unsigned long flags;
-@@ -94,9 +93,8 @@ close_transaction(struct fw_transaction *transaction,
+@@ -94,9 +93,8 @@ close_transaction(struct fw_transaction 
   * Only valid for transactions that are potentially pending (ie have
   * been sent).
   */
@@ -3175,7 +2914,7 @@
  {
  	/*
  	 * Cancel the packet transmission if it's still queued.  That
-@@ -116,9 +114,8 @@ fw_cancel_transaction(struct fw_card *card,
+@@ -116,9 +114,8 @@ fw_cancel_transaction(struct fw_card *ca
  }
  EXPORT_SYMBOL(fw_cancel_transaction);
  
@@ -3187,7 +2926,7 @@
  {
  	struct fw_transaction *t =
  	    container_of(packet, struct fw_transaction, packet);
-@@ -151,8 +148,7 @@ transmit_complete_callback(struct fw_packet *packet,
+@@ -151,8 +148,7 @@ transmit_complete_callback(struct fw_pac
  	}
  }
  
@@ -3197,7 +2936,7 @@
  		int destination_id, int source_id, int generation, int speed,
  		unsigned long long offset, void *payload, size_t length)
  {
-@@ -247,12 +243,10 @@ fw_fill_request(struct fw_packet *packet, int tcode, int tlabel,
+@@ -247,12 +243,10 @@ fw_fill_request(struct fw_packet *packet
   * @param callback_data pointer to arbitrary data, which will be
   *   passed to the callback
   */
@@ -3214,7 +2953,7 @@
  {
  	unsigned long flags;
  	int tlabel;
-@@ -322,8 +316,8 @@ static void transaction_callback(struct fw_card *card, int rcode,
+@@ -322,8 +316,8 @@ static void transaction_callback(struct 
   * Returns the RCODE.
   */
  int fw_run_transaction(struct fw_card *card, int tcode, int destination_id,
@@ -3225,7 +2964,7 @@
  {
  	struct transaction_callback_data d;
  	struct fw_transaction t;
-@@ -399,9 +393,8 @@ void fw_flush_transactions(struct fw_card *card)
+@@ -399,9 +393,8 @@ void fw_flush_transactions(struct fw_car
  	}
  }
  
@@ -3237,7 +2976,7 @@
  {
  	struct fw_address_handler *handler;
  
-@@ -414,9 +407,8 @@ lookup_overlapping_address_handler(struct list_head *list,
+@@ -414,9 +407,8 @@ lookup_overlapping_address_handler(struc
  	return NULL;
  }
  
@@ -3249,7 +2988,7 @@
  {
  	struct fw_address_handler *handler;
  
-@@ -449,36 +441,44 @@ const struct fw_address_region fw_unit_space_region =
+@@ -449,36 +441,44 @@ const struct fw_address_region fw_unit_s
  #endif  /*  0  */
  
  /**
@@ -3306,7 +3045,7 @@
  		} else {
  			list_add_tail(&handler->link, &address_handler_list);
  			ret = 0;
-@@ -493,12 +493,7 @@ fw_core_add_address_handler(struct fw_address_handler *handler,
+@@ -493,12 +493,7 @@ fw_core_add_address_handler(struct fw_ad
  EXPORT_SYMBOL(fw_core_add_address_handler);
  
  /**
@@ -3332,7 +3071,7 @@
  {
  	struct fw_request *request;
  
-@@ -528,9 +522,8 @@ free_response_callback(struct fw_packet *packet,
+@@ -528,9 +522,8 @@ free_response_callback(struct fw_packet 
  	kfree(request);
  }
  
@@ -3344,7 +3083,7 @@
  {
  	int tcode, tlabel, extended_tcode, source, destination;
  
-@@ -588,8 +581,7 @@ fw_fill_response(struct fw_packet *response, u32 *request_header,
+@@ -588,8 +581,7 @@ fw_fill_response(struct fw_packet *respo
  }
  EXPORT_SYMBOL(fw_fill_response);
  
@@ -3365,7 +3104,7 @@
  {
  	/* unified transaction or broadcast transaction: don't respond */
  	if (request->ack != ACK_PENDING ||
-@@ -670,8 +662,7 @@ fw_send_response(struct fw_card *card, struct fw_request *request, int rcode)
+@@ -670,8 +662,7 @@ fw_send_response(struct fw_card *card, s
  }
  EXPORT_SYMBOL(fw_send_response);
  
@@ -3375,7 +3114,7 @@
  {
  	struct fw_address_handler *handler;
  	struct fw_request *request;
-@@ -719,8 +710,7 @@ fw_core_handle_request(struct fw_card *card, struct fw_packet *p)
+@@ -719,8 +710,7 @@ fw_core_handle_request(struct fw_card *c
  }
  EXPORT_SYMBOL(fw_core_handle_request);
  
@@ -3385,7 +3124,7 @@
  {
  	struct fw_transaction *t;
  	unsigned long flags;
-@@ -793,12 +783,10 @@ static const struct fw_address_region topology_map_region =
+@@ -793,12 +783,10 @@ static const struct fw_address_region to
  	{ .start = CSR_REGISTER_BASE | CSR_TOPOLOGY_MAP,
  	  .end   = CSR_REGISTER_BASE | CSR_TOPOLOGY_MAP_END, };
  
@@ -3402,7 +3141,7 @@
  {
  	int i, start, end;
  	__be32 *map;
-@@ -832,12 +820,10 @@ static const struct fw_address_region registers_region =
+@@ -832,12 +820,10 @@ static const struct fw_address_region re
  	{ .start = CSR_REGISTER_BASE,
  	  .end   = CSR_REGISTER_BASE | CSR_CONFIG_ROM, };
  
@@ -3419,7 +3158,7 @@
  {
  	int reg = offset & ~CSR_REGISTER_BASE;
  	unsigned long long bus_time;
-@@ -939,11 +925,11 @@ static struct fw_descriptor model_id_descriptor = {
+@@ -939,11 +925,11 @@ static struct fw_descriptor model_id_des
  
  static int __init fw_core_init(void)
  {
@@ -3459,10 +3198,9 @@
  
  	return 0;
  }
-diff --git a/drivers/firewire/fw-transaction.h b/drivers/firewire/fw-transaction.h
-index c9ab12a..212a102 100644
---- a/drivers/firewire/fw-transaction.h
-+++ b/drivers/firewire/fw-transaction.h
+diff -Naurp linux-2.6-git/drivers/firewire/fw-transaction.h firewire-git/drivers/firewire/fw-transaction.h
+--- linux-2.6-git/drivers/firewire/fw-transaction.h	2009-01-30 13:39:02.992772636 -0500
++++ firewire-git/drivers/firewire/fw-transaction.h	2009-01-30 13:35:51.862647087 -0500
 @@ -82,14 +82,14 @@
  #define CSR_SPEED_MAP			0x2000
  #define CSR_SPEED_MAP_END		0x3000
@@ -3480,7 +3218,7 @@
  {
  	u32    *dst = _dst;
  	__be32 *src = _src;
-@@ -99,8 +99,7 @@ fw_memcpy_from_be32(void *_dst, void *_src, size_t size)
+@@ -99,8 +99,7 @@ fw_memcpy_from_be32(void *_dst, void *_s
  		dst[i] = be32_to_cpu(src[i]);
  }
  
@@ -3490,7 +3228,7 @@
  {
  	fw_memcpy_from_be32(_dst, _src, size);
  }
-@@ -125,8 +124,7 @@ typedef void (*fw_packet_callback_t)(struct fw_packet *packet,
+@@ -125,8 +124,7 @@ typedef void (*fw_packet_callback_t)(str
  				     struct fw_card *card, int status);
  
  typedef void (*fw_transaction_callback_t)(struct fw_card *card, int rcode,
@@ -3500,7 +3238,7 @@
  					  void *callback_data);
  
  /*
-@@ -141,12 +139,6 @@ typedef void (*fw_address_callback_t)(struct fw_card *card,
+@@ -141,12 +139,6 @@ typedef void (*fw_address_callback_t)(st
  				      void *data, size_t length,
  				      void *callback_data);
  
@@ -3534,23 +3272,7 @@
  struct fw_address_region {
  	u64 start;
  	u64 end;
-@@ -276,6 +261,15 @@ static inline void fw_card_put(struct fw_card *card)
- extern void fw_schedule_bm_work(struct fw_card *card, unsigned long delay);
- 
- /*
-+ * Check whether new_generation is the immediate successor of old_generation.
-+ * Take counter roll-over at 255 (as per to OHCI) into account.
-+ */
-+static inline bool is_next_generation(int new_generation, int old_generation)
-+{
-+	return (new_generation & 0xff) == ((old_generation + 1) & 0xff);
-+}
-+
-+/*
-  * The iso packet format allows for an immediate header/payload part
-  * stored in 'header' immediately after the packet info plus an
-  * indirect payload part that is pointer to by the 'payload' field.
-@@ -306,10 +300,8 @@ struct fw_iso_packet {
+@@ -315,10 +300,8 @@ struct fw_iso_packet {
  struct fw_iso_context;
  
  typedef void (*fw_iso_callback_t)(struct fw_iso_context *context,
@@ -3563,7 +3285,7 @@
  
  /*
   * An iso buffer is just a set of pages mapped for DMA in the
-@@ -335,36 +327,25 @@ struct fw_iso_context {
+@@ -344,36 +327,25 @@ struct fw_iso_context {
  	void *callback_data;
  };
  
@@ -3594,9 +3316,6 @@
 -int
 -fw_iso_context_start(struct fw_iso_context *ctx,
 -		     int cycle, int sync, int tags);
--
--int
--fw_iso_context_stop(struct fw_iso_context *ctx);
 +int fw_iso_buffer_init(struct fw_iso_buffer *buffer, struct fw_card *card,
 +		       int page_count, enum dma_data_direction direction);
 +int fw_iso_buffer_map(struct fw_iso_buffer *buffer, struct vm_area_struct *vma);
@@ -3613,13 +3332,15 @@
 +			 int cycle, int sync, int tags);
 +int fw_iso_context_stop(struct fw_iso_context *ctx);
 +void fw_iso_context_destroy(struct fw_iso_context *ctx);
-+
+ 
+-int
+-fw_iso_context_stop(struct fw_iso_context *ctx);
 +void fw_iso_resource_manage(struct fw_card *card, int generation,
 +		u64 channels_mask, int *channel, int *bandwidth, bool allocate);
  
  struct fw_card_driver {
  	/*
-@@ -406,7 +387,7 @@ struct fw_card_driver {
+@@ -415,7 +387,7 @@ struct fw_card_driver {
  
  	struct fw_iso_context *
  	(*allocate_iso_context)(struct fw_card *card,
@@ -3628,7 +3349,7 @@
  	void (*free_iso_context)(struct fw_iso_context *ctx);
  
  	int (*start_iso)(struct fw_iso_context *ctx,
-@@ -420,24 +401,18 @@ struct fw_card_driver {
+@@ -429,24 +401,18 @@ struct fw_card_driver {
  	int (*stop_iso)(struct fw_iso_context *ctx);
  };
  
@@ -3658,7 +3379,7 @@
  void fw_send_phy_config(struct fw_card *card,
  			int node_id, int generation, int gap_count);
  
-@@ -445,29 +420,18 @@ void fw_send_phy_config(struct fw_card *card,
+@@ -454,29 +420,18 @@ void fw_send_phy_config(struct fw_card *
   * Called by the topology code to inform the device code of node
   * activity; found, lost, or updated nodes.
   */
@@ -3698,10 +3419,8 @@
 +void fw_core_handle_response(struct fw_card *card, struct fw_packet *packet);
  
  #endif /* __fw_transaction_h */
-diff --git a/include/linux/firewire-cdev.h b/include/linux/firewire-cdev.h
-index 4d078e9..2e35379 100644
---- a/include/linux/firewire-cdev.h
-+++ b/include/linux/firewire-cdev.h
+--- linux-2.6-git/include/linux/firewire-cdev.h	2008-11-04 11:19:21.000000000 -0500
++++ firewire-git/include/linux/firewire-cdev.h	2009-01-30 13:35:54.327647015 -0500
 @@ -25,10 +25,12 @@
  #include <linux/types.h>
  #include <linux/firewire-constants.h>

linux-2.6.29-lirc.patch:

Index: linux-2.6.29-lirc.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6.29-lirc.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- linux-2.6.29-lirc.patch	28 Jan 2009 04:51:37 -0000	1.2
+++ linux-2.6.29-lirc.patch	30 Jan 2009 19:15:58 -0000	1.3
@@ -1,5 +1,3 @@
- drivers/hid/hid-core.c                |    2 +
- drivers/hid/hid-ids.h                 |    2 +
  drivers/input/Kconfig                 |    2 +
  drivers/input/Makefile                |    2 +
  drivers/input/lirc/Kconfig            |  118 +++
@@ -25,7 +23,7 @@
  drivers/input/lirc/lirc_ttusbir.c     |  396 ++++++++++
  drivers/input/lirc/lirc_zilog.c       | 1382 +++++++++++++++++++++++++++++++++
 
- 26 files changed, 14507 insertions(+), 0 deletions(-)
+ 24 files changed, 14503 insertions(+), 0 deletions(-)
 
 diff --git a/drivers/input/Kconfig b/drivers/input/Kconfig
 index 5f9d860..2ba0904 100644
@@ -14681,29 +14679,3 @@
 +
 +module_param(disable_tx, bool, 0644);
 +MODULE_PARM_DESC(disable_tx, "Disable the IR transmitter device");
-diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
-index 5d7640e..7001c31 100644
---- a/drivers/hid/hid-core.c
-+++ b/drivers/hid/hid-core.c
-@@ -1606,6 +1606,8 @@ static const struct hid_device_id hid_ignore_list[] = {
- 	{ HID_USB_DEVICE(USB_VENDOR_ID_SOUNDGRAPH, USB_DEVICE_ID_SOUNDGRAPH_IMON_LCD) },
- 	{ HID_USB_DEVICE(USB_VENDOR_ID_SOUNDGRAPH, USB_DEVICE_ID_SOUNDGRAPH_IMON_LCD2) },
- 	{ HID_USB_DEVICE(USB_VENDOR_ID_SOUNDGRAPH, USB_DEVICE_ID_SOUNDGRAPH_IMON_LCD3) },
-+	{ HID_USB_DEVICE(USB_VENDOR_ID_SOUNDGRAPH, USB_DEVICE_ID_SOUNDGRAPH_IMON_LCD4) },
-+	{ HID_USB_DEVICE(USB_VENDOR_ID_SOUNDGRAPH, USB_DEVICE_ID_SOUNDGRAPH_IMON_LCD5) },
- 	{ HID_USB_DEVICE(USB_VENDOR_ID_TENX, USB_DEVICE_ID_TENX_IBUDDY1) },
- 	{ HID_USB_DEVICE(USB_VENDOR_ID_TENX, USB_DEVICE_ID_TENX_IBUDDY2) },
- 	{ HID_USB_DEVICE(USB_VENDOR_ID_THRUSTMASTER, 0xb300) },
-diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
-index acc1abc..e899f51 100644
---- a/drivers/hid/hid-ids.h
-+++ b/drivers/hid/hid-ids.h
-@@ -362,6 +362,8 @@
- #define USB_DEVICE_ID_SOUNDGRAPH_IMON_LCD	0x0038
- #define USB_DEVICE_ID_SOUNDGRAPH_IMON_LCD2	0x0036
- #define USB_DEVICE_ID_SOUNDGRAPH_IMON_LCD3	0x0034
-+#define USB_DEVICE_ID_SOUNDGRAPH_IMON_LCD4	0x0044
-+#define USB_DEVICE_ID_SOUNDGRAPH_IMON_LCD5	0x0045
- 
- #define USB_VENDOR_ID_SUN		0x0430
- #define USB_DEVICE_ID_RARITAN_KVM_DONGLE	0xcdab



From pkgdb at fedoraproject.org  Fri Jan 30 19:23:06 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 19:23:06 +0000
Subject: [pkgdb] WebKit had acl change status
Message-ID: <20090130192306.6EC4B208484@bastion.fedora.phx.redhat.com>

pgordon has set the watchbugzilla acl on WebKit (Fedora devel) to Approved for mso

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/WebKit



From pkgdb at fedoraproject.org  Fri Jan 30 19:23:16 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 19:23:16 +0000
Subject: [pkgdb] WebKit had acl change status
Message-ID: <20090130192317.0165D2084B6@bastion.fedora.phx.redhat.com>

pgordon has set the watchcommits acl on WebKit (Fedora 10) to Approved for mso

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/WebKit



From pkgdb at fedoraproject.org  Fri Jan 30 19:23:08 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 19:23:08 +0000
Subject: [pkgdb] WebKit had acl change status
Message-ID: <20090130192308.8E596208493@bastion.fedora.phx.redhat.com>

pgordon has set the watchcommits acl on WebKit (Fedora devel) to Approved for mso

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/WebKit



From pkgdb at fedoraproject.org  Fri Jan 30 19:23:19 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 19:23:19 +0000
Subject: [pkgdb] WebKit had acl change status
Message-ID: <20090130192319.6E1C42084BD@bastion.fedora.phx.redhat.com>

pgordon has set the watchbugzilla acl on WebKit (Fedora 10) to Approved for mso

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/WebKit



From pkgdb at fedoraproject.org  Fri Jan 30 19:26:20 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 19:26:20 +0000
Subject: [pkgdb] WebKit had acl change status
Message-ID: <20090130192620.E2307208484@bastion.fedora.phx.redhat.com>

pgordon has set the watchcommits acl on WebKit (Fedora 10) to Obsolete for mso

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/WebKit



From cwickert at fedoraproject.org  Fri Jan 30 19:57:08 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Fri, 30 Jan 2009 19:57:08 +0000 (UTC)
Subject: rpms/xfce-mcs-manager/F-10 xfce-mcs-manager.spec,1.19,1.20
Message-ID: <20090130195708.97A0870117@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/xfce-mcs-manager/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11725

Modified Files:
	xfce-mcs-manager.spec 
Log Message:
* Fri Jan 30 2009 Christoph Wickert <cwickert at fedoraproject.org> - 4.4.3-2
- Own %{_libdir}/xfce4/modules (#474587)



Index: xfce-mcs-manager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfce-mcs-manager/F-10/xfce-mcs-manager.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- xfce-mcs-manager.spec	27 Oct 2008 16:08:36 -0000	1.19
+++ xfce-mcs-manager.spec	30 Jan 2009 19:56:38 -0000	1.20
@@ -1,7 +1,7 @@
 Summary: Multi channel settings manager
 Name: xfce-mcs-manager
 Version: 4.4.3
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: LGPLv2+
 URL: http://www.xfce.org/
 Source0: http://www.xfce.org/archive/xfce-%{version}/src/xfce-mcs-manager-%{version}.tar.bz2
@@ -39,7 +39,7 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT/%{_libdir}/xfce4
+mkdir -p $RPM_BUILD_ROOT/%{_libdir}/xfce4/modules
 mkdir -p $RPM_BUILD_ROOT/%{_datadir}/xfce4
 mkdir -p $RPM_BUILD_ROOT/%{_datadir}/xfce4/doc
 
@@ -59,6 +59,7 @@
 %{_bindir}/*
 %{_datadir}/applications/*
 %dir %{_libdir}/xfce4
+%dir %{_libdir}/xfce4/modules
 %dir %{_datadir}/xfce4
 %dir %{_datadir}/xfce4/doc
 
@@ -68,6 +69,9 @@
 %{_includedir}/xfce4/xfce-mcs-manager
 
 %changelog
+* Fri Jan 30 2009 Christoph Wickert <cwickert at fedoraproject.org> - 4.4.3-2
+- Own %%{_libdir}/xfce4/modules (#474587)
+
 * Mon Oct 27 2008 Christoph Wickert <cwickert at fedoraproject.org> - 4.4.3-1
 - Update to 4.4.3
 - BuildRequire intltool



From sdz at fedoraproject.org  Fri Jan 30 20:00:36 2009
From: sdz at fedoraproject.org (Sebastian Dziallas)
Date: Fri, 30 Jan 2009 20:00:36 +0000 (UTC)
Subject: comps comps-f10.xml.in,1.212,1.213
Message-ID: <20090130200036.C36FF70117@cvs1.fedora.phx.redhat.com>

Author: sdz

Update of /cvs/pkgs/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12320

Modified Files:
	comps-f10.xml.in 
Log Message:
add further sugar activities



Index: comps-f10.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f10.xml.in,v
retrieving revision 1.212
retrieving revision 1.213
diff -u -r1.212 -r1.213
--- comps-f10.xml.in	28 Jan 2009 19:48:47 -0000	1.212
+++ comps-f10.xml.in	30 Jan 2009 20:00:06 -0000	1.213
@@ -4244,10 +4244,15 @@
       <packagereq type="default">sugar-browse</packagereq>
       <packagereq type="default">sugar-calculator</packagereq>
       <packagereq type="default">sugar-chat</packagereq>
+      <packagereq type="default">sugar-connect</packagereq>
+      <packagereq type="default">sugar-distance</packagereq>
+      <packagereq type="default">sugar-imageviewer</packagereq>
+      <packagereq type="default">sugar-implode</packagereq>
       <packagereq type="default">sugar-jukebox</packagereq>
       <packagereq type="default">sugar-log</packagereq>
       <packagereq type="default">sugar-memorize</packagereq>
       <packagereq type="default">sugar-moon</packagereq>
+      <packagereq type="default">sugar-speak</packagereq>
       <packagereq type="default">sugar-terminal</packagereq>
       <packagereq type="default">sugar-turtleart</packagereq>
       <packagereq type="default">sugar-write</packagereq>



From nim at fedoraproject.org  Fri Jan 30 20:04:57 2009
From: nim at fedoraproject.org (Nicolas Mailhot)
Date: Fri, 30 Jan 2009 20:04:57 +0000 (UTC)
Subject: rpms/apanov-heuristica-fonts/devel .cvsignore, 1.2,
	1.3 apanov-heuristica-fonts.spec, 1.2, 1.3 import.log, 1.2,
	1.3 sources, 1.2, 1.3
Message-ID: <20090130200457.DDF4A70117@cvs1.fedora.phx.redhat.com>

Author: nim

Update of /cvs/extras/rpms/apanov-heuristica-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13182/devel

Modified Files:
	.cvsignore apanov-heuristica-fonts.spec import.log sources 
Log Message:
20090125


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/apanov-heuristica-fonts/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	16 Nov 2008 21:40:37 -0000	1.2
+++ .cvsignore	30 Jan 2009 20:04:27 -0000	1.3
@@ -1 +1 @@
-heuristica-src-20081109.tar.bz2
+heuristica-src-20090125.tar.bz2


Index: apanov-heuristica-fonts.spec
===================================================================
RCS file: /cvs/extras/rpms/apanov-heuristica-fonts/devel/apanov-heuristica-fonts.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- apanov-heuristica-fonts.spec	17 Dec 2008 19:13:24 -0000	1.2
+++ apanov-heuristica-fonts.spec	30 Jan 2009 20:04:27 -0000	1.3
@@ -4,8 +4,8 @@
 %define archivename heuristica-src-%{version}
 
 Name:    %{fontname}-fonts
-Version: 20081109
-Release: 3%{?dist}
+Version: 20090125
+Release: 1%{?dist}
 Summary: Heuristica font
 
 Group:     User Interface/X
@@ -21,7 +21,7 @@
 Requires:      fontpackages-filesystem
 
 %description
-Heuristica is a serif latin & cyrillic font, derived from the "Adobe Utopia??"
+Heuristica is a serif latin & cyrillic font, derived from the ???Adobe Utopia???
 font that was released to the TeX Users Group under a liberal license.
 
 
@@ -59,6 +59,9 @@
 
 
 %changelog
+*Fri Jan 30 2009 <nicolas.mailhot at laposte.net>
+- 20090125-1
+
 * Sun Nov 23 2008 <nicolas.mailhot at laposte.net>
 - 20081109-3
 ??? ???rpm-fonts??? renamed to ???fontpackages???


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/apanov-heuristica-fonts/devel/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	17 Dec 2008 19:13:24 -0000	1.2
+++ import.log	30 Jan 2009 20:04:27 -0000	1.3
@@ -1,2 +1,3 @@
 apanov-heuristica-fonts-20081109-1_fc11:HEAD:apanov-heuristica-fonts-20081109-1.fc11.src.rpm:1226871596
 apanov-heuristica-fonts-20081109-3_fc11:HEAD:apanov-heuristica-fonts-20081109-3.fc11.src.rpm:1229540973
+apanov-heuristica-fonts-20090125-1_fc11:HEAD:apanov-heuristica-fonts-20090125-1.fc11.src.rpm:1233345796


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/apanov-heuristica-fonts/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	16 Nov 2008 21:40:37 -0000	1.2
+++ sources	30 Jan 2009 20:04:27 -0000	1.3
@@ -1 +1 @@
-05cba594f95ebdd6daa6d8c1c8ca42db  heuristica-src-20081109.tar.bz2
+316d7eaf64b4deb8e39eaeed76eaf5d6  heuristica-src-20090125.tar.bz2



From notting at fedoraproject.org  Fri Jan 30 20:09:03 2009
From: notting at fedoraproject.org (Bill Nottingham)
Date: Fri, 30 Jan 2009 20:09:03 +0000 (UTC)
Subject: comps comps-f11.xml.in,1.92,1.93
Message-ID: <20090130200903.7942670117@cvs1.fedora.phx.redhat.com>

Author: notting

Update of /cvs/extras/comps
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13856

Modified Files:
	comps-f11.xml.in 
Log Message:
revert prior change, it doesn't work



Index: comps-f11.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-f11.xml.in,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -r1.92 -r1.93
--- comps-f11.xml.in	30 Jan 2009 16:10:19 -0000	1.92
+++ comps-f11.xml.in	30 Jan 2009 20:08:33 -0000	1.93
@@ -212,6 +212,7 @@
       <packagereq type="default">dump</packagereq>
       <packagereq type="default">eject</packagereq>
       <packagereq type="default">fbset</packagereq>
+      <packagereq type="default">fedora-release-notes</packagereq>
       <packagereq type="default">finger</packagereq>
       <packagereq type="default">fprintd-pam</packagereq>
       <packagereq type="default">ftp</packagereq>
@@ -266,7 +267,6 @@
       <packagereq type="default">sysreport</packagereq>
       <packagereq type="default">system-config-firewall-tui</packagereq>
       <packagereq type="default">system-config-network-tui</packagereq>
-      <packagereq type="default">system-release-notes</packagereq>
       <packagereq type="default">talk</packagereq>
       <packagereq type="default">tcpdump</packagereq>
       <packagereq type="default">tcp_wrappers</packagereq>



From cwickert at fedoraproject.org  Fri Jan 30 20:09:43 2009
From: cwickert at fedoraproject.org (Christoph Wickert)
Date: Fri, 30 Jan 2009 20:09:43 +0000 (UTC)
Subject: rpms/xfce-mcs-manager/F-10 xfce-mcs-manager.spec,1.20,1.21
Message-ID: <20090130200943.0E50970117@cvs1.fedora.phx.redhat.com>

Author: cwickert

Update of /cvs/pkgs/rpms/xfce-mcs-manager/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14025

Modified Files:
	xfce-mcs-manager.spec 
Log Message:
fix release in order to not break the obsoletes in xfce4-settings


Index: xfce-mcs-manager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfce-mcs-manager/F-10/xfce-mcs-manager.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- xfce-mcs-manager.spec	30 Jan 2009 19:56:38 -0000	1.20
+++ xfce-mcs-manager.spec	30 Jan 2009 20:09:12 -0000	1.21
@@ -1,7 +1,7 @@
 Summary: Multi channel settings manager
 Name: xfce-mcs-manager
 Version: 4.4.3
-Release: 2%{?dist}
+Release: 1%{?dist}.1
 License: LGPLv2+
 URL: http://www.xfce.org/
 Source0: http://www.xfce.org/archive/xfce-%{version}/src/xfce-mcs-manager-%{version}.tar.bz2
@@ -69,7 +69,7 @@
 %{_includedir}/xfce4/xfce-mcs-manager
 
 %changelog
-* Fri Jan 30 2009 Christoph Wickert <cwickert at fedoraproject.org> - 4.4.3-2
+* Fri Jan 30 2009 Christoph Wickert <cwickert at fedoraproject.org> - 4.4.3-1.1
 - Own %%{_libdir}/xfce4/modules (#474587)
 
 * Mon Oct 27 2008 Christoph Wickert <cwickert at fedoraproject.org> - 4.4.3-1



From nim at fedoraproject.org  Fri Jan 30 20:14:40 2009
From: nim at fedoraproject.org (Nicolas Mailhot)
Date: Fri, 30 Jan 2009 20:14:40 +0000 (UTC)
Subject: rpms/xgridfit/devel .cvsignore, 1.5, 1.6 import.log, 1.2,
	1.3 sources, 1.5, 1.6 xgridfit.spec, 1.7, 1.8
Message-ID: <20090130201440.7054770117@cvs1.fedora.phx.redhat.com>

Author: nim

Update of /cvs/extras/rpms/xgridfit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15010/devel

Modified Files:
	.cvsignore import.log sources xgridfit.spec 
Log Message:
1.17


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xgridfit/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	14 Nov 2008 10:43:39 -0000	1.5
+++ .cvsignore	30 Jan 2009 20:14:09 -0000	1.6
@@ -1 +1 @@
-xgridfit-1-11a.tar.gz
+xgridfit-1-17.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/xgridfit/devel/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	14 Nov 2008 10:43:39 -0000	1.2
+++ import.log	30 Jan 2009 20:14:09 -0000	1.3
@@ -1,2 +1,3 @@
 xgridfit-1_9-1_fc10:HEAD:xgridfit-1.9-1.fc10.src.rpm:1220282275
 xgridfit-1_11-1_a_fc11:HEAD:xgridfit-1.11-1.a.fc11.src.rpm:1226659397
+xgridfit-1_17-1_fc11:HEAD:xgridfit-1.17-1.fc11.src.rpm:1233346359


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xgridfit/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	14 Nov 2008 10:43:39 -0000	1.5
+++ sources	30 Jan 2009 20:14:09 -0000	1.6
@@ -1 +1 @@
-df07408852d577b1df37d4e4c1361735  xgridfit-1-11a.tar.gz
+82b4f14d1bb1fb89a38da0cff19cb05e  xgridfit-1-17.tar.gz


Index: xgridfit.spec
===================================================================
RCS file: /cvs/extras/rpms/xgridfit/devel/xgridfit.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- xgridfit.spec	14 Nov 2008 10:43:39 -0000	1.7
+++ xgridfit.spec	30 Jan 2009 20:14:09 -0000	1.8
@@ -1,8 +1,8 @@
-%define archivever 1-11a
+%define archivever 1-17
 
 Name:    xgridfit
-Version: 1.11
-Release: 1.a%{?dist}
+Version: 1.17
+Release: 1%{?dist}
 Summary: Font hinting tool
 
 # This is where we drop fontforge
@@ -17,7 +17,7 @@
 Requires:        %{_bindir}/xsltproc
 
 %description
-Xgridfit is a high-level, XML-based language for gridfitting, or "hinting",
+Xgridfit is a high-level, XML-based language for gridfitting, or ???hinting???,
 fonts. The Xgridfit program compiles an XML source file into tables and
 instructions that relate to the gridfitting of glyphs. Xgridfit does not
 insert these elements into a font itself, but rather relies on FontForge, the
@@ -84,6 +84,9 @@
 
 
 %changelog
+* Fri Jan 30 2009 <nicolas.mailhot at laposte.net>
+- 1.17-1
+
 * Fri Nov 14 2008 <nicolas.mailhot at laposte.net>
 - 1.11-1.a
 ??? update for F11 cycle



From mbarnes at fedoraproject.org  Fri Jan 30 20:47:41 2009
From: mbarnes at fedoraproject.org (Matthew Barnes)
Date: Fri, 30 Jan 2009 20:47:41 +0000 (UTC)
Subject: rpms/gtkhtml3/F-10 .cvsignore, 1.86, 1.87 gtkhtml3.spec, 1.137,
	1.138 sources, 1.86, 1.87
Message-ID: <20090130204741.D5E6D70117@cvs1.fedora.phx.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/gtkhtml3/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21130

Modified Files:
	.cvsignore gtkhtml3.spec sources 
Log Message:

* Fri Jan 30 2009 Matthew Barnes <mbarnes at redhat.com> - 3.24.4-1.fc10
- Update to 3.24.4



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gtkhtml3/F-10/.cvsignore,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -r1.86 -r1.87
--- .cvsignore	12 Jan 2009 19:49:04 -0000	1.86
+++ .cvsignore	30 Jan 2009 20:47:11 -0000	1.87
@@ -1 +1 @@
-gtkhtml-3.24.3.tar.bz2
+gtkhtml-3.24.4.tar.bz2


Index: gtkhtml3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtkhtml3/F-10/gtkhtml3.spec,v
retrieving revision 1.137
retrieving revision 1.138
diff -u -r1.137 -r1.138
--- gtkhtml3.spec	12 Jan 2009 19:49:04 -0000	1.137
+++ gtkhtml3.spec	30 Jan 2009 20:47:11 -0000	1.138
@@ -9,7 +9,7 @@
 ### Abstract ###
 
 Name: gtkhtml3
-Version: 3.24.3
+Version: 3.24.4
 Release: 1%{?dist}
 License: LGPLv2+ and GPLv2
 Group: System Environment/Libraries
@@ -123,6 +123,9 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Fri Jan 30 2009 Matthew Barnes <mbarnes at redhat.com> - 3.24.4-1.fc10
+- Update to 3.24.4
+
 * Mon Jan 22 2009 Matthew Barnes <mbarnes at redhat.com> - 3.24.3-1.fc10
 - Update to 3.24.3
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gtkhtml3/F-10/sources,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -r1.86 -r1.87
--- sources	12 Jan 2009 19:49:04 -0000	1.86
+++ sources	30 Jan 2009 20:47:11 -0000	1.87
@@ -1 +1 @@
-d492359012c0a48227bba467492cbf08  gtkhtml-3.24.3.tar.bz2
+7b6786e77dffe9b2db8a27e3d04e70ff  gtkhtml-3.24.4.tar.bz2



From rdieter at fedoraproject.org  Fri Jan 30 20:48:24 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 30 Jan 2009 20:48:24 +0000 (UTC)
Subject: rpms/kdelibs/devel kdelibs-4.2.0-kded-kdirwatch.patch, NONE,
	1.1 kdelibs.spec, 1.426, 1.427
Message-ID: <20090130204824.9C68970117@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdelibs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21349

Modified Files:
	kdelibs.spec 
Added Files:
	kdelibs-4.2.0-kded-kdirwatch.patch 
Log Message:
* Fri Jan 30 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.0-7
- kded/kdirwatch patch (kde#182472)


kdelibs-4.2.0-kded-kdirwatch.patch:

--- NEW FILE kdelibs-4.2.0-kded-kdirwatch.patch ---
--- branches/KDE/4.2/kdelibs/kded/kded.cpp	2009/01/12 21:32:29	910250
+++ branches/KDE/4.2/kdelibs/kded/kded.cpp	2009/01/30 20:28:25	918838
@@ -115,9 +115,8 @@
    KToolInvocation::kdeinitExecWait( "kdontchangethehostname", args );
 }
 
-Kded::Kded(bool checkUpdates)
-  : b_checkUpdates(checkUpdates),
-    m_needDelayedCheck(false)
+Kded::Kded()
+  : m_needDelayedCheck(false)
 {
   _self = this;
 
@@ -280,7 +279,7 @@
     KSharedConfig::Ptr config = KGlobal::config();
     // Ensure the service exists.
     KService::Ptr service = KService::serviceByDesktopPath("kded/"+obj+".desktop");
-    if (!service) 
+    if (!service)
         return;
     KConfigGroup cg(config, QString("Module-%1").arg(service->desktopEntryName()));
     cg.writeEntry("autoload", autoload);
@@ -290,7 +289,7 @@
 bool Kded::isModuleAutoloaded(const QString &obj) const
 {
     KService::Ptr s = KService::serviceByDesktopPath("kded/"+obj+".desktop");
-    if (!s) 
+    if (!s)
         return false;
     return isModuleAutoloaded(s);
 }
@@ -307,7 +306,7 @@
 bool Kded::isModuleLoadedOnDemand(const QString &obj) const
 {
     KService::Ptr s = KService::serviceByDesktopPath("kded/"+obj+".desktop");
-    if (!s) 
+    if (!s)
         return false;
     return isModuleLoadedOnDemand(s);
 }
@@ -446,7 +445,7 @@
 
 void Kded::updateDirWatch()
 {
-  if (!b_checkUpdates) return;
+  if (!bCheckUpdates) return;
 
   delete m_pDirWatch;
   m_pDirWatch = new KDirWatch;
@@ -471,7 +470,7 @@
 {
   delete KSycoca::self();
 
-  if (!b_checkUpdates) return;
+  if (!bCheckUpdates) return;
 
   if (delayedCheck) return;
 
@@ -921,7 +920,7 @@
      checkStamps = cg.readEntry("CheckFileStamps", true);
      delayedCheck = cg.readEntry("DelayedCheck", false);
 
-     Kded *kded = new Kded(false); // Build data base
+     Kded *kded = new Kded(); // Build data base
 
      KDE_signal(SIGTERM, sighandler);
      KDE_signal(SIGHUP, sighandler);
--- branches/KDE/4.2/kdelibs/kded/kded.h	2009/01/06 17:13:38	906699
+++ branches/KDE/4.2/kdelibs/kded/kded.h	2009/01/30 20:28:25	918838
@@ -41,7 +41,7 @@
 {
   Q_OBJECT
 public:
-   Kded(bool checkUpdates);
+   Kded();
    virtual ~Kded();
 
    static Kded *self() { return _self;}
@@ -186,8 +186,6 @@
     */
    KDirWatch* m_pDirWatch;
 
-   bool b_checkUpdates;
-
    /**
     * When a desktop file is updated, a timer is started (5 sec)
     * before rebuilding the binary - so that multiple updates result


Index: kdelibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.426
retrieving revision 1.427
diff -u -r1.426 -r1.427
--- kdelibs.spec	30 Jan 2009 17:11:19 -0000	1.426
+++ kdelibs.spec	30 Jan 2009 20:47:54 -0000	1.427
@@ -1,6 +1,6 @@
 Summary: K Desktop Environment 4 - Libraries
 Version: 4.2.0
-Release: 6%{?dist}
+Release: 7%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs
@@ -86,6 +86,7 @@
 Patch110: kdelibs-4.2.1-kde#917170.patch
 Patch111: kdelibs-4.2.1-kde#918403.patch
 Patch112: kdelibs-4.2.1-kde#918654.patch
+Patch113: kdelibs-4.2.0-kded-kdirwatch.patch
 
 BuildRequires: qt4-devel >= 4.4.0
 # qt4%{_?_isa} isn't provided yet -- Rex
@@ -218,6 +219,7 @@
 %patch110 -p0 -b .kde#917170
 %patch111 -p0 -b .kde#918403
 %patch112 -p0 -b .kde#918654
+%patch113 -p4 -b .kde#182472
 
 
 %build
@@ -228,7 +230,7 @@
 popd
 
 %if 0%{?rest}
-make %{?_smp_mflags} -C %{_target_platform} VERBOSE=1
+make %{?_smp_mflags} -C %{_target_platform}
 %endif
 
 # build apidocs
@@ -380,6 +382,9 @@
 
 
 %changelog
+* Fri Jan 30 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.0-7
+- kded/kdirwatch patch (kde#182472)
+
 * Fri Jan 30 2009 Luk???? Tinkl <ltinkl at redhat.com> 4.2.0-6
 - Emit the correct FilesRemoved signal if the job was aborted in the middle of its operation, 
   otherwise it can result in confusion and data loss (overwriting files with files



From rdieter at fedoraproject.org  Fri Jan 30 20:49:08 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 30 Jan 2009 20:49:08 +0000 (UTC)
Subject: rpms/kdelibs/F-10 kdelibs-4.2.0-kded-kdirwatch.patch, NONE,
	1.1 kdelibs.spec, 1.401, 1.402
Message-ID: <20090130204908.E8A8270117@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdelibs/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21562

Modified Files:
	kdelibs.spec 
Added Files:
	kdelibs-4.2.0-kded-kdirwatch.patch 
Log Message:
* Fri Jan 30 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.0-7
- kded/kdirwatch patch (kde#182472)


kdelibs-4.2.0-kded-kdirwatch.patch:

--- NEW FILE kdelibs-4.2.0-kded-kdirwatch.patch ---
--- branches/KDE/4.2/kdelibs/kded/kded.cpp	2009/01/12 21:32:29	910250
+++ branches/KDE/4.2/kdelibs/kded/kded.cpp	2009/01/30 20:28:25	918838
@@ -115,9 +115,8 @@
    KToolInvocation::kdeinitExecWait( "kdontchangethehostname", args );
 }
 
-Kded::Kded(bool checkUpdates)
-  : b_checkUpdates(checkUpdates),
-    m_needDelayedCheck(false)
+Kded::Kded()
+  : m_needDelayedCheck(false)
 {
   _self = this;
 
@@ -280,7 +279,7 @@
     KSharedConfig::Ptr config = KGlobal::config();
     // Ensure the service exists.
     KService::Ptr service = KService::serviceByDesktopPath("kded/"+obj+".desktop");
-    if (!service) 
+    if (!service)
         return;
     KConfigGroup cg(config, QString("Module-%1").arg(service->desktopEntryName()));
     cg.writeEntry("autoload", autoload);
@@ -290,7 +289,7 @@
 bool Kded::isModuleAutoloaded(const QString &obj) const
 {
     KService::Ptr s = KService::serviceByDesktopPath("kded/"+obj+".desktop");
-    if (!s) 
+    if (!s)
         return false;
     return isModuleAutoloaded(s);
 }
@@ -307,7 +306,7 @@
 bool Kded::isModuleLoadedOnDemand(const QString &obj) const
 {
     KService::Ptr s = KService::serviceByDesktopPath("kded/"+obj+".desktop");
-    if (!s) 
+    if (!s)
         return false;
     return isModuleLoadedOnDemand(s);
 }
@@ -446,7 +445,7 @@
 
 void Kded::updateDirWatch()
 {
-  if (!b_checkUpdates) return;
+  if (!bCheckUpdates) return;
 
   delete m_pDirWatch;
   m_pDirWatch = new KDirWatch;
@@ -471,7 +470,7 @@
 {
   delete KSycoca::self();
 
-  if (!b_checkUpdates) return;
+  if (!bCheckUpdates) return;
 
   if (delayedCheck) return;
 
@@ -921,7 +920,7 @@
      checkStamps = cg.readEntry("CheckFileStamps", true);
      delayedCheck = cg.readEntry("DelayedCheck", false);
 
-     Kded *kded = new Kded(false); // Build data base
+     Kded *kded = new Kded(); // Build data base
 
      KDE_signal(SIGTERM, sighandler);
      KDE_signal(SIGHUP, sighandler);
--- branches/KDE/4.2/kdelibs/kded/kded.h	2009/01/06 17:13:38	906699
+++ branches/KDE/4.2/kdelibs/kded/kded.h	2009/01/30 20:28:25	918838
@@ -41,7 +41,7 @@
 {
   Q_OBJECT
 public:
-   Kded(bool checkUpdates);
+   Kded();
    virtual ~Kded();
 
    static Kded *self() { return _self;}
@@ -186,8 +186,6 @@
     */
    KDirWatch* m_pDirWatch;
 
-   bool b_checkUpdates;
-
    /**
     * When a desktop file is updated, a timer is started (5 sec)
     * before rebuilding the binary - so that multiple updates result


Index: kdelibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/F-10/kdelibs.spec,v
retrieving revision 1.401
retrieving revision 1.402
diff -u -r1.401 -r1.402
--- kdelibs.spec	30 Jan 2009 17:18:42 -0000	1.401
+++ kdelibs.spec	30 Jan 2009 20:48:38 -0000	1.402
@@ -1,6 +1,6 @@
 Summary: K Desktop Environment 4 - Libraries
 Version: 4.2.0
-Release: 6%{?dist}
+Release: 7%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs
@@ -86,6 +86,7 @@
 Patch110: kdelibs-4.2.1-kde#917170.patch
 Patch111: kdelibs-4.2.1-kde#918403.patch
 Patch112: kdelibs-4.2.1-kde#918654.patch
+Patch113: kdelibs-4.2.0-kded-kdirwatch.patch
 
 BuildRequires: qt4-devel >= 4.4.0
 # qt4%{_?_isa} isn't provided yet -- Rex
@@ -218,6 +219,7 @@
 %patch110 -p0 -b .kde#917170
 %patch111 -p0 -b .kde#918403
 %patch112 -p0 -b .kde#918654
+%patch113 -p4 -b .kde#182472
 
 
 %build
@@ -228,7 +230,7 @@
 popd
 
 %if 0%{?rest}
-make %{?_smp_mflags} -C %{_target_platform} VERBOSE=1
+make %{?_smp_mflags} -C %{_target_platform}
 %endif
 
 # build apidocs
@@ -380,6 +382,9 @@
 
 
 %changelog
+* Fri Jan 30 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.0-7
+- kded/kdirwatch patch (kde#182472)
+
 * Fri Jan 30 2009 Luk???? Tinkl <ltinkl at redhat.com> 4.2.0-6
 - Emit the correct FilesRemoved signal if the job was aborted in the middle of its operation, 
   otherwise it can result in confusion and data loss (overwriting files with files



From rdieter at fedoraproject.org  Fri Jan 30 20:49:45 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Fri, 30 Jan 2009 20:49:45 +0000 (UTC)
Subject: rpms/kdelibs/F-9 kdelibs-4.2.0-kded-kdirwatch.patch, NONE,
	1.1 kdelibs.spec, 1.376, 1.377
Message-ID: <20090130204945.9331170117@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdelibs/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21733

Modified Files:
	kdelibs.spec 
Added Files:
	kdelibs-4.2.0-kded-kdirwatch.patch 
Log Message:
* Fri Jan 30 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.0-7
- kded/kdirwatch patch (kde#182472)


kdelibs-4.2.0-kded-kdirwatch.patch:

--- NEW FILE kdelibs-4.2.0-kded-kdirwatch.patch ---
--- branches/KDE/4.2/kdelibs/kded/kded.cpp	2009/01/12 21:32:29	910250
+++ branches/KDE/4.2/kdelibs/kded/kded.cpp	2009/01/30 20:28:25	918838
@@ -115,9 +115,8 @@
    KToolInvocation::kdeinitExecWait( "kdontchangethehostname", args );
 }
 
-Kded::Kded(bool checkUpdates)
-  : b_checkUpdates(checkUpdates),
-    m_needDelayedCheck(false)
+Kded::Kded()
+  : m_needDelayedCheck(false)
 {
   _self = this;
 
@@ -280,7 +279,7 @@
     KSharedConfig::Ptr config = KGlobal::config();
     // Ensure the service exists.
     KService::Ptr service = KService::serviceByDesktopPath("kded/"+obj+".desktop");
-    if (!service) 
+    if (!service)
         return;
     KConfigGroup cg(config, QString("Module-%1").arg(service->desktopEntryName()));
     cg.writeEntry("autoload", autoload);
@@ -290,7 +289,7 @@
 bool Kded::isModuleAutoloaded(const QString &obj) const
 {
     KService::Ptr s = KService::serviceByDesktopPath("kded/"+obj+".desktop");
-    if (!s) 
+    if (!s)
         return false;
     return isModuleAutoloaded(s);
 }
@@ -307,7 +306,7 @@
 bool Kded::isModuleLoadedOnDemand(const QString &obj) const
 {
     KService::Ptr s = KService::serviceByDesktopPath("kded/"+obj+".desktop");
-    if (!s) 
+    if (!s)
         return false;
     return isModuleLoadedOnDemand(s);
 }
@@ -446,7 +445,7 @@
 
 void Kded::updateDirWatch()
 {
-  if (!b_checkUpdates) return;
+  if (!bCheckUpdates) return;
 
   delete m_pDirWatch;
   m_pDirWatch = new KDirWatch;
@@ -471,7 +470,7 @@
 {
   delete KSycoca::self();
 
-  if (!b_checkUpdates) return;
+  if (!bCheckUpdates) return;
 
   if (delayedCheck) return;
 
@@ -921,7 +920,7 @@
      checkStamps = cg.readEntry("CheckFileStamps", true);
      delayedCheck = cg.readEntry("DelayedCheck", false);
 
-     Kded *kded = new Kded(false); // Build data base
+     Kded *kded = new Kded(); // Build data base
 
      KDE_signal(SIGTERM, sighandler);
      KDE_signal(SIGHUP, sighandler);
--- branches/KDE/4.2/kdelibs/kded/kded.h	2009/01/06 17:13:38	906699
+++ branches/KDE/4.2/kdelibs/kded/kded.h	2009/01/30 20:28:25	918838
@@ -41,7 +41,7 @@
 {
   Q_OBJECT
 public:
-   Kded(bool checkUpdates);
+   Kded();
    virtual ~Kded();
 
    static Kded *self() { return _self;}
@@ -186,8 +186,6 @@
     */
    KDirWatch* m_pDirWatch;
 
-   bool b_checkUpdates;
-
    /**
     * When a desktop file is updated, a timer is started (5 sec)
     * before rebuilding the binary - so that multiple updates result


Index: kdelibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/F-9/kdelibs.spec,v
retrieving revision 1.376
retrieving revision 1.377
diff -u -r1.376 -r1.377
--- kdelibs.spec	30 Jan 2009 02:05:29 -0000	1.376
+++ kdelibs.spec	30 Jan 2009 20:49:15 -0000	1.377
@@ -1,6 +1,6 @@
 Summary: K Desktop Environment 4 - Libraries
 Version: 4.2.0
-Release: 5%{?dist}
+Release: 7%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs
@@ -82,6 +82,11 @@
 # upstream
 # 4.3 branch
 Patch101: kdelibs-4.1.96-AllowExternalPaths.patch
+# 4.2 branch
+Patch110: kdelibs-4.2.1-kde#917170.patch
+Patch111: kdelibs-4.2.1-kde#918403.patch
+Patch112: kdelibs-4.2.1-kde#918654.patch
+Patch113: kdelibs-4.2.0-kded-kdirwatch.patch
 
 BuildRequires: qt4-devel >= 4.4.0
 # qt4%{_?_isa} isn't provided yet -- Rex
@@ -211,6 +216,10 @@
 
 # upstream patches
 %patch101 -p1 -b .AllowExternalPaths
+%patch110 -p0 -b .kde#917170
+%patch111 -p0 -b .kde#918403
+%patch112 -p0 -b .kde#918654
+%patch113 -p4 -b .kde#182472
 
 
 %build
@@ -221,7 +230,7 @@
 popd
 
 %if 0%{?rest}
-make %{?_smp_mflags} -C %{_target_platform} VERBOSE=1
+make %{?_smp_mflags} -C %{_target_platform}
 %endif
 
 # build apidocs
@@ -373,6 +382,18 @@
 
 
 %changelog
+* Fri Jan 30 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.0-7
+- kded/kdirwatch patch (kde#182472)
+
+* Fri Jan 30 2009 Luk???? Tinkl <ltinkl at redhat.com> 4.2.0-6
+- Emit the correct FilesRemoved signal if the job was aborted in the middle of its operation, 
+  otherwise it can result in confusion and data loss (overwriting files with files
+  that don't exist). kdebug:118593
+- Fix "klauncher hangs when kdeinit4 dies" -- this happened because
+  klauncher was doing a blocking read forever.
+- Repair klauncher support for unique-applications like konsole.
+  kdebug:162729, kdebug:75492
+
 * Fri Jan 30 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.2.0-5
 - reenable PolicyKit and NTFS workarounds
 



From mbarnes at fedoraproject.org  Fri Jan 30 20:56:55 2009
From: mbarnes at fedoraproject.org (Matthew Barnes)
Date: Fri, 30 Jan 2009 20:56:55 +0000 (UTC)
Subject: rpms/gnome-python2-extras/devel .cvsignore, 1.15,
	1.16 gnome-python2-extras.spec, 1.45, 1.46 sources, 1.15, 1.16
Message-ID: <20090130205655.F30A670117@cvs1.fedora.phx.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/gnome-python2-extras/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23654

Modified Files:
	.cvsignore gnome-python2-extras.spec sources 
Log Message:

* Fri Jan 30 2009 Matthew Barnes <mbarnes at redhat.com> - 2.25.2-1
- Update to 2.25.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-python2-extras/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	22 Jan 2009 04:19:55 -0000	1.15
+++ .cvsignore	30 Jan 2009 20:56:25 -0000	1.16
@@ -1 +1 @@
-gnome-python-extras-2.25.1.tar.bz2
+gnome-python-extras-2.25.2.tar.bz2


Index: gnome-python2-extras.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-python2-extras/devel/gnome-python2-extras.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- gnome-python2-extras.spec	23 Jan 2009 11:18:09 -0000	1.45
+++ gnome-python2-extras.spec	30 Jan 2009 20:56:25 -0000	1.46
@@ -13,7 +13,7 @@
 ### Abstract ###
 
 Name: gnome-python2-extras
-Version: 2.25.1
+Version: 2.25.2
 Release: 1%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: Development/Languages
@@ -180,6 +180,9 @@
 %{_libdir}/pkgconfig/pygda-4.0.pc
 
 %changelog
+* Fri Jan 30 2009 Matthew Barnes <mbarnes at redhat.com> - 2.25.2-1
+- Update to 2.25.2
+
 * Fri Jan 23 2009 Denis Leroy <denis at poolshark.org> - 2.25.1-1
 - Fixed Source URL
 - Switch to libgda 4.0 API


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-python2-extras/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	22 Jan 2009 04:19:55 -0000	1.15
+++ sources	30 Jan 2009 20:56:25 -0000	1.16
@@ -1 +1 @@
-80be52db42a6ad5804d3cc432efe2590  gnome-python-extras-2.25.1.tar.bz2
+63703ff4e6438e88fc205e6a5360f841  gnome-python-extras-2.25.2.tar.bz2



From mbarnes at fedoraproject.org  Fri Jan 30 20:58:18 2009
From: mbarnes at fedoraproject.org (Matthew Barnes)
Date: Fri, 30 Jan 2009 20:58:18 +0000 (UTC)
Subject: rpms/evolution-data-server/F-10 .cvsignore, 1.98,
	1.99 evolution-data-server.spec, 1.240, 1.241 sources, 1.98,
	1.99 evolution-data-server-2.24.3-compiler-warnings.patch, 1.1, NONE
Message-ID: <20090130205818.45EBA70117@cvs1.fedora.phx.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/evolution-data-server/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23977

Modified Files:
	.cvsignore evolution-data-server.spec sources 
Removed Files:
	evolution-data-server-2.24.3-compiler-warnings.patch 
Log Message:

* Fri Jan 30 2009 Matthew Barnes <mbarnes at redhat.com> - 2.24.4-1.fc10
- Update to 2.24.4



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-data-server/F-10/.cvsignore,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -r1.98 -r1.99
--- .cvsignore	12 Jan 2009 19:49:07 -0000	1.98
+++ .cvsignore	30 Jan 2009 20:57:47 -0000	1.99
@@ -1 +1 @@
-evolution-data-server-2.24.3.tar.bz2
+evolution-data-server-2.24.4.tar.bz2


Index: evolution-data-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-data-server/F-10/evolution-data-server.spec,v
retrieving revision 1.240
retrieving revision 1.241
diff -u -r1.240 -r1.241
--- evolution-data-server.spec	12 Jan 2009 19:49:07 -0000	1.240
+++ evolution-data-server.spec	30 Jan 2009 20:57:47 -0000	1.241
@@ -28,7 +28,7 @@
 ### Abstract ###
 
 Name: evolution-data-server
-Version: 2.24.3
+Version: 2.24.4
 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.24.3-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
+* Fri Jan 30 2009 Matthew Barnes <mbarnes at redhat.com> - 2.24.4-1.fc10
+- Update to 2.24.4
+
 * Mon Jan 12 2009 Matthew Barnes <mbarnes at redhat.com> - 2.24.3-1.fc10
 - Update to 2.24.3
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-data-server/F-10/sources,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -r1.98 -r1.99
--- sources	12 Jan 2009 19:49:07 -0000	1.98
+++ sources	30 Jan 2009 20:57:47 -0000	1.99
@@ -1 +1 @@
-fc0b48f6246ed700fcc2b9f52538dd85  evolution-data-server-2.24.3.tar.bz2
+5cdd0537ca5961bcd87e2d4de2744488  evolution-data-server-2.24.4.tar.bz2


--- evolution-data-server-2.24.3-compiler-warnings.patch DELETED ---



From mbarnes at fedoraproject.org  Fri Jan 30 20:58:47 2009
From: mbarnes at fedoraproject.org (Matthew Barnes)
Date: Fri, 30 Jan 2009 20:58:47 +0000 (UTC)
Subject: rpms/evolution-exchange/F-10 .cvsignore, 1.34,
	1.35 evolution-exchange.spec, 1.48, 1.49 sources, 1.34, 1.35
Message-ID: <20090130205847.B258E70117@cvs1.fedora.phx.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/evolution-exchange/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24072

Modified Files:
	.cvsignore evolution-exchange.spec sources 
Log Message:

* Fri Jan 30 2009 Matthew Barnes <mbarnes at redhat.com> - 2.24.4-1.fc10
- Update to 2.24.4



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-exchange/F-10/.cvsignore,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- .cvsignore	12 Jan 2009 19:49:08 -0000	1.34
+++ .cvsignore	30 Jan 2009 20:58:17 -0000	1.35
@@ -1 +1 @@
-evolution-exchange-2.24.3.tar.bz2
+evolution-exchange-2.24.4.tar.bz2


Index: evolution-exchange.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-exchange/F-10/evolution-exchange.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- evolution-exchange.spec	15 Jan 2009 14:42:40 -0000	1.48
+++ evolution-exchange.spec	30 Jan 2009 20:58:17 -0000	1.49
@@ -22,8 +22,8 @@
 ### Abstract ###
 
 Name: evolution-exchange
-Version: 2.24.3
-Release: 2%{?dist}
+Version: 2.24.4
+Release: 1%{?dist}
 License: GPLv2
 Group: Applications/Productivity
 Summary: Evolution plugin to interact with MS Exchange Server
@@ -156,6 +156,9 @@
 %{_sysconfdir}/gconf/schemas/apps_exchange_addressbook-%{evo_major}.schemas
 
 %changelog
+* Fri Jan 30 2009 Matthew Barnes <mbarnes at redhat.com> - 2.24.4-1.fc10
+- Update to 2.24.4
+
 * Thu Jan 15 2009 Matthew Barnes <mbarnes at redhat.com> - 2.24.3-2.fc10
 - Rebuild against the correct evolution-data-server.
 - Bump eds_version to 2.24.3.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-exchange/F-10/sources,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- sources	12 Jan 2009 19:49:08 -0000	1.34
+++ sources	30 Jan 2009 20:58:17 -0000	1.35
@@ -1 +1 @@
-ec3a9f81d113b96ce3dcb05b1f54eab1  evolution-exchange-2.24.3.tar.bz2
+e2c4e282488b1e9a3b528cad0d7f684f  evolution-exchange-2.24.4.tar.bz2



From cebbert at fedoraproject.org  Fri Jan 30 21:22:12 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Fri, 30 Jan 2009 21:22:12 +0000 (UTC)
Subject: rpms/kernel/F-10
	linux-2.6-hwmon-superio-fix-acpi-resource-check-error-handling.patch, 
	NONE, 1.1 linux-2.6.29-btrfs-readdir-fix.patch, NONE,
	1.1 linux-2.6.29-btrfs-selinux.patch, NONE,
	1.1 linux-2.6.29-btrfs-setxattr-fix.patch, NONE,
	1.1 patch-2.6.29-rc3-git1.bz2.sign, NONE, 1.1 .cvsignore, 1.967,
	1.968 kernel.spec, 1.1236,
	1.1237 linux-2.6-firewire-git-pending.patch, 1.35,
	1.36 linux-2.6-firewire-git-update.patch, 1.19,
	1.20 linux-2.6.29-lirc.patch, 1.1, 1.2 sources, 1.929,
	1.930 upstream, 1.840, 1.841 linux-2.6-gspca-git.patch, 1.2,
	NONE linux-2.6-gspca-stv06xx-git.patch, 1.1, NONE
Message-ID: <20090130212212.A020E70117@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27948

Modified Files:
	.cvsignore kernel.spec linux-2.6-firewire-git-pending.patch 
	linux-2.6-firewire-git-update.patch linux-2.6.29-lirc.patch 
	sources upstream 
Added Files:
	linux-2.6-hwmon-superio-fix-acpi-resource-check-error-handling.patch 
	linux-2.6.29-btrfs-readdir-fix.patch 
	linux-2.6.29-btrfs-selinux.patch 
	linux-2.6.29-btrfs-setxattr-fix.patch 
	patch-2.6.29-rc3-git1.bz2.sign 
Removed Files:
	linux-2.6-gspca-git.patch linux-2.6-gspca-stv06xx-git.patch 
Log Message:
Copy 2.6.29-rc3-git1 update and btrfs fixes from Rawhide.

linux-2.6-hwmon-superio-fix-acpi-resource-check-error-handling.patch:

--- NEW FILE linux-2.6-hwmon-superio-fix-acpi-resource-check-error-handling.patch ---
This patch fixes a number of cases where things were not properly cleaned up
when acpi_check_resource_conflict() returned an error, causing oopses such as
the one reported here:
https://bugzilla.redhat.com/show_bug.cgi?id=483208

Signed-off-by: Hans de Goede <hdegoede at redhat.com>
diff -up linux-2.6.28.x86_64/drivers/hwmon/f71882fg.c~ linux-2.6.28.x86_64/drivers/hwmon/f71882fg.c
--- linux-2.6.28.x86_64/drivers/hwmon/f71882fg.c~	2009-01-30 11:18:04.000000000 +0100
+++ linux-2.6.28.x86_64/drivers/hwmon/f71882fg.c	2009-01-30 11:18:04.000000000 +0100
@@ -1932,7 +1932,7 @@ static int __init f71882fg_device_add(un
 	res.name = f71882fg_pdev->name;
 	err = acpi_check_resource_conflict(&res);
 	if (err)
-		return err;
+		goto exit_device_put;
 
 	err = platform_device_add_resources(f71882fg_pdev, &res, 1);
 	if (err) {
diff -up linux-2.6.28.x86_64/drivers/hwmon/vt1211.c~ linux-2.6.28.x86_64/drivers/hwmon/vt1211.c
--- linux-2.6.28.x86_64/drivers/hwmon/vt1211.c~	2009-01-30 11:21:32.000000000 +0100
+++ linux-2.6.28.x86_64/drivers/hwmon/vt1211.c	2009-01-30 11:21:32.000000000 +0100
@@ -1262,7 +1262,7 @@ static int __init vt1211_device_add(unsi
 	res.name = pdev->name;
 	err = acpi_check_resource_conflict(&res);
 	if (err)
-		goto EXIT;
+		goto EXIT_DEV_PUT;
 
 	err = platform_device_add_resources(pdev, &res, 1);
 	if (err) {
diff -up linux-2.6.28.x86_64/drivers/hwmon/w83627ehf.c~ linux-2.6.28.x86_64/drivers/hwmon/w83627ehf.c
--- linux-2.6.28.x86_64/drivers/hwmon/w83627ehf.c~	2009-01-30 11:22:26.000000000 +0100
+++ linux-2.6.28.x86_64/drivers/hwmon/w83627ehf.c	2009-01-30 11:22:26.000000000 +0100
@@ -1548,7 +1548,7 @@ static int __init sensors_w83627ehf_init
 
 	err = acpi_check_resource_conflict(&res);
 	if (err)
-		goto exit;
+		goto exit_device_put;
 
 	err = platform_device_add_resources(pdev, &res, 1);
 	if (err) {

linux-2.6.29-btrfs-readdir-fix.patch:

--- NEW FILE linux-2.6.29-btrfs-readdir-fix.patch ---
Josef,

This fixes btrfs readdir on 32 bit boxes.  It keeps us from giving glibc
an offset too big to handle.

diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index 5771ec2..ebd7d6c 100644
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -3277,7 +3277,7 @@ skip:
 
 	/* Reached end of directory/root. Bump pos past the last item. */
 	if (key_type == BTRFS_DIR_INDEX_KEY)
-		filp->f_pos = INT_LIMIT(typeof(filp->f_pos));
+		filp->f_pos = INT_LIMIT(off_t);
 	else
 		filp->f_pos++;
 nopos:



linux-2.6.29-btrfs-selinux.patch:

--- NEW FILE linux-2.6.29-btrfs-selinux.patch ---
Add call to LSM security initialization and save
resulting security xattr for new inodes.

Add xattr support to symlink inode ops.

Set inode->i_op for existing special files.

Signed-off-by: jim owens <jowens at hp.com>
---
  fs/btrfs/inode.c |   23 +++++++++++++++++++----
  fs/btrfs/xattr.c |   32 ++++++++++++++++++++++++++++++++
  fs/btrfs/xattr.h |    2 ++
  3 files changed, 53 insertions(+), 4 deletions(-)

Index: linux/fs/btrfs/inode.c
===================================================================
--- linux.orig/fs/btrfs/inode.c
+++ linux/fs/btrfs/inode.c
@@ -91,6 +91,16 @@ static noinline int cow_file_range(struc
 				   u64 start, u64 end, int *page_started,
 				   unsigned long *nr_written, int unlock);
 
+static int btrfs_init_inode_security(struct inode *inode,  struct inode *dir)
+{
+	int err;
+
+	err = btrfs_init_acl(inode, dir);
+	if (!err)
+		err = btrfs_xattr_security_init(inode, dir);
+	return err;
+}
+
 /*
  * a very lame attempt at stopping writes when the FS is 85% full.  There
  * are countless ways this is incorrect, but it is better than nothing.
@@ -2039,6 +2049,7 @@ void btrfs_read_locked_inode(struct inod
 		inode->i_mapping->backing_dev_info = &root->fs_info->bdi;
 		break;
 	default:
+		inode->i_op = &btrfs_special_inode_operations;
 		init_special_inode(inode, inode->i_mode, rdev);
 		break;
 	}
@@ -3586,7 +3597,7 @@ static int btrfs_mknod(struct inode *dir
 	if (IS_ERR(inode))
 		goto out_unlock;
 
-	err = btrfs_init_acl(inode, dir);
+	err = btrfs_init_inode_security(inode, dir);
 	if (err) {
 		drop_inode = 1;
 		goto out_unlock;
@@ -3649,7 +3660,7 @@ static int btrfs_create(struct inode *di
 	if (IS_ERR(inode))
 		goto out_unlock;
 
-	err = btrfs_init_acl(inode, dir);
+	err = btrfs_init_inode_security(inode, dir);
 	if (err) {
 		drop_inode = 1;
 		goto out_unlock;
@@ -3772,7 +3783,7 @@ static int btrfs_mkdir(struct inode *dir
 
 	drop_on_err = 1;
 
-	err = btrfs_init_acl(inode, dir);
+	err = btrfs_init_inode_security(inode, dir);
 	if (err)
 		goto out_fail;
 
@@ -4733,7 +4744,7 @@ static int btrfs_symlink(struct inode *d
 	if (IS_ERR(inode))
 		goto out_unlock;
 
-	err = btrfs_init_acl(inode, dir);
+	err = btrfs_init_inode_security(inode, dir);
 	if (err) {
 		drop_inode = 1;
 		goto out_unlock;
@@ -5032,4 +5043,8 @@ static struct inode_operations btrfs_sym
 	.follow_link	= page_follow_link_light,
 	.put_link	= page_put_link,
 	.permission	= btrfs_permission,
+	.setxattr	= btrfs_setxattr,
+	.getxattr	= btrfs_getxattr,
+	.listxattr	= btrfs_listxattr,
+	.removexattr	= btrfs_removexattr,
 };
Index: linux/fs/btrfs/xattr.c
===================================================================
--- linux.orig/fs/btrfs/xattr.c
+++ linux/fs/btrfs/xattr.c
@@ -21,6 +21,7 @@
 #include <linux/slab.h>
 #include <linux/rwsem.h>
 #include <linux/xattr.h>
+#include <linux/security.h>
 #include "ctree.h"
 #include "btrfs_inode.h"
 #include "transaction.h"
@@ -320,3 +321,34 @@ int btrfs_removexattr(struct dentry *den
 		return -EOPNOTSUPP;
 	return __btrfs_setxattr(dentry->d_inode, name, NULL, 0, XATTR_REPLACE);
 }
+
+int btrfs_xattr_security_init(struct inode *inode, struct inode *dir)
+{
+	int err;
+	size_t len;
+	void *value;
+	char *suffix;
+	char *name;
+
+	err = security_inode_init_security(inode, dir, &suffix, &value, &len);
+	if (err) {
+		if (err == -EOPNOTSUPP)
+			return 0;
+		return err;
+	}
+
+	name = kmalloc(XATTR_SECURITY_PREFIX_LEN + strlen(suffix) + 1,
+		       GFP_NOFS);
+	if (!name) {
+		err = -ENOMEM;
+	} else {
+		strcpy(name, XATTR_SECURITY_PREFIX);
+		strcpy(name + XATTR_SECURITY_PREFIX_LEN, suffix);
+		err = __btrfs_setxattr(inode, name, value, len, 0);
+		kfree(name);
+	}
+
+	kfree(suffix);
+	kfree(value);
+	return err;
+}
Index: linux/fs/btrfs/xattr.h
===================================================================
--- linux.orig/fs/btrfs/xattr.h
+++ linux/fs/btrfs/xattr.h
@@ -36,4 +36,6 @@ extern int btrfs_setxattr(struct dentry 
 		const void *value, size_t size, int flags);
 extern int btrfs_removexattr(struct dentry *dentry, const char *name);
 
+extern int btrfs_xattr_security_init(struct inode *inode, struct inode *dir);
+
 #endif /* __XATTR__ */


linux-2.6.29-btrfs-setxattr-fix.patch:

--- NEW FILE linux-2.6.29-btrfs-setxattr-fix.patch ---
With selinux on we end up calling __btrfs_setxattr when we create an inode,
which calls btrfs_start_transaction().  The problem is we've already called that
in btrfs_new_inode, and in btrfs_start_transaction we end up doing a
wait_current_trans().  If btrfs-transaction has started committing it will wait
for all handles to finish, while the other process is waiting for the
transaction to commit.  This is fixed by using btrfs_join_transaction, which
won't wait for the transaction to commit.  Thanks,

Signed-off-by: Josef Bacik <jbacik at redhat.com>
---
 fs/btrfs/xattr.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/fs/btrfs/xattr.c b/fs/btrfs/xattr.c
index 312b943..a9d3bf4 100644
--- a/fs/btrfs/xattr.c
+++ b/fs/btrfs/xattr.c
@@ -98,7 +98,7 @@ int __btrfs_setxattr(struct inode *inode, const char *name,
 	if (!path)
 		return -ENOMEM;
 
-	trans = btrfs_start_transaction(root, 1);
+	trans = btrfs_join_transaction(root, 1);
 	btrfs_set_trans_block_group(trans, inode);
 
 	/* first lets see if we already have this xattr */
-- 
1.5.4.3



--- NEW FILE patch-2.6.29-rc3-git1.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBJguwAyGugalF9Dw4RAhQUAJ0eeGfFKWnr3R/eqRA3JktfT/pz6ACfXMZr
SaiMPoOJt6Di4ZgqPjadpuU=
=piNt
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/.cvsignore,v
retrieving revision 1.967
retrieving revision 1.968
diff -u -r1.967 -r1.968
--- .cvsignore	29 Jan 2009 21:14:10 -0000	1.967
+++ .cvsignore	30 Jan 2009 21:21:41 -0000	1.968
@@ -5,3 +5,4 @@
 kernel-2.6.28
 linux-2.6.28.tar.bz2
 patch-2.6.29-rc3.bz2
+patch-2.6.29-rc3-git1.bz2


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/kernel.spec,v
retrieving revision 1.1236
retrieving revision 1.1237
diff -u -r1.1236 -r1.1237
--- kernel.spec	30 Jan 2009 03:22:12 -0000	1.1236
+++ kernel.spec	30 Jan 2009 21:21:41 -0000	1.1237
@@ -57,7 +57,7 @@
 # The rc snapshot level
 %define rcrev 3
 # The git snapshot level
-%define gitrev 0
+%define gitrev 1
 # Set rpm version accordingly
 %define rpmversion 2.6.%{upstream_sublevel}
 %endif
@@ -613,6 +613,7 @@
 Patch382: linux-2.6-defaults-pciehp.patch
 Patch390: linux-2.6-defaults-acpi-video.patch
 Patch391: linux-2.6-acpi-video-dos.patch
+Patch394: linux-2.6-hwmon-superio-fix-acpi-resource-check-error-handling.patch
 Patch400: linux-2.6-scsi-cpqarray-set-master.patch
 Patch450: linux-2.6-input-kill-stupid-messages.patch
 Patch460: linux-2.6-serial-460800.patch
@@ -666,6 +667,15 @@
 # silence the ACPI blacklist code
 Patch2802: linux-2.6-silence-acpi-blacklist.patch
 
+# Hook up proper selinux bits for btrfs
+Patch9003: linux-2.6.29-btrfs-selinux.patch
+
+# Fix setxattr bug in btrfs
+Patch9004: linux-2.6.29-btrfs-setxattr-fix.patch
+
+# Fix readdir for 32bit boxes in btrfs
+Patch9005: linux-2.6.29-btrfs-readdir-fix.patch
+
 %endif
 
 BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -1067,11 +1077,17 @@
 
 # xfs
 
+# btrfs
+ApplyPatch linux-2.6.29-btrfs-selinux.patch
+ApplyPatch linux-2.6.29-btrfs-setxattr-fix.patch
+ApplyPatch linux-2.6.29-btrfs-readdir-fix.patch
+
 # USB
 
 # ACPI
 ApplyPatch linux-2.6-defaults-acpi-video.patch
 ApplyPatch linux-2.6-acpi-video-dos.patch
+ApplyPatch linux-2.6-hwmon-superio-fix-acpi-resource-check-error-handling.patch
 
 # Various low-impact patches to aid debugging.
 ApplyPatch linux-2.6-debug-sizeof-structs.patch
@@ -1747,6 +1763,9 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Fri Jan 30 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.29-0.7.rc3.git1
+- Copy 2.6.29-rc3-git1 update and btrfs fixes from Rawhide.
+
 * Thu Jan 29 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.29-0.6.rc3
 - Copy lirc and nouveau from rawhide.
 

linux-2.6-firewire-git-pending.patch:

Index: linux-2.6-firewire-git-pending.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/linux-2.6-firewire-git-pending.patch,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- linux-2.6-firewire-git-pending.patch	30 Jan 2009 00:24:47 -0000	1.35
+++ linux-2.6-firewire-git-pending.patch	30 Jan 2009 21:21:41 -0000	1.36
@@ -2,393 +2,3 @@
 # Patches under review and/or pending inclusion in the linux1394-git
 # tree (and/or in by the time your read this), which we want...
 #
-
-Date: Sat, 24 Jan 2009 19:42:21 +0100 (CET)
-From: Stefan Richter <stefanr at s5r6.in-berlin.de>
-Subject: [PATCH 1/7] firewire: sbp2: fix payload limit at S1600 and S3200
-To: linux1394-devel at lists.sourceforge.net
-Cc: linux-kernel at vger.kernel.org
-
-1394-2008 clause 16.3.4.1 (1394b-2002 clause 16.3.1.1) defines tighter
-limits than 1394-2008 clause 6.2.2.3 (1394a-2000 clause 6.2.2.3).
-
-Our previously too large limit doesn't matter though if the controller
-reports its max_receive correctly.
-
-Signed-off-by: Stefan Richter <stefanr at s5r6.in-berlin.de>
----
- drivers/firewire/fw-sbp2.c |   23 ++++++++++++-----------
- 1 file changed, 12 insertions(+), 11 deletions(-)
-
-Index: linux/drivers/firewire/fw-sbp2.c
-===================================================================
---- linux.orig/drivers/firewire/fw-sbp2.c
-+++ linux/drivers/firewire/fw-sbp2.c
-@@ -168,6 +168,7 @@ struct sbp2_target {
- 	int address_high;
- 	unsigned int workarounds;
- 	unsigned int mgt_orb_timeout;
-+	unsigned int max_payload;
- 
- 	int dont_block;	/* counter for each logical unit */
- 	int blocked;	/* ditto */
-@@ -1150,6 +1151,15 @@ static int sbp2_probe(struct device *dev
- 
- 	sbp2_init_workarounds(tgt, model, firmware_revision);
- 
-+	/*
-+	 * At S100 we can do 512 bytes per packet, at S200 1024 bytes,
-+	 * and so on up to 4096 bytes.  The SBP-2 max_payload field
-+	 * specifies the max payload size as 2 ^ (max_payload + 2), so
-+	 * if we set this to max_speed + 7, we get the right value.
-+	 */
-+	tgt->max_payload = min(device->max_speed + 7, 10U);
-+	tgt->max_payload = min(tgt->max_payload, device->card->max_receive - 1);
-+
- 	/* Do the login in a workqueue so we can easily reschedule retries. */
- 	list_for_each_entry(lu, &tgt->lu_list, link)
- 		sbp2_queue_work(lu, DIV_ROUND_UP(HZ, 5));
-@@ -1426,7 +1436,6 @@ static int sbp2_scsi_queuecommand(struct
- 	struct sbp2_logical_unit *lu = cmd->device->hostdata;
- 	struct fw_device *device = fw_device(lu->tgt->unit->device.parent);
- 	struct sbp2_command_orb *orb;
--	unsigned int max_payload;
- 	int generation, retval = SCSI_MLQUEUE_HOST_BUSY;
- 
- 	/*
-@@ -1454,17 +1463,9 @@ static int sbp2_scsi_queuecommand(struct
- 	orb->done = done;
- 	orb->cmd  = cmd;
- 
--	orb->request.next.high   = cpu_to_be32(SBP2_ORB_NULL);
--	/*
--	 * At speed 100 we can do 512 bytes per packet, at speed 200,
--	 * 1024 bytes per packet etc.  The SBP-2 max_payload field
--	 * specifies the max payload size as 2 ^ (max_payload + 2), so
--	 * if we set this to max_speed + 7, we get the right value.
--	 */
--	max_payload = min(device->max_speed + 7,
--			  device->card->max_receive - 1);
-+	orb->request.next.high = cpu_to_be32(SBP2_ORB_NULL);
- 	orb->request.misc = cpu_to_be32(
--		COMMAND_ORB_MAX_PAYLOAD(max_payload) |
-+		COMMAND_ORB_MAX_PAYLOAD(lu->tgt->max_payload) |
- 		COMMAND_ORB_SPEED(device->max_speed) |
- 		COMMAND_ORB_NOTIFY);
- 
-
--- 
-Stefan Richter
--=====-==--= ---= ==---
-http://arcgraph.de/sr/
-
-
-
-Date: Sat, 24 Jan 2009 19:42:47 +0100 (CET)
-From: Stefan Richter <stefanr at s5r6.in-berlin.de>
-Subject: [PATCH 2/7] firewire: sbp2: define some magic numbers as macros
-To: linux1394-devel at lists.sourceforge.net
-Cc: linux-kernel at vger.kernel.org
-
-Signed-off-by: Stefan Richter <stefanr at s5r6.in-berlin.de>
----
- drivers/firewire/fw-sbp2.c |   23 ++++++++++++-----------
- 1 file changed, 12 insertions(+), 11 deletions(-)
-
-Index: linux/drivers/firewire/fw-sbp2.c
-===================================================================
---- linux.orig/drivers/firewire/fw-sbp2.c
-+++ linux/drivers/firewire/fw-sbp2.c
-@@ -311,14 +311,16 @@ struct sbp2_command_orb {
- 	dma_addr_t page_table_bus;
- };
- 
-+#define SBP2_ROM_VALUE_WILDCARD ~0         /* match all */
-+#define SBP2_ROM_VALUE_MISSING  0xff000000 /* not present in the unit dir. */
-+
- /*
-  * List of devices with known bugs.
-  *
-  * The firmware_revision field, masked with 0xffff00, is the best
-  * indicator for the type of bridge chip of a device.  It yields a few
-  * false positives but this did not break correctly behaving devices
-- * so far.  We use ~0 as a wildcard, since the 24 bit values we get
-- * from the config rom can never match that.
-+ * so far.
-  */
- static const struct {
- 	u32 firmware_revision;
-@@ -340,22 +342,22 @@ static const struct {
- 	},
- 	/* Initio bridges, actually only needed for some older ones */ {
- 		.firmware_revision	= 0x000200,
--		.model			= ~0,
-+		.model			= SBP2_ROM_VALUE_WILDCARD,
- 		.workarounds		= SBP2_WORKAROUND_INQUIRY_36,
- 	},
- 	/* PL-3507 bridge with Prolific firmware */ {
- 		.firmware_revision	= 0x012800,
--		.model			= ~0,
-+		.model			= SBP2_ROM_VALUE_WILDCARD,
- 		.workarounds		= SBP2_WORKAROUND_POWER_CONDITION,
- 	},
- 	/* Symbios bridge */ {
- 		.firmware_revision	= 0xa0b800,
--		.model			= ~0,
-+		.model			= SBP2_ROM_VALUE_WILDCARD,
- 		.workarounds		= SBP2_WORKAROUND_128K_MAX_TRANS,
- 	},
- 	/* Datafab MD2-FW2 with Symbios/LSILogic SYM13FW500 bridge */ {
- 		.firmware_revision	= 0x002600,
--		.model			= ~0,
-+		.model			= SBP2_ROM_VALUE_WILDCARD,
- 		.workarounds		= SBP2_WORKAROUND_128K_MAX_TRANS,
- 	},
- 
-@@ -1087,7 +1089,7 @@ static void sbp2_init_workarounds(struct
- 			continue;
- 
- 		if (sbp2_workarounds_table[i].model != model &&
--		    sbp2_workarounds_table[i].model != ~0)
-+		    sbp2_workarounds_table[i].model != SBP2_ROM_VALUE_WILDCARD)
- 			continue;
- 
- 		w |= sbp2_workarounds_table[i].workarounds;
-@@ -1137,14 +1139,13 @@ static int sbp2_probe(struct device *dev
- 	fw_device_get(device);
- 	fw_unit_get(unit);
- 
--	/* Initialize to values that won't match anything in our table. */
--	firmware_revision = 0xff000000;
--	model = 0xff000000;
--
- 	/* implicit directory ID */
- 	tgt->directory_id = ((unit->directory - device->config_rom) * 4
- 			     + CSR_CONFIG_ROM) & 0xffffff;
- 
-+	firmware_revision = SBP2_ROM_VALUE_MISSING;
-+	model		  = SBP2_ROM_VALUE_MISSING;
-+
- 	if (sbp2_scan_unit_dir(tgt, unit->directory, &model,
- 			       &firmware_revision) < 0)
- 		goto fail_tgt_put;
-
--- 
-Stefan Richter
--=====-==--= ---= ==---
-http://arcgraph.de/sr/
-
-
-
-Date: Sat, 24 Jan 2009 19:41:46 +0100 (CET)
-From: Stefan Richter <stefanr at s5r6.in-berlin.de>
-Subject: firewire: sbp2: add workarounds for 2nd and 3rd generation iPods
-
-According to https://bugs.launchpad.net/bugs/294391
-  - 3rd generation iPods need the "fix capacity" workaround after all
-    (apparently they crash after the last sector was accessed),
-  - 2nd generation iPods need the "128 kB maximum request size"
-    workaround.
-
-Furthermore, Kristian H??gsberg mentioned that 2nd generation iPods
-treat page tables (scatter-gather lists) as data buffers, i.e. ignore
-the page_table_present bit of command block ORBs.  If this is true, then
-the 128 kB limit is not a sufficient workaround; instead we have to
-guarantee that all requests have only a single s/g element.  This could
-be up to 64 kByte - 4 Bytes in size.  But I expect the block layer to
-typically emit much smaller elements than that, alas.
-
-Alas both iPod generations feature the same model ID in the config ROM,
-hence we can only define a shared quirks list entry for them.  This is
-bad since
-  - the "fix capacity" workaround prevents access to the very last
-    sector if a device does not actually have this bug,
-  - the "no page tables" workaround dramatically reduces throughput,
-    e.g. from 25 to 9 MB/s without gap count optimization, and from 36
-    11 MB/s with gap count optimization (as per hdparm with a regular
-    3.5" S400 disk on an i686 PC without IOMMU).  Whether this matters
-    with the already slow iPod disk is not yet known.
-
-This patch needs testing by somebody who has the hardware:
-  - Do 2nd and 3rd gen. iPods actually have a model_id == 0, or do they
-    have in fact no model_id at all?
-  - Does the "fix capacity" workaround harm usage of 2nd gen. iPods?
-  - Is the "no page tables" workaround really necessary for 2nd gen.
-    iPods, or is the 128k limit sufficient as reported for the Ubuntu
-    8.10 kernel?
-  - How badly does the "no page tables" workaround affect throughput of
-    3rd gen. iPods which don't need it?
-
-A side note:  Apple computers in target mode (or at least an x86 Mac
-mini) don't have firmware_version and model_id, hence none of the iPod
-quirks list entries is active for them.
-
-Signed-off-by: Stefan Richter <stefanr at s5r6.in-berlin.de>
----
- drivers/firewire/fw-sbp2.c |   27 +++++++++++++++++++--------
- 1 file changed, 19 insertions(+), 8 deletions(-)
-
-Index: linux/drivers/firewire/fw-sbp2.c
-===================================================================
---- linux.orig/drivers/firewire/fw-sbp2.c
-+++ linux/drivers/firewire/fw-sbp2.c
-@@ -92,6 +92,10 @@ MODULE_PARM_DESC(exclusive_login, "Exclu
-  *   sd_mod on suspend, resume, and shutdown (if manage_start_stop is on).
-  *   Some disks need this to spin down or to resume properly.
-  *
-+ * - no page tables
-+ *   Limit data buffers to a single scatter/ gather element for buggy devices
-+ *   which ignore the page_table_present bit in command block ORBs.
-+ *
-  * - override internal blacklist
-  *   Instead of adding to the built-in blacklist, use only the workarounds
-  *   specified in the module load parameter.
-@@ -104,6 +108,7 @@ MODULE_PARM_DESC(exclusive_login, "Exclu
- #define SBP2_WORKAROUND_DELAY_INQUIRY	0x10
- #define SBP2_INQUIRY_DELAY		12
- #define SBP2_WORKAROUND_POWER_CONDITION	0x20
-+#define SBP2_WORKAROUND_NO_PAGE_TABLES	0x40
- #define SBP2_WORKAROUND_OVERRIDE	0x100
- 
- static int sbp2_param_workarounds;
-@@ -116,6 +121,7 @@ MODULE_PARM_DESC(workarounds, "Work arou
- 	", delay inquiry = "      __stringify(SBP2_WORKAROUND_DELAY_INQUIRY)
- 	", set power condition in start stop unit = "
- 				  __stringify(SBP2_WORKAROUND_POWER_CONDITION)
-+	", no page tables = "     __stringify(SBP2_WORKAROUND_NO_PAGE_TABLES)
- 	", override internal blacklist = " __stringify(SBP2_WORKAROUND_OVERRIDE)
- 	", or a combination)");
- 
-@@ -325,7 +331,7 @@ struct sbp2_command_orb {
- static const struct {
- 	u32 firmware_revision;
- 	u32 model;
--	unsigned int workarounds;
-+	unsigned workarounds;
- } sbp2_workarounds_table[] = {
- 	/* DViCO Momobay CX-1 with TSB42AA9 bridge */ {
- 		.firmware_revision	= 0x002800,
-@@ -360,15 +366,17 @@ static const struct {
- 		.model			= SBP2_ROM_VALUE_WILDCARD,
- 		.workarounds		= SBP2_WORKAROUND_128K_MAX_TRANS,
- 	},
--
- 	/*
--	 * There are iPods (2nd gen, 3rd gen) with model_id == 0, but
--	 * these iPods do not feature the read_capacity bug according
--	 * to one report.  Read_capacity behaviour as well as model_id
--	 * could change due to Apple-supplied firmware updates though.
-+	 * iPod 2nd generation: needs 128k max transfer workaround
-+	 * iPod 3rd generation: needs fix-capacity workaround
- 	 */
--
--	/* iPod 4th generation. */ {
-+	{
-+		.firmware_revision	= 0x0a2700,
-+		.model			= 0x000000,
-+		.workarounds		= SBP2_WORKAROUND_128K_MAX_TRANS |
-+					  SBP2_WORKAROUND_FIX_CAPACITY,
-+	},
-+	/* iPod 4th generation */ {
- 		.firmware_revision	= 0x0a2700,
- 		.model			= 0x000021,
- 		.workarounds		= SBP2_WORKAROUND_FIX_CAPACITY,
-@@ -1540,6 +1548,9 @@ static int sbp2_scsi_slave_configure(str
- 	if (lu->tgt->workarounds & SBP2_WORKAROUND_128K_MAX_TRANS)
- 		blk_queue_max_sectors(sdev->request_queue, 128 * 1024 / 512);
- 
-+	if (lu->tgt->workarounds & SBP2_WORKAROUND_NO_PAGE_TABLES)
-+		blk_queue_max_hw_segments(sdev->request_queue, 1);
-+
- 	blk_queue_max_segment_size(sdev->request_queue, SBP2_MAX_SEG_SIZE);
- 
- 	return 0;
-Date: Wed, 28 Jan 2009 01:03:34 +0100 (CET)
-From: Stefan Richter <stefanr at s5r6.in-berlin.de>
-Subject: Re: swiotlb default size (64 MB) too small?
-To: FUJITA Tomonori <fujita.tomonori at lab.ntt.co.jp>
-Cc: linux1394-devel at lists.sourceforge.net,
- linux-kernel at vger.kernel.org,
- linux-scsi at vger.kernel.org
-
-> FUJITA Tomonori wrote:
->> On Tue, 27 Jan 2009 18:03:40 +0100 (CET)
->> Stefan Richter <stefanr at s5r6.in-berlin.de> wrote:
->>> +	if (orb->page_table_bus)
->>> +		dma_unmap_single(card_device, orb->page_table_bus,
->>> +				 sizeof(orb->page_table), DMA_TO_DEVICE);
->> 
->> Well, this does not look correct since zero can be a valid dma
->> address.
-
-
-From: Stefan Richter <stefanr at s5r6.in-berlin.de>
-Subject: firewire: sbp2: fix DMA mapping leak on the failure path
-
-Reported-by: FUJITA Tomonori <fujita.tomonori at lab.ntt.co.jp>
-who also provided a first version of the fix.
-
-Signed-off-by: Stefan Richter <stefanr at s5r6.in-berlin.de>
----
- drivers/firewire/fw-sbp2.c |   27 +++++++++++++++++----------
- 1 file changed, 17 insertions(+), 10 deletions(-)
-
-Index: linux/drivers/firewire/fw-sbp2.c
-===================================================================
---- linux.orig/drivers/firewire/fw-sbp2.c
-+++ linux/drivers/firewire/fw-sbp2.c
-@@ -1323,6 +1323,19 @@ static unsigned int sbp2_status_to_sense
- 	}
- }
- 
-+static void sbp2_unmap_scatterlist(struct device *card_device,
-+				   struct sbp2_command_orb *orb)
-+{
-+	if (scsi_sg_count(orb->cmd))
-+		dma_unmap_sg(card_device, scsi_sglist(orb->cmd),
-+			     scsi_sg_count(orb->cmd),
-+			     orb->cmd->sc_data_direction);
-+
-+	if (orb->request.misc & cpu_to_be32(COMMAND_ORB_PAGE_TABLE_PRESENT))
-+		dma_unmap_single(card_device, orb->page_table_bus,
-+				 sizeof(orb->page_table), DMA_TO_DEVICE);
-+}
-+
- static void complete_command_orb(struct sbp2_orb *base_orb,
- 				 struct sbp2_status *status)
- {
-@@ -1364,15 +1377,7 @@ static void complete_command_orb(struct 
- 
- 	dma_unmap_single(device->card->device, orb->base.request_bus,
- 			 sizeof(orb->request), DMA_TO_DEVICE);
--
--	if (scsi_sg_count(orb->cmd) > 0)
--		dma_unmap_sg(device->card->device, scsi_sglist(orb->cmd),
--			     scsi_sg_count(orb->cmd),
--			     orb->cmd->sc_data_direction);
--
--	if (orb->page_table_bus != 0)
--		dma_unmap_single(device->card->device, orb->page_table_bus,
--				 sizeof(orb->page_table), DMA_TO_DEVICE);
-+	sbp2_unmap_scatterlist(device->card->device, orb);
- 
- 	orb->cmd->result = result;
- 	orb->done(orb->cmd);
-@@ -1493,8 +1498,10 @@ static int sbp2_scsi_queuecommand(struct
- 	orb->base.request_bus =
- 		dma_map_single(device->card->device, &orb->request,
- 			       sizeof(orb->request), DMA_TO_DEVICE);
--	if (dma_mapping_error(device->card->device, orb->base.request_bus))
-+	if (dma_mapping_error(device->card->device, orb->base.request_bus)) {
-+		sbp2_unmap_scatterlist(device->card->device, orb);
- 		goto out;
-+	}
- 
- 	sbp2_send_orb(&orb->base, lu, lu->tgt->node_id, generation,
- 		      lu->command_block_agent_address + SBP2_ORB_POINTER);
-
--- 
-Stefan Richter
--=====-==--= ---= ===--
-http://arcgraph.de/sr/
-

linux-2.6-firewire-git-update.patch:

Index: linux-2.6-firewire-git-update.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/linux-2.6-firewire-git-update.patch,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- linux-2.6-firewire-git-update.patch	30 Jan 2009 00:24:47 -0000	1.19
+++ linux-2.6-firewire-git-update.patch	30 Jan 2009 21:21:41 -0000	1.20
@@ -1,25 +1,23 @@
-git diff -p --stat v2.6.29-rc2 -- drivers/firewire/ include/linux/ in
-linux1394-2.6.git, done on 20090126 by Jarod.
+linux1394-2.6.git tree vs. linus v2.6.29-rc3-git1 on 20090130 by jarod
 
 ---
- drivers/firewire/fw-card.c        |   70 +--
- drivers/firewire/fw-cdev.c        | 1006 +++++++++++++++++++++++++------------
- drivers/firewire/fw-device.c      |  164 +++++--
- drivers/firewire/fw-device.h      |    8 +-
- drivers/firewire/fw-iso.c         |  225 +++++++--
- drivers/firewire/fw-ohci.c        |  242 +++++-----
- drivers/firewire/fw-sbp2.c        |   57 +--
- drivers/firewire/fw-topology.c    |   40 +-
- drivers/firewire/fw-topology.h    |   19 +-
- drivers/firewire/fw-transaction.c |  151 +++----
- drivers/firewire/fw-transaction.h |  136 ++----
- include/linux/firewire-cdev.h     |  170 ++++++-
- 12 files changed, 1481 insertions(+), 807 deletions(-)
+ firewire-git/drivers/firewire/fw-card.c        |   68 -
+ firewire-git/drivers/firewire/fw-cdev.c        | 1014 +++++++++++++++++--------
+ firewire-git/drivers/firewire/fw-device.c      |   43 -
+ firewire-git/drivers/firewire/fw-device.h      |    7 
+ firewire-git/drivers/firewire/fw-iso.c         |  225 ++++-
+ firewire-git/drivers/firewire/fw-ohci.c        |  236 ++---
+ firewire-git/drivers/firewire/fw-sbp2.c        |   57 -
+ firewire-git/drivers/firewire/fw-topology.c    |   28 
+ firewire-git/drivers/firewire/fw-topology.h    |   19 
+ firewire-git/drivers/firewire/fw-transaction.c |  151 +--
+ firewire-git/drivers/firewire/fw-transaction.h |  125 ---
+ include/linux/firewire-cdev.h                  |  170 +++-
+ 12 files changed, 1359 insertions(+), 784 deletions(-)
 
-diff --git a/drivers/firewire/fw-card.c b/drivers/firewire/fw-card.c
-index 6bd91a1..bed7994 100644
---- a/drivers/firewire/fw-card.c
-+++ b/drivers/firewire/fw-card.c
+diff -Naurp linux-2.6-git/drivers/firewire/fw-card.c firewire-git/drivers/firewire/fw-card.c
+--- linux-2.6-git/drivers/firewire/fw-card.c	2009-01-30 13:39:02.989651512 -0500
++++ firewire-git/drivers/firewire/fw-card.c	2009-01-30 13:35:51.859771884 -0500
 @@ -63,8 +63,7 @@ static int descriptor_count;
  #define BIB_CMC			((1) << 30)
  #define BIB_IMC			((1) << 31)
@@ -30,7 +28,7 @@
  {
  	struct fw_descriptor *desc;
  	static u32 config_rom[256];
-@@ -128,8 +127,7 @@ generate_config_rom(struct fw_card *card, size_t *config_rom_length)
+@@ -128,8 +127,7 @@ generate_config_rom(struct fw_card *card
  	return config_rom;
  }
  
@@ -50,7 +48,7 @@
  {
  	size_t i;
  
-@@ -171,8 +168,7 @@ fw_core_add_descriptor(struct fw_descriptor *desc)
+@@ -171,8 +168,7 @@ fw_core_add_descriptor(struct fw_descrip
  	return 0;
  }
  
@@ -70,7 +68,7 @@
  {
  	int scheduled;
  
-@@ -200,8 +195,7 @@ fw_schedule_bm_work(struct fw_card *card, unsigned long delay)
+@@ -200,8 +195,7 @@ fw_schedule_bm_work(struct fw_card *card
  		fw_card_put(card);
  }
  
@@ -80,16 +78,7 @@
  {
  	struct fw_card *card = container_of(work, struct fw_card, work.work);
  	struct fw_device *root_device;
-@@ -232,7 +226,7 @@ fw_card_bm_work(struct work_struct *work)
- 	root_id = root_node->node_id;
- 	grace = time_after(jiffies, card->reset_jiffies + DIV_ROUND_UP(HZ, 10));
- 
--	if (card->bm_generation + 1 == generation ||
-+	if (is_next_generation(generation, card->bm_generation) ||
- 	    (card->bm_generation != generation && grace)) {
- 		/*
- 		 * This first step is to figure out who is IRM and
-@@ -371,17 +365,16 @@ fw_card_bm_work(struct work_struct *work)
+@@ -371,17 +365,16 @@ fw_card_bm_work(struct work_struct *work
  	fw_card_put(card);
  }
  
@@ -111,7 +100,7 @@
  {
  	static atomic_t index = ATOMIC_INIT(-1);
  
-@@ -406,9 +399,8 @@ fw_card_initialize(struct fw_card *card, const struct fw_card_driver *driver,
+@@ -406,9 +399,8 @@ fw_card_initialize(struct fw_card *card,
  }
  EXPORT_SYMBOL(fw_card_initialize);
  
@@ -152,7 +141,7 @@
  {
  	/*
  	 * We take the card out of card_list before setting the dummy
-@@ -461,27 +450,23 @@ dummy_set_config_rom(struct fw_card *card,
+@@ -461,27 +450,23 @@ dummy_set_config_rom(struct fw_card *car
  	return -1;
  }
  
@@ -185,7 +174,7 @@
  {
  	return -ENODEV;
  }
-@@ -496,16 +481,14 @@ static struct fw_card_driver dummy_driver = {
+@@ -496,16 +481,14 @@ static struct fw_card_driver dummy_drive
  	.enable_phys_dma = dummy_enable_phys_dma,
  };
  
@@ -204,7 +193,7 @@
  {
  	card->driver->update_phy_reg(card, 4,
  				     PHY_LINK_ACTIVE | PHY_CONTENDER, 0);
-@@ -529,8 +512,7 @@ fw_core_remove_card(struct fw_card *card)
+@@ -529,8 +512,7 @@ fw_core_remove_card(struct fw_card *card
  }
  EXPORT_SYMBOL(fw_core_remove_card);
  
@@ -214,10 +203,9 @@
  {
  	int reg = short_reset ? 5 : 1;
  	int bit = short_reset ? PHY_BUS_SHORT_RESET : PHY_BUS_RESET;
-diff --git a/drivers/firewire/fw-cdev.c b/drivers/firewire/fw-cdev.c
-index ed03234..86ec4da 100644
---- a/drivers/firewire/fw-cdev.c
-+++ b/drivers/firewire/fw-cdev.c
+diff -Naurp linux-2.6-git/drivers/firewire/fw-cdev.c firewire-git/drivers/firewire/fw-cdev.c
+--- linux-2.6-git/drivers/firewire/fw-cdev.c	2008-11-04 11:19:19.000000000 -0500
++++ firewire-git/drivers/firewire/fw-cdev.c	2009-01-30 13:35:51.860646788 -0500
 @@ -18,87 +18,162 @@
   * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
   */
@@ -424,7 +412,7 @@
  {
  	return (__u64)(unsigned long)ptr;
  }
-@@ -107,7 +182,6 @@ static int fw_device_op_open(struct inode *inode, struct file *file)
+@@ -107,7 +182,6 @@ static int fw_device_op_open(struct inod
  {
  	struct fw_device *device;
  	struct client *client;
@@ -432,7 +420,7 @@
  
  	device = fw_device_get_by_devt(inode->i_rdev);
  	if (device == NULL)
-@@ -125,16 +199,17 @@ static int fw_device_op_open(struct inode *inode, struct file *file)
+@@ -125,16 +199,17 @@ static int fw_device_op_open(struct inod
  	}
  
  	client->device = device;
@@ -454,7 +442,7 @@
  
  	return 0;
  }
-@@ -150,68 +225,69 @@ static void queue_event(struct client *client, struct event *event,
+@@ -150,68 +225,69 @@ static void queue_event(struct client *c
  	event->v[1].size = size1;
  
  	spin_lock_irqsave(&client->lock, flags);
@@ -547,7 +535,7 @@
  	event->closure	     = client->bus_reset_closure;
  	event->type          = FW_CDEV_EVENT_BUS_RESET;
  	event->generation    = client->device->generation;
-@@ -220,39 +296,49 @@ fill_bus_reset_event(struct fw_cdev_event_bus_reset *event,
+@@ -220,39 +296,49 @@ fill_bus_reset_event(struct fw_cdev_even
  	event->bm_node_id    = 0; /* FIXME: We don't track the BM. */
  	event->irm_node_id   = card->irm_node->node_id;
  	event->root_node_id  = card->root_node->node_id;
@@ -613,7 +601,7 @@
  }
  
  void fw_device_cdev_update(struct fw_device *device)
-@@ -274,11 +360,11 @@ static int ioctl_get_info(struct client *client, void *buffer)
+@@ -274,11 +360,11 @@ static int ioctl_get_info(struct client 
  {
  	struct fw_cdev_get_info *get_info = buffer;
  	struct fw_cdev_event_bus_reset bus_reset;
@@ -626,7 +614,7 @@
  
  	down_read(&fw_device_rwsem);
  
-@@ -300,49 +386,61 @@ static int ioctl_get_info(struct client *client, void *buffer)
+@@ -300,49 +386,61 @@ static int ioctl_get_info(struct client 
  	client->bus_reset_closure = get_info->bus_reset_closure;
  	if (get_info->bus_reset != 0) {
  		void __user *uptr = u64_to_uptr(get_info->bus_reset);
@@ -711,7 +699,7 @@
  		return -EINVAL;
  
  	if (resource)
-@@ -350,203 +448,242 @@ release_client_resource(struct client *client, u32 handle,
+@@ -350,203 +448,242 @@ release_client_resource(struct client *c
  	else
  		r->release(client, r);
  
@@ -846,14 +834,7 @@
  
 -	response->resource.release = release_transaction;
 -	add_client_resource(client, &response->resource);
-+	e->r.resource.release = release_transaction;
-+	ret = add_client_resource(client, &e->r.resource, GFP_KERNEL);
-+	if (ret < 0)
-+		goto failed;
-+
-+	/* Get a reference for the transaction callback */
-+	client_get(client);
- 
+-
 -	fw_send_request(device->card, &response->transaction,
 -			request->tcode & 0x1f,
 -			device->node->node_id,
@@ -862,6 +843,14 @@
 -			request->offset,
 -			response->response.data, request->length,
 -			complete_transaction, response);
++	e->r.resource.release = release_transaction;
++	ret = add_client_resource(client, &e->r.resource, GFP_KERNEL);
++	if (ret < 0)
++		goto failed;
++
++	/* Get a reference for the transaction callback */
++	client_get(client);
++
 +	fw_send_request(client->device->card, &e->r.transaction,
 +			request->tcode & 0x1f, destination_id,
 +			request->generation, speed, request->offset,
@@ -942,16 +931,17 @@
 -	       int generation, int speed,
 -	       unsigned long long offset,
 -	       void *payload, size_t length, void *callback_data)
+-{
+-	struct address_handler *handler = callback_data;
+-	struct request *request;
+-	struct request_event *e;
+-	struct client *client = handler->client;
 +static void handle_request(struct fw_card *card, struct fw_request *request,
 +			   int tcode, int destination, int source,
 +			   int generation, int speed,
 +			   unsigned long long offset,
 +			   void *payload, size_t length, void *callback_data)
- {
--	struct address_handler *handler = callback_data;
--	struct request *request;
--	struct request_event *e;
--	struct client *client = handler->client;
++{
 +	struct address_handler_resource *handler = callback_data;
 +	struct inbound_transaction_resource *r;
 +	struct inbound_transaction_event *e;
@@ -966,18 +956,19 @@
 -		fw_send_response(card, r, RCODE_CONFLICT_ERROR);
 -		return;
 -	}
-+	if (r == NULL || e == NULL)
-+		goto failed;
- 
+-
 -	request->request = r;
 -	request->data    = payload;
 -	request->length  = length;
-+	r->request = request;
-+	r->data    = payload;
-+	r->length  = length;
++	if (r == NULL || e == NULL)
++		goto failed;
  
 -	request->resource.release = release_request;
 -	add_client_resource(client, &request->resource);
++	r->request = request;
++	r->data    = payload;
++	r->length  = length;
++
 +	r->resource.release = release_request;
 +	ret = add_client_resource(handler->client, &r->resource, GFP_ATOMIC);
 +	if (ret < 0)
@@ -1069,7 +1060,7 @@
  
  	return 0;
  }
-@@ -555,18 +692,22 @@ static int ioctl_deallocate(struct client *client, void *buffer)
+@@ -555,18 +692,22 @@ static int ioctl_deallocate(struct clien
  {
  	struct fw_cdev_deallocate *request = buffer;
  
@@ -1096,7 +1087,7 @@
  	if (request->length < r->length)
  		r->length = request->length;
  	if (copy_from_user(r->data, u64_to_uptr(request->data), r->length))
-@@ -588,85 +729,84 @@ static int ioctl_initiate_bus_reset(struct client *client, void *buffer)
+@@ -588,85 +729,84 @@ static int ioctl_initiate_bus_reset(stru
  	return fw_core_initiate_bus_reset(client->device->card, short_reset);
  }
  
@@ -1151,29 +1142,30 @@
 -	descriptor->d.immediate = request->immediate;
 -	descriptor->d.key = request->key;
 -	descriptor->d.data = descriptor->data;
-+	r->descriptor.length    = request->length;
-+	r->descriptor.immediate = request->immediate;
-+	r->descriptor.key       = request->key;
-+	r->descriptor.data      = r->data;
- 
+-
 -	retval = fw_core_add_descriptor(&descriptor->d);
 -	if (retval < 0) {
 -		kfree(descriptor);
 -		return retval;
--	}
++	r->descriptor.length    = request->length;
++	r->descriptor.immediate = request->immediate;
++	r->descriptor.key       = request->key;
++	r->descriptor.data      = r->data;
++
 +	ret = fw_core_add_descriptor(&r->descriptor);
 +	if (ret < 0)
 +		goto failed;
- 
--	descriptor->resource.release = release_descriptor;
--	add_client_resource(client, &descriptor->resource);
--	request->handle = descriptor->resource.handle;
++
 +	r->resource.release = release_descriptor;
 +	ret = add_client_resource(client, &r->resource, GFP_KERNEL);
 +	if (ret < 0) {
 +		fw_core_remove_descriptor(&r->descriptor);
 +		goto failed;
-+	}
+ 	}
+-
+-	descriptor->resource.release = release_descriptor;
+-	add_client_resource(client, &descriptor->resource);
+-	request->handle = descriptor->resource.handle;
 +	request->handle = r->resource.handle;
  
  	return 0;
@@ -1225,7 +1217,7 @@
  }
  
  static int ioctl_create_iso_context(struct client *client, void *buffer)
-@@ -871,6 +1011,237 @@ static int ioctl_get_cycle_timer(struct client *client, void *buffer)
+@@ -871,6 +1011,237 @@ static int ioctl_get_cycle_timer(struct 
  	return 0;
  }
  
@@ -1463,7 +1455,7 @@
  static int (* const ioctl_handlers[])(struct client *client, void *buffer) = {
  	ioctl_get_info,
  	ioctl_send_request,
-@@ -885,13 +1256,19 @@ static int (* const ioctl_handlers[])(struct client *client, void *buffer) = {
+@@ -885,13 +1256,19 @@ static int (* const ioctl_handlers[])(st
  	ioctl_start_iso,
  	ioctl_stop_iso,
  	ioctl_get_cycle_timer,
@@ -1486,7 +1478,7 @@
  
  	if (_IOC_TYPE(cmd) != '#' ||
  	    _IOC_NR(cmd) >= ARRAY_SIZE(ioctl_handlers))
-@@ -903,9 +1280,9 @@ dispatch_ioctl(struct client *client, unsigned int cmd, void __user *arg)
+@@ -903,9 +1280,9 @@ dispatch_ioctl(struct client *client, un
  			return -EFAULT;
  	}
  
@@ -1499,7 +1491,7 @@
  
  	if (_IOC_DIR(cmd) & _IOC_READ) {
  		if (_IOC_SIZE(cmd) > sizeof(buffer) ||
-@@ -913,12 +1290,11 @@ dispatch_ioctl(struct client *client, unsigned int cmd, void __user *arg)
+@@ -913,12 +1290,11 @@ dispatch_ioctl(struct client *client, un
  			return -EFAULT;
  	}
  
@@ -1527,7 +1519,7 @@
  {
  	struct client *client = file->private_data;
  
-@@ -947,7 +1322,7 @@ static int fw_device_op_mmap(struct file *file, struct vm_area_struct *vma)
+@@ -947,7 +1322,7 @@ static int fw_device_op_mmap(struct file
  	struct client *client = file->private_data;
  	enum dma_data_direction direction;
  	unsigned long size;
@@ -1536,7 +1528,7 @@
  
  	if (fw_device_is_shutdown(client->device))
  		return -ENODEV;
-@@ -973,48 +1348,57 @@ static int fw_device_op_mmap(struct file *file, struct vm_area_struct *vma)
+@@ -973,48 +1348,57 @@ static int fw_device_op_mmap(struct file
  	else
  		direction = DMA_FROM_DEVICE;
  
@@ -1617,15 +1609,12 @@
  
  	return 0;
  }
-diff --git a/drivers/firewire/fw-device.c b/drivers/firewire/fw-device.c
-index 2af5a8d..e4efdd3 100644
---- a/drivers/firewire/fw-device.c
-+++ b/drivers/firewire/fw-device.c
-@@ -25,9 +25,12 @@
- #include <linux/device.h>
- #include <linux/delay.h>
+diff -Naurp linux-2.6-git/drivers/firewire/fw-device.c firewire-git/drivers/firewire/fw-device.c
+--- linux-2.6-git/drivers/firewire/fw-device.c	2009-01-30 13:39:02.989651512 -0500
++++ firewire-git/drivers/firewire/fw-device.c	2009-01-30 13:35:51.860646788 -0500
+@@ -27,8 +27,10 @@
  #include <linux/idr.h>
-+#include <linux/jiffies.h>
+ #include <linux/jiffies.h>
  #include <linux/string.h>
 +#include <linux/mutex.h>
  #include <linux/rwsem.h>
@@ -1634,7 +1623,7 @@
  #include <asm/system.h>
  #include <linux/ctype.h>
  #include "fw-transaction.h"
-@@ -131,8 +134,7 @@ static int get_modalias(struct fw_unit *unit, char *buffer, size_t buffer_size)
+@@ -132,8 +134,7 @@ static int get_modalias(struct fw_unit *
  			vendor, model, specifier_id, version);
  }
  
@@ -1644,7 +1633,7 @@
  {
  	struct fw_unit *unit = fw_unit(dev);
  	char modalias[64];
-@@ -190,8 +192,8 @@ struct config_rom_attribute {
+@@ -191,8 +192,8 @@ struct config_rom_attribute {
  	u32 key;
  };
  
@@ -1655,7 +1644,7 @@
  {
  	struct config_rom_attribute *attr =
  		container_of(dattr, struct config_rom_attribute, attr);
-@@ -222,8 +224,8 @@ show_immediate(struct device *dev, struct device_attribute *dattr, char *buf)
+@@ -223,8 +224,8 @@ show_immediate(struct device *dev, struc
  #define IMMEDIATE_ATTR(name, key)				\
  	{ __ATTR(name, S_IRUGO, show_immediate, NULL), key }
  
@@ -1666,7 +1655,7 @@
  {
  	struct config_rom_attribute *attr =
  		container_of(dattr, struct config_rom_attribute, attr);
-@@ -292,10 +294,9 @@ static struct config_rom_attribute config_rom_attributes[] = {
+@@ -293,10 +294,9 @@ static struct config_rom_attribute confi
  	TEXT_LEAF_ATTR(hardware_version_name, CSR_HARDWARE_VERSION),
  };
  
@@ -1680,7 +1669,7 @@
  {
  	struct device_attribute *attr;
  	int i, j;
-@@ -318,9 +319,8 @@ init_fw_attribute_group(struct device *dev,
+@@ -319,9 +319,8 @@ init_fw_attribute_group(struct device *d
  	dev->groups = group->groups;
  }
  
@@ -1692,7 +1681,7 @@
  {
  	struct fw_unit *unit = fw_unit(dev);
  	int length;
-@@ -331,9 +331,8 @@ modalias_show(struct device *dev,
+@@ -332,9 +331,8 @@ modalias_show(struct device *dev,
  	return length + 1;
  }
  
@@ -1704,7 +1693,7 @@
  {
  	struct fw_device *device = fw_device(dev->parent);
  	struct fw_unit *unit = fw_unit(dev);
-@@ -348,8 +347,8 @@ static struct device_attribute fw_unit_attributes[] = {
+@@ -349,8 +347,8 @@ static struct device_attribute fw_unit_a
  	__ATTR_NULL,
  };
  
@@ -1715,7 +1704,7 @@
  {
  	struct fw_device *device = fw_device(dev);
  	size_t length;
-@@ -362,8 +361,8 @@ config_rom_show(struct device *dev, struct device_attribute *attr, char *buf)
+@@ -363,8 +361,8 @@ config_rom_show(struct device *dev, stru
  	return length;
  }
  
@@ -1726,7 +1715,7 @@
  {
  	struct fw_device *device = fw_device(dev);
  	int ret;
-@@ -382,8 +381,8 @@ static struct device_attribute fw_device_attributes[] = {
+@@ -383,8 +381,8 @@ static struct device_attribute fw_device
  	__ATTR_NULL,
  };
  
@@ -1737,193 +1726,7 @@
  {
  	int rcode;
  
-@@ -634,12 +633,38 @@ struct fw_device *fw_device_get_by_devt(dev_t devt)
- 	return device;
- }
- 
-+/*
-+ * These defines control the retry behavior for reading the config
-+ * rom.  It shouldn't be necessary to tweak these; if the device
-+ * doesn't respond to a config rom read within 10 seconds, it's not
-+ * going to respond at all.  As for the initial delay, a lot of
-+ * devices will be able to respond within half a second after bus
-+ * reset.  On the other hand, it's not really worth being more
-+ * aggressive than that, since it scales pretty well; if 10 devices
-+ * are plugged in, they're all getting read within one second.
-+ */
-+
-+#define MAX_RETRIES	10
-+#define RETRY_DELAY	(3 * HZ)
-+#define INITIAL_DELAY	(HZ / 2)
-+#define SHUTDOWN_DELAY	(2 * HZ)
-+
- static void fw_device_shutdown(struct work_struct *work)
- {
- 	struct fw_device *device =
- 		container_of(work, struct fw_device, work.work);
- 	int minor = MINOR(device->device.devt);
- 
-+	if (time_is_after_jiffies(device->card->reset_jiffies + SHUTDOWN_DELAY)) {
-+		schedule_delayed_work(&device->work, SHUTDOWN_DELAY);
-+		return;
-+	}
-+
-+	if (atomic_cmpxchg(&device->state,
-+			   FW_DEVICE_GONE,
-+			   FW_DEVICE_SHUTDOWN) != FW_DEVICE_GONE)
-+		return;
-+
- 	fw_device_cdev_remove(device);
- 	device_for_each_child(&device->device, NULL, shutdown_unit);
- 	device_unregister(&device->device);
-@@ -647,6 +672,7 @@ static void fw_device_shutdown(struct work_struct *work)
- 	down_write(&fw_device_rwsem);
- 	idr_remove(&fw_device_idr, minor);
- 	up_write(&fw_device_rwsem);
-+
- 	fw_device_put(device);
- }
- 
-@@ -654,25 +680,63 @@ static struct device_type fw_device_type = {
- 	.release	= fw_device_release,
- };
- 
-+static void fw_device_update(struct work_struct *work);
-+
- /*
-- * These defines control the retry behavior for reading the config
-- * rom.  It shouldn't be necessary to tweak these; if the device
-- * doesn't respond to a config rom read within 10 seconds, it's not
-- * going to respond at all.  As for the initial delay, a lot of
-- * devices will be able to respond within half a second after bus
-- * reset.  On the other hand, it's not really worth being more
-- * aggressive than that, since it scales pretty well; if 10 devices
-- * are plugged in, they're all getting read within one second.
-+ * If a device was pending for deletion because its node went away but its
-+ * bus info block and root directory header matches that of a newly discovered
-+ * device, revive the existing fw_device.
-+ * The newly allocated fw_device becomes obsolete instead.
-  */
-+static int lookup_existing_device(struct device *dev, void *data)
-+{
-+	struct fw_device *old = fw_device(dev);
-+	struct fw_device *new = data;
-+	struct fw_card *card = new->card;
-+	int match = 0;
-+
-+	down_read(&fw_device_rwsem); /* serialize config_rom access */
-+	spin_lock_irq(&card->lock);  /* serialize node access */
-+
-+	if (memcmp(old->config_rom, new->config_rom, 6 * 4) == 0 &&
-+	    atomic_cmpxchg(&old->state,
-+			   FW_DEVICE_GONE,
-+			   FW_DEVICE_RUNNING) == FW_DEVICE_GONE) {
-+		struct fw_node *current_node = new->node;
-+		struct fw_node *obsolete_node = old->node;
-+
-+		new->node = obsolete_node;
-+		new->node->data = new;
-+		old->node = current_node;
-+		old->node->data = old;
-+
-+		old->max_speed = new->max_speed;
-+		old->node_id = current_node->node_id;
-+		smp_wmb();  /* update node_id before generation */
-+		old->generation = card->generation;
-+		old->config_rom_retries = 0;
-+		fw_notify("rediscovered device %s\n", dev_name(dev));
- 
--#define MAX_RETRIES	10
--#define RETRY_DELAY	(3 * HZ)
--#define INITIAL_DELAY	(HZ / 2)
-+		PREPARE_DELAYED_WORK(&old->work, fw_device_update);
-+		schedule_delayed_work(&old->work, 0);
-+
-+		if (current_node == card->root_node)
-+			fw_schedule_bm_work(card, 0);
-+
-+		match = 1;
-+	}
-+
-+	spin_unlock_irq(&card->lock);
-+	up_read(&fw_device_rwsem);
-+
-+	return match;
-+}
- 
- static void fw_device_init(struct work_struct *work)
- {
- 	struct fw_device *device =
- 		container_of(work, struct fw_device, work.work);
-+	struct device *revived_dev;
- 	int minor, err;
- 
- 	/*
-@@ -696,6 +760,15 @@ static void fw_device_init(struct work_struct *work)
- 		return;
- 	}
- 
-+	revived_dev = device_find_child(device->card->device,
-+					device, lookup_existing_device);
-+	if (revived_dev) {
-+		put_device(revived_dev);
-+		fw_device_release(&device->device);
-+
-+		return;
-+	}
-+
- 	device_initialize(&device->device);
- 
- 	fw_device_get(device);
-@@ -734,9 +807,10 @@ static void fw_device_init(struct work_struct *work)
- 	 * fw_node_event().
- 	 */
- 	if (atomic_cmpxchg(&device->state,
--		    FW_DEVICE_INITIALIZING,
--		    FW_DEVICE_RUNNING) == FW_DEVICE_SHUTDOWN) {
--		fw_device_shutdown(work);
-+			   FW_DEVICE_INITIALIZING,
-+			   FW_DEVICE_RUNNING) == FW_DEVICE_GONE) {
-+		PREPARE_DELAYED_WORK(&device->work, fw_device_shutdown);
-+		schedule_delayed_work(&device->work, SHUTDOWN_DELAY);
- 	} else {
- 		if (device->config_rom_retries)
- 			fw_notify("created device %s: GUID %08x%08x, S%d00, "
-@@ -847,8 +921,8 @@ static void fw_device_refresh(struct work_struct *work)
- 
- 	case REREAD_BIB_UNCHANGED:
- 		if (atomic_cmpxchg(&device->state,
--			    FW_DEVICE_INITIALIZING,
--			    FW_DEVICE_RUNNING) == FW_DEVICE_SHUTDOWN)
-+				   FW_DEVICE_INITIALIZING,
-+				   FW_DEVICE_RUNNING) == FW_DEVICE_GONE)
- 			goto gone;
- 
- 		fw_device_update(work);
-@@ -879,8 +953,8 @@ static void fw_device_refresh(struct work_struct *work)
- 	create_units(device);
- 
- 	if (atomic_cmpxchg(&device->state,
--		    FW_DEVICE_INITIALIZING,
--		    FW_DEVICE_RUNNING) == FW_DEVICE_SHUTDOWN)
-+			   FW_DEVICE_INITIALIZING,
-+			   FW_DEVICE_RUNNING) == FW_DEVICE_GONE)
- 		goto gone;
- 
- 	fw_notify("refreshed device %s\n", dev_name(&device->device));
-@@ -890,8 +964,9 @@ static void fw_device_refresh(struct work_struct *work)
-  give_up:
- 	fw_notify("giving up on refresh of device %s\n", dev_name(&device->device));
-  gone:
--	atomic_set(&device->state, FW_DEVICE_SHUTDOWN);
--	fw_device_shutdown(work);
-+	atomic_set(&device->state, FW_DEVICE_GONE);
-+	PREPARE_DELAYED_WORK(&device->work, fw_device_shutdown);
-+	schedule_delayed_work(&device->work, SHUTDOWN_DELAY);
-  out:
- 	if (node_id == card->root_node->node_id)
- 		fw_schedule_bm_work(card, 0);
-@@ -926,6 +1001,7 @@ void fw_node_event(struct fw_card *card, struct fw_node *node, int event)
+@@ -1004,6 +1002,7 @@ void fw_node_event(struct fw_card *card,
  		device->node = fw_node_get(node);
  		device->node_id = node->node_id;
  		device->generation = card->generation;
@@ -1931,23 +1734,10 @@
  		INIT_LIST_HEAD(&device->client_list);
  
  		/*
-@@ -995,9 +1071,9 @@ void fw_node_event(struct fw_card *card, struct fw_node *node, int event)
- 		 */
- 		device = node->data;
- 		if (atomic_xchg(&device->state,
--				FW_DEVICE_SHUTDOWN) == FW_DEVICE_RUNNING) {
-+				FW_DEVICE_GONE) == FW_DEVICE_RUNNING) {
- 			PREPARE_DELAYED_WORK(&device->work, fw_device_shutdown);
--			schedule_delayed_work(&device->work, 0);
-+			schedule_delayed_work(&device->work, SHUTDOWN_DELAY);
- 		}
- 		break;
- 	}
-diff --git a/drivers/firewire/fw-device.h b/drivers/firewire/fw-device.h
-index df51732..41483f1 100644
---- a/drivers/firewire/fw-device.h
-+++ b/drivers/firewire/fw-device.h
-@@ -23,11 +23,13 @@
+diff -Naurp linux-2.6-git/drivers/firewire/fw-device.h firewire-git/drivers/firewire/fw-device.h
+--- linux-2.6-git/drivers/firewire/fw-device.h	2009-01-30 13:39:02.989651512 -0500
++++ firewire-git/drivers/firewire/fw-device.h	2009-01-30 13:35:51.860646788 -0500
+@@ -23,6 +23,7 @@
  #include <linux/cdev.h>
  #include <linux/idr.h>
  #include <linux/rwsem.h>
@@ -1955,13 +1745,7 @@
  #include <asm/atomic.h>
  
  enum fw_device_state {
- 	FW_DEVICE_INITIALIZING,
- 	FW_DEVICE_RUNNING,
-+	FW_DEVICE_GONE,
- 	FW_DEVICE_SHUTDOWN,
- };
- 
-@@ -63,7 +65,10 @@ struct fw_device {
+@@ -64,7 +65,10 @@ struct fw_device {
  	bool cmc;
  	struct fw_card *card;
  	struct device device;
@@ -1972,7 +1756,7 @@
  	u32 *config_rom;
  	size_t config_rom_length;
  	int config_rom_retries;
-@@ -175,8 +180,7 @@ struct fw_driver {
+@@ -176,8 +180,7 @@ struct fw_driver {
  	const struct fw_device_id *id_table;
  };
  
@@ -1982,10 +1766,9 @@
  {
  	return container_of(drv, struct fw_driver, driver);
  }
-diff --git a/drivers/firewire/fw-iso.c b/drivers/firewire/fw-iso.c
-index e14c03d..f511d16 100644
---- a/drivers/firewire/fw-iso.c
-+++ b/drivers/firewire/fw-iso.c
+diff -Naurp linux-2.6-git/drivers/firewire/fw-iso.c firewire-git/drivers/firewire/fw-iso.c
+--- linux-2.6-git/drivers/firewire/fw-iso.c	2008-11-04 11:18:33.000000000 -0500
++++ firewire-git/drivers/firewire/fw-iso.c	2009-01-30 13:35:51.860646788 -0500
 @@ -1,5 +1,7 @@
  /*
 - * Isochronous IO functionality
@@ -2030,7 +1813,7 @@
  	dma_addr_t address;
  
  	buffer->page_count = page_count;
-@@ -69,19 +75,19 @@ fw_iso_buffer_init(struct fw_iso_buffer *buffer, struct fw_card *card,
+@@ -69,19 +75,19 @@ fw_iso_buffer_init(struct fw_iso_buffer 
  	kfree(buffer->pages);
   out:
  	buffer->pages = NULL;
@@ -2055,7 +1838,7 @@
  		uaddr += PAGE_SIZE;
  	}
  
-@@ -105,14 +111,14 @@ void fw_iso_buffer_destroy(struct fw_iso_buffer *buffer,
+@@ -105,14 +111,14 @@ void fw_iso_buffer_destroy(struct fw_iso
  	buffer->pages = NULL;
  }
  
@@ -2075,7 +1858,7 @@
  	if (IS_ERR(ctx))
  		return ctx;
  
-@@ -134,25 +140,186 @@ void fw_iso_context_destroy(struct fw_iso_context *ctx)
+@@ -134,25 +140,186 @@ void fw_iso_context_destroy(struct fw_is
  	card->driver->free_iso_context(ctx);
  }
  
@@ -2271,10 +2054,9 @@
 +		*channel = ret;
 +	}
 +}
-diff --git a/drivers/firewire/fw-ohci.c b/drivers/firewire/fw-ohci.c
-index ab9c01e..859af71 100644
---- a/drivers/firewire/fw-ohci.c
-+++ b/drivers/firewire/fw-ohci.c
+diff -Naurp linux-2.6-git/drivers/firewire/fw-ohci.c firewire-git/drivers/firewire/fw-ohci.c
+--- linux-2.6-git/drivers/firewire/fw-ohci.c	2009-01-30 13:39:02.990772025 -0500
++++ firewire-git/drivers/firewire/fw-ohci.c	2009-01-30 13:35:51.861646907 -0500
 @@ -205,6 +205,7 @@ struct fw_ohci {
  
  	u32 it_context_mask;
@@ -2283,16 +2065,7 @@
  	u32 ir_context_mask;
  	struct iso_context *ir_context_list;
  };
-@@ -226,7 +227,7 @@ static inline struct fw_ohci *fw_ohci(struct fw_card *card)
- #define CONTEXT_DEAD	0x0800
- #define CONTEXT_ACTIVE	0x0400
- 
--#define OHCI1394_MAX_AT_REQ_RETRIES	0x2
-+#define OHCI1394_MAX_AT_REQ_RETRIES	0xf
- #define OHCI1394_MAX_AT_RESP_RETRIES	0x2
- #define OHCI1394_MAX_PHYS_RESP_RETRIES	0x8
- 
-@@ -441,9 +442,8 @@ static inline void flush_writes(const struct fw_ohci *ohci)
+@@ -441,9 +442,8 @@ static inline void flush_writes(const st
  	reg_read(ohci, OHCI1394_Version);
  }
  
@@ -2304,7 +2077,7 @@
  {
  	struct fw_ohci *ohci = fw_ohci(card);
  	u32 val, old;
-@@ -658,8 +658,8 @@ static void ar_context_tasklet(unsigned long data)
+@@ -658,8 +658,8 @@ static void ar_context_tasklet(unsigned 
  	}
  }
  
@@ -2315,7 +2088,7 @@
  {
  	struct ar_buffer ab;
  
-@@ -690,8 +690,7 @@ static void ar_context_run(struct ar_context *ctx)
+@@ -690,8 +690,7 @@ static void ar_context_run(struct ar_con
  	flush_writes(ctx->ohci);
  }
  
@@ -2325,7 +2098,7 @@
  {
  	int b, key;
  
-@@ -751,8 +750,7 @@ static void context_tasklet(unsigned long data)
+@@ -751,8 +750,7 @@ static void context_tasklet(unsigned lon
   * Allocate a new buffer and add it to the list of free buffers for this
   * context.  Must be called with ohci->lock held.
   */
@@ -2347,7 +2120,7 @@
  {
  	ctx->ohci = ohci;
  	ctx->regs = regs;
-@@ -814,8 +811,7 @@ context_init(struct context *ctx, struct fw_ohci *ohci,
+@@ -814,8 +811,7 @@ context_init(struct context *ctx, struct
  	return 0;
  }
  
@@ -2368,20 +2141,6 @@
  {
  	struct descriptor *d = NULL;
  	struct descriptor_buffer *desc = ctx->buffer_tail;
-@@ -896,11 +892,11 @@ static void context_stop(struct context *ctx)
- 	for (i = 0; i < 10; i++) {
- 		reg = reg_read(ctx->ohci, CONTROL_SET(ctx->regs));
- 		if ((reg & CONTEXT_ACTIVE) == 0)
--			break;
-+			return;
- 
--		fw_notify("context_stop: still active (0x%08x)\n", reg);
- 		mdelay(1);
- 	}
-+	fw_error("Error: DMA context still active (0x%08x)\n", reg);
- }
- 
- struct driver_data {
 @@ -912,8 +908,8 @@ struct driver_data {
   * Must always be called with the ochi->lock held to ensure proper
   * generation handling and locking around packet queue manipulation.
@@ -2393,7 +2152,7 @@
  {
  	struct fw_ohci *ohci = ctx->ohci;
  	dma_addr_t d_bus, uninitialized_var(payload_bus);
-@@ -1095,8 +1091,8 @@ static int handle_at_packet(struct context *context,
+@@ -1095,8 +1091,8 @@ static int handle_at_packet(struct conte
  #define HEADER_GET_DATA_LENGTH(q)	(((q) >> 16) & 0xffff)
  #define HEADER_GET_EXTENDED_TCODE(q)	(((q) >> 0) & 0xffff)
  
@@ -2404,7 +2163,7 @@
  {
  	struct fw_packet response;
  	int tcode, length, i;
-@@ -1122,8 +1118,8 @@ handle_local_rom(struct fw_ohci *ohci, struct fw_packet *packet, u32 csr)
+@@ -1122,8 +1118,8 @@ handle_local_rom(struct fw_ohci *ohci, s
  	fw_core_handle_response(&ohci->card, &response);
  }
  
@@ -2415,7 +2174,7 @@
  {
  	struct fw_packet response;
  	int tcode, length, ext_tcode, sel;
-@@ -1164,8 +1160,7 @@ handle_local_lock(struct fw_ohci *ohci, struct fw_packet *packet, u32 csr)
+@@ -1164,8 +1160,7 @@ handle_local_lock(struct fw_ohci *ohci, 
  	fw_core_handle_response(&ohci->card, &response);
  }
  
@@ -2425,7 +2184,7 @@
  {
  	u64 offset;
  	u32 csr;
-@@ -1205,11 +1200,10 @@ handle_local_request(struct context *ctx, struct fw_packet *packet)
+@@ -1205,11 +1200,10 @@ handle_local_request(struct context *ctx
  	}
  }
  
@@ -2439,7 +2198,7 @@
  
  	spin_lock_irqsave(&ctx->ohci->lock, flags);
  
-@@ -1220,10 +1214,10 @@ at_context_transmit(struct context *ctx, struct fw_packet *packet)
+@@ -1220,10 +1214,10 @@ at_context_transmit(struct context *ctx,
  		return;
  	}
  
@@ -2452,7 +2211,7 @@
  		packet->callback(packet, &ctx->ohci->card, packet->ack);
  
  }
-@@ -1590,12 +1584,12 @@ static int ohci_enable(struct fw_card *card, u32 *config_rom, size_t length)
+@@ -1590,12 +1584,12 @@ static int ohci_enable(struct fw_card *c
  	return 0;
  }
  
@@ -2468,7 +2227,7 @@
  	__be32 *next_config_rom;
  	dma_addr_t uninitialized_var(next_config_rom_bus);
  
-@@ -1649,7 +1643,7 @@ ohci_set_config_rom(struct fw_card *card, u32 *config_rom, size_t length)
+@@ -1649,7 +1643,7 @@ ohci_set_config_rom(struct fw_card *card
  
  		reg_write(ohci, OHCI1394_ConfigROMmap,
  			  ohci->next_config_rom_bus);
@@ -2477,7 +2236,7 @@
  	}
  
  	spin_unlock_irqrestore(&ohci->lock, flags);
-@@ -1661,13 +1655,13 @@ ohci_set_config_rom(struct fw_card *card, u32 *config_rom, size_t length)
+@@ -1661,13 +1655,13 @@ ohci_set_config_rom(struct fw_card *card
  	 * controller could need to access it before the bus reset
  	 * takes effect.
  	 */
@@ -2493,7 +2252,7 @@
  }
  
  static void ohci_send_request(struct fw_card *card, struct fw_packet *packet)
-@@ -1689,7 +1683,7 @@ static int ohci_cancel_packet(struct fw_card *card, struct fw_packet *packet)
+@@ -1689,7 +1683,7 @@ static int ohci_cancel_packet(struct fw_
  	struct fw_ohci *ohci = fw_ohci(card);
  	struct context *ctx = &ohci->at_request_ctx;
  	struct driver_data *driver_data = packet->driver_data;
@@ -2502,7 +2261,7 @@
  
  	tasklet_disable(&ctx->tasklet);
  
-@@ -1704,23 +1698,22 @@ static int ohci_cancel_packet(struct fw_card *card, struct fw_packet *packet)
+@@ -1704,23 +1698,22 @@ static int ohci_cancel_packet(struct fw_
  	driver_data->packet = NULL;
  	packet->ack = RCODE_CANCELLED;
  	packet->callback(packet, &ohci->card, packet->ack);
@@ -2531,7 +2290,7 @@
  
  	/*
  	 * FIXME:  Make sure this bitmask is cleared when we clear the busReset
-@@ -1730,7 +1723,7 @@ ohci_enable_phys_dma(struct fw_card *card, int node_id, int generation)
+@@ -1730,7 +1723,7 @@ ohci_enable_phys_dma(struct fw_card *car
  	spin_lock_irqsave(&ohci->lock, flags);
  
  	if (ohci->generation != generation) {
@@ -2540,7 +2299,7 @@
  		goto out;
  	}
  
-@@ -1748,12 +1741,12 @@ ohci_enable_phys_dma(struct fw_card *card, int node_id, int generation)
+@@ -1748,12 +1741,12 @@ ohci_enable_phys_dma(struct fw_card *car
  	flush_writes(ohci);
   out:
  	spin_unlock_irqrestore(&ohci->lock, flags);
@@ -2585,7 +2344,7 @@
  static int handle_ir_dualbuffer_packet(struct context *context,
  				       struct descriptor *d,
  				       struct descriptor *last)
-@@ -1775,7 +1790,6 @@ static int handle_ir_dualbuffer_packet(struct context *context,
+@@ -1775,7 +1790,6 @@ static int handle_ir_dualbuffer_packet(s
  	__le32 *ir_header;
  	size_t header_length;
  	void *p, *end;
@@ -2593,7 +2352,7 @@
  
  	if (db->first_res_count != 0 && db->second_res_count != 0) {
  		if (ctx->excess_bytes <= le16_to_cpu(db->second_req_count)) {
-@@ -1788,25 +1802,14 @@ static int handle_ir_dualbuffer_packet(struct context *context,
+@@ -1788,25 +1802,14 @@ static int handle_ir_dualbuffer_packet(s
  	header_length = le16_to_cpu(db->first_req_count) -
  		le16_to_cpu(db->first_res_count);
  
@@ -2622,7 +2381,7 @@
  
  	ctx->excess_bytes -= le16_to_cpu(db->second_req_count) -
  		le16_to_cpu(db->second_res_count);
-@@ -1832,7 +1835,6 @@ static int handle_ir_packet_per_buffer(struct context *context,
+@@ -1832,7 +1835,6 @@ static int handle_ir_packet_per_buffer(s
  	struct descriptor *pd;
  	__le32 *ir_header;
  	void *p;
@@ -2630,7 +2389,7 @@
  
  	for (pd = d; pd <= last; pd++) {
  		if (pd->transfer_status)
-@@ -1842,21 +1844,8 @@ static int handle_ir_packet_per_buffer(struct context *context,
+@@ -1842,21 +1844,8 @@ static int handle_ir_packet_per_buffer(s
  		/* Descriptor(s) not done yet, stop iteration */
  		return 0;
  
@@ -2654,7 +2413,7 @@
  
  	if (le16_to_cpu(last->control) & DESCRIPTOR_IRQ_ALWAYS) {
  		ir_header = (__le32 *) p;
-@@ -1888,21 +1877,24 @@ static int handle_it_packet(struct context *context,
+@@ -1888,21 +1877,24 @@ static int handle_it_packet(struct conte
  	return 1;
  }
  
@@ -2682,7 +2441,7 @@
  		mask = &ohci->ir_context_mask;
  		list = ohci->ir_context_list;
  		if (ohci->use_dualbuffer)
-@@ -1912,9 +1904,11 @@ ohci_allocate_iso_context(struct fw_card *card, int type, size_t header_size)
+@@ -1912,9 +1904,11 @@ ohci_allocate_iso_context(struct fw_card
  	}
  
  	spin_lock_irqsave(&ohci->lock, flags);
@@ -2696,7 +2455,7 @@
  	spin_unlock_irqrestore(&ohci->lock, flags);
  
  	if (index < 0)
-@@ -1932,8 +1926,8 @@ ohci_allocate_iso_context(struct fw_card *card, int type, size_t header_size)
+@@ -1932,8 +1926,8 @@ ohci_allocate_iso_context(struct fw_card
  	if (ctx->header == NULL)
  		goto out;
  
@@ -2707,7 +2466,7 @@
  		goto out_with_header;
  
  	return &ctx->base;
-@@ -1945,7 +1939,7 @@ ohci_allocate_iso_context(struct fw_card *card, int type, size_t header_size)
+@@ -1945,7 +1939,7 @@ ohci_allocate_iso_context(struct fw_card
  	*mask |= 1 << index;
  	spin_unlock_irqrestore(&ohci->lock, flags);
  
@@ -2716,7 +2475,7 @@
  }
  
  static int ohci_start_iso(struct fw_iso_context *base,
-@@ -2024,16 +2018,16 @@ static void ohci_free_iso_context(struct fw_iso_context *base)
+@@ -2024,16 +2018,16 @@ static void ohci_free_iso_context(struct
  	} else {
  		index = ctx - ohci->ir_context_list;
  		ohci->ir_context_mask |= 1 << index;
@@ -2738,7 +2497,7 @@
  {
  	struct iso_context *ctx = container_of(base, struct iso_context, base);
  	struct descriptor *d, *last, *pd;
-@@ -2128,11 +2122,10 @@ ohci_queue_iso_transmit(struct fw_iso_context *base,
+@@ -2128,11 +2122,10 @@ ohci_queue_iso_transmit(struct fw_iso_co
  	return 0;
  }
  
@@ -2754,7 +2513,7 @@
  {
  	struct iso_context *ctx = container_of(base, struct iso_context, base);
  	struct db_descriptor *db = NULL;
-@@ -2151,11 +2144,11 @@ ohci_queue_iso_receive_dualbuffer(struct fw_iso_context *base,
+@@ -2151,11 +2144,11 @@ ohci_queue_iso_receive_dualbuffer(struct
  	z = 2;
  
  	/*
@@ -2769,7 +2528,7 @@
  
  	/* Get header size in number of descriptors. */
  	header_z = DIV_ROUND_UP(header_size, sizeof(*d));
-@@ -2173,7 +2166,8 @@ ohci_queue_iso_receive_dualbuffer(struct fw_iso_context *base,
+@@ -2173,7 +2166,8 @@ ohci_queue_iso_receive_dualbuffer(struct
  		db = (struct db_descriptor *) d;
  		db->control = cpu_to_le16(DESCRIPTOR_STATUS |
  					  DESCRIPTOR_BRANCH_ALWAYS);
@@ -2779,7 +2538,7 @@
  		if (p->skip && rest == p->payload_length) {
  			db->control |= cpu_to_le16(DESCRIPTOR_WAIT);
  			db->first_req_count = db->first_size;
-@@ -2208,11 +2202,10 @@ ohci_queue_iso_receive_dualbuffer(struct fw_iso_context *base,
+@@ -2208,11 +2202,10 @@ ohci_queue_iso_receive_dualbuffer(struct
  	return 0;
  }
  
@@ -2795,7 +2554,7 @@
  {
  	struct iso_context *ctx = container_of(base, struct iso_context, base);
  	struct descriptor *d = NULL, *pd = NULL;
-@@ -2223,11 +2216,11 @@ ohci_queue_iso_receive_packet_per_buffer(struct fw_iso_context *base,
+@@ -2223,11 +2216,11 @@ ohci_queue_iso_receive_packet_per_buffer
  	int page, offset, packet_count, header_size, payload_per_buffer;
  
  	/*
@@ -2810,7 +2569,7 @@
  
  	/* Get header size in number of descriptors. */
  	header_z = DIV_ROUND_UP(header_size, sizeof(*d));
-@@ -2286,29 +2279,27 @@ ohci_queue_iso_receive_packet_per_buffer(struct fw_iso_context *base,
+@@ -2286,29 +2279,27 @@ ohci_queue_iso_receive_packet_per_buffer
  	return 0;
  }
  
@@ -2851,7 +2610,7 @@
  }
  
  static const struct fw_card_driver ohci_driver = {
-@@ -2357,8 +2348,8 @@ static void ohci_pmac_off(struct pci_dev *dev)
+@@ -2357,8 +2348,8 @@ static void ohci_pmac_off(struct pci_dev
  #define ohci_pmac_off(dev)
  #endif /* CONFIG_PPC_PMAC */
  
@@ -2862,7 +2621,7 @@
  {
  	struct fw_ohci *ohci;
  	u32 bus_options, max_receive, link_speed, version;
-@@ -2440,6 +2431,7 @@ pci_probe(struct pci_dev *dev, const struct pci_device_id *ent)
+@@ -2440,6 +2431,7 @@ pci_probe(struct pci_dev *dev, const str
  	ohci->it_context_list = kzalloc(size, GFP_KERNEL);
  
  	reg_write(ohci, OHCI1394_IsoXmitIntMaskSet, ~0);
@@ -2870,11 +2629,10 @@
  	ohci->ir_context_mask = reg_read(ohci, OHCI1394_IsoXmitIntMaskSet);
  	reg_write(ohci, OHCI1394_IsoXmitIntMaskClear, ~0);
  	size = sizeof(struct iso_context) * hweight32(ohci->ir_context_mask);
-diff --git a/drivers/firewire/fw-sbp2.c b/drivers/firewire/fw-sbp2.c
-index e88d506..090e72e 100644
---- a/drivers/firewire/fw-sbp2.c
-+++ b/drivers/firewire/fw-sbp2.c
-@@ -387,20 +387,18 @@ static const struct {
+diff -Naurp linux-2.6-git/drivers/firewire/fw-sbp2.c firewire-git/drivers/firewire/fw-sbp2.c
+--- linux-2.6-git/drivers/firewire/fw-sbp2.c	2009-01-30 13:39:02.991771976 -0500
++++ firewire-git/drivers/firewire/fw-sbp2.c	2009-01-30 13:35:51.861646907 -0500
+@@ -392,20 +392,18 @@ static const struct {
  	}
  };
  
@@ -2901,7 +2659,7 @@
  {
  	struct sbp2_logical_unit *lu = callback_data;
  	struct sbp2_orb *orb;
-@@ -446,9 +444,8 @@ sbp2_status_write(struct fw_card *card, struct fw_request *request,
+@@ -451,9 +449,8 @@ sbp2_status_write(struct fw_card *card, 
  	fw_send_response(card, request, RCODE_COMPLETE);
  }
  
@@ -2913,7 +2671,7 @@
  {
  	struct sbp2_orb *orb = data;
  	unsigned long flags;
-@@ -477,9 +474,8 @@ complete_transaction(struct fw_card *card, int rcode,
+@@ -482,9 +479,8 @@ complete_transaction(struct fw_card *car
  	kref_put(&orb->kref, free_orb);
  }
  
@@ -2925,7 +2683,7 @@
  {
  	struct fw_device *device = fw_device(lu->tgt->unit->device.parent);
  	unsigned long flags;
-@@ -526,8 +522,8 @@ static int sbp2_cancel_orbs(struct sbp2_logical_unit *lu)
+@@ -531,8 +527,8 @@ static int sbp2_cancel_orbs(struct sbp2_
  	return retval;
  }
  
@@ -2936,7 +2694,7 @@
  {
  	struct sbp2_management_orb *orb =
  		container_of(base_orb, struct sbp2_management_orb, base);
-@@ -537,10 +533,9 @@ complete_management_orb(struct sbp2_orb *base_orb, struct sbp2_status *status)
+@@ -542,10 +538,9 @@ complete_management_orb(struct sbp2_orb 
  	complete(&orb->done);
  }
  
@@ -2950,7 +2708,7 @@
  {
  	struct fw_device *device = fw_device(lu->tgt->unit->device.parent);
  	struct sbp2_management_orb *orb;
-@@ -647,9 +642,8 @@ static void sbp2_agent_reset(struct sbp2_logical_unit *lu)
+@@ -652,9 +647,8 @@ static void sbp2_agent_reset(struct sbp2
  			   &d, sizeof(d));
  }
  
@@ -2962,9 +2720,9 @@
  {
  	kfree(data);
  }
-@@ -1273,8 +1267,7 @@ static struct fw_driver sbp2_driver = {
- 	.id_table = sbp2_id_table,
- };
+@@ -1299,8 +1293,7 @@ static void sbp2_unmap_scatterlist(struc
+ 				 sizeof(orb->page_table), DMA_TO_DEVICE);
+ }
  
 -static unsigned int
 -sbp2_status_to_sense_data(u8 *sbp2_status, u8 *sense_data)
@@ -2972,7 +2730,7 @@
  {
  	int sam_status;
  
-@@ -1311,8 +1304,8 @@ sbp2_status_to_sense_data(u8 *sbp2_status, u8 *sense_data)
+@@ -1337,8 +1330,8 @@ sbp2_status_to_sense_data(u8 *sbp2_statu
  	}
  }
  
@@ -2983,7 +2741,7 @@
  {
  	struct sbp2_command_orb *orb =
  		container_of(base_orb, struct sbp2_command_orb, base);
-@@ -1366,9 +1359,8 @@ complete_command_orb(struct sbp2_orb *base_orb, struct sbp2_status *status)
+@@ -1384,9 +1377,8 @@ complete_command_orb(struct sbp2_orb *ba
  	orb->done(orb->cmd);
  }
  
@@ -2995,7 +2753,7 @@
  {
  	struct scatterlist *sg = scsi_sglist(orb->cmd);
  	int i, n;
-@@ -1573,9 +1565,8 @@ static int sbp2_scsi_abort(struct scsi_cmnd *cmd)
+@@ -1584,9 +1576,8 @@ static int sbp2_scsi_abort(struct scsi_c
   * This is the concatenation of target port identifier and logical unit
   * identifier as per SAM-2...SAM-4 annex A.
   */
@@ -3007,11 +2765,10 @@
  {
  	struct scsi_device *sdev = to_scsi_device(dev);
  	struct sbp2_logical_unit *lu;
-diff --git a/drivers/firewire/fw-topology.c b/drivers/firewire/fw-topology.c
-index c9be6e6..b44131c 100644
---- a/drivers/firewire/fw-topology.c
-+++ b/drivers/firewire/fw-topology.c
-@@ -314,9 +314,8 @@ typedef void (*fw_node_callback_t)(struct fw_card * card,
+diff -Naurp linux-2.6-git/drivers/firewire/fw-topology.c firewire-git/drivers/firewire/fw-topology.c
+--- linux-2.6-git/drivers/firewire/fw-topology.c	2009-01-30 13:39:02.991771976 -0500
++++ firewire-git/drivers/firewire/fw-topology.c	2009-01-30 13:35:51.862647087 -0500
+@@ -314,9 +314,8 @@ typedef void (*fw_node_callback_t)(struc
  				   struct fw_node * node,
  				   struct fw_node * parent);
  
@@ -3023,7 +2780,7 @@
  {
  	struct list_head list;
  	struct fw_node *node, *next, *child, *parent;
-@@ -349,9 +348,8 @@ for_each_fw_node(struct fw_card *card, struct fw_node *root,
+@@ -349,9 +348,8 @@ for_each_fw_node(struct fw_card *card, s
  		fw_node_put(node);
  }
  
@@ -3047,7 +2804,7 @@
  {
  	int b_path = (node->phy_speed == SCODE_BETA);
  
-@@ -415,8 +412,7 @@ static void move_tree(struct fw_node *node0, struct fw_node *node1, int port)
+@@ -415,8 +412,7 @@ static void move_tree(struct fw_node *no
   * found, lost or updated.  Update the nodes in the card topology tree
   * as we go.
   */
@@ -3057,7 +2814,7 @@
  {
  	struct list_head list0, list1;
  	struct fw_node *node0, *node1, *next1;
-@@ -497,8 +493,8 @@ update_tree(struct fw_card *card, struct fw_node *root)
+@@ -497,8 +493,8 @@ update_tree(struct fw_card *card, struct
  	}
  }
  
@@ -3068,7 +2825,7 @@
  {
  	int node_count;
  
-@@ -510,14 +506,24 @@ update_topology_map(struct fw_card *card, u32 *self_ids, int self_id_count)
+@@ -510,10 +506,8 @@ update_topology_map(struct fw_card *card
  	fw_compute_block_crc(card->topology_map);
  }
  
@@ -3081,26 +2838,9 @@
  {
  	struct fw_node *local_node;
  	unsigned long flags;
- 
-+	/*
-+	 * If the selfID buffer is not the immediate successor of the
-+	 * previously processed one, we cannot reliably compare the
-+	 * old and new topologies.
-+	 */
-+	if (!is_next_generation(generation, card->generation) &&
-+	    card->local_node != NULL) {
-+		fw_notify("skipped bus generations, destroying all nodes\n");
-+		fw_destroy_nodes(card);
-+		card->bm_retries = 0;
-+	}
-+
- 	spin_lock_irqsave(&card->lock, flags);
- 
- 	card->node_id = node_id;
-diff --git a/drivers/firewire/fw-topology.h b/drivers/firewire/fw-topology.h
-index addb9f8..3c497bb 100644
---- a/drivers/firewire/fw-topology.h
-+++ b/drivers/firewire/fw-topology.h
+diff -Naurp linux-2.6-git/drivers/firewire/fw-topology.h firewire-git/drivers/firewire/fw-topology.h
+--- linux-2.6-git/drivers/firewire/fw-topology.h	2008-11-04 11:18:33.000000000 -0500
++++ firewire-git/drivers/firewire/fw-topology.h	2009-01-30 13:35:51.862647087 -0500
 @@ -19,6 +19,11 @@
  #ifndef __fw_topology_h
  #define __fw_topology_h
@@ -3145,10 +2885,9 @@
 +int fw_compute_block_crc(u32 *block);
  
  #endif /* __fw_topology_h */
-diff --git a/drivers/firewire/fw-transaction.c b/drivers/firewire/fw-transaction.c
-index 699ac04..1537737 100644
---- a/drivers/firewire/fw-transaction.c
-+++ b/drivers/firewire/fw-transaction.c
+diff -Naurp linux-2.6-git/drivers/firewire/fw-transaction.c firewire-git/drivers/firewire/fw-transaction.c
+--- linux-2.6-git/drivers/firewire/fw-transaction.c	2009-01-30 13:39:02.991771976 -0500
++++ firewire-git/drivers/firewire/fw-transaction.c	2009-01-30 13:35:51.862647087 -0500
 @@ -64,10 +64,9 @@
  #define PHY_CONFIG_ROOT_ID(node_id)	((((node_id) & 0x3f) << 24) | (1 << 23))
  #define PHY_IDENTIFIER(id)		((id) << 30)
@@ -3163,7 +2902,7 @@
  {
  	struct fw_transaction *t;
  	unsigned long flags;
-@@ -94,9 +93,8 @@ close_transaction(struct fw_transaction *transaction,
+@@ -94,9 +93,8 @@ close_transaction(struct fw_transaction 
   * Only valid for transactions that are potentially pending (ie have
   * been sent).
   */
@@ -3175,7 +2914,7 @@
  {
  	/*
  	 * Cancel the packet transmission if it's still queued.  That
-@@ -116,9 +114,8 @@ fw_cancel_transaction(struct fw_card *card,
+@@ -116,9 +114,8 @@ fw_cancel_transaction(struct fw_card *ca
  }
  EXPORT_SYMBOL(fw_cancel_transaction);
  
@@ -3187,7 +2926,7 @@
  {
  	struct fw_transaction *t =
  	    container_of(packet, struct fw_transaction, packet);
-@@ -151,8 +148,7 @@ transmit_complete_callback(struct fw_packet *packet,
+@@ -151,8 +148,7 @@ transmit_complete_callback(struct fw_pac
  	}
  }
  
@@ -3197,7 +2936,7 @@
  		int destination_id, int source_id, int generation, int speed,
  		unsigned long long offset, void *payload, size_t length)
  {
-@@ -247,12 +243,10 @@ fw_fill_request(struct fw_packet *packet, int tcode, int tlabel,
+@@ -247,12 +243,10 @@ fw_fill_request(struct fw_packet *packet
   * @param callback_data pointer to arbitrary data, which will be
   *   passed to the callback
   */
@@ -3214,7 +2953,7 @@
  {
  	unsigned long flags;
  	int tlabel;
-@@ -322,8 +316,8 @@ static void transaction_callback(struct fw_card *card, int rcode,
+@@ -322,8 +316,8 @@ static void transaction_callback(struct 
   * Returns the RCODE.
   */
  int fw_run_transaction(struct fw_card *card, int tcode, int destination_id,
@@ -3225,7 +2964,7 @@
  {
  	struct transaction_callback_data d;
  	struct fw_transaction t;
-@@ -399,9 +393,8 @@ void fw_flush_transactions(struct fw_card *card)
+@@ -399,9 +393,8 @@ void fw_flush_transactions(struct fw_car
  	}
  }
  
@@ -3237,7 +2976,7 @@
  {
  	struct fw_address_handler *handler;
  
-@@ -414,9 +407,8 @@ lookup_overlapping_address_handler(struct list_head *list,
+@@ -414,9 +407,8 @@ lookup_overlapping_address_handler(struc
  	return NULL;
  }
  
@@ -3249,7 +2988,7 @@
  {
  	struct fw_address_handler *handler;
  
-@@ -449,36 +441,44 @@ const struct fw_address_region fw_unit_space_region =
+@@ -449,36 +441,44 @@ const struct fw_address_region fw_unit_s
  #endif  /*  0  */
  
  /**
@@ -3306,7 +3045,7 @@
  		} else {
  			list_add_tail(&handler->link, &address_handler_list);
  			ret = 0;
-@@ -493,12 +493,7 @@ fw_core_add_address_handler(struct fw_address_handler *handler,
+@@ -493,12 +493,7 @@ fw_core_add_address_handler(struct fw_ad
  EXPORT_SYMBOL(fw_core_add_address_handler);
  
  /**
@@ -3332,7 +3071,7 @@
  {
  	struct fw_request *request;
  
-@@ -528,9 +522,8 @@ free_response_callback(struct fw_packet *packet,
+@@ -528,9 +522,8 @@ free_response_callback(struct fw_packet 
  	kfree(request);
  }
  
@@ -3344,7 +3083,7 @@
  {
  	int tcode, tlabel, extended_tcode, source, destination;
  
-@@ -588,8 +581,7 @@ fw_fill_response(struct fw_packet *response, u32 *request_header,
+@@ -588,8 +581,7 @@ fw_fill_response(struct fw_packet *respo
  }
  EXPORT_SYMBOL(fw_fill_response);
  
@@ -3365,7 +3104,7 @@
  {
  	/* unified transaction or broadcast transaction: don't respond */
  	if (request->ack != ACK_PENDING ||
-@@ -670,8 +662,7 @@ fw_send_response(struct fw_card *card, struct fw_request *request, int rcode)
+@@ -670,8 +662,7 @@ fw_send_response(struct fw_card *card, s
  }
  EXPORT_SYMBOL(fw_send_response);
  
@@ -3375,7 +3114,7 @@
  {
  	struct fw_address_handler *handler;
  	struct fw_request *request;
-@@ -719,8 +710,7 @@ fw_core_handle_request(struct fw_card *card, struct fw_packet *p)
+@@ -719,8 +710,7 @@ fw_core_handle_request(struct fw_card *c
  }
  EXPORT_SYMBOL(fw_core_handle_request);
  
@@ -3385,7 +3124,7 @@
  {
  	struct fw_transaction *t;
  	unsigned long flags;
-@@ -793,12 +783,10 @@ static const struct fw_address_region topology_map_region =
+@@ -793,12 +783,10 @@ static const struct fw_address_region to
  	{ .start = CSR_REGISTER_BASE | CSR_TOPOLOGY_MAP,
  	  .end   = CSR_REGISTER_BASE | CSR_TOPOLOGY_MAP_END, };
  
@@ -3402,7 +3141,7 @@
  {
  	int i, start, end;
  	__be32 *map;
-@@ -832,12 +820,10 @@ static const struct fw_address_region registers_region =
+@@ -832,12 +820,10 @@ static const struct fw_address_region re
  	{ .start = CSR_REGISTER_BASE,
  	  .end   = CSR_REGISTER_BASE | CSR_CONFIG_ROM, };
  
@@ -3419,7 +3158,7 @@
  {
  	int reg = offset & ~CSR_REGISTER_BASE;
  	unsigned long long bus_time;
-@@ -939,11 +925,11 @@ static struct fw_descriptor model_id_descriptor = {
+@@ -939,11 +925,11 @@ static struct fw_descriptor model_id_des
  
  static int __init fw_core_init(void)
  {
@@ -3459,10 +3198,9 @@
  
  	return 0;
  }
-diff --git a/drivers/firewire/fw-transaction.h b/drivers/firewire/fw-transaction.h
-index c9ab12a..212a102 100644
---- a/drivers/firewire/fw-transaction.h
-+++ b/drivers/firewire/fw-transaction.h
+diff -Naurp linux-2.6-git/drivers/firewire/fw-transaction.h firewire-git/drivers/firewire/fw-transaction.h
+--- linux-2.6-git/drivers/firewire/fw-transaction.h	2009-01-30 13:39:02.992772636 -0500
++++ firewire-git/drivers/firewire/fw-transaction.h	2009-01-30 13:35:51.862647087 -0500
 @@ -82,14 +82,14 @@
  #define CSR_SPEED_MAP			0x2000
  #define CSR_SPEED_MAP_END		0x3000
@@ -3480,7 +3218,7 @@
  {
  	u32    *dst = _dst;
  	__be32 *src = _src;
-@@ -99,8 +99,7 @@ fw_memcpy_from_be32(void *_dst, void *_src, size_t size)
+@@ -99,8 +99,7 @@ fw_memcpy_from_be32(void *_dst, void *_s
  		dst[i] = be32_to_cpu(src[i]);
  }
  
@@ -3490,7 +3228,7 @@
  {
  	fw_memcpy_from_be32(_dst, _src, size);
  }
-@@ -125,8 +124,7 @@ typedef void (*fw_packet_callback_t)(struct fw_packet *packet,
+@@ -125,8 +124,7 @@ typedef void (*fw_packet_callback_t)(str
  				     struct fw_card *card, int status);
  
  typedef void (*fw_transaction_callback_t)(struct fw_card *card, int rcode,
@@ -3500,7 +3238,7 @@
  					  void *callback_data);
  
  /*
-@@ -141,12 +139,6 @@ typedef void (*fw_address_callback_t)(struct fw_card *card,
+@@ -141,12 +139,6 @@ typedef void (*fw_address_callback_t)(st
  				      void *data, size_t length,
  				      void *callback_data);
  
@@ -3534,23 +3272,7 @@
  struct fw_address_region {
  	u64 start;
  	u64 end;
-@@ -276,6 +261,15 @@ static inline void fw_card_put(struct fw_card *card)
- extern void fw_schedule_bm_work(struct fw_card *card, unsigned long delay);
- 
- /*
-+ * Check whether new_generation is the immediate successor of old_generation.
-+ * Take counter roll-over at 255 (as per to OHCI) into account.
-+ */
-+static inline bool is_next_generation(int new_generation, int old_generation)
-+{
-+	return (new_generation & 0xff) == ((old_generation + 1) & 0xff);
-+}
-+
-+/*
-  * The iso packet format allows for an immediate header/payload part
-  * stored in 'header' immediately after the packet info plus an
-  * indirect payload part that is pointer to by the 'payload' field.
-@@ -306,10 +300,8 @@ struct fw_iso_packet {
+@@ -315,10 +300,8 @@ struct fw_iso_packet {
  struct fw_iso_context;
  
  typedef void (*fw_iso_callback_t)(struct fw_iso_context *context,
@@ -3563,7 +3285,7 @@
  
  /*
   * An iso buffer is just a set of pages mapped for DMA in the
-@@ -335,36 +327,25 @@ struct fw_iso_context {
+@@ -344,36 +327,25 @@ struct fw_iso_context {
  	void *callback_data;
  };
  
@@ -3594,9 +3316,6 @@
 -int
 -fw_iso_context_start(struct fw_iso_context *ctx,
 -		     int cycle, int sync, int tags);
--
--int
--fw_iso_context_stop(struct fw_iso_context *ctx);
 +int fw_iso_buffer_init(struct fw_iso_buffer *buffer, struct fw_card *card,
 +		       int page_count, enum dma_data_direction direction);
 +int fw_iso_buffer_map(struct fw_iso_buffer *buffer, struct vm_area_struct *vma);
@@ -3613,13 +3332,15 @@
 +			 int cycle, int sync, int tags);
 +int fw_iso_context_stop(struct fw_iso_context *ctx);
 +void fw_iso_context_destroy(struct fw_iso_context *ctx);
-+
+ 
+-int
+-fw_iso_context_stop(struct fw_iso_context *ctx);
 +void fw_iso_resource_manage(struct fw_card *card, int generation,
 +		u64 channels_mask, int *channel, int *bandwidth, bool allocate);
  
  struct fw_card_driver {
  	/*
-@@ -406,7 +387,7 @@ struct fw_card_driver {
+@@ -415,7 +387,7 @@ struct fw_card_driver {
  
  	struct fw_iso_context *
  	(*allocate_iso_context)(struct fw_card *card,
@@ -3628,7 +3349,7 @@
  	void (*free_iso_context)(struct fw_iso_context *ctx);
  
  	int (*start_iso)(struct fw_iso_context *ctx,
-@@ -420,24 +401,18 @@ struct fw_card_driver {
+@@ -429,24 +401,18 @@ struct fw_card_driver {
  	int (*stop_iso)(struct fw_iso_context *ctx);
  };
  
@@ -3658,7 +3379,7 @@
  void fw_send_phy_config(struct fw_card *card,
  			int node_id, int generation, int gap_count);
  
-@@ -445,29 +420,18 @@ void fw_send_phy_config(struct fw_card *card,
+@@ -454,29 +420,18 @@ void fw_send_phy_config(struct fw_card *
   * Called by the topology code to inform the device code of node
   * activity; found, lost, or updated nodes.
   */
@@ -3698,10 +3419,8 @@
 +void fw_core_handle_response(struct fw_card *card, struct fw_packet *packet);
  
  #endif /* __fw_transaction_h */
-diff --git a/include/linux/firewire-cdev.h b/include/linux/firewire-cdev.h
-index 4d078e9..2e35379 100644
---- a/include/linux/firewire-cdev.h
-+++ b/include/linux/firewire-cdev.h
+--- linux-2.6-git/include/linux/firewire-cdev.h	2008-11-04 11:19:21.000000000 -0500
++++ firewire-git/include/linux/firewire-cdev.h	2009-01-30 13:35:54.327647015 -0500
 @@ -25,10 +25,12 @@
  #include <linux/types.h>
  #include <linux/firewire-constants.h>

linux-2.6.29-lirc.patch:

Index: linux-2.6.29-lirc.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/linux-2.6.29-lirc.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6.29-lirc.patch	30 Jan 2009 02:54:07 -0000	1.1
+++ linux-2.6.29-lirc.patch	30 Jan 2009 21:21:41 -0000	1.2
@@ -1,5 +1,3 @@
- drivers/hid/hid-core.c                |    2 +
- drivers/hid/hid-ids.h                 |    2 +
  drivers/input/Kconfig                 |    2 +
  drivers/input/Makefile                |    2 +
  drivers/input/lirc/Kconfig            |  118 +++
@@ -25,7 +23,7 @@
  drivers/input/lirc/lirc_ttusbir.c     |  396 ++++++++++
  drivers/input/lirc/lirc_zilog.c       | 1382 +++++++++++++++++++++++++++++++++
 
- 26 files changed, 14507 insertions(+), 0 deletions(-)
+ 24 files changed, 14503 insertions(+), 0 deletions(-)
 
 diff --git a/drivers/input/Kconfig b/drivers/input/Kconfig
 index 5f9d860..2ba0904 100644
@@ -14681,29 +14679,3 @@
 +
 +module_param(disable_tx, bool, 0644);
 +MODULE_PARM_DESC(disable_tx, "Disable the IR transmitter device");
-diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
-index 5d7640e..7001c31 100644
---- a/drivers/hid/hid-core.c
-+++ b/drivers/hid/hid-core.c
-@@ -1606,6 +1606,8 @@ static const struct hid_device_id hid_ignore_list[] = {
- 	{ HID_USB_DEVICE(USB_VENDOR_ID_SOUNDGRAPH, USB_DEVICE_ID_SOUNDGRAPH_IMON_LCD) },
- 	{ HID_USB_DEVICE(USB_VENDOR_ID_SOUNDGRAPH, USB_DEVICE_ID_SOUNDGRAPH_IMON_LCD2) },
- 	{ HID_USB_DEVICE(USB_VENDOR_ID_SOUNDGRAPH, USB_DEVICE_ID_SOUNDGRAPH_IMON_LCD3) },
-+	{ HID_USB_DEVICE(USB_VENDOR_ID_SOUNDGRAPH, USB_DEVICE_ID_SOUNDGRAPH_IMON_LCD4) },
-+	{ HID_USB_DEVICE(USB_VENDOR_ID_SOUNDGRAPH, USB_DEVICE_ID_SOUNDGRAPH_IMON_LCD5) },
- 	{ HID_USB_DEVICE(USB_VENDOR_ID_TENX, USB_DEVICE_ID_TENX_IBUDDY1) },
- 	{ HID_USB_DEVICE(USB_VENDOR_ID_TENX, USB_DEVICE_ID_TENX_IBUDDY2) },
- 	{ HID_USB_DEVICE(USB_VENDOR_ID_THRUSTMASTER, 0xb300) },
-diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
-index acc1abc..e899f51 100644
---- a/drivers/hid/hid-ids.h
-+++ b/drivers/hid/hid-ids.h
-@@ -362,6 +362,8 @@
- #define USB_DEVICE_ID_SOUNDGRAPH_IMON_LCD	0x0038
- #define USB_DEVICE_ID_SOUNDGRAPH_IMON_LCD2	0x0036
- #define USB_DEVICE_ID_SOUNDGRAPH_IMON_LCD3	0x0034
-+#define USB_DEVICE_ID_SOUNDGRAPH_IMON_LCD4	0x0044
-+#define USB_DEVICE_ID_SOUNDGRAPH_IMON_LCD5	0x0045
- 
- #define USB_VENDOR_ID_SUN		0x0430
- #define USB_DEVICE_ID_RARITAN_KVM_DONGLE	0xcdab


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/sources,v
retrieving revision 1.929
retrieving revision 1.930
diff -u -r1.929 -r1.930
--- sources	29 Jan 2009 21:14:12 -0000	1.929
+++ sources	30 Jan 2009 21:21:41 -0000	1.930
@@ -1,2 +1,3 @@
 d351e44709c9810b85e29b877f50968a  linux-2.6.28.tar.bz2
 d95a5be60287e9632c9d0513b59f6511  patch-2.6.29-rc3.bz2
+8adc233b361618457c3f44c25be1455b  patch-2.6.29-rc3-git1.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/upstream,v
retrieving revision 1.840
retrieving revision 1.841
diff -u -r1.840 -r1.841
--- upstream	29 Jan 2009 21:14:12 -0000	1.840
+++ upstream	30 Jan 2009 21:21:41 -0000	1.841
@@ -1,2 +1,3 @@
 linux-2.6.28.tar.bz2
 patch-2.6.29-rc3.bz2
+patch-2.6.29-rc3-git1.bz2


--- linux-2.6-gspca-git.patch DELETED ---


--- linux-2.6-gspca-stv06xx-git.patch DELETED ---



From pgordon at fedoraproject.org  Fri Jan 30 21:28:19 2009
From: pgordon at fedoraproject.org (Peter Gordon)
Date: Fri, 30 Jan 2009 21:28:19 +0000 (UTC)
Subject: rpms/WebKit/devel WebKit.spec,1.23,1.24
Message-ID: <20090130212819.DFCB970117@cvs1.fedora.phx.redhat.com>

Author: pgordon

Update of /cvs/pkgs/rpms/WebKit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29578

Modified Files:
	WebKit.spec 
Log Message:
Fix docdir ownership, but properly (#473619). Bump version to match the configure/build scripts.


Index: WebKit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/WebKit/devel/WebKit.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- WebKit.spec	30 Jan 2009 02:18:06 -0000	1.23
+++ WebKit.spec	30 Jan 2009 21:27:49 -0000	1.24
@@ -39,8 +39,8 @@
 %bcond_with	wml
 
 Name:		WebKit
-Version:	1.0.0
-Release:	0.16.svn%{svn_revision}%{?dist}
+Version:	1.1.0
+Release:	0.17.svn%{svn_revision}%{?dist}
 Summary:	Web content engine library
 
 Group:		Development/Libraries
@@ -197,10 +197,15 @@
 
 %files	doc -f docfiles.list
 %defattr(-,root,root,-)
-%dir %{_docdir}/
+%dir %{_docdir}/%{name}-%{version}
 
 
 %changelog
+* Fri Jan 30 2009 Peter Gordon <peter at thecodergeek.com> 1.1.0-0.18.svn40351
+- Fix ownership of doc directory...this time without the oops (#473619).
+- Bump package version number to match that used in the configure/build
+  scripts. (Thanks to Martin Sourada for the bug report via email.)
+
 * Thu Jan 29 2009 Peter Gordon <peter at thecodergeek.com> 1.0.0-0.17.svn40351
 - Update to new upstream snapshot (SVN 40351): adds the WebPolicyDelegate
   implementaton and related API (#482739).



From mbarnes at fedoraproject.org  Fri Jan 30 21:29:27 2009
From: mbarnes at fedoraproject.org (Matthew Barnes)
Date: Fri, 30 Jan 2009 21:29:27 +0000 (UTC)
Subject: rpms/evolution/F-10 .cvsignore, 1.103, 1.104 evolution.spec, 1.366, 
	1.367 sources, 1.103, 1.104
Message-ID: <20090130212927.801FD70117@cvs1.fedora.phx.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/evolution/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29763

Modified Files:
	.cvsignore evolution.spec sources 
Log Message:

* Fri Jan 30 2009 Matthew Barnes <mbarnes at redhat.com> - 2.24.4-1.fc10
- Update to 2.24.4



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/F-10/.cvsignore,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -r1.103 -r1.104
--- .cvsignore	12 Jan 2009 19:49:08 -0000	1.103
+++ .cvsignore	30 Jan 2009 21:28:57 -0000	1.104
@@ -1 +1 @@
-evolution-2.24.3.tar.bz2
+evolution-2.24.4.tar.bz2


Index: evolution.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/F-10/evolution.spec,v
retrieving revision 1.366
retrieving revision 1.367
diff -u -r1.366 -r1.367
--- evolution.spec	12 Jan 2009 20:23:54 -0000	1.366
+++ evolution.spec	30 Jan 2009 21:28:57 -0000	1.367
@@ -44,7 +44,7 @@
 ### Abstract ###
 
 Name: evolution
-Version: 2.24.3
+Version: 2.24.4
 Release: 1%{?dist}
 License: GPLv2 and GFDL
 Group: Applications/Productivity
@@ -696,6 +696,9 @@
 %{_libexecdir}/evolution/%{evo_major}/evolution-addressbook-clean
 
 %changelog
+* Fri Jan 30 2009 Matthew Barnes <mbarnes at redhat.com> - 2.24.4-1.fc10
+- Update to 2.24.4
+
 * Mon Jan 12 2009 Matthew Barnes <mbarnes at redhat.com> - 2.24.3-1.fc10
 - Update to 2.24.3
 - Bump eds_version to 2.24.3.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/F-10/sources,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -r1.103 -r1.104
--- sources	12 Jan 2009 19:49:08 -0000	1.103
+++ sources	30 Jan 2009 21:28:57 -0000	1.104
@@ -1 +1 @@
-6671b2d31ea77ba6190fadbc51186567  evolution-2.24.3.tar.bz2
+2d4cb1a65223b141e974b51452feae03  evolution-2.24.4.tar.bz2



From mbarnes at fedoraproject.org  Fri Jan 30 21:32:07 2009
From: mbarnes at fedoraproject.org (Matthew Barnes)
Date: Fri, 30 Jan 2009 21:32:07 +0000 (UTC)
Subject: rpms/gnome-python2-extras/devel gnome-python2-extras.spec, 1.46,
	1.47
Message-ID: <20090130213207.6570A70117@cvs1.fedora.phx.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/gnome-python2-extras/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30393

Modified Files:
	gnome-python2-extras.spec 
Log Message:

* Fri Jan 30 2009 Matthew Barnes <mbarnes at redhat.com> - 2.25.2-1
- Update to 2.25.2
- Bump libgda_version to 3.99.9



Index: gnome-python2-extras.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-python2-extras/devel/gnome-python2-extras.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- gnome-python2-extras.spec	30 Jan 2009 20:56:25 -0000	1.46
+++ gnome-python2-extras.spec	30 Jan 2009 21:31:37 -0000	1.47
@@ -7,7 +7,7 @@
 %define gtkhtml2_version 2.3.1
 %define gecko_version 1.9.1
 %define gtkspell_version 2.0.7
-%define libgda_version 3.99.6
+%define libgda_version 3.99.9
 %define libgdl_version 2.24.0
 
 ### Abstract ###
@@ -182,6 +182,7 @@
 %changelog
 * Fri Jan 30 2009 Matthew Barnes <mbarnes at redhat.com> - 2.25.2-1
 - Update to 2.25.2
+- Bump libgda_version to 3.99.9
 
 * Fri Jan 23 2009 Denis Leroy <denis at poolshark.org> - 2.25.1-1
 - Fixed Source URL



From mbarnes at fedoraproject.org  Fri Jan 30 21:36:18 2009
From: mbarnes at fedoraproject.org (Matthew Barnes)
Date: Fri, 30 Jan 2009 21:36:18 +0000 (UTC)
Subject: rpms/evolution-sharp/devel evolution-sharp.spec,1.58,1.59
Message-ID: <20090130213618.D6C2170117@cvs1.fedora.phx.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/evolution-sharp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31306

Modified Files:
	evolution-sharp.spec 
Log Message:

* Fri Jan 30 2009 Matthew Barnes <mbarnes at redhat.com> - 0.19.1-2.fc11
- Fix unowned directory (RH bug #483345).



Index: evolution-sharp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-sharp/devel/evolution-sharp.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- evolution-sharp.spec	20 Jan 2009 01:45:46 -0000	1.58
+++ evolution-sharp.spec	30 Jan 2009 21:35:48 -0000	1.59
@@ -2,7 +2,7 @@
 
 Name: evolution-sharp
 Version: 0.19.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: LGPLv2
 Group: System Environment/Libraries
 Summary: Evolution Data Server Mono Bindings
@@ -72,8 +72,8 @@
 %defattr(-,root,root,-)
 %doc COPYING README
 %{_libdir}/*.so
+%{_libdir}/mono/evolution-sharp/
 %{_libdir}/mono/gac/evolution-sharp/
-%{_libdir}/mono/evolution-sharp/evolution-sharp.dll
 %{_datadir}/gapi-2.0/
 
 %files devel
@@ -86,6 +86,9 @@
 # sonames may need to be updated in evolution-sharp's configure.in.
 
 %changelog
+* Fri Jan 30 2009 Matthew Barnes <mbarnes at redhat.com> - 0.19.1-2.fc11
+- Fix unowned directory (RH bug #483345).
+
 * Mon Jan 19 2009 Matthew Barnes <mbarnes at redhat.com> - 0.19.1-1.fc11
 - Update to 0.19.1
 



From sgrubb at fedoraproject.org  Fri Jan 30 21:40:03 2009
From: sgrubb at fedoraproject.org (Steve Grubb)
Date: Fri, 30 Jan 2009 21:40:03 +0000 (UTC)
Subject: rpms/aide/devel aide-0.12-dedosify.patch, NONE,
	1.1 aide-0.13.1-contextsize.patch, NONE, 1.1 aide.conf, 1.1,
	1.2 aide.spec, 1.23, 1.24 aide-0.12-selcon.patch, 1.2,
	NONE aide.conf.rhel, 1.1, NONE
Message-ID: <20090130214003.A18DE70117@cvs1.fedora.phx.redhat.com>

Author: sgrubb

Update of /cvs/pkgs/rpms/aide/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32094

Modified Files:
	aide.conf aide.spec 
Added Files:
	aide-0.12-dedosify.patch aide-0.13.1-contextsize.patch 
Removed Files:
	aide-0.12-selcon.patch aide.conf.rhel 
Log Message:
* Fri Jan 30 2009 Steve Grubb <sgrubb at redhat.com> - 0.13.1-6
- enable xattr support and update config file


aide-0.12-dedosify.patch:

--- NEW FILE aide-0.12-dedosify.patch ---
--- aide-0.12/contrib/gpg2_check.sh.spc	2007-06-21 12:37:06.000000000 -0400
+++ aide-0.12/contrib/gpg2_check.sh	2007-06-21 12:39:53.000000000 -0400
@@ -1,32 +1,32 @@
-#!/bin/sh
-# $Id: gpg2_check.sh,v 1.1 2006/01/22 20:25:37 rvdb Exp $
-
-# Script by Vincent Danen <vdanen at linsec.ca>
-
-hostname=`uname -n`
-echo "AIDE integrity check for ${hostname} beginning (`date`)"
-echo ""
-if [ ! -e /var/lib/aide/aide.db ] ; then
-    echo "**** Error: AIDE database for ${hostname} not found."
-    echo "**** Run 'aide --init' and move the appropriate database file."
-else
-    if [ -f /etc/aide.conf ]; then
-        if [ -f /var/lib/aide/aide.db.sig ]; then
-	    pushd /var/lib/aide >/dev/null
-	        echo "Verifying the GPG signature on the database..."
-		echo ""
-	        gpg --verify aide.db.sig
-		echo ""
-		if [ "$?" == "1" ]; then
-		    echo "************************************************************"
-		    echo "GPG signature FAILED!  Your database has been tampered with!"
-		    echo "************************************************************"
-		    exit 1
-		fi
-	    popd >/dev/null
-	fi
-        nice -20 /usr/sbin/aide --check 2>/dev/null
-    fi
-fi
-
-exit 0
+#!/bin/sh
+# $Id: gpg2_check.sh,v 1.1 2006/01/22 20:25:37 rvdb Exp $
+
+# Script by Vincent Danen <vdanen at linsec.ca>
+
+hostname=`uname -n`
+echo "AIDE integrity check for ${hostname} beginning (`date`)"
+echo ""
+if [ ! -e /var/lib/aide/aide.db ] ; then
+    echo "**** Error: AIDE database for ${hostname} not found."
+    echo "**** Run 'aide --init' and move the appropriate database file."
+else
+    if [ -f /etc/aide.conf ]; then
+        if [ -f /var/lib/aide/aide.db.sig ]; then
+	    pushd /var/lib/aide >/dev/null
+	        echo "Verifying the GPG signature on the database..."
+		echo ""
+	        gpg --verify aide.db.sig
+		echo ""
+		if [ "$?" == "1" ]; then
+		    echo "************************************************************"
+		    echo "GPG signature FAILED!  Your database has been tampered with!"
+		    echo "************************************************************"
+		    exit 1
+		fi
+	    popd >/dev/null
+	fi
+        nice -20 /usr/sbin/aide --check 2>/dev/null
+    fi
+fi
+
+exit 0
--- aide-0.12/contrib/gpg2_update.sh.spc	2007-06-21 12:37:24.000000000 -0400
+++ aide-0.12/contrib/gpg2_update.sh	2007-06-21 12:39:43.000000000 -0400
@@ -1,52 +1,52 @@
-#!/bin/sh
-# $Id: gpg2_update.sh,v 1.1 2006/01/22 20:25:37 rvdb Exp $
-#
-# script to update and rotate the AIDE database files and, optionally
-# create a detached GPG signature to verify the database file
-#
-# written by Vincent Danen <vdanen-at-annvix.org> 01/21/2006
-
-usegpg=0
-
-if [ -f /root/.gnupg/secring.gpg ]; then
-    usegpg=1
-fi
-
-if [ ! -d /var/lib/aide ]; then
-    echo "The AIDE database directory /var/lib/aide does not exist!"
-    exit 1
-fi
-
-pushd /var/lib/aide >/dev/null
-
-# copy the old database
-if [ -f aide.db ]; then
-    newfile="aide-`hostname`-`date +%Y%m%d-%H%M%S`.db"
-    if [ "${usegpg}" == 1 -a -f aide.db.sig ]; then
-        # do an integrity check
-	gpg --verify aide.db.sig
-	if [ "$?" == "1" ]; then
-	    echo "************************************************************"
-	    echo "GPG signature FAILED!  Your database has been tampered with!"
-	    echo "************************************************************"
-	    exit 1
-	fi
-    fi
-    cp -av aide.db ${newfile} 
-    /usr/sbin/aide --update -B "database=file:/var/lib/aide/${newfile}" 
-    if [ "${usegpg}" == "1" ]; then
-	# create the signature file
-	[[ -f aide.db.sig ]] && rm -f aide.db.sig
-        gpg --detach-sign aide.db
-	if [ "$?" == "1" ]; then
-	    echo "FATAL:  Error occurred when creating the signature file!"
-	    exit 1
-	fi
-    fi
-    gzip -9f ${newfile}
-else
-    echo "The AIDE database does not exist, can't update!"
-    exit 1
-fi
-
-popd >/dev/null
+#!/bin/sh
+# $Id: gpg2_update.sh,v 1.1 2006/01/22 20:25:37 rvdb Exp $
+#
+# script to update and rotate the AIDE database files and, optionally
+# create a detached GPG signature to verify the database file
+#
+# written by Vincent Danen <vdanen-at-annvix.org> 01/21/2006
+
+usegpg=0
+
+if [ -f /root/.gnupg/secring.gpg ]; then
+    usegpg=1
+fi
+
+if [ ! -d /var/lib/aide ]; then
+    echo "The AIDE database directory /var/lib/aide does not exist!"
+    exit 1
+fi
+
+pushd /var/lib/aide >/dev/null
+
+# copy the old database
+if [ -f aide.db ]; then
+    newfile="aide-`hostname`-`date +%Y%m%d-%H%M%S`.db"
+    if [ "${usegpg}" == 1 -a -f aide.db.sig ]; then
+        # do an integrity check
+	gpg --verify aide.db.sig
+	if [ "$?" == "1" ]; then
+	    echo "************************************************************"
+	    echo "GPG signature FAILED!  Your database has been tampered with!"
+	    echo "************************************************************"
+	    exit 1
+	fi
+    fi
+    cp -av aide.db ${newfile} 
+    /usr/sbin/aide --update -B "database=file:/var/lib/aide/${newfile}" 
+    if [ "${usegpg}" == "1" ]; then
+	# create the signature file
+	[[ -f aide.db.sig ]] && rm -f aide.db.sig
+        gpg --detach-sign aide.db
+	if [ "$?" == "1" ]; then
+	    echo "FATAL:  Error occurred when creating the signature file!"
+	    exit 1
+	fi
+    fi
+    gzip -9f ${newfile}
+else
+    echo "The AIDE database does not exist, can't update!"
+    exit 1
+fi
+
+popd >/dev/null

aide-0.13.1-contextsize.patch:

--- NEW FILE aide-0.13.1-contextsize.patch ---
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
often isn't enough to see what changed.
This patch increases the displayed length to 128 characters for selinux
contexts and also for link names.

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];
-char      nline[33];
+const int part_len = 33; /* usable length of line[] for most purposes */
+const int long_part_len = 129; /* length of line[] for link names and selinux contexts */
+char      oline[129];
+char      nline[129];
 const char* entry_format=        "  %-9s: %-33s, %s\n";
 const char* entry_format_justnew="  %-9s: %-33c  %s\n";
 /*************/
@@ -379,17 +380,17 @@ void print_str_changes(char*old,char*new
 
   if(old==NULL){
     if(new!=NULL){
-       snprintf(oline,part_len,"<NULL>");
-       snprintf(nline,part_len,"%s",new);
+       snprintf(oline,long_part_len,"<NULL>");
+       snprintf(nline,long_part_len,"%s",new);
        ok = 1;
     }
   } else if(new==NULL){
-       snprintf(oline,part_len,"%s",old);
-       snprintf(nline,part_len,"<NULL>");
+       snprintf(oline,long_part_len,"%s",old);
+       snprintf(nline,long_part_len,"<NULL>");
        ok = 1;
    } else if(strcmp(old,new)!=0){
-        snprintf(oline,part_len,"%s",old);
-        snprintf(nline,part_len,"%s",new);
+        snprintf(oline,long_part_len,"%s",old);
+        snprintf(nline,long_part_len,"%s",new);
         ok = 1;
   }
    if(ok)


Index: aide.conf
===================================================================
RCS file: /cvs/pkgs/rpms/aide/devel/aide.conf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- aide.conf	8 Nov 2004 04:00:58 -0000	1.1
+++ aide.conf	30 Jan 2009 21:39:33 -0000	1.2
@@ -1,6 +1,7 @@
 # Example configuration file for AIDE.
 
 @@define DBDIR /var/lib/aide
+@@define LOGDIR /var/log/aide
 
 # The location of the database to be read.
 database=file:@@{DBDIR}/aide.db.gz
@@ -16,7 +17,7 @@
 # Default.
 verbose=5
 
-report_url=file:/var/log/aide.log
+report_url=file:@@{LOGDIR}/aide.log
 report_url=stdout
 #report_url=stderr
 #NOT IMPLEMENTED report_url=mailto:root at foo.com
@@ -35,23 +36,52 @@
 #a:      atime
 #c:      ctime
 #S:      check for growing size
+#acl:           Access Control Lists
+#selinux        SELinux security context
+#xattrs:        Extended file attributes
 #md5:    md5 checksum
 #sha1:   sha1 checksum
+#sha256:        sha256 checksum
+#sha512:        sha512 checksum
 #rmd160: rmd160 checksum
 #tiger:  tiger checksum
-#haval:  haval checksum
-#gost:   gost checksum
-#crc32:  crc32 checksum
-#R:      p+i+n+u+g+s+m+c+md5
-#L:      p+i+n+u+g
-#E:      Empty group
-#>:      Growing logfile p+u+g+i+n+S
 
-# You can create custom rules like this.
-
-NORMAL = R+b+sha1
+#haval:  haval checksum (MHASH only)
+#gost:   gost checksum (MHASH only)
+#crc32:  crc32 checksum (MHASH only)
+#whirlpool:     whirlpool checksum (MHASH only)
+
+#R:             p+i+n+u+g+s+m+c+acl+selinux+xattrs+md5
+#L:             p+i+n+u+g+acl+selinux+xattrs
+#E:             Empty group
+#>:             Growing logfile p+u+g+i+n+S+acl+selinux+xattrs
 
-DIR = p+i+n+u+g
+# You can create custom rules like this.
+# With MHASH...
+# ALLXTRAHASHES = sha1+rmd160+sha256+sha512+whirlpool+tiger+haval+gost+crc32
+ALLXTRAHASHES = sha1+rmd160+sha256+sha512+tiger
+# Everything but access time (Ie. all changes)
+EVERYTHING = R+ALLXTRAHASHES
+
+# Sane, with multiple hashes
+# NORMAL = R+rmd160+sha256+whirlpool
+NORMAL = R+rmd160+sha256
+
+# For directories, don't bother doing hashes
+DIR = p+i+n+u+g+acl+selinux+xattrs
+
+# Access control only
+PERMS = p+i+u+g+acl+selinux
+
+# Logfile are special, in that they often change
+LOG = >
+
+# Just do md5 and sha256 hashes
+LSPP = R+sha256
+
+# Some files get updated automatically, so the inode/ctime/mtime change
+# but we want to know when the data inside them changes
+DATAONLY =  p+n+u+g+s+acl+selinux+xattrs+md5+sha256+rmd160+tiger
 
 # Next decide what directories/files you want in the database.
 
@@ -62,19 +92,120 @@
 /opt    NORMAL
 /usr    NORMAL
 /root   NORMAL
+# These are too volatile
+!/usr/src
+!/usr/tmp
 
 # Check only permissions, inode, user and group for /etc, but
 # cover some important files closely.
-/etc    p+i+u+g
+/etc    PERMS
 !/etc/mtab
+# Ignore backup files
+!/etc/.*~
 /etc/exports  NORMAL
 /etc/fstab    NORMAL
 /etc/passwd   NORMAL
 /etc/group    NORMAL
 /etc/gshadow  NORMAL
 /etc/shadow   NORMAL
+/etc/security/opasswd   NORMAL
+
+/etc/hosts.allow   NORMAL
+/etc/hosts.deny    NORMAL
+
+/etc/sudoers NORMAL
+/etc/skel NORMAL
 
-/var/log   p+n+u+g
+/etc/logrotate.d NORMAL
+
+/etc/resolv.conf DATAONLY
+
+/etc/nscd.conf NORMAL
+/etc/securetty NORMAL
+
+# Shell/X starting files
+/etc/profile NORMAL
+/etc/bashrc NORMAL
+/etc/bash_completion.d/ NORMAL
+/etc/login.defs NORMAL
+/etc/zprofile NORMAL
+/etc/zshrc NORMAL
+/etc/zlogin NORMAL
+/etc/zlogout NORMAL
+/etc/profile.d/ NORMAL
+/etc/X11/ NORMAL
+
+# Pkg manager
+/etc/yum.conf NORMAL
+/etc/yumex.conf NORMAL
+/etc/yumex.profiles.conf NORMAL
+/etc/yum/ NORMAL
+/etc/yum.repos.d/ NORMAL
+
+/var/log   LOG
+/var/run/utmp LOG
+
+# This gets new/removes-old filenames daily
+!/var/log/sa
+# As we are checking it, we've truncated yesterdays size to zero.
+!/var/log/aide.log
+
+# LSPP rules...
+# AIDE produces an audit record, so this becomes perpetual motion.
+# /var/log/audit/ LSPP
+/etc/audit/ LSPP
+/etc/libaudit.conf LSPP
+/usr/sbin/stunnel LSPP
+/var/spool/at LSPP
+/etc/at.allow LSPP
+/etc/at.deny LSPP
+/etc/cron.allow LSPP
+/etc/cron.deny LSPP
+/etc/cron.d/ LSPP
+/etc/cron.daily/ LSPP
+/etc/cron.hourly/ LSPP
+/etc/cron.monthly/ LSPP
+/etc/cron.weekly/ LSPP
+/etc/crontab LSPP
+/var/spool/cron/root LSPP
+
+/etc/login.defs LSPP
+/etc/securetty LSPP
+/var/log/faillog LSPP
+/var/log/lastlog LSPP
+
+/etc/hosts LSPP
+/etc/sysconfig LSPP
+
+/etc/inittab LSPP
+/etc/grub/ LSPP
+/etc/rc.d LSPP
+
+/etc/ld.so.conf LSPP
+
+/etc/localtime LSPP
+
+/etc/sysctl.conf LSPP
+
+/etc/modprobe.conf LSPP
+
+/etc/pam.d LSPP
+/etc/security LSPP
+/etc/aliases LSPP
+/etc/postfix LSPP
+
+/etc/ssh/sshd_config LSPP
+/etc/ssh/ssh_config LSPP
+
+/etc/stunnel LSPP
+
+/etc/vsftpd.ftpusers LSPP
+/etc/vsftpd LSPP
+
+/etc/issue LSPP
+/etc/issue.net LSPP
+
+/etc/cups LSPP
 
 # With AIDE's default verbosity level of 5, these would give lots of
 # warnings upon tree traversal. It might change with future version.
@@ -82,3 +213,8 @@
 #=/lost\+found    DIR
 #=/home           DIR
 
+# Ditto /var/log/sa reason...
+!/var/log/and-httpd
+
+# Admins dot files constantly change, just check perms
+/root/.* PERMS


Index: aide.spec
===================================================================
RCS file: /cvs/pkgs/rpms/aide/devel/aide.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- aide.spec	26 Sep 2008 17:29:01 -0000	1.23
+++ aide.spec	30 Jan 2009 21:39:33 -0000	1.24
@@ -7,25 +7,26 @@
 Summary: Intrusion detection environment
 Name: aide
 Version: 0.13.1
-Release: 5%{?dist}
+Release: 6%{?dist}
 URL: http://sourceforge.net/projects/aide
 License: GPLv2+
 Group: Applications/System
 Source0: http://download.sourceforge.net/aide/aide-%{version}.tar.gz
 Source1: aide.conf
 Source2: README.quickstart
-Source3: aide.conf.rhel
-Patch0: aide-0.13.1-manuals.patch
-Patch1: aide-0.12-selcon.patch
+Patch1: aide-0.13.1-contextsize.patch
+Patch2: aide-0.12-dedosify.patch
+Patch3: aide-0.13.1-manuals.patch
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n)
-Buildrequires: mhash-devel zlib-devel
+BuildRequires: mktemp
+Buildrequires: mhash-devel
+Buildrequires: zlib-devel libgcrypt-devel
 Buildrequires: flex bison
+Buildrequires: libattr-devel libacl-devel libselinux-devel
+Buildrequires: audit-libs-devel >= 1.2.8-2
 %if "%{?_with_curl}x" != "x"
 Buildrequires: curl-devel
 %endif
-Buildrequires: pkgconfig
-Buildrequires: libattr-devel libacl-devel libselinux-devel
-Buildrequires: audit-libs-devel >= 1.2.8-2
 #Buildrequires: postgresql-devel libgcrypt-devel
 #(needs --with-psql and -lgcrypt in src/Makefile.in)
 
@@ -36,22 +37,19 @@
 
 %prep
 %setup -q
-
-%patch0 -p1 -b .manuals
-# Adjust default paths in manual (not as safe as the patch).
-#sed -i -e 's!@sysconfdir@/aide.db\(.new\)\?!%{_localstatedir}/lib/aide/aide.db\1.gz!' doc/aide.1.in
-#sed -i -e 's!@sysconfdir@/aide.conf!%{_sysconfdir}/aide.conf!' doc/aide.1.in
-%patch1 -p1 -b .selcon
+%patch1 -p1 -b .contextsize
+%patch2 -p1 -b .dedosify
+%patch3 -p1 -b .manpages
 
 
 %build
 %configure --with-config_file=%{_sysconfdir}/aide.conf \
            --with-zlib \
+           --disable-static \
            --with-mhash --enable-mhash \
            %{?_with_curl} %{?_without_curl} \
-           --with-selinux --with-posix-acl --with-configmactype=sha256 \
-           --with-audit \
-           %{?nostatic}
+           --with-selinux --with-posix-acl --with-audit \
+           --with-xattr
 
 make %{?_smp_mflags}
 
@@ -59,11 +57,11 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 %makeinstall bindir=$RPM_BUILD_ROOT%{_sbindir}
+mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/log/aide
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}
 install -p %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}
 mkdir -p -m0700 $RPM_BUILD_ROOT%{_localstatedir}/lib/aide
 install -p %{SOURCE2} README.quickstart
-install -p %{SOURCE3} aide.conf.rhel
 
 
 %clean
@@ -73,15 +71,19 @@
 %files
 %defattr(0644,root,root,0755)
 %doc AUTHORS COPYING ChangeLog NEWS README doc/manual.html contrib/
-%doc README.quickstart aide.conf.rhel
+%doc README.quickstart
 %attr(0700,root,root) %{_sbindir}/aide
 %{_mandir}/man1/*
 %{_mandir}/man5/*
 %config(noreplace) %attr(0600,root,root) %{_sysconfdir}/aide.conf
 %dir %attr(0700,root,root) %{_localstatedir}/lib/aide
+%dir %attr(0700,root,root) %{_localstatedir}/log/aide
 
 
 %changelog
+* Fri Jan 30 2009 Steve Grubb <sgrubb at redhat.com> - 0.13.1-6
+- enable xattr support and update config file
+
 * Fri Sep 26 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.13.1-5
 - fix selcon patch to apply without fuzz
 


--- aide-0.12-selcon.patch DELETED ---


--- aide.conf.rhel DELETED ---



From nsantos at fedoraproject.org  Fri Jan 30 21:58:19 2009
From: nsantos at fedoraproject.org (Nuno Santos)
Date: Fri, 30 Jan 2009 21:58:19 +0000 (UTC)
Subject: rpms/amqp/F-9 .cvsignore, 1.12, 1.13 amqp.spec, 1.16, 1.17 sources, 
	1.15, 1.16
Message-ID: <20090130215819.DDC5570117@cvs1.fedora.phx.redhat.com>

Author: nsantos

Update of /cvs/extras/rpms/amqp/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3324

Modified Files:
	.cvsignore amqp.spec sources 
Log Message:
Rebased to svn rev 738618


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/amqp/F-9/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	15 Jan 2009 16:08:07 -0000	1.12
+++ .cvsignore	30 Jan 2009 21:57:49 -0000	1.13
@@ -1 +1 @@
-amqp-1.0.734452.tar.gz
+amqp-1.0.738618.tar.gz


Index: amqp.spec
===================================================================
RCS file: /cvs/extras/rpms/amqp/F-9/amqp.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- amqp.spec	15 Jan 2009 16:08:07 -0000	1.16
+++ amqp.spec	30 Jan 2009 21:57:49 -0000	1.17
@@ -1,5 +1,5 @@
 Name:           amqp
-Version:        1.0.734452
+Version:        1.0.738618
 Release:        1%{?dist}
 Epoch:          0
 Summary:        The AMQP specification
@@ -39,7 +39,10 @@
 
 
 %changelog
-* Thu Jan 15 2009 Nuno Santos <nsantos at redhat.com> - 0:1.0.734452-1
+* Wed Jan 28 2009 Nuno Santos <nsantos at redhat.com> - 0:1.0.738618-1
+- Rebased to svn rev 738618
+
+* Wed Jan 14 2009 Nuno Santos <nsantos at redhat.com> - 0:1.0.734452-1
 - Rebased to svn rev 734452
 
 * Tue Dec 23 2008 Nuno Santos <nsantos at redhat.com> - 0:1.0.728142-2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/amqp/F-9/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	15 Jan 2009 16:08:07 -0000	1.15
+++ sources	30 Jan 2009 21:57:49 -0000	1.16
@@ -1 +1 @@
-201602662e6a756afe2167b9650d787b  amqp-1.0.734452.tar.gz
+86da15fe433b1460c8394e052c32a709  amqp-1.0.738618.tar.gz



From cebbert at fedoraproject.org  Fri Jan 30 21:59:01 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Fri, 30 Jan 2009 21:59:01 +0000 (UTC)
Subject: rpms/kernel/F-10
	linux-2.6-input-atkbd-broaden-dell-signatures.patch, 
	NONE, 1.1.2.1 linux-2.6-input-atkbd-samsung-nc10-key-repeat-fix.patch,
	NONE, 1.1.2.1 kernel.spec, 1.1206.2.7, 1.1206.2.8
Message-ID: <20090130215901.3B7A670117@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3419

Modified Files:
      Tag: private-fedora-10-2_6_27
	kernel.spec 
Added Files:
      Tag: private-fedora-10-2_6_27
	linux-2.6-input-atkbd-broaden-dell-signatures.patch 
	linux-2.6-input-atkbd-samsung-nc10-key-repeat-fix.patch 
Log Message:
Add keyboard quirks for more systems:
  Some Dell machines have a different vendor name in DMI.
  Samsung NC10 doesn't generate keyup for some keys.

linux-2.6-input-atkbd-broaden-dell-signatures.patch:

--- NEW FILE linux-2.6-input-atkbd-broaden-dell-signatures.patch ---
From: Matthew Garrett <mjg59 at srcf.ucam.org>
Date: Tue, 30 Dec 2008 08:43:11 +0000 (-0800)
Subject: Input: atkbd - broaden the Dell DMI signatures
X-Git-Tag: v2.6.29-rc1~221^2~1^2~2
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=2a3ec3265741c3b2a7ebbd1b33f538e5a5583c48

Input: atkbd - broaden the Dell DMI signatures

Some Dells need the dell input quirk applied but have a different vendor
string in their DMI tables. Add an extra entry to cover these machines as
well.

Signed-off-by: Matthew Garrett <mjg at redhat.com>
Signed-off-by: Dmitry Torokhov <dtor at mail.ru>
---

diff --git a/drivers/input/keyboard/atkbd.c b/drivers/input/keyboard/atkbd.c
index 97f709f..f6e9f39 100644
--- a/drivers/input/keyboard/atkbd.c
+++ b/drivers/input/keyboard/atkbd.c
@@ -1509,6 +1509,15 @@ static struct dmi_system_id atkbd_dmi_quirk_table[] __initdata = {
 		.driver_data = atkbd_dell_laptop_keymap_fixup,
 	},
 	{
+		.ident = "Dell Laptop",
+		.matches = {
+			DMI_MATCH(DMI_SYS_VENDOR, "Dell Computer Corporation"),
+			DMI_MATCH(DMI_CHASSIS_TYPE, "8"), /* Portable */
+		},
+		.callback = atkbd_setup_fixup,
+		.driver_data = atkbd_dell_laptop_keymap_fixup,
+	},
+	{
 		.ident = "HP 2133",
 		.matches = {
 			DMI_MATCH(DMI_SYS_VENDOR, "Hewlett-Packard"),

linux-2.6-input-atkbd-samsung-nc10-key-repeat-fix.patch:

--- NEW FILE linux-2.6-input-atkbd-samsung-nc10-key-repeat-fix.patch ---
From: Stuart Hopkins <stuart at dodgy-geeza.com>
Date: Sat, 20 Dec 2008 09:12:33 +0000 (-0500)
Subject: Input: atkbd - Samsung NC10 key repeat fix
X-Git-Tag: v2.6.29-rc1~221^2~1^2~13
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=4200844bd9dc511088258437d564a187f0ffc94e

Input: atkbd - Samsung NC10 key repeat fix

This patch fixes the key repeat issue with the Fn+F? keys on the new
Samsung NC10 Netbook, so that the keys can be defined and used within
ACPID correctly, otherwise the keys repeat indefinately.

This solves part of http://bugzilla.kernel.org/show_bug.cgi?id=12021

Signed-off-by: Stuart Hopkins <stuart at dodgy-geeza.com>
Signed-off-by: Dmitry Torokhov <dtor at mail.ru>
---

diff --git a/drivers/input/keyboard/atkbd.c b/drivers/input/keyboard/atkbd.c
index fa6ed33..97f709f 100644
--- a/drivers/input/keyboard/atkbd.c
+++ b/drivers/input/keyboard/atkbd.c
@@ -901,6 +901,22 @@ static void atkbd_hp_zv6100_keymap_fixup(struct atkbd *atkbd)
 }
 
 /*
+ * Samsung NC10 with Fn+F? key release not working
+ */
+static void atkbd_samsung_keymap_fixup(struct atkbd *atkbd)
+{
+	const unsigned int forced_release_keys[] = {
+		0x82, 0x83, 0x84, 0x86, 0x88, 0x89, 0xb3, 0xf7, 0xf9,
+	};
+	int i;
+
+	if (atkbd->set == 2)
+		for (i = 0; i < ARRAY_SIZE(forced_release_keys); i++)
+			__set_bit(forced_release_keys[i],
+				  atkbd->force_release_mask);
+}
+
+/*
  * atkbd_set_keycode_table() initializes keyboard's keycode table
  * according to the selected scancode set
  */
@@ -1519,6 +1535,15 @@ static struct dmi_system_id atkbd_dmi_quirk_table[] __initdata = {
 		.callback = atkbd_setup_fixup,
 		.driver_data = atkbd_inventec_keymap_fixup,
 	},
+	{
+		.ident = "Samsung NC10",
+		.matches = {
+			DMI_MATCH(DMI_SYS_VENDOR, "SAMSUNG ELECTRONICS CO., LTD."),
+			DMI_MATCH(DMI_PRODUCT_NAME, "NC10"),
+		},
+		.callback = atkbd_setup_fixup,
+		.driver_data = atkbd_samsung_keymap_fixup,
+	},
 	{ }
 };
 


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/kernel.spec,v
retrieving revision 1.1206.2.7
retrieving revision 1.1206.2.8
diff -u -r1.1206.2.7 -r1.1206.2.8
--- kernel.spec	28 Jan 2009 18:27:13 -0000	1.1206.2.7
+++ kernel.spec	30 Jan 2009 21:58:30 -0000	1.1206.2.8
@@ -630,6 +630,8 @@
 Patch452: linux-2.6.27-hwmon-applesmc-2.6.28.patch
 # 448656
 Patch454: linux-2.6-input.git-i8042-add-xps-m1530-to-nomux.patch
+Patch455: linux-2.6-input-atkbd-broaden-dell-signatures.patch
+Patch456: linux-2.6-input-atkbd-samsung-nc10-key-repeat-fix.patch
 
 Patch460: linux-2.6-serial-460800.patch
 Patch510: linux-2.6-silence-noise.patch
@@ -1221,6 +1223,10 @@
 ApplyPatch linux-2.6.27-hwmon-applesmc-2.6.28.patch
 # 448656
 ApplyPatch linux-2.6-input.git-i8042-add-xps-m1530-to-nomux.patch
+# apply dell quirks to additional machines
+ApplyPatch linux-2.6-input-atkbd-broaden-dell-signatures.patch
+# fix key repeats on Samsung NC10
+ApplyPatch linux-2.6-input-atkbd-samsung-nc10-key-repeat-fix.patch
 
 # Allow to use 480600 baud on 16C950 UARTs
 ApplyPatch linux-2.6-serial-460800.patch
@@ -1911,6 +1917,11 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Fri Jan 30 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.27.13-170.2.8
+- Add keyboard quirks for more systems:
+  Some Dell machines have a different vendor name in DMI.
+  Samsung NC10 doesn't generate keyup for some keys.
+
 * Wed Jan 28 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.27.13-170.2.7
 - Drop sctp patch marged in 2.6.27.13
 



From nsantos at fedoraproject.org  Fri Jan 30 22:03:02 2009
From: nsantos at fedoraproject.org (Nuno Santos)
Date: Fri, 30 Jan 2009 22:03:02 +0000 (UTC)
Subject: rpms/python-qpid/F-9 .cvsignore, 1.12, 1.13 python-qpid.spec, 1.16, 
	1.17 sources, 1.16, 1.17
Message-ID: <20090130220302.7F0AD70117@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-serv4125

Modified Files:
	.cvsignore python-qpid.spec sources 
Log Message:
Rebased to svn rev 738618


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-qpid/F-9/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	15 Jan 2009 19:52:45 -0000	1.12
+++ .cvsignore	30 Jan 2009 22:02:31 -0000	1.13
@@ -1 +1 @@
-python-qpid-0.4.734452.tar.gz
+python-qpid-0.4.738618.tar.gz


Index: python-qpid.spec
===================================================================
RCS file: /cvs/extras/rpms/python-qpid/F-9/python-qpid.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- python-qpid.spec	15 Jan 2009 19:52:45 -0000	1.16
+++ python-qpid.spec	30 Jan 2009 22:02:32 -0000	1.17
@@ -1,5 +1,5 @@
 Name:           python-qpid
-Version:        0.4.734452
+Version:        0.4.738618
 Release:        1%{?dist}
 Summary:        Python language client for AMQP
 
@@ -16,7 +16,7 @@
 BuildRequires:  python-devel
 
 Requires:       python
-Requires:       amqp >= 1.0.734452
+Requires:       amqp >= 1.0.738618
 
 %description
 The Apache Qpid project's Python language client for AMQP.
@@ -75,6 +75,9 @@
 
 
 %changelog
+* Wed Jan 28 2009 Nuno Santos <nsantos at redhat.com> - 0.4.738618-1
+- Rebased to svn rev 738618
+
 * Wed Jan 14 2009 Nuno Santos <nsantos at redhat.com> - 0.4.734452-1
 - Rebased to svn rev 734452
 - BZ 478467: include examples


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-qpid/F-9/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources	15 Jan 2009 19:52:45 -0000	1.16
+++ sources	30 Jan 2009 22:02:32 -0000	1.17
@@ -1 +1 @@
-cb50d8ba6012bbc674c2d87860d4838d  python-qpid-0.4.734452.tar.gz
+5eb4d4722b50e1b2818d9ff863938bd5  python-qpid-0.4.738618.tar.gz



From nsantos at fedoraproject.org  Fri Jan 30 22:08:04 2009
From: nsantos at fedoraproject.org (Nuno Santos)
Date: Fri, 30 Jan 2009 22:08:04 +0000 (UTC)
Subject: rpms/ruby-qpid/F-9 .cvsignore, 1.6, 1.7 ruby-qpid.spec, 1.5,
	1.6 sources, 1.6, 1.7
Message-ID: <20090130220804.B735570117@cvs1.fedora.phx.redhat.com>

Author: nsantos

Update of /cvs/extras/rpms/ruby-qpid/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5018

Modified Files:
	.cvsignore ruby-qpid.spec sources 
Log Message:
Rebased to svn rev 738618


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ruby-qpid/F-9/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	15 Jan 2009 19:57:48 -0000	1.6
+++ .cvsignore	30 Jan 2009 22:07:34 -0000	1.7
@@ -1 +1 @@
-ruby-qpid-0.4.734452.tar.gz
+ruby-qpid-0.4.738618.tar.gz


Index: ruby-qpid.spec
===================================================================
RCS file: /cvs/extras/rpms/ruby-qpid/F-9/ruby-qpid.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ruby-qpid.spec	15 Jan 2009 19:57:49 -0000	1.5
+++ ruby-qpid.spec	30 Jan 2009 22:07:34 -0000	1.6
@@ -1,5 +1,5 @@
 Name:           ruby-qpid
-Version:	0.4.734452
+Version: 	0.4.738618
 Release:        1%{?dist}
 Summary:        Ruby language client for AMQP
 
@@ -7,23 +7,27 @@
 License:        ASL 2.0
 URL:            http://qpid.apache.org/
 Source0:        %{name}-%{version}.tar.gz
-# svn export http://svn.apache.org/repos/asf/qpid/trunk/qpid/ruby ruby-qpid
+# svn export http://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid/ruby \
+#  ruby-qpid
 # tar czf ruby-qpid.tar.gz ruby-qpid
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+%{!?ruby_sitelib: %define ruby_sitelib %(ruby -rrbconfig  -e 'puts Config::CONFIG["sitelibdir"]')}
 BuildArch:      noarch
 
 BuildRequires:  ruby
-BuildRequires:	amqp
+BuildRequires:  ruby-devel
+BuildRequires:	rubygem-rake
+BuildRequires:  amqp >= 1.0.%{version}
+BuildRequires:	cyrus-sasl-devel
 
 Requires:       ruby
 Requires:       ruby(abi) = 1.8
-Requires:       amqp >= 1.0.734452
+Requires:       amqp >= 1.0.%{version}
+Requires:	cyrus-sasl
 
 Provides:       ruby(qpid) = %{version}
 
-%{!?ruby_sitelib: %define ruby_sitelib %(ruby -rrbconfig  -e 'puts Config::CONFIG["sitelibdir"]')}
-
 %description
 The Apache Qpid project's Ruby language client for AMQP.
 
@@ -31,15 +35,20 @@
 %setup -q -n %{name}-%{version}
 
 %build
-ruby -I lib -r qpid -e 'Qpid::Spec010::load()'
+pushd ruby
+rake build
+popd
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -dm 755 $RPM_BUILD_ROOT%{ruby_sitelib}/qpid
-install -pm 644 lib/qpid/*.rb $RPM_BUILD_ROOT%{ruby_sitelib}/qpid
+install -pm 644 ruby/lib/qpid/*.rb $RPM_BUILD_ROOT%{ruby_sitelib}/qpid
 install -dm 755 $RPM_BUILD_ROOT%{ruby_sitelib}/qpid/spec_cache
-install -pm 644 lib/qpid/spec_cache/*.rb_marshal $RPM_BUILD_ROOT%{ruby_sitelib}/qpid/spec_cache
-install -pm 644 lib/qpid.rb $RPM_BUILD_ROOT%{ruby_sitelib}
+install -pm 644 ruby/lib/qpid/spec_cache/*.rb_marshal $RPM_BUILD_ROOT%{ruby_sitelib}/qpid/spec_cache
+install -pm 644 ruby/lib/qpid.rb $RPM_BUILD_ROOT%{ruby_sitelib}
+# to quiet rpmlint warning
+chmod -x ruby/LICENSE.txt
+rm -fr specs
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -48,20 +57,18 @@
 %defattr(-,root,root,-)
 %{ruby_sitelib}/qpid
 %{ruby_sitelib}/qpid.rb
-%doc LICENSE.txt NOTICE.txt
+%doc ruby/LICENSE.txt ruby/NOTICE.txt ruby/RELEASE_NOTES
 
 %changelog
-* Wed Jan 14 2009 Nuno Santos <nsantos at redhat.com> - 0.4.734452-1
-- Rebased to svn rev 734452
-
-* Tue Dec 23 2008 Nuno Santos <nsantos at redhat.com> - 0.4.728142-1
-- Rebased to svn rev 728142
+* Thu Jan 29 2009 Nuno Santos <nsantos at redhat.com> - 0.4.738618-1
+- Rebased to svn rev 738618
 
-* Tue Dec  2 2008 Nuno Santos <nsantos at redhat.com> - 0.3.722557-1
-- Rebased to svn rev 722557
+* Wed Dec 10 2008 Andrew Stitcher <astitcher at redhat.com> - 0.3.725356-1
+- Updated spec file to work with RHEL 4 and earlier Fedora versions
 
-* Tue Nov 25 2008 Nuno Santos <nsantos at redhat.com> - 0.3.720585-1
-- Rebased to svn rev 720585
+* Mon Dec  1 2008 Andrew Stitcher <astitcher at redhat.com> - 0.3.722126-1
+- Changed version numbering to fit other qpid packages
+- Added release notes to doc directory
 
 * Fri Nov 14 2008 Rafael Schloming <rafaels at redhat.com> - 0.2-1
 - Updated to work with qpid M4.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ruby-qpid/F-9/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	15 Jan 2009 19:57:49 -0000	1.6
+++ sources	30 Jan 2009 22:07:34 -0000	1.7
@@ -1 +1 @@
-4a8ef6ba2a2c4b50d100c950ce236e68  ruby-qpid-0.4.734452.tar.gz
+01fcbfd9e95cc24ffa1923bd497093c1  ruby-qpid-0.4.738618.tar.gz



From nsantos at fedoraproject.org  Fri Jan 30 22:20:13 2009
From: nsantos at fedoraproject.org (Nuno Santos)
Date: Fri, 30 Jan 2009 22:20:13 +0000 (UTC)
Subject: rpms/qpidc/F-9 .cvsignore, 1.15, 1.16 qpidc.spec, 1.47, 1.48 sources,
	1.29, 1.30
Message-ID: <20090130222014.27D4370117@cvs1.fedora.phx.redhat.com>

Author: nsantos

Update of /cvs/extras/rpms/qpidc/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7064

Modified Files:
	.cvsignore qpidc.spec sources 
Log Message:
Rebased to svn rev 738618


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/qpidc/F-9/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	15 Jan 2009 20:03:48 -0000	1.15
+++ .cvsignore	30 Jan 2009 22:19:42 -0000	1.16
@@ -1 +1 @@
-qpidc-0.4.734452.tar.gz
+qpidc-0.4.738618.tar.gz


Index: qpidc.spec
===================================================================
RCS file: /cvs/extras/rpms/qpidc/F-9/qpidc.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- qpidc.spec	22 Jan 2009 00:58:20 -0000	1.47
+++ qpidc.spec	30 Jan 2009 22:19:42 -0000	1.48
@@ -6,8 +6,8 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           qpidc
-Version:        0.4.734452
-Release:        4%{?dist}
+Version:        0.4.738618
+Release:        1%{?dist}
 Summary:        Libraries for Qpid C++ client applications
 Group:          System Environment/Libraries
 License:        ASL 2.0
@@ -91,6 +91,7 @@
 Summary: Header files and tools for developing QMF extensions
 Group: Development/System
 Requires: qmf = %version-%release
+Requires: %name-devel = %version-%release
 
 %description -n qmf-devel
 Header files and code-generation tools needed for developers of QMF-managed
@@ -172,7 +173,7 @@
 %description perftest
 Tools for performing testing and benchmarking of MRG-Messaging
 
-%pre
+%pre -n qpidd
 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 \
@@ -238,12 +239,14 @@
 %_libdir/libqpidcommon.so.0.1.0
 %_libdir/libqpidclient.so.0
 %_libdir/libqpidclient.so.0.1.0
+%dir %_libdir/qpid
 %dir %_libdir/qpid/client
 %dir %_sysconfdir/qpid
 %config(noreplace) %_sysconfdir/qpid/qpidc.conf
 
 %files devel
 %defattr(-,root,root,-)
+%dir %_includedir/qpid
 %_includedir/qpid/*.h
 %_includedir/qpid/amqp_0_10
 %_includedir/qpid/client
@@ -253,7 +256,6 @@
 %_includedir/qpid/log
 %_includedir/qpid/management
 %_includedir/qpid/agent
-%_includedir/qpid
 %_includedir/qmf
 %_libdir/libqpidcommon.so
 %_libdir/libqpidclient.so
@@ -264,13 +266,15 @@
 %defattr(-,root,root,-)
 %_libdir/libqpidbroker.so.0
 %_libdir/libqpidbroker.so.0.1.0
+%_libdir/qpid/daemon/replicating_listener.so
+%_libdir/qpid/daemon/replication_exchange.so
 %_sbindir/qpidd
 %config(noreplace) %_sysconfdir/qpidd.conf
 %config(noreplace) %_sysconfdir/sasl2/qpidd.conf
 %{_initrddir}/qpidd
 %dir %_libdir/qpid/daemon
 %attr(755, qpidd, qpidd) %_localstatedir/lib/qpidd
-%attr(755, qpidd, qpidd) %_libdir/qpidd
+#%attr(755, qpidd, qpidd) %_libdir/qpidd
 %attr(755, qpidd, qpidd) /var/run/qpidd
 %attr(600, qpidd, qpidd) %config(noreplace) %_localstatedir/lib/qpidd/qpidd.sasldb
 %doc %_mandir/man1/qpidd.*
@@ -372,6 +376,9 @@
 %postun -n qmf -p /sbin/ldconfig
 
 %changelog
+* Wed Jan 28 2009 Nuno Santos <nsantos at redhat.com> - 0.4.738618-1
+- Rebased to svn rev 738618
+
 * Tue Jan 20 2009 Nuno Santos <nsantos at redhat.com> - 0.4.734452-3
 - BZ474614 and BZ474613 - qpidc/rhm unowned directories
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/qpidc/F-9/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- sources	15 Jan 2009 20:03:48 -0000	1.29
+++ sources	30 Jan 2009 22:19:42 -0000	1.30
@@ -1 +1 @@
-2b11da88553b325b1c6cfdb3031f077c  qpidc-0.4.734452.tar.gz
+fb7c84a7a179ee59bea66137061c4701  qpidc-0.4.738618.tar.gz



From spot at fedoraproject.org  Fri Jan 30 22:32:22 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Fri, 30 Jan 2009 22:32:22 +0000 (UTC)
Subject: rpms/ntfs-3g/F-10 ntfs-3g.spec,1.40,1.41 sources,1.28,1.29
Message-ID: <20090130223222.55C1C70117@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/extras/rpms/ntfs-3g/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9670/F-10

Modified Files:
	ntfs-3g.spec sources 
Log Message:
update to 2009.1.1


Index: ntfs-3g.spec
===================================================================
RCS file: /cvs/extras/rpms/ntfs-3g/F-10/ntfs-3g.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- ntfs-3g.spec	8 Jan 2009 21:18:16 -0000	1.40
+++ ntfs-3g.spec	30 Jan 2009 22:31:51 -0000	1.41
@@ -4,8 +4,8 @@
 
 Name:		ntfs-3g
 Summary: 	Linux NTFS userspace driver 
-Version:	1.5130
-Release:	2%{?dist}
+Version:	2009.1.1
+Release:	1%{?dist}
 License:	GPLv2+
 Group:		System Environment/Base
 Source0:	http://ntfs-3g.org/ntfs-3g-%{version}.tgz
@@ -128,9 +128,15 @@
 %{_libdir}/pkgconfig/libntfs-3g.pc
 
 %changelog
-* Thu Jan  8 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 2:1.5130-2
+* Fri Jan 30 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 2:2009.1.1-1
+- new release, new versioning scheme from upstream
+
+* Thu Jan  8 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 2:1.5222-0.2.RC
 - move pkgconfig Requires to -devel package where it belongs
 
+* Mon Dec 22 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 2:1.5222-0.1.RC
+- 1.5222-RC
+
 * Tue Dec  2 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 2:1.5130-1
 - update to 1.5130
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ntfs-3g/F-10/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- sources	2 Dec 2008 16:15:10 -0000	1.28
+++ sources	30 Jan 2009 22:31:51 -0000	1.29
@@ -1 +1 @@
-ad3c40bba398d162f97c2936293eae1f  ntfs-3g-1.5130.tgz
+56e4aed24d0c2543597de0ba52b3ed64  ntfs-3g-2009.1.1.tgz



From spot at fedoraproject.org  Fri Jan 30 22:32:22 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Fri, 30 Jan 2009 22:32:22 +0000 (UTC)
Subject: rpms/ntfs-3g/F-9 ntfs-3g.spec,1.40,1.41 sources,1.28,1.29
Message-ID: <20090130223222.7DC6670117@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-serv9670/F-9

Modified Files:
	ntfs-3g.spec sources 
Log Message:
update to 2009.1.1


Index: ntfs-3g.spec
===================================================================
RCS file: /cvs/extras/rpms/ntfs-3g/F-9/ntfs-3g.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- ntfs-3g.spec	8 Jan 2009 21:18:16 -0000	1.40
+++ ntfs-3g.spec	30 Jan 2009 22:31:52 -0000	1.41
@@ -4,8 +4,8 @@
 
 Name:		ntfs-3g
 Summary: 	Linux NTFS userspace driver 
-Version:	1.5130
-Release:	2%{?dist}
+Version:	2009.1.1
+Release:	1%{?dist}
 License:	GPLv2+
 Group:		System Environment/Base
 Source0:	http://ntfs-3g.org/ntfs-3g-%{version}.tgz
@@ -128,9 +128,15 @@
 %{_libdir}/pkgconfig/libntfs-3g.pc
 
 %changelog
-* Thu Jan  8 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 2:1.5130-2
+* Fri Jan 30 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 2:2009.1.1-1
+- new release, new versioning scheme from upstream
+
+* Thu Jan  8 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 2:1.5222-0.2.RC
 - move pkgconfig Requires to -devel package where it belongs
 
+* Mon Dec 22 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 2:1.5222-0.1.RC
+- 1.5222-RC
+
 * Tue Dec  2 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 2:1.5130-1
 - update to 1.5130
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ntfs-3g/F-9/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- sources	2 Dec 2008 16:15:10 -0000	1.28
+++ sources	30 Jan 2009 22:31:52 -0000	1.29
@@ -1 +1 @@
-ad3c40bba398d162f97c2936293eae1f  ntfs-3g-1.5130.tgz
+56e4aed24d0c2543597de0ba52b3ed64  ntfs-3g-2009.1.1.tgz



From spot at fedoraproject.org  Fri Jan 30 22:32:22 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Fri, 30 Jan 2009 22:32:22 +0000 (UTC)
Subject: rpms/ntfs-3g/devel .cvsignore, 1.27, 1.28 ntfs-3g.spec, 1.41,
	1.42 sources, 1.29, 1.30
Message-ID: <20090130223222.DC30070117@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/extras/rpms/ntfs-3g/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9670/devel

Modified Files:
	.cvsignore ntfs-3g.spec sources 
Log Message:
update to 2009.1.1


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ntfs-3g/devel/.cvsignore,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- .cvsignore	22 Dec 2008 20:02:05 -0000	1.27
+++ .cvsignore	30 Jan 2009 22:31:52 -0000	1.28
@@ -1 +1 @@
-ntfs-3g-1.5222-RC.tgz
+ntfs-3g-2009.1.1.tgz


Index: ntfs-3g.spec
===================================================================
RCS file: /cvs/extras/rpms/ntfs-3g/devel/ntfs-3g.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- ntfs-3g.spec	8 Jan 2009 21:18:16 -0000	1.41
+++ ntfs-3g.spec	30 Jan 2009 22:31:52 -0000	1.42
@@ -2,15 +2,13 @@
 # Default is internal fuse-lite.
 %define with_externalfuse %{?_with_externalfuse:1}%{!?_with_externalfuse:0}
 
-%define subrel RC
-
 Name:		ntfs-3g
 Summary: 	Linux NTFS userspace driver 
-Version:	1.5222
-Release:	0.2.%{subrel}%{?dist}
+Version:	2009.1.1
+Release:	1%{?dist}
 License:	GPLv2+
 Group:		System Environment/Base
-Source0:	http://ntfs-3g.org/ntfs-3g-%{version}-%{subrel}.tgz
+Source0:	http://ntfs-3g.org/ntfs-3g-%{version}.tgz
 Source1:	20-ntfs-config-write-policy.fdi
 Patch0:		ntfs-3g-1.2216-nomtab.patch
 URL:		http://www.ntfs-3g.org/
@@ -49,7 +47,7 @@
 functionality.
 
 %prep
-%setup -q -n %{name}-%{version}-%{subrel}
+%setup -q
 %patch0 -p1
 
 %build
@@ -130,6 +128,9 @@
 %{_libdir}/pkgconfig/libntfs-3g.pc
 
 %changelog
+* Fri Jan 30 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 2:2009.1.1-1
+- new release, new versioning scheme from upstream
+
 * Thu Jan  8 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 2:1.5222-0.2.RC
 - move pkgconfig Requires to -devel package where it belongs
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ntfs-3g/devel/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- sources	22 Dec 2008 20:02:05 -0000	1.29
+++ sources	30 Jan 2009 22:31:52 -0000	1.30
@@ -1 +1 @@
-5503472a0638df369eb90cd1b4fc495a  ntfs-3g-1.5222-RC.tgz
+56e4aed24d0c2543597de0ba52b3ed64  ntfs-3g-2009.1.1.tgz



From sarantis at fedoraproject.org  Fri Jan 30 22:39:12 2009
From: sarantis at fedoraproject.org (Sarantis Paskalis)
Date: Fri, 30 Jan 2009 22:39:12 +0000 (UTC)
Subject: rpms/ctan-kerkis-fonts/devel ctan-kerkis-fonts.spec,1.1,1.2
Message-ID: <20090130223912.D880C70117@cvs1.fedora.phx.redhat.com>

Author: sarantis

Update of /cvs/extras/rpms/ctan-kerkis-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11070

Modified Files:
	ctan-kerkis-fonts.spec 
Log Message:
Add forgotten %%{_fontdir} in %%files section in -common (bz #483333)



Index: ctan-kerkis-fonts.spec
===================================================================
RCS file: /cvs/extras/rpms/ctan-kerkis-fonts/devel/ctan-kerkis-fonts.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ctan-kerkis-fonts.spec	25 Jan 2009 15:02:51 -0000	1.1
+++ ctan-kerkis-fonts.spec	30 Jan 2009 22:38:42 -0000	1.2
@@ -15,7 +15,7 @@
 
 Name:           ctan-kerkis-fonts
 Version:        2.0
-Release:        18%{?dist}
+Release:        19%{?dist}
 Summary:        Kerkis Type 1 fonts
 Group:          Applications/Publishing
 License:        LPPL
@@ -169,6 +169,7 @@
 %files common
 %defattr(0644,root,root,0755)
 %doc License.txt README.html
+%dir %{_fontdir}
 
 
 %files -n %{texfontpkg}
@@ -184,6 +185,9 @@
 
 
 %changelog
+* Sat Jan 31 2009 Sarantis Paskalis <paskalis at di.uoa.gr> - 2.0-19
+- Add forgotten %%{_fontdir} in %%files section in -common (bz #483333)
+
 * Tue Jan 20 2009 Sarantis Paskalis <paskalis at di.uoa.gr> - 2.0-18
 - Address comments in https://bugzilla.redhat.com/show_bug.cgi?id=480591#c2
   (thanks Nicolas Mailhot)



From pkgdb at fedoraproject.org  Fri Jan 30 22:39:21 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 22:39:21 +0000
Subject: [pkgdb] fonts-sig ownership updated
Message-ID: <20090130223922.21DE620820B@bastion.fedora.phx.redhat.com>

Package fonts-sig in Fedora devel was orphaned by roozbeh

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/fonts-sig



From mnowak at fedoraproject.org  Fri Jan 30 23:10:29 2009
From: mnowak at fedoraproject.org (Michal Nowak)
Date: Fri, 30 Jan 2009 23:10:29 +0000 (UTC)
Subject: rpms/eclipse-pydev/devel .cvsignore, 1.14, 1.15 eclipse-pydev.spec, 
	1.21, 1.22 import.log, 1.1, 1.2 sources, 1.14, 1.15
Message-ID: <20090130231029.CC89B70117@cvs1.fedora.phx.redhat.com>

Author: mnowak

Update of /cvs/pkgs/rpms/eclipse-pydev/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16958/devel

Modified Files:
	.cvsignore eclipse-pydev.spec import.log sources 
Log Message:
- %%defattr(-,root,root,-) for mylyn sub-package
- Disable building -debuginfo due to psyco problems; resolves: rhbz#483357




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-pydev/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	14 Jan 2009 20:11:10 -0000	1.14
+++ .cvsignore	30 Jan 2009 23:09:57 -0000	1.15
@@ -1,7 +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.feature-src-1_3_22.zip
-org.python.pydev.feature-src-1_3_23.zip
-org.python.pydev.feature-src-1_3_24.zip
-org.python.pydev.feature-src-1_4_0.zip
 org.python.pydev.feature-src-1_4_2.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/devel/eclipse-pydev.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- eclipse-pydev.spec	14 Jan 2009 20:11:10 -0000	1.21
+++ eclipse-pydev.spec	30 Jan 2009 23:09:57 -0000	1.22
@@ -1,3 +1,6 @@
+# psyco: Bug 483357 - Empty eclipse-pydev-debuginfo
+%define debug_package %{nil}
+
 Epoch: 1
 
 %define eclipse_base        %{_libdir}/eclipse
@@ -6,10 +9,11 @@
 %define major     1
 %define minor     4
 %define maint     2
+
 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
@@ -206,9 +210,14 @@
 %{install_loc}/pydev
 
 %files mylyn
+%defattr(-,root,root,-)
 %{install_loc}/pydev-mylyn
 
 %changelog
+* Sat Jan 31 2009 Michal Nowak <mnowak at redhat.com> 1:1.4.2-2
+- %%defattr(-,root,root,-) for mylyn sub-package
+- Disable building -debuginfo due to psyco problems; resolves: rhbz#483357
+
 * Wed Jan 14 2009 Alexander Kurtakov <akurtako at redhat.com> 1:1.4.2-1
 - Update to 1.4.2.
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-pydev/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	14 Oct 2008 16:35:29 -0000	1.1
+++ import.log	30 Jan 2009 23:09:57 -0000	1.2
@@ -1 +1,2 @@
 eclipse-pydev-1_3_20-1_fc10:HEAD:eclipse-pydev-1.3.20-1.fc10.src.rpm:1224001997
+eclipse-pydev-1_4_2-2_fc10:HEAD:eclipse-pydev-1.4.2-2.fc10.src.rpm:1233356816


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-pydev/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	14 Jan 2009 20:11:10 -0000	1.14
+++ sources	30 Jan 2009 23:09:57 -0000	1.15
@@ -1,2 +1,2 @@
-3a42402df10a42af0a8d648711c36239  org.python.pydev.mylyn.feature-fetched-src-pydev_1_3_7.tar.bz2
 22b7dbf332b2c53372154f5ba651a41a  org.python.pydev.feature-src-1_4_2.zip
+3a42402df10a42af0a8d648711c36239  org.python.pydev.mylyn.feature-fetched-src-pydev_1_3_7.tar.bz2



From pkgdb at fedoraproject.org  Fri Jan 30 23:18:40 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Fri, 30 Jan 2009 23:18:40 +0000
Subject: [pkgdb] eclipse-pydev had acl change status
Message-ID: <20090130231841.751AC208485@bastion.fedora.phx.redhat.com>

mnowak has set the commit acl on eclipse-pydev (Fedora devel) to Obsolete for bkonrath

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/eclipse-pydev



From nsantos at fedoraproject.org  Fri Jan 30 23:30:08 2009
From: nsantos at fedoraproject.org (Nuno Santos)
Date: Fri, 30 Jan 2009 23:30:08 +0000 (UTC)
Subject: rpms/qpidc/devel qpidc.spec,1.66,1.67
Message-ID: <20090130233008.1EAE970117@cvs1.fedora.phx.redhat.com>

Author: nsantos

Update of /cvs/extras/rpms/qpidc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21056

Modified Files:
	qpidc.spec 
Log Message:
BZ474614 - qpidc : Unowned directories


Index: qpidc.spec
===================================================================
RCS file: /cvs/extras/rpms/qpidc/devel/qpidc.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- qpidc.spec	29 Jan 2009 20:59:15 -0000	1.66
+++ qpidc.spec	30 Jan 2009 23:29:37 -0000	1.67
@@ -7,7 +7,7 @@
 
 Name:           qpidc
 Version:        0.4.738618
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Libraries for Qpid C++ client applications
 Group:          System Environment/Libraries
 License:        ASL 2.0
@@ -91,6 +91,7 @@
 Summary: Header files and tools for developing QMF extensions
 Group: Development/System
 Requires: qmf = %version-%release
+Requires: %name-devel = %version-%release
 
 %description -n qmf-devel
 Header files and code-generation tools needed for developers of QMF-managed
@@ -240,12 +241,14 @@
 %_libdir/libqpidcommon.so.0.1.0
 %_libdir/libqpidclient.so.0
 %_libdir/libqpidclient.so.0.1.0
+%dir %_libdir/qpid
 %dir %_libdir/qpid/client
 %dir %_sysconfdir/qpid
 %config(noreplace) %_sysconfdir/qpid/qpidc.conf
 
 %files devel
 %defattr(-,root,root,-)
+%dir %_includedir/qpid
 %_includedir/qpid/*.h
 %_includedir/qpid/amqp_0_10
 %_includedir/qpid/client
@@ -255,7 +258,6 @@
 %_includedir/qpid/log
 %_includedir/qpid/management
 %_includedir/qpid/agent
-%_includedir/qpid
 %_includedir/qmf
 %_libdir/libqpidcommon.so
 %_libdir/libqpidclient.so
@@ -274,7 +276,7 @@
 %{_initrddir}/qpidd
 %dir %_libdir/qpid/daemon
 %attr(755, qpidd, qpidd) %_localstatedir/lib/qpidd
-%attr(755, qpidd, qpidd) %_libdir/qpidd
+#%attr(755, qpidd, qpidd) %_libdir/qpidd
 %attr(755, qpidd, qpidd) /var/run/qpidd
 %attr(600, qpidd, qpidd) %config(noreplace) %_localstatedir/lib/qpidd/qpidd.sasldb
 %doc %_mandir/man1/qpidd.*
@@ -376,7 +378,7 @@
 %postun -n qmf -p /sbin/ldconfig
 
 %changelog
-* Wed Jan 28 2009 Nuno Santos <nsantos at redhat.com> - 0.4.738618-1
+* Wed Jan 28 2009 Nuno Santos <nsantos at redhat.com> - 0.4.738618-2
 - Rebased to svn rev 738618
 
 * Tue Jan 20 2009 Nuno Santos <nsantos at redhat.com> - 0.4.734452-3



From spot at fedoraproject.org  Fri Jan 30 23:53:02 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Fri, 30 Jan 2009 23:53:02 +0000 (UTC)
Subject: rpms/lincity-ng/F-9 lincity-ng.spec,1.18,1.19 sources,1.9,1.10
Message-ID: <20090130235302.9830370142@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-serv24549/F-9

Modified Files:
	lincity-ng.spec sources 
Log Message:
2.0 final


Index: lincity-ng.spec
===================================================================
RCS file: /cvs/extras/rpms/lincity-ng/F-9/lincity-ng.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- lincity-ng.spec	24 Dec 2008 03:50:56 -0000	1.18
+++ lincity-ng.spec	30 Jan 2009 23:52:31 -0000	1.19
@@ -1,11 +1,11 @@
 Name:		lincity-ng
-Version:	1.97
-Release:	0.1.beta%{?dist}
+Version:	2.0
+Release:	1%{?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
+Source0:	http://download.berlios.de/lincity-ng/lincity-ng-%{version}.tar.bz2
 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
@@ -30,7 +30,7 @@
 play Lincity-NG.
 
 %prep
-%setup -q -n %{name}-%{version}.beta
+%setup -q -n %{name}-%{version}
 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
@@ -55,7 +55,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc %{_datadir}/doc/%{name}-%{version}.beta
+%doc %{_datadir}/doc/%{name}-%{version}
 %{_bindir}/lincity-ng
 %{_datadir}/pixmaps/*
 %{_datadir}/applications/fedora-lincity-ng.desktop
@@ -65,6 +65,9 @@
 %{_datadir}/lincity-ng/
 
 %changelog
+* Fri Jan 30 2009 Tom "spot" Callaway <tcallawa at redhat.com> 2.0-1
+- 2.0 final
+
 * Tue Dec 23 2008 Tom "spot" Callaway <tcallawa at redhat.com> 1.97-0.1.beta
 - update to 1.97.beta
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/lincity-ng/F-9/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	24 Dec 2008 03:50:56 -0000	1.9
+++ sources	30 Jan 2009 23:52:31 -0000	1.10
@@ -1 +1 @@
-04218b695055beaa3f969477a716f34f  lincity-ng-1.97.beta.tar.bz2
+1bd0f58e0f2b131d70044f4230600ed1  lincity-ng-2.0.tar.bz2



From spot at fedoraproject.org  Fri Jan 30 23:53:02 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Fri, 30 Jan 2009 23:53:02 +0000 (UTC)
Subject: rpms/lincity-ng/devel .cvsignore, 1.9, 1.10 lincity-ng.spec, 1.20, 
	1.21 sources, 1.9, 1.10
Message-ID: <20090130235302.9D12670143@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/extras/rpms/lincity-ng/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24549/devel

Modified Files:
	.cvsignore lincity-ng.spec sources 
Log Message:
2.0 final


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/lincity-ng/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	24 Dec 2008 03:50:56 -0000	1.9
+++ .cvsignore	30 Jan 2009 23:52:31 -0000	1.10
@@ -1 +1 @@
-lincity-ng-1.97.beta.tar.bz2
+lincity-ng-2.0.tar.bz2


Index: lincity-ng.spec
===================================================================
RCS file: /cvs/extras/rpms/lincity-ng/devel/lincity-ng.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- lincity-ng.spec	17 Jan 2009 17:21:41 -0000	1.20
+++ lincity-ng.spec	30 Jan 2009 23:52:31 -0000	1.21
@@ -1,11 +1,11 @@
 Name:		lincity-ng
-Version:	1.97
-Release:	0.3.beta%{?dist}
+Version:	2.0
+Release:	1%{?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
+Source0:	http://download.berlios.de/lincity-ng/lincity-ng-%{version}.tar.bz2
 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,7 +31,7 @@
 play Lincity-NG.
 
 %prep
-%setup -q -n %{name}-%{version}.beta
+%setup -q -n %{name}-%{version}
 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
@@ -60,7 +60,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc %{_datadir}/doc/%{name}-%{version}.beta
+%doc %{_datadir}/doc/%{name}-%{version}
 %{_bindir}/lincity-ng
 %{_datadir}/pixmaps/*
 %{_datadir}/applications/fedora-lincity-ng.desktop
@@ -70,6 +70,9 @@
 %{_datadir}/lincity-ng/
 
 %changelog
+* Fri Jan 30 2009 Tom "spot" Callaway <tcallawa at redhat.com> 2.0-1
+- 2.0 final
+
 * Sat Jan 17 2009 Tom "spot" Callaway <tcallawa at redhat.com> 1.97-0.3.beta
 - fix Requires: dejavu-sans-fonts
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/lincity-ng/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	24 Dec 2008 03:50:56 -0000	1.9
+++ sources	30 Jan 2009 23:52:31 -0000	1.10
@@ -1 +1 @@
-04218b695055beaa3f969477a716f34f  lincity-ng-1.97.beta.tar.bz2
+1bd0f58e0f2b131d70044f4230600ed1  lincity-ng-2.0.tar.bz2



From spot at fedoraproject.org  Fri Jan 30 23:53:02 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Fri, 30 Jan 2009 23:53:02 +0000 (UTC)
Subject: rpms/lincity-ng/F-10 sources,1.9,1.10
Message-ID: <20090130235302.A44E270144@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/extras/rpms/lincity-ng/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24549/F-10

Modified Files:
	sources 
Log Message:
2.0 final


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/lincity-ng/F-10/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	24 Dec 2008 03:50:56 -0000	1.9
+++ sources	30 Jan 2009 23:52:30 -0000	1.10
@@ -1 +1 @@
-04218b695055beaa3f969477a716f34f  lincity-ng-1.97.beta.tar.bz2
+1bd0f58e0f2b131d70044f4230600ed1  lincity-ng-2.0.tar.bz2



From spot at fedoraproject.org  Fri Jan 30 23:56:05 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Fri, 30 Jan 2009 23:56:05 +0000 (UTC)
Subject: rpms/lincity-ng/F-10 lincity-ng.spec,1.18,1.19
Message-ID: <20090130235605.3440970118@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/extras/rpms/lincity-ng/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25288

Modified Files:
	lincity-ng.spec 
Log Message:
update to 2.0


Index: lincity-ng.spec
===================================================================
RCS file: /cvs/extras/rpms/lincity-ng/F-10/lincity-ng.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- lincity-ng.spec	24 Dec 2008 03:50:56 -0000	1.18
+++ lincity-ng.spec	30 Jan 2009 23:55:34 -0000	1.19
@@ -1,11 +1,11 @@
 Name:		lincity-ng
-Version:	1.97
-Release:	0.1.beta%{?dist}
+Version:	2.0
+Release:	1%{?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
+Source0:	http://download.berlios.de/lincity-ng/lincity-ng-%{version}.tar.bz2
 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
@@ -30,7 +30,7 @@
 play Lincity-NG.
 
 %prep
-%setup -q -n %{name}-%{version}.beta
+%setup -q -n %{name}-%{version}
 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
@@ -55,7 +55,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc %{_datadir}/doc/%{name}-%{version}.beta
+%doc %{_datadir}/doc/%{name}-%{version}
 %{_bindir}/lincity-ng
 %{_datadir}/pixmaps/*
 %{_datadir}/applications/fedora-lincity-ng.desktop
@@ -65,6 +65,9 @@
 %{_datadir}/lincity-ng/
 
 %changelog
+* Fri Jan 30 2009 Tom "spot" Callaway <tcallawa at redhat.com> 2.0-1
+- 2.0 final
+
 * Tue Dec 23 2008 Tom "spot" Callaway <tcallawa at redhat.com> 1.97-0.1.beta
 - update to 1.97.beta
 



From pkgdb at fedoraproject.org  Sat Jan 31 00:32:58 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 31 Jan 2009 00:32:58 +0000
Subject: [pkgdb] sugar-write ownership updated
Message-ID: <20090131003259.3C9B5208495@bastion.fedora.phx.redhat.com>

Package sugar-write in Fedora devel is now owned by tuxbrewr

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-write



From pkgdb at fedoraproject.org  Sat Jan 31 00:33:03 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 31 Jan 2009 00:33:03 +0000
Subject: [pkgdb] sugar-write ownership updated
Message-ID: <20090131003303.F20E32084A7@bastion.fedora.phx.redhat.com>

Package sugar-write in Fedora 9 is now owned by tuxbrewr

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-write



From pkgdb at fedoraproject.org  Sat Jan 31 00:33:29 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 31 Jan 2009 00:33:29 +0000
Subject: [pkgdb] sugar-calculator ownership updated
Message-ID: <20090131003330.0345E208496@bastion.fedora.phx.redhat.com>

Package sugar-calculator in Fedora devel is now owned by tuxbrewr

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-calculator



From pkgdb at fedoraproject.org  Sat Jan 31 00:33:11 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 31 Jan 2009 00:33:11 +0000
Subject: [pkgdb] sugar-write ownership updated
Message-ID: <20090131003312.4D45A2084BD@bastion.fedora.phx.redhat.com>

Package sugar-write in Fedora 10 is now owned by tuxbrewr

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-write



From pkgdb at fedoraproject.org  Sat Jan 31 00:33:34 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 31 Jan 2009 00:33:34 +0000
Subject: [pkgdb] sugar-calculator ownership updated
Message-ID: <20090131003334.683A1208497@bastion.fedora.phx.redhat.com>

Package sugar-calculator in Fedora 9 is now owned by tuxbrewr

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-calculator



From pkgdb at fedoraproject.org  Sat Jan 31 00:33:49 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 31 Jan 2009 00:33:49 +0000
Subject: [pkgdb] sugar-calculator ownership updated
Message-ID: <20090131003349.EEFF1208496@bastion.fedora.phx.redhat.com>

Package sugar-calculator in Fedora 10 is now owned by tuxbrewr

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/sugar-calculator



From spot at fedoraproject.org  Sat Jan 31 00:42:49 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Sat, 31 Jan 2009 00:42:49 +0000 (UTC)
Subject: rpms/kscope/devel kscope.spec,1.5,1.6
Message-ID: <20090131004249.D71FF70119@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/kscope/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1704

Modified Files:
	kscope.spec 
Log Message:
1.9.1


Index: kscope.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kscope/devel/kscope.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- kscope.spec	12 Jan 2009 19:52:35 -0000	1.5
+++ kscope.spec	31 Jan 2009 00:42:19 -0000	1.6
@@ -1,6 +1,6 @@
 Name:		kscope
-Summary: 	KDE front-end to Cscope
-Version:	1.9.0
+Summary: 	QT front-end to Cscope
+Version:	1.9.1
 Release:	1%{?dist}
 License:	GPLv2+
 Group:		Development/Tools
@@ -13,7 +13,7 @@
 Requires:	cscope, ctags, graphviz
 
 %description
-KScope is a KDE front-end to Cscope. It provides a source-editing 
+KScope is a QT4 front-end to Cscope. It provides a source-editing 
 environment for large C projects, such as the Linux kernel.
 
 KScope is by no means intended to be a replacement to any of the leading 
@@ -71,6 +71,9 @@
 %{_libdir}/libkscope_cscope.so
 
 %changelog
+* Fri Jan 20 2009 Tom "spot" Callaway <tcallawa at redhat.com> 1.9.1-1
+- Update to 1.9.1
+
 * Mon Jan 12 2009 Tom "spot" Callaway <tcallawa at redhat.com> 1.9.0-1
 - update to 1.9.0, no longer depends on kde
 - license change to GPLv2+



From spot at fedoraproject.org  Sat Jan 31 00:43:39 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Sat, 31 Jan 2009 00:43:39 +0000 (UTC)
Subject: rpms/kscope/devel .cvsignore,1.4,1.5 sources,1.4,1.5
Message-ID: <20090131004339.1F6FB70119@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/kscope/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1900

Modified Files:
	.cvsignore sources 
Log Message:
1.9.1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kscope/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	12 Jan 2009 19:52:34 -0000	1.4
+++ .cvsignore	31 Jan 2009 00:43:08 -0000	1.5
@@ -1 +1 @@
-kscope-1.9.0.tar.gz
+kscope-1.9.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kscope/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	12 Jan 2009 19:52:35 -0000	1.4
+++ sources	31 Jan 2009 00:43:08 -0000	1.5
@@ -1 +1 @@
-4ff9cb81d06f8adbd98b41b45a0a4999  kscope-1.9.0.tar.gz
+c452690dbb338a3ce4a1d1b6c27ec0fa  kscope-1.9.1.tar.gz



From spot at fedoraproject.org  Sat Jan 31 00:45:52 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Sat, 31 Jan 2009 00:45:52 +0000 (UTC)
Subject: rpms/asymptote/devel .cvsignore, 1.41, 1.42 asymptote.spec, 1.49,
	1.50 sources, 1.41, 1.42
Message-ID: <20090131004552.56C1B70119@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/asymptote/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2379

Modified Files:
	.cvsignore asymptote.spec sources 
Log Message:
1.60


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/asymptote/devel/.cvsignore,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- .cvsignore	19 Jan 2009 18:50:10 -0000	1.41
+++ .cvsignore	31 Jan 2009 00:45:21 -0000	1.42
@@ -1 +1 @@
-asymptote-1.59.src.tgz
+asymptote-1.60.src.tgz


Index: asymptote.spec
===================================================================
RCS file: /cvs/pkgs/rpms/asymptote/devel/asymptote.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- asymptote.spec	19 Jan 2009 18:50:10 -0000	1.49
+++ asymptote.spec	31 Jan 2009 00:45:21 -0000	1.50
@@ -4,7 +4,7 @@
 %define xemacs_sitelisp %{_datadir}/xemacs/site-packages/lisp
 
 Name:           asymptote
-Version:        1.59
+Version:        1.60
 Release:        1%{?dist}
 Summary:        Descriptive vector graphics language
 
@@ -140,6 +140,9 @@
 
 
 %changelog
+* Fri Jan 30 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 1.60-1
+- 1.60
+
 * Mon Jan 19 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 1.59-1
 - 1.59
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/asymptote/devel/sources,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- sources	19 Jan 2009 18:50:11 -0000	1.41
+++ sources	31 Jan 2009 00:45:21 -0000	1.42
@@ -1 +1 @@
-9d7c25d9e3a24b0d9b63c98b5f676c89  asymptote-1.59.src.tgz
+b07daf438e67159cd2368b4429c32287  asymptote-1.60.src.tgz



From bpepple at fedoraproject.org  Sat Jan 31 01:05:38 2009
From: bpepple at fedoraproject.org (Brian Pepple)
Date: Sat, 31 Jan 2009 01:05:38 +0000 (UTC)
Subject: rpms/farsight2/devel farsight2.spec,1.5,1.6
Message-ID: <20090131010538.6DAA370119@cvs1.fedora.phx.redhat.com>

Author: bpepple

Update of /cvs/pkgs/rpms/farsight2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5949

Modified Files:
	farsight2.spec 
Log Message:
* Mon Jan 19 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.0.7-2
- Add BR on gupnp-igd-devel, pygobject2-devel, and pygtk2-devel.



Index: farsight2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/farsight2/devel/farsight2.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- farsight2.spec	10 Jan 2009 01:03:15 -0000	1.5
+++ farsight2.spec	31 Jan 2009 01:05:07 -0000	1.6
@@ -8,7 +8,7 @@
 
 Name:           farsight2
 Version:        0.0.7
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Libraries for videoconferencing
 
 Group:          System Environment/Libraries
@@ -20,9 +20,12 @@
 BuildRequires:	glib2-devel >= 2.14
 BuildRequires:  gstreamer-devel >= %{gst_ver}
 BuildRequires:	gstreamer-plugins-base-devel >= %{gst_plugins_base_ver}
-BuildRequires:	gstreamer-python >= %{gst_python}
+BuildRequires:	gstreamer-python-devel >= %{gst_python}
 BuildRequires:	libnice-devel >= 0.0.3
+BuildRequires:	gupnp-igd-devel
 BuildRequires:	python-devel
+BuildRequires:	pygobject2-devel
+BuildRequires:	pygtk2-devel
 
 Requires:	gstreamer-plugins-farsight >= %{gst_plugins_farsight}
 Requires:	gstreamer-plugins-good >= %{gst_plugins_good}
@@ -116,6 +119,9 @@
 
 
 %changelog
+* Mon Jan 19 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.0.7-2
+- Add BR on gupnp-igd-devel, pygobject2-devel, and pygtk2-devel.
+
 * Fri Jan  9 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.0.7-1
 - Update to 0.0.7.
 



From spot at fedoraproject.org  Sat Jan 31 01:32:49 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Sat, 31 Jan 2009 01:32:49 +0000 (UTC)
Subject: rpms/alienarena/F-9 alienarena-7.21-show-search-paths.patch, NONE, 
	1.1 alienarena.spec, 1.8, 1.9 sources, 1.4, 1.5
Message-ID: <20090131013249.7FCA270142@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/alienarena/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8495/F-9

Modified Files:
	alienarena.spec sources 
Added Files:
	alienarena-7.21-show-search-paths.patch 
Log Message:
7.21

alienarena-7.21-show-search-paths.patch:

--- NEW FILE alienarena-7.21-show-search-paths.patch ---
diff -up alienarena-7.21/source/qcommon/files.c.BAD alienarena-7.21/source/qcommon/files.c
--- alienarena-7.21/source/qcommon/files.c.BAD	2009-01-30 19:52:35.000000000 -0500
+++ alienarena-7.21/source/qcommon/files.c	2009-01-30 19:53:25.000000000 -0500
@@ -582,6 +582,7 @@ void FS_AddGameDirectory (char *dir)
 #else
 	strcpy (search->filename, dir);
 #endif
+	Com_Printf("added %s to search paths\n", search->filename);
 	search->next = fs_searchpaths;
 	fs_searchpaths = search;
 


Index: alienarena.spec
===================================================================
RCS file: /cvs/pkgs/rpms/alienarena/F-9/alienarena.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- alienarena.spec	29 Oct 2008 14:26:14 -0000	1.8
+++ alienarena.spec	31 Jan 2009 01:32:19 -0000	1.9
@@ -1,30 +1,32 @@
 Name:		alienarena
 Summary: 	Multiplayer retro sci-fi deathmatch game
-Version:	7.20
-Release:	5%{?dist}
+Version:	7.21
+Release:	1%{?dist}
 License:	GPLv2+
 Group:		Amusements/Games
 # Subversion:  https://svn.icculus.org/alienarena/trunk/?sortby=date
 # Upstream seems too inept to provide a simple source only tarball, so we use svn.
 # Trunk contains the huge data also, so for the exe just get the source dir.
-#   mkdir alienarena-7.20 && cd alienarena-7.20/
-#   svn co svn://svn.icculus.org/alienarena/tags/7.20/source
-#   svn co svn://svn.icculus.org/alienarena/tags/7.20/docs
+#   mkdir alienarena-7.21 && cd alienarena-7.21/
+#   svn co svn://svn.icculus.org/alienarena/tags/7.21/source
+#   svn co svn://svn.icculus.org/alienarena/tags/7.21/docs
 #   cd ../
-#   tar -cvjf alienarena-7.20.tar.bz2 alienarena-7.20
-Source0:	alienarena-7.20.tar.bz2
+#   find alienarena-7.21 -depth -name .svn -type d -exec rm -rf {} \;
+#   tar -cvjf alienarena-7.21.tar.bz2 alienarena-7.21
+Source0:	alienarena-7.21.tar.bz2
 Source1:	alienarena.desktop
 Source2:	GPL.acebot.txt
 Source3:	alienarena.png
 Patch0:		alienarena-7.20-currentdir-option.patch
 Patch1:		alienarena-7.10-dont-search-dll-in-data-path.patch
 Patch2:		alienarena-7.10-genericoptflagsonly.patch
+Patch3:		alienarena-7.21-show-search-paths.patch
 URL:		http://red.planetarena.org/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	libX11-devel, libXext-devel, libXxf86dga-devel, libXxf86vm-devel, libjpeg-devel
 BuildRequires:	mesa-libGL-devel, mesa-libGLU-devel, SDL-devel, curl-devel, libpng-devel
 BuildRequires:	desktop-file-utils
-Requires:	alienarena-data = 20081016
+Requires:	alienarena-data = 20090115
 Requires:	desktop-file-utils >= 0.9, opengl-games-utils
 
 
@@ -37,7 +39,7 @@
 %package server
 Group:      Amusements/Games
 Summary:    Dedicated server for alienarena, the FPS game
-Requires:   alienarena-data = 20081016
+Requires:   alienarena-data = 20090115
 
 
 %description server
@@ -55,13 +57,11 @@
 %patch0 -p0
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 # Copy license clarification for acebot
 cp -p %{SOURCE2} .
 
-# clean up svn files
-find -name "\.svn" -type d -print0 | xargs -0 rm -rf
-
 # clean up prebuilt binary files
 [[ -e crx ]] && rm crded crx crx.sdl {arena,data1}/game.so
 
@@ -151,6 +151,10 @@
 
 
 %changelog
+* Fri Jan 30 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 7.21-1
+- update to 7.21
+- apply Paul's patch to print the search paths
+
 * Wed Oct 29 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 7.20-5
 - use /bin/bash for the scripts due to the export LD_LIBRARY_PATH
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/alienarena/F-9/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	20 Oct 2008 18:41:11 -0000	1.4
+++ sources	31 Jan 2009 01:32:19 -0000	1.5
@@ -1 +1 @@
-70b479b0ff8553440fc0ad7a38b7c59b  alienarena-7.20.tar.bz2
+2743db92fa3f2f9d3b80d323356c0313  alienarena-7.21.tar.bz2



From spot at fedoraproject.org  Sat Jan 31 01:32:49 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Sat, 31 Jan 2009 01:32:49 +0000 (UTC)
Subject: rpms/alienarena/F-10 alienarena-7.21-show-search-paths.patch, NONE, 
	1.1 alienarena.spec, 1.9, 1.10 sources, 1.4, 1.5
Message-ID: <20090131013249.7A47B7011B@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/alienarena/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8495/F-10

Modified Files:
	alienarena.spec sources 
Added Files:
	alienarena-7.21-show-search-paths.patch 
Log Message:
7.21

alienarena-7.21-show-search-paths.patch:

--- NEW FILE alienarena-7.21-show-search-paths.patch ---
diff -up alienarena-7.21/source/qcommon/files.c.BAD alienarena-7.21/source/qcommon/files.c
--- alienarena-7.21/source/qcommon/files.c.BAD	2009-01-30 19:52:35.000000000 -0500
+++ alienarena-7.21/source/qcommon/files.c	2009-01-30 19:53:25.000000000 -0500
@@ -582,6 +582,7 @@ void FS_AddGameDirectory (char *dir)
 #else
 	strcpy (search->filename, dir);
 #endif
+	Com_Printf("added %s to search paths\n", search->filename);
 	search->next = fs_searchpaths;
 	fs_searchpaths = search;
 


Index: alienarena.spec
===================================================================
RCS file: /cvs/pkgs/rpms/alienarena/F-10/alienarena.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- alienarena.spec	29 Oct 2008 14:26:14 -0000	1.9
+++ alienarena.spec	31 Jan 2009 01:32:18 -0000	1.10
@@ -1,30 +1,32 @@
 Name:		alienarena
 Summary: 	Multiplayer retro sci-fi deathmatch game
-Version:	7.20
-Release:	5%{?dist}
+Version:	7.21
+Release:	1%{?dist}
 License:	GPLv2+
 Group:		Amusements/Games
 # Subversion:  https://svn.icculus.org/alienarena/trunk/?sortby=date
 # Upstream seems too inept to provide a simple source only tarball, so we use svn.
 # Trunk contains the huge data also, so for the exe just get the source dir.
-#   mkdir alienarena-7.20 && cd alienarena-7.20/
-#   svn co svn://svn.icculus.org/alienarena/tags/7.20/source
-#   svn co svn://svn.icculus.org/alienarena/tags/7.20/docs
+#   mkdir alienarena-7.21 && cd alienarena-7.21/
+#   svn co svn://svn.icculus.org/alienarena/tags/7.21/source
+#   svn co svn://svn.icculus.org/alienarena/tags/7.21/docs
 #   cd ../
-#   tar -cvjf alienarena-7.20.tar.bz2 alienarena-7.20
-Source0:	alienarena-7.20.tar.bz2
+#   find alienarena-7.21 -depth -name .svn -type d -exec rm -rf {} \;
+#   tar -cvjf alienarena-7.21.tar.bz2 alienarena-7.21
+Source0:	alienarena-7.21.tar.bz2
 Source1:	alienarena.desktop
 Source2:	GPL.acebot.txt
 Source3:	alienarena.png
 Patch0:		alienarena-7.20-currentdir-option.patch
 Patch1:		alienarena-7.10-dont-search-dll-in-data-path.patch
 Patch2:		alienarena-7.10-genericoptflagsonly.patch
+Patch3:		alienarena-7.21-show-search-paths.patch
 URL:		http://red.planetarena.org/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	libX11-devel, libXext-devel, libXxf86dga-devel, libXxf86vm-devel, libjpeg-devel
 BuildRequires:	mesa-libGL-devel, mesa-libGLU-devel, SDL-devel, curl-devel, libpng-devel
 BuildRequires:	desktop-file-utils
-Requires:	alienarena-data = 20081016
+Requires:	alienarena-data = 20090115
 Requires:	desktop-file-utils >= 0.9, opengl-games-utils
 
 
@@ -37,7 +39,7 @@
 %package server
 Group:      Amusements/Games
 Summary:    Dedicated server for alienarena, the FPS game
-Requires:   alienarena-data = 20081016
+Requires:   alienarena-data = 20090115
 
 
 %description server
@@ -55,13 +57,11 @@
 %patch0 -p0
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 # Copy license clarification for acebot
 cp -p %{SOURCE2} .
 
-# clean up svn files
-find -name "\.svn" -type d -print0 | xargs -0 rm -rf
-
 # clean up prebuilt binary files
 [[ -e crx ]] && rm crded crx crx.sdl {arena,data1}/game.so
 
@@ -151,6 +151,10 @@
 
 
 %changelog
+* Fri Jan 30 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 7.21-1
+- update to 7.21
+- apply Paul's patch to print the search paths
+
 * Wed Oct 29 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 7.20-5
 - use /bin/bash for the scripts due to the export LD_LIBRARY_PATH
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/alienarena/F-10/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	20 Oct 2008 18:41:12 -0000	1.4
+++ sources	31 Jan 2009 01:32:18 -0000	1.5
@@ -1 +1 @@
-70b479b0ff8553440fc0ad7a38b7c59b  alienarena-7.20.tar.bz2
+2743db92fa3f2f9d3b80d323356c0313  alienarena-7.21.tar.bz2



From spot at fedoraproject.org  Sat Jan 31 01:32:49 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Sat, 31 Jan 2009 01:32:49 +0000 (UTC)
Subject: rpms/alienarena/devel alienarena-7.21-show-search-paths.patch, NONE,
	1.1 .cvsignore, 1.4, 1.5 alienarena.spec, 1.9, 1.10 sources, 1.4, 1.5
Message-ID: <20090131013249.B2BA37011B@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/alienarena/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8495/devel

Modified Files:
	.cvsignore alienarena.spec sources 
Added Files:
	alienarena-7.21-show-search-paths.patch 
Log Message:
7.21

alienarena-7.21-show-search-paths.patch:

--- NEW FILE alienarena-7.21-show-search-paths.patch ---
diff -up alienarena-7.21/source/qcommon/files.c.BAD alienarena-7.21/source/qcommon/files.c
--- alienarena-7.21/source/qcommon/files.c.BAD	2009-01-30 19:52:35.000000000 -0500
+++ alienarena-7.21/source/qcommon/files.c	2009-01-30 19:53:25.000000000 -0500
@@ -582,6 +582,7 @@ void FS_AddGameDirectory (char *dir)
 #else
 	strcpy (search->filename, dir);
 #endif
+	Com_Printf("added %s to search paths\n", search->filename);
 	search->next = fs_searchpaths;
 	fs_searchpaths = search;
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/alienarena/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	20 Oct 2008 18:41:11 -0000	1.4
+++ .cvsignore	31 Jan 2009 01:32:19 -0000	1.5
@@ -1 +1 @@
-alienarena-7.20.tar.bz2
+alienarena-7.21.tar.bz2


Index: alienarena.spec
===================================================================
RCS file: /cvs/pkgs/rpms/alienarena/devel/alienarena.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- alienarena.spec	29 Oct 2008 14:26:14 -0000	1.9
+++ alienarena.spec	31 Jan 2009 01:32:19 -0000	1.10
@@ -1,30 +1,32 @@
 Name:		alienarena
 Summary: 	Multiplayer retro sci-fi deathmatch game
-Version:	7.20
-Release:	5%{?dist}
+Version:	7.21
+Release:	1%{?dist}
 License:	GPLv2+
 Group:		Amusements/Games
 # Subversion:  https://svn.icculus.org/alienarena/trunk/?sortby=date
 # Upstream seems too inept to provide a simple source only tarball, so we use svn.
 # Trunk contains the huge data also, so for the exe just get the source dir.
-#   mkdir alienarena-7.20 && cd alienarena-7.20/
-#   svn co svn://svn.icculus.org/alienarena/tags/7.20/source
-#   svn co svn://svn.icculus.org/alienarena/tags/7.20/docs
+#   mkdir alienarena-7.21 && cd alienarena-7.21/
+#   svn co svn://svn.icculus.org/alienarena/tags/7.21/source
+#   svn co svn://svn.icculus.org/alienarena/tags/7.21/docs
 #   cd ../
-#   tar -cvjf alienarena-7.20.tar.bz2 alienarena-7.20
-Source0:	alienarena-7.20.tar.bz2
+#   find alienarena-7.21 -depth -name .svn -type d -exec rm -rf {} \;
+#   tar -cvjf alienarena-7.21.tar.bz2 alienarena-7.21
+Source0:	alienarena-7.21.tar.bz2
 Source1:	alienarena.desktop
 Source2:	GPL.acebot.txt
 Source3:	alienarena.png
 Patch0:		alienarena-7.20-currentdir-option.patch
 Patch1:		alienarena-7.10-dont-search-dll-in-data-path.patch
 Patch2:		alienarena-7.10-genericoptflagsonly.patch
+Patch3:		alienarena-7.21-show-search-paths.patch
 URL:		http://red.planetarena.org/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	libX11-devel, libXext-devel, libXxf86dga-devel, libXxf86vm-devel, libjpeg-devel
 BuildRequires:	mesa-libGL-devel, mesa-libGLU-devel, SDL-devel, curl-devel, libpng-devel
 BuildRequires:	desktop-file-utils
-Requires:	alienarena-data = 20081016
+Requires:	alienarena-data = 20090115
 Requires:	desktop-file-utils >= 0.9, opengl-games-utils
 
 
@@ -37,7 +39,7 @@
 %package server
 Group:      Amusements/Games
 Summary:    Dedicated server for alienarena, the FPS game
-Requires:   alienarena-data = 20081016
+Requires:   alienarena-data = 20090115
 
 
 %description server
@@ -55,13 +57,11 @@
 %patch0 -p0
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 # Copy license clarification for acebot
 cp -p %{SOURCE2} .
 
-# clean up svn files
-find -name "\.svn" -type d -print0 | xargs -0 rm -rf
-
 # clean up prebuilt binary files
 [[ -e crx ]] && rm crded crx crx.sdl {arena,data1}/game.so
 
@@ -151,6 +151,10 @@
 
 
 %changelog
+* Fri Jan 30 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 7.21-1
+- update to 7.21
+- apply Paul's patch to print the search paths
+
 * Wed Oct 29 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 7.20-5
 - use /bin/bash for the scripts due to the export LD_LIBRARY_PATH
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/alienarena/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	20 Oct 2008 18:41:12 -0000	1.4
+++ sources	31 Jan 2009 01:32:19 -0000	1.5
@@ -1 +1 @@
-70b479b0ff8553440fc0ad7a38b7c59b  alienarena-7.20.tar.bz2
+2743db92fa3f2f9d3b80d323356c0313  alienarena-7.21.tar.bz2



From spot at fedoraproject.org  Sat Jan 31 01:43:44 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Sat, 31 Jan 2009 01:43:44 +0000 (UTC)
Subject: rpms/alienarena-data/F-10 alienarena-data.spec, 1.5, 1.6 sources,
	1.4, 1.5
Message-ID: <20090131014344.15EF370119@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/alienarena-data/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10213/F-10

Modified Files:
	alienarena-data.spec sources 
Log Message:
update to 20090115 for 7.21


Index: alienarena-data.spec
===================================================================
RCS file: /cvs/pkgs/rpms/alienarena-data/F-10/alienarena-data.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- alienarena-data.spec	20 Oct 2008 18:20:54 -0000	1.5
+++ alienarena-data.spec	31 Jan 2009 01:43:13 -0000	1.6
@@ -1,17 +1,18 @@
 Name:		alienarena-data
 Summary: 	Data files for Alien Arena 2008
-Version:	20081016
+Version:	20090115
 Release:	1%{?dist}
 License:	Redistributable, no modification permitted
 Group:		Amusements/Games
 URL:		http://icculus.org/alienarena/
 # We need to get this from SVN
-#   mkdir alienarena-data-20081016 && cd alienarena-data-20081016
-#   svn co svn://svn.icculus.org/alienarena/tags/7.20/arena
-#   svn co svn://svn.icculus.org/alienarena/tags/7.20/botinfo
-#   svn co svn://svn.icculus.org/alienarena/tags/7.20/data1
+#   mkdir alienarena-data-20090115 && cd alienarena-data-20090115
+#   svn co svn://svn.icculus.org/alienarena/tags/7.21/arena
+#   svn co svn://svn.icculus.org/alienarena/tags/7.21/botinfo
+#   svn co svn://svn.icculus.org/alienarena/tags/7.21/data1
 #   cd ../
-#   tar -cvjf alienarena-data-20081016.tar.bz2 alienarena-data-20081016
+#   find alienarena-20090115 -depth -name .svn -type d -exec rm -rf {} \;
+#   tar -cvjf alienarena-data-20090115.tar.bz2 alienarena-data-20090115
 Source0:	%{name}-%{version}.tar.bz2
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:	noarch
@@ -23,7 +24,6 @@
 
 %prep
 %setup -q
-find -name "\.svn" -type d -print0 | xargs -0 rm -rf
 rm -f {arena,data1}/game.so
 
 
@@ -45,6 +45,9 @@
 %{_datadir}/alienarena/
 
 %changelog
+* Fri Jan 30 2009 Tom "spot" Callaway <tcallawa at redhat.com> 20090115-1
+- update to 20090115 (7.21)
+
 * Mon Oct 20 2008 Tom "spot" Callaway <tcallawa at redhat.com> 20081016-1
 - update to 20081016
 - sync up with Paul Bredbury's spec


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/alienarena-data/F-10/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	20 Oct 2008 18:20:54 -0000	1.4
+++ sources	31 Jan 2009 01:43:13 -0000	1.5
@@ -1 +1 @@
-300e44b08a54f72587f4144008a61868  alienarena-data-20081016.tar.bz2
+85fcf79affa2ac14a7d1983cf02990fd  alienarena-data-20090115.tar.bz2



From spot at fedoraproject.org  Sat Jan 31 01:43:44 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Sat, 31 Jan 2009 01:43:44 +0000 (UTC)
Subject: rpms/alienarena-data/F-9 alienarena-data.spec, 1.5, 1.6 sources, 1.4,
	1.5
Message-ID: <20090131014344.354047011B@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/alienarena-data/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10213/F-9

Modified Files:
	alienarena-data.spec sources 
Log Message:
update to 20090115 for 7.21


Index: alienarena-data.spec
===================================================================
RCS file: /cvs/pkgs/rpms/alienarena-data/F-9/alienarena-data.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- alienarena-data.spec	20 Oct 2008 18:34:51 -0000	1.5
+++ alienarena-data.spec	31 Jan 2009 01:43:13 -0000	1.6
@@ -1,17 +1,18 @@
 Name:		alienarena-data
 Summary: 	Data files for Alien Arena 2008
-Version:	20081016
+Version:	20090115
 Release:	1%{?dist}
 License:	Redistributable, no modification permitted
 Group:		Amusements/Games
 URL:		http://icculus.org/alienarena/
 # We need to get this from SVN
-#   mkdir alienarena-data-20081016 && cd alienarena-data-20081016
-#   svn co svn://svn.icculus.org/alienarena/tags/7.20/arena
-#   svn co svn://svn.icculus.org/alienarena/tags/7.20/botinfo
-#   svn co svn://svn.icculus.org/alienarena/tags/7.20/data1
+#   mkdir alienarena-data-20090115 && cd alienarena-data-20090115
+#   svn co svn://svn.icculus.org/alienarena/tags/7.21/arena
+#   svn co svn://svn.icculus.org/alienarena/tags/7.21/botinfo
+#   svn co svn://svn.icculus.org/alienarena/tags/7.21/data1
 #   cd ../
-#   tar -cvjf alienarena-data-20081016.tar.bz2 alienarena-data-20081016
+#   find alienarena-20090115 -depth -name .svn -type d -exec rm -rf {} \;
+#   tar -cvjf alienarena-data-20090115.tar.bz2 alienarena-data-20090115
 Source0:	%{name}-%{version}.tar.bz2
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:	noarch
@@ -23,7 +24,6 @@
 
 %prep
 %setup -q
-find -name "\.svn" -type d -print0 | xargs -0 rm -rf
 rm -f {arena,data1}/game.so
 
 
@@ -45,6 +45,9 @@
 %{_datadir}/alienarena/
 
 %changelog
+* Fri Jan 30 2009 Tom "spot" Callaway <tcallawa at redhat.com> 20090115-1
+- update to 20090115 (7.21)
+
 * Mon Oct 20 2008 Tom "spot" Callaway <tcallawa at redhat.com> 20081016-1
 - update to 20081016
 - sync up with Paul Bredbury's spec


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/alienarena-data/F-9/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	20 Oct 2008 18:34:51 -0000	1.4
+++ sources	31 Jan 2009 01:43:13 -0000	1.5
@@ -1 +1 @@
-300e44b08a54f72587f4144008a61868  alienarena-data-20081016.tar.bz2
+85fcf79affa2ac14a7d1983cf02990fd  alienarena-data-20090115.tar.bz2



From spot at fedoraproject.org  Sat Jan 31 01:43:44 2009
From: spot at fedoraproject.org (Tom Callaway)
Date: Sat, 31 Jan 2009 01:43:44 +0000 (UTC)
Subject: rpms/alienarena-data/devel .cvsignore, 1.4, 1.5 alienarena-data.spec,
	1.5, 1.6 sources, 1.4, 1.5
Message-ID: <20090131014344.726C670142@cvs1.fedora.phx.redhat.com>

Author: spot

Update of /cvs/pkgs/rpms/alienarena-data/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10213/devel

Modified Files:
	.cvsignore alienarena-data.spec sources 
Log Message:
update to 20090115 for 7.21


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/alienarena-data/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	20 Oct 2008 18:20:54 -0000	1.4
+++ .cvsignore	31 Jan 2009 01:43:14 -0000	1.5
@@ -1 +1 @@
-alienarena-data-20081016.tar.bz2
+alienarena-data-20090115.tar.bz2


Index: alienarena-data.spec
===================================================================
RCS file: /cvs/pkgs/rpms/alienarena-data/devel/alienarena-data.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- alienarena-data.spec	20 Oct 2008 18:20:54 -0000	1.5
+++ alienarena-data.spec	31 Jan 2009 01:43:14 -0000	1.6
@@ -1,17 +1,18 @@
 Name:		alienarena-data
 Summary: 	Data files for Alien Arena 2008
-Version:	20081016
+Version:	20090115
 Release:	1%{?dist}
 License:	Redistributable, no modification permitted
 Group:		Amusements/Games
 URL:		http://icculus.org/alienarena/
 # We need to get this from SVN
-#   mkdir alienarena-data-20081016 && cd alienarena-data-20081016
-#   svn co svn://svn.icculus.org/alienarena/tags/7.20/arena
-#   svn co svn://svn.icculus.org/alienarena/tags/7.20/botinfo
-#   svn co svn://svn.icculus.org/alienarena/tags/7.20/data1
+#   mkdir alienarena-data-20090115 && cd alienarena-data-20090115
+#   svn co svn://svn.icculus.org/alienarena/tags/7.21/arena
+#   svn co svn://svn.icculus.org/alienarena/tags/7.21/botinfo
+#   svn co svn://svn.icculus.org/alienarena/tags/7.21/data1
 #   cd ../
-#   tar -cvjf alienarena-data-20081016.tar.bz2 alienarena-data-20081016
+#   find alienarena-20090115 -depth -name .svn -type d -exec rm -rf {} \;
+#   tar -cvjf alienarena-data-20090115.tar.bz2 alienarena-data-20090115
 Source0:	%{name}-%{version}.tar.bz2
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:	noarch
@@ -23,7 +24,6 @@
 
 %prep
 %setup -q
-find -name "\.svn" -type d -print0 | xargs -0 rm -rf
 rm -f {arena,data1}/game.so
 
 
@@ -45,6 +45,9 @@
 %{_datadir}/alienarena/
 
 %changelog
+* Fri Jan 30 2009 Tom "spot" Callaway <tcallawa at redhat.com> 20090115-1
+- update to 20090115 (7.21)
+
 * Mon Oct 20 2008 Tom "spot" Callaway <tcallawa at redhat.com> 20081016-1
 - update to 20081016
 - sync up with Paul Bredbury's spec


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/alienarena-data/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	20 Oct 2008 18:20:54 -0000	1.4
+++ sources	31 Jan 2009 01:43:14 -0000	1.5
@@ -1 +1 @@
-300e44b08a54f72587f4144008a61868  alienarena-data-20081016.tar.bz2
+85fcf79affa2ac14a7d1983cf02990fd  alienarena-data-20090115.tar.bz2



From davej at fedoraproject.org  Sat Jan 31 01:59:39 2009
From: davej at fedoraproject.org (Dave Jones)
Date: Sat, 31 Jan 2009 01:59:39 +0000 (UTC)
Subject: rpms/kernel/devel patch-2.6.29-rc3-git2.bz2.sign, NONE,
	1.1 .cvsignore, 
	1.1000, 1.1001 kernel.spec, 1.1252, 1.1253 sources, 1.962,
	1.963 upstream, 1.874, 1.875 patch-2.6.29-rc3-git1.bz2.sign, 1.1, NONE
Message-ID: <20090131015939.6D42970119@cvs1.fedora.phx.redhat.com>

Author: davej

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11740

Modified Files:
	.cvsignore kernel.spec sources upstream 
Added Files:
	patch-2.6.29-rc3-git2.bz2.sign 
Removed Files:
	patch-2.6.29-rc3-git1.bz2.sign 
Log Message:
2.6.29-rc3-git2


--- NEW FILE patch-2.6.29-rc3-git2.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBJg5T7yGugalF9Dw4RAnRSAJwPbyqRlkjCEq0C4eTRyU3GRPA1zwCfSkrv
T8vWM0Y/Lv0sKOMUJ08TrrA=
=E0Gs
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.1000
retrieving revision 1.1001
diff -u -r1.1000 -r1.1001
--- .cvsignore	30 Jan 2009 18:08:04 -0000	1.1000
+++ .cvsignore	31 Jan 2009 01:59:08 -0000	1.1001
@@ -5,4 +5,4 @@
 kernel-2.6.28
 linux-2.6.28.tar.bz2
 patch-2.6.29-rc3.bz2
-patch-2.6.29-rc3-git1.bz2
+patch-2.6.29-rc3-git2.bz2


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1252
retrieving revision 1.1253
diff -u -r1.1252 -r1.1253
--- kernel.spec	30 Jan 2009 19:15:57 -0000	1.1252
+++ kernel.spec	31 Jan 2009 01:59:08 -0000	1.1253
@@ -58,7 +58,7 @@
 # The rc snapshot level
 %define rcrev 3
 # The git snapshot level
-%define gitrev 1
+%define gitrev 2
 # Set rpm version accordingly
 %define rpmversion 2.6.%{upstream_sublevel}
 %endif
@@ -1784,6 +1784,9 @@
 
 %changelog
 * Fri Jan 30 2009 Dave Jones <davej at redhat.com>
+- 2.6.29-rc3-git2
+
+* Fri Jan 30 2009 Dave Jones <davej at redhat.com>
 - 2.6.29-rc3-git1
 
 * Fri Jan 30 2009 Josef Bacik <josef at toxicpanda.com>


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v
retrieving revision 1.962
retrieving revision 1.963
diff -u -r1.962 -r1.963
--- sources	30 Jan 2009 18:08:04 -0000	1.962
+++ sources	31 Jan 2009 01:59:09 -0000	1.963
@@ -1,3 +1,3 @@
 d351e44709c9810b85e29b877f50968a  linux-2.6.28.tar.bz2
 d95a5be60287e9632c9d0513b59f6511  patch-2.6.29-rc3.bz2
-8adc233b361618457c3f44c25be1455b  patch-2.6.29-rc3-git1.bz2
+9053918f123eb5412ce4f4e911c9976e  patch-2.6.29-rc3-git2.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v
retrieving revision 1.874
retrieving revision 1.875
diff -u -r1.874 -r1.875
--- upstream	30 Jan 2009 18:08:04 -0000	1.874
+++ upstream	31 Jan 2009 01:59:09 -0000	1.875
@@ -1,3 +1,3 @@
 linux-2.6.28.tar.bz2
 patch-2.6.29-rc3.bz2
-patch-2.6.29-rc3-git1.bz2
+patch-2.6.29-rc3-git2.bz2


--- patch-2.6.29-rc3-git1.bz2.sign DELETED ---



From cebbert at fedoraproject.org  Sat Jan 31 02:10:09 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Sat, 31 Jan 2009 02:10:09 +0000 (UTC)
Subject: rpms/kernel/F-10 linux-2.6-toshiba-acpi-close-race.patch, NONE,
	1.1.2.1
	linux-2.6-toshiba-acpi-only-register-rfkill-if-bt-enabled.patch,
	NONE, 1.1.2.1 kernel.spec, 1.1206.2.8, 1.1206.2.9
Message-ID: <20090131021009.3B78670119@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13485

Modified Files:
      Tag: private-fedora-10-2_6_27
	kernel.spec 
Added Files:
      Tag: private-fedora-10-2_6_27
	linux-2.6-toshiba-acpi-close-race.patch 
	linux-2.6-toshiba-acpi-only-register-rfkill-if-bt-enabled.patch 
Log Message:
Fix oops in toshiba_acpi driver (#470215)

linux-2.6-toshiba-acpi-close-race.patch:

--- NEW FILE linux-2.6-toshiba-acpi-close-race.patch ---
From: Arjan van de Ven <arjan at linux.intel.com>
Date: Fri, 28 Nov 2008 16:19:09 +0000 (-0800)
Subject: toshiba_acpi: close race in toshiba_acpi driver
X-Git-Tag: v2.6.28-rc7~55^2
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=23d0a65cf229acd273b6f5a325c34d758a90d592

toshiba_acpi: close race in toshiba_acpi driver

the toshiba ACPI driver will, in a failure case, free the rfkill state
before stopping the polling timer that would use this state. More interesting,
in the same failure case handling, it calls the exit function, which also
frees the rfkill state, but after stopping the polling.

If the race happens, a NULL pointer is passed to rfkill_force_state()
which then causes a nice dereference.

Fix the race by just not doing the too-early freeing of the rfkill state.

This appears to be the cause of a hot issue on kerneloops.org; while I
have no solid evidence of that this patch will fix the issue, the race
appears rather real.

Signed-off-by: Arjan van de Ven <arjan at linux.intel.com>
Signed-off-by: Len Brown <len.brown at intel.com>
---

diff --git a/drivers/acpi/toshiba_acpi.c b/drivers/acpi/toshiba_acpi.c
index 66aac06..25f531d 100644
--- a/drivers/acpi/toshiba_acpi.c
+++ b/drivers/acpi/toshiba_acpi.c
@@ -848,8 +848,6 @@ static int __init toshiba_acpi_init(void)
 	ret = input_register_polled_device(toshiba_acpi.poll_dev);
 	if (ret) {
 		printk(MY_ERR "unable to register kill-switch input device\n");
-		rfkill_free(toshiba_acpi.rfk_dev);
-		toshiba_acpi.rfk_dev = NULL;
 		toshiba_acpi_exit();
 		return ret;
 	}

linux-2.6-toshiba-acpi-only-register-rfkill-if-bt-enabled.patch:

--- NEW FILE linux-2.6-toshiba-acpi-only-register-rfkill-if-bt-enabled.patch ---
From: Frederik Deweerdt <frederik.deweerdt at xprog.eu>
Date: Mon, 15 Dec 2008 21:54:19 +0000 (-0800)
Subject: ACPI toshiba: only register rfkill if bt is enabled
X-Git-Tag: v2.6.28-rc9~21
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=38aefbc585c5d86df101e7644bff2c47112783d4

ACPI toshiba: only register rfkill if bt is enabled

Part of the rfkill initialization was done whenever BT was on or not.  The
following patch checks for BT presence before registering the rfkill to
the input layer.  Some minor cleanups (> 80 char lines) were also added in
the process.

On Tue, Oct 28, 2008 at 10:10:37PM +0300, Andrey Borzenkov wrote:
[...]
> [   66.633036] toshiba_acpi: Toshiba Laptop ACPI Extras version 0.19
> [   66.633054] toshiba_acpi:     HCI method: \_SB_.VALD.GHCI
> [   66.637764] input: Toshiba RFKill Switch as /devices/virtual/input/input3
[...]
> [  113.920753] ------------[ cut here ]------------
> [  113.920828] kernel BUG at /home/bor/src/linux-git/net/rfkill/rfkill.c:347!
> [  113.920845] invalid opcode: 0000 [#1]
> [  113.920877] last sysfs file: /sys/devices/pci0000:00/0000:00:04.0/host0/target0:0:0/0:0:0:0/block/sda/size
> [  113.920900] Dumping ftrace buffer:
> [  113.920919]    (ftrace buffer empty)
> [  113.920933] Modules linked in: af_packet irnet ppp_generic slhc ircomm_tty ircomm binfmt_misc loop dm_mirror dm_region_hash dm_log dm_round_robin dm_multipath dm_mod alim15x3 ide_core nvram toshiba cryptomgr aead crypto_blkcipher michael_mic crypto_algapi orinoco_cs orinoco hermes_dld hermes pcmcia firmware_class snd_ali5451 snd_ac97_codec ac97_bus snd_seq_dummy snd_seq_oss snd_seq_midi_event snd_seq snd_seq_device smsc_ircc2 snd_pcm_oss snd_pcm rtc_cmos irda snd_timer snd_mixer_oss rtc_core snd crc_ccitt yenta_socket rtc_lib rsrc_nonstatic i2c_ali1535 pcmcia_core pcspkr psmouse soundcore i2c_core evdev sr_mod snd_page_alloc alim1535_wdt cdrom fan sg video output toshiba_acpi rfkill thermal backlight ali_agp processor ac button input_polldev battery agpgart ohci_hcd usbcore reiserfs pata_ali libata sd_mod scsi_mod [last unloaded: scsi_wait_scan]
> [  113.921765]
> [  113.921785] Pid: 3272, comm: ipolldevd Not tainted (2.6.28-rc2-1avb #3) PORTEGE 4000
> [  113.921801] EIP: 0060:[<dfaa4683>] EFLAGS: 00010246 CPU: 0
> [  113.921854] EIP is at rfkill_force_state+0x53/0x90 [rfkill]
> [  113.921870] EAX: 00000000 EBX: 00000000 ECX: 00000003 EDX: 00000000
> [  113.921885] ESI: 00000000 EDI: ddd50300 EBP: d8d7af40 ESP: d8d7af24
> [  113.921900]  DS: 007b ES: 007b FS: 0000 GS: 0000 SS: 0068
> [  113.921918] Process ipolldevd (pid: 3272, ti=d8d7a000 task=d8d93c90 task.ti=d8d7a000)
> [  113.921933] Stack:
> [  113.921945]  d8d7af38 00000246 dfb029d8 dfb029c0 dfb029d8 dfb029c0 ddd50300 d8d7af5c
> [  113.922014]  dfb018e2 01000246 01000000 ddd50300 ddd50314 ddabb8a0 d8d7af68 dfb381c1
> [  113.922098]  00000000 d8d7afa4 c012ec0a 00000000 00000002 00000000 c012eba8 ddabb8c0
> [  113.922240] Call Trace:
> [  113.922240]  [<dfb018e2>] ? bt_poll_rfkill+0x5c/0x82 [toshiba_acpi]
> [  113.922240]  [<dfb381c1>] ? input_polled_device_work+0x11/0x40 [input_polldev]
> [  113.922240]  [<c012ec0a>] ? run_workqueue+0xea/0x1f0
> [  113.922240]  [<c012eba8>] ? run_workqueue+0x88/0x1f0
> [  113.922240]  [<dfb381b0>] ? input_polled_device_work+0x0/0x40 [input_polldev]
> [  113.922240]  [<c012f047>] ? worker_thread+0x87/0xf0
> [  113.922240]  [<c0132b00>] ? autoremove_wake_function+0x0/0x50
> [  113.922240]  [<c012efc0>] ? worker_thread+0x0/0xf0
> [  113.922240]  [<c013280f>] ? kthread+0x3f/0x80
> [  113.922240]  [<c01327d0>] ? kthread+0x0/0x80
> [  113.922240]  [<c01040d7>] ? kernel_thread_helper+0x7/0x10
> [  113.922240] Code: 43 54 89 73 54 39 c6 74 11 89 d9 ba 01 00 00 00 b8 40 68 aa df e8 3e 35 69 e0 89 f8 e8 77 fd 85 e0 31 c0 83 c4 10 5b 5e 5f 5d c3 <0f> 0b eb fe 89 f6 8d bc 27 00 00 00 00 be f4 4d aa df bb 5f 01
> [  113.922240] EIP: [<dfaa4683>] rfkill_force_state+0x53/0x90 [rfkill] SS:ESP 0068:d8d7af24
> [  113.924700] ---[ end trace 0e404eb40cadd5f0 ]---

Signed-off-by: Frederik Deweerdt <frederik.deweerdt at gmail.com>
Tested-by: Andrey Borzenkov <arvidjaar at mail.ru>
Acked-by: Len Brown <len.brown at intel.com>
Cc: Richard Purdie <rpurdie at rpsys.net>
Acked-by: Philip Langdale <philipl at overt.org>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
---

diff --git a/drivers/acpi/toshiba_acpi.c b/drivers/acpi/toshiba_acpi.c
index 25f531d..40e60fc 100644
--- a/drivers/acpi/toshiba_acpi.c
+++ b/drivers/acpi/toshiba_acpi.c
@@ -824,32 +824,36 @@ static int __init toshiba_acpi_init(void)
 			toshiba_acpi_exit();
 			return -ENOMEM;
 		}
-	}
 
-	/* Register input device for kill switch */
-	toshiba_acpi.poll_dev = input_allocate_polled_device();
-	if (!toshiba_acpi.poll_dev) {
-		printk(MY_ERR "unable to allocate kill-switch input device\n");
-		toshiba_acpi_exit();
-		return -ENOMEM;
-	}
-	toshiba_acpi.poll_dev->private = &toshiba_acpi;
-	toshiba_acpi.poll_dev->poll = bt_poll_rfkill;
-	toshiba_acpi.poll_dev->poll_interval = 1000; /* msecs */
-
-	toshiba_acpi.poll_dev->input->name = toshiba_acpi.rfk_name;
-	toshiba_acpi.poll_dev->input->id.bustype = BUS_HOST;
-	toshiba_acpi.poll_dev->input->id.vendor = 0x0930; /* Toshiba USB ID */
-	set_bit(EV_SW, toshiba_acpi.poll_dev->input->evbit);
-	set_bit(SW_RFKILL_ALL, toshiba_acpi.poll_dev->input->swbit);
-	input_report_switch(toshiba_acpi.poll_dev->input, SW_RFKILL_ALL, TRUE);
-	input_sync(toshiba_acpi.poll_dev->input);
-
-	ret = input_register_polled_device(toshiba_acpi.poll_dev);
-	if (ret) {
-		printk(MY_ERR "unable to register kill-switch input device\n");
-		toshiba_acpi_exit();
-		return ret;
+		/* Register input device for kill switch */
+		toshiba_acpi.poll_dev = input_allocate_polled_device();
+		if (!toshiba_acpi.poll_dev) {
+			printk(MY_ERR
+			       "unable to allocate kill-switch input device\n");
+			toshiba_acpi_exit();
+			return -ENOMEM;
+		}
+		toshiba_acpi.poll_dev->private = &toshiba_acpi;
+		toshiba_acpi.poll_dev->poll = bt_poll_rfkill;
+		toshiba_acpi.poll_dev->poll_interval = 1000; /* msecs */
+
+		toshiba_acpi.poll_dev->input->name = toshiba_acpi.rfk_name;
+		toshiba_acpi.poll_dev->input->id.bustype = BUS_HOST;
+		/* Toshiba USB ID */
+		toshiba_acpi.poll_dev->input->id.vendor = 0x0930;
+		set_bit(EV_SW, toshiba_acpi.poll_dev->input->evbit);
+		set_bit(SW_RFKILL_ALL, toshiba_acpi.poll_dev->input->swbit);
+		input_report_switch(toshiba_acpi.poll_dev->input,
+				    SW_RFKILL_ALL, TRUE);
+		input_sync(toshiba_acpi.poll_dev->input);
+
+		ret = input_register_polled_device(toshiba_acpi.poll_dev);
+		if (ret) {
+			printk(MY_ERR
+			       "unable to register kill-switch input device\n");
+			toshiba_acpi_exit();
+			return ret;
+		}
 	}
 
 	return 0;


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/kernel.spec,v
retrieving revision 1.1206.2.8
retrieving revision 1.1206.2.9
diff -u -r1.1206.2.8 -r1.1206.2.9
--- kernel.spec	30 Jan 2009 21:58:30 -0000	1.1206.2.8
+++ kernel.spec	31 Jan 2009 02:09:38 -0000	1.1206.2.9
@@ -688,6 +688,8 @@
 
 # Backport Toshiba updates so Bluetooth can be enabled (#437091)
 Patch2012: linux-2.6-toshiba-acpi-update.patch
+Patch2013: linux-2.6-toshiba-acpi-close-race.patch
+Patch2014: linux-2.6-toshiba-acpi-only-register-rfkill-if-bt-enabled.patch
 
 # atl2 network driver
 Patch2020: linux-2.6-netdev-atl2.patch
@@ -1291,6 +1293,8 @@
 
 ApplyPatch linux-2.6-eeepc-laptop-update.patch
 ApplyPatch linux-2.6-toshiba-acpi-update.patch
+ApplyPatch linux-2.6-toshiba-acpi-close-race.patch
+ApplyPatch linux-2.6-toshiba-acpi-only-register-rfkill-if-bt-enabled.patch
 
 # atl2 network driver
 ApplyPatch linux-2.6-netdev-atl2.patch
@@ -1917,6 +1921,9 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Fri Jan 30 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.27.13-170.2.9
+- Fix oops in toshiba_acpi driver (#470215)
+
 * Fri Jan 30 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.27.13-170.2.8
 - Add keyboard quirks for more systems:
   Some Dell machines have a different vendor name in DMI.



From bpepple at fedoraproject.org  Sat Jan 31 02:24:44 2009
From: bpepple at fedoraproject.org (Brian Pepple)
Date: Sat, 31 Jan 2009 02:24:44 +0000 (UTC)
Subject: rpms/telepathy-glib/devel .cvsignore, 1.25, 1.26 sources, 1.25,
	1.26 telepathy-glib.spec, 1.32, 1.33
Message-ID: <20090131022444.198F170119@cvs1.fedora.phx.redhat.com>

Author: bpepple

Update of /cvs/pkgs/rpms/telepathy-glib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14892

Modified Files:
	.cvsignore sources telepathy-glib.spec 
Log Message:
* Fri Jan 30 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.7.25-1
- Update to 0.7.25.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-glib/devel/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- .cvsignore	29 Jan 2009 17:35:14 -0000	1.25
+++ .cvsignore	31 Jan 2009 02:24:13 -0000	1.26
@@ -1 +1 @@
-telepathy-glib-0.7.24.tar.gz
+telepathy-glib-0.7.25.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-glib/devel/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- sources	29 Jan 2009 17:35:14 -0000	1.25
+++ sources	31 Jan 2009 02:24:13 -0000	1.26
@@ -1 +1 @@
-f49db7c435ed7494d9129d400839833d  telepathy-glib-0.7.24.tar.gz
+7a676676e902f0d73ec7ec407fbf04f1  telepathy-glib-0.7.25.tar.gz


Index: telepathy-glib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-glib/devel/telepathy-glib.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- telepathy-glib.spec	29 Jan 2009 17:35:15 -0000	1.32
+++ telepathy-glib.spec	31 Jan 2009 02:24:13 -0000	1.33
@@ -3,7 +3,7 @@
 %define	glib_ver	2.16
 
 Name:           telepathy-glib
-Version:        0.7.24
+Version:        0.7.25
 Release:        1%{?dist}
 Summary:        GLib bindings for Telepathy
 
@@ -89,6 +89,9 @@
 
 
 %changelog
+* Fri Jan 30 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.7.25-1
+- Update to 0.7.25.
+
 * Wed Jan 28 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.7.24-1
 - Update to 0.7.24.
 



From davej at fedoraproject.org  Sat Jan 31 02:33:52 2009
From: davej at fedoraproject.org (Dave Jones)
Date: Sat, 31 Jan 2009 02:33:52 +0000 (UTC)
Subject: rpms/kernel/devel linux-2.6-compile-fixes.patch,1.186,1.187
Message-ID: <20090131023352.BB3FA70141@cvs1.fedora.phx.redhat.com>

Author: davej

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15715

Modified Files:
	linux-2.6-compile-fixes.patch 
Log Message:
buildfix

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.186
retrieving revision 1.187
diff -u -r1.186 -r1.187
--- linux-2.6-compile-fixes.patch	6 Jan 2009 17:50:09 -0000	1.186
+++ linux-2.6-compile-fixes.patch	31 Jan 2009 02:33:22 -0000	1.187
@@ -4,3 +4,19 @@
 # Please add the errors from gcc before the diffs to save others having
 # to do a compile to figure out what your diff is fixing. Thanks.
 #
+
+net/ipv6/ip6mr.c: In function 'pim6_rcv':
+net/ipv6/ip6mr.c:368: error: implicit declaration of function 'csum_ipv6_magic'
+
+Signed-off-by: Dave Jones <davej at redhat.com>
+
+--- linux-2.6.28.noarch/net/ipv6/ip6mr.c~	2009-01-30 21:32:19.000000000 -0500
++++ linux-2.6.28.noarch/net/ipv6/ip6mr.c	2009-01-30 21:32:29.000000000 -0500
+@@ -48,6 +48,7 @@
+ #include <linux/pim.h>
+ #include <net/addrconf.h>
+ #include <linux/netfilter_ipv6.h>
++#include <net/ip6_checksum.h>
+ 
+ /* Big lock, protecting vif table, mrt cache and mroute socket state.
+    Note that the changes are semaphored via rtnl_lock.



From pkgdb at fedoraproject.org  Sat Jan 31 03:20:10 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 31 Jan 2009 03:20:10 +0000
Subject: [pkgdb] mt-daapd ownership updated
Message-ID: <20090131032010.F38C3208485@bastion.fedora.phx.redhat.com>

Package mt-daapd in Fedora devel was orphaned by mikep

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mt-daapd



From pkgdb at fedoraproject.org  Sat Jan 31 03:20:18 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 31 Jan 2009 03:20:18 +0000
Subject: [pkgdb] mt-daapd ownership updated
Message-ID: <20090131032018.A2AB7208494@bastion.fedora.phx.redhat.com>

Package mt-daapd in Fedora 8 was orphaned by mikep

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mt-daapd



From pkgdb at fedoraproject.org  Sat Jan 31 03:20:23 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 31 Jan 2009 03:20:23 +0000
Subject: [pkgdb] mt-daapd ownership updated
Message-ID: <20090131032023.6D773208495@bastion.fedora.phx.redhat.com>

Package mt-daapd in Fedora 9 was orphaned by mikep

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mt-daapd



From pkgdb at fedoraproject.org  Sat Jan 31 03:20:26 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 31 Jan 2009 03:20:26 +0000
Subject: [pkgdb] mt-daapd ownership updated
Message-ID: <20090131032026.DE67C208497@bastion.fedora.phx.redhat.com>

Package mt-daapd in Fedora EPEL 5 was orphaned by mikep

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mt-daapd



From pkgdb at fedoraproject.org  Sat Jan 31 03:20:30 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 31 Jan 2009 03:20:30 +0000
Subject: [pkgdb] mt-daapd ownership updated
Message-ID: <20090131032030.5EAEB208485@bastion.fedora.phx.redhat.com>

Package mt-daapd in Fedora 10 was orphaned by mikep

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/mt-daapd



From cebbert at fedoraproject.org  Sat Jan 31 03:34:12 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Sat, 31 Jan 2009 03:34:12 +0000 (UTC)
Subject: rpms/kernel/F-10 patch-2.6.27.14-rc1.bz2.sign, NONE,
	1.1.2.1 .cvsignore, 1.960.2.2, 1.960.2.3 kernel.spec, 1.1206.2.9,
	1.1206.2.10 sources, 1.922.2.2, 1.922.2.3 upstream, 1.834.2.2,
	1.834.2.3
Message-ID: <20090131033412.25AB270119@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24739

Modified Files:
      Tag: private-fedora-10-2_6_27
	.cvsignore kernel.spec sources upstream 
Added Files:
      Tag: private-fedora-10-2_6_27
	patch-2.6.27.14-rc1.bz2.sign 
Log Message:
2.6.27.14-rc1


--- NEW FILE patch-2.6.27.14-rc1.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBJg7oEyGugalF9Dw4RAjmOAJ4uzG7kElr+sAOTM5KnRCIVaWUv0ACfQxRu
JA0G4kLWtwYe1EuyEtSKvsI=
=aPiL
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/.cvsignore,v
retrieving revision 1.960.2.2
retrieving revision 1.960.2.3
diff -u -r1.960.2.2 -r1.960.2.3
--- .cvsignore	26 Jan 2009 21:26:25 -0000	1.960.2.2
+++ .cvsignore	31 Jan 2009 03:33:41 -0000	1.960.2.3
@@ -5,3 +5,4 @@
 kernel-2.6.27
 linux-2.6.27.tar.bz2
 patch-2.6.27.13.bz2
+patch-2.6.27.14-rc1.bz2


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/kernel.spec,v
retrieving revision 1.1206.2.9
retrieving revision 1.1206.2.10
diff -u -r1.1206.2.9 -r1.1206.2.10
--- kernel.spec	31 Jan 2009 02:09:38 -0000	1.1206.2.9
+++ kernel.spec	31 Jan 2009 03:33:41 -0000	1.1206.2.10
@@ -36,9 +36,9 @@
 %if 0%{?released_kernel}
 
 # Do we have a -stable update to apply?
-%define stable_update 13
+%define stable_update 14
 # Is it a -stable RC?
-%define stable_rc 0
+%define stable_rc 1
 # Set rpm version accordingly
 %if 0%{?stable_update}
 %define stablerev .%{stable_update}
@@ -1921,6 +1921,9 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Fri Jan 30 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.27.14-170.2.10.rc1
+- 2.6.27.14-rc1
+
 * Fri Jan 30 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.27.13-170.2.9
 - Fix oops in toshiba_acpi driver (#470215)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/sources,v
retrieving revision 1.922.2.2
retrieving revision 1.922.2.3
diff -u -r1.922.2.2 -r1.922.2.3
--- sources	26 Jan 2009 21:26:25 -0000	1.922.2.2
+++ sources	31 Jan 2009 03:33:41 -0000	1.922.2.3
@@ -1,2 +1,3 @@
 b3e78977aa79d3754cb7f8143d7ddabd  linux-2.6.27.tar.bz2
 ead4980144479f23f7ca9b22ea9ee44f  patch-2.6.27.13.bz2
+865e2d46f3fa219b5d09199d22757059  patch-2.6.27.14-rc1.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/upstream,v
retrieving revision 1.834.2.2
retrieving revision 1.834.2.3
diff -u -r1.834.2.2 -r1.834.2.3
--- upstream	26 Jan 2009 21:26:25 -0000	1.834.2.2
+++ upstream	31 Jan 2009 03:33:41 -0000	1.834.2.3
@@ -1,2 +1,3 @@
 linux-2.6.27.tar.bz2
 patch-2.6.27.13.bz2
+patch-2.6.27.14-rc1.bz2



From cebbert at fedoraproject.org  Sat Jan 31 04:53:34 2009
From: cebbert at fedoraproject.org (Chuck Ebbert)
Date: Sat, 31 Jan 2009 04:53:34 +0000 (UTC)
Subject: rpms/kernel/F-10 patch-2.6.29-rc3-git2.bz2.sign, NONE,
	1.1 .cvsignore, 1.968, 1.969 kernel.spec, 1.1237,
	1.1238 linux-2.6-compile-fixes.patch, 1.181, 1.182 sources,
	1.930, 1.931 upstream, 1.841,
	1.842 patch-2.6.29-rc3-git1.bz2.sign, 1.1, NONE
Message-ID: <20090131045334.A28FB70119@cvs1.fedora.phx.redhat.com>

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9076

Modified Files:
	.cvsignore kernel.spec linux-2.6-compile-fixes.patch sources 
	upstream 
Added Files:
	patch-2.6.29-rc3-git2.bz2.sign 
Removed Files:
	patch-2.6.29-rc3-git1.bz2.sign 
Log Message:
2.6.29-rc3-git2


--- NEW FILE patch-2.6.29-rc3-git2.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBJg5T7yGugalF9Dw4RAnRSAJwPbyqRlkjCEq0C4eTRyU3GRPA1zwCfSkrv
T8vWM0Y/Lv0sKOMUJ08TrrA=
=E0Gs
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/.cvsignore,v
retrieving revision 1.968
retrieving revision 1.969
diff -u -r1.968 -r1.969
--- .cvsignore	30 Jan 2009 21:21:41 -0000	1.968
+++ .cvsignore	31 Jan 2009 04:53:03 -0000	1.969
@@ -5,4 +5,4 @@
 kernel-2.6.28
 linux-2.6.28.tar.bz2
 patch-2.6.29-rc3.bz2
-patch-2.6.29-rc3-git1.bz2
+patch-2.6.29-rc3-git2.bz2


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/kernel.spec,v
retrieving revision 1.1237
retrieving revision 1.1238
diff -u -r1.1237 -r1.1238
--- kernel.spec	30 Jan 2009 21:21:41 -0000	1.1237
+++ kernel.spec	31 Jan 2009 04:53:03 -0000	1.1238
@@ -57,7 +57,7 @@
 # The rc snapshot level
 %define rcrev 3
 # The git snapshot level
-%define gitrev 1
+%define gitrev 2
 # Set rpm version accordingly
 %define rpmversion 2.6.%{upstream_sublevel}
 %endif
@@ -1763,6 +1763,9 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Fri Jan 30 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.29-0.8.rc3.git2
+- 2.6.29-rc3-git2
+
 * Fri Jan 30 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.29-0.7.rc3.git1
 - Copy 2.6.29-rc3-git1 update and btrfs fixes from Rawhide.
 

linux-2.6-compile-fixes.patch:

Index: linux-2.6-compile-fixes.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/linux-2.6-compile-fixes.patch,v
retrieving revision 1.181
retrieving revision 1.182
diff -u -r1.181 -r1.182
--- linux-2.6-compile-fixes.patch	30 Jan 2009 00:35:45 -0000	1.181
+++ linux-2.6-compile-fixes.patch	31 Jan 2009 04:53:03 -0000	1.182
@@ -5,6 +5,22 @@
 # to do a compile to figure out what your diff is fixing. Thanks.
 #
 
+net/ipv6/ip6mr.c: In function 'pim6_rcv': 
+net/ipv6/ip6mr.c:368: error: implicit declaration of function 'csum_ipv6_magic' 
+
+Signed-off-by: Dave Jones <davej at redhat.com> 
+
+--- a/net/ipv6/ip6mr.c
++++ b/net/ipv6/ip6mr.c
+@@ -48,6 +48,7 @@ 
+ #include <linux/pim.h>
+ #include <net/addrconf.h>
+ #include <linux/netfilter_ipv6.h>
++#include <net/ip6_checksum.h>
+ 
+ /* Big lock, protecting vif table, mrt cache and mroute socket state.
+    Note that the changes are semaphored via rtnl_lock.
+
 CONFIG_MTD_NAND_FSL_UPM can be built modular, but needs to
 use fsl_lbc_lock, which isn't currently exported.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/sources,v
retrieving revision 1.930
retrieving revision 1.931
diff -u -r1.930 -r1.931
--- sources	30 Jan 2009 21:21:41 -0000	1.930
+++ sources	31 Jan 2009 04:53:03 -0000	1.931
@@ -1,3 +1,3 @@
 d351e44709c9810b85e29b877f50968a  linux-2.6.28.tar.bz2
 d95a5be60287e9632c9d0513b59f6511  patch-2.6.29-rc3.bz2
-8adc233b361618457c3f44c25be1455b  patch-2.6.29-rc3-git1.bz2
+9053918f123eb5412ce4f4e911c9976e  patch-2.6.29-rc3-git2.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/upstream,v
retrieving revision 1.841
retrieving revision 1.842
diff -u -r1.841 -r1.842
--- upstream	30 Jan 2009 21:21:41 -0000	1.841
+++ upstream	31 Jan 2009 04:53:03 -0000	1.842
@@ -1,3 +1,3 @@
 linux-2.6.28.tar.bz2
 patch-2.6.29-rc3.bz2
-patch-2.6.29-rc3-git1.bz2
+patch-2.6.29-rc3-git2.bz2


--- patch-2.6.29-rc3-git1.bz2.sign DELETED ---



From mtasaka at fedoraproject.org  Sat Jan 31 05:42:33 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Sat, 31 Jan 2009 05:42:33 +0000 (UTC)
Subject: rpms/cairo-dock/devel .cvsignore, 1.108, 1.109 cairo-dock.spec,
	1.147, 1.148 sources, 1.108, 1.109
Message-ID: <20090131054233.5CA0F70119@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/cairo-dock/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20224

Modified Files:
	.cvsignore cairo-dock.spec sources 
Log Message:
rev 1507


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cairo-dock/devel/.cvsignore,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -r1.108 -r1.109
--- .cvsignore	27 Jan 2009 05:27:10 -0000	1.108
+++ .cvsignore	31 Jan 2009 05:42:02 -0000	1.109
@@ -1 +1 @@
-cairo-dock-sources-svn1504_trunk.tar.bz2
+cairo-dock-sources-svn1507_trunk.tar.bz2


Index: cairo-dock.spec
===================================================================
RCS file: /cvs/extras/rpms/cairo-dock/devel/cairo-dock.spec,v
retrieving revision 1.147
retrieving revision 1.148
diff -u -r1.147 -r1.148
--- cairo-dock.spec	27 Jan 2009 13:25:51 -0000	1.147
+++ cairo-dock.spec	31 Jan 2009 05:42:02 -0000	1.148
@@ -14,7 +14,7 @@
 %undefine		betaver		
 %define		build_webkit	1
 %define		build_xfce	1
-%define		tarballver	svn1504_trunk
+%define		tarballver	svn1507_trunk
 
 %define		fedora_main_rel	3
 
@@ -231,11 +231,6 @@
 	configure.ac
 cd ..
 
-# illusion
-sed -i.po2 \
-	-e 's|^ICON_EFFECTS_PACKAGE=cd-illusion|ILLUSION_PACKAGE=cd-illusion|' \
-	configure.ac
-
 # mail: license conflict
 # * mail plug-ins is GPLv2 only, 
 #   however source codes include "cairo-dock.h", which includes "cairo-dock-log.h",
@@ -641,8 +636,8 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
-* Tue Jan 27 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
-- rev 1504
+* Sat Jan 31 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- rev 1507
 
 * Thu Jan 22 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
 - rev 1496


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cairo-dock/devel/sources,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -r1.108 -r1.109
--- sources	27 Jan 2009 05:27:10 -0000	1.108
+++ sources	31 Jan 2009 05:42:02 -0000	1.109
@@ -1 +1 @@
-a7a2a9f8ec8583e53b54720d78514ef6  cairo-dock-sources-svn1504_trunk.tar.bz2
+382c9ae8a01656dc023d87055ef881f8  cairo-dock-sources-svn1507_trunk.tar.bz2



From mtasaka at fedoraproject.org  Sat Jan 31 05:56:49 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Sat, 31 Jan 2009 05:56:49 +0000 (UTC)
Subject: rpms/cairo-dock/devel cairo-dock.spec,1.148,1.149
Message-ID: <20090131055649.B5DFE70119@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/cairo-dock/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23440

Modified Files:
	cairo-dock.spec 
Log Message:
missing files


Index: cairo-dock.spec
===================================================================
RCS file: /cvs/extras/rpms/cairo-dock/devel/cairo-dock.spec,v
retrieving revision 1.148
retrieving revision 1.149
diff -u -r1.148 -r1.149
--- cairo-dock.spec	31 Jan 2009 05:42:02 -0000	1.148
+++ cairo-dock.spec	31 Jan 2009 05:56:19 -0000	1.149
@@ -194,6 +194,9 @@
 autoreconf -i -f
 %endif
 
+# Missing files
+cp -p data/themes.conf{,.in}
+
 # B. themes
 cd ../themes
 



From mtasaka at fedoraproject.org  Sat Jan 31 06:05:40 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Sat, 31 Jan 2009 06:05:40 +0000 (UTC)
Subject: rpms/cairo-dock/devel cairo-dock.spec,1.149,1.150
Message-ID: <20090131060540.1877570119@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/cairo-dock/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25589

Modified Files:
	cairo-dock.spec 
Log Message:
missing files


Index: cairo-dock.spec
===================================================================
RCS file: /cvs/extras/rpms/cairo-dock/devel/cairo-dock.spec,v
retrieving revision 1.149
retrieving revision 1.150
diff -u -r1.149 -r1.150
--- cairo-dock.spec	31 Jan 2009 05:56:19 -0000	1.149
+++ cairo-dock.spec	31 Jan 2009 06:05:09 -0000	1.150
@@ -184,6 +184,9 @@
 done
 %{__chmod} 0644 [A-Z]*
 
+# Missing files
+cp -p data/themes.conf{,.in}
+
 # Makefile issue
 %{__sed} -i.debuglevel -e '/-O3/d' \
 %if 0%{?released} > 0
@@ -194,9 +197,6 @@
 autoreconf -i -f
 %endif
 
-# Missing files
-cp -p data/themes.conf{,.in}
-
 # B. themes
 cd ../themes
 



From mtasaka at fedoraproject.org  Sat Jan 31 06:28:53 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Sat, 31 Jan 2009 06:28:53 +0000 (UTC)
Subject: rpms/cairo-dock/devel cairo-dock.spec,1.150,1.151
Message-ID: <20090131062853.0F29470119@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/cairo-dock/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31497

Modified Files:
	cairo-dock.spec 
Log Message:
again


Index: cairo-dock.spec
===================================================================
RCS file: /cvs/extras/rpms/cairo-dock/devel/cairo-dock.spec,v
retrieving revision 1.150
retrieving revision 1.151
diff -u -r1.150 -r1.151
--- cairo-dock.spec	31 Jan 2009 06:05:09 -0000	1.150
+++ cairo-dock.spec	31 Jan 2009 06:28:22 -0000	1.151
@@ -186,6 +186,8 @@
 
 # Missing files
 cp -p data/themes.conf{,.in}
+[ -f data/depth-rotate-desklet.svg ] || \
+	cp -p data/rotate-desklet.svg data/depth-rotate-desklet.svg
 
 # Makefile issue
 %{__sed} -i.debuglevel -e '/-O3/d' \



From mtasaka at fedoraproject.org  Sat Jan 31 06:58:59 2009
From: mtasaka at fedoraproject.org (Mamoru Tasaka)
Date: Sat, 31 Jan 2009 06:58:59 +0000 (UTC)
Subject: rpms/cairo-dock/devel cairo-dock.spec,1.151,1.152
Message-ID: <20090131065859.22FAF70119@cvs1.fedora.phx.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/cairo-dock/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4901

Modified Files:
	cairo-dock.spec 
Log Message:
Once more


Index: cairo-dock.spec
===================================================================
RCS file: /cvs/extras/rpms/cairo-dock/devel/cairo-dock.spec,v
retrieving revision 1.151
retrieving revision 1.152
diff -u -r1.151 -r1.152
--- cairo-dock.spec	31 Jan 2009 06:28:22 -0000	1.151
+++ cairo-dock.spec	31 Jan 2009 06:58:28 -0000	1.152
@@ -230,6 +230,11 @@
 	configure.ac
 %{__sed} -i.icon2 -e '$s|\\$||' Cairo-Penguin/data/themes/Makefile.am
 
+# dialog-rendering
+find dialog-rendering -type f \
+	\( -not -path '*/.svn/*' -and -not -name \*.png \) \
+	| xargs %{__sed} -i -e 's|\r||'
+
 # drop-indicator
 cd drop-indicator
 %{__sed} -i.gettext -e 's|^GETTEXT_PACKAGE=|GETTEXT_DROP_INDICATOR=|' \



From remi at fedoraproject.org  Sat Jan 31 07:33:47 2009
From: remi at fedoraproject.org (Remi Collet)
Date: Sat, 31 Jan 2009 07:33:47 +0000 (UTC)
Subject: rpms/cups-pdf/devel .cvsignore, 1.7, 1.8 INSTALL.fedora.cups-pdf,
	1.1, 1.2 cups-pdf.spec, 1.14, 1.15 sources, 1.7, 1.8
Message-ID: <20090131073347.21AB770119@cvs1.fedora.phx.redhat.com>

Author: remi

Update of /cvs/extras/rpms/cups-pdf/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9928

Modified Files:
	.cvsignore INSTALL.fedora.cups-pdf cups-pdf.spec sources 
Log Message:
update to 2.5.0


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cups-pdf/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	29 Jun 2008 11:18:48 -0000	1.7
+++ .cvsignore	31 Jan 2009 07:33:16 -0000	1.8
@@ -1 +1 @@
-cups-pdf_2.4.8.tar.gz
+cups-pdf_2.5.0.tar.gz


Index: INSTALL.fedora.cups-pdf
===================================================================
RCS file: /cvs/extras/rpms/cups-pdf/devel/INSTALL.fedora.cups-pdf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- INSTALL.fedora.cups-pdf	14 Nov 2006 05:46:25 -0000	1.1
+++ INSTALL.fedora.cups-pdf	31 Jan 2009 07:33:16 -0000	1.2
@@ -1,9 +1,30 @@
+===== Virtual Printer =====
+
 This cups-pdf RPM is designed to create a Cups-PDF virtual printer
 during the installation, but only if cups is running.
 
 You can create the virtual pinter using :
-    /usr/sbin/lpadmin -p Cups-PDF -v cups-pdf:/ -m PostscriptColor.ppd -E
+    /usr/sbin/lpadmin -p Cups-PDF -v cups-pdf:/ -m CUPS-PDF.ppd -E
 
 You can remove the virtual printer using
     /usr/sbin/lpadmin -x Cups-PDF
 
+
+===== SELinux Notes =====
+
+Default configuration will save PDF in the user Desktop
+This requires special SElinux context.
+
+- Fedora >= 9:
+
+SELinux managed by main policies (selinux-policy)
+
+- Fedora 7, 8 and EPEL-5:
+
+SELinux managed by the RPM (cups_pdf module)
+
+- Fedora Core and EPEL-4: 
+
+not managed by the RPM : see SELinux-HOWTO
+
+


Index: cups-pdf.spec
===================================================================
RCS file: /cvs/extras/rpms/cups-pdf/devel/cups-pdf.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- cups-pdf.spec	29 Jun 2008 11:18:48 -0000	1.14
+++ cups-pdf.spec	31 Jan 2009 07:33:16 -0000	1.15
@@ -17,7 +17,7 @@
 Summary:        Extension for creating pdf-Files with CUPS
 Summary(fr):    Extension de CUPS pour cr??er des fichiers PDF
 Name:           cups-pdf
-Version:        2.4.8
+Version:        2.5.0
 Release:        1%{?dist}
 Group:          Applications/Publishing
 Source0:        http://www.physik.uni-wuerzburg.de/~vrbehr/cups-pdf/src/%{name}_%{version}.tar.gz
@@ -146,7 +146,7 @@
 # First install : create the printer if cupsd is running
 if [ "$1" -eq "1" -a -f "%{_var}/run/cupsd.pid" ]
 then
-%if %{?fedora}%{?rhel} < 5
+%if 0%{?fedora}%{?rhel} < 5
     # Restart CUPS on old Fedora/RHEL to discover the new "backend"
     /sbin/service cups condrestart
 %endif
@@ -184,6 +184,10 @@
 
 
 %changelog
+* Sat Jan 31 2009 Remi Collet <Fedora at FamilleCollet.com> 2.5.0-1
+- update to 2.5.0
+- Add SElinux notes in INSTALL.fedora 
+
 * Sat Mar 28 2008 Remi Collet <Fedora at FamilleCollet.com> 2.4.8-1
 - update to 2.4.8
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cups-pdf/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	29 Jun 2008 11:18:48 -0000	1.7
+++ sources	31 Jan 2009 07:33:16 -0000	1.8
@@ -1 +1 @@
-0d17dc5e094b366c8ad43cc27c7f82c9  cups-pdf_2.4.8.tar.gz
+9194af099a8c0e9aa213505b29ec6818  cups-pdf_2.5.0.tar.gz



From pgordon at fedoraproject.org  Sat Jan 31 07:38:16 2009
From: pgordon at fedoraproject.org (Peter Gordon)
Date: Sat, 31 Jan 2009 07:38:16 +0000 (UTC)
Subject: rpms/WebKit/F-10 .cvsignore, 1.10, 1.11 WebKit.spec, 1.21,
	1.22 sources, 1.10, 1.11
Message-ID: <20090131073817.0CED270119@cvs1.fedora.phx.redhat.com>

Author: pgordon

Update of /cvs/pkgs/rpms/WebKit/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10496

Modified Files:
	.cvsignore WebKit.spec sources 
Log Message:
Update to SVN snapshot 40351 (adds WebPolicyDelegate and related API); sync other changes in from rawhide.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/WebKit/F-10/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	24 Oct 2008 05:17:51 -0000	1.10
+++ .cvsignore	31 Jan 2009 07:37:46 -0000	1.11
@@ -1 +1 @@
-WebKit-r37790.tar.bz2
+WebKit-r40351.tar.bz2


Index: WebKit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/WebKit/F-10/WebKit.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- WebKit.spec	24 Oct 2008 05:21:23 -0000	1.21
+++ WebKit.spec	31 Jan 2009 07:37:46 -0000	1.22
@@ -3,7 +3,7 @@
 	cp -p %1  %{buildroot}%{_docdir}/%{name}-%{version}/$(echo '%1' | sed -e 's!/!.!g') \
 	echo %%{_docdir}/%{name}-%{version}/$(echo '%1' | sed -e 's!/!.!g') >> docfiles.list
 
-%define		svn_revision	37790
+%define		svn_revision	40351
 
 ## Optional build modifications...
 ## --with debug: Enable more verbose debugging. Makes runtime a bit slower.
@@ -26,16 +26,21 @@
 ##
 ## --with svg: Experimental SVG support (filters)
 ##	(Default: No) 
+##
+## --with wml: Build support for WML
+##	(Default: No)
+
 %bcond_with 	debug
 %bcond_with 	html5video	
 %bcond_with 	jit
 %bcond_with 	libsoup
 %bcond_with 	pango	
 %bcond_with 	svg
+%bcond_with	wml
 
 Name:		WebKit
-Version:	1.0.0
-Release:	0.15.svn%{svn_revision}%{?dist}
+Version:	1.1.0
+Release:	0.16.svn%{svn_revision}%{?dist}
 Summary:	Web content engine library
 
 Group:		Development/Libraries
@@ -60,7 +65,6 @@
 
 ## Conditional dependencies...
 %if %{with html5video}
-BuildRequires:	gnome-vfs2-devel
 BuildRequires:	gstreamer-devel
 BuildRequires:	gstreamer-plugins-base-devel
 %endif
@@ -134,7 +138,8 @@
 %{?with_jit:		--enable-jit			}	\
 %{?with_libsoup:	--with-http-backend=soup	}	\
 %{?with_pango:		--with-font-backend=pango	}	\
-%{?with_svg:		--enable-svg-filters		}
+%{?with_svg:		--enable-svg-filters		}	\
+%{?with_wml:		--enable-wml			}
 	
 make %{?_smp_mflags}
 
@@ -184,15 +189,25 @@
 %files	gtk-devel
 %defattr(-,root,root,-)
 %exclude %{_libdir}/*.la
+%{_datadir}/webkit-1.0
 %{_includedir}/webkit-1.0
 %{_libdir}/libwebkit-1.0.so
 %{_libdir}/pkgconfig/webkit-1.0.pc
 
 %files	doc -f docfiles.list
 %defattr(-,root,root,-)
+%dir %{_docdir}/%{name}-%{version}
 
 
 %changelog
+* Fri Jan 30 2009 Peter Gordon <peter at thecodergeek.com> 1.1.0-0.18.svn40351
+- Fix ownership of doc directory...this time without the oops (#473619).
+- Bump package version number to match that used in the configure/build
+  scripts. (Thanks to Martin Sourada for the bug report via email.)
+- Update to new upstream snapshot (SVN 40351): adds the WebPolicyDelegate
+  implementaton and related API (#482739).
+- Add build-time conditional for WML support.
+
 * Thu Oct 23 2008 Peter Gordon <peter at thecodergeek.com> 1.0.0-0.15.svn37790
 - Update to new upstream snapshot (SVN 37790).
 - Default to freetype font backend for improved CJK/Unicode support. (#448693)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/WebKit/F-10/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	24 Oct 2008 05:17:51 -0000	1.10
+++ sources	31 Jan 2009 07:37:46 -0000	1.11
@@ -1 +1 @@
-49873486eeace6611a5fa138845a9abb  WebKit-r37790.tar.bz2
+663a8a9a4cd334ccab4a325ba65c6a3c  WebKit-r40351.tar.bz2



From fabbione at fedoraproject.org  Sat Jan 31 08:21:50 2009
From: fabbione at fedoraproject.org (Fabio M. Di Nitto)
Date: Sat, 31 Jan 2009 08:21:50 +0000 (UTC)
Subject: rpms/cluster/devel cluster.spec,1.33,1.34
Message-ID: <20090131082150.3504170119@cvs1.fedora.phx.redhat.com>

Author: fabbione

Update of /cvs/pkgs/rpms/cluster/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16451

Modified Files:
	cluster.spec 
Log Message:
Add missing unowned directory #483330



Index: cluster.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cluster/devel/cluster.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- cluster.spec	27 Jan 2009 11:09:59 -0000	1.33
+++ cluster.spec	31 Jan 2009 08:21:19 -0000	1.34
@@ -19,7 +19,7 @@
 Name: cluster
 Summary: Red Hat Cluster
 Version: 3.0.0
-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/
@@ -147,6 +147,7 @@
 %{_sysconfdir}/rc.d/init.d/cman
 %{_sysconfdir}/rc.d/init.d/qdiskd
 %{_sysconfdir}/rc.d/init.d/scsi_reserve
+%dir %{_sysconfdir}/cluster/cman-notify.d
 %{_sysconfdir}/cluster/cman-notify.d/scsi_reserve_notify
 %config(noreplace) %{_sysconfdir}/udev/rules.d/*-dlm.rules
 %config(noreplace) %{_sysconfdir}/logrotate.d/cman
@@ -326,6 +327,9 @@
 %{_mandir}/man8/*.gfs.*
 
 %changelog
+* Sat Jan 31 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 3.0.0-5.alpha3
+- Fix directory ownership. #483330
+
 * Tue Jan 27 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 3.0.0-4.alpha3
 - New upstream release
 



From pkgdb at fedoraproject.org  Sat Jan 31 08:57:33 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 31 Jan 2009 08:57:33 +0000
Subject: [pkgdb] emesene: kaustuv03 has requested watchcommits
Message-ID: <20090131085733.E8A96208494@bastion.fedora.phx.redhat.com>

kaustuv03 has requested the watchcommits acl on emesene (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/emesene



From pkgdb at fedoraproject.org  Sat Jan 31 08:57:51 2009
From: pkgdb at fedoraproject.org (Fedora PackageDB)
Date: Sat, 31 Jan 2009 08:57:51 +0000
Subject: [pkgdb] emesene: kaustuv03 has given up watchcommits
Message-ID: <20090131085751.E6F09208496@bastion.fedora.phx.redhat.com>

kaustuv03 has given up the watchcommits acl on emesene (Fedora 10)

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/packages/name/emesene



From rakesh at fedoraproject.org  Sat Jan 31 09:38:00 2009
From: rakesh at fedoraproject.org (Rakesh Pandit)
Date: Sat, 31 Jan 2009 09:38:00 +0000 (UTC)
Subject: rpms/examiner/devel examiner.spec,1.1,1.2
Message-ID: <20090131093800.D937E70119@cvs1.fedora.phx.redhat.com>

Author: rakesh

Update of /cvs/pkgs/rpms/examiner/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25626

Modified Files:
	examiner.spec 
Log Message:
Fixed unowned directories


Index: examiner.spec
===================================================================
RCS file: /cvs/pkgs/rpms/examiner/devel/examiner.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- examiner.spec	10 Dec 2008 16:06:18 -0000	1.1
+++ examiner.spec	31 Jan 2009 09:37:30 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           examiner
 Version:        0.5
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Utility to disassemble and comment foreign executable binaries 
 
 Group:          Development/Tools
@@ -46,14 +46,15 @@
 
 %files
 %defattr(-,root,root,-)
-%dir %{_datadir}/doc/%{name}-%{version}/
-%{_datadir}/doc/%{name}-%{version}/*
+%{_datadir}/doc/%{name}-%{version}/
 %{_bindir}/%{name}
 %{_mandir}/man1/%{name}.1.gz
-%dir %{_datadir}/%{name}/os
-%{_datadir}/%{name}/os/*
+%{_datadir}/%{name}/
 
 %changelog
+* Sat Jan 31 2009 Rakesh Pandit <rakesh at fedorapeople.org> 0.5-3
+- Fixed unowned directory
+
 * Sat Nov 08 2008 Rakesh Pandit <rakesh at fedorapeople.org> 0.5-2
 - Cleaned up sed mess.
 



From rakesh at fedoraproject.org  Sat Jan 31 09:45:56 2009
From: rakesh at fedoraproject.org (Rakesh Pandit)
Date: Sat, 31 Jan 2009 09:45:56 +0000 (UTC)
Subject: rpms/examiner/F-10 examiner.spec,1.1,1.2
Message-ID: <20090131094556.8A07370119@cvs1.fedora.phx.redhat.com>

Author: rakesh

Update of /cvs/pkgs/rpms/examiner/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26608

Modified Files:
	examiner.spec 
Log Message:
Fixed unowned directories


Index: examiner.spec
===================================================================
RCS file: /cvs/pkgs/rpms/examiner/F-10/examiner.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- examiner.spec	10 Dec 2008 16:07:03 -0000	1.1
+++ examiner.spec	31 Jan 2009 09:45:26 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           examiner
 Version:        0.5
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Utility to disassemble and comment foreign executable binaries 
 
 Group:          Development/Tools
@@ -46,14 +46,15 @@
 
 %files
 %defattr(-,root,root,-)
-%dir %{_datadir}/doc/%{name}-%{version}/
-%{_datadir}/doc/%{name}-%{version}/*
+%{_datadir}/doc/%{name}-%{version}/
 %{_bindir}/%{name}
 %{_mandir}/man1/%{name}.1.gz
-%dir %{_datadir}/%{name}/os
-%{_datadir}/%{name}/os/*
+%{_datadir}/%{name}/
 
 %changelog
+* Sat Jan 31 2009 Rakesh Pandit <rakesh at fedorapeople.org> 0.5-3
+- Fixed unowned directory
+
 * Sat Nov 08 2008 Rakesh Pandit <rakesh at fedorapeople.org> 0.5-2
 - Cleaned up sed mess.
 



From rakesh at fedoraproject.org  Sat Jan 31 09:46:47 2009
From: rakesh at fedoraproject.org (Rakesh Pandit)
Date: Sat, 31 Jan 2009 09:46:47 +0000 (UTC)
Subject: rpms/examiner/F-9 examiner.spec,1.1,1.2
Message-ID: <20090131094647.1D82270119@cvs1.fedora.phx.redhat.com>

Author: rakesh

Update of /cvs/pkgs/rpms/examiner/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26701

Modified Files:
	examiner.spec 
Log Message:
Fixed unowned directories


Index: examiner.spec
===================================================================
RCS file: /cvs/pkgs/rpms/examiner/F-9/examiner.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- examiner.spec	10 Dec 2008 16:06:34 -0000	1.1
+++ examiner.spec	31 Jan 2009 09:46:16 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           examiner
 Version:        0.5
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Utility to disassemble and comment foreign executable binaries 
 
 Group:          Development/Tools
@@ -46,14 +46,15 @@
 
 %files
 %defattr(-,root,root,-)
-%dir %{_datadir}/doc/%{name}-%{version}/
-%{_datadir}/doc/%{name}-%{version}/*
+%{_datadir}/doc/%{name}-%{version}/
 %{_bindir}/%{name}
 %{_mandir}/man1/%{name}.1.gz
-%dir %{_datadir}/%{name}/os
-%{_datadir}/%{name}/os/*
+%{_datadir}/%{name}/
 
 %changelog
+* Sat Jan 31 2009 Rakesh Pandit <rakesh at fedorapeople.org> 0.5-3
+- Fixed unowned directory
+
 * Sat Nov 08 2008 Rakesh Pandit <rakesh at fedorapeople.org> 0.5-2
 - Cleaned up sed mess.
 



From veillard at fedoraproject.org  Sat Jan 31 09:49:18 2009
From: veillard at fedoraproject.org (Daniel Veillard)
Date: Sat, 31 Jan 2009 09:49:18 +0000 (UTC)
Subject: rpms/libvirt/devel .cvsignore, 1.35, 1.36 libvirt.spec, 1.107,
	1.108 sources, 1.36, 1.37 libvirt-0.5.1-read-only-checks.patch,
	1.1, NONE
Message-ID: <20090131094918.79D6970119@cvs1.fedora.phx.redhat.com>

Author: veillard

Update of /cvs/pkgs/rpms/libvirt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27767

Modified Files:
	.cvsignore libvirt.spec sources 
Removed Files:
	libvirt-0.5.1-read-only-checks.patch 
Log Message:
Release of 0.6.0, Daniel



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt/devel/.cvsignore,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- .cvsignore	5 Dec 2008 05:38:54 -0000	1.35
+++ .cvsignore	31 Jan 2009 09:48:47 -0000	1.36
@@ -6,3 +6,4 @@
 libvirt-0.4.6.tar.gz
 libvirt-0.5.0.tar.gz
 libvirt-0.5.1.tar.gz
+libvirt-0.6.0.tar.gz


Index: libvirt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt/devel/libvirt.spec,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -r1.107 -r1.108
--- libvirt.spec	17 Dec 2008 16:59:30 -0000	1.107
+++ libvirt.spec	31 Jan 2009 09:48:47 -0000	1.108
@@ -11,6 +11,7 @@
 %define with_python    0%{!?_without_python:1}
 %define with_libvirtd  0%{!?_without_libvirtd:1}
 %define with_uml       0%{!?_without_uml:1}
+%define with_network   0%{!?_without_network:1}
 
 # Xen is available only on i386 x86_64 ia64
 %ifnarch i386 i686 x86_64 ia64
@@ -32,15 +33,25 @@
 %define with_xen_proxy 0
 %endif
 
+#
+# If building on RHEL switch on the specific support
+# for the specific Xen version
+#
+%if 0%{?fedora}
+%define with_rhel5 0
+%else
+%define with_rhel5 1
+%endif
+
+
 Summary: Library providing a simple API virtualization
 Name: libvirt
-Version: 0.5.1
-Release: 2%{?dist}%{?extra_release}
+Version: 0.6.0
+Release: 1%{?dist}%{?extra_release}
 License: LGPLv2+
 Group: Development/Libraries
 Source: libvirt-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-Patch0: libvirt-0.5.1-read-only-checks.patch
 URL: http://libvirt.org/
 BuildRequires: python python-devel
 Requires: libxml2
@@ -125,6 +136,8 @@
 BuildRequires: iscsi-initiator-utils
 # For disk driver
 BuildRequires: parted-devel
+# For QEMU/LXC numa info
+BuildRequires: numactl-devel
 Obsoletes: libvir
 
 # Fedora build root suckage
@@ -164,7 +177,6 @@
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
 %if ! %{with_xen}
@@ -207,6 +219,14 @@
 %define _without_uml --without-uml
 %endif
 
+%if %{with_rhel5}
+%define _with_rhel5_api --with-rhel5-api
+%endif
+
+%if ! %{with_network}
+%define _without_network --without-network
+%endif
+
 %configure %{?_without_xen} \
            %{?_without_qemu} \
            %{?_without_openvz} \
@@ -217,6 +237,8 @@
            %{?_without_python} \
            %{?_without_libvirtd} \
            %{?_without_uml} \
+           %{?_without_network} \
+           %{?_with_rhel5_api} \
            --with-init-script=redhat \
            --with-qemud-pid-file=%{_localstatedir}/run/libvirt_qemud.pid \
            --with-remote-file=%{_localstatedir}/run/libvirtd.pid
@@ -277,7 +299,7 @@
 # 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
 /sbin/chkconfig --list libvirtd 1>/dev/null 2>&1
-if [ $? != 0 ]
+if [ $? != 0 -a ! -f %{_sysconfdir}/libvirt/qemu/networks/default.xml ]
 then
     UUID=`/usr/bin/uuidgen`
     sed -e "s,</name>,</name>\n  <uuid>$UUID</uuid>," \
@@ -320,6 +342,7 @@
 %{_sysconfdir}/rc.d/init.d/libvirtd
 %config(noreplace) %{_sysconfdir}/sysconfig/libvirtd
 %config(noreplace) %{_sysconfdir}/libvirt/libvirtd.conf
+%config(noreplace) %{_sysconfdir}/logrotate.d/libvirtd
 %endif
 
 %if %{with_qemu}
@@ -336,12 +359,42 @@
 %{_datadir}/libvirt/networks/default.xml
 %endif
 
+%dir %{_datadir}/libvirt/
+%dir %{_datadir}/libvirt/schemas/
+
+%{_datadir}/libvirt/schemas/domain.rng
+%{_datadir}/libvirt/schemas/network.rng
+%{_datadir}/libvirt/schemas/storagepool.rng
+%{_datadir}/libvirt/schemas/storagevol.rng
+%{_datadir}/libvirt/schemas/nodedev.rng
+%{_datadir}/libvirt/schemas/capability.rng
+
 %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/
 
 %if %{with_qemu}
+%dir %{_localstatedir}/run/libvirt/qemu/
+%dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/qemu/
+%endif
+%if %{with_lxc}
+%dir %{_localstatedir}/run/libvirt/lxc/
+%dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/lxc/
+%endif
+%if %{with_uml}
+%dir %{_localstatedir}/run/libvirt/uml/
+%dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/uml/
+%endif
+%if %{with_network}
+%dir %{_localstatedir}/run/libvirt/network/
+%dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/network/
+%dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/iptables/filter/
+%dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/iptables/nat/
+%endif
+
+%if %{with_qemu}
 %{_datadir}/augeas/lenses/libvirtd_qemu.aug
 %{_datadir}/augeas/lenses/tests/test_libvirtd_qemu.aug
 %endif
@@ -372,7 +425,6 @@
 %attr(0755, root, root) %{_sbindir}/libvirtd
 %endif
 
-%doc docs/*.rng
 %doc docs/*.xml
 
 %files devel
@@ -405,6 +457,15 @@
 %endif
 
 %changelog
+* Sat Jan 31 2009 Daniel Veillard <veillard at redhat.com> - 0.6.0-1.fc11
+- upstream release 0.6.0
+- thread safety of API
+- allow QEmu/KVM domains to survive daemon restart
+- extended logging capabilities
+- support copy on write storage volumes for QEmu/KVM
+- support of storage cache control options for QEmu/KVM
+- a lot of bug fixes
+
 * Wed Dec 17 2008 Daniel Veillard <veillard at redhat.com> - 0.5.1-2.fc11
 - fix missing read-only access checks, fixes CVE-2008-5086
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt/devel/sources,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- sources	5 Dec 2008 05:38:54 -0000	1.36
+++ sources	31 Jan 2009 09:48:48 -0000	1.37
@@ -1 +1,2 @@
 abc697978e9c66cbc8d8db4fa3f1c1b6  libvirt-0.5.1.tar.gz
+8e0120d5452b37179f682031bf0895ea  libvirt-0.6.0.tar.gz


--- libvirt-0.5.1-read-only-checks.patch DELETED ---



From veillard at fedoraproject.org  Sat Jan 31 10:09:15 2009
From: veillard at fedoraproject.org (Daniel Veillard)
Date: Sat, 31 Jan 2009 10:09:15 +0000 (UTC)
Subject: rpms/libvirt/F-10 libvirt.spec, 1.106, 1.107 sources, 1.36,
	1.37 libvirt-0.5.1-read-only-checks.patch, 1.1, NONE
Message-ID: <20090131100915.7EAF270119@cvs1.fedora.phx.redhat.com>

Author: veillard

Update of /cvs/pkgs/rpms/libvirt/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29844

Modified Files:
	libvirt.spec sources 
Removed Files:
	libvirt-0.5.1-read-only-checks.patch 
Log Message:
Upstream 0.6.0 release, daniel



Index: libvirt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt/F-10/libvirt.spec,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -r1.106 -r1.107
--- libvirt.spec	17 Dec 2008 16:38:07 -0000	1.106
+++ libvirt.spec	31 Jan 2009 10:08:45 -0000	1.107
@@ -11,6 +11,7 @@
 %define with_python    0%{!?_without_python:1}
 %define with_libvirtd  0%{!?_without_libvirtd:1}
 %define with_uml       0%{!?_without_uml:1}
+%define with_network   0%{!?_without_network:1}
 
 # Xen is available only on i386 x86_64 ia64
 %ifnarch i386 i686 x86_64 ia64
@@ -32,15 +33,25 @@
 %define with_xen_proxy 0
 %endif
 
+#
+# If building on RHEL switch on the specific support
+# for the specific Xen version
+#
+%if 0%{?fedora}
+%define with_rhel5 0
+%else
+%define with_rhel5 1
+%endif
+
+
 Summary: Library providing a simple API virtualization
 Name: libvirt
-Version: 0.5.1
-Release: 2%{?dist}%{?extra_release}
+Version: 0.6.0
+Release: 1%{?dist}%{?extra_release}
 License: LGPLv2+
 Group: Development/Libraries
 Source: libvirt-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-Patch0: libvirt-0.5.1-read-only-checks.patch
 URL: http://libvirt.org/
 BuildRequires: python python-devel
 Requires: libxml2
@@ -125,6 +136,8 @@
 BuildRequires: iscsi-initiator-utils
 # For disk driver
 BuildRequires: parted-devel
+# For QEMU/LXC numa info
+BuildRequires: numactl-devel
 Obsoletes: libvir
 
 # Fedora build root suckage
@@ -164,7 +177,6 @@
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
 %if ! %{with_xen}
@@ -207,6 +219,14 @@
 %define _without_uml --without-uml
 %endif
 
+%if %{with_rhel5}
+%define _with_rhel5_api --with-rhel5-api
+%endif
+
+%if ! %{with_network}
+%define _without_network --without-network
+%endif
+
 %configure %{?_without_xen} \
            %{?_without_qemu} \
            %{?_without_openvz} \
@@ -217,6 +237,8 @@
            %{?_without_python} \
            %{?_without_libvirtd} \
            %{?_without_uml} \
+           %{?_without_network} \
+           %{?_with_rhel5_api} \
            --with-init-script=redhat \
            --with-qemud-pid-file=%{_localstatedir}/run/libvirt_qemud.pid \
            --with-remote-file=%{_localstatedir}/run/libvirtd.pid
@@ -277,7 +299,7 @@
 # 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
 /sbin/chkconfig --list libvirtd 1>/dev/null 2>&1
-if [ $? != 0 ]
+if [ $? != 0 -a ! -f %{_sysconfdir}/libvirt/qemu/networks/default.xml ]
 then
     UUID=`/usr/bin/uuidgen`
     sed -e "s,</name>,</name>\n  <uuid>$UUID</uuid>," \
@@ -320,6 +342,7 @@
 %{_sysconfdir}/rc.d/init.d/libvirtd
 %config(noreplace) %{_sysconfdir}/sysconfig/libvirtd
 %config(noreplace) %{_sysconfdir}/libvirt/libvirtd.conf
+%config(noreplace) %{_sysconfdir}/logrotate.d/libvirtd
 %endif
 
 %if %{with_qemu}
@@ -336,12 +359,42 @@
 %{_datadir}/libvirt/networks/default.xml
 %endif
 
+%dir %{_datadir}/libvirt/
+%dir %{_datadir}/libvirt/schemas/
+
+%{_datadir}/libvirt/schemas/domain.rng
+%{_datadir}/libvirt/schemas/network.rng
+%{_datadir}/libvirt/schemas/storagepool.rng
+%{_datadir}/libvirt/schemas/storagevol.rng
+%{_datadir}/libvirt/schemas/nodedev.rng
+%{_datadir}/libvirt/schemas/capability.rng
+
 %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/
 
 %if %{with_qemu}
+%dir %{_localstatedir}/run/libvirt/qemu/
+%dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/qemu/
+%endif
+%if %{with_lxc}
+%dir %{_localstatedir}/run/libvirt/lxc/
+%dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/lxc/
+%endif
+%if %{with_uml}
+%dir %{_localstatedir}/run/libvirt/uml/
+%dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/uml/
+%endif
+%if %{with_network}
+%dir %{_localstatedir}/run/libvirt/network/
+%dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/network/
+%dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/iptables/filter/
+%dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/iptables/nat/
+%endif
+
+%if %{with_qemu}
 %{_datadir}/augeas/lenses/libvirtd_qemu.aug
 %{_datadir}/augeas/lenses/tests/test_libvirtd_qemu.aug
 %endif
@@ -372,7 +425,6 @@
 %attr(0755, root, root) %{_sbindir}/libvirtd
 %endif
 
-%doc docs/*.rng
 %doc docs/*.xml
 
 %files devel
@@ -405,6 +457,15 @@
 %endif
 
 %changelog
+* Sat Jan 31 2009 Daniel Veillard <veillard at redhat.com> - 0.6.0-1.fc10
+- upstream release 0.6.0
+- thread safety of API
+- allow QEmu/KVM domains to survive daemon restart
+- extended logging capabilities
+- support copy on write storage volumes for QEmu/KVM
+- support of storage cache control options for QEmu/KVM
+- a lot of bug fixes
+
 * Wed Dec 17 2008 Daniel Veillard <veillard at redhat.com> - 0.5.1-2.fc10
 - fix missing read-only access checks, fixes CVE-2008-5086
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt/F-10/sources,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- sources	5 Dec 2008 05:41:33 -0000	1.36
+++ sources	31 Jan 2009 10:08:45 -0000	1.37
@@ -1 +1,2 @@
 abc697978e9c66cbc8d8db4fa3f1c1b6  libvirt-0.5.1.tar.gz
+8e0120d5452b37179f682031bf0895ea  libvirt-0.6.0.tar.gz


--- libvirt-0.5.1-read-only-checks.patch DELETED ---



From rakesh at fedoraproject.org  Sat Jan 31 10:14:43 2009
From: rakesh at fedoraproject.org (Rakesh Pandit)
Date: Sat, 31 Jan 2009 10:14:43 +0000 (UTC)
Subject: rpms/glade3/devel glade3-3.5.6-desktop.patch, NONE, 1.1 import.log, 
	NONE, 1.1 .cvsignore, 1.8, 1.9 glade3.spec, 1.16, 1.17 sources,
	1.8, 1.9 glade3-3.5.5-desktop.patch, 1.1, NONE
Message-ID: <20090131101443.7111D70119@cvs1.fedora.phx.redhat.com>

Author: rakesh

Update of /cvs/pkgs/rpms/glade3/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30676/devel

Modified Files:
	.cvsignore glade3.spec sources 
Added Files:
	glade3-3.5.6-desktop.patch import.log 
Removed Files:
	glade3-3.5.5-desktop.patch 
Log Message:

* Sat Jan 31 2009 Rakesh Pandit <rakesh at fedoraproject.org> - 3.5.6-1
- Updated to 3.5.6 (as per NEWS):
- a) Handling of new entry properties
- b) Added filechooser dialog to pixbuf properties
- Fixed unowned directories in libgladeui-devel



glade3-3.5.6-desktop.patch:

--- NEW FILE glade3-3.5.6-desktop.patch ---
diff -urNp glade3-3.5.5.orig/data/glade-3.desktop.in.in glade3-3.5.5/data/glade-3.desktop.in.in
--- glade3-3.5.5.orig/data/glade-3.desktop.in.in	2009-01-07 00:41:35.000000000 +0530
+++ glade3-3.5.5/data/glade-3.desktop.in.in	2009-01-07 00:42:21.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


--- NEW FILE import.log ---
glade3-3_5_6-1_fc11:HEAD:glade3-3.5.6-1.fc11.src.rpm:1233396590


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/glade3/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	6 Jan 2009 19:35:43 -0000	1.8
+++ .cvsignore	31 Jan 2009 10:14:12 -0000	1.9
@@ -1 +1 @@
-glade3-3.5.5.tar.gz
+glade3-3.5.6.tar.gz


Index: glade3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/glade3/devel/glade3.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- glade3.spec	6 Jan 2009 19:35:43 -0000	1.16
+++ glade3.spec	31 Jan 2009 10:14:12 -0000	1.17
@@ -1,6 +1,6 @@
 Summary:	User Interface Designer for GTK+ and GNOME
 Name:		glade3
-Version:	3.5.5
+Version:	3.5.6
 Release:	1%{?dist}
 License:	GPLv2+
 Group:		Development/Tools
@@ -178,14 +178,16 @@
 %doc COPYING.GPL
 %{_libdir}/libgladeui-1.so
 %{_libdir}/pkgconfig/gladeui-1.0.pc
-
-%dir %{_datadir}/gtk-doc/html/gladeui
-%{_datadir}/gtk-doc/html/gladeui/*
-
-%dir %{_includedir}/libgladeui-1.0/gladeui
-%{_includedir}/libgladeui-1.0/gladeui/*
+%{_datadir}/gtk-doc/html/gladeui/
+%{_includedir}/libgladeui-1.0/
 
 %changelog
+* Sat Jan 31 2009 Rakesh Pandit <rakesh at fedoraproject.org> - 3.5.6-1
+- Updated to 3.5.6 (as per NEWS):
+- a) Handling of new entry properties
+- b) Added filechooser dialog to pixbuf properties
+- Fixed unowned directories in libgladeui-devel
+
 * Wed Jan 07 2009 Debarshi Ray <rishi at fedoraproject.org> - 3.5.5-1
 - Version bump to 3.5.5.
 - Removed 'Provides: glade'.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/glade3/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	6 Jan 2009 19:35:43 -0000	1.8
+++ sources	31 Jan 2009 10:14:13 -0000	1.9
@@ -1 +1 @@
-a4827f97468476c2e34e4932494dc570  glade3-3.5.5.tar.gz
+2b778a21b0ce53b24b40548d4ae696ba  glade3-3.5.6.tar.gz


--- glade3-3.5.5-desktop.patch DELETED ---



From veillard at fedoraproject.org  Sat Jan 31 10:16:48 2009
From: veillard at fedoraproject.org (Daniel Veillard)
Date: Sat, 31 Jan 2009 10:16:48 +0000 (UTC)
Subject: rpms/libvirt/F-9 libvirt.spec, 1.97, 1.98 sources, 1.35,
	1.36 libvirt-0.5.1-read-only-checks.patch, 1.1, NONE
Message-ID: <20090131101648.50D1170119@cvs1.fedora.phx.redhat.com>

Author: veillard

Update of /cvs/pkgs/rpms/libvirt/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31111

Modified Files:
	libvirt.spec sources 
Removed Files:
	libvirt-0.5.1-read-only-checks.patch 
Log Message:
Upstream release of 0.6.0, Daniel



Index: libvirt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt/F-9/libvirt.spec,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -r1.97 -r1.98
--- libvirt.spec	17 Dec 2008 16:39:37 -0000	1.97
+++ libvirt.spec	31 Jan 2009 10:16:17 -0000	1.98
@@ -11,6 +11,7 @@
 %define with_python    0%{!?_without_python:1}
 %define with_libvirtd  0%{!?_without_libvirtd:1}
 %define with_uml       0%{!?_without_uml:1}
+%define with_network   0%{!?_without_network:1}
 
 # Xen is available only on i386 x86_64 ia64
 %ifnarch i386 i686 x86_64 ia64
@@ -32,15 +33,25 @@
 %define with_xen_proxy 0
 %endif
 
+#
+# If building on RHEL switch on the specific support
+# for the specific Xen version
+#
+%if 0%{?fedora}
+%define with_rhel5 0
+%else
+%define with_rhel5 1
+%endif
+
+
 Summary: Library providing a simple API virtualization
 Name: libvirt
-Version: 0.5.1
-Release: 2%{?dist}%{?extra_release}
+Version: 0.6.0
+Release: 1%{?dist}%{?extra_release}
 License: LGPLv2+
 Group: Development/Libraries
 Source: libvirt-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-Patch0: libvirt-0.5.1-read-only-checks.patch
 URL: http://libvirt.org/
 BuildRequires: python python-devel
 Requires: libxml2
@@ -125,6 +136,8 @@
 BuildRequires: iscsi-initiator-utils
 # For disk driver
 BuildRequires: parted-devel
+# For QEMU/LXC numa info
+BuildRequires: numactl-devel
 Obsoletes: libvir
 
 # Fedora build root suckage
@@ -164,7 +177,6 @@
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
 %if ! %{with_xen}
@@ -207,6 +219,14 @@
 %define _without_uml --without-uml
 %endif
 
+%if %{with_rhel5}
+%define _with_rhel5_api --with-rhel5-api
+%endif
+
+%if ! %{with_network}
+%define _without_network --without-network
+%endif
+
 %configure %{?_without_xen} \
            %{?_without_qemu} \
            %{?_without_openvz} \
@@ -217,6 +237,8 @@
            %{?_without_python} \
            %{?_without_libvirtd} \
            %{?_without_uml} \
+           %{?_without_network} \
+           %{?_with_rhel5_api} \
            --with-init-script=redhat \
            --with-qemud-pid-file=%{_localstatedir}/run/libvirt_qemud.pid \
            --with-remote-file=%{_localstatedir}/run/libvirtd.pid
@@ -277,7 +299,7 @@
 # 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
 /sbin/chkconfig --list libvirtd 1>/dev/null 2>&1
-if [ $? != 0 ]
+if [ $? != 0 -a ! -f %{_sysconfdir}/libvirt/qemu/networks/default.xml ]
 then
     UUID=`/usr/bin/uuidgen`
     sed -e "s,</name>,</name>\n  <uuid>$UUID</uuid>," \
@@ -320,6 +342,7 @@
 %{_sysconfdir}/rc.d/init.d/libvirtd
 %config(noreplace) %{_sysconfdir}/sysconfig/libvirtd
 %config(noreplace) %{_sysconfdir}/libvirt/libvirtd.conf
+%config(noreplace) %{_sysconfdir}/logrotate.d/libvirtd
 %endif
 
 %if %{with_qemu}
@@ -336,12 +359,42 @@
 %{_datadir}/libvirt/networks/default.xml
 %endif
 
+%dir %{_datadir}/libvirt/
+%dir %{_datadir}/libvirt/schemas/
+
+%{_datadir}/libvirt/schemas/domain.rng
+%{_datadir}/libvirt/schemas/network.rng
+%{_datadir}/libvirt/schemas/storagepool.rng
+%{_datadir}/libvirt/schemas/storagevol.rng
+%{_datadir}/libvirt/schemas/nodedev.rng
+%{_datadir}/libvirt/schemas/capability.rng
+
 %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/
 
 %if %{with_qemu}
+%dir %{_localstatedir}/run/libvirt/qemu/
+%dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/qemu/
+%endif
+%if %{with_lxc}
+%dir %{_localstatedir}/run/libvirt/lxc/
+%dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/lxc/
+%endif
+%if %{with_uml}
+%dir %{_localstatedir}/run/libvirt/uml/
+%dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/uml/
+%endif
+%if %{with_network}
+%dir %{_localstatedir}/run/libvirt/network/
+%dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/network/
+%dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/iptables/filter/
+%dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/iptables/nat/
+%endif
+
+%if %{with_qemu}
 %{_datadir}/augeas/lenses/libvirtd_qemu.aug
 %{_datadir}/augeas/lenses/tests/test_libvirtd_qemu.aug
 %endif
@@ -372,7 +425,6 @@
 %attr(0755, root, root) %{_sbindir}/libvirtd
 %endif
 
-%doc docs/*.rng
 %doc docs/*.xml
 
 %files devel
@@ -405,6 +457,15 @@
 %endif
 
 %changelog
+* Sat Jan 31 2009 Daniel Veillard <veillard at redhat.com> - 0.6.0-1.fc9
+- upstream release 0.6.0
+- thread safety of API
+- allow QEmu/KVM domains to survive daemon restart
+- extended logging capabilities
+- support copy on write storage volumes for QEmu/KVM
+- support of storage cache control options for QEmu/KVM
+- a lot of bug fixes
+
 * Wed Dec 17 2008 Daniel Veillard <veillard at redhat.com> - 0.5.1-2.fc9
 - fix missing read-only access checks, fixes CVE-2008-5086
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt/F-9/sources,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- sources	5 Dec 2008 05:44:19 -0000	1.35
+++ sources	31 Jan 2009 10:16:17 -0000	1.36
@@ -1 +1,2 @@
 abc697978e9c66cbc8d8db4fa3f1c1b6  libvirt-0.5.1.tar.gz
+8e0120d5452b37179f682031bf0895ea  libvirt-0.6.0.tar.gz


--- libvirt-0.5.1-read-only-checks.patch DELETED ---



From drago01 at fedoraproject.org  Sat Jan 31 11:24:33 2009
From: drago01 at fedoraproject.org (Adel Gadllah)
Date: Sat, 31 Jan 2009 11:24:33 +0000 (UTC)
Subject: rpms/beagle/F-10 beagle-0.3.9-libgnome-desktop-soname.patch, NONE, 
	1.1 beagle-0.2.15.1-libdir.patch, 1.1,
	1.2 beagle-0.3.8-epiphany.patch, 1.2, 1.3 beagle.spec, 1.155,
	1.156 beagle-0.3.8-category-crash.patch, 1.2,
	NONE beagle-0.3.8-desktop-parser.patch, 1.1,
	NONE beagle-0.3.8-libgnome-desktop-soname.patch, 1.1,
	NONE beagle-0.3.8-tmp-permissions.patch, 1.2,
	NONE beagle-0.3.8-typo-fix.patch, 1.1, NONE
Message-ID: <20090131112433.4794570119@cvs1.fedora.phx.redhat.com>

Author: drago01

Update of /cvs/pkgs/rpms/beagle/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9211

Modified Files:
	beagle-0.2.15.1-libdir.patch beagle-0.3.8-epiphany.patch 
	beagle.spec 
Added Files:
	beagle-0.3.9-libgnome-desktop-soname.patch 
Removed Files:
	beagle-0.3.8-category-crash.patch 
	beagle-0.3.8-desktop-parser.patch 
	beagle-0.3.8-libgnome-desktop-soname.patch 
	beagle-0.3.8-tmp-permissions.patch beagle-0.3.8-typo-fix.patch 
Log Message:
Update to 0.3.9

beagle-0.3.9-libgnome-desktop-soname.patch:

--- NEW FILE beagle-0.3.9-libgnome-desktop-soname.patch ---
diff -upNr beagle-0.3.9.orign/search/Beagle.Search.exe.config beagle-0.3.9/search/Beagle.Search.exe.config
--- beagle-0.3.9.orign/search/Beagle.Search.exe.config	2008-07-17 10:59:14.000000000 +0200
+++ beagle-0.3.9/search/Beagle.Search.exe.config	2009-01-28 12:51:07.000000000 +0100
@@ -1,4 +1,4 @@
 <configuration>
-	<dllmap dll="libgnome-desktop-2" target="libgnome-desktop-2.so.2" />
+	<dllmap dll="libgnome-desktop-2" target="libgnome-desktop-2.so.7" />
 </configuration>
 

beagle-0.2.15.1-libdir.patch:

Index: beagle-0.2.15.1-libdir.patch
===================================================================
RCS file: /cvs/pkgs/rpms/beagle/F-10/beagle-0.2.15.1-libdir.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- beagle-0.2.15.1-libdir.patch	5 Feb 2007 14:42:26 -0000	1.1
+++ beagle-0.2.15.1-libdir.patch	31 Jan 2009 11:24:31 -0000	1.2
@@ -1,11 +1,30 @@
---- beagle-0.2.15.1/configure.in.libdir	2007-02-05 13:35:26.000000000 +0100
-+++ beagle-0.2.15.1/configure.in	2007-02-05 13:37:10.000000000 +0100
-@@ -77,7 +77,7 @@
- needed_dlls="Mono.Data.SqliteClient Mono.Posix System.Runtime.Remoting System.Web System.Web.Services ICSharpCode.SharpZipLib"
+diff -upNr beagle-0.3.9.orign/configure beagle-0.3.9/configure
+--- beagle-0.3.9.orign/configure	2008-07-19 13:20:36.000000000 +0200
++++ beagle-0.3.9/configure	2009-01-28 13:16:04.000000000 +0100
+@@ -21191,7 +21191,7 @@ needed_dlls="Mono.Data.Sqlite Mono.Posix
  for i in $needed_dlls; do
-   AC_MSG_CHECKING([for $i.dll])
+   { echo "$as_me:$LINENO: checking for $i.dll" >&5
+ echo $ECHO_N "checking for $i.dll... $ECHO_C" >&6; }
 -  if test ! -e `$PKG_CONFIG --variable=prefix mono`/lib/mono/2.0/$i.dll; then
 +  if test ! -e `monodir`/2.0/$i.dll; then
-     AC_MSG_ERROR([missing required mono DLL: $i.dll])
-   else
-     AC_MSG_RESULT([found])
+     { { echo "$as_me:$LINENO: error: missing required mono DLL: $i.dll" >&5
+ echo "$as_me: error: missing required mono DLL: $i.dll" >&2;}
+    { (exit 1); exit 1; }; }
+@@ -25613,7 +25613,7 @@ if test "x$enable_google" = "xyes"; then
+   i="System.Security"
+   { echo "$as_me:$LINENO: checking for $i.dll (needed by Google backends)" >&5
+ echo $ECHO_N "checking for $i.dll (needed by Google backends)... $ECHO_C" >&6; }
+-  if test ! -e `$PKG_CONFIG --variable=prefix mono`/lib/mono/2.0/$i.dll; then
++  if test ! -e `monodir`/2.0/$i.dll; then
+     { { echo "$as_me:$LINENO: error: missing required mono DLL: $i.dll" >&5
+ echo "$as_me: error: missing required mono DLL: $i.dll" >&2;}
+    { (exit 1); exit 1; }; }
+@@ -27512,7 +27512,7 @@ if test "x$enable_qt" != "xno" -a "x$has
+ 	i="qt-dotnet"
+ 	{ echo "$as_me:$LINENO: checking for $i.dll" >&5
+ echo $ECHO_N "checking for $i.dll... $ECHO_C" >&6; }
+-	if test ! -e `$PKG_CONFIG --variable=prefix mono`/lib/mono/2.0/$i.dll; then
++	if test ! -e `monodir`/2.0/$i.dll; then
+ 		{ { echo "$as_me:$LINENO: error: missing required mono DLL: $i.dll" >&5
+ echo "$as_me: error: missing required mono DLL: $i.dll" >&2;}
+    { (exit 1); exit 1; }; }

beagle-0.3.8-epiphany.patch:

Index: beagle-0.3.8-epiphany.patch
===================================================================
RCS file: /cvs/pkgs/rpms/beagle/F-10/beagle-0.3.8-epiphany.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- beagle-0.3.8-epiphany.patch	4 Oct 2008 12:44:40 -0000	1.2
+++ beagle-0.3.8-epiphany.patch	31 Jan 2009 11:24:31 -0000	1.3
@@ -1,12 +1,12 @@
-diff -upNr beagle-0.3.8.orign/configure.in beagle-0.3.8/configure.in
---- beagle-0.3.8.orign/configure.in	2008-06-12 18:06:25.000000000 +0200
-+++ beagle-0.3.8/configure.in	2008-07-24 14:17:24.000000000 +0200
-@@ -402,7 +402,7 @@ if test "x$enable_epiphany_extension" !=
- 	dnl If you want to add anything but a <major>.<minor> version here, you
- 	dnl need to see the handling of the epiphany_version variable in the
- 	dnl epiphany extension code
--	VALID_EPIPHANY_VERSIONS="2.22 2.20 2.19 2.18 2.17 2.16 2.15 2.14 1.8 1.6"
-+	VALID_EPIPHANY_VERSIONS="2.24 2.22 2.20 2.19 2.18 2.17 2.16 2.15 2.14 1.8 1.6"
+diff -upNr beagle-0.3.9.orign/configure beagle-0.3.9/configure
+--- beagle-0.3.9.orign/configure	2008-07-19 13:20:36.000000000 +0200
++++ beagle-0.3.9/configure	2009-01-28 12:54:38.000000000 +0100
+@@ -26942,7 +26942,7 @@ echo $ECHO_N "checking for Epiphany... $
+ 	{ echo "$as_me:$LINENO: result: " >&5
+ echo "${ECHO_T}" >&6; }
+ 
+-				VALID_EPIPHANY_VERSIONS="2.22 2.20 2.19 2.18 2.17 2.16 2.15 2.14 1.8 1.6"
++				VALID_EPIPHANY_VERSIONS="2.26 2.25 2.24 2.22 2.20 2.19 2.18 2.17 2.16 2.15 2.14 1.8 1.6"
  	for v in $VALID_EPIPHANY_VERSIONS; do
- 	
- 		AC_MSG_CHECKING([for Epiphany $v])
+ 
+ 		{ echo "$as_me:$LINENO: checking for Epiphany $v" >&5


Index: beagle.spec
===================================================================
RCS file: /cvs/pkgs/rpms/beagle/F-10/beagle.spec,v
retrieving revision 1.155
retrieving revision 1.156
diff -u -r1.155 -r1.156
--- beagle.spec	28 Dec 2008 14:30:23 -0000	1.155
+++ beagle.spec	31 Jan 2009 11:24:31 -0000	1.156
@@ -1,6 +1,6 @@
 Name:		beagle
-Version:	0.3.8
-Release:	14%{?dist}
+Version:	0.3.9
+Release:	1%{?dist}
 Summary:	The Beagle Search Infrastructure
 Group:		User Interface/Desktops
 # see COPYING for details
@@ -55,31 +55,18 @@
 Patch4: beagle-0.3.0-runuser.patch
 Patch5: beagle-0.2.15.1-libdir.patch
 Patch6: beagle-monodoc.patch
-Patch7: beagle-0.3.8-typo-fix.patch
-Patch8: beagle-0.3.8-epiphany.patch
-Patch9: beagle-0.3.8-desktop-parser.patch
-Patch10: beagle-0.3.8-libgnome-desktop-soname.patch
-#svn commit r4855
-Patch11: beagle-0.3.8-category-crash.patch
-#svn commit 4899, fixes RH #465358
-Patch12: beagle-0.3.8-tmp-permissions.patch
+Patch7: beagle-0.3.8-epiphany.patch
+Patch8: beagle-0.3.9-libgnome-desktop-soname.patch
+
 # Mono is not available on these arches 
 ExcludeArch: s390 s390x sparc64 ppc64
 
-# Fedora 9 and above ships xulrunner
-%if 0%{?fedora} > 8
 BuildRequires:	xulrunner-devel
-%else
-BuildRequires:	firefox-devel
-%endif
 
 # firefox app id for beagle firefox extension
 %define firefox_app_id \{ec8030f7-c20a-464f-9b0e-13a3a9e97384\}
 %define firefox_ext_id \{fda00e13-8c62-4f63-9d19-d168115b11ca\}
 
-# thunderbird version and ext id for beagle extension
-%define tb_ext_id \{b656ef18-fd76-45e6-95cc-8043f26361e7\}
-
 %description
 A general infrastructure for making your data easy to find. 
 
@@ -150,15 +137,10 @@
 %patch4 -p1 -b .runuser
 %patch5 -p1 -b .libdir
 %patch6 -p1 -b .monodoc
-%patch7 -p1 -b .typo
-%patch8 -p1 -b .epiphany
-%patch9 -p1 -b .desktop-parser
-%patch10 -p1 -b .gnome-desktop
-%patch11 -p1 -b .category-crash
-%patch12 -p1 -b .tmp-leak
+%patch7 -p1 -b .epiphany
+%patch8 -p1 -b .gnome-desktop
 
 %build
-autoconf
 export MONO_SHARED_DIR=%{_builddir}/%{?buildsubdir}
 %configure --enable-wv1 --disable-googlebackends
 make %{?_smp_mflags}
@@ -347,6 +329,10 @@
 %{_libdir}/pkgconfig/beagle*.pc
 
 %changelog
+* Sat Jan 31 2009 Adel Gadllah <adel.gadllah at gmail.com> - 0.3.9-1
+- Update to 0.3.9
+- Drop obsolete patches
+
 * Sun Dec 28 2008 Adel Gadllah <adel.gadllah at gmail.com> - 0.3.8-14
 - Fix tmp file leak, RH #465358
 


--- beagle-0.3.8-category-crash.patch DELETED ---


--- beagle-0.3.8-desktop-parser.patch DELETED ---


--- beagle-0.3.8-libgnome-desktop-soname.patch DELETED ---


--- beagle-0.3.8-tmp-permissions.patch DELETED ---


--- beagle-0.3.8-typo-fix.patch DELETED ---



From drago01 at fedoraproject.org  Sat Jan 31 11:28:49 2009
From: drago01 at fedoraproject.org (Adel Gadllah)
Date: Sat, 31 Jan 2009 11:28:49 +0000 (UTC)
Subject: rpms/beagle/F-10 .cvsignore,1.31,1.32 sources,1.34,1.35
Message-ID: <20090131112849.261EF70119@cvs1.fedora.phx.redhat.com>

Author: drago01

Update of /cvs/pkgs/rpms/beagle/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9775

Modified Files:
	.cvsignore sources 
Log Message:
upload source tarball


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/beagle/F-10/.cvsignore,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- .cvsignore	15 Jul 2008 12:23:23 -0000	1.31
+++ .cvsignore	31 Jan 2009 11:28:18 -0000	1.32
@@ -1 +1 @@
-beagle-0.3.8.tar.bz2
+beagle-0.3.9.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/beagle/F-10/sources,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- sources	15 Jul 2008 12:23:23 -0000	1.34
+++ sources	31 Jan 2009 11:28:18 -0000	1.35
@@ -1 +1 @@
-fcafad26efa65a3bf06a019268ae6230  beagle-0.3.8.tar.bz2
+b73c12423d2d67133dbb05933f4c8fe1  beagle-0.3.9.tar.bz2



From pmatilai at fedoraproject.org  Sat Jan 31 11:36:40 2009
From: pmatilai at fedoraproject.org (Panu Matilainen)
Date: Sat, 31 Jan 2009 11:36:40 +0000 (UTC)
Subject: rpms/rpm/devel rpm.spec,1.318,1.319
Message-ID: <20090131113640.1751C70119@cvs1.fedora.phx.redhat.com>

Author: pmatilai

Update of /cvs/pkgs/rpms/rpm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10731

Modified Files:
	rpm.spec 
Log Message:
- change platform sharedstatedir to something more sensible (#185862)
- add rpmdb_foo links to db utils for documentation compatibility



Index: rpm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rpm/devel/rpm.spec,v
retrieving revision 1.318
retrieving revision 1.319
diff -u -r1.318 -r1.319
--- rpm.spec	30 Jan 2009 11:28:35 -0000	1.318
+++ rpm.spec	31 Jan 2009 11:36:08 -0000	1.319
@@ -18,7 +18,7 @@
 Summary: The RPM package management system
 Name: rpm
 Version: %{rpmver}
-Release: 0.%{snapver}.1%{?dist}
+Release: 0.%{snapver}.2%{?dist}
 Group: System Environment/Base
 Url: http://www.rpm.org/
 Source0: http://rpm.org/releases/testing/%{name}-%{srcver}.tar.bz2
@@ -42,7 +42,8 @@
 
 Requires(post): coreutils
 %if %{without int_bdb}
-Requires(post): compat-db45
+# normally db4-utils = %{bdbver} for the rpmdb_foo symlinks
+Requires: compat-db45
 %endif
 Requires: popt >= 1.10.2.1
 Requires: crontabs
@@ -190,6 +191,7 @@
     --prefix=%{_usr} \
     --sysconfdir=%{_sysconfdir} \
     --localstatedir=%{_var} \
+    --sharedstatedir=%{_var}/lib \
     --libdir=%{_libdir} \
     %{!?with_int_bdb: --with-external-db} \
     %{?with_sqlite: --enable-sqlite3} \
@@ -224,6 +226,16 @@
     touch $RPM_BUILD_ROOT/var/lib/rpm/$dbi
 done
 
+# plant links to db utils as rpmdb_foo so existing documantion is usable
+%if %{without int_bdb}
+for dbutil in \
+    archive deadlock dump load printlog \
+    recover stat svc upgrade verify
+do
+    ln -s ../../bin/db45_$dbutil $RPM_BUILD_ROOT/%{rpmhome}/rpmdb_$dbutil
+done
+%endif
+
 %find_lang %{name}
 
 find $RPM_BUILD_ROOT -name "*.la"|xargs rm -f
@@ -239,11 +251,7 @@
 
 %posttrans
 # XXX this is klunky and ugly, rpm itself should handle this
-%if %{with int_bdb}
 dbstat=/usr/lib/rpm/rpmdb_stat
-%else
-dbstat=%{_bindir}/db45_stat
-%endif
 if [ -x "$dbstat" ]; then
     if "$dbstat" -e -h /var/lib/rpm 2>&1 | grep -q "doesn't match environment version \| Invalid argument"; then
         rm -f /var/lib/rpm/__db.* 
@@ -357,6 +365,10 @@
 %doc doc/librpm/html/*
 
 %changelog
+* Sat Jan 31 2009 Panu Matilainen <pmatilai at redhat.com>
+- change platform sharedstatedir to something more sensible (#185862)
+- add rpmdb_foo links to db utils for documentation compatibility
+
 * Fri Jan 30 2009 Panu Matilainen <pmatilai at redhat.com> - 4.6.0-0.rc4.1
 - update to 4.6.0-rc4
 - fixes #475582, #478907, #476737, #479869, #476201



From steved at fedoraproject.org  Sat Jan 31 11:42:31 2009
From: steved at fedoraproject.org (Steve Dickson)
Date: Sat, 31 Jan 2009 11:42:31 +0000 (UTC)
Subject: rpms/nfs-utils/devel nfs-utils-1.1.4-tcpwrap-cleanup.patch, NONE,
	1.1 nfs-utils-1.1.4-tcpwrap-hash.patch, NONE,
	1.1 nfs-utils-1.1.4-tcpwrap-newrules.patch, NONE,
	1.1 nfs-utils.spec, 1.209,
	1.210 nfs-utils-1.1.4-tcpwrap-rulecheck.patch, 1.1, NONE
Message-ID: <20090131114232.0500B70119@cvs1.fedora.phx.redhat.com>

Author: steved

Update of /cvs/pkgs/rpms/nfs-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11456

Modified Files:
	nfs-utils.spec 
Added Files:
	nfs-utils-1.1.4-tcpwrap-cleanup.patch 
	nfs-utils-1.1.4-tcpwrap-hash.patch 
	nfs-utils-1.1.4-tcpwrap-newrules.patch 
Removed Files:
	nfs-utils-1.1.4-tcpwrap-rulecheck.patch 
Log Message:
- Reworked tcp wrapper code to correctly use API (bz 480223)
- General clean up of tcp wrapper code.


nfs-utils-1.1.4-tcpwrap-cleanup.patch:

--- NEW FILE nfs-utils-1.1.4-tcpwrap-cleanup.patch ---
Author: Steve Dickson <steved at redhat.com>
Date:   Sat Jan 31 06:17:18 2009 -0500

    General clean up. Removed unused routines. Reworked syslog
    message to (hopefully) make it more sensible. Move
    "#ifdef HAVE_LIBWRAP" around so nothing will be defined
    when tcp wrapper is not configured.
    
    Signed-off-by: Steve Dickson <steved at redhat.com>

diff -up nfs-utils-1.1.4/support/misc/tcpwrapper.c.orig nfs-utils-1.1.4/support/misc/tcpwrapper.c
--- nfs-utils-1.1.4/support/misc/tcpwrapper.c.orig	2009-01-31 06:27:54.000000000 -0500
+++ nfs-utils-1.1.4/support/misc/tcpwrapper.c	2009-01-31 06:31:32.000000000 -0500
@@ -34,6 +34,7 @@
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
+#ifdef HAVE_LIBWRAP
 #include <tcpwrapper.h>
 #include <unistd.h>
 #include <string.h>
@@ -57,40 +58,10 @@
 
 static void logit(int severity, struct sockaddr_in *addr,
 		  u_long procnum, u_long prognum, char *text);
-static void toggle_verboselog(int sig);
-int     verboselog = 0;
-int     allow_severity = LOG_INFO;
-int     deny_severity = LOG_WARNING;
-
-/* A handful of macros for "readability". */
-
-#ifdef HAVE_LIBWRAP
-/* coming from libwrap.a (tcp_wrappers) */
-extern int hosts_ctl(char *daemon, char *name, char *addr, char *user);
-#else
-int hosts_ctl(char *daemon, char *name, char *addr, char *user)
-{
-	return 0;
-}
-#endif
-
-#define	legal_port(a,p) \
-  (ntohs((a)->sin_port) < IPPORT_RESERVED || (p) >= IPPORT_RESERVED)
-
-#define log_bad_port(addr, proc, prog) \
-  logit(deny_severity, addr, proc, prog, ": request from unprivileged port")
+static int check_files(void);
 
 #define log_bad_host(addr, proc, prog) \
-  logit(deny_severity, addr, proc, prog, ": request from unauthorized host")
-
-#define log_bad_owner(addr, proc, prog) \
-  logit(deny_severity, addr, proc, prog, ": request from non-local host")
-
-#define	log_no_forward(addr, proc, prog) \
-  logit(deny_severity, addr, proc, prog, ": request not forwarded")
-
-#define log_client(addr, proc, prog) \
-  logit(allow_severity, addr, proc, prog, "")
+  logit(LOG_WARNING, addr, proc, prog, "request from unauthorized host")
 
 #define ALLOW 1
 #define DENY 0
@@ -180,46 +151,9 @@ struct sockaddr_in *addr;
 	return DENY;
 }
 
-/* check_startup - additional startup code */
-
-void    check_startup(void)
-{
-
-    /*
-     * Give up root privileges so that we can never allocate a privileged
-     * port when forwarding an rpc request.
-     *
-     * Fix 8/3/00 Philipp Knirsch: First lookup our rpc user. If we find it,
-     * switch to that uid, otherwise simply resue the old bin user and print
-     * out a warning in syslog.
-     */
-
-    struct passwd *pwent;
-
-    pwent = getpwnam("rpc");
-    if (pwent == NULL) {
-        syslog(LOG_WARNING, "user rpc not found, reverting to user bin");
-        if (setuid(1) == -1) {
-            syslog(LOG_ERR, "setuid(1) failed: %m");
-            exit(1);
-        }
-    }
-    else {
-        if (setuid(pwent->pw_uid) == -1) {
-            syslog(LOG_WARNING, "setuid() to rpc user failed: %m");
-            if (setuid(1) == -1) {
-                syslog(LOG_ERR, "setuid(1) failed: %m");
-                exit(1);
-            }
-        }
-    }
-
-    (void) signal(SIGINT, toggle_verboselog);
-}
-
 /* check_files - check to see if either access files have changed */
 
-int check_files()
+static int check_files()
 {
 	static time_t allow_mtime, deny_mtime;
 	struct stat astat, dstat;
@@ -268,78 +202,21 @@ u_long  prog;
 			haccess_add(addr, prog, FALSE);
 		return (FALSE);
 	}
-	if (verboselog)
-		log_client(addr, proc, prog);
 
 	if (acc)
 		acc->access = TRUE;
 	else 
 		haccess_add(addr, prog, TRUE);
-    return (TRUE);
-}
 
-/* check_privileged_port - additional checks for privileged-port updates */
-int
-check_privileged_port(struct sockaddr_in *addr,	
-		      u_long proc, u_long prog, u_long port)
-{
-#ifdef CHECK_PORT
-    if (!legal_port(addr, port)) {
-	log_bad_port(addr, proc, prog);
-	return (FALSE);
-    }
-#endif
     return (TRUE);
 }
 
-/* toggle_verboselog - toggle verbose logging flag */
-
-static void toggle_verboselog(int sig)
-{
-    (void) signal(sig, toggle_verboselog);
-    verboselog = !verboselog;
-}
-
 /* logit - report events of interest via the syslog daemon */
 
 static void logit(int severity, struct sockaddr_in *addr,
 		  u_long procnum, u_long prognum, char *text)
 {
-    char   *procname;
-    char    procbuf[16 + 4 * sizeof(u_long)];
-    char   *progname;
-    char    progbuf[16 + 4 * sizeof(u_long)];
-    struct rpcent *rpc;
-
-    /*
-     * Fork off a process or the portmap daemon might hang while
-     * getrpcbynumber() or syslog() does its thing.
-     *
-     * Don't forget to wait for the children, too...
-     */
-
-    if (fork() == 0) {
-
-	/* Try to map program number to name. */
-
-	if (prognum == 0) {
-	    progname = "";
-	} else if ((rpc = getrpcbynumber((int) prognum))) {
-	    progname = rpc->r_name;
-	} else {
-	    snprintf(progname = progbuf, sizeof (progbuf),
-		     "prog (%lu)", prognum);
-	}
-
-	/* Try to map procedure number to name. */
-
-	snprintf(procname = procbuf, sizeof (procbuf),
-		 "proc (%lu)", (u_long) procnum);
-
-	/* Write syslog record. */
-
-	syslog(severity, "connect from %s to %s in %s%s",
-	       inet_ntoa(addr->sin_addr), procname, progname, text);
-	exit(0);
-    }
+	syslog(severity, "connect from %s denied: %s",
+	       inet_ntoa(addr->sin_addr), text);
 }
+#endif

nfs-utils-1.1.4-tcpwrap-hash.patch:

--- NEW FILE nfs-utils-1.1.4-tcpwrap-hash.patch ---
Author: Steve Dickson <steved at redhat.com>
Date:   Sat Jan 31 05:30:13 2009 -0500

    Only hash on IP address and Program number. Including the Procedure
    number only creates needles extra hash entries.
    
    Signed-off-by: Steve Dickson <steved at redhat.com>

diff -up nfs-utils-1.1.4/support/misc/tcpwrapper.c.orig nfs-utils-1.1.4/support/misc/tcpwrapper.c
--- nfs-utils-1.1.4/support/misc/tcpwrapper.c.orig	2009-01-31 06:22:35.000000000 -0500
+++ nfs-utils-1.1.4/support/misc/tcpwrapper.c	2009-01-31 06:23:22.000000000 -0500
@@ -106,8 +106,8 @@ typedef struct _hash_head {
 	TAILQ_HEAD(host_list, _haccess_t) h_head;
 } hash_head;
 hash_head haccess_tbl[HASH_TABLE_SIZE];
-static haccess_t *haccess_lookup(struct sockaddr_in *addr, u_long, u_long);
-static void haccess_add(struct sockaddr_in *addr, u_long, u_long, int);
+static haccess_t *haccess_lookup(struct sockaddr_in *addr, u_long);
+static void haccess_add(struct sockaddr_in *addr, u_long, int);
 
 inline unsigned int strtoint(char *str)
 {
@@ -124,11 +124,10 @@ inline int hashint(unsigned int num)
 {
 	return num % HASH_TABLE_SIZE;
 }
-#define HASH(_addr, _proc, _prog) \
-	hashint((strtoint((_addr))+(_proc)+(_prog)))
+#define HASH(_addr, _prog) \
+	hashint((strtoint((_addr))+(_prog)))
 
-void haccess_add(struct sockaddr_in *addr, u_long proc, 
-	u_long prog, int access)
+void haccess_add(struct sockaddr_in *addr, u_long prog, int access)
 {
 	hash_head *head;
  	haccess_t *hptr;
@@ -138,7 +137,7 @@ void haccess_add(struct sockaddr_in *add
 	if (hptr == NULL)
 		return;
 
-	hash = HASH(inet_ntoa(addr->sin_addr), proc, prog);
+	hash = HASH(inet_ntoa(addr->sin_addr), prog);
 	head = &(haccess_tbl[hash]);
 
 	hptr->access = access;
@@ -149,13 +148,13 @@ void haccess_add(struct sockaddr_in *add
 	else
 		TAILQ_INSERT_TAIL(&head->h_head, hptr, list);
 }
-haccess_t *haccess_lookup(struct sockaddr_in *addr, u_long proc, u_long prog)
+haccess_t *haccess_lookup(struct sockaddr_in *addr, u_long prog)
 {
 	hash_head *head;
  	haccess_t *hptr;
 	int hash;
 
-	hash = HASH(inet_ntoa(addr->sin_addr), proc, prog);
+	hash = HASH(inet_ntoa(addr->sin_addr), prog);
 	head = &(haccess_tbl[hash]);
 
 	TAILQ_FOREACH(hptr, &head->h_head, list) {
@@ -300,7 +299,7 @@ u_long  prog;
 	haccess_t *acc = NULL;
 	int changed = check_files();
 
-	acc = haccess_lookup(addr, proc, prog);
+	acc = haccess_lookup(addr, prog);
 	if (acc && changed == 0)
 		return (acc->access);
 
@@ -309,7 +308,7 @@ u_long  prog;
 		if (acc)
 			acc->access = FALSE;
 		else 
-			haccess_add(addr, proc, prog, FALSE);
+			haccess_add(addr, prog, FALSE);
 		return (FALSE);
 	}
 	if (verboselog)
@@ -318,7 +317,7 @@ u_long  prog;
 	if (acc)
 		acc->access = TRUE;
 	else 
-		haccess_add(addr, proc, prog, TRUE);
+		haccess_add(addr, prog, TRUE);
     return (TRUE);
 }
 

nfs-utils-1.1.4-tcpwrap-newrules.patch:

--- NEW FILE nfs-utils-1.1.4-tcpwrap-newrules.patch ---
Author: Steve Dickson <steved at redhat.com>
Date:   Sat Jan 31 05:50:51 2009 -0500

    Converted good_client() to correctly use the tcp wrapper
    interface and added a note to the mountd man page saying
    hostnames will be ignored when they can not be looked up.
    
    Signed-off-by: Steve Dickson <steved at redhat.com>

diff -up nfs-utils-1.1.4/support/misc/tcpwrapper.c.orig nfs-utils-1.1.4/support/misc/tcpwrapper.c
--- nfs-utils-1.1.4/support/misc/tcpwrapper.c.orig	2009-01-31 06:25:16.000000000 -0500
+++ nfs-utils-1.1.4/support/misc/tcpwrapper.c	2009-01-31 06:26:27.000000000 -0500
@@ -46,7 +46,7 @@
 #include <sys/signal.h>
 #include <sys/queue.h>
 #include <sys/stat.h>
-#include <unistd.h>
+#include <tcpd.h>
 
 #include "xlog.h"
 
@@ -169,58 +169,15 @@ good_client(daemon, addr)
 char *daemon;
 struct sockaddr_in *addr;
 {
-    struct hostent *hp;
-    char **sp;
-    char *tmpname;
-
-	/* First check the address. */
-	if (hosts_ctl(daemon, "", inet_ntoa(addr->sin_addr), "") == DENY)
-		return DENY;
-
-	/* Now do the hostname lookup */
-	hp = gethostbyaddr ((const char *) &(addr->sin_addr),
-		sizeof (addr->sin_addr), AF_INET);
-	if (!hp) {
-		xlog(L_WARNING, 
-			"Warning: Client IP address '%s' not found in host lookup",
-			inet_ntoa(addr->sin_addr));
-		return DENY; /* never heard of it. misconfigured DNS? */
-	}
-
-	/* Make sure the hostent is authorative. */
-	tmpname = strdup(hp->h_name);
-	if (!tmpname) {
-		xlog(L_WARNING, "Warning: No memory for Host access check");
-		return DENY;
-	}
-	hp = gethostbyname(tmpname);
-	if (!hp) {
-		xlog(L_WARNING, 
-			"Warning: Client hostname '%s' not found in host lookup", tmpname);
-		free(tmpname);
-		return DENY; /* never heard of it. misconfigured DNS? */
-	}
-	free(tmpname);
+	struct request_info req;
 
-	/* Now make sure the address is on the list */
-	for (sp = hp->h_addr_list ; *sp ; sp++) {
-	    if (memcmp(*sp, &(addr->sin_addr), hp->h_length) == 0)
-			break;
-	}
-	if (!*sp)
-	    return DENY; /* it was a FAKE. */
+	request_init(&req, RQ_DAEMON, daemon, RQ_CLIENT_SIN, addr, 0);
+	sock_methods(&req);
 
-	/* Check the official name and address. */
-	if (hosts_ctl(daemon, hp->h_name, inet_ntoa(addr->sin_addr), "") == DENY)
-		return DENY;
-
-	/* Now check aliases. */
-	for (sp = hp->h_aliases; *sp ; sp++) {
-		if (hosts_ctl(daemon, *sp, inet_ntoa(addr->sin_addr), "") == DENY)
-	    	return DENY;
-	}
+	if (hosts_access(&req)) 
+		return ALLOW;
 
-   return ALLOW;
+	return DENY;
 }
 
 /* check_startup - additional startup code */
diff -up nfs-utils-1.1.4/utils/mountd/mountd.man.orig nfs-utils-1.1.4/utils/mountd/mountd.man
--- nfs-utils-1.1.4/utils/mountd/mountd.man.orig	2008-10-17 10:20:09.000000000 -0400
+++ nfs-utils-1.1.4/utils/mountd/mountd.man	2009-01-31 06:26:27.000000000 -0500
@@ -181,13 +181,15 @@ mountd: .bar.com
 You have to use the daemon name 
 .B mountd
 for the daemon name (even if the binary has a different name).
+.B Note:
+hostnames used in either access file will be ignored when
+they can not be resolved into IP addresses.
 
 For further information please have a look at the
 .BR tcpd (8)
 and
 .BR hosts_access (5)
 manual pages.
-
 .SH SEE ALSO
 .BR rpc.nfsd (8),
 .BR exportfs (8),


Index: nfs-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nfs-utils/devel/nfs-utils.spec,v
retrieving revision 1.209
retrieving revision 1.210
diff -u -r1.209 -r1.210
--- nfs-utils.spec	27 Jan 2009 23:02:49 -0000	1.209
+++ nfs-utils.spec	31 Jan 2009 11:42:01 -0000	1.210
@@ -2,7 +2,7 @@
 Name: nfs-utils
 URL: http://sourceforge.net/projects/nfs
 Version: 1.1.4
-Release: 14%{?dist}
+Release: 15%{?dist}
 Epoch: 1
 
 # group all 32bit related archs
@@ -44,8 +44,10 @@
 Patch115: nfs-utils-1.1.4-mount-addrconfig.patch
 Patch116: nfs-utils-1.1.4-configure-uuid.patch
 Patch117: nfs-utils-1.1.4-configure-tirpc.patch
-Patch118: nfs-utils-1.1.4-tcpwrap-rulecheck.patch
-Patch119: nfs-utils-1.1.4-mount-textbased.patch
+Patch118: nfs-utils-1.1.4-tcpwrap-hash.patch
+Patch119: nfs-utils-1.1.4-tcpwrap-newrules.patch
+Patch120: nfs-utils-1.1.4-tcpwrap-cleanup.patch
+Patch121: nfs-utils-1.1.4-mount-textbased.patch
 
 %if %{enablefscache}
 Patch90: nfs-utils-1.1.0-mount-fsc.patch
@@ -120,6 +122,8 @@
 %patch117 -p1
 %patch118 -p1
 %patch119 -p1
+%patch120 -p1
+%patch121 -p1
 
 %if %{enablefscache}
 %patch90 -p1
@@ -283,6 +287,10 @@
 %attr(4755,root,root)   /sbin/umount.nfs4
 
 %changelog
+* Sat Jan 31 2009 Steve Dickson <steved at redhat.com> 1.1.4-15
+- Reworked tcp wrapper code to correctly use API (bz 480223)
+- General clean up of tcp wrapper code.
+
 * Tue Jan 27 2009 Steve Dickson <steved at redhat.com> 1.1.4-14
 - text-based mount command: make po_rightmost() work for N options
 - text-based mount command: Function to stuff "struct pmap" from mount options


--- nfs-utils-1.1.4-tcpwrap-rulecheck.patch DELETED ---



From drago01 at fedoraproject.org  Sat Jan 31 11:47:55 2009
From: drago01 at fedoraproject.org (Adel Gadllah)
Date: Sat, 31 Jan 2009 11:47:55 +0000 (UTC)
Subject: rpms/beagle/devel beagle-0.3.9-spew.patch, NONE, 1.1 beagle.spec,
	1.159, 1.160 beagle-0.3.2-spew.patch, 1.1, NONE
Message-ID: <20090131114756.0604070119@cvs1.fedora.phx.redhat.com>

Author: drago01

Update of /cvs/pkgs/rpms/beagle/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12214

Modified Files:
	beagle.spec 
Added Files:
	beagle-0.3.9-spew.patch 
Removed Files:
	beagle-0.3.2-spew.patch 
Log Message:
Rebase debug output patch

beagle-0.3.9-spew.patch:

--- NEW FILE beagle-0.3.9-spew.patch ---
diff -upNr beagle-0.3.9.orign/beagled/BeagleDaemon.cs beagle-0.3.9/beagled/BeagleDaemon.cs
--- beagle-0.3.9.orign/beagled/BeagleDaemon.cs	2008-06-11 20:42:20.000000000 +0200
+++ beagle-0.3.9/beagled/BeagleDaemon.cs	2009-01-31 12:44:23.000000000 +0100
@@ -456,7 +456,7 @@ namespace Beagle.Daemon {
 			// debugging this code, after all...
 			// arg_debug ? LogLevel.Debug : LogLevel.Warn
 			
-			Log.Initialize (PathFinder.LogDir, "Beagle", LogLevel.Debug, arg_fg);
+			Log.Initialize (PathFinder.LogDir, "Beagle", arg_debug ? LogLevel.Debug : LogLevel.Warn, arg_fg);
 			Log.Always ("Starting Beagle Daemon (version {0})", ExternalStringsHack.Version);
 			Log.Always ("Running on {0}", SystemInformation.MonoRuntimeVersion);
 			Log.Always ("Command Line: {0}",


Index: beagle.spec
===================================================================
RCS file: /cvs/pkgs/rpms/beagle/devel/beagle.spec,v
retrieving revision 1.159
retrieving revision 1.160
diff -u -r1.159 -r1.160
--- beagle.spec	28 Jan 2009 12:03:15 -0000	1.159
+++ beagle.spec	31 Jan 2009 11:47:25 -0000	1.160
@@ -1,6 +1,6 @@
 Name:		beagle
 Version:	0.3.9
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	The Beagle Search Infrastructure
 Group:		User Interface/Desktops
 # see COPYING for details
@@ -51,7 +51,7 @@
 Requires(pre):	shadow-utils >= 4.0.17-5
 
 #Patch2: beagle-0.2.7-crawl.patch
-Patch3: beagle-0.3.2-spew.patch
+Patch3: beagle-0.3.9-spew.patch
 Patch4: beagle-0.3.0-runuser.patch
 Patch5: beagle-0.2.15.1-libdir.patch
 Patch6: beagle-monodoc.patch
@@ -339,6 +339,9 @@
 %{_libdir}/pkgconfig/beagle*.pc
 
 %changelog
+* Sat Jan 31 2009 Adel Gadllah <adel.gadllah at gmail.com> - 0.3.9-2
+- Rebase debug output patch
+
 * Wed Jan 28 2009 Adel Gadllah <adel.gadllah at gmail.com> - 0.3.9-1
 - Update t 0.3.9
 - Drop obsolete patches


--- beagle-0.3.2-spew.patch DELETED ---



From drago01 at fedoraproject.org  Sat Jan 31 11:49:51 2009
From: drago01 at fedoraproject.org (Adel Gadllah)
Date: Sat, 31 Jan 2009 11:49:51 +0000 (UTC)
Subject: rpms/beagle/F-10 beagle-0.3.9-spew.patch, NONE, 1.1 beagle.spec,
	1.156, 1.157 beagle-0.3.2-spew.patch, 1.1, NONE
Message-ID: <20090131114951.220BF70119@cvs1.fedora.phx.redhat.com>

Author: drago01

Update of /cvs/pkgs/rpms/beagle/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12611

Modified Files:
	beagle.spec 
Added Files:
	beagle-0.3.9-spew.patch 
Removed Files:
	beagle-0.3.2-spew.patch 
Log Message:
Rebase debug output patch

beagle-0.3.9-spew.patch:

--- NEW FILE beagle-0.3.9-spew.patch ---
diff -upNr beagle-0.3.9.orign/beagled/BeagleDaemon.cs beagle-0.3.9/beagled/BeagleDaemon.cs
--- beagle-0.3.9.orign/beagled/BeagleDaemon.cs	2008-06-11 20:42:20.000000000 +0200
+++ beagle-0.3.9/beagled/BeagleDaemon.cs	2009-01-31 12:44:23.000000000 +0100
@@ -456,7 +456,7 @@ namespace Beagle.Daemon {
 			// debugging this code, after all...
 			// arg_debug ? LogLevel.Debug : LogLevel.Warn
 			
-			Log.Initialize (PathFinder.LogDir, "Beagle", LogLevel.Debug, arg_fg);
+			Log.Initialize (PathFinder.LogDir, "Beagle", arg_debug ? LogLevel.Debug : LogLevel.Warn, arg_fg);
 			Log.Always ("Starting Beagle Daemon (version {0})", ExternalStringsHack.Version);
 			Log.Always ("Running on {0}", SystemInformation.MonoRuntimeVersion);
 			Log.Always ("Command Line: {0}",


Index: beagle.spec
===================================================================
RCS file: /cvs/pkgs/rpms/beagle/F-10/beagle.spec,v
retrieving revision 1.156
retrieving revision 1.157
diff -u -r1.156 -r1.157
--- beagle.spec	31 Jan 2009 11:24:31 -0000	1.156
+++ beagle.spec	31 Jan 2009 11:49:20 -0000	1.157
@@ -1,6 +1,6 @@
 Name:		beagle
 Version:	0.3.9
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	The Beagle Search Infrastructure
 Group:		User Interface/Desktops
 # see COPYING for details
@@ -51,7 +51,7 @@
 Requires(pre):	shadow-utils >= 4.0.17-5
 
 #Patch2: beagle-0.2.7-crawl.patch
-Patch3: beagle-0.3.2-spew.patch
+Patch3: beagle-0.3.9-spew.patch
 Patch4: beagle-0.3.0-runuser.patch
 Patch5: beagle-0.2.15.1-libdir.patch
 Patch6: beagle-monodoc.patch
@@ -329,6 +329,9 @@
 %{_libdir}/pkgconfig/beagle*.pc
 
 %changelog
+* Sat Jan 31 2009 Adel Gadllah <adel.gadllah at gmail.com> - 0.3.9-2
+- Rebase debug output patch
+
 * Sat Jan 31 2009 Adel Gadllah <adel.gadllah at gmail.com> - 0.3.9-1
 - Update to 0.3.9
 - Drop obsolete patches


--- beagle-0.3.2-spew.patch DELETED ---



From pmatilai at fedoraproject.org  Sat Jan 31 11:50:57 2009
From: pmatilai at fedoraproject.org (Panu Matilainen)
Date: Sat, 31 Jan 2009 11:50:57 +0000 (UTC)
Subject: rpms/rpm/devel rpm.spec,1.319,1.320
Message-ID: <20090131115057.AE8D970119@cvs1.fedora.phx.redhat.com>

Author: pmatilai

Update of /cvs/pkgs/rpms/rpm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12745

Modified Files:
	rpm.spec 
Log Message:
- oops, db svc util is named differently in fedora



Index: rpm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rpm/devel/rpm.spec,v
retrieving revision 1.319
retrieving revision 1.320
diff -u -r1.319 -r1.320
--- rpm.spec	31 Jan 2009 11:36:08 -0000	1.319
+++ rpm.spec	31 Jan 2009 11:50:27 -0000	1.320
@@ -228,12 +228,14 @@
 
 # plant links to db utils as rpmdb_foo so existing documantion is usable
 %if %{without int_bdb}
+dbprefix=db45
 for dbutil in \
     archive deadlock dump load printlog \
-    recover stat svc upgrade verify
+    recover stat upgrade verify
 do
-    ln -s ../../bin/db45_$dbutil $RPM_BUILD_ROOT/%{rpmhome}/rpmdb_$dbutil
+    ln -s ../../bin/${dbprefix}_${dbutil} $RPM_BUILD_ROOT/%{rpmhome}/rpmdb_${dbutil}
 done
+ln -s ../../bin/berkeley_${dbprefix}_svc $RPM_BUILD_ROOT/%{rpmhome}/rpmdb_svc
 %endif
 
 %find_lang %{name}



From steved at fedoraproject.org  Sat Jan 31 11:53:44 2009
From: steved at fedoraproject.org (Steve Dickson)
Date: Sat, 31 Jan 2009 11:53:44 +0000 (UTC)
Subject: rpms/nfs-utils/F-10 nfs-utils-1.1.4-tcpwrap-cleanup.patch, NONE,
	1.1 nfs-utils-1.1.4-tcpwrap-hash.patch, NONE,
	1.1 nfs-utils-1.1.4-tcpwrap-newrules.patch, NONE,
	1.1 nfs-utils.spec, 1.199,
	1.200 nfs-utils-1.1.4-tcpwrap-rulecheck.patch, 1.1, NONE
Message-ID: <20090131115344.D0B2870119@cvs1.fedora.phx.redhat.com>

Author: steved

Update of /cvs/pkgs/rpms/nfs-utils/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14043

Modified Files:
	nfs-utils.spec 
Added Files:
	nfs-utils-1.1.4-tcpwrap-cleanup.patch 
	nfs-utils-1.1.4-tcpwrap-hash.patch 
	nfs-utils-1.1.4-tcpwrap-newrules.patch 
Removed Files:
	nfs-utils-1.1.4-tcpwrap-rulecheck.patch 
Log Message:
- Reworked tcp wrapper code to correctly use API (bz 480223)
- General clean up of tcp wrapper code.


nfs-utils-1.1.4-tcpwrap-cleanup.patch:

--- NEW FILE nfs-utils-1.1.4-tcpwrap-cleanup.patch ---
Author: Steve Dickson <steved at redhat.com>
Date:   Sat Jan 31 06:17:18 2009 -0500

    General clean up. Removed unused routines. Reworked syslog
    message to (hopefully) make it more sensible. Move
    "#ifdef HAVE_LIBWRAP" around so nothing will be defined
    when tcp wrapper is not configured.
    
    Signed-off-by: Steve Dickson <steved at redhat.com>

diff -up nfs-utils-1.1.4/support/misc/tcpwrapper.c.orig nfs-utils-1.1.4/support/misc/tcpwrapper.c
--- nfs-utils-1.1.4/support/misc/tcpwrapper.c.orig	2009-01-31 06:27:54.000000000 -0500
+++ nfs-utils-1.1.4/support/misc/tcpwrapper.c	2009-01-31 06:31:32.000000000 -0500
@@ -34,6 +34,7 @@
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
+#ifdef HAVE_LIBWRAP
 #include <tcpwrapper.h>
 #include <unistd.h>
 #include <string.h>
@@ -57,40 +58,10 @@
 
 static void logit(int severity, struct sockaddr_in *addr,
 		  u_long procnum, u_long prognum, char *text);
-static void toggle_verboselog(int sig);
-int     verboselog = 0;
-int     allow_severity = LOG_INFO;
-int     deny_severity = LOG_WARNING;
-
-/* A handful of macros for "readability". */
-
-#ifdef HAVE_LIBWRAP
-/* coming from libwrap.a (tcp_wrappers) */
-extern int hosts_ctl(char *daemon, char *name, char *addr, char *user);
-#else
-int hosts_ctl(char *daemon, char *name, char *addr, char *user)
-{
-	return 0;
-}
-#endif
-
-#define	legal_port(a,p) \
-  (ntohs((a)->sin_port) < IPPORT_RESERVED || (p) >= IPPORT_RESERVED)
-
-#define log_bad_port(addr, proc, prog) \
-  logit(deny_severity, addr, proc, prog, ": request from unprivileged port")
+static int check_files(void);
 
 #define log_bad_host(addr, proc, prog) \
-  logit(deny_severity, addr, proc, prog, ": request from unauthorized host")
-
-#define log_bad_owner(addr, proc, prog) \
-  logit(deny_severity, addr, proc, prog, ": request from non-local host")
-
-#define	log_no_forward(addr, proc, prog) \
-  logit(deny_severity, addr, proc, prog, ": request not forwarded")
-
-#define log_client(addr, proc, prog) \
-  logit(allow_severity, addr, proc, prog, "")
+  logit(LOG_WARNING, addr, proc, prog, "request from unauthorized host")
 
 #define ALLOW 1
 #define DENY 0
@@ -180,46 +151,9 @@ struct sockaddr_in *addr;
 	return DENY;
 }
 
-/* check_startup - additional startup code */
-
-void    check_startup(void)
-{
-
-    /*
-     * Give up root privileges so that we can never allocate a privileged
-     * port when forwarding an rpc request.
-     *
-     * Fix 8/3/00 Philipp Knirsch: First lookup our rpc user. If we find it,
-     * switch to that uid, otherwise simply resue the old bin user and print
-     * out a warning in syslog.
-     */
-
-    struct passwd *pwent;
-
-    pwent = getpwnam("rpc");
-    if (pwent == NULL) {
-        syslog(LOG_WARNING, "user rpc not found, reverting to user bin");
-        if (setuid(1) == -1) {
-            syslog(LOG_ERR, "setuid(1) failed: %m");
-            exit(1);
-        }
-    }
-    else {
-        if (setuid(pwent->pw_uid) == -1) {
-            syslog(LOG_WARNING, "setuid() to rpc user failed: %m");
-            if (setuid(1) == -1) {
-                syslog(LOG_ERR, "setuid(1) failed: %m");
-                exit(1);
-            }
-        }
-    }
-
-    (void) signal(SIGINT, toggle_verboselog);
-}
-
 /* check_files - check to see if either access files have changed */
 
-int check_files()
+static int check_files()
 {
 	static time_t allow_mtime, deny_mtime;
 	struct stat astat, dstat;
@@ -268,78 +202,21 @@ u_long  prog;
 			haccess_add(addr, prog, FALSE);
 		return (FALSE);
 	}
-	if (verboselog)
-		log_client(addr, proc, prog);
 
 	if (acc)
 		acc->access = TRUE;
 	else 
 		haccess_add(addr, prog, TRUE);
-    return (TRUE);
-}
 
-/* check_privileged_port - additional checks for privileged-port updates */
-int
-check_privileged_port(struct sockaddr_in *addr,	
-		      u_long proc, u_long prog, u_long port)
-{
-#ifdef CHECK_PORT
-    if (!legal_port(addr, port)) {
-	log_bad_port(addr, proc, prog);
-	return (FALSE);
-    }
-#endif
     return (TRUE);
 }
 
-/* toggle_verboselog - toggle verbose logging flag */
-
-static void toggle_verboselog(int sig)
-{
-    (void) signal(sig, toggle_verboselog);
-    verboselog = !verboselog;
-}
-
 /* logit - report events of interest via the syslog daemon */
 
 static void logit(int severity, struct sockaddr_in *addr,
 		  u_long procnum, u_long prognum, char *text)
 {
-    char   *procname;
-    char    procbuf[16 + 4 * sizeof(u_long)];
-    char   *progname;
-    char    progbuf[16 + 4 * sizeof(u_long)];
-    struct rpcent *rpc;
-
-    /*
-     * Fork off a process or the portmap daemon might hang while
-     * getrpcbynumber() or syslog() does its thing.
-     *
-     * Don't forget to wait for the children, too...
-     */
-
-    if (fork() == 0) {
-
-	/* Try to map program number to name. */
-
-	if (prognum == 0) {
-	    progname = "";
-	} else if ((rpc = getrpcbynumber((int) prognum))) {
-	    progname = rpc->r_name;
-	} else {
-	    snprintf(progname = progbuf, sizeof (progbuf),
-		     "prog (%lu)", prognum);
-	}
-
-	/* Try to map procedure number to name. */
-
-	snprintf(procname = procbuf, sizeof (procbuf),
-		 "proc (%lu)", (u_long) procnum);
-
-	/* Write syslog record. */
-
-	syslog(severity, "connect from %s to %s in %s%s",
-	       inet_ntoa(addr->sin_addr), procname, progname, text);
-	exit(0);
-    }
+	syslog(severity, "connect from %s denied: %s",
+	       inet_ntoa(addr->sin_addr), text);
 }
+#endif

nfs-utils-1.1.4-tcpwrap-hash.patch:

--- NEW FILE nfs-utils-1.1.4-tcpwrap-hash.patch ---
Author: Steve Dickson <steved at redhat.com>
Date:   Sat Jan 31 05:30:13 2009 -0500

    Only hash on IP address and Program number. Including the Procedure
    number only creates needles extra hash entries.
    
    Signed-off-by: Steve Dickson <steved at redhat.com>

diff -up nfs-utils-1.1.4/support/misc/tcpwrapper.c.orig nfs-utils-1.1.4/support/misc/tcpwrapper.c
--- nfs-utils-1.1.4/support/misc/tcpwrapper.c.orig	2009-01-31 06:22:35.000000000 -0500
+++ nfs-utils-1.1.4/support/misc/tcpwrapper.c	2009-01-31 06:23:22.000000000 -0500
@@ -106,8 +106,8 @@ typedef struct _hash_head {
 	TAILQ_HEAD(host_list, _haccess_t) h_head;
 } hash_head;
 hash_head haccess_tbl[HASH_TABLE_SIZE];
-static haccess_t *haccess_lookup(struct sockaddr_in *addr, u_long, u_long);
-static void haccess_add(struct sockaddr_in *addr, u_long, u_long, int);
+static haccess_t *haccess_lookup(struct sockaddr_in *addr, u_long);
+static void haccess_add(struct sockaddr_in *addr, u_long, int);
 
 inline unsigned int strtoint(char *str)
 {
@@ -124,11 +124,10 @@ inline int hashint(unsigned int num)
 {
 	return num % HASH_TABLE_SIZE;
 }
-#define HASH(_addr, _proc, _prog) \
-	hashint((strtoint((_addr))+(_proc)+(_prog)))
+#define HASH(_addr, _prog) \
+	hashint((strtoint((_addr))+(_prog)))
 
-void haccess_add(struct sockaddr_in *addr, u_long proc, 
-	u_long prog, int access)
+void haccess_add(struct sockaddr_in *addr, u_long prog, int access)
 {
 	hash_head *head;
  	haccess_t *hptr;
@@ -138,7 +137,7 @@ void haccess_add(struct sockaddr_in *add
 	if (hptr == NULL)
 		return;
 
-	hash = HASH(inet_ntoa(addr->sin_addr), proc, prog);
+	hash = HASH(inet_ntoa(addr->sin_addr), prog);
 	head = &(haccess_tbl[hash]);
 
 	hptr->access = access;
@@ -149,13 +148,13 @@ void haccess_add(struct sockaddr_in *add
 	else
 		TAILQ_INSERT_TAIL(&head->h_head, hptr, list);
 }
-haccess_t *haccess_lookup(struct sockaddr_in *addr, u_long proc, u_long prog)
+haccess_t *haccess_lookup(struct sockaddr_in *addr, u_long prog)
 {
 	hash_head *head;
  	haccess_t *hptr;
 	int hash;
 
-	hash = HASH(inet_ntoa(addr->sin_addr), proc, prog);
+	hash = HASH(inet_ntoa(addr->sin_addr), prog);
 	head = &(haccess_tbl[hash]);
 
 	TAILQ_FOREACH(hptr, &head->h_head, list) {
@@ -300,7 +299,7 @@ u_long  prog;
 	haccess_t *acc = NULL;
 	int changed = check_files();
 
-	acc = haccess_lookup(addr, proc, prog);
+	acc = haccess_lookup(addr, prog);
 	if (acc && changed == 0)
 		return (acc->access);
 
@@ -309,7 +308,7 @@ u_long  prog;
 		if (acc)
 			acc->access = FALSE;
 		else 
-			haccess_add(addr, proc, prog, FALSE);
+			haccess_add(addr, prog, FALSE);
 		return (FALSE);
 	}
 	if (verboselog)
@@ -318,7 +317,7 @@ u_long  prog;
 	if (acc)
 		acc->access = TRUE;
 	else 
-		haccess_add(addr, proc, prog, TRUE);
+		haccess_add(addr, prog, TRUE);
     return (TRUE);
 }
 

nfs-utils-1.1.4-tcpwrap-newrules.patch:

--- NEW FILE nfs-utils-1.1.4-tcpwrap-newrules.patch ---
Author: Steve Dickson <steved at redhat.com>
Date:   Sat Jan 31 05:50:51 2009 -0500

    Converted good_client() to correctly use the tcp wrapper
    interface and added a note to the mountd man page saying
    hostnames will be ignored when they can not be looked up.
    
    Signed-off-by: Steve Dickson <steved at redhat.com>

diff -up nfs-utils-1.1.4/support/misc/tcpwrapper.c.orig nfs-utils-1.1.4/support/misc/tcpwrapper.c
--- nfs-utils-1.1.4/support/misc/tcpwrapper.c.orig	2009-01-31 06:25:16.000000000 -0500
+++ nfs-utils-1.1.4/support/misc/tcpwrapper.c	2009-01-31 06:26:27.000000000 -0500
@@ -46,7 +46,7 @@
 #include <sys/signal.h>
 #include <sys/queue.h>
 #include <sys/stat.h>
-#include <unistd.h>
+#include <tcpd.h>
 
 #include "xlog.h"
 
@@ -169,58 +169,15 @@ good_client(daemon, addr)
 char *daemon;
 struct sockaddr_in *addr;
 {
-    struct hostent *hp;
-    char **sp;
-    char *tmpname;
-
-	/* First check the address. */
-	if (hosts_ctl(daemon, "", inet_ntoa(addr->sin_addr), "") == DENY)
-		return DENY;
-
-	/* Now do the hostname lookup */
-	hp = gethostbyaddr ((const char *) &(addr->sin_addr),
-		sizeof (addr->sin_addr), AF_INET);
-	if (!hp) {
-		xlog(L_WARNING, 
-			"Warning: Client IP address '%s' not found in host lookup",
-			inet_ntoa(addr->sin_addr));
-		return DENY; /* never heard of it. misconfigured DNS? */
-	}
-
-	/* Make sure the hostent is authorative. */
-	tmpname = strdup(hp->h_name);
-	if (!tmpname) {
-		xlog(L_WARNING, "Warning: No memory for Host access check");
-		return DENY;
-	}
-	hp = gethostbyname(tmpname);
-	if (!hp) {
-		xlog(L_WARNING, 
-			"Warning: Client hostname '%s' not found in host lookup", tmpname);
-		free(tmpname);
-		return DENY; /* never heard of it. misconfigured DNS? */
-	}
-	free(tmpname);
+	struct request_info req;
 
-	/* Now make sure the address is on the list */
-	for (sp = hp->h_addr_list ; *sp ; sp++) {
-	    if (memcmp(*sp, &(addr->sin_addr), hp->h_length) == 0)
-			break;
-	}
-	if (!*sp)
-	    return DENY; /* it was a FAKE. */
+	request_init(&req, RQ_DAEMON, daemon, RQ_CLIENT_SIN, addr, 0);
+	sock_methods(&req);
 
-	/* Check the official name and address. */
-	if (hosts_ctl(daemon, hp->h_name, inet_ntoa(addr->sin_addr), "") == DENY)
-		return DENY;
-
-	/* Now check aliases. */
-	for (sp = hp->h_aliases; *sp ; sp++) {
-		if (hosts_ctl(daemon, *sp, inet_ntoa(addr->sin_addr), "") == DENY)
-	    	return DENY;
-	}
+	if (hosts_access(&req)) 
+		return ALLOW;
 
-   return ALLOW;
+	return DENY;
 }
 
 /* check_startup - additional startup code */
diff -up nfs-utils-1.1.4/utils/mountd/mountd.man.orig nfs-utils-1.1.4/utils/mountd/mountd.man
--- nfs-utils-1.1.4/utils/mountd/mountd.man.orig	2008-10-17 10:20:09.000000000 -0400
+++ nfs-utils-1.1.4/utils/mountd/mountd.man	2009-01-31 06:26:27.000000000 -0500
@@ -181,13 +181,15 @@ mountd: .bar.com
 You have to use the daemon name 
 .B mountd
 for the daemon name (even if the binary has a different name).
+.B Note:
+hostnames used in either access file will be ignored when
+they can not be resolved into IP addresses.
 
 For further information please have a look at the
 .BR tcpd (8)
 and
 .BR hosts_access (5)
 manual pages.
-
 .SH SEE ALSO
 .BR rpc.nfsd (8),
 .BR exportfs (8),


Index: nfs-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nfs-utils/F-10/nfs-utils.spec,v
retrieving revision 1.199
retrieving revision 1.200
diff -u -r1.199 -r1.200
--- nfs-utils.spec	20 Jan 2009 12:06:23 -0000	1.199
+++ nfs-utils.spec	31 Jan 2009 11:53:14 -0000	1.200
@@ -2,7 +2,7 @@
 Name: nfs-utils
 URL: http://sourceforge.net/projects/nfs
 Version: 1.1.4
-Release: 7%{?dist}
+Release: 8%{?dist}
 Epoch: 1
 
 # group all 32bit related archs
@@ -30,7 +30,10 @@
 Patch05: nfs-utils-1.1.4-tcpwrapper-update.patch
 Patch06: nfs-utils-1.1.4-tcpwrap-warn.patch
 Patch07: nfs-utils-1.1.4-gssd-verbosity.patch
-Patch08: nfs-utils-1.1.4-tcpwrap-rulecheck.patch
+Patch08: nfs-utils-1.1.4-tcpwrap-hash.patch
+Patch09: nfs-utils-1.1.4-tcpwrap-newrules.patch
+Patch10: nfs-utils-1.1.4-tcpwrap-cleanup.patch
+
 
 %if %{enablefscache}
 Patch90: nfs-utils-1.1.0-mount-fsc.patch
@@ -90,6 +93,8 @@
 %patch06 -p1
 %patch07 -p1
 %patch08 -p1
+%patch09 -p1
+%patch10 -p1
 
 %if %{enablefscache}
 %patch90 -p1
@@ -253,6 +258,10 @@
 %attr(4755,root,root)   /sbin/umount.nfs4
 
 %changelog
+* Sat Jan 31 2009 Steve Dickson <steved at redhat.com> 1.1.4-8
+- Reworked tcp wrapper code to correctly use API (bz 480223)
+- General clean up of tcp wrapper code.
+
 * Tue Jan 20 2009 Steve Dickson <steved at redhat.com> 1.1.4-7
 - mountd: Don't do tcp wrapper check when there are no rules (bz 448898)
 


--- nfs-utils-1.1.4-tcpwrap-rulecheck.patch DELETED ---



From steved at fedoraproject.org  Sat Jan 31 12:14:18 2009
From: steved at fedoraproject.org (Steve Dickson)
Date: Sat, 31 Jan 2009 12:14:18 +0000 (UTC)
Subject: rpms/nfs-utils/F-9 nfs-utils-1.1.2-tcpwrap-cleanup.patch, NONE,
	1.1 nfs-utils-1.1.2-tcpwrap-hash.patch, NONE,
	1.1 nfs-utils-1.1.2-tcpwrap-newrules.patch, NONE,
	1.1 nfs-utils.spec, 1.180,
	1.181 nfs-utils-1.1.2-tcpwrap-rulecheck.patch, 1.1, NONE
Message-ID: <20090131121418.3723370119@cvs1.fedora.phx.redhat.com>

Author: steved

Update of /cvs/pkgs/rpms/nfs-utils/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16491

Modified Files:
	nfs-utils.spec 
Added Files:
	nfs-utils-1.1.2-tcpwrap-cleanup.patch 
	nfs-utils-1.1.2-tcpwrap-hash.patch 
	nfs-utils-1.1.2-tcpwrap-newrules.patch 
Removed Files:
	nfs-utils-1.1.2-tcpwrap-rulecheck.patch 
Log Message:
- Reworked tcp wrapper code to correctly use API (bz 480223)
- General clean up of tcp wrapper code.


nfs-utils-1.1.2-tcpwrap-cleanup.patch:

--- NEW FILE nfs-utils-1.1.2-tcpwrap-cleanup.patch ---
Author: Steve Dickson <steved at redhat.com>
Date:   Sat Jan 31 06:17:18 2009 -0500

    General clean up. Removed unused routines. Reworked syslog
    message to (hopefully) make it more sensible. Move
    "#ifdef HAVE_LIBWRAP" around so nothing will be defined
    when tcp wrapper is not configured.
    
    Signed-off-by: Steve Dickson <steved at redhat.com>

diff -up nfs-utils-1.1.4/support/misc/tcpwrapper.c.orig nfs-utils-1.1.4/support/misc/tcpwrapper.c
--- nfs-utils-1.1.4/support/misc/tcpwrapper.c.orig	2009-01-31 06:27:54.000000000 -0500
+++ nfs-utils-1.1.4/support/misc/tcpwrapper.c	2009-01-31 06:31:32.000000000 -0500
@@ -34,6 +34,7 @@
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
+#ifdef HAVE_LIBWRAP
 #include <tcpwrapper.h>
 #include <unistd.h>
 #include <string.h>
@@ -57,40 +58,10 @@
 
 static void logit(int severity, struct sockaddr_in *addr,
 		  u_long procnum, u_long prognum, char *text);
-static void toggle_verboselog(int sig);
-int     verboselog = 0;
-int     allow_severity = LOG_INFO;
-int     deny_severity = LOG_WARNING;
-
-/* A handful of macros for "readability". */
-
-#ifdef HAVE_LIBWRAP
-/* coming from libwrap.a (tcp_wrappers) */
-extern int hosts_ctl(char *daemon, char *name, char *addr, char *user);
-#else
-int hosts_ctl(char *daemon, char *name, char *addr, char *user)
-{
-	return 0;
-}
-#endif
-
-#define	legal_port(a,p) \
-  (ntohs((a)->sin_port) < IPPORT_RESERVED || (p) >= IPPORT_RESERVED)
-
-#define log_bad_port(addr, proc, prog) \
-  logit(deny_severity, addr, proc, prog, ": request from unprivileged port")
+static int check_files(void);
 
 #define log_bad_host(addr, proc, prog) \
-  logit(deny_severity, addr, proc, prog, ": request from unauthorized host")
-
-#define log_bad_owner(addr, proc, prog) \
-  logit(deny_severity, addr, proc, prog, ": request from non-local host")
-
-#define	log_no_forward(addr, proc, prog) \
-  logit(deny_severity, addr, proc, prog, ": request not forwarded")
-
-#define log_client(addr, proc, prog) \
-  logit(allow_severity, addr, proc, prog, "")
+  logit(LOG_WARNING, addr, proc, prog, "request from unauthorized host")
 
 #define ALLOW 1
 #define DENY 0
@@ -180,46 +151,9 @@ struct sockaddr_in *addr;
 	return DENY;
 }
 
-/* check_startup - additional startup code */
-
-void    check_startup(void)
-{
-
-    /*
-     * Give up root privileges so that we can never allocate a privileged
-     * port when forwarding an rpc request.
-     *
-     * Fix 8/3/00 Philipp Knirsch: First lookup our rpc user. If we find it,
-     * switch to that uid, otherwise simply resue the old bin user and print
-     * out a warning in syslog.
-     */
-
-    struct passwd *pwent;
-
-    pwent = getpwnam("rpc");
-    if (pwent == NULL) {
-        syslog(LOG_WARNING, "user rpc not found, reverting to user bin");
-        if (setuid(1) == -1) {
-            syslog(LOG_ERR, "setuid(1) failed: %m");
-            exit(1);
-        }
-    }
-    else {
-        if (setuid(pwent->pw_uid) == -1) {
-            syslog(LOG_WARNING, "setuid() to rpc user failed: %m");
-            if (setuid(1) == -1) {
-                syslog(LOG_ERR, "setuid(1) failed: %m");
-                exit(1);
-            }
-        }
-    }
-
-    (void) signal(SIGINT, toggle_verboselog);
-}
-
 /* check_files - check to see if either access files have changed */
 
-int check_files()
+static int check_files()
 {
 	static time_t allow_mtime, deny_mtime;
 	struct stat astat, dstat;
@@ -268,78 +202,21 @@ u_long  prog;
 			haccess_add(addr, prog, FALSE);
 		return (FALSE);
 	}
-	if (verboselog)
-		log_client(addr, proc, prog);
 
 	if (acc)
 		acc->access = TRUE;
 	else 
 		haccess_add(addr, prog, TRUE);
-    return (TRUE);
-}
 
-/* check_privileged_port - additional checks for privileged-port updates */
-int
-check_privileged_port(struct sockaddr_in *addr,	
-		      u_long proc, u_long prog, u_long port)
-{
-#ifdef CHECK_PORT
-    if (!legal_port(addr, port)) {
-	log_bad_port(addr, proc, prog);
-	return (FALSE);
-    }
-#endif
     return (TRUE);
 }
 
-/* toggle_verboselog - toggle verbose logging flag */
-
-static void toggle_verboselog(int sig)
-{
-    (void) signal(sig, toggle_verboselog);
-    verboselog = !verboselog;
-}
-
 /* logit - report events of interest via the syslog daemon */
 
 static void logit(int severity, struct sockaddr_in *addr,
 		  u_long procnum, u_long prognum, char *text)
 {
-    char   *procname;
-    char    procbuf[16 + 4 * sizeof(u_long)];
-    char   *progname;
-    char    progbuf[16 + 4 * sizeof(u_long)];
-    struct rpcent *rpc;
-
-    /*
-     * Fork off a process or the portmap daemon might hang while
-     * getrpcbynumber() or syslog() does its thing.
-     *
-     * Don't forget to wait for the children, too...
-     */
-
-    if (fork() == 0) {
-
-	/* Try to map program number to name. */
-
-	if (prognum == 0) {
-	    progname = "";
-	} else if ((rpc = getrpcbynumber((int) prognum))) {
-	    progname = rpc->r_name;
-	} else {
-	    snprintf(progname = progbuf, sizeof (progbuf),
-		     "prog (%lu)", prognum);
-	}
-
-	/* Try to map procedure number to name. */
-
-	snprintf(procname = procbuf, sizeof (procbuf),
-		 "proc (%lu)", (u_long) procnum);
-
-	/* Write syslog record. */
-
-	syslog(severity, "connect from %s to %s in %s%s",
-	       inet_ntoa(addr->sin_addr), procname, progname, text);
-	exit(0);
-    }
+	syslog(severity, "connect from %s denied: %s",
+	       inet_ntoa(addr->sin_addr), text);
 }
+#endif

nfs-utils-1.1.2-tcpwrap-hash.patch:

--- NEW FILE nfs-utils-1.1.2-tcpwrap-hash.patch ---
Author: Steve Dickson <steved at redhat.com>
Date:   Sat Jan 31 05:30:13 2009 -0500

    Only hash on IP address and Program number. Including the Procedure
    number only creates needles extra hash entries.
    
    Signed-off-by: Steve Dickson <steved at redhat.com>

diff -up nfs-utils-1.1.4/support/misc/tcpwrapper.c.orig nfs-utils-1.1.4/support/misc/tcpwrapper.c
--- nfs-utils-1.1.4/support/misc/tcpwrapper.c.orig	2009-01-31 06:22:35.000000000 -0500
+++ nfs-utils-1.1.4/support/misc/tcpwrapper.c	2009-01-31 06:23:22.000000000 -0500
@@ -106,8 +106,8 @@ typedef struct _hash_head {
 	TAILQ_HEAD(host_list, _haccess_t) h_head;
 } hash_head;
 hash_head haccess_tbl[HASH_TABLE_SIZE];
-static haccess_t *haccess_lookup(struct sockaddr_in *addr, u_long, u_long);
-static void haccess_add(struct sockaddr_in *addr, u_long, u_long, int);
+static haccess_t *haccess_lookup(struct sockaddr_in *addr, u_long);
+static void haccess_add(struct sockaddr_in *addr, u_long, int);
 
 inline unsigned int strtoint(char *str)
 {
@@ -124,11 +124,10 @@ inline int hashint(unsigned int num)
 {
 	return num % HASH_TABLE_SIZE;
 }
-#define HASH(_addr, _proc, _prog) \
-	hashint((strtoint((_addr))+(_proc)+(_prog)))
+#define HASH(_addr, _prog) \
+	hashint((strtoint((_addr))+(_prog)))
 
-void haccess_add(struct sockaddr_in *addr, u_long proc, 
-	u_long prog, int access)
+void haccess_add(struct sockaddr_in *addr, u_long prog, int access)
 {
 	hash_head *head;
  	haccess_t *hptr;
@@ -138,7 +137,7 @@ void haccess_add(struct sockaddr_in *add
 	if (hptr == NULL)
 		return;
 
-	hash = HASH(inet_ntoa(addr->sin_addr), proc, prog);
+	hash = HASH(inet_ntoa(addr->sin_addr), prog);
 	head = &(haccess_tbl[hash]);
 
 	hptr->access = access;
@@ -149,13 +148,13 @@ void haccess_add(struct sockaddr_in *add
 	else
 		TAILQ_INSERT_TAIL(&head->h_head, hptr, list);
 }
-haccess_t *haccess_lookup(struct sockaddr_in *addr, u_long proc, u_long prog)
+haccess_t *haccess_lookup(struct sockaddr_in *addr, u_long prog)
 {
 	hash_head *head;
  	haccess_t *hptr;
 	int hash;
 
-	hash = HASH(inet_ntoa(addr->sin_addr), proc, prog);
+	hash = HASH(inet_ntoa(addr->sin_addr), prog);
 	head = &(haccess_tbl[hash]);
 
 	TAILQ_FOREACH(hptr, &head->h_head, list) {
@@ -300,7 +299,7 @@ u_long  prog;
 	haccess_t *acc = NULL;
 	int changed = check_files();
 
-	acc = haccess_lookup(addr, proc, prog);
+	acc = haccess_lookup(addr, prog);
 	if (acc && changed == 0)
 		return (acc->access);
 
@@ -309,7 +308,7 @@ u_long  prog;
 		if (acc)
 			acc->access = FALSE;
 		else 
-			haccess_add(addr, proc, prog, FALSE);
+			haccess_add(addr, prog, FALSE);
 		return (FALSE);
 	}
 	if (verboselog)
@@ -318,7 +317,7 @@ u_long  prog;
 	if (acc)
 		acc->access = TRUE;
 	else 
-		haccess_add(addr, proc, prog, TRUE);
+		haccess_add(addr, prog, TRUE);
     return (TRUE);
 }
 

nfs-utils-1.1.2-tcpwrap-newrules.patch:

--- NEW FILE nfs-utils-1.1.2-tcpwrap-newrules.patch ---
Author: Steve Dickson <steved at redhat.com>
Date:   Sat Jan 31 05:50:51 2009 -0500

    Converted good_client() to correctly use the tcp wrapper
    interface and added a note to the mountd man page saying
    hostnames will be ignored when they can not be looked up.
    
    Signed-off-by: Steve Dickson <steved at redhat.com>

diff -up nfs-utils-1.1.4/support/misc/tcpwrapper.c.orig nfs-utils-1.1.4/support/misc/tcpwrapper.c
--- nfs-utils-1.1.4/support/misc/tcpwrapper.c.orig	2009-01-31 06:25:16.000000000 -0500
+++ nfs-utils-1.1.4/support/misc/tcpwrapper.c	2009-01-31 06:26:27.000000000 -0500
@@ -46,7 +46,7 @@
 #include <sys/signal.h>
 #include <sys/queue.h>
 #include <sys/stat.h>
-#include <unistd.h>
+#include <tcpd.h>
 
 #include "xlog.h"
 
@@ -169,58 +169,15 @@ good_client(daemon, addr)
 char *daemon;
 struct sockaddr_in *addr;
 {
-    struct hostent *hp;
-    char **sp;
-    char *tmpname;
-
-	/* First check the address. */
-	if (hosts_ctl(daemon, "", inet_ntoa(addr->sin_addr), "") == DENY)
-		return DENY;
-
-	/* Now do the hostname lookup */
-	hp = gethostbyaddr ((const char *) &(addr->sin_addr),
-		sizeof (addr->sin_addr), AF_INET);
-	if (!hp) {
-		xlog(L_WARNING, 
-			"Warning: Client IP address '%s' not found in host lookup",
-			inet_ntoa(addr->sin_addr));
-		return DENY; /* never heard of it. misconfigured DNS? */
-	}
-
-	/* Make sure the hostent is authorative. */
-	tmpname = strdup(hp->h_name);
-	if (!tmpname) {
-		xlog(L_WARNING, "Warning: No memory for Host access check");
-		return DENY;
-	}
-	hp = gethostbyname(tmpname);
-	if (!hp) {
-		xlog(L_WARNING, 
-			"Warning: Client hostname '%s' not found in host lookup", tmpname);
-		free(tmpname);
-		return DENY; /* never heard of it. misconfigured DNS? */
-	}
-	free(tmpname);
+	struct request_info req;
 
-	/* Now make sure the address is on the list */
-	for (sp = hp->h_addr_list ; *sp ; sp++) {
-	    if (memcmp(*sp, &(addr->sin_addr), hp->h_length) == 0)
-			break;
-	}
-	if (!*sp)
-	    return DENY; /* it was a FAKE. */
+	request_init(&req, RQ_DAEMON, daemon, RQ_CLIENT_SIN, addr, 0);
+	sock_methods(&req);
 
-	/* Check the official name and address. */
-	if (hosts_ctl(daemon, hp->h_name, inet_ntoa(addr->sin_addr), "") == DENY)
-		return DENY;
-
-	/* Now check aliases. */
-	for (sp = hp->h_aliases; *sp ; sp++) {
-		if (hosts_ctl(daemon, *sp, inet_ntoa(addr->sin_addr), "") == DENY)
-	    	return DENY;
-	}
+	if (hosts_access(&req)) 
+		return ALLOW;
 
-   return ALLOW;
+	return DENY;
 }
 
 /* check_startup - additional startup code */
diff -up nfs-utils-1.1.4/utils/mountd/mountd.man.orig nfs-utils-1.1.4/utils/mountd/mountd.man
--- nfs-utils-1.1.4/utils/mountd/mountd.man.orig	2008-10-17 10:20:09.000000000 -0400
+++ nfs-utils-1.1.4/utils/mountd/mountd.man	2009-01-31 06:26:27.000000000 -0500
@@ -181,13 +181,15 @@ mountd: .bar.com
 You have to use the daemon name 
 .B mountd
 for the daemon name (even if the binary has a different name).
+.B Note:
+hostnames used in either access file will be ignored when
+they can not be resolved into IP addresses.
 
 For further information please have a look at the
 .BR tcpd (8)
 and
 .BR hosts_access (5)
 manual pages.
-
 .SH SEE ALSO
 .BR rpc.nfsd (8),
 .BR exportfs (8),


Index: nfs-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nfs-utils/F-9/nfs-utils.spec,v
retrieving revision 1.180
retrieving revision 1.181
diff -u -r1.180 -r1.181
--- nfs-utils.spec	20 Jan 2009 12:14:32 -0000	1.180
+++ nfs-utils.spec	31 Jan 2009 12:13:47 -0000	1.181
@@ -2,7 +2,7 @@
 Name: nfs-utils
 URL: http://sourceforge.net/projects/nfs
 Version: 1.1.2
-Release: 10%{?dist}
+Release: 11%{?dist}
 Epoch: 1
 
 # group all 32bit related archs
@@ -36,7 +36,9 @@
 Patch11: nfs-utils-1.1.2-tcpwrapper-update.patch
 Patch12: nfs-utils-1.1.2-tcpwrap-warn.patch
 Patch13: nfs-utils-1.1.2-gssd-verbosity.patch
-Patch14: nfs-utils-1.1.2-tcpwrap-rulecheck.patch
+Patch14: nfs-utils-1.1.2-tcpwrap-hash.patch
+Patch15: nfs-utils-1.1.2-tcpwrap-newrules.patch
+Patch16: nfs-utils-1.1.2-tcpwrap-cleanup.patch
 
 %if %{enablefscache}
 Patch90: nfs-utils-1.1.0-mount-fsc.patch
@@ -102,6 +104,8 @@
 %patch12 -p1
 %patch13 -p1
 %patch14 -p1
+%patch15 -p1
+%patch16 -p1
 
 %if %{enablefscache}
 %patch90 -p1
@@ -265,6 +269,10 @@
 %attr(4755,root,root)   /sbin/umount.nfs4
 
 %changelog
+* Sat Jan 31 2009 Steve Dickson <steved at redhat.com> 1.1.2-11
+- Reworked tcp wrapper code to correctly use API (bz 480223)
+- General clean up of tcp wrapper code.
+
 * Tue Jan 20 2009 Steve Dickson <steved at redhat.com> 1.1.2-10
 - mountd: Don't do tcp wrapper check when there are no rules (bz 448898)
 


--- nfs-utils-1.1.2-tcpwrap-rulecheck.patch DELETED ---



From belegdol at fedoraproject.org  Sat Jan 31 13:10:18 2009
From: belegdol at fedoraproject.org (Julian Sikorski)
Date: Sat, 31 Jan 2009 13:10:18 +0000 (UTC)
Subject: rpms/goffice/devel .cvsignore, 1.9, 1.10 goffice.spec, 1.21,
	1.22 sources, 1.9, 1.10
Message-ID: <20090131131018.7C40870119@cvs1.fedora.phx.redhat.com>

Author: belegdol

Update of /cvs/pkgs/rpms/goffice/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23669

Modified Files:
	.cvsignore goffice.spec sources 
Log Message:
* Sat Jan 31 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.6.6-1
- Updated to 0.6.6



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/goffice/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	7 Sep 2008 00:17:37 -0000	1.9
+++ .cvsignore	31 Jan 2009 13:09:48 -0000	1.10
@@ -1 +1 @@
-goffice-0.6.5.tar.bz2
+goffice-0.6.6.tar.bz2


Index: goffice.spec
===================================================================
RCS file: /cvs/pkgs/rpms/goffice/devel/goffice.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- goffice.spec	12 Jan 2009 09:42:54 -0000	1.21
+++ goffice.spec	31 Jan 2009 13:09:48 -0000	1.22
@@ -1,6 +1,6 @@
 Name:           goffice         
-Version:        0.6.5
-Release:        2%{?dist}
+Version:        0.6.6
+Release:        1%{?dist}
 Summary:        Goffice support libraries
 Group:          System Environment/Libraries
 # bug filed upstream about this being GPL v2 only:
@@ -77,6 +77,9 @@
 
 
 %changelog
+* Sat Jan 31 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.6.6-1
+- Updated to 0.6.6
+
 * Mon Jan 12 2009 Caol??n McNamara <caolanm at redhat.com> - 0.6.5-2
 - rebuild to get provides pkgconfig(libgoffice-0.4) >= 0:0.4.0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/goffice/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	7 Sep 2008 00:17:37 -0000	1.9
+++ sources	31 Jan 2009 13:09:48 -0000	1.10
@@ -1 +1 @@
-ab0cf11995b7750f26112669cedf6707  goffice-0.6.5.tar.bz2
+92e51878b9cd9c2fa954953d708f2c47  goffice-0.6.6.tar.bz2



From itamarjp at fedoraproject.org  Sat Jan 31 13:52:56 2009
From: itamarjp at fedoraproject.org (Itamar Reis Peixoto)
Date: Sat, 31 Jan 2009 13:52:56 +0000 (UTC)
Subject: rpms/ss5/devel import.log,1.1,1.2
Message-ID: <20090131135256.BDB6070119@cvs1.fedora.phx.redhat.com>

Author: itamarjp

Update of /cvs/pkgs/rpms/ss5/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29306/devel

Modified Files:
	import.log 
Log Message:
fix initscript



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/ss5/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	28 Jan 2009 04:19:12 -0000	1.1
+++ import.log	31 Jan 2009 13:52:26 -0000	1.2
@@ -1 +1,2 @@
 ss5-3_6_4-2_fc9:HEAD:ss5-3.6.4-2.fc9.src.rpm:1233115244
+ss5-3_6_4-2_fc10:HEAD:ss5-3.6.4-2.fc10.src.rpm:1233409811



From itamarjp at fedoraproject.org  Sat Jan 31 13:58:51 2009
From: itamarjp at fedoraproject.org (Itamar Reis Peixoto)
Date: Sat, 31 Jan 2009 13:58:51 +0000 (UTC)
Subject: rpms/ss5/F-9 import.log, NONE, 1.1 ss5_init.patch, NONE,
	1.1 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 ss5.spec, 1.7, 1.8
Message-ID: <20090131135851.708E470119@cvs1.fedora.phx.redhat.com>

Author: itamarjp

Update of /cvs/pkgs/rpms/ss5/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30926/F-9

Modified Files:
	.cvsignore sources ss5.spec 
Added Files:
	import.log ss5_init.patch 
Log Message:
fix initscript



--- NEW FILE import.log ---
ss5-3_6_4-2_fc10:F-9:ss5-3.6.4-2.fc10.src.rpm:1233410233

ss5_init.patch:

--- NEW FILE ss5_init.patch ---
diff -ruNp ss5-3.6.4.old/conf/ss5.init ss5-3.6.4.new/conf/ss5.init
--- ss5-3.6.4.old/conf/ss5.init	2007-04-17 11:40:43.000000000 -0300
+++ ss5-3.6.4.new/conf/ss5.init	2009-01-28 01:08:43.000000000 -0200
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# chkconfig: 345 20 80
+# chkconfig: - 20 80
 # description: This script takes care of starting \
 #              and stopping ss5
 #
@@ -31,7 +31,7 @@ case "$1" in
 	if [ $OS = "Linux" ]; then
             daemon /usr/sbin/ss5 -t $SS5_OPTS
             touch /var/lock/subsys/ss5
-	if [ $OS = "SunOS" ]; then
+	elif [ $OS = "SunOS" ]; then
             /usr/sbin/ss5 -t 
             touch /var/lock/subsys/ss5
 	else


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ss5/F-9/.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	31 Jan 2009 13:58:21 -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/F-9/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	31 Jan 2009 13:58:21 -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/F-9/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	31 Jan 2009 13:58:21 -0000	1.8
@@ -1,24 +1,28 @@
 Summary: Socks Server 5 
 Name: ss5
-Version: 3.5.9
-Release: 7
-License: GPL 
+Version: 3.6.4
+Release: 2%{?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
+
+Patch0: ss5_init.patch
 
 %description
 ss5 is a socks server, which supports both SOCKS4 and SOCKS5 protocols,
 that runs on Linux/Solaris platforms. 
 
 %prep
-%setup
+%setup -q
+%patch0 -p1
 
 %build
-
-./configure --with-libpath=%{_libdir} 
+%configure --with-libpath=%{_libdir} 
 make %{?_smp_mflags}
 
 %install
@@ -41,37 +45,46 @@
 fi
 
 %files
-%defattr(755,root,root)
+%defattr(-,root,root,-)
 %{_sbindir}/ss5
 %{_initrddir}/ss5
 %{_libdir}/ss5/
 
-%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
 
 %dir %{_sysconfdir}/opt/ss5
-%defattr(0640,root,root)
 %config(noreplace) %{_sysconfdir}/opt/ss5/ss5.conf
 %config(noreplace) %{_sysconfdir}/opt/ss5/ss5.passwd
 %config(noreplace) %{_sysconfdir}/pam.d/ss5
+%doc ChangeLog
 
 %changelog
+* Wed Jan 28 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 3.6.4-2
+- fix init script BZ #478702
+- replace some tabs with spaces in changelog
+- fix wrong permissions in spec file
+
+* 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
 
@@ -98,7 +111,7 @@
         * Fix DNS buffer as RFC
 
 *Fri May  05 2006 Matteo Ricchetti <matteo.ricchetti at libero.it>
-	* SS5-v3.5.8-2 released
+        * SS5-v3.5.8-2 released
         * Fix startup script
 
 *Wed Apr  26 2006 Matteo Ricchetti <matteo.ricchetti at libero.it>
@@ -106,13 +119,13 @@
         * Fix EAP (thx to Jakob Perz)
 
 *Mon Apr  24 2006 Matteo Ricchetti <matteo.ricchetti at libero.it>
-	* SS5-v3.5.7-1 released
-	* Fix replica feature
+        * SS5-v3.5.7-1 released
+        * Fix replica feature
         * Fix configure file
         * Fix man file for ss5.peers
 
 *Mon Apr  10 2006 Matteo Ricchetti <matteo.ricchetti at libero.it>
-	* SS5-v3.5.6-1 released
+        * SS5-v3.5.6-1 released
         * Fix startup script 
 
 *Thu Apr  06 2006 Matteo Ricchetti <matteo.ricchetti at libero.it>
@@ -128,11 +141,11 @@
         * Fix external authentication program 
 
 *Sun Mar  19 2006 Matteo Ricchetti <matteo.ricchetti at libero.it>
-	* SS5-v3.5.3-2 released
+        * SS5-v3.5.3-2 released
         * Fix package for Fedora naming guidelines
 
 *Thu Mar  09 2006 Matteo Ricchetti <matteo.ricchetti at libero.it>
-	* SS5-v3.5.3-1 released
+        * SS5-v3.5.3-1 released
         * Add security feature to centralized management
 
 *Thu Mar  09 2006 Matteo Ricchetti <matteo.ricchetti at libero.it>
@@ -172,14 +185,14 @@
         * New configure file (thx to Walter Franzini)
 
 *Tue Feb  07 2006 Matteo Ricchetti <matteo.ricchetti at libero.it>
-	* SS5-v3.3r5 released
+        * SS5-v3.3r5 released
         * Fix Solaris 10 compatibility with ctime_r() call
         * Fix netbios default domain
 
 *Mon Feb  06 2006 Matteo Ricchetti <matteo.ricchetti at libero.it>
         * SS5-v3.3r4 released
         * Add default netbios domain
-	* Fix externalprogram
+        * Fix externalprogram
 
 *Sat Feb  04 2006 Matteo Ricchetti <matteo.ricchetti at libero.it>
         * SS5-v3.3r3 released
@@ -193,7 +206,7 @@
 
 *Mon Jan  20 2006 Matteo Ricchetti <matteo.ricchetti at libero.it>
         * SS5-v3.3r1 released
-	* Add multiple directory store support
+        * Add multiple directory store support
         * Add netbios compatibility in authorization module
         * Add noproxy rule in mod_socks5
 
@@ -207,7 +220,7 @@
         * Fix module authentication (pam)
 
 *Mon Dec  16 2005 Matteo Ricchetti <matteo.ricchetti at libero.it>
-	* SS5-v3.2r5 released
+        * SS5-v3.2r5 released
         * Fix makefile for gcc old version
 
 *Mon Dec  04 2005 Matteo Ricchetti <matteo.ricchetti at libero.it>
@@ -249,7 +262,7 @@
         * Fix recv call
 
 *Mon Aug  22 2005 Matteo Ricchetti <matteo.ricchetti at libero.it>
-	* SS5-v3.0r9 released
+        * SS5-v3.0r9 released
         * Fix SS5_AUTHCACHEAGE option
 
 *Thu Aug  18 2005 Matteo Ricchetti <matteo.ricchetti at libero.it>
@@ -266,15 +279,15 @@
 
 *Thu May  10 2005 Matteo Ricchetti <matteo.ricchetti at libero.it>
         * SS5-v3.0r5 released
-	* Fix connect response using dns
+        * Fix connect response using dns
         * Increase authentication buffer
-	* Fix profiling bug
+        * Fix profiling bug
         * Modify package structure
 
 *Thu Apr  10 2005 Matteo Ricchetti <matteo.ricchetti at libero.it>
         * SS5-v3.0r4 released
         * Added comment into group file
-	
+
 *Thu Mar  10 2005 Matteo Ricchetti <matteo.ricchetti at libero.it>
         * SS5-v3.0r3 released
         * Pam module fix
@@ -315,7 +328,7 @@
 *Thu Dec  30 2003 Matteo Ricchetti <matteo.ricchetti at libero.it>
         * SS5-v2.4r5 released
         * Fix Solaris documentation
-	* Fix admin access check
+        * Fix admin access check
         * Add statistics information
 
 *Thu Dec  24 2003 Matteo Ricchetti <matteo.ricchetti at libero.it>
@@ -329,10 +342,10 @@
 *Thu Nov  15 2003 Matteo Ricchetti <matteo.ricchetti at libero.it>
         * SS5-v2.4r2 released
         * Fix some potential buffer overflow 
-	* Fix udp bind problem
+        * Fix udp bind problem
 
 *Thu Oct  29 2003 Matteo Ricchetti <matteo.ricchetti at libero.it>
-	* SS5-v2.4r1 released
+        * SS5-v2.4r1 released
         * Add session affinity in balanced connections
         * Add socks statistics about connections
         * Add fake authentication
@@ -361,8 +374,8 @@
         * SS5-v2.3r1 released
         * Add source-if feature for connect operation
         * Add better control in ldap base configuration
-	* Add better detail on log messages
-	* Threads creation improvement
+        * Add better detail on log messages
+        * Threads creation improvement
         * Fix automatic configuration reload (every 30 seconds)
 
 *Thu Aug  14  2003 Matteo Ricchetti <matteo.ricchetti at libero.it>
@@ -370,7 +383,7 @@
         * Add ldap profile feature
         * Add PAM authentication
         * Add username for ss5 execution
-	* Add server balancing feature !!!
+        * Add server balancing feature !!!
         * Add ssl fixup
         * Add pop3 fixup
         * Add imap fixup



From jwrdegoede at fedoraproject.org  Sat Jan 31 14:18:12 2009
From: jwrdegoede at fedoraproject.org (Hans de Goede)
Date: Sat, 31 Jan 2009 14:18:12 +0000 (UTC)
Subject: rpms/ode/devel .cvsignore, 1.8, 1.9 ode.spec, 1.14, 1.15 sources,
	1.8, 1.9
Message-ID: <20090131141812.C92FE70119@cvs1.fedora.phx.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/ode/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv821

Modified Files:
	.cvsignore ode.spec sources 
Log Message:
* Fri Jan 30 2009 Hans de Goede <hdegoede at redhat.com> 0.11-1
- New upstream release 0.11



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ode/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	15 Sep 2008 21:16:49 -0000	1.8
+++ .cvsignore	31 Jan 2009 14:17:42 -0000	1.9
@@ -1 +1 @@
-ode-0.10.1.tar.bz2
+ode-0.11.tar.bz2


Index: ode.spec
===================================================================
RCS file: /cvs/extras/rpms/ode/devel/ode.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- ode.spec	15 Sep 2008 21:16:50 -0000	1.14
+++ ode.spec	31 Jan 2009 14:17:42 -0000	1.15
@@ -1,5 +1,5 @@
 Name:           ode
-Version:        0.10.1
+Version:        0.11
 Release:        1%{?dist}
 Summary:        High performance library for simulating rigid body dynamics
 Group:          System Environment/Libraries
@@ -25,7 +25,7 @@
 %package        devel
 Summary:        Development files for %{name}
 Group:          Development/Libraries
-Requires:       %{name} = %{version}-%{release}
+Requires:       %{name} = %{version}-%{release}, pkgconfig
 
 %description    devel
 The %{name}-devel package contains libraries and header files for
@@ -74,9 +74,13 @@
 %{_bindir}/%{name}-config
 %{_includedir}/%{name}
 %{_libdir}/libode.so
+%{_libdir}/pkgconfig/%{name}.pc
 
 
 %changelog
+* Fri Jan 30 2009 Hans de Goede <hdegoede at redhat.com> 0.11-1
+- New upstream release 0.11
+
 * 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: sources
===================================================================
RCS file: /cvs/extras/rpms/ode/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	15 Sep 2008 21:16:50 -0000	1.8
+++ sources	31 Jan 2009 14:17:42 -0000	1.9
@@ -1 +1 @@
-91c396b915539a760617437d56eb1681  ode-0.10.1.tar.bz2
+ce59bf1e2ea78d92f08e973a99c3069a  ode-0.11.tar.bz2



From saispo at fedoraproject.org  Sat Jan 31 15:49:42 2009
From: saispo at fedoraproject.org (Jerome Soyer)
Date: Sat, 31 Jan 2009 15:49:42 +0000 (UTC)
Subject: rpms/nufw/devel nufw.spec,1.3,1.4
Message-ID: <20090131154942.3541570119@cvs1.fedora.phx.redhat.com>

Author: saispo

Update of /cvs/pkgs/rpms/nufw/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13157

Modified Files:
	nufw.spec 
Log Message:
Fix unowned directory



Index: nufw.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nufw/devel/nufw.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- nufw.spec	24 Jan 2009 16:38:56 -0000	1.3
+++ nufw.spec	31 Jan 2009 15:49:11 -0000	1.4
@@ -2,7 +2,7 @@
 
 Name: nufw
 Version: 2.2.20
-Release: 7%{dist}
+Release: 8%{dist}
 Summary: Authentication Firewall Suite for Linux
 License: GPLv2
 Group: System Environment/Daemons
@@ -106,24 +106,28 @@
 %package -n nuauth-auth-ldap
 Summary: Module for nuauth providing ldap user database
 Group: System Environment/Libraries
+Requires: nuauth = %{version}-%{release}
 %description -n nuauth-auth-ldap
 This package provides a module to use ldap as user database for nuauth.
 
 %package -n nuauth-log-mysql
 Summary: Module for nuauth to log in Mysql database
 Group: System Environment/Libraries
+Requires: nuauth = %{version}-%{release}
 %description -n nuauth-log-mysql
 This module allows you to log user activity in a mysql database.
 
 %package -n nuauth-log-pgsql
 Summary: Module for nuauth to log in Postgresql database
 Group: System Environment/Libraries
+Requires: nuauth = %{version}-%{release}
 %description -n nuauth-log-pgsql
 This module allows you to log user activity in a postgresql database.
 
 %package -n nuauth-log-prelude
 Summary: Module for nuauth to log to Prelude IDS
 Group: System Environment/Libraries
+Requires: nuauth = %{version}-%{release}
 %description -n nuauth-log-prelude
 This module allows you to log user activity to the Prelude IDS.
 
@@ -357,6 +361,9 @@
 %{python_sitelib}/nuclient/*
 
 %changelog
+* Sat Jan 31 2009 Jerome Soyer <saispo at gmail.com> 2.2.20-8
+- Add requires on all nuauth-* fo fixing unowned directory
+
 * Sat Jan 24 2009 Caol??n McNamara <caolanm at redhat.com> 2.2.20-7
 - rebuild for dependencies
 



From karsten at fedoraproject.org  Sat Jan 31 16:39:19 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Sat, 31 Jan 2009 16:39:19 +0000 (UTC)
Subject: rpms/gnupg2/devel gnupg2.spec,1.88,1.89
Message-ID: <20090131163919.74AE170119@cvs1.fedora.phx.redhat.com>

Author: karsten

Update of /cvs/extras/rpms/gnupg2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21063

Modified Files:
	gnupg2.spec 
Log Message:
- don't require pcsc-lite-libs and libusb on mainframe where
  we don't have those packages as there's no hardware for that



Index: gnupg2.spec
===================================================================
RCS file: /cvs/extras/rpms/gnupg2/devel/gnupg2.spec,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -r1.88 -r1.89
--- gnupg2.spec	13 Jan 2009 20:54:10 -0000	1.88
+++ gnupg2.spec	31 Jan 2009 16:38:47 -0000	1.89
@@ -22,13 +22,15 @@
 #BuildRequires: libgcrypt-devel => 1.2.2
 BuildRequires: libgpg-error-devel => 1.4
 BuildRequires: libksba-devel >= 1.0.2
-BuildRequires: libusb-devel
 BuildRequires: openldap-devel
+%ifnarch s390 s390x
+BuildRequires: libusb-devel
 %if 0%{?fedora} > 3 || 0%{?rhel} > 4
 BuildRequires: pcsc-lite-libs
 %else
 %define pcsclib libpcsclite.so.0
 %endif
+%endif
 BuildRequires: pth-devel
 BuildRequires: readline-devel ncurses-devel
 BuildRequires: zlib-devel
@@ -165,6 +167,10 @@
 
 
 %changelog
+* Sat Jan 31 2009 Karsten Hopp <karsten at redhat.com> 2.0.10-1
+- don't require pcsc-lite-libs and libusb on mainframe where
+  we don't have those packages as there's no hardware for that
+
 * Tue Jan 13 2009 Rex Dieter <rdieter at fedoraproject.org> 2.0.10-1
 - gnupg-2.0.10
 



From gd at fedoraproject.org  Sat Jan 31 16:44:37 2009
From: gd at fedoraproject.org (Guenther Deschner)
Date: Sat, 31 Jan 2009 16:44:37 +0000 (UTC)
Subject: rpms/samba/devel
	0001-fix-bug-6073-prevent-ads_connect-from-using-SSL.patch, NONE,
	1.1 samba.spec, 1.169, 1.170
Message-ID: <20090131164437.1D02870119@cvs1.fedora.phx.redhat.com>

Author: gd

Update of /cvs/pkgs/rpms/samba/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21866

Modified Files:
	samba.spec 
Added Files:
	0001-fix-bug-6073-prevent-ads_connect-from-using-SSL.patch 
Log Message:
Add upstream fix for ldap connections to AD (Bug #6073).

Guenther


0001-fix-bug-6073-prevent-ads_connect-from-using-SSL.patch:

--- NEW FILE 0001-fix-bug-6073-prevent-ads_connect-from-using-SSL.patch ---
>From d332da87068cd72489941010a33e372ab53d3bcc Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox at samba.org>
Date: Thu, 29 Jan 2009 13:17:46 +0100
Subject: [PATCH] fix bug #6073: prevent ads_connect() from using SSL unless explicitly requested

This fixes "net ads join".
It copes with the changed default "ldap ssl = start tls".
A new boolean option "ldap ssl : ads" is added to allow for
explicitly requesting ssl with  ads.

Michael
---
 source/libads/ldap.c |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/source/libads/ldap.c b/source/libads/ldap.c
index f3bc2c5..5c95d4f 100644
--- a/source/libads/ldap.c
+++ b/source/libads/ldap.c
@@ -672,9 +672,11 @@ got_connection:
 
 	ldap_set_option(ads->ldap.ld, LDAP_OPT_PROTOCOL_VERSION, &version);
 
-	status = ADS_ERROR(smb_ldap_start_tls(ads->ldap.ld, version));
-	if (!ADS_ERR_OK(status)) {
-		goto out;
+	if (lp_parm_bool(-1, "ldap ssl", "ads", false)) {
+		status = ADS_ERROR(smb_ldap_start_tls(ads->ldap.ld, version));
+		if (!ADS_ERR_OK(status)) {
+			goto out;
+		}
 	}
 
 	/* fill in the current time and offsets */
-- 
1.6.0.2



Index: samba.spec
===================================================================
RCS file: /cvs/pkgs/rpms/samba/devel/samba.spec,v
retrieving revision 1.169
retrieving revision 1.170
diff -u -r1.169 -r1.170
--- samba.spec	30 Jan 2009 17:31:45 -0000	1.169
+++ samba.spec	31 Jan 2009 16:44:06 -0000	1.170
@@ -43,6 +43,7 @@
 # The passwd part has been applied, but not the group part
 Patch107: samba-3.2.0pre1-grouppwd.patch
 Patch200: samba-3.2.5-inotify.patch
+Patch201: 0001-fix-bug-6073-prevent-ads_connect-from-using-SSL.patch
 
 Requires(pre): samba-common = %{epoch}:%{samba_version}-%{release}
 Requires: pam >= 0:0.64
@@ -246,6 +247,7 @@
 #%patch104 -p1 -b .nmbd-netbiosname # FIXME: does not apply
 %patch107 -p1 -b .grouppwd
 %patch200 -p0 -b .inotify
+%patch201 -p1 -b .ldap_ssl
 
 mv source/VERSION source/VERSION.orig
 sed -e 's/SAMBA_VERSION_VENDOR_SUFFIX=$/&\"%{samba_release}\"/' < source/VERSION.orig > source/VERSION
@@ -826,8 +828,9 @@
 %{_datadir}/pixmaps/samba/logo-small.png
 
 %changelog
-* Fri Jan 30 2009 Guenther Deschner <gdeschner at redhat.com> - 3.3.0-0.25
+* Sat Jan 31 2009 Guenther Deschner <gdeschner at redhat.com> - 3.3.0-0.25
 - Update to 3.3.0 final
+- Add upstream fix for ldap connections to AD (Bug #6073)
 
 * Fri Nov 28 2008 Guenther Deschner <gdeschner at redhat.com> - 3.3.0-0rc1.24
 - Update to 3.3.0rc1



From karsten at fedoraproject.org  Sat Jan 31 16:54:53 2009
From: karsten at fedoraproject.org (Karsten Hopp)
Date: Sat, 31 Jan 2009 16:54:53 +0000 (UTC)
Subject: rpms/qt3/devel qt.csh,1.2,1.3 qt.sh,1.2,1.3 qt3.spec,1.9,1.10
Message-ID: <20090131165453.4926270119@cvs1.fedora.phx.redhat.com>

Author: karsten

Update of /cvs/extras/rpms/qt3/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23350

Modified Files:
	qt.csh qt.sh qt3.spec 
Log Message:
- s390x is 64bit, s390 is 32bit. Fixed in /etc/profile.d/qt.*



Index: qt.csh
===================================================================
RCS file: /cvs/extras/rpms/qt3/devel/qt.csh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- qt.csh	7 Jul 2008 19:44:46 -0000	1.2
+++ qt.csh	31 Jan 2009 16:54:22 -0000	1.3
@@ -13,7 +13,7 @@
 switch (`uname -m`)
    case x86_64:
    case ia64:
-   case s390:
+   case s390x:
       set QTPREFIXES = "/usr/lib64/qt-3.3 /usr/lib/qt-3.3"
       breaksw
    case *:


Index: qt.sh
===================================================================
RCS file: /cvs/extras/rpms/qt3/devel/qt.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- qt.sh	7 Jul 2008 19:44:46 -0000	1.2
+++ qt.sh	31 Jan 2009 16:54:22 -0000	1.3
@@ -9,7 +9,7 @@
 if [ -z "${QTDIR}" ]; then
 
 case `uname -m` in
-   x86_64 | ia64 | s390 )
+   x86_64 | ia64 | s390x )
       QT_PREFIXES="/usr/lib64/qt-3.3 /usr/lib/qt-3.3" ;;
    * )
       QT_PREFIXES="/usr/lib/qt-3.3 /usr/lib64/qt-3.3" ;;


Index: qt3.spec
===================================================================
RCS file: /cvs/extras/rpms/qt3/devel/qt3.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- qt3.spec	22 Jan 2009 21:20:02 -0000	1.9
+++ qt3.spec	31 Jan 2009 16:54:22 -0000	1.10
@@ -2,7 +2,7 @@
 
 Summary: The shared library for the Qt 3 GUI toolkit
 Version: 3.3.8b
-Release: 18%{?dist}
+Release: 19%{?dist}
 %if 0%{?fedora} > 8
 Name: qt3
 Obsoletes: qt < 1:%{version}-%{release}
@@ -641,6 +641,9 @@
 
 
 %changelog
+* Sat Jan 31 2009 Karsten Hopp <karsten at redhat.com> 3.3.8b-19
+- s390x is 64bit, s390 is 32bit. Fixed in /etc/profile.d/qt.*
+
 * Thu Jan 22 2009 Rex Dieter <rdieter at fedoraproject.org> 3.3.8b-18
 - respin (mysql)
 



From rdieter at fedoraproject.org  Sat Jan 31 17:21:59 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sat, 31 Jan 2009 17:21:59 +0000 (UTC)
Subject: rpms/kdegraphics/devel kdegraphics.spec,1.186,1.187
Message-ID: <20090131172159.DB70C70119@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdegraphics/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27530

Modified Files:
	kdegraphics.spec 
Log Message:
* Sat Jan 31 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.0-2
- unowned dirs (#483317)



Index: kdegraphics.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdegraphics/devel/kdegraphics.spec,v
retrieving revision 1.186
retrieving revision 1.187
diff -u -r1.186 -r1.187
--- kdegraphics.spec	22 Jan 2009 11:10:27 -0000	1.186
+++ kdegraphics.spec	31 Jan 2009 17:21:29 -0000	1.187
@@ -7,7 +7,7 @@
 Summary:        K Desktop Environment - Graphics Applications
 Epoch:          7
 Version:        4.2.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 
 Name:           kdegraphics
 #Obsoletes:     kdegraphics4 < %{version}-%{release}
@@ -150,7 +150,7 @@
 %{_kde4_appsdir}/gwenview/
 %{_kde4_appsdir}/kolourpaint/
 %{_kde4_appsdir}/kruler/
-%{_kde4_appsdir}/svgpart/*
+%{_kde4_appsdir}/svgpart/
 %{_datadir}/dbus-1/interfaces/*
 %{_kde4_docdir}/HTML/en/*/
 %{_kde4_iconsdir}/hicolor/*/*/*
@@ -179,6 +179,9 @@
 
 
 %changelog
+* Sat Jan 31 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.0-2
+- unowned dirs (#483317)
+
 * Thu Jan 22 2009 Than Ngo <than at redhat.com> - 4.2.0-1
 - 4.2.0
 



From rdieter at fedoraproject.org  Sat Jan 31 17:25:45 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sat, 31 Jan 2009 17:25:45 +0000 (UTC)
Subject: rpms/kdelibs/devel kdelibs.spec,1.427,1.428
Message-ID: <20090131172545.E614470119@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdelibs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28134

Modified Files:
	kdelibs.spec 
Log Message:
* Sat Jan 31 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.0-8
- unowned dirs (#483315)



Index: kdelibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.427
retrieving revision 1.428
diff -u -r1.427 -r1.428
--- kdelibs.spec	30 Jan 2009 20:47:54 -0000	1.427
+++ kdelibs.spec	31 Jan 2009 17:25:15 -0000	1.428
@@ -1,6 +1,6 @@
 Summary: K Desktop Environment 4 - Libraries
 Version: 4.2.0
-Release: 7%{?dist}
+Release: 8%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs
@@ -327,7 +327,6 @@
 %exclude %{_kde4_appsdir}/cmake/
 %{_kde4_configdir}/*
 %{_datadir}/dbus-1/interfaces/*
-%{_libdir}/kde4/plugins/script/*
 %{_kde4_datadir}/mime/packages/*
 %{_kde4_sharedir}/kde4/services/*
 %{_kde4_sharedir}/kde4/servicetypes/*
@@ -341,6 +340,7 @@
 %{_kde4_libexecdir}/*
 %dir %{_kde4_libdir}/kde4/plugins/
 %{_kde4_libdir}/kde4/plugins/imageformats/
+%{_kde4_libdir}/kde4/plugins/script/
 %{_kde4_sysconfdir}/xdg/menus/*.menu
 %doc %{_mandir}/man*/*
 # kdelibs-common comes from here for fedora >= 9
@@ -382,6 +382,9 @@
 
 
 %changelog
+* Sat Jan 31 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.0-8
+- unowned dirs (#483315)
+
 * Fri Jan 30 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.0-7
 - kded/kdirwatch patch (kde#182472)
 



From rdieter at fedoraproject.org  Sat Jan 31 17:29:39 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sat, 31 Jan 2009 17:29:39 +0000 (UTC)
Subject: rpms/kdemultimedia/devel kdemultimedia.spec,1.133,1.134
Message-ID: <20090131172939.4F44470119@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdemultimedia/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28743

Modified Files:
	kdemultimedia.spec 
Log Message:
* Sat Jan 31 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.0-2
- unowned dirs (#483516)



Index: kdemultimedia.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdemultimedia/devel/kdemultimedia.spec,v
retrieving revision 1.133
retrieving revision 1.134
diff -u -r1.133 -r1.134
--- kdemultimedia.spec	22 Jan 2009 11:25:18 -0000	1.133
+++ kdemultimedia.spec	31 Jan 2009 17:29:08 -0000	1.134
@@ -1,7 +1,7 @@
 Name: kdemultimedia
 Epoch: 6
 Version: 4.2.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: K Desktop Environment - Multimedia applications
 
 Group:     Applications/Multimedia
@@ -17,13 +17,11 @@
 BuildRequires: alsa-lib-devel
 BuildRequires: cdparanoia-devel cdparanoia
 BuildRequires: flac-devel
-BuildRequires: giflib-devel
 BuildRequires: kdebase-workspace-devel >= %{version}
 BuildRequires: libtheora-devel
 ## needed to build Kscd, keep for now -- Kevin
 BuildRequires: libtunepimp-devel libmusicbrainz-devel
 BuildRequires: libvorbis-devel
-BuildRequires: pcre-devel
 BuildRequires: taglib-devel
 BuildRequires: xine-lib-devel libxcb-devel
 
@@ -77,7 +75,7 @@
 %{cmake_kde4} ..
 popd
 
-make %{?_smp_mflags} -C %{_target_platform} VERBOSE=1
+make %{?_smp_mflags} -C %{_target_platform}
 
 
 %install
@@ -112,8 +110,8 @@
 %{_kde4_appsdir}/kmix/
 %{_kde4_appsdir}/kconf_update/*
 %{_kde4_appsdir}/konqsidebartng/
-%{_kde4_appsdir}/profiles/*
-%{_kde4_appsdir}/kscd/skin/
+%{_kde4_appsdir}/profiles/
+%{_kde4_appsdir}/kscd/
 %{_kde4_appsdir}/solid/actions/dragonplayer-opendvd.desktop
 %{_kde4_configdir}/dragonplayerrc
 %{_kde4_datadir}/applications/kde4/*
@@ -146,6 +144,9 @@
 
 
 %changelog
+* Sat Jan 31 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.0-2
+- unowned dirs (#483516)
+
 * Thu Jan 22 2009 Than Ngo <than at redhat.com> - 4.2.0-1
 - 4.2.0
 



From rdieter at fedoraproject.org  Sat Jan 31 17:33:01 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sat, 31 Jan 2009 17:33:01 +0000 (UTC)
Subject: rpms/kdegames/devel kdegames.spec,1.113,1.114
Message-ID: <20090131173301.0DCC570119@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdegames/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29485

Modified Files:
	kdegames.spec 
Log Message:
* Sat Jan 31 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.0-2
- unowned dirs (#438314)



Index: kdegames.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdegames/devel/kdegames.spec,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -r1.113 -r1.114
--- kdegames.spec	22 Jan 2009 11:06:04 -0000	1.113
+++ kdegames.spec	31 Jan 2009 17:32:30 -0000	1.114
@@ -4,7 +4,7 @@
 Summary: K Desktop Environment 4 - Games
 Epoch:   6
 Version: 4.2.0
-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} VERBOSE=1
+make %{?_smp_mflags} -C %{_target_platform}
 
 
 %install
@@ -153,7 +153,7 @@
 %exclude %{_kde4_appsdir}/cmake/
 %{_kde4_configdir}/*
 %{_kde4_datadir}/sounds/*.ogg
-%{_kde4_datadir}/sounds/*/*.ogg
+%{_kde4_datadir}/sounds/capman/
 %{_kde4_datadir}/applications/kde4/*
 %{_kde4_datadir}/config.kcfg/*
 %{_kde4_docdir}/HTML/en/*
@@ -177,6 +177,9 @@
 
 
 %changelog
+* Sat Jan 31 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.0-2
+- unowned dirs (#438314)
+
 * Thu Jan 22 2009 Than Ngo <than at redhat.com> - 4.2.0-1
 - 4.2.0
 



From rdieter at fedoraproject.org  Sat Jan 31 18:38:33 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sat, 31 Jan 2009 18:38:33 +0000 (UTC)
Subject: rpms/kdegames/devel kdegames.spec,1.114,1.115
Message-ID: <20090131183833.C350F70119@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdegames/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5637

Modified Files:
	kdegames.spec 
Log Message:
thinko



Index: kdegames.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdegames/devel/kdegames.spec,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -r1.114 -r1.115
--- kdegames.spec	31 Jan 2009 17:32:30 -0000	1.114
+++ kdegames.spec	31 Jan 2009 18:38:03 -0000	1.115
@@ -153,7 +153,7 @@
 %exclude %{_kde4_appsdir}/cmake/
 %{_kde4_configdir}/*
 %{_kde4_datadir}/sounds/*.ogg
-%{_kde4_datadir}/sounds/capman/
+%{_kde4_datadir}/sounds/kapman/
 %{_kde4_datadir}/applications/kde4/*
 %{_kde4_datadir}/config.kcfg/*
 %{_kde4_docdir}/HTML/en/*



From rishi at fedoraproject.org  Sat Jan 31 18:47:20 2009
From: rishi at fedoraproject.org (Debarshi Ray)
Date: Sat, 31 Jan 2009 18:47:20 +0000 (UTC)
Subject: rpms/glade3/F-10 glade3.spec,1.15,1.16
Message-ID: <20090131184720.328DA70119@cvs1.fedora.phx.redhat.com>

Author: rishi

Update of /cvs/pkgs/rpms/glade3/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6554

Modified Files:
	glade3.spec 
Log Message:
* Sat Jan 31 2009 Debarshi Ray <rishi at fedoraproject.org> - 3.4.5-3
- Fixed unowned directories in libgladeui-devel. Closes Red Hat Bugzilla bug
  #483311.



Index: glade3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/glade3/F-10/glade3.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- glade3.spec	4 Jan 2009 19:26:36 -0000	1.15
+++ glade3.spec	31 Jan 2009 18:46:49 -0000	1.16
@@ -6,7 +6,7 @@
 Summary:	User Interface Designer for GTK+ and GNOME
 Name:		glade3
 Version:	3.4.5
-Release:	2%{?dist}
+Release:	3%{?dist}
 License:	GPLv2+
 Group:		Development/Tools
 URL:		http://glade.gnome.org/
@@ -187,12 +187,16 @@
 %{_libdir}/pkgconfig/gladeui-1.0.pc
 
 %dir %{_datadir}/gtk-doc/html/gladeui
-%{_datadir}/gtk-doc/html/gladeui/*
+%doc %{_datadir}/gtk-doc/html/gladeui/*
 
-%dir %{_includedir}/libgladeui-1.0/gladeui
-%{_includedir}/libgladeui-1.0/gladeui/*
+%dir %{_includedir}/libgladeui-1.0
+%{_includedir}/libgladeui-1.0/gladeui
 
 %changelog
+* Sat Jan 31 2009 Debarshi Ray <rishi at fedoraproject.org> - 3.4.5-3
+- Fixed unowned directories in libgladeui-devel. Closes Red Hat Bugzilla bug
+  #483311.
+
 * Mon Jan 05 2009 Debarshi Ray <rishi at fedoraproject.org> - 3.4.5-2
 - Added patch to prevent Anjuta from hanging on startup from GNOME that was
   mistakenly left out from the upstream tarball. Closes GNOME Bugzilla bug



From rdieter at fedoraproject.org  Sat Jan 31 18:51:07 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sat, 31 Jan 2009 18:51:07 +0000 (UTC)
Subject: rpms/kdelibs/devel kdelibs.spec,1.428,1.429
Message-ID: <20090131185107.82BD770119@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdelibs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7137

Modified Files:
	kdelibs.spec 
Log Message:
* Sat Jan 31 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.0-8
- unowned dirs (#483315,#483318)



Index: kdelibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.428
retrieving revision 1.429
diff -u -r1.428 -r1.429
--- kdelibs.spec	31 Jan 2009 17:25:15 -0000	1.428
+++ kdelibs.spec	31 Jan 2009 18:50:36 -0000	1.429
@@ -250,6 +250,9 @@
 mv %{buildroot}%{_kde4_sysconfdir}/xdg/menus/applications.menu \
    %{buildroot}%{_kde4_sysconfdir}/xdg/menus/kde4-applications.menu
 
+# create/own, see http://bugzilla.redhat.com/483318
+mkdir -p %{_kde4_libdir}/kconf_update_bin
+
 %if "%{name}" != "kdelibs"
 # remove files which conflict with KDE 3
 rm -f %{buildroot}%{_kde4_bindir}/checkXML %{buildroot}%{_kde4_bindir}/kjscmd \
@@ -335,6 +338,7 @@
 %{_kde4_docdir}/HTML/en/kioslave/
 %{_kde4_libdir}/lib*.so.*
 %{_kde4_libdir}/libkdeinit4_*.so
+%{_kde4_libdir}/kconf_update_bin/
 %dir %{_kde4_libdir}/kde4/
 %{_kde4_libdir}/kde4/*.so
 %{_kde4_libexecdir}/*
@@ -383,7 +387,7 @@
 
 %changelog
 * Sat Jan 31 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.0-8
-- unowned dirs (#483315)
+- unowned dirs (#483315,#483318)
 
 * Fri Jan 30 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.0-7
 - kded/kdirwatch patch (kde#182472)



From rishi at fedoraproject.org  Sat Jan 31 18:52:55 2009
From: rishi at fedoraproject.org (Debarshi Ray)
Date: Sat, 31 Jan 2009 18:52:55 +0000 (UTC)
Subject: rpms/glade3/F-9 glade3.spec,1.16,1.17
Message-ID: <20090131185255.7772E70119@cvs1.fedora.phx.redhat.com>

Author: rishi

Update of /cvs/pkgs/rpms/glade3/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7472

Modified Files:
	glade3.spec 
Log Message:
* Sat Jan 31 2009 Debarshi Ray <rishi at fedoraproject.org> - 3.4.5-3
- Fixed unowned directories in libgladeui-devel. Closes Red Hat Bugzilla bug
  #483311.



Index: glade3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/glade3/F-9/glade3.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- glade3.spec	4 Jan 2009 19:23:13 -0000	1.16
+++ glade3.spec	31 Jan 2009 18:52:25 -0000	1.17
@@ -6,7 +6,7 @@
 Summary:	User Interface Designer for GTK+ and GNOME
 Name:		glade3
 Version:	3.4.5
-Release:	2%{?dist}
+Release:	3%{?dist}
 License:	GPLv2+
 Group:		Development/Tools
 URL:		http://glade.gnome.org/
@@ -187,12 +187,16 @@
 %{_libdir}/pkgconfig/gladeui-1.0.pc
 
 %dir %{_datadir}/gtk-doc/html/gladeui
-%{_datadir}/gtk-doc/html/gladeui/*
+%doc %{_datadir}/gtk-doc/html/gladeui/*
 
-%dir %{_includedir}/libgladeui-1.0/gladeui
-%{_includedir}/libgladeui-1.0/gladeui/*
+%dir %{_includedir}/libgladeui-1.0
+%{_includedir}/libgladeui-1.0/gladeui
 
 %changelog
+* Sat Jan 31 2009 Debarshi Ray <rishi at fedoraproject.org> - 3.4.5-3
+- Fixed unowned directories in libgladeui-devel. Closes Red Hat Bugzilla bug
+  #483311.
+
 * Mon Jan 05 2009 Debarshi Ray <rishi at fedoraproject.org> - 3.4.5-2
 - Added patch to prevent Anjuta from hanging on startup from GNOME that was
   mistakenly left out from the upstream tarball. Closes GNOME Bugzilla bug



From rdieter at fedoraproject.org  Sat Jan 31 18:53:22 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sat, 31 Jan 2009 18:53:22 +0000 (UTC)
Subject: rpms/kdelibs3/devel kdelibs3.spec,1.46,1.47
Message-ID: <20090131185322.E69F170119@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdelibs3/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7560

Modified Files:
	kdelibs3.spec 
Log Message:
* Sat Jan 31 2009 Rex Dieter <rdieter at fedoraproject.org> - 6:3.5.10-5
- unowned dirs (#483318)



Index: kdelibs3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs3/devel/kdelibs3.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- kdelibs3.spec	10 Jan 2009 17:28:52 -0000	1.46
+++ kdelibs3.spec	31 Jan 2009 18:52:52 -0000	1.47
@@ -36,7 +36,7 @@
 
 Summary: K Desktop Environment 3 - Libraries
 Version: 3.5.10
-Release: 4%{?dist}
+Release: 5%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs3
@@ -344,6 +344,9 @@
 
 make DESTDIR=%{buildroot} install
 
+# create/own, see http://bugzilla.redhat.com/483318
+mkdir -p %{_libdir}/kconf_update_bin
+
 chmod a+x %{buildroot}%{_libdir}/*
 install -p -m 644 %{SOURCE3} %{buildroot}%{_datadir}/services/devices.protocol
 
@@ -575,6 +578,7 @@
 %{_libdir}/lib*.so.*
 %{_libdir}/libkdeinit_*.so
 %{_libdir}/lib*.la
+%{_libdir}/kconf_update_bin/
 %{_libdir}/kde3/
 %{_datadir}/applications/kde/*.desktop
 %{_datadir}/apps/*
@@ -632,6 +636,9 @@
 
 
 %changelog
+* Sat Jan 31 2009 Rex Dieter <rdieter at fedoraproject.org> - 6:3.5.10-5
+- unowned dirs (#483318)
+
 * Sat Jan 10 2009 Ville Skytt?? <ville.skytta at iki.fi> - 6:3.5.10-4
 - Slight speedup to profile.d/kde.sh (#465370).
 



From nim at fedoraproject.org  Sat Jan 31 18:54:37 2009
From: nim at fedoraproject.org (Nicolas Mailhot)
Date: Sat, 31 Jan 2009 18:54:37 +0000 (UTC)
Subject: rpms/google-droid-fonts/devel google-droid-fonts.spec, 1.2,
	1.3 import.log, 1.2, 1.3
Message-ID: <20090131185437.7643F70119@cvs1.fedora.phx.redhat.com>

Author: nim

Update of /cvs/extras/rpms/google-droid-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7944/devel

Modified Files:
	google-droid-fonts.spec import.log 
Log Message:
fix fontconfig links for sans and mono


Index: google-droid-fonts.spec
===================================================================
RCS file: /cvs/extras/rpms/google-droid-fonts/devel/google-droid-fonts.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- google-droid-fonts.spec	16 Jan 2009 22:29:21 -0000	1.2
+++ google-droid-fonts.spec	31 Jan 2009 18:54:07 -0000	1.3
@@ -12,7 +12,7 @@
 Name:    %{fontname}-fonts
 # The font files all have the same version except for sans fallback which I'm going to ignore here
 Version: 1.0.112
-Release: 3%{?dist}
+Release: 4%{?dist}
 Summary: General-purpose fonts released by Google as part of Android
 
 Group:     User Interface/X
@@ -122,8 +122,8 @@
 install -m 0644 -p %{SOURCE13} \
         %{buildroot}%{_fontconfig_templatedir}/59-%{fontname}-serif.conf
 
-for fontconf in 59-%{fontname}-sans.conf \
-                59-%{fontname}-sans-mono.conf \
+for fontconf in 65-%{fontname}-sans.conf \
+                60-%{fontname}-sans-mono.conf \
                 59-%{fontname}-serif.conf ; do
   ln -s %{_fontconfig_templatedir}/$fontconf \
         %{buildroot}%{_fontconfig_confdir}/$fontconf
@@ -142,6 +142,10 @@
 
 
 %changelog
+* Sat Jan 31 2009 <nicolas.mailhot at laposte.net>
+- 1.0.112-4
+??? fix-up fontconfig installation for sans and mono
+
 * Fri Jan 16 2009 <nicolas.mailhot at laposte.net>
 - 1.0.112-3
 ??? Workaround RHEL5 rpmbuild UTF-8 handling bug


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/google-droid-fonts/devel/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	16 Jan 2009 22:29:21 -0000	1.2
+++ import.log	31 Jan 2009 18:54:07 -0000	1.3
@@ -1,2 +1,3 @@
 google-droid-fonts-1_0_112-2_fc11:HEAD:google-droid-fonts-1.0.112-2.fc11.src.rpm:1232143809
 google-droid-fonts-1_0_112-3_fc11:HEAD:google-droid-fonts-1.0.112-3.fc11.src.rpm:1232144541
+google-droid-fonts-1_0_112-4_fc11:HEAD:google-droid-fonts-1.0.112-4.fc11.src.rpm:1233428004



From rdieter at fedoraproject.org  Sat Jan 31 19:11:20 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sat, 31 Jan 2009 19:11:20 +0000 (UTC)
Subject: rpms/kdelibs/devel kdelibs.spec,1.429,1.430
Message-ID: <20090131191120.BF86970119@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdelibs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10588

Modified Files:
	kdelibs.spec 
Log Message:
add missing %%buildroot



Index: kdelibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.429
retrieving revision 1.430
diff -u -r1.429 -r1.430
--- kdelibs.spec	31 Jan 2009 18:50:36 -0000	1.429
+++ kdelibs.spec	31 Jan 2009 19:10:50 -0000	1.430
@@ -251,7 +251,7 @@
    %{buildroot}%{_kde4_sysconfdir}/xdg/menus/kde4-applications.menu
 
 # create/own, see http://bugzilla.redhat.com/483318
-mkdir -p %{_kde4_libdir}/kconf_update_bin
+mkdir -p %{buildroot}%{_kde4_libdir}/kconf_update_bin
 
 %if "%{name}" != "kdelibs"
 # remove files which conflict with KDE 3



From rdieter at fedoraproject.org  Sat Jan 31 19:19:35 2009
From: rdieter at fedoraproject.org (Rex Dieter)
Date: Sat, 31 Jan 2009 19:19:35 +0000 (UTC)
Subject: rpms/kdelibs3/devel kdelibs3.spec,1.47,1.48
Message-ID: <20090131191935.DC10B70119@cvs1.fedora.phx.redhat.com>

Author: rdieter

Update of /cvs/pkgs/rpms/kdelibs3/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11452

Modified Files:
	kdelibs3.spec 
Log Message:
bummer when one copy-n-paste's something that's wrong



Index: kdelibs3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs3/devel/kdelibs3.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- kdelibs3.spec	31 Jan 2009 18:52:52 -0000	1.47
+++ kdelibs3.spec	31 Jan 2009 19:19:05 -0000	1.48
@@ -345,7 +345,7 @@
 make DESTDIR=%{buildroot} install
 
 # create/own, see http://bugzilla.redhat.com/483318
-mkdir -p %{_libdir}/kconf_update_bin
+mkdir -p %{buildroot}%{_libdir}/kconf_update_bin
 
 chmod a+x %{buildroot}%{_libdir}/*
 install -p -m 644 %{SOURCE3} %{buildroot}%{_datadir}/services/devices.protocol



From rishi at fedoraproject.org  Sat Jan 31 19:25:02 2009
From: rishi at fedoraproject.org (Debarshi Ray)
Date: Sat, 31 Jan 2009 19:25:02 +0000 (UTC)
Subject: rpms/glade3/devel glade3.spec,1.17,1.18
Message-ID: <20090131192502.B341270119@cvs1.fedora.phx.redhat.com>

Author: rishi

Update of /cvs/pkgs/rpms/glade3/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12114

Modified Files:
	glade3.spec 
Log Message:
Fixed Spec in devel.
 
 Modified Files:
 	glade3.spec 



Index: glade3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/glade3/devel/glade3.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- glade3.spec	31 Jan 2009 10:14:12 -0000	1.17
+++ glade3.spec	31 Jan 2009 19:24:32 -0000	1.18
@@ -11,9 +11,6 @@
 
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
-# Will be dropped in Fedora 10.
-#Provides:	glade = 1:%{version}-%{release}
-
 Requires:	hicolor-icon-theme
 Requires:	%{name}-libgladeui = %{version}-%{release}
 Requires(post):	scrollkeeper
@@ -91,10 +88,6 @@
 find $RPM_BUILD_ROOT -type f -name "*.la" -delete
 find $RPM_BUILD_ROOT -type f -name "*.a" -delete
 
-%if 0%{?fc7}
- rm -rf $RPM_BUILD_ROOT%{_var}/lib/scrollkeeper
-%endif
-
 %find_lang %{name}
 
 desktop-file-install %{?_remove_encoding} --vendor fedora --delete-original \
@@ -178,15 +171,20 @@
 %doc COPYING.GPL
 %{_libdir}/libgladeui-1.so
 %{_libdir}/pkgconfig/gladeui-1.0.pc
-%{_datadir}/gtk-doc/html/gladeui/
-%{_includedir}/libgladeui-1.0/
+
+%dir %{_datadir}/gtk-doc/html/gladeui
+%doc %{_datadir}/gtk-doc/html/gladeui/*
+
+%dir %{_includedir}/libgladeui-1.0
+%{_includedir}/libgladeui-1.0/gladeui
 
 %changelog
 * Sat Jan 31 2009 Rakesh Pandit <rakesh at fedoraproject.org> - 3.5.6-1
 - Updated to 3.5.6 (as per NEWS):
 - a) Handling of new entry properties
 - b) Added filechooser dialog to pixbuf properties
-- Fixed unowned directories in libgladeui-devel
+- Fixed unowned directories in libgladeui-devel. Closes Red Hat Bugzilla bug
+  #483311.
 
 * Wed Jan 07 2009 Debarshi Ray <rishi at fedoraproject.org> - 3.5.5-1
 - Version bump to 3.5.5.



From mbarnes at fedoraproject.org  Sat Jan 31 19:55:21 2009
From: mbarnes at fedoraproject.org (Matthew Barnes)
Date: Sat, 31 Jan 2009 19:55:21 +0000 (UTC)
Subject: rpms/pygtk2/devel .cvsignore, 1.39, 1.40 pygtk2.spec, 1.20,
	1.21 sources, 1.39, 1.40
Message-ID: <20090131195521.BE22570119@cvs1.fedora.phx.redhat.com>

Author: mbarnes

Update of /cvs/pkgs/rpms/pygtk2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16204

Modified Files:
	.cvsignore pygtk2.spec sources 
Log Message:

* Sat Jan 31 2009 Matthew Barnes <mbarnes at redhat.com> - 2.14.0-1.fc11
- Update to 2.14.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pygtk2/devel/.cvsignore,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- .cvsignore	25 Aug 2008 11:11:15 -0000	1.39
+++ .cvsignore	31 Jan 2009 19:54:51 -0000	1.40
@@ -1 +1 @@
-pygtk-2.13.0.tar.bz2
+pygtk-2.14.0.tar.bz2


Index: pygtk2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pygtk2/devel/pygtk2.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- pygtk2.spec	29 Nov 2008 18:16:47 -0000	1.20
+++ pygtk2.spec	31 Jan 2009 19:54:51 -0000	1.21
@@ -14,8 +14,8 @@
 ### Abstract ###
 
 Name: pygtk2
-Version: 2.13.0
-Release: 3%{?dist}
+Version: 2.14.0
+Release: 1%{?dist}
 License: LGPLv2+
 Group: Development/Languages
 Summary: Python bindings for GTK+
@@ -162,6 +162,9 @@
 %{_datadir}/gtk-doc/html/pygtk
 
 %changelog
+* Sat Jan 31 2009 Matthew Barnes <mbarnes at redhat.com> - 2.14.0-1.fc11
+- Update to 2.14.0
+
 * Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 2.13.0-3
 - Rebuild for Python 2.6
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pygtk2/devel/sources,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- sources	25 Aug 2008 11:11:16 -0000	1.39
+++ sources	31 Jan 2009 19:54:51 -0000	1.40
@@ -1 +1 @@
-e1513921bfd3790b456899c483fceaea  pygtk-2.13.0.tar.bz2
+b5fec3a9493a394d0ba2b8d2b337c4c5  pygtk-2.14.0.tar.bz2



From steved at fedoraproject.org  Sat Jan 31 20:33:19 2009
From: steved at fedoraproject.org (Steve Dickson)
Date: Sat, 31 Jan 2009 20:33:19 +0000 (UTC)
Subject: rpms/nfs-utils/devel nfs-utils-1.1.4-mount-textbased.patch, 1.1,
	1.2 nfs-utils.spec, 1.210, 1.211
Message-ID: <20090131203319.E6F6C70119@cvs1.fedora.phx.redhat.com>

Author: steved

Update of /cvs/pkgs/rpms/nfs-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20972

Modified Files:
	nfs-utils-1.1.4-mount-textbased.patch nfs-utils.spec 
Log Message:
Fixed typo in -mount-textbased.patch (bz 483375)


nfs-utils-1.1.4-mount-textbased.patch:

Index: nfs-utils-1.1.4-mount-textbased.patch
===================================================================
RCS file: /cvs/pkgs/rpms/nfs-utils/devel/nfs-utils-1.1.4-mount-textbased.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nfs-utils-1.1.4-mount-textbased.patch	27 Jan 2009 23:02:49 -0000	1.1
+++ nfs-utils-1.1.4-mount-textbased.patch	31 Jan 2009 20:33:19 -0000	1.2
@@ -61,7 +61,7 @@
 -				return PO_KEY1_RIGHTMOST;
 +			for (i = 0; keys[i] != NULL; i++)
 +				if (strcmp(option->keyword, keys[i]) == 0)
-+					return i;
++					return i+1;
  		}
  	}
  


Index: nfs-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nfs-utils/devel/nfs-utils.spec,v
retrieving revision 1.210
retrieving revision 1.211
diff -u -r1.210 -r1.211
--- nfs-utils.spec	31 Jan 2009 11:42:01 -0000	1.210
+++ nfs-utils.spec	31 Jan 2009 20:33:19 -0000	1.211
@@ -2,7 +2,7 @@
 Name: nfs-utils
 URL: http://sourceforge.net/projects/nfs
 Version: 1.1.4
-Release: 15%{?dist}
+Release: 16%{?dist}
 Epoch: 1
 
 # group all 32bit related archs
@@ -287,6 +287,9 @@
 %attr(4755,root,root)   /sbin/umount.nfs4
 
 %changelog
+* Sat Jan 31 2009 Steve Dickson <steved at redhat.com> 1.1.4-16
+- Fixed typo in -mount-textbased.patch (bz 483375)
+
 * Sat Jan 31 2009 Steve Dickson <steved at redhat.com> 1.1.4-15
 - Reworked tcp wrapper code to correctly use API (bz 480223)
 - General clean up of tcp wrapper code.



From ryan52 at fedoraproject.org  Sat Jan 31 22:01:14 2009
From: ryan52 at fedoraproject.org (Ryan Niebur)
Date: Sat, 31 Jan 2009 22:01:14 +0000 (UTC)
Subject: rpms/ldm/devel ldm.spec,1.16,1.17
Message-ID: <20090131220114.3DB2870119@cvs1.fedora.phx.redhat.com>

Author: ryan52

Update of /cvs/pkgs/rpms/ldm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1852

Modified Files:
	ldm.spec 
Log Message:
merge changes from F-10


Index: ldm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ldm/devel/ldm.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- ldm.spec	31 Oct 2008 21:20:24 -0000	1.16
+++ ldm.spec	31 Jan 2009 22:00:43 -0000	1.17
@@ -1,17 +1,18 @@
 Name:           ldm
-Version:        2.0.16
-%define _datestamp .20081030.15
+Version:        2.0.30
+%define _datestamp .20090127.13
 #Release:        2%{_datestamp}%{?dist}
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        LTSP Display Manager
 
 Group:          User Interface/X
 License:        GPLv2+
 URL:            https://code.launchpad.net/~ltsp-upstream/ltsp/ldm-trunk
 Source0:        ldm-%{version}.tar.bz2
+Patch0:         ldm-2.0.30-nbd-update.patch
 # Artwork by Maureen Duffy <duffy at redhat.com>
-Source1:        ldm-k12linux-theme-1.0.1.tar.bz2
-Patch0:         ldm-rearrange-stuff.patch
+%define theme_version 1.0.2
+Source1:        k12linux-theme-%{theme_version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gtk2-devel
@@ -38,6 +39,7 @@
 
 
 %build
+export CFLAGS="$CFLAGS -DK12LINUX"
 %configure
 make %{?_smp_mflags}
 
@@ -47,7 +49,7 @@
 make install DESTDIR=$RPM_BUILD_ROOT
 cd $RPM_BUILD_ROOT/%{_datadir}/ldm/themes
     tar xfvj %SOURCE1
-    mv ldm-k12linux-theme-1.0.1 k12linux
+    mv k12linux-theme-%{theme_version} k12linux
     ln -s k12linux default
 cd -
 
@@ -59,12 +61,27 @@
 install -m 0755 ldminfod/ldminfod $RPM_BUILD_ROOT%{_sbindir}/ldminfod
 install -m 0644 ldminfod/xinetd.d/ldminfod $RPM_BUILD_ROOT%{_sysconfdir}/xinetd.d/ldminfod
 
+rm -rf $RPM_BUILD_ROOT%{_datadir}/ldm/themes/ltsp
+
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/ltsp
+cat > $RPM_BUILD_ROOT%{_sysconfdir}/ltsp/ldm-global-dmrc <<EOL
+[Desktop]
+#Session=gnome
+#Session=kde
+#Session=xfce4
+#Session=sugar
+#Language=ja_JP.utf8
+#Language=en_US.utf8
+EOL
+chmod 644 $RPM_BUILD_ROOT%{_sysconfdir}/ltsp/ldm-global-dmrc
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files -f ldm.lang
 %defattr(-,root,root,-) 
 %doc COPYING README
+%{_bindir}/ldm-dialog
 %{_sbindir}/ldm
 %{_libexecdir}/ldm/
 %{_datadir}/ldm/
@@ -75,9 +92,40 @@
 %files -n ldminfod
 %{_sbindir}/ldminfod
 %config(noreplace) %{_sysconfdir}/xinetd.d/ldminfod
+%config(noreplace) %{_sysconfdir}/ltsp/ldm-global-dmrc
 
 %changelog
-* Fri Oct 31 2008 Warren Togami <wtogami at redhat.com. - 2.0.16-1
+* Wed Jan 28 2009 Warren Togami <wtogami at redhat.com> - 2.0.30-2
+- Fix nbd update checker
+
+* Wed Jan 22 2009 Warren Togami <wtogami at redhat.com> - 2.0.30-1
+- NBD update checker, reboots client automatically if needed
+
+* Wed Dec 24 2008 Warren Togami <wtogami at redhat.com> - 2.0.27-1
+- More bug fixes 
+
+* Thu Dec 12 2008 Warren Togami <wtogami at redhat.com> - 2.0.25-1
+- More bug fixes 
+
+* Fri Dec 12 2008 Warren Togami <wtogami at redhat.com> - 2.0.24-1
+- Minor bug fixes
+
+* Fri Dec 12 2008 Warren Togami <wtogami at redhat.com> - 2.0.23-1
+- LDM_DIRECTX=true was broken, now fixed
+
+* Thu Dec 11 2008 Warren Togami <wtogami at redhat.com> - 2.0.22-1
+- Show good names in Session menu
+- Use and write to user .dmrc
+  It is now possible to set a default session that is not GNOME.
+  Set LDM_GLOBAL_DMRC=/etc/ltsp/ldm-global-dmrc in lts.conf
+    and specify your choice in /etc/ltsp/ldm-global-dmrc on the server.
+
+* Thu Nov 13 2008 Warren Togami <wtogami at redhat.com> - 2.0.18-1
+- Fix race condition in a clean way without the ugly hack.
+- Improve logging.
+- Many little bug fixes and code cleanups.
+
+* Fri Oct 31 2008 Warren Togami <wtogami at redhat.com> - 2.0.16-1
 - UGLY HACK: Workaround race condition where keyboard layout setting would often fail
              because it was being set before X was done initializing.
 



From ryan52 at fedoraproject.org  Sat Jan 31 22:04:33 2009
From: ryan52 at fedoraproject.org (Ryan Niebur)
Date: Sat, 31 Jan 2009 22:04:33 +0000 (UTC)
Subject: rpms/ldm/devel .cvsignore, 1.9, 1.10 ldm.spec, 1.17, 1.18 sources, 
	1.13, 1.14 ldm-rearrange-stuff.patch, 1.2, NONE
Message-ID: <20090131220433.CE2FD70119@cvs1.fedora.phx.redhat.com>

Author: ryan52

Update of /cvs/pkgs/rpms/ldm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2465

Modified Files:
	.cvsignore ldm.spec sources 
Removed Files:
	ldm-rearrange-stuff.patch 
Log Message:
new version


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ldm/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	31 Oct 2008 21:20:24 -0000	1.9
+++ .cvsignore	31 Jan 2009 22:04:03 -0000	1.10
@@ -1,2 +1,2 @@
-ldm-k12linux-theme-1.0.1.tar.bz2
-ldm-2.0.16.tar.bz2
+k12linux-theme-1.0.2.tar.bz2
+ldm-2.0.31.tar.bz2


Index: ldm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ldm/devel/ldm.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- ldm.spec	31 Jan 2009 22:00:43 -0000	1.17
+++ ldm.spec	31 Jan 2009 22:04:03 -0000	1.18
@@ -1,15 +1,14 @@
 Name:           ldm
-Version:        2.0.30
+Version:        2.0.31
 %define _datestamp .20090127.13
-#Release:        2%{_datestamp}%{?dist}
-Release:        2%{?dist}
+Release:        1%{_datestamp}%{?dist}
+#Release:        1%{?dist}
 Summary:        LTSP Display Manager
 
 Group:          User Interface/X
 License:        GPLv2+
 URL:            https://code.launchpad.net/~ltsp-upstream/ltsp/ldm-trunk
 Source0:        ldm-%{version}.tar.bz2
-Patch0:         ldm-2.0.30-nbd-update.patch
 # Artwork by Maureen Duffy <duffy at redhat.com>
 %define theme_version 1.0.2
 Source1:        k12linux-theme-%{theme_version}.tar.bz2
@@ -18,6 +17,8 @@
 BuildRequires:  gtk2-devel
 BuildRequires:  gettext-devel
 BuildRequires:  intltool
+BuildRequires:  iso-codes
+BuildRequires:  python
 
 Requires:       nc
 Requires:       openssh-clients
@@ -35,7 +36,6 @@
 
 %prep
 %setup -q
-%patch0 -p1
 
 
 %build
@@ -95,6 +95,10 @@
 %config(noreplace) %{_sysconfdir}/ltsp/ldm-global-dmrc
 
 %changelog
+* Wed Jan 31 2009 Ryan Niebur <ryanryan52 at gmail.com> - 2.0.31-1
+- show the languages in a user friendly way in the language chooser
+- race condition fix
+
 * Wed Jan 28 2009 Warren Togami <wtogami at redhat.com> - 2.0.30-2
 - Fix nbd update checker
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ldm/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	31 Oct 2008 21:20:24 -0000	1.13
+++ sources	31 Jan 2009 22:04:03 -0000	1.14
@@ -1,2 +1,2 @@
-5b2cbbad73c92f47c65733ff181705cc  ldm-k12linux-theme-1.0.1.tar.bz2
-31214d1394711340f2c5a6a18f36cc8d  ldm-2.0.16.tar.bz2
+620e0ae9f5db3c40ade7e17681b97a08  k12linux-theme-1.0.2.tar.bz2
+7aa083ae5ab8130ac4e42af7e2b61456  ldm-2.0.31.tar.bz2


--- ldm-rearrange-stuff.patch DELETED ---



From ryan52 at fedoraproject.org  Sat Jan 31 22:11:39 2009
From: ryan52 at fedoraproject.org (Ryan Niebur)
Date: Sat, 31 Jan 2009 22:11:39 +0000 (UTC)
Subject: rpms/ldm/devel ldm.spec,1.18,1.19
Message-ID: <20090131221139.B9A7370119@cvs1.fedora.phx.redhat.com>

Author: ryan52

Update of /cvs/pkgs/rpms/ldm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4182

Modified Files:
	ldm.spec 
Log Message:
use the real version


Index: ldm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ldm/devel/ldm.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- ldm.spec	31 Jan 2009 22:04:03 -0000	1.18
+++ ldm.spec	31 Jan 2009 22:11:09 -0000	1.19
@@ -1,8 +1,8 @@
 Name:           ldm
 Version:        2.0.31
 %define _datestamp .20090127.13
-Release:        1%{_datestamp}%{?dist}
-#Release:        1%{?dist}
+#Release:        1%{_datestamp}%{?dist}
+Release:        1%{?dist}
 Summary:        LTSP Display Manager
 
 Group:          User Interface/X



From ryan52 at fedoraproject.org  Sat Jan 31 22:14:03 2009
From: ryan52 at fedoraproject.org (Ryan Niebur)
Date: Sat, 31 Jan 2009 22:14:03 +0000 (UTC)
Subject: rpms/ldm/devel ldm.spec,1.19,1.20
Message-ID: <20090131221403.389D170119@cvs1.fedora.phx.redhat.com>

Author: ryan52

Update of /cvs/pkgs/rpms/ldm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4571

Modified Files:
	ldm.spec 
Log Message:
it's Saturday, not Wednesday..


Index: ldm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ldm/devel/ldm.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- ldm.spec	31 Jan 2009 22:11:09 -0000	1.19
+++ ldm.spec	31 Jan 2009 22:13:32 -0000	1.20
@@ -95,7 +95,7 @@
 %config(noreplace) %{_sysconfdir}/ltsp/ldm-global-dmrc
 
 %changelog
-* Wed Jan 31 2009 Ryan Niebur <ryanryan52 at gmail.com> - 2.0.31-1
+* Sat Jan 31 2009 Ryan Niebur <ryanryan52 at gmail.com> - 2.0.31-1
 - show the languages in a user friendly way in the language chooser
 - race condition fix
 



From sarantis at fedoraproject.org  Sat Jan 31 22:15:28 2009
From: sarantis at fedoraproject.org (Sarantis Paskalis)
Date: Sat, 31 Jan 2009 22:15:28 +0000 (UTC)
Subject: rpms/ctan-kerkis-fonts/devel ctan-kerkis-fonts.spec,1.2,1.3
Message-ID: <20090131221528.3F6AE70119@cvs1.fedora.phx.redhat.com>

Author: sarantis

Update of /cvs/extras/rpms/ctan-kerkis-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4847

Modified Files:
	ctan-kerkis-fonts.spec 
Log Message:
add forgotten requires on -common



Index: ctan-kerkis-fonts.spec
===================================================================
RCS file: /cvs/extras/rpms/ctan-kerkis-fonts/devel/ctan-kerkis-fonts.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ctan-kerkis-fonts.spec	30 Jan 2009 22:38:42 -0000	1.2
+++ ctan-kerkis-fonts.spec	31 Jan 2009 22:14:57 -0000	1.3
@@ -15,7 +15,7 @@
 
 Name:           ctan-kerkis-fonts
 Version:        2.0
-Release:        19%{?dist}
+Release:        20%{?dist}
 Summary:        Kerkis Type 1 fonts
 Group:          Applications/Publishing
 License:        LPPL
@@ -45,6 +45,7 @@
 %package -n %{seriffonts}
 Summary:  Kerkis serif Type1 fonts
 Group:    User Interface/X
+Requires:  %{name}-common = %{version}-%{release}
 %description -n %{seriffonts}
 %{common_desc}
 This package contains the Kerkis font family. It is based on the URW Bookman
@@ -57,6 +58,7 @@
 %package -n %{sansfonts}
 Summary:  KerkisSans Type1 fonts
 Group:    User Interface/X
+Requires:  %{name}-common = %{version}-%{release}
 %description -n %{sansfonts}
 %{common_desc}
 This package contains the KerkisSans font family, based on a free version
@@ -69,6 +71,7 @@
 %package -n %{calligraphicfonts}
 Summary:  Kerkis Calligraphic Type1 fonts
 Group:    User Interface/X
+Requires:  %{name}-common = %{version}-%{release}
 %description -n %{calligraphicfonts}
 %{common_desc}
 This package contains the Kerkis-Calligraphic font family, a calligraphic font 
@@ -185,6 +188,9 @@
 
 
 %changelog
+* Sun Feb  1 2009 Sarantis Paskalis <paskalis at di.uoa.gr> - 2.0-20
+- Also add forgotten requires on -common.
+
 * Sat Jan 31 2009 Sarantis Paskalis <paskalis at di.uoa.gr> - 2.0-19
 - Add forgotten %%{_fontdir} in %%files section in -common (bz #483333)
 



From ryan52 at fedoraproject.org  Sat Jan 31 22:24:10 2009
From: ryan52 at fedoraproject.org (Ryan Niebur)
Date: Sat, 31 Jan 2009 22:24:10 +0000 (UTC)
Subject: rpms/ldm/F-10 .cvsignore, 1.17, 1.18 ldm.spec, 1.27, 1.28 sources, 
	1.21, 1.22 ldm-2.0.30-nbd-update.patch, 1.1, NONE
Message-ID: <20090131222410.5952A70119@cvs1.fedora.phx.redhat.com>

Author: ryan52

Update of /cvs/pkgs/rpms/ldm/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6264

Modified Files:
	.cvsignore ldm.spec sources 
Removed Files:
	ldm-2.0.30-nbd-update.patch 
Log Message:
new version, merged from devel


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ldm/F-10/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- .cvsignore	22 Jan 2009 05:17:03 -0000	1.17
+++ .cvsignore	31 Jan 2009 22:23:39 -0000	1.18
@@ -1,2 +1,2 @@
 k12linux-theme-1.0.2.tar.bz2
-ldm-2.0.30.tar.bz2
+ldm-2.0.31.tar.bz2


Index: ldm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ldm/F-10/ldm.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- ldm.spec	28 Jan 2009 22:43:11 -0000	1.27
+++ ldm.spec	31 Jan 2009 22:23:39 -0000	1.28
@@ -1,15 +1,14 @@
 Name:           ldm
-Version:        2.0.30
+Version:        2.0.31
 %define _datestamp .20090127.13
-#Release:        2%{_datestamp}%{?dist}
-Release:        2%{?dist}
+#Release:        1%{_datestamp}%{?dist}
+Release:        1%{?dist}
 Summary:        LTSP Display Manager
 
 Group:          User Interface/X
 License:        GPLv2+
 URL:            https://code.launchpad.net/~ltsp-upstream/ltsp/ldm-trunk
 Source0:        ldm-%{version}.tar.bz2
-Patch0:         ldm-2.0.30-nbd-update.patch
 # Artwork by Maureen Duffy <duffy at redhat.com>
 %define theme_version 1.0.2
 Source1:        k12linux-theme-%{theme_version}.tar.bz2
@@ -18,6 +17,8 @@
 BuildRequires:  gtk2-devel
 BuildRequires:  gettext-devel
 BuildRequires:  intltool
+BuildRequires:  iso-codes
+BuildRequires:  python
 
 Requires:       nc
 Requires:       openssh-clients
@@ -35,7 +36,6 @@
 
 %prep
 %setup -q
-%patch0 -p1
 
 
 %build
@@ -95,6 +95,10 @@
 %config(noreplace) %{_sysconfdir}/ltsp/ldm-global-dmrc
 
 %changelog
+* Sat Jan 31 2009 Ryan Niebur <ryanryan52 at gmail.com> - 2.0.31-1
+- show the languages in a user friendly way in the language chooser
+- race condition fix
+
 * Wed Jan 28 2009 Warren Togami <wtogami at redhat.com> - 2.0.30-2
 - Fix nbd update checker
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ldm/F-10/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sources	22 Jan 2009 05:17:03 -0000	1.21
+++ sources	31 Jan 2009 22:23:39 -0000	1.22
@@ -1,2 +1,2 @@
 620e0ae9f5db3c40ade7e17681b97a08  k12linux-theme-1.0.2.tar.bz2
-1fcfcf63c7b11d9e1c041494f8bfe88b  ldm-2.0.30.tar.bz2
+7aa083ae5ab8130ac4e42af7e2b61456  ldm-2.0.31.tar.bz2


--- ldm-2.0.30-nbd-update.patch DELETED ---



From ryan52 at fedoraproject.org  Sat Jan 31 22:26:49 2009
From: ryan52 at fedoraproject.org (Ryan Niebur)
Date: Sat, 31 Jan 2009 22:26:49 +0000 (UTC)
Subject: rpms/ldm/F-9 .cvsignore, 1.23, 1.24 ldm.spec, 1.32, 1.33 sources,
	1.27, 1.28 ldm-2.0.30-nbd-update.patch, 1.1, NONE
Message-ID: <20090131222649.A42DB70119@cvs1.fedora.phx.redhat.com>

Author: ryan52

Update of /cvs/pkgs/rpms/ldm/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6737

Modified Files:
	.cvsignore ldm.spec sources 
Removed Files:
	ldm-2.0.30-nbd-update.patch 
Log Message:
new version, merged from devel


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ldm/F-9/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- .cvsignore	22 Jan 2009 05:18:54 -0000	1.23
+++ .cvsignore	31 Jan 2009 22:26:19 -0000	1.24
@@ -1,2 +1,2 @@
 k12linux-theme-1.0.2.tar.bz2
-ldm-2.0.30.tar.bz2
+ldm-2.0.31.tar.bz2


Index: ldm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ldm/F-9/ldm.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- ldm.spec	28 Jan 2009 22:48:36 -0000	1.32
+++ ldm.spec	31 Jan 2009 22:26:19 -0000	1.33
@@ -1,15 +1,14 @@
 Name:           ldm
-Version:        2.0.30
+Version:        2.0.31
 %define _datestamp .20090127.13
-#Release:        2%{_datestamp}%{?dist}
-Release:        2%{?dist}
+#Release:        1%{_datestamp}%{?dist}
+Release:        1%{?dist}
 Summary:        LTSP Display Manager
 
 Group:          User Interface/X
 License:        GPLv2+
 URL:            https://code.launchpad.net/~ltsp-upstream/ltsp/ldm-trunk
 Source0:        ldm-%{version}.tar.bz2
-Patch0:         ldm-2.0.30-nbd-update.patch
 # Artwork by Maureen Duffy <duffy at redhat.com>
 %define theme_version 1.0.2
 Source1:        k12linux-theme-%{theme_version}.tar.bz2
@@ -18,6 +17,8 @@
 BuildRequires:  gtk2-devel
 BuildRequires:  gettext-devel
 BuildRequires:  intltool
+BuildRequires:  iso-codes
+BuildRequires:  python
 
 Requires:       nc
 Requires:       openssh-clients
@@ -35,7 +36,6 @@
 
 %prep
 %setup -q
-%patch0 -p1
 
 
 %build
@@ -95,6 +95,10 @@
 %config(noreplace) %{_sysconfdir}/ltsp/ldm-global-dmrc
 
 %changelog
+* Sat Jan 31 2009 Ryan Niebur <ryanryan52 at gmail.com> - 2.0.31-1
+- show the languages in a user friendly way in the language chooser
+- race condition fix
+
 * Wed Jan 28 2009 Warren Togami <wtogami at redhat.com> - 2.0.30-2
 - Fix nbd update checker
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ldm/F-9/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- sources	22 Jan 2009 05:18:54 -0000	1.27
+++ sources	31 Jan 2009 22:26:19 -0000	1.28
@@ -1,2 +1,2 @@
 620e0ae9f5db3c40ade7e17681b97a08  k12linux-theme-1.0.2.tar.bz2
-1fcfcf63c7b11d9e1c041494f8bfe88b  ldm-2.0.30.tar.bz2
+7aa083ae5ab8130ac4e42af7e2b61456  ldm-2.0.31.tar.bz2


--- ldm-2.0.30-nbd-update.patch DELETED ---



From itamarjp at fedoraproject.org  Sat Jan 31 22:29:00 2009
From: itamarjp at fedoraproject.org (Itamar Reis Peixoto)
Date: Sat, 31 Jan 2009 22:29:00 +0000 (UTC)
Subject: rpms/ss5/devel ss5.sysconfig, NONE, 1.1 import.log, 1.2,
	1.3 ss5.spec, 1.9, 1.10
Message-ID: <20090131222900.D284770119@cvs1.fedora.phx.redhat.com>

Author: itamarjp

Update of /cvs/pkgs/rpms/ss5/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7014/devel

Modified Files:
	import.log ss5.spec 
Added Files:
	ss5.sysconfig 
Log Message:
include /etc/sysconfig/ss5 file



--- NEW FILE ss5.sysconfig ---
# 'ss5' can be started with some options (e.g. -b or -s), pass this options via SS5_OPTS
SS5_OPTS=


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/ss5/devel/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	31 Jan 2009 13:52:26 -0000	1.2
+++ import.log	31 Jan 2009 22:28:30 -0000	1.3
@@ -1,2 +1,3 @@
 ss5-3_6_4-2_fc9:HEAD:ss5-3.6.4-2.fc9.src.rpm:1233115244
 ss5-3_6_4-2_fc10:HEAD:ss5-3.6.4-2.fc10.src.rpm:1233409811
+ss5-3_6_4-3_fc11:HEAD:ss5-3.6.4-3.fc11.src.rpm:1233440808


Index: ss5.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ss5/devel/ss5.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ss5.spec	28 Jan 2009 04:19:12 -0000	1.9
+++ ss5.spec	31 Jan 2009 22:28:30 -0000	1.10
@@ -1,16 +1,17 @@
 Summary: Socks Server 5 
 Name: ss5
 Version: 3.6.4
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+
 Group: Applications/Internet
 URL: http://sourceforge.net/projects/ss5
-Source: http://prdownloads.sourceforge.net/ss5/ss5-%{version}-3.tar.gz
+Source0: 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
 
+Source1: ss5.sysconfig
 Patch0: ss5_init.patch
 
 %description
@@ -30,6 +31,8 @@
 
 make install prefix=$RPM_BUILD_ROOT 
 
+install -Dpm 644 %{SOURCE1} %{buildroot}/%{_sysconfdir}/sysconfig/ss5
+
 chmod -R +r $RPM_BUILD_ROOT
 
 %clean
@@ -49,6 +52,7 @@
 %{_sbindir}/ss5
 %{_initrddir}/ss5
 %{_libdir}/ss5/
+%config(noreplace) %{_sysconfdir}/sysconfig/ss5
 
 %dir %{_docdir}/ss5
 %{_docdir}/ss5/License
@@ -76,6 +80,9 @@
 %doc ChangeLog
 
 %changelog
+* Wed Jan 31 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 3.6.4-3
+- include /etc/sysconfig/ss5 file
+
 * Wed Jan 28 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 3.6.4-2
 - fix init script BZ #478702
 - replace some tabs with spaces in changelog



From itamarjp at fedoraproject.org  Sat Jan 31 22:31:52 2009
From: itamarjp at fedoraproject.org (Itamar Reis Peixoto)
Date: Sat, 31 Jan 2009 22:31:52 +0000 (UTC)
Subject: rpms/ss5/F-10 ss5.sysconfig, NONE, 1.1 import.log, 1.1, 1.2 ss5.spec,
	1.9, 1.10
Message-ID: <20090131223152.3ADDE70119@cvs1.fedora.phx.redhat.com>

Author: itamarjp

Update of /cvs/pkgs/rpms/ss5/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7688/F-10

Modified Files:
	import.log ss5.spec 
Added Files:
	ss5.sysconfig 
Log Message:
include /etc/sysconfig/ss5 file



--- NEW FILE ss5.sysconfig ---
# 'ss5' can be started with some options (e.g. -b or -s), pass this options via SS5_OPTS
SS5_OPTS=


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/ss5/F-10/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	28 Jan 2009 06:08:48 -0000	1.1
+++ import.log	31 Jan 2009 22:31:21 -0000	1.2
@@ -1 +1,2 @@
 ss5-3_6_4-2_fc11:F-10:ss5-3.6.4-2.fc11.src.rpm:1233122875
+ss5-3_6_4-3_fc11:F-10:ss5-3.6.4-3.fc11.src.rpm:1233440983


Index: ss5.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ss5/F-10/ss5.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ss5.spec	28 Jan 2009 06:08:48 -0000	1.9
+++ ss5.spec	31 Jan 2009 22:31:21 -0000	1.10
@@ -1,16 +1,17 @@
 Summary: Socks Server 5 
 Name: ss5
 Version: 3.6.4
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+
 Group: Applications/Internet
 URL: http://sourceforge.net/projects/ss5
-Source: http://prdownloads.sourceforge.net/ss5/ss5-%{version}-3.tar.gz
+Source0: 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
 
+Source1: ss5.sysconfig
 Patch0: ss5_init.patch
 
 %description
@@ -30,6 +31,8 @@
 
 make install prefix=$RPM_BUILD_ROOT 
 
+install -Dpm 644 %{SOURCE1} %{buildroot}/%{_sysconfdir}/sysconfig/ss5
+
 chmod -R +r $RPM_BUILD_ROOT
 
 %clean
@@ -49,6 +52,7 @@
 %{_sbindir}/ss5
 %{_initrddir}/ss5
 %{_libdir}/ss5/
+%config(noreplace) %{_sysconfdir}/sysconfig/ss5
 
 %dir %{_docdir}/ss5
 %{_docdir}/ss5/License
@@ -76,6 +80,9 @@
 %doc ChangeLog
 
 %changelog
+* Wed Jan 31 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 3.6.4-3
+- include /etc/sysconfig/ss5 file
+
 * Wed Jan 28 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 3.6.4-2
 - fix init script BZ #478702
 - replace some tabs with spaces in changelog



From itamarjp at fedoraproject.org  Sat Jan 31 22:35:14 2009
From: itamarjp at fedoraproject.org (Itamar Reis Peixoto)
Date: Sat, 31 Jan 2009 22:35:14 +0000 (UTC)
Subject: rpms/ss5/F-9 ss5.sysconfig, NONE, 1.1 import.log, 1.1, 1.2 ss5.spec,
	1.8, 1.9
Message-ID: <20090131223514.AD6A070119@cvs1.fedora.phx.redhat.com>

Author: itamarjp

Update of /cvs/pkgs/rpms/ss5/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8360/F-9

Modified Files:
	import.log ss5.spec 
Added Files:
	ss5.sysconfig 
Log Message:
include /etc/sysconfig/ss5 file



--- NEW FILE ss5.sysconfig ---
# 'ss5' can be started with some options (e.g. -b or -s), pass this options via SS5_OPTS
SS5_OPTS=


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/ss5/F-9/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	31 Jan 2009 13:58:21 -0000	1.1
+++ import.log	31 Jan 2009 22:34:44 -0000	1.2
@@ -1 +1,2 @@
 ss5-3_6_4-2_fc10:F-9:ss5-3.6.4-2.fc10.src.rpm:1233410233
+ss5-3_6_4-3_fc11:F-9:ss5-3.6.4-3.fc11.src.rpm:1233441197


Index: ss5.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ss5/F-9/ss5.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ss5.spec	31 Jan 2009 13:58:21 -0000	1.8
+++ ss5.spec	31 Jan 2009 22:34:44 -0000	1.9
@@ -1,16 +1,17 @@
 Summary: Socks Server 5 
 Name: ss5
 Version: 3.6.4
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+
 Group: Applications/Internet
 URL: http://sourceforge.net/projects/ss5
-Source: http://prdownloads.sourceforge.net/ss5/ss5-%{version}-3.tar.gz
+Source0: 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
 
+Source1: ss5.sysconfig
 Patch0: ss5_init.patch
 
 %description
@@ -30,6 +31,8 @@
 
 make install prefix=$RPM_BUILD_ROOT 
 
+install -Dpm 644 %{SOURCE1} %{buildroot}/%{_sysconfdir}/sysconfig/ss5
+
 chmod -R +r $RPM_BUILD_ROOT
 
 %clean
@@ -49,6 +52,7 @@
 %{_sbindir}/ss5
 %{_initrddir}/ss5
 %{_libdir}/ss5/
+%config(noreplace) %{_sysconfdir}/sysconfig/ss5
 
 %dir %{_docdir}/ss5
 %{_docdir}/ss5/License
@@ -76,6 +80,9 @@
 %doc ChangeLog
 
 %changelog
+* Wed Jan 31 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 3.6.4-3
+- include /etc/sysconfig/ss5 file
+
 * Wed Jan 28 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 3.6.4-2
 - fix init script BZ #478702
 - replace some tabs with spaces in changelog